From a79a6ab3641e3536e509278706e7ac4de01a8126 Mon Sep 17 00:00:00 2001
From: David Grayson <davidegrayson@gmail.com>
Date: Sun, 4 Jun 2023 19:55:41 -0700
Subject: [PATCH 0001/3129] py/builtinimport: Remove partially-loaded modules
 from sys.modules.

Prior to this commit, importing a module that exists but has a syntax error
or some other problem that happens at import time would result in a
potentially-incomplete module object getting added to sys.modules.
Subsequent imports would use that object, resulting in confusing error
messages that hide the root cause of the problem.

This commit fixes that issue by removing the failed module from sys.modules
using the new NLR callback mechanism.

Note that it is still important to add the module to sys.modules while the
import is happening so that we can support circular imports just like
CPython does.

Fixes issue #967.

Signed-off-by: David Grayson <davidegrayson@gmail.com>
---
 py/builtinimport.c                      | 20 +++++++++++++++-
 tests/cpydiff/core_import_prereg.py     | 18 --------------
 tests/import/broken/pkg2_and_zerodiv.py |  2 ++
 tests/import/broken/zerodiv.py          |  1 +
 tests/import/circular/main.py           |  4 ++++
 tests/import/circular/sub.py            |  3 +++
 tests/import/import_broken.py           | 32 +++++++++++++++++++++++++
 tests/import/import_circular.py         |  1 +
 8 files changed, 62 insertions(+), 19 deletions(-)
 delete mode 100644 tests/cpydiff/core_import_prereg.py
 create mode 100644 tests/import/broken/pkg2_and_zerodiv.py
 create mode 100644 tests/import/broken/zerodiv.py
 create mode 100644 tests/import/circular/main.py
 create mode 100644 tests/import/circular/sub.py
 create mode 100644 tests/import/import_broken.py
 create mode 100644 tests/import/import_circular.py

diff --git a/py/builtinimport.c b/py/builtinimport.c
index de4ea17f38c03..8827be612330a 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -346,6 +346,17 @@ STATIC void evaluate_relative_import(mp_int_t level, const char **module_name, s
     *module_name_len = new_module_name_len;
 }
 
+typedef struct _nlr_jump_callback_node_unregister_module_t {
+    nlr_jump_callback_node_t callback;
+    qstr name;
+} nlr_jump_callback_node_unregister_module_t;
+
+STATIC void unregister_module_from_nlr_jump_callback(void *ctx_in) {
+    nlr_jump_callback_node_unregister_module_t *ctx = ctx_in;
+    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(ctx->name), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
+}
+
 // Load a module at the specified absolute path, possibly as a submodule of the given outer module.
 // full_mod_name:    The full absolute path up to this level (e.g. "foo.bar.baz").
 // level_mod_name:   The final component of the path (e.g. "baz").
@@ -467,8 +478,13 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
     // Module was found on the filesystem/frozen, try and load it.
     DEBUG_printf("Found path to load: %.*s\n", (int)vstr_len(&path), vstr_str(&path));
 
-    // Prepare for loading from the filesystem. Create a new shell module.
+    // Prepare for loading from the filesystem. Create a new shell module
+    // and register it in sys.modules.  Also make sure we remove it if
+    // there is any problem below.
     module_obj = mp_obj_new_module(full_mod_name);
+    nlr_jump_callback_node_unregister_module_t ctx;
+    ctx.name = full_mod_name;
+    nlr_push_jump_callback(&ctx.callback, unregister_module_from_nlr_jump_callback);
 
     #if MICROPY_MODULE_OVERRIDE_MAIN_IMPORT
     // If this module is being loaded via -m on unix, then
@@ -526,6 +542,8 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
         mp_store_attr(outer_module_obj, level_mod_name, module_obj);
     }
 
+    nlr_pop_jump_callback(false);
+
     return module_obj;
 }
 
diff --git a/tests/cpydiff/core_import_prereg.py b/tests/cpydiff/core_import_prereg.py
deleted file mode 100644
index 3ce2340c68dc7..0000000000000
--- a/tests/cpydiff/core_import_prereg.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-categories: Core,import
-description: Failed to load modules are still registered as loaded
-cause: To make module handling more efficient, it's not wrapped with exception handling.
-workaround: Test modules before production use; during development, use ``del sys.modules["name"]``, or just soft or hard reset the board.
-"""
-import sys
-
-try:
-    from modules import foo
-except NameError as e:
-    print(e)
-try:
-    from modules import foo
-
-    print("Should not get here")
-except NameError as e:
-    print(e)
diff --git a/tests/import/broken/pkg2_and_zerodiv.py b/tests/import/broken/pkg2_and_zerodiv.py
new file mode 100644
index 0000000000000..3580628ff5136
--- /dev/null
+++ b/tests/import/broken/pkg2_and_zerodiv.py
@@ -0,0 +1,2 @@
+import pkg2
+import broken.zerodiv
diff --git a/tests/import/broken/zerodiv.py b/tests/import/broken/zerodiv.py
new file mode 100644
index 0000000000000..72dca4d5e478b
--- /dev/null
+++ b/tests/import/broken/zerodiv.py
@@ -0,0 +1 @@
+1 / 0
diff --git a/tests/import/circular/main.py b/tests/import/circular/main.py
new file mode 100644
index 0000000000000..5d63d507c3211
--- /dev/null
+++ b/tests/import/circular/main.py
@@ -0,0 +1,4 @@
+x = 1
+import circular.sub
+
+print(circular.sub.y)
diff --git a/tests/import/circular/sub.py b/tests/import/circular/sub.py
new file mode 100644
index 0000000000000..50d7afe07bc71
--- /dev/null
+++ b/tests/import/circular/sub.py
@@ -0,0 +1,3 @@
+from circular.main import x
+
+y = x + 20
diff --git a/tests/import/import_broken.py b/tests/import/import_broken.py
new file mode 100644
index 0000000000000..3c7cf4a498528
--- /dev/null
+++ b/tests/import/import_broken.py
@@ -0,0 +1,32 @@
+import sys, pkg
+
+# Modules we import are usually added to sys.modules.
+print("pkg" in sys.modules)
+
+try:
+    from broken.zerodiv import x
+except Exception as e:
+    print(e.__class__.__name__)
+
+# The broken module we tried to import should not be in sys.modules.
+print("broken.zerodiv" in sys.modules)
+
+# If we try to import the module again, the code should
+# run again and we should get the same error.
+try:
+    from broken.zerodiv import x
+except Exception as e:
+    print(e.__class__.__name__)
+
+# Import a module that successfully imports some other modules
+# before importing the problematic module.
+try:
+    import broken.pkg2_and_zerodiv
+except ZeroDivisionError:
+    pass
+
+print("pkg2" in sys.modules)
+print("pkg2.mod1" in sys.modules)
+print("pkg2.mod2" in sys.modules)
+print("broken.zerodiv" in sys.modules)
+print("broken.pkg2_and_zerodiv" in sys.modules)
diff --git a/tests/import/import_circular.py b/tests/import/import_circular.py
new file mode 100644
index 0000000000000..388efdd13083d
--- /dev/null
+++ b/tests/import/import_circular.py
@@ -0,0 +1 @@
+import circular.main

From bf7d3ad8c69431d7bb8d1188484996af94e78990 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 24 May 2023 16:13:01 +0200
Subject: [PATCH 0002/3129] samd/boards: Rename flash pins consistently for
 QSPI and SPI.

For SAMD21 devices, the board flash signals must be named in pins.csv as
FLASH_MOSI, FLASH_MISO, FLASH_SCK, FLASH_CS for creating the SPI object.

And rename the QSPI pins to QSPI_xxxx instead of FLASH_xxx.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/pinout.rst                          | 48 +++++++++----------
 .../ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv      |  6 +--
 .../ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv      | 13 ++---
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv    | 13 ++---
 ports/samd/boards/MINISAM_M4/pins.csv         |  9 ++++
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv |  7 +++
 6 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 212275a014338..5fe1e14ecb374 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -160,14 +160,14 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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    -     -
+ 43 PB11      QSPI_CS  12    -    -     -     4/3   5/1   0/5   1/1
+  8 PA08      QSPI_D0   -    8    2    0/0    2/1   0/0   0/0   1/4
+  9 PA09      QSPI_D1   9    9    3    0/1    2/0   0/1   0/1   1/5
+ 10 PA10      QSPI_D2  10   10    -    0/2    2/2   1/0   0/2   1/6
+ 11 PA11      QSPI_D3  11   11    -    0/3    2/3   1/1   0/3   1/7
+ 42 PB10     QSPI_SCK  10    -    -     -     4/2   5/0   0/4   1/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
@@ -288,15 +288,15 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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    -      -
+ 43 PB11      QSPI_CS  12    -    -     -     4/3   5/1   0/5   1/1
+  8 PA08      QSPI_D0   -    8    2    0/0    2/1   0/0   0/0   1/4
+  9 PA09      QSPI_D1   9    9    3    0/1    2/0   0/1   0/1   1/5
+ 10 PA10      QSPI_D2  10   10    -    0/2    2/2   1/0   0/2   1/6
+ 11 PA11      QSPI_D3  11   11    -    0/3    2/3   1/1   0/3   1/7
+ 42 PB10     QSPI_SCK  10    -    -     -     4/2   5/0   0/4   1/0
  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
@@ -650,6 +650,12 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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    -     -
+ 43 PB11      QSPI_CS  12    -    -     -     4/3   5/1   0/5   1/1
+  8 PA08      QSPI_D0   -    8    2    0/0    2/1   0/0   0/0   1/4
+  9 PA09      QSPI_D1   9    9    3    0/1    2/0   0/1   0/1   1/5
+ 10 PA10      QSPI_D2  10   10    -    0/2    2/2   1/0   0/2   1/6
+ 11 PA11      QSPI_D3  11   11    -    0/3    2/3   1/1   0/3   1/7
+ 42 PB10     QSPI_SCK  10    -    -     -     4/2   5/0   0/4   1/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
@@ -657,17 +663,11 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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
@@ -734,6 +734,12 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
 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    -
+ 43 PB11      QSPI_CS  12    -    -     -     4/3   5/1   0/5   1/1
+  8 PA08      QSPI_D0   -    8    2    0/0    2/1   0/0   0/0   1/4
+  9 PA09      QSPI_D1   9    9    3    0/1    2/0   0/1   0/1   1/5
+ 10 PA10      QSPI_D2  10   10    -    0/2    2/2   1/0   0/2   1/6
+ 11 PA11      QSPI_D3  11   11    -    0/3    2/3   1/1   0/3   1/7
+ 42 PB10     QSPI_SCK  10    -    -     -     4/2   5/0   0/4   1/0
  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    -
@@ -750,17 +756,11 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
   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    -     -
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
index 35b6d1fd4e076..65362770624de 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -8,9 +8,9 @@ PIN_PB03,LED_RX
 
 PIN_PA11,D0
 PIN_PA10,D1
-PIN_PA14,D2
-PIN_PA09,D3
-PIN_PA08,D4
+PIN_PA08,FLASH_MOSI
+PIN_PA14,FLASH_MISO
+PIN_PA09,FLASH_SCK
 PIN_PA15,D5
 PIN_PA20,D6
 PIN_PA21,D7
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
index ad8449ac9ec78..df3373f246a84 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -28,12 +28,13 @@ 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
+
+PIN_PB11,QSPI_CS
+PIN_PB10,QSPI_SCK
+PIN_PA08,QSPI_D0
+PIN_PA09,QSPI_D1
+PIN_PA10,QSPI_D2
+PIN_PA11,QSPI_D3
 
 PIN_PA24,USB_DM
 PIN_PA25,USB_DP
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
index 43c8e9a64a971..b63a1f4b13554 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -28,12 +28,13 @@ 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
+
+PIN_PB11,QSPI_CS
+PIN_PB10,QSPI_SCK
+PIN_PA08,QSPI_D0
+PIN_PA09,QSPI_D1
+PIN_PA10,QSPI_D2
+PIN_PA11,QSPI_D3
 
 PIN_PA24,USB_DM
 PIN_PA25,USB_DP
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
index 793e523fcd96c..3ea5f85cbacb9 100644
--- a/ports/samd/boards/MINISAM_M4/pins.csv
+++ b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -26,6 +26,15 @@ PIN_PA01,SCK
 PIN_PB03,DOTSTAR_DATA
 PIN_PB02,DOTSTAR_CLK
 
+PIN_PB11,QSPI_CS
+PIN_PB10,QSPI_SCK
+PIN_PA08,QSPI_D0
+PIN_PA09,QSPI_D1
+PIN_PA10,QSPI_D2
+PIN_PA11,QSPI_D3
+
+PIN_PA15,LED
+
 PIN_PA24,USB_DM
 PIN_PA25,USB_DP
 PIN_PA26,USB_SOF
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
index 55cbb5bf0492d..c32108b9f72a0 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -58,6 +58,13 @@ PIN_PC13,LCD_YD
 PIN_PC30,MIC
 PIN_PD11,BUZZER
 
+PIN_PB11,QSPI_CS
+PIN_PB10,QSPI_SCK
+PIN_PA08,QSPI_D0
+PIN_PA09,QSPI_D1
+PIN_PA10,QSPI_D2
+PIN_PA11,QSPI_D3
+
 PIN_PA15,LED_BLUE
 PIN_PC05,LED_LCD
 

From 5561130c3f220e52fc878b683fc90ecb031427e6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 24 May 2023 16:14:47 +0200
Subject: [PATCH 0003/3129] samd/samd_spiflash: Add SPI flash driver and
 configure it accordingly.

The SPI flash driver includes the block device for being used as a
filesystem.  It provides the same methods as the driver for the internal
flash.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../mpconfigboard.h                           |   3 +
 .../mpconfigboard.h                           |   3 +
 ports/samd/samd_spiflash.c                    | 299 ++++++++++++++++++
 3 files changed, 305 insertions(+)
 create mode 100644 ports/samd/samd_spiflash.c

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
index 815597899c4ae..880df8d200390 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -2,3 +2,6 @@
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
 
 #define MICROPY_HW_XOSC32K  (1)
+
+#define MICROPY_HW_SPIFLASH (1)
+#define MICROPY_HW_SPIFLASH_ID (2)
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
index 160c61ea2aaae..16018fdc56356 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
@@ -2,3 +2,6 @@
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
 
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
+
+#define MICROPY_HW_SPIFLASH         (1)
+#define MICROPY_HW_SPIFLASH_ID      (5)
diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
new file mode 100644
index 0000000000000..eaa0ec14348a8
--- /dev/null
+++ b/ports/samd/samd_spiflash.c
@@ -0,0 +1,299 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2020 Peter Hinch
+ * Copyright (c) 2023 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 "extmod/machine_spi.h"
+#include "extmod/vfs.h"
+#include "modmachine.h"
+#include "pin_af.h"
+
+#if MICROPY_HW_SPIFLASH
+
+#define _READ_INDEX (0)
+#define _PROGRAM_PAGE_INDEX (1)
+#define _SECTOR_ERASE_INDEX (2)
+
+const uint8_t _COMMANDS_24BIT[] = {0x03, 0x02, 0x20};  // READ, PROGRAM_PAGE, ERASE_4K
+const uint8_t _COMMANDS_32BIT[] = {0x13, 0x12, 0x21};  // READ, PROGRAM_PAGE, ERASE_4K
+
+#define COMMAND_JEDEC_ID (0x9F)
+#define COMMAND_READ_STATUS (0x05)
+#define COMMAND_WRITE_ENABLE (0x06)
+#define COMMAND_READ_SFDP (0x5A)
+#define PAGE_SIZE (256)
+#define SECTOR_SIZE (4096)
+
+typedef struct _spiflash_obj_t {
+    mp_obj_base_t base;
+    mp_obj_base_t *spi;
+    mp_hal_pin_obj_t cs;
+    bool addr_is_32bit;
+    uint16_t pagesize;
+    uint16_t sectorsize;
+    const uint8_t *commands;
+    uint32_t size;
+} spiflash_obj_t;
+
+extern const mp_obj_type_t samd_spiflash_type;
+
+// The SPIflash object is a singleton
+static spiflash_obj_t spiflash_obj = {
+    { &samd_spiflash_type }, NULL, 0, false, PAGE_SIZE, SECTOR_SIZE, NULL, 0
+};
+
+static void spi_transfer(mp_obj_base_t *spi, size_t len, const uint8_t *src, uint8_t *dest) {
+    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(spi->type, protocol);
+    spi_p->transfer(spi, len, src, dest);
+}
+
+static void wait(spiflash_obj_t *self) {
+    uint8_t msg[2];
+    uint32_t timeout = 100000;
+
+    // each loop takes at least about 5us @ 120Mhz. So a timeout of
+    // 100000 wait 500ms max. at 120Mhz. Sector erase lasts about
+    // 100ms worst case, page write is < 1ms.
+    do {
+        msg[0] = COMMAND_READ_STATUS;
+        mp_hal_pin_write(self->cs, 0);
+        spi_transfer((mp_obj_base_t *)self->spi, 2, msg, msg);
+        mp_hal_pin_write(self->cs, 1);
+    } while (msg[1] != 0 && timeout-- > 0);
+}
+
+static void get_id(spiflash_obj_t *self, uint8_t id[3]) {
+    uint8_t msg[1];
+
+    msg[0] = COMMAND_JEDEC_ID;
+    mp_hal_pin_write(self->cs, 0);
+    spi_transfer(self->spi, 1, msg, NULL);
+    spi_transfer(self->spi, 3, id, id);
+    mp_hal_pin_write(self->cs, 1);
+}
+static void write_addr(spiflash_obj_t *self, uint8_t cmd, uint32_t addr) {
+    uint8_t msg[5];
+    uint8_t index = 1;
+    msg[0] = cmd;
+    if (self->addr_is_32bit) {
+        msg[index++] = addr >> 24;
+    }
+    msg[index++] = (addr >> 16) & 0xff;
+    msg[index++] = (addr >> 8) & 0xff;
+    msg[index++] = addr & 0xff;
+    mp_hal_pin_write(self->cs, 0);
+    spi_transfer(self->spi, self->addr_is_32bit ? 5 : 4, msg, msg);
+}
+
+static void write_enable(spiflash_obj_t *self) {
+    uint8_t msg[1];
+
+    msg[0] = COMMAND_WRITE_ENABLE;
+    mp_hal_pin_write(self->cs, 0);
+    spi_transfer(self->spi, 1, msg, NULL);
+    mp_hal_pin_write(self->cs, 1);
+}
+
+static void get_sfdp(spiflash_obj_t *self, uint32_t addr, uint8_t *buffer, int size) {
+    uint8_t dummy[1];
+    write_addr(self, COMMAND_READ_SFDP, addr);
+    spi_transfer(self->spi, 1, dummy, NULL);
+    spi_transfer(self->spi, size, buffer, buffer);
+    mp_hal_pin_write(self->cs, 1);
+}
+
+STATIC mp_obj_t spiflash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // Set up the object
+    spiflash_obj_t *self = &spiflash_obj;
+
+    mp_obj_t spi_args[] = {
+        MP_OBJ_NEW_SMALL_INT(MICROPY_HW_SPIFLASH_ID),
+        MP_OBJ_NEW_SMALL_INT(24000000),  // baudrate
+        MP_OBJ_NEW_QSTR(MP_QSTR_mosi), MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_MOSI),
+        MP_OBJ_NEW_QSTR(MP_QSTR_miso), MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_MISO),
+        MP_OBJ_NEW_QSTR(MP_QSTR_sck), MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_SCK),
+    };
+    self->spi = MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, make_new)((mp_obj_t)&machine_spi_type, 2, 3, spi_args);
+
+    mp_obj_t pin_args[] = {
+        MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_CS),
+        MP_ROM_INT(1),
+    };
+    machine_pin_obj_t *cs = MP_OBJ_TYPE_GET_SLOT(&machine_pin_type, make_new)((mp_obj_t)&machine_pin_type, 2, 0, pin_args);
+    self->cs = cs->pin_id;
+    mp_hal_pin_write(self->cs, 1);
+
+    wait(self);
+
+    // Get the flash size from the device ID (default)
+    uint8_t id[3];
+    get_id(self, id);
+    if (id[1] == 0x84 && id[2] == 1) {  // Adesto
+        self->size = 512 * 1024;
+    } else if (id[1] == 0x1f && id[2] == 1) {  // Atmel / Renesas
+        self->size = 1024 * 1024;
+    } else {
+        self->size = 1 << id[2];
+    }
+
+    // Get the addr_is_32bit flag and the sector size
+    uint8_t buffer[128];
+    get_sfdp(self, 0, buffer, 16);  // get the header
+    int len = MIN(buffer[11] * 4, sizeof(buffer));
+    if (len >= 29) {
+        int addr = buffer[12] + (buffer[13] << 8) + (buffer[14] << 16);
+        get_sfdp(self, addr, buffer, len);  // Get the JEDEC mandatory table
+        self->sectorsize = 1 << buffer[28];
+        self->addr_is_32bit = ((buffer[2] >> 1) & 0x03) != 0;
+    }
+    self->commands = self->addr_is_32bit ? _COMMANDS_32BIT : _COMMANDS_24BIT;
+
+    return self;
+}
+
+STATIC mp_obj_t spiflash_read(spiflash_obj_t *self, uint32_t addr, uint8_t *dest, uint32_t len) {
+    if (len > 0) {
+        write_addr(self, self->commands[_READ_INDEX], addr);
+        spi_transfer(self->spi, len, dest, dest);
+        mp_hal_pin_write(self->cs, 1);
+    }
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t spiflash_write(spiflash_obj_t *self, uint32_t addr, uint8_t *src, uint32_t len) {
+    uint32_t length = len;
+    uint32_t pos = 0;
+    uint8_t *buf = src;
+
+    while (pos < length) {
+        uint16_t maxsize = self->pagesize - pos % self->pagesize;
+        uint16_t size = (length - pos) > maxsize ? maxsize : length - pos;
+
+        write_enable(self);
+        write_addr(self, self->commands[_PROGRAM_PAGE_INDEX], addr);
+        spi_transfer(self->spi, size, buf + pos, NULL);
+        mp_hal_pin_write(self->cs, 1);
+        wait(self);
+
+        addr += size;
+        pos += size;
+    }
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t spiflash_erase(spiflash_obj_t *self, uint32_t addr) {
+    write_enable(self);
+    write_addr(self, self->commands[_SECTOR_ERASE_INDEX], addr);
+    mp_hal_pin_write(self->cs, 1);
+    wait(self);
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t spiflash_readblocks(size_t n_args, const mp_obj_t *args) {
+    spiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
+    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)
+    spiflash_read(self, offset, bufinfo.buf, bufinfo.len);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spiflash_readblocks_obj, 3, 4, spiflash_readblocks);
+
+STATIC mp_obj_t spiflash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    spiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    if (n_args == 3) {
+        spiflash_erase(self, offset);
+        // TODO check return value
+    } else {
+        offset += mp_obj_get_int(args[3]);
+    }
+    // Write data to flash (adf4 API)
+    spiflash_write(self,  offset, bufinfo.buf, bufinfo.len);
+    // TODO check return value
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spiflash_writeblocks_obj, 3, 4, spiflash_writeblocks);
+
+STATIC mp_obj_t spiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    spiflash_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->size / self->sectorsize);
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(self->sectorsize);
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            spiflash_erase(self, mp_obj_get_int(arg_in) * self->sectorsize);
+            // TODO check return value
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(spiflash_ioctl_obj, spiflash_ioctl);
+
+STATIC const mp_rom_map_elem_t spiflash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&spiflash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&spiflash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&spiflash_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(spiflash_locals_dict, spiflash_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    samd_spiflash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    make_new, spiflash_make_new,
+    locals_dict, &spiflash_locals_dict
+    );
+
+#endif // #if MICROPY_HW_SPIFLASH

From 2b5a5a0f35b325e14268f8f48ac8b5022da87691 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 24 May 2023 16:16:40 +0200
Subject: [PATCH 0004/3129] samd/samd_qspiflash: Add QSPI flash driver and
 configure it accordingly.

The QSPI driver provides the interface for using an on-board QSPI flash for
the filesystem.  It provides the same methods as the driver for the
internal flash and uses the same name.  Therefore, only one of the drivers
for internal flash, SPI flash and QSPI flash must be enabled at a time.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 drivers/memory/external_flash_device.h        | 461 ++++++++++++++++
 .../mpconfigboard.h                           |   2 +
 .../mpconfigboard.h                           |   2 +
 ports/samd/boards/MINISAM_M4/mpconfigboard.h  |   2 +
 .../boards/SEEED_WIO_TERMINAL/mpconfigboard.h |   2 +
 .../mpconfigboard.h                           |   5 +
 ports/samd/pin_af.h                           |   3 +
 ports/samd/samd_qspiflash.c                   | 491 ++++++++++++++++++
 8 files changed, 968 insertions(+)
 create mode 100644 drivers/memory/external_flash_device.h
 create mode 100644 ports/samd/samd_qspiflash.c

diff --git a/drivers/memory/external_flash_device.h b/drivers/memory/external_flash_device.h
new file mode 100644
index 0000000000000..03798446036aa
--- /dev/null
+++ b/drivers/memory/external_flash_device.h
@@ -0,0 +1,461 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+typedef struct {
+    uint32_t total_size;
+    uint16_t start_up_time_us;
+
+    // Three response bytes to 0x9f JEDEC ID command.
+    uint8_t manufacturer_id;
+    uint8_t memory_type;
+    uint8_t capacity;
+
+    // Max clock speed for all operations and the fastest read mode.
+    uint8_t max_clock_speed_mhz;
+
+    // Bitmask for Quad Enable bit if present. 0x00 otherwise. This is for the highest byte in the
+    // status register.
+    uint8_t quad_enable_bit_mask;
+
+    bool has_sector_protection : 1;
+
+    // Supports the 0x0b fast read command with 8 dummy cycles.
+    bool supports_fast_read : 1;
+
+    // Supports the fast read, quad output command 0x6b with 8 dummy cycles.
+    bool supports_qspi : 1;
+
+    // Supports the quad input page program command 0x32. This is known as 1-1-4 because it only
+    // uses all four lines for data.
+    bool supports_qspi_writes : 1;
+
+    // Requires a separate command 0x31 to write to the second byte of the status register.
+    // Otherwise two byte are written via 0x01.
+    bool write_status_register_split : 1;
+
+    // True when the status register is a single byte. This implies the Quad Enable bit is in the
+    // first byte and the Read Status Register 2 command (0x35) is unsupported.
+    bool single_status_byte : 1;
+} external_flash_device;
+
+// Settings for the Adesto Tech AT25DF081A 1MiB SPI flash. Its on the SAMD21
+// Xplained board.
+// Datasheet: https://www.adestotech.com/wp-content/uploads/doc8715.pdf
+#define AT25DF081A { \
+        .total_size = (1 << 20), /* 1 MiB */ \
+        .start_up_time_us = 10000, \
+        .manufacturer_id = 0x1f, \
+        .memory_type = 0x45, \
+        .capacity = 0x01, \
+        .max_clock_speed_mhz = 85, \
+        .quad_enable_bit_mask = 0x00, \
+        .has_sector_protection = true, \
+        .supports_fast_read = true, \
+        .supports_qspi = false, \
+        .supports_qspi_writes = false, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Gigadevice GD25Q16C 2MiB SPI flash.
+// Datasheet: http://www.gigadevice.com/datasheet/gd25q16c/
+#define GD25Q16C { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xc8, \
+        .memory_type = 0x40, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 104, /* if we need 120 then we can turn on high performance mode */ \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Gigadevice GD25Q64C 8MiB SPI flash.
+// Datasheet: http://www.elm-tech.com/en/products/spi-flash-memory/gd25q64/gd25q64.pdf
+#define GD25Q64C { \
+        .total_size = (1 << 23), /* 8 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xc8, \
+        .memory_type = 0x40, \
+        .capacity = 0x17, \
+        .max_clock_speed_mhz = 104, /* if we need 120 then we can turn on high performance mode */ \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = true, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Cypress (was Spansion) S25FL064L 8MiB SPI flash.
+// Datasheet: http://www.cypress.com/file/316661/download
+#define S25FL064L { \
+        .total_size = (1 << 23), /* 8 MiB */ \
+        .start_up_time_us = 300, \
+        .manufacturer_id = 0x01, \
+        .memory_type = 0x60, \
+        .capacity = 0x17, \
+        .max_clock_speed_mhz = 108, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Cypress (was Spansion) S25FL116K 2MiB SPI flash.
+// Datasheet: http://www.cypress.com/file/196886/download
+#define S25FL116K { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 10000, \
+        .manufacturer_id = 0x01, \
+        .memory_type = 0x40, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 108, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = false, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Cypress (was Spansion) S25FL216K 2MiB SPI flash.
+// Datasheet: http://www.cypress.com/file/197346/download
+#define S25FL216K { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 10000, \
+        .manufacturer_id = 0x01, \
+        .memory_type = 0x40, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 65, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = false, \
+        .supports_qspi_writes = false, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Winbond W25Q16FW 2MiB SPI flash.
+// Datasheet: https://www.winbond.com/resource-files/w25q16fw%20revj%2005182017%20sfdp.pdf
+#define W25Q16FW { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x60, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Winbond W25Q16JV-IQ 2MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
+// Datasheet: https://www.winbond.com/resource-files/w25q16jv%20spi%20revf%2005092017.pdf
+#define W25Q16JV_IQ { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x40, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Winbond W25Q16JV-IM 2MiB SPI flash. Note that JV-IQ has a different .memory_type (0x40)
+// Datasheet: https://www.winbond.com/resource-files/w25q16jv%20spi%20revf%2005092017.pdf
+#define W25Q16JV_IM { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x70, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+}
+
+// Settings for the Winbond W25Q32BV 4MiB SPI flash.
+// Datasheet: https://www.winbond.com/resource-files/w25q32bv_revi_100413_wo_automotive.pdf
+#define W25Q32BV { \
+        .total_size = (1 << 22), /* 4 MiB */ \
+        .start_up_time_us = 10000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x60, \
+        .capacity = 0x16, \
+        .max_clock_speed_mhz = 104, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = false, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+// Settings for the Winbond W25Q32JV-IM 4MiB SPI flash.
+// Datasheet: https://www.winbond.com/resource-files/w25q32jv%20revg%2003272018%20plus.pdf
+#define W25Q32JV_IM { \
+        .total_size = (1 << 22), /* 4 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x70, \
+        .capacity = 0x16, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+}
+
+// Settings for the Winbond W25Q32JV-IM 4MiB SPI flash.
+// Datasheet: https://www.winbond.com/resource-files/w25q32jv%20revg%2003272018%20plus.pdf
+#define W25Q32JV_IQ { \
+        .total_size = (1 << 22), /* 4 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x40, \
+        .capacity = 0x16, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+}
+
+// Settings for the Winbond W25Q64JV-IM 8MiB SPI flash. Note that JV-IQ has a different .memory_type (0x40)
+// Datasheet: http://www.winbond.com/resource-files/w25q64jv%20revj%2003272018%20plus.pdf
+#define W25Q64JV_IM { \
+        .total_size = (1 << 23), /* 8 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x70, \
+        .capacity = 0x17, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Winbond W25Q64JV-IQ 8MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
+// Datasheet: http://www.winbond.com/resource-files/w25q64jv%20revj%2003272018%20plus.pdf
+#define W25Q64JV_IQ { \
+        .total_size = (1 << 23), /* 8 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x40, \
+        .capacity = 0x17, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Winbond W25Q80DL 1MiB SPI flash.
+// Datasheet: https://www.winbond.com/resource-files/w25q80dv%20dl_revh_10022015.pdf
+#define W25Q80DL { \
+        .total_size = (1 << 20), /* 1 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x60, \
+        .capacity = 0x14, \
+        .max_clock_speed_mhz = 104, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = false, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+
+// Settings for the Winbond W25Q128JV-SQ 16MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
+// Datasheet: https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
+#define W25Q128JV_SQ { \
+        .total_size = (1 << 24), /* 16 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x40, \
+        .capacity = 0x18, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for the Macronix MX25L1606 2MiB SPI flash.
+// Datasheet:
+#define MX25L1606  { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xc2, \
+        .memory_type = 0x20, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 8, \
+        .quad_enable_bit_mask = 0x40, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = true, \
+}
+
+// Settings for the Macronix MX25L3233F 4MiB SPI flash.
+// Datasheet: http://www.macronix.com/Lists/Datasheet/Attachments/7426/MX25L3233F,%203V,%2032Mb,%20v1.6.pdf
+#define MX25L3233F  { \
+        .total_size = (1 << 22), /* 4 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xc2, \
+        .memory_type = 0x20, \
+        .capacity = 0x16, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x40, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = true, \
+}
+
+// Settings for the Macronix MX25R6435F 8MiB SPI flash.
+// Datasheet: http://www.macronix.com/Lists/Datasheet/Attachments/7428/MX25R6435F,%20Wide%20Range,%2064Mb,%20v1.4.pdf
+// By default its in lower power mode which can only do 8mhz. In high power mode it can do 80mhz.
+#define MX25R6435F  { \
+        .total_size = (1 << 23), /* 8 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xc2, \
+        .memory_type = 0x28, \
+        .capacity = 0x17, \
+        .max_clock_speed_mhz = 8, \
+        .quad_enable_bit_mask = 0x40, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = true, \
+}
+
+// Settings for the Winbond W25Q128JV-PM 16MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
+// Datasheet: https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
+#define W25Q128JV_PM { \
+        .total_size = (1 << 24), /* 16 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x70, \
+        .capacity = 0x18, \
+        .max_clock_speed_mhz = 133, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+}
+
+// Settings for the Winbond W25Q32FV 4MiB SPI flash.
+// Datasheet:http://www.winbond.com/resource-files/w25q32fv%20revj%2006032016.pdf?__locale=en
+#define W25Q32FV { \
+        .total_size = (1 << 22), /* 4 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0xef, \
+        .memory_type = 0x40, \
+        .capacity = 0x16, \
+        .max_clock_speed_mhz = 104, \
+        .quad_enable_bit_mask = 0x00, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = false, \
+        .supports_qspi_writes = false, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+
+// Settings for a GENERIC device with the most common setting
+#define GENERIC { \
+        .total_size = (1 << 21), /* 2 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0x00, \
+        .memory_type = 0x40, \
+        .capacity = 0x15, \
+        .max_clock_speed_mhz = 48, \
+        .quad_enable_bit_mask = 0x02, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = false, \
+}
+#endif  // MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
index b78c003b19a5d..a9f7d518e2364 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
@@ -3,3 +3,5 @@
 
 #define MICROPY_HW_XOSC32K          (1)
 #define MICROPY_HW_MCU_OSC32KULP    (1)
+
+#define MICROPY_HW_QSPIFLASH        GD25Q16C
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
index f53481d631917..2f246c60b188c 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
@@ -2,3 +2,5 @@
 #define MICROPY_HW_MCU_NAME   "SAMD51G19A"
 
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
+
+#define MICROPY_HW_QSPIFLASH        GD25Q16C
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.h b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
index 6715a16f01450..2dc403bad60fe 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.h
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "Mini SAM M4"
 #define MICROPY_HW_MCU_NAME   "SAMD51G19A"
+
+#define MICROPY_HW_QSPIFLASH   GD25Q16C
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
index 8260992101c5d..062f69ae4e773 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
@@ -2,3 +2,5 @@
 #define MICROPY_HW_MCU_NAME   "SAMD51P19A"
 
 #define MICROPY_HW_XOSC32K          (1)
+
+#define MICROPY_HW_QSPIFLASH        W25Q32JV_IQ
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
index a51b71c363e18..706fc3c64c37b 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
@@ -8,3 +8,8 @@
 // 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))
+
+// Enabling both two lines below will set the boot file system to
+// the board's external flash.
+#define MICROPY_HW_SPIFLASH         (1)
+#define MICROPY_HW_SPIFLASH_ID      (0)
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
index edab72aaed6a4..3a15ae7f356a9 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -65,6 +65,9 @@ typedef struct _machine_pin_obj_t {
 #define ALT_FCT_TC        4
 #define ALT_FCT_TCC1      5
 #define ALT_FCT_TCC2      6
+#define ALT_FCT_QSPI      7
+#define ALT_FCT_CAN1      7
+#define ALT_FCT_USB       7
 
 #endif
 
diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
new file mode 100644
index 0000000000000..9bb79de5c5a28
--- /dev/null
+++ b/ports/samd/samd_qspiflash.c
@@ -0,0 +1,491 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Adafruit Industries
+ * Copyright (c) 2023 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.
+ *
+ * Port of the Adafruit QSPIflash driver for SAMD devices
+ *
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "modmachine.h"
+#include "extmod/machine_spi.h"
+#include "extmod/vfs.h"
+#include "pin_af.h"
+#include "clock_config.h"
+#include "sam.h"
+
+#ifdef MICROPY_HW_QSPIFLASH
+
+#include "drivers/memory/external_flash_device.h"
+
+// QSPI command codes
+enum
+{
+    QSPI_CMD_READ              = 0x03,
+    QSPI_CMD_READ_4B           = 0x13,
+    QSPI_CMD_QUAD_READ         = 0x6B,// 1 line address, 4 line data
+
+    QSPI_CMD_READ_JEDEC_ID     = 0x9f,
+
+    QSPI_CMD_PAGE_PROGRAM      = 0x02,
+    QSPI_CMD_PAGE_PROGRAM_4B   = 0x12,
+    QSPI_CMD_QUAD_PAGE_PROGRAM = 0x32, // 1 line address, 4 line data
+
+    QSPI_CMD_READ_STATUS       = 0x05,
+    QSPI_CMD_READ_STATUS2      = 0x35,
+
+    QSPI_CMD_WRITE_STATUS      = 0x01,
+    QSPI_CMD_WRITE_STATUS2     = 0x31,
+
+    QSPI_CMD_ENABLE_RESET      = 0x66,
+    QSPI_CMD_RESET             = 0x99,
+
+    QSPI_CMD_WRITE_ENABLE      = 0x06,
+    QSPI_CMD_WRITE_DISABLE     = 0x04,
+
+    QSPI_CMD_ERASE_SECTOR      = 0x20,
+    QSPI_CMD_ERASE_SECTOR_4B   = 0x21,
+    QSPI_CMD_ERASE_BLOCK       = 0xD8,
+    QSPI_CMD_ERASE_CHIP        = 0xC7,
+
+    QSPI_CMD_READ_SFDP_PARAMETER = 0x5A,
+};
+
+// QSPI flash pins are: CS=PB11, SCK=PB10, IO0-IO3=PA08, PA09, PA10 and PA11.
+#define PIN_CS  (43)
+#define PIN_SCK (42)
+#define PIN_IO0 (8)
+#define PIN_IO1 (9)
+#define PIN_IO2 (10)
+#define PIN_IO3 (11)
+
+#define PAGE_SIZE (256)
+#define SECTOR_SIZE (4096)
+
+typedef struct _samd_qspiflash_obj_t {
+    mp_obj_base_t base;
+    uint16_t pagesize;
+    uint16_t sectorsize;
+    uint32_t size;
+    uint8_t phase;
+    uint8_t polarity;
+} samd_qspiflash_obj_t;
+
+/// List of all possible flash devices used by Adafruit boards
+static const external_flash_device possible_devices[] = {
+    MICROPY_HW_QSPIFLASH
+};
+
+#define EXTERNAL_FLASH_DEVICE_COUNT MP_ARRAY_SIZE(possible_devices)
+static external_flash_device const *flash_device;
+static external_flash_device generic_config = GENERIC;
+extern const mp_obj_type_t samd_qspiflash_type;
+
+// The QSPIflash object is a singleton
+static samd_qspiflash_obj_t qspiflash_obj = { { &samd_qspiflash_type } };
+
+// Turn off cache and invalidate all data in it.
+static void samd_peripherals_disable_and_clear_cache(void) {
+    CMCC->CTRL.bit.CEN = 0;
+    while (CMCC->SR.bit.CSTS) {
+    }
+    CMCC->MAINT0.bit.INVALL = 1;
+}
+
+// Enable cache
+static void samd_peripherals_enable_cache(void) {
+    CMCC->CTRL.bit.CEN = 1;
+}
+
+// Run a single QSPI instruction.
+// Parameters are:
+// - command instruction code
+// - iframe iframe register value (configured by caller according to command code)
+// - addr the address to read or write from. If the instruction doesn't require an address, this parameter is meaningless.
+// - buffer pointer to the data to be written or stored depending on the type is Read or Write
+// - size the number of bytes to read or write.
+bool run_instruction(uint8_t command, uint32_t iframe, uint32_t addr, uint8_t *buffer, uint32_t size) {
+
+    samd_peripherals_disable_and_clear_cache();
+
+    uint8_t *qspi_mem = (uint8_t *)QSPI_AHB;
+    if (addr) {
+        qspi_mem += addr;
+    }
+
+    QSPI->INSTRCTRL.bit.INSTR = command;
+    QSPI->INSTRADDR.reg = addr;
+    QSPI->INSTRFRAME.reg = iframe;
+
+    // Dummy read of INSTRFRAME needed to synchronize.
+    // See Instruction Transmission Flow Diagram, figure 37.9, page 995
+    // and Example 4, page 998, section 37.6.8.5.
+    (volatile uint32_t)QSPI->INSTRFRAME.reg;
+
+    if (buffer && size) {
+        uint32_t const tfr_type = iframe & QSPI_INSTRFRAME_TFRTYPE_Msk;
+        if ((tfr_type == QSPI_INSTRFRAME_TFRTYPE_READ) || (tfr_type == QSPI_INSTRFRAME_TFRTYPE_READMEMORY)) {
+            memcpy(buffer, qspi_mem, size);
+        } else {
+            memcpy(qspi_mem, buffer, size);
+        }
+    }
+
+    __asm volatile ("dsb");
+    __asm volatile ("isb");
+
+    QSPI->CTRLA.reg = QSPI_CTRLA_ENABLE | QSPI_CTRLA_LASTXFER;
+    while (!QSPI->INTFLAG.bit.INSTREND) {
+    }
+    QSPI->INTFLAG.reg = QSPI_INTFLAG_INSTREND;
+
+    samd_peripherals_enable_cache();
+    return true;
+}
+
+bool run_command(uint8_t command) {
+    uint32_t iframe = QSPI_INSTRFRAME_WIDTH_SINGLE_BIT_SPI | QSPI_INSTRFRAME_ADDRLEN_24BITS |
+        QSPI_INSTRFRAME_TFRTYPE_READ | QSPI_INSTRFRAME_INSTREN;
+    return run_instruction(command, iframe, 0, NULL, 0);
+}
+
+bool read_command(uint8_t command, uint8_t *response, uint32_t len) {
+    uint32_t iframe = QSPI_INSTRFRAME_WIDTH_SINGLE_BIT_SPI | QSPI_INSTRFRAME_ADDRLEN_24BITS |
+        QSPI_INSTRFRAME_TFRTYPE_READ | QSPI_INSTRFRAME_INSTREN | QSPI_INSTRFRAME_DATAEN;
+    return run_instruction(command, iframe, 0, response, len);
+}
+
+bool read_memory_single(uint8_t command, uint32_t addr, uint8_t *response, uint32_t len) {
+    uint32_t iframe = QSPI_INSTRFRAME_WIDTH_SINGLE_BIT_SPI | QSPI_INSTRFRAME_ADDRLEN_24BITS |
+        QSPI_INSTRFRAME_TFRTYPE_READ | QSPI_INSTRFRAME_INSTREN | QSPI_INSTRFRAME_ADDREN |
+        QSPI_INSTRFRAME_DATAEN | QSPI_INSTRFRAME_DUMMYLEN(8);
+    return run_instruction(command, iframe, addr, response, len);
+}
+
+bool write_command(uint8_t command, uint8_t const *data, uint32_t len) {
+    uint32_t iframe = QSPI_INSTRFRAME_WIDTH_SINGLE_BIT_SPI | QSPI_INSTRFRAME_ADDRLEN_24BITS |
+        QSPI_INSTRFRAME_TFRTYPE_WRITE | QSPI_INSTRFRAME_INSTREN | (data != NULL ? QSPI_INSTRFRAME_DATAEN : 0);
+    return run_instruction(command, iframe, 0, (uint8_t *)data, len);
+}
+
+bool erase_command(uint8_t command, uint32_t address) {
+    // Sector Erase
+    uint32_t iframe = QSPI_INSTRFRAME_WIDTH_SINGLE_BIT_SPI | QSPI_INSTRFRAME_ADDRLEN_24BITS |
+        QSPI_INSTRFRAME_TFRTYPE_WRITE | QSPI_INSTRFRAME_INSTREN | QSPI_INSTRFRAME_ADDREN;
+    return run_instruction(command, iframe, address, NULL, 0);
+}
+
+bool read_memory_quad(uint8_t command, uint32_t addr, uint8_t *data, uint32_t len) {
+    uint32_t iframe = QSPI_INSTRFRAME_WIDTH_QUAD_OUTPUT | QSPI_INSTRFRAME_ADDRLEN_24BITS |
+        QSPI_INSTRFRAME_TFRTYPE_READMEMORY | QSPI_INSTRFRAME_INSTREN | QSPI_INSTRFRAME_ADDREN | QSPI_INSTRFRAME_DATAEN |
+        /*QSPI_INSTRFRAME_CRMODE |*/ QSPI_INSTRFRAME_DUMMYLEN(8);
+    return run_instruction(command, iframe, addr, data, len);
+}
+
+bool write_memory_quad(uint8_t command, uint32_t addr, uint8_t *data, uint32_t len) {
+    uint32_t iframe = QSPI_INSTRFRAME_WIDTH_QUAD_OUTPUT | QSPI_INSTRFRAME_ADDRLEN_24BITS |
+        QSPI_INSTRFRAME_TFRTYPE_WRITEMEMORY | QSPI_INSTRFRAME_INSTREN | QSPI_INSTRFRAME_ADDREN | QSPI_INSTRFRAME_DATAEN;
+    return run_instruction(command, iframe, addr, data, len);
+}
+
+static uint8_t read_status(void) {
+    uint8_t r;
+    read_command(QSPI_CMD_READ_STATUS, &r, 1);
+    return r;
+}
+
+static uint8_t read_status2(void) {
+    uint8_t r;
+    read_command(QSPI_CMD_READ_STATUS2, &r, 1);
+    return r;
+}
+
+static bool write_enable(void) {
+    return run_command(QSPI_CMD_WRITE_ENABLE);
+}
+
+static void wait_for_flash_ready(void) {
+    // both WIP and WREN bit should be clear
+    while (read_status() & 0x03) {
+    }
+}
+
+static uint8_t get_baud(int32_t freq_mhz) {
+    int baud = get_peripheral_freq() / (freq_mhz * 1000000) - 1;
+    if (baud < 1) {
+        baud = 1;
+    }
+    if (baud > 255) {
+        baud = 255;
+    }
+    return baud;
+}
+
+int get_sfdp_table(uint8_t *table, int maxlen) {
+    uint8_t header[16];
+    read_memory_single(QSPI_CMD_READ_SFDP_PARAMETER, 0, header, sizeof(header));
+    int len = MIN(header[11] * 4, maxlen);
+    int addr = header[12] + (header[13] << 8) + (header[14] << 16);
+    read_memory_single(QSPI_CMD_READ_SFDP_PARAMETER, addr, table, len);
+    return len;
+}
+
+STATIC mp_obj_t samd_qspiflash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // The QSPI is a singleton
+    samd_qspiflash_obj_t *self = &qspiflash_obj;
+    self->phase = 0;
+    self->polarity = 0;
+    self->pagesize = PAGE_SIZE;
+    self->sectorsize = SECTOR_SIZE;
+
+    // Enable the device clock
+    MCLK->AHBMASK.reg |= MCLK_AHBMASK_QSPI;
+    MCLK->AHBMASK.reg |= MCLK_AHBMASK_QSPI_2X;
+    MCLK->APBCMASK.reg |= MCLK_APBCMASK_QSPI;
+
+    // Configure the pins.
+    mp_hal_set_pin_mux(PIN_CS, ALT_FCT_QSPI);
+    mp_hal_set_pin_mux(PIN_SCK, ALT_FCT_QSPI);
+    mp_hal_set_pin_mux(PIN_IO0, ALT_FCT_QSPI);
+    mp_hal_set_pin_mux(PIN_IO1, ALT_FCT_QSPI);
+    mp_hal_set_pin_mux(PIN_IO2, ALT_FCT_QSPI);
+    mp_hal_set_pin_mux(PIN_IO3, ALT_FCT_QSPI);
+
+    // Configure the QSPI interface
+    QSPI->CTRLA.bit.SWRST = 1;
+    mp_hal_delay_us(1000);  // Maybe not required.
+
+    QSPI->CTRLB.reg = QSPI_CTRLB_MODE_MEMORY |
+        QSPI_CTRLB_CSMODE_NORELOAD |
+        QSPI_CTRLB_DATALEN_8BITS |
+        QSPI_CTRLB_CSMODE_LASTXFER;
+    // start with low 4Mhz, Mode 0
+    QSPI->BAUD.reg = QSPI_BAUD_BAUD(get_baud(4)) |
+        (self->phase << QSPI_BAUD_CPHA_Pos) |
+        (self->polarity << QSPI_BAUD_CPOL_Pos);
+    QSPI->CTRLA.bit.ENABLE = 1;
+
+    uint8_t jedec_ids[3];
+    read_command(QSPI_CMD_READ_JEDEC_ID, jedec_ids, sizeof(jedec_ids));
+
+    // Read the common sfdp table
+    // Check the device addr length, support of 1-1-4 mode and get the sector size
+    uint8_t sfdp_table[128];
+    int len = get_sfdp_table(sfdp_table, sizeof(sfdp_table));
+    if (len >= 29) {
+        self->sectorsize = 1 << sfdp_table[28];
+        bool addr4b = ((sfdp_table[2] >> 1) & 0x03) == 0x02;
+        bool supports_qspi_114 = (sfdp_table[2] & 0x40) != 0;
+        if (addr4b || !supports_qspi_114) {
+            mp_raise_ValueError(MP_ERROR_TEXT("QSPI mode not supported"));
+        }
+    }
+
+    // Check, if the flash device is known and get it's properties.
+    flash_device = NULL;
+    for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
+        const external_flash_device *possible_device = &possible_devices[i];
+        if (jedec_ids[0] == possible_device->manufacturer_id &&
+            jedec_ids[1] == possible_device->memory_type &&
+            jedec_ids[2] == possible_device->capacity) {
+            flash_device = possible_device;
+            break;
+        }
+    }
+
+    // If the flash device is not known, try generic config options
+    if (flash_device == NULL) {
+        if (jedec_ids[0] == 0xc2) { // Macronix devices
+            generic_config.quad_enable_bit_mask = 0x04;
+            generic_config.single_status_byte = true;
+        }
+        generic_config.total_size = 1 << jedec_ids[2];
+        flash_device = &generic_config;
+    }
+
+    self->size = flash_device->total_size;
+
+    // The write in progress bit should be low.
+    while (read_status() & 0x01) {
+    }
+    // The suspended write/erase bit should be low.
+    while (read_status2() & 0x80) {
+    }
+    run_command(QSPI_CMD_ENABLE_RESET);
+    run_command(QSPI_CMD_RESET);
+    // Wait 30us for the reset
+    mp_hal_delay_us(30);
+    // Speed up the frequency
+    QSPI->BAUD.bit.BAUD = get_baud(flash_device->max_clock_speed_mhz);
+
+    // Enable Quad Mode if available
+    uint8_t status = 0;
+    if (flash_device->quad_enable_bit_mask) {
+        // Verify that QSPI mode is enabled.
+        status = flash_device->single_status_byte ? read_status() : read_status2();
+    }
+
+    // Check the quad enable bit.
+    if ((status & flash_device->quad_enable_bit_mask) == 0) {
+        write_enable();
+        uint8_t full_status[2] = {0x00, flash_device->quad_enable_bit_mask};
+
+        if (flash_device->write_status_register_split) {
+            write_command(QSPI_CMD_WRITE_STATUS2, full_status + 1, 1);
+        } else if (flash_device->single_status_byte) {
+            write_command(QSPI_CMD_WRITE_STATUS, full_status + 1, 1);
+        } else {
+            write_command(QSPI_CMD_WRITE_STATUS, full_status, 2);
+        }
+    }
+    // Turn off writes in case this is a microcontroller only reset.
+    run_command(QSPI_CMD_WRITE_DISABLE);
+    wait_for_flash_ready();
+
+    return self;
+}
+
+STATIC mp_obj_t samd_qspiflash_read(samd_qspiflash_obj_t *self, uint32_t addr, uint8_t *dest, uint32_t len) {
+    if (len > 0) {
+        wait_for_flash_ready();
+        // Command 0x6B 1 line address, 4 line Data
+        // with Continuous Read Mode and Quad output mode, read memory type
+        read_memory_quad(QSPI_CMD_QUAD_READ, addr, dest, len);
+    }
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t samd_qspiflash_write(samd_qspiflash_obj_t *self, uint32_t addr, uint8_t *src, uint32_t len) {
+    uint32_t length = len;
+    uint32_t pos = 0;
+    uint8_t *buf = src;
+
+    while (pos < length) {
+        uint16_t maxsize = self->pagesize - pos % self->pagesize;
+        uint16_t size = (length - pos) > maxsize ? maxsize : length - pos;
+
+        wait_for_flash_ready();
+        write_enable();
+        write_memory_quad(QSPI_CMD_QUAD_PAGE_PROGRAM, addr, buf + pos, size);
+
+        addr += size;
+        pos += size;
+    }
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t samd_qspiflash_erase(uint32_t addr) {
+    wait_for_flash_ready();
+    write_enable();
+    erase_command(QSPI_CMD_ERASE_SECTOR, addr);
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t samd_qspiflash_readblocks(size_t n_args, const mp_obj_t *args) {
+    samd_qspiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
+    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)
+    samd_qspiflash_read(self, offset, bufinfo.buf, bufinfo.len);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_qspiflash_readblocks_obj, 3, 4, samd_qspiflash_readblocks);
+
+STATIC mp_obj_t samd_qspiflash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    samd_qspiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    if (n_args == 3) {
+        samd_qspiflash_erase(offset);
+        // TODO check return value
+    } else {
+        offset += mp_obj_get_int(args[3]);
+    }
+    // Write data to flash (adf4 API)
+    samd_qspiflash_write(self,  offset, bufinfo.buf, bufinfo.len);
+    // TODO check return value
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_qspiflash_writeblocks_obj, 3, 4, samd_qspiflash_writeblocks);
+
+STATIC mp_obj_t samd_qspiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    samd_qspiflash_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->size / self->sectorsize);
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(self->sectorsize);
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            samd_qspiflash_erase(mp_obj_get_int(arg_in) * self->sectorsize);
+            // TODO check return value
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(samd_qspiflash_ioctl_obj, samd_qspiflash_ioctl);
+
+STATIC const mp_rom_map_elem_t samd_qspiflash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&samd_qspiflash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&samd_qspiflash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&samd_qspiflash_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(samd_qspiflash_locals_dict, samd_qspiflash_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    samd_qspiflash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    make_new, samd_qspiflash_make_new,
+    locals_dict, &samd_qspiflash_locals_dict
+    );
+
+#endif // MICROPY_HW_QSPI_FLASH

From 69cb5e8f2ac6ffd1b4e2127eb31321bff240a654 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 24 May 2023 16:19:33 +0200
Subject: [PATCH 0005/3129] samd: Adapt existing samd.Flash and integrate with
 (Q)SPI flash in boot.

Checks are added to ensure, that only one of the flash drivers is selected.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/Makefile         |  2 ++
 ports/samd/modsamd.c        | 13 ++++++++++++-
 ports/samd/modules/_boot.py | 10 +++++-----
 ports/samd/mpconfigport.h   |  5 +++++
 ports/samd/samd_flash.c     | 38 +++++++++++++++----------------------
 5 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 6f7c8fbd85ad3..211607650ba4c 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -113,7 +113,9 @@ SRC_C += \
 	pin_af.c \
 	samd_flash.c \
 	samd_isr.c \
+	samd_qspiflash.c \
 	samd_soc.c \
+	samd_spiflash.c \
 	tusb_port.c \
 
 SHARED_SRC_C += \
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 7593a7bb0da38..307de62af56e8 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -32,7 +32,18 @@
 #include "pin_af.h"
 #include "samd_soc.h"
 
+#if MICROPY_HW_MCUFLASH
 extern const mp_obj_type_t samd_flash_type;
+#define SPIFLASH_TYPE samd_flash_type
+#endif
+#ifdef MICROPY_HW_QSPIFLASH
+extern const mp_obj_type_t samd_qspiflash_type;
+#define SPIFLASH_TYPE samd_qspiflash_type
+#endif
+#if MICROPY_HW_SPIFLASH
+extern const mp_obj_type_t samd_spiflash_type;
+#define SPIFLASH_TYPE samd_spiflash_type
+#endif
 
 STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
     const machine_pin_obj_t *pin_af = pin_find(pin_obj);
@@ -67,7 +78,7 @@ 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(&SPIFLASH_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);
diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py
index e183125f2e4bf..5fe2bc640c584 100644
--- a/ports/samd/modules/_boot.py
+++ b/ports/samd/modules/_boot.py
@@ -2,18 +2,18 @@
 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.
 fs_type = uos.VfsLfs2 if hasattr(uos, "VfsLfs2") else uos.VfsLfs1
 
 try:
-    vfs = fs_type(bdev)
+    vfs = fs_type(bdev, progsize=256)
 except:
-    fs_type.mkfs(bdev)
-    vfs = fs_type(bdev)
+    fs_type.mkfs(bdev, progsize=256)
+    vfs = fs_type(bdev, progsize=256)
 uos.mount(vfs, "/")
 
+del vfs, fs_type, bdev, uos, samd
 gc.collect()
-del uos, vfs, gc
+del gc
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index bf03b5f7bd681..7392b03059079 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -136,6 +136,11 @@
 #define MICROPY_BOARD_PENDSV_ENTRIES
 #endif
 
+// Use internal flash for the file system if no flash file system is selected.
+#if !defined(MICROPY_HW_MCUFLASH) && !defined(MICROPY_HW_QSPIFLASH) && !(defined(MICROPY_HW_SPIFLASH) && defined(MICROPY_HW_SPIFLASH_ID))
+#define MICROPY_HW_MCUFLASH                 (1)
+#endif  // !defined(MICROPY_HW_MCUFLASH) ....
+
 // Miscellaneous settings
 __attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
     __set_PRIMASK(state);
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 6d9ee96895b01..b00b4af6032bf 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -29,7 +29,8 @@
 #include "py/runtime.h"
 #include "extmod/vfs.h"
 #include "samd_soc.h"
-#include "hal_flash.h"
+
+#if MICROPY_HW_MCUFLASH
 
 // ASF 4
 #include "hal_flash.h"
@@ -62,18 +63,9 @@ STATIC samd_flash_obj_t samd_flash_obj = {
     .flash_size = (uint32_t)&_sflash_fs, // Get from MCU-Specific loader script.
 };
 
-// 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) {
+STATIC void samd_flash_init(void) {
     #ifdef SAMD51
     hri_mclk_set_AHBMASK_NVMCTRL_bit(MCLK);
     #endif
@@ -82,9 +74,17 @@ STATIC mp_obj_t samd_flash_init(void) {
     #endif
 
     flash_init(&flash_desc, NVMCTRL);
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_init_obj, samd_flash_init);
+
+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);
+
+    samd_flash_init();
+
+    // Return singleton object.
+    return MP_OBJ_FROM_PTR(&samd_flash_obj);
+}
 
 // Function for ioctl.
 STATIC mp_obj_t eraseblock(uint32_t sector_in) {
@@ -102,14 +102,6 @@ STATIC mp_obj_t samd_flash_version(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_version_obj, samd_flash_version);
 
-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);
-    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_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;
@@ -171,8 +163,6 @@ 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_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) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&samd_flash_ioctl_obj) },
@@ -186,3 +176,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     make_new, samd_flash_make_new,
     locals_dict, &samd_flash_locals_dict
     );
+
+#endif  // MICROPY_HW_MCUFLASH

From db5444f68aaca1bec2c90df0ed5afe36bce94cfc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 24 May 2023 16:21:35 +0200
Subject: [PATCH 0006/3129] samd/boards: Extend the code size limit for boards
 with external flash.

Code size limits are charged to:
- SAMD21:    184K -> 248K
- SAMD51x19: 368K -> 496K
- SAMD51x20: 368K -> 1008K

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk   | 1 +
 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk   | 1 +
 ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk | 1 +
 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk | 1 +
 ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk     | 1 +
 ports/samd/boards/MINISAM_M4/mpconfigboard.mk                    | 1 +
 ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk            | 1 +
 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk    | 1 +
 8 files changed, 8 insertions(+)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
index a760cf047e629..aa3fbd35dacef 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
@@ -6,3 +6,4 @@ TEXT0 = 0x2000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_CODESIZE ?= 248K
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
index 781faa24106dd..70d73ee6fa1b5 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
@@ -6,3 +6,4 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
index a760cf047e629..aa3fbd35dacef 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
@@ -6,3 +6,4 @@ TEXT0 = 0x2000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_CODESIZE ?= 248K
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
index da3e47589ad05..7ef411431d7fb 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
@@ -6,3 +6,4 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
index 238ca0055d6a4..a196612539c21 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
@@ -10,3 +10,4 @@ MICROPY_PY_NETWORK ?= 1
 MICROPY_PY_NETWORK_NINAW10 ?= 1
 
 BOARD_VARIANTS += "wlan"
+MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
index 73afb0210446f..4ccbf92c7e7a9 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
@@ -7,3 +7,4 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
index c2c4da6152738..03f97e138c53c 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
@@ -6,3 +6,4 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
index 9e5cf887dfce3..65b1ba7a33df4 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
@@ -6,3 +6,4 @@ TEXT0 = 0x4000
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_CODESIZE ?= 1008K

From d080d427ebcc263ac6ff792271cec1506e5c81fc Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri, 2 Jun 2023 13:21:39 -0400
Subject: [PATCH 0007/3129] top: Add "mis" to list of ignore words for
 codespell.

Observed with codespell 2.2.5.dev57+gdc7e98d9:

    $ codespell
    ./ports/rp2/machine_uart.c:163: mis ==> miss, mist
    ./ports/rp2/machine_uart.c:168: mis ==> miss, mist
    2
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index a52796860aeef..dfd26bd8c9c3e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ line-length = 99
 [tool.codespell]
 count = ""
 ignore-regex = '\b[A-Z]{3}\b'
-ignore-words-list = "ans,asend,deques,dout,extint,hsi,iput,numer,technic,ure"
+ignore-words-list = "ans,asend,deques,dout,extint,hsi,iput,mis,numer,technic,ure"
 quiet-level = 3
 skip = """
 */build*,\

From 30628d1bb782006c88325a086ddfcd5c2e5ddbb4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 17 Aug 2022 16:18:31 +1000
Subject: [PATCH 0008/3129] all: Rename MP_QSTR_umodule to MP_QSTR_module
 everywhere.

This renames the builtin-modules, such that help('modules') and printing
the module object will show "module" rather than "umodule".

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/uheapq/uheapq.c        | 2 +-
 examples/natmod/urandom/urandom.c      | 2 +-
 examples/natmod/ure/ure.c              | 2 +-
 examples/natmod/uzlib/uzlib.c          | 2 +-
 extmod/modbluetooth.c                  | 4 ++--
 extmod/modlwip.c                       | 2 +-
 extmod/modubinascii.c                  | 4 ++--
 extmod/moducryptolib.c                 | 4 ++--
 extmod/moduhashlib.c                   | 4 ++--
 extmod/moduheapq.c                     | 4 ++--
 extmod/modujson.c                      | 4 ++--
 extmod/moduos.c                        | 6 +++---
 extmod/moduplatform.c                  | 4 ++--
 extmod/modurandom.c                    | 4 ++--
 extmod/modure.c                        | 6 +++---
 extmod/moduselect.c                    | 4 ++--
 extmod/modusocket.c                    | 4 ++--
 extmod/modussl_axtls.c                 | 8 ++++----
 extmod/modussl_mbedtls.c               | 8 ++++----
 extmod/modutime.c                      | 4 ++--
 extmod/modutimeq.c                     | 8 ++++----
 extmod/moduwebsocket.c                 | 4 ++--
 extmod/moduzlib.c                      | 4 ++--
 ports/cc3200/mods/modmachine.c         | 4 ++--
 ports/cc3200/mods/moduhashlib.c        | 2 +-
 ports/cc3200/mods/moduos.c             | 4 ++--
 ports/cc3200/mods/modusocket.c         | 4 ++--
 ports/cc3200/mods/modussl.c            | 6 +++---
 ports/cc3200/mpconfigport.h            | 2 +-
 ports/esp32/modmachine.c               | 4 ++--
 ports/esp32/modsocket.c                | 4 ++--
 ports/esp8266/modmachine.c             | 4 ++--
 ports/mimxrt/modmachine.c              | 4 ++--
 ports/nrf/modules/machine/modmachine.c | 4 ++--
 ports/nrf/modules/uos/moduos.c         | 4 ++--
 ports/qemu-arm/modmachine.c            | 4 ++--
 ports/renesas-ra/README.md             | 4 ++--
 ports/renesas-ra/modmachine.c          | 4 ++--
 ports/renesas-ra/mpconfigport.h        | 2 +-
 ports/rp2/README.md                    | 4 ++--
 ports/rp2/modmachine.c                 | 4 ++--
 ports/samd/modmachine.c                | 4 ++--
 ports/stm32/modmachine.c               | 4 ++--
 ports/stm32/mpconfigport.h             | 2 +-
 ports/unix/modmachine.c                | 4 ++--
 ports/unix/moduselect.c                | 4 ++--
 ports/unix/modusocket.c                | 4 ++--
 ports/zephyr/README.md                 | 4 ++--
 ports/zephyr/modmachine.c              | 4 ++--
 ports/zephyr/modusocket.c              | 4 ++--
 py/modarray.c                          | 4 ++--
 py/modcollections.c                    | 4 ++--
 py/modio.c                             | 4 ++--
 py/modstruct.c                         | 4 ++--
 py/modsys.c                            | 2 +-
 py/moduerrno.c                         | 4 ++--
 56 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c
index 9da6bb4ada4b4..75f00e15cb061 100644
--- a/examples/natmod/uheapq/uheapq.c
+++ b/examples/natmod/uheapq/uheapq.c
@@ -7,7 +7,7 @@
 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
 
-    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_uheapq));
+    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_heapq));
     mp_store_global(MP_QSTR_heappush, MP_OBJ_FROM_PTR(&mod_uheapq_heappush_obj));
     mp_store_global(MP_QSTR_heappop, MP_OBJ_FROM_PTR(&mod_uheapq_heappop_obj));
     mp_store_global(MP_QSTR_heapify, MP_OBJ_FROM_PTR(&mod_uheapq_heapify_obj));
diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c
index e1fed6a554fce..bb41bf3f8ee64 100644
--- a/examples/natmod/urandom/urandom.c
+++ b/examples/natmod/urandom/urandom.c
@@ -16,7 +16,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     yasmarang_n = 69;
     yasmarang_d = 233;
 
-    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_urandom));
+    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_random));
     mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_urandom_getrandbits_obj));
     mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_urandom_seed_obj));
     #if MICROPY_PY_URANDOM_EXTRA_FUNCS
diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
index d4bd680abd428..c51df2a475955 100644
--- a/examples/natmod/ure/ure.c
+++ b/examples/natmod/ure/ure.c
@@ -63,7 +63,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_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.name = MP_QSTR_re;
     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) };
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index 9cf58b10e78e2..06b24f4b8182d 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -27,7 +27,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     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, 2);
 
-    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_uzlib));
+    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_zlib));
     mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_uzlib_decompress_obj));
     mp_store_global(MP_QSTR_DecompIO, MP_OBJ_FROM_PTR(&decompio_type));
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index e65851d6b4bbc..35ba745e318d7 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -985,7 +985,7 @@ STATIC MP_DEFINE_CONST_OBJ_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___name__), MP_ROM_QSTR(MP_QSTR_bluetooth) },
     { 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) },
 
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_bluetooth, mp_module_ubluetooth);
 
 // Helpers
 
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 734722f83a124..19df1ea50308e 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1802,7 +1802,7 @@ const mp_obj_module_t mp_module_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);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);
 
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 45a39c58d443b..85205bc3d131a 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -184,7 +184,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj, 1, 2, mod_bin
 #endif
 
 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___name__), MP_ROM_QSTR(MP_QSTR_binascii) },
     #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) },
@@ -203,6 +203,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);
+MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_ubinascii);
 
 #endif // MICROPY_PY_UBINASCII
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index fc3fcfd90d904..730ae4c6f5d65 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -357,7 +357,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ucryptolib) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
     { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&ucryptolib_aes_type) },
     #if MICROPY_PY_UCRYPTOLIB_CONSTS
     { MP_ROM_QSTR(MP_QSTR_MODE_ECB), MP_ROM_INT(UCRYPTOLIB_MODE_ECB) },
@@ -375,6 +375,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);
+MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_ucryptolib);
 
 #endif // MICROPY_PY_UCRYPTOLIB
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 64e15c444df80..addf094765a85 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -355,7 +355,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 #endif // MICROPY_PY_UHASHLIB_MD5
 
 STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uhashlib) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) },
     #if MICROPY_PY_UHASHLIB_SHA256
     { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&uhashlib_sha256_type) },
     #endif
@@ -374,6 +374,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);
+MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_uhashlib);
 
 #endif // MICROPY_PY_UHASHLIB
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index bfa6ba608d33f..9c3df65258e75 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -105,7 +105,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_uheapq_heapify_obj, mod_uheapq_heapify);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t mp_module_uheapq_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uheapq) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_heapq) },
     { MP_ROM_QSTR(MP_QSTR_heappush), MP_ROM_PTR(&mod_uheapq_heappush_obj) },
     { MP_ROM_QSTR(MP_QSTR_heappop), MP_ROM_PTR(&mod_uheapq_heappop_obj) },
     { MP_ROM_QSTR(MP_QSTR_heapify), MP_ROM_PTR(&mod_uheapq_heapify_obj) },
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_uheapq);
 #endif
 
 #endif // MICROPY_PY_UHEAPQ
diff --git a/extmod/modujson.c b/extmod/modujson.c
index 4e992e2245d18..106595aab6f58 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -367,7 +367,7 @@ STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_loads_obj, mod_ujson_loads);
 
 STATIC const mp_rom_map_elem_t mp_module_ujson_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ujson) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_json) },
     { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_ujson_dump_obj) },
     { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_ujson_dumps_obj) },
     { MP_ROM_QSTR(MP_QSTR_load), MP_ROM_PTR(&mod_ujson_load_obj) },
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_json, mp_module_ujson);
 
 #endif // MICROPY_PY_UJSON
diff --git a/extmod/moduos.c b/extmod/moduos.c
index a245ae7283a54..a7d15ef966d36 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -122,7 +122,7 @@ 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) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
     #if MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV
     { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mp_uos_getenv_obj) },
@@ -141,7 +141,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #if MICROPY_PY_UOS_UNAME
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_uos_uname_obj) },
     #endif
-    #if MICROPY_PY_UOS_URANDOM
+    #if MICROPY_PY_OS_URANDOM
     { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_uos_urandom_obj) },
     #endif
 
@@ -195,6 +195,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);
+MP_REGISTER_MODULE(MP_QSTR_os, mp_module_uos);
 
 #endif // MICROPY_PY_UOS
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 1b35b08aa7214..079e275362e84 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -62,7 +62,7 @@ STATIC mp_obj_t platform_libc_ver(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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___name__), MP_ROM_QSTR(MP_QSTR_platform) },
     { 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) },
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_uplatform);
 
 #endif // MICROPY_PY_UPLATFORM
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index b66162719034b..6b59c0ae39700 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -231,7 +231,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) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random) },
     #if SEED_ON_IMPORT
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_urandom___init___obj) },
     #endif
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_random, mp_module_urandom);
 #endif
 
 #endif // MICROPY_PY_URANDOM
diff --git a/extmod/modure.c b/extmod/modure.c
index 801e5df89779e..c27125bf1c886 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -414,7 +414,7 @@ STATIC MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table);
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     re_type,
-    MP_QSTR_ure,
+    MP_QSTR_re,
     MP_TYPE_FLAG_NONE,
     print, re_print,
     locals_dict, &re_locals_dict
@@ -451,7 +451,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_compile_obj, 1, 2, mod_re_compile);
 
 #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___name__), MP_ROM_QSTR(MP_QSTR_re) },
     { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_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) },
@@ -470,7 +470,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);
+MP_REGISTER_MODULE(MP_QSTR_re, 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 128154a4b6d9a..4df0f4d561a2a 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -355,7 +355,7 @@ STATIC mp_obj_t select_poll(void) {
 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) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_select) },
     #if MICROPY_PY_USELECT_SELECT
     { MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_select_select_obj) },
     #endif
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_select, mp_module_uselect);
 
 #endif // MICROPY_PY_USELECT
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 2aa6010884a00..6d14ebdfb072d 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -616,7 +616,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
 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) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&mod_usocket_getaddrinfo_obj) },
@@ -653,6 +653,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);
+MP_REGISTER_MODULE(MP_QSTR_socket, 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 77e942ec12a8e..393a945facf1f 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -316,9 +316,9 @@ STATIC const mp_stream_p_t ussl_socket_stream_p = {
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ussl_socket_type,
-    MP_QSTR_ussl,
-    MP_TYPE_FLAG_NONE,
     // Save on qstr's, reuse same as for module
+    MP_QSTR_ssl,
+    MP_TYPE_FLAG_NONE,
     print, ussl_socket_print,
     protocol, &ussl_socket_stream_p,
     locals_dict, &ussl_socket_locals_dict
@@ -346,7 +346,7 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socket);
 
 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___name__), MP_ROM_QSTR(MP_QSTR_ssl) },
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
 };
 
@@ -357,6 +357,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);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 74a59fdb67be4..c12c943d8a6d0 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -461,9 +461,9 @@ STATIC const mp_stream_p_t ussl_socket_stream_p = {
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ussl_socket_type,
-    MP_QSTR_ussl,
-    MP_TYPE_FLAG_NONE,
     // Save on qstr's, reuse same as for module
+    MP_QSTR_ssl,
+    MP_TYPE_FLAG_NONE,
     print, socket_print,
     protocol, &ussl_socket_stream_p,
     locals_dict, &ussl_socket_locals_dict
@@ -493,7 +493,7 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socket);
 
 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___name__), MP_ROM_QSTR(MP_QSTR_ssl) },
     { 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) },
@@ -507,6 +507,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);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS
diff --git a/extmod/modutime.c b/extmod/modutime.c
index d82ac6a27c922..5d8148f98ad22 100644
--- a/extmod/modutime.c
+++ b/extmod/modutime.c
@@ -197,7 +197,7 @@ 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);
 
 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___name__), MP_ROM_QSTR(MP_QSTR_time) },
 
     #if MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
     { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mp_utime_localtime_obj) },
@@ -231,6 +231,6 @@ 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);
+MP_REGISTER_MODULE(MP_QSTR_time, mp_module_utime);
 
 #endif // MICROPY_PY_UTIME
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 1a38104eafcdc..4aa572934f9e7 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -211,7 +211,7 @@ STATIC MP_DEFINE_CONST_DICT(utimeq_locals_dict, utimeq_locals_dict_table);
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     utimeq_type,
-    MP_QSTR_utimeq,
+    MP_QSTR_timeq,
     MP_TYPE_FLAG_NONE,
     make_new, utimeq_make_new,
     unary_op, utimeq_unary_op,
@@ -219,8 +219,8 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utimeq) },
-    { MP_ROM_QSTR(MP_QSTR_utimeq), MP_ROM_PTR(&utimeq_type) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_timeq) },
+    { MP_ROM_QSTR(MP_QSTR_timeq), MP_ROM_PTR(&utimeq_type) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_utimeq_globals, mp_module_utimeq_globals_table);
@@ -230,6 +230,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);
+MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_utimeq);
 
 #endif // MICROPY_PY_UTIMEQ
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 9b12fc86358cd..ca7152bb13c17 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -300,7 +300,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uwebsocket) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_websocket) },
     { MP_ROM_QSTR(MP_QSTR_websocket), MP_ROM_PTR(&websocket_type) },
 };
 
@@ -311,6 +311,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);
+MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_uwebsocket);
 
 #endif // MICROPY_PY_UWEBSOCKET
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 14d15321a3c1e..f41ca2b012935 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -211,7 +211,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_uzlib_decompress_obj, 1, 3, mod_u
 
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t mp_module_uzlib_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uzlib) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) },
     { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&mod_uzlib_decompress_obj) },
     { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) },
 };
@@ -224,7 +224,7 @@ const mp_obj_module_t mp_module_uzlib = {
 };
 
 
-MP_REGISTER_MODULE(MP_QSTR_uzlib, mp_module_uzlib);
+MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_uzlib);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 3e483e0a23d2d..c5b06f507778d 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -162,7 +162,7 @@ STATIC mp_obj_t machine_wake_reason (void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_wake_reason_obj, machine_wake_reason);
 
 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___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
 
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
 #ifdef DEBUG
@@ -214,5 +214,5 @@ 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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 MP_REGISTER_ROOT_POINTER(mp_obj_t machine_config_main);
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/moduhashlib.c
index 302ff335ff862..5424a6c0fb4c2 100644
--- a/ports/cc3200/mods/moduhashlib.c
+++ b/ports/cc3200/mods/moduhashlib.c
@@ -194,7 +194,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),    MP_ROM_QSTR(MP_QSTR_uhashlib) },
+    { MP_ROM_QSTR(MP_QSTR___name__),    MP_ROM_QSTR(MP_QSTR_hashlib) },
     //{ MP_ROM_QSTR(MP_QSTR_md5),         MP_ROM_PTR(&md5_type) },
     { MP_ROM_QSTR(MP_QSTR_sha1),        MP_ROM_PTR(&sha1_type) },
     { MP_ROM_QSTR(MP_QSTR_sha256),      MP_ROM_PTR(&sha256_type) },
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index e284e9eb1ffb4..b3f3bbf8d8b37 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -146,7 +146,7 @@ STATIC mp_obj_t os_dupterm(uint n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_dupterm_obj, 0, 1, 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) },
+    { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_os) },
 
     { MP_ROM_QSTR(MP_QSTR_uname),           MP_ROM_PTR(&os_uname_obj) },
 
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_os, mp_module_uos);
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index cd1489fb4ae5a..311a4395fb073 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -795,7 +795,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_usocket_getaddrinfo_obj, 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) },
+    { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket),          MP_ROM_PTR(&socket_type) },
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo),     MP_ROM_PTR(&mod_usocket_getaddrinfo_obj) },
@@ -818,4 +818,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);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket);
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index 118cbd06f8fad..e2de7b05cbc0a 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -62,7 +62,7 @@ STATIC const mp_obj_type_t ssl_socket_type;
 // locals and stream methods
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ssl_socket_type,
-    MP_QSTR_ussl,
+    MP_QSTR_ssl,
     MP_TYPE_FLAG_NONE,
     protocol, &socket_stream_p,
     locals_dict, &socket_locals_dict
@@ -136,7 +136,7 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 0, mod_ssl_wrap_socket);
 
 STATIC const mp_rom_map_elem_t mp_module_ussl_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_ussl) },
+    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_ssl) },
     { MP_ROM_QSTR(MP_QSTR_wrap_socket),         MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
 
     // class exceptions
@@ -160,4 +160,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);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index cb71a28f34e01..6bdaa9b553079 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -136,7 +136,7 @@
 
 // extra constants
 #define MICROPY_PORT_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) },  \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 37d4f424d4216..a863f716c717d 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -272,7 +272,7 @@ 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 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___name__), MP_ROM_QSTR(MP_QSTR_machine) },
 
     { MP_ROM_QSTR(MP_QSTR_mem8), MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16), MP_ROM_PTR(&machine_mem16_obj) },
@@ -353,6 +353,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 9812eb347689c..5e07d1f4f5d95 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -844,7 +844,7 @@ STATIC mp_obj_t esp_socket_initialize() {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_socket_initialize_obj, esp_socket_initialize);
 
 STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usocket) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&esp_socket_initialize_obj) },
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&esp_socket_getaddrinfo_obj) },
@@ -872,4 +872,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);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket);
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 3c75a2d7ffda6..383f46dda70db 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -396,7 +396,7 @@ mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t
 }
 
 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___name__), MP_ROM_QSTR(MP_QSTR_machine) },
     { 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) },
@@ -456,6 +456,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 7b00470cca533..098c3b949a23e 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -130,7 +130,7 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
 
 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___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
     { 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) },
@@ -185,6 +185,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index b080a526cf7bd..b7cbdc7b2dab9 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -205,7 +205,7 @@ STATIC mp_obj_t machine_disable_irq(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_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___name__),           MP_ROM_QSTR(MP_QSTR_machine) },
     { 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) },
@@ -266,6 +266,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index 402096aacd789..bb4901270786d 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -138,7 +138,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_dupterm_obj, 0, 1, os_dupterm);
 #endif // MICROPY_PY_MACHINE_UART
 
 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___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
 
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_os, mp_module_uos);
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 515452f41d2c3..1f9151ff74178 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -31,7 +31,7 @@
 #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___name__), MP_ROM_QSTR(MP_QSTR_machine) },
 
     { MP_ROM_QSTR(MP_QSTR_mem8), MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16), MP_ROM_PTR(&machine_mem16_obj) },
@@ -48,6 +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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
index 896d465d2d02f..1e5e2ed0cf48d 100644
--- a/ports/renesas-ra/README.md
+++ b/ports/renesas-ra/README.md
@@ -4,8 +4,8 @@ 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.
+- `time` module with sleep, time, and ticks functions.
+- `os` 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.
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index ecb028983c6c4..07e6103aaac78 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -251,7 +251,7 @@ STATIC mp_obj_t machine_reset_cause(void) {
 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___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
     { 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) },
@@ -307,6 +307,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 7dbe941c0e257..42834c1fbc7fa 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -139,7 +139,7 @@
 
 #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) }, \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
 #else
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
diff --git a/ports/rp2/README.md b/ports/rp2/README.md
index 078919ce81940..3f152b8181f98 100644
--- a/ports/rp2/README.md
+++ b/ports/rp2/README.md
@@ -6,8 +6,8 @@ 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.
+- `time` module with sleep, time and ticks functions.
+- `os` 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.
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 81154c94cecad..61b91bda0a70d 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -229,7 +229,7 @@ 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 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___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
     { 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) },
@@ -278,6 +278,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 58ca895b45b6c..7e231b28b45ea 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -224,7 +224,7 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 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___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
     { 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) },
@@ -297,6 +297,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index dee9689e3bab3..e6eb73f9cb1dd 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -386,7 +386,7 @@ 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___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
     { 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) },
@@ -471,6 +471,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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index fd5254082d5e9..62784dccf1012 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -170,7 +170,7 @@ extern const struct _mp_obj_module_t stm_module;
 
 #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) }, \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
 #else
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 542ff50025fbc..29ac532d2b0bf 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -86,7 +86,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 #endif
 
 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___name__), MP_ROM_QSTR(MP_QSTR_machine) },
 
     { MP_ROM_QSTR(MP_QSTR_mem8), MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16), MP_ROM_PTR(&machine_mem16_obj) },
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 8f71813e70aec..9b205d333fb73 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -336,7 +336,7 @@ STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_poll_obj, 0, 1, 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) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_select) },
     { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&mp_select_poll_obj) },
     { MP_ROM_QSTR(MP_QSTR_POLLIN), MP_ROM_INT(POLLIN) },
     { MP_ROM_QSTR(MP_QSTR_POLLOUT), MP_ROM_INT(POLLOUT) },
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_select, mp_module_uselect);
 
 #endif // MICROPY_PY_USELECT_POSIX
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index a32fc60163136..2d4eeec346d87 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -674,7 +674,7 @@ STATIC mp_obj_t mod_socket_sockaddr(mp_obj_t sockaddr_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_socket_sockaddr_obj, mod_socket_sockaddr);
 
 STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usocket) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_type_socket) },
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&mod_socket_getaddrinfo_obj) },
     { MP_ROM_QSTR(MP_QSTR_inet_pton), MP_ROM_PTR(&mod_socket_inet_pton_obj) },
@@ -708,6 +708,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);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
 
 #endif // MICROPY_PY_SOCKET
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index f9bd45344b322..3de793b2fece0 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -12,11 +12,11 @@ should work with MicroPython (but not all were tested).
 Features supported at this time:
 
 * REPL (interactive prompt) over Zephyr UART console.
-* `utime` module for time measurements and delays.
+* `time` 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).
+* `socket` 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.
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 95a66c51199b1..6f4bbbdab61e8 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -61,7 +61,7 @@ STATIC mp_obj_t machine_idle(void) {
 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) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
     #ifdef CONFIG_REBOOT
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) },
     #endif
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index c79f73a9d2759..98dff7e8e8026 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -449,7 +449,7 @@ STATIC mp_obj_t pkt_get_info(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(pkt_get_info_obj, pkt_get_info);
 
 STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usocket) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
     // objects
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
     // class constants
@@ -473,6 +473,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);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket);
 
 #endif // MICROPY_PY_USOCKET
diff --git a/py/modarray.c b/py/modarray.c
index d9f7a0452886d..c91e92f798bf3 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -29,7 +29,7 @@
 #if MICROPY_PY_ARRAY
 
 STATIC const mp_rom_map_elem_t mp_module_array_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uarray) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_array) },
     { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_type_array) },
 };
 
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_array, mp_module_uarray);
 
 #endif
diff --git a/py/modcollections.c b/py/modcollections.c
index 8c62f34db7ef3..a56fe069eaa77 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -29,7 +29,7 @@
 #if MICROPY_PY_COLLECTIONS
 
 STATIC const mp_rom_map_elem_t mp_module_collections_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ucollections) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_collections) },
     #if MICROPY_PY_COLLECTIONS_DEQUE
     { MP_ROM_QSTR(MP_QSTR_deque), MP_ROM_PTR(&mp_type_deque) },
     #endif
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_collections, mp_module_collections);
 
 #endif // MICROPY_PY_COLLECTIONS
diff --git a/py/modio.c b/py/modio.c
index 9ec6bbcc4ecd4..3462611d71928 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -203,7 +203,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 #endif // MICROPY_PY_IO_BUFFEREDWRITER
 
 STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uio) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io) },
     // Note: mp_builtin_open_obj should be defined by port, it's not
     // part of the core.
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
@@ -226,6 +226,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);
+MP_REGISTER_MODULE(MP_QSTR_io, mp_module_io);
 
 #endif
diff --git a/py/modstruct.c b/py/modstruct.c
index ec86d4b9c2976..78c7d53e4bb89 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -251,7 +251,7 @@ STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX, struct_pack_into);
 
 STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ustruct) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_struct) },
     { MP_ROM_QSTR(MP_QSTR_calcsize), MP_ROM_PTR(&struct_calcsize_obj) },
     { MP_ROM_QSTR(MP_QSTR_pack), MP_ROM_PTR(&struct_pack_obj) },
     { MP_ROM_QSTR(MP_QSTR_pack_into), MP_ROM_PTR(&struct_pack_into_obj) },
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_struct, mp_module_ustruct);
 
 #endif
diff --git a/py/modsys.c b/py/modsys.c
index 35af761a08f12..09bdfefc63475 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -294,7 +294,7 @@ 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);
+MP_REGISTER_MODULE(MP_QSTR_sys, 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.
diff --git a/py/moduerrno.c b/py/moduerrno.c
index 1b16fd9d9ed71..e197f921e1522 100644
--- a/py/moduerrno.c
+++ b/py/moduerrno.c
@@ -82,7 +82,7 @@ STATIC const mp_obj_dict_t errorcode_dict = {
 #endif
 
 STATIC const mp_rom_map_elem_t mp_module_uerrno_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uerrno) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_errno) },
     #if MICROPY_PY_UERRNO_ERRORCODE
     { MP_ROM_QSTR(MP_QSTR_errorcode), MP_ROM_PTR(&errorcode_dict) },
     #endif
@@ -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);
+MP_REGISTER_MODULE(MP_QSTR_errno, mp_module_uerrno);
 
 qstr mp_errno_to_str(mp_obj_t errno_val) {
     #if MICROPY_PY_UERRNO_ERRORCODE

From dfe232d0003b9f381643050c06c547fc3093e9e1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 17 Aug 2022 16:21:03 +1000
Subject: [PATCH 0009/3129] py/builtinimport: Remove weak links.

In order to keep "import umodule" working, the existing mechanism is
replaced with a simple fallback to drop the "u".

This makes importing of built-ins no longer touch the filesystem, which
makes a typical built-in import take ~0.15ms rather than 3-5ms.

(Weak links were added in c14a81662c1df812c0c6b4299f97966302f16477)

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/develop/porting.rst     |  3 ---
 ports/cc3200/mpconfigport.h  |  1 -
 ports/nrf/mpconfigport.h     |  1 -
 ports/samd/mpconfigport.h    |  1 -
 ports/windows/mpconfigport.h |  1 -
 ports/zephyr/mpconfigport.h  |  1 -
 py/builtinimport.c           | 50 ++++--------------------------------
 py/mpconfig.h                |  5 ----
 py/objmodule.c               |  1 -
 9 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index fab8a751b8495..63919b97a6ccd 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -151,9 +151,6 @@ 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)
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 6bdaa9b553079..aa78005d68bc8 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -71,7 +71,6 @@
 #define MICROPY_FATFS_SYNC_T                        SemaphoreHandle_t
 
 #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_VFS                                 (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 23f7e560dc542..3d482f4fe1f30 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -137,7 +137,6 @@
 #define MICROPY_PY_UOS              (0)
 
 #define MICROPY_STREAMS_NON_BLOCK   (1)
-#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
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 7392b03059079..a0a58a2fd728c 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -59,7 +59,6 @@
 #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_ENABLE_USBDEV            (1)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index fd3a76408cd75..5e56923d93b34 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -72,7 +72,6 @@
 #endif
 #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)
 #ifndef MICROPY_ENABLE_SCHEDULER
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index d3ef4375c7f21..30ccccb6272f5 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -69,7 +69,6 @@
 #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)
 #ifdef CONFIG_NETWORKING
 // If we have networking, we likely want errno comfort
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 8827be612330a..299877de639a1 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -45,15 +45,6 @@
 #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.
@@ -391,13 +382,8 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
     if (outer_module_obj == MP_OBJ_NULL) {
         DEBUG_printf("Searching for top-level module\n");
 
-        // An exact match of a built-in will always bypass the filesystem.
-        // Note that CPython-compatible built-ins are named e.g. utime, so this
-        // means that an exact match is only for `import utime`, so `import
-        // time` will search the filesystem and failing that hit the weak
-        // link handling below. Whereas micropython-specific built-ins like
-        // `micropython`, `pyb`, `network`, etc will match exactly and cannot
-        // be overridden by the filesystem.
+        // An import of a non-extensible built-in will always bypass the
+        // filesystem. e.g. `import micropython` or `import pyb`.
         module_obj = mp_module_get_builtin(level_mod_name);
         if (module_obj != MP_OBJ_NULL) {
             return module_obj;
@@ -417,20 +403,9 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
         // relative to all the locations in sys.path.
         stat = stat_top_level(level_mod_name, &path);
 
-        #if MICROPY_MODULE_WEAK_LINKS
-        if (stat == MP_IMPORT_STAT_NO_EXIST) {
-            // No match on the filesystem. (And not a built-in either).
-            // If "foo" was requested, then try "ufoo" as a built-in. This
-            // allows `import time` to use built-in `utime`, unless `time`
-            // exists on the filesystem. This feature was formerly known
-            // as "weak links".
-            qstr umodule_name = make_weak_link_name(&path, level_mod_name);
-            module_obj = mp_module_get_builtin(umodule_name);
-            if (module_obj != MP_OBJ_NULL) {
-                return module_obj;
-            }
-        }
-        #endif
+        // TODO: If stat failed, now try extensible built-in modules.
+
+        // TODO: If importing `ufoo`, try `foo`.
     } else {
         DEBUG_printf("Searching for sub-module\n");
 
@@ -667,21 +642,6 @@ mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
         return module_obj;
     }
 
-    #if MICROPY_MODULE_WEAK_LINKS
-    // Check if the u-prefixed name is a built-in.
-    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_builtin(umodule_name_qstr);
-    if (module_obj != MP_OBJ_NULL) {
-        return module_obj;
-    }
-    #elif MICROPY_PY_SYS
-    // Special handling to make `import sys` work even if weak links aren't enabled.
-    if (module_name_qstr == MP_QSTR_sys) {
-        return MP_OBJ_FROM_PTR(&mp_module_sys);
-    }
-    #endif
-
     // Couldn't find the module, so fail
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
diff --git a/py/mpconfig.h b/py/mpconfig.h
index afef744ab5b01..9f4d88ec09ddd 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -871,11 +871,6 @@ typedef double mp_float_t;
 #define MICROPY_MODULE_GETATTR (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
-// Whether module weak links are supported
-#ifndef MICROPY_MODULE_WEAK_LINKS
-#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
diff --git a/py/objmodule.c b/py/objmodule.c
index 7326fbe2d1273..e63fb18a1eac0 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -169,7 +169,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     // builtin modules declared with MP_REGISTER_MODULE()
     MICROPY_REGISTERED_MODULES
 };
-
 MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
 
 // Attempts to find (and initialise) a builtin, otherwise returns

From 1bf2dcb15ecf4ba37211327f4378b164a5aaf567 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 14:47:56 +1000
Subject: [PATCH 0010/3129] all: Rename mp_umodule*, mp_module_umodule* to
 remove the "u" prefix.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/misc.h                                | 16 ++---
 extmod/modbluetooth.c                        |  4 +-
 extmod/modubinascii.c                        |  4 +-
 extmod/moducryptolib.c                       | 10 +--
 extmod/moduhashlib.c                         | 10 +--
 extmod/moduheapq.c                           | 10 +--
 extmod/modujson.c                            | 10 +--
 extmod/moduos.c                              | 66 ++++++++++----------
 extmod/moduplatform.c                        |  4 +-
 extmod/modurandom.c                          | 10 +--
 extmod/modure.c                              |  4 +-
 extmod/moduselect.c                          |  4 +-
 extmod/modusocket.c                          | 10 +--
 extmod/modussl_axtls.c                       |  4 +-
 extmod/modussl_mbedtls.c                     |  4 +-
 extmod/modutime.c                            | 60 +++++++++---------
 extmod/modutime.h                            | 20 +++---
 extmod/modutimeq.c                           | 10 +--
 extmod/moduwebsocket.c                       |  4 +-
 extmod/moduzlib.c                            | 10 +--
 extmod/uos_dupterm.c                         | 26 ++++----
 extmod/utime_mphal.c                         |  0
 ports/cc3200/mods/moduhashlib.c              |  2 +-
 ports/cc3200/mods/moduos.c                   |  4 +-
 ports/cc3200/mods/modusocket.c               | 10 +--
 ports/cc3200/mods/modussl.c                  | 10 +--
 ports/cc3200/mods/modutime.c                 |  4 +-
 ports/esp32/modsocket.c                      |  4 +-
 ports/esp32/moduos.c                         | 10 +--
 ports/esp32/modutime.c                       |  4 +-
 ports/esp32/mphalport.c                      |  2 +-
 ports/esp8266/esp_mphal.c                    |  6 +-
 ports/esp8266/main.c                         |  2 +-
 ports/esp8266/moduos.c                       | 12 ++--
 ports/esp8266/modutime.c                     |  4 +-
 ports/mimxrt/moduos.c                        | 10 +--
 ports/mimxrt/modutime.c                      |  4 +-
 ports/mimxrt/mphalport.c                     |  6 +-
 ports/nrf/modules/uos/moduos.c               |  4 +-
 ports/renesas-ra/moduos.c                    |  4 +-
 ports/renesas-ra/modutime.c                  |  4 +-
 ports/renesas-ra/mphalport.c                 |  6 +-
 ports/rp2/moduos.c                           |  4 +-
 ports/rp2/modutime.c                         |  4 +-
 ports/rp2/mphalport.c                        |  6 +-
 ports/samd/moduos.c                          | 12 ++--
 ports/samd/modutime.c                        |  4 +-
 ports/samd/mphalport.c                       |  6 +-
 ports/stm32/modpyb.c                         | 10 +--
 ports/stm32/moduos.c                         |  8 +--
 ports/stm32/modutime.c                       |  4 +-
 ports/stm32/mphalport.c                      |  6 +-
 ports/stm32/portmodules.h                    |  4 +-
 ports/unix/main.c                            |  2 +-
 ports/unix/moduos.c                          | 24 +++----
 ports/unix/moduselect.c                      |  4 +-
 ports/unix/modutime.c                        |  4 +-
 ports/unix/mpconfigport.h                    |  2 +-
 ports/unix/unix_mphal.c                      |  2 +-
 ports/unix/variants/mpconfigvariant_common.h |  2 +-
 ports/zephyr/modusocket.c                    | 10 +--
 ports/zephyr/modutime.c                      |  2 +-
 py/builtin.h                                 |  2 +-
 py/modarray.c                                |  4 +-
 py/modstruct.c                               |  4 +-
 py/moduerrno.c                               | 16 ++---
 py/parse.c                                   |  2 +-
 67 files changed, 280 insertions(+), 280 deletions(-)
 create mode 100644 extmod/utime_mphal.c

diff --git a/extmod/misc.h b/extmod/misc.h
index a9392aa10b7b3..80e5b59a08ee1 100644
--- a/extmod/misc.h
+++ b/extmod/misc.h
@@ -32,17 +32,17 @@
 #include <stddef.h>
 #include "py/runtime.h"
 
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_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);
-void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc);
+bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream);
+void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached);
+uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags);
+int mp_os_dupterm_rx_chr(void);
+void mp_os_dupterm_tx_strn(const char *str, size_t len);
+void mp_os_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc);
 #else
-#define mp_uos_dupterm_tx_strn(s, l)
+#define mp_os_dupterm_tx_strn(s, l)
 #endif
 
 #endif // MICROPY_INCLUDED_EXTMOD_MISC_H
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 35ba745e318d7..628c643a586f8 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -999,12 +999,12 @@ STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_bluetooth_globals, mp_module_bluetooth_globals_table);
 
-const mp_obj_module_t mp_module_ubluetooth = {
+const mp_obj_module_t mp_module_bluetooth = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_bluetooth_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_bluetooth, mp_module_ubluetooth);
+MP_REGISTER_MODULE(MP_QSTR_bluetooth, mp_module_bluetooth);
 
 // Helpers
 
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 85205bc3d131a..bfb8195d91909 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -198,11 +198,11 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globals_table);
 
-const mp_obj_module_t mp_module_ubinascii = {
+const mp_obj_module_t mp_module_binascii = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_binascii_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_ubinascii);
+MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_binascii);
 
 #endif // MICROPY_PY_UBINASCII
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index 730ae4c6f5d65..e727f50548af6 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -356,7 +356,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &ucryptolib_aes_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
     { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&ucryptolib_aes_type) },
     #if MICROPY_PY_UCRYPTOLIB_CONSTS
@@ -368,13 +368,13 @@ STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ucryptolib_globals, mp_module_ucryptolib_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_cryptolib_globals, mp_module_cryptolib_globals_table);
 
-const mp_obj_module_t mp_module_ucryptolib = {
+const mp_obj_module_t mp_module_cryptolib = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_ucryptolib_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_cryptolib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_ucryptolib);
+MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_cryptolib);
 
 #endif // MICROPY_PY_UCRYPTOLIB
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index addf094765a85..ef1a29fc78952 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -354,7 +354,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif // MICROPY_PY_UHASHLIB_MD5
 
-STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) },
     #if MICROPY_PY_UHASHLIB_SHA256
     { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&uhashlib_sha256_type) },
@@ -367,13 +367,13 @@ STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_uhashlib_globals, mp_module_uhashlib_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
 
-const mp_obj_module_t mp_module_uhashlib = {
+const mp_obj_module_t mp_module_hashlib = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uhashlib_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_hashlib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_uhashlib);
+MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_hashlib);
 
 #endif // MICROPY_PY_UHASHLIB
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 9c3df65258e75..fb6cb81182e62 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -104,21 +104,21 @@ STATIC mp_obj_t mod_uheapq_heapify(mp_obj_t heap_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_uheapq_heapify_obj, mod_uheapq_heapify);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_uheapq_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_heapq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_heapq) },
     { MP_ROM_QSTR(MP_QSTR_heappush), MP_ROM_PTR(&mod_uheapq_heappush_obj) },
     { MP_ROM_QSTR(MP_QSTR_heappop), MP_ROM_PTR(&mod_uheapq_heappop_obj) },
     { MP_ROM_QSTR(MP_QSTR_heapify), MP_ROM_PTR(&mod_uheapq_heapify_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_uheapq_globals, mp_module_uheapq_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_heapq_globals, mp_module_heapq_globals_table);
 
-const mp_obj_module_t mp_module_uheapq = {
+const mp_obj_module_t mp_module_heapq = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uheapq_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_heapq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_uheapq);
+MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_heapq);
 #endif
 
 #endif // MICROPY_PY_UHEAPQ
diff --git a/extmod/modujson.c b/extmod/modujson.c
index 106595aab6f58..44dd316b699e3 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -366,7 +366,7 @@ STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_loads_obj, mod_ujson_loads);
 
-STATIC const mp_rom_map_elem_t mp_module_ujson_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_json_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_json) },
     { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_ujson_dump_obj) },
     { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_ujson_dumps_obj) },
@@ -374,13 +374,13 @@ STATIC const mp_rom_map_elem_t mp_module_ujson_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_loads), MP_ROM_PTR(&mod_ujson_loads_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ujson_globals, mp_module_ujson_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_json_globals, mp_module_json_globals_table);
 
-const mp_obj_module_t mp_module_ujson = {
+const mp_obj_module_t mp_module_json = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_ujson_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_json_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_json, mp_module_ujson);
+MP_REGISTER_MODULE(MP_QSTR_json, mp_module_json);
 
 #endif // MICROPY_PY_UJSON
diff --git a/extmod/moduos.c b/extmod/moduos.c
index a7d15ef966d36..8c40f45370306 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -65,7 +65,7 @@
 #if MICROPY_PY_UOS_SYNC
 // sync()
 // Sync all filesystems.
-STATIC mp_obj_t mp_uos_sync(void) {
+STATIC mp_obj_t mp_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
@@ -74,7 +74,7 @@ STATIC mp_obj_t mp_uos_sync(void) {
     #endif
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_os_sync_obj, mp_os_sync);
 #endif
 
 #if MICROPY_PY_UOS_UNAME
@@ -85,39 +85,39 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
 #define CONST_RELEASE const
 #endif
 
-STATIC const qstr mp_uos_uname_info_fields[] = {
+STATIC const qstr mp_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(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_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);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC CONST_RELEASE MP_DEFINE_STR_OBJ(mp_os_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_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,
+    mp_os_uname_info_obj,
+    mp_os_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)
+    MP_ROM_PTR(&mp_os_uname_info_sysname_obj),
+    MP_ROM_PTR(&mp_os_uname_info_nodename_obj),
+    MP_ROM_PTR(&mp_os_uname_info_release_obj),
+    MP_ROM_PTR(&mp_os_uname_info_version_obj),
+    MP_ROM_PTR(&mp_os_uname_info_machine_obj)
     );
 
-STATIC mp_obj_t mp_uos_uname(void) {
+STATIC mp_obj_t mp_os_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;
+    const char *release = mp_os_uname_release();
+    mp_os_uname_info_release_obj.len = strlen(release);
+    mp_os_uname_info_release_obj.data = (const byte *)release;
     #endif
-    return MP_OBJ_FROM_PTR(&mp_uos_uname_info_obj);
+    return MP_OBJ_FROM_PTR(&mp_os_uname_info_obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_uname_obj, mp_uos_uname);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_os_uname_obj, mp_os_uname);
 
 #endif
 
@@ -125,24 +125,24 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
     #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) },
+    { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mp_os_getenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mp_os_putenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mp_os_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) },
+    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_os_sync_obj) },
     #endif
     #if MICROPY_PY_UOS_SYSTEM
-    { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mp_uos_system_obj) },
+    { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mp_os_system_obj) },
     #endif
     #if MICROPY_PY_UOS_UNAME
-    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_uos_uname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_os_uname_obj) },
     #endif
     #if MICROPY_PY_OS_URANDOM
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_uos_urandom_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_os_urandom_obj) },
     #endif
 
     #if MICROPY_VFS
@@ -161,13 +161,13 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     // 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), MP_ROM_PTR(&mp_os_dupterm_obj) },
     #endif
     #if MICROPY_PY_UOS_DUPTERM_NOTIFY
-    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_uos_dupterm_notify_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_os_dupterm_notify_obj) },
     #endif
     #if MICROPY_PY_UOS_ERRNO
-    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_uos_errno_obj) },
+    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_os_errno_obj) },
     #endif
 
     #if MICROPY_VFS
@@ -190,11 +190,11 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
 
-const mp_obj_module_t mp_module_uos = {
+const mp_obj_module_t mp_module_os = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_os, mp_module_uos);
+MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
 
 #endif // MICROPY_PY_UOS
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 079e275362e84..791ae8344d95c 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -70,11 +70,11 @@ STATIC const mp_rom_map_elem_t modplatform_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(modplatform_globals, modplatform_globals_table);
 
-const mp_obj_module_t mp_module_uplatform = {
+const mp_obj_module_t mp_module_platform = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&modplatform_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_uplatform);
+MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_platform);
 
 #endif // MICROPY_PY_UPLATFORM
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 6b59c0ae39700..86e3a872c5551 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -230,7 +230,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom___init___obj, mod_urandom___init__)
 #endif
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_urandom_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random) },
     #if SEED_ON_IMPORT
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_urandom___init___obj) },
@@ -248,14 +248,14 @@ STATIC const mp_rom_map_elem_t mp_module_urandom_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_urandom_globals, mp_module_urandom_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_random_globals, mp_module_random_globals_table);
 
-const mp_obj_module_t mp_module_urandom = {
+const mp_obj_module_t mp_module_random = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_urandom_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_random_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_random, mp_module_urandom);
+MP_REGISTER_MODULE(MP_QSTR_random, mp_module_random);
 #endif
 
 #endif // MICROPY_PY_URANDOM
diff --git a/extmod/modure.c b/extmod/modure.c
index c27125bf1c886..4798f07b0beb6 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -465,12 +465,12 @@ STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_re_globals, mp_module_re_globals_table);
 
-const mp_obj_module_t mp_module_ure = {
+const mp_obj_module_t mp_module_re = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_re_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_re, mp_module_ure);
+MP_REGISTER_MODULE(MP_QSTR_re, mp_module_re);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 4df0f4d561a2a..5bb5f4f48df2c 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -368,11 +368,11 @@ STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
 
-const mp_obj_module_t mp_module_uselect = {
+const mp_obj_module_t mp_module_select = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_select, mp_module_uselect);
+MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
 
 #endif // MICROPY_PY_USELECT
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 6d14ebdfb072d..6c2b4ff06fdeb 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -615,7 +615,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
 }
 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[] = {
+STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
@@ -646,13 +646,13 @@ STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
     */
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
-const mp_obj_module_t mp_module_usocket = {
+const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
 
 #endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 393a945facf1f..6e490a594a065 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -352,11 +352,11 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
 
-const mp_obj_module_t mp_module_ussl = {
+const mp_obj_module_t mp_module_ssl = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index c12c943d8a6d0..117a06b6b28d3 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -502,11 +502,11 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
 
-const mp_obj_module_t mp_module_ussl = {
+const mp_obj_module_t mp_module_ssl = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS
diff --git a/extmod/modutime.c b/extmod/modutime.c
index 5d8148f98ad22..9731f5ff0b214 100644
--- a/extmod/modutime.c
+++ b/extmod/modutime.c
@@ -55,7 +55,7 @@
 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.
-        return mp_utime_localtime_get();
+        return mp_time_localtime_get();
     } else {
         // Convert given seconds to tuple.
         mp_int_t seconds = mp_obj_get_int(args[0]);
@@ -74,7 +74,7 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_tuple(8, tuple);
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_utime_localtime_obj, 0, 1, time_localtime);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_time_localtime_obj, 0, 1, time_localtime);
 
 // mktime()
 // This is the inverse function of localtime. Its argument is a full 8-tuple
@@ -94,7 +94,7 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
         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(mp_utime_mktime_obj, time_mktime);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_mktime_obj, time_mktime);
 
 #endif // MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
 
@@ -103,22 +103,22 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_mktime_obj, time_mktime);
 // time()
 // Return the number of seconds since the Epoch.
 STATIC mp_obj_t time_time(void) {
-    return mp_utime_time_get();
+    return mp_time_time_get();
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_time_obj, time_time);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_obj, time_time);
 
 // time_ns()
 // 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);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_ns_obj, time_time_ns);
 
 #endif // MICROPY_PY_UTIME_TIME_TIME_NS
 
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
     #ifdef MICROPY_PY_UTIME_CUSTOM_SLEEP
-    mp_utime_sleep(seconds_o);
+    mp_time_sleep(seconds_o);
     #else
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_hal_delay_ms((mp_uint_t)(1000 * mp_obj_get_float(seconds_o)));
@@ -128,7 +128,7 @@ STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
     #endif
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_obj, time_sleep);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_obj, time_sleep);
 
 STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) {
     mp_int_t ms = mp_obj_get_int(arg);
@@ -137,7 +137,7 @@ STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) {
     }
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj, time_sleep_ms);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_ms_obj, time_sleep_ms);
 
 STATIC mp_obj_t time_sleep_us(mp_obj_t arg) {
     mp_int_t us = mp_obj_get_int(arg);
@@ -146,22 +146,22 @@ STATIC mp_obj_t time_sleep_us(mp_obj_t arg) {
     }
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_us_obj, time_sleep_us);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_us_obj, time_sleep_us);
 
 STATIC mp_obj_t time_ticks_ms(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_ticks_ms_obj, time_ticks_ms);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_ms_obj, time_ticks_ms);
 
 STATIC mp_obj_t time_ticks_us(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_us() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_ticks_us_obj, time_ticks_us);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_us_obj, time_ticks_us);
 
 STATIC mp_obj_t time_ticks_cpu(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_cpu() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_ticks_cpu_obj, time_ticks_cpu);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_cpu_obj, time_ticks_cpu);
 
 STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
     // we assume that the arguments come from ticks_xx so are small ints
@@ -173,7 +173,7 @@ STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
         - MICROPY_PY_UTIME_TICKS_PERIOD / 2;
     return MP_OBJ_NEW_SMALL_INT(diff);
 }
-MP_DEFINE_CONST_FUN_OBJ_2(mp_utime_ticks_diff_obj, time_ticks_diff);
+MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_diff_obj, time_ticks_diff);
 
 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
@@ -194,31 +194,31 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
 
     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);
+MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_add_obj, time_ticks_add);
 
 STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) },
 
     #if MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
-    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mp_utime_localtime_obj) },
-    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mp_utime_localtime_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_utime_mktime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mp_time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mp_time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_time_mktime_obj) },
     #endif
 
     #if MICROPY_PY_UTIME_TIME_TIME_NS
-    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_utime_time_obj) },
-    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_time_time_ns_obj) },
     #endif
 
-    { 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_sleep), MP_ROM_PTR(&mp_time_sleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_time_sleep_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_time_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_ticks_ms), MP_ROM_PTR(&mp_time_ticks_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_time_ticks_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_time_ticks_cpu_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_time_ticks_add_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_time_ticks_diff_obj) },
 
     #ifdef MICROPY_PY_UTIME_EXTRA_GLOBALS
     MICROPY_PY_UTIME_EXTRA_GLOBALS
@@ -226,11 +226,11 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
 
-const mp_obj_module_t mp_module_utime = {
+const mp_obj_module_t mp_module_time = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_time, mp_module_utime);
+MP_REGISTER_MODULE(MP_QSTR_time, mp_module_time);
 
 #endif // MICROPY_PY_UTIME
diff --git a/extmod/modutime.h b/extmod/modutime.h
index 2e10afb89bb2c..f5ea6b55bf306 100644
--- a/extmod/modutime.h
+++ b/extmod/modutime.h
@@ -29,15 +29,15 @@
 
 #include "py/obj.h"
 
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_mktime_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_us_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_ms_obj);
-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);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_mktime_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_sleep_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_sleep_ms_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_sleep_us_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_ticks_ms_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_ticks_us_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_ticks_cpu_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_time_ticks_diff_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_time_ticks_add_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_time_ns_obj);
 
 #endif // MICROPY_INCLUDED_EXTMOD_MODUTIME_H
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 4aa572934f9e7..8187fa2b23c19 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -218,18 +218,18 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &utimeq_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_timeq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_timeq) },
     { MP_ROM_QSTR(MP_QSTR_timeq), MP_ROM_PTR(&utimeq_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_utimeq_globals, mp_module_utimeq_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_timeq_globals, mp_module_timeq_globals_table);
 
-const mp_obj_module_t mp_module_utimeq = {
+const mp_obj_module_t mp_module_timeq = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_utimeq_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_timeq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_utimeq);
+MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_timeq);
 
 #endif // MICROPY_PY_UTIMEQ
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index ca7152bb13c17..301f72fba0456 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -306,11 +306,11 @@ STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(uwebsocket_module_globals, uwebsocket_module_globals_table);
 
-const mp_obj_module_t mp_module_uwebsocket = {
+const mp_obj_module_t mp_module_websocket = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&uwebsocket_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_uwebsocket);
+MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_websocket);
 
 #endif // MICROPY_PY_UWEBSOCKET
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index f41ca2b012935..504c637c3c736 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -210,21 +210,21 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_uzlib_decompress_obj, 1, 3, mod_uzlib_decompress);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_uzlib_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_zlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) },
     { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&mod_uzlib_decompress_obj) },
     { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_uzlib_globals, mp_module_uzlib_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_zlib_globals, mp_module_zlib_globals_table);
 
-const mp_obj_module_t mp_module_uzlib = {
+const mp_obj_module_t mp_module_zlib = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uzlib_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_zlib_globals,
 };
 
 
-MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_uzlib);
+MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_zlib);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index 981d05a63839d..c72b365bea034 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -38,7 +38,7 @@
 
 #include "shared/runtime/interrupt_char.h"
 
-void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) {
+void mp_os_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;
     mp_printf(&mp_plat_print, msg);
@@ -54,7 +54,7 @@ void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) {
     }
 }
 
-uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags) {
+uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags) {
     uintptr_t poll_flags_out = 0;
 
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
@@ -67,7 +67,7 @@ uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags) {
         mp_uint_t ret = 0;
         const mp_stream_p_t *stream_p = mp_get_stream(s);
         #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
-        if (mp_uos_dupterm_is_builtin_stream(s)) {
+        if (mp_os_dupterm_is_builtin_stream(s)) {
             ret = stream_p->ioctl(s, MP_STREAM_POLL, poll_flags, &errcode);
         } else
         #endif
@@ -93,14 +93,14 @@ uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags) {
     return poll_flags_out;
 }
 
-int mp_uos_dupterm_rx_chr(void) {
+int mp_os_dupterm_rx_chr(void) {
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
         if (MP_STATE_VM(dupterm_objs[idx]) == MP_OBJ_NULL) {
             continue;
         }
 
         #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
-        if (mp_uos_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
+        if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
             byte buf[1];
             int errcode = 0;
             const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx]));
@@ -121,7 +121,7 @@ int mp_uos_dupterm_rx_chr(void) {
             mp_uint_t out_sz = stream_p->read(MP_STATE_VM(dupterm_objs[idx]), buf, 1, &errcode);
             if (out_sz == 0) {
                 nlr_pop();
-                mp_uos_deactivate(idx, "dupterm: EOF received, deactivating\n", MP_OBJ_NULL);
+                mp_os_deactivate(idx, "dupterm: EOF received, deactivating\n", MP_OBJ_NULL);
             } else if (out_sz == MP_STREAM_ERROR) {
                 // errcode is valid
                 if (mp_is_nonblocking_error(errcode)) {
@@ -140,7 +140,7 @@ int mp_uos_dupterm_rx_chr(void) {
                 return buf[0];
             }
         } else {
-            mp_uos_deactivate(idx, "dupterm: Exception in read() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
+            mp_os_deactivate(idx, "dupterm: Exception in read() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
         }
     }
 
@@ -148,14 +148,14 @@ int mp_uos_dupterm_rx_chr(void) {
     return -1;
 }
 
-void mp_uos_dupterm_tx_strn(const char *str, size_t len) {
+void mp_os_dupterm_tx_strn(const char *str, size_t len) {
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
         if (MP_STATE_VM(dupterm_objs[idx]) == MP_OBJ_NULL) {
             continue;
         }
 
         #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
-        if (mp_uos_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
+        if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
             int errcode = 0;
             const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx]));
             stream_p->write(MP_STATE_VM(dupterm_objs[idx]), str, len, &errcode);
@@ -168,12 +168,12 @@ void mp_uos_dupterm_tx_strn(const char *str, size_t len) {
             mp_stream_write(MP_STATE_VM(dupterm_objs[idx]), str, len, MP_STREAM_RW_WRITE);
             nlr_pop();
         } else {
-            mp_uos_deactivate(idx, "dupterm: Exception in write() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
+            mp_os_deactivate(idx, "dupterm: Exception in write() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
         }
     }
 }
 
-STATIC mp_obj_t mp_uos_dupterm(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args) {
     mp_int_t idx = 0;
     if (n_args == 2) {
         idx = mp_obj_get_int(args[1]);
@@ -195,12 +195,12 @@ STATIC mp_obj_t mp_uos_dupterm(size_t n_args, const mp_obj_t *args) {
     }
 
     #if MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED
-    mp_uos_dupterm_stream_detached_attached(previous_obj, args[0]);
+    mp_os_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);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_dupterm_obj, 1, 2, mp_os_dupterm);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM]);
 
diff --git a/extmod/utime_mphal.c b/extmod/utime_mphal.c
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/moduhashlib.c
index 5424a6c0fb4c2..de56e114af796 100644
--- a/ports/cc3200/mods/moduhashlib.c
+++ b/ports/cc3200/mods/moduhashlib.c
@@ -202,7 +202,7 @@ STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
 
-const mp_obj_module_t mp_module_uhashlib = {
+const mp_obj_module_t mp_module_hashlib = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_hashlib_globals,
 };
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index b3f3bbf8d8b37..a6e4ef50a7a31 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -175,9 +175,9 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
 
-const mp_obj_module_t mp_module_uos = {
+const mp_obj_module_t mp_module_os = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_os, mp_module_uos);
+MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 311a4395fb073..53682743a9c8b 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -794,7 +794,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_usocket_getaddrinfo_obj, mod_usocket_getaddrinfo);
 
-STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket),          MP_ROM_PTR(&socket_type) },
@@ -811,11 +811,11 @@ STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_UDP),     MP_ROM_INT(SL_IPPROTO_UDP) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
-const mp_obj_module_t mp_module_usocket = {
+const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
+    .globals = (mp_obj_dict_t*)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index e2de7b05cbc0a..dda6725e6681b 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -135,7 +135,7 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 0, mod_ssl_wrap_socket);
 
-STATIC const mp_rom_map_elem_t mp_module_ussl_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_ssl) },
     { MP_ROM_QSTR(MP_QSTR_wrap_socket),         MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
 
@@ -153,11 +153,11 @@ STATIC const mp_rom_map_elem_t mp_module_ussl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLSv1_2),    MP_ROM_INT(SL_SO_SEC_METHOD_TLSV1_2) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ussl_globals, mp_module_ussl_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
 
-const mp_obj_module_t mp_module_ussl = {
+const mp_obj_module_t mp_module_ssl = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_ussl_globals,
+    .globals = (mp_obj_dict_t*)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c
index 52eb1a60294b0..6fa98296d2fbd 100644
--- a/ports/cc3200/mods/modutime.c
+++ b/ports/cc3200/mods/modutime.c
@@ -30,7 +30,7 @@
 #include "pybrtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     timeutils_struct_time_t tm;
 
     // get the seconds from the RTC
@@ -49,6 +49,6 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     return mp_obj_new_int(pyb_rtc_get_seconds());
 }
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 5e07d1f4f5d95..8199304457509 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -864,7 +864,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
-const mp_obj_module_t mp_module_usocket = {
+const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
@@ -872,4 +872,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_socket, mp_module_usocket);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c
index bdfd19c5d20ad..6a5a26c256b70 100644
--- a/ports/esp32/moduos.c
+++ b/ports/esp32/moduos.c
@@ -33,7 +33,7 @@
 #include "py/mphal.h"
 #include "extmod/misc.h"
 
-STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -47,13 +47,13 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
 #if MICROPY_PY_UOS_DUPTERM_NOTIFY
-STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
+STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
-        int c = mp_uos_dupterm_rx_chr();
+        int c = mp_os_dupterm_rx_chr();
         if (c < 0) {
             break;
         }
@@ -61,5 +61,5 @@ STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
 #endif
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index 7b833a194d02f..7a2b2150869e1 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -32,7 +32,7 @@
 #include "shared/timeutils/timeutils.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
     timeutils_struct_time_t tm;
@@ -51,7 +51,7 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
     return mp_obj_new_int(tv.tv_sec);
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index b187b422d50be..61e9fd563ef70 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -121,7 +121,7 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (release_gil) {
         MP_THREAD_GIL_ENTER();
     }
-    mp_uos_dupterm_tx_strn(str, len);
+    mp_os_dupterm_tx_strn(str, len);
 }
 
 uint32_t mp_hal_ticks_ms(void) {
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 219e614841266..7606bd4f63131 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -63,7 +63,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
         ret |= MP_STREAM_POLL_RD;
     }
     if (poll_flags & MP_STREAM_POLL_WR) {
-        ret |= mp_uos_dupterm_poll(poll_flags);
+        ret |= mp_os_dupterm_poll(poll_flags);
     }
     return ret;
 }
@@ -95,7 +95,7 @@ void mp_hal_debug_str(const char *str) {
 #endif
 
 void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
-    mp_uos_dupterm_tx_strn(str, len);
+    mp_os_dupterm_tx_strn(str, len);
 }
 
 void mp_hal_debug_tx_strn_cooked(void *env, const char *str, uint32_t len) {
@@ -146,7 +146,7 @@ STATIC void dupterm_task_handler(os_event_t *evt) {
     }
     lock = 1;
     while (1) {
-        int c = mp_uos_dupterm_rx_chr();
+        int c = mp_os_dupterm_rx_chr();
         if (c < 0) {
             break;
         }
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 2aa81aba05d28..3083fe364e77c 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -74,7 +74,7 @@ STATIC void mp_reset(void) {
         args[1] = MP_OBJ_NEW_SMALL_INT(115200);
         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);
+        mp_os_dupterm_obj.fun.var(2, args);
     }
 
     #if MICROPY_ESPNOW
diff --git a/ports/esp8266/moduos.c b/ports/esp8266/moduos.c
index a023796fd3b6c..78072d4f44869 100644
--- a/ports/esp8266/moduos.c
+++ b/ports/esp8266/moduos.c
@@ -37,11 +37,11 @@
 #include "esp_mphal.h"
 #include "user_interface.h"
 
-STATIC const char *mp_uos_uname_release(void) {
+STATIC const char *mp_os_uname_release(void) {
     return system_get_sdk_version();
 }
 
-STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -50,9 +50,9 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
-void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
+void mp_os_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;
     }
@@ -61,9 +61,9 @@ void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t
     }
 }
 
-STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
+STATIC mp_obj_t mp_os_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(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index b90763371b0eb..21dd3cbcd9099 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -30,7 +30,7 @@
 #include "modmachine.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     mp_int_t seconds = pyb_rtc_get_us_since_epoch() / 1000 / 1000;
     timeutils_struct_time_t tm;
     timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     // get date and time
     return mp_obj_new_int(pyb_rtc_get_us_since_epoch() / 1000 / 1000);
 }
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index b3f97693fa5ab..8ae8019aaefd3 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -96,7 +96,7 @@ uint32_t trng_random_u32(void) {
 }
 
 #if MICROPY_PY_UOS_URANDOM
-STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -106,14 +106,14 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
 
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
 
 #if MICROPY_PY_UOS_DUPTERM_NOTIFY
-STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
+STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
-        int c = mp_uos_dupterm_rx_chr();
+        int c = mp_os_dupterm_rx_chr();
         if (c < 0) {
             break;
         }
@@ -121,5 +121,5 @@ STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
 #endif
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index 5872e9d8d60d5..b0c927899f996 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -30,7 +30,7 @@
 #include "fsl_snvs_lp.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     // Get current date and time.
     snvs_lp_srtc_datetime_t t;
     SNVS_LP_SRTC_GetDatetime(SNVS, &t);
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     snvs_lp_srtc_datetime_t t;
     SNVS_LP_SRTC_GetDatetime(SNVS, &t);
     // EPOCH is 1970 for this port, which leads to the following trouble:
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index beb471ab801e6..2114baaae4fd8 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -90,7 +90,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
         ret |= MP_STREAM_POLL_WR;
     }
     #if MICROPY_PY_OS_DUPTERM
-    ret |= mp_uos_dupterm_poll(poll_flags);
+    ret |= mp_os_dupterm_poll(poll_flags);
     #endif
     return ret;
 }
@@ -103,7 +103,7 @@ int mp_hal_stdin_rx_chr(void) {
             return c;
         }
         #if MICROPY_PY_OS_DUPTERM
-        int dupterm_c = mp_uos_dupterm_rx_chr();
+        int dupterm_c = mp_os_dupterm_rx_chr();
         if (dupterm_c >= 0) {
             return dupterm_c;
         }
@@ -134,7 +134,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         }
     }
     #if MICROPY_PY_OS_DUPTERM
-    mp_uos_dupterm_tx_strn(str, len);
+    mp_os_dupterm_tx_strn(str, len);
     #endif
 }
 
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index bb4901270786d..b7181506134f8 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -192,9 +192,9 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
 
-const mp_obj_module_t mp_module_uos = {
+const mp_obj_module_t mp_module_os = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_os, mp_module_uos);
+MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
diff --git a/ports/renesas-ra/moduos.c b/ports/renesas-ra/moduos.c
index 6f524f119fc9e..e6aadd9ebc1c3 100644
--- a/ports/renesas-ra/moduos.c
+++ b/ports/renesas-ra/moduos.c
@@ -28,12 +28,12 @@
 #include "py/runtime.h"
 #include "uart.h"
 
-bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
+bool mp_os_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;
 }
 
-void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
+void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
     if (mp_obj_get_type(stream_detached) == &machine_uart_type) {
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modutime.c
index 49dcfd589dd5f..1ab51e336deb8 100644
--- a/ports/renesas-ra/modutime.c
+++ b/ports/renesas-ra/modutime.c
@@ -29,7 +29,7 @@
 #include "rtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     // get current date and time
     rtc_init_finalise();
     ra_rtc_t time;
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     // get date and time
     rtc_init_finalise();
     ra_rtc_t time;
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index 6e6a83aa2648f..b35ab7571440e 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -54,7 +54,7 @@ MP_WEAK uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
         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);
+    return ret | mp_os_dupterm_poll(poll_flags);
 }
 
 #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
@@ -69,7 +69,7 @@ MP_WEAK int mp_hal_stdin_rx_chr(void) {
         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();
+        int dupterm_c = mp_os_dupterm_rx_chr();
         if (dupterm_c >= 0) {
             return dupterm_c;
         }
@@ -81,7 +81,7 @@ 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);
+    mp_os_dupterm_tx_strn(str, len);
 }
 
 void mp_hal_ticks_cpu_enable(void) {
diff --git a/ports/rp2/moduos.c b/ports/rp2/moduos.c
index 398ec28d92107..77f980a731bb8 100644
--- a/ports/rp2/moduos.c
+++ b/ports/rp2/moduos.c
@@ -28,7 +28,7 @@
 
 uint8_t rosc_random_u8(size_t cycles);
 
-STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -37,4 +37,4 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
diff --git a/ports/rp2/modutime.c b/ports/rp2/modutime.c
index 9859295d1a5b0..b4120be7c3ea6 100644
--- a/ports/rp2/modutime.c
+++ b/ports/rp2/modutime.c
@@ -29,7 +29,7 @@
 #include "hardware/rtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     datetime_t t;
     rtc_get_datetime(&t);
     mp_obj_t tuple[8] = {
@@ -46,7 +46,7 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(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));
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 84a34b2a405ef..52d55198b7dc8 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -109,7 +109,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     }
     #endif
     #if MICROPY_PY_OS_DUPTERM
-    ret |= mp_uos_dupterm_poll(poll_flags);
+    ret |= mp_os_dupterm_poll(poll_flags);
     #endif
     return ret;
 }
@@ -126,7 +126,7 @@ int mp_hal_stdin_rx_chr(void) {
             return c;
         }
         #if MICROPY_PY_OS_DUPTERM
-        int dupterm_c = mp_uos_dupterm_rx_chr();
+        int dupterm_c = mp_os_dupterm_rx_chr();
         if (dupterm_c >= 0) {
             return dupterm_c;
         }
@@ -164,7 +164,7 @@ 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);
+    mp_os_dupterm_tx_strn(str, len);
     #endif
 }
 
diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c
index 3404919d24b59..4438bf3c7bb2f 100644
--- a/ports/samd/moduos.c
+++ b/ports/samd/moduos.c
@@ -70,7 +70,7 @@ uint32_t trng_random_u32(int delay) {
 #endif
 
 #if MICROPY_PY_UOS_URANDOM
-STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -86,22 +86,22 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
 #endif // MICROPY_PY_UOS_URANDOM
 
 #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
-bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
+bool mp_os_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) {
+STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
-        int c = mp_uos_dupterm_rx_chr();
+        int c = mp_os_dupterm_rx_chr();
         if (c < 0) {
             break;
         }
@@ -109,5 +109,5 @@ STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
 #endif
diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index db90a22822662..aa5bd33609f08 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -29,7 +29,7 @@
 #include "modmachine.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     timeutils_struct_time_t tm;
     rtc_gettime(&tm);
     tm.tm_wday = timeutils_calc_weekday(tm.tm_year, tm.tm_mon, tm.tm_mday);
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     timeutils_struct_time_t tm;
     rtc_gettime(&tm);
     return mp_obj_new_int_from_uint(timeutils_mktime(
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 3dc6b70a8d9ee..dc38ea2964eb9 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -167,7 +167,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     }
 
     #if MICROPY_PY_OS_DUPTERM
-    ret |= mp_uos_dupterm_poll(poll_flags);
+    ret |= mp_os_dupterm_poll(poll_flags);
     #endif
     return ret;
 }
@@ -182,7 +182,7 @@ int mp_hal_stdin_rx_chr(void) {
         }
 
         #if MICROPY_PY_OS_DUPTERM
-        int dupterm_c = mp_uos_dupterm_rx_chr();
+        int dupterm_c = mp_os_dupterm_rx_chr();
         if (dupterm_c >= 0) {
             return dupterm_c;
         }
@@ -212,6 +212,6 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         }
     }
     #if MICROPY_PY_OS_DUPTERM
-    mp_uos_dupterm_tx_strn(str, len);
+    mp_os_dupterm_tx_strn(str, len);
     #endif
 }
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index b148898f164fb..88eafafb0aa1f 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -178,13 +178,13 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     #endif
 
     #if MICROPY_PY_PYB_LEGACY
-    { MP_ROM_QSTR(MP_QSTR_millis), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_millis), MP_ROM_PTR(&mp_time_ticks_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_elapsed_millis), MP_ROM_PTR(&pyb_elapsed_millis_obj) },
-    { MP_ROM_QSTR(MP_QSTR_micros), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_micros), MP_ROM_PTR(&mp_time_ticks_us_obj) },
     { 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(&mp_uos_sync_obj) },
+    { MP_ROM_QSTR(MP_QSTR_delay), MP_ROM_PTR(&mp_time_sleep_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_udelay), MP_ROM_PTR(&mp_time_sleep_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_os_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 1f41e68bdef0f..bfbb868e2fb36 100644
--- a/ports/stm32/moduos.c
+++ b/ports/stm32/moduos.c
@@ -33,7 +33,7 @@
 // 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) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -42,10 +42,10 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
 
-bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
+bool mp_os_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
            #if MICROPY_HW_ENABLE_USB
@@ -54,7 +54,7 @@ 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) {
+void mp_os_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);
     }
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index 4eda59f81ef3f..e7160cd5b2cc0 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -29,7 +29,7 @@
 #include "rtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_utime_localtime_get(void) {
+STATIC mp_obj_t mp_time_localtime_get(void) {
     // get current date and time
     // note: need to call get time then get date to correctly access the registers
     rtc_init_finalise();
@@ -51,7 +51,7 @@ STATIC mp_obj_t mp_utime_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since 1/1/2000.
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     // get date and time
     // note: need to call get time then get date to correctly access the registers
     rtc_init_finalise();
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 092d63e1bb19e..727517f5bda4c 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -28,7 +28,7 @@ MP_WEAK uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
         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);
+    return ret | mp_os_dupterm_poll(poll_flags);
 }
 
 MP_WEAK int mp_hal_stdin_rx_chr(void) {
@@ -45,7 +45,7 @@ MP_WEAK int mp_hal_stdin_rx_chr(void) {
         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();
+        int dupterm_c = mp_os_dupterm_rx_chr();
         if (dupterm_c >= 0) {
             return dupterm_c;
         }
@@ -60,7 +60,7 @@ MP_WEAK void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     #if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
     lcd_print_strn(str, len);
     #endif
-    mp_uos_dupterm_tx_strn(str, len);
+    mp_os_dupterm_tx_strn(str, len);
 }
 
 #if __CORTEX_M >= 0x03
diff --git a/ports/stm32/portmodules.h b/ports/stm32/portmodules.h
index f6edef39877da..87f97f3170094 100644
--- a/ports/stm32/portmodules.h
+++ b/ports/stm32/portmodules.h
@@ -28,13 +28,13 @@
 
 extern const mp_obj_module_t pyb_module;
 extern const mp_obj_module_t stm_module;
-extern const mp_obj_module_t mp_module_usocket;
+extern const mp_obj_module_t mp_module_socket;
 
 // additional helper functions exported by the modules
 
 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(mp_uos_sync_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_os_sync_obj);
 
 #endif // MICROPY_INCLUDED_STM32_PORTMODULES_H
diff --git a/ports/unix/main.c b/ports/unix/main.c
index fc0f6da7b81ef..392ce59dded0c 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -73,7 +73,7 @@ STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t ret;
     MP_HAL_RETRY_SYSCALL(ret, write(STDERR_FILENO, str, len), {});
-    mp_uos_dupterm_tx_strn(str, len);
+    mp_os_dupterm_tx_strn(str, len);
 }
 
 const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
diff --git a/ports/unix/moduos.c b/ports/unix/moduos.c
index e44ceb677b5c6..1d5e2afef4ad9 100644
--- a/ports/unix/moduos.c
+++ b/ports/unix/moduos.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-STATIC mp_obj_t mp_uos_getenv(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mp_os_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) {
@@ -42,9 +42,9 @@ STATIC mp_obj_t mp_uos_getenv(size_t n_args, const mp_obj_t *args) {
     }
     return mp_obj_new_str(s, strlen(s));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_getenv_obj, 1, 2, mp_uos_getenv);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_getenv_obj, 1, 2, mp_os_getenv);
 
-STATIC mp_obj_t mp_uos_putenv(mp_obj_t key_in, mp_obj_t value_in) {
+STATIC mp_obj_t mp_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;
@@ -60,9 +60,9 @@ STATIC mp_obj_t mp_uos_putenv(mp_obj_t key_in, mp_obj_t value_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_uos_putenv_obj, mp_uos_putenv);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_os_putenv_obj, mp_os_putenv);
 
-STATIC mp_obj_t mp_uos_unsetenv(mp_obj_t key_in) {
+STATIC mp_obj_t mp_os_unsetenv(mp_obj_t key_in) {
     const char *key = mp_obj_str_get_str(key_in);
     int ret;
 
@@ -77,9 +77,9 @@ STATIC mp_obj_t mp_uos_unsetenv(mp_obj_t key_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_unsetenv_obj, mp_uos_unsetenv);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_unsetenv_obj, mp_os_unsetenv);
 
-STATIC mp_obj_t mp_uos_system(mp_obj_t cmd_in) {
+STATIC mp_obj_t mp_os_system(mp_obj_t cmd_in) {
     const char *cmd = mp_obj_str_get_str(cmd_in);
 
     MP_THREAD_GIL_EXIT();
@@ -90,18 +90,18 @@ STATIC mp_obj_t mp_uos_system(mp_obj_t cmd_in) {
 
     return MP_OBJ_NEW_SMALL_INT(r);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_system_obj, mp_uos_system);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_system_obj, mp_os_system);
 
-STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
     mp_hal_get_random(n, vstr.buf);
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
-STATIC mp_obj_t mp_uos_errno(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mp_os_errno(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return MP_OBJ_NEW_SMALL_INT(errno);
     }
@@ -109,4 +109,4 @@ STATIC mp_obj_t mp_uos_errno(size_t n_args, const mp_obj_t *args) {
     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);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_errno_obj, 0, 1, mp_os_errno);
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 9b205d333fb73..9f7f452a1291a 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -346,11 +346,11 @@ STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
 
-const mp_obj_module_t mp_module_uselect = {
+const mp_obj_module_t mp_module_select = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_select, mp_module_uselect);
+MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
 
 #endif // MICROPY_PY_USELECT_POSIX
diff --git a/ports/unix/modutime.c b/ports/unix/modutime.c
index dade99295d559..26c2fbdb900b4 100644
--- a/ports/unix/modutime.c
+++ b/ports/unix/modutime.c
@@ -61,7 +61,7 @@ static inline int msec_sleep_tv(struct timeval *tv) {
 #error Unsupported clock() implementation
 #endif
 
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
     struct timeval tv;
     gettimeofday(&tv, NULL);
@@ -85,7 +85,7 @@ STATIC mp_obj_t mod_time_clock(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);
 
-STATIC mp_obj_t mp_utime_sleep(mp_obj_t arg) {
+STATIC mp_obj_t mp_time_sleep(mp_obj_t arg) {
     #if MICROPY_PY_BUILTINS_FLOAT
     struct timeval tv;
     mp_float_t val = mp_obj_get_float(arg);
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 8eafb6119bebc..0588e100d6c65 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -184,7 +184,7 @@ void mp_unix_mark_exec(void);
 #ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
 #include <stddef.h>
 void mp_hal_get_random(size_t n, void *buf);
-static inline unsigned long mp_urandom_seed_init(void) {
+static inline unsigned long mp_random_seed_init(void) {
     unsigned long r;
     mp_hal_get_random(sizeof(r), &r);
     return r;
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 6f2def890330e..5478b69ad41f2 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -187,7 +187,7 @@ main_term:;
 void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     ssize_t ret;
     MP_HAL_RETRY_SYSCALL(ret, write(STDOUT_FILENO, str, len), {});
-    mp_uos_dupterm_tx_strn(str, len);
+    mp_os_dupterm_tx_strn(str, len);
 }
 
 // cooked is same as uncooked because the terminal does some postprocessing
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index e4e0c0c5d3ba3..9a8a524a226ed 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -58,7 +58,7 @@
 #endif
 
 // Seed random on import.
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_random_seed_init())
 
 // Allow exception details in low-memory conditions.
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 98dff7e8e8026..c3356189ab790 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -448,7 +448,7 @@ STATIC mp_obj_t pkt_get_info(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(pkt_get_info_obj, pkt_get_info);
 
-STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
     // objects
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
@@ -466,13 +466,13 @@ STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_pkt_get_info), MP_ROM_PTR(&pkt_get_info_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
-const mp_obj_module_t mp_module_usocket = {
+const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
 
 #endif // MICROPY_PY_USOCKET
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modutime.c
index c02460ba0180a..65ba1e6e6917c 100644
--- a/ports/zephyr/modutime.c
+++ b/ports/zephyr/modutime.c
@@ -29,7 +29,7 @@
 
 #include "py/obj.h"
 
-STATIC mp_obj_t mp_utime_time_get(void) {
+STATIC mp_obj_t mp_time_time_get(void) {
     /* The absence of FP support is deliberate. The Zephyr port uses
      * single precision floats so the fraction component will start to
      * lose precision on devices with a long uptime.
diff --git a/py/builtin.h b/py/builtin.h
index 7232142b77bea..81d0789802b9c 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -133,7 +133,7 @@ extern const mp_obj_module_t mp_module_builtins;
 extern const mp_obj_module_t mp_module_sys;
 
 // 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_errno;
 extern const mp_obj_module_t mp_module_uctypes;
 extern const mp_obj_module_t mp_module_machine;
 
diff --git a/py/modarray.c b/py/modarray.c
index c91e92f798bf3..cfed0fbb59c4f 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -35,11 +35,11 @@ STATIC const mp_rom_map_elem_t mp_module_array_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_array_globals, mp_module_array_globals_table);
 
-const mp_obj_module_t mp_module_uarray = {
+const mp_obj_module_t mp_module_array = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_array_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_array, mp_module_uarray);
+MP_REGISTER_MODULE(MP_QSTR_array, mp_module_array);
 
 #endif
diff --git a/py/modstruct.c b/py/modstruct.c
index 78c7d53e4bb89..e908c73e1d94d 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -261,11 +261,11 @@ STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_table);
 
-const mp_obj_module_t mp_module_ustruct = {
+const mp_obj_module_t mp_module_struct = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_struct_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_struct, mp_module_ustruct);
+MP_REGISTER_MODULE(MP_QSTR_struct, mp_module_struct);
 
 #endif
diff --git a/py/moduerrno.c b/py/moduerrno.c
index e197f921e1522..ed172ae4d6e7d 100644
--- a/py/moduerrno.c
+++ b/py/moduerrno.c
@@ -81,7 +81,7 @@ STATIC const mp_obj_dict_t errorcode_dict = {
 };
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_uerrno_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_errno_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_errno) },
     #if MICROPY_PY_UERRNO_ERRORCODE
     { MP_ROM_QSTR(MP_QSTR_errorcode), MP_ROM_PTR(&errorcode_dict) },
@@ -92,14 +92,14 @@ STATIC const mp_rom_map_elem_t mp_module_uerrno_globals_table[] = {
 #undef X
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_uerrno_globals, mp_module_uerrno_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_errno_globals, mp_module_errno_globals_table);
 
-const mp_obj_module_t mp_module_uerrno = {
+const mp_obj_module_t mp_module_errno = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uerrno_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_errno_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_errno, mp_module_uerrno);
+MP_REGISTER_MODULE(MP_QSTR_errno, mp_module_errno);
 
 qstr mp_errno_to_str(mp_obj_t errno_val) {
     #if MICROPY_PY_UERRNO_ERRORCODE
@@ -112,9 +112,9 @@ qstr mp_errno_to_str(mp_obj_t errno_val) {
     }
     #else
     // We don't have the errorcode dict so do a simple search in the modules dict
-    for (size_t i = 0; i < MP_ARRAY_SIZE(mp_module_uerrno_globals_table); ++i) {
-        if (errno_val == mp_module_uerrno_globals_table[i].value) {
-            return MP_OBJ_QSTR_VALUE(mp_module_uerrno_globals_table[i].key);
+    for (size_t i = 0; i < MP_ARRAY_SIZE(mp_module_errno_globals_table); ++i) {
+        if (errno_val == mp_module_errno_globals_table[i].value) {
+            return MP_OBJ_QSTR_VALUE(mp_module_errno_globals_table[i].key);
         }
     }
     return MP_QSTRnull;
diff --git a/py/parse.c b/py/parse.c
index 86198224fdaec..a271aa0ea359d 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -637,7 +637,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
 #if MICROPY_COMP_MODULE_CONST
 STATIC const mp_rom_map_elem_t mp_constants_table[] = {
     #if MICROPY_PY_UERRNO
-    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) },
+    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_errno) },
     #endif
     #if MICROPY_PY_UCTYPES
     { MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },

From 7f5d5c72718af773db751269c6ae14037b9c0727 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 14:49:57 +1000
Subject: [PATCH 0011/3129] all: Rename mod_umodule*, ^umodule* to remove the
 "u" prefix.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/uheapq/uheapq.c    |   6 +-
 examples/natmod/urandom/urandom.c  |  14 +--
 examples/natmod/uzlib/uzlib.c      |   2 +-
 extmod/modlwip.c                   |   2 +-
 extmod/moducryptolib.c             |  26 +++---
 extmod/moduhashlib.c               | 138 ++++++++++++++---------------
 extmod/moduheapq.c                 |  38 ++++----
 extmod/modujson.c                  |  50 +++++------
 extmod/modurandom.c                |  50 +++++------
 extmod/modure.c                    |   6 +-
 extmod/modusocket.c                |  10 +--
 extmod/modussl_axtls.c             |  48 +++++-----
 extmod/modussl_mbedtls.c           |  16 ++--
 extmod/modutimeq.c                 |  74 ++++++++--------
 extmod/moduwebsocket.c             |   6 +-
 extmod/moduzlib.c                  |  10 +--
 ports/cc3200/mods/modusocket.c     |  16 ++--
 ports/cc3200/mpconfigport.h        |   2 +-
 ports/esp32/main.c                 |   2 +-
 ports/esp32/modnetwork.h           |   2 +-
 ports/esp32/modsocket.c            |  38 ++++----
 ports/esp32/mpconfigport.h         |   2 +-
 ports/nrf/main.c                   |   8 +-
 ports/nrf/modules/uos/microbitfs.c |  70 +++++++--------
 ports/nrf/modules/uos/microbitfs.h |  14 +--
 ports/nrf/modules/uos/moduos.c     |  10 +--
 ports/nrf/mpconfigport.h           |   2 +-
 ports/nrf/qstrdefsport.h           |   2 +-
 ports/renesas-ra/qstrdefsport.h    |   2 +-
 ports/samd/modmachine.c            |   2 +-
 ports/stm32/modpyb.c               |   2 +-
 ports/stm32/qstrdefsport.h         |   2 +-
 ports/stm32/rng.c                  |   2 +-
 ports/unix/coverage.c              |   2 +-
 ports/unix/modusocket.c            |  17 ++--
 ports/unix/unix_mphal.c            |   2 +-
 py/mpconfig.h                      |  20 ++---
 37 files changed, 357 insertions(+), 358 deletions(-)

diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c
index 75f00e15cb061..ff70bef479ec7 100644
--- a/examples/natmod/uheapq/uheapq.c
+++ b/examples/natmod/uheapq/uheapq.c
@@ -8,9 +8,9 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     MP_DYNRUNTIME_INIT_ENTRY
 
     mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_heapq));
-    mp_store_global(MP_QSTR_heappush, MP_OBJ_FROM_PTR(&mod_uheapq_heappush_obj));
-    mp_store_global(MP_QSTR_heappop, MP_OBJ_FROM_PTR(&mod_uheapq_heappop_obj));
-    mp_store_global(MP_QSTR_heapify, MP_OBJ_FROM_PTR(&mod_uheapq_heapify_obj));
+    mp_store_global(MP_QSTR_heappush, MP_OBJ_FROM_PTR(&mod_heapq_heappush_obj));
+    mp_store_global(MP_QSTR_heappop, MP_OBJ_FROM_PTR(&mod_heapq_heappop_obj));
+    mp_store_global(MP_QSTR_heapify, MP_OBJ_FROM_PTR(&mod_heapq_heapify_obj));
 
     MP_DYNRUNTIME_INIT_EXIT
 }
diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c
index bb41bf3f8ee64..0c4e88c77e7c2 100644
--- a/examples/natmod/urandom/urandom.c
+++ b/examples/natmod/urandom/urandom.c
@@ -17,15 +17,15 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     yasmarang_d = 233;
 
     mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_random));
-    mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_urandom_getrandbits_obj));
-    mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_urandom_seed_obj));
+    mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_random_getrandbits_obj));
+    mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_random_seed_obj));
     #if MICROPY_PY_URANDOM_EXTRA_FUNCS
-    mp_store_global(MP_QSTR_randrange, MP_OBJ_FROM_PTR(&mod_urandom_randrange_obj));
-    mp_store_global(MP_QSTR_randint, MP_OBJ_FROM_PTR(&mod_urandom_randint_obj));
-    mp_store_global(MP_QSTR_choice, MP_OBJ_FROM_PTR(&mod_urandom_choice_obj));
+    mp_store_global(MP_QSTR_randrange, MP_OBJ_FROM_PTR(&mod_random_randrange_obj));
+    mp_store_global(MP_QSTR_randint, MP_OBJ_FROM_PTR(&mod_random_randint_obj));
+    mp_store_global(MP_QSTR_choice, MP_OBJ_FROM_PTR(&mod_random_choice_obj));
     #if MICROPY_PY_BUILTINS_FLOAT
-    mp_store_global(MP_QSTR_random, MP_OBJ_FROM_PTR(&mod_urandom_random_obj));
-    mp_store_global(MP_QSTR_uniform, MP_OBJ_FROM_PTR(&mod_urandom_uniform_obj));
+    mp_store_global(MP_QSTR_random, MP_OBJ_FROM_PTR(&mod_random_random_obj));
+    mp_store_global(MP_QSTR_uniform, MP_OBJ_FROM_PTR(&mod_random_uniform_obj));
     #endif
     #endif
 
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index 06b24f4b8182d..ea21235102dd0 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -28,7 +28,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_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_zlib));
-    mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_uzlib_decompress_obj));
+    mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_zlib_decompress_obj));
     mp_store_global(MP_QSTR_DecompIO, MP_OBJ_FROM_PTR(&decompio_type));
 
     MP_DYNRUNTIME_INIT_EXIT
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 19df1ea50308e..c66a1de196139 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1801,7 +1801,7 @@ const mp_obj_module_t mp_module_lwip = {
 
 MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
 
-// On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c).
+// On LWIP-ports, this is the socket module (replaces extmod/modusocket.c).
 MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index e727f50548af6..0c9701024eea5 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -211,7 +211,7 @@ STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *
 
 #endif
 
-STATIC mp_obj_t ucryptolib_aes_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 cryptolib_aes_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);
 
     const mp_int_t block_mode = mp_obj_get_int(args[1]);
@@ -332,33 +332,33 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
 
-STATIC mp_obj_t ucryptolib_aes_encrypt(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t cryptolib_aes_encrypt(size_t n_args, const mp_obj_t *args) {
     return aes_process(n_args, args, true);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ucryptolib_aes_encrypt_obj, 2, 3, ucryptolib_aes_encrypt);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_encrypt_obj, 2, 3, cryptolib_aes_encrypt);
 
-STATIC mp_obj_t ucryptolib_aes_decrypt(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t cryptolib_aes_decrypt(size_t n_args, const mp_obj_t *args) {
     return aes_process(n_args, args, false);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ucryptolib_aes_decrypt_obj, 2, 3, ucryptolib_aes_decrypt);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_decrypt_obj, 2, 3, cryptolib_aes_decrypt);
 
-STATIC const mp_rom_map_elem_t ucryptolib_aes_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_encrypt), MP_ROM_PTR(&ucryptolib_aes_encrypt_obj) },
-    { MP_ROM_QSTR(MP_QSTR_decrypt), MP_ROM_PTR(&ucryptolib_aes_decrypt_obj) },
+STATIC const mp_rom_map_elem_t cryptolib_aes_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_encrypt), MP_ROM_PTR(&cryptolib_aes_encrypt_obj) },
+    { MP_ROM_QSTR(MP_QSTR_decrypt), MP_ROM_PTR(&cryptolib_aes_decrypt_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(ucryptolib_aes_locals_dict, ucryptolib_aes_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(cryptolib_aes_locals_dict, cryptolib_aes_locals_dict_table);
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    ucryptolib_aes_type,
+    cryptolib_aes_type,
     MP_QSTR_aes,
     MP_TYPE_FLAG_NONE,
-    make_new, ucryptolib_aes_make_new,
-    locals_dict, &ucryptolib_aes_locals_dict
+    make_new, cryptolib_aes_make_new,
+    locals_dict, &cryptolib_aes_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
-    { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&ucryptolib_aes_type) },
+    { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&cryptolib_aes_type) },
     #if MICROPY_PY_UCRYPTOLIB_CONSTS
     { MP_ROM_QSTR(MP_QSTR_MODE_ECB), MP_ROM_INT(UCRYPTOLIB_MODE_ECB) },
     { MP_ROM_QSTR(MP_QSTR_MODE_CBC), MP_ROM_INT(UCRYPTOLIB_MODE_CBC) },
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index ef1a29fc78952..0e01b4f27f9fe 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -64,14 +64,14 @@ typedef struct _mp_obj_hash_t {
     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) {
+static void hashlib_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);
+STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_MBEDTLS
 
@@ -81,30 +81,30 @@ STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 #define mbedtls_sha256_finish_ret mbedtls_sha256_finish
 #endif
 
-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) {
+STATIC mp_obj_t hashlib_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 = 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);
     if (n_args == 1) {
-        uhashlib_sha256_update(MP_OBJ_FROM_PTR(o), args[0]);
+        hashlib_sha256_update(MP_OBJ_FROM_PTR(o), args[0]);
     }
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t hashlib_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);
+    hashlib_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);
     return mp_const_none;
 }
 
-STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
+STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
-    uhashlib_ensure_not_final(self);
+    hashlib_ensure_not_final(self);
     self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 32);
@@ -116,29 +116,29 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
 
 #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) {
+STATIC mp_obj_t hashlib_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 = 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) {
-        uhashlib_sha256_update(MP_OBJ_FROM_PTR(o), args[0]);
+        hashlib_sha256_update(MP_OBJ_FROM_PTR(o), args[0]);
     }
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t hashlib_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);
+    hashlib_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);
     return mp_const_none;
 }
 
-STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
+STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
-    uhashlib_ensure_not_final(self);
+    hashlib_ensure_not_final(self);
     self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, SHA256_BLOCK_SIZE);
@@ -147,52 +147,52 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
 }
 #endif
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(uhashlib_sha256_update_obj, uhashlib_sha256_update);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(uhashlib_sha256_digest_obj, uhashlib_sha256_digest);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_sha256_update_obj, hashlib_sha256_update);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_sha256_digest_obj, hashlib_sha256_digest);
 
-STATIC const mp_rom_map_elem_t uhashlib_sha256_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&uhashlib_sha256_update_obj) },
-    { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&uhashlib_sha256_digest_obj) },
+STATIC const mp_rom_map_elem_t hashlib_sha256_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_sha256_update_obj) },
+    { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_sha256_digest_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(uhashlib_sha256_locals_dict, uhashlib_sha256_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(hashlib_sha256_locals_dict, hashlib_sha256_locals_dict_table);
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    uhashlib_sha256_type,
+    hashlib_sha256_type,
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
     make_new, uhashlib_sha256_make_new,
-    locals_dict, &uhashlib_sha256_locals_dict
+    locals_dict, &hashlib_sha256_locals_dict
     );
 #endif
 
 #if MICROPY_PY_UHASHLIB_SHA1
-STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg);
+STATIC mp_obj_t hashlib_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) {
+STATIC mp_obj_t hashlib_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 = 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) {
-        uhashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
+        hashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
     }
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t hashlib_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);
+    hashlib_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);
     return mp_const_none;
 }
 
-STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
+STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
-    uhashlib_ensure_not_final(self);
+    hashlib_ensure_not_final(self);
     self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, SHA1_SIZE);
@@ -209,30 +209,30 @@ STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
 #define mbedtls_sha1_finish_ret mbedtls_sha1_finish
 #endif
 
-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) {
+STATIC mp_obj_t hashlib_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 = 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);
     if (n_args == 1) {
-        uhashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
+        hashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
     }
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t hashlib_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);
+    hashlib_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);
     return mp_const_none;
 }
 
-STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
+STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
-    uhashlib_ensure_not_final(self);
+    hashlib_ensure_not_final(self);
     self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 20);
@@ -242,51 +242,51 @@ STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
 }
 #endif
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(uhashlib_sha1_update_obj, uhashlib_sha1_update);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(uhashlib_sha1_digest_obj, uhashlib_sha1_digest);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_sha1_update_obj, hashlib_sha1_update);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_sha1_digest_obj, hashlib_sha1_digest);
 
-STATIC const mp_rom_map_elem_t uhashlib_sha1_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&uhashlib_sha1_update_obj) },
-    { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&uhashlib_sha1_digest_obj) },
+STATIC const mp_rom_map_elem_t hashlib_sha1_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_sha1_update_obj) },
+    { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_sha1_digest_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(uhashlib_sha1_locals_dict, uhashlib_sha1_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(hashlib_sha1_locals_dict, hashlib_sha1_locals_dict_table);
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    uhashlib_sha1_type,
+    hashlib_sha1_type,
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
-    make_new, uhashlib_sha1_make_new,
-    locals_dict, &uhashlib_sha1_locals_dict
+    make_new, hashlib_sha1_make_new,
+    locals_dict, &hashlib_sha1_locals_dict
     );
 #endif
 
 #if MICROPY_PY_UHASHLIB_MD5
-STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg);
+STATIC mp_obj_t hashlib_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) {
+STATIC mp_obj_t hashlib_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 = 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) {
-        uhashlib_md5_update(MP_OBJ_FROM_PTR(o), args[0]);
+        hashlib_md5_update(MP_OBJ_FROM_PTR(o), args[0]);
     }
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t hashlib_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);
+    hashlib_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);
     return mp_const_none;
 }
 
-STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
+STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
-    uhashlib_ensure_not_final(self);
+    hashlib_ensure_not_final(self);
     self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, MD5_SIZE);
@@ -303,30 +303,30 @@ STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
 #define mbedtls_md5_finish_ret mbedtls_md5_finish
 #endif
 
-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) {
+STATIC mp_obj_t hashlib_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 = 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);
     if (n_args == 1) {
-        uhashlib_md5_update(MP_OBJ_FROM_PTR(o), args[0]);
+        hashlib_md5_update(MP_OBJ_FROM_PTR(o), args[0]);
     }
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
+STATIC mp_obj_t hashlib_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);
+    hashlib_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);
     return mp_const_none;
 }
 
-STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
+STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
-    uhashlib_ensure_not_final(self);
+    hashlib_ensure_not_final(self);
     self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 16);
@@ -336,34 +336,34 @@ STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
 }
 #endif // MICROPY_SSL_MBEDTLS
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(uhashlib_md5_update_obj, uhashlib_md5_update);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(uhashlib_md5_digest_obj, uhashlib_md5_digest);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_md5_update_obj, hashlib_md5_update);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_md5_digest_obj, hashlib_md5_digest);
 
-STATIC const mp_rom_map_elem_t uhashlib_md5_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&uhashlib_md5_update_obj) },
-    { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&uhashlib_md5_digest_obj) },
+STATIC const mp_rom_map_elem_t hashlib_md5_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_md5_update_obj) },
+    { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_md5_digest_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(uhashlib_md5_locals_dict, uhashlib_md5_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(hashlib_md5_locals_dict, hashlib_md5_locals_dict_table);
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    uhashlib_md5_type,
+    hashlib_md5_type,
     MP_QSTR_md5,
     MP_TYPE_FLAG_NONE,
-    make_new, uhashlib_md5_make_new,
-    locals_dict, &uhashlib_md5_locals_dict
+    make_new, hashlib_md5_make_new,
+    locals_dict, &hashlib_md5_locals_dict
     );
 #endif // MICROPY_PY_UHASHLIB_MD5
 
 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) },
     #if MICROPY_PY_UHASHLIB_SHA256
-    { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&uhashlib_sha256_type) },
+    { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&hashlib_sha256_type) },
     #endif
     #if MICROPY_PY_UHASHLIB_SHA1
-    { MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&uhashlib_sha1_type) },
+    { MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&hashlib_sha1_type) },
     #endif
     #if MICROPY_PY_UHASHLIB_MD5
-    { MP_ROM_QSTR(MP_QSTR_md5), MP_ROM_PTR(&uhashlib_md5_type) },
+    { MP_ROM_QSTR(MP_QSTR_md5), MP_ROM_PTR(&hashlib_md5_type) },
     #endif
 };
 
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index fb6cb81182e62..59277813e9582 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -31,14 +31,14 @@
 
 // the algorithm here is modelled on CPython's heapq.py
 
-STATIC mp_obj_list_t *uheapq_get_heap(mp_obj_t heap_in) {
+STATIC mp_obj_list_t *heapq_get_heap(mp_obj_t heap_in) {
     if (!mp_obj_is_type(heap_in, &mp_type_list)) {
         mp_raise_TypeError(MP_ERROR_TEXT("heap must be a list"));
     }
     return MP_OBJ_TO_PTR(heap_in);
 }
 
-STATIC void uheapq_heap_siftdown(mp_obj_list_t *heap, mp_uint_t start_pos, mp_uint_t pos) {
+STATIC void heapq_heap_siftdown(mp_obj_list_t *heap, mp_uint_t start_pos, mp_uint_t pos) {
     mp_obj_t item = heap->items[pos];
     while (pos > start_pos) {
         mp_uint_t parent_pos = (pos - 1) >> 1;
@@ -53,7 +53,7 @@ STATIC void uheapq_heap_siftdown(mp_obj_list_t *heap, mp_uint_t start_pos, mp_ui
     heap->items[pos] = item;
 }
 
-STATIC void uheapq_heap_siftup(mp_obj_list_t *heap, mp_uint_t pos) {
+STATIC void heapq_heap_siftup(mp_obj_list_t *heap, mp_uint_t pos) {
     mp_uint_t start_pos = pos;
     mp_uint_t end_pos = heap->len;
     mp_obj_t item = heap->items[pos];
@@ -67,19 +67,19 @@ STATIC void uheapq_heap_siftup(mp_obj_list_t *heap, mp_uint_t pos) {
         pos = child_pos;
     }
     heap->items[pos] = item;
-    uheapq_heap_siftdown(heap, start_pos, pos);
+    heapq_heap_siftdown(heap, start_pos, pos);
 }
 
-STATIC mp_obj_t mod_uheapq_heappush(mp_obj_t heap_in, mp_obj_t item) {
-    mp_obj_list_t *heap = uheapq_get_heap(heap_in);
+STATIC mp_obj_t mod_heapq_heappush(mp_obj_t heap_in, mp_obj_t item) {
+    mp_obj_list_t *heap = heapq_get_heap(heap_in);
     mp_obj_list_append(heap_in, item);
-    uheapq_heap_siftdown(heap, 0, heap->len - 1);
+    heapq_heap_siftdown(heap, 0, heap->len - 1);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_uheapq_heappush_obj, mod_uheapq_heappush);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_heapq_heappush_obj, mod_heapq_heappush);
 
-STATIC mp_obj_t mod_uheapq_heappop(mp_obj_t heap_in) {
-    mp_obj_list_t *heap = uheapq_get_heap(heap_in);
+STATIC mp_obj_t mod_heapq_heappop(mp_obj_t heap_in) {
+    mp_obj_list_t *heap = heapq_get_heap(heap_in);
     if (heap->len == 0) {
         mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty heap"));
     }
@@ -88,27 +88,27 @@ STATIC mp_obj_t mod_uheapq_heappop(mp_obj_t heap_in) {
     heap->items[0] = heap->items[heap->len];
     heap->items[heap->len] = MP_OBJ_NULL; // so we don't retain a pointer
     if (heap->len) {
-        uheapq_heap_siftup(heap, 0);
+        heapq_heap_siftup(heap, 0);
     }
     return item;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_uheapq_heappop_obj, mod_uheapq_heappop);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_heapq_heappop_obj, mod_heapq_heappop);
 
-STATIC mp_obj_t mod_uheapq_heapify(mp_obj_t heap_in) {
-    mp_obj_list_t *heap = uheapq_get_heap(heap_in);
+STATIC mp_obj_t mod_heapq_heapify(mp_obj_t heap_in) {
+    mp_obj_list_t *heap = heapq_get_heap(heap_in);
     for (mp_uint_t i = heap->len / 2; i > 0;) {
-        uheapq_heap_siftup(heap, --i);
+        heapq_heap_siftup(heap, --i);
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_uheapq_heapify_obj, mod_uheapq_heapify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_heapq_heapify_obj, mod_heapq_heapify);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t mp_module_heapq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_heapq) },
-    { MP_ROM_QSTR(MP_QSTR_heappush), MP_ROM_PTR(&mod_uheapq_heappush_obj) },
-    { MP_ROM_QSTR(MP_QSTR_heappop), MP_ROM_PTR(&mod_uheapq_heappop_obj) },
-    { MP_ROM_QSTR(MP_QSTR_heapify), MP_ROM_PTR(&mod_uheapq_heapify_obj) },
+    { MP_ROM_QSTR(MP_QSTR_heappush), MP_ROM_PTR(&mod_heapq_heappush_obj) },
+    { MP_ROM_QSTR(MP_QSTR_heappop), MP_ROM_PTR(&mod_heapq_heappop_obj) },
+    { MP_ROM_QSTR(MP_QSTR_heapify), MP_ROM_PTR(&mod_heapq_heapify_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_heapq_globals, mp_module_heapq_globals_table);
diff --git a/extmod/modujson.c b/extmod/modujson.c
index 44dd316b699e3..e67761e1a99b5 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -41,7 +41,7 @@ enum {
     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) {
+STATIC mp_obj_t mod_json_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} },
@@ -78,34 +78,34 @@ STATIC mp_obj_t mod_ujson_dump_helper(size_t n_args, const mp_obj_t *pos_args, m
     }
 }
 
-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_obj_t mod_json_dump(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return mod_json_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_DEFINE_CONST_FUN_OBJ_KW(mod_json_dump_obj, 2, mod_json_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_obj_t mod_json_dumps(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return mod_json_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);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_json_dumps_obj, 1, mod_json_dumps);
 
 #else
 
-STATIC mp_obj_t mod_ujson_dump(mp_obj_t obj, mp_obj_t stream) {
+STATIC mp_obj_t mod_json_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};
     mp_obj_print_helper(&print, obj, PRINT_JSON);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_ujson_dump_obj, mod_ujson_dump);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_json_dump_obj, mod_json_dump);
 
-STATIC mp_obj_t mod_ujson_dumps(mp_obj_t obj) {
+STATIC mp_obj_t mod_json_dumps(mp_obj_t obj) {
     vstr_t vstr;
     mp_print_t print;
     vstr_init_print(&vstr, 8, &print);
     mp_obj_print_helper(&print, obj, PRINT_JSON);
     return mp_obj_new_str_from_utf8_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_dumps_obj, mod_ujson_dumps);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_dumps_obj, mod_json_dumps);
 
 #endif
 
@@ -122,19 +122,19 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_dumps_obj, mod_ujson_dumps);
 // strings).  It does 1 pass over the input stream.  It tries to be fast and
 // small in code size, while not using more RAM than necessary.
 
-typedef struct _ujson_stream_t {
+typedef struct _json_stream_t {
     mp_obj_t stream_obj;
     mp_uint_t (*read)(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode);
     int errcode;
     byte cur;
-} ujson_stream_t;
+} json_stream_t;
 
 #define S_EOF (0) // null is not allowed in json stream so is ok as EOF marker
 #define S_END(s) ((s).cur == S_EOF)
 #define S_CUR(s) ((s).cur)
-#define S_NEXT(s) (ujson_stream_next(&(s)))
+#define S_NEXT(s) (json_stream_next(&(s)))
 
-STATIC byte ujson_stream_next(ujson_stream_t *s) {
+STATIC byte json_stream_next(json_stream_t *s) {
     mp_uint_t ret = s->read(s->stream_obj, &s->cur, 1, &s->errcode);
     if (s->errcode != 0) {
         mp_raise_OSError(s->errcode);
@@ -145,9 +145,9 @@ STATIC byte ujson_stream_next(ujson_stream_t *s) {
     return s->cur;
 }
 
-STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
+STATIC mp_obj_t mod_json_load(mp_obj_t stream_obj) {
     const mp_stream_p_t *stream_p = mp_get_stream_raise(stream_obj, MP_STREAM_OP_READ);
-    ujson_stream_t s = {stream_obj, stream_p->read, 0, 0};
+    json_stream_t s = {stream_obj, stream_p->read, 0, 0};
     vstr_t vstr;
     vstr_init(&vstr, 8);
     mp_obj_list_t stack; // we use a list as a simple stack for nested JSON
@@ -355,23 +355,23 @@ STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
 fail:
     mp_raise_ValueError(MP_ERROR_TEXT("syntax error in JSON"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_load_obj, mod_ujson_load);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_load_obj, mod_json_load);
 
-STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
+STATIC mp_obj_t mod_json_loads(mp_obj_t obj) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);
     vstr_t vstr = {bufinfo.len, bufinfo.len, (char *)bufinfo.buf, true};
     mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL};
-    return mod_ujson_load(MP_OBJ_FROM_PTR(&sio));
+    return mod_json_load(MP_OBJ_FROM_PTR(&sio));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_loads_obj, mod_ujson_loads);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_loads_obj, mod_json_loads);
 
 STATIC const mp_rom_map_elem_t mp_module_json_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_json) },
-    { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_ujson_dump_obj) },
-    { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_ujson_dumps_obj) },
-    { MP_ROM_QSTR(MP_QSTR_load), MP_ROM_PTR(&mod_ujson_load_obj) },
-    { MP_ROM_QSTR(MP_QSTR_loads), MP_ROM_PTR(&mod_ujson_loads_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_json_dump_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_json_dumps_obj) },
+    { MP_ROM_QSTR(MP_QSTR_load), MP_ROM_PTR(&mod_json_load_obj) },
+    { MP_ROM_QSTR(MP_QSTR_loads), MP_ROM_PTR(&mod_json_loads_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_json_globals, mp_module_json_globals_table);
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 86e3a872c5551..f69f7f41933e9 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -85,7 +85,7 @@ STATIC uint32_t yasmarang_randbelow(uint32_t n) {
 
 #endif
 
-STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
+STATIC mp_obj_t mod_random_getrandbits(mp_obj_t num_in) {
     int n = mp_obj_get_int(num_in);
     if (n > 32 || n < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("bits must be 32 or less"));
@@ -98,9 +98,9 @@ STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
     mask >>= (32 - n);
     return mp_obj_new_int_from_uint(yasmarang() & mask);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_urandom_getrandbits_obj, mod_urandom_getrandbits);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_getrandbits_obj, mod_random_getrandbits);
 
-STATIC mp_obj_t mod_urandom_seed(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mod_random_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
@@ -117,11 +117,11 @@ STATIC mp_obj_t mod_urandom_seed(size_t n_args, const mp_obj_t *args) {
     yasmarang_dat = 0;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_urandom_seed_obj, 0, 1, mod_urandom_seed);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_seed_obj, 0, 1, mod_random_seed);
 
 #if MICROPY_PY_URANDOM_EXTRA_FUNCS
 
-STATIC mp_obj_t mod_urandom_randrange(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
     mp_int_t start = mp_obj_get_int(args[0]);
     if (n_args == 1) {
         // range(stop)
@@ -161,9 +161,9 @@ STATIC mp_obj_t mod_urandom_randrange(size_t n_args, const mp_obj_t *args) {
 error:
     mp_raise_ValueError(NULL);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_urandom_randrange_obj, 1, 3, mod_urandom_randrange);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_randrange_obj, 1, 3, mod_random_randrange);
 
-STATIC mp_obj_t mod_urandom_randint(mp_obj_t a_in, mp_obj_t b_in) {
+STATIC mp_obj_t mod_random_randint(mp_obj_t a_in, mp_obj_t b_in) {
     mp_int_t a = mp_obj_get_int(a_in);
     mp_int_t b = mp_obj_get_int(b_in);
     if (a <= b) {
@@ -172,9 +172,9 @@ STATIC mp_obj_t mod_urandom_randint(mp_obj_t a_in, mp_obj_t b_in) {
         mp_raise_ValueError(NULL);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_randint_obj, mod_urandom_randint);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_randint_obj, mod_random_randint);
 
-STATIC mp_obj_t mod_urandom_choice(mp_obj_t seq) {
+STATIC mp_obj_t mod_random_choice(mp_obj_t seq) {
     mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
     if (len > 0) {
         return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow(len)), MP_OBJ_SENTINEL);
@@ -182,7 +182,7 @@ STATIC mp_obj_t mod_urandom_choice(mp_obj_t seq) {
         mp_raise_type(&mp_type_IndexError);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_urandom_choice_obj, mod_urandom_choice);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_choice_obj, mod_random_choice);
 
 #if MICROPY_PY_BUILTINS_FLOAT
 
@@ -199,51 +199,51 @@ STATIC mp_float_t yasmarang_float(void) {
     return u.f - 1;
 }
 
-STATIC mp_obj_t mod_urandom_random(void) {
+STATIC mp_obj_t mod_random_random(void) {
     return mp_obj_new_float(yasmarang_float());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom_random_obj, mod_urandom_random);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_random_random_obj, mod_random_random);
 
-STATIC mp_obj_t mod_urandom_uniform(mp_obj_t a_in, mp_obj_t b_in) {
+STATIC mp_obj_t mod_random_uniform(mp_obj_t a_in, mp_obj_t b_in) {
     mp_float_t a = mp_obj_get_float(a_in);
     mp_float_t b = mp_obj_get_float(b_in);
     return mp_obj_new_float(a + (b - a) * yasmarang_float());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_uniform_obj, mod_urandom_uniform);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_uniform_obj, mod_random_uniform);
 
 #endif
 
 #endif // MICROPY_PY_URANDOM_EXTRA_FUNCS
 
 #if SEED_ON_IMPORT
-STATIC mp_obj_t mod_urandom___init__(void) {
+STATIC mp_obj_t mod_random___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;
     if (!seeded) {
         seeded = true;
-        mod_urandom_seed(0, NULL);
+        mod_random_seed(0, NULL);
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom___init___obj, mod_urandom___init__);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_random___init___obj, mod_random___init__);
 #endif
 
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random) },
     #if SEED_ON_IMPORT
-    { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_urandom___init___obj) },
+    { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_random___init___obj) },
     #endif
-    { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&mod_urandom_getrandbits_obj) },
-    { MP_ROM_QSTR(MP_QSTR_seed), MP_ROM_PTR(&mod_urandom_seed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&mod_random_getrandbits_obj) },
+    { MP_ROM_QSTR(MP_QSTR_seed), MP_ROM_PTR(&mod_random_seed_obj) },
     #if MICROPY_PY_URANDOM_EXTRA_FUNCS
-    { MP_ROM_QSTR(MP_QSTR_randrange), MP_ROM_PTR(&mod_urandom_randrange_obj) },
-    { MP_ROM_QSTR(MP_QSTR_randint), MP_ROM_PTR(&mod_urandom_randint_obj) },
-    { MP_ROM_QSTR(MP_QSTR_choice), MP_ROM_PTR(&mod_urandom_choice_obj) },
+    { MP_ROM_QSTR(MP_QSTR_randrange), MP_ROM_PTR(&mod_random_randrange_obj) },
+    { MP_ROM_QSTR(MP_QSTR_randint), MP_ROM_PTR(&mod_random_randint_obj) },
+    { MP_ROM_QSTR(MP_QSTR_choice), MP_ROM_PTR(&mod_random_choice_obj) },
     #if MICROPY_PY_BUILTINS_FLOAT
-    { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mod_urandom_random_obj) },
-    { MP_ROM_QSTR(MP_QSTR_uniform), MP_ROM_PTR(&mod_urandom_uniform_obj) },
+    { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mod_random_random_obj) },
+    { MP_ROM_QSTR(MP_QSTR_uniform), MP_ROM_PTR(&mod_random_uniform_obj) },
     #endif
     #endif
 };
diff --git a/extmod/modure.c b/extmod/modure.c
index 4798f07b0beb6..a6fad3cf4ee11 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -194,7 +194,7 @@ STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     mp_printf(print, "<re %p>", self);
 }
 
-STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
+STATIC mp_obj_t re_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], (mp_obj_type_t *)&re_type)) {
@@ -223,12 +223,12 @@ STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
 }
 
 STATIC mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {
-    return ure_exec(true, n_args, args);
+    return re_exec(true, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_match_obj, 2, 4, re_match);
 
 STATIC mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {
-    return ure_exec(false, n_args, args);
+    return re_exec(false, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);
 
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 6c2b4ff06fdeb..c8695f1044816 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -540,10 +540,10 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 /******************************************************************************/
-// usocket module
+// socket module
 
-// function usocket.getaddrinfo(host, port)
-STATIC mp_obj_t mod_usocket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
+// function socket.getaddrinfo(host, port)
+STATIC mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     size_t hlen;
     const char *host = mp_obj_str_get_data(args[0], &hlen);
     mp_int_t port = mp_obj_get_int(args[1]);
@@ -613,13 +613,13 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     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_VAR_BETWEEN(mod_usocket_getaddrinfo_obj, 2, 6, mod_usocket_getaddrinfo);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_socket_getaddrinfo_obj, 2, 6, mod_socket_getaddrinfo);
 
 STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
-    { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&mod_usocket_getaddrinfo_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&mod_socket_getaddrinfo_obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_AF_INET), MP_ROM_INT(MOD_NETWORK_AF_INET) },
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 6e490a594a065..c09059cae8572 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -53,7 +53,7 @@ struct ssl_args {
     mp_arg_val_t do_handshake;
 };
 
-STATIC const mp_obj_type_t ussl_socket_type;
+STATIC const mp_obj_type_t ssl_socket_type;
 
 // Table of error strings corresponding to SSL_xxx error codes.
 STATIC const char *const ssl_error_tab1[] = {
@@ -84,7 +84,7 @@ STATIC const char *const ssl_error_tab2[] = {
     "NOT_SUPPORTED",
 };
 
-STATIC NORETURN void ussl_raise_error(int err) {
+STATIC NORETURN void ssl_raise_error(int err) {
     MP_STATIC_ASSERT(SSL_NOT_OK - 3 == SSL_EAGAIN);
     MP_STATIC_ASSERT(SSL_ERROR_CONN_LOST - 18 == SSL_ERROR_NOT_SUPPORTED);
 
@@ -117,13 +117,13 @@ STATIC NORETURN void ussl_raise_error(int err) {
 }
 
 
-STATIC mp_obj_ssl_socket_t *ussl_socket_new(mp_obj_t sock, struct ssl_args *args) {
+STATIC mp_obj_ssl_socket_t *ssl_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);
     #else
     mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t);
     #endif
-    o->base.type = &ussl_socket_type;
+    o->base.type = &ssl_socket_type;
     o->buf = NULL;
     o->bytes_left = 0;
     o->sock = sock;
@@ -175,7 +175,7 @@ STATIC mp_obj_ssl_socket_t *ussl_socket_new(mp_obj_t sock, struct ssl_args *args
                 } else if (r == SSL_EAGAIN) {
                     r = MP_EAGAIN;
                 }
-                ussl_raise_error(r);
+                ssl_raise_error(r);
             }
         }
 
@@ -184,13 +184,13 @@ STATIC mp_obj_ssl_socket_t *ussl_socket_new(mp_obj_t sock, struct ssl_args *args
     return o;
 }
 
-STATIC void ussl_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void ssl_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_ssl_socket_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<_SSLSocket %p>", self->ssl_sock);
 }
 
-STATIC mp_uint_t ussl_socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t ssl_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);
 
     if (o->ssl_sock == NULL) {
@@ -239,7 +239,7 @@ STATIC mp_uint_t ussl_socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int
     return size;
 }
 
-STATIC mp_uint_t ussl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t ssl_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);
 
     if (o->ssl_sock == NULL) {
@@ -251,7 +251,7 @@ STATIC mp_uint_t ussl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t siz
 eagain:
     r = ssl_write(o->ssl_sock, buf, size);
     if (r == 0) {
-        // see comment in ussl_socket_read above
+        // see comment in ssl_socket_read above
         if (o->blocking) {
             goto eagain;
         } else {
@@ -271,7 +271,7 @@ STATIC mp_uint_t ussl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t siz
     return r;
 }
 
-STATIC mp_uint_t ussl_socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+STATIC mp_uint_t ssl_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);
     if (request == MP_STREAM_CLOSE && self->ssl_sock != NULL) {
         ssl_free(self->ssl_sock);
@@ -282,7 +282,7 @@ STATIC mp_uint_t ussl_socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t a
     return mp_get_stream(self->sock)->ioctl(self->sock, request, arg, errcode);
 }
 
-STATIC mp_obj_t ussl_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
+STATIC mp_obj_t ssl_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(self_in);
     mp_obj_t sock = o->sock;
     mp_obj_t dest[3];
@@ -292,36 +292,36 @@ STATIC mp_obj_t ussl_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     o->blocking = mp_obj_is_true(flag_in);
     return res;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ussl_socket_setblocking_obj, ussl_socket_setblocking);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_socket_setblocking_obj, ssl_socket_setblocking);
 
-STATIC const mp_rom_map_elem_t ussl_socket_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t ssl_socket_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_write), MP_ROM_PTR(&mp_stream_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&ussl_socket_setblocking_obj) },
+    { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&ssl_socket_setblocking_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
     #if MICROPY_PY_USSL_FINALISER
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(ussl_socket_locals_dict, ussl_socket_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
 
-STATIC const mp_stream_p_t ussl_socket_stream_p = {
-    .read = ussl_socket_read,
-    .write = ussl_socket_write,
-    .ioctl = ussl_socket_ioctl,
+STATIC const mp_stream_p_t ssl_socket_stream_p = {
+    .read = ssl_socket_read,
+    .write = ssl_socket_write,
+    .ioctl = ssl_socket_ioctl,
 };
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    ussl_socket_type,
+    ssl_socket_type,
     // Save on qstr's, reuse same as for module
     MP_QSTR_ssl,
     MP_TYPE_FLAG_NONE,
-    print, ussl_socket_print,
-    protocol, &ussl_socket_stream_p,
-    locals_dict, &ussl_socket_locals_dict
+    print, ssl_socket_print,
+    protocol, &ssl_socket_stream_p,
+    locals_dict, &ssl_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) {
@@ -341,7 +341,7 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
         MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args);
 
-    return MP_OBJ_FROM_PTR(ussl_socket_new(sock, &args));
+    return MP_OBJ_FROM_PTR(ssl_socket_new(sock, &args));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socket);
 
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 117a06b6b28d3..dbe802f75b142 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -73,7 +73,7 @@ struct ssl_args {
     mp_arg_val_t do_handshake;
 };
 
-STATIC const mp_obj_type_t ussl_socket_type;
+STATIC const mp_obj_type_t ssl_socket_type;
 
 #ifdef MBEDTLS_DEBUG_C
 STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
@@ -168,7 +168,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     #else
     mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t);
     #endif
-    o->base.type = &ussl_socket_type;
+    o->base.type = &ssl_socket_type;
     o->sock = sock;
     o->poll_mask = 0;
     o->last_error = 0;
@@ -435,7 +435,7 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
     return ret;
 }
 
-STATIC const mp_rom_map_elem_t ussl_socket_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t ssl_socket_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) },
@@ -451,22 +451,22 @@ STATIC const mp_rom_map_elem_t ussl_socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_getpeercert), MP_ROM_PTR(&mod_ssl_getpeercert_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ussl_socket_locals_dict, ussl_socket_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
 
-STATIC const mp_stream_p_t ussl_socket_stream_p = {
+STATIC const mp_stream_p_t ssl_socket_stream_p = {
     .read = socket_read,
     .write = socket_write,
     .ioctl = socket_ioctl,
 };
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    ussl_socket_type,
+    ssl_socket_type,
     // Save on qstr's, reuse same as for module
     MP_QSTR_ssl,
     MP_TYPE_FLAG_NONE,
     print, socket_print,
-    protocol, &ussl_socket_stream_p,
-    locals_dict, &ussl_socket_locals_dict
+    protocol, &ssl_socket_stream_p,
+    locals_dict, &ssl_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 8187fa2b23c19..643aef5d6d37b 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -46,16 +46,16 @@ struct qentry {
     mp_obj_t args;
 };
 
-typedef struct _mp_obj_utimeq_t {
+typedef struct _mp_obj_timeq_t {
     mp_obj_base_t base;
     mp_uint_t alloc;
     mp_uint_t len;
     struct qentry items[];
-} mp_obj_utimeq_t;
+} mp_obj_timeq_t;
 
-STATIC mp_uint_t utimeq_id;
+STATIC mp_uint_t timeq_id;
 
-STATIC mp_obj_utimeq_t *utimeq_get_heap(mp_obj_t heap_in) {
+STATIC mp_obj_timeq_t *timeq_get_heap(mp_obj_t heap_in) {
     return MP_OBJ_TO_PTR(heap_in);
 }
 
@@ -74,17 +74,17 @@ STATIC bool time_less_than(struct qentry *item, struct qentry *parent) {
     return res && res < (MODULO / 2);
 }
 
-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) {
+STATIC mp_obj_t timeq_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 = mp_obj_malloc_var(mp_obj_utimeq_t, struct qentry, alloc, type);
+    mp_obj_timeq_t *o = mp_obj_malloc_var(mp_obj_timeq_t, struct qentry, alloc, type);
     memset(o->items, 0, sizeof(*o->items) * alloc);
     o->alloc = alloc;
     o->len = 0;
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC void utimeq_heap_siftdown(mp_obj_utimeq_t *heap, mp_uint_t start_pos, mp_uint_t pos) {
+STATIC void timeq_heap_siftdown(mp_obj_timeq_t *heap, mp_uint_t start_pos, mp_uint_t pos) {
     struct qentry item = heap->items[pos];
     while (pos > start_pos) {
         mp_uint_t parent_pos = (pos - 1) >> 1;
@@ -100,7 +100,7 @@ STATIC void utimeq_heap_siftdown(mp_obj_utimeq_t *heap, mp_uint_t start_pos, mp_
     heap->items[pos] = item;
 }
 
-STATIC void utimeq_heap_siftup(mp_obj_utimeq_t *heap, mp_uint_t pos) {
+STATIC void timeq_heap_siftup(mp_obj_timeq_t *heap, mp_uint_t pos) {
     mp_uint_t start_pos = pos;
     mp_uint_t end_pos = heap->len;
     struct qentry item = heap->items[pos];
@@ -117,29 +117,29 @@ STATIC void utimeq_heap_siftup(mp_obj_utimeq_t *heap, mp_uint_t pos) {
         pos = child_pos;
     }
     heap->items[pos] = item;
-    utimeq_heap_siftdown(heap, start_pos, pos);
+    timeq_heap_siftdown(heap, start_pos, pos);
 }
 
-STATIC mp_obj_t mod_utimeq_heappush(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mod_timeq_heappush(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     mp_obj_t heap_in = args[0];
-    mp_obj_utimeq_t *heap = utimeq_get_heap(heap_in);
+    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
     if (heap->len == heap->alloc) {
         mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("queue overflow"));
     }
     mp_uint_t l = heap->len;
     heap->items[l].time = MP_OBJ_SMALL_INT_VALUE(args[1]);
-    heap->items[l].id = utimeq_id++;
+    heap->items[l].id = timeq_id++;
     heap->items[l].callback = args[2];
     heap->items[l].args = args[3];
-    utimeq_heap_siftdown(heap, 0, heap->len);
+    timeq_heap_siftdown(heap, 0, heap->len);
     heap->len++;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_utimeq_heappush_obj, 4, 4, mod_utimeq_heappush);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_timeq_heappush_obj, 4, 4, mod_timeq_heappush);
 
-STATIC mp_obj_t mod_utimeq_heappop(mp_obj_t heap_in, mp_obj_t list_ref) {
-    mp_obj_utimeq_t *heap = utimeq_get_heap(heap_in);
+STATIC mp_obj_t mod_timeq_heappop(mp_obj_t heap_in, mp_obj_t list_ref) {
+    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
     if (heap->len == 0) {
         mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty heap"));
     }
@@ -157,14 +157,14 @@ STATIC mp_obj_t mod_utimeq_heappop(mp_obj_t heap_in, mp_obj_t list_ref) {
     heap->items[heap->len].callback = MP_OBJ_NULL; // so we don't retain a pointer
     heap->items[heap->len].args = MP_OBJ_NULL;
     if (heap->len) {
-        utimeq_heap_siftup(heap, 0);
+        timeq_heap_siftup(heap, 0);
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_utimeq_heappop_obj, mod_utimeq_heappop);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_timeq_heappop_obj, mod_timeq_heappop);
 
-STATIC mp_obj_t mod_utimeq_peektime(mp_obj_t heap_in) {
-    mp_obj_utimeq_t *heap = utimeq_get_heap(heap_in);
+STATIC mp_obj_t mod_timeq_peektime(mp_obj_t heap_in) {
+    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
     if (heap->len == 0) {
         mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty heap"));
     }
@@ -172,22 +172,22 @@ STATIC mp_obj_t mod_utimeq_peektime(mp_obj_t heap_in) {
     struct qentry *item = &heap->items[0];
     return MP_OBJ_NEW_SMALL_INT(item->time);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_utimeq_peektime_obj, mod_utimeq_peektime);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_timeq_peektime_obj, mod_timeq_peektime);
 
 #if DEBUG
-STATIC mp_obj_t mod_utimeq_dump(mp_obj_t heap_in) {
-    mp_obj_utimeq_t *heap = utimeq_get_heap(heap_in);
+STATIC mp_obj_t mod_timeq_dump(mp_obj_t heap_in) {
+    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
     for (int i = 0; i < heap->len; i++) {
         printf(UINT_FMT "\t%p\t%p\n", heap->items[i].time,
             MP_OBJ_TO_PTR(heap->items[i].callback), MP_OBJ_TO_PTR(heap->items[i].args));
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_utimeq_dump_obj, mod_utimeq_dump);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_timeq_dump_obj, mod_timeq_dump);
 #endif
 
-STATIC mp_obj_t utimeq_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    mp_obj_utimeq_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t timeq_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    mp_obj_timeq_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
             return mp_obj_new_bool(self->len != 0);
@@ -198,29 +198,29 @@ STATIC mp_obj_t utimeq_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_rom_map_elem_t utimeq_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_push), MP_ROM_PTR(&mod_utimeq_heappush_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&mod_utimeq_heappop_obj) },
-    { MP_ROM_QSTR(MP_QSTR_peektime), MP_ROM_PTR(&mod_utimeq_peektime_obj) },
+STATIC const mp_rom_map_elem_t timeq_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_push), MP_ROM_PTR(&mod_timeq_heappush_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&mod_timeq_heappop_obj) },
+    { MP_ROM_QSTR(MP_QSTR_peektime), MP_ROM_PTR(&mod_timeq_peektime_obj) },
     #if DEBUG
-    { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_utimeq_dump_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_timeq_dump_obj) },
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(utimeq_locals_dict, utimeq_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(timeq_locals_dict, timeq_locals_dict_table);
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    utimeq_type,
+    timeq_type,
     MP_QSTR_timeq,
     MP_TYPE_FLAG_NONE,
-    make_new, utimeq_make_new,
-    unary_op, utimeq_unary_op,
-    locals_dict, &utimeq_locals_dict
+    make_new, timeq_make_new,
+    unary_op, timeq_unary_op,
+    locals_dict, &timeq_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_timeq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_timeq) },
-    { MP_ROM_QSTR(MP_QSTR_timeq), MP_ROM_PTR(&utimeq_type) },
+    { MP_ROM_QSTR(MP_QSTR_timeq), MP_ROM_PTR(&timeq_type) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_timeq_globals, mp_module_timeq_globals_table);
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 301f72fba0456..76330f3125926 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -299,16 +299,16 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &websocket_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {
+STATIC const mp_rom_map_elem_t websocket_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_websocket) },
     { MP_ROM_QSTR(MP_QSTR_websocket), MP_ROM_PTR(&websocket_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(uwebsocket_module_globals, uwebsocket_module_globals_table);
+STATIC MP_DEFINE_CONST_DICT(websocket_module_globals, websocket_module_globals_table);
 
 const mp_obj_module_t mp_module_websocket = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&uwebsocket_module_globals,
+    .globals = (mp_obj_dict_t *)&websocket_module_globals,
 };
 
 MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_websocket);
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 504c637c3c736..e840bdcbfd552 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -150,7 +150,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
-STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mod_zlib_decompress(size_t n_args, const mp_obj_t *args) {
     mp_obj_t data = args[0];
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
@@ -164,7 +164,7 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
 
     decomp->dest = dest_buf;
     decomp->dest_limit = dest_buf + dest_buf_size;
-    DEBUG_printf("uzlib: Initial out buffer: " UINT_FMT " bytes\n", dest_buf_size);
+    DEBUG_printf("zlib: Initial out buffer: " UINT_FMT " bytes\n", dest_buf_size);
     decomp->source = bufinfo.buf;
     decomp->source_limit = (byte *)bufinfo.buf + bufinfo.len;
 
@@ -198,7 +198,7 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
     }
 
     mp_uint_t final_sz = decomp->dest - dest_buf;
-    DEBUG_printf("uzlib: Resizing from " UINT_FMT " to final size: " UINT_FMT " bytes\n", dest_buf_size, final_sz);
+    DEBUG_printf("zlib: Resizing from " UINT_FMT " to final size: " UINT_FMT " bytes\n", dest_buf_size, final_sz);
     dest_buf = (byte *)m_renew(byte, dest_buf, dest_buf_size, final_sz);
     mp_obj_t res = mp_obj_new_bytearray_by_ref(final_sz, dest_buf);
     m_del_obj(TINF_DATA, decomp);
@@ -207,12 +207,12 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
 error:
     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);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_zlib_decompress_obj, 1, 3, mod_zlib_decompress);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t mp_module_zlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) },
-    { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&mod_uzlib_decompress_obj) },
+    { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&mod_zlib_decompress_obj) },
     { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) },
 };
 
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 53682743a9c8b..da756296fc904 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -41,14 +41,14 @@
 
 /******************************************************************************/
 // The following set of macros and functions provide a glue between the CC3100
-// simplelink layer and the functions/methods provided by the usocket module.
-// They were historically in a separate file because usocket was designed to
+// simplelink layer and the functions/methods provided by the socket module.
+// They were historically in a separate file because socket was designed to
 // work with multiple NICs, and the wlan_XXX functions just provided one
 // particular NIC implementation (that of the CC3100).  But the CC3200 port only
 // supports a single NIC (being the CC3100) so it's unnecessary and inefficient
 // to provide an intermediate wrapper layer.  Hence the wlan_XXX functions
 // are provided below as static functions so they can be inlined directly by
-// the corresponding usocket calls.
+// the corresponding socket calls.
 
 #define WLAN_MAX_RX_SIZE                16000
 #define WLAN_MAX_TX_SIZE                1476
@@ -769,11 +769,11 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 /******************************************************************************/
-// usocket module
+// socket module
 
-// function usocket.getaddrinfo(host, port)
+// function socket.getaddrinfo(host, port)
 /// \function 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_socket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
     size_t hlen;
     const char *host = mp_obj_str_get_data(host_in, &hlen);
     mp_int_t port = mp_obj_get_int(port_in);
@@ -792,13 +792,13 @@ 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_LITTLE);
     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_2(mod_socket_getaddrinfo_obj, mod_socket_getaddrinfo);
 
 STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket),          MP_ROM_PTR(&socket_type) },
-    { MP_ROM_QSTR(MP_QSTR_getaddrinfo),     MP_ROM_PTR(&mod_usocket_getaddrinfo_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getaddrinfo),     MP_ROM_PTR(&mod_socket_getaddrinfo_obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_AF_INET),         MP_ROM_INT(SL_AF_INET) },
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index aa78005d68bc8..8026f7b7575b1 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -125,7 +125,7 @@
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE        (0)
 #define MICROPY_KBD_EXCEPTION                       (1)
 
-// We define our own list of errno constants to include in uerrno module
+// We define our own list of errno constants to include in errno module
 #define MICROPY_PY_UERRNO_LIST \
     X(EPERM) \
     X(EIO) \
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 0d876eb5f7214..b3d467a80e999 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -225,7 +225,7 @@ void mp_task(void *pvParameter) {
     machine_pins_deinit();
     machine_deinit();
     #if MICROPY_PY_USOCKET_EVENTS
-    usocket_events_deinit();
+    socket_events_deinit();
     #endif
 
     mp_deinit();
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 80537ea473afb..ac6321d8f6f1d 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -63,7 +63,7 @@ static inline void esp_exceptions(esp_err_t e) {
     }
 }
 
-void usocket_events_deinit(void);
+void socket_events_deinit(void);
 void network_wlan_event_handler(system_event_t *event);
 void esp_initialise_wifi(void);
 
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 8199304457509..114629a9d77b9 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -87,22 +87,22 @@ void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms);
 // This divisor is used to reduce the load on the system, so it doesn't poll sockets too often
 #define USOCKET_EVENTS_DIVISOR (8)
 
-STATIC uint8_t usocket_events_divisor;
-STATIC socket_obj_t *usocket_events_head;
+STATIC uint8_t socket_events_divisor;
+STATIC socket_obj_t *socket_events_head;
 
-void usocket_events_deinit(void) {
-    usocket_events_head = NULL;
+void socket_events_deinit(void) {
+    socket_events_head = NULL;
 }
 
 // Assumes the socket is not already in the linked list, and adds it
-STATIC void usocket_events_add(socket_obj_t *sock) {
-    sock->events_next = usocket_events_head;
-    usocket_events_head = sock;
+STATIC void socket_events_add(socket_obj_t *sock) {
+    sock->events_next = socket_events_head;
+    socket_events_head = sock;
 }
 
 // Assumes the socket is already in the linked list, and removes it
-STATIC void usocket_events_remove(socket_obj_t *sock) {
-    for (socket_obj_t **s = &usocket_events_head;; s = &(*s)->events_next) {
+STATIC void socket_events_remove(socket_obj_t *sock) {
+    for (socket_obj_t **s = &socket_events_head;; s = &(*s)->events_next) {
         if (*s == sock) {
             *s = (*s)->events_next;
             return;
@@ -111,20 +111,20 @@ STATIC void usocket_events_remove(socket_obj_t *sock) {
 }
 
 // Polls all registered sockets for readability and calls their callback if they are readable
-void usocket_events_handler(void) {
-    if (usocket_events_head == NULL) {
+void socket_events_handler(void) {
+    if (socket_events_head == NULL) {
         return;
     }
-    if (--usocket_events_divisor) {
+    if (--socket_events_divisor) {
         return;
     }
-    usocket_events_divisor = USOCKET_EVENTS_DIVISOR;
+    socket_events_divisor = USOCKET_EVENTS_DIVISOR;
 
     fd_set rfds;
     FD_ZERO(&rfds);
     int max_fd = 0;
 
-    for (socket_obj_t *s = usocket_events_head; s != NULL; s = s->events_next) {
+    for (socket_obj_t *s = socket_events_head; s != NULL; s = s->events_next) {
         FD_SET(s->fd, &rfds);
         max_fd = MAX(max_fd, s->fd);
     }
@@ -137,7 +137,7 @@ void usocket_events_handler(void) {
     }
 
     // Call the callbacks
-    for (socket_obj_t *s = usocket_events_head; s != NULL; s = s->events_next) {
+    for (socket_obj_t *s = socket_events_head; s != NULL; s = s->events_next) {
         if (FD_ISSET(s->fd, &rfds)) {
             mp_call_function_1_protected(s->events_callback, s);
         }
@@ -402,12 +402,12 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
         case 20: {
             if (args[3] == mp_const_none) {
                 if (self->events_callback != MP_OBJ_NULL) {
-                    usocket_events_remove(self);
+                    socket_events_remove(self);
                     self->events_callback = MP_OBJ_NULL;
                 }
             } else {
                 if (self->events_callback == MP_OBJ_NULL) {
-                    usocket_events_add(self);
+                    socket_events_add(self);
                 }
                 self->events_callback = args[3];
             }
@@ -736,7 +736,7 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
         if (socket->fd >= 0) {
             #if MICROPY_PY_USOCKET_EVENTS
             if (socket->events_callback != MP_OBJ_NULL) {
-                usocket_events_remove(socket);
+                socket_events_remove(socket);
                 socket->events_callback = MP_OBJ_NULL;
             }
             #endif
@@ -871,5 +871,5 @@ const mp_obj_module_t mp_module_socket = {
 
 // 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.
+// extmod/mod{lwip,socket}.c.
 MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 4701040e66654..d6aaa9878725d 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -170,7 +170,7 @@ void *esp_native_code_commit(void *, size_t, void *);
 #define MICROPY_END_ATOMIC_SECTION(state) portEXIT_CRITICAL_NESTED(state)
 
 #if MICROPY_PY_USOCKET_EVENTS
-#define MICROPY_PY_USOCKET_EVENTS_HANDLER extern void usocket_events_handler(void); usocket_events_handler();
+#define MICROPY_PY_USOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler();
 #else
 #define MICROPY_PY_USOCKET_EVENTS_HANDLER
 #endif
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index f64107f8907fe..7f35c7f1b34be 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -43,7 +43,7 @@
 #include "gccollect.h"
 #include "modmachine.h"
 #include "modmusic.h"
-#include "modules/uos/microbitfs.h"
+#include "modules/os/microbitfs.h"
 #include "led.h"
 #include "uart.h"
 #include "nrf.h"
@@ -301,15 +301,15 @@ int main(int argc, char **argv) {
 #if MICROPY_MBFS
 // Use micro:bit filesystem
 mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    return uos_mbfs_new_reader(filename);
+    return os_mbfs_new_reader(filename);
 }
 
 mp_import_stat_t mp_import_stat(const char *path) {
-    return uos_mbfs_import_stat(path);
+    return os_mbfs_import_stat(path);
 }
 
 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);
+    return os_mbfs_open(n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index f4c2d20a0914b..5ffe837efea6e 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -121,8 +121,8 @@ typedef struct _persistent_config_t {
     uint8_t marker; // Should always be PERSISTENT_DATA_MARKER
 } persistent_config_t;
 
-extern const mp_obj_type_t uos_mbfs_fileio_type;
-extern const mp_obj_type_t uos_mbfs_textio_type;
+extern const mp_obj_type_t os_mbfs_fileio_type;
+extern const mp_obj_type_t os_mbfs_textio_type;
 
 // Page indexes count down from the end of ROM.
 STATIC uint8_t first_page_index;
@@ -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 = mp_obj_malloc(file_descriptor_obj, binary ? &uos_mbfs_fileio_type : &uos_mbfs_textio_type);
+    file_descriptor_obj *res = mp_obj_malloc(file_descriptor_obj, binary ? &os_mbfs_fileio_type : &os_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;
@@ -511,9 +511,9 @@ STATIC mp_uint_t file_read_byte(file_descriptor_obj *fd) {
     return res;
 }
 
-// Now follows the code to integrate this filesystem into the uos module.
+// Now follows the code to integrate this filesystem into the os module.
 
-mp_lexer_t *uos_mbfs_new_reader(const char *filename) {
+mp_lexer_t *os_mbfs_new_reader(const char *filename) {
     file_descriptor_obj *fd = microbit_file_open(filename, strlen(filename), false, false);
     if (fd == NULL) {
         mp_raise_OSError(MP_ENOENT);
@@ -525,7 +525,7 @@ mp_lexer_t *uos_mbfs_new_reader(const char *filename) {
     return mp_lexer_new(qstr_from_str(filename), reader);
 }
 
-mp_import_stat_t uos_mbfs_import_stat(const char *path) {
+mp_import_stat_t os_mbfs_import_stat(const char *path) {
     uint8_t chunk = microbit_find_file(path, strlen(path));
     if (chunk == FILE_NOT_FOUND) {
         return MP_IMPORT_STAT_NO_EXIST;
@@ -534,38 +534,38 @@ mp_import_stat_t uos_mbfs_import_stat(const char *path) {
     }
 }
 
-STATIC mp_obj_t uos_mbfs_file_name(mp_obj_t self) {
+STATIC mp_obj_t os_mbfs_file_name(mp_obj_t self) {
     file_descriptor_obj *fd = (file_descriptor_obj*)self;
     return microbit_file_name(fd);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(uos_mbfs_file_name_obj, uos_mbfs_file_name);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_file_name_obj, os_mbfs_file_name);
 
-STATIC mp_obj_t uos_mbfs_file_close(mp_obj_t self) {
+STATIC mp_obj_t os_mbfs_file_close(mp_obj_t self) {
     file_descriptor_obj *fd = (file_descriptor_obj*)self;
     microbit_file_close(fd);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(uos_mbfs_file_close_obj, uos_mbfs_file_close);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_file_close_obj, os_mbfs_file_close);
 
-STATIC mp_obj_t uos_mbfs_remove(mp_obj_t name) {
+STATIC mp_obj_t os_mbfs_remove(mp_obj_t name) {
     return microbit_remove(name);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(uos_mbfs_remove_obj, uos_mbfs_remove);
+MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_remove_obj, os_mbfs_remove);
 
-STATIC mp_obj_t uos_mbfs_file___exit__(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t os_mbfs_file___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
-    return uos_mbfs_file_close(args[0]);
+    return os_mbfs_file_close(args[0]);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uos_mbfs_file___exit___obj, 4, 4, uos_mbfs_file___exit__);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_mbfs_file___exit___obj, 4, 4, os_mbfs_file___exit__);
 
 typedef struct {
     mp_obj_base_t base;
     mp_fun_1_t iternext;
     uint8_t index;
-} uos_mbfs_ilistdir_it_t;
+} os_mbfs_ilistdir_it_t;
 
-STATIC mp_obj_t uos_mbfs_ilistdir_it_iternext(mp_obj_t self_in) {
-    uos_mbfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t os_mbfs_ilistdir_it_iternext(mp_obj_t self_in) {
+    os_mbfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
 
     // Read until the next FILE_START chunk.
     for (; self->index <= chunks_in_file_system; self->index++) {
@@ -589,27 +589,27 @@ STATIC mp_obj_t uos_mbfs_ilistdir_it_iternext(mp_obj_t self_in) {
     return MP_OBJ_STOP_ITERATION;
 }
 
-STATIC mp_obj_t uos_mbfs_ilistdir(void) {
-    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;
+STATIC mp_obj_t os_mbfs_ilistdir(void) {
+    os_mbfs_ilistdir_it_t *iter = mp_obj_malloc(os_mbfs_ilistdir_it_t, &mp_type_polymorph_iter);
+    iter->iternext = os_mbfs_ilistdir_it_iternext;
     iter->index = 1;
 
     return MP_OBJ_FROM_PTR(iter);
 }
-MP_DEFINE_CONST_FUN_OBJ_0(uos_mbfs_ilistdir_obj, uos_mbfs_ilistdir);
+MP_DEFINE_CONST_FUN_OBJ_0(os_mbfs_ilistdir_obj, os_mbfs_ilistdir);
 
-MP_DEFINE_CONST_FUN_OBJ_0(uos_mbfs_listdir_obj, microbit_file_list);
+MP_DEFINE_CONST_FUN_OBJ_0(os_mbfs_listdir_obj, microbit_file_list);
 
 STATIC mp_obj_t microbit_file_writable(mp_obj_t self) {
     return mp_obj_new_bool(((file_descriptor_obj *)self)->writable);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(microbit_file_writable_obj, microbit_file_writable);
 
-STATIC const mp_map_elem_t uos_mbfs_file_locals_dict_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&uos_mbfs_file_close_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_name), (mp_obj_t)&uos_mbfs_file_name_obj },
+STATIC const mp_map_elem_t os_mbfs_file_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&os_mbfs_file_close_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_name), (mp_obj_t)&os_mbfs_file_name_obj },
     { MP_ROM_QSTR(MP_QSTR___enter__), (mp_obj_t)&mp_identity_obj },
-    { MP_ROM_QSTR(MP_QSTR___exit__), (mp_obj_t)&uos_mbfs_file___exit___obj },
+    { MP_ROM_QSTR(MP_QSTR___exit__), (mp_obj_t)&os_mbfs_file___exit___obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_writable), (mp_obj_t)&microbit_file_writable_obj },
     /* Stream methods */
     { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj },
@@ -617,7 +617,7 @@ STATIC const mp_map_elem_t uos_mbfs_file_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj},
     { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj},
 };
-STATIC MP_DEFINE_CONST_DICT(uos_mbfs_file_locals_dict, uos_mbfs_file_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(os_mbfs_file_locals_dict, os_mbfs_file_locals_dict_table);
 
 
 STATIC const mp_stream_p_t textio_stream_p = {
@@ -627,11 +627,11 @@ STATIC const mp_stream_p_t textio_stream_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    uos_mbfs_textio_type,
+    os_mbfs_textio_type,
     MP_QSTR_TextIO,
     MP_TYPE_FLAG_NONE,
     protocol, &textio_stream_p,
-    locals_dict, &uos_mbfs_file_locals_dict
+    locals_dict, &os_mbfs_file_locals_dict
     );
 
 
@@ -641,15 +641,15 @@ STATIC const mp_stream_p_t fileio_stream_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    uos_mbfs_fileio_type,
+    os_mbfs_fileio_type,
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_NONE,
     protocol, &fileio_stream_p,
-    locals_dict, &uos_mbfs_file_locals_dict
+    locals_dict, &os_mbfs_file_locals_dict
     );
 
 // From micro:bit fileobj.c
-mp_obj_t uos_mbfs_open(size_t n_args, const mp_obj_t *args) {
+mp_obj_t os_mbfs_open(size_t n_args, const mp_obj_t *args) {
     /// -1 means default; 0 explicitly false; 1 explicitly true.
     int read = -1;
     int text = -1;
@@ -683,7 +683,7 @@ mp_obj_t uos_mbfs_open(size_t n_args, const mp_obj_t *args) {
     mp_raise_ValueError(MP_ERROR_TEXT("illegal mode"));
 }
 
-STATIC mp_obj_t uos_mbfs_stat(mp_obj_t filename) {
+STATIC mp_obj_t os_mbfs_stat(mp_obj_t filename) {
     mp_obj_t file_size = microbit_file_size(filename);
 
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
@@ -699,6 +699,6 @@ STATIC mp_obj_t uos_mbfs_stat(mp_obj_t filename) {
     t->items[9] = MP_OBJ_NEW_SMALL_INT(0); // st_ctime
     return MP_OBJ_FROM_PTR(t);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(uos_mbfs_stat_obj, uos_mbfs_stat);
+MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_stat_obj, os_mbfs_stat);
 
 #endif // MICROPY_MBFS
diff --git a/ports/nrf/modules/uos/microbitfs.h b/ports/nrf/modules/uos/microbitfs.h
index 645a1e3289617..56d111383e21d 100644
--- a/ports/nrf/modules/uos/microbitfs.h
+++ b/ports/nrf/modules/uos/microbitfs.h
@@ -40,14 +40,14 @@
 #define MBFS_LOG_CHUNK_SIZE 7
 #endif
 
-mp_obj_t uos_mbfs_open(size_t n_args, const mp_obj_t *args);
+mp_obj_t os_mbfs_open(size_t n_args, const mp_obj_t *args);
 void microbit_filesystem_init(void);
-mp_lexer_t *uos_mbfs_new_reader(const char *filename);
-mp_import_stat_t uos_mbfs_import_stat(const char *path);
+mp_lexer_t *os_mbfs_new_reader(const char *filename);
+mp_import_stat_t os_mbfs_import_stat(const char *path);
 
-MP_DECLARE_CONST_FUN_OBJ_0(uos_mbfs_listdir_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(uos_mbfs_ilistdir_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(uos_mbfs_remove_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(uos_mbfs_stat_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(os_mbfs_listdir_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(os_mbfs_ilistdir_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(os_mbfs_remove_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(os_mbfs_stat_obj);
 
 #endif // __MICROPY_INCLUDED_FILESYSTEM_H__
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index b7181506134f8..7c54f28ab45ae 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -33,7 +33,7 @@
 #include "py/objstr.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
-#include "modules/uos/microbitfs.h"
+#include "modules/os/microbitfs.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
@@ -158,10 +158,10 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mod_os_sync_obj) },
 
 #elif MICROPY_MBFS
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&uos_mbfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&uos_mbfs_ilistdir_obj) }, // uses ~136 bytes
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&uos_mbfs_stat_obj) },         // uses ~228 bytes
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&uos_mbfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&os_mbfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&os_mbfs_ilistdir_obj) }, // uses ~136 bytes
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&os_mbfs_stat_obj) },         // uses ~228 bytes
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_mbfs_remove_obj) },
 #endif
 
     /// \constant sep - separation character used in paths
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 3d482f4fe1f30..0799000b908dd 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -133,7 +133,7 @@
     #define MICROPY_FATFS_MAX_SS       (4096)
 #endif
 
-// Use port specific uos module rather than extmod variant.
+// Use port specific os module rather than extmod variant.
 #define MICROPY_PY_UOS              (0)
 
 #define MICROPY_STREAMS_NON_BLOCK   (1)
diff --git a/ports/nrf/qstrdefsport.h b/ports/nrf/qstrdefsport.h
index 3cc2f1e6468c3..f12cf40efadc0 100644
--- a/ports/nrf/qstrdefsport.h
+++ b/ports/nrf/qstrdefsport.h
@@ -30,7 +30,7 @@
 // Entries for sys.path
 Q(/flash)
 
-// For uos.sep
+// For os.sep
 Q(/)
 
 Q(a)
diff --git a/ports/renesas-ra/qstrdefsport.h b/ports/renesas-ra/qstrdefsport.h
index bc07f2752aa85..7f5743bbdce79 100644
--- a/ports/renesas-ra/qstrdefsport.h
+++ b/ports/renesas-ra/qstrdefsport.h
@@ -33,7 +33,7 @@ Q(/flash/lib)
 Q(/sd)
 Q(/sd/lib)
 
-// For uos.sep
+// For os.sep
 Q(/)
 
 #if MICROPY_HW_ENABLE_USB
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 7e231b28b45ea..9890e3b590ffe 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -116,7 +116,7 @@ STATIC mp_obj_t machine_unique_id(void) {
     // 0x0080a040: 50534b54 332e3120 ff091645
     //
     // MicroPython (this code and same order as shown in Arduino IDE)
-    // >>> ubinascii.hexlify(machine.unique_id())
+    // >>> binascii.hexlify(machine.unique_id())
     // b'6e27f15f50534b54332e3120ff091645'
 
     #if defined(MCU_SAMD21)
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 88eafafb0aa1f..b7d6fe7e6a162 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -89,7 +89,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);
 MP_DECLARE_CONST_FUN_OBJ_KW(pyb_main_obj); // defined in main.c
 
 // Get or set the UART object that the REPL is repeated on.
-// This is a legacy function, use of uos.dupterm is preferred.
+// This is a legacy function, use of os.dupterm is preferred.
 STATIC mp_obj_t pyb_repl_uart(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         if (MP_STATE_PORT(pyb_stdio_uart) == NULL) {
diff --git a/ports/stm32/qstrdefsport.h b/ports/stm32/qstrdefsport.h
index e7d84cbec0ebb..d44388ebd2eb6 100644
--- a/ports/stm32/qstrdefsport.h
+++ b/ports/stm32/qstrdefsport.h
@@ -33,7 +33,7 @@ Q(/flash/lib)
 Q(/sd)
 Q(/sd/lib)
 
-// For uos.sep
+// For os.sep
 Q(/)
 
 #if MICROPY_HW_ENABLE_USB
diff --git a/ports/stm32/rng.c b/ports/stm32/rng.c
index eea02f72657de..5d6ddf6d62c9a 100644
--- a/ports/stm32/rng.c
+++ b/ports/stm32/rng.c
@@ -66,7 +66,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(pyb_rng_get_obj, pyb_rng_get);
 // For MCUs that don't have an RNG we still need to provide a rng_get() function,
 // 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
+// don't want to use random's pRNG because then the user won't see a reproducible
 // random stream.
 
 // Yasmarang random number generator by Ilya Levin
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index f059c21be40bd..ab06c0fb39357 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -364,7 +364,7 @@ STATIC mp_obj_t extra_coverage(void) {
         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_repl_autocomplete("import time", 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);
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 2d4eeec346d87..d8a615b469693 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -54,11 +54,10 @@
 /*
   The idea of this module is to implement reasonable minimum of
   socket-related functions to write typical clients and servers.
-  The module named "usocket" on purpose, to allow to make
-  Python-level module more (or fully) compatible with CPython
-  "socket", e.g.:
+  It's then possible to make a Python-level module more (or fully)
+  compatible with CPython "socket", e.g.:
   ---- socket.py ----
-  from usocket import *
+  from socket import *
   from socket_more_funcs import *
   from socket_more_funcs2 import *
   -------------------
@@ -487,7 +486,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, siz
     return MP_OBJ_FROM_PTR(socket_new(fd));
 }
 
-STATIC const mp_rom_map_elem_t usocket_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_fileno), MP_ROM_PTR(&socket_fileno_obj) },
     { MP_ROM_QSTR(MP_QSTR_makefile), MP_ROM_PTR(&socket_makefile_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
@@ -508,9 +507,9 @@ STATIC const mp_rom_map_elem_t usocket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(usocket_locals_dict, usocket_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
-STATIC const mp_stream_p_t usocket_stream_p = {
+STATIC const mp_stream_p_t socket_stream_p = {
     .read = socket_read,
     .write = socket_write,
     .ioctl = socket_ioctl,
@@ -522,8 +521,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     make_new, socket_make_new,
     print, socket_print,
-    protocol, &usocket_stream_p,
-    locals_dict, &usocket_locals_dict
+    protocol, &socket_stream_p,
+    locals_dict, &socket_locals_dict
     );
 
 #define BINADDR_MAX_LEN sizeof(struct in6_addr)
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 5478b69ad41f2..eafc915ca4b31 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -255,7 +255,7 @@ 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);
+    int fd = open("/dev/random", O_RDONLY);
     RAISE_ERRNO(fd, errno);
     RAISE_ERRNO(read(fd, buf, n), errno);
     close(fd);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 9f4d88ec09ddd..fbe8ba54e2d22 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1273,7 +1273,7 @@ typedef double mp_float_t;
 #define MICROPY_PY_COLLECTIONS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
-// Whether to provide "ucollections.deque" type
+// Whether to provide "collections.deque" type
 #ifndef MICROPY_PY_COLLECTIONS_DEQUE
 #define MICROPY_PY_COLLECTIONS_DEQUE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
@@ -1458,44 +1458,44 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_ATTR_DELEGATION (MICROPY_PY_SYS_PS1_PS2 || MICROPY_PY_SYS_TRACEBACKLIMIT)
 #endif
 
-// Whether to provide "uerrno" module
+// Whether to provide "errno" module
 #ifndef MICROPY_PY_UERRNO
 #define MICROPY_PY_UERRNO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Whether to provide the uerrno.errorcode dict
+// Whether to provide the errno.errorcode dict
 #ifndef MICROPY_PY_UERRNO_ERRORCODE
 #define MICROPY_PY_UERRNO_ERRORCODE (1)
 #endif
 
-// Whether to provide "uselect" module (baremetal implementation)
+// Whether to provide "select" module (baremetal implementation)
 #ifndef MICROPY_PY_USELECT
 #define MICROPY_PY_USELECT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Whether to enable the select() function in the "uselect" module (baremetal
+// Whether to enable the select() function in the "select" 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 the "utime" module
+// Whether to provide the "time" module
 #ifndef MICROPY_PY_UTIME
 #define MICROPY_PY_UTIME (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
 #endif
 
-// Whether to provide utime.gmtime/localtime/mktime functions
+// Whether to provide time.gmtime/localtime/mktime functions
 #ifndef MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
 #define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (0)
 #endif
 
-// Whether to provide utime.time/time_ns functions
+// Whether to provide time.time/time_ns functions
 #ifndef MICROPY_PY_UTIME_TIME_TIME_NS
 #define MICROPY_PY_UTIME_TIME_TIME_NS (0)
 #endif
 
-// Period of values returned by utime.ticks_ms(), ticks_us(), ticks_cpu()
+// Period of values returned by time.ticks_ms(), ticks_us(), ticks_cpu()
 // functions. Should be power of two. All functions above use the same
 // period, so if underlying hardware/API has different periods, the
 // minimum of them should be used. The value below is the maximum value
@@ -1686,7 +1686,7 @@ typedef double mp_float_t;
 #define MICROPY_PY_USSL (0)
 #endif
 
-// Whether to add finaliser code to ussl objects
+// Whether to add finaliser code to ssl objects
 #ifndef MICROPY_PY_USSL_FINALISER
 #define MICROPY_PY_USSL_FINALISER (0)
 #endif

From f5f9edf6457624bf32e71b0c2fdcfbfa5d5753a6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 15:01:26 +1000
Subject: [PATCH 0012/3129] all: Rename UMODULE to MODULE in
 preprocessor/Makefile vars.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/random.rst                       |   4 +-
 examples/natmod/uheapq/uheapq.c               |   2 +-
 examples/natmod/urandom/urandom.c             |   6 +-
 examples/natmod/ure/ure.c                     |   8 +-
 examples/natmod/uzlib/uzlib.c                 |   2 +-
 extmod/extmod.mk                              |   4 +-
 extmod/modlwip.c                              |   2 +-
 extmod/modnetwork.h                           |   2 +-
 extmod/moduasyncio.c                          |   6 +-
 extmod/modubinascii.c                         |   8 +-
 extmod/moducryptolib.c                        |  18 +--
 extmod/moduhashlib.c                          |  24 +--
 extmod/moduheapq.c                            |   4 +-
 extmod/modujson.c                             |   6 +-
 extmod/moduos.c                               |  34 ++---
 extmod/moduplatform.c                         |   4 +-
 extmod/moduplatform.h                         |   2 +-
 extmod/modurandom.c                           |  18 +--
 extmod/modure.c                               |  26 ++--
 extmod/moduselect.c                           |  10 +-
 extmod/modusocket.c                           |  14 +-
 extmod/modussl_axtls.c                        |   8 +-
 extmod/modussl_mbedtls.c                      |   8 +-
 extmod/modutime.c                             |  40 ++---
 extmod/modutimeq.c                            |   6 +-
 extmod/moduwebsocket.c                        |   4 +-
 extmod/moduzlib.c                             |   4 +-
 extmod/uos_dupterm.c                          |   8 +-
 extmod/vfs_posix.c                            |   4 +-
 extmod/vfs_posix_file.c                       |   2 +-
 ports/cc3200/mods/modusocket.c                |   2 +-
 ports/cc3200/mpconfigport.h                   |  28 ++--
 ports/esp32/main.c                            |   2 +-
 ports/esp32/modsocket.c                       |  14 +-
 ports/esp32/moduos.c                          |   2 +-
 ports/esp32/mpconfigport.h                    |  46 +++---
 ports/esp32/mphalport.c                       |   2 +-
 ports/esp8266/Makefile                        |   2 +-
 ports/esp8266/boards/GENERIC/mpconfigboard.h  |   2 +-
 .../esp8266/boards/GENERIC_1M/mpconfigboard.h |   2 +-
 .../boards/GENERIC_512K/mpconfigboard.h       |   2 +-
 ports/esp8266/mpconfigport.h                  |  30 ++--
 .../boards/ADAFRUIT_METRO_M7/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 +-
 .../boards/MIMXRT1170_EVK/mpconfigboard.mk    |   2 +-
 .../boards/OLIMEX_RT1010/mpconfigboard.h      |   2 +-
 .../boards/SEEED_ARCH_MIX/mpconfigboard.mk    |   2 +-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |   2 +-
 ports/mimxrt/moduos.c                         |   4 +-
 ports/mimxrt/mpconfigport.h                   |  36 ++---
 ports/nrf/boards/evk_nina_b3/mpconfigboard.h  |   4 +-
 ports/nrf/mpconfigport.h                      |  14 +-
 ports/qemu-arm/mpconfigport.h                 |  18 +--
 .../boards/EK_RA4M1/mpconfigboard.h           |   4 +-
 .../boards/EK_RA4W1/mpconfigboard.h           |   4 +-
 .../boards/EK_RA6M1/mpconfigboard.h           |   4 +-
 .../boards/EK_RA6M2/mpconfigboard.h           |   4 +-
 .../boards/RA4M1_CLICKER/mpconfigboard.h      |   4 +-
 ports/renesas-ra/mpconfigport.h               |  28 ++--
 .../mpconfigboard.h                           |   2 +-
 ports/rp2/mpconfigport.h                      |  40 ++---
 ports/samd/mcu/samd21/mpconfigmcu.h           |   8 +-
 ports/samd/mcu/samd51/mpconfigmcu.h           |   6 +-
 ports/samd/moduos.c                           |   8 +-
 ports/samd/mpconfigport.h                     |  22 +--
 .../boards/ARDUINO_GIGA/mpconfigboard.mk      |   2 +-
 .../ARDUINO_NICLA_VISION/mpconfigboard.mk     |   2 +-
 .../ARDUINO_PORTENTA_H7/mpconfigboard.mk      |   2 +-
 .../boards/B_L072Z_LRWAN1/mpconfigboard.h     |   6 +-
 .../boards/ESPRUINO_PICO/mpconfigboard.h      |   2 +-
 .../boards/NUCLEO_F091RC/mpconfigboard.h      |   6 +-
 .../boards/NUCLEO_F429ZI/mpconfigboard.mk     |   2 +-
 .../boards/NUCLEO_F439ZI/mpconfigboard.mk     |   2 +-
 .../boards/NUCLEO_F746ZG/mpconfigboard.mk     |   2 +-
 .../boards/NUCLEO_F756ZG/mpconfigboard.mk     |   2 +-
 .../boards/NUCLEO_F767ZI/mpconfigboard.mk     |   2 +-
 .../boards/NUCLEO_G474RE/mpconfigboard.h      |  12 +-
 .../boards/NUCLEO_H723ZG/mpconfigboard.mk     |   2 +-
 .../boards/NUCLEO_H743ZI/mpconfigboard.mk     |   2 +-
 .../boards/NUCLEO_L073RZ/mpconfigboard.h      |   6 +-
 .../boards/NUCLEO_L432KC/mpconfigboard.h      |   6 +-
 .../boards/NUCLEO_L452RE/mpconfigboard.h      |   2 +-
 .../stm32/boards/NUCLEO_WL55/mpconfigboard.h  |   6 +-
 .../stm32/boards/OLIMEX_E407/mpconfigboard.mk |   2 +-
 ports/stm32/boards/PYBD_SF2/mpconfigboard.mk  |   2 +-
 ports/stm32/boards/PYBD_SF3/mpconfigboard.mk  |   2 +-
 ports/stm32/boards/PYBD_SF6/mpconfigboard.mk  |   2 +-
 .../boards/STM32F769DISC/mpconfigboard.mk     |   2 +-
 .../stm32/boards/STM32F7DISC/mpconfigboard.mk |   2 +-
 .../boards/VCC_GND_F407ZG/mpconfigboard.mk    |   2 +-
 ports/stm32/moduos.c                          |   2 +-
 ports/stm32/mpconfigport.h                    |  46 +++---
 ports/unix/Makefile                           |   2 +-
 ports/unix/README.md                          |   2 +-
 ports/unix/mbedtls/mbedtls_config.h           |   2 +-
 ports/unix/moduselect.c                       |   8 +-
 ports/unix/modusocket.c                       |   4 +-
 ports/unix/modutime.c                         |   2 +-
 ports/unix/mpconfigport.h                     |   4 +-
 ports/unix/mpconfigport.mk                    |   4 +-
 .../unix/variants/coverage/mpconfigvariant.h  |   2 +-
 ports/unix/variants/minimal/mpconfigvariant.h |   2 +-
 .../unix/variants/minimal/mpconfigvariant.mk  |   2 +-
 ports/unix/variants/mpconfigvariant_common.h  |  42 ++---
 ports/windows/mpconfigport.h                  |  44 +++---
 ports/windows/variants/dev/mpconfigvariant.h  |   4 +-
 ports/zephyr/modusocket.c                     |   6 +-
 ports/zephyr/modzsensor.c                     |   2 +-
 ports/zephyr/mpconfigport.h                   |  16 +-
 ports/zephyr/prj.conf                         |   2 +-
 py/moduerrno.c                                |  18 +--
 py/mpconfig.h                                 | 144 +++++++++---------
 py/mperrno.h                                  |   2 +-
 py/objbool.c                                  |   2 +-
 py/objdict.c                                  |   6 +-
 py/objexcept.c                                |   2 +-
 py/objlist.c                                  |   4 +-
 py/objnone.c                                  |   2 +-
 py/objstr.c                                   |   4 +-
 py/objstrunicode.c                            |   2 +-
 py/objtuple.c                                 |   6 +-
 py/parse.c                                    |   2 +-
 tools/ci.sh                                   |   4 +-
 126 files changed, 563 insertions(+), 563 deletions(-)

diff --git a/docs/library/random.rst b/docs/library/random.rst
index dd8b47c80f084..be56eb088eae7 100644
--- a/docs/library/random.rst
+++ b/docs/library/random.rst
@@ -24,7 +24,7 @@ This module implements a pseudo-random number generator (PRNG).
 .. note::
 
    The :func:`randrange`, :func:`randint` and :func:`choice` functions are only
-   available if the ``MICROPY_PY_URANDOM_EXTRA_FUNCS`` configuration option is
+   available if the ``MICROPY_PY_RANDOM_EXTRA_FUNCS`` configuration option is
    enabled.
 
 
@@ -73,7 +73,7 @@ Other Functions
     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
+    The ``None`` case only works if ``MICROPY_PY_RANDOM_SEED_INIT_FUNC`` is
     enabled by the port, otherwise it raises ``ValueError``.
 
 .. function:: choice(sequence)
diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c
index ff70bef479ec7..e339ccafd7732 100644
--- a/examples/natmod/uheapq/uheapq.c
+++ b/examples/natmod/uheapq/uheapq.c
@@ -1,4 +1,4 @@
-#define MICROPY_PY_UHEAPQ (1)
+#define MICROPY_PY_HEAPQ (1)
 
 #include "py/dynruntime.h"
 
diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c
index 0c4e88c77e7c2..ed46651b342ba 100644
--- a/examples/natmod/urandom/urandom.c
+++ b/examples/natmod/urandom/urandom.c
@@ -1,5 +1,5 @@
-#define MICROPY_PY_URANDOM (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
+#define MICROPY_PY_RANDOM (1)
+#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1)
 
 #include "py/dynruntime.h"
 
@@ -19,7 +19,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_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_random));
     mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_random_getrandbits_obj));
     mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_random_seed_obj));
-    #if MICROPY_PY_URANDOM_EXTRA_FUNCS
+    #if MICROPY_PY_RANDOM_EXTRA_FUNCS
     mp_store_global(MP_QSTR_randrange, MP_OBJ_FROM_PTR(&mod_random_randrange_obj));
     mp_store_global(MP_QSTR_randint, MP_OBJ_FROM_PTR(&mod_random_randint_obj));
     mp_store_global(MP_QSTR_choice, MP_OBJ_FROM_PTR(&mod_random_choice_obj));
diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
index c51df2a475955..79eca90ab9eb7 100644
--- a/examples/natmod/ure/ure.c
+++ b/examples/natmod/ure/ure.c
@@ -1,8 +1,8 @@
 #define MICROPY_STACK_CHECK (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 (0) // requires vstr interface
+#define MICROPY_PY_RE (1)
+#define MICROPY_PY_RE_MATCH_GROUPS (1)
+#define MICROPY_PY_RE_MATCH_SPAN_START_END (1)
+#define MICROPY_PY_RE_SUB (0) // requires vstr interface
 
 #include <alloca.h>
 #include "py/dynruntime.h"
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index ea21235102dd0..9a3ec0af3c83c 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -1,4 +1,4 @@
-#define MICROPY_PY_UZLIB (1)
+#define MICROPY_PY_ZLIB (1)
 
 #include "py/dynruntime.h"
 
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index ee9372e18d9bf..2f9bd3b065dd5 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -108,8 +108,8 @@ endif
 ################################################################################
 # ussl
 
-ifeq ($(MICROPY_PY_USSL),1)
-CFLAGS_EXTMOD += -DMICROPY_PY_USSL=1
+ifeq ($(MICROPY_PY_SSL),1)
+CFLAGS_EXTMOD += -DMICROPY_PY_SSL=1
 ifeq ($(MICROPY_SSL_AXTLS),1)
 AXTLS_DIR = lib/axtls
 GIT_SUBMODULES += $(AXTLS_DIR)
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index c66a1de196139..a902e8fb0fe30 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -918,7 +918,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 = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
+    mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 11691140fd6f1..4786596e9b93d 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -101,7 +101,7 @@ typedef struct _mod_network_socket_obj_t {
     int32_t timeout;
     mp_obj_t callback;
     int32_t state   : 8;
-    #if MICROPY_PY_USOCKET_EXTENDED_STATE
+    #if MICROPY_PY_SOCKET_EXTENDED_STATE
     // Extended socket state for NICs/ports that need it.
     void *_private;
     #endif
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 021e0da1be2c4..c05a8dfc60979 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -64,14 +64,14 @@ STATIC mp_obj_t task_queue_make_new(const mp_obj_type_t *type, size_t n_args, si
 // Ticks for task ordering in pairing heap
 
 STATIC mp_obj_t ticks(void) {
-    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 
 STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
     mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);
     mp_uint_t t1 = MP_OBJ_SMALL_INT_VALUE(t1_in);
-    mp_int_t diff = ((t1 - t0 + MICROPY_PY_UTIME_TICKS_PERIOD / 2) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1))
-        - MICROPY_PY_UTIME_TICKS_PERIOD / 2;
+    mp_int_t diff = ((t1 - t0 + MICROPY_PY_TIME_TICKS_PERIOD / 2) & (MICROPY_PY_TIME_TICKS_PERIOD - 1))
+        - MICROPY_PY_TIME_TICKS_PERIOD / 2;
     return diff;
 }
 
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index bfb8195d91909..af8eab79f0a05 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -32,7 +32,7 @@
 #include "py/binary.h"
 #include "py/objstr.h"
 
-#if MICROPY_PY_UBINASCII
+#if MICROPY_PY_BINASCII
 
 #if MICROPY_PY_BUILTINS_BYTES_HEX
 STATIC mp_obj_t bytes_hex_as_bytes(size_t n_args, const mp_obj_t *args) {
@@ -170,7 +170,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
 
-#if MICROPY_PY_UBINASCII_CRC32
+#if MICROPY_PY_BINASCII_CRC32
 #include "lib/uzlib/tinf.h"
 
 STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
@@ -191,7 +191,7 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
     #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
+    #if MICROPY_PY_BINASCII_CRC32
     { MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_binascii_crc32_obj) },
     #endif
 };
@@ -205,4 +205,4 @@ const mp_obj_module_t mp_module_binascii = {
 
 MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_binascii);
 
-#endif // MICROPY_PY_UBINASCII
+#endif // MICROPY_PY_BINASCII
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index 0c9701024eea5..229947725991d 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -27,7 +27,7 @@
 
 #include "py/mpconfig.h"
 
-#if MICROPY_PY_UCRYPTOLIB
+#if MICROPY_PY_CRYPTOLIB
 
 #include <assert.h>
 #include <string.h>
@@ -90,7 +90,7 @@ typedef struct _mp_obj_aes_t {
 } mp_obj_aes_t;
 
 static inline bool is_ctr_mode(int block_mode) {
-    #if MICROPY_PY_UCRYPTOLIB_CTR
+    #if MICROPY_PY_CRYPTOLIB_CTR
     return block_mode == UCRYPTOLIB_MODE_CTR;
     #else
     return false;
@@ -140,7 +140,7 @@ STATIC void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *
     }
 }
 
-#if MICROPY_PY_UCRYPTOLIB_CTR
+#if MICROPY_PY_CRYPTOLIB_CTR
 // axTLS doesn't have CTR support out of the box. This implements the counter part using the ECB primitive.
 STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) {
     size_t n = ctr_params->offset;
@@ -203,7 +203,7 @@ STATIC void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *
     mbedtls_aes_crypt_cbc(&ctx->u.mbedtls_ctx, encrypt ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT, in_len, ctx->iv, in, out);
 }
 
-#if MICROPY_PY_UCRYPTOLIB_CTR
+#if MICROPY_PY_CRYPTOLIB_CTR
 STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) {
     mbedtls_aes_crypt_ctr(&ctx->u.mbedtls_ctx, in_len, &ctr_params->offset, ctx->iv, ctr_params->encrypted_counter, in, out);
 }
@@ -219,7 +219,7 @@ STATIC mp_obj_t cryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args,
     switch (block_mode) {
         case UCRYPTOLIB_MODE_ECB:
         case UCRYPTOLIB_MODE_CBC:
-        #if MICROPY_PY_UCRYPTOLIB_CTR
+        #if MICROPY_PY_CRYPTOLIB_CTR
         case UCRYPTOLIB_MODE_CTR:
         #endif
             break;
@@ -318,7 +318,7 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
             aes_process_cbc_impl(&self->ctx, in_bufinfo.buf, out_buf_ptr, in_bufinfo.len, encrypt);
             break;
 
-        #if MICROPY_PY_UCRYPTOLIB_CTR
+        #if MICROPY_PY_CRYPTOLIB_CTR
         case UCRYPTOLIB_MODE_CTR:
             aes_process_ctr_impl(&self->ctx, in_bufinfo.buf, out_buf_ptr, in_bufinfo.len,
                 ctr_params_from_aes(self));
@@ -359,10 +359,10 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
     { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&cryptolib_aes_type) },
-    #if MICROPY_PY_UCRYPTOLIB_CONSTS
+    #if MICROPY_PY_CRYPTOLIB_CONSTS
     { MP_ROM_QSTR(MP_QSTR_MODE_ECB), MP_ROM_INT(UCRYPTOLIB_MODE_ECB) },
     { MP_ROM_QSTR(MP_QSTR_MODE_CBC), MP_ROM_INT(UCRYPTOLIB_MODE_CBC) },
-    #if MICROPY_PY_UCRYPTOLIB_CTR
+    #if MICROPY_PY_CRYPTOLIB_CTR
     { MP_ROM_QSTR(MP_QSTR_MODE_CTR), MP_ROM_INT(UCRYPTOLIB_MODE_CTR) },
     #endif
     #endif
@@ -377,4 +377,4 @@ const mp_obj_module_t mp_module_cryptolib = {
 
 MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_cryptolib);
 
-#endif // MICROPY_PY_UCRYPTOLIB
+#endif // MICROPY_PY_CRYPTOLIB
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 0e01b4f27f9fe..1b94cc01a04e9 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -29,13 +29,13 @@
 
 #include "py/runtime.h"
 
-#if MICROPY_PY_UHASHLIB
+#if MICROPY_PY_HASHLIB
 
 #if MICROPY_SSL_MBEDTLS
 #include "mbedtls/version.h"
 #endif
 
-#if MICROPY_PY_UHASHLIB_SHA256
+#if MICROPY_PY_HASHLIB_SHA256
 
 #if MICROPY_SSL_MBEDTLS
 #include "mbedtls/sha256.h"
@@ -45,7 +45,7 @@
 
 #endif
 
-#if MICROPY_PY_UHASHLIB_SHA1 || MICROPY_PY_UHASHLIB_MD5
+#if MICROPY_PY_HASHLIB_SHA1 || MICROPY_PY_HASHLIB_MD5
 
 #if MICROPY_SSL_AXTLS
 #include "lib/axtls/crypto/crypto.h"
@@ -70,7 +70,7 @@ static void hashlib_ensure_not_final(mp_obj_hash_t *self) {
     }
 }
 
-#if MICROPY_PY_UHASHLIB_SHA256
+#if MICROPY_PY_HASHLIB_SHA256
 STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_MBEDTLS
@@ -161,12 +161,12 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     hashlib_sha256_type,
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
-    make_new, uhashlib_sha256_make_new,
+    make_new, hashlib_sha256_make_new,
     locals_dict, &hashlib_sha256_locals_dict
     );
 #endif
 
-#if MICROPY_PY_UHASHLIB_SHA1
+#if MICROPY_PY_HASHLIB_SHA1
 STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_AXTLS
@@ -260,7 +260,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
-#if MICROPY_PY_UHASHLIB_MD5
+#if MICROPY_PY_HASHLIB_MD5
 STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_AXTLS
@@ -352,17 +352,17 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     make_new, hashlib_md5_make_new,
     locals_dict, &hashlib_md5_locals_dict
     );
-#endif // MICROPY_PY_UHASHLIB_MD5
+#endif // MICROPY_PY_HASHLIB_MD5
 
 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) },
-    #if MICROPY_PY_UHASHLIB_SHA256
+    #if MICROPY_PY_HASHLIB_SHA256
     { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&hashlib_sha256_type) },
     #endif
-    #if MICROPY_PY_UHASHLIB_SHA1
+    #if MICROPY_PY_HASHLIB_SHA1
     { MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&hashlib_sha1_type) },
     #endif
-    #if MICROPY_PY_UHASHLIB_MD5
+    #if MICROPY_PY_HASHLIB_MD5
     { MP_ROM_QSTR(MP_QSTR_md5), MP_ROM_PTR(&hashlib_md5_type) },
     #endif
 };
@@ -376,4 +376,4 @@ const mp_obj_module_t mp_module_hashlib = {
 
 MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_hashlib);
 
-#endif // MICROPY_PY_UHASHLIB
+#endif // MICROPY_PY_HASHLIB
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 59277813e9582..79a12c2b9c5bf 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -27,7 +27,7 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 
-#if MICROPY_PY_UHEAPQ
+#if MICROPY_PY_HEAPQ
 
 // the algorithm here is modelled on CPython's heapq.py
 
@@ -121,4 +121,4 @@ const mp_obj_module_t mp_module_heapq = {
 MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_heapq);
 #endif
 
-#endif // MICROPY_PY_UHEAPQ
+#endif // MICROPY_PY_HEAPQ
diff --git a/extmod/modujson.c b/extmod/modujson.c
index e67761e1a99b5..1b475543e167a 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -32,9 +32,9 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 
-#if MICROPY_PY_UJSON
+#if MICROPY_PY_JSON
 
-#if MICROPY_PY_UJSON_SEPARATORS
+#if MICROPY_PY_JSON_SEPARATORS
 
 enum {
     DUMP_MODE_TO_STRING = 1,
@@ -383,4 +383,4 @@ const mp_obj_module_t mp_module_json = {
 
 MP_REGISTER_MODULE(MP_QSTR_json, mp_module_json);
 
-#endif // MICROPY_PY_UJSON
+#endif // MICROPY_PY_JSON
diff --git a/extmod/moduos.c b/extmod/moduos.c
index 8c40f45370306..e962a6c1718d7 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -27,14 +27,14 @@
 #include "py/objstr.h"
 #include "py/runtime.h"
 
-#if MICROPY_PY_UOS
+#if MICROPY_PY_OS
 
 #include "extmod/misc.h"
 #include "extmod/vfs.h"
 
 #if MICROPY_VFS_FAT
 #include "extmod/vfs_fat.h"
-#if MICROPY_PY_UOS_SYNC
+#if MICROPY_PY_OS_SYNC
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #endif
@@ -48,12 +48,12 @@
 #include "extmod/vfs_posix.h"
 #endif
 
-#if MICROPY_PY_UOS_UNAME
+#if MICROPY_PY_OS_UNAME
 #include "genhdr/mpversion.h"
 #endif
 
-#ifdef MICROPY_PY_UOS_INCLUDEFILE
-#include MICROPY_PY_UOS_INCLUDEFILE
+#ifdef MICROPY_PY_OS_INCLUDEFILE
+#include MICROPY_PY_OS_INCLUDEFILE
 #endif
 
 #ifdef MICROPY_BUILD_TYPE
@@ -62,7 +62,7 @@
 #define MICROPY_BUILD_TYPE_PAREN
 #endif
 
-#if MICROPY_PY_UOS_SYNC
+#if MICROPY_PY_OS_SYNC
 // sync()
 // Sync all filesystems.
 STATIC mp_obj_t mp_os_sync(void) {
@@ -77,9 +77,9 @@ STATIC mp_obj_t mp_os_sync(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(mp_os_sync_obj, mp_os_sync);
 #endif
 
-#if MICROPY_PY_UOS_UNAME
+#if MICROPY_PY_OS_UNAME
 
-#if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC
+#if MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC
 #define CONST_RELEASE
 #else
 #define CONST_RELEASE const
@@ -110,7 +110,7 @@ STATIC MP_DEFINE_ATTRTUPLE(
     );
 
 STATIC mp_obj_t mp_os_uname(void) {
-    #if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC
+    #if MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC
     const char *release = mp_os_uname_release();
     mp_os_uname_info_release_obj.len = strlen(release);
     mp_os_uname_info_release_obj.data = (const byte *)release;
@@ -124,21 +124,21 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_os_uname_obj, mp_os_uname);
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
-    #if MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV
+    #if MICROPY_PY_OS_GETENV_PUTENV_UNSETENV
     { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mp_os_getenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mp_os_putenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mp_os_unsetenv_obj) },
     #endif
-    #if MICROPY_PY_UOS_SEP
+    #if MICROPY_PY_OS_SEP
     { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
     #endif
-    #if MICROPY_PY_UOS_SYNC
+    #if MICROPY_PY_OS_SYNC
     { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_os_sync_obj) },
     #endif
-    #if MICROPY_PY_UOS_SYSTEM
+    #if MICROPY_PY_OS_SYSTEM
     { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mp_os_system_obj) },
     #endif
-    #if MICROPY_PY_UOS_UNAME
+    #if MICROPY_PY_OS_UNAME
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_os_uname_obj) },
     #endif
     #if MICROPY_PY_OS_URANDOM
@@ -163,10 +163,10 @@ 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_os_dupterm_obj) },
     #endif
-    #if MICROPY_PY_UOS_DUPTERM_NOTIFY
+    #if MICROPY_PY_OS_DUPTERM_NOTIFY
     { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_os_dupterm_notify_obj) },
     #endif
-    #if MICROPY_PY_UOS_ERRNO
+    #if MICROPY_PY_OS_ERRNO
     { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_os_errno_obj) },
     #endif
 
@@ -197,4 +197,4 @@ const mp_obj_module_t mp_module_os = {
 
 MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
 
-#endif // MICROPY_PY_UOS
+#endif // MICROPY_PY_OS
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 791ae8344d95c..d5f919fc5e067 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -32,7 +32,7 @@
 #include "extmod/moduplatform.h"
 #include "genhdr/mpversion.h"
 
-#if MICROPY_PY_UPLATFORM
+#if MICROPY_PY_PLATFORM
 
 // platform - Access to underlying platform's identifying data
 
@@ -77,4 +77,4 @@ const mp_obj_module_t mp_module_platform = {
 
 MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_platform);
 
-#endif // MICROPY_PY_UPLATFORM
+#endif // MICROPY_PY_PLATFORM
diff --git a/extmod/moduplatform.h b/extmod/moduplatform.h
index 3597f7559f512..7ca4297788993 100644
--- a/extmod/moduplatform.h
+++ b/extmod/moduplatform.h
@@ -30,7 +30,7 @@
 #include "py/mpconfig.h"
 
 // Preprocessor directives identifying the platform.
-// The (u)platform module itself is guarded by MICROPY_PY_UPLATFORM, see the
+// The platform module itself is guarded by MICROPY_PY_PLATFORM, 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/
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index f69f7f41933e9..1c697aec70dd3 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -29,10 +29,10 @@
 
 #include "py/runtime.h"
 
-#if MICROPY_PY_URANDOM
+#if MICROPY_PY_RANDOM
 
 // Work out if the seed will be set on import or not.
-#if MICROPY_MODULE_BUILTIN_INIT && defined(MICROPY_PY_URANDOM_SEED_INIT_FUNC)
+#if MICROPY_MODULE_BUILTIN_INIT && defined(MICROPY_PY_RANDOM_SEED_INIT_FUNC)
 #define SEED_ON_IMPORT (1)
 #else
 #define SEED_ON_IMPORT (0)
@@ -67,7 +67,7 @@ STATIC uint32_t yasmarang(void) {
 
 // End of Yasmarang
 
-#if MICROPY_PY_URANDOM_EXTRA_FUNCS
+#if MICROPY_PY_RANDOM_EXTRA_FUNCS
 
 // returns an unsigned integer below the given argument
 // n must not be zero
@@ -103,8 +103,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_getrandbits_obj, mod_random_getrandb
 STATIC mp_obj_t mod_random_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;
+        #ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC
+        seed = MICROPY_PY_RANDOM_SEED_INIT_FUNC;
         #else
         mp_raise_ValueError(MP_ERROR_TEXT("no default seed"));
         #endif
@@ -119,7 +119,7 @@ STATIC mp_obj_t mod_random_seed(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_seed_obj, 0, 1, mod_random_seed);
 
-#if MICROPY_PY_URANDOM_EXTRA_FUNCS
+#if MICROPY_PY_RANDOM_EXTRA_FUNCS
 
 STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
     mp_int_t start = mp_obj_get_int(args[0]);
@@ -213,7 +213,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_uniform_obj, mod_random_uniform);
 
 #endif
 
-#endif // MICROPY_PY_URANDOM_EXTRA_FUNCS
+#endif // MICROPY_PY_RANDOM_EXTRA_FUNCS
 
 #if SEED_ON_IMPORT
 STATIC mp_obj_t mod_random___init__(void) {
@@ -237,7 +237,7 @@ STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&mod_random_getrandbits_obj) },
     { MP_ROM_QSTR(MP_QSTR_seed), MP_ROM_PTR(&mod_random_seed_obj) },
-    #if MICROPY_PY_URANDOM_EXTRA_FUNCS
+    #if MICROPY_PY_RANDOM_EXTRA_FUNCS
     { MP_ROM_QSTR(MP_QSTR_randrange), MP_ROM_PTR(&mod_random_randrange_obj) },
     { MP_ROM_QSTR(MP_QSTR_randint), MP_ROM_PTR(&mod_random_randint_obj) },
     { MP_ROM_QSTR(MP_QSTR_choice), MP_ROM_PTR(&mod_random_choice_obj) },
@@ -258,4 +258,4 @@ const mp_obj_module_t mp_module_random = {
 MP_REGISTER_MODULE(MP_QSTR_random, mp_module_random);
 #endif
 
-#endif // MICROPY_PY_URANDOM
+#endif // MICROPY_PY_RANDOM
diff --git a/extmod/modure.c b/extmod/modure.c
index a6fad3cf4ee11..c8a019be89129 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -37,7 +37,7 @@
 #include "py/unicode.h"
 #endif
 
-#if MICROPY_PY_URE
+#if MICROPY_PY_RE
 
 #define re1_5_stack_chk() MP_STACK_CHECK()
 
@@ -85,7 +85,7 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(match_group_obj, match_group);
 
-#if MICROPY_PY_URE_MATCH_GROUPS
+#if MICROPY_PY_RE_MATCH_GROUPS
 
 STATIC mp_obj_t match_groups(mp_obj_t self_in) {
     mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
@@ -102,7 +102,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(match_groups_obj, match_groups);
 
 #endif
 
-#if MICROPY_PY_URE_MATCH_SPAN_START_END
+#if MICROPY_PY_RE_MATCH_SPAN_START_END
 
 STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span[2]) {
     mp_obj_match_t *self = MP_OBJ_TO_PTR(args[0]);
@@ -167,10 +167,10 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(match_end_obj, 1, 2, match_end);
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t match_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_group), MP_ROM_PTR(&match_group_obj) },
-    #if MICROPY_PY_URE_MATCH_GROUPS
+    #if MICROPY_PY_RE_MATCH_GROUPS
     { MP_ROM_QSTR(MP_QSTR_groups), MP_ROM_PTR(&match_groups_obj) },
     #endif
-    #if MICROPY_PY_URE_MATCH_SPAN_START_END
+    #if MICROPY_PY_RE_MATCH_SPAN_START_END
     { MP_ROM_QSTR(MP_QSTR_span), MP_ROM_PTR(&match_span_obj) },
     { MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR(&match_start_obj) },
     { MP_ROM_QSTR(MP_QSTR_end), MP_ROM_PTR(&match_end_obj) },
@@ -277,7 +277,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_split_obj, 2, 3, re_split);
 
-#if MICROPY_PY_URE_SUB
+#if MICROPY_PY_RE_SUB
 
 STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
     mp_obj_re_t *self;
@@ -405,7 +405,7 @@ STATIC const mp_rom_map_elem_t re_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) },
     { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&re_search_obj) },
     { MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&re_split_obj) },
-    #if MICROPY_PY_URE_SUB
+    #if MICROPY_PY_RE_SUB
     { MP_ROM_QSTR(MP_QSTR_sub), MP_ROM_PTR(&re_sub_obj) },
     #endif
 };
@@ -429,7 +429,7 @@ STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
         goto error;
     }
     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
+    #if MICROPY_PY_RE_DEBUG
     int flags = 0;
     if (n_args > 1) {
         flags = mp_obj_get_int(args[1]);
@@ -440,7 +440,7 @@ STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
     error:
         mp_raise_ValueError(MP_ERROR_TEXT("error in regex"));
     }
-    #if MICROPY_PY_URE_DEBUG
+    #if MICROPY_PY_RE_DEBUG
     if (flags & FLAG_DEBUG) {
         re1_5_dumpcode(&o->re);
     }
@@ -455,10 +455,10 @@ STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_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
+    #if MICROPY_PY_RE_SUB
     { MP_ROM_QSTR(MP_QSTR_sub), MP_ROM_PTR(&re_sub_obj) },
     #endif
-    #if MICROPY_PY_URE_DEBUG
+    #if MICROPY_PY_RE_DEBUG
     { MP_ROM_QSTR(MP_QSTR_DEBUG), MP_ROM_INT(FLAG_DEBUG) },
     #endif
 };
@@ -482,11 +482,11 @@ MP_REGISTER_MODULE(MP_QSTR_re, mp_module_re);
 #include "lib/re1.5/recursiveloop.c"
 #include "lib/re1.5/charclass.c"
 
-#if MICROPY_PY_URE_DEBUG
+#if MICROPY_PY_RE_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
 
-#endif // MICROPY_PY_URE
+#endif // MICROPY_PY_RE
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 5bb5f4f48df2c..011d5cb832cdf 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -26,7 +26,7 @@
  */
 
 #include "py/mpconfig.h"
-#if MICROPY_PY_USELECT
+#if MICROPY_PY_SELECT
 
 #include <stdio.h>
 
@@ -107,7 +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
+#if MICROPY_PY_SELECT_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
@@ -174,7 +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
+#endif // MICROPY_PY_SELECT_SELECT
 
 typedef struct _mp_obj_poll_t {
     mp_obj_base_t base;
@@ -356,7 +356,7 @@ 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_select) },
-    #if MICROPY_PY_USELECT_SELECT
+    #if MICROPY_PY_SELECT_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) },
@@ -375,4 +375,4 @@ const mp_obj_module_t mp_module_select = {
 
 MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
 
-#endif // MICROPY_PY_USELECT
+#endif // MICROPY_PY_SELECT
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index c8695f1044816..316a578ac206b 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -33,7 +33,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 
-#if MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
+#if MICROPY_PY_NETWORK && MICROPY_PY_SOCKET && !MICROPY_PY_LWIP
 
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
@@ -75,7 +75,7 @@ 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
+    #if MICROPY_PY_SOCKET_EXTENDED_STATE
     s->_private = NULL;
     #endif
 
@@ -94,7 +94,7 @@ STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) {
             mp_raise_OSError(_errno);
         }
 
-        #if MICROPY_PY_USOCKET_EXTENDED_STATE
+        #if MICROPY_PY_SOCKET_EXTENDED_STATE
         // if a timeout was set before binding a NIC, call settimeout to reset it
         if (self->timeout != -1 && self->nic_protocol->settimeout(self, self->timeout, &_errno) != 0) {
             mp_raise_OSError(_errno);
@@ -134,7 +134,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 = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
+    mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
@@ -177,7 +177,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     socket2->timeout = -1;
     socket2->callback = MP_OBJ_NULL;
     socket2->state = MOD_NETWORK_SS_NEW;
-    #if MICROPY_PY_USOCKET_EXTENDED_STATE
+    #if MICROPY_PY_SOCKET_EXTENDED_STATE
     socket2->_private = NULL;
     #endif
 
@@ -420,7 +420,7 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
         #endif
     }
     if (self->nic == MP_OBJ_NULL) {
-        #if MICROPY_PY_USOCKET_EXTENDED_STATE
+        #if MICROPY_PY_SOCKET_EXTENDED_STATE
         // store the timeout in the socket state until a NIC is bound
         self->timeout = timeout;
         #else
@@ -655,4 +655,4 @@ const mp_obj_module_t mp_module_socket = {
 
 MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
 
-#endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
+#endif // MICROPY_PY_NETWORK && MICROPY_PY_SOCKET && !MICROPY_PY_LWIP
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index c09059cae8572..1c9caf76ebff8 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -31,7 +31,7 @@
 #include "py/stream.h"
 #include "py/objstr.h"
 
-#if MICROPY_PY_USSL && MICROPY_SSL_AXTLS
+#if MICROPY_PY_SSL && MICROPY_SSL_AXTLS
 
 #include "ssl.h"
 
@@ -118,7 +118,7 @@ STATIC NORETURN void ssl_raise_error(int err) {
 
 
 STATIC mp_obj_ssl_socket_t *ssl_socket_new(mp_obj_t sock, struct ssl_args *args) {
-    #if MICROPY_PY_USSL_FINALISER
+    #if MICROPY_PY_SSL_FINALISER
     mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t);
     #else
     mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t);
@@ -301,7 +301,7 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&ssl_socket_setblocking_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
-    #if MICROPY_PY_USSL_FINALISER
+    #if MICROPY_PY_SSL_FINALISER
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     #endif
 };
@@ -359,4 +359,4 @@ const mp_obj_module_t mp_module_ssl = {
 
 MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
-#endif // MICROPY_PY_USSL && MICROPY_SSL_AXTLS
+#endif // MICROPY_PY_SSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index dbe802f75b142..d724e0a08a50c 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -26,7 +26,7 @@
  */
 
 #include "py/mpconfig.h"
-#if MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS
+#if MICROPY_PY_SSL && MICROPY_SSL_MBEDTLS
 
 #include <stdio.h>
 #include <string.h>
@@ -163,7 +163,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     // Verify the socket object has the full stream protocol
     mp_get_stream_raise(sock, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
 
-    #if MICROPY_PY_USSL_FINALISER
+    #if MICROPY_PY_SSL_FINALISER
     mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t);
     #else
     mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t);
@@ -442,7 +442,7 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
-    #if MICROPY_PY_USSL_FINALISER
+    #if MICROPY_PY_SSL_FINALISER
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     #endif
     #if MICROPY_UNIX_COVERAGE
@@ -509,4 +509,4 @@ const mp_obj_module_t mp_module_ssl = {
 
 MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
-#endif // MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS
+#endif // MICROPY_PY_SSL && MICROPY_SSL_MBEDTLS
diff --git a/extmod/modutime.c b/extmod/modutime.c
index 9731f5ff0b214..1dfd7aa2c09a8 100644
--- a/extmod/modutime.c
+++ b/extmod/modutime.c
@@ -30,13 +30,13 @@
 #include "py/smallint.h"
 #include "extmod/modutime.h"
 
-#if MICROPY_PY_UTIME
+#if MICROPY_PY_TIME
 
-#ifdef MICROPY_PY_UTIME_INCLUDEFILE
-#include MICROPY_PY_UTIME_INCLUDEFILE
+#ifdef MICROPY_PY_TIME_INCLUDEFILE
+#include MICROPY_PY_TIME_INCLUDEFILE
 #endif
 
-#if MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
+#if MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME
 
 #include "shared/timeutils/timeutils.h"
 
@@ -96,9 +96,9 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_time_mktime_obj, time_mktime);
 
-#endif // MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
+#endif // MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME
 
-#if MICROPY_PY_UTIME_TIME_TIME_NS
+#if MICROPY_PY_TIME_TIME_TIME_NS
 
 // time()
 // Return the number of seconds since the Epoch.
@@ -114,10 +114,10 @@ STATIC mp_obj_t time_time_ns(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_ns_obj, time_time_ns);
 
-#endif // MICROPY_PY_UTIME_TIME_TIME_NS
+#endif // MICROPY_PY_TIME_TIME_TIME_NS
 
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
-    #ifdef MICROPY_PY_UTIME_CUSTOM_SLEEP
+    #ifdef MICROPY_PY_TIME_CUSTOM_SLEEP
     mp_time_sleep(seconds_o);
     #else
     #if MICROPY_PY_BUILTINS_FLOAT
@@ -149,17 +149,17 @@ STATIC mp_obj_t time_sleep_us(mp_obj_t arg) {
 MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_us_obj, time_sleep_us);
 
 STATIC mp_obj_t time_ticks_ms(void) {
-    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_ms_obj, time_ticks_ms);
 
 STATIC mp_obj_t time_ticks_us(void) {
-    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_us() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_us() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_us_obj, time_ticks_us);
 
 STATIC mp_obj_t time_ticks_cpu(void) {
-    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_cpu() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_cpu() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_cpu_obj, time_ticks_cpu);
 
@@ -169,8 +169,8 @@ STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
     mp_uint_t end = MP_OBJ_SMALL_INT_VALUE(end_in);
     // Optimized formula avoiding if conditions. We adjust difference "forward",
     // wrap it around and adjust back.
-    mp_int_t diff = ((end - start + MICROPY_PY_UTIME_TICKS_PERIOD / 2) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1))
-        - MICROPY_PY_UTIME_TICKS_PERIOD / 2;
+    mp_int_t diff = ((end - start + MICROPY_PY_TIME_TICKS_PERIOD / 2) & (MICROPY_PY_TIME_TICKS_PERIOD - 1))
+        - MICROPY_PY_TIME_TICKS_PERIOD / 2;
     return MP_OBJ_NEW_SMALL_INT(diff);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_diff_obj, time_ticks_diff);
@@ -188,24 +188,24 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
     //
     // 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) {
+    if (delta + MICROPY_PY_TIME_TICKS_PERIOD / 2 - 1 >= MICROPY_PY_TIME_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));
+    return MP_OBJ_NEW_SMALL_INT((ticks + delta) & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_add_obj, time_ticks_add);
 
 STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) },
 
-    #if MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
+    #if MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME
     { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mp_time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mp_time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_time_mktime_obj) },
     #endif
 
-    #if MICROPY_PY_UTIME_TIME_TIME_NS
+    #if MICROPY_PY_TIME_TIME_TIME_NS
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_time_time_obj) },
     { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_time_time_ns_obj) },
     #endif
@@ -220,8 +220,8 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_time_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_time_ticks_diff_obj) },
 
-    #ifdef MICROPY_PY_UTIME_EXTRA_GLOBALS
-    MICROPY_PY_UTIME_EXTRA_GLOBALS
+    #ifdef MICROPY_PY_TIME_EXTRA_GLOBALS
+    MICROPY_PY_TIME_EXTRA_GLOBALS
     #endif
 };
 STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
@@ -233,4 +233,4 @@ const mp_obj_module_t mp_module_time = {
 
 MP_REGISTER_MODULE(MP_QSTR_time, mp_module_time);
 
-#endif // MICROPY_PY_UTIME
+#endif // MICROPY_PY_TIME
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 643aef5d6d37b..7c037ea0a90e3 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -31,9 +31,9 @@
 #include "py/runtime.h"
 #include "py/smallint.h"
 
-#if MICROPY_PY_UTIMEQ
+#if MICROPY_PY_TIMEQ
 
-#define MODULO MICROPY_PY_UTIME_TICKS_PERIOD
+#define MODULO MICROPY_PY_TIME_TICKS_PERIOD
 
 #define DEBUG 0
 
@@ -232,4 +232,4 @@ const mp_obj_module_t mp_module_timeq = {
 
 MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_timeq);
 
-#endif // MICROPY_PY_UTIMEQ
+#endif // MICROPY_PY_TIMEQ
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 76330f3125926..ac90dea8b36fc 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -32,7 +32,7 @@
 #include "py/stream.h"
 #include "extmod/moduwebsocket.h"
 
-#if MICROPY_PY_UWEBSOCKET
+#if MICROPY_PY_WEBSOCKET
 
 enum { FRAME_HEADER, FRAME_OPT, PAYLOAD, CONTROL };
 
@@ -313,4 +313,4 @@ const mp_obj_module_t mp_module_websocket = {
 
 MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_websocket);
 
-#endif // MICROPY_PY_UWEBSOCKET
+#endif // MICROPY_PY_WEBSOCKET
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index e840bdcbfd552..a912f113ce49b 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -31,7 +31,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 
-#if MICROPY_PY_UZLIB
+#if MICROPY_PY_ZLIB
 
 #include "lib/uzlib/tinf.h"
 
@@ -236,4 +236,4 @@ MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_zlib);
 #include "lib/uzlib/adler32.c"
 #include "lib/uzlib/crc32.c"
 
-#endif // MICROPY_PY_UZLIB
+#endif // MICROPY_PY_ZLIB
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index c72b365bea034..cfd1c62616497 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -66,7 +66,7 @@ uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags) {
         int errcode = 0;
         mp_uint_t ret = 0;
         const mp_stream_p_t *stream_p = mp_get_stream(s);
-        #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
+        #if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM
         if (mp_os_dupterm_is_builtin_stream(s)) {
             ret = stream_p->ioctl(s, MP_STREAM_POLL, poll_flags, &errcode);
         } else
@@ -99,7 +99,7 @@ int mp_os_dupterm_rx_chr(void) {
             continue;
         }
 
-        #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
+        #if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM
         if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
             byte buf[1];
             int errcode = 0;
@@ -154,7 +154,7 @@ void mp_os_dupterm_tx_strn(const char *str, size_t len) {
             continue;
         }
 
-        #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
+        #if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM
         if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
             int errcode = 0;
             const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx]));
@@ -194,7 +194,7 @@ STATIC mp_obj_t mp_os_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
+    #if MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED
     mp_os_dupterm_stream_detached_attached(previous_obj, args[0]);
     #endif
 
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 9b856e1f01cc6..d63bb5be7bff4 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -332,7 +332,7 @@ 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
+#if MICROPY_PY_OS_STATVFS
 
 #ifdef __ANDROID__
 #define USE_STATFS 1
@@ -390,7 +390,7 @@ 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
+    #if MICROPY_PY_OS_STATVFS
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&vfs_posix_statvfs_obj) },
     #endif
 };
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index ea19de7fd04af..1d89e3ca09737 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -194,7 +194,7 @@ 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
+        #if MICROPY_PY_SELECT
         case MP_STREAM_POLL: {
             #ifdef _WIN32
             mp_raise_NotImplementedError(MP_ERROR_TEXT("poll on file not available on win32"));
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index da756296fc904..9b614c6d34cd1 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 = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
+    int32_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 8026f7b7575b1..af10c63531ffa 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -104,29 +104,29 @@
 #define MICROPY_PY_SYS_STDFILES                     (1)
 #define MICROPY_PY_CMATH                            (0)
 #define MICROPY_PY_IO                               (1)
-#define MICROPY_PY_UERRNO                           (1)
-#define MICROPY_PY_UERRNO_ERRORCODE                 (0)
+#define MICROPY_PY_ERRNO                            (1)
+#define MICROPY_PY_ERRNO_ERRORCODE                  (0)
 #define MICROPY_PY_THREAD                           (1)
 #define MICROPY_PY_THREAD_GIL                       (1)
-#define MICROPY_PY_UBINASCII                        (1)
+#define MICROPY_PY_BINASCII                         (1)
 #define MICROPY_PY_UCTYPES                          (0)
-#define MICROPY_PY_UZLIB                            (0)
-#define MICROPY_PY_UJSON                            (1)
-#define MICROPY_PY_URE                              (1)
-#define MICROPY_PY_UHEAPQ                           (0)
-#define MICROPY_PY_UHASHLIB                         (0)
-#define MICROPY_PY_USELECT                          (1)
-#define MICROPY_PY_UTIME                            (1)
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME    (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS               (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE                "ports/cc3200/mods/modutime.c"
+#define MICROPY_PY_ZLIB                             (0)
+#define MICROPY_PY_JSON                             (1)
+#define MICROPY_PY_RE                               (1)
+#define MICROPY_PY_HEAPQ                            (0)
+#define MICROPY_PY_HASHLIB                          (0)
+#define MICROPY_PY_SELECT                           (1)
+#define MICROPY_PY_TIME                             (1)
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS                (1)
+#define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
 
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF      (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE        (0)
 #define MICROPY_KBD_EXCEPTION                       (1)
 
 // We define our own list of errno constants to include in errno module
-#define MICROPY_PY_UERRNO_LIST \
+#define MICROPY_PY_ERRNO_LIST \
     X(EPERM) \
     X(EIO) \
     X(ENODEV) \
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index b3d467a80e999..3e7c9ee162d79 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -224,7 +224,7 @@ void mp_task(void *pvParameter) {
     // TODO: machine_rmt_deinit_all();
     machine_pins_deinit();
     machine_deinit();
-    #if MICROPY_PY_USOCKET_EVENTS
+    #if MICROPY_PY_SOCKET_EVENTS
     socket_events_deinit();
     #endif
 
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 114629a9d77b9..0b2d40e333c78 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -73,7 +73,7 @@ typedef struct _socket_obj_t {
     uint8_t proto;
     uint8_t state;
     unsigned int retries;
-    #if MICROPY_PY_USOCKET_EVENTS
+    #if MICROPY_PY_SOCKET_EVENTS
     mp_obj_t events_callback;
     struct _socket_obj_t *events_next;
     #endif
@@ -81,7 +81,7 @@ typedef struct _socket_obj_t {
 
 void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms);
 
-#if MICROPY_PY_USOCKET_EVENTS
+#if MICROPY_PY_SOCKET_EVENTS
 // Support for callbacks on asynchronous socket events (when socket becomes readable)
 
 // This divisor is used to reduce the load on the system, so it doesn't poll sockets too often
@@ -144,7 +144,7 @@ void socket_events_handler(void) {
     }
 }
 
-#endif // MICROPY_PY_USOCKET_EVENTS
+#endif // MICROPY_PY_SOCKET_EVENTS
 
 static inline void check_for_exceptions(void) {
     mp_handle_pending(true);
@@ -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 = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
+    int backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
@@ -396,7 +396,7 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
             break;
         }
 
-            #if MICROPY_PY_USOCKET_EVENTS
+            #if MICROPY_PY_SOCKET_EVENTS
         // level: SOL_SOCKET
         // special "register callback" option
         case 20: {
@@ -734,7 +734,7 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
         return ret;
     } else if (request == MP_STREAM_CLOSE) {
         if (socket->fd >= 0) {
-            #if MICROPY_PY_USOCKET_EVENTS
+            #if MICROPY_PY_SOCKET_EVENTS
             if (socket->events_callback != MP_OBJ_NULL) {
                 socket_events_remove(socket);
                 socket->events_callback = MP_OBJ_NULL;
@@ -869,7 +869,7 @@ const mp_obj_module_t mp_module_socket = {
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-// Note: This port doesn't define MICROPY_PY_USOCKET or MICROPY_PY_LWIP so
+// Note: This port doesn't define MICROPY_PY_SOCKET or MICROPY_PY_LWIP so
 // this will not conflict with the common implementation provided by
 // extmod/mod{lwip,socket}.c.
 MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c
index 6a5a26c256b70..287f1d9900211 100644
--- a/ports/esp32/moduos.c
+++ b/ports/esp32/moduos.c
@@ -49,7 +49,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
-#if MICROPY_PY_UOS_DUPTERM_NOTIFY
+#if MICROPY_PY_OS_DUPTERM_NOTIFY
 STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index d6aaa9878725d..d25a5c2734d86 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -62,9 +62,9 @@
 #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       esp32_help_text
 #define MICROPY_PY_IO_BUFFEREDWRITER        (1)
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS       (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE        "ports/esp32/modutime.c"
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS        (1)
+#define MICROPY_PY_TIME_INCLUDEFILE         "ports/esp32/modtime.c"
 #define MICROPY_PY_THREAD                   (1)
 #define MICROPY_PY_THREAD_GIL               (1)
 #define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
@@ -83,17 +83,17 @@
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif
-#define MICROPY_PY_UTIMEQ                   (1)
-#define MICROPY_PY_UHASHLIB_SHA1            (1)
-#define MICROPY_PY_UHASHLIB_SHA256          (1)
-#define MICROPY_PY_UCRYPTOLIB               (1)
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (esp_random())
-#define MICROPY_PY_UOS_INCLUDEFILE          "ports/esp32/moduos.c"
+#define MICROPY_PY_TIMEQ                    (1)
+#define MICROPY_PY_HASHLIB_SHA1             (1)
+#define MICROPY_PY_HASHLIB_SHA256           (1)
+#define MICROPY_PY_CRYPTOLIB                (1)
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (esp_random())
+#define MICROPY_PY_OS_INCLUDEFILE           "ports/esp32/moduos.c"
 #define MICROPY_PY_OS_DUPTERM               (1)
-#define MICROPY_PY_UOS_DUPTERM_NOTIFY       (1)
-#define MICROPY_PY_UOS_SYNC                 (1)
-#define MICROPY_PY_UOS_UNAME                (1)
-#define MICROPY_PY_UOS_URANDOM              (1)
+#define MICROPY_PY_OS_DUPTERM_NOTIFY        (1)
+#define MICROPY_PY_OS_SYNC                  (1)
+#define MICROPY_PY_OS_UNAME                 (1)
+#define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
@@ -136,14 +136,14 @@
 #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)
+#define MICROPY_PY_SSL                      (1)
 #define MICROPY_SSL_MBEDTLS                 (1)
-#define MICROPY_PY_USSL_FINALISER           (1)
-#define MICROPY_PY_UWEBSOCKET               (1)
+#define MICROPY_PY_SSL_FINALISER            (1)
+#define MICROPY_PY_WEBSOCKET                (1)
 #define MICROPY_PY_WEBREPL                  (1)
 #define MICROPY_PY_ONEWIRE                  (1)
-#define MICROPY_PY_UPLATFORM                (1)
-#define MICROPY_PY_USOCKET_EVENTS           (MICROPY_PY_WEBREPL)
+#define MICROPY_PY_PLATFORM                 (1)
+#define MICROPY_PY_SOCKET_EVENTS            (MICROPY_PY_WEBREPL)
 #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR    (1)
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")
 
@@ -169,10 +169,10 @@ void *esp_native_code_commit(void *, size_t, void *);
 #define MICROPY_BEGIN_ATOMIC_SECTION() portENTER_CRITICAL_NESTED()
 #define MICROPY_END_ATOMIC_SECTION(state) portEXIT_CRITICAL_NESTED(state)
 
-#if MICROPY_PY_USOCKET_EVENTS
-#define MICROPY_PY_USOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler();
+#if MICROPY_PY_SOCKET_EVENTS
+#define MICROPY_PY_SOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler();
 #else
-#define MICROPY_PY_USOCKET_EVENTS_HANDLER
+#define MICROPY_PY_SOCKET_EVENTS_HANDLER
 #endif
 
 #if MICROPY_PY_THREAD
@@ -180,7 +180,7 @@ void *esp_native_code_commit(void *, size_t, void *);
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        MICROPY_PY_USOCKET_EVENTS_HANDLER \
+        MICROPY_PY_SOCKET_EVENTS_HANDLER \
         MP_THREAD_GIL_EXIT(); \
         ulTaskNotifyTake(pdFALSE, 1); \
         MP_THREAD_GIL_ENTER(); \
@@ -190,7 +190,7 @@ void *esp_native_code_commit(void *, size_t, void *);
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        MICROPY_PY_USOCKET_EVENTS_HANDLER \
+        MICROPY_PY_SOCKET_EVENTS_HANDLER \
         asm ("waiti 0"); \
     } while (0);
 #endif
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 61e9fd563ef70..4c8fa012f4fbf 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -138,7 +138,7 @@ void mp_hal_delay_ms(uint32_t ms) {
     uint64_t t0 = esp_timer_get_time();
     for (;;) {
         mp_handle_pending(true);
-        MICROPY_PY_USOCKET_EVENTS_HANDLER
+        MICROPY_PY_SOCKET_EVENTS_HANDLER
         MP_THREAD_GIL_EXIT();
         uint64_t t1 = esp_timer_get_time();
         dt = t1 - t0;
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index e3727dfeda490..e4db811f240e7 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -27,7 +27,7 @@ QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_AXTLS = 1
 AXTLS_DEFS_EXTRA = -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 BTREE_DEFS_EXTRA = -DDEFPSIZE=1024 -DMINCACHE=3
diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.h b/ports/esp8266/boards/GENERIC/mpconfigboard.h
index 1d9b8e6f70dd3..52c93f83a3684 100644
--- a/ports/esp8266/boards/GENERIC/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC/mpconfigboard.h
@@ -11,4 +11,4 @@
 #define MICROPY_READER_VFS              (MICROPY_VFS)
 #define MICROPY_VFS                     (1)
 
-#define MICROPY_PY_UCRYPTOLIB           (1)
+#define MICROPY_PY_CRYPTOLIB            (1)
diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
index cf5127686cc2d..f811f70592fdd 100644
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
@@ -14,4 +14,4 @@
 #define MICROPY_PY_FSTRINGS             (0)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
 #define MICROPY_PY_UASYNCIO             (0)
-#define MICROPY_PY_UCRYPTOLIB           (1)
+#define MICROPY_PY_CRYPTOLIB            (1)
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
index b0adb7081c99c..fc933cd3eb43b 100644
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
@@ -9,5 +9,5 @@
 #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)
+#define MICROPY_PY_RE_SUB               (0)
 #define MICROPY_PY_FRAMEBUF             (0)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 0cfb83f73e762..9985d59dd3944 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -36,8 +36,8 @@
 #define MICROPY_PY_MATH_FACTORIAL               (0)
 #define MICROPY_PY_MATH_ISCLOSE                 (0)
 #define MICROPY_PY_SYS_PS1_PS2                  (0)
-#define MICROPY_PY_UBINASCII_CRC32              (0)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (0)
+#define MICROPY_PY_BINASCII_CRC32               (0)
+#define MICROPY_PY_RANDOM_EXTRA_FUNCS           (0)
 
 // Configure other options.
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
@@ -54,11 +54,11 @@
 #define MICROPY_REPL_EVENT_DRIVEN   (0)
 #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_URANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE "ports/esp8266/modutime.c"
+#define MICROPY_PY_HASHLIB_SHA1     (MICROPY_PY_SSL && MICROPY_SSL_AXTLS)
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS (1)
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modutime.c"
 #define MICROPY_PY_LWIP             (1)
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
@@ -78,19 +78,19 @@
 #endif
 #define MICROPY_PY_NETWORK_INCLUDEFILE "ports/esp8266/modnetwork.h"
 #define MICROPY_PY_NETWORK_MODULE_GLOBALS_INCLUDEFILE "ports/esp8266/modnetwork_globals.h"
-#define MICROPY_PY_UWEBSOCKET       (1)
+#define MICROPY_PY_WEBSOCKET        (1)
 #define MICROPY_PY_ONEWIRE          (1)
 #define MICROPY_PY_WEBREPL          (1)
 #define MICROPY_PY_WEBREPL_DELAY    (20)
 #define MICROPY_PY_WEBREPL_STATIC_FILEBUF (1)
-#define MICROPY_PY_UOS_INCLUDEFILE  "ports/esp8266/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/esp8266/modos.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_SYNC         (1)
-#define MICROPY_PY_UOS_UNAME        (1)
-#define MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC (1)
-#define MICROPY_PY_UOS_URANDOM      (1)
+#define MICROPY_PY_OS_DUPTERM_NOTIFY (1)
+#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
+#define MICROPY_PY_OS_SYNC          (1)
+#define MICROPY_PY_OS_UNAME         (1)
+#define MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC (1)
+#define MICROPY_PY_OS_URANDOM       (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_WARNINGS            (1)
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
index 8617261d5400e..236db27c87db3 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
@@ -7,5 +7,5 @@ MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 
 MICROPY_PY_NETWORK_NINAW10 ?= 1
-MICROPY_PY_USSL ?= 1
+MICROPY_PY_SSL ?= 1
 MICROPY_SSL_MBEDTLS ?= 1
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 85bc1f71b6065..547b88d57de43 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 8e4213569a4fa..0cf2a348046e2 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 22cd5356d93a6..c2556a27248ac 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index b0bd7ec6ace4e..d3ba752419e0a 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
index dc44b93bd073f..25747a52c6be7 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
@@ -12,7 +12,7 @@ MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x4000000  # 64MB
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index d63c0dc403900..3d080ff25f1f8 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -3,7 +3,7 @@
 #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)
+#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (0)
 
 // Olimex RT1010-Py has 1 board LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_11)
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 8e530ac55892c..ca27dff55f3a2 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index ca7e10b5e4c38..cf07144668e15 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -8,7 +8,7 @@ MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index 8ae8019aaefd3..ecfc3712d78fa 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -95,7 +95,7 @@ uint32_t trng_random_u32(void) {
     return rngval;
 }
 
-#if MICROPY_PY_UOS_URANDOM
+#if MICROPY_PY_OS_URANDOM
 STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
@@ -109,7 +109,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
 
-#if MICROPY_PY_UOS_DUPTERM_NOTIFY
+#if MICROPY_PY_OS_DUPTERM_NOTIFY
 STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 52301cf94b275..be086cb552127 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -69,17 +69,17 @@ uint32_t trng_random_u32(void);
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970               (1)
-#define MICROPY_PY_USSL_FINALISER           (MICROPY_PY_USSL)
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS       (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE        "ports/mimxrt/modutime.c"
-#define MICROPY_PY_UOS_INCLUDEFILE          "ports/mimxrt/moduos.c"
+#define MICROPY_PY_SSL_FINALISER            (MICROPY_PY_SSL)
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS        (1)
+#define MICROPY_PY_TIME_INCLUDEFILE         "ports/mimxrt/modutime.c"
+#define MICROPY_PY_OS_INCLUDEFILE           "ports/mimxrt/moduos.c"
 #define MICROPY_PY_OS_DUPTERM               (3)
-#define MICROPY_PY_UOS_DUPTERM_NOTIFY       (1)
-#define MICROPY_PY_UOS_SYNC                 (1)
-#define MICROPY_PY_UOS_UNAME                (1)
-#define MICROPY_PY_UOS_URANDOM              (1)
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (trng_random_u32())
+#define MICROPY_PY_OS_DUPTERM_NOTIFY        (1)
+#define MICROPY_PY_OS_SYNC                  (1)
+#define MICROPY_PY_OS_UNAME                 (1)
+#define MICROPY_PY_OS_URANDOM               (1)
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (trng_random_u32())
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
@@ -96,7 +96,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_TIMER            (1)
 #define MICROPY_SOFT_TIMER_TICKS_MS         systick_ms
 #define MICROPY_PY_ONEWIRE                  (1)
-#define MICROPY_PY_UPLATFORM                (1)
+#define MICROPY_PY_PLATFORM                 (1)
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (1)
@@ -107,16 +107,16 @@ uint32_t trng_random_u32(void);
 #ifndef MICROPY_PY_NETWORK
 #define MICROPY_PY_NETWORK                  (1)
 #endif
-#ifndef MICROPY_PY_USOCKET
-#define MICROPY_PY_USOCKET                  (1)
+#ifndef MICROPY_PY_SOCKET
+#define MICROPY_PY_SOCKET                   (1)
 #endif
-#define MICROPY_PY_UWEBSOCKET               (MICROPY_PY_LWIP)
+#define MICROPY_PY_WEBSOCKET                (MICROPY_PY_LWIP)
 #define MICROPY_PY_WEBREPL                  (MICROPY_PY_LWIP)
 #define MICROPY_PY_LWIP_SOCK_RAW            (MICROPY_PY_LWIP)
-#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)
+#define MICROPY_PY_SSL_FINALISER            (MICROPY_PY_SSL)
+// #define MICROPY_PY_HASHLIB_MD5              (MICROPY_PY_SSL)
+#define MICROPY_PY_HASHLIB_SHA1             (MICROPY_PY_SSL)
+// #define MICROPY_PY_CRYPTOLIB                (MICROPY_PY_SSL)
 
 // Prevent the "LWIP task" from running.
 #define MICROPY_PY_LWIP_ENTER   MICROPY_PY_PENDSV_ENTER
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
index eab232848bce0..d4ce93a0aca15 100644
--- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
+++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
@@ -41,8 +41,8 @@
 #define MICROPY_EMIT_INLINE_THUMB   (1)
 
 // Enable optional modules
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_UHASHLIB         (1)
+#define MICROPY_PY_ERRNO            (1)
+#define MICROPY_PY_HASHLIB          (1)
 
 // Peripherals Config
 #define MICROPY_PY_MACHINE_UART     (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 0799000b908dd..3a311fe5d9abc 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -80,8 +80,8 @@
 #define MICROPY_PY_SYS_STDFILES            (CORE_FEAT)
 #endif
 
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII               (CORE_FEAT)
+#ifndef MICROPY_PY_BINASCII
+#define MICROPY_PY_BINASCII                (CORE_FEAT)
 #endif
 
 #ifndef MICROPY_PY_NRF
@@ -134,7 +134,7 @@
 #endif
 
 // Use port specific os module rather than extmod variant.
-#define MICROPY_PY_UOS              (0)
+#define MICROPY_PY_OS               (0)
 
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
@@ -155,9 +155,9 @@
 #define MICROPY_MODULE_BUILTIN_INIT (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_URANDOM          (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
-#define MICROPY_PY_UTIME            (1)
+#define MICROPY_PY_RANDOM           (1)
+#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1)
+#define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
 #define MICROPY_PY_MACHINE_SOFTI2C  (MICROPY_PY_MACHINE_I2C)
@@ -286,7 +286,7 @@ 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())
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_generate_random_word())
 long unsigned int rng_generate_random_word(void);
 #endif
 
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 972dce61b4987..0eada5a529c56 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -36,16 +36,16 @@
 #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)
+#define MICROPY_PY_ERRNO            (1)
+#define MICROPY_PY_BINASCII         (1)
+#define MICROPY_PY_RANDOM           (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_ZLIB             (1)
+#define MICROPY_PY_JSON             (1)
+#define MICROPY_PY_OS               (1)
+#define MICROPY_PY_RE               (1)
+#define MICROPY_PY_HEAPQ            (1)
+#define MICROPY_PY_HASHLIB          (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_USE_INTERNAL_PRINTF (1)
diff --git a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
index cd699e51bdaf4..4845c0c09eb4d 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
@@ -10,8 +10,8 @@
 #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_HEAPQ            (0)
+#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_THREAD           (0)
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
index 5fd2d1c6a3499..d8d22ad72f76e 100644
--- a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
@@ -10,8 +10,8 @@
 #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_HEAPQ            (1)
+#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
index b6f76a062e538..d746dbdfc2833 100644
--- a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
@@ -10,8 +10,8 @@
 #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_HEAPQ            (1)
+#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
index 9e3c462eec691..b6ecfe6d494c1 100644
--- a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
@@ -10,8 +10,8 @@
 #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_HEAPQ            (1)
+#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
index 7b8ccb1445bcb..3934dd264b478 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
@@ -10,8 +10,8 @@
 #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_HEAPQ            (0)
+#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_THREAD           (0)
 
 // peripheral config
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 42834c1fbc7fa..1886d31541ae3 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -91,19 +91,19 @@
 #endif
 
 // extended modules
-#define MICROPY_PY_UOS_INCLUDEFILE  "ports/renesas-ra/moduos.c"
+#define MICROPY_PY_OS_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)
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE "ports/renesas-ra/modutime.c"
-#ifndef MICROPY_PY_UTIMEQ
-#define MICROPY_PY_UTIMEQ           (1)
+#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
+#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
+#define MICROPY_PY_OS_SEP           (1)
+#define MICROPY_PY_OS_SYNC          (1)
+#define MICROPY_PY_OS_UNAME         (1)
+#define MICROPY_PY_OS_URANDOM       (MICROPY_HW_ENABLE_RNG)
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS (1)
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/renesas-ra/modtime.c"
+#ifndef MICROPY_PY_TIMEQ
+#define MICROPY_PY_TIMEQ            (1)
 #endif
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
@@ -126,8 +126,8 @@
 #ifndef MICROPY_PY_ONEWIRE
 #define MICROPY_PY_ONEWIRE          (1)
 #endif
-#ifndef MICROPY_PY_UPLATFORM
-#define MICROPY_PY_UPLATFORM        (1)
+#ifndef MICROPY_PY_PLATFORM
+#define MICROPY_PY_PLATFORM         (1)
 #endif
 
 // fatfs configuration used in ffconf.h
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index a4fb8b7c8c9e0..98b9c0f6faa72 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -8,7 +8,7 @@
 #define MICROPY_PY_NETWORK              (1)
 
 // Enable MD5 hash.
-#define MICROPY_PY_UHASHLIB_MD5         (1)
+#define MICROPY_PY_HASHLIB_MD5          (1)
 
 // Disable internal error numbers.
 #define MICROPY_USE_INTERNAL_ERRNO      (0)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 720e858f19645..de05a281bdb0e 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -95,21 +95,21 @@
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
-#define MICROPY_PY_UOS_INCLUDEFILE              "ports/rp2/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE               "ports/rp2/moduos.c"
 #ifndef MICROPY_PY_OS_DUPTERM
 #define MICROPY_PY_OS_DUPTERM                   (1)
 #endif
-#define MICROPY_PY_UOS_SYNC                     (1)
-#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_GMTIME_LOCALTIME_MKTIME (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS           (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE            "ports/rp2/modutime.c"
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (rosc_random_u32())
+#define MICROPY_PY_OS_SYNC                      (1)
+#define MICROPY_PY_OS_UNAME                     (1)
+#define MICROPY_PY_OS_URANDOM                   (1)
+#define MICROPY_PY_RE_MATCH_GROUPS              (1)
+#define MICROPY_PY_RE_MATCH_SPAN_START_END      (1)
+#define MICROPY_PY_HASHLIB_SHA1                 (1)
+#define MICROPY_PY_CRYPTOLIB                    (1)
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS            (1)
+#define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modutime.c"
+#define MICROPY_PY_RANDOM_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)
@@ -151,14 +151,14 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-rp2"
 #endif
 
-#ifndef MICROPY_PY_USOCKET
-#define MICROPY_PY_USOCKET              (1)
+#ifndef MICROPY_PY_SOCKET
+#define MICROPY_PY_SOCKET               (1)
 #endif
-#ifndef MICROPY_PY_USSL
-#define MICROPY_PY_USSL                 (1)
+#ifndef MICROPY_PY_SSL
+#define MICROPY_PY_SSL                  (1)
 #endif
-#ifndef MICROPY_PY_UWEBSOCKET
-#define MICROPY_PY_UWEBSOCKET           (1)
+#ifndef MICROPY_PY_WEBSOCKET
+#define MICROPY_PY_WEBSOCKET            (1)
 #endif
 #ifndef MICROPY_PY_WEBREPL
 #define MICROPY_PY_WEBREPL              (1)
@@ -181,8 +181,8 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 
 #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)
+#ifndef MICROPY_PY_SOCKET_EXTENDED_STATE
+#define MICROPY_PY_SOCKET_EXTENDED_STATE    (1)
 #endif
 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) },
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index df94b9682dfdb..f70981acd53c1 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -14,8 +14,8 @@
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
 #endif
 
-#ifndef MICROPY_PY_UTIME
-#define MICROPY_PY_UTIME                (1)
+#ifndef MICROPY_PY_TIME
+#define MICROPY_PY_TIME                 (1)
 #endif
 
 #ifndef MICROPY_PY_MATH
@@ -26,7 +26,7 @@
 #define MICROPY_PY_CMATH                (0)
 #endif
 
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32(300))
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32(300))
 unsigned long trng_random_u32(int delay);
 
 #define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
@@ -35,7 +35,7 @@ unsigned long trng_random_u32(int delay);
 #define MICROPY_HW_UART_TXBUF           (1)
 #endif
 
-#define MICROPY_PY_UOS_URANDOM          (1)
+#define MICROPY_PY_OS_URANDOM           (1)
 
 #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
 #define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 0c2d2370ffa98..1569e5624dd3a 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -27,9 +27,9 @@
 
 #define MICROPY_PY_MACHINE_DHT_READINTO (1)
 #define MICROPY_PY_ONEWIRE              (1)
-#define MICROPY_PY_UOS_SYNC             (1)
-#define MICROPY_PY_UOS_URANDOM          (1)
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
+#define MICROPY_PY_OS_SYNC              (1)
+#define MICROPY_PY_OS_URANDOM           (1)
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
 
 #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c
index 4438bf3c7bb2f..f9df0cd9969b7 100644
--- a/ports/samd/moduos.c
+++ b/ports/samd/moduos.c
@@ -69,7 +69,7 @@ uint32_t trng_random_u32(int delay) {
 #define TRNG_RANDOM_U32 trng_random_u32(10)
 #endif
 
-#if MICROPY_PY_UOS_URANDOM
+#if MICROPY_PY_OS_URANDOM
 STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
@@ -88,16 +88,16 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
-#endif // MICROPY_PY_UOS_URANDOM
+#endif // MICROPY_PY_OS_URANDOM
 
-#if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
+#if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM
 bool mp_os_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
+#if MICROPY_PY_OS_DUPTERM_NOTIFY
 STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index a0a58a2fd728c..8a9947468e53a 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -77,21 +77,21 @@
 #define MICROPY_PY_IO_IOBASE                (1)
 
 // Extended modules
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS       (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE        "ports/samd/modutime.c"
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS        (1)
+#define MICROPY_PY_TIME_INCLUDEFILE         "ports/samd/modtime.c"
 #define MICROPY_PY_MACHINE                  (1)
-#define MICROPY_PY_UOS                      (1)
-#define MICROPY_PY_UOS_INCLUDEFILE          "ports/samd/moduos.c"
+#define MICROPY_PY_OS                       (1)
+#define MICROPY_PY_OS_INCLUDEFILE           "ports/samd/modos.c"
 #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_JSON                     (1)
+#define MICROPY_PY_RE                       (1)
+#define MICROPY_PY_BINASCII                 (1)
 #define MICROPY_PY_UCTYPES                  (1)
-#define MICROPY_PY_UHEAPQ                   (1)
-#define MICROPY_PY_URANDOM                  (1)
-#define MICROPY_PY_UZLIB                    (1)
+#define MICROPY_PY_HEAPQ                    (1)
+#define MICROPY_PY_RANDOM                   (1)
+#define MICROPY_PY_ZLIB                     (1)
 #define MICROPY_PY_UASYNCIO                 (1)
 #define MICROPY_PY_MACHINE_RTC              (1)
 #ifndef MICROPY_PY_MACHINE_ADC
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
index 135b12b8c8c58..b927388c5577a 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
@@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1
 MICROPY_BLUETOOTH_BTSTACK = 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
index ebe9775e80771..2c48c17f3805e 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
@@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1
 MICROPY_BLUETOOTH_BTSTACK = 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
index 3bfd40dc92458..cf4d40e5fe9b9 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
@@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1
 MICROPY_BLUETOOTH_BTSTACK = 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index dfcca72afb55c..165284f31adeb 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -12,13 +12,13 @@
 #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_SOCKET           (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_PY_HEAPQ            (0)
+#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)
diff --git a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
index ed8178d7d4d6e..cfc46491e0763 100644
--- a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
+++ b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
@@ -4,7 +4,7 @@
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
-#define MICROPY_PY_USOCKET          (0)
+#define MICROPY_PY_SOCKET           (0)
 #define MICROPY_PY_NETWORK          (0)
 
 #define MICROPY_HW_HAS_SWITCH       (1)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index d44bfb0bb663b..39d0082d7bdc3 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -5,12 +5,12 @@
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
-#define MICROPY_PY_USOCKET          (0)
+#define MICROPY_PY_SOCKET           (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_HEAPQ            (0)
+#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_FRAMEBUF         (0)
 
 #define MICROPY_HW_ENABLE_RTC       (1)
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
index 9e82be1dc7355..e5fc89ab47aa0 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
@@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
index 69b0f80a2d2f9..b8666755b0345 100644
--- a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
@@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
index 9506b6759555d..20acc63f160e2 100644
--- a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
@@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
index 90fc242f9ac62..ab3eada5b0676 100644
--- a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
@@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
index 6ef9d42f9d375..22c40981591c9 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
@@ -8,7 +8,7 @@ TEXT1_ADDR = 0x08020000
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
index 31157dd2c4d34..336d95c42c62f 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
@@ -10,13 +10,13 @@
 #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_ZLIB             (0)
+#define MICROPY_PY_BINASCII         (0)
+#define MICROPY_PY_HASHLIB          (0)
+#define MICROPY_PY_JSON             (0)
+#define MICROPY_PY_RE               (0)
 #define MICROPY_PY_FRAMEBUF         (0)
-#define MICROPY_PY_USOCKET          (0)
+#define MICROPY_PY_SOCKET           (0)
 #define MICROPY_PY_NETWORK          (0)
 
 // The board has an 24MHz HSE, the following gives 170MHz CPU speed
diff --git a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk
index 287b51f6d83f4..6d512ec0eda27 100644
--- a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk
@@ -18,7 +18,7 @@ endif
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
index ea95fd00743c9..cbdf48c52a86d 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
@@ -18,7 +18,7 @@ endif
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index c8c809eb4899e..1d6b303260dca 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -12,13 +12,13 @@
 #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_SOCKET           (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_PY_HEAPQ            (0)
+#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_PY_MACHINE_BITSTREAM (0)
 
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 5e05053cdd904..ba843c8a61153 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -6,13 +6,13 @@
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
-#define MICROPY_PY_USOCKET          (0)
+#define MICROPY_PY_SOCKET           (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_PY_HEAPQ            (0)
+#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (1)
diff --git a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
index 1b5827d5aec00..b0fab459567c6 100644
--- a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
@@ -1,7 +1,7 @@
 #define MICROPY_HW_BOARD_NAME       "NUCLEO-L452RE"
 #define MICROPY_HW_MCU_NAME         "STM32L452RE"
 
-#define MICROPY_PY_USOCKET          (0)
+#define MICROPY_PY_SOCKET           (0)
 #define MICROPY_PY_NETWORK          (0)
 
 #define MICROPY_HW_ENABLE_RTC       (1)
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
index baf1f023be861..2bb368adccd4f 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -11,13 +11,13 @@
 #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_SOCKET                       (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_PY_HEAPQ                        (0)
+#define MICROPY_PY_TIMEQ                        (0)
 
 #define MICROPY_HW_HAS_FLASH                    (1)
 #define MICROPY_HW_ENABLE_RTC                   (1)
diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk
index 0d3eee83be276..aa11fd5492dc4 100644
--- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk
+++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk
@@ -7,5 +7,5 @@ TEXT1_ADDR = 0x08020000
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
index 6615a44a538d9..ee481e344f0c9 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
@@ -15,7 +15,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1
 MICROPY_BLUETOOTH_BTSTACK ?= 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
diff --git a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
index 550094b7439db..cb8c44361cbbd 100644
--- a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
@@ -15,7 +15,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1
 MICROPY_BLUETOOTH_BTSTACK ?= 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
index 9db2210559a63..943ddf60d33b8 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
@@ -12,7 +12,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1
 MICROPY_BLUETOOTH_BTSTACK ?= 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
index 6457fc6046bd4..712906747ccdf 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
@@ -42,7 +42,7 @@ endif
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
index 9506b6759555d..20acc63f160e2 100644
--- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
@@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000
 
 # MicroPython settings
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
index a30a6137d3b38..2d3e4cec4f8b6 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
@@ -6,7 +6,7 @@ TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
 
 MICROPY_PY_LWIP = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/moduos.c b/ports/stm32/moduos.c
index bfbb868e2fb36..43543aa55e2dd 100644
--- a/ports/stm32/moduos.c
+++ b/ports/stm32/moduos.c
@@ -29,7 +29,7 @@
 #include "usb.h"
 #include "uart.h"
 
-#if MICROPY_PY_UOS_URANDOM
+#if MICROPY_PY_OS_URANDOM
 // urandom(n)
 // Return a bytes object with n random bytes, generated by the hardware
 // random number generator.
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 62784dccf1012..49a8a03405257 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -92,24 +92,24 @@
 #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)
-#define MICROPY_PY_UOS_INCLUDEFILE  "ports/stm32/moduos.c"
+#define MICROPY_PY_SSL_FINALISER    (MICROPY_PY_SSL)
+#define MICROPY_PY_HASHLIB_MD5      (MICROPY_PY_SSL)
+#define MICROPY_PY_HASHLIB_SHA1     (MICROPY_PY_SSL)
+#define MICROPY_PY_CRYPTOLIB        (MICROPY_PY_SSL)
+#define MICROPY_PY_OS_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())
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE "ports/stm32/modutime.c"
-#ifndef MICROPY_PY_UTIMEQ
-#define MICROPY_PY_UTIMEQ           (1)
+#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
+#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
+#define MICROPY_PY_OS_SEP           (1)
+#define MICROPY_PY_OS_SYNC          (1)
+#define MICROPY_PY_OS_UNAME         (1)
+#define MICROPY_PY_OS_URANDOM       (MICROPY_HW_ENABLE_RNG)
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_get())
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS (1)
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modutime.c"
+#ifndef MICROPY_PY_TIMEQ
+#define MICROPY_PY_TIMEQ            (1)
 #endif
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
@@ -130,10 +130,10 @@
 #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)
+#define MICROPY_PY_WEBSOCKET        (MICROPY_PY_LWIP)
 #define MICROPY_PY_WEBREPL          (MICROPY_PY_LWIP)
-#ifndef MICROPY_PY_USOCKET
-#define MICROPY_PY_USOCKET          (1)
+#ifndef MICROPY_PY_SOCKET
+#define MICROPY_PY_SOCKET           (1)
 #endif
 #ifndef MICROPY_PY_NETWORK
 #define MICROPY_PY_NETWORK          (1)
@@ -141,8 +141,8 @@
 #ifndef MICROPY_PY_ONEWIRE
 #define MICROPY_PY_ONEWIRE          (1)
 #endif
-#ifndef MICROPY_PY_UPLATFORM
-#define MICROPY_PY_UPLATFORM        (1)
+#ifndef MICROPY_PY_PLATFORM
+#define MICROPY_PY_PLATFORM         (1)
 #endif
 
 // fatfs configuration used in ffconf.h
@@ -324,5 +324,5 @@ 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.
+// Needed for MICROPY_PY_RANDOM_SEED_INIT_FUNC.
 uint32_t rng_get(void);
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 0ff2e4b6e8faf..9ff19aab9883f 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -138,7 +138,7 @@ CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
 LDFLAGS += $(LIBPTHREAD)
 endif
 
-ifeq ($(MICROPY_PY_USSL),1)
+ifeq ($(MICROPY_PY_SSL),1)
 ifeq ($(MICROPY_SSL_AXTLS),1)
 
 endif
diff --git a/ports/unix/README.md b/ports/unix/README.md
index a3a0dba75a131..a3159a3262e85 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -70,5 +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 the SSL module, `MICROPY_PY_USSL` should be
+options. For example, to build the SSL module, `MICROPY_PY_SSL` should be
 set to 1.
diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h
index c8ffab0832a16..629064abcf297 100644
--- a/ports/unix/mbedtls/mbedtls_config.h
+++ b/ports/unix/mbedtls/mbedtls_config.h
@@ -27,7 +27,7 @@
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
 // Set mbedtls configuration
-#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_UCRYPTOLIB_CTR
+#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_CRYPTOLIB_CTR
 
 // Enable mbedtls modules
 #define MBEDTLS_HAVEGE_C
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 9f7f452a1291a..97c3602e4bc72 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -27,10 +27,10 @@
 
 #include "py/mpconfig.h"
 
-#if MICROPY_PY_USELECT_POSIX
+#if MICROPY_PY_SELECT_POSIX
 
-#if MICROPY_PY_USELECT
-#error "Can't have both MICROPY_PY_USELECT and MICROPY_PY_USELECT_POSIX."
+#if MICROPY_PY_SELECT
+#error "Can't have both MICROPY_PY_SELECT and MICROPY_PY_SELECT_POSIX."
 #endif
 
 #include <stdio.h>
@@ -353,4 +353,4 @@ const mp_obj_module_t mp_module_select = {
 
 MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
 
-#endif // MICROPY_PY_USELECT_POSIX
+#endif // MICROPY_PY_SELECT_POSIX
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index d8a615b469693..9854f3cbce155 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -146,7 +146,7 @@ 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
+        #if MICROPY_PY_SELECT
         case MP_STREAM_POLL: {
             mp_uint_t ret = 0;
             uint8_t pollevents = 0;
@@ -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 = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
+    int backlog = MICROPY_PY_SOCKET_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/modutime.c b/ports/unix/modutime.c
index 26c2fbdb900b4..b6fbae0d1c24b 100644
--- a/ports/unix/modutime.c
+++ b/ports/unix/modutime.c
@@ -200,7 +200,7 @@ STATIC mp_obj_t mod_time_mktime(mp_obj_t tuple) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mod_time_mktime_obj, mod_time_mktime);
 
-#define MICROPY_PY_UTIME_EXTRA_GLOBALS \
+#define MICROPY_PY_TIME_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&mod_time_clock_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) }, \
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 0588e100d6c65..58aba9700bdb8 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -160,7 +160,7 @@ typedef long mp_off_t;
 // Enable sys.executable.
 #define MICROPY_PY_SYS_EXECUTABLE (1)
 
-#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
+#define MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
 
 // Bare-metal ports don't have stderr. Printing debug to stderr may give tests
 // which check stdout a chance to pass, etc.
@@ -181,7 +181,7 @@ void mp_unix_mark_exec(void);
 #endif
 
 // If enabled, configure how to seed random on init.
-#ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
+#ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC
 #include <stddef.h>
 void mp_hal_get_random(size_t n, void *buf);
 static inline unsigned long mp_random_seed_init(void) {
diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk
index ce6183c13397a..c8ade0b7e277c 100644
--- a/ports/unix/mpconfigport.mk
+++ b/ports/unix/mpconfigport.mk
@@ -23,8 +23,8 @@ MICROPY_PY_SOCKET = 1
 # ffi module requires libffi (libffi-dev Debian package)
 MICROPY_PY_FFI = 1
 
-# ussl module requires one of the TLS libraries below
-MICROPY_PY_USSL = 1
+# ssl module requires one of the TLS libraries below
+MICROPY_PY_SSL = 1
 # axTLS has minimal size but implements only a subset of modern TLS
 # functionality, so may have problems with some servers.
 MICROPY_SSL_AXTLS = 0
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 2a48e57e7f013..e24e0f1b14ade 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -41,4 +41,4 @@
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_TRACKED_ALLOC          (1)
 #define MICROPY_WARNINGS_CATEGORY      (1)
-#define MICROPY_PY_UCRYPTOLIB_CTR      (1)
+#define MICROPY_PY_CRYPTOLIB_CTR       (1)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 6b107e77909c3..0dbfbb3d1cd43 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -63,7 +63,7 @@
 
 // Enable just the sys and os built-in modules.
 #define MICROPY_PY_SYS (1)
-#define MICROPY_PY_UOS (1)
+#define MICROPY_PY_OS (1)
 
 // The minimum sets this to 1 to save flash.
 #define MICROPY_QSTR_BYTES_IN_HASH (2)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.mk b/ports/unix/variants/minimal/mpconfigvariant.mk
index d5c2a52e9ae62..19b3460ed5950 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.mk
+++ b/ports/unix/variants/minimal/mpconfigvariant.mk
@@ -7,7 +7,7 @@ MICROPY_PY_FFI = 0
 MICROPY_PY_SOCKET = 0
 MICROPY_PY_THREAD = 0
 MICROPY_PY_TERMIOS = 0
-MICROPY_PY_USSL = 0
+MICROPY_PY_SSL = 0
 MICROPY_USE_READLINE = 0
 
 MICROPY_VFS_FAT = 0
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 9a8a524a226ed..cc50d426ceb26 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -58,7 +58,7 @@
 #endif
 
 // Seed random on import.
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_random_seed_init())
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (mp_random_seed_init())
 
 // Allow exception details in low-memory conditions.
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
@@ -87,39 +87,39 @@
 #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)
+#define MICROPY_PY_OS_INCLUDEFILE      "ports/unix/moduos.c"
+#define MICROPY_PY_OS_ERRNO            (1)
+#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
+#define MICROPY_PY_OS_SEP              (1)
+#define MICROPY_PY_OS_SYSTEM           (1)
+#define MICROPY_PY_OS_URANDOM          (1)
 
 // Enable the unix-specific "time" module.
-#define MICROPY_PY_UTIME               (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS  (1)
-#define MICROPY_PY_UTIME_CUSTOM_SLEEP  (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE   "ports/unix/modutime.c"
+#define MICROPY_PY_TIME                (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS   (1)
+#define MICROPY_PY_TIME_CUSTOM_SLEEP   (1)
+#define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modutime.c"
 
 // Enable the utimeq module used by the previous (v2) version of uasyncio.
-#define MICROPY_PY_UTIMEQ              (1)
+#define MICROPY_PY_TIMEQ               (1)
 
-#if MICROPY_PY_USSL
-#define MICROPY_PY_UHASHLIB_MD5        (1)
-#define MICROPY_PY_UHASHLIB_SHA1       (1)
-#define MICROPY_PY_UCRYPTOLIB          (1)
+#if MICROPY_PY_SSL
+#define MICROPY_PY_HASHLIB_MD5         (1)
+#define MICROPY_PY_HASHLIB_SHA1        (1)
+#define MICROPY_PY_CRYPTOLIB           (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)
+#ifndef MICROPY_PY_SELECT
+#define MICROPY_PY_SELECT              (0)
 #endif
-#ifndef MICROPY_PY_USELECT_POSIX
-#define MICROPY_PY_USELECT_POSIX       (!MICROPY_PY_USELECT)
+#ifndef MICROPY_PY_SELECT_POSIX
+#define MICROPY_PY_SELECT_POSIX        (!MICROPY_PY_SELECT)
 #endif
 
 // Enable the "websocket" module.
-#define MICROPY_PY_UWEBSOCKET          (1)
+#define MICROPY_PY_WEBSOCKET           (1)
 
 // Enable the "machine" module, mostly for machine.mem*.
 #define MICROPY_PY_MACHINE             (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 5e56923d93b34..87e12562b1646 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -130,29 +130,29 @@
 #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_TIME_TIME_NS (1)
-#define MICROPY_PY_UTIME_CUSTOM_SLEEP (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE "ports/unix/modutime.c"
-#define MICROPY_PY_UERRNO           (1)
+#define MICROPY_PY_OS               (1)
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/unix/moduos.c"
+#define MICROPY_PY_OS_ERRNO         (1)
+#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
+#define MICROPY_PY_OS_SEP           (1)
+#define MICROPY_PY_OS_STATVFS       (0)
+#define MICROPY_PY_OS_SYSTEM        (1)
+#define MICROPY_PY_OS_URANDOM       (1)
+#define MICROPY_PY_TIME             (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS (1)
+#define MICROPY_PY_TIME_CUSTOM_SLEEP (1)
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c"
+#define MICROPY_PY_ERRNO            (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)
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_UBINASCII_CRC32  (1)
-#define MICROPY_PY_URANDOM          (1)
+#define MICROPY_PY_ZLIB             (1)
+#define MICROPY_PY_JSON             (1)
+#define MICROPY_PY_RE               (1)
+#define MICROPY_PY_HEAPQ            (1)
+#define MICROPY_PY_TIMEQ            (1)
+#define MICROPY_PY_HASHLIB          (1)
+#define MICROPY_PY_BINASCII         (1)
+#define MICROPY_PY_BINASCII_CRC32   (1)
+#define MICROPY_PY_RANDOM           (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_MACHINE_MEM_GET_READ_ADDR   mod_machine_mem_get_addr
diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h
index abf43a0da92ac..d6ce7bf36f9d9 100644
--- a/ports/windows/variants/dev/mpconfigvariant.h
+++ b/ports/windows/variants/dev/mpconfigvariant.h
@@ -34,9 +34,9 @@
 #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_RANDOM_EXTRA_FUNCS           (1)
 #define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
-#define MICROPY_PY_USELECT                      (1)
+#define MICROPY_PY_SELECT                       (1)
 
 #ifndef MICROPY_PY_UASYNCIO
 #define MICROPY_PY_UASYNCIO                     (1)
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index c3356189ab790..8d4197410c2e6 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/mpconfig.h"
-#ifdef MICROPY_PY_USOCKET
+#ifdef MICROPY_PY_SOCKET
 
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -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 = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
+    mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
@@ -475,4 +475,4 @@ const mp_obj_module_t mp_module_socket = {
 
 MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
 
-#endif // MICROPY_PY_USOCKET
+#endif // MICROPY_PY_SOCKET
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index e35a1716f473f..5b55f0ebbaa1e 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -145,4 +145,4 @@ const mp_obj_module_t mp_module_zsensor = {
 
 MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor);
 
-#endif // MICROPY_PY_UHASHLIB
+#endif // MICROPY_PY_HASHLIB
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 30ccccb6272f5..ec759bda775f9 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -72,8 +72,8 @@
 #define MICROPY_PY_STRUCT           (0)
 #ifdef CONFIG_NETWORKING
 // If we have networking, we likely want errno comfort
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_USOCKET          (1)
+#define MICROPY_PY_ERRNO            (1)
+#define MICROPY_PY_SOCKET           (1)
 #endif
 #ifdef CONFIG_BT
 #define MICROPY_PY_BLUETOOTH        (1)
@@ -82,12 +82,12 @@
 #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)
-#define MICROPY_PY_UTIME            (1)
-#define MICROPY_PY_UTIME_TIME_TIME_NS (1)
-#define MICROPY_PY_UTIME_INCLUDEFILE "ports/zephyr/modutime.c"
+#define MICROPY_PY_BINASCII         (1)
+#define MICROPY_PY_HASHLIB          (1)
+#define MICROPY_PY_OS               (1)
+#define MICROPY_PY_TIME             (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS (1)
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modutime.c"
 #define MICROPY_PY_ZEPHYR           (1)
 #define MICROPY_PY_ZSENSOR          (1)
 #define MICROPY_PY_SYS_MODULES      (0)
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 90211e3657900..6046690197c25 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -57,7 +57,7 @@ CONFIG_THREAD_ANALYZER=y
 CONFIG_THREAD_ANALYZER_USE_PRINTK=y
 CONFIG_THREAD_NAME=y
 
-# Required for usocket.pkt_get_info()
+# Required for socket.pkt_get_info()
 CONFIG_NET_BUF_POOL_USAGE=y
 
 # Required for zephyr.shell_exec()
diff --git a/py/moduerrno.c b/py/moduerrno.c
index ed172ae4d6e7d..99ca101bd6e85 100644
--- a/py/moduerrno.c
+++ b/py/moduerrno.c
@@ -30,12 +30,12 @@
 #include "py/obj.h"
 #include "py/mperrno.h"
 
-#if MICROPY_PY_UERRNO
+#if MICROPY_PY_ERRNO
 
 // This list can be defined per port in mpconfigport.h to tailor it to a
 // specific port's needs.  If it's not defined then we provide a default.
-#ifndef MICROPY_PY_UERRNO_LIST
-#define MICROPY_PY_UERRNO_LIST \
+#ifndef MICROPY_PY_ERRNO_LIST
+#define MICROPY_PY_ERRNO_LIST \
     X(EPERM) \
     X(ENOENT) \
     X(EIO) \
@@ -61,10 +61,10 @@
 
 #endif
 
-#if MICROPY_PY_UERRNO_ERRORCODE
+#if MICROPY_PY_ERRNO_ERRORCODE
 STATIC const mp_rom_map_elem_t errorcode_table[] = {
     #define X(e) { MP_ROM_INT(MP_##e), MP_ROM_QSTR(MP_QSTR_##e) },
-    MICROPY_PY_UERRNO_LIST
+    MICROPY_PY_ERRNO_LIST
 #undef X
 };
 
@@ -83,12 +83,12 @@ STATIC const mp_obj_dict_t errorcode_dict = {
 
 STATIC const mp_rom_map_elem_t mp_module_errno_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_errno) },
-    #if MICROPY_PY_UERRNO_ERRORCODE
+    #if MICROPY_PY_ERRNO_ERRORCODE
     { MP_ROM_QSTR(MP_QSTR_errorcode), MP_ROM_PTR(&errorcode_dict) },
     #endif
 
     #define X(e) { MP_ROM_QSTR(MP_QSTR_##e), MP_ROM_INT(MP_##e) },
-    MICROPY_PY_UERRNO_LIST
+    MICROPY_PY_ERRNO_LIST
 #undef X
 };
 
@@ -102,7 +102,7 @@ const mp_obj_module_t mp_module_errno = {
 MP_REGISTER_MODULE(MP_QSTR_errno, mp_module_errno);
 
 qstr mp_errno_to_str(mp_obj_t errno_val) {
-    #if MICROPY_PY_UERRNO_ERRORCODE
+    #if MICROPY_PY_ERRNO_ERRORCODE
     // We have the errorcode dict so can do a lookup using the hash map
     mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)&errorcode_dict.map, errno_val, MP_MAP_LOOKUP);
     if (elem == NULL) {
@@ -121,4 +121,4 @@ qstr mp_errno_to_str(mp_obj_t errno_val) {
     #endif
 }
 
-#endif // MICROPY_PY_UERRNO
+#endif // MICROPY_PY_ERRNO
diff --git a/py/mpconfig.h b/py/mpconfig.h
index fbe8ba54e2d22..a004f548ad912 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1459,40 +1459,40 @@ typedef double mp_float_t;
 #endif
 
 // Whether to provide "errno" module
-#ifndef MICROPY_PY_UERRNO
-#define MICROPY_PY_UERRNO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_ERRNO
+#define MICROPY_PY_ERRNO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide the errno.errorcode dict
-#ifndef MICROPY_PY_UERRNO_ERRORCODE
-#define MICROPY_PY_UERRNO_ERRORCODE (1)
+#ifndef MICROPY_PY_ERRNO_ERRORCODE
+#define MICROPY_PY_ERRNO_ERRORCODE (1)
 #endif
 
 // Whether to provide "select" module (baremetal implementation)
-#ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_SELECT
+#define MICROPY_PY_SELECT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to enable the select() function in the "select" 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)
+#ifndef MICROPY_PY_SELECT_SELECT
+#define MICROPY_PY_SELECT_SELECT (1)
 #endif
 
 // Whether to provide the "time" module
-#ifndef MICROPY_PY_UTIME
-#define MICROPY_PY_UTIME (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
+#ifndef MICROPY_PY_TIME
+#define MICROPY_PY_TIME (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
 #endif
 
 // Whether to provide time.gmtime/localtime/mktime functions
-#ifndef MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
-#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (0)
+#ifndef MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (0)
 #endif
 
 // Whether to provide time.time/time_ns functions
-#ifndef MICROPY_PY_UTIME_TIME_TIME_NS
-#define MICROPY_PY_UTIME_TIME_TIME_NS (0)
+#ifndef MICROPY_PY_TIME_TIME_TIME_NS
+#define MICROPY_PY_TIME_TIME_TIME_NS (0)
 #endif
 
 // Period of values returned by time.ticks_ms(), ticks_us(), ticks_cpu()
@@ -1501,8 +1501,8 @@ typedef double mp_float_t;
 // minimum of them should be used. The value below is the maximum value
 // this parameter can take (corresponding to 30 bit tick values on 32-bit
 // system).
-#ifndef MICROPY_PY_UTIME_TICKS_PERIOD
-#define MICROPY_PY_UTIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1)
+#ifndef MICROPY_PY_TIME_TICKS_PERIOD
+#define MICROPY_PY_TIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1)
 #endif
 
 // Whether to provide "_thread" module
@@ -1538,101 +1538,101 @@ typedef double mp_float_t;
 #define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1)
 #endif
 
-#ifndef MICROPY_PY_UZLIB
-#define MICROPY_PY_UZLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_ZLIB
+#define MICROPY_PY_ZLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-#ifndef MICROPY_PY_UJSON
-#define MICROPY_PY_UJSON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_JSON
+#define MICROPY_PY_JSON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support the "separators" argument to dump, dumps
-#ifndef MICROPY_PY_UJSON_SEPARATORS
-#define MICROPY_PY_UJSON_SEPARATORS (1)
+#ifndef MICROPY_PY_JSON_SEPARATORS
+#define MICROPY_PY_JSON_SEPARATORS (1)
 #endif
 
-#ifndef MICROPY_PY_UOS
-#define MICROPY_PY_UOS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_OS
+#define MICROPY_PY_OS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-#ifndef MICROPY_PY_UOS_STATVFS
-#define MICROPY_PY_UOS_STATVFS (MICROPY_PY_UOS)
+#ifndef MICROPY_PY_OS_STATVFS
+#define MICROPY_PY_OS_STATVFS (MICROPY_PY_OS)
 #endif
 
-#ifndef MICROPY_PY_URE
-#define MICROPY_PY_URE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_RE
+#define MICROPY_PY_RE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-#ifndef MICROPY_PY_URE_DEBUG
-#define MICROPY_PY_URE_DEBUG (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#ifndef MICROPY_PY_RE_DEBUG
+#define MICROPY_PY_RE_DEBUG (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
-#ifndef MICROPY_PY_URE_MATCH_GROUPS
-#define MICROPY_PY_URE_MATCH_GROUPS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#ifndef MICROPY_PY_RE_MATCH_GROUPS
+#define MICROPY_PY_RE_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 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#ifndef MICROPY_PY_RE_MATCH_SPAN_START_END
+#define MICROPY_PY_RE_MATCH_SPAN_START_END (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
-#ifndef MICROPY_PY_URE_SUB
-#define MICROPY_PY_URE_SUB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_RE_SUB
+#define MICROPY_PY_RE_SUB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-#ifndef MICROPY_PY_UHEAPQ
-#define MICROPY_PY_UHEAPQ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_HEAPQ
+#define MICROPY_PY_HEAPQ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Optimized heap queue for relative timestamps (only used by uasyncio v2)
-#ifndef MICROPY_PY_UTIMEQ
-#define MICROPY_PY_UTIMEQ (0)
+#ifndef MICROPY_PY_TIMEQ
+#define MICROPY_PY_TIMEQ (0)
 #endif
 
-#ifndef MICROPY_PY_UHASHLIB
-#define MICROPY_PY_UHASHLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_HASHLIB
+#define MICROPY_PY_HASHLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-#ifndef MICROPY_PY_UHASHLIB_MD5
-#define MICROPY_PY_UHASHLIB_MD5 (0)
+#ifndef MICROPY_PY_HASHLIB_MD5
+#define MICROPY_PY_HASHLIB_MD5 (0)
 #endif
 
-#ifndef MICROPY_PY_UHASHLIB_SHA1
-#define MICROPY_PY_UHASHLIB_SHA1  (0)
+#ifndef MICROPY_PY_HASHLIB_SHA1
+#define MICROPY_PY_HASHLIB_SHA1  (0)
 #endif
 
-#ifndef MICROPY_PY_UHASHLIB_SHA256
-#define MICROPY_PY_UHASHLIB_SHA256 (1)
+#ifndef MICROPY_PY_HASHLIB_SHA256
+#define MICROPY_PY_HASHLIB_SHA256 (1)
 #endif
 
-#ifndef MICROPY_PY_UCRYPTOLIB
-#define MICROPY_PY_UCRYPTOLIB (0)
+#ifndef MICROPY_PY_CRYPTOLIB
+#define MICROPY_PY_CRYPTOLIB (0)
 #endif
 
-// Depends on MICROPY_PY_UCRYPTOLIB
-#ifndef MICROPY_PY_UCRYPTOLIB_CTR
-#define MICROPY_PY_UCRYPTOLIB_CTR (0)
+// Depends on MICROPY_PY_CRYPTOLIB
+#ifndef MICROPY_PY_CRYPTOLIB_CTR
+#define MICROPY_PY_CRYPTOLIB_CTR (0)
 #endif
 
-#ifndef MICROPY_PY_UCRYPTOLIB_CONSTS
-#define MICROPY_PY_UCRYPTOLIB_CONSTS (0)
+#ifndef MICROPY_PY_CRYPTOLIB_CONSTS
+#define MICROPY_PY_CRYPTOLIB_CONSTS (0)
 #endif
 
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_BINASCII
+#define MICROPY_PY_BINASCII (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Depends on MICROPY_PY_UZLIB
-#ifndef MICROPY_PY_UBINASCII_CRC32
-#define MICROPY_PY_UBINASCII_CRC32 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+// Depends on MICROPY_PY_ZLIB
+#ifndef MICROPY_PY_BINASCII_CRC32
+#define MICROPY_PY_BINASCII_CRC32 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-#ifndef MICROPY_PY_URANDOM
-#define MICROPY_PY_URANDOM (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_RANDOM
+#define MICROPY_PY_RANDOM (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 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_RANDOM_EXTRA_FUNCS
+#define MICROPY_PY_RANDOM_EXTRA_FUNCS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_MACHINE
@@ -1678,21 +1678,21 @@ typedef double mp_float_t;
 #endif
 
 // The default backlog value for socket.listen(backlog)
-#ifndef MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT
-#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (2)
+#ifndef MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT
+#define MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT (2)
 #endif
 
-#ifndef MICROPY_PY_USSL
-#define MICROPY_PY_USSL (0)
+#ifndef MICROPY_PY_SSL
+#define MICROPY_PY_SSL (0)
 #endif
 
 // Whether to add finaliser code to ssl objects
-#ifndef MICROPY_PY_USSL_FINALISER
-#define MICROPY_PY_USSL_FINALISER (0)
+#ifndef MICROPY_PY_SSL_FINALISER
+#define MICROPY_PY_SSL_FINALISER (0)
 #endif
 
-#ifndef MICROPY_PY_UWEBSOCKET
-#define MICROPY_PY_UWEBSOCKET (0)
+#ifndef MICROPY_PY_WEBSOCKET
+#define MICROPY_PY_WEBSOCKET (0)
 #endif
 
 #ifndef MICROPY_PY_FRAMEBUF
diff --git a/py/mperrno.h b/py/mperrno.h
index 6f6d816b8f496..be2a65a088c8b 100644
--- a/py/mperrno.h
+++ b/py/mperrno.h
@@ -141,7 +141,7 @@
 
 #endif
 
-#if MICROPY_PY_UERRNO
+#if MICROPY_PY_ERRNO
 
 #include "py/obj.h"
 
diff --git a/py/objbool.c b/py/objbool.c
index 3267ff98bb8a1..96f0e60dd1765 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -45,7 +45,7 @@ typedef struct _mp_obj_bool_t {
 
 STATIC void bool_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     bool value = BOOL_VALUE(self_in);
-    if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
+    if (MICROPY_PY_JSON && kind == PRINT_JSON) {
         if (value) {
             mp_print_str(print, "true");
         } else {
diff --git a/py/objdict.c b/py/objdict.c
index a621c4feafbf2..8aafe607d69ff 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -75,10 +75,10 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
     bool first = true;
     const char *item_separator = ", ";
     const char *key_separator = ": ";
-    if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
+    if (!(MICROPY_PY_JSON && kind == PRINT_JSON)) {
         kind = PRINT_REPR;
     } else {
-        #if MICROPY_PY_UJSON_SEPARATORS
+        #if MICROPY_PY_JSON_SEPARATORS
         item_separator = MP_PRINT_GET_EXT(print)->item_separator;
         key_separator = MP_PRINT_GET_EXT(print)->key_separator;
         #endif
@@ -94,7 +94,7 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
             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);
+        bool add_quote = MICROPY_PY_JSON && kind == PRINT_JSON && !mp_obj_is_str_or_bytes(next->key);
         if (add_quote) {
             mp_print_str(print, "\"");
         }
diff --git a/py/objexcept.c b/py/objexcept.c
index cc0ddd9dc5f00..a90405c525484 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -178,7 +178,7 @@ void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kin
             return;
         }
 
-        #if MICROPY_PY_UERRNO
+        #if MICROPY_PY_ERRNO
         // 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]);
diff --git a/py/objlist.c b/py/objlist.c
index 18da91ba3abc3..1423cb1deeb73 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -45,10 +45,10 @@ 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)) {
+    if (!(MICROPY_PY_JSON && kind == PRINT_JSON)) {
         kind = PRINT_REPR;
     } else {
-        #if MICROPY_PY_UJSON_SEPARATORS
+        #if MICROPY_PY_JSON_SEPARATORS
         item_separator = MP_PRINT_GET_EXT(print)->item_separator;
         #endif
     }
diff --git a/py/objnone.c b/py/objnone.c
index 4b0696d3a1429..5b25cd38c46d5 100644
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -36,7 +36,7 @@ typedef struct _mp_obj_none_t {
 
 STATIC void none_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)self_in;
-    if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
+    if (MICROPY_PY_JSON && kind == PRINT_JSON) {
         mp_print_str(print, "null");
     } else {
         mp_print_str(print, "None");
diff --git a/py/objstr.c b/py/objstr.c
index e6c5ee71cf7ef..b966a70169c36 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -109,7 +109,7 @@ void mp_str_print_quoted(const mp_print_t *print, const byte *str_data, size_t s
     mp_printf(print, "%c", quote_char);
 }
 
-#if MICROPY_PY_UJSON
+#if MICROPY_PY_JSON
 void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str_len) {
     // for JSON spec, see http://www.ietf.org/rfc/rfc4627.txt
     // if we are given a valid utf8-encoded string, we will print it in a JSON-conforming way
@@ -137,7 +137,7 @@ void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str
 
 STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     GET_STR_DATA_LEN(self_in, str_data, str_len);
-    #if MICROPY_PY_UJSON
+    #if MICROPY_PY_JSON
     if (kind == PRINT_JSON) {
         mp_str_print_json(print, str_data, str_len);
         return;
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 93383b3c19e95..cbc797de29128 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -85,7 +85,7 @@ STATIC void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint
 
 STATIC void uni_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     GET_STR_DATA_LEN(self_in, str_data, str_len);
-    #if MICROPY_PY_UJSON
+    #if MICROPY_PY_JSON
     if (kind == PRINT_JSON) {
         mp_str_print_json(print, str_data, str_len);
         return;
diff --git a/py/objtuple.c b/py/objtuple.c
index 9d6797b4ffc3f..0318a35db6349 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -40,9 +40,9 @@
 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) {
+    if (MICROPY_PY_JSON && kind == PRINT_JSON) {
         mp_print_str(print, "[");
-        #if MICROPY_PY_UJSON_SEPARATORS
+        #if MICROPY_PY_JSON_SEPARATORS
         item_separator = MP_PRINT_GET_EXT(print)->item_separator;
         #endif
     } else {
@@ -55,7 +55,7 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
         }
         mp_obj_print_helper(print, o->items[i], kind);
     }
-    if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
+    if (MICROPY_PY_JSON && kind == PRINT_JSON) {
         mp_print_str(print, "]");
     } else {
         if (o->len == 1) {
diff --git a/py/parse.c b/py/parse.c
index a271aa0ea359d..0dd56e4554f44 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -636,7 +636,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
 
 #if MICROPY_COMP_MODULE_CONST
 STATIC const mp_rom_map_elem_t mp_constants_table[] = {
-    #if MICROPY_PY_UERRNO
+    #if MICROPY_PY_ERRNO
     { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_errno) },
     #endif
     #if MICROPY_PY_UCTYPES
diff --git a/tools/ci.sh b/tools/ci.sh
index e8c4021f37ea5..8d361e2b3972d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -395,14 +395,14 @@ function ci_teensy_build {
 CI_UNIX_OPTS_SYS_SETTRACE=(
     MICROPY_PY_BTREE=0
     MICROPY_PY_FFI=0
-    MICROPY_PY_USSL=0
+    MICROPY_PY_SSL=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
+    MICROPY_PY_SSL=0
     CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1"
 )
 

From 0ceccd4cf809ef067feea8c42614b1bd07984451 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 15:07:24 +1000
Subject: [PATCH 0013/3129] all: Rename *umodule*.h to remove the "u" prefix.

This work was funded through GitHub Sponsors.

Also updates #includes.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/{moduplatform.h => modplatform.h}        |  6 +++---
 extmod/{modutime.h => modtime.h}                |  0
 extmod/moduplatform.c                           |  2 +-
 extmod/modutime.c                               |  2 +-
 extmod/moduwebsocket.c                          |  2 +-
 extmod/moduwebsocket.h                          | 10 ----------
 extmod/modwebrepl.c                             |  2 +-
 extmod/modwebsocket.h                           | 10 ++++++++++
 extmod/utime_mphal.h                            |  1 +
 ports/cc3200/ftp/ftp.c                          |  4 ++--
 ports/cc3200/hal/cc3200_hal.c                   |  2 +-
 ports/cc3200/mods/modmachine.c                  |  2 +-
 ports/cc3200/mods/{moduos.h => modos.h}         |  6 +++---
 ports/cc3200/mods/{modusocket.h => modsocket.h} |  6 +++---
 ports/cc3200/mods/moduos.c                      |  2 +-
 ports/cc3200/mods/modusocket.c                  |  2 +-
 ports/cc3200/mods/modussl.c                     |  2 +-
 ports/cc3200/mods/modwlan.c                     |  2 +-
 ports/cc3200/mods/pybuart.c                     |  2 +-
 ports/cc3200/mptask.c                           |  4 ++--
 ports/cc3200/serverstask.c                      |  2 +-
 ports/cc3200/telnet/telnet.c                    |  2 +-
 ports/stm32/modpyb.c                            |  2 +-
 ports/unix/main.c                               |  2 +-
 py/modsys.c                                     |  2 +-
 25 files changed, 40 insertions(+), 39 deletions(-)
 rename extmod/{moduplatform.h => modplatform.h} (96%)
 rename extmod/{modutime.h => modtime.h} (100%)
 delete mode 100644 extmod/moduwebsocket.h
 create mode 100644 extmod/modwebsocket.h
 create mode 100644 extmod/utime_mphal.h
 rename ports/cc3200/mods/{moduos.h => modos.h} (92%)
 rename ports/cc3200/mods/{modusocket.h => modsocket.h} (91%)

diff --git a/extmod/moduplatform.h b/extmod/modplatform.h
similarity index 96%
rename from extmod/moduplatform.h
rename to extmod/modplatform.h
index 7ca4297788993..95bf073fbd90f 100644
--- a/extmod/moduplatform.h
+++ b/extmod/modplatform.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_MODUPLATFORM_H
-#define MICROPY_INCLUDED_MODUPLATFORM_H
+#ifndef MICROPY_INCLUDED_MODPLATFORM_H
+#define MICROPY_INCLUDED_MODPLATFORM_H
 
 #include "py/misc.h"  // For MP_STRINGIFY.
 #include "py/mpconfig.h"
@@ -102,4 +102,4 @@
 #define MICROPY_PLATFORM_VERSION ""
 #endif
 
-#endif // MICROPY_INCLUDED_MODUPLATFORM_H
+#endif // MICROPY_INCLUDED_MODPLATFORM_H
diff --git a/extmod/modutime.h b/extmod/modtime.h
similarity index 100%
rename from extmod/modutime.h
rename to extmod/modtime.h
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index d5f919fc5e067..4d10bdb4df02e 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -29,7 +29,7 @@
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "py/mphal.h"
-#include "extmod/moduplatform.h"
+#include "extmod/modplatform.h"
 #include "genhdr/mpversion.h"
 
 #if MICROPY_PY_PLATFORM
diff --git a/extmod/modutime.c b/extmod/modutime.c
index 1dfd7aa2c09a8..163b874d5e095 100644
--- a/extmod/modutime.c
+++ b/extmod/modutime.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/smallint.h"
-#include "extmod/modutime.h"
+#include "extmod/modtime.h"
 
 #if MICROPY_PY_TIME
 
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index ac90dea8b36fc..3bf50cc58c822 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -30,7 +30,7 @@
 
 #include "py/runtime.h"
 #include "py/stream.h"
-#include "extmod/moduwebsocket.h"
+#include "extmod/modwebsocket.h"
 
 #if MICROPY_PY_WEBSOCKET
 
diff --git a/extmod/moduwebsocket.h b/extmod/moduwebsocket.h
deleted file mode 100644
index c1ea291ed7434..0000000000000
--- a/extmod/moduwebsocket.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef MICROPY_INCLUDED_EXTMOD_MODUWEBSOCKET_H
-#define MICROPY_INCLUDED_EXTMOD_MODUWEBSOCKET_H
-
-#define FRAME_OPCODE_MASK 0x0f
-enum {
-    FRAME_CONT, FRAME_TXT, FRAME_BIN,
-    FRAME_CLOSE = 0x8, FRAME_PING, FRAME_PONG
-};
-
-#endif // MICROPY_INCLUDED_EXTMOD_MODUWEBSOCKET_H
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index d86f358962348..64276b5a8f3bd 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -34,7 +34,7 @@
 #ifdef MICROPY_PY_WEBREPL_DELAY
 #include "py/mphal.h"
 #endif
-#include "extmod/moduwebsocket.h"
+#include "extmod/modwebsocket.h"
 
 #if MICROPY_PY_WEBREPL
 
diff --git a/extmod/modwebsocket.h b/extmod/modwebsocket.h
new file mode 100644
index 0000000000000..2720147dfdb6f
--- /dev/null
+++ b/extmod/modwebsocket.h
@@ -0,0 +1,10 @@
+#ifndef MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
+#define MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
+
+#define FRAME_OPCODE_MASK 0x0f
+enum {
+    FRAME_CONT, FRAME_TXT, FRAME_BIN,
+    FRAME_CLOSE = 0x8, FRAME_PING, FRAME_PONG
+};
+
+#endif // MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
diff --git a/extmod/utime_mphal.h b/extmod/utime_mphal.h
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/extmod/utime_mphal.h
@@ -0,0 +1 @@
+
diff --git a/ports/cc3200/ftp/ftp.c b/ports/cc3200/ftp/ftp.c
index 173bb7c2c0947..5d4fc6fb5f2d0 100644
--- a/ports/cc3200/ftp/ftp.c
+++ b/ports/cc3200/ftp/ftp.c
@@ -42,13 +42,13 @@
 #include "simplelink.h"
 #include "modnetwork.h"
 #include "modwlan.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "debug.h"
 #include "serverstask.h"
 #include "fifo.h"
 #include "socketfifo.h"
 #include "updater.h"
-#include "moduos.h"
+#include "modos.h"
 
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS
diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index 4694235eebf62..4d9d7647d3dec 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -49,7 +49,7 @@
 #include "pybuart.h"
 #include "utils.h"
 #include "irq.h"
-#include "moduos.h"
+#include "modos.h"
 
 #ifdef USE_FREERTOS
 #include "FreeRTOS.h"
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index c5b06f507778d..a695fdccae206 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -43,7 +43,7 @@
 #include "simplelink.h"
 #include "modnetwork.h"
 #include "modwlan.h"
-#include "moduos.h"
+#include "modos.h"
 #include "FreeRTOS.h"
 #include "portable.h"
 #include "task.h"
diff --git a/ports/cc3200/mods/moduos.h b/ports/cc3200/mods/modos.h
similarity index 92%
rename from ports/cc3200/mods/moduos.h
rename to ports/cc3200/mods/modos.h
index f183715c907ca..5fa2a967d4347 100644
--- a/ports/cc3200/mods/moduos.h
+++ b/ports/cc3200/mods/modos.h
@@ -24,8 +24,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_CC3200_MODS_MODUOS_H
-#define MICROPY_INCLUDED_CC3200_MODS_MODUOS_H
+#ifndef MICROPY_INCLUDED_CC3200_MODS_MODOS_H
+#define MICROPY_INCLUDED_CC3200_MODS_MODOS_H
 
 #include "py/obj.h"
 
@@ -44,4 +44,4 @@ typedef struct _os_term_dup_obj_t {
  ******************************************************************************/
 void osmount_unmount_all (void);
 
-#endif // MICROPY_INCLUDED_CC3200_MODS_MODUOS_H
+#endif // MICROPY_INCLUDED_CC3200_MODS_MODOS_H
diff --git a/ports/cc3200/mods/modusocket.h b/ports/cc3200/mods/modsocket.h
similarity index 91%
rename from ports/cc3200/mods/modusocket.h
rename to ports/cc3200/mods/modsocket.h
index aaee04ce1927e..8eb4cb50ac6ad 100644
--- a/ports/cc3200/mods/modusocket.h
+++ b/ports/cc3200/mods/modsocket.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_CC3200_MODS_MODUSOCKET_H
-#define MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H
+#ifndef MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
+#define MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
 
 #include "py/stream.h"
 
@@ -37,4 +37,4 @@ extern void modusocket_socket_delete (int16_t sd);
 extern void modusocket_enter_sleep (void);
 extern void modusocket_close_all_user_sockets (void);
 
-#endif // MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H
+#endif // MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index a6e4ef50a7a31..7b1e8d79fd194 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -35,7 +35,7 @@
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "genhdr/mpversion.h"
-#include "moduos.h"
+#include "modos.h"
 #include "sflash_diskio.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 9b614c6d34cd1..fd09cd6a41398 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -37,7 +37,7 @@
 #include "py/mphal.h"
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 
 /******************************************************************************/
 // The following set of macros and functions provide a glue between the CC3100
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index dda6725e6681b..eb3aea1f85b5a 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -32,7 +32,7 @@
 #include "py/objstr.h"
 #include "py/runtime.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 
 /******************************************************************************
  DEFINE CONSTANTS
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index bf243ce7b9a6d..8d98dd0421de2 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -38,7 +38,7 @@
 #include "shared/timeutils/timeutils.h"
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "modwlan.h"
 #include "pybrtc.h"
 #include "debug.h"
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 424ca251ec792..5d6ad075275d5 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -50,7 +50,7 @@
 #include "pin.h"
 #include "pybpin.h"
 #include "pins.h"
-#include "moduos.h"
+#include "modos.h"
 
 /// \moduleref pyb
 /// \class UART - duplex serial communication bus
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index a9dbf3c4c3ed7..abf8484b0d42a 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -55,7 +55,7 @@
 #include "mperror.h"
 #include "simplelink.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "modwlan.h"
 #include "serverstask.h"
 #include "telnet.h"
@@ -70,7 +70,7 @@
 #include "cryptohash.h"
 #include "mpirq.h"
 #include "updater.h"
-#include "moduos.h"
+#include "modos.h"
 #include "antenna.h"
 #include "task.h"
 
diff --git a/ports/cc3200/serverstask.c b/ports/cc3200/serverstask.c
index 4d852447f4196..de782f5e7acd9 100644
--- a/ports/cc3200/serverstask.c
+++ b/ports/cc3200/serverstask.c
@@ -37,7 +37,7 @@
 #include "telnet.h"
 #include "ftp.h"
 #include "pybwdt.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "modnetwork.h"
 #include "modwlan.h"
 
diff --git a/ports/cc3200/telnet/telnet.c b/ports/cc3200/telnet/telnet.c
index df1fd1c22d560..86843c78f6c9e 100644
--- a/ports/cc3200/telnet/telnet.c
+++ b/ports/cc3200/telnet/telnet.c
@@ -33,7 +33,7 @@
 #include "simplelink.h"
 #include "modnetwork.h"
 #include "modwlan.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "debug.h"
 #include "serverstask.h"
 #include "genhdr/mpversion.h"
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index b7d6fe7e6a162..831ece74a944d 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -54,7 +54,7 @@
 #include "modmachine.h"
 #include "extmod/modnetwork.h"
 #include "extmod/vfs.h"
-#include "extmod/modutime.h"
+#include "extmod/modtime.h"
 
 #if MICROPY_PY_PYB
 
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 392ce59dded0c..16f663de199f6 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -48,7 +48,7 @@
 #include "py/mphal.h"
 #include "py/mpthread.h"
 #include "extmod/misc.h"
-#include "extmod/moduplatform.h"
+#include "extmod/modplatform.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_posix.h"
 #include "genhdr/mpversion.h"
diff --git a/py/modsys.c b/py/modsys.c
index 09bdfefc63475..1cfc09ecfbf86 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -36,7 +36,7 @@
 #include "py/smallint.h"
 #include "py/runtime.h"
 #include "py/persistentcode.h"
-#include "extmod/moduplatform.h"
+#include "extmod/modplatform.h"
 #include "genhdr/mpversion.h"
 
 #if MICROPY_PY_SYS_SETTRACE

From 45ac651d1a2801bccbdc32fddaa9b029ed4ce879 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 16:24:27 +1000
Subject: [PATCH 0014/3129] all: Rename *umodule*.c to remove the "u" prefix.

Updates any includes, and references from Makefiles/CMake.

This essentially reverts what was done long ago in commit
136b5cbd7669e8318f8455fc2706da97a5b7994c

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../embedding/Makefile.upylib                 |  0
 examples/natmod/uheapq/uheapq.c               |  2 +-
 examples/natmod/urandom/urandom.c             |  2 +-
 examples/natmod/ure/ure.c                     |  2 +-
 examples/natmod/uzlib/uzlib.c                 |  2 +-
 extmod/extmod.cmake                           | 36 +++++++++----------
 extmod/extmod.mk                              | 36 +++++++++----------
 extmod/{modubinascii.c => modbinascii.c}      |  0
 extmod/{moducryptolib.c => modcryptolib.c}    |  0
 extmod/{moduhashlib.c => modhashlib.c}        |  0
 extmod/{moduheapq.c => modheapq.c}            |  0
 extmod/{modujson.c => modjson.c}              |  0
 extmod/modlwip.c                              |  2 +-
 extmod/{moduos.c => modos.c}                  |  0
 extmod/{moduplatform.c => modplatform.c}      |  0
 extmod/{modurandom.c => modrandom.c}          |  0
 extmod/{modure.c => modre.c}                  |  0
 extmod/{moduselect.c => modselect.c}          |  0
 extmod/{modusocket.c => modsocket.c}          |  0
 extmod/{modussl_axtls.c => modssl_axtls.c}    |  0
 .../{modussl_mbedtls.c => modssl_mbedtls.c}   |  0
 extmod/{modutime.c => modtime.c}              |  0
 extmod/{modutimeq.c => modtimeq.c}            |  0
 extmod/{moduwebsocket.c => modwebsocket.c}    |  0
 extmod/{moduzlib.c => modzlib.c}              |  0
 extmod/{uos_dupterm.c => os_dupterm.c}        |  0
 ports/cc3200/application.mk                   |  6 ++--
 .../mods/{moduhashlib.c => modhashlib.c}      |  0
 ports/cc3200/mods/{moduos.c => modos.c}       |  0
 .../cc3200/mods/{modusocket.c => modsocket.c} |  0
 ports/cc3200/mods/{modussl.c => modssl.c}     |  0
 ports/cc3200/mods/{modutime.c => modtime.c}   |  0
 ports/embed/embed.mk                          |  2 +-
 ports/esp32/{moduos.c => modos.c}             |  0
 ports/esp32/{modutime.c => modtime.c}         |  0
 ports/esp32/mpconfigport.h                    |  2 +-
 ports/esp8266/boards/esp8266_common.ld        |  2 +-
 ports/esp8266/{moduos.c => modos.c}           |  0
 ports/esp8266/{modutime.c => modtime.c}       |  0
 ports/esp8266/mpconfigport.h                  |  2 +-
 ports/mimxrt/{moduos.c => modos.c}            |  0
 ports/mimxrt/{modutime.c => modtime.c}        |  0
 ports/mimxrt/mpconfigport.h                   |  4 +--
 ports/nrf/Makefile                            |  4 +--
 ports/nrf/modules/{uos => os}/microbitfs.c    |  0
 ports/nrf/modules/{uos => os}/microbitfs.h    |  0
 .../nrf/modules/{uos/moduos.c => os/modos.c}  |  0
 ports/renesas-ra/{moduos.c => modos.c}        |  0
 ports/renesas-ra/{modutime.c => modtime.c}    |  0
 ports/renesas-ra/mpconfigport.h               |  2 +-
 ports/rp2/CMakeLists.txt                      |  2 +-
 ports/rp2/{moduos.c => modos.c}               |  0
 ports/rp2/{modutime.c => modtime.c}           |  0
 ports/rp2/mpconfigport.h                      |  4 +--
 ports/samd/{moduos.c => modos.c}              |  0
 ports/samd/{modutime.c => modtime.c}          |  0
 ports/stm32/{moduos.c => modos.c}             |  0
 ports/stm32/{modutime.c => modtime.c}         |  0
 ports/stm32/mpconfigport.h                    |  4 +--
 ports/unix/Makefile                           |  4 +--
 ports/unix/{moduos.c => modos.c}              |  0
 ports/unix/{moduselect.c => modselect.c}      |  0
 ports/unix/{modusocket.c => modsocket.c}      |  0
 ports/unix/{modutime.c => modtime.c}          |  0
 ports/unix/variants/mpconfigvariant_common.h  |  4 +--
 ports/windows/mpconfigport.h                  |  4 +--
 ports/windows/msvc/sources.props              | 22 ++++++------
 ports/zephyr/CMakeLists.txt                   |  2 +-
 ports/zephyr/{modusocket.c => modsocket.c}    |  0
 ports/zephyr/{modutime.c => modtime.c}        |  0
 ports/zephyr/mpconfigport.h                   |  2 +-
 py/{moduerrno.c => moderrno.c}                |  0
 py/py.cmake                                   |  2 +-
 py/py.mk                                      |  2 +-
 tools/codeformat.py                           |  4 +--
 75 files changed, 81 insertions(+), 81 deletions(-)
 rename extmod/utime_mphal.c => examples/embedding/Makefile.upylib (100%)
 rename extmod/{modubinascii.c => modbinascii.c} (100%)
 rename extmod/{moducryptolib.c => modcryptolib.c} (100%)
 rename extmod/{moduhashlib.c => modhashlib.c} (100%)
 rename extmod/{moduheapq.c => modheapq.c} (100%)
 rename extmod/{modujson.c => modjson.c} (100%)
 rename extmod/{moduos.c => modos.c} (100%)
 rename extmod/{moduplatform.c => modplatform.c} (100%)
 rename extmod/{modurandom.c => modrandom.c} (100%)
 rename extmod/{modure.c => modre.c} (100%)
 rename extmod/{moduselect.c => modselect.c} (100%)
 rename extmod/{modusocket.c => modsocket.c} (100%)
 rename extmod/{modussl_axtls.c => modssl_axtls.c} (100%)
 rename extmod/{modussl_mbedtls.c => modssl_mbedtls.c} (100%)
 rename extmod/{modutime.c => modtime.c} (100%)
 rename extmod/{modutimeq.c => modtimeq.c} (100%)
 rename extmod/{moduwebsocket.c => modwebsocket.c} (100%)
 rename extmod/{moduzlib.c => modzlib.c} (100%)
 rename extmod/{uos_dupterm.c => os_dupterm.c} (100%)
 rename ports/cc3200/mods/{moduhashlib.c => modhashlib.c} (100%)
 rename ports/cc3200/mods/{moduos.c => modos.c} (100%)
 rename ports/cc3200/mods/{modusocket.c => modsocket.c} (100%)
 rename ports/cc3200/mods/{modussl.c => modssl.c} (100%)
 rename ports/cc3200/mods/{modutime.c => modtime.c} (100%)
 rename ports/esp32/{moduos.c => modos.c} (100%)
 rename ports/esp32/{modutime.c => modtime.c} (100%)
 rename ports/esp8266/{moduos.c => modos.c} (100%)
 rename ports/esp8266/{modutime.c => modtime.c} (100%)
 rename ports/mimxrt/{moduos.c => modos.c} (100%)
 rename ports/mimxrt/{modutime.c => modtime.c} (100%)
 rename ports/nrf/modules/{uos => os}/microbitfs.c (100%)
 rename ports/nrf/modules/{uos => os}/microbitfs.h (100%)
 rename ports/nrf/modules/{uos/moduos.c => os/modos.c} (100%)
 rename ports/renesas-ra/{moduos.c => modos.c} (100%)
 rename ports/renesas-ra/{modutime.c => modtime.c} (100%)
 rename ports/rp2/{moduos.c => modos.c} (100%)
 rename ports/rp2/{modutime.c => modtime.c} (100%)
 rename ports/samd/{moduos.c => modos.c} (100%)
 rename ports/samd/{modutime.c => modtime.c} (100%)
 rename ports/stm32/{moduos.c => modos.c} (100%)
 rename ports/stm32/{modutime.c => modtime.c} (100%)
 rename ports/unix/{moduos.c => modos.c} (100%)
 rename ports/unix/{moduselect.c => modselect.c} (100%)
 rename ports/unix/{modusocket.c => modsocket.c} (100%)
 rename ports/unix/{modutime.c => modtime.c} (100%)
 rename ports/zephyr/{modusocket.c => modsocket.c} (100%)
 rename ports/zephyr/{modutime.c => modtime.c} (100%)
 rename py/{moduerrno.c => moderrno.c} (100%)

diff --git a/extmod/utime_mphal.c b/examples/embedding/Makefile.upylib
similarity index 100%
rename from extmod/utime_mphal.c
rename to examples/embedding/Makefile.upylib
diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c
index e339ccafd7732..ed19652a66b1d 100644
--- a/examples/natmod/uheapq/uheapq.c
+++ b/examples/natmod/uheapq/uheapq.c
@@ -2,7 +2,7 @@
 
 #include "py/dynruntime.h"
 
-#include "extmod/moduheapq.c"
+#include "extmod/modheapq.c"
 
 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
diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c
index ed46651b342ba..92257b8bc6811 100644
--- a/examples/natmod/urandom/urandom.c
+++ b/examples/natmod/urandom/urandom.c
@@ -7,7 +7,7 @@
 uint32_t yasmarang_pad, yasmarang_n, yasmarang_d;
 uint8_t yasmarang_dat;
 
-#include "extmod/modurandom.c"
+#include "extmod/modrandom.c"
 
 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
diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
index 79eca90ab9eb7..df89ea83530ec 100644
--- a/examples/natmod/ure/ure.c
+++ b/examples/natmod/ure/ure.c
@@ -35,7 +35,7 @@ void *memmove(void *dest, const void *src, size_t n) {
 mp_obj_full_type_t match_type;
 mp_obj_full_type_t re_type;
 
-#include "extmod/modure.c"
+#include "extmod/modre.c"
 
 mp_map_elem_t match_locals_dict_table[5];
 STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index 9a3ec0af3c83c..2b0dbd5ca0155 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -10,7 +10,7 @@ void *memset(void *s, int c, size_t n) {
 
 mp_obj_full_type_t decompio_type;
 
-#include "extmod/moduzlib.c"
+#include "extmod/modzlib.c"
 
 mp_map_elem_t decompio_locals_dict_table[3];
 STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table);
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 675a4c6eccf93..2bb89423c9acb 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -19,30 +19,30 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modnetwork.c
     ${MICROPY_EXTMOD_DIR}/modonewire.c
     ${MICROPY_EXTMOD_DIR}/moduasyncio.c
-    ${MICROPY_EXTMOD_DIR}/modubinascii.c
-    ${MICROPY_EXTMOD_DIR}/moducryptolib.c
+    ${MICROPY_EXTMOD_DIR}/modbinascii.c
+    ${MICROPY_EXTMOD_DIR}/modcryptolib.c
     ${MICROPY_EXTMOD_DIR}/moductypes.c
-    ${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
-    ${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}/modutime.c
-    ${MICROPY_EXTMOD_DIR}/modutimeq.c
-    ${MICROPY_EXTMOD_DIR}/moduwebsocket.c
-    ${MICROPY_EXTMOD_DIR}/moduzlib.c
+    ${MICROPY_EXTMOD_DIR}/modhashlib.c
+    ${MICROPY_EXTMOD_DIR}/modheapq.c
+    ${MICROPY_EXTMOD_DIR}/modjson.c
+    ${MICROPY_EXTMOD_DIR}/modos.c
+    ${MICROPY_EXTMOD_DIR}/modplatform.c
+    ${MICROPY_EXTMOD_DIR}/modrandom.c
+    ${MICROPY_EXTMOD_DIR}/modre.c
+    ${MICROPY_EXTMOD_DIR}/modselect.c
+    ${MICROPY_EXTMOD_DIR}/modsocket.c
+    ${MICROPY_EXTMOD_DIR}/modssl_axtls.c
+    ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
+    ${MICROPY_EXTMOD_DIR}/modtime.c
+    ${MICROPY_EXTMOD_DIR}/modtimeq.c
+    ${MICROPY_EXTMOD_DIR}/modwebsocket.c
+    ${MICROPY_EXTMOD_DIR}/modzlib.c
     ${MICROPY_EXTMOD_DIR}/modwebrepl.c
     ${MICROPY_EXTMOD_DIR}/network_cyw43.c
     ${MICROPY_EXTMOD_DIR}/network_lwip.c
     ${MICROPY_EXTMOD_DIR}/network_ninaw10.c
     ${MICROPY_EXTMOD_DIR}/network_wiznet5k.c
-    ${MICROPY_EXTMOD_DIR}/uos_dupterm.c
+    ${MICROPY_EXTMOD_DIR}/os_dupterm.c
     ${MICROPY_EXTMOD_DIR}/vfs.c
     ${MICROPY_EXTMOD_DIR}/vfs_blockdev.c
     ${MICROPY_EXTMOD_DIR}/vfs_fat.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 2f9bd3b065dd5..a573da4c60aab 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -11,37 +11,37 @@ SRC_EXTMOD_C += \
 	extmod/machine_signal.c \
 	extmod/machine_spi.c \
 	extmod/machine_timer.c \
+	extmod/modbinascii.c \
 	extmod/modbluetooth.c \
 	extmod/modbtree.c \
+	extmod/modcryptolib.c \
 	extmod/modframebuf.c \
+	extmod/modhashlib.c \
+	extmod/modheapq.c \
+	extmod/modjson.c \
 	extmod/modlwip.c \
 	extmod/modnetwork.c \
 	extmod/modonewire.c \
+	extmod/modos.c \
+	extmod/modplatform.c\
+	extmod/modrandom.c \
+	extmod/modre.c \
+	extmod/modselect.c \
+	extmod/modsocket.c \
+	extmod/modssl_axtls.c \
+	extmod/modssl_mbedtls.c \
+	extmod/modtime.c \
+	extmod/modtimeq.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/modutime.c \
-	extmod/modutimeq.c \
-	extmod/moduwebsocket.c \
-	extmod/moduzlib.c \
 	extmod/modwebrepl.c \
+	extmod/modwebsocket.c \
+	extmod/modzlib.c \
 	extmod/network_cyw43.c \
 	extmod/network_lwip.c \
 	extmod/network_ninaw10.c \
 	extmod/network_wiznet5k.c \
-	extmod/uos_dupterm.c \
+	extmod/os_dupterm.c \
 	extmod/vfs.c \
 	extmod/vfs_blockdev.c \
 	extmod/vfs_fat.c \
diff --git a/extmod/modubinascii.c b/extmod/modbinascii.c
similarity index 100%
rename from extmod/modubinascii.c
rename to extmod/modbinascii.c
diff --git a/extmod/moducryptolib.c b/extmod/modcryptolib.c
similarity index 100%
rename from extmod/moducryptolib.c
rename to extmod/modcryptolib.c
diff --git a/extmod/moduhashlib.c b/extmod/modhashlib.c
similarity index 100%
rename from extmod/moduhashlib.c
rename to extmod/modhashlib.c
diff --git a/extmod/moduheapq.c b/extmod/modheapq.c
similarity index 100%
rename from extmod/moduheapq.c
rename to extmod/modheapq.c
diff --git a/extmod/modujson.c b/extmod/modjson.c
similarity index 100%
rename from extmod/modujson.c
rename to extmod/modjson.c
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index a902e8fb0fe30..24047b0a98c71 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1801,7 +1801,7 @@ const mp_obj_module_t mp_module_lwip = {
 
 MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
 
-// On LWIP-ports, this is the socket module (replaces extmod/modusocket.c).
+// On LWIP-ports, this is the socket module (replaces extmod/modsocket.c).
 MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);
diff --git a/extmod/moduos.c b/extmod/modos.c
similarity index 100%
rename from extmod/moduos.c
rename to extmod/modos.c
diff --git a/extmod/moduplatform.c b/extmod/modplatform.c
similarity index 100%
rename from extmod/moduplatform.c
rename to extmod/modplatform.c
diff --git a/extmod/modurandom.c b/extmod/modrandom.c
similarity index 100%
rename from extmod/modurandom.c
rename to extmod/modrandom.c
diff --git a/extmod/modure.c b/extmod/modre.c
similarity index 100%
rename from extmod/modure.c
rename to extmod/modre.c
diff --git a/extmod/moduselect.c b/extmod/modselect.c
similarity index 100%
rename from extmod/moduselect.c
rename to extmod/modselect.c
diff --git a/extmod/modusocket.c b/extmod/modsocket.c
similarity index 100%
rename from extmod/modusocket.c
rename to extmod/modsocket.c
diff --git a/extmod/modussl_axtls.c b/extmod/modssl_axtls.c
similarity index 100%
rename from extmod/modussl_axtls.c
rename to extmod/modssl_axtls.c
diff --git a/extmod/modussl_mbedtls.c b/extmod/modssl_mbedtls.c
similarity index 100%
rename from extmod/modussl_mbedtls.c
rename to extmod/modssl_mbedtls.c
diff --git a/extmod/modutime.c b/extmod/modtime.c
similarity index 100%
rename from extmod/modutime.c
rename to extmod/modtime.c
diff --git a/extmod/modutimeq.c b/extmod/modtimeq.c
similarity index 100%
rename from extmod/modutimeq.c
rename to extmod/modtimeq.c
diff --git a/extmod/moduwebsocket.c b/extmod/modwebsocket.c
similarity index 100%
rename from extmod/moduwebsocket.c
rename to extmod/modwebsocket.c
diff --git a/extmod/moduzlib.c b/extmod/modzlib.c
similarity index 100%
rename from extmod/moduzlib.c
rename to extmod/modzlib.c
diff --git a/extmod/uos_dupterm.c b/extmod/os_dupterm.c
similarity index 100%
rename from extmod/uos_dupterm.c
rename to extmod/os_dupterm.c
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 78c2b8044a18c..5021e4ff3cb1a 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -78,9 +78,9 @@ APP_MISC_SRC_C = $(addprefix misc/,\
 APP_MODS_SRC_C = $(addprefix mods/,\
 	modmachine.c \
 	modnetwork.c \
-	moduos.c \
-	modusocket.c \
-	modussl.c \
+	modos.c \
+	modsocket.c \
+	modssl.c \
 	modwipy.c \
 	modwlan.c \
 	pybadc.c \
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/modhashlib.c
similarity index 100%
rename from ports/cc3200/mods/moduhashlib.c
rename to ports/cc3200/mods/modhashlib.c
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/modos.c
similarity index 100%
rename from ports/cc3200/mods/moduos.c
rename to ports/cc3200/mods/modos.c
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modsocket.c
similarity index 100%
rename from ports/cc3200/mods/modusocket.c
rename to ports/cc3200/mods/modsocket.c
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modssl.c
similarity index 100%
rename from ports/cc3200/mods/modussl.c
rename to ports/cc3200/mods/modssl.c
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modtime.c
similarity index 100%
rename from ports/cc3200/mods/modutime.c
rename to ports/cc3200/mods/modtime.c
diff --git a/ports/embed/embed.mk b/ports/embed/embed.mk
index 7fb344d704922..84d45accd2d71 100644
--- a/ports/embed/embed.mk
+++ b/ports/embed/embed.mk
@@ -52,7 +52,7 @@ micropython-embed-package: $(GENHDR_OUTPUT)
 	$(ECHO) "- py"
 	$(Q)$(CP) $(TOP)/py/*.[ch] $(PACKAGE_DIR)/py
 	$(ECHO) "- extmod"
-	$(Q)$(CP) $(TOP)/extmod/moduplatform.h $(PACKAGE_DIR)/extmod
+	$(Q)$(CP) $(TOP)/extmod/modplatform.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
diff --git a/ports/esp32/moduos.c b/ports/esp32/modos.c
similarity index 100%
rename from ports/esp32/moduos.c
rename to ports/esp32/modos.c
diff --git a/ports/esp32/modutime.c b/ports/esp32/modtime.c
similarity index 100%
rename from ports/esp32/modutime.c
rename to ports/esp32/modtime.c
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index d25a5c2734d86..217a9ec297482 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -88,7 +88,7 @@
 #define MICROPY_PY_HASHLIB_SHA256           (1)
 #define MICROPY_PY_CRYPTOLIB                (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (esp_random())
-#define MICROPY_PY_OS_INCLUDEFILE           "ports/esp32/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE           "ports/esp32/modos.c"
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_OS_DUPTERM_NOTIFY        (1)
 #define MICROPY_PY_OS_SYNC                  (1)
diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index 7e230fd42a630..083e84d9afe5c 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -164,7 +164,7 @@ SECTIONS
         *machine_hspi.o(.literal*, .text*)
         *hspi.o(.literal*, .text*)
         *modesp.o(.literal* .text*)
-        *moduos.o(.literal* .text*)
+        *modos.o(.literal* .text*)
         *modlwip.o(.literal* .text*)
         *modsocket.o(.literal* .text*)
         *modonewire.o(.literal* .text*)
diff --git a/ports/esp8266/moduos.c b/ports/esp8266/modos.c
similarity index 100%
rename from ports/esp8266/moduos.c
rename to ports/esp8266/modos.c
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modtime.c
similarity index 100%
rename from ports/esp8266/modutime.c
rename to ports/esp8266/modtime.c
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 9985d59dd3944..37a794f44b2fe 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -58,7 +58,7 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modtime.c"
 #define MICROPY_PY_LWIP             (1)
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/modos.c
similarity index 100%
rename from ports/mimxrt/moduos.c
rename to ports/mimxrt/modos.c
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modtime.c
similarity index 100%
rename from ports/mimxrt/modutime.c
rename to ports/mimxrt/modtime.c
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index be086cb552127..b1cd84f265601 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -72,8 +72,8 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_SSL_FINALISER            (MICROPY_PY_SSL)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS        (1)
-#define MICROPY_PY_TIME_INCLUDEFILE         "ports/mimxrt/modutime.c"
-#define MICROPY_PY_OS_INCLUDEFILE           "ports/mimxrt/moduos.c"
+#define MICROPY_PY_TIME_INCLUDEFILE         "ports/mimxrt/modtime.c"
+#define MICROPY_PY_OS_INCLUDEFILE           "ports/mimxrt/modos.c"
 #define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_OS_DUPTERM_NOTIFY        (1)
 #define MICROPY_PY_OS_SYNC                  (1)
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 54701adacb3f7..89bb03dfae2df 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -329,8 +329,8 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	machine/timer.c \
 	machine/rtcounter.c \
 	machine/temp.c \
-	uos/moduos.c \
-	uos/microbitfs.c \
+	os/modos.c \
+	os/microbitfs.c \
 	board/modboard.c \
 	board/led.c \
 	ubluepy/modubluepy.c \
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/os/microbitfs.c
similarity index 100%
rename from ports/nrf/modules/uos/microbitfs.c
rename to ports/nrf/modules/os/microbitfs.c
diff --git a/ports/nrf/modules/uos/microbitfs.h b/ports/nrf/modules/os/microbitfs.h
similarity index 100%
rename from ports/nrf/modules/uos/microbitfs.h
rename to ports/nrf/modules/os/microbitfs.h
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/os/modos.c
similarity index 100%
rename from ports/nrf/modules/uos/moduos.c
rename to ports/nrf/modules/os/modos.c
diff --git a/ports/renesas-ra/moduos.c b/ports/renesas-ra/modos.c
similarity index 100%
rename from ports/renesas-ra/moduos.c
rename to ports/renesas-ra/modos.c
diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modtime.c
similarity index 100%
rename from ports/renesas-ra/modutime.c
rename to ports/renesas-ra/modtime.c
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 1886d31541ae3..42ce0b68272e1 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -91,7 +91,7 @@
 #endif
 
 // extended modules
-#define MICROPY_PY_OS_INCLUDEFILE   "ports/renesas-ra/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/renesas-ra/modos.c"
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
 #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 3dff0d54c6a25..55c542173abc7 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -157,7 +157,7 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/machine_wdt.c
     ${PROJECT_SOURCE_DIR}/modmachine.c
     ${PROJECT_SOURCE_DIR}/modrp2.c
-    ${PROJECT_SOURCE_DIR}/moduos.c
+    ${PROJECT_SOURCE_DIR}/modos.c
     ${PROJECT_SOURCE_DIR}/rp2_flash.c
     ${PROJECT_SOURCE_DIR}/rp2_pio.c
     ${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c
diff --git a/ports/rp2/moduos.c b/ports/rp2/modos.c
similarity index 100%
rename from ports/rp2/moduos.c
rename to ports/rp2/modos.c
diff --git a/ports/rp2/modutime.c b/ports/rp2/modtime.c
similarity index 100%
rename from ports/rp2/modutime.c
rename to ports/rp2/modtime.c
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index de05a281bdb0e..28b06fa3a8f42 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -95,7 +95,7 @@
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
-#define MICROPY_PY_OS_INCLUDEFILE               "ports/rp2/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE               "ports/rp2/modos.c"
 #ifndef MICROPY_PY_OS_DUPTERM
 #define MICROPY_PY_OS_DUPTERM                   (1)
 #endif
@@ -108,7 +108,7 @@
 #define MICROPY_PY_CRYPTOLIB                    (1)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS            (1)
-#define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modtime.c"
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
diff --git a/ports/samd/moduos.c b/ports/samd/modos.c
similarity index 100%
rename from ports/samd/moduos.c
rename to ports/samd/modos.c
diff --git a/ports/samd/modutime.c b/ports/samd/modtime.c
similarity index 100%
rename from ports/samd/modutime.c
rename to ports/samd/modtime.c
diff --git a/ports/stm32/moduos.c b/ports/stm32/modos.c
similarity index 100%
rename from ports/stm32/moduos.c
rename to ports/stm32/modos.c
diff --git a/ports/stm32/modutime.c b/ports/stm32/modtime.c
similarity index 100%
rename from ports/stm32/modutime.c
rename to ports/stm32/modtime.c
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 49a8a03405257..c0a95cf5d563f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -96,7 +96,7 @@
 #define MICROPY_PY_HASHLIB_MD5      (MICROPY_PY_SSL)
 #define MICROPY_PY_HASHLIB_SHA1     (MICROPY_PY_SSL)
 #define MICROPY_PY_CRYPTOLIB        (MICROPY_PY_SSL)
-#define MICROPY_PY_OS_INCLUDEFILE   "ports/stm32/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/stm32/modos.c"
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
 #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
@@ -107,7 +107,7 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_get())
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modtime.c"
 #ifndef MICROPY_PY_TIMEQ
 #define MICROPY_PY_TIMEQ            (1)
 #endif
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 9ff19aab9883f..a8981e8f5c6e3 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -201,7 +201,7 @@ SRC_C += \
 	mpthreadport.c \
 	input.c \
 	modmachine.c \
-	moduselect.c \
+	modselect.c \
 	alloc.c \
 	fatfs_port.c \
 	mpbthciport.c \
@@ -210,7 +210,7 @@ SRC_C += \
 	mpbtstackport_usb.c \
 	mpnimbleport.c \
 	modtermios.c \
-	modusocket.c \
+	modsocket.c \
 	modffi.c \
 	modjni.c \
 	$(wildcard $(VARIANT_DIR)/*.c)
diff --git a/ports/unix/moduos.c b/ports/unix/modos.c
similarity index 100%
rename from ports/unix/moduos.c
rename to ports/unix/modos.c
diff --git a/ports/unix/moduselect.c b/ports/unix/modselect.c
similarity index 100%
rename from ports/unix/moduselect.c
rename to ports/unix/modselect.c
diff --git a/ports/unix/modusocket.c b/ports/unix/modsocket.c
similarity index 100%
rename from ports/unix/modusocket.c
rename to ports/unix/modsocket.c
diff --git a/ports/unix/modutime.c b/ports/unix/modtime.c
similarity index 100%
rename from ports/unix/modutime.c
rename to ports/unix/modtime.c
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index cc50d426ceb26..afdd313134d86 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -87,7 +87,7 @@
 #define MICROPY_PY_SYS_EXC_INFO        (1)
 
 // Configure the "os" module with extra unix features.
-#define MICROPY_PY_OS_INCLUDEFILE      "ports/unix/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE      "ports/unix/modos.c"
 #define MICROPY_PY_OS_ERRNO            (1)
 #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
 #define MICROPY_PY_OS_SEP              (1)
@@ -98,7 +98,7 @@
 #define MICROPY_PY_TIME                (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS   (1)
 #define MICROPY_PY_TIME_CUSTOM_SLEEP   (1)
-#define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modtime.c"
 
 // Enable the utimeq module used by the previous (v2) version of uasyncio.
 #define MICROPY_PY_TIMEQ               (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 87e12562b1646..239dcfec91686 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -131,7 +131,7 @@
 #endif
 
 #define MICROPY_PY_OS               (1)
-#define MICROPY_PY_OS_INCLUDEFILE   "ports/unix/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/unix/modos.c"
 #define MICROPY_PY_OS_ERRNO         (1)
 #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
 #define MICROPY_PY_OS_SEP           (1)
@@ -141,7 +141,7 @@
 #define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_CUSTOM_SLEEP (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
 #define MICROPY_PY_ERRNO            (1)
 #define MICROPY_PY_UCTYPES          (1)
 #define MICROPY_PY_ZLIB             (1)
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index de950c3ac93d0..24cdcd82dafee 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -8,18 +8,18 @@
     <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\modbinascii.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
-    <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" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modutime.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modutimeq.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modos.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modrandom.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modtimeq.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" />
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 39942bdc84f01..ddc613a2c0747 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -43,7 +43,7 @@ set(MICROPY_SOURCE_PORT
     machine_uart.c
     modbluetooth_zephyr.c
     modmachine.c
-    modusocket.c
+    modsocket.c
     modzephyr.c
     modzsensor.c
     mphalport.c
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modsocket.c
similarity index 100%
rename from ports/zephyr/modusocket.c
rename to ports/zephyr/modsocket.c
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modtime.c
similarity index 100%
rename from ports/zephyr/modutime.c
rename to ports/zephyr/modtime.c
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index ec759bda775f9..df24e52002b06 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -87,7 +87,7 @@
 #define MICROPY_PY_OS               (1)
 #define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modtime.c"
 #define MICROPY_PY_ZEPHYR           (1)
 #define MICROPY_PY_ZSENSOR          (1)
 #define MICROPY_PY_SYS_MODULES      (0)
diff --git a/py/moduerrno.c b/py/moderrno.c
similarity index 100%
rename from py/moduerrno.c
rename to py/moderrno.c
diff --git a/py/py.cmake b/py/py.cmake
index 07d1fe05ffacc..95a841b5f4a02 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -47,7 +47,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/modstruct.c
     ${MICROPY_PY_DIR}/modsys.c
     ${MICROPY_PY_DIR}/modthread.c
-    ${MICROPY_PY_DIR}/moduerrno.c
+    ${MICROPY_PY_DIR}/moderrno.c
     ${MICROPY_PY_DIR}/mpprint.c
     ${MICROPY_PY_DIR}/mpstate.c
     ${MICROPY_PY_DIR}/mpz.c
diff --git a/py/py.mk b/py/py.mk
index 1dc0c8641f30b..ffb853c652db9 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -185,7 +185,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	modmicropython.o \
 	modstruct.o \
 	modsys.o \
-	moduerrno.o \
+	moderrno.o \
 	modthread.o \
 	vm.o \
 	bc.o \
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 4a2cfb3367d91..517aced37a190 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -69,8 +69,8 @@
     "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]",
+    "ports/nrf/modules/os/*.[ch]",
+    "ports/nrf/modules/time/*.[ch]",
     # STM32 USB dev/host code is mostly 3rd party.
     "ports/stm32/usbdev/**/*.[ch]",
     "ports/stm32/usbhost/**/*.[ch]",

From 24c02c4eb5f11200f876bb57cd63a9d0bae91fd3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 2 Jun 2023 12:28:07 +1000
Subject: [PATCH 0015/3129] py/makemoduledefs.py: Add a way to register
 extensible built-in modules.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/builtinhelp.c     |  1 +
 py/builtinimport.c   | 22 ++++++++-------------
 py/makemoduledefs.py | 46 ++++++++++++++++++++++++++++++++++---------
 py/makeqstrdefs.py   |  4 ++--
 py/obj.h             |  3 +++
 py/objmodule.c       | 47 +++++++++++++++++++++++++++++++++++++++-----
 py/objmodule.h       |  3 ++-
 py/repl.c            |  4 ++--
 8 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index 93d94a389d269..c60ed44e9c60d 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -79,6 +79,7 @@ STATIC void mp_help_print_modules(void) {
     mp_obj_t list = mp_obj_new_list(0, NULL);
 
     mp_help_add_from_map(list, &mp_builtin_module_map);
+    mp_help_add_from_map(list, &mp_builtin_extensible_module_map);
 
     #if MICROPY_MODULE_FROZEN
     extern const char mp_frozen_names[];
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 299877de639a1..15521c77c42af 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -384,28 +384,22 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
 
         // An import of a non-extensible built-in will always bypass the
         // filesystem. e.g. `import micropython` or `import pyb`.
-        module_obj = mp_module_get_builtin(level_mod_name);
+        module_obj = mp_module_get_builtin(level_mod_name, false);
         if (module_obj != MP_OBJ_NULL) {
             return module_obj;
         }
 
-        #if MICROPY_PY_SYS
-        // Never allow sys to be overridden from the filesystem. If weak links
-        // are disabled, then this also provides a default weak link so that
-        // `import sys` is treated like `import usys` (and therefore bypasses
-        // the filesystem).
-        if (level_mod_name == MP_QSTR_sys) {
-            return MP_OBJ_FROM_PTR(&mp_module_sys);
-        }
-        #endif
-
         // First module in the dotted-name; search for a directory or file
         // relative to all the locations in sys.path.
         stat = stat_top_level(level_mod_name, &path);
 
         // TODO: If stat failed, now try extensible built-in modules.
-
-        // TODO: If importing `ufoo`, try `foo`.
+        if (stat == MP_IMPORT_STAT_NO_EXIST) {
+            module_obj = mp_module_get_builtin(level_mod_name, true);
+            if (module_obj != MP_OBJ_NULL) {
+                return module_obj;
+            }
+        }
     } else {
         DEBUG_printf("Searching for sub-module\n");
 
@@ -637,7 +631,7 @@ mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
 
     // Try the name directly as a built-in.
     qstr module_name_qstr = mp_obj_str_get_qstr(args[0]);
-    mp_obj_t module_obj = mp_module_get_builtin(module_name_qstr);
+    mp_obj_t module_obj = mp_module_get_builtin(module_name_qstr, false);
     if (module_obj != MP_OBJ_NULL) {
         return module_obj;
     }
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 9061cd890be82..2f787905a9d62 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -1,8 +1,17 @@
 """
 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
+`MP_REGISTER_MODULE(MP_QSTR_module_name, obj_module)` or
+`MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_module_name, obj_module)`
+(i.e. the output of `py/makeqstrdefs.py cat module`).
+
+The output is a header (typically moduledefs.h) which is included by
+py/objmodule.c that contains entries to be included in the definition of
+ - mp_rom_map_elem_t mp_builtin_module_table[]
+ - mp_rom_map_elem_t mp_builtin_extensible_module_table[]
+
+Extensible modules are modules that can be overridden from the filesystem, see
+py/builtinimnport.c:process_import_at_level. Regular modules will always use
+the built-in version.
 """
 
 from __future__ import print_function
@@ -13,7 +22,10 @@
 import argparse
 
 
-pattern = re.compile(r"\s*MP_REGISTER_MODULE\((.*?),\s*(.*?)\);", flags=re.DOTALL)
+pattern = re.compile(
+    r"\s*(MP_REGISTER_MODULE|MP_REGISTER_EXTENSIBLE_MODULE)\(MP_QSTR_(.*?),\s*(.*?)\);",
+    flags=re.DOTALL,
+)
 
 
 def find_module_registrations(filename):
@@ -37,14 +49,23 @@ def generate_module_table_header(modules):
 
     # Print header file for all external modules.
     mod_defs = set()
+    extensible_mod_defs = set()
     print("// Automatically generated by makemoduledefs.py.\n")
-    for module_name, obj_module in modules:
+    for macro_name, module_name, obj_module in modules:
         mod_def = "MODULE_DEF_{}".format(module_name.upper())
-        mod_defs.add(mod_def)
+        if macro_name == "MP_REGISTER_MODULE":
+            mod_defs.add(mod_def)
+        elif macro_name == "MP_REGISTER_EXTENSIBLE_MODULE":
+            extensible_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]
+                "ERROR: Call to {}({}, {}) should be {}({}, {})\n".format(
+                    macro_name,
+                    module_name,
+                    obj_module,
+                    macro_name,
+                    module_name,
+                    obj_module.split(",")[0],
                 ),
                 file=sys.stderr,
             )
@@ -53,7 +74,7 @@ def generate_module_table_header(modules):
             (
                 "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"
+                "#define {mod_def} {{ MP_ROM_QSTR(MP_QSTR_{module_name}), MP_ROM_PTR(&{obj_module}) }},\n"
             ).format(
                 module_name=module_name,
                 obj_module=obj_module,
@@ -68,6 +89,13 @@ def generate_module_table_header(modules):
 
     print("// MICROPY_REGISTERED_MODULES")
 
+    print("\n#define MICROPY_REGISTERED_EXTENSIBLE_MODULES \\")
+
+    for mod_def in sorted(extensible_mod_defs):
+        print("    {mod_def} \\".format(mod_def=mod_def))
+
+    print("// MICROPY_REGISTERED_EXTENSIBLE_MODULES")
+
 
 def main():
     parser = argparse.ArgumentParser()
diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 13a8b54d67cf4..dd96513351e2f 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -21,7 +21,7 @@
 # Extract MP_COMPRESSED_ROM_TEXT("") macros.  (Which come from MP_ERROR_TEXT)
 _MODE_COMPRESS = "compress"
 
-# Extract MP_REGISTER_MODULE(...) macros.
+# Extract MP_REGISTER_(EXTENSIBLE_)MODULE(...) macros.
 _MODE_MODULE = "module"
 
 # Extract MP_REGISTER_ROOT_POINTER(...) macros.
@@ -93,7 +93,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*.*?\);")
+        re_match = re.compile(r"MP_REGISTER_(?:EXTENSIBLE_)?MODULE\(.*?,\s*.*?\);")
     elif args.mode == _MODE_ROOT_POINTER:
         re_match = re.compile(r"MP_REGISTER_ROOT_POINTER\(.*?\);")
     output = []
diff --git a/py/obj.h b/py/obj.h
index 3735b72c22c50..005383e9f3838 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -434,6 +434,9 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
 // param obj_module: mp_obj_module_t instance
 #define MP_REGISTER_MODULE(module_name, obj_module)
 
+// As above, but allow this module to be extended from the filesystem.
+#define MP_REGISTER_EXTENSIBLE_MODULE(module_name, obj_module)
+
 // 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)
diff --git a/py/objmodule.c b/py/objmodule.c
index e63fb18a1eac0..bf383662667c1 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -166,17 +166,54 @@ 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[] = {
-    // builtin modules declared with MP_REGISTER_MODULE()
+    // built-in modules declared with MP_REGISTER_MODULE()
     MICROPY_REGISTERED_MODULES
 };
 MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
 
-// Attempts to find (and initialise) a builtin, otherwise returns
+STATIC const mp_rom_map_elem_t mp_builtin_extensible_module_table[] = {
+    // built-in modules declared with MP_REGISTER_EXTENSIBLE_MODULE()
+    MICROPY_REGISTERED_EXTENSIBLE_MODULES
+};
+MP_DEFINE_CONST_MAP(mp_builtin_extensible_module_map, mp_builtin_extensible_module_table);
+
+// Attempts to find (and initialise) a built-in, otherwise returns
 // MP_OBJ_NULL.
-mp_obj_t mp_module_get_builtin(qstr module_name) {
-    mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
+    mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)(extensible ? &mp_builtin_extensible_module_map : &mp_builtin_module_map), MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
     if (!elem) {
-        return MP_OBJ_NULL;
+        #if MICROPY_PY_SYS
+        // Special case for sys, which isn't extensible but can always be
+        // imported with the alias `usys`.
+        if (module_name == MP_QSTR_usys) {
+            return MP_OBJ_FROM_PTR(&mp_module_sys);
+        }
+        #endif
+
+        if (extensible) {
+            // At this point we've already tried non-extensible built-ins, the
+            // filesystem, and now extensible built-ins. No match, so fail
+            // the import.
+            return MP_OBJ_NULL;
+        }
+
+        // We're trying to match a non-extensible built-in (i.e. before trying
+        // the filesystem), but if the user is importing `ufoo`, _and_ `foo`
+        // is an extensible module, then allow it as a way of forcing the
+        // built-in. Essentially, this makes it as if all the extensible
+        // built-ins also had non-extensible aliases named `ufoo`. Newer code
+        // should be using sys.path to force the built-in, but this retains
+        // the old behaviour of the u-prefix being used to force a built-in
+        // import.
+        size_t module_name_len;
+        const char *module_name_str = (const char *)qstr_data(module_name, &module_name_len);
+        if (module_name_str[0] != 'u') {
+            return MP_OBJ_NULL;
+        }
+        elem = mp_map_lookup((mp_map_t *)&mp_builtin_extensible_module_map, MP_OBJ_NEW_QSTR(qstr_from_strn(module_name_str + 1, module_name_len - 1)), MP_MAP_LOOKUP);
+        if (!elem) {
+            return MP_OBJ_NULL;
+        }
     }
 
     #if MICROPY_MODULE_BUILTIN_INIT
diff --git a/py/objmodule.h b/py/objmodule.h
index 11bd7bb42fd8a..63ae3c3bdfabd 100644
--- a/py/objmodule.h
+++ b/py/objmodule.h
@@ -32,8 +32,9 @@
 #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;
+extern const mp_map_t mp_builtin_extensible_module_map;
 
-mp_obj_t mp_module_get_builtin(qstr module_name);
+mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible);
 
 void mp_module_generic_attr(qstr attr, mp_obj_t *dest, const uint16_t *keys, mp_obj_t *values);
 
diff --git a/py/repl.c b/py/repl.c
index 0369b02195195..cf69d3d8993df 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -162,8 +162,8 @@ STATIC bool test_qstr(mp_obj_t obj, qstr name) {
         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);
+        return mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP) ||
+               mp_map_lookup((mp_map_t *)&mp_builtin_extensible_module_map, MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP);
     }
 }
 

From 2eba98f1e0d292de0f7e48ce228221ef50c01967 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 2 Jun 2023 12:33:25 +1000
Subject: [PATCH 0016/3129] all: Use MP_REGISTER_EXTENSIBLE_MODULE for
 overrideable built-ins.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbinascii.c                   |  2 +-
 extmod/modbluetooth.c                  |  6 +++++-
 extmod/modcryptolib.c                  |  6 +++++-
 extmod/modhashlib.c                    |  2 +-
 extmod/modheapq.c                      |  2 +-
 extmod/modjson.c                       |  2 +-
 extmod/modlwip.c                       |  2 +-
 extmod/modos.c                         |  2 +-
 extmod/modplatform.c                   |  2 +-
 extmod/modrandom.c                     |  2 +-
 extmod/modre.c                         |  2 +-
 extmod/modselect.c                     |  2 +-
 extmod/modsocket.c                     |  2 +-
 extmod/modssl_axtls.c                  |  2 +-
 extmod/modssl_mbedtls.c                |  2 +-
 extmod/modtime.c                       |  2 +-
 extmod/modtimeq.c                      |  2 +-
 extmod/moductypes.c                    |  2 ++
 extmod/modwebsocket.c                  |  6 +++++-
 extmod/modzlib.c                       |  2 +-
 ports/cc3200/mods/modmachine.c         |  2 +-
 ports/cc3200/mods/modos.c              |  2 +-
 ports/cc3200/mods/modsocket.c          |  2 +-
 ports/cc3200/mods/modssl.c             |  2 +-
 ports/esp32/modmachine.c               |  2 +-
 ports/esp32/modsocket.c                |  2 +-
 ports/esp8266/modmachine.c             |  2 +-
 ports/mimxrt/modmachine.c              |  2 +-
 ports/nrf/modules/machine/modmachine.c |  2 +-
 ports/nrf/modules/os/modos.c           |  2 +-
 ports/qemu-arm/modmachine.c            |  2 +-
 ports/renesas-ra/modmachine.c          |  2 +-
 ports/rp2/modmachine.c                 |  2 +-
 ports/samd/modmachine.c                |  2 +-
 ports/stm32/modmachine.c               |  2 +-
 ports/unix/modmachine.c                |  2 +-
 ports/unix/modselect.c                 |  2 +-
 ports/unix/modsocket.c                 |  2 +-
 ports/zephyr/modmachine.c              |  2 +-
 ports/zephyr/modsocket.c               |  2 +-
 py/builtinimport.c                     | 11 +++++++----
 py/modarray.c                          |  2 +-
 py/modcollections.c                    |  2 +-
 py/moderrno.c                          |  2 +-
 py/modio.c                             |  2 +-
 py/modstruct.c                         |  2 +-
 py/modsys.c                            |  3 +++
 47 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/extmod/modbinascii.c b/extmod/modbinascii.c
index af8eab79f0a05..46027d5fd5c16 100644
--- a/extmod/modbinascii.c
+++ b/extmod/modbinascii.c
@@ -203,6 +203,6 @@ const mp_obj_module_t mp_module_binascii = {
     .globals = (mp_obj_dict_t *)&mp_module_binascii_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_binascii);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_binascii, mp_module_binascii);
 
 #endif // MICROPY_PY_BINASCII
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 628c643a586f8..7b13f9556c4fe 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1004,7 +1004,11 @@ const mp_obj_module_t mp_module_bluetooth = {
     .globals = (mp_obj_dict_t *)&mp_module_bluetooth_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_bluetooth, mp_module_bluetooth);
+// This module should not be extensible (as it is not a CPython standard
+// library nor is it necessary to override from the filesystem), however it
+// has previously been known as `ubluetooth`, so by making it extensible the
+// `ubluetooth` alias will continue to work.
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_bluetooth, mp_module_bluetooth);
 
 // Helpers
 
diff --git a/extmod/modcryptolib.c b/extmod/modcryptolib.c
index 229947725991d..b33d8533fc5e6 100644
--- a/extmod/modcryptolib.c
+++ b/extmod/modcryptolib.c
@@ -375,6 +375,10 @@ const mp_obj_module_t mp_module_cryptolib = {
     .globals = (mp_obj_dict_t *)&mp_module_cryptolib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_cryptolib);
+// This module should not be extensible (as it is not a CPython standard
+// library nor is it necessary to override from the filesystem), however it
+// has previously been known as `ucryptolib`, so by making it extensible the
+// `ucryptolib` alias will continue to work.
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_cryptolib, mp_module_cryptolib);
 
 #endif // MICROPY_PY_CRYPTOLIB
diff --git a/extmod/modhashlib.c b/extmod/modhashlib.c
index 1b94cc01a04e9..3fafe6316def6 100644
--- a/extmod/modhashlib.c
+++ b/extmod/modhashlib.c
@@ -374,6 +374,6 @@ const mp_obj_module_t mp_module_hashlib = {
     .globals = (mp_obj_dict_t *)&mp_module_hashlib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_hashlib);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_hashlib, mp_module_hashlib);
 
 #endif // MICROPY_PY_HASHLIB
diff --git a/extmod/modheapq.c b/extmod/modheapq.c
index 79a12c2b9c5bf..db1e35bac2830 100644
--- a/extmod/modheapq.c
+++ b/extmod/modheapq.c
@@ -118,7 +118,7 @@ const mp_obj_module_t mp_module_heapq = {
     .globals = (mp_obj_dict_t *)&mp_module_heapq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_heapq);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_heapq, mp_module_heapq);
 #endif
 
 #endif // MICROPY_PY_HEAPQ
diff --git a/extmod/modjson.c b/extmod/modjson.c
index 1b475543e167a..1772b7299886e 100644
--- a/extmod/modjson.c
+++ b/extmod/modjson.c
@@ -381,6 +381,6 @@ const mp_obj_module_t mp_module_json = {
     .globals = (mp_obj_dict_t *)&mp_module_json_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_json, mp_module_json);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_json, mp_module_json);
 
 #endif // MICROPY_PY_JSON
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 24047b0a98c71..0d4c03c68a876 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1802,7 +1802,7 @@ const mp_obj_module_t mp_module_lwip = {
 MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
 
 // On LWIP-ports, this is the socket module (replaces extmod/modsocket.c).
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_socket, mp_module_lwip);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);
 
diff --git a/extmod/modos.c b/extmod/modos.c
index e962a6c1718d7..6df49d7f84972 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -195,6 +195,6 @@ const mp_obj_module_t mp_module_os = {
     .globals = (mp_obj_dict_t *)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_os, mp_module_os);
 
 #endif // MICROPY_PY_OS
diff --git a/extmod/modplatform.c b/extmod/modplatform.c
index 4d10bdb4df02e..73846f946d0ed 100644
--- a/extmod/modplatform.c
+++ b/extmod/modplatform.c
@@ -75,6 +75,6 @@ const mp_obj_module_t mp_module_platform = {
     .globals = (mp_obj_dict_t *)&modplatform_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_platform);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_platform, mp_module_platform);
 
 #endif // MICROPY_PY_PLATFORM
diff --git a/extmod/modrandom.c b/extmod/modrandom.c
index 1c697aec70dd3..e65f31488bfeb 100644
--- a/extmod/modrandom.c
+++ b/extmod/modrandom.c
@@ -255,7 +255,7 @@ const mp_obj_module_t mp_module_random = {
     .globals = (mp_obj_dict_t *)&mp_module_random_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_random, mp_module_random);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_random, mp_module_random);
 #endif
 
 #endif // MICROPY_PY_RANDOM
diff --git a/extmod/modre.c b/extmod/modre.c
index c8a019be89129..7f00b1c23c4ae 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -470,7 +470,7 @@ const mp_obj_module_t mp_module_re = {
     .globals = (mp_obj_dict_t *)&mp_module_re_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_re, mp_module_re);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_re, mp_module_re);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/modselect.c b/extmod/modselect.c
index 011d5cb832cdf..3d7ccbd99558b 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -373,6 +373,6 @@ const mp_obj_module_t mp_module_select = {
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_select, mp_module_select);
 
 #endif // MICROPY_PY_SELECT
diff --git a/extmod/modsocket.c b/extmod/modsocket.c
index 316a578ac206b..488b6d17125d5 100644
--- a/extmod/modsocket.c
+++ b/extmod/modsocket.c
@@ -653,6 +653,6 @@ const mp_obj_module_t mp_module_socket = {
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_socket, mp_module_socket);
 
 #endif // MICROPY_PY_NETWORK && MICROPY_PY_SOCKET && !MICROPY_PY_LWIP
diff --git a/extmod/modssl_axtls.c b/extmod/modssl_axtls.c
index 1c9caf76ebff8..de6e0ce5dd121 100644
--- a/extmod/modssl_axtls.c
+++ b/extmod/modssl_axtls.c
@@ -357,6 +357,6 @@ const mp_obj_module_t mp_module_ssl = {
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
 #endif // MICROPY_PY_SSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index d724e0a08a50c..c230b1eaa2416 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -507,6 +507,6 @@ const mp_obj_module_t mp_module_ssl = {
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
 #endif // MICROPY_PY_SSL && MICROPY_SSL_MBEDTLS
diff --git a/extmod/modtime.c b/extmod/modtime.c
index 163b874d5e095..805c2621c0b67 100644
--- a/extmod/modtime.c
+++ b/extmod/modtime.c
@@ -231,6 +231,6 @@ const mp_obj_module_t mp_module_time = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_time, mp_module_time);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_time, mp_module_time);
 
 #endif // MICROPY_PY_TIME
diff --git a/extmod/modtimeq.c b/extmod/modtimeq.c
index 7c037ea0a90e3..4edb7dd3c80de 100644
--- a/extmod/modtimeq.c
+++ b/extmod/modtimeq.c
@@ -230,6 +230,6 @@ const mp_obj_module_t mp_module_timeq = {
     .globals = (mp_obj_dict_t *)&mp_module_timeq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_timeq);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_timeq, mp_module_timeq);
 
 #endif // MICROPY_PY_TIMEQ
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 86d82f03ba065..63be621fbcbeb 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -718,6 +718,8 @@ const mp_obj_module_t mp_module_uctypes = {
     .globals = (mp_obj_dict_t *)&mp_module_uctypes_globals,
 };
 
+// uctypes is not a Python standard library module (hence "uctypes"
+// not "ctypes") and therefore shouldn't be extensible.
 MP_REGISTER_MODULE(MP_QSTR_uctypes, mp_module_uctypes);
 
 #endif
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index 3bf50cc58c822..d2cb72039621b 100644
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@@ -311,6 +311,10 @@ const mp_obj_module_t mp_module_websocket = {
     .globals = (mp_obj_dict_t *)&websocket_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_websocket);
+// This module should not be extensible (as it is not a CPython standard
+// library nor is it necessary to override from the filesystem), however it
+// has previously been known as `uwebsocket`, so by making it extensible the
+// `uwebsocket` alias will continue to work.
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_websocket, mp_module_websocket);
 
 #endif // MICROPY_PY_WEBSOCKET
diff --git a/extmod/modzlib.c b/extmod/modzlib.c
index a912f113ce49b..31096cfeb9e92 100644
--- a/extmod/modzlib.c
+++ b/extmod/modzlib.c
@@ -224,7 +224,7 @@ const mp_obj_module_t mp_module_zlib = {
 };
 
 
-MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_zlib);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_zlib, mp_module_zlib);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index a695fdccae206..bdf963c31a601 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -214,5 +214,5 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 MP_REGISTER_ROOT_POINTER(mp_obj_t machine_config_main);
diff --git a/ports/cc3200/mods/modos.c b/ports/cc3200/mods/modos.c
index 7b1e8d79fd194..1a854750f2340 100644
--- a/ports/cc3200/mods/modos.c
+++ b/ports/cc3200/mods/modos.c
@@ -180,4 +180,4 @@ const mp_obj_module_t mp_module_os = {
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_os, mp_module_os);
diff --git a/ports/cc3200/mods/modsocket.c b/ports/cc3200/mods/modsocket.c
index fd09cd6a41398..a107fa7120736 100644
--- a/ports/cc3200/mods/modsocket.c
+++ b/ports/cc3200/mods/modsocket.c
@@ -818,4 +818,4 @@ const mp_obj_module_t mp_module_socket = {
     .globals = (mp_obj_dict_t*)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_socket, mp_module_socket);
diff --git a/ports/cc3200/mods/modssl.c b/ports/cc3200/mods/modssl.c
index eb3aea1f85b5a..15c825fcf4dcb 100644
--- a/ports/cc3200/mods/modssl.c
+++ b/ports/cc3200/mods/modssl.c
@@ -160,4 +160,4 @@ const mp_obj_module_t mp_module_ssl = {
     .globals = (mp_obj_dict_t*)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_ssl, mp_module_ssl);
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index a863f716c717d..fc19618b7309f 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -353,6 +353,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 0b2d40e333c78..731f69fbc2211 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -872,4 +872,4 @@ const mp_obj_module_t mp_module_socket = {
 // Note: This port doesn't define MICROPY_PY_SOCKET or MICROPY_PY_LWIP so
 // this will not conflict with the common implementation provided by
 // extmod/mod{lwip,socket}.c.
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_socket, mp_module_socket);
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 383f46dda70db..64346b4debdc4 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -456,6 +456,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 098c3b949a23e..423a67d6095f2 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -185,6 +185,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index b7cbdc7b2dab9..616757a96aea6 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -266,6 +266,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/nrf/modules/os/modos.c b/ports/nrf/modules/os/modos.c
index 7c54f28ab45ae..7654ac119bf7e 100644
--- a/ports/nrf/modules/os/modos.c
+++ b/ports/nrf/modules/os/modos.c
@@ -197,4 +197,4 @@ const mp_obj_module_t mp_module_os = {
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_os, mp_module_os);
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 1f9151ff74178..0d712f792eabe 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -48,6 +48,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 07e6103aaac78..47f7e8c8057b4 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -307,6 +307,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 61b91bda0a70d..1efbb09312bf8 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -278,6 +278,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 9890e3b590ffe..9d5b7c2e27241 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -297,6 +297,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index e6eb73f9cb1dd..25fc66eb9c681 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -471,6 +471,6 @@ 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);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 29ac532d2b0bf..dd3cbf96c04c7 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_machine, mp_module_machine);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/unix/modselect.c b/ports/unix/modselect.c
index 97c3602e4bc72..894820c63d9dd 100644
--- a/ports/unix/modselect.c
+++ b/ports/unix/modselect.c
@@ -351,6 +351,6 @@ const mp_obj_module_t mp_module_select = {
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_select, mp_module_select);
 
 #endif // MICROPY_PY_SELECT_POSIX
diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index 9854f3cbce155..871be8dcf7338 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -707,6 +707,6 @@ const mp_obj_module_t mp_module_socket = {
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_socket, mp_module_socket);
 
 #endif // MICROPY_PY_SOCKET
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 6f4bbbdab61e8..633416805432a 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_machine, mp_module_machine);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index 8d4197410c2e6..eacdb049da495 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -473,6 +473,6 @@ const mp_obj_module_t mp_module_socket = {
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_socket, mp_module_socket);
 
 #endif // MICROPY_PY_SOCKET
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 15521c77c42af..8a125fc538afa 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -380,20 +380,23 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
     mp_obj_t module_obj;
 
     if (outer_module_obj == MP_OBJ_NULL) {
+        // First module in the dotted-name path.
         DEBUG_printf("Searching for top-level module\n");
 
         // An import of a non-extensible built-in will always bypass the
-        // filesystem. e.g. `import micropython` or `import pyb`.
+        // filesystem. e.g. `import micropython` or `import pyb`. So try and
+        // match a non-extensible built-ins first.
         module_obj = mp_module_get_builtin(level_mod_name, false);
         if (module_obj != MP_OBJ_NULL) {
             return module_obj;
         }
 
-        // First module in the dotted-name; search for a directory or file
-        // relative to all the locations in sys.path.
+        // Next try the filesystem. Search for a directory or file relative to
+        // all the locations in sys.path.
         stat = stat_top_level(level_mod_name, &path);
 
-        // TODO: If stat failed, now try extensible built-in modules.
+        // If filesystem failed, now try and see if it matches an extensible
+        // built-in module.
         if (stat == MP_IMPORT_STAT_NO_EXIST) {
             module_obj = mp_module_get_builtin(level_mod_name, true);
             if (module_obj != MP_OBJ_NULL) {
diff --git a/py/modarray.c b/py/modarray.c
index cfed0fbb59c4f..ac2e56ed38b40 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -40,6 +40,6 @@ const mp_obj_module_t mp_module_array = {
     .globals = (mp_obj_dict_t *)&mp_module_array_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_array, mp_module_array);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_array, mp_module_array);
 
 #endif
diff --git a/py/modcollections.c b/py/modcollections.c
index a56fe069eaa77..30a5881bc2c3a 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_collections, mp_module_collections);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_collections, mp_module_collections);
 
 #endif // MICROPY_PY_COLLECTIONS
diff --git a/py/moderrno.c b/py/moderrno.c
index 99ca101bd6e85..4f0673a23a255 100644
--- a/py/moderrno.c
+++ b/py/moderrno.c
@@ -99,7 +99,7 @@ const mp_obj_module_t mp_module_errno = {
     .globals = (mp_obj_dict_t *)&mp_module_errno_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_errno, mp_module_errno);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_errno, mp_module_errno);
 
 qstr mp_errno_to_str(mp_obj_t errno_val) {
     #if MICROPY_PY_ERRNO_ERRORCODE
diff --git a/py/modio.c b/py/modio.c
index 3462611d71928..39317c52d545f 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -226,6 +226,6 @@ const mp_obj_module_t mp_module_io = {
     .globals = (mp_obj_dict_t *)&mp_module_io_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_io, mp_module_io);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_io, mp_module_io);
 
 #endif
diff --git a/py/modstruct.c b/py/modstruct.c
index e908c73e1d94d..42f91b282cd14 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -266,6 +266,6 @@ const mp_obj_module_t mp_module_struct = {
     .globals = (mp_obj_dict_t *)&mp_module_struct_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_struct, mp_module_struct);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_struct, mp_module_struct);
 
 #endif
diff --git a/py/modsys.c b/py/modsys.c
index 1cfc09ecfbf86..ddc732e00572c 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -294,6 +294,9 @@ const mp_obj_module_t mp_module_sys = {
     .globals = (mp_obj_dict_t *)&mp_module_sys_globals,
 };
 
+// Unlike the other CPython-compatible modules, sys is not extensible from the
+// filesystem. We rely on it to work so that things like sys.path are always
+// available.
 MP_REGISTER_MODULE(MP_QSTR_sys, mp_module_sys);
 
 // If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is not enabled then these two lists

From eb85f4d4c9c332c8e7bef9b20bb06e25f6f6c5d2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 21:40:53 +1000
Subject: [PATCH 0017/3129] examples/natmod: Rename umodule to module.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/{uzlib => heapq}/Makefile              |  6 +++---
 examples/natmod/{uheapq/uheapq.c => heapq/heapq.c}     |  0
 examples/natmod/{uheapq => random}/Makefile            |  6 +++---
 examples/natmod/{urandom/urandom.c => random/random.c} |  0
 examples/natmod/{ure => re}/Makefile                   |  6 +++---
 examples/natmod/{ure/ure.c => re/re.c}                 |  0
 examples/natmod/{urandom => zlib}/Makefile             |  6 +++---
 examples/natmod/{uzlib/uzlib.c => zlib/zlib.c}         |  0
 tools/ci.sh                                            | 10 +++++-----
 9 files changed, 17 insertions(+), 17 deletions(-)
 rename examples/natmod/{uzlib => heapq}/Makefile (68%)
 rename examples/natmod/{uheapq/uheapq.c => heapq/heapq.c} (100%)
 rename examples/natmod/{uheapq => random}/Makefile (67%)
 rename examples/natmod/{urandom/urandom.c => random/random.c} (100%)
 rename examples/natmod/{ure => re}/Makefile (69%)
 rename examples/natmod/{ure/ure.c => re/re.c} (100%)
 rename examples/natmod/{urandom => zlib}/Makefile (66%)
 rename examples/natmod/{uzlib/uzlib.c => zlib/zlib.c} (100%)

diff --git a/examples/natmod/uzlib/Makefile b/examples/natmod/heapq/Makefile
similarity index 68%
rename from examples/natmod/uzlib/Makefile
rename to examples/natmod/heapq/Makefile
index 8761caf2dd26c..af45b472da1ae 100644
--- a/examples/natmod/uzlib/Makefile
+++ b/examples/natmod/heapq/Makefile
@@ -1,11 +1,11 @@
 # Location of top-level MicroPython directory
 MPY_DIR = ../../..
 
-# Name of module (different to built-in uzlib so it can coexist)
-MOD = uzlib_$(ARCH)
+# Name of module (different to built-in heapq so it can coexist)
+MOD = heapq_$(ARCH)
 
 # Source files (.c or .py)
-SRC = uzlib.c
+SRC = heapq.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
 ARCH = x64
diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/heapq/heapq.c
similarity index 100%
rename from examples/natmod/uheapq/uheapq.c
rename to examples/natmod/heapq/heapq.c
diff --git a/examples/natmod/uheapq/Makefile b/examples/natmod/random/Makefile
similarity index 67%
rename from examples/natmod/uheapq/Makefile
rename to examples/natmod/random/Makefile
index 55de3cc081857..5c50227b15f9d 100644
--- a/examples/natmod/uheapq/Makefile
+++ b/examples/natmod/random/Makefile
@@ -1,11 +1,11 @@
 # Location of top-level MicroPython directory
 MPY_DIR = ../../..
 
-# Name of module (different to built-in uheapq so it can coexist)
-MOD = uheapq_$(ARCH)
+# Name of module (different to built-in random so it can coexist)
+MOD = random_$(ARCH)
 
 # Source files (.c or .py)
-SRC = uheapq.c
+SRC = random.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
 ARCH = x64
diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/random/random.c
similarity index 100%
rename from examples/natmod/urandom/urandom.c
rename to examples/natmod/random/random.c
diff --git a/examples/natmod/ure/Makefile b/examples/natmod/re/Makefile
similarity index 69%
rename from examples/natmod/ure/Makefile
rename to examples/natmod/re/Makefile
index f5254298fdd90..1ba540110650d 100644
--- a/examples/natmod/ure/Makefile
+++ b/examples/natmod/re/Makefile
@@ -1,11 +1,11 @@
 # Location of top-level MicroPython directory
 MPY_DIR = ../../..
 
-# Name of module (different to built-in ure so it can coexist)
-MOD = ure_$(ARCH)
+# Name of module (different to built-in re so it can coexist)
+MOD = re_$(ARCH)
 
 # Source files (.c or .py)
-SRC = ure.c
+SRC = re.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
 ARCH = x64
diff --git a/examples/natmod/ure/ure.c b/examples/natmod/re/re.c
similarity index 100%
rename from examples/natmod/ure/ure.c
rename to examples/natmod/re/re.c
diff --git a/examples/natmod/urandom/Makefile b/examples/natmod/zlib/Makefile
similarity index 66%
rename from examples/natmod/urandom/Makefile
rename to examples/natmod/zlib/Makefile
index 3f018baaf76b6..e4b4e0712ef2e 100644
--- a/examples/natmod/urandom/Makefile
+++ b/examples/natmod/zlib/Makefile
@@ -1,11 +1,11 @@
 # Location of top-level MicroPython directory
 MPY_DIR = ../../..
 
-# Name of module (different to built-in urandom so it can coexist)
-MOD = urandom_$(ARCH)
+# Name of module (different to built-in zlib so it can coexist)
+MOD = zlib_$(ARCH)
 
 # Source files (.c or .py)
-SRC = urandom.c
+SRC = zlib.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
 ARCH = x64
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/zlib/zlib.c
similarity index 100%
rename from examples/natmod/uzlib/uzlib.c
rename to examples/natmod/zlib/zlib.c
diff --git a/tools/ci.sh b/tools/ci.sh
index 8d361e2b3972d..21acc17535bb0 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -454,10 +454,10 @@ function ci_native_mpy_modules_build {
     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
-    make -C examples/natmod/urandom ARCH=$arch
-    make -C examples/natmod/ure ARCH=$arch
-    make -C examples/natmod/uzlib ARCH=$arch
+    make -C examples/natmod/heapq ARCH=$arch
+    make -C examples/natmod/random ARCH=$arch
+    make -C examples/natmod/re ARCH=$arch
+    make -C examples/natmod/zlib ARCH=$arch
 }
 
 function ci_native_mpy_modules_32bit_build {
@@ -523,7 +523,7 @@ function ci_unix_coverage_run_mpy_merge_tests {
 
 function ci_unix_coverage_run_native_mpy_tests {
     MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython -m features2
-    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py)
+    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,heapq*,random*,re*,zlib*}.py)
 }
 
 function ci_unix_32bit_setup {

From 13c817e61cf2f00fc398e01840e5d8c20e575c8c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 5 Jun 2023 15:52:57 +1000
Subject: [PATCH 0018/3129] py/objmodule: Add a table of built-in modules with
 delegation.

This replaces the previous QSTR_null entry in the globals dict which could
leak out to Python (e.g. via iteration of mod.__dict__) and could lead to
crashes.

It results in smaller code size at the expense of turning a lookup into a
loop, but the list it is looping over likely only contains one or two
elements.

To allow a module to register its custom attr function it can use the new
`MP_REGISTER_MODULE_DELEGATION` macro.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/builtin.h         |  2 ++
 py/builtinhelp.c     |  7 +------
 py/makemoduledefs.py | 27 +++++++++++++++++++++++----
 py/makeqstrdefs.py   |  4 +++-
 py/modsys.c          |  8 ++------
 py/mpconfig.h        |  4 ++--
 py/obj.h             |  4 ++++
 py/objmodule.c       | 44 ++++++++++++++++++++++++++++++--------------
 py/objmodule.h       |  3 ---
 9 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/py/builtin.h b/py/builtin.h
index 81d0789802b9c..57f275fb31206 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -132,6 +132,8 @@ 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_sys;
 
+void mp_module_sys_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
+
 // Modules needed by the parser when MICROPY_COMP_MODULE_CONST is enabled.
 extern const mp_obj_module_t mp_module_errno;
 extern const mp_obj_module_t mp_module_uctypes;
diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index c60ed44e9c60d..9bd56cca0962e 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -151,12 +151,7 @@ STATIC void mp_help_print_obj(const mp_obj_t obj) {
     if (map != NULL) {
         for (uint i = 0; i < map->alloc; i++) {
             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
-                ) {
+            if (key != MP_OBJ_NULL) {
                 mp_help_print_info_about_object(key, map->table[i].value);
             }
         }
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 2f787905a9d62..5a1362a4c9897 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -22,11 +22,16 @@
 import argparse
 
 
-pattern = re.compile(
+register_pattern = re.compile(
     r"\s*(MP_REGISTER_MODULE|MP_REGISTER_EXTENSIBLE_MODULE)\(MP_QSTR_(.*?),\s*(.*?)\);",
     flags=re.DOTALL,
 )
 
+delegation_pattern = re.compile(
+    r"\s*(?:MP_REGISTER_MODULE_DELEGATION)\((.*?),\s*(.*?)\);",
+    flags=re.DOTALL,
+)
+
 
 def find_module_registrations(filename):
     """Find any MP_REGISTER_MODULE definitions in the provided file.
@@ -37,7 +42,8 @@ def find_module_registrations(filename):
     global pattern
 
     with io.open(filename, encoding="utf-8") as c_file_obj:
-        return set(re.findall(pattern, c_file_obj.read()))
+        c = c_file_obj.read()
+        return set(re.findall(register_pattern, c)), set(re.findall(delegation_pattern, c))
 
 
 def generate_module_table_header(modules):
@@ -50,7 +56,6 @@ def generate_module_table_header(modules):
     # Print header file for all external modules.
     mod_defs = set()
     extensible_mod_defs = set()
-    print("// Automatically generated by makemoduledefs.py.\n")
     for macro_name, module_name, obj_module in modules:
         mod_def = "MODULE_DEF_{}".format(module_name.upper())
         if macro_name == "MP_REGISTER_MODULE":
@@ -97,13 +102,27 @@ def generate_module_table_header(modules):
     print("// MICROPY_REGISTERED_EXTENSIBLE_MODULES")
 
 
+def generate_module_delegations(delegations):
+    print("\n#define MICROPY_MODULE_DELEGATIONS \\")
+    for obj_module, fun_name in delegations:
+        print(
+            "    {{ MP_ROM_PTR(&{obj_module}), {fun_name} }},".format(
+                obj_module=obj_module, fun_name=fun_name
+            )
+        )
+    print("// MICROPY_MODULE_DELEGATIONS")
+
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("file", nargs=1, help="file with MP_REGISTER_MODULE definitions")
     args = parser.parse_args()
 
-    modules = find_module_registrations(args.file[0])
+    print("// Automatically generated by makemoduledefs.py.\n")
+
+    modules, delegations = find_module_registrations(args.file[0])
     generate_module_table_header(sorted(modules))
+    generate_module_delegations(sorted(delegations))
 
 
 if __name__ == "__main__":
diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index dd96513351e2f..64249f76ce3f2 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -93,7 +93,9 @@ 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_(?:EXTENSIBLE_)?MODULE\(.*?,\s*.*?\);")
+        re_match = re.compile(
+            r"(?:MP_REGISTER_MODULE|MP_REGISTER_EXTENSIBLE_MODULE|MP_REGISTER_MODULE_DELEGATION)\(.*?,\s*.*?\);"
+        )
     elif args.mode == _MODE_ROOT_POINTER:
         re_match = re.compile(r"MP_REGISTER_ROOT_POINTER\(.*?\);")
     output = []
diff --git a/py/modsys.c b/py/modsys.c
index ddc732e00572c..a0ecb87b5f305 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -207,7 +207,7 @@ 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) {
+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));
@@ -280,11 +280,6 @@ 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);
@@ -317,6 +312,7 @@ MP_REGISTER_ROOT_POINTER(mp_obj_t sys_exitfunc);
 #if MICROPY_PY_SYS_ATTR_DELEGATION
 // Contains mutable sys attributes.
 MP_REGISTER_ROOT_POINTER(mp_obj_t sys_mutable[MP_SYS_MUTABLE_NUM]);
+MP_REGISTER_MODULE_DELEGATION(mp_module_sys, &mp_module_sys_attr);
 #endif
 
 #endif // MICROPY_PY_SYS
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a004f548ad912..504ad64b01267 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -839,8 +839,8 @@ 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.
+// Whether modules can use MP_REGISTER_MODULE_DELEGATION() to delegate failed
+// attribute lookups to a custom handler function.
 #ifndef MICROPY_MODULE_ATTR_DELEGATION
 #define MICROPY_MODULE_ATTR_DELEGATION (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
diff --git a/py/obj.h b/py/obj.h
index 005383e9f3838..de4c15b22c69c 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -437,6 +437,10 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
 // As above, but allow this module to be extended from the filesystem.
 #define MP_REGISTER_EXTENSIBLE_MODULE(module_name, obj_module)
 
+// Add a custom handler for a builtin module that will be called to delegate
+// failed attribute lookups.
+#define MP_REGISTER_MODULE_DELEGATION(obj_module, fun_name)
+
 // 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)
diff --git a/py/objmodule.c b/py/objmodule.c
index bf383662667c1..ad96a3be287ff 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -63,20 +63,7 @@ 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_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 
 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);
@@ -177,6 +164,18 @@ STATIC const mp_rom_map_elem_t mp_builtin_extensible_module_table[] = {
 };
 MP_DEFINE_CONST_MAP(mp_builtin_extensible_module_map, mp_builtin_extensible_module_table);
 
+#if MICROPY_MODULE_ATTR_DELEGATION && defined(MICROPY_MODULE_DELEGATIONS)
+typedef struct _mp_module_delegation_entry_t {
+    mp_rom_obj_t mod;
+    mp_attr_fun_t fun;
+} mp_module_delegation_entry_t;
+
+STATIC const mp_module_delegation_entry_t mp_builtin_module_delegation_table[] = {
+    // delegation entries declared with MP_REGISTER_MODULE_DELEGATION()
+    MICROPY_MODULE_DELEGATIONS
+};
+#endif
+
 // Attempts to find (and initialise) a built-in, otherwise returns
 // MP_OBJ_NULL.
 mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
@@ -230,6 +229,23 @@ mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
     return elem->value;
 }
 
+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.
+    size_t n = MP_ARRAY_SIZE(mp_builtin_module_delegation_table);
+    for (size_t i = 0; i < n; ++i) {
+        if (*(mp_obj_t *)(&mp_builtin_module_delegation_table[i].mod) == self_in) {
+            mp_builtin_module_delegation_table[i].fun(self_in, attr, dest);
+            break;
+        }
+    }
+    #else
+    (void)self_in;
+    (void)attr;
+    (void)dest;
+    #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]) {
diff --git a/py/objmodule.h b/py/objmodule.h
index 63ae3c3bdfabd..9cc9a2f102feb 100644
--- a/py/objmodule.h
+++ b/py/objmodule.h
@@ -28,9 +28,6 @@
 
 #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;
 extern const mp_map_t mp_builtin_extensible_module_map;
 

From e6926d60219d9b00da3eedb5eedecefe0d6c321c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Jun 2023 22:49:50 +1000
Subject: [PATCH 0019/3129] py/objmodule: Workaround for MSVC with no module
 delegation.

When compiling mpy-cross, there is no `sys` module, and so there will
be no entries in the `mp_builtin_module_delegation_table`.

MSVC doesn't like this, so instead pretend as if the feature isn't
enabled at all.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/makemoduledefs.py | 3 +++
 py/objmodule.c       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 5a1362a4c9897..b1e118bf374be 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -103,6 +103,9 @@ def generate_module_table_header(modules):
 
 
 def generate_module_delegations(delegations):
+    if not delegations:
+        return
+
     print("\n#define MICROPY_MODULE_DELEGATIONS \\")
     for obj_module, fun_name in delegations:
         print(
diff --git a/py/objmodule.c b/py/objmodule.c
index ad96a3be287ff..8ffae139bca37 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -230,7 +230,7 @@ mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
 }
 
 STATIC void module_attr_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    #if MICROPY_MODULE_ATTR_DELEGATION
+    #if MICROPY_MODULE_ATTR_DELEGATION && defined(MICROPY_MODULE_DELEGATIONS)
     // Delegate lookup to a module's custom attr method.
     size_t n = MP_ARRAY_SIZE(mp_builtin_module_delegation_table);
     for (size_t i = 0; i < n; ++i) {

From 7d2ee8aed0cc5ba1a0041ac4cc7631898aaf252f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 5 Jun 2023 22:38:36 +1000
Subject: [PATCH 0020/3129] py/mpconfig: Enable module delegation if sys needs
 it.

Otherwise you can get into the confusing state where e.g. sys.ps1 is
enabled in config (via `MICROPY_PY_SYS_PS1_PS2`) but still doesn't actually
get enabled.

Also verify that the required delegation options are enabled in modsys.c.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/mpconfigport.h |  1 -
 py/modsys.c                  | 14 ++++++++++++++
 py/mpconfig.h                |  2 +-
 py/mpstate.h                 |  3 +++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 37a794f44b2fe..18b2e47e29dc0 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -19,7 +19,6 @@
 #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)
diff --git a/py/modsys.c b/py/modsys.c
index a0ecb87b5f305..72817ce00935e 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -195,7 +195,21 @@ 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_PS1_PS2 && !MICROPY_PY_SYS_ATTR_DELEGATION
+#error "MICROPY_PY_SYS_PS1_PS2 requires MICROPY_PY_SYS_ATTR_DELEGATION"
+#endif
+
+#if MICROPY_PY_SYS_TRACEBACKLIMIT && !MICROPY_PY_SYS_ATTR_DELEGATION
+#error "MICROPY_PY_SYS_TRACEBACKLIMIT requires MICROPY_PY_SYS_ATTR_DELEGATION"
+#endif
+
+#if MICROPY_PY_SYS_ATTR_DELEGATION && !MICROPY_MODULE_ATTR_DELEGATION
+#error "MICROPY_PY_SYS_ATTR_DELEGATION requires MICROPY_MODULE_ATTR_DELEGATION"
+#endif
+
 #if MICROPY_PY_SYS_ATTR_DELEGATION
+// Must be kept in sync with the enum at the top of mpstate.h.
 STATIC const uint16_t sys_mutable_keys[] = {
     #if MICROPY_PY_SYS_PS1_PS2
     MP_QSTR_ps1,
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 504ad64b01267..b6f8838662d8f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -842,7 +842,7 @@ typedef double mp_float_t;
 // Whether modules can use MP_REGISTER_MODULE_DELEGATION() to delegate failed
 // attribute lookups to a custom handler function.
 #ifndef MICROPY_MODULE_ATTR_DELEGATION
-#define MICROPY_MODULE_ATTR_DELEGATION (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#define MICROPY_MODULE_ATTR_DELEGATION (MICROPY_PY_SYS_ATTR_DELEGATION || MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to call __init__ when importing builtin modules for the first time.
diff --git a/py/mpstate.h b/py/mpstate.h
index 80b49cb6b6454..3786131de6b44 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -40,6 +40,8 @@
 // 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.
 
+#if MICROPY_PY_SYS_ATTR_DELEGATION
+// Must be kept in sync with sys_mutable_keys in modsys.c.
 enum {
     #if MICROPY_PY_SYS_PS1_PS2
     MP_SYS_MUTABLE_PS1,
@@ -50,6 +52,7 @@ enum {
     #endif
     MP_SYS_MUTABLE_NUM,
 };
+#endif // MICROPY_PY_SYS_ATTR_DELEGATION
 
 // This structure contains dynamic configuration for the compiler.
 #if MICROPY_DYNAMIC_COMPILER

From 5e50975a6dd9466afafbcd012c00078093fe1f57 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 5 Jun 2023 16:52:29 +1000
Subject: [PATCH 0021/3129] py/modsys: Allow sys.path to be assigned to.

Previously sys.path could be modified by append/pop or slice assignment.

This allows `sys.path = [...]`, which can be simpler in many cases, but
also improves CPython compatibility.

It also allows sys.path to be set to a tuple which means that you can
clear sys.path (e.g. temporarily) with no allocations.

This also makes sys.path (and sys.argv for consistency) able to be disabled
via mpconfig. The unix port (and upytesthelper) require them, so they
explicitly verify that they're enabled.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/main.c                    | 66 +++++++++++++++-------------
 ports/unix/mpconfigport.h            |  2 +-
 py/builtinimport.c                   |  4 +-
 py/modsys.c                          | 18 ++++++--
 py/mpconfig.h                        | 19 +++++++-
 py/mpstate.h                         |  3 ++
 py/runtime.c                         |  6 ++-
 py/runtime.h                         |  7 ++-
 shared/upytesthelper/upytesthelper.c | 10 ++++-
 9 files changed, 93 insertions(+), 42 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 16f663de199f6..b065706ba65a1 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -69,6 +69,14 @@ long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
 #define MICROPY_GC_SPLIT_HEAP_N_HEAPS (1)
 #endif
 
+#if !MICROPY_PY_SYS_PATH
+#error "The unix port requires MICROPY_PY_SYS_PATH=1"
+#endif
+
+#if !MICROPY_PY_SYS_ARGV
+#error "The unix port requires MICROPY_PY_SYS_ARGV=1"
+#endif
+
 STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t ret;
@@ -538,44 +546,40 @@ MP_NOINLINE int main_(int argc, char **argv) {
     }
     #endif
 
-    char *home = getenv("HOME");
-    char *path = getenv("MICROPYPATH");
-    if (path == NULL) {
-        path = MICROPY_PY_SYS_PATH_DEFAULT;
-    }
-    size_t path_num = 1; // [0] is for current dir (or base dir of the script)
-    if (*path == PATHLIST_SEP_CHAR) {
-        path_num++;
-    }
-    for (char *p = path; p != NULL; p = strchr(p, PATHLIST_SEP_CHAR)) {
-        path_num++;
-        if (p != NULL) {
-            p++;
-        }
-    }
-    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_);
     {
-        char *p = path;
-        for (mp_uint_t i = 1; i < path_num; i++) {
-            char *p1 = strchr(p, PATHLIST_SEP_CHAR);
-            if (p1 == NULL) {
-                p1 = p + strlen(p);
+        // sys.path starts as [""]
+        mp_sys_path = mp_obj_new_list(0, NULL);
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
+
+        // Add colon-separated entries from MICROPYPATH.
+        char *home = getenv("HOME");
+        char *path = getenv("MICROPYPATH");
+        if (path == NULL) {
+            path = MICROPY_PY_SYS_PATH_DEFAULT;
+        }
+        if (*path == PATHLIST_SEP_CHAR) {
+            // First entry is empty. We've already added an empty entry to sys.path, so skip it.
+            ++path;
+        }
+        bool path_remaining = *path;
+        while (path_remaining) {
+            char *path_entry_end = strchr(path, PATHLIST_SEP_CHAR);
+            if (path_entry_end == NULL) {
+                path_entry_end = path + strlen(path);
+                path_remaining = false;
             }
-            if (p[0] == '~' && p[1] == '/' && home != NULL) {
+            if (path[0] == '~' && path[1] == '/' && home != NULL) {
                 // Expand standalone ~ to $HOME
                 int home_l = strlen(home);
                 vstr_t vstr;
-                vstr_init(&vstr, home_l + (p1 - p - 1) + 1);
+                vstr_init(&vstr, home_l + (path_entry_end - path - 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(&vstr);
+                vstr_add_strn(&vstr, path + 1, path_entry_end - path - 1);
+                mp_obj_list_append(mp_sys_path, mp_obj_new_str_from_vstr(&vstr));
             } else {
-                path_items[i] = mp_obj_new_str_via_qstr(p, p1 - p);
+                mp_obj_list_append(mp_sys_path, mp_obj_new_str_via_qstr(path, path_entry_end - path));
             }
-            p = p1 + 1;
+            path = path_entry_end + 1;
         }
     }
 
@@ -710,7 +714,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
 
             // Set base dir of the script as first entry in sys.path.
             char *p = strrchr(basedir, '/');
-            path_items[0] = mp_obj_new_str_via_qstr(basedir, p - basedir);
+            mp_obj_list_store(mp_sys_path, MP_OBJ_NEW_SMALL_INT(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 58aba9700bdb8..c20aff1683ca1 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -154,7 +154,7 @@ typedef long mp_off_t;
 // Ensure builtinimport.c works with -m.
 #define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
 
-// Don't default sys.argv because we do that in main.
+// Don't default sys.argv and sys.path because we do that in main.
 #define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
 
 // Enable sys.executable.
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 8a125fc538afa..4fee04b8f3415 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -118,7 +118,7 @@ STATIC mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
     #if MICROPY_PY_SYS
     size_t path_num;
     mp_obj_t *path_items;
-    mp_obj_list_get(mp_sys_path, &path_num, &path_items);
+    mp_obj_get_array(mp_sys_path, &path_num, &path_items);
 
     // go through each sys.path entry, trying to import "<entry>/<mod_name>".
     for (size_t i = 0; i < path_num; i++) {
@@ -365,7 +365,7 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
     // which may have come from the filesystem.
     size_t path_num;
     mp_obj_t *path_items;
-    mp_obj_list_get(mp_sys_path, &path_num, &path_items);
+    mp_obj_get_array(mp_sys_path, &path_num, &path_items);
     if (path_num)
     #endif
     {
diff --git a/py/modsys.c b/py/modsys.c
index 72817ce00935e..9b3a2bc163501 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -195,6 +195,9 @@ 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_PATH && !MICROPY_PY_SYS_ATTR_DELEGATION
+#error "MICROPY_PY_SYS_PATH requires MICROPY_PY_SYS_ATTR_DELEGATION"
+#endif
 
 #if MICROPY_PY_SYS_PS1_PS2 && !MICROPY_PY_SYS_ATTR_DELEGATION
 #error "MICROPY_PY_SYS_PS1_PS2 requires MICROPY_PY_SYS_ATTR_DELEGATION"
@@ -211,6 +214,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_settrace_obj, mp_sys_settrace);
 #if MICROPY_PY_SYS_ATTR_DELEGATION
 // Must be kept in sync with the enum at the top of mpstate.h.
 STATIC const uint16_t sys_mutable_keys[] = {
+    #if MICROPY_PY_SYS_PATH
+    // Code should access this (as an mp_obj_t) for use with e.g.
+    // mp_obj_list_append by using the `mp_sys_path` macro defined in runtime.h.
+    MP_QSTR_path,
+    #endif
     #if MICROPY_PY_SYS_PS1_PS2
     MP_QSTR_ps1,
     MP_QSTR_ps2,
@@ -231,8 +239,9 @@ void mp_module_sys_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sys) },
 
-    { MP_ROM_QSTR(MP_QSTR_path), MP_ROM_PTR(&MP_STATE_VM(mp_sys_path_obj)) },
+    #if MICROPY_PY_SYS_ARGV
     { MP_ROM_QSTR(MP_QSTR_argv), MP_ROM_PTR(&MP_STATE_VM(mp_sys_argv_obj)) },
+    #endif
     { 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) },
@@ -308,10 +317,11 @@ const mp_obj_module_t mp_module_sys = {
 // available.
 MP_REGISTER_MODULE(MP_QSTR_sys, 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);
+#if MICROPY_PY_SYS_ARGV
+// Code should access this (as an mp_obj_t) for use with e.g.
+// mp_obj_list_append by using the `mp_sys_argv` macro defined in runtime.h.
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_sys_argv_obj);
+#endif
 
 #if MICROPY_PY_SYS_EXC_INFO
 // current exception being handled, for sys.exc_info()
diff --git a/py/mpconfig.h b/py/mpconfig.h
index b6f8838662d8f..eb23c5965c3f7 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1421,6 +1421,23 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_ATEXIT (0)
 #endif
 
+// Whether to provide the "sys.path" attribute (which forces module delegation
+// and mutable sys attributes to be enabled).
+// If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is enabled, this is initialised in
+// mp_init to an empty list. Otherwise the port must initialise it using
+// `mp_sys_path = mp_obj_new_list(...)`.
+#ifndef MICROPY_PY_SYS_PATH
+#define MICROPY_PY_SYS_PATH (1)
+#endif
+
+// Whether to provide the "sys.argv" attribute.
+// If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is enabled, this is initialised in
+// mp_init to an empty list. Otherwise the port must initialise it using
+// `mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), ...);`
+#ifndef MICROPY_PY_SYS_ARGV
+#define MICROPY_PY_SYS_ARGV (1)
+#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)
@@ -1455,7 +1472,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_PS1_PS2 || MICROPY_PY_SYS_TRACEBACKLIMIT)
+#define MICROPY_PY_SYS_ATTR_DELEGATION (MICROPY_PY_SYS_PATH || MICROPY_PY_SYS_PS1_PS2 || MICROPY_PY_SYS_TRACEBACKLIMIT)
 #endif
 
 // Whether to provide "errno" module
diff --git a/py/mpstate.h b/py/mpstate.h
index 3786131de6b44..080dc1380bcbf 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -43,6 +43,9 @@
 #if MICROPY_PY_SYS_ATTR_DELEGATION
 // Must be kept in sync with sys_mutable_keys in modsys.c.
 enum {
+    #if MICROPY_PY_SYS_PATH
+    MP_SYS_MUTABLE_PATH,
+    #endif
     #if MICROPY_PY_SYS_PS1_PS2
     MP_SYS_MUTABLE_PS1,
     MP_SYS_MUTABLE_PS2,
diff --git a/py/runtime.c b/py/runtime.c
index 2326dfb3cac33..f5d219728f701 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -136,13 +136,17 @@ void mp_init(void) {
     #endif
 
     #if MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
-    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+    #if MICROPY_PY_SYS_PATH
+    mp_sys_path = mp_obj_new_list(0, NULL);
     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
+    #endif
+    #if MICROPY_PY_SYS_ARGV
     mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
     #endif
+    #endif // MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
 
     #if MICROPY_PY_SYS_ATEXIT
     MP_STATE_VM(sys_exitfunc) = mp_const_none;
diff --git a/py/runtime.h b/py/runtime.h
index 78194973d6126..c033c77b4034c 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -227,8 +227,13 @@ int mp_native_type_from_qstr(qstr qst);
 mp_uint_t mp_native_from_obj(mp_obj_t obj, mp_uint_t type);
 mp_obj_t mp_native_to_obj(mp_uint_t val, mp_uint_t type);
 
-#define mp_sys_path (MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_sys_path_obj)))
+#if MICROPY_PY_SYS_PATH
+#define mp_sys_path (MP_STATE_VM(sys_mutable[MP_SYS_MUTABLE_PATH]))
+#endif
+
+#if MICROPY_PY_SYS_ARGV
 #define mp_sys_argv (MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_sys_argv_obj)))
+#endif
 
 #if MICROPY_WARNINGS
 #ifndef mp_warning
diff --git a/shared/upytesthelper/upytesthelper.c b/shared/upytesthelper/upytesthelper.c
index 12fa8276b0bb8..ba20037f7ac04 100644
--- a/shared/upytesthelper/upytesthelper.c
+++ b/shared/upytesthelper/upytesthelper.c
@@ -31,6 +31,14 @@
 #include "py/compile.h"
 #include "upytesthelper.h"
 
+#if !MICROPY_PY_SYS_PATH
+#error "upytesthelper requires MICROPY_PY_SYS_PATH=1"
+#endif
+
+#if !MICROPY_PY_SYS_ARGV
+#error "upytesthelper requires MICROPY_PY_SYS_ARGV=1"
+#endif
+
 static const char *test_exp_output;
 static int test_exp_output_len, test_rem_output_len;
 static int test_failed;
@@ -93,7 +101,7 @@ void upytest_execute_test(const char *src) {
     // reinitialized before running each.
     gc_init(heap_start, heap_end);
     mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
+    mp_sys_path = mp_obj_new_list(0, NULL);
     #if MICROPY_MODULE_FROZEN
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
     #endif

From 4216bc7d1351feb8199e4ebbff1a9598aa1c5b02 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 16:57:45 +1000
Subject: [PATCH 0022/3129] tests: Replace umodule with module everywhere.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/coverage.c                         |  14 +--
 tests/basics/array1.py                        |   9 +-
 tests/basics/array_add.py                     |   9 +-
 tests/basics/array_construct.py               |   9 +-
 tests/basics/array_construct2.py              |   9 +-
 tests/basics/array_construct_endian.py        |   9 +-
 tests/basics/array_intbig.py                  |   9 +-
 tests/basics/array_micropython.py             |   9 +-
 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/bytearray_construct_array.py     |   9 +-
 tests/basics/bytearray_construct_endian.py    |   9 +-
 tests/basics/bytes_add_array.py               |   9 +-
 tests/basics/bytes_add_endian.py              |   9 +-
 tests/basics/bytes_compare_array.py           |   9 +-
 tests/basics/bytes_construct_array.py         |   9 +-
 tests/basics/bytes_construct_endian.py        |   9 +-
 tests/basics/class_ordereddict.py             |   9 +-
 tests/basics/class_store_class.py             |   7 +-
 tests/basics/deque1.py                        |   5 +-
 tests/basics/deque2.py                        |   5 +-
 tests/basics/dict_fixed.py                    |  22 ++--
 tests/basics/errno1.py                        |  14 +--
 tests/basics/errno1.py.exp                    |   2 +-
 tests/basics/int_big1.py                      |   5 +-
 tests/basics/io_buffered_writer.py            |   2 +-
 tests/basics/io_bytesio_cow.py                |   6 +-
 tests/basics/io_bytesio_ext.py                |   6 +-
 tests/basics/io_bytesio_ext2.py               |   6 +-
 tests/basics/io_iobase.py                     |   6 +-
 tests/basics/io_stringio1.py                  |   6 +-
 tests/basics/io_stringio_base.py              |   5 +-
 tests/basics/io_stringio_with.py              |   6 +-
 tests/basics/io_write_ext.py                  |   6 +-
 tests/basics/memoryview1.py                   |   9 +-
 tests/basics/memoryview2.py                   |   9 +-
 tests/basics/memoryview_intbig.py             |   9 +-
 tests/basics/memoryview_itemsize.py           |   9 +-
 tests/basics/memoryview_slice_assign.py       |   9 +-
 tests/basics/module2.py                       |   4 +-
 tests/basics/namedtuple1.py                   |   5 +-
 tests/basics/namedtuple_asdict.py             |   5 +-
 tests/basics/ordereddict1.py                  |   7 +-
 tests/basics/ordereddict_eq.py                |   7 +-
 tests/basics/python34.py                      |   6 +-
 tests/basics/string_compare.py                |   5 +-
 tests/basics/struct1.py                       |  11 +-
 tests/basics/struct1_intbig.py                |  11 +-
 tests/basics/struct2.py                       |  13 +--
 tests/basics/struct_endian.py                 |  13 +--
 tests/basics/struct_micropython.py            |  11 +-
 tests/basics/subclass_native_call.py          |   5 +-
 tests/basics/subclass_native_exc_new.py       |   1 -
 tests/basics/sys1.py                          |   6 +-
 tests/basics/sys_exit.py                      |   6 +-
 tests/basics/sys_getsizeof.py                 |   7 +-
 tests/basics/sys_path.py                      |   6 +-
 tests/basics/sys_tracebacklimit.py            |   8 +-
 tests/basics/sys_tracebacklimit.py.exp        |  30 ++---
 tests/cmdline/repl_micropyinspect             |   4 +-
 tests/cmdline/repl_sys_ps1_ps2.py             |   6 +-
 tests/cmdline/repl_sys_ps1_ps2.py.exp         |   6 +-
 tests/esp32/partition_ota.py                  |  12 +-
 tests/esp32/resolve_on_connect.py             |   5 +-
 ...i_a2b_base64.py => binascii_a2b_base64.py} |   5 +-
 ...i_b2a_base64.py => binascii_b2a_base64.py} |   5 +-
 .../{ubinascii_crc32.py => binascii_crc32.py} |   5 +-
 ...inascii_hexlify.py => binascii_hexlify.py} |   5 +-
 ...cii_unhexlify.py => binascii_unhexlify.py} |   5 +-
 tests/extmod/btree1.py                        |   8 +-
 tests/extmod/btree_error.py                   |  14 ++-
 tests/extmod/btree_gc.py                      |   4 +-
 ..._aes128_cbc.py => cryptolib_aes128_cbc.py} |   2 +-
 ...cbc.py.exp => cryptolib_aes128_cbc.py.exp} |   0
 ..._aes128_ctr.py => cryptolib_aes128_ctr.py} |   2 +-
 ...ctr.py.exp => cryptolib_aes128_ctr.py.exp} |   0
 ..._aes128_ecb.py => cryptolib_aes128_ecb.py} |   2 +-
 ...ecb.py.exp => cryptolib_aes128_ecb.py.exp} |   0
 ...ecb_enc.py => cryptolib_aes128_ecb_enc.py} |   2 +-
 ...py.exp => cryptolib_aes128_ecb_enc.py.exp} |   0
 ...b_inpl.py => cryptolib_aes128_ecb_inpl.py} |   2 +-
 ...y.exp => cryptolib_aes128_ecb_inpl.py.exp} |   0
 ...b_into.py => cryptolib_aes128_ecb_into.py} |   2 +-
 ...y.exp => cryptolib_aes128_ecb_into.py.exp} |   0
 ..._aes256_cbc.py => cryptolib_aes256_cbc.py} |   2 +-
 ...cbc.py.exp => cryptolib_aes256_cbc.py.exp} |   0
 ..._aes256_ecb.py => cryptolib_aes256_ecb.py} |   2 +-
 ...ecb.py.exp => cryptolib_aes256_ecb.py.exp} |   0
 tests/extmod/framebuf16.py                    |   4 +-
 tests/extmod/framebuf_palette.py              |   2 +-
 tests/extmod/framebuf_subclass.py             |   4 +-
 .../{uhashlib_final.py => hashlib_final.py}   |   4 +-
 ...hlib_final.py.exp => hashlib_final.py.exp} |   0
 tests/extmod/hashlib_md5.py                   |  18 +++
 tests/extmod/hashlib_sha1.py                  |  18 +++
 .../{uhashlib_sha256.py => hashlib_sha256.py} |  13 +--
 tests/extmod/{uheapq1.py => heapq1.py}        |  11 +-
 tests/extmod/{ujson_dump.py => json_dump.py}  |  14 +--
 ...son_dump_iobase.py => json_dump_iobase.py} |  12 +-
 ..._separators.py => json_dump_separators.py} |  14 +--
 .../extmod/{ujson_dumps.py => json_dumps.py}  |   9 +-
 tests/extmod/json_dumps_extra.py              |   9 ++
 ...s_extra.py.exp => json_dumps_extra.py.exp} |   0
 tests/extmod/json_dumps_float.py              |   8 ++
 tests/extmod/json_dumps_ordereddict.py        |   8 ++
 ...separators.py => json_dumps_separators.py} |   9 +-
 tests/extmod/json_load.py                     |  11 ++
 .../extmod/{ujson_loads.py => json_loads.py}  |   9 +-
 ...son_loads_bytes.py => json_loads_bytes.py} |   9 +-
 ...s_bytes.py.exp => json_loads_bytes.py.exp} |   0
 ...son_loads_float.py => json_loads_float.py} |   9 +-
 tests/extmod/machine1.py                      |   6 +-
 tests/extmod/machine_pinbase.py               |   6 +-
 tests/extmod/machine_pulse.py                 |   6 +-
 tests/extmod/machine_signal.py                |   6 +-
 tests/extmod/machine_timer.py                 |   6 +-
 .../{urandom_basic.py => random_basic.py}     |   9 +-
 ...andom_basic.py.exp => random_basic.py.exp} |   0
 .../{urandom_extra.py => random_extra.py}     |   9 +-
 ...m_extra_float.py => random_extra_float.py} |   9 +-
 ...seed_default.py => random_seed_default.py} |  11 +-
 tests/extmod/{ure1.py => re1.py}              |   9 +-
 tests/extmod/{ure_debug.py => re_debug.py}    |   6 +-
 .../{ure_debug.py.exp => re_debug.py.exp}     |   0
 tests/extmod/{ure_error.py => re_error.py}    |   9 +-
 tests/extmod/{ure_group.py => re_group.py}    |   9 +-
 tests/extmod/{ure_groups.py => re_groups.py}  |   9 +-
 tests/extmod/{ure_limit.py => re_limit.py}    |   4 +-
 .../{ure_limit.py.exp => re_limit.py.exp}     |   0
 .../{ure_namedclass.py => re_namedclass.py}   |   9 +-
 tests/extmod/{ure_span.py => re_span.py}      |   9 +-
 tests/extmod/{ure_split.py => re_split.py}    |   9 +-
 .../{ure_split_empty.py => re_split_empty.py} |   2 +-
 ...lit_empty.py.exp => re_split_empty.py.exp} |   0
 ...e_split_notimpl.py => re_split_notimpl.py} |   2 +-
 ...notimpl.py.exp => re_split_notimpl.py.exp} |   0
 tests/extmod/re_stack_overflow.py             |  10 ++
 ...erflow.py.exp => re_stack_overflow.py.exp} |   0
 tests/extmod/{ure_sub.py => re_sub.py}        |   9 +-
 ...e_sub_unmatched.py => re_sub_unmatched.py} |   9 +-
 ...matched.py.exp => re_sub_unmatched.py.exp} |   0
 ...ect_poll_basic.py => select_poll_basic.py} |  15 +--
 ...uselect_poll_udp.py => select_poll_udp.py} |  13 +--
 ...ocket_tcp_basic.py => socket_tcp_basic.py} |   9 +-
 ...udp_nonblock.py => socket_udp_nonblock.py} |   9 +-
 tests/extmod/{ussl_basic.py => ssl_basic.py}  |   4 +-
 .../{ussl_basic.py.exp => ssl_basic.py.exp}   |   0
 .../{ussl_keycert.py => ssl_keycert.py}       |   6 +-
 ...ussl_keycert.py.exp => ssl_keycert.py.exp} |   0
 tests/extmod/{ussl_poll.py => ssl_poll.py}    |  14 +--
 .../{ussl_poll.py.exp => ssl_poll.py.exp}     |   0
 tests/extmod/ticks_add.py                     |   2 +-
 tests/extmod/ticks_diff.py                    |   2 +-
 tests/extmod/time_ms_us.py                    |  26 ++---
 tests/extmod/{utime_res.py => time_res.py}    |  16 +--
 .../{utime_res.py.exp => time_res.py.exp}     |   0
 .../{utime_time_ns.py => time_time_ns.py}     |  14 +--
 ...ime_time_ns.py.exp => time_time_ns.py.exp} |   0
 tests/extmod/{utimeq1.py => timeq1.py}        |  18 +--
 .../extmod/{utimeq1.py.exp => timeq1.py.exp}  |   0
 .../{utimeq_stable.py => timeq_stable.py}     |   4 +-
 ...imeq_stable.py.exp => timeq_stable.py.exp} |   0
 tests/extmod/uasyncio_basic.py                |  13 +--
 tests/extmod/uasyncio_micropython.py          |   8 +-
 tests/extmod/uasyncio_threadsafeflag.py       |   2 +-
 tests/extmod/uasyncio_wait_task.py            |  12 +-
 .../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/uctypes_sizeof_od.py             |   2 +-
 tests/extmod/uhashlib_md5.py                  |  21 ----
 tests/extmod/uhashlib_sha1.py                 |  21 ----
 tests/extmod/ujson_dumps_extra.py             |   9 --
 tests/extmod/ujson_dumps_float.py             |  11 --
 tests/extmod/ujson_dumps_ordereddict.py       |  12 --
 tests/extmod/ujson_load.py                    |  15 ---
 tests/extmod/ure_stack_overflow.py            |  13 ---
 tests/extmod/vfs_basic.py                     | 104 +++++++++---------
 tests/extmod/vfs_blockdev.py                  |  12 +-
 tests/extmod/vfs_fat_fileio1.py               |  24 ++--
 tests/extmod/vfs_fat_fileio2.py               |  26 ++---
 tests/extmod/vfs_fat_finaliser.py             |  12 +-
 tests/extmod/vfs_fat_ilistdir_del.py          |   6 +-
 tests/extmod/vfs_fat_more.py                  |  94 ++++++++--------
 tests/extmod/vfs_fat_mtime.py                 |  14 +--
 tests/extmod/vfs_fat_oldproto.py              |  12 +-
 tests/extmod/vfs_fat_ramdisk.py               |  22 ++--
 tests/extmod/vfs_fat_ramdisklarge.py          |  12 +-
 tests/extmod/vfs_lfs.py                       |  10 +-
 tests/extmod/vfs_lfs_corrupt.py               |  10 +-
 tests/extmod/vfs_lfs_error.py                 |  10 +-
 tests/extmod/vfs_lfs_file.py                  |  10 +-
 tests/extmod/vfs_lfs_ilistdir_del.py          |   6 +-
 tests/extmod/vfs_lfs_mount.py                 |  42 +++----
 tests/extmod/vfs_lfs_mtime.py                 |  16 +--
 tests/extmod/vfs_lfs_superblock.py            |  12 +-
 tests/extmod/vfs_posix.py                     |  48 ++++----
 tests/extmod/vfs_userfs.py                    |  22 ++--
 tests/extmod/websocket_basic.py               |  22 ++--
 .../{uzlib_decompio.py => zlib_decompio.py}   |   4 +-
 ...b_decompio.py.exp => zlib_decompio.py.exp} |   0
 ...lib_decompio_gz.py => zlib_decompio_gz.py} |   4 +-
 ...mpio_gz.py.exp => zlib_decompio_gz.py.exp} |   0
 ...uzlib_decompress.py => zlib_decompress.py} |   7 +-
 tests/feature_check/byteorder.py              |   5 +-
 .../{uio_module.py => io_module.py}           |   4 +-
 .../{uio_module.py.exp => io_module.py.exp}   |   0
 tests/float/array_construct.py                |   9 +-
 tests/float/bytearray_construct_endian.py     |   9 +-
 tests/float/bytes_construct_endian.py         |   9 +-
 tests/float/float2int_doubleprec_intbig.py    |   8 +-
 tests/float/float2int_fp30_intbig.py          |   8 +-
 tests/float/float2int_intbig.py               |   8 +-
 tests/float/float_array.py                    |   9 +-
 tests/float/float_struct.py                   |   5 +-
 tests/import/builtin_ext.py                   |   4 +
 tests/import/builtin_ext.py.exp               |   4 +-
 tests/import/ext/time.py                      |   6 +-
 tests/inlineasm/asmfpldrstr.py                |   2 +-
 tests/inlineasm/asmsum.py                     |   2 +-
 tests/internal_bench/var-8-namedtuple-1st.py  |   2 +-
 .../internal_bench/var-8.1-namedtuple-5th.py  |   2 +-
 tests/io/argv.py                              |   5 +-
 tests/io/builtin_print_file.py                |   5 +-
 tests/io/file_stdio.py                        |   5 +-
 tests/io/open_append.py                       |   5 +-
 tests/io/open_plus.py                         |   5 +-
 tests/micropython/builtin_execfile.py         |  22 ++--
 tests/micropython/emg_exc.py                  |   8 +-
 tests/micropython/heapalloc_bytesio.py        |   4 +-
 tests/micropython/heapalloc_bytesio2.py       |   4 +-
 tests/micropython/heapalloc_iter.py           |   9 +-
 tests/micropython/heapalloc_traceback.py      |   8 +-
 tests/micropython/import_mpy_invalid.py       |  16 +--
 tests/micropython/import_mpy_native.py        |  20 ++--
 tests/micropython/import_mpy_native_gc.py     |  12 +-
 tests/micropython/opt_level_lineno.py         |   2 +-
 tests/micropython/viper_misc_intbig.py        |   4 +-
 tests/misc/non_compliant.py                   |   8 +-
 tests/misc/print_exception.py                 |   8 +-
 tests/misc/sys_atexit.py                      |   6 +-
 tests/misc/sys_exc_info.py                    |   5 +-
 tests/multi_net/ssl_cert_rsa.py               |   2 +-
 tests/multi_net/ssl_data.py                   |   2 +-
 tests/multi_net/uasyncio_tcp_readinto.py      |   9 +-
 tests/net_hosted/accept_nonblock.py           |   5 +-
 tests/net_hosted/accept_timeout.py            |   5 +-
 tests/net_hosted/connect_nonblock.py          |   6 +-
 tests/net_hosted/connect_nonblock_xfer.py     |   7 +-
 tests/net_hosted/connect_poll.py              |   5 +-
 tests/net_hosted/ssl_getpeercert.py           |   8 +-
 tests/net_inet/getaddrinfo.py                 |   5 +-
 tests/net_inet/ssl_cert.py                    |   6 +-
 tests/net_inet/ssl_errors.py                  |   7 +-
 tests/net_inet/test_tls_nonblock.py           |   5 +-
 tests/net_inet/test_tls_sites.py              |  19 ++--
 tests/net_inet/tls_num_errors.py              |   6 +-
 tests/net_inet/tls_text_errors.py             |   5 +-
 tests/perf_bench/benchrun.py                  |   6 +-
 tests/perf_bench/bm_hexiom.py                 |   5 +-
 tests/perf_bench/core_import_mpy_multi.py     |  12 +-
 tests/perf_bench/core_import_mpy_single.py    |  10 +-
 tests/renesas-ra/freq.py                      |   2 +-
 tests/run-natmodtests.py                      |  18 +--
 tests/run-tests-exp.py                        |   4 +-
 tests/run-tests.py                            |  32 +++---
 tests/stress/recursive_data.py                |   2 +-
 tests/thread/stress_aes.py                    |   5 +-
 tests/thread/stress_create.py                 |  11 +-
 tests/thread/stress_heap.py                   |   5 +-
 tests/thread/stress_schedule.py               |   8 +-
 tests/thread/thread_exc2.py                   |   4 +-
 tests/thread/thread_exit1.py                  |   5 +-
 tests/thread/thread_exit2.py                  |   5 +-
 tests/thread/thread_lock2.py                  |   5 +-
 tests/thread/thread_lock4.py                  |   5 +-
 tests/thread/thread_qstr1.py                  |   5 +-
 tests/thread/thread_sleep1.py                 |  10 +-
 tests/thread/thread_stacksize1.py             |   6 +-
 tests/thread/thread_start1.py                 |   5 +-
 tests/thread/thread_start2.py                 |   5 +-
 tests/unicode/unicode_ure.py                  |   9 +-
 tests/unix/extra_coverage.py                  |  10 +-
 tests/unix/extra_coverage.py.exp              |  24 ++--
 tests/unix/ffi_types.py                       |   6 +-
 .../{time.py => time_mktime_localtime.py}     |   5 +-
 tests/wipy/wlan/machine.py.exp                |   2 +-
 tools/ci.sh                                   |   4 +-
 tools/tinytest-codegen.py                     |   6 +-
 295 files changed, 1009 insertions(+), 1431 deletions(-)
 rename tests/extmod/{ubinascii_a2b_base64.py => binascii_a2b_base64.py} (92%)
 rename tests/extmod/{ubinascii_b2a_base64.py => binascii_b2a_base64.py} (88%)
 rename tests/extmod/{ubinascii_crc32.py => binascii_crc32.py} (87%)
 rename tests/extmod/{ubinascii_hexlify.py => binascii_hexlify.py} (80%)
 rename tests/extmod/{ubinascii_unhexlify.py => binascii_unhexlify.py} (81%)
 rename tests/extmod/{ucryptolib_aes128_cbc.py => cryptolib_aes128_cbc.py} (90%)
 rename tests/extmod/{ucryptolib_aes128_cbc.py.exp => cryptolib_aes128_cbc.py.exp} (100%)
 rename tests/extmod/{ucryptolib_aes128_ctr.py => cryptolib_aes128_ctr.py} (94%)
 rename tests/extmod/{ucryptolib_aes128_ctr.py.exp => cryptolib_aes128_ctr.py.exp} (100%)
 rename tests/extmod/{ucryptolib_aes128_ecb.py => cryptolib_aes128_ecb.py} (89%)
 rename tests/extmod/{ucryptolib_aes128_ecb.py.exp => cryptolib_aes128_ecb.py.exp} (100%)
 rename tests/extmod/{ucryptolib_aes128_ecb_enc.py => cryptolib_aes128_ecb_enc.py} (91%)
 rename tests/extmod/{ucryptolib_aes128_ecb_enc.py.exp => cryptolib_aes128_ecb_enc.py.exp} (100%)
 rename tests/extmod/{ucryptolib_aes128_ecb_inpl.py => cryptolib_aes128_ecb_inpl.py} (90%)
 rename tests/extmod/{ucryptolib_aes128_ecb_inpl.py.exp => cryptolib_aes128_ecb_inpl.py.exp} (100%)
 rename tests/extmod/{ucryptolib_aes128_ecb_into.py => cryptolib_aes128_ecb_into.py} (90%)
 rename tests/extmod/{ucryptolib_aes128_ecb_into.py.exp => cryptolib_aes128_ecb_into.py.exp} (100%)
 rename tests/extmod/{ucryptolib_aes256_cbc.py => cryptolib_aes256_cbc.py} (90%)
 rename tests/extmod/{ucryptolib_aes256_cbc.py.exp => cryptolib_aes256_cbc.py.exp} (100%)
 rename tests/extmod/{ucryptolib_aes256_ecb.py => cryptolib_aes256_ecb.py} (89%)
 rename tests/extmod/{ucryptolib_aes256_ecb.py.exp => cryptolib_aes256_ecb.py.exp} (100%)
 rename tests/extmod/{uhashlib_final.py => hashlib_final.py} (92%)
 rename tests/extmod/{uhashlib_final.py.exp => hashlib_final.py.exp} (100%)
 create mode 100644 tests/extmod/hashlib_md5.py
 create mode 100644 tests/extmod/hashlib_sha1.py
 rename tests/extmod/{uhashlib_sha256.py => hashlib_sha256.py} (72%)
 rename tests/extmod/{uheapq1.py => heapq1.py} (78%)
 rename tests/extmod/{ujson_dump.py => json_dump.py} (69%)
 rename tests/extmod/{ujson_dump_iobase.py => json_dump_iobase.py} (71%)
 rename tests/extmod/{ujson_dump_separators.py => json_dump_separators.py} (86%)
 rename tests/extmod/{ujson_dumps.py => json_dumps.py} (83%)
 create mode 100644 tests/extmod/json_dumps_extra.py
 rename tests/extmod/{ujson_dumps_extra.py.exp => json_dumps_extra.py.exp} (100%)
 create mode 100644 tests/extmod/json_dumps_float.py
 create mode 100644 tests/extmod/json_dumps_ordereddict.py
 rename tests/extmod/{ujson_dumps_separators.py => json_dumps_separators.py} (93%)
 create mode 100644 tests/extmod/json_load.py
 rename tests/extmod/{ujson_loads.py => json_loads.py} (92%)
 rename tests/extmod/{ujson_loads_bytes.py => json_loads_bytes.py} (56%)
 rename tests/extmod/{ujson_loads_bytes.py.exp => json_loads_bytes.py.exp} (100%)
 rename tests/extmod/{ujson_loads_float.py => json_loads_float.py} (65%)
 rename tests/extmod/{urandom_basic.py => random_basic.py} (81%)
 rename tests/extmod/{urandom_basic.py.exp => random_basic.py.exp} (100%)
 rename tests/extmod/{urandom_extra.py => random_extra.py} (89%)
 rename tests/extmod/{urandom_extra_float.py => random_extra_float.py} (72%)
 rename tests/extmod/{urandom_seed_default.py => random_seed_default.py} (69%)
 rename tests/extmod/{ure1.py => re1.py} (95%)
 rename tests/extmod/{ure_debug.py => re_debug.py} (65%)
 rename tests/extmod/{ure_debug.py.exp => re_debug.py.exp} (100%)
 rename tests/extmod/{ure_error.py => re_error.py} (73%)
 rename tests/extmod/{ure_group.py => re_group.py} (81%)
 rename tests/extmod/{ure_groups.py => re_groups.py} (81%)
 rename tests/extmod/{ure_limit.py => re_limit.py} (88%)
 rename tests/extmod/{ure_limit.py.exp => re_limit.py.exp} (100%)
 rename tests/extmod/{ure_namedclass.py => re_namedclass.py} (85%)
 rename tests/extmod/{ure_span.py => re_span.py} (85%)
 rename tests/extmod/{ure_split.py => re_split.py} (82%)
 rename tests/extmod/{ure_split_empty.py => re_split_empty.py} (95%)
 rename tests/extmod/{ure_split_empty.py.exp => re_split_empty.py.exp} (100%)
 rename tests/extmod/{ure_split_notimpl.py => re_split_notimpl.py} (89%)
 rename tests/extmod/{ure_split_notimpl.py.exp => re_split_notimpl.py.exp} (100%)
 create mode 100644 tests/extmod/re_stack_overflow.py
 rename tests/extmod/{ure_stack_overflow.py.exp => re_stack_overflow.py.exp} (100%)
 rename tests/extmod/{ure_sub.py => re_sub.py} (93%)
 rename tests/extmod/{ure_sub_unmatched.py => re_sub_unmatched.py} (71%)
 rename tests/extmod/{ure_sub_unmatched.py.exp => re_sub_unmatched.py.exp} (100%)
 rename tests/extmod/{uselect_poll_basic.py => select_poll_basic.py} (69%)
 rename tests/extmod/{uselect_poll_udp.py => select_poll_udp.py} (66%)
 rename tests/extmod/{usocket_tcp_basic.py => socket_tcp_basic.py} (60%)
 rename tests/extmod/{usocket_udp_nonblock.py => socket_udp_nonblock.py} (63%)
 rename tests/extmod/{ussl_basic.py => ssl_basic.py} (96%)
 rename tests/extmod/{ussl_basic.py.exp => ssl_basic.py.exp} (100%)
 rename tests/extmod/{ussl_keycert.py => ssl_keycert.py} (94%)
 rename tests/extmod/{ussl_keycert.py.exp => ssl_keycert.py.exp} (100%)
 rename tests/extmod/{ussl_poll.py => ssl_poll.py} (94%)
 rename tests/extmod/{ussl_poll.py.exp => ssl_poll.py.exp} (100%)
 rename tests/extmod/{utime_res.py => time_res.py} (80%)
 rename tests/extmod/{utime_res.py.exp => time_res.py.exp} (100%)
 rename tests/extmod/{utime_time_ns.py => time_time_ns.py} (68%)
 rename tests/extmod/{utime_time_ns.py.exp => time_time_ns.py.exp} (100%)
 rename tests/extmod/{utimeq1.py => timeq1.py} (90%)
 rename tests/extmod/{utimeq1.py.exp => timeq1.py.exp} (100%)
 rename tests/extmod/{utimeq_stable.py => timeq_stable.py} (90%)
 rename tests/extmod/{utimeq_stable.py.exp => timeq_stable.py.exp} (100%)
 delete mode 100644 tests/extmod/uhashlib_md5.py
 delete mode 100644 tests/extmod/uhashlib_sha1.py
 delete mode 100644 tests/extmod/ujson_dumps_extra.py
 delete mode 100644 tests/extmod/ujson_dumps_float.py
 delete mode 100644 tests/extmod/ujson_dumps_ordereddict.py
 delete mode 100644 tests/extmod/ujson_load.py
 delete mode 100644 tests/extmod/ure_stack_overflow.py
 rename tests/extmod/{uzlib_decompio.py => zlib_decompio.py} (93%)
 rename tests/extmod/{uzlib_decompio.py.exp => zlib_decompio.py.exp} (100%)
 rename tests/extmod/{uzlib_decompio_gz.py => zlib_decompio_gz.py} (97%)
 rename tests/extmod/{uzlib_decompio_gz.py.exp => zlib_decompio_gz.py.exp} (100%)
 rename tests/extmod/{uzlib_decompress.py => zlib_decompress.py} (94%)
 rename tests/feature_check/{uio_module.py => io_module.py} (56%)
 rename tests/feature_check/{uio_module.py.exp => io_module.py.exp} (100%)
 rename tests/unix/{time.py => time_mktime_localtime.py} (96%)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index ab06c0fb39357..6022ff2bff7be 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -356,19 +356,19 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "# repl\n");
 
         const char *str;
-        size_t len = mp_repl_autocomplete("__n", 3, &mp_plat_print, &str);
+        size_t len = mp_repl_autocomplete("__n", 3, &mp_plat_print, &str); // expect "ame__"
         mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
 
-        len = mp_repl_autocomplete("i", 1,  &mp_plat_print, &str);
+        len = mp_repl_autocomplete("im", 2,  &mp_plat_print, &str); // expect "port"
         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_repl_autocomplete("import ", 7,  &mp_plat_print, &str); // expect the list of builtins
+        len = mp_repl_autocomplete("import ti", 9,  &mp_plat_print, &str); // expect "me"
         mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
-        mp_repl_autocomplete("import time", 12,  &mp_plat_print, &str);
+        mp_repl_autocomplete("import time", 11,  &mp_plat_print, &str); // expect "time timeq"
 
         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);
+        mp_repl_autocomplete("sys.", 4, &mp_plat_print, &str); // expect dir(sys)
+        len = mp_repl_autocomplete("sys.impl", 8, &mp_plat_print, &str); // expect "ementation"
         mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
     }
 
diff --git a/tests/basics/array1.py b/tests/basics/array1.py
index f21ad4bd75f90..5c5d13a581631 100644
--- a/tests/basics/array1.py
+++ b/tests/basics/array1.py
@@ -1,11 +1,8 @@
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 a = array.array('B', [1, 2, 3])
 print(a, len(a))
diff --git a/tests/basics/array_add.py b/tests/basics/array_add.py
index 8335eb6b82bb9..76ce59f761e06 100644
--- a/tests/basics/array_add.py
+++ b/tests/basics/array_add.py
@@ -1,12 +1,9 @@
 # test array + array
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 a1 = array.array('I', [1])
 a2 = array.array('I', [2])
diff --git a/tests/basics/array_construct.py b/tests/basics/array_construct.py
index 4985244d13bb5..2221de99068c2 100644
--- a/tests/basics/array_construct.py
+++ b/tests/basics/array_construct.py
@@ -1,13 +1,10 @@
 # test construction of array.array from different objects
 
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # tuple, list
 print(array('b', (1, 2)))
diff --git a/tests/basics/array_construct2.py b/tests/basics/array_construct2.py
index d1b1e9d158c63..c305b7f011d1f 100644
--- a/tests/basics/array_construct2.py
+++ b/tests/basics/array_construct2.py
@@ -1,11 +1,8 @@
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # construct from something with unknown length (requires generators)
 print(array('i', (i for i in range(10))))
diff --git a/tests/basics/array_construct_endian.py b/tests/basics/array_construct_endian.py
index 82a962fbe0d57..990d7b1ea039b 100644
--- a/tests/basics/array_construct_endian.py
+++ b/tests/basics/array_construct_endian.py
@@ -1,13 +1,10 @@
 # test construction of array.array from different objects
 
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # raw copy from bytes, bytearray
 print(array('h', b'12'))
diff --git a/tests/basics/array_intbig.py b/tests/basics/array_intbig.py
index ba7f9ef985ad3..5702a8ae63538 100644
--- a/tests/basics/array_intbig.py
+++ b/tests/basics/array_intbig.py
@@ -1,13 +1,10 @@
 # test array types QqLl that require big-ints
 
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(array('L', [0, 2**32-1]))
 print(array('l', [-2**31, 0, 2**31-1]))
diff --git a/tests/basics/array_micropython.py b/tests/basics/array_micropython.py
index 44dc1d83d8efd..771a7d709cb45 100644
--- a/tests/basics/array_micropython.py
+++ b/tests/basics/array_micropython.py
@@ -1,12 +1,9 @@
 # test MicroPython-specific features of array.array
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # arrays of objects
 a = array.array('O')
diff --git a/tests/basics/async_await2.py b/tests/basics/async_await2.py
index 56f77604ac1be..1e3164df93372 100644
--- a/tests/basics/async_await2.py
+++ b/tests/basics/async_await2.py
@@ -1,9 +1,6 @@
 # test await expression
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
+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 4af3be4c6df32..aad23a3e5ad8c 100644
--- a/tests/basics/async_for2.py
+++ b/tests/basics/async_for2.py
@@ -1,9 +1,6 @@
 # test waiting within "async for" __anext__ function
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
+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 4dd1386240f2c..44421ae91798e 100644
--- a/tests/basics/async_with2.py
+++ b/tests/basics/async_with2.py
@@ -1,9 +1,6 @@
 # test waiting within async with enter/exit functions
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
+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 249c030bb4fdb..78a0fbed1b73a 100644
--- a/tests/basics/attrtuple1.py
+++ b/tests/basics/attrtuple1.py
@@ -1,10 +1,7 @@
 # test attrtuple
 # we can't test this type directly so we use sys.implementation object
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
+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 c0a9d0c473a5a..3ae49f004d18a 100644
--- a/tests/basics/builtin_callable.py
+++ b/tests/basics/builtin_callable.py
@@ -7,10 +7,7 @@
 print(callable("dfsd"))
 
 # modules should not be callabe
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 print(callable(sys))
 
 # builtins should be callable
diff --git a/tests/basics/builtin_dir.py b/tests/basics/builtin_dir.py
index 1f2b498d77f77..1eecbd044b7b0 100644
--- a/tests/basics/builtin_dir.py
+++ b/tests/basics/builtin_dir.py
@@ -4,10 +4,7 @@
 print('__name__' in dir())
 
 # dir of module
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 print('version' in dir(sys))
 
 # dir of type
diff --git a/tests/basics/bytearray_construct_array.py b/tests/basics/bytearray_construct_array.py
index 52eaa7c6efbdc..bde5fa08bd2c2 100644
--- a/tests/basics/bytearray_construct_array.py
+++ b/tests/basics/bytearray_construct_array.py
@@ -1,12 +1,9 @@
 # test construction of bytearray from different objects
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # arrays
 print(bytearray(array('b', [1, 2])))
diff --git a/tests/basics/bytearray_construct_endian.py b/tests/basics/bytearray_construct_endian.py
index 332b43e68617b..0002f19c5f9ba 100644
--- a/tests/basics/bytearray_construct_endian.py
+++ b/tests/basics/bytearray_construct_endian.py
@@ -1,12 +1,9 @@
 # test construction of bytearray from different objects
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # arrays
 print(bytearray(array('h', [1, 2])))
diff --git a/tests/basics/bytes_add_array.py b/tests/basics/bytes_add_array.py
index c6382bed7495c..b17556d83cbaf 100644
--- a/tests/basics/bytes_add_array.py
+++ b/tests/basics/bytes_add_array.py
@@ -1,12 +1,9 @@
 # test bytes + other
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # should be byteorder-neutral
 print(b"123" + array.array('h', [0x1515]))
diff --git a/tests/basics/bytes_add_endian.py b/tests/basics/bytes_add_endian.py
index 40b3de7d61520..8cfffa7b6ace2 100644
--- a/tests/basics/bytes_add_endian.py
+++ b/tests/basics/bytes_add_endian.py
@@ -1,11 +1,8 @@
 # test bytes + other
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(b"123" + array.array('i', [1]))
diff --git a/tests/basics/bytes_compare_array.py b/tests/basics/bytes_compare_array.py
index 6bad50b55a1ed..ad378de70c56b 100644
--- a/tests/basics/bytes_compare_array.py
+++ b/tests/basics/bytes_compare_array.py
@@ -1,11 +1,8 @@
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(array.array('b', [1, 2]) in b'\x01\x02\x03')
 # CPython gives False here
diff --git a/tests/basics/bytes_construct_array.py b/tests/basics/bytes_construct_array.py
index 7bdd8f10df4de..453eb59010392 100644
--- a/tests/basics/bytes_construct_array.py
+++ b/tests/basics/bytes_construct_array.py
@@ -1,12 +1,9 @@
 # test construction of bytes from different objects
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # arrays
 print(bytes(array('b', [1, 2])))
diff --git a/tests/basics/bytes_construct_endian.py b/tests/basics/bytes_construct_endian.py
index 294c5f23f5cff..cf1a9f408fa8d 100644
--- a/tests/basics/bytes_construct_endian.py
+++ b/tests/basics/bytes_construct_endian.py
@@ -1,13 +1,10 @@
 # test construction of bytes from different objects
 
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # arrays
 print(bytes(array('h', [1, 2])))
diff --git a/tests/basics/class_ordereddict.py b/tests/basics/class_ordereddict.py
index 4dd25eb6e15b4..03a211ddad242 100644
--- a/tests/basics/class_ordereddict.py
+++ b/tests/basics/class_ordereddict.py
@@ -1,13 +1,10 @@
 # test using an OrderedDict as the locals to construct a class
 
 try:
-    from ucollections import OrderedDict
+    from collections import OrderedDict
 except ImportError:
-    try:
-        from collections import OrderedDict
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 if not hasattr(int, "__dict__"):
     print("SKIP")
diff --git a/tests/basics/class_store_class.py b/tests/basics/class_store_class.py
index 797f88f8526d8..8ee2f8db11bd9 100644
--- a/tests/basics/class_store_class.py
+++ b/tests/basics/class_store_class.py
@@ -5,11 +5,8 @@
 try:
     from collections import namedtuple
 except ImportError:
-    try:
-        from ucollections import namedtuple
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 _DefragResultBase = namedtuple('DefragResult', [ 'foo', 'bar' ])
 
diff --git a/tests/basics/deque1.py b/tests/basics/deque1.py
index 19966fcb07871..8b7874e2b1d37 100644
--- a/tests/basics/deque1.py
+++ b/tests/basics/deque1.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        from ucollections import deque
-    except ImportError:
-        from collections import deque
+    from collections import deque
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py
index 22d370e943ba1..80fcd66785663 100644
--- a/tests/basics/deque2.py
+++ b/tests/basics/deque2.py
@@ -1,10 +1,7 @@
 # Tests for deques with "check overflow" flag and other extensions
 # wrt to CPython.
 try:
-    try:
-        from ucollections import deque
-    except ImportError:
-        from collections import deque
+    from collections import deque
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/basics/dict_fixed.py b/tests/basics/dict_fixed.py
index 4261a06557aae..cfd3b71f5741b 100644
--- a/tests/basics/dict_fixed.py
+++ b/tests/basics/dict_fixed.py
@@ -1,48 +1,48 @@
 # test that fixed dictionaries cannot be modified
 
 try:
-    import uerrno
+    import errno
 except ImportError:
     print("SKIP")
     raise SystemExit
 
-# Save a copy of uerrno.errorcode, so we can check later
+# Save a copy of errno.errorcode, so we can check later
 # that it hasn't been modified.
-errorcode_copy = uerrno.errorcode.copy()
+errorcode_copy = errno.errorcode.copy()
 
 try:
-    uerrno.errorcode.popitem()
+    errno.errorcode.popitem()
 except TypeError:
     print("TypeError")
 
 try:
-    uerrno.errorcode.pop(0)
+    errno.errorcode.pop(0)
 except TypeError:
     print("TypeError")
 
 try:
-    uerrno.errorcode.setdefault(0, 0)
+    errno.errorcode.setdefault(0, 0)
 except TypeError:
     print("TypeError")
 
 try:
-    uerrno.errorcode.update([(1, 2)])
+    errno.errorcode.update([(1, 2)])
 except TypeError:
     print("TypeError")
 
 try:
-    del uerrno.errorcode[1]
+    del errno.errorcode[1]
 except TypeError:
     print("TypeError")
 
 try:
-    uerrno.errorcode[1] = 'foo'
+    errno.errorcode[1] = 'foo'
 except TypeError:
     print("TypeError")
 
 try:
-    uerrno.errorcode.clear()
+    errno.errorcode.clear()
 except TypeError:
     print("TypeError")
 
-assert uerrno.errorcode == errorcode_copy
+assert errno.errorcode == errorcode_copy
diff --git a/tests/basics/errno1.py b/tests/basics/errno1.py
index d9a895a972d62..0773c926fde52 100644
--- a/tests/basics/errno1.py
+++ b/tests/basics/errno1.py
@@ -1,25 +1,25 @@
-# test errno's and uerrno module
+# test errno's and errno module
 
 try:
-    import uerrno
+    import errno
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 # check that constants exist and are integers
-print(type(uerrno.EIO))
+print(type(errno.EIO))
 
 # check that errors are rendered in a nice way
-msg = str(OSError(uerrno.EIO))
+msg = str(OSError(errno.EIO))
 print(msg[:7], msg[-5:])
-msg = str(OSError(uerrno.EIO, "details"))
+msg = str(OSError(errno.EIO, "details"))
 print(msg[:7], msg[-14:])
-msg = str(OSError(uerrno.EIO, "details", "more details"))
+msg = str(OSError(errno.EIO, "details", "more details"))
 print(msg[:1], msg[-28:])
 
 # check that unknown errno is still rendered
 print(str(OSError(9999)))
 
 # this tests a failed constant lookup in errno
-errno = uerrno
+errno = errno
 print(errno.__name__)
diff --git a/tests/basics/errno1.py.exp b/tests/basics/errno1.py.exp
index 58605b4767a2b..7a9ffea8f7c3b 100644
--- a/tests/basics/errno1.py.exp
+++ b/tests/basics/errno1.py.exp
@@ -3,4 +3,4 @@
 [Errno  ] EIO: details
 ( , 'details', 'more details')
 9999
-uerrno
+errno
diff --git a/tests/basics/int_big1.py b/tests/basics/int_big1.py
index ea48372b28392..de2ba9fc4f2df 100644
--- a/tests/basics/int_big1.py
+++ b/tests/basics/int_big1.py
@@ -105,10 +105,7 @@
 x = -4611686018427387904 # big
 
 # sys.maxsize is a constant mpz, so test it's compatible with dynamic ones
-try:
-    import usys as sys
-except ImportError:
-    import sys
+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/io_buffered_writer.py b/tests/basics/io_buffered_writer.py
index 0e943cb0a9012..5c065f158a2d3 100644
--- a/tests/basics/io_buffered_writer.py
+++ b/tests/basics/io_buffered_writer.py
@@ -1,4 +1,4 @@
-import uio as io
+import io
 
 try:
     io.BytesIO
diff --git a/tests/basics/io_bytesio_cow.py b/tests/basics/io_bytesio_cow.py
index 92654a0003fb6..2edb7136a9691 100644
--- a/tests/basics/io_bytesio_cow.py
+++ b/tests/basics/io_bytesio_cow.py
@@ -1,10 +1,6 @@
 # Make sure that write operations on io.BytesIO don't
 # change original object it was constructed from.
-try:
-    import uio as io
-except ImportError:
-    import io
-
+import io
 b = b"foobar"
 
 a = io.BytesIO(b)
diff --git a/tests/basics/io_bytesio_ext.py b/tests/basics/io_bytesio_ext.py
index e454b2fd9f2dd..4d4c60c1363b7 100644
--- a/tests/basics/io_bytesio_ext.py
+++ b/tests/basics/io_bytesio_ext.py
@@ -1,9 +1,5 @@
 # Extended stream operations on io.BytesIO
-try:
-    import uio as io
-except ImportError:
-    import io
-
+import io
 a = io.BytesIO(b"foobar")
 a.seek(10)
 print(a.read(10))
diff --git a/tests/basics/io_bytesio_ext2.py b/tests/basics/io_bytesio_ext2.py
index 8f624fd58c569..414ac90a3b083 100644
--- a/tests/basics/io_bytesio_ext2.py
+++ b/tests/basics/io_bytesio_ext2.py
@@ -1,8 +1,4 @@
-try:
-    import uio as io
-except ImportError:
-    import io
-
+import io
 a = io.BytesIO(b"foobar")
 try:
     a.seek(-10)
diff --git a/tests/basics/io_iobase.py b/tests/basics/io_iobase.py
index 6f554b00f082d..d3824c177f3b3 100644
--- a/tests/basics/io_iobase.py
+++ b/tests/basics/io_iobase.py
@@ -1,8 +1,4 @@
-try:
-    import uio as io
-except:
-    import io
-
+import io
 try:
     io.IOBase
 except AttributeError:
diff --git a/tests/basics/io_stringio1.py b/tests/basics/io_stringio1.py
index 41089f22d5398..7d355930f5a29 100644
--- a/tests/basics/io_stringio1.py
+++ b/tests/basics/io_stringio1.py
@@ -1,8 +1,4 @@
-try:
-    import uio as io
-except ImportError:
-    import io
-
+import io
 a = io.StringIO()
 print('io.StringIO' in repr(a))
 print(a.getvalue())
diff --git a/tests/basics/io_stringio_base.py b/tests/basics/io_stringio_base.py
index dffc879074a78..0f65fb3fabc3b 100644
--- a/tests/basics/io_stringio_base.py
+++ b/tests/basics/io_stringio_base.py
@@ -1,10 +1,7 @@
 # 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
+import io
 
 a = io.StringIO()
 a.write("hello\nworld\nmicro\npython\n")
diff --git a/tests/basics/io_stringio_with.py b/tests/basics/io_stringio_with.py
index c35975445df96..a3aa6ec84e066 100644
--- a/tests/basics/io_stringio_with.py
+++ b/tests/basics/io_stringio_with.py
@@ -1,8 +1,4 @@
-try:
-    import uio as io
-except ImportError:
-    import io
-
+import io
 # test __enter__/__exit__
 with io.StringIO() as b:
     b.write("foo")
diff --git a/tests/basics/io_write_ext.py b/tests/basics/io_write_ext.py
index 5a6eaa35cf039..695abccef4421 100644
--- a/tests/basics/io_write_ext.py
+++ b/tests/basics/io_write_ext.py
@@ -1,14 +1,14 @@
 # This tests extended (MicroPython-specific) form of write:
 # write(buf, len) and write(buf, offset, len)
-import uio
+import io
 
 try:
-    uio.BytesIO
+    io.BytesIO
 except AttributeError:
     print('SKIP')
     raise SystemExit
 
-buf = uio.BytesIO()
+buf = io.BytesIO()
 
 buf.write(b"foo", 2)
 print(buf.getvalue())
diff --git a/tests/basics/memoryview1.py b/tests/basics/memoryview1.py
index 4c20c91f4947f..1ebfbc53b9217 100644
--- a/tests/basics/memoryview1.py
+++ b/tests/basics/memoryview1.py
@@ -5,13 +5,10 @@
     print("SKIP")
     raise SystemExit
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # test reading from bytes
 b = b'1234'
diff --git a/tests/basics/memoryview2.py b/tests/basics/memoryview2.py
index eacc227c28317..fa5514e07273d 100644
--- a/tests/basics/memoryview2.py
+++ b/tests/basics/memoryview2.py
@@ -5,13 +5,10 @@
     print("SKIP")
     raise SystemExit
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(list(memoryview(b'\x7f\x80\x81\xff')))
 print(list(memoryview(array('b', [0x7f, -0x80]))))
diff --git a/tests/basics/memoryview_intbig.py b/tests/basics/memoryview_intbig.py
index 4800a70cc2726..72951d6eaa849 100644
--- a/tests/basics/memoryview_intbig.py
+++ b/tests/basics/memoryview_intbig.py
@@ -5,13 +5,10 @@
     print("SKIP")
     raise SystemExit
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(list(memoryview(array('i', [0x7f000000, -0x80000000]))))
 print(list(memoryview(array('I', [0x7f000000, 0x80000000, 0x81000000, 0xffffffff]))))
diff --git a/tests/basics/memoryview_itemsize.py b/tests/basics/memoryview_itemsize.py
index 64a8822b8b214..5428a41785f8d 100644
--- a/tests/basics/memoryview_itemsize.py
+++ b/tests/basics/memoryview_itemsize.py
@@ -4,13 +4,10 @@
     print("SKIP")
     raise SystemExit
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 for code in ['b', 'h', 'i', 'q', 'f', 'd']:
     print(memoryview(array(code)).itemsize)
diff --git a/tests/basics/memoryview_slice_assign.py b/tests/basics/memoryview_slice_assign.py
index 74f6fae6f788d..94f8073f0a1fd 100644
--- a/tests/basics/memoryview_slice_assign.py
+++ b/tests/basics/memoryview_slice_assign.py
@@ -7,13 +7,10 @@
     raise SystemExit
 
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # test slice assignment between memoryviews
 b1 = bytearray(b'1234')
diff --git a/tests/basics/module2.py b/tests/basics/module2.py
index 5923a27e08d42..a135601579cd7 100644
--- a/tests/basics/module2.py
+++ b/tests/basics/module2.py
@@ -1,6 +1,6 @@
 # uPy behaviour only: builtin modules are read-only
-import usys
+import sys
 try:
-    usys.x = 1
+    sys.x = 1
 except AttributeError:
     print("AttributeError")
diff --git a/tests/basics/namedtuple1.py b/tests/basics/namedtuple1.py
index e8247e4d6e130..362c60583ec32 100644
--- a/tests/basics/namedtuple1.py
+++ b/tests/basics/namedtuple1.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        from ucollections import namedtuple
-    except ImportError:
-        from collections import namedtuple
+    from collections import namedtuple
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/basics/namedtuple_asdict.py b/tests/basics/namedtuple_asdict.py
index 34c4e6f7131b6..e85281bb73ebe 100644
--- a/tests/basics/namedtuple_asdict.py
+++ b/tests/basics/namedtuple_asdict.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        from ucollections import namedtuple
-    except ImportError:
-        from collections import namedtuple
+    from collections import namedtuple
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/basics/ordereddict1.py b/tests/basics/ordereddict1.py
index 270deab3846a9..a6f305ff78bb4 100644
--- a/tests/basics/ordereddict1.py
+++ b/tests/basics/ordereddict1.py
@@ -1,11 +1,8 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    try:
-        from ucollections import OrderedDict
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 d = OrderedDict([(10, 20), ("b", 100), (1, 2)])
 print(len(d))
diff --git a/tests/basics/ordereddict_eq.py b/tests/basics/ordereddict_eq.py
index c69daf8802cc9..e103c867e237b 100644
--- a/tests/basics/ordereddict_eq.py
+++ b/tests/basics/ordereddict_eq.py
@@ -1,11 +1,8 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    try:
-        from ucollections import OrderedDict
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 x = OrderedDict()
 y = OrderedDict()
diff --git a/tests/basics/python34.py b/tests/basics/python34.py
index 36e25e20dd5f9..922234d22db93 100644
--- a/tests/basics/python34.py
+++ b/tests/basics/python34.py
@@ -29,9 +29,9 @@ def test_syntax(code):
 
 # from basics/sys1.py
 # uPy prints version 3.4
-import usys
-print(usys.version[:3])
-print(usys.version_info[0], usys.version_info[1])
+import sys
+print(sys.version[:3])
+print(sys.version_info[0], sys.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 f34879df25bcb..6515809b3642d 100644
--- a/tests/basics/string_compare.py
+++ b/tests/basics/string_compare.py
@@ -51,10 +51,7 @@
 
 # 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
-try:
-    import usys as sys
-except ImportError:
-    import sys
+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/struct1.py b/tests/basics/struct1.py
index c4960d2f8015b..a18655517bb77 100644
--- a/tests/basics/struct1.py
+++ b/tests/basics/struct1.py
@@ -1,11 +1,8 @@
 try:
-    import ustruct as struct
-except:
-    try:
-        import struct
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 print(struct.calcsize("<bI"))
 print(struct.unpack("<bI", b"\x80\0\0\x01\0"))
diff --git a/tests/basics/struct1_intbig.py b/tests/basics/struct1_intbig.py
index 24541c8a42509..ef1f0579cfa28 100644
--- a/tests/basics/struct1_intbig.py
+++ b/tests/basics/struct1_intbig.py
@@ -1,11 +1,8 @@
 try:
-    import ustruct as struct
-except:
-    try:
-        import struct
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # check maximum pack on 32-bit machine
 print(struct.pack("<I", 2**32 - 1))
diff --git a/tests/basics/struct2.py b/tests/basics/struct2.py
index ceb06777691a0..9cbf5ad8674a5 100644
--- a/tests/basics/struct2.py
+++ b/tests/basics/struct2.py
@@ -1,13 +1,10 @@
-# test ustruct with a count specified before the type
+# test struct with a count specified before the type
 
 try:
-    import ustruct as struct
-except:
-    try:
-        import struct
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 print(struct.calcsize('0s'))
 print(struct.unpack('0s', b''))
diff --git a/tests/basics/struct_endian.py b/tests/basics/struct_endian.py
index 91f5539c15927..6eabda01888e9 100644
--- a/tests/basics/struct_endian.py
+++ b/tests/basics/struct_endian.py
@@ -1,13 +1,10 @@
-# test ustruct and endian specific things
+# test struct and endian specific things
 
 try:
-    import ustruct as struct
-except:
-    try:
-        import struct
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # unpack/unpack_from with unaligned native type
 buf = b'0123456789'
diff --git a/tests/basics/struct_micropython.py b/tests/basics/struct_micropython.py
index f203a4666f803..81985299ffa70 100644
--- a/tests/basics/struct_micropython.py
+++ b/tests/basics/struct_micropython.py
@@ -1,13 +1,10 @@
 # test MicroPython-specific features of struct
 
 try:
-    import ustruct as struct
-except:
-    try:
-        import struct
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 class A():
     pass
diff --git a/tests/basics/subclass_native_call.py b/tests/basics/subclass_native_call.py
index 969f0a415ea15..e77287060cc70 100644
--- a/tests/basics/subclass_native_call.py
+++ b/tests/basics/subclass_native_call.py
@@ -4,10 +4,7 @@
 # and is callable (has call).  The only one available is machine.Signal, which
 # in turns needs PinBase.
 try:
-    try:
-        import umachine as machine
-    except ImportError:
-        import machine
+    import machine
     machine.PinBase
     machine.Signal
 except:
diff --git a/tests/basics/subclass_native_exc_new.py b/tests/basics/subclass_native_exc_new.py
index c1bd89a6fa69b..a431392eaa44f 100644
--- a/tests/basics/subclass_native_exc_new.py
+++ b/tests/basics/subclass_native_exc_new.py
@@ -29,7 +29,6 @@ def __new__(cls, *args, **kwargs):
     print(type(bad), bad.args[0])
 
 try:
-
     def gen():
         yield
 
diff --git a/tests/basics/sys1.py b/tests/basics/sys1.py
index a609f54b63621..759b9a6eaec22 100644
--- a/tests/basics/sys1.py
+++ b/tests/basics/sys1.py
@@ -1,10 +1,6 @@
 # test sys module
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
-
+import sys
 print(sys.__name__)
 print(type(sys.path))
 print(type(sys.argv))
diff --git a/tests/basics/sys_exit.py b/tests/basics/sys_exit.py
index 4d640ae60e4e9..4994af4161c1f 100644
--- a/tests/basics/sys_exit.py
+++ b/tests/basics/sys_exit.py
@@ -1,10 +1,6 @@
 # test sys module's exit function
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
-
+import sys
 try:
     sys.exit
 except AttributeError:
diff --git a/tests/basics/sys_getsizeof.py b/tests/basics/sys_getsizeof.py
index 4dc919848ca4c..779e992d1f642 100644
--- a/tests/basics/sys_getsizeof.py
+++ b/tests/basics/sys_getsizeof.py
@@ -1,9 +1,6 @@
 # test sys.getsizeof() function
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 try:
     sys.getsizeof
 except AttributeError:
@@ -19,7 +16,7 @@ class A:
 
 # Only test deque if we have it
 try:
-    from ucollections import deque
+    from collections import deque
     assert sys.getsizeof(deque((), 1)) > 0
 except ImportError:
     pass
diff --git a/tests/basics/sys_path.py b/tests/basics/sys_path.py
index 6456e24019707..576bd66c94d4d 100644
--- a/tests/basics/sys_path.py
+++ b/tests/basics/sys_path.py
@@ -1,10 +1,6 @@
 # test sys.path
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
-
+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")
diff --git a/tests/basics/sys_tracebacklimit.py b/tests/basics/sys_tracebacklimit.py
index 1ee638967f129..3ae372b8d524e 100644
--- a/tests/basics/sys_tracebacklimit.py
+++ b/tests/basics/sys_tracebacklimit.py
@@ -1,12 +1,8 @@
 # test sys.tracebacklimit
 
 try:
-    try:
-        import usys as sys
-        import uio as io
-    except ImportError:
-        import sys
-        import io
+    import sys
+    import io
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/basics/sys_tracebacklimit.py.exp b/tests/basics/sys_tracebacklimit.py.exp
index 3647280584dde..39c54523a05c6 100644
--- a/tests/basics/sys_tracebacklimit.py.exp
+++ b/tests/basics/sys_tracebacklimit.py.exp
@@ -1,35 +1,35 @@
 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
+  File  , line 58, in ftop
+  File  , line 53, in f3
+  File  , line 49, in f2
+  File  , line 45, in f1
+  File  , line 41, 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
+  File  , line 58, in ftop
+  File  , line 53, in f3
+  File  , line 49, in f2
+  File  , line 45, 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
+  File  , line 58, in ftop
+  File  , line 53, in f3
+  File  , line 49, in f2
 ValueError: value
 
 limit 2
 Traceback (most recent call last):
-  File  , line 62, in ftop
-  File  , line 57, in f3
+  File  , line 58, in ftop
+  File  , line 53, in f3
 ValueError: value
 
 limit 1
 Traceback (most recent call last):
-  File  , line 62, in ftop
+  File  , line 58, in ftop
 ValueError: value
 
 limit 0
diff --git a/tests/cmdline/repl_micropyinspect b/tests/cmdline/repl_micropyinspect
index 0710f1a75bedd..8dfa8810ea41a 100644
--- a/tests/cmdline/repl_micropyinspect
+++ b/tests/cmdline/repl_micropyinspect
@@ -1,3 +1,3 @@
-import uos
+import os
 
-uos.putenv('MICROPYINSPECT', '1')
+os.putenv('MICROPYINSPECT', '1')
diff --git a/tests/cmdline/repl_sys_ps1_ps2.py b/tests/cmdline/repl_sys_ps1_ps2.py
index 4f96057c49b6d..cfefe804bf254 100644
--- a/tests/cmdline/repl_sys_ps1_ps2.py
+++ b/tests/cmdline/repl_sys_ps1_ps2.py
@@ -1,6 +1,6 @@
 # test changing ps1/ps2
-import usys
-usys.ps1 = "PS1"
-usys.ps2 = "PS2"
+import sys
+sys.ps1 = "PS1"
+sys.ps2 = "PS2"
 (1 +
 2)
diff --git a/tests/cmdline/repl_sys_ps1_ps2.py.exp b/tests/cmdline/repl_sys_ps1_ps2.py.exp
index e4a802d34d75e..9e82db5e313e4 100644
--- a/tests/cmdline/repl_sys_ps1_ps2.py.exp
+++ b/tests/cmdline/repl_sys_ps1_ps2.py.exp
@@ -1,9 +1,9 @@
 MicroPython \.\+ version
 Use \.\+
 >>> # test changing ps1/ps2
->>> import usys
->>> usys.ps1 = "PS1"
-PS1usys.ps2 = "PS2"
+>>> import sys
+>>> sys.ps1 = "PS1"
+PS1sys.ps2 = "PS2"
 PS1(1 +
 PS22)
 3
diff --git a/tests/esp32/partition_ota.py b/tests/esp32/partition_ota.py
index 212fcf03385e7..65e2742ebb228 100644
--- a/tests/esp32/partition_ota.py
+++ b/tests/esp32/partition_ota.py
@@ -22,10 +22,10 @@ def log(*args):
 
 
 # replace boot.py with the test code that will run on each reboot
-import uos
+import os
 
 try:
-    uos.rename("boot.py", "boot-orig.py")
+    os.rename("boot.py", "boot-orig.py")
 except:
     pass
 with open("boot.py", "w") as f:
@@ -74,10 +74,10 @@ def log(*args):
 elif STEP == 4:
     log("Confirming boot ok and DONE!")
     Partition.mark_app_valid_cancel_rollback()
-    import uos
-    uos.remove("step.py")
-    uos.remove("boot.py")
-    uos.rename("boot-orig.py", "boot.py")
+    import os
+    os.remove("step.py")
+    os.remove("boot.py")
+    os.rename("boot-orig.py", "boot.py")
     print("\\nSUCCESS!\\n\\x04\\x04")
 
 """
diff --git a/tests/esp32/resolve_on_connect.py b/tests/esp32/resolve_on_connect.py
index 068757ab2ab47..e604ce9ca099a 100644
--- a/tests/esp32/resolve_on_connect.py
+++ b/tests/esp32/resolve_on_connect.py
@@ -5,10 +5,7 @@
     print("SKIP")
     raise SystemExit
 
-try:
-    import usocket as socket, sys
-except:
-    import socket, sys
+import socket, sys
 
 
 def test_bind_resolves_0_0_0_0():
diff --git a/tests/extmod/ubinascii_a2b_base64.py b/tests/extmod/binascii_a2b_base64.py
similarity index 92%
rename from tests/extmod/ubinascii_a2b_base64.py
rename to tests/extmod/binascii_a2b_base64.py
index 2630965e6a06a..fd1ff75e1fcfe 100644
--- a/tests/extmod/ubinascii_a2b_base64.py
+++ b/tests/extmod/binascii_a2b_base64.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        import ubinascii as binascii
-    except ImportError:
-        import binascii
+    import binascii
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ubinascii_b2a_base64.py b/tests/extmod/binascii_b2a_base64.py
similarity index 88%
rename from tests/extmod/ubinascii_b2a_base64.py
rename to tests/extmod/binascii_b2a_base64.py
index 3f92488969e93..306af94004891 100644
--- a/tests/extmod/ubinascii_b2a_base64.py
+++ b/tests/extmod/binascii_b2a_base64.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        import ubinascii as binascii
-    except ImportError:
-        import binascii
+    import binascii
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ubinascii_crc32.py b/tests/extmod/binascii_crc32.py
similarity index 87%
rename from tests/extmod/ubinascii_crc32.py
rename to tests/extmod/binascii_crc32.py
index 8f5f4d9ba5e53..0e4a5b58f33bc 100644
--- a/tests/extmod/ubinascii_crc32.py
+++ b/tests/extmod/binascii_crc32.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        import ubinascii as binascii
-    except ImportError:
-        import binascii
+    import binascii
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ubinascii_hexlify.py b/tests/extmod/binascii_hexlify.py
similarity index 80%
rename from tests/extmod/ubinascii_hexlify.py
rename to tests/extmod/binascii_hexlify.py
index 3c266fb6cc08c..d06029aabaffb 100644
--- a/tests/extmod/ubinascii_hexlify.py
+++ b/tests/extmod/binascii_hexlify.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        import ubinascii as binascii
-    except ImportError:
-        import binascii
+    import binascii
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ubinascii_unhexlify.py b/tests/extmod/binascii_unhexlify.py
similarity index 81%
rename from tests/extmod/ubinascii_unhexlify.py
rename to tests/extmod/binascii_unhexlify.py
index 2c3598ab98ec3..bb663bc5b0c0d 100644
--- a/tests/extmod/ubinascii_unhexlify.py
+++ b/tests/extmod/binascii_unhexlify.py
@@ -1,8 +1,5 @@
 try:
-    try:
-        import ubinascii as binascii
-    except ImportError:
-        import binascii
+    import binascii
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/btree1.py b/tests/extmod/btree1.py
index 876bce4f8757a..d142a370f4d8c 100644
--- a/tests/extmod/btree1.py
+++ b/tests/extmod/btree1.py
@@ -1,13 +1,13 @@
 try:
     import btree
-    import uio
-    import uerrno
+    import io
+    import errno
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 # f = open("_test.db", "w+b")
-f = uio.BytesIO()
+f = io.BytesIO()
 db = btree.open(f, pagesize=512)
 
 mv = memoryview(b"bar1foo1")
@@ -68,7 +68,7 @@
 try:
     db.seq(b"foo1")
 except OSError as e:
-    print(e.errno == uerrno.EINVAL)
+    print(e.errno == errno.EINVAL)
 
 print(list(db.keys()))
 print(list(db.values()))
diff --git a/tests/extmod/btree_error.py b/tests/extmod/btree_error.py
index b64769e8840bf..2dd0d137a00e6 100644
--- a/tests/extmod/btree_error.py
+++ b/tests/extmod/btree_error.py
@@ -1,15 +1,15 @@
 # Test that errno's propagate correctly through btree module.
 
 try:
-    import btree, uio, uerrno
+    import btree, io, errno
 
-    uio.IOBase
+    io.IOBase
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
 
-class Device(uio.IOBase):
+class Device(io.IOBase):
     def __init__(self, read_ret=0, ioctl_ret=0):
         self.read_ret = read_ret
         self.ioctl_ret = ioctl_ret
@@ -25,18 +25,24 @@ def ioctl(self, cmd, arg):
 
 # Invalid pagesize; errno comes from btree library
 try:
+    import btree, io, errno
+
     db = btree.open(Device(), pagesize=511)
 except OSError as er:
-    print("OSError", er.errno == uerrno.EINVAL)
+    print("OSError", er.errno == errno.EINVAL)
 
 # Valid pagesize, device returns error on read; errno comes from Device.readinto
 try:
+    import btree, io, errno
+
     db = btree.open(Device(-1000), pagesize=512)
 except OSError as er:
     print(repr(er))
 
 # Valid pagesize, device returns error on seek; errno comes from Device.ioctl
 try:
+    import btree, io, errno
+
     db = btree.open(Device(0, -1001), pagesize=512)
 except OSError as er:
     print(repr(er))
diff --git a/tests/extmod/btree_gc.py b/tests/extmod/btree_gc.py
index 1845aa064095f..c5274eb4896cc 100644
--- a/tests/extmod/btree_gc.py
+++ b/tests/extmod/btree_gc.py
@@ -1,7 +1,7 @@
 # Test btree interaction with the garbage collector.
 
 try:
-    import btree, uio, gc
+    import btree, io, gc
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -9,7 +9,7 @@
 N = 80
 
 # Create a BytesIO but don't keep a reference to it.
-db = btree.open(uio.BytesIO(), pagesize=512)
+db = btree.open(io.BytesIO(), pagesize=512)
 
 # Overwrite lots of the Python stack to make sure no reference to the BytesIO remains.
 x = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
diff --git a/tests/extmod/ucryptolib_aes128_cbc.py b/tests/extmod/cryptolib_aes128_cbc.py
similarity index 90%
rename from tests/extmod/ucryptolib_aes128_cbc.py
rename to tests/extmod/cryptolib_aes128_cbc.py
index d861d2c6bf47c..ef6d45368561a 100644
--- a/tests/extmod/ucryptolib_aes128_cbc.py
+++ b/tests/extmod/cryptolib_aes128_cbc.py
@@ -4,7 +4,7 @@
     aes = AES.new
 except ImportError:
     try:
-        from ucryptolib import aes
+        from cryptolib import aes
     except ImportError:
         print("SKIP")
         raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes128_cbc.py.exp b/tests/extmod/cryptolib_aes128_cbc.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes128_cbc.py.exp
rename to tests/extmod/cryptolib_aes128_cbc.py.exp
diff --git a/tests/extmod/ucryptolib_aes128_ctr.py b/tests/extmod/cryptolib_aes128_ctr.py
similarity index 94%
rename from tests/extmod/ucryptolib_aes128_ctr.py
rename to tests/extmod/cryptolib_aes128_ctr.py
index 538d9606e9ed9..b5066fb7b4817 100644
--- a/tests/extmod/ucryptolib_aes128_ctr.py
+++ b/tests/extmod/cryptolib_aes128_ctr.py
@@ -1,5 +1,5 @@
 try:
-    from ucryptolib import aes
+    from cryptolib import aes
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes128_ctr.py.exp b/tests/extmod/cryptolib_aes128_ctr.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes128_ctr.py.exp
rename to tests/extmod/cryptolib_aes128_ctr.py.exp
diff --git a/tests/extmod/ucryptolib_aes128_ecb.py b/tests/extmod/cryptolib_aes128_ecb.py
similarity index 89%
rename from tests/extmod/ucryptolib_aes128_ecb.py
rename to tests/extmod/cryptolib_aes128_ecb.py
index 5c0e179986822..d1e77d326d027 100644
--- a/tests/extmod/ucryptolib_aes128_ecb.py
+++ b/tests/extmod/cryptolib_aes128_ecb.py
@@ -4,7 +4,7 @@
     aes = AES.new
 except ImportError:
     try:
-        from ucryptolib import aes
+        from cryptolib import aes
     except ImportError:
         print("SKIP")
         raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes128_ecb.py.exp b/tests/extmod/cryptolib_aes128_ecb.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes128_ecb.py.exp
rename to tests/extmod/cryptolib_aes128_ecb.py.exp
diff --git a/tests/extmod/ucryptolib_aes128_ecb_enc.py b/tests/extmod/cryptolib_aes128_ecb_enc.py
similarity index 91%
rename from tests/extmod/ucryptolib_aes128_ecb_enc.py
rename to tests/extmod/cryptolib_aes128_ecb_enc.py
index 1d4484b0bc11e..1bc973e22d6d6 100644
--- a/tests/extmod/ucryptolib_aes128_ecb_enc.py
+++ b/tests/extmod/cryptolib_aes128_ecb_enc.py
@@ -7,7 +7,7 @@
     aes = AES.new
 except ImportError:
     try:
-        from ucryptolib import aes
+        from cryptolib import aes
     except ImportError:
         print("SKIP")
         raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes128_ecb_enc.py.exp b/tests/extmod/cryptolib_aes128_ecb_enc.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes128_ecb_enc.py.exp
rename to tests/extmod/cryptolib_aes128_ecb_enc.py.exp
diff --git a/tests/extmod/ucryptolib_aes128_ecb_inpl.py b/tests/extmod/cryptolib_aes128_ecb_inpl.py
similarity index 90%
rename from tests/extmod/ucryptolib_aes128_ecb_inpl.py
rename to tests/extmod/cryptolib_aes128_ecb_inpl.py
index 88ccb02daf265..826f95ced87df 100644
--- a/tests/extmod/ucryptolib_aes128_ecb_inpl.py
+++ b/tests/extmod/cryptolib_aes128_ecb_inpl.py
@@ -1,6 +1,6 @@
 # Inplace operations (input and output buffer is the same)
 try:
-    from ucryptolib import aes
+    from cryptolib import aes
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes128_ecb_inpl.py.exp b/tests/extmod/cryptolib_aes128_ecb_inpl.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes128_ecb_inpl.py.exp
rename to tests/extmod/cryptolib_aes128_ecb_inpl.py.exp
diff --git a/tests/extmod/ucryptolib_aes128_ecb_into.py b/tests/extmod/cryptolib_aes128_ecb_into.py
similarity index 90%
rename from tests/extmod/ucryptolib_aes128_ecb_into.py
rename to tests/extmod/cryptolib_aes128_ecb_into.py
index ff832d7ef3b07..f90dfcf272703 100644
--- a/tests/extmod/ucryptolib_aes128_ecb_into.py
+++ b/tests/extmod/cryptolib_aes128_ecb_into.py
@@ -1,6 +1,6 @@
 # Operations with pre-allocated output buffer
 try:
-    from ucryptolib import aes
+    from cryptolib import aes
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes128_ecb_into.py.exp b/tests/extmod/cryptolib_aes128_ecb_into.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes128_ecb_into.py.exp
rename to tests/extmod/cryptolib_aes128_ecb_into.py.exp
diff --git a/tests/extmod/ucryptolib_aes256_cbc.py b/tests/extmod/cryptolib_aes256_cbc.py
similarity index 90%
rename from tests/extmod/ucryptolib_aes256_cbc.py
rename to tests/extmod/cryptolib_aes256_cbc.py
index c01846f199dec..91a9cd7609a2f 100644
--- a/tests/extmod/ucryptolib_aes256_cbc.py
+++ b/tests/extmod/cryptolib_aes256_cbc.py
@@ -4,7 +4,7 @@
     aes = AES.new
 except ImportError:
     try:
-        from ucryptolib import aes
+        from cryptolib import aes
     except ImportError:
         print("SKIP")
         raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes256_cbc.py.exp b/tests/extmod/cryptolib_aes256_cbc.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes256_cbc.py.exp
rename to tests/extmod/cryptolib_aes256_cbc.py.exp
diff --git a/tests/extmod/ucryptolib_aes256_ecb.py b/tests/extmod/cryptolib_aes256_ecb.py
similarity index 89%
rename from tests/extmod/ucryptolib_aes256_ecb.py
rename to tests/extmod/cryptolib_aes256_ecb.py
index 0760063c14c48..ed040bc15ba19 100644
--- a/tests/extmod/ucryptolib_aes256_ecb.py
+++ b/tests/extmod/cryptolib_aes256_ecb.py
@@ -4,7 +4,7 @@
     aes = AES.new
 except ImportError:
     try:
-        from ucryptolib import aes
+        from cryptolib import aes
     except ImportError:
         print("SKIP")
         raise SystemExit
diff --git a/tests/extmod/ucryptolib_aes256_ecb.py.exp b/tests/extmod/cryptolib_aes256_ecb.py.exp
similarity index 100%
rename from tests/extmod/ucryptolib_aes256_ecb.py.exp
rename to tests/extmod/cryptolib_aes256_ecb.py.exp
diff --git a/tests/extmod/framebuf16.py b/tests/extmod/framebuf16.py
index cd7f5ec015836..9f373c331e51f 100644
--- a/tests/extmod/framebuf16.py
+++ b/tests/extmod/framebuf16.py
@@ -1,11 +1,11 @@
 try:
-    import framebuf, usys
+    import framebuf, sys
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 # This test and its .exp file is based on a little-endian architecture.
-if usys.byteorder != "little":
+if sys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/framebuf_palette.py b/tests/extmod/framebuf_palette.py
index f5b15fda7394b..ad1af2cf4c46d 100644
--- a/tests/extmod/framebuf_palette.py
+++ b/tests/extmod/framebuf_palette.py
@@ -1,6 +1,6 @@
 # Test blit between different color spaces
 try:
-    import framebuf, usys
+    import framebuf, sys
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/framebuf_subclass.py b/tests/extmod/framebuf_subclass.py
index 4cd9ea4eb5fa3..162839e8bf682 100644
--- a/tests/extmod/framebuf_subclass.py
+++ b/tests/extmod/framebuf_subclass.py
@@ -1,13 +1,13 @@
 # test subclassing framebuf.FrameBuffer
 
 try:
-    import framebuf, usys
+    import framebuf, sys
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 # This test and its .exp file is based on a little-endian architecture.
-if usys.byteorder != "little":
+if sys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uhashlib_final.py b/tests/extmod/hashlib_final.py
similarity index 92%
rename from tests/extmod/uhashlib_final.py
rename to tests/extmod/hashlib_final.py
index f562cc17807ec..c8fdac92346c5 100644
--- a/tests/extmod/uhashlib_final.py
+++ b/tests/extmod/hashlib_final.py
@@ -1,12 +1,12 @@
 try:
-    import uhashlib
+    import hashlib
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 
 for algo_name in ("md5", "sha1", "sha256"):
-    algo = getattr(uhashlib, algo_name, None)
+    algo = getattr(hashlib, algo_name, None)
     if not algo:
         continue
 
diff --git a/tests/extmod/uhashlib_final.py.exp b/tests/extmod/hashlib_final.py.exp
similarity index 100%
rename from tests/extmod/uhashlib_final.py.exp
rename to tests/extmod/hashlib_final.py.exp
diff --git a/tests/extmod/hashlib_md5.py b/tests/extmod/hashlib_md5.py
new file mode 100644
index 0000000000000..5f925fc97d02e
--- /dev/null
+++ b/tests/extmod/hashlib_md5.py
@@ -0,0 +1,18 @@
+try:
+    import hashlib
+except ImportError:
+    # This is neither uPy, nor cPy, so must be uPy with
+    # hashlib module disabled.
+    print("SKIP")
+    raise SystemExit
+
+try:
+    hashlib.md5
+except AttributeError:
+    # MD5 is only available on some ports
+    print("SKIP")
+    raise SystemExit
+
+md5 = hashlib.md5(b"hello")
+md5.update(b"world")
+print(md5.digest())
diff --git a/tests/extmod/hashlib_sha1.py b/tests/extmod/hashlib_sha1.py
new file mode 100644
index 0000000000000..af23033a591f2
--- /dev/null
+++ b/tests/extmod/hashlib_sha1.py
@@ -0,0 +1,18 @@
+try:
+    import hashlib
+except ImportError:
+    # This is neither uPy, nor cPy, so must be uPy with
+    # hashlib module disabled.
+    print("SKIP")
+    raise SystemExit
+
+try:
+    hashlib.sha1
+except AttributeError:
+    # SHA1 is only available on some ports
+    print("SKIP")
+    raise SystemExit
+
+sha1 = hashlib.sha1(b"hello")
+sha1.update(b"world")
+print(sha1.digest())
diff --git a/tests/extmod/uhashlib_sha256.py b/tests/extmod/hashlib_sha256.py
similarity index 72%
rename from tests/extmod/uhashlib_sha256.py
rename to tests/extmod/hashlib_sha256.py
index 2e6df7df13202..f0d07e1482cf4 100644
--- a/tests/extmod/uhashlib_sha256.py
+++ b/tests/extmod/hashlib_sha256.py
@@ -1,13 +1,10 @@
 try:
-    import uhashlib as hashlib
+    import hashlib
 except ImportError:
-    try:
-        import hashlib
-    except ImportError:
-        # This is neither uPy, nor cPy, so must be uPy with
-        # uhashlib module disabled.
-        print("SKIP")
-        raise SystemExit
+    # This is neither uPy, nor cPy, so must be uPy with
+    # hashlib module disabled.
+    print("SKIP")
+    raise SystemExit
 
 
 h = hashlib.sha256()
diff --git a/tests/extmod/uheapq1.py b/tests/extmod/heapq1.py
similarity index 78%
rename from tests/extmod/uheapq1.py
rename to tests/extmod/heapq1.py
index a470bb6f71b13..efe208dac3e84 100644
--- a/tests/extmod/uheapq1.py
+++ b/tests/extmod/heapq1.py
@@ -1,11 +1,8 @@
 try:
-    import uheapq as heapq
-except:
-    try:
-        import heapq
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    import heapq
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 try:
     heapq.heappop([])
diff --git a/tests/extmod/ujson_dump.py b/tests/extmod/json_dump.py
similarity index 69%
rename from tests/extmod/ujson_dump.py
rename to tests/extmod/json_dump.py
index feda8a47dda42..897d33cc81253 100644
--- a/tests/extmod/ujson_dump.py
+++ b/tests/extmod/json_dump.py
@@ -1,13 +1,9 @@
 try:
-    from uio import StringIO
-    import ujson as json
-except:
-    try:
-        from io import StringIO
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    from io import StringIO
+    import json
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 s = StringIO()
 json.dump(False, s)
diff --git a/tests/extmod/ujson_dump_iobase.py b/tests/extmod/json_dump_iobase.py
similarity index 71%
rename from tests/extmod/ujson_dump_iobase.py
rename to tests/extmod/json_dump_iobase.py
index 7ecf23afb6539..94d317b87968f 100644
--- a/tests/extmod/ujson_dump_iobase.py
+++ b/tests/extmod/json_dump_iobase.py
@@ -1,14 +1,10 @@
-# test ujson.dump in combination with uio.IOBase
+# test json.dump in combination with io.IOBase
 
 try:
-    import uio as io
-    import ujson as json
+    import io, json
 except ImportError:
-    try:
-        import io, json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 if not hasattr(io, "IOBase"):
     print("SKIP")
diff --git a/tests/extmod/ujson_dump_separators.py b/tests/extmod/json_dump_separators.py
similarity index 86%
rename from tests/extmod/ujson_dump_separators.py
rename to tests/extmod/json_dump_separators.py
index e19b99a26d727..4f8e56dceb536 100644
--- a/tests/extmod/ujson_dump_separators.py
+++ b/tests/extmod/json_dump_separators.py
@@ -1,13 +1,9 @@
 try:
-    from uio import StringIO
-    import ujson as json
-except:
-    try:
-        from io import StringIO
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    from io import StringIO
+    import json
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 for sep in [
     None,
diff --git a/tests/extmod/ujson_dumps.py b/tests/extmod/json_dumps.py
similarity index 83%
rename from tests/extmod/ujson_dumps.py
rename to tests/extmod/json_dumps.py
index 251b2687557e5..16f144e44fc59 100644
--- a/tests/extmod/ujson_dumps.py
+++ b/tests/extmod/json_dumps.py
@@ -1,11 +1,8 @@
 try:
-    import ujson as json
+    import json
 except ImportError:
-    try:
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(json.dumps(False))
 print(json.dumps(True))
diff --git a/tests/extmod/json_dumps_extra.py b/tests/extmod/json_dumps_extra.py
new file mode 100644
index 0000000000000..9074416a99d93
--- /dev/null
+++ b/tests/extmod/json_dumps_extra.py
@@ -0,0 +1,9 @@
+# test uPy json behaviour that's not valid in CPy
+
+try:
+    import json
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+print(json.dumps(b"1234"))
diff --git a/tests/extmod/ujson_dumps_extra.py.exp b/tests/extmod/json_dumps_extra.py.exp
similarity index 100%
rename from tests/extmod/ujson_dumps_extra.py.exp
rename to tests/extmod/json_dumps_extra.py.exp
diff --git a/tests/extmod/json_dumps_float.py b/tests/extmod/json_dumps_float.py
new file mode 100644
index 0000000000000..25fbc5c512634
--- /dev/null
+++ b/tests/extmod/json_dumps_float.py
@@ -0,0 +1,8 @@
+try:
+    import json
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+print(json.dumps(1.2))
+print(json.dumps({1.5: "hi"}))
diff --git a/tests/extmod/json_dumps_ordereddict.py b/tests/extmod/json_dumps_ordereddict.py
new file mode 100644
index 0000000000000..e1fa2a659cbec
--- /dev/null
+++ b/tests/extmod/json_dumps_ordereddict.py
@@ -0,0 +1,8 @@
+try:
+    import json
+    from collections import OrderedDict
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+print(json.dumps(OrderedDict(((1, 2), (3, 4)))))
diff --git a/tests/extmod/ujson_dumps_separators.py b/tests/extmod/json_dumps_separators.py
similarity index 93%
rename from tests/extmod/ujson_dumps_separators.py
rename to tests/extmod/json_dumps_separators.py
index efb541fe8bfad..a3a9ec308f09d 100644
--- a/tests/extmod/ujson_dumps_separators.py
+++ b/tests/extmod/json_dumps_separators.py
@@ -1,11 +1,8 @@
 try:
-    import ujson as json
+    import json
 except ImportError:
-    try:
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 for sep in [
     None,
diff --git a/tests/extmod/json_load.py b/tests/extmod/json_load.py
new file mode 100644
index 0000000000000..b2c7733282a30
--- /dev/null
+++ b/tests/extmod/json_load.py
@@ -0,0 +1,11 @@
+try:
+    from io import StringIO
+    import json
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+print(json.load(StringIO("null")))
+print(json.load(StringIO('"abc\\u0064e"')))
+print(json.load(StringIO("[false, true, 1, -2]")))
+print(json.load(StringIO('{"a":true}')))
diff --git a/tests/extmod/ujson_loads.py b/tests/extmod/json_loads.py
similarity index 92%
rename from tests/extmod/ujson_loads.py
rename to tests/extmod/json_loads.py
index 2de9cdcbc1a8a..f9073c121e2ef 100644
--- a/tests/extmod/ujson_loads.py
+++ b/tests/extmod/json_loads.py
@@ -1,11 +1,8 @@
 try:
-    import ujson as json
+    import json
 except ImportError:
-    try:
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def my_print(o):
diff --git a/tests/extmod/ujson_loads_bytes.py b/tests/extmod/json_loads_bytes.py
similarity index 56%
rename from tests/extmod/ujson_loads_bytes.py
rename to tests/extmod/json_loads_bytes.py
index 3ee87bbcd582e..45cd0a35c5a99 100644
--- a/tests/extmod/ujson_loads_bytes.py
+++ b/tests/extmod/json_loads_bytes.py
@@ -1,13 +1,10 @@
 # test loading from bytes and bytearray (introduced in Python 3.6)
 
 try:
-    import ujson as json
+    import json
 except ImportError:
-    try:
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(json.loads(b"[1,2]"))
 print(json.loads(bytearray(b"[null]")))
diff --git a/tests/extmod/ujson_loads_bytes.py.exp b/tests/extmod/json_loads_bytes.py.exp
similarity index 100%
rename from tests/extmod/ujson_loads_bytes.py.exp
rename to tests/extmod/json_loads_bytes.py.exp
diff --git a/tests/extmod/ujson_loads_float.py b/tests/extmod/json_loads_float.py
similarity index 65%
rename from tests/extmod/ujson_loads_float.py
rename to tests/extmod/json_loads_float.py
index 842718f37de73..2a8402dc6a213 100644
--- a/tests/extmod/ujson_loads_float.py
+++ b/tests/extmod/json_loads_float.py
@@ -1,11 +1,8 @@
 try:
-    import ujson as json
+    import json
 except ImportError:
-    try:
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def my_print(o):
diff --git a/tests/extmod/machine1.py b/tests/extmod/machine1.py
index 0c7f8122f4ae4..90e6d17174fb3 100644
--- a/tests/extmod/machine1.py
+++ b/tests/extmod/machine1.py
@@ -1,10 +1,8 @@
 # test machine module
 
 try:
-    try:
-        import umachine as machine
-    except ImportError:
-        import machine
+    import machine
+
     machine.mem8
 except:
     print("SKIP")
diff --git a/tests/extmod/machine_pinbase.py b/tests/extmod/machine_pinbase.py
index 8bddd4bb70615..4c467c2d26e67 100644
--- a/tests/extmod/machine_pinbase.py
+++ b/tests/extmod/machine_pinbase.py
@@ -1,8 +1,6 @@
 try:
-    try:
-        import umachine as machine
-    except ImportError:
-        import machine
+    import machine
+
     machine.PinBase
 except:
     print("SKIP")
diff --git a/tests/extmod/machine_pulse.py b/tests/extmod/machine_pulse.py
index 65d15fb3513bf..c793134e19757 100644
--- a/tests/extmod/machine_pulse.py
+++ b/tests/extmod/machine_pulse.py
@@ -1,8 +1,6 @@
 try:
-    try:
-        import umachine as machine
-    except ImportError:
-        import machine
+    import machine
+
     machine.PinBase
     machine.time_pulse_us
 except:
diff --git a/tests/extmod/machine_signal.py b/tests/extmod/machine_signal.py
index 1ffdb5643605f..2f6332748d571 100644
--- a/tests/extmod/machine_signal.py
+++ b/tests/extmod/machine_signal.py
@@ -1,10 +1,8 @@
 # test machine.Signal class
 
 try:
-    try:
-        import umachine as machine
-    except ImportError:
-        import machine
+    import machine
+
     machine.PinBase
     machine.Signal
 except:
diff --git a/tests/extmod/machine_timer.py b/tests/extmod/machine_timer.py
index c9a47c402583e..1be01d184d442 100644
--- a/tests/extmod/machine_timer.py
+++ b/tests/extmod/machine_timer.py
@@ -1,7 +1,7 @@
 # test machine.Timer
 
 try:
-    import utime, umachine as machine
+    import time, machine as machine
 
     machine.Timer
 except:
@@ -29,10 +29,10 @@
 
 # create one-shot timer with callback and wait for it to print (should be just once)
 t = machine.Timer(period=1, mode=machine.Timer.ONE_SHOT, callback=lambda t: print("one-shot"))
-utime.sleep_ms(5)
+time.sleep_ms(5)
 t.deinit()
 
 # create periodic timer with callback and wait for it to print
 t = machine.Timer(period=4, mode=machine.Timer.PERIODIC, callback=lambda t: print("periodic"))
-utime.sleep_ms(14)
+time.sleep_ms(14)
 t.deinit()
diff --git a/tests/extmod/urandom_basic.py b/tests/extmod/random_basic.py
similarity index 81%
rename from tests/extmod/urandom_basic.py
rename to tests/extmod/random_basic.py
index f7f5a6d691145..7cb992fede2e8 100644
--- a/tests/extmod/urandom_basic.py
+++ b/tests/extmod/random_basic.py
@@ -1,11 +1,8 @@
 try:
-    import urandom as random
+    import random
 except ImportError:
-    try:
-        import random
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # check getrandbits returns a value within the bit range
 for b in (1, 2, 3, 4, 16, 32):
diff --git a/tests/extmod/urandom_basic.py.exp b/tests/extmod/random_basic.py.exp
similarity index 100%
rename from tests/extmod/urandom_basic.py.exp
rename to tests/extmod/random_basic.py.exp
diff --git a/tests/extmod/urandom_extra.py b/tests/extmod/random_extra.py
similarity index 89%
rename from tests/extmod/urandom_extra.py
rename to tests/extmod/random_extra.py
index 78e17379dc68e..aa05053377b09 100644
--- a/tests/extmod/urandom_extra.py
+++ b/tests/extmod/random_extra.py
@@ -1,11 +1,8 @@
 try:
-    import urandom as random
+    import random
 except ImportError:
-    try:
-        import random
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     random.randint
diff --git a/tests/extmod/urandom_extra_float.py b/tests/extmod/random_extra_float.py
similarity index 72%
rename from tests/extmod/urandom_extra_float.py
rename to tests/extmod/random_extra_float.py
index 65918da136945..3b37ed8dcef2f 100644
--- a/tests/extmod/urandom_extra_float.py
+++ b/tests/extmod/random_extra_float.py
@@ -1,11 +1,8 @@
 try:
-    import urandom as random
+    import random
 except ImportError:
-    try:
-        import random
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     random.randint
diff --git a/tests/extmod/urandom_seed_default.py b/tests/extmod/random_seed_default.py
similarity index 69%
rename from tests/extmod/urandom_seed_default.py
rename to tests/extmod/random_seed_default.py
index a032b9362b701..2fb16282ca387 100644
--- a/tests/extmod/urandom_seed_default.py
+++ b/tests/extmod/random_seed_default.py
@@ -1,13 +1,10 @@
-# test urandom.seed() without any arguments
+# test random.seed() without any arguments
 
 try:
-    import urandom as random
+    import random
 except ImportError:
-    try:
-        import random
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     random.seed()
diff --git a/tests/extmod/ure1.py b/tests/extmod/re1.py
similarity index 95%
rename from tests/extmod/ure1.py
rename to tests/extmod/re1.py
index 2bdf2d0cfb4f3..7e3839ae24fab 100644
--- a/tests/extmod/ure1.py
+++ b/tests/extmod/re1.py
@@ -1,11 +1,8 @@
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 r = re.compile(".+")
 m = r.match("abc")
diff --git a/tests/extmod/ure_debug.py b/tests/extmod/re_debug.py
similarity index 65%
rename from tests/extmod/ure_debug.py
rename to tests/extmod/re_debug.py
index 7a07ede2d4373..0f4c95551f9da 100644
--- a/tests/extmod/ure_debug.py
+++ b/tests/extmod/re_debug.py
@@ -1,10 +1,10 @@
 # test printing debugging info when compiling
 try:
-    import ure
+    import re
 
-    ure.DEBUG
+    re.DEBUG
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
-ure.compile("^a|b[0-9]\w$", ure.DEBUG)
+re.compile("^a|b[0-9]\w$", re.DEBUG)
diff --git a/tests/extmod/ure_debug.py.exp b/tests/extmod/re_debug.py.exp
similarity index 100%
rename from tests/extmod/ure_debug.py.exp
rename to tests/extmod/re_debug.py.exp
diff --git a/tests/extmod/ure_error.py b/tests/extmod/re_error.py
similarity index 73%
rename from tests/extmod/ure_error.py
rename to tests/extmod/re_error.py
index 52a96b7c0385a..f61d0913289e1 100644
--- a/tests/extmod/ure_error.py
+++ b/tests/extmod/re_error.py
@@ -1,13 +1,10 @@
 # test errors in regex
 
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def test_re(r):
diff --git a/tests/extmod/ure_group.py b/tests/extmod/re_group.py
similarity index 81%
rename from tests/extmod/ure_group.py
rename to tests/extmod/re_group.py
index 41425dd62347f..06c9ccfb2dea0 100644
--- a/tests/extmod/ure_group.py
+++ b/tests/extmod/re_group.py
@@ -1,13 +1,10 @@
 # test groups, and nested groups
 
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def print_groups(match):
diff --git a/tests/extmod/ure_groups.py b/tests/extmod/re_groups.py
similarity index 81%
rename from tests/extmod/ure_groups.py
rename to tests/extmod/re_groups.py
index 7da072a920658..840a4b1af1378 100644
--- a/tests/extmod/ure_groups.py
+++ b/tests/extmod/re_groups.py
@@ -1,13 +1,10 @@
 # test match.groups()
 
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     m = re.match(".", "a")
diff --git a/tests/extmod/ure_limit.py b/tests/extmod/re_limit.py
similarity index 88%
rename from tests/extmod/ure_limit.py
rename to tests/extmod/re_limit.py
index 99c6a818e8577..e0531afbdc852 100644
--- a/tests/extmod/ure_limit.py
+++ b/tests/extmod/re_limit.py
@@ -1,7 +1,7 @@
-# Test overflow in ure.compile output code.
+# Test overflow in re.compile output code.
 
 try:
-    import ure as re
+    import re
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ure_limit.py.exp b/tests/extmod/re_limit.py.exp
similarity index 100%
rename from tests/extmod/ure_limit.py.exp
rename to tests/extmod/re_limit.py.exp
diff --git a/tests/extmod/ure_namedclass.py b/tests/extmod/re_namedclass.py
similarity index 85%
rename from tests/extmod/ure_namedclass.py
rename to tests/extmod/re_namedclass.py
index 4afc09dc0abe1..442172f4ab0c7 100644
--- a/tests/extmod/ure_namedclass.py
+++ b/tests/extmod/re_namedclass.py
@@ -1,13 +1,10 @@
 # test named char classes
 
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def print_groups(match):
diff --git a/tests/extmod/ure_span.py b/tests/extmod/re_span.py
similarity index 85%
rename from tests/extmod/ure_span.py
rename to tests/extmod/re_span.py
index 03a3fef9f3d1a..d00ef957a1192 100644
--- a/tests/extmod/ure_span.py
+++ b/tests/extmod/re_span.py
@@ -1,13 +1,10 @@
 # test match.span(), and nested spans
 
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     m = re.match(".", "a")
diff --git a/tests/extmod/ure_split.py b/tests/extmod/re_split.py
similarity index 82%
rename from tests/extmod/ure_split.py
rename to tests/extmod/re_split.py
index 7e6ef3990f4cd..7769e1a121d24 100644
--- a/tests/extmod/ure_split.py
+++ b/tests/extmod/re_split.py
@@ -1,11 +1,8 @@
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 r = re.compile(" ")
 s = r.split("a b c foobar")
diff --git a/tests/extmod/ure_split_empty.py b/tests/extmod/re_split_empty.py
similarity index 95%
rename from tests/extmod/ure_split_empty.py
rename to tests/extmod/re_split_empty.py
index 76ce97ea67d48..bc17aa8d78365 100644
--- a/tests/extmod/ure_split_empty.py
+++ b/tests/extmod/re_split_empty.py
@@ -5,7 +5,7 @@
 # splitting as soon as an empty match is found.
 
 try:
-    import ure as re
+    import re
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ure_split_empty.py.exp b/tests/extmod/re_split_empty.py.exp
similarity index 100%
rename from tests/extmod/ure_split_empty.py.exp
rename to tests/extmod/re_split_empty.py.exp
diff --git a/tests/extmod/ure_split_notimpl.py b/tests/extmod/re_split_notimpl.py
similarity index 89%
rename from tests/extmod/ure_split_notimpl.py
rename to tests/extmod/re_split_notimpl.py
index 51bad791efb88..7ddec9fa03af3 100644
--- a/tests/extmod/ure_split_notimpl.py
+++ b/tests/extmod/re_split_notimpl.py
@@ -1,5 +1,5 @@
 try:
-    import ure as re
+    import re
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ure_split_notimpl.py.exp b/tests/extmod/re_split_notimpl.py.exp
similarity index 100%
rename from tests/extmod/ure_split_notimpl.py.exp
rename to tests/extmod/re_split_notimpl.py.exp
diff --git a/tests/extmod/re_stack_overflow.py b/tests/extmod/re_stack_overflow.py
new file mode 100644
index 0000000000000..90fb8296b12b5
--- /dev/null
+++ b/tests/extmod/re_stack_overflow.py
@@ -0,0 +1,10 @@
+try:
+    import re
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    re.match("(a*)*", "aaa")
+except RuntimeError:
+    print("RuntimeError")
diff --git a/tests/extmod/ure_stack_overflow.py.exp b/tests/extmod/re_stack_overflow.py.exp
similarity index 100%
rename from tests/extmod/ure_stack_overflow.py.exp
rename to tests/extmod/re_stack_overflow.py.exp
diff --git a/tests/extmod/ure_sub.py b/tests/extmod/re_sub.py
similarity index 93%
rename from tests/extmod/ure_sub.py
rename to tests/extmod/re_sub.py
index 806c38957627e..229c0e63eed3d 100644
--- a/tests/extmod/ure_sub.py
+++ b/tests/extmod/re_sub.py
@@ -1,11 +1,8 @@
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     re.sub
diff --git a/tests/extmod/ure_sub_unmatched.py b/tests/extmod/re_sub_unmatched.py
similarity index 71%
rename from tests/extmod/ure_sub_unmatched.py
rename to tests/extmod/re_sub_unmatched.py
index d6312bfc2cbc2..c238a7ed64bb2 100644
--- a/tests/extmod/ure_sub_unmatched.py
+++ b/tests/extmod/re_sub_unmatched.py
@@ -1,13 +1,10 @@
 # test re.sub with unmatched groups, behaviour changed in CPython 3.5
 
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     re.sub
diff --git a/tests/extmod/ure_sub_unmatched.py.exp b/tests/extmod/re_sub_unmatched.py.exp
similarity index 100%
rename from tests/extmod/ure_sub_unmatched.py.exp
rename to tests/extmod/re_sub_unmatched.py.exp
diff --git a/tests/extmod/uselect_poll_basic.py b/tests/extmod/select_poll_basic.py
similarity index 69%
rename from tests/extmod/uselect_poll_basic.py
rename to tests/extmod/select_poll_basic.py
index 97fbd6fd158b8..b36e16f0186de 100644
--- a/tests/extmod/uselect_poll_basic.py
+++ b/tests/extmod/select_poll_basic.py
@@ -1,13 +1,10 @@
 try:
-    import usocket as socket, uselect as select, uerrno as errno
-except ImportError:
-    try:
-        import socket, select, errno
-
-        select.poll  # Raises AttributeError for CPython implementations without poll()
-    except (ImportError, AttributeError):
-        print("SKIP")
-        raise SystemExit
+    import socket, select, errno
+
+    select.poll  # Raises AttributeError for CPython implementations without poll()
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 
 poller = select.poll()
diff --git a/tests/extmod/uselect_poll_udp.py b/tests/extmod/select_poll_udp.py
similarity index 66%
rename from tests/extmod/uselect_poll_udp.py
rename to tests/extmod/select_poll_udp.py
index 2a56a122b5f21..336f987c120ff 100644
--- a/tests/extmod/uselect_poll_udp.py
+++ b/tests/extmod/select_poll_udp.py
@@ -1,15 +1,12 @@
 # test select.poll on UDP sockets
 
 try:
-    import usocket as socket, uselect as select
-except ImportError:
-    try:
-        import socket, select
+    import socket, select
 
-        select.poll  # Raises AttributeError for CPython implementations without poll()
-    except (ImportError, AttributeError):
-        print("SKIP")
-        raise SystemExit
+    select.poll  # Raises AttributeError for CPython implementations without poll()
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 
 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
diff --git a/tests/extmod/usocket_tcp_basic.py b/tests/extmod/socket_tcp_basic.py
similarity index 60%
rename from tests/extmod/usocket_tcp_basic.py
rename to tests/extmod/socket_tcp_basic.py
index c2fe8cd14cccd..ebd30f7862cc8 100644
--- a/tests/extmod/usocket_tcp_basic.py
+++ b/tests/extmod/socket_tcp_basic.py
@@ -1,13 +1,10 @@
 # Test basic, stand-alone TCP socket functionality
 
 try:
-    import usocket as socket, uerrno as errno
+    import socket, errno
 except ImportError:
-    try:
-        import socket, errno
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 # recv() on a fresh socket should raise ENOTCONN
 s = socket.socket()
diff --git a/tests/extmod/usocket_udp_nonblock.py b/tests/extmod/socket_udp_nonblock.py
similarity index 63%
rename from tests/extmod/usocket_udp_nonblock.py
rename to tests/extmod/socket_udp_nonblock.py
index bc560de142e0c..f7ce5f34448ea 100644
--- a/tests/extmod/usocket_udp_nonblock.py
+++ b/tests/extmod/socket_udp_nonblock.py
@@ -1,13 +1,10 @@
 # test non-blocking UDP sockets
 
 try:
-    import usocket as socket, uerrno as errno
+    import socket, errno
 except ImportError:
-    try:
-        import socket, errno
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
diff --git a/tests/extmod/ussl_basic.py b/tests/extmod/ssl_basic.py
similarity index 96%
rename from tests/extmod/ussl_basic.py
rename to tests/extmod/ssl_basic.py
index dd3b6f0b91e94..d035798c98643 100644
--- a/tests/extmod/ussl_basic.py
+++ b/tests/extmod/ssl_basic.py
@@ -1,8 +1,8 @@
 # very basic test of ssl module, just to test the methods exist
 
 try:
-    import uio as io
-    import ussl as ssl
+    import io
+    import ssl
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ussl_basic.py.exp b/tests/extmod/ssl_basic.py.exp
similarity index 100%
rename from tests/extmod/ussl_basic.py.exp
rename to tests/extmod/ssl_basic.py.exp
diff --git a/tests/extmod/ussl_keycert.py b/tests/extmod/ssl_keycert.py
similarity index 94%
rename from tests/extmod/ussl_keycert.py
rename to tests/extmod/ssl_keycert.py
index 87a40a1e552b5..53f064fdaff48 100644
--- a/tests/extmod/ussl_keycert.py
+++ b/tests/extmod/ssl_keycert.py
@@ -1,8 +1,8 @@
-# Test ussl with key/cert passed in
+# Test ssl with key/cert passed in
 
 try:
-    import uio as io
-    import ussl as ssl
+    import io
+    import ssl
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ussl_keycert.py.exp b/tests/extmod/ssl_keycert.py.exp
similarity index 100%
rename from tests/extmod/ussl_keycert.py.exp
rename to tests/extmod/ssl_keycert.py.exp
diff --git a/tests/extmod/ussl_poll.py b/tests/extmod/ssl_poll.py
similarity index 94%
rename from tests/extmod/ussl_poll.py
rename to tests/extmod/ssl_poll.py
index 8080ec5112248..347e5f7d37a42 100644
--- a/tests/extmod/ussl_poll.py
+++ b/tests/extmod/ssl_poll.py
@@ -1,8 +1,8 @@
 try:
-    import uselect
-    import ussl
+    import select
+    import ssl
     import io
-    import ubinascii as binascii
+    import binascii
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -121,9 +121,9 @@ def assert_raises(cb, *args, **kwargs):
 
 client_io.block_reads = True
 client_io.block_writes = True
-client_sock = ussl.wrap_socket(client_io, do_handshake=False)
+client_sock = ssl.wrap_socket(client_io, do_handshake=False)
 
-server_sock = ussl.wrap_socket(server_io, key=key, cert=cert, server_side=True, do_handshake=False)
+server_sock = ssl.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:
@@ -175,7 +175,7 @@ def assert_raises(cb, *args, **kwargs):
 
 # Polling on a closed socket errors out:
 client_io, _ = _Pipe.new_pair()
-client_sock = ussl.wrap_socket(client_io, do_handshake=False)
+client_sock = ssl.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
@@ -184,7 +184,7 @@ def assert_raises(cb, *args, **kwargs):
 
 # Errors propagates to poll:
 client_io, server_io = _Pipe.new_pair()
-client_sock = ussl.wrap_socket(client_io, do_handshake=False)
+client_sock = ssl.wrap_socket(client_io, do_handshake=False)
 
 # The server returns garbage:
 server_io.write(b"fooba")  # Needs to be exactly 5 bytes
diff --git a/tests/extmod/ussl_poll.py.exp b/tests/extmod/ssl_poll.py.exp
similarity index 100%
rename from tests/extmod/ussl_poll.py.exp
rename to tests/extmod/ssl_poll.py.exp
diff --git a/tests/extmod/ticks_add.py b/tests/extmod/ticks_add.py
index 2f1ba6c8109de..4f465f3cfbac5 100644
--- a/tests/extmod/ticks_add.py
+++ b/tests/extmod/ticks_add.py
@@ -1,5 +1,5 @@
 try:
-    from utime import ticks_diff, ticks_add
+    from time import ticks_diff, ticks_add
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ticks_diff.py b/tests/extmod/ticks_diff.py
index de45a557afcf2..b2445f0d62454 100644
--- a/tests/extmod/ticks_diff.py
+++ b/tests/extmod/ticks_diff.py
@@ -1,5 +1,5 @@
 try:
-    from utime import ticks_diff, ticks_add
+    from time import ticks_diff, ticks_add
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/time_ms_us.py b/tests/extmod/time_ms_us.py
index ac2ed8be27e5a..e26c6e677a910 100644
--- a/tests/extmod/time_ms_us.py
+++ b/tests/extmod/time_ms_us.py
@@ -1,23 +1,23 @@
 try:
-    import utime
+    import time
 
-    utime.sleep_ms, utime.sleep_us, utime.ticks_diff, utime.ticks_ms, utime.ticks_us, utime.ticks_cpu
+    time.sleep_ms, time.sleep_us, time.ticks_diff, time.ticks_ms, time.ticks_us, time.ticks_cpu
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
-utime.sleep_ms(1)
-utime.sleep_us(1)
+time.sleep_ms(1)
+time.sleep_us(1)
 
-t0 = utime.ticks_ms()
-t1 = utime.ticks_ms()
-print(0 <= utime.ticks_diff(t1, t0) <= 1)
+t0 = time.ticks_ms()
+t1 = time.ticks_ms()
+print(0 <= time.ticks_diff(t1, t0) <= 1)
 
-t0 = utime.ticks_us()
-t1 = utime.ticks_us()
-print(0 <= utime.ticks_diff(t1, t0) <= 500)
+t0 = time.ticks_us()
+t1 = time.ticks_us()
+print(0 <= time.ticks_diff(t1, t0) <= 500)
 
 # ticks_cpu may not be implemented, at least make sure it doesn't decrease
-t0 = utime.ticks_cpu()
-t1 = utime.ticks_cpu()
-print(utime.ticks_diff(t1, t0) >= 0)
+t0 = time.ticks_cpu()
+t1 = time.ticks_cpu()
+print(time.ticks_diff(t1, t0) >= 0)
diff --git a/tests/extmod/utime_res.py b/tests/extmod/time_res.py
similarity index 80%
rename from tests/extmod/utime_res.py
rename to tests/extmod/time_res.py
index 4b624334836f1..548bef1f1747c 100644
--- a/tests/extmod/utime_res.py
+++ b/tests/extmod/time_res.py
@@ -1,18 +1,18 @@
-# test utime resolutions
+# test time resolutions
 
 try:
-    import utime
+    import time
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 
 def gmtime_time():
-    return utime.gmtime(utime.time())
+    return time.gmtime(time.time())
 
 
 def localtime_time():
-    return utime.localtime(utime.time())
+    return time.localtime(time.time())
 
 
 def test():
@@ -32,12 +32,12 @@ def test():
 
     # 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)
+    end_time = time.ticks_ms() + TEST_TIME
+    while time.ticks_diff(end_time, time.ticks_ms()) > 0:
+        time.sleep_ms(100)
         for func_name, _ in EXPECTED_MAP:
             try:
-                time_func = getattr(utime, func_name, None) or globals()[func_name]
+                time_func = getattr(time, func_name, None) or globals()[func_name]
                 now = time_func()  # may raise AttributeError
             except (KeyError, AttributeError):
                 continue
diff --git a/tests/extmod/utime_res.py.exp b/tests/extmod/time_res.py.exp
similarity index 100%
rename from tests/extmod/utime_res.py.exp
rename to tests/extmod/time_res.py.exp
diff --git a/tests/extmod/utime_time_ns.py b/tests/extmod/time_time_ns.py
similarity index 68%
rename from tests/extmod/utime_time_ns.py
rename to tests/extmod/time_time_ns.py
index 0d13f839d4f2d..3ef58e56a9459 100644
--- a/tests/extmod/utime_time_ns.py
+++ b/tests/extmod/time_time_ns.py
@@ -1,18 +1,18 @@
-# test utime.time_ns()
+# test time.time_ns()
 
 try:
-    import utime
+    import time
 
-    utime.sleep_us
-    utime.time_ns
+    time.sleep_us
+    time.time_ns
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
 
-t0 = utime.time_ns()
-utime.sleep_us(5000)
-t1 = utime.time_ns()
+t0 = time.time_ns()
+time.sleep_us(5000)
+t1 = time.time_ns()
 
 # Check that time_ns increases.
 print(t0 < t1)
diff --git a/tests/extmod/utime_time_ns.py.exp b/tests/extmod/time_time_ns.py.exp
similarity index 100%
rename from tests/extmod/utime_time_ns.py.exp
rename to tests/extmod/time_time_ns.py.exp
diff --git a/tests/extmod/utimeq1.py b/tests/extmod/timeq1.py
similarity index 90%
rename from tests/extmod/utimeq1.py
rename to tests/extmod/timeq1.py
index 688e5b834ff9d..0778c8725592f 100644
--- a/tests/extmod/utimeq1.py
+++ b/tests/extmod/timeq1.py
@@ -1,8 +1,8 @@
-# Test for utimeq module which implements task queue with support for
-# wraparound time (utime.ticks_ms() style).
+# Test for timeq module which implements task queue with support for
+# wraparound time (time.ticks_ms() style).
 try:
-    from utime import ticks_add, ticks_diff
-    from utimeq import utimeq
+    from time import ticks_add, ticks_diff
+    from timeq import timeq
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -24,7 +24,7 @@ def dprint(*v):
 
 
 # Try not to crash on invalid data
-h = utimeq(10)
+h = timeq(10)
 try:
     h.push(1)
     assert False
@@ -45,7 +45,7 @@ def dprint(*v):
     pass
 
 # pushing on full queue
-h = utimeq(1)
+h = timeq(1)
 h.push(1, 0, 0)
 try:
     h.push(2, 0, 0)
@@ -68,7 +68,7 @@ def dprint(*v):
 
 # peektime with empty queue
 try:
-    utimeq(1).peektime()
+    timeq(1).peektime()
     assert False
 except IndexError:
     pass
@@ -92,7 +92,7 @@ def add(h, v):
     dprint("-----")
 
 
-h = utimeq(10)
+h = timeq(10)
 add(h, 0)
 add(h, MAX)
 add(h, MAX - 1)
@@ -107,7 +107,7 @@ def add(h, v):
 
 
 def edge_case(edge, offset):
-    h = utimeq(10)
+    h = timeq(10)
     add(h, ticks_add(0, offset))
     add(h, ticks_add(edge, offset))
     dprint(h)
diff --git a/tests/extmod/utimeq1.py.exp b/tests/extmod/timeq1.py.exp
similarity index 100%
rename from tests/extmod/utimeq1.py.exp
rename to tests/extmod/timeq1.py.exp
diff --git a/tests/extmod/utimeq_stable.py b/tests/extmod/timeq_stable.py
similarity index 90%
rename from tests/extmod/utimeq_stable.py
rename to tests/extmod/timeq_stable.py
index 9fb522d514628..b19ea1b3adee9 100644
--- a/tests/extmod/utimeq_stable.py
+++ b/tests/extmod/timeq_stable.py
@@ -1,10 +1,10 @@
 try:
-    from utimeq import utimeq
+    from timeq import timeq
 except ImportError:
     print("SKIP")
     raise SystemExit
 
-h = utimeq(10)
+h = timeq(10)
 
 # Check that for 2 same-key items, the queue is stable (pops items
 # in the same order they were pushed). Unfortunately, this no longer
diff --git a/tests/extmod/utimeq_stable.py.exp b/tests/extmod/timeq_stable.py.exp
similarity index 100%
rename from tests/extmod/utimeq_stable.py.exp
rename to tests/extmod/timeq_stable.py.exp
diff --git a/tests/extmod/uasyncio_basic.py b/tests/extmod/uasyncio_basic.py
index 20c0a82e47a91..3858e4fdd52f1 100644
--- a/tests/extmod/uasyncio_basic.py
+++ b/tests/extmod/uasyncio_basic.py
@@ -7,15 +7,12 @@
         print("SKIP")
         raise SystemExit
 
+import time
 
-try:
-    import utime
-
-    ticks = utime.ticks_ms
-    ticks_diff = utime.ticks_diff
-except:
-    import time
-
+if hasattr(time, "ticks_ms"):
+    ticks = time.ticks_ms
+    ticks_diff = time.ticks_diff
+else:
     ticks = lambda: int(time.time() * 1000)
     ticks_diff = lambda t1, t0: t1 - t0
 
diff --git a/tests/extmod/uasyncio_micropython.py b/tests/extmod/uasyncio_micropython.py
index a6b65bb2a84c0..de1687ca8b988 100644
--- a/tests/extmod/uasyncio_micropython.py
+++ b/tests/extmod/uasyncio_micropython.py
@@ -3,7 +3,7 @@
 # - wait_for_ms
 
 try:
-    import utime, uasyncio
+    import time, uasyncio
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -18,13 +18,13 @@ async def task(id, t):
 
 async def main():
     # Simple sleep_ms
-    t0 = utime.ticks_ms()
+    t0 = time.ticks_ms()
     await uasyncio.sleep_ms(1)
-    print(utime.ticks_diff(utime.ticks_ms(), t0) < 100)
+    print(time.ticks_diff(time.ticks_ms(), t0) < 100)
 
     try:
         # Sleep 1ms beyond maximum allowed sleep value
-        await uasyncio.sleep_ms(utime.ticks_add(0, -1) // 2 + 1)
+        await uasyncio.sleep_ms(time.ticks_add(0, -1) // 2 + 1)
     except OverflowError:
         print("OverflowError")
 
diff --git a/tests/extmod/uasyncio_threadsafeflag.py b/tests/extmod/uasyncio_threadsafeflag.py
index a8a08d2e92587..f97b138498d60 100644
--- a/tests/extmod/uasyncio_threadsafeflag.py
+++ b/tests/extmod/uasyncio_threadsafeflag.py
@@ -18,7 +18,7 @@
 
 try:
     # Unix port can't select/poll on user-defined types.
-    import uselect as select
+    import select
 
     poller = select.poll()
     poller.register(asyncio.ThreadSafeFlag())
diff --git a/tests/extmod/uasyncio_wait_task.py b/tests/extmod/uasyncio_wait_task.py
index e19e29903ccc3..1d70ddf72032e 100644
--- a/tests/extmod/uasyncio_wait_task.py
+++ b/tests/extmod/uasyncio_wait_task.py
@@ -10,14 +10,12 @@
         raise SystemExit
 
 
-try:
-    import utime
-
-    ticks = utime.ticks_ms
-    ticks_diff = utime.ticks_diff
-except:
-    import time
+import time
 
+if hasattr(time, "ticks_ms"):
+    ticks = time.ticks_ms
+    ticks_diff = time.ticks_diff
+else:
     ticks = lambda: int(time.time() * 1000)
     ticks_diff = lambda t1, t0: t1 - t0
 
diff --git a/tests/extmod/uctypes_array_assign_native_le.py b/tests/extmod/uctypes_array_assign_native_le.py
index 5bddfcdf2f601..d4c27fc4b3f5a 100644
--- a/tests/extmod/uctypes_array_assign_native_le.py
+++ b/tests/extmod/uctypes_array_assign_native_le.py
@@ -1,4 +1,4 @@
-import usys
+import sys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if usys.byteorder != "little":
+if sys.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 42583b8afefef..f33c63b4ef959 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 usys
+import sys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if usys.byteorder != "little":
+if sys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uctypes_native_le.py b/tests/extmod/uctypes_native_le.py
index 9889b98e9d00f..7958e5c22ada9 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 usys
+import sys
 
 try:
     import uctypes
@@ -9,7 +9,7 @@
     print("SKIP")
     raise SystemExit
 
-if usys.byteorder != "little":
+if sys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uctypes_ptr_le.py b/tests/extmod/uctypes_ptr_le.py
index f475465ae80f8..5d8094ee48a79 100644
--- a/tests/extmod/uctypes_ptr_le.py
+++ b/tests/extmod/uctypes_ptr_le.py
@@ -1,4 +1,4 @@
-import usys
+import sys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if usys.byteorder != "little":
+if sys.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 ca2b316c54a5d..8ca4d2c55cf9c 100644
--- a/tests/extmod/uctypes_ptr_native_le.py
+++ b/tests/extmod/uctypes_ptr_native_le.py
@@ -1,4 +1,4 @@
-import usys
+import sys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if usys.byteorder != "little":
+if sys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uctypes_sizeof_od.py b/tests/extmod/uctypes_sizeof_od.py
index 2f070095b55ff..375f05f5e2ce0 100644
--- a/tests/extmod/uctypes_sizeof_od.py
+++ b/tests/extmod/uctypes_sizeof_od.py
@@ -1,5 +1,5 @@
 try:
-    from ucollections import OrderedDict
+    from collections import OrderedDict
     import uctypes
 except ImportError:
     print("SKIP")
diff --git a/tests/extmod/uhashlib_md5.py b/tests/extmod/uhashlib_md5.py
deleted file mode 100644
index 07d5f3169200c..0000000000000
--- a/tests/extmod/uhashlib_md5.py
+++ /dev/null
@@ -1,21 +0,0 @@
-try:
-    import uhashlib as hashlib
-except ImportError:
-    try:
-        import hashlib
-    except ImportError:
-        # This is neither uPy, nor cPy, so must be uPy with
-        # uhashlib module disabled.
-        print("SKIP")
-        raise SystemExit
-
-try:
-    hashlib.md5
-except AttributeError:
-    # MD5 is only available on some ports
-    print("SKIP")
-    raise SystemExit
-
-md5 = hashlib.md5(b"hello")
-md5.update(b"world")
-print(md5.digest())
diff --git a/tests/extmod/uhashlib_sha1.py b/tests/extmod/uhashlib_sha1.py
deleted file mode 100644
index a573121316520..0000000000000
--- a/tests/extmod/uhashlib_sha1.py
+++ /dev/null
@@ -1,21 +0,0 @@
-try:
-    import uhashlib as hashlib
-except ImportError:
-    try:
-        import hashlib
-    except ImportError:
-        # This is neither uPy, nor cPy, so must be uPy with
-        # uhashlib module disabled.
-        print("SKIP")
-        raise SystemExit
-
-try:
-    hashlib.sha1
-except AttributeError:
-    # SHA1 is only available on some ports
-    print("SKIP")
-    raise SystemExit
-
-sha1 = hashlib.sha1(b"hello")
-sha1.update(b"world")
-print(sha1.digest())
diff --git a/tests/extmod/ujson_dumps_extra.py b/tests/extmod/ujson_dumps_extra.py
deleted file mode 100644
index f2aa7f249fc93..0000000000000
--- a/tests/extmod/ujson_dumps_extra.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# test uPy ujson behaviour that's not valid in CPy
-
-try:
-    import ujson
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-print(ujson.dumps(b"1234"))
diff --git a/tests/extmod/ujson_dumps_float.py b/tests/extmod/ujson_dumps_float.py
deleted file mode 100644
index 25681d0c23c4e..0000000000000
--- a/tests/extmod/ujson_dumps_float.py
+++ /dev/null
@@ -1,11 +0,0 @@
-try:
-    import ujson as json
-except ImportError:
-    try:
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
-
-print(json.dumps(1.2))
-print(json.dumps({1.5: "hi"}))
diff --git a/tests/extmod/ujson_dumps_ordereddict.py b/tests/extmod/ujson_dumps_ordereddict.py
deleted file mode 100644
index c6f4a8fcb7942..0000000000000
--- a/tests/extmod/ujson_dumps_ordereddict.py
+++ /dev/null
@@ -1,12 +0,0 @@
-try:
-    import ujson as json
-    from ucollections import OrderedDict
-except ImportError:
-    try:
-        import json
-        from collections import OrderedDict
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
-
-print(json.dumps(OrderedDict(((1, 2), (3, 4)))))
diff --git a/tests/extmod/ujson_load.py b/tests/extmod/ujson_load.py
deleted file mode 100644
index 7cec9246b82c5..0000000000000
--- a/tests/extmod/ujson_load.py
+++ /dev/null
@@ -1,15 +0,0 @@
-try:
-    from uio import StringIO
-    import ujson as json
-except:
-    try:
-        from io import StringIO
-        import json
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
-
-print(json.load(StringIO("null")))
-print(json.load(StringIO('"abc\\u0064e"')))
-print(json.load(StringIO("[false, true, 1, -2]")))
-print(json.load(StringIO('{"a":true}')))
diff --git a/tests/extmod/ure_stack_overflow.py b/tests/extmod/ure_stack_overflow.py
deleted file mode 100644
index d3ce0c5a7b176..0000000000000
--- a/tests/extmod/ure_stack_overflow.py
+++ /dev/null
@@ -1,13 +0,0 @@
-try:
-    import ure as re
-except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
-
-try:
-    re.match("(a*)*", "aaa")
-except RuntimeError:
-    print("RuntimeError")
diff --git a/tests/extmod/vfs_basic.py b/tests/extmod/vfs_basic.py
index 9a9ef2ca61be3..028846406a145 100644
--- a/tests/extmod/vfs_basic.py
+++ b/tests/extmod/vfs_basic.py
@@ -1,9 +1,9 @@
 # test VFS functionality without any particular filesystem type
 
 try:
-    import uos
+    import os
 
-    uos.mount
+    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -59,35 +59,35 @@ def open(self, file, mode):
 
 # first we umount any existing mount points the target may have
 try:
-    uos.umount("/")
+    os.umount("/")
 except OSError:
     pass
-for path in uos.listdir("/"):
-    uos.umount("/" + path)
+for path in os.listdir("/"):
+    os.umount("/" + path)
 
 # stat root dir
-print(uos.stat("/"))
+print(os.stat("/"))
 
 # statvfs root dir; verify that f_namemax has a sensible size
-print(uos.statvfs("/")[9] >= 32)
+print(os.statvfs("/")[9] >= 32)
 
 # getcwd when in root dir
-print(uos.getcwd())
+print(os.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)
+            getattr(os, func)(arg)
         except OSError:
             print(func, arg, "OSError")
 
 # basic mounting and listdir
-uos.mount(Filesystem(1), "/test_mnt")
-print(uos.listdir())
+os.mount(Filesystem(1), "/test_mnt")
+print(os.listdir())
 
 # ilistdir
-i = uos.ilistdir()
+i = os.ilistdir()
 print(next(i))
 try:
     next(i)
@@ -99,88 +99,88 @@ def open(self, file, mode):
     print("StopIteration")
 
 # referencing the mount point in different ways
-print(uos.listdir("test_mnt"))
-print(uos.listdir("/test_mnt"))
+print(os.listdir("test_mnt"))
+print(os.listdir("/test_mnt"))
 
 # mounting another filesystem
-uos.mount(Filesystem(2), "/test_mnt2", readonly=True)
-print(uos.listdir())
-print(uos.listdir("/test_mnt2"))
+os.mount(Filesystem(2), "/test_mnt2", readonly=True)
+print(os.listdir())
+print(os.listdir("/test_mnt2"))
 
 # mounting over an existing mount point
 try:
-    uos.mount(Filesystem(3), "/test_mnt2")
+    os.mount(Filesystem(3), "/test_mnt2")
 except OSError:
     print("OSError")
 
 # mkdir of a mount point
 try:
-    uos.mkdir("/test_mnt")
+    os.mkdir("/test_mnt")
 except OSError:
     print("OSError")
 
 # rename across a filesystem
 try:
-    uos.rename("/test_mnt/a", "/test_mnt2/b")
+    os.rename("/test_mnt/a", "/test_mnt2/b")
 except OSError:
     print("OSError")
 
 # delegating to mounted filesystem
-uos.chdir("test_mnt")
-print(uos.listdir())
-print(uos.getcwd())
-uos.mkdir("test_dir")
-uos.remove("test_file")
-uos.rename("test_file", "test_file2")
-uos.rmdir("test_dir")
-print(uos.stat("test_file"))
-print(uos.statvfs("/test_mnt"))
+os.chdir("test_mnt")
+print(os.listdir())
+print(os.getcwd())
+os.mkdir("test_dir")
+os.remove("test_file")
+os.rename("test_file", "test_file2")
+os.rmdir("test_dir")
+print(os.stat("test_file"))
+print(os.statvfs("/test_mnt"))
 open("test_file")
 open("test_file", "wb")
 
 # umount
-uos.umount("/test_mnt")
-uos.umount("/test_mnt2")
+os.umount("/test_mnt")
+os.umount("/test_mnt2")
 
 # umount a non-existent mount point
 try:
-    uos.umount("/test_mnt")
+    os.umount("/test_mnt")
 except OSError:
     print("OSError")
 
 # root dir
-uos.mount(Filesystem(3), "/")
-print(uos.stat("/"))
-print(uos.statvfs("/"))
-print(uos.listdir())
+os.mount(Filesystem(3), "/")
+print(os.stat("/"))
+print(os.statvfs("/"))
+print(os.listdir())
 open("test")
 
-uos.mount(Filesystem(4), "/mnt")
-print(uos.listdir())
-print(uos.listdir("/mnt"))
-uos.chdir("/mnt")
-print(uos.listdir())
+os.mount(Filesystem(4), "/mnt")
+print(os.listdir())
+print(os.listdir("/mnt"))
+os.chdir("/mnt")
+print(os.listdir())
 
 # chdir to a subdir within root-mounted vfs, and then listdir
-uos.chdir("/subdir")
-print(uos.listdir())
-uos.chdir("/")
+os.chdir("/subdir")
+print(os.listdir())
+os.chdir("/")
 
-uos.umount("/")
-print(uos.listdir("/"))
-uos.umount("/mnt")
+os.umount("/")
+print(os.listdir("/"))
+os.umount("/mnt")
 
 # chdir to a non-existent mount point (current directory should remain unchanged)
 try:
-    uos.chdir("/foo")
+    os.chdir("/foo")
 except OSError:
     print("OSError")
-print(uos.getcwd())
+print(os.getcwd())
 
 # chdir to a non-existent subdirectory in a mounted filesystem
-uos.mount(Filesystem(5, 1), "/mnt")
+os.mount(Filesystem(5, 1), "/mnt")
 try:
-    uos.chdir("/mnt/subdir")
+    os.chdir("/mnt/subdir")
 except OSError:
     print("OSError")
-print(uos.getcwd())
+print(os.getcwd())
diff --git a/tests/extmod/vfs_blockdev.py b/tests/extmod/vfs_blockdev.py
index e24169ba93689..f4c84ea9213c2 100644
--- a/tests/extmod/vfs_blockdev.py
+++ b/tests/extmod/vfs_blockdev.py
@@ -1,10 +1,10 @@
 # Test for behaviour of combined standard and extended block device
 
 try:
-    import uos
+    import os
 
-    uos.VfsFat
-    uos.VfsLfs2
+    os.VfsFat
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -65,10 +65,12 @@ def test(bdev, vfs_class):
 
 
 try:
+    import os
+
     bdev = RAMBlockDevice(50)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-test(bdev, uos.VfsFat)
-test(bdev, uos.VfsLfs2)
+test(bdev, os.VfsFat)
+test(bdev, os.VfsLfs2)
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index 55f399ff2ea85..f4db5ac8ddea8 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -1,12 +1,12 @@
 try:
-    import uerrno
-    import uos
+    import errno
+    import os
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 try:
-    uos.VfsFat
+    os.VfsFat
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -38,14 +38,14 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    uos.VfsFat.mkfs(bdev)
+    os.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = uos.VfsFat(bdev)
-uos.mount(vfs, "/ramdisk")
-uos.chdir("/ramdisk")
+vfs = os.VfsFat(bdev)
+os.mount(vfs, "/ramdisk")
+os.chdir("/ramdisk")
 
 # file IO
 f = open("foo_file.txt", "w")
@@ -57,22 +57,22 @@ def ioctl(self, op, arg):
 try:
     f.write("world!")
 except OSError as e:
-    print(e.errno == uerrno.EINVAL)
+    print(e.errno == errno.EINVAL)
 
 try:
     f.read()
 except OSError as e:
-    print(e.errno == uerrno.EINVAL)
+    print(e.errno == errno.EINVAL)
 
 try:
     f.flush()
 except OSError as e:
-    print(e.errno == uerrno.EINVAL)
+    print(e.errno == errno.EINVAL)
 
 try:
     open("foo_file.txt", "x")
 except OSError as e:
-    print(e.errno == uerrno.EEXIST)
+    print(e.errno == errno.EEXIST)
 
 with open("foo_file.txt", "a") as f:
     f.write("world!")
@@ -104,7 +104,7 @@ def ioctl(self, op, arg):
 try:
     vfs.rmdir("foo_file.txt")
 except OSError as e:
-    print(e.errno == 20)  # uerrno.ENOTDIR
+    print(e.errno == 20)  # errno.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 9429f115f626c..353b997e5c827 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -1,12 +1,12 @@
 try:
-    import uerrno
-    import uos
+    import errno
+    import os
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 try:
-    uos.VfsFat
+    os.VfsFat
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -38,34 +38,34 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    uos.VfsFat.mkfs(bdev)
+    os.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = uos.VfsFat(bdev)
-uos.mount(vfs, "/ramdisk")
-uos.chdir("/ramdisk")
+vfs = os.VfsFat(bdev)
+os.mount(vfs, "/ramdisk")
+os.chdir("/ramdisk")
 
 try:
     vfs.mkdir("foo_dir")
 except OSError as e:
-    print(e.errno == uerrno.EEXIST)
+    print(e.errno == errno.EEXIST)
 
 try:
     vfs.remove("foo_dir")
 except OSError as e:
-    print(e.errno == uerrno.EISDIR)
+    print(e.errno == errno.EISDIR)
 
 try:
     vfs.remove("no_file.txt")
 except OSError as e:
-    print(e.errno == uerrno.ENOENT)
+    print(e.errno == errno.ENOENT)
 
 try:
     vfs.rename("foo_dir", "/null/file")
 except OSError as e:
-    print(e.errno == uerrno.ENOENT)
+    print(e.errno == errno.ENOENT)
 
 # file in dir
 with open("foo_dir/file-in-dir.txt", "w+t") as f:
@@ -81,7 +81,7 @@ def ioctl(self, op, arg):
 try:
     vfs.rmdir("foo_dir")
 except OSError as e:
-    print(e.errno == uerrno.EACCES)
+    print(e.errno == errno.EACCES)
 
 # trim full path
 vfs.rename("foo_dir/file-in-dir.txt", "foo_dir/file.txt")
@@ -110,5 +110,5 @@ def ioctl(self, op, arg):
     f = open("large_file.txt", "wb")
     f.write(bytearray(bsize * free))
 except OSError as e:
-    print("ENOSPC:", e.errno == 28)  # uerrno.ENOSPC
+    print("ENOSPC:", e.errno == 28)  # errno.ENOSPC
 f.close()
diff --git a/tests/extmod/vfs_fat_finaliser.py b/tests/extmod/vfs_fat_finaliser.py
index b38e640c73daf..b6c7dffb8295f 100644
--- a/tests/extmod/vfs_fat_finaliser.py
+++ b/tests/extmod/vfs_fat_finaliser.py
@@ -1,9 +1,9 @@
 # Test VfsFat class and its finaliser
 
 try:
-    import uerrno, uos
+    import errno, os
 
-    uos.VfsFat
+    os.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -31,14 +31,16 @@ def ioctl(self, op, arg):
 
 # Create block device, and skip test if not enough RAM
 try:
+    import errno, os
+
     bdev = RAMBlockDevice(50)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
 # Format block device and create VFS object
-uos.VfsFat.mkfs(bdev)
-vfs = uos.VfsFat(bdev)
+os.VfsFat.mkfs(bdev)
+vfs = os.VfsFat(bdev)
 
 # Here we test that opening a file with the heap locked fails correctly.  This
 # is a special case because file objects use a finaliser and allocating with a
@@ -48,6 +50,8 @@ def ioctl(self, op, arg):
 
 micropython.heap_lock()
 try:
+    import errno, os
+
     vfs.open("x", "r")
 except MemoryError:
     print("MemoryError")
diff --git a/tests/extmod/vfs_fat_ilistdir_del.py b/tests/extmod/vfs_fat_ilistdir_del.py
index ccdacc57c25e1..055836ad71bef 100644
--- a/tests/extmod/vfs_fat_ilistdir_del.py
+++ b/tests/extmod/vfs_fat_ilistdir_del.py
@@ -2,9 +2,9 @@
 import gc
 
 try:
-    import uos
+    import os
 
-    uos.VfsFat
+    os.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -77,4 +77,4 @@ def test(bdev, vfs_class):
     print("SKIP")
     raise SystemExit
 
-test(bdev, uos.VfsFat)
+test(bdev, os.VfsFat)
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index 981c2524a6ee0..7074221a326d4 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -1,11 +1,11 @@
 try:
-    import uos
+    import os
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 try:
-    uos.VfsFat
+    os.VfsFat
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -44,76 +44,76 @@ def ioctl(self, op, arg):
 
 # first we umount any existing mount points the target may have
 try:
-    uos.umount("/")
+    os.umount("/")
 except OSError:
     pass
-for path in uos.listdir("/"):
-    uos.umount("/" + path)
+for path in os.listdir("/"):
+    os.umount("/" + path)
 
-uos.VfsFat.mkfs(bdev)
-uos.mount(bdev, "/")
+os.VfsFat.mkfs(bdev)
+os.mount(bdev, "/")
 
-print(uos.getcwd())
+print(os.getcwd())
 
 f = open("test.txt", "w")
 f.write("hello")
 f.close()
 
-print(uos.listdir())
-print(uos.listdir("/"))
-print(uos.stat("")[:-3])
-print(uos.stat("/")[:-3])
-print(uos.stat("test.txt")[:-3])
-print(uos.stat("/test.txt")[:-3])
+print(os.listdir())
+print(os.listdir("/"))
+print(os.stat("")[:-3])
+print(os.stat("/")[:-3])
+print(os.stat("test.txt")[:-3])
+print(os.stat("/test.txt")[:-3])
 
 f = open("/test.txt")
 print(f.read())
 f.close()
 
-uos.rename("test.txt", "test2.txt")
-print(uos.listdir())
-uos.rename("test2.txt", "/test3.txt")
-print(uos.listdir())
-uos.rename("/test3.txt", "test4.txt")
-print(uos.listdir())
-uos.rename("/test4.txt", "/test5.txt")
-print(uos.listdir())
-
-uos.mkdir("dir")
-print(uos.listdir())
-uos.mkdir("/dir2")
-print(uos.listdir())
-uos.mkdir("dir/subdir")
-print(uos.listdir("dir"))
+os.rename("test.txt", "test2.txt")
+print(os.listdir())
+os.rename("test2.txt", "/test3.txt")
+print(os.listdir())
+os.rename("/test3.txt", "test4.txt")
+print(os.listdir())
+os.rename("/test4.txt", "/test5.txt")
+print(os.listdir())
+
+os.mkdir("dir")
+print(os.listdir())
+os.mkdir("/dir2")
+print(os.listdir())
+os.mkdir("dir/subdir")
+print(os.listdir("dir"))
 for exist in ("", "/", "dir", "/dir", "dir/subdir"):
     try:
-        uos.mkdir(exist)
+        os.mkdir(exist)
     except OSError as er:
         print("mkdir OSError", er.errno == 17)  # EEXIST
 
-uos.chdir("/")
-print(uos.stat("test5.txt")[:-3])
+os.chdir("/")
+print(os.stat("test5.txt")[:-3])
 
-uos.VfsFat.mkfs(bdev2)
-uos.mount(bdev2, "/sys")
-print(uos.listdir())
-print(uos.listdir("sys"))
-print(uos.listdir("/sys"))
+os.VfsFat.mkfs(bdev2)
+os.mount(bdev2, "/sys")
+print(os.listdir())
+print(os.listdir("sys"))
+print(os.listdir("/sys"))
 
-uos.rmdir("dir2")
-uos.remove("test5.txt")
-print(uos.listdir())
+os.rmdir("dir2")
+os.remove("test5.txt")
+print(os.listdir())
 
-uos.umount("/")
-print(uos.getcwd())
-print(uos.listdir())
-print(uos.listdir("sys"))
+os.umount("/")
+print(os.getcwd())
+print(os.listdir())
+print(os.listdir("sys"))
 
 # test importing a file from a mounted FS
-import usys
+import sys
 
-usys.path.clear()
-usys.path.append("/sys")
+sys.path.clear()
+sys.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_fat_mtime.py b/tests/extmod/vfs_fat_mtime.py
index d8fd66b75f769..1ceb611364a18 100644
--- a/tests/extmod/vfs_fat_mtime.py
+++ b/tests/extmod/vfs_fat_mtime.py
@@ -1,11 +1,11 @@
 # Test for VfsFat using a RAM device, mtime feature
 
 try:
-    import utime, uos
+    import time, os
 
-    utime.time
-    utime.sleep
-    uos.VfsFat
+    time.time
+    time.sleep
+    os.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -44,11 +44,11 @@ def test(bdev, vfs_class):
     vfs = vfs_class(bdev)
 
     # Create an empty file, should have a timestamp.
-    current_time = int(utime.time())
+    current_time = int(time.time())
     vfs.open("test1", "wt").close()
 
     # Wait 2 seconds so mtime will increase (FAT has 2 second resolution).
-    utime.sleep(2)
+    time.sleep(2)
 
     # Create another empty file, should have a timestamp.
     vfs.open("test2", "wt").close()
@@ -71,4 +71,4 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(50)
-test(bdev, uos.VfsFat)
+test(bdev, os.VfsFat)
diff --git a/tests/extmod/vfs_fat_oldproto.py b/tests/extmod/vfs_fat_oldproto.py
index b1556ba2c0e7d..f5336ba916fa9 100644
--- a/tests/extmod/vfs_fat_oldproto.py
+++ b/tests/extmod/vfs_fat_oldproto.py
@@ -1,12 +1,12 @@
 try:
-    import uerrno
-    import uos
+    import errno
+    import os
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 try:
-    uos.VfsFat
+    os.VfsFat
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -41,9 +41,9 @@ def count(self):
     print("SKIP")
     raise SystemExit
 
-uos.VfsFat.mkfs(bdev)
-vfs = uos.VfsFat(bdev)
-uos.mount(vfs, "/ramdisk")
+os.VfsFat.mkfs(bdev)
+vfs = os.VfsFat(bdev)
+os.mount(vfs, "/ramdisk")
 
 # file io
 with vfs.open("file.txt", "w") as f:
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 01235bc26647f..1693359d49d56 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -1,12 +1,12 @@
 try:
-    import uerrno
-    import uos
+    import errno
+    import os
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 try:
-    uos.VfsFat
+    os.VfsFat
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -38,7 +38,7 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    uos.VfsFat.mkfs(bdev)
+    os.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
@@ -46,8 +46,8 @@ def ioctl(self, op, arg):
 print(b"FOO_FILETXT" not in bdev.data)
 print(b"hello!" not in bdev.data)
 
-vfs = uos.VfsFat(bdev)
-uos.mount(vfs, "/ramdisk")
+vfs = os.VfsFat(bdev)
+os.mount(vfs, "/ramdisk")
 
 print("statvfs:", vfs.statvfs("/ramdisk"))
 print("getcwd:", vfs.getcwd())
@@ -55,7 +55,7 @@ def ioctl(self, op, arg):
 try:
     vfs.stat("no_file.txt")
 except OSError as e:
-    print(e.errno == uerrno.ENOENT)
+    print(e.errno == errno.ENOENT)
 
 with vfs.open("foo_file.txt", "w") as f:
     f.write("hello!")
@@ -78,18 +78,18 @@ def ioctl(self, op, arg):
 try:
     vfs.chdir("sub_file.txt")
 except OSError as e:
-    print(e.errno == uerrno.ENOENT)
+    print(e.errno == errno.ENOENT)
 
 vfs.chdir("..")
 print("getcwd:", vfs.getcwd())
 
-uos.umount(vfs)
+os.umount(vfs)
 
-vfs = uos.VfsFat(bdev)
+vfs = os.VfsFat(bdev)
 print(list(vfs.ilistdir(b"")))
 
 # list a non-existent directory
 try:
     vfs.ilistdir(b"no_exist")
 except OSError as e:
-    print("ENOENT:", e.errno == uerrno.ENOENT)
+    print("ENOENT:", e.errno == errno.ENOENT)
diff --git a/tests/extmod/vfs_fat_ramdisklarge.py b/tests/extmod/vfs_fat_ramdisklarge.py
index 649a53db14705..40cba9ee430a1 100644
--- a/tests/extmod/vfs_fat_ramdisklarge.py
+++ b/tests/extmod/vfs_fat_ramdisklarge.py
@@ -1,13 +1,13 @@
 # test making a FAT filesystem on a very large block device
 
 try:
-    import uos
+    import os
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 try:
-    uos.VfsFat
+    os.VfsFat
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -46,13 +46,13 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMBDevSparse(4 * 1024 * 1024 * 1024 // RAMBDevSparse.SEC_SIZE)
-    uos.VfsFat.mkfs(bdev)
+    os.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = uos.VfsFat(bdev)
-uos.mount(vfs, "/ramdisk")
+vfs = os.VfsFat(bdev)
+os.mount(vfs, "/ramdisk")
 
 print("statvfs:", vfs.statvfs("/ramdisk"))
 
@@ -66,4 +66,4 @@ def ioctl(self, op, arg):
 print(f.read())
 f.close()
 
-uos.umount(vfs)
+os.umount(vfs)
diff --git a/tests/extmod/vfs_lfs.py b/tests/extmod/vfs_lfs.py
index 8e56400df3c2b..83377653b2cfb 100644
--- a/tests/extmod/vfs_lfs.py
+++ b/tests/extmod/vfs_lfs.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device
 
 try:
-    import uos
+    import os
 
-    uos.VfsLfs1
-    uos.VfsLfs2
+    os.VfsLfs1
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -150,5 +150,5 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, uos.VfsLfs1)
-test(bdev, uos.VfsLfs2)
+test(bdev, os.VfsLfs1)
+test(bdev, os.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_corrupt.py b/tests/extmod/vfs_lfs_corrupt.py
index 330458709a37f..c49dcad92b441 100644
--- a/tests/extmod/vfs_lfs_corrupt.py
+++ b/tests/extmod/vfs_lfs_corrupt.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, testing error handling from corrupt block device
 
 try:
-    import uos
+    import os
 
-    uos.VfsLfs1
-    uos.VfsLfs2
+    os.VfsLfs1
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -108,5 +108,5 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, uos.VfsLfs1)
-test(bdev, uos.VfsLfs2)
+test(bdev, os.VfsLfs1)
+test(bdev, os.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_error.py b/tests/extmod/vfs_lfs_error.py
index 717284ea01723..32b76b2821258 100644
--- a/tests/extmod/vfs_lfs_error.py
+++ b/tests/extmod/vfs_lfs_error.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, testing error handling
 
 try:
-    import uos
+    import os
 
-    uos.VfsLfs1
-    uos.VfsLfs2
+    os.VfsLfs1
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -117,5 +117,5 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, uos.VfsLfs1)
-test(bdev, uos.VfsLfs2)
+test(bdev, os.VfsLfs1)
+test(bdev, os.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_file.py b/tests/extmod/vfs_lfs_file.py
index 774cca296433f..b4a3e6b22367a 100644
--- a/tests/extmod/vfs_lfs_file.py
+++ b/tests/extmod/vfs_lfs_file.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, file IO
 
 try:
-    import uos
+    import os
 
-    uos.VfsLfs1
-    uos.VfsLfs2
+    os.VfsLfs1
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -117,5 +117,5 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, uos.VfsLfs1)
-test(bdev, uos.VfsLfs2)
+test(bdev, os.VfsLfs1)
+test(bdev, os.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_ilistdir_del.py b/tests/extmod/vfs_lfs_ilistdir_del.py
index 073576986d3ac..ff66717147868 100644
--- a/tests/extmod/vfs_lfs_ilistdir_del.py
+++ b/tests/extmod/vfs_lfs_ilistdir_del.py
@@ -2,9 +2,9 @@
 import gc
 
 try:
-    import uos
+    import os
 
-    uos.VfsLfs2
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -72,4 +72,4 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, uos.VfsLfs2)
+test(bdev, os.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_mount.py b/tests/extmod/vfs_lfs_mount.py
index bea8a2723ac5b..4ebd9ac6233f8 100644
--- a/tests/extmod/vfs_lfs_mount.py
+++ b/tests/extmod/vfs_lfs_mount.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, with mount/umount
 
 try:
-    import uos
+    import os
 
-    uos.VfsLfs1
-    uos.VfsLfs2
+    os.VfsLfs1
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -42,7 +42,7 @@ def test(vfs_class):
 
     # mount bdev unformatted
     try:
-        uos.mount(bdev, "/lfs")
+        os.mount(bdev, "/lfs")
     except Exception as er:
         print(repr(er))
 
@@ -53,7 +53,7 @@ def test(vfs_class):
     vfs = vfs_class(bdev)
 
     # mount
-    uos.mount(vfs, "/lfs")
+    os.mount(vfs, "/lfs")
 
     # import
     with open("/lfs/lfsmod.py", "w") as f:
@@ -61,23 +61,23 @@ def test(vfs_class):
     import lfsmod
 
     # import package
-    uos.mkdir("/lfs/lfspkg")
+    os.mkdir("/lfs/lfspkg")
     with open("/lfs/lfspkg/__init__.py", "w") as f:
         f.write('print("package")\n')
     import lfspkg
 
     # chdir and import module from current directory (needs "" in sys.path)
-    uos.mkdir("/lfs/subdir")
-    uos.chdir("/lfs/subdir")
-    uos.rename("/lfs/lfsmod.py", "/lfs/subdir/lfsmod2.py")
+    os.mkdir("/lfs/subdir")
+    os.chdir("/lfs/subdir")
+    os.rename("/lfs/lfsmod.py", "/lfs/subdir/lfsmod2.py")
     import lfsmod2
 
     # umount
-    uos.umount("/lfs")
+    os.umount("/lfs")
 
     # mount read-only
     vfs = vfs_class(bdev)
-    uos.mount(vfs, "/lfs", readonly=True)
+    os.mount(vfs, "/lfs", readonly=True)
 
     # test reading works
     with open("/lfs/subdir/lfsmod2.py") as f:
@@ -90,25 +90,25 @@ def test(vfs_class):
         print(repr(er))
 
     # umount
-    uos.umount("/lfs")
+    os.umount("/lfs")
 
     # mount bdev again
-    uos.mount(bdev, "/lfs")
+    os.mount(bdev, "/lfs")
 
     # umount
-    uos.umount("/lfs")
+    os.umount("/lfs")
 
     # clear imported modules
-    usys.modules.clear()
+    sys.modules.clear()
 
 
 # initialise path
-import usys
+import sys
 
-usys.path.clear()
-usys.path.append("/lfs")
-usys.path.append("")
+sys.path.clear()
+sys.path.append("/lfs")
+sys.path.append("")
 
 # run tests
-test(uos.VfsLfs1)
-test(uos.VfsLfs2)
+test(os.VfsLfs1)
+test(os.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_mtime.py b/tests/extmod/vfs_lfs_mtime.py
index a67e48dd80dde..ade02fa144987 100644
--- a/tests/extmod/vfs_lfs_mtime.py
+++ b/tests/extmod/vfs_lfs_mtime.py
@@ -1,11 +1,11 @@
 # Test for VfsLfs using a RAM device, mtime feature
 
 try:
-    import utime, uos
+    import time, os
 
-    utime.time
-    utime.sleep
-    uos.VfsLfs2
+    time.time
+    time.sleep
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -47,11 +47,11 @@ def test(bdev, vfs_class):
     vfs = vfs_class(bdev, mtime=True)
 
     # Create an empty file, should have a timestamp.
-    current_time = int(utime.time())
+    current_time = int(time.time())
     vfs.open("test1", "wt").close()
 
     # Wait 1 second so mtime will increase by at least 1.
-    utime.sleep(1)
+    time.sleep(1)
 
     # Create another empty file, should have a timestamp.
     vfs.open("test2", "wt").close()
@@ -68,7 +68,7 @@ def test(bdev, vfs_class):
     print(stat1[8] < stat2[8])
 
     # Wait 1 second so mtime will increase by at least 1.
-    utime.sleep(1)
+    time.sleep(1)
 
     # Open test1 for reading and ensure mtime did not change.
     vfs.open("test1", "rt").close()
@@ -107,4 +107,4 @@ def test(bdev, vfs_class):
     print("SKIP")
     raise SystemExit
 
-test(bdev, uos.VfsLfs2)
+test(bdev, os.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_superblock.py b/tests/extmod/vfs_lfs_superblock.py
index 1ac5675554b46..b8a8ec60b967a 100644
--- a/tests/extmod/vfs_lfs_superblock.py
+++ b/tests/extmod/vfs_lfs_superblock.py
@@ -1,9 +1,9 @@
 # Test for VfsLfs using a RAM device, when the first superblock does not exist
 
 try:
-    import uos
+    import os
 
-    uos.VfsLfs2
+    os.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -36,12 +36,12 @@ def ioctl(self, op, arg):
 bdev = RAMBlockDevice(64, lfs2_data)
 
 # Create the VFS explicitly, no auto-detection is needed for this.
-vfs = uos.VfsLfs2(bdev)
+vfs = os.VfsLfs2(bdev)
 print(list(vfs.ilistdir()))
 
 # Mount the block device directly; this relies on auto-detection.
-uos.mount(bdev, "/userfs")
-print(uos.listdir("/userfs"))
+os.mount(bdev, "/userfs")
+print(os.listdir("/userfs"))
 
 # Clean up.
-uos.umount("/userfs")
+os.umount("/userfs")
diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index 3c23140065af8..05dc0f537e3ca 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -2,9 +2,9 @@
 
 try:
     import gc
-    import uos
+    import os
 
-    uos.VfsPosix
+    os.VfsPosix
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -13,27 +13,29 @@
 # Skip the test if it does exist.
 temp_dir = "micropy_test_dir"
 try:
-    uos.stat(temp_dir)
+    import os
+
+    os.stat(temp_dir)
     print("SKIP")
     raise SystemExit
 except OSError:
     pass
 
 # getcwd and chdir
-curdir = uos.getcwd()
-uos.chdir("/")
-print(uos.getcwd())
-uos.chdir(curdir)
-print(uos.getcwd() == curdir)
+curdir = os.getcwd()
+os.chdir("/")
+print(os.getcwd())
+os.chdir(curdir)
+print(os.getcwd() == curdir)
 
 # stat
-print(type(uos.stat("/")))
+print(type(os.stat("/")))
 
 # listdir and ilistdir
-print(type(uos.listdir("/")))
+print(type(os.listdir("/")))
 
 # mkdir
-uos.mkdir(temp_dir)
+os.mkdir(temp_dir)
 
 # file create
 f = open(temp_dir + "/test", "w")
@@ -78,14 +80,14 @@ def write_files_without_closing():
     print("next_file_no <= base_file_no", next_file_no <= base_file_no)
 
 for n in names + [basefd, nextfd]:
-    uos.remove(n)
+    os.remove(n)
 
 # rename
-uos.rename(temp_dir + "/test", temp_dir + "/test2")
-print(uos.listdir(temp_dir))
+os.rename(temp_dir + "/test", temp_dir + "/test2")
+print(os.listdir(temp_dir))
 
 # construct new VfsPosix with path argument
-vfs = uos.VfsPosix(temp_dir)
+vfs = os.VfsPosix(temp_dir)
 print(list(i[0] for i in vfs.ilistdir(".")))
 
 # stat, statvfs (statvfs may not exist)
@@ -98,21 +100,25 @@ def write_files_without_closing():
 print(type(list(vfs.ilistdir(b"."))[0][0]))
 
 # remove
-uos.remove(temp_dir + "/test2")
-print(uos.listdir(temp_dir))
+os.remove(temp_dir + "/test2")
+print(os.listdir(temp_dir))
 
 # remove with error
 try:
-    uos.remove(temp_dir + "/test2")
+    import os
+
+    os.remove(temp_dir + "/test2")
 except OSError:
     print("remove OSError")
 
 # rmdir
-uos.rmdir(temp_dir)
-print(temp_dir in uos.listdir())
+os.rmdir(temp_dir)
+print(temp_dir in os.listdir())
 
 # rmdir with error
 try:
-    uos.rmdir(temp_dir)
+    import os
+
+    os.rmdir(temp_dir)
 except OSError:
     print("rmdir OSError")
diff --git a/tests/extmod/vfs_userfs.py b/tests/extmod/vfs_userfs.py
index 570b8335341e1..518373c70a9e1 100644
--- a/tests/extmod/vfs_userfs.py
+++ b/tests/extmod/vfs_userfs.py
@@ -1,21 +1,21 @@
 # test VFS functionality with a user-defined filesystem
-# also tests parts of uio.IOBase implementation
+# also tests parts of io.IOBase implementation
 
-import usys
+import sys
 
 try:
-    import uio
+    import io
 
-    uio.IOBase
-    import uos
+    io.IOBase
+    import os
 
-    uos.mount
+    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
 
-class UserFile(uio.IOBase):
+class UserFile(io.IOBase):
     def __init__(self, mode, data):
         assert isinstance(data, bytes)
         self.is_text = mode.find("b") == -1
@@ -69,16 +69,16 @@ def open(self, path, mode):
     "/usermod1.py": b"print('in usermod1')\nimport usermod2",
     "/usermod2.py": b"print('in usermod2')",
 }
-uos.mount(UserFS(user_files), "/userfs")
+os.mount(UserFS(user_files), "/userfs")
 
 # open and read a file
 f = open("/userfs/data.txt")
 print(f.read())
 
 # import files from the user filesystem
-usys.path.append("/userfs")
+sys.path.append("/userfs")
 import usermod1
 
 # unmount and undo path addition
-uos.umount("/userfs")
-usys.path.pop()
+os.umount("/userfs")
+sys.path.pop()
diff --git a/tests/extmod/websocket_basic.py b/tests/extmod/websocket_basic.py
index dabdb76be1e31..133457784f681 100644
--- a/tests/extmod/websocket_basic.py
+++ b/tests/extmod/websocket_basic.py
@@ -1,7 +1,7 @@
 try:
-    import uio
-    import uerrno
-    import uwebsocket
+    import io
+    import errno
+    import websocket
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -9,14 +9,14 @@
 
 # put raw data in the stream and do a websocket read
 def ws_read(msg, sz):
-    ws = uwebsocket.websocket(uio.BytesIO(msg))
+    ws = websocket.websocket(io.BytesIO(msg))
     return ws.read(sz)
 
 
 # do a websocket write and then return the raw data from the stream
 def ws_write(msg, sz):
-    s = uio.BytesIO()
-    ws = uwebsocket.websocket(s)
+    s = io.BytesIO()
+    ws = websocket.websocket(s)
     ws.write(msg)
     s.seek(0)
     return s.read(sz)
@@ -38,8 +38,8 @@ def ws_write(msg, sz):
 print(ws_read(b"\x81\x84maskmask", 4))
 
 # close control frame
-s = uio.BytesIO(b"\x88\x00")  # FRAME_CLOSE
-ws = uwebsocket.websocket(s)
+s = io.BytesIO(b"\x88\x00")  # FRAME_CLOSE
+ws = websocket.websocket(s)
 print(ws.read(1))
 s.seek(2)
 print(s.read(4))
@@ -49,15 +49,15 @@ def ws_write(msg, sz):
 print(ws_read(b"\x8a\x00\x81\x04pong", 4))  # FRAME_PONG
 
 # close method
-ws = uwebsocket.websocket(uio.BytesIO())
+ws = websocket.websocket(io.BytesIO())
 ws.close()
 
 # ioctl
-ws = uwebsocket.websocket(uio.BytesIO())
+ws = websocket.websocket(io.BytesIO())
 print(ws.ioctl(8))  # GET_DATA_OPTS
 print(ws.ioctl(9, 2))  # SET_DATA_OPTS
 print(ws.ioctl(9))
 try:
     ws.ioctl(-1)
 except OSError as e:
-    print("ioctl: EINVAL:", e.errno == uerrno.EINVAL)
+    print("ioctl: EINVAL:", e.errno == errno.EINVAL)
diff --git a/tests/extmod/uzlib_decompio.py b/tests/extmod/zlib_decompio.py
similarity index 93%
rename from tests/extmod/uzlib_decompio.py
rename to tests/extmod/zlib_decompio.py
index fae901aad0a48..9abbad43c60f5 100644
--- a/tests/extmod/uzlib_decompio.py
+++ b/tests/extmod/zlib_decompio.py
@@ -1,6 +1,6 @@
 try:
-    import uzlib as zlib
-    import uio as io
+    import zlib
+    import io
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/uzlib_decompio.py.exp b/tests/extmod/zlib_decompio.py.exp
similarity index 100%
rename from tests/extmod/uzlib_decompio.py.exp
rename to tests/extmod/zlib_decompio.py.exp
diff --git a/tests/extmod/uzlib_decompio_gz.py b/tests/extmod/zlib_decompio_gz.py
similarity index 97%
rename from tests/extmod/uzlib_decompio_gz.py
rename to tests/extmod/zlib_decompio_gz.py
index 1bc8ba885ba54..1407459304dc5 100644
--- a/tests/extmod/uzlib_decompio_gz.py
+++ b/tests/extmod/zlib_decompio_gz.py
@@ -1,6 +1,6 @@
 try:
-    import uzlib as zlib
-    import uio as io
+    import zlib
+    import io
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/uzlib_decompio_gz.py.exp b/tests/extmod/zlib_decompio_gz.py.exp
similarity index 100%
rename from tests/extmod/uzlib_decompio_gz.py.exp
rename to tests/extmod/zlib_decompio_gz.py.exp
diff --git a/tests/extmod/uzlib_decompress.py b/tests/extmod/zlib_decompress.py
similarity index 94%
rename from tests/extmod/uzlib_decompress.py
rename to tests/extmod/zlib_decompress.py
index 8d4a9640b471f..b72ee96ea88ce 100644
--- a/tests/extmod/uzlib_decompress.py
+++ b/tests/extmod/zlib_decompress.py
@@ -1,11 +1,8 @@
 try:
     import zlib
 except ImportError:
-    try:
-        import uzlib as zlib
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PATTERNS = [
     # Packed results produced by CPy's zlib.compress()
diff --git a/tests/feature_check/byteorder.py b/tests/feature_check/byteorder.py
index 509bd8b1b51de..c82a41a24b1c0 100644
--- a/tests/feature_check/byteorder.py
+++ b/tests/feature_check/byteorder.py
@@ -1,6 +1,3 @@
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 
 print(sys.byteorder)
diff --git a/tests/feature_check/uio_module.py b/tests/feature_check/io_module.py
similarity index 56%
rename from tests/feature_check/uio_module.py
rename to tests/feature_check/io_module.py
index bad8d7c95beb1..9094e605316ba 100644
--- a/tests/feature_check/uio_module.py
+++ b/tests/feature_check/io_module.py
@@ -1,6 +1,6 @@
 try:
-    import uio
+    import io
 
-    print("uio")
+    print("io")
 except ImportError:
     print("no")
diff --git a/tests/feature_check/uio_module.py.exp b/tests/feature_check/io_module.py.exp
similarity index 100%
rename from tests/feature_check/uio_module.py.exp
rename to tests/feature_check/io_module.py.exp
diff --git a/tests/float/array_construct.py b/tests/float/array_construct.py
index f6a3a9dc9d41c..6b5c996312d9c 100644
--- a/tests/float/array_construct.py
+++ b/tests/float/array_construct.py
@@ -1,13 +1,10 @@
 # test construction of array from array with float type
 
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(array("f", array("h", [1, 2])))
 print(array("d", array("f", [1, 2])))
diff --git a/tests/float/bytearray_construct_endian.py b/tests/float/bytearray_construct_endian.py
index 47f2b793c0616..a971d706e2952 100644
--- a/tests/float/bytearray_construct_endian.py
+++ b/tests/float/bytearray_construct_endian.py
@@ -1,12 +1,9 @@
 # test construction of bytearray from array with float type
 
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(bytearray(array("f", [1, 2.5])))
diff --git a/tests/float/bytes_construct_endian.py b/tests/float/bytes_construct_endian.py
index 4e15acc8bc710..4dbcf390ea0a3 100644
--- a/tests/float/bytes_construct_endian.py
+++ b/tests/float/bytes_construct_endian.py
@@ -1,12 +1,9 @@
 # test construction of bytes from array with float type
 
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 print(bytes(array("f", [1, 2.5])))
diff --git a/tests/float/float2int_doubleprec_intbig.py b/tests/float/float2int_doubleprec_intbig.py
index adc76d4aeb289..402966cace271 100644
--- a/tests/float/float2int_doubleprec_intbig.py
+++ b/tests/float/float2int_doubleprec_intbig.py
@@ -1,11 +1,7 @@
 # check cases converting float to int, requiring double precision float
 
-try:
-    import ustruct as struct
-    import usys as sys
-except:
-    import struct
-    import sys
+import struct
+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 4e3c1fa217b7d..1b22fe9646f5a 100644
--- a/tests/float/float2int_fp30_intbig.py
+++ b/tests/float/float2int_fp30_intbig.py
@@ -1,11 +1,7 @@
 # check cases converting float to int, relying only on single precision float
 
-try:
-    import ustruct as struct
-    import usys as sys
-except:
-    import struct
-    import sys
+import struct
+import sys
 
 maxsize_bits = 0
 maxsize = sys.maxsize
diff --git a/tests/float/float2int_intbig.py b/tests/float/float2int_intbig.py
index 739f98f804dbf..d047f247f2777 100644
--- a/tests/float/float2int_intbig.py
+++ b/tests/float/float2int_intbig.py
@@ -1,11 +1,7 @@
 # check cases converting float to int, relying only on single precision float
 
-try:
-    import ustruct as struct
-    import usys as sys
-except:
-    import struct
-    import sys
+import struct
+import sys
 
 maxsize_bits = 0
 maxsize = sys.maxsize
diff --git a/tests/float/float_array.py b/tests/float/float_array.py
index 219b6b86aef25..3d128da83819f 100644
--- a/tests/float/float_array.py
+++ b/tests/float/float_array.py
@@ -1,11 +1,8 @@
 try:
-    from uarray import array
+    from array import array
 except ImportError:
-    try:
-        from array import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def test(a):
diff --git a/tests/float/float_struct.py b/tests/float/float_struct.py
index 18893af0e0aa1..47fe405018038 100644
--- a/tests/float/float_struct.py
+++ b/tests/float/float_struct.py
@@ -1,9 +1,6 @@
 # test struct package with floats
 try:
-    try:
-        import ustruct as struct
-    except:
-        import struct
+    import struct
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/import/builtin_ext.py b/tests/import/builtin_ext.py
index dd8f95cbc1341..87465f1d5931a 100644
--- a/tests/import/builtin_ext.py
+++ b/tests/import/builtin_ext.py
@@ -1,3 +1,4 @@
+# Verify that sys is a builtin.
 import sys
 
 print(sys, hasattr(sys, "__file__"))
@@ -7,6 +8,8 @@
 
 # All three should only get builtins, despite sys.py, usys.py, and
 # micropython.py being in the path.
+# usys isn't extensible, but has a special-cased alias for backwards
+# compatibility.
 import micropython
 
 print(micropython, hasattr(micropython, "__file__"))
@@ -31,6 +34,7 @@
 import uos
 
 print(uos, hasattr(uos, "__file__"), hasattr(uos, "extra"))
+
 import utime
 
 print(utime, hasattr(utime, "__file__"), hasattr(utime, "extra"))
diff --git a/tests/import/builtin_ext.py.exp b/tests/import/builtin_ext.py.exp
index 08496e14b71d1..e09af2843af9b 100644
--- a/tests/import/builtin_ext.py.exp
+++ b/tests/import/builtin_ext.py.exp
@@ -6,5 +6,5 @@ os from filesystem
 <module 'os' from 'ext/os.py'> True / 1
 time from filesystem
 <module 'time' from 'ext/time.py'> True <function> 1
-<module 'uos'> False False
-<module 'utime'> False False
+<module 'os'> False False
+<module 'time'> False False
diff --git a/tests/import/ext/time.py b/tests/import/ext/time.py
index 6f2d4a42c030d..6b460b4235571 100644
--- a/tests/import/ext/time.py
+++ b/tests/import/ext/time.py
@@ -4,11 +4,11 @@
 # import.
 import sys
 
-_path = sys.path[:]
-sys.path.clear()
+_path = sys.path
+sys.path = ()
 from time import *
 
-sys.path.extend(_path)
+sys.path = _path
 del _path
 
 extra = 1
diff --git a/tests/inlineasm/asmfpldrstr.py b/tests/inlineasm/asmfpldrstr.py
index 96cd0c23eb52d..c65f8a798b96d 100644
--- a/tests/inlineasm/asmfpldrstr.py
+++ b/tests/inlineasm/asmfpldrstr.py
@@ -1,4 +1,4 @@
-import uarray as array
+import array
 
 
 @micropython.asm_thumb  # test vldr, vstr
diff --git a/tests/inlineasm/asmsum.py b/tests/inlineasm/asmsum.py
index 208709a25f74a..51613ef6ac5df 100644
--- a/tests/inlineasm/asmsum.py
+++ b/tests/inlineasm/asmsum.py
@@ -46,7 +46,7 @@ def asm_sum_bytes(r0, r1):
     mov(r0, r2)
 
 
-import uarray as array
+import array
 
 b = array.array("l", (100, 200, 300, 400))
 n = asm_sum_words(len(b), b)
diff --git a/tests/internal_bench/var-8-namedtuple-1st.py b/tests/internal_bench/var-8-namedtuple-1st.py
index 1a6daa6cddc0f..e3a2fa19cd32e 100644
--- a/tests/internal_bench/var-8-namedtuple-1st.py
+++ b/tests/internal_bench/var-8-namedtuple-1st.py
@@ -1,5 +1,5 @@
 import bench
-from ucollections import namedtuple
+from collections import namedtuple
 
 T = namedtuple("Tup", ["num", "bar"])
 
diff --git a/tests/internal_bench/var-8.1-namedtuple-5th.py b/tests/internal_bench/var-8.1-namedtuple-5th.py
index 568ece8067143..3e52121746673 100644
--- a/tests/internal_bench/var-8.1-namedtuple-5th.py
+++ b/tests/internal_bench/var-8.1-namedtuple-5th.py
@@ -1,5 +1,5 @@
 import bench
-from ucollections import namedtuple
+from collections import namedtuple
 
 T = namedtuple("Tup", ["foo1", "foo2", "foo3", "foo4", "num"])
 
diff --git a/tests/io/argv.py b/tests/io/argv.py
index 834292504d05d..53254da11906b 100644
--- a/tests/io/argv.py
+++ b/tests/io/argv.py
@@ -1,6 +1,3 @@
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 
 print(sys.argv)
diff --git a/tests/io/builtin_print_file.py b/tests/io/builtin_print_file.py
index e5c20b64e4bec..822356a6cc305 100644
--- a/tests/io/builtin_print_file.py
+++ b/tests/io/builtin_print_file.py
@@ -1,9 +1,6 @@
 # test builtin print function, using file= argument
 
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 
 try:
     sys.stdout
diff --git a/tests/io/file_stdio.py b/tests/io/file_stdio.py
index 6c08f35d78784..cbdb070163c31 100644
--- a/tests/io/file_stdio.py
+++ b/tests/io/file_stdio.py
@@ -1,7 +1,4 @@
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 
 print(sys.stdin.fileno())
 print(sys.stdout.fileno())
diff --git a/tests/io/open_append.py b/tests/io/open_append.py
index 49cdd094b3d56..80a9422d815ee 100644
--- a/tests/io/open_append.py
+++ b/tests/io/open_append.py
@@ -1,7 +1,4 @@
-try:
-    import uos as os
-except ImportError:
-    import os
+import os
 
 if not hasattr(os, "remove"):
     print("SKIP")
diff --git a/tests/io/open_plus.py b/tests/io/open_plus.py
index 3cb2330eed4a4..5199861a4e32f 100644
--- a/tests/io/open_plus.py
+++ b/tests/io/open_plus.py
@@ -1,7 +1,4 @@
-try:
-    import uos as os
-except ImportError:
-    import os
+import os
 
 if not hasattr(os, "remove"):
     print("SKIP")
diff --git a/tests/micropython/builtin_execfile.py b/tests/micropython/builtin_execfile.py
index 8a8ce79f784c9..5a26ccf0ad353 100644
--- a/tests/micropython/builtin_execfile.py
+++ b/tests/micropython/builtin_execfile.py
@@ -1,17 +1,17 @@
 # Test builtin execfile function using VFS.
 
 try:
-    import uio, uos
+    import io, os
 
     execfile
-    uio.IOBase
-    uos.mount
+    io.IOBase
+    os.mount
 except (ImportError, NameError, AttributeError):
     print("SKIP")
     raise SystemExit
 
 
-class File(uio.IOBase):
+class File(io.IOBase):
     def __init__(self, data):
         self.data = data
         self.off = 0
@@ -44,21 +44,25 @@ def open(self, file, mode):
 
 # First umount any existing mount points the target may have.
 try:
-    uos.umount("/")
+    import io, os
+
+    os.umount("/")
 except OSError:
     pass
-for path in uos.listdir("/"):
-    uos.umount("/" + path)
+for path in os.listdir("/"):
+    os.umount("/" + path)
 
 # Create and mount the VFS object.
 files = {
     "/test.py": "print(123)",
 }
 fs = Filesystem(files)
-uos.mount(fs, "/test_mnt")
+os.mount(fs, "/test_mnt")
 
 # Test execfile with a file that doesn't exist.
 try:
+    import io, os
+
     execfile("/test_mnt/noexist.py")
 except OSError:
     print("OSError")
@@ -67,4 +71,4 @@ def open(self, file, mode):
 execfile("/test_mnt/test.py")
 
 # Unmount the VFS object.
-uos.umount(fs)
+os.umount(fs)
diff --git a/tests/micropython/emg_exc.py b/tests/micropython/emg_exc.py
index b8df94b071af8..9a09956c86136 100644
--- a/tests/micropython/emg_exc.py
+++ b/tests/micropython/emg_exc.py
@@ -1,10 +1,10 @@
 # test that emergency exceptions work
 
 import micropython
-import usys
+import sys
 
 try:
-    import uio
+    import io
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -25,8 +25,8 @@ def f():
     micropython.heap_unlock()
 
     # print the exception
-    buf = uio.StringIO()
-    usys.print_exception(exc, buf)
+    buf = io.StringIO()
+    sys.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_bytesio.py b/tests/micropython/heapalloc_bytesio.py
index 4aae2abf063e8..0ac8c92555ab6 100644
--- a/tests/micropython/heapalloc_bytesio.py
+++ b/tests/micropython/heapalloc_bytesio.py
@@ -1,5 +1,5 @@
 try:
-    import uio
+    import io
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -7,7 +7,7 @@
 import micropython
 
 data = b"1234" * 16
-buf = uio.BytesIO(64)
+buf = io.BytesIO(64)
 
 micropython.heap_lock()
 
diff --git a/tests/micropython/heapalloc_bytesio2.py b/tests/micropython/heapalloc_bytesio2.py
index 3b9f141270d5a..05c384a516dec 100644
--- a/tests/micropython/heapalloc_bytesio2.py
+++ b/tests/micropython/heapalloc_bytesio2.py
@@ -1,7 +1,7 @@
 # Creating BytesIO from immutable object should not immediately
 # copy its content.
 try:
-    import uio
+    import io
     import micropython
 
     micropython.mem_total
@@ -14,7 +14,7 @@
 
 before = micropython.mem_total()
 
-buf = uio.BytesIO(data)
+buf = io.BytesIO(data)
 
 after = micropython.mem_total()
 
diff --git a/tests/micropython/heapalloc_iter.py b/tests/micropython/heapalloc_iter.py
index 18f5322ee1552..bd1ba4db79fef 100644
--- a/tests/micropython/heapalloc_iter.py
+++ b/tests/micropython/heapalloc_iter.py
@@ -5,13 +5,10 @@
     print("SKIP")
     raise SystemExit
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     from micropython import heap_lock, heap_unlock
diff --git a/tests/micropython/heapalloc_traceback.py b/tests/micropython/heapalloc_traceback.py
index 09a2ad2c14d6e..4c5f99afeeb44 100644
--- a/tests/micropython/heapalloc_traceback.py
+++ b/tests/micropython/heapalloc_traceback.py
@@ -1,10 +1,10 @@
 # test that we can generate a traceback without allocating
 
 import micropython
-import usys
+import sys
 
 try:
-    import uio
+    import io
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -32,8 +32,8 @@ def test():
 test()
 
 # print the exception that was raised
-buf = uio.StringIO()
-usys.print_exception(global_exc, buf)
+buf = io.StringIO()
+sys.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 b02312a7a8d53..36db102e9d6f3 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -1,16 +1,16 @@
 # test importing of invalid .mpy files
 
 try:
-    import usys, uio, uos
+    import sys, io, os
 
-    uio.IOBase
-    uos.mount
+    io.IOBase
+    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
 
-class UserFile(uio.IOBase):
+class UserFile(io.IOBase):
     def __init__(self, data):
         self.data = memoryview(data)
         self.pos = 0
@@ -52,8 +52,8 @@ def open(self, path, mode):
 }
 
 # create and mount a user filesystem
-uos.mount(UserFS(user_files), "/userfs")
-usys.path.append("/userfs")
+os.mount(UserFS(user_files), "/userfs")
+sys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
 for i in range(len(user_files)):
@@ -64,5 +64,5 @@ def open(self, path, mode):
         print(mod, "ValueError", er)
 
 # unmount and undo path addition
-uos.umount("/userfs")
-usys.path.pop()
+os.umount("/userfs")
+sys.path.pop()
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index 73e20694cc27e..da20746b225de 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -1,23 +1,23 @@
 # test importing of .mpy files with native code
 
 try:
-    import usys, uio, uos
+    import sys, io, os
 
-    usys.implementation._mpy
-    uio.IOBase
-    uos.mount
+    sys.implementation._mpy
+    io.IOBase
+    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
-mpy_arch = usys.implementation._mpy >> 8
+mpy_arch = sys.implementation._mpy >> 8
 if mpy_arch >> 2 == 0:
     # This system does not support .mpy files containing native code
     print("SKIP")
     raise SystemExit
 
 
-class UserFile(uio.IOBase):
+class UserFile(io.IOBase):
     def __init__(self, data):
         self.data = memoryview(data)
         self.pos = 0
@@ -110,8 +110,8 @@ def open(self, path, mode):
 # fmt: on
 
 # create and mount a user filesystem
-uos.mount(UserFS(user_files), "/userfs")
-usys.path.append("/userfs")
+os.mount(UserFS(user_files), "/userfs")
+sys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
 for i in range(len(user_files)):
@@ -123,5 +123,5 @@ def open(self, path, mode):
         print(mod, "ValueError", er)
 
 # unmount and undo path addition
-uos.umount("/userfs")
-usys.path.pop()
+os.umount("/userfs")
+sys.path.pop()
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index e18720fb31473..5a3855dc7d299 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -1,17 +1,17 @@
 # Test that native code loaded from a .mpy file is retained after a GC.
 
 try:
-    import gc, sys, uio, uos
+    import gc, sys, io, os
 
     sys.implementation._mpy
-    uio.IOBase
-    uos.mount
+    io.IOBase
+    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
 
-class UserFile(uio.IOBase):
+class UserFile(io.IOBase):
     def __init__(self, data):
         self.data = memoryview(data)
         self.pos = 0
@@ -68,7 +68,7 @@ def open(self, path, mode):
 user_files = {"/features0.mpy": features0_file_contents[sys_implementation_mpy]}
 
 # Create and mount a user filesystem.
-uos.mount(UserFS(user_files), "/userfs")
+os.mount(UserFS(user_files), "/userfs")
 sys.path.append("/userfs")
 
 # Import the native function.
@@ -89,5 +89,5 @@ def open(self, path, mode):
 print(factorial(10))
 
 # Unmount and undo path addition.
-uos.umount("/userfs")
+os.umount("/userfs")
 sys.path.pop()
diff --git a/tests/micropython/opt_level_lineno.py b/tests/micropython/opt_level_lineno.py
index 1cbf2fb1a8548..d8253e54b41f0 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 usys\n usys.print_exception(er)")
+exec("try:\n xyz\nexcept NameError as er:\n import sys\n sys.print_exception(er)")
diff --git a/tests/micropython/viper_misc_intbig.py b/tests/micropython/viper_misc_intbig.py
index ac09f578572f0..91673f2c1087a 100644
--- a/tests/micropython/viper_misc_intbig.py
+++ b/tests/micropython/viper_misc_intbig.py
@@ -7,6 +7,6 @@ def viper_uint() -> uint:
     return uint(-1)
 
 
-import usys
+import sys
 
-print(viper_uint() == (usys.maxsize << 1 | 1))
+print(viper_uint() == (sys.maxsize << 1 | 1))
diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index cc63185b5d2ee..da90f90ac3ed7 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -1,8 +1,8 @@
 # tests for things that are not implemented, or have non-compliant behaviour
 
 try:
-    import uarray as array
-    import ustruct
+    import array
+    import struct
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -106,10 +106,10 @@
     print("NotImplementedError")
 
 # struct pack with too many args, not checked by uPy
-print(ustruct.pack("bb", 1, 2, 3))
+print(struct.pack("bb", 1, 2, 3))
 
 # struct pack with too few args, not checked by uPy
-print(ustruct.pack("bb", 1))
+print(struct.pack("bb", 1))
 
 # array slice assignment with unsupported RHS
 try:
diff --git a/tests/misc/print_exception.py b/tests/misc/print_exception.py
index 06f4023349a19..1d196d6ab167f 100644
--- a/tests/misc/print_exception.py
+++ b/tests/misc/print_exception.py
@@ -1,10 +1,6 @@
 try:
-    try:
-        import uio as io
-        import usys as sys
-    except ImportError:
-        import io
-        import sys
+    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 141b24cc9f62b..e9c5693f975e3 100644
--- a/tests/misc/sys_atexit.py
+++ b/tests/misc/sys_atexit.py
@@ -1,9 +1,9 @@
 # test sys.atexit() function
 
-import usys
+import sys
 
 try:
-    usys.atexit
+    sys.atexit
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -15,7 +15,7 @@ def do_at_exit():
     print("done at exit:", some_var)
 
 
-usys.atexit(do_at_exit)
+sys.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 3a8c4a6c8d3ed..d7e8a2d943b5e 100644
--- a/tests/misc/sys_exc_info.py
+++ b/tests/misc/sys_exc_info.py
@@ -1,7 +1,4 @@
-try:
-    import usys as sys
-except ImportError:
-    import sys
+import sys
 
 try:
     sys.exc_info
diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
index 7c718ee40a512..872855edbaf2e 100644
--- a/tests/multi_net/ssl_cert_rsa.py
+++ b/tests/multi_net/ssl_cert_rsa.py
@@ -2,7 +2,7 @@
 # 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
+    import binascii, socket, ssl
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/multi_net/ssl_data.py b/tests/multi_net/ssl_data.py
index aef85b83ab3af..a21c8c6589377 100644
--- a/tests/multi_net/ssl_data.py
+++ b/tests/multi_net/ssl_data.py
@@ -2,7 +2,7 @@
 # This test won't run under CPython because it requires key/cert
 
 try:
-    import ubinascii as binascii, usocket as socket, ussl as ssl
+    import binascii, socket, ssl
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py b/tests/multi_net/uasyncio_tcp_readinto.py
index 631997652aa8f..647c06b8aaab5 100644
--- a/tests/multi_net/uasyncio_tcp_readinto.py
+++ b/tests/multi_net/uasyncio_tcp_readinto.py
@@ -10,13 +10,10 @@
         raise SystemExit
 
 try:
-    import uarray as array
+    import array
 except ImportError:
-    try:
-        import array
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 
diff --git a/tests/net_hosted/accept_nonblock.py b/tests/net_hosted/accept_nonblock.py
index d17e287498cd4..30d2033e652e1 100644
--- a/tests/net_hosted/accept_nonblock.py
+++ b/tests/net_hosted/accept_nonblock.py
@@ -1,9 +1,6 @@
 # test that socket.accept() on a non-blocking socket raises EAGAIN
 
-try:
-    import usocket as socket
-except:
-    import socket
+import socket
 
 s = socket.socket()
 s.bind(socket.getaddrinfo("127.0.0.1", 8123)[0][-1])
diff --git a/tests/net_hosted/accept_timeout.py b/tests/net_hosted/accept_timeout.py
index 734fe217cad34..865d2aad26f25 100644
--- a/tests/net_hosted/accept_timeout.py
+++ b/tests/net_hosted/accept_timeout.py
@@ -1,9 +1,6 @@
 # test that socket.accept() on a socket with timeout raises ETIMEDOUT
 
-try:
-    import uerrno as errno, usocket as socket
-except:
-    import errno, socket
+import errno, socket
 
 try:
     socket.socket.settimeout
diff --git a/tests/net_hosted/connect_nonblock.py b/tests/net_hosted/connect_nonblock.py
index 4b8055c1615a9..781f1a4ee2cdc 100644
--- a/tests/net_hosted/connect_nonblock.py
+++ b/tests/net_hosted/connect_nonblock.py
@@ -1,10 +1,6 @@
 # test that socket.connect() on a non-blocking socket raises EINPROGRESS
 
-try:
-    import usocket as socket
-    import uerrno as errno
-except:
-    import socket, errno
+import socket, errno
 
 
 def test(peer_addr):
diff --git a/tests/net_hosted/connect_nonblock_xfer.py b/tests/net_hosted/connect_nonblock_xfer.py
index 1a0b2422765c4..e669a5766c49b 100644
--- a/tests/net_hosted/connect_nonblock_xfer.py
+++ b/tests/net_hosted/connect_nonblock_xfer.py
@@ -1,11 +1,8 @@
 # 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
+import sys, time, socket, errno, ssl
+
 isMP = sys.implementation.name == "micropython"
 
 
diff --git a/tests/net_hosted/connect_poll.py b/tests/net_hosted/connect_poll.py
index b2739e36e9d89..a3232bd334ed5 100644
--- a/tests/net_hosted/connect_poll.py
+++ b/tests/net_hosted/connect_poll.py
@@ -1,9 +1,6 @@
 # test that socket.connect() has correct polling behaviour before, during and after
 
-try:
-    import usocket as socket, uselect as select
-except:
-    import socket, select
+import socket, select
 
 
 def test(peer_addr):
diff --git a/tests/net_hosted/ssl_getpeercert.py b/tests/net_hosted/ssl_getpeercert.py
index dee5fcfd8997e..0df895a654be1 100644
--- a/tests/net_hosted/ssl_getpeercert.py
+++ b/tests/net_hosted/ssl_getpeercert.py
@@ -1,11 +1,7 @@
 # test ssl.getpeercert() method
 
-try:
-    import usocket as socket
-    import ussl as ssl
-except:
-    import socket
-    import ssl
+import socket
+import ssl
 
 
 def test(peer_addr):
diff --git a/tests/net_inet/getaddrinfo.py b/tests/net_inet/getaddrinfo.py
index 765723ae73f87..e26060ad212a6 100644
--- a/tests/net_inet/getaddrinfo.py
+++ b/tests/net_inet/getaddrinfo.py
@@ -1,7 +1,4 @@
-try:
-    import usocket as socket, sys
-except:
-    import socket, sys
+import socket, sys
 
 
 def test_non_existent():
diff --git a/tests/net_inet/ssl_cert.py b/tests/net_inet/ssl_cert.py
index d2d437e381b17..d6e0aec889732 100644
--- a/tests/net_inet/ssl_cert.py
+++ b/tests/net_inet/ssl_cert.py
@@ -1,6 +1,6 @@
-import ubinascii as binascii
-import usocket as socket
-import ussl as ssl
+import binascii
+import socket
+import ssl
 
 
 # This certificate was obtained from micropython.org using openssl:
diff --git a/tests/net_inet/ssl_errors.py b/tests/net_inet/ssl_errors.py
index ece1f6e253b42..65f3637e9e2f1 100644
--- a/tests/net_inet/ssl_errors.py
+++ b/tests/net_inet/ssl_errors.py
@@ -1,12 +1,7 @@
 # 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
+import sys, errno, socket, ssl
 
 
 def test(addr, hostname, block=True):
diff --git a/tests/net_inet/test_tls_nonblock.py b/tests/net_inet/test_tls_nonblock.py
index b4f2ef4ed2708..6378280a71d30 100644
--- a/tests/net_inet/test_tls_nonblock.py
+++ b/tests/net_inet/test_tls_nonblock.py
@@ -1,7 +1,4 @@
-try:
-    import usocket as socket, ussl as ssl, uerrno as errno, sys
-except:
-    import socket, ssl, errno, sys, time, select
+import socket, ssl, errno, sys, time, select
 
 
 def test_one(site, opts):
diff --git a/tests/net_inet/test_tls_sites.py b/tests/net_inet/test_tls_sites.py
index fabe4b43c9cee..f9a3dc86d2f2c 100644
--- a/tests/net_inet/test_tls_sites.py
+++ b/tests/net_inet/test_tls_sites.py
@@ -1,21 +1,16 @@
-try:
-    import usocket as _socket
-except:
-    import _socket
-try:
-    import ussl as ssl
-except:
-    import ssl
-
-    # CPython only supports server_hostname with SSLContext
+import socket
+import ssl
+
+# CPython only supports server_hostname with SSLContext
+if hasattr(ssl, "SSLContext"):
     ssl = ssl.SSLContext()
 
 
 def test_one(site, opts):
-    ai = _socket.getaddrinfo(site, 443)
+    ai = socket.getaddrinfo(site, 443)
     addr = ai[0][-1]
 
-    s = _socket.socket()
+    s = socket.socket()
 
     try:
         s.connect(addr)
diff --git a/tests/net_inet/tls_num_errors.py b/tests/net_inet/tls_num_errors.py
index dd7f714e6ef7e..34aa2bb455134 100644
--- a/tests/net_inet/tls_num_errors.py
+++ b/tests/net_inet/tls_num_errors.py
@@ -1,9 +1,7 @@
 # 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
+import socket, ssl, sys
+
 try:
     from micropython import alloc_emergency_exception_buf, heap_lock, heap_unlock
 except:
diff --git a/tests/net_inet/tls_text_errors.py b/tests/net_inet/tls_text_errors.py
index 9e8ccfaf9ec77..498593bba2203 100644
--- a/tests/net_inet/tls_text_errors.py
+++ b/tests/net_inet/tls_text_errors.py
@@ -1,9 +1,6 @@
 # test that modtls produces a text error message
 
-try:
-    import usocket as socket, ussl as ssl, sys
-except:
-    import socket, ssl, sys
+import socket, ssl, sys
 
 
 def test(addr):
diff --git a/tests/perf_bench/benchrun.py b/tests/perf_bench/benchrun.py
index ed43297d15fdc..4029c8ac8aa94 100644
--- a/tests/perf_bench/benchrun.py
+++ b/tests/perf_bench/benchrun.py
@@ -1,10 +1,10 @@
 def bm_run(N, M):
     try:
-        from utime import ticks_us, ticks_diff
+        from time import ticks_us, ticks_diff
     except ImportError:
-        import time
+        from time import perf_counter
 
-        ticks_us = lambda: int(time.perf_counter() * 1000000)
+        ticks_us = lambda: int(perf_counter() * 1000000)
         ticks_diff = lambda a, b: a - b
 
     # Pick sensible parameters given N, M
diff --git a/tests/perf_bench/bm_hexiom.py b/tests/perf_bench/bm_hexiom.py
index 84eda9a90966e..e36fc234cd71a 100644
--- a/tests/perf_bench/bm_hexiom.py
+++ b/tests/perf_bench/bm_hexiom.py
@@ -632,10 +632,7 @@ def solve_file(file, strategy, order, output):
 
 
 def bm_setup(params):
-    try:
-        import uio as io
-    except ImportError:
-        import io
+    import io
 
     loops, level, order, strategy = params
 
diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index 99c4721d29d68..ce68306678b1a 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -1,8 +1,8 @@
 # Test performance of importing an .mpy file many times.
 
-import usys, uio, uos
+import sys, io, os
 
-if not (hasattr(uio, "IOBase") and hasattr(uos, "mount")):
+if not (hasattr(io, "IOBase") and hasattr(os, "mount")):
     print("SKIP")
     raise SystemExit
 
@@ -26,7 +26,7 @@ def f():
 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):
+class File(io.IOBase):
     def __init__(self):
         self.off = 0
 
@@ -57,14 +57,14 @@ def open(self, path, mode):
 
 
 def mount():
-    uos.mount(FS(), "/__remote")
-    uos.chdir("/__remote")
+    os.mount(FS(), "/__remote")
+    os.chdir("/__remote")
 
 
 def test(r):
     global result
     for _ in r:
-        usys.modules.clear()
+        sys.modules.clear()
         module = __import__("__injected")
     result = module.result
 
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index af3f4a29b255e..1b411fc3fb6d9 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -2,9 +2,9 @@
 # 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
+import io, os
 
-if not (hasattr(uio, "IOBase") and hasattr(uos, "mount")):
+if not (hasattr(io, "IOBase") and hasattr(os, "mount")):
     print("SKIP")
     raise SystemExit
 
@@ -81,7 +81,7 @@ def f1():
 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):
+class File(io.IOBase):
     def __init__(self):
         self.off = 0
 
@@ -112,8 +112,8 @@ def open(self, path, mode):
 
 
 def mount():
-    uos.mount(FS(), "/__remote")
-    uos.chdir("/__remote")
+    os.mount(FS(), "/__remote")
+    os.chdir("/__remote")
 
 
 def test():
diff --git a/tests/renesas-ra/freq.py b/tests/renesas-ra/freq.py
index 6ce1871f8c112..97fe946b72a29 100644
--- a/tests/renesas-ra/freq.py
+++ b/tests/renesas-ra/freq.py
@@ -20,7 +20,7 @@
 
 try:
     import machine
-except:
+except ImportError:
     print("machine module is not found")
     raise SystemExit
 
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 16bb469222569..9fe970a6d0939 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -22,16 +22,16 @@
 TEST_MAPPINGS = {
     "btree": "btree/btree_$(ARCH).mpy",
     "framebuf": "framebuf/framebuf_$(ARCH).mpy",
-    "uheapq": "uheapq/uheapq_$(ARCH).mpy",
-    "urandom": "urandom/urandom_$(ARCH).mpy",
-    "ure": "ure/ure_$(ARCH).mpy",
-    "uzlib": "uzlib/uzlib_$(ARCH).mpy",
+    "heapq": "heapq/heapq_$(ARCH).mpy",
+    "random": "random/random_$(ARCH).mpy",
+    "re": "re/re_$(ARCH).mpy",
+    "zlib": "zlib/zlib_$(ARCH).mpy",
 }
 
 # Code to allow a target MicroPython to import an .mpy from RAM
 injected_import_hook_code = """\
-import usys, uos, uio
-class __File(uio.IOBase):
+import sys, os, io
+class __File(io.IOBase):
   def __init__(self):
     self.off = 0
   def ioctl(self, request, arg):
@@ -52,9 +52,9 @@ def stat(self, path):
       raise OSError(-2) # ENOENT
   def open(self, path, mode):
     return __File()
-uos.mount(__FS(), '/__remote')
-uos.chdir('/__remote')
-usys.modules['{}'] = __import__('__injected')
+os.mount(__FS(), '/__remote')
+os.chdir('/__remote')
+sys.modules['{}'] = __import__('__injected')
 """
 
 
diff --git a/tests/run-tests-exp.py b/tests/run-tests-exp.py
index 21b6645336f1f..bbb057f4cede9 100644
--- a/tests/run-tests-exp.py
+++ b/tests/run-tests-exp.py
@@ -5,8 +5,8 @@
 # This script is intended to be run by the same interpreter executable
 # which is to be tested, so should use minimal language functionality.
 #
-import usys as sys
-import uos as os
+import sys
+import os
 
 
 tests = ["basics", "micropython", "float", "import", "io", " misc", "unicode", "extmod", "unix"]
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 498db8b4041b4..4964ff49fd021 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -56,8 +56,8 @@ def base_path(*p):
 
 # Code to allow a target MicroPython to import an .mpy from RAM
 injected_import_hook_code = """\
-import usys, uos, uio
-class __File(uio.IOBase):
+import sys, os, io
+class __File(io.IOBase):
   def __init__(self):
     self.off = 0
   def ioctl(self, request, arg):
@@ -80,8 +80,8 @@ def stat(self, path):
       raise OSError(-2) # ENOENT
   def open(self, path, mode):
     return __File()
-uos.mount(__FS(), '/__vfstest')
-uos.chdir('/__vfstest')
+os.mount(__FS(), '/__vfstest')
+os.chdir('/__vfstest')
 __import__('__injected_test')
 """
 
@@ -455,9 +455,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         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":
+        # Check if io module exists, and skip such tests if it doesn't
+        output = run_feature_check(pyb, args, base_path, "io_module.py")
+        if output != b"io\n":
             skip_io_module = True
 
         # Check if fstring feature is enabled, and skip such tests if it doesn't
@@ -512,9 +512,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         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("extmod/json_dumps_float.py")
+        skip_tests.add("extmod/json_loads_float.py")
+        skip_tests.add("extmod/random_extra_float.py")
         skip_tests.add("misc/rge_sm.py")
     if upy_float_precision < 32:
         skip_tests.add(
@@ -544,7 +544,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")
+        skip_tests.add("extmod/ssl_poll.py")
 
     # Some tests shouldn't be run on a PC
     if args.target == "unix":
@@ -568,9 +568,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
                 }
             )  # 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
+            skip_tests.add("extmod/heapq1.py")  # heapq not supported by WiPy
+            skip_tests.add("extmod/random_basic.py")  # requires random
+            skip_tests.add("extmod/random_extra.py")  # requires random
         elif args.target == "esp8266":
             skip_tests.add("misc/rge_sm.py")  # too large
         elif args.target == "minimal":
@@ -582,7 +582,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             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("extmod/random_basic.py")  # unimplemented: random.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:
@@ -590,7 +590,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
                     skip_tests.add(t)
         elif args.target == "renesas-ra":
             skip_tests.add(
-                "extmod/utime_time_ns.py"
+                "extmod/time_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
diff --git a/tests/stress/recursive_data.py b/tests/stress/recursive_data.py
index 3b7fa50952584..6e01319ed3a36 100644
--- a/tests/stress/recursive_data.py
+++ b/tests/stress/recursive_data.py
@@ -1,6 +1,6 @@
 # This tests that printing recursive data structure doesn't lead to segfault.
 try:
-    import uio as io
+    import io
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index aaf9f576dd5a5..b25da855aeffc 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -216,10 +216,7 @@ def apply_to(self, data):
 ##################################################################
 # test code
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/thread/stress_create.py b/tests/thread/stress_create.py
index 877424cdf50b2..98f272f5cd33a 100644
--- a/tests/thread/stress_create.py
+++ b/tests/thread/stress_create.py
@@ -1,13 +1,12 @@
 # stress test for creating many threads
 
-try:
-    import utime
-
-    sleep_ms = utime.sleep_ms
-except ImportError:
-    import time
+import time
 
+if hasattr(time, "sleep_ms"):
+    sleep_ms = time.sleep_ms
+else:
     sleep_ms = lambda t: time.sleep(t / 1000)
+
 import _thread
 
 
diff --git a/tests/thread/stress_heap.py b/tests/thread/stress_heap.py
index 2ad91ae147694..dec65c7ce0534 100644
--- a/tests/thread/stress_heap.py
+++ b/tests/thread/stress_heap.py
@@ -3,10 +3,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/thread/stress_schedule.py b/tests/thread/stress_schedule.py
index 8be7f2d737874..40191e6620986 100644
--- a/tests/thread/stress_schedule.py
+++ b/tests/thread/stress_schedule.py
@@ -2,7 +2,7 @@
 # while dealing with concurrent access from multiple threads.
 
 import _thread
-import utime
+import time
 import micropython
 import gc
 
@@ -32,15 +32,15 @@ def thread():
             micropython.schedule(task, None)
         except RuntimeError:
             # Queue full, back off.
-            utime.sleep_ms(10)
+            time.sleep_ms(10)
 
 
 for i in range(8):
     _thread.start_new_thread(thread, ())
 
 # 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:
+t = time.ticks_ms()
+while n < _NUM_TASKS and time.ticks_diff(time.ticks_ms(), t) < _TIMEOUT_MS:
     pass
 
 if n < _NUM_TASKS:
diff --git a/tests/thread/thread_exc2.py b/tests/thread/thread_exc2.py
index 2863e1dec12a4..6f77bdbffaa92 100644
--- a/tests/thread/thread_exc2.py
+++ b/tests/thread/thread_exc2.py
@@ -1,5 +1,5 @@
 # test raising exception within thread which is not caught
-import utime
+import time
 import _thread
 
 
@@ -8,5 +8,5 @@ def thread_entry():
 
 
 _thread.start_new_thread(thread_entry, ())
-utime.sleep(1)
+time.sleep(1)
 print("done")
diff --git a/tests/thread/thread_exit1.py b/tests/thread/thread_exit1.py
index 186a9be340bd1..e34ca827ca383 100644
--- a/tests/thread/thread_exit1.py
+++ b/tests/thread/thread_exit1.py
@@ -2,10 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/thread/thread_exit2.py b/tests/thread/thread_exit2.py
index 5be7945db2205..630b664758267 100644
--- a/tests/thread/thread_exit2.py
+++ b/tests/thread/thread_exit2.py
@@ -2,10 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/thread/thread_lock2.py b/tests/thread/thread_lock2.py
index b842f69c937dc..96b3a6af809c1 100644
--- a/tests/thread/thread_lock2.py
+++ b/tests/thread/thread_lock2.py
@@ -2,10 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 lock = _thread.allocate_lock()
diff --git a/tests/thread/thread_lock4.py b/tests/thread/thread_lock4.py
index bbf9043996182..97c3dc538007d 100644
--- a/tests/thread/thread_lock4.py
+++ b/tests/thread/thread_lock4.py
@@ -2,10 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/thread/thread_qstr1.py b/tests/thread/thread_qstr1.py
index 14f5b6be6649d..f184d2a58e1d4 100644
--- a/tests/thread/thread_qstr1.py
+++ b/tests/thread/thread_qstr1.py
@@ -2,10 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/thread/thread_sleep1.py b/tests/thread/thread_sleep1.py
index 18fa4e05a115a..add9b02f1573b 100644
--- a/tests/thread/thread_sleep1.py
+++ b/tests/thread/thread_sleep1.py
@@ -2,13 +2,11 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime
-
-    sleep_ms = utime.sleep_ms
-except ImportError:
-    import time
+import time
 
+if hasattr(time, "sleep_ms"):
+    sleep_ms = time.sleep_ms
+else:
     sleep_ms = lambda t: time.sleep(t / 1000)
 
 import _thread
diff --git a/tests/thread/thread_stacksize1.py b/tests/thread/thread_stacksize1.py
index cf46b73b770e0..140d165cb3497 100644
--- a/tests/thread/thread_stacksize1.py
+++ b/tests/thread/thread_stacksize1.py
@@ -1,10 +1,8 @@
 # test setting the thread stack size
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
-try:
-    import usys as sys
-except ImportError:
-    import sys
+
+import sys
 import _thread
 
 # different implementations have different minimum sizes
diff --git a/tests/thread/thread_start1.py b/tests/thread/thread_start1.py
index 7274633245a71..ea8c4f0002507 100644
--- a/tests/thread/thread_start1.py
+++ b/tests/thread/thread_start1.py
@@ -2,10 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/thread/thread_start2.py b/tests/thread/thread_start2.py
index d68ea94329beb..f8239a779a673 100644
--- a/tests/thread/thread_start2.py
+++ b/tests/thread/thread_start2.py
@@ -2,10 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 import _thread
 
 
diff --git a/tests/unicode/unicode_ure.py b/tests/unicode/unicode_ure.py
index 5a5dc600545f1..c268b9e6fe96a 100644
--- a/tests/unicode/unicode_ure.py
+++ b/tests/unicode/unicode_ure.py
@@ -1,13 +1,10 @@
 # test match.span() for unicode strings
 
 try:
-    import ure as re
+    import re
 except ImportError:
-    try:
-        import re
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     m = re.match(".", "a")
diff --git a/tests/unix/extra_coverage.py b/tests/unix/extra_coverage.py
index 3c12b26923a57..0ea8f7886bfff 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/unix/extra_coverage.py
@@ -4,8 +4,8 @@
     print("SKIP")
     raise SystemExit
 
-import uerrno
-import uio
+import errno
+import io
 
 data = extra_coverage()
 
@@ -18,7 +18,7 @@
 
 # test streams
 stream = data[2]  # has set_error and set_buf. Write always returns error
-stream.set_error(uerrno.EAGAIN)  # non-blocking error
+stream.set_error(errno.EAGAIN)  # non-blocking error
 print(stream.read())  # read all encounters non-blocking error
 print(stream.read(1))  # read 1 byte encounters non-blocking error
 print(stream.readline())  # readline encounters non-blocking error
@@ -42,8 +42,8 @@
 print(stream2.read(1))  # read 1 byte encounters non-blocking error with textio stream
 
 # test BufferedWriter with stream errors
-stream.set_error(uerrno.EAGAIN)
-buf = uio.BufferedWriter(stream, 8)
+stream.set_error(errno.EAGAIN)
+buf = io.BufferedWriter(stream, 8)
 print(buf.write(bytearray(16)))
 
 # function defined in C++ code
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 7ea2599c91938..6ec8eaaa04405 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -48,21 +48,21 @@ RuntimeError:
 RuntimeError: 
 # repl
 ame__
-mport 
+port 
 
 builtins        micropython     _thread         _uasyncio
-btree           cexample        cmath           cppexample
-example_package                 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
+array           binascii        btree           cexample
+cmath           collections     cppexample      cryptolib
+errno           example_package                 ffi
+framebuf        gc              hashlib         heapq
+io              json            machine         math
+os              random          re              select
+socket          ssl             struct          sys
+termios         time            timeq           uctypes
+websocket       zlib
+me
 
-utime           utimeq
+time            timeq
 
 argv            atexit          byteorder       exc_info
 executable      exit            getsizeof       implementation
diff --git a/tests/unix/ffi_types.py b/tests/unix/ffi_types.py
index fd94c509d05ed..06e9b89d3fe23 100644
--- a/tests/unix/ffi_types.py
+++ b/tests/unix/ffi_types.py
@@ -1,7 +1,7 @@
 # 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
+import os, sys
 
 try:
     import ffi
@@ -9,9 +9,9 @@
     print("SKIP")
     raise SystemExit
 
-ffi_lib_filename = "./" + usys.argv[0].rsplit("/", 1)[0] + "/ffi_lib.so"
+ffi_lib_filename = "./" + sys.argv[0].rsplit("/", 1)[0] + "/ffi_lib.so"
 try:
-    uos.stat(ffi_lib_filename)
+    os.stat(ffi_lib_filename)
 except OSError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/unix/time.py b/tests/unix/time_mktime_localtime.py
similarity index 96%
rename from tests/unix/time.py
rename to tests/unix/time_mktime_localtime.py
index 55a4b18aaef38..d1c03c103d704 100644
--- a/tests/unix/time.py
+++ b/tests/unix/time_mktime_localtime.py
@@ -1,7 +1,4 @@
-try:
-    import utime as time
-except ImportError:
-    import time
+import time
 
 DAYS_PER_MONTH = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
diff --git a/tests/wipy/wlan/machine.py.exp b/tests/wipy/wlan/machine.py.exp
index cc5b3f61dab03..303a0633a65f4 100644
--- a/tests/wipy/wlan/machine.py.exp
+++ b/tests/wipy/wlan/machine.py.exp
@@ -1,4 +1,4 @@
-<module 'umachine'>
+<module 'machine'>
 True
 True
 Active
diff --git a/tools/ci.sh b/tools/ci.sh
index 21acc17535bb0..a010adcbce721 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -630,8 +630,8 @@ function ci_unix_macos_build {
 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 && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
+    # - random_basic has a problem with getrandbits(0)
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude 'import_pkg7.py' --exclude 'random_basic.py')
 }
 
 function ci_unix_qemu_mips_setup {
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index feda75f283d3c..d6e87ac6ce24d 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -65,11 +65,11 @@ def script_to_map(test_file):
     "basics/bytes_compare3.py",
     "extmod/ticks_diff.py",
     "extmod/time_ms_us.py",
-    "extmod/uheapq_timeq.py",
+    "extmod/heapq_timeq.py",
     # unicode char issue
-    "extmod/ujson_loads.py",
+    "extmod/json_loads.py",
     # doesn't output to python stdout
-    "extmod/ure_debug.py",
+    "extmod/re_debug.py",
     "extmod/vfs_basic.py",
     "extmod/vfs_fat_ramdisk.py",
     "extmod/vfs_fat_fileio.py",

From 109717457edbf49421af3848ea26e26fff567289 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 2 Jun 2023 15:23:23 +1000
Subject: [PATCH 0023/3129] tests/run-multitests.py: Don't allow imports from
 the cwd.

Make tests run in an isolated environment (i.e. `import io` would
otherwise get the `tests/io` directory).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/run-multitests.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 81db31ea94e86..5ae8b8ea48014 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -162,6 +162,14 @@ def __init__(self, argv, env=None):
     def __str__(self):
         return self.argv[0].rsplit("/")[-1]
 
+    def prepare_script_from_file(self, filename, prepend, append):
+        # Make tests run in an isolated environment (i.e. `import io` would
+        # otherwise get the `tests/io` directory).
+        remove_cwd_from_sys_path = b"import sys\nsys.path.remove('')\n\n"
+        return remove_cwd_from_sys_path + super().prepare_script_from_file(
+            filename, prepend, append
+        )
+
     def run_script(self, script):
         output = b""
         err = None
@@ -582,7 +590,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.join(("", ".frozen", "../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 339f02a5947e79347014b4d34adbf8a120b184bc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 2 Jun 2023 15:40:03 +1000
Subject: [PATCH 0024/3129] tests/run-perfbench.py: Don't allow imports from
 the cwd.

Make tests run in an isolated environment (i.e. `import io` would
otherwise get the `tests/io` directory).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/perf_bench/core_import_mpy_multi.py  | 4 ++--
 tests/perf_bench/core_import_mpy_single.py | 6 +++---
 tests/run-perfbench.py                     | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index ce68306678b1a..364c325042843 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -47,7 +47,7 @@ def chdir(self, path):
         pass
 
     def stat(self, path):
-        if path == "__injected.mpy":
+        if path == "/__injected.mpy":
             return tuple(0 for _ in range(10))
         else:
             raise OSError(-2)  # ENOENT
@@ -58,7 +58,7 @@ def open(self, path, mode):
 
 def mount():
     os.mount(FS(), "/__remote")
-    os.chdir("/__remote")
+    sys.path.insert(0, "/__remote")
 
 
 def test(r):
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index 1b411fc3fb6d9..5757c3eaf1fdf 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -2,7 +2,7 @@
 # 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 io, os
+import io, os, sys
 
 if not (hasattr(io, "IOBase") and hasattr(os, "mount")):
     print("SKIP")
@@ -102,7 +102,7 @@ def chdir(self, path):
         pass
 
     def stat(self, path):
-        if path == "__injected.mpy":
+        if path == "/__injected.mpy":
             return tuple(0 for _ in range(10))
         else:
             raise OSError(-2)  # ENOENT
@@ -113,7 +113,7 @@ def open(self, path, mode):
 
 def mount():
     os.mount(FS(), "/__remote")
-    os.chdir("/__remote")
+    sys.path.insert(0, "/__remote")
 
 
 def test():
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 578f975bb8424..81d873c45997d 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -109,8 +109,9 @@ def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
             continue
 
         # Create test script
+        test_script = b"import sys\nsys.path.remove('')\n\n"
         with open(test_file, "rb") as f:
-            test_script = f.read()
+            test_script += f.read()
         with open(BENCH_SCRIPT_DIR + "benchrun.py", "rb") as f:
             test_script += f.read()
         test_script += b"bm_run(%u, %u)\n" % (param_n, param_m)

From 9d7eac07138b6e02f4c0775dc70f36fdd69432a2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 2 Jun 2023 17:58:27 +1000
Subject: [PATCH 0025/3129] tests/run-natmodtests.py: Don't allow imports from
 the cwd.

Make tests run in an isolated environment (i.e. `import io` would
otherwise get the `tests/io` directory).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/run-natmodtests.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 9fe970a6d0939..16f8fde967b36 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -46,14 +46,14 @@ def mount(self, readonly, mkfs):
   def chdir(self, path):
     pass
   def stat(self, path):
-    if path == '__injected.mpy':
+    if path == '/__injected.mpy':
       return tuple(0 for _ in range(10))
     else:
       raise OSError(-2) # ENOENT
   def open(self, path, mode):
     return __File()
 os.mount(__FS(), '/__remote')
-os.chdir('/__remote')
+sys.path.insert(0, '/__remote')
 sys.modules['{}'] = __import__('__injected')
 """
 
@@ -111,9 +111,10 @@ def run_tests(target_truth, target, args, stats):
             test_file_data = f.read()
 
         # Create full test with embedded .mpy
+        test_script = b"import sys\nsys.path.remove('')\n\n"
         try:
             with open(NATMOD_EXAMPLE_DIR + test_mpy, "rb") as f:
-                test_script = b"__buf=" + bytes(repr(f.read()), "ascii") + b"\n"
+                test_script += b"__buf=" + bytes(repr(f.read()), "ascii") + b"\n"
         except OSError:
             print("----  {} - mpy file not compiled".format(test_file))
             continue

From 5fd042e7d1610b4d42acfc523441468f2ac28c6f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 19 Aug 2022 22:58:37 +1000
Subject: [PATCH 0026/3129] all: Replace all uses of umodule in Python code.

Applies to drivers/examples/extmod/port-modules/tools.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/hwapi/README.md                      |  6 +--
 examples/hwapi/button_led.py                  |  4 +-
 examples/hwapi/button_reaction.py             |  4 +-
 examples/hwapi/soft_pwm.py                    |  6 +--
 examples/network/http_client.py               |  5 +--
 examples/network/http_client_ssl.py           | 14 ++-----
 examples/network/http_server.py               |  5 +--
 examples/network/http_server_simplistic.py    |  5 +--
 .../http_server_simplistic_commented.py       |  5 +--
 examples/network/http_server_ssl.py           | 10 ++---
 examples/unix/machine_bios.py                 |  2 +-
 extmod/uasyncio/event.py                      |  4 +-
 extmod/uasyncio/stream.py                     |  6 +--
 ports/esp32/modules/_boot.py                  |  4 +-
 ports/esp32/modules/inisetup.py               |  8 ++--
 ports/esp8266/boards/GENERIC/board.md         |  2 +-
 ports/esp8266/boards/GENERIC_1M/board.md      |  2 +-
 ports/esp8266/modules/_boot.py                |  4 +-
 ports/esp8266/modules/espnow.py               |  2 +-
 ports/esp8266/modules/inisetup.py             | 18 ++++-----
 ports/nrf/modules/scripts/_mkfs.py            | 14 +++----
 ports/rp2/modules/rp2.py                      |  4 +-
 ports/samd/modules/_boot.py                   |  8 ++--
 .../boards/NUCLEO_WB55/rfcore_firmware.py     |  2 +-
 ports/stm32/mboot/fwupdate.py                 |  6 +--
 tools/mpremote/mpremote/commands.py           |  4 +-
 tools/mpremote/mpremote/main.py               |  2 +-
 tools/mpremote/mpremote/transport_serial.py   | 38 +++++++++----------
 tools/pyboard.py                              | 26 ++++++-------
 29 files changed, 99 insertions(+), 121 deletions(-)

diff --git a/examples/hwapi/README.md b/examples/hwapi/README.md
index f3de752f9c063..a1b0c5642a2fb 100644
--- a/examples/hwapi/README.md
+++ b/examples/hwapi/README.md
@@ -40,13 +40,13 @@ application of this idea would look like:
 `app.py`:
 
     from hwconfig import *
-    import utime
+    import time
 
     while True:
         LED.value(1)
-        utime.sleep_ms(500)
+        time.sleep_ms(500)
         LED.value(0)
-        utime.sleep_ms(500)
+        time.sleep_ms(500)
 
 
 To deploy this application to a particular board, a user will need:
diff --git a/examples/hwapi/button_led.py b/examples/hwapi/button_led.py
index bd6fe0172988c..c73bcfc89a297 100644
--- a/examples/hwapi/button_led.py
+++ b/examples/hwapi/button_led.py
@@ -1,4 +1,4 @@
-import utime
+import time
 from hwconfig import LED, BUTTON
 
 # Light LED when (and while) a BUTTON is pressed
@@ -6,4 +6,4 @@
 while 1:
     LED.value(BUTTON.value())
     # Don't burn CPU
-    utime.sleep_ms(10)
+    time.sleep_ms(10)
diff --git a/examples/hwapi/button_reaction.py b/examples/hwapi/button_reaction.py
index e5a139a575f2c..52bdf793849ed 100644
--- a/examples/hwapi/button_reaction.py
+++ b/examples/hwapi/button_reaction.py
@@ -1,4 +1,4 @@
-import utime
+import time
 import machine
 from hwconfig import LED, BUTTON
 
@@ -18,4 +18,4 @@
         print("Well, you're *really* slow")
     else:
         print("You are as slow as %d microseconds!" % delay)
-    utime.sleep_ms(10)
+    time.sleep_ms(10)
diff --git a/examples/hwapi/soft_pwm.py b/examples/hwapi/soft_pwm.py
index 72291b0ecde52..466de08f09b6c 100644
--- a/examples/hwapi/soft_pwm.py
+++ b/examples/hwapi/soft_pwm.py
@@ -1,4 +1,4 @@
-import utime
+import time
 from hwconfig import LED
 
 
@@ -15,10 +15,10 @@ def pwm_cycle(led, duty, cycles):
     for i in range(cycles):
         if duty:
             led.on()
-            utime.sleep_ms(duty)
+            time.sleep_ms(duty)
         if duty_off:
             led.off()
-            utime.sleep_ms(duty_off)
+            time.sleep_ms(duty_off)
 
 
 # At the duty setting of 1, an LED is still pretty bright, then
diff --git a/examples/network/http_client.py b/examples/network/http_client.py
index 0791c8066b676..661c286b70bc4 100644
--- a/examples/network/http_client.py
+++ b/examples/network/http_client.py
@@ -1,7 +1,4 @@
-try:
-    import usocket as socket
-except:
-    import socket
+import socket
 
 
 def main(use_stream=False):
diff --git a/examples/network/http_client_ssl.py b/examples/network/http_client_ssl.py
index 83f685fdf35db..323971c0ee24d 100644
--- a/examples/network/http_client_ssl.py
+++ b/examples/network/http_client_ssl.py
@@ -1,17 +1,11 @@
-try:
-    import usocket as _socket
-except:
-    import _socket
-try:
-    import ussl as ssl
-except:
-    import ssl
+import socket
+import ssl
 
 
 def main(use_stream=True):
-    s = _socket.socket()
+    s = socket.socket()
 
-    ai = _socket.getaddrinfo("google.com", 443)
+    ai = socket.getaddrinfo("google.com", 443)
     print("Address infos:", ai)
     addr = ai[0][-1]
 
diff --git a/examples/network/http_server.py b/examples/network/http_server.py
index 76be3ab8173b0..a6ed53154a4eb 100644
--- a/examples/network/http_server.py
+++ b/examples/network/http_server.py
@@ -1,7 +1,4 @@
-try:
-    import usocket as socket
-except:
-    import socket
+import socket
 
 
 CONTENT = b"""\
diff --git a/examples/network/http_server_simplistic.py b/examples/network/http_server_simplistic.py
index a9831127ff05a..09936b9d91ea8 100644
--- a/examples/network/http_server_simplistic.py
+++ b/examples/network/http_server_simplistic.py
@@ -1,9 +1,6 @@
 # Do not use this code in real projects! Read
 # http_server_simplistic_commented.py for details.
-try:
-    import usocket as socket
-except:
-    import socket
+import socket
 
 
 CONTENT = b"""\
diff --git a/examples/network/http_server_simplistic_commented.py b/examples/network/http_server_simplistic_commented.py
index da042c6c8a56e..d4710ad61a61e 100644
--- a/examples/network/http_server_simplistic_commented.py
+++ b/examples/network/http_server_simplistic_commented.py
@@ -8,10 +8,7 @@
 # details, and use this code only for quick hacks, preferring
 # http_server.py for "real thing".
 #
-try:
-    import usocket as socket
-except:
-    import socket
+import socket
 
 
 CONTENT = b"""\
diff --git a/examples/network/http_server_ssl.py b/examples/network/http_server_ssl.py
index 1116c71e996a9..7766fa7ea5661 100644
--- a/examples/network/http_server_ssl.py
+++ b/examples/network/http_server_ssl.py
@@ -1,10 +1,6 @@
-import ubinascii as binascii
-
-try:
-    import usocket as socket
-except:
-    import socket
-import ussl as ssl
+import binascii
+import socket
+import ssl
 
 
 # This self-signed key/cert pair is randomly generated and to be used for
diff --git a/examples/unix/machine_bios.py b/examples/unix/machine_bios.py
index 878f3fd8f3c58..40aae4ccefe6d 100644
--- a/examples/unix/machine_bios.py
+++ b/examples/unix/machine_bios.py
@@ -4,6 +4,6 @@
 # It is expected to print 0xaa55, which is a signature at the start of
 # Video BIOS.
 
-import umachine as machine
+import machine
 
 print(hex(machine.mem16[0xC0000]))
diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index 43d47eb5f06f6..8a9053459072e 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -40,9 +40,9 @@ def wait(self):
 # that asyncio will poll until a flag is set.
 # Note: Unlike Event, this is self-clearing after a wait().
 try:
-    import uio
+    import io
 
-    class ThreadSafeFlag(uio.IOBase):
+    class ThreadSafeFlag(io.IOBase):
         def __init__(self):
             self.state = 0
 
diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 875353c940f03..ac297cce04d79 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -101,8 +101,8 @@ def drain(self):
 #
 # async
 def open_connection(host, port):
-    from uerrno import EINPROGRESS
-    import usocket as socket
+    from errno import EINPROGRESS
+    import socket
 
     ai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)[0]  # TODO this is blocking!
     s = socket.socket(ai[0], ai[1], ai[2])
@@ -154,7 +154,7 @@ async def _serve(self, s, cb):
 # 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):
-    import usocket as socket
+    import socket
 
     # Create and bind server socket.
     host = socket.getaddrinfo(host, port)[0]  # TODO this is blocking!
diff --git a/ports/esp32/modules/_boot.py b/ports/esp32/modules/_boot.py
index a7d9813090bfd..651fc7b10cdd8 100644
--- a/ports/esp32/modules/_boot.py
+++ b/ports/esp32/modules/_boot.py
@@ -1,10 +1,10 @@
 import gc
-import uos
+import os
 from flashbdev import bdev
 
 try:
     if bdev:
-        uos.mount(bdev, "/")
+        os.mount(bdev, "/")
 except OSError:
     import inisetup
 
diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py
index 426a47a6b45e5..35d1c6bc9a829 100644
--- a/ports/esp32/modules/inisetup.py
+++ b/ports/esp32/modules/inisetup.py
@@ -1,4 +1,4 @@
-import uos
+import os
 from flashbdev import bdev
 
 
@@ -33,9 +33,9 @@ def fs_corrupted():
 def setup():
     check_bootsec()
     print("Performing initial setup")
-    uos.VfsLfs2.mkfs(bdev)
-    vfs = uos.VfsLfs2(bdev)
-    uos.mount(vfs, "/")
+    os.VfsLfs2.mkfs(bdev)
+    vfs = os.VfsLfs2(bdev)
+    os.mount(vfs, "/")
     with open("boot.py", "w") as f:
         f.write(
             """\
diff --git a/ports/esp8266/boards/GENERIC/board.md b/ports/esp8266/boards/GENERIC/board.md
index b93ca509f89c7..fa0cf410d66fa 100644
--- a/ports/esp8266/boards/GENERIC/board.md
+++ b/ports/esp8266/boards/GENERIC/board.md
@@ -6,7 +6,7 @@ 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)`.
+`os.VfsLfs2.mkfs(bdev)`.
 
 ### OTA builds
 Over-The-Air (OTA) builds of the ESP8266 firmware are also provided.
diff --git a/ports/esp8266/boards/GENERIC_1M/board.md b/ports/esp8266/boards/GENERIC_1M/board.md
index 4a0e677078713..17cc6e3a6bdf0 100644
--- a/ports/esp8266/boards/GENERIC_1M/board.md
+++ b/ports/esp8266/boards/GENERIC_1M/board.md
@@ -2,4 +2,4 @@ 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)`.
+`os.VfsLfs2.mkfs(bdev)`.
diff --git a/ports/esp8266/modules/_boot.py b/ports/esp8266/modules/_boot.py
index 1f77d88024635..06b372990a52d 100644
--- a/ports/esp8266/modules/_boot.py
+++ b/ports/esp8266/modules/_boot.py
@@ -1,12 +1,12 @@
 import gc
 
 gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
-import uos
+import os
 from flashbdev import bdev
 
 if bdev:
     try:
-        uos.mount(bdev, "/")
+        os.mount(bdev, "/")
     except:
         import inisetup
 
diff --git a/ports/esp8266/modules/espnow.py b/ports/esp8266/modules/espnow.py
index 2f9c256c6b428..1d2b946552e7d 100644
--- a/ports/esp8266/modules/espnow.py
+++ b/ports/esp8266/modules/espnow.py
@@ -2,7 +2,7 @@
 # MIT license; Copyright (c) 2022 Glenn Moloney @glenn20
 
 from _espnow import *
-from uselect import poll, POLLIN
+from select import poll, POLLIN
 
 
 class ESPNow(ESPNowBase):
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index e5ce00138eccb..fa6a93fd83929 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -1,13 +1,13 @@
-import uos
+import os
 import network
 from flashbdev import bdev
 
 
 def wifi():
-    import ubinascii
+    import binascii
 
     ap_if = network.WLAN(network.AP_IF)
-    ssid = b"MicroPython-%s" % ubinascii.hexlify(ap_if.config("mac")[-3:])
+    ssid = b"MicroPython-%s" % binascii.hexlify(ap_if.config("mac")[-3:])
     ap_if.config(ssid=ssid, security=network.AUTH_WPA_WPA2_PSK, key=b"micropythoN")
 
 
@@ -32,7 +32,7 @@ def fs_corrupted():
             """\
 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
+format it with os.VfsLfs2.mkfs(bdev), or completely erase the flash and
 reprogram MicroPython.
 """
             % (bdev.start_sec, bdev.blocks)
@@ -44,17 +44,17 @@ def setup():
     check_bootsec()
     print("Performing initial setup")
     wifi()
-    uos.VfsLfs2.mkfs(bdev)
-    vfs = uos.VfsLfs2(bdev)
-    uos.mount(vfs, "/")
+    os.VfsLfs2.mkfs(bdev)
+    vfs = os.VfsLfs2(bdev)
+    os.mount(vfs, "/")
     with open("boot.py", "w") as f:
         f.write(
             """\
 # This file is executed on every boot (including wake-boot from deepsleep)
 #import esp
 #esp.osdebug(None)
-import uos, machine
-#uos.dupterm(None, 1) # disable REPL on UART(0)
+import os, machine
+#os.dupterm(None, 1) # disable REPL on UART(0)
 import gc
 #import webrepl
 #webrepl.start()
diff --git a/ports/nrf/modules/scripts/_mkfs.py b/ports/nrf/modules/scripts/_mkfs.py
index 00522ffbb9382..02e8dabce285f 100644
--- a/ports/nrf/modules/scripts/_mkfs.py
+++ b/ports/nrf/modules/scripts/_mkfs.py
@@ -1,19 +1,19 @@
-import uos, nrf
+import os, nrf
 
 try:
-    from uos import VfsLfs1
+    from os import VfsLfs1
 
-    uos.VfsLfs1.mkfs(nrf.Flash())
+    os.VfsLfs1.mkfs(nrf.Flash())
 except ImportError:
     try:
-        from uos import VfsLfs2
+        from os import VfsLfs2
 
-        uos.VfsLfs2.mkfs(nrf.Flash())
+        os.VfsLfs2.mkfs(nrf.Flash())
     except ImportError:
         try:
-            from uos import VfsFat
+            from os import VfsFat
 
-            uos.VfsFat.mkfs(nrf.Flash())
+            os.VfsFat.mkfs(nrf.Flash())
         except ImportError:
             pass
         except OSError as e:
diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index f145cbd607717..a34e8e92a34aa 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -34,9 +34,9 @@ def __init__(
         pull_thresh=32,
         fifo_join=0
     ):
-        # uarray is a built-in module so importing it here won't require
+        # array is a built-in module so importing it here won't require
         # scanning the filesystem.
-        from uarray import array
+        from array import array
 
         self.labels = {}
         execctrl = 0
diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py
index 5fe2bc640c584..1ff51de598815 100644
--- a/ports/samd/modules/_boot.py
+++ b/ports/samd/modules/_boot.py
@@ -1,19 +1,19 @@
 import gc
-import uos
+import os
 import samd
 
 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
+fs_type = os.VfsLfs2 if hasattr(os, "VfsLfs2") else os.VfsLfs1
 
 try:
     vfs = fs_type(bdev, progsize=256)
 except:
     fs_type.mkfs(bdev, progsize=256)
     vfs = fs_type(bdev, progsize=256)
-uos.mount(vfs, "/")
+os.mount(vfs, "/")
 
-del vfs, fs_type, bdev, uos, samd
+del vfs, fs_type, bdev, os, samd
 gc.collect()
 del gc
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
index fe34ce1228633..3c741e575caa9 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -73,7 +73,7 @@
 
 try:
     import machine, stm
-    from ubinascii import crc32
+    from binascii import crc32
     from micropython import const
 except ImportError:
     # cpython
diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 4bf07f5a33eb8..78a8d73658b43 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -3,7 +3,7 @@
 
 from micropython import const
 import struct, time
-import uzlib, machine, stm
+import zlib, machine, stm
 
 # Constants to be used with update_mpy
 VFS_FAT = 1
@@ -36,7 +36,7 @@ def dfu_read(filename):
     if hdr == b"Dfu":
         pass
     elif hdr == b"\x1f\x8b\x08":
-        f = uzlib.DecompIO(f, 16 + 15)
+        f = zlib.DecompIO(f, 16 + 15)
     else:
         print("Invalid firmware", filename)
         return None
@@ -231,7 +231,7 @@ def update_app_elements(
     # Check firmware is of .dfu or .dfu.gz type
     try:
         with open(filename, "rb") as f:
-            hdr = uzlib.DecompIO(f, 16 + 15).read(6)
+            hdr = zlib.DecompIO(f, 16 + 15).read(6)
     except Exception:
         with open(filename, "rb") as f:
             hdr = f.read(6)
diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 45acb8da19e85..ef1a7643cb932 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -137,14 +137,14 @@ def _list_recursive(files, path):
                 raise CommandError("'cp -r' source files must be local")
             _list_recursive(src_files, path)
         known_dirs = {""}
-        state.transport.exec_("import uos")
+        state.transport.exec_("import os")
         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.transport.exec_(
-                        "try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d
+                        "try:\n os.mkdir('%s')\nexcept OSError as e:\n print(e)" % d
                     )
                     known_dirs.add(d)
             state.transport.filesystem_command(
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 6689266098b13..eeb9cbd989389 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -317,7 +317,7 @@ def argparse_none(description):
     # Disk used/free.
     "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')",
+        "import os\nprint('mount \\tsize \\tused \\tavail \\tuse%')\nfor _m in [''] + os.listdir('/'):\n _s = os.stat('/' + _m)\n if not _s[0] & 1 << 14: continue\n _s = os.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": {
diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 84822fe69cd80..09025c3098833 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -292,14 +292,14 @@ def execfile(self, filename):
 
     def fs_exists(self, src):
         try:
-            self.exec("import uos\nuos.stat(%s)" % (("'%s'" % src) if src else ""))
+            self.exec("import os\nos.stat(%s)" % (("'%s'" % src) if src else ""))
             return True
         except TransportError:
             return False
 
     def fs_ls(self, src):
         cmd = (
-            "import uos\nfor f in uos.ilistdir(%s):\n"
+            "import os\nfor f in os.ilistdir(%s):\n"
             " print('{:12} {}{}'.format(f[3]if len(f)>3 else 0,f[0],'/'if f[1]&0x4000 else ''))"
             % (("'%s'" % src) if src else "")
         )
@@ -311,7 +311,7 @@ def fs_listdir(self, src=""):
         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=',')" % (
+        cmd = "import os\nfor f in os.ilistdir(%s):\n" " print(repr(f), end=',')" % (
             ("'%s'" % src) if src else ""
         )
         try:
@@ -328,8 +328,8 @@ def repr_consumer(b):
 
     def fs_stat(self, src):
         try:
-            self.exec("import uos")
-            return os.stat_result(self.eval("uos.stat(%s)" % (("'%s'" % src)), parse=True))
+            self.exec("import os")
+            return os.stat_result(self.eval("os.stat(%s)" % (("'%s'" % src)), parse=True))
         except TransportError as e:
             reraise_filesystem_error(e, src)
 
@@ -422,13 +422,13 @@ def fs_put(self, src, dest, chunk_size=256, progress_callback=None):
         self.exec("f.close()")
 
     def fs_mkdir(self, dir):
-        self.exec("import uos\nuos.mkdir('%s')" % dir)
+        self.exec("import os\nos.mkdir('%s')" % dir)
 
     def fs_rmdir(self, dir):
-        self.exec("import uos\nuos.rmdir('%s')" % dir)
+        self.exec("import os\nos.rmdir('%s')" % dir)
 
     def fs_rm(self, src):
-        self.exec("import uos\nuos.remove('%s')" % src)
+        self.exec("import os\nos.remove('%s')" % src)
 
     def fs_touch(self, src):
         self.exec("f=open('%s','a')\nf.close()" % src)
@@ -595,7 +595,7 @@ def write_ctrl_d(self, out_callback):
 
     def umount_local(self):
         if self.mounted:
-            self.exec('uos.umount("/remote")')
+            self.exec('os.umount("/remote")')
             self.mounted = False
             self.serial = self.serial.orig_serial
 
@@ -616,18 +616,18 @@ def umount_local(self):
 }
 
 fs_hook_code = """\
-import uos, uio, ustruct, micropython
+import os, io, struct, micropython
 
 SEEK_SET = 0
 
 class RemoteCommand:
     def __init__(self):
-        import uselect, usys
+        import select, sys
         self.buf4 = bytearray(4)
-        self.fout = usys.stdout.buffer
-        self.fin = usys.stdin.buffer
-        self.poller = uselect.poll()
-        self.poller.register(self.fin, uselect.POLLIN)
+        self.fout = sys.stdout.buffer
+        self.fin = sys.stdin.buffer
+        self.poller = select.poll()
+        self.poller.register(self.fin, select.POLLIN)
 
     def poll_in(self):
         for _ in self.poller.ipoll(1000):
@@ -710,7 +710,7 @@ def wr_s8(self, i):
         self.fout.write(self.buf4, 1)
 
     def wr_s32(self, i):
-        ustruct.pack_into('<i', self.buf4, 0, i)
+        struct.pack_into('<i', self.buf4, 0, i)
         self.fout.write(self.buf4)
 
     def wr_bytes(self, b):
@@ -721,7 +721,7 @@ def wr_bytes(self, b):
     wr_str = wr_bytes
 
 
-class RemoteFile(uio.IOBase):
+class RemoteFile(io.IOBase):
     def __init__(self, cmd, fd, is_text):
         self.cmd = cmd
         self.fd = fd
@@ -934,8 +934,8 @@ def open(self, path, mode):
 
 
 def __mount():
-    uos.mount(RemoteFS(RemoteCommand()), '/remote')
-    uos.chdir('/remote')
+    os.mount(RemoteFS(RemoteCommand()), '/remote')
+    os.chdir('/remote')
 """
 
 # Apply basic compression on hook code.
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 0ce2d291e641c..723e43c01e134 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -509,14 +509,14 @@ def get_time(self):
 
     def fs_exists(self, src):
         try:
-            self.exec_("import uos\nuos.stat(%s)" % (("'%s'" % src) if src else ""))
+            self.exec_("import os\nos.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"
+            "import os\nfor f in os.ilistdir(%s):\n"
             " print('{:12} {}{}'.format(f[3]if len(f)>3 else 0,f[0],'/'if f[1]&0x4000 else ''))"
             % (("'%s'" % src) if src else "")
         )
@@ -528,7 +528,7 @@ def fs_listdir(self, src=""):
         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=',')" % (
+        cmd = "import os\nfor f in os.ilistdir(%s):\n" " print(repr(f), end=',')" % (
             ("'%s'" % src) if src else ""
         )
         try:
@@ -545,8 +545,8 @@ def repr_consumer(b):
 
     def fs_stat(self, src):
         try:
-            self.exec_("import uos")
-            return os.stat_result(self.eval("uos.stat(%s)" % (("'%s'" % src)), parse=True))
+            self.exec_("import os")
+            return os.stat_result(self.eval("os.stat(%s)" % (("'%s'" % src)), parse=True))
         except PyboardError as e:
             raise e.convert(src)
 
@@ -639,13 +639,13 @@ def fs_put(self, src, dest, chunk_size=256, progress_callback=None):
         self.exec_("f.close()")
 
     def fs_mkdir(self, dir):
-        self.exec_("import uos\nuos.mkdir('%s')" % dir)
+        self.exec_("import os\nos.mkdir('%s')" % dir)
 
     def fs_rmdir(self, dir):
-        self.exec_("import uos\nuos.rmdir('%s')" % dir)
+        self.exec_("import os\nos.rmdir('%s')" % dir)
 
     def fs_rm(self, src):
-        self.exec_("import uos\nuos.remove('%s')" % src)
+        self.exec_("import os\nos.remove('%s')" % src)
 
     def fs_touch(self, src):
         self.exec_("f=open('%s','a')\nf.close()" % src)
@@ -737,9 +737,9 @@ def fname_cp_dest(src, dest):
 
 
 _injected_import_hook_code = """\
-import uos, uio
+import os, io
 class _FS:
-  class File(uio.IOBase):
+  class File(io.IOBase):
     def __init__(self):
       self.off = 0
     def ioctl(self, request, arg):
@@ -756,10 +756,10 @@ def stat(self, path):
       raise OSError(-2) # ENOENT
   def open(self, path, mode):
     return self.File()
-uos.mount(_FS(), '/_')
-uos.chdir('/_')
+os.mount(_FS(), '/_')
+os.chdir('/_')
 from _injected import *
-uos.umount('/_')
+os.umount('/_')
 del _injected_buf, _FS
 """
 

From 8211d56712301d58970904892da5312b11b2ab7c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 2 Jun 2023 23:33:42 +1000
Subject: [PATCH 0027/3129] docs/library/index: Update docs after umodule
 rename.

- Update guide for extending built-in modules.
- Remove any last trace of umodule in other docs.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/esp32/tutorial/pwm.rst                   |  4 +-
 docs/library/index.rst                        | 68 +++++++++++--------
 docs/library/zephyr.DiskAccess.rst            |  2 +-
 docs/library/zephyr.FlashArea.rst             |  2 +-
 docs/renesas-ra/tutorial/using_peripheral.rst |  5 +-
 docs/zephyr/quickref.rst                      |  2 +-
 6 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/docs/esp32/tutorial/pwm.rst b/docs/esp32/tutorial/pwm.rst
index 12d10a86b9474..2650284d35f41 100644
--- a/docs/esp32/tutorial/pwm.rst
+++ b/docs/esp32/tutorial/pwm.rst
@@ -50,7 +50,7 @@ low all of the time.
 
 * Example of a smooth frequency change::
 
-    from utime import sleep
+    from time import sleep
     from machine import Pin, PWM
 
     F_MIN = 500
@@ -75,7 +75,7 @@ low all of the time.
 
 * Example of a smooth duty change::
 
-    from utime import sleep
+    from time import sleep
     from machine import Pin, PWM
 
     DUTY_MAX = 2**16 - 1
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 985a7ad770d17..e428f3a062d2f 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -191,34 +191,27 @@ The following libraries are specific to the Zephyr port.
 Extending built-in libraries from Python
 ----------------------------------------
 
-Many built-in modules are actually named ``umodule`` rather than ``module``, but
-MicroPython will alias any module prefixed with a ``u`` to the non-``u``
-version. This means that, for example, ``import time`` will first attempt to
-resolve from the filesystem, and then failing that will fall back to the
-built-in ``utime``. On the other hand, ``import utime`` will always go directly
-to the built-in.
+A subset of the built-in modules are able to be extended by Python code by
+providing a module of the same name in the filesystem. This extensibility
+applies to the following Python standard library modules which are built-in to
+the firmware: ``array``, ``binascii``, ``collections``, ``errno``, ``hashlib``,
+``heapq``, ``io``, ``json``, ``os``, ``platform``, ``random``, ``re``,
+``select``, ``socket``, ``ssl``, ``struct``, ``time`` ``zlib``, as well as the
+MicroPython-specific ``machine`` module. All other built-in modules cannot be
+extended from the filesystem.
 
 This allows the user to provide an extended implementation of a built-in library
 (perhaps to provide additional CPython compatibility or missing functionality).
-The user-provided module (in ``module.py``) can still use the built-in
-functionality by importing ``umodule`` directly (e.g. typically an extension
-module ``time.py`` will do ``from utime import *``). This is used extensively
-in :term:`micropython-lib`. See :ref:`packages` for more information.
-
-This extensibility applies to the following Python standard library modules
-which are built-in to the firmware: ``array``, ``binascii``, ``collections``,
-``errno``, ``hashlib``, ``heapq``, ``io``, ``json``, ``os``, ``platform``,
-``random``, ``re``, ``select``, ``socket``, ``ssl``, ``struct``, ``sys``,
-``time``, ``zlib``, as well as the MicroPython-specific libraries: ``bluepy``,
-``bluetooth``, ``machine``, ``timeq``, ``websocket``. All other built-in
-modules cannot be extended from the filesystem.
-
-*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``.
-
-**Note:** In MicroPython v1.21.0 and higher, it is now possible to force an
-import of the built-in module by clearing ``sys.path`` during the import. For
-example, in ``time.py``, you can write::
+This is used extensively in :term:`micropython-lib`, see :ref:`packages` for
+more information. The filesystem module will typically do a wildcard import of
+the built-in module in order to inherit all the globals (classes, functions and
+variables) from the built-in.
+
+In MicroPython v1.21.0 and higher, to prevent the filesystem module from
+importing itself, it can force an import of the built-in module it by
+temporarily clearing ``sys.path`` during the import. For example, to extend the
+``time`` module from Python, a file named ``time.py`` on the filesystem would
+do the following::
 
   _path = sys.path
   sys.path = ()
@@ -228,6 +221,25 @@ example, in ``time.py``, you can write::
     sys.path = _path
     del _path
 
-This is now the preferred way (instead of ``from utime import *``), as the
-``u``-prefix will be removed from the names of built-in modules in a future
-version of MicroPython.
+  def extra_method():
+    pass
+
+The result is that ``time.py`` contains all the globals of the built-in ``time``
+module, but adds ``extra_method``.
+
+In earlier versions of MicroPython, you can force an import of a built-in module
+by appending a ``u`` to the start of its name. For example, ``import utime``
+instead of ``import time``. For example, ``time.py`` on the filesystem could
+look like::
+
+  from utime import *
+
+  def extra_method():
+    pass
+
+This way is still supported, but the ``sys.path`` method described above is now
+preferred as the ``u``-prefix will be removed from the names of built-in
+modules in a future version of MicroPython.
+
+*Other than when it specifically needs to force the use of the built-in module,
+code should always use* ``import module`` *rather than* ``import umodule``.
diff --git a/docs/library/zephyr.DiskAccess.rst b/docs/library/zephyr.DiskAccess.rst
index d19d81a962e23..3e5fa9a3575a0 100644
--- a/docs/library/zephyr.DiskAccess.rst
+++ b/docs/library/zephyr.DiskAccess.rst
@@ -34,5 +34,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/zephyr.FlashArea.rst b/docs/library/zephyr.FlashArea.rst
index 306347d449eab..9cd4dd59d6852 100644
--- a/docs/library/zephyr.FlashArea.rst
+++ b/docs/library/zephyr.FlashArea.rst
@@ -37,4 +37,4 @@ 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/renesas-ra/tutorial/using_peripheral.rst b/docs/renesas-ra/tutorial/using_peripheral.rst
index c50181b3d681a..7296d8b3304f7 100644
--- a/docs/renesas-ra/tutorial/using_peripheral.rst
+++ b/docs/renesas-ra/tutorial/using_peripheral.rst
@@ -12,9 +12,8 @@ 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".
+Especially `machine` module and class :ref:`machine.Pin <machine.Pin>` are very
+important for using peripherals.
 
 Using "from machine import Pin", Pin name is available corresponding to
 the RA MCU's pin name which are Pin.cpu.P000 and 'P000'.
diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 329a9c41c0cc8..57262ffb5c632 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -19,7 +19,7 @@ See the corresponding section of the tutorial: :ref:`intro`.
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 

From a1fbb1980cf90cc58186eac9cc405a97ebd41e64 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Jun 2023 22:15:44 +1000
Subject: [PATCH 0028/3129] extmod/modtimeq: Remove timeq module.

This is a MicroPython-specific module that existed to support the old
version of uasyncio.  It's undocumented and not enabled on all ports and
takes up code size unnecessarily.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/extmod.cmake                           |   1 -
 extmod/extmod.mk                              |   1 -
 extmod/modtimeq.c                             | 235 ------------------
 ports/esp32/mpconfigport.h                    |   1 -
 .../boards/EK_RA4M1/mpconfigboard.h           |   1 -
 .../boards/EK_RA4W1/mpconfigboard.h           |   1 -
 .../boards/EK_RA6M1/mpconfigboard.h           |   1 -
 .../boards/EK_RA6M2/mpconfigboard.h           |   1 -
 .../boards/RA4M1_CLICKER/mpconfigboard.h      |   1 -
 ports/renesas-ra/mpconfigport.h               |   3 -
 .../boards/B_L072Z_LRWAN1/mpconfigboard.h     |   1 -
 .../boards/NUCLEO_F091RC/mpconfigboard.h      |   1 -
 .../boards/NUCLEO_L073RZ/mpconfigboard.h      |   1 -
 .../boards/NUCLEO_L432KC/mpconfigboard.h      |   1 -
 .../stm32/boards/NUCLEO_WL55/mpconfigboard.h  |   1 -
 ports/stm32/mpconfigport.h                    |   3 -
 ports/unix/coverage.c                         |   2 +-
 ports/unix/variants/mpconfigvariant_common.h  |   3 -
 ports/windows/mpconfigport.h                  |   1 -
 ports/windows/msvc/sources.props              |   1 -
 py/mpconfig.h                                 |   5 -
 tests/extmod/timeq1.py                        | 146 -----------
 tests/extmod/timeq1.py.exp                    |   1 -
 tests/extmod/timeq_stable.py                  |  22 --
 tests/extmod/timeq_stable.py.exp              |   1 -
 tests/unix/extra_coverage.py.exp              |   6 +-
 tools/tinytest-codegen.py                     |   1 -
 27 files changed, 4 insertions(+), 439 deletions(-)
 delete mode 100644 extmod/modtimeq.c
 delete mode 100644 tests/extmod/timeq1.py
 delete mode 100644 tests/extmod/timeq1.py.exp
 delete mode 100644 tests/extmod/timeq_stable.py
 delete mode 100644 tests/extmod/timeq_stable.py.exp

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 2bb89423c9acb..8ebaf944f3a59 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -34,7 +34,6 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modssl_axtls.c
     ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
     ${MICROPY_EXTMOD_DIR}/modtime.c
-    ${MICROPY_EXTMOD_DIR}/modtimeq.c
     ${MICROPY_EXTMOD_DIR}/modwebsocket.c
     ${MICROPY_EXTMOD_DIR}/modzlib.c
     ${MICROPY_EXTMOD_DIR}/modwebrepl.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index a573da4c60aab..c544e8179231d 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -31,7 +31,6 @@ SRC_EXTMOD_C += \
 	extmod/modssl_axtls.c \
 	extmod/modssl_mbedtls.c \
 	extmod/modtime.c \
-	extmod/modtimeq.c \
 	extmod/moduasyncio.c \
 	extmod/moductypes.c \
 	extmod/modwebrepl.c \
diff --git a/extmod/modtimeq.c b/extmod/modtimeq.c
deleted file mode 100644
index 4edb7dd3c80de..0000000000000
--- a/extmod/modtimeq.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Damien P. George
- * Copyright (c) 2016-2017 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 "py/objlist.h"
-#include "py/runtime.h"
-#include "py/smallint.h"
-
-#if MICROPY_PY_TIMEQ
-
-#define MODULO MICROPY_PY_TIME_TICKS_PERIOD
-
-#define DEBUG 0
-
-// the algorithm here is modelled on CPython's heapq.py
-
-struct qentry {
-    mp_uint_t time;
-    mp_uint_t id;
-    mp_obj_t callback;
-    mp_obj_t args;
-};
-
-typedef struct _mp_obj_timeq_t {
-    mp_obj_base_t base;
-    mp_uint_t alloc;
-    mp_uint_t len;
-    struct qentry items[];
-} mp_obj_timeq_t;
-
-STATIC mp_uint_t timeq_id;
-
-STATIC mp_obj_timeq_t *timeq_get_heap(mp_obj_t heap_in) {
-    return MP_OBJ_TO_PTR(heap_in);
-}
-
-STATIC bool time_less_than(struct qentry *item, struct qentry *parent) {
-    mp_uint_t item_tm = item->time;
-    mp_uint_t parent_tm = parent->time;
-    mp_uint_t res = parent_tm - item_tm;
-    if (res == 0) {
-        // TODO: This actually should use the same "ring" logic
-        // as for time, to avoid artifacts when id's overflow.
-        return item->id < parent->id;
-    }
-    if ((mp_int_t)res < 0) {
-        res += MODULO;
-    }
-    return res && res < (MODULO / 2);
-}
-
-STATIC mp_obj_t timeq_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_timeq_t *o = mp_obj_malloc_var(mp_obj_timeq_t, struct qentry, alloc, type);
-    memset(o->items, 0, sizeof(*o->items) * alloc);
-    o->alloc = alloc;
-    o->len = 0;
-    return MP_OBJ_FROM_PTR(o);
-}
-
-STATIC void timeq_heap_siftdown(mp_obj_timeq_t *heap, mp_uint_t start_pos, mp_uint_t pos) {
-    struct qentry item = heap->items[pos];
-    while (pos > start_pos) {
-        mp_uint_t parent_pos = (pos - 1) >> 1;
-        struct qentry *parent = &heap->items[parent_pos];
-        bool lessthan = time_less_than(&item, parent);
-        if (lessthan) {
-            heap->items[pos] = *parent;
-            pos = parent_pos;
-        } else {
-            break;
-        }
-    }
-    heap->items[pos] = item;
-}
-
-STATIC void timeq_heap_siftup(mp_obj_timeq_t *heap, mp_uint_t pos) {
-    mp_uint_t start_pos = pos;
-    mp_uint_t end_pos = heap->len;
-    struct qentry item = heap->items[pos];
-    for (mp_uint_t child_pos = 2 * pos + 1; child_pos < end_pos; child_pos = 2 * pos + 1) {
-        // choose right child if it's <= left child
-        if (child_pos + 1 < end_pos) {
-            bool lessthan = time_less_than(&heap->items[child_pos], &heap->items[child_pos + 1]);
-            if (!lessthan) {
-                child_pos += 1;
-            }
-        }
-        // bubble up the smaller child
-        heap->items[pos] = heap->items[child_pos];
-        pos = child_pos;
-    }
-    heap->items[pos] = item;
-    timeq_heap_siftdown(heap, start_pos, pos);
-}
-
-STATIC mp_obj_t mod_timeq_heappush(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    mp_obj_t heap_in = args[0];
-    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
-    if (heap->len == heap->alloc) {
-        mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("queue overflow"));
-    }
-    mp_uint_t l = heap->len;
-    heap->items[l].time = MP_OBJ_SMALL_INT_VALUE(args[1]);
-    heap->items[l].id = timeq_id++;
-    heap->items[l].callback = args[2];
-    heap->items[l].args = args[3];
-    timeq_heap_siftdown(heap, 0, heap->len);
-    heap->len++;
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_timeq_heappush_obj, 4, 4, mod_timeq_heappush);
-
-STATIC mp_obj_t mod_timeq_heappop(mp_obj_t heap_in, mp_obj_t list_ref) {
-    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
-    if (heap->len == 0) {
-        mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty heap"));
-    }
-    mp_obj_list_t *ret = MP_OBJ_TO_PTR(list_ref);
-    if (!mp_obj_is_type(list_ref, &mp_type_list) || ret->len < 3) {
-        mp_raise_TypeError(NULL);
-    }
-
-    struct qentry *item = &heap->items[0];
-    ret->items[0] = MP_OBJ_NEW_SMALL_INT(item->time);
-    ret->items[1] = item->callback;
-    ret->items[2] = item->args;
-    heap->len -= 1;
-    heap->items[0] = heap->items[heap->len];
-    heap->items[heap->len].callback = MP_OBJ_NULL; // so we don't retain a pointer
-    heap->items[heap->len].args = MP_OBJ_NULL;
-    if (heap->len) {
-        timeq_heap_siftup(heap, 0);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_timeq_heappop_obj, mod_timeq_heappop);
-
-STATIC mp_obj_t mod_timeq_peektime(mp_obj_t heap_in) {
-    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
-    if (heap->len == 0) {
-        mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty heap"));
-    }
-
-    struct qentry *item = &heap->items[0];
-    return MP_OBJ_NEW_SMALL_INT(item->time);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_timeq_peektime_obj, mod_timeq_peektime);
-
-#if DEBUG
-STATIC mp_obj_t mod_timeq_dump(mp_obj_t heap_in) {
-    mp_obj_timeq_t *heap = timeq_get_heap(heap_in);
-    for (int i = 0; i < heap->len; i++) {
-        printf(UINT_FMT "\t%p\t%p\n", heap->items[i].time,
-            MP_OBJ_TO_PTR(heap->items[i].callback), MP_OBJ_TO_PTR(heap->items[i].args));
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_timeq_dump_obj, mod_timeq_dump);
-#endif
-
-STATIC mp_obj_t timeq_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    mp_obj_timeq_t *self = MP_OBJ_TO_PTR(self_in);
-    switch (op) {
-        case MP_UNARY_OP_BOOL:
-            return mp_obj_new_bool(self->len != 0);
-        case MP_UNARY_OP_LEN:
-            return MP_OBJ_NEW_SMALL_INT(self->len);
-        default:
-            return MP_OBJ_NULL;      // op not supported
-    }
-}
-
-STATIC const mp_rom_map_elem_t timeq_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_push), MP_ROM_PTR(&mod_timeq_heappush_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&mod_timeq_heappop_obj) },
-    { MP_ROM_QSTR(MP_QSTR_peektime), MP_ROM_PTR(&mod_timeq_peektime_obj) },
-    #if DEBUG
-    { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_timeq_dump_obj) },
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(timeq_locals_dict, timeq_locals_dict_table);
-
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    timeq_type,
-    MP_QSTR_timeq,
-    MP_TYPE_FLAG_NONE,
-    make_new, timeq_make_new,
-    unary_op, timeq_unary_op,
-    locals_dict, &timeq_locals_dict
-    );
-
-STATIC const mp_rom_map_elem_t mp_module_timeq_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_timeq) },
-    { MP_ROM_QSTR(MP_QSTR_timeq), MP_ROM_PTR(&timeq_type) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(mp_module_timeq_globals, mp_module_timeq_globals_table);
-
-const mp_obj_module_t mp_module_timeq = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_timeq_globals,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_timeq, mp_module_timeq);
-
-#endif // MICROPY_PY_TIMEQ
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 217a9ec297482..778a4cbc7ed38 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -83,7 +83,6 @@
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif
-#define MICROPY_PY_TIMEQ                    (1)
 #define MICROPY_PY_HASHLIB_SHA1             (1)
 #define MICROPY_PY_HASHLIB_SHA256           (1)
 #define MICROPY_PY_CRYPTOLIB                (1)
diff --git a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
index 4845c0c09eb4d..e7cce5e24a7fa 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_THREAD           (0)
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
index d8d22ad72f76e..9eda05f0fdd1b 100644
--- a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (1)
 #define MICROPY_PY_MATH             (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
index d746dbdfc2833..2f992a25ae18e 100644
--- a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (1)
 #define MICROPY_PY_MATH             (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
index b6ecfe6d494c1..203f3e8e5b6eb 100644
--- a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (1)
 #define MICROPY_PY_MATH             (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
index 3934dd264b478..8ec45d603b92f 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_THREAD           (0)
 
 // peripheral config
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 42ce0b68272e1..434bc00f1197a 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -102,9 +102,6 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/renesas-ra/modtime.c"
-#ifndef MICROPY_PY_TIMEQ
-#define MICROPY_PY_TIMEQ            (1)
-#endif
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index 165284f31adeb..7d96eedda9a78 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -18,7 +18,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index 39d0082d7bdc3..e28bb51f609db 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -10,7 +10,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_FRAMEBUF         (0)
 
 #define MICROPY_HW_ENABLE_RTC       (1)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index 1d6b303260dca..7ec295e44d74b 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -18,7 +18,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_PY_MACHINE_BITSTREAM (0)
 
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index ba843c8a61153..0daf4877ff6c2 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -12,7 +12,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (1)
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
index 2bb368adccd4f..51700ba8a5367 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -17,7 +17,6 @@
 #define MICROPY_PY_STM                          (0)
 #define MICROPY_PY_PYB_LEGACY                   (0)
 #define MICROPY_PY_HEAPQ                        (0)
-#define MICROPY_PY_TIMEQ                        (0)
 
 #define MICROPY_HW_HAS_FLASH                    (1)
 #define MICROPY_HW_ENABLE_RTC                   (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index c0a95cf5d563f..3c44bddfd5e6d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -108,9 +108,6 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modtime.c"
-#ifndef MICROPY_PY_TIMEQ
-#define MICROPY_PY_TIMEQ            (1)
-#endif
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 6022ff2bff7be..f3bb3d450f65e 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -364,7 +364,7 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_repl_autocomplete("import ", 7,  &mp_plat_print, &str); // expect the list of builtins
         len = mp_repl_autocomplete("import ti", 9,  &mp_plat_print, &str); // expect "me"
         mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
-        mp_repl_autocomplete("import time", 11,  &mp_plat_print, &str); // expect "time timeq"
+        mp_repl_autocomplete("import m", 8,  &mp_plat_print, &str); // expect "micropython machine math"
 
         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); // expect dir(sys)
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index afdd313134d86..8cb1f88e685ca 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -100,9 +100,6 @@
 #define MICROPY_PY_TIME_CUSTOM_SLEEP   (1)
 #define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modtime.c"
 
-// Enable the utimeq module used by the previous (v2) version of uasyncio.
-#define MICROPY_PY_TIMEQ               (1)
-
 #if MICROPY_PY_SSL
 #define MICROPY_PY_HASHLIB_MD5         (1)
 #define MICROPY_PY_HASHLIB_SHA1        (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 239dcfec91686..dc9208f6f1dc2 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -148,7 +148,6 @@
 #define MICROPY_PY_JSON             (1)
 #define MICROPY_PY_RE               (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_HASHLIB          (1)
 #define MICROPY_PY_BINASCII         (1)
 #define MICROPY_PY_BINASCII_CRC32   (1)
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index 24cdcd82dafee..18d053b811d25 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -18,7 +18,6 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modtimeq.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
diff --git a/py/mpconfig.h b/py/mpconfig.h
index eb23c5965c3f7..831fd534fd462 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1600,11 +1600,6 @@ typedef double mp_float_t;
 #define MICROPY_PY_HEAPQ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Optimized heap queue for relative timestamps (only used by uasyncio v2)
-#ifndef MICROPY_PY_TIMEQ
-#define MICROPY_PY_TIMEQ (0)
-#endif
-
 #ifndef MICROPY_PY_HASHLIB
 #define MICROPY_PY_HASHLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
diff --git a/tests/extmod/timeq1.py b/tests/extmod/timeq1.py
deleted file mode 100644
index 0778c8725592f..0000000000000
--- a/tests/extmod/timeq1.py
+++ /dev/null
@@ -1,146 +0,0 @@
-# Test for timeq module which implements task queue with support for
-# wraparound time (time.ticks_ms() style).
-try:
-    from time import ticks_add, ticks_diff
-    from timeq import timeq
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-DEBUG = 0
-
-MAX = ticks_add(0, -1)
-MODULO_HALF = MAX // 2 + 1
-
-if DEBUG:
-
-    def dprint(*v):
-        print(*v)
-
-else:
-
-    def dprint(*v):
-        pass
-
-
-# Try not to crash on invalid data
-h = timeq(10)
-try:
-    h.push(1)
-    assert False
-except TypeError:
-    pass
-
-try:
-    h.pop(1)
-    assert False
-except IndexError:
-    pass
-
-# unsupported unary op
-try:
-    ~h
-    assert False
-except TypeError:
-    pass
-
-# pushing on full queue
-h = timeq(1)
-h.push(1, 0, 0)
-try:
-    h.push(2, 0, 0)
-    assert False
-except IndexError:
-    pass
-
-# popping into invalid type
-try:
-    h.pop([])
-    assert False
-except TypeError:
-    pass
-
-# length
-assert len(h) == 1
-
-# peektime
-assert h.peektime() == 1
-
-# peektime with empty queue
-try:
-    timeq(1).peektime()
-    assert False
-except IndexError:
-    pass
-
-
-def pop_all(h):
-    l = []
-    while h:
-        item = [0, 0, 0]
-        h.pop(item)
-        # print("!", item)
-        l.append(tuple(item))
-    dprint(l)
-    return l
-
-
-def add(h, v):
-    h.push(v, 0, 0)
-    dprint("-----")
-    # h.dump()
-    dprint("-----")
-
-
-h = timeq(10)
-add(h, 0)
-add(h, MAX)
-add(h, MAX - 1)
-add(h, 101)
-add(h, 100)
-add(h, MAX - 2)
-dprint(h)
-l = pop_all(h)
-for i in range(len(l) - 1):
-    diff = ticks_diff(l[i + 1][0], l[i][0])
-    assert diff > 0
-
-
-def edge_case(edge, offset):
-    h = timeq(10)
-    add(h, ticks_add(0, offset))
-    add(h, ticks_add(edge, offset))
-    dprint(h)
-    l = pop_all(h)
-    diff = ticks_diff(l[1][0], l[0][0])
-    dprint(diff, diff > 0)
-    return diff
-
-
-dprint("===")
-diff = edge_case(MODULO_HALF - 1, 0)
-assert diff == MODULO_HALF - 1
-assert edge_case(MODULO_HALF - 1, 100) == diff
-assert edge_case(MODULO_HALF - 1, -100) == diff
-
-# We expect diff to be always positive, per the definition of heappop() which should return
-# the smallest value.
-# This is the edge case where this invariant breaks, due to asymmetry of two's-complement
-# range - there's one more negative integer than positive, so heappushing values like below
-# will then make ticks_diff() return the minimum negative value. We could make heappop
-# return them in a different order, but ticks_diff() result would be the same. Conclusion:
-# never add to a heap values where (a - b) == MODULO_HALF (and which are >= MODULO_HALF
-# ticks apart in real time of course).
-dprint("===")
-diff = edge_case(MODULO_HALF, 0)
-assert diff == -MODULO_HALF
-assert edge_case(MODULO_HALF, 100) == diff
-assert edge_case(MODULO_HALF, -100) == diff
-
-dprint("===")
-diff = edge_case(MODULO_HALF + 1, 0)
-assert diff == MODULO_HALF - 1
-assert edge_case(MODULO_HALF + 1, 100) == diff
-assert edge_case(MODULO_HALF + 1, -100) == diff
-
-print("OK")
diff --git a/tests/extmod/timeq1.py.exp b/tests/extmod/timeq1.py.exp
deleted file mode 100644
index d86bac9de59ab..0000000000000
--- a/tests/extmod/timeq1.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/tests/extmod/timeq_stable.py b/tests/extmod/timeq_stable.py
deleted file mode 100644
index b19ea1b3adee9..0000000000000
--- a/tests/extmod/timeq_stable.py
+++ /dev/null
@@ -1,22 +0,0 @@
-try:
-    from timeq import timeq
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-h = timeq(10)
-
-# Check that for 2 same-key items, the queue is stable (pops items
-# in the same order they were pushed). Unfortunately, this no longer
-# holds for more same-key values, as the underlying heap structure
-# is not stable itself.
-h.push(100, 20, 0)
-h.push(100, 10, 0)
-
-res = [0, 0, 0]
-h.pop(res)
-assert res == [100, 20, 0]
-h.pop(res)
-assert res == [100, 10, 0]
-
-print("OK")
diff --git a/tests/extmod/timeq_stable.py.exp b/tests/extmod/timeq_stable.py.exp
deleted file mode 100644
index d86bac9de59ab..0000000000000
--- a/tests/extmod/timeq_stable.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 6ec8eaaa04405..04aefcfe2f33b 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -58,11 +58,11 @@ framebuf        gc              hashlib         heapq
 io              json            machine         math
 os              random          re              select
 socket          ssl             struct          sys
-termios         time            timeq           uctypes
-websocket       zlib
+termios         time            uctypes         websocket
+zlib
 me
 
-time            timeq
+micropython     machine         math
 
 argv            atexit          byteorder       exc_info
 executable      exit            getsizeof       implementation
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index d6e87ac6ce24d..7f6c86243badb 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -65,7 +65,6 @@ def script_to_map(test_file):
     "basics/bytes_compare3.py",
     "extmod/ticks_diff.py",
     "extmod/time_ms_us.py",
-    "extmod/heapq_timeq.py",
     # unicode char issue
     "extmod/json_loads.py",
     # doesn't output to python stdout

From 0832fc53cec2d3fd5ed8c9108d185f00b83c3a8f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Jun 2023 14:10:38 +1000
Subject: [PATCH 0029/3129] tools/ci.sh: Add mimxrt and samd ports to code size
 build.

The automatic code size build and GitHub comment is a really useful
feature.  This commit adds a few more builds to it (mimxrt and samd).

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 a010adcbce721..2f96a5b51d93d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -61,8 +61,8 @@ 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"
+    PORTS_TO_CHECK=bmusxpd
+    SUBMODULES="lib/asf4 lib/berkeley-db-1.xx lib/mbedtls lib/micropython-lib lib/nxp_driver 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

From 3b370157d007649d5d5ed1747514ea242f597215 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 May 2023 16:17:58 +1000
Subject: [PATCH 0030/3129] stm32/mpconfigboard_common: Provide default spidev
 config.

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

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 0bb80f215ee8c..300ca55d5b4d2 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -499,6 +499,21 @@
 #define MICROPY_HW_BDEV_WRITEBLOCK flash_bdev_writeblock
 #endif
 
+#if defined(MICROPY_HW_BDEV_SPIFLASH)
+// Provide block device macros using spi_bdev.
+// The board must provide settings for:
+//  - MICROPY_HW_BDEV_SPIFLASH - pointer to a spi_bdev_t
+//  - MICROPY_HW_BDEV_SPIFLASH_CONFIG - pointer to an mp_spiflash_config_t
+//  - MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES - size in bytes of the SPI flash
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(MICROPY_HW_BDEV_SPIFLASH, (op), (uint32_t)MICROPY_HW_BDEV_SPIFLASH_CONFIG) : \
+    spi_bdev_ioctl(MICROPY_HW_BDEV_SPIFLASH, (op), (arg)) \
+    )
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(MICROPY_HW_BDEV_SPIFLASH, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(MICROPY_HW_BDEV_SPIFLASH, (src), (bl), (n))
+#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,

From 30100e9b3d4e2b805997a642e5e411aaf14324a7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 May 2023 16:18:08 +1000
Subject: [PATCH 0031/3129] stm32/boards: Use default spibdev config where
 appropriate.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h     | 10 +++-------
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h      | 10 +++-------
 .../boards/ARDUINO_NICLA_VISION/mpconfigboard.h      | 12 ++++--------
 .../stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 10 +++-------
 ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h      | 10 +++-------
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h          | 10 +++-------
 .../boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h   | 10 +++-------
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h     | 10 +++-------
 ports/stm32/boards/STM32L476DISC/mpconfigboard.h     | 10 +++-------
 ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h    | 10 +++-------
 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h    | 10 +++-------
 11 files changed, 34 insertions(+), 78 deletions(-)

diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
index b0821b27594d8..a7bfc37df2994 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
@@ -38,13 +38,9 @@
 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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
 
 #endif // !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index dee0106b96512..29b61bd8ddd78 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -130,13 +130,9 @@ void GIGA_board_osc_enable(int enable);
 // 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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev)
 #endif
 
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index e96d5b6a6413e..276288d287cbc 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -130,14 +130,10 @@ void NICLAV_board_osc_enable(int enable);
 // 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)
+#define MICROPY_HW_BDEV_SPIFLASH            (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG     (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED   (&spi_bdev)
 #endif
 
 // 4 wait states
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index a2efd94de4e8b..452ec00d7098e 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -132,13 +132,9 @@ void PORTENTA_board_osc_enable(int enable);
 // 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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev)
 #endif
 
diff --git a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
index d092586f608d5..4c3fbba052176 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
+++ b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
@@ -81,13 +81,9 @@
 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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
 
 #endif // !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index c92e6f75288be..f0ef67e77e604 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -82,13 +82,9 @@ 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) : \
-    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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
 
 // SPI flash #2, to be memory mapped
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
index 98e3c896d78c4..d2f44cf6cccf0 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
@@ -38,13 +38,9 @@ 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 (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
 
 #endif // !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index fd58854b4a995..f899091d201c0 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -42,13 +42,9 @@ 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) : \
-    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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES ((1 << MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2) / 8)
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
 #endif
 
diff --git a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
index 2ee505447ea74..61f9521fe0020 100644
--- a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
@@ -23,13 +23,9 @@ void STM32L476DISC_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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 
 // MSI is used and is 4MHz
 #define MICROPY_HW_CLK_PLLM (1)
diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
index 0ba2ee32e8f71..498005e3e0741 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
@@ -133,13 +133,9 @@ 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) : \
-    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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 
 #endif
 
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
index 3000389bee7c1..75254f641ca68 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
@@ -141,13 +141,9 @@ 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) : \
-    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    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
 
 #endif
 

From f01d5fb657159f1afa9d41cf39830d17b791a67e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Jun 2023 14:24:41 +1000
Subject: [PATCH 0032/3129] py/mkrules.mk: Automatically configure frozen
 options when manifest set.

Following how mkrules.cmake works.  This makes it easy for a port to enable
frozen code, by defining FROZEN_MANIFEST in its Makefile.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h  |  3 ---
 ports/esp8266/Makefile      |  6 ------
 ports/mimxrt/mpconfigport.h |  2 --
 ports/nrf/Makefile          |  6 ------
 ports/qemu-arm/Makefile     |  6 ------
 ports/renesas-ra/Makefile   | 13 -------------
 ports/samd/Makefile         |  6 ------
 ports/stm32/Makefile        |  6 ------
 ports/unix/Makefile         |  5 -----
 ports/windows/Makefile      |  2 +-
 ports/zephyr/mpconfigport.h |  2 --
 py/mkrules.mk               |  5 +++++
 12 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 778a4cbc7ed38..f81ad58fa1d20 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -49,9 +49,6 @@
 #define MICROPY_WARNINGS                    (1)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_STREAMS_POSIX_API           (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_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_SCHEDULER_DEPTH             (8)
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index e4db811f240e7..1cdcafa031bc6 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -200,12 +200,6 @@ $(BUILD)/uart.o: $(CONFVARS_FILE)
 
 FROZEN_EXTRA_DEPS = $(CONFVARS_FILE)
 
-ifneq ($(FROZEN_MANIFEST),)
-CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
-CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-CFLAGS += -DMICROPY_MODULE_FROZEN_STR
-endif
-
 .PHONY: deploy
 
 deploy: $(BUILD)/firmware-combined.bin
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index b1cd84f265601..ce71cb279534e 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -60,8 +60,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #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_BUILTINS_HELP_TEXT       mimxrt_help_text
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 89bb03dfae2df..3a4b0ef23d500 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -552,12 +552,6 @@ $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qst
 $(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
 	$(call compile_c)
 
-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
 
 include ../../py/mkrules.mk
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 40b3062ae4c49..599caf026605e 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -133,12 +133,6 @@ OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST)
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(LIB_SRC_C)
 
-ifneq ($(FROZEN_MANIFEST),)
-CFLAGS += -DMICROPY_MODULE_FROZEN_STR
-CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
-CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-endif
-
 all: run
 
 run: $(BUILD)/firmware.elf
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 2c9f917f36bde..c49db286fd3ab 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -430,19 +430,6 @@ $(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)
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 211607650ba4c..360cf0dd4c770 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -170,12 +170,6 @@ OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.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
-
 all: $(BUILD)/firmware.uf2
 
 $(BUILD)/firmware.elf: $(OBJ)
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index e51c0d2713f23..fce81d753f4fa 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -530,12 +530,6 @@ $(TOP)/lib/stm32lib/README.md:
 	$(ECHO) "stm32lib submodule not found, fetching it now..."
 	(cd $(TOP) && git submodule update --init lib/stm32lib)
 
-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
 	$(ECHO) "Writing $(1) to the board"
 	$(if $(filter $(USE_PYDFU),1),\
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index a8981e8f5c6e3..188e4be633694 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -235,12 +235,7 @@ SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
 SRC_QSTR_AUTO_DEPS +=
 
 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
-CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
 CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD))
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 7753fa25d4e0f..31ac8d8b8847a 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -87,7 +87,7 @@ SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
 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
+CFLAGS += -DMPZ_DIG_SIZE=16
 endif
 
 CXXFLAGS += $(filter-out -std=gnu99,$(CFLAGS))
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index df24e52002b06..2f3e314db6e8b 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -127,8 +127,6 @@ void mp_hal_signal_event(void);
 #define MICROPY_HW_MCU_NAME "unknown-cpu"
 #endif
 
-#define MICROPY_MODULE_FROZEN_STR   (0)
-
 typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
diff --git a/py/mkrules.mk b/py/mkrules.mk
index aa7f77bd2a02d..db81faa7ff2f6 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -183,6 +183,11 @@ ifeq ($(MPY_LIB_DIR),$(MPY_LIB_SUBMODULE_DIR))
 GIT_SUBMODULES += lib/micropython-lib
 endif
 
+# Set compile options needed to enable frozen code.
+CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
+CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
+CFLAGS += -DMICROPY_MODULE_FROZEN_STR
+
 # 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 -e $(HELP_MPY_LIB_SUBMODULE); false)

From b4de697ad10427a1513c02160abd0662f55701d5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 9 Jun 2023 13:34:08 +1000
Subject: [PATCH 0033/3129] tools/mpremote: Fix exec_ -> exec in commands.py.

This was missed in the pyboard refactor and is preventing `cp -r` from
working.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/commands.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index ef1a7643cb932..de12aa0bb196e 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -137,13 +137,13 @@ def _list_recursive(files, path):
                 raise CommandError("'cp -r' source files must be local")
             _list_recursive(src_files, path)
         known_dirs = {""}
-        state.transport.exec_("import os")
+        state.transport.exec("import os")
         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.transport.exec_(
+                    state.transport.exec(
                         "try:\n os.mkdir('%s')\nexcept OSError as e:\n print(e)" % d
                     )
                     known_dirs.add(d)

From fd277704c458784a0e25ae87cf7190833661185d Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Fri, 9 Jun 2023 13:09:46 +1000
Subject: [PATCH 0034/3129] esp32/modespnow: Change name of buffer size config
 option to "rxbuf".

Rename "buffer" option to "rxbuf" which accords with docs and esp8266.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp32/modespnow.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index 047245995d383..c71201e9b7bde 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -236,10 +236,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_activ
 //    timeout: Default read timeout (default=300,000 milliseconds)
 STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     esp_espnow_obj_t *self = _get_singleton();
-    enum { ARG_get, ARG_buffer, ARG_timeout_ms, ARG_rate };
+    enum { ARG_get, ARG_rxbuf, ARG_timeout_ms, ARG_rate };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_buffer, 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_ms, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MIN} },
         { MP_QSTR_rate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
@@ -247,8 +247,8 @@ STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
         MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    if (args[ARG_buffer].u_int >= 0) {
-        self->recv_buffer_size = args[ARG_buffer].u_int;
+    if (args[ARG_rxbuf].u_int >= 0) {
+        self->recv_buffer_size = args[ARG_rxbuf].u_int;
     }
     if (args[ARG_timeout_ms].u_int != INT_MIN) {
         self->recv_timeout_ms = args[ARG_timeout_ms].u_int;
@@ -268,7 +268,7 @@ STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
     // Return the value of the requested parameter
     uintptr_t name = (uintptr_t)args[ARG_get].u_obj;
-    if (name == QS(MP_QSTR_buffer)) {
+    if (name == QS(MP_QSTR_rxbuf)) {
         return mp_obj_new_int(self->recv_buffer_size);
     } else if (name == QS(MP_QSTR_timeout_ms)) {
         return mp_obj_new_int(self->recv_timeout_ms);

From 5fe2a3f14f8f60a536c5db12826ef2c3a8921951 Mon Sep 17 00:00:00 2001
From: Brian 'redbeard' Harrington <redbeard@dead-city.org>
Date: Mon, 12 Jun 2023 13:02:10 -0700
Subject: [PATCH 0035/3129] esp32/CMake: Change PROJECT_DIR to
 CMAKE_CURRENT_LIST_DIR.

This migrates the CMake variable `MICROPY_PORT_DIR` from the ESP-IDF
defined project to the component. Previously used instances of the variable
within the project definition have been migrated to
`CMAKE_CURRENT_LIST_DIR`. Within the component (the `main` subdirectory in
the ESP32 port) we define `MICROPY_PORT_DIR` using `CMAKE_CURRENT_LIST_DIR`
and subsequently use the `MICROPY_PORT_DIR` value in all locations where
`PROJECT` had previously been used.

Context:

In commit 9b90882146, initial support was added for building with the newly
introduced CMake support provided by the ESP-IDF.

Specifically, the commit message states:

> 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.

`PROJECT_DIR` is a variable populated by the ESP-IDF specifically and is
not stable when used with "[Pure CMake components][1]" as documented in the
ESP-IDF. It is intended to be used in the scope of the parent of the
current file (the "project") as opposed to the current file ("the
component"). Crossing into the parent scope like this works solely when the
"project" is MicroPython, but not when used as a component by other ESP-IDF
projects.

Analyzing this file, the intention is to reference the "Project" which in
the example is the parent directory. Within the [CMake variables][2]
documentation, there is one specifically defined for referencing the
directory for the CMake listfile currently being processed:
[`CMAKE_CURRENT_LIST_DIR`][3].

After making the change from `PROJECT_DIR` to `CMAKE_CURRENT_LIST_DIR`, the
reach into the parent scope defined by the ESP-IDF and the resulting CMake
interface violation is removed.

Similar to the component definition, the project `CMakeLists.txt` uses the
variable `CMAKE_SOURCE_DIR` which CMake defines as "The path to the top
level of the source tree."  This commit changes the variable to
`CMAKE_CURRENT_LIST_DIR` for the reasons cited above.

[1]: https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/build-system.html#writing-pure-cmake-components
[2]: https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html
[3]: https://cmake.org/cmake/help/latest/variable/CMAKE_CURRENT_LIST_DIR.html

Signed-off-by: Brian 'redbeard' Harrington <redbeard@dead-city.org>
---
 ports/esp32/CMakeLists.txt      |  7 +--
 ports/esp32/main/CMakeLists.txt | 83 +++++++++++++++++----------------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 7209dd96da4ae..6992737c9b4d6 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -2,9 +2,6 @@
 
 cmake_minimum_required(VERSION 3.12)
 
-# 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)
@@ -12,7 +9,7 @@ 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})
+    set(MICROPY_BOARD_DIR ${CMAKE_CURRENT_LIST_DIR}/boards/${MICROPY_BOARD})
 endif()
 if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
     message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
@@ -35,7 +32,7 @@ include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
 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)
+    set(MICROPY_FROZEN_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/boards/manifest.py)
 endif()
 
 # Add sdkconfig fragments that depend on the IDF version.
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 51e53c202fdfb..425d70fdf047c 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Set location of base MicroPython directory.
 if(NOT MICROPY_DIR)
-    get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
+endif()
+
+if(NOT MICROPY_PORT_DIR)
+    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
 endif()
 
 # Include core source components.
@@ -16,7 +20,7 @@ if(NOT CMAKE_BUILD_EARLY_EXPANSION)
 endif()
 
 set(MICROPY_QSTRDEFS_PORT
-    ${PROJECT_DIR}/qstrdefsport.h
+    ${MICROPY_PORT_DIR}/qstrdefsport.h
 )
 
 set(MICROPY_SOURCE_SHARED
@@ -48,44 +52,45 @@ set(MICROPY_SOURCE_DRIVERS
 )
 
 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
-    ${PROJECT_DIR}/help.c
-    ${PROJECT_DIR}/machine_bitstream.c
-    ${PROJECT_DIR}/machine_timer.c
-    ${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
-    ${PROJECT_DIR}/machine_uart.c
-    ${PROJECT_DIR}/modmachine.c
-    ${PROJECT_DIR}/network_common.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
-    ${PROJECT_DIR}/esp32_nvs.c
-    ${PROJECT_DIR}/esp32_partition.c
-    ${PROJECT_DIR}/esp32_rmt.c
-    ${PROJECT_DIR}/esp32_ulp.c
-    ${PROJECT_DIR}/modesp32.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
-    ${PROJECT_DIR}/modespnow.c
+    main.c
+    uart.c
+    usb.c
+    usb_serial_jtag.c
+    gccollect.c
+    mphalport.c
+    fatfs_port.c
+    help.c
+    machine_bitstream.c
+    machine_timer.c
+    machine_pin.c
+    machine_touchpad.c
+    machine_adc.c
+    machine_adcblock.c
+    machine_dac.c
+    machine_i2c.c
+    machine_i2s.c
+    machine_uart.c
+    modmachine.c
+    network_common.c
+    network_lan.c
+    network_ppp.c
+    network_wlan.c
+    mpnimbleport.c
+    modsocket.c
+    modesp.c
+    esp32_nvs.c
+    esp32_partition.c
+    esp32_rmt.c
+    esp32_ulp.c
+    modesp32.c
+    machine_hw_spi.c
+    machine_wdt.c
+    mpthreadport.c
+    machine_rtc.c
+    machine_sdcard.c
+    modespnow.c
 )
+list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
 
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}

From ea8f0fd8965f24e5c9978a4078e377d2a0480908 Mon Sep 17 00:00:00 2001
From: Brian 'redbeard' Harrington <redbeard@dead-city.org>
Date: Mon, 12 Jun 2023 13:15:56 -0700
Subject: [PATCH 0036/3129] rp2/CMake: Normalize MICROPY_PORT_DIR.

In 5fe2a3f1 the ESP32 port underwent a change to how `MICROPY_PORT_DIR`
is defined.  This commit normalizes the `rp2` port to use the same
underlying variable mechanism (`CMAKE_CURRENT_LIST_DIR`).

Signed-off-by: Brian 'redbeard' Harrington <redbeard@dead-city.org>
---
 ports/rp2/CMakeLists.txt | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 55c542173abc7..72f44b19e2628 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -20,7 +20,7 @@ set(PICO_TINYUSB_PATH ${MICROPY_DIR}/lib/tinyusb)
 set(PICO_LWIP_PATH ${MICROPY_DIR}/lib/lwip)
 
 # Set the location of this port's directory.
-set(MICROPY_PORT_DIR ${CMAKE_SOURCE_DIR})
+set(MICROPY_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
@@ -80,7 +80,7 @@ include(${MICROPY_DIR}/py/usermod.cmake)
 add_executable(${MICROPY_TARGET})
 
 set(MICROPY_QSTRDEFS_PORT
-    ${PROJECT_SOURCE_DIR}/qstrdefsport.h
+    ${MICROPY_PORT_DIR}/qstrdefsport.h
 )
 
 set(MICROPY_SOURCE_LIB
@@ -146,20 +146,20 @@ set(MICROPY_SOURCE_QSTR
     ${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
-    ${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
-    ${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}/modos.c
-    ${PROJECT_SOURCE_DIR}/rp2_flash.c
-    ${PROJECT_SOURCE_DIR}/rp2_pio.c
+    ${MICROPY_PORT_DIR}/machine_adc.c
+    ${MICROPY_PORT_DIR}/machine_i2c.c
+    ${MICROPY_PORT_DIR}/machine_i2s.c
+    ${MICROPY_PORT_DIR}/machine_pin.c
+    ${MICROPY_PORT_DIR}/machine_rtc.c
+    ${MICROPY_PORT_DIR}/machine_spi.c
+    ${MICROPY_PORT_DIR}/machine_timer.c
+    ${MICROPY_PORT_DIR}/machine_uart.c
+    ${MICROPY_PORT_DIR}/machine_wdt.c
+    ${MICROPY_PORT_DIR}/modmachine.c
+    ${MICROPY_PORT_DIR}/modrp2.c
+    ${MICROPY_PORT_DIR}/modos.c
+    ${MICROPY_PORT_DIR}/rp2_flash.c
+    ${MICROPY_PORT_DIR}/rp2_pio.c
     ${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c
 )
 
@@ -343,7 +343,7 @@ set(MICROPY_CROSS_FLAGS -march=armv6m)
 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)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
 endif()
 
 target_sources(${MICROPY_TARGET} PRIVATE
@@ -362,7 +362,7 @@ target_include_directories(${MICROPY_TARGET} PRIVATE
     ${MICROPY_INC_CORE}
     ${MICROPY_INC_USERMOD}
     ${MICROPY_BOARD_DIR}
-    "${PROJECT_SOURCE_DIR}"
+    "${MICROPY_PORT_DIR}"
     "${CMAKE_BINARY_DIR}"
 )
 

From 034502bc72e8d1b6371ce2970fdba4b7f4f41710 Mon Sep 17 00:00:00 2001
From: Wilko Nienhaus <wilko.nienhaus@gmail.com>
Date: Sun, 4 Jun 2023 15:42:13 +0300
Subject: [PATCH 0037/3129] esp32/esp32_ulp: Fix ULP (FSM) support for S2 and
 S3.

This change enables the ULP (FSM) for all ESP32 variants rather than
requiring it to be enabled for each board specifically.

It also ensures the correct header file is included for each variant.

Lastly, it updates the IDF version we're builing against to v4.4.2, as that
version contains important fixes to make the ULP actually work on S2/S3
chips. See: https://github.com/espressif/esp-idf/commit/a0e3d48

Signed-off-by: Wilko Nienhaus <wilko.nienhaus@gmail.com>
---
 ports/esp32/boards/sdkconfig.base | 4 ++++
 ports/esp32/esp32_ulp.c           | 9 +++++++--
 tools/ci.sh                       | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 6b891aa006b1b..138de095b45f2 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -50,6 +50,10 @@ CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 # ULP coprocessor support
 CONFIG_ESP32_ULP_COPROC_ENABLED=y
 CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=2040
+CONFIG_ESP32S2_ULP_COPROC_ENABLED=y
+CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=2040
+CONFIG_ESP32S3_ULP_COPROC_ENABLED=y
+CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=2040
 
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index e7962ce1acb5b..439ee3283683d 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -26,10 +26,15 @@
 
 #include "py/runtime.h"
 
-
 #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/ulp.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/ulp.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/ulp.h"
+#endif
 #include "esp_err.h"
 
 typedef struct _esp32_ulp_obj_t {
@@ -106,4 +111,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &esp32_ulp_locals_dict
     );
 
-#endif // CONFIG_IDF_TARGET_ESP32
+#endif // CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
diff --git a/tools/ci.sh b/tools/ci.sh
index 2f96a5b51d93d..e69558a83be8d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -141,7 +141,7 @@ function ci_esp32_idf402_setup {
 }
 
 function ci_esp32_idf44_setup {
-    ci_esp32_setup_helper v4.4
+    ci_esp32_setup_helper v4.4.2
 }
 
 function ci_esp32_build {

From 8cf9898dd3c93f3226d009ebce30f1f1c97b7afb Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 6 Jun 2023 10:41:23 -0500
Subject: [PATCH 0038/3129] py/parsenum: Fix typo in #endif comment.

This fixes a `#endif` comment to exactly match the `#if`.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/parsenum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index d59715fdc9379..e3ad8070c6e02 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -214,7 +214,7 @@ static void accept_digit(mp_float_t *p_dec_val, int dig, int *p_exp_extra, int i
         }
     }
 }
-#endif // MICROPY_BUILTINS_FLOAT
+#endif // MICROPY_PY_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)

From b02a5fa10aba1b17c9a24a073992ded8d7031a69 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sun, 11 Jun 2023 14:53:15 -0500
Subject: [PATCH 0039/3129] py/nlraarch64: Fix dangerous use of input register.

Starting with 2757acf6, the `top` variable in `nlr_jump()` in
`nlraarch64.c` was assigned to register `x19` by the compiler.  However,
the assembly code writes over that register with

    ldp x19, x20, [%0,  #32]

since `%0` is now `x19`. This causes the next line

    ldp lr,  x9,  [%0,  #16]

to load the wrong values.

To fix the issue, we move the value of the `top` variable from an unknown
register to a known register at the beginning of the asm code then only use
known/hard-coded registers after that.

Fixes issue #11754.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/nlraarch64.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/py/nlraarch64.c b/py/nlraarch64.c
index 1295351cbe828..fcc318f2dc182 100644
--- a/py/nlraarch64.c
+++ b/py/nlraarch64.c
@@ -62,13 +62,14 @@ NORETURN void nlr_jump(void *val) {
     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 x0, %0              \n"
+        "ldr x29,      [x0, #112]\n"
+        "ldp x27, x28, [x0,  #96]\n"
+        "ldp x25, x26, [x0,  #80]\n"
+        "ldp x23, x24, [x0,  #64]\n"
+        "ldp x21, x22, [x0,  #48]\n"
+        "ldp x19, x20, [x0,  #32]\n"
+        "ldp lr,  x9,  [x0,  #16]\n" // 16 == offsetof(nlr_buf_t, regs)
         "mov sp, x9              \n"
         "mov x0, #1              \n"  // non-local return
         "ret                     \n"

From 44295c9daa8a9210e2855ef431de21362c0cb662 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jun 2023 13:09:29 +1000
Subject: [PATCH 0040/3129] py/makemoduledefs.py: Fix declaring multiple module
 delegations.

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

diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index b1e118bf374be..66d4bff65cb28 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -109,7 +109,7 @@ def generate_module_delegations(delegations):
     print("\n#define MICROPY_MODULE_DELEGATIONS \\")
     for obj_module, fun_name in delegations:
         print(
-            "    {{ MP_ROM_PTR(&{obj_module}), {fun_name} }},".format(
+            "    {{ MP_ROM_PTR(&{obj_module}), {fun_name} }}, \\".format(
                 obj_module=obj_module, fun_name=fun_name
             )
         )

From 5ce1a03a78bf87c914d53f63a35cf2b81963e6e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jun 2023 13:09:48 +1000
Subject: [PATCH 0041/3129] py/makemoduledefs.py: Automatically declare
 delegation attr functions.

So that the delegation functions don't need to be put somewhere global,
like in mpconfigport.h.  That would otherwise make it hard for extension
modules to use delegation.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtin.h         | 2 --
 py/makemoduledefs.py | 5 ++++-
 py/modsys.c          | 2 +-
 py/objmodule.c       | 6 ------
 py/objmodule.h       | 6 ++++++
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/py/builtin.h b/py/builtin.h
index 57f275fb31206..81d0789802b9c 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -132,8 +132,6 @@ 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_sys;
 
-void mp_module_sys_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
-
 // Modules needed by the parser when MICROPY_COMP_MODULE_CONST is enabled.
 extern const mp_obj_module_t mp_module_errno;
 extern const mp_obj_module_t mp_module_uctypes;
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 66d4bff65cb28..29162ab387c8b 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -106,7 +106,10 @@ def generate_module_delegations(delegations):
     if not delegations:
         return
 
-    print("\n#define MICROPY_MODULE_DELEGATIONS \\")
+    print()
+    for obj_module, fun_name in delegations:
+        print("extern void {}(mp_obj_t self_in, qstr attr, mp_obj_t *dest);".format(fun_name))
+    print("#define MICROPY_MODULE_DELEGATIONS \\")
     for obj_module, fun_name in delegations:
         print(
             "    {{ MP_ROM_PTR(&{obj_module}), {fun_name} }}, \\".format(
diff --git a/py/modsys.c b/py/modsys.c
index 9b3a2bc163501..38105ee21894a 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -336,7 +336,7 @@ MP_REGISTER_ROOT_POINTER(mp_obj_t sys_exitfunc);
 #if MICROPY_PY_SYS_ATTR_DELEGATION
 // Contains mutable sys attributes.
 MP_REGISTER_ROOT_POINTER(mp_obj_t sys_mutable[MP_SYS_MUTABLE_NUM]);
-MP_REGISTER_MODULE_DELEGATION(mp_module_sys, &mp_module_sys_attr);
+MP_REGISTER_MODULE_DELEGATION(mp_module_sys, mp_module_sys_attr);
 #endif
 
 #endif // MICROPY_PY_SYS
diff --git a/py/objmodule.c b/py/objmodule.c
index 8ffae139bca37..5266421b79645 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -34,12 +34,6 @@
 #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
-
 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);
diff --git a/py/objmodule.h b/py/objmodule.h
index 9cc9a2f102feb..8b14cd9fc3d30 100644
--- a/py/objmodule.h
+++ b/py/objmodule.h
@@ -28,6 +28,12 @@
 
 #include "py/obj.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
+
 extern const mp_map_t mp_builtin_module_map;
 extern const mp_map_t mp_builtin_extensible_module_map;
 

From b3cd41dd4ba9d44910b7efc6c4a1fa5f531858d4 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 30 May 2022 10:22:57 -0400
Subject: [PATCH 0042/3129] py/lexer: Allow conversion specifiers in f-strings
 (e.g. !r).

PEP-498 allows for conversion specifiers like !r and !s to convert the
expression declared in braces to be passed through repr() and str()
respectively.

This updates the logic that detects the end of the expression to also stop
when it sees "![rs]" that is either at the end of the f-string or before
the ":" indicating the start of the format specifier. The "![rs]" is now
retained in the format string, whereas previously it stayed on the end
of the expression leading to a syntax error.

Previously: `f"{x!y:z}"` --> `"{:z}".format(x!y)`
Now: `f"{x!y:z}"` --> `"{!y:z}".format(x)`

Note that "!a" is not supported by `str.format` as MicroPython has no
`ascii()`, but now this will raise the correct error.

Updated cpydiff and added tests.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/lexer.c                         | 24 ++++++++++++++++++------
 tests/basics/string_fstring.py     | 19 +++++++++++++++++++
 tests/cpydiff/core_fstring_repr.py | 18 ++++--------------
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/py/lexer.c b/py/lexer.c
index e7d0e81440fc2..b22cc2eaeaec4 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -361,13 +361,25 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
                     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
-                    // 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({})}'.
+                    // Extract characters inside the { until the bracket level
+                    // is zero and we reach the conversion specifier '!',
+                    // format specifier ':', or closing '}'. The conversion
+                    // and format specifiers are left unchanged in the format
+                    // string to be handled by str.format.
+                    // (MicroPython limitation) note: this is completely
+                    // unaware of Python syntax and will not handle any
+                    // expression containing '}' or ':'. e.g. f'{"}"}' or f'
+                    // {foo({})}'. However, detection of the '!' will
+                    // specifically ensure that it's followed by [rs] and
+                    // then either the format specifier or the closing
+                    // brace. This allows the use of e.g. != in expressions.
                     unsigned int nested_bracket_level = 0;
-                    while (!is_end(lex) && (nested_bracket_level != 0 || !is_char_or(lex, ':', '}'))) {
+                    while (!is_end(lex) && (nested_bracket_level != 0
+                                            || !(is_char_or(lex, ':', '}')
+                                                 || (is_char(lex, '!')
+                                                     && is_char_following_or(lex, 'r', 's')
+                                                     && is_char_following_following_or(lex, ':', '}'))))
+                           ) {
                         unichar c = CUR_CHAR(lex);
                         if (c == '[' || c == '{') {
                             nested_bracket_level += 1;
diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
index 8907a5c47846c..1a3960680e4f8 100644
--- a/tests/basics/string_fstring.py
+++ b/tests/basics/string_fstring.py
@@ -61,3 +61,22 @@ def foo(a, b):
 print(f"a {1,} b")
 print(f"a {x,y,} b")
 print(f"a {x,1} b")
+
+# f-strings with conversion specifiers (only support !r and !s).
+a = "123"
+print(f"{a!r}")
+print(f"{a!s}")
+try:
+    eval('print(f"{a!x}")')
+except (ValueError, SyntaxError):
+    # CPython detects this at compile time, MicroPython fails with ValueError
+    # when the str.format is executed.
+    print("ValueError")
+
+# Mixing conversion specifiers with formatting.
+print(f"{a!r:8s}")
+print(f"{a!s:8s}")
+
+# Still allow ! in expressions.
+print(f"{'1' if a != '456' else '0'!r:8s}")
+print(f"{'1' if a != '456' else '0'!s:8s}")
diff --git a/tests/cpydiff/core_fstring_repr.py b/tests/cpydiff/core_fstring_repr.py
index df80abf795b38..d37fb48db758c 100644
--- a/tests/cpydiff/core_fstring_repr.py
+++ b/tests/cpydiff/core_fstring_repr.py
@@ -1,18 +1,8 @@
 """
 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() explicitly.
+description: f-strings don't support !a conversions
+cause: MicropPython does not implement ascii()
+workaround: None
 """
 
-
-class X:
-    def __repr__(self):
-        return "repr"
-
-    def __str__(self):
-        return "str"
-
-
-print(f"{X()!r}")
-print(f"{X()!s}")
+f"{'unicode text'!a}"

From ca3807081aa80646e5e4cb44b1457ae3ad35f1b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jun 2023 00:04:02 +1000
Subject: [PATCH 0043/3129] lib/cyw43-driver: Update driver to latest version
 v1.0.1.

Includes a fix for combined BT+WiFi when using SPI transport.

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 36144f94bee69..8ef38a6d32c54 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 36144f94bee69ad5e7b46fef06ce0c2405bafee5
+Subproject commit 8ef38a6d32c54f850bff8f189bdca19ded33792a

From 825a95713ed30e8a4dc542088d88ac24fa8a9cee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jun 2023 00:04:24 +1000
Subject: [PATCH 0044/3129] lib/btstack: Update to v1.5.6.2.

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 1635e36d06821..77e752abd6a09 160000
--- a/lib/btstack
+++ b/lib/btstack
@@ -1 +1 @@
-Subproject commit 1635e36d06821af8b61302509e91bfcc1ade84c4
+Subproject commit 77e752abd6a0992334047a48038a5a3960e5c6bc

From 1de335f7ff0758ebdda5bd6abea3ea45a9c29c5e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jun 2023 00:04:43 +1000
Subject: [PATCH 0045/3129] lib/pico-sdk: Update to version 1.5.1.

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 f396d05f8252d..6a7db34ff6334 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit f396d05f8252d4670d4ea05c8b7ac938ef0cd381
+Subproject commit 6a7db34ff63345a7badec79ebea3aaef1712f374

From 35182a86884f23d8bbee212506abb785920be055 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Tue, 2 Aug 2022 17:34:30 +0100
Subject: [PATCH 0046/3129] extmod/btstack: Add cmake support for BTstack.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack.cmake | 60 ++++++++++++++++++++++++++++++++++++
 extmod/extmod.cmake          |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 extmod/btstack/btstack.cmake

diff --git a/extmod/btstack/btstack.cmake b/extmod/btstack/btstack.cmake
new file mode 100644
index 0000000000000..dd416fcbfbd33
--- /dev/null
+++ b/extmod/btstack/btstack.cmake
@@ -0,0 +1,60 @@
+set(BTSTACK_LIB_DIR "${MICROPY_DIR}/lib/btstack")
+set(BTSTACK_EXTMOD_DIR "${MICROPY_DIR}/extmod/btstack")
+
+add_library(micropy_extmod_btstack INTERFACE)
+
+target_include_directories(micropy_extmod_btstack INTERFACE
+    ${MICROPY_DIR}/
+    ${MICROPY_PORT_DIR}/
+    ${BTSTACK_EXTMOD_DIR}/
+    ${BTSTACK_LIB_DIR}/src
+    ${BTSTACK_LIB_DIR}/3rd-party/bluedroid/decoder/include
+    ${BTSTACK_LIB_DIR}/3rd-party/bluedroid/encoder/include
+    ${BTSTACK_LIB_DIR}/3rd-party/md5
+    ${BTSTACK_LIB_DIR}/3rd-party/yxml
+)
+
+target_sources(micropy_extmod_btstack INTERFACE
+    ${BTSTACK_LIB_DIR}/platform/embedded/hci_dump_embedded_stdout.c
+    ${BTSTACK_LIB_DIR}/src/ad_parser.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/ancs_client.c
+    ${BTSTACK_LIB_DIR}/src/ble/att_db.c
+    ${BTSTACK_LIB_DIR}/src/ble/att_db_util.c
+    ${BTSTACK_LIB_DIR}/src/ble/att_dispatch.c
+    ${BTSTACK_LIB_DIR}/src/ble/att_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/battery_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/cycling_power_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/cycling_speed_and_cadence_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/device_information_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/heart_rate_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/hids_device.c
+    ${BTSTACK_LIB_DIR}/src/mesh/gatt-service/mesh_provisioning_service_server.c
+    ${BTSTACK_LIB_DIR}/src/mesh/gatt-service/mesh_proxy_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/nordic_spp_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt-service/ublox_spp_service_server.c
+    ${BTSTACK_LIB_DIR}/src/ble/gatt_client.c
+    ${BTSTACK_LIB_DIR}/src/ble/le_device_db_memory.c
+    ${BTSTACK_LIB_DIR}/src/ble/sm.c
+    ${BTSTACK_LIB_DIR}/src/btstack_audio.c
+    ${BTSTACK_LIB_DIR}/src/btstack_base64_decoder.c
+    ${BTSTACK_LIB_DIR}/src/btstack_crypto.c
+    ${BTSTACK_LIB_DIR}/src/btstack_hid_parser.c
+    ${BTSTACK_LIB_DIR}/src/btstack_linked_list.c
+    ${BTSTACK_LIB_DIR}/src/btstack_memory.c
+    ${BTSTACK_LIB_DIR}/src/btstack_memory_pool.c
+    ${BTSTACK_LIB_DIR}/src/btstack_resample.c
+    ${BTSTACK_LIB_DIR}/src/btstack_ring_buffer.c
+    ${BTSTACK_LIB_DIR}/src/btstack_run_loop.c
+    ${BTSTACK_LIB_DIR}/src/btstack_run_loop_base.c
+    ${BTSTACK_LIB_DIR}/src/btstack_slip.c
+    ${BTSTACK_LIB_DIR}/src/btstack_tlv.c
+    ${BTSTACK_LIB_DIR}/src/btstack_tlv_none.c
+    ${BTSTACK_LIB_DIR}/src/btstack_util.c
+    ${BTSTACK_LIB_DIR}/src/hci.c
+    ${BTSTACK_LIB_DIR}/src/hci_cmd.c
+    ${BTSTACK_LIB_DIR}/src/hci_dump.c
+    ${BTSTACK_LIB_DIR}/src/hci_transport_em9304_spi.c
+    ${BTSTACK_LIB_DIR}/src/hci_transport_h4.c
+    ${BTSTACK_LIB_DIR}/src/l2cap.c
+    ${BTSTACK_LIB_DIR}/src/l2cap_signaling.c
+)
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 8ebaf944f3a59..59f07b8ae49f4 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}/btstack/modbluetooth_btstack.c
     ${MICROPY_EXTMOD_DIR}/machine_bitstream.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c

From 888a15cda3c7094009563fc65f19c6d8f76cc201 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 13 Jul 2022 13:08:09 +0100
Subject: [PATCH 0047/3129] rp2: Add Bluetooth support via cyw43.

Using BTstack with CYW43 for Pico W.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt               |  41 ++++++-
 ports/rp2/btstack_inc/btstack_config.h |   9 ++
 ports/rp2/cyw43_configport.h           |  10 +-
 ports/rp2/main.c                       |   2 +-
 ports/rp2/mpbthciport.c                |  26 ++--
 ports/rp2/mpbthciport.h                |   2 +-
 ports/rp2/mpbtstackport.c              | 157 +++++++++++++++++++++++++
 ports/rp2/mpconfigport.h               |   6 +
 ports/rp2/mpnetworkport.c              |   2 +-
 9 files changed, 238 insertions(+), 17 deletions(-)
 create mode 100644 ports/rp2/btstack_inc/btstack_config.h
 create mode 100644 ports/rp2/mpbtstackport.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 72f44b19e2628..4334a0aba9b93 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -18,6 +18,8 @@ endif()
 set(PICO_TINYUSB_PATH ${MICROPY_DIR}/lib/tinyusb)
 # Use the local lwip instead of the one in pico-sdk
 set(PICO_LWIP_PATH ${MICROPY_DIR}/lib/lwip)
+# Use the local btstack instead of the one in pico-sdk
+set(PICO_BTSTACK_PATH ${MICROPY_DIR}/lib/btstack)
 
 # Set the location of this port's directory.
 set(MICROPY_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
@@ -217,11 +219,40 @@ if(MICROPY_PY_BLUETOOTH)
         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
     )
 endif()
 
+if (MICROPY_PY_BLUETOOTH_CYW43)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        CYW43_ENABLE_BLUETOOTH=1
+        MICROPY_PY_BLUETOOTH_CYW43=1
+    )
+
+    if (MICROPY_BLUETOOTH_BTSTACK)
+        target_link_libraries(${MICROPY_TARGET}
+            pico_btstack_hci_transport_cyw43
+        )
+    endif()
+endif()
+
+if (MICROPY_BLUETOOTH_BTSTACK)
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/btstack)
+
+    list(APPEND MICROPY_SOURCE_PORT mpbtstackport.c)
+
+    include(${MICROPY_DIR}/extmod/btstack/btstack.cmake)
+    target_link_libraries(${MICROPY_TARGET} micropy_extmod_btstack)
+
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_BLUETOOTH_BTSTACK=1
+        MICROPY_BLUETOOTH_BTSTACK_CONFIG_FILE=\"btstack_inc/btstack_config.h\"
+    )
+
+    # For modbluetooth_btstack.c includes
+    get_target_property(BTSTACK_INCLUDE micropy_extmod_btstack INTERFACE_INCLUDE_DIRECTORIES)
+    list(APPEND MICROPY_INC_CORE ${BTSTACK_INCLUDE})
+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)
@@ -232,6 +263,8 @@ if(MICROPY_BLUETOOTH_NIMBLE)
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
         MICROPY_BLUETOOTH_NIMBLE=1
         MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY=0
+        MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
+        MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
     )
     target_compile_options(${MICROPY_TARGET} PRIVATE
     # TODO: This flag is currently needed to make nimble build.
@@ -272,6 +305,10 @@ if (MICROPY_PY_NETWORK_CYW43)
         cyw43_driver_picow
         cmsis_core
     )
+    target_include_directories(${MICROPY_TARGET} PRIVATE
+        ${MICROPY_DIR}/lib/cyw43-driver/
+    )
+
 endif()
 
 if (MICROPY_PY_NETWORK_NINAW10)
diff --git a/ports/rp2/btstack_inc/btstack_config.h b/ports/rp2/btstack_inc/btstack_config.h
new file mode 100644
index 0000000000000..ec7cd7fb729e9
--- /dev/null
+++ b/ports/rp2/btstack_inc/btstack_config.h
@@ -0,0 +1,9 @@
+#ifndef MICROPY_INCLUDED_BTSTACK_BTSTACK_CONFIG_H
+#define MICROPY_INCLUDED_BTSTACK_BTSTACK_CONFIG_H
+
+#define HCI_OUTGOING_PRE_BUFFER_SIZE 4
+#define HCI_ACL_CHUNK_SIZE_ALIGNMENT 4
+
+#include "btstack_config_common.h"
+
+#endif
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 08cded6f1f156..0c4a032100e8a 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -33,7 +33,6 @@
 #include "extmod/modnetwork.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)
@@ -91,6 +90,15 @@
 
 #define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
 
+// Bluetooth uses the C heap to load its firmware (provided by pico-sdk).
+// Space is reserved for this, see MICROPY_C_HEAP_SIZE.
+#ifndef cyw43_malloc
+#define cyw43_malloc malloc
+#endif
+#ifndef cyw43_free
+#define cyw43_free free
+#endif
+
 void cyw43_post_poll_hook(void);
 extern volatile int cyw43_has_pending;
 
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index c5118857a4382..ff0384b95292b 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv) {
     #endif
     #endif
 
-    #if MICROPY_PY_NETWORK_CYW43
+    #if MICROPY_PY_NETWORK_CYW43 || MICROPY_PY_BLUETOOTH_CYW43
     {
         cyw43_init(&cyw43_state);
         cyw43_irq_init();
diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index 8840fe52f124e..ac05e4607ec7a 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -50,11 +50,6 @@ 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();
@@ -70,7 +65,7 @@ void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
 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.
+    // This will process all HCI data, and run any callouts or events.
     mp_bluetooth_hci_poll();
     return mp_const_none;
 }
@@ -88,8 +83,15 @@ void mp_bluetooth_hci_poll_now(void) {
     }
 }
 
+#if defined(MICROPY_HW_BLE_UART_ID)
+
 mp_obj_t mp_bthci_uart;
 
+STATIC void mp_bluetooth_hci_start_polling(void) {
+    events_task_is_scheduled = false;
+    mp_bluetooth_hci_poll_now();
+}
+
 int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     debug_printf("mp_bluetooth_hci_uart_init\n");
 
@@ -121,11 +123,6 @@ int mp_bluetooth_hci_uart_deinit(void) {
     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 *)MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, protocol);
@@ -171,6 +168,13 @@ int mp_bluetooth_hci_uart_readchar(void) {
     }
 }
 
+int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
+    debug_printf("mp_bluetooth_hci_uart_set_baudrate(%lu)\n", baudrate);
+    return 0;
+}
+
+#endif // defined(MICROPY_HW_BLE_UART_ID)
+
 // 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).
diff --git a/ports/rp2/mpbthciport.h b/ports/rp2/mpbthciport.h
index ac5263aa11a8f..fdf46c506c16b 100644
--- a/ports/rp2/mpbthciport.h
+++ b/ports/rp2/mpbthciport.h
@@ -34,7 +34,7 @@ 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.
+// Request new HCI data 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);
diff --git a/ports/rp2/mpbtstackport.c b/ports/rp2/mpbtstackport.c
new file mode 100644
index 0000000000000..4d907be76f7be
--- /dev/null
+++ b/ports/rp2/mpbtstackport.c
@@ -0,0 +1,157 @@
+/*
+ * 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"
+
+#define DEBUG_printf(...)
+#define BTSTACK_ENABLE_HCI_DUMP (0)
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
+
+#include "lib/btstack/src/btstack.h"
+#include "lib/btstack/platform/embedded/hci_dump_embedded_stdout.h"
+#include "extmod/mpbthci.h"
+#include "extmod/btstack/modbluetooth_btstack.h"
+#include "mpbthciport.h"
+#include "pico/btstack_hci_transport_cyw43.h"
+
+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) {
+    DEBUG_printf("mp_btstack_runloop_set_timer %lu\n", timeout_ms);
+    tim->timeout = mp_hal_ticks_ms() + timeout_ms + 1;
+}
+
+static void mp_btstack_runloop_add_timer(btstack_timer_source_t *tim) {
+    DEBUG_printf("mp_btstack_runloop_add_timer %lu\n", tim->timeout);
+    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);
+    }
+}
+
+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);
+}
+
+static uint32_t mp_btstack_runloop_get_time_ms(void) {
+    return mp_hal_ticks_ms();
+}
+
+static const btstack_run_loop_t mp_btstack_runloop_rp2 = {
+    &mp_btstack_runloop_init,
+    &btstack_run_loop_base_add_data_source,
+    &btstack_run_loop_base_remove_data_source,
+    &btstack_run_loop_base_enable_data_source_callbacks,
+    &btstack_run_loop_base_disable_data_source_callbacks,
+    &mp_btstack_runloop_set_timer,
+    &mp_btstack_runloop_add_timer,
+    &mp_btstack_runloop_remove_timer,
+    NULL, // execute
+    NULL, // dump_timer
+    &mp_btstack_runloop_get_time_ms,
+    &mp_bluetooth_hci_poll_now, // poll_data_sources_from_irq
+    NULL, // execute_on_main_thread
+    NULL, // trigger_exit
+};
+
+void mp_bluetooth_hci_poll(void) {
+    if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_OFF) {
+        return;
+    }
+
+    // Process BT data.
+    if (mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_HALTING) {
+        btstack_run_loop_base_poll_data_sources();
+    }
+
+    // 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) {
+    btstack_run_loop_init(&mp_btstack_runloop_rp2);
+
+    #if BTSTACK_ENABLE_HCI_DUMP
+    hci_dump_init(hci_dump_embedded_stdout_get_instance());
+    #endif
+
+    const hci_transport_t *transport = hci_transport_cyw43_instance();
+    hci_init(transport, NULL);
+}
+
+void mp_bluetooth_btstack_port_deinit(void) {
+    hci_power_control(HCI_POWER_OFF);
+    // We really need hci to be closed or else we might get a BT interrupt going off and
+    // this will cause a crash when calling btstack_run_loop_poll_data_sources_from_irq after the btstack run loop has been deleted
+    if (mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_OFF) {
+        hci_transport_cyw43_instance()->close();
+    }
+    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/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 28b06fa3a8f42..df44831662443 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -282,3 +282,9 @@ 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);
+
+#if MICROPY_PY_BLUETOOTH_CYW43
+// 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;
+#endif
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index d8e33e229d9f8..dac04760b8462 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -62,7 +62,7 @@ static void gpio_irq_handler(void) {
 }
 
 void cyw43_irq_init(void) {
-    gpio_add_raw_irq_handler_with_order_priority(IO_IRQ_BANK0, gpio_irq_handler, CYW43_SHARED_IRQ_HANDLER_PRIORITY);
+    gpio_add_raw_irq_handler_with_order_priority(CYW43_PIN_WL_HOST_WAKE, gpio_irq_handler, CYW43_SHARED_IRQ_HANDLER_PRIORITY);
     irq_set_enabled(IO_IRQ_BANK0, true);
     NVIC_SetPriority(PendSV_IRQn, PICO_LOWEST_IRQ_PRIORITY);
 }

From a459eaf3e6a8d0e0f36c885c994819a296a64e71 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Mon, 13 Mar 2023 10:35:48 +0000
Subject: [PATCH 0048/3129] rp2/mpbthciport: Cancel existing alarms.

Cancel any existing poll alarm before add a new one.

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

diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index ac05e4607ec7a..d5b3c6073ade2 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -57,6 +57,9 @@ static int64_t mp_bluetooth_hci_timer_callback(alarm_id_t id, void *user_data) {
 }
 
 void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+    if (poll_timer_id != 0) {
+        cancel_alarm(poll_timer_id);
+    }
     poll_timer_id = add_alarm_in_ms(ms, mp_bluetooth_hci_timer_callback, NULL, true);
 }
 

From ba83f6d50c0da30e159d266232457d8c1d281179 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Mon, 13 Mar 2023 10:39:06 +0000
Subject: [PATCH 0049/3129] extmod/btstack: Fix marking of static addresses in
 set_random_address.

Marking address as static was not applied to all code paths.

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

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 183c85a445481..0c15e9343159d 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -544,8 +544,6 @@ STATIC void set_random_address(void) {
 
         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
 
@@ -558,6 +556,8 @@ STATIC void set_random_address(void) {
         }
 
         #endif // MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
+        // Mark it as STATIC (not RPA or NRPA).
+        static_addr[0] |= 0xc0;
 
         DEBUG_printf("set_random_address: Address generated.\n");
         gap_random_address_set(static_addr);

From 856e08b1931b88271816a2f60648f6ff332235b2 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Mon, 13 Mar 2023 10:40:22 +0000
Subject: [PATCH 0050/3129] rp2/boards/PICO_W: Enable Bluetooth Low Energy
 support.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/boards/PICO_W/board.json          | 3 ++-
 ports/rp2/boards/PICO_W/manifest.py         | 3 +++
 ports/rp2/boards/PICO_W/mpconfigboard.cmake | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/PICO_W/board.json
index 755ba1037011e..a85d7e0446642 100644
--- a/ports/rp2/boards/PICO_W/board.json
+++ b/ports/rp2/boards/PICO_W/board.json
@@ -7,7 +7,8 @@
         "Breadboard friendly",
         "Castellated Pads",
         "Micro USB",
-        "WiFi"
+        "WiFi",
+        "Bluetooth"
     ],
     "id": "rp2-pico-w",
     "images": [
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index 02d1874b52b9a..4e38f09cdee4f 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -1,3 +1,6 @@
 include("$(PORT_DIR)/boards/manifest.py")
 
 require("bundle-networking")
+
+# Bluetooth
+require("aioble")
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.cmake b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
index df9d70c016eaa..e6db8dda6a2cb 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
@@ -1,6 +1,15 @@
 # cmake file for Raspberry Pi Pico W
+
+# The C malloc is needed by cyw43-driver Bluetooth
+set(MICROPY_C_HEAP_SIZE 4096)
+
 set(MICROPY_PY_LWIP ON)
 set(MICROPY_PY_NETWORK_CYW43 ON)
 
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
 # Board specific version of the frozen manifest
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

From 33b403dfb4ea9ec90427e7228c53e0ac4d333863 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jun 2023 09:36:26 +1000
Subject: [PATCH 0051/3129] tools/ci.sh: Build PICO_W board as part of rp2 CI.

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 e69558a83be8d..eac0d52ffccf2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -300,8 +300,8 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
     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
+    make ${MAKEOPTS} -C ports/rp2 BOARD=PICO_W submodules
+    make ${MAKEOPTS} -C ports/rp2 BOARD=PICO_W 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 bf9ca0bb33a715e09387009987f3f2d3332bb75f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Mar 2023 00:14:43 +1100
Subject: [PATCH 0052/3129] py/mkrules.mk: Allow $(AFLAGS) to set flags to
 $(AS).

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 db81faa7ff2f6..a3ff85ef821b3 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) $(AFLAGS) -o $@ $<
 
 define compile_c
 $(ECHO) "CC $<"

From 68b09abc45ddd4077dfecf215624d7a4e1915ce3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Mar 2023 00:15:02 +1100
Subject: [PATCH 0053/3129] stm32/Makefile: Pass relevant CPU flags to
 assembler.

Needed for compiling gchelper_thumb2 on cortex-m33.

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

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index fce81d753f4fa..2b99a98788f40 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -110,6 +110,8 @@ CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
 CFLAGS += -DMBOOT_VTOR=$(MBOOT_TEXT0_ADDR)
 CFLAGS += -DMICROPY_HW_VTOR=$(TEXT0_ADDR)
 
+AFLAGS += $(filter -mcpu=%,$(CFLAGS_MCU_$(MCU_SERIES)))
+
 # Configure for nan-boxing object model if requested
 ifeq ($(NANBOX),1)
 CFLAGS += -DMP_CONFIGFILE='"mpconfigport_nanbox.h"'

From fb1bdf0ff2d48fbc28ce89b5424fac07edd50e4b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Mar 2023 16:27:05 +1100
Subject: [PATCH 0054/3129] stm32/make-stmconst.py: Support structs with names
 ending in _t.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/make-stmconst.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index bf0543716a8e8..49b5c1a17bed4 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -71,6 +71,10 @@ class Lexer:
         ("typedef struct", re.compile(r"typedef struct$")),
         ("{", re.compile(r"{$")),
         ("}", re.compile(r"}$")),
+        (
+            "} _t",
+            re.compile(r"} *([A-Za-z0-9_]+)_t;$"),
+        ),
         (
             "} TypeDef",
             re.compile(r"} *(?P<id>[A-Z][A-Za-z0-9_]*)_(?P<global>([A-Za-z0-9_]+)?)TypeDef;$"),
@@ -157,7 +161,7 @@ def parse_file(filename):
                     for i in range(int(d["array"])):
                         regs.append((reg + str(i), offset + i * bits // 8, bits, comment))
                 m = lexer.next_match()
-            if m[0] == "}":
+            if m[0] in ("}", "} _t"):
                 pass
             elif m[0] == "} TypeDef":
                 d = m[1].groupdict()

From b839acc7d9231df049793bd32c672f72b705af3e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 May 2023 15:55:28 +1000
Subject: [PATCH 0055/3129] stm32/main: Start UART REPL as early as possible.

For debugging purposes, to see output from other peripherals.

Also reset the pyb_stdio_uart state at the end of soft reset, in case it
points to a heap-allocated object.

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

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index cc0367b824e05..15be21d481328 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -411,6 +411,21 @@ void stm32_main(uint32_t reset_mode) {
     rtc_init_start(false);
     #endif
     uart_init0();
+
+    #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 - 1] = &pyb_uart_repl_obj;
+    MP_STATE_PORT(pyb_stdio_uart) = &pyb_uart_repl_obj;
+    #endif
+
     spi_init0();
     #if MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
     i2c_init0();
@@ -446,19 +461,6 @@ void stm32_main(uint32_t reset_mode) {
     }
     #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 - 1] = &pyb_uart_repl_obj;
-    #endif
-
     boardctrl_state_t state;
     state.reset_mode = reset_mode;
     state.log_soft_reset = false;
@@ -496,12 +498,6 @@ void stm32_main(uint32_t reset_mode) {
     // 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();
     pin_init0();
     extint_init0();
@@ -659,6 +655,12 @@ void stm32_main(uint32_t reset_mode) {
     pyb_thread_deinit();
     #endif
 
+    #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
+
     MICROPY_BOARD_END_SOFT_RESET(&state);
 
     gc_sweep_all();

From 92d2de82e29fb27d329417a76f0dc95b5b29e9b1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jun 2023 17:10:22 +1000
Subject: [PATCH 0056/3129] stm32/usbd_conf: Treat G0 USB periph as
 MICROPY_HW_USB_IS_MULTI_OTG=0.

The G0 USB peripheral behaves more like MICROPY_HW_USB_IS_MULTI_OTG=0 than
that config =1.  This fixes the configuration of the PMA FIFO buffers.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h |  4 +++-
 ports/stm32/usbd_cdc_interface.c   |  4 ++--
 ports/stm32/usbd_conf.c            | 18 ++++++------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 300ca55d5b4d2..62311324aabdb 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -574,7 +574,9 @@
 #endif
 
 // Whether the USB peripheral is device-only, or multiple OTG
-#if defined(STM32G4) || defined(STM32L0) || defined(STM32L432xx) || defined(STM32WB)
+// For STM32G0 the USB peripheral supports device and host mode,
+// but otherwise acts like a non-multi-OTG peripheral.
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L432xx) || defined(STM32WB)
 #define MICROPY_HW_USB_IS_MULTI_OTG (0)
 #else
 #define MICROPY_HW_USB_IS_MULTI_OTG (1)
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index 399411d8abbb8..1e5d6c80a4e69 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -52,9 +52,9 @@
 
 #if !MICROPY_HW_USB_IS_MULTI_OTG
 #define USE_USB_CNTR_SOFM (1)
-#elif defined(STM32G0)
-#define USE_USB_CNTR_SOFM (1)
+#if defined(STM32G0)
 #define USB USB_DRD_FS
+#endif
 #else
 #define USE_USB_CNTR_SOFM (0)
 #endif
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 371558d77517d..9c53c6323a44d 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -44,13 +44,11 @@ PCD_HandleTypeDef pcd_fs_handle;
 PCD_HandleTypeDef pcd_hs_handle;
 #endif
 
-#if !MICROPY_HW_USB_IS_MULTI_OTG
-// The MCU has a single USB device-only instance
-#define USB_OTG_FS USB
-#endif
-
 #if defined(STM32G0)
 #define USB_OTG_FS USB_DRD_FS
+#elif !MICROPY_HW_USB_IS_MULTI_OTG
+// The MCU has a single USB device-only instance
+#define USB_OTG_FS USB
 #endif
 
 /*******************************************************************************
@@ -119,7 +117,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         #endif
 
         // Enable USB FS Clocks
-        #if !MICROPY_HW_USB_IS_MULTI_OTG || defined(STM32G0)
+        #if !MICROPY_HW_USB_IS_MULTI_OTG
         __HAL_RCC_USB_CLK_ENABLE();
         #else
         __USB_OTG_FS_CLK_ENABLE();
@@ -262,11 +260,7 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef *hpcd) {
     #if MICROPY_HW_USB_FS
     if (hpcd->Instance == USB_OTG_FS) {
         /* Disable USB FS Clocks */
-        #if defined(STM32G0)
-        __HAL_RCC_USB_CLK_DISABLE();
-        #else
         __USB_OTG_FS_CLK_DISABLE();
-        #endif
         return;
     }
     #endif
@@ -443,7 +437,7 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const
         pcd_fs_handle.Init.speed = PCD_SPEED_FULL;
         pcd_fs_handle.Init.lpm_enable = DISABLE;
         pcd_fs_handle.Init.battery_charging_enable = DISABLE;
-        #if MICROPY_HW_USB_IS_MULTI_OTG
+        #if MICROPY_HW_USB_IS_MULTI_OTG || defined(STM32G0)
         #if !defined(STM32G0)
         pcd_fs_handle.Init.use_dedicated_ep1 = 0;
         #endif
@@ -463,7 +457,7 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const
         HAL_PCD_Init(&pcd_fs_handle);
 
         // Set FIFO buffer sizes
-        #if !MICROPY_HW_USB_IS_MULTI_OTG || defined(STM32G0)
+        #if !MICROPY_HW_USB_IS_MULTI_OTG
         uint32_t fifo_offset = USBD_PMA_RESERVE; // need to reserve some data at start of FIFO
         for (size_t i = 0; i < USBD_PMA_NUM_FIFO; ++i) {
             uint16_t ep_addr = ((i & 1) * 0x80) | (i >> 1);

From f7f8332ddf877c15f89c525fbfb34f5ff9f8f453 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 15 Jun 2023 10:58:53 +1000
Subject: [PATCH 0057/3129] stm32/machine_adc: Handle ADC resolution less than
 8 bits on all MCUs.

All MCUs can have 6-bit resolution; see adc_cr_to_bits_table.

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

diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 34319e9753321..f68ed0ec84766 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -374,12 +374,10 @@ uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sa
 
     // Scale raw reading to 16 bit value using a Taylor expansion (for bits <= 16).
     uint32_t bits = adc_get_bits(adc);
-    #if defined(STM32H7)
     if (bits < 8) {
         // For 6 and 7 bits
         return raw << (16 - bits) | raw << (16 - 2 * bits) | raw >> (3 * bits - 16);
     }
-    #endif
     return raw << (16 - bits) | raw >> (2 * bits - 16);
 }
 

From bd7196e1233a7c36fbd8be8fea71eaaad4fb62fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jun 2023 15:13:47 +1000
Subject: [PATCH 0058/3129] lib/stm32lib: Update library for H5 v1.0.0.

Changes in this new library version are:
- Add H5 HAL at v1.0.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 fdb1ec6879bc8..928df866e4d28 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit fdb1ec6879bc8b7bb54ded73bac04839003c5a07
+Subproject commit 928df866e4d287ebc3c60726151513ebee609128

From 61339aa5062577ca1c75cb2443c78e5b5965c30b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Mar 2023 16:38:49 +1100
Subject: [PATCH 0059/3129] stm32: Add initial support for H5 MCUs.

This commit adds initial support for STM32H5xx MCUs.  The following
features have been confirmed to be working on an STM32H573:
- UART over REPL and USB CDC
- USB CDC and MSC
- internal flash filesystem
- machine.Pin
- machine.SPI transfers with DMA
- machine.ADC
- machine.RTC
- pyb.LED
- pyb.Switch
- pyb.rng
- mboot

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile               |  10 ++-
 ports/stm32/adc.c                  |  22 ++++--
 ports/stm32/adc.h                  |   2 +-
 ports/stm32/dac.c                  |   8 +-
 ports/stm32/dma.c                  | 115 +++++++++++++++++++++++++++--
 ports/stm32/dma.h                  |   2 +-
 ports/stm32/extint.c               |  41 +++++++---
 ports/stm32/extint.h               |   5 ++
 ports/stm32/flash.c                |  33 +++++++--
 ports/stm32/i2cslave.h             |   2 +-
 ports/stm32/machine_adc.c          |  30 ++++----
 ports/stm32/machine_uart.c         |   2 +-
 ports/stm32/main.c                 |  13 ++++
 ports/stm32/mboot/Makefile         |   2 +
 ports/stm32/mboot/main.c           |  31 +++++++-
 ports/stm32/mboot/mphalport.h      |   2 +
 ports/stm32/modmachine.c           |  34 +++++----
 ports/stm32/mpconfigboard_common.h |  14 +++-
 ports/stm32/mphalport.c            |   6 +-
 ports/stm32/mphalport.h            |   4 +
 ports/stm32/mpu.h                  |  30 ++++++++
 ports/stm32/powerctrl.c            |  33 +++++++--
 ports/stm32/powerctrlboot.c        | 102 ++++++++++++++++++++++++-
 ports/stm32/rng.c                  |   1 +
 ports/stm32/rtc.c                  |  36 ++++++---
 ports/stm32/spi.c                  |  27 ++++++-
 ports/stm32/stm32.mk               |   2 +
 ports/stm32/stm32_it.c             |  29 +++++++-
 ports/stm32/timer.c                |  60 ++++++++++++++-
 ports/stm32/uart.c                 |  14 ++--
 ports/stm32/usb.c                  |   2 +-
 ports/stm32/usbd_cdc_interface.c   |   2 +-
 ports/stm32/usbd_conf.c            |  23 ++++--
 33 files changed, 624 insertions(+), 115 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 2b99a98788f40..d75101159bd37 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -403,7 +403,7 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_utils.c \
 	)
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h7 l0 l4 wb))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 l0 l4 wb))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_pcd.c \
 	hal_pcd_ex.c \
@@ -432,12 +432,18 @@ $(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno
 endif
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h7))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_dma_ex.c \
 	)
 endif
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),h5))
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_icache.c \
+	)
+endif
+
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
 else ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),g0 g4 h7))
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index fc966e822ddf5..7c51a8b39c14b 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -102,7 +102,7 @@
 #define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 4))
 #define ADC_CAL_BITS            (12)
 
-#elif defined(STM32G0) || defined(STM32G4)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5)
 
 #define ADC_SCALE_V             (((float)VREFINT_CAL_VREF) / 1000.0f)
 #define ADC_CAL_ADDRESS         VREFINT_CAL_ADDR
@@ -160,6 +160,8 @@
 #define VBAT_DIV (4)
 #elif defined(STM32G0) || defined(STM32G4)
 #define VBAT_DIV (3)
+#elif defined(STM32H5)
+#define VBAT_DIV (4)
 #elif defined(STM32H723xx) || defined(STM32H733xx) || \
     defined(STM32H743xx) || defined(STM32H747xx) || \
     defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
@@ -248,6 +250,10 @@ STATIC bool is_adcx_channel(int channel) {
     handle.Instance = ADCx;
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
            || IS_ADC_CHANNEL(&handle, __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
+    #elif defined(STM32H5)
+    // The first argument to the IS_ADC_CHANNEL macro is unused.
+    return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
+           || IS_ADC_CHANNEL(NULL, __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
     #else
     #error Unsupported processor
     #endif
@@ -257,7 +263,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) || 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)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     while (READ_BIT(adcHandle->Instance->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #else
     #error Unsupported processor
@@ -278,6 +284,8 @@ STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     __HAL_RCC_ADC_CLK_ENABLE();
     #elif defined(STM32G4)
     __HAL_RCC_ADC12_CLK_ENABLE();
+    #elif defined(STM32H5)
+    __HAL_RCC_ADC_CLK_ENABLE();
     #elif defined(STM32H7)
     if (adch->Instance == ADC3) {
         __HAL_RCC_ADC3_CLK_ENABLE();
@@ -335,7 +343,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.LowPowerAutoWait = DISABLE;
     adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
     adch->Init.DMAContinuousRequests = DISABLE;
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
     adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
     adch->Init.LowPowerAutoWait = DISABLE;
@@ -354,7 +362,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     #endif
     #if defined(STM32G0)
     HAL_ADCEx_Calibration_Start(adch);
-    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
     HAL_ADCEx_Calibration_Start(adch, ADC_SINGLE_ENDED);
     #endif
 }
@@ -415,7 +423,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     } else {
         sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5;
     }
-    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
     } else {
@@ -599,7 +607,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) || defined(STM32L1)
             self->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(self->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -709,7 +717,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) || defined(STM32L1)
             adc->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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 c61bad459cddb..0518cdcd9a59f 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -48,7 +48,7 @@ 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)
+        #elif defined(STM32G4) || defined(STM32H5)
         adc_common = ADC12_COMMON;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         adc_common = ADC12_COMMON;
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index feadbe5c58170..e44e519b636c9 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -66,7 +66,7 @@
 
 #if defined(MICROPY_HW_ENABLE_DAC) && MICROPY_HW_ENABLE_DAC
 
-#if defined(STM32H7)
+#if defined(STM32H5) || defined(STM32H7)
 #define DAC DAC1
 #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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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(STM32G0) || defined(STM32G4) || defined(STM32L4)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4)
     __HAL_RCC_DAC1_CLK_ENABLE();
     #elif defined(STM32L1)
     __HAL_RCC_DAC_CLK_ENABLE();
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 29306f1b271cc..cdbb90e5d8b3c 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(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -92,6 +92,23 @@ struct _dma_descr_t {
 
 // Default parameters to dma_init() shared by spi and i2c; Channel and Direction
 // vary depending on the peripheral instance so they get passed separately
+#if defined(STM32H5)
+static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
+    .Request = 0, // set by dma_init_handle
+    .BlkHWRequest = DMA_BREQ_SINGLE_BURST,
+    .Direction = 0, // set by dma_init_handle
+    .SrcInc = 0, // set by dma_init_handle
+    .DestInc = 0, // set by dma_init_handle
+    .SrcDataWidth = DMA_SRC_DATAWIDTH_BYTE,
+    .DestDataWidth = DMA_DEST_DATAWIDTH_BYTE,
+    .Priority = DMA_LOW_PRIORITY_LOW_WEIGHT,
+    .SrcBurstLength = 1,
+    .DestBurstLength = 1,
+    .TransferAllocatedPort = DMA_SRC_ALLOCATED_PORT0 | DMA_DEST_ALLOCATED_PORT0,
+    .TransferEventMode = DMA_TCEM_BLOCK_TRANSFER,
+    .Mode = DMA_NORMAL, // DMA_NORMAL or DMA_PFCTRL (peripheral flow control mode)
+};
+#else
 static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
@@ -112,6 +129,7 @@ static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     .PeriphBurst = DMA_PBURST_INC4
     #endif
 };
+#endif
 
 #if MICROPY_HW_ENABLE_I2S
 // Default parameters to dma_init() for i2s; Channel and Direction
@@ -678,6 +696,39 @@ static const uint8_t dma_irqn[NSTREAM] = {
     #endif
 };
 
+#elif defined(STM32H5)
+
+#define NCONTROLLERS            (2)
+#define NSTREAMS_PER_CONTROLLER (8)
+#define NSTREAM                 (NCONTROLLERS * NSTREAMS_PER_CONTROLLER)
+
+#define DMA_SUB_INSTANCE_AS_UINT8(dma_channel) (dma_channel)
+
+#define DMA1_ENABLE_MASK (0x00ff) // Bits in dma_enable_mask corresponding to GPDMA1
+#define DMA2_ENABLE_MASK (0xff00) // Bits in dma_enable_mask corresponding to GPDMA2
+
+const dma_descr_t dma_SPI_2_RX = { GPDMA1_Channel0, GPDMA1_REQUEST_SPI2_RX, dma_id_0, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_TX = { GPDMA1_Channel1, GPDMA1_REQUEST_SPI2_TX, dma_id_1, &dma_init_struct_spi_i2c };
+
+static const uint8_t dma_irqn[NSTREAM] = {
+    GPDMA1_Channel0_IRQn,
+    GPDMA1_Channel1_IRQn,
+    GPDMA1_Channel2_IRQn,
+    GPDMA1_Channel3_IRQn,
+    GPDMA1_Channel4_IRQn,
+    GPDMA1_Channel5_IRQn,
+    GPDMA1_Channel6_IRQn,
+    GPDMA1_Channel7_IRQn,
+    GPDMA2_Channel0_IRQn,
+    GPDMA2_Channel1_IRQn,
+    GPDMA2_Channel2_IRQn,
+    GPDMA2_Channel3_IRQn,
+    GPDMA2_Channel4_IRQn,
+    GPDMA2_Channel5_IRQn,
+    GPDMA2_Channel6_IRQn,
+    GPDMA2_Channel7_IRQn,
+};
+
 #elif defined(STM32H7)
 
 #define NCONTROLLERS            (2)
@@ -761,6 +812,13 @@ volatile dma_idle_count_t dma_idle;
 #if defined(DMA2)
 #define DMA2_IS_CLK_ENABLED()   ((RCC->AHBENR & RCC_AHBENR_DMA2EN) != 0)
 #endif
+#elif defined(STM32H5)
+#define DMA1_IS_CLK_ENABLED()   (__HAL_RCC_GPDMA1_IS_CLK_ENABLED())
+#define DMA2_IS_CLK_ENABLED()   (__HAL_RCC_GPDMA2_IS_CLK_ENABLED())
+#define __HAL_RCC_DMA1_CLK_ENABLE __HAL_RCC_GPDMA1_CLK_ENABLE
+#define __HAL_RCC_DMA2_CLK_ENABLE __HAL_RCC_GPDMA2_CLK_ENABLE
+#define __HAL_RCC_DMA1_CLK_DISABLE __HAL_RCC_GPDMA1_CLK_DISABLE
+#define __HAL_RCC_DMA2_CLK_DISABLE __HAL_RCC_GPDMA2_CLK_DISABLE
 #else
 #define DMA1_IS_CLK_ENABLED()   ((RCC->AHB1ENR & RCC_AHB1ENR_DMA1EN) != 0)
 #define DMA2_IS_CLK_ENABLED()   ((RCC->AHB1ENR & RCC_AHB1ENR_DMA2EN) != 0)
@@ -1093,6 +1151,34 @@ void DMA2_Channel8_IRQHandler(void) {
 }
 #endif
 
+#elif defined(STM32H5)
+
+#define DEFINE_IRQ_HANDLER(periph, channel, id) \
+    void GPDMA##periph##_Channel##channel##_IRQHandler(void) { \
+        IRQ_ENTER(GPDMA##periph##_Channel##channel##_IRQn); \
+        if (dma_handle[id] != NULL) { \
+            HAL_DMA_IRQHandler(dma_handle[id]); \
+        } \
+        IRQ_EXIT(GPDMA##periph##_Channel##channel##_IRQn); \
+    }
+
+DEFINE_IRQ_HANDLER(1, 0, dma_id_0)
+DEFINE_IRQ_HANDLER(1, 1, dma_id_1)
+DEFINE_IRQ_HANDLER(1, 2, dma_id_2)
+DEFINE_IRQ_HANDLER(1, 3, dma_id_3)
+DEFINE_IRQ_HANDLER(1, 4, dma_id_4)
+DEFINE_IRQ_HANDLER(1, 5, dma_id_5)
+DEFINE_IRQ_HANDLER(1, 6, dma_id_6)
+DEFINE_IRQ_HANDLER(1, 7, dma_id_7)
+DEFINE_IRQ_HANDLER(2, 0, dma_id_8)
+DEFINE_IRQ_HANDLER(2, 1, dma_id_9)
+DEFINE_IRQ_HANDLER(2, 2, dma_id_10)
+DEFINE_IRQ_HANDLER(2, 3, dma_id_11)
+DEFINE_IRQ_HANDLER(2, 4, dma_id_12)
+DEFINE_IRQ_HANDLER(2, 5, dma_id_13)
+DEFINE_IRQ_HANDLER(2, 6, dma_id_14)
+DEFINE_IRQ_HANDLER(2, 7, dma_id_15)
+
 #elif defined(STM32L0)
 
 void DMA1_Channel1_IRQHandler(void) {
@@ -1276,7 +1362,7 @@ static void dma_enable_clock(dma_id_t dma_id) {
             }
         }
     }
-    #if defined(DMA2)
+    #if defined(DMA2) || defined(GPDMA2)
     else {
         if (((old_enable_mask & DMA2_ENABLE_MASK) == 0) && !DMA2_IS_CLK_ENABLED()) {
             __HAL_RCC_DMA2_CLK_ENABLE();
@@ -1310,13 +1396,25 @@ 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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     dma->Init.Request = dma_descr->sub_instance;
     #else
     #if !defined(STM32F0) && !defined(STM32L1)
     dma->Init.Channel = dma_descr->sub_instance;
     #endif
     #endif
+
+    #if defined(STM32H5)
+    // Configure src/dest settings based on the DMA direction.
+    if (dir == DMA_MEMORY_TO_PERIPH) {
+        dma->Init.SrcInc = DMA_SINC_INCREMENTED;
+        dma->Init.DestInc = DMA_DINC_FIXED;
+    } else if (dir == DMA_PERIPH_TO_MEMORY) {
+        dma->Init.SrcInc = DMA_SINC_FIXED;
+        dma->Init.DestInc = DMA_DINC_INCREMENTED;
+    }
+    #endif
+
     // half of __HAL_LINKDMA(data, xxx, *dma)
     // caller must implement other half by doing: data->xxx = dma
     dma->Parent = data;
@@ -1337,11 +1435,12 @@ 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(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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
         HAL_DMA_DeInit(dma);
+        dma->Parent = data; // HAL_DMA_DeInit may clear Parent, so set it again
         HAL_DMA_Init(dma);
         NVIC_SetPriority(IRQn_NONNEG(dma_irqn[dma_id]), IRQ_PRI_DMA);
         #else
@@ -1418,7 +1517,7 @@ static void dma_idle_handler(uint32_t tick) {
 
     static const uint32_t controller_mask[] = {
         DMA1_ENABLE_MASK,
-        #if defined(DMA2)
+        #if defined(DMA2) || defined(GPDMA2)
         DMA2_ENABLE_MASK,
         #endif
     };
@@ -1435,7 +1534,7 @@ static void dma_idle_handler(uint32_t tick) {
                 if (controller == 0) {
                     __HAL_RCC_DMA1_CLK_DISABLE();
                     #if defined(STM32G4)
-                    #if defined(DMA2)
+                    #if defined(DMA2) || defined(GPDMA2)
                     if (__HAL_RCC_DMA2_IS_CLK_DISABLED())
                     #endif
                     {
@@ -1443,7 +1542,7 @@ static void dma_idle_handler(uint32_t tick) {
                     }
                     #endif
                 }
-                #if defined(DMA2)
+                #if defined(DMA2) || defined(GPDMA2)
                 else {
                     __HAL_RCC_DMA2_CLK_DISABLE();
                     #if defined(STM32G4)
@@ -1514,7 +1613,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(STM32G0) || defined(STM32WB) || defined(STM32WL)
+#elif defined(STM32G0) || defined(STM32H5) || 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 37b8710c214c1..92d5db6c0a71c 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(STM32G0) || defined(STM32H7)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32H5) || 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 f810bc4e0d41d..7698569149561 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -92,7 +92,7 @@
 #define EXTI_SWIER_BB(line) (*(__IO uint32_t *)(PERIPH_BB_BASE + ((EXTI_OFFSET + offsetof(EXTI_TypeDef, SWIER)) * 32) + ((line) * 4)))
 #endif
 
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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.
@@ -170,6 +170,25 @@ STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     ADC1_COMP_IRQn,
     #endif
 
+    #elif defined(STM32H5)
+
+    EXTI0_IRQn,
+    EXTI1_IRQn,
+    EXTI2_IRQn,
+    EXTI3_IRQn,
+    EXTI4_IRQn,
+    EXTI5_IRQn,
+    EXTI6_IRQn,
+    EXTI7_IRQn,
+    EXTI8_IRQn,
+    EXTI9_IRQn,
+    EXTI10_IRQn,
+    EXTI11_IRQn,
+    EXTI12_IRQn,
+    EXTI13_IRQn,
+    EXTI14_IRQn,
+    EXTI15_IRQn,
+
     #else
 
     EXTI0_IRQn,     EXTI1_IRQn,     EXTI2_IRQn,     EXTI3_IRQn,     EXTI4_IRQn,
@@ -327,10 +346,10 @@ 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) && !defined(STM32WL)
+        #if !defined(STM32H5) && !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
-        #if defined(STM32G0)
+        #if defined(STM32G0) || defined(STM32H5)
         EXTI->EXTICR[line >> 2] =
             (EXTI->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
             | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
@@ -370,10 +389,10 @@ 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) && !defined(STM32WL)
+        #if !defined(STM32H5) && !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
-        #if defined(STM32G0)
+        #if defined(STM32G0) || defined(STM32H5)
         EXTI->EXTICR[line >> 2] =
             (EXTI->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
             | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
@@ -416,7 +435,7 @@ void extint_enable(uint line) {
     if (pyb_extint_mode[line] == EXTI_Mode_Interrupt) {
         #if defined(STM32H7)
         EXTI_D1->IMR1 |= (1 << line);
-        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= (1 << line);
         #else
         EXTI->IMR |= (1 << line);
@@ -424,7 +443,7 @@ void extint_enable(uint line) {
     } else {
         #if defined(STM32H7)
         EXTI_D1->EMR1 |= (1 << line);
-        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WB) || defined(STM32WL)
         EXTI->EMR1 |= (1 << line);
         #else
         EXTI->EMR |= (1 << line);
@@ -450,7 +469,7 @@ void extint_disable(uint line) {
     #if defined(STM32H7)
     EXTI_D1->IMR1 &= ~(1 << line);
     EXTI_D1->EMR1 &= ~(1 << line);
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WB) || defined(STM32WL)
     EXTI->IMR1 &= ~(1 << line);
     EXTI->EMR1 &= ~(1 << line);
     #else
@@ -472,7 +491,7 @@ void extint_swint(uint line) {
         return;
     }
     // we need 0 to 1 transition to trigger the interrupt
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     EXTI->SWIER1 &= ~(1 << line);
     EXTI->SWIER1 |= (1 << line);
     #else
@@ -552,7 +571,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
 STATIC mp_obj_t extint_regs(void) {
     const mp_print_t *print = &mp_plat_print;
 
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     mp_printf(print, "EXTI_IMR1   %08x\n", (unsigned int)EXTI->IMR1);
     mp_printf(print, "EXTI_IMR2   %08x\n", (unsigned int)EXTI->IMR2);
     mp_printf(print, "EXTI_EMR1   %08x\n", (unsigned int)EXTI->EMR1);
@@ -563,7 +582,7 @@ STATIC mp_obj_t extint_regs(void) {
     mp_printf(print, "EXTI_FTSR2  %08x\n", (unsigned int)EXTI->FTSR2);
     mp_printf(print, "EXTI_SWIER1 %08x\n", (unsigned int)EXTI->SWIER1);
     mp_printf(print, "EXTI_SWIER2 %08x\n", (unsigned int)EXTI->SWIER2);
-    #if defined(STM32G0)
+    #if defined(STM32G0) || defined(STM32H5)
     mp_printf(print, "EXTI_RPR1    %08x\n", (unsigned int)EXTI->RPR1);
     mp_printf(print, "EXTI_FPR1    %08x\n", (unsigned int)EXTI->FPR1);
     mp_printf(print, "EXTI_RPR2    %08x\n", (unsigned int)EXTI->RPR2);
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 84eb876d8d1ff..919e4bb2e8483 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -46,12 +46,17 @@
 #if defined(STM32F0) || defined(STM32G4) || defined(STM32L1) || defined(STM32L4) || defined(STM32WL)
 #define EXTI_RTC_TIMESTAMP      (19)
 #define EXTI_RTC_WAKEUP         (20)
+#elif defined(STM32H5)
+#define EXTI_RTC_WAKEUP         (17)
+#define EXTI_RTC_TAMP           (19)
 #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)
+#elif defined(STM32H5)
+#define EXTI_RTC_WAKEUP         (17)
 #else
 #define EXTI_RTC_TIMESTAMP      (21)
 #define EXTI_RTC_WAKEUP         (22)
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 12fa523cd56eb..a8f50dbcbaf7a 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -123,6 +123,12 @@ static const flash_layout_t flash_layout[] = {
     { (uint32_t)FLASH_BASE, 0x200, 1024 },
 };
 
+#elif defined(STM32H5)
+
+static const flash_layout_t flash_layout[] = {
+    { 0x08000000, 8192, 256 },
+};
+
 #elif defined(STM32H7)
 
 static const flash_layout_t flash_layout[] = {
@@ -140,11 +146,11 @@ static uint32_t get_bank(uint32_t addr) {
     return FLASH_BANK_1;
 }
 
-#elif (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32H7)
+#elif (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32H5) || defined(STM32H7)
 
 // get the bank of a given flash address
 static uint32_t get_bank(uint32_t addr) {
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     if (READ_BIT(FLASH->OPTCR, FLASH_OPTCR_SWAP_BANK) == 0) {
     #else
     if (READ_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE) == 0) {
@@ -297,7 +303,9 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     EraseInitStruct.NbPages = get_page(flash_dest + 4 * num_word32 - 1) - EraseInitStruct.Page + 1;
     #else
 
-    #if defined(STM32H7)
+    #if defined(STM32H5)
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+    #elif 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);
@@ -309,14 +317,17 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     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
+    #elif !defined(STM32H5)
     EraseInitStruct.VoltageRange = 0; // unused parameter on STM32H7A3/B3
     #endif
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7)
     EraseInitStruct.Banks = get_bank(flash_dest);
     #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;
+    #if defined(STM32H5)
+    EraseInitStruct.Sector &= 0x7f; // second bank should start counting at 0
+    #endif
 
     #endif
 
@@ -439,6 +450,18 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
         #endif
     }
 
+    #elif defined(STM32H5)
+
+    // program the flash 128 bits (4 words) at a time
+    for (int i = 0; i < num_word32 / 4; i++) {
+        status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_QUADWORD, flash_dest, (uint64_t)(uint32_t)src);
+        if (status != HAL_OK) {
+            break;
+        }
+        flash_dest += 16;
+        src += 4;
+    }
+
     #elif defined(STM32H7)
 
     // program the flash 256 bits at a time
diff --git a/ports/stm32/i2cslave.h b/ports/stm32/i2cslave.h
index 3f9022aa70b7a..a4b2957de3347 100644
--- a/ports/stm32/i2cslave.h
+++ b/ports/stm32/i2cslave.h
@@ -47,7 +47,7 @@ static inline void i2c_slave_init(i2c_slave_t *i2c, int irqn, int irq_pri, int a
     RCC->APBENR1 |= 1 << (RCC_APBENR1_I2C1EN_Pos + i2c_idx);
     volatile uint32_t tmp = RCC->APBENR1; // Delay after enabling clock
     (void)tmp;
-    #elif defined(STM32H7)
+    #elif defined(STM32H5) || defined(STM32H7)
     RCC->APB1LENR |= 1 << (RCC_APB1LENR_I2C1EN_Pos + i2c_idx);
     volatile uint32_t tmp = RCC->APB1LENR; // Delay after enabling clock
     (void)tmp;
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index f68ed0ec84766..3a348e18bf945 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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 #define ADC_V2 (1)
 #else
 #define ADC_V2 (0)
@@ -45,7 +45,7 @@
 #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)
+#elif defined(STM32G4) || defined(STM32H5)
 #define ADC_STAB_DELAY_US (1) // TODO: Check if this is enough
 #elif defined(STM32L4)
 #define ADC_STAB_DELAY_US (10)
@@ -59,7 +59,7 @@
 #elif defined(STM32F4) || defined(STM32F7)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_15CYCLES
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_480CYCLES
-#elif defined(STM32G4)
+#elif defined(STM32G4) || defined(STM32H5)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_247CYCLES_5
 #elif defined(STM32H7)
@@ -113,7 +113,9 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     __HAL_RCC_ADC_CLK_ENABLE();
     #else
     if (adc == ADC1) {
-        #if defined(STM32G4) || defined(STM32H7)
+        #if defined(STM32H5)
+        __HAL_RCC_ADC_CLK_ENABLE();
+        #elif defined(STM32G4) || defined(STM32H7)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC1_CLK_ENABLE();
@@ -121,7 +123,9 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     }
     #if defined(ADC2)
     if (adc == ADC2) {
-        #if defined(STM32G4) || defined(STM32H7)
+        #if defined(STM32H5)
+        __HAL_RCC_ADC_CLK_ENABLE();
+        #elif defined(STM32G4) || defined(STM32H7)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC2_CLK_ENABLE();
@@ -144,7 +148,7 @@ 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)
+    #elif defined(STM32H5) || 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;
@@ -157,13 +161,13 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     ADC_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos; // PRESC=1
     #endif
 
-    #if defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     if (adc->CR & ADC_CR_DEEPPWD) {
         adc->CR = 0; // disable deep powerdown
     }
     #endif
 
-    #if defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32H5) || 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)
@@ -179,7 +183,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
         // ADC isn't enabled so calibrate it now
         #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
         LL_ADC_StartCalibration(adc);
-        #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32H5) || 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);
@@ -225,7 +229,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     adc->CR2 = (adc->CR2 & ~cr2_clr) | cr2;
     adc->SQR1 = 1 << ADC_SQR1_L_Pos; // 1 conversion in regular sequence
 
-    #elif defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
 
     uint32_t cfgr_clr = ADC_CFGR_CONT | ADC_CFGR_EXTEN | ADC_CFGR_RES;
     #if defined(STM32H7)
@@ -244,7 +248,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) || defined(STM32L1)
     uint32_t res = (adc->CR1 & ADC_CR1_RES) >> ADC_CR1_RES_Pos;
-    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H5) || 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];
@@ -311,8 +315,8 @@ 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(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    #elif defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     ADC_Common_TypeDef *adc_common = ADC12_COMMON;
     #elif defined(STM32H7)
     #if defined(ADC_VER_V5_V90)
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 20def373fb146..ba8c1a91115dd 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -477,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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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/main.c b/ports/stm32/main.c
index 15be21d481328..2235e4de3537d 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -306,8 +306,10 @@ void stm32_main(uint32_t reset_mode) {
     SCB->VTOR = MICROPY_HW_VTOR;
     #endif
 
+    #if __CORTEX_M != 33
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
+    #endif
 
     // Hook for a board to run code at start up, for example check if a
     // bootloader should be entered instead of the main application.
@@ -336,6 +338,10 @@ void stm32_main(uint32_t reset_mode) {
     SCB_EnableICache();
     SCB_EnableDCache();
 
+    #elif defined(STM32H5)
+
+    HAL_ICACHE_Enable();
+
     #elif defined(STM32L4)
 
     #if !INSTRUCTION_CACHE_ENABLE
@@ -387,6 +393,13 @@ void stm32_main(uint32_t reset_mode) {
     MICROPY_BOARD_EARLY_INIT();
 
     // basic sub-system init
+    #if defined(STM32H5)
+    volatile uint32_t *src = (volatile uint32_t *)UID_BASE;
+    uint32_t *dest = (uint32_t *)&mp_hal_unique_id_address[0];
+    dest[0] = src[0];
+    dest[1] = src[1];
+    dest[2] = src[2];
+    #endif
     #if defined(STM32WB)
     rfcore_init();
     #endif
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 4e3f7597f7afc..1f6ba063b22e5 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -152,12 +152,14 @@ 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.c \
 	hal_cortex.c \
 	hal_dma.c \
 	hal_flash.c \
 	hal_flash_ex.c \
 	hal_pcd.c \
 	hal_pcd_ex.c \
+	hal_pwr_ex.c \
 	hal_rcc.c \
 	hal_rcc_ex.c \
 	ll_usb.c \
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 80e2a710ad01c..afd4a2f1ceb1b 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -36,6 +36,7 @@
 #include "i2cslave.h"
 #include "irq.h"
 #include "mboot.h"
+#include "mpu.h"
 #include "powerctrl.h"
 #include "sdcard.h"
 #include "dfu.h"
@@ -377,7 +378,7 @@ void SystemClock_Config(void) {
 #elif defined(STM32H7)
 #define AHBxENR AHB4ENR
 #define AHBxENR_GPIOAEN_Pos RCC_AHB4ENR_GPIOAEN_Pos
-#elif defined(STM32WB)
+#elif defined(STM32H5) || defined(STM32WB)
 #define AHBxENR AHB2ENR
 #define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR_GPIOAEN_Pos
 #endif
@@ -411,6 +412,8 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 
 #if defined(STM32G0)
 #define FLASH_END (FLASH_BASE + FLASH_SIZE - 1)
+#elif defined(STM32H5)
+#define FLASH_END (0x08000000 + 2 * 1024 * 1024)
 #elif defined(STM32WB)
 #define FLASH_END FLASH_END_ADDR
 #endif
@@ -433,6 +436,8 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/04*032Kg,01*128Kg,07*256Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #elif defined(STM32G0)
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*02Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#elif defined(STM32H5)
+#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*08Kg" 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)
@@ -1314,6 +1319,10 @@ static void leave_bootloader(void) {
     NVIC_SystemReset();
 }
 
+#if defined(STM32H5)
+uint8_t mp_hal_unique_id_address[12];
+#endif
+
 extern PCD_HandleTypeDef pcd_fs_handle;
 extern PCD_HandleTypeDef pcd_hs_handle;
 
@@ -1337,8 +1346,10 @@ void stm32_main(uint32_t initial_r0) {
     // Make sure IRQ vector table points to flash where this bootloader lives.
     SCB->VTOR = MBOOT_VTOR;
 
+    #if __CORTEX_M != 33
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
+    #endif
 
     #if defined(STM32F4)
     #if INSTRUCTION_CACHE_ENABLE
@@ -1388,6 +1399,18 @@ void stm32_main(uint32_t initial_r0) {
 
 enter_bootloader:
 
+    #if defined(STM32H5)
+    // MPU is needed for H5 to access the unique id.
+    mpu_init();
+
+    // Copy unique id to byte-addressable buffer.
+    volatile uint32_t *src = (volatile uint32_t *)UID_BASE;
+    uint32_t *dest = (uint32_t *)&mp_hal_unique_id_address[0];
+    dest[0] = src[0];
+    dest[1] = src[1];
+    dest[2] = src[2];
+    #endif
+
     MBOOT_BOARD_ENTRY_INIT(&initial_r0);
 
     #if USE_USB_POLLING
@@ -1562,6 +1585,12 @@ void USB_UCPD1_2_IRQHandler(void) {
     HAL_PCD_IRQHandler(&pcd_fs_handle);
 }
 
+#elif defined(STM32H5)
+
+void USB_DRD_FS_IRQHandler(void) {
+    HAL_PCD_IRQHandler(&pcd_fs_handle);
+}
+
 #elif defined(STM32WB)
 
 void USB_LP_IRQHandler(void) {
diff --git a/ports/stm32/mboot/mphalport.h b/ports/stm32/mboot/mphalport.h
index aa36026646392..45bf11d42b73d 100644
--- a/ports/stm32/mboot/mphalport.h
+++ b/ports/stm32/mboot/mphalport.h
@@ -28,6 +28,8 @@
 
 #include "genhdr/pins.h"
 
+extern uint8_t mp_hal_unique_id_address[12];
+
 // 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;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 25fc66eb9c681..1869b984dab0a 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -58,23 +58,20 @@
 #include "uart.h"
 #include "wdt.h"
 
-#if defined(STM32L0)
-// L0 does not have a BOR, so use POR instead
-#define RCC_CSR_BORRSTF RCC_CSR_PORRSTF
-#endif
-
-#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
-
 #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)
+#if defined(STM32H5)
+#define RCC_SR          RSR
+#define RCC_SR_IWDGRSTF RCC_RSR_IWDGRSTF
+#define RCC_SR_WWDGRSTF RCC_RSR_WWDGRSTF
+#define RCC_SR_BORRSTF  RCC_RSR_BORRSTF
+#define RCC_SR_PINRSTF  RCC_RSR_PINRSTF
+#define RCC_SR_RMVF     RCC_RSR_RMVF
+#elif defined(STM32H7)
 #define RCC_SR          RSR
 #define RCC_SR_IWDGRSTF RCC_RSR_IWDG1RSTF
 #define RCC_SR_WWDGRSTF RCC_RSR_WWDG1RSTF
@@ -86,8 +83,12 @@
 #define RCC_SR          CSR
 #define RCC_SR_IWDGRSTF RCC_CSR_IWDGRSTF
 #define RCC_SR_WWDGRSTF RCC_CSR_WWDGRSTF
+#if defined(RCC_CSR_PORRSTF)
 #define RCC_SR_PORRSTF  RCC_CSR_PORRSTF
+#endif
+#if defined(RCC_CSR_BORRSTF)
 #define RCC_SR_BORRSTF  RCC_CSR_BORRSTF
+#endif
 #define RCC_SR_PINRSTF  RCC_CSR_PINRSTF
 #define RCC_SR_RMVF     RCC_CSR_RMVF
 #endif
@@ -137,9 +138,12 @@ void machine_init(void) {
         uint32_t state = RCC->RCC_SR;
         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) && !defined(STM32L1)
-                   || state & RCC_SR_BORRSTF
+        } else if (0
+                   #if defined(RCC_SR_PORRSTF)
+                   || (state & RCC_SR_PORRSTF)
+                   #endif
+                   #if defined(RCC_SR_BORRSTF)
+                   || (state & RCC_SR_BORRSTF)
                    #endif
                    ) {
             reset_cause = PYB_RESET_POWER_ON;
@@ -286,6 +290,8 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
 
     #if defined(STM32F7) || defined(STM32H7)
     powerctrl_enter_bootloader(0, 0x1ff00000);
+    #elif defined(STM32H5)
+    powerctrl_enter_bootloader(0, 0x0bf97000);
     #else
     powerctrl_enter_bootloader(0, 0x00000000);
     #endif
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 62311324aabdb..8f2a6e530a540 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -339,6 +339,16 @@
 #define MICROPY_HW_MAX_UART (5) // UART1-5 + LPUART1
 #define MICROPY_HW_MAX_LPUART (1)
 
+// Configuration for STM32H5 series
+#elif defined(STM32H5)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (mp_hal_unique_id_address)
+#define PYB_EXTI_NUM_VECTORS (58)
+#define MICROPY_HW_MAX_I2C (4)
+#define MICROPY_HW_MAX_TIMER (17)
+#define MICROPY_HW_MAX_UART (12)
+#define MICROPY_HW_MAX_LPUART (1)
+
 // Configuration for STM32H7A3/B3 series
 #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
     defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -574,9 +584,9 @@
 #endif
 
 // Whether the USB peripheral is device-only, or multiple OTG
-// For STM32G0 the USB peripheral supports device and host mode,
+// For STM32G0 and STM32H5 the USB peripheral supports device and host mode,
 // but otherwise acts like a non-multi-OTG peripheral.
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L432xx) || defined(STM32WB)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L432xx) || defined(STM32WB)
 #define MICROPY_HW_USB_IS_MULTI_OTG (0)
 #else
 #define MICROPY_HW_USB_IS_MULTI_OTG (1)
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 727517f5bda4c..8edafa9bfc2fb 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -16,6 +16,10 @@ const byte mp_hal_status_to_errno_table[4] = {
     [HAL_TIMEOUT] = MP_ETIMEDOUT,
 };
 
+#if defined(STM32H5)
+uint8_t mp_hal_unique_id_address[12];
+#endif
+
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
     mp_raise_OSError(mp_hal_status_to_errno_table[status]);
 }
@@ -102,7 +106,7 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
     #elif defined(STM32G0)
     #define AHBxENR IOPENR
     #define AHBxENR_GPIOAEN_Pos RCC_IOPENR_GPIOAEN_Pos
-    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     #define AHBxENR AHB2ENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR_GPIOAEN_Pos
     #endif
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 728f5fefbded9..2757d39841306 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -2,6 +2,8 @@
 #include STM32_HAL_H
 #include "pin.h"
 
+extern uint8_t mp_hal_unique_id_address[12];
+
 // 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"
@@ -13,6 +15,8 @@
 #define MICROPY_PLATFORM_VERSION "HAL1.5.1"
 #elif defined(STM32G4)
 #define MICROPY_PLATFORM_VERSION "HAL1.3.0"
+#elif defined(STM32H5)
+#define MICROPY_PLATFORM_VERSION "HAL1.0.0"
 #elif defined(STM32H7)
 #define MICROPY_PLATFORM_VERSION "HAL1.11.0"
 #elif defined(STM32L0)
diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index ff51f382eeec0..106112073e477 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -95,6 +95,36 @@ static inline void mpu_config_end(uint32_t irq_state) {
     enable_irq(irq_state);
 }
 
+#elif defined(STM32H5)
+
+#define ST_DEVICE_SIGNATURE_BASE (0x08fff800)
+#define ST_DEVICE_SIGNATURE_LIMIT (0x08ffffff)
+
+static inline void mpu_init(void) {
+    // Configure attribute 0, inner-outer non-cacheable (=0x44).
+    __DMB();
+    MPU->MAIR0 = (MPU->MAIR0 & ~MPU_MAIR0_Attr0_Msk)
+        | 0x44 << MPU_MAIR0_Attr0_Pos;
+
+    // Configure region 0 to make device signature non-cacheable.
+    // This allows the memory region at ST_DEVICE_SIGNATURE_BASE to be readable.
+    __DMB();
+    MPU->RNR = MPU_REGION_NUMBER0;
+    MPU->RBAR = (ST_DEVICE_SIGNATURE_BASE & MPU_RBAR_BASE_Msk)
+        | MPU_ACCESS_NOT_SHAREABLE << MPU_RBAR_SH_Pos
+        | MPU_REGION_ALL_RW << MPU_RBAR_AP_Pos
+        | MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RBAR_XN_Pos;
+    MPU->RLAR = (ST_DEVICE_SIGNATURE_LIMIT & MPU_RLAR_LIMIT_Msk)
+        | MPU_ATTRIBUTES_NUMBER0 << MPU_RLAR_AttrIndx_Pos
+        | MPU_REGION_ENABLE << MPU_RLAR_EN_Pos;
+
+    // Enable the MPU.
+    MPU->CTRL = MPU_PRIVILEGED_DEFAULT | MPU_CTRL_ENABLE_Msk;
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+    __DMB();
+    __ISB();
+}
+
 #else
 
 static inline void mpu_init(void) {
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index d5fa9095d8c66..80195f04aeb38 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -31,7 +31,7 @@
 #include "genhdr/pllfreqtable.h"
 #include "extmod/modbluetooth.h"
 
-#if defined(STM32H7)
+#if defined(STM32H5) || defined(STM32H7)
 #define RCC_SR          RSR
 #if defined(STM32H747xx)
 #define RCC_SR_SFTRSTF  RCC_RSR_SFT2RSTF
@@ -379,7 +379,7 @@ STATIC uint32_t calc_apb2_div(uint32_t wanted_div) {
     #endif
 }
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7)
 
 int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2) {
     // Return straight away if the clocks are already at the desired frequency
@@ -453,13 +453,20 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     // Determine the bus clock dividers
     // Note: AHB freq required to be >= 14.2MHz for USB operation
     RCC_ClkInitStruct.AHBCLKDivider = calc_ahb_div(sysclk / ahb);
-    #if !defined(STM32H7)
+    #if defined(STM32H5)
+    ahb = sysclk >> AHBPrescTable[RCC_ClkInitStruct.AHBCLKDivider >> RCC_CFGR2_HPRE_Pos];
+    #elif defined(STM32H7)
+    // Do nothing.
+    #else
     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(STM32H5)
+    RCC_ClkInitStruct.APB3CLKDivider = RCC_HCLK_DIV1;
+    #endif
     #if defined(STM32H7)
     RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
     RCC_ClkInitStruct.APB3CLKDivider = MICROPY_HW_CLK_APB3_DIV;
@@ -842,6 +849,18 @@ void powerctrl_enter_stop_mode(void) {
     HAL_PWREx_EnableOverDrive();
     #endif
 
+    #if defined(STM32H5)
+
+    // Enable PLL1, and switch the system clock source to PLL1P.
+    LL_RCC_PLL1_Enable();
+    while (!LL_RCC_PLL1_IsReady()) {
+    }
+    LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL1);
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL1) {
+    }
+
+    #else
+
     // enable PLL
     __HAL_RCC_PLL_ENABLE();
     while (!__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY)) {
@@ -860,6 +879,8 @@ void powerctrl_enter_stop_mode(void) {
     }
     #endif
 
+    #endif
+
     powerctrl_disable_hsi_if_unused();
 
     #if HAVE_PLL48
@@ -967,7 +988,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(STM32G0) || defined(STM32G4) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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)
@@ -991,7 +1012,7 @@ void powerctrl_enter_standby_mode(void) {
     // clear RTC wake-up flags
     #if defined(SR_BITS)
     RTC->SR &= ~SR_BITS;
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WL)
     RTC->MISR &= ~ISR_BITS;
     #else
     RTC->ISR &= ~ISR_BITS;
@@ -1006,6 +1027,8 @@ void powerctrl_enter_standby_mode(void) {
     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(STM32H5)
+    LL_PWR_ClearFlag_WU();
     #elif defined(STM32H7)
     // Clear and mask D1 EXTIs.
     EXTI_D1->PR1 = 0x3fffffu;
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index e970b81a9fcc3..149c34ae63ec4 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -52,7 +52,7 @@ void powerctrl_config_systick(void) {
     SysTick_Config(HAL_RCC_GetHCLKFreq() / 1000);
     NVIC_SetPriority(SysTick_IRQn, IRQ_PRI_SYSTICK);
 
-    #if !BUILDING_MBOOT && (defined(STM32H7) || defined(STM32L4) || defined(STM32WB))
+    #if !BUILDING_MBOOT && (defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB))
     // Set SysTick IRQ priority variable in case the HAL needs to use it
     uwTickPrio = IRQ_PRI_SYSTICK;
     #endif
@@ -192,6 +192,106 @@ void SystemClock_Config(void) {
     #endif
 }
 
+#elif defined(STM32H5)
+
+void SystemClock_Config(void) {
+    // Set power voltage scaling.
+    __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0);
+    while (!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) {
+    }
+
+    #if MICROPY_HW_CLK_USE_HSI
+    LL_RCC_HSI_Enable();
+    while (!LL_RCC_HSI_IsReady()) {
+    }
+    const uint32_t pll1_source = LL_RCC_PLL1SOURCE_HSI;
+    #else
+    // Enable HSE.
+    #if MICROPY_HW_CLK_USE_BYPASS
+    LL_RCC_HSE_EnableBypass();
+    #endif
+    LL_RCC_HSE_Enable();
+    while (!LL_RCC_HSE_IsReady()) {
+    }
+    const uint32_t pll1_source = LL_RCC_PLL1SOURCE_HSE;
+    #endif
+
+    // Configure PLL1 for use as system clock.
+    LL_RCC_PLL1_ConfigDomain_SYS(pll1_source, MICROPY_HW_CLK_PLLM, MICROPY_HW_CLK_PLLN, MICROPY_HW_CLK_PLLP);
+    LL_RCC_PLL1_SetQ(MICROPY_HW_CLK_PLLQ);
+    LL_RCC_PLL1_SetR(MICROPY_HW_CLK_PLLR);
+    LL_RCC_PLL1_SetFRACN(MICROPY_HW_CLK_PLLFRAC);
+    LL_RCC_PLL1_SetVCOInputRange(MICROPY_HW_CLK_PLLVCI_LL);
+    LL_RCC_PLL1_SetVCOOutputRange(MICROPY_HW_CLK_PLLVCO_LL);
+    LL_RCC_PLL1P_Enable();
+
+    // Enable PLL1.
+    LL_RCC_PLL1_Enable();
+    while (!LL_RCC_PLL1_IsReady()) {
+    }
+
+    // Configure bus dividers.
+    LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
+    LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
+    LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
+    LL_RCC_SetAPB3Prescaler(LL_RCC_APB3_DIV_1);
+
+    // Configure the flash latency before switching the system clock source.
+    __HAL_FLASH_SET_LATENCY(MICROPY_HW_FLASH_LATENCY);
+    while (__HAL_FLASH_GET_LATENCY() != MICROPY_HW_FLASH_LATENCY) {
+    }
+
+    // Switch the system clock source to PLL1P.
+    LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL1);
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL1) {
+    }
+
+    // Reconfigure clock state and SysTick.
+    SystemCoreClockUpdate();
+    powerctrl_config_systick();
+
+    // USB clock configuration, either HSI48 or PLL3.
+    #if 1
+
+    // Enable HSI48.
+    LL_RCC_HSI48_Enable();
+    while (!LL_RCC_HSI48_IsReady()) {
+    }
+
+    // Select HSI48 for USB clock source
+    LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_HSI48);
+
+    // Synchronise HSI48 with 1kHz USB SoF
+    __HAL_RCC_CRS_CLK_ENABLE();
+    CRS->CFGR = 2 << CRS_CFGR_SYNCSRC_Pos | 0x22 << CRS_CFGR_FELIM_Pos
+        | __HAL_RCC_CRS_RELOADVALUE_CALCULATE(48000000, 1000) << CRS_CFGR_RELOAD_Pos;
+    CRS->CR = 0x20 << CRS_CR_TRIM_Pos | CRS_CR_AUTOTRIMEN | CRS_CR_CEN;
+
+    #else
+
+    // Configure PLL3 for use by USB at Q=48MHz.
+    LL_RCC_PLL3_SetSource(LL_RCC_PLL3SOURCE_HSE);
+    LL_RCC_PLL3_SetM(MICROPY_HW_CLK_PLL3M);
+    LL_RCC_PLL3_SetN(MICROPY_HW_CLK_PLL3N);
+    LL_RCC_PLL3_SetP(MICROPY_HW_CLK_PLL3P);
+    LL_RCC_PLL3_SetQ(MICROPY_HW_CLK_PLL3Q);
+    LL_RCC_PLL3_SetR(MICROPY_HW_CLK_PLL3R);
+    LL_RCC_PLL3_SetFRACN(MICROPY_HW_CLK_PLL3FRAC);
+    LL_RCC_PLL3_SetVCOInputRange(MICROPY_HW_CLK_PLL3VCI_LL);
+    LL_RCC_PLL3_SetVCOOutputRange(MICROPY_HW_CLK_PLL3VCO_LL);
+    LL_RCC_PLL3Q_Enable();
+
+    // Enable PLL3.
+    LL_RCC_PLL3_Enable();
+    while (!LL_RCC_PLL3_IsReady()) {
+    }
+
+    // Select PLL3-Q for USB clock source
+    LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_PLL3Q);
+
+    #endif
+}
+
 #elif defined(STM32L0)
 
 void SystemClock_Config(void) {
diff --git a/ports/stm32/rng.c b/ports/stm32/rng.c
index 5d6ddf6d62c9a..236d79ea87952 100644
--- a/ports/stm32/rng.c
+++ b/ports/stm32/rng.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
 #include "rtc.h"
 #include "rng.h"
 
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 92f64626a3ecb..3b05fb40ebfff 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -101,8 +101,10 @@ 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.
+    #if defined(STM32H5)
+    __HAL_RCC_RTC_CLK_ENABLE();
+    #elif defined(STM32WL)
     __HAL_RCC_RTCAPB_CLK_ENABLE();
     #endif
 
@@ -147,14 +149,23 @@ void rtc_init_start(bool force_init) {
             // Clear source Reset Flag
             __HAL_RCC_CLEAR_RESET_FLAGS();
             // Turn the LSI on (it may need this even if the RTC is running)
+            #if defined(STM32H5)
+            RCC->BDCR |= RCC_BDCR_LSION;
+            #else
             RCC->CSR |= RCC_CSR_LSION;
+            #endif
             // provide some status information
             rtc_info |= 0x80000;
         }
 
         if (rtc_running) {
             // Provide information about the registers that indicated the RTC is running.
+            // Bits are (MSB first): LSIRDY LSION LSEBYP LSERDY LSEON
+            #if defined(STM32H5)
+            rtc_info |= (RCC->BDCR >> RCC_BDCR_LSEON_Pos & 7) | (RCC->BDCR >> RCC_BDCR_LSION_Pos & 3) << 8;
+            #else
             rtc_info |= (RCC->BDCR & 7) | (RCC->CSR & 3) << 8;
+            #endif
 
             // 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
@@ -234,7 +245,7 @@ void rtc_init_finalise() {
     RTC_CalendarConfig();
     #if defined(STM32G0)
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_PWRRST) != RESET) {
-    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G4) || defined(STM32H5) || 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 +277,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) && !defined(STM32WL)
+        #if !defined(STM32H5) && !defined(STM32H7) && !defined(STM32WB) && !defined(STM32WL)
         // Enable Power Clock
         __HAL_RCC_PWR_CLK_ENABLE();
         #endif
@@ -285,6 +296,13 @@ STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
                 return HAL_TIMEOUT;
             }
         }
+        #elif defined(STM32H5)
+        // Wait for Backup domain Write protection disable
+        while (!LL_PWR_IsEnabledBkUpAccess()) {
+            if (HAL_GetTick() - tickstart > RCC_DBP_TIMEOUT_VALUE) {
+                return HAL_TIMEOUT;
+            }
+        }
         #else
         // Enable write access to Backup domain
         // PWR->CR |= PWR_CR_DBP;
@@ -363,7 +381,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(STM32G0) || defined(STM32G4) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WL)
         hrtc->Instance->CR &= (uint32_t) ~RTC_CR_TAMPALRM_TYPE_Msk;
         hrtc->Instance->CR |= (uint32_t)(hrtc->Init.OutPutType);
         #else
@@ -629,7 +647,7 @@ mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
 
-#if defined(STM32F0) || defined(STM32L0)
+#if defined(STM32F0) || defined(STM32H5) || defined(STM32L0)
 #define RTC_WKUP_IRQn RTC_IRQn
 #elif defined(STM32G0)
 #define RTC_WKUP_IRQn RTC_TAMP_IRQn
@@ -738,7 +756,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(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
@@ -750,7 +768,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #endif
 
         // clear interrupt flags
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WL)
         RTC->ICSR &= ~RTC_ICSR_WUTWF;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         RTC->SR &= ~RTC_SR_WUTF;
@@ -761,7 +779,7 @@ 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)
+        #elif defined(STM32G0) || defined(STM32H5)
         // Do nothing
         #else
         EXTI->PR = 1 << EXTI_RTC_WAKEUP;
@@ -777,7 +795,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(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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 e61c837692b2c..11a9a74ea3bac 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -96,8 +96,8 @@ const spi_t spi_obj[6] = {
     #endif
 };
 
-#if defined(STM32H7)
-// STM32H7 HAL requires SPI IRQs to be enabled and handled.
+#if defined(STM32H5) || defined(STM32H7)
+// STM32H5/H7 HAL requires SPI IRQs to be enabled and handled.
 #if defined(MICROPY_HW_SPI1_SCK)
 void SPI1_IRQHandler(void) {
     IRQ_ENTER(SPI1_IRQn);
@@ -217,6 +217,20 @@ int spi_find_index(mp_obj_t id) {
 STATIC uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
     #if defined(STM32F0) || defined(STM32G0)
     return HAL_RCC_GetPCLK1Freq();
+    #elif defined(STM32H5)
+    if (spi->Instance == SPI1) {
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI1);
+    } else if (spi->Instance == SPI2) {
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI2);
+    } else if (spi->Instance == SPI3) {
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI3);
+    } else if (spi->Instance == SPI4) {
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI4);
+    } else if (spi->Instance == SPI5) {
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI5);
+    } else {
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI6);
+    }
     #elif defined(STM32H7)
     if (spi->Instance == SPI1 || spi->Instance == SPI2 || spi->Instance == SPI3) {
         return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI123);
@@ -252,6 +266,11 @@ void spi_set_params(const spi_t *spi_obj, uint32_t prescale, int32_t baudrate,
     SPI_HandleTypeDef *spi = spi_obj->spi;
     SPI_InitTypeDef *init = &spi->Init;
 
+    #if defined(STM32H5)
+    // Enable PLL1Q output to be used as SPI clock (this is the default SPI clock source).
+    LL_RCC_PLL1Q_Enable();
+    #endif
+
     if (prescale != 0xffffffff || baudrate != -1) {
         if (prescale == 0xffffffff) {
             // prescaler not given, so select one that yields at most the requested baudrate
@@ -419,7 +438,7 @@ int spi_init(const spi_t *self, bool enable_nss_pin) {
     dma_invalidate_channel(self->tx_dma_descr);
     dma_invalidate_channel(self->rx_dma_descr);
 
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     NVIC_SetPriority(irqn, IRQ_PRI_SPI);
     HAL_NVIC_EnableIRQ(irqn);
     #else
@@ -647,7 +666,7 @@ 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)
+            #if defined(STM32H5) || defined(STM32H7)
             uint log_prescaler = (spi->Init.BaudRatePrescaler >> 28) + 1;
             #else
             uint log_prescaler = (spi->Init.BaudRatePrescaler >> 3) + 1;
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index ae267a599596b..b9f70db73e0a1 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -66,6 +66,7 @@ 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_h5 = $(CFLAGS_CORTEX_M) -mtune=cortex-m33 -mcpu=cortex-m33
 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
@@ -78,6 +79,7 @@ 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_h5 = armv7m
 MPY_CROSS_MCU_ARCH_h7 = armv7m
 MPY_CROSS_MCU_ARCH_wb = armv7m
 MPY_CROSS_MCU_ARCH_wl = armv7m
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 78e7f15190eb6..84c05602b57b7 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -304,6 +304,14 @@ void USB_UCPD1_2_IRQHandler(void) {
 }
 #endif
 
+#elif defined(STM32H5)
+
+#if MICROPY_HW_USB_FS
+void USB_DRD_FS_IRQHandler(void) {
+    HAL_PCD_IRQHandler(&pcd_fs_handle);
+}
+#endif
+
 #elif defined(STM32L0) || defined(STM32L432xx)
 
 #if MICROPY_HW_USB_FS
@@ -404,7 +412,7 @@ void OTG_FS_WKUP_IRQHandler(void) {
 
     #if defined(STM32L4)
     EXTI->PR1 = USB_OTG_FS_WAKEUP_EXTI_LINE;
-    #elif !defined(STM32H7)
+    #elif !defined(STM32H5) && !defined(STM32H7)
     /* Clear EXTI pending Bit*/
     __HAL_USB_FS_EXTI_CLEAR_FLAG();
     #endif
@@ -424,7 +432,7 @@ void OTG_HS_WKUP_IRQHandler(void) {
 
     OTG_CMD_WKUP_Handler(&pcd_hs_handle);
 
-    #if !defined(STM32H7)
+    #if !defined(STM32H5) && !defined(STM32H7)
     /* Clear EXTI pending Bit*/
     __HAL_USB_HS_EXTI_CLEAR_FLAG();
     #endif
@@ -528,7 +536,13 @@ void ETH_WKUP_IRQHandler(void) {
 }
 #endif
 
-#if defined(STM32L1)
+#if defined(STM32H5)
+void TAMP_IRQHandler(void) {
+    IRQ_ENTER(TAMP_IRQn);
+    Handle_EXTI_Irq(EXTI_RTC_TAMP);
+    IRQ_EXIT(TAMP_IRQn);
+}
+#elif defined(STM32L1)
 void TAMPER_STAMP_IRQHandler(void) {
     IRQ_ENTER(TAMPER_STAMP_IRQn);
     Handle_EXTI_Irq(EXTI_RTC_TIMESTAMP);
@@ -542,10 +556,17 @@ void TAMP_STAMP_IRQHandler(void) {
 }
 #endif
 
-void RTC_WKUP_IRQHandler(void) {
+#if defined(STM32H5)
+void RTC_IRQHandler(void)
+#else
+void RTC_WKUP_IRQHandler(void)
+#endif
+{
     IRQ_ENTER(RTC_WKUP_IRQn);
     #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
     RTC->MISR &= ~RTC_MISR_WUTMF; // clear wakeup interrupt flag
+    #elif defined(STM32H5)
+    RTC->SCR = RTC_SCR_CWUTF; // clear wakeup interrupt flag
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     RTC->SR &= ~RTC_SR_WUTF; // clear wakeup interrupt flag
     #else
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 6c110f87ea6ea..b4fa1d6cf9b7e 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -233,6 +233,36 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
 // APB clock.  Otherwise (APB prescaler > 1) the timer clock is twice its
 // respective APB clock.  See DM00031020 Rev 4, page 115.
 uint32_t timer_get_source_freq(uint32_t tim_id) {
+    #if defined(STM32H5)
+
+    uint32_t source, ppre;
+    if ((2 <= tim_id && tim_id <= 7) || (12 <= tim_id && tim_id <= 14)) {
+        // TIM{2-7,12-14} are on APB1
+        source = HAL_RCC_GetPCLK1Freq();
+        ppre = (RCC->CFGR2 >> RCC_CFGR2_PPRE1_Pos) & 7;
+    } else {
+        // TIM{1,8,15-17} are on APB2
+        source = HAL_RCC_GetPCLK2Freq();
+        ppre = (RCC->CFGR2 >> RCC_CFGR2_PPRE2_Pos) & 7;
+    }
+    if (RCC->CFGR1 & RCC_CFGR1_TIMPRE) {
+        if (ppre == 0 || ppre == 4 || ppre == 5) {
+            // PPREx divider is 1, 2 or 4.
+            return 2 * source;
+        } else {
+            return 4 * source;
+        }
+    } else {
+        if (ppre == 0 || ppre == 4) {
+            // PPREx divider is 1 or 2.
+            return HAL_RCC_GetHCLKFreq();
+        } else {
+            return 2 * source;
+        }
+    }
+
+    #else
+
     uint32_t source, clk_div;
     if (tim_id == 1 || (8 <= tim_id && tim_id <= 11)) {
         // TIM{1,8,9,10,11} are on APB2
@@ -267,6 +297,8 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
         source *= 2;
     }
     return source;
+
+    #endif
 }
 
 /******************************************************************************/
@@ -837,6 +869,8 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(6, TIM6_IRQn),
     #elif defined(STM32G0)
     TIM_ENTRY(6, TIM6_DAC_LPTIM1_IRQn),
+    #elif defined(STM32H5)
+    TIM_ENTRY(6, TIM6_IRQn),
     #else
     TIM_ENTRY(6, TIM6_DAC_IRQn),
     #endif
@@ -857,6 +891,7 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(8, TIM8_UP_IRQn),
     #endif
     #endif
+
     #if defined(TIM9)
     #if defined(STM32L1)
     TIM_ENTRY(9, TIM9_IRQn),
@@ -864,6 +899,7 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(9, TIM1_BRK_TIM9_IRQn),
     #endif
     #endif
+
     #if defined(TIM10)
     #if defined(STM32L1)
     TIM_ENTRY(10, TIM10_IRQn),
@@ -871,6 +907,7 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(10, TIM1_UP_TIM10_IRQn),
     #endif
     #endif
+
     #if defined(TIM11)
     #if defined(STM32L1)
     TIM_ENTRY(11, TIM11_IRQn),
@@ -878,42 +915,57 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(11, TIM1_TRG_COM_TIM11_IRQn),
     #endif
     #endif
+
     #if defined(TIM12)
+    #if defined(STM32H5)
+    TIM_ENTRY(12, TIM12_IRQn),
+    #else
     TIM_ENTRY(12, TIM8_BRK_TIM12_IRQn),
     #endif
+    #endif
+
     #if defined(TIM13)
+    #if defined(STM32H5)
+    TIM_ENTRY(13, TIM13_IRQn),
+    #else
     TIM_ENTRY(13, TIM8_UP_TIM13_IRQn),
     #endif
-    #if defined(STM32F0) || defined(STM32G0)
+    #endif
+
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5)
     TIM_ENTRY(14, TIM14_IRQn),
     #elif defined(TIM14)
     TIM_ENTRY(14, TIM8_TRG_COM_TIM14_IRQn),
     #endif
+
     #if defined(TIM15)
-    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H7)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7)
     TIM_ENTRY(15, TIM15_IRQn),
     #else
     TIM_ENTRY(15, TIM1_BRK_TIM15_IRQn),
     #endif
     #endif
+
     #if defined(TIM16)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(16, TIM16_FDCAN_IT0_IRQn),
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32WL)
     TIM_ENTRY(16, TIM16_IRQn),
     #else
     TIM_ENTRY(16, TIM1_UP_TIM16_IRQn),
     #endif
     #endif
+
     #if defined(TIM17)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(17, TIM17_FDCAN_IT1_IRQn),
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32WL)
     TIM_ENTRY(17, TIM17_IRQn),
     #else
     TIM_ENTRY(17, TIM1_TRG_COM_TIM17_IRQn),
     #endif
     #endif
+
     #if defined(TIM20)
     TIM_ENTRY(20, TIM20_UP_IRQn),
     #endif
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 6d1240cf8d5aa..e477c5c16ca14 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -82,7 +82,7 @@
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE)
 #endif
 
-#elif defined(STM32G0) || defined(STM32G4)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5)
 #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)
@@ -903,14 +903,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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
             , self->uartx->PRESC
             #endif
             );
     }
     #endif
     return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         self->uartx->PRESC,
         #endif
         LL_USART_OVERSAMPLING_16);
@@ -920,7 +920,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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
             LL_LPUART_PRESCALER_DIV1,
             #endif
             baudrate);
@@ -928,7 +928,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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         LL_USART_PRESCALER_DIV1,
         #endif
         LL_USART_OVERSAMPLING_16, baudrate);
@@ -979,7 +979,7 @@ int uart_rx_char(pyb_uart_obj_t *self) {
         return data;
     } else {
         // no buffering
-        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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;
@@ -1129,7 +1129,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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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/usb.c b/ports/stm32/usb.c
index c9c29cc50c1b5..94d62f7625a57 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -59,7 +59,7 @@
 #endif
 
 // Maximum number of endpoints (excluding EP0)
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32WB)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32WB)
 #define MAX_ENDPOINT(dev_id) (7)
 #elif defined(STM32L4)
 #define MAX_ENDPOINT(dev_id) (5)
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index 1e5d6c80a4e69..f25dcc380a6ee 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -52,7 +52,7 @@
 
 #if !MICROPY_HW_USB_IS_MULTI_OTG
 #define USE_USB_CNTR_SOFM (1)
-#if defined(STM32G0)
+#if defined(STM32G0) || defined(STM32H5)
 #define USB USB_DRD_FS
 #endif
 #else
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 9c53c6323a44d..9f187fc08b57a 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -44,7 +44,7 @@ PCD_HandleTypeDef pcd_fs_handle;
 PCD_HandleTypeDef pcd_hs_handle;
 #endif
 
-#if defined(STM32G0)
+#if defined(STM32G0) || defined(STM32H5)
 #define USB_OTG_FS USB_DRD_FS
 #elif !MICROPY_HW_USB_IS_MULTI_OTG
 // The MCU has a single USB device-only instance
@@ -85,7 +85,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         const uint32_t otg_alt = GPIO_AF0_USB;
         #elif defined(STM32L432xx)
         const uint32_t otg_alt = GPIO_AF10_USB_FS;
-        #elif defined(STM32WB)
+        #elif defined(STM32H5) || defined(STM32WB)
         const uint32_t otg_alt = GPIO_AF10_USB;
         #else
         const uint32_t otg_alt = GPIO_AF10_OTG_FS;
@@ -108,10 +108,10 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, otg_alt);
         #endif
 
-        #if defined(STM32G0)
+        // Keep USB clock running during sleep or else __WFI() will disable the USB
+        #if defined(STM32G0) || defined(STM32H5)
         __HAL_RCC_USB_CLK_SLEEP_ENABLE();
         #elif defined(STM32H7)
-        // Keep USB clock running during sleep or else __WFI() will disable the USB
         __HAL_RCC_USB2_OTG_FS_CLK_SLEEP_ENABLE();
         __HAL_RCC_USB2_OTG_FS_ULPI_CLK_SLEEP_DISABLE();
         #endif
@@ -123,8 +123,10 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         __USB_OTG_FS_CLK_ENABLE();
         #endif
 
-        #if defined(STM32L4)
         // Enable VDDUSB
+        #if defined(STM32H5)
+        HAL_PWREx_EnableVddUSB();
+        #elif defined(STM32L4)
         if (__HAL_RCC_PWR_IS_CLK_DISABLED()) {
             __HAL_RCC_PWR_CLK_ENABLE();
             HAL_PWREx_EnableVddUSB();
@@ -138,6 +140,9 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         #if defined(STM32G0)
         NVIC_SetPriority(USB_UCPD1_2_IRQn, IRQ_PRI_OTG_FS);
         HAL_NVIC_EnableIRQ(USB_UCPD1_2_IRQn);
+        #elif defined(STM32H5)
+        NVIC_SetPriority(USB_DRD_FS_IRQn, IRQ_PRI_OTG_FS);
+        HAL_NVIC_EnableIRQ(USB_DRD_FS_IRQn);
         #elif defined(STM32L0)
         NVIC_SetPriority(USB_IRQn, IRQ_PRI_OTG_FS);
         HAL_NVIC_EnableIRQ(USB_IRQn);
@@ -437,8 +442,8 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const
         pcd_fs_handle.Init.speed = PCD_SPEED_FULL;
         pcd_fs_handle.Init.lpm_enable = DISABLE;
         pcd_fs_handle.Init.battery_charging_enable = DISABLE;
-        #if MICROPY_HW_USB_IS_MULTI_OTG || defined(STM32G0)
-        #if !defined(STM32G0)
+        #if MICROPY_HW_USB_IS_MULTI_OTG || defined(STM32G0) || defined(STM32H5)
+        #if !defined(STM32G0) && !defined(STM32H5)
         pcd_fs_handle.Init.use_dedicated_ep1 = 0;
         #endif
         pcd_fs_handle.Init.dma_enable = 0;
@@ -448,6 +453,10 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const
         pcd_fs_handle.Init.vbus_sensing_enable = 1;
         #endif
         #endif
+        #if defined(STM32G0) || defined(STM32H5)
+        pcd_fs_handle.Init.bulk_doublebuffer_enable = DISABLE;
+        pcd_fs_handle.Init.iso_singlebuffer_enable = DISABLE;
+        #endif
 
         // Link The driver to the stack
         pcd_fs_handle.pData = pdev;

From ec4232b32e5d24ae363786ac10305272447ed303 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Mar 2023 16:39:12 +1100
Subject: [PATCH 0060/3129] stm32/boards: Add ld, af.csv and hal_conf_base.h
 files for H5 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32h573_af.csv          | 142 +++++++++++++++++++
 ports/stm32/boards/stm32h573xi.ld            |  34 +++++
 ports/stm32/boards/stm32h5xx_hal_conf_base.h | 108 ++++++++++++++
 3 files changed, 284 insertions(+)
 create mode 100644 ports/stm32/boards/stm32h573_af.csv
 create mode 100644 ports/stm32/boards/stm32h573xi.ld
 create mode 100644 ports/stm32/boards/stm32h5xx_hal_conf_base.h

diff --git a/ports/stm32/boards/stm32h573_af.csv b/ports/stm32/boards/stm32h573_af.csv
new file mode 100644
index 0000000000000..bdc29ebe2a0a3
--- /dev/null
+++ b/ports/stm32/boards/stm32h573_af.csv
@@ -0,0 +1,142 @@
+Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,SYS,LPTIM1/TIM1/2/16/17,LPTIM3/PDM_SAI1/TIM3/4/5/12/15,I3C1/LPTIM2/3/LPUART1/OCTOSPI/TIM1/8,CEC/DCMI/I2C1/2/3/4/LPTIM1/2/SPI1/I2S1/TIM15/USART1,CEC/I3C1/LPTIM1/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,I2C4/OCTOSPI/SAI1/SPI3/I2S3/SPI4/UART4/12/USART10/USB_PD,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/UART7/8/12/USART1/2/3/6/10/11,LPUART1/SAI2/SDMMC1/SPI6/UART4/5/8,FDCAN1/2/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/OCTOSPI/SDMMC2/TIM13/14,CRS/FMC[NAND16]/OCTOSPI/SAI2/SDMMC2/TIM8/USB_,ETH[MII/RMII]/FMC[NAND16]/OCTOSPI/SDMMC2/UART7/9/USB_PD,FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/FMC[SDRAM_16bit]/SDMMC1,DCMI/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/LPTIM5,LPTIM3/4/5/6/TIM2/UART5,SYS,ADC
+PortA,PA0,,TIM2_CH1,TIM5_CH1,TIM8_ETR,TIM15_BKIN,SPI6_NSS,SPI3_RDY,USART2_CTS/USART2_NSS,UART4_TX,SDMMC2_CMD,SAI2_SD_B,ETH_MII_CRS,,,TIM2_ETR,EVENTOUT,ADC12_INP0/ADC12_INN1
+PortA,PA1,,TIM2_CH2,TIM5_CH2,,TIM15_CH1N,LPTIM1_IN1,OCTOSPI1_DQS,USART2_RTS,UART4_RX,OCTOSPI1_IO3,SAI2_MCLK_B,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,,EVENTOUT,ADC12_INP1
+PortA,PA2,,TIM2_CH3,TIM5_CH3,,TIM15_CH1,LPTIM1_IN2,,USART2_TX,SAI2_SCK_B,,,ETH_MDIO,,,,EVENTOUT,ADC12_INP14
+PortA,PA3,,TIM2_CH4,TIM5_CH4,OCTOSPI1_CLK,TIM15_CH2,SPI2_NSS/I2S2_WS,SAI1_SD_B,USART2_RX,,,,ETH_MII_COL,,,,EVENTOUT,ADC12_INP15
+PortA,PA4,,,TIM5_ETR,LPTIM2_CH1,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,SPI6_NSS,,,,,DCMI_HSYNC/PSSI_DE,,EVENTOUT,ADC12_INP18
+PortA,PA5,,TIM2_CH1,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,SPI6_SCK,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,,PSSI_D14,TIM2_ETR,EVENTOUT,ADC12_INP19/ADC12_INN18
+PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO/I2S1_SDI,OCTOSPI1_IO3,USART11_TX,SPI6_MISO,TIM13_CH1,,,,DCMI_PIXCLK/PSSI_PDCK,,EVENTOUT,ADC12_INP3
+PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SDO,,USART11_RX,SPI6_MOSI,TIM14_CH1,OCTOSPI1_IO2,ETH_MII_RX_DV/ETH_RMII_CRS_DV,FMC_SDNWE,FMC_NWE,,EVENTOUT,ADC12_INP7/ADC12_INN3
+PortA,PA8,MCO1,TIM1_CH1,,TIM8_BKIN2,I2C3_SCL,SPI1_RDY,,USART1_CK,,,USB_SOF,UART7_RX,FMC_NOE,DCMI_D3/PSSI_D3,,EVENTOUT,
+PortA,PA9,,TIM1_CH2,,LPUART1_TX,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,,,ETH_MII_TX_ER,FMC_NWE,DCMI_D0/PSSI_D0,,EVENTOUT,
+PortA,PA10,,TIM1_CH3,,LPUART1_RX,LPTIM2_IN2,,UCPD1_FRSTX,USART1_RX,,FDCAN2_TX,,,SDMMC1_D0,DCMI_D1/PSSI_D1,,EVENTOUT,
+PortA,PA11,,TIM1_CH4,,LPUART1_CTS,,SPI2_NSS/I2S2_WS,UART4_RX,USART1_CTS/USART1_NSS,,FDCAN1_RX,USB_DM,,,,,EVENTOUT,
+PortA,PA12,,TIM1_ETR,,LPUART1_RTS,,SPI2_SCK/I2S2_CK,UART4_TX,USART1_RTS,SAI2_FS_B,FDCAN1_TX,USB_DP,,,,,EVENTOUT,
+PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA15,JTDI,TIM2_CH1,LPTIM3_IN2,,HDMI_CEC,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,SPI6_NSS,UART4_RTS,,,UART7_TX,FMC_NBL1,DCMI_D11/PSSI_D11,TIM2_ETR,EVENTOUT,
+PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,OCTOSPI1_IO1,USART11_CK,UART4_CTS,,,ETH_MII_RXD2,,,LPTIM3_CH1,EVENTOUT,ADC12_INP9/ADC12_INN5
+PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,OCTOSPI1_IO0,,,,,ETH_MII_RXD3,,,LPTIM3_CH2,EVENTOUT,ADC12_INP5
+PortB,PB2,RTC_OUT2,,SAI1_D1,TIM8_CH4N,SPI1_RDY,LPTIM1_CH1,SAI1_SD_A,SPI3_MOSI/I2S3_SDO,,OCTOSPI1_CLK,OCTOSPI1_DQS,,SDMMC1_CMD,LPTIM5_ETR,,EVENTOUT,
+PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,I2C2_SDA,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,UART12_CTS/UART12_NSS,SPI6_SCK,SDMMC2_D2,CRS_SYNC,UART7_RX,,,LPTIM6_ETR,EVENTOUT,
+PortB,PB4,NJTRST,TIM16_BKIN,TIM3_CH1,OCTOSPI1_CLK,LPTIM1_CH2,SPI1_MISO/I2S1_SDI,SPI3_MISO/I2S3_SDI,SPI2_NSS/I2S2_WS,SPI6_MISO,SDMMC2_D3,,UART7_TX,,DCMI_D7/PSSI_D7,,EVENTOUT,
+PortB,PB5,,TIM17_BKIN,TIM3_CH2,OCTOSPI1_NCLK,I2C1_SMBA,SPI1_MOSI/I2S1_SDO,I2C4_SMBA,SPI3_MOSI/I2S3_SDO,SPI6_MOSI,FDCAN2_RX,,ETH_PPS_OUT,FMC_SDCKE1,DCMI_D10/PSSI_D10,UART5_RX,EVENTOUT,
+PortB,PB6,,TIM16_CH1N,TIM4_CH1,I3C1_SCL,I2C1_SCL,HDMI_CEC,I2C4_SCL,USART1_TX,LPUART1_TX,FDCAN2_TX,OCTOSPI1_NCS,,FMC_SDNE1,DCMI_D5/PSSI_D5,UART5_TX,EVENTOUT,
+PortB,PB7,,TIM17_CH1N,TIM4_CH2,I3C1_SDA,I2C1_SDA,,I2C4_SDA,USART1_RX,LPUART1_RX,FDCAN1_TX,SDMMC2_D5,SDMMC2_CKIN,FMC_NL,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
+PortB,PB8,,TIM16_CH1,TIM4_CH3,I3C1_SCL,I2C1_SCL,SPI4_RDY,I2C4_SCL,SDMMC1_CKIN,UART4_RX,FDCAN1_RX,SDMMC2_D4,ETH_MII_TXD3,SDMMC1_D4,DCMI_D6/PSSI_D6,,EVENTOUT,
+PortB,PB9,,TIM17_CH1,TIM4_CH4,I3C1_SDA,I2C1_SDA,SPI2_NSS/I2S2_WS,I2C4_SDA,SDMMC1_CDIR,UART4_TX,FDCAN1_TX,SDMMC2_D5,SDMMC2_CKIN,SDMMC1_D5,DCMI_D7/PSSI_D7,,EVENTOUT,
+PortB,PB10,,TIM2_CH3,LPTIM3_CH1,LPTIM2_IN1,I2C2_SCL,SPI2_SCK/I2S2_CK,,USART3_TX,,OCTOSPI1_NCS,,ETH_MII_RX_ER,,,,EVENTOUT,
+PortB,PB11,,TIM2_CH4,,LPTIM2_ETR,I2C2_SDA,SPI2_RDY,SPI4_RDY,USART3_RX,,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,FMC_NBL1,,,EVENTOUT,
+PortB,PB12,,TIM1_BKIN,,OCTOSPI1_NCLK,I2C2_SDA,SPI2_NSS/I2S2_WS,UCPD1_FRSTX,USART3_CK,,FDCAN2_RX,,ETH_MII_TXD0/ETH_RMII_TXD0,,,UART5_RX,EVENTOUT,
+PortB,PB13,,TIM1_CH1N,LPTIM3_IN1,LPTIM2_CH1,I2C2_SMBA,SPI2_SCK/I2S2_CK,,USART3_CTS/USART3_NSS,,FDCAN2_TX,,,SDMMC1_D0,,UART5_TX,EVENTOUT,
+PortB,PB14,,TIM1_CH2N,TIM12_CH1,TIM8_CH2N,USART1_TX,SPI2_MISO/I2S2_SDI,,USART3_RTS,UART4_RTS,SDMMC2_D0,,,,,LPTIM3_ETR,EVENTOUT,
+PortB,PB15,RTC_REFIN,TIM1_CH3N,TIM12_CH2,TIM8_CH3N,USART1_RX,SPI2_MOSI/I2S2_SDO,,USART11_CTS/USART11_NSS,UART4_CTS,SDMMC2_D1,OCTOSPI1_CLK,ETH_MII_TXD1/ETH_RMII_TXD1,,DCMI_D2/PSSI_D2,UART5_RX,EVENTOUT,
+PortC,PC0,,TIM16_BKIN,,,,,SAI1_MCLK_A,SPI2_RDY,SAI2_FS_B,FMC_A25,OCTOSPI1_IO7,,FMC_SDNWE,,,EVENTOUT,ADC12_INP10
+PortC,PC1,TRACED0,,SAI1_D1,,,SPI2_MOSI/I2S2_SDO,SAI1_SD_A,USART11_RTS,SAI2_SD_A,SDMMC2_CK,OCTOSPI1_IO4,ETH_MDC,,,,EVENTOUT,ADC12_INP11/ADC12_INN10
+PortC,PC2,PWR_CSLEEP,TIM17_CH1,TIM4_CH4,,,SPI2_MISO/I2S2_SDI,OCTOSPI1_IO5,,,OCTOSPI1_IO2,,ETH_MII_TXD2,FMC_SDNE0,,,EVENTOUT,ADC12_INP12/ADC12_INN11
+PortC,PC3,PWR_CSTOP,,SAI1_D3,LPTIM3_CH1,,SPI2_MOSI/I2S2_SDO,OCTOSPI1_IO6,,,OCTOSPI1_IO0,,ETH_MII_TX_CLK,FMC_SDCKE0,,,EVENTOUT,ADC12_INP13/ADC12_INN12
+PortC,PC4,,TIM2_CH4,SAI1_CK1,LPTIM2_ETR,,I2S1_MCK,,USART3_RX,,,,ETH_MII_RXD0/ETH_RMII_RXD0,FMC_SDNE0,,,EVENTOUT,ADC12_INP4
+PortC,PC5,,TIM1_CH4N,SAI1_D3,,PSSI_D15,,SAI1_FS_A,UART12_RTS,,,OCTOSPI1_DQS,ETH_MII_RXD1/ETH_RMII_RXD1,FMC_SDCKE0,,,EVENTOUT,ADC12_INP8/ADC12_INN4
+PortC,PC6,,,TIM3_CH1,TIM8_CH1,,I2S2_MCK,SAI1_SCK_A,USART6_TX,SDMMC1_D0DIR,FMC_NWAIT,SDMMC2_D6,OCTOSPI1_IO5,SDMMC1_D6,DCMI_D0/PSSI_D0,,EVENTOUT,
+PortC,PC7,TRGIO,,TIM3_CH2,TIM8_CH2,,,I2S3_MCK,USART6_RX,SDMMC1_D123DIR,FMC_NE1,SDMMC2_D7,OCTOSPI1_IO6,SDMMC1_D7,DCMI_D1/PSSI_D1,,EVENTOUT,
+PortC,PC8,TRACED1,,TIM3_CH3,TIM8_CH3,,,,USART6_CK,UART5_RTS,FMC_NE2/FMC_NCE,FMC_INT,FMC_ALE,SDMMC1_D0,DCMI_D2/PSSI_D2,,EVENTOUT,
+PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,AUDIOCLK,,,UART5_CTS,OCTOSPI1_IO0,,FMC_CLE,SDMMC1_D1,DCMI_D3/PSSI_D3,,EVENTOUT,
+PortC,PC10,,,LPTIM3_ETR,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,OCTOSPI1_IO1,,ETH_MII_TXD0/ETH_RMII_TXD0,SDMMC1_D2,DCMI_D8/PSSI_D8,,EVENTOUT,
+PortC,PC11,,,LPTIM3_IN1,,,,SPI3_MISO/I2S3_SDI,USART3_RX,UART4_RX,OCTOSPI1_NCS,,,SDMMC1_D3,DCMI_D4/PSSI_D4,,EVENTOUT,
+PortC,PC12,TRACED3,,TIM15_CH1,,,SPI6_SCK,SPI3_MOSI/I2S3_SDO,USART3_CK,UART5_TX,,,,SDMMC1_CK,DCMI_D9/PSSI_D9,,EVENTOUT,
+PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
+PortD,PD0,,,,TIM8_CH4N,,,,,UART4_RX,FDCAN1_RX,,UART9_CTS,FMC_D2/FMC_AD2,,,EVENTOUT,
+PortD,PD1,,,,,,,,,UART4_TX,FDCAN1_TX,,,FMC_D3/FMC_AD3,,,EVENTOUT,
+PortD,PD2,TRACED2,,TIM3_ETR,,TIM15_BKIN,,,,UART5_RX,,,,SDMMC1_CMD,DCMI_D11/PSSI_D11,LPTIM4_ETR,EVENTOUT,
+PortD,PD3,,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS/USART2_NSS,,,,,FMC_CLK,DCMI_D5/PSSI_D5,,EVENTOUT,
+PortD,PD4,,,,,,,,USART2_RTS,,,OCTOSPI1_IO4,,FMC_NOE,,,EVENTOUT,
+PortD,PD5,,TIM1_CH4N,,,,SPI2_RDY,,USART2_TX,,FDCAN1_TX,OCTOSPI1_IO5,,FMC_NWE,,,EVENTOUT,
+PortD,PD6,,,SAI1_D1,,,SPI3_MOSI/I2S3_SDO,SAI1_SD_A,USART2_RX,,,OCTOSPI1_IO6,SDMMC2_CK,FMC_NWAIT,DCMI_D10/PSSI_D10,,EVENTOUT,
+PortD,PD7,,,,,,SPI1_MOSI/I2S1_SDO,,USART2_CK,,,OCTOSPI1_IO7,SDMMC2_CMD,FMC_NE1/FMC_NCE,,LPTIM4_OUT,EVENTOUT,
+PortD,PD8,,,,,,,,USART3_TX,,,,,FMC_D13/FMC_AD13,,,EVENTOUT,
+PortD,PD9,,,,,,,,USART3_RX,,FDCAN2_RX,,,FMC_D14/FMC_AD14,,,EVENTOUT,
+PortD,PD10,,,,LPTIM2_CH2,,,,USART3_CK,,,,,FMC_D15/FMC_AD15,,,EVENTOUT,
+PortD,PD11,,,SAI1_CK1,LPTIM2_IN2,I2C4_SMBA,,,USART3_CTS/USART3_NSS,UART4_RX,OCTOSPI1_IO0,SAI2_SD_A,,FMC_A16/FMC_CLE,,,EVENTOUT,
+PortD,PD12,,LPTIM1_IN1,TIM4_CH1,LPTIM2_IN1,I2C4_SCL,I3C1_SCL,SAI1_D1,USART3_RTS,UART4_TX,OCTOSPI1_IO1,SAI2_FS_A,,FMC_A17/FMC_ALE,DCMI_D12/PSSI_D12,,EVENTOUT,
+PortD,PD13,,LPTIM1_CH1,TIM4_CH2,LPTIM2_CH1,I2C4_SDA,I3C1_SDA,,,,OCTOSPI1_IO3,SAI2_SCK_A,UART9_RTS,FMC_A18,DCMI_D13/PSSI_D13,LPTIM4_IN1,EVENTOUT,
+PortD,PD14,,,TIM4_CH3,,,,,,UART8_CTS,,,UART9_RX,FMC_D0/FMC_AD0,,,EVENTOUT,
+PortD,PD15,,,TIM4_CH4,,,,,,UART8_RTS,,,UART9_TX,FMC_D1/FMC_AD1,,,EVENTOUT,
+PortE,PE0,,LPTIM1_ETR,TIM4_ETR,LPTIM2_CH2,LPTIM2_ETR,,SPI3_RDY,,UART8_RX,FDCAN1_RX,SAI2_MCLK_A,,FMC_NBL0,DCMI_D2/PSSI_D2,,EVENTOUT,
+PortE,PE1,,LPTIM1_IN2,,,,,,,UART8_TX,FDCAN1_TX,,,FMC_NBL1,DCMI_D3/PSSI_D3,,EVENTOUT,
+PortE,PE2,TRACECLK,LPTIM1_IN2,SAI1_CK1,,,SPI4_SCK,SAI1_MCLK_A,USART10_RX,UART8_TX,OCTOSPI1_IO2,,ETH_MII_TXD3,FMC_A23,DCMI_D3/PSSI_D3,,EVENTOUT,
+PortE,PE3,TRACED0,,,,TIM15_BKIN,,SAI1_SD_B,USART10_TX,,,,,FMC_A19,,,EVENTOUT,
+PortE,PE4,TRACED1,,SAI1_D2,,TIM15_CH1N,SPI4_NSS,SAI1_FS_A,,,,,,FMC_A20,DCMI_D4/PSSI_D4,,EVENTOUT,
+PortE,PE5,TRACED2,,SAI1_CK2,,TIM15_CH1,SPI4_MISO,SAI1_SCK_A,,,,,,FMC_A21,DCMI_D6/PSSI_D6,,EVENTOUT,
+PortE,PE6,TRACED3,TIM1_BKIN2,SAI1_D1,,TIM15_CH2,SPI4_MOSI,SAI1_SD_A,,,,SAI2_MCLK_B,,FMC_A22,DCMI_D7/PSSI_D7,,EVENTOUT,
+PortE,PE7,,TIM1_ETR,,,,,UART12_RTS,UART7_RX,,,OCTOSPI1_IO4,,FMC_D4/FMC_AD4,,,EVENTOUT,
+PortE,PE8,,TIM1_CH1N,,,,,UART12_CTS/UART12_NSS,UART7_TX,,,OCTOSPI1_IO5,,FMC_D5/FMC_AD5,,,EVENTOUT,
+PortE,PE9,,TIM1_CH1,,,,,UART12_RX,UART7_RTS,,,OCTOSPI1_IO6,,FMC_D6/FMC_AD6,,,EVENTOUT,
+PortE,PE10,,TIM1_CH2N,,,,,UART12_TX,UART7_CTS,,,OCTOSPI1_IO7,,FMC_D7/FMC_AD7,,,EVENTOUT,
+PortE,PE11,,TIM1_CH2,,,SPI1_RDY,SPI4_NSS,OCTOSPI1_NCS,,,,SAI2_SD_B,,FMC_D8/FMC_AD8,,,EVENTOUT,
+PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,,,,,SAI2_SCK_B,,FMC_D9/FMC_AD9,,,EVENTOUT,
+PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,,,,,SAI2_FS_B,,FMC_D10/FMC_AD10,,,EVENTOUT,
+PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI2_MCLK_B,,FMC_D11/FMC_AD11,,,EVENTOUT,
+PortE,PE15,,TIM1_BKIN,,TIM1_CH4N,,,,USART10_CK,,,,,FMC_D12/FMC_AD12,,,EVENTOUT,
+PortF,PF0,,,,,I2C2_SDA,,,,,,,,FMC_A0,LPTIM5_CH1,,EVENTOUT,
+PortF,PF1,,,,,I2C2_SCL,,,,,,,,FMC_A1,LPTIM5_CH2,,EVENTOUT,
+PortF,PF2,,,LPTIM3_CH2,LPTIM3_IN2,I2C2_SMBA,,UART12_TX,USART11_CK,,,,,FMC_A2,LPTIM5_IN1,,EVENTOUT,
+PortF,PF3,,,LPTIM3_IN1,,,,,USART11_TX,,,,,FMC_A3,LPTIM5_IN2,,EVENTOUT,
+PortF,PF4,,,LPTIM3_ETR,,,,,USART11_RX,,,,,FMC_A4,,,EVENTOUT,
+PortF,PF5,,,LPTIM3_CH1,,I2C4_SCL,I3C1_SCL,UART12_RX,USART11_CTS/USART11_NSS,,,,,FMC_A5,,LPTIM3_IN1,EVENTOUT,
+PortF,PF6,,TIM16_CH1,,,,SPI5_NSS,SAI1_SD_B,UART7_RX,,,OCTOSPI1_IO3,,,LPTIM5_CH1,,EVENTOUT,
+PortF,PF7,,TIM17_CH1,,,,SPI5_SCK,SAI1_MCLK_B,UART7_TX,,,OCTOSPI1_IO2,,,LPTIM5_CH2,,EVENTOUT,
+PortF,PF8,,TIM16_CH1N,,,,SPI5_MISO,SAI1_SCK_B,UART7_RTS,,TIM13_CH1,OCTOSPI1_IO0,,,LPTIM5_IN1,,EVENTOUT,
+PortF,PF9,,TIM17_CH1N,,,,SPI5_MOSI,SAI1_FS_B,UART7_CTS,,TIM14_CH1,OCTOSPI1_IO1,,,LPTIM5_IN2,,EVENTOUT,
+PortF,PF10,,TIM16_BKIN,SAI1_D3,,PSSI_D15,,,,,OCTOSPI1_CLK,,,,DCMI_D11/PSSI_D11,,EVENTOUT,
+PortF,PF11,,,,,,SPI5_MOSI,,,,OCTOSPI1_NCLK,SAI2_SD_B,,FMC_NRAS,DCMI_D12/PSSI_D12,LPTIM6_CH1,EVENTOUT,ADC1_INP2
+PortF,PF12,,,,,,,,,,,,,FMC_A6,,LPTIM6_CH2,EVENTOUT,ADC1_INP6/ADC1_INN2
+PortF,PF13,,,,,I2C4_SMBA,,,,,,,,FMC_A7,,LPTIM6_IN1,EVENTOUT,ADC2_INP2
+PortF,PF14,,,,,,,,,,,,,FMC_A8,,LPTIM6_IN2,EVENTOUT,ADC2_INP6/ADC2_INN2
+PortF,PF15,,,,,I2C4_SDA,I3C1_SDA,,,,,,,FMC_A9,,,EVENTOUT,
+PortG,PG0,,,,,,,,,,,,UART9_RX,FMC_A10,,LPTIM4_IN1,EVENTOUT,
+PortG,PG1,,,,,,,,SPI2_MOSI/I2S2_SDO,,,,UART9_TX,FMC_A11,,,EVENTOUT,
+PortG,PG2,,,,TIM8_BKIN,,,,UART12_RX,,,,,FMC_A12,,LPTIM6_ETR,EVENTOUT,
+PortG,PG3,,,,TIM8_BKIN2,,,,UART12_TX,,,,,FMC_A13,LPTIM5_ETR,,EVENTOUT,
+PortG,PG4,,TIM1_BKIN2,,,,,,,,,,,FMC_A14/FMC_BA0,,LPTIM4_ETR,EVENTOUT,
+PortG,PG5,,TIM1_ETR,,,,,,,,,,,FMC_A15/FMC_BA1,,,EVENTOUT,
+PortG,PG6,,TIM17_BKIN,,I3C1_SDA,I2C4_SDA,SPI1_RDY,,,,,OCTOSPI1_NCS,UCPD1_FRSTX,FMC_NE3,DCMI_D12/PSSI_D12,,EVENTOUT,
+PortG,PG7,,,SAI1_CK2,I3C1_SCL,I2C4_SCL,,SAI1_MCLK_A,USART6_CK,,,,UCPD1_FRSTX,FMC_INT,DCMI_D13/PSSI_D13,,EVENTOUT,
+PortG,PG8,,,,TIM8_ETR,,SPI6_NSS,,USART6_RTS,,,,ETH_PPS_OUT,FMC_SDCLK,,,EVENTOUT,
+PortG,PG9,,,,,,SPI1_MISO/I2S1_SDI,,USART6_RX,,OCTOSPI1_IO6,SAI2_FS_B,SDMMC2_D0,FMC_NE2/FMC_NCE,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
+PortG,PG10,,,,,,SPI1_NSS/I2S1_WS,,,,,SAI2_SD_B,SDMMC2_D1,FMC_NE3,DCMI_D2/PSSI_D2,,EVENTOUT,
+PortG,PG11,,LPTIM1_IN2,,,,SPI1_SCK/I2S1_CK,USART10_RX,USART11_RTS,,,SDMMC2_D2,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DCMI_D3/PSSI_D3,,EVENTOUT,
+PortG,PG12,,LPTIM1_IN1,,,PSSI_D15,SPI6_MISO,USART10_TX,USART6_RTS,,,SDMMC2_D3,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_NE4,DCMI_D11/PSSI_D11,LPTIM5_CH1,EVENTOUT,
+PortG,PG13,TRACED0,LPTIM1_CH1,,,,SPI6_SCK,USART10_CTS/USART10_NSS,USART6_CTS/USART6_NSS,,,SDMMC2_D6,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,LPTIM5_CH2,,EVENTOUT,
+PortG,PG14,TRACED1,LPTIM1_ETR,,,LPTIM1_CH2,SPI6_MOSI,USART10_RTS,USART6_TX,,OCTOSPI1_IO7,SDMMC2_D7,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_A25,LPTIM5_IN1,,EVENTOUT,
+PortG,PG15,,,,,,SPI4_RDY,USART10_CK,USART6_CTS/USART6_NSS,,,,,FMC_NCAS,DCMI_D13/PSSI_D13,,EVENTOUT,
+PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
+PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
+PortH,PH2,,LPTIM1_IN2,,,,,,,,OCTOSPI1_IO4,SAI2_SCK_B,ETH_MII_CRS,FMC_SDCKE0,,,EVENTOUT,
+PortH,PH3,,,,,,,,,,OCTOSPI1_IO5,SAI2_MCLK_B,ETH_MII_COL,FMC_SDNE0,,,EVENTOUT,
+PortH,PH4,,,,,I2C2_SCL,SPI5_RDY,,SPI6_RDY,,,,,,PSSI_D14,,EVENTOUT,
+PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,SPI6_RDY,,,,,FMC_SDNWE,,,EVENTOUT,
+PortH,PH6,,TIM1_CH3N,TIM12_CH1,TIM8_CH1,I2C2_SMBA,SPI5_SCK,,,,,,ETH_MII_RXD2,FMC_SDNE1,DCMI_D8/PSSI_D8,,EVENTOUT,
+PortH,PH7,,TIM1_CH3,,TIM8_CH1N,I2C3_SCL,SPI5_MISO,,,,,,ETH_MII_RXD3,FMC_SDCKE1,DCMI_D9/PSSI_D9,,EVENTOUT,
+PortH,PH8,,TIM1_CH2N,TIM5_ETR,TIM8_CH2,I2C3_SDA,SPI5_MOSI,,,,,,,,DCMI_HSYNC/PSSI_DE,,EVENTOUT,
+PortH,PH9,,TIM1_CH2,TIM12_CH2,TIM8_CH2N,I2C3_SMBA,SPI5_NSS,,,,,,,,DCMI_D0/PSSI_D0,,EVENTOUT,
+PortH,PH10,,TIM1_CH1N,TIM5_CH1,TIM8_CH3,I2C4_SMBA,SPI5_RDY,,,,,,,,DCMI_D1/PSSI_D1,,EVENTOUT,
+PortH,PH11,,TIM1_CH1,TIM5_CH2,TIM8_CH3N,I2C4_SCL,I3C1_SCL,,,,,,,,DCMI_D2/PSSI_D2,,EVENTOUT,
+PortH,PH12,,TIM1_BKIN,TIM5_CH3,TIM8_BKIN,I2C4_SDA,I3C1_SDA,,,,,TIM8_CH4N,,,DCMI_D3/PSSI_D3,,EVENTOUT,
+PortH,PH13,,LPTIM1_IN2,,TIM8_CH1N,,,,UART8_TX,UART4_TX,FDCAN1_TX,,,,DCMI_D3/PSSI_D3,,EVENTOUT,
+PortH,PH14,,,,TIM8_CH2N,,,,,UART4_RX,FDCAN1_RX,,,,DCMI_D4/PSSI_D4,,EVENTOUT,
+PortH,PH15,,,,TIM8_CH3N,,,,,,,,,,DCMI_D11/PSSI_D11,,EVENTOUT,
+PortI,PI0,,,TIM5_CH4,,,SPI2_NSS/I2S2_WS,,,,,,,,DCMI_D13/PSSI_D13,,EVENTOUT,
+PortI,PI1,,,,TIM8_BKIN2,,SPI2_SCK/I2S2_CK,,,,,,,,DCMI_D8/PSSI_D8,,EVENTOUT,
+PortI,PI2,,,,TIM8_CH4,,SPI2_MISO/I2S2_SDI,,,,,,,,DCMI_D9/PSSI_D9,,EVENTOUT,
+PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SDO,,,,,,,,DCMI_D10/PSSI_D10,,EVENTOUT,
+PortI,PI4,,,,TIM8_BKIN,,,,SPI2_RDY,,,SAI2_MCLK_A,,,DCMI_D5/PSSI_D5,,EVENTOUT,
+PortI,PI5,,,,TIM8_CH1,,,,,,,SAI2_SCK_A,,,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
+PortI,PI6,,,,TIM8_CH2,,,,,,,SAI2_SD_A,,,DCMI_D6/PSSI_D6,,EVENTOUT,
+PortI,PI7,,,,TIM8_CH3,,,,,,,SAI2_FS_A,,,DCMI_D7/PSSI_D7,,EVENTOUT,
+PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT,
+PortI,PI9,,,,,,,,,UART4_RX,FDCAN1_RX,,,,,,EVENTOUT,
+PortI,PI10,,,,,,,,,,FDCAN1_RX,,ETH_MII_RX_ER,,PSSI_D14,,EVENTOUT,
+PortI,PI11,,,,,,,,,,,,,,PSSI_D15,,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h573xi.ld b/ports/stm32/boards/stm32h573xi.ld
new file mode 100644
index 0000000000000..334e1f7b85124
--- /dev/null
+++ b/ports/stm32/boards/stm32h573xi.ld
@@ -0,0 +1,34 @@
+/*
+    GNU linker script for STM32H573xI
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K   /* sectors 0-127 (for common_basic.ld) */
+    FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 992K    /* sectors 4-127 (for common_bl.ld) */
+    FLASH_FS (rx)   : ORIGIN = 0x08100000, LENGTH = 1024K   /* sectors 128-255 */
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 632K    /* SRAM1+SRAM2+SRAM3 - 8K */
+    FS_CACHE (xrw)  : ORIGIN = 0x2009e000, LENGTH = 8K      /* last 8K of SRAM3 */
+}
+
+/* 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;
+
+/* 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/stm32h5xx_hal_conf_base.h b/ports/stm32/boards/stm32h5xx_hal_conf_base.h
new file mode 100644
index 0000000000000..c40fc7085597e
--- /dev/null
+++ b/ports/stm32/boards/stm32h5xx_hal_conf_base.h
@@ -0,0 +1,108 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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_STM32H5XX_HAL_CONF_BASE_H
+#define MICROPY_INCLUDED_STM32H5XX_HAL_CONF_BASE_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_DCMI_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FDCAN_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_HASH_MODULE_ENABLED
+#define HAL_HCD_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_I2S_MODULE_ENABLED
+#define HAL_ICACHE_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
+#define HAL_SD_MODULE_ENABLED
+#define HAL_SDRAM_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 CSI_VALUE (4000000)
+#define HSI_VALUE (64000000)
+#define HSI48_VALUE (48000000)
+#define LSI_VALUE (32000)
+
+// SysTick has the highest priority
+#define TICK_INT_PRIORITY (0x00)
+
+// Miscellaneous HAL settings
+#define USE_RTOS            0
+#define USE_SPI_CRC         1
+
+// Include various HAL modules for convenience
+#include "stm32h5xx_hal_dma.h"
+#include "stm32h5xx_hal_rcc.h"
+#include "stm32h5xx_hal_adc.h"
+#include "stm32h5xx_hal_cortex.h"
+#include "stm32h5xx_hal_crc.h"
+#include "stm32h5xx_hal_dac.h"
+#include "stm32h5xx_hal_dcmi.h"
+#include "stm32h5xx_hal_fdcan.h"
+#include "stm32h5xx_hal_flash.h"
+#include "stm32h5xx_hal_gpio.h"
+#include "stm32h5xx_hal_hash.h"
+#include "stm32h5xx_hal_hcd.h"
+#include "stm32h5xx_hal_i2c.h"
+#include "stm32h5xx_hal_i2s.h"
+#include "stm32h5xx_hal_icache.h"
+#include "stm32h5xx_hal_iwdg.h"
+#include "stm32h5xx_hal_pcd.h"
+#include "stm32h5xx_hal_pwr.h"
+#include "stm32h5xx_hal_rtc.h"
+#include "stm32h5xx_hal_sd.h"
+#include "stm32h5xx_hal_sdram.h"
+#include "stm32h5xx_hal_spi.h"
+#include "stm32h5xx_hal_tim.h"
+#include "stm32h5xx_hal_uart.h"
+#include "stm32h5xx_hal_usart.h"
+#include "stm32h5xx_hal_wwdg.h"
+#include "stm32h5xx_ll_adc.h"
+#include "stm32h5xx_ll_lpuart.h"
+#include "stm32h5xx_ll_pwr.h"
+#include "stm32h5xx_ll_rcc.h"
+#include "stm32h5xx_ll_rtc.h"
+#include "stm32h5xx_ll_usart.h"
+
+// HAL parameter assertions are disabled
+#define assert_param(expr) ((void)0)
+
+#endif // MICROPY_INCLUDED_STM32H5XX_HAL_CONF_BASE_H

From 56a22ddc8b610235d4bfca08a56a57451feef22f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 May 2023 12:45:14 +1000
Subject: [PATCH 0061/3129] stm32/octospi: Add preliminary support for OCTOSPI
 peripheral.

It currently operates in 1-line (SPI) mode only.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile  |   1 +
 ports/stm32/octospi.c | 343 ++++++++++++++++++++++++++++++++++++++++++
 ports/stm32/octospi.h |  33 ++++
 3 files changed, 377 insertions(+)
 create mode 100644 ports/stm32/octospi.c
 create mode 100644 ports/stm32/octospi.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d75101159bd37..d5030b7e46da2 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -320,6 +320,7 @@ SRC_C += \
 	spi.c \
 	pyb_spi.c \
 	qspi.c \
+	octospi.c \
 	uart.c \
 	ulpi.c \
 	can.c \
diff --git a/ports/stm32/octospi.c b/ports/stm32/octospi.c
new file mode 100644
index 0000000000000..b37ebb2a082da
--- /dev/null
+++ b/ports/stm32/octospi.c
@@ -0,0 +1,343 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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.
+ */
+
+// This OCTOSPI driver is currently configured to run in 1-line (SPI) mode.
+// It uses the mp_qspi_proto_t QSPI protocol and translates quad-commands
+// into 1-line commands.
+
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "octospi.h"
+#include "pin_static_af.h"
+
+#if defined(MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2)
+
+#ifndef MICROPY_HW_OSPI_PRESCALER
+#define MICROPY_HW_OSPI_PRESCALER (3) // F_CLK = F_AHB/3
+#endif
+
+#ifndef MICROPY_HW_OSPI_CS_HIGH_CYCLES
+#define MICROPY_HW_OSPI_CS_HIGH_CYCLES (2) // nCS stays high for 2 cycles
+#endif
+
+void octospi_init(void) {
+    // Configure OCTOSPI pins (allows 1, 2, 4 or 8 line configuration).
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_CS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_NCS);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_SCK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_CLK);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO0);
+    #if defined(MICROPY_HW_OSPIFLASH_IO1)
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO1);
+    #if defined(MICROPY_HW_OSPIFLASH_IO2)
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO2);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO3);
+    #if defined(MICROPY_HW_OSPIFLASH_IO4)
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO4, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO4);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO5);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO6);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO7);
+    #endif
+    #endif
+    #endif
+
+    // Reset and turn on the OCTOSPI peripheral.
+    __HAL_RCC_OSPI1_CLK_ENABLE();
+    __HAL_RCC_OSPI1_FORCE_RESET();
+    __HAL_RCC_OSPI1_RELEASE_RESET();
+
+    // Configure the OCTOSPI peripheral.
+
+    OCTOSPI1->CR =
+        3 << OCTOSPI_CR_FTHRES_Pos // 4 bytes must be available to read/write
+            | 0 << OCTOSPI_CR_MSEL_Pos // FLASH 0 selected
+            | 0 << OCTOSPI_CR_DMM_Pos // dual-memory mode disabled
+    ;
+
+    OCTOSPI1->DCR1 =
+        (MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2 - 3 - 1) << OCTOSPI_DCR1_DEVSIZE_Pos
+            | (MICROPY_HW_OSPI_CS_HIGH_CYCLES - 1) << OCTOSPI_DCR1_CSHT_Pos
+            | 0 << OCTOSPI_DCR1_CKMODE_Pos // CLK idles at low state
+    ;
+
+    OCTOSPI1->DCR2 =
+        (MICROPY_HW_OSPI_PRESCALER - 1) << OCTOSPI_DCR2_PRESCALER_Pos
+    ;
+
+    OCTOSPI1->DCR3 = 0;
+    OCTOSPI1->DCR4 = 0;
+
+    // Enable the OCTOSPI peripheral.
+    OCTOSPI1->CR |= OCTOSPI_CR_EN;
+}
+
+STATIC int octospi_ioctl(void *self_in, uint32_t cmd) {
+    (void)self_in;
+    switch (cmd) {
+        case MP_QSPI_IOCTL_INIT:
+            octospi_init();
+            break;
+        case MP_QSPI_IOCTL_BUS_ACQUIRE:
+            // Abort any ongoing transfer if peripheral is busy.
+            if (OCTOSPI1->SR & OCTOSPI_SR_BUSY) {
+                OCTOSPI1->CR |= OCTOSPI_CR_ABORT;
+                while (OCTOSPI1->CR & OCTOSPI_CR_ABORT) {
+                }
+            }
+            break;
+        case MP_QSPI_IOCTL_BUS_RELEASE:
+            break;
+    }
+    return 0; // success
+}
+
+STATIC int octospi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
+    (void)self_in;
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    OCTOSPI1->CR = (OCTOSPI1->CR & ~OCTOSPI_CR_FMODE_Msk) | 0 << OCTOSPI_CR_FMODE_Pos; // indirect write mode
+
+    if (len == 0) {
+        OCTOSPI1->CCR =
+            0 << OCTOSPI_CCR_DDTR_Pos // DD mode disabled
+                | 0 << OCTOSPI_CCR_SIOO_Pos // send instruction every transaction
+                | 0 << OCTOSPI_CCR_DMODE_Pos // no data
+                | 0 << OCTOSPI_CCR_ABMODE_Pos // no alternate byte
+                | 0 << OCTOSPI_CCR_ADMODE_Pos // no address
+                | 1 << OCTOSPI_CCR_IMODE_Pos // instruction on 1 line
+        ;
+        OCTOSPI1->TCR = 0 << OCTOSPI_TCR_DCYC_Pos; // 0 dummy cycles
+
+        // This triggers the start of the operation.
+        OCTOSPI1->IR = cmd << OCTOSPI_IR_INSTRUCTION_Pos; // write opcode
+    } else {
+        OCTOSPI1->DLR = len - 1;
+        OCTOSPI1->CCR =
+            0 << OCTOSPI_CCR_DDTR_Pos // DD mode disabled
+                | 0 << OCTOSPI_CCR_SIOO_Pos // send instruction every transaction
+                | 1 << OCTOSPI_CCR_DMODE_Pos // data on 1 line
+                | 0 << OCTOSPI_CCR_ABMODE_Pos // no alternate byte
+                | 0 << OCTOSPI_CCR_ADMODE_Pos // no address
+                | 1 << OCTOSPI_CCR_IMODE_Pos // instruction on 1 line
+        ;
+        OCTOSPI1->TCR = 0 << OCTOSPI_TCR_DCYC_Pos; // 0 dummy cycles
+        OCTOSPI1->IR = cmd << OCTOSPI_IR_INSTRUCTION_Pos; // write opcode
+
+        // Wait for at least 1 free byte location in the FIFO.
+        while (!(OCTOSPI1->SR & OCTOSPI_SR_FTF)) {
+        }
+
+        // This triggers the start of the operation.
+        // This assumes len==2
+        *(uint16_t *)&OCTOSPI1->DR = data;
+    }
+
+    // Wait for write to finish
+    while (!(OCTOSPI1->SR & OCTOSPI_SR_TCF)) {
+        if (OCTOSPI1->SR & OCTOSPI_SR_TEF) {
+            return -MP_EIO;
+        }
+    }
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
+}
+
+STATIC int octospi_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;
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    OCTOSPI1->CR = (OCTOSPI1->CR & ~OCTOSPI_CR_FMODE_Msk) | 0 << OCTOSPI_CR_FMODE_Pos; // indirect write mode
+
+    if (len == 0) {
+        OCTOSPI1->CCR =
+            0 << OCTOSPI_CCR_DDTR_Pos // DD mode disabled
+                | 0 << OCTOSPI_CCR_SIOO_Pos // send instruction every transaction
+                | 0 << OCTOSPI_CCR_DMODE_Pos // no data
+                | 0 << OCTOSPI_CCR_ABMODE_Pos // no alternate byte
+                | adsize << OCTOSPI_CCR_ADSIZE_Pos // 32/24-bit address size
+                | 1 << OCTOSPI_CCR_ADMODE_Pos // address on 1 line
+                | 1 << OCTOSPI_CCR_IMODE_Pos // instruction on 1 line
+        ;
+        OCTOSPI1->TCR = 0 << OCTOSPI_TCR_DCYC_Pos; // 0 dummy cycles
+        OCTOSPI1->IR = cmd << OCTOSPI_IR_INSTRUCTION_Pos; // write opcode
+
+        // This triggers the start of the operation.
+        OCTOSPI1->AR = addr;
+    } else {
+        OCTOSPI1->DLR = len - 1;
+
+        OCTOSPI1->CCR =
+            0 << OCTOSPI_CCR_DDTR_Pos // DD mode disabled
+                | 0 << OCTOSPI_CCR_SIOO_Pos // send instruction every transaction
+                | 1 << OCTOSPI_CCR_DMODE_Pos // data on 1 line
+                | 0 << OCTOSPI_CCR_ABMODE_Pos // no alternate byte
+                | adsize << OCTOSPI_CCR_ADSIZE_Pos // 32/24-bit address size
+                | 1 << OCTOSPI_CCR_ADMODE_Pos // address on 1 line
+                | 1 << OCTOSPI_CCR_IMODE_Pos // instruction on 1 line
+        ;
+        OCTOSPI1->TCR = 0 << OCTOSPI_TCR_DCYC_Pos; // 0 dummy cycles
+        OCTOSPI1->IR = cmd << OCTOSPI_IR_INSTRUCTION_Pos; // write opcode
+        OCTOSPI1->AR = addr;
+
+        // Write out the data 1 byte at a time
+        // This triggers the start of the operation.
+        while (len) {
+            while (!(OCTOSPI1->SR & OCTOSPI_SR_FTF)) {
+                if (OCTOSPI1->SR & OCTOSPI_SR_TEF) {
+                    return -MP_EIO;
+                }
+            }
+            *(volatile uint8_t *)&OCTOSPI1->DR = *src++;
+            --len;
+        }
+    }
+
+    // Wait for write to finish
+    while (!(OCTOSPI1->SR & OCTOSPI_SR_TCF)) {
+        if (OCTOSPI1->SR & OCTOSPI_SR_TEF) {
+            return -MP_EIO;
+        }
+    }
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
+}
+
+STATIC int octospi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
+    (void)self_in;
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    OCTOSPI1->DLR = len - 1; // number of bytes to read
+
+    OCTOSPI1->CR = (OCTOSPI1->CR & ~OCTOSPI_CR_FMODE_Msk) | 1 << OCTOSPI_CR_FMODE_Pos; // indirect read mode
+
+    OCTOSPI1->CCR =
+        0 << OCTOSPI_CCR_DDTR_Pos // DD mode disabled
+            | 0 << OCTOSPI_CCR_SIOO_Pos // send instruction every transaction
+            | 1 << OCTOSPI_CCR_DMODE_Pos // data on 1 line
+            | 0 << OCTOSPI_CCR_ABMODE_Pos // no alternate byte
+            | 0 << OCTOSPI_CCR_ADMODE_Pos // no address
+            | 1 << OCTOSPI_CCR_IMODE_Pos // instruction on 1 line
+    ;
+
+    OCTOSPI1->TCR = 0 << OCTOSPI_TCR_DCYC_Pos; // 0 dummy cycles
+
+    // This triggers the start of the operation.
+    OCTOSPI1->IR = cmd << OCTOSPI_IR_INSTRUCTION_Pos; // read opcode
+
+    // Wait for read to finish
+    while (!(OCTOSPI1->SR & OCTOSPI_SR_TCF)) {
+        if (OCTOSPI1->SR & OCTOSPI_SR_TEF) {
+            return -MP_EIO;
+        }
+    }
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    // Read result
+    *dest = OCTOSPI1->DR;
+
+    return 0;
+}
+
+STATIC int octospi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
+    (void)self_in;
+
+    uint32_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
+    uint32_t dmode = 1; // data on 1-line
+    uint32_t admode = 1; // address on 1-line
+    uint32_t dcyc = 0; // 0 dummy cycles
+
+    if (cmd == 0xeb) {
+        // Convert to 1-line command.
+        cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 0x13 : 0x03;
+    }
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    OCTOSPI1->DLR = len - 1; // number of bytes to read
+    OCTOSPI1->CR = (OCTOSPI1->CR & ~OCTOSPI_CR_FMODE_Msk) | 1 << OCTOSPI_CR_FMODE_Pos; // indirect read mode
+    OCTOSPI1->CCR =
+        0 << OCTOSPI_CCR_DDTR_Pos // DD mode disabled
+            | 0 << OCTOSPI_CCR_SIOO_Pos // send instruction every transaction
+            | dmode << OCTOSPI_CCR_DMODE_Pos // data on n lines
+            | 0 << OCTOSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
+            | 0 << OCTOSPI_CCR_ABMODE_Pos // no alternate byte
+            | adsize << OCTOSPI_CCR_ADSIZE_Pos // 32 or 24-bit address size
+            | admode << OCTOSPI_CCR_ADMODE_Pos // address on n lines
+            | 1 << OCTOSPI_CCR_IMODE_Pos // instruction on 1 line
+    ;
+    OCTOSPI1->TCR = dcyc << OCTOSPI_TCR_DCYC_Pos; // n dummy cycles
+    OCTOSPI1->IR = cmd << OCTOSPI_IR_INSTRUCTION_Pos; // quad read opcode
+
+    // This triggers the start of the operation.
+    OCTOSPI1->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) {
+        while (len >= 4) {
+            while (!(OCTOSPI1->SR & OCTOSPI_SR_FTF)) {
+                if (OCTOSPI1->SR & OCTOSPI_SR_TEF) {
+                    return -MP_EIO;
+                }
+            }
+            *(uint32_t *)dest = OCTOSPI1->DR;
+            dest += 4;
+            len -= 4;
+        }
+    }
+
+    // Read in remaining data 1 byte at a time
+    while (len) {
+        while (!((OCTOSPI1->SR >> OCTOSPI_SR_FLEVEL_Pos) & 0x3f)) {
+            if (OCTOSPI1->SR & OCTOSPI_SR_TEF) {
+                return -MP_EIO;
+            }
+        }
+        *dest++ = *(volatile uint8_t *)&OCTOSPI1->DR;
+        --len;
+    }
+
+    OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
+}
+
+const mp_qspi_proto_t octospi_proto = {
+    .ioctl = octospi_ioctl,
+    .write_cmd_data = octospi_write_cmd_data,
+    .write_cmd_addr_data = octospi_write_cmd_addr_data,
+    .read_cmd = octospi_read_cmd,
+    .read_cmd_qaddr_qdata = octospi_read_cmd_qaddr_qdata,
+};
+
+#endif // defined(MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2)
diff --git a/ports/stm32/octospi.h b/ports/stm32/octospi.h
new file mode 100644
index 0000000000000..3ef4b8206fa2a
--- /dev/null
+++ b/ports/stm32/octospi.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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_STM32_OCTOSPI_H
+#define MICROPY_INCLUDED_STM32_OCTOSPI_H
+
+#include "drivers/bus/qspi.h"
+
+extern const mp_qspi_proto_t octospi_proto;
+
+#endif // MICROPY_INCLUDED_STM32_OCTOSPI_H

From 6f74146bc14fcc4011ec8df497fd85d52f176e4e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Mar 2023 16:41:11 +1100
Subject: [PATCH 0062/3129] stm32/boards/STM32H573I_DK: Add H5 board definition
 files.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/STM32H573I_DK/bdev.c       |  45 ++++++
 .../boards/STM32H573I_DK/mpconfigboard.h      | 113 +++++++++++++
 .../boards/STM32H573I_DK/mpconfigboard.mk     |  15 ++
 ports/stm32/boards/STM32H573I_DK/pins.csv     | 149 ++++++++++++++++++
 .../boards/STM32H573I_DK/stm32h5xx_hal_conf.h |  19 +++
 5 files changed, 341 insertions(+)
 create mode 100644 ports/stm32/boards/STM32H573I_DK/bdev.c
 create mode 100644 ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
 create mode 100644 ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/STM32H573I_DK/pins.csv
 create mode 100644 ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h

diff --git a/ports/stm32/boards/STM32H573I_DK/bdev.c b/ports/stm32/boards/STM32H573I_DK/bdev.c
new file mode 100644
index 0000000000000..b3047342375c2
--- /dev/null
+++ b/ports/stm32/boards/STM32H573I_DK/bdev.c
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "storage.h"
+#include "octospi.h"
+
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+static mp_spiflash_cache_t spi_bdev_cache;
+#endif
+
+// External SPI flash uses hardware OCTOSPI interface (in 1-line mode).
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_QSPI, // spiflash driver doesn't yet support OSPI
+    .bus.u_qspi.data = NULL,
+    .bus.u_qspi.proto = &octospi_proto,
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+    .cache = &spi_bdev_cache,
+    #endif
+};
+
+spi_bdev_t spi_bdev;
diff --git a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
new file mode 100644
index 0000000000000..01064325dafba
--- /dev/null
+++ b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
@@ -0,0 +1,113 @@
+#define MICROPY_HW_BOARD_NAME               "STM32H573I-DK"
+#define MICROPY_HW_MCU_NAME                 "STM32H573IIK3Q"
+
+#define MICROPY_PY_PYB_LEGACY               (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_ADC               (1)
+#define MICROPY_HW_ENABLE_DAC               (0) // requires DMA
+#define MICROPY_HW_ENABLE_USB               (1)
+#define MICROPY_HW_HAS_SWITCH               (1)
+#define MICROPY_HW_HAS_FLASH                (1)
+
+#if 1
+// The board has a 25MHz oscillator, the following gives 250MHz CPU speed
+#define MICROPY_HW_CLK_USE_BYPASS           (1)
+#define MICROPY_HW_CLK_PLLM                 (5)
+#define MICROPY_HW_CLK_PLLN                 (100)
+#define MICROPY_HW_CLK_PLLP                 (2)
+#define MICROPY_HW_CLK_PLLQ                 (2)
+#define MICROPY_HW_CLK_PLLR                 (2)
+#define MICROPY_HW_CLK_PLLVCI_LL            (LL_RCC_PLLINPUTRANGE_4_8)
+#define MICROPY_HW_CLK_PLLVCO_LL            (LL_RCC_PLLVCORANGE_WIDE)
+#define MICROPY_HW_CLK_PLLFRAC              (0)
+#define MICROPY_HW_FLASH_LATENCY            FLASH_LATENCY_5
+#else
+// Use 64MHz HSI to clock the CPU at 200MHz
+#define MICROPY_HW_CLK_USE_HSI              (1) // 64MHz
+#define MICROPY_HW_CLK_PLLM                 (16)
+#define MICROPY_HW_CLK_PLLN                 (100)
+#define MICROPY_HW_CLK_PLLP                 (2)
+#define MICROPY_HW_CLK_PLLQ                 (2)
+#define MICROPY_HW_CLK_PLLR                 (2)
+#define MICROPY_HW_CLK_PLLVCI_LL            (LL_RCC_PLLINPUTRANGE_4_8)
+#define MICROPY_HW_CLK_PLLVCO_LL            (LL_RCC_PLLVCORANGE_WIDE)
+#define MICROPY_HW_CLK_PLLFRAC              (0)
+#define MICROPY_HW_FLASH_LATENCY            FLASH_LATENCY_4 // VOS0, 168-210MHz
+#endif
+
+// PLL3 with Q output at 48MHz for USB
+#define MICROPY_HW_CLK_PLL3M                (25)
+#define MICROPY_HW_CLK_PLL3N                (192)
+#define MICROPY_HW_CLK_PLL3P                (2)
+#define MICROPY_HW_CLK_PLL3Q                (4)
+#define MICROPY_HW_CLK_PLL3R                (2)
+#define MICROPY_HW_CLK_PLL3FRAC             (0)
+#define MICROPY_HW_CLK_PLL3VCI_LL           (LL_RCC_PLLINPUTRANGE_1_2)
+#define MICROPY_HW_CLK_PLL3VCO_LL           (LL_RCC_PLLVCORANGE_MEDIUM)
+
+// There is an external 32kHz oscillator
+#define MICROPY_HW_RTC_USE_LSE              (1)
+
+// 512MBit
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2 (29)
+#define MICROPY_HW_OSPIFLASH_CS             (pin_G6)
+#define MICROPY_HW_OSPIFLASH_SCK            (pin_F10)
+#define MICROPY_HW_OSPIFLASH_IO0            (pin_B1)
+#define MICROPY_HW_OSPIFLASH_IO1            (pin_D12)
+#define MICROPY_HW_OSPIFLASH_IO2            (pin_C2)
+#define MICROPY_HW_OSPIFLASH_IO3            (pin_D13)
+#define MICROPY_HW_OSPIFLASH_IO4            (pin_H2)
+#define MICROPY_HW_OSPIFLASH_IO5            (pin_H3)
+#define MICROPY_HW_OSPIFLASH_IO6            (pin_G9)
+#define MICROPY_HW_OSPIFLASH_IO7            (pin_C0)
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE    (1)
+#define MICROPY_HW_BDEV_SPIFLASH            (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG     (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES ((1 << MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2) / 8)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED   (&spi_bdev) // for extended block protocol
+#endif
+
+// UART buses
+#define MICROPY_HW_UART1_TX                 (pin_A9)
+#define MICROPY_HW_UART1_RX                 (pin_A10)
+#define MICROPY_HW_UART3_TX                 (pin_B10) // Arduino Connector CN15-Pin2 (D1)
+#define MICROPY_HW_UART3_RX                 (pin_B11) // Arduino Connector CN15-Pin1 (D0)
+#define MICROPY_HW_UART_REPL                PYB_UART_1
+#define MICROPY_HW_UART_REPL_BAUD           115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL                 (pin_B6) // Arduino Connector CN13-Pin10 (D15)
+#define MICROPY_HW_I2C1_SDA                 (pin_B7) // Arduino Connector CN13-Pin9 (D14)
+
+// SPI buses
+#define MICROPY_HW_SPI2_NSS                 (pin_A3) // Arduino Connector CN13-Pin3 (D10)
+#define MICROPY_HW_SPI2_SCK                 (pin_I1) // Arduino Connector CN13-Pin6 (D13)
+#define MICROPY_HW_SPI2_MISO                (pin_I2) // Arduino Connector CN13-Pin5 (D12)
+#define MICROPY_HW_SPI2_MOSI                (pin_B15) // Arduino Connector CN13-Pin4 (D11)
+
+// 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_I9) // green
+#define MICROPY_HW_LED2                     (pin_I8) // orange
+#define MICROPY_HW_LED3                     (pin_F1) // red
+#define MICROPY_HW_LED4                     (pin_F4) // 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                   (1)
+#define MICROPY_HW_USB_MAIN_DEV             (USB_PHY_FS_ID)
+
+/******************************************************************************/
+// Variable and function declarations
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
diff --git a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk
new file mode 100644
index 0000000000000..99d3923f203c0
--- /dev/null
+++ b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk
@@ -0,0 +1,15 @@
+USE_MBOOT ?= 0
+
+# MCU settings
+MCU_SERIES = h5
+CMSIS_MCU = STM32H573xx
+MICROPY_FLOAT_IMPL = single
+AF_FILE = boards/stm32h573_af.csv
+
+ifeq ($(USE_MBOOT),1)
+LD_FILES = boards/stm32h573xi.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08008000
+else
+LD_FILES = boards/stm32h573xi.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+endif
diff --git a/ports/stm32/boards/STM32H573I_DK/pins.csv b/ports/stm32/boards/STM32H573I_DK/pins.csv
new file mode 100644
index 0000000000000..5672bc4922f4e
--- /dev/null
+++ b/ports/stm32/boards/STM32H573I_DK/pins.csv
@@ -0,0 +1,149 @@
+,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
+LED1,G11
+LED2,G2
+SW,PC13
+UART3_TX,PB10
+UART3_RX,PB11
diff --git a/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h b/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h
new file mode 100644
index 0000000000000..6b32ffb18508d
--- /dev/null
+++ b/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2023 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32H5XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32H5XX_HAL_CONF_H
+
+// Oscillator values in Hz
+#define HSE_VALUE (25000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+#include "boards/stm32h5xx_hal_conf_base.h"
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32H5XX_HAL_CONF_H

From 0908d00453e63560451edfd062a0d24face1c705 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jun 2023 14:43:35 +1000
Subject: [PATCH 0063/3129] tools/ci.sh: Add a H5 board to stm32 CI 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 eac0d52ffccf2..986fe8f074de8 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -358,6 +358,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=STM32H573I_DK
     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 47dc7d0130d583ce3c9426a82eabe0473ec1cfa5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 15 Jun 2023 12:19:57 +1000
Subject: [PATCH 0064/3129] esp32,esp8266: Allow Ctrl-C to interrupt the
 corrupt-fs while loop.

Commit c046b23ea29e0183c899a8dbe1da3bed3440a255 prevented frozen boot code
from being interrupted by Ctrl-C, but that means a corrupt filesystem will
forever lock up an esp32/esp8266 board.  This commit fixes that by
explicitly enabling Ctrl-C before running the forever loop.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modules/inisetup.py   | 4 ++++
 ports/esp8266/modules/inisetup.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py
index 35d1c6bc9a829..c8a33d5827cb5 100644
--- a/ports/esp32/modules/inisetup.py
+++ b/ports/esp32/modules/inisetup.py
@@ -17,6 +17,10 @@ def check_bootsec():
 
 def fs_corrupted():
     import time
+    import micropython
+
+    # Allow this loop to be stopped via Ctrl-C.
+    micropython.kbd_intr(3)
 
     while 1:
         print(
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index fa6a93fd83929..3f3edcf6d0af0 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -26,6 +26,10 @@ def check_bootsec():
 
 def fs_corrupted():
     import time
+    import micropython
+
+    # Allow this loop to be stopped via Ctrl-C.
+    micropython.kbd_intr(3)
 
     while 1:
         print(

From ed962f1f233eb74edf2cee83dc488d3cac5e02ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Jun 2023 12:08:34 +1000
Subject: [PATCH 0065/3129] tests/float: Test domain errors for more combos of
 args to math funcs.

Instead of having a special set of arguments to test for each math-module
function, just test all functions with all sets of arguments.  This gives
improved test cases to prevent regressions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/math_domain.py               | 107 +++++++++++++----------
 tests/float/math_domain_python311.py     |  26 ++++++
 tests/float/math_domain_python311.py.exp |   5 ++
 3 files changed, 94 insertions(+), 44 deletions(-)
 create mode 100644 tests/float/math_domain_python311.py
 create mode 100644 tests/float/math_domain_python311.py.exp

diff --git a/tests/float/math_domain.py b/tests/float/math_domain.py
index 606a655284c1a..26e883ea64877 100644
--- a/tests/float/math_domain.py
+++ b/tests/float/math_domain.py
@@ -10,25 +10,25 @@
 nan = float("nan")
 
 # single argument functions
-for name, f, args in (
-    ("fabs", math.fabs, ()),
-    ("ceil", math.ceil, ()),
-    ("floor", math.floor, ()),
-    ("trunc", math.trunc, ()),
-    ("sqrt", math.sqrt, (-1, 0)),
-    ("exp", math.exp, ()),
-    ("log", math.log, ()),
-    ("sin", math.sin, ()),
-    ("cos", math.cos, ()),
-    ("tan", math.tan, ()),
-    ("asin", math.asin, (-1.1, 1, 1.1)),
-    ("acos", math.acos, (-1.1, 1, 1.1)),
-    ("atan", math.atan, ()),
-    ("ldexp", lambda x: math.ldexp(x, 0), ()),
-    ("radians", math.radians, ()),
-    ("degrees", math.degrees, ()),
+for name, f in (
+    ("fabs", math.fabs),
+    ("ceil", math.ceil),
+    ("floor", math.floor),
+    ("trunc", math.trunc),
+    ("sqrt", math.sqrt),
+    ("exp", math.exp),
+    ("log", math.log),
+    ("sin", math.sin),
+    ("cos", math.cos),
+    ("tan", math.tan),
+    ("asin", math.asin),
+    ("acos", math.acos),
+    ("atan", math.atan),
+    ("ldexp", lambda x: math.ldexp(x, 0)),
+    ("radians", math.radians),
+    ("degrees", math.degrees),
 ):
-    for x in args + (inf, -inf, nan):
+    for x in (0, 1, 1.1, -1, -1.1, inf, -inf, nan):
         try:
             ans = "%.4f" % f(x)
         except ValueError:
@@ -38,35 +38,54 @@
         print("%s(%.4f) = %s" % (name, x, ans))
 
 # double argument functions
-for name, f, args in (
-    (
-        "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))),
-    ("copysign", math.copysign, ()),
+for name, f in (
+    ("pow", math.pow),
+    ("log", math.log),
+    ("fmod", math.fmod),
+    ("atan2", math.atan2),
+    ("copysign", math.copysign),
 ):
-    for x in args + ((0, inf), (inf, 0), (inf, inf), (inf, nan), (nan, inf), (nan, nan)):
+    for x in (
+        (0, 0),
+        (0, 2),
+        (0, -1),
+        (1, 0),
+        (1.2, 0),
+        (-1, 0),
+        (-1, 2),
+        (-1, 2.3),
+        (0, inf),
+        (0.5, inf),
+        (0.5, -inf),
+        (0.9, inf),
+        (0.9, -inf),
+        (1.2, inf),
+        (1.2, -inf),
+        (-0.5, inf),
+        (-0.5, -inf),
+        (-0.9, inf),
+        (-0.9, -inf),
+        (-1.2, inf),
+        (-1.2, -inf),
+        (inf, 0),
+        (inf, 1.2),
+        (inf, -1.2),
+        (inf, inf),
+        (inf, -inf),
+        (-inf, inf),
+        (-inf, -inf),
+        (0, nan),
+        (nan, 0),
+        (1, nan),
+        (nan, 1),
+        (inf, nan),
+        (nan, inf),
+        (nan, nan),
+    ):
         try:
             ans = "%.4f" % f(*x)
         except ValueError:
             ans = "ValueError"
+        except ZeroDivisionError:
+            ans = "ZeroDivisionError"
         print("%s(%.4f, %.4f) = %s" % (name, x[0], x[1], ans))
diff --git a/tests/float/math_domain_python311.py b/tests/float/math_domain_python311.py
new file mode 100644
index 0000000000000..f56fd55852288
--- /dev/null
+++ b/tests/float/math_domain_python311.py
@@ -0,0 +1,26 @@
+# Tests domain errors in math functions.
+# This is split out from math_domain.py because math.pow(0, -inf) was changed
+# in Python 3.11, and so this test requires a .py.exp file.
+# (See https://github.com/python/cpython/issues/88505)
+
+try:
+    import math
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+inf = float("inf")
+
+for name, f in (
+    ("pow", math.pow),
+    ("log", math.log),
+    ("fmod", math.fmod),
+    ("atan2", math.atan2),
+    ("copysign", math.copysign),
+):
+    for x in ((0, -inf),):
+        try:
+            ans = "%.4f" % f(*x)
+        except ValueError:
+            ans = "ValueError"
+        print("%s(%.4f, %.4f) = %s" % (name, x[0], x[1], ans))
diff --git a/tests/float/math_domain_python311.py.exp b/tests/float/math_domain_python311.py.exp
new file mode 100644
index 0000000000000..dfc93bb5104cd
--- /dev/null
+++ b/tests/float/math_domain_python311.py.exp
@@ -0,0 +1,5 @@
+pow(0.0000, -inf) = inf
+log(0.0000, -inf) = ValueError
+fmod(0.0000, -inf) = 0.0000
+atan2(0.0000, -inf) = 3.1416
+copysign(0.0000, -inf) = -0.0000

From 2fbc08c462e247e7f78460783c9a07c76c5b762e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jun 2023 15:51:50 +1000
Subject: [PATCH 0066/3129] extmod/asyncio: Rename uasyncio to asyncio.

The asyncio module now has much better CPython compatibility and
deserves to be just called "asyncio".

This will avoid people having to write `from uasyncio import asyncio`.

Renames all files, and updates port manifests to use the new path. Also
renames the built-in _uasyncio to _asyncio.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/{uasyncio => asyncio}/__init__.py      |  2 +-
 extmod/{uasyncio => asyncio}/core.py          |  4 +--
 extmod/{uasyncio => asyncio}/event.py         |  2 +-
 extmod/{uasyncio => asyncio}/funcs.py         |  2 +-
 extmod/{uasyncio => asyncio}/lock.py          |  2 +-
 extmod/{uasyncio => asyncio}/manifest.py      |  2 +-
 extmod/{uasyncio => asyncio}/stream.py        |  2 +-
 extmod/{uasyncio => asyncio}/task.py          |  2 +-
 extmod/extmod.cmake                           |  2 +-
 extmod/extmod.mk                              |  2 +-
 extmod/{moduasyncio.c => modasyncio.c}        | 32 +++++++++----------
 ports/esp32/boards/manifest.py                |  2 +-
 ports/esp8266/boards/GENERIC/manifest.py      |  4 +--
 .../esp8266/boards/GENERIC_1M/mpconfigboard.h |  2 +-
 .../boards/GENERIC_512K/mpconfigboard.h       |  2 +-
 ports/mimxrt/boards/manifest.py               |  2 +-
 ports/nrf/modules/manifest.py                 |  2 +-
 ports/renesas-ra/boards/manifest.py           |  2 +-
 ports/rp2/boards/manifest.py                  |  2 +-
 ports/samd/mcu/samd51/manifest.py             |  2 +-
 ports/samd/mpconfigport.h                     |  2 +-
 .../boards/NUCLEO_G474RE/mpconfigboard.h      |  2 +-
 ports/stm32/boards/manifest.py                |  2 +-
 ports/unix/variants/standard/manifest.py      |  2 +-
 ports/windows/msvc/sources.props              |  2 +-
 ports/windows/variants/dev/manifest.py        |  2 +-
 ports/windows/variants/dev/mpconfigvariant.h  |  4 +--
 py/mpconfig.h                                 |  4 +--
 28 files changed, 47 insertions(+), 47 deletions(-)
 rename extmod/{uasyncio => asyncio}/__init__.py (95%)
 rename extmod/{uasyncio => asyncio}/core.py (99%)
 rename extmod/{uasyncio => asyncio}/event.py (98%)
 rename extmod/{uasyncio => asyncio}/funcs.py (99%)
 rename extmod/{uasyncio => asyncio}/lock.py (98%)
 rename extmod/{uasyncio => asyncio}/manifest.py (94%)
 rename extmod/{uasyncio => asyncio}/stream.py (99%)
 rename extmod/{uasyncio => asyncio}/task.py (99%)
 rename extmod/{moduasyncio.c => modasyncio.c} (91%)

diff --git a/extmod/uasyncio/__init__.py b/extmod/asyncio/__init__.py
similarity index 95%
rename from extmod/uasyncio/__init__.py
rename to extmod/asyncio/__init__.py
index 373de52af4642..1f83750c5aafa 100644
--- a/extmod/uasyncio/__init__.py
+++ b/extmod/asyncio/__init__.py
@@ -1,4 +1,4 @@
-# MicroPython uasyncio module
+# MicroPython asyncio module
 # MIT license; Copyright (c) 2019 Damien P. George
 
 from .core import *
diff --git a/extmod/uasyncio/core.py b/extmod/asyncio/core.py
similarity index 99%
rename from extmod/uasyncio/core.py
rename to extmod/asyncio/core.py
index f191d202e2361..be5119ba6118a 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/asyncio/core.py
@@ -1,4 +1,4 @@
-# MicroPython uasyncio module
+# MicroPython asyncio module
 # MIT license; Copyright (c) 2019 Damien P. George
 
 from time import ticks_ms as ticks, ticks_diff, ticks_add
@@ -6,7 +6,7 @@
 
 # Import TaskQueue and Task, preferring built-in C code over Python code
 try:
-    from _uasyncio import TaskQueue, Task
+    from _asyncio import TaskQueue, Task
 except:
     from .task import TaskQueue, Task
 
diff --git a/extmod/uasyncio/event.py b/extmod/asyncio/event.py
similarity index 98%
rename from extmod/uasyncio/event.py
rename to extmod/asyncio/event.py
index 8a9053459072e..e0b41f7324244 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/asyncio/event.py
@@ -1,4 +1,4 @@
-# MicroPython uasyncio module
+# MicroPython asyncio module
 # MIT license; Copyright (c) 2019-2020 Damien P. George
 
 from . import core
diff --git a/extmod/uasyncio/funcs.py b/extmod/asyncio/funcs.py
similarity index 99%
rename from extmod/uasyncio/funcs.py
rename to extmod/asyncio/funcs.py
index dc52ad3958bf3..599091dfbdc2b 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/asyncio/funcs.py
@@ -1,4 +1,4 @@
-# MicroPython uasyncio module
+# MicroPython asyncio module
 # MIT license; Copyright (c) 2019-2022 Damien P. George
 
 from . import core
diff --git a/extmod/uasyncio/lock.py b/extmod/asyncio/lock.py
similarity index 98%
rename from extmod/uasyncio/lock.py
rename to extmod/asyncio/lock.py
index 85a9437b4fe8b..0a46ac32619d0 100644
--- a/extmod/uasyncio/lock.py
+++ b/extmod/asyncio/lock.py
@@ -1,4 +1,4 @@
-# MicroPython uasyncio module
+# MicroPython asyncio module
 # MIT license; Copyright (c) 2019-2020 Damien P. George
 
 from . import core
diff --git a/extmod/uasyncio/manifest.py b/extmod/asyncio/manifest.py
similarity index 94%
rename from extmod/uasyncio/manifest.py
rename to extmod/asyncio/manifest.py
index d425a467b3afa..0aba5b1856ceb 100644
--- a/extmod/uasyncio/manifest.py
+++ b/extmod/asyncio/manifest.py
@@ -1,7 +1,7 @@
 # This list of package files doesn't include task.py because that's provided
 # by the C module.
 package(
-    "uasyncio",
+    "asyncio",
     (
         "__init__.py",
         "core.py",
diff --git a/extmod/uasyncio/stream.py b/extmod/asyncio/stream.py
similarity index 99%
rename from extmod/uasyncio/stream.py
rename to extmod/asyncio/stream.py
index ac297cce04d79..c47c48cf09823 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/asyncio/stream.py
@@ -1,4 +1,4 @@
-# MicroPython uasyncio module
+# MicroPython asyncio module
 # MIT license; Copyright (c) 2019-2020 Damien P. George
 
 from . import core
diff --git a/extmod/uasyncio/task.py b/extmod/asyncio/task.py
similarity index 99%
rename from extmod/uasyncio/task.py
rename to extmod/asyncio/task.py
index 4ead2a1308437..30be2170eb0a7 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/asyncio/task.py
@@ -1,4 +1,4 @@
-# MicroPython uasyncio module
+# MicroPython asyncio module
 # MIT license; Copyright (c) 2019-2020 Damien P. George
 
 # This file contains the core TaskQueue based on a pairing heap, and the core Task class.
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 59f07b8ae49f4..67f33cf91f89b 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -19,7 +19,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modlwip.c
     ${MICROPY_EXTMOD_DIR}/modnetwork.c
     ${MICROPY_EXTMOD_DIR}/modonewire.c
-    ${MICROPY_EXTMOD_DIR}/moduasyncio.c
+    ${MICROPY_EXTMOD_DIR}/modasyncio.c
     ${MICROPY_EXTMOD_DIR}/modbinascii.c
     ${MICROPY_EXTMOD_DIR}/modcryptolib.c
     ${MICROPY_EXTMOD_DIR}/moductypes.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index c544e8179231d..41d200fce4954 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -11,6 +11,7 @@ SRC_EXTMOD_C += \
 	extmod/machine_signal.c \
 	extmod/machine_spi.c \
 	extmod/machine_timer.c \
+	extmod/modasyncio.c \
 	extmod/modbinascii.c \
 	extmod/modbluetooth.c \
 	extmod/modbtree.c \
@@ -31,7 +32,6 @@ SRC_EXTMOD_C += \
 	extmod/modssl_axtls.c \
 	extmod/modssl_mbedtls.c \
 	extmod/modtime.c \
-	extmod/moduasyncio.c \
 	extmod/moductypes.c \
 	extmod/modwebrepl.c \
 	extmod/modwebsocket.c \
diff --git a/extmod/moduasyncio.c b/extmod/modasyncio.c
similarity index 91%
rename from extmod/moduasyncio.c
rename to extmod/modasyncio.c
index c05a8dfc60979..a6a54eba8765a 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/modasyncio.c
@@ -29,7 +29,7 @@
 #include "py/pairheap.h"
 #include "py/mphal.h"
 
-#if MICROPY_PY_UASYNCIO
+#if MICROPY_PY_ASYNCIO
 
 // Used when task cannot be guaranteed to be non-NULL.
 #define TASK_PAIRHEAP(task) ((task) ? &(task)->pairheap : NULL)
@@ -155,8 +155,8 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // Task class
 
-// This is the core uasyncio context with cur_task, _task_queue and CancelledError.
-STATIC mp_obj_t uasyncio_context = MP_OBJ_NULL;
+// This is the core asyncio context with cur_task, _task_queue and CancelledError.
+STATIC mp_obj_t asyncio_context = MP_OBJ_NULL;
 
 STATIC mp_obj_t task_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);
@@ -168,7 +168,7 @@ STATIC mp_obj_t task_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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];
+        asyncio_context = args[1];
     }
     return MP_OBJ_FROM_PTR(self);
 }
@@ -186,7 +186,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
         return mp_const_false;
     }
     // Can't cancel self (not supported yet).
-    mp_obj_t cur_task = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
+    mp_obj_t cur_task = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
     if (self_in == cur_task) {
         mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("can't cancel self"));
     }
@@ -195,7 +195,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
         self = MP_OBJ_TO_PTR(self->data);
     }
 
-    mp_obj_t _task_queue = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__task_queue));
+    mp_obj_t _task_queue = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__task_queue));
 
     // Reschedule Task as a cancelled task.
     mp_obj_t dest[3];
@@ -218,7 +218,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
         task_queue_push(2, dest);
     }
 
-    self->data = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_CancelledError));
+    self->data = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_CancelledError));
 
     return mp_const_true;
 }
@@ -278,7 +278,7 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
         nlr_raise(self->data);
     } 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 cur_task = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
         mp_obj_t args[2] = { self->state, cur_task };
         task_queue_push(2, args);
         // Set calling task's data to this task that it waits on, to double-link it.
@@ -302,20 +302,20 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 /******************************************************************************/
-// C-level uasyncio module
+// C-level asyncio module
 
-STATIC const mp_rom_map_elem_t mp_module_uasyncio_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__uasyncio) },
+STATIC const mp_rom_map_elem_t mp_module_asyncio_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__asyncio) },
     { MP_ROM_QSTR(MP_QSTR_TaskQueue), MP_ROM_PTR(&task_queue_type) },
     { MP_ROM_QSTR(MP_QSTR_Task), MP_ROM_PTR(&task_type) },
 };
-STATIC MP_DEFINE_CONST_DICT(mp_module_uasyncio_globals, mp_module_uasyncio_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_asyncio_globals, mp_module_asyncio_globals_table);
 
-const mp_obj_module_t mp_module_uasyncio = {
+const mp_obj_module_t mp_module_asyncio = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uasyncio_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_asyncio_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR__uasyncio, mp_module_uasyncio);
+MP_REGISTER_MODULE(MP_QSTR__asyncio, mp_module_asyncio);
 
-#endif // MICROPY_PY_UASYNCIO
+#endif // MICROPY_PY_ASYNCIO
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index fa851b5eeaa7a..290d98c4e499c 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,5 +1,5 @@
 freeze("$(PORT_DIR)/modules")
-include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/extmod/asyncio")
 
 # Useful networking-related packages.
 require("bundle-networking")
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index ef708846241fa..fd9c41dc5423f 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -1,8 +1,8 @@
 # base modules
 include("$(PORT_DIR)/boards/manifest.py")
 
-# uasyncio
-include("$(MPY_DIR)/extmod/uasyncio")
+# asyncio
+include("$(MPY_DIR)/extmod/asyncio")
 
 # drivers
 require("ssd1306")
diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
index f811f70592fdd..41752e692b315 100644
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
@@ -13,5 +13,5 @@
 
 #define MICROPY_PY_FSTRINGS             (0)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#define MICROPY_PY_UASYNCIO             (0)
+#define MICROPY_PY_ASYNCIO              (0)
 #define MICROPY_PY_CRYPTOLIB            (1)
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
index fc933cd3eb43b..c29e23d5ad114 100644
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
@@ -8,6 +8,6 @@
 #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_ASYNCIO              (0)
 #define MICROPY_PY_RE_SUB               (0)
 #define MICROPY_PY_FRAMEBUF             (0)
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index e4e5a236a3578..d7acab38373f0 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -1,5 +1,5 @@
 freeze("$(PORT_DIR)/modules")
-include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/extmod/asyncio")
 require("onewire")
 require("ds18x20")
 require("dht")
diff --git a/ports/nrf/modules/manifest.py b/ports/nrf/modules/manifest.py
index 6efaf62d79d69..7ba0f80d884d0 100644
--- a/ports/nrf/modules/manifest.py
+++ b/ports/nrf/modules/manifest.py
@@ -1,2 +1,2 @@
 module("_mkfs.py", base_path="$(PORT_DIR)/modules/scripts", opt=3)
-include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/extmod/asyncio")
diff --git a/ports/renesas-ra/boards/manifest.py b/ports/renesas-ra/boards/manifest.py
index 01699c3d6e6ad..c650136f6648c 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)/extmod/asyncio")
 require("dht")
 require("onewire")
 require("sdcard")
diff --git a/ports/rp2/boards/manifest.py b/ports/rp2/boards/manifest.py
index e62d02f30857c..92260f798aeaf 100644
--- a/ports/rp2/boards/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,5 +1,5 @@
 freeze("$(PORT_DIR)/modules")
-include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/extmod/asyncio")
 require("onewire")
 require("ds18x20")
 require("dht")
diff --git a/ports/samd/mcu/samd51/manifest.py b/ports/samd/mcu/samd51/manifest.py
index 4a79f6818f8b9..2a19a843f8a9b 100644
--- a/ports/samd/mcu/samd51/manifest.py
+++ b/ports/samd/mcu/samd51/manifest.py
@@ -1,5 +1,5 @@
 include("$(PORT_DIR)/boards/manifest.py")
-include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/extmod/asyncio")
 require("onewire")
 require("ds18x20")
 require("dht")
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 8a9947468e53a..7bf4acb84eb39 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -92,7 +92,7 @@
 #define MICROPY_PY_HEAPQ                    (1)
 #define MICROPY_PY_RANDOM                   (1)
 #define MICROPY_PY_ZLIB                     (1)
-#define MICROPY_PY_UASYNCIO                 (1)
+#define MICROPY_PY_ASYNCIO                  (1)
 #define MICROPY_PY_MACHINE_RTC              (1)
 #ifndef MICROPY_PY_MACHINE_ADC
 #define MICROPY_PY_MACHINE_ADC              (1)
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
index 336d95c42c62f..e10f63da73216 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
@@ -9,7 +9,7 @@
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_FLASH        (0) // QSPI extflash not mounted
 
-#define MICROPY_PY_UASYNCIO         (0)
+#define MICROPY_PY_ASYNCIO          (0)
 #define MICROPY_PY_ZLIB             (0)
 #define MICROPY_PY_BINASCII         (0)
 #define MICROPY_PY_HASHLIB          (0)
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index e6b77f8ab335d..4f38179713ea6 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)/extmod/asyncio")
 
 require("dht")
 require("onewire")
diff --git a/ports/unix/variants/standard/manifest.py b/ports/unix/variants/standard/manifest.py
index dd521258e1ac1..d27bf3c47fe92 100644
--- a/ports/unix/variants/standard/manifest.py
+++ b/ports/unix/variants/standard/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/variants/manifest.py")
 
-include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/extmod/asyncio")
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index 18d053b811d25..6277b74e20cc1 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -7,7 +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\modasyncio.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modbinascii.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
diff --git a/ports/windows/variants/dev/manifest.py b/ports/windows/variants/dev/manifest.py
index f65a3d35e9d15..d5d9cc7959ebb 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")
+include("$(MPY_DIR)/extmod/asyncio")
diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h
index d6ce7bf36f9d9..70a4a4d045257 100644
--- a/ports/windows/variants/dev/mpconfigvariant.h
+++ b/ports/windows/variants/dev/mpconfigvariant.h
@@ -38,6 +38,6 @@
 #define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
 #define MICROPY_PY_SELECT                       (1)
 
-#ifndef MICROPY_PY_UASYNCIO
-#define MICROPY_PY_UASYNCIO                     (1)
+#ifndef MICROPY_PY_ASYNCIO
+#define MICROPY_PY_ASYNCIO                      (1)
 #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 831fd534fd462..2bbe3849b0517 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1541,8 +1541,8 @@ typedef double mp_float_t;
 
 // Extended modules
 
-#ifndef MICROPY_PY_UASYNCIO
-#define MICROPY_PY_UASYNCIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#ifndef MICROPY_PY_ASYNCIO
+#define MICROPY_PY_ASYNCIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_UCTYPES

From 6027c41c8f5b8f1a9e7b85b2bb93b3e6f2718e54 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jun 2023 16:01:38 +1000
Subject: [PATCH 0067/3129] tests: Rename uasyncio to asyncio.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ...o_await_return.py => asyncio_await_return.py} |  9 +++------
 ...return.py.exp => asyncio_await_return.py.exp} |  0
 .../{uasyncio_basic.py => asyncio_basic.py}      |  9 +++------
 ...asyncio_basic.py.exp => asyncio_basic.py.exp} |  0
 .../{uasyncio_basic2.py => asyncio_basic2.py}    |  9 +++------
 ...yncio_basic2.py.exp => asyncio_basic2.py.exp} |  0
 ...cio_cancel_fair.py => asyncio_cancel_fair.py} |  9 +++------
 ...el_fair.py.exp => asyncio_cancel_fair.py.exp} |  0
 ...o_cancel_fair2.py => asyncio_cancel_fair2.py} |  9 +++------
 ..._fair2.py.exp => asyncio_cancel_fair2.py.exp} |  0
 ...cio_cancel_self.py => asyncio_cancel_self.py} |  9 +++------
 ...el_self.py.exp => asyncio_cancel_self.py.exp} |  0
 ...cio_cancel_task.py => asyncio_cancel_task.py} |  9 +++------
 ...el_task.py.exp => asyncio_cancel_task.py.exp} |  0
 ...hed.py => asyncio_cancel_wait_on_finished.py} |  9 +++------
 ...xp => asyncio_cancel_wait_on_finished.py.exp} |  0
 ...o_current_task.py => asyncio_current_task.py} |  9 +++------
 ...t_task.py.exp => asyncio_current_task.py.exp} |  0
 .../{uasyncio_event.py => asyncio_event.py}      |  9 +++------
 ...asyncio_event.py.exp => asyncio_event.py.exp} |  0
 ...yncio_event_fair.py => asyncio_event_fair.py} |  9 +++------
 ...ent_fair.py.exp => asyncio_event_fair.py.exp} |  0
 ...asyncio_exception.py => asyncio_exception.py} |  9 +++------
 ...exception.py.exp => asyncio_exception.py.exp} |  0
 .../extmod/{uasyncio_fair.py => asyncio_fair.py} |  9 +++------
 ...{uasyncio_fair.py.exp => asyncio_fair.py.exp} |  0
 .../{uasyncio_gather.py => asyncio_gather.py}    | 11 ++++-------
 ...yncio_gather.py.exp => asyncio_gather.py.exp} |  0
 ...ther_notimpl.py => asyncio_gather_notimpl.py} | 11 ++++-------
 ...impl.py.exp => asyncio_gather_notimpl.py.exp} |  0
 ...t_event_loop.py => asyncio_get_event_loop.py} |  9 +++------
 ...{uasyncio_heaplock.py => asyncio_heaplock.py} | 11 ++++-------
 ...o_heaplock.py.exp => asyncio_heaplock.py.exp} |  0
 .../extmod/{uasyncio_lock.py => asyncio_lock.py} |  9 +++------
 ...{uasyncio_lock.py.exp => asyncio_lock.py.exp} |  0
 ...cio_lock_cancel.py => asyncio_lock_cancel.py} |  9 +++------
 ..._cancel.py.exp => asyncio_lock_cancel.py.exp} |  0
 ...asyncio_loop_stop.py => asyncio_loop_stop.py} |  9 +++------
 ...loop_stop.py.exp => asyncio_loop_stop.py.exp} |  0
 ...cio_micropython.py => asyncio_micropython.py} | 16 ++++++++--------
 ...opython.py.exp => asyncio_micropython.py.exp} |  0
 ...w_event_loop.py => asyncio_new_event_loop.py} |  9 +++------
 ...loop.py.exp => asyncio_new_event_loop.py.exp} |  0
 ...ndler.py => asyncio_set_exception_handler.py} |  9 +++------
 ....exp => asyncio_set_exception_handler.py.exp} |  0
 ...asyncio_task_done.py => asyncio_task_done.py} |  9 +++------
 ...task_done.py.exp => asyncio_task_done.py.exp} |  0
 ...readsafeflag.py => asyncio_threadsafeflag.py} |  2 +-
 ...flag.py.exp => asyncio_threadsafeflag.py.exp} |  0
 ...{uasyncio_wait_for.py => asyncio_wait_for.py} |  9 +++------
 ...o_wait_for.py.exp => asyncio_wait_for.py.exp} |  0
 ...o_wait_for_fwd.py => asyncio_wait_for_fwd.py} |  9 +++------
 ...or_fwd.py.exp => asyncio_wait_for_fwd.py.exp} |  0
 ...asyncio_wait_task.py => asyncio_wait_task.py} |  9 +++------
 ...wait_task.py.exp => asyncio_wait_task.py.exp} |  0
 ...0_uasyncio_client.py => 80_asyncio_client.py} |  2 +-
 ...io_client.py.exp => 80_asyncio_client.py.exp} |  0
 ...1_uasyncio_server.py => 81_asyncio_server.py} |  2 +-
 ...io_server.py.exp => 81_asyncio_server.py.exp} |  0
 ...p_client_rst.py => asyncio_tcp_client_rst.py} |  9 +++------
 ..._rst.py.exp => asyncio_tcp_client_rst.py.exp} |  0
 ...close_write.py => asyncio_tcp_close_write.py} | 11 ++++-------
 ...ite.py.exp => asyncio_tcp_close_write.py.exp} |  0
 ...cio_tcp_readall.py => asyncio_tcp_readall.py} | 11 ++++-------
 ...readall.py.exp => asyncio_tcp_readall.py.exp} |  0
 ...readexactly.py => asyncio_tcp_readexactly.py} | 11 ++++-------
 ...tly.py.exp => asyncio_tcp_readexactly.py.exp} |  0
 ...o_tcp_readinto.py => asyncio_tcp_readinto.py} | 11 ++++-------
 ...adinto.py.exp => asyncio_tcp_readinto.py.exp} |  0
 ...er_client.py => asyncio_tcp_server_client.py} | 11 ++++-------
 ...t.py.exp => asyncio_tcp_server_client.py.exp} |  0
 ...o_start_server.py => asyncio_start_server.py} | 11 ++++-------
 ...server.py.exp => asyncio_start_server.py.exp} |  0
 ...cancel_stream.py => asyncio_cancel_stream.py} |  9 +++------
 ...tream.py.exp => asyncio_cancel_stream.py.exp} |  0
 ..._connection.py => asyncio_open_connection.py} | 11 ++++-------
 ...ion.py.exp => asyncio_open_connection.py.exp} |  0
 ...ad_headers.py => asyncio_tcp_read_headers.py} | 11 ++++-------
 ...rs.py.exp => asyncio_tcp_read_headers.py.exp} |  0
 tests/run-tests.py                               | 10 +++++-----
 tests/unix/extra_coverage.py.exp                 |  2 +-
 81 files changed, 136 insertions(+), 244 deletions(-)
 rename tests/extmod/{uasyncio_await_return.py => asyncio_await_return.py} (70%)
 rename tests/extmod/{uasyncio_await_return.py.exp => asyncio_await_return.py.exp} (100%)
 rename tests/extmod/{uasyncio_basic.py => asyncio_basic.py} (85%)
 rename tests/extmod/{uasyncio_basic.py.exp => asyncio_basic.py.exp} (100%)
 rename tests/extmod/{uasyncio_basic2.py => asyncio_basic2.py} (67%)
 rename tests/extmod/{uasyncio_basic2.py.exp => asyncio_basic2.py.exp} (100%)
 rename tests/extmod/{uasyncio_cancel_fair.py => asyncio_cancel_fair.py} (84%)
 rename tests/extmod/{uasyncio_cancel_fair.py.exp => asyncio_cancel_fair.py.exp} (100%)
 rename tests/extmod/{uasyncio_cancel_fair2.py => asyncio_cancel_fair2.py} (82%)
 rename tests/extmod/{uasyncio_cancel_fair2.py.exp => asyncio_cancel_fair2.py.exp} (100%)
 rename tests/extmod/{uasyncio_cancel_self.py => asyncio_cancel_self.py} (76%)
 rename tests/extmod/{uasyncio_cancel_self.py.exp => asyncio_cancel_self.py.exp} (100%)
 rename tests/extmod/{uasyncio_cancel_task.py => asyncio_cancel_task.py} (93%)
 rename tests/extmod/{uasyncio_cancel_task.py.exp => asyncio_cancel_task.py.exp} (100%)
 rename tests/extmod/{uasyncio_cancel_wait_on_finished.py => asyncio_cancel_wait_on_finished.py} (83%)
 rename tests/extmod/{uasyncio_cancel_wait_on_finished.py.exp => asyncio_cancel_wait_on_finished.py.exp} (100%)
 rename tests/extmod/{uasyncio_current_task.py => asyncio_current_task.py} (69%)
 rename tests/extmod/{uasyncio_current_task.py.exp => asyncio_current_task.py.exp} (100%)
 rename tests/extmod/{uasyncio_event.py => asyncio_event.py} (93%)
 rename tests/extmod/{uasyncio_event.py.exp => asyncio_event.py.exp} (100%)
 rename tests/extmod/{uasyncio_event_fair.py => asyncio_event_fair.py} (83%)
 rename tests/extmod/{uasyncio_event_fair.py.exp => asyncio_event_fair.py.exp} (100%)
 rename tests/extmod/{uasyncio_exception.py => asyncio_exception.py} (88%)
 rename tests/extmod/{uasyncio_exception.py.exp => asyncio_exception.py.exp} (100%)
 rename tests/extmod/{uasyncio_fair.py => asyncio_fair.py} (80%)
 rename tests/extmod/{uasyncio_fair.py.exp => asyncio_fair.py.exp} (100%)
 rename tests/extmod/{uasyncio_gather.py => asyncio_gather.py} (94%)
 rename tests/extmod/{uasyncio_gather.py.exp => asyncio_gather.py.exp} (100%)
 rename tests/extmod/{uasyncio_gather_notimpl.py => asyncio_gather_notimpl.py} (85%)
 rename tests/extmod/{uasyncio_gather_notimpl.py.exp => asyncio_gather_notimpl.py.exp} (100%)
 rename tests/extmod/{uasyncio_get_event_loop.py => asyncio_get_event_loop.py} (60%)
 rename tests/extmod/{uasyncio_heaplock.py => asyncio_heaplock.py} (92%)
 rename tests/extmod/{uasyncio_heaplock.py.exp => asyncio_heaplock.py.exp} (100%)
 rename tests/extmod/{uasyncio_lock.py => asyncio_lock.py} (94%)
 rename tests/extmod/{uasyncio_lock.py.exp => asyncio_lock.py.exp} (100%)
 rename tests/extmod/{uasyncio_lock_cancel.py => asyncio_lock_cancel.py} (90%)
 rename tests/extmod/{uasyncio_lock_cancel.py.exp => asyncio_lock_cancel.py.exp} (100%)
 rename tests/extmod/{uasyncio_loop_stop.py => asyncio_loop_stop.py} (83%)
 rename tests/extmod/{uasyncio_loop_stop.py.exp => asyncio_loop_stop.py.exp} (100%)
 rename tests/extmod/{uasyncio_micropython.py => asyncio_micropython.py} (66%)
 rename tests/extmod/{uasyncio_micropython.py.exp => asyncio_micropython.py.exp} (100%)
 rename tests/extmod/{uasyncio_new_event_loop.py => asyncio_new_event_loop.py} (80%)
 rename tests/extmod/{uasyncio_new_event_loop.py.exp => asyncio_new_event_loop.py.exp} (100%)
 rename tests/extmod/{uasyncio_set_exception_handler.py => asyncio_set_exception_handler.py} (90%)
 rename tests/extmod/{uasyncio_set_exception_handler.py.exp => asyncio_set_exception_handler.py.exp} (100%)
 rename tests/extmod/{uasyncio_task_done.py => asyncio_task_done.py} (89%)
 rename tests/extmod/{uasyncio_task_done.py.exp => asyncio_task_done.py.exp} (100%)
 rename tests/extmod/{uasyncio_threadsafeflag.py => asyncio_threadsafeflag.py} (98%)
 rename tests/extmod/{uasyncio_threadsafeflag.py.exp => asyncio_threadsafeflag.py.exp} (100%)
 rename tests/extmod/{uasyncio_wait_for.py => asyncio_wait_for.py} (96%)
 rename tests/extmod/{uasyncio_wait_for.py.exp => asyncio_wait_for.py.exp} (100%)
 rename tests/extmod/{uasyncio_wait_for_fwd.py => asyncio_wait_for_fwd.py} (91%)
 rename tests/extmod/{uasyncio_wait_for_fwd.py.exp => asyncio_wait_for_fwd.py.exp} (100%)
 rename tests/extmod/{uasyncio_wait_task.py => asyncio_wait_task.py} (90%)
 rename tests/extmod/{uasyncio_wait_task.py.exp => asyncio_wait_task.py.exp} (100%)
 rename tests/multi_espnow/{80_uasyncio_client.py => 80_asyncio_client.py} (98%)
 rename tests/multi_espnow/{80_uasyncio_client.py.exp => 80_asyncio_client.py.exp} (100%)
 rename tests/multi_espnow/{81_uasyncio_server.py => 81_asyncio_server.py} (98%)
 rename tests/multi_espnow/{81_uasyncio_server.py.exp => 81_asyncio_server.py.exp} (100%)
 rename tests/multi_net/{uasyncio_tcp_client_rst.py => asyncio_tcp_client_rst.py} (90%)
 rename tests/multi_net/{uasyncio_tcp_client_rst.py.exp => asyncio_tcp_client_rst.py.exp} (100%)
 rename tests/multi_net/{uasyncio_tcp_close_write.py => asyncio_tcp_close_write.py} (87%)
 rename tests/multi_net/{uasyncio_tcp_close_write.py.exp => asyncio_tcp_close_write.py.exp} (100%)
 rename tests/multi_net/{uasyncio_tcp_readall.py => asyncio_tcp_readall.py} (84%)
 rename tests/multi_net/{uasyncio_tcp_readall.py.exp => asyncio_tcp_readall.py.exp} (100%)
 rename tests/multi_net/{uasyncio_tcp_readexactly.py => asyncio_tcp_readexactly.py} (86%)
 rename tests/multi_net/{uasyncio_tcp_readexactly.py.exp => asyncio_tcp_readexactly.py.exp} (100%)
 rename tests/multi_net/{uasyncio_tcp_readinto.py => asyncio_tcp_readinto.py} (86%)
 rename tests/multi_net/{uasyncio_tcp_readinto.py.exp => asyncio_tcp_readinto.py.exp} (100%)
 rename tests/multi_net/{uasyncio_tcp_server_client.py => asyncio_tcp_server_client.py} (83%)
 rename tests/multi_net/{uasyncio_tcp_server_client.py.exp => asyncio_tcp_server_client.py.exp} (100%)
 rename tests/net_hosted/{uasyncio_start_server.py => asyncio_start_server.py} (72%)
 rename tests/net_hosted/{uasyncio_start_server.py.exp => asyncio_start_server.py.exp} (100%)
 rename tests/net_inet/{uasyncio_cancel_stream.py => asyncio_cancel_stream.py} (81%)
 rename tests/net_inet/{uasyncio_cancel_stream.py.exp => asyncio_cancel_stream.py.exp} (100%)
 rename tests/net_inet/{uasyncio_open_connection.py => asyncio_open_connection.py} (69%)
 rename tests/net_inet/{uasyncio_open_connection.py.exp => asyncio_open_connection.py.exp} (100%)
 rename tests/net_inet/{uasyncio_tcp_read_headers.py => asyncio_tcp_read_headers.py} (77%)
 rename tests/net_inet/{uasyncio_tcp_read_headers.py.exp => asyncio_tcp_read_headers.py.exp} (100%)

diff --git a/tests/extmod/uasyncio_await_return.py b/tests/extmod/asyncio_await_return.py
similarity index 70%
rename from tests/extmod/uasyncio_await_return.py
rename to tests/extmod/asyncio_await_return.py
index d375c9ea97ab3..35f214b99a9ff 100644
--- a/tests/extmod/uasyncio_await_return.py
+++ b/tests/extmod/asyncio_await_return.py
@@ -1,13 +1,10 @@
 # Test that tasks return their value correctly to the caller
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def foo():
diff --git a/tests/extmod/uasyncio_await_return.py.exp b/tests/extmod/asyncio_await_return.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_await_return.py.exp
rename to tests/extmod/asyncio_await_return.py.exp
diff --git a/tests/extmod/uasyncio_basic.py b/tests/extmod/asyncio_basic.py
similarity index 85%
rename from tests/extmod/uasyncio_basic.py
rename to tests/extmod/asyncio_basic.py
index 3858e4fdd52f1..ca37c7bcb0212 100644
--- a/tests/extmod/uasyncio_basic.py
+++ b/tests/extmod/asyncio_basic.py
@@ -1,11 +1,8 @@
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 import time
 
diff --git a/tests/extmod/uasyncio_basic.py.exp b/tests/extmod/asyncio_basic.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_basic.py.exp
rename to tests/extmod/asyncio_basic.py.exp
diff --git a/tests/extmod/uasyncio_basic2.py b/tests/extmod/asyncio_basic2.py
similarity index 67%
rename from tests/extmod/uasyncio_basic2.py
rename to tests/extmod/asyncio_basic2.py
index a2167e48ee1a7..3040b6aa51b77 100644
--- a/tests/extmod/uasyncio_basic2.py
+++ b/tests/extmod/asyncio_basic2.py
@@ -1,11 +1,8 @@
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def forever():
diff --git a/tests/extmod/uasyncio_basic2.py.exp b/tests/extmod/asyncio_basic2.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_basic2.py.exp
rename to tests/extmod/asyncio_basic2.py.exp
diff --git a/tests/extmod/uasyncio_cancel_fair.py b/tests/extmod/asyncio_cancel_fair.py
similarity index 84%
rename from tests/extmod/uasyncio_cancel_fair.py
rename to tests/extmod/asyncio_cancel_fair.py
index 9a7b35c1618af..a1e35f82ba6e0 100644
--- a/tests/extmod/uasyncio_cancel_fair.py
+++ b/tests/extmod/asyncio_cancel_fair.py
@@ -2,13 +2,10 @@
 # That tasks which continuously cancel each other don't take over the scheduler
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, other):
diff --git a/tests/extmod/uasyncio_cancel_fair.py.exp b/tests/extmod/asyncio_cancel_fair.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_cancel_fair.py.exp
rename to tests/extmod/asyncio_cancel_fair.py.exp
diff --git a/tests/extmod/uasyncio_cancel_fair2.py b/tests/extmod/asyncio_cancel_fair2.py
similarity index 82%
rename from tests/extmod/uasyncio_cancel_fair2.py
rename to tests/extmod/asyncio_cancel_fair2.py
index 46e40f71b15ca..577823204fa22 100644
--- a/tests/extmod/uasyncio_cancel_fair2.py
+++ b/tests/extmod/asyncio_cancel_fair2.py
@@ -2,13 +2,10 @@
 # That tasks which keeps being cancelled by multiple other tasks gets a chance to run
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task_a():
diff --git a/tests/extmod/uasyncio_cancel_fair2.py.exp b/tests/extmod/asyncio_cancel_fair2.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_cancel_fair2.py.exp
rename to tests/extmod/asyncio_cancel_fair2.py.exp
diff --git a/tests/extmod/uasyncio_cancel_self.py b/tests/extmod/asyncio_cancel_self.py
similarity index 76%
rename from tests/extmod/uasyncio_cancel_self.py
rename to tests/extmod/asyncio_cancel_self.py
index 660ae66389366..a437edb5403ab 100644
--- a/tests/extmod/uasyncio_cancel_self.py
+++ b/tests/extmod/asyncio_cancel_self.py
@@ -1,13 +1,10 @@
 # Test a task cancelling itself (currently unsupported)
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task():
diff --git a/tests/extmod/uasyncio_cancel_self.py.exp b/tests/extmod/asyncio_cancel_self.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_cancel_self.py.exp
rename to tests/extmod/asyncio_cancel_self.py.exp
diff --git a/tests/extmod/uasyncio_cancel_task.py b/tests/extmod/asyncio_cancel_task.py
similarity index 93%
rename from tests/extmod/uasyncio_cancel_task.py
rename to tests/extmod/asyncio_cancel_task.py
index ec60d85545740..9250f46b51c47 100644
--- a/tests/extmod/uasyncio_cancel_task.py
+++ b/tests/extmod/asyncio_cancel_task.py
@@ -1,13 +1,10 @@
 # Test cancelling a task
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(s, allow_cancel):
diff --git a/tests/extmod/uasyncio_cancel_task.py.exp b/tests/extmod/asyncio_cancel_task.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_cancel_task.py.exp
rename to tests/extmod/asyncio_cancel_task.py.exp
diff --git a/tests/extmod/uasyncio_cancel_wait_on_finished.py b/tests/extmod/asyncio_cancel_wait_on_finished.py
similarity index 83%
rename from tests/extmod/uasyncio_cancel_wait_on_finished.py
rename to tests/extmod/asyncio_cancel_wait_on_finished.py
index 66b36dd60d42b..c3529b8d7aa63 100644
--- a/tests/extmod/uasyncio_cancel_wait_on_finished.py
+++ b/tests/extmod/asyncio_cancel_wait_on_finished.py
@@ -1,13 +1,10 @@
 # Test cancelling a task that is waiting on a task that just finishes.
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def sleep_task():
diff --git a/tests/extmod/uasyncio_cancel_wait_on_finished.py.exp b/tests/extmod/asyncio_cancel_wait_on_finished.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_cancel_wait_on_finished.py.exp
rename to tests/extmod/asyncio_cancel_wait_on_finished.py.exp
diff --git a/tests/extmod/uasyncio_current_task.py b/tests/extmod/asyncio_current_task.py
similarity index 69%
rename from tests/extmod/uasyncio_current_task.py
rename to tests/extmod/asyncio_current_task.py
index 3165a2cf16a7e..18058230f2d90 100644
--- a/tests/extmod/uasyncio_current_task.py
+++ b/tests/extmod/asyncio_current_task.py
@@ -1,13 +1,10 @@
 # Test current_task() function
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(result):
diff --git a/tests/extmod/uasyncio_current_task.py.exp b/tests/extmod/asyncio_current_task.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_current_task.py.exp
rename to tests/extmod/asyncio_current_task.py.exp
diff --git a/tests/extmod/uasyncio_event.py b/tests/extmod/asyncio_event.py
similarity index 93%
rename from tests/extmod/uasyncio_event.py
rename to tests/extmod/asyncio_event.py
index fb8eb9ffa40a7..290323a7de3a5 100644
--- a/tests/extmod/uasyncio_event.py
+++ b/tests/extmod/asyncio_event.py
@@ -1,13 +1,10 @@
 # Test Event class
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, ev):
diff --git a/tests/extmod/uasyncio_event.py.exp b/tests/extmod/asyncio_event.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_event.py.exp
rename to tests/extmod/asyncio_event.py.exp
diff --git a/tests/extmod/uasyncio_event_fair.py b/tests/extmod/asyncio_event_fair.py
similarity index 83%
rename from tests/extmod/uasyncio_event_fair.py
rename to tests/extmod/asyncio_event_fair.py
index 37eca5faef10b..ed34f3f0b5a60 100644
--- a/tests/extmod/uasyncio_event_fair.py
+++ b/tests/extmod/asyncio_event_fair.py
@@ -2,13 +2,10 @@
 # That tasks which continuously wait on events don't take over the scheduler
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task1(id):
diff --git a/tests/extmod/uasyncio_event_fair.py.exp b/tests/extmod/asyncio_event_fair.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_event_fair.py.exp
rename to tests/extmod/asyncio_event_fair.py.exp
diff --git a/tests/extmod/uasyncio_exception.py b/tests/extmod/asyncio_exception.py
similarity index 88%
rename from tests/extmod/uasyncio_exception.py
rename to tests/extmod/asyncio_exception.py
index 4e4f978dc2092..6f19509bac90f 100644
--- a/tests/extmod/uasyncio_exception.py
+++ b/tests/extmod/asyncio_exception.py
@@ -1,13 +1,10 @@
 # Test general exception handling
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 # main task raising an exception
diff --git a/tests/extmod/uasyncio_exception.py.exp b/tests/extmod/asyncio_exception.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_exception.py.exp
rename to tests/extmod/asyncio_exception.py.exp
diff --git a/tests/extmod/uasyncio_fair.py b/tests/extmod/asyncio_fair.py
similarity index 80%
rename from tests/extmod/uasyncio_fair.py
rename to tests/extmod/asyncio_fair.py
index e2257060548bb..43076fef1d707 100644
--- a/tests/extmod/uasyncio_fair.py
+++ b/tests/extmod/asyncio_fair.py
@@ -1,13 +1,10 @@
 # Test fairness of scheduler
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, t):
diff --git a/tests/extmod/uasyncio_fair.py.exp b/tests/extmod/asyncio_fair.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_fair.py.exp
rename to tests/extmod/asyncio_fair.py.exp
diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/asyncio_gather.py
similarity index 94%
rename from tests/extmod/uasyncio_gather.py
rename to tests/extmod/asyncio_gather.py
index af6ea555ab132..78a40ba3aadf7 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/asyncio_gather.py
@@ -1,13 +1,10 @@
-# test uasyncio.gather() function
+# test asyncio.gather() function
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def factorial(name, number):
diff --git a/tests/extmod/uasyncio_gather.py.exp b/tests/extmod/asyncio_gather.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_gather.py.exp
rename to tests/extmod/asyncio_gather.py.exp
diff --git a/tests/extmod/uasyncio_gather_notimpl.py b/tests/extmod/asyncio_gather_notimpl.py
similarity index 85%
rename from tests/extmod/uasyncio_gather_notimpl.py
rename to tests/extmod/asyncio_gather_notimpl.py
index 3ebab9bad6388..98f9a9368f92d 100644
--- a/tests/extmod/uasyncio_gather_notimpl.py
+++ b/tests/extmod/asyncio_gather_notimpl.py
@@ -1,13 +1,10 @@
-# Test uasyncio.gather() function, features that are not implemented.
+# Test asyncio.gather() function, features that are not implemented.
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def custom_handler(loop, context):
diff --git a/tests/extmod/uasyncio_gather_notimpl.py.exp b/tests/extmod/asyncio_gather_notimpl.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_gather_notimpl.py.exp
rename to tests/extmod/asyncio_gather_notimpl.py.exp
diff --git a/tests/extmod/uasyncio_get_event_loop.py b/tests/extmod/asyncio_get_event_loop.py
similarity index 60%
rename from tests/extmod/uasyncio_get_event_loop.py
rename to tests/extmod/asyncio_get_event_loop.py
index 8ccbd6814e96c..b2d50e3cba7a0 100644
--- a/tests/extmod/uasyncio_get_event_loop.py
+++ b/tests/extmod/asyncio_get_event_loop.py
@@ -1,13 +1,10 @@
 # Test get_event_loop()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def main():
diff --git a/tests/extmod/uasyncio_heaplock.py b/tests/extmod/asyncio_heaplock.py
similarity index 92%
rename from tests/extmod/uasyncio_heaplock.py
rename to tests/extmod/asyncio_heaplock.py
index 9c9487357a2ef..8326443f0e6c5 100644
--- a/tests/extmod/uasyncio_heaplock.py
+++ b/tests/extmod/asyncio_heaplock.py
@@ -1,6 +1,6 @@
 # test that the following do not use the heap:
 # - basic scheduling of tasks
-# - uasyncio.sleep_ms
+# - asyncio.sleep_ms
 # - StreamWriter.write, stream is blocked and data to write is a bytes object
 # - StreamWriter.write, when stream is not blocked
 
@@ -25,13 +25,10 @@ def f(x):
     raise SystemExit
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 class TestStream:
diff --git a/tests/extmod/uasyncio_heaplock.py.exp b/tests/extmod/asyncio_heaplock.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_heaplock.py.exp
rename to tests/extmod/asyncio_heaplock.py.exp
diff --git a/tests/extmod/uasyncio_lock.py b/tests/extmod/asyncio_lock.py
similarity index 94%
rename from tests/extmod/uasyncio_lock.py
rename to tests/extmod/asyncio_lock.py
index 096a8c82be148..f565adb03fc39 100644
--- a/tests/extmod/uasyncio_lock.py
+++ b/tests/extmod/asyncio_lock.py
@@ -1,13 +1,10 @@
 # Test Lock class
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task_loop(id, lock):
diff --git a/tests/extmod/uasyncio_lock.py.exp b/tests/extmod/asyncio_lock.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_lock.py.exp
rename to tests/extmod/asyncio_lock.py.exp
diff --git a/tests/extmod/uasyncio_lock_cancel.py b/tests/extmod/asyncio_lock_cancel.py
similarity index 90%
rename from tests/extmod/uasyncio_lock_cancel.py
rename to tests/extmod/asyncio_lock_cancel.py
index 85b8df8483065..c81bb3c7ba594 100644
--- a/tests/extmod/uasyncio_lock_cancel.py
+++ b/tests/extmod/asyncio_lock_cancel.py
@@ -1,13 +1,10 @@
 # Test that locks work when cancelling multiple waiters on the lock
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(i, lock, lock_flag):
diff --git a/tests/extmod/uasyncio_lock_cancel.py.exp b/tests/extmod/asyncio_lock_cancel.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_lock_cancel.py.exp
rename to tests/extmod/asyncio_lock_cancel.py.exp
diff --git a/tests/extmod/uasyncio_loop_stop.py b/tests/extmod/asyncio_loop_stop.py
similarity index 83%
rename from tests/extmod/uasyncio_loop_stop.py
rename to tests/extmod/asyncio_loop_stop.py
index 23507f9a7efe2..b4bd0c74ad90a 100644
--- a/tests/extmod/uasyncio_loop_stop.py
+++ b/tests/extmod/asyncio_loop_stop.py
@@ -1,13 +1,10 @@
 # Test Loop.stop() to stop the event loop
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task():
diff --git a/tests/extmod/uasyncio_loop_stop.py.exp b/tests/extmod/asyncio_loop_stop.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_loop_stop.py.exp
rename to tests/extmod/asyncio_loop_stop.py.exp
diff --git a/tests/extmod/uasyncio_micropython.py b/tests/extmod/asyncio_micropython.py
similarity index 66%
rename from tests/extmod/uasyncio_micropython.py
rename to tests/extmod/asyncio_micropython.py
index de1687ca8b988..cc96d34be2ecd 100644
--- a/tests/extmod/uasyncio_micropython.py
+++ b/tests/extmod/asyncio_micropython.py
@@ -3,7 +3,7 @@
 # - wait_for_ms
 
 try:
-    import time, uasyncio
+    import time, asyncio
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -11,7 +11,7 @@
 
 async def task(id, t):
     print("task start", id)
-    await uasyncio.sleep_ms(t)
+    await asyncio.sleep_ms(t)
     print("task end", id)
     return id * 2
 
@@ -19,25 +19,25 @@ async def task(id, t):
 async def main():
     # Simple sleep_ms
     t0 = time.ticks_ms()
-    await uasyncio.sleep_ms(1)
+    await asyncio.sleep_ms(1)
     print(time.ticks_diff(time.ticks_ms(), t0) < 100)
 
     try:
         # Sleep 1ms beyond maximum allowed sleep value
-        await uasyncio.sleep_ms(time.ticks_add(0, -1) // 2 + 1)
+        await asyncio.sleep_ms(time.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))
+    print(await asyncio.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(await asyncio.wait_for_ms(task(2, 50), 5))
+    except asyncio.TimeoutError:
         print("timeout")
 
     print("finish")
 
 
-uasyncio.run(main())
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_micropython.py.exp b/tests/extmod/asyncio_micropython.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_micropython.py.exp
rename to tests/extmod/asyncio_micropython.py.exp
diff --git a/tests/extmod/uasyncio_new_event_loop.py b/tests/extmod/asyncio_new_event_loop.py
similarity index 80%
rename from tests/extmod/uasyncio_new_event_loop.py
rename to tests/extmod/asyncio_new_event_loop.py
index b711befba9715..a3feb02126c70 100644
--- a/tests/extmod/uasyncio_new_event_loop.py
+++ b/tests/extmod/asyncio_new_event_loop.py
@@ -1,13 +1,10 @@
 # Test Loop.new_event_loop()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task():
diff --git a/tests/extmod/uasyncio_new_event_loop.py.exp b/tests/extmod/asyncio_new_event_loop.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_new_event_loop.py.exp
rename to tests/extmod/asyncio_new_event_loop.py.exp
diff --git a/tests/extmod/uasyncio_set_exception_handler.py b/tests/extmod/asyncio_set_exception_handler.py
similarity index 90%
rename from tests/extmod/uasyncio_set_exception_handler.py
rename to tests/extmod/asyncio_set_exception_handler.py
index fe7b83eb4d81a..5935f0f4ebeaa 100644
--- a/tests/extmod/uasyncio_set_exception_handler.py
+++ b/tests/extmod/asyncio_set_exception_handler.py
@@ -1,13 +1,10 @@
 # Test that tasks return their value correctly to the caller
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def custom_handler(loop, context):
diff --git a/tests/extmod/uasyncio_set_exception_handler.py.exp b/tests/extmod/asyncio_set_exception_handler.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_set_exception_handler.py.exp
rename to tests/extmod/asyncio_set_exception_handler.py.exp
diff --git a/tests/extmod/uasyncio_task_done.py b/tests/extmod/asyncio_task_done.py
similarity index 89%
rename from tests/extmod/uasyncio_task_done.py
rename to tests/extmod/asyncio_task_done.py
index 2700da8c34168..7cc493a12277e 100644
--- a/tests/extmod/uasyncio_task_done.py
+++ b/tests/extmod/asyncio_task_done.py
@@ -1,13 +1,10 @@
 # Test the Task.done() method
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(t, exc=None):
diff --git a/tests/extmod/uasyncio_task_done.py.exp b/tests/extmod/asyncio_task_done.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_task_done.py.exp
rename to tests/extmod/asyncio_task_done.py.exp
diff --git a/tests/extmod/uasyncio_threadsafeflag.py b/tests/extmod/asyncio_threadsafeflag.py
similarity index 98%
rename from tests/extmod/uasyncio_threadsafeflag.py
rename to tests/extmod/asyncio_threadsafeflag.py
index f97b138498d60..46da1b7b487a8 100644
--- a/tests/extmod/uasyncio_threadsafeflag.py
+++ b/tests/extmod/asyncio_threadsafeflag.py
@@ -1,7 +1,7 @@
 # Test Event class
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/uasyncio_threadsafeflag.py.exp b/tests/extmod/asyncio_threadsafeflag.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_threadsafeflag.py.exp
rename to tests/extmod/asyncio_threadsafeflag.py.exp
diff --git a/tests/extmod/uasyncio_wait_for.py b/tests/extmod/asyncio_wait_for.py
similarity index 96%
rename from tests/extmod/uasyncio_wait_for.py
rename to tests/extmod/asyncio_wait_for.py
index c636c7dd747ad..f973e46f4cf91 100644
--- a/tests/extmod/uasyncio_wait_for.py
+++ b/tests/extmod/asyncio_wait_for.py
@@ -1,13 +1,10 @@
 # Test asyncio.wait_for
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, t):
diff --git a/tests/extmod/uasyncio_wait_for.py.exp b/tests/extmod/asyncio_wait_for.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_wait_for.py.exp
rename to tests/extmod/asyncio_wait_for.py.exp
diff --git a/tests/extmod/uasyncio_wait_for_fwd.py b/tests/extmod/asyncio_wait_for_fwd.py
similarity index 91%
rename from tests/extmod/uasyncio_wait_for_fwd.py
rename to tests/extmod/asyncio_wait_for_fwd.py
index 33738085ce4a5..9ec734fae662e 100644
--- a/tests/extmod/uasyncio_wait_for_fwd.py
+++ b/tests/extmod/asyncio_wait_for_fwd.py
@@ -1,13 +1,10 @@
 # Test asyncio.wait_for, with forwarding cancellation
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def awaiting(t, return_if_fail):
diff --git a/tests/extmod/uasyncio_wait_for_fwd.py.exp b/tests/extmod/asyncio_wait_for_fwd.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_wait_for_fwd.py.exp
rename to tests/extmod/asyncio_wait_for_fwd.py.exp
diff --git a/tests/extmod/uasyncio_wait_task.py b/tests/extmod/asyncio_wait_task.py
similarity index 90%
rename from tests/extmod/uasyncio_wait_task.py
rename to tests/extmod/asyncio_wait_task.py
index 1d70ddf72032e..bce426d971046 100644
--- a/tests/extmod/uasyncio_wait_task.py
+++ b/tests/extmod/asyncio_wait_task.py
@@ -1,13 +1,10 @@
 # Test waiting on a task
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 import time
diff --git a/tests/extmod/uasyncio_wait_task.py.exp b/tests/extmod/asyncio_wait_task.py.exp
similarity index 100%
rename from tests/extmod/uasyncio_wait_task.py.exp
rename to tests/extmod/asyncio_wait_task.py.exp
diff --git a/tests/multi_espnow/80_uasyncio_client.py b/tests/multi_espnow/80_asyncio_client.py
similarity index 98%
rename from tests/multi_espnow/80_uasyncio_client.py
rename to tests/multi_espnow/80_asyncio_client.py
index fa2918cc031ab..4d58a451c1c01 100644
--- a/tests/multi_espnow/80_uasyncio_client.py
+++ b/tests/multi_espnow/80_asyncio_client.py
@@ -102,7 +102,7 @@ def instance0():
 # Client
 def instance1():
     try:
-        import uasyncio as asyncio
+        import asyncio
         from aioespnow import AIOESPNow
     except ImportError:
         print("SKIP")
diff --git a/tests/multi_espnow/80_uasyncio_client.py.exp b/tests/multi_espnow/80_asyncio_client.py.exp
similarity index 100%
rename from tests/multi_espnow/80_uasyncio_client.py.exp
rename to tests/multi_espnow/80_asyncio_client.py.exp
diff --git a/tests/multi_espnow/81_uasyncio_server.py b/tests/multi_espnow/81_asyncio_server.py
similarity index 98%
rename from tests/multi_espnow/81_uasyncio_server.py
rename to tests/multi_espnow/81_asyncio_server.py
index ee098b7f3beff..df1dbb2ac8aa1 100644
--- a/tests/multi_espnow/81_uasyncio_server.py
+++ b/tests/multi_espnow/81_asyncio_server.py
@@ -58,7 +58,7 @@ async def echo_server(e):
 # Server
 def instance0():
     try:
-        import uasyncio as asyncio
+        import asyncio
         from aioespnow import AIOESPNow
     except ImportError:
         print("SKIP")
diff --git a/tests/multi_espnow/81_uasyncio_server.py.exp b/tests/multi_espnow/81_asyncio_server.py.exp
similarity index 100%
rename from tests/multi_espnow/81_uasyncio_server.py.exp
rename to tests/multi_espnow/81_asyncio_server.py.exp
diff --git a/tests/multi_net/uasyncio_tcp_client_rst.py b/tests/multi_net/asyncio_tcp_client_rst.py
similarity index 90%
rename from tests/multi_net/uasyncio_tcp_client_rst.py
rename to tests/multi_net/asyncio_tcp_client_rst.py
index d81f22748e444..af70c2e22eef6 100644
--- a/tests/multi_net/uasyncio_tcp_client_rst.py
+++ b/tests/multi_net/asyncio_tcp_client_rst.py
@@ -1,13 +1,10 @@
 # Test TCP server with client issuing TCP RST part way through read
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 import struct, time, socket
 
diff --git a/tests/multi_net/uasyncio_tcp_client_rst.py.exp b/tests/multi_net/asyncio_tcp_client_rst.py.exp
similarity index 100%
rename from tests/multi_net/uasyncio_tcp_client_rst.py.exp
rename to tests/multi_net/asyncio_tcp_client_rst.py.exp
diff --git a/tests/multi_net/uasyncio_tcp_close_write.py b/tests/multi_net/asyncio_tcp_close_write.py
similarity index 87%
rename from tests/multi_net/uasyncio_tcp_close_write.py
rename to tests/multi_net/asyncio_tcp_close_write.py
index 5698ed8b1699d..d1892fe895e26 100644
--- a/tests/multi_net/uasyncio_tcp_close_write.py
+++ b/tests/multi_net/asyncio_tcp_close_write.py
@@ -1,13 +1,10 @@
-# Test uasyncio TCP stream closing then writing
+# Test asyncio TCP stream closing then writing
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 
diff --git a/tests/multi_net/uasyncio_tcp_close_write.py.exp b/tests/multi_net/asyncio_tcp_close_write.py.exp
similarity index 100%
rename from tests/multi_net/uasyncio_tcp_close_write.py.exp
rename to tests/multi_net/asyncio_tcp_close_write.py.exp
diff --git a/tests/multi_net/uasyncio_tcp_readall.py b/tests/multi_net/asyncio_tcp_readall.py
similarity index 84%
rename from tests/multi_net/uasyncio_tcp_readall.py
rename to tests/multi_net/asyncio_tcp_readall.py
index c411f1c69d658..66ad97549cbb2 100644
--- a/tests/multi_net/uasyncio_tcp_readall.py
+++ b/tests/multi_net/asyncio_tcp_readall.py
@@ -1,13 +1,10 @@
-# Test uasyncio stream read(-1) method using TCP server/client
+# Test asyncio stream read(-1) method using TCP server/client
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 
diff --git a/tests/multi_net/uasyncio_tcp_readall.py.exp b/tests/multi_net/asyncio_tcp_readall.py.exp
similarity index 100%
rename from tests/multi_net/uasyncio_tcp_readall.py.exp
rename to tests/multi_net/asyncio_tcp_readall.py.exp
diff --git a/tests/multi_net/uasyncio_tcp_readexactly.py b/tests/multi_net/asyncio_tcp_readexactly.py
similarity index 86%
rename from tests/multi_net/uasyncio_tcp_readexactly.py
rename to tests/multi_net/asyncio_tcp_readexactly.py
index 71d8c6d0e9323..2c8df1f30aa0d 100644
--- a/tests/multi_net/uasyncio_tcp_readexactly.py
+++ b/tests/multi_net/asyncio_tcp_readexactly.py
@@ -1,13 +1,10 @@
-# Test uasyncio stream readexactly() method using TCP server/client
+# Test asyncio stream readexactly() method using TCP server/client
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 
diff --git a/tests/multi_net/uasyncio_tcp_readexactly.py.exp b/tests/multi_net/asyncio_tcp_readexactly.py.exp
similarity index 100%
rename from tests/multi_net/uasyncio_tcp_readexactly.py.exp
rename to tests/multi_net/asyncio_tcp_readexactly.py.exp
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py b/tests/multi_net/asyncio_tcp_readinto.py
similarity index 86%
rename from tests/multi_net/uasyncio_tcp_readinto.py
rename to tests/multi_net/asyncio_tcp_readinto.py
index 647c06b8aaab5..563b640e13b20 100644
--- a/tests/multi_net/uasyncio_tcp_readinto.py
+++ b/tests/multi_net/asyncio_tcp_readinto.py
@@ -1,13 +1,10 @@
-# Test uasyncio stream readinto() method using TCP server/client
+# Test asyncio stream readinto() method using TCP server/client
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     import array
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py.exp b/tests/multi_net/asyncio_tcp_readinto.py.exp
similarity index 100%
rename from tests/multi_net/uasyncio_tcp_readinto.py.exp
rename to tests/multi_net/asyncio_tcp_readinto.py.exp
diff --git a/tests/multi_net/uasyncio_tcp_server_client.py b/tests/multi_net/asyncio_tcp_server_client.py
similarity index 83%
rename from tests/multi_net/uasyncio_tcp_server_client.py
rename to tests/multi_net/asyncio_tcp_server_client.py
index 6a8cb58de53da..6c4aaf2b7ef4e 100644
--- a/tests/multi_net/uasyncio_tcp_server_client.py
+++ b/tests/multi_net/asyncio_tcp_server_client.py
@@ -1,13 +1,10 @@
-# Test uasyncio TCP server and client using start_server() and open_connection()
+# Test asyncio TCP server and client using start_server() and open_connection()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 
diff --git a/tests/multi_net/uasyncio_tcp_server_client.py.exp b/tests/multi_net/asyncio_tcp_server_client.py.exp
similarity index 100%
rename from tests/multi_net/uasyncio_tcp_server_client.py.exp
rename to tests/multi_net/asyncio_tcp_server_client.py.exp
diff --git a/tests/net_hosted/uasyncio_start_server.py b/tests/net_hosted/asyncio_start_server.py
similarity index 72%
rename from tests/net_hosted/uasyncio_start_server.py
rename to tests/net_hosted/asyncio_start_server.py
index f13402979f86b..316221898112f 100644
--- a/tests/net_hosted/uasyncio_start_server.py
+++ b/tests/net_hosted/asyncio_start_server.py
@@ -1,13 +1,10 @@
-# Test basic behaviour of uasyncio.start_server()
+# Test basic behaviour of asyncio.start_server()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def test():
diff --git a/tests/net_hosted/uasyncio_start_server.py.exp b/tests/net_hosted/asyncio_start_server.py.exp
similarity index 100%
rename from tests/net_hosted/uasyncio_start_server.py.exp
rename to tests/net_hosted/asyncio_start_server.py.exp
diff --git a/tests/net_inet/uasyncio_cancel_stream.py b/tests/net_inet/asyncio_cancel_stream.py
similarity index 81%
rename from tests/net_inet/uasyncio_cancel_stream.py
rename to tests/net_inet/asyncio_cancel_stream.py
index 6b6b845b0f7a8..a192736576a20 100644
--- a/tests/net_inet/uasyncio_cancel_stream.py
+++ b/tests/net_inet/asyncio_cancel_stream.py
@@ -1,13 +1,10 @@
 # Test cancelling a task waiting on stream IO
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def get(reader):
diff --git a/tests/net_inet/uasyncio_cancel_stream.py.exp b/tests/net_inet/asyncio_cancel_stream.py.exp
similarity index 100%
rename from tests/net_inet/uasyncio_cancel_stream.py.exp
rename to tests/net_inet/asyncio_cancel_stream.py.exp
diff --git a/tests/net_inet/uasyncio_open_connection.py b/tests/net_inet/asyncio_open_connection.py
similarity index 69%
rename from tests/net_inet/uasyncio_open_connection.py
rename to tests/net_inet/asyncio_open_connection.py
index 68285a2437d64..505f3c16bfa4b 100644
--- a/tests/net_inet/uasyncio_open_connection.py
+++ b/tests/net_inet/asyncio_open_connection.py
@@ -1,13 +1,10 @@
-# Test simple HTTP request with uasyncio.open_connection()
+# Test simple HTTP request with asyncio.open_connection()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def http_get(url):
diff --git a/tests/net_inet/uasyncio_open_connection.py.exp b/tests/net_inet/asyncio_open_connection.py.exp
similarity index 100%
rename from tests/net_inet/uasyncio_open_connection.py.exp
rename to tests/net_inet/asyncio_open_connection.py.exp
diff --git a/tests/net_inet/uasyncio_tcp_read_headers.py b/tests/net_inet/asyncio_tcp_read_headers.py
similarity index 77%
rename from tests/net_inet/uasyncio_tcp_read_headers.py
rename to tests/net_inet/asyncio_tcp_read_headers.py
index e8087aeedf7be..ec334d8bf483c 100644
--- a/tests/net_inet/uasyncio_tcp_read_headers.py
+++ b/tests/net_inet/asyncio_tcp_read_headers.py
@@ -1,13 +1,10 @@
-# Test uasyncio.open_connection() and stream readline()
+# Test asyncio.open_connection() and stream readline()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def http_get_headers(url):
diff --git a/tests/net_inet/uasyncio_tcp_read_headers.py.exp b/tests/net_inet/asyncio_tcp_read_headers.py.exp
similarity index 100%
rename from tests/net_inet/uasyncio_tcp_read_headers.py.exp
rename to tests/net_inet/asyncio_tcp_read_headers.py.exp
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 4964ff49fd021..6fee9d91834f1 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -624,10 +624,10 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         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
-        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("extmod/asyncio_event.py")  # unknown issue
+        skip_tests.add("extmod/asyncio_lock.py")  # requires async with
+        skip_tests.add("extmod/asyncio_micropython.py")  # unknown issue
+        skip_tests.add("extmod/asyncio_wait_for.py")  # unknown issue
         skip_tests.add("misc/features.py")  # requires raise_varargs
         skip_tests.add(
             "misc/print_exception.py"
@@ -672,7 +672,7 @@ def run_one_test(test_file):
         is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
         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_async = test_name.startswith(("async_", "asyncio_"))
         is_const = test_name.startswith("const")
         is_io_module = test_name.startswith("io_")
         is_fstring = test_name.startswith("string_fstring")
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 04aefcfe2f33b..013782ede5f18 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -50,7 +50,7 @@ RuntimeError:
 ame__
 port 
 
-builtins        micropython     _thread         _uasyncio
+builtins        micropython     _asyncio        _thread
 array           binascii        btree           cexample
 cmath           collections     cppexample      cryptolib
 errno           example_package                 ffi

From 9092909bf5e5f3347a93ea5146dd93320527956a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jun 2023 16:08:09 +1000
Subject: [PATCH 0068/3129] docs: Rename uasyncio to asyncio.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/{uasyncio.rst => asyncio.rst} | 30 +++++++++++-----------
 docs/library/espnow.rst                    |  6 ++---
 docs/library/index.rst                     |  2 +-
 docs/library/machine.I2S.rst               |  8 +++---
 docs/reference/isr_rules.rst               | 14 +++++-----
 5 files changed, 30 insertions(+), 30 deletions(-)
 rename docs/library/{uasyncio.rst => asyncio.rst} (92%)

diff --git a/docs/library/uasyncio.rst b/docs/library/asyncio.rst
similarity index 92%
rename from docs/library/uasyncio.rst
rename to docs/library/asyncio.rst
index 4cbcfa9f98ada..9a2c14e7e0152 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/asyncio.rst
@@ -1,7 +1,7 @@
-:mod:`uasyncio` --- asynchronous I/O scheduler
-==============================================
+:mod:`asyncio` --- asynchronous I/O scheduler
+=============================================
 
-.. module:: uasyncio
+.. module:: asyncio
    :synopsis: asynchronous I/O scheduler for writing concurrent code
 
 |see_cpython_module|
@@ -9,27 +9,27 @@
 
 Example::
 
-    import uasyncio
+    import asyncio
 
     async def blink(led, period_ms):
         while True:
             led.on()
-            await uasyncio.sleep_ms(5)
+            await asyncio.sleep_ms(5)
             led.off()
-            await uasyncio.sleep_ms(period_ms)
+            await asyncio.sleep_ms(period_ms)
 
     async def main(led1, led2):
-        uasyncio.create_task(blink(led1, 700))
-        uasyncio.create_task(blink(led2, 400))
-        await uasyncio.sleep_ms(10_000)
+        asyncio.create_task(blink(led1, 700))
+        asyncio.create_task(blink(led2, 400))
+        await asyncio.sleep_ms(10_000)
 
     # Running on a pyboard
     from pyb import LED
-    uasyncio.run(main(LED(1), LED(2)))
+    asyncio.run(main(LED(1), LED(2)))
 
     # Running on a generic board
     from machine import Pin
-    uasyncio.run(main(Pin(1), Pin(2)))
+    asyncio.run(main(Pin(1), Pin(2)))
 
 Core functions
 --------------
@@ -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 ``uasyncio.TimeoutError``:
+    If a timeout occurs, it cancels the task and raises ``asyncio.TimeoutError``:
     this should be trapped by the caller.  The task receives
-    ``uasyncio.CancelledError`` which may be ignored or trapped using ``try...except``
+    ``asyncio.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 ``uasyncio.CancelledError`` into it.  The task may
+    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``.
 
@@ -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 uasyncio loop, such as other threads, IRQs, or scheduler
+    outside the asyncio loop, such as other threads, IRQs, or scheduler
     callbacks.  Flags start in the cleared state.  The class does not currently
     work under the Unix build of MicroPython.
 
diff --git a/docs/library/espnow.rst b/docs/library/espnow.rst
index f821de59aa7f0..f344983700a13 100644
--- a/docs/library/espnow.rst
+++ b/docs/library/espnow.rst
@@ -632,7 +632,7 @@ Supporting asyncio
 ------------------
 
 A supplementary module (`aioespnow`) is available to provide
-:doc:`asyncio<uasyncio>` support.
+:doc:`asyncio<asyncio>` support.
 
 **Note:** Asyncio support is available on all ESP32 targets as well as those
 ESP8266 boards which include the asyncio module (ie. ESP8266 devices with at
@@ -642,7 +642,7 @@ A small async server example::
 
     import network
     import aioespnow
-    import uasyncio as asyncio
+    import asyncio
 
     # A WLAN interface must be active to send()/recv()
     network.WLAN(network.STA_IF).active(True)
@@ -680,7 +680,7 @@ A small async server example::
     asyncio.run(main(e, peer, 120, 10))
 
 .. module:: aioespnow
-    :synopsis: ESP-NOW :doc:`uasyncio` support
+    :synopsis: ESP-NOW :doc:`asyncio` support
 
 .. class:: AIOESPNow()
 
diff --git a/docs/library/index.rst b/docs/library/index.rst
index e428f3a062d2f..69bc81ade5e14 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -57,6 +57,7 @@ library.
    :maxdepth: 1
 
    array.rst
+   asyncio.rst
    binascii.rst
    builtins.rst
    cmath.rst
@@ -77,7 +78,6 @@ library.
    struct.rst
    sys.rst
    time.rst
-   uasyncio.rst
    zlib.rst
    _thread.rst
 
diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index 2244ef4202dc0..84edb94e78dbf 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -47,7 +47,7 @@ I2S objects can be created and initialized using::
 3 modes of operation are supported:
  - blocking
  - non-blocking
- - uasyncio
+ - asyncio
 
 blocking::
 
@@ -63,13 +63,13 @@ non-blocking::
    audio_in.irq(i2s_callback)          # i2s_callback is called when buf is filled
    num_read = audio_in.readinto(buf)   # returns immediately
 
-uasyncio::
+asyncio::
 
-   swriter = uasyncio.StreamWriter(audio_out)
+   swriter = asyncio.StreamWriter(audio_out)
    swriter.write(buf)
    await swriter.drain()
 
-   sreader = uasyncio.StreamReader(audio_in)
+   sreader = asyncio.StreamReader(audio_in)
    num_read = await sreader.readinto(buf)
 
 Some codec devices like the WM8960 or SGTL5000 require separate initialization
diff --git a/docs/reference/isr_rules.rst b/docs/reference/isr_rules.rst
index bdb838c590589..ea330acad3aaa 100644
--- a/docs/reference/isr_rules.rst
+++ b/docs/reference/isr_rules.rst
@@ -219,20 +219,20 @@ 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
------------------------
+Interfacing to asyncio
+----------------------
 
-When an ISR runs it can preempt the `uasyncio` scheduler. If the ISR performs a `uasyncio`
+When an ISR runs it can preempt the `asyncio` scheduler. If the ISR performs a `asyncio`
 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
+The safe way to interact with `asyncio` is to implement a coroutine with synchronisation performed by
+`asyncio.ThreadSafeFlag`. The following fragment illustrates the creation of a task in response
 to an interrupt:
 
 .. code:: python
 
-    tsf = uasyncio.ThreadSafeFlag()
+    tsf = asyncio.ThreadSafeFlag()
 
     def isr(_):  # Interrupt handler
         tsf.set()
@@ -240,7 +240,7 @@ to an interrupt:
     async def foo():
         while True:
             await tsf.wait()
-            uasyncio.create_task(bar())
+            asyncio.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

From d975bb1f2799a3a0b33ee073886354ca03e2e7f5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jun 2023 16:11:49 +1000
Subject: [PATCH 0069/3129] examples/hwapi: Rename uasyncio to asyncio.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../{soft_pwm2_uasyncio.py => soft_pwm2_asyncio.py}    | 10 +++++-----
 .../{soft_pwm_uasyncio.py => soft_pwm_asyncio.py}      |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename examples/hwapi/{soft_pwm2_uasyncio.py => soft_pwm2_asyncio.py} (73%)
 rename examples/hwapi/{soft_pwm_uasyncio.py => soft_pwm_asyncio.py} (79%)

diff --git a/examples/hwapi/soft_pwm2_uasyncio.py b/examples/hwapi/soft_pwm2_asyncio.py
similarity index 73%
rename from examples/hwapi/soft_pwm2_uasyncio.py
rename to examples/hwapi/soft_pwm2_asyncio.py
index 908ef2d8ac202..6894990043273 100644
--- a/examples/hwapi/soft_pwm2_uasyncio.py
+++ b/examples/hwapi/soft_pwm2_asyncio.py
@@ -1,6 +1,6 @@
-# Like soft_pwm_uasyncio.py, but fading 2 LEDs with different phase.
+# Like soft_pwm_asyncio.py, but fading 2 LEDs with different phase.
 # Also see original soft_pwm.py.
-import uasyncio
+import asyncio
 from hwconfig import LED, LED2
 
 
@@ -9,10 +9,10 @@ async def pwm_cycle(led, duty, cycles):
     for i in range(cycles):
         if duty:
             led.value(1)
-            await uasyncio.sleep_ms(duty)
+            await asyncio.sleep_ms(duty)
         if duty_off:
             led.value(0)
-            await uasyncio.sleep_ms(duty_off)
+            await asyncio.sleep_ms(duty_off)
 
 
 async def fade_in_out(LED):
@@ -25,7 +25,7 @@ async def fade_in_out(LED):
             await pwm_cycle(LED, i, 2)
 
 
-loop = uasyncio.get_event_loop()
+loop = asyncio.get_event_loop()
 loop.create_task(fade_in_out(LED))
 loop.call_later_ms(800, fade_in_out(LED2))
 loop.run_forever()
diff --git a/examples/hwapi/soft_pwm_uasyncio.py b/examples/hwapi/soft_pwm_asyncio.py
similarity index 79%
rename from examples/hwapi/soft_pwm_uasyncio.py
rename to examples/hwapi/soft_pwm_asyncio.py
index 8d7ad8c9e07ba..ae6c7340f6fdd 100644
--- a/examples/hwapi/soft_pwm_uasyncio.py
+++ b/examples/hwapi/soft_pwm_asyncio.py
@@ -1,5 +1,5 @@
 # See original soft_pwm.py for detailed comments.
-import uasyncio
+import asyncio
 from hwconfig import LED
 
 
@@ -8,10 +8,10 @@ async def pwm_cycle(led, duty, cycles):
     for i in range(cycles):
         if duty:
             led.value(1)
-            await uasyncio.sleep_ms(duty)
+            await asyncio.sleep_ms(duty)
         if duty_off:
             led.value(0)
-            await uasyncio.sleep_ms(duty_off)
+            await asyncio.sleep_ms(duty_off)
 
 
 async def fade_in_out(LED):
@@ -24,5 +24,5 @@ async def fade_in_out(LED):
             await pwm_cycle(LED, i, 2)
 
 
-loop = uasyncio.get_event_loop()
+loop = asyncio.get_event_loop()
 loop.run_until_complete(fade_in_out(LED))

From 7979a4d26776330a89166fa60c917475579f7dd8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jun 2023 16:14:54 +1000
Subject: [PATCH 0070/3129] ports: In machine_i2s.c, rename uasyncio to
 asyncio.

Mostly updates comments, but also renames the UASYNCIO enum value to
ASYNCIO.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/machine_i2s.c  | 24 ++++++++++++------------
 ports/mimxrt/machine_i2s.c | 22 +++++++++++-----------
 ports/rp2/machine_i2s.c    | 22 +++++++++++-----------
 ports/stm32/machine_i2s.c  | 22 +++++++++++-----------
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index ce1cb59849dc1..f0163486cd73e 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -61,9 +61,9 @@
 // - 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
+// Mode3: Asyncio
 // - implements the stream protocol
-// - uasyncio mode is enabled when the ioctl() function is called
+// - asyncio 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:
@@ -102,7 +102,7 @@ typedef enum {
 typedef enum {
     BLOCKING,
     NON_BLOCKING,
-    UASYNCIO
+    ASYNCIO
 } io_mode_t;
 
 typedef enum {
@@ -240,7 +240,7 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
     // 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
+    // For asyncio 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
@@ -257,7 +257,7 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
         size_t num_bytes_received_from_dma = 0;
 
         TickType_t delay;
-        if (self->io_mode == UASYNCIO) {
+        if (self->io_mode == ASYNCIO) {
             delay = 0; // stop i2s_read() operation if DMA memory becomes empty
         } else {
             delay = portMAX_DELAY;  // block until supplied buffer is filled
@@ -307,7 +307,7 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
 
         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)) {
+        if ((self->io_mode == ASYNCIO) && (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
@@ -327,7 +327,7 @@ STATIC size_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appb
     size_t num_bytes_written = 0;
 
     TickType_t delay;
-    if (self->io_mode == UASYNCIO) {
+    if (self->io_mode == ASYNCIO) {
         delay = 0;  // stop i2s_write() operation if DMA memory becomes full
     } else {
         delay = portMAX_DELAY;  // block until supplied buffer is emptied
@@ -345,14 +345,14 @@ STATIC size_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appb
 
     check_esp_err(ret);
 
-    if ((self->io_mode == UASYNCIO) && (num_bytes_written < appbuf->len)) {
+    if ((self->io_mode == ASYNCIO) && (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.
+        // The asyncio 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);
         }
@@ -729,7 +729,7 @@ STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint
         // 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
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -759,7 +759,7 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
         // 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
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -772,7 +772,7 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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
+    self->io_mode = ASYNCIO; // a call to ioctl() is an indication that asyncio is being used
 
     if (request == MP_STREAM_POLL) {
         ret = 0;
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index aa8eabeb0bd1e..7711219441bed 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -60,9 +60,9 @@
 // - 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
+// Mode3: Asyncio
 // - implements the stream protocol
-// - uasyncio mode is enabled when the ioctl() function is called
+// - asyncio 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:
@@ -122,7 +122,7 @@ typedef enum {
 typedef enum {
     BLOCKING,
     NON_BLOCKING,
-    UASYNCIO
+    ASYNCIO
 } io_mode_t;
 
 typedef enum {
@@ -441,7 +441,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
 
     // 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
+    // For asyncio 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
@@ -467,7 +467,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
                         ;
                     }
                     num_bytes_copied_to_appbuf++;
-                } else if (self->io_mode == UASYNCIO) {
+                } else if (self->io_mode == ASYNCIO) {
                     if (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
                         // ring buffer is empty, exit
                         goto exit;
@@ -484,7 +484,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
                     while (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
                         ;
                     }
-                } else if (self->io_mode == UASYNCIO) {
+                } else if (self->io_mode == ASYNCIO) {
                     if (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
                         // ring buffer is empty, exit
                         goto exit;
@@ -547,7 +547,7 @@ STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t
 
     // 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
+    // for asyncio mode, the loop will make an early exit if the ring buffer becomes full
 
     uint32_t a_index = 0;
 
@@ -558,7 +558,7 @@ STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t
                 ;
             }
             a_index++;
-        } else if (self->io_mode == UASYNCIO) {
+        } else if (self->io_mode == ASYNCIO) {
             if (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
                 // ring buffer is full, exit
                 break;
@@ -1185,7 +1185,7 @@ STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint
         self->non_blocking_descriptor.index = 0;
         self->non_blocking_descriptor.copy_in_progress = true;
         return size;
-    } else { // blocking or uasyncio mode
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -1212,7 +1212,7 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
         self->non_blocking_descriptor.index = 0;
         self->non_blocking_descriptor.copy_in_progress = true;
         return size;
-    } else { // blocking or uasyncio mode
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -1225,7 +1225,7 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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
+    self->io_mode = ASYNCIO; // a call to ioctl() is an indication that asyncio is being used
 
     if (request == MP_STREAM_POLL) {
         ret = 0;
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index d5175471ae809..5ad1a748b9b93 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -57,9 +57,9 @@
 // - 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
+// Mode3: Asyncio
 // - implements the stream protocol
-// - uasyncio mode is enabled when the ioctl() function is called
+// - asyncio 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:
@@ -112,7 +112,7 @@ typedef enum {
 typedef enum {
     BLOCKING,
     NON_BLOCKING,
-    UASYNCIO
+    ASYNCIO
 } io_mode_t;
 
 typedef enum {
@@ -307,7 +307,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
 
     // 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
+    // For asyncio 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
@@ -333,7 +333,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
                         ;
                     }
                     num_bytes_copied_to_appbuf++;
-                } else if (self->io_mode == UASYNCIO) {
+                } else if (self->io_mode == ASYNCIO) {
                     if (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
                         // ring buffer is empty, exit
                         goto exit;
@@ -350,7 +350,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
                     while (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
                         ;
                     }
-                } else if (self->io_mode == UASYNCIO) {
+                } else if (self->io_mode == ASYNCIO) {
                     if (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
                         // ring buffer is empty, exit
                         goto exit;
@@ -413,7 +413,7 @@ STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t
 
     // 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
+    // for asyncio mode, the loop will make an early exit if the ring buffer becomes full
 
     uint32_t a_index = 0;
 
@@ -424,7 +424,7 @@ STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t
                 ;
             }
             a_index++;
-        } else if (self->io_mode == UASYNCIO) {
+        } else if (self->io_mode == ASYNCIO) {
             if (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
                 // ring buffer is full, exit
                 break;
@@ -1056,7 +1056,7 @@ STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint
         self->non_blocking_descriptor.index = 0;
         self->non_blocking_descriptor.copy_in_progress = true;
         return size;
-    } else { // blocking or uasyncio mode
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -1083,7 +1083,7 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
         self->non_blocking_descriptor.index = 0;
         self->non_blocking_descriptor.copy_in_progress = true;
         return size;
-    } else { // blocking or uasyncio mode
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -1096,7 +1096,7 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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
+    self->io_mode = ASYNCIO; // a call to ioctl() is an indication that asyncio is being used
 
     if (request == MP_STREAM_POLL) {
         ret = 0;
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 83ac6bc124eb7..bb595a25790a7 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -55,9 +55,9 @@
 // - 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
+// Mode3: Asyncio
 // - implements the stream protocol
-// - uasyncio mode is enabled when the ioctl() function is called
+// - asyncio 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:
@@ -104,7 +104,7 @@ typedef enum {
 typedef enum {
     BLOCKING,
     NON_BLOCKING,
-    UASYNCIO
+    ASYNCIO
 } io_mode_t;
 
 typedef enum {
@@ -287,7 +287,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
 
     // 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
+    // For asyncio 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
@@ -313,7 +313,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
                         ;
                     }
                     num_bytes_copied_to_appbuf++;
-                } else if (self->io_mode == UASYNCIO) {
+                } else if (self->io_mode == ASYNCIO) {
                     if (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
                         // ring buffer is empty, exit
                         goto exit;
@@ -330,7 +330,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
                     while (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
                         ;
                     }
-                } else if (self->io_mode == UASYNCIO) {
+                } else if (self->io_mode == ASYNCIO) {
                     if (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
                         // ring buffer is empty, exit
                         goto exit;
@@ -393,7 +393,7 @@ STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t
 
     // 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
+    // for asyncio mode, the loop will make an early exit if the ring buffer becomes full
 
     uint32_t a_index = 0;
 
@@ -404,7 +404,7 @@ STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t
                 ;
             }
             a_index++;
-        } else if (self->io_mode == UASYNCIO) {
+        } else if (self->io_mode == ASYNCIO) {
             if (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
                 // ring buffer is full, exit
                 break;
@@ -1033,7 +1033,7 @@ STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint
         self->non_blocking_descriptor.index = 0;
         self->non_blocking_descriptor.copy_in_progress = true;
         return size;
-    } else { // blocking or uasyncio mode
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -1060,7 +1060,7 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
         self->non_blocking_descriptor.index = 0;
         self->non_blocking_descriptor.copy_in_progress = true;
         return size;
-    } else { // blocking or uasyncio mode
+    } else { // blocking or asyncio mode
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -1073,7 +1073,7 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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
+    self->io_mode = ASYNCIO; // a call to ioctl() is an indication that asyncio is being used
 
     if (request == MP_STREAM_POLL) {
         ret = 0;

From ca79b4961953be587a290bc995ae925e664c9fbc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jun 2023 16:42:19 +1000
Subject: [PATCH 0071/3129] extmod/asyncio/uasyncio.py: Add
 backwards-compatible uasyncio alias.

This allows existing code that does `import uasyncio` or
`import uasyncio as asyncio` to continue working.

It uses the same lazy-loading as asyncio to prevent loading of unused
features.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/asyncio/manifest.py              |  3 +++
 extmod/asyncio/uasyncio.py              |  8 ++++++++
 tests/extmod/asyncio_as_uasyncio.py     | 12 ++++++++++++
 tests/extmod/asyncio_as_uasyncio.py.exp |  2 ++
 4 files changed, 25 insertions(+)
 create mode 100644 extmod/asyncio/uasyncio.py
 create mode 100644 tests/extmod/asyncio_as_uasyncio.py
 create mode 100644 tests/extmod/asyncio_as_uasyncio.py.exp

diff --git a/extmod/asyncio/manifest.py b/extmod/asyncio/manifest.py
index 0aba5b1856ceb..e8dc7643250ac 100644
--- a/extmod/asyncio/manifest.py
+++ b/extmod/asyncio/manifest.py
@@ -13,3 +13,6 @@
     base_path="..",
     opt=3,
 )
+
+# Backwards-compatible uasyncio module.
+module("uasyncio.py", opt=3)
diff --git a/extmod/asyncio/uasyncio.py b/extmod/asyncio/uasyncio.py
new file mode 100644
index 0000000000000..67e6ddcfa36dd
--- /dev/null
+++ b/extmod/asyncio/uasyncio.py
@@ -0,0 +1,8 @@
+# This module just allows `import uasyncio` to work. It lazy-loads from
+# `asyncio` without duplicating its globals dict.
+
+
+def __getattr__(attr):
+    import asyncio
+
+    return getattr(asyncio, attr)
diff --git a/tests/extmod/asyncio_as_uasyncio.py b/tests/extmod/asyncio_as_uasyncio.py
new file mode 100644
index 0000000000000..612292299c172
--- /dev/null
+++ b/tests/extmod/asyncio_as_uasyncio.py
@@ -0,0 +1,12 @@
+try:
+    import uasyncio
+    import asyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+x = set(dir(uasyncio))
+y = set(dir(asyncio)) - set(["event", "lock", "stream", "funcs"])
+
+print(x - y)
+print(y - x)
diff --git a/tests/extmod/asyncio_as_uasyncio.py.exp b/tests/extmod/asyncio_as_uasyncio.py.exp
new file mode 100644
index 0000000000000..9405b80109126
--- /dev/null
+++ b/tests/extmod/asyncio_as_uasyncio.py.exp
@@ -0,0 +1,2 @@
+set()
+set()

From 25fb6515663f7541704d15068de280702e428042 Mon Sep 17 00:00:00 2001
From: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
Date: Thu, 8 Jun 2023 16:22:17 +0100
Subject: [PATCH 0072/3129] lib/oofatfs: Fix speculative read in create_name.

Signed-off-by: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
---
 lib/oofatfs/ff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
index 0c9d04fe746fe..eca5b45bda11e 100644
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@@ -2821,7 +2821,7 @@ static FRESULT create_name (    /* FR_OK: successful, FR_INVALID_NAME: could not
         if (di >= FF_MAX_LFN) return FR_INVALID_NAME;   /* Reject too long name */
         lfn[di++] = wc;                 /* Store the Unicode character */
     }
-    while (*p == '/' || *p == '\\') p++;    /* Skip duplicated separators if exist */
+    if (wc == '/' || wc == '\\') while (*p == '/' || *p == '\\') p++;    /* Skip duplicated separators if exist */
     *path = p;                          /* Return pointer to the next segment */
     cf = (wc < ' ') ? NS_LAST : 0;      /* Set last segment flag if end of the path */
 

From ae778363702a759e987bb9209165f5a413dbd8a9 Mon Sep 17 00:00:00 2001
From: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
Date: Wed, 14 Jun 2023 15:03:14 +0100
Subject: [PATCH 0073/3129] extmod/modbinascii: Fix buffer length error.

The mod_binascii_a2b_base64() function allocates a buffer which may be
too small. It needs to be no less than three-quarters of the input
length, but is calculated as (<length> / 4) * 3 + 1, which may be less
due to integer division. Changed to (<length> * 3) / 4 + 1.

Signed-off-by: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
---
 extmod/modbinascii.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modbinascii.c b/extmod/modbinascii.c
index 46027d5fd5c16..183cd3fc1789b 100644
--- a/extmod/modbinascii.c
+++ b/extmod/modbinascii.c
@@ -71,7 +71,7 @@ STATIC mp_obj_t mod_binascii_a2b_base64(mp_obj_t data) {
     byte *in = bufinfo.buf;
 
     vstr_t vstr;
-    vstr_init(&vstr, (bufinfo.len / 4) * 3 + 1); // Potentially over-allocate
+    vstr_init(&vstr, (bufinfo.len * 3) / 4 + 1); // Potentially over-allocate
     byte *out = (byte *)vstr.buf;
 
     uint shift = 0;

From bc2ed8c55a69d80ea6aa8441673232a8c4054f13 Mon Sep 17 00:00:00 2001
From: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
Date: Wed, 14 Jun 2023 15:29:39 +0100
Subject: [PATCH 0074/3129] tests/extmod/uctypes_array_assign_le: Fix buffer.

Structure descriptor in test extmod/uctypes_array_assign_le
is 6 bytes long, due to member "arr3" having length 4
(2 * UINT16) and offset 2, but only 5 bytes are allocated.
Increased buffer length to 6 bytes.

Signed-off-by: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
---
 tests/extmod/uctypes_array_assign_le.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/extmod/uctypes_array_assign_le.py b/tests/extmod/uctypes_array_assign_le.py
index d822faf7e8a96..b7fcdfb49c059 100644
--- a/tests/extmod/uctypes_array_assign_le.py
+++ b/tests/extmod/uctypes_array_assign_le.py
@@ -18,7 +18,7 @@
     "arr8": (uctypes.ARRAY | 1, 1, {"l": uctypes.UINT32 | 0}),
 }
 
-data = bytearray(5)
+data = bytearray(6)
 
 S = uctypes.struct(uctypes.addressof(data), desc, uctypes.LITTLE_ENDIAN)
 

From 41c91422f083aaf61036c8ead26bf0c43111ae00 Mon Sep 17 00:00:00 2001
From: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
Date: Thu, 15 Jun 2023 09:33:10 +0100
Subject: [PATCH 0075/3129] tests/extmod/framebuf: Fix buffer size issues.

Tests framebuf1 and framebuf2 do not take the need for byte-aligned
strides into consideration when calculating buffer lengths.
Accordingly, the buffers allocated are slightly too small. Fixed
buffer length calculations.

Signed-off-by: Duncan Lowther <Duncan.Lowther@glasgow.ac.uk>
---
 tests/extmod/framebuf1.py     |   2 +-
 tests/extmod/framebuf1.py.exp | 108 +++++++++++++++++-----------------
 tests/extmod/framebuf2.py     |   2 +-
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/tests/extmod/framebuf1.py b/tests/extmod/framebuf1.py
index c8e0132265aa0..d35674a709ad8 100644
--- a/tests/extmod/framebuf1.py
+++ b/tests/extmod/framebuf1.py
@@ -6,7 +6,7 @@
 
 w = 5
 h = 16
-size = w * h // 8
+size = ((w + 7) & ~7) * ((h + 7) & ~7) // 8
 buf = bytearray(size)
 maps = {
     framebuf.MONO_VLSB: "MONO_VLSB",
diff --git a/tests/extmod/framebuf1.py.exp b/tests/extmod/framebuf1.py.exp
index d954623dee367..b9cd97835d60c 100644
--- a/tests/extmod/framebuf1.py.exp
+++ b/tests/extmod/framebuf1.py.exp
@@ -1,68 +1,68 @@
 MONO_VLSB
 0
-bytearray(b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x01\x00\x00\x00\x01\x80\x00\x00\x00\x80')
-bytearray(b'\x01\x00\x00\x00\x01\x80\x00\x00\x00\x00')
+bytearray(b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x01\x00\x00\x00\x01\x80\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x01\x00\x00\x00\x01\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
 1 0
-hline bytearray(b'\x02\x02\x02\x02\x02\x00\x00\x00\x00\x00')
-vline bytearray(b'\x00\xff\x00\x00\x00\x00\xff\x00\x00\x00')
-rect bytearray(b'\x00\x0e\n\x0e\x00\x00\x00\x00\x00\x00')
-fill_rect bytearray(b'\x00\x0e\x0e\x0e\x00\x00\x00\x00\x00\x00')
-line bytearray(b'\x00\x02\x04\x08\x00\x00\x00\x00\x00\x00')
-line bytearray(b'\x00\x00\x06\x08\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00')
-bytearray(b'\x00\x00@\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x00\x00\x00@\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x00\x00@\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
-bytearray(b'\x00\x7f\x7f\x04\x04\x00\x00\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\xaaU\xaaU\xaa\x00\x00\x00\x00\x00')
+hline bytearray(b'\x02\x02\x02\x02\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+vline bytearray(b'\x00\xff\x00\x00\x00\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+rect bytearray(b'\x00\x0e\n\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+fill_rect bytearray(b'\x00\x0e\x0e\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+line bytearray(b'\x00\x02\x04\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+line bytearray(b'\x00\x00\x06\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x7f\x7f\x04\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\xaaU\xaaU\xaa\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
 
 MONO_HLSB
 0
-bytearray(b'\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x88')
+bytearray(b'\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80')
 1 0
-hline bytearray(b'\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x00')
-vline bytearray(b'@@@@@@@@@@')
-rect bytearray(b'\x00pPp\x00\x00\x00\x00\x00\x00')
-fill_rect bytearray(b'\x00ppp\x00\x00\x00\x00\x00\x00')
-line bytearray(b'\x00@ \x10\x00\x00\x00\x00\x00\x00')
-line bytearray(b'\x00  \x10\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00 \x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00 \x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00 \x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00')
-bytearray(b'``x````\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'P\xa8P\xa8P\xa8P\xa8\x00\x00')
+hline bytearray(b'\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+vline bytearray(b'@@@@@@@@@@@@@@@@')
+rect bytearray(b'\x00pPp\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+fill_rect bytearray(b'\x00ppp\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+line bytearray(b'\x00@ \x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+line bytearray(b'\x00  \x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'``x````\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'P\xa8P\xa8P\xa8P\xa8\x00\x00\x00\x00\x00\x00\x00\x00')
 
 MONO_HMSB
 0
-bytearray(b'\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f\x1f')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11')
+bytearray(b'\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
 1 0
-hline bytearray(b'\x00\x1f\x00\x00\x00\x00\x00\x00\x00\x00')
-vline bytearray(b'\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02')
-rect bytearray(b'\x00\x0e\n\x0e\x00\x00\x00\x00\x00\x00')
-fill_rect bytearray(b'\x00\x0e\x0e\x0e\x00\x00\x00\x00\x00\x00')
-line bytearray(b'\x00\x02\x04\x08\x00\x00\x00\x00\x00\x00')
-line bytearray(b'\x00\x04\x04\x08\x00\x00\x00\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00')
-bytearray(b'\x06\x06\x1e\x06\x06\x06\x06\x00\x00\x00')
-bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-bytearray(b'\n\x15\n\x15\n\x15\n\x15\x00\x00')
+hline bytearray(b'\x00\x1f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+vline bytearray(b'\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02')
+rect bytearray(b'\x00\x0e\n\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+fill_rect bytearray(b'\x00\x0e\x0e\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+line bytearray(b'\x00\x02\x04\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+line bytearray(b'\x00\x04\x04\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x06\x06\x1e\x06\x06\x06\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+bytearray(b'\n\x15\n\x15\n\x15\n\x15\x00\x00\x00\x00\x00\x00\x00\x00')
 
 ValueError
 True
diff --git a/tests/extmod/framebuf2.py b/tests/extmod/framebuf2.py
index 097057fe96fa1..408a483bef5f6 100644
--- a/tests/extmod/framebuf2.py
+++ b/tests/extmod/framebuf2.py
@@ -48,7 +48,7 @@ def printbuf():
 
 w2 = 2
 h2 = 3
-buf2 = bytearray(w2 * h2 // 4)
+buf2 = bytearray(h2 * ((w2 + 3) // 4))
 fbuf2 = framebuf.FrameBuffer(buf2, w2, h2, framebuf.GS2_HMSB)
 
 # blit

From e7ae3ad92d7540cbe349cc05f5d62e0f63fce59b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 9 May 2023 09:52:16 +1000
Subject: [PATCH 0076/3129] extmod: Update to support mbedtls 3.x.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modhashlib.c     | 4 ++--
 extmod/modssl_mbedtls.c | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extmod/modhashlib.c b/extmod/modhashlib.c
index 3fafe6316def6..4cdc23fddc6c6 100644
--- a/extmod/modhashlib.c
+++ b/extmod/modhashlib.c
@@ -75,7 +75,7 @@ STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_MBEDTLS
 
-#if MBEDTLS_VERSION_NUMBER < 0x02070000
+#if MBEDTLS_VERSION_NUMBER < 0x02070000 || MBEDTLS_VERSION_NUMBER >= 0x03000000
 #define mbedtls_sha256_starts_ret mbedtls_sha256_starts
 #define mbedtls_sha256_update_ret mbedtls_sha256_update
 #define mbedtls_sha256_finish_ret mbedtls_sha256_finish
@@ -203,7 +203,7 @@ STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
 
 #if MICROPY_SSL_MBEDTLS
 
-#if MBEDTLS_VERSION_NUMBER < 0x02070000
+#if MBEDTLS_VERSION_NUMBER < 0x02070000 || MBEDTLS_VERSION_NUMBER >= 0x03000000
 #define mbedtls_sha1_starts_ret mbedtls_sha1_starts
 #define mbedtls_sha1_update_ret mbedtls_sha1_update
 #define mbedtls_sha1_finish_ret mbedtls_sha1_finish
diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index c230b1eaa2416..e346f986f77f2 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -225,7 +225,11 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
         size_t key_len;
         const byte *key = (const byte *)mp_obj_str_get_data(args->key.u_obj, &key_len);
         // len should include terminating null
+        #if MBEDTLS_VERSION_NUMBER >= 0x03000000
+        ret = mbedtls_pk_parse_key(&o->pkey, key, key_len + 1, NULL, 0, mbedtls_ctr_drbg_random, &o->ctr_drbg);
+        #else
         ret = mbedtls_pk_parse_key(&o->pkey, key, key_len + 1, NULL, 0);
+        #endif
         if (ret != 0) {
             ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA; // use general error for all key errors
             goto cleanup;

From 402fdc40fb5ca98b3987052cc264e8344d928a69 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Jun 2023 14:40:33 +1000
Subject: [PATCH 0077/3129] extmod/modplatform: Set MICROPY_PLATFORM_ARCH on
 riscv platforms.

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

diff --git a/extmod/modplatform.h b/extmod/modplatform.h
index 95bf073fbd90f..56a50e53c5445 100644
--- a/extmod/modplatform.h
+++ b/extmod/modplatform.h
@@ -43,6 +43,8 @@
 #define MICROPY_PLATFORM_ARCH   "x86"
 #elif defined(__xtensa__)
 #define MICROPY_PLATFORM_ARCH   "xtensa"
+#elif defined(__riscv)
+#define MICROPY_PLATFORM_ARCH   "riscv"
 #else
 #define MICROPY_PLATFORM_ARCH   ""
 #endif

From 18caf49a7fab84f55fdf170eb5ca1c27206ccc76 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jun 2023 11:18:01 +1000
Subject: [PATCH 0078/3129] extmod/modbtree: Undefine queue macros before
 including berkeley-db.

To prevent warnings when building with ESP IDF v5.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbtree.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index e9c760a389717..9b2d184a1ee79 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -32,6 +32,31 @@
 #include <stdio.h>
 #include <errno.h> // for declaration of global errno variable
 #include <fcntl.h>
+
+// Undefine queue macros that will be defined in berkeley-db-1.xx headers
+// below, in case they clash with system ones defined in headers above.
+#undef LIST_HEAD
+#undef LIST_ENTRY
+#undef LIST_INIT
+#undef LIST_INSERT_AFTER
+#undef LIST_INSERT_HEAD
+#undef LIST_REMOVE
+#undef TAILQ_HEAD
+#undef TAILQ_ENTRY
+#undef TAILQ_INIT
+#undef TAILQ_INSERT_HEAD
+#undef TAILQ_INSERT_TAIL
+#undef TAILQ_INSERT_AFTER
+#undef TAILQ_REMOVE
+#undef CIRCLEQ_HEAD
+#undef CIRCLEQ_ENTRY
+#undef CIRCLEQ_INIT
+#undef CIRCLEQ_INSERT_AFTER
+#undef CIRCLEQ_INSERT_BEFORE
+#undef CIRCLEQ_INSERT_HEAD
+#undef CIRCLEQ_INSERT_TAIL
+#undef CIRCLEQ_REMOVE
+
 #include <db.h>
 #include <../../btree/btree.h>
 

From 7c929d4478fbb247c330eb182e9d07440b962cfc Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 9 May 2023 15:46:01 +1000
Subject: [PATCH 0079/3129] esp32: Switch from UART driver to UART HAL.

Allows registering UART interrupt again.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/uart.c | 104 +++++++++++++++++++++++++--------------------
 ports/esp32/uart.h |   2 +-
 2 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index e871ca1d7a330..358d434709951 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -28,81 +28,93 @@
 
 #include <stdio.h>
 
-#include "driver/uart.h"
-#include "soc/uart_periph.h"
+#include "hal/uart_hal.h"
 
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "uart.h"
 
+// Backwards compatibility for when MICROPY_HW_UART_REPL was a ESP-IDF UART
+// driver enum. Only UART_NUM_0 was supported with that version of the driver.
+#define UART_NUM_0 0
+
 STATIC void uart_irq_handler(void *arg);
 
+// Declaring the HAL structure on the stack saves a tiny amount of static RAM
+#define REPL_HAL_DEFN() { .dev = UART_LL_GET_HW(MICROPY_HW_UART_REPL) }
+
+// RXFIFO Full interrupt threshold. Set the same as the ESP-IDF UART driver
+#define RXFIFO_FULL_THR (SOC_UART_FIFO_LEN - 8)
+
+// RXFIFO RX timeout threshold. This is in bit periods, so 10==one byte. Same as ESP-IDF UART driver.
+#define RXFIFO_RX_TIMEOUT (10)
+
 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
-    };
-    #if SOC_UART_SUPPORT_XTAL_CLK
-    // works independently of APB frequency
-    uartcfg.source_clk = UART_SCLK_XTAL; // ESP32C3, ESP32S3
+    uart_hal_context_t repl_hal = REPL_HAL_DEFN();
+    uint32_t sclk_freq;
+
+    #if UART_SCLK_DEFAULT == SOC_MOD_CLK_APB
+    sclk_freq = APB_CLK_FREQ; // Assumes no frequency scaling
+    #else
+    // ESP32-H2 and ESP32-C2, I think
+    #error "This SoC uses a different default UART SCLK source, code needs updating."
     #endif
-    uart_param_config(MICROPY_HW_UART_REPL, &uartcfg);
 
-    const uint32_t rxbuf = 129; // IDF requires > 128 min
-    const uint32_t txbuf = 0;
+    uart_hal_init(&repl_hal, MICROPY_HW_UART_REPL); // Sets defaults: 8n1, no flow control
+    uart_hal_set_baudrate(&repl_hal, MICROPY_HW_UART_REPL_BAUD, sclk_freq);
+    uart_hal_rxfifo_rst(&repl_hal);
+    uart_hal_txfifo_rst(&repl_hal);
 
-    uart_driver_install(MICROPY_HW_UART_REPL, rxbuf, txbuf, 0, NULL, 0);
+    ESP_ERROR_CHECK(
+        esp_intr_alloc(uart_periph_signal[MICROPY_HW_UART_REPL].irq,
+            ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM,
+            uart_irq_handler,
+            NULL,
+            NULL)
+        );
 
-    uart_isr_handle_t handle;
-    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);
+    // Enable RX interrupts
+    uart_hal_set_rxfifo_full_thr(&repl_hal, RXFIFO_FULL_THR);
+    uart_hal_set_rx_timeout(&repl_hal, RXFIFO_RX_TIMEOUT);
+    uart_hal_ena_intr_mask(&repl_hal, UART_INTR_RXFIFO_FULL | UART_INTR_RXFIFO_TOUT);
 }
 
 int uart_stdout_tx_strn(const char *str, size_t len) {
+    uart_hal_context_t repl_hal = REPL_HAL_DEFN();
     size_t remaining = len;
+    uint32_t written = 0;
     // 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) {
+        uart_hal_write_txfifo(&repl_hal, (const void *)str, remaining, &written);
+
+        if (written >= remaining) {
             break;
         }
-        str += ret;
+        remaining -= written;
+        str += written;
         ulTaskNotifyTake(pdFALSE, 1);
     }
-    return len - remaining;
+    return len;
 }
 
 // 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.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 || CONFIG_IDF_TARGET_ESP32S3
-        uint8_t c = READ_PERI_REG(UART_FIFO_AHB_REG(0)); // UART0
-        #endif
-        if (c == mp_interrupt_char) {
+    uint8_t rbuf[SOC_UART_FIFO_LEN];
+    int len;
+    uart_hal_context_t repl_hal = REPL_HAL_DEFN();
+
+    uart_hal_clr_intsts_mask(&repl_hal, UART_INTR_RXFIFO_FULL | UART_INTR_RXFIFO_TOUT | UART_INTR_FRAM_ERR);
+
+    len = uart_hal_get_rxfifo_len(&repl_hal);
+
+    uart_hal_read_rxfifo(&repl_hal, rbuf, &len);
+
+    for (int i = 0; i < len; i++) {
+        if (rbuf[i] == mp_interrupt_char) {
             mp_sched_keyboard_interrupt();
         } else {
             // this is an inline function so will be in IRAM
-            ringbuf_put(&stdin_ringbuf, c);
+            ringbuf_put(&stdin_ringbuf, rbuf[i]);
         }
     }
 }
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index e3c7482e7b485..14ad30ccd84ea 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -34,7 +34,7 @@
 #endif
 
 #ifndef MICROPY_HW_UART_REPL
-#define MICROPY_HW_UART_REPL (UART_NUM_0)
+#define MICROPY_HW_UART_REPL (0)
 #endif
 
 #ifndef MICROPY_HW_UART_REPL_BAUD

From 1db40ed29542ff85c8d1d1b58707122436b39cf4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Jun 2023 15:09:26 +1000
Subject: [PATCH 0080/3129] esp32/ppp_set_auth: Add pppapi_set_auth from
 ESP-IDF.

This function was made private/static in IDF commit
c67f4c2b4c2bb4b7740f988fc0f8a3e911e56afe, so it add back here.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE                         |  2 ++
 ports/esp32/main/CMakeLists.txt |  1 +
 ports/esp32/ppp_set_auth.c      | 35 +++++++++++++++++++++++++++++++++
 ports/esp32/ppp_set_auth.h      | 22 +++++++++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 ports/esp32/ppp_set_auth.c
 create mode 100644 ports/esp32/ppp_set_auth.h

diff --git a/LICENSE b/LICENSE
index 31eb9813f2d6a..07c88b0a03231 100644
--- a/LICENSE
+++ b/LICENSE
@@ -67,6 +67,8 @@ used during the build process and is not part of the compiled source code.
             /hal (BSD-3-clause)
             /simplelink (BSD-3-clause)
             /FreeRTOS (GPL-2.0 with FreeRTOS exception)
+        /esp32
+            /ppp_set_auth.* (Apache-2.0)
         /stm32
             /usbd*.c (MCD-ST Liberty SW License Agreement V2)
             /stm32_it.* (MIT + BSD-3-clause)
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 425d70fdf047c..4311af801c0f3 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -53,6 +53,7 @@ set(MICROPY_SOURCE_DRIVERS
 
 set(MICROPY_SOURCE_PORT
     main.c
+    ppp_set_auth.c
     uart.c
     usb.c
     usb_serial_jtag.c
diff --git a/ports/esp32/ppp_set_auth.c b/ports/esp32/ppp_set_auth.c
new file mode 100644
index 0000000000000..88ab668d48d3a
--- /dev/null
+++ b/ports/esp32/ppp_set_auth.c
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// The pppapi_set_auth function was made static in the ESP-IDF, so it's re-added here.
+// See ESP-IDF commit c67f4c2b4c2bb4b7740f988fc0f8a3e911e56afe
+
+#include "ppp_set_auth.h"
+
+#ifdef CONFIG_ESP_NETIF_TCPIP_LWIP
+
+#include "netif/ppp/pppapi.h"
+
+typedef struct {
+    struct tcpip_api_call_data call;
+    ppp_pcb *ppp;
+    u8_t authtype;
+    const char *user;
+    const char *passwd;
+} set_auth_msg_t;
+
+static err_t pppapi_do_ppp_set_auth(struct tcpip_api_call_data *m) {
+    set_auth_msg_t *msg = (set_auth_msg_t *)m;
+    ppp_set_auth(msg->ppp, msg->authtype, msg->user, msg->passwd);
+    return ERR_OK;
+}
+
+void pppapi_set_auth(ppp_pcb *pcb, u8_t authtype, const char *user, const char *passwd) {
+    set_auth_msg_t msg = { .ppp = pcb, .authtype = authtype, .user = user, .passwd = passwd};
+    tcpip_api_call(pppapi_do_ppp_set_auth, &msg.call);
+}
+
+#endif
diff --git a/ports/esp32/ppp_set_auth.h b/ports/esp32/ppp_set_auth.h
new file mode 100644
index 0000000000000..67676ef4d6c76
--- /dev/null
+++ b/ports/esp32/ppp_set_auth.h
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// The pppapi_set_auth function was made static in the ESP-IDF, so it's re-added here.
+// See ESP-IDF commit c67f4c2b4c2bb4b7740f988fc0f8a3e911e56afe
+
+#pragma once
+
+#include "esp_netif.h"
+
+#ifdef CONFIG_ESP_NETIF_TCPIP_LWIP
+
+#include "lwip/netif.h"
+
+typedef struct ppp_pcb_s ppp_pcb;
+
+void pppapi_set_auth(ppp_pcb *pcb, u8_t authtype, const char *user, const char *passwd);
+
+#endif

From 2af229c3cc55ceefc4cfba0f50092af725c3bfa9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Jun 2023 17:04:56 +1000
Subject: [PATCH 0081/3129] esp32/modesp32: Remove esp32.hall_sensor function.

The hall sensor is no longer supported by IDF v5.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modesp32.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 7a436bf77cefb..a18ca4c1375ac 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -170,12 +170,6 @@ STATIC mp_obj_t esp32_raw_temperature(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp32_raw_temperature_obj, esp32_raw_temperature);
 
-STATIC mp_obj_t esp32_hall_sensor(void) {
-    adc1_config_width(ADC_WIDTH_12Bit);
-    return MP_OBJ_NEW_SMALL_INT(hall_sensor_read());
-}
-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) {
@@ -210,7 +204,6 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { 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) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_idf_heap_info), MP_ROM_PTR(&esp32_idf_heap_info_obj) },
 

From e4650125b88a35f074097f16d84a8f49bd22ac06 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 9 May 2023 09:52:54 +1000
Subject: [PATCH 0082/3129] esp32: Update port to support IDF v5.0.2.

This commit updates the esp32 port to work exclusively with ESP-IDF v5.
IDF v5 is needed for some of the newer ESP32 SoCs to work, and it also
cleans up a lot of the inconsistencies between existing SoCs (eg S2, S3,
and C3).

Support for IDF v4 is dropped because it's a lot of effort to maintain both
versions at the same time.

The following components have been verified to work on the various SoCs:

                ESP32     ESP32-S2  ESP32-S3  ESP32-C3
    build       pass      pass      pass      pass
    SPIRAM      pass      pass      pass      N/A
    REPL (UART) pass      pass      pass      pass
    REPL (USB)  N/A       pass      pass      N/A
    filesystem  pass      pass      pass      pass
    GPIO        pass      pass      pass      pass
    SPI         pass      pass      pass      pass
    I2C         pass      pass      pass      pass
    PWM         pass      pass      pass      pass
    ADC         pass      pass      pass      pass
    WiFi STA    pass      pass      pass      pass
    WiFi AP     pass      pass      pass      pass
    BLE         pass      N/A       pass      pass
    ETH         pass      --        --        --
    PPP         pass      pass      pass      --
    sockets     pass      pass      pass      pass
    SSL         pass      ENOMEM    pass      pass
    RMT         pass      pass      pass      pass
    NeoPixel    pass      pass      pass      pass
    I2S         pass      pass      pass      N/A
    ESPNow      pass      pass      pass      pass
    ULP-FSM     pass      pass      pass      N/A
    SDCard      pass      N/A       N/A       pass
    WDT         pass      pass      pass      pass

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/.gitignore                        |   2 +
 ports/esp32/CMakeLists.txt                    |  20 ++-
 ports/esp32/README.md                         |  15 +-
 .../boards/ESP32_S2_WROVER/sdkconfig.board    |   1 -
 .../boards/GENERIC_C3_USB/sdkconfig.board     |   2 -
 .../esp32/boards/GENERIC_D2WD/sdkconfig.board |   1 +
 ports/esp32/boards/GENERIC_S3/sdkconfig.board |   3 -
 .../boards/GENERIC_S3_SPIRAM/sdkconfig.board  |   3 -
 .../GENERIC_S3_SPIRAM_OCT/sdkconfig.board     |   3 -
 .../boards/GENERIC_SPIRAM/mpconfigboard.cmake |   1 -
 .../boards/GENERIC_SPIRAM/sdkconfig.board     |   2 -
 .../boards/LOLIN_C3_MINI/sdkconfig.board      |   2 -
 .../esp32/boards/UM_FEATHERS2/sdkconfig.board |   4 -
 .../boards/UM_FEATHERS2NEO/sdkconfig.board    |   2 -
 .../esp32/boards/UM_FEATHERS3/sdkconfig.board |   7 +-
 ports/esp32/boards/UM_PROS3/sdkconfig.board   |   5 -
 .../esp32/boards/UM_TINYPICO/sdkconfig.board  |   3 -
 ports/esp32/boards/UM_TINYS2/sdkconfig.board  |   2 -
 ports/esp32/boards/UM_TINYS3/sdkconfig.board  |   5 -
 ports/esp32/boards/sdkconfig.240mhz           |   9 +-
 ports/esp32/boards/sdkconfig.base             |  34 +++--
 ports/esp32/boards/sdkconfig.ble              |  15 +-
 ports/esp32/boards/sdkconfig.nimble_core0     |   6 -
 ports/esp32/boards/sdkconfig.nimble_core1     |   6 -
 ports/esp32/boards/sdkconfig.spiram           |   9 +-
 ports/esp32/boards/sdkconfig.spiram_sx        |   7 +-
 ports/esp32/boards/sdkconfig.usb              |   8 +-
 .../CMakeLists.txt => esp32_common.cmake}     |  75 +++-------
 ports/esp32/esp32_rmt.c                       |   4 -
 ports/esp32/esp32_ulp.c                       |   9 +-
 ports/esp32/gccollect.c                       |   3 +-
 ports/esp32/machine_adcblock.h                |   2 +
 ports/esp32/machine_bitstream.c               |  35 +----
 ports/esp32/machine_hw_spi.c                  |  34 +++--
 ports/esp32/machine_i2c.c                     |   8 +-
 ports/esp32/machine_i2s.c                     |  30 +---
 ports/esp32/machine_pin.c                     |  25 ++--
 ports/esp32/machine_pwm.c                     |  19 +--
 ports/esp32/machine_sdcard.c                  | 137 ++++++++++++------
 ports/esp32/machine_timer.c                   |  32 +---
 ports/esp32/machine_uart.c                    |   9 --
 ports/esp32/machine_wdt.c                     |  10 +-
 ports/esp32/main.c                            |  67 ++-------
 ports/esp32/main_esp32/CMakeLists.txt         |  11 ++
 ports/esp32/main_esp32c3/CMakeLists.txt       |  14 ++
 ports/esp32/main_esp32s2/CMakeLists.txt       |  11 ++
 ports/esp32/main_esp32s2/idf_component.yml    |   5 +
 ports/esp32/main_esp32s3/CMakeLists.txt       |  11 ++
 ports/esp32/main_esp32s3/idf_component.yml    |   5 +
 ports/esp32/modesp.c                          |  24 +--
 ports/esp32/modesp32.c                        |   6 +-
 ports/esp32/modespnow.c                       |  14 +-
 ports/esp32/modmachine.c                      |  16 +-
 ports/esp32/modnetwork.h                      |  10 +-
 ports/esp32/modnetwork_globals.h              |   9 +-
 ports/esp32/modsocket.c                       |   7 +-
 ports/esp32/mpconfigport.h                    |  14 +-
 ports/esp32/mphalport.c                       |   3 +-
 ports/esp32/mphalport.h                       |  12 +-
 ports/esp32/mpnimbleport.c                    |   4 +-
 ports/esp32/network_common.c                  | 107 +++-----------
 ports/esp32/network_lan.c                     |  52 +++----
 ports/esp32/network_ppp.c                     |   1 +
 ports/esp32/network_wlan.c                    | 129 ++++++++++-------
 ports/esp32/uart.h                            |   2 +-
 ports/esp32/usb.c                             |  11 +-
 ports/esp32/usb.h                             |   2 +-
 ports/esp32/usb_serial_jtag.c                 |   4 +-
 68 files changed, 485 insertions(+), 675 deletions(-)
 create mode 100644 ports/esp32/.gitignore
 delete mode 100644 ports/esp32/boards/GENERIC_SPIRAM/sdkconfig.board
 delete mode 100644 ports/esp32/boards/sdkconfig.nimble_core0
 delete mode 100644 ports/esp32/boards/sdkconfig.nimble_core1
 rename ports/esp32/{main/CMakeLists.txt => esp32_common.cmake} (69%)
 create mode 100644 ports/esp32/main_esp32/CMakeLists.txt
 create mode 100644 ports/esp32/main_esp32c3/CMakeLists.txt
 create mode 100644 ports/esp32/main_esp32s2/CMakeLists.txt
 create mode 100644 ports/esp32/main_esp32s2/idf_component.yml
 create mode 100644 ports/esp32/main_esp32s3/CMakeLists.txt
 create mode 100644 ports/esp32/main_esp32s3/idf_component.yml

diff --git a/ports/esp32/.gitignore b/ports/esp32/.gitignore
new file mode 100644
index 0000000000000..a78ecd0191c9f
--- /dev/null
+++ b/ports/esp32/.gitignore
@@ -0,0 +1,2 @@
+dependencies.lock
+managed_components/
diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 6992737c9b4d6..a4970c1a1b0b2 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -15,16 +15,15 @@ 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)
 
 # 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 board config; this is expected to set (among other options):
+# - SDKCONFIG_DEFAULTS
+# - IDF_TARGET
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
 
 # Set the frozen manifest file. Note if MICROPY_FROZEN_MANIFEST is set from the cmake
@@ -35,13 +34,6 @@ elseif (NOT MICROPY_FROZEN_MANIFEST)
     set(MICROPY_FROZEN_MANIFEST ${CMAKE_CURRENT_LIST_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)
-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})
@@ -51,5 +43,11 @@ 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.
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+# Set the location of the main component for the project (one per target).
+set(EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
+
 # Define the project.
 project(micropython)
diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index c37213b303109..dc9e9f8b723ac 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -22,13 +22,13 @@ Initial development of this ESP32 port was sponsored in part by Microbric Pty Lt
 Setting up ESP-IDF and the build environment
 --------------------------------------------
 
-MicroPython on ESP32 requires the Espressif IDF version 4 (IoT development
+MicroPython on ESP32 requires the Espressif IDF version 5 (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, v4.1.1, v4.2.2, v4.3.2 and v4.4,
+Currently MicroPython supports v5.0.2,
 although other IDF v4 versions may also work.
 
 To install the ESP-IDF the full instructions can be found at the
@@ -47,10 +47,10 @@ The steps to take are summarised below.
 To check out a copy of the IDF use git clone:
 
 ```bash
-$ git clone -b v4.0.2 --recursive https://github.com/espressif/esp-idf.git
+$ git clone -b v5.0.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v4.0.2` with `v4.2.2` or `v4.4` or any other supported version.
+You can replace `v5.0.2` with 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.)
 
@@ -59,7 +59,7 @@ MicroPython and update the submodules using:
 
 ```bash
 $ cd esp-idf
-$ git checkout v4.2
+$ git checkout v5.0.2
 $ git submodule update --init --recursive
 ```
 
@@ -75,11 +75,6 @@ $ 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 `v4.4` or later.
-- ESP32-S2 and ESP32-C3 require `v4.3.1` or later.
-
 Building the firmware
 ---------------------
 
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
index 9373a522324db..ea263cad9f4af 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
+++ b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
diff --git a/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board b/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board
index f0cbad00e4617..d9e7c7f61f620 100644
--- a/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board
@@ -1,9 +1,7 @@
 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/boards/GENERIC_D2WD/sdkconfig.board b/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
index 07e208a09ae7b..7b4313b7deef1 100644
--- a/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
@@ -1,6 +1,7 @@
 # Optimise using -Os to reduce size
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=n
+CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 
 CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
diff --git a/ports/esp32/boards/GENERIC_S3/sdkconfig.board b/ports/esp32/boards/GENERIC_S3/sdkconfig.board
index c9726d4232ed4..7b9d932503e55 100644
--- a/ports/esp32/boards/GENERIC_S3/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_S3/sdkconfig.board
@@ -1,10 +1,7 @@
 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=
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
index c9726d4232ed4..7b9d932503e55 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
@@ -1,10 +1,7 @@
 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=
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
index c9726d4232ed4..7b9d932503e55 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
@@ -1,10 +1,7 @@
 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=
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
index dcffe5f01e7a0..2e1d799b93b1c 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -2,5 +2,4 @@ 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
deleted file mode 100644
index a2859acb5f906..0000000000000
--- a/ports/esp32/boards/GENERIC_SPIRAM/sdkconfig.board
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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/LOLIN_C3_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
index f0cbad00e4617..d9e7c7f61f620 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
@@ -1,9 +1,7 @@
 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/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
index ccda7bff68129..88bc9e72aca76 100644
--- a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
@@ -1,15 +1,11 @@
 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"
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
index 556de1f8b4227..87a92892d07e1 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
@@ -3,8 +3,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
-CONFIG_SPIRAM_MEMTEST=
-
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2Neo"
 # end of LWIP
diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
index 5e20045125463..a4a167de8a748 100644
--- a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -1,10 +1,7 @@
 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
@@ -13,11 +10,9 @@ 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
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_fs3_"
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
index 06b3a00a1c5a4..74ca6df8f6686 100644
--- a/ports/esp32/boards/UM_PROS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -1,10 +1,7 @@
 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
@@ -13,9 +10,7 @@ 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"
diff --git a/ports/esp32/boards/UM_TINYPICO/sdkconfig.board b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
index 8ed083e62d1a4..766419c7f81a3 100644
--- a/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
@@ -3,6 +3,3 @@ 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
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
index 39a2a293acc8c..5e129e4d8e33f 100644
--- a/ports/esp32/boards/UM_TINYS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
@@ -3,8 +3,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
-CONFIG_SPIRAM_MEMTEST=
-
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS2"
 # end of LWIP
diff --git a/ports/esp32/boards/UM_TINYS3/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
index 2b9ddbebe7b5d..0ac3c1f4cb157 100644
--- a/ports/esp32/boards/UM_TINYS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -1,10 +1,7 @@
 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=
@@ -13,9 +10,7 @@ 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"
diff --git a/ports/esp32/boards/sdkconfig.240mhz b/ports/esp32/boards/sdkconfig.240mhz
index e36884009d1ed..c89a1ed251899 100644
--- a/ports/esp32/boards/sdkconfig.240mhz
+++ b/ports/esp32/boards/sdkconfig.240mhz
@@ -1,5 +1,6 @@
 # MicroPython on ESP32, ESP IDF configuration with 240MHz CPU
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_40=
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 138de095b45f2..c74a19c0cf2aa 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -4,8 +4,6 @@
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 # 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_PERF=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 
@@ -21,10 +19,14 @@ CONFIG_LOG_DEFAULT_LEVEL_INFO=n
 CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
 CONFIG_LOG_DEFAULT_LEVEL=1
 
-# ESP32-specific
+# Main XTAL Config
+# Only on: ESP32
+CONFIG_XTAL_FREQ_AUTO=y
+
+# ESP System Settings
+# Only on: ESP32, ESP32S3
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
-CONFIG_ESP32_XTAL_FREQ_AUTO=y
 
 # Power Management
 CONFIG_PM_ENABLE=y
@@ -44,16 +46,14 @@ CONFIG_LWIP_PPP_PAP_SUPPORT=y
 CONFIG_LWIP_PPP_CHAP_SUPPORT=y
 
 # SSL
-# Use 4kiB output buffer instead of default 16kiB (because IDF heap is fragmented in 4.0)
+# Use 4kiB output buffer instead of default 16kiB
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 
 # ULP coprocessor support
-CONFIG_ESP32_ULP_COPROC_ENABLED=y
-CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=2040
-CONFIG_ESP32S2_ULP_COPROC_ENABLED=y
-CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=2040
-CONFIG_ESP32S3_ULP_COPROC_ENABLED=y
-CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=2040
+# Only on: ESP32, ESP32S2, ESP32S3
+CONFIG_ULP_COPROC_ENABLED=y
+CONFIG_ULP_COPROC_TYPE_FSM=y
+CONFIG_ULP_COPROC_RESERVE_MEM=2040
 
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
@@ -64,7 +64,17 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
 
-# ADC calibration
+# Legacy ADC Calibration Configuration
+# Only on: ESP32
 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
 CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
 CONFIG_ADC_CAL_LUT_ENABLE=y
+
+# UART Configuration
+CONFIG_UART_ISR_IN_IRAM=y
+
+# IDF 5 deprecated
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/ports/esp32/boards/sdkconfig.ble b/ports/esp32/boards/sdkconfig.ble
index 08d5e481f4993..91ac3240ebee7 100644
--- a/ports/esp32/boards/sdkconfig.ble
+++ b/ports/esp32/boards/sdkconfig.ble
@@ -1,9 +1,14 @@
-# Note this requires building with IDF 4.x
+CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR=y
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
-CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CTRL_MODE_BTDM=
-
 CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_CONTROLLER_ENABLED=y
 
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
+
+# 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.
+# Only on: ESP32, ESP32S2, ESP32S3
+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/boards/sdkconfig.nimble_core0 b/ports/esp32/boards/sdkconfig.nimble_core0
deleted file mode 100644
index cacaff1197cb3..0000000000000
--- a/ports/esp32/boards/sdkconfig.nimble_core0
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
deleted file mode 100644
index 33653cc4b164c..0000000000000
--- a/ports/esp32/boards/sdkconfig.nimble_core1
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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/boards/sdkconfig.spiram b/ports/esp32/boards/sdkconfig.spiram
index 5b4ce118b890e..74d35f7b4ad4a 100644
--- a/ports/esp32/boards/sdkconfig.spiram
+++ b/ports/esp32/boards/sdkconfig.spiram
@@ -1,6 +1,11 @@
 # MicroPython on ESP32, ESP IDF configuration with SPIRAM support
 
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_MEMMAP=y
+CONFIG_SPIRAM_USE_CAPS_ALLOC=y
+
+# SPIRAM increases the size of the firmware and overflows iram0_0_seg, due
+# to PSRAM bug workarounds.  Apply some options to reduce the firmware size.
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
diff --git a/ports/esp32/boards/sdkconfig.spiram_sx b/ports/esp32/boards/sdkconfig.spiram_sx
index ef24e90829e16..fe388467800e2 100644
--- a/ports/esp32/boards/sdkconfig.spiram_sx
+++ b/ports/esp32/boards/sdkconfig.spiram_sx
@@ -1,6 +1,4 @@
 # 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
@@ -9,7 +7,4 @@ 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
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+CONFIG_SPIRAM_USE_CAPS_ALLOC=y
diff --git a/ports/esp32/boards/sdkconfig.usb b/ports/esp32/boards/sdkconfig.usb
index 657edbc58059b..4090c710e62e6 100644
--- a/ports/esp32/boards/sdkconfig.usb
+++ b/ports/esp32/boards/sdkconfig.usb
@@ -1,4 +1,4 @@
-CONFIG_USB_ENABLED=y
-CONFIG_USB_CDC_ENABLED=y
-CONFIG_USB_CDC_RX_BUFSIZE=256
-CONFIG_USB_CDC_TX_BUFSIZE=256
+CONFIG_USB_OTG_SUPPORTED=y
+CONFIG_TINYUSB_CDC_ENABLED=y
+CONFIG_TINYUSB_CDC_RX_BUFSIZE=256
+CONFIG_TINYUSB_CDC_TX_BUFSIZE=256
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/esp32_common.cmake
similarity index 69%
rename from ports/esp32/main/CMakeLists.txt
rename to ports/esp32/esp32_common.cmake
index 4311af801c0f3..d55dd38134fb8 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/esp32_common.cmake
@@ -1,8 +1,9 @@
 # Set location of base MicroPython directory.
 if(NOT MICROPY_DIR)
-    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
 endif()
 
+# Set location of the ESP32 port directory.
 if(NOT MICROPY_PORT_DIR)
     get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
 endif()
@@ -19,11 +20,11 @@ if(NOT CMAKE_BUILD_EARLY_EXPANSION)
     include(${MICROPY_DIR}/extmod/extmod.cmake)
 endif()
 
-set(MICROPY_QSTRDEFS_PORT
+list(APPEND MICROPY_QSTRDEFS_PORT
     ${MICROPY_PORT_DIR}/qstrdefsport.h
 )
 
-set(MICROPY_SOURCE_SHARED
+list(APPEND MICROPY_SOURCE_SHARED
     ${MICROPY_DIR}/shared/readline/readline.c
     ${MICROPY_DIR}/shared/netutils/netutils.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
@@ -33,25 +34,22 @@ set(MICROPY_SOURCE_SHARED
     ${MICROPY_DIR}/shared/runtime/pyexec.c
 )
 
-set(MICROPY_SOURCE_LIB
+list(APPEND 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/esp32_mbedtls_errors.c
+    #${MICROPY_DIR}/lib/mbedtls_errors/esp32_mbedtls_errors.c
     ${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
+list(APPEND MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/bus/softspi.c
     ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
-set(MICROPY_SOURCE_PORT
+list(APPEND MICROPY_SOURCE_PORT
     main.c
     ppp_set_auth.c
     uart.c
@@ -93,7 +91,7 @@ set(MICROPY_SOURCE_PORT
 )
 list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
 
-set(MICROPY_SOURCE_QSTR
+list(APPEND MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
     ${MICROPY_SOURCE_USERMOD}
@@ -103,63 +101,42 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_BOARD}
 )
 
-set(IDF_COMPONENTS
+list(APPEND IDF_COMPONENTS
     app_update
     bootloader_support
     bt
     driver
-    esp_adc_cal
+    esp_adc
+    esp_app_format
     esp_common
     esp_eth
     esp_event
+    esp_hw_support
+    esp_netif
+    esp_partition
+    esp_pm
+    esp_psram
     esp_ringbuf
     esp_rom
+    esp_system
+    esp_timer
     esp_wifi
     freertos
+    hal
     heap
     log
     lwip
     mbedtls
-    mdns
     newlib
     nvs_flash
     sdmmc
     soc
     spi_flash
-    tcpip_adapter
     ulp
     vfs
     xtensa
 )
 
-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 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 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)
-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)
-elseif(IDF_TARGET STREQUAL "esp32s3")
-    list(APPEND IDF_COMPONENTS esp32s3)
-    list(APPEND IDF_COMPONENTS tinyusb)
-endif()
-
 # Register the main IDF component.
 idf_component_register(
     SRCS
@@ -216,18 +193,8 @@ 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})
+    micropy_gather_target_properties(${comp})
 endforeach()
 
-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)
-    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.
 include(${MICROPY_DIR}/py/mkrules.cmake)
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 3cd43e8474e66..f92af636f55a2 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -48,11 +48,7 @@
 // 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;
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 439ee3283683d..97041c60bd6be 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -35,7 +35,6 @@
 #elif CONFIG_IDF_TARGET_ESP32S3
 #include "esp32s3/ulp.h"
 #endif
-#include "esp_err.h"
 
 typedef struct _esp32_ulp_obj_t {
     mp_obj_base_t base;
@@ -93,13 +92,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 CONFIG_IDF_TARGET_ESP32
-    { MP_ROM_QSTR(MP_QSTR_RESERVE_MEM), MP_ROM_INT(CONFIG_ESP32_ULP_COPROC_RESERVE_MEM) },
-    #elif CONFIG_IDF_TARGET_ESP32S2
-    { MP_ROM_QSTR(MP_QSTR_RESERVE_MEM), MP_ROM_INT(CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM) },
-    #elif CONFIG_IDF_TARGET_ESP32S3
-    { MP_ROM_QSTR(MP_QSTR_RESERVE_MEM), MP_ROM_INT(CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM) },
-    #endif
+    { MP_ROM_QSTR(MP_QSTR_RESERVE_MEM), MP_ROM_INT(CONFIG_ULP_COPROC_RESERVE_MEM) },
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_ulp_locals_dict, esp32_ulp_locals_dict_table);
 
diff --git a/ports/esp32/gccollect.c b/ports/esp32/gccollect.c
index 403a3c7dfa0fb..6fa287de28c0c 100644
--- a/ports/esp32/gccollect.c
+++ b/ports/esp32/gccollect.c
@@ -34,7 +34,6 @@
 #include "py/gc.h"
 #include "py/mpthread.h"
 #include "gccollect.h"
-#include "soc/cpu.h"
 
 #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 
@@ -50,7 +49,7 @@ static void gc_collect_inner(int level) {
 
     if (level == XCHAL_NUM_AREGS / 8) {
         // get the sp
-        volatile uint32_t sp = (uint32_t)get_sp();
+        volatile uint32_t sp = (uint32_t)esp_cpu_get_sp();
         gc_collect_root((void **)sp, ((mp_uint_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
         return;
     }
diff --git a/ports/esp32/machine_adcblock.h b/ports/esp32/machine_adcblock.h
index 0500726d71791..7c9249b072c18 100644
--- a/ports/esp32/machine_adcblock.h
+++ b/ports/esp32/machine_adcblock.h
@@ -3,6 +3,8 @@
 
 #include "esp_adc_cal.h"
 
+#define ADC_ATTEN_MAX SOC_ADC_ATTEN_NUM
+
 typedef struct _madcblock_obj_t {
     mp_obj_base_t base;
     adc_unit_t unit_id;
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index 4284b5f8baf77..87a5ae53cfe54 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -28,6 +28,10 @@
 #include "py/mphal.h"
 #include "modesp32.h"
 
+#include "rom/gpio.h"
+#include "soc/gpio_reg.h"
+#include "soc/gpio_sig_map.h"
+
 #if MICROPY_PY_MACHINE_BITSTREAM
 
 /******************************************************************************/
@@ -52,7 +56,7 @@ STATIC void IRAM_ATTR machine_bitstream_high_low_bitbang(mp_hal_pin_obj_t pin, u
     }
 
     // Convert ns to cpu ticks [high_time_0, period_0, high_time_1, period_1].
-    uint32_t fcpu_mhz = ets_get_cpu_frequency();
+    uint32_t fcpu_mhz = esp_rom_get_cpu_ticks_per_us();
     for (size_t i = 0; i < 4; ++i) {
         timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
         if (timing_ns[i] > NS_TICKS_OVERHEAD) {
@@ -91,27 +95,6 @@ STATIC void IRAM_ATTR machine_bitstream_high_low_bitbang(mp_hal_pin_obj_t pin, u
 
 #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.
-#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
-
 // 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 }}};
@@ -163,13 +146,7 @@ STATIC void machine_bitstream_high_low_rmt(mp_hal_pin_obj_t pin, uint32_t *timin
 
     // 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;
 
@@ -193,7 +170,7 @@ STATIC void machine_bitstream_high_low_rmt(mp_hal_pin_obj_t pin, uint32_t *timin
     check_esp_err(rmt_driver_uninstall(config.channel));
 
     // Cancel RMT output to GPIO pin.
-    gpio_matrix_out(pin, SIG_GPIO_OUT_IDX, false, false);
+    esp_rom_gpio_connect_out_signal(pin, SIG_GPIO_OUT_IDX, false, false);
 }
 
 /******************************************************************************/
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 36f8d3f06956a..662d0e599419b 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -35,6 +35,8 @@
 #include "modmachine.h"
 
 #include "driver/spi_master.h"
+#include "soc/gpio_sig_map.h"
+#include "soc/spi_pins.h"
 
 // SPI mappings by device, naming used by IDF old/new
 // upython   | ESP32     | ESP32S2   | ESP32S3 | ESP32C3
@@ -57,9 +59,9 @@
 #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
+#define MICROPY_HW_SPI1_SCK SPI2_IOMUX_PIN_NUM_CLK
+#define MICROPY_HW_SPI1_MOSI SPI2_IOMUX_PIN_NUM_MOSI
+#define MICROPY_HW_SPI1_MISO SPI2_IOMUX_PIN_NUM_MISO
 #endif
 #endif
 
@@ -67,9 +69,9 @@
 #ifndef MICROPY_HW_SPI2_SCK
 #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
+#define MICROPY_HW_SPI2_SCK SPI3_IOMUX_PIN_NUM_CLK      // pin 18
+#define MICROPY_HW_SPI2_MOSI SPI3_IOMUX_PIN_NUM_MOSI    // pin 23
+#define MICROPY_HW_SPI2_MISO SPI3_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
@@ -83,9 +85,9 @@
 #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
+#define SPI2_HOST SPI2_HOST
 #elif CONFIG_IDF_TARGET_ESP32S3
-#define HSPI_HOST SPI3_HOST
+#define SPI2_HOST SPI3_HOST
 #define FSPI_HOST SPI2_HOST
 #endif
 
@@ -122,7 +124,7 @@ STATIC const machine_hw_spi_default_pins_t machine_hw_spi_default_pins[2] = {
     #endif
 };
 
-// Static objects mapping to HSPI and VSPI hardware peripherals
+// Static objects mapping to SPI2 and SPI3 hardware peripherals
 STATIC machine_hw_spi_obj_t machine_hw_spi_obj[2];
 
 STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
@@ -150,8 +152,8 @@ STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
 
     for (int i = 0; i < 3; i++) {
         if (pins[i] != -1) {
-            gpio_pad_select_gpio(pins[i]);
-            gpio_matrix_out(pins[i], SIG_GPIO_OUT_IDX, false, false);
+            esp_rom_gpio_pad_select_gpio(pins[i]);
+            esp_rom_gpio_connect_out_signal(pins[i], SIG_GPIO_OUT_IDX, false, false);
             gpio_set_direction(pins[i], GPIO_MODE_INPUT);
         }
     }
@@ -226,12 +228,12 @@ STATIC void machine_hw_spi_init_internal(
         changed = true;
     }
 
-    if (self->host != HSPI_HOST
+    if (self->host != SPI2_HOST
         #ifdef FSPI_HOST
         && self->host != FSPI_HOST
         #endif
-        #ifdef VSPI_HOST
-        && self->host != VSPI_HOST
+        #ifdef SPI3_HOST
+        && self->host != SPI3_HOST
         #endif
         ) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), self->host);
@@ -270,7 +272,7 @@ STATIC void machine_hw_spi_init_internal(
     #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 (self->host == SPI2_HOST) {
         dma_chan = 1;
     } else {
         dma_chan = 2;
@@ -483,7 +485,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 == 1) { // SPI2_HOST which is FSPI_HOST on ESP32Sx, HSPI_HOST on others
+    if (args[ARG_id].u_int == 1) { // SPI2_HOST which is FSPI_HOST on ESP32Sx, SPI2_HOST on others
         self = &machine_hw_spi_obj[0];
         default_pins = &machine_hw_spi_default_pins[0];
     } else {
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 9ec39e5649668..e3b76477902f9 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -31,13 +31,7 @@
 #include "modmachine.h"
 
 #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)
@@ -125,7 +119,7 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_
     }
 
     // TODO proper timeout
-    esp_err_t err = i2c_master_cmd_begin(self->port, cmd, 100 * (1 + data_len) / portTICK_RATE_MS);
+    esp_err_t err = i2c_master_cmd_begin(self->port, cmd, 100 * (1 + data_len) / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
 
     if (err == ESP_FAIL) {
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index f0163486cd73e..59b24ae70c3af 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -148,7 +148,7 @@ STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYT
 };
 
 void machine_i2s_init0() {
-    for (i2s_port_t p = 0; p < I2S_NUM_MAX; p++) {
+    for (i2s_port_t p = 0; p < I2S_NUM_AUTO; p++) {
         MP_STATE_PORT(machine_i2s_obj)[p] = NULL;
     }
 }
@@ -269,15 +269,6 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
             num_bytes_requested_from_dma,
             &num_bytes_received_from_dma,
             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.
@@ -334,15 +325,6 @@ STATIC size_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appb
     }
 
     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 == ASYNCIO) && (num_bytes_written < appbuf->len)) {
@@ -467,10 +449,8 @@ STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args,
     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.mclk_multiple = I2S_MCLK_MULTIPLE_256;
     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));
@@ -487,9 +467,7 @@ 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;
 
@@ -527,7 +505,7 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
     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) {
+    if (port < 0 || port >= I2S_NUM_AUTO) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
     }
 
@@ -841,6 +819,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_i2s_locals_dict
     );
 
-MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]);
+MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_AUTO]);
 
 #endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index f103b96963ce4..5ea41701afe3c 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -31,6 +31,7 @@
 
 #include "driver/gpio.h"
 #include "driver/rtc_io.h"
+#include "hal/gpio_ll.h"
 
 #include "py/runtime.h"
 #include "py/mphal.h"
@@ -92,11 +93,7 @@ STATIC const machine_pin_obj_t machine_pin_obj[GPIO_NUM_MAX] = {
     #endif
     {{&machine_pin_type}, GPIO_NUM_18},
     {{&machine_pin_type}, GPIO_NUM_19},
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 2)
     {{&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},
@@ -295,7 +292,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     #endif
 
     // configure the pin for gpio
-    gpio_pad_select_gpio(self->id);
+    esp_rom_gpio_pad_select_gpio(self->id);
 
     // set initial value (do this before configuring mode/pull)
     if (args[ARG_value].u_obj != MP_OBJ_NULL) {
@@ -423,7 +420,7 @@ 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_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_trigger, MP_ARG_INT, {.u_int = GPIO_INTR_POSEDGE | GPIO_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]);
@@ -436,7 +433,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
         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) {
+        if ((trigger == GPIO_INTR_LOW_LEVEL || trigger == GPIO_INTR_HIGH_LEVEL) && wake_obj != mp_const_none) {
             mp_int_t wake;
             if (mp_obj_get_int_maybe(wake_obj, &wake)) {
                 if (wake < 2 || wake > 7) {
@@ -460,7 +457,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
                 mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
             }
 
-            machine_rtc_config.ext0_level = trigger == GPIO_PIN_INTR_LOLEVEL ? 0 : 1;
+            machine_rtc_config.ext0_level = trigger == GPIO_INTR_LOW_LEVEL ? 0 : 1;
             machine_rtc_config.ext0_wake_types = wake;
         } else {
             if (machine_rtc_config.ext0_pin == self->id) {
@@ -497,10 +494,10 @@ 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_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) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_INTR_POSEDGE) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_INTR_NEGEDGE) },
+    { MP_ROM_QSTR(MP_QSTR_WAKE_LOW), MP_ROM_INT(GPIO_INTR_LOW_LEVEL) },
+    { MP_ROM_QSTR(MP_QSTR_WAKE_HIGH), MP_ROM_INT(GPIO_INTR_HIGH_LEVEL) },
     { 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) },
@@ -573,11 +570,7 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[GPIO_NUM_MAX] = {
     #endif
     {{&machine_pin_irq_type}, GPIO_NUM_18},
     {{&machine_pin_irq_type}, GPIO_NUM_19},
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 2)
     {{&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},
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 445ac80fb218c..462d0fa79c740 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -34,6 +34,7 @@
 
 #include "driver/ledc.h"
 #include "esp_err.h"
+#include "soc/gpio_sig_map.h"
 
 #define PWM_DBG(...)
 // #define PWM_DBG(...) mp_printf(&mp_plat_print, __VA_ARGS__); mp_printf(&mp_plat_print, "\n");
@@ -164,13 +165,13 @@ STATIC void pwm_deinit(int 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);
+            // esp_rom_gpio_connect_out_signal(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);
+                esp_rom_gpio_connect_out_signal(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);
+                esp_rom_gpio_connect_out_signal(pin, LEDC_HS_SIG_OUT0_IDX + channel, false, true);
                 #else
                 #error Add supported CONFIG_IDF_TARGET_ESP32_xxx
                 #endif
@@ -209,18 +210,13 @@ 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) {
     if (freq != timer->freq_hz) {
         // Find the highest bit resolution for the requested frequency
-        unsigned int i = LEDC_APB_CLK_HZ; // 80 MHz
+        unsigned int i = APB_CLK_FREQ; // 80 MHz
         #if SOC_LEDC_SUPPORT_REF_TICK
         if (freq < EMPIRIC_FREQ) {
-            i = LEDC_REF_CLK_HZ; // 1 MHz
+            i = REF_CLK_FREQ; // 1 MHz
         }
         #endif
 
-        #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
         int divider = (i + freq / 2) / freq; // rounded
         if (divider == 0) {
             divider = 1;
@@ -230,7 +226,6 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
             f = 1.0;
         }
         i = (unsigned int)roundf((float)i / f);
-        #endif
 
         unsigned int res = 0;
         for (; i > 1; i >>= 1) {
@@ -354,7 +349,7 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
     // See https://github.com/espressif/esp-idf/issues/7288
     if (duty != get_duty_u16(self)) {
         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);
+        esp_rom_delay_us(2 * 1000000 / timer.freq_hz);
         if (duty != get_duty_u16(self)) {
             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);
         }
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 5b495f8494e77..a2d133442f10b 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -69,6 +69,68 @@ typedef struct _sdcard_obj_t {
 
 #define _SECTOR_SIZE(self) (self->card.csd.sector_size)
 
+// SPI bus default bus and device configuration.
+
+static const spi_bus_config_t spi_bus_defaults[2] = {
+    {
+        #if CONFIG_IDF_TARGET_ESP32
+        .miso_io_num = GPIO_NUM_19,
+        .mosi_io_num = GPIO_NUM_23,
+        .sclk_io_num = GPIO_NUM_18,
+        #else
+        .miso_io_num = GPIO_NUM_36,
+        .mosi_io_num = GPIO_NUM_35,
+        .sclk_io_num = GPIO_NUM_37,
+        #endif
+        .data2_io_num = GPIO_NUM_NC,
+        .data3_io_num = GPIO_NUM_NC,
+        .data4_io_num = GPIO_NUM_NC,
+        .data5_io_num = GPIO_NUM_NC,
+        .data6_io_num = GPIO_NUM_NC,
+        .data7_io_num = GPIO_NUM_NC,
+        .max_transfer_sz = 4000,
+        .flags = SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK | SPICOMMON_BUSFLAG_MISO | SPICOMMON_BUSFLAG_MOSI,
+        .intr_flags = 0,
+    },
+    {
+        .miso_io_num = GPIO_NUM_2,
+        .mosi_io_num = GPIO_NUM_15,
+        .sclk_io_num = GPIO_NUM_14,
+        .data2_io_num = GPIO_NUM_NC,
+        .data3_io_num = GPIO_NUM_NC,
+        .data4_io_num = GPIO_NUM_NC,
+        .data5_io_num = GPIO_NUM_NC,
+        .data6_io_num = GPIO_NUM_NC,
+        .data7_io_num = GPIO_NUM_NC,
+        .max_transfer_sz = 4000,
+        .flags = SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK | SPICOMMON_BUSFLAG_MISO | SPICOMMON_BUSFLAG_MOSI,
+        .intr_flags = 0,
+    },
+};
+
+#if CONFIG_IDF_TARGET_ESP32
+static const uint8_t spi_dma_channel_defaults[2] = {
+    2,
+    1,
+};
+#endif
+
+static const sdspi_device_config_t spi_dev_defaults[2] = {
+    {
+        #if CONFIG_IDF_TARGET_ESP32
+        .host_id = VSPI_HOST,
+        .gpio_cs = GPIO_NUM_5,
+        #else
+        .host_id = SPI3_HOST,
+        .gpio_cs = GPIO_NUM_34,
+        #endif
+        .gpio_cd = SDSPI_SLOT_NO_CD,
+        .gpio_wp = SDSPI_SLOT_NO_WP,
+        .gpio_int = SDSPI_SLOT_NO_INT,
+    },
+    SDSPI_DEVICE_CONFIG_DEFAULT(), // HSPI (ESP32) / SPI2 (ESP32S3)
+};
+
 STATIC gpio_num_t pin_or_int(const mp_obj_t arg) {
     if (mp_obj_is_small_int(arg)) {
         return MP_OBJ_SMALL_INT_VALUE(arg);
@@ -188,10 +250,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
+        // Needs to match spi_dev_defaults above.
+        #if CONFIG_IDF_TARGET_ESP32
         self->host.slot = slot_num ? HSPI_HOST : VSPI_HOST;
+        #else
+        self->host.slot = slot_num ? SPI2_HOST : SPI3_HOST;
         #endif
     }
 
@@ -202,46 +265,39 @@ 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 = SPI_DMA_CH_AUTO
-            },
-            SDSPI_SLOT_CONFIG_DEFAULT()
-        };
+        DEBUG_printf("  Setting up SPI slot configuration");
+        spi_host_device_t spi_host_id = self->host.slot;
+        spi_bus_config_t bus_config = spi_bus_defaults[slot_num];
+        #if CONFIG_IDF_TARGET_ESP32
+        spi_dma_chan_t dma_channel = spi_dma_channel_defaults[slot_num];
         #else
-        STATIC const sdspi_slot_config_t slot_defaults[2] = {
-            {
-                .gpio_miso = GPIO_NUM_19,
-                .gpio_mosi = GPIO_NUM_23,
-                .gpio_sck = GPIO_NUM_18,
-                .gpio_cs = GPIO_NUM_5,
-                .gpio_cd = SDSPI_SLOT_NO_CD,
-                .gpio_wp = SDSPI_SLOT_NO_WP,
-                .dma_channel = 2
-            },
-            SDSPI_SLOT_CONFIG_DEFAULT()
-        };
+        spi_dma_chan_t dma_channel = SPI_DMA_CH_AUTO;
         #endif
+        sdspi_device_config_t dev_config = spi_dev_defaults[slot_num];
 
-        DEBUG_printf("  Setting up SPI slot configuration");
-        sdspi_slot_config_t slot_config = slot_defaults[slot_num];
+        SET_CONFIG_PIN(bus_config, miso_io_num, ARG_miso);
+        SET_CONFIG_PIN(bus_config, mosi_io_num, ARG_mosi);
+        SET_CONFIG_PIN(bus_config, sclk_io_num, ARG_sck);
 
-        SET_CONFIG_PIN(slot_config, gpio_cd, ARG_cd);
-        SET_CONFIG_PIN(slot_config, gpio_wp, ARG_wp);
-        SET_CONFIG_PIN(slot_config, gpio_miso, ARG_miso);
-        SET_CONFIG_PIN(slot_config, gpio_mosi, ARG_mosi);
-        SET_CONFIG_PIN(slot_config, gpio_sck, ARG_sck);
-        SET_CONFIG_PIN(slot_config, gpio_cs, ARG_cs);
+        SET_CONFIG_PIN(dev_config, gpio_cs, ARG_cs);
+        SET_CONFIG_PIN(dev_config, gpio_cd, ARG_cd);
+        SET_CONFIG_PIN(dev_config, gpio_wp, ARG_wp);
 
-        DEBUG_printf("  Calling init_slot()");
-        check_esp_err(sdspi_host_init_slot(self->host.slot, &slot_config));
+        DEBUG_printf("  Calling spi_bus_initialize()");
+        check_esp_err(spi_bus_initialize(spi_host_id, &bus_config, dma_channel));
+
+        DEBUG_printf("  Calling sdspi_host_init_device()");
+        sdspi_dev_handle_t sdspi_handle;
+        esp_err_t ret = sdspi_host_init_device(&dev_config, &sdspi_handle);
+        if (ret != ESP_OK) {
+            spi_bus_free(spi_host_id);
+            check_esp_err(ret);
+        }
+        if (self->host.slot != sdspi_handle) {
+            // MicroPython restriction: the SPI bus must be exclusively for the SD card.
+            spi_bus_free(spi_host_id);
+            mp_raise_ValueError(MP_ERROR_TEXT("SPI bus already in use"));
+        }
     } else {
         // SD/MMC interface
         DEBUG_printf("  Setting up SDMMC slot configuration");
@@ -275,12 +331,9 @@ 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) {
-        #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
-        {
+        } else {
             self->host.deinit();
         }
         if (self->host.flags & SDMMC_HOST_FLAG_SPI) {
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index c66cb2a48d903..5855cfb3e0b09 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -36,16 +36,13 @@
 #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
 
 // TIMER_BASE_CLK is normally 80MHz. TIMER_DIVIDER ought to divide this exactly
-#define TIMER_SCALE    (TIMER_BASE_CLK / TIMER_DIVIDER)
+#define TIMER_SCALE    (APB_CLK_FREQ / TIMER_DIVIDER)
 
 #define TIMER_FLAGS    0
 
@@ -143,39 +140,14 @@ 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 && 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)
     #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
-    #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
-
-    device->hw_timer[self->index].update = 1;
-    if (self->index) {
-        device->int_clr_timers.t1 = 1;
-    } else {
-        device->int_clr_timers.t0 = 1;
-    }
-    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_uart.c b/ports/esp32/machine_uart.c
index 8e6e5788d074e..d9b845047b6b3 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -37,17 +37,10 @@
 #include "modmachine.h"
 #include "uart.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)
 
@@ -273,9 +266,7 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
         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);
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
index 4ccf417b60999..2cb6c518175eb 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -54,14 +54,16 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
         mp_raise_ValueError(NULL);
     }
 
-    // Convert milliseconds to seconds (esp_task_wdt_init needs seconds)
-    args[ARG_timeout].u_int /= 1000;
-
     if (args[ARG_timeout].u_int <= 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("WDT timeout too short"));
     }
 
-    mp_int_t rs_code = esp_task_wdt_init(args[ARG_timeout].u_int, true);
+    esp_task_wdt_config_t config = {
+        .timeout_ms = args[ARG_timeout].u_int,
+        .idle_core_mask = 0,
+        .trigger_panic = true,
+    };
+    mp_int_t rs_code = esp_task_wdt_reconfigure(&config);
     if (rs_code != ESP_OK) {
         mp_raise_OSError(rs_code);
     }
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 3e7c9ee162d79..b8ba03e513fff 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -35,16 +35,9 @@
 #include "esp_system.h"
 #include "nvs_flash.h"
 #include "esp_task.h"
-#include "soc/cpu.h"
+#include "esp_event.h"
 #include "esp_log.h"
-
-#if CONFIG_IDF_TARGET_ESP32
-#include "esp32/spiram.h"
-#elif CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/spiram.h"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/spiram.h"
-#endif
+#include "esp_psram.h"
 
 #include "py/stackctrl.h"
 #include "py/nlr.h"
@@ -88,11 +81,11 @@ int vprintf_null(const char *format, va_list ap) {
 }
 
 void mp_task(void *pvParameter) {
-    volatile uint32_t sp = (uint32_t)get_sp();
+    volatile uint32_t sp = (uint32_t)esp_cpu_get_sp();
     #if MICROPY_PY_THREAD
     mp_thread_init(pxTaskGetStackStart(NULL), MP_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
-    #if CONFIG_USB_ENABLED
+    #if CONFIG_USB_OTG_SUPPORTED
     usb_init();
     #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_init();
@@ -102,50 +95,18 @@ void mp_task(void *pvParameter) {
     #endif
     machine_init();
 
-    size_t mp_task_heap_size;
-    void *mp_task_heap = NULL;
-
-    #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()) {
-        case ESP_SPIRAM_SIZE_16MBITS:
-            mp_task_heap_size = 2 * 1024 * 1024;
-            break;
-        case ESP_SPIRAM_SIZE_32MBITS:
-        case ESP_SPIRAM_SIZE_64MBITS:
-            mp_task_heap_size = 4 * 1024 * 1024;
-            break;
-        default:
-            // No SPIRAM, fallback to normal allocation
-            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 esp_spiram_size = esp_spiram_get_size();
-    if (esp_spiram_size > 0) {
-        mp_task_heap = (void *)SOC_EXTRAM_DATA_HIGH - esp_spiram_size;
-        mp_task_heap_size = esp_spiram_size;
+    esp_err_t err = esp_event_loop_create_default();
+    if (err != ESP_OK) {
+        ESP_LOGE("esp_init", "can't create event loop: 0x%x\n", err);
     }
-    #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.
-        #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);
-    }
+    // 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.
+    // When SPIRAM is enabled, this will allocate from SPIRAM.
+    uint32_t caps = MALLOC_CAP_8BIT;
+    size_t heap_total = heap_caps_get_total_size(caps);
+    size_t mp_task_heap_size = MIN(heap_caps_get_largest_free_block(caps), heap_total / 2);
+    void *mp_task_heap = heap_caps_malloc(mp_task_heap_size, caps);
 
 soft_reset:
     // initialise the stack pointer for the main thread
diff --git a/ports/esp32/main_esp32/CMakeLists.txt b/ports/esp32/main_esp32/CMakeLists.txt
new file mode 100644
index 0000000000000..40188abff8e57
--- /dev/null
+++ b/ports/esp32/main_esp32/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Set location of base MicroPython directory.
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
+endif()
+
+# Set location of the ESP32 port directory.
+if(NOT MICROPY_PORT_DIR)
+    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
+endif()
+
+include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32c3/CMakeLists.txt b/ports/esp32/main_esp32c3/CMakeLists.txt
new file mode 100644
index 0000000000000..307c0f32183a9
--- /dev/null
+++ b/ports/esp32/main_esp32c3/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Set location of base MicroPython directory.
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
+endif()
+
+# Set location of the ESP32 port directory.
+if(NOT MICROPY_PORT_DIR)
+    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
+endif()
+
+list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
+list(APPEND IDF_COMPONENTS riscv)
+
+include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32s2/CMakeLists.txt b/ports/esp32/main_esp32s2/CMakeLists.txt
new file mode 100644
index 0000000000000..40188abff8e57
--- /dev/null
+++ b/ports/esp32/main_esp32s2/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Set location of base MicroPython directory.
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
+endif()
+
+# Set location of the ESP32 port directory.
+if(NOT MICROPY_PORT_DIR)
+    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
+endif()
+
+include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml
new file mode 100644
index 0000000000000..fe3213bd26af2
--- /dev/null
+++ b/ports/esp32/main_esp32s2/idf_component.yml
@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  idf:
+    version: ">=5.0.2"
+  espressif/esp_tinyusb: "~1.0.0"
diff --git a/ports/esp32/main_esp32s3/CMakeLists.txt b/ports/esp32/main_esp32s3/CMakeLists.txt
new file mode 100644
index 0000000000000..40188abff8e57
--- /dev/null
+++ b/ports/esp32/main_esp32s3/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Set location of base MicroPython directory.
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
+endif()
+
+# Set location of the ESP32 port directory.
+if(NOT MICROPY_PORT_DIR)
+    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
+endif()
+
+include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml
new file mode 100644
index 0000000000000..fe3213bd26af2
--- /dev/null
+++ b/ports/esp32/main_esp32s3/idf_component.yml
@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  idf:
+    version: ">=5.0.2"
+  espressif/esp_tinyusb: "~1.0.0"
diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index f125b614bda95..4726ce5874209 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -29,8 +29,8 @@
 
 #include <stdio.h>
 
+#include "esp_flash.h"
 #include "esp_log.h"
-#include "esp_spi_flash.h"
 
 #include "py/runtime.h"
 #include "py/mperrno.h"
@@ -53,33 +53,33 @@ STATIC mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_osdebug_obj, 1, 2, esp_osdebug);
 
-STATIC mp_obj_t esp_flash_read(mp_obj_t offset_in, mp_obj_t buf_in) {
+STATIC mp_obj_t esp_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);
-    esp_err_t res = spi_flash_read(offset, bufinfo.buf, bufinfo.len);
+    esp_err_t res = esp_flash_read(NULL, bufinfo.buf, offset, bufinfo.len);
     if (res != ESP_OK) {
         mp_raise_OSError(MP_EIO);
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_read_obj, esp_flash_read);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_read_obj, esp_flash_read_);
 
-STATIC mp_obj_t esp_flash_write(mp_obj_t offset_in, mp_obj_t buf_in) {
+STATIC mp_obj_t esp_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);
-    esp_err_t res = spi_flash_write(offset, bufinfo.buf, bufinfo.len);
+    esp_err_t res = esp_flash_write(NULL, bufinfo.buf, offset, bufinfo.len);
     if (res != ESP_OK) {
         mp_raise_OSError(MP_EIO);
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_write_obj, esp_flash_write);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_write_obj, esp_flash_write_);
 
 STATIC mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
     mp_int_t sector = mp_obj_get_int(sector_in);
-    esp_err_t res = spi_flash_erase_sector(sector);
+    esp_err_t res = esp_flash_erase_region(NULL, sector * 4096, 4096);
     if (res != ESP_OK) {
         mp_raise_OSError(MP_EIO);
     }
@@ -88,7 +88,9 @@ STATIC mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_flash_erase_obj, esp_flash_erase);
 
 STATIC mp_obj_t esp_flash_size(void) {
-    return mp_obj_new_int_from_uint(spi_flash_get_chip_size());
+    uint32_t size;
+    esp_flash_get_size(NULL, &size);
+    return mp_obj_new_int_from_uint(size);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
 
@@ -98,14 +100,14 @@ STATIC mp_obj_t esp_flash_user_start(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_user_start_obj, esp_flash_user_start);
 
 STATIC mp_obj_t esp_gpio_matrix_in(mp_obj_t pin, mp_obj_t sig, mp_obj_t inv) {
-    gpio_matrix_in(mp_obj_get_int(pin), mp_obj_get_int(sig), mp_obj_get_int(inv));
+    esp_rom_gpio_connect_in_signal(mp_obj_get_int(pin), mp_obj_get_int(sig), mp_obj_get_int(inv));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_gpio_matrix_in_obj, esp_gpio_matrix_in);
 
 STATIC mp_obj_t esp_gpio_matrix_out(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
-    gpio_matrix_out(mp_obj_get_int(args[0]), mp_obj_get_int(args[1]), mp_obj_get_int(args[2]), mp_obj_get_int(args[3]));
+    esp_rom_gpio_connect_out_signal(mp_obj_get_int(args[0]), mp_obj_get_int(args[1]), mp_obj_get_int(args[2]), mp_obj_get_int(args[3]));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_gpio_matrix_out_obj, 4, 4, esp_gpio_matrix_out);
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index a18ca4c1375ac..ef3ad0b76d459 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -45,10 +45,8 @@
 #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) {
@@ -161,9 +159,9 @@ STATIC mp_obj_t esp32_raw_temperature(void) {
     CLEAR_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_DUMP_OUT);
     SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP_FORCE);
     SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP);
-    ets_delay_us(100);
+    esp_rom_delay_us(100);
     SET_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_DUMP_OUT);
-    ets_delay_us(5);
+    esp_rom_delay_us(5);
     int res = GET_PERI_REG_BITS2(SENS_SAR_SLAVE_ADDR3_REG, SENS_TSENS_OUT, SENS_TSENS_OUT_S);
 
     return mp_obj_new_int(res);
diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index c71201e9b7bde..c94fc81708a14 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -179,7 +179,7 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
 // Forward declare the send and recv ESPNow callbacks
 STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
 
-STATIC void recv_cb(const uint8_t *mac_addr, const uint8_t *data, int len);
+STATIC void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len);
 
 // ESPNow.init(): Initialise the data buffers and ESP-NOW functions.
 // Initialise the Espressif ESPNOW software stack, register callbacks and
@@ -254,13 +254,9 @@ STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         self->recv_timeout_ms = args[ARG_timeout_ms].u_int;
     }
     if (args[ARG_rate].u_int >= 0) {
-        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
         esp_initialise_wifi();  // Call the wifi init code in network_wlan.c
         check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, args[ARG_rate].u_int));
         check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, args[ARG_rate].u_int));
-        #else
-        mp_raise_ValueError(MP_ERROR_TEXT("rate option not supported"));
-        #endif
     }
     if (args[ARG_get].u_obj == MP_OBJ_NULL) {
         return mp_const_none;
@@ -329,11 +325,7 @@ static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg) {
         (wifi_promiscuous_pkt_t *)(msg - sizeof_espnow_frame_format -
             sizeof(wifi_promiscuous_pkt_t));
 
-    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0)
-    return wifi_pkt->rx_ctrl.rssi - 100;  // Offset rssi for IDF 4.0.2
-    #else
     return wifi_pkt->rx_ctrl.rssi;
-    #endif
 }
 
 // Lookup a peer in the peers table and return a reference to the item in the
@@ -573,7 +565,7 @@ STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
 // ESPNow packet.
 // If the buffer is full, drop the message and increment the dropped count.
 // Schedules the user callback if one has been registered (ESPNow.config()).
-STATIC void recv_cb(const uint8_t *mac_addr, const uint8_t *msg, int msg_len) {
+STATIC void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len) {
     esp_espnow_obj_t *self = _get_singleton();
     ringbuf_t *buf = self->recv_buffer;
     // TODO: Test this works with ">".
@@ -590,7 +582,7 @@ STATIC void recv_cb(const uint8_t *mac_addr, const uint8_t *msg, int msg_len) {
     #endif // MICROPY_ESPNOW_RSSI
 
     ringbuf_put_bytes(buf, (uint8_t *)&header, sizeof(header));
-    ringbuf_put_bytes(buf, mac_addr, ESP_NOW_ETH_ALEN);
+    ringbuf_put_bytes(buf, recv_info->src_addr, ESP_NOW_ETH_ALEN);
     ringbuf_put_bytes(buf, msg, msg_len);
     self->rx_packets++;
     if (self->recv_cb != mp_const_none) {
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index fc19618b7309f..01acb01029eab 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -32,20 +32,10 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "esp_mac.h"
 #include "esp_sleep.h"
 #include "esp_pm.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"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/rtc.h"
-#include "esp32s3/clk.h"
-#endif
-
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "shared/runtime/pyexec.h"
@@ -79,7 +69,7 @@ int esp_clk_cpu_freq(void);
 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(esp_clk_cpu_freq());
+        return mp_obj_new_int(esp_rom_get_cpu_ticks_per_us() * 1000000);
     } else {
         // set
         mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
@@ -110,7 +100,7 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         if (ret != ESP_OK) {
             mp_raise_ValueError(NULL);
         }
-        while (esp_clk_cpu_freq() != freq * 1000000) {
+        while (esp_rom_get_cpu_ticks_per_us() != freq) {
             vTaskDelay(1);
         }
         return mp_const_none;
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index ac6321d8f6f1d..b1b3fc368a450 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
 
-#include "esp_event.h"
+#include "esp_netif.h"
 
 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)
@@ -40,10 +40,11 @@ enum {
     STAT_GOT_IP     = 1010,
 };
 
-typedef struct _wlan_if_obj_t {
+typedef struct _base_if_obj_t {
     mp_obj_base_t base;
-    int if_id;
-} wlan_if_obj_t;
+    esp_interface_t if_id;
+    esp_netif_t *netif;
+} base_if_obj_t;
 
 extern const mp_obj_type_t esp_network_wlan_type;
 
@@ -64,7 +65,6 @@ static inline void esp_exceptions(esp_err_t e) {
 }
 
 void socket_events_deinit(void);
-void network_wlan_event_handler(system_event_t *event);
 void esp_initialise_wifi(void);
 
 #endif
diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 1f657fb5c8813..7326d453be5aa 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -27,9 +27,8 @@
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_ENTERPRISE), MP_ROM_INT(WIFI_AUTH_WPA2_ENTERPRISE) },
 { 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_OWE), MP_ROM_INT(WIFI_AUTH_OWE) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
 #endif
 
@@ -39,14 +38,8 @@
 { 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
-#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/modsocket.c b/ports/esp32/modsocket.c
index 731f69fbc2211..7484fce786c74 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -46,7 +46,6 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "shared/netutils/netutils.h"
-#include "mdns.h"
 #include "modnetwork.h"
 
 #include "lwip/sockets.h"
@@ -164,11 +163,7 @@ 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) {
@@ -836,7 +831,7 @@ STATIC mp_obj_t esp_socket_initialize() {
     static int initialized = 0;
     if (!initialized) {
         ESP_LOGI("modsocket", "Initializing");
-        tcpip_adapter_init();
+        esp_netif_init();
         initialized = 1;
     }
     return mp_const_none;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index f81ad58fa1d20..b18681bb572df 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -6,9 +6,11 @@
 
 #include <stdint.h>
 #include <alloca.h>
+#include "esp_random.h"
 #include "esp_system.h"
 #include "freertos/FreeRTOS.h"
 #include "driver/i2s.h"
+#include "esp_wifi_types.h"
 
 #ifndef MICROPY_CONFIG_ROM_LEVEL
 #define MICROPY_CONFIG_ROM_LEVEL            (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
@@ -131,7 +133,7 @@
 #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_HW_SOFTSPI_MAX_BAUDRATE     (esp_rom_get_cpu_ticks_per_us() * 1000000 / 200) // roughly
 #define MICROPY_PY_SSL                      (1)
 #define MICROPY_SSL_MBEDTLS                 (1)
 #define MICROPY_PY_SSL_FINALISER            (1)
@@ -162,8 +164,8 @@ void *esp_native_code_commit(void *, size_t, void *);
 // the only disable interrupts on the current CPU.  To full manage exclusion
 // one should use portENTER_CRITICAL/portEXIT_CRITICAL instead.
 #include "freertos/FreeRTOS.h"
-#define MICROPY_BEGIN_ATOMIC_SECTION() portENTER_CRITICAL_NESTED()
-#define MICROPY_END_ATOMIC_SECTION(state) portEXIT_CRITICAL_NESTED(state)
+#define MICROPY_BEGIN_ATOMIC_SECTION() portSET_INTERRUPT_MASK_FROM_ISR()
+#define MICROPY_END_ATOMIC_SECTION(state) portCLEAR_INTERRUPT_MASK_FROM_ISR(state)
 
 #if MICROPY_PY_SOCKET_EVENTS
 #define MICROPY_PY_SOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler();
@@ -219,11 +221,11 @@ typedef long mp_off_t;
 #endif
 
 #ifndef MICROPY_HW_ENABLE_MDNS_QUERIES
-#define MICROPY_HW_ENABLE_MDNS_QUERIES      (1)
+#define MICROPY_HW_ENABLE_MDNS_QUERIES      (0)
 #endif
 
 #ifndef MICROPY_HW_ENABLE_MDNS_RESPONDER
-#define MICROPY_HW_ENABLE_MDNS_RESPONDER    (1)
+#define MICROPY_HW_ENABLE_MDNS_RESPONDER    (0)
 #endif
 
 #ifndef MICROPY_BOARD_STARTUP
@@ -233,7 +235,7 @@ typedef long mp_off_t;
 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)))
+#if 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)
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 4c8fa012f4fbf..63a674c24b620 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -32,6 +32,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "esp_timer.h"
 
 #include "py/obj.h"
 #include "py/objstr.h"
@@ -110,7 +111,7 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }
-    #if CONFIG_USB_ENABLED
+    #if CONFIG_USB_OTG_SUPPORTED
     usb_tx_strn(str, len);
     #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 672fa306f5dca..4f25b3d4fd3a2 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -46,10 +46,8 @@
 // See https://github.com/micropython/micropython/issues/5489 for history
 #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)
+#define MP_TASK_COREID (1)
 #endif
 
 extern TaskHandle_t mp_main_task_handle;
@@ -71,7 +69,7 @@ __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
 }
 
 void mp_hal_delay_us(uint32_t);
-#define mp_hal_delay_us_fast(us) ets_delay_us(us)
+#define mp_hal_delay_us_fast(us) esp_rom_delay_us(us)
 void mp_hal_set_interrupt_char(int c);
 uint32_t mp_hal_get_cpu_freq(void);
 
@@ -91,15 +89,15 @@ mp_hal_pin_obj_t machine_pin_get_id(mp_obj_t pin_in);
 #define mp_obj_get_pin(o) machine_pin_get_id(o) // legacy name; only to support esp8266/modonewire
 #define mp_hal_pin_name(p) (p)
 static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
-    gpio_pad_select_gpio(pin);
+    esp_rom_gpio_pad_select_gpio(pin);
     gpio_set_direction(pin, GPIO_MODE_INPUT);
 }
 static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
-    gpio_pad_select_gpio(pin);
+    esp_rom_gpio_pad_select_gpio(pin);
     gpio_set_direction(pin, GPIO_MODE_INPUT_OUTPUT);
 }
 static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
-    gpio_pad_select_gpio(pin);
+    esp_rom_gpio_pad_select_gpio(pin);
     gpio_set_direction(pin, GPIO_MODE_INPUT_OUTPUT_OD);
 }
 static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
diff --git a/ports/esp32/mpnimbleport.c b/ports/esp32/mpnimbleport.c
index a58fcbdbf49f4..8235275be6fd6 100644
--- a/ports/esp32/mpnimbleport.c
+++ b/ports/esp32/mpnimbleport.c
@@ -46,13 +46,13 @@ STATIC void ble_host_task(void *param) {
 
 void mp_bluetooth_nimble_port_hci_init(void) {
     DEBUG_printf("mp_bluetooth_nimble_port_hci_init\n");
-    esp_nimble_hci_and_controller_init();
+    esp_nimble_hci_init();
 }
 
 void mp_bluetooth_nimble_port_hci_deinit(void) {
     DEBUG_printf("mp_bluetooth_nimble_port_hci_deinit\n");
 
-    esp_nimble_hci_and_controller_deinit();
+    esp_nimble_hci_deinit();
 }
 
 void mp_bluetooth_nimble_port_start(void) {
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index 1e76d679db046..082943e2aecc4 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -38,15 +38,10 @@
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 
-#include "esp_wifi.h"
 #include "esp_log.h"
-#include "lwip/dns.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
+#include "esp_netif.h"
+#include "esp_wifi.h"
+// #include "lwip/dns.h"
 
 NORETURN void esp_exceptions_helper(esp_err_t e) {
     switch (e) {
@@ -80,64 +75,15 @@ NORETURN void esp_exceptions_helper(esp_err_t e) {
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Wifi Would Block"));
         case ESP_ERR_WIFI_NOT_CONNECT:
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Wifi Not Connected"));
-        case ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS:
-            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("TCP/IP Invalid Parameters"));
-        case ESP_ERR_TCPIP_ADAPTER_IF_NOT_READY:
-            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("TCP/IP IF Not Ready"));
-        case ESP_ERR_TCPIP_ADAPTER_DHCPC_START_FAILED:
-            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("TCP/IP DHCP Client Start Failed"));
-        case ESP_ERR_TCPIP_ADAPTER_NO_MEM:
-            mp_raise_OSError(MP_ENOMEM);
         default:
             mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Wifi Unknown Error 0x%04x"), e);
     }
 }
 
-// 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) {
-        #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;
-        case SYSTEM_EVENT_ETH_START:
-            ESP_LOGI("ethernet", "start");
-            break;
-        case SYSTEM_EVENT_ETH_STOP:
-            ESP_LOGI("ethernet", "stop");
-            break;
-        case SYSTEM_EVENT_ETH_CONNECTED:
-            ESP_LOGI("ethernet", "LAN cable connected");
-            break;
-        case SYSTEM_EVENT_ETH_DISCONNECTED:
-            ESP_LOGI("ethernet", "LAN cable disconnected");
-            break;
-        case SYSTEM_EVENT_ETH_GOT_IP:
-            ESP_LOGI("ethernet", "Got IP");
-            break;
-        default:
-            ESP_LOGI("network", "event %d", event->event_id);
-            break;
-    }
-    return ESP_OK;
-}
-
 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_LOGD("modnetwork", "esp_event_loop_init done");
+        esp_exceptions(esp_netif_init());
         initialized = 1;
     }
     return mp_const_none;
@@ -145,11 +91,11 @@ STATIC mp_obj_t esp_initialize() {
 MP_DEFINE_CONST_FUN_OBJ_0(esp_network_initialize_obj, esp_initialize);
 
 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;
-    tcpip_adapter_dns_info_t dns_info;
-    tcpip_adapter_get_ip_info(self->if_id, &info);
-    tcpip_adapter_get_dns_info(self->if_id, DNS_MAIN, &dns_info);
+    base_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    esp_netif_ip_info_t info;
+    esp_netif_dns_info_t dns_info;
+    esp_netif_get_ip_info(self->netif, &info);
+    esp_netif_get_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_info);
     if (n_args == 1) {
         // get
         mp_obj_t tuple[4] = {
@@ -171,36 +117,36 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
                 // 16 -> 255.255.0.0
                 // etc...
                 uint32_t *m = (uint32_t *)&info.netmask;
-                *m = htonl(0xffffffff << (32 - mp_obj_get_int(items[1])));
+                *m = esp_netif_htonl(0xffffffff << (32 - mp_obj_get_int(items[1])));
             } else {
                 netutils_parse_ipv4_addr(items[1], (void *)&info.netmask, NETUTILS_BIG);
             }
             netutils_parse_ipv4_addr(items[2], (void *)&info.gw, NETUTILS_BIG);
             netutils_parse_ipv4_addr(items[3], (void *)&dns_info.ip, NETUTILS_BIG);
             // To set a static IP we have to disable DHCP first
-            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) {
+            if (self->if_id == ESP_IF_WIFI_STA || self->if_id == ESP_IF_ETH) {
+                esp_err_t e = esp_netif_dhcpc_stop(self->netif);
+                if (e != ESP_OK && e != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
                     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));
-            } 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(esp_netif_set_ip_info(self->netif, &info));
+                esp_exceptions(esp_netif_set_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_info));
+            } else if (self->if_id == ESP_IF_WIFI_AP) {
+                esp_err_t e = esp_netif_dhcps_stop(self->netif);
+                if (e != ESP_OK && e != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
                     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(esp_netif_set_ip_info(self->netif, &info));
+                esp_exceptions(esp_netif_set_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_info));
+                esp_exceptions(esp_netif_dhcps_start(self->netif));
             }
         } else {
             // check for the correct string
             const char *mode = mp_obj_str_get_str(args[1]);
-            if ((self->if_id != WIFI_IF_STA && self->if_id != ESP_IF_ETH) || strcmp("dhcp", mode)) {
+            if ((self->if_id != ESP_IF_WIFI_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(esp_netif_dhcpc_start(self->netif));
         }
         return mp_const_none;
     }
@@ -212,9 +158,4 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_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_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 9b7a31cc4f9d3..8128eb5e11d49 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -32,7 +32,6 @@
 
 #include "esp_idf_version.h"
 
-// LAN only for ESP32 (not ESP32S2) and only for ESP-IDF v4.1 and higher
 #if MICROPY_PY_NETWORK_LAN
 
 #include "esp_eth.h"
@@ -47,8 +46,7 @@
 #include "modnetwork.h"
 
 typedef struct _lan_if_obj_t {
-    mp_obj_base_t base;
-    int if_id; // MUST BE FIRST to match wlan_if_obj_t
+    base_if_obj_t base;
     bool initialized;
     bool active;
     int8_t mdc_pin;
@@ -59,12 +57,11 @@ typedef struct _lan_if_obj_t {
     uint8_t phy_addr;
     uint8_t phy_type;
     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 lan_if_obj_t lan_obj = {{{&lan_if_type}, ESP_IF_ETH, NULL}, false, false};
 STATIC uint8_t eth_status = 0;
 
 static void eth_event_handler(void *arg, esp_event_base_t event_base,
@@ -114,11 +111,8 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         { 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_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -147,12 +141,8 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         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
         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 &&
@@ -169,17 +159,21 @@ 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();
+    #if CONFIG_IDF_TARGET_ESP32
+    eth_esp32_emac_config_t esp32_config = ETH_ESP32_EMAC_DEFAULT_CONFIG();
+    #endif
+
     esp_eth_mac_t *mac = NULL;
 
-    // Dynamic ref_clk configuration available at v4.4
-    #if ESP_IDF_VERSION_MINOR >= 4
+    #if CONFIG_IDF_TARGET_ESP32
+    // Dynamic ref_clk configuration.
     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 =
+        esp32_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);
+        esp32_config.clock_config.rmii.clock_gpio = machine_pin_get_id(args[ARG_ref_clk].u_obj);
     }
     #endif
 
@@ -224,7 +218,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         #if CONFIG_IDF_TARGET_ESP32
         case PHY_LAN8710:
         case PHY_LAN8720:
-            self->phy = esp_eth_phy_new_lan8720(&phy_config);
+            self->phy = esp_eth_phy_new_lan87xx(&phy_config);
             break;
         case PHY_IP101:
             self->phy = esp_eth_phy_new_ip101(&phy_config);
@@ -235,17 +229,11 @@ 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:
-            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);
+            self->phy = esp_eth_phy_new_ksz80xx(&phy_config);
             break;
         #endif
-        #endif
         #if CONFIG_ETH_USE_SPI_ETHERNET
         #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
         case PHY_KSZ8851SNL: {
@@ -282,9 +270,9 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         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);
+        esp32_config.smi_mdc_gpio_num = self->mdc_pin;
+        esp32_config.smi_mdio_gpio_num = self->mdio_pin;
+        mac = esp_eth_mac_new_esp32(&esp32_config, &mac_config);
     }
     #endif
 
@@ -293,11 +281,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     }
 
     esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
-    self->eth_netif = esp_netif_new(&cfg);
-
-    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)"));
-    }
+    self->base.netif = esp_netif_new(&cfg);
 
     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"));
@@ -323,7 +307,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         }
     }
 
-    if (esp_netif_attach(self->eth_netif, esp_eth_new_netif_glue(self->eth_handle)) != ESP_OK) {
+    if (esp_netif_attach(self->base.netif, esp_eth_new_netif_glue(self->eth_handle)) != ESP_OK) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_netif_attach failed"));
     }
 
@@ -384,7 +368,7 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         }
                         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)
+                            (esp_netif_set_mac(self->base.netif, bufinfo.buf) != ESP_OK)
                             ) {
                             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed setting MAC address"));
                         }
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index b3cab835981e1..caad7eb48bfe5 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -32,6 +32,7 @@
 #include "py/stream.h"
 #include "shared/netutils/netutils.h"
 #include "modmachine.h"
+#include "ppp_set_auth.h"
 
 #include "netif/ppp/ppp.h"
 #include "netif/ppp/pppos.h"
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index e56d73b237bfd..63f01dfc25f5f 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -41,7 +41,6 @@
 
 #include "esp_wifi.h"
 #include "esp_log.h"
-#include "mdns.h"
 
 #if MICROPY_PY_NETWORK_WLAN
 
@@ -49,8 +48,10 @@
 #error WIFI_MODE_STA and WIFI_MODE_AP are supposed to be bitfields!
 #endif
 
-STATIC const wlan_if_obj_t wlan_sta_obj;
-STATIC const wlan_if_obj_t wlan_ap_obj;
+typedef base_if_obj_t wlan_if_obj_t;
+
+STATIC wlan_if_obj_t wlan_sta_obj;
+STATIC wlan_if_obj_t wlan_ap_obj;
 
 // Set to "true" if esp_wifi_start() was called
 static bool wifi_started = false;
@@ -75,34 +76,22 @@ 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:
+static void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
+    switch (event_id) {
+        case WIFI_EVENT_STA_START:
             ESP_LOGI("wifi", "STA_START");
             wifi_sta_reconnects = 0;
             break;
-        case SYSTEM_EVENT_STA_CONNECTED:
+
+        case WIFI_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
-                mdns_hostname_set(mod_network_hostname);
-                mdns_instance_name_set(mod_network_hostname);
-                #endif
-                mdns_initialised = true;
-            }
-            #endif
-            break;
-        case SYSTEM_EVENT_STA_DISCONNECTED: {
+
+        case WIFI_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;
+
+            wifi_event_sta_disconnected_t *disconn = event_data;
             char *message = "";
             wifi_sta_disconn_reason = disconn->reason;
             switch (disconn->reason) {
@@ -152,20 +141,55 @@ void network_wlan_event_handler(system_event_t *event) {
     }
 }
 
+static void network_wlan_ip_event_handler(void *event_handler_arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
+    switch (event_id) {
+        case IP_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
+                mdns_hostname_set(mod_network_hostname);
+                mdns_instance_name_set(mod_network_hostname);
+                #endif
+                mdns_initialised = true;
+            }
+            #endif
+            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"));
+        mp_raise_msg(&mp_type_OSError, if_no == ESP_IF_WIFI_STA ? MP_ERROR_TEXT("STA required") : MP_ERROR_TEXT("AP required"));
     }
 }
 
-void esp_initialise_wifi() {
+void esp_initialise_wifi(void) {
     static int wifi_initialized = 0;
     if (!wifi_initialized) {
+        esp_exceptions(esp_event_handler_instance_register(WIFI_EVENT, ESP_EVENT_ANY_ID, network_wlan_wifi_event_handler, NULL, NULL));
+        esp_exceptions(esp_event_handler_instance_register(IP_EVENT, ESP_EVENT_ANY_ID, network_wlan_ip_event_handler, NULL, NULL));
+
+        wlan_sta_obj.base.type = &esp_network_wlan_type;
+        wlan_sta_obj.if_id = ESP_IF_WIFI_STA;
+        wlan_sta_obj.netif = esp_netif_create_default_wifi_sta();
+
+        wlan_ap_obj.base.type = &esp_network_wlan_type;
+        wlan_ap_obj.if_id = ESP_IF_WIFI_AP;
+        wlan_ap_obj.netif = esp_netif_create_default_wifi_ap();
+
         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");
         wifi_initialized = 1;
     }
@@ -176,10 +200,10 @@ STATIC mp_obj_t network_wlan_make_new(const mp_obj_type_t *type, size_t n_args,
 
     esp_initialise_wifi();
 
-    int idx = (n_args > 0) ? mp_obj_get_int(args[0]) : WIFI_IF_STA;
-    if (idx == WIFI_IF_STA) {
+    int idx = (n_args > 0) ? mp_obj_get_int(args[0]) : ESP_IF_WIFI_STA;
+    if (idx == ESP_IF_WIFI_STA) {
         return MP_OBJ_FROM_PTR(&wlan_sta_obj);
-    } else if (idx == WIFI_IF_AP) {
+    } else if (idx == ESP_IF_WIFI_AP) {
         return MP_OBJ_FROM_PTR(&wlan_ap_obj);
     } else {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid WLAN interface identifier"));
@@ -196,7 +220,7 @@ STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
         esp_exceptions(esp_wifi_get_mode(&mode));
     }
 
-    int bit = (self->if_id == WIFI_IF_STA) ? WIFI_MODE_STA : WIFI_MODE_AP;
+    int bit = (self->if_id == ESP_IF_WIFI_STA) ? WIFI_MODE_STA : WIFI_MODE_AP;
 
     if (n_args > 1) {
         bool active = mp_obj_is_true(args[1]);
@@ -262,7 +286,7 @@ STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp
         esp_exceptions(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_sta_config));
     }
 
-    esp_exceptions(tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_STA, mod_network_hostname));
+    esp_exceptions(esp_netif_set_hostname(wlan_sta_obj.netif, mod_network_hostname));
 
     wifi_sta_reconnects = 0;
     // connect to the WiFi AP
@@ -285,7 +309,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_wlan_disconnect_obj, network_wlan_disco
 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) {
+        if (self->if_id == ESP_IF_WIFI_STA) {
             // Case of no arg is only for the STA interface
             if (wifi_sta_connected) {
                 // Happy path, connected with IP
@@ -310,7 +334,7 @@ STATIC mp_obj_t network_wlan_status(size_t n_args, const mp_obj_t *args) {
     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);
+            require_if(args[0], ESP_IF_WIFI_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;
@@ -324,7 +348,7 @@ STATIC mp_obj_t network_wlan_status(size_t n_args, const mp_obj_t *args) {
         }
         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);
+            require_if(args[0], ESP_IF_WIFI_STA);
 
             wifi_ap_record_t info;
             esp_exceptions(esp_wifi_sta_get_ap_info(&info));
@@ -383,7 +407,7 @@ 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) {
+    if (self->if_id == ESP_IF_WIFI_STA) {
         return mp_obj_new_bool(wifi_sta_connected);
     } else {
         wifi_sta_list_t sta;
@@ -400,7 +424,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
 
     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;
+    bool is_wifi = self->if_id == ESP_IF_WIFI_AP || self->if_id == ESP_IF_WIFI_STA;
 
     wifi_config_t cfg;
     if (is_wifi) {
@@ -428,7 +452,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                     }
                     case MP_QSTR_ssid:
                     case MP_QSTR_essid: {
-                        req_if = WIFI_IF_AP;
+                        req_if = ESP_IF_WIFI_AP;
                         size_t len;
                         const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
                         len = MIN(len, sizeof(cfg.ap.ssid));
@@ -437,19 +461,19 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         break;
                     }
                     case MP_QSTR_hidden: {
-                        req_if = WIFI_IF_AP;
+                        req_if = ESP_IF_WIFI_AP;
                         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;
+                        req_if = ESP_IF_WIFI_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;
+                        req_if = ESP_IF_WIFI_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);
@@ -488,13 +512,13 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         break;
                     }
                     case MP_QSTR_max_clients: {
-                        req_if = WIFI_IF_AP;
+                        req_if = ESP_IF_WIFI_AP;
                         cfg.ap.max_connection = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
                     case MP_QSTR_reconnects: {
                         int reconnects = mp_obj_get_int(kwargs->table[i].value);
-                        req_if = WIFI_IF_STA;
+                        req_if = ESP_IF_WIFI_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;
@@ -542,8 +566,8 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
         case MP_QSTR_mac: {
             uint8_t mac[6];
             switch (self->if_id) {
-                case WIFI_IF_AP: // fallthrough intentional
-                case WIFI_IF_STA:
+                case ESP_IF_WIFI_AP: // fallthrough intentional
+                case ESP_IF_WIFI_STA:
                     esp_exceptions(esp_wifi_get_mac(self->if_id, mac));
                     return mp_obj_new_bytes(mac, sizeof(mac));
                 default:
@@ -553,23 +577,23 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
         case MP_QSTR_ssid:
         case MP_QSTR_essid:
             switch (self->if_id) {
-                case WIFI_IF_STA:
+                case ESP_IF_WIFI_STA:
                     val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
                     break;
-                case WIFI_IF_AP:
+                case ESP_IF_WIFI_AP:
                     val = mp_obj_new_str((char *)cfg.ap.ssid, cfg.ap.ssid_len);
                     break;
                 default:
-                    req_if = WIFI_IF_AP;
+                    req_if = ESP_IF_WIFI_AP;
             }
             break;
         case MP_QSTR_hidden:
-            req_if = WIFI_IF_AP;
+            req_if = ESP_IF_WIFI_AP;
             val = mp_obj_new_bool(cfg.ap.ssid_hidden);
             break;
         case MP_QSTR_security:
         case MP_QSTR_authmode:
-            req_if = WIFI_IF_AP;
+            req_if = ESP_IF_WIFI_AP;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);
             break;
         case MP_QSTR_channel: {
@@ -582,7 +606,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
         case MP_QSTR_hostname:
         case MP_QSTR_dhcp_hostname: {
             // TODO: Deprecated. Use network.hostname() instead.
-            req_if = WIFI_IF_STA;
+            req_if = ESP_IF_WIFI_STA;
             val = mp_obj_new_str(mod_network_hostname, strlen(mod_network_hostname));
             break;
         }
@@ -591,7 +615,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             break;
         }
         case MP_QSTR_reconnects:
-            req_if = WIFI_IF_STA;
+            req_if = ESP_IF_WIFI_STA;
             int rec = conf_wifi_sta_reconnects - 1;
             val = MP_OBJ_NEW_SMALL_INT(rec);
             break;
@@ -654,7 +678,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &wlan_if_locals_dict
     );
 
-STATIC const wlan_if_obj_t wlan_sta_obj = {{&esp_network_wlan_type}, WIFI_IF_STA};
-STATIC const wlan_if_obj_t wlan_ap_obj = {{&esp_network_wlan_type}, WIFI_IF_AP};
-
 #endif // MICROPY_PY_NETWORK_WLAN
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index 14ad30ccd84ea..6410db24c9577 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -30,7 +30,7 @@
 
 // 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)
+#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
 #endif
 
 #ifndef MICROPY_HW_UART_REPL
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 80612cd276e74..83ba9533d3802 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -28,14 +28,17 @@
 #include "py/mphal.h"
 #include "usb.h"
 
-#if CONFIG_USB_ENABLED
+#if CONFIG_USB_OTG_SUPPORTED
 
+#include "esp_timer.h"
+#ifndef NO_QSTR
 #include "tinyusb.h"
 #include "tusb_cdc_acm.h"
+#endif
 
 #define CDC_ITF TINYUSB_CDC_ACM_0
 
-static uint8_t usb_rx_buf[CONFIG_USB_CDC_RX_BUFSIZE];
+static uint8_t usb_rx_buf[CONFIG_TINYUSB_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?
@@ -79,7 +82,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);
+    uint64_t timeout = esp_timer_get_time() + (uint64_t)(MICROPY_HW_USB_CDC_TX_TIMEOUT_MS * 1000);
     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;
@@ -88,4 +91,4 @@ void usb_tx_strn(const char *str, size_t len) {
     }
 }
 
-#endif // CONFIG_USB_ENABLED
+#endif // CONFIG_USB_OTG_SUPPORTED
diff --git a/ports/esp32/usb.h b/ports/esp32/usb.h
index 009bf42624d98..a4c7d40701dfc 100644
--- a/ports/esp32/usb.h
+++ b/ports/esp32/usb.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_ESP32_USB_H
 #define MICROPY_INCLUDED_ESP32_USB_H
 
-#define MICROPY_HW_USB_CDC_TX_TIMEOUT  (500)
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT_MS (500)
 
 void usb_init(void);
 void usb_tx_strn(const char *str, size_t len);
diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c
index a7d06a355a2ea..3289a1b5c0783 100644
--- a/ports/esp32/usb_serial_jtag.c
+++ b/ports/esp32/usb_serial_jtag.c
@@ -79,9 +79,9 @@ void usb_serial_jtag_tx_strn(const char *str, size_t len) {
         if (l > USB_SERIAL_JTAG_PACKET_SZ_BYTES) {
             l = USB_SERIAL_JTAG_PACKET_SZ_BYTES;
         }
-        portTickType start_tick = xTaskGetTickCount();
+        TickType_t start_tick = xTaskGetTickCount();
         while (!usb_serial_jtag_ll_txfifo_writable()) {
-            portTickType now_tick = xTaskGetTickCount();
+            TickType_t now_tick = xTaskGetTickCount();
             if (!terminal_connected || now_tick > (start_tick + pdMS_TO_TICKS(200))) {
                 terminal_connected = false;
                 return;

From 2cc3711e5e00c13d43771ee8a78778e7ef3c2930 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Thu, 25 May 2023 10:40:50 +1000
Subject: [PATCH 0083/3129] esp32: In recv_cb, get espnow rssi from
 recv_info->rx_ctrl.

IDF v5.0 provides access to rssi value for received espnow packets via
recv_info arg to recv_cb().

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp32/modespnow.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index c94fc81708a14..08836c0ad790e 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -313,21 +313,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_obj, espnow_stats);
 // - to return unique bytestrings for each peer which supports more efficient
 //   application memory usage and peer handling.
 
-// Get the RSSI value from the wifi packet header
-static inline int8_t _get_rssi_from_wifi_pkt(const uint8_t *msg) {
-    // Warning: Secret magic to get the rssi from the wifi packet header
-    // See espnow.c:espnow_recv_cb() at https://github.com/espressif/esp-now/
-    // In the wifi packet the msg comes after a wifi_promiscuous_pkt_t
-    // and a espnow_frame_format_t.
-    // Backtrack to get a pointer to the wifi_promiscuous_pkt_t.
-    static const size_t sizeof_espnow_frame_format = 39;
-    wifi_promiscuous_pkt_t *wifi_pkt =
-        (wifi_promiscuous_pkt_t *)(msg - sizeof_espnow_frame_format -
-            sizeof(wifi_promiscuous_pkt_t));
-
-    return wifi_pkt->rx_ctrl.rssi;
-}
-
 // Lookup a peer in the peers table and return a reference to the item in the
 // peers_table. Add peer to the table if it is not found (may alloc memory).
 // Will not return NULL.
@@ -577,7 +562,7 @@ STATIC void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, in
     header.magic = ESPNOW_MAGIC;
     header.msg_len = msg_len;
     #if MICROPY_ESPNOW_RSSI
-    header.rssi = _get_rssi_from_wifi_pkt(msg);
+    header.rssi = recv_info->rx_ctrl->rssi;
     header.time_ms = mp_hal_ticks_ms();
     #endif // MICROPY_ESPNOW_RSSI
 

From bccbaa92b1fc6237f0f49a7f07cc194835fbf4e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Jun 2023 17:08:08 +1000
Subject: [PATCH 0084/3129] esp32/network_wlan: Wait for WIFI_EVENT_STA_START
 after activating.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/network_wlan.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 63f01dfc25f5f..cfedd898cdf24 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -72,7 +72,7 @@ static bool mdns_initialised = false;
 #endif
 
 static uint8_t conf_wifi_sta_reconnects = 0;
-static uint8_t wifi_sta_reconnects;
+static volatile 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.
@@ -233,16 +233,16 @@ STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
         } else {
             esp_exceptions(esp_wifi_set_mode(mode));
             if (!wifi_started) {
+                // WIFI_EVENT_STA_START must be received before esp_wifi_connect() can be called.
+                // Use the `wifi_sta_reconnects` variable to detect that event.
+                wifi_sta_reconnects = 1;
                 esp_exceptions(esp_wifi_start());
                 wifi_started = true;
+                while (wifi_sta_reconnects != 0) {
+                    MICROPY_EVENT_POLL_HOOK;
+                }
             }
         }
-        // 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 717060447f7ba7e71a7f40b19c1e977e4e444f12 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jun 2023 12:45:46 +1000
Subject: [PATCH 0085/3129] esp32/Makefile: Provide more IDF shortcuts.

And change erase_flash to erase-flash, because the former is deprecated
since IDF 4.4.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/Makefile | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 0b33fa6e5a735..7c8c225dfb6e9 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -48,6 +48,10 @@ endif
 
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
+define RUN_IDF_PY
+	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) $(1)
+endef
+
 all:
 	idf.py $(IDFPY_FLAGS) build || (echo -e $(HELP_BUILD_ERROR); false)
 	@$(PYTHON) makeimg.py \
@@ -61,13 +65,25 @@ all:
 $(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition-table.bin $(BUILD)/micropython.bin: FORCE
 
 clean:
-	idf.py $(IDFPY_FLAGS) fullclean
+	$(call RUN_IDF_PY,fullclean)
 
 deploy:
-	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) flash
+	$(call RUN_IDF_PY,flash)
 
 erase:
-	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) erase_flash
+	$(call RUN_IDF_PY,erase-flash)
+
+monitor:
+	$(call RUN_IDF_PY,monitor)
+
+size:
+	$(call RUN_IDF_PY,size)
+
+size-components:
+	$(call RUN_IDF_PY,size-components)
+
+size-files:
+	$(call RUN_IDF_PY,size-files)
 
 submodules:
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules

From 68e0e889b43c4c381515691b689b5f02f037063f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Jun 2023 11:55:22 +1000
Subject: [PATCH 0086/3129] docs/esp32: Update esp32 docs based on IDF v5
 changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst      | 19 -------------------
 docs/library/esp32.rst       |  4 ----
 docs/library/machine.WDT.rst |  5 ++---
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index e19c6ecb40893..f4eb9a0ce8ca2 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -57,7 +57,6 @@ 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 Fahrenheit
     esp32.ULP()             # access to the Ultra-Low-Power Co-processor
 
@@ -137,19 +136,11 @@ The keyword arguments for the constructor defining the PHY type and interface ar
   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)
@@ -164,16 +155,6 @@ These are working configurations for LAN interfaces of popular boards::
     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
 ----------------
 
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index d9241d545c46b..efdd6c1be289c 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -44,10 +44,6 @@ Functions
 
     Read the raw value of the internal temperature sensor, returning an integer.
 
-.. function:: hall_sensor()
-
-    Read the raw value of the internal Hall sensor, returning an integer.
-
 .. function:: idf_heap_info(capabilities)
 
     Returns information about the ESP-IDF heap memory regions. One of them contains
diff --git a/docs/library/machine.WDT.rst b/docs/library/machine.WDT.rst
index 95893cec36be7..cf77df9632088 100644
--- a/docs/library/machine.WDT.rst
+++ b/docs/library/machine.WDT.rst
@@ -25,9 +25,8 @@ 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. On rp2040 devices,
-   the maximum timeout is 8388 ms.
+   Notes: On the esp8266 a timeout cannot be specified, it is determined by the underlying system.
+   On rp2040 devices, the maximum timeout is 8388 ms.
 
 Methods
 -------

From 6a9db521eda2f62766749d84244c70fd2073d4a0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 May 2023 14:15:10 +1000
Subject: [PATCH 0087/3129] github/workflows: Update esp32 CI to use IDF v5.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 13 ++---------
 tools/ci.sh                       | 38 ++++---------------------------
 2 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 6fc009d4fee83..2cc9f592bf23e 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -18,20 +18,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_idf402:
+  build_idf50:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf402_setup
-    - name: Build
-      run: source tools/ci.sh && ci_esp32_build
-
-  build_idf44:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v3
-    - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf44_setup
+      run: source tools/ci.sh && ci_esp32_idf50_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 986fe8f074de8..84ca83e9b8aa4 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -115,35 +115,13 @@ function ci_cc3200_build {
 ########################################################################################
 # ports/esp32
 
-function ci_esp32_setup_helper {
+function ci_esp32_idf50_setup {
     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 \
-        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
+    git -C esp-idf checkout v5.0.2
     ./esp-idf/install.sh
 }
 
-function ci_esp32_idf402_setup {
-    ci_esp32_setup_helper v4.0.2
-}
-
-function ci_esp32_idf44_setup {
-    ci_esp32_setup_helper v4.4.2
-}
-
 function ci_esp32_build {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
@@ -151,15 +129,9 @@ function ci_esp32_build {
     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
-    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
+    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
+    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
+    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3
 
     # Test building native .mpy with xtensawin architecture.
     ci_native_mpy_modules_build xtensawin

From 273ba28c071aec22b67f44775aeec3c5f1a8d5f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 Jun 2023 15:51:23 +1000
Subject: [PATCH 0088/3129] tools/autobuild: Update auto-build code to build
 esp32 port with IDF v5.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/autobuild.sh    | 15 ++++-----------
 tools/autobuild/build-boards.sh | 31 +------------------------------
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 209460151664d..b3c9c19c7ceb0 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -4,8 +4,7 @@
 #
 # Requirements:
 # - All toolchains must be in path (arm-none-eabi-gcc, xtensa-lx106-elf)
-# - IDF_PATH_V42 must be set
-# - IDF_PATH_V44 must be set
+# - IDF_PATH_V50 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"
 #
@@ -13,13 +12,8 @@
 # - 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_V42" ]; then
-    echo "must set IDF_PATH_V42"
-    exit 1
-fi
-
-if [ ! -d "$IDF_PATH_V44" ]; then
-    echo "must set IDF_PATH_V44"
+if [ ! -d "$IDF_PATH_V50" ]; then
+    echo "must set IDF_PATH_V50"
     exit 1
 fi
 
@@ -70,8 +64,7 @@ ${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
 ${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32
-(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})
+(source ${IDF_PATH_V50}/export.sh && build_esp32_boards ${FW_TAG} ${LOCAL_FIRMWARE})
 cd ../mimxrt
 build_mimxrt_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../nrf
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 0a0e127f2eb81..aae9981f94a30 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -62,36 +62,7 @@ function build_boards {
 }
 
 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
-        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
-                build_board $board_json $fw_tag $dest_dir bin elf map
-            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 uf2
-            fi
-        fi
-    done
+    build_boards modesp32.c $1 $2 bin elf map uf2
 }
 
 function build_mimxrt_boards {

From 2ede7c6c21133812af8a0891e6a4f3f31c362b50 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 24 Jun 2023 18:19:58 +1000
Subject: [PATCH 0089/3129] esp32/boards: Change SDK config parameters from
 deprecated to new ones.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board       | 2 +-
 ports/esp32/boards/GENERIC_S3/sdkconfig.board            | 2 +-
 ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board     | 2 +-
 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board | 2 +-
 ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board         | 2 +-
 ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board         | 2 +-
 ports/esp32/boards/M5STACK_ATOM/sdkconfig.board          | 2 +-
 ports/esp32/boards/SIL_WESP32/sdkconfig.board            | 2 +-
 ports/esp32/boards/UM_FEATHERS2/sdkconfig.board          | 2 +-
 ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board       | 2 +-
 ports/esp32/boards/UM_FEATHERS3/sdkconfig.board          | 2 +-
 ports/esp32/boards/UM_PROS3/sdkconfig.board              | 2 +-
 ports/esp32/boards/UM_TINYPICO/sdkconfig.board           | 2 +-
 ports/esp32/boards/UM_TINYS2/sdkconfig.board             | 2 +-
 ports/esp32/boards/UM_TINYS3/sdkconfig.board             | 2 +-
 ports/esp32/boards/sdkconfig.spiram_sx                   | 4 ++--
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
index ea263cad9f4af..40a8e3047ccef 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
+++ b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/GENERIC_S3/sdkconfig.board b/ports/esp32/boards/GENERIC_S3/sdkconfig.board
index 7b9d932503e55..a36b971162850 100644
--- a/ports/esp32/boards/GENERIC_S3/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_S3/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
index 7b9d932503e55..a36b971162850 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
index 7b9d932503e55..a36b971162850 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
index 1a7ef3f8b92ad..cbb3ad06d9a1b 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
 # LWIP
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
index bf0f3e780e4d6..eadff2f1b90b0 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
 # LWIP
diff --git a/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board b/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
index b299822dcb6d7..0026b42344236 100644
--- a/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
+++ b/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_ESP32_REV_MIN_1=y
diff --git a/ports/esp32/boards/SIL_WESP32/sdkconfig.board b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
index 98eef1d109167..be9e40c4c3ae5 100644
--- a/ports/esp32/boards/SIL_WESP32/sdkconfig.board
+++ b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
@@ -7,7 +7,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
 
 # Fast flash
 
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESP32_REV_MIN_1=y
 
diff --git a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
index 88bc9e72aca76..b23755dea7895 100644
--- a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
index 87a92892d07e1..b2c6979a70be2 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
index a4a167de8a748..804944ab24bec 100644
--- a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
index 74ca6df8f6686..71511e3c52983 100644
--- a/ports/esp32/boards/UM_PROS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/UM_TINYPICO/sdkconfig.board b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
index 766419c7f81a3..8fa596a25ded9 100644
--- a/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_ESP32_REV_MIN_1=y
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
index 5e129e4d8e33f..09e0deb078fa3 100644
--- a/ports/esp32/boards/UM_TINYS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
diff --git a/ports/esp32/boards/UM_TINYS3/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
index 0ac3c1f4cb157..c22e78eaeae7c 100644
--- a/ports/esp32/boards/UM_TINYS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -1,4 +1,4 @@
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
diff --git a/ports/esp32/boards/sdkconfig.spiram_sx b/ports/esp32/boards/sdkconfig.spiram_sx
index fe388467800e2..329a507337108 100644
--- a/ports/esp32/boards/sdkconfig.spiram_sx
+++ b/ports/esp32/boards/sdkconfig.spiram_sx
@@ -1,8 +1,8 @@
 # MicroPython on ESP32-S2 and ESP32-PAD1_subscript_3, ESP IDF configuration with SPIRAM support
 CONFIG_SPIRAM_MODE_QUAD=y
 CONFIG_SPIRAM_TYPE_AUTO=y
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-CONFIG_DEFAULT_PSRAM_CS_IO=26
+CONFIG_SPIRAM_CLK_IO=30
+CONFIG_SPIRAM_CS_IO=26
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y

From 23fe170da447340f42e924b2a1fc520a735525bb Mon Sep 17 00:00:00 2001
From: Wind-stormger <storm-wind@foxmail.com>
Date: Tue, 20 Jun 2023 09:28:28 +0000
Subject: [PATCH 0090/3129] esp32/modules/inisetup.py: Format partition as FAT
 if its label is ffat.

Signed-off-by: Wind-stormger <storm-wind@foxmail.com>
---
 ports/esp32/modules/inisetup.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py
index c8a33d5827cb5..2003864e9f3e8 100644
--- a/ports/esp32/modules/inisetup.py
+++ b/ports/esp32/modules/inisetup.py
@@ -37,8 +37,12 @@ def fs_corrupted():
 def setup():
     check_bootsec()
     print("Performing initial setup")
-    os.VfsLfs2.mkfs(bdev)
-    vfs = os.VfsLfs2(bdev)
+    if bdev.info()[4] == "vfs":
+        os.VfsLfs2.mkfs(bdev)
+        vfs = os.VfsLfs2(bdev)
+    elif bdev.info()[4] == "ffat":
+        os.VfsFat.mkfs(bdev)
+        vfs = os.VfsFat(bdev)
     os.mount(vfs, "/")
     with open("boot.py", "w") as f:
         f.write(

From c2ea8b2f98c6e2a00f78f9ab14754f53c257302e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jun 2023 23:22:43 +1000
Subject: [PATCH 0091/3129] renesas-ra: Consolidate all fsp_cfg header files to
 one location.

The config header files with the same name have the same contents, so they
don't need to be repeated for each board in the board's source directory.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/Makefile                         |  1 +
 .../boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h    | 13 -------------
 .../EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h      | 15 ---------------
 .../boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h | 13 -------------
 .../boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h    | 14 --------------
 .../boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h    | 13 -------------
 .../boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h | 13 -------------
 .../boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h    | 14 --------------
 .../boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h    | 13 -------------
 .../EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h      | 15 ---------------
 .../boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h | 13 -------------
 .../boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h    | 14 --------------
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h      | 13 -------------
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h | 15 ---------------
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h   | 13 -------------
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h      | 14 --------------
 .../EK_RA4M1/ra_cfg => }/fsp_cfg/r_adc_cfg.h      |  0
 .../EK_RA6M1/ra_cfg => }/fsp_cfg/r_flash_hp_cfg.h |  0
 .../EK_RA4M1/ra_cfg => }/fsp_cfg/r_flash_lp_cfg.h |  0
 .../EK_RA4M1/ra_cfg => }/fsp_cfg/r_ioport_cfg.h   |  0
 .../EK_RA4M1/ra_cfg => }/fsp_cfg/r_lpm_cfg.h      |  0
 21 files changed, 1 insertion(+), 205 deletions(-)
 delete mode 100644 ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h
 delete mode 100644 ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h
 delete mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h
 delete mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
 delete mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h
 delete mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h
 rename ports/renesas-ra/{boards/EK_RA4M1/ra_cfg => }/fsp_cfg/r_adc_cfg.h (100%)
 rename ports/renesas-ra/{boards/EK_RA6M1/ra_cfg => }/fsp_cfg/r_flash_hp_cfg.h (100%)
 rename ports/renesas-ra/{boards/EK_RA4M1/ra_cfg => }/fsp_cfg/r_flash_lp_cfg.h (100%)
 rename ports/renesas-ra/{boards/EK_RA4M1/ra_cfg => }/fsp_cfg/r_ioport_cfg.h (100%)
 rename ports/renesas-ra/{boards/EK_RA4M1/ra_cfg => }/fsp_cfg/r_lpm_cfg.h (100%)

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index c49db286fd3ab..13be532cb2390 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -91,6 +91,7 @@ CROSS_COMPILE ?= arm-none-eabi-
 
 INC += -imacros boards/compiler_barrier.h
 INC += -I.
+INC += -Ifsp_cfg
 INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(TOP)/$(CMSIS_DIR)
diff --git a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h
deleted file mode 100644
index be8a4272068ae..0000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
deleted file mode 100644
index 7f285caced820..0000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_FLASH_LP_CFG_H_
-#define R_FLASH_LP_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#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)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_FLASH_LP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h
deleted file mode 100644
index d2688bf5ba392..0000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_IOPORT_CFG_H_
-#define R_IOPORT_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h
deleted file mode 100644
index 6712eee6a172a..0000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h
deleted file mode 100644
index be8a4272068ae..0000000000000
--- a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
deleted file mode 100644
index d2688bf5ba392..0000000000000
--- a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_IOPORT_CFG_H_
-#define R_IOPORT_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
deleted file mode 100644
index 6712eee6a172a..0000000000000
--- a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h
deleted file mode 100644
index be8a4272068ae..0000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
deleted file mode 100644
index 9f7819b71a41c..0000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_FLASH_HP_CFG_H_
-#define R_FLASH_HP_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#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)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_FLASH_HP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h
deleted file mode 100644
index d2688bf5ba392..0000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_IOPORT_CFG_H_
-#define R_IOPORT_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h
deleted file mode 100644
index 6712eee6a172a..0000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_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
deleted file mode 100644
index be8a4272068ae..0000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_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
deleted file mode 100644
index 7f285caced820..0000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_FLASH_LP_CFG_H_
-#define R_FLASH_LP_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#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)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_FLASH_LP_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
deleted file mode 100644
index d2688bf5ba392..0000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_IOPORT_CFG_H_
-#define R_IOPORT_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#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
deleted file mode 100644
index 6712eee6a172a..0000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/fsp_cfg/r_adc_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_adc_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_adc_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/fsp_cfg/r_flash_hp_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_flash_hp_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/fsp_cfg/r_flash_lp_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_flash_lp_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/fsp_cfg/r_ioport_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_ioport_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/fsp_cfg/r_lpm_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_lpm_cfg.h

From e8a4c1dd537c7ccfba92936c6eee9d5cf529be9e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Jun 2023 01:06:00 +1000
Subject: [PATCH 0092/3129] extmod/modssl: Add SSLContext class.

This commit adds the SSLContext class to the ssl module, and retains the
existing ssl.wrap_socket() function to maintain backwards compatibility.

CPython deprecated the ssl.wrap_socket() function since CPython 3.7 and
instead one should use ssl.SSLContext().wrap_socket().  This commit makes
that possible.

For the axtls implementation:
- ssl.SSLContext is added, although it doesn't hold much state because
  axtls requires calling ssl_ctx_new() for each new socket
- ssl.SSLContext.wrap_socket() is added
- ssl.PROTOCOL_TLS_CLIENT and ssl.PROTOCOL_TLS_SERVER are added

For the mbedtls implementation:
- ssl.SSLContext is added, and holds most of the mbedtls state
- ssl.verify_mode is added (getter and setter)
- ssl.SSLContext.wrap_socket() is added
- ssl.PROTOCOL_TLS_CLIENT and ssl.PROTOCOL_TLS_SERVER are added

The signatures match CPython:
- SSLContext(protocol)
- SSLContext.wrap_socket(sock, *, server_side=False,
    do_handshake_on_connect=True, server_hostname=None)

The existing ssl.wrap_socket() functions retain their existing signature.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modssl_axtls.c            | 155 ++++++++++---
 extmod/modssl_mbedtls.c          | 384 ++++++++++++++++++++-----------
 tests/extmod/ssl_basic.py        |   2 +-
 tests/extmod/ssl_basic.py.exp    |   2 +-
 tests/net_inet/test_tls_sites.py |   2 +-
 5 files changed, 384 insertions(+), 161 deletions(-)

diff --git a/extmod/modssl_axtls.c b/extmod/modssl_axtls.c
index de6e0ce5dd121..d169d89a2cfe0 100644
--- a/extmod/modssl_axtls.c
+++ b/extmod/modssl_axtls.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2015-2019 Paul Sokolovsky
+ * Copyright (c) 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
@@ -35,6 +36,17 @@
 
 #include "ssl.h"
 
+#define PROTOCOL_TLS_CLIENT (0)
+#define PROTOCOL_TLS_SERVER (1)
+
+// This corresponds to an SSLContext object.
+typedef struct _mp_obj_ssl_context_t {
+    mp_obj_base_t base;
+    mp_obj_t key;
+    mp_obj_t cert;
+} mp_obj_ssl_context_t;
+
+// This corresponds to an SSLSocket object.
 typedef struct _mp_obj_ssl_socket_t {
     mp_obj_base_t base;
     mp_obj_t sock;
@@ -53,8 +65,15 @@ struct ssl_args {
     mp_arg_val_t do_handshake;
 };
 
+STATIC const mp_obj_type_t ssl_context_type;
 STATIC const mp_obj_type_t ssl_socket_type;
 
+STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname);
+
+/******************************************************************************/
+// Helper functions.
+
 // Table of error strings corresponding to SSL_xxx error codes.
 STATIC const char *const ssl_error_tab1[] = {
     "NOT_OK",
@@ -116,8 +135,71 @@ STATIC NORETURN void ssl_raise_error(int err) {
     nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
 }
 
+/******************************************************************************/
+// SSLContext type.
+
+STATIC mp_obj_t ssl_context_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, 1, false);
+
+    // The "protocol" argument is ignored in this implementation.
+
+    // Create SSLContext object.
+    #if MICROPY_PY_SSL_FINALISER
+    mp_obj_ssl_context_t *self = m_new_obj_with_finaliser(mp_obj_ssl_context_t);
+    #else
+    mp_obj_ssl_context_t *self = m_new_obj(mp_obj_ssl_context_t);
+    #endif
+    self->base.type = type_in;
+    self->key = mp_const_none;
+    self->cert = mp_const_none;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
+    self->key = key_obj;
+    self->cert = cert_obj;
+}
+
+STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_do_handshake_on_connect, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
+        { MP_QSTR_server_hostname, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse arguments.
+    mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_obj_t sock = 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);
+
+    // Create and return the new SSLSocket object.
+    return ssl_socket_make_new(self, sock, args[ARG_server_side].u_bool,
+        args[ARG_do_handshake_on_connect].u_bool, args[ARG_server_hostname].u_obj);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
+
+STATIC const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_context_wrap_socket_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);
+
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ssl_context_type,
+    MP_QSTR_SSLContext,
+    MP_TYPE_FLAG_NONE,
+    make_new, ssl_context_make_new,
+    locals_dict, &ssl_context_locals_dict
+    );
+
+/******************************************************************************/
+// SSLSocket type.
+
+STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
 
-STATIC mp_obj_ssl_socket_t *ssl_socket_new(mp_obj_t sock, struct ssl_args *args) {
     #if MICROPY_PY_SSL_FINALISER
     mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t);
     #else
@@ -130,43 +212,43 @@ STATIC mp_obj_ssl_socket_t *ssl_socket_new(mp_obj_t sock, struct ssl_args *args)
     o->blocking = true;
 
     uint32_t options = SSL_SERVER_VERIFY_LATER;
-    if (!args->do_handshake.u_bool) {
+    if (!do_handshake_on_connect) {
         options |= SSL_CONNECT_IN_PARTS;
     }
-    if (args->key.u_obj != mp_const_none) {
+    if (ssl_context->key != mp_const_none) {
         options |= SSL_NO_DEFAULT_KEY;
     }
     if ((o->ssl_ctx = ssl_ctx_new(options, SSL_DEFAULT_CLNT_SESS)) == NULL) {
         mp_raise_OSError(MP_EINVAL);
     }
 
-    if (args->key.u_obj != mp_const_none) {
+    if (ssl_context->key != mp_const_none) {
         size_t len;
-        const byte *data = (const byte *)mp_obj_str_get_data(args->key.u_obj, &len);
+        const byte *data = (const byte *)mp_obj_str_get_data(ssl_context->key, &len);
         int res = ssl_obj_memory_load(o->ssl_ctx, SSL_OBJ_RSA_KEY, data, len, NULL);
         if (res != SSL_OK) {
             mp_raise_ValueError(MP_ERROR_TEXT("invalid key"));
         }
 
-        data = (const byte *)mp_obj_str_get_data(args->cert.u_obj, &len);
+        data = (const byte *)mp_obj_str_get_data(ssl_context->cert, &len);
         res = ssl_obj_memory_load(o->ssl_ctx, SSL_OBJ_X509_CERT, data, len, NULL);
         if (res != SSL_OK) {
             mp_raise_ValueError(MP_ERROR_TEXT("invalid cert"));
         }
     }
 
-    if (args->server_side.u_bool) {
+    if (server_side) {
         o->ssl_sock = ssl_server_new(o->ssl_ctx, (long)sock);
     } else {
         SSL_EXTENSIONS *ext = ssl_ext_new();
 
-        if (args->server_hostname.u_obj != mp_const_none) {
-            ext->host_name = (char *)mp_obj_str_get_str(args->server_hostname.u_obj);
+        if (server_hostname != mp_const_none) {
+            ext->host_name = (char *)mp_obj_str_get_str(server_hostname);
         }
 
         o->ssl_sock = ssl_client_new(o->ssl_ctx, (long)sock, NULL, 0, ext);
 
-        if (args->do_handshake.u_bool) {
+        if (do_handshake_on_connect) {
             int r = ssl_handshake_status(o->ssl_sock);
 
             if (r != SSL_OK) {
@@ -178,18 +260,11 @@ STATIC mp_obj_ssl_socket_t *ssl_socket_new(mp_obj_t sock, struct ssl_args *args)
                 ssl_raise_error(r);
             }
         }
-
     }
 
     return o;
 }
 
-STATIC void ssl_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_ssl_socket_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<_SSLSocket %p>", self->ssl_sock);
-}
-
 STATIC mp_uint_t ssl_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);
 
@@ -305,7 +380,6 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     #endif
 };
-
 STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
 
 STATIC const mp_stream_p_t ssl_socket_stream_p = {
@@ -316,16 +390,23 @@ STATIC const mp_stream_p_t ssl_socket_stream_p = {
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ssl_socket_type,
-    // Save on qstr's, reuse same as for module
-    MP_QSTR_ssl,
+    MP_QSTR_SSLSocket,
     MP_TYPE_FLAG_NONE,
-    print, ssl_socket_print,
     protocol, &ssl_socket_stream_p,
     locals_dict, &ssl_socket_locals_dict
     );
 
+/******************************************************************************/
+// ssl module.
+
 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
+    enum {
+        ARG_key,
+        ARG_cert,
+        ARG_server_side,
+        ARG_server_hostname,
+        ARG_do_handshake,
+    };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_cert, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -334,22 +415,40 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
         { MP_QSTR_do_handshake, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
     };
 
-    // TODO: Check that sock implements stream protocol
+    // Parse arguments.
     mp_obj_t sock = 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);
+
+    // Create SSLContext.
+    mp_int_t protocol = args[ARG_server_side].u_bool ? PROTOCOL_TLS_SERVER : PROTOCOL_TLS_CLIENT;
+    mp_obj_t ssl_context_args[1] = { MP_OBJ_NEW_SMALL_INT(protocol) };
+    mp_obj_ssl_context_t *ssl_context = MP_OBJ_TO_PTR(ssl_context_make_new(&ssl_context_type, 1, 0, ssl_context_args));
 
-    struct ssl_args args;
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
-        MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args);
+    // Load key and cert if given.
+    if (args[ARG_key].u_obj != mp_const_none) {
+        ssl_context_load_key(ssl_context, args[ARG_key].u_obj, args[ARG_cert].u_obj);
+    }
 
-    return MP_OBJ_FROM_PTR(ssl_socket_new(sock, &args));
+    // Create and return the new SSLSocket object.
+    return ssl_socket_make_new(ssl_context, sock, args[ARG_server_side].u_bool,
+        args[ARG_do_handshake].u_bool, args[ARG_server_hostname].u_obj);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socket);
 
 STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ssl) },
+
+    // Functions.
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
-};
 
+    // Classes.
+    { MP_ROM_QSTR(MP_QSTR_SSLContext), MP_ROM_PTR(&ssl_context_type) },
+
+    // Constants.
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(PROTOCOL_TLS_CLIENT) },
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(PROTOCOL_TLS_SERVER) },
+};
 STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
 
 const mp_obj_module_t mp_module_ssl = {
diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index e346f986f77f2..83f6f907f4cc2 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2016 Linaro Ltd.
  * Copyright (c) 2019 Paul Sokolovsky
+ * Copyright (c) 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
@@ -48,33 +49,38 @@
 
 #define MP_STREAM_POLL_RDWR (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)
 
-typedef struct _mp_obj_ssl_socket_t {
+// This corresponds to an SSLContext object.
+typedef struct _mp_obj_ssl_context_t {
     mp_obj_base_t base;
-    mp_obj_t sock;
     mbedtls_entropy_context entropy;
     mbedtls_ctr_drbg_context ctr_drbg;
-    mbedtls_ssl_context ssl;
     mbedtls_ssl_config conf;
     mbedtls_x509_crt cacert;
     mbedtls_x509_crt cert;
     mbedtls_pk_context pkey;
+    int authmode;
+} mp_obj_ssl_context_t;
+
+// This corresponds to an SSLSocket object.
+typedef struct _mp_obj_ssl_socket_t {
+    mp_obj_base_t base;
+    mp_obj_ssl_context_t *ssl_context;
+    mp_obj_t sock;
+    mbedtls_ssl_context ssl;
 
     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 {
-    mp_arg_val_t key;
-    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;
-};
-
+STATIC const mp_obj_type_t ssl_context_type;
 STATIC const mp_obj_type_t ssl_socket_type;
 
+STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname);
+
+/******************************************************************************/
+// Helper functions.
+
 #ifdef MBEDTLS_DEBUG_C
 STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
     (void)ctx;
@@ -84,6 +90,15 @@ STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, cons
 #endif
 
 STATIC NORETURN void mbedtls_raise_error(int err) {
+    // Handle special cases.
+    if (err == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
+        mp_raise_OSError(MP_ENOMEM);
+    } else if (err == MBEDTLS_ERR_PK_BAD_INPUT_DATA) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid key"));
+    } else if (err == MBEDTLS_ERR_X509_BAD_INPUT_DATA) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid cert"));
+    }
+
     // _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
@@ -123,6 +138,178 @@ STATIC NORETURN void mbedtls_raise_error(int err) {
     #endif
 }
 
+/******************************************************************************/
+// SSLContext type.
+
+STATIC mp_obj_t ssl_context_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, 1, false);
+
+    // This is the "protocol" argument.
+    mp_int_t endpoint = mp_obj_get_int(args[0]);
+
+    // Create SSLContext object.
+    #if MICROPY_PY_SSL_FINALISER
+    mp_obj_ssl_context_t *self = m_new_obj_with_finaliser(mp_obj_ssl_context_t);
+    #else
+    mp_obj_ssl_context_t *self = m_new_obj(mp_obj_ssl_context_t);
+    #endif
+    self->base.type = type_in;
+
+    // Initialise mbedTLS state.
+    mbedtls_ssl_config_init(&self->conf);
+    mbedtls_entropy_init(&self->entropy);
+    mbedtls_ctr_drbg_init(&self->ctr_drbg);
+    mbedtls_x509_crt_init(&self->cacert);
+    mbedtls_x509_crt_init(&self->cert);
+    mbedtls_pk_init(&self->pkey);
+
+    #ifdef MBEDTLS_DEBUG_C
+    // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
+    mbedtls_debug_set_threshold(3);
+    #endif
+
+    const byte seed[] = "upy";
+    int ret = mbedtls_ctr_drbg_seed(&self->ctr_drbg, mbedtls_entropy_func, &self->entropy, seed, sizeof(seed));
+    if (ret != 0) {
+        mbedtls_raise_error(ret);
+    }
+
+    ret = mbedtls_ssl_config_defaults(&self->conf, endpoint,
+        MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT);
+    if (ret != 0) {
+        mbedtls_raise_error(ret);
+    }
+
+    if (endpoint == MBEDTLS_SSL_IS_CLIENT) {
+        // The CPython default is MBEDTLS_SSL_VERIFY_REQUIRED, but to maintain
+        // backwards compatibility we use MBEDTLS_SSL_VERIFY_NONE for now.
+        self->authmode = MBEDTLS_SSL_VERIFY_NONE;
+    } else {
+        self->authmode = MBEDTLS_SSL_VERIFY_NONE;
+    }
+    mbedtls_ssl_conf_authmode(&self->conf, self->authmode);
+    mbedtls_ssl_conf_rng(&self->conf, mbedtls_ctr_drbg_random, &self->ctr_drbg);
+    #ifdef MBEDTLS_DEBUG_C
+    mbedtls_ssl_conf_dbg(&self->conf, mbedtls_debug, NULL);
+    #endif
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
+    if (dest[0] == MP_OBJ_NULL) {
+        // Load attribute.
+        if (attr == MP_QSTR_verify_mode) {
+            dest[0] = MP_OBJ_NEW_SMALL_INT(self->authmode);
+        } else {
+            // Continue lookup in locals_dict.
+            dest[1] = MP_OBJ_SENTINEL;
+        }
+    } else if (dest[1] != MP_OBJ_NULL) {
+        // Store attribute.
+        if (attr == MP_QSTR_verify_mode) {
+            self->authmode = mp_obj_get_int(dest[1]);
+            dest[0] = MP_OBJ_NULL;
+            mbedtls_ssl_conf_authmode(&self->conf, self->authmode);
+        }
+    }
+}
+
+#if MICROPY_PY_SSL_FINALISER
+STATIC mp_obj_t ssl_context___del__(mp_obj_t self_in) {
+    mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
+    mbedtls_pk_free(&self->pkey);
+    mbedtls_x509_crt_free(&self->cert);
+    mbedtls_x509_crt_free(&self->cacert);
+    mbedtls_ctr_drbg_free(&self->ctr_drbg);
+    mbedtls_entropy_free(&self->entropy);
+    mbedtls_ssl_config_free(&self->conf);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_context___del___obj, ssl_context___del__);
+#endif
+
+STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
+    size_t key_len;
+    const byte *key = (const byte *)mp_obj_str_get_data(key_obj, &key_len);
+    // len should include terminating null
+    int ret;
+    #if MBEDTLS_VERSION_NUMBER >= 0x03000000
+    ret = mbedtls_pk_parse_key(&self->pkey, key, key_len + 1, NULL, 0, mbedtls_ctr_drbg_random, &self->ctr_drbg);
+    #else
+    ret = mbedtls_pk_parse_key(&self->pkey, key, key_len + 1, NULL, 0);
+    #endif
+    if (ret != 0) {
+        mbedtls_raise_error(MBEDTLS_ERR_PK_BAD_INPUT_DATA); // use general error for all key errors
+    }
+
+    size_t cert_len;
+    const byte *cert = (const byte *)mp_obj_str_get_data(cert_obj, &cert_len);
+    // len should include terminating null
+    ret = mbedtls_x509_crt_parse(&self->cert, cert, cert_len + 1);
+    if (ret != 0) {
+        mbedtls_raise_error(MBEDTLS_ERR_X509_BAD_INPUT_DATA); // use general error for all cert errors
+    }
+
+    ret = mbedtls_ssl_conf_own_cert(&self->conf, &self->cert, &self->pkey);
+    if (ret != 0) {
+        mbedtls_raise_error(ret);
+    }
+}
+
+STATIC void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_obj) {
+    size_t cacert_len;
+    const byte *cacert = (const byte *)mp_obj_str_get_data(cadata_obj, &cacert_len);
+    // len should include terminating null
+    int ret = mbedtls_x509_crt_parse(&self->cacert, cacert, cacert_len + 1);
+    if (ret != 0) {
+        mbedtls_raise_error(MBEDTLS_ERR_X509_BAD_INPUT_DATA); // use general error for all cert errors
+    }
+
+    mbedtls_ssl_conf_ca_chain(&self->conf, &self->cacert, NULL);
+}
+
+STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_do_handshake_on_connect, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
+        { MP_QSTR_server_hostname, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse arguments.
+    mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_obj_t sock = 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);
+
+    // Create and return the new SSLSocket object.
+    return ssl_socket_make_new(self, sock, args[ARG_server_side].u_bool,
+        args[ARG_do_handshake_on_connect].u_bool, args[ARG_server_hostname].u_obj);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
+
+STATIC const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
+    #if MICROPY_PY_SSL_FINALISER
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&ssl_context___del___obj) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_context_wrap_socket_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);
+
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ssl_context_type,
+    MP_QSTR_SSLContext,
+    MP_TYPE_FLAG_NONE,
+    make_new, ssl_context_make_new,
+    attr, ssl_context_attr,
+    locals_dict, &ssl_context_locals_dict
+    );
+
+/******************************************************************************/
+// SSLSocket type.
+
 STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
     mp_obj_t sock = *(mp_obj_t *)ctx;
 
@@ -158,8 +345,9 @@ STATIC int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
     }
 }
 
+STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
 
-STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     // Verify the socket object has the full stream protocol
     mp_get_stream_raise(sock, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
 
@@ -175,44 +363,14 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
 
     int ret;
     mbedtls_ssl_init(&o->ssl);
-    mbedtls_ssl_config_init(&o->conf);
-    mbedtls_x509_crt_init(&o->cacert);
-    mbedtls_x509_crt_init(&o->cert);
-    mbedtls_pk_init(&o->pkey);
-    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(3);
-    #endif
-
-    mbedtls_entropy_init(&o->entropy);
-    const byte seed[] = "upy";
-    ret = mbedtls_ctr_drbg_seed(&o->ctr_drbg, mbedtls_entropy_func, &o->entropy, seed, sizeof(seed));
-    if (ret != 0) {
-        goto cleanup;
-    }
-
-    ret = mbedtls_ssl_config_defaults(&o->conf,
-        args->server_side.u_bool ? MBEDTLS_SSL_IS_SERVER : MBEDTLS_SSL_IS_CLIENT,
-        MBEDTLS_SSL_TRANSPORT_STREAM,
-        MBEDTLS_SSL_PRESET_DEFAULT);
-    if (ret != 0) {
-        goto cleanup;
-    }
-
-    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);
-    #endif
 
-    ret = mbedtls_ssl_setup(&o->ssl, &o->conf);
+    ret = mbedtls_ssl_setup(&o->ssl, &ssl_context->conf);
     if (ret != 0) {
         goto cleanup;
     }
 
-    if (args->server_hostname.u_obj != mp_const_none) {
-        const char *sni = mp_obj_str_get_str(args->server_hostname.u_obj);
+    if (server_hostname != mp_const_none) {
+        const char *sni = mp_obj_str_get_str(server_hostname);
         ret = mbedtls_ssl_set_hostname(&o->ssl, sni);
         if (ret != 0) {
             goto cleanup;
@@ -221,49 +379,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
 
     mbedtls_ssl_set_bio(&o->ssl, &o->sock, _mbedtls_ssl_send, _mbedtls_ssl_recv, NULL);
 
-    if (args->key.u_obj != mp_const_none) {
-        size_t key_len;
-        const byte *key = (const byte *)mp_obj_str_get_data(args->key.u_obj, &key_len);
-        // len should include terminating null
-        #if MBEDTLS_VERSION_NUMBER >= 0x03000000
-        ret = mbedtls_pk_parse_key(&o->pkey, key, key_len + 1, NULL, 0, mbedtls_ctr_drbg_random, &o->ctr_drbg);
-        #else
-        ret = mbedtls_pk_parse_key(&o->pkey, key, key_len + 1, NULL, 0);
-        #endif
-        if (ret != 0) {
-            ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA; // use general error for all key errors
-            goto cleanup;
-        }
-
-        size_t cert_len;
-        const byte *cert = (const byte *)mp_obj_str_get_data(args->cert.u_obj, &cert_len);
-        // len should include terminating null
-        ret = mbedtls_x509_crt_parse(&o->cert, cert, cert_len + 1);
-        if (ret != 0) {
-            ret = MBEDTLS_ERR_X509_BAD_INPUT_DATA; // use general error for all cert errors
-            goto cleanup;
-        }
-
-        ret = mbedtls_ssl_conf_own_cert(&o->conf, &o->cert, &o->pkey);
-        if (ret != 0) {
-            goto cleanup;
-        }
-    }
-
-    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) {
+    if (do_handshake_on_connect) {
         while ((ret = mbedtls_ssl_handshake(&o->ssl)) != 0) {
             if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
                 goto cleanup;
@@ -274,26 +390,11 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
         }
     }
 
-    return o;
+    return MP_OBJ_FROM_PTR(o);
 
 cleanup:
-    mbedtls_pk_free(&o->pkey);
-    mbedtls_x509_crt_free(&o->cert);
-    mbedtls_x509_crt_free(&o->cacert);
     mbedtls_ssl_free(&o->ssl);
-    mbedtls_ssl_config_free(&o->conf);
-    mbedtls_ctr_drbg_free(&o->ctr_drbg);
-    mbedtls_entropy_free(&o->entropy);
-
-    if (ret == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
-        mp_raise_OSError(MP_ENOMEM);
-    } else if (ret == MBEDTLS_ERR_PK_BAD_INPUT_DATA) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid key"));
-    } else if (ret == MBEDTLS_ERR_X509_BAD_INPUT_DATA) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid cert"));
-    } else {
-        mbedtls_raise_error(ret);
-    }
+    mbedtls_raise_error(ret);
 }
 
 STATIC mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
@@ -309,12 +410,6 @@ STATIC mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_ssl_getpeercert_obj, mod_ssl_getpeercert);
 
-STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_ssl_socket_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<_SSLSocket %p>", self);
-}
-
 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;
@@ -397,13 +492,7 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
 
     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);
         mbedtls_ssl_free(&self->ssl);
-        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
@@ -454,7 +543,6 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_getpeercert), MP_ROM_PTR(&mod_ssl_getpeercert_obj) },
 };
-
 STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
 
 STATIC const mp_stream_p_t ssl_socket_stream_p = {
@@ -465,16 +553,25 @@ STATIC const mp_stream_p_t ssl_socket_stream_p = {
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ssl_socket_type,
-    // Save on qstr's, reuse same as for module
-    MP_QSTR_ssl,
+    MP_QSTR_SSLSocket,
     MP_TYPE_FLAG_NONE,
-    print, socket_print,
     protocol, &ssl_socket_stream_p,
     locals_dict, &ssl_socket_locals_dict
     );
 
+/******************************************************************************/
+// ssl module.
+
 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
+    enum {
+        ARG_key,
+        ARG_cert,
+        ARG_server_side,
+        ARG_server_hostname,
+        ARG_cert_reqs,
+        ARG_cadata,
+        ARG_do_handshake,
+    };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_cert, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -485,25 +582,52 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
         { MP_QSTR_do_handshake, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
     };
 
-    // TODO: Check that sock implements stream protocol
+    // Parse arguments.
     mp_obj_t sock = 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);
 
-    struct ssl_args args;
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
-        MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args);
+    // Create SSLContext.
+    mp_int_t protocol = args[ARG_server_side].u_bool ? MBEDTLS_SSL_IS_SERVER : MBEDTLS_SSL_IS_CLIENT;
+    mp_obj_t ssl_context_args[1] = { MP_OBJ_NEW_SMALL_INT(protocol) };
+    mp_obj_ssl_context_t *ssl_context = MP_OBJ_TO_PTR(ssl_context_make_new(&ssl_context_type, 1, 0, ssl_context_args));
 
-    return MP_OBJ_FROM_PTR(socket_new(sock, &args));
+    // Load key and cert if given.
+    if (args[ARG_key].u_obj != mp_const_none) {
+        ssl_context_load_key(ssl_context, args[ARG_key].u_obj, args[ARG_cert].u_obj);
+    }
+
+    // Set the verify_mode.
+    mp_obj_t dest[2] = { MP_OBJ_SENTINEL, MP_OBJ_NEW_SMALL_INT(args[ARG_cert_reqs].u_int) };
+    ssl_context_attr(MP_OBJ_FROM_PTR(ssl_context), MP_QSTR_verify_mode, dest);
+
+    // Load cadata if given.
+    if (args[ARG_cadata].u_obj != mp_const_none) {
+        ssl_context_load_cadata(ssl_context, args[ARG_cadata].u_obj);
+    }
+
+    // Create and return the new SSLSocket object.
+    return ssl_socket_make_new(ssl_context, sock, args[ARG_server_side].u_bool,
+        args[ARG_do_handshake].u_bool, args[ARG_server_hostname].u_obj);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socket);
 
 STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ssl) },
+
+    // Functions.
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
+
+    // Classes.
+    { MP_ROM_QSTR(MP_QSTR_SSLContext), MP_ROM_PTR(&ssl_context_type) },
+
+    // Constants.
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(MBEDTLS_SSL_IS_CLIENT) },
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(MBEDTLS_SSL_IS_SERVER) },
     { 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);
 
 const mp_obj_module_t mp_module_ssl = {
diff --git a/tests/extmod/ssl_basic.py b/tests/extmod/ssl_basic.py
index d035798c98643..95e66e0cae610 100644
--- a/tests/extmod/ssl_basic.py
+++ b/tests/extmod/ssl_basic.py
@@ -33,7 +33,7 @@ def setblocking(self, value):
 ss = ssl.wrap_socket(TestSocket(), server_side=1, do_handshake=0)
 
 # print
-print(repr(ss)[:12])
+print(ss)
 
 # setblocking() propagates call to the underlying stream object
 ss.setblocking(False)
diff --git a/tests/extmod/ssl_basic.py.exp b/tests/extmod/ssl_basic.py.exp
index 30bfd3a43676a..1a10a1861446b 100644
--- a/tests/extmod/ssl_basic.py.exp
+++ b/tests/extmod/ssl_basic.py.exp
@@ -1,5 +1,5 @@
 OSError: client
-<_SSLSocket 
+<SSLSocket>
 TestSocket.setblocking(False)
 TestSocket.setblocking(True)
 TestSocket.ioctl 4 0
diff --git a/tests/net_inet/test_tls_sites.py b/tests/net_inet/test_tls_sites.py
index f9a3dc86d2f2c..4f457b3abcba1 100644
--- a/tests/net_inet/test_tls_sites.py
+++ b/tests/net_inet/test_tls_sites.py
@@ -3,7 +3,7 @@
 
 # CPython only supports server_hostname with SSLContext
 if hasattr(ssl, "SSLContext"):
-    ssl = ssl.SSLContext()
+    ssl = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
 
 
 def test_one(site, opts):

From b50da3dbd7e98dfe5360684a55b342666c7683ca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Jun 2023 14:16:20 +1000
Subject: [PATCH 0093/3129] tests/extmod: Add tests for ssl.SSLContext.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/ssl_sslcontext.py                | 25 ++++++++++++++++
 tests/extmod/ssl_sslcontext_micropython.py    | 29 +++++++++++++++++++
 .../extmod/ssl_sslcontext_micropython.py.exp  |  4 +++
 tests/extmod/ssl_sslcontext_verify_mode.py    | 24 +++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 tests/extmod/ssl_sslcontext.py
 create mode 100644 tests/extmod/ssl_sslcontext_micropython.py
 create mode 100644 tests/extmod/ssl_sslcontext_micropython.py.exp
 create mode 100644 tests/extmod/ssl_sslcontext_verify_mode.py

diff --git a/tests/extmod/ssl_sslcontext.py b/tests/extmod/ssl_sslcontext.py
new file mode 100644
index 0000000000000..23ff9c29646c0
--- /dev/null
+++ b/tests/extmod/ssl_sslcontext.py
@@ -0,0 +1,25 @@
+# Very basic test of ssl.SSLContext class.
+
+try:
+    import socket, ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Test constructing with arguments.
+ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+
+# Test printing object.
+ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+print("SSLContext" in str(ctx))
+
+# Coverage test for destructor, and calling it twice.
+if hasattr(ctx, "__del__"):
+    ctx.__del__()
+    ctx.__del__()
+
+# Test calling .wrap_socket() method, multiple times.
+ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+ctx.wrap_socket(socket.socket(), do_handshake_on_connect=False)
+ctx.wrap_socket(socket.socket(), do_handshake_on_connect=False)
diff --git a/tests/extmod/ssl_sslcontext_micropython.py b/tests/extmod/ssl_sslcontext_micropython.py
new file mode 100644
index 0000000000000..136fb8a054ed7
--- /dev/null
+++ b/tests/extmod/ssl_sslcontext_micropython.py
@@ -0,0 +1,29 @@
+# Test MicroPython-specific behaviour of ssl.SSLContext.
+
+try:
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Test constructing without any arguments (in CPython it's a DeprecationWarning).
+try:
+    ssl.SSLContext()
+except TypeError:
+    print("TypeError")
+
+# Test attributes that don't exist (in CPython new attributes can be added).
+# This test is needed for coverage because SSLContext implements a custom attr handler.
+ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+try:
+    ctx.does_not_exist
+except AttributeError:
+    print("AttributeError on load")
+try:
+    ctx.does_not_exist = None
+except AttributeError:
+    print("AttributeError on store")
+try:
+    del ctx.does_not_exist
+except AttributeError:
+    print("AttributeError on delete")
diff --git a/tests/extmod/ssl_sslcontext_micropython.py.exp b/tests/extmod/ssl_sslcontext_micropython.py.exp
new file mode 100644
index 0000000000000..21e65258ff2a1
--- /dev/null
+++ b/tests/extmod/ssl_sslcontext_micropython.py.exp
@@ -0,0 +1,4 @@
+TypeError
+AttributeError on load
+AttributeError on store
+AttributeError on delete
diff --git a/tests/extmod/ssl_sslcontext_verify_mode.py b/tests/extmod/ssl_sslcontext_verify_mode.py
new file mode 100644
index 0000000000000..daccc2f4a956b
--- /dev/null
+++ b/tests/extmod/ssl_sslcontext_verify_mode.py
@@ -0,0 +1,24 @@
+# Test ssl.SSLContext.verify_mode attribute.
+# It's not available in the axtls implementation, so has an independent test.
+
+try:
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+if not hasattr(ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT), "verify_mode"):
+    print("SKIP")
+    raise SystemExit
+
+# Test default verify_mode for server (client default is different in MicroPython).
+ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+print(ctx.verify_mode == ssl.CERT_NONE)
+
+# Test setting and getting verify_mode.
+ctx.verify_mode = ssl.CERT_NONE
+print(ctx.verify_mode == ssl.CERT_NONE)
+ctx.verify_mode = ssl.CERT_OPTIONAL
+print(ctx.verify_mode == ssl.CERT_OPTIONAL)
+ctx.verify_mode = ssl.CERT_REQUIRED
+print(ctx.verify_mode == ssl.CERT_REQUIRED)

From 9900eaa2698ef493d15237cb737bdfcc51ac193f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Jun 2023 15:28:09 +1000
Subject: [PATCH 0094/3129] tests/extmod: Add test for passing cadata into
 ssl.wrap_socket().

For coverage.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/ssl_cadata.py     | 14 ++++++++++++++
 tests/extmod/ssl_cadata.py.exp |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 tests/extmod/ssl_cadata.py
 create mode 100644 tests/extmod/ssl_cadata.py.exp

diff --git a/tests/extmod/ssl_cadata.py b/tests/extmod/ssl_cadata.py
new file mode 100644
index 0000000000000..a68cae1ecbb48
--- /dev/null
+++ b/tests/extmod/ssl_cadata.py
@@ -0,0 +1,14 @@
+# Test ssl.wrap_socket() with cadata passed in.
+
+try:
+    import io
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Invalid cadata.
+try:
+    ssl.wrap_socket(io.BytesIO(), cadata=b"!")
+except ValueError as er:
+    print(repr(er))
diff --git a/tests/extmod/ssl_cadata.py.exp b/tests/extmod/ssl_cadata.py.exp
new file mode 100644
index 0000000000000..9f1cf732e33ff
--- /dev/null
+++ b/tests/extmod/ssl_cadata.py.exp
@@ -0,0 +1 @@
+ValueError('invalid cert',)

From 713a45124bd8cf161af7ecd8babda1aa030a8ba4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Jun 2023 16:33:23 +1000
Subject: [PATCH 0095/3129] docs/library/ssl: Add documentation for SSLContext.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/ssl.rst | 62 ++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index 924b03b3541b3..e3dfa9d993668 100644
--- a/docs/library/ssl.rst
+++ b/docs/library/ssl.rst
@@ -15,36 +15,53 @@ Functions
 
 .. function:: ssl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, cadata=None, server_hostname=None, do_handshake=True)
 
+    Wrap the given *sock* and return a new wrapped-socket object.  The implementation
+    of this function is to first create an `SSLContext` and then call the `SSLContext.wrap_socket`
+    method on that context object.  The arguments *sock*, *server_side* and *server_hostname* are
+    passed through unchanged to the method call.  The argument *do_handshake* is passed through as
+    *do_handshake_on_connect*.  The remaining arguments have the following behaviour:
+
+   - *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.
+
+   Depending on the underlying module implementation in a particular
+   :term:`MicroPython port`, some or all keyword arguments above may be not supported.
+
+class SSLContext
+----------------
+
+.. class:: SSLContext(protocol, /)
+
+    Create a new SSLContext instance.  The *protocol* argument must be one of the ``PROTOCOL_*``
+    constants.
+
+.. method:: SSLContext.wrap_socket(sock, *, server_side=False, do_handshake_on_connect=True, server_hostname=None)
+
    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
+   and returns an instance of ssl.SSLSocket, wrapping the underlying stream.
+   The 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:`~socket.socket.accept()` on a non-SSL listening server socket.
 
-   - *do_handshake* determines whether the handshake is done as part of the ``wrap_socket``
+   - *server_side* selects whether the wrapped socket is on the server or client side.
+     A server-side SSL socket should be created from a normal socket returned from
+     :meth:`~socket.socket.accept()` on a non-SSL listening server socket.
+
+   - *do_handshake_on_connect* 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.
 
-   - *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.
-
 .. warning::
 
    Some implementations of ``ssl`` module do NOT validate server certificates,
@@ -55,6 +72,11 @@ Functions
    returns an object more similar to CPython's ``SSLObject`` which does not have
    these socket methods.
 
+.. attribute:: SSLContext.verify_mode
+
+    Set or get the behaviour for verification of peer certificates.  Must be one of the
+    ``CERT_*`` constants.
+
 Exceptions
 ----------
 
@@ -65,8 +87,14 @@ Exceptions
 Constants
 ---------
 
+.. data:: ssl.PROTOCOL_TLS_CLIENT
+          ssl.PROTOCOL_TLS_SERVER
+
+    Supported values for the *protocol* parameter.
+
 .. data:: ssl.CERT_NONE
           ssl.CERT_OPTIONAL
           ssl.CERT_REQUIRED
 
-    Supported values for *cert_reqs* parameter.
+    Supported values for *cert_reqs* parameter, and the :attr:`SSLContext.verify_mode`
+    attribute.

From 92c7532d8e461f3fd9ea44f4d024ee3ce156e5e8 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 1 Jun 2023 17:56:28 +0900
Subject: [PATCH 0096/3129] renesas-ra: Support changing baudrate for UART.

* Use R_SCI_UART_BaudCalculate() of fsp/src/r_sci_uart/r_sci_uart.c
* Support UART.init(baudrate)

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/Makefile                 |  4 +++
 ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h | 25 +++++++++++++++
 ports/renesas-ra/ra/ra_sci.c              | 37 +++++++++++++----------
 3 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 13be532cb2390..7ffb3b1d0ec75 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -359,8 +359,12 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/fsp/src/bsp/mcu/all/,\
 
 HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/fsp/src/,\
 	r_ioport/r_ioport.c \
+	r_sci_uart/r_sci_uart.c \
 	)
 
+CFLAGS_FSP = -Wno-unused-variable -Wno-unused-function
+$(BUILD)/lib/fsp/ra/fsp/src/r_sci_uart/r_sci_uart.o: CFLAGS += $(CFLAGS_FSP)
+
 ifeq ($(USE_FSP_LPM), 1)
 CFLAGS += -DUSE_FSP_LPM
 HAL_SRC_C += $(HAL_DIR)/ra/fsp/src/r_lpm/r_lpm.c
diff --git a/ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h
new file mode 100644
index 0000000000000..bbc6dc5522c60
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h
@@ -0,0 +1,25 @@
+#ifndef R_SCI_UART_CFG_H_
+#define R_SCI_UART_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#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)
+#define SCI_UART_CFG_RS485_SUPPORT (0)
+
+/*
+ * Disable r_sci_uart.c's interrupt handlers by defining followings
+ * because the renesas-ra has own interrupt handlers for SCI and
+ * symbol conflict happens.
+ */
+
+#define SCI_UART_CFG_TX_ENABLE (0)
+#define SCI_UART_CFG_RX_ENABLE (0)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_SCI_UART_CFG_H_ */
diff --git a/ports/renesas-ra/ra/ra_sci.c b/ports/renesas-ra/ra/ra_sci.c
index 3f8bf2444401d..5d1406724868c 100644
--- a/ports/renesas-ra/ra/ra_sci.c
+++ b/ports/renesas-ra/ra/ra_sci.c
@@ -28,6 +28,7 @@
 #include "ra_int.h"
 #include "ra_utils.h"
 #include "ra_sci.h"
+#include "r_sci_uart.h"
 
 #if !defined(RA_PRI_UART)
 #define RA_PRI_UART (1)
@@ -1100,20 +1101,24 @@ static void ra_sci_fifo_init(uint32_t ch) {
 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);
+    baud_setting_t baud_setting;
+
+    // baudrate_modulation=1(enabled), baudrate_max_err=5%(general value for FSP example).
+    if (R_SCI_UART_BaudCalculate(baud, 1, 5000, &baud_setting) == FSP_SUCCESS) {
+        // Disable transmitter and receiver.
+        uint8_t scr = sci_reg->SCR;
+        sci_reg->SCR = scr & ~(0xF0);
+
+        // Change baudrate
+        sci_reg->BRR = baud_setting.brr;
+        // Update CKS(b1:b0)
+        sci_reg->SMR_b.CKS = (uint8_t)(0x03U & baud_setting.cks);
+        sci_reg->MDDR = baud_setting.mddr;
+        // Update BGDM(b6)/ABCS(b4)/ABCSE(b3)/BRME(b2) bits
+        sci_reg->SEMR = (uint8_t)((sci_reg->SEMR & ~(0x5cU)) | (baud_setting.semr_baudrate_bits & 0x5cU));
+
+        // Restore SCR
+        sci_reg->SCR = scr;
     }
 }
 
@@ -1131,8 +1136,8 @@ void ra_sci_init_with_flow(uint32_t ch, uint32_t tx_pin, uint32_t rx_pin, uint32
         sci_cb[idx] = 0;
         ra_sci_init_flag[idx]++;
     } else {
-        ra_sci_init_flag[idx]++;
-        return;
+        ra_sci_irq_disable(ch);
+        ra_sci_module_stop(ch);
     }
     ra_sci_module_start(ch);
     ra_sci_tx_set_pin(tx_pin);

From fae96b17a762608224a133067810ac461c3de14e Mon Sep 17 00:00:00 2001
From: mbedNoobNinja <novoltage@gmail.com>
Date: Thu, 2 Mar 2023 18:08:31 +0200
Subject: [PATCH 0097/3129] renesas-ra: Add support for RA6M5, and add machine
 PWM, DAC, SDCard.

This commit adds support for a new processor RA6M5.  It also adds the
following classes to the machine module: PWM, DAC, SDCard.

Signed-off-by: mbedNoobNinja <novoltage@gmail.com>
---
 ports/renesas-ra/Makefile                     |  78 +--
 ports/renesas-ra/RA4M1_hal.h                  |   7 +-
 ports/renesas-ra/RA4W1_hal.h                  |   7 +-
 ports/renesas-ra/RA6M1_hal.h                  |   7 +-
 ports/renesas-ra/RA6M2_hal.h                  |   7 +-
 ports/renesas-ra/RA6M5_hal.h                  | 109 +++
 ports/renesas-ra/README.md                    |   6 +-
 .../boards/EK_RA4M1/mpconfigboard.mk          |   3 +
 .../boards/EK_RA4W1/mpconfigboard.mk          |   2 +
 .../boards/EK_RA6M1/mpconfigboard.mk          |   2 +
 .../boards/EK_RA6M2/mpconfigboard.mk          |   2 +
 .../boards/RA4M1_CLICKER/mpconfigboard.mk     |   3 +
 ports/renesas-ra/boards/manifest.py           |   1 -
 ports/renesas-ra/boards/ra6m5_af.csv          | 193 ++++++
 ports/renesas-ra/flashbdev.c                  |  13 +-
 ports/renesas-ra/fsp_cfg/r_agt_cfg.h          |  14 +
 ports/renesas-ra/fsp_cfg/r_dtc_cfg.h          |  13 +
 ports/renesas-ra/fsp_cfg/r_icu_cfg.h          |  12 +
 ports/renesas-ra/fsp_cfg/r_iic_master_cfg.h   |  14 +
 ports/renesas-ra/fsp_cfg/r_rtc_cfg.h          |  13 +
 ports/renesas-ra/fsp_cfg/r_sdhi_cfg.h         |  19 +
 ports/renesas-ra/fsp_cfg/r_spi_cfg.h          |  17 +
 ports/renesas-ra/machine_dac.c                | 183 +++++
 ports/renesas-ra/machine_pwm.c                | 357 ++++++++++
 ports/renesas-ra/machine_sdcard.c             | 338 ++++++++++
 ports/renesas-ra/machine_spi.c                | 103 ++-
 ports/renesas-ra/modmachine.c                 |  13 +
 ports/renesas-ra/mpconfigboard_common.h       |  46 ++
 ports/renesas-ra/mpconfigport.h               |   9 +
 ports/renesas-ra/powerctrl.c                  |   2 +-
 ports/renesas-ra/ra/ra_adc.c                  |  85 ++-
 ports/renesas-ra/ra/ra_adc.h                  |  61 ++
 ports/renesas-ra/ra/ra_config.h               |   6 +
 ports/renesas-ra/ra/ra_dac.c                  | 168 +++++
 ports/renesas-ra/ra/ra_dac.h                  |  41 ++
 ports/renesas-ra/ra/ra_flash.c                | 166 ++++-
 ports/renesas-ra/ra/ra_flash.h                |  19 +
 ports/renesas-ra/ra/ra_gpio.h                 |  62 +-
 ports/renesas-ra/ra/ra_gpt.c                  | 626 ++++++++++++++++++
 ports/renesas-ra/ra/ra_gpt.h                  |  43 ++
 ports/renesas-ra/ra/ra_i2c.c                  |  69 +-
 ports/renesas-ra/ra/ra_i2c.h                  |   7 +
 ports/renesas-ra/ra/ra_icu.c                  | 174 +++++
 ports/renesas-ra/ra/ra_int.h                  |   2 +-
 ports/renesas-ra/ra/ra_rtc.c                  |   2 +-
 ports/renesas-ra/ra/ra_sci.c                  | 213 +++++-
 ports/renesas-ra/ra/ra_spi.c                  | 281 ++++++--
 ports/renesas-ra/ra/ra_spi.h                  |  12 +-
 ports/renesas-ra/ra/ra_timer.c                |   4 +-
 ports/renesas-ra/ra/ra_utils.c                |  14 +-
 ports/renesas-ra/ra/ra_utils.h                |   2 +
 ports/renesas-ra/spi.h                        |   3 -
 52 files changed, 3403 insertions(+), 250 deletions(-)
 create mode 100644 ports/renesas-ra/RA6M5_hal.h
 create mode 100644 ports/renesas-ra/boards/ra6m5_af.csv
 create mode 100644 ports/renesas-ra/fsp_cfg/r_agt_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_dtc_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_icu_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_iic_master_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_rtc_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_sdhi_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_spi_cfg.h
 create mode 100644 ports/renesas-ra/machine_dac.c
 create mode 100644 ports/renesas-ra/machine_pwm.c
 create mode 100644 ports/renesas-ra/machine_sdcard.c
 create mode 100644 ports/renesas-ra/ra/ra_dac.c
 create mode 100644 ports/renesas-ra/ra/ra_dac.h
 create mode 100644 ports/renesas-ra/ra/ra_gpt.c
 create mode 100644 ports/renesas-ra/ra/ra_gpt.h

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 7ffb3b1d0ec75..71d0a2d667bdd 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -16,41 +16,6 @@ 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
-CMSIS_MCU_CAP = RA4M1
-USE_FSP_LPM = 0
-endif
-
-ifeq ($(BOARD),EK_RA4M1)
-BOARD_LOW = ra4m1_ek
-CMSIS_MCU_LOW = ra4m1
-CMSIS_MCU_CAP = RA4M1
-USE_FSP_LPM = 0
-endif
-
-ifeq ($(BOARD),EK_RA4W1)
-BOARD_LOW = ra4w1_ek
-CMSIS_MCU_LOW = ra4w1
-CMSIS_MCU_CAP = RA4W1
-USE_FSP_LPM = 1
-endif
-
-ifeq ($(BOARD),EK_RA6M1)
-BOARD_LOW = ra6m1_ek
-CMSIS_MCU_LOW = ra6m1
-CMSIS_MCU_CAP = RA6M1
-USE_FSP_LPM = 1
-endif
-
-ifeq ($(BOARD),EK_RA6M2)
-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
 
@@ -58,6 +23,10 @@ include ../../py/mkenv.mk
 -include mpconfigport.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
+USE_FSP_LPM ?= 1
+USE_FSP_QSPI ?= 0
+FSP_BOARD_NAME ?= $(shell echo $(BOARD) | tr '[:upper:]' '[:lower:]')
+
 # 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
@@ -101,16 +70,18 @@ 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))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1 RA6M1 RA6M2 RA6M5))
 INC += -Ira
 endif
 INC += -I$(BOARD_DIR)/ra_gen
+INC += -I$(BOARD_DIR)/ra_cfg/driver
 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>'
+CFLAGS += -DRA_CFG_H='<$(FSP_BOARD_NAME)_conf.h>'
 
 # Basic Cortex-M flags
 CFLAGS_CORTEX_M = -mthumb
@@ -123,12 +94,19 @@ CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 endif
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),m33))
+CFLAGS_CORTEX_M += -mfpu=fpv5-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_MCU_RA6M5 = $(CFLAGS_CORTEX_M) -mtune=cortex-m33 -mcpu=cortex-m33
 
+ASFLAGS += $(CFLAGS_CORTEX_M) -mcpu=cortex-$(MCU_SERIES)
 CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_EXTRA)
 #CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += $(CFLAGS_MCU_$(CMSIS_MCU))
@@ -315,11 +293,13 @@ SRC_C += \
 	gccollect.c \
 	help.c \
 	machine_adc.c \
+	machine_dac.c \
 	machine_i2c.c \
 	machine_spi.c \
 	machine_uart.c \
 	machine_pin.c \
 	machine_rtc.c \
+	machine_sdcard.c \
 	modmachine.c \
 	extint.c \
 	usrsw.c \
@@ -365,6 +345,17 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/fsp/src/,\
 CFLAGS_FSP = -Wno-unused-variable -Wno-unused-function
 $(BUILD)/lib/fsp/ra/fsp/src/r_sci_uart/r_sci_uart.o: CFLAGS += $(CFLAGS_FSP)
 
+ifeq ($(USE_FSP_QSPI), 1)
+CFLAGS += -DUSE_FSP_QSPI
+HAL_SRC_C += $(HAL_DIR)/ra/fsp/src/r_qspi/r_qspi.c
+endif
+
+ifeq ($(USE_FSP_SDHI), 1)
+CFLAGS += -DUSE_FSP_SDHI
+HAL_SRC_C += $(HAL_DIR)/ra/fsp/src/r_sdhi/r_sdhi.c \
+	$(HAL_DIR)/ra/fsp/src/r_dtc/r_dtc.c
+endif
+
 ifeq ($(USE_FSP_LPM), 1)
 CFLAGS += -DUSE_FSP_LPM
 HAL_SRC_C += $(HAL_DIR)/ra/fsp/src/r_lpm/r_lpm.c
@@ -377,16 +368,17 @@ 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 ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA6M1 RA6M2 RA6M5))
 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))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1 RA6M1 RA6M2 RA6M5))
 HAL_SRC_C += $(addprefix ra/,\
 	ra_adc.c \
+	ra_dac.c \
 	ra_flash.c \
 	ra_gpio.c \
 	ra_i2c.c \
@@ -397,6 +389,7 @@ HAL_SRC_C += $(addprefix ra/,\
 	ra_sci.c \
 	ra_spi.c \
 	ra_timer.c \
+	ra_gpt.c \
 	ra_utils.c \
 	)
 
@@ -413,6 +406,12 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))
 OBJ += $(BUILD)/pins_$(BOARD).o
 
+ifeq ($(CMSIS_MCU),RA6M5)
+$(BUILD)/shared/runtime/gchelper_thumb2.o: $(TOP)/shared/runtime/gchelper_thumb2.s
+	$(ECHO) "AS $<"
+	$(Q)$(AS) $(ASFLAGS) -o $@ $<
+endif
+
 # 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.
@@ -486,6 +485,9 @@ endif
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA6M2))
 AF_FILE = boards/ra6m2_af.csv
 endif
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA6M5))
+AF_FILE = boards/ra6m5_af.csv
+endif
 GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
diff --git a/ports/renesas-ra/RA4M1_hal.h b/ports/renesas-ra/RA4M1_hal.h
index 7f0ad9666f47b..bdfa8cc75cf73 100644
--- a/ports/renesas-ra/RA4M1_hal.h
+++ b/ports/renesas-ra/RA4M1_hal.h
@@ -31,8 +31,11 @@
 // #include "hal_data.h"
 #include "bsp_api.h"
 #include "common_data.h"
+#if defined(USE_DBG_PRINT)
+#include RA_CFG_H
+#endif
 
-#define SCI_CH      0
+#define SCI_CH      DEFAULT_DBG_CH
 #define SCI_BAUD    115200
 #define UART_CH     SCI_CH
 #define UART_TxStr  sci_tx_str
@@ -56,8 +59,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"
diff --git a/ports/renesas-ra/RA4W1_hal.h b/ports/renesas-ra/RA4W1_hal.h
index 774ec46b38196..930127c459114 100644
--- a/ports/renesas-ra/RA4W1_hal.h
+++ b/ports/renesas-ra/RA4W1_hal.h
@@ -31,8 +31,11 @@
 // #include "hal_data.h"
 #include "bsp_api.h"
 #include "common_data.h"
+#if defined(USE_DBG_PRINT)
+#include RA_CFG_H
+#endif
 
-#define SCI_CH      0
+#define SCI_CH      DEFAULT_DBG_CH
 #define SCI_BAUD    115200
 #define UART_CH     SCI_CH
 #define UART_TxStr  sci_tx_str
@@ -56,8 +59,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"
diff --git a/ports/renesas-ra/RA6M1_hal.h b/ports/renesas-ra/RA6M1_hal.h
index 9929d29b5462a..6721a6fdb2b44 100644
--- a/ports/renesas-ra/RA6M1_hal.h
+++ b/ports/renesas-ra/RA6M1_hal.h
@@ -31,8 +31,11 @@
 // #include "hal_data.h"
 #include "bsp_api.h"
 #include "common_data.h"
+#if defined(USE_DBG_PRINT)
+#include RA_CFG_H
+#endif
 
-#define SCI_CH      0
+#define SCI_CH      DEFAULT_DBG_CH
 #define SCI_BAUD    115200
 #define UART_CH     SCI_CH
 #define UART_TxStr  sci_tx_str
@@ -56,8 +59,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"
diff --git a/ports/renesas-ra/RA6M2_hal.h b/ports/renesas-ra/RA6M2_hal.h
index 75877cc0f6052..ffecacd2bab8b 100644
--- a/ports/renesas-ra/RA6M2_hal.h
+++ b/ports/renesas-ra/RA6M2_hal.h
@@ -31,8 +31,11 @@
 // #include "hal_data.h"
 #include "bsp_api.h"
 #include "common_data.h"
+#if defined(USE_DBG_PRINT)
+#include RA_CFG_H
+#endif
 
-#define SCI_CH      0
+#define SCI_CH      DEFAULT_DBG_CH
 #define SCI_BAUD    115200
 #define UART_CH     SCI_CH
 #define UART_TxStr  sci_tx_str
@@ -56,8 +59,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"
diff --git a/ports/renesas-ra/RA6M5_hal.h b/ports/renesas-ra/RA6M5_hal.h
new file mode 100644
index 0000000000000..2e58dcb41db0f
--- /dev/null
+++ b/ports/renesas-ra/RA6M5_hal.h
@@ -0,0 +1,109 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_RA6M5_HAL_H_
+#define PORTS_RA_RA6M5_HAL_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+// #include "hal_data.h"
+#include "bsp_api.h"
+#include "common_data.h"
+#if defined(USE_DBG_PRINT)
+#include RA_CFG_H
+#endif
+
+#define SCI_CH      DEFAULT_DBG_CH
+#define SCI_BAUD    115200
+#define UART_CH     SCI_CH
+#define UART_TxStr  sci_tx_str
+#define PCLK        100000000
+
+#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_dac.h"
+#include "ra_flash.h"
+#include "ra_gpio.h"
+#include "ra_gpt.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 == 6)
+#define DEBUG_TX_PIN    P506
+#define DEBUG_RX_PIN    P505
+#endif
+#if (DEBUG_CH == 7)
+#define DEBUG_TX_PIN    P613
+#define DEBUG_RX_PIN    P614
+#endif
+#if (DEBUG_CH == 9)
+#define DEBUG_TX_PIN    P109
+#define DEBUG_RX_PIN    P110
+#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_RA6M5_HAL_H_ */
diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
index 1e5e2ed0cf48d..4cd116a37f9eb 100644
--- a/ports/renesas-ra/README.md
+++ b/ports/renesas-ra/README.md
@@ -6,9 +6,9 @@ Currently supported features are:
 - Filesystem on the internal flash using FatFs.
 - `time` module with sleep, time, and ticks functions.
 - `os` 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.
+- `machine` module with the following classes: `Pin`, `ADC`, `PWM`, `DAC`, `I2C`,
+  `SPI`, `SoftI2C`, `SoftSPI`, `UART`, `RTC`, `SDCard`.
+- `sdcard` module for MCUs without native `machine.SDCard` support.
 
 Currently supported board product names are:
 
diff --git a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.mk
index abc111d16e31e..71c004df81136 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.mk
@@ -4,6 +4,9 @@ LD_FILES = boards/EK_RA4M1/ra4m1_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
+USE_FSP_LPM = 0
+
+CFLAGS+=-DDEFAULT_DBG_CH=0
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?= boards/EK_RA4M1/manifest.py
diff --git a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.mk
index c4f95f79f4bb1..3a064e0e3545b 100644
--- a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.mk
@@ -4,3 +4,5 @@ LD_FILES = boards/EK_RA4W1/ra4w1_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
+
+CFLAGS+=-DDEFAULT_DBG_CH=0
diff --git a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.mk
index 3f916eb8e3a4b..645daedc7b7f4 100644
--- a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.mk
@@ -4,3 +4,5 @@ LD_FILES = boards/EK_RA6M1/ra6m1_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
+
+CFLAGS+=-DDEFAULT_DBG_CH=0
diff --git a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.mk
index a48ec6e50a878..983cbed119002 100644
--- a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.mk
@@ -4,3 +4,5 @@ LD_FILES = boards/EK_RA6M2/ra6m2_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
+
+CFLAGS+=-DDEFAULT_DBG_CH=0
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk
index 1758ce67388d3..5d845d93c5178 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk
@@ -4,6 +4,9 @@ LD_FILES = boards/RA4M1_CLICKER/ra4m1_clicker.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
+USE_FSP_LPM = 0
+
+CFLAGS+=-DDEFAULT_DBG_CH=0
 
 # 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/manifest.py b/ports/renesas-ra/boards/manifest.py
index c650136f6648c..94457a4696286 100644
--- a/ports/renesas-ra/boards/manifest.py
+++ b/ports/renesas-ra/boards/manifest.py
@@ -1,4 +1,3 @@
 include("$(MPY_DIR)/extmod/asyncio")
 require("dht")
 require("onewire")
-require("sdcard")
diff --git a/ports/renesas-ra/boards/ra6m5_af.csv b/ports/renesas-ra/boards/ra6m5_af.csv
new file mode 100644
index 0000000000000..816a0c5001dae
--- /dev/null
+++ b/ports/renesas-ra/boards/ra6m5_af.csv
@@ -0,0 +1,193 @@
+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,AF23,AF24,AF25,AF26,AF27,AF28,AF29,
+P000,0,0,AN000,IRQ6-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P001,0,1,AN001,IRQ7-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P002,0,2,AN002,IRQ8-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P003,0,3,AN003,,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P004,0,4,AN004,IRQ9-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P005,0,5,AN005,IRQ10-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P006,0,6,AN006,IRQ11-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P007,0,7,AN007,,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P008,0,8,AN008,IRQ12-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P009,0,9,AN009,IRQ13-DS,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P010,0,10,AN010,IRQ14,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P014,0,14,AN012,,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P015,0,15,AN013,IRQ13,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P100,1,0,,IRQ2,Hi-Z,AGTIO0,GTETRGA,GTIOC5B,RXD0/MISO0/SCL0,SCK1,MISOB_A,,,,,D00[A00/D00],,,,,,QSPCLK,,,,,,,,,,,OM_SCLK,,
+P101,1,1,,IRQ1,Hi-Z,AGTEE0,GTETRGB,GTIOC5A,TXD0/MOSI0/SDA0,CTS1_RTS1/SS1,MOSIB_A,,,,,D01[A01/D01],,,,,,QIO1,,,,,,,,,,,OM_SIO7,,
+P102,1,2,,,Hi-Z,AGTO0,GTOWLO,GTIOC2B,SCK0,,RSPCKB_A,,,,ADTRG0,D02[A02/D02],,,,,CRX0,QIO0,,,,,,,,,,,OM_SIO1,,
+P103,1,3,,,Hi-Z,AGTIO2,GTOWUP,GTIOC2A,CTS0_RTS0/SS0,,SSLB0_A,,,,,D03[A03/D03],,,,,CTX0,QIO3,,,,,,,,,,,OM_SIO6,,
+P104,1,4,,IRQ1,Hi-Z,AGTEE2,GTETRGB,GTIOC1B,RXD8/MISO8/SCL8,,SSLB1_A,,,,,D04[A04/D04],,,,,,QIO2,,,,,,,,,,,OM_DQS,,
+P105,1,5,,IRQ0,Hi-Z,AGTO2,GTETRGA,GTIOC1A,TXD8/MOSI8/SDA8,,SSLB2_A,,,,,D05[A05/D05],,,,,,,,,,,,,,,,,OM_SIO5,,
+P106,1,6,,,Hi-Z,AGTOB0,,GTIOC8B,SCK8,,SSLB3_A,,,,,D06[A06/D06],,,,,,,,,,,,,,,,,OM_SIO0,,
+P107,1,7,,,Hi-Z,AGTOA0,,GTIOC8A,CTS8_RTS8/SS8,,,,,,,D07[A07/D07],,,,,,,,,,,,,,,,,OM_SIO3,,
+P108,1,8,,,TMS/SWDIO,AGTOA3,GTOULO,GTIOC0B,,CTS9_RTS9/SS9,SSLA0_B,,,,,,,,,,,,,,,,,,,,,,,,
+P109,1,9,,,TDO/SWO,AGTOB3,GTOVUP,GTIOC1A,,TXD9/MOSI9/SDA9,MOSIA_B,,,CLKOUT,,,,,,,CTX1,,,,,,,,,,,,,,
+P110,1,10,,IRQ3,TDI,AGTEE3,GTOVLO,GTIOC1B,CTS2_RTS2/SS2,RXD9/MISO9/SCL9,MISOA_B,,,,,,,,,,CRX1,,,,,,,,,,,,,,
+P111,1,11,,IRQ4,Hi-Z,AGTOA5,,GTIOC3A,SCK2,SCK9,RSPCKA_B,,,,,A05,,,,,,,,,,,,,,,,,,,
+P112,1,12,,,Hi-Z,AGTOB5,,GTIOC3B,TXD2/MOSI2/SDA2/TXDX2/SIOX2,SCK1,SSLA0_B,,,,,A04,,,,,,QSSL,SSIBCK0_B,,,,,,,,,,OM_CS1,,
+P113,1,13,,,Hi-Z,AGTEE5,,GTIOC2A,RXD2/MISO2/SCL2/RXDX2,,,,,,,A03,,,,,,,SSILRCK0/SSIFS0_B,,,,,,,,,,,,
+P114,1,14,,,Hi-Z,AGTIO5,,GTIOC2B,,CTS9,,,,,,A02,,,,,,,SSIRXD0_B,,,,,,,,,,,,
+P115,1,15,,,Hi-Z,,,GTIOC4A,,,,,,,,A01,,,,,,,SSITXD0_B,,,,,,,,,,,,
+P200,2,0,,NMI,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P201,2,1,,,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P202,2,2,,IRQ3-DS,Hi-Z,AGTOB3,,GTIOC5B,SCK2,RXD9/MISO9/SCL9,MISOA_A,,,,,WR1/BC1,TS19,,,,CRX0,,,,,SD0DAT6_A,ET0_ERXD2,,,,,,,,
+P203,2,3,,IRQ2-DS,Hi-Z,AGTOA3,,GTIOC5A,CTS2_RTS2/SS2,TXD9/MOSI9/SDA9,MOSIA_A,,,,,A19,TS18,,,,CTX0,,,,,SD0DAT5_A,ET0_COL,,,,,,,,
+P204,2,4,,,Hi-Z,AGTIO1,GTIW,GTIOC4B,SCK4,SCK9,RSPCKA_A,,,,CACREF,A18,TS00,,,,,,SSIBCK0_C,USB_OVRCURB-DS,,SD0DAT4_A,ET0_RX_DV,,,,,,,,
+P205,2,5,,IRQ1-DS,Hi-Z,AGTO1,GTIV,GTIOC4A,TXD4/MOSI4/SDA4,CTS9_RTS9/SS9,SSLA0_A,SCL1_B,,CLKOUT,,A16,TS01,,,,,,SSILRCK0/SSIFS0_C,USB_OVRCURA-DS,,SD0DAT3_A,ET0_WOL,ET0_WOL,,,,,,,
+P206,2,6,,IRQ0-DS,Hi-Z,,GTIU,,RXD4/MISO4/SCL4,CTS9,SSLA1_A,SDA1_B,,,,WAIT,TS02,,,,,,SSIDATA0_C,USB_VBUSEN,,SD0DAT2_A,ET0_LINKSTA,ET0_LINKSTA,,,,,,CECIO_B,
+P207,2,7,,,Hi-Z,,,,TXD4/MOSI4/SDA4,,SSLA2_A,,,,,A17,TSCAP,,,,,QSSL,,,,,,,,,,,,,
+P208,2,8,,,Hi-Z,,GTOVLO,,,,,,,,,CS4,,,,,,QIO3,,,,SD0DAT0_B,ET0_LINKSTA,ET0_LINKSTA,,,TDATA3,,,,
+P209,2,9,,,Hi-Z,AGTEE5,GTOVUP,,,,,,,,,CS5,,,,,,QIO2,,,,SD0WP,ET0_EXOUT,ET0_EXOUT,,,TDATA2,,,,
+P210,2,10,,,Hi-Z,AGTOB5,GTIW,,,,,,,,,CS6,,,,,,QIO1,,,,SD0CD,ET0_WOL,ET0_WOL,,,TDATA1,,,,
+P211,2,11,,,Hi-Z,AGTOA5,GTIV,,,,,,,,,CS7,,,,,,QIO0,,,,SD0CMD_B,ET0_MDIO,ET0_MDIO,,,TDATA0,,,,
+P212,2,12,,IRQ3,Hi-Z,AGTEE1,GTETRGD,GTIOC0B,,RXD1/MISO1/SCL1/RXDX1,,,,,,,,,,,,,,,,,,,,,,,,,
+P213,2,13,,IRQ2,Hi-Z,AGTEE2,GTETRGC,GTIOC0A,,TXD1/MOSI1/SDA1/TXDX1/SIOX1,,,,,ADTRG1,,,,,,,,,,,,,,,,,,,,
+P214,2,14,,,Hi-Z,AGTO5,GTIU,,,,,,,,,,,,,,,QSPCLK,,,,SD0CLK_B,ET0_MDC,ET0_MDC,,,TCLK,,,,
+-,2,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P300,3,0,,,TCK/SWCLK,,GTOUUP,GTIOC0A,,,SSLA1_B,,,,,,,,,,,,,,,,,,,,,,,,
+P301,3,1,,IRQ6,Hi-Z,AGTIO0,GTOULO,GTIOC4B,RXD2/MISO2/SCL2/RXDX2,CTS9_RTS9/SS9,SSLA2_B,,,,,A06,,,,,,,,,,,,,,,,,,,
+P302,3,2,,IRQ5,Hi-Z,,GTOUUP,GTIOC4A,TXD2/MOSI2/SDA2/TXDX2/SIOX2,,SSLA3_B,,,,,A07,,,,,,,,,,,,,,,,,,,
+P303,3,3,,,Hi-Z,,,GTIOC7B,,CTS9,,,,,,A08,,,,,,,,,,,,,,,,,,,
+P304,3,4,,IRQ9,Hi-Z,AGTEE2,GTOWLO,GTIOC7A,RXD6/MISO6/SCL6,,,,,,,A09,,,,,,,,,,,,,,,,,,,
+P305,3,5,,IRQ8,Hi-Z,AGTOB2,GTOWUP,,TXD6/MOSI6/SDA6,,,,,,,A10,,,,,,QSPCLK,,,,,,,,,,,,,
+P306,3,6,,,Hi-Z,AGTOA2,GTOULO,,SCK6,,,,,,,A11,,,,,,QSSL,,,,,,,,,,,,,
+P307,3,7,,,Hi-Z,AGTEE4,GTOUUP,,CTS6_RTS6/SS6,,,,,,,A12,,,,,,QIO0,,,,,,,,,,,,,
+P308,3,8,,,Hi-Z,AGTOB4,,,CTS6,CTS3,,,,,,A13,,,,,,QIO1,,,,,,,,,,,,,
+P309,3,9,,,Hi-Z,AGTOA4,,,,RXD3/MISO3/SCL3,,,,,,A14,,,,,,QIO2,,,,,,,,,,,,,
+P310,3,10,,,Hi-Z,AGTEE1,,,,TXD3/MOSI3/SDA3,,,,,,A15,,,,,,QIO3,,,,,,,,,,,,,
+P311,3,11,,,Hi-Z,AGTOB1,,,,SCK3,,,,,,CS2,,,,,,,,,,,,,,,,,,,
+P312,3,12,,,Hi-Z,AGTOA1,,,,CTS3_RTS3/SS3,,,,,,CS3,,,,,,,,,,,,,,,,,,,
+P313,3,13,,,Hi-Z,,,,,,,,,,,A20,,,,,,,,,,SD0DAT7_A,ET0_ERXD3,,,,,,,,
+P314,3,14,,,Hi-Z,,,,,,ADTRG0,,,,,A21,,,,,,,,,,,,,,,,,,,
+P315,3,15,,,Hi-Z,,,,RXD4,,,,,,,A22,,,,,,,,,,,,,,,,,,,
+P400,4,0,,IRQ0,Hi-Z,AGTIO1,,GTIOC6A,SCK4,SCK7,,SCL0_A,,,ADTRG1,,,,,,,,AUDIO_CLK,,,,ET0_WOL,ET0_WOL,,,,,,,
+P401,4,1,,IRQ5-DS,Hi-Z,,GTETRGA,GTIOC6B,CTS4_RTS4/SS4,TXD7/MOSI7/SDA7,,SDA0_A,,,,,,,,,CTX0,,,,,,ET0_MDC,ET0_MDC,,,,,,,
+P402,4,2,,IRQ4-DS,Hi-Z,,,,CTS4,RXD7/MISO7/SCL7,,,,,CACREF,,,,,,CRX0,,AUDIO_CLK,,,,ET0_MDIO,ET0_MDIO,,,,,,,
+P403,4,3,,IRQ14-DS,Hi-Z,,,GTIOC3A,,CTS7_RTS7/SS7,,,,,,,,,,,,,SSIBCK0_A,,,,ET0_LINKSTA,ET0_LINKSTA,,,,,,,
+P404,4,4,,IRQ15-DS,Hi-Z,,,GTIOC3B,,CTS7,,,,,,,,,,,,,SSILRCK0/SSIFS0_A,,,,ET0_EXOUT,ET0_EXOUT,,,,,,,
+P405,4,5,,,Hi-Z,,,GTIOC1A,,,,,,,,,,,,,,,SSITXD0_A,,,,ET0_TX_EN,RMII0_TXD_EN_B,,,,,,,
+P406,4,6,,,Hi-Z,AGTO5,,GTIOC1B,,,SSLA3_C,,,,,,,,,,,,SSIRXD0_A,,,,ET0_RX_ER,RMII0_TXD1_B,,,,,,,
+P407,4,7,,,Hi-Z,AGTIO0,,GTIOC6A,CTS4_RTS4/SS4,,SSLA3_A,SDA0_B,,RTCOUT,ADTRG0,,TS03,,,,,,,USB_VBUS,,,ET0_EXOUT,ET0_EXOUT,,,,,,,
+P408,4,8,,IRQ7,Hi-Z,AGTOB2,GTOWLO,GTIOC6B,CTS4,RXD3/MISO3/SCL3,,SCL0_B,,,,,TS04,,,,,,,USB_ID,USBHS_ID,,ET0_CRS,RMII0_CRS_DV_A,,,,,,,
+P409,4,9,,IRQ6,Hi-Z,AGTOA2,GTOWUP,,,TXD3/MOSI3/SDA3,,SDA2_A,,,,,TS05,,,,,,,USB_EXICEN,USBHS_EXICEN,,ET0_RX_CLK,RMII0_RX_ER_A,,,,,,,
+P410,4,10,,IRQ5,Hi-Z,AGTOB1,GTOVLO,GTIOC9B,RXD0/MISO0/SCL0,SCK3,MISOB_B,SCL2_A,,,,,TS06,,,,,,,,,SD0DAT1_A,ET0_ERXD0,RMII0_RXD1_A,,,,,,,
+P411,4,11,,IRQ4,Hi-Z,AGTOA1,GTOVUP,GTIOC9A,TXD0/MOSI0/SDA0,CTS3_RTS3/SS3,MOSIB_B,,,,,,TS07,,,,,,,,,SD0DAT0_A,ET0_ERXD1,RMII0_RXD0_A,,,,,,,
+P412,4,12,,,Hi-Z,AGTEE1,GTOULO,,SCK0,CTS3,RSPCKB_B,,,,,,TS08,,,,,,,,,SD0CMD_A,ET0_ETXD0,REF50CK0_A,,,,,,,
+P413,4,13,,,Hi-Z,AGTEE3,GTOUUP,,CTS0_RTS0/SS0,,SSLB0_B,,,,,,TS09,,,,,,,,,SD0CLK_A,ET0_ETXD1,RMII0_TXD0_A,,,,,,,
+P414,4,14,,IRQ9,Hi-Z,AGTIO5,,GTIOC0B,CTS0,,SSLB1_B,SDA2_B,,,,,TS10,,,,,,,,,SD0WP,ET0_RX_ER,RMII0_TXD1_A,,,,,,,
+P415,4,15,,IRQ8,Hi-Z,AGTIO4,,GTIOC0A,,,SSLB2_B,SCL2_B,,,,,TS11,,,,,,,USB_VBUSEN,,SD0CD,ET0_TX_EN,RMII0_TXD_EN_A,,,,,,,
+P500,5,0,AN116,,Hi-Z,AGTOA0,GTIU,,,CTS5,,,,,CACREF,,,,,,,QSPCLK,,USB_VBUSEN,,,,,,,,,,,
+P501,5,1,AN117,IRQ11,Hi-Z,AGTOB0,GTIV,,,TXD5/MISO5/SDA5,,,,,,,,,,,,QSSL,,USB_OVRCURA,,,,,,,,,,,
+P502,5,2,AN118,IRQ12,Hi-Z,AGTOA2,GTIW,,CTS6,RXD5/MISO5/SCL5,,,,,,,,,,,,QIO0,,USB_OVRCURB,,,,,,,,,,,
+P503,5,3,AN119,,Hi-Z,AGTOB2,GTETRGC,,CTS6_RTS6/SS6,SCK5,,,,,,,,,,,,QIO1,,USB_EXICEN,,,,,,,,,,,
+P504,5,4,AN120,,Hi-Z,AGTOA3,GTETRGD,,SCK6,CTS5_RTS5/SS5,,,,,,ALE,,,,,,QIO2,,USB_ID,,,,,,,,,,,
+P505,5,5,AN121,IRQ14,Hi-Z,AGTOB3,,,RXD6/MISO6/SCL6,,,,,,,,,,,,,QIO3,,,,,,,,,,,,,
+P506,5,6,AN122,IRQ15,Hi-Z,,,,TXD6/MOSI6/SDA6,,,,,,,,,,,,,,,,,,,,,,,,,,
+P507,5,7,AN123,,Hi-Z,,,,SCK6,SCK5,,,,,,,,,,,,,,,,,,,,,,,,,
+P508,5,8,AN124,,Hi-Z,,,,,CTS5_RTS5,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P511,5,11,,IRQ15,Hi-Z,,,GTIOC0B,RXD4/MISO4/SCL4,,,SDA1_A,,,,,,,,,CRX1,,,,,,,,,,,,,,
+P512,5,12,,IRQ14,Hi-Z,,,GTIOC0A,TXD4/MOSI4/SDA4,,,SCL1_A,,,,,,,,,CTX1,,,,,,,,,,,,,,
+P513,5,13,,,Hi-Z,,,,,RXD5,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P600,6,0,,,Hi-Z,AGTIO3,,GTIOC6B,,SCK9,,,,CLKOUT,CACREF,RD,,,,,,,,,,,,,,,,,OM_SIO4,,
+P601,6,1,,,Hi-Z,AGTEE3,,GTIOC6A,,RXD9/MISO9/SCL9,,,,,,WR/WR0,,,,,,,,,,,,,,,,,OM_SIO2,,
+P602,6,2,,,Hi-Z,AGTO3,,GTIOC7B,,TXD9/MOSI9/SDA9,,,,,,EBCLK,,,,,,,,,,,,,,,,,OM_CS1,,
+P603,6,3,,,Hi-Z,AGTIO4,,GTIOC7A,,CTS9_RTS9/SS9,,,,,,D13[A13/D13],,,,,,,,,,,,,,,,,,,
+P604,6,4,,,Hi-Z,AGTEE4,,GTIOC8B,,CTS9,,,,,,D12[A12/D12],,,,,,,,,,,,,,,,,,,
+P605,6,5,,,Hi-Z,AGTO4,,GTIOC8A,CTS8,,,,,,,D11[A11/D11],,,,,,,,,,,,,,,,,,,
+P606,6,6,,,Hi-Z,,,,CTS8_RTS8,,,,,RTCOUT,,,,,,,,,,,,,,,,,,,,,
+P607,6,7,,,Hi-Z,,,,RXD8,,,,,,,,,,,,,,,,,,,,,,,,,,
+P608,6,8,,,Hi-Z,,,GTIOC4B,,,,,,,,A00/BC0,,,,,,,,,,,,,,,,,,,
+P609,6,9,,,Hi-Z,AGTO5,,GTIOC5A,,,,,,,,CS1,,,,,CTX1,,,,,,,,,,,,OM_ECS,,
+P610,6,10,,,Hi-Z,AGTO4,,GTIOC5B,,CTS7,,,,,,CS0,,,,,CRX1,,,,,,,,,,,,OM_CS0,,
+P611,6,11,,,Hi-Z,AGTO3,,,,CTS7_RTS7/SS7,,,,CLKOUT,CACREF,,,,,,,,,,,,,,,,,,,,
+P612,6,12,,,Hi-Z,AGTO2,,,,SCK7,,,,,,D08[A08/D08],,,,,,,,,,,,,,,,,,,
+P613,6,13,,,Hi-Z,AGTO1,,,,TXD7,,,,,,D09[A09/D09],,,,,,,,,,,,,,,,,,,
+P614,6,14,,,Hi-Z,AGTO0,,,,RXD7,,,,,,D10[A10/D10],,,,,,,,,,,,,,,,,,,
+P615,6,15,,IRQ7,Hi-Z,,,,,,,,,,,,,,,,,,,USB_VBUSEN,,,,,,,,,,,
+P700,7,0,,,Hi-Z,AGTO4,,GTIOC5A,,,MISOA_C,,,,,,,,,,,,,,,,ET0_ETXD1,RMII0_TXD0_B,,,,,,,
+P701,7,1,,,Hi-Z,AGTO3,,GTIOC5B,,,MOSIA_C,,,,,,,,,,,,,,,,ET0_ETXD0,REF50CK0_B,,,,,,,
+P702,7,2,,,Hi-Z,AGTO2,,GTIOC6A,,,RSPCKA_C,,,,,,,,,,,,,,,,ET0_ERXD1,RMII0_RXD0_B,,,,,,,
+P703,7,3,,,Hi-Z,AGTO1,,GTIOC6B,,,SSLA0_C,,,,,,,,,,,,,,,,ET0_ERXD0,RMII0_RXD1_B,,,,,,,
+P704,7,4,,,Hi-Z,AGTO0,,,,,SSLA1_C,,,,,,,,,,CTX0,,,,,,ET0_RX_CLK,RMII0_RX_ER_B,,,,,,,
+P705,7,5,,,Hi-Z,AGTIO0,,,,CTS3,SSLA2_C,,,,,,,,,,CRX0,,,,,,ET0_CRS,RMII0_CRS_DV_B,,,,,,,
+P706,7,6,,IRQ7,Hi-Z,,,,,RXD3,,,,,,,,,,,,,,,USBHS_OVRCURB,,,,,,,,,,
+P707,7,7,,IRQ8,Hi-Z,,,,,TXD3,,,,,,,,,,,,,,,USBHS_OVRCURA,,,,,,,,,,
+P708,7,8,,IRQ11,Hi-Z,,,,,RXD1/MISO1/SCL1/RXDX1/SCL1,SSLB3_B,,,,CACREF,,TS12,,,,,,AUDIO_CLK,,,,ET0_ETXD3,,,,,,,CECIO_A,
+P709,7,9,,IRQ10,Hi-Z,,,,,TXD1/MOSI1/SDA1/TXDX1/SIOX1/SDA1,,,,,,,TS13,,,,,,,,,,ET0_ETXD2,,,,,,,,
+P710,7,10,,,Hi-Z,,,,,SCK1,,,,,,,TS14,,,,,,,,,,ET0_TX_ER,,,,,,,,
+P711,7,11,,,Hi-Z,AGTEE0,,,,CTS1_RTS1/SS1,,,,,,,TS15,,,,,,,,,,ET0_TX_CLK,,,,,,,,
+P712,7,12,,,Hi-Z,AGTOB0,,GTIOC2B,,,,,,,,,TS16,,,,,,,,,,,,,,,,,,
+P713,7,13,,,Hi-Z,AGTOA0,,GTIOC2A,,,,,,,,,TS17,,,,,,,,,,,,,,,,,,
+-,7,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P800,8,0,AN125,,Hi-Z,AGTOA4,,,CTS0,,,,,,,D14[A14/D14],,,,,,,,,,,,,,,,,,,
+P801,8,1,AN126,,Hi-Z,AGTOB4,,,CTS8,,,,,,,D15[A15/D15],,,,,,,,,,,,,,,,,,,
+P802,8,2,AN127,IRQ3,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P803,8,3,AN128,IRQ2,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P804,8,4,,IRQ1,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P805,8,5,,,Hi-Z,,,,,TXD5,,,,,,,,,,,,,,,,,,,,,,,,,
+P806,8,6,,IRQ0,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P900,9,0,,,Hi-Z,,,,TXD4,,,,,,,A23,,,,,,,,,,,,,,,,,,,
+P901,9,1,,,Hi-Z,AGTIO,,,SCK4,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P905,9,5,,IRQ8,Hi-Z,,,,,,,,,,,,,,,,,,,USB_ID,,,,,,,,,,,
+P906,9,6,,IRQ9,Hi-Z,,,,,,,,,,,,,,,,,,,USB_EXICEN,,,,,,,,,,,
+P907,9,7,,IRQ10,Hi-Z,,,,,,,,,,,,,,,,,,,,USBHS_ID,,,,,,,,,,
+P908,9,8,,IRQ11,Hi-Z,,,,,,,,,,,,,,,,,,,,USBHS_EXICEN,,,,,,,,,,
+-,9,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+PA00,A,0,,,Hi-Z,,,,TXD8,,,,,,,,,,,,,,,,,,,,,,,,,,
+PA01,A,1,,,Hi-Z,,,,SCK8,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+PA08,A,8,,IRQ6,Hi-Z,,,,,,,,,,,,,,,,,,,USB_OVRCURA,,,,,,,,,,,
+PA09,A,9,,IRQ5,Hi-Z,,,,,,,,,,,,,,,,,,,USB_OVRCURB,,,,,,,,,,,
+PA10,A,10,,IRQ4,Hi-Z,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,A,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+PB00,B,0,,,Hi-Z,,,,,SCK3,,,,,,,,,,,,,,,USBHS_VBUSEN,,,,,,,,,,
+PB01,B,1,,,Hi-Z,,,,,CTS3_RTS3,,,,,,,,,,,,,,,USBHS_VBUS,,,,,,,,,,
+-,B,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,B,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/ports/renesas-ra/flashbdev.c b/ports/renesas-ra/flashbdev.c
index 3e890d31d9cab..c213ed8f9b89e 100644
--- a/ports/renesas-ra/flashbdev.c
+++ b/ports/renesas-ra/flashbdev.c
@@ -38,6 +38,16 @@
 
 #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 
+#if MICROPY_HW_HAS_QSPI_FLASH
+// The linker script specifies flash storage locations.
+extern uint8_t _micropy_hw_external_flash_storage_start;
+extern uint8_t _micropy_hw_external_flash_storage_end;
+
+#define FLASH_MEM_SEG1_START_ADDR \
+    ((long)&_micropy_hw_external_flash_storage_start)
+#define FLASH_MEM_SEG1_NUM_BLOCKS \
+    ((&_micropy_hw_external_flash_storage_end - &_micropy_hw_external_flash_storage_start) / 512)
+#else
 // 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;
@@ -46,10 +56,11 @@ extern uint8_t _micropy_hw_internal_flash_storage_end;
     ((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)
+#endif
 
 #if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
 #define FLASH_SECTOR_SIZE_MAX (0x800)           // 2k max
-#elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3)
+#elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
 #define FLASH_SECTOR_SIZE_MAX (0x8000)          // 32k max
 #else
 #error "no internal flash storage support for this MCU"
diff --git a/ports/renesas-ra/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/fsp_cfg/r_agt_cfg.h
new file mode 100644
index 0000000000000..216b6a21d7ee5
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_agt_cfg.h
@@ -0,0 +1,14 @@
+#ifndef R_AGT_CFG_H_
+#define R_AGT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#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)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_AGT_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/fsp_cfg/r_dtc_cfg.h
new file mode 100644
index 0000000000000..c4237e7073fcd
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_dtc_cfg.h
@@ -0,0 +1,13 @@
+#ifndef R_DTC_CFG_H_
+#define R_DTC_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define DTC_CFG_VECTOR_TABLE_SECTION_NAME ".fsp_dtc_vector_table"
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_DTC_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/fsp_cfg/r_icu_cfg.h
new file mode 100644
index 0000000000000..999692ed3ccb6
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_icu_cfg.h
@@ -0,0 +1,12 @@
+#ifndef R_ICU_CFG_H_
+#define R_ICU_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ICU_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_ICU_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/fsp_cfg/r_iic_master_cfg.h
new file mode 100644
index 0000000000000..20f1445862b78
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_iic_master_cfg.h
@@ -0,0 +1,14 @@
+#ifndef R_IIC_MASTER_CFG_H_
+#define R_IIC_MASTER_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#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)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_IIC_MASTER_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/fsp_cfg/r_rtc_cfg.h
new file mode 100644
index 0000000000000..1f8ba25cdaa99
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_rtc_cfg.h
@@ -0,0 +1,13 @@
+#ifndef R_RTC_CFG_H_
+#define R_RTC_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define RTC_CFG_OPEN_SET_CLOCK_SOURCE (1)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_RTC_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_sdhi_cfg.h b/ports/renesas-ra/fsp_cfg/r_sdhi_cfg.h
new file mode 100644
index 0000000000000..62049ed445016
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_sdhi_cfg.h
@@ -0,0 +1,19 @@
+#ifndef R_SDHI_CFG_H_
+#define R_SDHI_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SDHI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SDMMC_CFG_UNALIGNED_ACCESS_ENABLE (1)
+#ifndef SDHI_CFG_SD_SUPPORT_ENABLE
+#define SDHI_CFG_SD_SUPPORT_ENABLE ((1))
+#endif
+#ifndef SDHI_CFG_EMMC_SUPPORT_ENABLE
+#define SDHI_CFG_EMMC_SUPPORT_ENABLE ((0))
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_SDHI_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/fsp_cfg/r_spi_cfg.h
new file mode 100644
index 0000000000000..e228e1036abd3
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_spi_cfg.h
@@ -0,0 +1,17 @@
+#ifndef R_SPI_CFG_H_
+#define R_SPI_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SPI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SPI_DMA_SUPPORT_ENABLE (1)
+#define SPI_TRANSMIT_FROM_RXI_ISR (0)
+
+/* DEPRECATED: Use SPI_DMA_SUPPORT_ENABLE instead. */
+#define SPI_DTC_SUPPORT_ENABLE (SPI_DMA_SUPPORT_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_SPI_CFG_H_ */
diff --git a/ports/renesas-ra/machine_dac.c b/ports/renesas-ra/machine_dac.c
new file mode 100644
index 0000000000000..6fd23c23889db
--- /dev/null
+++ b/ports/renesas-ra/machine_dac.c
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Nick Moore
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/mperrno.h"
+#include "pin.h"
+#include "ra/ra_dac.h"
+#include "modmachine.h"
+
+#if MICROPY_PY_MACHINE_DAC
+
+typedef struct _machine_dac_obj_t {
+    mp_obj_base_t base;
+    uint8_t active;
+    uint8_t ch;
+    uint16_t mv;
+    mp_hal_pin_obj_t dac;
+} machine_dac_obj_t;
+
+STATIC machine_dac_obj_t machine_dac_obj[] = {
+    #if defined(MICROPY_HW_DAC0)
+    {{&machine_dac_type}, 0, 0, 0, MICROPY_HW_DAC0},
+    #endif
+    #if defined(MICROPY_HW_DAC1)
+    {{&machine_dac_type}, 0, 1, 0, MICROPY_HW_DAC1}
+    #endif
+};
+
+STATIC void machine_dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);     // const char *qstr_str(qstr q);
+    mp_printf(print, "DAC(DA%d [#%d], runing=%u, out=%u mV)", self->ch, self->dac->pin, self->active, self->mv);
+}
+
+STATIC mp_obj_t machine_dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_hal_pin_obj_t pin_id = MP_OBJ_NULL;
+    machine_dac_obj_t *self = MP_OBJ_NULL;
+
+    enum { ARG_pin };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pin,  MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }
+    };
+
+    mp_arg_check_num(n_args, n_kw, 1, 1, true);
+    mp_arg_val_t init_args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, args, MP_ARRAY_SIZE(allowed_args), allowed_args, init_args);
+
+    // Get GPIO and optional device to connect to DAC.
+    pin_id = mp_hal_get_pin_obj(init_args[ARG_pin].u_obj);
+
+    if (pin_id) {
+        for (int i = 0; i < MP_ARRAY_SIZE(machine_dac_obj); i++) {
+            if (pin_id->pin == machine_dac_obj[i].dac->pin) {
+                self = &machine_dac_obj[i];
+                break;
+            }
+        }
+
+        if (self) {
+            if (ra_dac_is_dac_pin(self->dac->pin)) {
+                ra_dac_init(self->dac->pin, self->ch);
+                self->active = ra_dac_is_running(self->ch);
+            } else {
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%d) has no DAC output"), self->dac->pin);
+            }
+        } else {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%d) is used with other peripheral"), pin_id->pin);
+        }
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't exist"));
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// DAC.deinit()
+STATIC mp_obj_t machine_dac_deinit(mp_obj_t self_in) {
+    machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    ra_dac_deinit(self->dac->pin, self->ch);
+    self->active = ra_dac_is_running(self->ch);
+    self->ch = 0;
+    self->mv = 0;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_deinit_obj, machine_dac_deinit);
+
+// DAC.write(value)
+STATIC mp_obj_t machine_dac_write(mp_obj_t self_in, mp_obj_t data) { // mp_obj_t value_in
+    machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t value = mp_obj_get_int(data);
+
+    if (value < 0 || value > 4095) {
+        mp_raise_ValueError(MP_ERROR_TEXT("value should be 0-4095"));
+    } else
+    if (self->active) {
+        ra_dac_write(self->ch, value);
+        self->mv = (value * 3300) / 4095;
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_dac_write_obj, machine_dac_write);
+
+// DAC.read()
+STATIC mp_obj_t machine_dac_read(mp_obj_t self_in) {
+    machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(ra_dac_read(self->ch));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_read_obj, machine_dac_read);
+
+// DAC.write_mv(Vout)
+STATIC mp_obj_t machine_dac_write_mv(mp_obj_t self_in, mp_obj_t data) {  // mp_obj_t self_in, mp_obj_t value_in
+    machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t Vout = mp_obj_get_int(data);
+
+    if (Vout < 0 || Vout > 3300) {
+        mp_raise_ValueError(MP_ERROR_TEXT("value should be 0-3300"));
+    } else
+    if (self->active) {
+        uint16_t Dout = (Vout * 4095) / 3300;
+        ra_dac_write(self->ch, Dout);
+        self->mv = Vout;
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_dac_write_mv_obj, machine_dac_write_mv);
+
+// DAC.read_mv()
+STATIC mp_obj_t machine_dac_read_mv(mp_obj_t self_in) {
+    machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(self->mv);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_read_mv_obj, machine_dac_read_mv);
+
+// MP_DEFINE_CONST_FUN_OBJ_2(mp_machine_dac_write_obj, mp_machine_dac_write);
+
+STATIC const mp_rom_map_elem_t machine_dac_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_dac_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&machine_dac_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&machine_dac_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read_mv), MP_ROM_PTR(&machine_dac_read_mv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write_mv), MP_ROM_PTR(&machine_dac_write_mv_obj) }
+};
+
+STATIC MP_DEFINE_CONST_DICT(machine_dac_locals_dict, machine_dac_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_dac_type,
+    MP_QSTR_DAC,
+    MP_TYPE_FLAG_NONE,
+    make_new, machine_dac_make_new,
+    print, machine_dac_print,
+    locals_dict, &machine_dac_locals_dict
+    );
+
+#endif // MICROPY_PY_MACHINE_DAC
diff --git a/ports/renesas-ra/machine_pwm.c b/ports/renesas-ra/machine_pwm.c
new file mode 100644
index 0000000000000..f2199805a1e76
--- /dev/null
+++ b/ports/renesas-ra/machine_pwm.c
@@ -0,0 +1,357 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_pwm.h"
+#include "pin.h"
+#include "ra/ra_gpt.h"
+#include "modmachine.h"
+
+#if MICROPY_HW_ENABLE_HW_PWM
+
+typedef struct _machine_pwm_obj_t {
+    mp_obj_base_t base;
+    R_GPT0_Type *pwm_inst;
+    uint8_t active;
+    uint8_t ch;
+    uint8_t id;
+    uint8_t duty;
+    uint32_t freq;
+    mp_hal_pin_obj_t pwm;
+} machine_pwm_obj_t;
+
+STATIC machine_pwm_obj_t machine_pwm_obj[] = {
+    #if defined(MICROPY_HW_PWM_0A)
+    {{&machine_pwm_type}, R_GPT0, 0, 0, 'A', 0, 0ul, MICROPY_HW_PWM_0A},
+    #endif
+    #if defined(MICROPY_HW_PWM_0B)
+    {{&machine_pwm_type}, R_GPT0, 0, 0, 'B', 0, 0ul, MICROPY_HW_PWM_0B},
+    #endif
+    #if defined(MICROPY_HW_PWM_1A)
+    {{&machine_pwm_type}, R_GPT1, 0, 1, 'A', 0, 0ul, MICROPY_HW_PWM_1A},
+    #endif
+    #if defined(MICROPY_HW_PWM_1B)
+    {{&machine_pwm_type}, R_GPT1, 0, 1, 'B', 0, 0ul, MICROPY_HW_PWM_1B},
+    #endif
+    #if defined(MICROPY_HW_PWM_2A)
+    {{&machine_pwm_type}, R_GPT2, 0, 2, 'A', 0, 0ul, MICROPY_HW_PWM_2A},
+    #endif
+    #if defined(MICROPY_HW_PWM_2B)
+    {{&machine_pwm_type}, R_GPT2, 0, 2, 'B', 0, 0ul, MICROPY_HW_PWM_2B},
+    #endif
+    #if defined(MICROPY_HW_PWM_3A)
+    {{&machine_pwm_type}, R_GPT3, 0, 3, 'A', 0, 0ul, MICROPY_HW_PWM_3A},
+    #endif
+    #if defined(MICROPY_HW_PWM_3B)
+    {{&machine_pwm_type}, R_GPT3, 0, 3, 'B', 0, 0ul, MICROPY_HW_PWM_3B},
+    #endif
+    #if defined(MICROPY_HW_PWM_4A)
+    {{&machine_pwm_type}, R_GPT4, 0, 4, 'A', 0, 0ul, MICROPY_HW_PWM_4A},
+    #endif
+    #if defined(MICROPY_HW_PWM_4B)
+    {{&machine_pwm_type}, R_GPT4, 0, 4, 'B', 0, 0ul, MICROPY_HW_PWM_4B},
+    #endif
+    #if defined(MICROPY_HW_PWM_5A)
+    {{&machine_pwm_type}, R_GPT5, 0, 5, 'A', 0, 0ul, MICROPY_HW_PWM_5A},
+    #endif
+    #if defined(MICROPY_HW_PWM_5B)
+    {{&machine_pwm_type}, R_GPT5, 0, 5, 'B', 0, 0ul, MICROPY_HW_PWM_5B},
+    #endif
+    #if defined(MICROPY_HW_PWM_6A)
+    {{&machine_pwm_type}, R_GPT6, 0, 6, 'A', 0, 0ul, MICROPY_HW_PWM_6A},
+    #endif
+    #if defined(MICROPY_HW_PWM_6B)
+    {{&machine_pwm_type}, R_GPT6, 0, 6, 'B', 0, 0ul, MICROPY_HW_PWM_6B},
+    #endif
+    #if defined(MICROPY_HW_PWM_7A)
+    {{&machine_pwm_type}, R_GPT7, 0, 7, 'A', 0, 0ul, MICROPY_HW_PWM_7A},
+    #endif
+    #if defined(MICROPY_HW_PWM_7B)
+    {{&machine_pwm_type}, R_GPT7, 0, 7, 'B', 0, 0ul, MICROPY_HW_PWM_7B},
+    #endif
+    #if defined(MICROPY_HW_PWM_8A)
+    {{&machine_pwm_type}, R_GPT8, 0, 8, 'A', 0, 0ul, MICROPY_HW_PWM_8A},
+    #endif
+    #if defined(MICROPY_HW_PWM_8B)
+    {{&machine_pwm_type}, R_GPT8, 0, 8, 'B', 0, 0ul, MICROPY_HW_PWM_8B},
+    #endif
+    #if defined(MICROPY_HW_PWM_9A)
+    {{&machine_pwm_type}, R_GPT9, 0, 9, 'A', 0, 0ul, MICROPY_HW_PWM_9A},
+    #endif
+    #if defined(MICROPY_HW_PWM_9B)
+    {{&machine_pwm_type}, R_GPT9, 0, 9, 'B', 0, 0ul, MICROPY_HW_PWM_9B},
+    #endif
+    #if defined(MICROPY_HW_PWM_10A)
+    {{&machine_pwm_type}, R_GPT10, 0, 10, 'A', 0, 0ul, MICROPY_HW_PWM_10A},
+    #endif
+    #if defined(MICROPY_HW_PWM_10B)
+    {{&machine_pwm_type}, R_GPT10, 0, 10, 'B', 0, 0ul, MICROPY_HW_PWM_10B},
+    #endif
+    #if defined(MICROPY_HW_PWM_11A)
+    {{&machine_pwm_type}, R_GPT11, 0, 11, 'A', 0, 0ul, MICROPY_HW_PWM_11A},
+    #endif
+    #if defined(MICROPY_HW_PWM_11B)
+    {{&machine_pwm_type}, R_GPT11, 0, 11, 'B', 0, 0ul, MICROPY_HW_PWM_11B},
+    #endif
+    #if defined(MICROPY_HW_PWM_12A)
+    {{&machine_pwm_type}, R_GPT12, 0, 12, 'A', 0, 0ul, MICROPY_HW_PWM_12A},
+    #endif
+    #if defined(MICROPY_HW_PWM_12B)
+    {{&machine_pwm_type}, R_GPT12, 0, 12, 'B', 0, 0ul, MICROPY_HW_PWM_12B},
+    #endif
+    #if defined(MICROPY_HW_PWM_13A)
+    {{&machine_pwm_type}, R_GPT13, 0, 13, 'A', 0, 0ul, MICROPY_HW_PWM_13A},
+    #endif
+    #if defined(MICROPY_HW_PWM_13B)
+    {{&machine_pwm_type}, R_GPT13, 0, 13, 'B', 0, 0ul, MICROPY_HW_PWM_13B}
+    #endif
+};
+
+/******************************************************************************/
+// 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(GTIOC %d%c[#%d], runing=%u, freq=%u, duty=%u)", self->ch, self->id, self->pwm->pin, self->active, self->freq, self->duty);
+}
+
+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) {
+    uint32_t D = 0ul;
+
+    enum { ARG_freq, ARG_duty };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_duty, 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 (args[ARG_freq].u_int != -1) {
+        if ((args[ARG_freq].u_int < 0) || (args[ARG_freq].u_int > 24000000)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("freq should be 0-24000000"));
+        } else {
+            self->freq = args[ARG_freq].u_int;
+        }
+    }
+
+    ra_gpt_timer_init(self->pwm->pin, self->ch, self->id, 0, (float)self->freq);
+
+    if (args[ARG_duty].u_int != -1) {
+        if ((args[ARG_duty].u_int < 0) || (args[ARG_duty].u_int > 100)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("duty should be 0-100"));
+        } else {
+            self->duty = args[ARG_duty].u_int;
+        }
+    }
+
+    D = self->duty * ra_gpt_timer_get_period(self->ch);
+    ra_gpt_timer_set_duty(self->ch, self->id, (uint32_t)(D / 100));
+
+    if (self->duty && self->freq) {
+        ra_gpt_timer_start(self->ch);
+        self->active = 1;
+    }
+}
+
+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_hal_pin_obj_t pin_id = MP_OBJ_NULL;
+    machine_pwm_obj_t *self = MP_OBJ_NULL;
+
+    enum { ARG_pin, ARG_freq, ARG_duty };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pin,  MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_duty, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} }
+    };
+
+    mp_arg_check_num(n_args, n_kw, 1, 3, true);
+    mp_arg_val_t init_args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, args, MP_ARRAY_SIZE(allowed_args), allowed_args, init_args);
+
+    // Get GPIO and optional device to connect to PWM.
+    pin_id = mp_hal_get_pin_obj(init_args[ARG_pin].u_obj);
+
+    if (pin_id) {
+        for (int i = 0; i < MP_ARRAY_SIZE(machine_pwm_obj); i++) {
+            if (pin_id->pin == machine_pwm_obj[i].pwm->pin) {
+                self = &machine_pwm_obj[i];
+                break;
+            }
+        }
+
+        if (self) {
+            if (ra_gpt_timer_is_pwm_pin(self->pwm->pin)) {
+                // start the PWM running for this channel
+                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);
+            } else {
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%d) has no timer output"), self->pwm->pin);
+            }
+        } else {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%d) is used with other peripheral"), pin_id->pin);
+        }
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't exist"));
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+    ra_gpt_timer_deinit(self->pwm->pin, self->ch, self->id);
+    self->active = 0;
+    self->ch = 0;
+    self->id = ' ';
+    self->duty = 0;
+    self->freq = 0;
+}
+
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT((uint32_t)ra_gpt_timer_get_freq(self->ch));
+}
+
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    if (freq) {
+        ra_gpt_timer_set_freq(self->ch, (float)freq);
+        self->freq = (uint32_t)ra_gpt_timer_get_freq(self->ch);
+        if (!self->freq) {
+            mp_raise_ValueError(MP_ERROR_TEXT("freq should be 0-24000000"));
+        } else
+        if (!self->active) {
+            ra_gpt_timer_start(self->ch);
+            self->active = 1;
+        }
+    } else {
+        ra_gpt_timer_stop(self->ch);
+        ra_gpt_timer_set_freq(self->ch, (float)freq);
+        self->freq = 0;
+        self->active = 0;
+    }
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
+    // give the result in %
+    uint64_t Dc = ra_gpt_timer_get_duty(self->ch, self->id) * 100;
+    return MP_OBJ_NEW_SMALL_INT(Dc / ra_gpt_timer_get_period(self->ch));
+}
+
+STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
+    // assume duty is in %
+    if (duty < 0 || duty > 100) {
+        mp_raise_ValueError(MP_ERROR_TEXT("duty should be 0-100"));
+    } else {
+        if (duty) {
+            uint64_t D = (uint8_t)(duty) * ra_gpt_timer_get_period(self->ch);
+            ra_gpt_timer_set_duty(self->ch, self->id, (uint32_t)(D / 100));
+            self->duty = (uint8_t)duty;
+
+            if (!self->active && self->freq) {
+                ra_gpt_timer_start(self->ch);
+                self->active = 1;
+            }
+        } else {
+            if (self->active) {
+                ra_gpt_timer_stop(self->ch);
+                ra_gpt_timer_set_duty(self->ch, self->id, 0);
+                self->duty = 0;
+                self->active = 0;
+            }
+        }
+    }
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+    // give the result in ratio (u16 / 65535)
+    uint64_t Dc = ra_gpt_timer_get_duty(self->ch, self->id) * 65535;
+    return MP_OBJ_NEW_SMALL_INT(Dc / ra_gpt_timer_get_period(self->ch));
+}
+
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
+    // assume duty is a ratio (u16 / 65535)
+    if (duty_u16 < 0 || duty_u16 > 65535) {
+        mp_raise_ValueError(MP_ERROR_TEXT("duty should be 0-65535"));
+    } else {
+        if (duty_u16) {
+            uint64_t D = duty_u16 * ra_gpt_timer_get_period(self->ch);
+            ra_gpt_timer_set_duty(self->ch, self->id, (uint32_t)(D / 65535));
+            self->duty = (uint8_t)((duty_u16 * 100) / 65535);
+
+            if (!self->active && self->freq) {
+                ra_gpt_timer_start(self->ch);
+                self->active = 1;
+            }
+        } else {
+            if (self->active) {
+                ra_gpt_timer_stop(self->ch);
+                ra_gpt_timer_set_duty(self->ch, self->id, 0);
+                self->duty = 0;
+                self->active = 0;
+            }
+        }
+    }
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+    // give the result in ns
+    float ns = ra_gpt_timer_tick_time(self->ch);
+    ns *= (float)ra_gpt_timer_get_duty(self->ch, self->id);
+    return MP_OBJ_NEW_SMALL_INT(ns);
+}
+
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+    // assume duty is ns
+    uint32_t ns_min = (uint32_t)ra_gpt_timer_tick_time(self->ch);
+    uint32_t ns_max = ns_min * ra_gpt_timer_get_period(self->ch);
+    if (duty_ns) {
+        if (duty_ns < ns_min || duty_ns > ns_max) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty should be in period range %d-%d"), ns_min, ns_max);
+        } else {
+            uint32_t D = (uint32_t)duty_ns / ns_min;
+            ra_gpt_timer_set_duty(self->ch, self->id, D);
+            D *= ns_min * 100;
+            self->duty = D / ns_max;
+
+            if (!self->active && self->freq) {
+                ra_gpt_timer_start(self->ch);
+                self->active = 1;
+            }
+        }
+    } else {
+        if (self->active) {
+            ra_gpt_timer_stop(self->ch);
+            ra_gpt_timer_set_duty(self->ch, self->id, 0);
+            self->duty = 0;
+            self->active = 0;
+        }
+    }
+}
+
+#endif // MICROPY_HW_ENABLE_HW_PWM
diff --git a/ports/renesas-ra/machine_sdcard.c b/ports/renesas-ra/machine_sdcard.c
new file mode 100644
index 0000000000000..2ed0d6653567a
--- /dev/null
+++ b/ports/renesas-ra/machine_sdcard.c
@@ -0,0 +1,338 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "modmachine.h"
+#include "extmod/vfs.h"
+#include "hal_data.h"
+#include "led.h"
+
+#if MICROPY_HW_HAS_SDHI_CARD
+
+#define CARD_HOLDER    1000  // 500 ms
+#define CARD_OPERATION  200  // 100 ms
+
+static volatile uint8_t OP_complete = 0;
+
+typedef struct _machine_sdcard_obj_t {
+    mp_obj_base_t base;
+    sdmmc_status_t status;
+    uint16_t block_len;
+    uint32_t block_count;
+} machine_sdcard_obj_t;
+
+STATIC machine_sdcard_obj_t machine_sdcard_objs[] = {
+    {{&machine_sdcard_type}, {false, false, false}, 0, 0}
+};
+
+void sdhi_ISR(sdmmc_callback_args_t *p_args) {
+    switch (p_args->event)
+    {
+        case SDMMC_EVENT_CARD_INSERTED:
+            machine_sdcard_objs[0].status.card_inserted = true;
+            OP_complete = 0;
+            break;
+
+        case SDMMC_EVENT_CARD_REMOVED:
+            machine_sdcard_objs[0].status.card_inserted = false;
+            machine_sdcard_objs[0].status.initialized = false;
+            machine_sdcard_objs[0].block_count = 0;
+            break;
+
+        case SDMMC_EVENT_ERASE_COMPLETE:
+        case SDMMC_EVENT_TRANSFER_COMPLETE:
+            OP_complete = 0;
+            break;
+
+        // case SDMMC_EVENT_ERASE_BUSY:
+        // case SDMMC_EVENT_TRANSFER_ERROR:
+
+        default:
+            break;
+    }
+}
+
+STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    fsp_err_t err = FSP_SUCCESS;
+    machine_sdcard_obj_t *self = mp_const_none;
+
+    if (g_sdmmc0_ctrl.open) {
+    check:
+        if ((err = R_SDHI_StatusGet(&g_sdmmc0_ctrl, &self->status)) == FSP_SUCCESS) {
+            self = &machine_sdcard_objs[0];
+            if (!self->status.initialized && self->status.card_inserted) {
+                if ((err = R_SDHI_MediaInit(&g_sdmmc0_ctrl, NULL)) == FSP_SUCCESS) {
+                    self->status.initialized = true;
+                    self->block_len = g_sdmmc0_ctrl.device.sector_size_bytes;
+                    self->block_count = g_sdmmc0_ctrl.device.sector_count;
+                } else {
+                    mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't init SDHI card, %d"), err);
+                }
+            }
+        } else {
+            mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);
+        }
+    } else {
+        if ((err = R_SDHI_Open(&g_sdmmc0_ctrl, &g_sdmmc0_cfg)) == FSP_SUCCESS) {
+            uint32_t Istamp = mp_hal_ticks_ms();
+            OP_complete = 1;
+            while (OP_complete) {
+                if ((mp_hal_ticks_ms() - Istamp) > CARD_HOLDER) {
+                    OP_complete = 0;
+                    Istamp = 0;
+                }
+            }
+
+            goto check;
+        } else {
+            mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't open SDHI controller, %d"), err);
+        }
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_sdcard_init_obj, 1, machine_sdcard_init);
+
+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_arg_check_num(n_args, n_kw, 0, 0, true);
+    mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
+    return machine_sdcard_init(n_args, all_args, &kw_args);
+}
+
+// deinit()
+STATIC mp_obj_t machine_sdcard_deinit(mp_obj_t self_in) {
+    machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    R_SDHI_Close(&g_sdmmc0_ctrl);
+    self->block_count = self->block_len = 0;
+    self->status.card_inserted = self->status.initialized = self->status.transfer_in_progress = false;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_deinit_obj, machine_sdcard_deinit);
+
+// present()
+STATIC mp_obj_t machine_sdcard_present(mp_obj_t self_in) {
+    fsp_err_t err = FSP_SUCCESS;
+    machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if ((err = R_SDHI_StatusGet(&g_sdmmc0_ctrl, &self->status)) == FSP_SUCCESS) {
+        return mp_obj_new_bool(self->status.card_inserted);
+    } else {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);
+    }
+}
+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) {
+    machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->status.card_inserted && self->status.initialized) {
+        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);
+
+// 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;
+    machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
+
+    if ((self->status.initialized) && (FSP_SUCCESS == R_SDHI_Read(&g_sdmmc0_ctrl, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / g_sdmmc0_cfg.block_size))) {
+        uint32_t Rstamp = mp_hal_ticks_ms();
+        OP_complete = 1;
+        while (OP_complete) {
+            if ((mp_hal_ticks_ms() - Rstamp) > CARD_OPERATION) {
+                OP_complete = 0;
+                Rstamp = 0;
+            }
+        }
+
+        return Rstamp? MP_OBJ_NEW_SMALL_INT(0) : MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+    } else {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_readblocks_obj, machine_sdcard_readblocks);
+
+// 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;
+    machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
+
+    if ((self->status.initialized) && (FSP_SUCCESS == R_SDHI_Write(&g_sdmmc0_ctrl, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / g_sdmmc0_cfg.block_size))) {
+        uint32_t Wstamp = mp_hal_ticks_ms();
+        OP_complete = 1;
+        while (OP_complete) {
+            if ((mp_hal_ticks_ms() - Wstamp) > CARD_OPERATION) {
+                OP_complete = 0;
+                Wstamp = 0;
+            }
+        }
+
+        return Wstamp? MP_OBJ_NEW_SMALL_INT(0) : MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+    } 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) {
+    machine_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 (!g_sdmmc0_ctrl.open) {
+                if (FSP_SUCCESS == R_SDHI_Open(&g_sdmmc0_ctrl, &g_sdmmc0_cfg)) {
+                    uint32_t Istamp = mp_hal_ticks_ms();
+                    OP_complete = 1;
+                    while (OP_complete) {
+                        if ((mp_hal_ticks_ms() - Istamp) > CARD_OPERATION) {
+                            OP_complete = 0;
+                            Istamp = 0;
+                        }
+                    }
+                } else {
+                    return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+                }
+            }
+
+            R_SDHI_StatusGet(&g_sdmmc0_ctrl, &self->status);
+
+            if (self->status.card_inserted) {
+                if (!self->status.initialized) {
+                    if (FSP_SUCCESS == R_SDHI_MediaInit(&g_sdmmc0_ctrl, NULL)) {
+                        self->status.initialized = true;
+                        self->block_len = g_sdmmc0_ctrl.device.sector_size_bytes;
+                        self->block_count = g_sdmmc0_ctrl.device.sector_count;
+                        return MP_OBJ_NEW_SMALL_INT(0);
+                    } else {
+                        return MP_OBJ_NEW_SMALL_INT(-MP_EIO); // Initialization failed
+                    }
+                } else {
+                    return MP_OBJ_NEW_SMALL_INT(0);
+                }
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Initialization failed
+            }
+        }
+        break;
+
+        case MP_BLOCKDEV_IOCTL_DEINIT: {
+            if (g_sdmmc0_ctrl.open) {
+                R_SDHI_Close(&g_sdmmc0_ctrl);
+                self->block_count = self->block_len = 0;
+                self->status.card_inserted = self->status.initialized = self->status.transfer_in_progress = false;
+                return MP_OBJ_NEW_SMALL_INT(0);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Deinitialization failed
+            }
+        }
+        break;
+
+        case MP_BLOCKDEV_IOCTL_SYNC: {
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+        break;
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT: {
+            if (self->status.initialized) {
+                return MP_OBJ_NEW_SMALL_INT(self->block_count);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Card not initialized
+            }
+        }
+        break;
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE: {
+            if (self->status.initialized) {
+                return MP_OBJ_NEW_SMALL_INT(self->block_len);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Card not initialized
+            }
+        }
+        break;
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            if (self->status.initialized) {
+                uint32_t Estamp = mp_hal_ticks_ms();
+                OP_complete = 1;
+                while (OP_complete) {
+                    if ((mp_hal_ticks_ms() - Estamp) > CARD_OPERATION) {
+                        OP_complete = 0;
+                        Estamp = 0;
+                    }
+                }
+
+                return Estamp? MP_OBJ_NEW_SMALL_INT(0) : MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Card not initialized
+            }
+        }
+
+        default: // unknown command
+            return mp_const_none;
+            break;
+    }
+}
+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);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_sdcard_type,
+    MP_QSTR_SDCard,
+    MP_TYPE_FLAG_NONE,
+    make_new, sdcard_obj_make_new,
+    locals_dict, &sdcard_locals_dict
+    );
+
+#endif // MICROPY_PY_MACHINE_SDCARD
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index 2c71c83b666c1..8c0c026d9a728 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -86,6 +86,47 @@ STATIC machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     #endif
 };
 
+STATIC void spi_init(machine_hard_spi_obj_t *self) {
+    const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
+
+    if (0) {
+    #if defined(MICROPY_HW_SPI0_RSPCK)
+    } else if (self->spi_id == 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
+    #endif
+    #if defined(MICROPY_HW_SPI1_RSPCK)
+    } else if (self->spi_id == 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
+    #endif
+    } else {
+        // SPI does not exist for this board (shouldn't get here, should be checked by caller)
+        return;
+    }
+    ra_spi_init(self->spi_id, pins[3]->pin, pins[2]->pin, pins[1]->pin, pins[0]->pin, self->baudrate, self->bits, self->polarity, self->phase, self->firstbit);
+}
+
 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)",
@@ -189,10 +230,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
         }
     }
     // 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);
+    spi_init(self);
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -275,10 +313,7 @@ STATIC void machine_hard_spi_init(mp_obj_base_t *self_in, size_t n_args, const m
     }
 
     // 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);
+    spi_init(self);
 }
 
 STATIC void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
@@ -310,58 +345,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
 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)
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 47f7e8c8057b4..bc85d9b7f88bb 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2013-2015 Damien P. George
  * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ * Copyright (c) 2023 Vekatech Ltd.
  *
  * 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,7 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
+#include "extmod/machine_pwm.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
@@ -279,6 +281,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 
     { 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_DAC
+    { MP_ROM_QSTR(MP_QSTR_DAC),                 MP_ROM_PTR(&machine_dac_type) },
+    #endif
     #if MICROPY_PY_MACHINE_I2C
     #if MICROPY_HW_ENABLE_HW_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
@@ -291,6 +296,14 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
+    #if MICROPY_PY_MACHINE_PWM
+    #if MICROPY_HW_ENABLE_HW_PWM
+    { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
+    #endif
+    #endif
+    #if MICROPY_HW_HAS_SDHI_CARD
+    { MP_ROM_QSTR(MP_QSTR_SDCard),              MP_ROM_PTR(&machine_sdcard_type) },
+    #endif
     { 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) },
diff --git a/ports/renesas-ra/mpconfigboard_common.h b/ports/renesas-ra/mpconfigboard_common.h
index f63a924ad8e4d..f8990f489e3b2 100644
--- a/ports/renesas-ra/mpconfigboard_common.h
+++ b/ports/renesas-ra/mpconfigboard_common.h
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2018 Damien P. George
  * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ * Copyright (c) 2023 Vekatech Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -63,6 +64,16 @@
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE_SEGMENT2 (0)
 #endif
 
+// Whether to enable storage on the external QSPI flash of the MCU, instead of the internal flash
+#ifndef MICROPY_HW_HAS_QSPI_FLASH
+#define MICROPY_HW_HAS_QSPI_FLASH (0)
+#endif
+
+// Whether to enable access to SDCARD, through SDHI controller
+#ifndef MICROPY_HW_HAS_SDHI_CARD
+#define MICROPY_HW_HAS_SDHI_CARD (0)
+#endif
+
 // Whether to enable the RTC, exposed as pyb.RTC
 #ifndef MICROPY_HW_ENABLE_RTC
 #define MICROPY_HW_ENABLE_RTC (0)
@@ -209,6 +220,16 @@
 #define MICROPY_HW_MAX_UART (10)
 #define MICROPY_HW_MAX_LPUART (0)
 
+#elif defined(RA6M5)
+
+#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)
+
+#else
 #error Unsupported MCU series
 #endif
 
@@ -240,5 +261,30 @@
 #define MICROPY_HW_ENABLE_HW_I2C (0)
 #endif
 
+#if defined(MICROPY_HW_PWM_0A) || defined(MICROPY_HW_PWM_0B) \
+    || defined(MICROPY_HW_PWM_1A) || defined(MICROPY_HW_PWM_1B) \
+    || defined(MICROPY_HW_PWM_2A) || defined(MICROPY_HW_PWM_2B) \
+    || defined(MICROPY_HW_PWM_3A) || defined(MICROPY_HW_PWM_3B) \
+    || defined(MICROPY_HW_PWM_4A) || defined(MICROPY_HW_PWM_4B) \
+    || defined(MICROPY_HW_PWM_5A) || defined(MICROPY_HW_PWM_5B) \
+    || defined(MICROPY_HW_PWM_6A) || defined(MICROPY_HW_PWM_6B) \
+    || defined(MICROPY_HW_PWM_7A) || defined(MICROPY_HW_PWM_7B) \
+    || defined(MICROPY_HW_PWM_8A) || defined(MICROPY_HW_PWM_8B) \
+    || defined(MICROPY_HW_PWM_9A) || defined(MICROPY_HW_PWM_9B) \
+    || defined(MICROPY_HW_PWM_10A) || defined(MICROPY_HW_PWM_10B) \
+    || defined(MICROPY_HW_PWM_11A) || defined(MICROPY_HW_PWM_11B) \
+    || defined(MICROPY_HW_PWM_12A) || defined(MICROPY_HW_PWM_12B) \
+    || defined(MICROPY_HW_PWM_13A) || defined(MICROPY_HW_PWM_13B)
+#define MICROPY_HW_ENABLE_HW_PWM (1)
+#else
+#define MICROPY_HW_ENABLE_HW_PWM (0)
+#endif
+
+#if defined(MICROPY_HW_DAC0) || defined(MICROPY_HW_DAC1)
+#define MICROPY_HW_ENABLE_HW_DAC (1)
+#else
+#define MICROPY_HW_ENABLE_HW_DAC (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
index 434bc00f1197a..a4a0caa373ba6 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2013-2017 Damien P. George
  * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ * Copyright (c) 2023 Vekatech Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -117,6 +118,14 @@
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_SOFT_TIMER_TICKS_MS uwTick
+#if MICROPY_HW_ENABLE_HW_PWM
+#define MICROPY_PY_MACHINE_PWM      (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY (1)
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/renesas-ra/machine_pwm.c"
+#endif
+#if MICROPY_HW_ENABLE_HW_DAC
+#define MICROPY_PY_MACHINE_DAC      (1)
+#endif
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (48000000 / 48)
diff --git a/ports/renesas-ra/powerctrl.c b/ports/renesas-ra/powerctrl.c
index 8f9e25b7240af..26dc1cbe3a8f3 100644
--- a/ports/renesas-ra/powerctrl.c
+++ b/ports/renesas-ra/powerctrl.c
@@ -175,7 +175,7 @@ const lpm_instance_t g_lpm_standby = {
 #endif
 
 NORETURN void powerctrl_mcu_reset(void) {
-    #if BSP_FEATURE_TZ_HAS_TRUSTZONE
+    #if BSP_TZ_SECURE_BUILD
     R_BSP_NonSecureEnter();
     #else
     NVIC_SystemReset();
diff --git a/ports/renesas-ra/ra/ra_adc.c b/ports/renesas-ra/ra/ra_adc.c
index e7a270a19483c..fc6583e80e199 100644
--- a/ports/renesas-ra/ra/ra_adc.c
+++ b/ports/renesas-ra/ra/ra_adc.c
@@ -31,13 +31,13 @@
 #include "ra_utils.h"
 #include "ra_adc.h"
 
-static R_ADC0_Type *adc_reg = (R_ADC0_Type *)0x4005c000;
+static R_ADC0_Type *adc_reg = R_ADC0;
 #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;
+#if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
+static R_TSN_CTRL_Type *tsn_ctrl_reg = R_TSN_CTRL;
+static R_TSN_CAL_Type *tsn_cal_reg = R_TSN_CAL;
 #endif
 static uint8_t resolution = RA_ADC_DEF_RESOLUTION;
 
@@ -110,6 +110,63 @@ static const adc_pin_to_ch_t pin_to_ch[] = {
     { P506, AN019 },
     { P509, AN020 },
 
+    #elif defined(RA6M3)
+    { P000, AN000 },
+    { P001, AN001 },
+    { P002, AN002 },
+    { P003, AN007 },
+    { P004, AN100 },
+    { P005, AN101 },
+    { P006, AN102 },
+    { P007, AN107 },
+    { P008, AN003 },
+    { P009, AN004 },
+    { P010, AN103 },
+    { P014, AN005 },
+    { P014, AN105 },
+    { P015, AN006 },
+    { P015, AN106 },
+    { P500, AN016 },
+    { P501, AN116 },
+    { P502, AN017 },
+    { P503, AN117 },
+    { P504, AN018 },
+    { P505, AN118 },
+    { P506, AN019 },
+    { P507, AN119 },
+    { P508, AN020 },
+
+    #elif defined(RA6M5)
+    { P000, AN000 },
+    { P001, AN001 },
+    { P002, AN002 },
+    { P003, AN003 },
+    { P004, AN004 },
+    { P005, AN005 },
+    { P006, AN006 },
+    { P007, AN007 },
+    { P008, AN008 },
+    { P009, AN009 },
+    { P010, AN010 },
+    { P014, AN012 },
+    { P015, AN013 },
+    { P000, AN100 },
+    { P001, AN101 },
+    { P002, AN002 },
+    { P500, AN116 },
+    { P501, AN117 },
+    { P502, AN118 },
+    { P503, AN119 },
+    { P504, AN120 },
+    { P505, AN121 },
+    { P506, AN122 },
+    { P507, AN123 },
+    { P508, AN124 },
+    { P800, AN125 },
+    { P801, AN126 },
+    { P802, AN127 },
+    { P803, AN128 },
+
     #elif defined(RA6M1)
     { P000, AN000 },
     { P001, AN001 },
@@ -191,7 +248,7 @@ static void ra_adc0_module_stop(void) {
     ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD16_Msk);
 }
 
-#if defined(RA6M1) | defined(RA6M2)
+#if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
 static void ra_adc1_module_start(void) {
     ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD15_Msk);
 }
@@ -202,7 +259,7 @@ static void ra_adc1_module_stop(void) {
 #endif
 
 // For RA4M1 and RA4W1, there is no TSN configuration
-#if defined(RA6M1) | defined(RA6M2)
+#if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
 static void ra_tsn_module_start(void) {
     ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD22_Msk);
 }
@@ -324,7 +381,7 @@ uint8_t ra_adc_get_resolution(void) {
 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 defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
         if (ch == ADC_TEMP) {
             adc_reg->ADEXICR_b.TSSA = 1;
             tsn_ctrl_reg->TSCR_b.TSEN = 1;
@@ -360,7 +417,7 @@ uint16_t ra_adc_read_ch(uint8_t ch) {
     } else {
         value16 = (uint16_t)adc_reg->ADDR[ch];
     }
-    #if defined(RA6M1) | defined(RA6M2)
+    #if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     if (ch == ADC_TEMP) {
         tsn_ctrl_reg->TSCR_b.TSOE = 0;
         while (tsn_ctrl_reg->TSCR_b.TSOE) {
@@ -394,7 +451,7 @@ int16_t ra_adc_read_itemp(void) {
     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)
+    #elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     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);
@@ -416,7 +473,7 @@ float ra_adc_read_ftemp(void) {
     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)
+    #if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     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);
@@ -487,7 +544,7 @@ void ra_adc_all(__attribute__((unused)) uint32_t resolution, uint32_t mask) {
         adc_reg->ADANSA[0] = 0;
         adc_reg->ADANSA[1] = 0;
         adc_reg->ADEXICR_b.TSSA = 1;
-        #if defined(RA6M1) | defined(RA6M2)
+        #if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
         tsn_ctrl_reg->TSCR_b.TSEN = 1;
         while (!tsn_ctrl_reg->TSCR_b.TSEN) {
             ;
@@ -505,7 +562,7 @@ void ra_adc_all(__attribute__((unused)) uint32_t resolution, uint32_t mask) {
         }
         value16 = (uint16_t)adc_reg->ADTSDR;
         adc_values[ADC_TEMP] = value16;
-        #if defined(RA6M1) | defined(RA6M2)
+        #if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
         tsn_ctrl_reg->TSCR_b.TSOE = 0;
         while (tsn_ctrl_reg->TSCR_b.TSOE) {
             ;
@@ -533,7 +590,7 @@ void ra_adc_all(__attribute__((unused)) uint32_t resolution, uint32_t mask) {
 
 bool ra_adc_init(void) {
     ra_adc0_module_start();
-    #if defined(RA6M1) | defined(RA6M2)
+    #if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     ra_adc1_module_start();
     ra_tsn_module_start();
     #endif
@@ -544,7 +601,7 @@ bool ra_adc_init(void) {
 
 bool ra_adc_deinit(void) {
     ra_adc0_module_stop();
-    #if defined(RA6M1) | defined(RA6M2)
+    #if defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     ra_adc1_module_stop();
     ra_tsn_module_stop();
     #endif
diff --git a/ports/renesas-ra/ra/ra_adc.h b/ports/renesas-ra/ra/ra_adc.h
index 4d56243d1eb7a..c6befa9f2787b 100644
--- a/ports/renesas-ra/ra/ra_adc.h
+++ b/ports/renesas-ra/ra/ra_adc.h
@@ -148,6 +148,67 @@ enum ADC14_PIN
     AN117 = 49,
     AN118 = 50,
 
+    #elif defined(RA6M3)
+    // 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,
+    AN103 = 35,
+    AN105 = 37,
+    AN106 = 38,
+    AN107 = 39,
+    AN116 = 48,
+    AN117 = 49,
+    AN118 = 50,
+    AN119 = 51,
+
+    #elif defined(RA6M5)
+    // Unit 0
+    AN000 = 0,
+    AN001 = 1,
+    AN002 = 2,
+    AN003 = 3,
+    AN004 = 4,
+    AN005 = 5,
+    AN006 = 6,
+    AN007 = 7,
+    AN008 = 8,
+    AN009 = 9,
+    AN010 = 10,
+    AN012 = 12,
+    AN013 = 13,
+    // Unit 1
+    AN100 = 32,
+    AN101 = 33,
+    AN102 = 34,
+    AN116 = 35,
+    AN117 = 37,
+    AN118 = 38,
+    AN119 = 39,
+    AN120 = 48,
+    AN121 = 49,
+    AN122 = 50,
+    AN123 = 51,
+    AN124 = 52,
+    AN125 = 53,
+    AN126 = 54,
+    AN127 = 55,
+    AN128 = 56,
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
diff --git a/ports/renesas-ra/ra/ra_config.h b/ports/renesas-ra/ra/ra_config.h
index c02947a47bc41..a2df775c8902b 100644
--- a/ports/renesas-ra/ra/ra_config.h
+++ b/ports/renesas-ra/ra/ra_config.h
@@ -39,6 +39,12 @@
 #define SCI_TX_BUF_SIZE 128
 #define SCI_RX_BUF_SIZE 256
 #define PCLK         120000000
+#elif defined(RA6M5)
+#define SCI_CH_MAX   10
+#define SCI_CH_NUM   4
+#define SCI_TX_BUF_SIZE 128
+#define SCI_RX_BUF_SIZE 256
+#define PCLK         100000000
 #else
 #error "CMSIS MCU Series is not specified."
 #endif
diff --git a/ports/renesas-ra/ra/ra_dac.c b/ports/renesas-ra/ra/ra_dac.c
new file mode 100644
index 0000000000000..e1b2008f72f81
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_dac.c
@@ -0,0 +1,168 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/* FSP has available API for DAC (r_dac)
+
+R_DAC_Open ( ... )
+R_DAC_Stop ( ... )
+R_DAC_Start ( ... )
+R_DAC_Write ( ... )
+R_DAC_Close ( ... )
+
+and this is (The Lazy way)
+
+   ... but looking to other drivers implementation (for example AGT [ra_timer.c/h]), Renesas want to be hard, so ...
+
+   (The Hard way it is)
+*/
+
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+#include "ra_sci.h"
+// #include "ra_int.h"
+#include "ra_utils.h"
+#include "ra_dac.h"
+
+
+
+#if defined(RA4M1) || defined(RA4W1)
+#define DAC_CH_SIZE 1
+#elif defined(RA6M1) || defined(RA6M2) || defined(RA6M3) || defined(RA6M5)
+#define DAC_CH_SIZE 2
+#else
+#error "CMSIS MCU Series is not specified."
+#endif
+
+#define DAC_PINS_SIZE sizeof(ra_dac_pins) / sizeof(ra_af_pin_t)
+
+static const ra_af_pin_t ra_dac_pins[] = {
+    #if defined(RA4M1) || defined(RA4W1)
+    { AF_GPIO, 0, P014 }, // (A3)
+    #elif defined(RA6M1) || defined(RA6M2) || defined(RA6M3) || defined(RA6M5)
+    { AF_GPIO, 0, P014 }, // (A4)
+    { AF_GPIO, 1, P015 }, // (A5)
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+
+static void ra_dac_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_dac_pins, DAC_PINS_SIZE, pin, &ch, &af);
+    if (find) {
+        ra_gpio_config(pin, GPIO_MODE_ANALOG, GPIO_NOPULL, GPIO_LOW_POWER, af);
+        // pwpr_unprotect();
+        // _PXXPFS(GPIO_PORT(pin), GPIO_BIT(pin)) &= ~(PDR_MASK);
+        // _PXXPFS(GPIO_PORT(pin), GPIO_BIT(pin)) |= PDR_MASK;    // output
+        // pwpr_protect();
+    }
+}
+
+static void ra_dac_release_pin(uint32_t pin) {
+    bool find = false;
+    uint32_t ch;
+    uint32_t af;
+    find = ra_af_find_ch_af((ra_af_pin_t *)&ra_dac_pins, DAC_PINS_SIZE, pin, &ch, &af);
+    if (find) {
+        ra_gpio_config(pin, GPIO_MODE_ANALOG, GPIO_NOPULL, GPIO_LOW_POWER, AF_GPIO);
+        // pwpr_unprotect();
+        // _PXXPFS(GPIO_PORT(pin), GPIO_BIT(pin)) &= ~(PDR_MASK);
+        // pwpr_protect();
+    }
+}
+
+bool ra_dac_is_dac_pin(uint32_t pin) {
+    uint32_t ch;
+    uint32_t af;
+    return ra_af_find_ch_af((ra_af_pin_t *)&ra_dac_pins, DAC_PINS_SIZE, pin, &ch, &af);
+}
+
+uint8_t ra_dac_is_running(uint8_t ch) {
+    if (ch < DAC_CH_SIZE) {
+        return ch? R_DAC->DACR_b.DAOE1 : R_DAC->DACR_b.DAOE0;
+    } else {
+        return 0;
+    }
+}
+
+void ra_dac_start(uint8_t ch) {
+    if (ch < DAC_CH_SIZE) {
+        if (ch) {
+            R_DAC->DACR_b.DAOE1 = 1U;
+        } else {
+            R_DAC->DACR_b.DAOE0 = 1U;
+        }
+    }
+}
+
+void ra_dac_stop(uint8_t ch) {
+    if (ch < DAC_CH_SIZE) {
+        if (ch) {
+            R_DAC->DACR_b.DAOE1 = 0U;
+        } else {
+            R_DAC->DACR_b.DAOE0 = 0U;
+        }
+    }
+}
+
+void ra_dac_write(uint8_t ch, uint16_t val) {
+    if ((ch < DAC_CH_SIZE) || (val < 4096)) {
+        R_DAC->DADR[ch] = val;
+    }
+}
+
+uint16_t ra_dac_read(uint8_t ch) {
+    if (ch < DAC_CH_SIZE) {
+        return R_DAC->DADR[ch];
+    } else {
+        return 0;
+    }
+}
+
+void ra_dac_init(uint32_t dac_pin, uint8_t ch) {
+    if (ch < DAC_CH_SIZE) {
+        ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD20_Msk);
+
+        R_DAC->DADPR_b.DPSEL = 0;    // Right-justified format
+        R_DAC->DAADSCR_b.DAADST = 0;  // Do not synchronize with ADC14
+        R_DAC->DAVREFCR_b.REF = 1;   // AVCC0/AVSS0 selected
+        R_DAC->DADR[ch] = 0;         // Output 0 Volts
+
+        ra_dac_set_pin(dac_pin);
+        ra_dac_start(ch);
+    }
+}
+
+void ra_dac_deinit(uint32_t dac_pin, uint8_t ch) {
+    if (ch < DAC_CH_SIZE) {
+        ra_dac_stop(ch);
+        R_DAC->DAVREFCR_b.REF = 0;   // No reference voltage selected
+        ra_dac_release_pin(dac_pin);
+
+        ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD20_Msk);
+    }
+}
diff --git a/ports/renesas-ra/ra/ra_dac.h b/ports/renesas-ra/ra/ra_dac.h
new file mode 100644
index 0000000000000..5afa11d9737f2
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_dac.h
@@ -0,0 +1,41 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_DAC_H_
+#define RA_RA_DAC_H_
+
+#include <stdint.h>
+
+void ra_dac_start(uint8_t ch);
+void ra_dac_stop(uint8_t ch);
+uint8_t ra_dac_is_running(uint8_t ch);
+uint16_t ra_dac_read(uint8_t ch);
+void ra_dac_write(uint8_t ch, uint16_t val);
+void ra_dac_init(uint32_t dac_pin, uint8_t ch);
+void ra_dac_deinit(uint32_t dac_pin, uint8_t ch);
+bool ra_dac_is_dac_pin(uint32_t pin);
+
+#endif /* RA_RA_DAC_H_ */
diff --git a/ports/renesas-ra/ra/ra_flash.c b/ports/renesas-ra/ra/ra_flash.c
index e289f5f924b3c..933e3fef9e6b1 100644
--- a/ports/renesas-ra/ra/ra_flash.c
+++ b/ports/renesas-ra/ra/ra_flash.c
@@ -2,6 +2,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2021 Renesas Electronics Corporation
+ * Copyright (c) 2023 Vekatech Ltd.
  *
  * 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 +24,7 @@
  */
 
 #include <stdbool.h>
+#include "py/mpconfig.h"
 #include "hal_data.h"
 #include "ra_config.h"
 #include "ra_utils.h"
@@ -47,6 +49,115 @@ static volatile _Bool g_b_flash_event_write_complete = false;
 
 static uint8_t flash_buf[FLASH_BUF_SIZE] __attribute__((aligned(2)));
 
+#ifdef USE_FSP_QSPI
+#if MICROPY_HW_HAS_QSPI_FLASH
+static bool r_qspi_get_QE(void) {
+    /* Enter direct communication mode */
+    R_QSPI->SFMCMD = 1U;
+
+    R_QSPI->SFMCOM = 0x35;
+    bool sts = (R_QSPI->SFMCOM >> 1) & 1;
+
+    /* Close the SPI bus cycle. Reference section 39.10.3 "Generating the SPI Bus Cycle during Direct Communication"
+     * in the RA6M3 manual R01UH0886EJ0100. */
+    R_QSPI->SFMCMD = 1U;
+
+    /* Exit direct communication mode */
+    R_QSPI->SFMCMD = 0U;
+
+    return sts;
+}
+
+static void r_qspi_set_QE(qspi_instance_ctrl_t *p_instance_ctrl) {
+    /* Enter direct communication mode */
+    R_QSPI->SFMCMD = 1U;
+
+    /* Enable write. */
+    R_QSPI->SFMCOM = p_instance_ctrl->p_cfg->write_enable_command;
+
+    /* Close the SPI bus cycle. Reference section 39.10.3 "Generating the SPI Bus Cycle during Direct Communication"
+     * in the RA6M3 manual R01UH0886EJ0100. */
+    R_QSPI->SFMCMD = 1U;
+
+    R_QSPI->SFMCOM = 0x31;
+    R_QSPI->SFMCOM = 0x02;
+
+    /* Close the SPI bus cycle. Reference section 39.10.3 "Generating the SPI Bus Cycle during Direct Communication"
+     * in the RA6M3 manual R01UH0886EJ0100. */
+    R_QSPI->SFMCMD = 1U;
+
+    /* Exit direct communication mode */
+    R_QSPI->SFMCMD = 0U;
+}
+
+static void r_qspi_wait_WIP(qspi_instance_ctrl_t *p_instance_ctrl) {
+    /* Enter direct communication mode */
+    R_QSPI->SFMCMD = 1U;
+
+    R_QSPI->SFMCOM = p_instance_ctrl->p_cfg->status_command;
+    while ((R_QSPI->SFMCOM >> p_instance_ctrl->p_cfg->write_status_bit) & 1) {
+        ;
+    }
+
+    /* Close the SPI bus cycle. Reference section 39.10.3 "Generating the SPI Bus Cycle during Direct Communication"
+     * in the RA6M3 manual R01UH0886EJ0100. */
+    R_QSPI->SFMCMD = 1U;
+
+    /* Exit direct communication mode */
+    R_QSPI->SFMCMD = 0U;
+}
+
+static fsp_err_t R_QSPI_QuadEnable(spi_flash_ctrl_t *p_ctrl) {
+    qspi_instance_ctrl_t *p_instance_ctrl = (qspi_instance_ctrl_t *)p_ctrl;
+
+    #if QSPI_CFG_PARAM_CHECKING_ENABLE
+    FSP_ASSERT(NULL != p_instance_ctrl);
+    FSP_ASSERT(NULL != p_status);
+    FSP_ERROR_RETURN(QSPI_PRV_OPEN == p_instance_ctrl->open, FSP_ERR_NOT_OPEN);
+
+    /* Do not enter direct communication mode from XIP mode.  Reference note in section 39.10.2 "Using Direct
+     * Communication Mode" in the RA6M3 manual R01UH0886EJ0100. */
+    FSP_ERROR_RETURN(0U == R_QSPI->SFMSDC_b.SFMXST, FSP_ERR_INVALID_MODE);
+    #endif
+
+    /* Read device status. */
+    if (!r_qspi_get_QE()) {
+        r_qspi_set_QE(p_instance_ctrl);
+    }
+
+    return FSP_SUCCESS;
+}
+
+static fsp_err_t R_QSPI_Wait_WIP(spi_flash_ctrl_t *p_ctrl) {
+    qspi_instance_ctrl_t *p_instance_ctrl = (qspi_instance_ctrl_t *)p_ctrl;
+
+    #if QSPI_CFG_PARAM_CHECKING_ENABLE
+    FSP_ASSERT(NULL != p_instance_ctrl);
+    FSP_ASSERT(NULL != p_status);
+    FSP_ERROR_RETURN(QSPI_PRV_OPEN == p_instance_ctrl->open, FSP_ERR_NOT_OPEN);
+
+    /* Do not enter direct communication mode from XIP mode.  Reference note in section 39.10.2 "Using Direct
+     * Communication Mode" in the RA6M3 manual R01UH0886EJ0100. */
+    FSP_ERROR_RETURN(0U == R_QSPI->SFMSDC_b.SFMXST, FSP_ERR_INVALID_MODE);
+    #endif
+
+    /* Wait WIP flag to go 0 */
+    r_qspi_wait_WIP(p_instance_ctrl);
+
+    return FSP_SUCCESS;
+}
+
+static bool lmemprob(void *dst, size_t len) {
+    uint8_t *p;
+    for (p = (uint8_t *)dst; ((len > 0) && (p[0] == 0xFF)); len--) {
+        p++;
+    }
+
+    return len? false : true;
+}
+#endif
+#endif
+
 void *FLASH_SECTION lmemset(void *dst, int c, size_t len) {
     char *p;
     for (p = (char *)dst; len > 0; len--) {
@@ -80,7 +191,7 @@ int FLASH_SECTION lmemcmp(const void *p1, const void *p2, size_t len) {
     return (int)0;
 }
 
-#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
+#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1) | MICROPY_HW_HAS_QSPI_FLASH
 
 uint32_t FLASH_SECTION sector_size(uint32_t addr) {
     return FLASH_SECTOR_SIZE;
@@ -94,7 +205,7 @@ uint32_t FLASH_SECTION sector_index(uint32_t addr) {
     return (addr - 0x00000000) / FLASH_SECTOR_SIZE;
 }
 
-#elif defined(RA6M1) | defined(RA6M2)
+#elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
 
 #define REGION1_SECTOR_SIZE 0x8000  // 32K
 #define REGION1_SECTOR_MAX  14
@@ -102,7 +213,7 @@ uint32_t FLASH_SECTION sector_index(uint32_t addr) {
 #define REGION0_SECTOR_MAX  8
 
 uint32_t FLASH_SECTION sector_size(uint32_t addr) {
-    if (addr <= 0x00010000) {
+    if (addr < 0x00010000) {
         return REGION0_SECTOR_SIZE;
     } else {
         return REGION1_SECTOR_SIZE;
@@ -110,7 +221,7 @@ uint32_t FLASH_SECTION sector_size(uint32_t addr) {
 }
 
 uint32_t FLASH_SECTION sector_start(uint32_t addr) {
-    if (addr <= 0x00010000) {
+    if (addr < 0x00010000) {
         return addr & ~(REGION0_SECTOR_SIZE - 1);
     } else {
         return addr & ~(REGION1_SECTOR_SIZE - 1);
@@ -118,10 +229,10 @@ uint32_t FLASH_SECTION sector_start(uint32_t addr) {
 }
 
 uint32_t FLASH_SECTION sector_index(uint32_t addr) {
-    if (addr <= 0x00010000) {
-        return (addr - 0x00010000) / REGION0_SECTOR_SIZE;
+    if (addr < 0x00010000) {
+        return (addr - 0x00000000) / REGION0_SECTOR_SIZE;
     } else {
-        return (addr - 0x000100000) / REGION1_SECTOR_SIZE;
+        return ((addr - 0x00010000) / REGION1_SECTOR_SIZE) + REGION0_SECTOR_SIZE;
     }
 }
 
@@ -169,15 +280,23 @@ bool internal_flash_writex(uint8_t *addr, uint32_t NumBytes, uint8_t *pSectorBuf
         }
         g_b_flash_event_write_complete = false;
         uint8_t *flash_addr = (uint8_t *)((uint32_t)startaddr & FLASH_BUF_ADDR_MASK);
+        #if MICROPY_HW_HAS_QSPI_FLASH
+        for (uint16_t idx = 0; ((err == FSP_SUCCESS) && (idx < FLASH_SECTOR_SIZE)); idx += FLASH_PAGE_SIZE)
+        {
+            err = R_QSPI_Write(&g_qspi0_ctrl, &buf_addr[idx], &flash_addr[idx], FLASH_PAGE_SIZE);
+            err = R_QSPI_Wait_WIP(&g_qspi0_ctrl);
+        }
+        #else
         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)
+        #elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
         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);
+        #endif
         if (FSP_SUCCESS != err) {
             error_code = 1;
             goto WriteX_exit;
@@ -205,14 +324,17 @@ bool internal_flash_memset(uint8_t *addr, uint8_t Data, uint32_t NumBytes) {
 }
 
 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;
+    #if MICROPY_HW_HAS_QSPI_FLASH
+    return lmemprob((uint8_t *)((uint32_t)addr & FLASH_BUF_ADDR_MASK), FLASH_SECTOR_SIZE);
+    #else
+    fsp_err_t err = FSP_SUCCESS;
+    flash_result_t blankCheck = FLASH_RESULT_BLANK;
     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)
+    #elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     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."
@@ -227,21 +349,29 @@ bool internal_flash_isblockerased(uint8_t *addr, uint32_t BlockLength) {
     } else {
         return false;
     }
+    #endif
 }
 
 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;
+    #if MICROPY_HW_HAS_QSPI_FLASH
+    if (!lmemprob((uint8_t *)((uint32_t)addr & FLASH_BUF_ADDR_MASK), FLASH_SECTOR_SIZE)) {
+        err = R_QSPI_Erase(&g_qspi0_ctrl, (uint8_t *const)addr, FLASH_SECTOR_SIZE);
+        err = R_QSPI_Wait_WIP(&g_qspi0_ctrl);
+    }
+    #else
     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)
+    #elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     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);
+    #endif
     if (err == FSP_SUCCESS) {
         error_code = 0;
     } else {
@@ -277,9 +407,18 @@ void callback_flash(flash_callback_args_t *p_args) {
 
 bool internal_flash_init(void) {
     fsp_err_t err = FSP_SUCCESS;
+    #if MICROPY_HW_HAS_QSPI_FLASH
+    err = R_QSPI_Open(&g_qspi0_ctrl, &g_qspi0_cfg);
+    if (err == FSP_SUCCESS) {
+        R_QSPI_QuadEnable(&g_qspi0_ctrl);
+        return true;
+    } else {
+        return false;
+    }
+    #else
     #if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
     err = R_FLASH_LP_Open(&g_flash0_ctrl, &g_flash0_cfg);
-    #elif defined(RA6M1) | defined(RA6M2)
+    #elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
     err = R_FLASH_HP_Open(&g_flash0_ctrl, &g_flash0_cfg);
     #else
     #error "CMSIS MCU Series is not specified."
@@ -289,6 +428,7 @@ bool internal_flash_init(void) {
     } else {
         return false;
     }
+    #endif
 }
 
 #else
diff --git a/ports/renesas-ra/ra/ra_flash.h b/ports/renesas-ra/ra/ra_flash.h
index f9afef2a948f6..f6e01daff5bf8 100644
--- a/ports/renesas-ra/ra/ra_flash.h
+++ b/ports/renesas-ra/ra/ra_flash.h
@@ -29,8 +29,27 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#if MICROPY_HW_HAS_QSPI_FLASH
+#define SELECT(ic, attr)        ic##_##attr
+#define FLASH(ic, attr)         SELECT(ic, attr)
+#define CHIP                    AT25SF128A
+// #define CHIP                    W25Q128JV
+
+#define W25Q128JV_SECTOR_SIZE   4096ul
+#define W25Q128JV_NUM_BLOCKS    4096ul
+#define W25Q128JV_PAGE_SIZE     256ul
+
+#define AT25SF128A_SECTOR_SIZE  4096ul
+#define AT25SF128A_NUM_BLOCKS   4096ul
+#define AT25SF128A_PAGE_SIZE    256ul
+
+#define FLASH_SECTOR_SIZE       FLASH(CHIP, SECTOR_SIZE)
+#define FLASH_NUM_BLOCKS        FLASH(CHIP, NUM_BLOCKS)
+#define FLASH_PAGE_SIZE         FLASH(CHIP, PAGE_SIZE)
+#else
 #define FLASH_SECTOR_SIZE   ((uint32_t)2048)
 #define FLASH_NUM_BLOCKS    ((uint32_t)128)
+#endif
 #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
diff --git a/ports/renesas-ra/ra/ra_gpio.h b/ports/renesas-ra/ra/ra_gpio.h
index 8c16fe3ba18c7..58df7aafe9987 100644
--- a/ports/renesas-ra/ra/ra_gpio.h
+++ b/ports/renesas-ra/ra/ra_gpio.h
@@ -42,10 +42,12 @@ enum CPU_PIN {
     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,
+    P600 = 0x60, 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,
+    PA00 = 0xA0, PA01, PA02, PA03, PA04, PA05, PA06, PA07, PA08, PA09, PA10, PA11, PA12, PA13, PA14, PA15,
+    PB00 = 0xB0, PB01, PB02, PB03, PB04, PB05, PB06, PB07, PB08, PB09, PB10, PB11, PB12, PB13, PB14, PB15,
     PIN_END = 0xff,
 };
 
@@ -126,35 +128,35 @@ enum AF_INDEX {
 #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))))
+#define _PWPR               (*(volatile uint8_t *)(R_PFS_BASE + 0x503))
+
+#define _PXXPFS(port, bit)  (*(volatile uint32_t *)(R_PFS_BASE + (0x40 * ((uint32_t)port)) + (0x4 * ((uint32_t)bit))))
+#define _PCNTR1(port)       (*(volatile uint32_t *)(R_PORT0_BASE + (0x20 * (port))))
+#define _PODR(port)         (*(volatile uint16_t *)(R_PORT0_BASE + (0x20 * (port))))
+#define _PDR(port)          (*(volatile uint16_t *)(R_PORT0_BASE + 0x2 + (0x20 * (port))))
+#define _PCNTR2(port)       (*(volatile uint32_t *)(R_PORT0_BASE + 0x4 + (0x20 * (port))))
+#define _EIDR(port)         (*(volatile uint16_t *)(R_PORT0_BASE + 0x4 + (0x20 * (port))))
+#define _PIDR(port)         (*(volatile uint16_t *)(R_PORT0_BASE + 0x6 + (0x20 * (port))))
+#define _PCNTR3(port)       (*(volatile uint32_t *)(R_PORT0_BASE + 0x8 + (0x20 * (port))))
+#define _PORR(port)         (*(volatile uint16_t *)(R_PORT0_BASE + 0x8 + (0x20 * (port))))
+#define _POSR(port)         (*(volatile uint16_t *)(R_PORT0_BASE + 0xa + (0x20 * (port))))
+#define _PCNTR4(port)       (*(volatile uint32_t *)(R_PORT0_BASE + 0xc + (0x20 * (port))))
+#define _EORR(port)         (*(volatile uint16_t *)(R_PORT0_BASE + 0xc + (0x20 * (port))))
+#define _EOSR(port)         (*(volatile uint16_t *)(R_PORT0_BASE + 0xe + (0x20 * (port))))
+
+#define _PPXXPFS(port, bit)  ((volatile uint32_t *)(R_PFS_BASE + (0x40 * (port)) + (0x4 * (bit))))
+#define _PPCNTR1(port)       ((volatile uint32_t *)(R_PORT0_BASE + (0x20 * (port))))
+#define _PPODR(port)         ((volatile uint16_t *)(R_PORT0_BASE + (0x20 * (port))))
+#define _PPDR(port)          ((volatile uint16_t *)(R_PORT0_BASE + 0x2 + (0x20 * (port))))
+#define _PPCNTR2(port)       ((volatile uint32_t *)(R_PORT0_BASE + 0x4 + (0x20 * (port))))
+#define _PEIDR(port)         ((volatile uint16_t *)(R_PORT0_BASE + 0x4 + (0x20 * (port))))
+#define _PPIDR(port)         ((volatile uint16_t *)(R_PORT0_BASE + 0x6 + (0x20 * (port))))
+#define _PPCNTR3(port)       ((volatile uint32_t *)(R_PORT0_BASE + 0x8 + (0x20 * (port))))
+#define _PPORR(port)         ((volatile uint16_t *)(R_PORT0_BASE + 0x8 + (0x20 * (port))))
+#define _PPOSR(port)         ((volatile uint16_t *)(R_PORT0_BASE + 0xa + (0x20 * (port))))
+#define _PPCNTR4(port)       ((volatile uint32_t *)(R_PORT0_BASE + 0xc + (0x20 * (port))))
+#define _PEORR(port)         ((volatile uint16_t *)(R_PORT0_BASE + 0xc + (0x20 * (port))))
+#define _PEOSR(port)         ((volatile uint16_t *)(R_PORT0_BASE + 0xe + (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);
diff --git a/ports/renesas-ra/ra/ra_gpt.c b/ports/renesas-ra/ra/ra_gpt.c
new file mode 100644
index 0000000000000..cca32c4d82357
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_gpt.c
@@ -0,0 +1,626 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/* FSP has available API for PWM (r_gpt)
+
+R_GPT_Open ( ... )
+R_GPT_Stop ( ... )
+R_GPT_Start ( ... )
+R_GPT_Reset ( ... )
+R_GPT_Enable ( ... )
+R_GPT_Disable ( ... )
+R_GPT_PeriodSet ( ... )
+R_GPT_DutyCycleSet ( ... )
+R_GPT_InfoGet ( ... )
+R_GPT_StatusGet ( ... )
+R_GPT_CounterSet ( ... )
+R_GPT_OutputEnable ( ... )
+R_GPT_OutputDisable ( ... )
+R_GPT_AdcTriggerSet ( ... )
+R_GPT_CallbackSet ( ... )
+R_GPT_Close ( ... )
+
+and this is (The Lazy way)
+
+   ... but looking to other drivers implementation (for example AGT [ra_timer.c/h]), Renesas want to be hard, so ...
+
+   (The Hard way it is)
+*/
+
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+#include "ra_sci.h"
+// #include "ra_int.h"
+#include "ra_utils.h"
+#include "ra_gpt.h"
+
+
+
+#if defined(RA4M1)
+#define GPT_CH_SIZE 8
+#define CH_GAP 0
+#elif defined(RA4W1)
+#define GPT_CH_SIZE 9
+#define CH_GAP (ch == 6) || (ch == 7)
+#elif defined(RA6M1)
+#define GPT_CH_SIZE 13
+#define CH_GAP 0
+#elif defined(RA6M2) || defined(RA6M3)
+#define GPT_CH_SIZE 14
+#define CH_GAP 0
+#elif defined(RA6M5)
+#define GPT_CH_SIZE 10
+#define CH_GAP 0
+#else
+#error "CMSIS MCU Series is not specified."
+#endif
+
+enum GPT_SOURCE {
+    GPT_PCLKD = 0,
+    GPT_PCLKD4,
+    GPT_PCLKD16,
+    GPT_PCLKD64,
+    GPT_PCLKD256,
+    GPT_PCLKD1024
+};
+
+static R_GPT0_Type *gpt_regs[GPT_CH_SIZE] = {
+    #if defined(RA4M1)
+    R_GPT0,     // GPT320 General PWM Timer 0 (32-bit)
+    R_GPT1,     // GPT321 General PWM Timer 1 (32-bit)
+    R_GPT2,     // GPT162 General PWM Timer 2 (16-bit)
+    R_GPT3,     // GPT163 General PWM Timer 3 (16-bit)
+    R_GPT4,     // GPT164 General PWM Timer 4 (16-bit)
+    R_GPT5,     // GPT165 General PWM Timer 5 (16-bit)
+    R_GPT6,     // GPT166 General PWM Timer 6 (16-bit)
+    R_GPT7,     // GPT167 General PWM Timer 7 (16-bit)
+    #elif defined(RA4W1)
+    R_GPT0,     // GPT320 General PWM Timer 0 (32-bit)
+    R_GPT1,     // GPT321 General PWM Timer 1 (32-bit)
+    R_GPT2,     // GPT322 General PWM Timer 2 (32-bit)
+    R_GPT3,     // GPT323 General PWM Timer 3 (32-bit)
+    R_GPT4,     // GPT164 General PWM Timer 4 (16-bit)
+    R_GPT5,     // GPT165 General PWM Timer 5 (16-bit)
+    NULL,       // N/A            PWM Timer 6 (Does not exist)
+    NULL,       // N/A            PWM Timer 7 (Does not exist)
+    R_GPT8      // GPT168 General PWM Timer 8 (16-bit)
+    #elif defined(RA6M1) || defined(RA6M2) || defined(RA6M3)
+    R_GPT0,     // GPT32EH0 General PWM Timer 0  (32-bit)
+    R_GPT1,     // GPT32EH1 General PWM Timer 1  (32-bit)
+    R_GPT2,     // GPT32EH2 General PWM Timer 2  (32-bit)
+    R_GPT3,     // GPT32EH3 General PWM Timer 3  (32-bit)
+    R_GPT4,     // GPT32E4  General PWM Timer 4  (32-bit)
+    R_GPT5,     // GPT32E5  General PWM Timer 5  (32-bit)
+    R_GPT6,     // GPT32E6  General PWM Timer 6  (32-bit)
+    R_GPT7,     // GPT32E7  General PWM Timer 7  (32-bit)
+    R_GPT8,     // GPT328   General PWM Timer 8  (32-bit)
+    R_GPT9,     // GPT329   General PWM Timer 9  (32-bit)
+    R_GPT10,    // GPT3210  General PWM Timer 10 (32-bit)
+    R_GPT11,    // GPT3211  General PWM Timer 11 (32-bit)
+    R_GPT12,    // GPT3212  General PWM Timer 12 (32-bit)
+    #if defined(RA6M2) || defined(RA6M3)
+    R_GPT13,    // GPT3213  General PWM Timer 13 (32-bit)
+    #endif
+    #elif defined(RA6M5)
+    R_GPT0,     // GPT320 General PWM Timer 0  (32-bit)
+    R_GPT1,     // GPT321 General PWM Timer 1  (32-bit)
+    R_GPT2,     // GPT322 General PWM Timer 2  (32-bit)
+    R_GPT3,     // GPT323 General PWM Timer 3  (32-bit)
+    R_GPT4,     // GPT164 General PWM Timer 4  (16-bit)
+    R_GPT5,     // GPT165 General PWM Timer 5  (16-bit)
+    R_GPT6,     // GPT166 General PWM Timer 6  (16-bit)
+    R_GPT7,     // GPT167 General PWM Timer 7  (16-bit)
+    R_GPT8,     // GPT168 General PWM Timer 8  (16-bit)
+    R_GPT9,     // GPT169 General PWM Timer 9  (16-bit)
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+
+#define GPT_TMR_PINS_SIZE sizeof(ra_gpt_timer_pins) / sizeof(ra_af_pin_t)
+
+static const ra_af_pin_t ra_gpt_timer_pins[] = {
+    #if defined(RA4M1)
+    { AF_GPT2, 0,  P107 }, { AF_GPT2, 0,  P213 }, { AF_GPT2, 0,  P300 }, { AF_GPT2, 0,  P415 }, // GTIOC0A
+    { AF_GPT2, 0,  P106 }, { AF_GPT2, 0,  P108 }, { AF_GPT2, 0,  P212 }, { AF_GPT2, 0,  P414 }, // GTIOC0B
+    { AF_GPT2, 1,  P105 }, { AF_GPT2, 1,  P109 }, { AF_GPT2, 1,  P405 },                        // GTIOC1A
+    { AF_GPT2, 1,  P104 }, { AF_GPT2, 1,  P110 }, { AF_GPT2, 1,  P406 },                        // GTIOC1B
+    { AF_GPT2, 2,  P103 }, { AF_GPT2, 2,  P113 }, { AF_GPT2, 2,  P500 },                        // GTIOC2A
+    { AF_GPT2, 2,  P102 }, { AF_GPT2, 2,  P114 }, { AF_GPT2, 2,  P501 },                        // GTIOC2B
+    { AF_GPT2, 3,  P111 }, { AF_GPT2, 3,  P403 },                                               // GTIOC3A
+    { AF_GPT2, 3,  P112 }, { AF_GPT2, 3,  P404 }, { AF_GPT2, 3,  P502 },                        // GTIOC3B
+    { AF_GPT2, 4,  P115 }, { AF_GPT2, 4,  P205 }, { AF_GPT2, 4,  P302 },                        // GTIOC4A
+    { AF_GPT2, 4,  P204 }, { AF_GPT2, 4,  P301 }, { AF_GPT2, 4,  P608 },                        // GTIOC4B
+    { AF_GPT2, 5,  P101 }, { AF_GPT2, 5,  P203 }, { AF_GPT2, 5,  P409 }, { AF_GPT2, 5,  P609 }, // GTIOC5A
+    { AF_GPT2, 5,  P100 }, { AF_GPT2, 5,  P202 }, { AF_GPT2, 5,  P408 }, { AF_GPT2, 5,  P610 }, // GTIOC5B
+    { AF_GPT2, 6,  P400 }, { AF_GPT2, 6,  P411 }, { AF_GPT2, 6,  P601 },                        // GTIOC6A
+    { AF_GPT2, 6,  P401 }, { AF_GPT2, 6,  P410 }, { AF_GPT2, 6,  P600 },                        // GTIOC6B
+    { AF_GPT2, 7,  P304 }, { AF_GPT2, 7,  P603 },                                               // GTIOC7A
+    { AF_GPT2, 7,  P303 }, { AF_GPT2, 7,  P602 },                                               // GTIOC7B
+    #elif defined(RA4W1)
+    { AF_GPT2, 0,  P213 }, { AF_GPT2, 0,  P300 },                        // GTIOC0A
+    { AF_GPT2, 0,  P108 }, { AF_GPT2, 0,  P212 }, { AF_GPT2, 0,  P414 }, // GTIOC0B
+    { AF_GPT2, 1,  P105 }, { AF_GPT2, 1,  P109 },                        // GTIOC1A
+    { AF_GPT2, 1,  P104 }, { AF_GPT2, 1,  P110 },                        // GTIOC1B
+    { AF_GPT2, 2,  P103 },                                               // GTIOC2A
+    { AF_GPT2, 2,  P102 }, { AF_GPT2, 2,  P501 },                        // GTIOC2B
+    { AF_GPT2, 3,  P111 },                                               // GTIOC3A
+    { AF_GPT2, 3,  P404 },                                               // GTIOC3B
+    { AF_GPT2, 4,  P205 },                                               // GTIOC4A
+    { AF_GPT2, 4,  P204 },                                               // GTIOC4B
+    { AF_GPT2, 5,  P101 }, { AF_GPT2, 5,  P409 },                        // GTIOC5A
+    { AF_GPT2, 5,  P100 },                                               // GTIOC5B
+    { AF_GPT2, 8,  P107 },                                               // GTIOC8A
+    { AF_GPT2, 8,  P106 },                                               // GTIOC8B
+    #elif defined(RA6M1)
+    { AF_GPT2, 0,  P213 }, { AF_GPT2, 0,  P415 },                        // GTIOC0A
+    { AF_GPT2, 0,  P212 }, { AF_GPT2, 0,  P414 },                        // GTIOC0B
+    { AF_GPT2, 1,  P105 }, { AF_GPT2, 1,  P405 },                        // GTIOC1A
+    { AF_GPT2, 1,  P104 }, { AF_GPT2, 1,  P406 },                        // GTIOC1B
+    { AF_GPT2, 2,  P113 },                                               // GTIOC2A
+    { AF_GPT2, 2,  P114 },                                               // GTIOC2B
+    { AF_GPT2, 3,  P403 },                                               // GTIOC3A
+    { AF_GPT2, 3,  P404 },                                               // GTIOC3B
+    { AF_GPT2, 4,  P115 }, { AF_GPT2, 4,  P205 }, { AF_GPT2, 4,  P302 }, // GTIOC4A
+    { AF_GPT2, 4,  P301 }, { AF_GPT2, 4,  P608 },                        // GTIOC4B
+    { AF_GPT2, 5,  P101 }, { AF_GPT2, 5,  P609 },                        // GTIOC5A
+    { AF_GPT2, 5,  P100 }, { AF_GPT2, 5,  P610 },                        // GTIOC5B
+    { AF_GPT2, 6,  P400 }, { AF_GPT2, 6,  P601 },                        // GTIOC6A
+    { AF_GPT2, 6,  P401 }, { AF_GPT2, 6,  P600 },                        // GTIOC6B
+    { AF_GPT2, 7,  P304 },                                               // GTIOC7A
+    { AF_GPT2, 7,  P303 }, { AF_GPT2, 7,  P602 },                        // GTIOC7B
+    { AF_GPT2, 8,  P107 },                                               // GTIOC8A
+    { AF_GPT2, 8,  P106 },                                               // GTIOC8B
+    { AF_GPT2, 9,  P411 },                                               // GTIOC9A
+    { AF_GPT2, 9,  P410 },                                               // GTIOC9B
+    { AF_GPT2, 10, P409 },                                               // GTIOC10A
+    { AF_GPT2, 10, P408 },                                               // GTIOC10B
+    { AF_GPT2, 11, P500 },                                               // GTIOC11A
+    { AF_GPT2, 11, P501 },                                               // GTIOC11B
+    { AF_GPT2, 12, P502 },                                               // GTIOC12A
+    { AF_GPT2, 12, P503 },                                               // GTIOC12B
+    #elif defined(RA6M2)
+    { AF_GPT2, 0,  P213 }, { AF_GPT2, 0,  P415 }, { AF_GPT2, 0,  P512 },                        // GTIOC0A
+    { AF_GPT2, 0,  P212 }, { AF_GPT2, 0,  P414 }, { AF_GPT2, 0,  P511 },                        // GTIOC0B
+    { AF_GPT2, 1,  P105 }, { AF_GPT2, 1,  P405 },                                               // GTIOC1A
+    { AF_GPT2, 1,  P104 }, { AF_GPT2, 1,  P406 },                                               // GTIOC1B
+    { AF_GPT2, 2,  P113 }, { AF_GPT2, 2,  P713 },                                               // GTIOC2A
+    { AF_GPT2, 2,  P114 }, { AF_GPT2, 2,  P712 },                                               // GTIOC2B
+    { AF_GPT2, 3,  P403 },                                                                      // GTIOC3A
+    { AF_GPT2, 3,  P404 },                                                                      // GTIOC3B
+    { AF_GPT2, 4,  P115 }, { AF_GPT2, 4,  P205 }, { AF_GPT2, 4,  P302 },                        // GTIOC4A
+    { AF_GPT2, 4,  P204 }, { AF_GPT2, 4,  P301 }, { AF_GPT2, 4,  P608 },                        // GTIOC4B
+    { AF_GPT2, 5,  P101 }, { AF_GPT2, 5,  P203 }, { AF_GPT2, 5,  P609 }, { AF_GPT2, 5,  P700 }, // GTIOC5A
+    { AF_GPT2, 5,  P100 }, { AF_GPT2, 5,  P202 }, { AF_GPT2, 5,  P610 }, { AF_GPT2, 5,  P701 }, // GTIOC5B
+    { AF_GPT2, 6,  P400 }, { AF_GPT2, 6,  P601 }, { AF_GPT2, 6,  P702 },                        // GTIOC6A
+    { AF_GPT2, 6,  P401 }, { AF_GPT2, 6,  P600 }, { AF_GPT2, 6,  P703 },                        // GTIOC6B
+    { AF_GPT2, 7,  P304 }, { AF_GPT2, 7,  P603 },                                               // GTIOC7A
+    { AF_GPT2, 7,  P303 }, { AF_GPT2, 7,  P602 },                                               // GTIOC7B
+    { AF_GPT2, 8,  P107 }, { AF_GPT2, 8,  P605 },                                               // GTIOC8A
+    { AF_GPT2, 8,  P106 }, { AF_GPT2, 8,  P604 },                                               // GTIOC8B
+    { AF_GPT2, 9,  P411 },                                                                      // GTIOC9A
+    { AF_GPT2, 9,  P410 },                                                                      // GTIOC9B
+    { AF_GPT2, 10, P409 },                                                                      // GTIOC10A
+    { AF_GPT2, 10, P408 },                                                                      // GTIOC10B
+    { AF_GPT2, 11, P500 },                                                                      // GTIOC11A
+    { AF_GPT2, 11, P501 },                                                                      // GTIOC11B
+    { AF_GPT2, 12, P502 },                                                                      // GTIOC12A
+    { AF_GPT2, 12, P503 },                                                                      // GTIOC12B
+    { AF_GPT2, 13, P504 },                                                                      // GTIOC13A
+    { AF_GPT2, 13, P505 },                                                                      // GTIOC13B
+    #elif defined(RA6M3)
+    { AF_GPT2, 0,  P213 }, { AF_GPT2, 0,  P415 }, { AF_GPT2, 0,  P512 },                        // GTIOC0A
+    { AF_GPT2, 0,  P212 }, { AF_GPT2, 0,  P414 }, { AF_GPT2, 0,  P511 },                        // GTIOC0B
+    { AF_GPT2, 1,  P105 }, { AF_GPT2, 1,  P405 },                                               // GTIOC1A
+    { AF_GPT2, 1,  P104 }, { AF_GPT2, 1,  P406 },                                               // GTIOC1B
+    { AF_GPT2, 2,  P113 }, { AF_GPT2, 2,  P713 },                                               // GTIOC2A
+    { AF_GPT2, 2,  P114 }, { AF_GPT2, 2,  P712 },                                               // GTIOC2B
+    { AF_GPT2, 3,  P403 },                                                                      // GTIOC3A
+    { AF_GPT2, 3,  P404 },                                                                      // GTIOC3B
+    { AF_GPT2, 4,  P115 }, { AF_GPT2, 4,  P205 }, { AF_GPT2, 4,  P302 },                        // GTIOC4A
+    { AF_GPT2, 4,  P204 }, { AF_GPT2, 4,  P301 }, { AF_GPT2, 4,  P608 },                        // GTIOC4B
+    { AF_GPT2, 5,  P101 }, { AF_GPT2, 5,  P203 }, { AF_GPT2, 5,  P609 }, { AF_GPT2, 5,  P700 }, // GTIOC5A
+    { AF_GPT2, 5,  P100 }, { AF_GPT2, 5,  P202 }, { AF_GPT2, 5,  P610 }, { AF_GPT2, 5,  P701 }, // GTIOC5B
+    { AF_GPT2, 6,  P400 }, { AF_GPT2, 6,  P601 }, { AF_GPT2, 6,  P702 },                        // GTIOC6A
+    { AF_GPT2, 6,  P401 }, { AF_GPT2, 6,  P600 }, { AF_GPT2, 6,  P703 },                        // GTIOC6B
+    { AF_GPT2, 7,  P304 }, { AF_GPT2, 7,  P603 },                                               // GTIOC7A
+    { AF_GPT2, 7,  P303 }, { AF_GPT2, 7,  P602 },                                               // GTIOC7B
+    { AF_GPT2, 8,  P107 }, { AF_GPT2, 8,  P605 },                                               // GTIOC8A
+    { AF_GPT2, 8,  P106 }, { AF_GPT2, 8,  P604 },                                               // GTIOC8B
+    { AF_GPT2, 9,  P411 },                                                                      // GTIOC9A
+    { AF_GPT2, 9,  P410 },                                                                      // GTIOC9B
+    { AF_GPT2, 10, P409 },                                                                      // GTIOC10A
+    { AF_GPT2, 10, P408 },                                                                      // GTIOC10B
+    { AF_GPT2, 11, P500 },                                                                      // GTIOC11A
+    { AF_GPT2, 11, P501 },                                                                      // GTIOC11B
+    { AF_GPT2, 12, P502 }, { AF_GPT2, 12, P908 },                                               // GTIOC12A
+    { AF_GPT2, 12, P503 }, { AF_GPT2, 12, P907 },                                               // GTIOC12B
+    { AF_GPT2, 13, P504 }, { AF_GPT2, 13, P906 },                                               // GTIOC13A
+    { AF_GPT2, 13, P505 }, { AF_GPT2, 13, P905 },                                               // GTIOC13B
+    #elif defined(RA6M5)
+    { AF_GPT2, 0,  P213 }, { AF_GPT2, 0,  P300 }, { AF_GPT2, 0,  P415 }, { AF_GPT2, 0,  P512 }, // GTIOC0A
+    { AF_GPT2, 0,  P108 }, { AF_GPT2, 0,  P212 }, { AF_GPT2, 0,  P414 }, { AF_GPT2, 0,  P511 }, // GTIOC0B
+    { AF_GPT2, 1,  P105 }, { AF_GPT2, 1,  P109 }, { AF_GPT2, 1,  P405 },                        // GTIOC1A
+    { AF_GPT2, 1,  P104 }, { AF_GPT2, 1,  P110 }, { AF_GPT2, 1,  P406 },                        // GTIOC1B
+    { AF_GPT2, 2,  P103 }, { AF_GPT2, 2,  P113 }, { AF_GPT2, 2,  P713 },                        // GTIOC2A
+    { AF_GPT2, 2,  P102 }, { AF_GPT2, 2,  P114 }, { AF_GPT2, 2,  P712 },                        // GTIOC2B
+    { AF_GPT2, 3,  P111 }, { AF_GPT2, 3,  P403 },                                               // GTIOC3A
+    { AF_GPT2, 3,  P112 }, { AF_GPT2, 3,  P404 },                                               // GTIOC3B
+    { AF_GPT2, 4,  P115 }, { AF_GPT2, 4,  P205 }, { AF_GPT2, 4,  P302 },                        // GTIOC4A
+    { AF_GPT2, 4,  P204 }, { AF_GPT2, 4,  P301 }, { AF_GPT2, 4,  P608 },                        // GTIOC4B
+    { AF_GPT2, 5,  P101 }, { AF_GPT2, 5,  P203 }, { AF_GPT2, 5,  P609 }, { AF_GPT2, 5,  P700 }, // GTIOC5A
+    { AF_GPT2, 5,  P100 }, { AF_GPT2, 5,  P202 }, { AF_GPT2, 5,  P610 }, { AF_GPT2, 5,  P701 }, // GTIOC5B
+    { AF_GPT2, 6,  P400 }, { AF_GPT2, 6,  P407 }, { AF_GPT2, 6,  P601 }, { AF_GPT2, 6,  P702 }, // GTIOC6A
+    { AF_GPT2, 6,  P401 }, { AF_GPT2, 6,  P408 }, { AF_GPT2, 6,  P600 }, { AF_GPT2, 6,  P703 }, // GTIOC6B
+    { AF_GPT2, 7,  P304 }, { AF_GPT2, 7,  P603 },                                               // GTIOC7A
+    { AF_GPT2, 7,  P303 }, { AF_GPT2, 7,  P602 },                                               // GTIOC7B
+    { AF_GPT2, 8,  P107 }, { AF_GPT2, 8,  P605 },                                               // GTIOC8A
+    { AF_GPT2, 8,  P106 }, { AF_GPT2, 8,  P604 },                                               // GTIOC8B
+    { AF_GPT2, 9,  P411 },                                                                      // GTIOC9A
+    { AF_GPT2, 9,  P410 },                                                                      // GTIOC9B
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+
+static float ra_gpt_freq[GPT_CH_SIZE];
+static volatile uint16_t ra_gpt_div[GPT_CH_SIZE];
+
+static void ra_gpt_timer_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_gpt_timer_pins, GPT_TMR_PINS_SIZE, pin, &ch, &af);
+    if (find) {             // GPIO_MODE_OUTPUT_PP
+        ra_gpio_config(pin, GPIO_MODE_AF_PP, GPIO_NOPULL, GPIO_LOW_POWER, af);
+    }
+}
+
+static void ra_gpt_timer_release_pin(uint32_t pin) {
+    bool find = false;
+    uint32_t ch;
+    uint32_t af;
+    find = ra_af_find_ch_af((ra_af_pin_t *)&ra_gpt_timer_pins, GPT_TMR_PINS_SIZE, pin, &ch, &af);
+    if (find) {                                                    // GPIO_PULLUP
+        ra_gpio_config(pin, GPIO_MODE_INPUT, GPIO_NOPULL, GPIO_LOW_POWER, AF_GPIO);
+    }
+}
+
+bool ra_gpt_timer_is_pwm_pin(uint32_t pin) {
+    uint32_t ch;
+    uint32_t af;
+    return ra_af_find_ch_af((ra_af_pin_t *)&ra_gpt_timer_pins, GPT_TMR_PINS_SIZE, pin, &ch, &af);
+}
+
+void ra_gpt_timer_start(uint32_t ch) {
+    if (CH_GAP || (ch >= GPT_CH_SIZE)) {
+        return;
+    }
+    gpt_regs[ch]->GTCR_b.CST = 1;
+}
+
+void ra_gpt_timer_stop(uint32_t ch) {
+    if (CH_GAP || (ch >= GPT_CH_SIZE)) {
+        return;
+    }
+    gpt_regs[ch]->GTCR_b.CST = 0;
+}
+
+void ra_gpt_timer_set_freq(uint32_t ch, float freq) {
+    R_GPT0_Type *gpt_reg = gpt_regs[ch];
+    uint8_t source = 0;
+    uint32_t period = 0;
+    ra_gpt_freq[ch] = 0.0f;
+
+    if ((!gpt_reg) || (ch >= GPT_CH_SIZE) || (freq == ra_gpt_freq[ch]) || (freq == 0.0f)) {
+        return;
+    }
+
+    ra_gpt_div[ch] = 0;
+
+    #ifdef RA4M1
+    if (ch <= 1) { // 32bit
+    #elif defined(RA4W1) || defined(RA6M5)
+    if (ch <= 3) { // 32bit
+    #elif defined(RA6M1) || defined(RA6M2) || defined(RA6M3)
+    if (1) { // all is 32bit
+    #else
+    #error What is the width of the timer? (How many bits)
+        #endif
+        // float min_freq = ((float)PCLK)/4294967295.0f;
+        if ((freq > (float)(PCLK / 2)) || (freq <= 0.0f)) {
+            return;
+        } else {
+            source = GPT_PCLKD;
+            period = (uint32_t)((float)(PCLK) / freq);
+        }
+    } else { // 16bit
+        float min_freq = ((float)PCLK) / 65565.0f;
+
+        if (freq > (float)(PCLK / 2)) {
+            return;
+        } else if (freq > min_freq) {
+            source = GPT_PCLKD;
+            period = (uint16_t)((float)(PCLK) / freq);
+        } else if (freq > (min_freq / 4.0f)) {
+            source = GPT_PCLKD4;
+            ra_gpt_div[ch] = 4;
+            period = (uint16_t)(((float)(PCLK) / 4.0f) / freq);
+        } else if (freq > (min_freq / 16.0f)) {
+            source = GPT_PCLKD16;
+            ra_gpt_div[ch] = 16;
+            period = (uint16_t)(((float)(PCLK) / 16.0f) / freq);
+        } else if (freq > (min_freq / 64.0f)) {
+            source = GPT_PCLKD64;
+            ra_gpt_div[ch] = 64;
+            period = (uint16_t)(((float)(PCLK) / 64.0f) / freq);
+        } else if (freq > (min_freq / 256.0f)) {
+            source = GPT_PCLKD256;
+            ra_gpt_div[ch] = 256;
+            period = (uint16_t)(((float)(PCLK) / 256.0f) / freq);
+        } else if (freq > (min_freq / 1024.0f)) {
+            source = GPT_PCLKD1024;
+            ra_gpt_div[ch] = 1024;
+            period = (uint16_t)(((float)(PCLK) / 1024.0f) / freq);
+        } else {
+            return;
+        }
+    }
+
+    ra_gpt_freq[ch] = freq;
+
+    float dutyA = (gpt_reg->GTIOR_b.OAE && gpt_reg->GTCCR[0] && gpt_reg->GTPR)? (float)(gpt_reg->GTCCR[0] + 1) / (float)(gpt_reg->GTPR + 1) : 0.0f;
+    float dutyB = (gpt_reg->GTIOR_b.OBE && gpt_reg->GTCCR[0] && gpt_reg->GTPR)? (float)(gpt_reg->GTCCR[1] + 1) / (float)(gpt_reg->GTPR + 1) : 0.0f;
+
+    if (gpt_reg->GTCR_b.CST) { // running
+        if ((gpt_reg->GTCR >> 23) != source) {    // Can't use gpt_reg->GTCR_b.TPCS this structure is declared wrong by FPS v2.3.0 so get the whole reg
+            gpt_reg->GTCR_b.CST = 0;               // stop counter
+            gpt_reg->GTCR_b.TPCS = source << 1;    // Again gpt_reg->GTCR_b.TPCS is wrong and incoming value should be shifted
+            gpt_reg->GTPR = period - 1;
+            gpt_reg->GTPBR = period - 1;
+
+            if (dutyA > 0.0f) {
+                dutyA = dutyA * ((float)(period));
+                gpt_reg->GTCCR[0] = (uint32_t)(dutyA - 1.0f);
+                gpt_reg->GTCCR[2] = gpt_reg->GTCCR[0];
+            }
+
+            if (dutyB > 0.0f) {
+                dutyB = dutyB * ((float)(period));
+                gpt_reg->GTCCR[1] = (uint32_t)(dutyB - 1.0f);
+                gpt_reg->GTCCR[3] = gpt_reg->GTCCR[1];
+            }
+
+            gpt_reg->GTCNT = 0ul;        // clear counter
+            gpt_reg->GTCR_b.CST = 1;     // start counter
+        } else {
+            // gpt_reg->GTPR = period-1;
+            gpt_reg->GTPBR = period - 1;
+
+            if (dutyA > 0.0f) {
+                dutyA = dutyA * ((float)(period));
+                // gpt_reg->GTCCR[0] = (uint32_t)(dutyA - 1.0f);
+                gpt_reg->GTCCR[2] = (uint32_t)(dutyA - 1.0f);
+            }
+
+            if (dutyB > 0.0f) {
+                dutyB = dutyB * ((float)(period));
+                // gpt_reg->GTCCR[1] = (uint32_t)(dutyB - 1.0f);
+                gpt_reg->GTCCR[3] = (uint32_t)(dutyB - 1.0f);
+            }
+        }
+    } else { // stopped
+        gpt_reg->GTCR_b.TPCS = source << 1;
+        gpt_reg->GTPR = period - 1;
+        gpt_reg->GTPBR = period - 1;
+
+        if (dutyA > 0.0f) {
+            dutyA = dutyA * ((float)(period));
+            gpt_reg->GTCCR[0] = (uint32_t)(dutyA - 1.0f);
+            gpt_reg->GTCCR[2] = gpt_reg->GTCCR[0];
+        }
+
+        if (dutyB > 0.0f) {
+            dutyB = dutyB * ((float)(period));
+            gpt_reg->GTCCR[1] = (uint32_t)(dutyB - 1.0f);
+            gpt_reg->GTCCR[3] = gpt_reg->GTCCR[1];
+        }
+    }
+}
+
+float ra_gpt_timer_get_freq(uint32_t ch) {
+    return (CH_GAP || (ch >= GPT_CH_SIZE))? 0.0f : ra_gpt_freq[ch];
+}
+
+float ra_gpt_timer_tick_time(uint32_t ch) {
+    if (CH_GAP || (ch >= GPT_CH_SIZE)) {
+        return 0.0f;
+    } else {
+        float NS = 1000000000.0f;
+        if (ra_gpt_div[ch]) {
+            NS *= (float)ra_gpt_div[ch];
+        }
+        return NS / (float)(PCLK);
+    }
+}
+
+/*
+void ra_gpt_timer_set_period(uint32_t ch, uint32_t ns)
+{
+    R_GPT0_Type *gpt_reg = gpt_regs[ch];
+
+    if((!gpt_reg) || (ch >= GPT_CH_SIZE))
+        return;
+
+    if(ch <= 3)
+    {  //32bit
+    }
+    else
+    {  //16bit
+    }
+}
+*/
+
+uint32_t ra_gpt_timer_get_period(uint32_t ch) {
+    R_GPT0_Type *gpt_reg = gpt_regs[ch];
+
+    if ((!gpt_reg) || (ch >= GPT_CH_SIZE)) {
+        return 0ul;
+    } else {
+        return gpt_reg->GTPR + 1;
+    }
+}
+
+void ra_gpt_timer_set_duty(uint32_t ch, uint8_t id, uint32_t duty) {
+    R_GPT0_Type *gpt_reg = gpt_regs[ch];
+
+    if ((!gpt_reg) || (ch >= GPT_CH_SIZE)) {
+        return;
+    } else {
+        if (gpt_reg->GTCR_b.CST) {
+            gpt_reg->GTCCR[(id == 'A')? 2 : 3] = duty? duty - 1 : duty;
+        } else {
+            gpt_reg->GTCCR[(id == 'A')? 0 : 1] = duty? duty - 1 : duty;
+            if (id == 'A') {
+                gpt_reg->GTCCR[2] = gpt_reg->GTCCR[0];
+            } else {
+                gpt_reg->GTCCR[3] = gpt_reg->GTCCR[1];
+            }
+        }
+    }
+}
+
+uint32_t ra_gpt_timer_get_duty(uint32_t ch, uint8_t id) {
+    R_GPT0_Type *gpt_reg = gpt_regs[ch];
+    if ((!gpt_reg) || (ch >= GPT_CH_SIZE)) {
+        return 0ul;
+    } else
+    if (id == 'A') {
+        return (gpt_reg->GTCCR[0])? gpt_reg->GTCCR[0] + 1 : 0;
+    } else {
+        return (gpt_reg->GTCCR[1])? gpt_reg->GTCCR[1] + 1 : 0;
+    }
+}
+
+void ra_gpt_timer_init(uint32_t pwm_pin, uint32_t ch, uint8_t id, uint32_t duty, float freq) {
+    R_GPT0_Type *gpt_reg = gpt_regs[ch];
+
+    if ((!gpt_reg) || (ch >= GPT_CH_SIZE)) {
+        return;
+    }
+
+    #ifdef RA4M1
+    if (ch <= 1) {
+    #elif defined(RA4W1)
+    if (ch <= 3) {
+    #elif defined(RA6M1) || defined(RA6M2) || defined(RA6M3)
+    if (ch <= 7) {
+    #elif defined(RA6M5)
+    if (ch <= 9) {
+    #else
+    #error Choose proper clock enable BIT!
+        #endif
+        #ifdef RA6M5
+        // R_MSTP_MSTPCRE_MSTPE22_Msk - R_MSTP_MSTPCRE_MSTPE31_Msk
+        ra_mstpcre_start(1UL << (31 - ch));
+        #else
+        ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD5_Msk);
+        #endif
+    } else {
+        ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD6_Msk);
+    }
+
+    ra_gpt_timer_stop(ch);                          // Stop the timer
+    gpt_reg->GTCR_b.MD = 0;                         // Set operating mode
+    gpt_reg->GTUDDTYC_b.UD = 1;                     // Set count direction
+    gpt_reg->GTBER_b.PR = 1;                        // Set buffer operation for the period
+    ra_gpt_timer_set_freq(ch, freq);                // Set count clock & cycle
+
+    gpt_reg->GTCNT = 0;                             // Set initial value for counter
+    if (id == 'A') {
+        gpt_reg->GTIOR_b.GTIOA = 0x9;               // Set GTIOC pin function (Initial low -> Low at GTCCRA/B compare match -> High at cycle end)
+        gpt_reg->GTIOR_b.OAE = 1;                   // Enable GTIOC pin output
+        gpt_reg->GTBER_b.CCRA = 1;                  // Set buffer operation for the duty
+        gpt_reg->GTCCR[0] = duty? duty - 1 : duty;  // Set compare match value
+        gpt_reg->GTCCR[2] = gpt_reg->GTCCR[0];
+    } else {
+        gpt_reg->GTIOR_b.GTIOB = 0x9;
+        gpt_reg->GTIOR_b.OBE = 1;
+        gpt_reg->GTBER_b.CCRB = 1;
+        gpt_reg->GTCCR[1] = duty? duty - 1 : duty;
+        gpt_reg->GTCCR[3] = gpt_reg->GTCCR[1];
+    }
+
+    ra_gpt_timer_set_pin(pwm_pin);
+
+    if (gpt_reg->GTPR && gpt_reg->GTCCR[(id == 'A')? 0 : 1]) {
+        ra_gpt_timer_start(ch);
+    }
+}
+
+void ra_gpt_timer_deinit(uint32_t pwm_pin, uint32_t ch, uint8_t id) {
+    if (CH_GAP || (ch >= GPT_CH_SIZE)) {
+        return;
+    }
+    ra_gpt_timer_stop(ch);
+
+    ra_gpt_div[ch] = 0;
+    ra_gpt_freq[ch] = 0;
+
+    gpt_regs[ch]->GTPR = 0;
+    gpt_regs[ch]->GTPBR = 0;
+
+    if (id == 'A') {
+        gpt_regs[ch]->GTIOR_b.OAE = 0;
+        gpt_regs[ch]->GTCCR[0] = 0;
+        gpt_regs[ch]->GTCCR[2] = 0;
+    } else {
+        gpt_regs[ch]->GTIOR_b.OBE = 0;
+        gpt_regs[ch]->GTCCR[1] = 0;
+        gpt_regs[ch]->GTCCR[3] = 0;
+    }
+
+    #ifdef RA4M1
+    if (ch <= 1) {
+    #elif defined(RA4W1)
+    if (ch <= 3) {
+    #elif defined(RA6M1) || defined(RA6M2) || defined(RA6M3)
+    if (ch <= 7) {
+    #elif defined(RA6M5)
+    if (ch <= 9) {
+    #else
+    #error Choose proper clock enable BIT!
+        #endif
+        #ifdef RA6M5
+        ra_mstpcre_stop(1UL << (31 - ch));
+        #else
+        ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD5_Msk);
+        #endif
+    } else {
+        ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD6_Msk);
+    }
+
+    ra_gpt_timer_release_pin(pwm_pin);
+}
diff --git a/ports/renesas-ra/ra/ra_gpt.h b/ports/renesas-ra/ra/ra_gpt.h
new file mode 100644
index 0000000000000..9f88acbbf3753
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_gpt.h
@@ -0,0 +1,43 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_GPT_H_
+#define RA_RA_GPT_H_
+
+#include <stdint.h>
+
+void ra_gpt_timer_start(uint32_t ch);
+void ra_gpt_timer_stop(uint32_t ch);
+void ra_gpt_timer_set_freq(uint32_t ch, float freq);
+float ra_gpt_timer_get_freq(uint32_t ch);
+float ra_gpt_timer_tick_time(uint32_t ch);
+void ra_gpt_timer_set_period(uint32_t ch, uint32_t ns);
+uint32_t ra_gpt_timer_get_period(uint32_t ch);
+void ra_gpt_timer_set_duty(uint32_t ch, uint8_t id, uint32_t duty);
+uint32_t ra_gpt_timer_get_duty(uint32_t ch, uint8_t id);
+void ra_gpt_timer_init(uint32_t pwm_pin, uint32_t ch, uint8_t id, uint32_t duty, float freq);
+void ra_gpt_timer_deinit(uint32_t pwm_pin, uint32_t ch, uint8_t id);
+bool ra_gpt_timer_is_pwm_pin(uint32_t pin);
+
+#endif /* RA_RA_GPT_H_ */
diff --git a/ports/renesas-ra/ra/ra_i2c.c b/ports/renesas-ra/ra/ra_i2c.c
index ad1e3a74e0de3..783c0c921543b 100644
--- a/ports/renesas-ra/ra/ra_i2c.c
+++ b/ports/renesas-ra/ra/ra_i2c.c
@@ -68,7 +68,7 @@ static const ra_af_pin_t scl_pins[] = {
     { AF_I2C, 1, P100 },
     { AF_I2C, 1, P205 },
 
-    #elif defined(RA6M2)
+    #elif defined(RA6M2) || defined(RA6M3)
 
     { AF_I2C, 0, P204 },
     { AF_I2C, 0, P400 },
@@ -76,6 +76,16 @@ static const ra_af_pin_t scl_pins[] = {
     { AF_I2C, 1, P100 },
     { AF_I2C, 1, P205 },
     { AF_I2C, 2, P512 },
+
+    #elif defined(RA6M5)
+
+    { AF_I2C, 0, P400 },
+    { AF_I2C, 0, P408 },
+    { AF_I2C, 1, P205 },
+    { AF_I2C, 1, P512 },
+    { AF_I2C, 2, P410 },
+    { AF_I2C, 2, P415 },
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
@@ -103,7 +113,7 @@ static const ra_af_pin_t sda_pins[] = {
     { AF_I2C, 1, P101 },
     { AF_I2C, 1, P206 },
 
-    #elif defined(RA6M2)
+    #elif defined(RA6M2) || defined(RA6M3)
 
     { AF_I2C, 0, P401 },
     { AF_I2C, 0, P407 },
@@ -111,6 +121,15 @@ static const ra_af_pin_t sda_pins[] = {
     { AF_I2C, 1, P206 },
     { AF_I2C, 2, P511 },
 
+    #elif defined(RA6M5)
+
+    { AF_I2C, 0, P401 },
+    { AF_I2C, 0, P407 },
+    { AF_I2C, 1, P206 },
+    { AF_I2C, 1, P511 },
+    { AF_I2C, 2, P409 },
+    { AF_I2C, 2, P414 },
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
@@ -305,11 +324,16 @@ static void ra_i2c_clock_calc(uint32_t baudrate, uint8_t *cks, uint8_t *brh, uin
         *cks = 1;
         *brh = 9;
         *brl = 20;
-    } else {
+    } else if (baudrate >= 100000) {
         // assume clock is 100000Hz (PCLKB 32MHz)
         *cks = 3;
         *brh = 15;
         *brl = 18;
+    } else {
+        // assume clock is 50000Hz (PCLKB 32MHz)
+        *cks = 4;
+        *brh = 15;
+        *brl = 18;
     }
     #elif defined(RA6M1)
     // PCLKB 60MHz SCLE=0
@@ -328,7 +352,7 @@ static void ra_i2c_clock_calc(uint32_t baudrate, uint8_t *cks, uint8_t *brh, uin
         *brh = 14;
         *brl = 17;
     }
-    #elif defined(RA6M2)
+    #elif defined(RA6M2) || defined(RA6M3)
     // PCLKB 60MHz SCLE=0
     if (baudrate >= RA_I2C_CLOCK_MAX) {
         *cks = 0;
@@ -339,11 +363,38 @@ static void ra_i2c_clock_calc(uint32_t baudrate, uint8_t *cks, uint8_t *brh, uin
         *cks = 2;
         *brh = 8;
         *brl = 19;
-    } else {
+    } else if (baudrate >= 100000) {
         // assume clock is 100000Hz
         *cks = 4;
         *brh = 14;
         *brl = 17;
+    } else {
+        // assume clock is 50000Hz
+        *cks = 5;
+        *brh = 14;
+        *brl = 17;
+    }
+    #elif defined(RA6M5)
+    // PCLKB 50MHz SCLE=0
+    if (baudrate >= RA_I2C_CLOCK_MAX) {
+        *cks = 0;
+        *brh = 12;
+        *brl = 24;
+    } else if (baudrate >= 400000) {
+        // assume clock is 400000Hz
+        *cks = 2;
+        *brh = 7;
+        *brl = 15;
+    } else if (baudrate >= 100000) {
+        // assume clock is 100000Hz
+        *cks = 3;
+        *brh = 24;
+        *brl = 30;
+    } else {
+        // assume clock is 50000Hz
+        *cks = 4;
+        *brh = 24;
+        *brl = 30;
     }
     #else
     #error "CMSIS MCU Series is not specified."
@@ -458,7 +509,9 @@ static void ra_i2c_iceri_isr(R_IIC0_Type *i2c_inst) {
     }
     // Check Start
     if (i2c_inst->ICSR2_b.START != 0) {
-        action->m_status = RA_I2C_STATUS_Started;
+        if (action->m_status == RA_I2C_STATUS_Idle) {
+            action->m_status = RA_I2C_STATUS_Started;
+        }
         i2c_inst->ICSR2_b.START = 0;
     }
     // Check Stop
@@ -504,8 +557,8 @@ static void ra_i2c_icrxi_isr(R_IIC0_Type *i2c_inst) {
 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) {
+    // When STIE is already checked.        When TIE occurs before STIE
+    if (action->m_status == RA_I2C_STATUS_Started || action->m_status == RA_I2C_STATUS_Idle) {
         i2c_inst->ICDRT = action->m_address;  // I2C send slave address
         action->m_status = RA_I2C_STATUS_AddrWriteCompleted;
         return;
diff --git a/ports/renesas-ra/ra/ra_i2c.h b/ports/renesas-ra/ra/ra_i2c.h
index 93a170ab8a678..e2432675a001e 100644
--- a/ports/renesas-ra/ra/ra_i2c.h
+++ b/ports/renesas-ra/ra/ra_i2c.h
@@ -28,6 +28,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#ifdef RA6M5
+// #define R_IIC2_BASE            0x4009F200
+#ifndef R_IIC2
+#define R_IIC2             ((R_IIC0_Type *)0x4009F200)
+#endif
+#endif
+
 #define RA_I2C_DEF_TIMEOUT              1000    // 1000 ms
 #define RA_I2C_TIMEOUT_STOP_CONDITION   100000  // counts
 #define RA_I2C_TIMEOUT_BUS_BUSY         100000  // counts
diff --git a/ports/renesas-ra/ra/ra_icu.c b/ports/renesas-ra/ra/ra_icu.c
index 000667b4c6732..caac8bfe221e2 100644
--- a/ports/renesas-ra/ra/ra_icu.c
+++ b/ports/renesas-ra/ra/ra_icu.c
@@ -345,6 +345,180 @@ static const ra_icu_pin_t ra_irq_pins[] = {
     { 15, P511 },
     #endif
 
+    #elif defined(RA6M3)
+
+    #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 },
+    { 7, P706 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    { 8, P002 }, /* DS */
+    { 8, P305 },
+    { 8, P415 },
+    { 8, P707 },
+    #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 },
+    { 14, P010 }, /* DS */
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    { 15, P506 },
+    { 15, P511 },
+    #endif
+
+    #elif defined(RA6M5)
+
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    { 0, P105 },
+    { 0, P206 }, /* DS */
+    { 0, P400 },
+    { 0, P806 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    { 1, P101 },
+    { 1, P104 },
+    { 1, P205 }, /* DS */
+    { 1, P804 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    { 2, P100 },
+    { 2, P203 }, /* DS */
+    { 2, P213 },
+    { 2, P803 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    { 3, P110 },
+    { 3, P202 }, /* DS */
+    { 3, P212 },
+    { 3, P802 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    { 4, P111 },
+    { 4, P402 }, /* DS */
+    { 4, P411 },
+    { 4, PA10 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    { 5, P302 },
+    { 5, P401 }, /* DS */
+    { 5, P410 },
+    { 5, PA09 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    { 6, P000 }, /* DS */
+    { 6, P301 },
+    { 6, P409 },
+    { 6, PA08 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    { 7, P001 }, /* DS */
+    { 7, P408 },
+    { 7, P706 },
+    { 7, P615 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    { 8, P002 }, /* DS */
+    { 8, P305 },
+    { 8, P415 },
+    { 8, P707 },
+    { 8, P905 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    { 9, P004 }, /*  DS */
+    { 9, P304 },
+    { 9, P414 },
+    { 9, P906 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    { 10, P005 }, /* DS */
+    { 10, P709 },
+    { 10, P907 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    { 11, P006 }, /* DS */
+    { 11, P501 },
+    { 11, P708 },
+    { 11, P908 },
+    #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, P010 },
+    { 14, P403 }, /* DS */
+    { 14, P505 },
+    { 14, P512 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    { 15, P404 }, /* DS */
+    { 15, P506 },
+    { 15, P511 },
+    #endif
+
     #else
     #error "CMSIS MCU Series is not speficied."
     #endif
diff --git a/ports/renesas-ra/ra/ra_int.h b/ports/renesas-ra/ra/ra_int.h
index cd12908bcd75a..1b92db99ccc67 100644
--- a/ports/renesas-ra/ra/ra_int.h
+++ b/ports/renesas-ra/ra/ra_int.h
@@ -29,7 +29,7 @@
 
 #if defined(RA4M1) | defined(RA4W1)
 #define IRQ_MAX 48
-#elif defined(RA6M1) | defined(RA6M2)
+#elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3) | defined(RA6M5)
 #define IRQ_MAX 128
 #else
 #error "CMSIS MCU Series is not specified."
diff --git a/ports/renesas-ra/ra/ra_rtc.c b/ports/renesas-ra/ra/ra_rtc.c
index f108de568d1b8..e23a4d42d2f06 100644
--- a/ports/renesas-ra/ra/ra_rtc.c
+++ b/ports/renesas-ra/ra/ra_rtc.c
@@ -34,7 +34,7 @@
 #include "hal_data.h"
 #include "ra_rtc.h"
 
-static R_RTC_Type *rtc_reg = (R_RTC_Type *)0x40044000;
+static R_RTC_Type *rtc_reg = R_RTC;
 static R_SYSTEM_Type *system_reg = (R_SYSTEM_Type *)0x4001E000;
 
 #if defined(VECTOR_NUMBER_RTC_ALARM)
diff --git a/ports/renesas-ra/ra/ra_sci.c b/ports/renesas-ra/ra/ra_sci.c
index 5d1406724868c..81f3ff9675b5e 100644
--- a/ports/renesas-ra/ra/ra_sci.c
+++ b/ports/renesas-ra/ra/ra_sci.c
@@ -265,34 +265,34 @@ static uint32_t ch_to_idx[SCI_CH_MAX] = {
 
 static R_SCI0_Type *sci_regs[] = {
     #if defined(VECTOR_NUMBER_SCI0_RXI)
-    (R_SCI0_Type *)0x40070000,
+    R_SCI0,
     #endif
     #if defined(VECTOR_NUMBER_SCI1_RXI)
-    (R_SCI0_Type *)0x40070020,
+    R_SCI1,
     #endif
     #if defined(VECTOR_NUMBER_SCI2_RXI)
-    (R_SCI0_Type *)0x40070040,
+    R_SCI2,
     #endif
     #if defined(VECTOR_NUMBER_SCI3_RXI)
-    (R_SCI0_Type *)0x40070060,
+    R_SCI3,
     #endif
     #if defined(VECTOR_NUMBER_SCI4_RXI)
-    (R_SCI0_Type *)0x40070080,
+    R_SCI4,
     #endif
     #if defined(VECTOR_NUMBER_SCI5_RXI)
-    (R_SCI0_Type *)0x400700a0,
+    R_SCI5,
     #endif
     #if defined(VECTOR_NUMBER_SCI6_RXI)
-    (R_SCI0_Type *)0x400700c0,
+    R_SCI6,
     #endif
     #if defined(VECTOR_NUMBER_SCI7_RXI)
-    (R_SCI0_Type *)0x400700e0,
+    R_SCI7,
     #endif
     #if defined(VECTOR_NUMBER_SCI8_RXI)
-    (R_SCI0_Type *)0x40070100,
+    R_SCI8,
     #endif
     #if defined(VECTOR_NUMBER_SCI9_RXI)
-    (R_SCI0_Type *)0x40070120,
+    R_SCI9,
     #endif
 };
 
@@ -408,6 +408,77 @@ static const ra_af_pin_t ra_sci_tx_pins[] = {
     { AF_SCI2, 9, P203 },
     { AF_SCI2, 9, P602 },
 
+    #elif defined(RA6M3)
+
+    { AF_SCI1, 0, P101 },
+    { AF_SCI1, 0, P411 },
+
+    { AF_SCI2, 1, P213 },
+    { AF_SCI2, 1, P709 },
+
+    { AF_SCI1, 2, P112 },
+    { AF_SCI1, 2, P302 },
+
+    { AF_SCI2, 3, P310 },
+    { AF_SCI2, 3, P409 },
+    { AF_SCI2, 3, P707 },
+
+    { AF_SCI1, 4, P205 },
+    { AF_SCI1, 4, P512 },
+    { AF_SCI1, 4, P900 },
+
+    { AF_SCI2, 5, P501 },
+    { AF_SCI2, 5, P805 },
+
+    { AF_SCI1, 6, P305 },
+    { AF_SCI1, 6, P506 },
+
+    { AF_SCI2, 7, P401 },
+    { AF_SCI2, 7, P613 },
+
+    { AF_SCI1, 8, P105 },
+    { AF_SCI1, 8, PA00 },
+
+    { AF_SCI2, 9, P109 },
+    { AF_SCI2, 9, P203 },
+    { AF_SCI2, 9, P602 },
+
+    #elif defined(RA6M5)
+
+    { AF_SCI1, 0, P101 },
+    { AF_SCI1, 0, P411 },
+
+    { AF_SCI2, 1, P213 },
+    { AF_SCI2, 1, P709 },
+
+    { AF_SCI1, 2, P112 },
+    { AF_SCI1, 2, P302 },
+
+    { AF_SCI2, 3, P310 },
+    { AF_SCI2, 3, P409 },
+    { AF_SCI2, 3, P707 },
+
+    { AF_SCI1, 4, P205 },
+    { AF_SCI1, 4, P207 },
+    { AF_SCI1, 4, P512 },
+    { AF_SCI1, 4, P900 },
+
+    { AF_SCI2, 5, P501 },
+    { AF_SCI2, 5, P805 },
+
+    { AF_SCI1, 6, P305 },
+    { AF_SCI1, 6, P506 },
+
+    { AF_SCI2, 7, P401 },
+    { AF_SCI2, 7, P613 },
+
+    { AF_SCI1, 8, P105 },
+    { AF_SCI1, 8, PA00 },
+
+    { AF_SCI2, 9, P109 },
+    { AF_SCI2, 9, P203 },
+    { AF_SCI2, 9, P602 },
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
@@ -496,6 +567,41 @@ static const ra_af_pin_t ra_sci_rx_pins[] = {
     { AF_SCI2, 9, P202 },
     { AF_SCI2, 9, P601 },
 
+    #elif defined(RA6M3) || defined(RA6M5)
+
+    { 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, P309 },
+    { AF_SCI2, 3, P408 },
+    { AF_SCI2, 3, P706 },
+
+    { AF_SCI1, 4, P206 },
+    { AF_SCI1, 4, P315 },
+    { AF_SCI1, 4, P511 },
+
+    { AF_SCI2, 5, P502 },
+    { AF_SCI2, 5, P513 },
+
+    { AF_SCI1, 6, P304 },
+    { AF_SCI1, 6, P505 },
+
+    { AF_SCI2, 7, P402 },
+    { AF_SCI2, 7, P614 },
+
+    { AF_SCI1, 8, P104 },
+    { AF_SCI1, 8, P607 },
+
+    { AF_SCI2, 9, P110 },
+    { AF_SCI2, 9, P202 },
+    { AF_SCI2, 9, P601 },
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
@@ -584,6 +690,93 @@ static const ra_af_pin_t ra_sci_cts_pins[] = {
     { AF_SCI2, 9, P301 },
     { AF_SCI2, 9, P603 },
 
+    #elif defined(RA6M3)
+
+    { 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_SCI2, 3, PB01 },
+
+    { AF_SCI1, 4, P401 },
+    { AF_SCI1, 4, P407 },
+
+    { AF_SCI2, 5, P504 },
+    { AF_SCI2, 5, P507 },
+
+    { AF_SCI1, 6, P307 },
+    { AF_SCI1, 6, P503 },
+
+    { AF_SCI2, 7, P403 },
+    { AF_SCI2, 7, P611 },
+
+    { AF_SCI1, 8, P107 },
+    { AF_SCI1, 8, P606 },
+
+    { AF_SCI2, 9, P108 },
+    { AF_SCI2, 9, P205 },
+    { AF_SCI2, 9, P301 },
+    { AF_SCI2, 9, P603 },
+
+    #elif defined(RA6M5)
+
+    { AF_SCI1, 0, P103 },
+    { AF_SCI1, 0, P413 },
+    { AF_SCI1, 0, P414 }, /* CTS only */
+    { AF_SCI1, 0, P800 }, /* CTS only */
+
+    { AF_SCI2, 1, P101 },
+    { AF_SCI2, 1, P711 },
+
+    { AF_SCI1, 2, P110 },
+    { AF_SCI1, 2, P203 },
+
+    { AF_SCI2, 3, P308 }, /* CTS only */
+    { AF_SCI2, 3, P312 },
+    { AF_SCI2, 3, P411 },
+    { AF_SCI2, 3, P412 }, /* CTS only */
+    { AF_SCI2, 3, P705 }, /* CTS only */
+
+    { AF_SCI1, 4, P401 },
+    { AF_SCI1, 4, P402 }, /* CTS only */
+    { AF_SCI1, 4, P407 },
+    { AF_SCI1, 4, P408 }, /* CTS only */
+
+    { AF_SCI2, 5, P500 }, /* CTS only */
+    { AF_SCI2, 5, P504 },
+    { AF_SCI2, 5, P508 },
+
+    { AF_SCI1, 6, P307 },
+    { AF_SCI1, 6, P308 }, /* CTS only */
+    { AF_SCI1, 6, P502 }, /* CTS only */
+    { AF_SCI1, 6, P503 },
+
+    { AF_SCI2, 7, P403 },
+    { AF_SCI2, 7, P404 }, /* CTS only */
+    { AF_SCI2, 7, P610 }, /* CTS only */
+    { AF_SCI2, 7, P611 },
+
+    { AF_SCI1, 8, P107 },
+    { AF_SCI1, 8, P605 }, /* CTS only */
+    { AF_SCI1, 8, P606 },
+    { AF_SCI1, 8, P801 }, /* CTS only */
+
+    { AF_SCI2, 9, P108 },
+    { AF_SCI2, 9, P114 }, /* CTS only */
+    { AF_SCI2, 9, P205 },
+    { AF_SCI2, 9, P206 }, /* CTS only */
+    { AF_SCI2, 9, P301 },
+    { AF_SCI2, 9, P303 }, /* CTS only */
+    { AF_SCI2, 9, P603 },
+    { AF_SCI2, 9, P604 }, /* CTS only */
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
diff --git a/ports/renesas-ra/ra/ra_spi.c b/ports/renesas-ra/ra/ra_spi.c
index 096519ffd6402..b0bb01bfb9172 100644
--- a/ports/renesas-ra/ra/ra_spi.c
+++ b/ports/renesas-ra/ra/ra_spi.c
@@ -38,8 +38,8 @@
 #endif
 
 static R_SPI0_Type *spi_regs[] = {
-    (R_SPI0_Type *)0x40072000,
-    (R_SPI0_Type *)0x40072100,
+    R_SPI0,
+    R_SPI1,
 };
 
 static const ra_af_pin_t mosi_pins[] = {
@@ -61,7 +61,7 @@ static const ra_af_pin_t mosi_pins[] = {
     { AF_SPI, 0, P411 }, /* MOSIA_B */
     { AF_SPI, 1, P109 }, /* MOSIB_B */
 
-    #elif defined(RA6M2)
+    #elif defined(RA6M2) || defined(RA6M3)
 
     { AF_SPI, 0, P101 }, /* MOSIA_A */
     { AF_SPI, 0, P411 }, /* MOSIA_B */
@@ -69,6 +69,14 @@ static const ra_af_pin_t mosi_pins[] = {
     { AF_SPI, 1, P203 }, /* MOSIB_A */
     { AF_SPI, 1, P701 }, /* MOSIB_C */
 
+    #elif defined(RA6M5)
+
+    { AF_SPI, 0, P109 }, /* MOSIA_B */
+    { AF_SPI, 0, P203 }, /* MOSIA_A */
+    { AF_SPI, 0, P701 }, /* MOSIA_C */
+    { AF_SPI, 1, P101 }, /* MOSIB_A */
+    { AF_SPI, 1, P411 }, /* MOSIB_B */
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
@@ -94,7 +102,7 @@ static const ra_af_pin_t miso_pins[] = {
     { AF_SPI, 0, P410 }, /* MISOA_B */
     { AF_SPI, 1, P110 }, /* MISOB_B */
 
-    #elif defined(RA6M2)
+    #elif defined(RA6M2) || defined(RA6M3)
 
     { AF_SPI, 0, P100 }, /* MISOA_A */
     { AF_SPI, 0, P410 }, /* MISOA_B */
@@ -102,6 +110,14 @@ static const ra_af_pin_t miso_pins[] = {
     { AF_SPI, 1, P202 }, /* MISOB_A */
     { AF_SPI, 1, P700 }, /* MISOB_C */
 
+    #elif defined(RA6M5)
+
+    { AF_SPI, 0, P110 }, /* MISOA_B */
+    { AF_SPI, 0, P202 }, /* MISOA_A */
+    { AF_SPI, 0, P700 }, /* MISOA_C */
+    { AF_SPI, 1, P100 }, /* MISOB_A */
+    { AF_SPI, 1, P410 }, /* MISOB_B */
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
@@ -127,7 +143,7 @@ static const ra_af_pin_t sck_pins[] = {
     { AF_SPI, 0, P412 }, /* RSPCKA_B */
     { AF_SPI, 1, P111 }, /* RSPCKB_B */
 
-    #elif defined(RA6M2)
+    #elif defined(RA6M2) || defined(RA6M3)
 
     { AF_SPI, 0, P102 }, /* RSPCKA_A */
     { AF_SPI, 0, P412 }, /* RSPCKA_B */
@@ -135,12 +151,144 @@ static const ra_af_pin_t sck_pins[] = {
     { AF_SPI, 1, P204 }, /* RSPCKB_A */
     { AF_SPI, 1, P702 }, /* RSPCKB_C */
 
+    #elif defined(RA6M5)
+
+    { AF_SPI, 0, P111 }, /* RSPCKA_B */
+    { AF_SPI, 0, P204 }, /* RSPCKA_A */
+    { AF_SPI, 0, P702 }, /* RSPCKA_C */
+    { AF_SPI, 1, P102 }, /* RSPCKB_A */
+    { AF_SPI, 1, P412 }, /* RSPCKB_B */
+
     #else
     #error "CMSIS MCU Series is not specified."
     #endif
 };
 #define SCK_PINS_SIZE sizeof(sck_pins) / sizeof(ra_af_pin_t)
 
+typedef struct ra_ssl_pin {
+    uint8_t ssln;
+    uint32_t pin;
+} ra_ssl_pin_t;
+
+static const ra_ssl_pin_t ssl_pins[] = {
+    #if defined(RA4M1)
+
+    { 0, P103 }, /* SSLA0 */
+    { 1, P104 }, /* SSLA1 */
+    { 2, P105 }, /* SSLA2 */
+    { 3, P106 }, /* SSLA3 */
+    { 0, P108 }, /* SSLB0 */
+    { 0, P112 }, /* SSLB0 */
+
+    { 0, P205 }, /* SSLB0 */
+    { 1, P206 }, /* SSLB1 */
+
+    { 1, P300 }, /* SSLB1 */
+    { 2, P301 }, /* SSLB2 */
+    { 3, P302 }, /* SSLB3 */
+
+    { 3, P407 }, /* SSLB3 */
+    { 0, P413 }, /* SSLA0 */
+    { 1, P414 }, /* SSLA1 */
+    { 2, P415 }, /* SSLA2 */
+
+    #elif defined(RA4W1)
+
+    { 0, P103 }, /* SSLA0 */
+    { 1, P104 }, /* SSLA1 */
+    { 2, P105 }, /* SSLA2 */
+    { 3, P106 }, /* SSLA3 */
+    { 0, P108 }, /* SSLB0 */
+
+    { 0, P205 }, /* SSLB0 */
+    { 1, P206 }, /* SSLB1 */
+
+    { 1, P300 }, /* SSLB1 */
+
+    { 3, P407 }, /* SSLB3 */
+    { 1, P414 }, /* SSLA1 */
+
+    #elif defined(RA6M1)
+
+    { 0, P103 }, /* SSLA0_A */
+    { 1, P104 }, /* SSLA1_A */
+    { 2, P105 }, /* SSLA2_A */
+    { 3, P106 }, /* SSLA3_A */
+    { 0, P108 }, /* SSLB0_B */
+    { 0, P112 }, /* SSLB0_B */
+
+    { 1, P300 }, /* SSLB1_B */
+    { 2, P301 }, /* SSLB2_B */
+    { 3, P302 }, /* SSLB3_B */
+
+    { 0, P413 }, /* SSLA0_B */
+    { 1, P414 }, /* SSLA1_B */
+    { 2, P415 }, /* SSLA2_B */
+
+    { 3, P708 }, /* SSLA3_B */
+
+    #elif defined(RA6M2) || defined(RA6M3)
+
+    { 0, P103 }, /* SSLA0_A */
+    { 1, P104 }, /* SSLA1_A */
+    { 2, P105 }, /* SSLA2_A */
+    { 3, P106 }, /* SSLA3_A */
+    { 0, P108 }, /* SSLB0_B */
+    { 0, P112 }, /* SSLB0_B */
+
+    { 0, P205 }, /* SSLB0_A */
+    { 1, P206 }, /* SSLB1_A */
+    { 2, P207 }, /* SSLB2_A */
+
+    { 1, P300 }, /* SSLB1_B */
+    { 2, P301 }, /* SSLB2_B */
+    { 3, P302 }, /* SSLB3_B */
+
+    { 3, P406 }, /* SSLB3_C */
+    { 3, P407 }, /* SSLB3_A */
+    { 0, P413 }, /* SSLA0_B */
+    { 1, P414 }, /* SSLA1_B */
+    { 2, P415 }, /* SSLA2_B */
+
+    { 0, P703 }, /* SSLB0_C */
+    { 1, P704 }, /* SSLB1_C */
+    { 2, P705 }, /* SSLB2_C */
+    { 3, P708 }, /* SSLA3_B */
+
+    #elif defined(RA6M5)
+
+    { 0, P103 }, /* SSLB0_A */
+    { 1, P104 }, /* SSLB1_A */
+    { 2, P105 }, /* SSLB2_A */
+    { 3, P106 }, /* SSLB3_A */
+    { 0, P108 }, /* SSLA0_B */
+    { 0, P112 }, /* SSLA0_B */
+
+    { 0, P205 }, /* SSLA0_A */
+    { 1, P206 }, /* SSLA1_A */
+    { 2, P207 }, /* SSLA2_A */
+
+    { 1, P300 }, /* SSLA1_B */
+    { 2, P301 }, /* SSLA2_B */
+    { 3, P302 }, /* SSLA3_B */
+
+    { 3, P406 }, /* SSLA3_C */
+    { 3, P407 }, /* SSLA3_A */
+    { 0, P413 }, /* SSLB0_B */
+    { 1, P414 }, /* SSLB1_B */
+    { 2, P415 }, /* SSLB2_B */
+
+    { 0, P703 }, /* SSLA0_C */
+    { 1, P704 }, /* SSLA1_C */
+    { 2, P705 }, /* SSLA2_C */
+    { 3, P708 }, /* SSLB3_B */
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define SSL_PINS_SIZE sizeof(ssl_pins) / sizeof(ra_ssl_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;
@@ -178,6 +326,25 @@ bool ra_spi_find_af_ch(uint32_t mosi, uint32_t miso, uint32_t sck, uint8_t *ch)
     return find;
 }
 
+static bool ra_spi_pin_to_ssln(uint32_t pin, uint8_t *ssln) {
+    ra_ssl_pin_t *ssl_pin = (ra_ssl_pin_t *)&ssl_pins;
+    bool find = false;
+    uint32_t i;
+    for (i = 0; i < SSL_PINS_SIZE; i++) {
+        if (ssl_pin->pin == pin) {
+            find = true;
+            if (find) {
+                *ssln = ssl_pin->ssln;
+            } else {
+                *ssln = 0;
+            }
+            break;
+        }
+        ssl_pin++;
+    }
+    return find;
+}
+
 static void ra_spi_module_start(uint32_t ch) {
     if (ch == 0) {
         ra_mstpcrb_start(R_MSTP_MSTPCRB_MSTPB19_Msk);
@@ -202,7 +369,7 @@ static void ra_spi_set_pin(uint32_t pin, bool miso) {
     }
 }
 
-void ra_spi_set_bits(uint32_t ch, uint32_t bits) {
+static 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;
@@ -219,17 +386,7 @@ void ra_spi_set_bits(uint32_t ch, uint32_t bits) {
     }
 }
 
-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) {
+static 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
@@ -238,7 +395,7 @@ 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) {
+static 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)
@@ -254,18 +411,6 @@ void ra_spi_set_mode(uint32_t ch, uint32_t polarity, uint32_t phase) {
     }
 }
 
-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) {
@@ -280,7 +425,6 @@ uint8_t ra_spi_write_byte(uint32_t ch, uint8_t b) {
 
 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) {
             ;
@@ -295,7 +439,6 @@ void ra_spi_write_bytes8(uint32_t ch, uint8_t *buf, uint32_t count) {
 
 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) {
             ;
@@ -310,7 +453,6 @@ void ra_spi_read_bytes8(uint32_t ch, uint8_t *buf, uint32_t count) {
 
 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) {
             ;
@@ -325,7 +467,6 @@ 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) {
     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) {
             ;
@@ -350,7 +491,6 @@ 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) {
     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) {
             ;
@@ -359,13 +499,16 @@ void ra_spi_transfer8(uint32_t ch, uint8_t *dst, uint8_t *src, uint32_t count) {
         while (spi_reg->SPSR_b.SPRF == 0) {
             ;
         }
-        *dst++ = (uint8_t)(spi_reg->SPDR_BY);
+        if (dst) {
+            *dst++ = (uint8_t)(spi_reg->SPDR_BY);
+        } else {
+            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) {
             ;
@@ -374,13 +517,16 @@ void ra_spi_transfer16(uint32_t ch, uint16_t *dst, uint16_t *src, uint32_t count
         while (spi_reg->SPSR_b.SPRF == 0) {
             ;
         }
-        *dst++ = (uint16_t)(spi_reg->SPDR_HA);
+        if (dst) {
+            *dst++ = (uint16_t)(spi_reg->SPDR_HA);
+        } else {
+            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) {
             ;
@@ -389,7 +535,11 @@ void ra_spi_transfer32(uint32_t ch, uint32_t *dst, uint32_t *src, uint32_t count
         while (spi_reg->SPSR_b.SPRF == 0) {
             ;
         }
-        *dst++ = (uint32_t)(spi_reg->SPDR);
+        if (dst) {
+            *dst++ = (uint32_t)(spi_reg->SPDR);
+        } else {
+            spi_reg->SPDR;
+        }
     }
 }
 
@@ -421,18 +571,53 @@ void ra_spi_get_conf(uint32_t ch, uint16_t *spcmd, uint8_t *spbr) {
     *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);
+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, uint32_t firstbit) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    uint8_t ssln = 0;
+    uint8_t sslp = 0;
+
+    ra_spi_pin_to_ssln(cs, &ssln);
+    sslp &= ~0x0fU;
+    sslp |= (uint8_t)polarity << ssln;
+
     ra_spi_module_start(ch);
+
+    spi_reg->SPSR;              // dummy read to clear OVRF
+    spi_reg->SPSR = 0xa0;       // clear all status
+
+    spi_reg->SPCR = 0x00;       // disable SPI
+    spi_reg->SSLP = sslp;       // select slave active polarity
+    spi_reg->SPPCR = 0x00;      // fixed idle value, disable loop-back mode
+    spi_reg->SPBR = (PCLK / 2 / baud) - 1;      // Set baudrate
+    spi_reg->SPDCR = 0x40;      // SPBYT=1, SPLW=0 byte access
+    spi_reg->SPCKD = 0x00;      // 1RSPCK
+    spi_reg->SPDCR = 0x00;      // 1RSPCK
+    spi_reg->SPND = 0x00;       // 1RSPCK + 2PCLKA
+    spi_reg->SPCR2 = 0x10;      // SCKASE=1
+    spi_reg->SPSCR = 0x00;      // Disable sequence control
+    spi_reg->SPCMD[0] = (0xe700 | (ssln << 4));  // LSBF=0, SPB=7, SSLA:ssln, BRDV=0, CPOL=0, CPHA=0
+    spi_reg->SPDCR2 = 0x00;     // BYSW=0, SINV=0(RA6M5)
+
+    /* set other setting */
+    ra_spi_set_mode(ch, polarity, phase);
+    ra_spi_set_bits(ch, bits);
+    ra_spi_set_lsb_first(ch, firstbit);
+
+    /* NIVC, DMAC setting */
+
+    /* I/O port setting */
     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
+    ra_spi_set_pin(cs, false);
+
+    #if defined(RA6M5)
+    spi_reg->SPCR3 = 0x00;      // default
+    #endif
+
+    spi_reg->SPCR = 0x48;       // Start SPI in master mode
+    spi_reg->SPCR;              // wait for completion
+
     return;
 }
 
diff --git a/ports/renesas-ra/ra/ra_spi.h b/ports/renesas-ra/ra/ra_spi.h
index e75acf8701bb9..c33120a863d28 100644
--- a/ports/renesas-ra/ra/ra_spi.h
+++ b/ports/renesas-ra/ra/ra_spi.h
@@ -34,16 +34,6 @@
 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);
@@ -57,7 +47,7 @@ void ra_spi_transfer(uint32_t ch, uint32_t bits, uint8_t *dst, uint8_t *src, uin
 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_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, uint32_t firstbit);
 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
index 9c2a3c010e045..fc01862706786 100644
--- a/ports/renesas-ra/ra/ra_timer.c
+++ b/ports/renesas-ra/ra/ra_timer.c
@@ -43,8 +43,8 @@ enum AGT_SOURCE {
 };
 
 static R_AGTX0_AGT16_Type *agt_regs[AGT_CH_SIZE] = {
-    (R_AGTX0_AGT16_Type *)0x40084000,
-    (R_AGTX0_AGT16_Type *)0x40084100
+    (R_AGTX0_AGT16_Type *)R_AGTX0,
+    (R_AGTX0_AGT16_Type *)R_AGTX1
 };
 
 static uint8_t ch_to_irq[AGT_CH_SIZE] = {
diff --git a/ports/renesas-ra/ra/ra_utils.c b/ports/renesas-ra/ra/ra_utils.c
index ae91427eec2b8..db59c1bb6fc4c 100644
--- a/ports/renesas-ra/ra/ra_utils.c
+++ b/ports/renesas-ra/ra/ra_utils.c
@@ -27,7 +27,7 @@
 #include "ra_utils.h"
 
 static R_SYSTEM_Type *system_reg = (R_SYSTEM_Type *)0x4001E000;
-static R_MSTP_Type *mstp_reg = (R_MSTP_Type *)R_MSTP;
+static R_MSTP_Type *mstp_reg = R_MSTP;
 
 void ra_mstpcra_stop(uint32_t mod_mask) {
     system_reg->PRCR = 0xa502;
@@ -77,6 +77,18 @@ void ra_mstpcrd_start(uint32_t mod_mask) {
     system_reg->PRCR = 0xa500;
 }
 
+void ra_mstpcre_stop(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRE |= mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcre_start(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRE &= ~mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
 __WEAK void ctsu_write_isr(void) {
     // dummy
 }
diff --git a/ports/renesas-ra/ra/ra_utils.h b/ports/renesas-ra/ra/ra_utils.h
index 3ff0f3a3718e9..3f954dee726da 100644
--- a/ports/renesas-ra/ra/ra_utils.h
+++ b/ports/renesas-ra/ra/ra_utils.h
@@ -52,6 +52,8 @@ 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);
+void ra_mstpcre_stop(uint32_t mod_mask);
+void ra_mstpcre_start(uint32_t mod_mask);
 
 /* mask bit definition for Module Stop Control Register B */
 #ifndef R_MSTP_MSTPCRB_MSTPB7_Msk
diff --git a/ports/renesas-ra/spi.h b/ports/renesas-ra/spi.h
index 47d9c13567e36..04be9f9b64e2b 100644
--- a/ports/renesas-ra/spi.h
+++ b/ports/renesas-ra/spi.h
@@ -34,11 +34,8 @@
 #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

From 761d86ae56d6b64f792df3a770167bfa05f3d0db Mon Sep 17 00:00:00 2001
From: mbedNoobNinja <novoltage@gmail.com>
Date: Thu, 2 Mar 2023 18:08:31 +0200
Subject: [PATCH 0098/3129] renesas-ra/boards/VK_RA6M5: Add new board
 definition.

Signed-off-by: mbedNoobNinja <novoltage@gmail.com>
---
 ports/renesas-ra/boards/VK_RA6M5/README.md    |   2 +
 ports/renesas-ra/boards/VK_RA6M5/board.json   |  23 +
 .../boards/VK_RA6M5/mpconfigboard.h           |  86 ++
 .../boards/VK_RA6M5/mpconfigboard.mk          |  12 +
 ports/renesas-ra/boards/VK_RA6M5/pins.csv     | 166 ++++
 .../VK_RA6M5/ra_cfg/driver/r_qspi_cfg.h       |  14 +
 .../VK_RA6M5/ra_cfg/fsp_cfg/bsp/board_cfg.h   |  13 +
 .../VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_cfg.h     |  62 ++
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |   5 +
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h       |  11 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h   | 386 +++++++++
 .../VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h |  42 +
 .../boards/VK_RA6M5/ra_gen/bsp_clock_cfg.h    |  35 +
 .../boards/VK_RA6M5/ra_gen/common_data.c      |  70 ++
 .../boards/VK_RA6M5/ra_gen/common_data.h      |  48 ++
 .../boards/VK_RA6M5/ra_gen/hal_data.c         | 774 ++++++++++++++++++
 .../boards/VK_RA6M5/ra_gen/hal_data.h         | 205 +++++
 .../boards/VK_RA6M5/ra_gen/pin_data.c         | 227 +++++
 .../boards/VK_RA6M5/ra_gen/vector_data.c      |  73 ++
 .../boards/VK_RA6M5/ra_gen/vector_data.h      |  98 +++
 ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5.ld  | 308 +++++++
 .../boards/VK_RA6M5/vk_ra6m5_conf.h           |  30 +
 22 files changed, 2690 insertions(+)
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/README.md
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/board.json
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/mpconfigboard.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/mpconfigboard.mk
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/pins.csv
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_cfg/driver/r_qspi_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/board_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/bsp_clock_cfg.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/common_data.c
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/common_data.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/hal_data.c
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/hal_data.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/pin_data.c
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.c
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.h
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5.ld
 create mode 100644 ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5_conf.h

diff --git a/ports/renesas-ra/boards/VK_RA6M5/README.md b/ports/renesas-ra/boards/VK_RA6M5/README.md
new file mode 100644
index 0000000000000..a743a0bbe0fb3
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/README.md
@@ -0,0 +1,2 @@
+In case you need to debug something in `VK_RA6M5` board, make sure the contents of
+[project repo](https://github.com/Vekatech/VK_RA6M5) is cloned in to **this** directory.
diff --git a/ports/renesas-ra/boards/VK_RA6M5/board.json b/ports/renesas-ra/boards/VK_RA6M5/board.json
new file mode 100644
index 0000000000000..ae11d52213476
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "UART",
+        "SPI",
+        "I2C",
+        "ADC",
+        "DAC",
+        "PWM"
+    ],
+    "id": "VK-RA6M5",
+    "images": [
+        "VK-RA6M5.jpg"
+    ],
+    "mcu": "RA6M5",
+    "product": "VK-RA6M5",
+    "thumbnail": "",
+    "url": "https://vekatech.com/VK-RA6M5_docs/brochures/VK-RA6M5%20Flyer%20R2.pdf",
+    "vendor": "Vekatech"
+}
diff --git a/ports/renesas-ra/boards/VK_RA6M5/mpconfigboard.h b/ports/renesas-ra/boards/VK_RA6M5/mpconfigboard.h
new file mode 100644
index 0000000000000..f5daf06b5b867
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/mpconfigboard.h
@@ -0,0 +1,86 @@
+// MCU config
+#define MICROPY_HW_BOARD_NAME       "VK-RA6M5"
+#define MICROPY_HW_MCU_NAME         "RA6M5"
+#define MICROPY_HW_MCU_SYSCLK       200000000
+#define MICROPY_HW_MCU_PCLK         100000000
+
+// 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
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#define MICROPY_HW_HAS_QSPI_FLASH   (1)
+#define MICROPY_HW_HAS_SDHI_CARD    (1)
+
+// board config
+
+// UART
+#define MICROPY_HW_UART7_TX         (pin_P613) // D1
+#define MICROPY_HW_UART7_RX         (pin_P614) // D0
+#define MICROPY_HW_UART6_TX         (pin_P506) // Modbus (RS485)
+#define MICROPY_HW_UART6_RX         (pin_P505) // Modbus (RS485)
+#define MICROPY_HW_UART9_TX         (pin_P109) // REPL
+#define MICROPY_HW_UART9_RX         (pin_P110) // REPL
+#define MICROPY_HW_UART_REPL        HW_UART_9
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C
+#define MICROPY_HW_I2C2_SCL         (pin_P415)
+#define MICROPY_HW_I2C2_SDA         (pin_P414)
+
+// SPI
+#define MICROPY_HW_SPI0_SSL         (pin_P301) // D10
+#define MICROPY_HW_SPI0_RSPCK       (pin_P204) // D13
+#define MICROPY_HW_SPI0_MISO        (pin_P202) // D12
+#define MICROPY_HW_SPI0_MOSI        (pin_P203) // D11
+
+// PWM
+#define MICROPY_HW_PWM_2A           (pin_P113) // D5
+#define MICROPY_HW_PWM_2B           (pin_P114) // D6
+#define MICROPY_HW_PWM_3A           (pin_P111) // D3
+// #define MICROPY_HW_PWM_3A           (pin_P403) // PN3_6
+#define MICROPY_HW_PWM_3B           (pin_P112) // D4
+// #define MICROPY_HW_PWM_3B           (pin_P404) // PN3_7
+#define MICROPY_HW_PWM_4A           (pin_P115) // D9
+// #define MICROPY_HW_PWM_4A           (pin_P302) // H6_4
+#define MICROPY_HW_PWM_4B           (pin_P608) // D7
+// #define MICROPY_HW_PWM_4B           (pin_P301) // D10
+// #define MICROPY_HW_PWM_4B           (pin_P204) // D13
+// #define MICROPY_HW_PWM_5A           (pin_P203) // D11
+// #define MICROPY_HW_PWM_5B           (pin_P202) // D12
+#define MICROPY_HW_PWM_6B           (pin_P408) // PN3_8
+#define MICROPY_HW_PWM_7A           (pin_P304) // H6_5
+#define MICROPY_HW_PWM_7B           (pin_P303) // H6_3
+#define MICROPY_HW_PWM_8A           (pin_P605) // PN4_4
+#define MICROPY_HW_PWM_8B           (pin_P604) // PN4_3
+
+// DAC
+#define MICROPY_HW_DAC0             (pin_P014) // A4
+#define MICROPY_HW_DAC1             (pin_P015) // A5
+
+// Switch
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_USRSW_PIN        (pin_P010)
+// #define MICROPY_HW_USRSW_PIN        (pin_P009)
+#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
+#define MICROPY_HW_LED1             (pin_P006)
+#define MICROPY_HW_LED2             (pin_P007)
+#define MICROPY_HW_LED3             (pin_P008)
+#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/VK_RA6M5/mpconfigboard.mk b/ports/renesas-ra/boards/VK_RA6M5/mpconfigboard.mk
new file mode 100644
index 0000000000000..5cbe7b5fa5271
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/mpconfigboard.mk
@@ -0,0 +1,12 @@
+CMSIS_MCU = RA6M5
+MCU_SERIES = m33
+LD_FILES = boards/VK_RA6M5/vk_ra6m5.ld
+
+# MicroPython settings
+MICROPY_VFS_FAT = 1
+
+# FSP settings
+USE_FSP_QSPI = 1
+USE_FSP_SDHI = 1
+
+CFLAGS+=-DDEFAULT_DBG_CH=9
diff --git a/ports/renesas-ra/boards/VK_RA6M5/pins.csv b/ports/renesas-ra/boards/VK_RA6M5/pins.csv
new file mode 100644
index 0000000000000..d3760ef315104
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/pins.csv
@@ -0,0 +1,166 @@
+P000,P000
+P001,P001
+P002,P002
+P003,P003
+P004,P004
+P005,P005
+P006,P006
+P007,P007
+P008,P008
+P009,P009
+P010,P010
+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
+P314,P314
+P315,P315
+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
+P507,P507
+P508,P508
+P511,P511
+P512,P512
+P513,P513
+P600,P600
+P601,P601
+P602,P602
+P603,P603
+P604,P604
+P605,P605
+P606,P606
+P607,P607
+P608,P608
+P609,P609
+P610,P610
+P611,P611
+P612,P612
+P613,P613
+P614,P614
+P615,P615
+P700,P700
+P701,P701
+P702,P702
+P703,P703
+P704,P704
+P705,P705
+P706,P706
+P707,P707
+P708,P708
+P800,P800
+P801,P801
+P802,P802
+P803,P803
+P804,P804
+P805,P805
+P806,P806
+P900,P900
+P901,P901
+P905,P905
+P906,P906
+P907,P907
+P908,P908
+PA00,PA00
+PA01,PA01
+PA08,PA08
+PA09,PA09
+PA10,PA10
+PB00,PB00
+PB01,PB01
+A0,P000
+A1,P001
+A2,P002
+A3,P003
+A4,P014
+A5,P015
+D0,P614
+D1,P613
+D2,P409
+D3,P111
+D4,P112
+D5,P113
+D6,P114
+D7,P608
+D8,P207
+D9,P115
+D10,P301
+D11,P203
+D12,P202
+D13,P204
+SW1,P010
+SW2,P009
+LED1,P006
+LED2,P007
+LED3,P008
+SDA2,P414
+SCL2,P415
+SWDIO,P108
+SWCLK,P300
+MD,P201
+LED_B,P006
+LED_G,P007
+LED_R,P008
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/driver/r_qspi_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/driver/r_qspi_cfg.h
new file mode 100644
index 0000000000000..ff436867fae9d
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/driver/r_qspi_cfg.h
@@ -0,0 +1,14 @@
+/* generated configuration header file - do not edit */
+#ifndef R_QSPI_CFG_H_
+#define R_QSPI_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define QSPI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define QSPI_CFG_SUPPORT_EXTENDED_SPI_MULTI_LINE_PROGRAM  (1)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_QSPI_CFG_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000000..a57cf3249e386
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void bsp_init(void *p_args);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BOARD_CFG_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
new file mode 100644
index 0000000000000..9952bf9b15c80
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -0,0 +1,62 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CFG_H_
+#define BSP_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#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
+#ifndef BSP_CFG_RTC_USED
+#define BSP_CFG_RTC_USED (1)
+#endif
+#undef RA_NOT_DEFINED
+#if defined(_RA_BOOT_IMAGE)
+#define BSP_CFG_BOOT_IMAGE (1)
+#endif
+#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_EARLY_INIT     ((0))
+
+#define BSP_CFG_STARTUP_CLOCK_REG_NOT_RESET ((0))
+
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_POPULATED
+#define BSP_CLOCK_CFG_MAIN_OSC_POPULATED (1)
+#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
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
new file mode 100644
index 0000000000000..bd6a901c32d6e
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/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/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
new file mode 100644
index 0000000000000..6845183db5c6a
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
@@ -0,0 +1,11 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_R7FA6M5BH3CFC
+#define BSP_MCU_FEATURE_SET ('B')
+#define BSP_ROM_SIZE_BYTES (2097152)
+#define BSP_RAM_SIZE_BYTES (524288)
+#define BSP_DATA_FLASH_SIZE_BYTES (8192)
+#define BSP_PACKAGE_LQFP
+#define BSP_PACKAGE_PINS (176)
+#endif /* BSP_MCU_DEVICE_PN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
new file mode 100644
index 0000000000000..c6bda8f8fbd45
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
@@ -0,0 +1,386 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_FAMILY_CFG_H_
+#define BSP_MCU_FAMILY_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "bsp_mcu_device_pn_cfg.h"
+#include "bsp_mcu_device_cfg.h"
+#include "../../../ra/fsp/src/bsp/mcu/ra6m5/bsp_mcu_info.h"
+#include "bsp_clock_cfg.h"
+#define BSP_MCU_GROUP_RA6M5 (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)
+
+#if defined(_RA_TZ_SECURE)
+#define BSP_TZ_SECURE_BUILD           (1)
+#define BSP_TZ_NONSECURE_BUILD        (0)
+#elif defined(_RA_TZ_NONSECURE)
+#define BSP_TZ_SECURE_BUILD           (0)
+#define BSP_TZ_NONSECURE_BUILD        (1)
+#else
+#define BSP_TZ_SECURE_BUILD           (0)
+#define BSP_TZ_NONSECURE_BUILD        (0)
+#endif
+
+/* TrustZone Settings */
+#define BSP_TZ_CFG_INIT_SECURE_ONLY       (BSP_CFG_CLOCKS_SECURE || (!BSP_CFG_CLOCKS_OVERRIDE))
+#define BSP_TZ_CFG_SKIP_INIT              (BSP_TZ_NONSECURE_BUILD && BSP_TZ_CFG_INIT_SECURE_ONLY)
+#define BSP_TZ_CFG_EXCEPTION_RESPONSE     (0)
+
+/* CMSIS TrustZone Settings */
+#define SCB_CSR_AIRCR_INIT                (1)
+#define SCB_AIRCR_BFHFNMINS_VAL           (0)
+#define SCB_AIRCR_SYSRESETREQS_VAL        (1)
+#define SCB_AIRCR_PRIS_VAL                (0)
+#define TZ_FPU_NS_USAGE                   (1)
+#ifndef SCB_NSACR_CP10_11_VAL
+#define SCB_NSACR_CP10_11_VAL             (3U)
+#endif
+
+#ifndef FPU_FPCCR_TS_VAL
+#define FPU_FPCCR_TS_VAL                  (1U)
+#endif
+#define FPU_FPCCR_CLRONRETS_VAL           (1)
+
+#ifndef FPU_FPCCR_CLRONRET_VAL
+#define FPU_FPCCR_CLRONRET_VAL            (1)
+#endif
+
+/* The C-Cache line size that is configured during startup. */
+#ifndef BSP_CFG_C_CACHE_LINE_SIZE
+#define BSP_CFG_C_CACHE_LINE_SIZE   (1U)
+#endif
+
+/* Type 1 Peripheral Security Attribution */
+
+/* Peripheral Security Attribution Register (PSAR) Settings */
+#ifndef BSP_TZ_CFG_PSARB
+#define BSP_TZ_CFG_PSARB ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* CAN1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 2) /* CAN0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 8) /* IIC1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 9) /* IIC0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 11) /* USBFS */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 18) /* SPI1 */ | \
+    (((1 > 0) ? 0U : 1U) << 19) /* SPI0 */ | \
+    (((1 > 0) ? 0U : 1U) << 22) /* SCI9 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 23) /* SCI8 */ | \
+    (((1 > 0) ? 0U : 1U) << 24) /* SCI7 */ | \
+    (((1 > 0) ? 0U : 1U) << 25) /* SCI6 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 26) /* SCI5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 27) /* SCI4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 28) /* SCI3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 29) /* SCI2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 30) /* SCI1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 31) /* SCI0 */ | \
+    0x33f4f9)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_PSARC
+#define BSP_TZ_CFG_PSARC ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* CAC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* CRC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 3) /* CTSU */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 8) /* SSIE0 */ | \
+    (((1 > 0) ? 0U : 1U) << 12) /* SDHI0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 13) /* DOC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 31) /* SCE9 */ | \
+    0x7fffcef4)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_PSARD
+#define BSP_TZ_CFG_PSARD ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* AGT3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* AGT2 */ | \
+    (((1 > 0) ? 0U : 1U) << 2) /* AGT1 */ | \
+    (((1 > 0) ? 0U : 1U) << 3) /* AGT0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 11) /* POEG3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 12) /* POEG2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 13) /* POEG1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 14) /* POEG0 */ | \
+    (((1 > 0) ? 0U : 1U) << 15) /* ADC1 */ | \
+    (((1 > 0) ? 0U : 1U) << 16) /* ADC0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 20) /* DAC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 22) /* TSN */ | \
+    0xffae07f0)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_PSARE
+#define BSP_TZ_CFG_PSARE ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* WDT */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* IWDT */ | \
+    (((1 > 0) ? 0U : 1U) << 2) /* RTC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 14) /* AGT5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 15) /* AGT4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 22) /* GPT9 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 23) /* GPT8 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 24) /* GPT7 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 25) /* GPT6 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 26) /* GPT5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 27) /* GPT4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 28) /* GPT3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 29) /* GPT2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 30) /* GPT1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 31) /* GPT0 */ | \
+    0x3f3ff8)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_MSSAR
+#define BSP_TZ_CFG_MSSAR ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* ELC */ | \
+    (((3 > 0) ? 0U : 1U) << 1) /* DTC_DMAC */ | \
+    0xfffffffc)         /* Unused */
+#endif
+
+/* Type 2 Peripheral Security Attribution */
+
+/* Security attribution for Cache registers. */
+#ifndef BSP_TZ_CFG_CSAR
+#define BSP_TZ_CFG_CSAR (0xFFFFFFFFU)
+#endif
+
+/* Security attribution for RSTSRn registers. */
+#ifndef BSP_TZ_CFG_RSTSAR
+#define BSP_TZ_CFG_RSTSAR (0xFFFFFFFFU)
+#endif
+
+/* Security attribution for registers of LVD channels. */
+#ifndef BSP_TZ_CFG_LVDSAR
+#define BSP_TZ_CFG_LVDSAR ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) |         /* LVD Channel 1 */ \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) |         /* LVD Channel 2 */ \
+    0xFFFFFFFCU)
+#endif
+
+/* Security attribution for LPM registers. */
+#ifndef BSP_TZ_CFG_LPMSAR
+#define BSP_TZ_CFG_LPMSAR ((1 > 0) ? 0xFFFFFCEAU : 0xFFFFFFFFU)
+#endif
+/* Deep Standby Interrupt Factor Security Attribution Register. */
+#ifndef BSP_TZ_CFG_DPFSAR
+#define BSP_TZ_CFG_DPFSAR ((1 > 0) ? 0xF2E00000U : 0xFFFFFFFFU)
+#endif
+
+/* Security attribution for CGC registers. */
+#ifndef BSP_TZ_CFG_CGFSAR
+#if BSP_CFG_CLOCKS_SECURE
+/* Protect all CGC registers from Non-secure write access. */
+#define BSP_TZ_CFG_CGFSAR (0xFFFCE402U)
+#else
+/* Allow Secure and Non-secure write access. */
+#define BSP_TZ_CFG_CGFSAR (0xFFFFFFFFU)
+#endif
+#endif
+
+/* Security attribution for Battery Backup registers. */
+#ifndef BSP_TZ_CFG_BBFSAR
+#define BSP_TZ_CFG_BBFSAR (0x00FFFFFF)
+#endif
+
+/* Security attribution for registers for IRQ channels. */
+#ifndef BSP_TZ_CFG_ICUSARA
+#define BSP_TZ_CFG_ICUSARA ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0U) /* External IRQ0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1U) /* External IRQ1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 2U) /* External IRQ2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 3U) /* External IRQ3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 4U) /* External IRQ4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 5U) /* External IRQ5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 6U) /* External IRQ6 */ | \
+    (((1 > 0) ? 0U : 1U) << 7U) /* External IRQ7 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 8U) /* External IRQ8 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 9U) /* External IRQ9 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 10U) /* External IRQ10 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 11U) /* External IRQ11 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 12U) /* External IRQ12 */ | \
+    (((1 > 0) ? 0U : 1U) << 13U) /* External IRQ13 */ | \
+    (((1 > 0) ? 0U : 1U) << 14U) /* External IRQ14 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 15U) /* External IRQ15 */ | \
+    0xFFFF0000U)
+#endif
+
+/* Security attribution for NMI registers. */
+#ifndef BSP_TZ_CFG_ICUSARB
+#define BSP_TZ_CFG_ICUSARB (0 | 0xFFFFFFFEU) /* Should match AIRCR.BFHFNMINS. */
+#endif
+
+/* Security attribution for registers for DMAC channels */
+#ifndef BSP_TZ_CFG_ICUSARC
+#define BSP_TZ_CFG_ICUSARC ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0U) /* DMAC Channel 0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1U) /* DMAC Channel 1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 2U) /* DMAC Channel 2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 3U) /* DMAC Channel 3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 4U) /* DMAC Channel 4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 5U) /* DMAC Channel 5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 6U) /* DMAC Channel 6 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 7U) /* DMAC Channel 7 */ | \
+    0xFFFFFF00U)
+#endif
+
+/* Security attribution registers for SELSR0. */
+#ifndef BSP_TZ_CFG_ICUSARD
+#define BSP_TZ_CFG_ICUSARD ((1 > 0) ? 0xFFFFFFFEU : 0xFFFFFFFFU)
+#endif
+
+/* Security attribution registers for WUPEN0. */
+#ifndef BSP_TZ_CFG_ICUSARE
+#define BSP_TZ_CFG_ICUSARE ((1 > 0) ? 0x04F2FFFFU : 0xFFFFFFFFU)
+#endif
+
+/* Security attribution registers for WUPEN1. */
+#ifndef BSP_TZ_CFG_ICUSARF
+#define BSP_TZ_CFG_ICUSARF ((1 > 0) ? 0xFFFFFFF8U : 0xFFFFFFFFU)
+#endif
+
+/* Set DTCSTSAR if the Secure program uses the DTC. */
+#if 3 == RA_NOT_DEFINED
+ #define BSP_TZ_CFG_DTC_USED (0U)
+#else
+#define BSP_TZ_CFG_DTC_USED (1U)
+#endif
+
+/* Security attribution of FLWT and FCKMHZ registers. */
+#ifndef BSP_TZ_CFG_FSAR
+/* If the CGC registers are only accessible in Secure mode, than there is no
+ * reason for nonsecure applications to access FLWT and FCKMHZ. */
+#if BSP_CFG_CLOCKS_SECURE
+/* Protect FLWT and FCKMHZ registers from nonsecure write access. */
+#define BSP_TZ_CFG_FSAR (0xFEFEU)
+#else
+/* Allow Secure and Non-secure write access. */
+#define BSP_TZ_CFG_FSAR (0xFFFFU)
+#endif
+#endif
+
+/* Security attribution for SRAM registers. */
+#ifndef BSP_TZ_CFG_SRAMSAR
+/* If the CGC registers are only accessible in Secure mode, than there is no reason for Non Secure applications to access
+ * SRAM0WTEN and therefore there is no reason to access PRCR2. */
+#define BSP_TZ_CFG_SRAMSAR ( \
+    1 | \
+    ((BSP_CFG_CLOCKS_SECURE == 0) ? (1U << 1U) : 0U) | \
+    4 | \
+    0xFFFFFFF8U)
+#endif
+
+/* Security attribution for Standby RAM registers. */
+#ifndef BSP_TZ_CFG_STBRAMSAR
+#define BSP_TZ_CFG_STBRAMSAR (0 | 0xFFFFFFF0U)
+#endif
+
+/* Security attribution for the DMAC Bus Master MPU settings. */
+#ifndef BSP_TZ_CFG_MMPUSARA
+/* The DMAC Bus Master MPU settings should align with the DMAC channel settings. */
+#define BSP_TZ_CFG_MMPUSARA (BSP_TZ_CFG_ICUSARC)
+#endif
+
+/* Security Attribution Register A for BUS Control registers. */
+#ifndef BSP_TZ_CFG_BUSSARA
+#define BSP_TZ_CFG_BUSSARA (0xFFFFFFFFU)
+#endif
+/* Security Attribution Register B for BUS Control registers. */
+#ifndef BSP_TZ_CFG_BUSSARB
+#define BSP_TZ_CFG_BUSSARB (0xFFFFFFFFU)
+#endif
+
+/* Enable Uninitialized Non-Secure Application Fallback. */
+#ifndef BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK
+#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
+#endif
+
+#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)
+
+/* Option Function Select Register 1 Security Attribution */
+#ifndef BSP_CFG_ROM_REG_OFS1_SEL
+#if defined(_RA_TZ_SECURE) || defined(_RA_TZ_NONSECURE)
+            #define BSP_CFG_ROM_REG_OFS1_SEL (0xFFFFF8F8U | ((BSP_CFG_CLOCKS_SECURE == 0) ? 0x700U : 0U) | ((RA_NOT_DEFINED > 0) ? 0U : 0x7U))
+#else
+#define BSP_CFG_ROM_REG_OFS1_SEL (0xFFFFF8F8U)
+#endif
+#endif
+
+#define BSP_CFG_ROM_REG_OFS1 (0xFFFFFEF8 | (1 << 2) | (3) | (1 << 8))
+
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    (ELC_##vector)
+
+/* Dual Mode Select Register */
+#ifndef BSP_CFG_ROM_REG_DUALSEL
+#define BSP_CFG_ROM_REG_DUALSEL (0xFFFFFFF8U | (0x7U))
+#endif
+
+/* Block Protection Register 0 */
+#ifndef BSP_CFG_ROM_REG_BPS0
+#define BSP_CFG_ROM_REG_BPS0 (~(0U))
+#endif
+/* Block Protection Register 1 */
+#ifndef BSP_CFG_ROM_REG_BPS1
+#define BSP_CFG_ROM_REG_BPS1 (~(0U))
+#endif
+/* Block Protection Register 2 */
+#ifndef BSP_CFG_ROM_REG_BPS2
+#define BSP_CFG_ROM_REG_BPS2 (~(0U))
+#endif
+/* Block Protection Register 3 */
+#ifndef BSP_CFG_ROM_REG_BPS3
+#define BSP_CFG_ROM_REG_BPS3 (0xFFFFFFFFU)
+#endif
+/* Permanent Block Protection Register 0 */
+#ifndef BSP_CFG_ROM_REG_PBPS0
+#define BSP_CFG_ROM_REG_PBPS0 (~(0U))
+#endif
+/* Permanent Block Protection Register 1 */
+#ifndef BSP_CFG_ROM_REG_PBPS1
+#define BSP_CFG_ROM_REG_PBPS1 (~(0U))
+#endif
+/* Permanent Block Protection Register 2 */
+#ifndef BSP_CFG_ROM_REG_PBPS2
+#define BSP_CFG_ROM_REG_PBPS2 (~(0U))
+#endif
+/* Permanent Block Protection Register 3 */
+#ifndef BSP_CFG_ROM_REG_PBPS3
+#define BSP_CFG_ROM_REG_PBPS3 (0xFFFFFFFFU)
+#endif
+/* Security Attribution for Block Protection Register 0 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL0
+#define BSP_CFG_ROM_REG_BPS_SEL0 (BSP_CFG_ROM_REG_BPS0 & BSP_CFG_ROM_REG_PBPS0)
+#endif
+/* Security Attribution for Block Protection Register 1 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL1
+#define BSP_CFG_ROM_REG_BPS_SEL1 (BSP_CFG_ROM_REG_BPS1 & BSP_CFG_ROM_REG_PBPS1)
+#endif
+/* Security Attribution for Block Protection Register 2 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL2
+#define BSP_CFG_ROM_REG_BPS_SEL2 (BSP_CFG_ROM_REG_BPS2 & BSP_CFG_ROM_REG_PBPS2)
+#endif
+/* Security Attribution for Block Protection Register 3 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL3
+#define BSP_CFG_ROM_REG_BPS_SEL3 (BSP_CFG_ROM_REG_BPS3 & BSP_CFG_ROM_REG_PBPS3)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
+#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_MCU_FAMILY_CFG_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h
new file mode 100644
index 0000000000000..46d4602641dc8
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h
@@ -0,0 +1,42 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_PIN_CFG_H_
+#define BSP_PIN_CFG_H_
+#include "r_ioport.h"
+
+/* Common macro for FSP header files. There is also a corresponding FSP_FOOTER macro at the end of this file. */
+FSP_HEADER
+
+#define A0 (BSP_IO_PORT_00_PIN_00)
+#define A1 (BSP_IO_PORT_00_PIN_01)
+#define A2 (BSP_IO_PORT_00_PIN_02)
+#define A3 (BSP_IO_PORT_00_PIN_03)
+#define LED_B (BSP_IO_PORT_00_PIN_06)
+#define LED_G (BSP_IO_PORT_00_PIN_07)
+#define LED_R (BSP_IO_PORT_00_PIN_08)
+#define BTN_2 (BSP_IO_PORT_00_PIN_09)
+#define BTN_1 (BSP_IO_PORT_00_PIN_10)
+#define A4 (BSP_IO_PORT_00_PIN_14)
+#define A5 (BSP_IO_PORT_00_PIN_15)
+#define D3 (BSP_IO_PORT_01_PIN_11)
+#define D4 (BSP_IO_PORT_01_PIN_12)
+#define D5 (BSP_IO_PORT_01_PIN_13)
+#define D6 (BSP_IO_PORT_01_PIN_14)
+#define D9 (BSP_IO_PORT_01_PIN_15)
+#define D12 (BSP_IO_PORT_02_PIN_02)
+#define D11 (BSP_IO_PORT_02_PIN_03)
+#define D13 (BSP_IO_PORT_02_PIN_04)
+#define D8 (BSP_IO_PORT_02_PIN_07)
+#define D10 (BSP_IO_PORT_03_PIN_01)
+#define D2 (BSP_IO_PORT_04_PIN_09)
+#define CAN_STBY (BSP_IO_PORT_05_PIN_13)
+#define D7 (BSP_IO_PORT_06_PIN_08)
+#define D1 (BSP_IO_PORT_06_PIN_13)
+#define D0 (BSP_IO_PORT_06_PIN_14)
+extern const ioport_cfg_t g_bsp_pin_cfg; /* VK-RA6M5_v2.0(R7FA6M5BH3CFC).pincfg */
+
+void BSP_PinConfigSecurityInit();
+
+/* Common macro for FSP header files. There is also a corresponding FSP_HEADER macro at the top of this file. */
+FSP_FOOTER
+
+#endif /* BSP_PIN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/bsp_clock_cfg.h
new file mode 100644
index 0000000000000..c586b0603db02
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/bsp_clock_cfg.h
@@ -0,0 +1,35 @@
+/* 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 (24000000) /* XTAL 24000000Hz */
+#define BSP_CFG_HOCO_FREQUENCY (2) /* HOCO 20MHz */
+#define BSP_CFG_PLL_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL Src: XTAL */
+#define BSP_CFG_PLL_DIV (BSP_CLOCKS_PLL_DIV_3) /* PLL Div /3 */
+#define BSP_CFG_PLL_MUL BSP_CLOCKS_PLL_MUL(25U, 0U) /* PLL Mul x25.0 */
+#define BSP_CFG_PLL2_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL2 Src: XTAL */
+#define BSP_CFG_PLL2_DIV (BSP_CLOCKS_PLL_DIV_2) /* PLL2 Div /2 */
+#define BSP_CFG_PLL2_MUL BSP_CLOCKS_PLL_MUL(20U, 0U) /* PLL2 Mul x20.0 */
+#define BSP_CFG_CLOCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* Clock Src: PLL */
+#define BSP_CFG_CLKOUT_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CLKOUT Disabled */
+#define BSP_CFG_UCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL2) /* UCLK Src: PLL2 */
+#define BSP_CFG_U60CK_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* U60CK Disabled */
+#define BSP_CFG_OCTA_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* OCTASPICLK Disabled */
+#define BSP_CFG_CANFDCLK_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CANFDCLK Disabled */
+#define BSP_CFG_CECCLK_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CECCLK Disabled */
+#define BSP_CFG_ICLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* ICLK Div /1 */
+#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) /* EBCLK Div /2 */
+#define BSP_CFG_FCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* FCLK Div /4 */
+#define BSP_CFG_CLKOUT_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* CLKOUT Div /1 */
+#define BSP_CFG_UCK_DIV (BSP_CLOCKS_USB_CLOCK_DIV_5) /* UCLK Div /5 */
+#define BSP_CFG_U60CK_DIV (BSP_CLOCKS_USB60_CLOCK_DIV_1) /* U60CK Div /1 */
+#define BSP_CFG_OCTA_DIV (BSP_CLOCKS_OCTA_CLOCK_DIV_1) /* OCTASPICLK Div /1 */
+#define BSP_CFG_CANFDCLK_DIV (BSP_CLOCKS_CANFD_CLOCK_DIV_1) /* CANFDCLK Div /1 */
+#define BSP_CFG_CECCLK_DIV (BSP_CLOCKS_CEC_CLOCK_DIV_1) /* CECCLK Div /1 */
+#endif /* BSP_CLOCK_CFG_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_gen/common_data.c b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/common_data.c
new file mode 100644
index 0000000000000..b70b403a910a3
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/common_data.c
@@ -0,0 +1,70 @@
+/* generated common source file - do not edit */
+#include "common_data.h"
+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,
+/** If NULL then do not add & */
+                                                  #if defined(NULL)
+                                                  .p_context = NULL,
+                                                  #else
+                                                  .p_context = &NULL,
+                                                  #endif
+                                                  .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,
+/** If NULL then do not add & */
+                                                  #if defined(NULL)
+                                                  .p_context = NULL,
+                                                  #else
+                                                  .p_context = &NULL,
+                                                  #endif
+                                                  .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_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,
+/** If NULL then do not add & */
+                                                 #if defined(NULL)
+                                                 .p_context = NULL,
+                                                 #else
+                                                 .p_context = &NULL,
+                                                 #endif
+                                                 .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 };
+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/VK_RA6M5/ra_gen/common_data.h b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/common_data.h
new file mode 100644
index 0000000000000..65674c8dfba5d
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/common_data.h
@@ -0,0 +1,48 @@
+/* generated common header file - do not edit */
+#ifndef COMMON_DATA_H_
+#define COMMON_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "r_icu.h"
+#include "r_external_irq_api.h"
+#include "r_ioport.h"
+#include "bsp_pin_cfg.h"
+FSP_HEADER
+/** 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_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
+/* 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/VK_RA6M5/ra_gen/hal_data.c b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/hal_data.c
new file mode 100644
index 0000000000000..9a6204a0c4687
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/hal_data.c
@@ -0,0 +1,774 @@
+/* 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
+dtc_instance_ctrl_t g_transfer2_ctrl;
+
+transfer_info_t g_transfer2_info = { .transfer_settings_word_b.dest_addr_mode =
+                                         TRANSFER_ADDR_MODE_FIXED, .transfer_settings_word_b.repeat_area =
+                                         TRANSFER_REPEAT_AREA_SOURCE, .transfer_settings_word_b.irq =
+                                         TRANSFER_IRQ_END, .transfer_settings_word_b.chain_mode =
+                                         TRANSFER_CHAIN_MODE_DISABLED, .transfer_settings_word_b.src_addr_mode =
+                                         TRANSFER_ADDR_MODE_INCREMENTED, .transfer_settings_word_b.size =
+                                         TRANSFER_SIZE_4_BYTE, .transfer_settings_word_b.mode =
+                                         TRANSFER_MODE_NORMAL, .p_dest = (void *)NULL, .p_src =
+                                         (void const *)NULL, .num_blocks = 0, .length = 128, };
+
+const dtc_extended_cfg_t g_transfer2_cfg_extend = { .activation_source =
+                                                        VECTOR_NUMBER_SDHIMMC0_DMA_REQ, };
+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 };
+#define RA_NOT_DEFINED (UINT32_MAX)
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+
+/* If the transfer module is DMAC, define a DMAC transfer callback. */
+#include "r_dmac.h"
+extern void r_sdhi_transfer_callback(sdhi_instance_ctrl_t *p_ctrl);
+
+void g_sdmmc0_dmac_callback(dmac_callback_args_t *p_args) {
+    r_sdhi_transfer_callback((sdhi_instance_ctrl_t *)p_args->p_context);
+}
+#endif
+#undef RA_NOT_DEFINED
+
+sdhi_instance_ctrl_t g_sdmmc0_ctrl;
+sdmmc_cfg_t g_sdmmc0_cfg = { .bus_width = SDMMC_BUS_WIDTH_4_BITS, .channel = 0,
+                             .p_callback = sdhi_ISR, .p_context = NULL, .block_size = 512,
+                             .card_detect = SDMMC_CARD_DETECT_CD, .write_protect =
+                                 SDMMC_WRITE_PROTECT_WP,
+
+                             .p_extend = NULL, .p_lower_lvl_transfer = &g_transfer2,
+
+                             .access_ipl = (12), .sdio_ipl = BSP_IRQ_DISABLED, .card_ipl = (12),
+                             .dma_req_ipl = (12),
+                             #if defined(VECTOR_NUMBER_SDHIMMC0_ACCS)
+                             .access_irq = VECTOR_NUMBER_SDHIMMC0_ACCS,
+                             #else
+                             .access_irq = FSP_INVALID_VECTOR,
+                             #endif
+                             #if defined(VECTOR_NUMBER_SDHIMMC0_CARD)
+                             .card_irq = VECTOR_NUMBER_SDHIMMC0_CARD,
+                             #else
+                             .card_irq = FSP_INVALID_VECTOR,
+                             #endif
+                             .sdio_irq = FSP_INVALID_VECTOR,
+                             #if defined(VECTOR_NUMBER_SDHIMMC0_DMA_REQ)
+                             .dma_req_irq = VECTOR_NUMBER_SDHIMMC0_DMA_REQ,
+                             #else
+                             .dma_req_irq = FSP_INVALID_VECTOR,
+                             #endif
+};
+/* Instance structure to use this module. */
+const sdmmc_instance_t g_sdmmc0 = { .p_ctrl = &g_sdmmc0_ctrl, .p_cfg =
+                                        &g_sdmmc0_cfg, .p_api = &g_sdmmc_on_sdhi };
+qspi_instance_ctrl_t g_qspi0_ctrl;
+
+static const spi_flash_erase_command_t g_qspi0_erase_command_list[] = {
+    #if 4096 > 0
+    { .command = 0x20, .size = 4096 },
+    #endif
+    #if 32768 > 0
+    { .command = 0x52, .size = 32768 },
+    #endif
+    #if 65536 > 0
+    { .command = 0xD8, .size = 65536 },
+    #endif
+    #if 0xC7 > 0
+    { .command = 0xC7, .size = SPI_FLASH_ERASE_SIZE_CHIP_ERASE },
+    #endif
+};
+static const qspi_extended_cfg_t g_qspi0_extended_cfg = {
+    .min_qssl_deselect_cycles = QSPI_QSSL_MIN_HIGH_LEVEL_9_QSPCLK,
+    .qspclk_div = QSPI_QSPCLK_DIV_2,
+};
+const spi_flash_cfg_t g_qspi0_cfg = { .spi_protocol =
+                                          SPI_FLASH_PROTOCOL_EXTENDED_SPI, .read_mode =
+                                          SPI_FLASH_READ_MODE_FAST_READ_QUAD_IO, .address_bytes =
+                                          SPI_FLASH_ADDRESS_BYTES_3, .dummy_clocks =
+                                          SPI_FLASH_DUMMY_CLOCKS_DEFAULT, .page_program_address_lines =
+                                          SPI_FLASH_DATA_LINES_1, .page_size_bytes = 256, .page_program_command =
+                                          0x32, .write_enable_command = 0x06, .status_command = 0x05,
+                                      .write_status_bit = 0, .xip_enter_command = 0x20, .xip_exit_command =
+                                          0xFF, .p_erase_command_list = &g_qspi0_erase_command_list[0],
+                                      .erase_command_list_length = sizeof(g_qspi0_erase_command_list)
+                                          / sizeof(g_qspi0_erase_command_list[0]), .p_extend =
+                                          &g_qspi0_extended_cfg, };
+/** This structure encompasses everything that is needed to use an instance of this interface. */
+const spi_flash_instance_t g_qspi0 = { .p_ctrl = &g_qspi0_ctrl, .p_cfg =
+                                           &g_qspi0_cfg, .p_api = &g_qspi_on_spi_flash, };
+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, .timeout_scl_low =
+      IIC_MASTER_TIMEOUT_SCL_LOW_ENABLED,
+  /* Actual calculated bitrate: 98425. Actual calculated duty cycle: 50%. */ .clock_settings.brl_value =
+      28, .clock_settings.brh_value = 28,
+  .clock_settings.cks_value = 3, };
+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, .enable_adbuf = 0,
+                                               #if defined(VECTOR_NUMBER_ADC1_WINDOW_A)
+                                               .window_a_irq = VECTOR_NUMBER_ADC1_WINDOW_A,
+                                               #else
+                                               .window_a_irq = FSP_INVALID_VECTOR,
+                                               #endif
+                                               .window_a_ipl = (BSP_IRQ_DISABLED),
+                                               #if defined(VECTOR_NUMBER_ADC1_WINDOW_B)
+                                               .window_b_irq = VECTOR_NUMBER_ADC1_WINDOW_B,
+                                               #else
+                                               .window_b_irq = FSP_INVALID_VECTOR,
+                                               #endif
+                                               .window_b_ipl = (BSP_IRQ_DISABLED), };
+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,
+                               /** If NULL then do not add & */
+                               #if defined(NULL)
+                               .p_context = NULL,
+                               #else
+                               .p_context = &NULL,
+                               #endif
+                               .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), };
+#if ((0) | (0))
+const adc_window_cfg_t g_adc1_window_cfg =
+{
+    .compare_mask = 0,
+    .compare_mode_mask = 0,
+    .compare_cfg = (0) | (0) | (0) | (ADC_COMPARE_CFG_EVENT_OUTPUT_OR),
+    .compare_ref_low = 0,
+    .compare_ref_high = 0,
+    .compare_b_channel = (ADC_WINDOW_B_CHANNEL_0),
+    .compare_b_mode = (ADC_WINDOW_B_MODE_LESS_THAN_OR_OUTSIDE),
+    .compare_b_ref_low = 0,
+    .compare_b_ref_high = 0,
+};
+#endif
+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,
+                                               #if ((0) | (0))
+                                               .p_window_cfg = (adc_window_cfg_t *)&g_adc1_window_cfg,
+                                               #else
+                                               .p_window_cfg = NULL,
+                                               #endif
+};
+/* 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, .enable_adbuf = 0,
+                                               #if defined(VECTOR_NUMBER_ADC0_WINDOW_A)
+                                               .window_a_irq = VECTOR_NUMBER_ADC0_WINDOW_A,
+                                               #else
+                                               .window_a_irq = FSP_INVALID_VECTOR,
+                                               #endif
+                                               .window_a_ipl = (BSP_IRQ_DISABLED),
+                                               #if defined(VECTOR_NUMBER_ADC0_WINDOW_B)
+                                               .window_b_irq = VECTOR_NUMBER_ADC0_WINDOW_B,
+                                               #else
+                                               .window_b_irq = FSP_INVALID_VECTOR,
+                                               #endif
+                                               .window_b_ipl = (BSP_IRQ_DISABLED), };
+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,
+                               /** If NULL then do not add & */
+                               #if defined(NULL)
+                               .p_context = NULL,
+                               #else
+                               .p_context = &NULL,
+                               #endif
+                               .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), };
+#if ((0) | (0))
+const adc_window_cfg_t g_adc0_window_cfg =
+{
+    .compare_mask = 0,
+    .compare_mode_mask = 0,
+    .compare_cfg = (0) | (0) | (0) | (ADC_COMPARE_CFG_EVENT_OUTPUT_OR),
+    .compare_ref_low = 0,
+    .compare_ref_high = 0,
+    .compare_b_channel = (ADC_WINDOW_B_CHANNEL_0),
+    .compare_b_mode = (ADC_WINDOW_B_MODE_LESS_THAN_OR_OUTSIDE),
+    .compare_b_ref_low = 0,
+    .compare_b_ref_high = 0,
+};
+#endif
+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,
+                                               #if ((0) | (0))
+                                               .p_window_cfg = (adc_window_cfg_t *)&g_adc0_window_cfg,
+                                               #else
+                                               .p_window_cfg = NULL,
+                                               #endif
+};
+/* 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,
+                               .standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_RTCALM
+                                   | (lpm_standby_wake_source_t)0,
+                               #if BSP_FEATURE_LPM_HAS_SNOOZE
+                               .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+                               .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+                               .snooze_end_sources = (lpm_snooze_end_t)0,
+                               .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+                               #endif
+                               #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
+                               #if BSP_FEATURE_LPM_HAS_PDRAMSCR
+                               .ram_retention_cfg.ram_retention = (uint8_t)(0),
+                               .ram_retention_cfg.tcm_retention = false,
+                               #endif
+                               #if BSP_FEATURE_LPM_HAS_DPSBYCR_SRKEEP
+                               .ram_retention_cfg.standby_ram_retention = false,
+                               #endif
+                               #if BSP_FEATURE_LPM_HAS_LDO_CONTROL
+                               .ldo_standby_cfg.pll1_ldo = false,
+                               .ldo_standby_cfg.pll2_ldo = false,
+                               .ldo_standby_cfg.hoco_ldo = false,
+                               #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 = { .transfer_settings_word_b.dest_addr_mode =
+                                         TRANSFER_ADDR_MODE_INCREMENTED, .transfer_settings_word_b.repeat_area =
+                                         TRANSFER_REPEAT_AREA_DESTINATION, .transfer_settings_word_b.irq =
+                                         TRANSFER_IRQ_END, .transfer_settings_word_b.chain_mode =
+                                         TRANSFER_CHAIN_MODE_DISABLED, .transfer_settings_word_b.src_addr_mode =
+                                         TRANSFER_ADDR_MODE_FIXED, .transfer_settings_word_b.size =
+                                         TRANSFER_SIZE_2_BYTE, .transfer_settings_word_b.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 = { .transfer_settings_word_b.dest_addr_mode =
+                                         TRANSFER_ADDR_MODE_FIXED, .transfer_settings_word_b.repeat_area =
+                                         TRANSFER_REPEAT_AREA_SOURCE, .transfer_settings_word_b.irq =
+                                         TRANSFER_IRQ_END, .transfer_settings_word_b.chain_mode =
+                                         TRANSFER_CHAIN_MODE_DISABLED, .transfer_settings_word_b.src_addr_mode =
+                                         TRANSFER_ADDR_MODE_INCREMENTED, .transfer_settings_word_b.size =
+                                         TRANSFER_SIZE_2_BYTE, .transfer_settings_word_b.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 };
+#define RA_NOT_DEFINED (UINT32_MAX)
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+
+/* If the transfer module is DMAC, define a DMAC transfer callback. */
+#include "r_dmac.h"
+extern void spi_tx_dmac_callback(spi_instance_ctrl_t const *const p_ctrl);
+
+void g_spi0_tx_transfer_callback(dmac_callback_args_t *p_args) {
+    FSP_PARAMETER_NOT_USED(p_args);
+    spi_tx_dmac_callback(&g_spi0_ctrl);
+}
+#endif
+
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+
+/* If the transfer module is DMAC, define a DMAC transfer callback. */
+#include "r_dmac.h"
+extern void spi_rx_dmac_callback(spi_instance_ctrl_t const *const p_ctrl);
+
+void g_spi0_rx_transfer_callback(dmac_callback_args_t *p_args) {
+    FSP_PARAMETER_NOT_USED(p_args);
+    spi_rx_dmac_callback(&g_spi0_ctrl);
+}
+#endif
+#undef RA_NOT_DEFINED
+
+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: 12500000. */ .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 };
+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,
+  .agtoab_settings_b.agtoa = AGT_PIN_CFG_DISABLED,
+  .agtoab_settings_b.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.00131072 seconds. Actual duty: 50%. */ .period_counts =
+                                       (uint32_t)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,
+  .agtoab_settings_b.agtoa = AGT_PIN_CFG_DISABLED,
+  .agtoab_settings_b.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.00131072 seconds. Actual duty: 50%. */ .period_counts =
+                                       (uint32_t)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.469% error. */ .semr_baudrate_bits_b.abcse = 0,
+    .semr_baudrate_bits_b.abcs = 0, .semr_baudrate_bits_b.bgdm = 1,
+    .cks = 0, .brr = 53, .mddr = (uint8_t)256, .semr_baudrate_bits_b.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,
+    .flow_control = SCI_UART_FLOW_CONTROL_RTS,
+    #if 0xFF != 0xFF
+    .flow_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+    #else
+    .flow_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+    #endif
+    .rs485_setting = { .enable = SCI_UART_RS485_DISABLE, .polarity =
+                           SCI_UART_RS485_DE_POLARITY_HIGH,
+                       #if 0xFF != 0xFF
+                       .de_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+                       #else
+                       .de_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+                       #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.469% error. */ .semr_baudrate_bits_b.abcse = 0,
+    .semr_baudrate_bits_b.abcs = 0, .semr_baudrate_bits_b.bgdm = 1,
+    .cks = 0, .brr = 53, .mddr = (uint8_t)256, .semr_baudrate_bits_b.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,
+    .flow_control = SCI_UART_FLOW_CONTROL_RTS,
+    #if 0xFF != 0xFF
+    .flow_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+    #else
+    .flow_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+    #endif
+    .rs485_setting = { .enable = SCI_UART_RS485_DISABLE, .polarity =
+                           SCI_UART_RS485_DE_POLARITY_HIGH,
+                       #if 0xFF != 0xFF
+                       .de_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+                       #else
+                       .de_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+                       #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_uart6_ctrl;
+
+baud_setting_t g_uart6_baud_setting = {
+/* Baud rate calculated with 0.469% error. */ .semr_baudrate_bits_b.abcse = 0,
+    .semr_baudrate_bits_b.abcs = 0, .semr_baudrate_bits_b.bgdm = 1,
+    .cks = 0, .brr = 53, .mddr = (uint8_t)256, .semr_baudrate_bits_b.brme =
+        false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart6_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_uart6_baud_setting,
+    .flow_control = SCI_UART_FLOW_CONTROL_RTS,
+    #if 0xFF != 0xFF
+    .flow_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+    #else
+    .flow_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+    #endif
+    .rs485_setting = { .enable = SCI_UART_RS485_DISABLE, .polarity =
+                           SCI_UART_RS485_DE_POLARITY_HIGH,
+                       #if 0xFF != 0xFF
+                       .de_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+                       #else
+                       .de_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+                       #endif
+    },
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart6_cfg = { .channel = 6, .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_uart6_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_SCI6_RXI)
+                                 .rxi_irq = VECTOR_NUMBER_SCI6_RXI,
+                                 #else
+                                 .rxi_irq = FSP_INVALID_VECTOR,
+                                 #endif
+                                 #if defined(VECTOR_NUMBER_SCI6_TXI)
+                                 .txi_irq = VECTOR_NUMBER_SCI6_TXI,
+                                 #else
+                                 .txi_irq = FSP_INVALID_VECTOR,
+                                 #endif
+                                 #if defined(VECTOR_NUMBER_SCI6_TEI)
+                                 .tei_irq = VECTOR_NUMBER_SCI6_TEI,
+                                 #else
+                                 .tei_irq = FSP_INVALID_VECTOR,
+                                 #endif
+                                 #if defined(VECTOR_NUMBER_SCI6_ERI)
+                                 .eri_irq = VECTOR_NUMBER_SCI6_ERI,
+                                 #else
+                                 .eri_irq = FSP_INVALID_VECTOR,
+                                 #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart6 = { .p_ctrl = &g_uart6_ctrl,
+                                  .p_cfg = &g_uart6_cfg, .p_api = &g_uart_on_sci };
+void g_hal_init(void) {
+    g_common_init();
+}
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_gen/hal_data.h b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/hal_data.h
new file mode 100644
index 0000000000000..9edcfdf4a0ebd
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/hal_data.h
@@ -0,0 +1,205 @@
+/* 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_dtc.h"
+#include "r_transfer_api.h"
+#include "r_sdhi.h"
+#include "r_sdmmc_api.h"
+#include "r_qspi.h"
+#include "r_spi_flash_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_spi.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
+/* 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;
+/** SDMMC on SDMMC Instance. */
+extern const sdmmc_instance_t g_sdmmc0;
+
+/** Access the SDMMC instance using these structures when calling API functions directly (::p_api is not used). */
+extern sdhi_instance_ctrl_t g_sdmmc0_ctrl;
+extern sdmmc_cfg_t g_sdmmc0_cfg;
+
+#ifndef sdhi_ISR
+void sdhi_ISR(sdmmc_callback_args_t *p_args);
+#endif
+extern const spi_flash_instance_t g_qspi0;
+extern qspi_instance_ctrl_t g_qspi0_ctrl;
+extern const spi_flash_cfg_t g_qspi0_cfg;
+/* 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
+
+#ifndef NULL
+#define ADC_DMAC_CHANNELS_PER_BLOCK_NULL  0
+#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
+
+#ifndef NULL
+#define ADC_DMAC_CHANNELS_PER_BLOCK_NULL  0
+#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
+/** 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_uart6;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart6_ctrl;
+extern const uart_cfg_t g_uart6_cfg;
+extern const sci_uart_extended_cfg_t g_uart6_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+void g_hal_init(void);
+FSP_FOOTER
+#endif /* HAL_DATA_H_ */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_gen/pin_data.c b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/pin_data.c
new file mode 100644
index 0000000000000..54319a6aee6e7
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/pin_data.c
@@ -0,0 +1,227 @@
+/* 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_00_PIN_01, .pin_cfg =
+                                                      ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) }, { .pin =
+                                                                                                    BSP_IO_PORT_00_PIN_02, .pin_cfg =
+                                                                                                    ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) }, { .pin =
+                                                                                                                                                  BSP_IO_PORT_00_PIN_03, .pin_cfg =
+                                                                                                                                                  ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) }, { .pin =
+                                                                                                                                                                                                BSP_IO_PORT_00_PIN_06, .pin_cfg =
+                                                                                                                                                                                                ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT
+                                                                                                                                                                                                    | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW) }, { .pin =
+                                                                                                                                                                                                                                                     BSP_IO_PORT_00_PIN_07, .pin_cfg =
+                                                                                                                                                                                                                                                     ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT
+                                                                                                                                                                                                                                                         | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW) }, { .pin =
+                                                                                                                                                                                                                                                                                                          BSP_IO_PORT_00_PIN_08, .pin_cfg =
+                                                                                                                                                                                                                                                                                                          ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT
+                                                                                                                                                                                                                                                                                                              | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                               BSP_IO_PORT_00_PIN_09, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                               ((uint32_t)IOPORT_CFG_IRQ_ENABLE
+                                                                                                                                                                                                                                                                                                                                                                   | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT) }, {
+                                                    .pin = BSP_IO_PORT_00_PIN_10, .pin_cfg =
+                                                        ((uint32_t)IOPORT_CFG_IRQ_ENABLE
+                                                            | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT)
+                                                },
+                                                { .pin = BSP_IO_PORT_00_PIN_14, .pin_cfg =
+                                                      ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) }, { .pin =
+                                                                                                    BSP_IO_PORT_00_PIN_15, .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_OSPI) }, { .pin =
+                                                                                                                                                                                                   BSP_IO_PORT_01_PIN_01, .pin_cfg =
+                                                                                                                                                                                                   ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                       | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                    BSP_IO_PORT_01_PIN_02, .pin_cfg =
+                                                                                                                                                                                                                                                    ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                        | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                     BSP_IO_PORT_01_PIN_03, .pin_cfg =
+                                                                                                                                                                                                                                                                                                     ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                         | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                      BSP_IO_PORT_01_PIN_04, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                      ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                          | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                       BSP_IO_PORT_01_PIN_05, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                       ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                           | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        BSP_IO_PORT_01_PIN_06, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                            | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         BSP_IO_PORT_01_PIN_07, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .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_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_02_PIN_05, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   BSP_IO_PORT_02_PIN_06, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        BSP_IO_PORT_02_PIN_09, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             BSP_IO_PORT_02_PIN_10, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .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_05, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | (uint32_t)IOPORT_PERIPHERAL_QSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     BSP_IO_PORT_03_PIN_06, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | (uint32_t)IOPORT_PERIPHERAL_QSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      BSP_IO_PORT_03_PIN_07, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | (uint32_t)IOPORT_PERIPHERAL_QSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       BSP_IO_PORT_03_PIN_08, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | (uint32_t)IOPORT_PERIPHERAL_QSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        BSP_IO_PORT_03_PIN_09, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | (uint32_t)IOPORT_PERIPHERAL_QSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         BSP_IO_PORT_03_PIN_10, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | (uint32_t)IOPORT_PERIPHERAL_QSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          BSP_IO_PORT_04_PIN_01, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 BSP_IO_PORT_04_PIN_02, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        BSP_IO_PORT_04_PIN_05, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               BSP_IO_PORT_04_PIN_06, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .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_DRIVE_MID
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | (uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              BSP_IO_PORT_04_PIN_11, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   BSP_IO_PORT_04_PIN_12, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        BSP_IO_PORT_04_PIN_13, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | (uint32_t)IOPORT_PERIPHERAL_SDHI_MMC) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             BSP_IO_PORT_04_PIN_14, .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_15, .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_05, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      BSP_IO_PORT_05_PIN_06, .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_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | (uint32_t)IOPORT_PERIPHERAL_CAN) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               BSP_IO_PORT_05_PIN_12, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | (uint32_t)IOPORT_PERIPHERAL_CAN) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               BSP_IO_PORT_06_PIN_00, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                BSP_IO_PORT_06_PIN_01, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 BSP_IO_PORT_06_PIN_02, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  BSP_IO_PORT_06_PIN_10, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | (uint32_t)IOPORT_PERIPHERAL_OSPI) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   BSP_IO_PORT_06_PIN_13, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            BSP_IO_PORT_06_PIN_14, .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_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            BSP_IO_PORT_07_PIN_01, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   BSP_IO_PORT_07_PIN_02, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          BSP_IO_PORT_07_PIN_03, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 BSP_IO_PORT_07_PIN_04, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        BSP_IO_PORT_07_PIN_05, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | (uint32_t)IOPORT_PERIPHERAL_ETHER_RMII) }, { .pin =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               BSP_IO_PORT_07_PIN_06, .pin_cfg =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ((uint32_t)IOPORT_CFG_IRQ_ENABLE
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT) }, {
+                                                    .pin = BSP_IO_PORT_11_PIN_01, .pin_cfg =
+                                                        ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+                                                            | (uint32_t)IOPORT_PERIPHERAL_USB_HS)
+                                                }, };
+
+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], };
+
+#if BSP_TZ_SECURE_BUILD
+
+void R_BSP_PinCfgSecurityInit(void);
+
+/* Initialize SAR registers for secure pins. */
+void R_BSP_PinCfgSecurityInit(void) {
+    #if (2U == BSP_FEATURE_IOPORT_VERSION)
+    uint32_t pmsar[BSP_FEATURE_BSP_NUM_PMSAR];
+    #else
+    uint16_t pmsar[BSP_FEATURE_BSP_NUM_PMSAR];
+    #endif
+    memset(pmsar, 0xFF, BSP_FEATURE_BSP_NUM_PMSAR * sizeof(R_PMISC->PMSAR[0]));
+
+
+    for (uint32_t i = 0; i < g_bsp_pin_cfg.number_of_pins; i++)
+    {
+        uint32_t port_pin = g_bsp_pin_cfg.p_pin_cfg_data[i].pin;
+        uint32_t port = port_pin >> 8U;
+        uint32_t pin = port_pin & 0xFFU;
+        pmsar[port] &= (uint16_t) ~(1U << pin);
+    }
+
+    for (uint32_t i = 0; i < BSP_FEATURE_BSP_NUM_PMSAR; i++)
+    {
+        #if (2U == BSP_FEATURE_IOPORT_VERSION)
+        R_PMISC->PMSAR[i].PMSAR = (uint16_t)pmsar[i];
+        #else
+        R_PMISC->PMSAR[i].PMSAR = pmsar[i];
+        #endif
+    }
+
+}
+#endif
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.c b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.c
new file mode 100644
index 0000000000000..3065f3b0138b5
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.c
@@ -0,0 +1,73 @@
+/* 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,         /* SCI6 RXI (Received data full) */
+    [1] = sci_uart_txi_isr,         /* SCI6 TXI (Transmit data empty) */
+    [2] = sci_uart_tei_isr,         /* SCI6 TEI (Transmit end) */
+    [3] = sci_uart_eri_isr,         /* SCI6 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] = agt_int_isr,         /* AGT1 INT (AGT interrupt) */
+    [17] = r_icu_isr,         /* ICU IRQ7 (External pin interrupt 7) */
+    [18] = r_icu_isr,         /* ICU IRQ13 (External pin interrupt 13) */
+    [19] = r_icu_isr,         /* ICU IRQ14 (External pin interrupt 14) */
+    [20] = spi_rxi_isr,         /* SPI0 RXI (Receive buffer full) */
+    [21] = spi_txi_isr,         /* SPI0 TXI (Transmit buffer empty) */
+    [22] = spi_tei_isr,         /* SPI0 TEI (Transmission complete event) */
+    [23] = spi_eri_isr,         /* SPI0 ERI (Error) */
+    [24] = iic_master_rxi_isr,         /* IIC2 RXI (Receive data full) */
+    [25] = iic_master_txi_isr,         /* IIC2 TXI (Transmit data empty) */
+    [26] = iic_master_tei_isr,         /* IIC2 TEI (Transmit end) */
+    [27] = iic_master_eri_isr,         /* IIC2 ERI (Transfer error) */
+    [28] = sdhimmc_accs_isr,         /* SDHIMMC0 ACCS (Card access) */
+    [29] = sdhimmc_card_isr,         /* SDHIMMC0 CARD (Card detect) */
+    [30] = sdhimmc_dma_req_isr,         /* SDHIMMC0 DMA REQ (DMA transfer request) */
+};
+const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
+{
+    [0] = BSP_PRV_IELS_ENUM(EVENT_SCI6_RXI),         /* SCI6 RXI (Received data full) */
+    [1] = BSP_PRV_IELS_ENUM(EVENT_SCI6_TXI),         /* SCI6 TXI (Transmit data empty) */
+    [2] = BSP_PRV_IELS_ENUM(EVENT_SCI6_TEI),         /* SCI6 TEI (Transmit end) */
+    [3] = BSP_PRV_IELS_ENUM(EVENT_SCI6_ERI),         /* SCI6 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_AGT1_INT),         /* AGT1 INT (AGT interrupt) */
+    [17] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ7),         /* ICU IRQ7 (External pin interrupt 7) */
+    [18] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ13),         /* ICU IRQ13 (External pin interrupt 13) */
+    [19] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ14),         /* ICU IRQ14 (External pin interrupt 14) */
+    [20] = BSP_PRV_IELS_ENUM(EVENT_SPI0_RXI),         /* SPI0 RXI (Receive buffer full) */
+    [21] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TXI),         /* SPI0 TXI (Transmit buffer empty) */
+    [22] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TEI),         /* SPI0 TEI (Transmission complete event) */
+    [23] = BSP_PRV_IELS_ENUM(EVENT_SPI0_ERI),         /* SPI0 ERI (Error) */
+    [24] = BSP_PRV_IELS_ENUM(EVENT_IIC2_RXI),         /* IIC2 RXI (Receive data full) */
+    [25] = BSP_PRV_IELS_ENUM(EVENT_IIC2_TXI),         /* IIC2 TXI (Transmit data empty) */
+    [26] = BSP_PRV_IELS_ENUM(EVENT_IIC2_TEI),         /* IIC2 TEI (Transmit end) */
+    [27] = BSP_PRV_IELS_ENUM(EVENT_IIC2_ERI),         /* IIC2 ERI (Transfer error) */
+    [28] = BSP_PRV_IELS_ENUM(EVENT_SDHIMMC0_ACCS),         /* SDHIMMC0 ACCS (Card access) */
+    [29] = BSP_PRV_IELS_ENUM(EVENT_SDHIMMC0_CARD),         /* SDHIMMC0 CARD (Card detect) */
+    [30] = BSP_PRV_IELS_ENUM(EVENT_SDHIMMC0_DMA_REQ),         /* SDHIMMC0 DMA REQ (DMA transfer request) */
+};
+#endif
diff --git a/ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.h b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.h
new file mode 100644
index 0000000000000..95f2226330912
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/ra_gen/vector_data.h
@@ -0,0 +1,98 @@
+/* generated vector header file - do not edit */
+#ifndef VECTOR_DATA_H
+#define VECTOR_DATA_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Number of interrupts allocated */
+#ifndef VECTOR_DATA_IRQ_COUNT
+#define VECTOR_DATA_IRQ_COUNT    (31)
+#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);
+void sdhimmc_accs_isr(void);
+void sdhimmc_card_isr(void);
+void sdhimmc_dma_req_isr(void);
+
+/* Vector table allocations */
+#define VECTOR_NUMBER_SCI6_RXI ((IRQn_Type)0)  /* SCI6 RXI (Received data full) */
+#define SCI6_RXI_IRQn          ((IRQn_Type)0)  /* SCI6 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI6_TXI ((IRQn_Type)1)  /* SCI6 TXI (Transmit data empty) */
+#define SCI6_TXI_IRQn          ((IRQn_Type)1)  /* SCI6 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI6_TEI ((IRQn_Type)2)  /* SCI6 TEI (Transmit end) */
+#define SCI6_TEI_IRQn          ((IRQn_Type)2)  /* SCI6 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI6_ERI ((IRQn_Type)3)  /* SCI6 ERI (Receive error) */
+#define SCI6_ERI_IRQn          ((IRQn_Type)3)  /* SCI6 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI7_RXI ((IRQn_Type)4)  /* SCI7 RXI (Received data full) */
+#define SCI7_RXI_IRQn          ((IRQn_Type)4)  /* SCI7 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI7_TXI ((IRQn_Type)5)  /* SCI7 TXI (Transmit data empty) */
+#define SCI7_TXI_IRQn          ((IRQn_Type)5)  /* SCI7 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI7_TEI ((IRQn_Type)6)  /* SCI7 TEI (Transmit end) */
+#define SCI7_TEI_IRQn          ((IRQn_Type)6)  /* SCI7 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI7_ERI ((IRQn_Type)7)  /* SCI7 ERI (Receive error) */
+#define SCI7_ERI_IRQn          ((IRQn_Type)7)  /* SCI7 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI9_RXI ((IRQn_Type)8)  /* SCI9 RXI (Received data full) */
+#define SCI9_RXI_IRQn          ((IRQn_Type)8)  /* SCI9 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI9_TXI ((IRQn_Type)9)  /* SCI9 TXI (Transmit data empty) */
+#define SCI9_TXI_IRQn          ((IRQn_Type)9)  /* SCI9 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI9_TEI ((IRQn_Type)10)  /* SCI9 TEI (Transmit end) */
+#define SCI9_TEI_IRQn          ((IRQn_Type)10)  /* SCI9 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI9_ERI ((IRQn_Type)11)  /* SCI9 ERI (Receive error) */
+#define SCI9_ERI_IRQn          ((IRQn_Type)11)  /* SCI9 ERI (Receive error) */
+#define VECTOR_NUMBER_RTC_ALARM ((IRQn_Type)12)  /* RTC ALARM (Alarm interrupt) */
+#define RTC_ALARM_IRQn          ((IRQn_Type)12)  /* RTC ALARM (Alarm interrupt) */
+#define VECTOR_NUMBER_RTC_PERIOD ((IRQn_Type)13)  /* RTC PERIOD (Periodic interrupt) */
+#define RTC_PERIOD_IRQn          ((IRQn_Type)13)  /* RTC PERIOD (Periodic interrupt) */
+#define VECTOR_NUMBER_RTC_CARRY ((IRQn_Type)14)  /* RTC CARRY (Carry interrupt) */
+#define RTC_CARRY_IRQn          ((IRQn_Type)14)  /* RTC CARRY (Carry interrupt) */
+#define VECTOR_NUMBER_AGT0_INT ((IRQn_Type)15)  /* AGT0 INT (AGT interrupt) */
+#define AGT0_INT_IRQn          ((IRQn_Type)15)  /* AGT0 INT (AGT interrupt) */
+#define VECTOR_NUMBER_AGT1_INT ((IRQn_Type)16)  /* AGT1 INT (AGT interrupt) */
+#define AGT1_INT_IRQn          ((IRQn_Type)16)  /* AGT1 INT (AGT interrupt) */
+#define VECTOR_NUMBER_ICU_IRQ7 ((IRQn_Type)17)  /* ICU IRQ7 (External pin interrupt 7) */
+#define ICU_IRQ7_IRQn          ((IRQn_Type)17)  /* ICU IRQ7 (External pin interrupt 7) */
+#define VECTOR_NUMBER_ICU_IRQ13 ((IRQn_Type)18)  /* ICU IRQ13 (External pin interrupt 13) */
+#define ICU_IRQ13_IRQn          ((IRQn_Type)18)  /* ICU IRQ13 (External pin interrupt 13) */
+#define VECTOR_NUMBER_ICU_IRQ14 ((IRQn_Type)19)  /* ICU IRQ14 (External pin interrupt 14) */
+#define ICU_IRQ14_IRQn          ((IRQn_Type)19)  /* ICU IRQ14 (External pin interrupt 14) */
+#define VECTOR_NUMBER_SPI0_RXI ((IRQn_Type)20)  /* SPI0 RXI (Receive buffer full) */
+#define SPI0_RXI_IRQn          ((IRQn_Type)20)  /* SPI0 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI0_TXI ((IRQn_Type)21)  /* SPI0 TXI (Transmit buffer empty) */
+#define SPI0_TXI_IRQn          ((IRQn_Type)21)  /* SPI0 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI0_TEI ((IRQn_Type)22)  /* SPI0 TEI (Transmission complete event) */
+#define SPI0_TEI_IRQn          ((IRQn_Type)22)  /* SPI0 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI0_ERI ((IRQn_Type)23)  /* SPI0 ERI (Error) */
+#define SPI0_ERI_IRQn          ((IRQn_Type)23)  /* SPI0 ERI (Error) */
+#define VECTOR_NUMBER_IIC2_RXI ((IRQn_Type)24)  /* IIC2 RXI (Receive data full) */
+#define IIC2_RXI_IRQn          ((IRQn_Type)24)  /* IIC2 RXI (Receive data full) */
+#define VECTOR_NUMBER_IIC2_TXI ((IRQn_Type)25)  /* IIC2 TXI (Transmit data empty) */
+#define IIC2_TXI_IRQn          ((IRQn_Type)25)  /* IIC2 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_IIC2_TEI ((IRQn_Type)26)  /* IIC2 TEI (Transmit end) */
+#define IIC2_TEI_IRQn          ((IRQn_Type)26)  /* IIC2 TEI (Transmit end) */
+#define VECTOR_NUMBER_IIC2_ERI ((IRQn_Type)27)  /* IIC2 ERI (Transfer error) */
+#define IIC2_ERI_IRQn          ((IRQn_Type)27)  /* IIC2 ERI (Transfer error) */
+#define VECTOR_NUMBER_SDHIMMC0_ACCS ((IRQn_Type)28)  /* SDHIMMC0 ACCS (Card access) */
+#define SDHIMMC0_ACCS_IRQn          ((IRQn_Type)28)  /* SDHIMMC0 ACCS (Card access) */
+#define VECTOR_NUMBER_SDHIMMC0_CARD ((IRQn_Type)29)  /* SDHIMMC0 CARD (Card detect) */
+#define SDHIMMC0_CARD_IRQn          ((IRQn_Type)29)  /* SDHIMMC0 CARD (Card detect) */
+#define VECTOR_NUMBER_SDHIMMC0_DMA_REQ ((IRQn_Type)30)  /* SDHIMMC0 DMA REQ (DMA transfer request) */
+#define SDHIMMC0_DMA_REQ_IRQn          ((IRQn_Type)30)  /* SDHIMMC0 DMA REQ (DMA transfer request) */
+#ifdef __cplusplus
+}
+#endif
+#endif /* VECTOR_DATA_H */
diff --git a/ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5.ld b/ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5.ld
new file mode 100644
index 0000000000000..8363d2e743f24
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5.ld
@@ -0,0 +1,308 @@
+/*
+                  Linker File for RA6M5 MCU
+*/
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00100000  /* 1MB/2MB */
+  FLASH_FS (r)       : ORIGIN = 0x00100000, LENGTH = 0x00100000  /* 1MB/2MB */
+  RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00080000  /* 512KB */
+  OSPI_RAM (rwx)     : ORIGIN = 0x68000000, LENGTH = 0x00800000  /* 8MB/8MB */
+  DATA_FLASH (rx)    : ORIGIN = 0x08000000, LENGTH = 0x00002000  /* 8KB */
+  QSPI_FLASH (rx)    : ORIGIN = 0x60000000, LENGTH = 0x01000000  /* 16MB/64MB */
+  OSPI_FLASH (rx)    : ORIGIN = 0x70000000, LENGTH = 0x01000000  /* 16MB/256MB */
+  ID_CODE (rx)       : ORIGIN = 0x00000000, LENGTH = 0x00000000  /* N/A */
+}
+
+/* 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 */
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+
+_micropy_hw_external_flash_storage_start = ORIGIN(QSPI_FLASH);
+_micropy_hw_external_flash_storage_end   = ORIGIN(QSPI_FLASH) + LENGTH(QSPI_FLASH);
diff --git a/ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5_conf.h b/ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5_conf.h
new file mode 100644
index 0000000000000..1e08a19737f1b
--- /dev/null
+++ b/ports/renesas-ra/boards/VK_RA6M5/vk_ra6m5_conf.h
@@ -0,0 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Vekatech Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 VK_RA6M5_CONF_H
+#define VK_RA6M5_CONF_H
+
+#define DEBUG_CH    7
+
+#endif /* VK_RA6M5_CONF_H */

From 5a9a0df3407cb195ff1f61cf9cba0fc8700c54c6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Jun 2023 13:05:33 +1000
Subject: [PATCH 0099/3129] esp32/machine_uart: Always select a source_clk
 value in UART config.

Fixes issue #11872.

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

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index d9b845047b6b3..7a2dc2b323e28 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -37,6 +37,13 @@
 #include "modmachine.h"
 #include "uart.h"
 
+#if SOC_UART_SUPPORT_XTAL_CLK
+// Works independently of APB frequency, on ESP32C3, ESP32S3.
+#define UART_SOURCE_CLK UART_SCLK_XTAL
+#else
+#define UART_SOURCE_CLK UART_SCLK_DEFAULT
+#endif
+
 #define UART_INV_TX UART_SIGNAL_TXD_INV
 #define UART_INV_RX UART_SIGNAL_RXD_INV
 #define UART_INV_RTS UART_SIGNAL_RTS_INV
@@ -157,7 +164,8 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
         }
         uart_config_t uartcfg = {
             .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
-            .rx_flow_ctrl_thresh = 0
+            .rx_flow_ctrl_thresh = 0,
+            .source_clk = UART_SOURCE_CLK,
         };
         uint32_t baudrate;
         uart_get_baudrate(self->uart_num, &baudrate);
@@ -308,12 +316,9 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         .parity = UART_PARITY_DISABLE,
         .stop_bits = UART_STOP_BITS_1,
         .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
-        .rx_flow_ctrl_thresh = 0
+        .rx_flow_ctrl_thresh = 0,
+        .source_clk = UART_SOURCE_CLK,
     };
-    #if SOC_UART_SUPPORT_XTAL_CLK
-    // works independently of APB frequency
-    uartcfg.source_clk = UART_SCLK_XTAL; // ESP32C3, ESP32S3
-    #endif
 
     // create instance
     machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);

From 909fe30dfd32da71ac962f004d7626beb3c693d0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 9 Jun 2023 12:40:39 +0200
Subject: [PATCH 0100/3129] samd: Set the LFS type in mpconfigmcu.mk instead of
 mpconfigboard.mk.

SAMD21: set the filesystem type to LFS1.

SAMD51: the type is already set to LFS2, support is now dropped for LFS1.
It has not been used and dropping it saves 10 k of flash.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk | 1 -
 .../samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk | 1 -
 .../boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk    | 1 -
 .../boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk    | 1 -
 ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk | 2 --
 ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk       | 4 ----
 ports/samd/boards/MINISAM_M4/mpconfigboard.mk                | 1 -
 ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk       | 4 ----
 ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk        | 1 -
 ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.mk         | 5 -----
 .../samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk  | 1 -
 ports/samd/mcu/samd21/mpconfigmcu.mk                         | 2 ++
 12 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
index aa3fbd35dacef..e2895c7c0c2f9 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
@@ -5,5 +5,4 @@ TEXT0 = 0x2000
 
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
 MICROPY_HW_CODESIZE ?= 248K
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
index 70d73ee6fa1b5..6ec2d43dedbd8 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
@@ -5,5 +5,4 @@ TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
 MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
index aa3fbd35dacef..e2895c7c0c2f9 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
@@ -5,5 +5,4 @@ TEXT0 = 0x2000
 
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
 MICROPY_HW_CODESIZE ?= 248K
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
index 7ef411431d7fb..740154a6d6825 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
@@ -5,5 +5,4 @@ TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
 MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
index a196612539c21..1a2635f7af112 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
@@ -4,8 +4,6 @@ LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
-
 MICROPY_PY_NETWORK ?= 1
 MICROPY_PY_NETWORK_NINAW10 ?= 1
 
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
index 448da296f46a8..5b4d0b63e7e5a 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
@@ -2,7 +2,3 @@ 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/MINISAM_M4/mpconfigboard.mk b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
index 4ccbf92c7e7a9..54948627d2b67 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
@@ -6,5 +6,4 @@ TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
 MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
index b298c9d7fcdf5..f95c6549381ba 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
@@ -2,7 +2,3 @@ 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/SEEED_WIO_TERMINAL/mpconfigboard.mk b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
index 03f97e138c53c..7bf70ac669566 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
@@ -5,5 +5,4 @@ TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
 MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.mk b/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.mk
index eb4d4d045e97b..8696c966bc321 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.mk
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.mk
@@ -2,8 +2,3 @@ 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/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
index 65b1ba7a33df4..263e582694495 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
@@ -5,5 +5,4 @@ TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
-MICROPY_VFS_LFS1 ?= 1
 MICROPY_HW_CODESIZE ?= 1008K
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index 2e16d12a2dc21..cce8f0e04e5e2 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -4,6 +4,8 @@ MPY_CROSS_MCU_ARCH = armv6m
 
 MICROPY_HW_CODESIZE ?= 184K
 
+MICROPY_VFS_LFS1 ?= 1
+
 SRC_S += shared/runtime/gchelper_thumb1.s
 
 LIBM_SRC_C +=  $(addprefix lib/libm/,\

From cfaa9a4997b0d57357631a82d1e33205d26972d4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 9 Jun 2023 16:30:08 +0200
Subject: [PATCH 0101/3129] samd/Makefile: Move the math lib files from
 mpconfigmcu.mk to Makefile.

They are used by both SAMD21 and SAMD51.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/Makefile                  | 23 ++++++++++++++++++++++
 ports/samd/mcu/samd21/mpconfigmcu.mk | 29 ----------------------------
 ports/samd/mcu/samd51/mpconfigmcu.mk | 29 ----------------------------
 3 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 360cf0dd4c770..e966fe2146c0f 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -139,10 +139,33 @@ ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
 	)
 
 LIBM_SRC_C += $(addprefix lib/libm/,\
+	acoshf.c \
+	asinfacosf.c \
+	asinhf.c \
+	atan2f.c \
+	atanf.c \
+	atanhf.c \
+	ef_rem_pio2.c \
 	ef_sqrt.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 \
 	)
 
 TINYUSB_SRC_C += $(addprefix lib/tinyusb/src/,\
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index cce8f0e04e5e2..35f442d86990a 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -7,32 +7,3 @@ MICROPY_HW_CODESIZE ?= 184K
 MICROPY_VFS_LFS1 ?= 1
 
 SRC_S += shared/runtime/gchelper_thumb1.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.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 433404fd11ac5..0e662a1705654 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -13,32 +13,3 @@ SRC_S += shared/runtime/gchelper_thumb2.s
 SRC_C += \
 	fatfs_port.c \
 	drivers/dht/dht.c \
-
-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 \
-	)

From 5ef7ce5116dd419b3f217fac5ab0cbf3634a028d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 26 Jun 2023 14:13:25 +0200
Subject: [PATCH 0102/3129] samd/Makefile: Print memory region usage instead of
 totals.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index e966fe2146c0f..7e5c334e6644a 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -78,7 +78,7 @@ ifeq ($(DEBUG),1)
 CFLAGS += -O0
 else
 CFLAGS += -Os -DNDEBUG
-LDFLAGS += --gc-sections
+LDFLAGS += --gc-sections --print-memory-usage
 CFLAGS += -fdata-sections -ffunction-sections
 endif
 
@@ -198,7 +198,6 @@ all: $(BUILD)/firmware.uf2
 $(BUILD)/firmware.elf: $(OBJ)
 	$(ECHO) "LINK $@"
 	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-	$(Q)$(SIZE) $@
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data $^ $(BUILD)/firmware.bin

From 057f3b00204cc88d31a66f7d5999fc3c29b92fe4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 26 Jun 2023 14:16:47 +0200
Subject: [PATCH 0103/3129] samd/mpconfigport: Enable DHT and onewire drivers
 on all MCUs/boards.

And move the setting to the samd-generic files, now that both samd21
and samd51 support it.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/Makefile                  | 1 +
 ports/samd/mcu/samd51/mpconfigmcu.h  | 2 --
 ports/samd/mcu/samd51/mpconfigmcu.mk | 1 -
 ports/samd/mpconfigport.h            | 2 ++
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 7e5c334e6644a..6dd71bd93f4c5 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -119,6 +119,7 @@ SRC_C += \
 	tusb_port.c \
 
 SHARED_SRC_C += \
+	drivers/dht/dht.c \
 	shared/runtime/mpirq.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 1569e5624dd3a..399b48c040d69 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -25,8 +25,6 @@
 #define MICROPY_PY_CMATH                (0)
 #endif
 
-#define MICROPY_PY_MACHINE_DHT_READINTO (1)
-#define MICROPY_PY_ONEWIRE              (1)
 #define MICROPY_PY_OS_SYNC              (1)
 #define MICROPY_PY_OS_URANDOM           (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 0e662a1705654..c706331aca459 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -12,4 +12,3 @@ SRC_S += shared/runtime/gchelper_thumb2.s
 
 SRC_C += \
 	fatfs_port.c \
-	drivers/dht/dht.c \
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 7bf4acb84eb39..f3fe38d7642c9 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -127,6 +127,8 @@
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/samd/machine_pwm.c"
 #endif
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
+#define MICROPY_PY_MACHINE_DHT_READINTO     (1)
+#define MICROPY_PY_ONEWIRE                  (1)
 
 #define MP_STATE_PORT MP_STATE_VM
 

From 0e215a9fbab5f15f8c459062b5ec75de2a83f403 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 26 Jun 2023 20:26:59 +0200
Subject: [PATCH 0104/3129] samd/mpconfigport: Provide the platform module.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index f3fe38d7642c9..600c79da04fdc 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -129,6 +129,8 @@
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_DHT_READINTO     (1)
 #define MICROPY_PY_ONEWIRE                  (1)
+#define MICROPY_PY_PLATFORM                 (1)
+#define MICROPY_PLATFORM_VERSION            "ASF4"
 
 #define MP_STATE_PORT MP_STATE_VM
 

From b2ad7e238b4e6de86aef646d715cf9a8a5144807 Mon Sep 17 00:00:00 2001
From: elibdev <eli@elib.dev>
Date: Mon, 19 Jun 2023 11:56:38 -0400
Subject: [PATCH 0105/3129] webassembly: Make mp_js_do_str asynchronous.

This fixes a bug where `gc.collect()` would crash due to
emscripten_scan_stack being called synchronously within mp_js_do_str.  The
fix is to make mp_js_do_str asynchronous.

Fixes #10692.

Signed-off-by: Eli Bierman <eli@elib.dev>
---
 ports/webassembly/README.md  | 6 +++---
 ports/webassembly/wrapper.js | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index 5019d6f9059c7..10cc6aa8c1157 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -49,7 +49,7 @@ using the require command and the general API outlined below. For example:
 var mp_js = require('./build/micropython.js');
 
 mp_js_init(64 * 1024);
-mp_js_do_str("print('hello world')\n");
+await mp_js_do_str("print('hello world')\n");
 ```
 
 Running with HTML
@@ -77,7 +77,7 @@ something to stdout.  The following code demonstrates basic functionality:
       Module["onRuntimeInitialized"] = async function() {
         mp_js_startup();
         mp_js_init(64 * 1024);
-        mp_js_do_str("print('hello world')");
+        await mp_js_do_str("print('hello world')");
       };
     </script>
   </body>
@@ -108,7 +108,7 @@ Initialize MicroPython with the given stack size in bytes. This must be
 called before attempting to interact with MicroPython.
 
 ```
-mp_js_do_str(code)
+await mp_js_do_str(code)
 ```
 
 Execute the input code. `code` must be a `string`.
diff --git a/ports/webassembly/wrapper.js b/ports/webassembly/wrapper.js
index 981ade5d80113..ab92045dfad78 100644
--- a/ports/webassembly/wrapper.js
+++ b/ports/webassembly/wrapper.js
@@ -29,7 +29,7 @@ var Module = {};
 var mainProgram = function()
 {
   mp_js_init = Module.cwrap('mp_js_init', 'null', ['number']);
-  mp_js_do_str = Module.cwrap('mp_js_do_str', 'number', ['string']);
+  mp_js_do_str = Module.cwrap('mp_js_do_str', 'number', ['string'], {async: true});
   mp_js_init_repl = Module.cwrap('mp_js_init_repl', 'null', ['null']);
   mp_js_process_char = Module.cwrap('mp_js_process_char', 'number', ['number']);
 
@@ -75,7 +75,9 @@ var mainProgram = function()
               }
           });
       } else {
-          process.exitCode = mp_js_do_str(contents);
+          mp_js_do_str(contents).then(exitCode => {
+              process.exitCode = exitCode
+          })
       }
   }
 }

From 813d559bc098eeaa1c6e0fa1deff92e666c0b458 Mon Sep 17 00:00:00 2001
From: elibdev <eli@elib.dev>
Date: Mon, 19 Jun 2023 14:15:42 -0400
Subject: [PATCH 0106/3129] webassembly: Make mp_js_process_char asynchronous.

This may also call the garbage collector.

Signed-off-by: Eli Bierman <eli@elib.dev>
---
 ports/webassembly/README.md  |  2 +-
 ports/webassembly/wrapper.js | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index 10cc6aa8c1157..abd2864a56cb3 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -121,7 +121,7 @@ Initialize MicroPython repl. Must be called before entering characters into
 the repl.
 
 ```
-mp_js_process_char(char)
+await mp_js_process_char(char)
 ```
 
 Input character into MicroPython repl. `char` must be of type `number`. This
diff --git a/ports/webassembly/wrapper.js b/ports/webassembly/wrapper.js
index ab92045dfad78..e63abfffe4ae9 100644
--- a/ports/webassembly/wrapper.js
+++ b/ports/webassembly/wrapper.js
@@ -31,7 +31,7 @@ var mainProgram = function()
   mp_js_init = Module.cwrap('mp_js_init', 'null', ['number']);
   mp_js_do_str = Module.cwrap('mp_js_do_str', 'number', ['string'], {async: true});
   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_process_char = Module.cwrap('mp_js_process_char', 'number', ['number'], {async: true});
 
   MP_JS_EPOCH = Date.now();
 
@@ -69,9 +69,11 @@ var mainProgram = function()
           process.stdin.setRawMode(true);
           process.stdin.on('data', function (data) {
               for (var i = 0; i < data.length; i++) {
-                  if (mp_js_process_char(data[i])) {
-                      process.exit()
-                  }
+                  mp_js_process_char(data[i]).then(result => {
+                      if (result) {
+                          process.exit()
+                      }
+                  })
               }
           });
       } else {

From 7ca3c1d8920fc0a9ceef0a1d725009d1716e41fa Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Tue, 20 Jun 2023 16:13:19 +0900
Subject: [PATCH 0107/3129] stm32: Add USB support for STM32L1 MCUs.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/Makefile                          |  2 +-
 .../boards/NUCLEO_L152RE/mpconfigboard.h      |  9 ++++++
 ports/stm32/boards/stm32l1xx_hal_conf_base.h  |  5 ++++
 ports/stm32/mpconfigboard_common.h            |  2 +-
 ports/stm32/powerctrlboot.c                   | 21 ++-----------
 ports/stm32/stm32_it.c                        |  2 +-
 ports/stm32/usb.c                             |  2 +-
 ports/stm32/usbd_conf.c                       | 30 ++++++++++++++++++-
 8 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d5030b7e46da2..81a48249e89d3 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -404,7 +404,7 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_utils.c \
 	)
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 l0 l4 wb))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 l0 l1 l4 wb))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_pcd.c \
 	hal_pcd_ex.c \
diff --git a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
index 3609955893fe1..5b83a980ce164 100644
--- a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
@@ -7,6 +7,7 @@
 #define MICROPY_HW_RTC_USE_LSE      (1)
 #define MICROPY_HW_ENABLE_SERVO     (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (0)
 
 // HSE is 8MHz, HSI is 16MHz CPU freq set to 32MHz
 // Default source for the clock is HSI.
@@ -72,3 +73,11 @@
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
 
 #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_1
+
+// USB config
+#if MICROPY_HW_ENABLE_USB
+#if MICROPY_HW_CLK_USE_HSI
+#error STM32L152RE cannot use USB feature with HSI clock. Use HSE.
+#endif
+#define MICROPY_HW_USB_FS (1)
+#endif
diff --git a/ports/stm32/boards/stm32l1xx_hal_conf_base.h b/ports/stm32/boards/stm32l1xx_hal_conf_base.h
index b839fd29f0a3d..5871e8a45a6f2 100644
--- a/ports/stm32/boards/stm32l1xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l1xx_hal_conf_base.h
@@ -26,6 +26,9 @@
 #ifndef MICROPY_INCLUDED_STM32L1XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32L1XX_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 "stm32l1xx_hal_rcc.h"
 #include "stm32l1xx_hal_gpio.h"
@@ -38,6 +41,7 @@
 #include "stm32l1xx_hal_flash.h"
 #include "stm32l1xx_hal_i2c.h"
 #include "stm32l1xx_hal_iwdg.h"
+#include "stm32l1xx_hal_pcd.h"
 #include "stm32l1xx_hal_pwr.h"
 #include "stm32l1xx_hal_rtc.h"
 #include "stm32l1xx_hal_spi.h"
@@ -50,6 +54,7 @@
 #include "stm32l1xx_ll_pwr.h"
 #include "stm32l1xx_ll_rtc.h"
 #include "stm32l1xx_ll_usart.h"
+#include "stm32l1xx_ll_usb.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 8f2a6e530a540..149d2ae73a636 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -586,7 +586,7 @@
 // Whether the USB peripheral is device-only, or multiple OTG
 // For STM32G0 and STM32H5 the USB peripheral supports device and host mode,
 // but otherwise acts like a non-multi-OTG peripheral.
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L432xx) || defined(STM32WB)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L432xx) || defined(STM32WB)
 #define MICROPY_HW_USB_IS_MULTI_OTG (0)
 #else
 #define MICROPY_HW_USB_IS_MULTI_OTG (1)
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 149c34ae63ec4..1721f6c7ec836 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -348,6 +348,8 @@ void SystemClock_Config(void) {
 #elif defined(STM32L1)
 
 void SystemClock_Config(void) {
+    // Enable SYSCFG clock
+    __HAL_RCC_SYSCFG_CLK_ENABLE();
     // Enable power control peripheral
     __HAL_RCC_PWR_CLK_ENABLE();
 
@@ -388,25 +390,6 @@ void SystemClock_Config(void) {
     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)
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 84c05602b57b7..483537b649379 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -320,7 +320,7 @@ void USB_IRQHandler(void) {
 }
 #endif
 
-#elif defined(STM32G4) || defined(STM32WB)
+#elif defined(STM32G4) || defined(STM32L1) || defined(STM32WB)
 
 #if MICROPY_HW_USB_FS
 void USB_LP_IRQHandler(void) {
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 94d62f7625a57..c3b8544417d0b 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -59,7 +59,7 @@
 #endif
 
 // Maximum number of endpoints (excluding EP0)
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32WB)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32WB)
 #define MAX_ENDPOINT(dev_id) (7)
 #elif defined(STM32L4)
 #define MAX_ENDPOINT(dev_id) (5)
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 9f187fc08b57a..5d9e7177de564 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -75,6 +75,16 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         mp_hal_pin_config(pin_A12, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
         mp_hal_pin_config_speed(pin_A12, GPIO_SPEED_FREQ_VERY_HIGH);
 
+        #elif defined(STM32L1)
+
+        // STM32L1 doesn't have an alternate function for USB.
+        // To be disconnected from all peripherals, put in input mode.
+
+        mp_hal_pin_config(pin_A11, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0);
+        mp_hal_pin_config_speed(pin_A11, GPIO_SPEED_FREQ_VERY_HIGH);
+        mp_hal_pin_config(pin_A12, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0);
+        mp_hal_pin_config_speed(pin_A12, GPIO_SPEED_FREQ_VERY_HIGH);
+
         #else
 
         // Other MCUs have an alternate function for GPIO's to be in USB mode.
@@ -149,7 +159,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         #elif defined(STM32L432xx)
         NVIC_SetPriority(USB_FS_IRQn, IRQ_PRI_OTG_FS);
         HAL_NVIC_EnableIRQ(USB_FS_IRQn);
-        #elif defined(STM32G4) || defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32L1) || defined(STM32WB)
         NVIC_SetPriority(USB_LP_IRQn, IRQ_PRI_OTG_FS);
         HAL_NVIC_EnableIRQ(USB_LP_IRQn);
         #else
@@ -708,6 +718,24 @@ void USBD_LL_Delay(uint32_t Delay) {
     HAL_Delay(Delay);
 }
 
+#if defined(STM32L1)
+/**
+  * @brief Software Device Connection
+  * @param hpcd: PCD handle
+  * @param state: Connection state (0: disconnected / 1: connected)
+  * @retval None
+  */
+void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state) {
+    if (state == 1) {
+        /*  DP Pull-Down is Internal */
+        __HAL_SYSCFG_USBPULLUP_ENABLE();
+    } else {
+        /*  DP Pull-Down is Internal */
+        __HAL_SYSCFG_USBPULLUP_DISABLE();
+    }
+}
+#endif
+
 #endif // MICROPY_HW_USB_FS || MICROPY_HW_USB_HS
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

From a2c02014cd4df7cd2b7bea611b555d3a58a4d02f Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Tue, 27 Jun 2023 22:20:12 +0900
Subject: [PATCH 0108/3129] stm32: Modify RCC->APB2ENR directly instead of HAL
 API.

Also, it is needed only when USB is enabled.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/powerctrlboot.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 1721f6c7ec836..51b740a809031 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -348,8 +348,6 @@ void SystemClock_Config(void) {
 #elif defined(STM32L1)
 
 void SystemClock_Config(void) {
-    // Enable SYSCFG clock
-    __HAL_RCC_SYSCFG_CLK_ENABLE();
     // Enable power control peripheral
     __HAL_RCC_PWR_CLK_ENABLE();
 
@@ -390,6 +388,10 @@ void SystemClock_Config(void) {
     SystemCoreClockUpdate();
     powerctrl_config_systick();
 
+    #if MICROPY_HW_ENABLE_USB
+    RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN;
+    #endif
+
     // Disable the Debug Module in low-power mode due to prevent
     // unexpected HardFault after __WFI().
     #if !defined(NDEBUG)

From dd8de8b41227c423330244f2a931d6bd98e63947 Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Wed, 28 Jun 2023 11:18:07 +0200
Subject: [PATCH 0109/3129] stm32/modmachine: Remove duplicate
 machine_timer_type declaration.

Signed-off-by: Tobias Thyrrestrup <tt@LEGO.com>
---
 ports/stm32/modmachine.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 0c776280b416c..409c552e6c0cb 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -29,7 +29,6 @@
 #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_i2c_type;
 extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_spi_type;

From 7bced2eaece1033cde8d6169555956214e92b542 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Jul 2023 13:45:53 +1000
Subject: [PATCH 0110/3129] stm32/modmachine: Make machine_reset_cause_obj
 public.

To match the other functions in the machine module, in particular so that
MICROPY_PY_MACHINE can be disabled without getting a compiler warning about
unused code.

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

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 1869b984dab0a..69fe8f4f54a83 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -387,7 +387,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsle
 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);
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
 #if MICROPY_PY_MACHINE
 
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 409c552e6c0cb..28d9c699d63fc 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -48,6 +48,7 @@ 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_reset_cause_obj);
 
 MP_DECLARE_CONST_FUN_OBJ_0(machine_disable_irq_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj);

From 1f35576a69e626bd9801f0e9ca6aa117405a39fc Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Sun, 25 Jun 2023 22:48:39 +0100
Subject: [PATCH 0111/3129] esp32: Re-enable mDNS after move to IDF v5.0.2.

mDNS was disabled in e4650125b88a35f074097f16d84a8f49bd22ac06.  This commit
re-enables it.

For reference see:
https://docs.espressif.com/projects/esp-idf/en/latest/esp32/migration-guides/release-5.x/5.0/removed-components.html

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 ports/esp32/main_esp32/idf_component.yml   | 5 +++++
 ports/esp32/main_esp32c3/idf_component.yml | 5 +++++
 ports/esp32/main_esp32s2/idf_component.yml | 3 ++-
 ports/esp32/main_esp32s3/idf_component.yml | 3 ++-
 ports/esp32/modsocket.c                    | 4 ++++
 ports/esp32/mpconfigport.h                 | 4 ++--
 ports/esp32/network_wlan.c                 | 4 ++++
 7 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 ports/esp32/main_esp32/idf_component.yml
 create mode 100644 ports/esp32/main_esp32c3/idf_component.yml

diff --git a/ports/esp32/main_esp32/idf_component.yml b/ports/esp32/main_esp32/idf_component.yml
new file mode 100644
index 0000000000000..8be21ed2fbe87
--- /dev/null
+++ b/ports/esp32/main_esp32/idf_component.yml
@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns: "~1.1.0"
+  idf:
+    version: ">=5.0.2"
diff --git a/ports/esp32/main_esp32c3/idf_component.yml b/ports/esp32/main_esp32c3/idf_component.yml
new file mode 100644
index 0000000000000..8be21ed2fbe87
--- /dev/null
+++ b/ports/esp32/main_esp32c3/idf_component.yml
@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns: "~1.1.0"
+  idf:
+    version: ">=5.0.2"
diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml
index fe3213bd26af2..69e27bf8b54bc 100644
--- a/ports/esp32/main_esp32s2/idf_component.yml
+++ b/ports/esp32/main_esp32s2/idf_component.yml
@@ -1,5 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
+  espressif/mdns: "~1.1.0"
+  espressif/esp_tinyusb: "~1.0.0"
   idf:
     version: ">=5.0.2"
-  espressif/esp_tinyusb: "~1.0.0"
diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml
index fe3213bd26af2..69e27bf8b54bc 100644
--- a/ports/esp32/main_esp32s3/idf_component.yml
+++ b/ports/esp32/main_esp32s3/idf_component.yml
@@ -1,5 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
+  espressif/mdns: "~1.1.0"
+  espressif/esp_tinyusb: "~1.0.0"
   idf:
     version: ">=5.0.2"
-  espressif/esp_tinyusb: "~1.0.0"
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 7484fce786c74..ba1fe096f6946 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -58,6 +58,10 @@
 #define MDNS_QUERY_TIMEOUT_MS (5000)
 #define MDNS_LOCAL_SUFFIX ".local"
 
+#ifndef NO_QSTR
+#include "mdns.h"
+#endif
+
 enum {
     SOCKET_STATE_NEW,
     SOCKET_STATE_CONNECTED,
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b18681bb572df..e97980c36f467 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -221,11 +221,11 @@ typedef long mp_off_t;
 #endif
 
 #ifndef MICROPY_HW_ENABLE_MDNS_QUERIES
-#define MICROPY_HW_ENABLE_MDNS_QUERIES      (0)
+#define MICROPY_HW_ENABLE_MDNS_QUERIES      (1)
 #endif
 
 #ifndef MICROPY_HW_ENABLE_MDNS_RESPONDER
-#define MICROPY_HW_ENABLE_MDNS_RESPONDER    (0)
+#define MICROPY_HW_ENABLE_MDNS_RESPONDER    (1)
 #endif
 
 #ifndef MICROPY_BOARD_STARTUP
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index cfedd898cdf24..3c88f8db8682a 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -42,6 +42,10 @@
 #include "esp_wifi.h"
 #include "esp_log.h"
 
+#ifndef NO_QSTR
+#include "mdns.h"
+#endif
+
 #if MICROPY_PY_NETWORK_WLAN
 
 #if (WIFI_MODE_STA & WIFI_MODE_AP != WIFI_MODE_NULL || WIFI_MODE_STA | WIFI_MODE_AP != WIFI_MODE_APSTA)

From 2c67671651651363fc6f89a334508d0029758eef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jul 2023 00:12:13 +1000
Subject: [PATCH 0112/3129] esp32/boards/GENERIC_OTA: Enable silent checks to
 reduce firmware size.

Enabling mDNS put this firmware over the limit of the OTA partition size,
so tweak the compiler settings to reduce the firmware size.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_OTA/sdkconfig.board | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp32/boards/GENERIC_OTA/sdkconfig.board b/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
index d314860cc9378..7ff939aa991f2 100644
--- a/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
@@ -1,3 +1,6 @@
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-ota.csv"
+
+# Reduce firmware size to fit in the OTA partition.
+CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y

From dbced75b48d2fed969e4ee430a50cadf858eb4bf Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Sat, 1 Jul 2023 13:54:44 +1000
Subject: [PATCH 0113/3129] esp32/network_wlan: Wait for STA/AP START/STOP
 event in wlan.active.

This is a fix for commit bccbaa92b1fc6237f0f49a7f07cc194835fbf4e3:
- Should only wait for WIFI_EVENT_STA_START when invoked on the STA_IF
  interface.
- The WIFI_EVENT_STA_START event is generated every time the STA_IF
  interface is set active(True) and it was previously inactive, ie. not
  only after calling esp_wifi_start().
- Also wait for WIFI_EVENT_STA_STOP when deactivating the interface.
- Also wait for relevant AP events.

Fixes issue #11910.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modnetwork.h   |  1 +
 ports/esp32/network_lan.c  | 15 +++++++--------
 ports/esp32/network_wlan.c | 29 ++++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index b1b3fc368a450..79bf9973ca95b 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -44,6 +44,7 @@ typedef struct _base_if_obj_t {
     mp_obj_base_t base;
     esp_interface_t if_id;
     esp_netif_t *netif;
+    volatile bool active;
 } base_if_obj_t;
 
 extern const mp_obj_type_t esp_network_wlan_type;
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 8128eb5e11d49..fe3ff6f772a8a 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -48,7 +48,6 @@
 typedef struct _lan_if_obj_t {
     base_if_obj_t base;
     bool initialized;
-    bool active;
     int8_t mdc_pin;
     int8_t mdio_pin;
     int8_t phy_power_pin;
@@ -295,7 +294,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
 
     esp_err_t esp_err = esp_eth_driver_install(&config, &self->eth_handle);
     if (esp_err == ESP_OK) {
-        self->active = false;
+        self->base.active = false;
         self->initialized = true;
     } else {
         if (esp_err == ESP_ERR_INVALID_ARG) {
@@ -322,19 +321,19 @@ 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_start(self->eth_handle) == ESP_OK);
-            if (!self->active) {
+            self->base.active = (esp_eth_start(self->eth_handle) == ESP_OK);
+            if (!self->base.active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet enable failed"));
             }
         } else {
-            self->active = !(esp_eth_stop(self->eth_handle) == ESP_OK);
-            if (self->active) {
+            self->base.active = !(esp_eth_stop(self->eth_handle) == ESP_OK);
+            if (self->base.active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet disable failed"));
             }
         }
     }
 
-    return mp_obj_new_bool(self->active);
+    return mp_obj_new_bool(self->base.active);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lan_active_obj, 1, 2, lan_active);
 
@@ -345,7 +344,7 @@ 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->phy->get_link(self->phy) == ETH_LINK_UP) : mp_const_false;
+    return self->base.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);
 
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 3c88f8db8682a..8287731c31b89 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -76,7 +76,7 @@ static bool mdns_initialised = false;
 #endif
 
 static uint8_t conf_wifi_sta_reconnects = 0;
-static volatile uint8_t wifi_sta_reconnects;
+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.
@@ -84,9 +84,14 @@ static void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_b
     switch (event_id) {
         case WIFI_EVENT_STA_START:
             ESP_LOGI("wifi", "STA_START");
+            wlan_sta_obj.active = true;
             wifi_sta_reconnects = 0;
             break;
 
+        case WIFI_EVENT_STA_STOP:
+            wlan_sta_obj.active = false;
+            break;
+
         case WIFI_EVENT_STA_CONNECTED:
             ESP_LOGI("network", "CONNECTED");
             break;
@@ -140,6 +145,15 @@ static void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_b
             }
             break;
         }
+
+        case WIFI_EVENT_AP_START:
+            wlan_ap_obj.active = true;
+            break;
+
+        case WIFI_EVENT_AP_STOP:
+            wlan_ap_obj.active = false;
+            break;
+
         default:
             break;
     }
@@ -184,10 +198,12 @@ void esp_initialise_wifi(void) {
         wlan_sta_obj.base.type = &esp_network_wlan_type;
         wlan_sta_obj.if_id = ESP_IF_WIFI_STA;
         wlan_sta_obj.netif = esp_netif_create_default_wifi_sta();
+        wlan_sta_obj.active = false;
 
         wlan_ap_obj.base.type = &esp_network_wlan_type;
         wlan_ap_obj.if_id = ESP_IF_WIFI_AP;
         wlan_ap_obj.netif = esp_netif_create_default_wifi_ap();
+        wlan_ap_obj.active = false;
 
         wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
         ESP_LOGD("modnetwork", "Initializing WiFi");
@@ -237,16 +253,15 @@ STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
         } else {
             esp_exceptions(esp_wifi_set_mode(mode));
             if (!wifi_started) {
-                // WIFI_EVENT_STA_START must be received before esp_wifi_connect() can be called.
-                // Use the `wifi_sta_reconnects` variable to detect that event.
-                wifi_sta_reconnects = 1;
                 esp_exceptions(esp_wifi_start());
                 wifi_started = true;
-                while (wifi_sta_reconnects != 0) {
-                    MICROPY_EVENT_POLL_HOOK;
-                }
             }
         }
+
+        // Wait for the interface to be in the correct state.
+        while (self->active != active) {
+            MICROPY_EVENT_POLL_HOOK;
+        }
     }
 
     return (mode & bit) ? mp_const_true : mp_const_false;

From cddeb5f0754e42f5e50da8ccefb5c073dce61be6 Mon Sep 17 00:00:00 2001
From: Elvis Pfutzenreuter <epxx@epxx.co>
Date: Thu, 6 Jul 2023 23:50:30 -0300
Subject: [PATCH 0114/3129] docs/esp32/quickref: Add LAN example for WT32-ETH01
 version 1.4.

This board requires slightly different configuration to work.  It is
important to hard reset (cycle power) if you try to initialize LAN and it
fails, before trying again with new parameters.

Discussion: https://github.com/orgs/micropython/discussions/11446

AliExpress purchase link: https://pt.aliexpress.com/item/1005002023196214.html

Signed-off-by: Elvis Pfutzenreuter <epxx@epxx.co>
---
 docs/esp32/quickref.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index f4eb9a0ce8ca2..5be737fa2d763 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -150,6 +150,12 @@ These are working configurations for LAN interfaces of popular boards::
     lan = network.LAN(mdc=machine.Pin(23), mdio=machine.Pin(18),
                       phy_type=network.PHY_LAN8720, phy_addr=1, power=None)
 
+    # Wireless-Tag's WT32-ETH01 v1.4
+
+    lan = network.LAN(mdc=machine.Pin(23), mdio=machine.Pin(18),
+                      phy_type=network.PHY_LAN8720, phy_addr=1,
+                      power=machine.Pin(16))
+
     # Espressif ESP32-Ethernet-Kit_A_V1.2
 
     lan = network.LAN(id=0, mdc=Pin(23), mdio=Pin(18), power=Pin(5),

From ec9ea97413c6091c101c3ab10207ae4daf1c56db Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 1 Jul 2023 10:25:18 +0900
Subject: [PATCH 0115/3129] stm32/dac: Fix dac.write_timed on G4 MCUs to use
 32-bit DMA access.

For STMG4 MCUs, the peripheral registers for DAC have to be accessed by
words (32bits) because DAC is connected to AHB directly.

(This requirement is also there for other MCU series.  However, if DAC is
connected to APB like F4/L1/L4 MCUs, AHB byte or half-word transfer is
changed into a 32-bit APB transfer.  This means that PSIZE does not have to
be DMA_PDATAALIGN_WORD on these MCUs, and in fact must be BYTE/HALFWORD to
function correctly.)

Fixes issue #9563.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/dac.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index e44e519b636c9..7a446854f80a7 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -170,9 +170,19 @@ STATIC void dac_start(uint32_t dac_channel) {
 STATIC void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, uint32_t dma_mode, uint32_t bit_size, uint32_t dac_align, size_t len, void *buf) {
     uint32_t dma_align;
     if (bit_size == 8) {
+        #if defined(STM32G4)
+        // For STM32G4, DAC registers have to be accessed by words (32-bit).
+        dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_WORD;
+        #else
         dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_BYTE;
+        #endif
     } else {
+        #if defined(STM32G4)
+        // For STM32G4, DAC registers have to be accessed by words (32-bit).
+        dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_WORD;
+        #else
         dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_HALFWORD;
+        #endif
     }
 
     uint32_t base;

From de8035b51070f14b3af32870fb8eede97ddb4215 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 8 Jul 2023 10:46:01 +0900
Subject: [PATCH 0116/3129] stm32/adc: Fix ADC clock prescaler for G4 MCUs.

For STM32G4, ADC clock frequency should be equal or less than 60MHz.
To satisfy this specification, ADC clock prescaler should be equal or
greater than 4 (For example, NUCLEO_G474RE runs 170MHz).

In addition, to obtain accurate internal channel value,
the ADC clock prescaler is set to 16 because vbat needs at least 12us
(16/170*247.5=23.3us).

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 7c51a8b39c14b..e2eb5f7e5a9b2 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -344,7 +344,11 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
     adch->Init.DMAContinuousRequests = DISABLE;
     #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4)
+    adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV16;
+    #else
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+    #endif
     adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
     adch->Init.LowPowerAutoWait = DISABLE;
     adch->Init.Overrun = ADC_OVR_DATA_PRESERVED;

From 0ba94a67ba72f2e04bfc26dcf0ed687addd0d740 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 8 Jul 2023 10:59:35 +0900
Subject: [PATCH 0117/3129] stm32/adc: Fix pyb.ADCAll.read_core_temp for G4
 MCUs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For STM32G4,
 * TS_CAL1 raw data acquired at a temperature of 30°C
 * TS_CAL2 raw data acquired at a temperature of 130°C
Also, these values are at VDDA=3.0V.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index e2eb5f7e5a9b2..fc0882286ca23 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -866,6 +866,12 @@ 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) || defined(STM32L1) || defined(STM32L4)
+    // Update the reference correction factor before reading tempsensor
+    // because TS_CAL1 and TS_CAL2 of STM32G4,L1/L4 are at VDDA=3.0V
+    adc_read_core_vref(adcHandle);
+    #endif
+
     #if defined(STM32G4)
     int32_t raw_value = 0;
     if (adcHandle->Instance == ADC1) {
@@ -873,15 +879,11 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
     } else {
         return 0;
     }
+    float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 100.0f;
     #else
-    #if defined(STM32L1) || defined(STM32L4)
-    // Update the reference correction factor before reading tempsensor
-    // 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);
-    #endif
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 80.0f;
+    #endif
     return (((float)raw_value * adc_refcor - *ADC_CAL1) / core_temp_avg_slope) + 30.0f;
 }
 

From d9764ad1408f4cdf981a1e0f4db380a4cb4fe94c Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 8 Jul 2023 11:04:20 +0900
Subject: [PATCH 0118/3129] stm32/adc: Fix reading internal ADC channels on G4
 MCUs.

For STM32G4 series, the internal sensors are connected to:
- ADC1_IN16: Temperature sensor
- ADC1_IN17: Battery voltage monitoring
- ADC1_IN18: Internal voltage reference
but ADC_CHANNEL_TEMPSENSOR_ADC1, ADC_CHANNEL_VBAT,
ADC_CHANNEL_VREFINT are not defined as 16, 17, 18.

This commit converts channel 16, 17, 18 to ADC_CHANNEL_x in
adc_get_internal_channel().

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index fc0882286ca23..93eaa93f024f5 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -220,6 +220,14 @@ static inline uint32_t adc_get_internal_channel(uint32_t channel) {
     if (channel == 16) {
         channel = ADC_CHANNEL_TEMPSENSOR;
     }
+    #elif defined(STM32G4)
+    if (channel == 16) {
+        channel = ADC_CHANNEL_TEMPSENSOR_ADC1;
+    } else if (channel == 17) {
+        channel = ADC_CHANNEL_VBAT;
+    } else if (channel == 18) {
+        channel = ADC_CHANNEL_VREFINT;
+    }
     #elif defined(STM32L4)
     if (channel == 0) {
         channel = ADC_CHANNEL_VREFINT;

From 0a31b9bf78b5ac57ef7c4df4a161779991106649 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 8 Jul 2023 11:11:29 +0900
Subject: [PATCH 0119/3129] stm32/machine_adc: Fix machine.ADC to work on G4
 MCUs.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/machine_adc.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 3a348e18bf945..041b0672382dc 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -45,7 +45,9 @@
 #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) || defined(STM32H5)
+#elif defined(STM32G4)
+#define ADC_STAB_DELAY_US (20)
+#elif defined(STM32H5)
 #define ADC_STAB_DELAY_US (1) // TODO: Check if this is enough
 #elif defined(STM32L4)
 #define ADC_STAB_DELAY_US (10)
@@ -148,6 +150,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(STM32G4)
+    ADC12_COMMON->CCR = 7 << ADC_CCR_PRESC_Pos; // PCLK/16 (asynchronous clock mode)
     #elif defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     ADC12_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
     #elif defined(STM32H7)
@@ -161,18 +165,18 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     ADC_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos; // PRESC=1
     #endif
 
-    #if defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     if (adc->CR & ADC_CR_DEEPPWD) {
         adc->CR = 0; // disable deep powerdown
     }
     #endif
 
-    #if defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G4) || defined(STM32H5) || 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)
         mp_hal_delay_us(10); // T_ADCVREG_STUP
-        #elif defined(STM32L4) || defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         mp_hal_delay_us(20); // T_ADCVREG_STUP
         #endif
     }
@@ -315,8 +319,8 @@ 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(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
-    #if defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     ADC_Common_TypeDef *adc_common = ADC12_COMMON;
     #elif defined(STM32H7)
     #if defined(ADC_VER_V5_V90)
@@ -334,12 +338,25 @@ STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     #endif
     if (channel == ADC_CHANNEL_VREFINT) {
         adc_common->CCR |= ADC_CCR_VREFEN;
+    #if defined(STM32G4)
+    } else if (channel == ADC_CHANNEL_TEMPSENSOR_ADC1) {
+        adc_common->CCR |= ADC_CCR_VSENSESEL;
+    #else
     } else if (channel == ADC_CHANNEL_TEMPSENSOR) {
         adc_common->CCR |= ADC_CCR_TSEN;
+    #endif
         adc_stabilisation_delay_us(ADC_TEMPSENSOR_DELAY_US);
     } else if (channel == ADC_CHANNEL_VBAT) {
+        #if defined(STM32G4)
+        adc_common->CCR |= ADC_CCR_VBATSEL;
+        #else
         adc_common->CCR |= ADC_CCR_VBATEN;
+        #endif
     }
+    #if defined(STM32G4)
+    channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
+    adc->DIFSEL &= ~(1 << channel); // Set channel to Single-ended.
+    #endif
     adc->SQR1 = (channel & 0x1f) << ADC_SQR1_SQ1_Pos | (1 - 1) << ADC_SQR1_L_Pos;
     __IO uint32_t *smpr;
     if (channel <= 9) {

From cb38f77918b7c7dde2904b7f13ad38aaf69d7350 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 8 Jul 2023 11:14:00 +0900
Subject: [PATCH 0120/3129] stm32/adc: Add workaround for ADC errata with G4
 MCUs.

For STM32G4, there is a errata on ADC that may get wrong ADC result.
According to the errata sheet, this can be avoid by performing two
consecutive ADC conversions and keep second result.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c         | 15 ++++++++++++---
 ports/stm32/machine_adc.c | 21 +++++++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 93eaa93f024f5..ec4a18cdeb6b0 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -458,9 +458,18 @@ 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(adcHandle, EOC_TIMEOUT);
-    uint32_t value = adcHandle->Instance->DR;
+    uint32_t value;
+    #if defined(STM32G4)
+    // For STM32G4 there is errata 2.7.7, "Wrong ADC result if conversion done late after
+    // calibration or previous conversion".  According to the errata, this can be avoided
+    // by performing two consecutive ADC conversions and keeping the second result.
+    for (uint8_t i = 0; i < 2; i++)
+    #endif
+    {
+        HAL_ADC_Start(adcHandle);
+        adc_wait_for_eoc_or_timeout(adcHandle, EOC_TIMEOUT);
+        value = adcHandle->Instance->DR;
+    }
     HAL_ADC_Stop(adcHandle);
     return value;
 }
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 041b0672382dc..fee3d698dbb85 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -371,13 +371,22 @@ STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
 }
 
 STATIC uint32_t adc_read_channel(ADC_TypeDef *adc) {
-    #if ADC_V2
-    adc->CR |= ADC_CR_ADSTART;
-    #else
-    adc->CR2 |= ADC_CR2_SWSTART;
+    uint32_t value;
+    #if defined(STM32G4)
+    // For STM32G4 there is errata 2.7.7, "Wrong ADC result if conversion done late after
+    // calibration or previous conversion".  According to the errata, this can be avoided
+    // by performing two consecutive ADC conversions and keeping the second result.
+    for (uint8_t i = 0; i < 2; i++)
     #endif
-    adc_wait_eoc(adc, ADC_EOC_TIMEOUT_MS);
-    uint32_t value = adc->DR;
+    {
+        #if ADC_V2
+        adc->CR |= ADC_CR_ADSTART;
+        #else
+        adc->CR2 |= ADC_CR2_SWSTART;
+        #endif
+        adc_wait_eoc(adc, ADC_EOC_TIMEOUT_MS);
+        value = adc->DR;
+    }
     return value;
 }
 

From 409978a1fb85968ac3a5eb0bc33788eb507dee14 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 8 Jul 2023 12:01:01 +0900
Subject: [PATCH 0121/3129] stm32/adc: Fix pyb.ADCAll.read_core_bat on G4 and
 L4 MCUs.

Update adc_refcor before reading ADC_CHANNEL_VBAT because VREFINT_CAL is at
VDDA=3.0V.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index ec4a18cdeb6b0..20cd2499e13a9 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -905,6 +905,12 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
 }
 
 float adc_read_core_vbat(ADC_HandleTypeDef *adcHandle) {
+    #if defined(STM32G4) || defined(STM32L4)
+    // Update the reference correction factor before reading tempsensor
+    // because VREFINT of STM32G4,L4 is at VDDA=3.0V
+    adc_read_core_vref(adcHandle);
+    #endif
+
     #if defined(STM32L152xE)
     mp_raise_NotImplementedError(MP_ERROR_TEXT("read_core_vbat not supported"));
     #else

From 730525cec965a912354454ec015a3d043d5579d3 Mon Sep 17 00:00:00 2001
From: Victor Rajewski <victor@allumeenergy.com.au>
Date: Tue, 4 Jul 2023 15:11:06 +1000
Subject: [PATCH 0122/3129] stm32/qspi: Allow qspi_write_cmd_data to write cmd
 with 1 data byte.

The existing qspi for stm32 implementation can only send a spi command with
exactly 0 or 2 data bytes.  Certain spiflash chips (e.g. AT25SF321B) have
commands that only take a single data byte, and will ignore the command if
more than that is sent.  This commit allows sending a command with a single
data byte.

Signed-off-by: Victor Rajewski <victor@allumeenergy.com.au>
---
 ports/stm32/qspi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index a79e692e0ec80..c10bec2365504 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -232,8 +232,12 @@ STATIC int qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t
         while (!(QUADSPI->SR & QUADSPI_SR_FTF)) {
         }
 
-        // This assumes len==2
-        *(uint16_t *)&QUADSPI->DR = data;
+        if (len == 1) {
+            *(uint8_t *)&QUADSPI->DR = data;
+        } else {
+            // This assumes len==2
+            *(uint16_t *)&QUADSPI->DR = data;
+        }
     }
 
     // Wait for write to finish

From 62673a7708083ab3d9452d67117b424cd4b81150 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Jul 2023 13:10:31 +1000
Subject: [PATCH 0123/3129] stm32/mpconfigport: Always define
 MICROPY_SOFT_TIMER_TICKS_MS.

Even if MICROPY_PY_MACHINE is disabled, the soft timer is still used.

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

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 3c44bddfd5e6d..c3202d1f2e3da 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -123,7 +123,6 @@
 #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)
@@ -275,6 +274,9 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_THREAD_YIELD()
 #endif
 
+// Configuration for shared/runtime/softtimer.c.
+#define MICROPY_SOFT_TIMER_TICKS_MS uwTick
+
 // 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);

From 88771c150098df53aa6a3fedcdd25b11eeb4e134 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Jul 2023 13:18:09 +1000
Subject: [PATCH 0124/3129] renesas-ra,stm32: Remove duplicate machine module
 from constants list.

In the u-module renaming done in 30628d1bb782006c88325a086ddfcd5c2e5ddbb4,
these duplicate lines were accidentally left.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/mpconfigport.h | 1 -
 ports/stm32/mpconfigport.h      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index a4a0caa373ba6..842de1eff757d 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -145,7 +145,6 @@
 
 #if MICROPY_PY_MACHINE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
 #else
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index c3202d1f2e3da..e3e24f4a9d468 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -166,7 +166,6 @@ extern const struct _mp_obj_module_t stm_module;
 
 #if MICROPY_PY_MACHINE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
 #else
 #define MACHINE_BUILTIN_MODULE_CONSTANTS

From 14c2b641312c7faec20b521b910a6354280ca068 Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Tue, 11 Jul 2023 18:05:28 +0100
Subject: [PATCH 0125/3129] webassembly: Replace typeof window check with
 ENVIRONMENT_IS_NODE flag.

When the "typeof window" check is run within a web worker the window is
undefined, causing an error because "require" is only defined in a Node
environment.  Change the logic to reflect the true intentions of when this
code should run, ie in Node only.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/library.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index fc5b542488a6a..009b0a4dcc20c 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -27,7 +27,7 @@
 mergeInto(LibraryManager.library, {
     mp_js_write: function(ptr, len) {
         const buffer = HEAPU8.subarray(ptr, ptr + len)
-        if (typeof window === 'undefined') {
+        if (ENVIRONMENT_IS_NODE) {
             process.stdout.write(buffer);
         } else {
             const printEvent = new CustomEvent('micropython-print', { detail: buffer });
@@ -40,7 +40,7 @@ mergeInto(LibraryManager.library, {
     },
 
     mp_js_hook: function() {
-        if (typeof window === 'undefined') {
+        if (ENVIRONMENT_IS_NODE) {
             var mp_interrupt_char = Module.ccall('mp_hal_get_interrupt_char', 'number', ['number'], ['null']);
             var fs = require('fs');
 

From 606ec9bfb1cca262cf5b936db78924a609f9e73d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 May 2023 17:00:53 +1000
Subject: [PATCH 0126/3129] py/compile: Fix async for's stack handling of
 iterator expression.

Prior to this fix, async for assumed the iterator expression was a simple
identifier, and used that identifier as a local to store the intermediate
iterator object.  This is incorrect behaviour.

This commit fixes the issue by keeping the iterator object on the stack as
an anonymous local variable.

Fixes issue #11511.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c                  | 25 ++++++++++---
 tests/basics/async_for.py     | 70 +++++++++++++++++++++++++++++------
 tests/basics/async_for.py.exp | 43 ++++++++++++++++++++-
 3 files changed, 120 insertions(+), 18 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index bb7c1117fa436..4f91ca49b903a 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1768,18 +1768,21 @@ STATIC void compile_await_object_method(compiler_t *comp, qstr method) {
 }
 
 STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
-    // comp->break_label |= MP_EMIT_BREAK_FROM_FOR;
-
-    qstr context = MP_PARSE_NODE_LEAF_ARG(pns->nodes[1]);
+    // Allocate labels.
     uint while_else_label = comp_next_label(comp);
     uint try_exception_label = comp_next_label(comp);
     uint try_else_label = comp_next_label(comp);
     uint try_finally_label = comp_next_label(comp);
 
+    // Stack: (...)
+
+    // Compile the iterator expression and load and call its __aiter__ method.
     compile_node(comp, pns->nodes[1]); // iterator
+    // Stack: (..., iterator)
     EMIT_ARG(load_method, MP_QSTR___aiter__, false);
+    // Stack: (..., iterator, __aiter__)
     EMIT_ARG(call_method, 0, 0, 0);
-    compile_store_id(comp, context);
+    // Stack: (..., iterable)
 
     START_BREAK_CONTINUE_BLOCK
 
@@ -1787,9 +1790,15 @@ STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns
 
     compile_increase_except_level(comp, try_exception_label, MP_EMIT_SETUP_BLOCK_EXCEPT);
 
-    compile_load_id(comp, context);
+    EMIT(dup_top);
+    // Stack: (..., iterable, iterable)
+
+    // Compile: yield from iterable.__anext__()
     compile_await_object_method(comp, MP_QSTR___anext__);
+    // Stack: (..., iterable, yielded_value)
+
     c_assign(comp, pns->nodes[0], ASSIGN_STORE); // variable
+    // Stack: (..., iterable)
     EMIT_ARG(pop_except_jump, try_else_label, false);
 
     EMIT_ARG(label_assign, try_exception_label);
@@ -1806,6 +1815,8 @@ STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns
     compile_decrease_except_level(comp);
     EMIT(end_except_handler);
 
+    // Stack: (..., iterable)
+
     EMIT_ARG(label_assign, try_else_label);
     compile_node(comp, pns->nodes[2]); // body
 
@@ -1817,6 +1828,10 @@ STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns
     compile_node(comp, pns->nodes[3]); // else
 
     EMIT_ARG(label_assign, break_label);
+    // Stack: (..., iterable)
+
+    EMIT(pop_top);
+    // Stack: (...)
 }
 
 STATIC void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_node_t *nodes, mp_parse_node_t body) {
diff --git a/tests/basics/async_for.py b/tests/basics/async_for.py
index 5fd0540828afe..f54f70238cae9 100644
--- a/tests/basics/async_for.py
+++ b/tests/basics/async_for.py
@@ -1,29 +1,75 @@
 # test basic async for execution
 # example taken from PEP0492
 
+
 class AsyncIteratorWrapper:
     def __init__(self, obj):
-        print('init')
-        self._it = iter(obj)
+        print("init")
+        self._obj = obj
+
+    def __repr__(self):
+        return "AsyncIteratorWrapper-" + self._obj
 
     def __aiter__(self):
-        print('aiter')
-        return self
+        print("aiter")
+        return AsyncIteratorWrapperIterator(self._obj)
+
+
+class AsyncIteratorWrapperIterator:
+    def __init__(self, obj):
+        print("init")
+        self._it = iter(obj)
 
     async def __anext__(self):
-        print('anext')
+        print("anext")
         try:
             value = next(self._it)
         except StopIteration:
             raise StopAsyncIteration
         return value
 
-async def coro():
-    async for letter in AsyncIteratorWrapper('abc'):
+
+def run_coro(c):
+    print("== start ==")
+    try:
+        c.send(None)
+    except StopIteration:
+        print("== finish ==")
+
+
+async def coro0():
+    async for letter in AsyncIteratorWrapper("abc"):
         print(letter)
 
-o = coro()
-try:
-    o.send(None)
-except StopIteration:
-    print('finished')
+
+run_coro(coro0())
+
+
+async def coro1():
+    a = AsyncIteratorWrapper("def")
+    async for letter in a:
+        print(letter)
+    print(a)
+
+
+run_coro(coro1())
+
+a_global = AsyncIteratorWrapper("ghi")
+
+
+async def coro2():
+    async for letter in a_global:
+        print(letter)
+    print(a_global)
+
+
+run_coro(coro2())
+
+
+async def coro3(a):
+    async for letter in a:
+        print(letter)
+    print(a)
+
+
+run_coro(coro3(AsyncIteratorWrapper("jkl")))
diff --git a/tests/basics/async_for.py.exp b/tests/basics/async_for.py.exp
index 1f728a66c82ed..6f59979c065de 100644
--- a/tests/basics/async_for.py.exp
+++ b/tests/basics/async_for.py.exp
@@ -1,5 +1,7 @@
+== start ==
 init
 aiter
+init
 anext
 a
 anext
@@ -7,4 +9,43 @@ b
 anext
 c
 anext
-finished
+== finish ==
+== start ==
+init
+aiter
+init
+anext
+d
+anext
+e
+anext
+f
+anext
+AsyncIteratorWrapper-def
+== finish ==
+init
+== start ==
+aiter
+init
+anext
+g
+anext
+h
+anext
+i
+anext
+AsyncIteratorWrapper-ghi
+== finish ==
+init
+== start ==
+aiter
+init
+anext
+j
+anext
+k
+anext
+l
+anext
+AsyncIteratorWrapper-jkl
+== finish ==

From 671b35ceae2d2b7b64f755524b3a5a42e29abcfe Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 4 Jul 2023 11:43:14 +1000
Subject: [PATCH 0127/3129] py/builtinimport: Fix built-in imports when
 external import is disabled.

Follow-up to 24c02c4eb5f11200f876bb57cd63a9d0bae91fd3 for when
MICROPY_ENABLE_EXTERNAL_IMPORT=0.  It now needs to try both extensible and
non-extensible modules.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/builtinimport.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/py/builtinimport.c b/py/builtinimport.c
index 4fee04b8f3415..d4cd254fd6a16 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -632,12 +632,17 @@ mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
         return elem->value;
     }
 
-    // Try the name directly as a built-in.
+    // Try the name directly as a non-extensible built-in (e.g. `micropython`).
     qstr module_name_qstr = mp_obj_str_get_qstr(args[0]);
     mp_obj_t module_obj = mp_module_get_builtin(module_name_qstr, false);
     if (module_obj != MP_OBJ_NULL) {
         return module_obj;
     }
+    // Now try as an extensible built-in (e.g. `time`).
+    module_obj = mp_module_get_builtin(module_name_qstr, true);
+    if (module_obj != MP_OBJ_NULL) {
+        return module_obj;
+    }
 
     // Couldn't find the module, so fail
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE

From 7d66ae603d91157069d7cdee065919a61f678fb9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jul 2023 16:39:26 +1000
Subject: [PATCH 0128/3129] esp32/machine_timer: Switch from legacy driver to
 timer HAL.

The legacy driver was deprecated in IDF v5, and crashes when the ISR
handler is called.  Instead of fixing the legacy code, this commit reworks
the machine.Timer class to use the low-level HAL driver.

Tested on ESP32, ESP32S2, ESP32S3 and ESP32C3.  Behaviour is the same as it
was before this commit, except the way the Timer object is printed, it now
gives more useful information (timer id, mode, period in ms).

Fixes issue #11970.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.base |  1 -
 ports/esp32/machine_timer.c       | 97 +++++++++++++++++--------------
 2 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index c74a19c0cf2aa..bf6c3f45c5269 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -75,6 +75,5 @@ CONFIG_UART_ISR_IN_IRAM=y
 
 # IDF 5 deprecated
 CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
-CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 5855cfb3e0b09..aba3db1983fce 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -35,10 +35,10 @@
 #include "modmachine.h"
 #include "mphalport.h"
 
-#include "driver/timer.h"
+#include "hal/timer_hal.h"
 #include "hal/timer_ll.h"
+#include "soc/timer_periph.h"
 
-#define TIMER_INTR_SEL TIMER_INTR_LEVEL
 #define TIMER_DIVIDER  8
 
 // TIMER_BASE_CLK is normally 80MHz. TIMER_DIVIDER ought to divide this exactly
@@ -48,6 +48,8 @@
 
 typedef struct _machine_timer_obj_t {
     mp_obj_base_t base;
+
+    timer_hal_context_t hal_context;
     mp_uint_t group;
     mp_uint_t index;
 
@@ -80,15 +82,9 @@ void machine_timer_deinit_all(void) {
 
 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 = self_in;
-
-    timer_config_t config;
-    mp_printf(print, "Timer(%p; ", self);
-
-    timer_get_config(self->group, self->index, &config);
-
-    mp_printf(print, "alarm_en=%d, ", config.alarm_en);
-    mp_printf(print, "auto_reload=%d, ", config.auto_reload);
-    mp_printf(print, "counter_en=%d)", config.counter_en);
+    qstr mode = self->repeat ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
+    uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms
+    mp_printf(print, "Timer(%u, mode=%q, period=%lu)", (self->group << 1) | self->index, mode, period);
 }
 
 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) {
@@ -126,8 +122,14 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
 }
 
 STATIC void machine_timer_disable(machine_timer_obj_t *self) {
+    if (self->hal_context.dev != NULL) {
+        // Disable the counter and alarm.
+        timer_ll_enable_counter(self->hal_context.dev, self->index, false);
+        timer_ll_enable_alarm(self->hal_context.dev, self->index, false);
+    }
+
     if (self->handle) {
-        timer_pause(self->group, self->index);
+        // Free the interrupt handler.
         esp_intr_free(self->handle);
         self->handle = NULL;
     }
@@ -138,39 +140,47 @@ STATIC void machine_timer_disable(machine_timer_obj_t *self) {
 
 STATIC void machine_timer_isr(void *self_in) {
     machine_timer_obj_t *self = self_in;
-    timg_dev_t *device = self->group ? &(TIMERG1) : &(TIMERG0);
 
-    #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
+    uint32_t intr_status = timer_ll_get_intr_status(self->hal_context.dev);
 
-    timer_ll_clear_intr_status(device, self->index);
-    timer_ll_set_alarm_value(device, self->index, self->repeat);
-
-    mp_sched_schedule(self->callback, self);
-    mp_hal_wake_main_task_from_isr();
+    if (intr_status & TIMER_LL_EVENT_ALARM(self->index)) {
+        timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
+        if (self->repeat) {
+            timer_ll_enable_alarm(self->hal_context.dev, self->index, true);
+        }
+        mp_sched_schedule(self->callback, self);
+        mp_hal_wake_main_task_from_isr();
+    }
 }
 
 STATIC void machine_timer_enable(machine_timer_obj_t *self) {
-    timer_config_t config;
-    config.alarm_en = TIMER_ALARM_EN;
-    config.auto_reload = self->repeat;
-    config.counter_dir = TIMER_COUNT_UP;
-    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));
-    check_esp_err(timer_set_alarm_value(self->group, self->index, self->period));
-    check_esp_err(timer_enable_intr(self->group, self->index));
-    check_esp_err(timer_isr_register(self->group, self->index, machine_timer_isr, (void *)self, TIMER_FLAGS, &self->handle));
-    check_esp_err(timer_start(self->group, self->index));
+    // Initialise the timer.
+    timer_hal_init(&self->hal_context, self->group, self->index);
+    timer_ll_enable_counter(self->hal_context.dev, self->index, false);
+    timer_ll_set_clock_source(self->hal_context.dev, self->index, GPTIMER_CLK_SRC_APB);
+    timer_ll_set_clock_prescale(self->hal_context.dev, self->index, TIMER_DIVIDER);
+    timer_hal_set_counter_value(&self->hal_context, 0);
+    timer_ll_set_count_direction(self->hal_context.dev, self->index, GPTIMER_COUNT_UP);
+
+    // Allocate and enable the alarm interrupt.
+    timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), false);
+    timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
+    ESP_ERROR_CHECK(
+        esp_intr_alloc(timer_group_periph_signals.groups[self->group].timer_irq_id[self->index],
+            TIMER_FLAGS, machine_timer_isr, self, &self->handle)
+        );
+    timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), true);
+
+    // Enable the alarm to trigger at the given period.
+    timer_ll_set_alarm_value(self->hal_context.dev, self->index, self->period);
+    timer_ll_enable_alarm(self->hal_context.dev, self->index, true);
+
+    // Set the counter to reload at 0 if it's in repeat mode.
+    timer_ll_set_reload_value(self->hal_context.dev, self->index, 0);
+    timer_ll_enable_auto_reload(self->hal_context.dev, self->index, self->repeat);
+
+    // Enable the counter.
+    timer_ll_enable_counter(self->hal_context.dev, self->index, true);
 }
 
 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) {
@@ -234,11 +244,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init)
 
 STATIC mp_obj_t machine_timer_value(mp_obj_t self_in) {
     machine_timer_obj_t *self = self_in;
-    double result;
-
-    timer_get_counter_time_sec(self->group, self->index, &result);
-
-    return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result * 1000));  // value in ms
+    uint64_t result = timer_ll_get_counter_value(self->hal_context.dev, self->index);
+    return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result / (TIMER_SCALE / 1000))); // value in ms
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_value_obj, machine_timer_value);
 

From c02da6d81dcc668fd719dc78efb848388a561074 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 6 Jun 2023 21:47:46 +0200
Subject: [PATCH 0129/3129] rp2/machine_pin: Factor out pin-find code from
 machine_pin_make_new.

And use it in mp_hal_get_pin_obj() and machine_pin_make_new().  That way,
mp_hal_get_pin_obj() accepts both int and str objects as argument, allowing
use of a pin specifier instead of a pin object in the constructor of
devices which need a pin as parameter.

E.g. instead of

    uart = UART(0, tx=Pin(0), rx=Pin(1))

one can write:

    uart = UART(0, tx=0, rx=1)

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/rp2/machine_pin.c | 58 ++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 71eda316da1dd..bdd80fb8f4fcb 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -166,6 +166,35 @@ const machine_pin_af_obj_t *machine_pin_find_alt_by_index(const machine_pin_obj_
     return NULL;
 }
 
+static const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
+    // Is already a object of the proper type
+    if (mp_obj_is_type(pin, &machine_pin_type)) {
+        return pin;
+    }
+    if (mp_obj_is_str(pin)) {
+        const char *name = mp_obj_str_get_str(pin);
+        // Try to find the pin in the board pins first.
+        const machine_pin_obj_t *self = machine_pin_find_named(&pin_board_pins_locals_dict, pin);
+        if (self != NULL) {
+            return 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, pin);
+        if (self != NULL) {
+            return self;
+        }
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unknown named pin \"%s\""), name);
+    } else if (mp_obj_is_int(pin)) {
+        // get the wanted pin object
+        int wanted_pin = mp_obj_get_int(pin);
+        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_cpu_pins)) {
+            return machine_pin_cpu_pins[wanted_pin];
+        }
+    }
+    mp_raise_ValueError("invalid pin");
+}
+
 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);
@@ -286,30 +315,8 @@ 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]);
-        // 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]);
-        }
-        if (!self) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unknown named pin \"%s\""), name);
-        }
-    } 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_cpu_pins)) {
-            self = machine_pin_cpu_pins[wanted_pin];
-        }
-    }
-    if (!self) {
-        mp_raise_ValueError("invalid pin");
-    }
+    const machine_pin_obj_t *self = machine_pin_find(args[0]);
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
@@ -587,10 +594,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) {
-    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);
+    const machine_pin_obj_t *pin = machine_pin_find(obj);
     if (is_ext_pin(pin)) {
         mp_raise_ValueError(MP_ERROR_TEXT("expecting a regular GPIO Pin"));
     }

From 3819ee4a6f07aa01f6e9d41c6617b931499f406b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 7 Jun 2023 14:58:56 +0200
Subject: [PATCH 0130/3129] esp32/machine_pin: Add a pin-find func and use it
 in machine_pin_get_id.

The new machine_pin_find() function accepts a Pin object and a integer
object as input and returns a pin object.  That can be extended later to
accept a string object, once named pins are supported.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_pin.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 5ea41701afe3c..119b5d250c49e 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -248,12 +248,27 @@ STATIC void machine_pin_isr_handler(void *arg) {
     mp_hal_wake_main_task_from_isr();
 }
 
-gpio_num_t machine_pin_get_id(mp_obj_t pin_in) {
-    if (mp_obj_get_type(pin_in) != &machine_pin_type) {
-        mp_raise_ValueError(MP_ERROR_TEXT("expecting a pin"));
+STATIC const machine_pin_obj_t *machine_pin_find(mp_obj_t pin_in) {
+    if (mp_obj_is_type(pin_in, &machine_pin_type)) {
+        return pin_in;
+    }
+    // get the wanted pin object
+    if (mp_obj_is_small_int(pin_in)) {
+        int wanted_pin = mp_obj_get_int(pin_in);
+        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj)) {
+            machine_pin_obj_t *self = (machine_pin_obj_t *)&machine_pin_obj[wanted_pin];
+            if (self->base.type != NULL) {
+                return self;
+            }
+        }
     }
-    machine_pin_obj_t *self = pin_in;
-    return self->id;
+    // At this place a check for named pins may be added
+    //
+    mp_raise_ValueError(MP_ERROR_TEXT("expecting a pin"));
+}
+
+gpio_num_t machine_pin_get_id(mp_obj_t pin_in) {
+    return machine_pin_find(pin_in)->id;
 }
 
 STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -354,14 +369,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]);
-    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"));
-    }
+    const machine_pin_obj_t *self = machine_pin_find(args[0]);
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO

From 29e9573de7200cc64654a77c2c20a57f89d11082 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 7 Jun 2023 15:10:11 +0200
Subject: [PATCH 0131/3129] esp32: Use always machine_pin_get_id for getting a
 Pin id.

This applies to all machine modules which have pins as arguments.  Since
machine_pin_get_id() calls pin_find(), these pin arguments may be at the
moment either integer objects or Pin objects.  That allows for instance to
write

    uart = UART(1, tx=Pin(4), rx=Pin(5))

instead of

    uart = UART(1, tx=4, rx=5)

which is consistent with other ports.  Since this handling is done at a
single place in the code, extending that scheme to accept strings for named
pins is easy.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_i2c.c    |  4 ++--
 ports/esp32/machine_i2s.c    |  6 +++---
 ports/esp32/machine_sdcard.c | 11 +----------
 ports/esp32/machine_uart.c   | 35 ++++++++++++++++++-----------------
 ports/esp32/mphalport.h      |  1 -
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index e3b76477902f9..d498aa058d74b 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -185,10 +185,10 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
 
     // Set SCL/SDA pins if given
     if (args[ARG_scl].u_obj != MP_OBJ_NULL) {
-        self->scl = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
+        self->scl = machine_pin_get_id(args[ARG_scl].u_obj);
     }
     if (args[ARG_sda].u_obj != MP_OBJ_NULL) {
-        self->sda = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
+        self->sda = machine_pin_get_id(args[ARG_sda].u_obj);
     }
 
     // Initialise the I2C peripheral
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 59b24ae70c3af..95751c87c3e60 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -392,9 +392,9 @@ STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args,
     //
 
     // 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);
+    int8_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sck].u_obj);
+    int8_t ws = args[ARG_ws].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_ws].u_obj);
+    int8_t sd = args[ARG_sd].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sd].u_obj);
 
     // is Mode valid?
     i2s_mode_t mode = args[ARG_mode].u_int;
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index a2d133442f10b..bc4aaf30c6f2b 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -131,18 +131,9 @@ static const sdspi_device_config_t spi_dev_defaults[2] = {
     SDSPI_DEVICE_CONFIG_DEFAULT(), // HSPI (ESP32) / SPI2 (ESP32S3)
 };
 
-STATIC gpio_num_t pin_or_int(const mp_obj_t arg) {
-    if (mp_obj_is_small_int(arg)) {
-        return MP_OBJ_SMALL_INT_VALUE(arg);
-    } else {
-        // This raises a value error if the argument is not a Pin.
-        return machine_pin_get_id(arg);
-    }
-}
-
 #define SET_CONFIG_PIN(config, pin_var, arg_id) \
     if (arg_vals[arg_id].u_obj != mp_const_none) \
-    config.pin_var = pin_or_int(arg_vals[arg_id].u_obj)
+    config.pin_var = machine_pin_get_id(arg_vals[arg_id].u_obj)
 
 STATIC esp_err_t sdcard_ensure_card_init(sdcard_card_obj_t *self, bool force) {
     if (force || !(self->flags & SDCARD_CARD_FLAGS_CARD_INIT_DONE)) {
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 7a2dc2b323e28..e7b2b8376b7aa 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -34,6 +34,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mperrno.h"
+#include "py/mphal.h"
 #include "modmachine.h"
 #include "uart.h"
 
@@ -58,10 +59,10 @@ typedef struct _machine_uart_obj_t {
     uint8_t bits;
     uint8_t parity;
     uint8_t stop;
-    int8_t tx;
-    int8_t rx;
-    int8_t rts;
-    int8_t cts;
+    gpio_num_t tx;
+    gpio_num_t rx;
+    gpio_num_t rts;
+    gpio_num_t cts;
     uint16_t txbuf;
     uint16_t rxbuf;
     uint16_t timeout;       // timeout waiting for first char (in ms)
@@ -133,10 +134,10 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
         { 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_INT, {.u_int = UART_PIN_NO_CHANGE} },
-        { MP_QSTR_rx, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = UART_PIN_NO_CHANGE} },
-        { MP_QSTR_rts, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = UART_PIN_NO_CHANGE} },
-        { MP_QSTR_cts, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = UART_PIN_NO_CHANGE} },
+        { 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_rts, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_cts, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { 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 = -1} },
@@ -185,22 +186,22 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     }
     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) {
-        self->tx = args[ARG_tx].u_int;
+    if (args[ARG_tx].u_obj != MP_OBJ_NULL) {
+        self->tx = machine_pin_get_id(args[ARG_tx].u_obj);
     }
 
-    if (args[ARG_rx].u_int != UART_PIN_NO_CHANGE) {
-        self->rx = args[ARG_rx].u_int;
+    if (args[ARG_rx].u_obj != MP_OBJ_NULL) {
+        self->rx = machine_pin_get_id(args[ARG_rx].u_obj);
     }
 
-    if (args[ARG_rts].u_int != UART_PIN_NO_CHANGE) {
-        self->rts = args[ARG_rts].u_int;
+    if (args[ARG_rts].u_obj != MP_OBJ_NULL) {
+        self->rts = machine_pin_get_id(args[ARG_rts].u_obj);
     }
 
-    if (args[ARG_cts].u_int != UART_PIN_NO_CHANGE) {
-        self->cts = args[ARG_cts].u_int;
+    if (args[ARG_cts].u_obj != MP_OBJ_NULL) {
+        self->cts = machine_pin_get_id(args[ARG_cts].u_obj);
     }
+    uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts);
 
     // set data bits
     switch (args[ARG_bits].u_int) {
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 4f25b3d4fd3a2..566d6609f110b 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -86,7 +86,6 @@ void mp_hal_wake_main_task_from_isr(void);
 #define mp_hal_pin_obj_t gpio_num_t
 mp_hal_pin_obj_t machine_pin_get_id(mp_obj_t pin_in);
 #define mp_hal_get_pin_obj(o) machine_pin_get_id(o)
-#define mp_obj_get_pin(o) machine_pin_get_id(o) // legacy name; only to support esp8266/modonewire
 #define mp_hal_pin_name(p) (p)
 static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
     esp_rom_gpio_pad_select_gpio(pin);

From 9fea0e98b1910c17578341eb75694e5b12922392 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 7 Jun 2023 17:56:58 +0200
Subject: [PATCH 0132/3129] esp8266/machine_pin: Accept an integer argument to
 mp_obj_get_pin_obj.

Allowing the machine.pwm() and esp.apa102() module to accept Pin(x) integer
parameters.  Not so much of a gain, just consistent with other ports.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp8266/machine_pin.c | 28 ++++++++++++++++------------
 ports/esp8266/modesp.c      |  4 ++--
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index a76f55423799c..344197da94720 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -122,11 +122,22 @@ void MP_FASTCODE(pin_intr_handler_part2)(uint32_t status) {
 }
 
 pyb_pin_obj_t *mp_obj_get_pin_obj(mp_obj_t pin_in) {
-    if (mp_obj_get_type(pin_in) != &pyb_pin_type) {
-        mp_raise_ValueError(MP_ERROR_TEXT("expecting a pin"));
+    if (mp_obj_is_type(pin_in, &pyb_pin_type)) {
+        return pin_in;
     }
-    pyb_pin_obj_t *self = pin_in;
-    return self;
+    // Get the wanted pin object.
+    if (mp_obj_is_small_int(pin_in)) {
+        int wanted_pin = mp_obj_get_int(pin_in);
+        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(pyb_pin_obj)) {
+            pyb_pin_obj_t *pin = (pyb_pin_obj_t *)&pyb_pin_obj[wanted_pin];
+            if (pin->base.type != NULL) {
+                return pin;
+            }
+        }
+    }
+    // At this place a check for named pins may be added.
+    //
+    mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
 }
 
 uint mp_obj_get_pin(mp_obj_t pin_in) {
@@ -310,14 +321,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]);
-    pyb_pin_obj_t *pin = NULL;
-    if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(pyb_pin_obj)) {
-        pin = (pyb_pin_obj_t *)&pyb_pin_obj[wanted_pin];
-    }
-    if (pin == NULL || pin->base.type == NULL) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
-    }
+    pyb_pin_obj_t *pin = mp_obj_get_pin_obj(args[0]);
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index 878d9392a16cf..95595faebc792 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -201,8 +201,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_check_fw_obj, esp_check_fw);
 STATIC mp_obj_t esp_apa102_write_(mp_obj_t clockPin, mp_obj_t dataPin, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
-    esp_apa102_write(mp_obj_get_pin_obj(clockPin)->phys_port,
-        mp_obj_get_pin_obj(dataPin)->phys_port,
+    esp_apa102_write(mp_obj_get_pin(clockPin),
+        mp_obj_get_pin(dataPin),
         (uint8_t *)bufinfo.buf, bufinfo.len);
     return mp_const_none;
 }

From 51c2d26f15c2a737f90f5e4f6581b2588e0930fc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 7 Jun 2023 20:42:25 +0200
Subject: [PATCH 0133/3129] renesas-ra/machine_spi: Consistently use
 machine_pin_find to get pin.

Sometimes mp_hal_get_pin_obj() was used.  machine_pin_find() is the
internal name, and the external interface is mp_hal_get_pin_obj().

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/renesas-ra/machine_spi.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index 8c0c026d9a728..6755ab73c23e5 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -205,7 +205,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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);
+        const machine_pin_obj_t *arg_sck = machine_pin_find(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"));
@@ -214,7 +214,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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);
+        const machine_pin_obj_t *arg_mosi = machine_pin_find(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"));
@@ -223,7 +223,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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);
+        const machine_pin_obj_t *arg_miso = machine_pin_find(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"));
@@ -287,21 +287,21 @@ STATIC void machine_hard_spi_init(mp_obj_base_t *self_in, size_t n_args, const m
         }
     }
     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);
+        const machine_pin_obj_t *arg_sck = machine_pin_find(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);
+        const machine_pin_obj_t *arg_mosi = machine_pin_find(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);
+        const machine_pin_obj_t *arg_miso = machine_pin_find(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"));

From cb31c0ae9c2a7eaadabfea3939aa8c3a07e36a67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 15 Jul 2023 00:03:59 +1000
Subject: [PATCH 0134/3129] esp32: Add support for board-named pins and the
 Pin.board dict.

This adds named-pins support to the esp32 port, following other ports.
Since the name of esp32 CPU pins is just GPIOx, where x is an integer, the
Pin.cpu dict is not supported and CPU pins are just retrieved via their
existing integer "name" (the cost of adding Pin.cpu is about 800 bytes,
mostly due to the additional qstrs).

What this commit supports is the Pin.board dict and constructing a pin by
names given by a board.  These names are defined in a pins.csv file at the
board level.  If no such file exists then Pin.board exists but is empty.

As part of this commit, pin and pin IRQ objects are optimised to reduce
their size in flash (by removing their gpio_num_t entry).  The net change
in firmware size for this commit is about -132 bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/make-pins.py  | 185 +++++++++++++
 ports/esp32/boards/pins_prefix.c |   4 +
 ports/esp32/esp32_common.cmake   |  28 ++
 ports/esp32/machine_pin.c        | 450 ++++++-------------------------
 ports/esp32/machine_pin.h        | 164 +++++++++++
 5 files changed, 462 insertions(+), 369 deletions(-)
 create mode 100755 ports/esp32/boards/make-pins.py
 create mode 100644 ports/esp32/boards/pins_prefix.c
 create mode 100644 ports/esp32/machine_pin.h

diff --git a/ports/esp32/boards/make-pins.py b/ports/esp32/boards/make-pins.py
new file mode 100755
index 0000000000000..e0f988549b7f3
--- /dev/null
+++ b/ports/esp32/boards/make-pins.py
@@ -0,0 +1,185 @@
+#!/usr/bin/env python
+
+import argparse
+import sys
+import csv
+import re
+
+MAX_CPU_PINS = 49
+
+
+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 characters.")
+    if not name_str.startswith("GPIO"):
+        raise ValueError("Expecting pin name to start with GPIO")
+    return int(re.findall(r"\d+$", name_str)[0])
+
+
+class Pin:
+    def __init__(self, pin):
+        self.pin = pin
+        self.is_board = False
+
+    def cpu_pin_name(self):
+        return "GPIO{:d}".format(self.pin)
+
+    def is_board_pin(self):
+        return self.is_board
+
+    def set_is_board_pin(self):
+        self.is_board = True
+
+
+class NamedPin:
+    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:
+    def __init__(self):
+        self.cpu_pins = []  # list of NamedPin objects
+        self.board_pins = []  # list of NamedPin objects
+
+    def find_pin(self, pin_name):
+        for pin in self.cpu_pins:
+            if pin.name() == pin_name:
+                return pin.pin()
+
+    def create_pins(self):
+        for pin_num in range(MAX_CPU_PINS):
+            pin = Pin(pin_num)
+            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]
+                parse_pin(cpu_pin_name)
+                pin = self.find_pin(cpu_pin_name)
+                if not pin:
+                    raise ValueError("Unknown pin {}".format(cpu_pin_name))
+                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, out_source):
+        print("", file=out_source)
+        print(
+            "const machine_{}_obj_t machine_{}_obj_table[GPIO_NUM_MAX] = {{".format(label, label),
+            file=out_source,
+        )
+        for pin in named_pins:
+            print("    #if MICROPY_HW_ENABLE_{}".format(pin.name()), file=out_source)
+            print(
+                "    [GPIO_NUM_{}] = {{ .base = {{ .type = &machine_{}_type }} }},".format(
+                    pin.pin().pin, label
+                ),
+                file=out_source,
+            )
+            print("    #endif", file=out_source)
+        print("};", file=out_source)
+
+    def print_named(self, label, named_pins, out_source):
+        print("", file=out_source)
+        print(
+            "STATIC const mp_rom_map_elem_t machine_pin_{:s}_pins_locals_dict_table[] = {{".format(
+                label
+            ),
+            file=out_source,
+        )
+        for named_pin in named_pins:
+            pin = named_pin.pin()
+            print(
+                "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}) }},".format(
+                    named_pin.name(), pin.cpu_pin_name()
+                ),
+                file=out_source,
+            )
+
+        print("};", file=out_source)
+        print(
+            "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, machine_pin_{:s}_pins_locals_dict_table);".format(
+                label, label
+            ),
+            file=out_source,
+        )
+
+    def print_tables(self, out_source):
+        self.print_table("pin", self.cpu_pins, out_source)
+        self.print_table("pin_irq", self.cpu_pins, out_source)
+        self.print_named("board", self.board_pins, out_source)
+
+    def print_header(self, out_header):
+        # Provide #defines for each cpu pin.
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            n = pin.cpu_pin_name()
+            print("#if MICROPY_HW_ENABLE_{}".format(n), file=out_header)
+            print(
+                "#define pin_{:s} (machine_pin_obj_table[{}])".format(n, pin.pin),
+                file=out_header,
+            )
+            print("#endif", file=out_header)
+
+        # Provide #define's mapping board to cpu name.
+        for named_pin in self.board_pins:
+            if named_pin.pin().is_board_pin():
+                print(
+                    "#define pin_{:s} pin_{:s}".format(
+                        named_pin.name(), named_pin.pin().cpu_pin_name()
+                    ),
+                    file=out_header,
+                )
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Generate board specific pin file")
+    parser.add_argument("--board-csv")
+    parser.add_argument("--prefix")
+    parser.add_argument("--output-source")
+    parser.add_argument("--output-header")
+    args = parser.parse_args(sys.argv[1:])
+
+    pins = Pins()
+    pins.create_pins()
+
+    if args.board_csv:
+        pins.parse_board_file(args.board_csv)
+
+    with open(args.output_source, "w") as out_source:
+        print("// This file was automatically generated by make-pins.py", file=out_source)
+        print("//", file=out_source)
+
+        if args.board_csv:
+            print("// --board-csv {:s}".format(args.board_csv), file=out_source)
+
+        if args.prefix:
+            print("// --prefix {:s}".format(args.prefix), file=out_source)
+            print("", file=out_source)
+            with open(args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), end="", file=out_source)
+
+        pins.print_tables(out_source)
+
+    with open(args.output_header, "w") as out_header:
+        pins.print_header(out_header)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/esp32/boards/pins_prefix.c b/ports/esp32/boards/pins_prefix.c
new file mode 100644
index 0000000000000..2733ddaab8654
--- /dev/null
+++ b/ports/esp32/boards/pins_prefix.c
@@ -0,0 +1,4 @@
+#include "py/obj.h"
+#include "machine_pin.h"
+#include "modmachine.h"
+#include "genhdr/pins.h"
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index d55dd38134fb8..c7d629cd6b374 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -90,6 +90,7 @@ list(APPEND MICROPY_SOURCE_PORT
     modespnow.c
 )
 list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
+list(APPEND MICROPY_SOURCE_PORT ${CMAKE_BINARY_DIR}/pins.c)
 
 list(APPEND MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
@@ -198,3 +199,30 @@ endforeach()
 
 # Include the main MicroPython cmake rules.
 include(${MICROPY_DIR}/py/mkrules.cmake)
+
+# Generate source files for named pins (requires mkrules.cmake for MICROPY_GENHDR_DIR).
+
+set(GEN_PINS_PREFIX "${MICROPY_PORT_DIR}/boards/pins_prefix.c")
+set(GEN_PINS_MKPINS "${MICROPY_PORT_DIR}/boards/make-pins.py")
+set(GEN_PINS_SRC "${CMAKE_BINARY_DIR}/pins.c")
+set(GEN_PINS_HDR "${MICROPY_GENHDR_DIR}/pins.h")
+
+if(EXISTS "${MICROPY_BOARD_DIR}/pins.csv")
+    set(GEN_PINS_BOARD_CSV "${MICROPY_BOARD_DIR}/pins.csv")
+    set(GEN_PINS_BOARD_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
+endif()
+
+target_sources(${MICROPY_TARGET} PRIVATE ${GEN_PINS_HDR})
+
+add_custom_command(
+    OUTPUT ${GEN_PINS_SRC} ${GEN_PINS_HDR}
+    COMMAND ${Python3_EXECUTABLE} ${GEN_PINS_MKPINS} ${GEN_PINS_BOARD_CSV_ARG}
+        --prefix ${GEN_PINS_PREFIX} --output-source ${GEN_PINS_SRC} --output-header ${GEN_PINS_HDR}
+    DEPENDS
+        ${MICROPY_MPVERSION}
+        ${GEN_PINS_MKPINS}
+        ${GEN_PINS_BOARD_CSV}
+        ${GEN_PINS_PREFIX}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 119b5d250c49e..835f16b1b066b 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -5,7 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2016-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
@@ -38,8 +38,10 @@
 #include "mphalport.h"
 #include "modmachine.h"
 #include "extmod/virtpin.h"
+#include "machine_pin.h"
 #include "machine_rtc.h"
 #include "modesp32.h"
+#include "genhdr/pins.h"
 
 #if CONFIG_IDF_TARGET_ESP32C3
 #include "soc/usb_serial_jtag_reg.h"
@@ -55,174 +57,18 @@
 #define GPIO_FIRST_NON_OUTPUT (46)
 #endif
 
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    gpio_num_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_pin_irq_obj_t {
-    mp_obj_base_t base;
-    gpio_num_t id;
-} machine_pin_irq_obj_t;
-
-STATIC const machine_pin_obj_t machine_pin_obj[GPIO_NUM_MAX] = {
-    #if CONFIG_IDF_TARGET_ESP32
-
-    {{&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},
-    #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},
-    {{&machine_pin_type}, GPIO_NUM_20},
-    {{&machine_pin_type}, GPIO_NUM_21},
-    {{&machine_pin_type}, GPIO_NUM_22},
-    {{&machine_pin_type}, GPIO_NUM_23},
-    {{NULL}, -1},
-    {{&machine_pin_type}, GPIO_NUM_25},
-    {{&machine_pin_type}, GPIO_NUM_26},
-    {{&machine_pin_type}, GPIO_NUM_27},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{&machine_pin_type}, GPIO_NUM_32},
-    {{&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},
-
-    #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},
-    {{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},
-
-    #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
-    #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
-    {{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
-    {{&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},
+// Return the gpio_num_t index for a given pin or pin-irq object.
+#define PIN_OBJ_INDEX(self) ((self) - &machine_pin_obj_table[0])
+#define PIN_IRQ_OBJ_INDEX(self) ((self) - &machine_pin_irq_obj_table[0])
 
-    #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
-STATIC const machine_pin_irq_obj_t machine_pin_irq_object[GPIO_NUM_MAX];
+STATIC 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;
+}
 
 void machine_pins_init(void) {
     static bool did_install = false;
@@ -234,16 +80,16 @@ void machine_pins_init(void) {
 }
 
 void machine_pins_deinit(void) {
-    for (int i = 0; i < MP_ARRAY_SIZE(machine_pin_obj); ++i) {
-        if (machine_pin_obj[i].id != (gpio_num_t)-1) {
-            gpio_isr_handler_remove(machine_pin_obj[i].id);
+    for (int i = 0; i < MP_ARRAY_SIZE(machine_pin_obj_table); ++i) {
+        if (machine_pin_obj_table[i].base.type != NULL) {
+            gpio_isr_handler_remove(i);
         }
     }
 }
 
 STATIC void 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_obj_t handler = MP_STATE_PORT(machine_pin_irq_handler)[PIN_OBJ_INDEX(self)];
     mp_sched_schedule(handler, MP_OBJ_FROM_PTR(self));
     mp_hal_wake_main_task_from_isr();
 }
@@ -252,28 +98,37 @@ STATIC const machine_pin_obj_t *machine_pin_find(mp_obj_t pin_in) {
     if (mp_obj_is_type(pin_in, &machine_pin_type)) {
         return pin_in;
     }
-    // get the wanted pin object
-    if (mp_obj_is_small_int(pin_in)) {
+
+    // Try to find the pin via integer index into the array of all pins.
+    if (mp_obj_is_int(pin_in)) {
         int wanted_pin = mp_obj_get_int(pin_in);
-        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj)) {
-            machine_pin_obj_t *self = (machine_pin_obj_t *)&machine_pin_obj[wanted_pin];
+        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj_table)) {
+            const machine_pin_obj_t *self = (machine_pin_obj_t *)&machine_pin_obj_table[wanted_pin];
             if (self->base.type != NULL) {
                 return self;
             }
         }
     }
-    // At this place a check for named pins may be added
-    //
-    mp_raise_ValueError(MP_ERROR_TEXT("expecting a pin"));
+
+    // Try to find the pin in the board pins dict.
+    if (mp_obj_is_str(pin_in)) {
+        const machine_pin_obj_t *self = machine_pin_find_named(&machine_pin_board_pins_locals_dict, pin_in);
+        if (self->base.type != NULL) {
+            return self;
+        }
+    }
+
+    mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
 }
 
 gpio_num_t machine_pin_get_id(mp_obj_t pin_in) {
-    return machine_pin_find(pin_in)->id;
+    const machine_pin_obj_t *self = machine_pin_find(pin_in);
+    return PIN_OBJ_INDEX(self);
 }
 
 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, "Pin(%u)", PIN_OBJ_INDEX(self));
 }
 
 // pin.init(mode=None, pull=-1, *, value, drive, hold)
@@ -293,32 +148,32 @@ 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 (rtc_gpio_is_valid_gpio(PIN_OBJ_INDEX(self))) {
             #if !CONFIG_IDF_TARGET_ESP32C3
-            rtc_gpio_deinit(self->id);
+            rtc_gpio_deinit(PIN_OBJ_INDEX(self));
             #endif
         }
     }
 
     #if CONFIG_IDF_TARGET_ESP32C3
-    if (self->id == 18 || self->id == 19) {
+    if (PIN_OBJ_INDEX(self) == 18 || PIN_OBJ_INDEX(self) == 19) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
 
     // configure the pin for gpio
-    esp_rom_gpio_pad_select_gpio(self->id);
+    esp_rom_gpio_pad_select_gpio(PIN_OBJ_INDEX(self));
 
     // set initial value (do this before configuring mode/pull)
     if (args[ARG_value].u_obj != MP_OBJ_NULL) {
-        gpio_set_level(self->id, mp_obj_is_true(args[ARG_value].u_obj));
+        gpio_set_level(PIN_OBJ_INDEX(self), 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)) {
+    if (args[ARG_drive].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(PIN_OBJ_INDEX(self))) {
         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);
+            gpio_set_drive_capability(PIN_OBJ_INDEX(self), strength);
         }
     }
 
@@ -326,11 +181,11 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     if (args[ARG_mode].u_obj != mp_const_none) {
         mp_int_t pin_io_mode = mp_obj_get_int(args[ARG_mode].u_obj);
         #ifdef GPIO_FIRST_NON_OUTPUT
-        if (self->id >= GPIO_FIRST_NON_OUTPUT && (pin_io_mode & GPIO_MODE_DEF_OUTPUT)) {
+        if (PIN_OBJ_INDEX(self) >= GPIO_FIRST_NON_OUTPUT && (pin_io_mode & GPIO_MODE_DEF_OUTPUT)) {
             mp_raise_ValueError(MP_ERROR_TEXT("pin can only be input"));
         }
         #endif
-        gpio_set_direction(self->id, pin_io_mode);
+        gpio_set_direction(PIN_OBJ_INDEX(self), pin_io_mode);
     }
 
     // configure pull
@@ -340,24 +195,24 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
             mode = mp_obj_get_int(args[ARG_pull].u_obj);
         }
         if (mode & GPIO_PULL_DOWN) {
-            gpio_pulldown_en(self->id);
+            gpio_pulldown_en(PIN_OBJ_INDEX(self));
         } else {
-            gpio_pulldown_dis(self->id);
+            gpio_pulldown_dis(PIN_OBJ_INDEX(self));
         }
         if (mode & GPIO_PULL_UP) {
-            gpio_pullup_en(self->id);
+            gpio_pullup_en(PIN_OBJ_INDEX(self));
         } else {
-            gpio_pullup_dis(self->id);
+            gpio_pullup_dis(PIN_OBJ_INDEX(self));
         }
     }
 
     // configure pad hold
-    if (args[ARG_hold].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(self->id)) {
+    if (args[ARG_hold].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(PIN_OBJ_INDEX(self))) {
         // always disable pad hold to apply outstanding config changes
-        gpio_hold_dis(self->id);
+        gpio_hold_dis(PIN_OBJ_INDEX(self));
         // (re-)enable pad hold if requested
         if (mp_obj_is_true(args[ARG_hold].u_obj)) {
-            gpio_hold_en(self->id);
+            gpio_hold_en(PIN_OBJ_INDEX(self));
         }
     }
 
@@ -387,10 +242,10 @@ 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_level(self->id));
+        return MP_OBJ_NEW_SMALL_INT(gpio_get_level(PIN_OBJ_INDEX(self)));
     } else {
         // set pin
-        gpio_set_level(self->id, mp_obj_is_true(args[0]));
+        gpio_set_level(PIN_OBJ_INDEX(self), mp_obj_is_true(args[0]));
         return mp_const_none;
     }
 }
@@ -410,7 +265,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_
 // pin.off()
 STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_level(self->id, 0);
+    gpio_set_level(PIN_OBJ_INDEX(self), 0);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
@@ -418,7 +273,7 @@ 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 = MP_OBJ_TO_PTR(self_in);
-    gpio_set_level(self->id, 1);
+    gpio_set_level(PIN_OBJ_INDEX(self), 1);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
@@ -455,20 +310,20 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
                 mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
             }
 
-            if (!RTC_IS_VALID_EXT_PIN(self->id)) {
+            if (!RTC_IS_VALID_EXT_PIN(PIN_OBJ_INDEX(self))) {
                 mp_raise_ValueError(MP_ERROR_TEXT("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) {
+                machine_rtc_config.ext0_pin = PIN_OBJ_INDEX(self);
+            } else if (machine_rtc_config.ext0_pin != PIN_OBJ_INDEX(self)) {
                 mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
             }
 
             machine_rtc_config.ext0_level = trigger == GPIO_INTR_LOW_LEVEL ? 0 : 1;
             machine_rtc_config.ext0_wake_types = wake;
         } else {
-            if (machine_rtc_config.ext0_pin == self->id) {
+            if (machine_rtc_config.ext0_pin == PIN_OBJ_INDEX(self)) {
                 machine_rtc_config.ext0_pin = -1;
             }
 
@@ -476,18 +331,25 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
                 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);
+            gpio_isr_handler_remove(PIN_OBJ_INDEX(self));
+            MP_STATE_PORT(machine_pin_irq_handler)[PIN_OBJ_INDEX(self)] = handler;
+            gpio_set_intr_type(PIN_OBJ_INDEX(self), trigger);
+            gpio_isr_handler_add(PIN_OBJ_INDEX(self), machine_pin_isr_handler, (void *)self);
         }
     }
 
     // return the irq object
-    return MP_OBJ_FROM_PTR(&machine_pin_irq_object[self->id]);
+    return MP_OBJ_FROM_PTR(&machine_pin_irq_obj_table[PIN_OBJ_INDEX(self)]);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
 
+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
+    );
+
 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) },
@@ -496,6 +358,9 @@ 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_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) },
+
     // 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_INPUT_OUTPUT) },
@@ -518,10 +383,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_level(self->id);
+            return gpio_get_level(PIN_OBJ_INDEX(self));
         }
         case MP_PIN_WRITE: {
-            gpio_set_level(self->id, arg);
+            gpio_set_level(PIN_OBJ_INDEX(self), arg);
             return 0;
         }
     }
@@ -548,172 +413,19 @@ MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // Pin IRQ object
 
-STATIC const mp_obj_type_t machine_pin_irq_type;
-
-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},
-    {{&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},
-    #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},
-    {{&machine_pin_irq_type}, GPIO_NUM_20},
-    {{&machine_pin_irq_type}, GPIO_NUM_21},
-    {{&machine_pin_irq_type}, GPIO_NUM_22},
-    {{&machine_pin_irq_type}, GPIO_NUM_23},
-    {{NULL}, -1},
-    {{&machine_pin_irq_type}, GPIO_NUM_25},
-    {{&machine_pin_irq_type}, GPIO_NUM_26},
-    {{&machine_pin_irq_type}, GPIO_NUM_27},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{&machine_pin_irq_type}, GPIO_NUM_32},
-    {{&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},
-
-    #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},
-    {{&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
-    #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
-    {{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},
-    {{&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},
-    {{&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
-};
-
 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]);
+    machine_pin_isr_handler((void *)&machine_pin_obj_table[PIN_IRQ_OBJ_INDEX(self)]);
     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;
+    uint32_t orig_trig = GPIO.pin[PIN_IRQ_OBJ_INDEX(self)].int_type;
     if (n_args == 2) {
         // set trigger
-        gpio_set_intr_type(self->id, mp_obj_get_int(args[1]));
+        gpio_set_intr_type(PIN_IRQ_OBJ_INDEX(self), mp_obj_get_int(args[1]));
     }
     // return original trigger value
     return MP_OBJ_NEW_SMALL_INT(orig_trig);
@@ -725,7 +437,7 @@ 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 MP_DEFINE_CONST_OBJ_TYPE(
+MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_irq_type,
     MP_QSTR_IRQ,
     MP_TYPE_FLAG_NONE,
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
new file mode 100644
index 0000000000000..dbbaac2219be9
--- /dev/null
+++ b/ports/esp32/machine_pin.h
@@ -0,0 +1,164 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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_ESP32_MACHINE_PIN_H
+#define MICROPY_INCLUDED_ESP32_MACHINE_PIN_H
+
+#include "py/obj.h"
+#include "hal/gpio_types.h"
+
+// Define which pins are enabled for a given SoC and configuration.
+
+#if CONFIG_IDF_TARGET_ESP32
+
+#define MICROPY_HW_ENABLE_GPIO0 (1)
+#define MICROPY_HW_ENABLE_GPIO1 (1)
+#define MICROPY_HW_ENABLE_GPIO2 (1)
+#define MICROPY_HW_ENABLE_GPIO3 (1)
+#define MICROPY_HW_ENABLE_GPIO4 (1)
+#define MICROPY_HW_ENABLE_GPIO5 (1)
+#define MICROPY_HW_ENABLE_GPIO6 (1)
+#define MICROPY_HW_ENABLE_GPIO7 (1)
+#define MICROPY_HW_ENABLE_GPIO8 (1)
+#define MICROPY_HW_ENABLE_GPIO9 (1)
+#define MICROPY_HW_ENABLE_GPIO10 (1)
+#define MICROPY_HW_ENABLE_GPIO11 (1)
+#define MICROPY_HW_ENABLE_GPIO12 (1)
+#define MICROPY_HW_ENABLE_GPIO13 (1)
+#define MICROPY_HW_ENABLE_GPIO14 (1)
+#define MICROPY_HW_ENABLE_GPIO15 (1)
+#if !CONFIG_ESP32_SPIRAM_SUPPORT
+#define MICROPY_HW_ENABLE_GPIO16 (1)
+#define MICROPY_HW_ENABLE_GPIO17 (1)
+#endif
+#define MICROPY_HW_ENABLE_GPIO18 (1)
+#define MICROPY_HW_ENABLE_GPIO19 (1)
+#define MICROPY_HW_ENABLE_GPIO20 (1)
+#define MICROPY_HW_ENABLE_GPIO21 (1)
+#define MICROPY_HW_ENABLE_GPIO22 (1)
+#define MICROPY_HW_ENABLE_GPIO23 (1)
+#define MICROPY_HW_ENABLE_GPIO25 (1)
+#define MICROPY_HW_ENABLE_GPIO26 (1)
+#define MICROPY_HW_ENABLE_GPIO27 (1)
+#define MICROPY_HW_ENABLE_GPIO32 (1)
+#define MICROPY_HW_ENABLE_GPIO33 (1)
+#define MICROPY_HW_ENABLE_GPIO34 (1)
+#define MICROPY_HW_ENABLE_GPIO35 (1)
+#define MICROPY_HW_ENABLE_GPIO36 (1)
+#define MICROPY_HW_ENABLE_GPIO37 (1)
+#define MICROPY_HW_ENABLE_GPIO38 (1)
+#define MICROPY_HW_ENABLE_GPIO39 (1)
+
+#elif CONFIG_IDF_TARGET_ESP32C3
+
+#define MICROPY_HW_ENABLE_GPIO0 (1)
+#define MICROPY_HW_ENABLE_GPIO1 (1)
+#define MICROPY_HW_ENABLE_GPIO2 (1)
+#define MICROPY_HW_ENABLE_GPIO3 (1)
+#define MICROPY_HW_ENABLE_GPIO4 (1)
+#define MICROPY_HW_ENABLE_GPIO5 (1)
+#define MICROPY_HW_ENABLE_GPIO6 (1)
+#define MICROPY_HW_ENABLE_GPIO7 (1)
+#define MICROPY_HW_ENABLE_GPIO8 (1)
+#define MICROPY_HW_ENABLE_GPIO9 (1)
+#define MICROPY_HW_ENABLE_GPIO10 (1)
+#define MICROPY_HW_ENABLE_GPIO11 (1)
+#define MICROPY_HW_ENABLE_GPIO12 (1)
+#define MICROPY_HW_ENABLE_GPIO13 (1)
+#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#define MICROPY_HW_ENABLE_GPIO18 (1)
+#define MICROPY_HW_ENABLE_GPIO19 (1)
+#endif
+#define MICROPY_HW_ENABLE_GPIO20 (1)
+#define MICROPY_HW_ENABLE_GPIO21 (1)
+
+#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+
+#define MICROPY_HW_ENABLE_GPIO0 (1)
+#define MICROPY_HW_ENABLE_GPIO1 (1)
+#define MICROPY_HW_ENABLE_GPIO2 (1)
+#define MICROPY_HW_ENABLE_GPIO3 (1)
+#define MICROPY_HW_ENABLE_GPIO4 (1)
+#define MICROPY_HW_ENABLE_GPIO5 (1)
+#define MICROPY_HW_ENABLE_GPIO6 (1)
+#define MICROPY_HW_ENABLE_GPIO7 (1)
+#define MICROPY_HW_ENABLE_GPIO8 (1)
+#define MICROPY_HW_ENABLE_GPIO9 (1)
+#define MICROPY_HW_ENABLE_GPIO10 (1)
+#define MICROPY_HW_ENABLE_GPIO11 (1)
+#define MICROPY_HW_ENABLE_GPIO12 (1)
+#define MICROPY_HW_ENABLE_GPIO13 (1)
+#define MICROPY_HW_ENABLE_GPIO14 (1)
+#define MICROPY_HW_ENABLE_GPIO15 (1)
+#define MICROPY_HW_ENABLE_GPIO16 (1)
+#define MICROPY_HW_ENABLE_GPIO17 (1)
+#define MICROPY_HW_ENABLE_GPIO18 (1)
+#if !CONFIG_USB_CDC_ENABLED
+#define MICROPY_HW_ENABLE_GPIO19 (1)
+#define MICROPY_HW_ENABLE_GPIO20 (1)
+#endif
+#define MICROPY_HW_ENABLE_GPIO21 (1)
+#if !CONFIG_SPIRAM
+#define MICROPY_HW_ENABLE_GPIO26 (1)
+#endif
+#if !CONFIG_SPIRAM_MODE_OCT
+#define MICROPY_HW_ENABLE_GPIO33 (1)
+#define MICROPY_HW_ENABLE_GPIO34 (1)
+#define MICROPY_HW_ENABLE_GPIO35 (1)
+#define MICROPY_HW_ENABLE_GPIO36 (1)
+#define MICROPY_HW_ENABLE_GPIO37 (1)
+#endif
+#define MICROPY_HW_ENABLE_GPIO38 (1)
+#define MICROPY_HW_ENABLE_GPIO39 (1)
+#define MICROPY_HW_ENABLE_GPIO40 (1)
+#define MICROPY_HW_ENABLE_GPIO41 (1)
+#define MICROPY_HW_ENABLE_GPIO42 (1)
+#define MICROPY_HW_ENABLE_GPIO43 (1)
+#define MICROPY_HW_ENABLE_GPIO44 (1)
+#define MICROPY_HW_ENABLE_GPIO45 (1)
+#define MICROPY_HW_ENABLE_GPIO46 (1)
+#if CONFIG_IDF_TARGET_ESP32S3 && MICROPY_HW_ESP32S3_EXTENDED_IO
+#define MICROPY_HW_ENABLE_GPIO47 (1)
+#define MICROPY_HW_ENABLE_GPIO48 (1)
+#endif
+
+#endif
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+} machine_pin_obj_t;
+
+typedef struct _machine_pin_irq_obj_t {
+    mp_obj_base_t base;
+} machine_pin_irq_obj_t;
+
+extern const mp_obj_type_t machine_pin_irq_type;
+
+extern const machine_pin_obj_t machine_pin_obj_table[GPIO_NUM_MAX];
+extern const machine_pin_irq_obj_t machine_pin_irq_obj_table[GPIO_NUM_MAX];
+
+extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
+
+#endif // MICROPY_INCLUDED_ESP32_MACHINE_PIN_H

From 3aabdf2f6bc4119576248bc383d20da47e759748 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Tue, 31 May 2022 16:37:40 +1000
Subject: [PATCH 0135/3129] stm32/boards/B_L072Z_LRWAN1: Add pin definitions
 for internal SX1262.

Includes fixing the SCK connection pin.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../boards/B_L072Z_LRWAN1/mpconfigboard.h     |  3 ++-
 ports/stm32/boards/B_L072Z_LRWAN1/pins.csv    | 22 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index 7d96eedda9a78..375b9717863c6 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -40,8 +40,9 @@
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 
 // SPI buses
+// SPI1 on the CMWX1ZZABZ module is connected internally to the SX1276
 #define MICROPY_HW_SPI1_NSS         (pin_A15)
-#define MICROPY_HW_SPI1_SCK         (pin_A5)
+#define MICROPY_HW_SPI1_SCK         (pin_B3)
 #define MICROPY_HW_SPI1_MISO        (pin_A6)
 #define MICROPY_HW_SPI1_MOSI        (pin_A7)
 #define MICROPY_HW_SPI2_NSS         (pin_B12)
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/pins.csv b/ports/stm32/boards/B_L072Z_LRWAN1/pins.csv
index e54b8b818a89e..82bc9ceb956e6 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/pins.csv
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/pins.csv
@@ -29,17 +29,26 @@ LED_RED,PB7
 ,PA3
 ,PA4
 ,PA5
-,PA6
-,PA7
+SX_MISO,PA6
+SX_MOSI,PA7
 ,PA8
 ,PA9
 ,PA10
 ,PA11
-,PA12
+SX_TCXO_VCC,PA12
+# Note about SX_TCXO_VCC: Unlike all of the other SX_ pins, PA12 is only
+# connected to TCXO_VCC on the Discovery Board and will have a different
+# connection on custom hardware using the same Murata module.
+#
+# By default it also does nothing, need to move jumper JP9 to make it control
+# TCXO_VCC at all. Note PA12 is by default also USB DP so need to disable
+# USB - call pyb.usb_mode(None) or rebuild without MICROPY_HW_ENABLE_USB -
+# in order to use it at all.
 ,PA13
 ,PA14
-,PA15
+SX_CS,PA15
 ,PB2
+SX_SCK,PB3
 ,PB5
 ,PB6
 ,PB7
@@ -49,3 +58,8 @@ LED_RED,PB7
 ,PB13
 ,PB14
 ,PB15
+SX_RESET,PC0
+SX_DIO0,PB4
+SX_DIO1,PB1
+SX_DIO2,PB0
+SX_DIO3,PC13

From 4548928449c63f72fce5917c683664bf3ca0501f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 2 Feb 2023 10:11:06 +1100
Subject: [PATCH 0136/3129] stm32/boards/B_L072Z_LRWAN1: Lower default ROM
 level to "Core".

Re-enable some features required for the board to still build and the lora
driver to run.

This board only has 192KB of flash total, so default stm32 build is very
close to the limit.

Before:

LINK build-B_L072Z_LRWAN1/firmware.elf
   text    data     bss     dec     hex filename
 184352      68   14112  198532   30784 build-B_L072Z_LRWAN1/firmware.elf

(12256 bytes free)

After:

LINK build-B_L072Z_LRWAN1/firmware.elf
   text    data     bss     dec     hex filename
 155028      68   14052  169148   294bc build-B_L072Z_LRWAN1/firmware.elf

(41580 bytes free)

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index 375b9717863c6..c2a0ba4f44cd3 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -5,8 +5,13 @@
 #define MICROPY_HW_BOARD_NAME       "B-L072Z-LRWAN1"
 #define MICROPY_HW_MCU_NAME         "STM32L072CZ"
 
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
+
+#define MICROPY_HELPER_REPL         (1)
+#define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_ENABLE_SCHEDULER    (1)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
@@ -18,6 +23,8 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
+#define MICROPY_PY_OS               (1)
+#define MICROPY_PY_TIME             (1)
 
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)

From 31ef7c186bbac067d3bbcaf0876cbef113ee0df6 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Wed, 5 Jul 2023 18:03:11 +0200
Subject: [PATCH 0137/3129] esp32: Collect properties from IDF-managed
 components as well.

Some targets like the ESP32-S3 use the IDF Component Manager to provide
additional dependencies to the build.  Make sure to include these extra
components when collecting properties used by MicroPython-specific build
steps, like qstr preprocessing.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 ports/esp32/esp32_common.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index c7d629cd6b374..37a19316b603d 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -191,8 +191,9 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
 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})
+# Collect all of the include directories and compile definitions for the IDF components,
+# including those added by the IDF Component Manager via idf_components.yaml.
+foreach(comp ${__COMPONENT_NAMES_RESOLVED})
     micropy_gather_target_properties(__idf_${comp})
     micropy_gather_target_properties(${comp})
 endforeach()

From 904ccfaf9480b6ec8f0589bb14bb29d05e251bc0 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Tue, 4 Jul 2023 11:54:53 +0200
Subject: [PATCH 0138/3129] esp32/modmachine: Add generic machine.bootloader().

Implement a standard machine.bootloader() method for ESP32-series devices.
No default implementation, each board can enable it as required.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 ports/esp32/modmachine.c   | 8 ++++++++
 ports/esp32/modmachine.h   | 1 +
 ports/esp32/mpconfigport.h | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 01acb01029eab..31fa589aed0a2 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -207,6 +207,13 @@ 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);
 
+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);
+
 void machine_init(void) {
     is_soft_reset = 0;
 }
@@ -276,6 +283,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { 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_idle), MP_ROM_PTR(&machine_idle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_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) },
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 138a89e9c33d5..24417f6107467 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -31,5 +31,6 @@ void machine_pwm_deinit_all(void);
 // TODO: void machine_rmt_deinit_all(void);
 void machine_timer_deinit_all(void);
 void machine_i2s_init0();
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 
 #endif // MICROPY_INCLUDED_ESP32_MODMACHINE_H
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index e97980c36f467..714871d4fc926 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -228,6 +228,10 @@ typedef long mp_off_t;
 #define MICROPY_HW_ENABLE_MDNS_RESPONDER    (1)
 #endif
 
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
+#endif
+
 #ifndef MICROPY_BOARD_STARTUP
 #define MICROPY_BOARD_STARTUP boardctrl_startup
 #endif

From 3d98f6b80a6d74ce31e33588f430a5ec17099620 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Tue, 4 Jul 2023 12:24:35 +0200
Subject: [PATCH 0139/3129] esp32/usb: Add custom TinyUSB callback support.

Allow boards to define their own additional USB callbacks.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 ports/esp32/usb.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 83ba9533d3802..b9d99676d3c5c 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -67,16 +67,22 @@ void usb_init(void) {
     ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
 
     // Initialise the USB serial interface.
-    tinyusb_config_cdcacm_t amc_cfg = {
+    tinyusb_config_cdcacm_t acm_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
+        #ifdef MICROPY_HW_USB_CUSTOM_RX_WANTED_CHAR_CB
+        .callback_rx_wanted_char = &MICROPY_HW_USB_CUSTOM_RX_WANTED_CHAR_CB,
+        #endif
+        #ifdef MICROPY_HW_USB_CUSTOM_LINE_STATE_CB
+        .callback_line_state_changed = &MICROPY_HW_USB_CUSTOM_LINE_STATE_CB,
+        #endif
+        #ifdef MICROPY_HW_USB_CUSTOM_LINE_CODING_CB
+        .callback_line_coding_changed = &MICROPY_HW_USB_CUSTOM_LINE_CODING_CB,
+        #endif
     };
-    ESP_ERROR_CHECK(tusb_cdc_acm_init(&amc_cfg));
+    ESP_ERROR_CHECK(tusb_cdc_acm_init(&acm_cfg));
 
 }
 

From e0784750aab4bd71896d6683de00b15324b8cb0f Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Tue, 4 Jul 2023 12:24:35 +0200
Subject: [PATCH 0140/3129] shared/tinyusb: Avoid symbol clash on targets with
 external TinyUSB.

On targets that provide a reference TinyUSB implementation, like ESP32,
the SDK already defines and implements standard callback functions such
as tud_cdc_line_state_cb(). This causes a symbol clash when enabling
shared implementations like the MicroPython 1200 touch functionality.

To avoid this symbol clash, add an optional macro to allow ports to
use a different function name in the shared implementation.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 shared/tinyusb/mp_cdc_common.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/shared/tinyusb/mp_cdc_common.c b/shared/tinyusb/mp_cdc_common.c
index cd4f5d1013b61..4ccae4bac125e 100644
--- a/shared/tinyusb/mp_cdc_common.c
+++ b/shared/tinyusb/mp_cdc_common.c
@@ -39,7 +39,13 @@ STATIC void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
     machine_bootloader(0, NULL);
 }
 
-void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
+void
+#if MICROPY_HW_USB_EXTERNAL_TINYUSB
+mp_usbd_line_state_cb
+#else
+tud_cdc_line_state_cb
+#endif
+    (uint8_t itf, bool dtr, bool rts) {
     if (dtr == false && rts == false) {
         // Device is disconnected.
         cdc_line_coding_t line_coding;

From cc9735ad6a5c3e198eabb406ee8d8ec687d5ec59 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Tue, 4 Jul 2023 16:08:23 +0200
Subject: [PATCH 0141/3129] esp32/boards/ARDUINO_NANO_ESP32: Add support for
 Arduino Nano ESP32.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 .../boards/ARDUINO_NANO_ESP32/board.json      |  20 +++
 .../boards/ARDUINO_NANO_ESP32/board_init.c    | 124 ++++++++++++++++++
 .../esp32/boards/ARDUINO_NANO_ESP32/deploy.md |   8 ++
 .../boards/ARDUINO_NANO_ESP32/double_tap.c    |  89 +++++++++++++
 .../boards/ARDUINO_NANO_ESP32/double_tap.h    |  37 ++++++
 .../boards/ARDUINO_NANO_ESP32/manifest.py     |   9 ++
 .../ARDUINO_NANO_ESP32/mpconfigboard.cmake    |  23 ++++
 .../boards/ARDUINO_NANO_ESP32/mpconfigboard.h |  32 +++++
 .../partitions-app3M_fat9M_fact512k_16MiB.csv |  10 ++
 .../esp32/boards/ARDUINO_NANO_ESP32/pins.csv  |  38 ++++++
 .../boards/ARDUINO_NANO_ESP32/sdkconfig.board |  22 ++++
 11 files changed, 412 insertions(+)
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.c
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.h
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/manifest.py
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/partitions-app3M_fat9M_fact512k_16MiB.csv
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
 create mode 100644 ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
new file mode 100644
index 0000000000000..031ee17415b6c
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy_s3.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi",
+        "USB-C",
+        "RGB LED"
+    ],
+    "images": [
+        "ABX00092_01.iso_1000x750.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "Arduino Nano ESP32",
+    "thumbnail": "",
+    "url": "https://store.arduino.cc/products/arduino-nano-esp32",
+    "vendor": "Arduino"
+}
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c b/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
new file mode 100644
index 0000000000000..ab03139d9055f
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 <esp_system.h>
+#include <esp_ota_ops.h>
+#include <esp_partition.h>
+
+#include "double_tap.h"
+#include "usb.h"
+
+#include "tinyusb.h"
+#include "tusb_cdc_acm.h"
+
+#define LED_RED     GPIO_NUM_46
+#define LED_GREEN   GPIO_NUM_0
+#define LED_BLUE    GPIO_NUM_45
+#define DELAY_US    60000
+
+static bool _recovery_marker_found; // double tap detected
+static bool _recovery_active;       // running from factory partition
+
+static void rgb_pulse_delay() {
+    // initialize RGB signals from weak pinstraps
+    mp_hal_pin_output(LED_RED);
+    mp_hal_pin_output(LED_GREEN);
+    mp_hal_pin_output(LED_BLUE);
+
+    static const uint8_t SEQ[] = { 1, 3, 2, 6, 7, 5, 4, 5, 7, 6, 2, 3, 1 };
+    for (int idx = 0; idx < sizeof(SEQ); ++idx) {
+        int v = SEQ[idx & 7];
+        mp_hal_pin_write(LED_RED, !(v & 1));
+        mp_hal_pin_write(LED_GREEN, !(v & 2));
+        mp_hal_pin_write(LED_BLUE, !(v & 4));
+
+        // busy wait, we can't use task delay yet
+        mp_hal_delay_us_fast(DELAY_US);
+    }
+
+    // reset pins to digital HIGH before leaving
+    mp_hal_pin_write(LED_RED, 1);
+    mp_hal_pin_write(LED_GREEN, 1);
+    mp_hal_pin_write(LED_BLUE, 1);
+}
+
+void NANO_ESP32_enter_bootloader(void) {
+    if (!_recovery_active) {
+        // check for valid partition scheme
+        const esp_partition_t *ota_part = esp_ota_get_next_update_partition(NULL);
+        const esp_partition_t *fact_part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_FACTORY, NULL);
+        if (ota_part && fact_part) {
+            // set tokens so the recovery FW will find them
+            double_tap_mark();
+            // invalidate other OTA image
+            esp_partition_erase_range(ota_part, 0, 4096);
+            // activate factory partition
+            esp_ota_set_boot_partition(fact_part);
+        }
+    }
+
+    esp_restart();
+}
+
+void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event_in) {
+    extern void mp_usbd_line_state_cb(uint8_t itf, bool dtr, bool rts);
+    cdcacm_event_t *event = event_in;
+    mp_usbd_line_state_cb(itf, event->line_state_changed_data.dtr, event->line_state_changed_data.rts);
+}
+
+void NANO_ESP32_board_startup(void) {
+    boardctrl_startup();
+
+    // mark current partition as valid
+    const esp_partition_t *running = esp_ota_get_running_partition();
+    esp_ota_img_states_t ota_state;
+    if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
+        if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
+            esp_ota_mark_app_valid_cancel_rollback();
+        }
+    }
+
+    const esp_partition_t *part = esp_ota_get_running_partition();
+    _recovery_active = (part->subtype == ESP_PARTITION_SUBTYPE_APP_FACTORY);
+
+    double_tap_init();
+
+    _recovery_marker_found = double_tap_check_match();
+    if (_recovery_marker_found && !_recovery_active) {
+        // double tap detected in user application, reboot to factory
+        NANO_ESP32_enter_bootloader();
+    }
+
+    // delay with mark set then proceed
+    // - for normal startup, to detect first double tap
+    // - in recovery mode, to ignore several short presses
+    double_tap_mark();
+    rgb_pulse_delay();
+    double_tap_invalidate();
+}
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md b/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
new file mode 100644
index 0000000000000..b600a55b64e2b
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
@@ -0,0 +1,8 @@
+### 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 -d 0x2341:0x0070 -R -D build-ARDUINO_NANO_ESP32/micropython.bin
+```
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.c b/ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.c
new file mode 100644
index 0000000000000..8f50a32722711
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.c
@@ -0,0 +1,89 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 <esp32s3/rom/cache.h>
+
+// for get_extram_data_high()
+#include <esp_psram.h>
+#include <esp_private/esp_psram_extram.h>
+
+#include "double_tap.h"
+
+#define NUM_TOKENS 3
+static const uint32_t MAGIC_TOKENS[NUM_TOKENS] = {
+    0xf01681de, 0xbd729b29, 0xd359be7a,
+};
+
+static void *magic_area;
+static uint32_t backup_area[NUM_TOKENS];
+
+// Current IDF does not map external RAM to a fixed address.
+// The actual VMA depends on other enabled devices, so the precise
+// location must be discovered.
+static uintptr_t get_extram_data_high(void) {
+    // get a pointer into SRAM area (only the address is useful)
+    void *psram_ptr = heap_caps_malloc(16, MALLOC_CAP_SPIRAM);
+    heap_caps_free(psram_ptr);
+
+    // keep moving backwards until leaving PSRAM area
+    uintptr_t psram_base_addr = (uintptr_t)psram_ptr;
+    psram_base_addr &= ~(CONFIG_MMU_PAGE_SIZE - 1); // align to start of page
+    while (esp_psram_check_ptr_addr((void *)psram_base_addr)) {
+        psram_base_addr -= CONFIG_MMU_PAGE_SIZE;
+    }
+
+    // offset is one page from start of PSRAM
+    return psram_base_addr + CONFIG_MMU_PAGE_SIZE + esp_psram_get_size();
+}
+
+void double_tap_init(void) {
+    // magic location block ends 0x20 bytes from end of PSRAM
+    magic_area = (void *)(get_extram_data_high() - 0x20 - sizeof(MAGIC_TOKENS));
+}
+
+void double_tap_mark() {
+    memcpy(backup_area, magic_area, sizeof(MAGIC_TOKENS));
+    memcpy(magic_area, MAGIC_TOKENS, sizeof(MAGIC_TOKENS));
+    Cache_WriteBack_Addr((uintptr_t)magic_area, sizeof(MAGIC_TOKENS));
+}
+
+void double_tap_invalidate() {
+    if (memcmp(backup_area, MAGIC_TOKENS, sizeof(MAGIC_TOKENS))) {
+        // different contents: restore backup
+        memcpy(magic_area, backup_area, sizeof(MAGIC_TOKENS));
+    } else {
+        // clear memory
+        memset(magic_area, 0, sizeof(MAGIC_TOKENS));
+    }
+    Cache_WriteBack_Addr((uintptr_t)magic_area, sizeof(MAGIC_TOKENS));
+}
+
+bool double_tap_check_match() {
+    return memcmp(magic_area, MAGIC_TOKENS, sizeof(MAGIC_TOKENS)) == 0;
+}
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.h
new file mode 100644
index 0000000000000..9aa738f2d9f88
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/double_tap.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ */
+
+#ifndef MICROPY_INCLUDED_ESP32_DOUBLE_TAP_H
+#define MICROPY_INCLUDED_ESP32_DOUBLE_TAP_H
+
+#include <stdint.h>
+
+void double_tap_init(void);
+void double_tap_mark(void);
+void double_tap_invalidate(void);
+bool double_tap_check_match(void);
+
+#endif /* MICROPY_INCLUDED_ESP32_DOUBLE_TAP_H */
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/manifest.py b/ports/esp32/boards/ARDUINO_NANO_ESP32/manifest.py
new file mode 100644
index 0000000000000..e7fc7fe1619f9
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/manifest.py
@@ -0,0 +1,9 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+# Utils
+require("time")
+require("senml")
+require("logging")
+
+# Bluetooth
+require("aioble")
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
new file mode 100644
index 0000000000000..7ae4b38185353
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
@@ -0,0 +1,23 @@
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../.. ABSOLUTE)
+endif()
+
+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
+    ${MICROPY_BOARD_DIR}/sdkconfig.board
+)
+
+set(MICROPY_SOURCE_BOARD
+    ${MICROPY_BOARD_DIR}/board_init.c
+    ${MICROPY_BOARD_DIR}/double_tap.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_cdc_common.c
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
new file mode 100644
index 0000000000000..3e98bb99d7027
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
@@ -0,0 +1,32 @@
+#define MICROPY_HW_BOARD_NAME               "Arduino Nano ESP32"
+#define MICROPY_HW_MCU_NAME                 "ESP32S3"
+
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+#define MICROPY_HW_I2C0_SCL                 (12)
+#define MICROPY_HW_I2C0_SDA                 (11)
+
+#define MICROPY_HW_I2C1_SCL                 (8)
+#define MICROPY_HW_I2C1_SDA                 (9)
+
+#define MICROPY_HW_SPI1_MOSI                (38)
+#define MICROPY_HW_SPI1_MISO                (47)
+#define MICROPY_HW_SPI1_SCK                 (48)
+
+#define MICROPY_HW_SPI2_MOSI                (10)
+#define MICROPY_HW_SPI2_MISO                (17)
+#define MICROPY_HW_SPI2_SCK                 (18)
+
+#define MICROPY_HW_ENABLE_USBDEV            (1)
+#define MICROPY_HW_USB_EXTERNAL_TINYUSB     (1)
+#define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
+#define MICROPY_SCHEDULER_STATIC_NODES      (1)
+
+#define MICROPY_HW_USB_CUSTOM_LINE_STATE_CB             NANO_ESP32_usb_callback_line_state_changed
+void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event);
+
+#define MICROPY_BOARD_STARTUP                           NANO_ESP32_board_startup
+void NANO_ESP32_board_startup(void);
+
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)     NANO_ESP32_enter_bootloader()
+void NANO_ESP32_enter_bootloader(void);
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/partitions-app3M_fat9M_fact512k_16MiB.csv b/ports/esp32/boards/ARDUINO_NANO_ESP32/partitions-app3M_fat9M_fact512k_16MiB.csv
new file mode 100644
index 0000000000000..13b4414b1d301
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/partitions-app3M_fat9M_fact512k_16MiB.csv
@@ -0,0 +1,10 @@
+# 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,   0x5000,
+otadata,  data, ota,        0xe000,   0x2000,
+app0,     app,  ota_0,     0x10000, 0x300000,
+app1,     app,  ota_1,    0x310000, 0x300000,
+ffat,     data, fat,      0x610000, 0x960000,
+factory,  app,  factory,  0xF70000,  0x80000,
+coredump, data, coredump, 0xFF0000,  0x10000,
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv b/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
new file mode 100644
index 0000000000000..b891608d5d89c
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
@@ -0,0 +1,38 @@
+D0,GPIO44
+D1,GPIO43
+D2,GPIO5
+D3,GPIO6
+D4,GPIO7
+D5,GPIO8
+D6,GPIO9
+D7,GPIO10
+D8,GPIO17
+D9,GPIO18
+D10,GPIO21
+D11,GPIO38
+D12,GPIO47
+D13,GPIO48
+LED_RED,GPIO46
+LED_GREEN,GPIO0
+LED_BLUE,GPIO45
+A0,GPIO1
+A1,GPIO2
+A2,GPIO3
+A3,GPIO4
+A4,GPIO11
+A5,GPIO12
+A6,GPIO13
+A7,GPIO14
+LED_BUILTIN,GPIO48
+TX,GPIO43
+RX,GPIO44
+RTS,GPIO45
+CTS,GPIO6
+DTR,GPIO1
+DSR,GPIO7
+SS,GPIO21
+MOSI,GPIO38
+MISO,GPIO47
+SCK,GPIO48
+SDA,GPIO11
+SCL,GPIO12
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
new file mode 100644
index 0000000000000..4d175f7ed77c7
--- /dev/null
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
@@ -0,0 +1,22 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="boards/ARDUINO_NANO_ESP32/partitions-app3M_fat9M_fact512k_16MiB.csv"
+
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_SPIRAM_IGNORE_NOTFOUND=
+
+CONFIG_LWIP_LOCAL_HOSTNAME="nano-esp32"
+
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x2341
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x056B
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Arduino"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="Nano ESP32"
+
+# compatibility with Espressif Arduino core
+CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
+CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
+CONFIG_ESP_ENABLE_COREDUMP_TO_FLASH=y

From 9fb56d15627e831f315e8afcbd5115c5506b10e0 Mon Sep 17 00:00:00 2001
From: Mark Grosen <mark@grosen.org>
Date: Mon, 17 Jul 2023 17:03:04 -0700
Subject: [PATCH 0142/3129] esp32/CMakeLists: Enable multiple extra component
 directories in build.

The EXTRA_COMPONENT_DIRS variable is a list so adding a directory so should
be done via append, not set.  This enables boards to use other components
in the build. See:
https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html#optional-project-variables
---
 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 a4970c1a1b0b2..4e29e96109457 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -47,7 +47,7 @@ set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 # Set the location of the main component for the project (one per target).
-set(EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
+list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
 
 # Define the project.
 project(micropython)

From add1200343e59774d2b168cc2ff1ab8ae5660489 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 00:21:12 +1000
Subject: [PATCH 0143/3129] all: Remove the zlib module.

This will be replaced with a new deflate module providing the same
functionality, with an optional frozen Python wrapper providing a
replacement zlib module.

binascii.crc32 is temporarily disabled.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/zlib/Makefile                 |  13 -
 examples/natmod/zlib/zlib.c                   |  35 ---
 extmod/extmod.cmake                           |   1 -
 extmod/extmod.mk                              |   1 -
 extmod/modbinascii.c                          |   6 +-
 extmod/modzlib.c                              | 239 ------------------
 ports/cc3200/mpconfigport.h                   |   1 -
 ports/qemu-arm/mpconfigport.h                 |   1 -
 ports/samd/mpconfigport.h                     |   1 -
 .../boards/NUCLEO_G474RE/mpconfigboard.h      |   1 -
 ports/windows/mpconfigport.h                  |   1 -
 ports/windows/msvc/sources.props              |   1 -
 py/mpconfig.h                                 |   4 -
 tests/extmod/zlib_decompio.py                 |  33 ---
 tests/extmod/zlib_decompio.py.exp             |  12 -
 tests/extmod/zlib_decompio_gz.py              |  60 -----
 tests/extmod/zlib_decompio_gz.py.exp          |  13 -
 tests/extmod/zlib_decompress.py               |  57 -----
 tests/run-natmodtests.py                      |   1 -
 tests/run-tests.py                            |   1 -
 tests/unix/extra_coverage.py.exp              |   1 -
 tools/ci.sh                                   |   3 +-
 22 files changed, 4 insertions(+), 482 deletions(-)
 delete mode 100644 examples/natmod/zlib/Makefile
 delete mode 100644 examples/natmod/zlib/zlib.c
 delete mode 100644 extmod/modzlib.c
 delete mode 100644 tests/extmod/zlib_decompio.py
 delete mode 100644 tests/extmod/zlib_decompio.py.exp
 delete mode 100644 tests/extmod/zlib_decompio_gz.py
 delete mode 100644 tests/extmod/zlib_decompio_gz.py.exp
 delete mode 100644 tests/extmod/zlib_decompress.py

diff --git a/examples/natmod/zlib/Makefile b/examples/natmod/zlib/Makefile
deleted file mode 100644
index e4b4e0712ef2e..0000000000000
--- a/examples/natmod/zlib/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Location of top-level MicroPython directory
-MPY_DIR = ../../..
-
-# Name of module (different to built-in zlib so it can coexist)
-MOD = zlib_$(ARCH)
-
-# Source files (.c or .py)
-SRC = zlib.c
-
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
-ARCH = x64
-
-include $(MPY_DIR)/py/dynruntime.mk
diff --git a/examples/natmod/zlib/zlib.c b/examples/natmod/zlib/zlib.c
deleted file mode 100644
index 2b0dbd5ca0155..0000000000000
--- a/examples/natmod/zlib/zlib.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#define MICROPY_PY_ZLIB (1)
-
-#include "py/dynruntime.h"
-
-#if !defined(__linux__)
-void *memset(void *s, int c, size_t n) {
-    return mp_fun_table.memset_(s, c, n);
-}
-#endif
-
-mp_obj_full_type_t decompio_type;
-
-#include "extmod/modzlib.c"
-
-mp_map_elem_t decompio_locals_dict_table[3];
-STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_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) {
-    MP_DYNRUNTIME_INIT_ENTRY
-
-    decompio_type.base.type = mp_fun_table.type_type;
-    decompio_type.name = MP_QSTR_DecompIO;
-    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, 2);
-
-    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_zlib));
-    mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_zlib_decompress_obj));
-    mp_store_global(MP_QSTR_DecompIO, MP_OBJ_FROM_PTR(&decompio_type));
-
-    MP_DYNRUNTIME_INIT_EXIT
-}
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 67f33cf91f89b..29b4627614b43 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -36,7 +36,6 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
     ${MICROPY_EXTMOD_DIR}/modtime.c
     ${MICROPY_EXTMOD_DIR}/modwebsocket.c
-    ${MICROPY_EXTMOD_DIR}/modzlib.c
     ${MICROPY_EXTMOD_DIR}/modwebrepl.c
     ${MICROPY_EXTMOD_DIR}/network_cyw43.c
     ${MICROPY_EXTMOD_DIR}/network_lwip.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 41d200fce4954..0745fb49ebc04 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -35,7 +35,6 @@ SRC_EXTMOD_C += \
 	extmod/moductypes.c \
 	extmod/modwebrepl.c \
 	extmod/modwebsocket.c \
-	extmod/modzlib.c \
 	extmod/network_cyw43.c \
 	extmod/network_lwip.c \
 	extmod/network_ninaw10.c \
diff --git a/extmod/modbinascii.c b/extmod/modbinascii.c
index 183cd3fc1789b..0c562de7c0f0d 100644
--- a/extmod/modbinascii.c
+++ b/extmod/modbinascii.c
@@ -170,8 +170,8 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
 
-#if MICROPY_PY_BINASCII_CRC32
-#include "lib/uzlib/tinf.h"
+#if 0 // MICROPY_PY_BINASCII_CRC32
+#include "lib/uzlib/crc32.c"
 
 STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
@@ -191,7 +191,7 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
     #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_BINASCII_CRC32
+    #if 0 // MICROPY_PY_BINASCII_CRC32
     { MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_binascii_crc32_obj) },
     #endif
 };
diff --git a/extmod/modzlib.c b/extmod/modzlib.c
deleted file mode 100644
index 31096cfeb9e92..0000000000000
--- a/extmod/modzlib.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-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 <stdio.h>
-#include <string.h>
-
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/mperrno.h"
-
-#if MICROPY_PY_ZLIB
-
-#include "lib/uzlib/tinf.h"
-
-#if 0 // print debugging info
-#define DEBUG_printf DEBUG_printf
-#else // don't print debugging info
-#define DEBUG_printf(...) (void)0
-#endif
-
-typedef struct _mp_obj_decompio_t {
-    mp_obj_base_t base;
-    mp_obj_t src_stream;
-    TINF_DATA decomp;
-    bool eof;
-} mp_obj_decompio_t;
-
-STATIC int read_src_stream(TINF_DATA *data) {
-    byte *p = (void *)data;
-    p -= offsetof(mp_obj_decompio_t, decomp);
-    mp_obj_decompio_t *self = (mp_obj_decompio_t *)p;
-
-    const mp_stream_p_t *stream = mp_get_stream(self->src_stream);
-    int err;
-    byte c;
-    mp_uint_t out_sz = stream->read(self->src_stream, &c, 1, &err);
-    if (out_sz == MP_STREAM_ERROR) {
-        mp_raise_OSError(err);
-    }
-    if (out_sz == 0) {
-        mp_raise_type(&mp_type_EOFError);
-    }
-    return c;
-}
-
-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 = 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];
-    o->eof = false;
-
-    mp_int_t dict_opt = 0;
-    uint dict_sz;
-    if (n_args > 1) {
-        dict_opt = mp_obj_get_int(args[1]);
-    }
-
-    if (dict_opt >= 16) {
-        int st = uzlib_gzip_parse_header(&o->decomp);
-        if (st != TINF_OK) {
-            goto header_error;
-        }
-        dict_sz = 1 << (dict_opt - 16);
-    } else if (dict_opt >= 0) {
-        dict_opt = uzlib_zlib_parse_header(&o->decomp);
-        if (dict_opt < 0) {
-        header_error:
-            mp_raise_ValueError(MP_ERROR_TEXT("compression header"));
-        }
-        // 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;
-    }
-
-    uzlib_uncompress_init(&o->decomp, m_new(byte, dict_sz), dict_sz);
-    return MP_OBJ_FROM_PTR(o);
-}
-
-STATIC mp_uint_t decompio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
-    mp_obj_decompio_t *o = MP_OBJ_TO_PTR(o_in);
-    if (o->eof) {
-        return 0;
-    }
-
-    o->decomp.dest = buf;
-    o->decomp.dest_limit = (byte *)buf + size;
-    int st = uzlib_uncompress_chksum(&o->decomp);
-    if (st == TINF_DONE) {
-        o->eof = true;
-    }
-    if (st < 0) {
-        DEBUG_printf("uncompress error=" INT_FMT "\n", st);
-        *errcode = MP_EINVAL;
-        return MP_STREAM_ERROR;
-    }
-    return o->decomp.dest - (byte *)buf;
-}
-
-#if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t decompio_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) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table);
-#endif
-
-STATIC const mp_stream_p_t decompio_stream_p = {
-    .read = decompio_read,
-};
-
-#if !MICROPY_ENABLE_DYNRUNTIME
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    decompio_type,
-    MP_QSTR_DecompIO,
-    MP_TYPE_FLAG_NONE,
-    make_new, decompio_make_new,
-    protocol, &decompio_stream_p,
-    locals_dict, &decompio_locals_dict
-    );
-#endif
-
-STATIC mp_obj_t mod_zlib_decompress(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t data = args[0];
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
-
-    TINF_DATA *decomp = m_new_obj(TINF_DATA);
-    memset(decomp, 0, sizeof(*decomp));
-    DEBUG_printf("sizeof(TINF_DATA)=" UINT_FMT "\n", sizeof(*decomp));
-    uzlib_uncompress_init(decomp, NULL, 0);
-    mp_uint_t dest_buf_size = (bufinfo.len + 15) & ~15;
-    byte *dest_buf = m_new(byte, dest_buf_size);
-
-    decomp->dest = dest_buf;
-    decomp->dest_limit = dest_buf + dest_buf_size;
-    DEBUG_printf("zlib: Initial out buffer: " UINT_FMT " bytes\n", dest_buf_size);
-    decomp->source = bufinfo.buf;
-    decomp->source_limit = (byte *)bufinfo.buf + bufinfo.len;
-
-    int st;
-    bool is_zlib = true;
-
-    if (n_args > 1 && MP_OBJ_SMALL_INT_VALUE(args[1]) < 0) {
-        is_zlib = false;
-    }
-
-    if (is_zlib) {
-        st = uzlib_zlib_parse_header(decomp);
-        if (st < 0) {
-            goto error;
-        }
-    }
-
-    while (1) {
-        st = uzlib_uncompress_chksum(decomp);
-        if (st < 0) {
-            goto error;
-        }
-        if (st == TINF_DONE) {
-            break;
-        }
-        size_t offset = decomp->dest - dest_buf;
-        dest_buf = m_renew(byte, dest_buf, dest_buf_size, dest_buf_size + 256);
-        dest_buf_size += 256;
-        decomp->dest = dest_buf + offset;
-        decomp->dest_limit = decomp->dest + 256;
-    }
-
-    mp_uint_t final_sz = decomp->dest - dest_buf;
-    DEBUG_printf("zlib: Resizing from " UINT_FMT " to final size: " UINT_FMT " bytes\n", dest_buf_size, final_sz);
-    dest_buf = (byte *)m_renew(byte, dest_buf, dest_buf_size, final_sz);
-    mp_obj_t res = mp_obj_new_bytearray_by_ref(final_sz, dest_buf);
-    m_del_obj(TINF_DATA, decomp);
-    return res;
-
-error:
-    mp_raise_type_arg(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_zlib_decompress_obj, 1, 3, mod_zlib_decompress);
-
-#if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_zlib_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) },
-    { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&mod_zlib_decompress_obj) },
-    { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(mp_module_zlib_globals, mp_module_zlib_globals_table);
-
-const mp_obj_module_t mp_module_zlib = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_zlib_globals,
-};
-
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_zlib, mp_module_zlib);
-#endif
-
-// Source files #include'd here to make sure they're compiled in
-// only if module is enabled by config setting.
-
-#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_ZLIB
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index af10c63531ffa..dbceabb9d86a6 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -110,7 +110,6 @@
 #define MICROPY_PY_THREAD_GIL                       (1)
 #define MICROPY_PY_BINASCII                         (1)
 #define MICROPY_PY_UCTYPES                          (0)
-#define MICROPY_PY_ZLIB                             (0)
 #define MICROPY_PY_JSON                             (1)
 #define MICROPY_PY_RE                               (1)
 #define MICROPY_PY_HEAPQ                            (0)
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 0eada5a529c56..d186f70b7eb33 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -40,7 +40,6 @@
 #define MICROPY_PY_BINASCII         (1)
 #define MICROPY_PY_RANDOM           (1)
 #define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_ZLIB             (1)
 #define MICROPY_PY_JSON             (1)
 #define MICROPY_PY_OS               (1)
 #define MICROPY_PY_RE               (1)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 600c79da04fdc..827e952b00de3 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -91,7 +91,6 @@
 #define MICROPY_PY_UCTYPES                  (1)
 #define MICROPY_PY_HEAPQ                    (1)
 #define MICROPY_PY_RANDOM                   (1)
-#define MICROPY_PY_ZLIB                     (1)
 #define MICROPY_PY_ASYNCIO                  (1)
 #define MICROPY_PY_MACHINE_RTC              (1)
 #ifndef MICROPY_PY_MACHINE_ADC
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
index e10f63da73216..0093b2df39bb9 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
@@ -10,7 +10,6 @@
 #define MICROPY_HW_HAS_FLASH        (0) // QSPI extflash not mounted
 
 #define MICROPY_PY_ASYNCIO          (0)
-#define MICROPY_PY_ZLIB             (0)
 #define MICROPY_PY_BINASCII         (0)
 #define MICROPY_PY_HASHLIB          (0)
 #define MICROPY_PY_JSON             (0)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index dc9208f6f1dc2..0658838075f69 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -144,7 +144,6 @@
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
 #define MICROPY_PY_ERRNO            (1)
 #define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_ZLIB             (1)
 #define MICROPY_PY_JSON             (1)
 #define MICROPY_PY_RE               (1)
 #define MICROPY_PY_HEAPQ            (1)
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index 6277b74e20cc1..6d438f3f0db0c 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -18,7 +18,6 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" />
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2bbe3849b0517..122d0a70f2a77 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1555,10 +1555,6 @@ typedef double mp_float_t;
 #define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1)
 #endif
 
-#ifndef MICROPY_PY_ZLIB
-#define MICROPY_PY_ZLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
-#endif
-
 #ifndef MICROPY_PY_JSON
 #define MICROPY_PY_JSON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
diff --git a/tests/extmod/zlib_decompio.py b/tests/extmod/zlib_decompio.py
deleted file mode 100644
index 9abbad43c60f5..0000000000000
--- a/tests/extmod/zlib_decompio.py
+++ /dev/null
@@ -1,33 +0,0 @@
-try:
-    import zlib
-    import io
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-
-# Raw DEFLATE bitstream
-buf = io.BytesIO(b"\xcbH\xcd\xc9\xc9\x07\x00")
-inp = zlib.DecompIO(buf, -8)
-print(buf.seek(0, 1))
-print(inp.read(1))
-print(buf.seek(0, 1))
-print(inp.read(2))
-print(inp.read())
-print(buf.seek(0, 1))
-print(inp.read(1))
-print(inp.read())
-print(buf.seek(0, 1))
-
-
-# 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"\x08\x9930\xa0=\x00\x00\xb3q\x12\xc0"))
-try:
-    print(inp.read())
-except OSError as e:
-    print(repr(e))
diff --git a/tests/extmod/zlib_decompio.py.exp b/tests/extmod/zlib_decompio.py.exp
deleted file mode 100644
index 3f5f360fa3ec0..0000000000000
--- a/tests/extmod/zlib_decompio.py.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-0
-b'h'
-2
-b'el'
-b'lo'
-7
-b''
-b''
-7
-b'0000000000'
-b'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-OSError(22,)
diff --git a/tests/extmod/zlib_decompio_gz.py b/tests/extmod/zlib_decompio_gz.py
deleted file mode 100644
index 1407459304dc5..0000000000000
--- a/tests/extmod/zlib_decompio_gz.py
+++ /dev/null
@@ -1,60 +0,0 @@
-try:
-    import zlib
-    import io
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-
-# gzip bitstream
-buf = io.BytesIO(
-    b"\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00"
-)
-inp = zlib.DecompIO(buf, 16 + 8)
-print(buf.seek(0, 1))
-print(inp.read(1))
-print(buf.seek(0, 1))
-print(inp.read(2))
-print(inp.read())
-print(buf.seek(0, 1))
-print(inp.read(1))
-print(inp.read())
-print(buf.seek(0, 1))
-
-# Check FHCRC field
-buf = io.BytesIO(
-    b"\x1f\x8b\x08\x02\x99\x0c\xe5W\x00\x03\x00\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00"
-)
-inp = zlib.DecompIO(buf, 16 + 8)
-print(inp.read())
-
-# Check FEXTRA field
-buf = io.BytesIO(
-    b"\x1f\x8b\x08\x04\x99\x0c\xe5W\x00\x03\x01\x00X\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00"
-)
-inp = zlib.DecompIO(buf, 16 + 8)
-print(inp.read())
-
-# broken header
-buf = io.BytesIO(
-    b"\x1f\x8c\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00"
-)
-try:
-    inp = zlib.DecompIO(buf, 16 + 8)
-except ValueError:
-    print("ValueError")
-
-# broken crc32
-buf = io.BytesIO(
-    b"\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa7\x106\x05\x00\x00\x00"
-)
-inp = zlib.DecompIO(buf, 16 + 8)
-try:
-    inp.read(6)
-except OSError as e:
-    print(repr(e))
-
-# broken uncompressed size - not checked so far
-# buf = io.BytesIO(b'\x1f\x8b\x08\x08\x99\x0c\xe5W\x00\x03hello\x00\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x06\x00\x00\x00')
-# inp = zlib.DecompIO(buf, 16 + 8)
-# inp.read(6)
diff --git a/tests/extmod/zlib_decompio_gz.py.exp b/tests/extmod/zlib_decompio_gz.py.exp
deleted file mode 100644
index 20a30c82a3d5e..0000000000000
--- a/tests/extmod/zlib_decompio_gz.py.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-16
-b'h'
-18
-b'el'
-b'lo'
-31
-b''
-b''
-31
-b'hello'
-b'hello'
-ValueError
-OSError(22,)
diff --git a/tests/extmod/zlib_decompress.py b/tests/extmod/zlib_decompress.py
deleted file mode 100644
index b72ee96ea88ce..0000000000000
--- a/tests/extmod/zlib_decompress.py
+++ /dev/null
@@ -1,57 +0,0 @@
-try:
-    import zlib
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-PATTERNS = [
-    # Packed results produced by CPy's zlib.compress()
-    (b"0", b"x\x9c3\x00\x00\x001\x001"),
-    (b"a", b"x\x9cK\x04\x00\x00b\x00b"),
-    (b"0" * 100, b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc1"),
-    (
-        bytes(range(64)),
-        b"x\x9cc`dbfaec\xe7\xe0\xe4\xe2\xe6\xe1\xe5\xe3\x17\x10\x14\x12\x16\x11\x15\x13\x97\x90\x94\x92\x96\x91\x95\x93WPTRVQUS\xd7\xd0\xd4\xd2\xd6\xd1\xd5\xd370426153\xb7\xb0\xb4\xb2\xb6\xb1\xb5\xb3\x07\x00\xaa\xe0\x07\xe1",
-    ),
-    (b"hello", b"x\x01\x01\x05\x00\xfa\xffhello\x06,\x02\x15"),  # compression level 0
-    # adaptive/dynamic huffman tree
-    (
-        b"13371813150|13764518736|12345678901",
-        b"x\x9c\x05\xc1\x81\x01\x000\x04\x04\xb1\x95\\\x1f\xcfn\x86o\x82d\x06Qq\xc8\x9d\xc5X}<e\xb5g\x83\x0f\x89X\x07\xab",
-    ),
-    # dynamic Huffman tree with "case 17" (repeat code for 3-10 times)
-    (
-        b">I}\x00\x951D>I}\x00\x951D>I}\x00\x951D>I}\x00\x951D",
-        b"x\x9c\x05\xc11\x01\x00\x00\x00\x010\x95\x14py\x84\x12C_\x9bR\x8cV\x8a\xd1J1Z)F\x1fw`\x089",
-    ),
-]
-
-for unpacked, packed in PATTERNS:
-    assert zlib.decompress(packed) == unpacked
-    print(unpacked)
-
-
-# Raw DEFLATE bitstream
-v = b"\xcbH\xcd\xc9\xc9\x07\x00"
-exp = b"hello"
-out = zlib.decompress(v, -15)
-assert out == exp
-print(exp)
-# Even when you ask CPython zlib.compress to produce Raw DEFLATE stream,
-# it returns it with adler2 and oriignal size appended, as if it was a
-# zlib stream. Make sure there're no random issues decompressing such.
-v = b"\xcbH\xcd\xc9\xc9\x07\x00\x86\xa6\x106\x05\x00\x00\x00"
-out = zlib.decompress(v, -15)
-assert out == exp
-
-# this should error
-try:
-    zlib.decompress(b"abc")
-except Exception:
-    print("Exception")
-
-# invalid block type
-try:
-    zlib.decompress(b"\x07", -15)  # final-block, block-type=3 (invalid)
-except Exception as er:
-    print("Exception")
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 16f8fde967b36..ce4f941350637 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -25,7 +25,6 @@
     "heapq": "heapq/heapq_$(ARCH).mpy",
     "random": "random/random_$(ARCH).mpy",
     "re": "re/re_$(ARCH).mpy",
-    "zlib": "zlib/zlib_$(ARCH).mpy",
 }
 
 # Code to allow a target MicroPython to import an .mpy from RAM
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 6fee9d91834f1..019b30189f939 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -567,7 +567,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
                     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/heapq1.py")  # heapq not supported by WiPy
             skip_tests.add("extmod/random_basic.py")  # requires random
             skip_tests.add("extmod/random_extra.py")  # requires random
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 013782ede5f18..9c7660de6dc6e 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -59,7 +59,6 @@ io              json            machine         math
 os              random          re              select
 socket          ssl             struct          sys
 termios         time            uctypes         websocket
-zlib
 me
 
 micropython     machine         math
diff --git a/tools/ci.sh b/tools/ci.sh
index 84ca83e9b8aa4..bbff5359a1e1f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -430,7 +430,6 @@ function ci_native_mpy_modules_build {
     make -C examples/natmod/heapq ARCH=$arch
     make -C examples/natmod/random ARCH=$arch
     make -C examples/natmod/re ARCH=$arch
-    make -C examples/natmod/zlib ARCH=$arch
 }
 
 function ci_native_mpy_modules_32bit_build {
@@ -496,7 +495,7 @@ function ci_unix_coverage_run_mpy_merge_tests {
 
 function ci_unix_coverage_run_native_mpy_tests {
     MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython -m features2
-    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,heapq*,random*,re*,zlib*}.py)
+    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,heapq*,random*,re*}.py)
 }
 
 function ci_unix_32bit_setup {

From 198311c780e9e05a58c710d73a22abaf8347d4ee Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 26 Jun 2023 23:53:12 +1000
Subject: [PATCH 0144/3129] py/stream: Add mp_stream___exit___obj that calls
 mp_stream_close.

There are enough places that implement __exit__ by forwarding directly to
mp_stream_close that this saves code size.

For the cases where __exit__ is a no-op, additionally make their
MP_STREAM_CLOSE ioctl handled as a no-op.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/vfs_fat_file.c            | 9 +--------
 extmod/vfs_lfsx_file.c           | 8 +-------
 extmod/vfs_posix_file.c          | 8 +-------
 ports/stm32/usb.c                | 9 +++------
 py/objstringio.c                 | 8 +-------
 py/stream.c                      | 6 ++++++
 py/stream.h                      | 1 +
 shared/runtime/sys_stdio_mphal.c | 9 +++------
 8 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 07e6df9bf9595..f82fe4aaae7e2 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -96,13 +96,6 @@ STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t siz
     return sz_out;
 }
 
-
-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 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);
 
@@ -165,7 +158,7 @@ STATIC const mp_rom_map_elem_t vfs_fat_rawfile_locals_dict_table[] = {
     { 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___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(vfs_fat_rawfile_locals_dict, vfs_fat_rawfile_locals_dict_table);
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index 5f0155d3c5c04..879ba78973db7 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -123,12 +123,6 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t MP_VFS_LFSx(file___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(MP_VFS_LFSx(file___exit___obj), 4, 4, MP_VFS_LFSx(file___exit__));
-
 STATIC mp_uint_t MP_VFS_LFSx(file_read)(mp_obj_t self_in, 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);
@@ -213,7 +207,7 @@ STATIC const mp_rom_map_elem_t MP_VFS_LFSx(file_locals_dict_table)[] = {
     { 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(&MP_VFS_LFSx(file___exit___obj)) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(MP_VFS_LFSx(file_locals_dict), MP_VFS_LFSx(file_locals_dict_table));
 
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 1d89e3ca09737..cfc56df99f104 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -115,12 +115,6 @@ STATIC mp_obj_t vfs_posix_file_fileno(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_file_fileno_obj, vfs_posix_file_fileno);
 
-STATIC mp_obj_t vfs_posix_file___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(vfs_posix_file___exit___obj, 4, 4, vfs_posix_file___exit__);
-
 STATIC mp_uint_t vfs_posix_file_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_vfs_posix_file_t *o = MP_OBJ_TO_PTR(o_in);
     check_fd_is_open(o);
@@ -239,7 +233,7 @@ STATIC const mp_rom_map_elem_t vfs_posix_rawfile_locals_dict_table[] = {
     { 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) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(vfs_posix_rawfile_locals_dict, vfs_posix_rawfile_locals_dict_table);
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index c3b8544417d0b..df6b2cf62a1ff 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -858,11 +858,6 @@ STATIC mp_obj_t pyb_usb_vcp_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 }
 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;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_usb_vcp___exit___obj, 4, 4, pyb_usb_vcp___exit__);
-
 STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_usb_vcp_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_setinterrupt), MP_ROM_PTR(&pyb_usb_vcp_setinterrupt_obj) },
@@ -879,7 +874,7 @@ STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     { 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) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_RTS) },
@@ -923,6 +918,8 @@ STATIC mp_uint_t pyb_usb_vcp_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
         if ((flags & MP_STREAM_POLL_WR) && usbd_cdc_tx_half_empty(self->cdc_itf)) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_CLOSE) {
+        ret = 0;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;
diff --git a/py/objstringio.c b/py/objstringio.c
index 1a083449bafa9..a3c66ed010cc0 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -170,12 +170,6 @@ STATIC mp_obj_t stringio_getvalue(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(stringio_getvalue_obj, stringio_getvalue);
 
-STATIC mp_obj_t stringio___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(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 = mp_obj_malloc(mp_obj_stringio_t, type);
     o->pos = 0;
@@ -232,7 +226,7 @@ STATIC const mp_rom_map_elem_t stringio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
     { MP_ROM_QSTR(MP_QSTR_getvalue), MP_ROM_PTR(&stringio_getvalue_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&stringio___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(stringio_locals_dict, stringio_locals_dict_table);
diff --git a/py/stream.c b/py/stream.c
index 36325e7d414a6..ac0234ac1353c 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -438,6 +438,12 @@ mp_obj_t mp_stream_close(mp_obj_t stream) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_close_obj, mp_stream_close);
 
+STATIC mp_obj_t mp_stream___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    return mp_stream_close(args[0]);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream___exit___obj, 4, 4, mp_stream___exit__);
+
 STATIC mp_obj_t stream_seek(size_t n_args, const mp_obj_t *args) {
     struct mp_stream_seek_t seek_s;
     // TODO: Could be uint64
diff --git a/py/stream.h b/py/stream.h
index 4bc329b3e790d..6b5c85ab15c2b 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -83,6 +83,7 @@ MP_DECLARE_CONST_FUN_OBJ_1(mp_stream_unbuffered_readlines_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write_obj);
 MP_DECLARE_CONST_FUN_OBJ_2(mp_stream_write1_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_stream_close_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream___exit___obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_seek_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_stream_tell_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_stream_flush_obj);
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index ab5bdd34e73c1..84ce5828ef048 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -89,17 +89,14 @@ STATIC mp_uint_t stdio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg,
     (void)self_in;
     if (request == MP_STREAM_POLL) {
         return mp_hal_stdio_poll(arg);
+    } else if (request == MP_STREAM_CLOSE) {
+        return 0;
     } else {
         *errcode = MP_EINVAL;
         return MP_STREAM_ERROR;
     }
 }
 
-STATIC mp_obj_t stdio_obj___exit__(size_t n_args, const mp_obj_t *args) {
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__);
-
 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) },
@@ -111,7 +108,7 @@ STATIC const mp_rom_map_elem_t stdio_locals_dict_table[] = {
     { 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___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&stdio_obj___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(stdio_locals_dict, stdio_locals_dict_table);

From c4feb806e0df452273b3c19751d8dad39ef8295b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Jan 2023 15:46:23 +1100
Subject: [PATCH 0145/3129] lib/uzlib: Add memory-efficient, streaming LZ77
 compression support.

The compression algorithm implemented in this commit uses much less memory
compared to the standard way of implementing it using a hash table and
large look-back window.  In particular the algorithm here doesn't allocate
hash table to store indices into the history of the previously seen text.
Instead it simply does a brute-force-search of the history text to find a
match for the compressor.  This is slower (linear search vs hash table
lookup) but with a small enough history (eg 512 bytes) it's not that slow.
And a small history does not impact the compression too much.

To give some more concrete numbers comparing memory use between the
approaches:

- Standard approach: inplace compression, all text to compress must be in
  RAM (or at least memory addressable), and then an additional 16k bytes
  RAM of hash table pointers, pointing into the text

- The approach in this commit: streaming compression, only a limited amount
  of previous text must be in RAM (user selectable, defaults to 512 bytes).

To compress, say, 1k of data, the standard approach requires all that data
to be in RAM, plus an additional 16k of RAM for the hash table pointers.
With this commit, you only need the 1k of data in RAM.  Or if it's
streaming from a file (or elsewhere), you could get away with only 256
bytes of RAM for the sliding history and still get very decent compression.

In summary: because compression takes such a large amount of RAM (in the
standard algorithm) and it's not really suitable for microcontrollers, the
approach taken in this commit is to minimise RAM usage as much as possible,
and still have acceptable performance (speed and compression ratio).

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/uzlib/defl_static.c | 302 ++++++++++++++++++++++++++++++++++++++++
 lib/uzlib/defl_static.h |   5 +-
 lib/uzlib/lz77.c        | 107 ++++++++++++++
 lib/uzlib/uzlib.h       |  17 ++-
 4 files changed, 419 insertions(+), 12 deletions(-)
 create mode 100644 lib/uzlib/defl_static.c
 create mode 100644 lib/uzlib/lz77.c

diff --git a/lib/uzlib/defl_static.c b/lib/uzlib/defl_static.c
new file mode 100644
index 0000000000000..89b5e1aa5ff66
--- /dev/null
+++ b/lib/uzlib/defl_static.c
@@ -0,0 +1,302 @@
+/*
+
+Routines in this file are based on:
+Zlib (RFC1950 / RFC1951) compression for PuTTY.
+
+PuTTY is copyright 1997-2014 Simon Tatham.
+
+Portions copyright Robert de Bath, Joris van Rantwijk, Delian
+Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
+Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
+Kuhn, Colin Watson, and CORE SDI S.A.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 <stdint.h>
+#include <string.h>
+#include <assert.h>
+
+/* ----------------------------------------------------------------------
+ * Zlib compression. We always use the static Huffman tree option.
+ * Mostly this is because it's hard to scan a block in advance to
+ * work out better trees; dynamic trees are great when you're
+ * compressing a large file under no significant time constraint,
+ * but when you're compressing little bits in real time, things get
+ * hairier.
+ *
+ * I suppose it's possible that I could compute Huffman trees based
+ * on the frequencies in the _previous_ block, as a sort of
+ * heuristic, but I'm not confident that the gain would balance out
+ * having to transmit the trees.
+ */
+
+static void outbits(struct Outbuf *out, unsigned long bits, int nbits)
+{
+    assert(out->noutbits + nbits <= 32);
+    out->outbits |= bits << out->noutbits;
+    out->noutbits += nbits;
+    while (out->noutbits >= 8) {
+        out->dest_write_cb(out, out->outbits & 0xFF);
+        out->outbits >>= 8;
+        out->noutbits -= 8;
+    }
+}
+
+static const unsigned char mirrorbytes[256] = {
+    0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+    0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+    0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+    0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+    0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+    0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+    0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+    0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+    0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+    0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+    0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+    0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+    0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+    0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+    0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+    0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+    0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+    0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+    0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+    0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+    0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+    0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+    0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+    0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+    0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+    0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+    0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+    0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+    0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+    0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+    0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+    0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
+};
+
+typedef struct {
+    uint8_t extrabits;
+    uint8_t min, max;
+} len_coderecord;
+
+typedef struct {
+    uint8_t code, extrabits;
+    uint16_t min, max;
+} dist_coderecord;
+
+#define TO_LCODE(x, y) x - 3, y - 3
+#define FROM_LCODE(x) (x + 3)
+
+static const len_coderecord lencodes[] = {
+    {0, TO_LCODE(3, 3)},
+    {0, TO_LCODE(4, 4)},
+    {0, TO_LCODE(5, 5)},
+    {0, TO_LCODE(6, 6)},
+    {0, TO_LCODE(7, 7)},
+    {0, TO_LCODE(8, 8)},
+    {0, TO_LCODE(9, 9)},
+    {0, TO_LCODE(10, 10)},
+    {1, TO_LCODE(11, 12)},
+    {1, TO_LCODE(13, 14)},
+    {1, TO_LCODE(15, 16)},
+    {1, TO_LCODE(17, 18)},
+    {2, TO_LCODE(19, 22)},
+    {2, TO_LCODE(23, 26)},
+    {2, TO_LCODE(27, 30)},
+    {2, TO_LCODE(31, 34)},
+    {3, TO_LCODE(35, 42)},
+    {3, TO_LCODE(43, 50)},
+    {3, TO_LCODE(51, 58)},
+    {3, TO_LCODE(59, 66)},
+    {4, TO_LCODE(67, 82)},
+    {4, TO_LCODE(83, 98)},
+    {4, TO_LCODE(99, 114)},
+    {4, TO_LCODE(115, 130)},
+    {5, TO_LCODE(131, 162)},
+    {5, TO_LCODE(163, 194)},
+    {5, TO_LCODE(195, 226)},
+    {5, TO_LCODE(227, 257)},
+    {0, TO_LCODE(258, 258)},
+};
+
+static const dist_coderecord distcodes[] = {
+    {0, 0, 1, 1},
+    {1, 0, 2, 2},
+    {2, 0, 3, 3},
+    {3, 0, 4, 4},
+    {4, 1, 5, 6},
+    {5, 1, 7, 8},
+    {6, 2, 9, 12},
+    {7, 2, 13, 16},
+    {8, 3, 17, 24},
+    {9, 3, 25, 32},
+    {10, 4, 33, 48},
+    {11, 4, 49, 64},
+    {12, 5, 65, 96},
+    {13, 5, 97, 128},
+    {14, 6, 129, 192},
+    {15, 6, 193, 256},
+    {16, 7, 257, 384},
+    {17, 7, 385, 512},
+    {18, 8, 513, 768},
+    {19, 8, 769, 1024},
+    {20, 9, 1025, 1536},
+    {21, 9, 1537, 2048},
+    {22, 10, 2049, 3072},
+    {23, 10, 3073, 4096},
+    {24, 11, 4097, 6144},
+    {25, 11, 6145, 8192},
+    {26, 12, 8193, 12288},
+    {27, 12, 12289, 16384},
+    {28, 13, 16385, 24576},
+    {29, 13, 24577, 32768},
+};
+
+void zlib_literal(struct Outbuf *out, unsigned char c)
+{
+    if (out->comp_disabled) {
+        /*
+         * We're in an uncompressed block, so just output the byte.
+         */
+        outbits(out, c, 8);
+        return;
+    }
+
+    if (c <= 143) {
+        /* 0 through 143 are 8 bits long starting at 00110000. */
+        outbits(out, mirrorbytes[0x30 + c], 8);
+    } else {
+        /* 144 through 255 are 9 bits long starting at 110010000. */
+        outbits(out, 1 + 2 * mirrorbytes[0x90 - 144 + c], 9);
+    }
+}
+
+void zlib_match(struct Outbuf *out, int distance, int len)
+{
+    const dist_coderecord *d;
+    const len_coderecord *l;
+    int i, j, k;
+    int lcode;
+
+    assert(!out->comp_disabled);
+
+    while (len > 0) {
+        int thislen;
+
+        /*
+         * We can transmit matches of lengths 3 through 258
+         * inclusive. So if len exceeds 258, we must transmit in
+         * several steps, with 258 or less in each step.
+         *
+         * Specifically: if len >= 261, we can transmit 258 and be
+         * sure of having at least 3 left for the next step. And if
+         * len <= 258, we can just transmit len. But if len == 259
+         * or 260, we must transmit len-3.
+         */
+        thislen = (len > 260 ? 258 : len <= 258 ? len : len - 3);
+        len -= thislen;
+
+        /*
+         * Binary-search to find which length code we're
+         * transmitting.
+         */
+        i = -1;
+        j = sizeof(lencodes) / sizeof(*lencodes);
+        while (1) {
+            assert(j - i >= 2);
+            k = (j + i) / 2;
+            if (thislen < FROM_LCODE(lencodes[k].min))
+                j = k;
+            else if (thislen > FROM_LCODE(lencodes[k].max))
+                i = k;
+            else {
+                l = &lencodes[k];
+                break;                 /* found it! */
+            }
+        }
+
+        lcode = l - lencodes + 257;
+
+        /*
+         * Transmit the length code. 256-279 are seven bits
+         * starting at 0000000; 280-287 are eight bits starting at
+         * 11000000.
+         */
+        if (lcode <= 279) {
+            outbits(out, mirrorbytes[(lcode - 256) * 2], 7);
+        } else {
+            outbits(out, mirrorbytes[0xc0 - 280 + lcode], 8);
+        }
+
+        /*
+         * Transmit the extra bits.
+         */
+        if (l->extrabits)
+            outbits(out, thislen - FROM_LCODE(l->min), l->extrabits);
+
+        /*
+         * Binary-search to find which distance code we're
+         * transmitting.
+         */
+        i = -1;
+        j = sizeof(distcodes) / sizeof(*distcodes);
+        while (1) {
+            assert(j - i >= 2);
+            k = (j + i) / 2;
+            if (distance < distcodes[k].min)
+                j = k;
+            else if (distance > distcodes[k].max)
+                i = k;
+            else {
+                d = &distcodes[k];
+                break;                 /* found it! */
+            }
+        }
+
+        /*
+         * Transmit the distance code. Five bits starting at 00000.
+         */
+        outbits(out, mirrorbytes[d->code * 8], 5);
+
+        /*
+         * Transmit the extra bits.
+         */
+        if (d->extrabits)
+            outbits(out, distance - d->min, d->extrabits);
+    }
+}
+
+void zlib_start_block(struct Outbuf *out)
+{
+//    outbits(out, 0x9C78, 16);
+    outbits(out, 1, 1); /* Final block */
+    outbits(out, 1, 2); /* Static huffman block */
+}
+
+void zlib_finish_block(struct Outbuf *out)
+{
+    outbits(out, 0, 7); /* close block */
+    outbits(out, 0, 7); /* Make sure all bits are flushed */
+}
diff --git a/lib/uzlib/defl_static.h b/lib/uzlib/defl_static.h
index 292734d77324b..94741c97fda35 100644
--- a/lib/uzlib/defl_static.h
+++ b/lib/uzlib/defl_static.h
@@ -31,14 +31,13 @@
    code. */
 
 struct Outbuf {
-    unsigned char *outbuf;
-    int outlen, outsize;
+    void *dest_write_data;
+    void (*dest_write_cb)(struct Outbuf *outbuf, uint8_t byte);
     unsigned long outbits;
     int noutbits;
     int comp_disabled;
 };
 
-void outbits(struct Outbuf *out, unsigned long bits, int nbits);
 void zlib_start_block(struct Outbuf *ctx);
 void zlib_finish_block(struct Outbuf *ctx);
 void zlib_literal(struct Outbuf *ectx, unsigned char c);
diff --git a/lib/uzlib/lz77.c b/lib/uzlib/lz77.c
new file mode 100644
index 0000000000000..285b4ddf91c8e
--- /dev/null
+++ b/lib/uzlib/lz77.c
@@ -0,0 +1,107 @@
+/*
+ * Simple LZ77 streaming compressor.
+ *
+ * The scheme implemented here doesn't use a hash table and instead does a brute
+ * force search in the history for a previous string.  It is relatively slow
+ * (but still O(N)) but gives good compression and minimal memory usage.  For a
+ * small history window (eg 256 bytes) it's not too slow and compresses well.
+ *
+ * MIT license; Copyright (c) 2021 Damien P. George
+ */
+
+#include "uzlib.h"
+
+#define MATCH_LEN_MIN (3)
+#define MATCH_LEN_MAX (258)
+
+// hist should be a preallocated buffer of hist_max size bytes.
+// hist_max should be greater than 0 a power of 2 (ie 1, 2, 4, 8, ...).
+// It's possible to pass in hist=NULL, and then the history window will be taken from the
+// src passed in to uzlib_lz77_compress (this is useful when not doing streaming compression).
+void uzlib_lz77_init(struct uzlib_lz77_state *state, uint8_t *hist, size_t hist_max) {
+    memset(&state->outbuf, 0, sizeof(state->outbuf));
+    state->hist_buf = hist;
+    state->hist_max = hist_max;
+    state->hist_start = 0;
+    state->hist_len = 0;
+}
+
+// Push the given byte to the history.
+// Search back in the history for the maximum match of the given src data,
+// with support for searching beyond the end of the history and into the src buffer
+// (effectively the history and src buffer are concatenated).
+static size_t uzlib_lz77_search_max_match(struct uzlib_lz77_state *state, const uint8_t *src, size_t len, size_t *longest_offset) {
+    size_t longest_len = 0;
+    for (size_t hist_search = 0; hist_search < state->hist_len; ++hist_search) {
+        size_t match_len;
+        for (match_len = 0; match_len <= MATCH_LEN_MAX && match_len < len; ++match_len) {
+            uint8_t hist;
+            if (hist_search + match_len < state->hist_len) {
+                hist = state->hist_buf[(state->hist_start + hist_search + match_len) & (state->hist_max - 1)];
+            } else {
+                hist = src[hist_search + match_len - state->hist_len];
+            }
+            if (src[match_len] != hist) {
+                break;
+            }
+        }
+        if (match_len >= MATCH_LEN_MIN && match_len > longest_len) {
+            longest_len = match_len;
+            *longest_offset = state->hist_len - hist_search;
+        }
+    }
+
+    return longest_len;
+}
+
+// Compress the given chunk of data.
+void uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, unsigned len) {
+    bool use_src_as_history = false;
+    if (state->hist_buf == NULL) {
+        use_src_as_history = true;
+        state->hist_buf = (uint8_t *)src;
+        state->hist_len = 0;
+    }
+
+    const uint8_t *top = src + len;
+    while (src < top) {
+        // Look for a match in the history window.
+        size_t match_offset = 0;
+        size_t match_len = uzlib_lz77_search_max_match(state, src, top - src, &match_offset);
+
+        // Encode the literal byte or the match.
+        if (match_len == 0) {
+            zlib_literal(&state->outbuf, *src);
+            match_len = 1;
+        } else {
+            zlib_match(&state->outbuf, match_offset, match_len);
+        }
+
+        // Advance the history window.
+        if (use_src_as_history) {
+            // Use src as the history, so advance it.
+            state->hist_len += match_len;
+            if (state->hist_len > state->hist_max) {
+                state->hist_buf += state->hist_len - state->hist_max;
+                state->hist_len = state->hist_max;
+            }
+            src += match_len;
+        } else {
+            // Push the bytes into the history buffer.
+            size_t mask = state->hist_max - 1;
+            while (match_len--) {
+                uint8_t b = *src++;
+                state->hist_buf[(state->hist_start + state->hist_len) & mask] = b;
+                if (state->hist_len == state->hist_max) {
+                    state->hist_start = (state->hist_start + 1) & mask;
+                } else {
+                    ++state->hist_len;
+                }
+            }
+        }
+    }
+
+    if (use_src_as_history) {
+        state->hist_buf = NULL;
+    }
+}
diff --git a/lib/uzlib/uzlib.h b/lib/uzlib/uzlib.h
index 3a4a1ad160da8..83dddcd477768 100644
--- a/lib/uzlib/uzlib.h
+++ b/lib/uzlib/uzlib.h
@@ -143,17 +143,16 @@ int TINFCC uzlib_gzip_parse_header(TINF_DATA *d);
 
 /* Compression API */
 
-typedef const uint8_t *uzlib_hash_entry_t;
-
-struct uzlib_comp {
-    struct Outbuf out;
-
-    uzlib_hash_entry_t *hash_table;
-    unsigned int hash_bits;
-    unsigned int dict_size;
+struct uzlib_lz77_state {
+    struct Outbuf outbuf;
+    uint8_t *hist_buf;
+    size_t hist_max;
+    size_t hist_start;
+    size_t hist_len;
 };
 
-void TINFCC uzlib_compress(struct uzlib_comp *c, const uint8_t *src, unsigned slen);
+void TINFCC uzlib_lz77_init(struct uzlib_lz77_state *state, uint8_t *hist, size_t hist_max);
+void TINFCC uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, unsigned len);
 
 /* Checksum API */
 

From 82db9926ed3546fa98e56b8c06936fed21f492aa Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 22:03:52 +1000
Subject: [PATCH 0146/3129] lib/uzlib/lz77: Always use separate history buffer.

Because we only use the streaming source, this is just extra code size.

Saves 64 bytes on PYBV11.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/uzlib/lz77.c | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/lib/uzlib/lz77.c b/lib/uzlib/lz77.c
index 285b4ddf91c8e..1c7a8442ca851 100644
--- a/lib/uzlib/lz77.c
+++ b/lib/uzlib/lz77.c
@@ -56,13 +56,6 @@ static size_t uzlib_lz77_search_max_match(struct uzlib_lz77_state *state, const
 
 // Compress the given chunk of data.
 void uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, unsigned len) {
-    bool use_src_as_history = false;
-    if (state->hist_buf == NULL) {
-        use_src_as_history = true;
-        state->hist_buf = (uint8_t *)src;
-        state->hist_len = 0;
-    }
-
     const uint8_t *top = src + len;
     while (src < top) {
         // Look for a match in the history window.
@@ -77,31 +70,16 @@ void uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, uns
             zlib_match(&state->outbuf, match_offset, match_len);
         }
 
-        // Advance the history window.
-        if (use_src_as_history) {
-            // Use src as the history, so advance it.
-            state->hist_len += match_len;
-            if (state->hist_len > state->hist_max) {
-                state->hist_buf += state->hist_len - state->hist_max;
-                state->hist_len = state->hist_max;
-            }
-            src += match_len;
-        } else {
-            // Push the bytes into the history buffer.
-            size_t mask = state->hist_max - 1;
-            while (match_len--) {
-                uint8_t b = *src++;
-                state->hist_buf[(state->hist_start + state->hist_len) & mask] = b;
-                if (state->hist_len == state->hist_max) {
-                    state->hist_start = (state->hist_start + 1) & mask;
-                } else {
-                    ++state->hist_len;
-                }
+        // Push the bytes into the history buffer.
+        size_t mask = state->hist_max - 1;
+        while (match_len--) {
+            uint8_t b = *src++;
+            state->hist_buf[(state->hist_start + state->hist_len) & mask] = b;
+            if (state->hist_len == state->hist_max) {
+                state->hist_start = (state->hist_start + 1) & mask;
+            } else {
+                ++state->hist_len;
             }
         }
     }
-
-    if (use_src_as_history) {
-        state->hist_buf = NULL;
-    }
 }

From 0900976384f2f881dc727f7b936c2b232e1ee6be Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 22 Jun 2023 14:24:42 +1000
Subject: [PATCH 0147/3129] lib/uzlib/defl_static: Implement some code size
 improvements.

This commit makes the following changes:
- Replace 256-byte reverse-bits-in-byte lookup table with computation.
- Replace length and distance code lookup tables with computation.
- Remove comp_disabled check (it's unused).
- Make the dest_write_cb take the data pointer directly, rather than the
  Outbuf.

Saves 500 bytes on PYBV11.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/uzlib/defl_static.c | 218 +++++++++-------------------------------
 lib/uzlib/defl_static.h |   3 +-
 2 files changed, 49 insertions(+), 172 deletions(-)

diff --git a/lib/uzlib/defl_static.c b/lib/uzlib/defl_static.c
index 89b5e1aa5ff66..529055ae847db 100644
--- a/lib/uzlib/defl_static.c
+++ b/lib/uzlib/defl_static.c
@@ -10,6 +10,9 @@ Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
 Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
 Kuhn, Colin Watson, and CORE SDI S.A.
 
+Optimised for MicroPython:
+Copyright (c) 2023 by 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,
@@ -55,152 +58,44 @@ static void outbits(struct Outbuf *out, unsigned long bits, int nbits)
     out->outbits |= bits << out->noutbits;
     out->noutbits += nbits;
     while (out->noutbits >= 8) {
-        out->dest_write_cb(out, out->outbits & 0xFF);
+        out->dest_write_cb(out->dest_write_data, out->outbits & 0xFF);
         out->outbits >>= 8;
         out->noutbits -= 8;
     }
 }
 
-static const unsigned char mirrorbytes[256] = {
-    0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-    0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-    0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-    0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-    0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-    0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-    0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-    0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-    0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-    0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-    0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-    0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-    0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-    0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-    0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-    0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-    0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-    0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-    0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-    0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-    0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-    0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-    0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-    0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-    0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-    0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-    0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-    0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-    0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-    0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-    0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-    0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
+static const unsigned char mirrornibbles[16] = {
+    0x0, 0x8, 0x4, 0xc, 0x2, 0xa, 0x6, 0xe,
+    0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf,
 };
 
-typedef struct {
-    uint8_t extrabits;
-    uint8_t min, max;
-} len_coderecord;
-
-typedef struct {
-    uint8_t code, extrabits;
-    uint16_t min, max;
-} dist_coderecord;
-
-#define TO_LCODE(x, y) x - 3, y - 3
-#define FROM_LCODE(x) (x + 3)
-
-static const len_coderecord lencodes[] = {
-    {0, TO_LCODE(3, 3)},
-    {0, TO_LCODE(4, 4)},
-    {0, TO_LCODE(5, 5)},
-    {0, TO_LCODE(6, 6)},
-    {0, TO_LCODE(7, 7)},
-    {0, TO_LCODE(8, 8)},
-    {0, TO_LCODE(9, 9)},
-    {0, TO_LCODE(10, 10)},
-    {1, TO_LCODE(11, 12)},
-    {1, TO_LCODE(13, 14)},
-    {1, TO_LCODE(15, 16)},
-    {1, TO_LCODE(17, 18)},
-    {2, TO_LCODE(19, 22)},
-    {2, TO_LCODE(23, 26)},
-    {2, TO_LCODE(27, 30)},
-    {2, TO_LCODE(31, 34)},
-    {3, TO_LCODE(35, 42)},
-    {3, TO_LCODE(43, 50)},
-    {3, TO_LCODE(51, 58)},
-    {3, TO_LCODE(59, 66)},
-    {4, TO_LCODE(67, 82)},
-    {4, TO_LCODE(83, 98)},
-    {4, TO_LCODE(99, 114)},
-    {4, TO_LCODE(115, 130)},
-    {5, TO_LCODE(131, 162)},
-    {5, TO_LCODE(163, 194)},
-    {5, TO_LCODE(195, 226)},
-    {5, TO_LCODE(227, 257)},
-    {0, TO_LCODE(258, 258)},
-};
+static unsigned int mirrorbyte(unsigned int b) {
+    return mirrornibbles[b & 0xf] << 4 | mirrornibbles[b >> 4];
+}
 
-static const dist_coderecord distcodes[] = {
-    {0, 0, 1, 1},
-    {1, 0, 2, 2},
-    {2, 0, 3, 3},
-    {3, 0, 4, 4},
-    {4, 1, 5, 6},
-    {5, 1, 7, 8},
-    {6, 2, 9, 12},
-    {7, 2, 13, 16},
-    {8, 3, 17, 24},
-    {9, 3, 25, 32},
-    {10, 4, 33, 48},
-    {11, 4, 49, 64},
-    {12, 5, 65, 96},
-    {13, 5, 97, 128},
-    {14, 6, 129, 192},
-    {15, 6, 193, 256},
-    {16, 7, 257, 384},
-    {17, 7, 385, 512},
-    {18, 8, 513, 768},
-    {19, 8, 769, 1024},
-    {20, 9, 1025, 1536},
-    {21, 9, 1537, 2048},
-    {22, 10, 2049, 3072},
-    {23, 10, 3073, 4096},
-    {24, 11, 4097, 6144},
-    {25, 11, 6145, 8192},
-    {26, 12, 8193, 12288},
-    {27, 12, 12289, 16384},
-    {28, 13, 16385, 24576},
-    {29, 13, 24577, 32768},
-};
+static int int_log2(int x) {
+    int r = 0;
+    while (x >>= 1) {
+        ++r;
+    }
+    return r;
+}
 
 void zlib_literal(struct Outbuf *out, unsigned char c)
 {
-    if (out->comp_disabled) {
-        /*
-         * We're in an uncompressed block, so just output the byte.
-         */
-        outbits(out, c, 8);
-        return;
-    }
-
     if (c <= 143) {
         /* 0 through 143 are 8 bits long starting at 00110000. */
-        outbits(out, mirrorbytes[0x30 + c], 8);
+        outbits(out, mirrorbyte(0x30 + c), 8);
     } else {
         /* 144 through 255 are 9 bits long starting at 110010000. */
-        outbits(out, 1 + 2 * mirrorbytes[0x90 - 144 + c], 9);
+        outbits(out, 1 + 2 * mirrorbyte(0x90 - 144 + c), 9);
     }
 }
 
 void zlib_match(struct Outbuf *out, int distance, int len)
 {
-    const dist_coderecord *d;
-    const len_coderecord *l;
-    int i, j, k;
-    int lcode;
-
-    assert(!out->comp_disabled);
+    assert(distance >= 1 && distance <= 32768);
+    distance -= 1;
 
     while (len > 0) {
         int thislen;
@@ -218,73 +113,56 @@ void zlib_match(struct Outbuf *out, int distance, int len)
         thislen = (len > 260 ? 258 : len <= 258 ? len : len - 3);
         len -= thislen;
 
-        /*
-         * Binary-search to find which length code we're
-         * transmitting.
-         */
-        i = -1;
-        j = sizeof(lencodes) / sizeof(*lencodes);
-        while (1) {
-            assert(j - i >= 2);
-            k = (j + i) / 2;
-            if (thislen < FROM_LCODE(lencodes[k].min))
-                j = k;
-            else if (thislen > FROM_LCODE(lencodes[k].max))
-                i = k;
-            else {
-                l = &lencodes[k];
-                break;                 /* found it! */
+        assert(thislen >= 3 && thislen <= 258);
+
+        thislen -= 3;
+        int lcode = 28;
+        int x = int_log2(thislen);
+        int y;
+        if (thislen < 255) {
+            if (x) {
+                --x;
             }
+            y = (thislen >> (x ? x - 1 : 0)) & 3;
+            lcode = x * 4 + y;
         }
 
-        lcode = l - lencodes + 257;
-
         /*
          * Transmit the length code. 256-279 are seven bits
          * starting at 0000000; 280-287 are eight bits starting at
          * 11000000.
          */
-        if (lcode <= 279) {
-            outbits(out, mirrorbytes[(lcode - 256) * 2], 7);
+        if (lcode <= 22) {
+            outbits(out, mirrorbyte((lcode + 1) * 2), 7);
         } else {
-            outbits(out, mirrorbytes[0xc0 - 280 + lcode], 8);
+            outbits(out, mirrorbyte(lcode + 169), 8);
         }
 
         /*
          * Transmit the extra bits.
          */
-        if (l->extrabits)
-            outbits(out, thislen - FROM_LCODE(l->min), l->extrabits);
-
-        /*
-         * Binary-search to find which distance code we're
-         * transmitting.
-         */
-        i = -1;
-        j = sizeof(distcodes) / sizeof(*distcodes);
-        while (1) {
-            assert(j - i >= 2);
-            k = (j + i) / 2;
-            if (distance < distcodes[k].min)
-                j = k;
-            else if (distance > distcodes[k].max)
-                i = k;
-            else {
-                d = &distcodes[k];
-                break;                 /* found it! */
-            }
+        if (thislen < 255 && x > 1) {
+            int extrabits = x - 1;
+            int lmin = (thislen >> extrabits) << extrabits;
+            outbits(out, thislen - lmin, extrabits);
         }
 
+        x = int_log2(distance);
+        y = (distance >> (x ? x - 1 : 0)) & 1;
+
         /*
          * Transmit the distance code. Five bits starting at 00000.
          */
-        outbits(out, mirrorbytes[d->code * 8], 5);
+        outbits(out, mirrorbyte((x * 2 + y) * 8), 5);
 
         /*
          * Transmit the extra bits.
          */
-        if (d->extrabits)
-            outbits(out, distance - d->min, d->extrabits);
+        if (x > 1) {
+            int dextrabits = x - 1;
+            int dmin = (distance >> dextrabits) << dextrabits;
+            outbits(out, distance - dmin, dextrabits);
+        }
     }
 }
 
diff --git a/lib/uzlib/defl_static.h b/lib/uzlib/defl_static.h
index 94741c97fda35..7329de36efa07 100644
--- a/lib/uzlib/defl_static.h
+++ b/lib/uzlib/defl_static.h
@@ -32,10 +32,9 @@
 
 struct Outbuf {
     void *dest_write_data;
-    void (*dest_write_cb)(struct Outbuf *outbuf, uint8_t byte);
+    void (*dest_write_cb)(void *data, uint8_t byte);
     unsigned long outbits;
     int noutbits;
-    int comp_disabled;
 };
 
 void zlib_start_block(struct Outbuf *ctx);

From c2b8e6e5d685ce0ef7cd7186f326cac8a39eb2a3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 00:50:05 +1000
Subject: [PATCH 0148/3129] lib/uzlib: Clean up tinf -> uzlib rename.

This library used a mix of "tinf" and "uzlib" to refer to itself.  Remove
all use of "tinf" in the public API.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/uzlib/adler32.c          |  2 +-
 lib/uzlib/crc32.c            |  2 +-
 lib/uzlib/tinf.h             |  3 --
 lib/uzlib/tinf_compat.h      |  9 ----
 lib/uzlib/tinfgzip.c         | 24 ++++-----
 lib/uzlib/tinflate.c         | 98 ++++++++++++++++++------------------
 lib/uzlib/tinfzlib.c         | 14 +++---
 lib/uzlib/uzlib.h            | 58 +++++++++------------
 ports/stm32/mboot/fsload.c   |  2 +-
 ports/stm32/mboot/gzstream.c | 42 ++++++++--------
 10 files changed, 117 insertions(+), 137 deletions(-)
 delete mode 100644 lib/uzlib/tinf.h
 delete mode 100644 lib/uzlib/tinf_compat.h

diff --git a/lib/uzlib/adler32.c b/lib/uzlib/adler32.c
index 1f1759493bba8..65fe1181b860c 100644
--- a/lib/uzlib/adler32.c
+++ b/lib/uzlib/adler32.c
@@ -36,7 +36,7 @@
  * Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
  */
 
-#include "tinf.h"
+#include "uzlib.h"
 
 #define A32_BASE 65521
 #define A32_NMAX 5552
diff --git a/lib/uzlib/crc32.c b/lib/uzlib/crc32.c
index e24c643b6acfb..1e3b1756b383d 100644
--- a/lib/uzlib/crc32.c
+++ b/lib/uzlib/crc32.c
@@ -36,7 +36,7 @@
  * Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
  */
 
-#include "tinf.h"
+#include "uzlib.h"
 
 static const unsigned int tinf_crc32tab[16] = {
    0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190,
diff --git a/lib/uzlib/tinf.h b/lib/uzlib/tinf.h
deleted file mode 100644
index ae6e1c4073ebb..0000000000000
--- a/lib/uzlib/tinf.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Compatibility header for the original tinf lib/older versions of uzlib.
-   Note: may be removed in the future, please migrate to uzlib.h. */
-#include "uzlib.h"
diff --git a/lib/uzlib/tinf_compat.h b/lib/uzlib/tinf_compat.h
deleted file mode 100644
index f763804bd94b2..0000000000000
--- a/lib/uzlib/tinf_compat.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This header contains compatibility defines for the original tinf API
-   and uzlib 2.x and below API. These defines are deprecated and going
-   to be removed in the future, so applications should migrate to new
-   uzlib API. */
-#define TINF_DATA struct uzlib_uncomp
-
-#define destSize dest_size
-#define destStart dest_start
-#define readSource source_read_cb
diff --git a/lib/uzlib/tinfgzip.c b/lib/uzlib/tinfgzip.c
index 22b000df9aa2d..3b0feb532122a 100644
--- a/lib/uzlib/tinfgzip.c
+++ b/lib/uzlib/tinfgzip.c
@@ -33,7 +33,7 @@
  *    any source distribution.
  */
 
-#include "tinf.h"
+#include "uzlib.h"
 
 #define FTEXT    1
 #define FHCRC    2
@@ -41,38 +41,38 @@
 #define FNAME    8
 #define FCOMMENT 16
 
-void tinf_skip_bytes(TINF_DATA *d, int num);
-uint16_t tinf_get_uint16(TINF_DATA *d);
+void tinf_skip_bytes(uzlib_uncomp_t *d, int num);
+uint16_t tinf_get_uint16(uzlib_uncomp_t *d);
 
-void tinf_skip_bytes(TINF_DATA *d, int num)
+void tinf_skip_bytes(uzlib_uncomp_t *d, int num)
 {
     while (num--) uzlib_get_byte(d);
 }
 
-uint16_t tinf_get_uint16(TINF_DATA *d)
+uint16_t tinf_get_uint16(uzlib_uncomp_t *d)
 {
     unsigned int v = uzlib_get_byte(d);
     v = (uzlib_get_byte(d) << 8) | v;
     return v;
 }
 
-int uzlib_gzip_parse_header(TINF_DATA *d)
+int uzlib_gzip_parse_header(uzlib_uncomp_t *d)
 {
     unsigned char flg;
 
     /* -- check format -- */
 
     /* check id bytes */
-    if (uzlib_get_byte(d) != 0x1f || uzlib_get_byte(d) != 0x8b) return TINF_DATA_ERROR;
+    if (uzlib_get_byte(d) != 0x1f || uzlib_get_byte(d) != 0x8b) return UZLIB_DATA_ERROR;
 
     /* check method is deflate */
-    if (uzlib_get_byte(d) != 8) return TINF_DATA_ERROR;
+    if (uzlib_get_byte(d) != 8) return UZLIB_DATA_ERROR;
 
     /* get flag byte */
     flg = uzlib_get_byte(d);
 
     /* check that reserved bits are zero */
-    if (flg & 0xe0) return TINF_DATA_ERROR;
+    if (flg & 0xe0) return UZLIB_DATA_ERROR;
 
     /* -- find start of compressed data -- */
 
@@ -99,12 +99,12 @@ int uzlib_gzip_parse_header(TINF_DATA *d)
 
         // TODO: Check!
 //       if (hcrc != (tinf_crc32(src, start - src) & 0x0000ffff))
-//          return TINF_DATA_ERROR;
+//          return UZLIB_DATA_ERROR;
     }
 
     /* initialize for crc32 checksum */
-    d->checksum_type = TINF_CHKSUM_CRC;
+    d->checksum_type = UZLIB_CHKSUM_CRC;
     d->checksum = ~0;
 
-    return TINF_OK;
+    return UZLIB_OK;
 }
diff --git a/lib/uzlib/tinflate.c b/lib/uzlib/tinflate.c
index 045952c7553a3..e844d7faa4913 100644
--- a/lib/uzlib/tinflate.c
+++ b/lib/uzlib/tinflate.c
@@ -33,7 +33,7 @@
  */
 
 #include <assert.h>
-#include "tinf.h"
+#include "uzlib.h"
 
 #define UZLIB_DUMP_ARRAY(heading, arr, size) \
     { \
@@ -44,8 +44,8 @@
         printf("\n"); \
     }
 
-uint32_t tinf_get_le_uint32(TINF_DATA *d);
-uint32_t tinf_get_be_uint32(TINF_DATA *d);
+uint32_t tinf_get_le_uint32(uzlib_uncomp_t *d);
+uint32_t tinf_get_be_uint32(uzlib_uncomp_t *d);
 
 /* --------------------------------------------------- *
  * -- uninitialized global data (static structures) -- *
@@ -189,7 +189,7 @@ static void tinf_build_tree(TINF_TREE *t, const unsigned char *lengths, unsigned
  * -- decode functions -- *
  * ---------------------- */
 
-unsigned char uzlib_get_byte(TINF_DATA *d)
+unsigned char uzlib_get_byte(uzlib_uncomp_t *d)
 {
     /* If end of source buffer is not reached, return next byte from source
        buffer. */
@@ -200,14 +200,14 @@ unsigned char uzlib_get_byte(TINF_DATA *d)
     /* Otherwise if there's callback and we haven't seen EOF yet, try to
        read next byte using it. (Note: the callback can also update ->source
        and ->source_limit). */
-    if (d->readSource && !d->eof) {
-        int val = d->readSource(d);
+    if (d->source_read_cb && !d->eof) {
+        int val = d->source_read_cb(d);
         if (val >= 0) {
             return (unsigned char)val;
         }
     }
 
-    /* Otherwise, we hit EOF (either from ->readSource() or from exhaustion
+    /* Otherwise, we hit EOF (either from ->source_read_cb() or from exhaustion
        of the buffer), and it will be "sticky", i.e. further calls to this
        function will end up here too. */
     d->eof = true;
@@ -215,7 +215,7 @@ unsigned char uzlib_get_byte(TINF_DATA *d)
     return 0;
 }
 
-uint32_t tinf_get_le_uint32(TINF_DATA *d)
+uint32_t tinf_get_le_uint32(uzlib_uncomp_t *d)
 {
     uint32_t val = 0;
     int i;
@@ -225,7 +225,7 @@ uint32_t tinf_get_le_uint32(TINF_DATA *d)
     return val;
 }
 
-uint32_t tinf_get_be_uint32(TINF_DATA *d)
+uint32_t tinf_get_be_uint32(uzlib_uncomp_t *d)
 {
     uint32_t val = 0;
     int i;
@@ -236,7 +236,7 @@ uint32_t tinf_get_be_uint32(TINF_DATA *d)
 }
 
 /* get one bit from source stream */
-static int tinf_getbit(TINF_DATA *d)
+static int tinf_getbit(uzlib_uncomp_t *d)
 {
    unsigned int bit;
 
@@ -256,7 +256,7 @@ static int tinf_getbit(TINF_DATA *d)
 }
 
 /* read a num bit value from a stream and add base */
-static unsigned int tinf_read_bits(TINF_DATA *d, int num, int base)
+static unsigned int tinf_read_bits(uzlib_uncomp_t *d, int num, int base)
 {
    unsigned int val = 0;
 
@@ -274,7 +274,7 @@ static unsigned int tinf_read_bits(TINF_DATA *d, int num, int base)
 }
 
 /* given a data stream and a tree, decode a symbol */
-static int tinf_decode_symbol(TINF_DATA *d, TINF_TREE *t)
+static int tinf_decode_symbol(uzlib_uncomp_t *d, TINF_TREE *t)
 {
    int sum = 0, cur = 0, len = 0;
 
@@ -284,7 +284,7 @@ static int tinf_decode_symbol(TINF_DATA *d, TINF_TREE *t)
       cur = 2*cur + tinf_getbit(d);
 
       if (++len == TINF_ARRAY_SIZE(t->table)) {
-         return TINF_DATA_ERROR;
+         return UZLIB_DATA_ERROR;
       }
 
       sum += t->table[len];
@@ -295,7 +295,7 @@ static int tinf_decode_symbol(TINF_DATA *d, TINF_TREE *t)
    sum += cur;
    #if UZLIB_CONF_PARANOID_CHECKS
    if (sum < 0 || sum >= TINF_ARRAY_SIZE(t->trans)) {
-      return TINF_DATA_ERROR;
+      return UZLIB_DATA_ERROR;
    }
    #endif
 
@@ -303,7 +303,7 @@ static int tinf_decode_symbol(TINF_DATA *d, TINF_TREE *t)
 }
 
 /* given a data stream, decode dynamic trees from it */
-static int tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
+static int tinf_decode_trees(uzlib_uncomp_t *d, TINF_TREE *lt, TINF_TREE *dt)
 {
    /* code lengths for 288 literal/len symbols and 32 dist symbols */
    unsigned char lengths[288+32];
@@ -348,7 +348,7 @@ static int tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
       {
       case 16:
          /* copy previous code length 3-6 times (read 2 bits) */
-         if (num == 0) return TINF_DATA_ERROR;
+         if (num == 0) return UZLIB_DATA_ERROR;
          fill_value = lengths[num - 1];
          lbits = 2;
          break;
@@ -370,7 +370,7 @@ static int tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
 
       /* special code length 16-18 are handled here */
       length = tinf_read_bits(d, lbits, lbase);
-      if (num + length > hlimit) return TINF_DATA_ERROR;
+      if (num + length > hlimit) return UZLIB_DATA_ERROR;
       for (; length; --length)
       {
          lengths[num++] = fill_value;
@@ -387,7 +387,7 @@ static int tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
    #if UZLIB_CONF_PARANOID_CHECKS
    /* Check that there's "end of block" symbol */
    if (lengths[256] == 0) {
-      return TINF_DATA_ERROR;
+      return UZLIB_DATA_ERROR;
    }
    #endif
 
@@ -395,7 +395,7 @@ static int tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
    tinf_build_tree(lt, lengths, hlit);
    tinf_build_tree(dt, lengths + hlit, hdist);
 
-   return TINF_OK;
+   return UZLIB_OK;
 }
 
 /* ----------------------------- *
@@ -403,7 +403,7 @@ static int tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
  * ----------------------------- */
 
 /* given a stream and two trees, inflate next byte of output */
-static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
+static int tinf_inflate_block_data(uzlib_uncomp_t *d, TINF_TREE *lt, TINF_TREE *dt)
 {
     if (d->curlen == 0) {
         unsigned int offs;
@@ -412,24 +412,24 @@ static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
         //printf("huff sym: %02x\n", sym);
 
         if (d->eof) {
-            return TINF_DATA_ERROR;
+            return UZLIB_DATA_ERROR;
         }
 
         /* literal byte */
         if (sym < 256) {
             TINF_PUT(d, sym);
-            return TINF_OK;
+            return UZLIB_OK;
         }
 
         /* end of block */
         if (sym == 256) {
-            return TINF_DONE;
+            return UZLIB_DONE;
         }
 
         /* substring from sliding dictionary */
         sym -= 257;
         if (sym >= 29) {
-            return TINF_DATA_ERROR;
+            return UZLIB_DATA_ERROR;
         }
 
         /* possibly get more bits from length code */
@@ -437,7 +437,7 @@ static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
 
         dist = tinf_decode_symbol(d, dt);
         if (dist >= 30) {
-            return TINF_DATA_ERROR;
+            return UZLIB_DATA_ERROR;
         }
 
         /* possibly get more bits from distance code */
@@ -446,7 +446,7 @@ static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
         /* calculate and validate actual LZ offset to use */
         if (d->dict_ring) {
             if (offs > d->dict_size) {
-                return TINF_DICT_ERROR;
+                return UZLIB_DICT_ERROR;
             }
             /* Note: unlike full-dest-in-memory case below, we don't
                try to catch offset which points to not yet filled
@@ -464,8 +464,8 @@ static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
             }
         } else {
             /* catch trying to point before the start of dest buffer */
-            if (offs > (unsigned int)(d->dest - d->destStart)) {
-                return TINF_DATA_ERROR;
+            if (offs > (unsigned int)(d->dest - d->dest_start)) {
+                return UZLIB_DATA_ERROR;
             }
             d->lzOff = -offs;
         }
@@ -482,11 +482,11 @@ static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
         d->dest++;
     }
     d->curlen--;
-    return TINF_OK;
+    return UZLIB_OK;
 }
 
 /* inflate next byte from uncompressed block of data */
-static int tinf_inflate_uncompressed_block(TINF_DATA *d)
+static int tinf_inflate_uncompressed_block(uzlib_uncomp_t *d)
 {
     if (d->curlen == 0) {
         unsigned int length, invlength;
@@ -498,9 +498,9 @@ static int tinf_inflate_uncompressed_block(TINF_DATA *d)
         invlength = uzlib_get_byte(d);
         invlength += 256 * uzlib_get_byte(d);
         /* check length */
-        if (length != (~invlength & 0x0000ffff)) return TINF_DATA_ERROR;
+        if (length != (~invlength & 0x0000ffff)) return UZLIB_DATA_ERROR;
 
-        /* increment length to properly return TINF_DONE below, without
+        /* increment length to properly return UZLIB_DONE below, without
            producing data at the same time */
         d->curlen = length + 1;
 
@@ -509,12 +509,12 @@ static int tinf_inflate_uncompressed_block(TINF_DATA *d)
     }
 
     if (--d->curlen == 0) {
-        return TINF_DONE;
+        return UZLIB_DONE;
     }
 
     unsigned char c = uzlib_get_byte(d);
     TINF_PUT(d, c);
-    return TINF_OK;
+    return UZLIB_OK;
 }
 
 /* ---------------------- *
@@ -536,7 +536,7 @@ void uzlib_init(void)
 }
 
 /* initialize decompression structure */
-void uzlib_uncompress_init(TINF_DATA *d, void *dict, unsigned int dictLen)
+void uzlib_uncompress_init(uzlib_uncomp_t *d, void *dict, unsigned int dictLen)
 {
    d->eof = 0;
    d->bitcount = 0;
@@ -549,7 +549,7 @@ void uzlib_uncompress_init(TINF_DATA *d, void *dict, unsigned int dictLen)
 }
 
 /* inflate next output bytes from compressed stream */
-int uzlib_uncompress(TINF_DATA *d)
+int uzlib_uncompress(uzlib_uncomp_t *d)
 {
     do {
         int res;
@@ -572,7 +572,7 @@ int uzlib_uncompress(TINF_DATA *d)
             } else if (d->btype == 2) {
                 /* decode trees from stream */
                 res = tinf_decode_trees(d, &d->ltree, &d->dtree);
-                if (res != TINF_OK) {
+                if (res != UZLIB_OK) {
                     return res;
                 }
             }
@@ -592,27 +592,27 @@ int uzlib_uncompress(TINF_DATA *d)
             res = tinf_inflate_block_data(d, &d->ltree, &d->dtree);
             break;
         default:
-            return TINF_DATA_ERROR;
+            return UZLIB_DATA_ERROR;
         }
 
-        if (res == TINF_DONE && !d->bfinal) {
+        if (res == UZLIB_DONE && !d->bfinal) {
             /* the block has ended (without producing more data), but we
                can't return without data, so start procesing next block */
             goto next_blk;
         }
 
-        if (res != TINF_OK) {
+        if (res != UZLIB_OK) {
             return res;
         }
 
     } while (d->dest < d->dest_limit);
 
-    return TINF_OK;
+    return UZLIB_OK;
 }
 
 /* inflate next output bytes from compressed stream, updating
    checksum, and at the end of stream, verify it */
-int uzlib_uncompress_chksum(TINF_DATA *d)
+int uzlib_uncompress_chksum(uzlib_uncomp_t *d)
 {
     int res;
     unsigned char *data = d->dest;
@@ -623,31 +623,31 @@ int uzlib_uncompress_chksum(TINF_DATA *d)
 
     switch (d->checksum_type) {
 
-    case TINF_CHKSUM_ADLER:
+    case UZLIB_CHKSUM_ADLER:
         d->checksum = uzlib_adler32(data, d->dest - data, d->checksum);
         break;
 
-    case TINF_CHKSUM_CRC:
+    case UZLIB_CHKSUM_CRC:
         d->checksum = uzlib_crc32(data, d->dest - data, d->checksum);
         break;
     }
 
-    if (res == TINF_DONE) {
+    if (res == UZLIB_DONE) {
         unsigned int val;
 
         switch (d->checksum_type) {
 
-        case TINF_CHKSUM_ADLER:
+        case UZLIB_CHKSUM_ADLER:
             val = tinf_get_be_uint32(d);
             if (d->checksum != val) {
-                return TINF_CHKSUM_ERROR;
+                return UZLIB_CHKSUM_ERROR;
             }
             break;
 
-        case TINF_CHKSUM_CRC:
+        case UZLIB_CHKSUM_CRC:
             val = tinf_get_le_uint32(d);
             if (~d->checksum != val) {
-                return TINF_CHKSUM_ERROR;
+                return UZLIB_CHKSUM_ERROR;
             }
             // Uncompressed size. TODO: Check
             val = tinf_get_le_uint32(d);
diff --git a/lib/uzlib/tinfzlib.c b/lib/uzlib/tinfzlib.c
index 5cb8852fcc4fa..03954cefaeba7 100644
--- a/lib/uzlib/tinfzlib.c
+++ b/lib/uzlib/tinfzlib.c
@@ -33,9 +33,9 @@
  *    any source distribution.
  */
 
-#include "tinf.h"
+#include "uzlib.h"
 
-int uzlib_zlib_parse_header(TINF_DATA *d)
+int uzlib_zlib_parse_header(uzlib_uncomp_t *d)
 {
    unsigned char cmf, flg;
 
@@ -47,19 +47,19 @@ int uzlib_zlib_parse_header(TINF_DATA *d)
    /* -- check format -- */
 
    /* check checksum */
-   if ((256*cmf + flg) % 31) return TINF_DATA_ERROR;
+   if ((256*cmf + flg) % 31) return UZLIB_DATA_ERROR;
 
    /* check method is deflate */
-   if ((cmf & 0x0f) != 8) return TINF_DATA_ERROR;
+   if ((cmf & 0x0f) != 8) return UZLIB_DATA_ERROR;
 
    /* check window size is valid */
-   if ((cmf >> 4) > 7) return TINF_DATA_ERROR;
+   if ((cmf >> 4) > 7) return UZLIB_DATA_ERROR;
 
    /* check there is no preset dictionary */
-   if (flg & 0x20) return TINF_DATA_ERROR;
+   if (flg & 0x20) return UZLIB_DATA_ERROR;
 
    /* initialize for adler32 checksum */
-   d->checksum_type = TINF_CHKSUM_ADLER;
+   d->checksum_type = UZLIB_CHKSUM_ADLER;
    d->checksum = 1;
 
    return cmf >> 4;
diff --git a/lib/uzlib/uzlib.h b/lib/uzlib/uzlib.h
index 83dddcd477768..ca58299fc3ecc 100644
--- a/lib/uzlib/uzlib.h
+++ b/lib/uzlib/uzlib.h
@@ -7,6 +7,9 @@
  *
  * Copyright (c) 2014-2018 by Paul Sokolovsky
  *
+ * Optimised for MicroPython:
+ * Copyright (c) 2023 by Jim Mussared
+ *
  * This software is provided 'as-is', without any express
  * or implied warranty.  In no event will the authors be
  * held liable for any damages arising from the use of
@@ -46,31 +49,22 @@
 #include <stdio.h>
 #endif
 
-/* calling convention */
-#ifndef TINFCC
- #ifdef __WATCOMC__
-  #define TINFCC __cdecl
- #else
-  #define TINFCC
- #endif
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* ok status, more data produced */
-#define TINF_OK             0
+#define UZLIB_OK             0
 /* end of compressed stream reached */
-#define TINF_DONE           1
-#define TINF_DATA_ERROR    (-3)
-#define TINF_CHKSUM_ERROR  (-4)
-#define TINF_DICT_ERROR    (-5)
+#define UZLIB_DONE           1
+#define UZLIB_DATA_ERROR    (-3)
+#define UZLIB_CHKSUM_ERROR  (-4)
+#define UZLIB_DICT_ERROR    (-5)
 
 /* checksum types */
-#define TINF_CHKSUM_NONE  0
-#define TINF_CHKSUM_ADLER 1
-#define TINF_CHKSUM_CRC   2
+#define UZLIB_CHKSUM_NONE  0
+#define UZLIB_CHKSUM_ADLER 1
+#define UZLIB_CHKSUM_CRC   2
 
 /* helper macros */
 #define TINF_ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*(arr)))
@@ -82,7 +76,7 @@ typedef struct {
    unsigned short trans[288]; /* code -> symbol translation table */
 } TINF_TREE;
 
-struct uzlib_uncomp {
+typedef struct _uzlib_uncomp_t {
     /* Pointer to the next byte in the input buffer */
     const unsigned char *source;
     /* Pointer to the next byte past the input buffer (source_limit = source + len) */
@@ -92,7 +86,7 @@ struct uzlib_uncomp {
        also return -1 in case of EOF (or irrecoverable error). Note that
        besides returning the next byte, it may also update source and
        source_limit fields, thus allowing for buffered operation. */
-    int (*source_read_cb)(struct uzlib_uncomp *uncomp);
+    int (*source_read_cb)(struct _uzlib_uncomp_t *uncomp);
 
     unsigned int tag;
     unsigned int bitcount;
@@ -119,9 +113,7 @@ struct uzlib_uncomp {
 
     TINF_TREE ltree; /* dynamic length/symbol tree */
     TINF_TREE dtree; /* dynamic distance tree */
-};
-
-#include "tinf_compat.h"
+} uzlib_uncomp_t;
 
 #define TINF_PUT(d, c) \
     { \
@@ -129,17 +121,17 @@ struct uzlib_uncomp {
         if (d->dict_ring) { d->dict_ring[d->dict_idx++] = c; if (d->dict_idx == d->dict_size) d->dict_idx = 0; } \
     }
 
-unsigned char TINFCC uzlib_get_byte(TINF_DATA *d);
+unsigned char uzlib_get_byte(uzlib_uncomp_t *d);
 
 /* Decompression API */
 
-void TINFCC uzlib_init(void);
-void TINFCC uzlib_uncompress_init(TINF_DATA *d, void *dict, unsigned int dictLen);
-int  TINFCC uzlib_uncompress(TINF_DATA *d);
-int  TINFCC uzlib_uncompress_chksum(TINF_DATA *d);
+void uzlib_init(void);
+void uzlib_uncompress_init(uzlib_uncomp_t *d, void *dict, unsigned int dictLen);
+int  uzlib_uncompress(uzlib_uncomp_t *d);
+int  uzlib_uncompress_chksum(uzlib_uncomp_t *d);
 
-int TINFCC uzlib_zlib_parse_header(TINF_DATA *d);
-int TINFCC uzlib_gzip_parse_header(TINF_DATA *d);
+int uzlib_zlib_parse_header(uzlib_uncomp_t *d);
+int uzlib_gzip_parse_header(uzlib_uncomp_t *d);
 
 /* Compression API */
 
@@ -151,15 +143,15 @@ struct uzlib_lz77_state {
     size_t hist_len;
 };
 
-void TINFCC uzlib_lz77_init(struct uzlib_lz77_state *state, uint8_t *hist, size_t hist_max);
-void TINFCC uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, unsigned len);
+void uzlib_lz77_init(struct uzlib_lz77_state *state, uint8_t *hist, size_t hist_max);
+void uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, unsigned len);
 
 /* Checksum API */
 
 /* prev_sum is previous value for incremental computation, 1 initially */
-uint32_t TINFCC uzlib_adler32(const void *data, unsigned int length, uint32_t prev_sum);
+uint32_t uzlib_adler32(const void *data, unsigned int length, uint32_t prev_sum);
 /* crc is previous value for incremental computation, 0xffffffff initially */
-uint32_t TINFCC uzlib_crc32(const void *data, unsigned int length, uint32_t crc);
+uint32_t uzlib_crc32(const void *data, unsigned int length, uint32_t crc);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index f3ea57c89fda2..abc3514ed146c 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "lib/uzlib/tinf.h"
+#include "lib/uzlib/uzlib.h"
 #include "mboot.h"
 #include "pack.h"
 #include "vfs.h"
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index 6ed8a21d99495..f008eca5cd795 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -38,14 +38,14 @@
 typedef struct _gz_stream_t {
     void *stream_data;
     stream_read_t stream_read;
-    struct uzlib_uncomp tinf;
+    uzlib_uncomp_t decomp;
     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) {
+static int gz_stream_read_src(uzlib_uncomp_t *decomp) {
     int n = gz_stream.stream_read(gz_stream.stream_data, gz_stream.buf, sizeof(gz_stream.buf));
     if (n < 0) {
         // Stream error
@@ -56,17 +56,17 @@ static int gz_stream_read_src(TINF_DATA *tinf) {
         return -1;
     }
 
-    tinf->source = gz_stream.buf + 1;
-    tinf->source_limit = gz_stream.buf + n;
+    decomp->source = gz_stream.buf + 1;
+    decomp->source_limit = gz_stream.buf + n;
     return gz_stream.buf[0];
 }
 
 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;
+    memset(&gz_stream.decomp, 0, sizeof(gz_stream.decomp));
+    gz_stream.decomp.source = data;
+    gz_stream.decomp.source_limit = data + len;
 
-    uzlib_uncompress_init(&gz_stream.tinf, gz_stream.dict, DICT_SIZE);
+    uzlib_uncompress_init(&gz_stream.decomp, gz_stream.dict, DICT_SIZE);
 
     return 0;
 }
@@ -75,36 +75,36 @@ 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;
 
-    memset(&gz_stream.tinf, 0, sizeof(gz_stream.tinf));
-    gz_stream.tinf.source_read_cb = gz_stream_read_src;
+    memset(&gz_stream.decomp, 0, sizeof(gz_stream.decomp));
+    gz_stream.decomp.source_read_cb = gz_stream_read_src;
 
-    int st = uzlib_gzip_parse_header(&gz_stream.tinf);
-    if (st != TINF_OK) {
+    int st = uzlib_gzip_parse_header(&gz_stream.decomp);
+    if (st != UZLIB_OK) {
         return -MBOOT_ERRNO_GUNZIP_FAILED;
     }
 
-    uzlib_uncompress_init(&gz_stream.tinf, gz_stream.dict, DICT_SIZE);
+    uzlib_uncompress_init(&gz_stream.decomp, gz_stream.dict, DICT_SIZE);
 
     return 0;
 }
 
 int gz_stream_read(size_t len, uint8_t *buf) {
-    if (gz_stream.tinf.source == NULL && gz_stream.tinf.source_read_cb == NULL) {
+    if (gz_stream.decomp.source == NULL && gz_stream.decomp.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);
+    gz_stream.decomp.dest = buf;
+    gz_stream.decomp.dest_limit = buf + len;
+    int st = uzlib_uncompress_chksum(&gz_stream.decomp);
     if (st < 0) {
         return st;
     }
-    if (st == TINF_DONE) {
+    if (st == UZLIB_DONE) {
         // Indicate end-of-stream for subsequent calls.
-        gz_stream.tinf.source = NULL;
-        gz_stream.tinf.source_read_cb = NULL;
+        gz_stream.decomp.source = NULL;
+        gz_stream.decomp.source_read_cb = NULL;
     }
-    return gz_stream.tinf.dest - buf;
+    return gz_stream.decomp.dest - buf;
 }
 
 #endif // MBOOT_FSLOAD || MBOOT_ENABLE_PACKING

From d75a3cd8611c421d03784ebc459c3faa878bf77b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 01:34:31 +1000
Subject: [PATCH 0149/3129] lib/uzlib: Combine zlib/gzip header parsing to
 allow auto-detect.

This supports `wbits` values between +40 to +47.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/uzlib/header.c           | 133 +++++++++++++++++++++++++++++++++++
 lib/uzlib/tinfgzip.c         | 110 -----------------------------
 lib/uzlib/tinfzlib.c         |  66 -----------------
 lib/uzlib/uzlib.h            |   5 +-
 ports/stm32/mboot/Makefile   |   2 +-
 ports/stm32/mboot/gzstream.c |   5 +-
 6 files changed, 140 insertions(+), 181 deletions(-)
 create mode 100644 lib/uzlib/header.c
 delete mode 100644 lib/uzlib/tinfgzip.c
 delete mode 100644 lib/uzlib/tinfzlib.c

diff --git a/lib/uzlib/header.c b/lib/uzlib/header.c
new file mode 100644
index 0000000000000..edd2b08ab5a48
--- /dev/null
+++ b/lib/uzlib/header.c
@@ -0,0 +1,133 @@
+/*
+ * uzlib  -  tiny deflate/inflate library (deflate, gzip, zlib)
+ *
+ * Copyright (c) 2003 by Joergen Ibsen / Jibz
+ * All Rights Reserved
+ *
+ * http://www.ibsensoftware.com/
+ *
+ * Copyright (c) 2014-2018 by Paul Sokolovsky
+ *
+ * Optimised for MicroPython:
+ * Copyright (c) 2023 by Jim Mussared
+ *
+ * This software is provided 'as-is', without any express
+ * or implied warranty.  In no event will the authors be
+ * held liable for any damages arising from the use of
+ * this software.
+ *
+ * Permission is granted to anyone to use this software
+ * for any purpose, including commercial applications,
+ * and to alter it and redistribute it freely, subject to
+ * the following restrictions:
+ *
+ * 1. The origin of this software must not be
+ *    misrepresented; you must not claim that you
+ *    wrote the original software. If you use this
+ *    software in a product, an acknowledgment in
+ *    the product documentation would be appreciated
+ *    but is not required.
+ *
+ * 2. Altered source versions must be plainly marked
+ *    as such, and must not be misrepresented as
+ *    being the original software.
+ *
+ * 3. This notice may not be removed or altered from
+ *    any source distribution.
+ */
+
+#include "uzlib.h"
+
+#define FTEXT    1
+#define FHCRC    2
+#define FEXTRA   4
+#define FNAME    8
+#define FCOMMENT 16
+
+void tinf_skip_bytes(uzlib_uncomp_t *d, int num);
+uint16_t tinf_get_uint16(uzlib_uncomp_t *d);
+
+void tinf_skip_bytes(uzlib_uncomp_t *d, int num)
+{
+    while (num--) uzlib_get_byte(d);
+}
+
+uint16_t tinf_get_uint16(uzlib_uncomp_t *d)
+{
+    unsigned int v = uzlib_get_byte(d);
+    v = (uzlib_get_byte(d) << 8) | v;
+    return v;
+}
+
+int uzlib_parse_zlib_gzip_header(uzlib_uncomp_t *d, int *wbits)
+{
+    /* -- check format -- */
+    unsigned char cmf = uzlib_get_byte(d);
+    unsigned char flg = uzlib_get_byte(d);
+
+    /* check for gzip id bytes */
+    if (cmf == 0x1f && flg == 0x8b) {
+        /* check method is deflate */
+        if (uzlib_get_byte(d) != 8) return UZLIB_DATA_ERROR;
+
+        /* get flag byte */
+        flg = uzlib_get_byte(d);
+
+        /* check that reserved bits are zero */
+        if (flg & 0xe0) return UZLIB_DATA_ERROR;
+
+        /* -- find start of compressed data -- */
+
+        /* skip rest of base header of 10 bytes */
+        tinf_skip_bytes(d, 6);
+
+        /* skip extra data if present */
+        if (flg & FEXTRA)
+        {
+           unsigned int xlen = tinf_get_uint16(d);
+           tinf_skip_bytes(d, xlen);
+        }
+
+        /* skip file name if present */
+        if (flg & FNAME) { while (uzlib_get_byte(d)); }
+
+        /* skip file comment if present */
+        if (flg & FCOMMENT) { while (uzlib_get_byte(d)); }
+
+        /* check header crc if present */
+        if (flg & FHCRC)
+        {
+           /*unsigned int hcrc =*/ tinf_get_uint16(d);
+
+            // TODO: Check!
+    //       if (hcrc != (tinf_crc32(src, start - src) & 0x0000ffff))
+    //          return UZLIB_DATA_ERROR;
+        }
+
+        /* initialize for crc32 checksum */
+        d->checksum_type = UZLIB_CHKSUM_CRC;
+        d->checksum = ~0;
+
+        return UZLIB_HEADER_GZIP;
+    } else {
+       /* check checksum */
+       if ((256*cmf + flg) % 31) return UZLIB_DATA_ERROR;
+
+       /* check method is deflate */
+       if ((cmf & 0x0f) != 8) return UZLIB_DATA_ERROR;
+
+       /* check window size is valid */
+       if ((cmf >> 4) > 7) return UZLIB_DATA_ERROR;
+
+       /* check there is no preset dictionary */
+       if (flg & 0x20) return UZLIB_DATA_ERROR;
+
+       /* initialize for adler32 checksum */
+       d->checksum_type = UZLIB_CHKSUM_ADLER;
+       d->checksum = 1;
+
+       *wbits = (cmf >> 4) + 8;
+
+        return UZLIB_HEADER_ZLIB;
+    }
+}
diff --git a/lib/uzlib/tinfgzip.c b/lib/uzlib/tinfgzip.c
deleted file mode 100644
index 3b0feb532122a..0000000000000
--- a/lib/uzlib/tinfgzip.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * uzlib  -  tiny deflate/inflate library (deflate, gzip, zlib)
- *
- * Copyright (c) 2003 by Joergen Ibsen / Jibz
- * All Rights Reserved
- *
- * http://www.ibsensoftware.com/
- *
- * Copyright (c) 2014-2018 by Paul Sokolovsky
- *
- * This software is provided 'as-is', without any express
- * or implied warranty.  In no event will the authors be
- * held liable for any damages arising from the use of
- * this software.
- *
- * Permission is granted to anyone to use this software
- * for any purpose, including commercial applications,
- * and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The origin of this software must not be
- *    misrepresented; you must not claim that you
- *    wrote the original software. If you use this
- *    software in a product, an acknowledgment in
- *    the product documentation would be appreciated
- *    but is not required.
- *
- * 2. Altered source versions must be plainly marked
- *    as such, and must not be misrepresented as
- *    being the original software.
- *
- * 3. This notice may not be removed or altered from
- *    any source distribution.
- */
-
-#include "uzlib.h"
-
-#define FTEXT    1
-#define FHCRC    2
-#define FEXTRA   4
-#define FNAME    8
-#define FCOMMENT 16
-
-void tinf_skip_bytes(uzlib_uncomp_t *d, int num);
-uint16_t tinf_get_uint16(uzlib_uncomp_t *d);
-
-void tinf_skip_bytes(uzlib_uncomp_t *d, int num)
-{
-    while (num--) uzlib_get_byte(d);
-}
-
-uint16_t tinf_get_uint16(uzlib_uncomp_t *d)
-{
-    unsigned int v = uzlib_get_byte(d);
-    v = (uzlib_get_byte(d) << 8) | v;
-    return v;
-}
-
-int uzlib_gzip_parse_header(uzlib_uncomp_t *d)
-{
-    unsigned char flg;
-
-    /* -- check format -- */
-
-    /* check id bytes */
-    if (uzlib_get_byte(d) != 0x1f || uzlib_get_byte(d) != 0x8b) return UZLIB_DATA_ERROR;
-
-    /* check method is deflate */
-    if (uzlib_get_byte(d) != 8) return UZLIB_DATA_ERROR;
-
-    /* get flag byte */
-    flg = uzlib_get_byte(d);
-
-    /* check that reserved bits are zero */
-    if (flg & 0xe0) return UZLIB_DATA_ERROR;
-
-    /* -- find start of compressed data -- */
-
-    /* skip rest of base header of 10 bytes */
-    tinf_skip_bytes(d, 6);
-
-    /* skip extra data if present */
-    if (flg & FEXTRA)
-    {
-       unsigned int xlen = tinf_get_uint16(d);
-       tinf_skip_bytes(d, xlen);
-    }
-
-    /* skip file name if present */
-    if (flg & FNAME) { while (uzlib_get_byte(d)); }
-
-    /* skip file comment if present */
-    if (flg & FCOMMENT) { while (uzlib_get_byte(d)); }
-
-    /* check header crc if present */
-    if (flg & FHCRC)
-    {
-       /*unsigned int hcrc =*/ tinf_get_uint16(d);
-
-        // TODO: Check!
-//       if (hcrc != (tinf_crc32(src, start - src) & 0x0000ffff))
-//          return UZLIB_DATA_ERROR;
-    }
-
-    /* initialize for crc32 checksum */
-    d->checksum_type = UZLIB_CHKSUM_CRC;
-    d->checksum = ~0;
-
-    return UZLIB_OK;
-}
diff --git a/lib/uzlib/tinfzlib.c b/lib/uzlib/tinfzlib.c
deleted file mode 100644
index 03954cefaeba7..0000000000000
--- a/lib/uzlib/tinfzlib.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * uzlib  -  tiny deflate/inflate library (deflate, gzip, zlib)
- *
- * Copyright (c) 2003 by Joergen Ibsen / Jibz
- * All Rights Reserved
- *
- * http://www.ibsensoftware.com/
- *
- * Copyright (c) 2014-2018 by Paul Sokolovsky
- *
- * This software is provided 'as-is', without any express
- * or implied warranty.  In no event will the authors be
- * held liable for any damages arising from the use of
- * this software.
- *
- * Permission is granted to anyone to use this software
- * for any purpose, including commercial applications,
- * and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The origin of this software must not be
- *    misrepresented; you must not claim that you
- *    wrote the original software. If you use this
- *    software in a product, an acknowledgment in
- *    the product documentation would be appreciated
- *    but is not required.
- *
- * 2. Altered source versions must be plainly marked
- *    as such, and must not be misrepresented as
- *    being the original software.
- *
- * 3. This notice may not be removed or altered from
- *    any source distribution.
- */
-
-#include "uzlib.h"
-
-int uzlib_zlib_parse_header(uzlib_uncomp_t *d)
-{
-   unsigned char cmf, flg;
-
-   /* -- get header bytes -- */
-
-   cmf = uzlib_get_byte(d);
-   flg = uzlib_get_byte(d);
-
-   /* -- check format -- */
-
-   /* check checksum */
-   if ((256*cmf + flg) % 31) return UZLIB_DATA_ERROR;
-
-   /* check method is deflate */
-   if ((cmf & 0x0f) != 8) return UZLIB_DATA_ERROR;
-
-   /* check window size is valid */
-   if ((cmf >> 4) > 7) return UZLIB_DATA_ERROR;
-
-   /* check there is no preset dictionary */
-   if (flg & 0x20) return UZLIB_DATA_ERROR;
-
-   /* initialize for adler32 checksum */
-   d->checksum_type = UZLIB_CHKSUM_ADLER;
-   d->checksum = 1;
-
-   return cmf >> 4;
-}
diff --git a/lib/uzlib/uzlib.h b/lib/uzlib/uzlib.h
index ca58299fc3ecc..3756ea75393fd 100644
--- a/lib/uzlib/uzlib.h
+++ b/lib/uzlib/uzlib.h
@@ -130,8 +130,9 @@ void uzlib_uncompress_init(uzlib_uncomp_t *d, void *dict, unsigned int dictLen);
 int  uzlib_uncompress(uzlib_uncomp_t *d);
 int  uzlib_uncompress_chksum(uzlib_uncomp_t *d);
 
-int uzlib_zlib_parse_header(uzlib_uncomp_t *d);
-int uzlib_gzip_parse_header(uzlib_uncomp_t *d);
+#define UZLIB_HEADER_ZLIB             0
+#define UZLIB_HEADER_GZIP             1
+int uzlib_parse_zlib_gzip_header(uzlib_uncomp_t *d, int *wbits);
 
 /* Compression API */
 
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 1f6ba063b22e5..630327d7002b6 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -105,7 +105,7 @@ LIB_SRC_C += \
 	lib/oofatfs/ffunicode.c \
 	lib/uzlib/adler32.c \
 	lib/uzlib/crc32.c \
-	lib/uzlib/tinfgzip.c \
+	lib/uzlib/header.c \
 	lib/uzlib/tinflate.c
 
 SRC_C += \
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index f008eca5cd795..764ef0a4779d4 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -78,8 +78,9 @@ int gz_stream_init_from_stream(void *stream_data, stream_read_t stream_read) {
     memset(&gz_stream.decomp, 0, sizeof(gz_stream.decomp));
     gz_stream.decomp.source_read_cb = gz_stream_read_src;
 
-    int st = uzlib_gzip_parse_header(&gz_stream.decomp);
-    if (st != UZLIB_OK) {
+    int header_wbits;
+    int st = uzlib_parse_zlib_gzip_header(&gz_stream.decomp, &header_wbits);
+    if (st != UZLIB_HEADER_GZIP) {
         return -MBOOT_ERRNO_GUNZIP_FAILED;
     }
 

From ef5061fefdcfd025eb2fc9645b65515ae3ae6d78 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 02:47:05 +1000
Subject: [PATCH 0150/3129] lib/uzlib/tinflate: Implement more compact lookup
 tables.

Saves 68 bytes on PYBV11.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/uzlib/tinflate.c | 116 ++++++++++++++++---------------------------
 lib/uzlib/uzlib.h    |   1 -
 2 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/lib/uzlib/tinflate.c b/lib/uzlib/tinflate.c
index e844d7faa4913..312485fd04368 100644
--- a/lib/uzlib/tinflate.c
+++ b/lib/uzlib/tinflate.c
@@ -7,6 +7,9 @@
  *
  * Copyright (c) 2014-2018 by Paul Sokolovsky
  *
+ * Optimised for MicroPython:
+ * Copyright (c) 2023 by Jim Mussared
+ *
  * This software is provided 'as-is', without any express
  * or implied warranty.  In no event will the authors be
  * held liable for any damages arising from the use of
@@ -51,45 +54,45 @@ uint32_t tinf_get_be_uint32(uzlib_uncomp_t *d);
  * -- uninitialized global data (static structures) -- *
  * --------------------------------------------------- */
 
-#ifdef RUNTIME_BITS_TABLES
-
-/* extra bits and base tables for length codes */
-unsigned char length_bits[30];
-unsigned short length_base[30];
-
-/* extra bits and base tables for distance codes */
-unsigned char dist_bits[30];
-unsigned short dist_base[30];
-
-#else
-
-const unsigned char length_bits[30] = {
-   0, 0, 0, 0, 0, 0, 0, 0,
-   1, 1, 1, 1, 2, 2, 2, 2,
-   3, 3, 3, 3, 4, 4, 4, 4,
-   5, 5, 5, 5
+typedef struct {
+    unsigned char length_bits : 3;
+    unsigned short length_base : 9;
+    unsigned char dist_bits : 4;
+    unsigned short dist_base : 15;
+} lookup_table_entry_t;
+
+const lookup_table_entry_t lookup_table[30] = {
+    {0, 3, 0, 1},
+    {0, 4, 0, 2},
+    {0, 5, 0, 3},
+    {0, 6, 0, 4},
+    {0, 7, 1, 5},
+    {0, 8, 1, 7},
+    {0, 9, 2, 9},
+    {0, 10, 2, 13},
+    {1, 11, 3, 17},
+    {1, 13, 3, 25},
+    {1, 15, 4, 33},
+    {1, 17, 4, 49},
+    {2, 19, 5, 65},
+    {2, 23, 5, 97},
+    {2, 27, 6, 129},
+    {2, 31, 6, 193},
+    {3, 35, 7, 257},
+    {3, 43, 7, 385},
+    {3, 51, 8, 513},
+    {3, 59, 8, 769},
+    {4, 67, 9, 1025},
+    {4, 83, 9, 1537},
+    {4, 99, 10, 2049},
+    {4, 115, 10, 3073},
+    {5, 131, 11, 4097},
+    {5, 163, 11, 6145},
+    {5, 195, 12, 8193},
+    {5, 227, 12, 12289},
+    {0, 258, 13, 16385},
+    {0, 0, 13, 24577},
 };
-const unsigned short length_base[30] = {
-   3, 4, 5, 6, 7, 8, 9, 10,
-   11, 13, 15, 17, 19, 23, 27, 31,
-   35, 43, 51, 59, 67, 83, 99, 115,
-   131, 163, 195, 227, 258
-};
-
-const unsigned char dist_bits[30] = {
-   0, 0, 0, 0, 1, 1, 2, 2,
-   3, 3, 4, 4, 5, 5, 6, 6,
-   7, 7, 8, 8, 9, 9, 10, 10,
-   11, 11, 12, 12, 13, 13
-};
-const unsigned short dist_base[30] = {
-   1, 2, 3, 4, 5, 7, 9, 13,
-   17, 25, 33, 49, 65, 97, 129, 193,
-   257, 385, 513, 769, 1025, 1537, 2049, 3073,
-   4097, 6145, 8193, 12289, 16385, 24577
-};
-
-#endif
 
 /* special ordering of code length codes */
 const unsigned char clcidx[] = {
@@ -102,25 +105,6 @@ const unsigned char clcidx[] = {
  * -- utility functions -- *
  * ----------------------- */
 
-#ifdef RUNTIME_BITS_TABLES
-/* build extra bits and base tables */
-static void tinf_build_bits_base(unsigned char *bits, unsigned short *base, int delta, int first)
-{
-   int i, sum;
-
-   /* build bits table */
-   for (i = 0; i < delta; ++i) bits[i] = 0;
-   for (i = 0; i < 30 - delta; ++i) bits[i + delta] = i / delta;
-
-   /* build base table */
-   for (sum = first, i = 0; i < 30; ++i)
-   {
-      base[i] = sum;
-      sum += 1 << bits[i];
-   }
-}
-#endif
-
 /* build the fixed huffman trees */
 static void tinf_build_fixed_trees(TINF_TREE *lt, TINF_TREE *dt)
 {
@@ -433,7 +417,7 @@ static int tinf_inflate_block_data(uzlib_uncomp_t *d, TINF_TREE *lt, TINF_TREE *
         }
 
         /* possibly get more bits from length code */
-        d->curlen = tinf_read_bits(d, length_bits[sym], length_base[sym]);
+        d->curlen = tinf_read_bits(d, lookup_table[sym].length_bits, lookup_table[sym].length_base);
 
         dist = tinf_decode_symbol(d, dt);
         if (dist >= 30) {
@@ -441,7 +425,7 @@ static int tinf_inflate_block_data(uzlib_uncomp_t *d, TINF_TREE *lt, TINF_TREE *
         }
 
         /* possibly get more bits from distance code */
-        offs = tinf_read_bits(d, dist_bits[dist], dist_base[dist]);
+        offs = tinf_read_bits(d, lookup_table[dist].dist_bits, lookup_table[dist].dist_base);
 
         /* calculate and validate actual LZ offset to use */
         if (d->dict_ring) {
@@ -521,20 +505,6 @@ static int tinf_inflate_uncompressed_block(uzlib_uncomp_t *d)
  * -- public functions -- *
  * ---------------------- */
 
-/* initialize global (static) data */
-void uzlib_init(void)
-{
-#ifdef RUNTIME_BITS_TABLES
-   /* build extra bits and base tables */
-   tinf_build_bits_base(length_bits, length_base, 4, 3);
-   tinf_build_bits_base(dist_bits, dist_base, 2, 1);
-
-   /* fix a special case */
-   length_bits[28] = 0;
-   length_base[28] = 258;
-#endif
-}
-
 /* initialize decompression structure */
 void uzlib_uncompress_init(uzlib_uncomp_t *d, void *dict, unsigned int dictLen)
 {
diff --git a/lib/uzlib/uzlib.h b/lib/uzlib/uzlib.h
index 3756ea75393fd..80f1b2a7238f2 100644
--- a/lib/uzlib/uzlib.h
+++ b/lib/uzlib/uzlib.h
@@ -125,7 +125,6 @@ unsigned char uzlib_get_byte(uzlib_uncomp_t *d);
 
 /* Decompression API */
 
-void uzlib_init(void);
 void uzlib_uncompress_init(uzlib_uncomp_t *d, void *dict, unsigned int dictLen);
 int  uzlib_uncompress(uzlib_uncomp_t *d);
 int  uzlib_uncompress_chksum(uzlib_uncomp_t *d);

From 7f16bfca9f6d5b558b33b6f89566b50918449ed6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 02:56:58 +1000
Subject: [PATCH 0151/3129] lib/uzlib/defl_static: Optimize
 zlib_start/finish_block.

Collapsing the two adjacent calls to outbits saves 32 bytes.

Bringing defl_static.c into lz77.c allows better inlining, saves 24 bytes.

Merge the Outbuf/uzlib_lz77_state_t structs, a minor simplification that
doesn't change code size.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/uzlib/defl_static.c | 49 +++++++++++++++++++++--------------------
 lib/uzlib/defl_static.h | 43 ------------------------------------
 lib/uzlib/lz77.c        | 14 +++++++-----
 lib/uzlib/uzlib.h       | 18 +++++++++------
 4 files changed, 44 insertions(+), 80 deletions(-)
 delete mode 100644 lib/uzlib/defl_static.h

diff --git a/lib/uzlib/defl_static.c b/lib/uzlib/defl_static.c
index 529055ae847db..208e9ea5d2a54 100644
--- a/lib/uzlib/defl_static.c
+++ b/lib/uzlib/defl_static.c
@@ -52,15 +52,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * having to transmit the trees.
  */
 
-static void outbits(struct Outbuf *out, unsigned long bits, int nbits)
+static void outbits(uzlib_lz77_state_t *state, unsigned long bits, int nbits)
 {
-    assert(out->noutbits + nbits <= 32);
-    out->outbits |= bits << out->noutbits;
-    out->noutbits += nbits;
-    while (out->noutbits >= 8) {
-        out->dest_write_cb(out->dest_write_data, out->outbits & 0xFF);
-        out->outbits >>= 8;
-        out->noutbits -= 8;
+    assert(state->noutbits + nbits <= 32);
+    state->outbits |= bits << state->noutbits;
+    state->noutbits += nbits;
+    while (state->noutbits >= 8) {
+        state->dest_write_cb(state->dest_write_data, state->outbits & 0xFF);
+        state->outbits >>= 8;
+        state->noutbits -= 8;
     }
 }
 
@@ -81,18 +81,18 @@ static int int_log2(int x) {
     return r;
 }
 
-void zlib_literal(struct Outbuf *out, unsigned char c)
+static void uzlib_literal(uzlib_lz77_state_t *state, unsigned char c)
 {
     if (c <= 143) {
         /* 0 through 143 are 8 bits long starting at 00110000. */
-        outbits(out, mirrorbyte(0x30 + c), 8);
+        outbits(state, mirrorbyte(0x30 + c), 8);
     } else {
         /* 144 through 255 are 9 bits long starting at 110010000. */
-        outbits(out, 1 + 2 * mirrorbyte(0x90 - 144 + c), 9);
+        outbits(state, 1 + 2 * mirrorbyte(0x90 - 144 + c), 9);
     }
 }
 
-void zlib_match(struct Outbuf *out, int distance, int len)
+static void uzlib_match(uzlib_lz77_state_t *state, int distance, int len)
 {
     assert(distance >= 1 && distance <= 32768);
     distance -= 1;
@@ -133,9 +133,9 @@ void zlib_match(struct Outbuf *out, int distance, int len)
          * 11000000.
          */
         if (lcode <= 22) {
-            outbits(out, mirrorbyte((lcode + 1) * 2), 7);
+            outbits(state, mirrorbyte((lcode + 1) * 2), 7);
         } else {
-            outbits(out, mirrorbyte(lcode + 169), 8);
+            outbits(state, mirrorbyte(lcode + 169), 8);
         }
 
         /*
@@ -144,7 +144,7 @@ void zlib_match(struct Outbuf *out, int distance, int len)
         if (thislen < 255 && x > 1) {
             int extrabits = x - 1;
             int lmin = (thislen >> extrabits) << extrabits;
-            outbits(out, thislen - lmin, extrabits);
+            outbits(state, thislen - lmin, extrabits);
         }
 
         x = int_log2(distance);
@@ -153,7 +153,7 @@ void zlib_match(struct Outbuf *out, int distance, int len)
         /*
          * Transmit the distance code. Five bits starting at 00000.
          */
-        outbits(out, mirrorbyte((x * 2 + y) * 8), 5);
+        outbits(state, mirrorbyte((x * 2 + y) * 8), 5);
 
         /*
          * Transmit the extra bits.
@@ -161,20 +161,21 @@ void zlib_match(struct Outbuf *out, int distance, int len)
         if (x > 1) {
             int dextrabits = x - 1;
             int dmin = (distance >> dextrabits) << dextrabits;
-            outbits(out, distance - dmin, dextrabits);
+            outbits(state, distance - dmin, dextrabits);
         }
     }
 }
 
-void zlib_start_block(struct Outbuf *out)
+void uzlib_start_block(uzlib_lz77_state_t *state)
 {
-//    outbits(out, 0x9C78, 16);
-    outbits(out, 1, 1); /* Final block */
-    outbits(out, 1, 2); /* Static huffman block */
+    // Final block (0b1)
+    // Static huffman block (0b01)
+    outbits(state, 3, 3);
 }
 
-void zlib_finish_block(struct Outbuf *out)
+void uzlib_finish_block(uzlib_lz77_state_t *state)
 {
-    outbits(out, 0, 7); /* close block */
-    outbits(out, 0, 7); /* Make sure all bits are flushed */
+    // Close block (0b0000000)
+    // Make sure all bits are flushed (0b0000000)
+    outbits(state, 0, 14);
 }
diff --git a/lib/uzlib/defl_static.h b/lib/uzlib/defl_static.h
deleted file mode 100644
index 7329de36efa07..0000000000000
--- a/lib/uzlib/defl_static.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) uzlib authors
- *
- * This software is provided 'as-is', without any express
- * or implied warranty.  In no event will the authors be
- * held liable for any damages arising from the use of
- * this software.
- *
- * Permission is granted to anyone to use this software
- * for any purpose, including commercial applications,
- * and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The origin of this software must not be
- *    misrepresented; you must not claim that you
- *    wrote the original software. If you use this
- *    software in a product, an acknowledgment in
- *    the product documentation would be appreciated
- *    but is not required.
- *
- * 2. Altered source versions must be plainly marked
- *    as such, and must not be misrepresented as
- *    being the original software.
- *
- * 3. This notice may not be removed or altered from
- *    any source distribution.
- */
-
-/* This files contains type declaration and prototypes for defl_static.c.
-   They may be altered/distinct from the originals used in PuTTY source
-   code. */
-
-struct Outbuf {
-    void *dest_write_data;
-    void (*dest_write_cb)(void *data, uint8_t byte);
-    unsigned long outbits;
-    int noutbits;
-};
-
-void zlib_start_block(struct Outbuf *ctx);
-void zlib_finish_block(struct Outbuf *ctx);
-void zlib_literal(struct Outbuf *ectx, unsigned char c);
-void zlib_match(struct Outbuf *ectx, int distance, int len);
diff --git a/lib/uzlib/lz77.c b/lib/uzlib/lz77.c
index 1c7a8442ca851..117ce50f70f20 100644
--- a/lib/uzlib/lz77.c
+++ b/lib/uzlib/lz77.c
@@ -11,6 +11,8 @@
 
 #include "uzlib.h"
 
+#include "defl_static.c"
+
 #define MATCH_LEN_MIN (3)
 #define MATCH_LEN_MAX (258)
 
@@ -18,8 +20,8 @@
 // hist_max should be greater than 0 a power of 2 (ie 1, 2, 4, 8, ...).
 // It's possible to pass in hist=NULL, and then the history window will be taken from the
 // src passed in to uzlib_lz77_compress (this is useful when not doing streaming compression).
-void uzlib_lz77_init(struct uzlib_lz77_state *state, uint8_t *hist, size_t hist_max) {
-    memset(&state->outbuf, 0, sizeof(state->outbuf));
+void uzlib_lz77_init(uzlib_lz77_state_t *state, uint8_t *hist, size_t hist_max) {
+    memset(state, 0, sizeof(uzlib_lz77_state_t));
     state->hist_buf = hist;
     state->hist_max = hist_max;
     state->hist_start = 0;
@@ -30,7 +32,7 @@ void uzlib_lz77_init(struct uzlib_lz77_state *state, uint8_t *hist, size_t hist_
 // Search back in the history for the maximum match of the given src data,
 // with support for searching beyond the end of the history and into the src buffer
 // (effectively the history and src buffer are concatenated).
-static size_t uzlib_lz77_search_max_match(struct uzlib_lz77_state *state, const uint8_t *src, size_t len, size_t *longest_offset) {
+static size_t uzlib_lz77_search_max_match(uzlib_lz77_state_t *state, const uint8_t *src, size_t len, size_t *longest_offset) {
     size_t longest_len = 0;
     for (size_t hist_search = 0; hist_search < state->hist_len; ++hist_search) {
         size_t match_len;
@@ -55,7 +57,7 @@ static size_t uzlib_lz77_search_max_match(struct uzlib_lz77_state *state, const
 }
 
 // Compress the given chunk of data.
-void uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, unsigned len) {
+void uzlib_lz77_compress(uzlib_lz77_state_t *state, const uint8_t *src, unsigned len) {
     const uint8_t *top = src + len;
     while (src < top) {
         // Look for a match in the history window.
@@ -64,10 +66,10 @@ void uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, uns
 
         // Encode the literal byte or the match.
         if (match_len == 0) {
-            zlib_literal(&state->outbuf, *src);
+            uzlib_literal(state, *src);
             match_len = 1;
         } else {
-            zlib_match(&state->outbuf, match_offset, match_len);
+            uzlib_match(state, match_offset, match_len);
         }
 
         // Push the bytes into the history buffer.
diff --git a/lib/uzlib/uzlib.h b/lib/uzlib/uzlib.h
index 80f1b2a7238f2..030f7698c176e 100644
--- a/lib/uzlib/uzlib.h
+++ b/lib/uzlib/uzlib.h
@@ -42,8 +42,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "defl_static.h"
-
 #include "uzlib_conf.h"
 #if UZLIB_CONF_DEBUG_LOG
 #include <stdio.h>
@@ -135,16 +133,22 @@ int uzlib_parse_zlib_gzip_header(uzlib_uncomp_t *d, int *wbits);
 
 /* Compression API */
 
-struct uzlib_lz77_state {
-    struct Outbuf outbuf;
+typedef struct {
+    void *dest_write_data;
+    void (*dest_write_cb)(void *data, uint8_t byte);
+    unsigned long outbits;
+    int noutbits;
     uint8_t *hist_buf;
     size_t hist_max;
     size_t hist_start;
     size_t hist_len;
-};
+} uzlib_lz77_state_t;
+
+void uzlib_lz77_init(uzlib_lz77_state_t *state, uint8_t *hist, size_t hist_max);
+void uzlib_lz77_compress(uzlib_lz77_state_t *state, const uint8_t *src, unsigned len);
 
-void uzlib_lz77_init(struct uzlib_lz77_state *state, uint8_t *hist, size_t hist_max);
-void uzlib_lz77_compress(struct uzlib_lz77_state *state, const uint8_t *src, unsigned len);
+void uzlib_start_block(uzlib_lz77_state_t *state);
+void uzlib_finish_block(uzlib_lz77_state_t *state);
 
 /* Checksum API */
 

From e6c290c3d145de81e23f406c84359860c4d6e632 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Jun 2023 11:56:08 +1000
Subject: [PATCH 0152/3129] lib/uzlib: Add a source_read_data var to pass to
 source_read_cb.

For better abstraction for users of this API.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/uzlib/tinflate.c         | 2 +-
 lib/uzlib/uzlib.h            | 3 ++-
 ports/stm32/mboot/gzstream.c | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/uzlib/tinflate.c b/lib/uzlib/tinflate.c
index 312485fd04368..53536272f3296 100644
--- a/lib/uzlib/tinflate.c
+++ b/lib/uzlib/tinflate.c
@@ -185,7 +185,7 @@ unsigned char uzlib_get_byte(uzlib_uncomp_t *d)
        read next byte using it. (Note: the callback can also update ->source
        and ->source_limit). */
     if (d->source_read_cb && !d->eof) {
-        int val = d->source_read_cb(d);
+        int val = d->source_read_cb(d->source_read_data);
         if (val >= 0) {
             return (unsigned char)val;
         }
diff --git a/lib/uzlib/uzlib.h b/lib/uzlib/uzlib.h
index 030f7698c176e..16984a77d3eb8 100644
--- a/lib/uzlib/uzlib.h
+++ b/lib/uzlib/uzlib.h
@@ -84,7 +84,8 @@ typedef struct _uzlib_uncomp_t {
        also return -1 in case of EOF (or irrecoverable error). Note that
        besides returning the next byte, it may also update source and
        source_limit fields, thus allowing for buffered operation. */
-    int (*source_read_cb)(struct _uzlib_uncomp_t *uncomp);
+    void *source_read_data;
+    int (*source_read_cb)(void *);
 
     unsigned int tag;
     unsigned int bitcount;
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index 764ef0a4779d4..f8b0987edf719 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -45,7 +45,8 @@ typedef struct _gz_stream_t {
 
 static gz_stream_t gz_stream SECTION_NOZERO_BSS;
 
-static int gz_stream_read_src(uzlib_uncomp_t *decomp) {
+static int gz_stream_read_src(void *data) {
+    uzlib_uncomp_t *decomp = data;
     int n = gz_stream.stream_read(gz_stream.stream_data, gz_stream.buf, sizeof(gz_stream.buf));
     if (n < 0) {
         // Stream error
@@ -76,6 +77,7 @@ int gz_stream_init_from_stream(void *stream_data, stream_read_t stream_read) {
     gz_stream.stream_read = stream_read;
 
     memset(&gz_stream.decomp, 0, sizeof(gz_stream.decomp));
+    gz_stream.decomp.source_read_data = &gz_stream.decomp;
     gz_stream.decomp.source_read_cb = gz_stream_read_src;
 
     int header_wbits;

From 3533924c36ae85ce6e8bf8598dd71cf16bbdb10b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 26 Jun 2023 13:52:10 +1000
Subject: [PATCH 0153/3129] extmod/moddeflate: Add deflate module providing the
 DeflateIO class.

This provides similar functionality to the former zlib.DecompIO and
especially CPython's gzip.GzipFile for both compression and decompression.

This class can be used directly, and also can be used from Python to
implement (via io.BytesIO) zlib.decompress and zlib.compress, as well as
gzip.GzipFile.

Enable/disable this on all ports/boards that zlib was previously configured
for.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/extmod.cmake                           |   1 +
 extmod/extmod.mk                              |   1 +
 extmod/modbinascii.c                          |   6 +-
 extmod/moddeflate.c                           | 404 ++++++++++++++++++
 ports/cc3200/mpconfigport.h                   |   1 +
 ports/qemu-arm/mpconfigport.h                 |   1 +
 ports/samd/mpconfigport.h                     |   1 +
 .../boards/NUCLEO_G474RE/mpconfigboard.h      |   1 +
 ports/windows/mpconfigport.h                  |   2 +
 ports/windows/msvc/sources.props              |   1 +
 py/mpconfig.h                                 |  12 +-
 tests/unix/extra_coverage.py.exp              |  13 +-
 12 files changed, 434 insertions(+), 10 deletions(-)
 create mode 100644 extmod/moddeflate.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 29b4627614b43..305cdee942762 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -23,6 +23,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modbinascii.c
     ${MICROPY_EXTMOD_DIR}/modcryptolib.c
     ${MICROPY_EXTMOD_DIR}/moductypes.c
+    ${MICROPY_EXTMOD_DIR}/moddeflate.c
     ${MICROPY_EXTMOD_DIR}/modhashlib.c
     ${MICROPY_EXTMOD_DIR}/modheapq.c
     ${MICROPY_EXTMOD_DIR}/modjson.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 0745fb49ebc04..a15b7e4a5fcda 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -16,6 +16,7 @@ SRC_EXTMOD_C += \
 	extmod/modbluetooth.c \
 	extmod/modbtree.c \
 	extmod/modcryptolib.c \
+	extmod/moddeflate.c \
 	extmod/modframebuf.c \
 	extmod/modhashlib.c \
 	extmod/modheapq.c \
diff --git a/extmod/modbinascii.c b/extmod/modbinascii.c
index 0c562de7c0f0d..ed39960180ae3 100644
--- a/extmod/modbinascii.c
+++ b/extmod/modbinascii.c
@@ -170,8 +170,8 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
 
-#if 0 // MICROPY_PY_BINASCII_CRC32
-#include "lib/uzlib/crc32.c"
+#if MICROPY_PY_BINASCII_CRC32 && MICROPY_PY_DEFLATE
+#include "lib/uzlib/uzlib.h"
 
 STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
@@ -191,7 +191,7 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
     #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 0 // MICROPY_PY_BINASCII_CRC32
+    #if MICROPY_PY_BINASCII_CRC32 && MICROPY_PY_DEFLATE
     { MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_binascii_crc32_obj) },
     #endif
 };
diff --git a/extmod/moddeflate.c b/extmod/moddeflate.c
new file mode 100644
index 0000000000000..1d8a8acf73b03
--- /dev/null
+++ b/extmod/moddeflate.c
@@ -0,0 +1,404 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Jim Mussared
+ *
+ * Based on extmod/modzlib.c
+ * Copyright (c) 2014-2016 Paul Sokolovsky
+ * Copyright (c) 2021-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 <string.h>
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+
+#if MICROPY_PY_DEFLATE
+
+#include "lib/uzlib/uzlib.h"
+
+#if 0 // print debugging info
+#define DEBUG_printf DEBUG_printf
+#else // don't print debugging info
+#define DEBUG_printf(...) (void)0
+#endif
+
+typedef enum {
+    DEFLATEIO_FORMAT_MIN = 0,
+    DEFLATEIO_FORMAT_AUTO = DEFLATEIO_FORMAT_MIN, // Read mode this means auto-detect zlib/gzip, write mode this means RAW.
+    DEFLATEIO_FORMAT_RAW = 1,
+    DEFLATEIO_FORMAT_ZLIB = 2,
+    DEFLATEIO_FORMAT_GZIP = 3,
+    DEFLATEIO_FORMAT_MAX = DEFLATEIO_FORMAT_GZIP,
+} deflateio_format_t;
+
+const int DEFLATEIO_DEFAULT_WBITS = 8;
+
+typedef struct {
+    void *window;
+    uzlib_uncomp_t decomp;
+    bool eof;
+} mp_obj_deflateio_read_t;
+
+#if MICROPY_PY_DEFLATE_COMPRESS
+typedef struct {
+    void *window;
+    size_t input_len;
+    uint32_t input_checksum;
+    uzlib_lz77_state_t lz77;
+} mp_obj_deflateio_write_t;
+#endif
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t stream;
+    uint8_t format : 2;
+    uint8_t window_bits : 4;
+    bool close : 1;
+    mp_obj_deflateio_read_t *read;
+    #if MICROPY_PY_DEFLATE_COMPRESS
+    mp_obj_deflateio_write_t *write;
+    #endif
+} mp_obj_deflateio_t;
+
+STATIC int deflateio_read_stream(void *data) {
+    mp_obj_deflateio_t *self = data;
+    const mp_stream_p_t *stream = mp_get_stream(self->stream);
+    int err;
+    byte c;
+    mp_uint_t out_sz = stream->read(self->stream, &c, 1, &err);
+    if (out_sz == MP_STREAM_ERROR) {
+        mp_raise_OSError(err);
+    }
+    if (out_sz == 0) {
+        mp_raise_type(&mp_type_EOFError);
+    }
+    return c;
+}
+
+STATIC bool deflateio_init_read(mp_obj_deflateio_t *self) {
+    if (self->read) {
+        return true;
+    }
+
+    mp_get_stream_raise(self->stream, MP_STREAM_OP_READ);
+
+    self->read = m_new_obj(mp_obj_deflateio_read_t);
+    memset(&self->read->decomp, 0, sizeof(self->read->decomp));
+    self->read->decomp.source_read_data = self;
+    self->read->decomp.source_read_cb = deflateio_read_stream;
+    self->read->eof = false;
+
+    // Don't modify self->window_bits as it may also be used for write.
+    int wbits = self->window_bits;
+
+    // Parse the header if we're in NONE/ZLIB/GZIP modes.
+    if (self->format != DEFLATEIO_FORMAT_RAW) {
+        int header_wbits = wbits;
+        int header_type = uzlib_parse_zlib_gzip_header(&self->read->decomp, &header_wbits);
+        if ((self->format == DEFLATEIO_FORMAT_ZLIB && header_type != UZLIB_HEADER_ZLIB) || (self->format == DEFLATEIO_FORMAT_GZIP && header_type != UZLIB_HEADER_GZIP)) {
+            return false;
+        }
+        if (wbits == 0 && header_wbits < 15) {
+            // If the header specified something lower than the default, then
+            // use that instead.
+            wbits = header_wbits;
+        }
+    }
+
+    if (wbits == 0) {
+        wbits = DEFLATEIO_DEFAULT_WBITS;
+    }
+
+    size_t window_len = 1 << wbits;
+    self->read->window = m_new(uint8_t, window_len);
+
+    uzlib_uncompress_init(&self->read->decomp, self->read->window, window_len);
+
+    return true;
+}
+
+#if MICROPY_PY_DEFLATE_COMPRESS
+STATIC void deflateio_out_byte(void *data, uint8_t b) {
+    mp_obj_deflateio_t *self = data;
+    const mp_stream_p_t *stream = mp_get_stream(self->stream);
+    int err;
+    mp_uint_t ret = stream->write(self->stream, &b, 1, &err);
+    if (ret == MP_STREAM_ERROR) {
+        mp_raise_OSError(err);
+    }
+}
+
+STATIC bool deflateio_init_write(mp_obj_deflateio_t *self) {
+    if (self->write) {
+        return true;
+    }
+
+    const mp_stream_p_t *stream = mp_get_stream_raise(self->stream, MP_STREAM_OP_WRITE);
+
+    self->write = m_new_obj(mp_obj_deflateio_write_t);
+    self->write->input_len = 0;
+
+    int wbits = self->window_bits;
+    if (wbits == 0) {
+        wbits = DEFLATEIO_DEFAULT_WBITS;
+    }
+    size_t window_len = 1 << wbits;
+    self->write->window = m_new(uint8_t, window_len);
+
+    uzlib_lz77_init(&self->write->lz77, self->write->window, window_len);
+    self->write->lz77.dest_write_data = self;
+    self->write->lz77.dest_write_cb = deflateio_out_byte;
+
+    // Write header if needed.
+    mp_uint_t ret = 0;
+    int err;
+    if (self->format == DEFLATEIO_FORMAT_ZLIB) {
+        // -----CMF------  ----------FLG---------------
+        // CINFO(5) CM(3)  FLEVEL(2) FDICT(1) FCHECK(5)
+        uint8_t buf[] = { 0x08, 0x80 }; // CM=2 (deflate), FLEVEL=2 (default), FDICT=0 (no dictionary)
+        buf[0] |= MAX(wbits - 8, 1) << 4; // base-2 logarithm of the LZ77 window size, minus eight.
+        buf[1] |= 31 - ((buf[0] * 256 + buf[1]) % 31); // (CMF*256 + FLG) % 31 == 0.
+        ret = stream->write(self->stream, buf, sizeof(buf), &err);
+
+        self->write->input_checksum = 1; // ADLER32
+    } else if (self->format == DEFLATEIO_FORMAT_GZIP) {
+        // ID1(8) ID2(8) CM(8) ---FLG--- MTIME(32) XFL(8) OS(8)
+        // FLG: x x x FCOMMENT FNAME FEXTRA FHCRC FTEXT
+        uint8_t buf[] = { 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03 }; // MTIME=0, XFL=4 (fastest), OS=3 (unix)
+        ret = stream->write(self->stream, buf, sizeof(buf), &err);
+
+        self->write->input_checksum = ~0; // CRC32
+    }
+    if (ret == MP_STREAM_ERROR) {
+        return false;
+    }
+
+    // Write starting block.
+    uzlib_start_block(&self->write->lz77);
+
+    return true;
+}
+#endif
+
+STATIC mp_obj_t deflateio_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
+    // args: stream, format=NONE, wbits=0, close=False
+    mp_arg_check_num(n_args, n_kw, 1, 4, false);
+
+    mp_int_t format = n_args > 1 ? mp_obj_get_int(args_in[1]) : DEFLATEIO_FORMAT_AUTO;
+    mp_int_t wbits = n_args > 2 ? mp_obj_get_int(args_in[2]) : 0;
+
+    if (format < DEFLATEIO_FORMAT_MIN || format > DEFLATEIO_FORMAT_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("format"));
+    }
+    if (wbits != 0 && (wbits < 5 || wbits > 15)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("wbits"));
+    }
+
+    mp_obj_deflateio_t *self = mp_obj_malloc(mp_obj_deflateio_t, type);
+    self->stream = args_in[0];
+    self->format = format;
+    self->window_bits = wbits;
+    self->read = NULL;
+    #if MICROPY_PY_DEFLATE_COMPRESS
+    self->write = NULL;
+    #endif
+    self->close = n_args > 3 ? mp_obj_is_true(args_in[3]) : false;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_uint_t deflateio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+    mp_obj_deflateio_t *self = MP_OBJ_TO_PTR(o_in);
+
+    if (self->stream == MP_OBJ_NULL || !deflateio_init_read(self)) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+
+    if (self->read->eof) {
+        return 0;
+    }
+
+    self->read->decomp.dest = buf;
+    self->read->decomp.dest_limit = (uint8_t *)buf + size;
+    int st = uzlib_uncompress_chksum(&self->read->decomp);
+    if (st == UZLIB_DONE) {
+        self->read->eof = true;
+    }
+    if (st < 0) {
+        DEBUG_printf("uncompress error=" INT_FMT "\n", st);
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+    return self->read->decomp.dest - (uint8_t *)buf;
+}
+
+#if MICROPY_PY_DEFLATE_COMPRESS
+STATIC mp_uint_t deflateio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+    mp_obj_deflateio_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->stream == MP_OBJ_NULL || !deflateio_init_write(self)) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+
+    self->write->input_len += size;
+    if (self->format == DEFLATEIO_FORMAT_ZLIB) {
+        self->write->input_checksum = uzlib_adler32(buf, size, self->write->input_checksum);
+    } else if (self->format == DEFLATEIO_FORMAT_GZIP) {
+        self->write->input_checksum = uzlib_crc32(buf, size, self->write->input_checksum);
+    }
+
+    uzlib_lz77_compress(&self->write->lz77, buf, size);
+    return size;
+}
+
+static inline void put_le32(char *buf, uint32_t value) {
+    buf[0] = value & 0xff;
+    buf[1] = value >> 8 & 0xff;
+    buf[2] = value >> 16 & 0xff;
+    buf[3] = value >> 24 & 0xff;
+}
+
+static inline void put_be32(char *buf, uint32_t value) {
+    buf[3] = value & 0xff;
+    buf[2] = value >> 8 & 0xff;
+    buf[1] = value >> 16 & 0xff;
+    buf[0] = value >> 24 & 0xff;
+}
+#endif
+
+STATIC mp_uint_t deflateio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    if (request == MP_STREAM_CLOSE) {
+        mp_obj_deflateio_t *self = MP_OBJ_TO_PTR(self_in);
+
+        mp_uint_t ret = 0;
+
+        if (self->stream != MP_OBJ_NULL) {
+            #if MICROPY_PY_DEFLATE_COMPRESS
+            if (self->write) {
+                uzlib_finish_block(&self->write->lz77);
+
+                const mp_stream_p_t *stream = mp_get_stream(self->stream);
+
+                // Write footer if needed.
+                if (self->format == DEFLATEIO_FORMAT_ZLIB || self->format == DEFLATEIO_FORMAT_GZIP) {
+                    char footer[8];
+                    size_t footer_len;
+                    if (self->format == DEFLATEIO_FORMAT_ZLIB) {
+                        put_be32(&footer[0], self->write->input_checksum);
+                        footer_len = 4;
+                    } else { // DEFLATEIO_FORMAT_GZIP
+                        put_le32(&footer[0], ~self->write->input_checksum);
+                        put_le32(&footer[4], self->write->input_len);
+                        footer_len = 8;
+                    }
+                    if (stream->write(self->stream, footer, footer_len, errcode) == MP_STREAM_ERROR) {
+                        ret = MP_STREAM_ERROR;
+                    }
+                }
+            }
+            #endif
+
+            // Only close the stream if required. e.g. when using io.BytesIO
+            // it needs to stay open so that getvalue() can be called.
+            if (self->close) {
+                mp_stream_close(self->stream);
+            }
+
+            // Either way, free the reference to the stream.
+            self->stream = MP_OBJ_NULL;
+        }
+
+        return ret;
+    } else {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+}
+
+STATIC const mp_stream_p_t deflateio_stream_p = {
+    .read = deflateio_read,
+    #if MICROPY_PY_DEFLATE_COMPRESS
+    .write = deflateio_write,
+    #endif
+    .ioctl = deflateio_ioctl,
+};
+
+#if !MICROPY_ENABLE_DYNRUNTIME
+STATIC const mp_rom_map_elem_t deflateio_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) },
+    #if MICROPY_PY_DEFLATE_COMPRESS
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_close), 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(&mp_stream___exit___obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(deflateio_locals_dict, deflateio_locals_dict_table);
+
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    deflateio_type,
+    MP_QSTR_DeflateIO,
+    MP_TYPE_FLAG_NONE,
+    make_new, deflateio_make_new,
+    protocol, &deflateio_stream_p,
+    locals_dict, &deflateio_locals_dict
+    );
+
+STATIC const mp_rom_map_elem_t mp_module_deflate_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_deflate) },
+    { MP_ROM_QSTR(MP_QSTR_DeflateIO), MP_ROM_PTR(&deflateio_type) },
+    { MP_ROM_QSTR(MP_QSTR_AUTO), MP_ROM_INT(DEFLATEIO_FORMAT_AUTO) },
+    { MP_ROM_QSTR(MP_QSTR_RAW), MP_ROM_INT(DEFLATEIO_FORMAT_RAW) },
+    { MP_ROM_QSTR(MP_QSTR_ZLIB), MP_ROM_INT(DEFLATEIO_FORMAT_ZLIB) },
+    { MP_ROM_QSTR(MP_QSTR_GZIP), MP_ROM_INT(DEFLATEIO_FORMAT_GZIP) },
+};
+STATIC MP_DEFINE_CONST_DICT(mp_module_deflate_globals, mp_module_deflate_globals_table);
+
+const mp_obj_module_t mp_module_deflate = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&mp_module_deflate_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_deflate, mp_module_deflate);
+#endif // !MICROPY_ENABLE_DYNRUNTIME
+
+// Source files #include'd here to make sure they're compiled in
+// only if the module is enabled.
+
+#include "lib/uzlib/tinflate.c"
+#include "lib/uzlib/header.c"
+#include "lib/uzlib/adler32.c"
+#include "lib/uzlib/crc32.c"
+
+#if MICROPY_PY_DEFLATE_COMPRESS
+#include "lib/uzlib/lz77.c"
+#endif
+
+#endif // MICROPY_PY_DEFLATE
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index dbceabb9d86a6..b6b412f178f3e 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -110,6 +110,7 @@
 #define MICROPY_PY_THREAD_GIL                       (1)
 #define MICROPY_PY_BINASCII                         (1)
 #define MICROPY_PY_UCTYPES                          (0)
+#define MICROPY_PY_DEFLATE                          (0)
 #define MICROPY_PY_JSON                             (1)
 #define MICROPY_PY_RE                               (1)
 #define MICROPY_PY_HEAPQ                            (0)
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index d186f70b7eb33..4341fba58f366 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -40,6 +40,7 @@
 #define MICROPY_PY_BINASCII         (1)
 #define MICROPY_PY_RANDOM           (1)
 #define MICROPY_PY_UCTYPES          (1)
+#define MICROPY_PY_DEFLATE          (1)
 #define MICROPY_PY_JSON             (1)
 #define MICROPY_PY_OS               (1)
 #define MICROPY_PY_RE               (1)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 827e952b00de3..c983d7e6d669c 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -91,6 +91,7 @@
 #define MICROPY_PY_UCTYPES                  (1)
 #define MICROPY_PY_HEAPQ                    (1)
 #define MICROPY_PY_RANDOM                   (1)
+#define MICROPY_PY_DEFLATE                  (1)
 #define MICROPY_PY_ASYNCIO                  (1)
 #define MICROPY_PY_MACHINE_RTC              (1)
 #ifndef MICROPY_PY_MACHINE_ADC
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
index 0093b2df39bb9..62d104a5462be 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
@@ -10,6 +10,7 @@
 #define MICROPY_HW_HAS_FLASH        (0) // QSPI extflash not mounted
 
 #define MICROPY_PY_ASYNCIO          (0)
+#define MICROPY_PY_DEFLATE          (0)
 #define MICROPY_PY_BINASCII         (0)
 #define MICROPY_PY_HASHLIB          (0)
 #define MICROPY_PY_JSON             (0)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 0658838075f69..de209423dd091 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -144,6 +144,8 @@
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
 #define MICROPY_PY_ERRNO            (1)
 #define MICROPY_PY_UCTYPES          (1)
+#define MICROPY_PY_DEFLATE          (1)
+#define MICROPY_PY_DEFLATE_COMPRESS (1)
 #define MICROPY_PY_JSON             (1)
 #define MICROPY_PY_RE               (1)
 #define MICROPY_PY_HEAPQ            (1)
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index 6d438f3f0db0c..53c4fdddfd65f 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -10,6 +10,7 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\modasyncio.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modbinascii.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\moddeflate.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 122d0a70f2a77..e6f1531ce1bf3 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1555,6 +1555,16 @@ typedef double mp_float_t;
 #define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1)
 #endif
 
+// Whether to provide "deflate" module (decompression-only by default)
+#ifndef MICROPY_PY_DEFLATE
+#define MICROPY_PY_DEFLATE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
+// Whether to provide compression support in "deflate" module
+#ifndef MICROPY_PY_DEFLATE_COMPRESS
+#define MICROPY_PY_DEFLATE_COMPRESS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_FULL_FEATURES)
+#endif
+
 #ifndef MICROPY_PY_JSON
 #define MICROPY_PY_JSON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
@@ -1629,7 +1639,7 @@ typedef double mp_float_t;
 #define MICROPY_PY_BINASCII (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Depends on MICROPY_PY_ZLIB
+// Depends on MICROPY_PY_DEFLATE
 #ifndef MICROPY_PY_BINASCII_CRC32
 #define MICROPY_PY_BINASCII_CRC32 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 9c7660de6dc6e..352bf39630ac3 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -53,12 +53,13 @@ port
 builtins        micropython     _asyncio        _thread
 array           binascii        btree           cexample
 cmath           collections     cppexample      cryptolib
-errno           example_package                 ffi
-framebuf        gc              hashlib         heapq
-io              json            machine         math
-os              random          re              select
-socket          ssl             struct          sys
-termios         time            uctypes         websocket
+deflate         errno           example_package
+ffi             framebuf        gc              hashlib
+heapq           io              json            machine
+math            os              random          re
+select          socket          ssl             struct
+sys             termios         time            uctypes
+websocket
 me
 
 micropython     machine         math

From 8b315ef0d82a31991def597906f7f24bd39c6e23 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Jun 2023 15:52:03 +1000
Subject: [PATCH 0154/3129] tests/extmod: Add deflate.DeflateIO tests.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/extmod/deflate_compress.py         | 148 +++++++++++++++++++
 tests/extmod/deflate_compress.py.exp     |  41 ++++++
 tests/extmod/deflate_decompress.py       | 174 +++++++++++++++++++++++
 tests/extmod/deflate_decompress.py.exp   |  80 +++++++++++
 tests/extmod/deflate_stream_error.py     |  89 ++++++++++++
 tests/extmod/deflate_stream_error.py.exp |  25 ++++
 6 files changed, 557 insertions(+)
 create mode 100644 tests/extmod/deflate_compress.py
 create mode 100644 tests/extmod/deflate_compress.py.exp
 create mode 100644 tests/extmod/deflate_decompress.py
 create mode 100644 tests/extmod/deflate_decompress.py.exp
 create mode 100644 tests/extmod/deflate_stream_error.py
 create mode 100644 tests/extmod/deflate_stream_error.py.exp

diff --git a/tests/extmod/deflate_compress.py b/tests/extmod/deflate_compress.py
new file mode 100644
index 0000000000000..612af663e4fd7
--- /dev/null
+++ b/tests/extmod/deflate_compress.py
@@ -0,0 +1,148 @@
+try:
+    # Check if deflate is available.
+    import deflate
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Check if compression is enabled.
+if not hasattr(deflate.DeflateIO, "write"):
+    print("SKIP")
+    raise SystemExit
+
+# Simple compression & decompression.
+b = io.BytesIO()
+g = deflate.DeflateIO(b, deflate.RAW)
+data = b"micropython"
+N = 10
+for i in range(N):
+    g.write(data)
+g.close()
+result_raw = b.getvalue()
+print(len(result_raw) < len(data) * N)
+b = io.BytesIO(result_raw)
+g = deflate.DeflateIO(b, deflate.RAW)
+print(g.read())
+
+# Same, but using a context manager.
+b = io.BytesIO()
+with deflate.DeflateIO(b, deflate.RAW) as g:
+    for i in range(N):
+        g.write(data)
+result_raw = b.getvalue()
+print(len(result_raw) < len(data) * N)
+b = io.BytesIO(result_raw)
+with deflate.DeflateIO(b, deflate.RAW) as g:
+    print(g.read())
+
+# Writing to a closed underlying stream.
+b = io.BytesIO()
+g = deflate.DeflateIO(b, deflate.RAW)
+g.write(b"micropython")
+b.close()
+try:
+    g.write(b"micropython")
+except ValueError:
+    print("ValueError")
+
+# Writing to a closed DeflateIO.
+b = io.BytesIO()
+g = deflate.DeflateIO(b, deflate.RAW)
+g.write(b"micropython")
+g.close()
+try:
+    g.write(b"micropython")
+except OSError:
+    print("OSError")
+
+
+def decompress(data, *args):
+    buf = io.BytesIO(data)
+    with deflate.DeflateIO(buf, *args) as g:
+        return g.read()
+
+
+def compress(data, *args):
+    b = io.BytesIO()
+    with deflate.DeflateIO(b, *args) as g:
+        g.write(data)
+    return b.getvalue()
+
+
+def compress_error(data, *args):
+    try:
+        compress(data, *args)
+    except OSError:
+        print("OSError")
+    except ValueError:
+        print("ValueError")
+
+
+# More test patterns.
+PATTERNS_RAW = (
+    (b"0", b"3\x00\x00"),
+    (b"a", b"K\x04\x00"),
+    (b"0" * 100, b"3\xa0\x03\x00\x00"),
+    (
+        bytes(range(64)),
+        b"c`dbfaec\xe7\xe0\xe4\xe2\xe6\xe1\xe5\xe3\x17\x10\x14\x12\x16\x11\x15\x13\x97\x90\x94\x92\x96\x91\x95\x93WPTRVQUS\xd7\xd0\xd4\xd2\xd6\xd1\xd5\xd370426153\xb7\xb0\xb4\xb2\xb6\xb1\xb5\xb3\x07\x00",
+    ),
+)
+for unpacked, packed in PATTERNS_RAW:
+    print(compress(unpacked) == packed)
+    print(compress(unpacked, deflate.RAW) == packed)
+
+# Verify header and checksum format.
+unpacked = b"hello"
+packed = b"\xcbH\xcd\xc9\xc9\x07\x00"
+
+
+def check_header(n, a, b):
+    if a == b:
+        print(n)
+    else:
+        print(n, a, b)
+
+
+check_header("RAW", compress(unpacked, deflate.RAW), packed)
+check_header(
+    "ZLIB(9)", compress(unpacked, deflate.ZLIB, 9), b"\x18\x95" + packed + b"\x06,\x02\x15"
+)
+check_header(
+    "ZLIB(15)", compress(unpacked, deflate.ZLIB, 15), b"\x78\x9c" + packed + b"\x06,\x02\x15"
+)
+check_header(
+    "GZIP",
+    compress(unpacked, deflate.GZIP, 9),
+    b"\x1f\x8b\x08\x00\x00\x00\x00\x00\x04\x03" + packed + b"\x86\xa6\x106\x05\x00\x00\x00",
+)
+
+# Valid wbits values.
+compress_error(unpacked, deflate.RAW, -1)
+print(len(compress(unpacked, deflate.RAW, 0)))
+compress_error(unpacked, deflate.RAW, 1)
+compress_error(unpacked, deflate.RAW, 4)
+for i in range(5, 16):
+    print(len(compress(unpacked, deflate.RAW, i)))
+compress_error(unpacked, deflate.RAW, 16)
+
+# Invalid values for format.
+compress_error(unpacked, -1)
+compress_error(unpacked, 5)
+
+# Fill buf with a predictable pseudorandom sequence.
+buf = bytearray(1024)
+lfsr = 1 << 15 | 1
+for i in range(len(buf)):
+    bit = (lfsr ^ (lfsr >> 1) ^ (lfsr >> 3) ^ (lfsr >> 12)) & 1
+    lfsr = (lfsr >> 1) | (bit << 15)
+    buf[i] = lfsr & 0xFF
+
+# Verify that compression improves as the window size increases.
+prev_len = len(buf)
+for wbits in range(5, 10):
+    result = compress(buf, deflate.RAW, wbits)
+    next_len = len(result)
+    print(next_len < prev_len and decompress(result, deflate.RAW, wbits) == buf)
+    prev_len = next_len
diff --git a/tests/extmod/deflate_compress.py.exp b/tests/extmod/deflate_compress.py.exp
new file mode 100644
index 0000000000000..5da70f491bdef
--- /dev/null
+++ b/tests/extmod/deflate_compress.py.exp
@@ -0,0 +1,41 @@
+True
+b'micropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropython'
+True
+b'micropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropythonmicropython'
+ValueError
+OSError
+True
+True
+True
+True
+True
+True
+True
+True
+RAW
+ZLIB(9)
+ZLIB(15)
+GZIP
+ValueError
+7
+ValueError
+ValueError
+7
+7
+7
+7
+7
+7
+7
+7
+7
+7
+7
+ValueError
+ValueError
+ValueError
+False
+True
+True
+True
+True
diff --git a/tests/extmod/deflate_decompress.py b/tests/extmod/deflate_decompress.py
new file mode 100644
index 0000000000000..29d3ec2d71105
--- /dev/null
+++ b/tests/extmod/deflate_decompress.py
@@ -0,0 +1,174 @@
+try:
+    # Check if deflate is available.
+    import deflate
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# zlib.compress(b'micropython hello world hello world micropython', wbits=-9)
+data_raw = b'\xcb\xcdL.\xca/\xa8,\xc9\xc8\xcfS\xc8H\xcd\xc9\xc9W(\xcf/\xcaIAa\xe7"\xd4\x00\x00'
+# zlib.compress(b'micropython hello world hello world micropython', wbits=9)
+data_zlib = b'\x18\x95\xcb\xcdL.\xca/\xa8,\xc9\xc8\xcfS\xc8H\xcd\xc9\xc9W(\xcf/\xcaIAa\xe7"\xd4\x00\x00\xbc\xfa\x12\x91'
+# zlib.compress(b'micropython hello world hello world micropython', wbits=25)
+data_gzip = b'\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03\xcb\xcdL.\xca/\xa8,\xc9\xc8\xcfS\xc8H\xcd\xc9\xc9W(\xcf/\xcaIAa\xe7"\xd4\x00\x00"\xeb\xc4\x98/\x00\x00\x00'
+
+# compress(b'hello' + bytearray(300) + b'hello', format=deflate.RAW, 5)
+data_wbits_5 = b"\xcbH\xcd\xc9\xc9g\x18\xe9\x00\x08\x88\x95\xcfH\xcd\xc9\xc9\x07\x00"
+# compress(b'hello' + bytearray(300) + b'hello', format=deflate.RAW, 6)
+data_wbits_6 = b"\xcbH\xcd\xc9\xc9g\x18\xe9\x00\x08\x88\xd5\x9f\x91\x9a\x93\x93\x0f\x00"
+# compress(b'hello' + bytearray(300) + b'hello', format=deflate.RAW, 8)
+data_wbits_8 = b"\xcbH\xcd\xc9\xc9g\x18\xe9\x00\x08\x88\xf5\x7fFjNN>\x00"
+# compress(b'hello' + bytearray(2000) + b'hello', format=deflate.RAW, 10)
+data_wbits_10 = b"\xcbH\xcd\xc9\xc9g\x18\xe9\x00\x08Fz\x18\x00\xc3`\xa4'\x03`2\x18\xe99\x01\x98\x13Fz\xfe\x07\xe6\xff\x91\x9e\xff\x81\xf9\x7f\xa4\xe7\x7f`\xfe\x1f\xba\xf9?#5''\x1f\x00"
+
+
+def decompress(data, *args):
+    buf = io.BytesIO(data)
+    with deflate.DeflateIO(buf, *args) as g:
+        return g.read()
+
+
+def decompress_error(data, *args):
+    try:
+        decompress(data, *args)
+    except OSError:
+        print("OSError")
+    except EOFError:
+        print("EOFError")
+    except ValueError:
+        print("ValueError")
+
+
+# Basic handling of format and detection.
+print(decompress(data_raw, deflate.RAW))
+print(decompress(data_zlib, deflate.ZLIB))
+print(decompress(data_gzip, deflate.GZIP))
+print(decompress(data_zlib))  # detect zlib/gzip.
+print(decompress(data_gzip))  # detect zlib/gzip.
+
+decompress_error(data_raw)  # cannot detect zlib/gzip from raw stream
+decompress_error(data_raw, deflate.ZLIB)
+decompress_error(data_raw, deflate.GZIP)
+decompress_error(data_zlib, deflate.RAW)
+decompress_error(data_zlib, deflate.GZIP)
+decompress_error(data_gzip, deflate.RAW)
+decompress_error(data_gzip, deflate.ZLIB)
+
+# Invalid data stream.
+decompress_error(b"abcef", deflate.RAW)
+
+# Invalid block type. final-block, block-type=3.
+decompress_error(b"\x07", deflate.RAW)
+
+# Truncated stream.
+decompress_error(data_raw[:10], deflate.RAW)
+
+# Partial reads.
+buf = io.BytesIO(data_zlib)
+with deflate.DeflateIO(buf) as g:
+    print(buf.seek(0, 1))  # verify stream is not read until first read of the DeflateIO stream.
+    print(g.read(1))
+    print(buf.seek(0, 1))  # verify that only the minimal amount is read from the source
+    print(g.read(1))
+    print(buf.seek(0, 1))
+    print(g.read(2))
+    print(buf.seek(0, 1))
+    print(g.read())
+    print(buf.seek(0, 1))
+    print(g.read(1))
+    print(buf.seek(0, 1))
+    print(g.read())
+
+# Invalid zlib checksum (+ length for gzip). Note: only checksum errors are
+# currently detected, see the end of uzlib_uncompress_chksum().
+decompress_error(data_zlib[:-4] + b"\x00\x00\x00\x00")
+decompress_error(data_gzip[:-8] + b"\x00\x00\x00\x00\x00\x00\x00\x00")
+decompress_error(data_zlib[:-4] + b"\x00\x00\x00\x00", deflate.ZLIB)
+decompress_error(data_gzip[:-8] + b"\x00\x00\x00\x00\x00\x00\x00\x00", deflate.GZIP)
+
+# Reading from a closed underlying stream.
+b = io.BytesIO(data_raw)
+g = deflate.DeflateIO(b, deflate.RAW)
+g.read(4)
+b.close()
+try:
+    g.read(4)
+except ValueError:
+    print("ValueError")
+
+# Reading from a closed DeflateIO.
+b = io.BytesIO(data_raw)
+g = deflate.DeflateIO(b, deflate.RAW)
+g.read(4)
+g.close()
+try:
+    g.read(4)
+except OSError:
+    print("OSError")
+
+# Gzip header with extra flags (FCOMMENT FNAME FEXTRA FHCRC) enabled.
+data_gzip_header_extra = b"\x1f\x8b\x08\x1e}\x9a\x9bd\x02\x00\x00\x00\x00\x00\x00\xff\xcb\xcdL.\xca/\xa8,\xc9\xc8\xcf\x03\x00\xf2KF>\x0b\x00\x00\x00"
+print(decompress(data_gzip_header_extra))
+
+# Test patterns.
+PATTERNS_ZLIB = [
+    # Packed results produced by CPy's zlib.compress()
+    (b"0", b"x\x9c3\x00\x00\x001\x001"),
+    (b"a", b"x\x9cK\x04\x00\x00b\x00b"),
+    (b"0" * 100, b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc1"),
+    (
+        bytes(range(64)),
+        b"x\x9cc`dbfaec\xe7\xe0\xe4\xe2\xe6\xe1\xe5\xe3\x17\x10\x14\x12\x16\x11\x15\x13\x97\x90\x94\x92\x96\x91\x95\x93WPTRVQUS\xd7\xd0\xd4\xd2\xd6\xd1\xd5\xd370426153\xb7\xb0\xb4\xb2\xb6\xb1\xb5\xb3\x07\x00\xaa\xe0\x07\xe1",
+    ),
+    (b"hello", b"x\x01\x01\x05\x00\xfa\xffhello\x06,\x02\x15"),  # compression level 0
+    # adaptive/dynamic huffman tree
+    (
+        b"13371813150|13764518736|12345678901",
+        b"x\x9c\x05\xc1\x81\x01\x000\x04\x04\xb1\x95\\\x1f\xcfn\x86o\x82d\x06Qq\xc8\x9d\xc5X}<e\xb5g\x83\x0f\x89X\x07\xab",
+    ),
+    # dynamic Huffman tree with "case 17" (repeat code for 3-10 times)
+    (
+        b">I}\x00\x951D>I}\x00\x951D>I}\x00\x951D>I}\x00\x951D",
+        b"x\x9c\x05\xc11\x01\x00\x00\x00\x010\x95\x14py\x84\x12C_\x9bR\x8cV\x8a\xd1J1Z)F\x1fw`\x089",
+    ),
+]
+for unpacked, packed in PATTERNS_ZLIB:
+    print(decompress(packed) == unpacked)
+    print(decompress(packed, deflate.ZLIB) == unpacked)
+
+# Older version's of CPython's zlib module still included the checksum and length (as if it were a zlib/gzip stream).
+# Make sure there're no problem decompressing this.
+data_raw_with_footer = data_raw + b"\x00\x00\x00\x00\x00\x00\x00\x00"
+print(decompress(data_raw_with_footer, deflate.RAW))
+
+# Valid wbits values.
+decompress_error(data_wbits_5, deflate.RAW, -1)
+print(len(decompress(data_wbits_5, deflate.RAW, 0)))
+decompress_error(data_wbits_5, deflate.RAW, 1)
+decompress_error(data_wbits_5, deflate.RAW, 4)
+for i in range(5, 16):
+    print(len(decompress(data_wbits_5, deflate.RAW, i)))
+decompress_error(data_wbits_5, deflate.RAW, 16)
+
+# Invalid values for format.
+decompress_error(data_raw, -1)
+decompress_error(data_raw, 5)
+
+# Data that requires a higher wbits value.
+decompress_error(data_wbits_6, deflate.RAW, 5)
+print(len(decompress(data_wbits_6, deflate.RAW, 6)))
+print(len(decompress(data_wbits_6, deflate.RAW, 7)))
+decompress_error(data_wbits_8, deflate.RAW, 7)
+print(len(decompress(data_wbits_8, deflate.RAW, 8)))
+print(len(decompress(data_wbits_8, deflate.RAW, 9)))
+decompress_error(data_wbits_10, deflate.RAW)
+decompress_error(data_wbits_10, deflate.RAW, 9)
+print(len(decompress(data_wbits_10, deflate.RAW, 10)))
+
+# zlib header sets the size, so works with wbits unset or wbits >= 10.
+data_wbits_10_zlib = b"(\x91\xcbH\xcd\xc9\xc9g\x18\xe9\x00\x08Fz\x18\x00\xc3`\xa4'\x03`2\x18\xe99\x01\x98\x13Fz\xfe\x07\xe6\xff\x91\x9e\xff\x81\xf9\x7f\xa4\xe7\x7f`\xfe\x1f\xba\xf9?#5''\x1f\x00[\xbc\x04)"
+print(len(decompress(data_wbits_10_zlib, deflate.ZLIB)))
+decompress_error(data_wbits_10_zlib, deflate.ZLIB, 9)
+print(len(decompress(data_wbits_10_zlib, deflate.ZLIB, 10)))
+print(len(decompress(data_wbits_10_zlib)))
diff --git a/tests/extmod/deflate_decompress.py.exp b/tests/extmod/deflate_decompress.py.exp
new file mode 100644
index 0000000000000..381f2b0685908
--- /dev/null
+++ b/tests/extmod/deflate_decompress.py.exp
@@ -0,0 +1,80 @@
+b'micropython hello world hello world micropython'
+b'micropython hello world hello world micropython'
+b'micropython hello world hello world micropython'
+b'micropython hello world hello world micropython'
+b'micropython hello world hello world micropython'
+OSError
+OSError
+OSError
+OSError
+OSError
+OSError
+OSError
+OSError
+OSError
+EOFError
+0
+b'm'
+4
+b'i'
+5
+b'cr'
+7
+b'opython hello world hello world micropython'
+36
+b''
+36
+b''
+OSError
+OSError
+OSError
+OSError
+ValueError
+OSError
+b'micropython'
+True
+True
+True
+True
+True
+True
+True
+True
+True
+True
+True
+True
+True
+True
+b'micropython hello world hello world micropython'
+ValueError
+310
+ValueError
+ValueError
+310
+310
+310
+310
+310
+310
+310
+310
+310
+310
+310
+ValueError
+ValueError
+ValueError
+OSError
+310
+310
+OSError
+310
+310
+OSError
+OSError
+2010
+2010
+OSError
+2010
+2010
diff --git a/tests/extmod/deflate_stream_error.py b/tests/extmod/deflate_stream_error.py
new file mode 100644
index 0000000000000..aee6b2803337c
--- /dev/null
+++ b/tests/extmod/deflate_stream_error.py
@@ -0,0 +1,89 @@
+# Test deflate module with stream errors.
+
+try:
+    # Check if deflate & IOBase are available.
+    import deflate, io
+
+    io.IOBase
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+# Check if compression is enabled.
+if not hasattr(deflate.DeflateIO, "write"):
+    print("SKIP")
+    raise SystemExit
+
+formats = (deflate.RAW, deflate.ZLIB, deflate.GZIP)
+
+# Test error on read when decompressing.
+
+
+class Stream(io.IOBase):
+    def readinto(self, buf):
+        print("Stream.readinto", len(buf))
+        return -1
+
+
+try:
+    deflate.DeflateIO(Stream()).read()
+except OSError as er:
+    print(repr(er))
+
+# Test error on write when compressing.
+
+
+class Stream(io.IOBase):
+    def write(self, buf):
+        print("Stream.write", buf)
+        return -1
+
+
+for format in formats:
+    try:
+        deflate.DeflateIO(Stream(), format).write("a")
+    except OSError as er:
+        print(repr(er))
+
+# Test write after close.
+
+
+class Stream(io.IOBase):
+    def write(self, buf):
+        print("Stream.write", buf)
+        return -1
+
+    def ioctl(self, cmd, arg):
+        print("Stream.ioctl", cmd, arg)
+        return 0
+
+
+try:
+    d = deflate.DeflateIO(Stream(), deflate.RAW, 0, True)
+    d.close()
+    d.write("a")
+except OSError as er:
+    print(repr(er))
+
+# Test error on write when closing.
+
+
+class Stream(io.IOBase):
+    def __init__(self):
+        self.num_writes = 0
+
+    def write(self, buf):
+        print("Stream.write", buf)
+        if self.num_writes >= 4:
+            return -1
+        self.num_writes += 1
+        return len(buf)
+
+
+for format in formats:
+    d = deflate.DeflateIO(Stream(), format)
+    d.write("a")
+    try:
+        d.close()
+    except OSError as er:
+        print(repr(er))
diff --git a/tests/extmod/deflate_stream_error.py.exp b/tests/extmod/deflate_stream_error.py.exp
new file mode 100644
index 0000000000000..4ec90d79977e0
--- /dev/null
+++ b/tests/extmod/deflate_stream_error.py.exp
@@ -0,0 +1,25 @@
+Stream.readinto 1
+OSError(1,)
+Stream.write bytearray(b'K')
+OSError(1,)
+Stream.write bytearray(b'\x18\x95')
+OSError(22,)
+Stream.write bytearray(b'\x1f\x8b\x08\x00\x00\x00\x00\x00\x04\x03')
+OSError(22,)
+Stream.ioctl 4 0
+OSError(22,)
+Stream.write bytearray(b'K')
+Stream.write bytearray(b'\x04')
+Stream.write bytearray(b'\x00')
+Stream.write bytearray(b'\x18\x95')
+Stream.write bytearray(b'K')
+Stream.write bytearray(b'\x04')
+Stream.write bytearray(b'\x00')
+Stream.write bytearray(b'\x00b\x00b')
+OSError(1,)
+Stream.write bytearray(b'\x1f\x8b\x08\x00\x00\x00\x00\x00\x04\x03')
+Stream.write bytearray(b'K')
+Stream.write bytearray(b'\x04')
+Stream.write bytearray(b'\x00')
+Stream.write bytearray(b'C\xbe\xb7\xe8\x01\x00\x00\x00')
+OSError(1,)

From b804443cb3df2ca4b71070739aa1c8f3c86464fc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 02:17:41 +1000
Subject: [PATCH 0155/3129] docs/library/deflate: Add docs for
 deflate.DeflateIO.

Also update zlib & gzip docs to describe the micropython-lib modules.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/deflate.rst | 177 +++++++++++++++++++++++++++++++++++++++
 docs/library/gzip.rst    | 106 +++++++++++++++++++++++
 docs/library/index.rst   |  12 +--
 docs/library/zlib.rst    |  90 +++++++++++++++-----
 4 files changed, 357 insertions(+), 28 deletions(-)
 create mode 100644 docs/library/deflate.rst
 create mode 100644 docs/library/gzip.rst

diff --git a/docs/library/deflate.rst b/docs/library/deflate.rst
new file mode 100644
index 0000000000000..9752af5925fc1
--- /dev/null
+++ b/docs/library/deflate.rst
@@ -0,0 +1,177 @@
+:mod:`deflate` -- deflate compression & decompression
+=====================================================
+
+.. module:: deflate
+   :synopsis: deflate compression & decompression
+
+This module allows compression and decompression of binary data with the
+`DEFLATE algorithm <https://en.wikipedia.org/wiki/DEFLATE>`_
+(commonly used in the zlib library and gzip archiver).
+
+**Availability:**
+
+* Added in MicroPython v1.21.
+
+* Decompression: Enabled via the ``MICROPY_PY_DEFLATE`` build option, on by default
+  on ports with the "extra features" level or higher (which is most boards).
+
+* Compression: Enabled via the ``MICROPY_PY_DEFLATE_COMPRESS`` build option, on
+  by default on ports with the "full features" level or higher (generally this means
+  you need to build your own firmware to enable this).
+
+Classes
+-------
+
+.. class:: DeflateIO(stream, format=AUTO, wbits=0, close=False, /)
+
+   This class can be used to wrap a *stream* which is any
+   :term:`stream-like <stream>` object such as a file, socket, or stream
+   (including :class:`io.BytesIO`). It is itself a stream and implements the
+   standard read/readinto/write/close methods.
+
+   The *stream* must be a blocking stream. Non-blocking streams are currently
+   not supported.
+
+   The *format* can be set to any of the constants defined below, and defaults
+   to ``AUTO`` which for decompressing will auto-detect gzip or zlib streams,
+   and for compressing it will generate a raw stream.
+
+   The *wbits* parameter sets the base-2 logarithm of the DEFLATE dictionary
+   window size. So for example, setting *wbits* to ``10`` sets the window size
+   to 1024 bytes. Valid values are ``5`` to ``15`` inclusive (corresponding to
+   window sizes of 32 to 32k bytes).
+
+   If *wbits* is set to ``0`` (the default), then a window size of 256 bytes
+   will be used (corresponding to *wbits* set to ``8``), except when
+   :ref:`decompressing a zlib stream <deflate_wbits_zlib>`.
+
+   See the :ref:`window size <deflate_wbits>` notes below for more information
+   about the window size, zlib, and gzip streams.
+
+   If *close* is set to ``True`` then the underlying stream will be closed
+   automatically when the :class:`deflate.DeflateIO` stream is closed. This is
+   useful if you want to return a :class:`deflate.DeflateIO` stream that wraps
+   another stream and not have the caller need to know about managing the
+   underlying stream.
+
+   If compression is enabled, a given :class:`deflate.DeflateIO` instance
+   supports both reading and writing. For example, a bidirectional stream like
+   a socket can be wrapped, which allows for compression/decompression in both
+   directions.
+
+Constants
+---------
+
+.. data:: deflate.AUTO
+          deflate.RAW
+          deflate.ZLIB
+          deflate.GZIP
+
+    Supported values for the *format* parameter.
+
+Examples
+--------
+
+A typical use case for :class:`deflate.DeflateIO` is to read or write a compressed
+file from storage:
+
+.. code:: python
+
+   import deflate
+
+   # Writing a zlib-compressed stream (uses the default window size of 256 bytes).
+   with open("data.gz", "wb") as f:
+       with deflate.DeflateIO(f, deflate.ZLIB) as d:
+           # Use d.write(...) etc
+
+   # Reading a zlib-compressed stream (auto-detect window size).
+   with open("data.z", "rb") as f:
+       with deflate.DeflateIO(f, deflate.ZLIB) as d:
+           # Use d.read(), d.readinto(), etc.
+
+Because :class:`deflate.DeflateIO` is a stream, it can be used for example
+with :meth:`json.dump` and :meth:`json.load` (and any other places streams can
+be used):
+
+.. code:: python
+
+   import deflate, json
+
+   # Write a dictionary as JSON in gzip format, with a
+   # small (64 byte) window size.
+   config = { ... }
+   with open("config.gz", "wb") as f:
+       with deflate.DeflateIO(f, deflate.GZIP, 6) as f:
+           json.dump(config, f)
+
+   # Read back that dictionary.
+   with open("config.gz", "rb") as f:
+       with deflate.DeflateIO(f, deflate.GZIP, 6) as f:
+           config = json.load(f)
+
+If your source data is not in a stream format, you can use :class:`io.BytesIO`
+to turn it into a stream suitable for use with :class:`deflate.DeflateIO`:
+
+.. code:: python
+
+   import deflate, io
+
+   # Decompress a bytes/bytearray value.
+   compressed_data = get_data_z()
+   with deflate.DeflateIO(io.BytesIO(compressed_data), deflate.ZLIB) as d:
+       decompressed_data = d.read()
+
+   # Compress a bytes/bytearray value.
+   uncompressed_data = get_data()
+   stream = io.BytesIO()
+   with deflate.DeflateIO(stream, deflate.ZLIB) as d:
+       d.write(uncompressed_data)
+   compressed_data = stream.getvalue()
+
+.. _deflate_wbits:
+
+Deflate window size
+-------------------
+
+The window size limits how far back in the stream the (de)compressor can
+reference. Increasing the window size will improve compression, but will
+require more memory.
+
+However, just because a given window size is used for compression, this does not
+mean that the stream will require the same size window for decompression, as
+the stream may not reference data as far back as the window allows (for example,
+if the length of the input is smaller than the window size).
+
+If the decompressor uses a smaller window size than necessary for the input data
+stream, it will fail mid-way through decompression with :exc:`OSError`.
+
+.. _deflate_wbits_zlib:
+
+The zlib format includes a header which specifies the window size used to
+compress the data (which due to the above, may be larger than the size required
+for the decompressor).
+
+If this header value is lower than the specified *wbits* value, then the header
+value will be used instead in order to reduce the memory allocation size. If
+the *wbits* parameter is zero (the default), then the header value will only be
+used if it is less than the maximum value of ``15`` (which is default value
+used by most compressors [#f1]_).
+
+In other words, if the source zlib stream has been compressed with a custom window
+size (i.e. less than ``15``), then using the default *wbits* parameter of zero
+will decompress any such stream.
+
+The gzip file format does not include the window size in the header.
+Additionally, most compressor libraries (including CPython's implementation
+of :class:`gzip.GzipFile`) will default to the maximum possible window size.
+This makes it difficult to decompress most gzip streams on MicroPython unless
+your board has a lot of free RAM.
+
+If you control the source of the compressed data, then prefer to use the zlib
+format, with a window size that is suitable for your target device.
+
+.. rubric:: Footnotes
+
+.. [#f1] The assumption here is that if the header value is the default used by
+   most compressors, then nothing is known about the likely required window
+   size and we should ignore it.
diff --git a/docs/library/gzip.rst b/docs/library/gzip.rst
new file mode 100644
index 0000000000000..f36f896db3a11
--- /dev/null
+++ b/docs/library/gzip.rst
@@ -0,0 +1,106 @@
+:mod:`gzip` -- gzip compression & decompression
+===============================================
+
+.. module:: gzip
+   :synopsis: gzip compression & decompression
+
+|see_cpython_module| :mod:`python:gzip`.
+
+This module allows compression and decompression of binary data with the
+`DEFLATE algorithm <https://en.wikipedia.org/wiki/DEFLATE>`_ used by the gzip
+file format.
+
+.. note:: Prefer to use :class:`deflate.DeflateIO` instead of the functions in this
+   module as it provides a streaming interface to compression and decompression
+   which is convenient and more memory efficient when working with reading or
+   writing compressed data to a file, socket, or stream.
+
+**Availability:**
+
+* This module is **not present by default** in official MicroPython firmware
+  releases as it duplicates functionality available in the :mod:`deflate
+  <deflate>` module.
+
+* A copy of this module can be installed (or frozen)
+  from :term:`micropython-lib` (`source <https://github.com/micropython/micropython-lib/blob/master/python-stdlib/gzip/gzip.py>`_).
+  See :ref:`packages` for more information. This documentation describes that module.
+
+* Compression support will only be available if compression support is enabled
+  in the built-in :mod:`deflate <deflate>` module.
+
+Functions
+---------
+
+.. function:: open(filename, mode, /)
+
+   Wrapper around built-in :func:`open` returning a GzipFile instance.
+
+.. function:: decompress(data, /)
+
+   Decompresses *data* into a bytes object.
+
+.. function:: compress(data, /)
+
+   Compresses *data* into a bytes object.
+
+Classes
+-------
+
+.. class:: GzipFile(*, fileobj, mode)
+
+   This class can be used to wrap a *fileobj* which is any
+   :term:`stream-like <stream>` object such as a file, socket, or stream
+   (including :class:`io.BytesIO`). It is itself a stream and implements the
+   standard read/readinto/write/close methods.
+
+   When the *mode* argument is ``"rb"``, reads from the GzipFile instance will
+   decompress the data in the underlying stream and return decompressed data.
+
+   If compression support is enabled then the *mode* argument can be set to
+   ``"wb"``, and writes to the GzipFile instance will be compressed and written
+   to the underlying stream.
+
+   By default the GzipFile class will read and write data using the gzip file
+   format, including a header and footer with checksum and a window size of 512
+   bytes.
+
+   The **file**, **compresslevel**, and **mtime** arguments are not
+   supported. **fileobj** and **mode** must always be specified as keyword
+   arguments.
+
+Examples
+--------
+
+A typical use case for :class:`gzip.GzipFile` is to read or write a compressed
+file from storage:
+
+.. code:: python
+
+   import gzip
+
+   # Reading:
+   with open("data.gz", "rb") as f:
+       with gzip.GzipFile(fileobj=f, mode="rb") as g:
+           # Use g.read(), g.readinto(), etc.
+
+    # Same, but using gzip.open:
+   with gzip.open("data.gz", "rb") as f:
+        # Use f.read(), f.readinto(), etc.
+
+   # Writing:
+   with open("data.gz", "wb") as f:
+       with gzip.GzipFile(fileobj=f, mode="wb") as g:
+           # Use g.write(...) etc
+
+   # Same, but using gzip.open:
+   with gzip.open("data.gz", "wb") as f:
+       # Use f.write(...) etc
+
+   # Write a dictionary as JSON in gzip format, with a
+   # small (64 byte) window size.
+   config = { ... }
+   with gzip.open("config.gz", "wb") as f:
+       json.dump(config, f)
+
+For guidance on working with gzip sources and choosing the window size see the
+note at the :ref:`end of the deflate documentation <deflate_wbits>`.
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 69bc81ade5e14..ae5d3e7d71175 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -64,6 +64,7 @@ library.
    collections.rst
    errno.rst
    gc.rst
+   gzip.rst
    hashlib.rst
    heapq.rst
    io.rst
@@ -95,6 +96,7 @@ the following libraries.
    bluetooth.rst
    btree.rst
    cryptolib.rst
+   deflate.rst
    framebuf.rst
    machine.rst
    micropython.rst
@@ -194,11 +196,11 @@ Extending built-in libraries from Python
 A subset of the built-in modules are able to be extended by Python code by
 providing a module of the same name in the filesystem. This extensibility
 applies to the following Python standard library modules which are built-in to
-the firmware: ``array``, ``binascii``, ``collections``, ``errno``, ``hashlib``,
-``heapq``, ``io``, ``json``, ``os``, ``platform``, ``random``, ``re``,
-``select``, ``socket``, ``ssl``, ``struct``, ``time`` ``zlib``, as well as the
-MicroPython-specific ``machine`` module. All other built-in modules cannot be
-extended from the filesystem.
+the firmware: ``array``, ``binascii``, ``collections``, ``errno``, ``gzip``,
+``hashlib``, ``heapq``, ``io``, ``json``, ``os``, ``platform``, ``random``,
+``re``, ``select``, ``socket``, ``ssl``, ``struct``, ``time`` ``zlib``, as well
+as the MicroPython-specific ``machine`` module. All other built-in modules
+cannot be extended from the filesystem.
 
 This allows the user to provide an extended implementation of a built-in library
 (perhaps to provide additional CPython compatibility or missing functionality).
diff --git a/docs/library/zlib.rst b/docs/library/zlib.rst
index 96d6c245232ba..54310b72f2a3d 100644
--- a/docs/library/zlib.rst
+++ b/docs/library/zlib.rst
@@ -1,38 +1,82 @@
-:mod:`zlib` -- zlib decompression
-=================================
+:mod:`zlib` -- zlib compression & decompression
+===============================================
 
 .. module:: zlib
-   :synopsis: zlib decompression
+   :synopsis: zlib compression & decompression
 
 |see_cpython_module| :mod:`python:zlib`.
 
-This module allows to decompress binary data compressed with
+This module allows compression and decompression of binary data with the
 `DEFLATE algorithm <https://en.wikipedia.org/wiki/DEFLATE>`_
-(commonly used in zlib library and gzip archiver). Compression
-is not yet implemented.
+(commonly used in the zlib library and gzip archiver).
+
+.. note:: Prefer to use :class:`deflate.DeflateIO` instead of the functions in this
+   module as it provides a streaming interface to compression and decompression
+   which is convenient and more memory efficient when working with reading or
+   writing compressed data to a file, socket, or stream.
+
+**Availability:**
+
+* From MicroPython v1.21 onwards, this module may not be present by default on
+  all MicroPython firmware as it duplicates functionality available in
+  the :mod:`deflate <deflate>` module.
+
+* A copy of this module can be installed (or frozen)
+  from :term:`micropython-lib` (`source <https://github.com/micropython/micropython-lib/blob/master/python-stdlib/zlib/zlib.py>`_).
+  See :ref:`packages` for more information. This documentation describes that module.
+
+* Requires the built-in :mod:`deflate <deflate>` module (available since MicroPython v1.21)
+
+* Compression support will only be available if compression support is enabled
+  in the built-in :mod:`deflate <deflate>` module.
 
 Functions
 ---------
 
-.. function:: decompress(data, wbits=0, bufsize=0, /)
+.. function:: decompress(data, wbits=15, /)
+
+   Decompresses *data* into a bytes object.
+
+   The *wbits* parameter works the same way as for :meth:`zlib.compress`
+   with the following additional valid values:
+
+   * ``0``: Automatically determine the window size from the zlib header
+     (*data* must be in zlib format).
+   * ``35`` to ``47``: Auto-detect either the zlib or gzip format.
+
+   As for :meth:`zlib.compress`, see the :mod:`CPython documentation for zlib <python:zlib>`
+   for more information about the *wbits* parameter. As for :meth:`zlib.compress`,
+   MicroPython also supports smaller window sizes than CPython. See more
+   :ref:`MicroPython-specific details <deflate_wbits>` in the
+   :mod:`deflate <deflate>` module documentation.
+
+   If the data to be decompressed requires a larger window size, it will
+   fail during decompression.
+
+.. function:: compress(data, wbits=15, /)
 
-   Return decompressed *data* as bytes. *wbits* is DEFLATE dictionary window
-   size used during compression (8-15, the dictionary size is power of 2 of
-   that value). Additionally, if value is positive, *data* is assumed to be
-   zlib stream (with zlib header). Otherwise, if it's negative, it's assumed
-   to be raw DEFLATE stream. *bufsize* parameter is for compatibility with
-   CPython and is ignored.
+   Compresses *data* into a bytes object.
 
-.. class:: DecompIO(stream, wbits=0, /)
+   *wbits* allows you to configure the DEFLATE dictionary window size and the
+   output format. The window size allows you to trade-off memory usage for
+   compression level. A larger window size will allow the compressor to
+   reference fragments further back in the input. The output formats are "raw"
+   DEFLATE (no header/footer), zlib, and gzip, where the latter two
+   include a header and checksum.
 
-   Create a `stream` wrapper which allows transparent decompression of
-   compressed data in another *stream*. This allows to process compressed
-   streams with data larger than available heap size. In addition to
-   values described in :func:`decompress`, *wbits* may take values
-   24..31 (16 + 8..15), meaning that input stream has gzip header.
+   The low four bits of the absolute value of *wbits* set the base-2 logarithm of
+   the DEFLATE dictionary window size. So for example, ``wbits=10``,
+   ``wbits=-10``, and ``wbits=26`` all set the window size to 1024 bytes. Valid
+   window sizes are ``5`` to ``15`` inclusive (corresponding to 32 to 32k bytes).
 
-   .. admonition:: Difference to CPython
-      :class: attention
+   Negative values of *wbits* between ``-5`` and ``-15`` correspond to "raw"
+   output mode, positive values between ``5`` and ``15`` correspond to zlib
+   output mode, and positive values between ``21`` and ``31`` correspond to
+   gzip output mode.
 
-      This class is MicroPython extension. It's included on provisional
-      basis and may be changed considerably or removed in later versions.
+   See the :mod:`CPython documentation for zlib <python:zlib>` for more
+   information about the *wbits* parameter. Note that MicroPython allows
+   for smaller window sizes, which is useful when memory is constrained while
+   still achieving a reasonable level of compression. It also speeds up
+   the compressor. See more :ref:`MicroPython-specific details <deflate_wbits>`
+   in the :mod:`deflate <deflate>` module documentation.

From ea1a5e43d08429bed96e251f68f77aa0334bb371 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Jul 2023 17:24:20 +1000
Subject: [PATCH 0156/3129] examples/natmod/deflate: Add deflate as a dynamic
 native module.

This replaces the previous zlib version.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/deflate/Makefile  | 13 ++++++
 examples/natmod/deflate/deflate.c | 70 +++++++++++++++++++++++++++++++
 tests/run-natmodtests.py          |  1 +
 tools/ci.sh                       |  3 +-
 4 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 examples/natmod/deflate/Makefile
 create mode 100644 examples/natmod/deflate/deflate.c

diff --git a/examples/natmod/deflate/Makefile b/examples/natmod/deflate/Makefile
new file mode 100644
index 0000000000000..86ef29b6324b3
--- /dev/null
+++ b/examples/natmod/deflate/Makefile
@@ -0,0 +1,13 @@
+# Location of top-level MicroPython directory
+MPY_DIR = ../../..
+
+# Name of module (different to built-in uzlib so it can coexist)
+MOD = deflate_$(ARCH)
+
+# Source files (.c or .py)
+SRC = deflate.c
+
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+ARCH = x64
+
+include $(MPY_DIR)/py/dynruntime.mk
diff --git a/examples/natmod/deflate/deflate.c b/examples/natmod/deflate/deflate.c
new file mode 100644
index 0000000000000..fa475bd067240
--- /dev/null
+++ b/examples/natmod/deflate/deflate.c
@@ -0,0 +1,70 @@
+#define MICROPY_PY_DEFLATE (1)
+#define MICROPY_PY_DEFLATE_COMPRESS (1)
+
+#include "py/dynruntime.h"
+
+#if !defined(__linux__)
+void *memcpy(void *dst, const void *src, size_t n) {
+    return mp_fun_table.memmove_(dst, src, n);
+}
+void *memset(void *s, int c, size_t n) {
+    return mp_fun_table.memset_(s, c, n);
+}
+#endif
+
+mp_obj_full_type_t deflateio_type;
+
+#include "extmod/moddeflate.c"
+
+// Re-implemented from py/stream.c, not yet available in dynruntime.h.
+mp_obj_t mp_stream_close(mp_obj_t stream) {
+    const mp_stream_p_t *stream_p = mp_get_stream(stream);
+    int error;
+    mp_uint_t res = stream_p->ioctl(stream, MP_STREAM_CLOSE, 0, &error);
+    if (res == MP_STREAM_ERROR) {
+        mp_raise_OSError(error);
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_close_obj, mp_stream_close);
+
+// Re-implemented from py/stream.c, not yet available in dynruntime.h.
+STATIC mp_obj_t mp_stream___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    return mp_stream_close(args[0]);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream___exit___obj, 4, 4, mp_stream___exit__);
+
+// Re-implemented from obj.c, not yet available in dynruntime.h.
+mp_obj_t mp_identity(mp_obj_t self) {
+    return self;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_identity_obj, mp_identity);
+
+mp_map_elem_t deflateio_locals_dict_table[7];
+STATIC MP_DEFINE_CONST_DICT(deflateio_locals_dict, deflateio_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) {
+    MP_DYNRUNTIME_INIT_ENTRY
+
+    deflateio_type.base.type = mp_fun_table.type_type;
+    deflateio_type.name = MP_QSTR_DeflateIO;
+    MP_OBJ_TYPE_SET_SLOT(&deflateio_type, make_new, &deflateio_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(&deflateio_type, protocol, &deflateio_stream_p, 1);
+    deflateio_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_OBJ_FROM_PTR(&mp_stream_read_obj) };
+    deflateio_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_OBJ_FROM_PTR(&mp_stream_readinto_obj) };
+    deflateio_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readline), MP_OBJ_FROM_PTR(&mp_stream_unbuffered_readline_obj) };
+    deflateio_locals_dict_table[3] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_OBJ_FROM_PTR(&mp_stream_write_obj) };
+    deflateio_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&mp_stream_close_obj) };
+    deflateio_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR___enter__), MP_OBJ_FROM_PTR(&mp_identity_obj) };
+    deflateio_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR___exit__), MP_OBJ_FROM_PTR(&mp_stream___exit___obj) };
+    MP_OBJ_TYPE_SET_SLOT(&deflateio_type, locals_dict, (void*)&deflateio_locals_dict, 2);
+
+    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_deflate));
+    mp_store_global(MP_QSTR_DeflateIO, MP_OBJ_FROM_PTR(&deflateio_type));
+    mp_store_global(MP_QSTR_RAW, MP_OBJ_NEW_SMALL_INT(DEFLATEIO_FORMAT_RAW));
+    mp_store_global(MP_QSTR_ZLIB, MP_OBJ_NEW_SMALL_INT(DEFLATEIO_FORMAT_ZLIB));
+    mp_store_global(MP_QSTR_GZIP, MP_OBJ_NEW_SMALL_INT(DEFLATEIO_FORMAT_GZIP));
+
+    MP_DYNRUNTIME_INIT_EXIT
+}
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index ce4f941350637..5764021472144 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -21,6 +21,7 @@
 # Supported tests and their corresponding mpy module
 TEST_MAPPINGS = {
     "btree": "btree/btree_$(ARCH).mpy",
+    "deflate": "deflate/deflate_$(ARCH).mpy",
     "framebuf": "framebuf/framebuf_$(ARCH).mpy",
     "heapq": "heapq/heapq_$(ARCH).mpy",
     "random": "random/random_$(ARCH).mpy",
diff --git a/tools/ci.sh b/tools/ci.sh
index bbff5359a1e1f..98e78dc78a6f5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -426,6 +426,7 @@ function ci_native_mpy_modules_build {
     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/deflate ARCH=$arch
     make -C examples/natmod/framebuf ARCH=$arch
     make -C examples/natmod/heapq ARCH=$arch
     make -C examples/natmod/random ARCH=$arch
@@ -495,7 +496,7 @@ function ci_unix_coverage_run_mpy_merge_tests {
 
 function ci_unix_coverage_run_native_mpy_tests {
     MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython -m features2
-    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,heapq*,random*,re*}.py)
+    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,deflate*,framebuf*,heapq*,random*,re*}.py)
 }
 
 function ci_unix_32bit_setup {

From 8ef5622b9b8cb8caabb138eaf3b1ecccccd882fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jul 2023 10:55:06 +1000
Subject: [PATCH 0157/3129] py/runtime: Always initialise sched_state in
 mp_init.

When MICROPY_SCHEDULER_STATIC_NODES is enabled, the logic is unchanged.

When MICROPY_SCHEDULER_STATIC_NODES is disable, sched_state is now always
initialised to MP_SCHED_IDLE when calling mp_init().  For example, the use
of mp_sched_vm_abort(), if it aborts a running scheduled function, can lead
to the scheduler starting off in a locked state when the runtime is
restarted, and then it stays locked.  This commit fixes that case by
resetting sched_state.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index f5d219728f701..c3ada72296d24 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -69,11 +69,10 @@ void mp_init(void) {
     // no pending exceptions to start with
     MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
     #if MICROPY_ENABLE_SCHEDULER
+    // no pending callbacks to start with
+    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 {
+    if (MP_STATE_VM(sched_head) != NULL) {
         // pending callbacks are on the list, eg from before a soft reset
         MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
     }

From c1acea0e7364c54f6bd6f918dac4e2d4dc227691 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 23 Jul 2023 15:43:37 +0300
Subject: [PATCH 0158/3129] esp32/boards/ARDUINO_NANO_ESP32: Fix deploy
 instructions.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/board.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
index 031ee17415b6c..afb24e10494bc 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy_s3.md"
+        "deploy.md"
     ],
     "docs": "",
     "features": [

From 1bde5f3316f4d0e4733b5b4b395a4d341b2392f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 31 May 2022 14:55:39 +0200
Subject: [PATCH 0159/3129] esp32/main: Remove unused mbedtls debug function.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since commit beeb74 we already check in modussl_mbedtls whether this
function is provided by the ESP-IDF before calling it, thus we no longer
need to define it here in order to compile.

Removing it so that if CONFIG_MBEDTLS_DEBUG is defined we do not cause any
'multiple definition' compile errors.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/main.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index b8ba03e513fff..3a172e6f8d4a1 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -216,11 +216,6 @@ void nlr_jump_fail(void *val) {
     esp_restart();
 }
 
-// modussl_mbedtls uses this function but it's not enabled in ESP IDF
-void mbedtls_debug_set_threshold(int threshold) {
-    (void)threshold;
-}
-
 void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     len = (len + 3) & ~3;
     uint32_t *p = heap_caps_malloc(len, MALLOC_CAP_EXEC);

From 52dc48b2a0da912396bd3224cd9c906f4e6288ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 4 Jul 2023 15:35:29 +0200
Subject: [PATCH 0160/3129] esp32/machine_wdt: Allow feeding WDT from threads.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This changes the ESP32 WDT implementation to use a custom handle so that it
becomes possible to reset the WDT from a thread.

By default esp_task_wdt_add subscribes the task_id of the current task.
That means that if we're running in a different task we are unable to reset
the WDT, which prevents feeding the WDT from a thread directly, or even
from a timer (which may randomly run in a different task when there's
multiple threads).

As an added bonus, the name we set makes the error clearly specify that it
was the user-specified WDT that reset the chip.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_wdt.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
index 2cb6c518175eb..bf924c35e09b0 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -37,9 +37,12 @@ const mp_obj_type_t machine_wdt_type;
 
 typedef struct _machine_wdt_obj_t {
     mp_obj_base_t base;
+    esp_task_wdt_user_handle_t twdt_user_handle;
 } machine_wdt_obj_t;
 
-STATIC machine_wdt_obj_t wdt_default = {{&machine_wdt_type}};
+STATIC machine_wdt_obj_t wdt_default = {
+    {&machine_wdt_type}, 0
+};
 
 STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_id, ARG_timeout };
@@ -68,14 +71,22 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
         mp_raise_OSError(rs_code);
     }
 
-    esp_task_wdt_add(NULL);
+    if (wdt_default.twdt_user_handle == NULL) {
+        rs_code = esp_task_wdt_add_user("mpy_machine_wdt", &wdt_default.twdt_user_handle);
+        if (rs_code != ESP_OK) {
+            mp_raise_OSError(rs_code);
+        }
+    }
 
     return &wdt_default;
 }
 
 STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
     (void)self_in;
-    esp_task_wdt_reset();
+    mp_int_t rs_code = esp_task_wdt_reset_user(wdt_default.twdt_user_handle);
+    if (rs_code != ESP_OK) {
+        mp_raise_OSError(rs_code);
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);

From 625e03d2dc88df40e9d5a8a29011084881730a2f Mon Sep 17 00:00:00 2001
From: Armin Brauns <armin.brauns@embedded-solutions.at>
Date: Thu, 13 Jul 2023 12:05:45 +0000
Subject: [PATCH 0161/3129] mpy-cross: Allow specifying source files starting
 with -.

Signed-off-by: Armin Brauns <armin.brauns@embedded-solutions.at>
---
 mpy-cross/main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 8a4dd5bcbed57..cf82759c17268 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -100,7 +100,7 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
 
 STATIC int usage(char **argv) {
     printf(
-        "usage: %s [<opts>] [-X <implopt>] <input filename>\n"
+        "usage: %s [<opts>] [-X <implopt>] [--] <input filename>\n"
         "Options:\n"
         "--version : show version information\n"
         "-o : output file for compiled bytecode (defaults to input with .mpy extension)\n"
@@ -220,10 +220,11 @@ MP_NOINLINE int main_(int argc, char **argv) {
     const char *input_file = NULL;
     const char *output_file = NULL;
     const char *source_file = NULL;
+    bool option_parsing_active = true;
 
     // parse main options
     for (int a = 1; a < argc; a++) {
-        if (argv[a][0] == '-') {
+        if (option_parsing_active && argv[a][0] == '-') {
             if (strcmp(argv[a], "-X") == 0) {
                 a += 1;
             } else if (strcmp(argv[a], "--version") == 0) {
@@ -309,6 +310,8 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 } else {
                     return usage(argv);
                 }
+            } else if (strcmp(argv[a], "--") == 0) {
+                option_parsing_active = false;
             } else {
                 return usage(argv);
             }

From 6a61e4ecd12c8d780bd2e09e017c2ee0eab3ee3e Mon Sep 17 00:00:00 2001
From: Armin Brauns <armin.brauns@embedded-solutions.at>
Date: Thu, 13 Jul 2023 12:06:00 +0000
Subject: [PATCH 0162/3129] mpy-cross: Allow reading from stdin and writing to
 stdout.

Signed-off-by: Armin Brauns <armin.brauns@embedded-solutions.at>
---
 mpy-cross/main.c | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index cf82759c17268..20f3f85dba11d 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -48,6 +48,14 @@ mp_uint_t mp_verbose_flag = 0;
 // Make it larger on a 64 bit machine, because pointers are larger.
 long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
 
+STATIC void stdout_print_strn(void *env, const char *str, size_t len) {
+    (void)env;
+    ssize_t dummy = write(STDOUT_FILENO, str, len);
+    (void)dummy;
+}
+
+STATIC const mp_print_t mp_stdout_print = {NULL, stdout_print_strn};
+
 STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t dummy = write(STDERR_FILENO, str, len);
@@ -59,7 +67,12 @@ STATIC const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
 STATIC int compile_and_save(const char *file, const char *output_file, const char *source_file) {
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
-        mp_lexer_t *lex = mp_lexer_new_from_file(file);
+        mp_lexer_t *lex;
+        if (strcmp(file, "-") == 0) {
+            lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, STDIN_FILENO, false);
+        } else {
+            lex = mp_lexer_new_from_file(file);
+        }
 
         qstr source_name;
         if (source_file == NULL) {
@@ -77,17 +90,22 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
         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);
-        if (output_file == NULL) {
-            vstr_add_str(&vstr, file);
-            vstr_cut_tail_bytes(&vstr, 2);
-            vstr_add_str(&vstr, "mpy");
+        if (output_file != NULL && strcmp(output_file, "-") == 0) {
+            mp_raw_code_save(&cm, (mp_print_t *)&mp_stdout_print);
         } else {
-            vstr_add_str(&vstr, output_file);
+            vstr_t vstr;
+            vstr_init(&vstr, 16);
+            if (output_file == NULL) {
+                vstr_add_str(&vstr, file);
+                vstr_cut_tail_bytes(&vstr, 2);
+                vstr_add_str(&vstr, "mpy");
+            } else {
+                vstr_add_str(&vstr, output_file);
+            }
+
+            mp_raw_code_save_file(&cm, vstr_null_terminated_str(&vstr));
+            vstr_clear(&vstr);
         }
-        mp_raw_code_save_file(&cm, vstr_null_terminated_str(&vstr));
-        vstr_clear(&vstr);
 
         nlr_pop();
         return 0;

From 3164749b3d19a35bc3d0064da18ce0e55c4d7f20 Mon Sep 17 00:00:00 2001
From: Armin Brauns <armin.brauns@embedded-solutions.at>
Date: Fri, 14 Jul 2023 10:31:33 +0000
Subject: [PATCH 0163/3129] mpy-cross: When reading from stdin, write output to
 stdout.

Unless -o is given, output defaults to stdout unless a source file is
given (in which case the source file name is used to derive an output
file name).

Signed-off-by: Armin Brauns <armin.brauns@embedded-solutions.at>
---
 mpy-cross/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 20f3f85dba11d..87e44e379d205 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -90,7 +90,8 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
         cm.context = m_new_obj(mp_module_context_t);
         mp_compile_to_raw_code(&parse_tree, source_name, false, &cm);
 
-        if (output_file != NULL && strcmp(output_file, "-") == 0) {
+        if ((output_file != NULL && strcmp(output_file, "-") == 0) ||
+            (output_file == NULL && strcmp(file, "-") == 0)) {
             mp_raw_code_save(&cm, (mp_print_t *)&mp_stdout_print);
         } else {
             vstr_t vstr;
@@ -121,7 +122,7 @@ STATIC int usage(char **argv) {
         "usage: %s [<opts>] [-X <implopt>] [--] <input filename>\n"
         "Options:\n"
         "--version : show version information\n"
-        "-o : output file for compiled bytecode (defaults to input with .mpy extension)\n"
+        "-o : output file for compiled bytecode (defaults to input filename with .mpy extension, or stdout if input is stdin)\n"
         "-s : source filename to embed in the compiled bytecode (defaults to input file)\n"
         "-v : verbose (trace various operations); can be multiple\n"
         "-O[N] : apply bytecode optimizations of level N\n"

From 14374850ce54f0e1d446355738b31d4b0ba7aabe Mon Sep 17 00:00:00 2001
From: Armin Brauns <armin.brauns@embedded-solutions.at>
Date: Mon, 24 Jul 2023 07:02:06 +0000
Subject: [PATCH 0164/3129] mpy-cross: Allow specifying stdin as input without
 --.

This way, a bare `-` is never interpreted as an option, even before
`--`. Filenames starting with `-` still need to be put after `--`.

Signed-off-by: Armin Brauns <armin.brauns@embedded-solutions.at>
---
 mpy-cross/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 87e44e379d205..3ef77d436f854 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -243,7 +243,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
 
     // parse main options
     for (int a = 1; a < argc; a++) {
-        if (option_parsing_active && argv[a][0] == '-') {
+        if (option_parsing_active && argv[a][0] == '-' && argv[a][1] != '\0') {
             if (strcmp(argv[a], "-X") == 0) {
                 a += 1;
             } else if (strcmp(argv[a], "--version") == 0) {

From 975a687447f5fed27e08001d5760259ec523631c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 13:39:36 +1000
Subject: [PATCH 0165/3129] py/mpconfig: Add MICROPY_PY_PLATFORM, enabled at
 extra features level.

Previously this was explicitly enabled on esp32/stm32/renesas/mimxrt/samd,
but didn't get a default feature level because it wasn't in py/mpconfig.h.

With this commit it's now enabled at the "extra features" level, which adds
rp2, unix-standard, windows, esp8266, webassembly, and some nrf boards.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/mpconfigport.h       | 1 -
 ports/mimxrt/mpconfigport.h      | 1 -
 ports/renesas-ra/mpconfigport.h  | 3 ---
 ports/stm32/mpconfigport.h       | 3 ---
 py/mpconfig.h                    | 5 +++++
 tests/unix/extra_coverage.py.exp | 8 ++++----
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 714871d4fc926..aa13eaf2fecf2 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -140,7 +140,6 @@
 #define MICROPY_PY_WEBSOCKET                (1)
 #define MICROPY_PY_WEBREPL                  (1)
 #define MICROPY_PY_ONEWIRE                  (1)
-#define MICROPY_PY_PLATFORM                 (1)
 #define MICROPY_PY_SOCKET_EVENTS            (MICROPY_PY_WEBREPL)
 #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR    (1)
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index ce71cb279534e..52054c5d4d6b4 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -94,7 +94,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_TIMER            (1)
 #define MICROPY_SOFT_TIMER_TICKS_MS         systick_ms
 #define MICROPY_PY_ONEWIRE                  (1)
-#define MICROPY_PY_PLATFORM                 (1)
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (1)
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 842de1eff757d..34b299bd16c02 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -132,9 +132,6 @@
 #ifndef MICROPY_PY_ONEWIRE
 #define MICROPY_PY_ONEWIRE          (1)
 #endif
-#ifndef MICROPY_PY_PLATFORM
-#define MICROPY_PY_PLATFORM         (1)
-#endif
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN       (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index e3e24f4a9d468..37165b158956c 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -137,9 +137,6 @@
 #ifndef MICROPY_PY_ONEWIRE
 #define MICROPY_PY_ONEWIRE          (1)
 #endif
-#ifndef MICROPY_PY_PLATFORM
-#define MICROPY_PY_PLATFORM         (1)
-#endif
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN       (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index e6f1531ce1bf3..c617f573b6c65 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1726,6 +1726,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_ONEWIRE (0)
 #endif
 
+// Whether to provide the "platform" module
+#ifndef MICROPY_PY_PLATFORM
+#define MICROPY_PY_PLATFORM (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 /*****************************************************************************/
 /* Hooks for a port to add builtins                                          */
 
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 352bf39630ac3..ec39500746d57 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -56,10 +56,10 @@ cmath           collections     cppexample      cryptolib
 deflate         errno           example_package
 ffi             framebuf        gc              hashlib
 heapq           io              json            machine
-math            os              random          re
-select          socket          ssl             struct
-sys             termios         time            uctypes
-websocket
+math            os              platform        random
+re              select          socket          ssl
+struct          sys             termios         time
+uctypes         websocket
 me
 
 micropython     machine         math

From aab8061dceb2ea4c6e87a876f48969e4a5a85c94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jul 2023 10:52:50 +1000
Subject: [PATCH 0166/3129] esp32/machine_hw_spi: Fix access of SPI(2).

SPI3_HOST is not a macro but rather an enum, so use SOC_SPI_PERIPH_NUM to
detect if it's defined.

Fixes issue #11919.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 662d0e599419b..2f4509f302a54 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -232,7 +232,7 @@ STATIC void machine_hw_spi_init_internal(
         #ifdef FSPI_HOST
         && self->host != FSPI_HOST
         #endif
-        #ifdef SPI3_HOST
+        #if SOC_SPI_PERIPH_NUM > 2
         && self->host != SPI3_HOST
         #endif
         ) {

From 862944a71f6a7bce7e6c9d749d63cf539a3bc3d7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jul 2023 10:54:41 +1000
Subject: [PATCH 0167/3129] esp32/machine_hw_spi: Remove unnecessary duplicate
 SPI pin defaults.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_hw_spi.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 2f4509f302a54..dedf7fc1ee291 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -46,24 +46,13 @@
 
 // Default pins for SPI(id=1) aka IDF SPI2, can be overridden by a board
 #ifndef MICROPY_HW_SPI1_SCK
-#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 SPI2_IOMUX_PIN_NUM_CLK
 #define MICROPY_HW_SPI1_MOSI SPI2_IOMUX_PIN_NUM_MOSI
 #define MICROPY_HW_SPI1_MISO SPI2_IOMUX_PIN_NUM_MISO
 #endif
-#endif
 
 // Default pins for SPI(id=2) aka IDF SPI3, can be overridden by a board
 #ifndef MICROPY_HW_SPI2_SCK

From 162dd022b188b3e26738bb692417480a0c5546c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jul 2023 11:10:58 +1000
Subject: [PATCH 0168/3129] esp32/machine_hw_spi: Remove SPI host renaming for
 C3 and S3 variants.

On ESP32C3 it's not doing anything.  On ESP32S3 the original code prevented
prevented machine.SPI(1) from working.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_hw_spi.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index dedf7fc1ee291..b00b5881a3029 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -73,13 +73,6 @@
 #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 SPI2_HOST SPI2_HOST
-#elif CONFIG_IDF_TARGET_ESP32S3
-#define SPI2_HOST SPI3_HOST
-#define FSPI_HOST SPI2_HOST
-#endif
-
 typedef struct _machine_hw_spi_default_pins_t {
     int8_t sck;
     int8_t mosi;
@@ -218,9 +211,6 @@ STATIC void machine_hw_spi_init_internal(
     }
 
     if (self->host != SPI2_HOST
-        #ifdef FSPI_HOST
-        && self->host != FSPI_HOST
-        #endif
         #if SOC_SPI_PERIPH_NUM > 2
         && self->host != SPI3_HOST
         #endif

From b2adfc8077435419c5a5eecb2818cba44f1d3f8f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jul 2023 11:33:51 +1000
Subject: [PATCH 0169/3129] esp32/machine_hw_spi: Check for valid SPI id in
 constructor, not init.

Otherwise constructing an invalid SPI instance (eg machine.SPI(3)) will
mess up machine.SPI(2)'s state before it's detected that it's an invalid
SPI id.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_hw_spi.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index b00b5881a3029..e09c493f5b945 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -44,6 +44,13 @@
 // SPI(id=1) | HSPI/SPI2 | FSPI/SPI2 | SPI2    | SPI2
 // SPI(id=2) | VSPI/SPI3 | HSPI/SPI3 | SPI3    | err
 
+// Number of available hardware SPI peripherals.
+#if SOC_SPI_PERIPH_NUM > 2
+#define MICROPY_HW_SPI_MAX (2)
+#else
+#define MICROPY_HW_SPI_MAX (1)
+#endif
+
 // Default pins for SPI(id=1) aka IDF SPI2, can be overridden by a board
 #ifndef MICROPY_HW_SPI1_SCK
 // Use IO_MUX pins by default.
@@ -99,15 +106,15 @@ typedef struct _machine_hw_spi_obj_t {
 } 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] = {
+STATIC const machine_hw_spi_default_pins_t machine_hw_spi_default_pins[MICROPY_HW_SPI_MAX] = {
     { .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 SPI2 and SPI3 hardware peripherals
-STATIC machine_hw_spi_obj_t machine_hw_spi_obj[2];
+// Static objects mapping to SPI2 (and SPI3 if available) hardware peripherals.
+STATIC machine_hw_spi_obj_t machine_hw_spi_obj[MICROPY_HW_SPI_MAX];
 
 STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
     switch (spi_bus_remove_device(self->spi)) {
@@ -210,14 +217,6 @@ STATIC void machine_hw_spi_init_internal(
         changed = true;
     }
 
-    if (self->host != SPI2_HOST
-        #if SOC_SPI_PERIPH_NUM > 2
-        && self->host != SPI3_HOST
-        #endif
-        ) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), self->host);
-    }
-
     if (changed) {
         if (self->state == MACHINE_HW_SPI_STATE_INIT) {
             self->state = MACHINE_HW_SPI_STATE_DEINIT;
@@ -464,13 +463,14 @@ 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 == 1) { // SPI2_HOST which is FSPI_HOST on ESP32Sx, SPI2_HOST on others
-        self = &machine_hw_spi_obj[0];
-        default_pins = &machine_hw_spi_default_pins[0];
+    mp_int_t spi_id = args[ARG_id].u_int;
+    if (1 <= spi_id && spi_id <= MICROPY_HW_SPI_MAX) {
+        self = &machine_hw_spi_obj[spi_id - 1];
+        default_pins = &machine_hw_spi_default_pins[spi_id - 1];
     } else {
-        self = &machine_hw_spi_obj[1];
-        default_pins = &machine_hw_spi_default_pins[1];
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
     }
+
     self->base.type = &machine_spi_type;
 
     int8_t sck, mosi, miso;

From c9d2c5537b0f911b494fc877e2006022a65c2973 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jul 2023 12:35:21 +1000
Subject: [PATCH 0170/3129] esp32/boards: Remove references to the IDF version
 in board.md files.

Listing the IDF version number in the board description is not as important
as it once was, when the IDF was still undergoing a lot of changes.  Now,
all builds use IDF 5.x and it's possible to query the exact version with
platform.platform().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC/board.md          | 4 +---
 ports/esp32/boards/GENERIC_SPIRAM/board.md   | 4 +---
 ports/esp32/boards/OLIMEX_ESP32_POE/board.md | 4 +---
 ports/esp32/boards/UM_FEATHERS2/board.md     | 3 +--
 ports/esp32/boards/UM_FEATHERS2NEO/board.md  | 3 +--
 ports/esp32/boards/UM_FEATHERS3/board.md     | 3 +--
 ports/esp32/boards/UM_PROS3/board.md         | 3 +--
 ports/esp32/boards/UM_TINYPICO/board.md      | 4 +---
 ports/esp32/boards/UM_TINYS2/board.md        | 3 +--
 ports/esp32/boards/UM_TINYS3/board.md        | 3 +--
 10 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/ports/esp32/boards/GENERIC/board.md b/ports/esp32/boards/GENERIC/board.md
index 576ea80450f6a..efb2b2cab7c24 100644
--- a/ports/esp32/boards/GENERIC/board.md
+++ b/ports/esp32/boards/GENERIC/board.md
@@ -1,3 +1 @@
-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.
+The following files are firmware for ESP32-based boards without external SPIRAM.
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.md b/ports/esp32/boards/GENERIC_SPIRAM/board.md
index 3b02b902cd758..c638f63dd3e18 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/board.md
+++ b/ports/esp32/boards/GENERIC_SPIRAM/board.md
@@ -1,3 +1 @@
-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.
+The following files are firmware for ESP32-based boards with external SPIRAM (also known as PSRAM).
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.md b/ports/esp32/boards/OLIMEX_ESP32_POE/board.md
index 1e2dbb744a0e3..f077deda95cbf 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/board.md
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.md
@@ -1,4 +1,2 @@
-The following files are daily firmware for Olimex ESP32 boards with Ethernet.
+The following files are 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/UM_FEATHERS2/board.md b/ports/esp32/boards/UM_FEATHERS2/board.md
index e04a8936c846c..86ca33382d36e 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.md
+++ b/ports/esp32/boards/UM_FEATHERS2/board.md
@@ -1,2 +1 @@
-The following files are daily firmware for the FeatherS2. This firmware is
-compiled using ESP-IDF v4.3 or later.
+The following files are firmware for the FeatherS2.
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.md b/ports/esp32/boards/UM_FEATHERS2NEO/board.md
index 60ee024a1261b..26012d0bae5d3 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.md
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.md
@@ -1,2 +1 @@
-The following files are daily firmware for the FeatherS2 Neo. This firmware is
-compiled using ESP-IDF v4.3 or later.
+The following files are firmware for the FeatherS2 Neo.
diff --git a/ports/esp32/boards/UM_FEATHERS3/board.md b/ports/esp32/boards/UM_FEATHERS3/board.md
index ca9c36ad331f3..bed179041c280 100644
--- a/ports/esp32/boards/UM_FEATHERS3/board.md
+++ b/ports/esp32/boards/UM_FEATHERS3/board.md
@@ -1,2 +1 @@
-The following files are daily firmware for the FeatherS3. This firmware is
-compiled using ESP-IDF v4.4 or later.
+The following files are firmware for the FeatherS3.
diff --git a/ports/esp32/boards/UM_PROS3/board.md b/ports/esp32/boards/UM_PROS3/board.md
index 4d1c435a07d11..406abf74e3a16 100644
--- a/ports/esp32/boards/UM_PROS3/board.md
+++ b/ports/esp32/boards/UM_PROS3/board.md
@@ -1,2 +1 @@
-The following files are daily firmware for the ProS3. This firmware is
-compiled using ESP-IDF v4.4 or later.
+The following files are firmware for the ProS3.
diff --git a/ports/esp32/boards/UM_TINYPICO/board.md b/ports/esp32/boards/UM_TINYPICO/board.md
index d0b1266d2eec1..0fb41c76e5518 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.md
+++ b/ports/esp32/boards/UM_TINYPICO/board.md
@@ -1,3 +1 @@
-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.
+The following files are firmware for the TinyPICO.
diff --git a/ports/esp32/boards/UM_TINYS2/board.md b/ports/esp32/boards/UM_TINYS2/board.md
index 9a61374edf327..739453da82000 100644
--- a/ports/esp32/boards/UM_TINYS2/board.md
+++ b/ports/esp32/boards/UM_TINYS2/board.md
@@ -1,2 +1 @@
-The following files are daily firmware for the TinyS2. This firmware is compiled
-using ESP-IDF v4.3 or later.
+The following files are firmware for the TinyS2.
diff --git a/ports/esp32/boards/UM_TINYS3/board.md b/ports/esp32/boards/UM_TINYS3/board.md
index da06e191f28cc..5b4b5d8f1269c 100644
--- a/ports/esp32/boards/UM_TINYS3/board.md
+++ b/ports/esp32/boards/UM_TINYS3/board.md
@@ -1,2 +1 @@
-The following files are daily firmware for the TinyS3. This firmware is
-compiled using ESP-IDF v4.4 or later.
+The following files are firmware for the TinyS3.

From cfcce4b5311c7b112d3628392c8012b4c29bdd63 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jul 2023 12:59:02 +1000
Subject: [PATCH 0171/3129] esp32/README: Specify that only IDF v5.0.2 is
 supported.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index dc9e9f8b723ac..2d5b05b9266ac 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -28,8 +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 v5.0.2,
-although other IDF v4 versions may also work.
+Currently MicroPython supports only v5.0.2.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).

From d14ddcbdb5f373bf73df8e7ff9e3b1a60d7d5e25 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jul 2023 00:15:15 +1000
Subject: [PATCH 0172/3129] tools/autobuild: Add support for application .bin
 files for esp32.

On esp32, the build output consists of:
- micropython.elf
- micropython.map
- micropython.bin -- application only
- micropython.uf2 -- application only
- firmware.bin -- bootloader, partition table and application

Currently everything is available at the download page except
micropython.bin.  This commit adds that file but with the extension changed
to .app-bin, to distinguish it from .bin (the full thing).

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/build-boards.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index aae9981f94a30..689444a98875f 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -33,6 +33,9 @@ function build_board {
             elif [ -r $build_dir/micropython.$ext ]; then
                 # esp32 has micropython.elf, etc
                 mv $build_dir/micropython.$ext $dest
+            elif [ $ext = app-bin -a -r $build_dir/micropython.bin ]; then
+                # esp32 has micropython.bin which is just the application
+                mv $build_dir/micropython.bin $dest
             fi
         done
     )
@@ -62,7 +65,7 @@ function build_boards {
 }
 
 function build_esp32_boards {
-    build_boards modesp32.c $1 $2 bin elf map uf2
+    build_boards modesp32.c $1 $2 bin elf map uf2 app-bin
 }
 
 function build_mimxrt_boards {

From 01c758e26a846eca42e9c4444639fa822adf005f Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Wed, 26 Jul 2023 17:00:03 -0700
Subject: [PATCH 0173/3129] unix/README: Fix Markdown link markup.

Signed-off-by: Brett Cannon <brett@python.org>
---
 ports/unix/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/unix/README.md b/ports/unix/README.md
index a3159a3262e85..a1af289968586 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -40,8 +40,8 @@ or
     >>> import mip
     >>> mip.install("hmac")
 
-Browse available modules at [micropython-lib]
-(https://github.com/micropython/micropython-lib). See
+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`.
 

From 70c564324c9a2af323866b0235dba75f534a9926 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 1 Aug 2023 15:12:14 +1000
Subject: [PATCH 0174/3129] extmod/modssl_mbedtls: Reference SSLContext from
 SSLSocket.

Prevent the GC cleaning up (and finalising) the SSLContext while the
socket is still live.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modssl_mbedtls.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 83f6f907f4cc2..6d78d7d1b372c 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -357,6 +357,7 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t);
     #endif
     o->base.type = &ssl_socket_type;
+    o->ssl_context = ssl_context;
     o->sock = sock;
     o->poll_mask = 0;
     o->last_error = 0;

From 2dcd745434757cf0737d5edd7d841aae1e4bffa4 Mon Sep 17 00:00:00 2001
From: Damien Tournoud <damien@platform.sh>
Date: Thu, 15 Dec 2022 14:09:19 -0800
Subject: [PATCH 0175/3129] py/gc: Speed up incremental GC cycles by tracking
 the last used block.

In applications that use little memory and run GC regularly, the cost of
the sweep phase quickly becomes prohibitives as the amount of RAM
increases.

On an ESP32-S3 with 2 MB of external SPIRAM, for example, a trivial GC
cycle takes a minimum of 40ms, virtually all of it in the sweep phase.

Similarly, on the UNIX port with 1 GB of heap, a trivial GC takes 47 ms,
again virtually all of it in the sweep phase.

This commit speeds up the sweep phase in the case most of the heap is empty
by keeping track of the ID of the highest block we allocated in an area
since the last GC.

The performance benchmark run on PYBV10 shows between +0 and +2%
improvement across the existing performance tests.  These tests don't
really stress the GC, so they were also run with gc.threshold(30000) and
gc.threshold(10000).  For the 30000 case, performance improved by up to
+10% with this commit.  For the 10000 case, performance improved by at
least +10% on 6 tests, and up to +25%.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c      | 22 ++++++++++++++++++++--
 py/mpstate.h |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 9fefd3638bde3..541632d12b155 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -158,6 +158,7 @@ STATIC void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
     #endif
 
     area->gc_last_free_atb_index = 0;
+    area->gc_last_used_block = 0;
 
     #if MICROPY_GC_SPLIT_HEAP
     area->next = NULL;
@@ -378,7 +379,14 @@ STATIC void gc_sweep(void) {
     // free unmarked heads and their tails
     int free_tail = 0;
     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++) {
+        size_t end_block = area->gc_alloc_table_byte_len * BLOCKS_PER_ATB;
+        if (area->gc_last_used_block < end_block) {
+            end_block = area->gc_last_used_block + 1;
+        }
+
+        size_t last_used_block = 0;
+
+        for (size_t block = 0; block < end_block; block++) {
             MICROPY_GC_HOOK_LOOP(block);
             switch (ATB_GET_KIND(area, block)) {
                 case AT_HEAD:
@@ -418,15 +426,20 @@ STATIC void gc_sweep(void) {
                         #if CLEAR_ON_SWEEP
                         memset((void *)PTR_FROM_BLOCK(area, block), 0, BYTES_PER_BLOCK);
                         #endif
+                    } else {
+                        last_used_block = block;
                     }
                     break;
 
                 case AT_MARK:
                     ATB_MARK_TO_HEAD(area, block);
                     free_tail = 0;
+                    last_used_block = block;
                     break;
             }
         }
+
+        area->gc_last_used_block = last_used_block;
     }
 }
 
@@ -680,6 +693,8 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
         area->gc_last_free_atb_index = (i + 1) / BLOCKS_PER_ATB;
     }
 
+    area->gc_last_used_block = MAX(area->gc_last_used_block, end_block);
+
     // mark first block as used head
     ATB_FREE_TO_HEAD(area, start_block);
 
@@ -971,11 +986,14 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     // check if we can expand in place
     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++) {
+        size_t end_block = block + new_blocks;
+        for (size_t bl = block + n_blocks; bl < end_block; bl++) {
             assert(ATB_GET_KIND(area, bl) == AT_FREE);
             ATB_FREE_TO_TAIL(area, bl);
         }
 
+        area->gc_last_used_block = MAX(area->gc_last_used_block, end_block);
+
         GC_EXIT();
 
         #if MICROPY_GC_CONSERVATIVE_CLEAR
diff --git a/py/mpstate.h b/py/mpstate.h
index 080dc1380bcbf..64915ab87dd40 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -93,6 +93,7 @@ typedef struct _mp_state_mem_area_t {
     byte *gc_pool_end;
 
     size_t gc_last_free_atb_index;
+    size_t gc_last_used_block; // The block ID of the highest block allocated in the area
 } mp_state_mem_area_t;
 
 // This structure hold information about the memory allocation system.

From 7fad499d1e4d31ffdd4a93a61a9c604189636e3c Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Fri, 4 Aug 2023 12:27:37 +0200
Subject: [PATCH 0176/3129] docs/develop/gettingstarted: Clarify submodule
 initialization.

When building for a specific board this must be specified in make
submodules.  I.e. make BOARD=STM32F769DISC submodules.

Signed-off-by: Rene Straub <rene@see5.ch>
---
 docs/develop/gettingstarted.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index c2d3816d425a4..c51cac360cea1 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -228,7 +228,7 @@ You can also specify which board to use:
 .. code-block:: bash
 
    $ cd ports/stm32
-   $ make submodules
+   $ make BOARD=<board> submodules
    $ make BOARD=<board>
 
 See `ports/stm32/boards <https://github.com/micropython/micropython/tree/master/ports/stm32/boards>`_

From b714f4181276b349873451bde291322bcb842f47 Mon Sep 17 00:00:00 2001
From: Elecia White <elecia@logicalelegance.com>
Date: Thu, 3 Aug 2023 08:04:28 -0700
Subject: [PATCH 0177/3129] docs/develop/gettingstarted: Update ARM package
 list.

Signed-off-by: Elecia White <elecia@logicalelegance.com>
---
 docs/develop/gettingstarted.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index c51cac360cea1..34ca1c9c63e6a 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -100,7 +100,7 @@ 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
+   $ sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
 
 See the `ARM GCC
 toolchain <https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads>`_

From 6a179019e882c181f2eec1a472f6ec4baf699a9b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jul 2023 12:21:21 +1000
Subject: [PATCH 0178/3129] unix/modsocket: Add poll support for missing
 ERR,HUP,NVAL poll values.

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

diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index 871be8dcf7338..737550b428de3 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -164,6 +164,15 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
                 if (pfd.revents & POLLOUT) {
                     ret |= MP_STREAM_POLL_WR;
                 }
+                if (pfd.revents & POLLERR) {
+                    ret |= MP_STREAM_POLL_ERR;
+                }
+                if (pfd.revents & POLLHUP) {
+                    ret |= MP_STREAM_POLL_HUP;
+                }
+                if (pfd.revents & POLLNVAL) {
+                    ret |= MP_STREAM_POLL_NVAL;
+                }
             }
             return ret;
         }

From 22106bf2fa574ba947eceb3b9cfa401c67c6a7eb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jul 2023 12:32:02 +1000
Subject: [PATCH 0179/3129] extmod/vfs_posix_file: Add poll support for missing
 ERR,HUP,NVAL values.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_posix_file.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index cfc56df99f104..41d7622b3747e 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -209,6 +209,15 @@ STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_
                 if (pfd.revents & POLLOUT) {
                     ret |= MP_STREAM_POLL_WR;
                 }
+                if (pfd.revents & POLLERR) {
+                    ret |= MP_STREAM_POLL_ERR;
+                }
+                if (pfd.revents & POLLHUP) {
+                    ret |= MP_STREAM_POLL_HUP;
+                }
+                if (pfd.revents & POLLNVAL) {
+                    ret |= MP_STREAM_POLL_NVAL;
+                }
             }
             return ret;
             #endif

From df08c38c286561c08d5ac354428074817eb0c163 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jul 2023 12:10:18 +1000
Subject: [PATCH 0180/3129] unix/modselect: Remove unix-specific implementation
 of select module.

The unix port has a custom select module which only works with objects that
have a file descriptor, eg files and sockets.  On the other hand, bare
metal ports use the common extmod/modselect.c implementation of the select
module that supports polling of arbitrary objects, as long as those objects
provide a MP_STREAM_POLL in their ioctl implementation (which can be done
in C or Python).

This commit removes the unix-specific code and makes unix use the common
one provided by extmod/modselect.c instead.  All objects with file
descriptors implement MP_STREAM_POLL so they continue to work.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile                          |   1 -
 ports/unix/modselect.c                       | 356 -------------------
 ports/unix/variants/mpconfigvariant_common.h |  10 +-
 3 files changed, 2 insertions(+), 365 deletions(-)
 delete mode 100644 ports/unix/modselect.c

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 188e4be633694..eae02bf257c42 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -201,7 +201,6 @@ SRC_C += \
 	mpthreadport.c \
 	input.c \
 	modmachine.c \
-	modselect.c \
 	alloc.c \
 	fatfs_port.c \
 	mpbthciport.c \
diff --git a/ports/unix/modselect.c b/ports/unix/modselect.c
deleted file mode 100644
index 894820c63d9dd..0000000000000
--- a/ports/unix/modselect.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Damien P. George
- * Copyright (c) 2015-2017 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 "py/mpconfig.h"
-
-#if MICROPY_PY_SELECT_POSIX
-
-#if MICROPY_PY_SELECT
-#error "Can't have both MICROPY_PY_SELECT and MICROPY_PY_SELECT_POSIX."
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <poll.h>
-
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/obj.h"
-#include "py/objlist.h"
-#include "py/objtuple.h"
-#include "py/mphal.h"
-#include "py/mpthread.h"
-
-#define DEBUG 0
-
-#if MICROPY_PY_SOCKET
-extern const mp_obj_type_t mp_type_socket;
-#endif
-
-// Flags for poll()
-#define FLAG_ONESHOT (1)
-
-/// \class Poll - poll class
-
-typedef struct _mp_obj_poll_t {
-    mp_obj_base_t base;
-    unsigned short alloc;
-    unsigned short len;
-    struct pollfd *entries;
-    mp_obj_t *obj_map;
-    short iter_cnt;
-    short iter_idx;
-    int flags;
-    // callee-owned tuple
-    mp_obj_t ret_tuple;
-} mp_obj_poll_t;
-
-STATIC int get_fd(mp_obj_t fdlike) {
-    if (mp_obj_is_obj(fdlike)) {
-        const mp_stream_p_t *stream_p = mp_get_stream_raise(fdlike, MP_STREAM_OP_IOCTL);
-        int err;
-        mp_uint_t res = stream_p->ioctl(fdlike, MP_STREAM_GET_FILENO, 0, &err);
-        if (res != MP_STREAM_ERROR) {
-            return res;
-        }
-    }
-    return mp_obj_get_int(fdlike);
-}
-
-/// \method 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]);
-    bool is_fd = mp_obj_is_int(args[1]);
-    int fd = get_fd(args[1]);
-
-    mp_uint_t flags;
-    if (n_args == 3) {
-        flags = mp_obj_get_int(args[2]);
-    } else {
-        flags = POLLIN | POLLOUT;
-    }
-
-    struct pollfd *free_slot = NULL;
-
-    struct pollfd *entry = self->entries;
-    for (int i = 0; i < self->len; i++, entry++) {
-        int entry_fd = entry->fd;
-        if (entry_fd == fd) {
-            entry->events = flags;
-            return mp_const_false;
-        }
-        if (entry_fd == -1) {
-            free_slot = entry;
-        }
-    }
-
-    if (free_slot == NULL) {
-        if (self->len >= self->alloc) {
-            self->entries = m_renew(struct pollfd, self->entries, self->alloc, self->alloc + 4);
-            if (self->obj_map) {
-                self->obj_map = m_renew(mp_obj_t, self->obj_map, self->alloc, self->alloc + 4);
-            }
-            self->alloc += 4;
-        }
-        free_slot = &self->entries[self->len++];
-    }
-
-    if (!is_fd) {
-        if (self->obj_map == NULL) {
-            self->obj_map = m_new0(mp_obj_t, self->alloc);
-        }
-        self->obj_map[free_slot - self->entries] = args[1];
-    }
-
-    free_slot->fd = fd;
-    free_slot->events = flags;
-    free_slot->revents = 0;
-    return mp_const_true;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);
-
-/// \method 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);
-    struct pollfd *entries = self->entries;
-    int fd = get_fd(obj_in);
-    for (int i = self->len - 1; i >= 0; i--) {
-        if (entries->fd == fd) {
-            entries->fd = -1;
-            if (self->obj_map) {
-                self->obj_map[entries - self->entries] = MP_OBJ_NULL;
-            }
-            break;
-        }
-        entries++;
-    }
-
-    // TODO raise KeyError if obj didn't exist in map
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(poll_unregister_obj, poll_unregister);
-
-/// \method 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);
-    struct pollfd *entries = self->entries;
-    int fd = get_fd(obj_in);
-    for (int i = self->len - 1; i >= 0; i--) {
-        if (entries->fd == fd) {
-            entries->events = mp_obj_get_int(eventmask_in);
-            return mp_const_none;
-        }
-        entries++;
-    }
-
-    // obj doesn't exist in poller
-    mp_raise_OSError(MP_ENOENT);
-}
-MP_DEFINE_CONST_FUN_OBJ_3(poll_modify_obj, poll_modify);
-
-STATIC int poll_poll_internal(size_t n_args, const mp_obj_t *args) {
-    mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
-
-    // work out timeout (it's given already in ms)
-    int timeout = -1;
-    int flags = 0;
-    if (n_args >= 2) {
-        if (args[1] != mp_const_none) {
-            mp_int_t timeout_i = mp_obj_get_int(args[1]);
-            if (timeout_i >= 0) {
-                timeout = timeout_i;
-            }
-        }
-        if (n_args >= 3) {
-            flags = mp_obj_get_int(args[2]);
-        }
-    }
-
-    self->flags = flags;
-
-    int n_ready;
-    MP_HAL_RETRY_SYSCALL(n_ready, poll(self->entries, self->len, timeout), mp_raise_OSError(err));
-    return n_ready;
-}
-
-/// \method poll([timeout])
-/// Timeout is in milliseconds.
-STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
-    int n_ready = poll_poll_internal(n_args, args);
-
-    if (n_ready == 0) {
-        return mp_const_empty_tuple;
-    }
-
-    mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
-
-    mp_obj_list_t *ret_list = MP_OBJ_TO_PTR(mp_obj_new_list(n_ready, NULL));
-    int ret_i = 0;
-    struct pollfd *entries = self->entries;
-    for (int i = 0; i < self->len; i++, entries++) {
-        if (entries->revents != 0) {
-            mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
-            // If there's an object stored, return it, otherwise raw fd
-            if (self->obj_map && self->obj_map[i] != MP_OBJ_NULL) {
-                t->items[0] = self->obj_map[i];
-            } else {
-                t->items[0] = MP_OBJ_NEW_SMALL_INT(entries->fd);
-            }
-            t->items[1] = MP_OBJ_NEW_SMALL_INT(entries->revents);
-            ret_list->items[ret_i++] = MP_OBJ_FROM_PTR(t);
-            if (self->flags & FLAG_ONESHOT) {
-                entries->events = 0;
-            }
-        }
-    }
-
-    return MP_OBJ_FROM_PTR(ret_list);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 3, poll_poll);
-
-STATIC mp_obj_t poll_ipoll(size_t n_args, const mp_obj_t *args) {
-    mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
-
-    if (self->ret_tuple == MP_OBJ_NULL) {
-        self->ret_tuple = mp_obj_new_tuple(2, NULL);
-    }
-
-    int n_ready = poll_poll_internal(n_args, args);
-    self->iter_cnt = n_ready;
-    self->iter_idx = 0;
-
-    return args[0];
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_ipoll_obj, 1, 3, poll_ipoll);
-
-STATIC mp_obj_t poll_iternext(mp_obj_t self_in) {
-    mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
-
-    if (self->iter_cnt == 0) {
-        return MP_OBJ_STOP_ITERATION;
-    }
-
-    self->iter_cnt--;
-
-    struct pollfd *entries = self->entries + self->iter_idx;
-    for (int i = self->iter_idx; i < self->len; i++, entries++) {
-        self->iter_idx++;
-        if (entries->revents != 0) {
-            mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->ret_tuple);
-            // If there's an object stored, return it, otherwise raw fd
-            if (self->obj_map && self->obj_map[i] != MP_OBJ_NULL) {
-                t->items[0] = self->obj_map[i];
-            } else {
-                t->items[0] = MP_OBJ_NEW_SMALL_INT(entries->fd);
-            }
-            t->items[1] = MP_OBJ_NEW_SMALL_INT(entries->revents);
-            if (self->flags & FLAG_ONESHOT) {
-                entries->events = 0;
-            }
-            return MP_OBJ_FROM_PTR(t);
-        }
-    }
-
-    assert(!"inconsistent number of poll active entries");
-    self->iter_cnt = 0;
-    return MP_OBJ_STOP_ITERATION;
-}
-
-#if DEBUG
-STATIC mp_obj_t poll_dump(mp_obj_t self_in) {
-    mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
-
-    struct pollfd *entries = self->entries;
-    for (int i = self->len - 1; i >= 0; i--) {
-        printf("fd: %d ev: %x rev: %x", entries->fd, entries->events, entries->revents);
-        if (self->obj_map) {
-            printf(" obj: %p", self->obj_map[entries - self->entries]);
-        }
-        printf("\n");
-        entries++;
-    }
-
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(poll_dump_obj, poll_dump);
-#endif
-
-STATIC const mp_rom_map_elem_t poll_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_register), MP_ROM_PTR(&poll_register_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unregister), MP_ROM_PTR(&poll_unregister_obj) },
-    { MP_ROM_QSTR(MP_QSTR_modify), MP_ROM_PTR(&poll_modify_obj) },
-    { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&poll_poll_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ipoll), MP_ROM_PTR(&poll_ipoll_obj) },
-    #if DEBUG
-    { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&poll_dump_obj) },
-    #endif
-};
-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_ITER_IS_ITERNEXT,
-    iter, poll_iternext,
-    locals_dict, &poll_locals_dict
-    );
-
-STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
-    int alloc = 4;
-    if (n_args > 0) {
-        alloc = mp_obj_get_int(args[0]);
-    }
-    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;
-    poll->obj_map = NULL;
-    poll->iter_cnt = 0;
-    poll->ret_tuple = MP_OBJ_NULL;
-    return MP_OBJ_FROM_PTR(poll);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_poll_obj, 0, 1, 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_select) },
-    { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&mp_select_poll_obj) },
-    { MP_ROM_QSTR(MP_QSTR_POLLIN), MP_ROM_INT(POLLIN) },
-    { MP_ROM_QSTR(MP_QSTR_POLLOUT), MP_ROM_INT(POLLOUT) },
-    { MP_ROM_QSTR(MP_QSTR_POLLERR), MP_ROM_INT(POLLERR) },
-    { MP_ROM_QSTR(MP_QSTR_POLLHUP), MP_ROM_INT(POLLHUP) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
-
-const mp_obj_module_t mp_module_select = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_select_globals,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_select, mp_module_select);
-
-#endif // MICROPY_PY_SELECT_POSIX
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 8cb1f88e685ca..9e320d584194a 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -106,14 +106,8 @@
 #define MICROPY_PY_CRYPTOLIB           (1)
 #endif
 
-// Use the posix implementation of the "select" module (unless the variant
-// specifically asks for the MicroPython version).
-#ifndef MICROPY_PY_SELECT
-#define MICROPY_PY_SELECT              (0)
-#endif
-#ifndef MICROPY_PY_SELECT_POSIX
-#define MICROPY_PY_SELECT_POSIX        (!MICROPY_PY_SELECT)
-#endif
+// The "select" module is enabled by default, but disable select.select().
+#define MICROPY_PY_SELECT_SELECT       (0)
 
 // Enable the "websocket" module.
 #define MICROPY_PY_WEBSOCKET           (1)

From 7f2efb4144ae2049988574d233ce308f90067b02 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jul 2023 16:36:08 +1000
Subject: [PATCH 0181/3129] extmod/modselect: Abstract out a poll_set_t struct
 and functions.

To make it easier to extend and modify this polling implementation.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modselect.c | 81 +++++++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 33 deletions(-)

diff --git a/extmod/modselect.c b/extmod/modselect.c
index 3d7ccbd99558b..2b463176d43ae 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2014 Damien P. George
+ * Copyright (c) 2014-2023 Damien P. George
  * Copyright (c) 2015-2017 Paul Sokolovsky
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,10 +26,6 @@
  */
 
 #include "py/mpconfig.h"
-#if MICROPY_PY_SELECT
-
-#include <stdio.h>
-
 #include "py/runtime.h"
 #include "py/obj.h"
 #include "py/objlist.h"
@@ -37,9 +33,12 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
+#if MICROPY_PY_SELECT
+
 // Flags for poll()
 #define FLAG_ONESHOT (1)
 
+// A single pollable object.
 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);
@@ -47,9 +46,25 @@ typedef struct _poll_obj_t {
     mp_uint_t flags_ret;
 } poll_obj_t;
 
-STATIC void poll_map_add(mp_map_t *poll_map, const mp_obj_t *obj, mp_uint_t obj_len, mp_uint_t flags, bool or_flags) {
+// A set of pollable objects.
+typedef struct _poll_set_t {
+    // Map containing a dict with key=object to poll, value=its corresponding poll_obj_t.
+    mp_map_t map;
+} poll_set_t;
+
+STATIC void poll_set_init(poll_set_t *poll_set, size_t n) {
+    mp_map_init(&poll_set->map, n);
+}
+
+#if MICROPY_PY_SELECT_SELECT
+STATIC void poll_set_deinit(poll_set_t *poll_set) {
+    mp_map_deinit(&poll_set->map);
+}
+#endif
+
+STATIC void poll_set_add_obj(poll_set_t *poll_set, const mp_obj_t *obj, mp_uint_t obj_len, mp_uint_t flags, bool or_flags) {
     for (mp_uint_t i = 0; i < obj_len; i++) {
-        mp_map_elem_t *elem = mp_map_lookup(poll_map, mp_obj_id(obj[i]), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+        mp_map_elem_t *elem = mp_map_lookup(&poll_set->map, mp_obj_id(obj[i]), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
         if (elem->value == MP_OBJ_NULL) {
             // object not found; get its ioctl and add it to the poll list
             const mp_stream_p_t *stream_p = mp_get_stream_raise(obj[i], MP_STREAM_OP_IOCTL);
@@ -71,14 +86,14 @@ STATIC void poll_map_add(mp_map_t *poll_map, const mp_obj_t *obj, mp_uint_t obj_
 }
 
 // poll each object in the map
-STATIC mp_uint_t poll_map_poll(mp_map_t *poll_map, size_t *rwx_num) {
+STATIC mp_uint_t poll_map_poll(poll_set_t *poll_set, size_t *rwx_num) {
     mp_uint_t n_ready = 0;
-    for (mp_uint_t i = 0; i < poll_map->alloc; ++i) {
-        if (!mp_map_slot_is_filled(poll_map, i)) {
+    for (mp_uint_t i = 0; i < poll_set->map.alloc; ++i) {
+        if (!mp_map_slot_is_filled(&poll_set->map, i)) {
             continue;
         }
 
-        poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_map->table[i].value);
+        poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set->map.table[i].value);
         int errcode;
         mp_int_t ret = poll_obj->ioctl(poll_obj->obj, MP_STREAM_POLL, poll_obj->flags, &errcode);
         poll_obj->flags_ret = ret;
@@ -133,17 +148,17 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
     }
 
     // merge separate lists and get the ioctl function for each object
-    mp_map_t poll_map;
-    mp_map_init(&poll_map, rwx_len[0] + rwx_len[1] + rwx_len[2]);
-    poll_map_add(&poll_map, r_array, rwx_len[0], MP_STREAM_POLL_RD, true);
-    poll_map_add(&poll_map, w_array, rwx_len[1], MP_STREAM_POLL_WR, true);
-    poll_map_add(&poll_map, x_array, rwx_len[2], MP_STREAM_POLL_ERR | MP_STREAM_POLL_HUP, true);
+    poll_set_t poll_set;
+    poll_set_init(&poll_set, rwx_len[0] + rwx_len[1] + rwx_len[2]);
+    poll_set_add_obj(&poll_set, r_array, rwx_len[0], MP_STREAM_POLL_RD, true);
+    poll_set_add_obj(&poll_set, w_array, rwx_len[1], MP_STREAM_POLL_WR, true);
+    poll_set_add_obj(&poll_set, x_array, rwx_len[2], MP_STREAM_POLL_ERR | MP_STREAM_POLL_HUP, true);
 
     mp_uint_t start_tick = mp_hal_ticks_ms();
     rwx_len[0] = rwx_len[1] = rwx_len[2] = 0;
     for (;;) {
         // poll the objects
-        mp_uint_t n_ready = poll_map_poll(&poll_map, rwx_len);
+        mp_uint_t n_ready = poll_map_poll(&poll_set, rwx_len);
 
         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
@@ -152,11 +167,11 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
             list_array[1] = mp_obj_new_list(rwx_len[1], NULL);
             list_array[2] = mp_obj_new_list(rwx_len[2], NULL);
             rwx_len[0] = rwx_len[1] = rwx_len[2] = 0;
-            for (mp_uint_t i = 0; i < poll_map.alloc; ++i) {
-                if (!mp_map_slot_is_filled(&poll_map, i)) {
+            for (mp_uint_t i = 0; i < poll_set.map.alloc; ++i) {
+                if (!mp_map_slot_is_filled(&poll_set.map, i)) {
                     continue;
                 }
-                poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_map.table[i].value);
+                poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set.map.table[i].value);
                 if (poll_obj->flags_ret & MP_STREAM_POLL_RD) {
                     ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[0]))->items[rwx_len[0]++] = poll_obj->obj;
                 }
@@ -167,7 +182,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
                     ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[2]))->items[rwx_len[2]++] = poll_obj->obj;
                 }
             }
-            mp_map_deinit(&poll_map);
+            poll_set_deinit(&poll_set);
             return mp_obj_new_tuple(3, list_array);
         }
         MICROPY_EVENT_POLL_HOOK
@@ -178,7 +193,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
 
 typedef struct _mp_obj_poll_t {
     mp_obj_base_t base;
-    mp_map_t poll_map;
+    poll_set_t poll_set;
     short iter_cnt;
     short iter_idx;
     int flags;
@@ -195,7 +210,7 @@ STATIC mp_obj_t poll_register(size_t n_args, const mp_obj_t *args) {
     } else {
         flags = MP_STREAM_POLL_RD | MP_STREAM_POLL_WR;
     }
-    poll_map_add(&self->poll_map, &args[1], 1, flags, false);
+    poll_set_add_obj(&self->poll_set, &args[1], 1, flags, false);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);
@@ -203,7 +218,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);
 // 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);
+    mp_map_lookup(&self->poll_set.map, mp_obj_id(obj_in), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
     // TODO raise KeyError if obj didn't exist in map
     return mp_const_none;
 }
@@ -212,7 +227,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(poll_unregister_obj, poll_unregister);
 // 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);
+    mp_map_elem_t *elem = mp_map_lookup(&self->poll_set.map, mp_obj_id(obj_in), MP_MAP_LOOKUP);
     if (elem == NULL) {
         mp_raise_OSError(MP_ENOENT);
     }
@@ -245,7 +260,7 @@ STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
     mp_uint_t n_ready;
     for (;;) {
         // poll the objects
-        n_ready = poll_map_poll(&self->poll_map, NULL);
+        n_ready = poll_map_poll(&self->poll_set, NULL);
         if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
             break;
         }
@@ -262,11 +277,11 @@ STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
     // one or more objects are ready, or we had a timeout
     mp_obj_list_t *ret_list = MP_OBJ_TO_PTR(mp_obj_new_list(n_ready, NULL));
     n_ready = 0;
-    for (mp_uint_t i = 0; i < self->poll_map.alloc; ++i) {
-        if (!mp_map_slot_is_filled(&self->poll_map, i)) {
+    for (mp_uint_t i = 0; i < self->poll_set.map.alloc; ++i) {
+        if (!mp_map_slot_is_filled(&self->poll_set.map, i)) {
             continue;
         }
-        poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_map.table[i].value);
+        poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_set.map.table[i].value);
         if (poll_obj->flags_ret != 0) {
             mp_obj_t tuple[2] = {poll_obj->obj, MP_OBJ_NEW_SMALL_INT(poll_obj->flags_ret)};
             ret_list->items[n_ready++] = mp_obj_new_tuple(2, tuple);
@@ -304,12 +319,12 @@ STATIC mp_obj_t poll_iternext(mp_obj_t self_in) {
 
     self->iter_cnt--;
 
-    for (mp_uint_t i = self->iter_idx; i < self->poll_map.alloc; ++i) {
+    for (mp_uint_t i = self->iter_idx; i < self->poll_set.map.alloc; ++i) {
         self->iter_idx++;
-        if (!mp_map_slot_is_filled(&self->poll_map, i)) {
+        if (!mp_map_slot_is_filled(&self->poll_set.map, i)) {
             continue;
         }
-        poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_map.table[i].value);
+        poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_set.map.table[i].value);
         if (poll_obj->flags_ret != 0) {
             mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->ret_tuple);
             t->items[0] = poll_obj->obj;
@@ -347,7 +362,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 // poll()
 STATIC mp_obj_t select_poll(void) {
     mp_obj_poll_t *poll = mp_obj_malloc(mp_obj_poll_t, &mp_type_poll);
-    mp_map_init(&poll->poll_map, 0);
+    poll_set_init(&poll->poll_set, 0);
     poll->iter_cnt = 0;
     poll->ret_tuple = MP_OBJ_NULL;
     return MP_OBJ_FROM_PTR(poll);

From ebc655634650274727c71881e0d36ff738793928 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jul 2023 17:00:19 +1000
Subject: [PATCH 0182/3129] extmod/modselect: Factor low-level polling code
 into common function.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modselect.c | 81 ++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/extmod/modselect.c b/extmod/modselect.c
index 2b463176d43ae..7c4e968e801d6 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -85,8 +85,8 @@ STATIC void poll_set_add_obj(poll_set_t *poll_set, const mp_obj_t *obj, mp_uint_
     }
 }
 
-// poll each object in the map
-STATIC mp_uint_t poll_map_poll(poll_set_t *poll_set, size_t *rwx_num) {
+// For each object in the poll set, poll it once.
+STATIC mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
     mp_uint_t n_ready = 0;
     for (mp_uint_t i = 0; i < poll_set->map.alloc; ++i) {
         if (!mp_map_slot_is_filled(&poll_set->map, i)) {
@@ -122,6 +122,18 @@ STATIC mp_uint_t poll_map_poll(poll_set_t *poll_set, size_t *rwx_num) {
     return n_ready;
 }
 
+STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size_t *rwx_num, mp_uint_t timeout) {
+    mp_uint_t start_tick = mp_hal_ticks_ms();
+    for (;;) {
+        // poll the objects
+        mp_uint_t n_ready = poll_set_poll_once(poll_set, rwx_num);
+        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
+            return n_ready;
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+}
+
 #if MICROPY_PY_SELECT_SELECT
 // select(rlist, wlist, xlist[, timeout])
 STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
@@ -154,39 +166,33 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
     poll_set_add_obj(&poll_set, w_array, rwx_len[1], MP_STREAM_POLL_WR, true);
     poll_set_add_obj(&poll_set, x_array, rwx_len[2], MP_STREAM_POLL_ERR | MP_STREAM_POLL_HUP, true);
 
-    mp_uint_t start_tick = mp_hal_ticks_ms();
+    // poll all objects
     rwx_len[0] = rwx_len[1] = rwx_len[2] = 0;
-    for (;;) {
-        // poll the objects
-        mp_uint_t n_ready = poll_map_poll(&poll_set, rwx_len);
+    poll_set_poll_until_ready_or_timeout(&poll_set, rwx_len, 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);
-            list_array[1] = mp_obj_new_list(rwx_len[1], NULL);
-            list_array[2] = mp_obj_new_list(rwx_len[2], NULL);
-            rwx_len[0] = rwx_len[1] = rwx_len[2] = 0;
-            for (mp_uint_t i = 0; i < poll_set.map.alloc; ++i) {
-                if (!mp_map_slot_is_filled(&poll_set.map, i)) {
-                    continue;
-                }
-                poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set.map.table[i].value);
-                if (poll_obj->flags_ret & MP_STREAM_POLL_RD) {
-                    ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[0]))->items[rwx_len[0]++] = poll_obj->obj;
-                }
-                if (poll_obj->flags_ret & MP_STREAM_POLL_WR) {
-                    ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[1]))->items[rwx_len[1]++] = poll_obj->obj;
-                }
-                if ((poll_obj->flags_ret & ~(MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)) != 0) {
-                    ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[2]))->items[rwx_len[2]++] = poll_obj->obj;
-                }
-            }
-            poll_set_deinit(&poll_set);
-            return mp_obj_new_tuple(3, list_array);
+    // 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);
+    list_array[1] = mp_obj_new_list(rwx_len[1], NULL);
+    list_array[2] = mp_obj_new_list(rwx_len[2], NULL);
+    rwx_len[0] = rwx_len[1] = rwx_len[2] = 0;
+    for (mp_uint_t i = 0; i < poll_set.map.alloc; ++i) {
+        if (!mp_map_slot_is_filled(&poll_set.map, i)) {
+            continue;
+        }
+        poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set.map.table[i].value);
+        if (poll_obj->flags_ret & MP_STREAM_POLL_RD) {
+            ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[0]))->items[rwx_len[0]++] = poll_obj->obj;
+        }
+        if (poll_obj->flags_ret & MP_STREAM_POLL_WR) {
+            ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[1]))->items[rwx_len[1]++] = poll_obj->obj;
+        }
+        if ((poll_obj->flags_ret & ~(MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)) != 0) {
+            ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[2]))->items[rwx_len[2]++] = poll_obj->obj;
         }
-        MICROPY_EVENT_POLL_HOOK
     }
+    poll_set_deinit(&poll_set);
+    return mp_obj_new_tuple(3, list_array);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
 #endif // MICROPY_PY_SELECT_SELECT
@@ -256,18 +262,7 @@ STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
 
     self->flags = flags;
 
-    mp_uint_t start_tick = mp_hal_ticks_ms();
-    mp_uint_t n_ready;
-    for (;;) {
-        // poll the objects
-        n_ready = poll_map_poll(&self->poll_set, NULL);
-        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
-            break;
-        }
-        MICROPY_EVENT_POLL_HOOK
-    }
-
-    return n_ready;
+    return poll_set_poll_until_ready_or_timeout(&self->poll_set, NULL, timeout);
 }
 
 STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {

From ef71028f77e4a6fc449c64906ebad0a160f35240 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Aug 2023 12:39:39 +1000
Subject: [PATCH 0183/3129] extmod/modselect: Add optimisation to use system
 poll when possible.

A previous commit removed the unix-specific select module implementation
and made unix use the common one.

This commit adds an optimisation so that the system poll function is used
when polling objects that have a file descriptor.  With this optimisation
enabled, if code registers both file-descriptor-based objects, and non-
file-descriptor-based objects with select.poll() then the following occurs:

- the system poll is called for all file-descriptor-based objects with a
  timeout of 1ms

- then the bare-metal polling implementation is used for remaining objects,
  which calls into their ioctl method (which can be in C or Python)

In the case where all objects have file descriptors, the system poll is
called with the full timeout requested by the caller.  That makes it as
efficient as possible in the case everything has a file descriptor.

Benefits of this approach:

- all ports use the same select module implementation

- the unix port now supports polling of all objects and matches bare metal
  implementations

- it's still efficient for existing cases where only files and sockets are
  polled (on unix)

- the bare metal implementation does not change

- polling of SSL objects will now work on unix by calling in to the ioctl
  method on SSL objects (this is required for asyncio ssl support)

Note that extmod/vfs_posix_file.c has poll disable when the optimisation is
enabled, because the code is not reachable when the optimisation is used.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modselect.c                           | 308 +++++++++++++++++--
 extmod/vfs_posix_file.c                      |   2 +-
 ports/unix/variants/mpconfigvariant_common.h |   1 +
 py/mpconfig.h                                |   7 +-
 4 files changed, 284 insertions(+), 34 deletions(-)

diff --git a/extmod/modselect.c b/extmod/modselect.c
index 7c4e968e801d6..01b1474d75729 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -35,6 +35,29 @@
 
 #if MICROPY_PY_SELECT
 
+#if MICROPY_PY_SELECT_SELECT && MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+#error "select.select is not supported with MICROPY_PY_SELECT_POSIX_OPTIMISATIONS"
+#endif
+
+#if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+
+#include <poll.h>
+
+#if !((MP_STREAM_POLL_RD) == (POLLIN) && \
+    (MP_STREAM_POLL_WR) == (POLLOUT) && \
+    (MP_STREAM_POLL_ERR) == (POLLERR) && \
+    (MP_STREAM_POLL_HUP) == (POLLHUP) && \
+    (MP_STREAM_POLL_NVAL) == (POLLNVAL))
+#error "With MICROPY_PY_SELECT_POSIX_OPTIMISATIONS enabled, POLL constants must match"
+#endif
+
+// When non-file-descriptor objects are on the list to be polled (the polling of
+// which involves repeatedly calling ioctl(MP_STREAM_POLL)), this variable sets
+// the period between polling these objects.
+#define MICROPY_PY_SELECT_IOCTL_CALL_PERIOD_MS (1)
+
+#endif
+
 // Flags for poll()
 #define FLAG_ONESHOT (1)
 
@@ -42,18 +65,42 @@
 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);
-    mp_uint_t flags;
-    mp_uint_t flags_ret;
+    #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+    // If the pollable object has an associated file descriptor, then pollfd points to an entry
+    // in poll_set_t::pollfds, and the events/revents fields for this object are stored in the
+    // pollfd entry (and the nonfd_* members are unused).
+    // Otherwise the object is a non-file-descriptor object and pollfd==NULL, and the events/
+    // revents fields are stored in the nonfd_* members (which are named as such so that code
+    // doesn't accidentally mix the use of these members when this optimisation is used).
+    struct pollfd *pollfd;
+    uint16_t nonfd_events;
+    uint16_t nonfd_revents;
+    #else
+    mp_uint_t events;
+    mp_uint_t revents;
+    #endif
 } poll_obj_t;
 
 // A set of pollable objects.
 typedef struct _poll_set_t {
     // Map containing a dict with key=object to poll, value=its corresponding poll_obj_t.
     mp_map_t map;
+
+    #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+    // Array of pollfd entries for objects that have a file descriptor.
+    unsigned short alloc;
+    unsigned short len;
+    struct pollfd *pollfds;
+    #endif
 } poll_set_t;
 
 STATIC void poll_set_init(poll_set_t *poll_set, size_t n) {
     mp_map_init(&poll_set->map, n);
+    #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+    poll_set->alloc = 0;
+    poll_set->len = 0;
+    poll_set->pollfds = NULL;
+    #endif
 }
 
 #if MICROPY_PY_SELECT_SELECT
@@ -62,25 +109,141 @@ STATIC void poll_set_deinit(poll_set_t *poll_set) {
 }
 #endif
 
-STATIC void poll_set_add_obj(poll_set_t *poll_set, const mp_obj_t *obj, mp_uint_t obj_len, mp_uint_t flags, bool or_flags) {
+#if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+
+STATIC mp_uint_t poll_obj_get_events(poll_obj_t *poll_obj) {
+    assert(poll_obj->pollfd == NULL);
+    return poll_obj->nonfd_events;
+}
+
+STATIC void poll_obj_set_events(poll_obj_t *poll_obj, mp_uint_t events) {
+    if (poll_obj->pollfd != NULL) {
+        poll_obj->pollfd->events = events;
+    } else {
+        poll_obj->nonfd_events = events;
+    }
+}
+
+STATIC mp_uint_t poll_obj_get_revents(poll_obj_t *poll_obj) {
+    if (poll_obj->pollfd != NULL) {
+        return poll_obj->pollfd->revents;
+    } else {
+        return poll_obj->nonfd_revents;
+    }
+}
+
+STATIC void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents) {
+    if (poll_obj->pollfd != NULL) {
+        poll_obj->pollfd->revents = revents;
+    } else {
+        poll_obj->nonfd_revents = revents;
+    }
+}
+
+STATIC struct pollfd *poll_set_add_fd(poll_set_t *poll_set, int fd) {
+    struct pollfd *free_slot = NULL;
+    for (unsigned int i = 0; i < poll_set->len; ++i) {
+        struct pollfd *slot = &poll_set->pollfds[i];
+        if (slot->fd == -1) {
+            free_slot = slot;
+            break;
+        }
+    }
+
+    if (free_slot == NULL) {
+        if (poll_set->len >= poll_set->alloc) {
+            poll_set->pollfds = m_renew(struct pollfd, poll_set->pollfds, poll_set->alloc, poll_set->alloc + 4);
+            poll_set->alloc += 4;
+        }
+        free_slot = &poll_set->pollfds[poll_set->len++];
+    }
+
+    free_slot->fd = fd;
+
+    return free_slot;
+}
+
+static inline bool poll_set_all_are_fds(poll_set_t *poll_set) {
+    return poll_set->map.used == poll_set->len;
+}
+
+#else
+
+static inline mp_uint_t poll_obj_get_events(poll_obj_t *poll_obj) {
+    return poll_obj->events;
+}
+
+static inline void poll_obj_set_events(poll_obj_t *poll_obj, mp_uint_t events) {
+    poll_obj->events = events;
+}
+
+static inline mp_uint_t poll_obj_get_revents(poll_obj_t *poll_obj) {
+    return poll_obj->revents;
+}
+
+static inline void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents) {
+    poll_obj->revents = revents;
+}
+
+#endif
+
+STATIC void poll_set_add_obj(poll_set_t *poll_set, const mp_obj_t *obj, mp_uint_t obj_len, mp_uint_t events, bool or_events) {
     for (mp_uint_t i = 0; i < obj_len; i++) {
         mp_map_elem_t *elem = mp_map_lookup(&poll_set->map, mp_obj_id(obj[i]), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
         if (elem->value == MP_OBJ_NULL) {
             // object not found; get its ioctl and add it to the poll list
-            const mp_stream_p_t *stream_p = mp_get_stream_raise(obj[i], MP_STREAM_OP_IOCTL);
+
+            // If an exception is raised below when adding the new object then the map entry for that
+            // object remains unpopulated, and methods like poll() may crash.  This case is not handled.
+
             poll_obj_t *poll_obj = m_new_obj(poll_obj_t);
             poll_obj->obj = obj[i];
+
+            #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+            int fd = -1;
+            if (mp_obj_is_int(obj[i])) {
+                // A file descriptor integer passed in as the object, so use it directly.
+                fd = mp_obj_get_int(obj[i]);
+                if (fd < 0) {
+                    mp_raise_ValueError(NULL);
+                }
+                poll_obj->ioctl = NULL;
+            } else {
+                // An object passed in.  Check if it has a file descriptor.
+                const mp_stream_p_t *stream_p = mp_get_stream_raise(obj[i], MP_STREAM_OP_IOCTL);
+                poll_obj->ioctl = stream_p->ioctl;
+                int err;
+                mp_uint_t res = stream_p->ioctl(obj[i], MP_STREAM_GET_FILENO, 0, &err);
+                if (res != MP_STREAM_ERROR) {
+                    fd = res;
+                }
+            }
+            if (fd >= 0) {
+                // Object has a file descriptor so add it to pollfds.
+                poll_obj->pollfd = poll_set_add_fd(poll_set, fd);
+            } else {
+                // Object doesn't have a file descriptor.
+                poll_obj->pollfd = NULL;
+            }
+            #else
+            const mp_stream_p_t *stream_p = mp_get_stream_raise(obj[i], MP_STREAM_OP_IOCTL);
             poll_obj->ioctl = stream_p->ioctl;
-            poll_obj->flags = flags;
-            poll_obj->flags_ret = 0;
+            #endif
+
+            poll_obj_set_events(poll_obj, events);
+            poll_obj_set_revents(poll_obj, 0);
             elem->value = MP_OBJ_FROM_PTR(poll_obj);
         } else {
-            // object exists; update its flags
-            if (or_flags) {
-                ((poll_obj_t *)MP_OBJ_TO_PTR(elem->value))->flags |= flags;
-            } else {
-                ((poll_obj_t *)MP_OBJ_TO_PTR(elem->value))->flags = flags;
+            // object exists; update its events
+            poll_obj_t *poll_obj = (poll_obj_t *)MP_OBJ_TO_PTR(elem->value);
+            #if MICROPY_PY_SELECT_SELECT
+            if (or_events) {
+                events |= poll_obj_get_events(poll_obj);
             }
+            #else
+            (void)or_events;
+            #endif
+            poll_obj_set_events(poll_obj, events);
         }
     }
 }
@@ -94,9 +257,17 @@ STATIC mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
         }
 
         poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set->map.table[i].value);
+
+        #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+        if (poll_obj->pollfd != NULL) {
+            // Object has file descriptor so will be polled separately by poll().
+            continue;
+        }
+        #endif
+
         int errcode;
-        mp_int_t ret = poll_obj->ioctl(poll_obj->obj, MP_STREAM_POLL, poll_obj->flags, &errcode);
-        poll_obj->flags_ret = ret;
+        mp_int_t ret = poll_obj->ioctl(poll_obj->obj, MP_STREAM_POLL, poll_obj_get_events(poll_obj), &errcode);
+        poll_obj_set_revents(poll_obj, ret);
 
         if (ret == -1) {
             // error doing ioctl
@@ -106,6 +277,7 @@ STATIC mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
         if (ret != 0) {
             // object is ready
             n_ready += 1;
+            #if MICROPY_PY_SELECT_SELECT
             if (rwx_num != NULL) {
                 if (ret & MP_STREAM_POLL_RD) {
                     rwx_num[0] += 1;
@@ -117,21 +289,80 @@ STATIC mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
                     rwx_num[2] += 1;
                 }
             }
+            #else
+            (void)rwx_num;
+            #endif
         }
     }
     return n_ready;
 }
 
 STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size_t *rwx_num, mp_uint_t timeout) {
-    mp_uint_t start_tick = mp_hal_ticks_ms();
+    mp_uint_t start_ticks = mp_hal_ticks_ms();
+
+    #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+
+    for (;;) {
+        MP_THREAD_GIL_EXIT();
+
+        // Compute the timeout.
+        int t = MICROPY_PY_SELECT_IOCTL_CALL_PERIOD_MS;
+        if (poll_set_all_are_fds(poll_set)) {
+            // All our pollables are file descriptors, so we can use a blocking
+            // poll and let it (the underlying system) handle the timeout.
+            if (timeout == (mp_uint_t)-1) {
+                t = -1;
+            } else {
+                mp_uint_t delta = mp_hal_ticks_ms() - start_ticks;
+                if (delta >= timeout) {
+                    t = 0;
+                } else {
+                    t = timeout - delta;
+                }
+            }
+        }
+
+        // Call system poll for those objects that have a file descriptor.
+        int n_ready = poll(poll_set->pollfds, poll_set->len, t);
+
+        MP_THREAD_GIL_ENTER();
+
+        // The call to poll() may have been interrupted, but per PEP 475 we must retry if the
+        // signal is EINTR (this implements a special case of calling MP_HAL_RETRY_SYSCALL()).
+        if (n_ready == -1) {
+            int err = errno;
+            if (err != EINTR) {
+                mp_raise_OSError(err);
+            }
+            n_ready = 0;
+        }
+
+        // Explicitly poll any objects that do not have a file descriptor.
+        if (!poll_set_all_are_fds(poll_set)) {
+            n_ready += poll_set_poll_once(poll_set, rwx_num);
+        }
+
+        // Return if an object is ready, or if the timeout expired.
+        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_ticks >= timeout)) {
+            return n_ready;
+        }
+
+        // This would be MICROPY_EVENT_POLL_HOOK but the call to poll() above already includes a delay.
+        mp_handle_pending(true);
+    }
+
+    #else
+
     for (;;) {
         // poll the objects
         mp_uint_t n_ready = poll_set_poll_once(poll_set, rwx_num);
-        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
+        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_ticks >= timeout)) {
             return n_ready;
         }
         MICROPY_EVENT_POLL_HOOK
     }
+
+    #endif
 }
 
 #if MICROPY_PY_SELECT_SELECT
@@ -181,13 +412,13 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
             continue;
         }
         poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set.map.table[i].value);
-        if (poll_obj->flags_ret & MP_STREAM_POLL_RD) {
+        if (poll_obj->revents & MP_STREAM_POLL_RD) {
             ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[0]))->items[rwx_len[0]++] = poll_obj->obj;
         }
-        if (poll_obj->flags_ret & MP_STREAM_POLL_WR) {
+        if (poll_obj->revents & MP_STREAM_POLL_WR) {
             ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[1]))->items[rwx_len[1]++] = poll_obj->obj;
         }
-        if ((poll_obj->flags_ret & ~(MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)) != 0) {
+        if ((poll_obj->revents & ~(MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)) != 0) {
             ((mp_obj_list_t *)MP_OBJ_TO_PTR(list_array[2]))->items[rwx_len[2]++] = poll_obj->obj;
         }
     }
@@ -210,13 +441,13 @@ typedef struct _mp_obj_poll_t {
 // 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;
+    mp_uint_t events;
     if (n_args == 3) {
-        flags = mp_obj_get_int(args[2]);
+        events = mp_obj_get_int(args[2]);
     } else {
-        flags = MP_STREAM_POLL_RD | MP_STREAM_POLL_WR;
+        events = MP_STREAM_POLL_RD | MP_STREAM_POLL_WR;
     }
-    poll_set_add_obj(&self->poll_set, &args[1], 1, flags, false);
+    poll_set_add_obj(&self->poll_set, &args[1], 1, events, false);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);
@@ -224,7 +455,20 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);
 // 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_set.map, mp_obj_id(obj_in), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
+    mp_map_elem_t *elem = mp_map_lookup(&self->poll_set.map, mp_obj_id(obj_in), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
+
+    #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+    if (elem != NULL) {
+        poll_obj_t *poll_obj = (poll_obj_t *)MP_OBJ_TO_PTR(elem->value);
+        if (poll_obj->pollfd != NULL) {
+            poll_obj->pollfd->fd = -1;
+        }
+        elem->value = MP_OBJ_NULL;
+    }
+    #else
+    (void)elem;
+    #endif
+
     // TODO raise KeyError if obj didn't exist in map
     return mp_const_none;
 }
@@ -237,7 +481,7 @@ STATIC mp_obj_t poll_modify(mp_obj_t self_in, mp_obj_t obj_in, mp_obj_t eventmas
     if (elem == NULL) {
         mp_raise_OSError(MP_ENOENT);
     }
-    ((poll_obj_t *)MP_OBJ_TO_PTR(elem->value))->flags = mp_obj_get_int(eventmask_in);
+    poll_obj_set_events((poll_obj_t *)MP_OBJ_TO_PTR(elem->value), mp_obj_get_int(eventmask_in));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_3(poll_modify_obj, poll_modify);
@@ -277,12 +521,12 @@ STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
             continue;
         }
         poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_set.map.table[i].value);
-        if (poll_obj->flags_ret != 0) {
-            mp_obj_t tuple[2] = {poll_obj->obj, MP_OBJ_NEW_SMALL_INT(poll_obj->flags_ret)};
+        if (poll_obj_get_revents(poll_obj) != 0) {
+            mp_obj_t tuple[2] = {poll_obj->obj, MP_OBJ_NEW_SMALL_INT(poll_obj_get_revents(poll_obj))};
             ret_list->items[n_ready++] = mp_obj_new_tuple(2, tuple);
             if (self->flags & FLAG_ONESHOT) {
-                // Don't poll next time, until new event flags will be set explicitly
-                poll_obj->flags = 0;
+                // Don't poll next time, until new event mask will be set explicitly
+                poll_obj_set_events(poll_obj, 0);
             }
         }
     }
@@ -320,13 +564,13 @@ STATIC mp_obj_t poll_iternext(mp_obj_t self_in) {
             continue;
         }
         poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_set.map.table[i].value);
-        if (poll_obj->flags_ret != 0) {
+        if (poll_obj_get_revents(poll_obj) != 0) {
             mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->ret_tuple);
             t->items[0] = poll_obj->obj;
-            t->items[1] = MP_OBJ_NEW_SMALL_INT(poll_obj->flags_ret);
+            t->items[1] = MP_OBJ_NEW_SMALL_INT(poll_obj_get_revents(poll_obj));
             if (self->flags & FLAG_ONESHOT) {
-                // Don't poll next time, until new event flags will be set explicitly
-                poll_obj->flags = 0;
+                // Don't poll next time, until new event mask will be set explicitly
+                poll_obj_set_events(poll_obj, 0);
             }
             return MP_OBJ_FROM_PTR(t);
         }
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 41d7622b3747e..d70bc4738e2e4 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -188,7 +188,7 @@ 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_SELECT
+        #if MICROPY_PY_SELECT && !MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
         case MP_STREAM_POLL: {
             #ifdef _WIN32
             mp_raise_NotImplementedError(MP_ERROR_TEXT("poll on file not available on win32"));
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 9e320d584194a..082938ed5f4f3 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -107,6 +107,7 @@
 #endif
 
 // The "select" module is enabled by default, but disable select.select().
+#define MICROPY_PY_SELECT_POSIX_OPTIMISATIONS (1)
 #define MICROPY_PY_SELECT_SELECT       (0)
 
 // Enable the "websocket" module.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index c617f573b6c65..4a15205ae3237 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1485,11 +1485,16 @@ typedef double mp_float_t;
 #define MICROPY_PY_ERRNO_ERRORCODE (1)
 #endif
 
-// Whether to provide "select" module (baremetal implementation)
+// Whether to provide "select" module
 #ifndef MICROPY_PY_SELECT
 #define MICROPY_PY_SELECT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether to enable POSIX optimisations in the "select" module (requires system poll)
+#ifndef MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
+#define MICROPY_PY_SELECT_POSIX_OPTIMISATIONS (0)
+#endif
+
 // Whether to enable the select() function in the "select" module (baremetal
 // implementation). This is present for compatibility but can be disabled to
 // save space.

From 3f417e894309ee769b80aea85e9a45a826482c64 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Aug 2023 10:04:13 +1000
Subject: [PATCH 0184/3129] extmod/modselect: Remove undocumented support for
 flags arg to poll.

The signature of this method was poller.poll(timeout=-1, flags=0, /) but
the flags argument was not documented and is not CPython compatible.  So
it's removed in this commit.

(The optional flags remains for the ipoll() method, which is documented.)

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

diff --git a/extmod/modselect.c b/extmod/modselect.c
index 01b1474d75729..7c65e7dcaf1c4 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -58,7 +58,7 @@
 
 #endif
 
-// Flags for poll()
+// Flags for ipoll()
 #define FLAG_ONESHOT (1)
 
 // A single pollable object.
@@ -524,15 +524,11 @@ STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
         if (poll_obj_get_revents(poll_obj) != 0) {
             mp_obj_t tuple[2] = {poll_obj->obj, MP_OBJ_NEW_SMALL_INT(poll_obj_get_revents(poll_obj))};
             ret_list->items[n_ready++] = mp_obj_new_tuple(2, tuple);
-            if (self->flags & FLAG_ONESHOT) {
-                // Don't poll next time, until new event mask will be set explicitly
-                poll_obj_set_events(poll_obj, 0);
-            }
         }
     }
     return MP_OBJ_FROM_PTR(ret_list);
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 3, poll_poll);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 2, poll_poll);
 
 STATIC mp_obj_t poll_ipoll(size_t n_args, const mp_obj_t *args) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);

From 6b78a1bf00b4d95b018e64f84bc1f5a36502940e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Aug 2023 22:54:52 +1000
Subject: [PATCH 0185/3129] tests/extmod: Add coverage tests for select module.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/select_ipoll.py           | 55 +++++++++++++++++
 tests/extmod/select_ipoll.py.exp       |  6 ++
 tests/extmod/select_poll_basic.py      |  1 +
 tests/extmod/select_poll_custom.py     | 83 ++++++++++++++++++++++++++
 tests/extmod/select_poll_custom.py.exp | 11 ++++
 tests/extmod/select_poll_eintr.py      | 47 +++++++++++++++
 tests/extmod/select_poll_fd.py         | 44 ++++++++++++++
 7 files changed, 247 insertions(+)
 create mode 100644 tests/extmod/select_ipoll.py
 create mode 100644 tests/extmod/select_ipoll.py.exp
 create mode 100644 tests/extmod/select_poll_custom.py
 create mode 100644 tests/extmod/select_poll_custom.py.exp
 create mode 100644 tests/extmod/select_poll_eintr.py
 create mode 100644 tests/extmod/select_poll_fd.py

diff --git a/tests/extmod/select_ipoll.py b/tests/extmod/select_ipoll.py
new file mode 100644
index 0000000000000..0b661c11c8331
--- /dev/null
+++ b/tests/extmod/select_ipoll.py
@@ -0,0 +1,55 @@
+# Test select.ipoll().
+
+try:
+    import socket, select
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def print_poll_output(lst):
+    print([(type(obj), flags) for obj, flags in lst])
+
+
+poller = select.poll()
+
+# Use a new UDP socket for tests, which should be writable but not readable.
+try:
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+poller.register(s)
+
+# Basic polling.
+print_poll_output(poller.ipoll(0))
+
+# Pass in flags=1 for one-shot behaviour.
+print_poll_output(poller.ipoll(0, 1))
+
+# Socket should be deregistered and poll should return nothing.
+print_poll_output(poller.ipoll(0))
+
+# Create a second socket.
+s2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+s2.bind(socket.getaddrinfo("127.0.0.1", 8001)[0][-1])
+
+# Register both sockets (to reset the first one).
+poller.register(s)
+poller.register(s2)
+
+# Basic polling with two sockets.
+print_poll_output(poller.ipoll(0))
+
+# Unregister the first socket, to test polling the remaining one.
+poller.unregister(s)
+print_poll_output(poller.ipoll(0))
+
+# Unregister the second socket, to test polling none.
+poller.unregister(s2)
+print_poll_output(poller.ipoll(0))
+
+s2.close()
+s.close()
diff --git a/tests/extmod/select_ipoll.py.exp b/tests/extmod/select_ipoll.py.exp
new file mode 100644
index 0000000000000..cbeabdce902c8
--- /dev/null
+++ b/tests/extmod/select_ipoll.py.exp
@@ -0,0 +1,6 @@
+[(<class 'socket'>, 4)]
+[(<class 'socket'>, 4)]
+[]
+[(<class 'socket'>, 4), (<class 'socket'>, 4)]
+[(<class 'socket'>, 4)]
+[]
diff --git a/tests/extmod/select_poll_basic.py b/tests/extmod/select_poll_basic.py
index b36e16f0186de..0814d89ce93c2 100644
--- a/tests/extmod/select_poll_basic.py
+++ b/tests/extmod/select_poll_basic.py
@@ -16,6 +16,7 @@
 # "Registering a file descriptor that’s already registered is not an error,
 # and has the same effect as registering the descriptor exactly once."
 poller.register(s)
+poller.register(s, select.POLLIN | select.POLLOUT)
 
 # 2 args are mandatory unlike register()
 try:
diff --git a/tests/extmod/select_poll_custom.py b/tests/extmod/select_poll_custom.py
new file mode 100644
index 0000000000000..0cbb6103278e6
--- /dev/null
+++ b/tests/extmod/select_poll_custom.py
@@ -0,0 +1,83 @@
+# Test custom pollable objects implemented in Python.
+
+from micropython import const
+
+try:
+    import socket, select, io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+_MP_STREAM_POLL = const(3)
+_MP_STREAM_GET_FILENO = const(10)
+
+_MP_STREAM_POLL_RD = const(0x0001)
+_MP_STREAM_POLL_WR = const(0x0004)
+
+
+def print_poll_output(lst):
+    print([(type(obj), flags) for obj, flags in lst])
+
+
+class CustomPollable(io.IOBase):
+    def __init__(self):
+        self.poll_state = 0
+
+    def ioctl(self, cmd, arg):
+        if cmd == _MP_STREAM_GET_FILENO:
+            # Bare-metal ports don't call this ioctl, so don't print it.
+            return -1
+
+        print("CustomPollable.ioctl", cmd, arg)
+        if cmd == _MP_STREAM_POLL:
+            if self.poll_state == "delay_rd":
+                self.poll_state = _MP_STREAM_POLL_RD
+                return 0
+            elif self.poll_state < 0:
+                return self.poll_state
+            else:
+                return self.poll_state & arg
+
+
+poller = select.poll()
+
+# Use a new UDP socket for tests, which should be writable but not readable.
+try:
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+x = CustomPollable()
+
+# Register both a file-descriptor-based object and a custom pure-Python object.
+poller.register(s)
+poller.register(x)
+
+# Modify the flags for the custom object.
+poller.modify(x, select.POLLIN)
+
+# Test polling.
+print_poll_output(poller.poll(0))
+x.poll_state = _MP_STREAM_POLL_WR
+print_poll_output(poller.poll(0))
+x.poll_state = _MP_STREAM_POLL_RD
+print_poll_output(poller.poll(0))
+
+# The custom object becomes readable only after being polled.
+poller.modify(s, select.POLLIN)
+x.poll_state = "delay_rd"
+print_poll_output(poller.poll())
+
+# The custom object returns an error.
+x.poll_state = -1000
+try:
+    poller.poll(0)
+except OSError as er:
+    print("OSError", er.errno)
+
+poller.unregister(x)
+poller.unregister(s)
+
+s.close()
diff --git a/tests/extmod/select_poll_custom.py.exp b/tests/extmod/select_poll_custom.py.exp
new file mode 100644
index 0000000000000..bcb4d83e2dfa0
--- /dev/null
+++ b/tests/extmod/select_poll_custom.py.exp
@@ -0,0 +1,11 @@
+CustomPollable.ioctl 3 1
+[(<class 'socket'>, 4)]
+CustomPollable.ioctl 3 1
+[(<class 'socket'>, 4)]
+CustomPollable.ioctl 3 1
+[(<class 'socket'>, 4), (<class 'CustomPollable'>, 1)]
+CustomPollable.ioctl 3 1
+CustomPollable.ioctl 3 1
+[(<class 'CustomPollable'>, 1)]
+CustomPollable.ioctl 3 1
+OSError 1000
diff --git a/tests/extmod/select_poll_eintr.py b/tests/extmod/select_poll_eintr.py
new file mode 100644
index 0000000000000..f53efcc83e20c
--- /dev/null
+++ b/tests/extmod/select_poll_eintr.py
@@ -0,0 +1,47 @@
+# Test interruption of select.poll by EINTR signal, when
+# MICROPY_PY_SELECT_POSIX_OPTIMISATIONS is enabled.
+
+try:
+    import time, gc, select, socket, _thread
+
+    time.time_ns  # Check for time_ns on MicroPython
+    select.poll  # Raises AttributeError for CPython implementations without poll()
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+def thread_main():
+    lock.acquire()
+    time.sleep(0.2)
+    print("thread gc start")
+    # The unix gc.collect() implementation will raise EINTR on other threads.
+    # Could possibly use _thread._interrupt_main() instead if MicroPython had it.
+    gc.collect()
+    print("thread gc end")
+
+
+# Start a thread to interrupt the main thread during its call to poll.
+lock = _thread.allocate_lock()
+lock.acquire()
+_thread.start_new_thread(thread_main, ())
+
+# Use a new UDP socket for tests, which should be writable but not readable.
+s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
+
+# Create the poller object.
+poller = select.poll()
+poller.register(s, select.POLLIN)
+
+# Poll on the UDP socket for a set timeout, which should be reached.
+print("poll")
+lock.release()
+t0 = time.time_ns()
+result = poller.poll(400)
+dt_ms = (time.time_ns() - t0) / 1e6
+print("result:", result)
+print("dt in range:", 380 <= dt_ms <= 500)
+
+# Clean up.
+s.close()
diff --git a/tests/extmod/select_poll_fd.py b/tests/extmod/select_poll_fd.py
new file mode 100644
index 0000000000000..fab9c0e0e9459
--- /dev/null
+++ b/tests/extmod/select_poll_fd.py
@@ -0,0 +1,44 @@
+# Test select.poll in combination with file descriptors.
+
+try:
+    import select, errno
+
+    select.poll  # Raises AttributeError for CPython implementations without poll()
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+# Check that poll supports registering file descriptors (integers).
+try:
+    select.poll().register(0)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+# Register invalid file descriptor.
+try:
+    select.poll().register(-1)
+except ValueError:
+    print("ValueError")
+
+# Test polling stdout, it should be writable.
+poller = select.poll()
+poller.register(1)
+poller.modify(1, select.POLLOUT)
+print(poller.poll())
+
+# Unregister then re-register.
+poller.unregister(1)
+poller.register(1, select.POLLIN)
+
+# Poll for input, should return an empty list.
+print(poller.poll(0))
+
+# Test registering a very large number of file descriptors.
+poller = select.poll()
+for fd in range(6000):
+    poller.register(fd)
+try:
+    poller.poll()
+except OSError as er:
+    print(er.errno == errno.EINVAL)

From 218242d1de781124307be8720a7a9d2f373ca46b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Aug 2023 12:36:00 +1000
Subject: [PATCH 0186/3129] tests/extmod: Skip select/socket tests if they
 can't create UDP socket.

Some targets (eg PYBV10) have the socket module but are unable to create
UDP sockets without a registered NIC.  So skip UDP tests on these targets.

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

diff --git a/tests/extmod/select_poll_udp.py b/tests/extmod/select_poll_udp.py
index 336f987c120ff..133871b1a4292 100644
--- a/tests/extmod/select_poll_udp.py
+++ b/tests/extmod/select_poll_udp.py
@@ -8,9 +8,13 @@
     print("SKIP")
     raise SystemExit
 
+try:
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
+except OSError:
+    print("SKIP")
+    raise SystemExit
 
-s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
 poll = select.poll()
 
 # UDP socket should not be readable
diff --git a/tests/extmod/socket_udp_nonblock.py b/tests/extmod/socket_udp_nonblock.py
index f7ce5f34448ea..1e74e2917dc30 100644
--- a/tests/extmod/socket_udp_nonblock.py
+++ b/tests/extmod/socket_udp_nonblock.py
@@ -6,9 +6,13 @@
     print("SKIP")
     raise SystemExit
 
+try:
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
+except OSError:
+    print("SKIP")
+    raise SystemExit
 
-s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
 s.settimeout(0)
 
 try:

From 20d3a6b1964705596d690182956f56b4f7678041 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Aug 2023 13:17:04 +1000
Subject: [PATCH 0187/3129] extmod/modssl_mbedtls: Reject ioctls that are not
 supported.

An SSL stream can only handle CLOSE and POLL ioctls.  Other ones do not
make sense, or at least it doesn't make sense to pass the ioctl request
directly down to the underlying stream.

In particular MP_STREAM_GET_FILENO should not be passed to the underlying
stream because the SSL stream is not directly related to a file descriptor,
and the SSL stream must handle the polling itself.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modssl_mbedtls.c       |  4 ++++
 tests/extmod/ssl_ioctl.py     | 31 +++++++++++++++++++++++++++++++
 tests/extmod/ssl_ioctl.py.exp |  6 ++++++
 3 files changed, 41 insertions(+)
 create mode 100644 tests/extmod/ssl_ioctl.py
 create mode 100644 tests/extmod/ssl_ioctl.py.exp

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 6d78d7d1b372c..8974ff65dd508 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -514,6 +514,10 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
                 }
             }
         }
+    } else {
+        // Unsupported ioctl.
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
     }
 
     // Pass all requests down to the underlying socket
diff --git a/tests/extmod/ssl_ioctl.py b/tests/extmod/ssl_ioctl.py
new file mode 100644
index 0000000000000..4db7c2df82aeb
--- /dev/null
+++ b/tests/extmod/ssl_ioctl.py
@@ -0,0 +1,31 @@
+# Test SSL ioctl method.
+# Direct access to this method is only available if MICROPY_UNIX_COVERAGE is enabled.
+
+try:
+    import io, ssl
+
+    io.BytesIO
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+_MP_STREAM_POLL = 3
+_MP_STREAM_CLOSE = 4
+_MP_STREAM_GET_FILENO = 10
+
+s = ssl.wrap_socket(io.BytesIO(), server_side=1, do_handshake=0)
+
+if not hasattr(s, "ioctl"):
+    print("SKIP")
+    raise SystemExit
+
+# These ioctl's should be unsupported.
+for request in (-1, 0, _MP_STREAM_GET_FILENO):
+    try:
+        s.ioctl(request, 0)
+    except OSError:
+        print(request, "OSError")
+
+# These ioctl's should be supported.
+for request in (_MP_STREAM_CLOSE, _MP_STREAM_POLL, _MP_STREAM_CLOSE):
+    print(request, s.ioctl(request, 0))
diff --git a/tests/extmod/ssl_ioctl.py.exp b/tests/extmod/ssl_ioctl.py.exp
new file mode 100644
index 0000000000000..72de7ed06de58
--- /dev/null
+++ b/tests/extmod/ssl_ioctl.py.exp
@@ -0,0 +1,6 @@
+-1 OSError
+0 OSError
+10 OSError
+4 0
+3 32
+4 32

From d529c20674131b9ce36853b92784e901a1bc86f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Aug 2023 13:19:18 +1000
Subject: [PATCH 0188/3129] extmod/modssl_mbedtls: Fix ioctl of a socket in
 closed/error state.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modssl_mbedtls.c       | 13 +++++++++----
 tests/extmod/ssl_ioctl.py.exp |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 8974ff65dd508..b02b77b76ff1c 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -486,15 +486,20 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
     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) {
+        if (sock == MP_OBJ_NULL) {
+            // Already closed socket, do nothing.
+            return 0;
+        }
         self->sock = MP_OBJ_NULL;
         mbedtls_ssl_free(&self->ssl);
     } else if (request == MP_STREAM_POLL) {
+        if (sock == MP_OBJ_NULL || self->last_error != 0) {
+            // Closed or error socket, return NVAL flag.
+            return MP_STREAM_POLL_NVAL;
+        }
+
         // 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)) {
diff --git a/tests/extmod/ssl_ioctl.py.exp b/tests/extmod/ssl_ioctl.py.exp
index 72de7ed06de58..22208b00cc94d 100644
--- a/tests/extmod/ssl_ioctl.py.exp
+++ b/tests/extmod/ssl_ioctl.py.exp
@@ -3,4 +3,4 @@
 10 OSError
 4 0
 3 32
-4 32
+4 0

From 597fcb47518c842d445975961737832569fe3529 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 17:41:54 +1000
Subject: [PATCH 0189/3129] tools/mpy-tool.py: Use isinstance() for type
 checking.

Ruff version 283 expanded E721 to fail when making direct comparison
against a built-in type.  Change the code to use isinstance() as
suggested, these usages appear to have equivalent functionality.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/mpy-tool.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 7f581d0b1345c..a5112de9a1b9a 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -33,9 +33,9 @@
 
     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_str_type = lambda o: isinstance(o, str)
     is_bytes_type = lambda o: type(o) is bytearray
-    is_int_type = lambda o: type(o) is int or type(o) is long
+    is_int_type = lambda o: isinstance(o, int) or isinstance(o, long)
 
     def hexlify_to_str(b):
         x = hexlify_py2(b)
@@ -46,9 +46,9 @@ def hexlify_to_str(b):
 
     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
+    is_str_type = lambda o: isinstance(o, str)
+    is_bytes_type = lambda o: isinstance(o, bytes)
+    is_int_type = lambda o: isinstance(o, int)
 
     def hexlify_to_str(b):
         return str(hexlify(b, ":"), "ascii")
@@ -756,7 +756,7 @@ def freeze_constant_obj(self, obj_name, obj):
                 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:
+        elif isinstance(obj, float):
             macro_name = "%s_macro" % obj_name
             print(
                 "#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B"
@@ -777,7 +777,7 @@ def freeze_constant_obj(self, obj_name, obj):
             print("#endif")
             const_obj_content += 3 * 4
             return macro_name
-        elif type(obj) is complex:
+        elif isinstance(obj, 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)

From 8dbb29da3fe733f5a1350c5f9d3d7c3bc71870d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 9 Aug 2023 12:50:24 +0200
Subject: [PATCH 0190/3129] tools/codeformat.py: Skip formatting ESP-IDF
 managed components.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 tools/codeformat.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 517aced37a190..93a4b141234e6 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -60,6 +60,8 @@
 EXCLUSIONS = [
     # The cc3200 port is not fully formatted yet.
     "ports/cc3200/*/*.[ch]",
+    # ESP-IDF downloads 3rd party code.
+    "ports/esp32/managed_components/*",
     # The nrf port is not fully formatted yet.
     "ports/nrf/boards/*.[ch]",
     "ports/nrf/device/*.[ch]",

From 232c29c2ed799a520bbdb5e4729a71ea7f0335ce Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Wed, 2 Aug 2023 10:07:31 +0200
Subject: [PATCH 0191/3129] tools/codeformat.py: Use pyproject.toml for black
 config.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 tools/codeformat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 93a4b141234e6..761bde3a81ed3 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -90,6 +90,7 @@
 TOP = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 
 UNCRUSTIFY_CFG = os.path.join(TOP, "tools/uncrustify.cfg")
+PYPROJECT_TOML = os.path.join(TOP, "pyproject.toml")
 
 C_EXTS = (
     ".c",
@@ -208,7 +209,7 @@ def batch(cmd, files, N=200):
 
     # Format Python files with black.
     if format_py:
-        command = ["black", "--fast", "--line-length=99"]
+        command = ["black", "--fast", "--config={}".format(PYPROJECT_TOML)]
         if args.v:
             command.append("-v")
         else:

From 4bbe879c2668e5fd81f266a0779387337858cbf9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 7 Aug 2023 11:20:12 +1000
Subject: [PATCH 0192/3129] tools/mpremote: Make soft-reset count as an action.

Otherwise `mpremote soft-reset` will implicitly run the repl command.

Fixes issue #10871.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index de12aa0bb196e..aae612765b011 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -238,6 +238,7 @@ def do_resume(state, _args=None):
 
 def do_soft_reset(state, _args=None):
     state.ensure_raw_repl(soft_reset=True)
+    state.did_action()
 
 
 def do_rtc(state, args):

From 24a6e951ec7696b8d18d95fe5da36f7e489913d0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 4 Aug 2023 16:54:33 +1000
Subject: [PATCH 0193/3129] ports: Simplify board feature tags in board.json.

This commit:
- Finds a common set of board feature tags and maps existing features to
  that reduced set.
- Removes some less-useful board feature tags.
- Ensures all MCUs are specified correctly.
- Ensures all boards have a vendor (and fixes some vendor names).

This is to make the downloads page show a less intimidating set of filters.

Work done in conjunction with Matt Trentini <matt.trentini@gmail.com>.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/boards/WIPY/board.json             |  7 +++----
 .../esp32/boards/ARDUINO_NANO_ESP32/board.json  |  5 +++--
 ports/esp32/boards/ESP32_S2_WROVER/board.json   |  3 ++-
 ports/esp32/boards/GENERIC/board.json           |  1 +
 ports/esp32/boards/GENERIC_C3/board.json        |  1 +
 ports/esp32/boards/GENERIC_C3_USB/board.json    |  1 +
 ports/esp32/boards/GENERIC_D2WD/board.json      |  1 +
 ports/esp32/boards/GENERIC_OTA/board.json       |  1 +
 ports/esp32/boards/GENERIC_S2/board.json        |  1 +
 ports/esp32/boards/GENERIC_S3/board.json        |  1 +
 ports/esp32/boards/GENERIC_S3_SPIRAM/board.json |  1 +
 .../boards/GENERIC_S3_SPIRAM_OCT/board.json     |  1 +
 ports/esp32/boards/GENERIC_SPIRAM/board.json    |  3 ++-
 ports/esp32/boards/GENERIC_UNICORE/board.json   |  1 +
 .../esp32/boards/LILYGO_TTGO_LORA32/board.json  |  5 +++--
 ports/esp32/boards/LOLIN_C3_MINI/board.json     |  1 +
 ports/esp32/boards/LOLIN_S2_MINI/board.json     |  3 ++-
 ports/esp32/boards/LOLIN_S2_PICO/board.json     |  8 ++++----
 ports/esp32/boards/M5STACK_ATOM/board.json      |  4 ++--
 ports/esp32/boards/OLIMEX_ESP32_POE/board.json  |  6 +++---
 ports/esp32/boards/SIL_WESP32/board.json        |  3 ++-
 ports/esp32/boards/UM_FEATHERS2/board.json      |  5 +++--
 ports/esp32/boards/UM_FEATHERS2NEO/board.json   |  5 +++--
 ports/esp32/boards/UM_FEATHERS3/board.json      | 14 +++++++-------
 ports/esp32/boards/UM_PROS3/board.json          | 14 +++++++-------
 ports/esp32/boards/UM_TINYPICO/board.json       |  5 +++--
 ports/esp32/boards/UM_TINYS2/board.json         |  5 +++--
 ports/esp32/boards/UM_TINYS3/board.json         |  7 ++++---
 ports/esp8266/boards/GENERIC/board.json         |  1 +
 ports/esp8266/boards/GENERIC_1M/board.json      |  1 +
 ports/esp8266/boards/GENERIC_512K/board.json    |  1 +
 .../mimxrt/boards/ADAFRUIT_METRO_M7/board.json  | 14 +++++---------
 ports/mimxrt/boards/MIMXRT1010_EVK/board.json   |  8 +++-----
 ports/mimxrt/boards/MIMXRT1015_EVK/board.json   |  9 +++------
 ports/mimxrt/boards/MIMXRT1020_EVK/board.json   | 13 ++++++-------
 ports/mimxrt/boards/MIMXRT1050_EVK/board.json   | 14 ++++++--------
 ports/mimxrt/boards/MIMXRT1060_EVK/board.json   | 16 +++++++---------
 ports/mimxrt/boards/MIMXRT1064_EVK/board.json   | 16 +++++++---------
 ports/mimxrt/boards/MIMXRT1170_EVK/board.json   | 17 +++++++----------
 ports/mimxrt/boards/OLIMEX_RT1010/board.json    |  8 +++-----
 ports/mimxrt/boards/SEEED_ARCH_MIX/board.json   | 11 ++++++-----
 ports/mimxrt/boards/TEENSY40/board.json         |  3 ++-
 ports/mimxrt/boards/TEENSY41/board.json         |  5 +++--
 .../boards/arduino_nano_33_ble_sense/board.json | 15 ++++++---------
 ports/nrf/boards/arduino_primo/board.json       |  2 +-
 .../boards/nrf52840-mdk-usb-dongle/board.json   |  2 +-
 ports/nrf/boards/seeed_xiao_nrf52/board.json    | 13 ++++++-------
 ports/renesas-ra/boards/EK_RA4M1/board.json     |  9 ++-------
 ports/renesas-ra/boards/EK_RA4W1/board.json     |  9 ++-------
 ports/renesas-ra/boards/EK_RA6M1/board.json     |  9 ++-------
 ports/renesas-ra/boards/EK_RA6M2/board.json     |  9 ++-------
 .../renesas-ra/boards/RA4M1_CLICKER/board.json  |  9 ++-------
 ports/renesas-ra/boards/VK_RA6M5/board.json     |  9 ++-------
 .../boards/ADAFRUIT_FEATHER_RP2040/board.json   |  6 +++---
 .../boards/ADAFRUIT_ITSYBITSY_RP2040/board.json |  6 +++---
 .../rp2/boards/ADAFRUIT_QTPY_RP2040/board.json  |  7 +++----
 .../ARDUINO_NANO_RP2040_CONNECT/board.json      | 17 ++++++++---------
 .../GARATRONIC_PYBSTICK26_RP2040/board.json     | 10 ++++------
 ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json  |  6 +++---
 ports/rp2/boards/PICO/board.json                |  6 +++---
 ports/rp2/boards/PICO_W/board.json              | 10 +++++-----
 .../boards/PIMORONI_PICOLIPO_16MB/board.json    |  7 +++----
 .../rp2/boards/PIMORONI_PICOLIPO_4MB/board.json |  7 +++----
 ports/rp2/boards/PIMORONI_TINY2040/board.json   |  4 ++--
 ports/rp2/boards/SPARKFUN_PROMICRO/board.json   |  6 +++---
 ports/rp2/boards/SPARKFUN_THINGPLUS/board.json  | 10 +++++-----
 ports/rp2/boards/W5100S_EVB_PICO/board.json     |  6 +++---
 ports/rp2/boards/W5500_EVB_PICO/board.json      |  6 +++---
 ports/rp2/boards/WEACTSTUDIO/board.json         |  4 ++--
 .../ADAFRUIT_FEATHER_M0_EXPRESS/board.json      |  5 ++---
 .../ADAFRUIT_FEATHER_M4_EXPRESS/board.json      |  5 ++---
 .../ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json    |  5 ++---
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json    |  5 ++---
 .../boards/ADAFRUIT_METRO_M4_EXPRESS/board.json | 10 ++++------
 .../samd/boards/ADAFRUIT_TRINKET_M0/board.json  |  5 ++---
 ports/samd/boards/MINISAM_M4/board.json         |  4 ++--
 .../samd/boards/SAMD21_XPLAINED_PRO/board.json  |  8 +++++---
 ports/samd/boards/SEEED_WIO_TERMINAL/board.json | 15 +++++++++------
 ports/samd/boards/SEEED_XIAO_SAMD21/board.json  |  4 +++-
 .../SPARKFUN_SAMD51_THING_PLUS/board.json       |  7 +++----
 ports/stm32/boards/ARDUINO_GIGA/board.json      | 11 ++++++-----
 .../boards/ARDUINO_NICLA_VISION/board.json      | 11 ++++++-----
 .../stm32/boards/ARDUINO_PORTENTA_H7/board.json | 15 +++++++--------
 ports/stm32/boards/CERB40/board.json            |  4 ++--
 ports/stm32/boards/HYDRABUS/board.json          |  4 ++--
 ports/stm32/boards/LEGO_HUB_NO6/board.json      |  2 +-
 ports/stm32/boards/LIMIFROG/board.json          |  4 ++--
 ports/stm32/boards/MIKROE_QUAIL/board.json      |  2 +-
 ports/stm32/boards/NETDUINO_PLUS_2/board.json   |  4 ++--
 ports/stm32/boards/PYBD_SF6/board.json          |  4 ++--
 ports/stm32/boards/STM32F439/board.json         |  2 +-
 ports/stm32/boards/USBDONGLE_WB55/board.json    |  2 +-
 92 files changed, 279 insertions(+), 313 deletions(-)

diff --git a/ports/cc3200/boards/WIPY/board.json b/ports/cc3200/boards/WIPY/board.json
index d8293b248190a..4a5a81f99ff2c 100644
--- a/ports/cc3200/boards/WIPY/board.json
+++ b/ports/cc3200/boards/WIPY/board.json
@@ -5,11 +5,10 @@
     "docs": "https://docs.pycom.io/datasheets/development/wipy3/",
     "features": [
         "BLE",
-        "Breadboard Friendly",
-        "MicroSD",
+        "External Flash",
         "RGB LED",
-        "SPI Flash",
-        "WiFi"
+        "WiFi",
+        "microSD"
     ],
     "id": "wipy",
     "images": [
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
index afb24e10494bc..77aa192959954 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
@@ -5,9 +5,10 @@
     "docs": "",
     "features": [
         "BLE",
-        "WiFi",
+        "External Flash",
+        "RGB LED",
         "USB-C",
-        "RGB LED"
+        "WiFi"
     ],
     "images": [
         "ABX00092_01.iso_1000x750.jpg"
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/board.json b/ports/esp32/boards/ESP32_S2_WROVER/board.json
index 7ebc84415c16d..d4c4ce21dff32 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/board.json
+++ b/ports/esp32/boards/ESP32_S2_WROVER/board.json
@@ -5,7 +5,8 @@
     "docs": "",
     "features": [
         "BLE",
-        "SPIRAM",
+        "External Flash",
+        "External RAM",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
index a52d58007d0cb..f70e2e0890fa3 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32",
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json
index 6cc326bf1430e..c993c87603e9a 100644
--- a/ports/esp32/boards/GENERIC_C3/board.json
+++ b/ports/esp32/boards/GENERIC_C3/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32c3",
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
index 23f9a8eb2023b..6d51e0a2c1519 100644
--- a/ports/esp32/boards/GENERIC_C3_USB/board.json
+++ b/ports/esp32/boards/GENERIC_C3_USB/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32c3-usb",
diff --git a/ports/esp32/boards/GENERIC_D2WD/board.json b/ports/esp32/boards/GENERIC_D2WD/board.json
index 39fce46bcabcd..0582820445f96 100644
--- a/ports/esp32/boards/GENERIC_D2WD/board.json
+++ b/ports/esp32/boards/GENERIC_D2WD/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32-d2wd",
diff --git a/ports/esp32/boards/GENERIC_OTA/board.json b/ports/esp32/boards/GENERIC_OTA/board.json
index 97756a9fb2c53..3b882e04f8ffa 100644
--- a/ports/esp32/boards/GENERIC_OTA/board.json
+++ b/ports/esp32/boards/GENERIC_OTA/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32-ota",
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
index dbd3b5b015fd3..102b039bf81a1 100644
--- a/ports/esp32/boards/GENERIC_S2/board.json
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
index 0db9b3250330c..c30d4ed993957 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
index 3b405d4a122ca..947787f3af8a1 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
index f3ca177ef974a..4cf15e888c984 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.json b/ports/esp32/boards/GENERIC_SPIRAM/board.json
index afb57b2ed1255..02242028fb6e1 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_SPIRAM/board.json
@@ -5,7 +5,8 @@
     "docs": "",
     "features": [
         "BLE",
-        "SPIRAM",
+        "External Flash",
+        "External RAM",
         "WiFi"
     ],
     "id": "esp32spiram",
diff --git a/ports/esp32/boards/GENERIC_UNICORE/board.json b/ports/esp32/boards/GENERIC_UNICORE/board.json
index 8fed71a018aa5..1f3beaf6e082e 100644
--- a/ports/esp32/boards/GENERIC_UNICORE/board.json
+++ b/ports/esp32/boards/GENERIC_UNICORE/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "WiFi"
     ],
     "id": "esp32-unicore",
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
index 9dd76b5792376..525551df3b174 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
@@ -5,10 +5,11 @@
     "docs": "",
     "features": [
         "BLE",
+        "Display",
+        "External Flash",
         "LoRa",
-        "OLED",
         "SDCard",
-        "USB-MICRO",
+        "USB",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/board.json b/ports/esp32/boards/LOLIN_C3_MINI/board.json
index f47c672fa49ad..c9b91641e5288 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_C3_MINI/board.json
@@ -5,6 +5,7 @@
     "docs": "",
     "features": [
         "BLE",
+        "External Flash",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
index 41e62a02287bb..a45d0434d995d 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -4,7 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "SPIRAM",
+        "External Flash",
+        "External RAM",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/board.json b/ports/esp32/boards/LOLIN_S2_PICO/board.json
index 43322b87b0a91..6c72e60f80546 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/board.json
+++ b/ports/esp32/boards/LOLIN_S2_PICO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "OLED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
+        "Display",
+        "External Flash",
+        "External RAM",
+        "JST-SH",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/M5STACK_ATOM/board.json b/ports/esp32/boards/M5STACK_ATOM/board.json
index 9d1886887c679..4b6c09db3a7e8 100644
--- a/ports/esp32/boards/M5STACK_ATOM/board.json
+++ b/ports/esp32/boards/M5STACK_ATOM/board.json
@@ -4,9 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Grove",
+        "External Flash",
         "IMU",
-        "Infrared",
+        "JST-PH",
         "RGB LED",
         "USB-C",
         "WiFi"
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
index 84b6680d591b4..e62b960ccd681 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
@@ -5,12 +5,12 @@
     "docs": "",
     "features": [
         "BLE",
-        "WiFi",
-        "MicroSD",
         "Battery Charging",
         "Ethernet",
+        "External Flash",
         "PoE",
-        "Breadboard friendly"
+        "WiFi",
+        "microSD"
     ],
     "images": [
         "ESP32-POE-ISO-1.jpg"
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 050620d618014..5c77b4887ad18 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -6,6 +6,7 @@
     "features": [
         "BLE",
         "Ethernet",
+        "External Flash",
         "PoE",
         "WiFi"
     ],
@@ -18,5 +19,5 @@
     "product": "SIL WESP32",
     "thumbnail": "",
     "url": "https://wesp32.com/",
-    "vendor": "Silicognition LLC"
+    "vendor": "Silicognition"
 }
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index fa5b213db0137..4b6ea88558941 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -5,10 +5,11 @@
     "docs": "",
     "features": [
         "Battery Charging",
+        "External Flash",
+        "External RAM",
         "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index d809485e86efc..51bb02b97b230 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -5,10 +5,11 @@
     "docs": "",
     "features": [
         "Battery Charging",
+        "External Flash",
+        "External RAM",
         "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS3/board.json b/ports/esp32/boards/UM_FEATHERS3/board.json
index 68423cca5e5de..0ad1ff73becb0 100644
--- a/ports/esp32/boards/UM_FEATHERS3/board.json
+++ b/ports/esp32/boards/UM_FEATHERS3/board.json
@@ -4,17 +4,17 @@
     ],
     "docs": "",
     "features": [
+        "BLE",
         "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
-        "WiFi",
-        "BLE",
-        "STEMMA QT/QWIIC",
-        "Feather"
-    ],
-    "features_non_filterable": [
+        "WiFi"
     ],
+    "features_non_filterable": [],
     "id": "feathers3",
     "images": [
         "unexpectedmaker_feathers3.jpg"
diff --git a/ports/esp32/boards/UM_PROS3/board.json b/ports/esp32/boards/UM_PROS3/board.json
index 0122e4b99167a..3e83a813f4b24 100644
--- a/ports/esp32/boards/UM_PROS3/board.json
+++ b/ports/esp32/boards/UM_PROS3/board.json
@@ -4,17 +4,17 @@
     ],
     "docs": "",
     "features": [
+        "BLE",
         "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
-        "WiFi",
-        "BLE",
-        "STEMMA QT/QWIIC",
-        "Feather"
-    ],
-    "features_non_filterable": [
+        "WiFi"
     ],
+    "features_non_filterable": [],
     "id": "pros3",
     "images": [
         "unexpectedmaker_pros3.jpg"
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index 9f1783a9f1e45..f6ba9ddb0edb6 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -4,10 +4,11 @@
     ],
     "docs": "",
     "features": [
-        "Battery Charging",
         "BLE",
+        "Battery Charging",
+        "External Flash",
+        "External RAM",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index e7068170cbcbc..b6c94ba9e89d8 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -5,9 +5,10 @@
     "docs": "",
     "features": [
         "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "JST-SH",
         "RGB LED",
-        "SPIRAM",
-        "STEMMA QT/QWIIC",
         "USB-C",
         "WiFi"
     ],
diff --git a/ports/esp32/boards/UM_TINYS3/board.json b/ports/esp32/boards/UM_TINYS3/board.json
index 73482a6284f6f..3b7bb13345394 100644
--- a/ports/esp32/boards/UM_TINYS3/board.json
+++ b/ports/esp32/boards/UM_TINYS3/board.json
@@ -4,12 +4,13 @@
     ],
     "docs": "",
     "features": [
+        "BLE",
         "Battery Charging",
+        "External Flash",
+        "External RAM",
         "RGB LED",
-        "SPIRAM",
         "USB-C",
-        "WiFi",
-        "BLE"
+        "WiFi"
     ],
     "features_non_filterable": [
         "TinyPICO Compatible"
diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/GENERIC/board.json
index 46c2659d8a7e2..ebdd95493b6d1 100644
--- a/ports/esp8266/boards/GENERIC/board.json
+++ b/ports/esp8266/boards/GENERIC/board.json
@@ -4,6 +4,7 @@
     ],
     "docs": "",
     "features": [
+        "External Flash",
         "WiFi"
     ],
     "id": "esp8266",
diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json
index 2ef4bd99fa570..5446f291284b6 100644
--- a/ports/esp8266/boards/GENERIC_1M/board.json
+++ b/ports/esp8266/boards/GENERIC_1M/board.json
@@ -4,6 +4,7 @@
     ],
     "docs": "",
     "features": [
+        "External Flash",
         "WiFi"
     ],
     "id": "esp8266-1m",
diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json
index 10050592cf404..1feac4a05cbaa 100644
--- a/ports/esp8266/boards/GENERIC_512K/board.json
+++ b/ports/esp8266/boards/GENERIC_512K/board.json
@@ -4,6 +4,7 @@
     ],
     "docs": "",
     "features": [
+        "External Flash",
         "WiFi"
     ],
     "id": "esp8266-512k",
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
index c96e9b08fe217..9f260b3a00f9b 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
@@ -4,16 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "USB-C",
-        "SPI",
-        "I2C",
-        "UART",
+        "BLE",
+        "External Flash",
+        "JST-SH",
         "RGB LED",
-        "QSPI Flash",
-        "QWIIC",
-        "JLink",
-        "WiFi",
-        "BLE"
+        "USB-C",
+        "WiFi"
     ],
     "images": [
         "Metro_M7.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
index 4bf9ce052457b..3fc3403c069a7 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
@@ -4,12 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "MicroUSB",
+        "Audio Codec",
+        "External Flash",
         "Microphone",
-        "AudioCodec",
-        "SPDIF",
-        "OpenSDA",
-        "JLink"
+        "USB"
     ],
     "images": [
         "i.MXRT1010-TOP.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/board.json b/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
index 78044c134e53f..d0bdd920bc522 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
@@ -4,13 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "MicroSD",
-        "MicroUSB",
+        "Audio Codec",
+        "External Flash",
         "Microphone",
-        "AudioCodec",
-        "CAN",
-        "OpenSDA",
-        "JLink"
+        "USB"
     ],
     "images": [
         "MIMXRT1015-EVK-TOP.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
index cc74c25fed433..4da224fc99c64 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
@@ -4,15 +4,14 @@
     ],
     "docs": "",
     "features": [
+        "Audio Codec",
+        "CAN",
         "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
+        "External Flash",
+        "External RAM",
         "Microphone",
-        "AudioCodec",
-        "CAN",
-        "OpenSDA",
-        "JLink"
+        "USB",
+        "microSD"
     ],
     "images": [
         "MIMXRT-1020-EVKBD.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
index d99ad9fcfdc0e..d7c82358cc41b 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
@@ -4,16 +4,14 @@
     ],
     "docs": "",
     "features": [
+        "Audio Codec",
+        "CAN",
         "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
+        "External Flash",
+        "External RAM",
         "Microphone",
-        "AudioCodec",
-        "SPDIF",
-        "CAN",
-        "OpenSDA",
-        "JLink"
+        "USB",
+        "microSD"
     ],
     "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 67a3818ee27dd..73c0cd1395c37 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
@@ -4,17 +4,15 @@
     ],
     "docs": "",
     "features": [
-        "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
-        "Microphone",
-        "AudioCodec",
-        "SPDIF",
+        "Audio Codec",
         "CAN",
         "Camera",
-        "OpenSDA",
-        "JLink"
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "Microphone",
+        "USB",
+        "microSD"
     ],
     "images": [
         "X-MIMXRT1060-EVK-BOARD-BOTTOM.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
index ef12336c445d7..a573009d381b8 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
@@ -4,17 +4,15 @@
     ],
     "docs": "",
     "features": [
-        "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
-        "Microphone",
-        "AudioAmp",
-        "SPDIF",
+        "Audio Codec",
         "CAN",
         "Camera",
-        "OpenSDA",
-        "JLink"
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "Microphone",
+        "USB",
+        "microSD"
     ],
     "images": [
         "MIMXRT1064EVK-TOP.jpg"
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/board.json b/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
index 01e554751b466..73453b45a6655 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
@@ -4,18 +4,15 @@
     ],
     "docs": "",
     "features": [
-        "Ethernet",
-        "SDRAM",
-        "MicroSD",
-        "MicroUSB",
-        "Microphone",
-        "AudioCodec",
-        "SPDIF",
+        "Audio Codec",
         "CAN",
         "Camera",
-        "SIM Socket",
-        "OpenSDA",
-        "JLink"
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "Microphone",
+        "USB",
+        "microSD"
     ],
     "images": [
         "IMX-RT1170-EVK-TOP.jpg"
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/board.json b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
index 1778725658630..882b931f8b7d2 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/board.json
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
@@ -4,11 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "MicroUSB",
-        "MicroSD",
-        "AudioCodec",
-        "SPDIF",
-        "JLink"
+        "External Flash",
+        "USB",
+        "microSD"
     ],
     "images": [
         "OLIMEX_RT1010Py.jpg"
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json b/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
index 3142f1a814317..138d28418cb89 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
@@ -4,10 +4,11 @@
     ],
     "docs": "",
     "features": [
-        "MicroSD",
-        "MicroUSB",
-        "SDRAM",
-        "RGB LED"
+        "External Flash",
+        "External RAM",
+        "RGB LED",
+        "USB",
+        "microSD"
     ],
     "images": [
         "main1.jpg"
@@ -16,5 +17,5 @@
     "product": "Arch Mix",
     "thumbnail": "",
     "url": "https://wiki.seeedstudio.com/Arch_Mix/",
-    "vendor": "Seeed Technology Co.,Ltd."
+    "vendor": "Seeed Studio"
 }
diff --git a/ports/mimxrt/boards/TEENSY40/board.json b/ports/mimxrt/boards/TEENSY40/board.json
index daa6dbf99e04f..599fb2f7296a2 100644
--- a/ports/mimxrt/boards/TEENSY40/board.json
+++ b/ports/mimxrt/boards/TEENSY40/board.json
@@ -4,7 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly"
+        "External Flash",
+        "USB"
     ],
     "images": [
         "teensy40_front.jpg"
diff --git a/ports/mimxrt/boards/TEENSY41/board.json b/ports/mimxrt/boards/TEENSY41/board.json
index 1f8fe37a99962..08235d4dae618 100644
--- a/ports/mimxrt/boards/TEENSY41/board.json
+++ b/ports/mimxrt/boards/TEENSY41/board.json
@@ -4,9 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "MicroSD",
         "Ethernet",
-        "Breadboard Friendly"
+        "External Flash",
+        "USB",
+        "microSD"
     ],
     "images": [
         "teensy41_4.jpg"
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json b/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
index 65a8e24350595..9079fbd666d7a 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
@@ -4,15 +4,12 @@
     ],
     "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"
+        "BLE",
+        "Environment Sensor",
+        "IMU",
+        "Microphone",
+        "Secure Element",
+        "USB"
     ],
     "images": [
         "ABX00031_01.iso_998x749.jpg"
diff --git a/ports/nrf/boards/arduino_primo/board.json b/ports/nrf/boards/arduino_primo/board.json
index d16ce1c3460f0..f7afed0ced576 100644
--- a/ports/nrf/boards/arduino_primo/board.json
+++ b/ports/nrf/boards/arduino_primo/board.json
@@ -11,5 +11,5 @@
     "product": "arduino_primo",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "Arduino"
 }
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
index 853c3757105cd..99d0caad235df 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
@@ -11,5 +11,5 @@
     "product": "nrf52840-mdk-usb-dongle",
     "thumbnail": "",
     "url": "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle",
-    "vendor": ""
+    "vendor": "Makerdiary"
 }
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.json b/ports/nrf/boards/seeed_xiao_nrf52/board.json
index 619a7c23b9e8b..d40355bb2e2d8 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/board.json
+++ b/ports/nrf/boards/seeed_xiao_nrf52/board.json
@@ -4,14 +4,13 @@
     ],
     "docs": "",
     "features": [
-        "Bluetooth 5.0",
-        "IMU LSM6DS3TR",
-        "Microphone MSM261D3526H1CPM",
-        "USB-C",
-        "Breadboard Friendly",
-        "Battery Management",
+        "BLE",
+        "Battery Charging",
+        "External Flash",
+        "IMU",
+        "Microphone",
         "RGB LED",
-        "QSPI Flash"
+        "USB-C"
     ],
     "images": [
         "XIAO_nrf52840_front.jpg"
diff --git a/ports/renesas-ra/boards/EK_RA4M1/board.json b/ports/renesas-ra/boards/EK_RA4M1/board.json
index bab3bcacee296..d21fe0c121220 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4M1/board.json
@@ -3,17 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA4M1",
     "images": [
         "ek_ra4m1_board.jpg"
     ],
-    "mcu": "RA4M1",
+    "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",
diff --git a/ports/renesas-ra/boards/EK_RA4W1/board.json b/ports/renesas-ra/boards/EK_RA4W1/board.json
index db06b6751db92..878d97a8acdbf 100644
--- a/ports/renesas-ra/boards/EK_RA4W1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4W1/board.json
@@ -3,17 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA4W1",
     "images": [
         "ek_ra4w1_board.jpg"
     ],
-    "mcu": "RA4W1",
+    "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",
diff --git a/ports/renesas-ra/boards/EK_RA6M1/board.json b/ports/renesas-ra/boards/EK_RA6M1/board.json
index babcc5c166aa1..d678fa387e089 100644
--- a/ports/renesas-ra/boards/EK_RA6M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M1/board.json
@@ -3,17 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA6M1",
     "images": [
         "ek_ra6m1_board.jpg"
     ],
-    "mcu": "RA6M1",
+    "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",
diff --git a/ports/renesas-ra/boards/EK_RA6M2/board.json b/ports/renesas-ra/boards/EK_RA6M2/board.json
index 63547d880733d..3d6b95aacb8a3 100644
--- a/ports/renesas-ra/boards/EK_RA6M2/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M2/board.json
@@ -3,12 +3,7 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "EK-RA6M2",
     "images": [
         "ek_ra6m2_board.jpg",
@@ -17,7 +12,7 @@
         "ek_ra6m2_j3_pins.jpg",
         "ek_ra6m2_j4_pins.jpg"
     ],
-    "mcu": "RA6M2",
+    "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",
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
index 1c3c4c8e91e22..8cb64f660103e 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
@@ -3,18 +3,13 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [
-	"UART",
-	"SPI",
-	"I2C",
-	"ADC"
-    ],
+    "features": [],
     "id": "RA4M1-CLICKER",
     "images": [
         "ra4m1_clicker_board.jpg",
         "ra4m1_clicker_pins.jpg"
     ],
-    "mcu": "RA4M1",
+    "mcu": "ra4m1",
     "product": "Mikroe RA4M1 Clicker",
     "thumbnail": "",
     "url": "https://www.mikroe.com/ra4m1-clicker",
diff --git a/ports/renesas-ra/boards/VK_RA6M5/board.json b/ports/renesas-ra/boards/VK_RA6M5/board.json
index ae11d52213476..b2ff6b0e401e5 100644
--- a/ports/renesas-ra/boards/VK_RA6M5/board.json
+++ b/ports/renesas-ra/boards/VK_RA6M5/board.json
@@ -4,18 +4,13 @@
     ],
     "docs": "",
     "features": [
-        "UART",
-        "SPI",
-        "I2C",
-        "ADC",
-        "DAC",
-        "PWM"
+        "DAC"
     ],
     "id": "VK-RA6M5",
     "images": [
         "VK-RA6M5.jpg"
     ],
-    "mcu": "RA6M5",
+    "mcu": "ra6m5",
     "product": "VK-RA6M5",
     "thumbnail": "",
     "url": "https://vekatech.com/VK-RA6M5_docs/brochures/VK-RA6M5%20Flyer%20R2.pdf",
diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
index a7db469389c14..be63f4430be5c 100644
--- a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
@@ -5,11 +5,11 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "Dual-core",
+        "External Flash",
         "Feather",
+        "JST-SH",
         "RGB LED",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
index 7ca0db06985ef..ea9070e13cc5d 100644
--- a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
+        "Dual-core",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "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 d63166616ff0a..d5e4394f4ea3a 100644
--- a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
@@ -4,11 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "RGB LED",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
index 5bd03e1e0b7e2..5639aaa2a4b7b 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
@@ -4,15 +4,14 @@
     ],
     "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"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "IMU",
+        "Microphone",
+        "Secure Element",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00052_01.iso_999x750.jpg"
diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
index 1b9e113143c3f..df9dd5d0de8e4 100644
--- a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
@@ -4,12 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "USB Stick form factor",
-        "Breadboard Friendly",
-        "Reset/User button",
-        "Red/green/orange/blue leds",
-        "1MB SPI Flash",
-        "USB-A"
+        "Dual-core",
+        "External Flash",
+        "RGB LED",
+        "USB"
     ],
     "images": [
         "pybstick-rp2040-26-broches-micropython-c.jpg"
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
index 2aff0580d879a..08aa7068ef160 100644
--- a/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
+        "Dual-core",
+        "External Flash",
         "RGB LED",
-        "USB-C",
-        "SPI Flash"
+        "USB-C"
     ],
     "images": [
         "nullbits_bit_c_pro.jpg"
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/PICO/board.json
index 9abf505e54355..8c0a12ae76c4d 100644
--- a/ports/rp2/boards/PICO/board.json
+++ b/ports/rp2/boards/PICO/board.json
@@ -4,9 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard friendly",
-        "Castellated Pads",
-        "Micro USB"
+        "Dual-core",
+        "External Flash",
+        "USB"
     ],
     "id": "rp2-pico",
     "images": [
diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/PICO_W/board.json
index a85d7e0446642..7ee7ef505e4d1 100644
--- a/ports/rp2/boards/PICO_W/board.json
+++ b/ports/rp2/boards/PICO_W/board.json
@@ -4,11 +4,11 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard friendly",
-        "Castellated Pads",
-        "Micro USB",
-        "WiFi",
-        "Bluetooth"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "USB",
+        "WiFi"
     ],
     "id": "rp2-pico-w",
     "images": [
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
index 9121154d81ca7..c44ea555142c2 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
@@ -5,10 +5,9 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
-        "Castellated Pads",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
index 69d8532397a39..cb06c746b62b0 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
@@ -5,10 +5,9 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
-        "Castellated Pads",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/board.json b/ports/rp2/boards/PIMORONI_TINY2040/board.json
index 753a25beaed31..207647f6b28f6 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/board.json
+++ b/ports/rp2/boards/PIMORONI_TINY2040/board.json
@@ -4,8 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
+        "External Flash",
         "RGB LED",
         "USB-C"
     ],
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
index a0d39165affb8..46878a29cd889 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
+        "External Flash",
+        "JST-SH",
         "RGB LED",
-        "STEMMA QT/QWIIC",
         "USB-C"
     ],
     "images": [
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
index 871a411b5b950..3eeb397265572 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
@@ -5,13 +5,13 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "Dual-core",
+        "External Flash",
         "Feather",
-        "MicroSD",
+        "JST-SH",
         "RGB LED",
-        "SPI Flash",
-        "STEMMA QT/QWIIC",
-        "USB-C"
+        "USB-C",
+        "microSD"
     ],
     "images": [
         "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/board.json b/ports/rp2/boards/W5100S_EVB_PICO/board.json
index 4091b78433e4a..daaf1cf8ac8af 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/board.json
+++ b/ports/rp2/boards/W5100S_EVB_PICO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
         "Ethernet",
-        "Micro USB"
+        "External Flash",
+        "USB"
     ],
     "images": [
         "W5100S-EVB-Pico.jpg"
diff --git a/ports/rp2/boards/W5500_EVB_PICO/board.json b/ports/rp2/boards/W5500_EVB_PICO/board.json
index 90b3186cd6b1b..93598255599bf 100644
--- a/ports/rp2/boards/W5500_EVB_PICO/board.json
+++ b/ports/rp2/boards/W5500_EVB_PICO/board.json
@@ -4,10 +4,10 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Castellated Pads",
+        "Dual-core",
         "Ethernet",
-        "Micro USB"
+        "External Flash",
+        "USB"
     ],
     "images": [
         "W5500-EVB-Pico.jpg"
diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
index bac5263627ba2..3a3f2f741f8ad 100644
--- a/ports/rp2/boards/WEACTSTUDIO/board.json
+++ b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -4,8 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "SPI Flash",
+        "Dual-core",
+        "External Flash",
         "USB-C"
     ],
     "images": [
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
index b0cb02cd4f037..22a9ffccba49a 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
@@ -5,11 +5,10 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "External Flash",
         "Feather",
-        "Micro USB",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "feather_m0_express.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
index c8042aa254733..06cd9a4fe4d9b 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
@@ -5,11 +5,10 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
+        "External Flash",
         "Feather",
-        "Micro USB",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "feather_m4_express.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
index f99d19ca87f87..0e423b2b8eeb7 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
@@ -4,10 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "itsybitsy_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 83db285b4d313..a998529ccde2e 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
@@ -4,10 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "images": [
         "itsybitsy_m4_express.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
index e0a256cf8817c..f830ff223f909 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
@@ -4,14 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "Micro USB",
-        "ADC",
+        "BLE",
         "DAC",
+        "External Flash",
         "RGB LED",
-        "QSPI Flash",
-        "WiFi",
-        "BLE",
-        "JLink"
+        "USB",
+        "WiFi"
     ],
     "images": [
         "metro_m4_express_airlift.jpg"
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
index 9112bc06efe2d..d77282db01aad 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
@@ -4,9 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "Breadboard Friendly",
-        "Micro USB",
-        "RGB LED"
+        "RGB LED",
+        "USB"
     ],
     "images": [
         "trinket_m0.jpg"
diff --git a/ports/samd/boards/MINISAM_M4/board.json b/ports/samd/boards/MINISAM_M4/board.json
index 126e0364009f3..6489dae863b0e 100644
--- a/ports/samd/boards/MINISAM_M4/board.json
+++ b/ports/samd/boards/MINISAM_M4/board.json
@@ -4,9 +4,9 @@
     ],
     "docs": "",
     "features": [
-        "Micro USB",
+        "External Flash",
         "RGB LED",
-        "SPI Flash"
+        "USB"
     ],
     "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 4d22c42bad58f..c59ebc1b7b7be 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "Micro USB",
-        "SPI Flash"
+        "External Flash",
+        "USB"
+    ],
+    "images": [
+        "2033-atsamd21-xpro.jpg"
     ],
-    "images": ["2033-atsamd21-xpro.jpg"],
     "mcu": "samd21",
     "product": "SAMD21 Xplained Pro",
     "thumbnail": "",
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/board.json b/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
index 350ada4c4a82f..5300b03808a56 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
@@ -4,14 +4,17 @@
     ],
     "docs": "",
     "features": [
-        "USB-C",
-        "Display",
-        "Grove",
-        "WiFi",
         "BLE",
-        "SDCard"
+        "Display",
+        "External Flash",
+        "JST-PH",
+        "SDCard",
+        "USB-C",
+        "WiFi"
+    ],
+    "images": [
+        "wio-terminal.jpg"
     ],
-    "images": ["wio-terminal.jpg"],
     "mcu": "samd51",
     "product": "Wio Terminal D51R",
     "thumbnail": "",
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/board.json b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
index 4e6217e19e4a8..4d19f6b94529a 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
@@ -6,7 +6,9 @@
     "features": [
         "USB-C"
     ],
-    "images": ["seeeduino-xiao.jpg"],
+    "images": [
+        "seeeduino-xiao.jpg"
+    ],
     "mcu": "samd21",
     "product": "Seeeduino XIAO (SAMD21)",
     "thumbnail": "",
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
index af643f5c5f3c2..ee9ca9d3689b0 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
@@ -5,10 +5,9 @@
     "docs": "",
     "features": [
         "Battery Charging",
-        "Breadboard Friendly",
-        "Micro USB",
-        "QWIIC",
-        "SPI Flash"
+        "External Flash",
+        "JST-SH",
+        "USB"
     ],
     "images": [
         "sparkfun_samd51_thing_plus.jpg"
diff --git a/ports/stm32/boards/ARDUINO_GIGA/board.json b/ports/stm32/boards/ARDUINO_GIGA/board.json
index f0595d4ad533f..53c636c774418 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/board.json
+++ b/ports/stm32/boards/ARDUINO_GIGA/board.json
@@ -4,11 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "8MB SDRAM",
-        "16MB Flash",
-        "Dual-core processor",
-        "USB Full speed",
-        "CYW43 WiFi/BT Module"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "External RAM",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00063_01.front_1000x750.jpg"
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json b/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
index 801bc320b5558..a4c81d69d4277 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
@@ -4,11 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "16MB Flash",
-        "Dual-core processor",
-        "USB High Speed Phy",
-        "CYW43 WiFi/BT Module",
-        "NXP SE050 crypto device"
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "Secure Element",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00051_01.iso_1000x750.jpg"
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
index 6467e43bb9736..f39d7d4c4792d 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
@@ -4,14 +4,13 @@
     ],
     "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"
+        "BLE",
+        "Dual-core",
+        "Ethernet",
+        "External Flash",
+        "External RAM",
+        "USB",
+        "WiFi"
     ],
     "images": [
         "ABX00042_01.iso_1000x750.jpg"
diff --git a/ports/stm32/boards/CERB40/board.json b/ports/stm32/boards/CERB40/board.json
index f80b3f5cab249..e3bd4296badf5 100644
--- a/ports/stm32/boards/CERB40/board.json
+++ b/ports/stm32/boards/CERB40/board.json
@@ -8,8 +8,8 @@
         "cerb40.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "CERB40",
+    "product": "Cerb40",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "Fez"
 }
diff --git a/ports/stm32/boards/HYDRABUS/board.json b/ports/stm32/boards/HYDRABUS/board.json
index 32561e6525904..20a2ac5eaef7e 100644
--- a/ports/stm32/boards/HYDRABUS/board.json
+++ b/ports/stm32/boards/HYDRABUS/board.json
@@ -8,8 +8,8 @@
         "hydrabus.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "HYDRABUS",
+    "product": "HydraBus v1.0",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "HydraBus"
 }
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board.json b/ports/stm32/boards/LEGO_HUB_NO6/board.json
index c11b9f1818346..3c602abba1379 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board.json
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board.json
@@ -9,5 +9,5 @@
     "product": "Hub No.6",
     "thumbnail": "",
     "url": "",
-    "vendor": "Lego"
+    "vendor": "LEGO"
 }
diff --git a/ports/stm32/boards/LIMIFROG/board.json b/ports/stm32/boards/LIMIFROG/board.json
index 3137350074be7..f516963a5bac2 100644
--- a/ports/stm32/boards/LIMIFROG/board.json
+++ b/ports/stm32/boards/LIMIFROG/board.json
@@ -8,8 +8,8 @@
         "limifrog.jpg"
     ],
     "mcu": "stm32l4",
-    "product": "LIMIFROG",
+    "product": "LimiFrog",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "LimiFrog"
 }
diff --git a/ports/stm32/boards/MIKROE_QUAIL/board.json b/ports/stm32/boards/MIKROE_QUAIL/board.json
index ccd9b4fdc0646..15d8b5fc134b5 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/board.json
+++ b/ports/stm32/boards/MIKROE_QUAIL/board.json
@@ -8,7 +8,7 @@
     ],
     "id": "MIKROE-QUAIL",
     "images": [
-            "quail_top.jpg"
+        "quail_top.jpg"
     ],
     "mcu": "stm32f4",
     "product": "MikroE Quail",
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/board.json b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
index 044bc2736b1a7..603032ee98833 100644
--- a/ports/stm32/boards/NETDUINO_PLUS_2/board.json
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
@@ -8,8 +8,8 @@
         "netduino_plus_2.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "NETDUINO_PLUS_2",
+    "product": "Netduino Plus 2",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "Netduino"
 }
diff --git a/ports/stm32/boards/PYBD_SF6/board.json b/ports/stm32/boards/PYBD_SF6/board.json
index 3e689d69bee5c..3a39763d5b33b 100644
--- a/ports/stm32/boards/PYBD_SF6/board.json
+++ b/ports/stm32/boards/PYBD_SF6/board.json
@@ -4,8 +4,8 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
-        "BLE"
+        "BLE",
+        "WiFi"
     ],
     "id": "PYBD-SF6",
     "images": [
diff --git a/ports/stm32/boards/STM32F439/board.json b/ports/stm32/boards/STM32F439/board.json
index 140c3474caa6f..068a9022d7d94 100644
--- a/ports/stm32/boards/STM32F439/board.json
+++ b/ports/stm32/boards/STM32F439/board.json
@@ -11,5 +11,5 @@
     "product": "STM32F439",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/USBDONGLE_WB55/board.json b/ports/stm32/boards/USBDONGLE_WB55/board.json
index 858e94d105166..6d61f0c280fa6 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/board.json
+++ b/ports/stm32/boards/USBDONGLE_WB55/board.json
@@ -11,5 +11,5 @@
     "product": "USBDONGLE_WB55",
     "thumbnail": "",
     "url": "",
-    "vendor": ""
+    "vendor": "ST Microelectronics"
 }

From f6af48416d6423016fd4395fd3260ba66f56cf56 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Aug 2023 13:45:53 +1000
Subject: [PATCH 0194/3129] extmod/modselect: Properly track number of poll
 objects that are fd's.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modselect.c                     | 38 ++++++++++++++++----------
 tests/extmod/select_poll_custom.py     | 21 +++++++++++++-
 tests/extmod/select_poll_custom.py.exp |  6 ++++
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/extmod/modselect.c b/extmod/modselect.c
index 7c65e7dcaf1c4..d665a1082794a 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -88,8 +88,9 @@ typedef struct _poll_set_t {
 
     #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
     // Array of pollfd entries for objects that have a file descriptor.
-    unsigned short alloc;
-    unsigned short len;
+    unsigned short alloc; // memory allocated for pollfds
+    unsigned short max_used; // maximum number of used entries in pollfds
+    unsigned short used; // actual number of used entries in pollfds
     struct pollfd *pollfds;
     #endif
 } poll_set_t;
@@ -98,7 +99,8 @@ STATIC void poll_set_init(poll_set_t *poll_set, size_t n) {
     mp_map_init(&poll_set->map, n);
     #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
     poll_set->alloc = 0;
-    poll_set->len = 0;
+    poll_set->max_used = 0;
+    poll_set->used = 0;
     poll_set->pollfds = NULL;
     #endif
 }
@@ -142,29 +144,34 @@ STATIC void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents) {
 
 STATIC struct pollfd *poll_set_add_fd(poll_set_t *poll_set, int fd) {
     struct pollfd *free_slot = NULL;
-    for (unsigned int i = 0; i < poll_set->len; ++i) {
-        struct pollfd *slot = &poll_set->pollfds[i];
-        if (slot->fd == -1) {
-            free_slot = slot;
-            break;
-        }
-    }
 
-    if (free_slot == NULL) {
-        if (poll_set->len >= poll_set->alloc) {
+    if (poll_set->used == poll_set->max_used) {
+        // No free slots below max_used, so expand max_used (and possibly allocate).
+        if (poll_set->max_used >= poll_set->alloc) {
             poll_set->pollfds = m_renew(struct pollfd, poll_set->pollfds, poll_set->alloc, poll_set->alloc + 4);
             poll_set->alloc += 4;
         }
-        free_slot = &poll_set->pollfds[poll_set->len++];
+        free_slot = &poll_set->pollfds[poll_set->max_used++];
+    } else {
+        // There should be a free slot below max_used.
+        for (unsigned int i = 0; i < poll_set->max_used; ++i) {
+            struct pollfd *slot = &poll_set->pollfds[i];
+            if (slot->fd == -1) {
+                free_slot = slot;
+                break;
+            }
+        }
+        assert(free_slot != NULL);
     }
 
     free_slot->fd = fd;
+    ++poll_set->used;
 
     return free_slot;
 }
 
 static inline bool poll_set_all_are_fds(poll_set_t *poll_set) {
-    return poll_set->map.used == poll_set->len;
+    return poll_set->map.used == poll_set->used;
 }
 
 #else
@@ -323,7 +330,7 @@ STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size
         }
 
         // Call system poll for those objects that have a file descriptor.
-        int n_ready = poll(poll_set->pollfds, poll_set->len, t);
+        int n_ready = poll(poll_set->pollfds, poll_set->max_used, t);
 
         MP_THREAD_GIL_ENTER();
 
@@ -462,6 +469,7 @@ STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
         poll_obj_t *poll_obj = (poll_obj_t *)MP_OBJ_TO_PTR(elem->value);
         if (poll_obj->pollfd != NULL) {
             poll_obj->pollfd->fd = -1;
+            --self->poll_set.used;
         }
         elem->value = MP_OBJ_NULL;
     }
diff --git a/tests/extmod/select_poll_custom.py b/tests/extmod/select_poll_custom.py
index 0cbb6103278e6..b854a8a14da55 100644
--- a/tests/extmod/select_poll_custom.py
+++ b/tests/extmod/select_poll_custom.py
@@ -77,7 +77,26 @@ def ioctl(self, cmd, arg):
 except OSError as er:
     print("OSError", er.errno)
 
+# Register then unregister a socket (a native stream), then test
+# that the Python object is still pollable.
+s2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+x.poll_state = _MP_STREAM_POLL_RD
+poller.register(s2)
+poller.unregister(s2)
+print_poll_output(poller.poll())
+
+# Test registering and unregistering multiple times.
+for _ in range(2):
+    poller.unregister(s)
+    poller.unregister(x)
+    poller.register(s2)
+    poller.register(s, select.POLLIN)
+    poller.register(x, select.POLLIN)
+    poller.unregister(s2)
+    print_poll_output(poller.poll())
+
+# Clean up.
 poller.unregister(x)
 poller.unregister(s)
-
+s2.close()
 s.close()
diff --git a/tests/extmod/select_poll_custom.py.exp b/tests/extmod/select_poll_custom.py.exp
index bcb4d83e2dfa0..d85508bab240e 100644
--- a/tests/extmod/select_poll_custom.py.exp
+++ b/tests/extmod/select_poll_custom.py.exp
@@ -9,3 +9,9 @@ CustomPollable.ioctl 3 1
 [(<class 'CustomPollable'>, 1)]
 CustomPollable.ioctl 3 1
 OSError 1000
+CustomPollable.ioctl 3 1
+[(<class 'CustomPollable'>, 1)]
+CustomPollable.ioctl 3 1
+[(<class 'CustomPollable'>, 1)]
+CustomPollable.ioctl 3 1
+[(<class 'CustomPollable'>, 1)]

From 88518009cec91d48451b97df35ca8ee053190378 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Aug 2023 19:37:01 +1000
Subject: [PATCH 0195/3129] tests/extmod/select_poll_eintr.py: Improve
 robustness of test.

Increase allowed range of dt_ms, and print it in case of failure.

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

diff --git a/tests/extmod/select_poll_eintr.py b/tests/extmod/select_poll_eintr.py
index f53efcc83e20c..e1cbc2aaf57d0 100644
--- a/tests/extmod/select_poll_eintr.py
+++ b/tests/extmod/select_poll_eintr.py
@@ -41,7 +41,10 @@ def thread_main():
 result = poller.poll(400)
 dt_ms = (time.time_ns() - t0) / 1e6
 print("result:", result)
-print("dt in range:", 380 <= dt_ms <= 500)
+if 380 <= dt_ms <= 600:
+    print("dt in range")
+else:
+    print("dt not in range:", dt_ms)
 
 # Clean up.
 s.close()

From d325ee4509d8f68e341d5efc5ddbe3c30f86089e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 2 Aug 2023 16:48:57 +1000
Subject: [PATCH 0196/3129] py/gc: Apply some code formatting cleanup.

This commit:
- Breaks up some long lines for readability.
- Fixes a potential macro argument expansion issue.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/gc.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 541632d12b155..11be30dfefa88 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -79,7 +79,7 @@
 #define ATB_3_IS_FREE(a) (((a) & ATB_MASK_3) == 0)
 
 #if MICROPY_GC_SPLIT_HEAP
-#define NEXT_AREA(area) (area->next)
+#define NEXT_AREA(area) ((area)->next)
 #else
 #define NEXT_AREA(area) (NULL)
 #endif
@@ -129,7 +129,13 @@ 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 - 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);
+    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 - ALLOC_TABLE_GAP_BYTE) / (1 + MP_BITS_PER_BYTE / 2 * BYTES_PER_BLOCK);
     #endif
@@ -165,11 +171,19 @@ STATIC void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
     #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);
+    DEBUG_printf("  alloc table at %p, length " UINT_FMT " bytes, "
+        UINT_FMT " blocks\n",
+        area->gc_alloc_table_start, area->gc_alloc_table_byte_len,
+        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);
+    DEBUG_printf("  finaliser table at %p, length " UINT_FMT " bytes, "
+        UINT_FMT " blocks\n", 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);
+    DEBUG_printf("  pool at %p, length " UINT_FMT " bytes, "
+        UINT_FMT " blocks\n", area->gc_pool_start,
+        gc_pool_block_len * BYTES_PER_BLOCK, gc_pool_block_len);
 }
 
 void gc_init(void *start, void *end) {

From 519c24dd48764f28593112dbeac7e30b8b2a6240 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 2 Aug 2023 16:49:44 +1000
Subject: [PATCH 0197/3129] py/gc: Add new MICROPY_GC_SPLIT_HEAP_AUTO "auto
 grow heap" mode.

When set, the split heap is automatically extended with new areas on
demand, and shrunk if a heap area becomes empty during a GC pass or soft
reset.

To save code size the size allocation for a new heap block (including
metadata) is estimated at 103% of the failed allocation, rather than
working from the more complex algorithm in gc_try_add_heap(). This appears
to work well except in the extreme limit case when almost all RAM is
exhausted (~last few hundred bytes). However in this case some allocation
is likely to fail soon anyhow.

Currently there is no API to manually add a block of a given size to the
heap, although that could easily be added if necessary.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/gc.c       | 107 +++++++++++++++++++++++++++++++++++++++++++++++++-
 py/gc.h       |   8 +++-
 py/mpconfig.h |  15 +++++++
 3 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 11be30dfefa88..b2e4aa4aae8dd 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -236,6 +236,83 @@ void gc_add(void *start, void *end) {
     // Add this area to the linked list
     prev_area->next = area;
 }
+
+#if MICROPY_GC_SPLIT_HEAP_AUTO
+// Try to automatically add a heap area large enough to fulfill 'failed_alloc'.
+STATIC bool gc_try_add_heap(size_t failed_alloc) {
+    // 'needed' is the size of a heap large enough to hold failed_alloc, with
+    // the additional metadata overheads as calculated in gc_setup_area().
+    //
+    // Rather than reproduce all of that logic here, we approximate that adding
+    // (13/512) is enough overhead for sufficiently large heap areas (the
+    // overhead converges to 3/128, but there's some fixed overhead and some
+    // rounding up of partial block sizes).
+    size_t needed = failed_alloc + MAX(2048, failed_alloc * 13 / 512);
+
+    size_t avail = gc_get_max_new_split();
+
+    DEBUG_printf("gc_try_add_heap failed_alloc " UINT_FMT ", "
+        "needed " UINT_FMT ", avail " UINT_FMT " bytes \n",
+        failed_alloc,
+        needed,
+        avail);
+
+    if (avail < needed) {
+        // Can't fit this allocation, or system heap has nearly run out anyway
+        return false;
+    }
+
+    // Deciding how much to grow the total heap by each time is tricky:
+    //
+    // - Grow by too small amounts, leads to heap fragmentation issues.
+    //
+    // - Grow by too large amounts, may lead to system heap running out of
+    //   space.
+    //
+    // Currently, this implementation is:
+    //
+    // - At minimum, aim to double the total heap size each time we add a new
+    //   heap.  i.e. without any large single allocations, total size will be
+    //   64KB -> 128KB -> 256KB -> 512KB -> 1MB, etc
+    //
+    // - If the failed allocation is too large to fit in that size, the new
+    //   heap is made exactly large enough for that allocation. Future growth
+    //   will double the total heap size again.
+    //
+    // - If the new heap won't fit in the available free space, add the largest
+    //   new heap that will fit (this may lead to failed system heap allocations
+    //   elsewhere, but some allocation will likely fail in this circumstance!)
+    size_t total_heap = 0;
+    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area);
+         area != NULL;
+         area = NEXT_AREA(area)) {
+        total_heap += area->gc_pool_end - area->gc_alloc_table_start;
+        total_heap += ALLOC_TABLE_GAP_BYTE + sizeof(mp_state_mem_area_t);
+    }
+
+    DEBUG_printf("total_heap " UINT_FMT " bytes\n", total_heap);
+
+    size_t to_alloc = MIN(avail, MAX(total_heap, needed));
+
+    mp_state_mem_area_t *new_heap = MP_PLAT_ALLOC_HEAP(to_alloc);
+
+    DEBUG_printf("MP_PLAT_ALLOC_HEAP " UINT_FMT " = %p\n",
+        to_alloc, new_heap);
+
+    if (new_heap == NULL) {
+        // This should only fail:
+        // - In a threaded environment if another thread has
+        //   allocated while this function ran.
+        // - If there is a bug in gc_get_max_new_split().
+        return false;
+    }
+
+    gc_add(new_heap, (void *)new_heap + to_alloc);
+
+    return true;
+}
+#endif
+
 #endif
 
 void gc_lock(void) {
@@ -392,6 +469,9 @@ STATIC void gc_sweep(void) {
     #endif
     // free unmarked heads and their tails
     int free_tail = 0;
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    mp_state_mem_area_t *prev_area = NULL;
+    #endif
     for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
         size_t end_block = area->gc_alloc_table_byte_len * BLOCKS_PER_ATB;
         if (area->gc_last_used_block < end_block) {
@@ -454,6 +534,17 @@ STATIC void gc_sweep(void) {
         }
 
         area->gc_last_used_block = last_used_block;
+
+        #if MICROPY_GC_SPLIT_HEAP_AUTO
+        // Free any empty area, aside from the first one
+        if (last_used_block == 0 && prev_area != NULL) {
+            DEBUG_printf("gc_sweep free empty area %p\n", area);
+            NEXT_AREA(prev_area) = NEXT_AREA(area);
+            MP_PLAT_FREE_HEAP(area);
+            area = prev_area;
+        }
+        prev_area = area;
+        #endif
     }
 }
 
@@ -636,6 +727,9 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
     size_t start_block;
     size_t n_free;
     int collected = !MP_STATE_MEM(gc_auto_collect_enabled);
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    bool added = false;
+    #endif
 
     #if MICROPY_GC_ALLOC_THRESHOLD
     if (!collected && MP_STATE_MEM(gc_alloc_amount) >= MP_STATE_MEM(gc_alloc_threshold)) {
@@ -681,6 +775,12 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
         GC_EXIT();
         // nothing found!
         if (collected) {
+            #if MICROPY_GC_SPLIT_HEAP_AUTO
+            if (!added && gc_try_add_heap(n_bytes)) {
+                added = true;
+                continue;
+            }
+            #endif
             return NULL;
         }
         DEBUG_printf("gc_alloc(" UINT_FMT "): no free mem, triggering GC\n", n_bytes);
@@ -1056,9 +1156,12 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
 void gc_dump_info(const mp_print_t *print) {
     gc_info_t info;
     gc_info(&info);
-    mp_printf(print, "GC: total: %u, used: %u, free: %u\n",
+    mp_printf(print, "GC: total: %u, used: %u, free: %u",
         (uint)info.total, (uint)info.used, (uint)info.free);
-    mp_printf(print, " No. of 1-blocks: %u, 2-blocks: %u, max blk sz: %u, max free sz: %u\n",
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    mp_printf(print, ", max new split: %u", (uint)gc_get_max_new_split());
+    #endif
+    mp_printf(print, "\n No. of 1-blocks: %u, 2-blocks: %u, max blk sz: %u, max free sz: %u\n",
         (uint)info.num_1block, (uint)info.num_2block, (uint)info.max_block, (uint)info.max_free);
 }
 
diff --git a/py/gc.h b/py/gc.h
index 8431c0a6cf1a7..7eec6265c87d5 100644
--- a/py/gc.h
+++ b/py/gc.h
@@ -35,7 +35,13 @@ 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
+
+#if MICROPY_GC_SPLIT_HEAP_AUTO
+// Port must implement this function to return the maximum available block of
+// RAM to allocate a new heap area into using MP_PLAT_ALLOC_HEAP.
+size_t gc_get_max_new_split(void);
+#endif // MICROPY_GC_SPLIT_HEAP_AUTO
+#endif // MICROPY_GC_SPLIT_HEAP
 
 // These lock/unlock functions can be nested.
 // They can be used to prevent the GC from allocating/freeing.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 4a15205ae3237..de4a89206b2fb 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -616,6 +616,11 @@
 #define MICROPY_GC_SPLIT_HEAP (0)
 #endif
 
+// Whether regions should be added/removed from the split heap as needed.
+#ifndef MICROPY_GC_SPLIT_HEAP_AUTO
+#define MICROPY_GC_SPLIT_HEAP_AUTO (0)
+#endif
+
 // Hook to run code during time consuming garbage collector operations
 // *i* is the loop index variable (e.g. can be used to run every x loops)
 #ifndef MICROPY_GC_HOOK_LOOP
@@ -1896,6 +1901,16 @@ typedef double mp_float_t;
 #define MP_PLAT_FREE_EXEC(ptr, size) m_del(byte, ptr, size)
 #endif
 
+// Allocating new heap area at runtime requires port to be able to allocate from system heap
+#if MICROPY_GC_SPLIT_HEAP_AUTO
+#ifndef MP_PLAT_ALLOC_HEAP
+#define MP_PLAT_ALLOC_HEAP(size) malloc(size)
+#endif
+#ifndef MP_PLAT_FREE_HEAP
+#define MP_PLAT_FREE_HEAP(ptr) free(ptr)
+#endif
+#endif
+
 // This macro is used to do all output (except when MICROPY_PY_IO is defined)
 #ifndef MP_PLAT_PRINT_STRN
 #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)

From 98fd78437c56efeebe2e38c944f5af0a1a59fe8a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 28 Jul 2023 12:16:05 +1000
Subject: [PATCH 0198/3129] esp32: Allow malloc() to allocate from SPIRAM.

Also shrinks the "prefer internal" threshold to 8KB, any allocation larger
than this will try PSRAM first.

Change the mbedTLS config to use regular malloc() as well, instead of
internal only.  The default is set to internal-only due to to potential
physical security issue of readout via PSRAM on the original ESP32.
However, as MicroPython runs from plaintext flash and all other context is
in the MP heap of PSRAM then it's hard to see how worsens physical security
for MP.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/sdkconfig.base      | 9 +++++++++
 ports/esp32/boards/sdkconfig.spiram    | 6 +++++-
 ports/esp32/boards/sdkconfig.spiram_sx | 6 +++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index bf6c3f45c5269..b98d5d0678865 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -49,6 +49,15 @@ CONFIG_LWIP_PPP_CHAP_SUPPORT=y
 # Use 4kiB output buffer instead of default 16kiB
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 
+# Allow mbedTLS to allocate from PSRAM or internal memory
+#
+# (The ESP-IDF default is internal-only, partly for physical security to prevent
+# possible information leakage from unencrypted PSRAM contents on the original
+# ESP32 - no PSRAM encryption on that chip. MicroPython doesn't support flash
+# encryption and is already storing the Python heap in PSRAM so this isn't a
+# significant factor in overall physical security.)
+CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
+
 # ULP coprocessor support
 # Only on: ESP32, ESP32S2, ESP32S3
 CONFIG_ULP_COPROC_ENABLED=y
diff --git a/ports/esp32/boards/sdkconfig.spiram b/ports/esp32/boards/sdkconfig.spiram
index 74d35f7b4ad4a..4dfc63624bab5 100644
--- a/ports/esp32/boards/sdkconfig.spiram
+++ b/ports/esp32/boards/sdkconfig.spiram
@@ -3,7 +3,11 @@
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_CAPS_ALLOC=y
+CONFIG_SPIRAM_USE_MALLOC=y
+
+# This is the threshold for preferring small allocations from internal memory
+# first, before failing over to PSRAM.
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192
 
 # SPIRAM increases the size of the firmware and overflows iram0_0_seg, due
 # to PSRAM bug workarounds.  Apply some options to reduce the firmware size.
diff --git a/ports/esp32/boards/sdkconfig.spiram_sx b/ports/esp32/boards/sdkconfig.spiram_sx
index 329a507337108..efe53ada41625 100644
--- a/ports/esp32/boards/sdkconfig.spiram_sx
+++ b/ports/esp32/boards/sdkconfig.spiram_sx
@@ -7,4 +7,8 @@ CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_CAPS_ALLOC=y
+CONFIG_SPIRAM_USE_MALLOC=y
+
+# This is the threshold for preferring small allocations from internal memory
+# first, before failing over to PSRAM.
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192

From 05dcb8be9957d0ed6c9694629be186a40c1a3fd9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 2 Aug 2023 16:51:07 +1000
Subject: [PATCH 0199/3129] esp32: Enable automatic Python heap growth.

Via MICROPY_GC_SPLIT_HEAP_AUTO feature flag added in previous commit.

Tested on ESP32 GENERIC_SPIRAM and GENERIC_S3 configurations, with some
worst-case allocation patterns and the standard test suite.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/esp32.rst     | 11 +++++++++--
 ports/esp32/gccollect.c    | 10 ++++++++++
 ports/esp32/main.c         | 14 ++++++--------
 ports/esp32/mpconfigport.h |  3 +++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index efdd6c1be289c..856d9aef8d0d8 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -51,13 +51,20 @@ Functions
     buffers and other data. This data is useful to get a sense of how much memory
     is available to ESP-IDF and the networking stack in particular. It may shed
     some light on situations where ESP-IDF operations fail due to allocation failures.
-    The information returned is *not* useful to troubleshoot Python allocation failures,
-    use `micropython.mem_info()` instead.
 
     The capabilities parameter corresponds to ESP-IDF's ``MALLOC_CAP_XXX`` values but the
     two most useful ones are predefined as `esp32.HEAP_DATA` for data heap regions and
     `esp32.HEAP_EXEC` for executable regions as used by the native code emitter.
 
+    Free IDF heap memory in the `esp32.HEAP_DATA` region is available to be
+    automatically added to the MicroPython heap to prevent a MicroPython
+    allocation from failing. However, the information returned here is otherwise
+    *not* useful to troubleshoot Python allocation failures, use
+    `micropython.mem_info()` instead. The "max new split" value in
+    `micropython.mem_info()` output corresponds to the largest free block of
+    ESP-IDF heap that could be automatically added on demand to the MicroPython
+    heap.
+
     The return value is a list of 4-tuples, where each 4-tuple corresponds to one heap
     and contains: the total bytes, the free bytes, the largest free block, and
     the minimum free seen over time.
diff --git a/ports/esp32/gccollect.c b/ports/esp32/gccollect.c
index 6fa287de28c0c..e16e8028adb1e 100644
--- a/ports/esp32/gccollect.c
+++ b/ports/esp32/gccollect.c
@@ -80,3 +80,13 @@ void gc_collect(void) {
 }
 
 #endif
+
+#if MICROPY_GC_SPLIT_HEAP_AUTO
+
+// The largest new region that is available to become Python heap is the largest
+// free block in the ESP-IDF system heap.
+size_t gc_get_max_new_split(void) {
+    return heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT);
+}
+
+#endif
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 3a172e6f8d4a1..a6346b027a1a5 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -75,6 +75,10 @@
 #define MP_TASK_STACK_LIMIT_MARGIN (1024)
 #endif
 
+// Initial Python heap size. This starts small but adds new heap areas on
+// demand due to settings MICROPY_GC_SPLIT_HEAP & MICROPY_GC_SPLIT_HEAP_AUTO
+#define MP_TASK_HEAP_SIZE (64 * 1024)
+
 int vprintf_null(const char *format, va_list ap) {
     // do nothing: this is used as a log target during raw repl mode
     return 0;
@@ -100,19 +104,13 @@ void mp_task(void *pvParameter) {
         ESP_LOGE("esp_init", "can't create event loop: 0x%x\n", err);
     }
 
-    // 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.
-    // When SPIRAM is enabled, this will allocate from SPIRAM.
-    uint32_t caps = MALLOC_CAP_8BIT;
-    size_t heap_total = heap_caps_get_total_size(caps);
-    size_t mp_task_heap_size = MIN(heap_caps_get_largest_free_block(caps), heap_total / 2);
-    void *mp_task_heap = heap_caps_malloc(mp_task_heap_size, caps);
+    void *mp_task_heap = MP_PLAT_ALLOC_HEAP(MP_TASK_HEAP_SIZE);
 
 soft_reset:
     // initialise the stack pointer for the main thread
     mp_stack_set_top((void *)sp);
     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);
+    gc_init(mp_task_heap, mp_task_heap + MP_TASK_HEAP_SIZE);
     mp_init();
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     readline_init0();
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index aa13eaf2fecf2..55035b5f86c10 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -68,6 +68,9 @@
 #define MICROPY_PY_THREAD_GIL               (1)
 #define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
 
+#define MICROPY_GC_SPLIT_HEAP               (1)
+#define MICROPY_GC_SPLIT_HEAP_AUTO          (1)
+
 // extended modules
 #ifndef MICROPY_ESPNOW
 #define MICROPY_ESPNOW                      (1)

From fa1ea21f75601a93827d143bb9074b1f7474a953 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 15 Aug 2023 14:34:25 +1000
Subject: [PATCH 0200/3129] esp32/gccollect: Make level arg volatile to force
 recursive function.

Otherwise the compiler may inline the gc_collect_inner() function and/or
remove the recursion, which is necessary to spill all the windowed
registers to the C stack.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/gccollect.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/ports/esp32/gccollect.c b/ports/esp32/gccollect.c
index e16e8028adb1e..4b6dd8ab61d83 100644
--- a/ports/esp32/gccollect.c
+++ b/ports/esp32/gccollect.c
@@ -39,30 +39,25 @@
 
 #include "xtensa/hal.h"
 
-static void gc_collect_inner(int level) {
+// The level argument must be volatile to force the compiler to emit code that
+// will call this function recursively, to nest the C stack.
+static void gc_collect_inner(volatile unsigned int level) {
     if (level < XCHAL_NUM_AREGS / 8) {
+        // Go deeper on the stack to spill more registers from the register window.
         gc_collect_inner(level + 1);
-        if (level != 0) {
-            return;
-        }
-    }
-
-    if (level == XCHAL_NUM_AREGS / 8) {
-        // get the sp
+    } else {
+        // Deep enough so that all registers are on the C stack, now trace the stack.
         volatile uint32_t sp = (uint32_t)esp_cpu_get_sp();
         gc_collect_root((void **)sp, ((mp_uint_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
-        return;
     }
-
-    // trace root pointers from any threads
-    #if MICROPY_PY_THREAD
-    mp_thread_gc_others();
-    #endif
 }
 
 void gc_collect(void) {
     gc_collect_start();
     gc_collect_inner(0);
+    #if MICROPY_PY_THREAD
+    mp_thread_gc_others();
+    #endif
     gc_collect_end();
 }
 

From ad123ed01393f34d31c7c9ac0f535a023f9385b7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 31 Jul 2023 17:24:38 +1000
Subject: [PATCH 0201/3129] esp32/Makefile: Implement `make submodules` to
 match other ports.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/extmod.cmake            | 87 +++++++++++++++++++---------------
 ports/esp32/Makefile           | 25 ++++++----
 ports/esp32/esp32_common.cmake |  3 ++
 ports/rp2/Makefile             |  7 ++-
 py/mkrules.cmake               |  7 ++-
 5 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 305cdee942762..7a7b892c96616 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -60,51 +60,62 @@ set(MICROPY_SOURCE_EXTMOD
 
 if(MICROPY_PY_BTREE)
     set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx")
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/berkeley-db-1.xx)
 
-    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
-    )
+    if(ECHO_SUBMODULES OR ECHO_QUERY_VARIANTS)
+        # No-op, we're just doing submodule/variant discovery.
+        # Cannot run the add_library/target_include_directories rules (even though
+        # the build won't run) because IDF will attempt verify the files exist.
+    elseif(NOT EXISTS ${MICROPY_LIB_BERKELEY_DIR}/README)
+        # Regular build, submodule not initialised -- fail with a clear error.
+        message(FATAL_ERROR " MICROPY_PY_BTREE is enabled but the berkeley-db submodule is not initialised.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
+    else()
+        # Regular build, we have the submodule.
+        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_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*"
-    )
+        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.
+        # 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_INC_CORE
+            "${MICROPY_LIB_BERKELEY_DIR}/PORT/include"
+        )
 
-    list(APPEND MICROPY_DEF_CORE
-        MICROPY_PY_BTREE=1
-        __DBINTERFACE_PRIVATE=1
-        "virt_fd_t=void*"
-    )
+        list(APPEND MICROPY_DEF_CORE
+            MICROPY_PY_BTREE=1
+            __DBINTERFACE_PRIVATE=1
+            "virt_fd_t=void*"
+        )
 
-    list(APPEND MICROPY_SOURCE_EXTMOD
-        ${MICROPY_EXTMOD_DIR}/modbtree.c
-    )
+        list(APPEND MICROPY_SOURCE_EXTMOD
+            ${MICROPY_EXTMOD_DIR}/modbtree.c
+        )
+    endif()
 endif()
 
 # Library for mbedtls
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 7c8c225dfb6e9..239618c6f73ae 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -26,12 +26,6 @@ BAUD ?= 460800
 
 PYTHON ?= python3
 
-# 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
 
 CMAKE_ARGS =
@@ -40,20 +34,24 @@ ifdef USER_C_MODULES
 	CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
 endif
 
-IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -D MICROPY_BOARD_DIR=$(abspath $(BOARD_DIR)) -B $(BUILD) $(CMAKE_ARGS)
+IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -D MICROPY_BOARD_DIR=$(abspath $(BOARD_DIR)) $(CMAKE_ARGS)
 
 ifdef FROZEN_MANIFEST
        IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
 endif
 
+ifdef BOARD_VARIANT
+	IDFPY_FLAGS += -D MICROPY_BOARD_VARIANT=$(BOARD_VARIANT)
+endif
+
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 define RUN_IDF_PY
-	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) $(1)
+	idf.py $(IDFPY_FLAGS) -B $(BUILD) -p $(PORT) -b $(BAUD) $(1)
 endef
 
 all:
-	idf.py $(IDFPY_FLAGS) build || (echo -e $(HELP_BUILD_ERROR); false)
+	idf.py $(IDFPY_FLAGS) -B $(BUILD) build || (echo -e $(HELP_BUILD_ERROR); false)
 	@$(PYTHON) makeimg.py \
 		$(BUILD)/sdkconfig \
 		$(BUILD)/bootloader/bootloader.bin \
@@ -85,5 +83,12 @@ size-components:
 size-files:
 	$(call RUN_IDF_PY,size-files)
 
+# Running the build with ECHO_SUBMODULES set will trigger py/mkrules.cmake to
+# print out the value of the GIT_SUBMODULES variable, prefixed with
+# "GIT_SUBMODULES", and then abort. This extracts out that line from the idf.py
+# output and passes the list of submodules to py/mkrules.mk which does the
+# `git submodule init` on each.
 submodules:
-	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
+	@GIT_SUBMODULES=$$(idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \
+	                  grep '^GIT_SUBMODULES=' | cut -d= -f2); \
+	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 37a19316b603d..098df1f1ae85f 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -11,6 +11,9 @@ endif()
 # Include core source components.
 include(${MICROPY_DIR}/py/py.cmake)
 
+# CMAKE_BUILD_EARLY_EXPANSION is set during the component-discovery phase of
+# `idf.py build`, so none of the extmod/usermod (and in reality, most of the
+# micropython) rules need to happen. Specifically, you cannot invoke add_library.
 if(NOT CMAKE_BUILD_EARLY_EXPANSION)
     # Enable extmod components that will be configured by extmod.cmake.
     # A board may also have enabled additional components.
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 4f5b4728ecbc0..7c14415ad5566 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -50,9 +50,14 @@ clean:
 
 # First ensure that pico-sdk is initialised, then use cmake to pick everything
 # else (including board-specific dependencies).
+# Running the build with ECHO_SUBMODULES set will trigger py/mkrules.cmake to
+# print out the value of the GIT_SUBMODULES variable, prefixed with
+# "GIT_SUBMODULES", and then abort. This extracts out that line from the cmake
+# output and passes the list of submodules to py/mkrules.mk which does the
+# `git submodule init` on each.
 submodules:
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="lib/pico-sdk" submodules
-	GIT_SUBMODULES=$$(cmake -B $(BUILD)/submodules -DECHO_SUBMODULES=1 ${CMAKE_ARGS} -S . 2>&1 | \
+	@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
 
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 7eb5fcf01837c..21d5c27334e38 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -178,7 +178,12 @@ if(MICROPY_FROZEN_MANIFEST)
         set(MICROPY_LIB_DIR ${MICROPY_DIR}/lib/micropython-lib)
     endif()
 
-    if(NOT (${ECHO_SUBMODULES}) AND NOT EXISTS ${MICROPY_LIB_DIR}/README.md)
+    if(ECHO_SUBMODULES OR ECHO_QUERY_VARIANTS)
+        # No-op, we're just doing submodule/variant discovery.
+        # Note: All the following rules are safe to run in discovery mode even
+        # though the submodule might not be available as they do not directly depend
+        # on anything from the submodule.
+    elseif(NOT EXISTS ${MICROPY_LIB_DIR}/README.md)
         message(FATAL_ERROR " micropython-lib not initialized.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
     endif()
 

From 9573d31071b069713ac7bc803777fba65c4ead41 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 31 Jul 2023 17:32:27 +1000
Subject: [PATCH 0202/3129] all: Remove query-variants make target.

This is difficult to implement on cmake-based ports, and having the list
of variants in mpconfigboard.{cmake,mk} duplicates information that's
already in board.json.

This removes the existing query-variants make target from stm32 & rp2
and the definition of BOARD_VARIANTS from the various board files.

Also renames the cmake variable to MICROPY_BOARD_VARIANT to match other
variables such as MICROPY_BOARD. The make variable stays as
BOARD_VARIANT.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/extmod.cmake                                |  2 +-
 ports/rp2/Makefile                                 |  7 +------
 ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake   | 14 ++++++--------
 .../ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk     |  1 -
 ports/stm32/Makefile                               |  3 ---
 ports/stm32/boards/PYBLITEV10/mpconfigboard.mk     |  2 --
 ports/stm32/boards/PYBV10/mpconfigboard.mk         |  2 --
 ports/stm32/boards/PYBV11/mpconfigboard.mk         |  2 --
 py/mkrules.cmake                                   |  8 +-------
 9 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 7a7b892c96616..c8756a682ec95 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -62,7 +62,7 @@ if(MICROPY_PY_BTREE)
     set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx")
     string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/berkeley-db-1.xx)
 
-    if(ECHO_SUBMODULES OR ECHO_QUERY_VARIANTS)
+    if(ECHO_SUBMODULES)
         # No-op, we're just doing submodule/variant discovery.
         # Cannot run the add_library/target_include_directories rules (even though
         # the build won't run) because IDF will attempt verify the files exist.
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 7c14415ad5566..ccfc1ac7d6c7a 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -36,7 +36,7 @@ CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Debug
 endif
 
 ifdef BOARD_VARIANT
-CMAKE_ARGS += -DBOARD_VARIANT=${BOARD_VARIANT}
+CMAKE_ARGS += -DMICROPY_BOARD_VARIANT=$(BOARD_VARIANT)
 endif
 
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
@@ -60,8 +60,3 @@ 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/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
index 5fd3eec897b36..28a30f4580dbc 100644
--- a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
@@ -7,20 +7,18 @@ 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")
+# Provide different variants for the downloads page
+if(MICROPY_BOARD_VARIANT STREQUAL "flash_2mb")
     set(PICO_BOARD "weactstudio_2mb")
 endif()
 
-if("${BOARD_VARIANT}" STREQUAL "flash_4mb")
-set(PICO_BOARD "weactstudio_4mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "flash_4mb")
+    set(PICO_BOARD "weactstudio_4mb")
 endif()
 
-if("${BOARD_VARIANT}" STREQUAL "flash_8mb")
-set(PICO_BOARD "weactstudio_8mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "flash_8mb")
+    set(PICO_BOARD "weactstudio_8mb")
 endif()
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
index 1a2635f7af112..43ca5a59cc636 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.mk
@@ -7,5 +7,4 @@ TEXT0 = 0x4000
 MICROPY_PY_NETWORK ?= 1
 MICROPY_PY_NETWORK_NINAW10 ?= 1
 
-BOARD_VARIANTS += "wlan"
 MICROPY_HW_CODESIZE ?= 496K
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 81a48249e89d3..2bfd11157eed3 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -43,9 +43,6 @@ include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/libhydrogen 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 461886b63cab0..afee27e94fbe3 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -6,8 +6,6 @@ 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
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index 363f6b4806163..d26ebd5ae91fe 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -16,8 +16,6 @@ endif
 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
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index 857049f215963..df2d70cda1041 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -16,8 +16,6 @@ endif
 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
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 21d5c27334e38..02e3148f2be5f 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -178,7 +178,7 @@ if(MICROPY_FROZEN_MANIFEST)
         set(MICROPY_LIB_DIR ${MICROPY_DIR}/lib/micropython-lib)
     endif()
 
-    if(ECHO_SUBMODULES OR ECHO_QUERY_VARIANTS)
+    if(ECHO_SUBMODULES)
         # No-op, we're just doing submodule/variant discovery.
         # Note: All the following rules are safe to run in discovery mode even
         # though the submodule might not be available as they do not directly depend
@@ -223,9 +223,3 @@ 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 2fbf42d3ad974b7de12823bb5a86df8a08d917ce Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 15:03:30 +1000
Subject: [PATCH 0203/3129] esp32/boards/GENERIC: Merge with
 GENERIC_{SPIRAM,OTA,D2WD,UNICORE}.

These are now variants of the GENERIC board.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC/board.json         |  8 +++-
 ports/esp32/boards/GENERIC/board.md           | 10 ++++-
 .../esp32/boards/GENERIC/mpconfigboard.cmake  | 44 +++++++++++++++++++
 ports/esp32/boards/GENERIC/mpconfigboard.h    | 10 ++++-
 .../sdkconfig.d2wd}                           |  0
 .../sdkconfig.board => GENERIC/sdkconfig.ota} |  0
 .../sdkconfig.unicore}                        |  0
 ports/esp32/boards/GENERIC_D2WD/board.json    | 20 ---------
 .../boards/GENERIC_D2WD/mpconfigboard.cmake   |  5 ---
 .../esp32/boards/GENERIC_D2WD/mpconfigboard.h |  2 -
 ports/esp32/boards/GENERIC_OTA/board.json     | 20 ---------
 .../boards/GENERIC_OTA/mpconfigboard.cmake    |  5 ---
 .../esp32/boards/GENERIC_OTA/mpconfigboard.h  |  2 -
 ports/esp32/boards/GENERIC_SPIRAM/board.json  | 24 ----------
 ports/esp32/boards/GENERIC_SPIRAM/board.md    |  1 -
 .../boards/GENERIC_SPIRAM/mpconfigboard.cmake |  5 ---
 .../boards/GENERIC_SPIRAM/mpconfigboard.h     |  2 -
 ports/esp32/boards/GENERIC_UNICORE/board.json | 20 ---------
 ports/esp32/boards/GENERIC_UNICORE/board.md   |  1 -
 .../GENERIC_UNICORE/mpconfigboard.cmake       |  5 ---
 .../boards/GENERIC_UNICORE/mpconfigboard.h    |  2 -
 ports/esp32/esp32_common.cmake                |  1 +
 22 files changed, 69 insertions(+), 118 deletions(-)
 rename ports/esp32/boards/{GENERIC_D2WD/sdkconfig.board => GENERIC/sdkconfig.d2wd} (100%)
 rename ports/esp32/boards/{GENERIC_OTA/sdkconfig.board => GENERIC/sdkconfig.ota} (100%)
 rename ports/esp32/boards/{GENERIC_UNICORE/sdkconfig.board => GENERIC/sdkconfig.unicore} (100%)
 delete mode 100644 ports/esp32/boards/GENERIC_D2WD/board.json
 delete mode 100644 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/GENERIC_OTA/board.json
 delete mode 100644 ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/GENERIC_OTA/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/GENERIC_SPIRAM/board.json
 delete mode 100644 ports/esp32/boards/GENERIC_SPIRAM/board.md
 delete mode 100644 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/GENERIC_UNICORE/board.json
 delete mode 100644 ports/esp32/boards/GENERIC_UNICORE/board.md
 delete mode 100644 ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.h

diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
index f70e2e0890fa3..d08fcfec157ab 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -13,11 +13,15 @@
         "esp32_devkitc.jpg"
     ],
     "mcu": "esp32",
-    "product": "ESP32",
+    "product": "ESP32 / WROOM",
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
     "variants": {
-        "idf3": "Compiled with IDF 3.x"
+        "idf3": "Compiled with IDF 3.x",
+        "d2wd": "ESP32 D2WD",
+        "spiram": "Support for SPIRAM / WROVER",
+        "unicore": "ESP32 Unicore",
+        "ota": "Support for OTA"
     },
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC/board.md b/ports/esp32/boards/GENERIC/board.md
index efb2b2cab7c24..8a669411d06a1 100644
--- a/ports/esp32/boards/GENERIC/board.md
+++ b/ports/esp32/boards/GENERIC/board.md
@@ -1 +1,9 @@
-The following files are firmware for ESP32-based boards without external SPIRAM.
+The following files are firmware that should work on most ESP32-based boards
+with 4MiB of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
+
+If your board is based on a WROVER module, or otherwise has SPIRAM (also known
+as PSRAM), then use the "spiram" variant.
+
+The "d2wd" variant is for ESP32-D2WD chips (with 2MiB flash), and "unicore" is
+for single-core ESP32 chips (e.g. the "SOLO" modules). The "ota" variant sets
+up the partition table to allow for Over-the-Air updates.
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
index ac60dc8630929..29096c27689c2 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -2,3 +2,47 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
+
+if(MICROPY_BOARD_VARIANT STREQUAL "d2wd")
+    set(SDKCONFIG_DEFAULTS
+        ${SDKCONFIG_DEFAULTS}
+        boards/GENERIC/sdkconfig.d2wd
+    )
+
+    list(APPEND MICROPY_DEF_BOARD
+        MICROPY_HW_MCU_NAME="ESP32-D2WD"
+    )
+endif()
+
+if(MICROPY_BOARD_VARIANT STREQUAL "ota")
+    set(SDKCONFIG_DEFAULTS
+        ${SDKCONFIG_DEFAULTS}
+        boards/GENERIC/sdkconfig.ota
+    )
+
+    list(APPEND MICROPY_DEF_BOARD
+        MICROPY_HW_BOARD_NAME="Generic ESP32 module with OTA"
+    )
+endif()
+
+if(MICROPY_BOARD_VARIANT STREQUAL "spiram")
+    set(SDKCONFIG_DEFAULTS
+        ${SDKCONFIG_DEFAULTS}
+        boards/sdkconfig.spiram
+    )
+
+    list(APPEND MICROPY_DEF_BOARD
+        MICROPY_HW_BOARD_NAME="Generic ESP32 module with SPIRAM"
+    )
+endif()
+
+if(MICROPY_BOARD_VARIANT STREQUAL "unicore")
+    set(SDKCONFIG_DEFAULTS
+        ${SDKCONFIG_DEFAULTS}
+        boards/GENERIC/sdkconfig.unicore
+    )
+
+    list(APPEND MICROPY_DEF_BOARD
+        MICROPY_HW_MCU_NAME="ESP32-UNICORE"
+    )
+endif()
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.h b/ports/esp32/boards/GENERIC/mpconfigboard.h
index 644807f78e601..7171a84bb3c7b 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.h
@@ -1,2 +1,10 @@
-#define MICROPY_HW_BOARD_NAME "ESP32 module"
+// Both of these can be set by mpconfigboard.cmake if a BOARD_VARIANT is
+// specified.
+
+#ifndef MICROPY_HW_BOARD_NAME
+#define MICROPY_HW_BOARD_NAME "Generic ESP32 module"
+#endif
+
+#ifndef MICROPY_HW_MCU_NAME
 #define MICROPY_HW_MCU_NAME "ESP32"
+#endif
diff --git a/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board b/ports/esp32/boards/GENERIC/sdkconfig.d2wd
similarity index 100%
rename from ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
rename to ports/esp32/boards/GENERIC/sdkconfig.d2wd
diff --git a/ports/esp32/boards/GENERIC_OTA/sdkconfig.board b/ports/esp32/boards/GENERIC/sdkconfig.ota
similarity index 100%
rename from ports/esp32/boards/GENERIC_OTA/sdkconfig.board
rename to ports/esp32/boards/GENERIC/sdkconfig.ota
diff --git a/ports/esp32/boards/GENERIC_UNICORE/sdkconfig.board b/ports/esp32/boards/GENERIC/sdkconfig.unicore
similarity index 100%
rename from ports/esp32/boards/GENERIC_UNICORE/sdkconfig.board
rename to ports/esp32/boards/GENERIC/sdkconfig.unicore
diff --git a/ports/esp32/boards/GENERIC_D2WD/board.json b/ports/esp32/boards/GENERIC_D2WD/board.json
deleted file mode 100644
index 0582820445f96..0000000000000
--- a/ports/esp32/boards/GENERIC_D2WD/board.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "WiFi"
-    ],
-    "id": "esp32-d2wd",
-    "images": [
-        "generic_d2wd.jpg"
-    ],
-    "mcu": "esp32",
-    "product": "ESP32 D2WD",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
deleted file mode 100644
index 88cc7a730e61e..0000000000000
--- a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.ble
-    boards/GENERIC_D2WD/sdkconfig.board
-)
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.h b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.h
deleted file mode 100644
index 8923d46fd1569..0000000000000
--- a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "Generic ESP32-D2WD module"
-#define MICROPY_HW_MCU_NAME "ESP32-D2WD"
diff --git a/ports/esp32/boards/GENERIC_OTA/board.json b/ports/esp32/boards/GENERIC_OTA/board.json
deleted file mode 100644
index 3b882e04f8ffa..0000000000000
--- a/ports/esp32/boards/GENERIC_OTA/board.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "WiFi"
-    ],
-    "id": "esp32-ota",
-    "images": [
-        "esp32_devkitc.jpg"
-    ],
-    "mcu": "esp32",
-    "product": "ESP32 with OTA support",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
deleted file mode 100644
index 8bc9d507af122..0000000000000
--- a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.ble
-    boards/GENERIC_OTA/sdkconfig.board
-)
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.h b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.h
deleted file mode 100644
index ff39c4b2b7da8..0000000000000
--- a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "4MB/OTA module"
-#define MICROPY_HW_MCU_NAME "ESP32"
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.json b/ports/esp32/boards/GENERIC_SPIRAM/board.json
deleted file mode 100644
index 02242028fb6e1..0000000000000
--- a/ports/esp32/boards/GENERIC_SPIRAM/board.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "External RAM",
-        "WiFi"
-    ],
-    "id": "esp32spiram",
-    "images": [
-        "esp32_psram.jpg"
-    ],
-    "mcu": "esp32",
-    "product": "ESP32 with SPIRAM",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "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
deleted file mode 100644
index c638f63dd3e18..0000000000000
--- a/ports/esp32/boards/GENERIC_SPIRAM/board.md
+++ /dev/null
@@ -1 +0,0 @@
-The following files are firmware for ESP32-based boards with external SPIRAM (also known as PSRAM).
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
deleted file mode 100644
index 2e1d799b93b1c..0000000000000
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.ble
-    boards/sdkconfig.spiram
-)
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.h
deleted file mode 100644
index a5982e47e5c32..0000000000000
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP32 module (spiram)"
-#define MICROPY_HW_MCU_NAME "ESP32"
diff --git a/ports/esp32/boards/GENERIC_UNICORE/board.json b/ports/esp32/boards/GENERIC_UNICORE/board.json
deleted file mode 100644
index 1f3beaf6e082e..0000000000000
--- a/ports/esp32/boards/GENERIC_UNICORE/board.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "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
deleted file mode 100644
index b41c167498c73..0000000000000
--- a/ports/esp32/boards/GENERIC_UNICORE/board.md
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 2f34688c8c474..0000000000000
--- a/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 5d0624b9c3f91..0000000000000
--- a/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP32 Unicore module"
-#define MICROPY_HW_MCU_NAME "ESP32-UNICORE"
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 098df1f1ae85f..f5219048f35a6 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -170,6 +170,7 @@ set(MICROPY_CROSS_FLAGS -march=xtensawin)
 # Set compile options for this port.
 target_compile_definitions(${MICROPY_TARGET} PUBLIC
     ${MICROPY_DEF_CORE}
+    ${MICROPY_DEF_BOARD}
     MICROPY_ESP_IDF_4=1
     MICROPY_VFS_FAT=1
     MICROPY_VFS_LFS2=1

From 4815af75bc0bc21e1e66b958fd4ee4e90c24ba10 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 14:45:07 +1000
Subject: [PATCH 0204/3129] esp32/boards/GENERIC_C3: Merge with GENERIC_C3_USB.

As the IDF no longer supports earlier revisions of the C3 by default, we
now just explicitly support rev 3+ and enable USB (which wasn't supported
in earlier revisions).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC_C3/board.md        |  7 +++++++
 .../boards/GENERIC_C3/mpconfigboard.cmake     |  1 +
 .../sdkconfig.c3usb}                          |  0
 ports/esp32/boards/GENERIC_C3_USB/board.json  | 20 -------------------
 .../boards/GENERIC_C3_USB/mpconfigboard.cmake |  7 -------
 .../boards/GENERIC_C3_USB/mpconfigboard.h     |  8 --------
 6 files changed, 8 insertions(+), 35 deletions(-)
 create mode 100644 ports/esp32/boards/GENERIC_C3/board.md
 rename ports/esp32/boards/{GENERIC_C3_USB/sdkconfig.board => GENERIC_C3/sdkconfig.c3usb} (100%)
 delete mode 100644 ports/esp32/boards/GENERIC_C3_USB/board.json
 delete mode 100644 ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h

diff --git a/ports/esp32/boards/GENERIC_C3/board.md b/ports/esp32/boards/GENERIC_C3/board.md
new file mode 100644
index 0000000000000..1604b879c59ae
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3/board.md
@@ -0,0 +1,7 @@
+The following files are firmware images that should work on most
+ESP32-C3-based boards with 4MiB of flash, including WROOM and MINI modules,
+that use the revision 3 silicon (or newer).
+
+USB serial/JTAG support is enabled on pin 18 and 19. Note that this
+is not a full USB stack, the C3 just provides a CDC/ACM class serial
+and JTAG interface.
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
index 38bf7388faf12..c8f78c161d22a 100644
--- a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
@@ -3,4 +3,5 @@ set(IDF_TARGET esp32c3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
+    boards/GENERIC_C3/sdkconfig.c3usb
 )
diff --git a/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board b/ports/esp32/boards/GENERIC_C3/sdkconfig.c3usb
similarity index 100%
rename from ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board
rename to ports/esp32/boards/GENERIC_C3/sdkconfig.c3usb
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
deleted file mode 100644
index 6d51e0a2c1519..0000000000000
--- a/ports/esp32/boards/GENERIC_C3_USB/board.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "deploy": [
-        "../deploy_c3.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "WiFi"
-    ],
-    "id": "esp32c3-usb",
-    "images": [
-        "esp32c3_devkitmini.jpg"
-    ],
-    "mcu": "esp32c3",
-    "product": "ESP32-C3 with USB",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
deleted file mode 100644
index 7436eead8783b..0000000000000
--- a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set(IDF_TARGET esp32c3)
-
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.ble
-    boards/GENERIC_C3_USB/sdkconfig.board
-)
diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h
deleted file mode 100644
index d403e70e46d48..0000000000000
--- a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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 b25a67590d2cd123a7d5dd453da5175bf735c748 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 15:20:05 +1000
Subject: [PATCH 0205/3129] esp32/boards/GENERIC_S2: Merge with
 ESP32_S2_WROVER.

Unsure of the history of the ESP32_S2_WROVER board (and why it wasn't
named GENERIC_S2_...) but now it's a variant of the generic S2 board.

Also removes the non-existent CONFIG_USB_AND_UART from all S2 boards.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/ESP32_S2_WROVER/board.json | 20 -------------------
 .../ESP32_S2_WROVER/mpconfigboard.cmake       |  8 --------
 .../boards/ESP32_S2_WROVER/mpconfigboard.h    |  8 --------
 .../boards/ESP32_S2_WROVER/sdkconfig.board    | 10 ----------
 ports/esp32/boards/GENERIC_S2/board.json      |  1 +
 ports/esp32/boards/GENERIC_S2/board.md        |  6 ++++++
 .../boards/GENERIC_S2/mpconfigboard.cmake     |  1 +
 ports/esp32/boards/GENERIC_S2/mpconfigboard.h |  8 ++++----
 .../boards/LOLIN_S2_MINI/sdkconfig.board      |  1 -
 .../boards/LOLIN_S2_PICO/sdkconfig.board      |  1 -
 .../boards/UM_FEATHERS2NEO/sdkconfig.board    |  1 -
 ports/esp32/boards/UM_TINYS2/sdkconfig.board  |  1 -
 12 files changed, 12 insertions(+), 54 deletions(-)
 delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/board.json
 delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
 create mode 100644 ports/esp32/boards/GENERIC_S2/board.md

diff --git a/ports/esp32/boards/ESP32_S2_WROVER/board.json b/ports/esp32/boards/ESP32_S2_WROVER/board.json
deleted file mode 100644
index d4c4ce21dff32..0000000000000
--- a/ports/esp32/boards/ESP32_S2_WROVER/board.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "deploy": [
-        "../deploy_s2.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "External RAM",
-        "WiFi"
-    ],
-    "images": [
-        "ESP32-S2-WROVER_L_0.jpg"
-    ],
-    "mcu": "esp32s2",
-    "product": "ESP32-S2 WROVER",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
deleted file mode 100644
index 056c9ab4a6a67..0000000000000
--- a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-set(IDF_TARGET esp32s2)
-
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.spiram_sx
-    boards/sdkconfig.usb
-    boards/ESP32_S2_WROVER/sdkconfig.board
-)
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
deleted file mode 100644
index a96262c6071b6..0000000000000
--- a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#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)
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
deleted file mode 100644
index 40a8e3047ccef..0000000000000
--- a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=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
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
index 102b039bf81a1..35d06f2f7e6cc 100644
--- a/ports/esp32/boards/GENERIC_S2/board.json
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -6,6 +6,7 @@
     "features": [
         "BLE",
         "External Flash",
+        "External RAM",
         "WiFi"
     ],
     "images": [
diff --git a/ports/esp32/boards/GENERIC_S2/board.md b/ports/esp32/boards/GENERIC_S2/board.md
new file mode 100644
index 0000000000000..3e46c02467ac6
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S2/board.md
@@ -0,0 +1,6 @@
+The following files are firmware that should work on most ESP32-S2-based
+boards with 4MiB of flash, including WROOM, WROVER, and MINI modules.
+
+This firmware supports configurations with and without SPIRAM (also known as
+PSRAM) and will auto-detect a connected SPIRAM chip at startup and allocate
+the MicroPython heap accordingly.
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
index 59ca906f4d47d..76d185d90d5fc 100644
--- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
@@ -3,4 +3,5 @@ set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
+    boards/sdkconfig.spiram_sx
 )
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
index c4f86a8fc6223..aaea41bcdec2b 100644
--- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
@@ -1,8 +1,8 @@
-#define MICROPY_HW_BOARD_NAME               "ESP32S2 module"
-#define MICROPY_HW_MCU_NAME                 "ESP32S2"
+#define MICROPY_HW_BOARD_NAME "Generic ESP32S2 module"
+#define MICROPY_HW_MCU_NAME "ESP32S2"
 
-#define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
+#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/LOLIN_S2_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
index cbb3ad06d9a1b..00ccc281eaaa0 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_USB_AND_UART=y
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_MINI"
 # end of LWIP
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
index eadff2f1b90b0..a49f3936e7f5d 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_USB_AND_UART=y
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_PICO"
 # end of LWIP
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
index b2c6979a70be2..a624f7fd97fb1 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_USB_AND_UART=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 # LWIP
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
index 09e0deb078fa3..0a2097e242141 100644
--- a/ports/esp32/boards/UM_TINYS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_USB_AND_UART=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 # LWIP

From afd407af8f1049aa764cc46d501286be36345a82 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 15:25:07 +1000
Subject: [PATCH 0206/3129] esp32/boards/GENERIC_S3: Merge with
 GENERIC_S3_{SPIRAM,SPIRAM_OCT}.

These are now variants of the GENERIC_S3 board.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC_S3/board.json      |  6 +++++-
 ports/esp32/boards/GENERIC_S3/board.md        |  7 +++++++
 .../boards/GENERIC_S3/mpconfigboard.cmake     | 13 +++++++++++++
 ports/esp32/boards/GENERIC_S3/mpconfigboard.h |  5 ++++-
 .../esp32/boards/GENERIC_S3_SPIRAM/board.json | 19 -------------------
 .../GENERIC_S3_SPIRAM/mpconfigboard.cmake     |  9 ---------
 .../boards/GENERIC_S3_SPIRAM/mpconfigboard.h  | 10 ----------
 .../boards/GENERIC_S3_SPIRAM/sdkconfig.board  |  9 ---------
 .../boards/GENERIC_S3_SPIRAM_OCT/board.json   | 19 -------------------
 .../GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake | 11 -----------
 .../GENERIC_S3_SPIRAM_OCT/mpconfigboard.h     | 10 ----------
 .../GENERIC_S3_SPIRAM_OCT/sdkconfig.board     |  9 ---------
 12 files changed, 29 insertions(+), 98 deletions(-)
 create mode 100644 ports/esp32/boards/GENERIC_S3/board.md
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h
 delete mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board

diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
index c30d4ed993957..be2170c12fd71 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -6,6 +6,7 @@
     "features": [
         "BLE",
         "External Flash",
+        "External RAM",
         "WiFi"
     ],
     "images": [
@@ -15,5 +16,8 @@
     "product": "ESP32-S3",
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
+    "vendor": "Espressif",
+    "variants": {
+        "spiram-oct": "Support for Octal-SPIRAM"
+    }
 }
diff --git a/ports/esp32/boards/GENERIC_S3/board.md b/ports/esp32/boards/GENERIC_S3/board.md
new file mode 100644
index 0000000000000..cc902eeb89fee
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3/board.md
@@ -0,0 +1,7 @@
+The following files are firmware that should work on most ESP32-S3-based
+boards with 8MiB of flash, including WROOM and MINI modules.
+
+This firmware supports configurations with and without SPIRAM (also known as
+PSRAM) and will auto-detect a connected SPIRAM chip at startup and allocate
+the MicroPython heap accordingly. However if your board has Octal SPIRAM, then
+use the "spiram-oct" variant.
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
index 3d83f89044642..bd163f9f33dc8 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -4,5 +4,18 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
     boards/sdkconfig.ble
+    boards/sdkconfig.spiram_sx
     boards/GENERIC_S3/sdkconfig.board
 )
+
+if(MICROPY_BOARD_VARIANT STREQUAL "spiram-oct")
+    set(SDKCONFIG_DEFAULTS
+        ${SDKCONFIG_DEFAULTS}
+        boards/sdkconfig.240mhz
+        boards/sdkconfig.spiram_oct
+    )
+
+    list(APPEND MICROPY_DEF_BOARD
+        MICROPY_HW_BOARD_NAME="Generic ESP32S3 module with Octal-SPIRAM"
+    )
+endif()
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
index b8f5fb256055f..8d369c7db02d8 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
@@ -1,4 +1,7 @@
-#define MICROPY_HW_BOARD_NAME               "ESP32S3 module"
+#ifndef MICROPY_HW_BOARD_NAME
+// Can be set by mpconfigboard.cmake.
+#define MICROPY_HW_BOARD_NAME               "Generic ESP32S3 module"
+#endif
 #define MICROPY_HW_MCU_NAME                 "ESP32S3"
 
 #define MICROPY_PY_MACHINE_DAC              (0)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
deleted file mode 100644
index 947787f3af8a1..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "deploy": [
-        "../deploy_s3.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "WiFi"
-    ],
-    "images": [
-        "generic_s3.jpg"
-    ],
-    "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
deleted file mode 100644
index e0b92dcd2640d..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
deleted file mode 100644
index 1a8560a2d7ead..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define MICROPY_HW_BOARD_NAME               "ESP32S3 module (spiram)"
-#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/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
deleted file mode 100644
index a36b971162850..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
-
-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/GENERIC_S3_SPIRAM_OCT/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
deleted file mode 100644
index 4cf15e888c984..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "deploy": [
-        "../deploy_s3.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "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
deleted file mode 100644
index 7a767c49d403f..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 88f6835c94201..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#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
deleted file mode 100644
index a36b971162850..0000000000000
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
-
-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 96258d371614c74ac2e4e9461ff6cb1ea0f97ced Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 16:04:19 +1000
Subject: [PATCH 0207/3129] esp32/partitions.csv: Rename to
 partitions-4MiB.csv.

To be consistent with the other partitions files (which have the "-
{2,8,16,32}MiB" suffix). Also renames partitions-ota.csv.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC/sdkconfig.ota                    | 2 +-
 ports/esp32/boards/sdkconfig.base                           | 2 +-
 ports/esp32/{partitions-ota.csv => partitions-4MiB-ota.csv} | 0
 ports/esp32/{partitions.csv => partitions-4MiB.csv}         | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename ports/esp32/{partitions-ota.csv => partitions-4MiB-ota.csv} (100%)
 rename ports/esp32/{partitions.csv => partitions-4MiB.csv} (100%)

diff --git a/ports/esp32/boards/GENERIC/sdkconfig.ota b/ports/esp32/boards/GENERIC/sdkconfig.ota
index 7ff939aa991f2..4a164aa6f841b 100644
--- a/ports/esp32/boards/GENERIC/sdkconfig.ota
+++ b/ports/esp32/boards/GENERIC/sdkconfig.ota
@@ -1,6 +1,6 @@
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-ota.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB-ota.csv"
 
 # Reduce firmware size to fit in the OTA partition.
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index b98d5d0678865..7443b34aa78fc 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -67,7 +67,7 @@ CONFIG_ULP_COPROC_RESERVE_MEM=2040
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB.csv"
 
 # To reduce iRAM usage
 CONFIG_ESP32_WIFI_IRAM_OPT=n
diff --git a/ports/esp32/partitions-ota.csv b/ports/esp32/partitions-4MiB-ota.csv
similarity index 100%
rename from ports/esp32/partitions-ota.csv
rename to ports/esp32/partitions-4MiB-ota.csv
diff --git a/ports/esp32/partitions.csv b/ports/esp32/partitions-4MiB.csv
similarity index 100%
rename from ports/esp32/partitions.csv
rename to ports/esp32/partitions-4MiB.csv

From 91674c41b85b2d22ed263cebb46cc5d99c51c4df Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 17:12:52 +1000
Subject: [PATCH 0208/3129] tools/autobuild: Automatically build all variants
 for each board.

Removes the special-case for stm32.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/autobuild/autobuild.sh         |  1 -
 tools/autobuild/build-boards.sh      | 76 ++++++++++++++++++----------
 tools/autobuild/build-stm32-extra.sh | 39 --------------
 3 files changed, 50 insertions(+), 66 deletions(-)
 delete mode 100755 tools/autobuild/build-stm32-extra.sh

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index b3c9c19c7ceb0..999a42c0ed220 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -77,7 +77,6 @@ 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 689444a98875f..f75ccba3981c9 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -3,8 +3,36 @@
 # 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
+#   $ source tools/autobuild/build-boards.sh
+#   $ cd ports/rp2
+#   $ MICROPY_AUTOBUILD_MAKE="make -j8" build_rp2_boards -latest /tmp
+#
+# Or to build a single board:
+#
+#   $ source tools/autobuild/build-boards.sh
+#   $ cd ports/rp2
+#   $ MICROPY_AUTOBUILD_MAKE="make -j8" build_board boards/PICO/board.json -latest /tmp uf2
+
+function copy_artefacts {
+    local dest_dir=$1
+    local descr=$2
+    local fw_tag=$3
+    local build_dir=$4
+    shift 4
+
+    for ext in $@; do
+        dest=$dest_dir/$descr$fw_tag.$ext
+        if [ -r $build_dir/firmware.$ext ]; then
+            mv $build_dir/firmware.$ext $dest
+        elif [ -r $build_dir/micropython.$ext ]; then
+            # esp32 has micropython.elf, etc
+            mv $build_dir/micropython.$ext $dest
+        elif [ $ext = app-bin -a -r $build_dir/micropython.bin ]; then
+            # esp32 has micropython.bin which is just the application
+            mv $build_dir/micropython.bin $dest
+        fi
+    done
+}
 
 function build_board {
     # check/get parameters
@@ -13,33 +41,29 @@ function build_board {
         return 1
     fi
 
-    board_json=$1
-    fw_tag=$2
-    dest_dir=$3
-    shift
-    shift
-    shift
+    local board_json=$1
+    local fw_tag=$2
+    local dest_dir=$3
+    shift 3
 
-    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
+    local board=$(echo $board_json | awk -F '/' '{ print $2 }')
+    local descr=$(cat $board_json | python3 -c "import json,sys; print(json.load(sys.stdin).get('id', '$board'))")
 
+    # Build the "default" variant. For most boards this is the only thing we build.
     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
-            elif [ -r $build_dir/micropython.$ext ]; then
-                # esp32 has micropython.elf, etc
-                mv $build_dir/micropython.$ext $dest
-            elif [ $ext = app-bin -a -r $build_dir/micropython.bin ]; then
-                # esp32 has micropython.bin which is just the application
-                mv $build_dir/micropython.bin $dest
-            fi
-        done
-    )
+    local build_dir=/tmp/micropython-build-$board
+    $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir && copy_artefacts $dest_dir $descr $fw_tag $build_dir $@
     rm -rf $build_dir
+
+    # Query variants from board.json and build them. Ignore the special "idf3"
+    # variant for ESP32 boards (this allows the downloads page to still have
+    # the idf3 files for older releases that used to be explicitly built).
+    for variant in `cat $board_json | python3 -c "import json,sys; print(' '.join(v for v in json.load(sys.stdin).get('variants', {}).keys() if v != 'idf3'))"`; do
+        local variant_build_dir=$build_dir-$variant
+        echo "building variant $descr $board $variant"
+        $MICROPY_AUTOBUILD_MAKE BOARD=$board BOARD_VARIANT=$variant BUILD=$variant_build_dir && copy_artefacts $dest_dir $descr-$variant $fw_tag $variant_build_dir $@
+        rm -rf $variant_build_dir
+    done
 }
 
 function build_boards {
@@ -49,7 +73,7 @@ function build_boards {
         return 1
     fi
 
-    check_file=$1
+    local check_file=$1
     shift
 
     # check we are in the correct directory
diff --git a/tools/autobuild/build-stm32-extra.sh b/tools/autobuild/build-stm32-extra.sh
deleted file mode 100755
index 887e3cd246943..0000000000000
--- a/tools/autobuild/build-stm32-extra.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# Build additional variants of pyboard firmware (base variants are built by build-boards.sh).
-
-# function for building firmware
-function do_build() {
-    descr=$1
-    board=$2
-    shift
-    shift
-    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-$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
-        rm -rf $build_dir
-    done
-}
-
-# 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 variants for each board
-do_build pybv10 PYBV10
-do_build pybv11 PYBV11
-do_build pyblitev10 PYBLITEV10

From a9821c01852201426e9439d7a704e791add333ab Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 28 Jul 2023 22:29:32 +0200
Subject: [PATCH 0209/3129] mimxrt/machine_pin: Fix bug when Pin.irq is called
 without a handler.

When called without a handler, the IRQ data was not cleared.  That caused a
crash at the second soft reset in a row.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_pin.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index f005e38d697d4..c66718e976cb8 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -337,6 +337,13 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     }
     machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]);
 
+    if (args[ARG_handler].u_obj == mp_const_none) {
+        // remove the IRQ from the table, leave it to gc to free it.
+        GPIO_PortDisableInterrupts(self->gpio, 1U << self->pin);
+        MP_STATE_PORT(machine_pin_irq_objects[index]) = NULL;
+        return mp_const_none;
+    }
+
     // Allocate the IRQ object if it doesn't already exist.
     if (irq == NULL) {
         irq = m_new_obj(machine_pin_irq_obj_t);
@@ -371,9 +378,9 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
             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);
         }
-        // Enable LEVEL1 interrupt again
-        EnableIRQ(irq_num);
     }
 
     return MP_OBJ_FROM_PTR(irq);

From a9a219d8bffe6843201d016e9dfb1d25c6a2eb3c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 29 Jul 2023 13:30:43 +0200
Subject: [PATCH 0210/3129] mimxrt/hal/pwm_backport: Fix 0 and 65536 edge cases
 of PWM's duty_u16.

It should be that:
- duty_u16=0: output low, no pulse
- duty_u16=65536: output high, no pulse

That previously did not apply to all of the three PWM mechanisms of this
port.  This commit fixes it.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/hal/pwm_backport.c | 61 +++++++++++++++++++++------------
 ports/mimxrt/hal/pwm_backport.h |  8 ++---
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/ports/mimxrt/hal/pwm_backport.c b/ports/mimxrt/hal/pwm_backport.c
index 018f8f62792e3..7732e0e8167c8 100644
--- a/ports/mimxrt/hal/pwm_backport.c
+++ b/ports/mimxrt/hal/pwm_backport.c
@@ -18,10 +18,10 @@
 #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) {
+    PWM_Type *base, pwm_submodule_t subModule, pwm_channels_t pwmSignal, uint32_t dutyCycle, uint16_t Center_u16) {
     assert((uint16_t)pwmSignal < 2U);
-    uint16_t pulseCnt = 0, pwmHighPulse = 0;
-    uint16_t center;
+    uint32_t pulseCnt = 0, pwmHighPulse = 0;
+    uint32_t center;
 
     // check and confine bounds for Center_u16
     if ((Center_u16 + dutyCycle / 2) >= PWM_FULL_SCALE) {
@@ -36,11 +36,21 @@ void PWM_UpdatePwmDutycycle_u16(
 
     // 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;
+        if (dutyCycle >= 65536) {
+            base->SM[subModule].VAL2 = 0;
+            base->SM[subModule].VAL3 = pulseCnt;
+        } else {
+            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;
+        if (dutyCycle >= 65536) {
+            base->SM[subModule].VAL4 = 0;
+            base->SM[subModule].VAL5 = pulseCnt;
+        } else {
+            base->SM[subModule].VAL4 = center - pwmHighPulse / 2;
+            base->SM[subModule].VAL5 = base->SM[subModule].VAL4 + pwmHighPulse;
+        }
     }
 }
 
@@ -86,33 +96,33 @@ 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) {
+    uint32_t pwmFreq_Hz, uint32_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 - 1) / 2) / pwmFreq_Hz;
+    pulseCnt = (pwmClock + (pwmFreq_Hz - 1) / 2) / pwmFreq_Hz - 1;
     base->SM[subModule].INIT = 0;
-    base->SM[subModule].VAL0 = ((uint32_t)duty_cycle * pulseCnt) / PWM_FULL_SCALE - 1;
-    base->SM[subModule].VAL1 = pulseCnt - 1;
+    base->SM[subModule].VAL0 = ((uint32_t)duty_cycle * pulseCnt) / PWM_FULL_SCALE;
+    base->SM[subModule].VAL1 = pulseCnt;
 
     base->SM[subModule].OCTRL = (base->SM[subModule].OCTRL & ~PWM_OCTRL_POLX_MASK) | PWM_OCTRL_POLX(!invert);
 
-    base->OUTEN |= (1U << subModule);
+    // Switch the output on or off.
+    if (duty_cycle == 0) {
+        base->OUTEN &= ~(1U << subModule);
+    } else {
+        base->OUTEN |= (1U << subModule);
+    }
 }
 
 #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 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) / 2) / pwmFreqHz) - 2;
     highCount = (periodCount * dutyCycleU16) / PWM_FULL_SCALE;
@@ -147,11 +157,18 @@ status_t QTMR_SetupPwm_u16(TMR_Type *base, qtmr_channel_selection_t channel, uin
 
     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));
+    if (dutyCycleU16 == 0) {
+        // Clear the output at the next compare
+        reg |= (TMR_CTRL_LENGTH_MASK | TMR_CTRL_OUTMODE(kQTMR_ClearOnCompare));
+    } else if (dutyCycleU16 >= 65536) {
+        // Set the output at the next compare
+        reg |= (TMR_CTRL_LENGTH_MASK | TMR_CTRL_OUTMODE(kQTMR_SetOnCompare));
+    } else {
+        // 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
index 516726961ca46..04899173e20b3 100644
--- a/ports/mimxrt/hal/pwm_backport.h
+++ b/ports/mimxrt/hal/pwm_backport.h
@@ -18,7 +18,7 @@
 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
+    uint32_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
@@ -27,17 +27,17 @@ typedef struct _pwm_signal_param_u16
 #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);
+    pwm_channels_t pwmSignal, uint32_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);
+    uint32_t pwmFreq_Hz, uint32_t duty_cycle, uint8_t invert, uint32_t srcClock_Hz);
 
 #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 dutyCycleU16, bool outputPolarity, uint32_t srcClock_Hz, bool is_init);
 #endif // FSL_FEATURE_SOC_TMR_COUNT
 
 #endif // PWM_BACKPORT_H

From e43c669b4aec1fc43188ac38a8dce6825dcdf346 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 10 Aug 2023 17:15:47 +0200
Subject: [PATCH 0211/3129] mimxrt/machine_uart: Add uart.deinit method and
 machine_uart_deinit_all.

The call to machine_uart_deinit_all() is needed to avoid a crash after soft
reset, if a UART had been used and data arrives before it is instantiated
again.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_uart.c | 18 ++++++++++++++++++
 ports/mimxrt/main.c         |  1 +
 ports/mimxrt/modmachine.h   |  1 +
 3 files changed, 20 insertions(+)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index ac9351da8a30e..d0563232e2567 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -288,6 +288,14 @@ STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
 
+// uart.deinit()
+STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    LPUART_Deinit(self->lpuart);
+    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);
     size_t count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
@@ -314,8 +322,18 @@ 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);
 
+// Deinitialize all defined UARTs
+void machine_uart_deinit_all(void) {
+    for (int i = 0; i < sizeof(uart_index_table); i++) {
+        if (uart_index_table[i] != 0) {
+            LPUART_Deinit(uart_base_ptr_table[uart_index_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) },
 
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 9ac46e4814d5b..2d0760964c225 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -124,6 +124,7 @@ int main(void) {
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
+        machine_uart_deinit_all();
         machine_pwm_deinit_all();
         soft_timer_deinit();
         gc_sweep_all();
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index ed1c4e34a07c9..1f669af09e962 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -43,6 +43,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_uart_deinit_all(void);
 void machine_timer_init_PIT(void);
 void machine_sdcard_init0(void);
 void mimxrt_sdram_init(void);

From afe2ca1a0af0fea2f8033eb900626725e30cf40c Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Sun, 30 Jul 2023 17:01:59 -0700
Subject: [PATCH 0212/3129] mimxrt/machine_uart: Add support for UART hardware
 flow control.

Signed-off-by: "Kwabena W. Agyeman" <kwagyeman@live.com>
---
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |  6 ++
 .../boards/MIMXRT1015_EVK/mpconfigboard.h     |  6 ++
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     | 10 +++
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     | 10 +++
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     | 10 +++
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     | 10 +++
 .../boards/MIMXRT1170_EVK/mpconfigboard.h     | 14 ++++
 .../boards/OLIMEX_RT1010/mpconfigboard.h      |  6 ++
 .../boards/SEEED_ARCH_MIX/mpconfigboard.h     | 10 +++
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  | 10 +++
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  | 10 +++
 ports/mimxrt/machine_uart.c                   | 67 ++++++++++++++++++-
 12 files changed, 167 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index eff9e9c2cd5c4..26811fdab8be2 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -23,6 +23,12 @@
     { IOMUXC_GPIO_08_LPUART3_TXD }, { IOMUXC_GPIO_AD_07_LPUART3_RXD }, \
     { IOMUXC_GPIO_AD_02_LPUART4_TXD }, { IOMUXC_GPIO_AD_01_LPUART4_RXD },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_08_LPUART1_CTS_B }, { IOMUXC_GPIO_07_LPUART1_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_14_LPUART4_CTS_B }, { IOMUXC_GPIO_AD_13_LPUART4_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 1 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
index f37ba824f4859..655bb62c27836 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
@@ -28,6 +28,12 @@
     { 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 IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_08_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_09_LPUART1_RTS_B }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_12_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B0_13_LPUART3_RTS_B }, \
+    { 0 }, { 0 },
+
 #define MICROPY_HW_SPI_INDEX { 1 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 390e91814d16a..8b7316c8dabfc 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -34,6 +34,16 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_SD_B1_02_LPUART8_TX }, { IOMUXC_GPIO_SD_B1_03_LPUART8_RX },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_08_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_09_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_B1_07_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_B0_12_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B0_13_LPUART3_RTS_B }, \
+    { IOMUXC_GPIO_EMC_00_LPUART4_CTS_B }, { IOMUXC_GPIO_EMC_01_LPUART4_RTS_B }, \
+    { IOMUXC_GPIO_EMC_36_LPUART5_CTS_B }, { IOMUXC_GPIO_EMC_37_LPUART5_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_EMC_24_LPUART8_CTS_B }, { IOMUXC_GPIO_EMC_25_LPUART8_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 1, 3 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 134c9637ea57e..74666562a81d5 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -30,6 +30,16 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_00_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_B1_01_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_04_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B1_05_LPUART3_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_EMC_30_LPUART6_CTS_B }, { IOMUXC_GPIO_EMC_29_LPUART6_RTS_B }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPUART8_CTS_B }, { IOMUXC_GPIO_SD_B0_03_LPUART8_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 1 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 01ae3ba303c68..824f9977c2710 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -30,6 +30,16 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_00_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_B1_01_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_04_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B1_05_LPUART3_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_EMC_30_LPUART6_CTS_B }, { IOMUXC_GPIO_EMC_29_LPUART6_RTS_B }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPUART8_CTS_B }, { IOMUXC_GPIO_SD_B0_03_LPUART8_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 1 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index b6752c3e1ba3e..cb64d2b9d24f8 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -30,6 +30,16 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_00_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_B1_01_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_04_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B1_05_LPUART3_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_EMC_30_LPUART6_CTS_B }, { IOMUXC_GPIO_EMC_29_LPUART6_RTS_B }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPUART8_CTS_B }, { IOMUXC_GPIO_SD_B0_03_LPUART8_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 1 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
index d37050eb56041..8ce91adbaf23e 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
@@ -43,6 +43,20 @@
     { 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 IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_26_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_27_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_DISP_B2_12_LPUART2_CTS_B }, { IOMUXC_GPIO_DISP_B2_13_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_SD_B2_07_LPUART3_CTS_B }, { IOMUXC_GPIO_SD_B2_08_LPUART3_RTS_B }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B2_09_LPUART5_CTS_B }, { IOMUXC_GPIO_SD_B2_10_LPUART5_RTS_B }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_02_LPUART7_CTS_B }, { IOMUXC_GPIO_AD_03_LPUART7_RTS_B }, \
+    { IOMUXC_GPIO_AD_04_LPUART8_CTS_B }, { IOMUXC_GPIO_AD_05_LPUART8_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_LPSR_10_LPUART11_CTS_B }, { IOMUXC_GPIO_LPSR_11_LPUART11_RTS_B }, \
+    { IOMUXC_GPIO_LPSR_05_LPUART12_CTS_B }, { IOMUXC_GPIO_LPSR_04_LPUART12_RTS_B },
+
 // Define the mapping hardware SPI # to logical SPI #
 // SCK/CS/SDO/SDI  HW-SPI   Logical SPI
 // D13/D10/D11/D12 LPSPI1  ->  0
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index 3d080ff25f1f8..828855d4d361a 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -25,6 +25,12 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_06_LPUART4_TXD }, { IOMUXC_GPIO_05_LPUART4_RXD },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_EMC_17_LPUART4_CTS_B }, { IOMUXC_GPIO_EMC_18_LPUART4_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 0, 1, 2 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
index c98cdcb0a7492..edda72f2660d1 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -32,6 +32,16 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_00_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_B1_01_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_04_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B1_05_LPUART3_RTS_B }, \
+    { IOMUXC_GPIO_EMC_17_LPUART4_CTS_B }, { IOMUXC_GPIO_EMC_18_LPUART4_RTS_B }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPUART8_CTS_B }, { IOMUXC_GPIO_SD_B0_03_LPUART8_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 3, 4 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 07da87db10fce..1a6227a60e074 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -22,6 +22,16 @@
     { 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 IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_00_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_B1_01_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_04_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B1_05_LPUART3_RTS_B }, \
+    { IOMUXC_GPIO_EMC_17_LPUART4_CTS_B }, { IOMUXC_GPIO_EMC_18_LPUART4_RTS_B }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_EMC_30_LPUART6_CTS_B }, { IOMUXC_GPIO_EMC_29_LPUART6_RTS_B }, \
+    { IOMUXC_GPIO_SD_B1_06_LPUART7_CTS_B }, { IOMUXC_GPIO_SD_B1_07_LPUART7_RTS_B }, \
+    { IOMUXC_GPIO_SD_B0_02_LPUART8_CTS_B }, { IOMUXC_GPIO_SD_B0_03_LPUART8_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 4, 3}
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 56740f48ea3d0..09addbe52c219 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -24,6 +24,16 @@
     { 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 IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_00_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_B1_01_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_B1_04_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_B1_05_LPUART3_RTS_B }, \
+    { IOMUXC_GPIO_EMC_17_LPUART4_CTS_B }, { IOMUXC_GPIO_EMC_18_LPUART4_RTS_B }, \
+    { IOMUXC_GPIO_EMC_28_LPUART5_CTS_B }, { IOMUXC_GPIO_EMC_27_LPUART5_RTS_B }, \
+    { IOMUXC_GPIO_EMC_30_LPUART6_CTS_B }, { IOMUXC_GPIO_EMC_29_LPUART6_RTS_B }, \
+    { IOMUXC_GPIO_SD_B1_06_LPUART7_CTS_B }, { IOMUXC_GPIO_SD_B1_07_LPUART7_RTS_B }, \
+    { IOMUXC_GPIO_SD_B0_02_LPUART8_CTS_B }, { IOMUXC_GPIO_SD_B0_03_LPUART8_RTS_B },
+
 #define MICROPY_HW_SPI_INDEX { 4, 3, 1 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index d0563232e2567..17d789886c618 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -40,6 +40,10 @@
 #define MIN_BUFFER_SIZE  (32)
 #define MAX_BUFFER_SIZE  (32766)
 
+#define UART_HWCONTROL_RTS  (1)
+#define UART_HWCONTROL_CTS  (2)
+#define UART_HWCONTROL_MASK (UART_HWCONTROL_RTS | UART_HWCONTROL_CTS)
+
 #define UART_INVERT_TX (1)
 #define UART_INVERT_RX (2)
 #define UART_INVERT_MASK (UART_INVERT_TX | UART_INVERT_RX)
@@ -74,12 +78,18 @@ STATIC LPUART_Type *uart_base_ptr_table[] = LPUART_BASE_PTRS;
 static const iomux_table_t iomux_table_uart[] = {
     IOMUX_TABLE_UART
 };
+static const iomux_table_t iomux_table_uart_cts_rts[] = {
+    IOMUX_TABLE_UART_CTS_RTS
+};
 
 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"};
+STATIC const char *_flow_name[] = {"None", "RTS", "CTS", "RTS|CTS"};
 
 #define RX (iomux_table_uart[index + 1])
 #define TX (iomux_table_uart[index])
+#define RTS (iomux_table_uart_cts_rts[index + 1])
+#define CTS (iomux_table_uart_cts_rts[index])
 
 bool lpuart_set_iomux(int8_t uart) {
     int index = (uart - 1) * 2;
@@ -98,6 +108,33 @@ bool lpuart_set_iomux(int8_t uart) {
     }
 }
 
+bool lpuart_set_iomux_rts(int8_t uart) {
+    MP_STATIC_ASSERT(MP_ARRAY_SIZE(iomux_table_uart) == MP_ARRAY_SIZE(iomux_table_uart_cts_rts));
+    int index = (uart - 1) * 2;
+
+    if (RTS.muxRegister != 0) {
+        IOMUXC_SetPinMux(RTS.muxRegister, RTS.muxMode, RTS.inputRegister, RTS.inputDaisy, RTS.configRegister, 0U);
+        IOMUXC_SetPinConfig(RTS.muxRegister, RTS.muxMode, RTS.inputRegister, RTS.inputDaisy, RTS.configRegister,
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, PIN_DRIVE_6, RTS.configRegister));
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool lpuart_set_iomux_cts(int8_t uart) {
+    int index = (uart - 1) * 2;
+
+    if (CTS.muxRegister != 0) {
+        IOMUXC_SetPinMux(CTS.muxRegister, CTS.muxMode, CTS.inputRegister, CTS.inputDaisy, CTS.configRegister, 0U);
+        IOMUXC_SetPinConfig(CTS.muxRegister, CTS.muxMode, CTS.inputRegister, CTS.inputDaisy, CTS.configRegister,
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_IN, PIN_DRIVE_6, CTS.configRegister));
+        return true;
+    } else {
+        return false;
+    }
+}
+
 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) {
@@ -111,22 +148,24 @@ void LPUART_UserCallback(LPUART_Type *base, lpuart_handle_t *handle, status_t st
 
 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, "
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, flow=%s, "
         "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,
+        _flow_name[(self->config.enableTxCTS << 1) | self->config.enableRxRTS],
         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,
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_flow,
            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_flow, MP_ARG_KW_ONLY | 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} },
@@ -164,6 +203,27 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         self->config.stopBitCount = args[ARG_stop].u_int - 1;
     }
 
+    // Set flow if configured.
+    if (args[ARG_flow].u_int >= 0) {
+        if (args[ARG_flow].u_int & ~UART_HWCONTROL_MASK) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad flow mask"));
+        }
+
+        if (args[ARG_flow].u_int & UART_HWCONTROL_RTS) {
+            if (!lpuart_set_iomux_rts(uart_index_table[self->id])) {
+                mp_raise_ValueError(MP_ERROR_TEXT("rts not available"));
+            }
+            self->config.enableRxRTS = true;
+        }
+
+        if (args[ARG_flow].u_int & UART_HWCONTROL_CTS) {
+            if (!lpuart_set_iomux_cts(uart_index_table[self->id])) {
+                mp_raise_ValueError(MP_ERROR_TEXT("cts not available"));
+            }
+            self->config.enableTxCTS = true;
+        }
+    }
+
     // Set timeout if configured.
     if (args[ARG_timeout].u_int >= 0) {
         self->timeout = args[ARG_timeout].u_int;
@@ -346,6 +406,9 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { 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_RTS), MP_ROM_INT(UART_HWCONTROL_RTS) },
+    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) },
+
     { 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) },
 

From cb7e133dbe0e13333534a21fc11bbf6a800ac4a2 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Tue, 25 Jul 2023 18:20:37 -0700
Subject: [PATCH 0213/3129] mimxrt/boards: Add support for GPIO control of SNVS
 pins.

Signed-off-by: "Kwabena W. Agyeman" <kwagyeman@live.com>
---
 ports/mimxrt/boards/MIMXRT1062_af.csv |  3 ++
 ports/mimxrt/boards/MIMXRT1176_af.csv | 20 ++++++-------
 ports/mimxrt/boards/make-pins.py      | 42 ++++++++++++++++++++++++---
 ports/mimxrt/boards/mimxrt_prefix.c   | 14 +++++++++
 4 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1062_af.csv b/ports/mimxrt/boards/MIMXRT1062_af.csv
index 9b83efeddc169..d2f0b22023cda 100644
--- a/ports/mimxrt/boards/MIMXRT1062_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1062_af.csv
@@ -123,3 +123,6 @@ GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,
 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
+WAKEUP,,,,,,GPIO5_IO00,,NMI,,,,,ALT5
+PMIC_ON_REQ,SNVS_PMIC_ON_REQ,,,,,GPIO5_IO01,,,,,,,ALT0
+PMIC_STBY_REQ,CCM_PMIC_STBY_REQ,,,,,GPIO5_IO02,,,,,,,ALT0
diff --git a/ports/mimxrt/boards/MIMXRT1176_af.csv b/ports/mimxrt/boards/MIMXRT1176_af.csv
index fe31f502e4ed2..21fd2a24178ba 100644
--- a/ports/mimxrt/boards/MIMXRT1176_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1176_af.csv
@@ -80,16 +80,16 @@ GPIO_EMC_B2_17,SEMC_DM03,XBAR1_INOUT15,ENET_1G_RX_EN,SAI3_MCLK,FLEXSPI2_A_DATA04
 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_SNVS_00_DIG,SNVS_TAMPER0,,,,,GPIO13_IO03,,,,,,,,
+GPIO_SNVS_01_DIG,SNVS_TAMPER1,,,,,GPIO13_IO04,,,,,,,,
+GPIO_SNVS_02_DIG,SNVS_TAMPER2,,,,,GPIO13_IO05,,,,,,,,
+GPIO_SNVS_03_DIG,SNVS_TAMPER3,,,,,GPIO13_IO06,,,,,,,,
+GPIO_SNVS_04_DIG,SNVS_TAMPER4,,,,,GPIO13_IO07,,,,,,,,
+GPIO_SNVS_05_DIG,SNVS_TAMPER5,,,,,GPIO13_IO08,,,,,,,,
+GPIO_SNVS_06_DIG,SNVS_TAMPER6,,,,,GPIO13_IO09,,,,,,,,
+GPIO_SNVS_07_DIG,SNVS_TAMPER7,,,,,GPIO13_IO10,,,,,,,,
+GPIO_SNVS_08_DIG,SNVS_TAMPER8,,,,,GPIO13_IO11,,,,,,,,
+GPIO_SNVS_09_DIG,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,,,
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index 429d648696707..51ae9eb717c8c 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -24,6 +24,10 @@
     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+)",
+    r"IOMUXC_[SNVS_]*(?P<pin>WAKEUP[_DIG]*)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_SNVS_(?P<pin>PMIC_ON_REQ)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_SNVS_(?P<pin>PMIC_STBY_REQ)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_SNVS_\d\d_DIG)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
 ]
 
 
@@ -118,10 +122,43 @@ def print(self):
             self.print_pin_af()
             self.print_pin_adc()
 
+            options = {
+                "GPIO_LPSR_00": "PIN_LPSR",
+                "GPIO_LPSR_01": "PIN_LPSR",
+                "GPIO_LPSR_02": "PIN_LPSR",
+                "GPIO_LPSR_03": "PIN_LPSR",
+                "GPIO_LPSR_04": "PIN_LPSR",
+                "GPIO_LPSR_05": "PIN_LPSR",
+                "GPIO_LPSR_06": "PIN_LPSR",
+                "GPIO_LPSR_07": "PIN_LPSR",
+                "GPIO_LPSR_08": "PIN_LPSR",
+                "GPIO_LPSR_09": "PIN_LPSR",
+                "GPIO_LPSR_10": "PIN_LPSR",
+                "GPIO_LPSR_11": "PIN_LPSR",
+                "GPIO_LPSR_12": "PIN_LPSR",
+                "GPIO_LPSR_13": "PIN_LPSR",
+                "GPIO_LPSR_14": "PIN_LPSR",
+                "GPIO_LPSR_15": "PIN_LPSR",
+                "GPIO_SNVS_00_DIG": "PIN_SNVS",
+                "GPIO_SNVS_01_DIG": "PIN_SNVS",
+                "GPIO_SNVS_02_DIG": "PIN_SNVS",
+                "GPIO_SNVS_03_DIG": "PIN_SNVS",
+                "GPIO_SNVS_04_DIG": "PIN_SNVS",
+                "GPIO_SNVS_05_DIG": "PIN_SNVS",
+                "GPIO_SNVS_06_DIG": "PIN_SNVS",
+                "GPIO_SNVS_07_DIG": "PIN_SNVS",
+                "GPIO_SNVS_08_DIG": "PIN_SNVS",
+                "GPIO_SNVS_09_DIG": "PIN_SNVS",
+                "WAKEUP": "PIN_SNVS",
+                "WAKEUP_DIG": "PIN_SNVS",
+                "PMIC_ON_REQ": "PIN_SNVS",
+                "PMIC_STBY_REQ": "PIN_SNVS",
+            }
+
             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",
+                    options.get(self.name, "PIN"),
                     self.gpio,
                     int(self.pin),
                     len(self.adc_fns),
@@ -233,9 +270,6 @@ def parse_af_file(self, filename, iomux_filename):
                 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[(pad_col + 1) : adc_col]):
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
index 09c0aa109ebff..d7a2bcfc80d1d 100644
--- a/ports/mimxrt/boards/mimxrt_prefix.c
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -49,3 +49,17 @@
         .adc_list = (_adc_list), \
     } \
 
+#define PIN_SNVS(_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_SNVS->SW_MUX_CTL_PAD_##_name), \
+        .configRegister = (uint32_t)&(IOMUXC_SNVS->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), \
+    } \
+

From 00855eeb36acaf626f153d8c1850ca75744b1c55 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Thu, 3 Aug 2023 17:55:27 -0700
Subject: [PATCH 0214/3129] mimxrt/hal: Make flash clock frequency
 configurable.

Signed-off-by: "Kwabena W. Agyeman" <kwagyeman@live.com>
---
 ports/mimxrt/Makefile                      | 4 ++++
 ports/mimxrt/hal/qspi_hyper_flash_config.c | 6 +++++-
 ports/mimxrt/hal/qspi_nor_flash_config.c   | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 63cba7d7a67c7..8cb46245aec97 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -397,6 +397,10 @@ CFLAGS += \
 	-DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1
 endif
 
+ifdef MICROPY_HW_FLASH_CLK
+	CFLAGS += -DMICROPY_HW_FLASH_CLK=$(MICROPY_HW_FLASH_CLK)
+endif
+
 CFLAGS += $(CFLAGS_EXTRA)
 
 MPY_CROSS_FLAGS += -march=armv7m
diff --git a/ports/mimxrt/hal/qspi_hyper_flash_config.c b/ports/mimxrt/hal/qspi_hyper_flash_config.c
index f5ffbe8413a7d..aaf2e923c162d 100644
--- a/ports/mimxrt/hal/qspi_hyper_flash_config.c
+++ b/ports/mimxrt/hal/qspi_hyper_flash_config.c
@@ -22,6 +22,10 @@ __attribute__((section(".boot_hdr.conf")))
 #pragma location = ".boot_hdr.conf"
 #endif
 
+#ifndef MICROPY_HW_FLASH_CLK
+#define MICROPY_HW_FLASH_CLK kFlexSpiSerialClk_133MHz
+#endif
+
 const flexspi_nor_config_t qspiflash_config = {
     .memConfig =
     {
@@ -36,7 +40,7 @@ const flexspi_nor_config_t qspiflash_config = {
             (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
             (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
         .sflashPadType = kSerialFlash_8Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .serialClkFreq = MICROPY_HW_FLASH_CLK,
         .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .dataValidTime = {16u, 16u},
         .lookupTable =
diff --git a/ports/mimxrt/hal/qspi_nor_flash_config.c b/ports/mimxrt/hal/qspi_nor_flash_config.c
index a6bbd624ed534..a8040737e51b0 100644
--- a/ports/mimxrt/hal/qspi_nor_flash_config.c
+++ b/ports/mimxrt/hal/qspi_nor_flash_config.c
@@ -28,6 +28,10 @@ __attribute__((section(".boot_hdr.conf")))
 #define MICROPY_HW_FLASH_DQS kFlexSPIReadSampleClk_LoopbackFromDqsPad
 #endif
 
+#ifndef MICROPY_HW_FLASH_CLK
+#define MICROPY_HW_FLASH_CLK kFlexSpiSerialClk_100MHz
+#endif
+
 const flexspi_nor_config_t qspiflash_config = {
     .memConfig =
     {
@@ -48,7 +52,7 @@ const flexspi_nor_config_t qspiflash_config = {
         // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
         .deviceType = kFlexSpiDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_100MHz,
+        .serialClkFreq = MICROPY_HW_FLASH_CLK,
         .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .lookupTable =
         {

From 861fbf6ab5bb0c2a21a04a312453bb7adb92b8be Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:14:33 +1000
Subject: [PATCH 0215/3129] examples: Mark asm, pio, etc. as noqa: F821
 (undefined-name).

These files all use decorators (@asm_thumb, @asm_pio) that add names to the
function scope, that the linter cannot see.

It's useful to clear them in the file not in pyproject.toml as example code
will be copied and adapted elsewhere, and those developers may also use
Ruff (we hope!)

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 examples/asmled.py                       | 4 ++++
 examples/asmsum.py                       | 3 +++
 examples/natmod/btree/btree_py.py        | 4 ++++
 examples/natmod/features2/test.py        | 2 ++
 examples/rp2/pio_1hz.py                  | 2 ++
 examples/rp2/pio_exec.py                 | 2 ++
 examples/rp2/pio_pinchange.py            | 2 ++
 examples/rp2/pio_pwm.py                  | 2 ++
 examples/rp2/pio_uart_rx.py              | 2 ++
 examples/rp2/pio_uart_tx.py              | 2 ++
 examples/rp2/pio_ws2812.py               | 2 ++
 examples/rp2/pwm_fade.py                 | 2 ++
 ports/qemu-arm/test-frzmpy/frozen_asm.py | 2 ++
 13 files changed, 31 insertions(+)

diff --git a/examples/asmled.py b/examples/asmled.py
index 09a06c184ade4..4ff35dfdf8d05 100644
--- a/examples/asmled.py
+++ b/examples/asmled.py
@@ -1,5 +1,9 @@
 # flash LED #1 using inline assembler
 # this version is overly verbose and uses word stores
+#
+# ruff: noqa: F821 - @asm_thumb decorator adds names to function scope
+
+
 @micropython.asm_thumb
 def flash_led(r0):
     movw(r1, (stm.GPIOA + stm.GPIO_BSRRL) & 0xFFFF)
diff --git a/examples/asmsum.py b/examples/asmsum.py
index f2c7f285badc7..2d8c2b2c9984b 100644
--- a/examples/asmsum.py
+++ b/examples/asmsum.py
@@ -1,3 +1,6 @@
+# ruff: noqa: F821 - @asm_thumb decorator adds names to function scope
+
+
 @micropython.asm_thumb
 def asm_sum_words(r0, r1):
     # r0 = len
diff --git a/examples/natmod/btree/btree_py.py b/examples/natmod/btree/btree_py.py
index bd53c084a13be..461b045c98dfc 100644
--- a/examples/natmod/btree/btree_py.py
+++ b/examples/natmod/btree/btree_py.py
@@ -1,3 +1,7 @@
 # Implemented in Python to support keyword arguments
+
+# ruff: noqa: F821 - this file is evaluated with C-defined names in scope
+
+
 def open(stream, *, flags=0, cachesize=0, pagesize=0, minkeypage=0):
     return _open(stream, flags, cachesize, pagesize, minkeypage)
diff --git a/examples/natmod/features2/test.py b/examples/natmod/features2/test.py
index 5ac80120d7338..af79b9692c216 100644
--- a/examples/natmod/features2/test.py
+++ b/examples/natmod/features2/test.py
@@ -1,5 +1,7 @@
 # This Python code will be merged with the C code in main.c
 
+# ruff: noqa: F821 - this file is evaluated with C-defined names in scope
+
 import array
 
 
diff --git a/examples/rp2/pio_1hz.py b/examples/rp2/pio_1hz.py
index 84d761fa1434e..3ffab79d5623b 100644
--- a/examples/rp2/pio_1hz.py
+++ b/examples/rp2/pio_1hz.py
@@ -1,6 +1,8 @@
 # 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.
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 import time
 from machine import Pin
 import rp2
diff --git a/examples/rp2/pio_exec.py b/examples/rp2/pio_exec.py
index ce39f2df84306..3bea51f8dd49e 100644
--- a/examples/rp2/pio_exec.py
+++ b/examples/rp2/pio_exec.py
@@ -5,6 +5,8 @@
 #   - using set_init and set_base
 #   - using StateMachine.exec
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 import time
 from machine import Pin
 import rp2
diff --git a/examples/rp2/pio_pinchange.py b/examples/rp2/pio_pinchange.py
index 767c8e78c2eef..4a210e7f390fc 100644
--- a/examples/rp2/pio_pinchange.py
+++ b/examples/rp2/pio_pinchange.py
@@ -8,6 +8,8 @@
 #   - setting an irq handler for a StateMachine
 #   - instantiating 2x StateMachine's with the same program and different pins
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 import time
 from machine import Pin
 import rp2
diff --git a/examples/rp2/pio_pwm.py b/examples/rp2/pio_pwm.py
index 176a238091a5f..24fd6b85a3026 100644
--- a/examples/rp2/pio_pwm.py
+++ b/examples/rp2/pio_pwm.py
@@ -1,5 +1,7 @@
 # Example of using PIO for PWM, and fading the brightness of an LED
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 from machine import Pin
 from rp2 import PIO, StateMachine, asm_pio
 from time import sleep
diff --git a/examples/rp2/pio_uart_rx.py b/examples/rp2/pio_uart_rx.py
index 080b6bd6392bc..f46aaa6a5e388 100644
--- a/examples/rp2/pio_uart_rx.py
+++ b/examples/rp2/pio_uart_rx.py
@@ -8,6 +8,8 @@
 #   - PIO irq handler
 #   - using the second core via _thread
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 import _thread
 from machine import Pin, UART
 from rp2 import PIO, StateMachine, asm_pio
diff --git a/examples/rp2/pio_uart_tx.py b/examples/rp2/pio_uart_tx.py
index 5e4af8f6ccfdc..04abf2d0d150f 100644
--- a/examples/rp2/pio_uart_tx.py
+++ b/examples/rp2/pio_uart_tx.py
@@ -1,5 +1,7 @@
 # Example using PIO to create a UART TX interface
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 from machine import Pin
 from rp2 import PIO, StateMachine, asm_pio
 
diff --git a/examples/rp2/pio_ws2812.py b/examples/rp2/pio_ws2812.py
index dd021a9d5642d..6de21ab8b7a21 100644
--- a/examples/rp2/pio_ws2812.py
+++ b/examples/rp2/pio_ws2812.py
@@ -1,5 +1,7 @@
 # Example using PIO to drive a set of WS2812 LEDs.
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 import array, time
 from machine import Pin
 import rp2
diff --git a/examples/rp2/pwm_fade.py b/examples/rp2/pwm_fade.py
index 5b7089c6b1add..6672f3443f3bd 100644
--- a/examples/rp2/pwm_fade.py
+++ b/examples/rp2/pwm_fade.py
@@ -1,6 +1,8 @@
 # Example using PWM to fade an LED.
 # Note: this does not work on Pico W because it uses Pin(25) for LED output.
 
+# ruff: noqa: F821 - @asm_pio decorator adds names to function scope
+
 import time
 from machine import Pin, PWM
 
diff --git a/ports/qemu-arm/test-frzmpy/frozen_asm.py b/ports/qemu-arm/test-frzmpy/frozen_asm.py
index 2c7f5c92cd376..ba43264b389e4 100644
--- a/ports/qemu-arm/test-frzmpy/frozen_asm.py
+++ b/ports/qemu-arm/test-frzmpy/frozen_asm.py
@@ -1,5 +1,7 @@
 # Test freezing inline-asm code.
 
+# ruff: noqa: F821 - @asm_thumb decorator adds names to function scope
+
 import micropython
 
 

From cec3ff5526d1aa09b0eb86a371d7312ddb8a33b4 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:16:39 +1000
Subject: [PATCH 0216/3129] mpy-cross: Fix source file name in file-not-found
 error.

Found by Ruff with F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 mpy-cross/mpy_cross/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index 8eadbc8352c74..5020033e8c808 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -100,7 +100,7 @@ def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=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))
+        raise CrossCompileError("Input .py file not found: {}.".format(src))
 
     args = []
 

From ef864a4aa4370ea1b659496e4d0f145bbc28bec3 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:17:06 +1000
Subject: [PATCH 0217/3129] cc3200/tools: Fix exception raised on process
 failure.

subprocess.CalledProcessError() constructor arguments aren't documented,
but these are them.  Even if they change, it's an improvement over a
non-existent exception name!

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/cc3200/tools/uniflash.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/cc3200/tools/uniflash.py b/ports/cc3200/tools/uniflash.py
index 83445a12d3438..2fa2c02f45df4 100644
--- a/ports/cc3200/tools/uniflash.py
+++ b/ports/cc3200/tools/uniflash.py
@@ -41,7 +41,7 @@ def execute(command):
     if exitCode == 0:
         return cmd_log
     else:
-        raise ProcessException(command, exitCode, output)
+        raise subprocess.CalledProcessError(exitCode, command, output)
 
 
 def main():

From 801910fc837919688b98e9abce04a679f14037be Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:18:50 +1000
Subject: [PATCH 0218/3129] all: Add missing imports for micropython.const.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 examples/bluetooth/ble_uart_repl.py            | 1 +
 ports/nrf/examples/ssd1306_mod.py              | 1 +
 ports/nrf/examples/ubluepy_eddystone.py        | 1 +
 ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py | 1 +
 4 files changed, 4 insertions(+)

diff --git a/examples/bluetooth/ble_uart_repl.py b/examples/bluetooth/ble_uart_repl.py
index 7d92c1f31829a..5812a5cc130f7 100644
--- a/examples/bluetooth/ble_uart_repl.py
+++ b/examples/bluetooth/ble_uart_repl.py
@@ -7,6 +7,7 @@
 import io
 import os
 import micropython
+from micropython import const
 import machine
 
 from ble_uart_peripheral import BLEUART
diff --git a/ports/nrf/examples/ssd1306_mod.py b/ports/nrf/examples/ssd1306_mod.py
index b083a3aa7e811..d42d165fa8a5d 100644
--- a/ports/nrf/examples/ssd1306_mod.py
+++ b/ports/nrf/examples/ssd1306_mod.py
@@ -19,6 +19,7 @@
 # disp = SSD1306_I2C_Mod(128, 64, i2c)
 
 from ssd1306 import SSD1306_I2C
+from micropython import const
 
 SET_COL_ADDR = const(0x21)
 SET_PAGE_ADDR = const(0x22)
diff --git a/ports/nrf/examples/ubluepy_eddystone.py b/ports/nrf/examples/ubluepy_eddystone.py
index 96818d01c2539..c98a2266f5f6c 100644
--- a/ports/nrf/examples/ubluepy_eddystone.py
+++ b/ports/nrf/examples/ubluepy_eddystone.py
@@ -1,3 +1,4 @@
+from micropython import const
 from ubluepy import Peripheral, constants
 
 BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE = const(0x02)
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
index 4dbead0acc63d..db533f18dc662 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
@@ -35,6 +35,7 @@
 # See rfcore_firmware.py for more information.
 
 from machine import mem8, mem16, mem32
+from micropython import const
 import stm
 
 SRAM2A_BASE = const(0x2003_0000)

From 29c022e0f141be4228d9e71469c691daabf372b2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 16 Aug 2023 15:04:42 +1000
Subject: [PATCH 0219/3129] examples/hwapi: Add missing import for 96Boards
 Carbon example.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 examples/hwapi/hwconfig_z_96b_carbon.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hwapi/hwconfig_z_96b_carbon.py b/examples/hwapi/hwconfig_z_96b_carbon.py
index 97fd57a07fff1..d4f98139bc671 100644
--- a/examples/hwapi/hwconfig_z_96b_carbon.py
+++ b/examples/hwapi/hwconfig_z_96b_carbon.py
@@ -1,4 +1,4 @@
-from machine import Signal
+from machine import Pin, Signal
 
 # 96Boards Carbon board
 # USR1 - User controlled led, connected to PD2

From 974f99482cc54fdc9be1623569c46e4be569ebd6 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:21:15 +1000
Subject: [PATCH 0220/3129] renesas-ra/boards: Remove unreachable code in
 make-pins.py.

Looks like copy-paste from the stm32 make-pins.py, references a function
that is not present in the renesas-ra version.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/renesas-ra/boards/make-pins.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/renesas-ra/boards/make-pins.py b/ports/renesas-ra/boards/make-pins.py
index 1b4588f02fe8a..5147d27940bdb 100644
--- a/ports/renesas-ra/boards/make-pins.py
+++ b/ports/renesas-ra/boards/make-pins.py
@@ -220,13 +220,7 @@ def print_qstr(self, qstr_filename):
             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:

From b8189d039d0a9cbda54a7cab8cf12a0aee9603a0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:22:01 +1000
Subject: [PATCH 0221/3129] tools/mpy_ld.py: Pre-declare some local variables
 to appease linter.

Spurious fix as the logic is structured such that these variables will be
set before dereferenced, but this keeps Ruff happy (no more F821
undefined-name).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/mpy_ld.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 87e57869f6d5b..60fa41ce1fa86 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -966,6 +966,9 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
 
     # MPY: relocation information
     prev_kind = None
+    prev_base = None
+    prev_offset = None
+    prev_n = None
     for base, addr, kind in env.mpy_relocs:
         if isinstance(kind, str) and kind.startswith(".text"):
             kind = 0

From 1a5c9b9da4f16f5f7bd91c3420022d4ec0e6fa1a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 19:08:44 +1000
Subject: [PATCH 0222/3129] tools/mpy-tool.py: Ignore linter failure in Python
 2 compatibility code.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 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 a5112de9a1b9a..5ef69b267aec7 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -35,7 +35,7 @@
     bytes_cons = lambda val, enc=None: bytearray(val)
     is_str_type = lambda o: isinstance(o, str)
     is_bytes_type = lambda o: type(o) is bytearray
-    is_int_type = lambda o: isinstance(o, int) or isinstance(o, long)
+    is_int_type = lambda o: isinstance(o, int) or isinstance(o, long)  # noqa: F821
 
     def hexlify_to_str(b):
         x = hexlify_py2(b)

From 40fcbe1246e95eea33a727b1c6f22f76abb34d95 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:24:29 +1000
Subject: [PATCH 0223/3129] top: Enable ruff linter check for F821
 undefined-name.

Very helpful for catching typos or missing imports when writing code!

Description can be found at
https://beta.ruff.rs/docs/rules/undefined-name/

Parent commits contain various small fixes and inline ignores for this
check.  The only blanket exception is manifest files, which are numerous
and evaluated with some global names pre-defined - these can be globally
ignored.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 pyproject.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index dfd26bd8c9c3e..a05abf887ecf0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,6 @@ ignore = [
   "F401",
   "F403",
   "F405",
-  "F821",
   "PLC1901",
 ]
 line-length = 337
@@ -46,3 +45,7 @@ max-complexity = 40
 
 [tool.ruff.per-file-ignores]
 "ports/cc3200/tools/uniflash.py" = ["E711"]
+
+# manifest.py files are evaluated with some global names pre-defined
+"**/manifest.py" = ["F821"]
+"ports/**/boards/manifest*.py" = ["F821"]

From a18d62e06727e0c424da1f43f80a5b0cb76bcc04 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 16 Aug 2023 08:41:40 +0200
Subject: [PATCH 0224/3129] mimxrt: Fix UART RTS/CTS assignments for the OLIMEX
 and Adafruit boards.

At the Adafruit Metro M7 the pin GPIO_AD_13 is used for JTAG. Therefore
it is not configured for RTS at UART 2 and 3.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h | 6 ++++++
 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
index ac9cf97058075..7d759df5e6f47 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
@@ -23,6 +23,12 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_02_LPUART4_TXD }, { IOMUXC_GPIO_AD_01_LPUART4_RXD },
 
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_08_LPUART1_CTS_B }, { IOMUXC_GPIO_07_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_14_LPUART3_CTS_B }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_14_LPUART4_CTS_B }, { 0 },
+
 #define MICROPY_HW_SPI_INDEX { 1 }
 
 #define IOMUX_TABLE_SPI \
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index 828855d4d361a..9443bb3732714 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -26,10 +26,10 @@
     { IOMUXC_GPIO_06_LPUART4_TXD }, { IOMUXC_GPIO_05_LPUART4_RXD },
 
 #define IOMUX_TABLE_UART_CTS_RTS \
-    { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_08_LPUART1_CTS_B }, { IOMUXC_GPIO_07_LPUART1_RTS_B }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
-    { IOMUXC_GPIO_EMC_17_LPUART4_CTS_B }, { IOMUXC_GPIO_EMC_18_LPUART4_RTS_B },
+    { IOMUXC_GPIO_AD_14_LPUART4_CTS_B }, { IOMUXC_GPIO_AD_13_LPUART4_RTS_B },
 
 #define MICROPY_HW_SPI_INDEX { 0, 1, 2 }
 

From e6cfb77342c475d3b4453317cfffbda30cf89e29 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Fri, 8 Jul 2022 12:46:27 +1000
Subject: [PATCH 0225/3129] stm32/spi: Add STM32WL5 SUBGHZ SPI peripheral.

This is a "normal" SPI peripheral with no external pins, to avoid having to
grow spi_obj[] for just this one board map it as SPI ID 3 (board has SPI
IDs 1,2 already).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../stm32/boards/NUCLEO_WL55/mpconfigboard.h  |  4 ++
 ports/stm32/dma.c                             |  4 ++
 ports/stm32/dma.h                             |  2 +
 ports/stm32/spi.c                             | 48 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
index 51700ba8a5367..4087ba4fbc3c3 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -48,6 +48,10 @@
 #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
 
+// SUBGHZSPI Internal radio SPI BUS
+#define MICROPY_HW_SUBGHZSPI_NAME               "SUBGHZ"
+#define MICROPY_HW_SUBGHZSPI_ID                 3
+
 // User switch; pressing the button makes the input go low
 #define MICROPY_HW_USRSW_PIN                    (pin_A0)
 #define MICROPY_HW_USRSW_PULL                   (GPIO_PULLUP)
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index cdbb90e5d8b3c..b2ba787ce694d 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -558,6 +558,10 @@ const dma_descr_t dma_SPI_1_RX = { DMA1_Channel1, DMA_REQUEST_SPI1_RX, dma_id_0,
 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 };
+#if defined(STM32WL)
+const dma_descr_t dma_SPI_SUBGHZ_RX = { DMA1_Channel5, DMA_REQUEST_SUBGHZSPI_RX, dma_id_4, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_SUBGHZ_TX = { DMA1_Channel6, DMA_REQUEST_SUBGHZSPI_TX, dma_id_5, &dma_init_struct_spi_i2c };
+#endif
 
 static const uint8_t dma_irqn[NSTREAM] = {
     DMA1_Channel1_IRQn,
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 92d5db6c0a71c..2afc94754187f 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -136,6 +136,8 @@ extern const dma_descr_t dma_SPI_3_TX;
 extern const dma_descr_t dma_SDIO_0;
 extern const dma_descr_t dma_I2C_4_TX;
 extern const dma_descr_t dma_I2C_4_RX;
+extern const dma_descr_t dma_SPI_SUBGHZ_TX;
+extern const dma_descr_t dma_SPI_SUBGHZ_RX;
 
 #endif
 
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 11a9a74ea3bac..1f5996165ebe0 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -62,6 +62,9 @@ STATIC SPI_HandleTypeDef SPIHandle5 = {.Instance = NULL};
 #if defined(MICROPY_HW_SPI6_SCK)
 STATIC SPI_HandleTypeDef SPIHandle6 = {.Instance = NULL};
 #endif
+#if defined(MICROPY_HW_SUBGHZSPI_ID)
+static SPI_HandleTypeDef SPIHandleSubGhz = {.Instance = NULL};
+#endif
 
 const spi_t spi_obj[6] = {
     #if defined(MICROPY_HW_SPI1_SCK)
@@ -76,6 +79,8 @@ const spi_t spi_obj[6] = {
     #endif
     #if defined(MICROPY_HW_SPI3_SCK)
     {&SPIHandle3, &dma_SPI_3_TX, &dma_SPI_3_RX},
+    #elif MICROPY_HW_SUBGHZSPI_ID == 3
+    {&SPIHandleSubGhz, &dma_SPI_SUBGHZ_TX, &dma_SPI_SUBGHZ_RX},
     #else
     {NULL, NULL, NULL},
     #endif
@@ -96,6 +101,10 @@ const spi_t spi_obj[6] = {
     #endif
 };
 
+#if defined(MICROPY_HW_SUBGHZSPI_ID) && MICROPY_HW_SUBGHZSPI_ID != 3
+#error "spi_obj needs updating for new value of MICROPY_HW_SUBGHZSPI_ID"
+#endif
+
 #if defined(STM32H5) || defined(STM32H7)
 // STM32H5/H7 HAL requires SPI IRQs to be enabled and handled.
 #if defined(MICROPY_HW_SPI1_SCK)
@@ -163,6 +172,9 @@ void spi_init0(void) {
     #if defined(MICROPY_HW_SPI6_SCK)
     SPIHandle6.Instance = SPI6;
     #endif
+    #if defined(MICROPY_HW_SUBGHZSPI_ID)
+    SPIHandleSubGhz.Instance = SUBGHZSPI;
+    #endif
 }
 
 int spi_find_index(mp_obj_t id) {
@@ -195,6 +207,10 @@ int spi_find_index(mp_obj_t id) {
         } else if (strcmp(port, MICROPY_HW_SPI6_NAME) == 0) {
             spi_id = 6;
         #endif
+        #ifdef MICROPY_HW_SUBGHZSPI_NAME
+        } else if (strcmp(port, MICROPY_HW_SUBGHZSPI_NAME) == 0) {
+            spi_id = MICROPY_HW_SUBGHZSPI_ID;
+        #endif
         } else {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%s) doesn't exist"), port);
         }
@@ -239,7 +255,7 @@ STATIC uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
     } else {
         return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI6);
     }
-    #else
+    #else // !STM32F0, !STM32G0, !STM32H
     #if defined(SPI2)
     if (spi->Instance == SPI2) {
         // SPI2 is on APB1
@@ -252,11 +268,20 @@ STATIC uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
         return HAL_RCC_GetPCLK1Freq();
     } else
     #endif
+    #if defined(MICROPY_HW_SUBGHZSPI_ID)
+    if (spi->Instance == SUBGHZSPI) {
+        // In STM32WL5x, SUBGHZSPI is PCLK3 which is same as HCLK3, no HCLK3->PCLK3 divider exists in clock tree
+        #if !defined(LL_APB3_GRP1_PERIPH_SUBGHZSPI)
+        #error "SPI needs updating for new SUBGHZSPI clock configuration"
+        #endif
+        return HAL_RCC_GetHCLK3Freq();
+    } else
+    #endif
     {
         // SPI1, SPI4, SPI5 and SPI6 are on APB2
         return HAL_RCC_GetPCLK2Freq();
     }
-    #endif
+    #endif // STM32F0, STM32G0, STM32H
 }
 
 // sets the parameters in the SPI_InitTypeDef struct
@@ -411,6 +436,12 @@ int spi_init(const spi_t *self, bool enable_nss_pin) {
         // enable the SPI clock
         __HAL_RCC_SPI6_CLK_ENABLE();
     #endif
+    #if defined(MICROPY_HW_SUBGHZSPI_ID)
+    } else if (spi->Instance == SUBGHZSPI) {
+        irqn = SUBGHZSPI_IRQn;
+        // pins remain all NULL, internal bus has no GPIO mappings
+        __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
+    #endif
     } else {
         // SPI does not exist for this board (shouldn't get here, should be checked by caller)
         return -MP_EINVAL;
@@ -502,6 +533,14 @@ void spi_deinit(const spi_t *spi_obj) {
         __HAL_RCC_SPI6_CLK_DISABLE();
         HAL_NVIC_DisableIRQ(SPI6_IRQn);
     #endif
+    #if defined(MICROPY_HW_SUBGHZSPI_ID)
+    } else if (spi->Instance == SUBGHZSPI) {
+        __HAL_RCC_SUBGHZSPI_FORCE_RESET();
+        __HAL_RCC_SUBGHZSPI_RELEASE_RESET();
+        __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
+        HAL_NVIC_DisableIRQ(SUBGHZSPI_IRQn);
+
+    #endif
     }
 }
 
@@ -661,6 +700,11 @@ void spi_print(const mp_print_t *print, const spi_t *spi_obj, bool legacy) {
         spi_num = 6;
     }
     #endif
+    #if defined(MICROPY_HW_SUBGHZSPI_ID)
+    else if (spi->Instance == SUBGHZSPI) {
+        spi_num = MICROPY_HW_SUBGHZSPI_ID;
+    }
+    #endif
 
     mp_printf(print, "SPI(%u", spi_num);
     if (spi->State != HAL_SPI_STATE_RESET) {

From 2c62adb42c241f0ddb523011dbf082c53ba8c742 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 16 Aug 2023 14:11:26 +1000
Subject: [PATCH 0226/3129] stm32/powerctrlboot: Support STM32WL system clock
 from HSE+PLL.

Switches default on the NUCLEO_WL55 board to use the HSE oscillator powered
from PB0_VDDTCXO pin.

Build-time configuration can select from MSI internal oscillator (previous
default), HSE via crystal, or HSE bypass with TCXO powered from PB0_VDDTCXO
pin (new default)

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../stm32/boards/NUCLEO_WL55/mpconfigboard.h  |  7 +++
 ports/stm32/boards/NUCLEO_WL55/pins.csv       |  3 +-
 ports/stm32/mpconfigboard_common.h            |  4 ++
 ports/stm32/powerctrlboot.c                   | 62 ++++++++++++++++++-
 4 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
index 4087ba4fbc3c3..ec5904a3591d7 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -28,6 +28,13 @@
 #define MICROPY_HW_RTC_USE_LSE                  (1)
 #define MICROPY_HW_RTC_USE_US                   (1)
 
+// Use external 32MHz TCXO + PLL as system clock source
+// (If unset, board will use the internal MSI oscillator instead.)
+#define MICROPY_HW_CLK_USE_HSE                  (1)
+
+// HSE bypass for STM32WL5x means TCXO is powered from PB0_VDDTCXO pin
+#define MICROPY_HW_CLK_USE_BYPASS               (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
diff --git a/ports/stm32/boards/NUCLEO_WL55/pins.csv b/ports/stm32/boards/NUCLEO_WL55/pins.csv
index afcf34df1147f..78a0ef8d047fd 100644
--- a/ports/stm32/boards/NUCLEO_WL55/pins.csv
+++ b/ports/stm32/boards/NUCLEO_WL55/pins.csv
@@ -14,7 +14,8 @@
 ,PA13
 ,PA14
 ,PA15
-,PB0
+# in the default board configuration, PB0 must stay muxed to analog for HSE VDDTCXO function
+,-PB0
 ,PB1
 ,PB2
 ,PB3
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 149d2ae73a636..3331b3840081b 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -471,8 +471,12 @@
 #define MICROPY_HW_RCC_HSI_STATE (RCC_HSI_OFF)
 #define MICROPY_HW_RCC_FLAG_HSxRDY (RCC_FLAG_HSERDY)
 #if MICROPY_HW_CLK_USE_BYPASS
+#if !defined(STM32WL)
 #define MICROPY_HW_RCC_HSE_STATE (RCC_HSE_BYPASS)
 #else
+#define MICROPY_HW_RCC_HSE_STATE (RCC_HSE_BYPASS_PWR)
+#endif
+#else
 #define MICROPY_HW_RCC_HSE_STATE (RCC_HSE_ON)
 #endif
 #endif
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 51b740a809031..b075073a5b6d8 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -460,13 +460,71 @@ void SystemClock_Config(void) {
 #include "stm32wlxx_ll_utils.h"
 
 void SystemClock_Config(void) {
-    // Set flash latency
+    // Set flash latency (2 wait states, sysclk > 36MHz)
     LL_FLASH_SetLatency(LL_FLASH_LATENCY_2);
     while (LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2) {
     }
 
     LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
 
+    #if MICROPY_HW_CLK_USE_HSE
+    // Enable the 32MHz external oscillator and 48MHZ SYSCLK via PLL
+
+    #if MICROPY_HW_CLK_USE_BYPASS
+    // Use "bypass power" option, port PB0_VDDTCXO supplies TCXO
+    // (STM32WL5x has no other HSE bypass mode.)
+
+    // "PB0 must be configured in analog mode prior enabling the HSE"
+    //
+    // Note: PB0 analog mode muxes PB0_VDDTCXO pin to the VDDTCXO regulator, set
+    // to default voltage of 1.7V.  Changing this voltage requires initializing
+    // the SUBGHZ radio and sending a Set_Tcxo command to it.
+    //
+    // For the Nucelo-WL55 board, ST uses the NDK "NT2016SF-32M-END5875A" TCXO
+    // which has no publicly available datasheet. However, the ST code for this
+    // board always keeps the pin at the default 1.7V voltage level so changing
+    // the level would only be needed if a different TCXO is used.
+    //
+    // (Note also that setting pin PB0 as a push-pull GPIO output is technically
+    // possible too, but 3.3V will be too high for many TCXOs.)
+    mp_hal_pin_config(pin_B0, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+
+    LL_RCC_HSE_EnableTcxo();
+
+    #endif // MICROPY_HW_CLK_USE_BYPASS
+
+    LL_RCC_HSE_Enable();
+    while (!LL_RCC_HSE_IsReady()) {
+        // Wait for HSE Ready signal
+    }
+
+    // Configure PLL for a 48MHz SYSCLK
+    #define PLLM (HSE_VALUE / 16000000) // VCO input 16MHz (recommended in ST docs)
+    #define PLLN (6) // 7*8MHz = 96MHz
+    #define PLLP (2) // f_P = 48MHz
+    #define PLLQ (2) // f_Q = 48MHz
+    #define PLLR (2) // f_R = 48MHz
+    RCC->PLLCFGR =
+        (PLLR - 1) << RCC_PLLCFGR_PLLR_Pos | RCC_PLLCFGR_PLLREN
+            | (PLLQ - 1) << RCC_PLLCFGR_PLLQ_Pos | RCC_PLLCFGR_PLLQEN
+            | (PLLP - 1) << RCC_PLLCFGR_PLLP_Pos | RCC_PLLCFGR_PLLPEN
+            | PLLN << RCC_PLLCFGR_PLLN_Pos
+            | (PLLM - 1) << RCC_PLLCFGR_PLLM_Pos
+            | LL_RCC_PLLSOURCE_HSE;
+
+    LL_RCC_PLL_Enable();
+    LL_RCC_PLL_EnableDomain_SYS();
+    while (!LL_RCC_PLL_IsReady()) {
+        // Wait for PLL to lock
+    }
+
+    LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL) {
+        // Wait for system clock source to switch
+    }
+
+    #else // Use MSI as 48MHz source for SYSCLK
+
     // Enable MSI
     LL_RCC_MSI_Enable();
     while (!LL_RCC_MSI_IsReady()) {
@@ -482,6 +540,8 @@ void SystemClock_Config(void) {
     while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSI) {
     }
 
+    #endif // MICROPY_HW_CLK_USE_HSE
+
     // Set bus dividers
     LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
     LL_RCC_SetAHB3Prescaler(LL_RCC_SYSCLK_DIV_1);

From 9e0f934cdf195ca8d06ce51eb89f89e590984176 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Fri, 8 Jul 2022 14:18:44 +1000
Subject: [PATCH 0227/3129] stm32/dma: Fix DMA completion on WL55 boards.

No IRQHandlers were compiled in for this board.

Includes small consolidation of the same DMAMUX_ENABLE line for STM32G4,
STM32WB, STM32WL.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/dma.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index b2ba787ce694d..bfa4fb23ff171 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -161,7 +161,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(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)) || defined(STM32WL)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -171,7 +171,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
     .MemDataAlignment = DMA_MDATAALIGN_WORD,
     #if defined(STM32F4) || defined(STM32F7)
     .Mode = DMA_PFCTRL,
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     .Mode = DMA_NORMAL,
     #endif
     .Priority = DMA_PRIORITY_VERY_HIGH,
@@ -189,7 +189,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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -1221,7 +1221,7 @@ void DMA1_Channel4_5_6_7_IRQHandler(void) {
     IRQ_EXIT(DMA1_Channel4_5_6_7_IRQn);
 }
 
-#elif defined(STM32L1) || defined(STM32L4) || defined(STM32WB)
+#elif defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 
 void DMA1_Channel1_IRQHandler(void) {
     IRQ_ENTER(DMA1_Channel1_IRQn);
@@ -1344,9 +1344,9 @@ 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 defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
     if (!__HAL_RCC_DMAMUX1_IS_CLK_ENABLED()) {
+        // MCU has a DMAMUX peripheral which needs to be enabled to multiplex the channels.
         __HAL_RCC_DMAMUX1_CLK_ENABLE();
     }
     #endif
@@ -1354,9 +1354,6 @@ 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.
@@ -1371,9 +1368,6 @@ 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.
 

From 02620c2236e948b1899d122359a1eb150e5a9ee0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 15 Jul 2022 14:04:33 +1000
Subject: [PATCH 0228/3129] stm32/subghz: Add STM32WL55 subghz radio interface
 to stm module.

This is the minimum C interface to allow a modem driver to be built in
Python.  Interface is simple, with the intention that the micropython-lib
driver is the main (only) consumer of it.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/stm.rst                          |  36 +++++
 ports/stm32/Makefile                          |   1 +
 .../stm32/boards/NUCLEO_WL55/mpconfigboard.h  |   2 +-
 ports/stm32/boards/NUCLEO_WL55/pins.csv       |   6 +-
 ports/stm32/irq.h                             |   2 +
 ports/stm32/main.c                            |   7 +
 ports/stm32/modstm.c                          |   7 +
 ports/stm32/subghz.c                          | 139 ++++++++++++++++++
 ports/stm32/subghz.h                          |  40 +++++
 9 files changed, 236 insertions(+), 4 deletions(-)
 create mode 100644 ports/stm32/subghz.c
 create mode 100644 ports/stm32/subghz.h

diff --git a/docs/library/stm.rst b/docs/library/stm.rst
index a181d6044cc16..970ab188344a5 100644
--- a/docs/library/stm.rst
+++ b/docs/library/stm.rst
@@ -102,3 +102,39 @@ the second CPU, the RF core.
     Execute a HCI command on the SYS channel.  The execution is synchronous.
 
     Returns a bytes object with the result of the SYS command.
+
+Functions specific to STM32WLxx MCUs
+------------------------------------
+
+These functions are available on STM32WLxx microcontrollers, and interact with
+the integrated "SUBGHZ" radio modem peripheral.
+
+.. function:: subghz_cs(level)
+
+   Sets the internal SPI CS pin attached to the radio peripheral. The ``level``
+   argument is active-low: a truthy value means "CS pin high" and de-asserts the
+   signal, a falsey value means "CS pin low" and asserts the signal.
+
+   The internal-only SPI bus corresponding to this CS signal can be instantiated
+   using :ref:`machine.SPI()<machine.SPI>` ``id`` value ``"SUBGHZ"``.
+
+.. function:: subghz_irq(handler)
+
+   Sets the internal SUBGHZ radio interrupt handler to the provided
+   function. The handler function is called as a "hard" interrupt in response to
+   radio peripheral interrupts. See :ref:`isr_rules` for more information about
+   interrupt handlers in MicroPython.
+
+   Calling this function with the handler argument set to None disables the IRQ.
+
+   Due to a hardware limitation, each time this IRQ fires MicroPython disables
+   it before calling the handler. In order to receive another interrupt, Python
+   code should call ``subghz_irq()`` to set the handler again. This has the side
+   effect of re-enabling the IRQ.
+
+.. function:: subghz_is_busy()
+
+   Return a ``bool`` corresponding to the internal "RFBUSYS" signal from the
+   radio peripheral. Before sending a new command to the radio over SPI then
+   this function should be polled until it returns ``False``, to confirm the
+   busy signal is de-asserted.
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 2bfd11157eed3..7051398970fb5 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -355,6 +355,7 @@ SRC_C += \
 	dac.c \
 	adc.c \
 	sdio.c \
+	subghz.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
 SRC_O += \
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
index ec5904a3591d7..c87fcdea9bed2 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -14,7 +14,7 @@
 #define MICROPY_PY_SOCKET                       (0)
 #define MICROPY_PY_NETWORK                      (0)
 #define MICROPY_PY_ONEWIRE                      (0)
-#define MICROPY_PY_STM                          (0)
+#define MICROPY_PY_STM                          (1)
 #define MICROPY_PY_PYB_LEGACY                   (0)
 #define MICROPY_PY_HEAPQ                        (0)
 
diff --git a/ports/stm32/boards/NUCLEO_WL55/pins.csv b/ports/stm32/boards/NUCLEO_WL55/pins.csv
index 78a0ef8d047fd..41e2d725a2dcb 100644
--- a/ports/stm32/boards/NUCLEO_WL55/pins.csv
+++ b/ports/stm32/boards/NUCLEO_WL55/pins.csv
@@ -34,9 +34,9 @@
 ,PC0
 ,PC1
 ,PC2
-,PC3
-,PC4
-,PC5
+FE_CTRL3,PC3
+FE_CTRL1,PC4
+FE_CTRL2,PC5
 ,PC6
 SW,PA0
 SW1,PA0
diff --git a/ports/stm32/irq.h b/ports/stm32/irq.h
index 8e98b4cc5ec5b..7f10d0d004604 100644
--- a/ports/stm32/irq.h
+++ b/ports/stm32/irq.h
@@ -155,6 +155,8 @@ static inline void restore_irq_pri(uint32_t state) {
 
 #define IRQ_PRI_CAN             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 7, 0)
 
+#define IRQ_PRI_SUBGHZ_RADIO    NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 8, 0)
+
 #define IRQ_PRI_SPI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 8, 0)
 
 // Interrupt priority for non-special timers.
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 2235e4de3537d..95b74c621a2d1 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -86,6 +86,7 @@
 #include "servo.h"
 #include "dac.h"
 #include "can.h"
+#include "subghz.h"
 
 #if MICROPY_PY_THREAD
 STATIC pyb_thread_t pyb_thread_main;
@@ -403,6 +404,9 @@ void stm32_main(uint32_t reset_mode) {
     #if defined(STM32WB)
     rfcore_init();
     #endif
+    #if defined(STM32WL)
+    subghz_init();
+    #endif
     #if MICROPY_HW_SDRAM_SIZE
     sdram_init();
     bool sdram_valid = true;
@@ -650,6 +654,9 @@ void stm32_main(uint32_t reset_mode) {
     #if MICROPY_PY_BLUETOOTH
     mp_bluetooth_deinit();
     #endif
+    #if defined(STM32WL)
+    subghz_deinit();
+    #endif
     #if MICROPY_PY_NETWORK
     mod_network_deinit();
     #endif
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 94d56d4d082b5..53bc0db79c2c2 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -32,6 +32,7 @@
 #include "extmod/machine_mem.h"
 #include "rfcore.h"
 #include "portmodules.h"
+#include "subghz.h"
 
 #if MICROPY_PY_STM
 
@@ -51,6 +52,12 @@ STATIC const mp_rom_map_elem_t stm_module_globals_table[] = {
     { 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
+
+    #if defined(STM32WL)
+    { MP_ROM_QSTR(MP_QSTR_subghz_cs), MP_ROM_PTR(&subghz_cs_obj) },
+    { MP_ROM_QSTR(MP_QSTR_subghz_irq), MP_ROM_PTR(&subghz_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_subghz_is_busy), MP_ROM_PTR(&subghz_is_busy_obj) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(stm_module_globals, stm_module_globals_table);
diff --git a/ports/stm32/subghz.c b/ports/stm32/subghz.c
new file mode 100644
index 0000000000000..1daed59aaf2aa
--- /dev/null
+++ b/ports/stm32/subghz.c
@@ -0,0 +1,139 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "py/gc.h"
+#include "py/runtime.h"
+#include "subghz.h"
+#include "irq.h"
+#include "spi.h"
+
+#if defined(STM32WL)
+
+// Interface to the STM32WL series "SUBGHZ Radio" module
+
+STATIC void handle_radio_irq() {
+    // Level-triggered interrupts means the interrupt has to be cleared before
+    // this function returns.
+    //
+    // Rather than writing to SUBGHZ SPI in Interrupt Context to clear the
+    // interrupt, disable the IRQ and rely on Python code to call
+    // subghz_irq(handler) to re-enable when needed.
+    HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+
+    mp_obj_t callback = MP_STATE_PORT(subghz_callback);
+    if (callback != mp_const_none) {
+        mp_sched_lock();
+        gc_lock();
+        // Passing dummy 'pin' argument of None, to keep
+        // compatibility with machine.Pin.isr() handlers
+        mp_call_function_1_protected(callback, mp_const_none);
+        gc_unlock();
+        mp_sched_unlock();
+    }
+}
+
+void SUBGHZ_Radio_IRQHandler(void) {
+    IRQ_ENTER(SUBGHZ_Radio_IRQn);
+    handle_radio_irq();
+    IRQ_EXIT(SUBGHZ_Radio_IRQn);
+}
+
+void subghz_init(void) {
+    __HAL_RCC_SUBGHZ_RADIO_FORCE_RESET();
+
+    #if !MICROPY_HW_CLK_USE_HSE && MICROPY_HW_CLK_USE_BYPASS
+    // SUBGHZ clock source is HSE oscillator.
+    //
+    // If this is not already enabled for the system clock, and we're depending
+    // on the VDDTCXO pin to power the HSE ("bypass mode"), then enable it.
+    __HAL_RCC_HSE_CONFIG(RCC_HSE_BYPASS_PWR);
+    #endif
+
+    NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+    NVIC_SetPriority(SUBGHZ_Radio_IRQn, IRQ_PRI_SUBGHZ_RADIO);
+
+    __HAL_RCC_SUBGHZ_RADIO_RELEASE_RESET();
+
+    while (__HAL_RCC_GET_FLAG(RCC_FLAG_RFRST) != 0) {
+    }
+
+    MP_STATE_PORT(subghz_callback) = mp_const_none;
+}
+
+void subghz_deinit(void) {
+    MP_STATE_PORT(subghz_callback) = mp_const_none;
+    NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+    __HAL_RCC_SUBGHZ_RADIO_FORCE_RESET();
+    __HAL_RCC_SUBGHZ_RADIO_RELEASE_RESET();
+}
+
+STATIC mp_obj_t subghz_cs(mp_obj_t value) {
+    // Treat the same as normal SPI - truthy is "unselected",
+    //   falsey is active low "selected",
+    if (mp_obj_is_true(value)) {
+        LL_PWR_UnselectSUBGHZSPI_NSS();
+    } else {
+        LL_PWR_SelectSUBGHZSPI_NSS();
+    }
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(subghz_cs_obj, subghz_cs);
+
+STATIC mp_obj_t subghz_irq(mp_obj_t handler) {
+    MP_STATE_PORT(subghz_callback) = handler;
+
+    if (mp_obj_is_true(handler)) {
+        HAL_NVIC_ClearPendingIRQ(SUBGHZ_Radio_IRQn);
+        HAL_NVIC_EnableIRQ(SUBGHZ_Radio_IRQn);
+    } else {
+        HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+    }
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(subghz_irq_obj, subghz_irq);
+
+STATIC mp_obj_t subghz_is_busy(void) {
+    // Read the raw unmasked busy signal. This should be checked before driving
+    // CS low to start a command.
+    //
+    // Reads the raw RFBUSYS not the masked RFBUSYMS, in contradiction to EM0453
+    // 6.3 "Radio busy management". This is because the RFBUSYMS signal doesn't
+    // seem to match the reference manual. Observed behaviour matches this bug
+    // report instead: https://community.st.com/s/question/0D53W000014zFx9SAE
+    //
+    // Reading RFBUSYS won't cause any problems here provided a new SPI command
+    // isn't immediately after the previous command, which shouldn't be possible
+    // with MicroPython.
+    return mp_obj_new_bool(LL_PWR_IsActiveFlag_RFBUSYS());
+
+}
+MP_DEFINE_CONST_FUN_OBJ_0(subghz_is_busy_obj, subghz_is_busy);
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t subghz_callback);
+
+#endif // STM32WL
diff --git a/ports/stm32/subghz.h b/ports/stm32/subghz.h
new file mode 100644
index 0000000000000..f8678cd087a17
--- /dev/null
+++ b/ports/stm32/subghz.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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_STM32_SUBGHZ_H
+#define MICROPY_INCLUDED_STM32_SUBGHZ_H
+
+#include "py/obj.h"
+
+// Interface to the STM32WL series "SUBGHZ Radio" module
+
+void subghz_init(void);
+void subghz_deinit(void);
+
+MP_DECLARE_CONST_FUN_OBJ_1(subghz_cs_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(subghz_irq_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(subghz_is_busy_obj);
+
+#endif

From 2919a9fbf33b2e9c0cfeeb73e1a7240d70b5310d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 11:53:03 +1000
Subject: [PATCH 0229/3129] stm32/modstm: Add MICROPY_PY_STM_CONST flag, clear
 it for STM32WL5.

MICROPY_PY_STM_CONST defaults to 1 if MICROPY_PY_STM is set.  Overriding to
0 disables the named register peripheral constants being including in the
stm32 module.

This saves about 7.5KB of code size for the STM32WL55, which is significant
as this SoC doesn't have a lot of flash.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h | 3 ++-
 ports/stm32/make-stmconst.py                   | 4 ++--
 ports/stm32/modstm.c                           | 2 ++
 ports/stm32/mpconfigboard_common.h             | 7 ++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
index c87fcdea9bed2..843e855ce7732 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -14,7 +14,8 @@
 #define MICROPY_PY_SOCKET                       (0)
 #define MICROPY_PY_NETWORK                      (0)
 #define MICROPY_PY_ONEWIRE                      (0)
-#define MICROPY_PY_STM                          (1)
+#define MICROPY_PY_STM                          (1) // for subghz radio functions
+#define MICROPY_PY_STM_CONST                    (0) // saves size, no named registers
 #define MICROPY_PY_PYB_LEGACY                   (0)
 #define MICROPY_PY_HEAPQ                        (0)
 
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 49b5c1a17bed4..4e4f2d7155f87 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -319,10 +319,10 @@ def main():
     print("")
 
     with open(args.qstr_filename, "wt") as qstr_file:
-        print("#if MICROPY_PY_STM", file=qstr_file)
+        print("#if MICROPY_PY_STM_CONST", file=qstr_file)
         for qstr in sorted(needed_qstrs):
             print("Q({})".format(qstr), file=qstr_file)
-        print("#endif // MICROPY_PY_STM", file=qstr_file)
+        print("#endif // MICROPY_PY_STM_CONST", file=qstr_file)
 
     with open(args.mpz_filename, "wt") as mpz_file:
         for mpz in sorted(needed_mpzs):
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 53bc0db79c2c2..251360594a657 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -45,7 +45,9 @@ STATIC const mp_rom_map_elem_t stm_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) },
 
+    #if MICROPY_PY_STM_CONST
     #include "genhdr/modstm_const.h"
+    #endif
 
     #if defined(STM32WB)
     { MP_ROM_QSTR(MP_QSTR_rfcore_status), MP_ROM_PTR(&rfcore_status_obj) },
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 3331b3840081b..611a08252d51d 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -32,11 +32,16 @@
 /*****************************************************************************/
 // Feature settings with defaults
 
-// Whether to include the stm module, with peripheral register constants
+// Whether to include the stm module
 #ifndef MICROPY_PY_STM
 #define MICROPY_PY_STM (1)
 #endif
 
+// Whether to include named register constants in the stm module
+#ifndef MICROPY_PY_STM_CONST
+#define MICROPY_PY_STM_CONST (MICROPY_PY_STM)
+#endif
+
 // Whether to include the pyb module
 #ifndef MICROPY_PY_PYB
 #define MICROPY_PY_PYB (1)

From f007d0aa3d91df70a79c5ebded7ac303c451f63f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 23:05:26 +1000
Subject: [PATCH 0230/3129] nrf/boards: Rename all nRF boards to use uppercase.

This is to match all the other ports.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/nrf/Makefile                            |  4 +-
 ports/nrf/README.md                           | 62 +++++++++----------
 .../board.json                                |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../pins.csv                                  |  0
 .../board.c                                   |  0
 .../board.json                                |  0
 .../deploy.md                                 |  0
 .../manifest.py                               |  0
 .../modules/imu.py                            |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  2 +-
 .../nano_bootloader.ld                        |  0
 .../pins.csv                                  |  0
 .../board.json                                |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../{arduino_primo => ARDUINO_PRIMO}/pins.csv |  0
 .../board.json                                |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../pins.csv                                  |  0
 .../{dvk_bl652 => DVK_BL652}/board.json       |  0
 .../{dvk_bl652 => DVK_BL652}/mpconfigboard.h  |  0
 .../{dvk_bl652 => DVK_BL652}/mpconfigboard.mk |  0
 .../boards/{dvk_bl652 => DVK_BL652}/pins.csv  |  0
 .../{evk_nina_b1 => EVK_NINA_B1}/board.json   |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../{evk_nina_b1 => EVK_NINA_B1}/pins.csv     |  0
 .../{evk_nina_b3 => EVK_NINA_B3}/board.json   |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../{evk_nina_b3 => EVK_NINA_B3}/pins.csv     |  0
 .../{feather52 => FEATHER52}/board.json       |  0
 .../{feather52 => FEATHER52}/mpconfigboard.h  |  0
 .../{feather52 => FEATHER52}/mpconfigboard.mk |  0
 .../boards/{feather52 => FEATHER52}/pins.csv  |  0
 .../board.json                                |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../pins.csv                                  |  0
 .../board.json                                |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../pins.csv                                  |  0
 .../boards/{microbit => MICROBIT}/board.json  |  0
 .../custom_nrf51822_s110_microbit.ld          |  0
 .../{microbit => MICROBIT}/modules/AUTHORS    |  0
 .../{microbit => MICROBIT}/modules/LICENSE    |  0
 .../modules/boardmodules.h                    |  0
 .../modules/boardmodules.mk                   |  2 +-
 .../{microbit => MICROBIT}/modules/iters.c    |  0
 .../{microbit => MICROBIT}/modules/iters.h    |  0
 .../modules/microbitconstimage.c              |  0
 .../modules/microbitconstimage.h              |  0
 .../modules/microbitconstimagetuples.c        |  0
 .../modules/microbitdisplay.c                 |  0
 .../modules/microbitdisplay.h                 |  0
 .../modules/microbitfont.h                    |  0
 .../modules/microbitimage.c                   |  0
 .../modules/microbitimage.h                   |  0
 .../modules/modmicrobit.c                     |  0
 .../modules/modmicrobit.h                     |  0
 .../{microbit => MICROBIT}/mpconfigboard.h    |  0
 .../{microbit => MICROBIT}/mpconfigboard.mk   |  2 +-
 .../boards/{microbit => MICROBIT}/pins.csv    |  0
 .../README.md                                 |  0
 .../board.json                                |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../pins.csv                                  |  0
 .../board.json                                |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../pins.csv                                  |  0
 .../boards/{pca10000 => PCA10000}/board.json  |  0
 .../{pca10000 => PCA10000}/mpconfigboard.h    |  0
 .../{pca10000 => PCA10000}/mpconfigboard.mk   |  0
 .../boards/{pca10000 => PCA10000}/pins.csv    |  0
 .../boards/{pca10001 => PCA10001}/board.json  |  0
 .../{pca10001 => PCA10001}/mpconfigboard.h    |  0
 .../{pca10001 => PCA10001}/mpconfigboard.mk   |  0
 .../boards/{pca10001 => PCA10001}/pins.csv    |  0
 .../boards/{pca10028 => PCA10028}/board.json  |  0
 .../{pca10028 => PCA10028}/mpconfigboard.h    |  0
 .../{pca10028 => PCA10028}/mpconfigboard.mk   |  0
 .../boards/{pca10028 => PCA10028}/pins.csv    |  0
 .../boards/{pca10031 => PCA10031}/board.json  |  0
 .../{pca10031 => PCA10031}/mpconfigboard.h    |  0
 .../{pca10031 => PCA10031}/mpconfigboard.mk   |  0
 .../boards/{pca10031 => PCA10031}/pins.csv    |  0
 .../boards/{pca10040 => PCA10040}/board.json  |  0
 .../{pca10040 => PCA10040}/mpconfigboard.h    |  0
 .../{pca10040 => PCA10040}/mpconfigboard.mk   |  0
 .../boards/{pca10040 => PCA10040}/pins.csv    |  0
 .../boards/{pca10056 => PCA10056}/board.json  |  0
 .../{pca10056 => PCA10056}/mpconfigboard.h    |  0
 .../{pca10056 => PCA10056}/mpconfigboard.mk   |  0
 .../boards/{pca10056 => PCA10056}/pins.csv    |  0
 .../boards/{pca10059 => PCA10059}/board.json  |  0
 .../modules/boardmodules.h                    |  0
 .../modules/boardmodules.mk                   |  2 +-
 .../modules/recover_uicr_regout0.c            |  0
 .../{pca10059 => PCA10059}/mpconfigboard.h    |  0
 .../{pca10059 => PCA10059}/mpconfigboard.mk   |  0
 .../boards/{pca10059 => PCA10059}/pins.csv    |  0
 .../boards/{pca10090 => PCA10090}/board.json  |  0
 .../{pca10090 => PCA10090}/mpconfigboard.h    |  0
 .../{pca10090 => PCA10090}/mpconfigboard.mk   |  0
 .../boards/{pca10090 => PCA10090}/pins.csv    |  0
 .../XIAO_bootloader.ld                        |  0
 .../board.c                                   |  0
 .../board.json                                |  0
 .../deploy.md                                 |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  2 +-
 .../pins.csv                                  |  0
 .../{wt51822_s4at => WT51822_S4AT}/board.json |  0
 .../mpconfigboard.h                           |  0
 .../mpconfigboard.mk                          |  0
 .../{wt51822_s4at => WT51822_S4AT}/pins.csv   |  0
 tools/ci.sh                                   |  8 +--
 124 files changed, 42 insertions(+), 42 deletions(-)
 rename ports/nrf/boards/{actinius_icarus => ACTINIUS_ICARUS}/board.json (100%)
 rename ports/nrf/boards/{actinius_icarus => ACTINIUS_ICARUS}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{actinius_icarus => ACTINIUS_ICARUS}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{actinius_icarus => ACTINIUS_ICARUS}/pins.csv (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/board.c (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/board.json (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/deploy.md (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/manifest.py (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/modules/imu.py (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/mpconfigboard.mk (77%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/nano_bootloader.ld (100%)
 rename ports/nrf/boards/{arduino_nano_33_ble_sense => ARDUINO_NANO_33_BLE_SENSE}/pins.csv (100%)
 rename ports/nrf/boards/{arduino_primo => ARDUINO_PRIMO}/board.json (100%)
 rename ports/nrf/boards/{arduino_primo => ARDUINO_PRIMO}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{arduino_primo => ARDUINO_PRIMO}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{arduino_primo => ARDUINO_PRIMO}/pins.csv (100%)
 rename ports/nrf/boards/{blueio_tag_evim => BLUEIO_TAG_EVIM}/board.json (100%)
 rename ports/nrf/boards/{blueio_tag_evim => BLUEIO_TAG_EVIM}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{blueio_tag_evim => BLUEIO_TAG_EVIM}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{blueio_tag_evim => BLUEIO_TAG_EVIM}/pins.csv (100%)
 rename ports/nrf/boards/{dvk_bl652 => DVK_BL652}/board.json (100%)
 rename ports/nrf/boards/{dvk_bl652 => DVK_BL652}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{dvk_bl652 => DVK_BL652}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{dvk_bl652 => DVK_BL652}/pins.csv (100%)
 rename ports/nrf/boards/{evk_nina_b1 => EVK_NINA_B1}/board.json (100%)
 rename ports/nrf/boards/{evk_nina_b1 => EVK_NINA_B1}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{evk_nina_b1 => EVK_NINA_B1}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{evk_nina_b1 => EVK_NINA_B1}/pins.csv (100%)
 rename ports/nrf/boards/{evk_nina_b3 => EVK_NINA_B3}/board.json (100%)
 rename ports/nrf/boards/{evk_nina_b3 => EVK_NINA_B3}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{evk_nina_b3 => EVK_NINA_B3}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{evk_nina_b3 => EVK_NINA_B3}/pins.csv (100%)
 rename ports/nrf/boards/{feather52 => FEATHER52}/board.json (100%)
 rename ports/nrf/boards/{feather52 => FEATHER52}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{feather52 => FEATHER52}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{feather52 => FEATHER52}/pins.csv (100%)
 rename ports/nrf/boards/{ibk_blyst_nano => IBK_BLYST_NANO}/board.json (100%)
 rename ports/nrf/boards/{ibk_blyst_nano => IBK_BLYST_NANO}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{ibk_blyst_nano => IBK_BLYST_NANO}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{ibk_blyst_nano => IBK_BLYST_NANO}/pins.csv (100%)
 rename ports/nrf/boards/{idk_blyst_nano => IDK_BLYST_NANO}/board.json (100%)
 rename ports/nrf/boards/{idk_blyst_nano => IDK_BLYST_NANO}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{idk_blyst_nano => IDK_BLYST_NANO}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{idk_blyst_nano => IDK_BLYST_NANO}/pins.csv (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/board.json (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/custom_nrf51822_s110_microbit.ld (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/AUTHORS (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/LICENSE (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/boardmodules.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/boardmodules.mk (91%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/iters.c (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/iters.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitconstimage.c (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitconstimage.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitconstimagetuples.c (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitdisplay.c (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitdisplay.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitfont.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitimage.c (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/microbitimage.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/modmicrobit.c (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/modules/modmicrobit.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{microbit => MICROBIT}/mpconfigboard.mk (79%)
 rename ports/nrf/boards/{microbit => MICROBIT}/pins.csv (100%)
 rename ports/nrf/boards/{nrf52840-mdk-usb-dongle => NRF52840_MDK_USB_DONGLE}/README.md (100%)
 rename ports/nrf/boards/{nrf52840-mdk-usb-dongle => NRF52840_MDK_USB_DONGLE}/board.json (100%)
 rename ports/nrf/boards/{nrf52840-mdk-usb-dongle => NRF52840_MDK_USB_DONGLE}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{nrf52840-mdk-usb-dongle => NRF52840_MDK_USB_DONGLE}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{nrf52840-mdk-usb-dongle => NRF52840_MDK_USB_DONGLE}/pins.csv (100%)
 rename ports/nrf/boards/{particle_xenon => PARTICLE_XENON}/board.json (100%)
 rename ports/nrf/boards/{particle_xenon => PARTICLE_XENON}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{particle_xenon => PARTICLE_XENON}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{particle_xenon => PARTICLE_XENON}/pins.csv (100%)
 rename ports/nrf/boards/{pca10000 => PCA10000}/board.json (100%)
 rename ports/nrf/boards/{pca10000 => PCA10000}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10000 => PCA10000}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10000 => PCA10000}/pins.csv (100%)
 rename ports/nrf/boards/{pca10001 => PCA10001}/board.json (100%)
 rename ports/nrf/boards/{pca10001 => PCA10001}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10001 => PCA10001}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10001 => PCA10001}/pins.csv (100%)
 rename ports/nrf/boards/{pca10028 => PCA10028}/board.json (100%)
 rename ports/nrf/boards/{pca10028 => PCA10028}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10028 => PCA10028}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10028 => PCA10028}/pins.csv (100%)
 rename ports/nrf/boards/{pca10031 => PCA10031}/board.json (100%)
 rename ports/nrf/boards/{pca10031 => PCA10031}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10031 => PCA10031}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10031 => PCA10031}/pins.csv (100%)
 rename ports/nrf/boards/{pca10040 => PCA10040}/board.json (100%)
 rename ports/nrf/boards/{pca10040 => PCA10040}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10040 => PCA10040}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10040 => PCA10040}/pins.csv (100%)
 rename ports/nrf/boards/{pca10056 => PCA10056}/board.json (100%)
 rename ports/nrf/boards/{pca10056 => PCA10056}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10056 => PCA10056}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10056 => PCA10056}/pins.csv (100%)
 rename ports/nrf/boards/{pca10059 => PCA10059}/board.json (100%)
 rename ports/nrf/boards/{pca10059 => PCA10059}/modules/boardmodules.h (100%)
 rename ports/nrf/boards/{pca10059 => PCA10059}/modules/boardmodules.mk (85%)
 rename ports/nrf/boards/{pca10059 => PCA10059}/modules/recover_uicr_regout0.c (100%)
 rename ports/nrf/boards/{pca10059 => PCA10059}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10059 => PCA10059}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10059 => PCA10059}/pins.csv (100%)
 rename ports/nrf/boards/{pca10090 => PCA10090}/board.json (100%)
 rename ports/nrf/boards/{pca10090 => PCA10090}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{pca10090 => PCA10090}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{pca10090 => PCA10090}/pins.csv (100%)
 rename ports/nrf/boards/{seeed_xiao_nrf52 => SEEED_XIAO_NRF52}/XIAO_bootloader.ld (100%)
 rename ports/nrf/boards/{seeed_xiao_nrf52 => SEEED_XIAO_NRF52}/board.c (100%)
 rename ports/nrf/boards/{seeed_xiao_nrf52 => SEEED_XIAO_NRF52}/board.json (100%)
 rename ports/nrf/boards/{seeed_xiao_nrf52 => SEEED_XIAO_NRF52}/deploy.md (100%)
 rename ports/nrf/boards/{seeed_xiao_nrf52 => SEEED_XIAO_NRF52}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{seeed_xiao_nrf52 => SEEED_XIAO_NRF52}/mpconfigboard.mk (82%)
 rename ports/nrf/boards/{seeed_xiao_nrf52 => SEEED_XIAO_NRF52}/pins.csv (100%)
 rename ports/nrf/boards/{wt51822_s4at => WT51822_S4AT}/board.json (100%)
 rename ports/nrf/boards/{wt51822_s4at => WT51822_S4AT}/mpconfigboard.h (100%)
 rename ports/nrf/boards/{wt51822_s4at => WT51822_S4AT}/mpconfigboard.mk (100%)
 rename ports/nrf/boards/{wt51822_s4at => WT51822_S4AT}/pins.csv (100%)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 3a4b0ef23d500..5e9e31ad0140b 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -4,8 +4,8 @@ ifdef BOARD_DIR
 # the path as the board name.
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
-# If not given on the command line, then default to pca10040.
-BOARD ?= pca10040
+# If not given on the command line, then default to PCA10040.
+BOARD ?= PCA10040
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index fde04e61f101c..889ead5d4d7ba 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -41,7 +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)
+  * [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)
@@ -63,8 +63,8 @@ By default, the PCA10040 (nrf52832) is used as compile target. To build and flas
 Alternatively the target board could be defined:
 
     make submodules
-    make BOARD=pca10040
-    make BOARD=pca10040 deploy
+    make BOARD=PCA10040
+    make BOARD=PCA10040 deploy
 
 ## Compile without LTO enabled
 
@@ -73,7 +73,7 @@ targets in the nrf-port. The `-flto` linker flag can be toggled easily by using
 the argument LTO when building. The example below shows how to disable LTO for
 the compilation:
 
-    make BOARD=pca10040 LTO=0
+    make BOARD=PCA10040 LTO=0
 
 **Note**: There have been several issues with use of LTO in conjunction with
 GNU ARM Embedded Toolchain 7.2.1/4Q17. It's recommended to use a toolchain after
@@ -88,11 +88,11 @@ First prepare the bluetooth folder by downloading Bluetooth LE stacks and header
 
 If the Bluetooth stacks has been downloaded, compile the target with the following command:
 
-    make BOARD=pca10040 SD=s132
+    make BOARD=PCA10040 SD=s132
 
 The **make sd** will trigger a flash of the bluetooth stack before that application is flashed. Note that **make sd** will perform a full erase of the chip, which could cause 3rd party bootloaders to also be wiped.
 
-    make BOARD=pca10040 SD=s132 sd
+    make BOARD=PCA10040 SD=s132 sd
 
 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`.
 
@@ -104,7 +104,7 @@ it in the specific target board's `mpconfigboard.mk`.
 
 For example:
 
-    make BOARD=pca10040 FROZEN_MANIFEST=path/to/manifest.py
+    make BOARD=PCA10040 FROZEN_MANIFEST=path/to/manifest.py
 
 In case of using the target board's makefile, add a line similar to this:
 
@@ -117,7 +117,7 @@ As the `oofatfs` module is not having header guards that can exclude the impleme
 
 For example:
 
-     make BOARD=pca10040 MICROPY_VFS_FAT=1
+     make BOARD=PCA10040 MICROPY_VFS_FAT=1
 
 ## Enable MICROPY_VFS_LFS1 or MICROPY_VFS_LFS2
 
@@ -127,7 +127,7 @@ or `MICROPY_VFS_LFS2` can be set. This will be in addition of setting
 
 For example:
 
-    make BOARD=pca10056 MICROPY_VFS_LFS2=1
+    make BOARD=PCA10056 MICROPY_VFS_LFS2=1
 
 ## Set file system size
 
@@ -141,7 +141,7 @@ 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
+    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
@@ -151,25 +151,25 @@ location.
 
 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)
+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
 
@@ -218,7 +218,7 @@ to trim of the MBR in case SoftDevice flashing is requested.
 `nrfutil` as flashing backend also requires a serial port parameter to be defined
 in addition to the `deploy` target of make. For example:
 
-    make BOARD=nrf52840-mdk-usb-dongle NRFUTIL_PORT=/dev/ttyACM0 deploy
+    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
@@ -228,7 +228,7 @@ 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
+    make BOARD=NRF52840_MDK_USB_DONGLE SD=s140 NRFUTIL_PORT=/dev/ttyACM0 sd
 
 ## Bluetooth LE REPL
 
diff --git a/ports/nrf/boards/actinius_icarus/board.json b/ports/nrf/boards/ACTINIUS_ICARUS/board.json
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/board.json
rename to ports/nrf/boards/ACTINIUS_ICARUS/board.json
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.h b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/mpconfigboard.h
rename to ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.mk b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/mpconfigboard.mk
rename to ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
diff --git a/ports/nrf/boards/actinius_icarus/pins.csv b/ports/nrf/boards/ACTINIUS_ICARUS/pins.csv
similarity index 100%
rename from ports/nrf/boards/actinius_icarus/pins.csv
rename to ports/nrf/boards/ACTINIUS_ICARUS/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
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/board.c
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.c
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/board.json
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/deploy.md
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/deploy.md
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/manifest.py
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/manifest.py
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/modules/imu.py b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/modules/imu.py
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/modules/imu.py
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/modules/imu.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
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
similarity index 77%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
index cb2ff5c6b81cd..148a9f1017943 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
@@ -4,7 +4,7 @@ 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
+LD_FILES += boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
 
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
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
similarity index 100%
rename from ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv
rename to ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
diff --git a/ports/nrf/boards/arduino_primo/board.json b/ports/nrf/boards/ARDUINO_PRIMO/board.json
similarity index 100%
rename from ports/nrf/boards/arduino_primo/board.json
rename to ports/nrf/boards/ARDUINO_PRIMO/board.json
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.h b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/arduino_primo/mpconfigboard.h
rename to ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.mk b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/arduino_primo/mpconfigboard.mk
rename to ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.mk
diff --git a/ports/nrf/boards/arduino_primo/pins.csv b/ports/nrf/boards/ARDUINO_PRIMO/pins.csv
similarity index 100%
rename from ports/nrf/boards/arduino_primo/pins.csv
rename to ports/nrf/boards/ARDUINO_PRIMO/pins.csv
diff --git a/ports/nrf/boards/blueio_tag_evim/board.json b/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/board.json
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.mk
diff --git a/ports/nrf/boards/blueio_tag_evim/pins.csv b/ports/nrf/boards/BLUEIO_TAG_EVIM/pins.csv
similarity index 100%
rename from ports/nrf/boards/blueio_tag_evim/pins.csv
rename to ports/nrf/boards/BLUEIO_TAG_EVIM/pins.csv
diff --git a/ports/nrf/boards/dvk_bl652/board.json b/ports/nrf/boards/DVK_BL652/board.json
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/board.json
rename to ports/nrf/boards/DVK_BL652/board.json
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.h b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/mpconfigboard.h
rename to ports/nrf/boards/DVK_BL652/mpconfigboard.h
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.mk b/ports/nrf/boards/DVK_BL652/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/mpconfigboard.mk
rename to ports/nrf/boards/DVK_BL652/mpconfigboard.mk
diff --git a/ports/nrf/boards/dvk_bl652/pins.csv b/ports/nrf/boards/DVK_BL652/pins.csv
similarity index 100%
rename from ports/nrf/boards/dvk_bl652/pins.csv
rename to ports/nrf/boards/DVK_BL652/pins.csv
diff --git a/ports/nrf/boards/evk_nina_b1/board.json b/ports/nrf/boards/EVK_NINA_B1/board.json
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/board.json
rename to ports/nrf/boards/EVK_NINA_B1/board.json
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/mpconfigboard.h
rename to ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/mpconfigboard.mk
rename to ports/nrf/boards/EVK_NINA_B1/mpconfigboard.mk
diff --git a/ports/nrf/boards/evk_nina_b1/pins.csv b/ports/nrf/boards/EVK_NINA_B1/pins.csv
similarity index 100%
rename from ports/nrf/boards/evk_nina_b1/pins.csv
rename to ports/nrf/boards/EVK_NINA_B1/pins.csv
diff --git a/ports/nrf/boards/evk_nina_b3/board.json b/ports/nrf/boards/EVK_NINA_B3/board.json
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/board.json
rename to ports/nrf/boards/EVK_NINA_B3/board.json
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/mpconfigboard.h
rename to ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
rename to ports/nrf/boards/EVK_NINA_B3/mpconfigboard.mk
diff --git a/ports/nrf/boards/evk_nina_b3/pins.csv b/ports/nrf/boards/EVK_NINA_B3/pins.csv
similarity index 100%
rename from ports/nrf/boards/evk_nina_b3/pins.csv
rename to ports/nrf/boards/EVK_NINA_B3/pins.csv
diff --git a/ports/nrf/boards/feather52/board.json b/ports/nrf/boards/FEATHER52/board.json
similarity index 100%
rename from ports/nrf/boards/feather52/board.json
rename to ports/nrf/boards/FEATHER52/board.json
diff --git a/ports/nrf/boards/feather52/mpconfigboard.h b/ports/nrf/boards/FEATHER52/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/feather52/mpconfigboard.h
rename to ports/nrf/boards/FEATHER52/mpconfigboard.h
diff --git a/ports/nrf/boards/feather52/mpconfigboard.mk b/ports/nrf/boards/FEATHER52/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/feather52/mpconfigboard.mk
rename to ports/nrf/boards/FEATHER52/mpconfigboard.mk
diff --git a/ports/nrf/boards/feather52/pins.csv b/ports/nrf/boards/FEATHER52/pins.csv
similarity index 100%
rename from ports/nrf/boards/feather52/pins.csv
rename to ports/nrf/boards/FEATHER52/pins.csv
diff --git a/ports/nrf/boards/ibk_blyst_nano/board.json b/ports/nrf/boards/IBK_BLYST_NANO/board.json
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/board.json
rename to ports/nrf/boards/IBK_BLYST_NANO/board.json
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
rename to ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk
rename to ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.mk
diff --git a/ports/nrf/boards/ibk_blyst_nano/pins.csv b/ports/nrf/boards/IBK_BLYST_NANO/pins.csv
similarity index 100%
rename from ports/nrf/boards/ibk_blyst_nano/pins.csv
rename to ports/nrf/boards/IBK_BLYST_NANO/pins.csv
diff --git a/ports/nrf/boards/idk_blyst_nano/board.json b/ports/nrf/boards/IDK_BLYST_NANO/board.json
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/board.json
rename to ports/nrf/boards/IDK_BLYST_NANO/board.json
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
rename to ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk
rename to ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.mk
diff --git a/ports/nrf/boards/idk_blyst_nano/pins.csv b/ports/nrf/boards/IDK_BLYST_NANO/pins.csv
similarity index 100%
rename from ports/nrf/boards/idk_blyst_nano/pins.csv
rename to ports/nrf/boards/IDK_BLYST_NANO/pins.csv
diff --git a/ports/nrf/boards/microbit/board.json b/ports/nrf/boards/MICROBIT/board.json
similarity index 100%
rename from ports/nrf/boards/microbit/board.json
rename to ports/nrf/boards/MICROBIT/board.json
diff --git a/ports/nrf/boards/microbit/custom_nrf51822_s110_microbit.ld b/ports/nrf/boards/MICROBIT/custom_nrf51822_s110_microbit.ld
similarity index 100%
rename from ports/nrf/boards/microbit/custom_nrf51822_s110_microbit.ld
rename to ports/nrf/boards/MICROBIT/custom_nrf51822_s110_microbit.ld
diff --git a/ports/nrf/boards/microbit/modules/AUTHORS b/ports/nrf/boards/MICROBIT/modules/AUTHORS
similarity index 100%
rename from ports/nrf/boards/microbit/modules/AUTHORS
rename to ports/nrf/boards/MICROBIT/modules/AUTHORS
diff --git a/ports/nrf/boards/microbit/modules/LICENSE b/ports/nrf/boards/MICROBIT/modules/LICENSE
similarity index 100%
rename from ports/nrf/boards/microbit/modules/LICENSE
rename to ports/nrf/boards/MICROBIT/modules/LICENSE
diff --git a/ports/nrf/boards/microbit/modules/boardmodules.h b/ports/nrf/boards/MICROBIT/modules/boardmodules.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/boardmodules.h
rename to ports/nrf/boards/MICROBIT/modules/boardmodules.h
diff --git a/ports/nrf/boards/microbit/modules/boardmodules.mk b/ports/nrf/boards/MICROBIT/modules/boardmodules.mk
similarity index 91%
rename from ports/nrf/boards/microbit/modules/boardmodules.mk
rename to ports/nrf/boards/MICROBIT/modules/boardmodules.mk
index eb8f108615604..84a606c448dbb 100644
--- a/ports/nrf/boards/microbit/modules/boardmodules.mk
+++ b/ports/nrf/boards/MICROBIT/modules/boardmodules.mk
@@ -1,4 +1,4 @@
-BOARD_MICROBIT_DIR = boards/microbit/modules
+BOARD_MICROBIT_DIR = boards/MICROBIT/modules
 
 INC += -I./$(BOARD_MICROBIT_DIR)
 CFLAGS += -DBOARD_SPECIFIC_MODULES
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/MICROBIT/modules/iters.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/iters.c
rename to ports/nrf/boards/MICROBIT/modules/iters.c
diff --git a/ports/nrf/boards/microbit/modules/iters.h b/ports/nrf/boards/MICROBIT/modules/iters.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/iters.h
rename to ports/nrf/boards/MICROBIT/modules/iters.h
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimage.c b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitconstimage.c
rename to ports/nrf/boards/MICROBIT/modules/microbitconstimage.c
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimage.h b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitconstimage.h
rename to ports/nrf/boards/MICROBIT/modules/microbitconstimage.h
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimagetuples.c b/ports/nrf/boards/MICROBIT/modules/microbitconstimagetuples.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitconstimagetuples.c
rename to ports/nrf/boards/MICROBIT/modules/microbitconstimagetuples.c
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitdisplay.c
rename to ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.h b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitdisplay.h
rename to ports/nrf/boards/MICROBIT/modules/microbitdisplay.h
diff --git a/ports/nrf/boards/microbit/modules/microbitfont.h b/ports/nrf/boards/MICROBIT/modules/microbitfont.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitfont.h
rename to ports/nrf/boards/MICROBIT/modules/microbitfont.h
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitimage.c
rename to ports/nrf/boards/MICROBIT/modules/microbitimage.c
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.h b/ports/nrf/boards/MICROBIT/modules/microbitimage.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/microbitimage.h
rename to ports/nrf/boards/MICROBIT/modules/microbitimage.h
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.c b/ports/nrf/boards/MICROBIT/modules/modmicrobit.c
similarity index 100%
rename from ports/nrf/boards/microbit/modules/modmicrobit.c
rename to ports/nrf/boards/MICROBIT/modules/modmicrobit.c
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.h b/ports/nrf/boards/MICROBIT/modules/modmicrobit.h
similarity index 100%
rename from ports/nrf/boards/microbit/modules/modmicrobit.h
rename to ports/nrf/boards/MICROBIT/modules/modmicrobit.h
diff --git a/ports/nrf/boards/microbit/mpconfigboard.h b/ports/nrf/boards/MICROBIT/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/microbit/mpconfigboard.h
rename to ports/nrf/boards/MICROBIT/mpconfigboard.h
diff --git a/ports/nrf/boards/microbit/mpconfigboard.mk b/ports/nrf/boards/MICROBIT/mpconfigboard.mk
similarity index 79%
rename from ports/nrf/boards/microbit/mpconfigboard.mk
rename to ports/nrf/boards/MICROBIT/mpconfigboard.mk
index 6fdd2bc500085..6c7e1b46b93c3 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.mk
+++ b/ports/nrf/boards/MICROBIT/mpconfigboard.mk
@@ -4,7 +4,7 @@ MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
 
 ifneq ($(SD),)
-LD_FILES += boards/microbit/custom_nrf51822_s110_microbit.ld
+LD_FILES += boards/MICROBIT/custom_nrf51822_s110_microbit.ld
 FROZEN_MANIFEST ?=
 else
 MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/microbit/pins.csv b/ports/nrf/boards/MICROBIT/pins.csv
similarity index 100%
rename from ports/nrf/boards/microbit/pins.csv
rename to ports/nrf/boards/MICROBIT/pins.csv
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.mk
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/pins.csv
similarity index 100%
rename from ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv
rename to ports/nrf/boards/NRF52840_MDK_USB_DONGLE/pins.csv
diff --git a/ports/nrf/boards/particle_xenon/board.json b/ports/nrf/boards/PARTICLE_XENON/board.json
similarity index 100%
rename from ports/nrf/boards/particle_xenon/board.json
rename to ports/nrf/boards/PARTICLE_XENON/board.json
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.h b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/particle_xenon/mpconfigboard.h
rename to ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.mk b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/particle_xenon/mpconfigboard.mk
rename to ports/nrf/boards/PARTICLE_XENON/mpconfigboard.mk
diff --git a/ports/nrf/boards/particle_xenon/pins.csv b/ports/nrf/boards/PARTICLE_XENON/pins.csv
similarity index 100%
rename from ports/nrf/boards/particle_xenon/pins.csv
rename to ports/nrf/boards/PARTICLE_XENON/pins.csv
diff --git a/ports/nrf/boards/pca10000/board.json b/ports/nrf/boards/PCA10000/board.json
similarity index 100%
rename from ports/nrf/boards/pca10000/board.json
rename to ports/nrf/boards/PCA10000/board.json
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.h b/ports/nrf/boards/PCA10000/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10000/mpconfigboard.h
rename to ports/nrf/boards/PCA10000/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.mk b/ports/nrf/boards/PCA10000/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10000/mpconfigboard.mk
rename to ports/nrf/boards/PCA10000/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10000/pins.csv b/ports/nrf/boards/PCA10000/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10000/pins.csv
rename to ports/nrf/boards/PCA10000/pins.csv
diff --git a/ports/nrf/boards/pca10001/board.json b/ports/nrf/boards/PCA10001/board.json
similarity index 100%
rename from ports/nrf/boards/pca10001/board.json
rename to ports/nrf/boards/PCA10001/board.json
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.h b/ports/nrf/boards/PCA10001/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10001/mpconfigboard.h
rename to ports/nrf/boards/PCA10001/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.mk b/ports/nrf/boards/PCA10001/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10001/mpconfigboard.mk
rename to ports/nrf/boards/PCA10001/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10001/pins.csv b/ports/nrf/boards/PCA10001/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10001/pins.csv
rename to ports/nrf/boards/PCA10001/pins.csv
diff --git a/ports/nrf/boards/pca10028/board.json b/ports/nrf/boards/PCA10028/board.json
similarity index 100%
rename from ports/nrf/boards/pca10028/board.json
rename to ports/nrf/boards/PCA10028/board.json
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.h b/ports/nrf/boards/PCA10028/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10028/mpconfigboard.h
rename to ports/nrf/boards/PCA10028/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.mk b/ports/nrf/boards/PCA10028/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10028/mpconfigboard.mk
rename to ports/nrf/boards/PCA10028/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10028/pins.csv b/ports/nrf/boards/PCA10028/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10028/pins.csv
rename to ports/nrf/boards/PCA10028/pins.csv
diff --git a/ports/nrf/boards/pca10031/board.json b/ports/nrf/boards/PCA10031/board.json
similarity index 100%
rename from ports/nrf/boards/pca10031/board.json
rename to ports/nrf/boards/PCA10031/board.json
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.h b/ports/nrf/boards/PCA10031/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10031/mpconfigboard.h
rename to ports/nrf/boards/PCA10031/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.mk b/ports/nrf/boards/PCA10031/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10031/mpconfigboard.mk
rename to ports/nrf/boards/PCA10031/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10031/pins.csv b/ports/nrf/boards/PCA10031/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10031/pins.csv
rename to ports/nrf/boards/PCA10031/pins.csv
diff --git a/ports/nrf/boards/pca10040/board.json b/ports/nrf/boards/PCA10040/board.json
similarity index 100%
rename from ports/nrf/boards/pca10040/board.json
rename to ports/nrf/boards/PCA10040/board.json
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10040/mpconfigboard.h
rename to ports/nrf/boards/PCA10040/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.mk b/ports/nrf/boards/PCA10040/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10040/mpconfigboard.mk
rename to ports/nrf/boards/PCA10040/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10040/pins.csv b/ports/nrf/boards/PCA10040/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10040/pins.csv
rename to ports/nrf/boards/PCA10040/pins.csv
diff --git a/ports/nrf/boards/pca10056/board.json b/ports/nrf/boards/PCA10056/board.json
similarity index 100%
rename from ports/nrf/boards/pca10056/board.json
rename to ports/nrf/boards/PCA10056/board.json
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/PCA10056/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10056/mpconfigboard.h
rename to ports/nrf/boards/PCA10056/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/PCA10056/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10056/mpconfigboard.mk
rename to ports/nrf/boards/PCA10056/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10056/pins.csv b/ports/nrf/boards/PCA10056/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10056/pins.csv
rename to ports/nrf/boards/PCA10056/pins.csv
diff --git a/ports/nrf/boards/pca10059/board.json b/ports/nrf/boards/PCA10059/board.json
similarity index 100%
rename from ports/nrf/boards/pca10059/board.json
rename to ports/nrf/boards/PCA10059/board.json
diff --git a/ports/nrf/boards/pca10059/modules/boardmodules.h b/ports/nrf/boards/PCA10059/modules/boardmodules.h
similarity index 100%
rename from ports/nrf/boards/pca10059/modules/boardmodules.h
rename to ports/nrf/boards/PCA10059/modules/boardmodules.h
diff --git a/ports/nrf/boards/pca10059/modules/boardmodules.mk b/ports/nrf/boards/PCA10059/modules/boardmodules.mk
similarity index 85%
rename from ports/nrf/boards/pca10059/modules/boardmodules.mk
rename to ports/nrf/boards/PCA10059/modules/boardmodules.mk
index 413790fbea7d5..d1457cde7cb38 100644
--- a/ports/nrf/boards/pca10059/modules/boardmodules.mk
+++ b/ports/nrf/boards/PCA10059/modules/boardmodules.mk
@@ -1,4 +1,4 @@
-BOARD_PCA10059_DIR = boards/pca10059/modules
+BOARD_PCA10059_DIR = boards/PCA10059/modules
 
 INC += -I./$(BOARD_PCA10059_DIR)
 CFLAGS += -DBOARD_SPECIFIC_MODULES
diff --git a/ports/nrf/boards/pca10059/modules/recover_uicr_regout0.c b/ports/nrf/boards/PCA10059/modules/recover_uicr_regout0.c
similarity index 100%
rename from ports/nrf/boards/pca10059/modules/recover_uicr_regout0.c
rename to ports/nrf/boards/PCA10059/modules/recover_uicr_regout0.c
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nrf/boards/PCA10059/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10059/mpconfigboard.h
rename to ports/nrf/boards/PCA10059/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/PCA10059/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10059/mpconfigboard.mk
rename to ports/nrf/boards/PCA10059/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10059/pins.csv b/ports/nrf/boards/PCA10059/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10059/pins.csv
rename to ports/nrf/boards/PCA10059/pins.csv
diff --git a/ports/nrf/boards/pca10090/board.json b/ports/nrf/boards/PCA10090/board.json
similarity index 100%
rename from ports/nrf/boards/pca10090/board.json
rename to ports/nrf/boards/PCA10090/board.json
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.h b/ports/nrf/boards/PCA10090/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/pca10090/mpconfigboard.h
rename to ports/nrf/boards/PCA10090/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.mk b/ports/nrf/boards/PCA10090/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/pca10090/mpconfigboard.mk
rename to ports/nrf/boards/PCA10090/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10090/pins.csv b/ports/nrf/boards/PCA10090/pins.csv
similarity index 100%
rename from ports/nrf/boards/pca10090/pins.csv
rename to ports/nrf/boards/PCA10090/pins.csv
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld b/ports/nrf/boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld
rename to ports/nrf/boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.c b/ports/nrf/boards/SEEED_XIAO_NRF52/board.c
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/board.c
rename to ports/nrf/boards/SEEED_XIAO_NRF52/board.c
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.json b/ports/nrf/boards/SEEED_XIAO_NRF52/board.json
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/board.json
rename to ports/nrf/boards/SEEED_XIAO_NRF52/board.json
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/deploy.md b/ports/nrf/boards/SEEED_XIAO_NRF52/deploy.md
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/deploy.md
rename to ports/nrf/boards/SEEED_XIAO_NRF52/deploy.md
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
rename to ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
similarity index 82%
rename from ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
rename to ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
index c2fc219187e39..1f495a9c64a67 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
@@ -3,7 +3,7 @@ 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
+LD_FILES += boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
 
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/pins.csv b/ports/nrf/boards/SEEED_XIAO_NRF52/pins.csv
similarity index 100%
rename from ports/nrf/boards/seeed_xiao_nrf52/pins.csv
rename to ports/nrf/boards/SEEED_XIAO_NRF52/pins.csv
diff --git a/ports/nrf/boards/wt51822_s4at/board.json b/ports/nrf/boards/WT51822_S4AT/board.json
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/board.json
rename to ports/nrf/boards/WT51822_S4AT/board.json
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.h b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/mpconfigboard.h
rename to ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.mk
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
rename to ports/nrf/boards/WT51822_S4AT/mpconfigboard.mk
diff --git a/ports/nrf/boards/wt51822_s4at/pins.csv b/ports/nrf/boards/WT51822_S4AT/pins.csv
similarity index 100%
rename from ports/nrf/boards/wt51822_s4at/pins.csv
rename to ports/nrf/boards/WT51822_S4AT/pins.csv
diff --git a/tools/ci.sh b/tools/ci.sh
index 98e78dc78a6f5..b9bfb7eef8fb1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -204,10 +204,10 @@ 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
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
+    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
 }
 
 ########################################################################################

From b5836e7252f78831d4ce45778a5f84c46f096df5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 23:12:42 +1000
Subject: [PATCH 0231/3129] esp32: Use uppercase variant names.

This is to support a future change to add the variant name to the build
directory and therefore should be the same style as the board name.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC/board.json             | 10 +++++-----
 ports/esp32/boards/GENERIC/mpconfigboard.cmake    |  8 ++++----
 ports/esp32/boards/GENERIC_S3/board.json          |  2 +-
 ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake |  2 +-
 ports/esp32/boards/UM_TINYPICO/board.json         |  2 +-
 tools/autobuild/build-boards.sh                   |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
index d08fcfec157ab..8e2f224328efe 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -17,11 +17,11 @@
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
     "variants": {
-        "idf3": "Compiled with IDF 3.x",
-        "d2wd": "ESP32 D2WD",
-        "spiram": "Support for SPIRAM / WROVER",
-        "unicore": "ESP32 Unicore",
-        "ota": "Support for OTA"
+        "IDF3": "Compiled with IDF 3.x",
+        "D2WD": "ESP32 D2WD",
+        "SPIRAM": "Support for SPIRAM / WROVER",
+        "UNICORE": "ESP32 Unicore",
+        "OTA": "Support for OTA"
     },
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
index 29096c27689c2..14b47b3e591b6 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -3,7 +3,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
 )
 
-if(MICROPY_BOARD_VARIANT STREQUAL "d2wd")
+if(MICROPY_BOARD_VARIANT STREQUAL "D2WD")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
         boards/GENERIC/sdkconfig.d2wd
@@ -14,7 +14,7 @@ if(MICROPY_BOARD_VARIANT STREQUAL "d2wd")
     )
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "ota")
+if(MICROPY_BOARD_VARIANT STREQUAL "OTA")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
         boards/GENERIC/sdkconfig.ota
@@ -25,7 +25,7 @@ if(MICROPY_BOARD_VARIANT STREQUAL "ota")
     )
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "spiram")
+if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
         boards/sdkconfig.spiram
@@ -36,7 +36,7 @@ if(MICROPY_BOARD_VARIANT STREQUAL "spiram")
     )
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "unicore")
+if(MICROPY_BOARD_VARIANT STREQUAL "UNICORE")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
         boards/GENERIC/sdkconfig.unicore
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
index be2170c12fd71..671936c922ce0 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -18,6 +18,6 @@
     "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif",
     "variants": {
-        "spiram-oct": "Support for Octal-SPIRAM"
+        "SPIRAM_OCT": "Support for Octal-SPIRAM"
     }
 }
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
index bd163f9f33dc8..29974aaba4e96 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -8,7 +8,7 @@ set(SDKCONFIG_DEFAULTS
     boards/GENERIC_S3/sdkconfig.board
 )
 
-if(MICROPY_BOARD_VARIANT STREQUAL "spiram-oct")
+if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM_OCT")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
         boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index f6ba9ddb0edb6..3e15e99112d78 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -24,7 +24,7 @@
     "thumbnail": "",
     "url": "https://www.tinypico.com/",
     "variants": {
-        "idf3": "Compiled with IDF 3.x"
+        "IDF3": "Compiled with IDF 3.x"
     },
     "vendor": "Unexpected Maker"
 }
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index f75ccba3981c9..82d7f36057bc4 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -55,10 +55,10 @@ function build_board {
     $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir && copy_artefacts $dest_dir $descr $fw_tag $build_dir $@
     rm -rf $build_dir
 
-    # Query variants from board.json and build them. Ignore the special "idf3"
+    # Query variants from board.json and build them. Ignore the special "IDF3"
     # variant for ESP32 boards (this allows the downloads page to still have
     # the idf3 files for older releases that used to be explicitly built).
-    for variant in `cat $board_json | python3 -c "import json,sys; print(' '.join(v for v in json.load(sys.stdin).get('variants', {}).keys() if v != 'idf3'))"`; do
+    for variant in `cat $board_json | python3 -c "import json,sys; print(' '.join(v for v in json.load(sys.stdin).get('variants', {}).keys() if v != 'IDF3'))"`; do
         local variant_build_dir=$build_dir-$variant
         echo "building variant $descr $board $variant"
         $MICROPY_AUTOBUILD_MAKE BOARD=$board BOARD_VARIANT=$variant BUILD=$variant_build_dir && copy_artefacts $dest_dir $descr-$variant $fw_tag $variant_build_dir $@

From 45845acf6d1cba5705f11abd08d8491bcc35c0a5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 23:12:57 +1000
Subject: [PATCH 0232/3129] rp2: Use uppercase variant names.

This is to support a future change to add the variant name to the build
directory and therefore should be the same style as the board name.

This only affects the WEACTSTUDIO board. Also standardises on a convention
for naming flash-size variants. Normally we would write e.g. 2MiB, but in
uppercase, it's awkward to write 2MIB, so instead use 2M, 512K, etc for
variant names, but use 2MiB when not constrained by case (e.g. a regular
filename).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/boards/WEACTSTUDIO/README.md             | 11 ++++-------
 ports/rp2/boards/WEACTSTUDIO/board.json            |  6 +++---
 ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake   | 14 +++++++-------
 .../{weactstudio_16mb.h => weactstudio_16MiB.h}    |  0
 .../{weactstudio_2mb.h => weactstudio_2MiB.h}      |  0
 .../{weactstudio_4mb.h => weactstudio_4MiB.h}      |  0
 .../{weactstudio_8mb.h => weactstudio_8MiB.h}      |  0
 7 files changed, 14 insertions(+), 17 deletions(-)
 rename ports/rp2/boards/WEACTSTUDIO/{weactstudio_16mb.h => weactstudio_16MiB.h} (100%)
 rename ports/rp2/boards/WEACTSTUDIO/{weactstudio_2mb.h => weactstudio_2MiB.h} (100%)
 rename ports/rp2/boards/WEACTSTUDIO/{weactstudio_4mb.h => weactstudio_4MiB.h} (100%)
 rename ports/rp2/boards/WEACTSTUDIO/{weactstudio_8mb.h => weactstudio_8MiB.h} (100%)

diff --git a/ports/rp2/boards/WEACTSTUDIO/README.md b/ports/rp2/boards/WEACTSTUDIO/README.md
index ae0acfd2c7b0f..1d553509002c7 100644
--- a/ports/rp2/boards/WEACTSTUDIO/README.md
+++ b/ports/rp2/boards/WEACTSTUDIO/README.md
@@ -9,18 +9,15 @@ 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:
+By default the firmware supports boards with 16MiB flash. This can be
+configured using the `BOARD_VARIANT` parameter. The valid options are
+`FLASH_2M`, 'FLASH_4M', and 'FLASH_8M'.
 
 ```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
+> make BOARD=WEACTSTUDIO BOARD_VARIANT=FLASH_8M 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.
diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
index 3a3f2f741f8ad..223bbdc07b34a 100644
--- a/ports/rp2/boards/WEACTSTUDIO/board.json
+++ b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -15,9 +15,9 @@
     "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"
+        "FLASH_2MB": "2 MiB Flash",
+        "FLASH_4MB": "4 MiB Flash",
+        "FLASH_8MB": "8 MiB Flash"
     },
     "vendor": "WeAct"
 }
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
index 28a30f4580dbc..848b50f604db6 100644
--- a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
@@ -8,17 +8,17 @@ list(APPEND PICO_BOARD_HEADER_DIRS ${MICROPY_BOARD_DIR})
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
 
 # Select the 16MB variant as the default
-set(PICO_BOARD "weactstudio_16mb")
+set(PICO_BOARD "weactstudio_16MiB")
 
 # Provide different variants for the downloads page
-if(MICROPY_BOARD_VARIANT STREQUAL "flash_2mb")
-    set(PICO_BOARD "weactstudio_2mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_2M")
+    set(PICO_BOARD "weactstudio_2MiB")
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "flash_4mb")
-    set(PICO_BOARD "weactstudio_4mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_4M")
+    set(PICO_BOARD "weactstudio_4MiB")
 endif()
 
-if(MICROPY_BOARD_VARIANT STREQUAL "flash_8mb")
-    set(PICO_BOARD "weactstudio_8mb")
+if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_8M")
+    set(PICO_BOARD "weactstudio_8MiB")
 endif()
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_16MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_16MiB.h
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_2MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_2MiB.h
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_4MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_4MiB.h
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_8MiB.h
similarity index 100%
rename from ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h
rename to ports/rp2/boards/WEACTSTUDIO/weactstudio_8MiB.h

From c3093080b1cfc1606f545ebfba3013be67e73d96 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 23:18:47 +1000
Subject: [PATCH 0233/3129] stm32: Use uppercase variant names.

This is to support a future change to add the variant name to the build
directory and therefore should be the same style as the board name.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/PYBLITEV10/board.json       | 8 ++++----
 ports/stm32/boards/PYBLITEV10/mpconfigboard.mk | 8 ++++----
 ports/stm32/boards/PYBV10/board.json           | 8 ++++----
 ports/stm32/boards/PYBV10/mpconfigboard.mk     | 8 ++++----
 ports/stm32/boards/PYBV11/board.json           | 8 ++++----
 ports/stm32/boards/PYBV11/mpconfigboard.mk     | 8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ports/stm32/boards/PYBLITEV10/board.json b/ports/stm32/boards/PYBLITEV10/board.json
index ce98ba7de7396..38bb7fe1a0154 100644
--- a/ports/stm32/boards/PYBLITEV10/board.json
+++ b/ports/stm32/boards/PYBLITEV10/board.json
@@ -15,10 +15,10 @@
     "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"
+        "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/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index afee27e94fbe3..1fe609cbb5849 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -6,20 +6,20 @@ TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
 
 # Provide different variants for the downloads page.
-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/board.json b/ports/stm32/boards/PYBV10/board.json
index 2907b8fc45734..5f8f906172611 100644
--- a/ports/stm32/boards/PYBV10/board.json
+++ b/ports/stm32/boards/PYBV10/board.json
@@ -13,10 +13,10 @@
     "thumbnail": "",
     "url": "",
     "variants": {
-        "dp": "Double-precision float",
-        "dp-thread": "Double precision float + Threads",
-        "network": "Wiznet 5200 Driver",
-        "thread": "Threading"
+        "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/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index d26ebd5ae91fe..1a4d6763193ae 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -16,20 +16,20 @@ endif
 MICROPY_VFS_LFS2 = 1
 
 # Provide different variants for the downloads page.
-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/board.json b/ports/stm32/boards/PYBV11/board.json
index fe59a7b16d77e..1fd04310fd8fa 100644
--- a/ports/stm32/boards/PYBV11/board.json
+++ b/ports/stm32/boards/PYBV11/board.json
@@ -15,10 +15,10 @@
     "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"
+        "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/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index df2d70cda1041..6dcb2fd1b4cd0 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -16,20 +16,20 @@ endif
 MICROPY_VFS_LFS2 = 1
 
 # Provide different variants for the downloads page.
-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 1a99f74063569df0927e1ada0256059fcdef128c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 23:25:15 +1000
Subject: [PATCH 0234/3129] ports/*/boards/*/board.json: Remove "id" field.

This was used to override the firmware filename generated by the build
server (to match the historical name before board definitions existed).

Now we're making everything use the board definition name (i.e. the
directory name).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/boards/WIPY/board.json              | 1 -
 ports/esp32/boards/GENERIC/board.json            | 1 -
 ports/esp32/boards/GENERIC_C3/board.json         | 1 -
 ports/esp32/boards/SIL_WESP32/board.json         | 1 -
 ports/esp32/boards/UM_FEATHERS2/board.json       | 1 -
 ports/esp32/boards/UM_FEATHERS2NEO/board.json    | 1 -
 ports/esp32/boards/UM_FEATHERS3/board.json       | 1 -
 ports/esp32/boards/UM_PROS3/board.json           | 1 -
 ports/esp32/boards/UM_TINYPICO/board.json        | 1 -
 ports/esp32/boards/UM_TINYS2/board.json          | 1 -
 ports/esp32/boards/UM_TINYS3/board.json          | 1 -
 ports/esp8266/boards/GENERIC/board.json          | 1 -
 ports/esp8266/boards/GENERIC_1M/board.json       | 1 -
 ports/esp8266/boards/GENERIC_512K/board.json     | 1 -
 ports/renesas-ra/boards/EK_RA4M1/board.json      | 1 -
 ports/renesas-ra/boards/EK_RA4W1/board.json      | 1 -
 ports/renesas-ra/boards/EK_RA6M1/board.json      | 1 -
 ports/renesas-ra/boards/EK_RA6M2/board.json      | 1 -
 ports/renesas-ra/boards/RA4M1_CLICKER/board.json | 1 -
 ports/renesas-ra/boards/VK_RA6M5/board.json      | 1 -
 ports/rp2/boards/PICO/board.json                 | 1 -
 ports/rp2/boards/PICO_W/board.json               | 1 -
 ports/stm32/boards/MIKROE_QUAIL/board.json       | 1 -
 ports/stm32/boards/PYBD_SF2/board.json           | 1 -
 ports/stm32/boards/PYBD_SF3/board.json           | 1 -
 ports/stm32/boards/PYBD_SF6/board.json           | 1 -
 ports/stm32/boards/PYBLITEV10/board.json         | 1 -
 ports/stm32/boards/PYBV10/board.json             | 1 -
 ports/stm32/boards/PYBV11/board.json             | 1 -
 29 files changed, 29 deletions(-)

diff --git a/ports/cc3200/boards/WIPY/board.json b/ports/cc3200/boards/WIPY/board.json
index 4a5a81f99ff2c..f615953af7b80 100644
--- a/ports/cc3200/boards/WIPY/board.json
+++ b/ports/cc3200/boards/WIPY/board.json
@@ -10,7 +10,6 @@
         "WiFi",
         "microSD"
     ],
-    "id": "wipy",
     "images": [
         "wipy.jpg"
     ],
diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
index 8e2f224328efe..0db38c25d3640 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -8,7 +8,6 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp32",
     "images": [
         "esp32_devkitc.jpg"
     ],
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json
index c993c87603e9a..4a81d227a0224 100644
--- a/ports/esp32/boards/GENERIC_C3/board.json
+++ b/ports/esp32/boards/GENERIC_C3/board.json
@@ -8,7 +8,6 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp32c3",
     "images": [
         "esp32c3_devkitmini.jpg"
     ],
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 5c77b4887ad18..50dd2cc660d48 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -10,7 +10,6 @@
         "PoE",
         "WiFi"
     ],
-    "id": "wesp32",
     "images": [
         "wesp32-iso.jpg",
         "wesp32-top.jpg"
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index 4b6ea88558941..4de9a7d4f71c2 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -16,7 +16,6 @@
     "features_non_filterable": [
         "Second LDO"
     ],
-    "id": "featherS2",
     "images": [
         "unexpectedmaker_feathers2.jpg"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index 51bb02b97b230..dfa1f46dc365e 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -16,7 +16,6 @@
     "features_non_filterable": [
         "5x5 RGB LED Matrix"
     ],
-    "id": "featherS2neo",
     "images": [
         "FeatherS2_Neo_White_Product2.jpg"
     ],
diff --git a/ports/esp32/boards/UM_FEATHERS3/board.json b/ports/esp32/boards/UM_FEATHERS3/board.json
index 0ad1ff73becb0..235d52a12d4fd 100644
--- a/ports/esp32/boards/UM_FEATHERS3/board.json
+++ b/ports/esp32/boards/UM_FEATHERS3/board.json
@@ -15,7 +15,6 @@
         "WiFi"
     ],
     "features_non_filterable": [],
-    "id": "feathers3",
     "images": [
         "unexpectedmaker_feathers3.jpg"
     ],
diff --git a/ports/esp32/boards/UM_PROS3/board.json b/ports/esp32/boards/UM_PROS3/board.json
index 3e83a813f4b24..8efc4e5ab55a7 100644
--- a/ports/esp32/boards/UM_PROS3/board.json
+++ b/ports/esp32/boards/UM_PROS3/board.json
@@ -15,7 +15,6 @@
         "WiFi"
     ],
     "features_non_filterable": [],
-    "id": "pros3",
     "images": [
         "unexpectedmaker_pros3.jpg"
     ],
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index 3e15e99112d78..bf0b3d2c8c621 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -15,7 +15,6 @@
     "features_non_filterable": [
         "TinyPICO Compatible"
     ],
-    "id": "tinypico",
     "images": [
         "tinypico-v2-both.jpg"
     ],
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index b6c94ba9e89d8..1b4c934dfaedb 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -15,7 +15,6 @@
     "features_non_filterable": [
         "TinyPICO Compatible"
     ],
-    "id": "tinys2",
     "images": [
         "TinyS2+Product+Shot.jpg"
     ],
diff --git a/ports/esp32/boards/UM_TINYS3/board.json b/ports/esp32/boards/UM_TINYS3/board.json
index 3b7bb13345394..27ae46a249a81 100644
--- a/ports/esp32/boards/UM_TINYS3/board.json
+++ b/ports/esp32/boards/UM_TINYS3/board.json
@@ -15,7 +15,6 @@
     "features_non_filterable": [
         "TinyPICO Compatible"
     ],
-    "id": "tinys3",
     "images": [
         "unexpectedmaker_tinys3.jpg"
     ],
diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/GENERIC/board.json
index ebdd95493b6d1..dffe6d2711a5b 100644
--- a/ports/esp8266/boards/GENERIC/board.json
+++ b/ports/esp8266/boards/GENERIC/board.json
@@ -7,7 +7,6 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp8266",
     "images": [],
     "mcu": "esp8266",
     "product": "ESP8266 with 2MiB+ flash",
diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json
index 5446f291284b6..4ab5c79df02ed 100644
--- a/ports/esp8266/boards/GENERIC_1M/board.json
+++ b/ports/esp8266/boards/GENERIC_1M/board.json
@@ -7,7 +7,6 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp8266-1m",
     "images": [],
     "mcu": "esp8266",
     "product": "ESP8266 with 1MiB flash",
diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json
index 1feac4a05cbaa..e035562be7757 100644
--- a/ports/esp8266/boards/GENERIC_512K/board.json
+++ b/ports/esp8266/boards/GENERIC_512K/board.json
@@ -7,7 +7,6 @@
         "External Flash",
         "WiFi"
     ],
-    "id": "esp8266-512k",
     "images": [],
     "mcu": "esp8266",
     "product": "ESP8266 with 512kiB flash",
diff --git a/ports/renesas-ra/boards/EK_RA4M1/board.json b/ports/renesas-ra/boards/EK_RA4M1/board.json
index d21fe0c121220..4d8dcd5e6d349 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4M1/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA4M1",
     "images": [
         "ek_ra4m1_board.jpg"
     ],
diff --git a/ports/renesas-ra/boards/EK_RA4W1/board.json b/ports/renesas-ra/boards/EK_RA4W1/board.json
index 878d97a8acdbf..edc4fcbfe0f1f 100644
--- a/ports/renesas-ra/boards/EK_RA4W1/board.json
+++ b/ports/renesas-ra/boards/EK_RA4W1/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA4W1",
     "images": [
         "ek_ra4w1_board.jpg"
     ],
diff --git a/ports/renesas-ra/boards/EK_RA6M1/board.json b/ports/renesas-ra/boards/EK_RA6M1/board.json
index d678fa387e089..3bdb08b92fb55 100644
--- a/ports/renesas-ra/boards/EK_RA6M1/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M1/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA6M1",
     "images": [
         "ek_ra6m1_board.jpg"
     ],
diff --git a/ports/renesas-ra/boards/EK_RA6M2/board.json b/ports/renesas-ra/boards/EK_RA6M2/board.json
index 3d6b95aacb8a3..5760b197366b1 100644
--- a/ports/renesas-ra/boards/EK_RA6M2/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M2/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "EK-RA6M2",
     "images": [
         "ek_ra6m2_board.jpg",
         "ek_ra6m2_j1_pins.jpg",
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
index 8cb64f660103e..be1dd977c33fb 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "RA4M1-CLICKER",
     "images": [
         "ra4m1_clicker_board.jpg",
         "ra4m1_clicker_pins.jpg"
diff --git a/ports/renesas-ra/boards/VK_RA6M5/board.json b/ports/renesas-ra/boards/VK_RA6M5/board.json
index b2ff6b0e401e5..48371138b19f6 100644
--- a/ports/renesas-ra/boards/VK_RA6M5/board.json
+++ b/ports/renesas-ra/boards/VK_RA6M5/board.json
@@ -6,7 +6,6 @@
     "features": [
         "DAC"
     ],
-    "id": "VK-RA6M5",
     "images": [
         "VK-RA6M5.jpg"
     ],
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/PICO/board.json
index 8c0a12ae76c4d..07938978f3655 100644
--- a/ports/rp2/boards/PICO/board.json
+++ b/ports/rp2/boards/PICO/board.json
@@ -8,7 +8,6 @@
         "External Flash",
         "USB"
     ],
-    "id": "rp2-pico",
     "images": [
         "rp2-pico.jpg"
     ],
diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/PICO_W/board.json
index 7ee7ef505e4d1..6ea326c6cdaf4 100644
--- a/ports/rp2/boards/PICO_W/board.json
+++ b/ports/rp2/boards/PICO_W/board.json
@@ -10,7 +10,6 @@
         "USB",
         "WiFi"
     ],
-    "id": "rp2-pico-w",
     "images": [
         "rp2-pico-w.jpg"
     ],
diff --git a/ports/stm32/boards/MIKROE_QUAIL/board.json b/ports/stm32/boards/MIKROE_QUAIL/board.json
index 15d8b5fc134b5..689bdb10524c1 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/board.json
+++ b/ports/stm32/boards/MIKROE_QUAIL/board.json
@@ -6,7 +6,6 @@
     "features": [
         "mikroBUS"
     ],
-    "id": "MIKROE-QUAIL",
     "images": [
         "quail_top.jpg"
     ],
diff --git a/ports/stm32/boards/PYBD_SF2/board.json b/ports/stm32/boards/PYBD_SF2/board.json
index 534a048ff0058..06a83e4d89e9f 100644
--- a/ports/stm32/boards/PYBD_SF2/board.json
+++ b/ports/stm32/boards/PYBD_SF2/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "PYBD-SF2",
     "images": [
         "PYBD_SF2_W4F2.jpg",
         "PYBD_SF2_W4F2_top.jpg",
diff --git a/ports/stm32/boards/PYBD_SF3/board.json b/ports/stm32/boards/PYBD_SF3/board.json
index 3e4731b3d2cba..e89f268cff718 100644
--- a/ports/stm32/boards/PYBD_SF3/board.json
+++ b/ports/stm32/boards/PYBD_SF3/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "PYBD-SF3",
     "images": [
         "PYBD_SF3_W4F2.jpg",
         "PYBD_SF3_W4F2_top.jpg",
diff --git a/ports/stm32/boards/PYBD_SF6/board.json b/ports/stm32/boards/PYBD_SF6/board.json
index 3a39763d5b33b..b6d85d6fd7fdc 100644
--- a/ports/stm32/boards/PYBD_SF6/board.json
+++ b/ports/stm32/boards/PYBD_SF6/board.json
@@ -7,7 +7,6 @@
         "BLE",
         "WiFi"
     ],
-    "id": "PYBD-SF6",
     "images": [
         "PYBD_SF6_W4F2.jpg",
         "PYBD_SF6_W4F2_top.jpg",
diff --git a/ports/stm32/boards/PYBLITEV10/board.json b/ports/stm32/boards/PYBLITEV10/board.json
index 38bb7fe1a0154..0d2338d3db698 100644
--- a/ports/stm32/boards/PYBLITEV10/board.json
+++ b/ports/stm32/boards/PYBLITEV10/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "pyblitev10",
     "images": [
         "PYBLITEv1_0.jpg",
         "PYBLITEv1_0-B.jpg",
diff --git a/ports/stm32/boards/PYBV10/board.json b/ports/stm32/boards/PYBV10/board.json
index 5f8f906172611..0c5fea2eb8cb6 100644
--- a/ports/stm32/boards/PYBV10/board.json
+++ b/ports/stm32/boards/PYBV10/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "pybv10",
     "images": [
         "PYBv1_0-C.jpg"
     ],
diff --git a/ports/stm32/boards/PYBV11/board.json b/ports/stm32/boards/PYBV11/board.json
index 1fd04310fd8fa..5d7abbaa8330c 100644
--- a/ports/stm32/boards/PYBV11/board.json
+++ b/ports/stm32/boards/PYBV11/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [],
-    "id": "pybv11",
     "images": [
         "PYBv1_1.jpg",
         "PYBv1_1-C.jpg",

From 97ffc53ec9ff10c7585125229ef077233c77cc48 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 23:30:22 +1000
Subject: [PATCH 0235/3129] {esp32,rp2,stm32}/Makefile: Append board variant to
 BUILD.

This allows switching between variants without clobbering the build
output.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/Makefile | 7 ++++++-
 ports/rp2/Makefile   | 8 +++++++-
 ports/stm32/Makefile | 7 ++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 239618c6f73ae..9d57ee4c21797 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -17,8 +17,13 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
-# If the build directory is not given, make it reflect the board name.
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 # Device serial settings.
 PORT ?= /dev/ttyUSB0
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index ccfc1ac7d6c7a..fdca11d11eba3 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -16,8 +16,14 @@ 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 (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 $(VERBOSE)MAKESILENT = -s
 
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 7051398970fb5..475d8f1004f08 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -13,8 +13,13 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
-# If the build directory is not given, make it reflect the board name.
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 include ../../py/mkenv.mk
 -include mpconfigport.mk

From aa236981192395cda555efa3db5f490c168bebdd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Aug 2023 23:49:35 +1000
Subject: [PATCH 0236/3129] esp32: Rename GENERIC* boards to ESP32_GENERIC*.

Board names need to be unique across ports, and GENERIC clashes with
the ESP8266 (which will be renamed to ESP8266_GENERIC).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/CMakeLists.txt                    |  2 +-
 ports/esp32/Makefile                          |  7 ++--
 ports/esp32/README.md                         | 33 ++++++++++++++-----
 .../{GENERIC => ESP32_GENERIC}/board.json     |  0
 .../{GENERIC => ESP32_GENERIC}/board.md       |  0
 .../mpconfigboard.cmake                       |  6 ++--
 .../mpconfigboard.h                           |  0
 .../{GENERIC => ESP32_GENERIC}/sdkconfig.d2wd |  0
 .../{GENERIC => ESP32_GENERIC}/sdkconfig.ota  |  0
 .../sdkconfig.unicore                         |  0
 .../board.json                                |  0
 .../{GENERIC_C3 => ESP32_GENERIC_C3}/board.md |  0
 .../mpconfigboard.cmake                       |  2 +-
 .../mpconfigboard.h                           |  0
 .../sdkconfig.c3usb                           |  0
 .../board.json                                |  0
 .../{GENERIC_S2 => ESP32_GENERIC_S2}/board.md |  0
 .../mpconfigboard.cmake                       |  0
 .../mpconfigboard.h                           |  0
 .../board.json                                |  0
 .../{GENERIC_S3 => ESP32_GENERIC_S3}/board.md |  0
 .../mpconfigboard.cmake                       |  2 +-
 .../mpconfigboard.h                           |  0
 .../sdkconfig.board                           |  0
 tools/ci.sh                                   |  6 ++--
 25 files changed, 38 insertions(+), 20 deletions(-)
 rename ports/esp32/boards/{GENERIC => ESP32_GENERIC}/board.json (100%)
 rename ports/esp32/boards/{GENERIC => ESP32_GENERIC}/board.md (100%)
 rename ports/esp32/boards/{GENERIC => ESP32_GENERIC}/mpconfigboard.cmake (87%)
 rename ports/esp32/boards/{GENERIC => ESP32_GENERIC}/mpconfigboard.h (100%)
 rename ports/esp32/boards/{GENERIC => ESP32_GENERIC}/sdkconfig.d2wd (100%)
 rename ports/esp32/boards/{GENERIC => ESP32_GENERIC}/sdkconfig.ota (100%)
 rename ports/esp32/boards/{GENERIC => ESP32_GENERIC}/sdkconfig.unicore (100%)
 rename ports/esp32/boards/{GENERIC_C3 => ESP32_GENERIC_C3}/board.json (100%)
 rename ports/esp32/boards/{GENERIC_C3 => ESP32_GENERIC_C3}/board.md (100%)
 rename ports/esp32/boards/{GENERIC_C3 => ESP32_GENERIC_C3}/mpconfigboard.cmake (69%)
 rename ports/esp32/boards/{GENERIC_C3 => ESP32_GENERIC_C3}/mpconfigboard.h (100%)
 rename ports/esp32/boards/{GENERIC_C3 => ESP32_GENERIC_C3}/sdkconfig.c3usb (100%)
 rename ports/esp32/boards/{GENERIC_S2 => ESP32_GENERIC_S2}/board.json (100%)
 rename ports/esp32/boards/{GENERIC_S2 => ESP32_GENERIC_S2}/board.md (100%)
 rename ports/esp32/boards/{GENERIC_S2 => ESP32_GENERIC_S2}/mpconfigboard.cmake (100%)
 rename ports/esp32/boards/{GENERIC_S2 => ESP32_GENERIC_S2}/mpconfigboard.h (100%)
 rename ports/esp32/boards/{GENERIC_S3 => ESP32_GENERIC_S3}/board.json (100%)
 rename ports/esp32/boards/{GENERIC_S3 => ESP32_GENERIC_S3}/board.md (100%)
 rename ports/esp32/boards/{GENERIC_S3 => ESP32_GENERIC_S3}/mpconfigboard.cmake (91%)
 rename ports/esp32/boards/{GENERIC_S3 => ESP32_GENERIC_S3}/mpconfigboard.h (100%)
 rename ports/esp32/boards/{GENERIC_S3 => ESP32_GENERIC_S3}/sdkconfig.board (100%)

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 4e29e96109457..94047a0482d28 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.12)
 
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
-    set(MICROPY_BOARD GENERIC)
+    set(MICROPY_BOARD ESP32_GENERIC)
 endif()
 
 # Set the board directory and check that it exists.
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 9d57ee4c21797..bf275ffe661a5 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -8,12 +8,15 @@ ifdef BOARD_DIR
 # 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 not given on the command line, then default to ESP32_GENERIC.
+BOARD ?= ESP32_GENERIC
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
+ifeq ($(findstring boards/GENERIC,$(BOARD_DIR)),boards/GENERIC)
+$(warning The GENERIC* boards have been renamed to ESP32_GENERIC*)
+endif
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 2d5b05b9266ac..169de4073bf71 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -93,7 +93,7 @@ $ make submodules
 $ make
 ```
 
-This will produce a combined `firmware.bin` image in the `build-GENERIC/`
+This will produce a combined `firmware.bin` image in the `build-ESP32_GENERIC/`
 subdirectory (this firmware image is made up of: bootloader.bin, partitions.bin
 and micropython.bin).
 
@@ -123,12 +123,12 @@ To flash the MicroPython firmware to your ESP32 use:
 $ make deploy
 ```
 
-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:
+The default ESP32 board build by the above commands is the `ESP32_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
+$ make BOARD=ESP32_GENERIC_S3
 ```
 
 Note: the above "make" commands are thin wrappers for the underlying `idf.py`
@@ -137,10 +137,25 @@ for example:
 
 ```bash
 $ idf.py build
-$ idf.py -D MICROPY_BOARD=GENERIC_SPIRAM build
+$ idf.py -D MICROPY_BOARD=ESP32_GENERIC build
 $ idf.py flash
 ```
 
+Some boards also support "variants", which are allow for small variations of
+an otherwise similar board. For example different flash sizes or features. For
+example to build the `OTA` variant of `ESP32_GENERIC`.
+
+```bash
+$ make BOARD=ESP32_GENERIC BOARD_VARIANT=OTA
+```
+
+or to enable octal-SPIRAM support for the `ESP32_GENERIC_S3` board:
+
+```bash
+$ make BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM_OCT
+```
+
+
 Getting a Python prompt on the device
 -------------------------------------
 
@@ -202,10 +217,10 @@ 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
+The default ESP-IDF configuration settings are provided by the `ESP32_GENERIC`
+board definition in the directory `boards/ESP32_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.
+copying an existing one (like `ESP32_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
diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/ESP32_GENERIC/board.json
similarity index 100%
rename from ports/esp32/boards/GENERIC/board.json
rename to ports/esp32/boards/ESP32_GENERIC/board.json
diff --git a/ports/esp32/boards/GENERIC/board.md b/ports/esp32/boards/ESP32_GENERIC/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC/board.md
rename to ports/esp32/boards/ESP32_GENERIC/board.md
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
similarity index 87%
rename from ports/esp32/boards/GENERIC/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
index 14b47b3e591b6..74cb591c0711a 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
@@ -6,7 +6,7 @@ set(SDKCONFIG_DEFAULTS
 if(MICROPY_BOARD_VARIANT STREQUAL "D2WD")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
-        boards/GENERIC/sdkconfig.d2wd
+        boards/ESP32_GENERIC/sdkconfig.d2wd
     )
 
     list(APPEND MICROPY_DEF_BOARD
@@ -17,7 +17,7 @@ endif()
 if(MICROPY_BOARD_VARIANT STREQUAL "OTA")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
-        boards/GENERIC/sdkconfig.ota
+        boards/ESP32_GENERIC/sdkconfig.ota
     )
 
     list(APPEND MICROPY_DEF_BOARD
@@ -39,7 +39,7 @@ endif()
 if(MICROPY_BOARD_VARIANT STREQUAL "UNICORE")
     set(SDKCONFIG_DEFAULTS
         ${SDKCONFIG_DEFAULTS}
-        boards/GENERIC/sdkconfig.unicore
+        boards/ESP32_GENERIC/sdkconfig.unicore
     )
 
     list(APPEND MICROPY_DEF_BOARD
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.h
similarity index 100%
rename from ports/esp32/boards/GENERIC/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC/sdkconfig.d2wd b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
similarity index 100%
rename from ports/esp32/boards/GENERIC/sdkconfig.d2wd
rename to ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
diff --git a/ports/esp32/boards/GENERIC/sdkconfig.ota b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
similarity index 100%
rename from ports/esp32/boards/GENERIC/sdkconfig.ota
rename to ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
diff --git a/ports/esp32/boards/GENERIC/sdkconfig.unicore b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.unicore
similarity index 100%
rename from ports/esp32/boards/GENERIC/sdkconfig.unicore
rename to ports/esp32/boards/ESP32_GENERIC/sdkconfig.unicore
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/ESP32_GENERIC_C3/board.json
similarity index 100%
rename from ports/esp32/boards/GENERIC_C3/board.json
rename to ports/esp32/boards/ESP32_GENERIC_C3/board.json
diff --git a/ports/esp32/boards/GENERIC_C3/board.md b/ports/esp32/boards/ESP32_GENERIC_C3/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC_C3/board.md
rename to ports/esp32/boards/ESP32_GENERIC_C3/board.md
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
similarity index 69%
rename from ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
index c8f78c161d22a..429366afac979 100644
--- a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
@@ -3,5 +3,5 @@ set(IDF_TARGET esp32c3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
-    boards/GENERIC_C3/sdkconfig.c3usb
+    boards/ESP32_GENERIC_C3/sdkconfig.c3usb
 )
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
similarity index 100%
rename from ports/esp32/boards/GENERIC_C3/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC_C3/sdkconfig.c3usb b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
similarity index 100%
rename from ports/esp32/boards/GENERIC_C3/sdkconfig.c3usb
rename to ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/ESP32_GENERIC_S2/board.json
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/board.json
rename to ports/esp32/boards/ESP32_GENERIC_S2/board.json
diff --git a/ports/esp32/boards/GENERIC_S2/board.md b/ports/esp32/boards/ESP32_GENERIC_S2/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/board.md
rename to ports/esp32/boards/ESP32_GENERIC_S2/board.md
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h
similarity index 100%
rename from ports/esp32/boards/GENERIC_S2/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
similarity index 100%
rename from ports/esp32/boards/GENERIC_S3/board.json
rename to ports/esp32/boards/ESP32_GENERIC_S3/board.json
diff --git a/ports/esp32/boards/GENERIC_S3/board.md b/ports/esp32/boards/ESP32_GENERIC_S3/board.md
similarity index 100%
rename from ports/esp32/boards/GENERIC_S3/board.md
rename to ports/esp32/boards/ESP32_GENERIC_S3/board.md
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
similarity index 91%
rename from ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
rename to ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
index 29974aaba4e96..36b4fe56240de 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -5,7 +5,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.spiram_sx
-    boards/GENERIC_S3/sdkconfig.board
+    boards/ESP32_GENERIC_S3/sdkconfig.board
 )
 
 if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM_OCT")
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
similarity index 100%
rename from ports/esp32/boards/GENERIC_S3/mpconfigboard.h
rename to ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC_S3/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
similarity index 100%
rename from ports/esp32/boards/GENERIC_S3/sdkconfig.board
rename to ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
diff --git a/tools/ci.sh b/tools/ci.sh
index b9bfb7eef8fb1..55e90dc4a8fcc 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -129,9 +129,9 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C ports/esp32 \
         USER_C_MODULES=../../../examples/usercmodule/micropython.cmake \
         FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest_test.py
-    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
-    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
-    make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C3
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S3
 
     # Test building native .mpy with xtensawin architecture.
     ci_native_mpy_modules_build xtensawin

From ef03ca8bf2e06d3d8b753aafdf13e1399dc26847 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Aug 2023 00:51:37 +1000
Subject: [PATCH 0237/3129] esp8266: Add board variant support.

This merges the existing GENERIC, GENERIC_1M, and GENERIC_512k boards
into variants of the new ESP8266_GENERIC board (renamed from GENERIC so
as not to clash with other ports).

Also moves the generation of the "OTA" variant (previously generated by
autobuild/build-esp8266-latest.sh) into the variant.

Following the convention established for the WEACTSTUDIO rp2 board, the
names of the variants are FLASH_1M and FLASH_512K (but rename the .ld files
to use MiB and kiB).

Updates autobuild to build esp8266 firmware the same way as other ports.
This requires renaming the output from firmware-combined.bin to just
firmware.bin.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/Makefile                        | 32 +++++++---
 ports/esp8266/README.md                       | 43 +++++++------
 ports/esp8266/boards/ESP8266_GENERIC/_boot.py |  6 ++
 .../{GENERIC => ESP8266_GENERIC}/board.json   |  6 +-
 .../{GENERIC => ESP8266_GENERIC}/board.md     | 13 +++-
 .../manifest_2MiB.py}                         |  0
 .../manifest_512kiB.py}                       |  0
 .../boards/ESP8266_GENERIC/mpconfigboard.h    | 52 ++++++++++++++++
 .../boards/ESP8266_GENERIC/mpconfigboard.mk   | 50 +++++++++++++++
 ports/esp8266/boards/GENERIC/mpconfigboard.h  | 14 -----
 ports/esp8266/boards/GENERIC/mpconfigboard.mk |  8 ---
 ports/esp8266/boards/GENERIC_1M/board.json    | 16 -----
 ports/esp8266/boards/GENERIC_1M/board.md      |  5 --
 .../esp8266/boards/GENERIC_1M/mpconfigboard.h | 17 ------
 .../boards/GENERIC_1M/mpconfigboard.mk        |  5 --
 ports/esp8266/boards/GENERIC_512K/_boot.py    |  3 -
 ports/esp8266/boards/GENERIC_512K/board.json  | 16 -----
 ports/esp8266/boards/GENERIC_512K/board.md    |  3 -
 .../boards/GENERIC_512K/mpconfigboard.h       | 13 ----
 .../boards/GENERIC_512K/mpconfigboard.mk      |  3 -
 .../boards/{esp8266_1m.ld => esp8266_1MiB.ld} |  0
 .../boards/{esp8266_2m.ld => esp8266_2MiB.ld} |  0
 .../{esp8266_512k.ld => esp8266_512kiB.ld}    |  0
 pyproject.toml                                |  2 +-
 tools/autobuild/autobuild.sh                  |  2 +-
 tools/autobuild/build-boards.sh               |  4 ++
 tools/autobuild/build-esp8266-latest.sh       | 61 -------------------
 tools/ci.sh                                   |  6 +-
 28 files changed, 179 insertions(+), 201 deletions(-)
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/_boot.py
 rename ports/esp8266/boards/{GENERIC => ESP8266_GENERIC}/board.json (70%)
 rename ports/esp8266/boards/{GENERIC => ESP8266_GENERIC}/board.md (58%)
 rename ports/esp8266/boards/{GENERIC/manifest.py => ESP8266_GENERIC/manifest_2MiB.py} (100%)
 rename ports/esp8266/boards/{GENERIC_512K/manifest.py => ESP8266_GENERIC/manifest_512kiB.py} (100%)
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
 delete mode 100644 ports/esp8266/boards/GENERIC/mpconfigboard.h
 delete mode 100644 ports/esp8266/boards/GENERIC/mpconfigboard.mk
 delete mode 100644 ports/esp8266/boards/GENERIC_1M/board.json
 delete mode 100644 ports/esp8266/boards/GENERIC_1M/board.md
 delete mode 100644 ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
 delete mode 100644 ports/esp8266/boards/GENERIC_1M/mpconfigboard.mk
 delete mode 100644 ports/esp8266/boards/GENERIC_512K/_boot.py
 delete mode 100644 ports/esp8266/boards/GENERIC_512K/board.json
 delete mode 100644 ports/esp8266/boards/GENERIC_512K/board.md
 delete mode 100644 ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
 delete mode 100644 ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
 rename ports/esp8266/boards/{esp8266_1m.ld => esp8266_1MiB.ld} (100%)
 rename ports/esp8266/boards/{esp8266_2m.ld => esp8266_2MiB.ld} (100%)
 rename ports/esp8266/boards/{esp8266_512k.ld => esp8266_512kiB.ld} (100%)
 delete mode 100755 tools/autobuild/build-esp8266-latest.sh

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 1cdcafa031bc6..e4c907c57a6c5 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -4,17 +4,25 @@ ifdef BOARD_DIR
 # 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 not given on the command line, then default to ESP8266_GENERIC.
+BOARD ?= ESP8266_GENERIC
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
+ifeq ($(findstring boards/GENERIC,$(BOARD_DIR)),boards/GENERIC)
+$(warning The GENERIC* boards have been renamed to ESP8266_GENERIC)
+endif
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
-# If the build directory is not given, make it reflect the board name.
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 include ../../py/mkenv.mk
 
@@ -40,7 +48,7 @@ include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/axtls lib/berkeley-db-1.xx
 
-FWBIN = $(BUILD)/firmware-combined.bin
+FWBIN = $(BUILD)/firmware.bin
 PORT ?= /dev/ttyACM0
 BAUD ?= 115200
 FLASH_MODE ?= qio
@@ -202,7 +210,7 @@ FROZEN_EXTRA_DEPS = $(CONFVARS_FILE)
 
 .PHONY: deploy
 
-deploy: $(BUILD)/firmware-combined.bin
+deploy: $(FWBIN)
 	$(ECHO) "Writing $< to the board"
 	$(Q)esptool.py --port $(PORT) --baud $(BAUD) write_flash --verify --flash_size=$(FLASH_SIZE) --flash_mode=$(FLASH_MODE) 0 $<
 
@@ -213,20 +221,26 @@ erase:
 reset:
 	echo -e "\r\nimport machine; machine.reset()\r\n" >$(PORT)
 
+ifeq ($(BOARD_VARIANT),OTA)
+$(FWBIN): $(BUILD)/firmware.elf
+	$(ECHO) "Create $@"
+	$(Q)esptool.py elf2image $^
+	$(Q)$(PYTHON) makeimg.py $(BUILD)/firmware.elf-0x00000.bin $(BUILD)/firmware.elf-0x[0-5][1-f]000.bin $(BUILD)/firmware-ota.bin
+
+	$(Q)cat $(YAOTA8266)/yaota8266.bin $(BUILD)/firmware-ota.bin > $@
+	$(Q)$(PYTHON) $(YAOTA8266)/ota-client/ota_client.py sign $@
+else
 $(FWBIN): $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
 	$(Q)esptool.py elf2image $^
 	$(Q)$(PYTHON) makeimg.py $(BUILD)/firmware.elf-0x00000.bin $(BUILD)/firmware.elf-0x[0-5][1-f]000.bin $@
+endif
 
 $(BUILD)/firmware.elf: $(OBJ)
 	$(ECHO) "LINK $@"
 	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 	$(Q)$(SIZE) $@
 
-ota:
-	rm -f $(BUILD)/firmware.elf $(BUILD)/firmware.elf*.bin
-	$(MAKE) LD_FILES=boards/esp8266_ota.ld FWBIN=$(BUILD)/firmware-ota.bin
-
 include $(TOP)/py/mkrules.mk
 
 clean-modules:
diff --git a/ports/esp8266/README.md b/ports/esp8266/README.md
index 1e0cae213937b..561c7714032ac 100644
--- a/ports/esp8266/README.md
+++ b/ports/esp8266/README.md
@@ -23,6 +23,9 @@ Supported features include:
 
 Documentation is available at http://docs.micropython.org/en/latest/esp8266/quickref.html.
 
+The default build requires a 2MiB flash chip, but see below for support for
+1MiB and 512kiB options.
+
 Build instructions
 ------------------
 
@@ -67,10 +70,10 @@ 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
+$ docker run --rm -v $HOME:$HOME -u $UID -w $PWD larsks/esp-open-sdk make -j BOARD=ESP8266_GENERIC
 ```
 
-This will produce binary images in the `build-GENERIC/` subdirectory.
+This will produce binary images in the `build-ESP8266_GENERIC/` subdirectory.
 Substitute the board for whichever board you're using.
 
 __Building with a local toolchain__
@@ -106,10 +109,10 @@ Then to compile the ESP8266 firmware:
 
 ```
 $ cd ports/esp8266
-$ make -j BOARD=GENERIC
+$ make -j BOARD=ESP8266_GENERIC
 ```
 
-This will produce binary images in the `build-GENERIC/` subdirectory.
+This will produce binary images in the `build-ESP8266_GENERIC/` subdirectory.
 Substitute the board for whichever board you're using.
 
 
@@ -149,25 +152,29 @@ $ make PORT=/dev/ttyUSB0 FLASH_MODE=qio FLASH_SIZE=32m deploy
 (note that flash size is in megabits)
 
 If you want to flash manually using `esptool.py` directly, the image produced is
-`build-GENERIC/firmware-combined.bin`, to be flashed at 0x00000.
+`build-ESP8266_GENERIC/firmware.bin`, to be flashed at 0x00000.
 
-The default board definition is the directory `boards/GENERIC`.
+The default board definition is the directory `boards/ESP8266_GENERIC`.
 For a custom configuration you can define your own board in the directory `boards/`.
 
-The `BOARD` variable can be set on the make command line, for example:
-```bash
-$ make BOARD=GENERIC_512K
-```
+__Reduced FlashROM variants__
 
-__512KB FlashROM version__
+The normal build described above requires modules with at least 2MiB of
+FlashROM onboard. There's a special configuration for 512kiB modules, which can
+be built with the `FLASH_512K` variant. This configuration is highly limited,
+lacks filesystem support, WebREPL, and has many other features disabled. It's
+mostly suitable for advanced users who are interested to fine-tune options to
+achieve a required setup. If you are an end user, please consider using a
+module with at least 2MiB of FlashROM.
 
-The normal build described above requires modules with at least 1MB of FlashROM
-onboard. There's a special configuration for 512KB modules, which can be
-built with `make BOARD=GENERIC_512K`. This configuration is highly limited, lacks
-filesystem support, WebREPL, and has many other features disabled. It's mostly
-suitable for advanced users who are interested to fine-tune options to achieve a
-required setup. If you are an end user, please consider using a module with at
-least 1MB of FlashROM.
+A variant is also provided for 1MiB modules which just lacks the included
+micropython-lib packages.
+
+The variant can be set on the make command line, for example:
+```bash
+$ make BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_512K
+$ make BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_1M
+```
 
 First start
 -----------
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/_boot.py b/ports/esp8266/boards/ESP8266_GENERIC/_boot.py
new file mode 100644
index 0000000000000..16da8bc4c3750
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/_boot.py
@@ -0,0 +1,6 @@
+# Minimal _boot.py for the 512kiB variant. Does not set up a block device or
+# filesystem. Other variants use esp8266/modules/_boot.py.
+
+import gc
+
+gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/ESP8266_GENERIC/board.json
similarity index 70%
rename from ports/esp8266/boards/GENERIC/board.json
rename to ports/esp8266/boards/ESP8266_GENERIC/board.json
index dffe6d2711a5b..1fca10c5f0b71 100644
--- a/ports/esp8266/boards/GENERIC/board.json
+++ b/ports/esp8266/boards/ESP8266_GENERIC/board.json
@@ -9,11 +9,13 @@
     ],
     "images": [],
     "mcu": "esp8266",
-    "product": "ESP8266 with 2MiB+ flash",
+    "product": "ESP8266",
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
     "variants": {
-        "ota": "OTA compatible"
+        "OTA": "OTA compatible",
+        "FLASH_1M": "1MiB flash",
+        "FLASH_512K": "512kiB flash"
     },
     "vendor": "Espressif"
 }
diff --git a/ports/esp8266/boards/GENERIC/board.md b/ports/esp8266/boards/ESP8266_GENERIC/board.md
similarity index 58%
rename from ports/esp8266/boards/GENERIC/board.md
rename to ports/esp8266/boards/ESP8266_GENERIC/board.md
index fa0cf410d66fa..96fbab617a8f6 100644
--- a/ports/esp8266/boards/GENERIC/board.md
+++ b/ports/esp8266/boards/ESP8266_GENERIC/board.md
@@ -1,6 +1,13 @@
-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.
+The following are daily builds of the ESP8266 firmware. This will work on
+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.
+
+For boards with 1MiB or 512kiB of flash, two variants are provided with reduced
+functionality. The 1MiB variant removes asyncio and FAT-filesystem support as
+well as some modules from micropython-lib. The 512kiB variant further removes
+all filesystem support, as well as framebuffer support, some Python language
+features, and has less detailed error messages.
 
 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
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py
similarity index 100%
rename from ports/esp8266/boards/GENERIC/manifest.py
rename to ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/ESP8266_GENERIC/manifest_512kiB.py
similarity index 100%
rename from ports/esp8266/boards/GENERIC_512K/manifest.py
rename to ports/esp8266/boards/ESP8266_GENERIC/manifest_512kiB.py
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
new file mode 100644
index 0000000000000..3a9c40e79503c
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
@@ -0,0 +1,52 @@
+#if defined(MICROPY_ESP8266_2M)
+
+#define MICROPY_HW_BOARD_NAME "ESP module"
+#define MICROPY_HW_MCU_NAME "ESP8266"
+
+#define MICROPY_PERSISTENT_CODE_LOAD    (1)
+#define MICROPY_EMIT_XTENSA             (1)
+#define MICROPY_EMIT_INLINE_XTENSA      (1)
+
+#define MICROPY_DEBUG_PRINTERS          (1)
+#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
+
+#define MICROPY_READER_VFS              (MICROPY_VFS)
+#define MICROPY_VFS                     (1)
+
+#define MICROPY_PY_CRYPTOLIB            (1)
+
+#elif defined(MICROPY_ESP8266_1M)
+
+#define MICROPY_HW_BOARD_NAME "ESP module (1M)"
+#define MICROPY_HW_MCU_NAME "ESP8266"
+
+#define MICROPY_PERSISTENT_CODE_LOAD    (1)
+#define MICROPY_EMIT_XTENSA             (1)
+#define MICROPY_EMIT_INLINE_XTENSA      (1)
+
+#define MICROPY_DEBUG_PRINTERS          (1)
+#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
+
+#define MICROPY_READER_VFS              (MICROPY_VFS)
+#define MICROPY_VFS                     (1)
+
+
+#define MICROPY_PY_CRYPTOLIB            (1)
+
+#elif defined(MICROPY_ESP8266_512K)
+
+#define MICROPY_HW_BOARD_NAME "ESP module (512K)"
+#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_REVERSE_SPECIAL_METHODS (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER     (0)
+#define MICROPY_PY_ASYNCIO              (0)
+#define MICROPY_PY_RE_SUB               (0)
+#define MICROPY_PY_FRAMEBUF             (0)
+
+#endif
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
new file mode 100644
index 0000000000000..2eb78d7e85e5c
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
@@ -0,0 +1,50 @@
+ifeq ($(BOARD_VARIANT),)
+LD_FILES = boards/esp8266_2MiB.ld
+
+MICROPY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Add asyncio and extra micropython-lib packages (in addition to the port manifest).
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_2MiB.py
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_2M
+endif
+
+ifeq ($(BOARD_VARIANT),FLASH_1M)
+LD_FILES = boards/esp8266_1MiB.ld
+
+MICROPY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Note: Implicitly uses the port manifest.
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_1M
+endif
+
+ifeq ($(BOARD_VARIANT),OTA)
+LD_FILES = boards/esp8266_ota.ld
+
+MICROPY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Note: Implicitly uses the port manifest.
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_1M
+endif
+
+ifeq ($(BOARD_VARIANT),FLASH_512K)
+LD_FILES = boards/esp8266_512kiB.ld
+
+# Note: Use the minimal manifest.py.
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_512kiB.py
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_512K
+endif
diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.h b/ports/esp8266/boards/GENERIC/mpconfigboard.h
deleted file mode 100644
index 52c93f83a3684..0000000000000
--- a/ports/esp8266/boards/GENERIC/mpconfigboard.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP module"
-#define MICROPY_HW_MCU_NAME "ESP8266"
-
-#define MICROPY_PERSISTENT_CODE_LOAD    (1)
-#define MICROPY_EMIT_XTENSA             (1)
-#define MICROPY_EMIT_INLINE_XTENSA      (1)
-
-#define MICROPY_DEBUG_PRINTERS          (1)
-#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
-
-#define MICROPY_READER_VFS              (MICROPY_VFS)
-#define MICROPY_VFS                     (1)
-
-#define MICROPY_PY_CRYPTOLIB            (1)
diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.mk b/ports/esp8266/boards/GENERIC/mpconfigboard.mk
deleted file mode 100644
index 8d7babdc84483..0000000000000
--- a/ports/esp8266/boards/GENERIC/mpconfigboard.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LD_FILES = boards/esp8266_2m.ld
-
-MICROPY_ESPNOW ?= 1
-MICROPY_PY_BTREE ?= 1
-MICROPY_VFS_FAT ?= 1
-MICROPY_VFS_LFS2 ?= 1
-
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json
deleted file mode 100644
index 4ab5c79df02ed..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/board.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "External Flash",
-        "WiFi"
-    ],
-    "images": [],
-    "mcu": "esp8266",
-    "product": "ESP8266 with 1MiB flash",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp8266/boards/GENERIC_1M/board.md b/ports/esp8266/boards/GENERIC_1M/board.md
deleted file mode 100644
index 17cc6e3a6bdf0..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/board.md
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-`os.VfsLfs2.mkfs(bdev)`.
diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
deleted file mode 100644
index 41752e692b315..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP module (1M)"
-#define MICROPY_HW_MCU_NAME "ESP8266"
-
-#define MICROPY_PERSISTENT_CODE_LOAD    (1)
-#define MICROPY_EMIT_XTENSA             (1)
-#define MICROPY_EMIT_INLINE_XTENSA      (1)
-
-#define MICROPY_DEBUG_PRINTERS          (1)
-#define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
-
-#define MICROPY_READER_VFS              (MICROPY_VFS)
-#define MICROPY_VFS                     (1)
-
-#define MICROPY_PY_FSTRINGS             (0)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#define MICROPY_PY_ASYNCIO              (0)
-#define MICROPY_PY_CRYPTOLIB            (1)
diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.mk b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.mk
deleted file mode 100644
index adc31702e0de7..0000000000000
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LD_FILES = boards/esp8266_1m.ld
-
-MICROPY_ESPNOW ?= 1
-MICROPY_PY_BTREE ?= 1
-MICROPY_VFS_LFS2 ?= 1
diff --git a/ports/esp8266/boards/GENERIC_512K/_boot.py b/ports/esp8266/boards/GENERIC_512K/_boot.py
deleted file mode 100644
index 1a55cfd36c55e..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/_boot.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import gc
-
-gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json
deleted file mode 100644
index e035562be7757..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/board.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "External Flash",
-        "WiFi"
-    ],
-    "images": [],
-    "mcu": "esp8266",
-    "product": "ESP8266 with 512kiB flash",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}
diff --git a/ports/esp8266/boards/GENERIC_512K/board.md b/ports/esp8266/boards/GENERIC_512K/board.md
deleted file mode 100644
index 1f6e2c7907385..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/board.md
+++ /dev/null
@@ -1,3 +0,0 @@
-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/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
deleted file mode 100644
index c29e23d5ad114..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "ESP module (512K)"
-#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_REVERSE_SPECIAL_METHODS (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER     (0)
-#define MICROPY_PY_ASYNCIO              (0)
-#define MICROPY_PY_RE_SUB               (0)
-#define MICROPY_PY_FRAMEBUF             (0)
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
deleted file mode 100644
index 120351909bc0c..0000000000000
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LD_FILES = boards/esp8266_512k.ld
-
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/esp8266/boards/esp8266_1m.ld b/ports/esp8266/boards/esp8266_1MiB.ld
similarity index 100%
rename from ports/esp8266/boards/esp8266_1m.ld
rename to ports/esp8266/boards/esp8266_1MiB.ld
diff --git a/ports/esp8266/boards/esp8266_2m.ld b/ports/esp8266/boards/esp8266_2MiB.ld
similarity index 100%
rename from ports/esp8266/boards/esp8266_2m.ld
rename to ports/esp8266/boards/esp8266_2MiB.ld
diff --git a/ports/esp8266/boards/esp8266_512k.ld b/ports/esp8266/boards/esp8266_512kiB.ld
similarity index 100%
rename from ports/esp8266/boards/esp8266_512k.ld
rename to ports/esp8266/boards/esp8266_512kiB.ld
diff --git a/pyproject.toml b/pyproject.toml
index a05abf887ecf0..e3d70385c3f52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,4 +48,4 @@ max-complexity = 40
 
 # manifest.py files are evaluated with some global names pre-defined
 "**/manifest.py" = ["F821"]
-"ports/**/boards/manifest*.py" = ["F821"]
+"ports/**/boards/**/manifest_*.py" = ["F821"]
diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 999a42c0ed220..12ac230dfb12c 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -62,7 +62,7 @@ FW_TAG="-$FW_DATE-unstable-$FW_GIT"
 cd ports/cc3200
 ${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
-${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+build_esp8266_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32
 (source ${IDF_PATH_V50}/export.sh && build_esp32_boards ${FW_TAG} ${LOCAL_FIRMWARE})
 cd ../mimxrt
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 82d7f36057bc4..6f3f9380962af 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -92,6 +92,10 @@ function build_esp32_boards {
     build_boards modesp32.c $1 $2 bin elf map uf2 app-bin
 }
 
+function build_esp8266_boards {
+    build_boards modesp.c $1 $2 bin elf map
+}
+
 function build_mimxrt_boards {
     build_boards modmimxrt.c $1 $2 bin hex
 }
diff --git a/tools/autobuild/build-esp8266-latest.sh b/tools/autobuild/build-esp8266-latest.sh
deleted file mode 100755
index 1972e85fcd922..0000000000000
--- a/tools/autobuild/build-esp8266-latest.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/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
-    $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
-    $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
-    pushd $yaota8266/ota-client
-    $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
-}
-
-# 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_1M ota
diff --git a/tools/ci.sh b/tools/ci.sh
index 55e90dc4a8fcc..f60ba0fd51d1a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -155,9 +155,9 @@ function ci_esp8266_path {
 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
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_512K
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_1M
 }
 
 ########################################################################################

From 873bd00ad48b0c4a2b3addb95964ac0ecbb918f2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Aug 2023 13:13:01 +1000
Subject: [PATCH 0238/3129] rp2: Rename PICO, PICO_W to RPI_PICO, RPI_PICO_W.

PICO might not always be a unique name across all ports, and the
convention generally for other boards is to do VENDOR_BOARD.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/CMakeLists.txt                                   | 2 +-
 ports/rp2/Makefile                                         | 7 +++++--
 ports/rp2/boards/{PICO => RPI_PICO}/board.json             | 0
 ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.cmake    | 1 +
 ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.h        | 0
 ports/rp2/boards/{PICO => RPI_PICO}/pins.csv               | 0
 ports/rp2/boards/{PICO_W => RPI_PICO_W}/board.json         | 0
 ports/rp2/boards/{PICO_W => RPI_PICO_W}/manifest.py        | 0
 .../rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.cmake  | 2 ++
 ports/rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.h    | 0
 ports/rp2/boards/{PICO_W => RPI_PICO_W}/pins.csv           | 0
 tools/ci.sh                                                | 4 ++--
 12 files changed, 11 insertions(+), 5 deletions(-)
 rename ports/rp2/boards/{PICO => RPI_PICO}/board.json (100%)
 rename ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.cmake (60%)
 rename ports/rp2/boards/{PICO => RPI_PICO}/mpconfigboard.h (100%)
 rename ports/rp2/boards/{PICO => RPI_PICO}/pins.csv (100%)
 rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/board.json (100%)
 rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/manifest.py (100%)
 rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.cmake (93%)
 rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/mpconfigboard.h (100%)
 rename ports/rp2/boards/{PICO_W => RPI_PICO_W}/pins.csv (100%)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 4334a0aba9b93..7718697b438f8 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -26,7 +26,7 @@ set(MICROPY_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
-    set(MICROPY_BOARD PICO)
+    set(MICROPY_BOARD RPI_PICO)
 endif()
 
 # Set the board directory and check that it exists.
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index fdca11d11eba3..8399b9e98afba 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -8,12 +8,15 @@ ifdef BOARD_DIR
 # the path as the board name.
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
-# If not given on the command line, then default to PICO.
-BOARD ?= PICO
+# If not given on the command line, then default to RPI_PICO.
+BOARD ?= RPI_PICO
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
+ifeq ($(findstring boards/PICO,$(BOARD_DIR)),boards/PICO)
+$(warning The PICO* boards have been renamed to RPI_PICO*)
+endif
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/RPI_PICO/board.json
similarity index 100%
rename from ports/rp2/boards/PICO/board.json
rename to ports/rp2/boards/RPI_PICO/board.json
diff --git a/ports/rp2/boards/PICO/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
similarity index 60%
rename from ports/rp2/boards/PICO/mpconfigboard.cmake
rename to ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
index 3a40ca2871c6b..13269e81e52e5 100644
--- a/ports/rp2/boards/PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
@@ -1 +1,2 @@
 # cmake file for Raspberry Pi Pico
+set(PICO_BOARD "pico")
diff --git a/ports/rp2/boards/PICO/mpconfigboard.h b/ports/rp2/boards/RPI_PICO/mpconfigboard.h
similarity index 100%
rename from ports/rp2/boards/PICO/mpconfigboard.h
rename to ports/rp2/boards/RPI_PICO/mpconfigboard.h
diff --git a/ports/rp2/boards/PICO/pins.csv b/ports/rp2/boards/RPI_PICO/pins.csv
similarity index 100%
rename from ports/rp2/boards/PICO/pins.csv
rename to ports/rp2/boards/RPI_PICO/pins.csv
diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/RPI_PICO_W/board.json
similarity index 100%
rename from ports/rp2/boards/PICO_W/board.json
rename to ports/rp2/boards/RPI_PICO_W/board.json
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/RPI_PICO_W/manifest.py
similarity index 100%
rename from ports/rp2/boards/PICO_W/manifest.py
rename to ports/rp2/boards/RPI_PICO_W/manifest.py
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
similarity index 93%
rename from ports/rp2/boards/PICO_W/mpconfigboard.cmake
rename to ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
index e6db8dda6a2cb..5610c313e6527 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
@@ -1,5 +1,7 @@
 # cmake file for Raspberry Pi Pico W
 
+set(PICO_BOARD "pico_w")
+
 # The C malloc is needed by cyw43-driver Bluetooth
 set(MICROPY_C_HEAP_SIZE 4096)
 
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.h b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
similarity index 100%
rename from ports/rp2/boards/PICO_W/mpconfigboard.h
rename to ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
diff --git a/ports/rp2/boards/PICO_W/pins.csv b/ports/rp2/boards/RPI_PICO_W/pins.csv
similarity index 100%
rename from ports/rp2/boards/PICO_W/pins.csv
rename to ports/rp2/boards/RPI_PICO_W/pins.csv
diff --git a/tools/ci.sh b/tools/ci.sh
index f60ba0fd51d1a..33dc58d6b8e1f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -272,8 +272,8 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/rp2 submodules
     make ${MAKEOPTS} -C ports/rp2
-    make ${MAKEOPTS} -C ports/rp2 BOARD=PICO_W submodules
-    make ${MAKEOPTS} -C ports/rp2 BOARD=PICO_W USER_C_MODULES=../../examples/usercmodule/micropython.cmake
+    make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W submodules
+    make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W 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 326dfd2a8579828c4159d965c6a41883a2a90029 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 21 Aug 2023 13:25:15 +1000
Subject: [PATCH 0239/3129] esp32/boards/ESP32_GENERIC_C3: Enable UART REPL.

This should have been added in 4815af75bc0bc21e1e66b958fd4ee4e90c24ba10
when the variants were combined. The original non-USB variant got this
implicitly, and therefore was not in mpconfigvariant.h

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
index d403e70e46d48..42e77ecb1a6d8 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
@@ -6,3 +6,6 @@
 #define MICROPY_HW_ENABLE_SDCARD            (0)
 #define MICROPY_PY_MACHINE_DAC              (0)
 #define MICROPY_PY_MACHINE_I2S              (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)

From bc1af5ab7f9f28d0bfd882a7f00027b146feb11e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 24 Aug 2023 15:44:16 +1000
Subject: [PATCH 0240/3129] cc3200/Makefile: Build firmware.zip.

This allows the cc3200 port to be build with the standard autobuild script
rather than the custom build-cc3200-latest.sh (which is now removed).

This also fixes the path inside the zip file (by using the `-j` flag to
zip).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/Makefile                  |  2 ++
 ports/cc3200/application.mk            |  6 ++++-
 py/mkenv.mk                            |  1 +
 tools/autobuild/autobuild.sh           |  2 +-
 tools/autobuild/build-boards.sh        |  4 ++++
 tools/autobuild/build-cc3200-latest.sh | 32 --------------------------
 6 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100755 tools/autobuild/build-cc3200-latest.sh

diff --git a/ports/cc3200/Makefile b/ports/cc3200/Makefile
index 61af0bfd98445..f89a927c0e43e 100644
--- a/ports/cc3200/Makefile
+++ b/ports/cc3200/Makefile
@@ -7,6 +7,8 @@ endif
 
 # Make 'release' the default build type
 BTYPE ?= release
+# Make the 'application' by default ('bootloader' can be built explicitly)
+BTARGET ?= application
 
 # Port for flashing firmware
 PORT ?= /dev/ttyUSB1
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 5021e4ff3cb1a..f4487d69d4646 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -198,7 +198,7 @@ WIPY_IP ?= '192.168.1.1'
 WIPY_USER ?= 'micro'
 WIPY_PWD ?= 'python'
 
-all: $(BUILD)/mcuimg.bin
+all: $(BUILD)/firmware.zip
 
 .PHONY: deploy-ota
 
@@ -219,6 +219,10 @@ $(BUILD)/mcuimg.bin: $(BUILD)/application.bin
 	$(ECHO) "Create $@"
 	$(Q)$(SHELL) $(APP_SIGN) $(BUILD)
 
+$(BUILD)/firmware.zip: $(BUILD)/mcuimg.bin
+	$(ECHO) "Create $@"
+	$(Q)$(ZIP) -j $@ $<
+
 MAKE_PINS = boards/make-pins.py
 BOARD_PINS = boards/$(BOARD)/pins.csv
 AF_FILE = boards/cc3200_af.csv
diff --git a/py/mkenv.mk b/py/mkenv.mk
index 5368279e2908f..d3dddcc32d9e8 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -42,6 +42,7 @@ SED = sed
 CAT = cat
 TOUCH = touch
 PYTHON = python3
+ZIP = zip
 
 AS = $(CROSS_COMPILE)as
 CC = $(CROSS_COMPILE)gcc
diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 12ac230dfb12c..e1f2287ee597a 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -60,7 +60,7 @@ FW_TAG="-$FW_DATE-unstable-$FW_GIT"
 
 # build new firmware
 cd ports/cc3200
-${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+build_cc3200_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
 build_esp8266_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 6f3f9380962af..2b323ba9b0621 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -88,6 +88,10 @@ function build_boards {
     done
 }
 
+function build_cc3200_boards {
+    build_boards hal/cc3200_hal.c $1 $2 zip
+}
+
 function build_esp32_boards {
     build_boards modesp32.c $1 $2 bin elf map uf2 app-bin
 }
diff --git a/tools/autobuild/build-cc3200-latest.sh b/tools/autobuild/build-cc3200-latest.sh
deleted file mode 100755
index 0cbdb9c4286b9..0000000000000
--- a/tools/autobuild/build-cc3200-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/cc3200-build-$board
-    $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
-}
-
-# 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

From 1dedb65e645f72afbd614431435208d687e16992 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Aug 2023 17:15:32 +1000
Subject: [PATCH 0241/3129] esp8266/boards/ESP8266_GENERIC: Add image filename.

This image is now in micropython-media.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/ESP8266_GENERIC/board.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp8266/boards/ESP8266_GENERIC/board.json b/ports/esp8266/boards/ESP8266_GENERIC/board.json
index 1fca10c5f0b71..2b3a6b5507db8 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/board.json
+++ b/ports/esp8266/boards/ESP8266_GENERIC/board.json
@@ -7,7 +7,9 @@
         "External Flash",
         "WiFi"
     ],
-    "images": [],
+    "images": [
+        "esp8266.jpg"
+    ],
     "mcu": "esp8266",
     "product": "ESP8266",
     "thumbnail": "",

From 4a3fdc0e76c640d550099cecaa41f8c3e1489562 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 23 Aug 2023 13:13:59 +1000
Subject: [PATCH 0242/3129] tests/misc/sys_settrace_features.py: Fix to run on
 newer CPython.

This test was failing on CPython 3.11 as it now emits `0` as the line
number for the "call" event corresponding to import, where as in 3.6 it had
`1` as the line number.

We maintain the old behavior, but in order to make this test pass on both
CPython versions, the trace handler now converts the `0` to a `1`.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/misc/sys_settrace_features.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/misc/sys_settrace_features.py b/tests/misc/sys_settrace_features.py
index 8a38b7534f7df..84cf875a86a62 100644
--- a/tests/misc/sys_settrace_features.py
+++ b/tests/misc/sys_settrace_features.py
@@ -22,7 +22,9 @@ def print_stacktrace(frame, level=0):
             frame.f_code.co_name,
             # Keep just the filename.
             "sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
-            frame.f_lineno,
+            max(
+                1, frame.f_lineno
+            ),  # CPython 3.11 emits `0` where CPython 3.6 emits `1` for the "call" event corresponding to import.
         )
     )
 

From b2b5bcce28016c16f9c25772195ebe89576c17de Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 23 Aug 2023 13:30:20 +1000
Subject: [PATCH 0243/3129] py/profile: Remove the requirement to disable
 MICROPY_COMP_CONST.

The only reason that const had to be disabled was to make the test output
match CPython when const was involved.  Instead, this commit fixes the test
to handle the lines where const is used.

Also:
- remove the special handling for MICROPY_PERSISTENT_CODE_SAVE in
  unix/mpconfigport.h, and make this automatic.
- move the check for MICROPY_PERSISTENT_CODE_SAVE to where it's used (like
  we do for other similar checks) and add a comment explaining it.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/mpconfigport.h                        |  6 ------
 py/mpconfig.h                                    | 16 ++++------------
 py/profile.c                                     |  6 ++++++
 tests/misc/sys_settrace_features.py              |  5 +++++
 .../sys_settrace_subdir/sys_settrace_importme.py | 10 ++++++++--
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index c20aff1683ca1..2de05a0a6c866 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -134,12 +134,6 @@ typedef long mp_off_t;
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
-// 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
-
 // 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
diff --git a/py/mpconfig.h b/py/mpconfig.h
index de4a89206b2fb..46c62913cca67 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -312,9 +312,11 @@
 #define MICROPY_PERSISTENT_CODE_LOAD (0)
 #endif
 
-// Whether to support saving of persistent code
+// Whether to support saving of persistent code, i.e. for mpy-cross to
+// generate .mpy files. Enabling this enables additional metadata on raw code
+// objects which is also required for sys.settrace.
 #ifndef MICROPY_PERSISTENT_CODE_SAVE
-#define MICROPY_PERSISTENT_CODE_SAVE (0)
+#define MICROPY_PERSISTENT_CODE_SAVE (MICROPY_PY_SYS_SETTRACE)
 #endif
 
 // Whether to support saving persistent code to a file via mp_raw_code_save_file
@@ -2013,14 +2015,4 @@ typedef double mp_float_t;
 #define MP_WARN_CAT(x) (NULL)
 #endif
 
-// Feature dependency check.
-#if MICROPY_PY_SYS_SETTRACE
-#if !MICROPY_PERSISTENT_CODE_SAVE
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_PERSISTENT_CODE_SAVE to be enabled"
-#endif
-#if MICROPY_COMP_CONST
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_COMP_CONST to be disabled"
-#endif
-#endif
-
 #endif // MICROPY_INCLUDED_PY_MPCONFIG_H
diff --git a/py/profile.c b/py/profile.c
index 89af8640a039c..274089d7022f1 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -31,6 +31,12 @@
 
 #if MICROPY_PY_SYS_SETTRACE
 
+#if !MICROPY_PERSISTENT_CODE_SAVE
+// The settrace feature requires that we maintain additional metadata on the raw
+// code object which is normally only done when writing .mpy files.
+#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_PERSISTENT_CODE_SAVE to be enabled"
+#endif
+
 #define prof_trace_cb MP_STATE_THREAD(prof_trace_callback)
 #define QSTR_MAP(context, idx) (context->constants.qstr_table[idx])
 
diff --git a/tests/misc/sys_settrace_features.py b/tests/misc/sys_settrace_features.py
index 84cf875a86a62..8ca6b382e3c64 100644
--- a/tests/misc/sys_settrace_features.py
+++ b/tests/misc/sys_settrace_features.py
@@ -67,6 +67,11 @@ def trace_tick_handler(frame, event, arg):
     if any(name in frame_name for name in to_ignore):
         return
 
+    # Lines 4,5,7 create the `const` lambda, and line `15` is a `_X = const()` which
+    # MicroPython will not see as it's optimised out.
+    if "sys_settrace_importme" in frame.f_code.co_filename and frame.f_lineno in (4, 5, 7, 15):
+        return trace_tick_handler
+
     print("### trace_handler::main event:", event)
     __prof__.trace_tick(frame, event, arg)
 
diff --git a/tests/misc/sys_settrace_subdir/sys_settrace_importme.py b/tests/misc/sys_settrace_subdir/sys_settrace_importme.py
index de561ef2176ea..fdfa06134e4ff 100644
--- a/tests/misc/sys_settrace_subdir/sys_settrace_importme.py
+++ b/tests/misc/sys_settrace_subdir/sys_settrace_importme.py
@@ -3,12 +3,18 @@
 try:
     x = const(1)
 except NameError:
-    print("const not defined")
+    # Either running on CPython or MICROPY_COMP_CONST disabled.
+    const = lambda x: x
 
-const = lambda x: x
 
+# No const optimisation.
 _CNT01 = "CONST01"
+
+# Const assigned to an underscore name. Invisible to MicroPython with
+# MICROPY_COMP_CONST enabled.
 _CNT02 = const(123)
+
+# Consts assigned to regular name, executed normally.
 A123 = const(123)
 a123 = const(123)
 

From f3eccb154c32213860cd6226fd42c5006920f2ff Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 23 Aug 2023 13:37:06 +1000
Subject: [PATCH 0244/3129] py/mpconfig: Enable SSL finalizers if finalizers
 are enabled.

The rp2 port was enabling SSL and had finalizers enabled via the "extra
features" level, but missed explicitly enabling `MICROPY_PY_SSL_FINALISER`
(like esp32, stm32, and mimxrt did).

This commit makes `MICROPY_PY_SSL_FINALISER` default to enabled if
finalizers are enabled, and removes the explicit setting of this for
esp32, stm32, mimxrt (because they all use the "extra features" level).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/mpconfigport.h  | 1 -
 ports/mimxrt/mpconfigport.h | 2 --
 ports/stm32/mpconfigport.h  | 1 -
 py/mpconfig.h               | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 55035b5f86c10..ae73e02e41a53 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -139,7 +139,6 @@
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (esp_rom_get_cpu_ticks_per_us() * 1000000 / 200) // roughly
 #define MICROPY_PY_SSL                      (1)
 #define MICROPY_SSL_MBEDTLS                 (1)
-#define MICROPY_PY_SSL_FINALISER            (1)
 #define MICROPY_PY_WEBSOCKET                (1)
 #define MICROPY_PY_WEBREPL                  (1)
 #define MICROPY_PY_ONEWIRE                  (1)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 52054c5d4d6b4..cd69151ed88c0 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -67,7 +67,6 @@ uint32_t trng_random_u32(void);
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970               (1)
-#define MICROPY_PY_SSL_FINALISER            (MICROPY_PY_SSL)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS        (1)
 #define MICROPY_PY_TIME_INCLUDEFILE         "ports/mimxrt/modtime.c"
@@ -110,7 +109,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_WEBSOCKET                (MICROPY_PY_LWIP)
 #define MICROPY_PY_WEBREPL                  (MICROPY_PY_LWIP)
 #define MICROPY_PY_LWIP_SOCK_RAW            (MICROPY_PY_LWIP)
-#define MICROPY_PY_SSL_FINALISER            (MICROPY_PY_SSL)
 // #define MICROPY_PY_HASHLIB_MD5              (MICROPY_PY_SSL)
 #define MICROPY_PY_HASHLIB_SHA1             (MICROPY_PY_SSL)
 // #define MICROPY_PY_CRYPTOLIB                (MICROPY_PY_SSL)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 37165b158956c..2d2d81486bbb7 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -92,7 +92,6 @@
 #endif
 
 // extended modules
-#define MICROPY_PY_SSL_FINALISER    (MICROPY_PY_SSL)
 #define MICROPY_PY_HASHLIB_MD5      (MICROPY_PY_SSL)
 #define MICROPY_PY_HASHLIB_SHA1     (MICROPY_PY_SSL)
 #define MICROPY_PY_CRYPTOLIB        (MICROPY_PY_SSL)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 46c62913cca67..433d6e50def2d 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1718,7 +1718,7 @@ typedef double mp_float_t;
 
 // Whether to add finaliser code to ssl objects
 #ifndef MICROPY_PY_SSL_FINALISER
-#define MICROPY_PY_SSL_FINALISER (0)
+#define MICROPY_PY_SSL_FINALISER (MICROPY_ENABLE_FINALISER)
 #endif
 
 #ifndef MICROPY_PY_WEBSOCKET

From 313068a5b34597ce1ea315b1a3b198349d92c9eb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Aug 2023 13:52:31 +1000
Subject: [PATCH 0245/3129] extmod/modssl_mbedtls: Clear sock member if error
 creating SSLSocket.

Otherwise if/when the finaliser runs for this newly created SSLSocket the
mbedtls state will be freed again.

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

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index b02b77b76ff1c..445978e0c3c7c 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -394,6 +394,7 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     return MP_OBJ_FROM_PTR(o);
 
 cleanup:
+    o->sock = MP_OBJ_NULL;
     mbedtls_ssl_free(&o->ssl);
     mbedtls_raise_error(ret);
 }

From 6b407d5600620dfd6670304b77008d92fd19388b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 2 May 2023 12:34:12 +0200
Subject: [PATCH 0246/3129] mimxrt/machine_pin: Extend pin configuration
 functions.

Add portable pin config macros to mphalport.h.  And add a function to
configure pins with more pin options such as alt function, pull, speed,
drive, interrupt mode, etc.

Note: this new `machine_pin_config()` function can replace
`machine_pin_set_mode()`, but the latter is left as-is to avoid breaking
anything.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/machine_pin.c | 54 ++++++++++++++++++++++++++++++++++++++
 ports/mimxrt/mphalport.h   | 19 ++++++++++++++
 ports/mimxrt/pin.h         |  9 +++++++
 3 files changed, 82 insertions(+)

diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index c66718e976cb8..5dfb2b72e29af 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -187,6 +187,60 @@ void machine_pin_set_mode(const machine_pin_obj_t *self, uint8_t mode) {
     GPIO_PinInit(self->gpio, self->pin, &pin_config);
 }
 
+void machine_pin_config(const machine_pin_obj_t *self, uint8_t mode,
+    uint8_t pull, uint8_t drive, uint8_t speed, uint8_t alt) {
+    (void)speed;
+    gpio_pin_config_t pin_config = {0};
+
+    if (IS_GPIO_IT_MODE(mode)) {
+        if (mode == PIN_MODE_IT_FALLING) {
+            pin_config.interruptMode = kGPIO_IntFallingEdge;
+        } else if (mode == PIN_MODE_IT_RISING) {
+            pin_config.interruptMode = kGPIO_IntRisingEdge;
+        } else if (mode == PIN_MODE_IT_BOTH) {
+            pin_config.interruptMode = kGPIO_IntRisingOrFallingEdge;
+        }
+        // Set pad config mode to input.
+        mode = PIN_MODE_IN;
+    }
+
+    if (mode == PIN_MODE_IN) {
+        pin_config.direction = kGPIO_DigitalInput;
+    } else {
+        pin_config.direction = kGPIO_DigitalOutput;
+    }
+
+    if (mode != PIN_MODE_ALT) {
+        // GPIO is always ALT5
+        alt = PIN_AF_MODE_ALT5;
+    }
+
+    const machine_pin_af_obj_t *af = pin_find_af(self, alt);
+    if (af == NULL) {
+        return;
+    }
+
+    // Configure the pad.
+    uint32_t pad_config = pin_generate_config(pull, mode, drive, self->configRegister);
+    IOMUXC_SetPinMux(self->muxRegister, alt, af->input_register, af->input_daisy, self->configRegister, 0U);
+    IOMUXC_SetPinConfig(self->muxRegister, alt, af->input_register, af->input_daisy, self->configRegister, pad_config);
+
+    // Initialize the pin.
+    GPIO_PinInit(self->gpio, self->pin, &pin_config);
+
+    // Configure interrupt (if enabled).
+    if (pin_config.interruptMode != kGPIO_NoIntmode) {
+        uint32_t gpio_nr = GPIO_get_instance(self->gpio);
+        uint32_t irq_num = self->pin < 16 ? GPIO_combined_low_irqs[gpio_nr] : GPIO_combined_high_irqs[gpio_nr];
+
+        GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin);
+        GPIO_PortClearInterruptFlags(self->gpio, ~0);
+
+        NVIC_SetPriority(irq_num, IRQ_PRI_EXTINT);
+        EnableIRQ(irq_num);
+    }
+}
+
 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 ba7e1cfa94165..1813a9834b165 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -38,6 +38,25 @@
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT   (500)
 
 #define MP_HAL_PIN_FMT                  "%q"
+#define MP_HAL_PIN_MODE_INPUT           PIN_MODE_IN
+#define MP_HAL_PIN_MODE_OUTPUT          PIN_MODE_OUT
+#define MP_HAL_PIN_MODE_ALT             PIN_MODE_ALT
+#define MP_HAL_PIN_MODE_OPEN_DRAIN      PIN_MODE_OPEN_DRAIN
+
+#define MP_HAL_PIN_PULL_NONE            PIN_PULL_DISABLED
+#define MP_HAL_PIN_PULL_UP              PIN_PULL_UP_100K
+#define MP_HAL_PIN_PULL_DOWN            PIN_PULL_DOWN_100K
+
+#define MP_HAL_PIN_SPEED_LOW            (0)
+#define MP_HAL_PIN_SPEED_MEDIUM         (1)
+#define MP_HAL_PIN_SPEED_HIGH           (2)
+#define MP_HAL_PIN_SPEED_VERY_HIGH      (3)
+
+#define MP_HAL_PIN_TRIGGER_NONE         kGPIO_NoIntmode
+#define MP_HAL_PIN_TRIGGER_FALL         kGPIO_IntFallingEdge
+#define MP_HAL_PIN_TRIGGER_RISE         kGPIO_IntRisingEdge
+#define MP_HAL_PIN_TRIGGER_RISE_FALL    kGPIO_IntRisingOrFallingEdge
+
 extern ringbuf_t stdin_ringbuf;
 
 // Define an alias for systick_ms, because the shared softtimer.c uses
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 63db55f8a7c55..aa86f05e82d46 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -39,6 +39,10 @@
     ((MODE) == PIN_MODE_OPEN_DRAIN) || \
     ((MODE) == PIN_MODE_ALT))
 
+#define IS_GPIO_IT_MODE(MODE) (((MODE) == PIN_MODE_IT_RISING) || \
+    ((MODE) == PIN_MODE_IT_FALLING) || \
+    ((MODE) == PIN_MODE_IT_BOTH))
+
 #define IS_GPIO_DRIVE(DRIVE) (((DRIVE) == PIN_DRIVE_OFF) || \
     ((DRIVE) == PIN_DRIVE_0) || \
     ((DRIVE) == PIN_DRIVE_1) || \
@@ -56,6 +60,9 @@ enum {
     PIN_MODE_OPEN_DRAIN,
     PIN_MODE_ALT,
     PIN_MODE_SKIP,
+    PIN_MODE_IT_RISING,
+    PIN_MODE_IT_FALLING,
+    PIN_MODE_IT_BOTH,
 };
 
 enum {
@@ -161,6 +168,8 @@ 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);
+void machine_pin_config(const machine_pin_obj_t *self, uint8_t mode,
+    uint8_t pull, uint8_t drive, uint8_t speed, uint8_t alt);
 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

From 46d83d97484790c163d4276e2472fc925aaaf8ff Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 2 May 2023 12:44:46 +0200
Subject: [PATCH 0247/3129] mimxrt/sdio: Add SDIO driver.

This is a basic SDIO driver for the mimxrt port, that was added mainly to
support the CYW43 WiFi driver, and as such it only supports the commands
required by the CYW43 driver (but more commands can be added easily). The
driver performs non-blocking DMA transfers, and can detect and recover from
errors.

Note: because the mimxrt port is missing static alternate functions, named
pins and other pin related functions, currently the alternate functions for
USDHC 1 and 2 are hard-coded in the driver.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile |   1 +
 ports/mimxrt/sdio.c   | 334 ++++++++++++++++++++++++++++++++++++++++++
 ports/mimxrt/sdio.h   |  40 +++++
 3 files changed, 375 insertions(+)
 create mode 100644 ports/mimxrt/sdio.c
 create mode 100644 ports/mimxrt/sdio.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 8cb46245aec97..f74e957c313f6 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -216,6 +216,7 @@ SRC_C += \
 	pendsv.c \
 	pin.c \
 	sdcard.c \
+	sdio.c \
 	systick.c \
 	ticks.c \
 	tusb_port.c \
diff --git a/ports/mimxrt/sdio.c b/ports/mimxrt/sdio.c
new file mode 100644
index 0000000000000..771a01e3d94ac
--- /dev/null
+++ b/ports/mimxrt/sdio.c
@@ -0,0 +1,334 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "py/mperrno.h"
+#include "py/mphal.h"
+#include "pin.h"
+#include "pendsv.h"
+
+#include "fsl_usdhc.h"
+#include "fsl_iomuxc.h"
+
+#if MICROPY_PY_NETWORK_CYW43
+
+#if MICROPY_HW_SDIO_SDMMC == 1
+#define SDMMC                       USDHC1
+#define SDMMC_IRQn                  USDHC1_IRQn
+#define SDMMC_CLOCK_DIV             kCLOCK_Usdhc1Div
+#define SDMMC_CLOCK_MUX             kCLOCK_Usdhc1Mux
+#ifndef MICROPY_HW_SDIO_CLK_ALT
+#define MICROPY_HW_SDIO_CMD_ALT     (0)
+#define MICROPY_HW_SDIO_CLK_ALT     (0)
+#define MICROPY_HW_SDIO_D0_ALT      (0)
+#define MICROPY_HW_SDIO_D1_ALT      (0)
+#define MICROPY_HW_SDIO_D2_ALT      (0)
+#define MICROPY_HW_SDIO_D3_ALT      (0)
+#endif
+#else
+#define SDMMC                       USDHC2
+#define SDMMC_IRQn                  USDHC2_IRQn
+#define SDMMC_CLOCK_DIV             kCLOCK_Usdhc2Div
+#define SDMMC_CLOCK_MUX             kCLOCK_Usdhc2Mux
+#ifndef MICROPY_HW_SDIO_CLK_ALT
+#define MICROPY_HW_SDIO_CMD_ALT     (6)
+#define MICROPY_HW_SDIO_CLK_ALT     (6)
+#define MICROPY_HW_SDIO_D0_ALT      (6)
+#define MICROPY_HW_SDIO_D1_ALT      (6)
+#define MICROPY_HW_SDIO_D2_ALT      (6)
+#define MICROPY_HW_SDIO_D3_ALT      (6)
+#endif
+#endif
+
+#define SDMMC_CLOCK_400KHZ      (400000U)
+#define SDMMC_CLOCK_25MHZ       (25000000U)
+#define SDMMC_CLOCK_50MHZ       (50000000U)
+
+#if SDIO_DEBUG
+#define debug_printf(...) mp_printf(&mp_plat_print, __VA_ARGS__)
+#else
+#define debug_printf(...)
+#endif
+
+#define DMA_DESCRIPTOR_BUFFER_SIZE (32U)
+AT_NONCACHEABLE_SECTION_ALIGN(
+    static uint32_t sdio_adma_descriptor_table[DMA_DESCRIPTOR_BUFFER_SIZE], USDHC_ADMA2_ADDRESS_ALIGN);
+
+typedef struct _mimxrt_sdmmc_t {
+    USDHC_Type *inst;
+    usdhc_handle_t handle;
+    volatile uint32_t xfer_flags;
+    volatile uint32_t xfer_error;
+} mimxrt_sdmmc_t;
+
+static mimxrt_sdmmc_t sdmmc = {
+    .inst = SDMMC,
+};
+
+typedef enum {
+    SDIO_TRANSFER_DATA_COMPLETE = (1 << 0),
+    SDIO_TRANSFER_CMD_COMPLETE  = (1 << 1),
+    SDIO_TRANSFER_ERROR         = (1 << 2),
+} sdio_xfer_flags_t;
+
+static uint32_t sdio_base_clk(void) {
+    return CLOCK_GetSysPfdFreq(kCLOCK_Pfd0) / (CLOCK_GetDiv(kCLOCK_Usdhc1Div) + 1U);
+}
+
+static uint32_t sdio_response_type(uint32_t cmd) {
+    switch (cmd) {
+        case 3:
+            return kCARD_ResponseTypeR6;
+        case 5:
+            return kCARD_ResponseTypeR4;
+        case 7:
+            return kCARD_ResponseTypeR1;
+        case 52:
+            return kCARD_ResponseTypeR5;
+        default:
+            return kCARD_ResponseTypeNone;
+    }
+}
+
+static void sdio_transfer_callback(USDHC_Type *base,
+    usdhc_handle_t *handle, status_t status, void *userData) {
+    if (status == kStatus_USDHC_TransferDataComplete) {
+        sdmmc.xfer_flags |= SDIO_TRANSFER_DATA_COMPLETE;
+    } else if (status == kStatus_USDHC_SendCommandSuccess) {
+        sdmmc.xfer_flags |= SDIO_TRANSFER_CMD_COMPLETE;
+    } else if (status != kStatus_USDHC_BusyTransferring) {
+        sdmmc.xfer_error = status;
+        sdmmc.xfer_flags |= SDIO_TRANSFER_ERROR;
+    }
+}
+
+static void sdio_interrupt_callback(USDHC_Type *base, void *userData) {
+    extern void (*cyw43_poll)(void);
+
+    USDHC_DisableInterruptSignal(base, kUSDHC_CardInterruptFlag);
+    USDHC_ClearInterruptStatusFlags(base, kUSDHC_CardInterruptFlag);
+
+    if (cyw43_poll) {
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
+    }
+}
+
+void sdio_init(uint32_t irq_pri) {
+    machine_pin_config(MICROPY_HW_SDIO_CMD, PIN_MODE_ALT, PIN_PULL_UP_100K, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_CMD_ALT);
+    machine_pin_config(MICROPY_HW_SDIO_CLK, PIN_MODE_ALT, PIN_PULL_DISABLED, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_CLK_ALT);
+    machine_pin_config(MICROPY_HW_SDIO_D0, PIN_MODE_ALT, PIN_PULL_UP_100K, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_D0_ALT);
+    machine_pin_config(MICROPY_HW_SDIO_D1, PIN_MODE_ALT, PIN_PULL_UP_100K, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_D1_ALT);
+    machine_pin_config(MICROPY_HW_SDIO_D2, PIN_MODE_ALT, PIN_PULL_UP_100K, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_D2_ALT);
+    machine_pin_config(MICROPY_HW_SDIO_D3, PIN_MODE_ALT, PIN_PULL_UP_100K, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_D3_ALT);
+
+    // 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);
+    CLOCK_SetDiv(SDMMC_CLOCK_DIV, 1U);  // USDHC_input_clk = PFD0_clk / 2
+    CLOCK_SetMux(SDMMC_CLOCK_MUX, 1U);  // Select PFD0 as clock input for USDHC
+
+    // Initialize USDHC
+    const usdhc_config_t config = {
+        .endianMode = kUSDHC_EndianModeLittle,
+        .dataTimeout = 0xFU,
+        .readBurstLen = 0,
+        .writeBurstLen = 0,
+        .readWatermarkLevel = 128U,
+        .writeWatermarkLevel = 128U,
+    };
+
+    USDHC_Init(sdmmc.inst, &config);
+    USDHC_Reset(SDMMC, kUSDHC_ResetAll, 1000U);
+    USDHC_DisableInterruptSignal(SDMMC, kUSDHC_AllInterruptFlags);
+    USDHC_SetSdClock(sdmmc.inst, sdio_base_clk(), SDMMC_CLOCK_25MHZ);
+    USDHC_SetDataBusWidth(sdmmc.inst, kUSDHC_DataBusWidth1Bit);
+
+    mp_hal_delay_ms(10);
+
+    NVIC_SetPriority(SDMMC_IRQn, irq_pri);
+    EnableIRQ(SDMMC_IRQn);
+
+    usdhc_transfer_callback_t callbacks = {
+        .SdioInterrupt = sdio_interrupt_callback,
+        .TransferComplete = sdio_transfer_callback,
+    };
+    USDHC_TransferCreateHandle(sdmmc.inst, &sdmmc.handle, &callbacks, NULL);
+}
+
+void sdio_deinit(void) {
+}
+
+void sdio_reenable(void) {
+}
+
+void sdio_enable_irq(bool enable) {
+    if (enable) {
+        USDHC_ClearInterruptStatusFlags(sdmmc.inst, kUSDHC_CardInterruptFlag);
+        USDHC_EnableInterruptStatus(sdmmc.inst, kUSDHC_CardInterruptFlag);
+        USDHC_EnableInterruptSignal(sdmmc.inst, kUSDHC_CardInterruptFlag);
+    } else {
+        USDHC_DisableInterruptStatus(sdmmc.inst, kUSDHC_CardInterruptFlag);
+        USDHC_ClearInterruptStatusFlags(sdmmc.inst, kUSDHC_CardInterruptFlag);
+        USDHC_DisableInterruptSignal(sdmmc.inst, kUSDHC_CardInterruptFlag);
+    }
+}
+
+void sdio_enable_high_speed_4bit(void) {
+    USDHC_SetSdClock(sdmmc.inst, sdio_base_clk(), SDMMC_CLOCK_50MHZ);
+    USDHC_SetDataBusWidth(sdmmc.inst, kUSDHC_DataBusWidth4Bit);
+}
+
+static status_t sdio_transfer_dma(USDHC_Type *base,
+    usdhc_handle_t *handle, usdhc_transfer_t *transfer, uint32_t timeout_ms) {
+    status_t status;
+    usdhc_adma_config_t dma_config = {
+        .dmaMode = kUSDHC_DmaModeAdma2,
+        #if !FSL_FEATURE_USDHC_HAS_NO_RW_BURST_LEN
+        .burstLen = kUSDHC_EnBurstLenForINCR,
+        #endif
+        .admaTable = sdio_adma_descriptor_table,
+        .admaTableWords = DMA_DESCRIPTOR_BUFFER_SIZE,
+    };
+
+    sdmmc.xfer_flags = 0;
+    sdmmc.xfer_error = 0;
+
+    uint32_t xfer_flags = SDIO_TRANSFER_CMD_COMPLETE;
+    if (transfer->data != NULL) {
+        xfer_flags |= SDIO_TRANSFER_DATA_COMPLETE;
+    }
+
+    status = USDHC_TransferNonBlocking(base, handle, &dma_config, transfer);
+    if (status != kStatus_Success) {
+        debug_printf("sdio_transfer_dma failed to start transfer error: %lu\n", status);
+        return status;
+    }
+
+    uint32_t start = mp_hal_ticks_ms();
+    while ((sdmmc.xfer_flags != xfer_flags) &&
+           !(sdmmc.xfer_flags & SDIO_TRANSFER_ERROR) &&
+           (mp_hal_ticks_ms() - start) < timeout_ms) {
+        MICROPY_EVENT_POLL_HOOK;
+    }
+
+    if (sdmmc.xfer_flags == 0) {
+        debug_printf("sdio_transfer_dma transfer timeout.\n");
+        return kStatus_Timeout;
+    } else if (sdmmc.xfer_flags != xfer_flags) {
+        debug_printf("sdio_transfer_dma transfer failed: %lu\n", sdmmc.xfer_error);
+        USDHC_Reset(base, kUSDHC_ResetCommand, 100);
+        if (xfer_flags & SDIO_TRANSFER_DATA_COMPLETE) {
+            USDHC_Reset(base, kUSDHC_ResetData, 100);
+        }
+        return sdmmc.xfer_error;
+    }
+
+    return kStatus_Success;
+}
+
+int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = cmd,
+        .argument = arg,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = sdio_response_type(cmd),
+        .responseErrorFlags = 0
+    };
+
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdio_transfer_dma(sdmmc.inst, &sdmmc.handle, &transfer, 5000);
+
+    if (status != kStatus_Success) {
+        debug_printf("sdio_transfer failed!\n");
+        return -MP_EIO;
+    }
+
+    if (resp != NULL) {
+        *resp = command.response[0];
+    }
+
+    return 0;
+}
+
+int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t len, uint8_t *buf) {
+    usdhc_data_t data = {
+        .enableAutoCommand12 = false,
+        .enableAutoCommand23 = false,
+        .enableIgnoreError = false,
+        .dataType = kUSDHC_TransferDataNormal,
+    };
+
+    usdhc_command_t command = {
+        .index = 53,
+        .argument = arg,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR5,
+        .responseErrorFlags = 0
+    };
+
+    usdhc_transfer_t transfer = {
+        .data = &data,
+        .command = &command,
+    };
+
+    if (write) {
+        data.rxData = NULL;
+        data.txData = (uint32_t *)buf;
+    } else {
+        data.txData = NULL;
+        data.rxData = (uint32_t *)buf;
+    }
+
+    if (arg & (1 << 27)) {
+        // SDIO_BLOCK_MODE
+        data.blockSize = block_size;
+        data.blockCount = len / block_size;
+    } else {
+        // SDIO_BYTE_MODE
+        data.blockSize = block_size;
+        data.blockCount = 1;
+    }
+
+    debug_printf("cmd53 rw: %d addr 0x%p blocksize %u blockcount %lu total %lu len %d\n",
+        write, buf, data.blockSize, data.blockCount, data.blockSize * data.blockCount, len);
+
+    status_t status = sdio_transfer_dma(sdmmc.inst, &sdmmc.handle, &transfer, 5000);
+
+    if (status != kStatus_Success) {
+        debug_printf("sdio_transfer_cmd53 failed!\n");
+        return -1;
+    }
+
+    return 0;
+}
+
+#endif
diff --git a/ports/mimxrt/sdio.h b/ports/mimxrt/sdio.h
new file mode 100644
index 0000000000000..f8d6f498b6485
--- /dev/null
+++ b/ports/mimxrt/sdio.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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_MIMXRT_SDIO_H
+#define MICROPY_INCLUDED_MIMXRT_SDIO_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+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);
+
+#endif // MICROPY_INCLUDED_MIMXRT_SDIO_H

From 772a36098f1b30ce1a5988c84471c7caec98b119 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 2 May 2023 12:44:05 +0200
Subject: [PATCH 0248/3129] mimxrt: Integrate support for WiFi via the CYW43
 driver.

This commit adds the necessary configuration and hooks to get the CYW43
driver working with the mimxrt port.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/board_init.c       |   1 +
 ports/mimxrt/cyw43_configport.h | 155 ++++++++++++++++++++++++++++++++
 ports/mimxrt/machine_pin.c      |  13 +++
 ports/mimxrt/main.c             |  14 +++
 ports/mimxrt/mpconfigport.h     |   8 ++
 ports/mimxrt/mpnetworkport.c    |  15 ++++
 ports/mimxrt/pendsv.h           |   3 +
 7 files changed, 209 insertions(+)
 create mode 100644 ports/mimxrt/cyw43_configport.h

diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 78001862f05d2..9222b302b2337 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -63,6 +63,7 @@ void board_init(void) {
 
     // 1ms tick timer
     SysTick_Config(SystemCoreClock / 1000);
+    NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 0, 0));
 
     // USB0
     usb_phy0_init(0b0111, 0b0110, 0b0110);  // Configure nominal values for D_CAL and TXCAL45DP/DN
diff --git a/ports/mimxrt/cyw43_configport.h b/ports/mimxrt/cyw43_configport.h
new file mode 100644
index 0000000000000..5f96856474051
--- /dev/null
+++ b/ports/mimxrt/cyw43_configport.h
@@ -0,0 +1,155 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Damien P. George
+ * 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.
+ */
+#ifndef MICROPY_INCLUDED_STM32_CYW43_CONFIGPORT_H
+#define MICROPY_INCLUDED_STM32_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 "extmod/modnetwork.h"
+#include "pendsv.h"
+#include "sdio.h"
+
+#define CYW43_USE_SPI                   (0)
+#define CYW43_LWIP                      (1)
+#define CYW43_USE_STATS                 (0)
+
+#ifndef CYW43_CHIPSET_FIRMWARE_INCLUDE_FILE
+#define CYW43_CHIPSET_FIRMWARE_INCLUDE_FILE "lib/cyw43-driver/firmware/w4343WA1_7_45_98_50_combined.h"
+#endif
+
+#ifndef CYW43_WIFI_NVRAM_INCLUDE_FILE
+#define CYW43_WIFI_NVRAM_INCLUDE_FILE   "lib/cyw43-driver/firmware/wifi_nvram_1dx.h"
+#endif
+
+#define CYW43_IOCTL_TIMEOUT_US          (1000000)
+#define CYW43_SLEEP_MAX                 (50)
+#define CYW43_NETUTILS                  (1)
+#define CYW43_CLEAR_SDIO_INT            (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_HOST_NAME                 mod_network_hostname
+
+#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
+
+#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_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_delay_us                  mp_hal_delay_us
+#define cyw43_delay_ms                  mp_hal_delay_ms
+
+#define CYW43_PIN_WL_REG_ON             MICROPY_HW_WL_REG_ON
+#define CYW43_PIN_WL_HOST_WAKE          MICROPY_HW_WL_HOST_WAKE
+#define CYW43_PIN_WL_SDIO_1             MICROPY_HW_SDIO_D1
+
+#define CYW43_PIN_BT_REG_ON             MICROPY_HW_BT_REG_ON
+#ifdef MICROPY_HW_BT_HOST_WAKE
+#define CYW43_PIN_BT_HOST_WAKE          MICROPY_HW_BT_HOST_WAKE
+#endif
+#ifdef MICROPY_HW_BT_DEV_WAKE
+#define CYW43_PIN_BT_DEV_WAKE           MICROPY_HW_BT_DEV_WAKE
+#endif
+#ifdef MICROPY_HW_BT_CTS
+#define CYW43_PIN_BT_CTS                MICROPY_HW_BT_CTS
+#endif
+
+#if MICROPY_HW_ENABLE_RF_SWITCH
+#define CYW43_PIN_WL_RFSW_VDD           pin_WL_RFSW_VDD
+#endif
+
+#define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
+
+static inline void cyw43_hal_pin_config(cyw43_hal_pin_obj_t pin, uint8_t mode, uint8_t pull, uint8_t alt) {
+    machine_pin_set_mode(pin, mode);
+}
+
+static inline void cyw43_hal_pin_config_irq_falling(cyw43_hal_pin_obj_t pin, int enable) {
+    if (enable) {
+        machine_pin_config(pin, PIN_MODE_IT_FALLING, PIN_PULL_UP_100K, 0, 0, PIN_AF_MODE_ALT5);
+    }
+}
+
+static inline void cyw43_sdio_init(void) {
+    sdio_init(NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 14, 0));
+}
+
+static inline void cyw43_sdio_reinit(void) {
+    sdio_reenable();
+}
+
+static inline void cyw43_sdio_deinit(void) {
+    sdio_deinit();
+}
+
+static inline void cyw43_sdio_set_irq(bool enable) {
+    sdio_enable_irq(enable);
+}
+
+static inline void cyw43_sdio_enable_high_speed_4bit(void) {
+    sdio_enable_high_speed_4bit();
+}
+
+static inline int cyw43_sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
+    return sdio_transfer(cmd, arg, resp);
+}
+
+static inline int cyw43_sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t len, uint8_t *buf) {
+    return sdio_transfer_cmd53(write, block_size, arg, len, buf);
+}
+
+#define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK
+
+#endif // MICROPY_INCLUDED_STM32_CYW43_CONFIGPORT_H
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 5dfb2b72e29af..3ebccb1755ad8 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -34,6 +34,9 @@
 #include "shared/runtime/mpirq.h"
 #include "extmod/virtpin.h"
 #include "pin.h"
+#if MICROPY_PY_NETWORK_CYW43
+#include "pendsv.h"
+#endif
 
 // 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);
@@ -98,6 +101,16 @@ void call_handler(GPIO_Type *gpio, int gpio_nr, int pin) {
         if (isr & mask) {
             gpio->ISR = mask; // clear the ISR flag
             int index = GET_PIN_IRQ_INDEX(gpio_nr, pin);
+            #if MICROPY_PY_NETWORK_CYW43
+            extern void (*cyw43_poll)(void);
+            const machine_pin_obj_t *pin = MICROPY_HW_WL_HOST_WAKE;
+            if (pin->gpio == gpio && pin->pin == (index % 32)) {
+                if (cyw43_poll) {
+                    pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
+                }
+                return;
+            }
+            #endif
             machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]);
             if (irq != NULL) {
                 irq->flags = irq->trigger;
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 2d0760964c225..8deaa5427570f 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -43,6 +43,9 @@
 #if MICROPY_PY_LWIP
 #include "lwip/init.h"
 #include "lwip/apps/mdns.h"
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
 #endif
 #include "systick.h"
 #include "extmod/modnetwork.h"
@@ -69,6 +72,17 @@ int main(void) {
     systick_enable_dispatch(SYSTICK_DISPATCH_LWIP, mod_network_lwip_poll_wrapper);
     #endif
 
+    #if MICROPY_PY_NETWORK_CYW43
+    {
+        cyw43_init(&cyw43_state);
+        uint8_t buf[8];
+        memcpy(&buf[0], "PYBD", 4);
+        mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, (char *)&buf[4]);
+        cyw43_wifi_ap_set_ssid(&cyw43_state, 8, buf);
+        cyw43_wifi_ap_set_password(&cyw43_state, 8, (const uint8_t *)"pybd0123");
+    }
+    #endif
+
     for (;;) {
         #if defined(MICROPY_HW_LED1)
         led_init();
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index cd69151ed88c0..eb5c3450b3c26 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -170,12 +170,20 @@ extern const struct _mp_obj_type_t network_lan_type;
 #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
+
 #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_BOARD_NETWORK_INTERFACES \
 
 #ifndef MICROPY_BOARD_ROOT_POINTERS
diff --git a/ports/mimxrt/mpnetworkport.c b/ports/mimxrt/mpnetworkport.c
index 2e6a49b90ee70..2ca3426197538 100644
--- a/ports/mimxrt/mpnetworkport.c
+++ b/ports/mimxrt/mpnetworkport.c
@@ -43,6 +43,11 @@
 #include "lwip/dhcp.h"
 #include "lwip/apps/mdns.h"
 
+#if MICROPY_PY_NETWORK_CYW43
+#include "extmod/network_cyw43.h"
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
+
 // Poll lwIP every 128ms
 #define LWIP_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
 
@@ -59,6 +64,16 @@ 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/mimxrt/pendsv.h b/ports/mimxrt/pendsv.h
index e68f487fb4a13..f3369b07fefdc 100644
--- a/ports/mimxrt/pendsv.h
+++ b/ports/mimxrt/pendsv.h
@@ -31,6 +31,9 @@ enum {
     #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
     PENDSV_DISPATCH_LWIP,
     #endif
+    #if MICROPY_PY_NETWORK_CYW43
+    PENDSV_DISPATCH_CYW43,
+    #endif
     MICROPY_BOARD_PENDSV_ENTRIES
     PENDSV_DISPATCH_MAX
 };

From fc495240a6c63a9839c8112f8c2bcbb6a0f168d0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 9 May 2023 17:06:57 +0200
Subject: [PATCH 0249/3129] mimxrt: Integrate Bluetooth support with NimBLE
 bindings.

This commit adds the necessary functions to get NimBLE working with the
mimxrt port.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile       |   9 ++
 ports/mimxrt/main.c         |  12 +++
 ports/mimxrt/mpbthciport.c  | 196 ++++++++++++++++++++++++++++++++++++
 ports/mimxrt/mpbthciport.h  |  42 ++++++++
 ports/mimxrt/mpconfigport.h |   9 ++
 ports/mimxrt/mpnimbleport.c |  78 ++++++++++++++
 ports/mimxrt/mpnimbleport.h |  30 ++++++
 7 files changed, 376 insertions(+)
 create mode 100644 ports/mimxrt/mpbthciport.c
 create mode 100644 ports/mimxrt/mpbthciport.h
 create mode 100644 ports/mimxrt/mpnimbleport.c
 create mode 100644 ports/mimxrt/mpnimbleport.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index f74e957c313f6..ead206e5e2106 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -264,6 +264,14 @@ else
     SRC_HAL_C += hal/$(FLEXSPI_FLASH_TYPE)_config.c
 endif
 
+ifeq ($(MICROPY_PY_BLUETOOTH),1)
+SRC_C += mpbthciport.c
+endif # MICROPY_PY_BLUETOOTH
+
+ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+SRC_C += mpnimbleport.c
+endif
+
 # Math library source files
 ifeq ($(MICROPY_FLOAT_IMPL),double)
     LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
@@ -449,6 +457,7 @@ OBJ += $(PY_O)
 OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(DRIVERS_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))
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 8deaa5427570f..993e598185702 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -47,6 +47,12 @@
 #include "lib/cyw43-driver/src/cyw43.h"
 #endif
 #endif
+
+#if MICROPY_PY_BLUETOOTH
+#include "mpbthciport.h"
+#include "extmod/modbluetooth.h"
+#endif
+
 #include "systick.h"
 #include "extmod/modnetwork.h"
 
@@ -71,6 +77,9 @@ int main(void) {
 
     systick_enable_dispatch(SYSTICK_DISPATCH_LWIP, mod_network_lwip_poll_wrapper);
     #endif
+    #if MICROPY_PY_BLUETOOTH
+    mp_bluetooth_hci_init();
+    #endif
 
     #if MICROPY_PY_NETWORK_CYW43
     {
@@ -135,6 +144,9 @@ int main(void) {
         #if MICROPY_PY_MACHINE_I2S
         machine_i2s_deinit_all();
         #endif
+        #if MICROPY_PY_BLUETOOTH
+        mp_bluetooth_deinit();
+        #endif
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
diff --git a/ports/mimxrt/mpbthciport.c b/ports/mimxrt/mpbthciport.c
new file mode 100644
index 0000000000000..c83c765871923
--- /dev/null
+++ b/ports/mimxrt/mpbthciport.c
@@ -0,0 +1,196 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2021 Damien P. George
+ * Copyright (c) 2023 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 "shared/runtime/softtimer.h"
+#include "modmachine.h"
+#include "mpbthciport.h"
+
+#include "fsl_lpuart.h"
+#include CLOCK_CONFIG_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__)
+
+uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
+STATIC mp_sched_node_t mp_bluetooth_hci_sched_node;
+STATIC soft_timer_entry_t mp_bluetooth_hci_soft_timer;
+
+STATIC void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
+    mp_bluetooth_hci_poll_now();
+}
+
+void mp_bluetooth_hci_init(void) {
+    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) {
+    mp_bluetooth_hci_poll_now();
+}
+
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+    soft_timer_reinsert(&mp_bluetooth_hci_soft_timer, ms);
+}
+
+// For synchronous mode, we run all BLE stack code inside a scheduled task.
+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.
+    mp_bluetooth_hci_poll();
+}
+
+// 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) {
+    mp_sched_schedule_node(&mp_bluetooth_hci_sched_node, run_events_scheduled_task);
+}
+
+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(port),
+        MP_OBJ_NEW_QSTR(MP_QSTR_baudrate), MP_OBJ_NEW_SMALL_INT(baudrate),
+        MP_OBJ_NEW_QSTR(MP_QSTR_timeout), MP_OBJ_NEW_SMALL_INT(200),
+        MP_OBJ_NEW_QSTR(MP_QSTR_timeout_char), MP_OBJ_NEW_SMALL_INT(200),
+        MP_OBJ_NEW_QSTR(MP_QSTR_txbuf), MP_OBJ_NEW_SMALL_INT(768),
+        MP_OBJ_NEW_QSTR(MP_QSTR_rxbuf), MP_OBJ_NEW_SMALL_INT(768),
+    };
+
+    mp_bthci_uart = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, 1, 5, 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");
+    mp_bthci_uart = MP_OBJ_NULL;
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
+    DEBUG_printf("mp_bluetooth_hci_uart_set_baudrate(%lu)\n", baudrate);
+    if (mp_bthci_uart != MP_OBJ_NULL) {
+        // This struct is not public, so we use the base defined in board config files.
+        // machine_uart_obj_t uart = (machine_uart_obj_t *) MP_PTR_FROM_OBJ(mp_bthci_uart);
+        LPUART_SetBaudRate(MICROPY_HW_BLE_UART_BASE, baudrate, BOARD_BOOTCLOCKRUN_UART_CLK_ROOT);
+    }
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_any(void) {
+    int errcode = 0;
+    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) {
+        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 *)MP_OBJ_TYPE_GET_SLOT(&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 *)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;
+        }
+        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;
+}
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t mp_bthci_uart);
+
+#endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/mimxrt/mpbthciport.h b/ports/mimxrt/mpbthciport.h
new file mode 100644
index 0000000000000..124c85dae5025
--- /dev/null
+++ b/ports/mimxrt/mpbthciport.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_MPBTHCIPORT_H
+#define MICROPY_INCLUDED_MIMXRT_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_MIMXRT_MPBTHCIPORT_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index eb5c3450b3c26..9dccebc1feb91 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -59,6 +59,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_SCHEDULER_DEPTH             (8)
+#define MICROPY_SCHEDULER_STATIC_NODES      (1)
 #define MICROPY_VFS                         (1)
 
 // Control over Python builtins
@@ -118,6 +119,14 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_LWIP_REENTER MICROPY_PY_PENDSV_REENTER
 #define MICROPY_PY_LWIP_EXIT    MICROPY_PY_PENDSV_EXIT
 
+#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
+
 #ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-mimxrt"
 #endif
diff --git a/ports/mimxrt/mpnimbleport.c b/ports/mimxrt/mpnimbleport.c
new file mode 100644
index 0000000000000..e2d39e271ce6c
--- /dev/null
+++ b/ports/mimxrt/mpnimbleport.c
@@ -0,0 +1,78 @@
+/*
+ * 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"
+
+#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"
+#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) {
+    __WFI();
+
+    // 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/mimxrt/mpnimbleport.h b/ports/mimxrt/mpnimbleport.h
new file mode 100644
index 0000000000000..78f4fc9b00c40
--- /dev/null
+++ b/ports/mimxrt/mpnimbleport.h
@@ -0,0 +1,30 @@
+/*
+ * 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_MIMXRT_NIMBLE_PORT_H
+#define MICROPY_INCLUDED_MIMXRT_NIMBLE_PORT_H
+
+#endif // MICROPY_INCLUDED_MIMXRT_NIMBLE_PORT_H

From a453b4f31d3b5928eeb48f50ce1d6314612538c1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 10 May 2023 15:59:15 +0200
Subject: [PATCH 0250/3129] drivers/cyw43: Make the CYW43 Bluetooth HCI driver
 more portable.

This commit allows other ports to reuse the CYW43 HCI driver, by replacing
all Bluetooth UART and control named pins with defines in config files and
using `mpbthci` abstract functions (i.e. `mp_bluetooth_hci_*`) instead of
the STM32 specific UART functions.

Note: the function `cywbt_wait_cts_low` does not need to switch the CTS
pin from alternate function to GPIO to read it.  At least on stm32, mimxrt
it's possible to just read the pin input.  For example, see the STM32F7
RM0410 section 6.3.11, and the `SION` for IMXRT.  So this function can
also be available for other ports if the pin mode switching is removed.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/cyw43/cywbt.c          | 99 ++++++++++++++++++++--------------
 ports/stm32/cyw43_configport.h |  7 +++
 2 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index 006fd28e901d7..bc6674ea2ef7c 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -29,8 +29,6 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "pin_static_af.h"
-#include "uart.h"
 #include "extmod/mpbthci.h"
 
 #if MICROPY_PY_NETWORK_CYW43
@@ -38,33 +36,41 @@
 #include "lib/cyw43-driver/src/cyw43_config.h"
 #include "lib/cyw43-driver/firmware/cyw43_btfw_4343A1.h"
 
-// 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
 
+#ifdef CYW43_PIN_BT_CTS
+// This code is not portable and currently only builds on stm32 port.
+
+#include "pin_static_af.h"
+#include "uart.h"
+
+// Provided by the port.
+extern pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
+
 STATIC void cywbt_wait_cts_low(void) {
-    mp_hal_pin_config(pyb_pin_BT_CTS, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
+    mp_hal_pin_config(CYW43_PIN_BT_CTS, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
     for (int i = 0; i < 200; ++i) {
-        if (mp_hal_pin_read(pyb_pin_BT_CTS) == 0) {
+        if (mp_hal_pin_read(CYW43_PIN_BT_CTS) == 0) {
             break;
         }
         mp_hal_delay_ms(1);
     }
-    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);
+    mp_hal_pin_config_alt(CYW43_PIN_BT_CTS, MP_HAL_PIN_MODE_ALT,
+        MP_HAL_PIN_PULL_UP, AF_FN_UART, mp_bluetooth_hci_uart_obj.uart_id);
 }
+#endif
 
 STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
-    uart_tx_strn(&mp_bluetooth_hci_uart_obj, (void*)buf, len);
-    for (int i = 0; i < 6; ++i) {
-        while (!uart_rx_any(&mp_bluetooth_hci_uart_obj)) {
+    mp_bluetooth_hci_uart_write((void *)buf, len);
+    for (int c, i = 0; i < 6; ++i) {
+        while ((c = mp_bluetooth_hci_uart_readchar()) == -1) {
             MICROPY_EVENT_POLL_HOOK
         }
-        buf[i] = uart_rx_char(&mp_bluetooth_hci_uart_obj);
+        buf[i] = c;
     }
 
     // expect a command complete event (event 0x0e)
@@ -80,11 +86,11 @@ STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
         */
 
     int sz = buf[2] - 3;
-    for (int i = 0; i < sz; ++i) {
-        while (!uart_rx_any(&mp_bluetooth_hci_uart_obj)) {
+    for (int c, i = 0; i < sz; ++i) {
+        while ((c = mp_bluetooth_hci_uart_readchar()) == -1) {
             MICROPY_EVENT_POLL_HOOK
         }
-        buf[i] = uart_rx_char(&mp_bluetooth_hci_uart_obj);
+        buf[i] = c;
     }
 
     return 0;
@@ -150,12 +156,15 @@ 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);
+    mp_hal_pin_config(CYW43_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
+    #ifdef CYW43_PIN_BT_CTS
     cywbt_wait_cts_low();
+    #endif
     #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)
+    // Select chip antenna (could also select external)
+    mp_hal_pin_config(CYW43_PIN_WL_GPIO_1, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_DOWN, 0);
     #endif
 
     mp_bluetooth_hci_uart_set_baudrate(115200);
@@ -168,25 +177,33 @@ STATIC int cywbt_download_firmware(const uint8_t *firmware) {
 int mp_bluetooth_hci_controller_init(void) {
     // This is called immediately after the UART is initialised during stack initialisation.
 
-    mp_hal_pin_output(pyb_pin_BT_REG_ON);
-    mp_hal_pin_low(pyb_pin_BT_REG_ON);
-    mp_hal_pin_input(pyb_pin_BT_HOST_WAKE);
-    mp_hal_pin_output(pyb_pin_BT_DEV_WAKE);
-    mp_hal_pin_low(pyb_pin_BT_DEV_WAKE);
+    mp_hal_pin_output(CYW43_PIN_BT_REG_ON);
+    mp_hal_pin_low(CYW43_PIN_BT_REG_ON);
+    #ifdef CYW43_PIN_BT_HOST_WAKE
+    mp_hal_pin_input(CYW43_PIN_BT_HOST_WAKE);
+    #endif
+    #ifdef CYW43_PIN_BT_DEV_WAKE
+    mp_hal_pin_output(CYW43_PIN_BT_DEV_WAKE);
+    mp_hal_pin_low(CYW43_PIN_BT_DEV_WAKE);
+    #endif
 
     #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
+    mp_hal_pin_config(CYW43_PIN_WL_GPIO_4, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0); // RF-switch power
+    mp_hal_pin_high(CYW43_PIN_WL_GPIO_4); // Turn the RF-switch on
     #endif
 
     uint8_t buf[256];
 
-    mp_hal_pin_low(pyb_pin_BT_REG_ON);
+    mp_hal_pin_low(CYW43_PIN_BT_REG_ON);
     mp_bluetooth_hci_uart_set_baudrate(115200);
     mp_hal_delay_ms(100);
-    mp_hal_pin_high(pyb_pin_BT_REG_ON);
+    mp_hal_pin_high(CYW43_PIN_BT_REG_ON);
+    #ifdef CYW43_PIN_BT_CTS
     cywbt_wait_cts_low();
+    #else
+    mp_hal_delay_ms(100);
+    #endif
 
     // Reset
     cywbt_hci_cmd(0x03, 0x0003, 0, NULL);
@@ -197,7 +214,7 @@ int mp_bluetooth_hci_controller_init(void) {
     mp_bluetooth_hci_uart_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE);
     #endif
 
-    cywbt_download_firmware((const uint8_t*)&cyw43_btfw_4343A1[0]);
+    cywbt_download_firmware((const uint8_t *)&cyw43_btfw_4343A1[0]);
 
     // Reset
     cywbt_hci_cmd(0x03, 0x0003, 0, NULL);
@@ -219,31 +236,33 @@ int mp_bluetooth_hci_controller_init(void) {
     // cywbt_hci_cmd(0x03, 0x0013, 248, buf);
 
     // Configure sleep mode
-    cywbt_hci_cmd(0x3f, 0x27, 12, (const uint8_t*)"\x01\x02\x02\x00\x00\x00\x01\x00\x00\x00\x00\x00");
+    cywbt_hci_cmd(0x3f, 0x27, 12, (const uint8_t *)"\x01\x02\x02\x00\x00\x00\x01\x00\x00\x00\x00\x00");
 
     // HCI_Write_LE_Host_Support
-    cywbt_hci_cmd(3, 109, 2, (const uint8_t*)"\x01\x00");
+    cywbt_hci_cmd(3, 109, 2, (const uint8_t *)"\x01\x00");
 
-    mp_hal_pin_high(pyb_pin_BT_DEV_WAKE); // let sleep
+    #ifdef CYW43_PIN_BT_DEV_WAKE
+    mp_hal_pin_high(CYW43_PIN_BT_DEV_WAKE); // let sleep
+    #endif
 
     return 0;
 }
 
 int mp_bluetooth_hci_controller_deinit(void) {
-    mp_hal_pin_low(pyb_pin_BT_REG_ON);
+    mp_hal_pin_low(CYW43_PIN_BT_REG_ON);
 
     return 0;
 }
 
-#ifdef pyb_pin_BT_DEV_WAKE
+#ifdef CYW43_PIN_BT_DEV_WAKE
 STATIC uint32_t bt_sleep_ticks;
 #endif
 
 int mp_bluetooth_hci_controller_sleep_maybe(void) {
-    #ifdef pyb_pin_BT_DEV_WAKE
-    if (mp_hal_pin_read(pyb_pin_BT_DEV_WAKE) == 0) {
+    #ifdef CYW43_PIN_BT_DEV_WAKE
+    if (mp_hal_pin_read(CYW43_PIN_BT_DEV_WAKE) == 0) {
         if (mp_hal_ticks_ms() - bt_sleep_ticks > 500) {
-            mp_hal_pin_high(pyb_pin_BT_DEV_WAKE); // let sleep
+            mp_hal_pin_high(CYW43_PIN_BT_DEV_WAKE); // let sleep
         }
     }
     #endif
@@ -251,8 +270,8 @@ int mp_bluetooth_hci_controller_sleep_maybe(void) {
 }
 
 bool mp_bluetooth_hci_controller_woken(void) {
-    #ifdef pyb_pin_BT_HOST_WAKE
-    bool host_wake = mp_hal_pin_read(pyb_pin_BT_HOST_WAKE);
+    #ifdef CYW43_PIN_BT_HOST_WAKE
+    bool host_wake = mp_hal_pin_read(CYW43_PIN_BT_HOST_WAKE);
     /*
     // this is just for info/tracing purposes
     static bool last_host_wake = false;
@@ -268,11 +287,11 @@ bool mp_bluetooth_hci_controller_woken(void) {
 }
 
 int mp_bluetooth_hci_controller_wakeup(void) {
-    #ifdef pyb_pin_BT_DEV_WAKE
+    #ifdef CYW43_PIN_BT_DEV_WAKE
     bt_sleep_ticks = mp_hal_ticks_ms();
 
-    if (mp_hal_pin_read(pyb_pin_BT_DEV_WAKE) == 1) {
-        mp_hal_pin_low(pyb_pin_BT_DEV_WAKE); // wake up
+    if (mp_hal_pin_read(CYW43_PIN_BT_DEV_WAKE) == 1) {
+        mp_hal_pin_low(CYW43_PIN_BT_DEV_WAKE); // wake up
         // Use delay_us rather than delay_ms to prevent running the scheduler (which
         // might result in more BLE operations).
         mp_hal_delay_us(5000); // can't go lower than this
diff --git a/ports/stm32/cyw43_configport.h b/ports/stm32/cyw43_configport.h
index 4b6dde3c43f7a..f2a880603ab04 100644
--- a/ports/stm32/cyw43_configport.h
+++ b/ports/stm32/cyw43_configport.h
@@ -93,6 +93,13 @@
 #define CYW43_PIN_WL_REG_ON             pyb_pin_WL_REG_ON
 #define CYW43_PIN_WL_HOST_WAKE          pyb_pin_WL_HOST_WAKE
 #define CYW43_PIN_WL_SDIO_1             pyb_pin_WL_SDIO_1
+#define CYW43_PIN_WL_GPIO_1             pyb_pin_WL_GPIO_1
+#define CYW43_PIN_WL_GPIO_4             pyb_pin_WL_GPIO_4
+
+#define CYW43_PIN_BT_REG_ON             pyb_pin_BT_REG_ON
+#define CYW43_PIN_BT_HOST_WAKE          pyb_pin_BT_HOST_WAKE
+#define CYW43_PIN_BT_DEV_WAKE           pyb_pin_BT_DEV_WAKE
+#define CYW43_PIN_BT_CTS                pyb_pin_BT_CTS
 
 #if MICROPY_HW_ENABLE_RF_SWITCH
 #define CYW43_PIN_WL_RFSW_VDD           pyb_pin_WL_RFSW_VDD

From 3f5976e14a1e0f94f9af414bd99789ebf30a865d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 11 May 2023 18:56:56 +0200
Subject: [PATCH 0251/3129] mimxrt/irq: Move all IRQ related definitions to
 dedicated header.

Following other ports, IRQ priorities and related functions are moved to
their own header, to simplify mpconfigport.h.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/board_init.c   |  3 +-
 ports/mimxrt/irq.h          | 80 +++++++++++++++++++++++++++++++++++++
 ports/mimxrt/mpconfigport.h | 17 --------
 ports/mimxrt/mphalport.h    |  1 +
 ports/mimxrt/pendsv.c       |  4 +-
 5 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 ports/mimxrt/irq.h

diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 9222b302b2337..88de27ea77371 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -39,6 +39,7 @@
 
 #include CLOCK_CONFIG_H
 #include "modmachine.h"
+#include "irq.h"
 
 const uint8_t dcd_data[] = { 0x00 };
 
@@ -63,7 +64,7 @@ void board_init(void) {
 
     // 1ms tick timer
     SysTick_Config(SystemCoreClock / 1000);
-    NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 0, 0));
+    NVIC_SetPriority(SysTick_IRQn, IRQ_PRI_SYSTICK);
 
     // USB0
     usb_phy0_init(0b0111, 0b0110, 0b0110);  // Configure nominal values for D_CAL and TXCAL45DP/DN
diff --git a/ports/mimxrt/irq.h b/ports/mimxrt/irq.h
new file mode 100644
index 0000000000000..b83eb49ffabfa
--- /dev/null
+++ b/ports/mimxrt/irq.h
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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_MIMXRT_IRQ_H
+#define MICROPY_INCLUDED_MIMXRT_IRQ_H
+
+#define NVIC_PRIORITYGROUP_4    ((uint32_t)0x00000003)
+
+static inline uint32_t query_irq(void) {
+    return __get_PRIMASK();
+}
+
+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);
+}
+
+// IRQ priority definitions.
+//
+// Lower number implies higher interrupt priority.
+//
+// The default priority grouping used in this port is NVIC_PRIORITYGROUP_4.
+// This corresponds to 4 bits for the priority field and 0 bits for the
+// sub-priority field (which means that for all intents and purposes 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 following interrupts are arranged from highest priority to lowest
+// priority to make it a bit easier to figure out.
+
+#define IRQ_PRI_SYSTICK         NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 0, 0)
+
+#define IRQ_PRI_OTG_HS          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 6, 0)
+
+#define IRQ_PRI_EXTINT          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 14, 0)
+
+// PENDSV should be at the lowst priority so that other interrupts complete
+// before exception is raised.
+#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0)
+
+#endif // MICROPY_INCLUDED_MIMXRT_IRQ_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 9dccebc1feb91..fb4acede5901e 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -152,23 +152,6 @@ __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 1813a9834b165..36eb387798133 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -31,6 +31,7 @@
 #include "ticks.h"
 #include "py/ringbuf.h"
 #include "pin.h"
+#include "irq.h"
 #include "fsl_clock.h"
 
 #define MICROPY_HAL_VERSION             "2.8.0"
diff --git a/ports/mimxrt/pendsv.c b/ports/mimxrt/pendsv.c
index 11f2ef5e1c86f..46d13a5aca245 100644
--- a/ports/mimxrt/pendsv.c
+++ b/ports/mimxrt/pendsv.c
@@ -28,9 +28,7 @@
 
 #include "py/runtime.h"
 #include "pendsv.h"
-
-#define NVIC_PRIORITYGROUP_4    ((uint32_t)0x00000003)
-#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0)
+#include "irq.h"
 
 #if defined(PENDSV_DISPATCH_NUM_SLOTS)
 pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];

From ce38784fa8e8abc57f7d99ce10739c4f1b577565 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 16 Aug 2023 16:00:43 +0200
Subject: [PATCH 0252/3129] mimxrt/machine_uart: Fix and complete UART.deinit
 and uart_deinit_all.

The code did not check at deinit whether a UART was initialized.  That did
not matter for all MCU's except MIMXRT1176, which crashes at the second
soft reset in a row.

But since it is a general problem to use UART methods of a UART which has
been deinitialized, checks were added to all applicable methods for a clear
response instead of e.g. a crash.

Deinitialize UART using software reset.  It resets the UART but keeps it
accessible for software, avoiding an exception when UART registers are
accessed after a DeInit.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_uart.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 17d789886c618..02e00c899ac85 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -146,6 +146,12 @@ void LPUART_UserCallback(LPUART_Type *base, lpuart_handle_t *handle, status_t st
     }
 }
 
+static void  machine_uart_ensure_active(machine_uart_obj_t *uart) {
+    if (uart->lpuart->CTRL == 0) {
+        mp_raise_OSError(EIO);
+    }
+}
+
 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, flow=%s, "
@@ -351,13 +357,14 @@ MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
 // uart.deinit()
 STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    LPUART_Deinit(self->lpuart);
+    LPUART_SoftwareReset(self->lpuart);
     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);
+    machine_uart_ensure_active(self);
     size_t count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
     return MP_OBJ_NEW_SMALL_INT(count);
 }
@@ -365,6 +372,7 @@ 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);
+    machine_uart_ensure_active(self);
     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;
@@ -382,11 +390,11 @@ 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);
 
-// Deinitialize all defined UARTs
+// Reset all defined UARTs
 void machine_uart_deinit_all(void) {
-    for (int i = 0; i < sizeof(uart_index_table); i++) {
+    for (int i = 0; i < MICROPY_HW_UART_NUM; i++) {
         if (uart_index_table[i] != 0) {
-            LPUART_Deinit(uart_base_ptr_table[uart_index_table[i]]);
+            LPUART_SoftwareReset(uart_base_ptr_table[uart_index_table[i]]);
         }
     }
 }
@@ -424,6 +432,8 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     size_t avail;
     size_t nget;
 
+    machine_uart_ensure_active(self);
+
     for (size_t received = 0; received < size;) {
         // Wait for the first/next character.
         while ((avail = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle)) <= 0) {
@@ -456,6 +466,8 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
     size_t offset = 0;
     uint8_t fifo_size = FSL_FEATURE_LPUART_FIFO_SIZEn(0);
 
+    machine_uart_ensure_active(self);
+
     // 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);
@@ -510,6 +522,7 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
     machine_uart_obj_t *self = self_in;
     mp_uint_t ret;
     if (request == MP_STREAM_POLL) {
+        machine_uart_ensure_active(self);
         uintptr_t flags = arg;
         ret = 0;
         if (flags & MP_STREAM_POLL_RD) {

From c86b9ec8bd11dbd665e2af29f2e8b6b6f1ce449a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 30 Aug 2023 16:21:41 +0200
Subject: [PATCH 0253/3129] mimxrt/boards: Fix use of MICROPY_HW_SDRAM_AVAIL in
 MIMXRT1176.ld.

MICROPY_HW_SDRAM_AVAIL is always defined.

Thanks to Ibrahim Abdakader for noticing.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/boards/MIMXRT1176.ld | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1176.ld b/ports/mimxrt/boards/MIMXRT1176.ld
index 2408977b9410b..d66c86a046024 100644
--- a/ports/mimxrt/boards/MIMXRT1176.ld
+++ b/ports/mimxrt/boards/MIMXRT1176.ld
@@ -39,7 +39,7 @@ dtcm_size           = 0x00020000;
 ocrm_start          = 0x20240000;
 ocrm_size           = 0x00100000;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 sdram_start         = 0x80000000;
 sdram_size          = MICROPY_HW_SDRAM_SIZE;
 #endif
@@ -49,7 +49,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

From 81c19d93bc687e2bd953af16c9d779a97e822e5f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 31 Aug 2023 08:02:32 +0200
Subject: [PATCH 0254/3129] mimxrt/machine_uart: Support slow baud rates for
 UART.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Down to 50 baud (in reverence to Jean-Maurice-Émile Baudot).  Implemented
for the MIMXRT10xx MCU's only.  The MIMXRT1176 runs down to 300 baud.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_uart.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 02e00c899ac85..ab5d13e0831bc 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -288,7 +288,18 @@ 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);
+        #if defined(MIMXRT117x_SERIES)
+        // Use the Lpuart1 clock value, which is set for All UART devices.
+        LPUART_Init(self->lpuart, &self->config, CLOCK_GetRootClockFreq(kCLOCK_Root_Lpuart1));
+        #else
+        // For baud rates < 1000000 divide the clock by 10, supporting baud rates down to 50 baud.
+        if (self->config.baudRate_Bps > 1000000) {
+            CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+        } else {
+            CLOCK_SetDiv(kCLOCK_UartDiv, 9);
+        }
+        LPUART_Init(self->lpuart, &self->config, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
+        #endif
         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);

From 32db4c58f7aebc18e425f67e9f2585a79d34febf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 31 Aug 2023 14:29:49 +1000
Subject: [PATCH 0255/3129] extmod/moddeflate: Change default window size.

The primary purpose of this commit is to make decompress default to
wbits=15 when the format is gzip (or auto format with gzip detected). The
idea is that someone decompressing a gzip stream should be able to use the
default `deflate.DeflateIO(f)` and it will "just work" for any input
stream, even though it uses a lot of memory.

This is done by making uzlib report gzip files as having wbits set to 15
in their header (where it previously only set the wbits out parameter for
zlib files), and then fixing up the logic in `deflateio_init_read`.

Updates the documentation to match.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/deflate.rst | 93 +++++++++++++++++++++-------------------
 extmod/moddeflate.c      | 31 +++++++++-----
 lib/uzlib/header.c       |  4 ++
 3 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/docs/library/deflate.rst b/docs/library/deflate.rst
index 9752af5925fc1..fad577870518d 100644
--- a/docs/library/deflate.rst
+++ b/docs/library/deflate.rst
@@ -41,9 +41,15 @@ Classes
    to 1024 bytes. Valid values are ``5`` to ``15`` inclusive (corresponding to
    window sizes of 32 to 32k bytes).
 
-   If *wbits* is set to ``0`` (the default), then a window size of 256 bytes
-   will be used (corresponding to *wbits* set to ``8``), except when
-   :ref:`decompressing a zlib stream <deflate_wbits_zlib>`.
+   If *wbits* is set to ``0`` (the default), then for compression a window size
+   of 256 bytes will be used (as if *wbits* was set to 8). For decompression, it
+   depends on the format:
+
+   * ``RAW`` will use 256 bytes (corresponding to *wbits* set to 8).
+   * ``ZLIB`` (or ``AUTO`` with zlib detected) will use the value from the zlib
+     header.
+   * ``GZIP`` (or ``AUTO`` with gzip detected) will use 32 kilobytes
+     (corresponding to *wbits* set to 15).
 
    See the :ref:`window size <deflate_wbits>` notes below for more information
    about the window size, zlib, and gzip streams.
@@ -134,44 +140,43 @@ Deflate window size
 -------------------
 
 The window size limits how far back in the stream the (de)compressor can
-reference. Increasing the window size will improve compression, but will
-require more memory.
-
-However, just because a given window size is used for compression, this does not
-mean that the stream will require the same size window for decompression, as
-the stream may not reference data as far back as the window allows (for example,
-if the length of the input is smaller than the window size).
-
-If the decompressor uses a smaller window size than necessary for the input data
-stream, it will fail mid-way through decompression with :exc:`OSError`.
-
-.. _deflate_wbits_zlib:
-
-The zlib format includes a header which specifies the window size used to
-compress the data (which due to the above, may be larger than the size required
-for the decompressor).
-
-If this header value is lower than the specified *wbits* value, then the header
-value will be used instead in order to reduce the memory allocation size. If
-the *wbits* parameter is zero (the default), then the header value will only be
-used if it is less than the maximum value of ``15`` (which is default value
-used by most compressors [#f1]_).
-
-In other words, if the source zlib stream has been compressed with a custom window
-size (i.e. less than ``15``), then using the default *wbits* parameter of zero
-will decompress any such stream.
-
-The gzip file format does not include the window size in the header.
-Additionally, most compressor libraries (including CPython's implementation
-of :class:`gzip.GzipFile`) will default to the maximum possible window size.
-This makes it difficult to decompress most gzip streams on MicroPython unless
-your board has a lot of free RAM.
-
-If you control the source of the compressed data, then prefer to use the zlib
-format, with a window size that is suitable for your target device.
-
-.. rubric:: Footnotes
-
-.. [#f1] The assumption here is that if the header value is the default used by
-   most compressors, then nothing is known about the likely required window
-   size and we should ignore it.
+reference. Increasing the window size will improve compression, but will require
+more memory and make the compressor slower.
+
+If an input stream was compressed a given window size, then `DeflateIO`
+using a smaller window size will fail mid-way during decompression with
+:exc:`OSError`, but only if a back-reference actually refers back further
+than the decompressor's window size. This means it may be possible to decompress
+with a smaller window size. For example, this would trivially be the case if the
+original uncompressed data is shorter than the window size.
+
+Decompression
+~~~~~~~~~~~~~
+
+The zlib format includes a header which specifies the window size that was used
+to compress the data. This indicates the maximum window size required to
+decompress this stream. If this header value is less than the specified *wbits*
+value (or if *wbits* is unset), then the header value will be used.
+
+The gzip format does not include the window size in the header, and assumes that
+all gzip compressors (e.g. the ``gzip`` utility, or CPython's implementation of
+:class:`gzip.GzipFile`) use the maximum window size of 32kiB. For this reason,
+if the *wbits* parameter is not set, the decompressor will use a 32 kiB window
+size (corresponding to *wbits* set to 15). This means that to be able to
+decompress an arbitrary gzip stream, you must have at least this much RAM
+available. If you control the source data, consider instead using the zlib
+format with a smaller window size.
+
+The raw format has no header and therefore does not include any information
+about the window size. If *wbits* is not set, then it will default to a window
+size of 256 bytes, which may not be large enough for a given stream. Therefore
+it is recommended that you should always explicitly set *wbits* if using the raw
+format.
+
+Compression
+~~~~~~~~~~~
+
+For compression, MicroPython will default to a window size of 256 bytes for all
+formats. This provides a reasonable amount of compression with minimal memory
+usage and fast compression time, and will generate output that will work with
+any decompressor.
diff --git a/extmod/moddeflate.c b/extmod/moddeflate.c
index 1d8a8acf73b03..560ee3f0abce9 100644
--- a/extmod/moddeflate.c
+++ b/extmod/moddeflate.c
@@ -54,6 +54,8 @@ typedef enum {
     DEFLATEIO_FORMAT_MAX = DEFLATEIO_FORMAT_GZIP,
 } deflateio_format_t;
 
+// This is used when the wbits is unset in the DeflateIO constructor. Default
+// to the smallest window size (faster compression, less RAM usage, etc).
 const int DEFLATEIO_DEFAULT_WBITS = 8;
 
 typedef struct {
@@ -114,24 +116,32 @@ STATIC bool deflateio_init_read(mp_obj_deflateio_t *self) {
     // Don't modify self->window_bits as it may also be used for write.
     int wbits = self->window_bits;
 
-    // Parse the header if we're in NONE/ZLIB/GZIP modes.
-    if (self->format != DEFLATEIO_FORMAT_RAW) {
-        int header_wbits = wbits;
+    if (self->format == DEFLATEIO_FORMAT_RAW) {
+        if (wbits == 0) {
+            // The docs recommends always setting wbits explicitly when using
+            // RAW, but we still allow a default.
+            wbits = DEFLATEIO_DEFAULT_WBITS;
+        }
+    } else {
+        // Parse the header if we're in NONE/ZLIB/GZIP modes.
+        int header_wbits;
         int header_type = uzlib_parse_zlib_gzip_header(&self->read->decomp, &header_wbits);
+        if (header_type < 0) {
+            // Stream header was invalid.
+            return false;
+        }
         if ((self->format == DEFLATEIO_FORMAT_ZLIB && header_type != UZLIB_HEADER_ZLIB) || (self->format == DEFLATEIO_FORMAT_GZIP && header_type != UZLIB_HEADER_GZIP)) {
+            // Not what we expected.
             return false;
         }
-        if (wbits == 0 && header_wbits < 15) {
-            // If the header specified something lower than the default, then
-            // use that instead.
+        // header_wbits will either be 15 (gzip) or 8-15 (zlib).
+        if (wbits == 0 || header_wbits < wbits) {
+            // If the header specified something lower, then use that instead.
+            // No point doing a bigger allocation than we need to.
             wbits = header_wbits;
         }
     }
 
-    if (wbits == 0) {
-        wbits = DEFLATEIO_DEFAULT_WBITS;
-    }
-
     size_t window_len = 1 << wbits;
     self->read->window = m_new(uint8_t, window_len);
 
@@ -163,6 +173,7 @@ STATIC bool deflateio_init_write(mp_obj_deflateio_t *self) {
 
     int wbits = self->window_bits;
     if (wbits == 0) {
+        // Same default wbits for all formats.
         wbits = DEFLATEIO_DEFAULT_WBITS;
     }
     size_t window_len = 1 << wbits;
diff --git a/lib/uzlib/header.c b/lib/uzlib/header.c
index edd2b08ab5a48..9c48d91391b5a 100644
--- a/lib/uzlib/header.c
+++ b/lib/uzlib/header.c
@@ -108,6 +108,10 @@ int uzlib_parse_zlib_gzip_header(uzlib_uncomp_t *d, int *wbits)
         d->checksum_type = UZLIB_CHKSUM_CRC;
         d->checksum = ~0;
 
+        /* gzip does not include the window size in the header, as it is expected that a
+           compressor will use wbits=15 (32kiB).*/
+        *wbits = 15;
+
         return UZLIB_HEADER_GZIP;
     } else {
        /* check checksum */

From a175f98a65173e254d4185e51f49b11cab20ffac Mon Sep 17 00:00:00 2001
From: Oliver Joos <oliver.joos@hispeed.ch>
Date: Fri, 25 Aug 2023 00:09:27 +0200
Subject: [PATCH 0256/3129] stm32/mboot: Fix fwupdate by replacing zlib with
 new deflate module.

Since commit 3533924c36ae85ce6e8bf8598dd71cf16bbdb10b the zlib module has
been replaced by the new deflate module.  This commit updates the script
fwupdate.py to use the new deflate module.

Signed-off-by: Oliver Joos <oliver.joos@hispeed.ch>
---
 ports/stm32/mboot/fwupdate.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 78a8d73658b43..47ceb19ba5dae 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -3,7 +3,7 @@
 
 from micropython import const
 import struct, time
-import zlib, machine, stm
+import deflate, machine, stm
 
 # Constants to be used with update_mpy
 VFS_FAT = 1
@@ -36,7 +36,7 @@ def dfu_read(filename):
     if hdr == b"Dfu":
         pass
     elif hdr == b"\x1f\x8b\x08":
-        f = zlib.DecompIO(f, 16 + 15)
+        f = deflate.DeflateIO(f, deflate.GZIP)
     else:
         print("Invalid firmware", filename)
         return None
@@ -231,7 +231,7 @@ def update_app_elements(
     # Check firmware is of .dfu or .dfu.gz type
     try:
         with open(filename, "rb") as f:
-            hdr = zlib.DecompIO(f, 16 + 15).read(6)
+            hdr = deflate.DeflateIO(f, deflate.GZIP).read(6)
     except Exception:
         with open(filename, "rb") as f:
             hdr = f.read(6)

From 141750ff7924cbf4b023e8b0c5715c5d7ae970b7 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 1 Jul 2023 15:07:18 +0900
Subject: [PATCH 0257/3129] stm32/uart: Fix UART timeout issue with low
 baudrate on G4 MCUs.

With using UART FIFO, the timeout should be long enough that FIFO becomes
empty.  Since previous data transfer may be ongoing, the timeout must be
timeout_char multiplied by FIFO size + 1.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/uart.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index e477c5c16ca14..7a2a3a9580800 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -1052,12 +1052,20 @@ size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars,
         // the overall timeout rather than the character timeout.
         timeout = self->timeout;
     } else {
+        #if defined(STM32G4)
+        // With using UART FIFO, the timeout should be long enough that FIFO becomes empty.
+        // Since previous data transfer may be ongoing, the timeout must be multiplied
+        // timeout_char by FIFO size + 1.
+        // STM32G4 has 8 words FIFO.
+        timeout = (8 + 1) * self->timeout_char;
+        #else
         // The timeout specified here is for waiting for the TX data register to
         // become empty (ie between chars), as well as for the final char to be
         // completely transferred.  The default value for timeout_char is long
         // enough for 1 char, but we need to double it to wait for the last char
         // to be transferred to the data register, and then to be transmitted.
         timeout = 2 * self->timeout_char;
+        #endif
     }
 
     const uint8_t *src = (const uint8_t *)src_in;

From 845d0c79ff798b4524c463be78c769b96528d01c Mon Sep 17 00:00:00 2001
From: Andy Piper <andypiperuk@gmail.com>
Date: Sun, 18 Jun 2023 22:10:13 +0100
Subject: [PATCH 0258/3129] docs/library/neopixel: Change link to a
 micropython-lib reference.

Signed-off-by: Andy Piper <andypiperuk@gmail.com>
---
 docs/library/neopixel.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/library/neopixel.rst b/docs/library/neopixel.rst
index 543f2588125e0..edcbc9345c304 100644
--- a/docs/library/neopixel.rst
+++ b/docs/library/neopixel.rst
@@ -9,9 +9,7 @@ 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 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.
+   directly from :term:`micropython-lib` and copy it to the filesystem.
 
 class NeoPixel
 --------------

From b94ab6a2ef56fce3f8db2f84b26e3ac0f4b3b155 Mon Sep 17 00:00:00 2001
From: Alexander Wilde <alexander.wilde87@gmail.com>
Date: Tue, 20 Jun 2023 11:07:45 +0100
Subject: [PATCH 0259/3129] examples/bluetooth: Raise ValueError when
 advertising data is too large.

Signed-off-by: Alexander Wilde <alexander.wilde87@gmail.com>
---
 examples/bluetooth/ble_advertising.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/bluetooth/ble_advertising.py b/examples/bluetooth/ble_advertising.py
index eed527f55d210..6dc78c5e3da26 100644
--- a/examples/bluetooth/ble_advertising.py
+++ b/examples/bluetooth/ble_advertising.py
@@ -19,6 +19,8 @@
 _ADV_TYPE_UUID128_MORE = const(0x6)
 _ADV_TYPE_APPEARANCE = const(0x19)
 
+_ADV_MAX_PAYLOAD = const(31)
+
 
 # Generate a payload to be passed to gap_advertise(adv_data=...).
 def advertising_payload(limited_disc=False, br_edr=False, name=None, services=None, appearance=0):
@@ -50,6 +52,9 @@ def _append(adv_type, value):
     if appearance:
         _append(_ADV_TYPE_APPEARANCE, struct.pack("<h", appearance))
 
+    if len(payload) > _ADV_MAX_PAYLOAD:
+        raise ValueError("advertising payload too large")
+
     return payload
 
 

From f4a6fc2c8e7250db3be540e91321299205383ec4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 24 Aug 2023 23:28:53 +1000
Subject: [PATCH 0260/3129] examples/bluetooth: Link to aioble in BLE examples.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/bluetooth/ble_advertising.py         | 4 ++++
 examples/bluetooth/ble_bonding_peripheral.py  | 5 +++++
 examples/bluetooth/ble_simple_central.py      | 5 +++++
 examples/bluetooth/ble_simple_peripheral.py   | 5 +++++
 examples/bluetooth/ble_temperature.py         | 6 ++++++
 examples/bluetooth/ble_temperature_central.py | 6 ++++++
 examples/bluetooth/ble_uart_peripheral.py     | 5 +++++
 7 files changed, 36 insertions(+)

diff --git a/examples/bluetooth/ble_advertising.py b/examples/bluetooth/ble_advertising.py
index 6dc78c5e3da26..2fe17d640b9d2 100644
--- a/examples/bluetooth/ble_advertising.py
+++ b/examples/bluetooth/ble_advertising.py
@@ -1,5 +1,9 @@
 # Helpers for generating BLE advertising payloads.
 
+# A more fully-featured (and easier to use) version of this is implemented in
+# aioble. This code is provided just as a basic example. See
+# https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble
+
 from micropython import const
 import struct
 import bluetooth
diff --git a/examples/bluetooth/ble_bonding_peripheral.py b/examples/bluetooth/ble_bonding_peripheral.py
index bd7596dbcb347..c3ae5f262a92f 100644
--- a/examples/bluetooth/ble_bonding_peripheral.py
+++ b/examples/bluetooth/ble_bonding_peripheral.py
@@ -4,6 +4,11 @@
 # any connected central every 10 seconds.
 #
 # Work-in-progress demo of implementing bonding and passkey auth.
+#
+# This example demonstrates the low-level bluetooth module. For most
+# applications, we recommend using the higher-level aioble library, which
+# includes an implementation of the secret store. See
+# https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble
 
 import bluetooth
 import random
diff --git a/examples/bluetooth/ble_simple_central.py b/examples/bluetooth/ble_simple_central.py
index 3c0cf2a0d49ea..caf63334722ca 100644
--- a/examples/bluetooth/ble_simple_central.py
+++ b/examples/bluetooth/ble_simple_central.py
@@ -1,6 +1,11 @@
 # This example finds and connects to a peripheral running the
 # UART service (e.g. ble_simple_peripheral.py).
 
+# This example demonstrates the low-level bluetooth module. For most
+# applications, we recommend using the higher-level aioble library which takes
+# care of all IRQ handling and connection management. See
+# https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble
+
 import bluetooth
 import random
 import struct
diff --git a/examples/bluetooth/ble_simple_peripheral.py b/examples/bluetooth/ble_simple_peripheral.py
index 0ebe431764c93..bdb5ed88c79d7 100644
--- a/examples/bluetooth/ble_simple_peripheral.py
+++ b/examples/bluetooth/ble_simple_peripheral.py
@@ -1,5 +1,10 @@
 # This example demonstrates a UART periperhal.
 
+# This example demonstrates the low-level bluetooth module. For most
+# applications, we recommend using the higher-level aioble library which takes
+# care of all IRQ handling and connection management. See
+# https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble
+
 import bluetooth
 import random
 import struct
diff --git a/examples/bluetooth/ble_temperature.py b/examples/bluetooth/ble_temperature.py
index e6378ebee7964..acd77127ad53e 100644
--- a/examples/bluetooth/ble_temperature.py
+++ b/examples/bluetooth/ble_temperature.py
@@ -3,6 +3,12 @@
 # The sensor's local value updates every second, and it will notify
 # any connected central every 10 seconds.
 
+# This example demonstrates the low-level bluetooth module. For most
+# applications, we recommend using the higher-level aioble library which takes
+# care of all IRQ handling and connection management. See
+# https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble
+# and in particular the temp_sensor.py example included with aioble.
+
 import bluetooth
 import random
 import struct
diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index afa914672ce47..fe1c70636f409 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -1,5 +1,11 @@
 # This example finds and connects to a BLE temperature sensor (e.g. the one in ble_temperature.py).
 
+# This example demonstrates the low-level bluetooth module. For most
+# applications, we recommend using the higher-level aioble library which takes
+# care of all IRQ handling and connection management. See
+# https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble
+# and in particular the temp_client.py example included with aioble.
+
 import bluetooth
 import random
 import struct
diff --git a/examples/bluetooth/ble_uart_peripheral.py b/examples/bluetooth/ble_uart_peripheral.py
index b4e352be9f6dd..0de4fe2ed43a4 100644
--- a/examples/bluetooth/ble_uart_peripheral.py
+++ b/examples/bluetooth/ble_uart_peripheral.py
@@ -1,5 +1,10 @@
 # This example demonstrates a peripheral implementing the Nordic UART Service (NUS).
 
+# This example demonstrates the low-level bluetooth module. For most
+# applications, we recommend using the higher-level aioble library which takes
+# care of all IRQ handling and connection management. See
+# https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble
+
 import bluetooth
 from ble_advertising import advertising_payload
 

From 83f2f36b9e5fea90a947aada5e1c8065468c0e70 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 23 Aug 2023 15:57:23 +0200
Subject: [PATCH 0261/3129] tests/unix/mod_os: Make os.system() test work on
 windows.

The "true" command by default is unavailable on windows so use
an equivalent which works on both unix and windows.

Signed-off-by: stijn <stijn@ignitron.net>
---
 tests/unix/mod_os.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unix/mod_os.py b/tests/unix/mod_os.py
index 17554d9375ac3..f69fa45b2b22a 100644
--- a/tests/unix/mod_os.py
+++ b/tests/unix/mod_os.py
@@ -12,7 +12,7 @@
 print(os.getenv("TEST_VARIABLE"))
 print(os.getenv("TEST_VARIABLE", "TEST_DEFAULT_VALUE"))
 
-print(os.system("true"))
+print(os.system("exit 0"))
 
 rand = os.urandom(4)
 print(type(rand) is bytes, len(rand))

From e0a148060025a75f4051e5009d9dc3728cb2bc75 Mon Sep 17 00:00:00 2001
From: mcskatkat <mc_skatkat@hotmail.com>
Date: Tue, 11 Jul 2023 00:50:33 +0300
Subject: [PATCH 0262/3129] py/objstr: Fix `str % {}` edge case.

Eliminate `TypeError` when format string contains no named conversions.
This matches CPython behavior.

Signed-off-by: mcskatkat <mc_skatkat@hotmail.com>
---
 py/objstr.c                          |  4 +++-
 tests/basics/string_format_modulo.py | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/py/objstr.c b/py/objstr.c
index b966a70169c36..5dfe94ac4fe1c 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1645,7 +1645,9 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
         }
     }
 
-    if (arg_i != n_args) {
+    if (dict == MP_OBJ_NULL && arg_i != n_args) {
+        // NOTE: if `dict` exists, then `n_args` is 1 and the dict is always consumed; either
+        // positionally, or as a map of named args, even if none were actually referenced.
         mp_raise_TypeError(MP_ERROR_TEXT("format string didn't convert all arguments"));
     }
 
diff --git a/tests/basics/string_format_modulo.py b/tests/basics/string_format_modulo.py
index 14b4a6a484ba3..7bddd96750d5e 100644
--- a/tests/basics/string_format_modulo.py
+++ b/tests/basics/string_format_modulo.py
@@ -51,8 +51,9 @@ def __int__(self):
 
 # Should be able to print dicts; in this case they aren't used
 # to lookup keywords in formats like %(foo)s
-print('%s' % {})
-print('%s' % ({},))
+print('%s' % {})      # dict treated as the single (positional) arg to %
+print('%s' % ({},))   # dict is the first (and only) arg in the positional arg tuple
+print('foo' % {})     # no error, dict treated as an empty map of named args
 
 # Cases when "*" used and there's not enough values total
 try:
@@ -65,7 +66,11 @@ def __int__(self):
     print("TypeError")
 
 print("%(foo)s" % {"foo": "bar", "baz": False})
-print("%s %(foo)s %(foo)s" % {"foo": 1})
+print("%s %(foo)s %(foo)s" % {"foo": 1})  # dict consumed positionally, then used as map - ok
+try:
+    print("%(foo)s %s %(foo)s" % {"foo": 1})  # used as map, then positionally - not enough args
+except TypeError:
+    print("TypeError")
 try:
     print("%(foo)s" % {})
 except KeyError:

From d1f288c041c85793de17da9f8b38ff20af2a6f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 23 Nov 2022 14:26:26 +0100
Subject: [PATCH 0263/3129] py/modstruct: Support pad bytes in struct format.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds support for the x format code in struct.pack and struct.unpack.

The primary use case for this is ignoring bytes while unpacking.  When
interfacing with existing systems, it may often happen that you either have
fields in a struct that aren't properly specified or you simply don't care
about them.  Being able to easily skip them is useful.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 py/modstruct.c          | 13 ++++++++++---
 tests/basics/struct1.py |  9 +++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/py/modstruct.c b/py/modstruct.c
index 42f91b282cd14..b3edc96328703 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -92,7 +92,9 @@ STATIC size_t calc_size_items(const char *fmt, size_t *total_sz) {
             cnt = get_fmt_num(&fmt);
         }
 
-        if (*fmt == 's') {
+        if (*fmt == 'x') {
+            size += cnt;
+        } else if (*fmt == 's') {
             total_cnt += 1;
             size += cnt;
         } else {
@@ -159,7 +161,9 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
             cnt = get_fmt_num(&fmt);
         }
         mp_obj_t item;
-        if (*fmt == 's') {
+        if (*fmt == 'x') {
+            p += cnt;
+        } else if (*fmt == 's') {
             item = mp_obj_new_bytes(p, cnt);
             p += cnt;
             res->items[i++] = item;
@@ -192,7 +196,10 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, c
             cnt = get_fmt_num(&fmt);
         }
 
-        if (*fmt == 's') {
+        if (*fmt == 'x') {
+            memset(p, 0, cnt);
+            p += cnt;
+        } else if (*fmt == 's') {
             mp_buffer_info_t bufinfo;
             mp_get_buffer_raise(args[i++], &bufinfo, MP_BUFFER_READ);
             mp_uint_t to_copy = cnt;
diff --git a/tests/basics/struct1.py b/tests/basics/struct1.py
index a18655517bb77..e473ffcc11872 100644
--- a/tests/basics/struct1.py
+++ b/tests/basics/struct1.py
@@ -20,6 +20,8 @@
 print(struct.pack(">h", 1))
 print(struct.pack("<b", 1))
 print(struct.pack(">b", 1))
+print(struct.pack("<x"))
+print(struct.pack(">x"))
 
 print(struct.pack("<bI", -128, 256))
 print(struct.pack(">bI", -128, 256))
@@ -29,6 +31,13 @@
 print(struct.unpack("<6sH", b"foo\0\0\0\x12\x34"))
 print(struct.pack("<6sH", b"foo", 10000))
 
+print(struct.calcsize("7xx"))
+print(struct.pack("7xx"))
+
+print(struct.calcsize(">bxI3xH"))
+print(struct.pack(">bxI3xH", 1, 2, 3))
+print(struct.unpack(">bxI3xH", b"\x01\0\0\0\0\x02\0\0\0\0\x03"))
+
 s = struct.pack("BHBI", 10, 100, 200, 300)
 v = struct.unpack("BHBI", s)
 print(v == (10, 100, 200, 300))

From 4837ec336a8047a1707534315f6b4b8aeac3f891 Mon Sep 17 00:00:00 2001
From: Jon Nordby <jononor@gmail.com>
Date: Sun, 30 Jul 2023 15:40:39 +0200
Subject: [PATCH 0264/3129] tools/mpy_ld.py: Support more complex rodata
 sections.

Sections sometimes named .rodata.str1.1 etc, instead of just .rodata.
Avoid crashing in that case.  Instead treat it like any other RO section.

Fix thanks to @phlash.

Fixes issue #8783.

Signed-off-by: Jon Nordby <jononor@gmail.com>
---
 tools/mpy_ld.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 60fa41ce1fa86..dd7b352b69fce 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -972,7 +972,7 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
     for base, addr, kind in env.mpy_relocs:
         if isinstance(kind, str) and kind.startswith(".text"):
             kind = 0
-        elif kind in (".rodata", ".data.rel.ro"):
+        elif isinstance(kind, str) and kind.startswith((".rodata", ".data.rel.ro")):
             if env.arch.separate_rodata:
                 kind = rodata_const_table_idx
             else:

From a64f2fdca09eb00fa4a6c0e96cd783f3ee772e57 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 25 Aug 2023 15:43:50 +1000
Subject: [PATCH 0265/3129] py/dynruntime.h: Implement MP_OBJ_NEW_QSTR.

Because mpy_ld.py doesn't know the target object representation, it emits
instances of `MP_OBJ_NEW_QSTR(MP_QSTR_Foo)` as const string objects, rather
than qstrs. However this doesn't work for map keys (e.g. for a locals dict)
because the map has all_keys_are_qstrs flag is set (and also auto-complete
requires the map keys to be qstrs).

Instead, emit them as regular qstrs, and make a functioning MP_OBJ_NEW_QSTR
function available (via `native_to_obj`, also used for e.g. making
integers).

Remove the code from mpy_ld.py to emit qstrs as constant strings, but leave
behind the scaffold to emit constant objects in case we want to do use this
in the future.

Strictly this should be a .mpy sub-version bump, even though the function
table isn't changing, it does lead to a change in behavior for a new .mpy
running against old MicroPython. `mp_native_to_obj` will incorrectly return
the qstr value directly as an `mp_obj_t`, leading to unexpected results.
But given that it's broken at the moment, it seems unlikely that anyone is
relying on this, so it's not work the other downsides of a sub-version bump
(i.e. breaking pure-Python modules that use @native). The opposite case of
running an old .mpy on new MicroPython is unchanged, and remains broken in
exactly the same way.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/dynruntime.h                           |  2 +-
 py/nativeglue.c                           |  2 +
 py/runtime0.h                             |  3 ++
 tests/micropython/import_mpy_native_gc.py |  4 ++
 tools/mpy_ld.py                           | 55 ++++++-----------------
 5 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 8564715c0b59f..90c401ab4b07a 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -79,7 +79,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 /******************************************************************************/
 // Types and objects
 
-#define MP_OBJ_NEW_QSTR(x) MP_OBJ_NEW_QSTR_##x
+#define MP_OBJ_NEW_QSTR(x)                  (mp_fun_table.native_to_obj(x, MP_NATIVE_TYPE_QSTR))
 
 #define mp_type_type                        (*mp_fun_table.type_type)
 #define mp_type_NoneType                    (*mp_obj_get_type(mp_const_none))
diff --git a/py/nativeglue.c b/py/nativeglue.c
index 743ff38ccbbf4..d92d815abdf5a 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -104,6 +104,8 @@ mp_obj_t mp_native_to_obj(mp_uint_t val, mp_uint_t type) {
             return mp_obj_new_int(val);
         case MP_NATIVE_TYPE_UINT:
             return mp_obj_new_int_from_uint(val);
+        case MP_NATIVE_TYPE_QSTR:
+            return MP_OBJ_NEW_QSTR(val);
         default: // a pointer
             // we return just the value of the pointer as an integer
             return mp_obj_new_int_from_uint(val);
diff --git a/py/runtime0.h b/py/runtime0.h
index 6ef2d727c1e38..69af38ddcb88e 100644
--- a/py/runtime0.h
+++ b/py/runtime0.h
@@ -50,6 +50,9 @@
 #define MP_NATIVE_TYPE_PTR16 (0x06)
 #define MP_NATIVE_TYPE_PTR32 (0x07)
 
+// Not use for viper, but for dynamic native modules
+#define MP_NATIVE_TYPE_QSTR (0x08)
+
 // Bytecode and runtime boundaries for unary ops
 #define MP_UNARY_OP_NUM_BYTECODE    (MP_UNARY_OP_NOT + 1)
 #define MP_UNARY_OP_NUM_RUNTIME     (MP_UNARY_OP_SIZEOF + 1)
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 5a3855dc7d299..5f2a2a6f452ec 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -47,6 +47,10 @@ def open(self, path, mode):
 
 # Pre-compiled examples/natmod/features0 example for various architectures, keyed
 # by the required value of sys.implementation._mpy (without sub-version).
+# cd examples/natmod/features0
+# make clean
+# make ARCH=x64 # or ARCH=armv6m
+# cat features0.mpy | python -c 'import sys; print(sys.stdin.buffer.read())'
 features0_file_contents = {
     # -march=x64
     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',
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index dd7b352b69fce..7f0fcbca22ac2 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -232,34 +232,20 @@ def extract_qstrs(source_files):
     def read_qstrs(f):
         with open(f) as f:
             vals = set()
-            objs = set()
             for line in f:
-                while line:
-                    m = re.search(r"MP_OBJ_NEW_QSTR\((MP_QSTR_[A-Za-z0-9_]*)\)", line)
-                    if m:
-                        objs.add(m.group(1))
-                    else:
-                        m = re.search(r"MP_QSTR_[A-Za-z0-9_]*", line)
-                        if m:
-                            vals.add(m.group())
-                    if m:
-                        s = m.span()
-                        line = line[: s[0]] + line[s[1] :]
-                    else:
-                        line = ""
-            return vals, objs
+                for m in re.finditer(r"MP_QSTR_[A-Za-z0-9_]*", line):
+                    vals.add(m.group())
+            return vals
 
     static_qstrs = ["MP_QSTR_" + qstrutil.qstr_escape(q) for q in qstrutil.static_qstr_list]
 
     qstr_vals = set()
-    qstr_objs = set()
     for f in source_files:
-        vals, objs = read_qstrs(f)
+        vals = read_qstrs(f)
         qstr_vals.update(vals)
-        qstr_objs.update(objs)
     qstr_vals.difference_update(static_qstrs)
 
-    return static_qstrs, qstr_vals, qstr_objs
+    return static_qstrs, qstr_vals
 
 
 ################################################################################
@@ -730,7 +716,7 @@ def load_object_file(env, felf):
                 env.unresolved_syms.append(sym)
 
 
-def link_objects(env, native_qstr_vals_len, native_qstr_objs_len):
+def link_objects(env, native_qstr_vals_len):
     # Build GOT information
     if env.arch.name == "EM_XTENSA":
         build_got_xtensa(env)
@@ -761,7 +747,7 @@ def link_objects(env, native_qstr_vals_len, native_qstr_objs_len):
     # 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),
+        bytearray(0 * env.arch.word_size),  # currently empty
         env.arch.word_size,
     )
 
@@ -899,7 +885,7 @@ def write_reloc(self, base, offset, dest, n):
             self.write_uint(n)
 
 
-def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
+def build_mpy(env, entry_offset, fmpy, native_qstr_vals):
     # Write jump instruction to start of text
     jump = env.arch.asm_jump(entry_offset)
     env.full_text[: len(jump)] = jump
@@ -927,7 +913,7 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
     out.write_uint(1 + len(native_qstr_vals))
 
     # MPY: n_obj
-    out.write_uint(len(native_qstr_objs))
+    out.write_uint(0)
 
     # MPY: qstr table
     out.write_qstr(fmpy)  # filename
@@ -935,10 +921,7 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
         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")
+    # <empty>
 
     # MPY: kind/len
     out.write_uint(len(env.full_text) << 3 | (MP_CODE_NATIVE_VIPER - MP_CODE_BYTECODE))
@@ -965,6 +948,7 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
         out.write_bytes(env.full_rodata)
 
     # MPY: relocation information
+    # See py/persistentcode.c:mp_native_relocate for meaning of the `kind` integer values.
     prev_kind = None
     prev_base = None
     prev_offset = None
@@ -1016,7 +1000,7 @@ def do_preprocess(args):
     if args.output is None:
         assert args.files[0].endswith(".c")
         args.output = args.files[0][:-1] + "config.h"
-    static_qstrs, qstr_vals, qstr_objs = extract_qstrs(args.files)
+    static_qstrs, qstr_vals = extract_qstrs(args.files)
     with open(args.output, "w") as f:
         print(
             "#include <stdint.h>\n"
@@ -1029,11 +1013,6 @@ def do_preprocess(args):
             print("#define %s (%u)" % (q, i + 1), file=f)
         for i, q in enumerate(sorted(qstr_vals)):
             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_obj_table[%d])" % (q, i),
-                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)
 
@@ -1043,25 +1022,19 @@ def do_link(args):
         assert args.files[0].endswith(".o")
         args.output = args.files[0][:-1] + "mpy"
     native_qstr_vals = []
-    native_qstr_objs = []
     if args.qstrs is not None:
         with open(args.qstrs) as f:
             for l in f:
                 m = re.match(r"#define MP_QSTR_([A-Za-z0-9_]*) \(mp_native_", l)
                 if m:
                     native_qstr_vals.append(m.group(1))
-                else:
-                    m = re.match(r"#define MP_OBJ_NEW_QSTR_MP_QSTR_([A-Za-z0-9_]*)", l)
-                    if m:
-                        native_qstr_objs.append(m.group(1))
     log(LOG_LEVEL_2, "qstr vals: " + ", ".join(native_qstr_vals))
-    log(LOG_LEVEL_2, "qstr objs: " + ", ".join(native_qstr_objs))
     env = LinkEnv(args.arch)
     try:
         for file in args.files:
             load_object_file(env, file)
-        link_objects(env, len(native_qstr_vals), len(native_qstr_objs))
-        build_mpy(env, env.find_addr("mpy_init"), args.output, native_qstr_vals, native_qstr_objs)
+        link_objects(env, len(native_qstr_vals))
+        build_mpy(env, env.find_addr("mpy_init"), args.output, native_qstr_vals)
     except LinkError as er:
         print("LinkError:", er.args[0])
         sys.exit(1)

From 633599cdd500d3a2c99193f2c4340ac823d1a8a8 Mon Sep 17 00:00:00 2001
From: stephanelsmith <stephane.smith@titansensor.com>
Date: Wed, 26 Jul 2023 02:52:56 +0000
Subject: [PATCH 0266/3129] tests/run-tests.py: Capture output of stderr when
 running on CPython.

Signed-off-by: stephanelsmith <stephane.smith@titansensor.com>
---
 tests/run-tests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 019b30189f939..de886b8ae7142 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -709,7 +709,9 @@ def run_one_test(test_file):
             # run CPython to work out expected output
             try:
                 output_expected = subprocess.check_output(
-                    CPYTHON3_CMD + [os.path.abspath(test_file)], cwd=os.path.dirname(test_file)
+                    CPYTHON3_CMD + [os.path.abspath(test_file)],
+                    cwd=os.path.dirname(test_file),
+                    stderr=subprocess.STDOUT,
                 )
                 if args.write_exp:
                     with open(test_file_expected, "wb") as f:

From 1c047742a273382241e8cfddb12a1d8b4f7f59ab Mon Sep 17 00:00:00 2001
From: stephanelsmith <stephane.smith@titansensor.com>
Date: Wed, 26 Jul 2023 02:52:56 +0000
Subject: [PATCH 0267/3129] extmod/vfs_posix_file: Fix flush handling on macOS.

On macOS, if running micropython from subprocess.check_output, then a
stdout.flush() raises error 45.

Here's a test case.  This will run fine on linux, but crashes on macOS with
error 45.

    import sys
    import subprocess
    import tempfile
    with tempfile.NamedTemporaryFile('w') as fp:
        fp.write('''
    import sys
    sys.stdout.write('hello world')
    sys.stdout.flush()
    print('')
    ''')
        fp.flush()
        print('py3')
        o = subprocess.check_output(f'python3 {fp.name}'.split())
        print(o)
        print('upy')
        o = subprocess.check_output(f'micropython {fp.name}'.split())
        print(o)

On macOS:

    py3
    b'hello world\n'
    upy
    Traceback (most recent call last):
      File "...", line 4, in <module>
    OSError: 45

On unix:

    py3
    b'hello world\n'
    upy
    b'hello world\n'

Signed-off-by: stephanelsmith <stephane.smith@titansensor.com>
---
 extmod/vfs_posix_file.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index d70bc4738e2e4..cce7a79af7b1b 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -153,12 +153,17 @@ STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_
     switch (request) {
         case MP_STREAM_FLUSH: {
             int ret;
+            // fsync(stdin/stdout/stderr) may fail with EINVAL (or ENOTSUP on macos),
+            // but don't propagate that error out.  Because data is not buffered by
+            // us, and stdin/out/err.flush() should just be a no-op.
+            #ifdef __APPLE__
+            #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL || err == ENOTSUP)
+            #else
+            #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL)
+            #endif
             MP_HAL_RETRY_SYSCALL(ret, fsync(o->fd), {
-                if (err == EINVAL
+                if (VFS_POSIX_STREAM_STDIO_ERR_CATCH
                     && (o->fd == STDIN_FILENO || o->fd == STDOUT_FILENO || o->fd == STDERR_FILENO)) {
-                    // fsync(stdin/stdout/stderr) may fail with EINVAL, but don't propagate that
-                    // error out.  Because data is not buffered by us, and stdin/out/err.flush()
-                    // should just be a no-op.
                     return 0;
                 }
                 *errcode = err;

From db06041d59ef8d5524340c4d2c4490c8e770591f Mon Sep 17 00:00:00 2001
From: stephanelsmith <stephane.smith@titansensor.com>
Date: Wed, 26 Jul 2023 02:52:56 +0000
Subject: [PATCH 0268/3129] extmod/vfs_posix_file: Implement sys.std*.buffer
 objects.

Add the buffer attribute to sys.stdin, sys.stdout and sys.stderr.  This
provides raw access to underlying stdio streams for the unix port (and
others that use VfsPosix).

Signed-off-by: stephanelsmith <stephane.smith@titansensor.com>
---
 extmod/vfs_posix_file.c | 46 +++++++++++++++++++++++++++++
 tests/io/file_stdio.py  |  1 +
 tests/io/file_stdio2.py | 65 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 tests/io/file_stdio2.py

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index cce7a79af7b1b..488593230c744 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -274,12 +274,58 @@ STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
     .is_text = true,
 };
 
+#if MICROPY_PY_SYS_STDIO_BUFFER
+
+const mp_obj_vfs_posix_file_t mp_sys_stdin_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDIN_FILENO};
+const mp_obj_vfs_posix_file_t mp_sys_stdout_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDOUT_FILENO};
+const mp_obj_vfs_posix_file_t mp_sys_stderr_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDERR_FILENO};
+
+// Forward declarations.
+const mp_obj_vfs_posix_file_t mp_sys_stdin_obj;
+const mp_obj_vfs_posix_file_t mp_sys_stdout_obj;
+const mp_obj_vfs_posix_file_t mp_sys_stderr_obj;
+
+STATIC void vfs_posix_textio_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    if (dest[0] != MP_OBJ_NULL) {
+        // These objects are read-only.
+        return;
+    }
+
+    if (attr == MP_QSTR_buffer) {
+        // Implement the `buffer` attribute only on std{in,out,err} instances.
+        if (MP_OBJ_TO_PTR(self_in) == &mp_sys_stdin_obj) {
+            dest[0] = MP_OBJ_FROM_PTR(&mp_sys_stdin_buffer_obj);
+            return;
+        }
+        if (MP_OBJ_TO_PTR(self_in) == &mp_sys_stdout_obj) {
+            dest[0] = MP_OBJ_FROM_PTR(&mp_sys_stdout_buffer_obj);
+            return;
+        }
+        if (MP_OBJ_TO_PTR(self_in) == &mp_sys_stderr_obj) {
+            dest[0] = MP_OBJ_FROM_PTR(&mp_sys_stderr_buffer_obj);
+            return;
+        }
+    }
+
+    // Any other attribute - forward to locals dict.
+    dest[1] = MP_OBJ_SENTINEL;
+};
+
+#define VFS_POSIX_TEXTIO_TYPE_ATTR attr, vfs_posix_textio_attr,
+
+#else
+
+#define VFS_POSIX_TEXTIO_TYPE_ATTR
+
+#endif // MICROPY_PY_SYS_STDIO_BUFFER
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_posix_textio,
     MP_QSTR_TextIOWrapper,
     MP_TYPE_FLAG_ITER_IS_STREAM,
     print, vfs_posix_file_print,
     protocol, &vfs_posix_textio_stream_p,
+    VFS_POSIX_TEXTIO_TYPE_ATTR
     locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
diff --git a/tests/io/file_stdio.py b/tests/io/file_stdio.py
index cbdb070163c31..d714bffd4df28 100644
--- a/tests/io/file_stdio.py
+++ b/tests/io/file_stdio.py
@@ -2,3 +2,4 @@
 
 print(sys.stdin.fileno())
 print(sys.stdout.fileno())
+print(sys.stderr.fileno())
diff --git a/tests/io/file_stdio2.py b/tests/io/file_stdio2.py
new file mode 100644
index 0000000000000..5b8a5a76921ad
--- /dev/null
+++ b/tests/io/file_stdio2.py
@@ -0,0 +1,65 @@
+# Test sys.std*.buffer objects.
+
+import sys
+
+try:
+    sys.stdout.buffer
+    sys.stdin.buffer
+    sys.stderr.buffer
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+# force cpython to flush after every print
+# this is to sequence stdout and stderr
+def print_flush(*args, **kwargs):
+    try:
+        print(*args, **kwargs, flush=True)
+    except TypeError:
+        print(*args, **kwargs)
+
+
+print_flush("==stdin==")
+print_flush(sys.stdin.buffer.fileno())
+
+
+print_flush("==stdout==")
+print_flush(sys.stdout.buffer.fileno())
+n_text = sys.stdout.write("The quick brown fox jumps over the lazy dog\n")
+sys.stdout.flush()
+n_binary = sys.stdout.buffer.write("The quick brown fox jumps over the lazy dog\n".encode("utf-8"))
+sys.stdout.buffer.flush()
+print_flush("n_text:{} n_binary:{}".format(n_text, n_binary))
+
+# temporarily disabling unicode tests until future PR which fixes unicode write character count
+# n_text = sys.stdout.write("🚀")
+# sys.stdout.flush()
+# n_binary = sys.stdout.buffer.write("🚀".encode("utf-8"))
+# sys.stdout.buffer.flush()
+# print_flush("")
+# print_flush("n_text:{} n_binary:{}".format(n_text, n_binary))
+# n_text = sys.stdout.write("1🚀2a3α4b5β6c7γ8d9δ0ぁ1🙐")
+# sys.stdout.flush()
+# n_binary = sys.stdout.buffer.write("1🚀2a3α4b5β6c7γ8d9δ0ぁ1🙐".encode("utf-8"))
+# sys.stdout.buffer.flush()
+# print_flush("")
+# print_flush("n_text:{} n_binary:{}".format(n_text, n_binary))
+
+
+print_flush("==stderr==")
+print_flush(sys.stderr.buffer.fileno())
+n_text = sys.stderr.write("The quick brown fox jumps over the lazy dog\n")
+sys.stderr.flush()
+n_binary = sys.stderr.buffer.write("The quick brown fox jumps over the lazy dog\n".encode("utf-8"))
+sys.stderr.buffer.flush()
+print_flush("n_text:{} n_binary:{}".format(n_text, n_binary))
+
+# temporarily disabling unicode tests until future PR which fixes unicode write character count
+# n_text = sys.stderr.write("🚀")
+# sys.stderr.flush()
+# n_binary = sys.stderr.buffer.write("🚀".encode("utf-8"))
+# sys.stderr.buffer.flush()
+# print_flush("")
+# print_flush("n_text:{} n_binary:{}".format(n_text, n_binary))
+# print_flush("")

From 25b89cbe946a198734f29b05c3e6730d6b949979 Mon Sep 17 00:00:00 2001
From: Wang Xuancong <xuancong84@gmail.com>
Date: Mon, 19 Jun 2023 10:09:59 +0800
Subject: [PATCH 0269/3129] extmod/{modlwip,modsocket}: Add support for
 SO_BROADCAST socket option.

Signed-off-by: Wang Xuancong <xuancong84@gmail.com>
---
 extmod/modlwip.c    | 4 +++-
 extmod/modnetwork.h | 1 +
 extmod/modsocket.c  | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 0d4c03c68a876..c881f0df6a7d0 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1377,7 +1377,8 @@ STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
 
     switch (opt) {
         // level: SOL_SOCKET
-        case SOF_REUSEADDR: {
+        case SOF_REUSEADDR:
+        case SOF_BROADCAST: {
             mp_int_t val = mp_obj_get_int(args[3]);
             // Options are common for UDP and TCP pcb's.
             if (val) {
@@ -1786,6 +1787,7 @@ STATIC const mp_rom_map_elem_t mp_module_lwip_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_SOL_SOCKET), MP_ROM_INT(1) },
     { MP_ROM_QSTR(MP_QSTR_SO_REUSEADDR), MP_ROM_INT(SOF_REUSEADDR) },
+    { MP_ROM_QSTR(MP_QSTR_SO_BROADCAST), MP_ROM_INT(SOF_BROADCAST) },
 
     { 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) },
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 4786596e9b93d..e775612fe7b13 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -43,6 +43,7 @@
 
 // Common option flags per-socket.
 #define MOD_NETWORK_SO_REUSEADDR    (0x0004)
+#define MOD_NETWORK_SO_BROADCAST    (0x0020)
 #define MOD_NETWORK_SO_KEEPALIVE    (0x0008)
 #define MOD_NETWORK_SO_SNDTIMEO     (0x1005)
 #define MOD_NETWORK_SO_RCVTIMEO     (0x1006)
diff --git a/extmod/modsocket.c b/extmod/modsocket.c
index 488b6d17125d5..72a32e3cba4eb 100644
--- a/extmod/modsocket.c
+++ b/extmod/modsocket.c
@@ -631,6 +631,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
 
     { 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_BROADCAST), MP_ROM_INT(MOD_NETWORK_SO_BROADCAST) },
     { 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) },

From 56e5a21312150793a846ce93103f3ea6fec29c68 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Sep 2023 18:33:58 +1000
Subject: [PATCH 0270/3129] esp32/modsocket: Add support for SO_BROADCAST
 socket option.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modsocket.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index ba1fe096f6946..e5a370641f599 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -386,7 +386,8 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
 
     switch (opt) {
         // level: SOL_SOCKET
-        case SO_REUSEADDR: {
+        case SO_REUSEADDR:
+        case SO_BROADCAST: {
             int val = mp_obj_get_int(args[3]);
             int ret = lwip_setsockopt(self->fd, SOL_SOCKET, opt, &val, sizeof(int));
             if (ret != 0) {
@@ -858,6 +859,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_IP), MP_ROM_INT(IPPROTO_IP) },
     { MP_ROM_QSTR(MP_QSTR_SOL_SOCKET), MP_ROM_INT(SOL_SOCKET) },
     { MP_ROM_QSTR(MP_QSTR_SO_REUSEADDR), MP_ROM_INT(SO_REUSEADDR) },
+    { MP_ROM_QSTR(MP_QSTR_SO_BROADCAST), MP_ROM_INT(SO_BROADCAST) },
     { MP_ROM_QSTR(MP_QSTR_IP_ADD_MEMBERSHIP), MP_ROM_INT(IP_ADD_MEMBERSHIP) },
 };
 

From ba8aad3d1dbc25a397c9b23b1428018c5a7be505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 4 Jul 2023 15:36:37 +0200
Subject: [PATCH 0271/3129] esp32/modnetwork: Add support for SO_BINDTODEVICE
 socket option.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This implements support for SO_BINDTODEVICE, which allows telling a socket
to use a specific interface instead of lwIP automatically selecting one.
This allows devices that have multiple connections (for example cellular
over PPP in addition to WLAN) to explicitly choose which data is send over
which connection, which may have different reliability and or (mobile data)
costs associated with using them.

The used lwIP network stack already has support for this, so all that was
needed was to expose this functionality in MicroPython.  This commit
exposes a new constant SO_BINDTODEVICE which can be set as an socket
option.  As a value it expects the name of the interface to bind to.  These
names can be retrieved using `.config('ifname')` implemented on each
interface type (including adding in this commit a `.config()` method to
PPP, which it didn't have before), which returns a string with the
interface name:

    >>> import machine
    >>> import network
    >>> network.WLAN(network.AP_IF).config('ifname')
    'lo0'
    >>> wlan = network.WLAN(network.AP_IF)
    >>> wlan.active(True) and wlan.config('ifname')
    'ap1'
    >>> wlan = network.WLAN(network.STA_IF)
    >>> wlan.active(True) and wlan.config('ifname')
    'st1'
    >>> ppp = network.PPP(machine.UART(0))
    >>> ppp.active(True) and ppp.config('ifname')
    'pp1'
    >>> ppp = network.PPP(machine.UART(0))
    >>> ppp.active(True) and ppp.config('ifname')
    'pp2'
    >>> ppp = network.PPP(machine.UART(0))
    >>> ppp.active(True) and ppp.config('ifname')
    'pp3'

Note that lo0 seems to be returned by lwIP if the interface is not yet
active.  The method can also return None in the case of PPP where the
entire lwIP interface doesn't yet exist before being activated.  Currently
no effort is made to unify those cases; it is expected that whatever we
receive from lwIP is valid.

When the socket option is set, this forces using a specific device:

    import socket
    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
    s.setsockopt(socket.SOL_SOCKET, socket.SO_BINDTODEVICE, 'st1')

setsockopt will throw (OSError: [Errno 19] ENODEV) if the specified
interface does not exist.

Tested with LAN, WLAN, and PPP; can specify which interface should be used
and when testing with, for example, HTTP requests to ifconfig.co the
returned IP address confirms a specific interface was used.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/modnetwork.h     |  2 ++
 ports/esp32/modsocket.c      | 13 +++++++++++
 ports/esp32/network_common.c | 10 ++++++++
 ports/esp32/network_lan.c    |  4 ++++
 ports/esp32/network_ppp.c    | 45 ++++++++++++++++++++++++++++++++++++
 ports/esp32/network_wlan.c   |  4 ++++
 6 files changed, 78 insertions(+)

diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 79bf9973ca95b..e57b80657f58f 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -57,6 +57,8 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_ifconfig_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(esp_network_config_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj);
 
+mp_obj_t esp_ifname(esp_netif_t *netif);
+
 NORETURN void esp_exceptions_helper(esp_err_t e);
 
 static inline void esp_exceptions(esp_err_t e) {
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index e5a370641f599..fe76b5f7601c2 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -396,6 +396,18 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
             break;
         }
 
+        case SO_BINDTODEVICE: {
+            size_t len;
+            const char *val = mp_obj_str_get_data(args[3], &len);
+            char ifname[NETIF_NAMESIZE] = {0};
+            memcpy(&ifname, val, len);
+            int ret = lwip_setsockopt(self->fd, SOL_SOCKET, opt, &ifname, NETIF_NAMESIZE);
+            if (ret != 0) {
+                mp_raise_OSError(errno);
+            }
+            break;
+        }
+
             #if MICROPY_PY_SOCKET_EVENTS
         // level: SOL_SOCKET
         // special "register callback" option
@@ -860,6 +872,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SOL_SOCKET), MP_ROM_INT(SOL_SOCKET) },
     { MP_ROM_QSTR(MP_QSTR_SO_REUSEADDR), MP_ROM_INT(SO_REUSEADDR) },
     { MP_ROM_QSTR(MP_QSTR_SO_BROADCAST), MP_ROM_INT(SO_BROADCAST) },
+    { MP_ROM_QSTR(MP_QSTR_SO_BINDTODEVICE), MP_ROM_INT(SO_BINDTODEVICE) },
     { MP_ROM_QSTR(MP_QSTR_IP_ADD_MEMBERSHIP), MP_ROM_INT(IP_ADD_MEMBERSHIP) },
 };
 
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index 082943e2aecc4..ca07f3c06ba18 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -41,6 +41,7 @@
 #include "esp_log.h"
 #include "esp_netif.h"
 #include "esp_wifi.h"
+#include "lwip/sockets.h"
 // #include "lwip/dns.h"
 
 NORETURN void esp_exceptions_helper(esp_err_t e) {
@@ -153,6 +154,15 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_ifconfig_obj, 1, 2, esp_ifconfig);
 
+mp_obj_t esp_ifname(esp_netif_t *netif) {
+    char ifname[NETIF_NAMESIZE + 1] = {0};
+    mp_obj_t ret = mp_const_none;
+    if (esp_netif_get_netif_impl_name(netif, ifname) == ESP_OK && ifname[0] != 0) {
+        ret = mp_obj_new_str((char *)ifname, strlen(ifname));
+    }
+    return ret;
+}
+
 STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
     return mp_const_none;
 }
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index fe3ff6f772a8a..8557700446f40 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -393,6 +393,10 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             esp_eth_ioctl(self->eth_handle, ETH_CMD_G_MAC_ADDR, mac);
             return mp_obj_new_bytes(mac, sizeof(mac));
         }
+        case MP_QSTR_ifname: {
+            val = esp_ifname(self->base.netif);
+            break;
+        }
         default:
             mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
     }
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index caad7eb48bfe5..8ab502426b4b1 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -266,11 +266,56 @@ STATIC mp_obj_t ppp_isconnected(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(ppp_isconnected_obj, ppp_isconnected);
 
+STATIC mp_obj_t ppp_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"));
+    }
+    ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (kwargs->used != 0) {
+        for (size_t i = 0; i < kwargs->alloc; i++) {
+            if (mp_map_slot_is_filled(kwargs, i)) {
+                switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    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 (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_ifname: {
+            if (self->pcb != NULL) {
+                struct netif *pppif = ppp_netif(self->pcb);
+                char ifname[NETIF_NAMESIZE + 1] = {0};
+                netif_index_to_name(netif_get_index(pppif), ifname);
+                if (ifname[0] != 0) {
+                    val = mp_obj_new_str((char *)ifname, strlen(ifname));
+                }
+            }
+            break;
+        }
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+    }
+
+    return val;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ppp_config_obj, 1, ppp_config);
+
 STATIC const mp_rom_map_elem_t ppp_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&ppp_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&ppp_connect_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&ppp_isconnected_obj) },
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&ppp_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&ppp_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&ppp_ifconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&ppp_delete_obj) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_NONE), MP_ROM_INT(PPPAUTHTYPE_NONE) },
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 8287731c31b89..58af9f3bc333f 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -622,6 +622,10 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             val = MP_OBJ_NEW_SMALL_INT(channel);
             break;
         }
+        case MP_QSTR_ifname: {
+            val = esp_ifname(self->netif);
+            break;
+        }
         case MP_QSTR_hostname:
         case MP_QSTR_dhcp_hostname: {
             // TODO: Deprecated. Use network.hostname() instead.

From f8bd6778c85322b33008d749ae4021cafa067044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 29 Jun 2023 14:55:34 +0200
Subject: [PATCH 0272/3129] esp32: Support JTAG console, free up UART.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CONFIG_USB_OTG_SUPPORTED is automatically set by the ESP-IDF when the chip
supports USB-OTG, which is the case for the ESP32-S2 and ESP32-S3.

When trying to use the JTAG console with these chips, it would not work
because our USB implementation will take over control over the USB port,
breaking the JTAG console in the process.

Thus, when the board is configured to use the JTAG console, we should not
enable our USB console support.

Additionally, this change also frees up UART0 when an USB-based console is
configured, since there's no reason to prevent (re)configuration of UART0
for other uses in that case.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_uart.c |  7 ++++++-
 ports/esp32/main.c         |  6 +++---
 ports/esp32/mphalport.c    |  6 +++---
 ports/esp32/uart.c         | 10 +++++++---
 ports/esp32/uart.h         |  6 +++++-
 ports/esp32/usb.c          |  4 ++--
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index e7b2b8376b7aa..541d7ccc55d2b 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -153,9 +153,11 @@ 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 MICROPY_HW_ENABLE_UART_REPL
         if (self->uart_num == MICROPY_HW_UART_REPL) {
             mp_raise_ValueError(MP_ERROR_TEXT("UART buffer size is fixed"));
         }
+        #endif
 
         if (args[ARG_txbuf].u_int >= 0) {
             self->txbuf = args[ARG_txbuf].u_int;
@@ -353,8 +355,11 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         #endif
     }
 
+    #if MICROPY_HW_ENABLE_UART_REPL
     // Only reset the driver if it's not the REPL UART.
-    if (uart_num != MICROPY_HW_UART_REPL) {
+    if (uart_num != MICROPY_HW_UART_REPL)
+    #endif
+    {
         // Remove any existing configuration
         uart_driver_delete(self->uart_num);
 
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index a6346b027a1a5..1420dd579c5db 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -89,10 +89,10 @@ 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_OTG_SUPPORTED
-    usb_init();
-    #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_init();
+    #elif CONFIG_USB_OTG_SUPPORTED
+    usb_init();
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
     uart_stdout_init();
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 63a674c24b620..d7003a1437454 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -111,10 +111,10 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }
-    #if CONFIG_USB_OTG_SUPPORTED
-    usb_tx_strn(str, len);
-    #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
+    #elif CONFIG_USB_OTG_SUPPORTED
+    usb_tx_strn(str, len);
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
     uart_stdout_tx_strn(str, len);
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index 358d434709951..fc69e279e33dd 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -26,14 +26,16 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-
-#include "hal/uart_hal.h"
 
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "uart.h"
 
+#if MICROPY_HW_ENABLE_UART_REPL
+
+#include <stdio.h>
+#include "hal/uart_hal.h"
+
 // Backwards compatibility for when MICROPY_HW_UART_REPL was a ESP-IDF UART
 // driver enum. Only UART_NUM_0 was supported with that version of the driver.
 #define UART_NUM_0 0
@@ -118,3 +120,5 @@ STATIC void IRAM_ATTR uart_irq_handler(void *arg) {
         }
     }
 }
+
+#endif // MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index 6410db24c9577..3d88eed8250fb 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -30,9 +30,11 @@
 
 // Whether to enable the REPL on a UART.
 #ifndef MICROPY_HW_ENABLE_UART_REPL
-#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
+#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
 #endif
 
+#if MICROPY_HW_ENABLE_UART_REPL
+
 #ifndef MICROPY_HW_UART_REPL
 #define MICROPY_HW_UART_REPL (0)
 #endif
@@ -44,4 +46,6 @@
 void uart_stdout_init(void);
 int uart_stdout_tx_strn(const char *str, size_t len);
 
+#endif // MICROPY_HW_ENABLE_UART_REPL
+
 #endif // MICROPY_INCLUDED_ESP32_UART_H
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index b9d99676d3c5c..2e417755c9abf 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "usb.h"
 
-#if CONFIG_USB_OTG_SUPPORTED
+#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
 
 #include "esp_timer.h"
 #ifndef NO_QSTR
@@ -97,4 +97,4 @@ void usb_tx_strn(const char *str, size_t len) {
     }
 }
 
-#endif // CONFIG_USB_OTG_SUPPORTED
+#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG

From 3cc3e4e032edd912dd3a55b8df65927e48217f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 23 Nov 2022 14:20:58 +0100
Subject: [PATCH 0273/3129] esp32/machine_uart: Release GIL for blocking reads.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we're reading from an UART with a non-zero timeout, we can release the
GIL so that other threads/tasks may run while we are sleeping waiting for
data to arrive.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_uart.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 541d7ccc55d2b..0b4f5890badbb 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -472,8 +472,17 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
         time_to_wait = pdMS_TO_TICKS(self->timeout);
     }
 
+    bool release_gil = time_to_wait > 0;
+    if (release_gil) {
+        MP_THREAD_GIL_EXIT();
+    }
+
     int bytes_read = uart_read_bytes(self->uart_num, buf_in, size, time_to_wait);
 
+    if (release_gil) {
+        MP_THREAD_GIL_ENTER();
+    }
+
     if (bytes_read <= 0) {
         *errcode = MP_EAGAIN;
         return MP_STREAM_ERROR;

From f52a2cd55afb3f487801aaa62e15328134eb73a4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Aug 2023 15:08:50 +1000
Subject: [PATCH 0274/3129] samd/modules/_boot.py: Add /lib to sys.path.

Needed for mip to find a default location to install to.

Like esp32, samd uses "/" as the mount point for the flash. Make _boot.py
add the entry after successfully mounting.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/samd/modules/_boot.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py
index 1ff51de598815..93522e2ea32b4 100644
--- a/ports/samd/modules/_boot.py
+++ b/ports/samd/modules/_boot.py
@@ -1,6 +1,7 @@
 import gc
 import os
 import samd
+import sys
 
 bdev = samd.Flash()
 
@@ -13,7 +14,8 @@
     fs_type.mkfs(bdev, progsize=256)
     vfs = fs_type(bdev, progsize=256)
 os.mount(vfs, "/")
+sys.path.append("/lib")
 
-del vfs, fs_type, bdev, os, samd
+del vfs, fs_type, bdev, os, samd, sys
 gc.collect()
 del gc

From 607548f32d98d955775bc02d4fc2b33a79e860ee Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 29 May 2023 16:56:38 +1000
Subject: [PATCH 0275/3129] examples/natmod: Add features4 as a class
 definition example.

Also provide a basic README.md for dynamic native modules.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/README.md             | 74 +++++++++++++++++++++++++++
 examples/natmod/features4/Makefile    | 14 +++++
 examples/natmod/features4/features4.c | 73 ++++++++++++++++++++++++++
 tools/ci.sh                           |  1 +
 4 files changed, 162 insertions(+)
 create mode 100644 examples/natmod/README.md
 create mode 100644 examples/natmod/features4/Makefile
 create mode 100644 examples/natmod/features4/features4.c

diff --git a/examples/natmod/README.md b/examples/natmod/README.md
new file mode 100644
index 0000000000000..0cc4010ef42f3
--- /dev/null
+++ b/examples/natmod/README.md
@@ -0,0 +1,74 @@
+# Dynamic Native Modules
+
+Dynamic Native Modules are .mpy files that contain native machine code from a
+language other than Python. For more info see [the documentation]
+(https://docs.micropython.org/en/latest/develop/natmod.html).
+
+This should not be confused with [User C Modules]
+(https://docs.micropython.org/en/latest/develop/cmodules.html) which are a
+mechanism to add additional out-of-tree modules into the firmware build.
+
+## Examples
+
+This directory contains several examples of writing dynamic native modules, in
+two main categories:
+
+1.  Feature examples.
+
+    * `features0` - A module containing a single "factorial" function which
+      demonstrates working with integers.
+
+    * `features1` - A module that demonstrates some common tasks:
+        - defining simple functions exposed to Python
+        - defining local, helper C functions
+        - defining constant integers and strings exposed to Python
+        - getting and creating integer objects
+        - creating Python lists
+        - raising exceptions
+        - allocating memory
+        - BSS and constant data (rodata)
+        - relocated pointers in rodata
+
+    * `features2` - This is a hybrid module containing both Python and C code,
+      and additionally the C code is spread over multiple files. It also
+      demonstrates using floating point (only when the target supports
+      hardware floating point).
+
+    * `features3` - A module that shows how to use types, constant objects,
+      and creating dictionary instances.
+
+    * `features4` - A module that demonstrates how to define a class.
+
+2.  Dynamic version of existing built-ins.
+
+    This provides a way to add missing functionality to firmware that doesn't
+    include certain built-in modules. See the `heapq`, `random`, `re`,
+    `deflate`, `btree`, and `framebuf` directories.
+
+    So for example, if your firmware was compiled with `MICROPY_PY_FRAMEBUF`
+    disabled (e.g. to save flash space), then it would not include the
+    `framebuf` module. The `framebuf` native module provides a way to add the
+    `framebuf` module dynamically.
+
+    The way these work is they define a dynamic native module which
+    `#include`'s the original module and then does the necessary
+    initialisation of the module's globals dict.
+
+## Build instructions
+
+To compile an example, you need to have the same toolchain available as
+required for your target port. e.g. `arm-none-eabi-gcc` for any ARM Cortex M
+target. See the port instructions for details.
+
+You also need to have the `pyelftools` Python package available, either via
+your system package manager or installed from PyPI in a virtual environment
+with `pip`.
+
+Each example provides a Makefile. You should specify the `ARCH` argument to
+make (one of x86, x64, armv6m, armv7m, xtensa, xtensawin):
+
+```
+$ cd features0
+$ make ARCH=armv7m
+$ mpremote cp features0.mpy :
+```
diff --git a/examples/natmod/features4/Makefile b/examples/natmod/features4/Makefile
new file mode 100644
index 0000000000000..f76a31a7cc141
--- /dev/null
+++ b/examples/natmod/features4/Makefile
@@ -0,0 +1,14 @@
+# Location of top-level MicroPython directory
+MPY_DIR = ../../..
+
+# Name of module
+MOD = features4
+
+# Source files (.c or .py)
+SRC = features4.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/features4/features4.c b/examples/natmod/features4/features4.c
new file mode 100644
index 0000000000000..336f4ecf64080
--- /dev/null
+++ b/examples/natmod/features4/features4.c
@@ -0,0 +1,73 @@
+/*
+  This example extends on features0 but demonstrates how to define a class.
+
+  The Factorial class constructor takes an integer, and then the calculate
+  method can be called to get the factorial.
+
+  >>> import features4
+  >>> f = features4.Factorial(4)
+  >>> f.calculate()
+  24
+*/
+
+// Include the header file to get access to the MicroPython API
+#include "py/dynruntime.h"
+
+// This is type(Factorial)
+mp_obj_full_type_t mp_type_factorial;
+
+// This is the internal state of a Factorial instance.
+typedef struct {
+    mp_obj_base_t base;
+    mp_int_t n;
+} mp_obj_factorial_t;
+
+// Essentially Factorial.__new__ (but also kind of __init__).
+// Takes a single argument (the number to find the factorial of)
+STATIC mp_obj_t factorial_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, 1, 1, false);
+
+    mp_obj_factorial_t *o = mp_obj_malloc(mp_obj_factorial_t, type);
+    o->n = mp_obj_get_int(args_in[0]);
+
+    return MP_OBJ_FROM_PTR(o);
+}
+
+STATIC mp_int_t factorial_helper(mp_int_t x) {
+    if (x == 0) {
+        return 1;
+    }
+    return x * factorial_helper(x - 1);
+}
+
+// Implements Factorial.calculate()
+STATIC mp_obj_t factorial_calculate(mp_obj_t self_in) {
+    mp_obj_factorial_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int(factorial_helper(self->n));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(factorial_calculate_obj, factorial_calculate);
+
+// Locals dict for the Factorial type (will have a single method, calculate,
+// added in mpy_init).
+mp_map_elem_t factorial_locals_dict_table[1];
+STATIC MP_DEFINE_CONST_DICT(factorial_locals_dict, factorial_locals_dict_table);
+
+// 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
+
+    // Initialise the type.
+    mp_type_factorial.base.type = (void*)&mp_type_type;
+    mp_type_factorial.flags = MP_TYPE_FLAG_NONE;
+    mp_type_factorial.name = MP_QSTR_Factorial;
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, make_new, factorial_make_new, 0);
+    factorial_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_calculate), MP_OBJ_FROM_PTR(&factorial_calculate_obj) };
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, locals_dict, (void*)&factorial_locals_dict, 1);
+
+    // Make the Factorial type available on the module.
+    mp_store_global(MP_QSTR_Factorial, MP_OBJ_FROM_PTR(&mp_type_factorial));
+
+    // This must be last, it restores the globals dict
+    MP_DYNRUNTIME_INIT_EXIT
+}
diff --git a/tools/ci.sh b/tools/ci.sh
index 33dc58d6b8e1f..5ce742b01bed8 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -425,6 +425,7 @@ function ci_native_mpy_modules_build {
     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/features4 ARCH=$arch
     make -C examples/natmod/btree ARCH=$arch
     make -C examples/natmod/deflate ARCH=$arch
     make -C examples/natmod/framebuf ARCH=$arch

From 6aa404ca53e3ebd1f234a8d62259a1e660a4132c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 2 Sep 2023 00:37:45 +1000
Subject: [PATCH 0276/3129] tools/metrics.py: Fix nrf and rp2 board names after
 renaming.

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

diff --git a/tools/metrics.py b/tools/metrics.py
index 13161e9b9a051..95156e3012d00 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -68,8 +68,8 @@ def __init__(self, name, dir, output, make_flags=None):
     "3": PortData("esp32", "esp32", "build-GENERIC/micropython.elf"),
     "x": PortData("mimxrt", "mimxrt", "build-TEENSY40/firmware.elf"),
     "e": PortData("renesas-ra", "renesas-ra", "build-EK_RA6M2/firmware.elf"),
-    "r": PortData("nrf", "nrf", "build-pca10040/firmware.elf"),
-    "p": PortData("rp2", "rp2", "build-PICO/firmware.elf"),
+    "r": PortData("nrf", "nrf", "build-PCA10040/firmware.elf"),
+    "p": PortData("rp2", "rp2", "build-RPI_PICO/firmware.elf"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),
 }
 

From 9f1576f2ade989d10c9504450f69779d48f9674c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 17 Jun 2023 16:07:58 +0200
Subject: [PATCH 0277/3129] rp2/machine_timer: Fix printing of timer period.

Showing the period alway as microsecond quantities, since tick_hz is
assumed as 1_000_000 if the period is given by freq=xxx.  If the period is
larger than 0xffffffff, the value is divided by 1000 and "000" is appended
in the display.  That works for periods up to about 50 days.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/rp2/machine_timer.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index e4fbb03af437c..f0df541e6bde8 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -57,7 +57,12 @@ STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
 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);
+    mp_printf(print, "Timer(mode=%q, tick_hz=1000000, period=", mode);
+    if (self->delta_us <= 0xffffffff) {
+        mp_printf(print, "%u)", (uint32_t)self->delta_us);
+    } else {
+        mp_printf(print, "%u000)", (uint32_t)(self->delta_us / 1000));
+    }
 }
 
 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) {

From 6ec2e8f6437017d72ea1b777aa3941ec7fbaee96 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Thu, 3 Aug 2023 20:23:50 +1000
Subject: [PATCH 0278/3129] esp32/boards: Add pins.csv to UM boards and other
 minor changes.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_FEATHERS2/pins.csv        | 12 ++++++++++++
 ports/esp32/boards/UM_FEATHERS2/sdkconfig.board |  2 ++
 ports/esp32/boards/UM_FEATHERS2NEO/pins.csv     | 14 ++++++++++++++
 ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h |  3 +++
 ports/esp32/boards/UM_FEATHERS3/pins.csv        | 15 +++++++++++++++
 ports/esp32/boards/UM_FEATHERS3/sdkconfig.board |  1 +
 ports/esp32/boards/UM_PROS3/pins.csv            | 12 ++++++++++++
 ports/esp32/boards/UM_PROS3/sdkconfig.board     |  1 +
 ports/esp32/boards/UM_TINYPICO/pins.csv         | 12 ++++++++++++
 ports/esp32/boards/UM_TINYS2/pins.csv           | 12 ++++++++++++
 ports/esp32/boards/UM_TINYS3/pins.csv           | 12 ++++++++++++
 ports/esp32/boards/UM_TINYS3/sdkconfig.board    |  1 +
 12 files changed, 97 insertions(+)
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/pins.csv
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/pins.csv
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/pins.csv
 create mode 100644 ports/esp32/boards/UM_PROS3/pins.csv
 create mode 100644 ports/esp32/boards/UM_TINYPICO/pins.csv
 create mode 100644 ports/esp32/boards/UM_TINYS2/pins.csv
 create mode 100644 ports/esp32/boards/UM_TINYS3/pins.csv

diff --git a/ports/esp32/boards/UM_FEATHERS2/pins.csv b/ports/esp32/boards/UM_FEATHERS2/pins.csv
new file mode 100644
index 0000000000000..edb7273f325bf
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/pins.csv
@@ -0,0 +1,12 @@
+AMB_LIGHT,GPIO4
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+LDO2_PWR,GPIO21
+LED_BLUE,GPIO13
+RGB_DATA,GPIO40
+RGB_CLK,GPIO45
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+UART0_TX,GPIO43
+UART0_RX,GPIO44
diff --git a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
index b23755dea7895..c2e1c2b3d3b7c 100644
--- a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
@@ -2,6 +2,8 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
+CONFIG_SPIRAM_MEMTEST=
+
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/pins.csv b/ports/esp32/boards/UM_FEATHERS2NEO/pins.csv
new file mode 100644
index 0000000000000..48e933dc95a93
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/pins.csv
@@ -0,0 +1,14 @@
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+LED_BLUE,GPIO13
+RGB_DATA,GPIO40
+RGB_PWR,GPIO39
+RGB_MATRIX_DATA,GPIO21
+RGB_MATRIX_DATA,GPIO4
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+UART0_TX,GPIO43
+UART0_RX,GPIO44
+VBAT_SENSE,GPIO2
+VBUS_SENSE,GPIO34
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
index 91ea5056d17b7..488a5884429a7 100644
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
@@ -7,6 +7,9 @@
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
+#define MICROPY_HW_I2C1_SCL                 (15)
+#define MICROPY_HW_I2C1_SDA                 (16)
+
 #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/pins.csv b/ports/esp32/boards/UM_FEATHERS3/pins.csv
new file mode 100644
index 0000000000000..83f889fb2ae55
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/pins.csv
@@ -0,0 +1,15 @@
+AMB_LIGHT,GPIO4
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+I2C_SCL2,GPIO15
+I2C_SDA2,GPIO16
+LDO2_PWR,GPIO39
+LED_BLUE,GPIO13
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+RGB_DATA,GPIO40
+UART0_TX,GPIO43
+UART0_RX,GPIO44
+VBAT_SENSE,GPIO2
+VBUS_SENSE,GPIO34
diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
index 804944ab24bec..3c8df5e2a857b 100644
--- a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -5,6 +5,7 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_SPIRAM_MEMTEST=
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
 
diff --git a/ports/esp32/boards/UM_PROS3/pins.csv b/ports/esp32/boards/UM_PROS3/pins.csv
new file mode 100644
index 0000000000000..c0d4149d75d45
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/pins.csv
@@ -0,0 +1,12 @@
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+VBAT_SENSE,GPIO10
+LDO2_PWR,GPIO17
+RGB_DATA,GPIO18
+VBUS_SENSE,GPIO33
+SPI_SS,GPIO34
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+UART0_TX,GPIO43
+UART0_RX,GPIO44
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
index 71511e3c52983..5d1ac0f684177 100644
--- a/ports/esp32/boards/UM_PROS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -5,6 +5,7 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_SPIRAM_MEMTEST=
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
 
diff --git a/ports/esp32/boards/UM_TINYPICO/pins.csv b/ports/esp32/boards/UM_TINYPICO/pins.csv
new file mode 100644
index 0000000000000..a8ab074cce951
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYPICO/pins.csv
@@ -0,0 +1,12 @@
+I2C_SCL,GPIO22
+I2C_SDA,GPIO21
+RGB_DATA,GPIO2
+RGB_CLK,GPIO12
+RGB_PWR,GPIO13
+SPI_SS,GPIO5
+SPI_MOSI,GPIO23
+SPI_SCK,GPIO18
+SPI_MISO,GPIO19
+VBAT_SENSE,GPIO35
+VBAT_CHRG,GPIO34
+VBUS_SENSE,GPIO9
diff --git a/ports/esp32/boards/UM_TINYS2/pins.csv b/ports/esp32/boards/UM_TINYS2/pins.csv
new file mode 100644
index 0000000000000..1ef7b2ecc8981
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/pins.csv
@@ -0,0 +1,12 @@
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+RGB_DATA,GPIO1
+RGB_PWR,GPIO2
+SPI_SS,GPIO14
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+UART0_TX,GPIO43
+UART0_RX,GPIO44
+VBAT_SENSE,GPIO3
+VBUS_SENSE,GPIO21
diff --git a/ports/esp32/boards/UM_TINYS3/pins.csv b/ports/esp32/boards/UM_TINYS3/pins.csv
new file mode 100644
index 0000000000000..1fad949a44214
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/pins.csv
@@ -0,0 +1,12 @@
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+RGB_DATA,GPIO18
+RGB_PWR,GPIO19
+SPI_SS,GPIO34
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+UART0_TX,GPIO43
+UART0_RX,GPIO44
+VBAT_SENSE,GPIO10
+VBUS_SENSE,GPIO33
diff --git a/ports/esp32/boards/UM_TINYS3/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
index c22e78eaeae7c..7b913a565f96d 100644
--- a/ports/esp32/boards/UM_TINYS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -5,6 +5,7 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_SPIRAM_MEMTEST=
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
 

From 6bd1404225a53bd85b75480146f6fbd1fd438ab9 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Thu, 3 Aug 2023 20:21:51 +1000
Subject: [PATCH 0279/3129] esp32/boards/UM_NANOS3: Add new UM NanoS3 board.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_NANOS3/board.json       | 25 +++++++++
 ports/esp32/boards/UM_NANOS3/board.md         |  1 +
 ports/esp32/boards/UM_NANOS3/deploy.md        | 52 +++++++++++++++++++
 ports/esp32/boards/UM_NANOS3/manifest.py      |  2 +
 .../esp32/boards/UM_NANOS3/modules/nanos3.py  | 46 ++++++++++++++++
 .../boards/UM_NANOS3/mpconfigboard.cmake      | 12 +++++
 ports/esp32/boards/UM_NANOS3/mpconfigboard.h  | 12 +++++
 ports/esp32/boards/UM_NANOS3/pins.csv         | 10 ++++
 ports/esp32/boards/UM_NANOS3/sdkconfig.board  | 19 +++++++
 9 files changed, 179 insertions(+)
 create mode 100644 ports/esp32/boards/UM_NANOS3/board.json
 create mode 100644 ports/esp32/boards/UM_NANOS3/board.md
 create mode 100644 ports/esp32/boards/UM_NANOS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_NANOS3/manifest.py
 create mode 100644 ports/esp32/boards/UM_NANOS3/modules/nanos3.py
 create mode 100644 ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_NANOS3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_NANOS3/pins.csv
 create mode 100644 ports/esp32/boards/UM_NANOS3/sdkconfig.board

diff --git a/ports/esp32/boards/UM_NANOS3/board.json b/ports/esp32/boards/UM_NANOS3/board.json
new file mode 100644
index 0000000000000..2eb40ac3c9efb
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "RGB LED",
+        "SPIRAM",
+        "WiFi",
+        "BLE"
+    ],
+    "features_non_filterable": [
+        "TinyPICO Nano Compatible"
+    ],
+    "id": "nanos3",
+    "images": [
+        "unexpectedmaker_nanos3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "NanoS3",
+    "thumbnail": "",
+    "url": "https://nanos3.io",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_NANOS3/board.md b/ports/esp32/boards/UM_NANOS3/board.md
new file mode 100644
index 0000000000000..9cb5310f6342b
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/board.md
@@ -0,0 +1 @@
+The following files are firmware for the NanoS3.
diff --git a/ports/esp32/boards/UM_NANOS3/deploy.md b/ports/esp32/boards/UM_NANOS3/deploy.md
new file mode 100644
index 0000000000000..725cff4946804
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/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 NanoS3, 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 `nanos3-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 nanos3-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 nanos3-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 nanos3-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_NANOS3/manifest.py b/ports/esp32/boards/UM_NANOS3/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_NANOS3/modules/nanos3.py b/ports/esp32/boards/UM_NANOS3/modules/nanos3.py
new file mode 100644
index 0000000000000..b3d57f121a0b8
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/modules/nanos3.py
@@ -0,0 +1,46 @@
+# NanoS3 Helper Library
+# MIT license; Copyright (c) 2023 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://nanos3.io
+
+# Import required libraries
+from micropython import const
+from machine import Pin, ADC
+import time
+
+# TinyS3 Hardware Pin Assignments
+
+# RGB LED Pins
+RGB_DATA = const(41)
+RGB_PWR = const(42)
+
+# 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)
+
+
+# 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_NANOS3/mpconfigboard.cmake b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..6c7f34009e432
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/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_NANOS3/mpconfigboard.h b/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
new file mode 100644
index 0000000000000..1c2782bfb75b2
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME               "NanoS3"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S3-FN8"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "NanoS3"
+
+#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_NANOS3/pins.csv b/ports/esp32/boards/UM_NANOS3/pins.csv
new file mode 100644
index 0000000000000..44880f82bafde
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/pins.csv
@@ -0,0 +1,10 @@
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+SPI_SS,GPIO34
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+RGB_DATA,GPIO41
+RGB_PWR,GPIO42
+UART0_TX,GPIO43
+UART0_RX,GPIO44
diff --git a/ports/esp32/boards/UM_NANOS3/sdkconfig.board b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
new file mode 100644
index 0000000000000..969bbc5be7fe4
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
@@ -0,0 +1,19 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="UMNanoS3"
+
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x817A
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="NanoS3"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_ns3_"

From c0d4c604e6a140c0f2967e1b43fd94d0b029c73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 15 Aug 2023 11:34:23 +0200
Subject: [PATCH 0280/3129] esp32/network_ppp: Block after deleting task.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When calling ppp.active(False) we could get a crash due to immediately
returning after asking FreeRTOS to delete the current task.

This commit adds a simple blocking loop, the same as used in all other
places where we call vTaskDelete(NULL).

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/network_ppp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 8ab502426b4b1..ea0dd1706e08a 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -114,6 +114,8 @@ static void pppos_client_task(void *self_in) {
 
     self->client_task_handle = NULL;
     vTaskDelete(NULL);
+    for (;;) {
+    }
 }
 
 STATIC mp_obj_t ppp_active(size_t n_args, const mp_obj_t *args) {

From ffb43b2dd37f10f48612d369b5cad9731c2a0597 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 3 Aug 2023 15:20:30 -0500
Subject: [PATCH 0281/3129] py/modthread: Return thread id from
 start_new_thread().

In CPython, `_thread.start_new_thread()` returns an ID that is the same ID
that is returned by `_thread.get_ident()`.  The current MicroPython
implementation of `_thread.start_new_thread()` always returns `None`.

This modifies the required functions to return a value. The native thread
id is returned since this can be used for interop with other functions, for
example, `pthread_kill()` on *nix. `_thread.get_ident()` is also modified
to return the native thread id so that the values match and avoids the need
for a separate `native_id` attribute.

Fixes issue #12153.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/cc3200/mpthreadport.c     |  9 ++++++++-
 ports/esp32/mpthreadport.c      | 12 +++++++++---
 ports/renesas-ra/mpthreadport.c |  8 +++++++-
 ports/rp2/mpthreadport.c        | 10 +++++++++-
 ports/stm32/mpthreadport.c      |  8 +++++++-
 ports/unix/mpthreadport.c       |  9 +++++++--
 py/modthread.c                  |  6 ++----
 py/mpthread.h                   |  3 ++-
 tests/thread/thread_ident1.py   |  9 +++++++--
 9 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/ports/cc3200/mpthreadport.c b/ports/cc3200/mpthreadport.c
index 4b6f27d578066..5b4771f3956fd 100644
--- a/ports/cc3200/mpthreadport.c
+++ b/ports/cc3200/mpthreadport.c
@@ -89,6 +89,10 @@ void mp_thread_set_state(mp_state_thread_t *state) {
     vTaskSetThreadLocalStoragePointer(NULL, 0, state);
 }
 
+mp_uint_t mp_thread_get_id(void) {
+    return (mp_uint_t)xTaskGetCurrentTaskHandle();
+}
+
 void mp_thread_start(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
     for (mp_thread_t *th = thread; th != NULL; th = th->next) {
@@ -111,7 +115,7 @@ STATIC void freertos_entry(void *arg) {
     }
 }
 
-void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
     // store thread entry function into a global variable so we can access it
     ext_thread_entry = entry;
 
@@ -148,6 +152,9 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 
     // adjust stack_size to provide room to recover from hitting the limit
     *stack_size -= 512;
+
+    MP_STATIC_ASSERT(sizeof(mp_uint_t) >= sizeof(TaskHandle_t));
+    return (mp_uint_t)id;
 }
 
 void mp_thread_finish(void) {
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index e6c7e9bc80eb2..74dbc14797432 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -98,6 +98,10 @@ void mp_thread_set_state(mp_state_thread_t *state) {
     vTaskSetThreadLocalStoragePointer(NULL, 1, state);
 }
 
+mp_uint_t mp_thread_get_id(void) {
+    return (mp_uint_t)xTaskGetCurrentTaskHandle();
+}
+
 void mp_thread_start(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
     for (mp_thread_t *th = thread; th != NULL; th = th->next) {
@@ -120,7 +124,7 @@ STATIC void freertos_entry(void *arg) {
     }
 }
 
-void mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size, int priority, char *name) {
+mp_uint_t mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size, int priority, char *name) {
     // store thread entry function into a global variable so we can access it
     ext_thread_entry = entry;
 
@@ -154,10 +158,12 @@ void mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size,
     *stack_size -= 1024;
 
     mp_thread_mutex_unlock(&thread_mutex);
+
+    return (mp_uint_t)th->id;
 }
 
-void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
-    mp_thread_create_ex(entry, arg, stack_size, MP_THREAD_PRIORITY, "mp_thread");
+mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+    return mp_thread_create_ex(entry, arg, stack_size, MP_THREAD_PRIORITY, "mp_thread");
 }
 
 void mp_thread_finish(void) {
diff --git a/ports/renesas-ra/mpthreadport.c b/ports/renesas-ra/mpthreadport.c
index ecdb2684684c4..a7d85cfe32987 100644
--- a/ports/renesas-ra/mpthreadport.c
+++ b/ports/renesas-ra/mpthreadport.c
@@ -54,7 +54,11 @@ void mp_thread_gc_others(void) {
     mp_thread_mutex_unlock(&thread_mutex);
 }
 
-void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+mp_uint_t mp_thread_get_id(void) {
+    return (uint32_t)pyb_thread_cur;
+}
+
+mp_uint_t 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) {
@@ -82,6 +86,8 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 
     // adjust stack_size to provide room to recover from hitting the limit
     *stack_size -= 1024;
+
+    return id;
 }
 
 void mp_thread_start(void) {
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 33dc698305bac..ed9e338da71d7 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -116,7 +116,13 @@ STATIC void core1_entry_wrapper(void) {
     // returning from here will loop the core forever (WFI)
 }
 
-void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+mp_uint_t mp_thread_get_id(void) {
+    // On RP2, there are only two threads, one for each core, so the thread id
+    // is the core number.
+    return get_core_num();
+}
+
+mp_uint_t 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"));
@@ -144,6 +150,8 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 
     // Adjust stack_size to provide room to recover from hitting the limit.
     *stack_size -= 512;
+
+    return 1;
 }
 
 void mp_thread_start(void) {
diff --git a/ports/stm32/mpthreadport.c b/ports/stm32/mpthreadport.c
index ecdb2684684c4..a7d85cfe32987 100644
--- a/ports/stm32/mpthreadport.c
+++ b/ports/stm32/mpthreadport.c
@@ -54,7 +54,11 @@ void mp_thread_gc_others(void) {
     mp_thread_mutex_unlock(&thread_mutex);
 }
 
-void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+mp_uint_t mp_thread_get_id(void) {
+    return (uint32_t)pyb_thread_cur;
+}
+
+mp_uint_t 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) {
@@ -82,6 +86,8 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 
     // adjust stack_size to provide room to recover from hitting the limit
     *stack_size -= 1024;
+
+    return id;
 }
 
 void mp_thread_start(void) {
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 6a267e723635c..2190bf4ad1ba3 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -191,6 +191,10 @@ void mp_thread_set_state(mp_state_thread_t *state) {
     pthread_setspecific(tls_key, state);
 }
 
+mp_uint_t mp_thread_get_id(void) {
+    return (mp_uint_t)pthread_self();
+}
+
 void mp_thread_start(void) {
     // enable realtime priority if `-X realtime` command line parameter was set
     #if defined(__APPLE__)
@@ -210,7 +214,7 @@ void mp_thread_start(void) {
     mp_thread_unix_end_atomic_section();
 }
 
-void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+mp_uint_t 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 * sizeof(void *);
@@ -265,7 +269,8 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 
     mp_thread_unix_end_atomic_section();
 
-    return;
+    MP_STATIC_ASSERT(sizeof(mp_uint_t) >= sizeof(pthread_t));
+    return (mp_uint_t)id;
 
 er:
     mp_raise_OSError(ret);
diff --git a/py/modthread.c b/py/modthread.c
index 51d63e4703720..6b75474904f40 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -129,7 +129,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 STATIC size_t thread_stack_size = 0;
 
 STATIC mp_obj_t mod_thread_get_ident(void) {
-    return mp_obj_new_int_from_uint((uintptr_t)mp_thread_get_state());
+    return mp_obj_new_int_from_uint(mp_thread_get_id());
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_get_ident_obj, mod_thread_get_ident);
 
@@ -268,9 +268,7 @@ STATIC mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args)
     th_args->fun = args[0];
 
     // spawn the thread!
-    mp_thread_create(thread_entry, th_args, &th_args->stack_size);
-
-    return mp_const_none;
+    return mp_obj_new_int_from_uint(mp_thread_create(thread_entry, th_args, &th_args->stack_size));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_thread_start_new_thread_obj, 2, 3, mod_thread_start_new_thread);
 
diff --git a/py/mpthread.h b/py/mpthread.h
index e611ef4c1197e..f335cc02911fc 100644
--- a/py/mpthread.h
+++ b/py/mpthread.h
@@ -40,7 +40,8 @@ struct _mp_state_thread_t;
 
 struct _mp_state_thread_t *mp_thread_get_state(void);
 void mp_thread_set_state(struct _mp_state_thread_t *state);
-void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size);
+mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size);
+mp_uint_t mp_thread_get_id(void);
 void mp_thread_start(void);
 void mp_thread_finish(void);
 void mp_thread_mutex_init(mp_thread_mutex_t *mutex);
diff --git a/tests/thread/thread_ident1.py b/tests/thread/thread_ident1.py
index 390193accc1ee..8e106cd317f4e 100644
--- a/tests/thread/thread_ident1.py
+++ b/tests/thread/thread_ident1.py
@@ -5,7 +5,11 @@
 import _thread
 
 
+tid = None
+
+
 def thread_entry():
+    global tid
     tid = _thread.get_ident()
     print("thread", type(tid) == int, tid != 0, tid != tid_main)
     global finished
@@ -16,8 +20,9 @@ def thread_entry():
 print("main", type(tid_main) == int, tid_main != 0)
 
 finished = False
-_thread.start_new_thread(thread_entry, ())
+new_tid = _thread.start_new_thread(thread_entry, ())
 
 while not finished:
     pass
-print("done")
+
+print("done", type(new_tid) == int, new_tid == tid)

From 1b03518e379208d4ee37362ee68ec6696c366efa Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko-dev|mpy@nanl.de>
Date: Tue, 1 Aug 2023 09:53:14 +0000
Subject: [PATCH 0282/3129] extmod/modssl_mbedtls: Call func psa_crypto_init if
 PSA is used.

Whenever the PSA interface is used (if MBEDTLS_PSA_CRYPTO is defined),
psa_crypto_init() needs to be called to initialise the global PSA data
struct, before any PSA related operations.

TLSv1.3 depends on the PSA interface, TLSv1.2 only uses the PSA stack if
MBEDTLS_USE_PSA_CRYPTO is defined.

Without psa_crypto_init() every PSA related call will result in
-0x6C00/-27648 which translates to "SSL - Internal error (eg, unexpected
failure in lower-level module)".

The error is misleading, especially since mbedtls in its docs itself
advices "to return #PSA_ERROR_BAD_STATE or some other applicable error.".

Signed-off-by: Mirko Vogt <mirko-dev|mpy@nanl.de>
---
 extmod/modssl_mbedtls.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 445978e0c3c7c..98baf572e4ba1 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -168,6 +168,12 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     mbedtls_debug_set_threshold(3);
     #endif
 
+    // Whenever the PSA interface is used (if MBEDTLS_PSA_CRYPTO), psa_crypto_init() needs to be called before any TLS related operations.
+    // TLSv1.3 depends on the PSA interface, TLSv1.2 only uses the PSA stack if MBEDTLS_USE_PSA_CRYPTO is defined.
+    #if defined(MBEDTLS_SSL_PROTO_TLS1_3) || defined(MBEDTLS_USE_PSA_CRYPTO)
+    psa_crypto_init();
+    #endif
+
     const byte seed[] = "upy";
     int ret = mbedtls_ctr_drbg_seed(&self->ctr_drbg, mbedtls_entropy_func, &self->entropy, seed, sizeof(seed));
     if (ret != 0) {

From 65f0cb11afb92cc9c333158ea467667f2127c9a2 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko-dev|mpy@nanl.de>
Date: Tue, 1 Aug 2023 09:59:30 +0000
Subject: [PATCH 0283/3129] extmod/modssl_mbedtls: Ignore err
 ERR_SSL_RECEIVED_NEW_SESSION_TICKET.

It appears a new session ticket being issued by the server right after
completed handshake is not uncommon and shouldn't be treated as fatal.

mbedtls itself states "This error code is experimental and may be changed
or removed without notice."

Signed-off-by: Mirko Vogt <mirko-dev|mpy@nanl.de>
---
 extmod/modssl_mbedtls.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 98baf572e4ba1..449952594c2db 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -443,6 +443,14 @@ STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
         // renegotiation.
         ret = MP_EWOULDBLOCK;
         o->poll_mask = MP_STREAM_POLL_WR;
+    #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
+    } else if (ret == MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET) {
+        // It appears a new session ticket being issued by the server right after
+        // completed handshake is not uncommon and shouldn't be treated as fatal.
+        // mbedtls itself states "This error code is experimental and may be
+        // changed or removed without notice."
+        ret = MP_EWOULDBLOCK;
+    #endif
     } else {
         o->last_error = ret;
     }

From 545b94a8f50ee8a708d387563a4a400e11ba1aff Mon Sep 17 00:00:00 2001
From: David Yang <mmyangfl@gmail.com>
Date: Tue, 8 Aug 2023 05:35:58 +0800
Subject: [PATCH 0284/3129] unix/modjni: Fix build errors with type definitions
 and error strings.

- Superfluous comments in MP_DEFINE_CONST_OBJ_TYPE stop correct macro
  expanding.
- MP_ERROR_TEXT now gives mp_rom_error_text_t, but we want plain const
  char *.

Signed-off-by: David Yang <mmyangfl@gmail.com>
---
 ports/unix/modjni.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 10622f588f8aa..a1cfca81495f4 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -329,8 +329,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     unary_op, jobject_unary_op,
     attr, jobject_attr,
     subscr, jobject_subscr,
-    iter, subscr_getiter,
-    //    .locals_dict = &jobject_locals_dict,
+    iter, subscr_getiter
     );
 
 STATIC mp_obj_t new_jobject(jobject jo) {
@@ -574,9 +573,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_jmethod,
     MP_TYPE_FLAG_NONE,
     print, jmethod_print,
-    call, jmethod_call,
-    //    .attr = jobject_attr,
-    //    .locals_dict = &jobject_locals_dict,
+    call, jmethod_call
     );
 
 #ifdef __ANDROID__
@@ -615,26 +612,26 @@ STATIC void create_jvm(void) {
 
     jclass Object_class = JJ(FindClass, "java/lang/Object");
     Object_toString_mid = JJ(GetMethodID, Object_class, "toString",
-        MP_ERROR_TEXT("()Ljava/lang/String;"));
+        MP_COMPRESSED_ROM_TEXT("()Ljava/lang/String;"));
 
     Class_getName_mid = (*env)->GetMethodID(env, Class_class, "getName",
-        MP_ERROR_TEXT("()Ljava/lang/String;"));
+        MP_COMPRESSED_ROM_TEXT("()Ljava/lang/String;"));
     Class_getField_mid = (*env)->GetMethodID(env, Class_class, "getField",
-        MP_ERROR_TEXT("(Ljava/lang/String;)Ljava/lang/reflect/Field;"));
+        MP_COMPRESSED_ROM_TEXT("(Ljava/lang/String;)Ljava/lang/reflect/Field;"));
     Class_getMethods_mid = (*env)->GetMethodID(env, Class_class, "getMethods",
-        MP_ERROR_TEXT("()[Ljava/lang/reflect/Method;"));
+        MP_COMPRESSED_ROM_TEXT("()[Ljava/lang/reflect/Method;"));
     Class_getConstructors_mid = (*env)->GetMethodID(env, Class_class, "getConstructors",
-        MP_ERROR_TEXT("()[Ljava/lang/reflect/Constructor;"));
+        MP_COMPRESSED_ROM_TEXT("()[Ljava/lang/reflect/Constructor;"));
     Method_getName_mid = (*env)->GetMethodID(env, method_class, "getName",
-        MP_ERROR_TEXT("()Ljava/lang/String;"));
+        MP_COMPRESSED_ROM_TEXT("()Ljava/lang/String;"));
 
     List_class = JJ(FindClass, "java/util/List");
     List_get_mid = JJ(GetMethodID, List_class, "get",
-        MP_ERROR_TEXT("(I)Ljava/lang/Object;"));
+        MP_COMPRESSED_ROM_TEXT("(I)Ljava/lang/Object;"));
     List_set_mid = JJ(GetMethodID, List_class, "set",
-        MP_ERROR_TEXT("(ILjava/lang/Object;)Ljava/lang/Object;"));
+        MP_COMPRESSED_ROM_TEXT("(ILjava/lang/Object;)Ljava/lang/Object;"));
     List_size_mid = JJ(GetMethodID, List_class, "size",
-        MP_ERROR_TEXT("()I"));
+        MP_COMPRESSED_ROM_TEXT("()I"));
     IndexException_class = JJ(FindClass, "java/lang/IndexOutOfBoundsException");
 }
 

From 6e79b55dc86dd443d50fe2bbf5d03456c2ae54a0 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Sun, 3 Sep 2023 19:07:51 +0300
Subject: [PATCH 0285/3129] py/malloc: Fix DEBUG_print() args in
 m_realloc_maybe.

Signed-off-by: Ihor Nehrutsa <IhorNehrutsa@gmail.com>
---
 py/malloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/malloc.c b/py/malloc.c
index efdff75396980..ddf139e386053 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -185,7 +185,7 @@ void *m_realloc_maybe(void *ptr, size_t new_num_bytes, bool allow_move)
     #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
     DEBUG_printf("realloc %p, %d, %d : %p\n", ptr, old_num_bytes, new_num_bytes, new_ptr);
     #else
-    DEBUG_printf("realloc %p, %d, %d : %p\n", ptr, new_num_bytes, new_ptr);
+    DEBUG_printf("realloc %p, %d : %p\n", ptr, new_num_bytes, new_ptr);
     #endif
     return new_ptr;
 }

From bf35eefc625b35aa301aefbc743dcf1395829865 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Thu, 31 Aug 2023 13:16:17 +0200
Subject: [PATCH 0286/3129] esp32/boards/ARDUINO_NANO_ESP32: Clarify recovery
 instructions.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md b/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
index b600a55b64e2b..bb32ba755932a 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
@@ -4,5 +4,10 @@ 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 -d 0x2341:0x0070 -R -D build-ARDUINO_NANO_ESP32/micropython.bin
+dfu-util -d 0x2341:0x0070 -R -D build-ARDUINO_NANO_ESP32/micropython.app-bin
 ```
+
+Please note that the DFU bootloader comes factory flashed. Should you for any reason erase the
+entire flash, the DFU bootloader will have to be re-installed. Please follow the instructions
+[here](https://support.arduino.cc/hc/en-us/articles/9810414060188-Reset-the-Arduino-bootloader-on-the-Nano-ESP32)
+to do so.

From d00105494fda537b42a73843260920bba8eb1bb8 Mon Sep 17 00:00:00 2001
From: Francis Dela Cruz <rainyworlds1@outlook.com>
Date: Mon, 21 Aug 2023 12:32:20 +0930
Subject: [PATCH 0287/3129] docs/library/platform: Add docs for the platform
 library.

Signed-off-by: Francis Dela Cruz <rainyworlds1@outlook.com>
---
 docs/library/index.rst    |  1 +
 docs/library/platform.rst | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 docs/library/platform.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index ae5d3e7d71175..4a7f78ecf3184 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -71,6 +71,7 @@ library.
    json.rst
    math.rst
    os.rst
+   platform.rst
    random.rst
    re.rst
    select.rst
diff --git a/docs/library/platform.rst b/docs/library/platform.rst
new file mode 100644
index 0000000000000..c091477d84cb1
--- /dev/null
+++ b/docs/library/platform.rst
@@ -0,0 +1,38 @@
+:mod:`platform` -- access to underlying platform’s identifying data
+===================================================================
+
+.. module:: platform
+   :synopsis: access to underlying platform’s identifying data
+
+|see_cpython_module| :mod:`python:platform`.
+
+This module tries to retrieve as much platform-identifying data as possible. It
+makes this information available via function APIs.
+
+Functions
+---------
+
+.. function:: platform()
+
+   Returns a string identifying the underlying platform. This string is composed
+   of several substrings in the following order, delimited by dashes (``-``):
+
+   - the name of the platform system (e.g. Unix, Windows or MicroPython)
+   - the MicroPython version
+   - the architecture of the platform
+   - the version of the underlying platform
+   - the concatenation of the name of the libc that MicroPython is linked to
+     and its corresponding version.
+
+   For example, this could be
+   ``"MicroPython-1.20.0-xtensa-IDFv4.2.4-with-newlib3.0.0"``.
+
+.. function:: python_compiler()
+
+   Returns a string identifying the compiler used for compiling MicroPython.
+
+.. function:: libc_ver()
+
+   Returns a tuple of strings *(lib, version)*, where *lib* is the name of the
+   libc that MicroPython is linked to, and *version* the corresponding version
+   of this libc.

From 304f13a74ee5909321a67cf538d3a50d85de1e82 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 4 Sep 2023 12:50:59 +1000
Subject: [PATCH 0288/3129] docs/library/network: Clarify network.hostname()
 behaviour.

This must be called before the interface connects.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/network.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/library/network.rst b/docs/library/network.rst
index b13c84123ce7f..a14d6192ea061 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -171,8 +171,8 @@ The following are functions available in the network module.
 
 .. function:: hostname([name])
 
-    Get or set the hostname that will identify this device on the network. It is
-    applied to all interfaces.
+    Get or set the hostname that will identify this device on the network. It will
+    be used by all interfaces.
 
     This hostname is used for:
      * Sending to the DHCP server in the client request. (If using DHCP)
@@ -182,6 +182,12 @@ The following are functions available in the network module.
     If the function is called without parameters, it returns the current
     hostname.
 
+    A change in hostname is typically only applied during connection. For DHCP
+    this is because the hostname is part of the DHCP client request, and the
+    implementation of mDNS in most ports only initialises the hostname once
+    during connection. For this reason, you must set the hostname before
+    activating/connecting your network interfaces.
+
     The default hostname is typically the name of the board.
 
 .. function:: phy_mode([mode])

From 1a5bfa502471c07f44997d05e242aae93687dfe9 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Fri, 1 Sep 2023 18:50:17 +0300
Subject: [PATCH 0289/3129] docs/esp32/tutorial: Add example for pin access via
 registers.

Synchronous access to pins directly via registers.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 docs/esp32/tutorial/img/mem32_gpio_output.jpg | Bin 0 -> 204577 bytes
 docs/esp32/tutorial/peripheral_access.rst     |  80 ++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100755 docs/esp32/tutorial/img/mem32_gpio_output.jpg

diff --git a/docs/esp32/tutorial/img/mem32_gpio_output.jpg b/docs/esp32/tutorial/img/mem32_gpio_output.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..5544202871eb7f5ce19fa6c660d7cbdec83d3335
GIT binary patch
literal 204577
zcmeFa1$Y(7wy@nhdy|9^NN@|m-9pe{!6CT2ySoH;_uwAf-QC^YU4pw4$p5a++A|rR
zIm6t0&v))Q|J^;aczab<uc}&IT~*z?yApOK?2h4CvRFVd!(y=*CHT(>yBj}N(ZCi>
z4WmpMBb{Lwu0{+?G{cF#B*-I+hkf7TZ1MbUKb0khVI|(ee}*N25y{*)EX6Ddf7>r>
zNuz17X36r~u~jX;=6)<fyE?`EJ&jWm!xnDGFr1P`*iRN=KY4`x6u<3ToKpT~f5gxh
z_HfIxVJYqV*0P3S?TY=s+{!d*(WA>>q$ra;N!fOtoBTxz@v3+woMoCcZqcA}lU7Lz
zH)zwOV}m3G+qZAsqEUm+E!wqp6C=JpzFBko_~rJ=k|ay6-2CtBE5U!g#UC);?q#PN
z17`iU|6o`$^(My;OC7#%Icyl?48w&Wn~$%r&p4~y`%cft+3fpPW4t9ijm61o1lbHJ
z9ksB=3Uc}V3<bIBewbkdMgBdnAUAs%tX@ImOq<qhR3vD8g#Do3_k-=_$>QS^Y*9Pp
z7VKm{Tb}KMt@eF)pWsOLeQSyZPQT~7z#3uS_FEZ>EO7okoO-a$ENXZZD!@)0#O=?#
z{%2vNl?`85>cYm<z+%?IR?#mPja0o#EzETCPh%A)Bm8P{DkGuMe=A#SQQ1Zz(n?${
z_BuEd@TXUm^~Ud4mGwcytIEmpn_r$g{pP#aNg`fVk{R0{T4mUku<J%)!`0c@#W|9z
zi;GL-$gXbgv7)+1iQ*nVMof=bi4r9CPL#mQD@lq>sgoqjklf2FP0q9#e6nQAmMw8=
zzkIoT^JdDL%~y<AB1eww9>qOg)Tr@%lX@lf{V#7}dyMF=MxYUFwIns1qFb!dEnx?Y
z#5f}oy_9rRy3sIgk(^yzBfCW*!A9I`v09yM)<}_TbQ_l5(r|6jBgIIXrJ!@n3JqM6
zb%^ELfBan6<b~Gmja~8V>l9fVb{r7dEl%8c@e`y>l{!t@blI}!$eGJ8ci|#Mixn>s
zP_k0xDpjjhuTis6<0eg;HE+?fQ|B&Sy9IXdF>uh}Aw!1^9}zTR;-tw_rcRqaZ~lUX
zixw|gx@_J04I4LY-m-PuzWoOd9y)yF=&^I>FI>EI`O4L6ckkVQ@bFQ{<0ntwynXln
z!^cmbzkHQ?(b~hS^;^w;s#kRC<z%y2Z7xzTi&Hnm8r>EtX%^=g1uM8T=nylRZ-3WV
zg~rcayEk(3tQB9!ZrJgxTbvZx?xuVrRWob$_bN8vzg4r}D)xK5t{LuDE{y2b=!U=X
zs!O8yFNOzY*imoEil7BmGuD_m>&*UulS#8In%=^-#Yvy(h1Q%e6I|8vT=_WeXG<(d
z)%>KjMCr5B-AY7WH0)Nv@q0dGJJe%Q&*<aF6z$-ha=_D!9WO<RGa}8)Sl>UKKH>W5
z)2gA~ZQLuZdH?#*rY|?UIekxddh@4cX?OT7FBUn$pwvIEgc%>6UbKA;dio{)tNG6k
zPHVVrV?*aYjSu(g@$FLHGl8Q!ZF+jz`*Dl!HS$f}x$J4RF^OXx@8FfTOQWq<(nKl|
zKehLyrXj`O^opCm$du_Vk2H!FYe@X#Z4y-*IH$JT@CMJHXRqM9^U;+13A0UGxNS{^
zxVQG6?iKCkslLgd)Y#Q-`1V`Z`rh{c-m>I?9upT#eGq00nsmiubImY=z|pOX2Y=pH
zrT&zzO%Ayhjh`{-X0E;827OOkGHA@h6xHhFJh1m>-5)0t<Zb7^b<c-8-Y(vu=O3L5
zEfXV8?@ecStetXg@x%C0ZuAYjKek-y1Y?Rc53c;SOPKNHd%rMakN?+;U5}T26Y0Xj
zNFS!|amh4#Oo>E8m&WRt?EAEy-&_uqN|yZQlly^3QYMZUx^sAF{z>j%%WjQ!?((Ld
zHLL^H&Ym+mdl{Fca~9sHdwj+B*^equjvl|)pzEhv&2Mx#c8scBlf18AF6341IV0vY
z-8esIo9B^3t8R-E;&&!h@S8#_O8BMh@P6-)MN3O9DZ1h1u*9FEe+)C8T`p2#Le}e5
z#`wBiJ=1H?gbA~QzkchR?%144o4X#bzJL3!OHC4Ow|)ryzPxDMokyD#yYM1-%jo;-
zM)ru^{`&RRF5hl#4gJ2f-Hu|H&t*J#Ao_;Ag&Jqge9YB<-~L_Y!i;4@qdeW~o2E;y
zwv$6%lsf0tuW6?p1ENI>i61}3n+c~nRJOg2V}0KK-H-EO#+xd$R<wy8=|X`wtz7+I
z`G3B!eCar+WofL75`BL5>Sf=oHA+<qoO{1g>&aezZ4L}ioM&j^Put#hUpo17$r<$$
z7LS+d%8OUe{gc+n8n~duXzQBt<3}G(RPIBzhe5fHw@!cbSx}zuE!&=q-lbakYW2sL
zJu$RFmdW)!78U&XJ>8^-ufJs&RlV1evK`C4o0}z%SIAJWa(z2w{!}deyk>6Qlk~|x
z@sr=_;-^}Tdvm^fh3e(LAARj{r`-EhV;1Mmc--$>uK0IreF-zZE>Cyw@tt>d(sxSL
zv{dI#GvC!Xoj)MOr3I6k%*Y$ma(mev-|v5}&|yLTD6>YUy;bb-vDY2uT<BYGVUbKF
zl00~{zUkRQ*^k5vc^hkFd)K3l-Y;o-);sl=Y8iTj8G}ntF|1RPkLjD`{OrD`@6IST
zd`jo-{l2c8?$Ub05tn!&$#)gsnQ8XXE=z0fO+VgieKNmOK9P-cYrc#v+$w#Vq>aCo
zo?D}vU#;1`kyFp!eW1_oq26`+cJ90WWuJCm8s9z^RN!i@y=#Z(JzB28naee=_jC)H
z{HWR7w5#&m%i5^u#^gWx6#p^c;?{oiDy5vbVqn*Ei~G;c-}2a2U#GqIyX^5hHv4Lr
zVf~WeX;$A5-%N#zJuTMJZBF0U{^OT*9PWPIDMzVBFXz<zu{Lz+jjCyOtk@bUUXM3b
zZnZsFw$H>^{S&S0xOi@G&Xobn;=OF&vq#e)-<OeX?eolO@4vEC#+Yfl7TB7o=bA(v
zUj69n)+6uK&hKKiH9T$^xmVXM{_MMN%1IqR4mmab;-G~SoSLNgGV*$h4`D|04j<kp
zo4;{qw0T(?wM)Nja)y_8##!=BjW#DF+kl6AE=N1)zvjZaO_%DdZ|t4x+s*EYXEkXR
zcVwy=xoQQ@-RIdgj^F8T2hN^}QrFe`Ez9kTYwM)<PCx!-@-qXgWxfBv<8F<aVaD;)
z#S(uyllao+EXACsbuK$&yXB43k#3oaTOarCy=&*_mE~#&W>3Go^ZGT{W38II>%@YY
zF-N_rwJB32k4n3HeooeOi0g^g#TpE*<Y!&wk}qnN^A8RW%h;#N-mRsb%NM_$Xzkc@
zQ?k^a9(BT@nhVkmu&p1tG-ZZ)@n3wucI;C2$nCCO>pnS4+CkQbh1L#y=l3|+{auyd
ziNyo^JSx$pT<(0k8n-W(>{ZbYlZKB?+TUgI!g}?*TaE9RZ2Hw$na;#H=4rhDwlQ~(
z77bUA$Xqw1`nMtnvISkQwSC;&f~jJq?!PDG+_d19Qxfz(@UG^%$a#mv54?CdvCrN9
zi7HoUwIKhHsc*uJVFR3|yjfl0?ezn>!i-%lhivUwujYlw{ymC&d9_cG>;3yrKju|j
zlc10Hu3hWTHO(>Ti*NkVd#<=%o97cbZ=+YUzkl_fG<tzG)9O~PDY~y)QM`q5cTBX%
zcf7oJZacFn%F}K?lAOJJZo|kKSK3XxW(-NvYyFn>{rZ%jpJ+(FTu%;mAF?oYXsN{w
zd;3pa__6xe8MoZWCa9F9(U7*zt%BR{zUBYv?5b*8P8Y1Us_)@u-3GquaJ@n3)C4#7
zw(YPj<(@XV3tw0{=lJ;99p{I(jIw=x_HXOEjQ`X=U-y*>&s@rKp=$fi&HDJJDtP{a
z|K}=Y^51W|zF~=YF%Olqe%m+i>!ddBX%n5!Rblq-G@rtZ1Zz9?J=<W4TgMz86T8Ou
z{~Gtpi`skUl?gtUu;NTl-wf?Mtmm#(s_xt|;K#%wOH;IHHDS)?!>2>H)$$1KpU8J#
z*U_n(G;}TYAo0h9p^++HIr+T6=5;IFs#bH4H|pgB%jQJihqk@>=FsHTJ+rp#R=P>2
zqv_vy=Wl!CtL5359*u2NHhkM!sc^xN+{<TdtnW2?PtnN6TVG!n@BIVMoLj#=U|PoW
zrPog`op^RY<BIKl1M=)iyf8|GIE&u}ceibel_q(LEZ^T)y}!MwkzmK0<MqEK9pl+P
z$J~Y<{x4!Q?-@Jx(sO||)&}nhJbJ2c?hD=XJsbYA#^XX|TV+0&q}1Iur4!%X+%<Ga
z--T^Y#0i-h*sbE2^nvqxmS~zHhx^t;&Si6b`tbfm&A2stO{rF@<A8&)&!tY+u2F%l
zm2+JyTj1`tuVW8wE?(&D*b&b^_bl6V^5wGIYosVpaLbrpp8ngijtUJ8Gd8|B+2zgD
zfaHfpE^u;9x$D^cL>`OR_i1!~TC`fvI?ntNcUqGsxfcy{n%QY-v8-bc`~TQhYgWl;
z`xDezx$f|Sx+{W?-0HZXTd7aw+uSI)*DFT8!z;7b|GXi^*<R(p9(=y7=am+58s59~
zFzUXV#p92PmolV%?f%Cej5+?Y<;)*(HXTjBGO$ZdZ(~>2>p@puTu;9GQ?VX1&ovBc
zG5%?v)E73)SpEFqkK@~h*oqd9GycS??FAEOO`CdvOR5zut}WR1^?0kmYZ;eiy5x~@
z$>8cQ{L?m{l6>^7S>+0ksyZcWt5W0g4{f~Zak1TZ!;JACC)LO_ri5G8(Ti7|pXuJ~
zaN>P&O3m?pcD()5S5144eV=RW+?Tt@UYH(fYm4lD^jW25Y`>l>WLWKV`_^<XedmDd
zp@UJLT^QriWA2@)&lg>~xq4NM+s6mbPU{_VbpL=XLym+@I8>~6@$#MHcG_?$W8U1^
zW?U{cvU|$vv*sOI<Td%QSK9{<-iLfxo%X_<@9rMe5?>nLx=y}R>-X<HU!-50Lmi9d
z-?$)W)@3ifW<RJF^TwI?iF3Lat$3;boWi>YbqR8*cOt=Kze^!Ok5@#yF@Erv(tU4d
zXfb_YqBlo6y(_l8W1h^%!;E!j&%D?;%`3^yNl%V`KNdNf|LrPa#?|G1i!)TtHnyLS
z5#PFa_vO&{K`UB(9*`#Za+fp*MsLi#xZq&h>ph)se%QO`RQ~O?a-6?gD&Fzl*N;#3
z^LjhZ<8h1H0nLYHYtd-H$3hE2o?o`6z7^Md<D?X8W9&cCtI^mA&tAO`J-s+*thD(`
zO`ku!i}7&k1b4rDeIHK$HYcR&i)m$N<;m*xs^EG5JwHB_nYwdWn;~CT-aFpLcTB!h
z`NE9TZ`)ixnd(QMdtpY>ic_awxOCq6WbW1>&VC8U7WNt$x@Xz8y3@KWyD>Gxz0nV<
z*aj51v!?dDAFoeuD$}BO^eA0xZ9kX2PX6;R;>J0fqUWZ!p5xDZ^~pYPnP00e8T*wA
zGu-;+_TD#i?Sc$9&t7~|@qWpTVaBRbq02sOf4O6D&-k(WY}|Ki;ljDMc1)cx``)x{
z{e#B`+*!J6;KaAzo%fYmP;E?!aghsU8UJxi!B_8H=AK@d^FaCHZ9ldz-l1KGhXo4f
z_1N06ao0n=+ZU}__sO-}yBln)T<F8b5;dRRx>CD9@fqzOr1}0dr+;9W;jz2IhlTCj
zul3vdCeGM#{<|}W83~s*Z&~$mvsP0YhE&_xcv9ohs~%3O5pb<r&I)sCN81x-1Y`&v
z@vT&rlS{8%bzRu#TbSYV@<!a?qHSmN{5m3_WsFJVuDqX-zOQff(1H!}4oI8hV609r
zdo7I@f0W0G%XvLx1WYQv*5&r~>mR&7UyNU8{jvmQC*;nsxlhtf>*q8~+yBL)hQXQq
z(oKDy>(h%;JzFfe@?^~9Yae!AI9DqEm5h%{XS!^Au=-npFk^J7n$vDxZ<ME$TbDdW
zof54E9XC2$4199ke{sl~ukD8B=yY$={rVX;#TXYYcjwT))`RJ-6CPLFvF&`D;Od>f
zz1oznR_ty*Q-3r(d1c_$Hy3*MjQiQY{J9q&rc9_hsZqb86L0U1v_Gx&p>532nH?^z
zx|XcV`kZ;oEN`AOcb>wFZqy3MGShcOK$>)0{BOm3_W50H=lQ8$Hu7F@zR9_=*Jc$R
z7L-0s@{Un5)Q^$7S?tA&G6c0OpC<nPW^W(u_<nVD;f-6T#K?SZUW;|3@)hm8e&V}U
z?cV1rSUK^BN@2$1j8ztIo_OT=!>vi~%j{=M=(7@`se5hST48dDcm3KI&)eJMb4A}g
z$tG3J<@Gx7*>_9m((E1EHH_Q;!nntK`yX;m!g%A>pwh!FAH4cBx=v4-C0U9i^UALq
z5IV{`xJS={<-2!(>|b+3(<@)P<y~>uYj*yL_oC(LYz@k{Y`X8G<fZ1Uuf0F@Cog|n
zvr!3_#i?O!v)|{r+ibs2r`uiVF(M$=w2bTLWO^}YMTcgq+IL&>;nT`erE+c^aP!`U
z7xRLOHcOjgd!Ys+2B-dZ*mkG?-n!lIUfaKQasEl&8f=YOcXRjq0ST%Hb()m+V)3Pi
zSNR=zQTx{XJg3*JU%%ZcAa#oAt+%zw-g!mW=C_l5PhYs$(F^xK+I~!Wl<|1aL{&m(
z)Xh3O_+q^c4FXbai+^HFq6-@@9G>%GMc=H`gWleb+bK;Vul{3Kwkp?XS8q4p>yume
zztVNt3u~2W0mItd7|_0N=GC7o_ifTOMH|2Ohj%)c88hTy=*3K<V$I(2wddFhw|5r(
zSomtdp6C9j=Y}pDKXdBwVON{>9Y3V{{Ul$1WUpJIZIg#d$Bl|MqBm3DF2$M;&X8$g
z{XVDD*AGb;)h|Prg!Qsz9DUSdjFZokIV}V7OkS{k{K%e58eB-ZWk87{Yy0J#TfW@X
zp@|nZ|6H-@nb3e%OX}9BlYK|ZqZOjv>$t+j)~|c=yk9TYn9}*)hisuORu;Y&wPKVR
z=}QfpKjub}B1bn4zi~Kk%qwFLXFu-yWwXyAulZS`%<Q;eX44@nrmf6=JW8T@FRk%k
z)coqSc30E%dkT+uJO548=bdveJ<wtE*4Wb?O}{xc<ER;a$wpS#elteEyBC&zNz2(j
zd^{4`^4p2{XTH==x9Dc@hi9k#>#b~6=5d#DO&$-r(8YCezr#@{wvQRwvb)#7!w<h+
zD$+6DL-&I-60QG{WbC;OS(;qUp6k}VYXzGw_42zhqFTtY{zuclnBD2Z{n)XllsFsj
z-sZG#U%0=FH>SsXuRG(zj9#DO&wJE*{?6d~4~Fi2d^pMZN>$$OJz-g&d1|renL4`0
zJ6zTy(dYNE?j0FFYsu{ePts*vQDIu+7?Z7&@;<EmvEGcuYaXqg`R>xl0Yz#Z$y=?`
z{HHaSwb-<_X7;H=5^jlKv;2b<GajUgmdluRHF^Aa@t>xhH@)hG<*gR9EY_;|%4;Wz
z$7^!vOYEFE9%j1z!rkZow^<%tTYWvXHbwDLJA5((9?wu=cJ~|6%K1<6x-_hPg^6Rj
z*YEXU;E37Rl7FAucJ~YGmr8T?e2=#1eeN>>D_=z&7*h8BfLI>yzEm6UF>H9RRF78q
zpSkdE|JVnuJg48PHT7WgW<^_coU(rHrY()fZys9N*4g|1`E#o>RLps6^NuiMH+}rU
z3h}db&OLrz8Mii8kLkBQ&H37JcW51->Icewoe^f#`w)dB=es24Cd9q)#CipCWbqzX
zukY=_VaEN5bL!XjT-w9(G_PorGOgILE6n(8`^NZ~>+snfr|;}Y{PAGl&krlNi(0bW
zv9^aV*}{x_kE_fPQ<*9k>XkP6%+1&RUmf%KK7DrH#HX{|oU_;E!{Qh9+OK<Fa#xgo
zZ!djXe5J&|uL&jwraS(5W#-+lQ@Z>((lX!5vZH&S4n6j%XCMF9E@N#icD`u$efRkZ
z^tk13xvlZ<dhT2PPfx;(LoM&uop*Ef_8+caf}VWl!9@C_clN}M^Kn)0yvNV<o!D@F
z<JYI=H|yf{w&sDghdS0sk*P<Y*cDf%PUtbsw|@Hhudn@hdiQ&Ew?~WL*nY(9RLQvF
zzt-i$isN~*CXEsB$)(`4T1Q(p-juDx;gSU}P4L{gCTc26zLwPw1z8hVE#(h4*!%9*
zloLx64SH8JSLrMTs#oyenX9bpo%2zm>>iP`=lQ~G<{pZg`Pj1|2`7GtU81Vr$yx=|
zZ@YJ<ahK+Y-!JWz@9mWmJ(?DtbEIO)a~ZcE2)i2gFlo@YuU|ep^ME%6j~_cD7a|+R
z4G$jNdK$(9ByV){xup4cl7B3&sPaRH{1oEY93F6Zz~KRh2OJ)7c);NShX))UaCpGs
z0fz@19&mWz-@*enxp7Bq@~R^uZyw4^V>Y>uM=^Eo<xTQxmaRSa{JcbG^KqA#Bn|U;
z9toK7ydY*WijpLz9#t7l$>Rev98)HFgkUm;GNzJOBhB#GN-3LTb9lhv0fz@19&mWT
z;Q@yS93F6Zz~KRh2OJ)7c);NShX?-u?t!pJpO;zRzIp9zL^d)|*$hbxBeZ~Fysw3f
zF^pJ2hT%SoFa1s##)6NgH_UIx<lT&xsPb+`(V6Bm9t+>&$paQk0RQle$8wlN^7-9Y
z((#PP5)669V~NE<JmZl^Mdn9<LZ0zhD(@#R*e{V`@QlaeiXEQuSVBn8Gakzk((#PP
z5&+4{5}9zG@mS=`Ql9ac$IIuhay-v?%;Whm(L6pb^d?<AD96W#a(n_P1xcv%f<EMn
z3A0`tW7bQ)oQp?z5-8<N3MHRpP|BGcik%b?7%8EA6qyQ=w~<<z2IfOg3w>caNZpO}
zO3s04CnF@-$OI{-ky&*gWfmniEP>>oRrCUekqtH`eRepA%yKAmN<8WKzS0c$Q$05%
z*vJD(ZsdiMA7wPlksk)5`$K#ySy*nsg0Lbi1o0uCJ%*<*qAaQ`25S;u9KH<;3o8K&
zpmPpPmV{RHQmU6$y^QK*RWApFNmm{Mqk`&`!PF}$E5jJXSAp0xs%m&OWp!l@C1o>@
zr@5P~t*oQ03om1*p6d0XBy6B;DB(D;5#$`nhpJ|L6Af<)#jnla4A>k}Hlqa$gj_==
zTfxUTqBRtIZD9S#hS64Zwsuf<+Cx_^rVh{zy`#jFz7xbZ@=leRz6+F{uJ8sIV>j3<
zw!s&n;ql#J0UC7=(K)^+q>UK8V0PFW`ocbNJ?sld!hSF&><@u407|_ELaF~CC=r7p
z*N!m+-f%LEp&C9+IULgVjS;G2+bqW@DD7-Cly){o<Htgd{cRhM9v3YLO8F;1$$z5g
zY?GkWd$Q_NU^Z97m?}Eyr$I?LUE`^PWf}TRxFw2V%z_)xXG8JZ9Myy25yIy}u`>^*
zMV~J^+X5(lT&VgYSmQ@n*kaX}z+}WPg}B8aPxH9tP<B?Rz7k4(R%!TZ2`9fbFartK
zLJ#8C!7#`<vb=_r*>Zq(vk{^io8T}`*k;i=eha)3%`moV{5Fl>uJJpd9JmvTom~>n
zwi^bM;U3YkvlpgGZW#MCen0%o2|b|k2O(}V4r%;hCBCy9a5jvisvm=Gv3Fec6UviN
zGCl>};At2P&%hG!ER^$e4ss0}=iz$}xBxlr#zmL_UV_q&FGKO$6}X1{u0pBDHTaqg
zu8Yn_o3prczHVy#Ehz2bw#MIqlJG99|2iz}o`hrPKJ@t<7WP1Nwuj0`$`Iva<rB!c
zHlD(`@R^1`SH4ibRK9}ZC(f}YISuEHhQC$5Q@)2%fDg)#%1;{qS@}i7zbd~eLzUl^
zKVTsCXk%voLhVfdl8H&al{drrP}xk!4>+d3Bf&Hr=d8Mm>aI}A7g_11jG}Z`MpZ^r
zdMG`W(UmcjF_p2Dv6XR@ah36u@s$ab36);TL`rWZUznTaPNGbzOr}h(OrcDvOr=b%
zOatpv|FqBtrh~vp4>_#{ZPe5=Lh0u-X?SLsnRp+V9cF=Pp)bq`vub=cWp*g-J_nTR
zCnw}w8@Zrl;0J+`TbT!@M$ZeyUOs4r`Jo)|59Npg=D&>pQ2K*H(3SYYkTz@-fpYy7
zg}^ALEDq@|j1r>Ljsu|BEh#!FOY!d!^wOdcUj|mkA!S7;zMT0l<G-?kvZAt*va+&@
zvZ}J0vbwT{vZk_@vbM60vaYh8vc9r`vZ1n(vazy>vZ=C}vbnN_vZb<>vbC~}vaPb6
zvc0l{vZJz-va_;_va7P2GEmuF*+bb=*-P0Q$_ebFdS7KfDCe!e=p-1R;RBU}l!KK+
zltY!nl*5%Hlp~?!H%j%<$}!5Z%5lo^${^(g<wWHq<z(d)<y7S~<#go?<xJ%)<!t2~
zWw3Ita-MR&a)EN8a*=Yea*1-Oa+z|ua)olGa+Pwma*cAWa-DL$a)WZCa+7kia*J{+
zlzx31tO>Vk_zu_&eW&WXU=8%$P|nXDH~{X2(jV=E@!@{RSZo}CbPL8oxQPzr5R`u8
zFl5eV9Dy=!AB8eL9D~3(t~{YUsXV1TtvsVVt30PXue_kVsJx`Sth@px!>h_`%InG-
z%A3kt%G=62%Dc*Yusrte!@TeTlzKhX@JCSc3xVS2$57^LPoVU7Phn&D3<Bdh6o0)?
z{iVjgQvJ2+Z&ZH^<$S$U{XLZP^+ENIQ0#qD{WFyOzNr3H^>3<&Lb3N<^&e2|g{f|^
zRuA2?3|3}&Ss%x=XH}gSKTJK6>dsK?xv1_6#UA(G=J9S&>_vgnj@)4>7*+LXs(V0h
z!abq*F*=L`W5B{NChP=xwqV}h$A)q~;=uecF7$`-U`rSu=70%c2AB|Lf?hB;Oa#k9
zZz$toVkqNn5-8(jQYgnIgSjAcGP8Uspci^dDD_DNQ^3?P8%zUb+)oST_;gV0r-!Lv
z1_+Fd%1p}4N*`qwrLQupGMh5HGKVs!GMCa%nHx%md7vlE3#ESfU^$o{HiQ0f5G(+J
zQBYY(Sy)*_SyWj}SzK8{8K5kwETt^1ETb$7qmy4bm=BhR4Pgb?2v&sSU?n&UR))Z+
zqO7W{rescG#@A5RRMt|~R@PD0Rn}A1S2loRs3DYjTO(y-$nBQV1Qvl!VQtt9O8?g!
z0;7eprLvW>wX%(}EtCV=L8)(h$e3qzfRVVcJHja3Pj!L~nRs;;qIZGk(Yr!-*bTPk
zLJNdmusf^@dq8=v)e|nlUN4vh_J(e-53C0JLRNw@`au`iA6}>81K=Y#5K2cg2)e_;
za5v#Y;C(n0CM2I>@EP&L;bOu^zzJ|9<Xjk|AY-*L8Zx#TV_<1G7T%@)<KP)M9<G5w
za3#csWgeUeC&Ec^CY%gAz$tJ9oC>GHX>byp4tu~EuqT`eyTDnnHJlA)oSXye!C>WF
zDA&h4SO?CB<>3NY5iW$%&n<$|?@(7ub+`mpgG*rmTm~ima##$mfJNX+D95dW72s+p
z{nZ*+6t30yb+8cndRPE%fH~ntSP*W4(w}aI(w}XCh2d5x$8FR2?NIv39Z-(j3A4go
zFcIWjn*Gxr)%U`9gztkf;C|%+=!$+2Muvx=J3I_s;1Ni3G>$5dL7IbcT=f%Bjz0-$
z4#p{sKdn3i<@mE2e-5G==b`Le(C~|@Us7I%lJ1J~Dir(IRHrSQ$KO!i)bLx%+ZujH
z^}DLyQ~kd3f%2h}Ys1VpMEO|xMEO+tO!-{-Litkp3d(tX4Y$EJus)XGLgsYFJLp1%
z-oqI11KdOSN5~x3_yn0F8=oO_ZQ~1U3%|kw@Ec4EL*X0je}_@fe?V^-2BSj5YFMrT
zPMYO0q))JHmS8CTuno%fNZ(|60-YtE<LEOi%<&9Ym=8vVVvjz?a)ESF;7CZ{VVMJ?
z!l5u4YymxB3Frw6!00dwi~(g_jR|FZhy~^TI5w2|X&jgW#)UGz$Af8LeCPucKpB4%
zD!rhL%ZXre=nd1s#4s*Q0+Yd{Fg8pEWxP+W;VGb8FDW%X6_n#rLz%y%fif>h3lqb1
zP|~M|GHzsm31CJT3uc0zFtf({XgGbedENO!nFnQsQl4y3>}OZzfO382gi?-NP|E8E
zCI8$oA<P4#!@N-J<%7{+ekk*Ke<=5T1)yBd1)*Grg&^I!Q5ec~TtxMv5Y;HA;l-6D
zphN^fIj*GYrJ$rQt>I;$*ek2?<uty$vVyXrvJ#Z*xw7h2lvSY^W(+g!S697;>NS<M
zl(m(0ly#N$l=YPjlns@Ql#P{5lueb*l+Beblr5F5l&zI*lx>ymp!mH#l=j&Hwu2od
zoSJolO<-pjA9jITiSG*K`s@ZLz(Cjlc84;~^??0gPdFU*f->IphSLA{fif=ig>t?1
zgEBwt52Za1fYMF}!l-Z%l=e1Q^&wE&(NHMuXc&}sG#o~OBcQamkx<f&((uucX^b&O
z!^c7yPsTy<!*~r3f?{U^l=eFjO1eo<#*xWT>`Z~uUZ*OjK}k0q%D6N`^_fu8&w`SE
zw(4`Bw69?0T!@>Ec~IKveB}ZSUkD}rBIRNz<yitH{Zc6TEQ4ZaxrVQRa$T%cuF~+;
zP|~eYeXZ*2prl`~`UWWZZd7j4_{~u2vqi(VLMg{Kjo+^N4k-ETRDG9nHx#>jG=8sg
zA0*h=ulfPyK@C3y<+#JDAJO=uQ1U;f;m4IHprk*k@u#3<a9ZQfD9<X-DbFh}C@(56
zDK9IpD6cB7DX%MUC~qonDQ_$9DDNuoDeo&EC?6^xDMOTxl~0sUq15l0>d#?y9Pk4A
z68=)dUnyTJ-zeWI-$AkSUiA;qYeya9qw*8XGO&X2S@{K;CyrzOD_eSod^xTscLHa(
z*E89_SVfcbkJdFA(6@rgq*p7*@6cxY+@$9j5Wh3`V^L|tND7ZAA1fuHgvV9-DvK*?
zD_bfDE9WVBmSY~D6aUc{I7xpK1AEfn_`)+>=t5~<S>f@*jF+l2Hk#py(TV20gMLnB
zAbqWqe4~;PUA|Gtr16=RjMYx*xR4W~v%a(81?4^`5p<`4lebeF%0(Y)`k@fvlD@E}
zFQVy-YWnu1lX+2RbSXz^*c`o#>caTltiOc^qBkSHJIqV^9#HyW;p3Cj^N2l<U)XzG
z)aeiQTK{A(abb@?*o*!Pd&Ar;f3Vm2Cwp&-gxecdd8S#un7^=BY4z`Z__O-TyhrM5
zw-@^t_P(Y5WBFSBRKDat)mPf%U!9M5Gi-mT@6YE$=5rCxhm6mEWp7BwKbB9<f5h`!
zy3il}m+%+%qMrPty`Re`<7ve5CHjTEHQb!q+ohZjnRi4iUsJVb91CxMiPawX?YM~T
zS#DOvUVRe$+4(J{^)2AO%xo`7)Sg@*_TwVjYrZ_ZzSV!SC-WJp=XC}`q1|3mwI}0|
z*puTT+H>OOUBXNKO?%1Io{Y=(<09JIS2?`B<X3wQp!m;TzJw*h&#&Eo$<>~W-(pXW
zi)e4jk8pcFf74zHwI}lru_wnxw3oj^xV`LZuOj@b@}*RJGLI5_a$H1vR~XbKJon$U
zmx^><NH6n2`*9KNeJL1TzJhA6GW@IZak=vzOh2>#6?<}AM0;JjM>6yI*`B>WT@>)g
z^C9W}%3khTe=J{9EuY=qL$zmbe+_<N?`?uVmaqFy_Lh|iFQ46BBjUSJPy6-pbA7Ls
z47X>$-hQ?>^Cx?9eTzN&^&!Va^xwL6;r6-^F4u1#7_mPXSN4zPlm18gKVbS@j*DpT
zri-%~F8PW*89yW1%U<-4_N0Fld-nRuaS`p6niyWbI%=<z+OuD8KlcYM)SkV*a$H1v
zK1@2L9oftGkL=m6Uzx8+`Rx6{&*iK1F}%G<J*B?(@yK32dw*a*zY;I@?EQfp7qNV`
zSBBTO_usT9<Gt9k_Xl!ZM0;PDtV?|Z)!xtbwU^IcUn!5+v-bybTts`N{lm*AcBH=l
z$ez8v@|-GSe<0~2+UxQ-+@9Tk44;4K4<eplnw(>Ec);NShX))UaCpGs0fz@19&mWT
z;Q@yS93F6Zz~KRh2OJ)7c);NShX))U_`l%+t32oDk+Bsq_zl5Y9uj7i_X&AsZyn1&
zJZm@q!ZXjvt-P~p@NC=KgmB*JF~fP6$jZB$@_WBE66BpEGo0U6t+z1DZ}O6jtY=`A
z_kege!P*$|YJv4Q@w~5Krsv%$D?i7}dIsikyjx|4^BcFdKH<D8Wrp*<f*H;`xMn!-
z{F(Oot=S~+^qJ&cKa;#;Xp(ofteMG|cmJ%sn_(o;@T5@6lT4XhnF1CiJf-TXU=j4x
zs;5z=g#;Vvl)NWm>byT;GNUpRlzb?IwJP+{aNaF5)A7!WNq+k<$-A8<DXYmGki3kX
zFb~Y7;eJql$ILA{ej?7Akt6uc&B`}0vYvq%&U+YEXX5>#l%s&MAe7?^K{>uKl;f$Z
zH4owVzzi=2c^6IAGcfIz(C`2#c1uFBTS{3P%JIBQVjf=>j^_Asup8mDH8Z>d<Q;gU
zB9!u0((uYq>{fyDo*X_i+i5k4XXBl6lQonzm9-#djM~aN5>7x}Wj$qmWdkVXZU|}1
zMkB~KO0u4TS-vJPI^}2z`9@6EGcd!OL*Aj5^$g5%x76@fP|DpJO1axW4wLl^%<{HV
zwpVsgc7&3yld`jf6VOH3RoP7$2&pr__ZU{%I=|~1)`z6;De>gr3;My{@Dt&EG`ug2
zM|eLd{_d~g1E7?9py+Ial!KK+p!jL1au^i5!zG^MM!>jmBuolNY4~V(m2_jE<TqBs
z$3e+&JQTY@$_Y@8p9sb7Bq+yEhB?ruX!ul^0(}}3yVEs%1{Aw9MQ59(oDIcabCkg_
z6Y1tkJe&t5-}x{q=@vjae+!k1AgZxgxkR~CxlFlSxk9-TQYKl?z=};{wT7>O{*-&I
zse4-1K^NlJLwC5r3^&&^u)3jdLidH6A#G09Gq7?lWIY2bZNb<EgW+~4>2^Tz>rRc|
zrSZEpeviiQg|s<iACz+LhvKIL5T6?dq2zN2;tS(2l=MfSq(7?qF&K<~97_HtpyYoN
z0$I<%<Z0y@<yqx9<$2`=<wfNs<z-k9dsko*)+@LQX-l%6fi(yEbtw7WP~KGDQr=eH
zQQlSFQ{GoTP(D;XQidoWE1xKzDxWEzD_<yIDqksIE8i&JD&HyJD?cbdDnBVdE59he
zD!(a1mEV;=lwnHx7Sm4_B`+nII-QV7n=+EpS?L1heM46$*JEUO1)W#ltl7|`K<O8F
zH{0rl9u;2y9u^i2^6iVkJ9*aa=$??*sSMt!vkqZ>oEVV4!H5Y5P=Z)cuH)D+FZSX<
z+OQE9q8jmFdKe#au8jl`7`zi^(o300>8<3QEHgfdGO3bxm(1|wO5PPR^^{89%`tV}
zsWF*G$+sh>o=%w_CZQY|U^18yCWo0+&kSwojJZ~Cm<7u9>kH+&%L=7_*_6CfWa>E}
z=TO!&Fquo~2j9?`c*n>Zh#|&YQ^#l4Fb~FmCGSp|I(?2cCVnjdrQhQn8FRcV1Y=>p
zFr<yhdIo0yR}`YkdIlzoD@!N?U?k38N!TwmEUXkP!F5;~c86s&zO2TVgCjZr<)Ngj
z05@<v?^>C5D#0(r^KO&1E%8<0UgE22d^I?j`07y7)qou+Uri`>YH4_FD96`<+i_@J
zDCz2He0_~?py3Un<kJYQ!fs<I_M1SdKkqV`<Q*Q9ynAD^g_3t&OudzocS}s2cQdSw
z<1_vXvC~f3UgJ9`d3VE1&pRF_J40z7ydz|d0lR8=H)Wu*JG?=;d%*RuCp-dsX*}<=
zSa+cJfwy5_DCfVQ#KZpZ3H}+N;R7{%kcJP|@F5yLRKtfsUiUJFYxoG5l#-8xg9sm`
z;iDnnR2gGbAFCXv953<YAEf#O_!NC2lzG=A4WA69oKxTzI90=^!OQ5=RiB}p3BM9P
z3x0#MHGB@diyjQ$!nqng4}L(OuUw$v3!#;AEQ0B%*J2G{0y|LOr4mp0G7Vo2`L@DX
zAv)Vi<tpWB<r?K$<vQhh<p$+O<tF83<rd{u<u)a4-8?TlM5o+4p`4dp8oyh)2j=4X
z*bC#seQ-D2597iEum|nsAT-bq!I9{P;Z?4SBT(i^M`3E>kHH@3$6+4y6Hw}ZQh7>w
zT6qR~lI|=l1kb_A@I1^0FTir-cM(QIzXWTebFQrq$^Qy`fPNLGA^sYyM1I$yFZvBw
z2>m8}N%~t*{Bc`(M@d_-#v%Nk>i1zr7jr!W>j1(ZYWO4gJ(9Vefwd|%d#vHKN$YXW
zKW)}L@6R;+Iebg_3&^(>#!C%<1^M>Gcn#(Hd86U9Me{tpQ~kY?HffgoBP4rS&%o@T
zKf^faTnp9~_<^==?T1cVw>E*Hun_jSw#?&yz;xsr23tXVVTM~^Y0~i$p_Okm4BEOG
zZi9S-WN=S!<(n3RvDggfTT4@S6`d`zlCj>@qbS{>j0;hrj0@4Aj0YZ2`h8E0=NdQT
z`F7I`r*AUHhgeYh^Vm@AaE{FWoO=wjU*;ah?62c%d;$$m2xWZmg3{k7f?~%T%6O0%
zO23{2a;?aE24=cs8lPO_xwkOGQ$iURQfYW<DC0vKD95LTQonRi{E;5Y_?7{VK+gyz
zf9^HR{4+zz-v=@$G_pW{=&SKrHJ-VYwIcSjYdmu;^LW1TFptj##V+@F)>tsN#^=%a
zyl^mf^TB7-J3nj;{o#7@F95%y7ld-X6w>&@8ec@?c_w4V7lY!z;!w(80>-A@1VFj2
zO2T@0pcLFjcxeqU11}I?7P`=Y%V~IdIG6AWFh9pt)bL8M9miLOeDfsh8JPB~LT|#W
z!DSrBw?bxk4OqsR@gEK%yq1R7hGFDa2d2Rfb)l>WR}aelNqzVny#Z{D-VpY}-;Ll+
z{Mi^vztRLYL2nBE(3?T&hnhnRdJC8Wy(K(@Us}ON=&j*l^fnOlMq7w^S<k>qab-ON
z^FFErl>4ZTP|DE>7KEK4V}z_{V6rQe<GVqbF9yN^usf9d!yXXGdInbRL1jGyGktF;
z_3Z;?e%TlHgZ(tVzs3)MZ3!O;r5yOu<Y46x<xu4?<#6Q)<w)fy<!I#?SPHvip_FHw
zhL4B!(1SF7g2qpTQr=0hJe&-3!YRtBP|7(?IbAtJIa4`HIa@ggN;!g|*ryGe_UA#d
zKOf4xYXJ;(HP<t+CW~UOXJB0vjq#swX*Wxt%<GoIot$Udq_r^ZVL1$iE8uwA!AgiZ
z$L8>W!vp_^J&?&7-VbC}`Y5v~eU(|2*_7FpIiP%Bnp2re>8H%C%mc;Ed6oH;|A$@w
zbJcA!jv_XRV9H<;r<vp*lS~~<GFF@9mcS%Kg2~8A#$Horh%m{sTa(-ynPkW?$)gyP
zp33M-?(NNRh7^-LgE1Lf$sFI*<0|7R8G6j{1j>X;FJ&SnW0{#QvGQkUICO^x93F6Z
zz~KRh2OJ)7c);NShX))UaCpGs0fz@19&mWT;Q@yS93F6Zz~KRh2OJ)7c);NShX))U
zaCpGs0fz@19&mWT;Q@yS93F6Zz~KRh2OJ)7c);NShX))UaCpGs0fz@19&mWT;Q@yS
z93F6Z;6KO%&U_Ol--kKNhji>av%iOZGn|j9M3;3D`7|sTgl~KwW`^^9n0(&t!}np%
z16h}c@57uMK)w%iZo%qkd>`h_w_36;qNI~`5uN3GZoUt5mhX}IKFkc~`!JJyALcB7
zhmr5YoaOH@@_m@8^L?19^L?19^L?19^L?0k9N&kT<ohs_<mpTv{GG;d@_m?djYSm<
zz7I3W_hHTjQ&%*S!2bIy8c8)g8RRe{xiW<^B@{oTf>mK^DBo4{t-Z515osY|vM!?Y
zIKG2U57)sA5MS_jCCLXp6TAyE!-voZHst&1EN~L(_*UGxBg_heh|dPIVm~`9O?VC{
z-`n%;wllV6T|_f~KPdU<hLV3CDEa4wl7BuZ`R9j{KWi|U`4@n}<X;d<{)J#;SQsuK
zT@m;ey(q+nQ4IDZyf~!JMhVE;DMkR~+{(I$&a?$t7tvYP6`;({;?Ob>HLNU@bxg`Z
zX?NwJd_P_Ra&C=^@DcHq;5%3u%6Y5;zoO%N=g+Vjlzgf~@qY~{^`}jl^{)k`{<Wdh
zzYdi8*M(AlzQH%^Umr^S8$hXlLn!rc1f~A$oAqx3rT$H!)V~>&`ZtG?e+wx2w}j&V
zR#5V94JH3JQ1WjJCI5C%&VPF-`FDVlKj+@ezY~=FJ45k*7by96g_3_aDEV_OnfZ5z
zl79~<`S*m9e=jKc_lA;xA1L|vg_3_iDEaq?lK%iG^&bc&|3Ogl9}Fe`AyD!k3MKzx
z8a^D#`T!%K{C(7sP&$)Q@FW~9@uVN491B^i#ux`_`?4;g^I7Z$K~!Uca-x#5nc<U_
zQ<PJc)1b7!>8j6wp6D}GpQW6woTCg@&V`jznCl`smq=x<i|Blg;};PA3@(JHDBmLJ
zi@q32r@2H({g%QE=*u8$*%-?qZQED@IY-7y<tlgseKn*l7;7MPl64Wy`mIy0S8h;l
zRBlpkR&G&lRc=#mSME^mRPIvlR_;;mRqj*nR~}FvR31_uRvu9vRUT6wSDsLwRGw0v
zR-RFwg*os8J~w$D%KE7npa;ANajS6&(#(v@&<$RJG4cOZ2xMJE=cMpDlzs+ZJF{Fx
z*iC37{1y~Dx1prJ15dDX7fzrt-Ggq~EXIB4b=b*x02>Xm7!Or{qzq9$hQr9<3H(Gp
zPa(_WgwbZ4U%=;3@_7Njp}&Mw$9M%@;A`mR&bmmjVoJk!3u6~FjCT@F{_m9^lpmF!
zl%L@OD)a?P{l3D)@Eg2OexXq6{~b!cKOkyY7<9``fQ5d61Qsa$suQF;2xBo7=l770
z$IW_0f>JM>XZE`;FcOEm!p7`GhMCdbU{M$aO8@N+lcGn3@nAHi2aJmD3HOm<ba;~V
zG2j~*6P|;y;2jtnet>b{D;O6_z2d>LFg~n;y#%l%ObEXa?gf*eCxYT{`fBG`FfsIk
zN#H(COj6jK^vU3Im>gb)DWJ5YlrRLQg0Ep}DC1EYI3NF~g<?M)j1AL68OP`o%yMRg
z(hf2~k{g*-_km@pe-<d`&lie)#(cB<G)41#WQXGa956EJazg1aazW{5{2-8Z5uIzt
zFl1dsXIZx;FO-OU&=ux~a^3htnw_kRXqKlSl=E3g^}-NU)<rbST@>=S<7Hh$v%f12
zWu2@NP}YeH(D0H_)`=?xWu3Uv8eRs<I&o#8%(u!xnU9r+G7qbuI%`0gdL=lmTV12F
zhD%xgncKK5=A73wDeV%M88YvbIj5WlZ-hQt`g7wDCr--V18Iy@Lkc0RU120fq<=Dy
z=cK!iTt?0zXOQ#A735+Bk+4gMq?I(X4WRL`_LFgf#<2vMfV4%rB6X4a2tG6D2aLVQ
z9i%xr>!O*HcGizFs<U4W;oKT$kv_<NB%YLyEgN~{qjKdq(NAGlI0IfKJ`K_gkwwz4
zVrvV+T2aOsjt_xx34aF5!Li79qzT6gTarfB+>`AMt!66W{QY@D)>A(YC4bf#GV2!?
zx*_S1!yLB?p{*OI5F25v>tv>7{Se~~`%kbT^9S0M5sfg}Hj_ss%AOEC1hF7PNs|ll
zMDCOJBytX+UywCa4X#(|8x8tHX;a2!WGBM)VI1c8?~p#xh{3*W?a1RDd9%Kh(Vj5Y
zSCX~KOkckv?Pg>e(hli>aQzwdoklHWGQxE!eW4+Jb8>|1!(fasnn7tRvLzu8S>!G&
zcJ~uD0g-ki<#u8J5&I8Gw+wwatd59{`3U{88P<aRj_l`yn@KPAt%Arolx-RI*HVvL
zgo$sZp3-KlNMnS4OV-Mk`I*d7WZoxhA{!wH*PyIxD{CJcO`x1-X@gwb#vp_>q0B8S
zd89`M5>}nCU_vV)#gKV~HG`dz4v5&2bIJN_GA5e7p>LIS_+;%*BNlX{?#GA=L~n{N
z+eYee8<F}>LZ%`kkcUVcM6Odg<}fl22}JrKk+C89F&{A)3yjW4WNfmYm$8vBxvu;)
z56Np0dCw(W>d9DXFfK};F7pc+E6lu^OBu{h%>4zh72)DLIsd(pyzKkJ8pr|mrM<}<
zQ8qcJi^)UUj|alICTsti*EM6h!8j!MQf58Z!Wu|=gmFaH5|?!?&9qzDFOIGH$RYNn
z9ZQ>+tuyxJI^B*w3z7C9?Vqth=1nr!Hu@rSkoHJ7gn5;$VJ-7qvo5XSek3Qyh;8OM
z=K0^tzHDi+FMZl-^c_fhq&C91Cu?_`?I;<%jl4$W+G0*(<}Z1SLFyvI5Etx78@z`!
z;P|D8Y##_`oj9`&a|x3^EgHhuZPX)P@|6CuFd}|ggD`KBxu5A1#$1`7n8yqy>?p$g
z(CACpVnjCSvwe_Y^cP57BocCxIL1(;A|myVfynv#Ot`c)dwbr%{tZO(5i-9s+u;!O
z>4<DLe3h6y?x8b&8iSEN$W279gVabNq%=|zk@G5SgRs7wtleg?j+?9*XN*FmPfCbP
z<#>A@G7d@qbO<?($oO&%k#i({iiFEpa}#-tNISfTyhT1Dt{fi~k+DqrK<QhhPv1t|
z0rGKd4iEe%dms{H?MfG}9i$FY8j<->Y~%xRSCOsARHQ4?2&sS+Mf{O`NCqS+5*v}V
zHa{Y75c#{~vgM9$7%AC5$#pXvX@Mj_%ynqFjv}%D0Lt~fjce*75}Pntx3&l(a~-)x
zWxm7uj7C4=<XT*a^dnE%)-y*v6q#$9d1?k^ZB)bPABDLHVb`cjIakUJ_mN)8UYqiS
zalDkf0rCo6>a`qcMY{Z?9|gaX-!Q^tD@Gn`-RQ%y85P^r;Zo8JA^r%*OC4WQRyXJd
zw_txd$8UnJ=%<j##HA*E57?RGo5HQ6X`^`@^I+~o`I}+4Bk{#ydg8j1PUb{?u_1oR
zf=GWSeW8p6QIJT;CS)i1$(p@A*q1uQBy9rrM{6Ew$zvMjzlFW5)Kku5UiNpAZW-c<
z?B@9DNC{*=$EHDK4m<>rKDQt;mHk$52l7eI8x&v4)+8D>$RiGRZ;(e-q$hE*c55Qa
z^n`sE(qG1g%yYJJjEpnYksO43Lm88b6W<@M!j9y17KyHT1aOY6<WU@(V~8&Un<6rA
zl(sbu%J`ZPTa6GIr#2wp5E<VpAY0jI?L9O7XLRZR<^E+B_GHV)xk!b`+`*r){G?w(
z_y}YuVKTRRh}=SE5*NbpiAX2@X6;g0uheKwnPjc#gYZ3NmprBYen6MaMje_WJmWFv
zRH=xUaZ}P=B&-DNh4e&Zoab4HInQNHUUNPx^P86J%lVRXDCe~kVYdkzr+G{wtT*RC
z=1X$^WXyelq+)*pj0$7I`iRVpG9hv<;$gEj%tm}s_GSLKThg*Wl5lCePMXI;>eh}t
z<eYjDF83TUkwc_Ah{RxD<~L`MCg?IBlKC)e!J6}<6xfk@uJ~~x<-LRqW4|w9($-|V
zN81^S+(S==ux_oawJhrm%i8fqGDPlWWNz{pMuAe#<A}_QWRCHIa4C<RtM7>H%e|?b
zW7(2pzrLI&bk<Ka+xH~miy<=Cmvd8$boZgmH>x6XJ-k7exw_=Nn|MDMi#o`?=_>XQ
zlSb~3Wt)%vM#K#e9T|@#Qak$yk~UcYk$d6<_(l2?Y1cona|F4-erIF~BIS|xA@d%w
zl^c<50D0`?xW4F<5V?1ib}8qVb#2YIz6@4Inj?9ULBv@R3$hTA^VbQHdEq`}DDne6
ziRQ7CJUWucXY`eXXND_~YsehJC2kfX?NaWymLThpABbE}@{Fu9QUpnhNdH)ZI4_PD
zk?j_F%q7eT#zPV#DG+zWg52krPe@eu6Cnu@dAO4aDTvfTS|HNLHbe#?labXNW3GW7
zo{i&QhX?*6J#e1uWFOZ@Fe1;Eh9Yf|I!Jy*`c-%29qDc(7m-7V%oDaDTaa~#+<(tQ
zW+B1K2~f5bj8Dbbug5hm<8w;nHGRPc<bsOayUjyNAkq)sMWjz)ZESNsCv!U))8-(o
zgKi!#{kDy=$>vKQW4JCWGVh6m)L^c)j`1WP{jtnbA9B6sLu4FXj7XnzhvTJhls@Ab
zdQCVU@g&^>q!{vr{G{%(y~Jh=?71PyupI@4kR|~#h~s1}`-h|zKgoTb%s1X~{4RI{
zsZCgaq#WsFe2_V@`0_Am9zfaVlZPL+yJ7P=@$x+J0O|da`=sfPlt*$QGB#aC#8)z&
z$`~Jt>?E&Q$O-nVa=bHX<#|OYlr1ZHY@qB?-&EwW6@DXbDiVZvBjOvmFCKtMKQ7M?
zWSnBHb|ZxS1;}Fdcf+rUJg<{6Ererb3+5c`ArEOIqsZec<&eHy?uBJeeh3*(dbzKD
zKzbS5`=Q$q8Dr#G&^)9A@%7<Lj+427h|Gy)dxf7Wl7~FQlyNQ*6u*xpjX%f9n7W;G
zClELGkHO-wGm@P6m9QXEgMAr?vmj{^d1l&H^T<aY36X|`?IKL(YVvHSJ|bh^Xt)5G
zk7U7Cbi!oJl(~Y;ljM1XoO>Au>k<Byauy;?+P^%*kgWlAn1RSMIGM8@MdTTXJnxcc
za!(K$r$u(LzYf`h$TOGQNB}YsX-pn<u$hNE<k^ahxzhGzTTl2*&cP}6rM;9^k-1)6
zq&6aRs#i!#_T{-t2qMq*WDXKYn9P-`u>YL>%<LzJbCGhIM_KaiOdfJiF@$h=jwJT8
zBbku~NE42qfH<)~2<AanuzwsL;W$Z?6uCut<6<ub`*Oad9J0m6{%OM7qgOyq5jPB(
zg2X`%l4d<}A6bg*N9qtR=iM2Jhb$+o0F1-&QV*%Sv}d_@lui0UnU_}5JY>#)9g%h^
z<(6}h6{*4gKx6~52x*2yN5pS(E*~Ir&nok|YJ|%i>mnjsdhAyxE(LkW^ZSX&DB{G9
zTnoj~0}#2k?n7xqGuRiO%ClD|^uzEWBF|CtL8+%auao(zZ1KoL=BY9_ls;3=TX!Ti
zatD!l`%x&@%X(x25)+YjAkRY6urI#fj5I=eAf=JT$WBByKk|@g<V_H13)24-V!sTs
z2bqa1MWh|BLKY!1Z<P9kB66?piOBP5xgKPGI0V^(9VwG+au0Nsusy`fH7M7=*`DDD
zq#@D{>4-@G*ac~g3`AsZEaQ^QE9E%z8ivxR%lu8QL&xUuz<;s_ctmEz|9>dr8?nzL
z6M4r_-ZwPGu1lC*BuwJ%dQA3XA+ZrDr-=P{*^h&WZP|qKo3T)i6GjwCD<bwJTx^Oh
zu_Ngv&v;10V`Sf+o?SCe(*K<1XI<<_USe1Bki6_=wWp0sn0;U3WnVU-Jx_c5pHYsN
zGTZAQ6#q&2Bu?@cUGf#3M~HvO<IjBbb3T$r$|Cv5@ph3s?D<L_cCq`9pg*mLz0N{=
znWTJ7DGjE1X4#pFn`8=TFs(83rwcdplk;o$BfG!lA!QUFO8$~Y$|Gf!@{1j@FXfee
zsf)dx*z0CLKN0PSFJu#nT{&Lj#fFqeL~KbJnc|rub|p;g38k!dUx^(#Ug|AzKl@7J
z?Y5-6l8@9uY)gH_j@ajspuEd#GU7S6=PT*#`AdHGdPrIcm*d4RVoOBIA;(C$Bu?^_
zbdug)2ce{qv`nGQIMGES<{@_NzOwtvo{v2*InPo*`?(Q6iXEw=93%Te`@S3(F%PMa
zNJJlspCw;OD|YPl5Q;8!lQa@<ubbGHGDv+TUc~Mzdma)e`(j%tX(V6qKg0iT=hL2E
z(n(qE^^v?K4`D<*sHQGq_A-fW$xn3gk(5))ER2}Hgo#bbM?{XXpC@}cgtFOnNoTij
z_m9{R+d|1x?Am=KX~aK5yVz|>8v8!GzwO(7BXzfzPtw`TZa?N9g++{yxF0c(h~fXt
zeaXYIIXv*6>H+DK|6hvuMf#+_lZT|U%U`9JaV=sz>Tk!{kN>-jXvaPlN2ERef09Q;
zdw;h7Kh5LMZ2lbf&&cCfKK<|J@pD-vAA6X6Uu?_%e>D%g9Xo$jhhODkw<DCYMAT*f
z&+OaF9x?9E>hZI!U+H!m_A*DbFUQ*B+5N3tzp@!I-hO;UO1wRvpY!-RT|`@dwQoP}
z@6^MdR`_Q&e-5{o^{@Eft;ery+T-ozw3l7ZhkgI&^4indkNrEeAM<zWVb9NQ*Io|0
z{*U-~^03?bXYyxX{WERbZAl)E&EbLnR1Z|5;PQ8{<-H-f$NG7TM3nrUZ}}VM^7qT_
zy6nr}`<B1OEn)IEvgPk%?^Rv)<?oSqz@VhD$8YD^wS?Jq*_UG^z5IP~*EGE2K$!gz
zcTM&`5^pg)QwJJ>wm^R9g6zqws)6#3wX3{rmN$HlpF#7=HyfUYr!zG7lDI(b{gW6;
zT%oxa7#VU6V@RF~gl}?x9lpsOeE25!q2Zg{nTBt2-)rBboKi;Fq>OpBj8dNPGMeQv
z%V?IzReq}VmV0QkjIqM^(zrnErZLjELUWHY+PD8%8TlFFugd6d4fmP5{Ag~L(cK7?
z{w;iyUOjx1=S1O~^yuN+KdX%LTqB|%1C8aj<$A7{+sw~WG)H-I6Tbbc%P2WVEMs0R
zqnvBX_-B4h^RF(W<oCxihF>$<9{(-MC@t#Wy^PY<|J}<dSK+^V8Kr;tcQ2##u2M$(
zIODB-xb%he;d~Njjvw^Rw(#*IO~2v)>g!rYq=<fu#M{-U=pXHy^q=9||6cznV`aoL
zo^c89d(ODX-pt5W<BUrrV`k);k^lF~D5Lm4E@Q5k;bqJfGnc$XuG_!*T+968AD6Lx
zs_-(lPt`uv|6Up8`TsvI<DJssWxP}RPU-)>GRp4@5zFYI*R{;AxUPAH!$W3+%)|7$
z_Wak+d*n9@DWkpb`Li<8{>(B)k{Rp&LK)?EoQQsGtbS~4$e#GIF+F5>8FkKG;9q^s
z$Ztv!%lK0t&b@-S%&N_KxH-Qz=i&DA?;PH*dm7v;*tdWF99QnIelMeq-*T5ZFLVC)
z>ci#twBO74?|DDt`-d{x&)2_~A01`1pO^pHy{p5I4nNvG@b56kb+kwO*>GIfj`kSd
z7Jl`N)N#!?t{J-r9M_EFnhE#7zvg!ZN8e+=@*Lx}qwjI_J&wL7{Jm{^ukfGHKib~~
z5Xw^?xsK(jvOHsyQN;fJg8bGb&#&xHg5=q%^m>1lUeeh61$oZ-EBlhh{zO}zIsPiW
zq_IB>mArnHUeee{MtNTNtMrn_{><|4mdE~N^Y7Nz{u}?_^{0KL`MdSCzjyI>%Wr=>
z<L{Q=et+_J)7#(l_`Bti-)m(1yY-ddPGtML<!KzA-2A@eSM5Q3(?ruty?>Qn(lpid
zQtw}-mo&{Zz0~_x=_O5bO)vHSReDLo>pt>2lKBqMuhL7O;7I?E`@?^Qe{S#I77}Lf
zL^&T3cI7l0@ye~cV(vuvCxG8$3i1_CPOh4a=9f$I1&^$G=|Q*$;U0ub>k02o<Qj0u
z{~aGlTX1auw>=OR5~J&<k00J!=uu>>^kSkA96s2ZOX$$InQy=_M#vH@((jm4Gybv3
zIup#h%y{NgW;pXCQ)m8TlfHy`jZM}|riU@(F>l&o3^mEvXp%9{Bw3qejIy=oIC?Cb
z%)er&&iHSJQ&uw_^9R!|Y0Plurl!ufi6;4$&<szYObBJX^MW!5Or$!$t()l*LxPPY
z%B0F<Q0kvt^%PK!PYGpil?qBPni>YcG!V$&sxg^PnI0y=i5cKH3}%G#er_fx_06pD
zJ{q4z<GF`0<FjgfHjU4&@i{a;r^e^fct4HLt?{g@Vk^(E&pW+lxi~krwz(}ve&}vw
zi{}rWoSZBLpwzb@1V$lcVPz2^&MK-brYx>30ZZU$d||SrvXrtk6uV`VWtHWWl+lc@
zpsc8@q^zv0qO7W{rmPNMmy0fII@@G@B7SeT?X?)TTJV;WVXF;8X>4_%l%uY)9$a9_
z=2<^n_h|qJzGf{E*Z?+y^0$^6!z65StZYru%e(qGGjFp+w#IN~K4y#OY7}Sz`|Syn
zzg1%k^9b{3rECq4IT=oEpy4#u))v<CsO8a4*&a%I+J?!F@R3t2r%o`I(@tAwDCxT>
zyTbZDKDoL<|A*OP1wtcId80e@`S!!52P_w(fwd>R+d7BQ3)&iuvh;?=AgBI)AU>DB
zRbw-9jq2YIhSdnG(H~YlQqvd!8z<Rj43zjKePxXv({F>7LzF|6!<56}BWrc<5pW;v
zWh9)F_^s0@*baR(3`@M<dkoBPWz88l&B$mO2Whjiezt9yOI4R3D3jF*Ceyi0gqK{*
z^>l18Y0s0<oh${7DbQw%955BSar`uxrg5<Rts0xBr>FZ2$Vyh;Gc|lxc(~_mGn{qA
zl)=imut2{(vgVY{)z!^?zJyyWvbK}W$>!|35W3l78;hVVa<o{Bh2*;gMyl-NxfELa
z`N%rfHpA-Uwj4(Fj2UMI49pvU>q-gdZgiDN^Y0+oTzSuDjp&}NZ>ZtxV2m`8(ySNV
z$MD$zvr_MkqT`oMLc{2{8A^S(K<ewcH9XvV8<cu%hf<Fn5>7pK!V#X{vUZWp$!c@n
z4aLwNNcnT_h5HNmxbK6;ejm5}P|ANm^a4hKgUUlfixGAhCaE9K^9YQTGOWN+NHq!^
zgA`NNbFvkHC!oB}bP`6hcw0`vetioVr=g@f17mr<j&~NK$~vYd&nqt|FDfs=p0>QQ
z=DE$)$^2V2wj~|P<iCoZmgBF%e9paPy>eR<%LZA;$~HZ0vT+lN{af$|g}x077cq=G
zFb1RDU6_(l?jFp^SM~Q{vt|t&K7h4rv(6Hf@;-uMCq(&J`9%3t`Aqp-`9hdDapITI
zukpnFub>nEy;i<4X|B&|hQHJB_Zt2|^^eL=8vYqN(}KRh=w$H~`dB<YzrlXroMb&y
zn=EAe9dg>7en>d0#uH@LgL7%y=l=h(_ug?$UH||1xtTYE5JCuHpCDoc#keCP#07EV
zjtk?)jXNqTRcmonv8|T6pmkB}z}70Z4xFI2O0})H5v$^kI}YIYyp;Fn`<D25Jbu65
z<M+q!kIV6Rcyey;c;54x=iD1VBZf$oy%eCu<q;v;Vg6Mgs(MYC7+8$I;~iR6JV?3i
zuqEC}#*Jg{I{`So!o6p$YI_A*jxQxzG~9R9RAIb>whH5Yx}v4nK#i7@U%WS~s>OTD
zs`~LBsw#g%i&lbuAGA`mc*j>&Ki*kZ)#80#Rr~cr%l*N>8V6MO2XZYsg3unt@$hco
zDt{%Ux}T!W#^(&xIJCO0Ro#YFw|FO7)$zis+d9=P-jP-H_qx?>M0Fck-PWsa>sPmU
zH*VGTcpq9-YpQPX?zk$9cfM7%jjP)x)h*tkR`vI0)ot_Y)?D4TsBU56tF~)d-Nsb6
zt*TqRgSe_cuDZ2Ux2>z&Hq~ugw8Mu?9M`TIx36yFtJ{R?)>_@-9duRu#k<L>+D_Fi
z-WOJdyHvMbtJ`kXZDMuXy}IpD-S(_*dsVl+tJ^-+E#9YAwO?Cxi+8bA;r`X_fa(_S
zcB}gPpz1cMx*c5I+N)cP1H6olgvn4eC;=#8#xP?PiW#L1N@tWlVST~|8wVRlhm8)K
zj53?frVGLrge{}X=vOG~P&T1#N7;jNAn-uoF_hEvG(8`9KJXGs3CdlR$NI<m7lAJV
z-=PTn1b!@vDo7RN<LBcSfMP(YgHj)*u}@<kv!B^77Nwm}JD(1I9sIiabo1%u*UPWJ
zPk*1mD8o@kqf9`Vg5p4#gEAlGGn8ds%e*ptGJIB{tnpgowZUhD&ql9}UR!;(`fT^w
z?v-0RxAuO+e#4R4M{1uooHm?Cxg2yk=%(SO;a<?aAScRelnTEJKT)tKSmCem_d@Xv
z_6-j95B3iW4hxR-kMwUC+%VXT66YW1-#)l~aA*I{{yk7^C`q~`-7u77l<_E&QD$gn
zXlCnX>(av0!WTy@j`%YC%kXt5n<F+y><Zl#x-WcRcz$SpXdy~ba8d9@l<WT2{r^F^
zkK#mmh4LOn;4AQz21o-ud_8<M0h$24uiiH(ASj@gZ!KRVO8tQP0gZhd`<hW&p|n9s
zK<Vt=**mdiV#_3yac#%7O+{JOa#_nYjn_2Z61gQZw^nYgJd}Kt!pOqN^C(wCu7=#I
zbF0q7#t$32LR=vjKSYMAK@C6+Gs53THKVpc?Tp$7e;<r?G}_6ivnk$Fhjtm-uTa;a
zZbIFTx(D?@Al_k!dK$l<M|%mi1obZJV?Evpj`kg@zz@0@RTTtXi8cV$fLaH&K5Anh
zoCn%i)OPs21KMtAd!g-*b};I2)X}IDP^X|eQ0Jh|NBs<SnHM1$Xjh@G!S5T;ZbZ8k
z?RK=ewej9S1D-)ddm8O|)XO-Zn`rN$b)vpTt-vuw!FUG`?28wwFMbb38-_L#Z9}wX
z)HwX!9&Kl|Jy30^NjmuEsL80~Q75C$(11s@Y2kR^Vg!6gwChke<M&;mct0V2&qrH`
zT7>;wM7@rE{eyZR)rtBF^*yS<7jpmsuvcg`X!U4=(AGk0M6HkC8>2O&wnA-#nt<Bb
z8}DUpiSt7p*B0;8MqP&A*T8w(5(#c<;hl!4`KX1!=TWbQ;N6aO@Loo2gV9s<&QHSs
z@C^Ka&42(q<SMs5UM_)>fXAg(!kMaB@pm0pu?_cfRNZ^jSE%q(KdA6ZHSj#u=vP+!
zJITiFpZfu<`cg1-6MVF?tir#tq8uACRdX&}tb>15m9Xg)QbW0fRPSvze@5>37so(P
zZY%S1!xC=$G|C0#6VK+rwM%3eK^oQLl!ttm?#saQ6$(<Q59EEw61^KHYzF$Xsb5#f
z=Ni_JQKcY7lSa8me+H~^Xo)frZa@kR!};`^%erHA1{LCXP3l2M&NBNT@~=8yHU77(
z)@u-valcV5^m(hvd2q)+!~&5SpEprG^uKjNvPLAp=EP1_fzWx2Y-&-}w>c(K6+T~Y
zsNM}rBt}Fk7V3%PH|?LUW?4H`2<+5b%Mv=5^^~(|)Puu;ED7l2Qq{x?HiLQ!5~&Ue
zi_nfnPZ_>NRfYXAxPIMot4c1(#C<VQG47>y%*SvZ@^t9Ow;uW@Syikkn<}wCs6V2Z
zpW`71Rsrh~5h#Y{{V&);1JSSQlkUOFbMS653zb5D3zwvO$br?s5@5lY%#YxI&yPVr
zla%ZsR@!lVd)4v94hL`wj&H~Dp~HJ+{x3L@2B2SQP4~e41D_@;1s~dlW&eY@gpO{w
zUiF{;|HcABsRaB6*~}_|#8P!XSX@uQvK-*Vs{Kh=;N)UA%*ag;Llc$be$}>{J&E$)
z@c>BbF3a&`STn_#pjw=taa^%GR&nD=O}WSE8YgEWbSgs7mPlndAM-M^7bD0gjKD$_
zIREA;HaAQ}-1ZiXH<q*;=g<h)LIZ=(oA8``uWYNg5Lkrq85PEoo@vQ$SirKO-1u!)
zk0m41Tv~yoh)5tW#&DJl-ecAY<Ryrp6KUOMEE)Kf)eSQeC$8U4qvBaId0o0*poT05
z=HQZ8L$A}WYMcq9>!gV%|I`0p7~_{Hi(zat48tm1{tRnp#E9ViH0g#RXN~XxER2{f
zB6^+OFmP`fypj(wBhO^SdM63&SY(*=cb>1rKb^u~V~k;GhJL5@-s0e7Dhewiwapeo
zpDiwp8xGH;Op_wgaCnMg)Hb75$f~Jal|#HtP8#!Lv0BJdD%T_vttpqbSW@VQMcCd$
zZYDnMGHBbm=~eoHyN4<zHPqjR@c{k6$kU0Z(n*bTt!|hRS*So`BN}ZkHBBzW_<<q`
z%*87kjE2zfTps`8G$K*!4Z*X_s*hnN&`zY_J8X<YMQ}bunU3S<Qr#9kJ`X`wTZsa4
z>@zpn4Kpe=VU%W~fSw7M;P7B17>~+a<orvhd_$&^fnFfWG$LoqsA6uJ8|E?vj4F|M
zi1MgvOtDg+q(tDKNhEA86?~Vh6yo@T;AA4l`7rbI+^_)sjK2;1VBCz$QHp|DBBn(+
zU$sG!=}<~S^;BZa!1+;w%u(!y#i2$j4oe{_k&~*D(T~$*<u;seCiTiJR<cSpQONZ~
z3cIA4YW1jzrRbN-@z|R>nfeWPc(5uXQ7BXJF3DUPkPUqXtW;ZwOq4_YQ(bOY#`SAK
z8TMZ*C0Qj2v`~*wEAbMg)4J=@fhqOy*W(e&WLn4Ja>G(;qN;E`^@iSPl#=Hul9wU4
z%_S0}i#FNLs>Sj=eBo^xk<mihBt6*;OEqPLWmAYetdO=|nC>OjXB*hyOwz#YqFwV{
zUQ%s_L9Vlr2vZL2`jt&n6U($E234?`G>*xkgTE^C7U6gvtdoQ`N;V8A$<vB7g~UUf
zO=>q|4Sn{oKJM5>Jk)8VUJt!t>;bc{Py~Cg$CwK&B)0Qb;AHp$CQ8_R((P=S&K+ZW
zWaCMUlMK+E(o0khMy^*=t%fo~FDGlIaw{WKTBvt3!q|@5+^|fN&d6b3bQ1_O@^P_`
zh%KRPxQ#Z9Nn?7RPWF;$v#Cd;WLnp1V!CX}bi-1830241z`c{$_U35BIx`XDe5KGS
z&3{bx6l?TEtb|Tbr;sMgb3THNkWDpV!_=hZ7Y?;pO{q-dpq@$#Q*TSLhe&Cntj0=J
zqHJPZWLA9)%Oz&2Rwj}La|>0BoDwl>rLaE?-IAjuEa*`}2Gq$Uc)8KT4P*QY(a*A0
z5;i~GLnzl%0nS0CE+RhP6)J=(mI$?w0g;9HEU_s+jxm0*AOE@Oc>e`#p~Q;orHpK~
zO(BGB5@UyQ=m5o%VmB;+{Bz&Mp;SW$Om`{7Dl3x47Ah2}8R2T9LJZv~Qc_$`8WAkY
zal<0HkuaPN71;?hIZwfcB~nFnI#r8ojPxtBf;Fa4d90OsK_(On3;!2vrW&P#cusXG
zB=CQ5y9h%aM7=Ik!9w?{pdW?)R;pQMRk~pn`t>P95bB`%v`nQ~WT#S{p7<!UNkFz4
z`oxa=3H=Tk_g_}#hNbA2>#W2V2Mt{a{Sj&;EQY&Cn@o(^Ru36;fvgF92-Zl$(_J6M
za<iS=o|+aGs@TA6;;Bofa%yCvaxzt{Hj$|P%@|L4#FTFJbi+7zO}LS2wCSYfvShVL
zWj4r-Y7%ZOCh^DNf9i||HjEN#NhS%|das&Ts7p3TsfC0O)YHD(b2JQeiAZCnK9IxS
zCB^V3(ug?NO!bHj67$l%YhngG38Aw?8ac?2KXZJlE}peeg7MeyyJGm$92peOkA-yJ
ziR?oS%-KKqOfc(dr04x&oj?E=NNuF@MkOR^jY}ht7h`;wiM&lB>Ar^bu8D<m7ZGS}
zL^(8(^gC(P;(VwWK2=@J!gN~%B1BeTH3<qd5$mk<k6;ItK;}YC$epZ7_7Z3*6-4Oq
zsvpQZ<W;CPQ3<{n#*?*^M$>aXibbJ%j4?`@FG==fG)5xU+lfSJq>-?9M6HL*nTRh_
zH&WwttA`ub8i^<n{qUjc&oA~6z*a%rpmQz6FgG3Y3x5`|i(F(Pbe0kFTLVKs37~Hk
zknyltnMwh!SESNYHBBR$>3MR_Hx+>ol|GGVr`r@Yah1HQFurIC@tu&P5Xce9VXTUf
z`De%2<U(*GK+Gc+S&4i?*+;PuJ}wLWq8zDLh#&`I*gF>63&xn`oa{?<Eci5Y^6iGj
z=$C5r)RTL$l^y%{HxsGZLPTLWhjCW9Fc|wXn}~!$$4xDE!y>Lf2Ij?Rq>5y{0>%*E
z3kI93%_SZVyu1qWfPm9yfknj2VOG?{4D^>!Zlg+V5z$S}M8BE}vAv2dBmq<P3I=f#
zVgRay{R&Je`zU54cItucL&rIk;=n{Ij51??ImDP|REqQ#DvHAX;lmnJTy9vXO{AiT
zWU7MCXqsB+A=McfrNu<V5qcU4eIkKBAO$rH^h(q?o2n)jOI+Xz$~xLinmdv`g`yOL
zOhBng=_IX}v7TbB-JlG{*i#mg)~T+K;0%M(-$?733Q3ntn-_t+a~$ZyU8KiX4lhQY
z4S$4^pm-ZxbgQN&7RYmn7-KVZsEybT=(W&4P&ODtR>c2{^0Yz@bIAc~21)qB?1n|K
zeN{TaN}0}k%|2qz9mRN+N2HPd6IhK1ax91bku@qJou<3IYGMiQtD+I^ZzB`aeRZKm
zsLG^V2wxlHx64SYrvUdBHjL=icG7N4jvE%rlc_{xB!Su#VqIcYbK^m*fzL0>Bh7|F
zUNN48I@mva19ao0;*Vn$<Wp%UO=sCu0>~i=#8@Ow5;+F;R}YoLoj=A$-I4HzYhZ4B
z0en~)n@#G?Dprah{9?oaYJCO?9+@NOumt+igH0sCW2}mgVKMxBh&-XwVP830tAkGp
zd#dj5l5xI^6!uHb>WTNzbh$f5ss}b(4j;^CWU*YVgPg(Uh#@!9q)ZuyWzc7cN2q*^
zzN-Jfv8ZZ$_@5%!?U6P)@*&_4*Ca~D;sXc1;s>$|{VPE$99s5qtf54TAtFdJ$~k#s
z5Iie!--QE{Wej9lpoe~i|HUS|+%Wth3ciV2X(96ARyhOuh5pD@u!t#ac{1#Xa5`Cr
znQU)+vixJ1vp;g^JYRdUoWa<KO(KdwJ@p%C!}&lNlSKGWCK@!*2>JgI3nY4MZwKGW
zG}NA_VAL2dVTth9SyC(6st~|8WBj2@)n*z#(2V%#LoC8^MLO(1&_?SIhkiipDaLqZ
z!?H=_)O4jt<ADE3;bWRe{o&~zHL*mOL!^3ei*egzYPw1&vKpjvO6w>yNZWx%U_Igi
zN(14K#M+F|4<BL?wwH%fYA`xTLW)hz_@@&=Ao5v=1G?GM)r=~$3j2o_llJ4RUhX&t
z<{jKbyGYlJLJd(npo}vS&s#{x`FY+9>>7cMBTX`pKQp^w!o>?*%!~fE$j=FNHiiLz
zx+pd2-QVgZRJmZ^De?BVkoZ34k6=u5;|}@g?2z|jFA<v$e~l$|!C$BNOqD>L0{f$<
z0on}GrlZRZ3$+=Pg?xr;OGrXea#j2-fX^)^cG4s^5B8MB$TVSmT1dlqvqw$LpqIh<
zOGW9>5AeTXzl5;9h^I-tX!yUuRw9NQBEjb);|txe$RGU_;~)B}UVm08LcUU}Nv041
zCa@U`c||Trl}x=!2?=SF>5f@!uYzw2`x4TpSPuPL6~Bn!FRG($GBI)s7#~!q&Li56
z#qJofp%gxkh-4FOAILZCkp#Z52Udhgqg|{7SQ_r2P`r%1t4-#H)rpkF_8Qn5S)WXq
z6tTAqGKrij5yY0U99BRlAqPvCuI8%#nplp00sJkJ=#WVfyC@Mad9XP|*rb@1B7Rcf
z`qc3MrR}V;nwZ6Bm2&ipGKtKZDTD7r<jB3UG?{o<^fC#DwQ9;DC*s{X@1t0OcvGf!
z5M3`l_mx#x)PiG*3W?5|BjfTvTs)*u7Lg#UL;f)=t@0O&NN6vYT!>hRlW8UR2<@C+
z<u3{03rcYQ;ho{n!JqmNt0B8aDusQnXM=yo`Hsj3c))*-Y6ttFg)adAQz6PA4LTPq
zYhw5pL=wU2yByMFU=A1m8H6Gmp%`!N+hIKF%BUEznHJ+Xt~2yQP3-SNtZOH}7;x=}
zr+W$lQ-~zWjOhY1>DsQ$Q=o+Z4-S1LR?^0rsji6`^o!uL`l*shhvZ@}e4Y|>4s<{f
z(>AtD!>H}Z2Uua_ouoyZ^#28$p#w@tTo1foOk!jtdL#7-B}|uQd1^*d%*D5uQ-u7+
z=D1-2{C^Q_m3L?wv34|i5oJ0R$}LE^W)o|$StZcHvEcFvu>Y2*bT`Z())IuOsXzML
zH!D^#(6u6e2bGHQNfUn?^fhD`^2p&v;e{W;&=rtR7V_D&kxR+IS7*Y^i1(98L@?|L
zd~>Fr8RIFP)Qz$!YGMJ#Dye6Mf0#!iqa7F@dI}SS{GFKw1{cb>cwK}sAO{YKFv~xN
z#Yz+Izn+9d+vJG#sR;H@4o<v6^)exjFGhSOhh6rGN_NLMUoqkrE<d1+O~>*__&<n8
zq-q=TC^@VEv9K8Nvs?=qXjbNi8Eh}oq95DKV{trA_7Rgv5c3Hl(pl(I<TtT@)<l@-
zJa-JggW+;+P_vAsj1@|3I3Bh|yd(%qXN3azBCu~<4nzul@G;E!dt&e-i{Xxsd^_e;
zyfEe!_44put3<?qM&b=Q@or+qJN7<~eQ*pPOS(+J=}+V&xp>Am%nFR_hyCGfa)^nQ
ze+-MzFM)j3GCSm4z8^Ups@A5FT7gD6VPWqz&@b>0!;M^gQUi1T0Q^fC{JY2|ISP?3
zlQ0zXC-4WOv<`&;xo0LAF{lVQELrJ>b?Jl&w@|Sthcs%U_YenK4D#Si8mcxjZM8-Z
zF;yGbsC4SD)HAV0R#g*A!c6GTq`_J<(>A79CD3FNDTTk#ERS?DIy~V|6B&HeK;&>+
zH_@wWViEig1+;Tea5}MCja~wsjr0E@L~7DrkgKV}fpE&;zeM|+KaO$#2x8>es6ve>
z&`G2b$<!0`R$U|xwNRZ;B*BQs5QntZ**=1ch$Iy8t1g?whZn+M$$<Z_CqZgGZLh+7
z59~h^hI|gje=C3MN3kGKPxP?yZ9<_R5VsQel0v<MHr1GwT<(FvSYouu5&9z^UIPn&
z3H)UN#(&e`Jf#@AP=fKRQd(&}{~S4|JH@n0K54yRJ@R88!C@xkk698GYE(#&J7KYn
zm&n9%T4nF#h@VxWG!hb8=7uFmHgWxGj29YSCX@I>mW&v$*q<gC_7k~Xg%LJH4V@mY
zm(|1)_$xB_9}=~V_(T|G&^3r35WlK3h|E8kg=|qd`1geUQ--F01jDw5;{K2#qKL|5
z8R#J)bf!>=_&?ana{iJKx<IDKIF7KnVW9~AI^r*RAo`m)SP5bm<Ws2x`3r&G%1XIh
z0>+;V`3afP;f7_wh;<;lGUzP1Ifs=(pDF#5;lJb}r-}VxUmhA8{E2*`)t0$o&fieM
z-|$4d;TvXzzJ=_=7J9HYqSvyJe}deNp2}GV2?@+|$4Hb)uszpb%Lx4-0r|*fs4(Wk
zl`a_<A8`IH3msw97o*=DbNY|#uODVraJCwA9?(B(+E8Qzwh%GyDdI8OKx<ak#1hyo
zF5e=8UTI8=mEv$0m6;Q9?wPc;NbeyDEv&*C<QH3Ni`_6AQB0NX>_n$^P)iv61LXf$
z_**`zM3TT-J%!L)GK>drO&W>S7rJ2)j;{=d{}~MV3xmCeyb(RF5k5^jNgnJyFmgHY
z^GS1w{(r${D1Z#oQj@L`_!}8fJqyw4GHEvn;t$Mk2(ddKjh?oaSluvT5g(}4TtA6d
zVg8iOra~3s8F1b~h50kgWpeu07vtL^H{x!7hy{Wa_{M7Lhx^@5V^eXl95<&WRN6>$
zon9$`UdDt3{L@U*SOfiA6T@%k?x~Q?AkB2?(9g)fLHB8K-|G20<p05H<Y^-`Wo}pq
z|3nPi=Y{besd2%6z(16js0=Y@kjf?_@Z*Fk<d8@jp@RI6V8}N5#jp=lk}nftu7n9j
z{tx%fOOwNjwD@cU<`*CjI(eBJ=H@yi5g7l-PgM0|EJ?#~4j6x!dts3;Ml1?_f;^^D
zlKc@2{lWE9$e}8kWgzPk_~T;a8-)V6MZhBX$5rvX+~|(Uzt_vjt59cTg_u99%AX<r
zk`T&bK{^#RLw+CErxf9Q+;9pNMI&FW%qJ?XjpgEFX_%!-Un@xpunn;Q?jhoDA5rl~
zu@t(4fgSc!yP!xBk7JZ*k$=?@Cl(RFpU~j-qR{a{qD)y$%%GpkFMGiUGN_AX0*-IY
zHK?Euj3TED{yOFEF{{obbwzpb&pw9D@WC@llv)q}F9)U*`4cTH66Bw=w_@l&ZVtD;
zQjh%ahghU4M0`h)<FJy3`b@+R7K6Bvo*FPNTPs-)p_UrNQHXz`&s(YyAJo8z9}JRa
zMrzQ*zEUgJH{>99jcW}~r&cBMXMzmedkYCfjxbJ%{8>$m?GZDQVA$XUy+h4lzMbgv
zAww40UX!CCN?`1d!2Yz*P<M=ZSAzLg@J?FE(=-r0Muhobjf9e}nq;*AaV>)}sF5d=
zHgbzQ=AK+Y{>EEn!}lwvsfGTTltl~^j5)y$nlcYYhx|UyPY3_aBB3gGoJl3z^|6$+
zl~`3G0nUZ9U+}rj63k~wl1bGZHSTW{m0jtM9q5O@10T7GDn-fav3@6l^C#>iQj#o}
z1tK?$`=J$Okh+?Zk6^5C0slJWYwGHpaw+UFHy<Uz9AKc_CX-@5QiWq<j-Cd~i`=jT
zxjhfq4Dd^XH6?g+H0-fNjrnvF(FihF<a>xzr^b9XZi~k0j`4S?KkO^y+fRoj{~8Mw
zP{hni*d2+PWsnQy{38#{e<<blk6<+wVyvp5-&GPj?7JEI5b`9kLGUU3eItHH{)@oB
z*O=Te!{z;<Qx(t?0y(yaFC&Kjm%)D$iLkv6@(BM$g&0t-PISWzY?A=}UaS@N-ogq5
zCagz54ijqvFoy#SS<)cCN^>!%SLB9;)%`5RniIB!<>u>I#NXWh{6Gum3(KMq&m%t&
zqRn>0(2Z1%e7{1ULu#puWMbsnWno;rWTWA53nci@qaJKD^n{VkcgKkBRYvq9-x!H$
zoT~U5_C^f7A0<izh8{#dT&zxm{Hqav*2EYqxIQuD+eA{7$X^>6=z~D$<2d4kzgot{
zzp(E%60OYkaKp$4A~{Y1^stWv@*#oVhW+xDq?351-jhMgt%>oKWRqA?hC7Bn;MTzS
z3vx+&rByA!d@V7T!P#L2?IW`PjrZYO5X@(`jJCUBfz}THAe|DEgR#USUJzh?59Y9R
z;YKFWKT$1^!=%8+_4Y3&?V?iLuux@Wq{z*B2fIjzh-|emFrPA*4+s|-8LO(uLll@s
zg%LIy2tUCRZc)|5LYhqlQOMn5zP(Loq6%}Lghi~%@!Uk^RB-tu7#(nsNKD}w$j^R=
zx!95g^FrtlQ)o8k`^-cXuBJ-Z>-zpF^8a8dn@l33FfCBs{~yfd4ke*nyoog$jZ6y6
z6;g4Ojax6q1Zga?s`;aE8}-C|0u6V%W7r!Zbgu_njDCXn6#HY<sK|e7vRQ%LO1L#H
zBIF}<p;YFEp*L~+hydIBg_>lH+(xk`2>vt1mCnLe&EFt@;)(I4jDSAj=5s#4M#==L
zsTcCAp5bY%5PE`}0}{&fs^neFS_rrPK`JUCOq88<$EK=&xsotU6pn}3nVTzBar4ef
z6DyV=76#U^xrk%Z+_3=tu-V?6{jUdmuZHPC&O{2m=Bdv>{u25S`Cq9rnfRL2$X|Yl
zVLPb|I!2;SCjm{UOd4t>Y!jR_43V#v%4Fe~TgH4Or{e;RCGI#hnJ8l{gn_&v6p^#=
zPgGG>oDbHVY1MMM(M~<FzC?rT3lA%C!_XDz$M&q6F;X?+f5g*)7C0b!(m-ujU_Be`
z0rV;KVuL`7vL+TIU*G}zMz8?2p*Bs)5Ipt-e>VvFB36q>v_vJyhd_QYzttkF$PEib
z#2}F1*#h|eae5Qhk2&Bwsi}{DK1m3~u*2WEIWZqq8i_OJyI}_Ql8fPVnhX*jXjcnD
zVb9GOIR8xAxxdL9YuhkhQmX7zTz}$@5o-|SW=NQxCX7k(mavqOV$G}u`G(#d^VL$=
zf9N;j3A>ok)#-+1TI35b2ka4LBVBq>FDY^#T)bObYbBkcF^obH`<W7nA7Z#RZF1eP
z0=aE(vz<`n9NWd_tKe&4?h*5eYA0#j%%nu_hblsm`@(#(sg2VOOORW~dM~O7%qI=n
zfN$iU#IRK?<SC+AzMMfGRm{c2$P?6UlcD%1M*J&4yj-_UwgUMj$P?Z{1%D_cIs@@0
zViDw5xcpvdydCoWA!g((5uhLWK~gI|Mb7yuBCHqjAQ{9fss!;kWFPiHq0J_`Hfb_<
z3|)uVN{)WNSo9M+Wt1#(_EyY6r@?F|R$))*Ls>kLxnU9RFXp^77+;EbCo51@*#r0-
zdgT9Lf8}XdzoCXs!8LX*al^u@euDWz<XL(Yu~>J2xdRjO)ke4voW4k-Tn=B4^O3i6
zx?u_8Jt_9>557G*J6TSCW$^!n&}nL#4{RfH_!EfXh%P1#^8F#kS}~$9VS60IuN~|=
z{Bs5FzZ(96Up>2w#r(Yz`q)#OPl7BKOrw5?tG0)J_RyA)U~7t;n|oC>p~x8+Nmvs*
zuo?OTJ_vlO+U*h*AH(t{xJT4V!mViv_=||Ax%^8Bsc*{0vPZbb&?g>B;Ft_$O)RGt
zZtPPf>|In$ky5I1QI*ny{Fj}yHYIw9C58Aba-Ya+wKAJjH8Iu`Ah%;8e$bDto203*
zmKX6G^69Y|q>~l)9)2C>Lx?sM`)g;y{CEwF?S=3+y(6+o2TLye^EB9VBgi*0oyL@S
zGolnYBd{4%&se7CyI}$1aU{P8G3Jquvn*PXe>&Fl68NH-#5U6IB~V!zZVibpJco1|
zlkJ9uItL?$ylA7+Nv|<Qn5H5I3GBIvl#tFz*(#yFhzgq}!xt+iZTnk1YhqC#H3*@f
z8;P8xJ=c%9a0z6d!To5GRHPKbACSU7B3OTI>Yw3J6N{_!XI##^ep0rF5P2WOFVq9^
zT>Tyvg+Na+w#<~}?0+9DZLfhvz!J_rvY8|@$)Xg<5l>?5t051;ZPc7SN9<1#17Q76
zSEn1sagiGag@~~Xec<McAa^SG6YwiE@rjr($9yF8JLb)ZPZF)tM;~G<{B`)em|yoD
zO63yF=V3mFDsla6H2h&;tbwFz#GkVM*)liG%@@LcYLw|jJ~RXQMa;WF{|XVm38Nr?
zz)IW=0vo~ffc&{(*jMyp-hhySX)>HY<UNt9!}5tJCLhipxI;|h4gZ3*XUJ+|ZatGs
zo(OxJjZiaNhFmL^MkD_RdBMkIm|mcgXv|HJe1h~bx6Hu}3(+qV6%#+ZMJ_}f&0;N=
z7&*Owc16&?@Sl*+6;dM&>Qw^%Kg9oT4;_k}R|rBsJimhcKezrWg@m^&l5?0F-zwPX
z+KDAq{r`;x(0829=VH9@ffygUG9s)8<pqB;%4SkB{&|=OCE(9U>J2n`)WiaRY>yN)
zgL#X3$!YNK?FOvrqmlIp({^AHo_{dnc>p`5VNTM@o{#4rKEwjnVh~{ds&1f~u?$yZ
zeR?|Vy_Ncf=8_&M77XTe9NdoeKqVwTrNj+05(nX)U(p2@k*+CrFK#Uq7Hkn>DkR;v
zIJJxl7`BO6u)bhRi5o`l9J<0vNDQ{$X7>?k6B*=tpieT%fF+3<p^`F!U<c7Ovy#L`
z8E#mh#`8j<Im8q4Z(EX&^@4@)H8V&=jFonqp5`gkWg@qd4P9)d2@}-nnpost27j}N
zG(c*~I*Y2su$NfFKqQ#MYo3(m0pA(<8~Di3=M9rAs+yRae-?+QSLM&6#@JQx9f&F>
zo5--Pp+O&~LJ90;=6qQTjqG2ftcg9M@N7X$F7B^|MvNpLQplSZ=I?xz8HD!FhP_Fo
zno!6W%_bpZU=M0w8S-V`5wO2BpBSbWVSWj|KXkps2oAfJz@O*V7QhFAf9O53L|zj^
z_HnMs1aq#$XEIS>y$`M(wjO#!5pS1aeGkTdBI0v3*7w=vH8HonFf0xF2mRAiuzr9L
zwh=yy^JU^qGR~i38zBY`%phdA3H={p&i__M!@t8l5=@2sA(tw_`EY_NOH4%m9I-9I
z@wqwmaqxd?V4>VdS=?_q=9pDe)8t${B?yNN!#tdqEnoI8wm_{QMi__duj>Cln9I$R
zu#~F!TsIZ*8Loqi(LA6J0}}1>f1i&)?t!Ebe>?m)m72>H{tqVbx47{uN8A%Mt_16&
zk$;ujh#K=<b!{nCn2WhQMHW)Wo`Ln%$glht=JXjsti{cb8dID~p*+88EO9<xqv0jU
z_hn#xh81(H2$6?7J!)b`mydj5GIHP+(qL*L<U7$IlB5tL^qkd^t725tz{rui0B-Hb
z_N<8oa+5)T*eV<`UE77+s~gf_uhNMgYleC+w0JQh4(AYksD*Z1SmK7O@)5|<dxulf
zeHr3=Ng5?2A2EQLvE5102~-Z){|qi4z;ydN(G5ekaA8H1Xmc3bE2mB%N@ql>T&nMC
zW`>{4#(HBLBa!D*Z8Hbc@0WZx%&-oI#WkvflLhuWR4Y)HP=UITHtg(R`mRY+i?l_Q
z2`{6OF*!_^HJDbbfyH_?@}*WoQ**kY%V~=j=JJty%Ak;cCT4D;io<eXahRTII$!Ns
z6N`|Slq1GsVhWkYJMErA<om?2g^0K8O#SKEN)gsWh~k0u7RER$1Nn#=n5IxcN7kTK
z7BR*(PLHbjXRIL=(R8f$#rT0el7>M?YRx2Y5yp=jwqaf@4LScj67pRMo)>`gglDjn
zA{X(UoWadMBM#4?3e2PG=I3+s&mUm!`5s191phXX(SL_mdtmJZ7rS|?O^kek8lN{&
zfi4I3i7>K77JR-2hF%i}mr=Dojgf6h<Ln#!59C~wWrUgTM7&@@UN4P`v^fM1#4BoI
z26+#mCYK5W^$gi=$LDc;HXWm1&B(?PtS5v$RROCDi98MdR1J*03}rNVSpRNg6qz_a
z{2k1dP!Zxc@02t-{3+-HaEy4!J2fBcn?J<RABfemp<~pHE(7^B#8*U}0e>FPl%<*w
zj{$4bz+W!$UzqZ5|9@i*`t`X~t~W8k>q?Z|`b&wbkgD+9YQ#bdu$tl-9^_M4COka_
z&o6$6x%o%VXIF^Qn7W&gM%82@&zVML;Jewve2fPNa*1hFt}G#q78a>$ViEiURlQu~
zFYHXi96Q#xT4B%gX_(2vbY7S5iP+B|q`5TMY+~Xwv(+`RSZ6Z`jB0}ssW$6zla~;>
zRHiDU0lE~X?{>RJ1l|-9Ck=?oWxC`djHrp(bmF108~mbk1-;Aiy+x8tN)UUHFtZ`)
ztz9qT^Z{ZsqAa659;@B3nCn-fUr!8uL%sZ@B%4u4Y$Pz=MaNyY_((-|MxjD(D%wSp
zuG>F?(-==pGW3(#Ff6>aP7M36M82ePFV-+*Z;_W+o{4*7ClNNIq0cXNO-(Gs_L9If
z=vIfJufzcTqQ*RwnRse*sAWxxCvu-yzYF~xSV*JSnDG2xO$<L5{(-{G8lo>d)$n~N
zx87e<&qW)2k&E@hX80F&qG@6_)LoK|{E9o4B6ilavl;3gO7vuqkLF$yB`4X`FdyR$
zv6UG7u+VFPb2B{LG2#cVpCyKnZ6+1>c}@nD>TK$}2=)q?K*kW#8N3%2DQjYZ0KOya
ztt!xD(C)Q+2;i@B&%k<;Tq;|xhP-jPJUdZ}sDb^$j`ffqVyrjC^AjoPw-}^HVZU(i
zkgp{S&YxL=ctwKv0<npJMP7P2;u|*%+lAZ$?6843RHQ`CANw;CFUT;vjKF@vzv9kE
zSxlwriB-=h{Wr$iFUVIS@zT4fbPwz${26Yo11rj=+H~kojz8FE7B<N{Eg$_KVlFqv
zqTfSQM0Gid9wPW1Ld+Sez<0<p$S<qL`dr*!@Ef!+&7&rkA|Mz0CliHQZ3xXZsig43
z<rMxCOAQg3DIQpxiAzgCJ~Gh|zAOX%A7U2A@-)FeWK#?g2U0w_xi@(zd^b}zHD^0j
zV#EQg&I<LPOPgdmJ!@i#GL6WP^YFIi(`LVws3j7+0naj$P{g%8bJZCCc7qhTeS?`8
zx^8#6VOE}Pkn0^JqL;<c>jfv@`9vW|Az>=J!IodbecvZxfx{#0hMvD=Xlr7zsEBx~
zGD&!Rwqa1%O&`Ml@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_
z@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_
z@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_
z@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_
z@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_
z@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_
z@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_@C@(_
z@C@(_@C@(_@C@(_@C@(_@C@(_@C^L_gn`N{q%9FJ4EL}4M<^C@KN68hD3(g3Qm(Qx
zg^Xq8tW+xZkjoWH{77XgPY<Pv`<>ef_i^r1_@`v0EVsq~v!BX*;>9v%X0wn9B?2!-
z=*3hXCn1C|Vy5cnKa4Q~p-3#jDajSs;Ab^XUnmsdWW^#8ww{B2BJvVz3=LaLyt@yP
zhECEp`efy|Y^^rCkNEWX!x`3i=;Zk_xz1Pb=U+R#j<Ie;lcvp@n_EP;ZPz|N!P=o?
z&tARz^tJWtKWzAjk)x7FkC`%c+VmNYnX?uw{B+T0>5G?q@#R;mR)3xO&6@8vZrZ$M
zYtHxEe*9_A&wKaf?f>QIvEwIB78IU3eg49qfBk*2_|oN@rMLdMedli3z57p}J%91?
z)oa(Ax7>9xMELJz;s1ZHtj2YD;kpF42O=qVU5sD`s?bX$HZ+uIT6dQYndBYX=o41k
zX63iLkH~5@?&0(qI{6Q|F09GT+E2MltGcrPdlxqU|J9ZK&xQS;>$*&oLIyWa=tbhl
z+q=gPdFDAEom(|Y;j#7hxH&g%=cH$jmR~pDTJo-OX@jHn<4*pPdVc1lg4h|eRC5x(
z-?e5geII_nIpW=f`SG82ow9G$+e-4e<7MvhwXeI39;#ivRhk>G@@?_5Rox#y?S1Ww
zO*4W#lDmv6SaI;dlKBHBUJH3LL;vW}z=K`>Nc?d_x#QOPw9`I^dXIbg{e~OTJLh&r
zgfGlFnQ*iB{m#Fp55F26$h>dmc`zYO_9o%m7hAi08W%a)aU^D5$KeZxyq`5}>zhi_
zs;tphJ+<S5=8iw$G(Jz=`);fL!SZ?M4#uBa*W5gT5gvZFWx*$Bqh~bnid4;fw)ybg
zt-_}{%kS2I_ITVV$)Z->0%vV#-*oSfcPBg<R-vz$>U}!gEcaEMZ9aX=fd#WA18;p>
z=W*6%v9(p(>F=)0Th(OW?<>B3GpR@6q_Sos+48scv?&|LG%B9ZeA?Z0BNxXHxLrvO
zCCnR>a3y#Apwq1;H+(atNAdpn#@<<pvv29o%^Lgrd|~SLnQyE|nwXE&E6BN@aJOR4
zy<OqbiQhfz(mEzbnOS>zi(B=J{v01QAfmaw<dIqU^lp=F(*qy3n2>Ps!S#*x^Cmqw
zxBJ1GHo0Hy?He+6_J-CuvAt{EnYi}G)<d%^Nyk<DtdsVnHGCPj_58++N7LWk=#kL#
zN+tR0QTxKLthala2OUtUq^U1+wzglnB4mauEo7kos;`B&@16V2_VmKf@qI_X+cav6
zG5nguRPk)rx2<-&diV-!cWU-Wev8tthj^?%SngrCe0qEH)Pmh-=k2N_+qT@g?ceo}
z{ds+!+@E)L^v=`1lgs~l9I$N8=#IvD2TrUAicV=+vA$)`PWI;~C+%5zq~OhoR-*6f
z_NXK?J+lkicKJMW-)~t{Z*6E?F{iBls(+M~ByP-@m4++t2mLrN>vo49_m6AY@b+@Q
z&n6@YA6!pMX?^*0!<V?__qJ{JIrL;;O7yJ6t-poT9jN+j($&LvcQtMP=jPzj&r~V<
zFJIrd>%x*LzpPw;?8_U$<==mDY0;D4ZnX%mBs-c8zkDnpekO@(QSjzo`^SUpM*e<a
z#ew~|%I58ycXD-`(>M3d-+n0T?)!H=%^@>F8nkf~ym_6yDoQGv=J%*W@t!?@PHOqp
zgezsO{m$KLJ59Q^mbsO5_uD_mJqTTN<w9QYpG)hUS-<~WDzl(t`O@xf&soeZe_5YB
z<<Z;oZw@wUe6{quQN?RNN&2R+;;UZ|4f|qFSI_%#<x|fr>kw3+cs*mPz2y?+l_A$w
zx142qSa(rkt+;Cs3Lg}hw=f6yMNU3E`^yb8H~-cn{ngr9k3X${Zt%JHrC&a3*>+UQ
zl_R3mf*tYw29FiK6iwTFZNb^A!~AN!?LEbR@``@@8vHglanh$jzg}4SD5&ANNf&$u
zO+UKh<jqIrqn~x!-!0WEkGa^YZ2zXA9RhC;j=Z>Ex}a^xt|?b%so1wm(zm>N(=FuK
z%9C@FXYVMuQ!jti=y55t<|H3nk{H(DPQtIk88I(v`2>C)w(4r$o4MV8^?RN3TDx*?
zpCd`%Jm~UG{9niB{9W?Ny<S<9HwNcV81Q@C@nYOP&!azFJ@e_+N-}L`McFN9C26tc
z+Q1)DFI_GUYFSC57Y$Zjcg_Fv$4x8rr*7u{)@pI-wnt;;*G)Rncw47QwF0JjM?C!^
z?(MDjOCrC^b^b8A&zXSu?GKxKSIqN|nDhAiHA#xLFQZ$X{b6sjZeMBJn5@A!c6BT2
zJ=n_;U2x*>i5|z>{?`4|mGRwT4_*JWZ1SrI`x@DGcfb5K@cD(j_xIbcmEIX;m$W!l
z$FJotbIg^*|LvC4e+Cb`+hFNo67{~tl(1L3AAi2QG&^<cwQetVg&+RWRCu~De?ei)
z$U_eg|Mc@;+t>IFy|Id{mezXupdfeG7xN|-4sq2gx%BdkV#FG2{_4K9{#hRT(DKiQ
zVxPOErXNZdUyT3xM!gj=tLyK0Ke$1Re|k>bjN3i`^eT9MBK6G1xtFikd)npr=UZLz
z_n%!0n3%b2NkH~XbH%Enw(k;LrMLS|{N!cO-7nXs?{@W#Nm;dN&(fB)lOJEaKKrM%
zjdk|Lu6sB8&(Qj}Zojy5AU0(AJoV<@Bb=>n)eYKNOWA6F$mhOsesk+|39sd>{~}d6
zVMDzowLUpMF8jCJ5p(*#J2$?M=$-J?rki^!i7f2-$yPI8?^1kSnsp*=Za2ZTDW7k;
zc4gV?yIDuK4NSGUepYtwoBvbP^~n==ob0xxVgGp}OS6hc&i#AM^|4P94y=4WYtq@c
zbI)_G{izeQ-7}32iz^@Vru6l#&rbX>vssqtRB)q?>*KF=jeh>@*3(K-Cm^wWQ$<Ao
z=(|V87fM4eXDqvWV?^A;1A`7p683I-^~JkCUc8#V{`85NCDTebHu}Ni+ohg!+ox`x
z^UnUh-A{g%WMR;ZDHnUkKf3sM#?DcF%lF3`E-xB#b6WesnXCTnp8mR$^cfR8U~xtF
z=WPab2ub$69Cu*W{Nf|Qe<@C9|MPgzwMkbl+}Jtx=7TJkvH6P9FULBjH#NWcY3|_$
zZ7WGk`MW;jZaBLi4hemleKgPS&WmO@-hcL}V)m_<^76#lyGG8rGyG`DhC}7EFNl_H
z?>p)J;q`Opov9?^sHY`E;}=idzxZhRu66TngzRV&SF-s~bk9mcXUAU+@cX6U`-;0i
zcgp{JP@Ja!fUN96-g>#`w*_y?XZ<<BX1uaLui*FB^OP^%kG<KulFZ-i__;@udF;KY
z2gkDZo$fSyopQ$Z9fK?6pWcc*bt^fw`IakpEBfuY`uT=+>y~8Y{5?nZy5H-Y)1)3*
z*&#`zm)#X+b<Ik;o>e}}C7I`n@cew|`qaaoqbEHwUyj;5@!rLIOLo<HuRT*h=M{Q(
zTCr~Uxu}Nceh%rrqqu+L7lQc0E6<iUUNbh%ug{>XGfuXjJFftj*Zk?xn_suRFsI`;
zo3CV@{b@MParOH)jeknmQoL<-L8CZ`d|b!aZwH)tqUtp_ed6<m&zt{dnx(Axs$gJ)
z>-WvEhl^h9I_K${IrzBZt4gvWC~m_h>zOx`u74Ne>=73d-8d?1WZc5JZ(L9mxC!TN
z{^y3r_B!`R3zPQQ?|CVXadT$%8u#vx^kb7&6uh~3cUhLR`-=22&F3sCkegbsJo4?l
zlJBy-Hnp64ZtL!Up#C#-+KP<>_LX*A{MOHFd{!gpls|rKc-FI$4A@ck@~zQB_Qme6
zBo9gt$4#vyF5`^jwbxnSPRMF@b+z*R_#Me{CE3?w*Ni;7c#HnZ?KdO7>A3u6x40bh
zi;ef2{_@qF8@C0q<D#yYOve@9h0|hY25e}S_4gtDidS!33ww?!d)sN<-oG1l*`F}(
z`HJV4zpEsRp1U$0VI1seFfm3}`);fIvETN6J977mVUMqW+O_ZU>?v8h;?8FzWNe%C
zqU7DYtnYU%?D^`6Ygz5VuGRM*E=}`I-Ok=C{%dvlfw_h~>8HNCx8#RY?N(2ieRo&L
z)?1zKPixj-<%`%`bK|ZjnF=PsZa(dL_IBBT4W@bL?hW=TcsJYes$cJ}pKki``@p4(
z3xa-}ePMX{!2@${@4V*Osc+1LPK(zrKYSP0)?5C0vsVdM6y>*v{b~+-J8MJTO~#Rx
zB>C=!N>Z`$#jZtL%l91$>-zB2sIi(`hCZWJ($dCnU*{A&+VQm3lbOvPZhHFeWL&qK
z8}CmWJn_KaO(v}PrJ(RlmyH*<ZhdplvNpM*=}FVrn^WG6eBUAd+ACW?(4@wrF1|b5
ze|6lImZi~;;)Z>?c1G=yal20SaQ5DD;YpLvgSTFdY<S~Y`K>Qc-H$uBBcgC;uQ#90
z`*ry>%iZFO$CqM9)|NAD1Mapsl2@ma3@_aqTE6eV7+vizk2O41ey8FO`|$TMJB@GG
zcYmjwlXl{(@#8Pm@jLhC#kZNm?p$v5NyWjj|2PhhuO#}Q8&9pfg4e7Za--s#DK9F?
z%U-A6jdPs(v$3O1*SuQqx;=ge4+tW#^N0IQv);GpzU7aX%PUF!85542lz8@h((yON
zvR$!x1u=b34|{d~>4Fo_T+QYjpY(a>kfIY6^P*>0T&!reChn@M+06m_eeX|yS90Rq
zg{FhMZ~w*T;pMAuzdgM>a@~w0ttv_RpnFR)yRFUmZ23kwFrTJwIsEhB<D<g{I!4~w
zu;7u`$~O<U4667m#5-p52<Oj#pKo|9epV&PpOZ6l&V&=jUz5t-{xbFx;oe7w>y|k%
z2F7em^4k>gZKmnUzMwe`-%j1Na$MYm&u3jcv3ge5{S%vg+4P^KY@;^If6cr(*>UpL
z$%L-1z>Ak|NP0Itr#v=uO2C}&yIy?bI5)0OkB!Ebox}EbAA9UN+c+e;to(Y)%+g=N
zysos{ee&?HWeHp23g3U;Z_T)NXU_h0_x3Hx_gxDnwhGBB-PUMt`pJtk=r@^<CT897
zD=A&lM!53V-%6&6cE;v?x2Jc#PFrW}e%m^5?Mh2|$*3E7v9p%1kA8W!#rH${w9nY}
z^?uu^i39Iu-7fyK`A<*eS8UH>?XqD7Q%;3dd{gjqy#}A}-uC!S-mnX0(Vi8%cYPb9
z?JryL&H7%(v$7jsUU-{z=Fr$9^GdQ0`NLAIcs1|o<dVX^ZSqp|g4XRv)!CX|9(heS
z;_KQ23$@BAujd@@y6R3P*>h)A`7Y<z$D6%5GqCJ+(KBhw?2LK+zy2kv(cYZ*x64-@
zFbvr_D7k-XTEfI>({8sA)}H*&@aek_9H{>;z%_SJqfWbA*4ksu6U0AttY6@9@hR@$
z&B3CI-)0@NJ-8e>Vd9sGE3&#>S4F-Q-YmM}yx3#lv3I}jS>Jn8qAjYqJ!H(Qy6>CE
z>$kiq@7lP1`8O}tN580d(RcUJ!S<{(J+`+>2>fTt-@hE}`D)zx_i^8Mn())0-}c_@
z_mAAfkhhcW4Z5+kY2K&{KX;!{bY`MsNVCVUm$WwPpWQmyGe}h$Ir#XRMOoX=Od7eb
z=+d=8@juopot8W@BKDU3ectN_PtNb{{d3nFe}A_A%(P)AUdDa$HuCuKQ<L(%zR-u<
z8+d)c)3^QPE1Q0~+&ZM*lE#nD|JtQn?=LRT`25hw9=+2IpA>u>7?QKSey5%*uRPxU
zO5T3fSEbAQb=WYtH008aV<%!K?roHj@V2Dk3VWP?X-vYq#*PWYFZX%)ZAHi)wQ6?X
z+_8OqHIa{&w8^`7d&9hrzh6jgP-pSxZ${>==wh=RJNx;&qg{#c-ntD7R`f6HC>!)$
zi_KHcKCUDsS%+2A)_$%#@pG3Rt%eQ$X^|sz=*cECebc(7=)GSA|9mt0@WU@l_TP>j
znKi9WOeNV8+wj8QhmQXBa^AzZB^%@imq(s?5a(Ht{PmP8S6WJYt-87@s4zY$?%>Kl
z`x<tp3OlWAxOCvc-=8<CQ@pu&K<>2_zaB7MTfR0Rq?trpzGg<wzGu(pCVe`)W7dd@
zI;Ym`dpNOVRG+~Q_ZO>fjLmovbaJe3-}0puA&Z;M8~T3drjQqxPEL6-WN_;aC0T0y
z>!`&)Oqg^^_eDxv#JNA`20IoFU7Ols#{@cR{K5l)^M0*xyxRHXhar_@b=>5}Z+{<~
z+U-f~v_s{~4uu$34rnuOU*{X$o}9b!;N>>oxZUTDU8p3D-jDJ-()_2i=;=2Gw@FH^
z^K`^f>tW~TV{bI?Jo*Cc+M#)c+aIi05Zma>RnDyR;^0Z;>zj4+t9Wv&;9!GoH+MJ-
z9=8r`Kk?4I*)8Xhc}D_b$<_B7=ZeKmS9rSaKfZOm&);{tZ%+E5&DWa3-P?wojlXM`
zba>tB0bHGN=Um}&M-E>qD9!rx(bO9rV`lg#eZO_{%i9MlvMb4$kc0L=K9i1FzcFN5
z?(wWOhg;8O9BVuMT)rkXDEt1S?e}J_{_<77txE>UAIC4=@%Z==t5-&Ik&r(9HRhI2
z={#qTiJtdE{9;2LL!Tdg8<O5MeSDKk_3wUBKlEPe*601wTHXq38~n}t$UCOR2S$b6
zdVGD5&yEY<mUZ2<Dt1JjInh~-T^B24r<?;$d|jbGpBi#=@t(-vryRR`{P~Tszg##s
zdhD2$ou3(O-+CNu7xpC3YvrC%wL&U_8s5zEy01Gt<ox><8~fiF{r69o66Sq>^|#BL
zkB$E0`kBDm>eQnxgyT~LPvk+bR__}5W3Fq#i0_kM3vaGivUz;S(dJ1y``$0-mXBO=
zKQ1n`)}EaGXU|UgDd$|!zGJ)ej$3W>8jrc5OzoG_<oDq77p%K0j(suh-N0s@Mub&N
zDlYP?Wj)1&oou+GwB_F$&5^Ae9DysfC}RD{m*caVzOM~GYeZ_8Yva?%qpw~a>$LP(
z=-n>oU(VhiHL_>Un8uoO<43kxEjk(7Gh*AKc=2avvLpw~zdqnOwq^YFpbNJvbS*L#
z)v6E=POdmx5#;*R*{1#S=Ql%^#<U+Xc6+}EuU6Lo`NYO!bH=Xpeqy^ab@uR-#81{O
z*kDRMIq}kf(h;|Bb-v;G-WF5PX#Ds_<4Ct!t6uy39NnSU7pwM9-Fx!I{gz2jFhtkB
zN_I91TXx9r!t9rQ^UV)lZ?jgCQ4K^5-=sF&vh(3`pM$&K_kQx(tM;yK=XHaL>xZ3P
zr`~J4Z1$3AhaWC@YB5%lCDIeZ7GXiKfg2)j`^OIc<YLEevn%Q>7%=zTT$xAczC}}4
z4_r6G(;_|m=cGR0m9IbG8MwQWoM^uJ_TsqvE8=zyTk?9gXYupW$(xo|61Kr&a!NRD
z=`2;n%do+_FCM?MYS01C(mIz-#~$uj_H@bVj#*!qOpEV+|7^&s+2tz_g`~D~J-S(6
znCSd#!RWUqcZ?rBdADHuAE!cpu)i8AyZiI3KL<NI?;@^=$Ko_U&wdmwd)Vaj7CTeJ
z?*-p@)GqY;h`g1pYd5=cZ9ub=Cp-TG{-)dvd00uFcDp(1_(9?E43~7!fwgV_G#p+c
zGerEPziR4{V41XR$^9nXq^ZMybUwV?yWo?TEq~AzO_<6yKbCv>M61i!8tbHY#+T$=
zJ9*Xfrq4e^v#%aJGoWk1@R><lL!5VCdAg>R#$B3UfAWJPOZLs^KIX?xyJl`4KlROy
z`E%A>%J}@#oq=!K)|1uGANEP_9fwQ4UNh&;{#U*CIe#m<S4qZp8FQy)hvELMe&4m~
zRZf4?=G)1?{ULCE*7Lxsut=}J@5f1F>)uadoUcEF{gVGR^s{5nuU>6)`f$@TUBbpS
zk4l;T6`9jzmS`?@?H*rxWzeh!pFY2GtzVaE-~V)CTG)`6v%l4^d6Pb`)b`cPko&o|
z@ptkz`!Bt@Z?H?+WAD9<cRhs_$CIQN51CvE#~P?Un?0&@#=e<R<A$8+ziE5^M#=5r
zM9}M2z{&R0c2}H?Q@ro@H1dddKUc?d9shXW?c1cWKi<2adMB-ad9HqSpMWK&UUgnw
zEAmd@RG&*7oHt504c1I;ptZR?Ui?1HYF)2XpV<3q#MR$herp~z`S_PFUhMp?*3-zY
zdGp7HeEN5vz5bIEMh{axF%@50^=rQ!efmxbuk&u;Z@&$g-saKCBa6Ro-u1@CvZ*_h
zR=-ybODO-O!s~uW@xF;S^+P@@=r(%ds0ll}y;5`={#yLk?stzix4G$L$7Re4e6Y(^
zr@<$wgSHMRI~3$RxNO#|wawOQFaB6(eR=l2HL3f~H(#|N_vmh)UY&os8@N|I%V+)T
z6F&rQ5AodbNBz#-vaiV6dMFDf{&TW0^|#;C^U5DPXFZ#_d49LWUEhv-9pX9Un{iv`
z-+9|@-`eSa?yUdlazF<~K}6;<Yu7(?*NVmag2x8*ir?M;M%#ZH=;of=;N^UszH9sV
z7YFMkE;>Ks)2Q}K+ut$9>@8rv-tZga({bMX3cqK)59hu(u*>h6?}`Z<N)M$!-J0*Y
zxRR(349gjFdBcL3HCuMIyx#TtaK-+tJB5kY8lLOA;jfH&BjSSf$FrO(PVEkuP)UAn
zy(jp<de^yGmoEo7UrjG_%zm$P-u&G6ooDAk6|2u&Xd1rO+4tDQIpL2yyF~ufGWFB^
zyNJ!+Ke*=ms@Kz!X)7wc-iVfL-dnzfSpK;i@OJ#&d*?cyc$#qJi8{6A;s#BZ>h>(U
zx2$`oI|bo)g|+AQn0Z8+mGrV%^1aV~nmxc7bEHD%8ZsjB7hPuFF+ncr_U6T_UEjsj
zc^CD**3%v5j$N_M^}BNARO#(se)%eDbCc~qOnBa4b@qx|4OO#8ExTCvX1DnpYCS#l
z)xNiLvtFGUbh2Tc%b}fD-6tcZFA8oaeRK1P{Cyke1II|~`xYY~-JGrXK{4mz?$Yj)
zN7eg%aqP2iuITgM^u50M#=}po$2KqN@A=;Qb$)EU<lmnx817uYacah<H3PrgbKbUK
zM&Qt%2PCn>M|Ku8d^W$aZSRdAKRY%k;b@oA8?M$9_FPeP>i0PA$7Sc=M1Qf}X<5Ec
zx$%e2m*lFLZ?g^#+V#nVirS8VqpPF4Z2fFpB`HmM_xJ6`Lq`X^zB6p)oncwOUf9}o
z<_^OTu2Xw*ntX{An|0~2r<;oQuJ^fdrcvS34$nK>nYnO##>U}$yU~B_JqH$^`=WW-
zq>5VQpU(|))ye<*?eXi%?vq}n#h#d*v(|6Vv%mka4r@2<T8o6QmZiz$o*mbg9)38a
zWS%@Z`rFTr_Dnu}X@~UE&d0S!t*|xtgtoVnD_>mdF?;IH!^htqUK%rHbNQG3U9-1b
zkKX%W=FneEOZ&cyNu1CtK^|}DbJEmOIjMJQ`?0rnd1ra~9f-MqC^T=$jP9n1Kg}GG
z-s{aTL08Mg<5k1_+O%4Eb7iWxv;5%Ro0~5^Y7sZ}dDh7Tqi)szeEHJS0awNjaNJzf
zbWqO5wCVp`Jij6QLW9(X_5O}tSbyvk|0lyIH)8yP9w7Q(G3!pukRP@c9*)xflM<WQ
z>UrOYZIL}!_;i^3!|3myKRGd&ZLs8!(KVt?-QI`y^$Q4E(<^wxokMS2BPQ%k3K}u^
zml5V5XT!lhj>&@`O<WQkSgU3K3YF}>&yict-v97umuT+YV}E>I(WqO}fvif>+p&N3
zy$w@`ubuR8%&5@?ZI>+zdH(iKU&YEV4y}9LwBEuMnWGN3J)d3Y^tE-letPNqivJ7B
zKsCQr=JR$gD?$ehhvm!XuRSQIG~zcn+J71<xs4a8`av6JWjj}<PduJaVtspa%`A66
zH_i9KARO{Ca(Vpu{{ZV#A_PLJ3vMT#Na{Ek$G1<V3%!J&C>a?fXZ-s9RrLqU^A;La
zk$>G8QJyjCKD_bl1#<rY6zmsK@a)htGYOVRn{oc~kblp$bWHnz;eJ8_s+0PW{XI`i
z3dQlGf5f$44Yg%mxjhAEBCdW${2SI}(=TJg?pW^ChzGbMj(Gl@4wd>@q}(Z$u-)^=
zdi=$<hx-G?TGSqB-)ns&K|#w6u18LT{{YrISLp|ab%ndqtmWPE&u<)_+^9d+z3d#c
zW;o4tJwgu<-e`Um((dhUA&w+z7Ff%ww4^_w<+we%eJYgy02p;8Tiv%3D%=m<fPd6w
zgM7St4ZQX>iK}XMZSd<)X_n!xe%El2G;B60#6<1{WbxA<t#Wee-??IU2FL@~@vfN0
z`<`r;r*${Ry<L9Cw(@P(nB9jz=|4Gdn0}u?D>m=rMzGe}rrk<t#Ht+wTsUaIcn%`>
z?f&j-fw<NPV!Mw6_^T@SUxpZ_^HNziE+W|BLN-Ut+#SOJjAV5OJ*%cLk7FHnI~_;k
z{=FR55`Sr3<4wR}=e{oSA%ETs^Vezr0AvAN&Y|(=#7hRF8tR&c-Ae>F+U4DChu{0N
zyX7Cl?kkYL);FUz=JY4hur&=|5vy)x+ni)${F>^gN-v?Do9=eg{?T40I;M(SS-ORE
zxg$;T-Oc6CiHw`43Q1w}5O6s~0~xM!R{fwnO<;AaHP-bDh16IBD&5R{osw?`9FSBu
zPM>tw9dW1$uGi&hm03$7w%y}7BRS)^&0zSKTZrD=J-kv{Le5G<Bl(RAlfWmr1B~Ej
zt#2AM`yyTJcT;}TUMjYmMY#UeyFb_=7Bx3gmAl(3OZ(to=Q(Ysr^*1VOaB1cBgCT1
zRJZ=s)OKq@8ba4nv%pqe<H{kvPT=~fuRXZeHcKYvJPdKrpYl3Y3;kUZIM_2W*heRk
z$^MnMv88W?8ONJr(e*#tAH>!Zcuw{o5Vgem97xLo%Q*Rx=1BtFh9F4CAmvE~8CM{J
z2Rr`&3;V>8>H54URK4<b$49vT07#UyJ7n`0$~(SZPCeI;uMe(kP|K&<h-{>^k~DRe
zVJkP=n7JXacm+lm3&Goy&1AN$p#W}MImqK6{{Wv})JBay#a*73-?U$eE%iSR-5pYW
z-W5px%eqGkFiDzVWd*)-xr&_iTn^Q9LHO~heVfEE%dSlmYTiqEau<=LVJ7@Wc@dS#
zJf1+n=Dd39{yC#;ws1C(e(1>NrL@0~?3%K!m-gmpP_4%I&YFD0K498*{NHou1b*|6
zn+BqIdVIPs>gJJ?x!>wvAN)~m;!h6hQQtDn;ccs7wV9(~9mCu%@sYf5ayja|M?qNj
ze;Re@bgg>IJLyb5Ab8}v1<v4OkjT3Za-T6Hj-!g;FR$87%HPCBImUhe0MGTPW4Xew
z-aR<=@AdSoWljrABcchtkE}mpPZ?-G6TUL|M$g9HBGxp!?+m@7cy;1*OG~GU>E~E3
z3uT#|<l3!~k@EE`T;J_Mt>`}tJZa(|3-}9P)wOLWQjtHk?k^b`UU;NuRe_WOsHKP`
zaNj|S@jr+9)X{k3Py08A<MCX@*shTx&m!LZjmFqnW%+*h%EOcy$jGO7?^K#k8(#~J
z7yc2cnr7Xl?3OX7pYCE}(gFVYC*HirhqZot>20*O{{VUDMOj%LBwreQMQP$63+gF+
zt9#(#40>xA!w9^Yo^%eUhs2J@EDlBi$f`D<5_M}m6IatBx^J-S(nT%mp03e5I&EXh
zfL*#{IqzJN)B-e{hs>juCxO%Sr$K%;DL*qVPCvWb(-l&R=#I*9T~9-Ai@LUtt@t-s
z)AeVcQShCV0?@UfQDG!g%PK}eBu#?Bw=m~^(hlBnZN4Jvntp?-X)#;{u-0XUd&u^J
zU7;?~;khe=BXsMYdJ4_)9-#jKX42YCANwX5EES-2ibej@P4W-466EeBw<hHQaTYPS
z5^&_ziMU+->|kX706)^Xr5_`@otixZPx#BP>E0&r-mwkfT|>fg!4{Pvg+I~ODH>Sv
zF^9uBIbd_1dsJFyk7c#+F14or0BFks>X%lt8zF46CE1J3!<lorJijxA0}f<4#=)K%
zEnjjr)oigKVEy4&Z1pR*@OG&rdMLQD^X-Mkq+oYz7A8+FF(!7Pmkvl^OL;>W!)KPH
zdmYf_vDxXr8+<`;;!OuwhWR7ZJTn9~`fSD|{lY>^N5(MNEO~5`o^w=fd~c{&_-gk>
zNtHCcO5zK<n0A8FNeGZe+lbsSC6Hhdo!sXG97H;kNU|NQp}HS(YRl?ASi>tjW0Fbs
z>CJM=n>u4-)BH2>Q&5Y>x(2U#t4U)fhi?_7wcHj_+(~H+N>u{K@~e;zGRG%5B;v8{
zymftR;j66{IltmxeRCD{#25$6mL-uRZP?xNtg;Rc4&jhU80S78>Y9bmi>$_*q^`Gk
z%;p;hfvy%}sB@GYoD8@82Q@;|Rua0ZvwriYUjv*E^X*)+rp~%;UdN`{d|TG-yhWw!
zG2d;}G`o20ZD%n@`<P>g$y5UvIFIGY1oNEdnz^QH*RA1MG?kfGO}MyA$Abd~WL89M
zkWUKiF`RSLIIl9d*BD0}n@`_A?BcZT{8-S*v_9?u$<8xevxNE`wB-ZXu6$*AZ{nL>
zQpZxbn(EfV8yN0owvIPcTUEDc!ey6grejv>zy>&D#(BEBJ{$hY5~$N!<X-s!M&CDQ
zm%Ddd?KsA9_}3@mUlnQ=8rhEfO^->s@*&@BkeC9ml)E2qt1j0kxng_bsm0@28}A0|
zjOUYCx^w7n8jwe&H;VO%JV@HZU9##DS(_G{Vt=SGc^ff|V8!z18OMC{T~5EIX?CBp
z{)hdSHRZ>ht=&y?_J|f8lZ$I$%DY{+Alxv=X*~R*yj6T;?H2{Jw>^6Q0G!vY{8HDo
zeJ9|5f!9{jZS<MuyS<heqO}(Od?G7AlRiH4H#uX;srGdq#W}+0<jsn&J6AXv&+?~B
zW4Cw8xyCpd$2H9V0K#6;zb6}c7(bu$q5Nts<yRY93?B{3o_qfQg=g&QUsI#nK--4R
zVq(K)??dTQTSJkR$IN<TrFyQvtXcd|z3>l*<<opUq0Qor1nM7X)AY!#o@?f7q=GWw
ze6cY|gAd28JHo#Jv{~$JEp=T-S50!_eKSsy8$lU@+V1?$@op?KQDR70!1;k@9Y+h6
zeGFY_bv(-2KQ3^)RB_*q)pex<8(Z$4x%RG`;(x+jKjFW_8%<F7h6|l*Wwi3yEXd4b
zxI*c+G4rO?0FwMRc&{gm#U(&rn`z@cD|&ICQ#zB2I@_y}_D9`~*v0|tUm$+a8se{v
zHKyJF04>-64&Pz*ucNN~RMFbw9JW9i>!1F$d`I!8#p`|Joo+qbvw1E?M$k7O^Zt3N
z(3dLpJp5FXiMQ}zuA%W`M8@sEYkl3w+Z>0lew|1E0ITjl3@&sVR^7Dh<R1L`*Ta9a
zUDD6-8%UC7jW!F37`X!n%W?U9-&|MQ8YhY@29s_Q;bm1&pvDX59e(IO_2%YsywY8d
z8k}{NyPB7*cCJ}^fDfUlE-rku$MH6C^Kws0f?pB9N6Q_|gT5hbeq;goRarHrBy7{}
zo00~0u76tc)J>zIdF41>SoZ39{HUyX^&LV+{oRaf>*h=E+W^s9D+^Qf+8mhJxAC39
zb`r-2x3?ckbY)5_E=X^fkKrHFKjJD2X95Pt8+wi5e;jo@_V?}9q**hzO~+`;jo&x)
z$NvDTzOA1!iQ8~3-*-KOA6`%S{c9J-5@$h>f%iym4;^b!q$mhh!u0Fy^ais0RNi)p
zb-46EK=i@lvXIgF5Ai5}WPES&or)^2*|ppF%L9QS`%IW__~Qe)>0fw!E!GX+fV3He
zi~G$s+~>dgrT+jpuY~^qX^;4ne$-w+fVSP*tkU4;X)pWC{eENl``6eXv-Yv}?}FYJ
zlXCw6$UZdAbCRQOKTp!VtiJmCA~9CwN3~nuUC;2I=vv8YBZ~Z+fia0#p^Zq}yPery
ziSrus>)m4z$@4BaJRA(>x+_boDSj90Uu<iFA=E9}4<N70BS$bBv-~`Bj%$b1H4Qy(
z_cGo!x0U<A3VECM^Mj0S-_Jbl<F7T^w39sfY&P>=K4JN`sOUe>`Qo$T*DeH?5y5o@
zxsu)YnIsA3Mh00q>RT8K)SLm<vaj_!bElMFJME@Shul1`FKNizjPBizbJMqa$JMp{
zHFXW%Rr6SRIP%2mBw2j0H*VXFqCguM&fYVhn!2f&Ne$F|L4w~uBmy#P7f{x*ZT`6M
za7KFn0H5>TsOtLNvuOKv$@b$ee9<8CjAeKmHsm(!o!ha4jCZOxy6%(xr8I)l_v|Jz
zsSnze$|W(79hgUgqEDL}K_lhJKQ(#~v6HylzYsON=2d2nMF6P;aDUI^S-v>&1=QO0
z_uDlXbz7#Hyz98-GNs!dONZdLdgrM%TUFJqTS-M&+wIFU7o5lpMl1lSvu;BM4VK(N
z1Plyh<my`Hkh<O6t6_AOEfcH|o7~B7DUS;5{$3eFoyB&7K?5W2R+?NjA)8fGxxB_!
z&p$#x{dGc3RHMer%iu7`$R3?~k8D&@YF2Y-FhY>Y9-y;4l3WS5M=WG6#1Z4=DnsP%
zJA(m%w<X$^zoE^kUPv_Cg|V6$lFr-hrJBw{2G?me4=^du%e8lUj<or$peWx_n(m=-
zb>Yo4Nvub83N*_Vg39c4-<esC#sO4F$0KPu+HwKLdC4^q2lt<886N)tTAuq@v|TdY
zVYM;cM=P0byv8eXhi1saZNiixvcU7aa5m((Qt>{MHnXZt9*|+Pyp7Vv+wHDSp2UKU
z=577v21XbR=BL_QLX|T<T|k+b2_Mko{Qm%vinXI^lFMhSEPB`WY-?tP;N2pPPzfXb
z$OsCP{{Ss<CKvZzcWnnRQ1Jzv`d*(3+N#}K%P-n4MC{*cLR6xZ=$mldkGvRn6(!cU
zrrqlr)y2Mx{)=@B8yj`FmQU<`&ZS>}SvD?H=i!57;Nqp!Y|=E!vtP3bHo4;f9>jI}
z_dHWyS~2a|+gpC&jt5TFPX7SK8hhAj=^cb=b!PG#sf4m0w*w|sSZ4{fL0qm02Pc}E
zZx?B|I)=2-Xz(g(DJS-PKWUZ5j7+N_DA~-rV+KFoXCe0=m;y1J?sQUxjqe3&K6i_3
zRlGpn7*>>z?MCy8*?gzwK1eci(+H&e-kGSpeW@%SGrN!e5)b%F5oX8sq6zlie4y?E
zWfEj$kC+4U`eLhie_zuU`@`@zh2z&IwPPLalylsxYg?F=4kK;I$_P>A5uKo%oaVQT
zJX5CH_?usiydxinp7A4!+QsI&-=Vl@*s=*<dlp4;iFXW4NWlt6BbU5-6yn~DN7cN&
z$IdO-@zi4(%{o1E2X<R_2^b!r;MROzFVn*4?Al$kuAh&#gEYhYTlc0<-r@dFkchu`
zx8+cN{#dp@7+S?`tS9zd40R%g)y%U00K~8d-H85dK36fHFg6tAVY#VtI-sm|TBYn?
zWYhNQpV|^jY+6WyI{krz$@`PLj)7##e80WNP{Ok2)fAD9#eVSzwtxEn0I$}gw($@4
zR-xgWxx7DWmX@(B&m8{%X;^$fi#xHAj_`2U@(F~X#3vYV%yZ`PWv#xIs9Sx8+2p^H
zCWh&nQzoCa$tw`t6o&)@yfMOz6*)DL(H#+R_<}fLW9Bx|)7u~7JJi<tm7UIwdn}rZ
zTi-`4K1H9|*_P=Deeb+*zFrf9%Xz0Cbk;qe#0x83b49s-59xBnrKEA(S-aeM8oMjA
z7MzJgWx)u-CP9T5+Hy=fW}|XEBdJKbD&1O}n`1Vv(8}N0rxKNgSTK!5z%j$AWA<^d
zfFC%?9dW&ldmTuWm4hno1D)M@{{TOwNcw?RK)czPgY-O9Hh&N;t+l;6{{Z_BMUovp
z-Y8_Vk!Cjc%!`90z(^Z=6S=lBjDdg$6`vo9(L6aNirCt;lU&CzzL6X45vnVxiEzPo
zIdIML<dj?xG7b#hH?h)aw|2K$il(Kg&8OMza`y=VouVKyP!KRDCkxk%=e1UgTgq)L
z%tu^y_NQn%_1}toUvAoOhAcHZ$ZY=4{hJM}(?@gVT9tX(1D7rpUT0uJhXt?{ZLC{w
z5JsLJ{?Gd@p5~oye%rN;*4>3fVY9bpPV8;TU=DG`VJc?Pn>q+}mWtU~SmSZ)#(N$r
zXtkty6fc>$uN$yGKmN5-PaH=2>A(KS(D2r+Y%N8*3uw=hArplypEp0f+*=-J&5V4t
zQs>0+4-Ku4*=*r9_YZUSu^AT*8C86u*~Y<*zyXlV$0xQv%-%Jc(CT%aTGvn1q>oR$
zp8Cx~?4DRWlEkPjl*?cS+y^Hh1IBP29=Ps`uFL|QlB1EIOnx6s)jtvVp7X<gGu5Ki
zd^@M<x9tmB%ce_c(XE3r1>GD)w=95RfjPlB$7;>L@!WFgc6L8!w2iFgl0k5g?V5f2
z2H77!GOo{*U}JN2%^uA&Pivvl{{X^3s#j=}C<6s2KK`A5rF!4R8;v(g_y^z!^n3fw
zLe6RRIo?~FL2Dw)UfeqD4F3QqD}dSLbAetHb@3ic&0AKyT{lUMb$H%040iir)AzE!
z?goBF7%I6Z3RrX0dnfHDE~%t^KlpKNu4p#?7Sz7Sdh%FXT78vc4Rlo;rcMhgh9|$a
zXpJ>-O0&@6-&t_mlYZbayFEH_S3E0aedCW9>3SWjMIF|$eGQaNAuAYpT~SM56O5jq
z5(RPcYY8)|t2XR+!tufWo&77k{gmbVZ|yno<|b|1yh*2@T;kym^r@*$MK)A%4El57
zx9mgX4~SkS(Qd9hNucZ29vOxkXd{j*%M@#P<aR`kX)OY{+)vCmk~7aB*P?h^_G$Q`
zH;24Yd8TWA3|qe#Yk%6aU&Qk;fT^8bB3UiVM&4wMRz+azvx0M)^xubib=8-_{S!^P
z)4W+K*hy_Bw`qR_tYnYMaPUB<@1U1w%A5hsU}@eH)U@b4A*aWtZPbKtT-n7Wq8YR}
z&`4cb4<TAjp@`sc4RY9@YTk#<zqLoe--zD@J`ZWF;%^dZ8itCuk=erysc*D1d2Ue3
z#x!Xa6<Jq%Ho$P817A0$z7S---P{s7dViB&SpMJkH{K5YoAi{wpHz}d?S2y=xwlJw
z(<Qv#YpO3Nd$vrC_wWd>ilx*RL=!7WrBi9n4o^KX+t~BPbknAqxO;1EbQc~V-yh4l
zRgYg^O88gDI;(1aExsaF{q@|LAH|Kw8OQnlb@m<Zqq5!EU6*Lj%Z|e}@V2F?{j*tp
zt+#tKE?5P?B%B-%f2rfGWsHuB$0d5V(Dm<z8cbK7H1Iq!d2JJFDLF6Dg^EWx?VKsE
z(60yC`F<U>5yr(tdxq4=0=_%_iBTri<B%$uE%f-poxd{gVchily{qkOTZf9(SIm5E
z?Vde98u|RfN!3fTIjE;+e&d?TMG96qGQ%8>wG5hUjn!3Do;NtBOK|LYW^8-aH*&}O
zyyrRTTvjWaQPWt=r{y;1o_>CmRad!S+z+obR;n+tKJES^^j_W6DEqs(>Z1dnTAUp1
z8;4Ah)c*jV^WLl4%2aO7-a*2X(?3pw6!n{ApDSlMAm<;AeIfI^BFvAx@P1B0jP~vN
zcC77jbE4fS+y1Pa_xAq)BCV_WpD|*@gVP_=`qh0*Z?c(wUQqu4D$Ye8kw3R#Iv?$k
z;{{UTE<VdK1Ne(tz<Pahf6i;^57{@w0{h?>hVWFfB&ZH?(pUWWubw~PrS{9F{@3@i
zH_9)x+d1;Xuum^MbB~g}SN1T}{Lg`wYqV{(yqYZMIr+nN$NN?6Wq%dCzsS!M@FVIk
z0N!5R_%p>YX}@7>jkeB3&y(eq4C>$Oeo%1SbUu~lH#bb}BK*Es1dvZ&GyZ?Abe;s%
zEN0MrVHTzK&#;X;IiwcBe9^Y%EMs>a`}VIpn^*fp%%i6`&pnNL+@A9|dLg>4&?i4H
zL&j?xO~1WQ5ZnER;?~mXn8uRI@y8mL1y1IFl}6HeJab8?YRXFPRoYHYPd}YvKCy1M
z(HrRIlFejaIU$rsE61OhD-c4l8Nn(>dm7p#@|l-+tgW{yp+Uxf&(jr+e|ixl`>Nb>
zdNAh{y4I+^b1ZH0k-%f~AFn-stz_QnYAu)@xazn$#yj=>D|I^)$U%R7k)M|f-}~J1
zKU!yx^$Y8bW;=`RQr}d#ng|%p6vBU#%0P%%e-bEEBlt>?bBfQqm~7pM_O@`|-<@ap
zmr=BubUJ;s)~c`~%Ck(enI#MR$6u9jtlWhlmFc+ktM;A6?E4kxzRQ&ip|kiNJAQRm
z_fo`B@TZb^=QT%Ay<ineDz`acK5z5QHtR>agTWU1(=<P0xW1CasbRQCk;Ltvub4j^
z{c3%s%H*-BcdT9?2HVFbuMCzj-%9amW>+#>%+bak<H{pw4iylPNj^{nVMSukcqEJc
zXUfNg3&wqFr24(8_;^Na<ok16i9Xlo{_MrK{ZWq?+#BZH8#u_vdd!<q-gfO(82}P^
z>U;kHN}KjBC9AhoCu_&Ffw-0EdVT~{o*KKlicLXd*Vjf_H2D%=GFc=0dJU)Szq<z|
z@G!50B}PcVtedS^AZ1}2Z5ZdPfzu!7wKqo9?2_tlwCQcCZnBXgjb&*3m)dsC^7Rp)
zn`z+V2aanuCTyd92yZTAl1wa!Ry^PZ`FQ>ueSgQjG+#Bms@~ZIj1Q+z@v1kPx0}bx
zIQfYLj(TH1&-`ku>Y-g*e0xHb&Nw`G{BV2J%11>ycb2DZ;H^dC@wS`xeR>}X&Gv=a
zs}`Cy)0pw+7KK_>3Nw;`x1cot0E-v0$>YsIu6$o_<9V5rcC#FpGmS&{YDOC65@WD@
zpE{0HjIIggyf>)B2Z{9Gv}vp27*^sxH%<~s8(s{I!@575ZX9KK2c>U(YKGTI_@%2^
zSa^LrFAc2TN@>1i(+IW<ZVfT>2y!>_c;CkYu)eovTw`ZrC7;VB2d4}Ab@%+~t2=Co
zmkY=w;BYbD`PEx#{?LxXMNzmafIUIU1bT3P9tT>m9i@qS@<AgUpKQ|H>9MimTjqyO
z(b(&Yst>X=8&neKNgi~cxI4gH6N!IzN`Cxu8*mu%Y6~n&x9?*NIpcxT@%(>Uwc;7#
zi%HUay)AUV^hOPGOr&beC6hNFG26!xe(wqUu1502;aW`0$`O&W2_z^O0~qbc1FcD<
z7jkR6;*$KlH{BRH>^*<_)qc)M+rxKk+SA+I$2=k}Gh~>(QY9@e;qnhF0Aaa4cgxYM
zpVjV~86^2r40zmrVm)*CRn0PKt~?v5G<qC2P%Y)M$*ZzX$4(_?BHS{cDMZ+2!>M!j
zVX%NC-IUIl?Wv({seH10$6}q_cO$PK<Z(|ItS*(6_Ne6LdX7KFvGkN_w4Fli$>puH
zM5KMzJBtoD{{Uv07ND}I+)$hoj<`Lz$4&)hBKfsD4-Z^gU0*8SY7=QN$dZw8keQe;
zjmj>?ApGyO3D3$KCm>>}E~@ap<!_mJIT^tp;Yr{b?=L(-BI)`}ejt%-?%divypt+M
zw(>NS?Tm)~$_AJ=cBzOnWkCllT{MC}n0&`}+;urT`c`E|df4f78~EDl546b53X(_+
zMn*G?jGliEy+uD-)a+%LG!gk(T(QYzB=AV~=ieT+$=%<120hYz%yES{KBpt_sbRZm
zw!<5Fj?S10ytaE|^8Ed)8An^1DOl<Col8rw*RB^&)GoC>HWwlbsi6BjlP*urW8T|I
z=Oc0Yp7E}(v8XY&==SdUj!!)S_5M|t@eXUtPaf+K>Y7X%4xtU~vEFHrz+jHTMPeEu
z86==m3gDhGj@6eIqxN9R(l*uP@CZ}%@7|=PBdWC2CQFu6BSNl$WD6ls>yX3{I*q^_
zbI1p^dsoN!G_4cBUkmJXJxcph)0aZJk{gS=L2D$%wJW{bq7LD3K~eLZfDakK@G)}s
zULb-M-!;*Z5n=;AV-mPt4>`^;?mAbq{@NO@uccjlJ+#*}Yd;R^koaLu)|qW=w(#0B
zU*3=v0V=;P3CD6z(v_}ErL~R*7Q-xx-zfQu1Hl;_WOnVG{{TwW@E^o&N8!(jG~I7V
zx)$1|mvXmulI#+BQYi&n4hU=!(1JMWinXGC)mK_KhwSVl@UO$EqqK!$S+0CN1hYxB
z1>Ef1vz&5IQ_Wca0EWK43;zHjkHcNvIPkT$SGQb$pUR0@t1yh8L)b0<0N|&;8fJz^
z{{V!^6Cd>ov;JOR;q}Eb@BRvd@rp6D_`_>3?WWpw1OB;Jkz0P(8l&2<lfu6Z^XdNp
z2)(BtUzZg$f3<F<6Rtcr@ZSI)2Ze0N>E8)isxat=rtfoW;}`9L<Ima~PP5beS+0L;
zS?Tk%*61x@hirsxEtFO5o(^k)TfrhJT=fK~JxBHb0PELHXZuy^c$L559Qb~xoPWhF
zWIr#GtT*jfsVFRbJ>Uj8EI;Cxvm+koW;@qJVv@2GsM|Q*e)H_QE!2$7^4rM#XR?$2
zewFaMYZ5n|Bys}GhCHe3!BgANn)@f>FNhhu6Ru00thQGYje`n@V{w7g+tc!|i0r3p
zi-{HA8?Zob1Cnur_#AWVUVdRKIImyO&sl7Jv-=6zu+=Xc=fYdq#xwoj-k!gg>GiL&
zyv@h@_C2fQpV&?<@?TB2YMG#m@mPz0HvMbsIT(fDf-{rbpYki_agOzxeqWKDKZI<+
zp6V5WBft4SN`hC;<MOXu=kci>iB|nM{&ikw9YMj*b>kJ4itC|Pb&=RAlk$$nifqgo
zzG1ttDMfU~_A@_5t;jK|hX-*7r(FAg^}AHT_p`R;EI2;@06;(eUrMJ8`Hg<?J@M&N
zJor2ftBj2H`uqO?jeCcMx-5rQ$X&g0$5WrDU-RoxN;g7OC>#--(k$CH90TdbK<`S=
zxp+Kw-N7}ShJI520Kr-;e#84sX;(ig{i{H?Vo!3H7a;yaZxyHe5O|qq_)n-t!PTME
zr0>&oah}yb{1#5kTYOdUh1+dkJ58Ptd;acl*!SX3=lJk{u?DuW_-kB-IB|=Zq;Li~
zDUYY{_ODYbllF_zinMP``xD^avvPbzu18?jse3k!a3D8AFC@B@a9_>+-acRA<N9;@
zXMyF^zAWhaRprIGk5|-I(Vi*eEE%=}cA-00E;hC{whjrw#UF!utTXuP;v1-@Hg{T1
zp&ZK*0z$uJm55w|H*v;C=UsQgoeRPjpAvi}s{a6MUD@2vac4E1yyZ)Lj++5x02U!|
zdwkqurF)Y2u8uxkEO`#Sq}@Szsav~Qd74;rE^edQF4t5dHr<H{$iPgJGI|Qanp?dY
z^xZ-mi&$j1n|-^Rh|62NZUAW%ljZU<H-HG|r#1F2tMD`Sb+Pe<^qQB7+sqFt%V8z!
zh~RKe>=1$S2s{=e>rmbNIQ^CM21su;n>nOa{wwRbKI1TNxyL(5KEPwKIL8?qUeE3y
zvuDFv)uqJOn!8DJr?i$V(n!MUFt-HC5cwE5m*#EQO#Gm*;8sMsZ1LP_f9ZN`Yprt|
zwaV?b22&UBzvq|*OMKY*NN$z)KEL3v*#}Y4qjRfSS*kjdEw#<|<J%Zu#|Is8)3_Yg
zKgLgk-?M*;J`H%v-@w0Rlg0X8i*u;iwY-;pX6Pa^eBNN#K?5XkeKAAFMQh6b;EgwX
z9}P~jTv_T;8?8KlX0pant_J&^&$ss~Kh^<^k_q`vYE4t^o+`ia{1@8xmonU1$87}j
zUH<1yi_B$MrXXf8rzDIVD+A7PT#S!0D8y&eInSZ%Nvz*n%WG;aY-Y8YAuD$B+zA%y
zUF<}NyI0E_3NGBYD$Sm7H1?M?_AM4A(**ie_0!&1uh?adKeM!?O>?_(-x}i#tGDJk
zA9*_D*JVG0W54~LG`m&TG+4gX;!`7CyzFi4jMhrqCLsw|Un>j(oD<g^*Ogn{H23i<
z!qN@uG1!88*V})wcZYrp-~P>hG(Qs7NPInK;)``a#zN5D8)?u1<$~O*xgB~6RVs2p
z&(m*IXDGX*d`~8!c{hMABmUQlD<sq-l<5sTo@K;_CttJ##=;d;p<+W1FaQW7iZXaw
z89YO8r~d$N=y1bvYPUxDq?hdQ6A_olbF*-iH}1|9jr?S<&tIcHAJczf_@}qMj`1e9
zw{w)dOQ8{PSOFrs40UV+!vF}*0jVwiHGaZc1omwnkE2{mYWq=+fpIBfr>h;9Z^y3~
z&0_KPT0&oNdpo@k%$e+?ItTWL_JyCF9mux+&D{S0X>}-D&L1w%FC%Z?4Y-e&9E;W-
zZ-x9}HKm7(G}{f@OxyKaN$ytGWRlgMOHIokm|4MVc2d4sb|ANwOV{ZJxABAa3-Q}u
zM%o^e50?azO7@xr_OBpPti=kbEZ7+YbF?>X*UG=}Q*R6WFws6Qd_M6P!oLjv0BCqe
z#hx6zai?4P_Nz6-7gu(zDk6=^vPi_318bPcAckzXV>z0Pp(TFnLuzqrM10_ua9nt8
zbr0<e877kDt&W}qpJ|O16@<r)o?8~$Fy*%+WkA6?*FF`swecnHpC5>{DQ)a+Ug8_!
z_May4))63zFk;`mo8%kSS8(~5FU)-AEk<p~(JBr)Zt4eruYA>ksz|rIuGU^S=t%9K
z%kveq<c_*D-Ookv#fn<r_<vHf@nw#Kdp4!z3x#`_r_e-xSxd)w(2$vORK#9DV1JMu
zo4ZfiV?mPV_J#4JdcThCd_i@m`ID}raM!b&=2ECEm8FY+n2N<l<ygRtfP8Hy$9yAv
z&*D8lcAhnrYlzEf`IG%McVNTv9pip><uJoMVB)`9zi2-e{>A<c_@Ak0zB=%o;PF|z
zYpq41(=Jhrt@AUNMqk}GQG>LO-D{4vAya8tyY^T9w>OkplCk-6G`m*Q^y&Wqw5(>6
zP<M*r5gfi|mKA^xCR1q)q_FbKoGHi$0<@b=v4!=;I^~3x`d;s`OB`1|R<Z=^9w5wl
zk0{MA@4UZ}Nc-d|{UE;muD@Yh8z$0+gY4#qAo;L(V=hKP1WE{g2*xv!k~$MpTK?W&
zu<Gge7VF@BHYl$hjG*{F6_c)bZ@dRQ06-j$1!A$X=}up9T+MENYTapLT9d;T_g*BA
z?32b|m(N?7Bk<&A;y}pDwC)>8xZ411iNEKeWf<{kHdfkhts&Lz<C{)&TSz>aOKM8)
zRhl!5AW??>;Zi{u$plyGt&i;;`zrikitEEZ82EDxde@6I9a7^&xw!C*HrDUtT3kx)
z6s^-^K_c!zLddMS7&!cbz11!xpUvMBJcpix9mgNx>0436dq&qQR`2Kk01RzT@;Zmo
z^vmxM=(e{$Beu7+)FO$s3+A(#(?@13td5&YOR-fBVgwMt1CVi(roF%XBKJZ~Q|$Lb
z>II8TSe=&jO3GSt%kmE>g<Y-lA3r1RwP4@PHh%PNxbi{A1E0)dwKP+H-T>4e`wltm
zS5UQ%O>@eZHWD;*?X}(*LIl7&?R75SX3CXSkQ=D%Z4~)#dw0W6h5i}Vz5ske)b6$D
z+8sXQ!~3-buy!_+Tt|BH+l1kmtdT5x*9zF(_iM`+O|d>3`&agdm#Pb)5U}zI-4B*q
z&NBVqy@lD=l5<~K{{X=(J}dk`_#5y);}3|wCg?JFo5Lx8pjv&F3skr(G^?qFeXk-7
zp#%3MXCM=TK7hXczJFu?0EJ#AI!%|tTgH<>muxdbquR82&T_3J`;RPs@b#}cSeYqG
zJgwWeq9>WBr}g+BoD%5z9jAzAxBmcyisSn|ELvFag^O;Me<y#D<?s1a&HJMvC*}F}
zpSo+@>9(<WZr<uU$<C!E%&<#n*4tx_B}myFX52$FGdL-?<qD^BZ@~RJvi|^rr~c0R
z<>ZiP-w1p`s!eBYCENX*MzO?jMG<Kn=3InG!7OpmRcSxqwEqAAZA5Da!u@rY*4W#?
zqffFQyKteEe|d~zD8c^#bb3~A6)uo}fnL$G^IulA@a?{<s9MFWUR>#rLn+g4PMidn
zvW=x9c>L4kf=SB;a<~T#o-&p_H0io~M}KuC^wK}uU^Zc6wT()M+Be>O#$mjWRdKWc
zPDvkh{@fq5Z^NICmwyd4?LXn}pKqu5+rzqz^iOvbQQX^`dyA+t+dfirY;l9YBEAjP
zt)!RYBg3b`Z!C>@8r$2r9$bt{g+dP<NCX}ZYiPAPYN1i7_F1JhzlYOP*A^{XQfpgP
zVWY@w6&p}KYJ~I0ntXs_F6V1YhETkQ-YZIUR+mPOO;c4-a5rlOY!#Zsd5kjv^GBci
zt*!GI{&G{G-gCTN{h=3(btb&Gv#`ATT*Bho+BJ>~X*ag`(N`!DPE-Zp0085zewiCz
zYc}@nBxPio5Mv}TBo2Cd^U|hH$k9s2vv~gi!ny=s9z0`bs9j&j9gd?7y|UX_t|W*8
zCTSPVU5uy!RU3mb!74d7KWh){y)y6N)sBsId3B@1;L9JgOM7m%w-Y1FJcE2{?y7!#
z;5%c~*XWmze{Ro&J{b79<9`l+!k^Q1EnCArA&)}3xG>pA{h@b@uPuwnoP5zpyPdvY
zFp@ycd<Xvk1v}O){7d^xM|EeU+W1z|PY>y@9+7O(Nfwx`2LAvhS`p=)yU5IcDec;d
zbsa?I%VhmKqaSGWM~p$KFWQ)Sk%p7zE!g)xxc>m_iuIoX{0q@MN$?W$#(KYqt}G@u
z@@bY4+S#?#5L_feR7=)Vz8|#w(c7?A4DrZVqM<e6D?G&xByFqNK^gb2Z~dLVI@|a&
z!Z+R=(fkv6;x8L(>n@pSZLVaR-%yHuzb(y}R`aBVkVyfIp-B`oZz{M`x>rWZMV){4
zK=Jp2JUe}TeWuyRYo}N}{qalKrE3C`!4$Ug?QF+&8{EJi2L0j*0V)BmhgAKCJbmH4
zO4`!-bQ=jKH$lApUIj}i?WFRhnsd7mLb87E%wiO=3JyrGYt=p={6O(Uy2YL6z%Plh
z_;1D!eW-YX1hu$Z*{`o=w4P?Rm92_J0FuVsDm-$yMvxaIt0bN|@!!O6iN6qUFLf`0
zKN2I*HC-oB(sc_+t!^W_c&_zF)B{5?w<?T{<wkc#;Hp2}EH=btHn#r0^0|^eeANE{
zWWO9}UJ}=}yUiVKZFD*0N#S|Np2-mjEV0L((nO7b(hrm$$oaZnd65MrTjtzOarMW!
z{{SYvpU2;|&ZVS$BGvvL&EdUE!)<3h-k!D)>X&x<b%Zip8RSW=7?zUZ9I^+NLZLV@
zmI15h(|FEGted#b(5AYhdun4ju7UA$Qx^XK4fWRB_iSba1JmU>{cGe6HDs4kRm6T<
zN~^*7SZ?q5e?P{)pZLo1C&KM(_rEj2v<<oH%00b%``693aVp;F(XM}YGO;^OGq@9s
z@GHyAo#hm5Mk&R!?|;}r5BQT_P4`TigYoPjgme1W)1|+6z}wFt`hSglkNXLD*5>wo
zTSvFCw~i|d)du0FC(Sa(9DJaE4$w26b6-(OKBxyV+5T<KeBLVl+Fqt~<7gvFN5Y<j
z;{;WCpXKL_biu6CbE^LUcE_ei-XQ+~Dy?&Is&w0Gzl(GJd8v)U%X30TEO?EdzsfU@
z^Zh8ShPc%m{(TjPUyz*sv{mX-kD2;Q1pfdo?bygU`MIg%kY#YK^L^9)9cwn;;kI|{
zR($WDx8YwxeCc&x6O4V)+dtDET5x=G$4^?SlI~n?+s^~A6uxj%>e(2q<Wc#}{{RKB
z)3$405AK473ofS<o!y7on13esuLu2#wXL)Gnmx^l5*buyI0JuC{{RB~eFc3f{{RKF
zunpj!3tln?TWxAsi9G<40(m{Y=chID5A1EI`F=IlAj>J2PsqXakPpwA@5`lXi{^A|
z?3wm=z-?YZ@y9@pIXt-~k?qv6<8#F73C|b>hh8d8dtcNv{{V=d48GJaEU&MlyN#!w
z&Pe2fRuU;CS}&9E9DX^jPvG9PmY*BEBO|{*+V;`DMmor<d(?hD)a+og(IwL0ys@;g
zzm^q>>UEw}WtR+hsvtRFNE=2ogPy0{=Ciqnv%4GnQor_3?Fr*+f0#!Wxpp`m2b{<H
z*O=dGm>ibrz#T}hM*XzzM1Qomi<A?#;`Cf69DepRlQ{nXf&R7RcQX(hb2rL1{G;xi
z{{Z#BD&mb-%8}Cw3F>Ni{{T_ExbZ#Ym)e9Ho$bL{B)o!AEORp|obDY+&JP?AMS9ol
z-E!Bz5_Ri;oBk#q6x7fjq?XYx*nX-ydRK|-R~Gjdp=@m~tl{#b9!!!M-IyZpZ0%kd
zw>B|_3<gd!Udj6+OC{IG{Rw|~(drs>wq@9Sq`sST7C-U+pX6s!v-WacOww3%mCv0n
zm^$QcV~wS|5s&HpYF`p+SCV*dMp?CJ@9k}pXzgsg*LKqo$XS%30Z=<TI0{HSlY^Q`
z>?bN=TU(DZG!issGr1HDmLT(uyyu`C(rUh3o*%PV^tq#%W|T>J=C_x24$Mc4Z3aGb
zgOVf}=rf<UXH&zgY;xC^zD3Hje4sdPIu3Jz*V4V$PQF+DhW;+9`H}sT#=1=4#@N7U
z?~^0jmHaEjHIEJ7M?KOupM4zGN?ztRiIuIw;1+OsToN)*LVpVOFA3=v*MG6+$5_p^
z-<NTzXm?h}VGD7Krip}S_=xj>IL-;jdfVGMQ~9sW92M~CG|}__0QTJN;Vo(?b-(QU
za_}^ocKLwT8Ca^as;P{aw-(HdxDIyYoL3)vsk<v+t2Q}7o=+V|PTv0jg>-OQO{UrF
z*0&xWy12ZxMOp47j(FtJ3e1Ym>IeX_K2Z{a0db5r4Rf-1Q&5_HIa0?^nCl1rCD?(<
z)B$4{5R88FGAkw*Ib|!?HPEWP#TqEJ;T=oQ))`r3+_u*P3)P2^>&J7)wR^|y2Y$)$
zH}-kCO?CV$y3fRR-`aboA7cYmoz8rfX>iLiTqry~2-;0}M}zz=s2>nZaQc3r&}nRA
zyO+vswoKuXM2(M-m&$<H$rv2hy!>eJ#q^)EAME0P;TpQ}9mVFQ;u!5Tm$$ed+X~kf
zPN;$sva+$1fMQ@t1OuGWTB>RuzoR4A+IC0F>2yikwSoJ`<o+xl%e_bT@*X|I<U^L@
z->Cp+kMoMX4}|Zh(JnPBdksQ;KFUa-xVer7Yj`A(F^wKTFs#Bk3W9RM7=UnbW)Fsb
zBfHn_H28EKVr$#WWV^Pt7IHMx+q_0)l@o4R3?RrDa8MS`256O3dNgTw7sHyb*tL5%
z{?e023oLGLfPL0SBlq9C8~#oo<Qur-Cj!2T{{VugY9T*v4;o1xuyu{iX(>39{SS4l
zOd%d%2LKS?FCRGXxDTDQZw_ixT3YJR=$E>tm-hJV)xOOu+g@Ceyjqt|tm;1EuyUu2
zbst3k0Kro{Gp=i2w#SHJxA2wTpEvduhNjS4*<5C8c(mALp6P^)$81|Ajoe`rTAklA
zxjd?(byM<xnlzL>^>gQE)>N}@EZlYc^HjgIn(g+e+A>ed_&xssA6kb008Z4bbUQ6h
zO*-*(jY{HcOKZas7WY#`BWYttASq;7qAZ}2qEsgVg<PNE{{V=z&0oYiea?fdMStNG
zd3DGh(Uxr>B&h_3;Yi&WS)@ce@rGp`O?JkjuyWf*eH;G(1n8dJ{?on*SoMpIN_Npa
zLak=YBCeKBnW%vhmib$HkuFn#=8%41O?>Hdbhh$rjzy3t06MTc_!uMTc+VjH25aa~
z_$J<)s%l@gSHn0@hW^L>sik;^Ek5oDBv<hkbp1jy`->Hol1#!pu%HAAM&L>L)_)3X
z7Zy6T(bDfcj}E+WYLbYET{+$Sv=Z@^CBrX0!K_rjeJ@4%$WhaBo}sL$1LpHLXXZG`
zI5;@ZUO)YP?`gAHw}vhzn^L@8L2lwmbku<PHxV+(USlroD<gSI6KO0ZW0l%NHGUa*
zgH`bci=@M&-rQ<lCyqOvD%$`(^in%2vUA90jesW{gH`nZ0Jp!w-9q9WF3w#gbxUNI
zR(OH9x17Z}j@=(QRFMRZ$^i^vLy$lQ=FKjwd-uZ4PtN}Uf_VI9Wmy$l#a<Rb2^)a&
zb(4?4=a1=Lb@77vo8sq)3n*z8_0wrMQP_9>Rq4MBz8?67+x83ixupL9XUw{+-Xrj?
zqL9fnVZO|Cy=w4C7`EJb1I)&A+Z(t(UGd@@=sa<+YYh@drAe<{*u^lBercl$?h5CB
z3nFqx4sZz|<DQDreyj31<u83}-}E!|E87``!PIW=EhB;nO|x5Dt--js1NTw3WL>Du
z!#E_U<Rjy4R%^DEwlHN2(MM2zpO?QidqMEtyWsx-5Nq0OntqQp_M4~NE~6dOTU{-@
zJ5)T8GcjK@WEE(b$O$EIb5!Q=?doWnZR0JwTI-I`+Bmz5c2SXJ+@ZHd131BvR31nq
z14M<)xsRhhEnT(0!ynnzR1%T=Jl7{69+}j2f=T}XzDMa^0j%BI&*STr)S7F16};JS
z&_*PhIDx~IR$v)|=Kzu0Bm<iI7vq<MH7z&7zXvSj8gk9ye}vkj-{$@X!yQXngouc8
zC;jAu{Z9V?mo7d)Sa=?%p=z2>#Vs!4&P^2E>e`W?Ocytna>9(aZwUKHk&JOEk~6t(
zLMco$0~-c8P>=3@Z}Sdy?Ji{A>UQy8P4+n?Yi;hZG|Co6k3T7OQb25V0Fjb#Pg>CM
zApX_(fuY;%+Vg5Q@s$K+ft7l7=bFc#OTE<M)%7VP(?oiF%C{g~!3#Ue&9}*f5Yiwh
z*)amBHsq))p6lQTfUh+l+AHDSmiHP+ZEIH3uHrx1Fc?u9WnhvxeX+^35#_NC7=<7b
z0aYXJwp3-Uk9qy0rPFmUj=!`8)~MHi*-h~-c<!3ap}6vubyFvn8|B@!oNnVic&{}5
zwI#8S;+~mrrO7w;eV>JN1hZR^rg0F`?U_8lzb^8uGmbNyabI+P$^H`fcdhF`wC9Mm
zja_2#V)&O`Hu2x3k+;)_`c5wG(&fZ*$g#;L<1tv&6P^y?@aOy#M&=a#tu^GfxogN^
zveMy6ibESp7f!YX_QF~)4=49zuQ*;YMH-36ku8y(?Jdt5isDC2tWzopV8`jxBfr+Y
z^Zp6dG@tO;eh!|~%xlXZw%tMGDP|89jl_$$9OSa`-#)eT$eZm1va+m&bC7?RUuyLK
z0NF40lauyW{h<6i<A`+F_31PNGcA;}m{wmh2_YwV4UBo4h6gwvrizig8eNT}Q&aYb
zSkpAy4+eN;d?|ON!{S|2R?=Sm)!s{ciNlFxlHns^x>93&<%9Bb#|FGQPNAuzU258c
zHmIKwZJ}k;?q|2Llq=dP4GD4>1&4s;uyRH-UmIF~!F*d!xBmb`_)p>cSl#^cBh(CF
z$&bE5#0Ku$y7fGCsO~@Dzxuo<di*WWS!0vVW;&#}4mmCUtaI;Nv7u7i588D;QvI$x
zOCGQLP5efYM%J6edWj9Y{+?v#@#pjOuQy5ErH?Gjo<>`*tsXG(y~mFHWvgp*LmXEc
z&Y?B*k*_NoO(Qv8$AZ|&<n^j{mksumY;Naw$^jr}*E#eamFX>6monXy{yA#jWB5_1
zw0>IdF{aXaT*#b^k6t+R`e*0A3*AKe{ffVtBQ)E1I0W(2@;n@WkFb8y*UfA2s^EON
zlHwI4ak~dR{#maS@G||Y#Wp|cz~7!1A%{5QuRgxj<K_{)X!?Gqb{_u5O#KG^hrSxF
ziKJX>4SBjvV&m;^5sUp=s(C6mXXeh$*&t(nJ7oPLRwWJoly@!<+|Tu|5&e;OLGZgr
zY#*CWibKau-#0(^*IM<4yjG012RQFvH(G90WZ!c-akNr2UN{(^^p0>d`?Jr#TCF|3
zy6s=J518P7?D6>Ks9fIsyT0-0Imh|*sxw@Y8~v=Dc3<<Fn6bE;zhtqK{bkngPu(6r
zS}U8mzja~$ub*-KO%=B&xmRQKiYd%(oVIh)r-tB>oM(^oiq2`zn#vA2JXFz7wUqw=
z7q>aDc=`0r2<6=0r!^>><@ry)Jxx$ah&=Si0~H{gs`bZSovLJ2&x(KGwzgh>?D?nM
zD=>Rs5n4zXbQ`Vi7oW^mz<;uCw3go#Sy_krMxQDGI41>Lr{VnT^ke=DA!qi_*&ANC
z9d!GxKI^7`<>4d$0NLyE{{Z%7)=K<V(^xS@nmN>r{{Yh`<JYJkOd8h-K3T6*(8I;b
zlSumu!(Jg>KgQZE&}LP))Ggm6XE>2h^!`=ce$xIf)wJL3n_IsUe{3n%rHXGV;iXkb
z<t8{J+y~7bI&ubhCcG~5#DCfHe6lcAkTJ)69E?|{e${%kLtgPvgG-x9M%E;_GPI7%
zs5FCloi_{sbJ21JI@h!9ZXU&6EYkh6ymzT-{{XZdwyAHZ-a~V3qiGiwGsiI!+Jj{a
z{_Nxx`HQy%a>Un;$KtEequf}>b#%IY%caf5vbpjkbjqW$jtNlg10I{sI`i0m*m}!d
z_?N-A`+!|T!J1UNm-vcA(4YMm`d5%HujjJvlRfx6uodUZwXUCbcVXx*RCb!5jCD;T
zRk6K?#8(%0(bz`}cNX_EES71o#x1ut8FnYgRY^^x07$Q1{f#_TbU$c6hc+vDbN!!j
zsapR4qwhXTNYWU0?9MlBax>Q)bg!Sao6>asIsX8&B-7w)V~L5AZlpwx4B)xOLH*g;
zh0J|7X1zQ1S@8<#zaIV@TyJ2}>lRtudgA&siqD?+NZO?opm2U7@n)$Pi0`f&Q`C*y
zZ?l?qxqmgH+vJ$b=OsL`vu<&;W2Y6Dcc>Qdd=a*^@+5b1ZPK$QE%J%F-~v3My8%uP
z^W_YTZ8dA+#lQAf#Lp4h?%KAxt<+^n{_LzfdSbBTGSA?drjJTiwvPD`^<|D-(X&Ry
zZHe9Ge8CyOBYD`^ZJ>(hjYn&ms%prutN6=OlIHShH7!C*jYUj%Qa!^NE`wt#?VP@F
zGo0rG+P!n(Z-{O+AK9<=fV2Bez>dd4(e(>>%;f!?jZ(*PMgAQ5faGH&3h*6D<(SFy
zGPZJZI3I`8`B$<2&ld*&0O4=P>qn5c+CCiH&Fz@4^ykm6eq4PkXw~-_&4{A8Z|V7?
z=jipxFPB=H`(C`WnrIBnkLJqS#J+M93$mPNmXmYj6A&CRTEUydH-)Wnb#=PLkFygo
z{{TiCi()?M^JMYdl6kHF00-z=hN*d~!(*ab>r%ahk~nzYMzD+&X1QIg0<r;(&6NS$
zBalZpwyK-i*zh`MAE)PC4-k^LMupj};N5QNd{b_I(Q&r&bn}<YEG`amHxJ_E<Y%Ed
zuYUN6G+Ni}SMXHdYPVWly|0Wl`$p7KH=a#8CbrQeXG9DOZQjfj5t29{oR6M-GjOnY
zhfiIlTkR41e-?5@eF3P;adZ0${4<i;&evAHwfLE+!3CAneq>jU`eu$&7g9hd#yzAG
zG7nyB3YG4csid&!NnH8v_VKO6(JZqqyp9P9PS+zK5<Pxn*QQUcHFb-WxoKm#xLFo4
z7n|m{-2?7qe+a+;bgI50l50I$>I;ZPy~J|5O%m|1KH>@i&NlSwK*eO->K|wIZ<vMr
zsON0-Dbk8JXOb}xNiHO|wq_f)Wr}2AxLkp`M@~nl743iURhx?o58CSLOC3`CP>$on
zIs~#bw#MIX?H<!$QN4)|AD1ENwWf5z*}cARZC%m7c8ez?hF!|c2<kdx*!AyUL4Uzp
z{{Xdr;ixp0)imuVOliCm;kQJxiWElw0Eu0&l#vr0?3hU!=cG}_7cqn;>9@^)>!Htx
ziWFUCSd(8H2T_q05or)XQR(hYKuK}Zl0&*vdN2j)n6$JCNQ30)hS5lOjgG+vG6szO
z-@V`2#r16Goaa8j#3o)6B1g{-blpXfZ{EmPC(r#PsGJs$Zq)#DcA(|K6>S91IGe<|
zcGA6oV_LD*OT(=Oy<*^s%mwhB=j-GE`4BzU>dyCKBzr+Y_7%RWY6__7t8@ZIj(1TN
zDt4W&+QM8rSTe2U=I29f8MW{6r<U`0D~}^v>Z}iGuU~2jG1DM+d5XD~1LE<DV*#DJ
zKv)Nt3ivg&OB`Cqb5jX;7+V%B>Jl<sDHyv%<<pd*9ga>$Jp-<$(W--iIp3F3`XD_!
zFO^usm&<=V2EHIc5iHI{ld)A3Aw>Yx($(^85N5k$_!}awdh2`~RA`zI{LK83o&7Wv
z4w&FtK;G|f7<aRVinOG!@;(Uo_{zM{MES#gGVl0jhn_77BwNJfhoZOG@hYIn{*Tsa
z9-Oy-V*59VhUp6YbZUk6_42*KdwX<OYTq6XH<p~jnJ*v&3ppWL6SttqFUKm-E{Txm
zgZE&5cmX<U{+FLRYiHZqpaWHcxVaLEHD-wVs!jNuUXDKh&CHn@iVVZopaC@bCrmOD
zMxcnr2qqlCdtuaN^ojqGh@c!W#B5l5<Z(VP_!0gM9C-S$(GsB$a^84x14OWbGy<yz
zcA<~j^7fqktuEA^gQ`%%D4I3vkJeb%tT(gz!r$3SEt}-kUA`oolQ|_Tg!%4gC_OG&
zo>zocJt>9APoF#cOP*A(IW}lXr5pwdZN;0MGVmHlJYGNk_Q#O&dvGyAW|<ZuE%ti!
z*~+}kN<tn?X*Q+sqp{i5683Aysf7ENYJ9s5@NULuo=}@SgMsn(<EHbfT(|Rh1&Bs-
z<E-FuWnJO)^4c3~xh{q3fDE4mH6wj5X%fvp9KN}!$7^*Xm@Xgm7jmMC;Lj$h`h(!Y
zCIz20L?GIo3KU?C30ytXo~>w=59Tb}RVo?Vk@<A_`fGXly6F3guuhrce5h61+qM3c
zD;CuoyC#0tKM7*5Xg9u7W5&p3#vwMjcLME?T&1z&C_i-NQiL%CT=3@f-_GfMpn~tk
zc@=l+bm?WD5R&;DiB(YEHbFax56`elS`tF^Z{E%Cbt&r41RRU_x5X+1ze4^lZyO90
z%g?Xg=LBF3Gx;#69k_k5lZo~mOftX?<>G!Pr*FuGhvG%TtD=k8!T82;#_^D4xt!>m
z3I+8V(-9Zff|}R?<4)gbK})cJjF}r{f%~Frz*53XF!kXab{3u)k&YZtpexbdq;d0?
z96WY=Y_8Z~^4YI5NmH8qB_;Rv9}fzitefVOMd%V8Qh87c(q^YGykqapH}npqhnTy%
z(3C2uxN-B+O+R5hzo99><)Ah0mqTe3JUOTOAwCr2bF5I{ZlNOJ8H9zd85qGS1Wqr(
z)UaQ9V}$}?XPM}LN}hlaFyC~N2Xi3ws%$2NBxEcd%uy~GujI2vhqG7vySPf#re@^#
z;Sq8_NATm#VznN>+T$~30iCbI&D5;ByW2B4v@crB4ta5T=(Kx0wm3)R8@6^c+*B3w
z?hONeC!dI_)uYoy8}Wj39t)PBxV$0)8SLz83$JpMh<9BNg37IFXMwA0|GJ#ts9tEr
zA6H0}1r=IzWj$si?aurDpeU4reTMC1fgkA`jjZ5PYC{Xh2%dxPmuVCk4_Y2RJqYKm
zxpnsy3vuQustZa!+N}SNgrPVL3F}_iFoOuT_dquNV(kziMT2+agOGGzB*8S}&P02M
zE0fMQGIzgc9g2UyZh2RKa~l}g+RVmQ3ARkSD@YcDtcy*w?E{?o-$>R~GjGMGKQ5!q
zzio}iAAK+r&Xp<+U#Cx8!ywx4NE)2u6P;3Qjyt3Y_B_|`)b%>Q#b37$*FUzV7O5Ij
z+qTeJmpVOf(aox@Uz7P~k&h>8xdQD`N*<uEb#?CPJ{vOYq+fY16GsEUVXBgk7R#8m
zjLsipt9V%W=M?4m(`naAu3WFBly36Sb6OUDDjyvm(XsUM6QFbzfw$qt8(G@}hi0H|
znTYg_4@iXoQ)>nEttbD-GGX3{7oYbN0?w<FQ!0<8nX0W!mxZro$HBY$ZbBKFo5xr#
z%^2r!vQoIb8dN8y#M9RU(6|ZQoh|tQsqBTx162)(cCoAC;)-Wy#=~wXLg0j&tR{cc
zm5M~~=<$5Xlg8VA>pth$@};bfRaNLbSB@N8&RP%-M5Z_zECw)}H;t?G^EofMGroOg
zXeKRBu6M@nQv#StylCS5olNBefDqA{l6j(Rh0srs)^4qc6Xz6%54VI5A|Q7pFKN*4
z+-o49zazTOfll;yeY@k=e{1aBy*J1gbCYt@A+Th4lZy9YmIb0=;2|-&??^Gao4Xwh
zt#`_U!}{d3d*ccLD=f4&%de<q0NI?lf93f?#zi|YYvEZTzGaiOqcx;stLg7O6A(6}
zqu8lg<xr=u(5#|Y_jS9&CnGNYj^pn%1)=I>x%{j6plceuCT_v{rp(^Y-m~a1O)hw*
zz|XIcCc^cvdKNRjLu6TbGwu9ty9>Gs^`#P`(1Gr|h`_gSX!QiLU&*F!iK+P~jVk=i
z6#a6_^2NYvxS7{F*RYKb0jwv7DG2}ahgv*vn%W0#3_EJCVZ)bIbTYNnLSLP<<*%^i
zY&wxODe>kyPhzwFBQYO+`p(ak{RIDzX=AJe?F5aG6Kee<RA#-w+t7T!F->GR;FBt|
z51TPm*y(cl@TJ&9+DCkw^IW?kUSqn|{+bsroNka5Z2CU={fx>1+`Dy-mp3{pV@bg1
zK?w<*Gqm+T5+mGRx&;u!+3-nGkfB%3teJTGQ^?ZA2v|6IUW5r@I=6Cz{YxPrFt9^!
zvb$)|*$+RmqGlR-%>%NXt`w@g)tI@kY5Pd45k=X%0S^Ullif}n+-YOL26rS~^yf0R
zHZ*=QLFhzR^JZx*y##W2|DDURz#X3oM}{!QUOyR=H)qmqNu%l}lRSejEcb6#-oL|B
zeMVR41V`QRq>E|wE*46(b|6Sw3n%?3o)RbKU7R*@P@Bp_%AH;es+wetWhK?9t*t#I
zDr4gV;RygCT$p|&!bH2G5?*Wu?qgWsl6+gsB#K%ao3`6+pXeM@d-)#;S~-tp?1B{H
zxq;!zWE6E5cZc0hckBAnxirwj&}dD*(?JBI8whPk;doYXRK>{ulMBawTu5PpE0xn<
zt!j8Z0)6+q?#_nZyVWR9x5(CK0t;6#BD(vuor}#(&Br~i!UP)bSZJ3$+PxhicK;PQ
zsnPE{j{Yt%ISEfqxuM|+E^~7tJbgEW*SzmBh|yo5m|eVWay!yG3dFp7XgcwKbqC()
z`Z<IWSC5SM?lqy!XJ4bMs=H{YVMyY5?M1%2*YW)H%YJsYbsGc(L{%YI$Pl@lv(FOK
z4!axZ_kWKC{60NyP@PE6(7N>@VvvXAn@nX7RuGqm1VsbUsSu!k*84~^^lV#+X_8Im
zj>fNv6MCMwTYlt&Y`$BK%!+XpZk6`B3EXO#AZ@xll)J>jagn*^>D4T6eM;wS!!N6|
zJI|h4j$~QeEwV&t#{DsTENE%&OnEve-mq;$^-b#fT+tK35m2QKO5hZoC5W#$4;Sr=
z9L#aDq`%7LulnZ<u8HR^=NL?!dyw_X?)``3bW#KOZ2+_whv?<x#(@fP($``dbrt*u
zEps1}<Q=JzrctgN9v~jOC5Hi0rQ2{`%UffJ!iOgpK4RrQ6u;)Ub=b2iw$(iJkK^v%
zPGcVE51QK(KC->Ozu(b-IMNYH57^Y=qS_;{VTKQ+rEAoha(JgK!&6DQ{oIwNH#zY}
zeOGe`Ixhb#q<ccE_Oma<w~BDotdX2s3AG7i=V6R*T<vQLfl6vkCA*K=TY=68P?lDm
zd;$W%fzH`3onOMKAw-?7^p+O~A10i3iHrLBQd-mI|6pbrtSIRgUb*}}XYed30R|F3
zk*~r@=PM_V$I!*4S$L>tN(Q}t>l$3k)MG<ZsJw|wps^e$PA8kI7GULgOjfr;ty0v~
zQRUe9*-I2#zy3El@0?DfU05vCK``hoMy+@6S+a7odlZwdT7`zqo4()Y(+|#k3QD(q
zS$>&UrBQ#qiYU)vz}8}fBU>HOhh}iXsPlOEi`yn_5_b~6GSylXWlIwe=C+)(A$*IP
z)w}GrLL3W%F2?Bq8kv56nU`<Wfp#-!Oz;K6IO!5*Wsv5RCUNEE9a7jc&$`rPC$tB-
z8SAAzff9o*Bisiro+7%gv_MD>EhRKC@~HCIW#fTLF`GH(iUN*NtXtfjvT6C9$gaF6
zEZYSjcJK`%i6Q@rB=Y+UA&;kB&Yk~QukmO*rN5w8J8EoBp$}`}pCSi35*BmGa1)Lg
z;0Cali*_$CGWN-I2#cfdqx7qHX+Bi;j&;x)FxT>LksZezD$ht=60YZ-6Du8^V+GF2
z&WoDYOGVb}c}FdE6X`nFf{Xihc5tm)ssO>4;l5F_%mQTmjAO4X)%OjH&}r4qB~FH3
zj;y6ltn8`>1oHZC8rIDHyQ%6ctntHX9wY*CMis+orcI#|bSChQ8u}2SyVoFB*F2ug
z6(O{!eryYmd34#@iW2Q(rkdIwb;Tuj0_#-an|Un$Nt+uTy<{c$SAWtqXVlT*e@&x)
zpTbM|QomYn74h!{JO7e=-0kHIU;P9`YihF&?P3pcPwZ-E>%P|?uBgr)>a=pZoJcP&
zE7O!b2dsNkr9tz!K6!$@R-s+A|B=`#@}ZPLFeY@ol*8;f5!=+FdLvkEsJCtPObpTl
zp~l3`b#gw$fiS}x+VIal6<XZ@q3X$Y)=^?WIk-o<8XkEuxKo!7<0ZW{u<3Pd$EGwU
zXB4qQ_-nzPyVRdJ7{E*vfL(oRn!DA<e63Z8STu;_diGTQPb2&0k3PqjPWS`E{i)v_
zC4G`FhL@o;YkMK3PEfRx@E5-e!-gvm>P3OciqklIvx~P>j?dFxKL6g2Zq{PQ{5@4%
zJaN+K8DfxBC?{dGfxzghxrzPxw{QyOZXM&QERPZtd@tb^G6q_tEQi6pk`}1gAn`fF
zm%;fVQ>#LM@unMG_ZJQl5oP|A-E1_hI<AkF)SozVJp5^16(*3~Xys@9r_Y%yDzFgV
zRiUB+>wTnExa@r2qCI8;xLEmA-9BC@4J1&N7IPH-_H*)+Z*inP3C2J;?ulaR>w5cr
z7|MXi#qFR$M+?_f&Z~@QP#-@uN;<PBwyw=jU&_ODP$=V0LvqOobKk>BMpby~4s|ai
zy3xiPoR!Cj2bOjr<Fzd0Y)|*D`r*NjjzQaX9?KwxGOY(mca2|Tj>&FQFv$#5Rd(2n
zGHjBgOs`q+Z>J$#wE0M3#xA5H52($QirFSpTT}s9vOmfUBcblZ^rV_^`W_t*R&pW!
zBl$y)QbZ~d-%eL}0nGVqbitwDVnuidR{l;*P*N;!>9wDTPeWwMODSs7ByHvQ@$%As
z!6Q5`UR;lI(*5?Q(nt3fZVK|5pmWQwioT-Qozy=p!6R4Yi+=`GGFd+|NSx(}bRQMV
z#<ysj3vY}^Rh=jZvzu`Kc!tRj2;>_4kAz!FyuN|^2nvC5fm#cK<|YtW%9}F0c?IOv
zY(0<!ce-YTsV`4*zGcp|i($|RcK753zI6S18B^=V#&qA6ocBc$6Q1D=Tl4o=fzOkx
z2h6FwO5(BjFwZ)Y@N^XWyNM0hmKDwUwjsd%-EB<|B59v!MsT<u?*5OYX7^}m6Z|EQ
z7NU*O>wDlpc!nPDx#3cuEuVWY66?Tui(AdiR^#I{I>X1a#4YtscplydP?!oC$I$6U
z1P87Ps*bD6wX+hKsF805R`pBaD*beUc*0FpJ2#F%$4V3|seooa8B65RIb=#lmp?Tx
zton3l7uSNpi)FksA~`0~J%VT$LeR7Qse@ejMXd0rraEnf`FSU2_ucyVRvozlrH7Cq
zX~yyVM-ol4Onl;a;J}b*O4}j9e!p)Q&)|;b2UCKOAe?z~sDFs_*FO>alFzpyD7rHg
z>H#{#4-I83{r4AJ@;-B+K_?5~4H!y%<M4zEqC4l~&grjuCH!D%U(oMiyvQ4^VtCOv
zpx>YTI1yf%!F6lQ0awi29Dq9buIX_2gk8J&o1?kZvl+^O?+TCRM}B-l6b91}SM@x`
zFA6}sI&{4X;X2SggiEvjt_{3$ok-H#U3ryedrJx!X7wxR>*Igr%X$|7^44WlHO$%O
zIB6!3lXyTo0~%X_(bAqi4}Pa(&1=NwUf^EMqIr{2Q1Gf<>%qOQu@JMEQ?4cX_W@96
zP|SmuH){{Usv$1Lw>B{2?Q(O|t9OVyUI!mEv4JM!RX7Cprx)(YrOr&JXW9~#AHtF?
z+YBgrDZ~eLz7vwW`v0nkh`bYxr4zIc20OmHZ3?455c>$0hfeZ#j<*G-mcHp~yf6(E
zPp4xVcm4;>7!w?cI%s*A%JMjIEclGz`L8PACaRqeXTQM|U9YXuJKHXh`=X*3Y%_^M
zHc#PI9K75lh6f7x8)U0lOjCWOPVW0euQ{uoou^Dt+*4(fVb5!o58=vlx+%Q*>JzM|
zNxaPRU;`A4-I|3%>-LZ8+04y<PD;pU9M@A&!=--tNVBZa^KXH^eP%rJw-w5pQ>iJ)
zHdr`wA}r;yPAe$>GFiac_dkML&`rK()xR~NUB7(hK<}tme#$f=x|ABA)0z1DHow4!
zQQy3W9nQohE`%H2jAu}RV^nMNofm(XDeko0jdd<YI0_)gcpo)P$}0tsn9@fkPI)v6
z+-L4|ua_idKMI@GO$Z4t_6L~~Yo838|1>_?aj2KIYRLuiniX`R3f|DS)6tf9^Khlz
zu>jUdM+pkrCLx2_iSO%-ipsva#GYR!h~gXASmQ{++tRO^y%IcI{QZ7{s>04LA77U4
zBDqi;n`J~463Xmz!r=6%IW=W*d&%PETKKhET8M$bFuTJ$5*B@fO%hKt^NOA!?{Kq9
zq_mB-VnmS5)!cL*+UO*f3H*>CiBr>UYyQ*v9j7n6=rWCPm!rC#(V*9ABHg?<FA#X%
z2T8Xr=7+Cd*5q#!7?!Qq4r59j#+75W1!>i=uxVCTpgQd2**=%d^4(i=RO^F8PpYHM
z5-TE2FpaX+=e%>AE8GWICzVgg_}$+j`e7vu>L<g|9?^J0F~98W?qhFHH69Q^A9_#e
zve5UE=){+`l9AlDk}O>~e15v&L#PM7C2;sxX}6*GG8eCA9qgVsY-!wO`EZLixSv1Y
z)sE%!3klb*?GLOQA@?0sUZV{Pvs9i`)X^(ND7W%DwE^iSn<-E(yKEVPOWBEamh47D
zPTGk@p8h{gJ@;gH>kV=@EqP?eL0N^i+Jy_M2&d9)Un^0At*I$HUFX7;n}sa)5DD|2
zrxjyaZ|s_k#q-j+e7xT{<Ee07xq@}mCeB%#TXp^~xR2TJ&+``s58`Z1M1Ad7{iInw
zh&Dp<RJtV8JX=o3Lte(?53w@Ln?LVn-5L9<er0Ji{U%RlHey;@;ey>0Ve(D;%Up-D
z+^oLehiwmN)ut|0`(63>^X%y;Mc12pv}vzz5e>HD31N9N$#1Ed7-WQJK%ei<3zd7d
zm^^#sy~f<H*lcvN+xyyFs|QBqRm(una=@Z4i6d8RO=FPIy*KNy^l|7v62FAc#31>=
zIf(_7?Zf5lq*KMK(~Bcsj-j60D6-GqhjX)SVaAy7@bn({I|Brt*+O7stYYi8=Wu^y
zOJh{XnJ;qF{pEeyNXd0LYw~I@?Y2R8qi)jyu$Pc}H11h!Mzs9U+GeQ`hGP_!XZ^RX
z#ny(OHwm>{oUGN53UdQ=vcHLEo_wvhFOic|y&>|+EA8|lD{{b2@cf)odlSz6mw(di
zNv|IkYTMML$5Dp3Q+C4kE5uA)O({OC(%Dp#cxbgko|^+?-2l|{eZ_ChD<8?5s@#7Z
zt{tb(kis5H1dYCVg9Vr6ow)vlmB~YUix8cVVYt<}<$ol2Yp!sA#mxXpKYO<$uE74^
zPn_Nnz)6e>?WtO478k)_?|(WS>-DR2A6N}=(mx~*MsB&C-uf;g;=R2kvkxx<WmZCa
zj`2VqwWoRAT(pC%jm8${pA$Ao_<*oL{2^=KU$l02aC4V{?iHW2uZ?NOQ)29IasO#d
zX;;%Cm5{1>pE>2fVd{gznxuSd1z}$L8z+N+OrpN`??K0-ATHEO;XF<Sn}t!3lMuB3
zy((B)!PtJ<&FyDTGeL4?r%PVl7hoTG9(D5X8YP*wi;|8Iw|w%LFPDuO5~}{(jHZBN
zDe#nkqGSC>;4fHQ=F=@$-GK!KdUVR0cy{;xnt2y6t}nSM#}(x+_;1CF%G_k>t?|*V
zWdx7q!Mz$)Brmh9)lenrOTfEU%iYlvV8(=M)+g(|cpC7##=1#6!bHM>^p{jiN0l-!
z4?UX8YwNYVAHek#;6pbB@@p{8?zErTjjwh>vL)-&cd7m~MJd#bDSN8G5BB>3hli(t
z5~OL4?t8aNAt7d1>*;Y9J}_AEaFrOr&lK-@?ShxDH6~?>huYS8!lZ^aNUm)6y|H}s
zY8MRupov)8cp@kE)W2|%ak`z=-^3v0N2=@bE-cXHGR4h)tKr`IhUz`u<I=z?JbMo2
z31jOu-Df<bsDXQJgmeJtIGxk)G3`&!JgoDXb7$tiMR(YzeF4a;T$Wa2?C<hZ%`z*~
zFm4BfEs|SG^99-eB-7mke=l?dR;yPsa}YTre1d=HI>Tz!qQgh_+%PEJPDrXbv}-hv
zUa->Bd7X>AB8>N=iiTH32TUZ1_oaS=@0WoA-pteSr5@}iCKCS;iZyM;*hkg<M?$;T
z4C;YBa$M9d{GFRrH^p}CjI|43$x!F|Nb*rX9)G+(*Tb3;o+}k^kotu@JJipbuLuyf
zgsJ*Pcr+jh#PNap!xR0O6|6T*D?3C177bx}IMzw*>~z)9qJCyJkG;=j0ptQXSTP=5
zPjCA%pkTg!xS}n-H}_M6=ZU<v-^;9_u+TmxUanN{FL64$hRY+Rs74ubd@u>Jd5u$o
zI8^(*cs5&zVNW(!NIFQmY^i6m(#VNx{FcVY=f9F0@;xn3rOT__ukw5;ZgcJnYJ7h+
zrJ6!~DqQgXsMu(1?aRRk3p(@m96*lvYKMLZAGFJ?U4YO-45A0GpHS^xN#$*105}}{
zd><|5Bo8ZQ$KNVX3@BGh`MuKkm_9e4FT`5O?N23R%{{_S5ZT|rAZ%4WvAFC4vuuiI
z%2aeZGdgQ$ainSfWOG|MGuO@-Hp*={aP;0LdxA1SeY5}L#>;PUGqXj1If<<xVTmE)
z77pXIc|UPL?KanreP@@c<a!UNFOEGoV1M#Ys~&Mhao_`|A%#<O-EuBbQ5@+S#u*uE
zW1Rrc#>6B3v)My~Q_!ld=vnIe^Yh))QX`Wx^&;v8T0bc|8KNvlv8<FSsH$@(4IH7R
zo>u}Uvcv0tpiKXfxK%}4aN+DXIr!8j@uV0%)Ro{-L$kB;MIx2m*=+`CjOu}yk&Kun
zwrZ$hMZPrtr;S<KfD1MBs$-mdAB1~qlO}lW2VpxsXIrSUnXNPo(%@d8`Ekm7Z=%tA
zhv`nNt&!t<u?3>spM(c2?w;19`>=66;T<uIVP@3c#zU{CTii+B@v_=gV!O?d7#{mv
zKH-(lzzy(5x!D;?wJQDDzS*2<tlC`j`I6a!tb>iH`kUV>myhLk-aZt*u4EQk_dpdU
z$r27#hjTi!#r~|vaYiOYG;2MrPF71SNW1iTlf%gU;r)_gd;ju|_H}D#7m4{-M&9Gw
zB%Y~uF{u*4!PoZ*(**gOxQ_L_b}0-~&yAHLx&CxJ&)${o2+WaYahS~UDy+sz-?GW!
z@AfMmH`1Nv4ld#l423#`PghA?yQ*|wL6gRvl9n7v1}NoV;umqltx@yVY@YmRfOfm=
z#+?rx>lv$$X(mB2i%NiON0ZOvhxoD{1u$O@a)tO4Mz?-T1)gNvhn*0#tyzatTLiCp
z(htztImB`WSgnE}QAs~_Q}lF7k|Nn~;@mk{kUJNPH0KmpRNGa1v@@?ya=cfRP{Z!J
z$-cdYXOhQew9c_^K<u4wKT!kP!8F4LS*+H*3jdI~vfs?G3=RUH&G!`n@`AC0!h{(j
z5*6#CmY_jZc_OiOza5+r`Xgt_OGKj}+P9@R(ZEYQVx1bAJ%Orh0DCb_ufvL=?jWXv
z+~>ISr~QSVk~2F^>maJbz+|Zz)7Yg^;JeHNE0X?w-qbNB61T_Ho?w2w{GVw_x<?X$
zA?Za2b5u0bzh*IvKl~>tjF%(0y`os=vX6B>zq=DGdF}n0_@oa0oA1Txde-jtl6IrW
zG$x^gS92p*iVeB$Jx<kYZDnsnbeyYg#Et+Un*Oe5qn*?#G;!=kY7K7mJ9ZBp_KvK3
zvs}MHT4EwP-<y)HRc)a1iYCBlt-<Z74p$h(n(1+L-L<v}PQ6^UAEwpfvAP@%{8B}h
z_~Fqqk0GzyxV%3(VD&o!G`9*|&w68ZQw*3oMPR{{{+a7lPraIH2>0-jaFcM|D^`P;
z_wEB1RSUIPV%6I(1@B7#2i@a{%+w2P-GDH1+P&hJQT?@3A2+AxtMTovm%q&tzQjYo
zm|PHwE4E$0UC^3|wQXT+qu)N68PIuNWq*^#q(&rViqLKxZsYpR3C@S0YAXKk>!+0o
zWzuP<0nyL)`e_Y(lV0_duwVLAjKvD~9>!KNd>|&#M?PIXHB%}wFRU2ZfN$DVu@{T<
zGNj0od<j*dQ!VK5O*+LVyri!;+WU`0JXU>nb=L{i?<Y>Xe9lEIJOGC}|BJ=C5T}%F
z9CY32=wc&}%pAh*YN5@b(J&<}Y-$=KIirx;-NM~q9hY4Hp+UB*3bxdrcSnWv|K&Wr
zb7U{2{U-;kbF&>+7w}iaOo474w3~A|9Vzbed$Ehgrk3}YbHdmz=Da+>5I>BOP6>d=
z;(;UA2oUjqUg6#amGDNco5#1#{fV-NqQ3iSei;dsdNQ^1o|tF&xi^>QO*v7@_s_I~
z;wOx#a9yy@WN-@^Myl3kO4zL$@W!l|do9QsS_GU+qPKG8aVpNwKM=TZeff(b;C^~r
z(8oR)@e&5ceE?IEJ*ny$f8e%q=8l2B{kQKRK9{*DW?CYQz{e4YQ7!H}9U}`jbwH;9
zVrYPSoDQyeyvH|}r9SputY#R<^rwGyDgP}m11}9<*~NRj*=d8E+LjL&2JWr!h{#88
z#aT0R&aA?sft2`M0Ndf6Q}qY_4R5o(FTxwSHev=bRZ$A!NVYPajSlK%f6tFb&Q;O|
z&SxG7QqLwPH`)E{V^j>^!}A?5?2<#@t%B1qJ*Q)|wx?aO{XY`=h2D`u!(|a(>oQJS
z;P@u!Cd&nX65IR|MHJ3%L2^TowV3^>*%G{0vm?Zo6^|JHLejPF1DpfKJB1933L^Ri
zxx71$7dNW+UJH?fyny49Th@v*F9LuA=Lf=ApHuw!UnuojTRZITZ0B=YG3dBc+f6+$
zSPFaK)ilOWIkY=e8xL)k=d8mv(@Zp-oPeK>Tk)`EdLMFn%Kw79oJGV315yox-!T);
z%LNm&sY|#Lnac-Hl;KnGk}Cs8VRa7w-Jko$*D7xq_UIO%y$#q*sgmva7lugyL&GDs
zISB*k!n;TA<ZJ3u8<iw1EPH_Ve?~s{&XnYHEuLxUJ0WIG>bvA@K;vu2A*mL#*F5a5
zfV^G&&aWAJ+ll!qc{7Hv0gi*OOv^%SzIXXob*C||g=3-oo$I~`kC#e8XYA{q$(el-
zyE0e$p(h@$^W2TUbV*kQa!gh2mVv$p>#&NDhxm6>3@W%Xq?SHXOVMP9<coJ*`6S;|
zeaNPNruh}kIL4K<`lQhaxrTa?56HUK#$Dch1jMNe^DVXDEbJiXTN~lt`Z=)tjrrB`
z<Rdpnm9a@dKUXyeeNJhvmY8$YODz_nTpUDKx9EzR*={GYC`)E<fax5Wb&uRutz29;
zn#gEd-hmV-F+?-6)Cy}a(fkDvllLWlN|B!^-?DJO$*gxaz%V#?Ea8&Gu=5$o`e&|O
z_eJ99|05CbqW-P}FP5oNje!5V(K$r&IGZ*)1UBTA5&Hfkd6XtE9}fS6F^u>7$kMz#
zt2B!hZ3~4-lc4sR1n8K%&}?nqTJ?F_XA%pUY-UnF$^vRpyCZ_94L#eCaJ|pV@hfP>
zvW?fe79k^f90EqZd#?X-lvIJcxxW(Kh!M#DkxaJxbTr-4V0u~F>EWToSM+avR#KW;
z0W6W8w->8w>N`<?*Ieqr?m_>ce+@j<CPUVc&7&{+Jw?Bi2Zf6PO1Sq*yYeUdXo2`5
z!u6q^$xXAe+cQf25q7W00Ghg6G6>DSsVdR@gT(ei$r2y!wCe6rjx!4Kp{@IOCz^Uh
zWcU+`o}}n)KRunf`(9+&)orEaf;hRJ=Pq#!g0Jiw39Esrtqnkmr6cIR-x}RN$B>0x
zQSK)R&hGs7D+40Ceth-*4jqx^b3U>H5RtRa*$0D++2SDS`CDpf&C9gA_ZXK?E=hRv
zQjBT{i=wgP;T@#H4R|=`tspCsF>1N7f;<bEQGcm0#y@SD@}tU!?;^AUA~RgcbB|Z`
zT%s!f4Yi<DtwIc}JmwcYQ`#;L2D_(jR&IhWxSM8Ol86Ox*FubGv-Uw5kbNpA?x>gL
z(jS$d+ujjT_fG1iydon|BqO!hpu}S1?we-C6ndvsp@xP!B>}`Ww{4?R!?U$Be4N$I
zKBVkHh>Ij-5$iJ4vu*g^!!sK;e)jL8%IW5_(30v+LkRVX+oB-ey-?&ZjF3)Ctc$r{
zQW4XuLu7AQb{p;!-@AC_zyGem6bpw;X?|Mv&%Q?-=v0lku~9uK$m(f7k9DEpqHOF*
z+7&%lKl;~_b$8Nba{rho9p%2m7V8?b@l&bA($MY>oJY#qOf0_hAMie2+&Ld&H&=dQ
z(+sa`m=og8LFGTtrq=KnI*QQ@?X)MU34O&DY0}l&px@zM+af_4(>Y0!#JDFW=9w5a
zy_pL#*-o{0r7ivRYi7ZX!)fJQD_B{PO6}Be(ADB^^diNw%69P2j(}Fp50|YXAn{+f
zFZuVl!UWQxXi#3lA|wsFv@wGhhq$RicJCq&6u<7e%?PMps@SP+g_2y3t%9DyU6u>(
zE8QkN-8|z^+pxH~27m<-NA}mRyY-I~hI{7N<AhmDpF!!w@mOwI32!7a#eJ9S<^`wL
zCfkC7Fmlw1YK?B+(A!+ub#ZvmogcJXI?SsQu()m+szK(tnJdcHpJxZtfL#OMtrQGR
zN<`eUX}i<onw@;zDOyKOmm0Mzsnur^k-1n`Rv27gKFu9p85#|DVLO9w_utGTT<kM<
zpEaL-;20SZ^B50pB)SN1oE^H(=^QFb=A8fv30lEQJX4>pz00I7&0bS9JkfjnXp<$}
zcjMmeZKJB9zd-nE2XsSQ7#lS6YziV**+FyU``Q(?8)3x6q(01R?cp%<)>Z}5l7seQ
zr%SS(VM(9)ycjSjvrkO!+H=P}XI#zkK@VfSv$Px9qYH3g61&DmjnsT|J>54XFNH^V
zH3k)>TAe@ZWL)p{o{1VfD51;Sf}9omXZLJu7G4_4+ccTNfJZ}cV}1TV+VMy+il?NM
zA6^`gG5~w|GwQQOm9;pSM%rtn=pF{z++t21{s8HPxeaV}-d6u1<7FmdrS0v<#629m
zmU27>$X)(a^z71;*=_|j{$9Kv&~{ll^GiG>^?1CrV?8Y}{2*kRXgYm2`q)@Hn$Hv}
z=sLOyOg+2Y@D^G|QS3q*&!jv%ILZ0qsw@OQ`p%P9HrEfrK;e+8)o4-L`vF{HoAfSs
z#J(^3=KX&P(ibexgBNx7#q?jvcOgI9w+38v`L>X}emzf_GVFGl<$Hc<#3lV@m?=wU
zZ>X_5xn(Y9tl)^Cj;!%vBf#z7{D!=0ubY*~QL)R~-4hjTD|Q8}d@Hu+8C4FqbI)lH
zP)R-w_4q+UBYR9#=aOYgHcoZa5+&MJcHym64J?o%%JsyZOC>F`uv$;E_<6};70$lv
zpMD<1+%>$MPsO!FJme`iVZ52>Nz!*xwmW_AVl}(1oGLU=&HU|^O4seg(Xp*_Tg`#1
zu$~abX)u9e94V-*T5mc`L|p@I<8Za%21q%<Eg6bhr-l*80b_02*s=3&2c!S5i))Q?
ze6MpbpH5R_!`*v5{H<Z0f^Z?g>y1IGG0|j;o{az=AX;1Sy)ZOp(UMP5w9woa@7&$0
z5d@<LmwsDlN|$Ae6bcFof#`b!3|q$nJ<U*AI?h*V_4dfDK}j0Gs;iQrx$=ugGHdTw
zJgTC;JtH;h`IaT}1AD3IxC)r5LxI#<BlfME(Rim!?@M*a*9Q`xEi0KLePvw{+4dx)
z>G^%}bS4>fj>4HTKl|_@R)|8o_heFQ-=YEQbSn|EeY$673^Xw<ssWpMANStyw~fkL
zmjcRe8YQ!e0YD<F+hodxQ&r%R_(p9#8ml^`W2)%IxNOM|K`4B7?j*+k94yXu_!MhY
zn$E8XrArn!HM*7wP&j?OmZ6N?_1Ax$PXbx~bKSGl;qI6Ubs`!MNI!r4i<i8A+pFbM
zn*!YpIl9lE>#MHTzVIgeZ<d*JFkr`+M@jTi43BIxz?l8b1;M50;tONQq{i!=U+KiV
zPDSFoU2t2nX6@uwbCNb-5~)?@&y4!8ov35udE6~?Mp&<c+<bx9majp)Fgq0iCFa_m
zWe_07<|?J|Ka#D-2+bxd8%5KL7B1i_%K`tcpS!}A>&@im4zOxJ`}&4|6=<3A0$CL;
z&6ah;wgHcdY2-z%I9a3q+PzyDZ+rU^U>mYo!FaSJcd|g%%i5OLSM?RGf*iohao51%
z{uV*0aurR}Lfg)~r>XtyIeoVLEM0@Q<M4And`s?IEA?8kk1OT#irmM~MuWMppYI##
zL3GgJGaccscn#;my@_$ppeJvke>zR0?+krkG4kYdI3ue9rz^~jO7%M=8V7Q!lJgRB
zfCE*UL{X6s*WoW2w4>bAWr#~~VJSxo+xEw~IIg)l$rCv>Ji`=1ZnXp*!A4)Stbz$0
zv2fJmEgGu1Y-nD70MITbv(G0B=VPwAQ|)1#?uXvG1u(P6^oxSs@q9NGtxoN%X!EKF
z0+;`kAv!)G@5cwT<pswY?Z)|mZu~0)7Irfsp3Cp9_v9Wp=d!NeBxJuXVha-AU1KBk
z1LV;CCEnB_Y}57fT&RG5Z1UGZz9I(<ef+%&ts4yulS-B{;|hl3eb9MvBvX$BEF{{q
zSi}D3(xF_YNwIYig^K7`{90?`tz&m#8JgVexoJb<UWdlAfnj=ZoG3=AUeSu*oZsN=
zQ%M?gdByCh%<4*OYet4U$I{3p*%M+dUb=Hf9WYjb8%;!A-~1&o;>{*MDblIMtab;D
zO8yv9`(2n);ZFb!#Z+ggCF$}0@vfWG{i?U7l4y14&6{*RJ`S#t*Q^mSq<lpZyqVCn
z`Iq$2P>@*slYCJK<6v7;gpTi|*8-O)@heKQn~I}aMX8Md>pO-aUZVI?>-M6G=arF(
zc*~{)XcV07&o7y8!tX+K5P!1?%FTHTG=MpbF97gCz>T--Nb7Y@An~qJX^Q+tY=Aw}
zO@7+$qb&Ma<cIe^7Ix_QVfjtm<{C!+y$cOyf0s9VOQM?Csw%m=6R49c|5A8GZ7a9{
zo@?@AInX+Bje}TpRY4a}18kK)<rhYoM)lB?ld?#h)YAqSV5_3B;d;L<k}mx4_d>nb
zVu}<-NUqyFdx9>CInTCTD~1w8{E0(zDTV!Vhfpw}?MlBnqB_$10JH#h0aB-#<*kj4
zcJfK+chs(QEVMK3_prh5x&;sZYKv3ItBKyQdV0MOn5U{OoRbei<TE6+&Pw<}azFU)
zPuAI`6L{0XB18pT^7y7%U0@{mqIO)tsCLA^c>lo}`Qd@no0c9(YsJSdXd|%%{JRr#
zKb;;?MVq0Kx??eWtg!M36KutYxz)h~bq$u&qFWqC(D!#7Rz697obWbnLY83HK@6t2
zo#w@7KJkZhf$=iv+Gn8-T%Y!1N8~Wr)=^6Kvicqvj1}$k*0-PZ=x_YpL8MhAEd5oN
zg~FWKa>^eTk2CKogpi+CeZU!%5}Qx%V^ZwjO`X%>GWNatg?<TRJwj$!Qt$CcKdf2L
zKJTab)bS@Iz1YH^t&d5n!GyNL+Id^er*OHxPTHh)ko^m{BcBh2i&VPrTY$l<LqrW;
z0(XK2tzU%w3sxTP@(U51=0TroAY*++0}MeNs{=be?y0}U<TmX>)ZU&=EqCKz<jh}H
z7^FOCFLQ6b9A4K>UxaXArrw^>kM4$UXA75vy|2mJpJ2}Zf9QruPG0&8*WTjw=PZ1(
zTeNL3Ajs+FA&y8F-g$|Wuf!82*0A4@XN^Rwv3Ak&ywp$Ir>zXi&&<DW{T#kex}OjR
z2j<EBTKN5afeGy9_^se)=a(m4)RbQu+kMxMNk~*F6tva(1c4Q!A~o5Siw;#Adwi{t
zdI__${qFysCHXZ`G_Q&b^=%5No!lk4^b<9-BpobIF;I~^S#D9+8y^tQ6%Pfz?0DLr
zwpcgy#=R^Uc2xKzx^nX@2`WHyylTM;6!(1j@WFTUg*zo!CRQgEr%BV5;GZ1rlRG}5
zZ?j$WNxdRZZjG4AM?7?uuTFWl*HEvhhfNEw7hVuwr&*JY=`sI9!XELWw6$^k2F|t1
zxD|5m?@7nT<H#eAeY@?X*GeT(G~ZVk$QsA5Tf<jESJ-Y_es=yxwGKkXqL;8fH{p<{
z0hJJuDM+BZf>zm*qf~SGquQ){Gp>b6;tGjUv%M2}NeZ%h-5A4;jnh@K)<4(mT(!`!
zWuDpvrS{p^;opVSl^id=7XyVTx)VBQ#eO%zWlE4v{X!zY7h7fzTYxgO5x)el)!+Lb
zyLbhQ1$vtA9t{U`Mqex8Ze9Bu)?%b`MBTOFqEbP$YekdoD;>mPY7zpdw~63dfOi3H
z>_!qbu<zTgJ~QI#5AI?vyhG)@Uj8EDsBU=vg5D~}Yk52%!lCkZ%k(Sp`av_R`H$88
zcznTe*PaJf%CD)e`g^om`hp^40+WYQVe@y!wqgEx2)25C@b7qUApRskb1?YXWLLyw
zK6}J%OK${N45K)L=v_=2m&`uRDtVo3ToatDwjAPs{hVv8Q2CdMLqvqX0(Xh=THEC7
z?YNICsf(DZf~ZukIqUs0ml!DVl+J88kczuK9KV^iEW^B;f_d1`Y*$^W1b}(k@+J&A
zJ1h1^KTGO<uleV(_@6fp==ES^V4NX+eqloK>~>7^o?Y8UtiP@8Qdk^y9Krt_*>;UJ
z%BY7e_+jJfVV{zK;dRl<LZnvBgzQ#dzFk80+*cFl#X$4DGmS!oCu2<MTK9$5rtT9X
zFOAy|?@$&E{uMedn42X^QPuMn1IMwTnGkXRA=kTWX31~Ry30K-XUxQ&&fdvx;pg`J
zp;H21QGB8#_ioR<kyE4<aN}-v?eoP?oN>jsG9t~v{o*Q~cXq0ad+d@&W@l@v6Yf1G
zO^J_D`<BSO#Y+-T75Z+{Ihm;6V)`&Wk;@^i>y!BQM`3Nv*R@(tB8=g&l$+If2rl5{
zCh``sAun*glHu*_I4)4Ga=OROuT_*yP{6%3A%(s>CQ>9K*F!2~$(cW(>pOI@sz!+r
zHuSNiE!CgCpzx2`_W^%tH6F7kiL_eov;^l65$~#jvyl3z`X;8;kN{vejNY`cHBx1^
zwWW9jW7Th_`MKtp-2ElxAHLuE2|r>kh&L6R=41%<P3GoweRNeN56)}IwSb|lyT`CS
zZpiS>dw}|87zb#+1+guDa~Hb4eG;!@VjPbCkEG{660zkl@!+JBo5y!}cDNjv$5cEM
zjQ%3qgNO?^lrYal-{B06TBX88V%WMuxTdVH#rg`~Y-=_w#{a4r;!eNl%T%1K9+;oc
zh&cWd=-7vEx92Z2)Qin*xPib@jz6Bp@|OwZ_0kRX%mG1%>QRSy+2w%U&mkT0L?4vZ
zUpIkvgw?15#*C_jzJ21J(qqw*v0Dx3k$Z!pzwa%22MW{oUX7$f7v$v1jDw?I366iu
zKSGkpm@jK1GFoIF*jE2Fj5tl6zv3rQSo=?gEJH~*2#aa^A2DBDZ_-}pnkSqwof!EI
zW~g^jjUTI?Y?Q+&h<go4kbu0Jezc~B`?#qQd+adMY?f9$e<y*})?iP3DOWCYg81;3
z1&dHr5Bk|g`BBmwf#LfD`IH50NnUXKR&vtDL&g_PuP(P1HCA8{j31ue7;~mO+q0kS
zZ=_M(V87rZG2z{4`<eFGtM|owii7u@ziUfC8O!TFFJIJyu4eM2O$ps=ER~R(4yq7t
zvBg?qh*wO=ZhUJtBu|<{^qc3}lV(L}>^<C+-^S$+a0F3Q3z)7cM-@RW%_>^@p9t8V
z-MeRF7ETe0@Fwwp(&lzTpryab7n(*qYT7uo%{oC%SPIaAQr1(MIhxsLONoz6{5c(V
zrYh_0<`jguV^r*_p|*?sJPl?dQTUNtKiM#K_P4iUcCp0ag}5XVbxWc&vETp%ZfYGE
z-%djOyp(oFoC1G^zul$@F3;ZE-nGO;g2C){v-yztrTq?xH2deEf0C!Z@KU$g6Vf+l
ztQ&bd90BfA$prtZA4KZ{6vt23Pq$dxofb$JD{21VOshImE9#f|lLa%)fjt{q{RZWM
zPWt%9+m<nx{qD?W627Dxf0nF0pZ30W`L!l49szJ%%1D3w5$y3^o$Pk#O=iQ_$sDa!
z-=@M}2gG4=ela}@8sP5T@HBMs`32&WUwpSJt<)VZkxNrg=F7loJJ;D$;HqoJ?FR8K
z6polA<(pBu>SSWq;gdsS-IydRl=!P5!d8%9>?TLF>7kU005hpNwG{FzW@ROOv;tX~
zIpv7$unpHvp<#KIkRO<`#Pbn0w%*{OF>trmQ+3D-aD7t@{RoQ9;{-abF|YbtcLJVF
zOI$ArK3-T;geTj6s&<?mT5{v%rhBeNo{T8;-ytgFZx`b*QcZr=0cZq5s^%Wc<IJ^p
z#@x9sG^M9Z2K4MXV^r4HMcF}qs8r(1zZBPo?m_z2ZvgKen1I8HOeXnFX7{Rpd46MK
zlhSSb2Ndw%fv2TKh5iXJ;-9zP6u9fU<C@ZjY10`j?zH@=jjxn@9#5A-9iP6;p!hI3
z+p20o@X3Y3m4PUG_7L$r{T%g-xai*z{{A&JCkhlPtNN$~cSRWKUpUHa|Fsv&Lw#0t
zo`%{JziS5M1(6?t#>ydL6{yM`eVM?t=WObBpNt=9?4->LfM1NETE>>`DTB)f)(BLo
z*J>l~UvSYp^;;o&(BAeL$j>-iPv*sWj>bcT=QwVSKzVYl1kwJxrZr9Aaq?qz?Nxs9
z<IyaJLf_R*^9S!X={gqwJY42?)$*h}!}HUY5I#qAh$65D%pzeL9H{7oFqy&&ODsZO
z+zPOr(r8Qq0X>&X@A{_P-Yq7}yd1x_1J();H<^;4T-evME$I-v)<tcBh@&1%RUa2U
z#B@_p&jb^mrA}<HNjd~I$uv*TDhi>jM6JXcqt+XYX+<xZ7|-&Z;@PvTFJs^%pekna
z_5fg|dgZ}i-Oz0!e4(_#o@)F83oe<h{PhUb)+jA=PTVl@AqYYjn9;}mR!C1CdH&?T
z74P@e=(ewfr?YMXUjYUMdWYh@Q~^mpJzS>r<Zm@FE3f%K12XW;X>yd7mbcy&0R2`+
zA?7aUmhx)V@J#jyaII12I1L^+iDz36x&ij2_0Lk3^);Ur>G2GvQ@u=}O6+8OxG!-m
z(4Bptq?*}YbdU}si1{b?wR2)r!wU{8J|eYfc)(3b^33_c%3VLFb@}f)d>7TmZbv;;
z^5O0pqw(gd@93*|#}x`?5U`$kL|EmbJ&;OLt9h(lG8NWWoD{<X+0V&0ysg}&Za^~%
zp_j(9hha1|r1`!OI7+^U(j^AIQzTkH`HG4{_%m@tG5(!lTs-Dv!?$C-O+^W<n2?8L
zldjG+)e6d!wdS?|=r}OgFUMIl*^HbvQOFFidpao1p{R3OzkTUw$|ZIz^Z5Tw#$ZCd
z$)x@J-ZTTVbuJgr{SPmS>xOqOV_A<Wvr&q~)2a$Gn;Rcc4RDzGp0o7%07$eux|W<z
zCZsF$AiM)sMWzdes!qV{aimG&$07CJSi5>@AcvqEz+I?+$aj^TzV`N;J1~+4Q?e4u
zVE!yj%H*<t=)s4A57rDrcGOMFw7%;^7@d|jh){pTRZRoWa<9~!xNCfzA9Z{gb~~zp
z4t~NvI%XPAzT;yUqZ0#&p&y8DmXCfY{NB`;ZZk8xe#`nq?FkGkijN`~JbZ-yaal3r
zN2_W33g1{_$eizfKJ@~XMxB4Q(@sD5E1$CfylC{kFN6Dm&vgv}Vm-H-nK@ZaIk7CP
zU@H!D6E}=+KrgxFy9LTI-l#gc(rGkyOm8H}Y<vrd9Y|F=+*6liU+zx?6yvm!Y{C2+
zJL&GcexifyJTGUf64$PYe3EN{zah>c%}QRDSLwleIQgIdNECFy8t-y`B%akj%g(Ca
zhXJmQZ=I!B@<(0Uv9VlwU;amuZ0=gVz$MJqZgSS-?z=pYzug5C!I%9F6dz3}-m`8W
zvb^sRq+b#gJ{B}5&-shKc1#?hVD&rU`nsd9bC-Dhv*ucEOSjK8-31BudxNt((C^uv
zf);r|S%kp739{tr^4hSm;Cq|<;2-3=TOZTiF`l#SjKtF@eCZCZY~wP+bT@Q|{mVt@
zKoJ^|aW%`x8?-F_8^GTTC7z5bL;p0om(<SGe}>p`R4@HUGGkGFEp#~NE4LPtHvGZ-
z!48OanfYX)z@T=4S1e7Q@q2u+(qh4Swo#&zC`>!PhB2ohjZcB-;Oj^Y6h0b4LZeTO
z7Z-X;B(aGluLPfw+YYnIeo*zTX<$jAW#;ni3zA_m=hDj5b<%CxX`b%bul=>GCVj#}
zJ=kPu5rVx(PR_zYa<!Sc<8#|iUgyhusjIErR%^idtpDmH647gfz3_D`TvqcyY8mJ?
zEWp|Oo2)$A<dPA3W~i0Y@7<;N1%=(PsY|Pd>YVbr=l&r(&aUqV-AkcXC!rs5x3xkU
z^L;)6J_trXOnFSrfm5)VwRAwj7t-Rt<MTb%1MQlHsTVX?pH;_D$(t+trdlT~o^WdS
zh;pmg6jNpU@NjtX-#zUt&#sL?@cpKn!()txW;xU4S5y$+mI=d|!jUG%G^<(2vctbE
z_so+QO`a)@$vVh#-8gN1;x7>-Cbn<3XK9Hnb8F3qQ3&399Id2FyFJLmj_G2IZ`yGE
z(oh<QIt(S*!XCfGrt^3CP@JL`QYVIn?#^~G-<D<rsU*iSd>B#~LmI|Z)1dWpwUYuS
ze)2r^%?MDqI-6ru#lXA$-PU$j8x%Bn|2n5fi!JtfvY%2sT1fm!(~*-U7Vh22-!B>$
zXDAyv!X;u}srEiFm|s@Ufk%hs;+}r+NlSe8e<YECe$i?2dGu=%(&;7z?&4xAX8qQ=
zo521(<0$L7G`BV<typtnRYcT<wetg6-s^L6_@;@4Q0PY_%T_aC^lbay+8zbvQpxjz
zJNM(m*l#hlEA2{(CZvg#=zNl0^0xy@548ZW!HPg|h3^_U{?jTY8s2Ma2$u$;6LH4>
zCL!bJWT*!3<2`Q}53|hqxb+aq&@&pKGwlaPbbRbHK`#aH=)z=;1)eIwLqkq*pEzeG
zRHgi6oaFb$pyru>%~WUon37d3<3`+gJ`8Epxl@u!>5FoISpP=K4I&eK>M;EB_%Z@i
zLN;|SIq6^XqLR1TIkt=~3`>k+T2OuRN~Gl343`X9k{3u<quj4%nGNR`_-T`C)0Fv)
z-^p(Hx>r|P2&u*c=fNP}5@)@ls=kedf7&7rs7k0)6!yRh-GlYQF`qU-mi*kW@&7K0
z3mUp8$IqT$w;@V4_hhk*GZ4+0dTr~ClW<oz{73t$#rd9wDUIl&vro43Vb&+n3_o;E
z<!@FS`+Xx23ah1vJeO^q^lfrK1)CV<uWn2A>ek=x$^s%~iLjfb+jFsef%YG$T^YnS
z>VG9&by!p1{|6OO5m5mF0jE+@A|M@;k5VEb-AI?jKsu%<AUQ%BHj!?T7~O32q+v9p
zyV=;7zx#cDf8S@%-MROid*0{$DizBcSBku5C2>-Ky$N_d9TGE8tXo^U54IPIh&nJ>
zMt>n$TDw3lE0>ys<z6+u3%mKojlL@~^ycfvfqr4z4}Di+3S@7m2tq_fUFI@v*z8Gg
z^w`7?gUOpqL2}TV+;mAdyZBEN_g!iP;?^t?b8BYVsydCAY_4t7nUx=h6VDGcBuW1$
z3j8<EeDo#RZ8G9k<7|!mt>cs}T(kI{MhpS4f-ULc&}zB<>VIYt&`<Qvc26_>tlAC5
z$rQ3|E4JMZPgDBa+pQ?A&+9N6i1mZA5=U{ozRIL-Lljdaz}vvPaSfp!`AN;x**v>u
zPrDhf`d0~RVrz(tC|f;_?y#f$z(z$IABV1Zce0+RN2QAzobjf-fas`{-px@4p08^Y
zosORCLKtz~fz^Qh5<?&-eJk29byjVrnGj?-Am@oXo-?VleB;8tedBGD7>8q)IYg;&
zT>I>Y5<9D{Jy6jLTWpn(YsEnHU0o;omB*gewKP<vMVp%yhJP}!7Oc-geqbP|u$sug
z_+x!9)!y4HoAs44d{#i+@ic01%<Yd+nh!4u9$mP<SA&U>f6>t3Chc4@_eVWeRSzrI
z+EE9lGppIlC{w+R_bL$(SHSuXWV}og>5B3oO41}eC6G-AnhneBNy>+|t&y_OQm15`
zOY_`VBC0&qr4;)8Hg2@ccGKX2h~q^FCLqY|)7h4b{*AB7?qn-lPMNT=>9rRhKmw8C
zpM8Yh6cvc~74STC^y5(CM>*DBuEo@bC{b)8)(t+2RfymP;3ndCB(5Tvdt})V$0+{9
zx&}+SG-g|UX2KUe3hQgc(cPM!0T1OGrTrgwg4%JFIH}F{!ZSII(3Kz=B4~P!jyCYW
zai)$|$EwPMi5xcUCOvE?Jb?GT6~Rz3!pHhfw0pgFvvb%1PZuj4wMDOZ-jdnX?%#v=
zA|<_~o@-0qkeZi`_+^FW4D5>4xUL93GZ}m7&?I>H+{jhz`{{-(zwhH1ZBe_w!eJ86
zRp&vTpI_WM?qzQp_v*Ed(Xt-k0VLu)u*O|-P=gekB?tjHlX{NA<WviS5tFBGE$el3
zSdLDoUF70^r|xW~ZH*FE>a+=*y8qrJcqCo6z=`w>Z<l$nVBZRc4SENhpLDwxw1LB0
z9sv1|&9A$q(b3`2EnFK&|CZ0#K=Gr^S}U2ED3!8;h|g*Bj%9{^-?s{R{?pz0aPdD<
zX2=KN$kdJvIz2@dEEz40teVK6YMSH8{e`suO?0@(u04Ktc5K$!RBpvL_(%0tyneCj
zbA$&sUYB5loxs*Rmm$p8`4H9ctYbeg4VgtCZ6+~)PW*a+-Qo#4cpR#ES+EFm*9?c=
z*80hDRna<(?YKc_7au#mBYzvXxtdeDTUQXj=AnIrtW2Syz=(Xk<1f><VzlBjUMufS
zucyzx>E)b={rSYZ{n}5Kry!th-u{gA-nv4WE=&wcJ6L2!up8|hHSZTY{AM~cttM6H
z?E7=(tUms~Ra0sZzl)$A=6P$vKZ?gOfpj7UBntvOz>TQwf-PBW4dbAe^>r1$I=L@=
zaY<#hMHU8{K~+Ww9cMH7?mbq&Fx2!1r1@vQrw2LFi$1+YfOpgMvgY)Tuesu(Qq*!I
zh|y59aC*+Ma#pGMX+!#m$~4cLz|!9;BG>QCe*Kz`!;Kk_bWhg(r=dv%K6u-Qn}%a+
zZpq4JVWB*X(lYW5aOW~}0c2HA=^s}Q4OK$JIXnNtKMG5t9Q<xe9IqKR6J24+=8Rdj
z5P$8{^jk35Zm!=Q%64He2C9s{g`nBZok570q^u`Eq%2lilYE;r>Ys6~`RL<+XgaBi
zNV@4Dwl8_-E#0Rq>uw+Tf!7&z0;FBn9arKUw>h2>XS{J&!J~&2Uw%YJPIO`TR%%t;
zEPF5c*25=<CIqcPypFo|Y?<-@C?-qmxg0dchh}liWw3CIO}NacHBFuDb}xGso}8(R
zG8krZc^;IMH!D_-xOI5+3zm98srdTi?#lCVedf~{m=ph24wLn|RN9vK`6D9>SBSZ7
z>73ug@mb5()toz;oa@KCW~ZgCjcqeWAFQR&nycm(KqNM1xxa?so5%q(-YDYn#N<`x
zG43ri_HKF1IT@Z(*%Ie86gUl}*ztzP2{R3ur>Eqamk+~J<qtNI6cavzT?^#DZRS3n
z(UU!(1Fbsbb^|SH;ncuK*h88S0vv>=`L{H81wN5P0{m|gU}yLU*OPwM&rIk3xtv)A
zp$?q;r&lVA_?6bHI`^hSg-n7rb2?YQ{H%-#)~TuN!AYKw{?`}2thI=ezU|tWu)0zM
z6t$d{vcA0=!Tu{xYSd!b{Rkd(x7=Icb8>S0MR+Oq2A^)aI~wltn4%eaxVvok_MV9I
zWPic0`m^b7v4N2tPyfBFocg*4>V<C@`(L?ws{}TGy*2ZS&~LL6SO+Abr+GQ&*PKqP
zoZfRChW>I*qv0Uci3HZ!5@(-L#}9h9GFYaO?1Np!R8C8h60PTW(vIU%H@)-;!TawZ
z3$6U(a5Uv_Y1*m%4gTSgby!(>^rzpWn5nL~c@-(9FSZJ6&q>Ro$Q6R*y3gQlxAk0<
z0@X5sN!^R{`@~9Li>c$W+r0Q{#@_7^;bV7C^t-rfi5CrhhrO&<q9q-^OWme3JpqT>
z`oc%0Yt}Dx%;`D)QRGqdudlWc=8kEnF|x;l_L8v=MeqBJvTEx)%i!G3f=UsN3Y>`q
zDAXHMzjj=8ZI{)@X78?w;QHu?@c#Jc-%3aN>@H`}pBeRp;}jN>dwU*#_^?;So!n!9
zNP|&d^9GI`-`WfyeZ{{wpixMiwzaWY*BI3|ru1*n4=tgl@eT<Cvi;CBm4zcZ(bd~c
z*H*vaSl`_R`nt4g>UNcByG!U9gIyWL;d#|3wFm(hthB@&Pj(x!yvszlE^$|9%OnGe
z<%%vDL`(JZe2t$dRCe8cNGhF@WdDM}UyOTXdK6`|)YZDk+aB3C7bF==CF|5^UB4YF
zlPsg*AzXcU46)iUo^iT8;^_IB#`sz6P1_Ic>0C1}IIq0E&v}*k$>$-d7a8U(KGqzu
z(on>Pd=hu5HSwJif5hI`*AFX`#FJcd_|IeYRN7>1DBCubtCY0Mrhn|&)S3k75qarf
zbI6YRq0hIxlgyeKXv=!G8{r{2bxq$o3ssUMque3X`=%LO^Eb^~oBCFRKOT5a<ii(&
zy+8NIhw&tC#}meRvlm#O$xQtQ>!1lFryTmUu{h#jgY910ODx~zj~VJ01EYKv<!0|1
zzh1en0D5v&7&r09+!vMU65LOhYJ1xi2~IU|75AD!g2f?q_o8u;V@;z=yv{4V?jy{V
z(hZ?{LF=LGNz+vcl)W6xD97G{-);@<pVv94<)EmN<Syxyr*&hc-KVqhoBG0NpPP}-
z9;ikdB_i*0+XxtbI9N>)@StO!J`{{uOIvKcy<m!$QLFqt|4?Sxey)sar8H*{%-fDh
zF7%U>;}<19dFwjMlA8JX)~+mQ+t@!p=@&A*?7@^%SxFJt`4|hXs`Uqqt}JKv>GeRO
z@Z6+o`{z8c9i)2{EBmAlfA@3Lv7q-J7Y6~>HxuS@$6H9w6C$QEaUlh*dRc2xMWb^w
zB3+8LSJ<y0A#k9U6vE^?horbw^C%@0^;g<m#P9SUg=7)ayKDIjd|zX!nfFal0!w8&
z*;#(TDR8MoeWEtX^?Ck#cX7hr%+o%}q20(A27K4e4pe(+AVop>$GRCi(jP6b0}2s>
z9ccTs2b!~Y;=dr>SO|s{uZ<_YwYqaVS34nR71HV>39>2bMKyZfD*zQ&=KGVBFVX2t
z;s{YcYk9)8b$C*JC$G53s7^9X*>l{EzX{Z?xG-i{F9&gFx54&f1RVy+gMY<d2%lR%
z$ZX81B)({P)gA5p3Dp0Q^6Q$P?~n?s4;4nTaF6@FbmF;kL7#uX#oEu7hDag0rWkv7
z8wmydL&NW%r>4J!wE7-Q3uf{zo?goc`1Vn=1fQ=^YGEeW0uP?PiR8UR-2eHGYBnOI
zvPaLe-tV^II%j%+ILgCFJQ-Mgqbp{NaFyZRy99y@(e|;O0$kooh3yJIptsf2|NhJp
z&EexY30?;f5+eiYultg^*iL6i?^U)5SBcq;NR_F{z}J4|4h@4{F?pq)rmsdr;xB)K
z=3S1|t}MNp1zDnn_c8s^Oo!bo#yb)!>Hf2?Z7<<bXEy?Cqk4}-w4RR;MTs3Wdz9yH
zgyOL{Rf*7wd^0}h&{*HQPBeAO4u<an;qveL7=F)T_U?cqOMHzngOePN9Qt}aiqr9R
z-ja_Y7|1ER^F!FQ&YIZ+v>tQOTNKw`<EKw*L2}99s_9v|S?I?0+CGF?Dv@<sCC0t9
zTVeJURVw^z`?+ySm(V?@?i$+X3q)5#1Fe{)Sc!T%FIHsS7x5yc%cYxDEBaSC__at1
z!w*MR^&J8;^10S<o@|S7k7)|H%rQpHdeOU5;!DlUps_kvg+OT+#MFrr;hnhtAo|_U
z7y3gxmgC|5C_1schnWZ3O5=}{3vy;KZeFE^XgBso_1q4Qs%Kwp!d@JC>2y-Caw1Y!
zU~dm$tj_d~NaL`tk1R*5TKyg@^vU*oE=cvUJyP=JsXMveI88FLUxLwRMAVdlotPd4
zRbwD8+p-G2x#E0&K8}t&rem?-`3^v_PO8jElkK8%ZLW4beXFG)QOx`K+K94;5RYb<
zH(m(mVr`0NKTKF7cE_0ol_(v%z6>{_>KYN7`}W^SJSbU<SNMQfMdI`{r=y*9cRA_|
zoWhDwth3S2;y7yj(d~5=0#I9_NTvei(Fa4$G65>5UxbOCeO@$IT>1!zt<Poz;aDgP
z^z7)zaDH<o@g3yj(bS?upCobW!p3X4wy=!Ky}do)ZSuZrR*Lm}6F<>o%NW{WM%Qs}
zPIus1RO)MoQs@8gkn1wHYGGqSdysSYHiU`De^21}&%i;NR)3NgFN<ao*tP=u6-T%0
zvMd<z{_iKDP~7Vgp2%b4k<;)x<mjoK{@#vR5b~*xjHxQb?$1ud1lQ4T4w^Wq#IARj
z!9et%b+$(epn|R7qzeE8yuRy@o}-9!aeg~oLkp=k3wQ(H!wwnVhtN&cq;}HDtNbM&
z86HWjQ$N<H{}Vb;B`e4GlFLZZ%>UH+;&ki`9N9`MFYlCq*VI0^M0Nx{#OV!NRgG7;
zx~-+Fn+K&lBU`@epz&R8%=*Qtq}M`_xdCDc9$u(Lcf+Uy?GEk3N&oXlxP*N_f%q&1
z^nSASo#41EO*xXizkj>*`IA=_?KddeWhZy3J2kKR!rJ6t02b1+GTZ<s>!wHj)bph`
zqfuMNNo)P3wZW?=PVe|%%qHA1aCB=Inz7JPcRuUJX9qRD7+en0(09r4T-(w#wTDeM
z>)L)ImHO3Rv;1C))8<#48E7P01W%^JcCB$S5;{$zE}v3AxyXH*p;0jjP+&?usy)YM
zPxbO=hMKdo;dlm5<#eRk{!s|aSXrW3f3tEDk54ZtP<0Oan|dtMM&D_F+eAm-r35Ey
z$Zd*QuKIfHpNGChDN9{jC&iO}-y&YdpEJ1s&7->Yw)Z1M94W7hcE{m8NymiXnp4b9
z-mPiU<Kb~;k?QA$C0D~l8t=u=+N`xGRo6I_<;^8{zZiNU`n8v=cY@xD%2CfFaaXBM
zI0r<`J0~j<ZW_d;PQ|7^WB59I&zz2FCgIso)%l2A2TiE(?)&pF13U!C;g+&JT5;`b
zos)&V?Nf%!6`Xsxa3q6-H%CDjhLy1un5V1`PpUG<`ukWJ&kKX~BV$H(+6RfD#P)hA
z>SiyCYh}UHhy3q!YR>u_W&U_ZE?bRdC!19^h*oZNT|eD44<$;ppCKZ}3%=BtRZc5`
zF94K6kIS#yFMA@TZXy2E=3WU(v~5RJQIDPqG!V3~tr+yiaSkNBd;jl=WI^BQK9I^y
z81%F6<^_}|(`|kGdaiUxpgk;Ap{^?b&L4&bS|_1?%BZplxImc3=qoxNxtol7d1I(d
zFVV#J_UvaZl9(FJ>-pEkPiXNE*K=BX(DOKUU!Zp7G!CcU4{Z7n5Zp>GMyF1rb%ND3
z-7V4pUeCKzlJmL{_8)~glmV~g`0zS1;pU><>tjY1;n*q6;E?F#-^se(KwU(J`_)@P
z;2~&|?>~xN?_j_hH>b|N_xs8njp;bzgqZ6@^odB?Gi%=7vOLh>Bbi*|n=iGdw(d3f
zTLXXlV%xLR<m6Im$TR84Ue)t*7Ere7=^f~2UX*9CsUZi_uEe&TtpMWfGiT^@^75!o
z^QfR$nUMB)b!xfsQ6E*xV3@<btmRt<&x4h;dfu+w@nhVyEvrNPv`=_nSTW9Kfy#Ph
z*z$CXa%acoUS1rkHq^U;+NHEjxD!rjKVw9TXU?vBMB@_M&=3pNIUqLa<Ee`_d7@kB
z`AfImh_ZY@css7<>h_#F`nP5EY6FD|My%V{Q*BrbdT$e=YVT%Ei=dSQX#9VQ9BJNO
z^NY)jyDs8hELGvk4{SpYC$h#aLgxyxqi_{87`CL>r1q;{yz<jASGD$o*<RO@)#xL}
z|5mJPDRFs0tW0eg*T=lrpReXbsa5?6H*wJ!bY#Z%+_SRP%4o5cwuOFMK{T3hoN0h&
zv`rRhL7HPW158@I^4kGw@4e3G-9Zj!^ZvN2)F64kZW#_<tEYi6++mNnx2x~^P)6$q
zp^_=vj(V?3$-!8boA*)jH;@NH-()2U%^k?P$8%=I(;931-$`j&c7PYGQU9}^wxe15
z$6q=%3k`dzRybaN5Bl>a9+NrqC+|BJa#S&(M9oI0pdnnJ^tQplZys5o4iHMy9@lUs
z$h#yxcp?5=QXv}0+PF8gpCR^cS}N4EqOX}DmKulms!)fS*M^<%T1-u>CeLEOtX1)9
zKI<OMb}88R>IIxJu)%}Ucd~KMWNDp)+`N{v<jU9TDj(=9mFxEm-JjQsBWw)1Mx@+}
zU*o+o{ehYRDa9o=M$kLy*qNJ()!26h4>`GLY9#m|9a}KmQ;bZ#ZCGjwaq4*-k8I{T
zcT2_BGe;OP;J;Cl>TP-UL!qvy4?6GQ9qR*XMM7&a`mfh08EDQv#jjYT>Fd$Ze?~RA
zbzanDVWO++_5`ZSgg@Fn2szTMewSRx9^nz$jbKeZ;XI&rDlExN;^W`Ia3(4ld47|V
zLc4WtYsIj9eLUsE+jEA|kn=YfLobSlkh!ZymJ)rwxdqBeL=RLrKizsdaSh>-8hF$K
zF*HjG91JzO>FT=;aI!SjfxN4tQ+4x+`E8xBfY$1u_@=M<uWJ7cj3hqS*L=P#a^*_B
zQt#=@Ela*$5Zji&?4)?DaKFevWp*s5md_hmw2Wr|kgDDOc`GHH%>2x7mmo<9_XyHl
zgj)DtL@lp(K=In?590mYlObDL+XmtdruR8ku-&zajm(}CN^ERr7Y50#5osTv3rwny
z1Y;l~gHJzt{E^<fH6=I`5G>fUsRYy2tZw*woZ2K7PQkIal*+gvoEb|75(FL&=AB|f
zPBM&6(}X@Q0orB9<H#vEzGr&KpO<H?{Ey~CQ`JCMR?QL8dM)wM;k`8>p}y(Kf@JZF
z<>rNs);}4(jqQkAUe2uB%%8G?xLYQ%CR~uEP<m5D^{-@|r%mGYzqM}Cy3YCh%o|A2
z;T_~EI;>d>mlf{K@Drt^;l)B&dYRo`BaBP9zqpSISWPVU^7$1v-t=J>jH3p$p32PB
zH9=DO4p<?Qm_#&*s>Ild=?raFKk_(A{dX-<@mSfnho?S%I7wejN0bsYpuhs#rv+iJ
zwqMY7!oE#NpMN9wFAu)f2w_zl^v7t8=2wp*W&eIpACi1`kW;+GvdZTZpIlxXSmNz>
znm;42IsP*NOxsS5_n7GS;_iw3(*gS<H^3_6bFccY6vcD@NYvP;jBT}&aU$(<Eh4$m
z00<a*<^HWl_{cKNATw})TF1g6(Bv{x@Kc#{2btkuY~tzGHp;qPLa1o7HqmI%|G-GH
z<&BDRA`4NwDC#`=n$i3m_0!g>$yhIou!rX{<zjBPV`Lq4wv8jA6x2#eel^6*6{Gn$
z6(g%BxUhBukiGBq+P<S$o!WmCU!qNs^6D=4kE~r>8-h;G9~NJ=zW=(uJj}>PNxIg^
z&{kpf#&)JnjEEZIraENJJSfZU0X^#zqWr#K23OT*{D$zks?<(E2_i=Radm)WPTk0a
z8r6(bZyvV9q<nem_3En9njMa<Qf|-=&}q((mn}L(V?8=p2R@lSpLF~noX}!ULy6M-
z7%5eB4xJpB7e=^k?@2bou5QIGEWGAM__3vb<X+z6V0EpDS|v<DYLrgbFSDn{br#vx
zwCaYJYX8*NWmqKkkN#IN=pQ(G_Xadd<VuszpwB+>75=xW>eH>egcSZi21MGH&6F=S
zu><jKiz|?kLhvr-GM<cC*%|~*sUE#G?#RELwZKikDkar}=7iVqY3-5s@!UoF&bF6<
zv0%-EPGqQ14VB6MiCTYvy=^;E*(>e$jtam=^J>E?U0sP4tps(d8_Vgd(H9ILy}iL$
zk0<Cfwny5SwRJh!eEn1Os)>GUwM1k{D0w!^GEnqqq}Y&%h^|mQY0yLyYme%E{OM3B
zH}`X6SKUWSBug8P&3Y!!o>!r4;q+KMq-<EIl}w2;BZ-gIl&Et%>~h8jDu|jm4j4g4
za&H&vvK<~v!!oYM4_a-3Z@URL$t|-My(Eruhs!?D?umt)RY%)U*|5w`AAP5yq$t8%
zGiVH?!WZD^qCk(DXqHU&nSEo~!CfsJzefs)ayVrXuI_>NRZrTnGXN0g$4(0nn!@C{
z9TDt;WI?eLi3QryK&I>ku8N3{HG<}AokLN&qmN^CXw*1r`f~RwD$kPYHRsAD9)>?1
zHce038VxMtIX*rifZ(HncMf09KY8e}8I4SEv^Tz28u5?fQOMX_8s%Jc1~kJ`rqLSG
zt^IZBdb3~drbN8Mxw><inX0vu0&8B<ZJDITpO;4;YAJ8K2kWCZpy-l0o(^*gd~g0H
z6I`%<QkG*;^X9g+#rG$N>^ts*T+16BM%sh1+N#m#_aE3x(kD&jUXgdYOd!2p#zcVc
zx_ZGFeEU)Si{NW*7kjNTPCl%5VM6sz65<mHKG?`_A-X-ftIox;G3NUh$h15*Gka<o
z&XkI!^PI@PviF18NUZqyf~|D%0{i6vnJ5|7BA!%MRXsOd0_4|EDLR(^(%gF?6pIL{
zzq0(x>`p_rBh_<Od(%_heACAL(pNvLaOr+_S9-NhT_Cpq0Ln&EBpQ*&9;((HXuygU
zyg0;Kzb-bx<+z#(SG^LJa^t?RDFpV~c<b`gGhrJ`HZ;Q@-55Qoh(z3zHCh7GxeWsr
zV4KUR34XO72lLs>SAFt~wi0HrD!Qr^CcVZl<AQfNL(j5lB8#|?ZpY*nT+X(3XN6zD
z$Rt$JZTt0-3H00ibJcO>(7-puaLt{P5MBR+CU5zyk}-K2X9T-E&D1=4aUX9)W)0Uj
zTxn8&;#L;Z8_lS`{6az`?4u3*=4nN1pz|W^3hBn-oxIyv!LrGaK$!r?qRyZq3snvl
zS6StNf`(o%4&j7(R%V<vO{GGWA7$*}Ve4*hUMEp@-q&EMC97Di(22}cTUS3J_RX5H
zn{+Nph`QFB+^O)ekTR_<c>L3H#vi*>(+<OWqP${7kX}M7A!s8AhH}G3>0I?j9?mPa
zu|{9OrLHANL(t}53GV&{JA^~P_%v&Lj7)QAiu9p>S@rJX<Ibq?O4a>(uGAydZH(#U
zk6xUdh90Y%tHIAsv-<T~rG0<PL)y+a40D?BG9ro#6S%$wm7aUAFV`n29fxNy04T&E
z{&MIY%ptw{p9Jp%w}{6f!?zRExH29qUWHg`{={s<j8`fuj9#)NX}k}czvH(-P1v2U
zaw*RbV>C!tQj&7j)PYNps<fS49&Rpq6Eae1>xSf8>Ixp3AIUUlsdU#@Uoy7pTRPny
zo;D4$T6n@iEfWjwoM@Rp;Lc*N2rFGo7V|>JJY~W3FuqzmC6z4KRI2rN*BUWr6mdj*
zq6hk#f~{I+4~}<6tv^Z(pewE&@GnbZEt;YOV{baYf5@X5+B+?9_=zJ6ceIUPD=<;L
z?RzY^%73}W*M+b~Z)^F@Rvh}QERtVV&hA)`uD0=j`PN#fvzu$i5`v^iwZ~<1DX`Rh
z<u(2Zunm-YW=sBQOZ|04qO22>%|N3^5NuJ=?~}yfttv%PG%8qUEGS3{&=tkiWJGX{
z&Eaa3#cpL|xvW%p*iONh{#)(h+lr#M4H{Le{Wpj2nb2^Jx`S6&(Wk!}m<}bfj^(nV
zgu%z{4i))-Wbf$Mv7moQ&QhR3lbh!D#8;G5X9ylXV;*KXLdDw<@Z5*>5WfnU%j~7A
znxlE0f#q9}6E-M#D9c$gRm(URBd#{^Y&+T;<PUe#t$=DYqY0ZvE#9nqdvloov2(N|
zAV?p#cgFzEBG%*8CooF%rAdrG!p%3K&$6=e@j(H|HLz73pUnMYW+>nOqYaf88ne;v
z?)(4&%i%w_Kw7?k6n<P$S6enPgl^k_B+a?>_;%8>e-v@Lf}r^+KTKd|z~o=71d8^#
zCcTAk?4)W-xas)F_O8bz@}AP@YXSS-TR#hFA6wT|5-6_OOb&ssa1$-UOU*uCS7h@-
z8BDfrnx`z)&ODI2sV&-bR-w$F93y(7@fao=-3)y_Y_ePmcZp8XKb})(3g4^d&GS2#
zB||bx^S*<92F;~-`nN>UqDw3SpDgYJMwj{^Y_ir+g<wTS)u5KNJ$3ZrNjvI>><E>1
zC6cu=ksMUaYb5>xNYz;%GpJz!@o-J;^59E;Wn3B?y$mv5_1YM$IjP!mnxv&Xn&Pyz
zx|cs0^ET@nB}&?=wM!Grt;y_wZOeEYD#otC^6}fIxMk$rKGo)RSyz#ppF8(xkQ}al
zY-Y2cADGgm<kMQut7N~(nE_gh5ot%i++q>;%UgtfBNwz9-?Js36;WPwq~jOumrbLv
z9;i!j6dv~3Wu~BPtAWigQdtByO^|<mMl_F(;i$2H@@#dEDucIUKc8%p8Q&^th!3-j
zVErP_HA&Pz|L3Lt9#rjB)*7ACwQvxDRb4j8{nXl=u%~2nj%}_#%0WG)vJmWdMLQj5
zL@*yUqgi2~{)uc8cW)%?7iJE)3>gqt8m|8cfJZDsvC=c0<}{Umz36CO7X^i@r>KQ(
zx~<gI-BtAxILcpT(IUG}P=o-0$xZ435^n%qILWzSOJ~!&At|qH*;F3kp&GWzc)TjL
zm}J?0CMK&@B5FUHfCgAr@(bj=^ifH|7YtEOPI`DCxquUApS{UsQQh4H=N&sWf!^4R
zp9PSEhf${Uv$JYmG@Y{a9e+e!V>n|!)cq&!$BT4*b||!~SB^(0j0^0&9OP8>a}f*8
z>nP2r-d0@>WBH)aNZ0V}soBVNNY&#I)e4yeEV!Y6xB*u|AlHcHBhGqyVjieweEu0Y
z03p?(|4|fIoqdPdIR$Frvq}Svq@Rp)+dowQT=^d}LUgVFZCfG{)e)k6O{t~_Y9oTY
zXhzR^mB*TJ*Z@7|1n$rjssx4VSjkH|i`RN?EJkEgS7z#?Qd|8UNKA6Rz}X`eV!i3{
z*HMz>TCG?smcGk-o@MltNx*lPos&yGxw~kF*Oz?LVoYQAOcOK$&xQ;fJHBjZW?7wE
z1-1s%^2d%>T>lF>cH8qL1h-~6D(!ArYpd*^fUr^e2a{b;R^N1Wo=*Sn$ym70_~Yhk
z?{5+7qAHc4UN-tx3asDx-ez?aZh~sifLTWFbA)rAuQ7JE{{D^XIyCmzBm1OlpAm4$
zrb%8zDt&_Lir>VkNF`>T=d*M$_|hrjcW>C4>>Zf^DBoU#q)j<Sr|$AklbTQQ<~a}^
ztUi&Glic{bPQ0HrMyu2zJu|~Mc~e_V&yM*TFKX4)6aM(JI?&d~xkUM@gTK=j*4p9c
z)TVpKM?p?M^JRW3>b+#|bp0Pf7o8mRyX)uLF9QrOSEbkhD~)E)hNk#E!8Q5WrSI%v
zQWr%1Kvdi><g>Ygv|A#9jRvy6*Au7yQ6NVC?Ei%FIP!gir80IK!Z+UtWQQQHxn4Sz
zjm@BEH#`&k)8W>xCJud00}+i5GVbzwez*kT9pJJZ%iUzREFWum{01E;7A&9_6&3!S
zk?ZsOo=0hb&dsSbQT1`JJ}yCJ8(}(zdN(cfv@|0r!|6}Cg6Se6kA^3c9?oq4_(1xQ
z3{kfeq(=_&P$X!GpIt>9Us}iQ1?3FPW!`NDXb#)Zc)fwNVFt2New0_hof2nm1Xq{;
zHxFK9Kww1RY)Ip+BUagH&rIv|^DIZGBNWShZZfhb5ExMY?q#F1;M@M5qgKF^wQ)*c
z<)C$2wlGg825ohU;$PooH6D`{E;X@mL^3@vI1|Y|n-o8)_I&+ReD#wTAt|Yz3KAkB
zZP!wSPb8|~?beqyyPyvZw}%&eYnrH*b~!rFs|aNRNK{A1sCLi*<uOjNp{rcsPUDZn
z5btkuC&JzQs*>IEgC*P9OYeoc5fP8rCcL67@Na8qK{`?Df5rHBz|(u$5|OO@2Jyd3
z@8Q0@_wfE<o;0>Vx_0?%NA_{+t+mQSgEOjwMB}fWQH5O-J^|d%Y~S4f;dkxl=b{vW
zI}GV9fzTy@Ue{WML<xmY1dBHua>2_W+5Jlgg6m=P+cq#c9Gc$N+Lntk>O;$4CI379
z-3!$`UsmuKT*0Uqzuo~NytM37>($bRPgMfRcY|^L-=z0qSAQle8?D@EANBK!<CVLY
z@sUg0c`?%I!r>o9qx}fRqFx>yPI`f7JWO2Lb~Kkh$VzU^>18h)--TD?E#%T;J87E|
zOdr_9snYG;x327{j;yGb5c{jSOoyd27|)pmb(u>h8oSY9mZyYR%{;v>Gq-9-O-l%k
zVW(d>_~g9}<6IsK288eQ19Mg!Z-jHZJ?EV88j{<&6jc&1W%)ZnCaEcTW+#U2h%YRI
z@B7BIt>QeT_8$Kq#M#*aym@&Wh<)f9p`)Ak6&K_sDcdjkT1{Nfzxd&)DeG~K{+VI)
zNU3F4KnJi}I`4AAGobApGX@?mqZ)G`&vqx)+p(}%S!K5+!$66k66XYmv%N`S$4Q;H
z6TdM}Nqd#TfJ?kcoBg&Sb^__QJkwi#ss?ykAL-PuH^k@1XHZ-*iomdWc#=xyz;1Mr
z?t#IVxg>>U8g|Pj1pr;Vt<NN)ARxrv1PP6OaO}xJfcgX^42E<an~Prm9@u#-zOx7w
zz!m(XDA{l>&z#iRI0!yrnEkl0<jIDmlfWY>s5J_}WzyJw*VXv9t7l0=6l`QLxp<@O
zrKX&LCpR6JFzk4ebT(3Tu>6rardedsUAX|S-}g(|BP(mj4%>#BwGR<_5o~dM8K4X2
zsC4**5q03Ny8=PKu7+kpjkkV|{3bTF{s>_JHGb{g*9}z7Bm72#G&8tVH#f<_EvI?X
zDe2-R@1<RV3Ly#t!3jQ;D{yuaZ(C>k!iPL!Ch_l-F*ENxF`JU?4>%@6ZxKLk6U3Hh
z_~1vm^DH9rR^l8;AnxQe8NSV)NxgsLuMOjd^yC`JQ5#>~6u;JOZk+yp_nNCI-8*|W
zx?_wJ1Pm5Dw&vlHVkbBAHHfdWQ_EohTF&Wm9?}f~ekO$iSjj@^MD_=YsTuA>qJh*k
zc&oYZuEm?+9&u*?Dgo$GQVA|;d#^whJk5dYXIb%7WVXc@Y`=lc$}ot3OK4hpv=<*Z
zwBWCr78Y>A9&l1VaI4vC#lyNfFMCT{*xZMA4sJO7CfeHV)M0P|GNTy8ay(nQ^~-Fy
zXfBEEw4ClNymoGp=qF4rUg4GR0+DO{uh{-#*&ikTs@snRG#t)&KM3hRse7Hb52Qis
zBjv^C%-ZG`vd>fo6!@q?h*1(*?;&`8E<t|V8+Q@R$if<R<)&-e+$i!Wdx2vWEJ4^d
z_ad_QWqgd!pUtdY4hk>;9r^_iFR2&oq51C6l`HccGL8#(l7^c7W6^(u8AA_g-Zo5<
zguUDxS=B`geaDs5K72LmQ>x6b$i{)HP}yw3H%F6|WL!GBJnB{gTbg|<bVt{SQg%i;
zsJ+i87n2br8BJE-J8Lfd>Ibl}Q)h3ua%4dLYFMDm-c%p=8-j?^s|~-E+x`<V#rQ}t
zP0i|gXyDU^FIt_N(X-)L6PD+8*s|zM`sh3LZ6(=8qvMXy*V~6IwGT@<9u_rn5!i1z
zzhi_3Hbcm#&szLUR;{LRte)xZNPJ28j2Yk?73#SJ6<T8v?dx`@lhquJZ7uuA(@pDl
zf8GMGFVC8)n)$3gW$kK<EXn^E2o?!@>OEf33{6{Ad(pn20`B5ci^!}@e`)H$d^vlz
zt+)5d@41B47F#s*=A!;LfPErHBYHPu3HA+H>;0^*ju1<IDZvwcUgSa+a*AXC8c)9t
zs*ZH4G$pa_9uNS~=9}D(fp(%v1M>A@$(2zg4UhFsZCPa(EHNvK8o0h)x=G?`+Lcgi
z-~N4!VY82QZVJcg|7K?*Gc1Iz-1c}oTmRuj04svrI`Pv2E57Uq)JdQN*-(%jPPQNu
z_p^?gI`*foE?PB^{~rZ6jF5O5ExJKog9!VAJzSi}&*jZ;Tml~4RDRC&<-wXdAPZAZ
zGQ?~QQT?DCsm=zz5qM?94g1RR&WMuV^<e3*_()Iki238YsQ@Qd1JAPx7Wtk5Ys0|$
z#l8*{p8#CfwqKUgKP)ucGaur4-`ekHr+n#xUi#a>8KSSWI<2tT_fs=sD|Q8!fi@-R
z+at<bxiJ{GXzSKNiR1GUCUCVuMEQLoo+bOvsds4<HPtqm*7b>Qa#SE}lFLB_=_ZSL
zOxcC#P~HJB%GQr@;?R0Da72>IpEByqce>kq*2}`-WtAO5AKP}MJkiV*493?*a9D&v
zX^j=<LS4iKBnr4S{!xtSl#yk9M}UNRMrfx<+Yb1UzxKnN-{ThF3xk(cxAq-?rF+$4
zMQkUKyymx8Q3$-XSFcT-1c}+iyc>}eLlE>wSfF=lWAk&CU(0)DeJ@ndj9Y($|C&q3
z93W`PEESZsP#fdDwhh1SzhjeN_NKrN2>|fuG)ntzr1Pe#;}ga;Cmu6qUk!CMu&@K;
z0ocjuO^(7YltfLwx#*u4?a{ioQs*d)6rdjcvOv0+lqhrbxtooJ+wBPh{AQxT_-h=Z
z%PY+r&$P50vk*YM(+P@yM^3WRjJ05RG?y00ac~)I%1=wDvA90kC$}}>@_myTx(JM_
zhlMCBciKw6`j27;#4v9<XJQ-N`FIwR`IXc>Xy3Wa^0ZFtKoyB^b1C~88%|CAckz;c
zuP|6P&;-EOe3lj{I~YB{%ZmA=*%Ne}|KZzKko=2WP}A=N#ilwL?+s%=u#n{P3=3|O
zF!qn)qcu1gga^ozN54P0FZ2tMsGvv6?J53QD+jeRW?j(_9v^3(g3BxyjJG_b^hR@u
zb3ZNs{?^rr*4IMvawHpFWhOWsa;{f@<fBy^hAk*#bfOGRd>!bHyfwUKeqWI-Bw625
zWw)mWv#Na@=sc|hP(T4j=c*kXLkp_<|J$wWwT7H-Z{%58&G-n>HuB8EDz<e%VbVQ{
zbN22A-Y?>61J3s?e#HP<G!Ku;iU?WR(uGenh9V2<wbNvaq1-5(1lp0C2K4=;MqkVD
zhc0Uaq;@t=&J(tAV+}t94Dvt<dQ|xq{)njdkAf1=;Bf{6L+B`&c%BPB<QQAS9Nw^q
zM&wIFrQ_wPeM1iQtPkd^dpfUrRX2NLn9o3E!O;@k7})hi%H<4BBkF5!r-y(Xu8QEX
zr9)-h*iLqn^`m(Y>xLALqi^;#U?5iQQU+LK0NUPjQz>L(gqT7=Wcq-se4^k>fry*<
zki|cM04ubeA6*1Us8pSa{G?ZwwL+Bm;#Uhk4{gzd@YYU?oYsS?7U{k%&cp5z-VfQ`
zv$KiAo>hsvvEal}lm#g7_!{7z6LP9^M*P8YK{-hX7$J|Lp<-ZC7Ww;d0OOhMKMLS6
zrxB*@iEM#t9^Jtp-?mz5T0Wdd=A)(HW<EoJtXdIS#io3KLy25pdb=qKl<F;nieail
z5SqIt4%wydz~1;@)OPI&1^~eC=@qo#XZM?1o;ah#SS!zF20Nn<B&-ihjB3H;VBn>;
z*^_ORbPc9b7U+);p&x{zJ>@sZ%=lsA^Ot^Ow{eKZSZJQA3!toA#&3J{uafu=ku;-3
z5k>TxeA4*<7K-9e!jJ?s@5?JIH#B~f7;Dz8Kk(^}>dElwqPw>Q<BI90--k(T!cgT>
zC@B|x1esC-2vh%+^w#2d&jQZ??ZF4r;Q>PQE~SsiKZ@?ML#vP%%u|eK?L0HtY!idw
zr2E@vpY>^&Iu;nE#YJwvEgQ{Oy)c-pIA~nf>!6cCUCit)wX0@qPq=B|cSj26NH-6g
z{uDiWHfb|Ac9|7Up6EGQ1dKw;II^r;*LT4rCNSC1qBb`#PYSxIMuH{V15G}y;9(}6
zmr)1kF16<1_v`;%7jEx`9>d3tS{LIMs^3I|m%p^c)KN=^7VqGg*DN$O{VzhG(>dLV
zdrF7gWjs<WRgh}$^}+Ru%0keY+9B<%Z;IjgTCdcV$KUA8O#xf+$v3`V*;-fscY7h=
z_LGlm^MT0?jJgLQHU%uKr!8QUhM<Cu2M4>%-I(tJ960hniVsjYzZDeECDHv%JSz8K
zu;fo%2lT#S`MfW9TlfM_8<3n$e6Vf&-TJbu_|N*+l?qKyc)&PK1)k@0e9WS0Tvp*}
zt!iI;-O1@S>xyQV%U0L|wiB4Ztz`A^N#4E9ZL$!aIt)pomq1G!4x*Y5&PFr8N<{52
zP<YT8f$2|5cVC}TPrBSo-bN#?@A~#S$~xM$QDS6h=={%UJ;^scxm&$N#fz31zb*RN
zsRh>q3fJVoPv@7SrUntMiwP139AeG$e|oH+G3G^4-0{EGj$y(4EL}y|(UC2Let;K~
z*z{<d5#)Eic9jQ$!FNg42Tjm}6g+>|sANO(n}f4rp@}g8MTPhumL5YC>zrTl#AxB&
zs!;!>>(_(o)=$cHI$D1xowv*RtHF2#pWeV4<=<DW_N?(f>}^L$wUMNI&e{8)hQ_N5
zDT(5t@URv)QIu|ly#Jr3M(jd}SV2GcEMx1vo`FL7qtniN6L~k|6Fe94B`?TcY<#8_
z?-DcZ^Q9OCT&)uwF>}2*_STE>)!EJWE#Km@W>i=({X>3|fSx8V2tpK_PL+RPXuWzY
zG8<dZIoY#$q`?r_jFEHRr3(><TH&2@%Yk=1#{Xh-5<b3Z3+)a@6wB`PiRb66dEE%D
zr!<*dLm&OhNn`an^pc}uJTXN_^gk*vV*B>i(y}ImnrCY5cZ<NxWzN!2Zcfq-<}X{!
zb`AHAi;w8!Zmw7(2`8l(cAl9))?($$ZJ$S3B2Zw%Gjq{da_Gw{PnWlgukAj%9G*Q+
z+<x=zN5>vUs|z@8mQgj8^-r-S@l+Jxb*y6Y_)0RXASlQ-X&apoM5m=9IPZ5~a*{Lt
zGnK#QXIZL8h<gon?*`i`fO6Nd^-dGT<A~?wIdhy}AD>{ssK&6Wqts$JC64Xve^10k
z1D;|pXPh#^Er|M>Us}9xZDYgZ=joce4hUwTJq4gUQ>j_{Lkrfh)R!N=kmWA)FoL*S
zx%`3C)K?2WzQ2~Uv#S51Z%XoXUp<HRZOKwUd$xL6KCbt&FZOE%!^VjkILWdKY5JMP
z_=S(xK5TuWRBX2Q>hs~X`|YYbL5HMb70#f-R^IrO-<QrjQ;jkVs3_-;h(nwcx_FHX
z6j#EVH}xmXS;q7jlicKgTJ*&zcu!+5haD`f@DX&GESu@Bysp(>#XGyv5CH7ykACmD
z3a?ygP3Ehq2tVoP1$z~=effPuMTdZc%MCirD*xe@Iot?Xi~pbtb6s=EsQ|vYs9&!q
zx@oe+JDwa(ceGd%dSZg;q)r%mWo2B>^(Qdi8aKY*smY;2By#i&)~BozVqeIClT`i|
z3SW3VhP6Qm`Xb*?g-2CKNo#t4s`O30qHlvVeiXc}eq20l@+TJ2V39EkGj}3qKg=C=
zZL|HL>>4oUcC({OqEBk^!2iPp?e#p#CaJt^tJ((;cw>T?mgpp)7nREU+L0`CFQ(LW
zYNoFOuh(x0OUm$jB`slkzMLEBQgXEPJE*P@q8KpO!*P(D!H`O%MGk%$c<b*^M&wyU
zsUSa>_nY_<9#eh)5d2?BP|@rAtgAXb%u={76Qzn?tFR1M;A!Ei*{!j(G90CMx2qok
z_Csn*7><@aEkHZERv`OfZki3kde&)a8O|=Ia1X!@_R){iTf-uB^WI!AoJwKA-<tbv
z0}wW+K6m$=$V4X-*eL|w%wWx^XK(l;uCpRf(ws3qt=@QO?(JCP%~<9ehPVsLOmfnF
zP7Mix7s*?y@6nrNPpy8>Mz#}N?CJgamyk*;riGX1cl6C8EjXXuYN?~3MIp`xcfTOr
zsiz|Q)lg5qicet5)M@wFid=Fl(Q?o-u@99wY$4BD&L(iOUW~E^b$Z%9u8RTs#_!5l
z_)pqij<-DCbxZw;VZWI8Mqo`o7i5dc^txUU^`0u#wf~WP4Te_7+GPeQ`$2cuB54K_
zoVvl6oLg7r<wc8br0YzNo`0Ds#O@ET`5|Ovu)2ukp=Ob<K53$2S|en9fjRy9@u@P{
z$ZyNXdp+_S2ALU~6{M&GlmlFT`xx*#Hp%sf{27#TS<d(R2l7dO&OKzUC#-@2B}vHG
znmq+b(eg?3nn$}mHoZg243qU7NxgbYm1CK=3eydLw3sQa4PD;>>L;oE4n0$#5k#_B
zPmeL_SL#3xw)aY+LCcPCS9GU!g{=40$YJ@eqjN43eF;Spnjg8xMkQ-6Ctu@YbuUc2
z46Z>PNO$BEm$AZD>p{n8%Vi;`#DesAMS<gxbM`e%Q`Y{#@y$|mj#`qr5J;rRwI#$3
z9L6=)0l<rn?5WS}($^2=a?;TE+HO7VR@XIKC`;D3+ExR74z?D$lHWDHa=WCK!XY;;
zgh<wScE6?m&F363q?X_h&3=oZK%jT9y;In7#+tO@NfJ};esr(;P%%8^X&CO>pF3c*
z9JnJtkMX68QqC8`af6zlch3U}b_ELPDU7g&ICmM_W#)AEPd~%JKvgyu3W-{yExx)e
zX77XW?4H0kI^O(=C%tih4XI}~^R7n#6fx4|Kennq4Ih+_PiWw-wx#!TTJQ^dF^31n
zG70FS=^mR{P&q<sS7$z^QeQ5Rn*&vUDW476-I!dvufphmaSreSLxZ}1A}SsJ7AP7H
zE74trk!yTxosHD~E)RG`zH2)6D-S-l{=4{IcR%+DY6k(Ck39c1qa3?j?xRqvRN&K(
zy17sGC2f_LP|v(<%yVn_+wkE|?$`N9{y%DSQXI{&G}~CsYUYkAR~}|SrG;_YZ($)x
zbzBw`X~lhCc_*QfqoiX+#`V!i*PRn*)xxap9X+$ioH}$NN=8=+npA}p?8V4vmNDq{
zti*1BuEz8y_F$~Z(1*n?U5O&3z5=!@%3uIU-t1;Dkc}x;Y7-pW#htsLaPe@N;rq-p
zt23djlIEhjWQO-zohfsQu!fvlP`W%NOpUUuXwNoTkwM?}UEL0KxCKs5<POD2e$!G0
z4bpK1SI_YNP2}%rvcr2=>ZAH~(jg38bFb%~KfgT-j(L}S_25_JVA_uw=k7>4(KT*)
z$kc_d4(4cAyRm9g?vSj`pwIYH$XlF0^C?cIY6y%u&LjWrx}2#E5F!jR=+ma>s<=jR
zkMq~Xiq4RZ-_JQMOs~xa)>@11Tw`-tuXy=h>z;8+@aShLoh@GTC5jo?D@gjY!ut0Q
zpZ{fpj9sDgR5u#Fq;t!(3D$l88oT-?ETF7w*Rq;2Olte&ET3K7)+HMnMPbi2toSZO
zE{v75d%JmPVFHE}*_}DQGk2)SVBWV;ugGm^ruvir*wV)fm;R|Cq!H@FaqZ&avx0%1
zA0Nw=+*nfftqWWcBe`F7rs?MAs?Pw&<EN3lJ5qulm8ri=%=O;2CRU-S-=pXNWTrez
z)8mi08imLWQsJ-Si-)LmF17V|(Z+RGDYjejZZ8)63?^g8-YbZ_iSi3~P2=Far{SE(
zpS0si23)tFm2o_g`^L02z_fO|Df(EOY4(*xb6f%YrNgi4?;a)5s;@e-a+u{?*Ynh!
zAywXM`Wr8(6%-k(RpR8Z%3ghkJJR0hO&w+T(XWl(bRf;w!0(DSb~OKU$h9#m+MI<4
z9Z!@h2!z(wzAZ$}cLI~sp*L1-uAY7M*TSpep4M%ZYmYvEI0yitTA-Id!FJ525bnHe
zREtNlh)E%FzV3Ye=dVb;$Hn|ApSIpU-#7r@+@#-Zy(b{x%JE`0D31|Ich+cQfYryW
v&J^<O{X7HaBDY0O!m+e)f``+J-MXj5tSi7>dHd{F^UaL`+*@(*zv=%2;K3Pt

literal 0
HcmV?d00001

diff --git a/docs/esp32/tutorial/peripheral_access.rst b/docs/esp32/tutorial/peripheral_access.rst
index 3304c341de873..ecdec101f7ef7 100644
--- a/docs/esp32/tutorial/peripheral_access.rst
+++ b/docs/esp32/tutorial/peripheral_access.rst
@@ -42,3 +42,83 @@ for this:
 
 The MCPWM0 peripheral is in bit position 17 of the above two registers, hence
 the value of ``DPORT_PWM0_CLK_EN``.
+
+Synchronous access to pins directly via registers
+-------------------------------------------------
+
+The following code shows how to access pins directly via registers.  It has been
+tested on a generic ESP32 board.  It configures pins 16, 17, 32 and 33 in output
+mode via registers, and switches pin output values via registers.  Pins 16 and
+17 are switched simultaneously.
+
+.. code-block:: python3
+
+    from micropython import const
+    from machine import mem32, Pin
+
+    GPIO_OUT_REG = const(0x3FF44004)  # GPIO 0-31 output register
+    GPIO_OUT1_REG = const(0x3FF44010)  # GPIO 32-39 output register
+
+    GPIO_ENABLE_REG = const(0x3FF44020)  # GPIO 0-31 output enable register
+    GPIO_ENABLE1_REG = const(0x3FF4402C)  # GPIO 32-39 output enable register
+
+    M16 = 1 << 16  # Pin(16) bit mask
+    M17 = 1 << 17  # Pin(17) bit mask
+
+    M32 = 1 << (32-32)  # Pin(32) bit mask
+    M33 = 1 << (33-32)  # Pin(33) bit mask
+
+    # Enable pin output mode like
+    # p16 = Pin(16, mode=Pin.OUT)
+    # p17 = Pin(17, mode=Pin.OUT)
+    # p32 = Pin(32, mode=Pin.OUT)
+    # p33 = Pin(33, mode=Pin.OUT)
+    mem32[GPIO_ENABLE_REG] = mem32[GPIO_ENABLE_REG] | M16 | M17
+    mem32[GPIO_ENABLE1_REG] = mem32[GPIO_ENABLE1_REG] | M32 | M33
+
+    print(hex(mem32[GPIO_OUT_REG]), hex(mem32[GPIO_OUT1_REG]))
+
+    # Set outputs to 1 like
+    # p16(1)
+    # p17(1)
+    # p32(1)
+    # p33(1)
+    mem32[GPIO_OUT_REG] = mem32[GPIO_OUT_REG] | M16 | M17
+    mem32[GPIO_OUT1_REG] = mem32[GPIO_OUT1_REG] | M32 | M33
+
+    print(hex(mem32[GPIO_OUT_REG]), hex(mem32[GPIO_OUT1_REG]))
+
+    # Set outputs to 0 like
+    # p16(0)
+    # p17(0)
+    # p32(0)
+    # p33(0)
+    mem32[GPIO_OUT_REG] = mem32[GPIO_OUT_REG] & ~(M16 | M17)
+    mem32[GPIO_OUT1_REG] = mem32[GPIO_OUT1_REG] & ~(M32 | M33)
+
+    print(hex(mem32[GPIO_OUT_REG]), hex(mem32[GPIO_OUT1_REG]))
+
+    while True:
+        # Set outputs to 1
+        mem32[GPIO_OUT_REG] = mem32[GPIO_OUT_REG] | M16 | M17
+        mem32[GPIO_OUT1_REG] = mem32[GPIO_OUT1_REG] | M32 | M33
+
+        # Set outputs to 0
+        mem32[GPIO_OUT_REG] = mem32[GPIO_OUT_REG] & ~(M16 | M17)
+        mem32[GPIO_OUT1_REG] = mem32[GPIO_OUT1_REG] & ~(M32 | M33)
+
+
+Output is::
+
+    0x0 0x0
+    0x30000 0x3
+    0x0 0x0
+
+Pins 16 and 17 are switched synchronously:
+
+.. image:: img/mem32_gpio_output.jpg
+
+Same image on pins 32 and 33.
+
+Note that pins 34-36 and 39 are inputs only. Also pins 1 and 3 are Tx, Rx of the REPL UART,
+pins 6-11 are connected to the built-in SPI flash.

From 8bd2494c9527a27710d15749dc4034515b473874 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Mon, 4 Sep 2023 18:28:32 +1000
Subject: [PATCH 0290/3129] esp32/boards/UM_FEATHERS3: Fix I2C pins in
 pins.csv.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_FEATHERS3/pins.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS3/pins.csv b/ports/esp32/boards/UM_FEATHERS3/pins.csv
index 83f889fb2ae55..38240bc33e254 100644
--- a/ports/esp32/boards/UM_FEATHERS3/pins.csv
+++ b/ports/esp32/boards/UM_FEATHERS3/pins.csv
@@ -1,6 +1,6 @@
 AMB_LIGHT,GPIO4
-I2C_SCL,GPIO8
-I2C_SDA,GPIO9
+I2C_SCL,GPIO9
+I2C_SDA,GPIO8
 I2C_SCL2,GPIO15
 I2C_SDA2,GPIO16
 LDO2_PWR,GPIO39

From 297892c4f465c1c6991e6bed0649771bbe1374f6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 1 Sep 2023 09:01:23 +0200
Subject: [PATCH 0291/3129] mimxrt/machine_uart: Add a helper function to
 change the baudrate.

And use it in the Bluetooth bindings instead of setting the baudrate by a
call to the NXP lib.

Also fixes machine_uart.c to work with a baud rate of 921600.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_uart.c | 32 +++++++++++++++++++++++++-------
 ports/mimxrt/modmachine.h   |  2 ++
 ports/mimxrt/mpbthciport.c  |  7 +------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index ab5d13e0831bc..fba2b7fe30763 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 "modmachine.h"
 #include "pin.h"
 
 #define DEFAULT_UART_BAUDRATE (115200)
@@ -146,12 +147,34 @@ void LPUART_UserCallback(LPUART_Type *base, lpuart_handle_t *handle, status_t st
     }
 }
 
-static void  machine_uart_ensure_active(machine_uart_obj_t *uart) {
+static void machine_uart_ensure_active(machine_uart_obj_t *uart) {
     if (uart->lpuart->CTRL == 0) {
         mp_raise_OSError(EIO);
     }
 }
 
+#if !defined(MIMXRT117x_SERIES)
+static inline void uart_set_clock_divider(uint32_t baudrate) {
+    // For baud rates < 460800 divide the clock by 10, supporting baud rates down to 50 baud.
+    if (baudrate >= 460800) {
+        CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    } else {
+        CLOCK_SetDiv(kCLOCK_UartDiv, 9);
+    }
+}
+#endif
+
+void machine_uart_set_baudrate(mp_obj_t uart_in, uint32_t baudrate) {
+    machine_uart_obj_t *uart = MP_OBJ_TO_PTR(uart_in);
+    #if defined(MIMXRT117x_SERIES)
+    // Use the Lpuart1 clock value, which is set for All UART devices.
+    LPUART_SetBaudRate(uart->lpuart, baudrate, CLOCK_GetRootClockFreq(kCLOCK_Root_Lpuart1));
+    #else
+    uart_set_clock_divider(baudrate);
+    LPUART_SetBaudRate(uart->lpuart, baudrate, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
+    #endif
+}
+
 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, flow=%s, "
@@ -292,12 +315,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         // Use the Lpuart1 clock value, which is set for All UART devices.
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetRootClockFreq(kCLOCK_Root_Lpuart1));
         #else
-        // For baud rates < 1000000 divide the clock by 10, supporting baud rates down to 50 baud.
-        if (self->config.baudRate_Bps > 1000000) {
-            CLOCK_SetDiv(kCLOCK_UartDiv, 0);
-        } else {
-            CLOCK_SetDiv(kCLOCK_UartDiv, 9);
-        }
+        uart_set_clock_divider(self->config.baudRate_Bps);
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
         #endif
         LPUART_TransferCreateHandle(self->lpuart, &self->handle,  LPUART_UserCallback, self);
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 1f669af09e962..904419df2cc8a 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -51,4 +51,6 @@ void machine_i2s_init0();
 void machine_i2s_deinit_all(void);
 void machine_rtc_start(void);
 
+void machine_uart_set_baudrate(mp_obj_t uart, uint32_t baudrate);
+
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/mpbthciport.c b/ports/mimxrt/mpbthciport.c
index c83c765871923..d8b384136452c 100644
--- a/ports/mimxrt/mpbthciport.c
+++ b/ports/mimxrt/mpbthciport.c
@@ -34,9 +34,6 @@
 #include "modmachine.h"
 #include "mpbthciport.h"
 
-#include "fsl_lpuart.h"
-#include CLOCK_CONFIG_H
-
 #if MICROPY_PY_BLUETOOTH
 
 #define DEBUG_printf(...) // mp_printf(&mp_plat_print, "mpbthciport.c: " __VA_ARGS__)
@@ -111,9 +108,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)\n", baudrate);
     if (mp_bthci_uart != MP_OBJ_NULL) {
-        // This struct is not public, so we use the base defined in board config files.
-        // machine_uart_obj_t uart = (machine_uart_obj_t *) MP_PTR_FROM_OBJ(mp_bthci_uart);
-        LPUART_SetBaudRate(MICROPY_HW_BLE_UART_BASE, baudrate, BOARD_BOOTCLOCKRUN_UART_CLK_ROOT);
+        machine_uart_set_baudrate(mp_bthci_uart, baudrate);
     }
     return 0;
 }

From 671b38f9440511b45fe2b93e15272f53135422d3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Sep 2023 11:03:08 +1000
Subject: [PATCH 0292/3129] mimxrt/sdio: Move config guard so headers are only
 included if used.

Otherwise it's a build error on certain MCU series.

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

diff --git a/ports/mimxrt/sdio.c b/ports/mimxrt/sdio.c
index 771a01e3d94ac..d97fef9e51296 100644
--- a/ports/mimxrt/sdio.c
+++ b/ports/mimxrt/sdio.c
@@ -30,11 +30,11 @@
 #include "pin.h"
 #include "pendsv.h"
 
+#if MICROPY_PY_NETWORK_CYW43
+
 #include "fsl_usdhc.h"
 #include "fsl_iomuxc.h"
 
-#if MICROPY_PY_NETWORK_CYW43
-
 #if MICROPY_HW_SDIO_SDMMC == 1
 #define SDMMC                       USDHC1
 #define SDMMC_IRQn                  USDHC1_IRQn

From 5e50593738d064267f0d527a0a79d91d928e9686 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:42:14 +0000
Subject: [PATCH 0293/3129] github/workflows: Bump actions/checkout from 3 to
 4.

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/code_formatting.yml   |  4 ++--
 .github/workflows/code_size.yml         |  2 +-
 .github/workflows/commit_formatting.yml |  2 +-
 .github/workflows/docs.yml              |  2 +-
 .github/workflows/examples.yml          |  2 +-
 .github/workflows/mpremote.yml          |  2 +-
 .github/workflows/mpy_format.yml        |  2 +-
 .github/workflows/ports.yml             |  2 +-
 .github/workflows/ports_cc3200.yml      |  2 +-
 .github/workflows/ports_esp32.yml       |  2 +-
 .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 +-
 .github/workflows/ruff.yml              |  2 +-
 25 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 81a2715f1b335..cab0ae55b2b18 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -10,7 +10,7 @@ jobs:
   code-formatting:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
     - name: Install packages
       run: source tools/ci.sh && ci_code_formatting_setup
@@ -22,7 +22,7 @@ jobs:
   code-spelling:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
     - name: Install packages
       run: source tools/ci.sh && ci_code_spell_setup
diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 5d955703b666a..56097a6d3e796 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 100
     - name: Install packages
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index 0b27038f2d264..a651f8a13a0f9 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: '100'
     - uses: actions/setup-python@v4
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e9b17007476c1..afc3166f3d658 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
     - name: Install Python packages
       run: pip install Sphinx
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 450805a6bde41..6613f106625a2 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -18,7 +18,7 @@ jobs:
   embedding:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: make -C examples/embedding -f micropython_embed.mk && make -C examples/embedding
     - name: Run
diff --git a/.github/workflows/mpremote.yml b/.github/workflows/mpremote.yml
index 14aef03e0773c..5b9465d7feb30 100644
--- a/.github/workflows/mpremote.yml
+++ b/.github/workflows/mpremote.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         # Setting this to zero means fetch all history and tags,
         # which hatch-vcs can use to discover the version tag.
diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index 66abb19b81a46..baa02ce08d507 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -17,7 +17,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04 # use 20.04 to get python2
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 fb574ad981908..1f262b0ba4bee 100644
--- a/.github/workflows/ports.yml
+++ b/.github/workflows/ports.yml
@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 b58bc24b58b0a..f178a140587db 100644
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 2cc9f592bf23e..9403aa656ba6b 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -21,7 +21,7 @@ jobs:
   build_idf50:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_esp32_idf50_setup
     - name: Build
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index ba89d5e9529eb..5236edf40b959 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 d91562534188a..614d7458079e8 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 89211217800b0..d9cffb9778cba 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 a15c4da97fa6a..c41b13e5ddffe 100644
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 93ec4da76700e..db3cd7871d591 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -22,7 +22,7 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 33e17a385a1e3..b1a30c2f11798 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -21,7 +21,7 @@ jobs:
   build_renesas_ra_board:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 f042ff1151ab1..5741b75d2aa79 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 9833a2fae2ef9..5bf1826cd17bb 100644
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 b278ea862ce61..0b781a93c1892 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -21,7 +21,7 @@ jobs:
   build_pyb:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_stm32_setup
     - name: Build
@@ -30,7 +30,7 @@ jobs:
   build_nucleo:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 f1299603259a6..291c8e303cd8f 100644
--- a/.github/workflows/ports_teensy.yml
+++ b/.github/workflows/ports_teensy.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 87c58055b988b..04dfd78525260 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -23,7 +23,7 @@ jobs:
   minimal:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: source tools/ci.sh && ci_unix_minimal_build
     - name: Run main test suite
@@ -35,7 +35,7 @@ jobs:
   reproducible:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build with reproducible date
       run: source tools/ci.sh && ci_unix_minimal_build
       env:
@@ -46,7 +46,7 @@ jobs:
   standard:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: source tools/ci.sh && ci_unix_standard_build
     - name: Run main test suite
@@ -58,7 +58,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_unix_coverage_setup
     - name: Build
@@ -87,7 +87,7 @@ jobs:
   coverage_32bit:
     runs-on: ubuntu-20.04 # use 20.04 to get libffi-dev:i386
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_unix_32bit_setup
     - name: Build
@@ -105,7 +105,7 @@ jobs:
   nanbox:
     runs-on: ubuntu-20.04 # use 20.04 to get python2, and libffi-dev:i386
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_unix_32bit_setup
     - name: Build
@@ -119,7 +119,7 @@ jobs:
   float:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: source tools/ci.sh && ci_unix_float_build
     - name: Run main test suite
@@ -131,7 +131,7 @@ jobs:
   stackless_clang:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_unix_clang_setup
     - name: Build
@@ -145,7 +145,7 @@ jobs:
   float_clang:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_unix_clang_setup
     - name: Build
@@ -159,7 +159,7 @@ jobs:
   settrace:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: source tools/ci.sh && ci_unix_settrace_build
     - name: Run main test suite
@@ -171,7 +171,7 @@ jobs:
   settrace_stackless:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: source tools/ci.sh && ci_unix_settrace_stackless_build
     - name: Run main test suite
@@ -183,7 +183,7 @@ jobs:
   macos:
     runs-on: macos-11.0
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: '3.8'
@@ -198,7 +198,7 @@ jobs:
   qemu_mips:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_unix_qemu_mips_setup
     - name: Build
@@ -212,7 +212,7 @@ jobs:
   qemu_arm:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 2e0865662f061..880f15ab34469 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 b31718c591402..4b1f4ea791e20 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 f64401b316a5b..f6f328c9277e4 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_zephyr_setup
     - name: Install Zephyr
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index b8e43dc78f17c..806d95e8954b0 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -5,6 +5,6 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: pip install --user ruff
     - run: ruff --format=github .

From 0bafdaf5f0f44295597cf2db8c36447675183339 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Thu, 17 Aug 2023 13:24:25 +1000
Subject: [PATCH 0294/3129] esp32: Skip validation of image on boot from
 deepsleep.

sdkconfig.base: Add CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y.
This reduces time to boot from deepsleep by at least 200ms and can
provide significant power savings for deepsleep-based battery
applications.

docs/library/esp32.rst: Add note cautioning not to enter deepsleep after
changing the boot partition, without first performing a hard reset.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 docs/library/esp32.rst            | 5 +++++
 ports/esp32/boards/sdkconfig.base | 1 +
 2 files changed, 6 insertions(+)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 856d9aef8d0d8..d6b4051a2fa2e 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -114,6 +114,11 @@ methods to enable over-the-air (OTA) updates.
 
     Sets the partition as the boot partition.
 
+    .. note:: Do not enter :func:`deepsleep<machine.deepsleep>` after changing
+       the OTA boot partition, without first performing a hard
+       :func:`reset<machine.reset>` or power cycle. This ensures the bootloader
+       will validate the new image before booting.
+
 .. method:: Partition.get_next_update()
 
     Gets the next update partition after this one, and returns a new Partition object.
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 7443b34aa78fc..4b7c852332da0 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -13,6 +13,7 @@ CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 
 # Bootloader config
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
+CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 
 # Change default log level to "ERROR" (instead of "INFO")
 CONFIG_LOG_DEFAULT_LEVEL_INFO=n

From 3637252b7bc3e85ea92038161e008a550991d1f4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Sep 2023 10:53:30 +0200
Subject: [PATCH 0295/3129] tests/multi_net: Increase asyncio tests timeouts.

Increase asyncio tests timeouts to account for different WiFi modules and
CPU clocks on different boards.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 tests/multi_net/asyncio_tcp_close_write.py | 2 +-
 tests/multi_net/asyncio_tcp_readall.py     | 4 ++--
 tests/multi_net/asyncio_tcp_readexactly.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/multi_net/asyncio_tcp_close_write.py b/tests/multi_net/asyncio_tcp_close_write.py
index d1892fe895e26..ea206c9219af7 100644
--- a/tests/multi_net/asyncio_tcp_close_write.py
+++ b/tests/multi_net/asyncio_tcp_close_write.py
@@ -33,7 +33,7 @@ async def tcp_server():
     print("server running")
     multitest.next()
     async with server:
-        await asyncio.wait_for(ev.wait(), 5)
+        await asyncio.wait_for(ev.wait(), 10)
 
 
 async def tcp_client():
diff --git a/tests/multi_net/asyncio_tcp_readall.py b/tests/multi_net/asyncio_tcp_readall.py
index 66ad97549cbb2..45eac229d2347 100644
--- a/tests/multi_net/asyncio_tcp_readall.py
+++ b/tests/multi_net/asyncio_tcp_readall.py
@@ -14,7 +14,7 @@ async def handle_connection(reader, writer):
     await writer.drain()
 
     # Split the first 2 bytes up so the client must wait for the second one
-    await asyncio.sleep(0.1)
+    await asyncio.sleep(1)
 
     writer.write(b"b")
     await writer.drain()
@@ -37,7 +37,7 @@ async def tcp_server():
     print("server running")
     multitest.next()
     async with server:
-        await asyncio.wait_for(ev.wait(), 2)
+        await asyncio.wait_for(ev.wait(), 10)
 
 
 async def tcp_client():
diff --git a/tests/multi_net/asyncio_tcp_readexactly.py b/tests/multi_net/asyncio_tcp_readexactly.py
index 2c8df1f30aa0d..4024e23fedb5e 100644
--- a/tests/multi_net/asyncio_tcp_readexactly.py
+++ b/tests/multi_net/asyncio_tcp_readexactly.py
@@ -14,7 +14,7 @@ async def handle_connection(reader, writer):
     await writer.drain()
 
     # Split the first 2 bytes up so the client must wait for the second one
-    await asyncio.sleep(0.1)
+    await asyncio.sleep(1)
 
     writer.write(b"b")
     await writer.drain()

From 8dbdac8c8202be5ca90ac9291574057330095bae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Sep 2023 12:49:14 +1000
Subject: [PATCH 0296/3129] extmod/modlwip: Fix setting of IP option
 SOF_BROADCAST.

Follow up to 25b89cbe946a198734f29b05c3e6730d6b949979.

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

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index c881f0df6a7d0..432b97e8fe3be 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1382,9 +1382,9 @@ STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
             mp_int_t val = mp_obj_get_int(args[3]);
             // Options are common for UDP and TCP pcb's.
             if (val) {
-                ip_set_option(socket->pcb.tcp, SOF_REUSEADDR);
+                ip_set_option(socket->pcb.tcp, opt);
             } else {
-                ip_reset_option(socket->pcb.tcp, SOF_REUSEADDR);
+                ip_reset_option(socket->pcb.tcp, opt);
             }
             break;
         }

From ff70bd1197e581cc43d5a1880323e71676a4b30d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 15 Aug 2023 15:29:15 +1000
Subject: [PATCH 0297/3129] stm32/timer: Fix deadtime config on Advanced Timer
 peripherals.

Newer MCU series have additional fields in the struct which need to be
initialised to zero, eg Break2AFMode on WB55.

This work was funded by Planet Innovation.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index b4fa1d6cf9b7e..5319ae4ece72d 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -507,7 +507,7 @@ STATIC mp_int_t compute_ticks_from_dtg(uint32_t dtg) {
 }
 
 STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk) {
-    TIM_BreakDeadTimeConfigTypeDef deadTimeConfig;
+    TIM_BreakDeadTimeConfigTypeDef deadTimeConfig = {0};
     deadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE;
     deadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE;
     deadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF;

From ee5e5944726983b51475ab8b687c7f5fa3671bc5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Sep 2023 16:04:11 +1000
Subject: [PATCH 0298/3129] stm32/dma: Add support for SPI1 DMA on H5 MCU's.

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

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index bfa4fb23ff171..94c293c0d0ee7 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -711,8 +711,10 @@ static const uint8_t dma_irqn[NSTREAM] = {
 #define DMA1_ENABLE_MASK (0x00ff) // Bits in dma_enable_mask corresponding to GPDMA1
 #define DMA2_ENABLE_MASK (0xff00) // Bits in dma_enable_mask corresponding to GPDMA2
 
-const dma_descr_t dma_SPI_2_RX = { GPDMA1_Channel0, GPDMA1_REQUEST_SPI2_RX, dma_id_0, &dma_init_struct_spi_i2c };
-const dma_descr_t dma_SPI_2_TX = { GPDMA1_Channel1, GPDMA1_REQUEST_SPI2_TX, dma_id_1, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_1_RX = { GPDMA1_Channel0, GPDMA1_REQUEST_SPI1_RX, dma_id_0, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_1_TX = { GPDMA1_Channel1, GPDMA1_REQUEST_SPI1_TX, dma_id_1, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_RX = { GPDMA1_Channel2, GPDMA1_REQUEST_SPI2_RX, dma_id_2, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_TX = { GPDMA1_Channel3, GPDMA1_REQUEST_SPI2_TX, dma_id_3, &dma_init_struct_spi_i2c };
 
 static const uint8_t dma_irqn[NSTREAM] = {
     GPDMA1_Channel0_IRQn,

From 60e0ef6ef6a06f9a892cafd83bf9dd367c3247e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Sep 2023 16:05:00 +1000
Subject: [PATCH 0299/3129] stm32/octospi: Add support for dual-line SPI
 interface.

And fix the case of 32-bit addresses in single-line mode.

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

diff --git a/ports/stm32/octospi.c b/ports/stm32/octospi.c
index b37ebb2a082da..f2854f3796eb2 100644
--- a/ports/stm32/octospi.c
+++ b/ports/stm32/octospi.c
@@ -272,16 +272,36 @@ STATIC int octospi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *de
 STATIC int octospi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
     (void)self_in;
 
+    #if defined(MICROPY_HW_OSPIFLASH_IO1) && !defined(MICROPY_HW_OSPIFLASH_IO2) && !defined(MICROPY_HW_OSPIFLASH_IO4)
+
+    // Use 2-line address, 2-line data.
+
+    uint32_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
+    uint32_t dmode = 2; // data on 2-lines
+    uint32_t admode = 2; // address on 2-lines
+    uint32_t dcyc = 4; // 4 dummy cycles
+
+    if (cmd == 0xeb || cmd == 0xec) {
+        // Convert to 2-line command.
+        cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 0xbc : 0xbb;
+    }
+
+    #else
+
+    // Fallback to use 1-line address, 1-line data.
+
     uint32_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
     uint32_t dmode = 1; // data on 1-line
     uint32_t admode = 1; // address on 1-line
     uint32_t dcyc = 0; // 0 dummy cycles
 
-    if (cmd == 0xeb) {
+    if (cmd == 0xeb || cmd == 0xec) {
         // Convert to 1-line command.
         cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 0x13 : 0x03;
     }
 
+    #endif
+
     OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
 
     OCTOSPI1->DLR = len - 1; // number of bytes to read

From 67b1c81f69d6cd1c5ad9c35bb68f4490e94865e5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Sep 2023 16:06:06 +1000
Subject: [PATCH 0300/3129] stm32/powerctrlboot: Allow using PLL3 for USB clock
 on H5 MCU's.

A board should enable MICROPY_HW_CLK_USE_PLL3_FOR_USB to use this feature.

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

diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index b075073a5b6d8..220375a51e09f 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -251,7 +251,7 @@ void SystemClock_Config(void) {
     powerctrl_config_systick();
 
     // USB clock configuration, either HSI48 or PLL3.
-    #if 1
+    #if MICROPY_HW_ENABLE_USB && !MICROPY_HW_CLK_USE_PLL3_FOR_USB
 
     // Enable HSI48.
     LL_RCC_HSI48_Enable();
@@ -267,7 +267,7 @@ void SystemClock_Config(void) {
         | __HAL_RCC_CRS_RELOADVALUE_CALCULATE(48000000, 1000) << CRS_CFGR_RELOAD_Pos;
     CRS->CR = 0x20 << CRS_CR_TRIM_Pos | CRS_CR_AUTOTRIMEN | CRS_CR_CEN;
 
-    #else
+    #elif MICROPY_HW_ENABLE_USB && MICROPY_HW_CLK_USE_PLL3_FOR_USB
 
     // Configure PLL3 for use by USB at Q=48MHz.
     LL_RCC_PLL3_SetSource(LL_RCC_PLL3SOURCE_HSE);

From a4d28e5279ff8d4b8b4676abcd86687c44be5e64 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Sep 2023 16:07:49 +1000
Subject: [PATCH 0301/3129] stm32/timer: Fix use of TIM8 on H5 MCU's.

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

diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 483537b649379..7363e26e89590 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -786,7 +786,7 @@ void TIM8_UP_TIM13_IRQHandler(void) {
     IRQ_EXIT(TIM8_UP_TIM13_IRQn);
 }
 
-#if defined(STM32G4) || defined(STM32L4)
+#if defined(STM32G4) || defined(STM32H5) || defined(STM32L4)
 void TIM8_UP_IRQHandler(void) {
     IRQ_ENTER(TIM8_UP_IRQn);
     timer_irq_handler(8);
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 5319ae4ece72d..5f2e213a0aa29 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -884,10 +884,11 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     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(STM32G4) || defined(STM32L4)
+    #else
     TIM_ENTRY(8, TIM8_UP_IRQn),
     #endif
     #endif

From dc99840b3a0e8afd97ab3b92ad2042233b000225 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Sep 2023 16:08:25 +1000
Subject: [PATCH 0302/3129] stm32/uart: Add support for UART10 when it's a
 USART.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/stm32_it.c |  8 ++++++++
 ports/stm32/uart.c     | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 7363e26e89590..50fd56ecaed0f 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -1015,6 +1015,14 @@ void UART10_IRQHandler(void) {
 }
 #endif
 
+#if defined(USART10)
+void USART10_IRQHandler(void) {
+    IRQ_ENTER(USART10_IRQn);
+    uart_irq_handler(10);
+    IRQ_EXIT(USART10_IRQn);
+}
+#endif
+
 #endif
 
 #if defined(LPUART1)
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 7a2a3a9580800..1823596df16c6 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -491,9 +491,15 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
         #if defined(MICROPY_HW_UART10_TX) && defined(MICROPY_HW_UART10_RX)
         case PYB_UART_10:
             uart_unit = 10;
+            #if defined(UART10)
             UARTx = UART10;
             irqn = UART10_IRQn;
             __HAL_RCC_UART10_CLK_ENABLE();
+            #else
+            UARTx = USART10;
+            irqn = USART10_IRQn;
+            __HAL_RCC_USART10_CLK_ENABLE();
+            #endif
             pins[0] = MICROPY_HW_UART10_TX;
             pins[1] = MICROPY_HW_UART10_RX;
             break;
@@ -771,6 +777,13 @@ void uart_deinit(pyb_uart_obj_t *self) {
         __HAL_RCC_UART10_RELEASE_RESET();
         __HAL_RCC_UART10_CLK_DISABLE();
     #endif
+    #if defined(USART10)
+    } else if (self->uart_id == 10) {
+        HAL_NVIC_DisableIRQ(USART10_IRQn);
+        __HAL_RCC_USART10_FORCE_RESET();
+        __HAL_RCC_USART10_RELEASE_RESET();
+        __HAL_RCC_USART10_CLK_DISABLE();
+    #endif
     #if defined(LPUART1)
     } else if (self->uart_id == PYB_LPUART_1) {
         #if defined(STM32G0)
@@ -886,7 +899,7 @@ uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
         #if defined(UART9)
         || self->uart_id == 9
         #endif
-        #if defined(UART10)
+        #if defined(UART10) || defined(USART10)
         || self->uart_id == 10
         #endif
         ) {

From c9089e71a1b9202aa5abefbb3c9c29659ec838ab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Sep 2023 18:12:26 +1000
Subject: [PATCH 0303/3129] py/runtime: Add helpers to call a general function
 on nlr jump callback.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c |  5 +++++
 py/runtime.h | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/py/runtime.c b/py/runtime.c
index c3ada72296d24..b4d5250e83a6f 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -197,6 +197,11 @@ void mp_globals_locals_set_from_nlr_jump_callback(void *ctx_in) {
     mp_locals_set(ctx->locals);
 }
 
+void mp_call_function_1_from_nlr_jump_callback(void *ctx_in) {
+    nlr_jump_callback_node_call_function_1_t *ctx = ctx_in;
+    ctx->func(ctx->arg);
+}
+
 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));
diff --git a/py/runtime.h b/py/runtime.h
index c033c77b4034c..5fa072d7e99d2 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -29,6 +29,13 @@
 #include "py/mpstate.h"
 #include "py/pystack.h"
 
+// For use with mp_call_function_1_from_nlr_jump_callback.
+#define MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, f, a) \
+    nlr_jump_callback_node_call_function_1_t ctx = { \
+        .func = (void (*)(void *))(f), \
+        .arg = (a), \
+    }
+
 typedef enum {
     MP_VM_RETURN_NORMAL,
     MP_VM_RETURN_YIELD,
@@ -73,6 +80,13 @@ typedef struct _nlr_jump_callback_node_globals_locals_t {
     mp_obj_dict_t *locals;
 } nlr_jump_callback_node_globals_locals_t;
 
+// For use with mp_call_function_1_from_nlr_jump_callback.
+typedef struct _nlr_jump_callback_node_call_function_1_t {
+    nlr_jump_callback_node_t callback;
+    void (*func)(void *);
+    void *arg;
+} nlr_jump_callback_node_call_function_1_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[];
@@ -121,6 +135,7 @@ static inline void mp_globals_set(mp_obj_dict_t *d) {
 }
 
 void mp_globals_locals_set_from_nlr_jump_callback(void *ctx_in);
+void mp_call_function_1_from_nlr_jump_callback(void *ctx_in);
 
 mp_obj_t mp_load_name(qstr qst);
 mp_obj_t mp_load_global(qstr qst);

From 5e122b11eaee64bbece2ace08fc3f994d5f83f2e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Sep 2023 18:17:27 +1000
Subject: [PATCH 0304/3129] py/parse: Always free lexer even if an exception is
 raised.

Fixes issue #3843.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/parse.c                     | 7 +++++--
 tests/extmod/vfs_userfs.py     | 7 +++++++
 tests/extmod/vfs_userfs.py.exp | 5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/py/parse.c b/py/parse.c
index 0dd56e4554f44..e86103ed8e02a 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -1023,6 +1023,9 @@ STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id,
 }
 
 mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
+    // Set exception handler to free the lexer if an exception is raised.
+    MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, mp_lexer_free, lex);
+    nlr_push_jump_callback(&ctx.callback, mp_call_function_1_from_nlr_jump_callback);
 
     // initialise parser and allocate memory for its stacks
 
@@ -1370,8 +1373,8 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
     m_del(rule_stack_t, parser.rule_stack, parser.rule_stack_alloc);
     m_del(mp_parse_node_t, parser.result_stack, parser.result_stack_alloc);
 
-    // we also free the lexer on behalf of the caller
-    mp_lexer_free(lex);
+    // Deregister exception handler and free the lexer.
+    nlr_pop_jump_callback(true);
 
     return parser.tree;
 }
diff --git a/tests/extmod/vfs_userfs.py b/tests/extmod/vfs_userfs.py
index 518373c70a9e1..91c355c3df573 100644
--- a/tests/extmod/vfs_userfs.py
+++ b/tests/extmod/vfs_userfs.py
@@ -68,6 +68,7 @@ def open(self, path, mode):
     "/data.txt": b"some data in a text file",
     "/usermod1.py": b"print('in usermod1')\nimport usermod2",
     "/usermod2.py": b"print('in usermod2')",
+    "/usermod3.py": b"syntax error",
 }
 os.mount(UserFS(user_files), "/userfs")
 
@@ -79,6 +80,12 @@ def open(self, path, mode):
 sys.path.append("/userfs")
 import usermod1
 
+# import a .py file with a syntax error (file should be closed on error)
+try:
+    import usermod3
+except SyntaxError:
+    print("SyntaxError in usermod3")
+
 # unmount and undo path addition
 os.umount("/userfs")
 sys.path.pop()
diff --git a/tests/extmod/vfs_userfs.py.exp b/tests/extmod/vfs_userfs.py.exp
index 00ddd95fca508..be54da47c29e3 100644
--- a/tests/extmod/vfs_userfs.py.exp
+++ b/tests/extmod/vfs_userfs.py.exp
@@ -10,3 +10,8 @@ stat /usermod2.py
 open /usermod2.py rb
 ioctl 4 0
 in usermod2
+stat /usermod3
+stat /usermod3.py
+open /usermod3.py rb
+ioctl 4 0
+SyntaxError in usermod3

From 397697aa8368f45bd0794e22a25083e9e18e3cfe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Sep 2023 18:18:47 +1000
Subject: [PATCH 0305/3129] py/persistentcode: Always close reader even if an
 exception is raised.

Fixes issue #3874.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c            | 7 ++++++-
 tests/extmod/vfs_userfs.py     | 7 +++++++
 tests/extmod/vfs_userfs.py.exp | 6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index fdc87d5cc8c3a..e1218e0b8a577 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -391,6 +391,10 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
 }
 
 void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *cm) {
+    // Set exception handler to close the reader if an exception is raised.
+    MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, reader->close, reader->data);
+    nlr_push_jump_callback(&ctx.callback, mp_call_function_1_from_nlr_jump_callback);
+
     byte header[4];
     read_bytes(reader, header, sizeof(header));
     byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);
@@ -435,7 +439,8 @@ void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *cm) {
     cm->n_obj = n_obj;
     #endif
 
-    reader->close(reader->data);
+    // Deregister exception handler and close the reader.
+    nlr_pop_jump_callback(true);
 }
 
 void mp_raw_code_load_mem(const byte *buf, size_t len, mp_compiled_module_t *context) {
diff --git a/tests/extmod/vfs_userfs.py b/tests/extmod/vfs_userfs.py
index 91c355c3df573..36f1088870d81 100644
--- a/tests/extmod/vfs_userfs.py
+++ b/tests/extmod/vfs_userfs.py
@@ -69,6 +69,7 @@ def open(self, path, mode):
     "/usermod1.py": b"print('in usermod1')\nimport usermod2",
     "/usermod2.py": b"print('in usermod2')",
     "/usermod3.py": b"syntax error",
+    "/usermod4.mpy": b"syntax error",
 }
 os.mount(UserFS(user_files), "/userfs")
 
@@ -86,6 +87,12 @@ def open(self, path, mode):
 except SyntaxError:
     print("SyntaxError in usermod3")
 
+# import a .mpy file with a syntax error (file should be closed on error)
+try:
+    import usermod4
+except ValueError:
+    print("ValueError in usermod4")
+
 # unmount and undo path addition
 os.umount("/userfs")
 sys.path.pop()
diff --git a/tests/extmod/vfs_userfs.py.exp b/tests/extmod/vfs_userfs.py.exp
index be54da47c29e3..05cff0452c68f 100644
--- a/tests/extmod/vfs_userfs.py.exp
+++ b/tests/extmod/vfs_userfs.py.exp
@@ -15,3 +15,9 @@ stat /usermod3.py
 open /usermod3.py rb
 ioctl 4 0
 SyntaxError in usermod3
+stat /usermod4
+stat /usermod4.py
+stat /usermod4.mpy
+open /usermod4.mpy rb
+ioctl 4 0
+ValueError in usermod4

From 09a2ee8e7f45756470f9ca51edd4402fcb0fc39c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 16 Apr 2023 17:16:37 +0200
Subject: [PATCH 0306/3129] renesas-ra/Makefile: Generate binary firmware
 output.

This patch generates a binary firmware image (*.bin) and removes the split
TEXT1/0_ADDR/SECTIONS because it's not configured for this port so it
generates broken binaries.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/Makefile | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 71d0a2d667bdd..77077d6ccf442 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -427,7 +427,7 @@ $(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
+all: $(TOP)/lib/fsp/README.md $(BUILD)/firmware.hex $(BUILD)/firmware.bin
 
 # For convenience, automatically fetch required submodules if they don't exist
 $(TOP)/lib/fsp/README.md:
@@ -442,7 +442,7 @@ endef
 
 define GENERATE_BIN
 	$(ECHO) "GEN $(1)"
-	$(Q)$(OBJCOPY) -O binary $(addprefix -j ,$(3)) $(2) $(1)
+	$(Q)$(OBJCOPY) -I ihex -O binary $(2) $(1)
 endef
 
 define GENERATE_HEX
@@ -450,19 +450,10 @@ define GENERATE_HEX
 	$(Q)$(OBJCOPY) -O ihex $(2) $(1)
 endef
 
-.PHONY: 
+.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.bin: $(BUILD)/firmware.hex
+	$(call GENERATE_BIN,$@,$^)
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(call GENERATE_HEX,$@,$^)

From 0a3264ba9636f0414078fa0c498178eae2994118 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 18 Apr 2023 14:21:11 +0200
Subject: [PATCH 0307/3129] shared/tinyusb: Support HS endpoint sizes.

Set buffer and endpoint sizes to 512 if the device is configured as a High
Speed device.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 shared/tinyusb/mp_usbd_descriptor.c | 2 +-
 shared/tinyusb/tusb_config.h        | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/shared/tinyusb/mp_usbd_descriptor.c b/shared/tinyusb/mp_usbd_descriptor.c
index 8fab599b673c8..72a2652179869 100644
--- a/shared/tinyusb/mp_usbd_descriptor.c
+++ b/shared/tinyusb/mp_usbd_descriptor.c
@@ -34,7 +34,7 @@
 #include "mp_usbd_internal.h"
 
 #define USBD_CDC_CMD_MAX_SIZE (8)
-#define USBD_CDC_IN_OUT_MAX_SIZE (64)
+#define USBD_CDC_IN_OUT_MAX_SIZE ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 64)
 
 const tusb_desc_device_t mp_usbd_desc_device_static = {
     .bLength = sizeof(tusb_desc_device_t),
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index 28bee09a594fc..96e883fc88861 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -43,7 +43,9 @@
 #define MICROPY_HW_USB_CDC_INTERFACE_STRING "Board CDC"
 #endif
 
+#ifndef CFG_TUSB_RHPORT0_MODE
 #define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
+#endif
 
 #if MICROPY_HW_USB_CDC
 #define CFG_TUD_CDC             (1)
@@ -59,8 +61,8 @@
 
 // CDC Configuration
 #if CFG_TUD_CDC
-#define CFG_TUD_CDC_RX_BUFSIZE  (256)
-#define CFG_TUD_CDC_TX_BUFSIZE  (256)
+#define CFG_TUD_CDC_RX_BUFSIZE  ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
+#define CFG_TUD_CDC_TX_BUFSIZE  ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
 #endif
 
 // MSC Configuration

From 86fd958212aaec7ad696d51a1fe729b3aca131e9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 21 Aug 2023 09:46:23 +0200
Subject: [PATCH 0308/3129] lib/tinyusb: Update to the most recent master.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 868f2bcda092b..1fdf29075d4e6 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 868f2bcda092b0b8d5f7ac55ffaef2c81316d35e
+Subproject commit 1fdf29075d4e613eacfa881166015263797db0f6

From 816b88ad074696f4f3fc43aa7773e6bc04fc1e6c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 21 Aug 2023 09:46:23 +0200
Subject: [PATCH 0309/3129] mimxrt/Makefile: Update to work with latest
 TinyUSB.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index ead206e5e2106..d5bb7081b01aa 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -341,7 +341,7 @@ CFLAGS += \
 	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-DBOARD_$(BOARD) \
 	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
-	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT \
+	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT1XXX \
 	-DCLOCK_CONFIG_H='<boards/$(MCU_SERIES)_clock_config.h>' \
 	-DCPU_$(MCU_SERIES)$(MCU_CORE) \
 	-DCPU_$(MCU_VARIANT) \

From d89a0606e0e008ca8a7bb6af905330eb512ea06c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 17 Apr 2023 17:46:13 +0200
Subject: [PATCH 0310/3129] renesas-ra: Add TinyUSB support.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/Makefile       |  29 +++-
 ports/renesas-ra/main.c         |   5 +
 ports/renesas-ra/mpconfigport.h |  52 +++++++
 ports/renesas-ra/mphalport.c    | 231 +++++++++++++++++++++++++++++---
 ports/renesas-ra/mphalport.h    |   4 +
 ports/renesas-ra/uart.c         |   6 +
 ports/renesas-ra/usbd.c         |  48 +++++++
 7 files changed, 357 insertions(+), 18 deletions(-)
 create mode 100644 ports/renesas-ra/usbd.c

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 77077d6ccf442..a8cc6d1915f37 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -44,7 +44,7 @@ FROZEN_MANIFEST ?= boards/manifest.py
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES += lib/fsp
+GIT_SUBMODULES += lib/fsp lib/tinyusb
 
 MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
 CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
@@ -69,6 +69,9 @@ 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 += -I$(TOP)/lib/tinyusb/hw
+INC += -I$(TOP)/lib/tinyusb/src
+INC += -I$(TOP)/shared/tinyusb
 #INC += -Ilwip_inc
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1 RA6M1 RA6M2 RA6M5))
 INC += -Ira
@@ -82,6 +85,7 @@ INC += -Idebug
 CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += -DRA_HAL_H='<$(CMSIS_MCU)_hal.h>'
 CFLAGS += -DRA_CFG_H='<$(FSP_BOARD_NAME)_conf.h>'
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_RAXXX
 
 # Basic Cortex-M flags
 CFLAGS_CORTEX_M = -mthumb
@@ -171,6 +175,27 @@ SHARED_SRC_C += $(addprefix shared/,\
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
+	tinyusb/mp_cdc_common.c \
+	tinyusb/mp_usbd.c \
+	tinyusb/mp_usbd_descriptor.c \
+	)
+
+# TinyUSB Stack source
+TINYUSB_SRC_C += $(addprefix lib/tinyusb/,\
+	src/class/cdc/cdc_device.c \
+	src/class/dfu/dfu_rt_device.c \
+	src/class/hid/hid_device.c \
+	src/class/midi/midi_device.c \
+	src/class/msc/msc_device.c \
+	src/class/usbtmc/usbtmc_device.c \
+	src/class/vendor/vendor_device.c \
+	src/common/tusb_fifo.c \
+	src/device/usbd.c \
+	src/device/usbd_control.c \
+	src/portable/renesas/rusb2/dcd_rusb2.c \
+	src/portable/renesas/rusb2/hcd_rusb2.c \
+	src/portable/renesas/rusb2/rusb2_common.c \
+	src/tusb.c \
 	)
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
@@ -307,6 +332,7 @@ SRC_C += \
 	flashbdev.c \
 	storage.c \
 	fatfs_port.c \
+	usbd.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
 SRC_C += $(addprefix $(BOARD_DIR)/ra_gen/,\
@@ -401,6 +427,7 @@ OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index 8f4baa8e2a0f7..f235396253525 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -62,6 +62,7 @@
 #include "usrsw.h"
 #include "rtc.h"
 #include "storage.h"
+#include "tusb.h"
 
 #define RA_EARLY_PRINT  1       /* for enabling mp_print in boardctrl. */
 
@@ -259,6 +260,10 @@ int main(void) {
     state.reset_mode = 1;
     state.log_soft_reset = false;
 
+    #if MICROPY_HW_ENABLE_USBDEV
+    tusb_init();
+    #endif
+
     MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP(&state);
 
 soft_reset:
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 34b299bd16c02..eb21db8430974 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -37,6 +37,28 @@
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 #endif
 
+#ifndef MICROPY_HW_ENABLE_USBDEV
+#define MICROPY_HW_ENABLE_USBDEV    (0)
+#endif
+#ifndef MICROPY_HW_ENABLE_UART_REPL
+#define MICROPY_HW_ENABLE_UART_REPL (1) // useful if there is no USB
+#endif
+
+#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
+// RA unique ID is 16 bytes (hex string == 32)
+#ifndef MICROPY_HW_USB_DESC_STR_MAX
+#define MICROPY_HW_USB_DESC_STR_MAX (32)
+#endif
+#endif
+
 // memory allocation policies
 #ifndef MICROPY_GC_STACK_ENTRY_TYPE
 #if MICROPY_HW_SDRAM_SIZE
@@ -139,6 +161,11 @@
 #define MICROPY_FATFS_USE_LABEL        (1)
 #define MICROPY_FATFS_RPATH            (2)
 #define MICROPY_FATFS_MULTI_PARTITION  (1)
+#if MICROPY_HW_USB_MSC
+// 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_PY_MACHINE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS \
@@ -153,6 +180,15 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
+// Miscellaneous settings
+
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID  (0xf055)
+#endif
+#ifndef MICROPY_HW_USB_PID
+#define MICROPY_HW_USB_PID  (0x9800)
+#endif
+
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
@@ -190,10 +226,25 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
 
+#if MICROPY_HW_ENABLE_USBDEV
+#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 (--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
+
 #if MICROPY_PY_THREAD
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
+        MICROPY_HW_USBDEV_TASK_HOOK \
         mp_handle_pending(true); \
         if (pyb_thread_enabled) { \
             MP_THREAD_GIL_EXIT(); \
@@ -209,6 +260,7 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
+        MICROPY_HW_USBDEV_TASK_HOOK \
         mp_handle_pending(true); \
         __WFI(); \
     } while (0);
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index b35ab7571440e..91705129cfd4c 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -3,8 +3,9 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Damien P. George
+ * Copyright (c) 2018,2021 Damien P. George
  * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ * Copyright (c) 2023 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
@@ -25,15 +26,32 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
-
 #include "py/runtime.h"
 #include "py/stream.h"
+#include "py/mphal.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "py/ringbuf.h"
 #include "extmod/misc.h"
+#include "shared/runtime/interrupt_char.h"
+#include "tusb.h"
 #include "uart.h"
 
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+void flash_cache_commit(void);
+#endif
+
+#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
+
+#ifndef MICROPY_HW_STDIN_BUFFER_LEN
+#define MICROPY_HW_STDIN_BUFFER_LEN 512
+#endif
+
+STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
+ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
+
+#endif
+
 // this table converts from HAL_StatusTypeDef to POSIX errno
 const byte mp_hal_status_to_errno_table[4] = {
     [HAL_OK] = 0,
@@ -46,42 +64,128 @@ 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);
+#if MICROPY_HW_USB_CDC
+
+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 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;
+        }
     }
-    return ret | mp_os_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) {
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    #if MICROPY_HW_USB_CDC
+    poll_cdc_interfaces();
+    #endif
+    #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;
+    }
+    if (poll_flags & MP_STREAM_POLL_WR) {
+        #if MICROPY_HW_ENABLE_UART_REPL
+        ret |= MP_STREAM_POLL_WR;
+        #else
+        if (tud_cdc_connected() && tud_cdc_write_available() > 0) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+        #endif
+    }
+    #endif
+    #if MICROPY_PY_OS_DUPTERM
+    ret |= mp_os_dupterm_poll(poll_flags);
+    #endif
+    return ret;
+}
+
+// Receive single character
+int mp_hal_stdin_rx_chr(void) {
     for (;;) {
+        #if MICROPY_HW_USB_CDC
+        poll_cdc_interfaces();
+        #endif
+
         #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 c = ringbuf_get(&stdin_ringbuf);
+        if (c != -1) {
+            return c;
         }
+        #if MICROPY_PY_OS_DUPTERM
         int dupterm_c = mp_os_dupterm_rx_chr();
         if (dupterm_c >= 0) {
             return dupterm_c;
         }
+        #endif
         MICROPY_EVENT_POLL_HOOK
     }
 }
 
-MP_WEAK void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+// Send string of given length
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    #if MICROPY_HW_ENABLE_UART_REPL
     if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
         uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
     }
+    #endif
+
+    #if MICROPY_HW_USB_CDC
+    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;
+            }
+            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;
+        }
+    }
+    #endif
+
+    #if MICROPY_PY_OS_DUPTERM
     mp_os_dupterm_tx_strn(str, len);
+    #endif
 }
 
 void mp_hal_ticks_cpu_enable(void) {
@@ -119,4 +223,97 @@ void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
     }
 }
 
+#if MICROPY_HW_ENABLE_USBDEV
+void usbfs_interrupt_handler(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST
+    tuh_int_handler(0);
+    #endif
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
+    tud_int_handler(0);
+    #endif
+}
+
+void usbfs_resume_handler(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST
+    tuh_int_handler(0);
+    #endif
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
+    tud_int_handler(0);
+    #endif
+}
+
+void usbfs_d0fifo_handler(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST
+    tuh_int_handler(0);
+    #endif
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
+    tud_int_handler(0);
+    #endif
+}
+
+void usbfs_d1fifo_handler(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST
+    tuh_int_handler(0);
+    #endif
+
+    #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
+    tud_int_handler(0);
+    #endif
+}
+
+void usbhs_interrupt_handler(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+
+    #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
+    tuh_int_handler(1);
+    #endif
+
+    #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
+    tud_int_handler(1);
+    #endif
+}
+
+void usbhs_d0fifo_handler(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+
+    #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
+    tuh_int_handler(1);
+    #endif
+
+    #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
+    tud_int_handler(1);
+    #endif
+}
+
+void usbhs_d1fifo_handler(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+
+    #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
+    tuh_int_handler(1);
+    #endif
+
+    #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
+    tud_int_handler(1);
+    #endif
+}
+#endif
+
 MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *pyb_stdio_uart);
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index 2648e22f994ca..2b25a36fbf853 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -27,8 +27,12 @@
 
 #include RA_HAL_H
 #include "pin.h"
+#include "py/ringbuf.h"
+
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 extern const unsigned char mp_hal_status_to_errno_table[4];
+extern ringbuf_t stdin_ringbuf;
 
 static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
     return -mp_hal_status_to_errno_table[status];
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index e41c68f0c442a..47c793e7d3b29 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -33,6 +33,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "py/ringbuf.h"
 #include "shared/runtime/interrupt_char.h"
 #include "shared/runtime/mpirq.h"
 #include "uart.h"
@@ -75,6 +76,11 @@ static void uart_rx_cb(uint32_t ch, int d) {
         (*keyex_cb[ch])(d);
     }
     #endif
+
+    #if MICROPY_HW_ENABLE_UART_REPL
+    ringbuf_put(&stdin_ringbuf, 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);
diff --git a/ports/renesas-ra/usbd.c b/ports/renesas-ra/usbd.c
new file mode 100644
index 0000000000000..7047503864f61
--- /dev/null
+++ b/ports/renesas-ra/usbd.c
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "py/mpconfig.h"
+
+#if MICROPY_HW_ENABLE_USBDEV
+
+#include "mp_usbd.h"
+#include "string.h"
+#include "tusb.h"
+
+void mp_usbd_port_get_serial_number(char *serial_buf) {
+    const bsp_unique_id_t *id = R_BSP_UniqueIdGet();
+    // convert to hex
+    int hexlen = sizeof(id->unique_id_bytes) * 2;
+    MP_STATIC_ASSERT(hexlen <= MICROPY_HW_USB_DESC_STR_MAX);
+    for (int i = 0; i < hexlen; i += 2) {
+        static const char *hexdig = "0123456789abcdef";
+        serial_buf[i] = hexdig[id->unique_id_bytes[i / 2] >> 4];
+        serial_buf[i + 1] = hexdig[id->unique_id_bytes[i / 2] & 0x0f];
+    }
+    serial_buf[hexlen] = 0;
+}
+
+#endif

From 5b774517dca780a074057e38e9511ef41a9100f7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 26 May 2023 15:39:36 +0200
Subject: [PATCH 0311/3129] renesas-ra: Add Bluetooth support using NimBLE.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/Makefile       |   8 ++
 ports/renesas-ra/main.c         |  11 ++
 ports/renesas-ra/mpbthciport.c  | 189 ++++++++++++++++++++++++++++++++
 ports/renesas-ra/mpbthciport.h  |  44 ++++++++
 ports/renesas-ra/mpconfigport.h |   9 ++
 ports/renesas-ra/mpnimbleport.c |  78 +++++++++++++
 ports/renesas-ra/mpnimbleport.h |  30 +++++
 7 files changed, 369 insertions(+)
 create mode 100644 ports/renesas-ra/mpbthciport.c
 create mode 100644 ports/renesas-ra/mpbthciport.h
 create mode 100644 ports/renesas-ra/mpnimbleport.c
 create mode 100644 ports/renesas-ra/mpnimbleport.h

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index a8cc6d1915f37..9accc760b5ef7 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -342,6 +342,14 @@ SRC_C += $(addprefix $(BOARD_DIR)/ra_gen/,\
 	vector_data.c \
 	)
 
+ifeq ($(MICROPY_PY_BLUETOOTH),1)
+SRC_C += mpbthciport.c
+endif
+
+ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+SRC_C += mpnimbleport.c
+endif
+
 SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index f235396253525..65ff76bb795ce 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -63,6 +63,10 @@
 #include "rtc.h"
 #include "storage.h"
 #include "tusb.h"
+#if MICROPY_PY_BLUETOOTH
+#include "mpbthciport.h"
+#include "extmod/modbluetooth.h"
+#endif
 
 #define RA_EARLY_PRINT  1       /* for enabling mp_print in boardctrl. */
 
@@ -264,6 +268,10 @@ int main(void) {
     tusb_init();
     #endif
 
+    #if MICROPY_PY_BLUETOOTH
+    mp_bluetooth_hci_init();
+    #endif
+
     MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP(&state);
 
 soft_reset:
@@ -382,6 +390,9 @@ int main(void) {
         mp_printf(&mp_plat_print, "MPY: soft reboot\n");
     }
 
+    #if MICROPY_PY_BLUETOOTH
+    mp_bluetooth_deinit();
+    #endif
     soft_timer_deinit();
     timer_deinit();
     uart_deinit_all();
diff --git a/ports/renesas-ra/mpbthciport.c b/ports/renesas-ra/mpbthciport.c
new file mode 100644
index 0000000000000..5092f8709a126
--- /dev/null
+++ b/ports/renesas-ra/mpbthciport.c
@@ -0,0 +1,189 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Arduino SA
+ * 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "shared/runtime/softtimer.h"
+#include "modmachine.h"
+#include "mpbthciport.h"
+#include "uart.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__)
+
+uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
+STATIC mp_sched_node_t mp_bluetooth_hci_sched_node;
+STATIC soft_timer_entry_t mp_bluetooth_hci_soft_timer;
+
+STATIC void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
+    mp_bluetooth_hci_poll_now();
+}
+
+void mp_bluetooth_hci_init(void) {
+    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) {
+    mp_bluetooth_hci_poll_now();
+}
+
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+    soft_timer_reinsert(&mp_bluetooth_hci_soft_timer, ms);
+}
+
+// For synchronous mode, we run all BLE stack code inside a scheduled task.
+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.
+    mp_bluetooth_hci_poll();
+}
+
+// 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) {
+    mp_sched_schedule_node(&mp_bluetooth_hci_sched_node, run_events_scheduled_task);
+}
+
+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(port),
+        MP_OBJ_NEW_QSTR(MP_QSTR_baudrate), MP_OBJ_NEW_SMALL_INT(baudrate),
+        MP_OBJ_NEW_QSTR(MP_QSTR_timeout), MP_OBJ_NEW_SMALL_INT(200),
+        MP_OBJ_NEW_QSTR(MP_QSTR_timeout_char), MP_OBJ_NEW_SMALL_INT(200),
+        MP_OBJ_NEW_QSTR(MP_QSTR_rxbuf), MP_OBJ_NEW_SMALL_INT(768),
+        MP_OBJ_NEW_QSTR(MP_QSTR_flow), MP_OBJ_NEW_SMALL_INT(UART_HWCONTROL_RTS | UART_HWCONTROL_CTS),
+    };
+
+    // This object is tracked in machine_uart_obj_all root pointer.
+    mp_bthci_uart = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, 1, 5, args);
+
+    // 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");
+    mp_bthci_uart = MP_OBJ_NULL;
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
+    debug_printf("mp_bluetooth_hci_uart_set_baudrate(%lu)\n", baudrate);
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(mp_bthci_uart);
+    ra_sci_set_baud((uint32_t)self->uart_id, baudrate);
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_any(void) {
+    int errcode = 0;
+    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) {
+        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 *)MP_OBJ_TYPE_GET_SLOT(&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 *)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;
+        }
+        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/renesas-ra/mpbthciport.h b/ports/renesas-ra/mpbthciport.h
new file mode 100644
index 0000000000000..e64c3817bbe76
--- /dev/null
+++ b/ports/renesas-ra/mpbthciport.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Arduino SA
+ * 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_MPBTHCIPORT_H
+#define MICROPY_INCLUDED_MIMXRT_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_MIMXRT_MPBTHCIPORT_H
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index eb21db8430974..27a0f21e5ce1e 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -100,6 +100,7 @@
 #endif
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_SCHEDULER_DEPTH     (8)
+#define MICROPY_SCHEDULER_STATIC_NODES (1)
 #define MICROPY_VFS                 (1)
 
 // control over Python builtins
@@ -268,6 +269,14 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_THREAD_YIELD()
 #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/renesas-ra/mpnimbleport.c b/ports/renesas-ra/mpnimbleport.c
new file mode 100644
index 0000000000000..904b1a804ee76
--- /dev/null
+++ b/ports/renesas-ra/mpnimbleport.c
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2023 Jim Mussared
+ * Copyright (c) 2020-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 "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.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/mpbthci.h"
+#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.
+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) {
+    __WFI();
+
+    // 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/renesas-ra/mpnimbleport.h b/ports/renesas-ra/mpnimbleport.h
new file mode 100644
index 0000000000000..d2d42b9cb5426
--- /dev/null
+++ b/ports/renesas-ra/mpnimbleport.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2023 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_MIMXRT_NIMBLE_PORT_H
+#define MICROPY_INCLUDED_MIMXRT_NIMBLE_PORT_H
+
+#endif // MICROPY_INCLUDED_MIMXRT_NIMBLE_PORT_H

From 142e8b70e28bd1a12a40b13cdbb9972dd73578a3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 22 Jun 2023 10:22:00 +0200
Subject: [PATCH 0312/3129] renesas-ra: Add RNG driver.

It needs to be enabled explicitly by a board.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/Makefile | 38 ++++++++++++++++++++++++++++
 ports/renesas-ra/modos.c  | 14 +++++++++++
 ports/renesas-ra/rng.c    | 52 +++++++++++++++++++++++++++++++++++++++
 ports/renesas-ra/rng.h    | 34 +++++++++++++++++++++++++
 4 files changed, 138 insertions(+)
 create mode 100644 ports/renesas-ra/rng.c
 create mode 100644 ports/renesas-ra/rng.h

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 9accc760b5ef7..50a7100538600 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -303,6 +303,7 @@ SRC_C += \
 	main.c \
 	ra_hal.c \
 	ra_it.c \
+	rng.c \
 	mphalport.c \
 	mpthreadport.c \
 	irq.c \
@@ -429,6 +430,43 @@ HAL_SRC_C += $(addprefix ra/,\
 
 endif
 
+ifeq ($(MICROPY_HW_ENABLE_RNG),1)
+CRYPTO_DIR = ra/fsp/src/r_sce_protected/crypto_procedures_protected/src/sce9/
+
+INC += -I$(TOP)/$(HAL_DIR)/$(CRYPTO_DIR)/inc
+INC += -I$(TOP)/$(HAL_DIR)/$(CRYPTO_DIR)/inc/api
+INC += -I$(TOP)/$(HAL_DIR)/$(CRYPTO_DIR)/private/inc
+INC += -I$(TOP)/$(HAL_DIR)/$(CRYPTO_DIR)/inc/instances
+
+# The following FSP files are required for the random number generator.
+HAL_SRC_C += $(addprefix $(HAL_DIR)/$(CRYPTO_DIR)/,\
+	public/r_sce.c \
+	public/r_sce_ecc.c \
+	public/r_sce_sha.c \
+	public/r_sce_aes.c \
+	private/r_sce_private.c \
+	primitive/r_sce_p00.c \
+	primitive/r_sce_p20.c \
+	primitive/r_sce_p26.c \
+	primitive/r_sce_p81.c \
+	primitive/r_sce_p82.c \
+	primitive/r_sce_p92.c \
+	primitive/r_sce_p40.c \
+	primitive/r_sce_func050.c \
+	primitive/r_sce_func051.c \
+	primitive/r_sce_func052.c \
+	primitive/r_sce_func053.c \
+	primitive/r_sce_func054.c \
+	primitive/r_sce_func100.c \
+	primitive/r_sce_func101.c \
+	primitive/r_sce_func040.c \
+	primitive/r_sce_func048.c \
+	primitive/r_sce_func102.c \
+	primitive/r_sce_func103.c \
+	primitive/r_sce_subprc01.c\
+	)
+endif
+
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(LIBM_O)
diff --git a/ports/renesas-ra/modos.c b/ports/renesas-ra/modos.c
index e6aadd9ebc1c3..0884a0b2c0e23 100644
--- a/ports/renesas-ra/modos.c
+++ b/ports/renesas-ra/modos.c
@@ -27,6 +27,7 @@
 
 #include "py/runtime.h"
 #include "uart.h"
+#include "rng.h"
 
 bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) {
     const mp_obj_type_t *type = mp_obj_get_type(stream);
@@ -42,3 +43,16 @@ void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t s
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
     }
 }
+
+#if MICROPY_PY_OS_URANDOM
+STATIC mp_obj_t mp_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] = rng_read();
+    }
+    return mp_obj_new_bytes_from_vstr(&vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+#endif
diff --git a/ports/renesas-ra/rng.c b/ports/renesas-ra/rng.c
new file mode 100644
index 0000000000000..4efee2d21ce8f
--- /dev/null
+++ b/ports/renesas-ra/rng.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 <stdint.h>
+#include <stdbool.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#if MICROPY_HW_ENABLE_RNG
+
+#include "rng.h"
+#include "r_sce.h"
+
+uint32_t rng_read(void) {
+    uint32_t random_data[4];
+    static bool initialized = false;
+
+    if (initialized == false) {
+        initialized = true;
+        R_SCE_Open(&sce_ctrl, &sce_cfg);
+    }
+
+    R_SCE_RandomNumberGenerate(random_data);
+
+    return random_data[0];
+}
+
+#endif
diff --git a/ports/renesas-ra/rng.h b/ports/renesas-ra/rng.h
new file mode 100644
index 0000000000000..ad70a454fffda
--- /dev/null
+++ b/ports/renesas-ra/rng.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ */
+
+#ifndef MICROPY_INCLUDED_RENESAS_RA_RNG_H
+#define MICROPY_INCLUDED_RENESAS_RA_RNG_H
+
+#include <stdint.h>
+
+uint32_t rng_read(void);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_RNG_H

From 62e650f2c2a8751ccdaa44be2c903f506297d9b5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 21 Jun 2023 17:08:58 +0200
Subject: [PATCH 0313/3129] renesas-ra: Add networking support using lwIP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/Makefile                 |  3 +-
 ports/renesas-ra/lwip_inc/arch/cc.h       | 10 +++
 ports/renesas-ra/lwip_inc/arch/sys_arch.h |  1 +
 ports/renesas-ra/lwip_inc/lwipopts.h      | 54 +++++++++++++++++
 ports/renesas-ra/main.c                   | 26 ++++++++
 ports/renesas-ra/mpconfigport.h           | 39 ++++++++++++
 ports/renesas-ra/mpnetworkport.c          | 74 +++++++++++++++++++++++
 7 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 ports/renesas-ra/lwip_inc/arch/cc.h
 create mode 100644 ports/renesas-ra/lwip_inc/arch/sys_arch.h
 create mode 100644 ports/renesas-ra/lwip_inc/lwipopts.h
 create mode 100644 ports/renesas-ra/mpnetworkport.c

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 50a7100538600..54d69691e3abb 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -72,7 +72,7 @@ INC += -I$(TOP)/$(HAL_DIR)/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include
 INC += -I$(TOP)/lib/tinyusb/hw
 INC += -I$(TOP)/lib/tinyusb/src
 INC += -I$(TOP)/shared/tinyusb
-#INC += -Ilwip_inc
+INC += -Ilwip_inc
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1 RA6M1 RA6M2 RA6M5))
 INC += -Ira
 endif
@@ -305,6 +305,7 @@ SRC_C += \
 	ra_it.c \
 	rng.c \
 	mphalport.c \
+	mpnetworkport.c \
 	mpthreadport.c \
 	irq.c \
 	pendsv.c \
diff --git a/ports/renesas-ra/lwip_inc/arch/cc.h b/ports/renesas-ra/lwip_inc/arch/cc.h
new file mode 100644
index 0000000000000..c31e54e9d69b7
--- /dev/null
+++ b/ports/renesas-ra/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/renesas-ra/lwip_inc/arch/sys_arch.h b/ports/renesas-ra/lwip_inc/arch/sys_arch.h
new file mode 100644
index 0000000000000..8b1a393741c96
--- /dev/null
+++ b/ports/renesas-ra/lwip_inc/arch/sys_arch.h
@@ -0,0 +1 @@
+// empty
diff --git a/ports/renesas-ra/lwip_inc/lwipopts.h b/ports/renesas-ra/lwip_inc/lwipopts.h
new file mode 100644
index 0000000000000..036da9bcef243
--- /dev/null
+++ b/ports/renesas-ra/lwip_inc/lwipopts.h
@@ -0,0 +1,54 @@
+#ifndef MICROPY_INCLUDED_RA_LWIP_LWIPOPTS_H
+#define MICROPY_INCLUDED_RA_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
+#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_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 rng_read(void);
+#define LWIP_RAND() rng_read()
+
+// 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_RA_LWIP_LWIPOPTS_H
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index 65ff76bb795ce..c4cb7cc9df043 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -63,10 +63,15 @@
 #include "rtc.h"
 #include "storage.h"
 #include "tusb.h"
+#if MICROPY_PY_LWIP
+#include "lwip/init.h"
+#include "lwip/apps/mdns.h"
+#endif
 #if MICROPY_PY_BLUETOOTH
 #include "mpbthciport.h"
 #include "extmod/modbluetooth.h"
 #endif
+#include "extmod/modnetwork.h"
 
 #define RA_EARLY_PRINT  1       /* for enabling mp_print in boardctrl. */
 
@@ -274,6 +279,16 @@ int main(void) {
 
     MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP(&state);
 
+    #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
+
 soft_reset:
 
     MICROPY_BOARD_TOP_SOFT_RESET_LOOP(&state);
@@ -320,6 +335,14 @@ int main(void) {
     machine_i2s_init0();
     #endif
 
+    #if MICROPY_PY_NETWORK
+    mod_network_init();
+    #endif
+
+    #if MICROPY_PY_LWIP
+    mod_network_lwip_init();
+    #endif
+
     // Initialise the local flash filesystem.
     // Create it if needed, mount in on /flash, and set it as current dir.
     bool mounted_flash = false;
@@ -393,6 +416,9 @@ int main(void) {
     #if MICROPY_PY_BLUETOOTH
     mp_bluetooth_deinit();
     #endif
+    #if MICROPY_PY_NETWORK
+    mod_network_deinit();
+    #endif
     soft_timer_deinit();
     timer_deinit();
     uart_deinit_all();
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 27a0f21e5ce1e..46320a8386aa1 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -126,6 +126,7 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/renesas-ra/modtime.c"
+#define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
@@ -168,6 +169,25 @@
 #define MICROPY_FATFS_MAX_SS           (FLASH_SECTOR_SIZE)
 #endif
 
+// By default networking should include sockets, ssl, websockets, webrepl, dupterm.
+#if MICROPY_PY_NETWORK
+#ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-ra"
+#endif
+#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_WEBREPL
+#define MICROPY_PY_WEBREPL              (1)
+#endif
+#endif
+
 #if MICROPY_PY_MACHINE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
@@ -181,6 +201,21 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
+#if MICROPY_PY_NETWORK_ESP_HOSTED
+extern const struct _mp_obj_type_t mod_network_esp_hosted_type;
+#define MICROPY_HW_NIC_ESP_HOSTED   { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_esp_hosted_type) },
+#else
+#define MICROPY_HW_NIC_ESP_HOSTED
+#endif
+
+#ifndef MICROPY_BOARD_NETWORK_INTERFACES
+#define MICROPY_BOARD_NETWORK_INTERFACES
+#endif
+
+#define MICROPY_PORT_NETWORK_INTERFACES \
+    MICROPY_HW_NIC_ESP_HOSTED \
+    MICROPY_BOARD_NETWORK_INTERFACES \
+
 // Miscellaneous settings
 
 #ifndef MICROPY_HW_USB_VID
@@ -269,6 +304,10 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_THREAD_YIELD()
 #endif
 
+#define MICROPY_PY_LWIP_ENTER
+#define MICROPY_PY_LWIP_REENTER
+#define MICROPY_PY_LWIP_EXIT
+
 #ifndef MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
 #endif
diff --git a/ports/renesas-ra/mpnetworkport.c b/ports/renesas-ra/mpnetworkport.c
new file mode 100644
index 0000000000000..2bc6bf439980c
--- /dev/null
+++ b/ports/renesas-ra/mpnetworkport.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "py/runtime.h"
+#include "py/mphal.h"
+#include "shared/runtime/softtimer.h"
+
+#if MICROPY_PY_LWIP
+
+#include "lwip/timeouts.h"
+
+static mp_sched_node_t network_poll_node;
+static soft_timer_entry_t network_timer;
+
+u32_t sys_now(void) {
+    return mp_hal_ticks_ms();
+}
+
+static void network_poll(mp_sched_node_t *node) {
+    // Run the lwIP internal updates
+    sys_check_timeouts();
+
+    #if MICROPY_PY_NETWORK_ESP_HOSTED
+    extern int esp_hosted_wifi_poll(void);
+    // Poll the NIC for incoming data
+    if (esp_hosted_wifi_poll() == -1) {
+        soft_timer_remove(&network_timer);
+    }
+    #endif
+}
+
+void mod_network_poll_events(void) {
+    mp_sched_schedule_node(&network_poll_node, network_poll);
+}
+
+static void network_timer_callback(soft_timer_entry_t *self) {
+    mod_network_poll_events();
+}
+
+void mod_network_lwip_init(void) {
+    static bool timer_started = false;
+    if (timer_started) {
+        soft_timer_remove(&network_timer);
+        timer_started = false;
+    }
+    // Start poll timer.
+    soft_timer_static_init(&network_timer, SOFT_TIMER_MODE_PERIODIC, 128, network_timer_callback);
+    soft_timer_reinsert(&network_timer, 128);
+    timer_started = true;
+}
+#endif // MICROPY_PY_LWIP

From 31ff3ff3aa6509ed58d0bbf51cc0ac16578a3811 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 22 Jun 2023 11:44:48 +0200
Subject: [PATCH 0314/3129] renesas-ra: Add mbedTLS support.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/Makefile                 |  4 ++
 ports/renesas-ra/mbedtls/mbedtls_config.h | 44 +++++++++++++
 ports/renesas-ra/mbedtls/mbedtls_port.c   | 80 +++++++++++++++++++++++
 ports/renesas-ra/mpconfigport.h           |  1 +
 4 files changed, 129 insertions(+)
 create mode 100644 ports/renesas-ra/mbedtls/mbedtls_config.h
 create mode 100644 ports/renesas-ra/mbedtls/mbedtls_port.c

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 54d69691e3abb..8126dbe7772d5 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -344,6 +344,10 @@ SRC_C += $(addprefix $(BOARD_DIR)/ra_gen/,\
 	vector_data.c \
 	)
 
+ifeq ($(MICROPY_SSL_MBEDTLS),1)
+LIB_SRC_C += mbedtls/mbedtls_port.c
+endif
+
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 SRC_C += mpbthciport.c
 endif
diff --git a/ports/renesas-ra/mbedtls/mbedtls_config.h b/ports/renesas-ra/mbedtls/mbedtls_config.h
new file mode 100644
index 0000000000000..006f5660fdb57
--- /dev/null
+++ b/ports/renesas-ra/mbedtls/mbedtls_config.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-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_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 ra_rtctime_seconds(time_t *timer);
+#define MBEDTLS_PLATFORM_TIME_MACRO ra_rtctime_seconds
+
+// 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/renesas-ra/mbedtls/mbedtls_port.c b/ports/renesas-ra/mbedtls/mbedtls_port.c
new file mode 100644
index 0000000000000..10c89bbcf0f5a
--- /dev/null
+++ b/ports/renesas-ra/mbedtls/mbedtls_port.c
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "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;
+    *olen = len;
+    while (len--) {
+        if (!n) {
+            val = rng_read();
+            n = 4;
+        }
+        *output++ = val;
+        val >>= 8;
+        --n;
+    }
+    return 0;
+}
+
+#if defined(MBEDTLS_HAVE_TIME)
+time_t ra_rtctime_seconds(time_t *timer) {
+    rtc_init_finalise();
+    RTC_TimeTypeDef time;
+    RTC_DateTypeDef date;
+    rtc_get_time(&time);
+    rtc_get_date(&date);
+    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
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 46320a8386aa1..255605a57e8c0 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -89,6 +89,7 @@
 #endif
 
 // Python internal features
+#define MICROPY_TRACKED_ALLOC       (MICROPY_SSL_MBEDTLS || MICROPY_BLUETOOTH_BTSTACK)
 #define MICROPY_READER_VFS          (1)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)

From dc5ea0c77d8729244ebf8f45c2f854cc3ef3581e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 1 Jun 2023 16:38:43 +0200
Subject: [PATCH 0315/3129] lib/protobuf-c: Add protobuf-c library.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .gitmodules    | 3 +++
 lib/protobuf-c | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/protobuf-c

diff --git a/.gitmodules b/.gitmodules
index 992fec3d1836f..75bffdadddeb8 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 "lib/protobuf-c"]
+	path = lib/protobuf-c
+	url = https://github.com/protobuf-c/protobuf-c.git
diff --git a/lib/protobuf-c b/lib/protobuf-c
new file mode 160000
index 0000000000000..abc67a11c6db2
--- /dev/null
+++ b/lib/protobuf-c
@@ -0,0 +1 @@
+Subproject commit abc67a11c6db271bedbb9f58be85d6f4e2ea8389

From ecedd78302cb2236a2175d4a2c9a09b482c8db03 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 21 Jun 2023 17:13:09 +0200
Subject: [PATCH 0316/3129] drivers/esp-hosted: Add host driver for ESP-Hosted
 firmware.

This is a host driver for ESP32 chips running the esp-hosted firmware,
which turns ESP32s into a WLAN/BT co-processor.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/esp-hosted/README.md             |  24 +
 drivers/esp-hosted/esp_hosted.proto      | 439 ++++++++++++++
 drivers/esp-hosted/esp_hosted_bthci.c    | 149 +++++
 drivers/esp-hosted/esp_hosted_hal.c      | 209 +++++++
 drivers/esp-hosted/esp_hosted_hal.h      |  82 +++
 drivers/esp-hosted/esp_hosted_internal.h | 117 ++++
 drivers/esp-hosted/esp_hosted_netif.c    | 167 ++++++
 drivers/esp-hosted/esp_hosted_netif.h    |  38 ++
 drivers/esp-hosted/esp_hosted_stack.h    |  63 ++
 drivers/esp-hosted/esp_hosted_wifi.c     | 697 +++++++++++++++++++++++
 drivers/esp-hosted/esp_hosted_wifi.h     | 110 ++++
 extmod/extmod.mk                         |  43 ++
 12 files changed, 2138 insertions(+)
 create mode 100644 drivers/esp-hosted/README.md
 create mode 100644 drivers/esp-hosted/esp_hosted.proto
 create mode 100644 drivers/esp-hosted/esp_hosted_bthci.c
 create mode 100644 drivers/esp-hosted/esp_hosted_hal.c
 create mode 100644 drivers/esp-hosted/esp_hosted_hal.h
 create mode 100644 drivers/esp-hosted/esp_hosted_internal.h
 create mode 100644 drivers/esp-hosted/esp_hosted_netif.c
 create mode 100644 drivers/esp-hosted/esp_hosted_netif.h
 create mode 100644 drivers/esp-hosted/esp_hosted_stack.h
 create mode 100644 drivers/esp-hosted/esp_hosted_wifi.c
 create mode 100644 drivers/esp-hosted/esp_hosted_wifi.h

diff --git a/drivers/esp-hosted/README.md b/drivers/esp-hosted/README.md
new file mode 100644
index 0000000000000..f4ecfd23d5552
--- /dev/null
+++ b/drivers/esp-hosted/README.md
@@ -0,0 +1,24 @@
+# esp-hosted driver
+
+This is a MicroPython driver for the Espressif
+[esp_hosted](https://github.com/espressif/esp-hosted/#readme) communications
+coprocessor, which allows creating a Wi-Fi and/or Bluetooth interface from
+MicroPython to a separate connected ESP32 compatible device running the
+`esp_hosted` firmware.
+
+## Building
+
+Enable this driver by setting `MICROPY_PY_NETWORK_ESP_HOSTED` to 1 in your
+Makefile. If `MICROPY_PY_BLUETOOTH` is set then the Bluetooth host driver will
+also be built.
+
+In addition to normal MicroPython build requirements, building this driver
+requires the [protocol buffer
+compiler](https://github.com/protocolbuffers/protobuf#protobuf-compiler-installation)
+(protoc) to be installed.
+
+On Debian/Ubuntu, it can be installed by running:
+
+```
+sudo apt-get install protobuf-compiler
+```
diff --git a/drivers/esp-hosted/esp_hosted.proto b/drivers/esp-hosted/esp_hosted.proto
new file mode 100644
index 0000000000000..8a51e9502bb6b
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted.proto
@@ -0,0 +1,439 @@
+/* Copyright (C) 2015-2023 Espressif Systems (Shanghai) PTE LTD */
+/* SPDX-License-Identifier: Apache-2.0 */
+
+/* This file is sourced from
+   https://github.com/espressif/esp-hosted/blob/master/esp_hosted_fg/common/proto/esp_hosted_config.proto
+*/
+
+syntax = "proto3";
+
+/* Enums similar to ESP IDF */
+enum Ctrl_VendorIEType {
+    Beacon = 0;
+    Probe_req = 1;
+    Probe_resp = 2;
+    Assoc_req = 3;
+    Assoc_resp = 4;
+}
+
+enum Ctrl_VendorIEID {
+    ID_0 = 0;
+    ID_1 = 1;
+}
+
+enum Ctrl_WifiMode {
+    NONE = 0;
+    STA = 1;
+    AP = 2;
+    APSTA = 3;
+}
+
+enum Ctrl_WifiBw {
+    BW_Invalid = 0;
+    HT20 = 1;
+    HT40 = 2;
+}
+
+enum Ctrl_WifiPowerSave {
+    PS_Invalid = 0;
+    MIN_MODEM = 1;
+    MAX_MODEM = 2;
+}
+
+enum Ctrl_WifiSecProt {
+    Open = 0;
+    WEP = 1;
+    WPA_PSK = 2;
+    WPA2_PSK = 3;
+    WPA_WPA2_PSK = 4;
+    WPA2_ENTERPRISE = 5;
+    WPA3_PSK = 6;
+    WPA2_WPA3_PSK = 7;
+}
+
+/* enums for Control path */
+enum Ctrl_Status {
+    Connected = 0;
+    Not_Connected = 1;
+    No_AP_Found = 2;
+    Connection_Fail = 3;
+    Invalid_Argument = 4;
+    Out_Of_Range = 5;
+}
+
+
+enum CtrlMsgType {
+    MsgType_Invalid = 0;
+    Req = 1;
+    Resp = 2;
+    Event = 3;
+    MsgType_Max = 4;
+}
+
+enum CtrlMsgId {
+    MsgId_Invalid = 0;
+
+    /** Request Msgs **/
+    Req_Base = 100;
+
+    Req_GetMACAddress = 101;
+    Req_SetMacAddress = 102;
+    Req_GetWifiMode = 103;
+    Req_SetWifiMode = 104;
+
+    Req_GetAPScanList = 105;
+    Req_GetAPConfig = 106;
+    Req_ConnectAP = 107;
+    Req_DisconnectAP = 108;
+
+    Req_GetSoftAPConfig = 109;
+    Req_SetSoftAPVendorSpecificIE = 110;
+    Req_StartSoftAP = 111;
+    Req_GetSoftAPConnectedSTAList = 112;
+    Req_StopSoftAP = 113;
+
+    Req_SetPowerSaveMode = 114;
+    Req_GetPowerSaveMode = 115;
+
+    Req_OTABegin = 116;
+    Req_OTAWrite = 117;
+    Req_OTAEnd = 118;
+
+    Req_SetWifiMaxTxPower = 119;
+    Req_GetWifiCurrTxPower = 120;
+
+    Req_ConfigHeartbeat = 121;
+    /* Add new control path command response before Req_Max
+     * and update Req_Max */
+    Req_Max = 122;
+
+    /** Response Msgs **/
+    Resp_Base = 200;
+
+    Resp_GetMACAddress = 201;
+    Resp_SetMacAddress = 202;
+    Resp_GetWifiMode = 203;
+    Resp_SetWifiMode = 204;
+
+    Resp_GetAPScanList = 205;
+    Resp_GetAPConfig = 206;
+    Resp_ConnectAP = 207;
+    Resp_DisconnectAP = 208;
+
+    Resp_GetSoftAPConfig = 209;
+    Resp_SetSoftAPVendorSpecificIE = 210;
+    Resp_StartSoftAP = 211;
+    Resp_GetSoftAPConnectedSTAList = 212;
+    Resp_StopSoftAP = 213;
+
+    Resp_SetPowerSaveMode = 214;
+    Resp_GetPowerSaveMode = 215;
+
+    Resp_OTABegin = 216;
+    Resp_OTAWrite = 217;
+    Resp_OTAEnd = 218;
+
+    Resp_SetWifiMaxTxPower = 219;
+    Resp_GetWifiCurrTxPower = 220;
+
+    Resp_ConfigHeartbeat = 221;
+    /* Add new control path command response before Resp_Max
+     * and update Resp_Max */
+    Resp_Max = 222;
+
+    /** Event Msgs **/
+    Event_Base = 300;
+    Event_ESPInit = 301;
+    Event_Heartbeat = 302;
+    Event_StationDisconnectFromAP = 303;
+    Event_StationDisconnectFromESPSoftAP = 304;
+    /* Add new control path command notification before Event_Max
+     * and update Event_Max */
+    Event_Max = 305;
+}
+
+/* internal supporting structures for CtrlMsg */
+message ScanResult {
+    bytes ssid = 1;
+    uint32 chnl = 2;
+    int32 rssi = 3;
+    bytes bssid = 4;
+    Ctrl_WifiSecProt sec_prot = 5;
+}
+
+message ConnectedSTAList {
+    bytes mac = 1;
+    int32 rssi = 2;
+}
+
+
+/* Control path structures */
+/** Req/Resp structure **/
+message CtrlMsg_Req_GetMacAddress {
+    int32 mode = 1;
+}
+
+message CtrlMsg_Resp_GetMacAddress {
+    bytes mac = 1;
+    int32 resp = 2;
+}
+
+message CtrlMsg_Req_GetMode {
+}
+
+message CtrlMsg_Resp_GetMode {
+    int32 mode = 1;
+    int32 resp = 2;
+}
+
+message CtrlMsg_Req_SetMode {
+    int32 mode = 1;
+}
+
+message CtrlMsg_Resp_SetMode {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_GetStatus {
+}
+
+message CtrlMsg_Resp_GetStatus {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_SetMacAddress {
+    bytes mac = 1;
+    int32 mode = 2;
+}
+
+message CtrlMsg_Resp_SetMacAddress {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_GetAPConfig {
+}
+
+message CtrlMsg_Resp_GetAPConfig {
+    bytes ssid = 1;
+    bytes bssid = 2;
+    int32 rssi = 3;
+    int32 chnl = 4;
+    Ctrl_WifiSecProt sec_prot = 5;
+    int32 resp = 6;
+}
+
+message CtrlMsg_Req_ConnectAP {
+    string ssid = 1;
+    string pwd = 2;
+    string bssid = 3;
+    bool is_wpa3_supported = 4;
+    int32 listen_interval = 5;
+}
+
+message  CtrlMsg_Resp_ConnectAP {
+    int32 resp = 1;
+    bytes mac = 2;
+}
+
+message CtrlMsg_Req_GetSoftAPConfig {
+}
+
+message CtrlMsg_Resp_GetSoftAPConfig {
+    bytes ssid = 1;
+    bytes pwd = 2;
+    int32 chnl = 3;
+    Ctrl_WifiSecProt sec_prot = 4;
+    int32 max_conn = 5;
+    bool ssid_hidden = 6;
+    int32 bw = 7;
+    int32 resp = 8;
+}
+
+message CtrlMsg_Req_StartSoftAP {
+    string ssid = 1;
+    string pwd = 2;
+    int32 chnl = 3;
+    Ctrl_WifiSecProt sec_prot = 4;
+    int32 max_conn = 5;
+    bool ssid_hidden = 6;
+    int32 bw = 7;
+}
+
+message CtrlMsg_Resp_StartSoftAP {
+    int32 resp = 1;
+    bytes mac = 2;
+}
+
+message CtrlMsg_Req_ScanResult {
+}
+
+message CtrlMsg_Resp_ScanResult {
+    uint32 count = 1;
+    repeated ScanResult entries = 2;
+    int32 resp = 3;
+}
+
+message CtrlMsg_Req_SoftAPConnectedSTA {
+}
+
+message CtrlMsg_Resp_SoftAPConnectedSTA {
+    uint32 num = 1;
+    repeated ConnectedSTAList stations = 2;
+    int32 resp = 3;
+}
+
+message CtrlMsg_Req_OTABegin {
+}
+
+message CtrlMsg_Resp_OTABegin {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_OTAWrite {
+    bytes ota_data = 1;
+}
+
+message CtrlMsg_Resp_OTAWrite {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_OTAEnd {
+}
+
+message CtrlMsg_Resp_OTAEnd {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_VendorIEData {
+    int32 element_id = 1;
+    int32 length = 2;
+    bytes vendor_oui = 3;
+    int32 vendor_oui_type = 4;
+    bytes payload = 5;
+}
+
+message CtrlMsg_Req_SetSoftAPVendorSpecificIE {
+    bool enable = 1;
+    Ctrl_VendorIEType type = 2;
+    Ctrl_VendorIEID idx = 3;
+    CtrlMsg_Req_VendorIEData vendor_ie_data = 4;
+}
+
+message CtrlMsg_Resp_SetSoftAPVendorSpecificIE {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_SetWifiMaxTxPower {
+    int32 wifi_max_tx_power = 1;
+}
+
+message CtrlMsg_Resp_SetWifiMaxTxPower {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Req_GetWifiCurrTxPower {
+}
+
+message CtrlMsg_Resp_GetWifiCurrTxPower {
+    int32 wifi_curr_tx_power = 1;
+    int32 resp = 2;
+}
+
+message CtrlMsg_Req_ConfigHeartbeat {
+    bool enable = 1;
+    int32 duration = 2;
+}
+
+message CtrlMsg_Resp_ConfigHeartbeat {
+    int32 resp = 1;
+}
+
+/** Event structure **/
+message CtrlMsg_Event_ESPInit {
+    bytes init_data = 1;
+}
+
+message CtrlMsg_Event_Heartbeat {
+    int32 hb_num = 1;
+}
+
+message CtrlMsg_Event_StationDisconnectFromAP {
+    int32 resp = 1;
+}
+
+message CtrlMsg_Event_StationDisconnectFromESPSoftAP {
+    int32 resp = 1;
+    bytes mac = 2;
+}
+
+message CtrlMsg {
+    /* msg_type could be req, resp or Event */
+    CtrlMsgType msg_type = 1;
+
+    /* msg id */
+    CtrlMsgId msg_id = 2;
+
+    /* union of all msg ids */
+    oneof payload {
+        /** Requests **/
+        CtrlMsg_Req_GetMacAddress req_get_mac_address = 101;
+        CtrlMsg_Req_SetMacAddress req_set_mac_address = 102;
+        CtrlMsg_Req_GetMode req_get_wifi_mode = 103;
+        CtrlMsg_Req_SetMode req_set_wifi_mode = 104;
+
+        CtrlMsg_Req_ScanResult req_scan_ap_list = 105;
+        CtrlMsg_Req_GetAPConfig req_get_ap_config = 106;
+        CtrlMsg_Req_ConnectAP req_connect_ap = 107;
+        CtrlMsg_Req_GetStatus req_disconnect_ap = 108;
+
+        CtrlMsg_Req_GetSoftAPConfig req_get_softap_config = 109;
+        CtrlMsg_Req_SetSoftAPVendorSpecificIE req_set_softap_vendor_specific_ie = 110;
+        CtrlMsg_Req_StartSoftAP req_start_softap = 111;
+        CtrlMsg_Req_SoftAPConnectedSTA req_softap_connected_stas_list = 112;
+        CtrlMsg_Req_GetStatus req_stop_softap = 113;
+
+        CtrlMsg_Req_SetMode req_set_power_save_mode = 114;
+        CtrlMsg_Req_GetMode req_get_power_save_mode = 115;
+
+        CtrlMsg_Req_OTABegin req_ota_begin = 116;
+        CtrlMsg_Req_OTAWrite req_ota_write = 117;
+        CtrlMsg_Req_OTAEnd req_ota_end = 118;
+
+        CtrlMsg_Req_SetWifiMaxTxPower req_set_wifi_max_tx_power = 119;
+        CtrlMsg_Req_GetWifiCurrTxPower req_get_wifi_curr_tx_power = 120;
+        CtrlMsg_Req_ConfigHeartbeat req_config_heartbeat = 121;
+
+        /** Responses **/
+        CtrlMsg_Resp_GetMacAddress resp_get_mac_address = 201;
+        CtrlMsg_Resp_SetMacAddress resp_set_mac_address = 202;
+        CtrlMsg_Resp_GetMode resp_get_wifi_mode = 203;
+        CtrlMsg_Resp_SetMode resp_set_wifi_mode = 204;
+
+        CtrlMsg_Resp_ScanResult resp_scan_ap_list = 205;
+        CtrlMsg_Resp_GetAPConfig resp_get_ap_config = 206;
+        CtrlMsg_Resp_ConnectAP resp_connect_ap = 207;
+        CtrlMsg_Resp_GetStatus resp_disconnect_ap = 208;
+
+        CtrlMsg_Resp_GetSoftAPConfig resp_get_softap_config = 209;
+        CtrlMsg_Resp_SetSoftAPVendorSpecificIE resp_set_softap_vendor_specific_ie = 210;
+        CtrlMsg_Resp_StartSoftAP resp_start_softap = 211;
+        CtrlMsg_Resp_SoftAPConnectedSTA resp_softap_connected_stas_list = 212;
+        CtrlMsg_Resp_GetStatus resp_stop_softap = 213;
+
+        CtrlMsg_Resp_SetMode resp_set_power_save_mode = 214;
+        CtrlMsg_Resp_GetMode resp_get_power_save_mode = 215;
+
+        CtrlMsg_Resp_OTABegin resp_ota_begin = 216;
+        CtrlMsg_Resp_OTAWrite resp_ota_write = 217;
+        CtrlMsg_Resp_OTAEnd resp_ota_end = 218;
+        CtrlMsg_Resp_SetWifiMaxTxPower resp_set_wifi_max_tx_power = 219;
+        CtrlMsg_Resp_GetWifiCurrTxPower resp_get_wifi_curr_tx_power = 220;
+        CtrlMsg_Resp_ConfigHeartbeat resp_config_heartbeat = 221;
+
+        /** Notifications **/
+        CtrlMsg_Event_ESPInit event_esp_init = 301;
+        CtrlMsg_Event_Heartbeat event_heartbeat = 302;
+        CtrlMsg_Event_StationDisconnectFromAP event_station_disconnect_from_AP = 303;
+        CtrlMsg_Event_StationDisconnectFromESPSoftAP event_station_disconnect_from_ESP_SoftAP = 304;
+    }
+}
diff --git a/drivers/esp-hosted/esp_hosted_bthci.c b/drivers/esp-hosted/esp_hosted_bthci.c
new file mode 100644
index 0000000000000..003054460d9a6
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_bthci.c
@@ -0,0 +1,149 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted Bluetooth HCI driver.
+ */
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_PY_NETWORK_ESP_HOSTED
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "extmod/mpbthci.h"
+#include "esp_hosted_hal.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)
+
+// Provided by the port, and also possibly shared with the stack.
+extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
+int esp_hosted_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) {
+    // Low-level pins init, memory pool allocation etc...
+    esp_hosted_hal_init(ESP_HOSTED_MODE_BT);
+
+    mp_uint_t start = mp_hal_ticks_ms();
+    // Skip bootloader messages.
+    while ((mp_hal_ticks_ms() - start) < 2500) {
+        if (mp_bluetooth_hci_uart_any()) {
+            mp_bluetooth_hci_uart_readchar();
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+
+    #ifdef MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY
+    mp_bluetooth_hci_uart_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY);
+    #endif
+
+    mp_hal_pin_output(MICROPY_HW_BLE_UART_RTS);
+    mp_hal_pin_write(MICROPY_HW_BLE_UART_RTS, 0);
+
+    // Send reset command
+    // It seems that nothing else is needed for now.
+    return esp_hosted_hci_cmd(OGF_HOST_CTL, OCF_RESET, 0, NULL);
+}
+
+int mp_bluetooth_hci_controller_deinit(void) {
+    esp_hosted_hal_deinit();
+    return 0;
+}
+
+#endif
diff --git a/drivers/esp-hosted/esp_hosted_hal.c b/drivers/esp-hosted/esp_hosted_hal.c
new file mode 100644
index 0000000000000..d8e2e6ece495b
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_hal.c
@@ -0,0 +1,209 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted WiFi HAL.
+ */
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_NETWORK_ESP_HOSTED
+
+#include <stdint.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "modmachine.h"
+#include "extmod/machine_spi.h"
+#include "mpconfigboard.h"
+
+#include "esp_hosted_hal.h"
+#include "esp_hosted_wifi.h"
+
+#ifndef MICROPY_HW_WIFI_IRQ
+#define MICROPY_HW_WIFI_IRQ MICROPY_HW_WIFI_HANDSHAKE
+#endif
+
+STATIC mp_obj_t esp_hosted_pin_irq_callback(mp_obj_t self_in) {
+    extern void mod_network_poll_events(void);
+    mod_network_poll_events();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_hosted_pin_irq_callback_obj, esp_hosted_pin_irq_callback);
+
+MP_WEAK int esp_hosted_hal_init(uint32_t mode) {
+    // Perform a hard reset and set pins to their defaults.
+    esp_hosted_hal_deinit();
+
+    if (mode == ESP_HOSTED_MODE_BT) {
+        // For Bluetooth mode, init is done.
+        return 0;
+    }
+
+    mp_hal_pin_input(MICROPY_HW_WIFI_HANDSHAKE);
+    mp_hal_pin_input(MICROPY_HW_WIFI_DATAREADY);
+
+    // Enable Pin-IRQ for the handshake PIN to call esp_hosted_wifi_poll()
+    mp_obj_t irq_rising_attr[2];
+    mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ, MP_QSTR_IRQ_RISING, irq_rising_attr);
+
+    if (irq_rising_attr[0] != MP_OBJ_NULL && irq_rising_attr[1] == MP_OBJ_NULL) {  // value for IRQ rising found
+        mp_obj_t pin_args[] = {
+            NULL, // Method pointer
+            (mp_obj_t)MICROPY_HW_WIFI_IRQ,   // Pin object
+            (mp_obj_t)&esp_hosted_pin_irq_callback_obj,   // Callback function object
+            NULL,  // The Rising edge value is set below.
+            mp_const_true,  // Hard IRQ, since the actual polling is scheduled.
+        };
+        pin_args[3] = irq_rising_attr[0];
+        mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ, MP_QSTR_irq, pin_args);
+        if (pin_args[0] != MP_OBJ_NULL && pin_args[1] != MP_OBJ_NULL) {
+            mp_call_method_n_kw(3, 0, pin_args);
+        }
+    }
+
+    // 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_OBJ_NEW_QSTR(MP_QSTR_polarity), MP_OBJ_NEW_SMALL_INT(1),
+    };
+
+    MP_STATE_PORT(mp_wifi_spi) =
+        MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, make_new)((mp_obj_t)&machine_spi_type, 2, 1, args);
+
+    // SPI might change the direction/mode of CS pin,
+    // set it to GPIO again just in case.
+    mp_hal_pin_output(MICROPY_HW_WIFI_SPI_CS);
+    mp_hal_pin_write(MICROPY_HW_WIFI_SPI_CS, 1);
+    return 0;
+}
+
+MP_WEAK int esp_hosted_hal_deinit(void) {
+    // Disable Pin-IRQ for the handshake PIN
+    mp_obj_t pin_args[] = {
+        NULL, // Method pointer
+        (mp_obj_t)MICROPY_HW_WIFI_IRQ,   // Pin object
+        mp_const_none  // Set to None
+    };
+    mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ, MP_QSTR_irq, pin_args);
+    if (pin_args[0] && pin_args[1]) {
+        mp_call_method_n_kw(1, 0, pin_args);
+    }
+
+    // Remove all network interfaces and reset wifi state.
+    esp_hosted_wifi_deinit();
+
+    mp_hal_pin_output(MICROPY_HW_ESP_HOSTED_GPIO0);
+    mp_hal_pin_output(MICROPY_HW_ESP_HOSTED_RESET);
+
+    #ifndef MICROPY_HW_ESP_HOSTED_SHARED_PINS
+    mp_hal_pin_output(MICROPY_HW_WIFI_SPI_CS);
+    mp_hal_pin_write(MICROPY_HW_WIFI_SPI_CS, 1);
+    #endif
+
+    // Perform a hard reset
+    mp_hal_pin_write(MICROPY_HW_ESP_HOSTED_GPIO0, 1);
+    mp_hal_pin_write(MICROPY_HW_ESP_HOSTED_RESET, 0);
+    mp_hal_delay_ms(100);
+    mp_hal_pin_write(MICROPY_HW_ESP_HOSTED_RESET, 1);
+    mp_hal_delay_ms(500);
+
+    MP_STATE_PORT(mp_wifi_spi) = MP_OBJ_NULL;
+    return 0;
+}
+
+MP_WEAK int esp_hosted_hal_atomic_enter(void) {
+    #if MICROPY_ENABLE_SCHEDULER
+    mp_sched_lock();
+    #endif
+    return 0;
+}
+
+MP_WEAK int esp_hosted_hal_atomic_exit(void) {
+    #if MICROPY_ENABLE_SCHEDULER
+    mp_sched_unlock();
+    #endif
+    return 0;
+}
+
+MP_WEAK bool esp_hosted_hal_data_ready(void) {
+    return mp_hal_pin_read(MICROPY_HW_WIFI_DATAREADY) && mp_hal_pin_read(MICROPY_HW_WIFI_HANDSHAKE);
+}
+
+MP_WEAK int esp_hosted_hal_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);
+    const mp_machine_spi_p_t *spi_proto = MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, protocol);
+
+    // Wait for handshake pin to go high.
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(1)) {
+        if (mp_hal_pin_read(MICROPY_HW_WIFI_HANDSHAKE)) {
+            break;
+        }
+        if ((mp_hal_ticks_ms() - start) >= 1000) {
+            error_printf("timeout waiting for handshake\n");
+            return -1;
+        }
+    }
+
+    mp_hal_pin_write(MICROPY_HW_WIFI_SPI_CS, 0);
+    mp_hal_delay_us(10);
+    spi_proto->transfer(mp_wifi_spi, size, tx_buf, rx_buf);
+    mp_hal_pin_write(MICROPY_HW_WIFI_SPI_CS, 1);
+    return 0;
+}
+
+MP_WEAK void *esp_hosted_hal_alloc(void *user, size_t size) {
+    (void)user;
+    void *mem = m_malloc0(size);
+    return mem;
+}
+
+MP_WEAK void esp_hosted_hal_free(void *user, void *ptr) {
+    (void)user;
+    m_free(ptr);
+}
+
+MP_WEAK void *esp_hosted_hal_calloc(size_t nmemb, size_t size) {
+    return NULL;
+}
+
+MP_WEAK void *esp_hosted_hal_realloc(void *ptr, size_t size) {
+    return NULL;
+}
+
+// Those are provided for protobuf-c's internally
+// defined allocator, and are not actually used.
+MP_WEAK void *malloc(size_t size) {
+    (void)size;
+    debug_printf("system malloc called\n");
+    return NULL;
+}
+
+MP_WEAK void free(void *ptr) {
+    (void)ptr;
+    debug_printf("system free called\n");
+}
+
+#endif // MICROPY_PY_NETWORK_NINAW10
diff --git a/drivers/esp-hosted/esp_hosted_hal.h b/drivers/esp-hosted/esp_hosted_hal.h
new file mode 100644
index 0000000000000..abf060c8935e1
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_hal.h
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted WiFi HAL.
+ */
+
+#ifndef MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_HAL_H
+#define MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_HAL_H
+
+#ifndef ESP_HOSTED_DEBUG
+#define ESP_HOSTED_DEBUG    (0)
+#endif
+
+#if ESP_HOSTED_DEBUG
+#define PROTOBUF_C_UNPACK_ERROR(...)    error_printf(__VA_ARGS__);
+#endif
+
+#define ANSI_C_RED          "\x1B[31m"
+#define ANSI_C_GREEN        "\x1B[32m"
+#define ANSI_C_YELLOW       "\x1B[33m"
+#define ANSI_C_BLUE         "\x1B[34m"
+#define ANSI_C_MAGENTA      "\x1B[35m"
+#define ANSI_C_CYAN         "\x1B[36m"
+#define ANSI_C_WHITE        "\x1B[37m"
+#define ANSI_C_DEFAULT      "\x1B[0m"
+
+#if ESP_HOSTED_DEBUG
+#define do_printf(...)      mp_printf(&mp_plat_print, __VA_ARGS__)
+#else
+#define do_printf(...)
+#endif
+
+// Logging macros.
+#define debug_printf(...)   do_printf(ANSI_C_BLUE); do_printf(__VA_ARGS__); do_printf(ANSI_C_DEFAULT);
+#define info_printf(...)    do_printf(ANSI_C_GREEN); do_printf(__VA_ARGS__); do_printf(ANSI_C_DEFAULT);
+#define warn_printf(...)    do_printf(ANSI_C_YELLOW); do_printf(__VA_ARGS__); do_printf(ANSI_C_DEFAULT);
+#define error_printf(...)   do_printf(ANSI_C_RED); do_printf(__VA_ARGS__); do_printf(ANSI_C_DEFAULT);
+#define crit_printf(...)    do_printf(ANSI_C_MAGENTA); do_printf(__VA_ARGS__); do_printf(ANSI_C_DEFAULT);
+
+typedef enum {
+    ESP_HOSTED_MODE_BT,
+    ESP_HOSTED_MODE_WIFI,
+} esp_hosted_mode_t;
+
+// HAL functions to be implemented by ports.
+// Note A default machine-based implementation is provided in esp_hosted_hal.c.
+int esp_hosted_hal_init(uint32_t mode);
+int esp_hosted_hal_deinit(void);
+bool esp_hosted_hal_data_ready(void);
+int esp_hosted_hal_atomic_enter(void);
+int esp_hosted_hal_atomic_exit(void);
+int esp_hosted_hal_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size);
+
+// Memory management functions.
+// Note alloc/free need to match the Protobuf allocator signature.
+void *esp_hosted_hal_alloc(void *user, size_t size);
+void esp_hosted_hal_free(void *user, void *ptr);
+void *esp_hosted_hal_calloc(size_t nmemb, size_t size);
+void *esp_hosted_hal_realloc(void *ptr, size_t size);
+#endif // MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_HAL_H
diff --git a/drivers/esp-hosted/esp_hosted_internal.h b/drivers/esp-hosted/esp_hosted_internal.h
new file mode 100644
index 0000000000000..f57cd210a18a5
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_internal.h
@@ -0,0 +1,117 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted internal.
+ */
+
+#ifndef MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_INTERNAL_H
+#define MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_INTERNAL_H
+
+#define ESP_HOSTED_DEBUG            (0)
+
+#define ESP_FRAME_MAX_SIZE          (1600)
+#define ESP_FRAME_MAX_PAYLOAD       (ESP_FRAME_MAX_SIZE - sizeof(esp_header_t))
+#define ESP_FRAME_FLAGS_FRAGMENT    (1 << 0)
+
+#define ESP_STATE_NUM_ITFS          (2)
+#define ESP_STATE_BUF_SIZE          (ESP_FRAME_MAX_SIZE * 2)
+#define ESP_STACK_CAPACITY          (32)
+#define ESP_SYNC_REQ_TIMEOUT        (5000)
+
+#define TLV_HEADER_TYPE_EP          (1)
+#define TLV_HEADER_TYPE_DATA        (2)
+#define TLV_HEADER_EP_RESP          "ctrlResp"
+#define TLV_HEADER_EP_EVENT         "ctrlEvnt"
+
+typedef enum {
+    ESP_HOSTED_FLAGS_RESET          = (0 << 0),
+    ESP_HOSTED_FLAGS_INIT           = (1 << 0),
+    ESP_HOSTED_FLAGS_ACTIVE         = (1 << 1),
+    ESP_HOSTED_FLAGS_STATIC_IP      = (1 << 2),
+    ESP_HOSTED_FLAGS_AP_STARTED     = (1 << 3),
+    ESP_HOSTED_FLAGS_STA_CONNECTED  = (1 << 4),
+} esp_hosted_flags_t;
+
+typedef enum {
+    ESP_PACKET_TYPE_EVENT,
+} esp_hosted_priv_packet_t;
+
+typedef enum {
+    ESP_PRIV_EVENT_INIT,
+} esp_hosted_priv_event_t;
+
+typedef struct esp_hosted_stack {
+    size_t capacity;
+    size_t top;
+    void *buff[ESP_STACK_CAPACITY];
+} esp_hosted_stack_t;
+
+typedef struct esp_hosted_state {
+    uint8_t chip_id;
+    uint8_t spi_clk;
+    uint8_t chip_flags;
+    uint8_t flags;
+    uint16_t seq_num;
+    uint32_t last_hb_ms;
+    struct netif netif[ESP_STATE_NUM_ITFS];
+    struct dhcp dhcp_client;
+    dhcp_server_t dhcp_server;
+    esp_hosted_stack_t stack;
+    uint8_t buf[ESP_STATE_BUF_SIZE];
+} esp_hosted_state_t;
+
+typedef struct __attribute__((packed)) {
+    uint8_t ep_type;
+    uint16_t ep_length;
+    uint8_t ep_value[8];
+    uint8_t data_type;
+    uint16_t data_length;
+    uint8_t data[];
+} tlv_header_t;
+
+typedef struct __attribute__((packed)) {
+    uint8_t event_type;
+    uint8_t event_len;
+    uint8_t event_data[];
+} esp_event_t;
+
+typedef struct __attribute__((packed)) {
+    uint8_t if_type    : 4;
+    uint8_t if_num     : 4;
+    uint8_t flags;
+    uint16_t len;
+    uint16_t offset;
+    uint16_t checksum;
+    uint16_t seq_num;
+    uint8_t reserved2;
+    union {
+        uint8_t hci_pkt_type;
+        uint8_t priv_pkt_type;
+    };
+    uint8_t payload[];
+} esp_header_t;
+
+uint16_t esp_hosted_checksum(esp_header_t *esp_header);
+#endif // MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_INTERNAL_H
diff --git a/drivers/esp-hosted/esp_hosted_netif.c b/drivers/esp-hosted/esp_hosted_netif.c
new file mode 100644
index 0000000000000..b471c3ad4c200
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_netif.c
@@ -0,0 +1,167 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted LWIP netif functions.
+ */
+
+#include "py/mphal.h"
+#include "py/mperrno.h"
+
+#if MICROPY_PY_NETWORK_ESP_HOSTED
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "lwip/err.h"
+#include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "netif/etharp.h"
+
+#include "shared/netutils/netutils.h"
+#include "shared/netutils/dhcpserver.h"
+
+#include "esp_hosted_hal.h"
+#include "esp_hosted_wifi.h"
+#include "esp_hosted_netif.h"
+#include "esp_hosted_internal.h"
+
+static err_t netif_struct_init(struct netif *netif) {
+    netif->linkoutput = esp_hosted_netif_output;
+    netif->output = etharp_output;
+    netif->mtu = 1500;
+    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP;
+    esp_hosted_wifi_get_mac(netif->name[1] - '0', netif->hwaddr);
+    netif->hwaddr_len = sizeof(netif->hwaddr);
+    info_printf("netif_init() netif initialized\n");
+    return ERR_OK;
+}
+
+int esp_hosted_netif_init(esp_hosted_state_t *state, uint32_t itf) {
+    struct netif *netif = &state->netif[itf];
+
+    ip_addr_t ipconfig[4];
+    ipconfig[0].addr = 0;
+    ipconfig[1].addr = 0;
+    ipconfig[2].addr = 0;
+    ipconfig[3].addr = 0;
+
+    if (itf == ESP_HOSTED_AP_IF) {
+        ipconfig[0].addr = PP_HTONL(ESP_HOSTED_AP_ADDRESS);
+        ipconfig[1].addr = PP_HTONL(ESP_HOSTED_AP_NETMASK);
+        ipconfig[2].addr = PP_HTONL(ESP_HOSTED_AP_GATEWAY);
+    }
+
+    netif->name[0] = 'w';
+    netif->name[1] = '0' + itf;
+
+    netif_add(netif, ip_2_ip4(&ipconfig[0]), ip_2_ip4(&ipconfig[1]),
+        ip_2_ip4(&ipconfig[2]), state, netif_struct_init, ethernet_input);
+
+    netif_set_hostname(netif, ESP_HOSTED_HOSTNAME);
+    netif_set_default(netif);
+    netif_set_up(netif);
+    netif_set_link_up(netif);
+    dns_setserver(0, &ipconfig[3]);
+
+    if (itf == ESP_HOSTED_STA_IF) {
+        dhcp_set_struct(netif, &state->dhcp_client);
+        dhcp_start(netif);
+    } else {
+        dhcp_server_init(&state->dhcp_server, &ipconfig[0], &ipconfig[1]);
+    }
+    return 0;
+}
+
+int esp_hosted_netif_deinit(esp_hosted_state_t *state, uint32_t itf) {
+    struct netif *netif = &state->netif[itf];
+
+    if (netif_is_link_up(netif)) {
+        if (itf == ESP_HOSTED_STA_IF) {
+            dhcp_stop(netif);
+        } else {
+            dhcp_server_deinit(&state->dhcp_server);
+        }
+    }
+
+    for (struct netif *netifp = netif_list; netif != NULL; netif = netif->next) {
+        if (netif == netifp) {
+            netif_remove(netif);
+            netif->flags = 0;
+            return 0;
+        }
+    }
+
+    return -1;
+}
+
+int esp_hosted_netif_input(esp_hosted_state_t *state, uint32_t itf, const void *buf, size_t len) {
+    struct netif *netif = &state->netif[itf];
+
+    struct pbuf *p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
+    if (p == NULL) {
+        error_printf("esp_hosted_netif_input() failed to alloc pbuf %d\n", len);
+        return -1;
+    }
+    // Copy buf to pbuf
+    pbuf_take(p, buf, len);
+
+    if (netif->input(p, netif) != ERR_OK) {
+        error_printf("esp_hosted_netif_input() netif input failed\n");
+        pbuf_free(p);
+        return -1;
+    }
+
+    debug_printf("esp_hosted_netif_input() eth frame input %d\n", len);
+    return 0;
+}
+
+err_t esp_hosted_netif_output(struct netif *netif, struct pbuf *p) {
+    esp_hosted_state_t *state = netif->state;
+
+    if (p->tot_len > ESP_FRAME_MAX_PAYLOAD) {
+        error_printf("esp_hosted_netif_output() pbuf len > SPI buf len\n");
+        return ERR_IF;
+    }
+
+    esp_header_t *esp_header = (esp_header_t *)(state->buf);
+    esp_header->if_type = netif->name[1] - '0';
+    esp_header->if_num = 0;
+    esp_header->flags = 0;
+    esp_header->len = p->tot_len;
+    esp_header->offset = sizeof(esp_header_t);
+    esp_header->seq_num = 0;
+    pbuf_copy_partial(p, esp_header->payload, p->tot_len, 0);
+    esp_header->checksum = esp_hosted_checksum(esp_header);
+
+    size_t frame_size = (sizeof(esp_header_t) + esp_header->len + 3) & ~3U;
+    if (esp_hosted_hal_spi_transfer(state->buf, NULL, frame_size) != 0) {
+        error_printf("esp_hosted_netif_output() failed to send eth frame\n");
+        return ERR_IF;
+    }
+    debug_printf("esp_hosted_netif_output() if %d pbuf len %d\n", esp_header->if_type, esp_header->len);
+    return ERR_OK;
+}
+#endif
diff --git a/drivers/esp-hosted/esp_hosted_netif.h b/drivers/esp-hosted/esp_hosted_netif.h
new file mode 100644
index 0000000000000..656f90d313e5b
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_netif.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted LWIP netif functions.
+ */
+
+#ifndef MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_NETIF_H
+#define MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_NETIF_H
+
+typedef struct esp_hosted_state esp_hosted_state_t;
+int esp_hosted_netif_init(esp_hosted_state_t *state, uint32_t itf);
+int esp_hosted_netif_deinit(esp_hosted_state_t *state, uint32_t itf);
+int esp_hosted_netif_input(esp_hosted_state_t *state, uint32_t itf, const void *buf, size_t len);
+err_t esp_hosted_netif_output(struct netif *netif, struct pbuf *p);
+
+#endif // MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_NETIF_H
diff --git a/drivers/esp-hosted/esp_hosted_stack.h b/drivers/esp-hosted/esp_hosted_stack.h
new file mode 100644
index 0000000000000..8fa45cc43b412
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_stack.h
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * Simple stack for control messages.
+ */
+
+#ifndef MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_STACK_H
+#define MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_STACK_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include "esp_hosted_internal.h"
+
+static inline void esp_hosted_stack_init(esp_hosted_stack_t *stack) {
+    stack->capacity = ESP_STACK_CAPACITY;
+    stack->top = 0;
+}
+
+static inline bool esp_hosted_stack_empty(esp_hosted_stack_t *stack) {
+    return stack->top == 0;
+}
+
+static inline bool esp_hosted_stack_push(esp_hosted_stack_t *stack, void *data) {
+    if (stack->top < stack->capacity) {
+        stack->buff[stack->top++] = data;
+        return true;
+    }
+    return false;
+}
+
+static inline void *esp_hosted_stack_pop(esp_hosted_stack_t *stack, bool peek) {
+    void *data = NULL;
+    if (stack->top > 0) {
+        data = stack->buff[stack->top - 1];
+        if (!peek) {
+            stack->top -= 1;
+        }
+    }
+    return data;
+}
+#endif // MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_STACK_H
diff --git a/drivers/esp-hosted/esp_hosted_wifi.c b/drivers/esp-hosted/esp_hosted_wifi.c
new file mode 100644
index 0000000000000..3cc153205c972
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_wifi.c
@@ -0,0 +1,697 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted WiFi driver.
+ */
+
+#include "py/mphal.h"
+#include "py/mperrno.h"
+
+#if MICROPY_PY_NETWORK_ESP_HOSTED
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "lwip/err.h"
+#include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "netif/etharp.h"
+
+#include "shared/netutils/netutils.h"
+#include "shared/netutils/dhcpserver.h"
+
+#include "esp_hosted.pb-c.h"
+
+#include "esp_hosted_hal.h"
+#include "esp_hosted_stack.h"
+#include "esp_hosted_netif.h"
+#include "esp_hosted_wifi.h"
+#include "esp_hosted_internal.h"
+
+static esp_hosted_state_t esp_state;
+
+static ProtobufCAllocator protobuf_alloc = {
+    .alloc = &esp_hosted_hal_alloc,
+    .free = &esp_hosted_hal_free,
+    .allocator_data = NULL,
+};
+
+static void esp_hosted_macstr_to_bytes(const uint8_t *mac_str, size_t mac_len, uint8_t *mac_out) {
+    uint8_t byte = 0;
+    for (int i = 0; i < mac_len; i++) {
+        char c = mac_str[i];
+        if (c >= '0' && c <= '9') {
+            byte = (byte << 4) | (c - '0');
+        } else if (c >= 'a' && c <= 'f') {
+            byte = (byte << 4) | (c - 'a' + 10);
+        } else if (c >= 'A' && c <= 'F') {
+            byte = (byte << 4) | (c - 'A' + 10);
+        }
+        if (c == ':' || (i + 1) == mac_len) {
+            *mac_out++ = byte;
+            byte = 0;
+        }
+    }
+}
+
+// to avoid bleeding the protocol buffer API into the public interface, convert esp_hosted_security_t
+// to/from CtrlWifiSecProt here.
+
+static esp_hosted_security_t sec_prot_to_hosted_security(CtrlWifiSecProt sec_prot)
+{
+    switch (sec_prot) {
+    case CTRL__WIFI_SEC_PROT__Open:
+        return ESP_HOSTED_SEC_OPEN;
+    case CTRL__WIFI_SEC_PROT__WEP:
+        return ESP_HOSTED_SEC_WEP;
+    case CTRL__WIFI_SEC_PROT__WPA_PSK:
+        return ESP_HOSTED_SEC_WPA_PSK;
+    case CTRL__WIFI_SEC_PROT__WPA2_PSK:
+        return ESP_HOSTED_SEC_WPA2_PSK;
+    case CTRL__WIFI_SEC_PROT__WPA_WPA2_PSK:
+        return ESP_HOSTED_SEC_WPA_WPA2_PSK;
+    case CTRL__WIFI_SEC_PROT__WPA2_ENTERPRISE:
+        return ESP_HOSTED_SEC_WPA2_ENTERPRISE;
+    case CTRL__WIFI_SEC_PROT__WPA3_PSK:
+        return ESP_HOSTED_SEC_WPA3_PSK;
+    case CTRL__WIFI_SEC_PROT__WPA2_WPA3_PSK:
+        return ESP_HOSTED_SEC_WPA2_WPA3_PSK;
+    default:
+        return ESP_HOSTED_SEC_INVALID;
+    }
+}
+
+static CtrlWifiSecProt hosted_security_to_sec_prot(esp_hosted_security_t hosted_security)
+{
+    switch (hosted_security) {
+    case ESP_HOSTED_SEC_OPEN:
+        return CTRL__WIFI_SEC_PROT__Open;
+    case ESP_HOSTED_SEC_WEP:
+        return CTRL__WIFI_SEC_PROT__WEP;
+    case ESP_HOSTED_SEC_WPA_PSK:
+        return CTRL__WIFI_SEC_PROT__WPA_PSK;
+    case ESP_HOSTED_SEC_WPA2_PSK:
+        return CTRL__WIFI_SEC_PROT__WPA2_PSK;
+    case ESP_HOSTED_SEC_WPA_WPA2_PSK:
+        return CTRL__WIFI_SEC_PROT__WPA_WPA2_PSK;
+    case ESP_HOSTED_SEC_WPA2_ENTERPRISE:
+        return CTRL__WIFI_SEC_PROT__WPA2_ENTERPRISE;
+    case ESP_HOSTED_SEC_WPA3_PSK:
+        return CTRL__WIFI_SEC_PROT__WPA3_PSK;
+    case ESP_HOSTED_SEC_WPA2_WPA3_PSK:
+        return CTRL__WIFI_SEC_PROT__WPA2_WPA3_PSK;
+    default:
+        abort(); // Range should be checked by the caller, making this unreachable
+    }
+}
+
+uint16_t esp_hosted_checksum(esp_header_t *esp_header) {
+    uint16_t checksum = 0;
+    esp_header->checksum = 0;
+    uint8_t *buf = (uint8_t *)esp_header;
+    for (size_t i = 0; i < (esp_header->len + sizeof(esp_header_t)); i++) {
+        checksum += buf[i];
+    }
+    return checksum;
+}
+
+#if ESP_HOSTED_DEBUG
+static void esp_hosted_dump_header(esp_header_t *esp_header) {
+    static const char *if_strs[] = { "STA", "AP", "SERIAL", "HCI", "PRIV", "TEST" };
+    if (esp_header->if_type > ESP_HOSTED_MAX_IF) {
+        return;
+    }
+    debug_printf("esp header: if %s_IF length %d offset %d checksum %d seq %d flags %x\n",
+        if_strs[esp_header->if_type], esp_header->len, esp_header->offset,
+        esp_header->checksum, esp_header->seq_num, esp_header->flags);
+
+    if (esp_header->if_type == ESP_HOSTED_SERIAL_IF) {
+        tlv_header_t *tlv_header = (tlv_header_t *)(esp_header->payload);
+        debug_printf("tlv header: ep_type %d ep_length %d ep_value %.8s data_type %d data_length %d\n",
+            tlv_header->ep_type, tlv_header->ep_length,
+            tlv_header->ep_value, tlv_header->data_type, tlv_header->data_length);
+    }
+}
+#endif
+
+static int32_t esp_hosted_resp_value(CtrlMsg *ctrl_msg) {
+    // Each response struct return value is located at a different offset,
+    // the following array maps response CtrlMsgs to return values (resp)
+    // offsets within each response struct.
+    const static size_t ctrl_msg_resp_offset[] = {
+        offsetof(CtrlMsgRespGetMacAddress, resp),
+        offsetof(CtrlMsgRespSetMacAddress, resp),
+        offsetof(CtrlMsgRespGetMode, resp),
+        offsetof(CtrlMsgRespSetMode, resp),
+        offsetof(CtrlMsgRespScanResult, resp),
+        offsetof(CtrlMsgRespGetAPConfig, resp),
+        offsetof(CtrlMsgRespConnectAP, resp),
+        offsetof(CtrlMsgRespGetStatus, resp),
+        offsetof(CtrlMsgRespGetSoftAPConfig, resp),
+        offsetof(CtrlMsgRespSetSoftAPVendorSpecificIE, resp),
+        offsetof(CtrlMsgRespStartSoftAP, resp),
+        offsetof(CtrlMsgRespSoftAPConnectedSTA, resp),
+        offsetof(CtrlMsgRespGetStatus, resp),
+        offsetof(CtrlMsgRespSetMode, resp),
+        offsetof(CtrlMsgRespGetMode, resp),
+        offsetof(CtrlMsgRespOTABegin, resp),
+        offsetof(CtrlMsgRespOTAWrite, resp),
+        offsetof(CtrlMsgRespOTAEnd, resp),
+        offsetof(CtrlMsgRespSetWifiMaxTxPower, resp),
+        offsetof(CtrlMsgRespGetWifiCurrTxPower, resp),
+        offsetof(CtrlMsgRespConfigHeartbeat, resp),
+    };
+
+    int32_t resp = -1;
+    size_t index = ctrl_msg->msg_id - CTRL_MSG_ID__Resp_Base;
+
+    // All types of messages share the same payload base address.
+    if (ctrl_msg->resp_get_mac_address != NULL &&
+        ctrl_msg->msg_type == CTRL_MSG_TYPE__Resp &&
+        index > 0 && index <= MP_ARRAY_SIZE(ctrl_msg_resp_offset)) {
+        // Return the response struct's return value.
+        size_t offset = ctrl_msg_resp_offset[index - 1];
+        resp = *((int32_t *)((char *)ctrl_msg->resp_get_mac_address + offset));
+    }
+    return resp;
+}
+
+static int esp_hosted_request(CtrlMsgId msg_id, void *ctrl_payload) {
+    CtrlMsg ctrl_msg = {0};
+    ctrl_msg__init(&ctrl_msg);
+    ctrl_msg.msg_id = msg_id;
+    ctrl_msg.payload_case = msg_id;
+
+    // All types of messages share the same payload base address.
+    ctrl_msg.req_get_mac_address = ctrl_payload;
+
+    // Pack protobuf
+    size_t payload_size = ctrl_msg__get_packed_size(&ctrl_msg);
+    if ((payload_size + sizeof(tlv_header_t)) > ESP_FRAME_MAX_PAYLOAD) {
+        error_printf("esp_hosted_request() payload size > max payload %d\n", msg_id);
+        return -1;
+    }
+
+    esp_header_t *esp_header = (esp_header_t *)(esp_state.buf);
+    tlv_header_t *tlv_header = (tlv_header_t *)(esp_header->payload);
+
+    esp_header->if_type = ESP_HOSTED_SERIAL_IF;
+    esp_header->if_num = 0;
+    esp_header->flags = 0;
+    esp_header->len = payload_size + sizeof(tlv_header_t);
+    esp_header->offset = sizeof(esp_header_t);
+    esp_header->seq_num = esp_state.seq_num++;
+
+    tlv_header->ep_type = TLV_HEADER_TYPE_EP;
+    tlv_header->ep_length = 8;
+    memcpy(tlv_header->ep_value, TLV_HEADER_EP_RESP, 8);
+    tlv_header->data_type = TLV_HEADER_TYPE_DATA;
+    tlv_header->data_length = payload_size;
+    ctrl_msg__pack(&ctrl_msg, tlv_header->data);
+    esp_header->checksum = esp_hosted_checksum(esp_header);
+
+    size_t frame_size = (sizeof(esp_header_t) + esp_header->len + 3) & ~3U;
+    if (esp_hosted_hal_spi_transfer(esp_state.buf, NULL, frame_size) != 0) {
+        error_printf("esp_hosted_request() request %d failed\n", msg_id);
+        return -1;
+    }
+    return 0;
+}
+
+static CtrlMsg *esp_hosted_response(CtrlMsgId msg_id, uint32_t timeout) {
+    CtrlMsg *ctrl_msg = NULL;
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
+        if (!esp_hosted_stack_empty(&esp_state.stack)) {
+            ctrl_msg = esp_hosted_stack_pop(&esp_state.stack, true);
+            if (ctrl_msg->msg_id == msg_id) {
+                ctrl_msg = esp_hosted_stack_pop(&esp_state.stack, false);
+                break;
+            }
+
+            debug_printf("esp_hosted_response() waiting for id %lu last id %lu\n", msg_id, ctrl_msg->msg_id);
+            ctrl_msg = NULL;
+        }
+
+        if (timeout == 0) {
+            // Request expected a sync response.
+            return NULL;
+        }
+
+        // Check timeout.
+        if ((mp_hal_ticks_ms() - start) >= timeout) {
+            return NULL;
+        }
+
+        MICROPY_EVENT_POLL_HOOK
+    }
+
+    // If message type is a response, check the response struct's return value.
+    if (ctrl_msg->msg_type == CTRL_MSG_TYPE__Resp && esp_hosted_resp_value(ctrl_msg) != 0) {
+        error_printf("esp_hosted_response() response %d failed %d\n", msg_id, esp_hosted_resp_value(ctrl_msg));
+        ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+        return NULL;
+    }
+
+    return ctrl_msg;
+}
+
+static int esp_hosted_ctrl(CtrlMsgId req_id, void *req_payload, CtrlMsg **resp_msg) {
+    if (esp_hosted_request(req_id, req_payload) != 0) {
+        return -1;
+    }
+    uint32_t resp_id = (req_id - CTRL_MSG_ID__Req_Base) + CTRL_MSG_ID__Resp_Base;
+    if ((*resp_msg = esp_hosted_response(resp_id, ESP_SYNC_REQ_TIMEOUT)) == NULL) {
+        return -1;
+    }
+    return 0;
+}
+
+int esp_hosted_wifi_poll(void) {
+    size_t offset = 0;
+    esp_header_t *esp_header = (esp_header_t *)(esp_state.buf);
+    tlv_header_t *tlv_header = (tlv_header_t *)(esp_header->payload);
+
+    if (!(esp_state.flags & ESP_HOSTED_FLAGS_INIT) || !esp_hosted_hal_data_ready()) {
+        return 0;
+    }
+
+    do {
+        esp_header_t *frag_header = (esp_header_t *)(esp_state.buf + offset);
+        if ((ESP_STATE_BUF_SIZE - offset) < ESP_FRAME_MAX_SIZE) {
+            // This shouldn't happen, but if it did stop polling.
+            error_printf("esp_hosted_poll() spi buffer overflow offs %d\n", offset);
+            return -1;
+        }
+
+        if (esp_hosted_hal_spi_transfer(NULL, esp_state.buf + offset, ESP_FRAME_MAX_SIZE) != 0) {
+            error_printf("esp_hosted_poll() spi transfer failed\n");
+            return 0;
+        }
+
+        if (frag_header->len == 0 ||
+            frag_header->len > ESP_FRAME_MAX_PAYLOAD ||
+            frag_header->offset != sizeof(esp_header_t)) {
+            // Invalid or empty packet, just ignore it silently.
+            warn_printf("esp_hosted_poll() invalid frame size %d offset %d\n",
+                esp_header->len, esp_header->offset);
+            return 0;
+        }
+
+        uint16_t checksum = frag_header->checksum;
+        frag_header->checksum = esp_hosted_checksum(frag_header);
+        if (frag_header->checksum != checksum) {
+            warn_printf("esp_hosted_poll() invalid checksum, expected %d\n", checksum);
+            return 0;
+        }
+
+        if (offset) {
+            // Combine fragmented packet
+            if ((esp_header->seq_num + 1) != frag_header->seq_num) {
+                error_printf("esp_hosted_poll() fragmented frame sequence mismatch\n");
+                return 0;
+            }
+            esp_header->len += frag_header->len;
+            esp_header->seq_num = frag_header->seq_num;
+            esp_header->flags = frag_header->flags;
+            info_printf("esp_hosted_poll() received fragmented packet %d\n", frag_header->len);
+            // Append the current fragment's payload to the previous one.
+            memcpy(esp_state.buf + offset, frag_header->payload, frag_header->len);
+        }
+
+        offset = sizeof(esp_header_t) + esp_header->len;
+    } while ((esp_header->flags & ESP_FRAME_FLAGS_FRAGMENT));
+
+    #if ESP_HOSTED_DEBUG
+    esp_hosted_dump_header(esp_header);
+    #endif
+
+    switch (esp_header->if_type) {
+        case ESP_HOSTED_STA_IF:
+        case ESP_HOSTED_AP_IF: {
+            // Networking traffic
+            uint32_t itf = esp_header->if_type;
+            if (netif_is_link_up(&esp_state.netif[itf])) {
+                if (esp_hosted_netif_input(&esp_state, itf, esp_header->payload, esp_header->len) != 0) {
+                    error_printf("esp_hosted_poll() netif input failed\n");
+                    return -1;
+                }
+                debug_printf("esp_hosted_poll() eth frame input %d\n", esp_header->len);
+            }
+            return 0;
+        }
+        case ESP_HOSTED_PRIV_IF: {
+            esp_event_t *priv_event = (esp_event_t *)(esp_header->payload);
+            if (esp_header->priv_pkt_type == ESP_PACKET_TYPE_EVENT &&
+                priv_event->event_type == ESP_PRIV_EVENT_INIT) {
+                esp_state.chip_id = priv_event->event_data[2];
+                esp_state.spi_clk = priv_event->event_data[5];
+                esp_state.chip_flags = priv_event->event_data[8];
+                info_printf("esp_hosted_poll() chip id %d spi_mhz %d caps 0x%x\n",
+                    esp_state.chip_id, esp_state.spi_clk, esp_state.chip_flags);
+            }
+            return 0;
+        }
+        case ESP_HOSTED_HCI_IF:
+        case ESP_HOSTED_TEST_IF:
+        case ESP_HOSTED_MAX_IF:
+            error_printf("esp_hosted_poll() unexpected interface type %d\n", esp_header->if_type);
+            return 0;
+        case ESP_HOSTED_SERIAL_IF:
+            // Requires further processing
+            break;
+    }
+
+    CtrlMsg *ctrl_msg = ctrl_msg__unpack(&protobuf_alloc, tlv_header->data_length, tlv_header->data);
+    if (ctrl_msg == NULL) {
+        error_printf("esp_hosted_poll() failed to unpack protobuf\n");
+        return 0;
+    }
+
+    if (ctrl_msg->msg_type == CTRL_MSG_TYPE__Event) {
+        switch (ctrl_msg->msg_id) {
+            case CTRL_MSG_ID__Event_ESPInit:
+                esp_state.flags |= ESP_HOSTED_FLAGS_ACTIVE;
+                break;
+            case CTRL_MSG_ID__Event_Heartbeat:
+                esp_state.last_hb_ms = mp_hal_ticks_ms();
+                info_printf("esp_hosted_poll() heartbeat %lu\n", esp_state.last_hb_ms);
+                return 0;
+            case CTRL_MSG_ID__Event_StationDisconnectFromAP:
+                esp_state.flags &= ~ESP_HOSTED_FLAGS_STA_CONNECTED;
+                return 0;
+            case CTRL_MSG_ID__Event_StationDisconnectFromESPSoftAP:
+                return 0;
+            default:
+                error_printf("esp_hosted_poll() unexpected event %d\n", ctrl_msg->msg_id);
+                return 0;
+        }
+    }
+
+    // Responses that should be handled here.
+    if (ctrl_msg->msg_type == CTRL_MSG_TYPE__Resp) {
+        switch (ctrl_msg->msg_id) {
+            case CTRL_MSG_ID__Resp_ConnectAP: {
+                if (esp_hosted_resp_value(ctrl_msg) == 0) {
+                    esp_state.flags |= ESP_HOSTED_FLAGS_STA_CONNECTED;
+                }
+                ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+                debug_printf("esp_hosted_poll() state %d\n", esp_state.flags);
+                return 0;
+            }
+            default:
+                break;
+        }
+    }
+
+    // A control message resp/event will be pushed on the stack for further processing.
+    if (!esp_hosted_stack_push(&esp_state.stack, ctrl_msg)) {
+        error_printf("esp_hosted_poll() message stack full\n");
+        return -1;
+    }
+
+    debug_printf("esp_hosted_poll() pushed msg_type %lu msg_id %lu\n", ctrl_msg->msg_type, ctrl_msg->msg_id);
+    return 0;
+}
+
+int esp_hosted_wifi_init(uint32_t itf) {
+    if (esp_state.flags == ESP_HOSTED_FLAGS_RESET) {
+        // Init state
+        memset(&esp_state, 0, sizeof(esp_hosted_state_t));
+        esp_hosted_stack_init(&esp_state.stack);
+
+        // Low-level pins and SPI init, memory pool allocation etc...
+        if (esp_hosted_hal_init(ESP_HOSTED_MODE_WIFI) != 0) {
+            return -1;
+        }
+
+        // Allow polling the bus.
+        esp_state.flags |= ESP_HOSTED_FLAGS_INIT;
+
+        CtrlMsg *ctrl_msg = NULL;
+
+        // Wait for an ESPInit control event.
+        ctrl_msg = esp_hosted_response(CTRL_MSG_ID__Event_ESPInit, ESP_SYNC_REQ_TIMEOUT);
+        if (ctrl_msg == NULL) {
+            return -1;
+        }
+        ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+
+        // Set WiFi mode to STA/AP.
+        CtrlMsgReqSetMode ctrl_payload;
+        ctrl_msg__req__set_mode__init(&ctrl_payload);
+        ctrl_payload.mode = CTRL__WIFI_MODE__APSTA;
+        if (esp_hosted_ctrl(CTRL_MSG_ID__Req_SetWifiMode, &ctrl_payload, &ctrl_msg) != 0) {
+            return -1;
+        }
+        ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+
+        info_printf("esp_hosted_init() device initialized\n");
+    }
+
+    if (!netif_is_link_up(&esp_state.netif[itf])) {
+        // Init lwip netif, and start DHCP client/server.
+        esp_hosted_netif_init(&esp_state, itf);
+        info_printf("esp_hosted_init() initialized itf %lu\n", itf);
+    }
+    return 0;
+}
+
+int esp_hosted_wifi_disable(uint32_t itf) {
+    // Remove netif
+    esp_hosted_netif_deinit(&esp_state, itf);
+
+    if (itf == ESP_HOSTED_STA_IF) {
+        esp_state.flags &= ~ESP_HOSTED_FLAGS_STA_CONNECTED;
+    } else {
+        esp_state.flags &= ~ESP_HOSTED_FLAGS_AP_STARTED;
+    }
+
+    info_printf("esp_hosted_deinit() deinitialized itf %lu\n", itf);
+    return 0;
+}
+
+int esp_hosted_wifi_deinit(void) {
+    if (esp_state.flags & ESP_HOSTED_FLAGS_INIT) {
+        // Remove network interfaces
+        esp_hosted_wifi_disable(ESP_HOSTED_STA_IF);
+        esp_hosted_wifi_disable(ESP_HOSTED_AP_IF);
+
+        // Reset state
+        memset(&esp_state, 0, sizeof(esp_hosted_state_t));
+        esp_hosted_stack_init(&esp_state.stack);
+
+        info_printf("esp_hosted_deinit() deinitialized\n");
+    }
+    return 0;
+}
+
+void *esp_hosted_wifi_get_netif(uint32_t itf) {
+    return &esp_state.netif[itf];
+}
+
+int esp_hosted_wifi_get_mac(int itf, uint8_t *mac) {
+    CtrlMsgReqGetMacAddress ctrl_payload;
+    ctrl_msg__req__get_mac_address__init(&ctrl_payload);
+    ctrl_payload.mode = (itf == ESP_HOSTED_STA_IF) ? CTRL__WIFI_MODE__STA : CTRL__WIFI_MODE__AP;
+
+    CtrlMsg *ctrl_msg = NULL;
+    if (esp_hosted_ctrl(CTRL_MSG_ID__Req_GetMACAddress, &ctrl_payload, &ctrl_msg) != 0) {
+        error_printf("esp_hosted_get_mac() request failed\n");
+        return -1;
+    }
+
+    ProtobufCBinaryData macstr = ctrl_msg->resp_get_mac_address->mac;
+    if (macstr.data) {
+        esp_hosted_macstr_to_bytes(macstr.data, macstr.len, mac);
+    }
+    ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+    return 0;
+}
+
+int esp_hosted_wifi_connect(const char *ssid, const char *bssid, esp_hosted_security_t security, const char *key, uint16_t channel) {
+    CtrlMsgReqConnectAP ctrl_payload;
+    ctrl_msg__req__connect_ap__init(&ctrl_payload);
+
+    if (security >= ESP_HOSTED_SEC_MAX) {
+        // Note: this argument is otherwise unused(!)
+        return -1;
+    }
+
+    ctrl_payload.ssid = (char *)ssid;
+    ctrl_payload.bssid = (char *)bssid;
+    ctrl_payload.pwd = (char *)key;
+    ctrl_payload.is_wpa3_supported = false;
+    ctrl_payload.listen_interval = 0;
+
+    if (esp_hosted_request(CTRL_MSG_ID__Req_ConnectAP, &ctrl_payload) != 0) {
+        return -1;
+    }
+    return 0;
+}
+
+int esp_hosted_wifi_start_ap(const char *ssid, esp_hosted_security_t security, const char *key, uint16_t channel) {
+    CtrlMsgReqStartSoftAP ctrl_payload;
+    ctrl_msg__req__start_soft_ap__init(&ctrl_payload);
+
+    if (security >= ESP_HOSTED_SEC_MAX) {
+        return -1;
+    }
+
+    ctrl_payload.ssid = (char *)ssid;
+    ctrl_payload.pwd = (char *)key;
+    ctrl_payload.chnl = channel;
+    ctrl_payload.sec_prot = hosted_security_to_sec_prot(security);
+    ctrl_payload.max_conn = ESP_HOSTED_MAX_AP_CLIENTS;
+    ctrl_payload.ssid_hidden = false;
+    ctrl_payload.bw = CTRL__WIFI_BW__HT40;
+
+    CtrlMsg *ctrl_msg = NULL;
+    if (esp_hosted_ctrl(CTRL_MSG_ID__Req_StartSoftAP, &ctrl_payload, &ctrl_msg) != 0) {
+        return -1;
+    }
+    ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+    esp_state.flags |= ESP_HOSTED_FLAGS_AP_STARTED;
+    return 0;
+}
+
+int esp_hosted_wifi_disconnect(uint32_t itf) {
+    CtrlMsg *ctrl_msg = NULL;
+    CtrlMsgReqGetStatus ctrl_payload;
+    ctrl_msg__req__get_status__init(&ctrl_payload);
+
+    if (itf == ESP_HOSTED_STA_IF) {
+        esp_state.flags &= ~ESP_HOSTED_FLAGS_STA_CONNECTED;
+        if (esp_hosted_ctrl(CTRL_MSG_ID__Req_DisconnectAP, &ctrl_payload, &ctrl_msg) != 0) {
+            return -1;
+        }
+    } else {
+        esp_state.flags &= ~ESP_HOSTED_FLAGS_AP_STARTED;
+        if (esp_hosted_ctrl(CTRL_MSG_ID__Req_StopSoftAP, &ctrl_payload, &ctrl_msg) != 0) {
+            return -1;
+        }
+    }
+    ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+    return 0;
+}
+
+int esp_hosted_wifi_link_status(uint32_t itf) {
+    return netif_is_link_up(&esp_state.netif[itf]);
+}
+
+int esp_hosted_wifi_is_connected(uint32_t itf) {
+    if (!esp_hosted_wifi_link_status(itf)) {
+        return false;
+    }
+    if (itf == ESP_HOSTED_AP_IF) {
+        return esp_state.flags & ESP_HOSTED_FLAGS_AP_STARTED;
+    }
+    if ((esp_state.flags & ESP_HOSTED_FLAGS_STA_CONNECTED) &&
+        ((esp_state.flags & ESP_HOSTED_FLAGS_STATIC_IP) ||
+         dhcp_supplied_address(&esp_state.netif[itf]))) {
+        return true;
+    }
+    return false;
+}
+
+int esp_hosted_wifi_get_stations(uint8_t *sta_list, size_t *sta_count) {
+    CtrlMsgReqSoftAPConnectedSTA ctrl_payload;
+    ctrl_msg__req__soft_apconnected_sta__init(&ctrl_payload);
+
+    CtrlMsg *ctrl_msg = NULL;
+    if (esp_hosted_ctrl(CTRL_MSG_ID__Req_GetSoftAPConnectedSTAList, &ctrl_payload, &ctrl_msg) != 0) {
+        return -1;
+    }
+
+    CtrlMsgRespSoftAPConnectedSTA *resp = ctrl_msg->resp_softap_connected_stas_list;
+    *sta_count = resp->n_stations;
+    for (size_t i = 0; i < resp->n_stations; i++) {
+        ProtobufCBinaryData mac = resp->stations[i]->mac;
+        esp_hosted_macstr_to_bytes(mac.data, mac.len, &sta_list[i * 6]);
+    }
+    ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+    return 0;
+}
+
+int esp_hosted_wifi_netinfo(esp_hosted_netinfo_t *netinfo) {
+    CtrlMsgReqGetAPConfig ctrl_payload;
+    ctrl_msg__req__get_apconfig__init(&ctrl_payload);
+
+    CtrlMsg *ctrl_msg = NULL;
+    if (esp_hosted_ctrl(CTRL_MSG_ID__Req_GetAPConfig, &ctrl_payload, &ctrl_msg) != 0) {
+        return -1;
+    }
+
+    netinfo->rssi = ctrl_msg->resp_get_ap_config->rssi;
+    netinfo->security = sec_prot_to_hosted_security(ctrl_msg->resp_get_ap_config->sec_prot);
+    netinfo->channel = ctrl_msg->resp_get_ap_config->chnl;
+
+    ProtobufCBinaryData ssid = ctrl_msg->resp_get_ap_config->ssid;
+    if (ssid.data) {
+        size_t ssid_len = MIN(ssid.len, (ESP_HOSTED_MAX_SSID_LEN - 1));
+        memcpy(netinfo->ssid, ssid.data, ssid_len);
+        netinfo->ssid[ssid_len] = 0;
+    }
+
+    ProtobufCBinaryData bssid = ctrl_msg->resp_get_ap_config->bssid;
+    if (bssid.data) {
+        esp_hosted_macstr_to_bytes(bssid.data, bssid.len, netinfo->bssid);
+    }
+
+    ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+    return 0;
+}
+
+int esp_hosted_wifi_scan(esp_hosted_scan_callback_t scan_callback, void *arg, uint32_t timeout) {
+    CtrlMsgReqScanResult ctrl_payload;
+    ctrl_msg__req__scan_result__init(&ctrl_payload);
+
+    CtrlMsg *ctrl_msg = NULL;
+    if (esp_hosted_ctrl(CTRL_MSG_ID__Req_GetAPScanList, &ctrl_payload, &ctrl_msg) != 0) {
+        return -MP_ETIMEDOUT;
+    }
+
+    CtrlMsgRespScanResult *rp = ctrl_msg->resp_scan_ap_list;
+    for (int i = 0; i < rp->count; i++) {
+        esp_hosted_scan_result_t result = {0};
+        result.rssi = rp->entries[i]->rssi;
+        result.security = sec_prot_to_hosted_security(rp->entries[i]->sec_prot);
+        result.channel = rp->entries[i]->chnl;
+        if (rp->entries[i]->bssid.data) {
+            esp_hosted_macstr_to_bytes(rp->entries[i]->bssid.data, rp->entries[i]->bssid.len, result.bssid);
+        }
+
+        if (rp->entries[i]->ssid.len) {
+            size_t ssid_len = MIN(rp->entries[i]->ssid.len, (ESP_HOSTED_MAX_SSID_LEN - 1));
+            memcpy(result.ssid, rp->entries[i]->ssid.data, ssid_len);
+            result.ssid[ssid_len] = 0;
+        }
+        scan_callback(&result, arg);
+    }
+
+    ctrl_msg__free_unpacked(ctrl_msg, &protobuf_alloc);
+    return 0;
+}
+#endif // MICROPY_PY_NETWORK_ESP_HOSTED
diff --git a/drivers/esp-hosted/esp_hosted_wifi.h b/drivers/esp-hosted/esp_hosted_wifi.h
new file mode 100644
index 0000000000000..03d225d88d0d5
--- /dev/null
+++ b/drivers/esp-hosted/esp_hosted_wifi.h
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted WiFi driver.
+ */
+
+#ifndef MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_WIFI_H
+#define MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_WIFI_H
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#define ESP_HOSTED_IPV4_ADDR_LEN    (4)
+#define ESP_HOSTED_MAC_ADDR_LEN     (6)
+#define ESP_HOSTED_MAC_STR_LEN      (18)
+#define ESP_HOSTED_MAX_SSID_LEN     (32)
+#define ESP_HOSTED_MAX_WEP_LEN      (13)
+#define ESP_HOSTED_MAX_WPA_LEN      (63)
+#define ESP_HOSTED_MAX_AP_CLIENTS   (3)
+
+#define ESP_HOSTED_AP_GATEWAY       LWIP_MAKEU32(192, 168, 1, 1)
+#define ESP_HOSTED_AP_ADDRESS       LWIP_MAKEU32(192, 168, 1, 1)
+#define ESP_HOSTED_AP_NETMASK       LWIP_MAKEU32(255, 255, 255, 0)
+#define ESP_HOSTED_HOSTNAME         "esphosted"
+
+typedef enum {
+    ESP_HOSTED_STA_IF = 0,
+    ESP_HOSTED_AP_IF,
+    ESP_HOSTED_SERIAL_IF,
+    ESP_HOSTED_HCI_IF,
+    ESP_HOSTED_PRIV_IF,
+    ESP_HOSTED_TEST_IF,
+    ESP_HOSTED_MAX_IF,
+} esp_hosted_interface_t;
+
+typedef enum {
+    ESP_HOSTED_SEC_INVALID = -1,
+    ESP_HOSTED_SEC_OPEN,
+    ESP_HOSTED_SEC_WEP,
+    ESP_HOSTED_SEC_WPA_PSK,
+    ESP_HOSTED_SEC_WPA2_PSK,
+    ESP_HOSTED_SEC_WPA_WPA2_PSK,
+    ESP_HOSTED_SEC_WPA2_ENTERPRISE,
+    ESP_HOSTED_SEC_WPA3_PSK,
+    ESP_HOSTED_SEC_WPA2_WPA3_PSK,
+    ESP_HOSTED_SEC_MAX,
+} esp_hosted_security_t;
+
+typedef struct {
+    uint8_t ip_addr[ESP_HOSTED_IPV4_ADDR_LEN];
+    uint8_t subnet_addr[ESP_HOSTED_IPV4_ADDR_LEN];
+    uint8_t gateway_addr[ESP_HOSTED_IPV4_ADDR_LEN];
+    uint8_t dns_addr[ESP_HOSTED_IPV4_ADDR_LEN];
+} esp_hosted_ifconfig_t;
+
+typedef struct {
+    int32_t rssi;
+    esp_hosted_security_t security;
+    uint8_t channel;
+    char ssid[ESP_HOSTED_MAX_SSID_LEN];
+    uint8_t bssid[ESP_HOSTED_MAC_ADDR_LEN];
+} esp_hosted_scan_result_t;
+
+typedef struct {
+    int32_t rssi;
+    esp_hosted_security_t security;
+    uint8_t channel;
+    char ssid[ESP_HOSTED_MAX_SSID_LEN];
+    uint8_t bssid[ESP_HOSTED_MAC_ADDR_LEN];
+} esp_hosted_netinfo_t;
+
+typedef int (*esp_hosted_scan_callback_t)(esp_hosted_scan_result_t *, void *);
+
+int esp_hosted_wifi_poll(void);
+int esp_hosted_wifi_init(uint32_t itf);
+int esp_hosted_wifi_deinit(void);
+int esp_hosted_wifi_disable(uint32_t itf);
+void *esp_hosted_wifi_get_netif(uint32_t itf);
+int esp_hosted_wifi_get_mac(int itf, uint8_t *mac);
+int esp_hosted_wifi_connect(const char *ssid, const char *bssid, esp_hosted_security_t security, const char *key, uint16_t channel);
+int esp_hosted_wifi_start_ap(const char *ssid, esp_hosted_security_t security, const char *key, uint16_t channel);
+int esp_hosted_wifi_disconnect(uint32_t itf);
+int esp_hosted_wifi_link_status(uint32_t itf);
+int esp_hosted_wifi_is_connected(uint32_t itf);
+int esp_hosted_wifi_get_stations(uint8_t *sta_list, size_t *sta_count);
+int esp_hosted_wifi_netinfo(esp_hosted_netinfo_t *netinfo);
+int esp_hosted_wifi_scan(esp_hosted_scan_callback_t scan_callback, void *arg, uint32_t timeout);
+#endif // MICROPY_INCLUDED_DRIVERS_ESPHOST_WIFI_H
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index a15b7e4a5fcda..d5b2230348775 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -337,8 +337,51 @@ SRC_THIRDPARTY_C += $(addprefix $(WIZNET5K_DIR)/,\
 	Internet/DHCP/dhcp.c \
 	)
 endif
+endif # MICROPY_PY_NETWORK_WIZNET5K
+
+ifeq ($(MICROPY_PY_NETWORK_ESP_HOSTED),1)
+ESP_HOSTED_DIR = drivers/esp-hosted
+PROTOBUF_C_DIR = lib/protobuf-c
+PROTOC ?= protoc-c
+GIT_SUBMODULES += $(PROTOBUF_C_DIR)
+
+CFLAGS += -DMICROPY_PY_NETWORK_ESP_HOSTED=1
+CFLAGS_EXTMOD += -DMICROPY_PY_NETWORK_ESP_HOSTED=1
+INC += -I$(TOP)/$(ESP_HOSTED_DIR)
+
+ESP_HOSTED_SRC_C = $(addprefix $(ESP_HOSTED_DIR)/,\
+	esp_hosted_wifi.c \
+	esp_hosted_netif.c \
+	esp_hosted_hal.c \
+	)
+
+ifeq ($(MICROPY_PY_BLUETOOTH),1)
+ESP_HOSTED_SRC_C += $(ESP_HOSTED_DIR)/esp_hosted_bthci.c
 endif
 
+# Include the protobuf-c support functions
+ESP_HOSTED_SRC_C += $(addprefix $(PROTOBUF_C_DIR)/,\
+	protobuf-c/protobuf-c.c \
+	)
+
+$(BUILD)/$(PROTOBUF_C_DIR)/%.o: CFLAGS += -Wno-unused-but-set-variable
+
+# Generate esp_hosted-pb-c.c|h from esp_hosted.proto
+PROTO_GEN_SRC = $(BUILD)/extmod/esp_hosted.pb-c.c
+ESP_HOSTED_SRC_C += $(PROTO_GEN_SRC)
+
+$(PROTO_GEN_SRC): $(TOP)/$(ESP_HOSTED_DIR)/esp_hosted.proto
+	$(PROTOC) --proto_path=$(dir $<) --c_out=$(dir $@) $<
+
+# Scope the protobuf include paths to the esp_hosted source files, only
+ESP_HOSTED_OBJS = $(addprefix $(BUILD)/, $(ESP_HOSTED_SRC_C:.c=.o))
+$(ESP_HOSTED_OBJS): $(PROTO_GEN_SRC)
+$(ESP_HOSTED_OBJS): CFLAGS += -I$(dir $(PROTO_GEN_SRC)) -I$(TOP)/$(PROTOBUF_C_DIR)
+
+DRIVERS_SRC_C += $(ESP_HOSTED_SRC_C)
+
+endif # MICROPY_PY_NETWORK_ESP_HOSTED
+
 ################################################################################
 # bluetooth
 

From 474bf4e1e3bce69ae333520aee658a07664c2294 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 21 Jun 2023 17:15:46 +0200
Subject: [PATCH 0317/3129] extmod/network_esp_hosted: Add ESP-Hosted
 networking interface.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/extmod.mk            |   1 +
 extmod/network_esp_hosted.c | 320 ++++++++++++++++++++++++++++++++++++
 2 files changed, 321 insertions(+)
 create mode 100644 extmod/network_esp_hosted.c

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index d5b2230348775..f776a7f69437e 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -37,6 +37,7 @@ SRC_EXTMOD_C += \
 	extmod/modwebrepl.c \
 	extmod/modwebsocket.c \
 	extmod/network_cyw43.c \
+	extmod/network_esp_hosted.c \
 	extmod/network_lwip.c \
 	extmod/network_ninaw10.c \
 	extmod/network_wiznet5k.c \
diff --git a/extmod/network_esp_hosted.c b/extmod/network_esp_hosted.c
new file mode 100644
index 0000000000000..1a3be3f39a1a1
--- /dev/null
+++ b/extmod/network_esp_hosted.c
@@ -0,0 +1,320 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * ESP-Hosted network interface.
+ */
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_NETWORK && MICROPY_PY_NETWORK_ESP_HOSTED
+
+#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 "modmachine.h"
+
+#include "esp_hosted_wifi.h"
+#include "esp_hosted_hal.h"
+
+typedef struct _esp_hosted_obj_t {
+    mp_obj_base_t base;
+    uint32_t itf;
+} esp_hosted_obj_t;
+
+static esp_hosted_obj_t esp_hosted_sta_if = {{(mp_obj_type_t *)&mod_network_esp_hosted_type}, ESP_HOSTED_STA_IF};
+static esp_hosted_obj_t esp_hosted_ap_if = {{(mp_obj_type_t *)&mod_network_esp_hosted_type}, ESP_HOSTED_AP_IF};
+
+STATIC mp_obj_t network_esp_hosted_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_t esp_hosted_obj;
+    // TODO fix
+    if (n_args == 0 || mp_obj_get_int(args[0]) == ESP_HOSTED_STA_IF) {
+        esp_hosted_obj = MP_OBJ_FROM_PTR(&esp_hosted_sta_if);
+    } else {
+        esp_hosted_obj = MP_OBJ_FROM_PTR(&esp_hosted_ap_if);
+    }
+    // Register with network module
+    mod_network_register_nic(esp_hosted_obj);
+    return esp_hosted_obj;
+}
+
+STATIC mp_obj_t network_esp_hosted_active(size_t n_args, const mp_obj_t *args) {
+    esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (n_args == 2) {
+        bool active = mp_obj_is_true(args[1]);
+        if (active) {
+            // If the active NIC is changing disable the active one first.
+            // Note the host driver, firmware and ESP all support simultaneous AP/STA,
+            // however modnetwork.c doesn't support routing traffic to different NICs
+            // at the moment.
+            if (self->itf == ESP_HOSTED_STA_IF && esp_hosted_wifi_link_status(ESP_HOSTED_AP_IF)) {
+                esp_hosted_wifi_disable(ESP_HOSTED_AP_IF);
+            } else if (self->itf == ESP_HOSTED_AP_IF && esp_hosted_wifi_link_status(ESP_HOSTED_STA_IF)) {
+                esp_hosted_wifi_disable(ESP_HOSTED_STA_IF);
+            }
+            if (esp_hosted_wifi_init(self->itf) != 0) {
+                mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("Failed to initialize ESP32 module"));
+            }
+        } else {
+            esp_hosted_wifi_disable(self->itf);
+        }
+        return mp_const_none;
+    }
+    return mp_obj_new_bool(esp_hosted_wifi_link_status(self->itf));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_active_obj, 1, 2, network_esp_hosted_active);
+
+STATIC int esp_hosted_scan_callback(esp_hosted_scan_result_t *scan_result, void *arg) {
+    mp_obj_t scan_list = (mp_obj_t)arg;
+    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_SMALL_INT(1),
+    };
+    mp_obj_list_append(scan_list, mp_obj_new_tuple(MP_ARRAY_SIZE(ap), ap));
+    return 0;
+}
+
+STATIC mp_obj_t network_esp_hosted_scan(mp_obj_t self_in) {
+    mp_obj_t scan_list;
+    scan_list = mp_obj_new_list(0, NULL);
+    esp_hosted_wifi_scan(esp_hosted_scan_callback, scan_list, 10000);
+    return scan_list;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_scan_obj, network_esp_hosted_scan);
+
+STATIC mp_obj_t network_esp_hosted_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_ssid, ARG_key, ARG_security, ARG_bssid, ARG_channel };
+    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_ROM_NONE} },
+        { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ESP_HOSTED_SEC_WPA_WPA2_PSK} },
+        { 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 = 0} },
+    };
+
+    // Extract args.
+    esp_hosted_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 = NULL;
+    if (args[ARG_ssid].u_obj != mp_const_none) {
+        ssid = mp_obj_str_get_str(args[ARG_ssid].u_obj);
+    } else {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SSID can't be empty!"));
+    }
+
+    // get bssid (if any)
+    const char *bssid = NULL;
+    if (args[ARG_bssid].u_obj != mp_const_none) {
+        bssid = mp_obj_str_get_str(args[ARG_bssid].u_obj);
+    }
+
+    // get key and security
+    const char *key = NULL;
+    mp_uint_t security = ESP_HOSTED_SEC_OPEN;
+    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 != ESP_HOSTED_SEC_OPEN && strlen(key) == 0) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Key can't be empty!"));
+        }
+    }
+
+    // get channel
+    mp_uint_t channel = args[ARG_channel].u_int;
+
+    // If connected or AP active disconnect/stop AP first.
+    if (esp_hosted_wifi_is_connected(self->itf)) {
+        esp_hosted_wifi_disconnect(self->itf);
+    }
+
+    if (self->itf == ESP_HOSTED_STA_IF) {
+        // Initialize WiFi in Station mode.
+        if (esp_hosted_wifi_connect(ssid, bssid, security, key, channel) != 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 {
+        // Initialize WiFi in AP mode.
+        if (esp_hosted_wifi_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_esp_hosted_connect_obj, 1, network_esp_hosted_connect);
+
+STATIC mp_obj_t network_esp_hosted_disconnect(mp_obj_t self_in) {
+    esp_hosted_obj_t *self = self_in;
+    esp_hosted_wifi_disconnect(self->itf);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_disconnect_obj, network_esp_hosted_disconnect);
+
+STATIC mp_obj_t network_esp_hosted_isconnected(mp_obj_t self_in) {
+    esp_hosted_obj_t *self = self_in;
+    return mp_obj_new_bool(esp_hosted_wifi_is_connected(self->itf));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_isconnected_obj, network_esp_hosted_isconnected);
+
+STATIC mp_obj_t network_esp_hosted_ifconfig(size_t n_args, const mp_obj_t *args) {
+    esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    void *netif = esp_hosted_wifi_get_netif(self->itf);
+    return mod_network_nic_ifconfig(netif, n_args - 1, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_ifconfig_obj, 1, 2, network_esp_hosted_ifconfig);
+
+STATIC mp_obj_t network_esp_hosted_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    esp_hosted_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];
+                esp_hosted_wifi_get_mac(self->itf, buf);
+                return mp_obj_new_bytes(buf, 6);
+            }
+            case MP_QSTR_ssid:
+            case MP_QSTR_essid: {
+                esp_hosted_netinfo_t netinfo;
+                esp_hosted_wifi_netinfo(&netinfo);
+                return mp_obj_new_str(netinfo.ssid, strlen(netinfo.ssid));
+            }
+            case MP_QSTR_security: {
+                esp_hosted_netinfo_t netinfo;
+                esp_hosted_wifi_netinfo(&netinfo);
+                return mp_obj_new_int(netinfo.security);
+            }
+            case MP_QSTR_bssid: {
+                esp_hosted_netinfo_t netinfo;
+                esp_hosted_wifi_netinfo(&netinfo);
+                return mp_obj_new_bytes(netinfo.bssid, 6);
+            }
+            case MP_QSTR_channel: {
+                esp_hosted_netinfo_t netinfo;
+                esp_hosted_wifi_netinfo(&netinfo);
+                return mp_obj_new_int(netinfo.channel);
+            }
+            default:
+                mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+        }
+    } else {
+        if (self->itf != MOD_NETWORK_AP_IF) {
+            mp_raise_ValueError(MP_ERROR_TEXT("AP required"));
+        }
+        // Call connect to set WiFi access point.
+        return network_esp_hosted_connect(n_args, args, kwargs);
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_esp_hosted_config_obj, 1, network_esp_hosted_config);
+
+STATIC mp_obj_t network_esp_hosted_status(size_t n_args, const mp_obj_t *args) {
+    esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (n_args == 1) {
+        // no arguments: return link status
+        return mp_obj_new_bool(esp_hosted_wifi_link_status(self->itf));
+    }
+
+    // Query parameter.
+    switch (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_rssi: {
+            esp_hosted_netinfo_t netinfo;
+            esp_hosted_wifi_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"));
+            }
+
+            size_t sta_count = 0;
+            uint8_t sta_macs[ESP_HOSTED_MAX_AP_CLIENTS * 6];
+
+            mp_obj_t sta_list = mp_obj_new_list(0, NULL);
+            if (esp_hosted_wifi_get_stations(sta_macs, &sta_count) == 0) {
+                for (int i = 0; i < sta_count; i++) {
+                    mp_obj_list_append(sta_list, mp_obj_new_bytes(&sta_macs[i * 6], 6));
+                }
+            }
+            return sta_list;
+        }
+    }
+
+    mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_status_obj, 1, 2, network_esp_hosted_status);
+
+STATIC const mp_rom_map_elem_t network_esp_hosted_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_active),              MP_ROM_PTR(&network_esp_hosted_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_scan),                MP_ROM_PTR(&network_esp_hosted_scan_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect),             MP_ROM_PTR(&network_esp_hosted_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disconnect),          MP_ROM_PTR(&network_esp_hosted_disconnect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_isconnected),         MP_ROM_PTR(&network_esp_hosted_isconnected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ifconfig),            MP_ROM_PTR(&network_esp_hosted_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config),              MP_ROM_PTR(&network_esp_hosted_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status),              MP_ROM_PTR(&network_esp_hosted_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN),                MP_ROM_INT(ESP_HOSTED_SEC_OPEN) },
+    { MP_ROM_QSTR(MP_QSTR_WEP),                 MP_ROM_INT(ESP_HOSTED_SEC_WEP) },
+    { MP_ROM_QSTR(MP_QSTR_WPA_PSK),             MP_ROM_INT(ESP_HOSTED_SEC_WPA_WPA2_PSK) },
+};
+STATIC MP_DEFINE_CONST_DICT(network_esp_hosted_locals_dict, network_esp_hosted_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_esp_hosted_type,
+    MP_QSTR_ESPHOSTED,
+    MP_TYPE_FLAG_NONE,
+    make_new, network_esp_hosted_make_new,
+    locals_dict, &network_esp_hosted_locals_dict
+    );
+
+MP_REGISTER_ROOT_POINTER(struct _machine_spi_obj_t *mp_wifi_spi);
+
+#endif // #if MICROPY_PY_BLUETOOTH && MICROPY_PY_NETWORK_ESP_HOSTED

From abd9bed667d61f4a3d6b5fb2898ee270ac3ffc07 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Jul 2023 16:43:52 +0200
Subject: [PATCH 0318/3129] renesas-ra/fsp_cfg: Add common FSP config files.

Add DAC, SCE and USB FSP config files.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/fsp_cfg/r_dac_cfg.h       |  13 +++
 ports/renesas-ra/fsp_cfg/r_sce_cfg.h       |  10 ++
 ports/renesas-ra/fsp_cfg/r_usb_basic_cfg.h | 113 +++++++++++++++++++++
 ports/renesas-ra/fsp_cfg/r_usb_class_cfg.h |   5 +
 ports/renesas-ra/fsp_cfg/r_usb_pcdc_cfg.h  |  23 +++++
 5 files changed, 164 insertions(+)
 create mode 100644 ports/renesas-ra/fsp_cfg/r_dac_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_sce_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_usb_basic_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_usb_class_cfg.h
 create mode 100644 ports/renesas-ra/fsp_cfg/r_usb_pcdc_cfg.h

diff --git a/ports/renesas-ra/fsp_cfg/r_dac_cfg.h b/ports/renesas-ra/fsp_cfg/r_dac_cfg.h
new file mode 100644
index 0000000000000..5924bc46aca2c
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_dac_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef R_DAC_CFG_H_
+#define R_DAC_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DAC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_DAC_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_sce_cfg.h b/ports/renesas-ra/fsp_cfg/r_sce_cfg.h
new file mode 100644
index 0000000000000..4718cae393a84
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_sce_cfg.h
@@ -0,0 +1,10 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SCE_CFG_H_
+#define R_SCE_CFG_H_
+#define SCE_RSA_RETRY_COUNT_FOR_RSA_KEY_GENERATION 10240
+#define SCE_USER_SHA_384_ENABLED                   (0)
+#define SCE_USER_SHA_384_FUNCTION                  crypto_sha384_user_function
+#ifndef SCE_USER_FAST_BOOT
+#define SCE_USER_FAST_BOOT                         (0)
+#endif
+#endif /* R_SCE_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_usb_basic_cfg.h b/ports/renesas-ra/fsp_cfg/r_usb_basic_cfg.h
new file mode 100644
index 0000000000000..cdb1fe0c065ab
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_usb_basic_cfg.h
@@ -0,0 +1,113 @@
+/* generated configuration header file - do not edit */
+#ifndef R_USB_BASIC_CFG_H_
+#define R_USB_BASIC_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef NULL
+extern const uint16_t NULL[];
+#endif
+
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HCDC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HHID_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HMSC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HVND_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HPRN_USE
+#endif
+#if (1 != RA_NOT_DEFINED)
+#define USB_CFG_PCDC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PHID_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PMSC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PPRN_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PVND_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HCDC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HMSC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HHID_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HPRN_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_HUVC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PCDC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PPRN_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PHID_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PMSC_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_PAUD_USE
+#endif
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#define USB_CFG_DFU_USE
+#endif
+#if ((RA_NOT_DEFINED != RA_NOT_DEFINED) || (RA_NOT_DEFINED != RA_NOT_DEFINED) || (RA_NOT_DEFINED != RA_NOT_DEFINED))
+#define USB_CFG_OTG_USE
+#endif
+#if (defined(USB_CFG_HCDC_USE) || defined(USB_CFG_HPRN_USE) || defined(USB_CFG_HMSC_USE) || defined(USB_CFG_HHID_USE) || defined(USB_CFG_HVND_USE) || defined(USB_CFG_HUVC_USE))
+#define USB_CFG_HOST_MODE 1
+#else
+#define USB_CFG_HOST_MODE 0
+#endif
+
+#if (defined(USB_CFG_PCDC_USE) || defined(USB_CFG_PPRN_USE) || defined(USB_CFG_PMSC_USE) || defined(USB_CFG_PHID_USE) || defined(USB_CFG_PVND_USE) || defined(USB_CFG_PAUD_USE) || defined(USB_CFG_DFU_USE))
+#define USB_CFG_PERI_MODE 2
+#else
+#define USB_CFG_PERI_MODE 0
+#endif
+
+#define USB_CFG_MODE (USB_CFG_PERI_MODE | USB_CFG_HOST_MODE)
+
+#define USB_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define USB_CFG_CLKSEL (USB_CFG_24MHZ)
+#define USB_CFG_BUSWAIT (USB_CFG_BUSWAIT_7)
+#define USB_CFG_BC (USB_CFG_ENABLE)
+#define USB_CFG_VBUS (USB_CFG_HIGH)
+#define USB_CFG_DCP (USB_CFG_DISABLE)
+#define USB_CFG_CLASS_REQUEST (USB_CFG_ENABLE)
+#define USB_CFG_DBLB (USB_CFG_DBLBON)
+#define USB_CFG_CNTMD (USB_CFG_CNTMDOFF)
+#define USB_CFG_LDO_REGULATOR (USB_CFG_DISABLE)
+#define USB_CFG_DMA   (USB_CFG_DISABLE)
+#define USB_SRC_ADDRESS (NULL)
+#define USB_DEST_ADDRESS (NULL)
+#define USB_CFG_TPLCNT (1)
+#define USB_CFG_TPL USB_NOVENDOR, USB_NOPRODUCT
+#define USB_CFG_TPL_TABLE NULL
+#define USB_CFG_COMPLIANCE (USB_CFG_DISABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_USB_BASIC_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_usb_class_cfg.h b/ports/renesas-ra/fsp_cfg/r_usb_class_cfg.h
new file mode 100644
index 0000000000000..7f78a4cb0ae3f
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_usb_class_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_USB_CLASS_CFG_H_
+#define R_USB_CLASS_CFG_H_
+
+#endif /* R_USB_CLASS_CFG_H_ */
diff --git a/ports/renesas-ra/fsp_cfg/r_usb_pcdc_cfg.h b/ports/renesas-ra/fsp_cfg/r_usb_pcdc_cfg.h
new file mode 100644
index 0000000000000..0bd4f37775ac4
--- /dev/null
+++ b/ports/renesas-ra/fsp_cfg/r_usb_pcdc_cfg.h
@@ -0,0 +1,23 @@
+/* generated configuration header file - do not edit */
+#ifndef R_USB_PCDC_CFG_H_
+#define R_USB_PCDC_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if (RA_NOT_DEFINED != RA_NOT_DEFINED)
+#include "r_usb_pcdc_2ch_cfg.h"
+#else
+#define USB_CFG_PCDC_BULK_IN2 (USB_NULL)
+#define USB_CFG_PCDC_BULK_OUT2 (USB_NULL)
+#define USB_CFG_PCDC_INT_IN2 (USB_NULL)
+#endif
+
+#define USB_CFG_PCDC_BULK_IN (USB_PIPE1)
+#define USB_CFG_PCDC_BULK_OUT (USB_PIPE2)
+#define USB_CFG_PCDC_INT_IN (USB_PIPE6)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_USB_PCDC_CFG_H_ */

From 7802eed14bf28cf89f2f29cf604a65aef306bb12 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Jul 2023 16:45:07 +0200
Subject: [PATCH 0319/3129] renesas-ra/boards/ARDUINO_PORTENTA_C33: Add support
 for Portenta C33.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/README.md                    |   5 +
 .../boards/ARDUINO_PORTENTA_C33/board.json    |  23 +
 .../boards/ARDUINO_PORTENTA_C33/board_init.c  |  53 ++
 .../boards/ARDUINO_PORTENTA_C33/deploy.md     |   8 +
 .../boards/ARDUINO_PORTENTA_C33/manifest.py   |  12 +
 .../mbedtls_config_board.h                    |   8 +
 .../ARDUINO_PORTENTA_C33/mpconfigboard.h      | 107 +++
 .../ARDUINO_PORTENTA_C33/mpconfigboard.mk     |  22 +
 .../boards/ARDUINO_PORTENTA_C33/pins.csv      | 152 +++++
 .../boards/ARDUINO_PORTENTA_C33/ra6m5.ld      | 306 +++++++++
 .../ra_cfg/fsp_cfg/bsp/board_cfg.h            |  13 +
 .../ra_cfg/fsp_cfg/bsp/bsp_cfg.h              |  62 ++
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |   5 +
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h       |  11 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h   | 386 +++++++++++
 .../ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h          |  16 +
 .../ra_gen/bsp_clock_cfg.h                    |  35 +
 .../ARDUINO_PORTENTA_C33/ra_gen/common_data.c |  37 ++
 .../ARDUINO_PORTENTA_C33/ra_gen/common_data.h |  31 +
 .../ARDUINO_PORTENTA_C33/ra_gen/hal_data.c    | 611 ++++++++++++++++++
 .../ARDUINO_PORTENTA_C33/ra_gen/hal_data.h    | 177 +++++
 .../ARDUINO_PORTENTA_C33/ra_gen/pin_data.c    |  76 +++
 .../ARDUINO_PORTENTA_C33/ra_gen/vector_data.c |  69 ++
 .../ARDUINO_PORTENTA_C33/ra_gen/vector_data.h |  98 +++
 24 files changed, 2323 insertions(+)
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board_init.c
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/deploy.md
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mbedtls_config_board.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra6m5.ld
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/board_cfg.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/bsp_clock_cfg.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/hal_data.c
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/hal_data.h
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c
 create mode 100644 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h

diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
index 4cd116a37f9eb..77b952178d61f 100644
--- a/ports/renesas-ra/README.md
+++ b/ports/renesas-ra/README.md
@@ -40,6 +40,11 @@ Linux, Mac and Windows hosts via https://developer.arm.com/downloads/-/arm-gnu-t
 The compiler can be changed using the `CROSS_COMPILE` variable
 when invoking `make`.
 
+* Protocol buffer compiler
+Building for the `ARDUINO_PORTENTA_C33` board will build the `esp_hosted` driver, that depends
+on the Protocol Buffer Compiler being installed. On Debian/Ubuntu, this can be installed with
+`sudo apt-get install protobuf-compiler`.
+
 * Obtain submodules
 First the submodules must be obtained using:
 
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
new file mode 100644
index 0000000000000..18e6fe65e44d4
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "./deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "512KB SRAM",
+        "2MB Flash",
+        "16MB QSPI Flash",
+        "USB High Speed Phy",
+        "10/100 Ethernet Phy",
+        "ESP32 WiFi/BT Module",
+        "NXP SE050 crypto device"
+    ],
+    "images": [
+        "ABX00074_01.iso_1000x750.jpg"
+    ],
+    "mcu": "RA6M5",
+    "product": "Arduino Portenta C33",
+    "thumbnail": "",
+    "url": "https://store.arduino.cc/pages/portenta-c33",
+    "vendor": "Arduino"
+}
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board_init.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board_init.c
new file mode 100644
index 0000000000000..aa939dc5aa3b4
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board_init.c
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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 "py/mphal.h"
+#include "r_sce.h"
+
+// Key code for writing PRCR register.
+#define BSP_PRV_PRCR_KEY            (0xA500U)
+#define BSP_PRV_PRCR_PRC1_UNLOCK    ((BSP_PRV_PRCR_KEY) | 0x2U)
+#define BSP_PRV_PRCR_LOCK               ((BSP_PRV_PRCR_KEY) | 0x0U)
+#define BOOT_DOUBLE_TAP_DATA        (0x07738135)
+#define BOOT_DOUBLE_TAP_ADDR        (*((volatile uint32_t *)&R_SYSTEM->VBTBKR[0]))
+
+void PORTENTA_C33_board_startup() {
+    // Enable USB_BASE
+    R_SYSTEM->PRCR = (uint16_t)BSP_PRV_PRCR_PRC1_UNLOCK;
+    R_MSTP->MSTPCRB &= ~(1U << 11U);
+    R_MSTP->MSTPCRB &= ~(1U << 12U);
+    R_SYSTEM->PRCR = (uint16_t)BSP_PRV_PRCR_LOCK;
+
+    // Re-enable IRQs after jump from the bootloader.
+    __enable_irq();
+}
+
+void PORTENTA_C33_board_enter_bootloader(void) {
+    R_SYSTEM->PRCR = (uint16_t)BSP_PRV_PRCR_PRC1_UNLOCK;
+    BOOT_DOUBLE_TAP_ADDR = BOOT_DOUBLE_TAP_DATA;
+    R_SYSTEM->PRCR = (uint16_t)BSP_PRV_PRCR_LOCK;
+    NVIC_SystemReset();
+}
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/deploy.md b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/deploy.md
new file mode 100644
index 0000000000000..6b342033c8401
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/deploy.md
@@ -0,0 +1,8 @@
+### 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 -a 0 -d 2341:0368 -D build-ARDUINO_PORTENTA_C33/firmware.bin -Q # -s :leave
+```
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py
new file mode 100644
index 0000000000000..b3c6b02e5ba07
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py
@@ -0,0 +1,12 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+# Networking
+require("bundle-networking")
+
+# Utils
+require("time")
+require("senml")
+require("logging")
+
+# Bluetooth
+require("aioble")
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mbedtls_config_board.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mbedtls_config_board.h
new file mode 100644
index 0000000000000..63c1b284fb6be
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/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/renesas-ra/mbedtls/mbedtls_config.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
new file mode 100644
index 0000000000000..ed19f60e9ea6b
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2023 Arduino SA
+ */
+
+// MCU config
+#define MICROPY_HW_BOARD_NAME       "PORTENTA C33"
+#define MICROPY_HW_MCU_NAME         "RA6M5"
+#define MICROPY_HW_MCU_SYSCLK       200000000
+#define MICROPY_HW_MCU_PCLK         100000000
+
+// 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
+#define MICROPY_PY_NETWORK          (1)
+
+// peripheral config
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_RTC_SOURCE       (1)
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_USBDEV    (1)
+#define MICROPY_HW_ENABLE_UART_REPL (0)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+#define MICROPY_BOARD_STARTUP       PORTENTA_C33_board_startup
+void PORTENTA_C33_board_startup(void);
+
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) PORTENTA_C33_board_enter_bootloader()
+void PORTENTA_C33_board_enter_bootloader(void);
+
+// board config
+// USB
+#define MICROPY_HW_USB_VID          (0x2341)
+#define MICROPY_HW_USB_PID          (0x0468)
+
+// UART
+#define MICROPY_HW_UART9_TX         (pin_P602)
+#define MICROPY_HW_UART9_RX         (pin_P110)
+#define MICROPY_HW_UART9_CTS        (pin_P604)
+#define MICROPY_HW_UART9_RTS        (pin_P603)
+
+#define MICROPY_HW_UART8_TX         (pin_PA00)
+#define MICROPY_HW_UART8_RX         (pin_P607)
+#define MICROPY_HW_UART8_CTS        (pin_P801)
+#define MICROPY_HW_UART8_RTS        (pin_P606)
+
+#if MICROPY_HW_ENABLE_UART_REPL
+#define MICROPY_HW_UART_REPL        (HW_UART_9)
+#define MICROPY_HW_UART_REPL_BAUD   (115200)
+#endif
+
+// I2C
+#define MICROPY_HW_I2C2_SCL         (pin_P407)
+#define MICROPY_HW_I2C2_SDA         (pin_P408)
+
+// SPI
+#define MICROPY_HW_SPI1_SSL         (pin_P104)
+#define MICROPY_HW_SPI1_RSPCK       (pin_P102)
+#define MICROPY_HW_SPI1_MISO        (pin_P100)
+#define MICROPY_HW_SPI1_MOSI        (pin_P101)
+
+// DAC
+#define MICROPY_HW_DAC0             (pin_P014)
+#define MICROPY_HW_DAC1             (pin_P015)
+
+// PWM
+#define MICROPY_HW_PWM_1A           (pin_P105)
+#define MICROPY_HW_PWM_8B           (pin_P106)
+#define MICROPY_HW_PWM_3A           (pin_P111)
+#define MICROPY_HW_PWM_7B           (pin_P303)
+#define MICROPY_HW_PWM_6B           (pin_P401)
+// #define MICROPY_HW_PWM            (pin_P210) // AGT
+#define MICROPY_HW_PWM_6A           (pin_P601)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_P107)
+#define MICROPY_HW_LED2             (pin_P400)
+#define MICROPY_HW_LED3             (pin_P800)
+#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)
+
+// Bluetooth config.
+#define MICROPY_HW_BLE_UART_ID          (8)
+#define MICROPY_HW_BLE_UART_RTS         (MICROPY_HW_UART8_RTS)
+#define MICROPY_HW_BLE_UART_BAUDRATE    (115200)
+#define MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY (921600)
+
+// WiFi config.
+#define MICROPY_HW_WIFI_SPI_ID          (1)
+#define MICROPY_HW_WIFI_SPI_CS          (pin_P104)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE    (30 * 1000 * 1000)
+#define MICROPY_HW_WIFI_DATAREADY       (pin_P803)
+#define MICROPY_HW_WIFI_HANDSHAKE       (pin_P806)
+
+// ESP hosted control pins
+#define MICROPY_HW_ESP_HOSTED_RESET     (pin_P804)
+#define MICROPY_HW_ESP_HOSTED_GPIO0     (pin_P803)
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk
new file mode 100644
index 0000000000000..de9902c16cf7f
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk
@@ -0,0 +1,22 @@
+CMSIS_MCU = RA6M5
+MCU_SERIES = m33
+LD_FILES = boards/ARDUINO_PORTENTA_C33/ra6m5.ld
+CFLAGS += -DCFG_TUH_MAX_SPEED=OPT_MODE_FULL_SPEED \
+          -DCFG_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED \
+          -DCFG_TUSB_RHPORT0_MODE=0\
+          -DCFG_TUSB_RHPORT1_MODE=OPT_MODE_DEVICE
+
+# MicroPython settings
+MICROPY_VFS_FAT = 1
+MICROPY_HW_ENABLE_RNG = 1
+MICROPY_PY_BLUETOOTH = 1
+MICROPY_BLUETOOTH_NIMBLE = 1
+MICROPY_BLUETOOTH_BTSTACK = 0
+MICROPY_PY_LWIP = 1
+MICROPY_PY_SSL = 1
+MICROPY_SSL_MBEDTLS = 1
+MICROPY_PY_NETWORK = 1
+MICROPY_PY_NETWORK_ESP_HOSTED = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
new file mode 100644
index 0000000000000..195d4d54ca374
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
@@ -0,0 +1,152 @@
+P000,P000
+P001,P001
+P002,P002
+P003,P003
+P004,P004
+P005,P005
+P006,P006
+P007,P007
+P008,P008
+P009,P009
+P010,P010
+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
+P314,P314
+P315,P315
+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
+P507,P507
+P508,P508
+P511,P511
+P512,P512
+P513,P513
+P600,P600
+P601,P601
+P602,P602
+P603,P603
+P604,P604
+P605,P605
+P606,P606
+P607,P607
+P608,P608
+P609,P609
+P610,P610
+P611,P611
+P612,P612
+P613,P613
+P614,P614
+P615,P615
+P700,P700
+P701,P701
+P702,P702
+P703,P703
+P704,P704
+P705,P705
+P706,P706
+P707,P707
+P708,P708
+P800,P800
+P801,P801
+P802,P802
+P803,P803
+P804,P804
+P805,P805
+P806,P806
+P900,P900
+P901,P901
+P905,P905
+P906,P906
+P907,P907
+P908,P908
+PA00,PA00
+PA01,PA01
+PA08,PA08
+PA09,PA09
+PA10,PA10
+PB00,PB00
+PB01,PB01
+A0,P006
+A1,P005
+A2,P004
+A3,P002
+A4,P001
+A5,P015
+A6,P014
+D0,P105
+D1,P106
+D2,P111
+D3,P303
+D4,P401
+D5,P210
+LED1,P107
+LED2,P400
+LED3,P800
+LED_R,P107
+LED_G,P400
+LED_B,P800
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra6m5.ld b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra6m5.ld
new file mode 100644
index 0000000000000..c1fac5106c37e
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra6m5.ld
@@ -0,0 +1,306 @@
+/*
+                  Linker File for RA6M5 MCU
+*/
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH_BOOT (r)     : ORIGIN = 0x00000000, LENGTH = 0x00010000  /* 64K */
+  FLASH (rx)         : ORIGIN = 0x00010000, LENGTH = 0x000f0000  /* 960KB */
+  FLASH_FS (r)       : ORIGIN = 0x00100000, LENGTH = 0x00100000  /* 1MB */
+  RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00080000  /* 512KB */
+  OSPI_RAM (rwx)     : ORIGIN = 0x68000000, LENGTH = 0x00800000  /* 8MB/8MB */
+  DATA_FLASH (rx)    : ORIGIN = 0x08000000, LENGTH = 0x00002000  /* 8KB */
+  QSPI_FLASH (rx)    : ORIGIN = 0x60000000, LENGTH = 0x01000000  /* 16MB/64MB */
+  OSPI_FLASH (rx)    : ORIGIN = 0x70000000, LENGTH = 0x01000000  /* 16MB/256MB */
+  ID_CODE (rx)       : ORIGIN = 0x00000000, LENGTH = 0x00000000  /* N/A */
+}
+
+/* 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 */
+
+_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/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000000..a57cf3249e386
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void bsp_init(void *p_args);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BOARD_CFG_H_ */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
new file mode 100644
index 0000000000000..9952bf9b15c80
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -0,0 +1,62 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CFG_H_
+#define BSP_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#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
+#ifndef BSP_CFG_RTC_USED
+#define BSP_CFG_RTC_USED (1)
+#endif
+#undef RA_NOT_DEFINED
+#if defined(_RA_BOOT_IMAGE)
+#define BSP_CFG_BOOT_IMAGE (1)
+#endif
+#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_EARLY_INIT     ((0))
+
+#define BSP_CFG_STARTUP_CLOCK_REG_NOT_RESET ((0))
+
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_POPULATED
+#define BSP_CLOCK_CFG_MAIN_OSC_POPULATED (1)
+#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
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
new file mode 100644
index 0000000000000..bd6a901c32d6e
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/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/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
new file mode 100644
index 0000000000000..29ea750b2c65c
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
@@ -0,0 +1,11 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_R7FA6M5BH2CBG
+#define BSP_MCU_FEATURE_SET ('B')
+#define BSP_ROM_SIZE_BYTES (2097152)
+#define BSP_RAM_SIZE_BYTES (524288)
+#define BSP_DATA_FLASH_SIZE_BYTES (8192)
+#define BSP_PACKAGE_BGA
+#define BSP_PACKAGE_PINS (176)
+#endif /* BSP_MCU_DEVICE_PN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
new file mode 100644
index 0000000000000..90e8485b2af21
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
@@ -0,0 +1,386 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_FAMILY_CFG_H_
+#define BSP_MCU_FAMILY_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "bsp_mcu_device_pn_cfg.h"
+#include "bsp_mcu_device_cfg.h"
+#include "../../../ra/fsp/src/bsp/mcu/ra6m5/bsp_mcu_info.h"
+#include "bsp_clock_cfg.h"
+#define BSP_MCU_GROUP_RA6M5 (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)
+
+#if defined(_RA_TZ_SECURE)
+#define BSP_TZ_SECURE_BUILD           (1)
+#define BSP_TZ_NONSECURE_BUILD        (0)
+#elif defined(_RA_TZ_NONSECURE)
+#define BSP_TZ_SECURE_BUILD           (0)
+#define BSP_TZ_NONSECURE_BUILD        (1)
+#else
+#define BSP_TZ_SECURE_BUILD           (0)
+#define BSP_TZ_NONSECURE_BUILD        (0)
+#endif
+
+/* TrustZone Settings */
+#define BSP_TZ_CFG_INIT_SECURE_ONLY       (BSP_CFG_CLOCKS_SECURE || (!BSP_CFG_CLOCKS_OVERRIDE))
+#define BSP_TZ_CFG_SKIP_INIT              (BSP_TZ_NONSECURE_BUILD && BSP_TZ_CFG_INIT_SECURE_ONLY)
+#define BSP_TZ_CFG_EXCEPTION_RESPONSE     (0)
+
+/* CMSIS TrustZone Settings */
+#define SCB_CSR_AIRCR_INIT                (1)
+#define SCB_AIRCR_BFHFNMINS_VAL           (0)
+#define SCB_AIRCR_SYSRESETREQS_VAL        (1)
+#define SCB_AIRCR_PRIS_VAL                (0)
+#define TZ_FPU_NS_USAGE                   (1)
+#ifndef SCB_NSACR_CP10_11_VAL
+#define SCB_NSACR_CP10_11_VAL             (3U)
+#endif
+
+#ifndef FPU_FPCCR_TS_VAL
+#define FPU_FPCCR_TS_VAL                  (1U)
+#endif
+#define FPU_FPCCR_CLRONRETS_VAL           (1)
+
+#ifndef FPU_FPCCR_CLRONRET_VAL
+#define FPU_FPCCR_CLRONRET_VAL            (1)
+#endif
+
+/* The C-Cache line size that is configured during startup. */
+#ifndef BSP_CFG_C_CACHE_LINE_SIZE
+#define BSP_CFG_C_CACHE_LINE_SIZE   (1U)
+#endif
+
+/* Type 1 Peripheral Security Attribution */
+
+/* Peripheral Security Attribution Register (PSAR) Settings */
+#ifndef BSP_TZ_CFG_PSARB
+#define BSP_TZ_CFG_PSARB ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* CAN1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 2) /* CAN0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 8) /* IIC1 */ | \
+    (((1 > 0) ? 0U : 1U) << 9) /* IIC0 */ | \
+    (((1 > 0) ? 0U : 1U) << 11) /* USBFS */ | \
+    (((1 > 0) ? 0U : 1U) << 18) /* SPI1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 19) /* SPI0 */ | \
+    (((1 > 0) ? 0U : 1U) << 22) /* SCI9 */ | \
+    (((1 > 0) ? 0U : 1U) << 23) /* SCI8 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 24) /* SCI7 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 25) /* SCI6 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 26) /* SCI5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 27) /* SCI4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 28) /* SCI3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 29) /* SCI2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 30) /* SCI1 */ | \
+    (((1 > 0) ? 0U : 1U) << 31) /* SCI0 */ | \
+    0x33f4f9)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_PSARC
+#define BSP_TZ_CFG_PSARC ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* CAC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* CRC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 3) /* CTSU */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 8) /* SSIE0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 12) /* SDHI0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 13) /* DOC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 31) /* SCE9 */ | \
+    0x7fffcef4)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_PSARD
+#define BSP_TZ_CFG_PSARD ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* AGT3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* AGT2 */ | \
+    (((1 > 0) ? 0U : 1U) << 2) /* AGT1 */ | \
+    (((1 > 0) ? 0U : 1U) << 3) /* AGT0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 11) /* POEG3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 12) /* POEG2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 13) /* POEG1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 14) /* POEG0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 15) /* ADC1 */ | \
+    (((1 > 0) ? 0U : 1U) << 16) /* ADC0 */ | \
+    (((2 > 0) ? 0U : 1U) << 20) /* DAC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 22) /* TSN */ | \
+    0xffae07f0)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_PSARE
+#define BSP_TZ_CFG_PSARE ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* WDT */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* IWDT */ | \
+    (((1 > 0) ? 0U : 1U) << 2) /* RTC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 14) /* AGT5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 15) /* AGT4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 22) /* GPT9 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 23) /* GPT8 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 24) /* GPT7 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 25) /* GPT6 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 26) /* GPT5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 27) /* GPT4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 28) /* GPT3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 29) /* GPT2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 30) /* GPT1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 31) /* GPT0 */ | \
+    0x3f3ff8)         /* Unused */
+#endif
+#ifndef BSP_TZ_CFG_MSSAR
+#define BSP_TZ_CFG_MSSAR ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) /* ELC */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) /* DTC_DMAC */ | \
+    0xfffffffc)         /* Unused */
+#endif
+
+/* Type 2 Peripheral Security Attribution */
+
+/* Security attribution for Cache registers. */
+#ifndef BSP_TZ_CFG_CSAR
+#define BSP_TZ_CFG_CSAR (0xFFFFFFFFU)
+#endif
+
+/* Security attribution for RSTSRn registers. */
+#ifndef BSP_TZ_CFG_RSTSAR
+#define BSP_TZ_CFG_RSTSAR (0xFFFFFFFFU)
+#endif
+
+/* Security attribution for registers of LVD channels. */
+#ifndef BSP_TZ_CFG_LVDSAR
+#define BSP_TZ_CFG_LVDSAR ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0) |         /* LVD Channel 1 */ \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1) |         /* LVD Channel 2 */ \
+    0xFFFFFFFCU)
+#endif
+
+/* Security attribution for LPM registers. */
+#ifndef BSP_TZ_CFG_LPMSAR
+#define BSP_TZ_CFG_LPMSAR ((1 > 0) ? 0xFFFFFCEAU : 0xFFFFFFFFU)
+#endif
+/* Deep Standby Interrupt Factor Security Attribution Register. */
+#ifndef BSP_TZ_CFG_DPFSAR
+#define BSP_TZ_CFG_DPFSAR ((1 > 0) ? 0xF2E00000U : 0xFFFFFFFFU)
+#endif
+
+/* Security attribution for CGC registers. */
+#ifndef BSP_TZ_CFG_CGFSAR
+#if BSP_CFG_CLOCKS_SECURE
+/* Protect all CGC registers from Non-secure write access. */
+#define BSP_TZ_CFG_CGFSAR (0xFFFCE402U)
+#else
+/* Allow Secure and Non-secure write access. */
+#define BSP_TZ_CFG_CGFSAR (0xFFFFFFFFU)
+#endif
+#endif
+
+/* Security attribution for Battery Backup registers. */
+#ifndef BSP_TZ_CFG_BBFSAR
+#define BSP_TZ_CFG_BBFSAR (0x00FFFFFF)
+#endif
+
+/* Security attribution for registers for IRQ channels. */
+#ifndef BSP_TZ_CFG_ICUSARA
+#define BSP_TZ_CFG_ICUSARA ( \
+    (((1 > 0) ? 0U : 1U) << 0U) /* External IRQ0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1U) /* External IRQ1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 2U) /* External IRQ2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 3U) /* External IRQ3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 4U) /* External IRQ4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 5U) /* External IRQ5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 6U) /* External IRQ6 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 7U) /* External IRQ7 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 8U) /* External IRQ8 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 9U) /* External IRQ9 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 10U) /* External IRQ10 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 11U) /* External IRQ11 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 12U) /* External IRQ12 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 13U) /* External IRQ13 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 14U) /* External IRQ14 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 15U) /* External IRQ15 */ | \
+    0xFFFF0000U)
+#endif
+
+/* Security attribution for NMI registers. */
+#ifndef BSP_TZ_CFG_ICUSARB
+#define BSP_TZ_CFG_ICUSARB (0 | 0xFFFFFFFEU) /* Should match AIRCR.BFHFNMINS. */
+#endif
+
+/* Security attribution for registers for DMAC channels */
+#ifndef BSP_TZ_CFG_ICUSARC
+#define BSP_TZ_CFG_ICUSARC ( \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 0U) /* DMAC Channel 0 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 1U) /* DMAC Channel 1 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 2U) /* DMAC Channel 2 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 3U) /* DMAC Channel 3 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 4U) /* DMAC Channel 4 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 5U) /* DMAC Channel 5 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 6U) /* DMAC Channel 6 */ | \
+    (((RA_NOT_DEFINED > 0) ? 0U : 1U) << 7U) /* DMAC Channel 7 */ | \
+    0xFFFFFF00U)
+#endif
+
+/* Security attribution registers for SELSR0. */
+#ifndef BSP_TZ_CFG_ICUSARD
+#define BSP_TZ_CFG_ICUSARD ((1 > 0) ? 0xFFFFFFFEU : 0xFFFFFFFFU)
+#endif
+
+/* Security attribution registers for WUPEN0. */
+#ifndef BSP_TZ_CFG_ICUSARE
+#define BSP_TZ_CFG_ICUSARE ((1 > 0) ? 0x04F2FFFFU : 0xFFFFFFFFU)
+#endif
+
+/* Security attribution registers for WUPEN1. */
+#ifndef BSP_TZ_CFG_ICUSARF
+#define BSP_TZ_CFG_ICUSARF ((1 > 0) ? 0xFFFFFFF8U : 0xFFFFFFFFU)
+#endif
+
+/* Set DTCSTSAR if the Secure program uses the DTC. */
+#if RA_NOT_DEFINED == RA_NOT_DEFINED
+#define BSP_TZ_CFG_DTC_USED (0U)
+#else
+ #define BSP_TZ_CFG_DTC_USED (1U)
+#endif
+
+/* Security attribution of FLWT and FCKMHZ registers. */
+#ifndef BSP_TZ_CFG_FSAR
+/* If the CGC registers are only accessible in Secure mode, than there is no
+ * reason for nonsecure applications to access FLWT and FCKMHZ. */
+#if BSP_CFG_CLOCKS_SECURE
+/* Protect FLWT and FCKMHZ registers from nonsecure write access. */
+#define BSP_TZ_CFG_FSAR (0xFEFEU)
+#else
+/* Allow Secure and Non-secure write access. */
+#define BSP_TZ_CFG_FSAR (0xFFFFU)
+#endif
+#endif
+
+/* Security attribution for SRAM registers. */
+#ifndef BSP_TZ_CFG_SRAMSAR
+/* If the CGC registers are only accessible in Secure mode, than there is no reason for Non Secure applications to access
+ * SRAM0WTEN and therefore there is no reason to access PRCR2. */
+#define BSP_TZ_CFG_SRAMSAR ( \
+    1 | \
+    ((BSP_CFG_CLOCKS_SECURE == 0) ? (1U << 1U) : 0U) | \
+    4 | \
+    0xFFFFFFF8U)
+#endif
+
+/* Security attribution for Standby RAM registers. */
+#ifndef BSP_TZ_CFG_STBRAMSAR
+#define BSP_TZ_CFG_STBRAMSAR (0 | 0xFFFFFFF0U)
+#endif
+
+/* Security attribution for the DMAC Bus Master MPU settings. */
+#ifndef BSP_TZ_CFG_MMPUSARA
+/* The DMAC Bus Master MPU settings should align with the DMAC channel settings. */
+#define BSP_TZ_CFG_MMPUSARA (BSP_TZ_CFG_ICUSARC)
+#endif
+
+/* Security Attribution Register A for BUS Control registers. */
+#ifndef BSP_TZ_CFG_BUSSARA
+#define BSP_TZ_CFG_BUSSARA (0xFFFFFFFFU)
+#endif
+/* Security Attribution Register B for BUS Control registers. */
+#ifndef BSP_TZ_CFG_BUSSARB
+#define BSP_TZ_CFG_BUSSARB (0xFFFFFFFFU)
+#endif
+
+/* Enable Uninitialized Non-Secure Application Fallback. */
+#ifndef BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK
+#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
+#endif
+
+#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)
+
+/* Option Function Select Register 1 Security Attribution */
+#ifndef BSP_CFG_ROM_REG_OFS1_SEL
+#if defined(_RA_TZ_SECURE) || defined(_RA_TZ_NONSECURE)
+            #define BSP_CFG_ROM_REG_OFS1_SEL (0xFFFFF8F8U | ((BSP_CFG_CLOCKS_SECURE == 0) ? 0x700U : 0U) | ((RA_NOT_DEFINED > 0) ? 0U : 0x7U))
+#else
+#define BSP_CFG_ROM_REG_OFS1_SEL (0xFFFFF8F8U)
+#endif
+#endif
+
+#define BSP_CFG_ROM_REG_OFS1 (0xFFFFFEF8 | (1 << 2) | (3) | (1 << 8))
+
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    (ELC_##vector)
+
+/* Dual Mode Select Register */
+#ifndef BSP_CFG_ROM_REG_DUALSEL
+#define BSP_CFG_ROM_REG_DUALSEL (0xFFFFFFF8U | (0x7U))
+#endif
+
+/* Block Protection Register 0 */
+#ifndef BSP_CFG_ROM_REG_BPS0
+#define BSP_CFG_ROM_REG_BPS0 (~(0U))
+#endif
+/* Block Protection Register 1 */
+#ifndef BSP_CFG_ROM_REG_BPS1
+#define BSP_CFG_ROM_REG_BPS1 (~(0U))
+#endif
+/* Block Protection Register 2 */
+#ifndef BSP_CFG_ROM_REG_BPS2
+#define BSP_CFG_ROM_REG_BPS2 (~(0U))
+#endif
+/* Block Protection Register 3 */
+#ifndef BSP_CFG_ROM_REG_BPS3
+#define BSP_CFG_ROM_REG_BPS3 (0xFFFFFFFFU)
+#endif
+/* Permanent Block Protection Register 0 */
+#ifndef BSP_CFG_ROM_REG_PBPS0
+#define BSP_CFG_ROM_REG_PBPS0 (~(0U))
+#endif
+/* Permanent Block Protection Register 1 */
+#ifndef BSP_CFG_ROM_REG_PBPS1
+#define BSP_CFG_ROM_REG_PBPS1 (~(0U))
+#endif
+/* Permanent Block Protection Register 2 */
+#ifndef BSP_CFG_ROM_REG_PBPS2
+#define BSP_CFG_ROM_REG_PBPS2 (~(0U))
+#endif
+/* Permanent Block Protection Register 3 */
+#ifndef BSP_CFG_ROM_REG_PBPS3
+#define BSP_CFG_ROM_REG_PBPS3 (0xFFFFFFFFU)
+#endif
+/* Security Attribution for Block Protection Register 0 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL0
+#define BSP_CFG_ROM_REG_BPS_SEL0 (BSP_CFG_ROM_REG_BPS0 & BSP_CFG_ROM_REG_PBPS0)
+#endif
+/* Security Attribution for Block Protection Register 1 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL1
+#define BSP_CFG_ROM_REG_BPS_SEL1 (BSP_CFG_ROM_REG_BPS1 & BSP_CFG_ROM_REG_PBPS1)
+#endif
+/* Security Attribution for Block Protection Register 2 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL2
+#define BSP_CFG_ROM_REG_BPS_SEL2 (BSP_CFG_ROM_REG_BPS2 & BSP_CFG_ROM_REG_PBPS2)
+#endif
+/* Security Attribution for Block Protection Register 3 (If any blocks are marked as protected in the secure application, then mark them as secure) */
+#ifndef BSP_CFG_ROM_REG_BPS_SEL3
+#define BSP_CFG_ROM_REG_BPS_SEL3 (BSP_CFG_ROM_REG_BPS3 & BSP_CFG_ROM_REG_PBPS3)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
+#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_MCU_FAMILY_CFG_H_ */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h
new file mode 100644
index 0000000000000..38611bc078c92
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h
@@ -0,0 +1,16 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_PIN_CFG_H_
+#define BSP_PIN_CFG_H_
+#include "r_ioport.h"
+
+/* Common macro for FSP header files. There is also a corresponding FSP_FOOTER macro at the end of this file. */
+FSP_HEADER
+
+extern const ioport_cfg_t g_bsp_pin_cfg; /* R7FA6M5BH2CBG.pincfg */
+
+void BSP_PinConfigSecurityInit();
+
+/* Common macro for FSP header files. There is also a corresponding FSP_HEADER macro at the top of this file. */
+FSP_FOOTER
+
+#endif /* BSP_PIN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/bsp_clock_cfg.h
new file mode 100644
index 0000000000000..6cb5d117bf51f
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/bsp_clock_cfg.h
@@ -0,0 +1,35 @@
+/* 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 (24000000) /* XTAL 24000000Hz */
+#define BSP_CFG_HOCO_FREQUENCY (2) /* HOCO 20MHz */
+#define BSP_CFG_PLL_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL Src: XTAL */
+#define BSP_CFG_PLL_DIV (BSP_CLOCKS_PLL_DIV_3) /* PLL Div /3 */
+#define BSP_CFG_PLL_MUL BSP_CLOCKS_PLL_MUL(25U, 0U) /* PLL Mul x25.0 */
+#define BSP_CFG_PLL2_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL2 Src: XTAL */
+#define BSP_CFG_PLL2_DIV (BSP_CLOCKS_PLL_DIV_2) /* PLL2 Div /2 */
+#define BSP_CFG_PLL2_MUL BSP_CLOCKS_PLL_MUL(20U, 0U) /* PLL2 Mul x20.0 */
+#define BSP_CFG_CLOCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* Clock Src: PLL */
+#define BSP_CFG_CLKOUT_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CLKOUT Disabled */
+#define BSP_CFG_UCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL2) /* UCLK Src: PLL2 */
+#define BSP_CFG_U60CK_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* U60CK Disabled */
+#define BSP_CFG_OCTA_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* OCTASPICLK Disabled */
+#define BSP_CFG_CANFDCLK_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CANFDCLK Disabled */
+#define BSP_CFG_CECCLK_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CECCLK Disabled */
+#define BSP_CFG_ICLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* ICLK Div /1 */
+#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) /* EBCLK Div /2 */
+#define BSP_CFG_FCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* FCLK Div /4 */
+#define BSP_CFG_CLKOUT_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* CLKOUT Div /1 */
+#define BSP_CFG_UCK_DIV (BSP_CLOCKS_USB_CLOCK_DIV_5) /* UCLK Div /5 */
+#define BSP_CFG_U60CK_DIV (BSP_CLOCKS_USB60_CLOCK_DIV_1) /* U60CK Div /1 */
+#define BSP_CFG_OCTA_DIV (BSP_CLOCKS_OCTA_CLOCK_DIV_1) /* OCTASPICLK Div /1 */
+#define BSP_CFG_CANFDCLK_DIV (BSP_CLOCKS_CANFD_CLOCK_DIV_6) /* CANFDCLK Div /6 */
+#define BSP_CFG_CECCLK_DIV (BSP_CLOCKS_CEC_CLOCK_DIV_1) /* CECCLK Div /1 */
+#endif /* BSP_CLOCK_CFG_H_ */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c
new file mode 100644
index 0000000000000..50a3f6046b1c8
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c
@@ -0,0 +1,37 @@
+/* generated common source file - do not edit */
+#include "common_data.h"
+sce_instance_ctrl_t sce_ctrl;
+const sce_cfg_t sce_cfg =
+{ .lifecycle = SCE_SSD };
+#if SCE_USER_SHA_384_ENABLED
+uint32_t SCE_USER_SHA_384_FUNCTION(uint8_t *message, uint8_t *digest, uint32_t message_length);
+#endif
+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 = NULL,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .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 };
+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/ARDUINO_PORTENTA_C33/ra_gen/common_data.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.h
new file mode 100644
index 0000000000000..0f5a143ff6a79
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.h
@@ -0,0 +1,31 @@
+/* generated common header file - do not edit */
+#ifndef COMMON_DATA_H_
+#define COMMON_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "r_sce.h"
+#include "r_icu.h"
+#include "r_external_irq_api.h"
+#include "r_ioport.h"
+#include "bsp_pin_cfg.h"
+FSP_HEADER
+extern sce_instance_ctrl_t sce_ctrl;
+extern const sce_cfg_t sce_cfg;
+/** 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 NULL
+void NULL(external_irq_callback_args_t *p_args);
+#endif
+/* 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/ARDUINO_PORTENTA_C33/ra_gen/hal_data.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/hal_data.c
new file mode 100644
index 0000000000000..2240eb99ea83f
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/hal_data.c
@@ -0,0 +1,611 @@
+/* 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
+#define RA_NOT_DEFINED (UINT32_MAX)
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+
+/* If the transfer module is DMAC, define a DMAC transfer callback. */
+#include "r_dmac.h"
+extern void spi_tx_dmac_callback(spi_instance_ctrl_t const *const p_ctrl);
+
+void g_spi1_tx_transfer_callback(dmac_callback_args_t *p_args) {
+    FSP_PARAMETER_NOT_USED(p_args);
+    spi_tx_dmac_callback(&g_spi1_ctrl);
+}
+#endif
+
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+
+/* If the transfer module is DMAC, define a DMAC transfer callback. */
+#include "r_dmac.h"
+extern void spi_rx_dmac_callback(spi_instance_ctrl_t const *const p_ctrl);
+
+void g_spi1_rx_transfer_callback(dmac_callback_args_t *p_args) {
+    FSP_PARAMETER_NOT_USED(p_args);
+    spi_rx_dmac_callback(&g_spi1_ctrl);
+}
+#endif
+#undef RA_NOT_DEFINED
+
+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_HIGH,
+  .ssl_select = SPI_SSL_SELECT_SSL1,
+  .mosi_idle = SPI_MOSI_IDLE_VALUE_FIXING_DISABLE,
+  .parity = SPI_PARITY_MODE_DISABLE,
+  .byte_swap = SPI_BYTE_SWAP_DISABLE,
+  .spck_div =
+  {
+      /* Actual calculated bitrate: 10000000. */ .spbr = 4,
+      .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_HIGH,
+
+  .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 };
+sci_uart_instance_ctrl_t g_uart8_ctrl;
+
+baud_setting_t g_uart8_baud_setting =
+{
+    /* Baud rate calculated with 0.469% error. */ .semr_baudrate_bits_b.abcse = 1,
+    .semr_baudrate_bits_b.abcs = 0, .semr_baudrate_bits_b.bgdm = 0, .cks = 0, .brr = 17, .mddr = (uint8_t)256, .semr_baudrate_bits_b.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, .flow_control =
+      SCI_UART_FLOW_CONTROL_HARDWARE_CTSRTS,
+  #if 0xFF != 0xFF
+  .flow_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+  #endif
+  .rs485_setting =
+  { .enable = SCI_UART_RS485_DISABLE, .polarity = SCI_UART_RS485_DE_POLARITY_HIGH,
+    #if 0xFF != 0xFF
+    .de_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+    #else
+    .de_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+    #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 };
+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,
+  .agtoab_settings_b.agtoa = AGT_PIN_CFG_DISABLED,
+  .agtoab_settings_b.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.00131072 seconds. Actual duty: 50%. */ .period_counts = (uint32_t)0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 1, .p_callback = NULL,
+  /** 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,
+  .agtoab_settings_b.agtoa = AGT_PIN_CFG_DISABLED,
+  .agtoab_settings_b.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.00131072 seconds. Actual duty: 50%. */ .period_counts = (uint32_t)0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 0, .p_callback = NULL,
+  /** 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 };
+dac_instance_ctrl_t g_dac1_ctrl;
+const dac_extended_cfg_t g_dac1_ext_cfg =
+{ .enable_charge_pump = 0,
+  .data_format = DAC_DATA_FORMAT_FLUSH_RIGHT,
+  .output_amplifier_enabled = 0,
+  .internal_output_enabled = false, };
+const dac_cfg_t g_dac1_cfg =
+{ .channel = 1, .ad_da_synchronized = false, .p_extend = &g_dac1_ext_cfg };
+/* Instance structure to use this module. */
+const dac_instance_t g_dac1 =
+{ .p_ctrl = &g_dac1_ctrl, .p_cfg = &g_dac1_cfg, .p_api = &g_dac_on_dac };
+dac_instance_ctrl_t g_dac0_ctrl;
+const dac_extended_cfg_t g_dac0_ext_cfg =
+{ .enable_charge_pump = 0,
+  .data_format = DAC_DATA_FORMAT_FLUSH_RIGHT,
+  .output_amplifier_enabled = 0,
+  .internal_output_enabled = false, };
+const dac_cfg_t g_dac0_cfg =
+{ .channel = 0, .ad_da_synchronized = false, .p_extend = &g_dac0_ext_cfg };
+/* Instance structure to use this module. */
+const dac_instance_t g_dac0 =
+{ .p_ctrl = &g_dac0_ctrl, .p_cfg = &g_dac0_cfg, .p_api = &g_dac_on_dac };
+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,
+  .enable_adbuf = 0,
+  #if defined(VECTOR_NUMBER_ADC0_WINDOW_A)
+  .window_a_irq = VECTOR_NUMBER_ADC0_WINDOW_A,
+  #else
+  .window_a_irq = FSP_INVALID_VECTOR,
+  #endif
+  .window_a_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC0_WINDOW_B)
+  .window_b_irq = VECTOR_NUMBER_ADC0_WINDOW_B,
+  #else
+  .window_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .window_b_ipl = (BSP_IRQ_DISABLED), };
+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,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .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), };
+#if ((0) | (0))
+const adc_window_cfg_t g_adc0_window_cfg =
+{
+    .compare_mask = 0,
+    .compare_mode_mask = 0,
+    .compare_cfg = (0) | (0) | (0) | (ADC_COMPARE_CFG_EVENT_OUTPUT_OR),
+    .compare_ref_low = 0,
+    .compare_ref_high = 0,
+    .compare_b_channel = (ADC_WINDOW_B_CHANNEL_0),
+    .compare_b_mode = (ADC_WINDOW_B_MODE_LESS_THAN_OR_OUTSIDE),
+    .compare_b_ref_low = 0,
+    .compare_b_ref_high = 0,
+};
+#endif
+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,
+  #if ((0) | (0))
+  .p_window_cfg = (adc_window_cfg_t *)&g_adc0_window_cfg,
+  #else
+  .p_window_cfg = NULL,
+  #endif
+};
+/* 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, .timeout_scl_low = IIC_MASTER_TIMEOUT_SCL_LOW_ENABLED,
+/* Actual calculated bitrate: 98425. Actual calculated duty cycle: 50%. */ .clock_settings.brl_value = 28,
+  .clock_settings.brh_value = 28, .clock_settings.cks_value = 3, };
+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 = NULL,
+  .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 };
+usb_instance_ctrl_t g_basic0_ctrl;
+
+#if !defined(g_usb_descriptor)
+extern usb_descriptor_t g_usb_descriptor;
+#endif
+#define RA_NOT_DEFINED (1)
+const usb_cfg_t g_basic0_cfg =
+{ .usb_mode = USB_MODE_PERI, .usb_speed = USB_SPEED_FS, .module_number = 0, .type = USB_CLASS_PCDC,
+  #if defined(g_usb_descriptor)
+  .p_usb_reg = g_usb_descriptor,
+  #else
+  .p_usb_reg = &g_usb_descriptor,
+  #endif
+  .usb_complience_cb = NULL,
+  #if defined(VECTOR_NUMBER_USBFS_INT)
+  .irq = VECTOR_NUMBER_USBFS_INT,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_USBFS_RESUME)
+  .irq_r = VECTOR_NUMBER_USBFS_RESUME,
+  #else
+  .irq_r = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_USBFS_FIFO_0)
+  .irq_d0 = VECTOR_NUMBER_USBFS_FIFO_0,
+  #else
+  .irq_d0 = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_USBFS_FIFO_1)
+  .irq_d1 = VECTOR_NUMBER_USBFS_FIFO_1,
+  #else
+  .irq_d1 = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_USBHS_USB_INT_RESUME)
+  .hsirq = VECTOR_NUMBER_USBHS_USB_INT_RESUME,
+  #else
+  .hsirq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_USBHS_FIFO_0)
+  .hsirq_d0 = VECTOR_NUMBER_USBHS_FIFO_0,
+  #else
+  .hsirq_d0 = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_USBHS_FIFO_1)
+  .hsirq_d1 = VECTOR_NUMBER_USBHS_FIFO_1,
+  #else
+  .hsirq_d1 = FSP_INVALID_VECTOR,
+  #endif
+  .ipl = (12),
+  .ipl_r = (12), .ipl_d0 = (12), .ipl_d1 = (12), .hsipl = (12), .hsipl_d0 = (12), .hsipl_d1 = (12),
+  #if (BSP_CFG_RTOS != 0)
+  .p_usb_apl_callback = NULL,
+  #else
+  .p_usb_apl_callback = NULL,
+  #endif
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+};
+#undef RA_NOT_DEFINED
+
+/* Instance structure to use this module. */
+const usb_instance_t g_basic0 =
+{ .p_ctrl = &g_basic0_ctrl, .p_cfg = &g_basic0_cfg, .p_api = &g_usb_on_usb, };
+
+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.469% error. */ .semr_baudrate_bits_b.abcse = 0,
+    .semr_baudrate_bits_b.abcs = 0, .semr_baudrate_bits_b.bgdm = 1, .cks = 0, .brr = 53, .mddr = (uint8_t)256, .semr_baudrate_bits_b.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, .flow_control =
+      SCI_UART_FLOW_CONTROL_RTS,
+  #if 0xFF != 0xFF
+  .flow_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+  #endif
+  .rs485_setting =
+  { .enable = SCI_UART_RS485_DISABLE, .polarity = SCI_UART_RS485_DE_POLARITY_HIGH,
+    #if 0xFF != 0xFF
+    .de_control_pin = BSP_IO_PORT_FF_PIN_0xFF,
+    #else
+    .de_control_pin = (bsp_io_port_pin_t)UINT16_MAX,
+    #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 };
+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 };
+lpm_instance_ctrl_t g_lpm0_ctrl;
+
+const lpm_cfg_t g_lpm0_cfg =
+{ .low_power_mode = LPM_MODE_SLEEP, .standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_RTCALM
+      | (lpm_standby_wake_source_t)0,
+  #if BSP_FEATURE_LPM_HAS_SNOOZE
+  .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+  .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+  .snooze_end_sources = (lpm_snooze_end_t)0,
+  .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+  #endif
+  #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
+  #if BSP_FEATURE_LPM_HAS_PDRAMSCR
+  .ram_retention_cfg.ram_retention = (uint8_t)(0),
+  .ram_retention_cfg.tcm_retention = false,
+  #endif
+  #if BSP_FEATURE_LPM_HAS_DPSBYCR_SRKEEP
+  .ram_retention_cfg.standby_ram_retention = false,
+  #endif
+  #if BSP_FEATURE_LPM_HAS_LDO_CONTROL
+  .ldo_standby_cfg.pll1_ldo = false,
+  .ldo_standby_cfg.pll2_ldo = false,
+  .ldo_standby_cfg.hoco_ldo = false,
+  #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 };
+void g_hal_init(void) {
+    g_common_init();
+}
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/hal_data.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/hal_data.h
new file mode 100644
index 0000000000000..1165f8257f559
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/hal_data.h
@@ -0,0 +1,177 @@
+/* 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_spi.h"
+#include "r_sci_uart.h"
+#include "r_uart_api.h"
+#include "r_agt.h"
+#include "r_timer_api.h"
+#include "r_dac.h"
+#include "r_dac_api.h"
+#include "r_adc.h"
+#include "r_adc_api.h"
+#include "r_iic_master.h"
+#include "r_i2c_master_api.h"
+#include "r_usb_basic.h"
+#include "r_usb_basic_api.h"
+#include "r_usb_pcdc_api.h"
+#include "r_rtc.h"
+#include "r_rtc_api.h"
+#include "r_flash_hp.h"
+#include "r_flash_api.h"
+#include "r_lpm.h"
+#include "r_lpm_api.h"
+FSP_HEADER
+/** 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 == RA_NOT_DEFINED)
+#define g_spi1_P_TRANSFER_TX (NULL)
+#else
+    #define g_spi1_P_TRANSFER_TX (&RA_NOT_DEFINED)
+#endif
+#if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+#define g_spi1_P_TRANSFER_RX (NULL)
+#else
+    #define g_spi1_P_TRANSFER_RX (&RA_NOT_DEFINED)
+#endif
+#undef RA_NOT_DEFINED
+/** 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
+/** 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 NULL
+void NULL(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 NULL
+void NULL(timer_callback_args_t *p_args);
+#endif
+/** DAC on DAC Instance. */
+extern const dac_instance_t g_dac1;
+
+/** Access the DAC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dac_instance_ctrl_t g_dac1_ctrl;
+extern const dac_cfg_t g_dac1_cfg;
+/** DAC on DAC Instance. */
+extern const dac_instance_t g_dac0;
+
+/** Access the DAC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dac_instance_ctrl_t g_dac0_ctrl;
+extern const dac_cfg_t g_dac0_cfg;
+/** 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
+
+#ifndef NULL
+#define ADC_DMAC_CHANNELS_PER_BLOCK_NULL  0
+#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 NULL
+void NULL(i2c_master_callback_args_t *p_args);
+#endif
+/* Basic on USB Instance. */
+extern const usb_instance_t g_basic0;
+
+/** Access the USB instance using these structures when calling API functions directly (::p_api is not used). */
+extern usb_instance_ctrl_t g_basic0_ctrl;
+extern const usb_cfg_t g_basic0_cfg;
+
+#ifndef NULL
+void NULL(void *);
+#endif
+
+#if 2 == BSP_CFG_RTOS
+#ifndef NULL
+void NULL(usb_event_info_t *, usb_hdl_t, usb_onoff_t);
+#endif
+#endif
+/** CDC Driver on USB Instance. */
+/* 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
+/* 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
+/** 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;
+void hal_entry(void);
+void g_hal_init(void);
+FSP_FOOTER
+#endif /* HAL_DATA_H_ */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c
new file mode 100644
index 0000000000000..895f662f27310
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c
@@ -0,0 +1,76 @@
+/* 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_00_PIN_01, .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) },
+    { .pin = BSP_IO_PORT_00_PIN_02, .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) },
+    { .pin = BSP_IO_PORT_00_PIN_04, .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) },
+    { .pin = BSP_IO_PORT_00_PIN_05, .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) },
+    { .pin = BSP_IO_PORT_00_PIN_06, .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) },
+    { .pin = BSP_IO_PORT_00_PIN_14, .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE) },
+    { .pin = BSP_IO_PORT_00_PIN_15, .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_04, .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_10, .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+        | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9) },
+    { .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_07, .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_08, .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_02, .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+        | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9) },
+    { .pin = BSP_IO_PORT_06_PIN_07, .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
+        | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8) },
+    { .pin = BSP_IO_PORT_10_PIN_00, .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], };
+
+#if BSP_TZ_SECURE_BUILD
+
+void R_BSP_PinCfgSecurityInit(void);
+
+/* Initialize SAR registers for secure pins. */
+void R_BSP_PinCfgSecurityInit(void) {
+    #if (2U == BSP_FEATURE_IOPORT_VERSION)
+    uint32_t pmsar[BSP_FEATURE_BSP_NUM_PMSAR];
+    #else
+    uint16_t pmsar[BSP_FEATURE_BSP_NUM_PMSAR];
+    #endif
+    memset(pmsar, 0xFF, BSP_FEATURE_BSP_NUM_PMSAR * sizeof(R_PMISC->PMSAR[0]));
+
+
+    for (uint32_t i = 0; i < g_bsp_pin_cfg.number_of_pins; i++)
+    {
+        uint32_t port_pin = g_bsp_pin_cfg.p_pin_cfg_data[i].pin;
+        uint32_t port = port_pin >> 8U;
+        uint32_t pin = port_pin & 0xFFU;
+        pmsar[port] &= (uint16_t) ~(1U << pin);
+    }
+
+    for (uint32_t i = 0; i < BSP_FEATURE_BSP_NUM_PMSAR; i++)
+    {
+        #if (2U == BSP_FEATURE_IOPORT_VERSION)
+        R_PMISC->PMSAR[i].PMSAR = (uint16_t)pmsar[i];
+        #else
+        R_PMISC->PMSAR[i].PMSAR = pmsar[i];
+        #endif
+    }
+
+}
+#endif
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c
new file mode 100644
index 0000000000000..ea8b0511ba178
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c
@@ -0,0 +1,69 @@
+/* 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,                     /* SCI9 RXI (Received data full) */
+    [1] = sci_uart_txi_isr,         /* SCI9 TXI (Transmit data empty) */
+    [2] = sci_uart_tei_isr,         /* SCI9 TEI (Transmit end) */
+    [3] = sci_uart_eri_isr,         /* SCI9 ERI (Receive error) */
+    [4] = rtc_alarm_periodic_isr,         /* RTC ALARM (Alarm interrupt) */
+    [5] = rtc_alarm_periodic_isr,         /* RTC PERIOD (Periodic interrupt) */
+    [6] = rtc_carry_isr,         /* RTC CARRY (Carry interrupt) */
+    [7] = r_icu_isr,         /* ICU IRQ0 (External pin interrupt 0) */
+    [8] = usbfs_interrupt_handler,         /* USBFS INT (USBFS interrupt) */
+    [9] = usbfs_resume_handler,         /* USBFS RESUME (USBFS resume interrupt) */
+    [10] = usbfs_d0fifo_handler,         /* USBFS FIFO 0 (DMA transfer request 0) */
+    [11] = usbfs_d1fifo_handler,         /* USBFS FIFO 1 (DMA transfer request 1) */
+    [12] = usbhs_interrupt_handler,         /* USBHS USB INT RESUME (USBHS interrupt) */
+    [13] = usbhs_d0fifo_handler,         /* USBHS FIFO 0 (DMA transfer request 0) */
+    [14] = usbhs_d1fifo_handler,         /* USBHS FIFO 1 (DMA transfer request 1) */
+    [15] = iic_master_rxi_isr,         /* IIC0 RXI (Receive data full) */
+    [16] = iic_master_txi_isr,         /* IIC0 TXI (Transmit data empty) */
+    [17] = iic_master_tei_isr,         /* IIC0 TEI (Transmit end) */
+    [18] = iic_master_eri_isr,         /* IIC0 ERI (Transfer error) */
+    [19] = agt_int_isr,         /* AGT0 INT (AGT interrupt) */
+    [20] = agt_int_isr,         /* AGT1 INT (AGT interrupt) */
+    [21] = sci_uart_rxi_isr,         /* SCI8 RXI (Received data full) */
+    [22] = sci_uart_txi_isr,         /* SCI8 TXI (Transmit data empty) */
+    [23] = sci_uart_tei_isr,         /* SCI8 TEI (Transmit end) */
+    [24] = sci_uart_eri_isr,         /* SCI8 ERI (Receive error) */
+    [25] = spi_rxi_isr,         /* SPI1 RXI (Receive buffer full) */
+    [26] = spi_txi_isr,         /* SPI1 TXI (Transmit buffer empty) */
+    [27] = spi_tei_isr,         /* SPI1 TEI (Transmission complete event) */
+    [28] = spi_eri_isr,         /* SPI1 ERI (Error) */
+};
+const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
+{
+    [0] = BSP_PRV_IELS_ENUM(EVENT_SCI9_RXI),         /* SCI9 RXI (Received data full) */
+    [1] = BSP_PRV_IELS_ENUM(EVENT_SCI9_TXI),         /* SCI9 TXI (Transmit data empty) */
+    [2] = BSP_PRV_IELS_ENUM(EVENT_SCI9_TEI),         /* SCI9 TEI (Transmit end) */
+    [3] = BSP_PRV_IELS_ENUM(EVENT_SCI9_ERI),         /* SCI9 ERI (Receive error) */
+    [4] = BSP_PRV_IELS_ENUM(EVENT_RTC_ALARM),         /* RTC ALARM (Alarm interrupt) */
+    [5] = BSP_PRV_IELS_ENUM(EVENT_RTC_PERIOD),         /* RTC PERIOD (Periodic interrupt) */
+    [6] = BSP_PRV_IELS_ENUM(EVENT_RTC_CARRY),         /* RTC CARRY (Carry interrupt) */
+    [7] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ0),         /* ICU IRQ0 (External pin interrupt 0) */
+    [8] = BSP_PRV_IELS_ENUM(EVENT_USBFS_INT),         /* USBFS INT (USBFS interrupt) */
+    [9] = BSP_PRV_IELS_ENUM(EVENT_USBFS_RESUME),         /* USBFS RESUME (USBFS resume interrupt) */
+    [10] = BSP_PRV_IELS_ENUM(EVENT_USBFS_FIFO_0),         /* USBFS FIFO 0 (DMA transfer request 0) */
+    [11] = BSP_PRV_IELS_ENUM(EVENT_USBFS_FIFO_1),         /* USBFS FIFO 1 (DMA transfer request 1) */
+    [12] = BSP_PRV_IELS_ENUM(EVENT_USBHS_USB_INT_RESUME),         /* USBHS USB INT RESUME (USBHS interrupt) */
+    [13] = BSP_PRV_IELS_ENUM(EVENT_USBHS_FIFO_0),         /* USBHS FIFO 0 (DMA transfer request 0) */
+    [14] = BSP_PRV_IELS_ENUM(EVENT_USBHS_FIFO_1),         /* USBHS FIFO 1 (DMA transfer request 1) */
+    [15] = BSP_PRV_IELS_ENUM(EVENT_IIC0_RXI),         /* IIC0 RXI (Receive data full) */
+    [16] = BSP_PRV_IELS_ENUM(EVENT_IIC0_TXI),         /* IIC0 TXI (Transmit data empty) */
+    [17] = BSP_PRV_IELS_ENUM(EVENT_IIC0_TEI),         /* IIC0 TEI (Transmit end) */
+    [18] = BSP_PRV_IELS_ENUM(EVENT_IIC0_ERI),         /* IIC0 ERI (Transfer error) */
+    [19] = BSP_PRV_IELS_ENUM(EVENT_AGT0_INT),         /* AGT0 INT (AGT interrupt) */
+    [20] = BSP_PRV_IELS_ENUM(EVENT_AGT1_INT),         /* AGT1 INT (AGT interrupt) */
+    [21] = BSP_PRV_IELS_ENUM(EVENT_SCI8_RXI),         /* SCI8 RXI (Received data full) */
+    [22] = BSP_PRV_IELS_ENUM(EVENT_SCI8_TXI),         /* SCI8 TXI (Transmit data empty) */
+    [23] = BSP_PRV_IELS_ENUM(EVENT_SCI8_TEI),         /* SCI8 TEI (Transmit end) */
+    [24] = BSP_PRV_IELS_ENUM(EVENT_SCI8_ERI),         /* SCI8 ERI (Receive error) */
+    [25] = BSP_PRV_IELS_ENUM(EVENT_SPI1_RXI),         /* SPI1 RXI (Receive buffer full) */
+    [26] = BSP_PRV_IELS_ENUM(EVENT_SPI1_TXI),         /* SPI1 TXI (Transmit buffer empty) */
+    [27] = BSP_PRV_IELS_ENUM(EVENT_SPI1_TEI),         /* SPI1 TEI (Transmission complete event) */
+    [28] = BSP_PRV_IELS_ENUM(EVENT_SPI1_ERI),         /* SPI1 ERI (Error) */
+};
+#endif
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h
new file mode 100644
index 0000000000000..2342dbbab1a4b
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h
@@ -0,0 +1,98 @@
+/* generated vector header file - do not edit */
+#ifndef VECTOR_DATA_H
+#define VECTOR_DATA_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Number of interrupts allocated */
+#ifndef VECTOR_DATA_IRQ_COUNT
+#define VECTOR_DATA_IRQ_COUNT    (29)
+#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 r_icu_isr(void);
+void usbfs_interrupt_handler(void);
+void usbfs_resume_handler(void);
+void usbfs_d0fifo_handler(void);
+void usbfs_d1fifo_handler(void);
+void usbhs_interrupt_handler(void);
+void usbhs_d0fifo_handler(void);
+void usbhs_d1fifo_handler(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);
+void agt_int_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_SCI9_RXI ((IRQn_Type)0)  /* SCI9 RXI (Received data full) */
+#define SCI9_RXI_IRQn          ((IRQn_Type)0)  /* SCI9 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI9_TXI ((IRQn_Type)1)  /* SCI9 TXI (Transmit data empty) */
+#define SCI9_TXI_IRQn          ((IRQn_Type)1)  /* SCI9 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI9_TEI ((IRQn_Type)2)  /* SCI9 TEI (Transmit end) */
+#define SCI9_TEI_IRQn          ((IRQn_Type)2)  /* SCI9 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI9_ERI ((IRQn_Type)3)  /* SCI9 ERI (Receive error) */
+#define SCI9_ERI_IRQn          ((IRQn_Type)3)  /* SCI9 ERI (Receive error) */
+#define VECTOR_NUMBER_RTC_ALARM ((IRQn_Type)4)  /* RTC ALARM (Alarm interrupt) */
+#define RTC_ALARM_IRQn          ((IRQn_Type)4)  /* RTC ALARM (Alarm interrupt) */
+#define VECTOR_NUMBER_RTC_PERIOD ((IRQn_Type)5)  /* RTC PERIOD (Periodic interrupt) */
+#define RTC_PERIOD_IRQn          ((IRQn_Type)5)  /* RTC PERIOD (Periodic interrupt) */
+#define VECTOR_NUMBER_RTC_CARRY ((IRQn_Type)6)  /* RTC CARRY (Carry interrupt) */
+#define RTC_CARRY_IRQn          ((IRQn_Type)6)  /* RTC CARRY (Carry interrupt) */
+#define VECTOR_NUMBER_ICU_IRQ0 ((IRQn_Type)7)  /* ICU IRQ0 (External pin interrupt 0) */
+#define ICU_IRQ0_IRQn          ((IRQn_Type)7)  /* ICU IRQ0 (External pin interrupt 0) */
+#define VECTOR_NUMBER_USBFS_INT ((IRQn_Type)8)  /* USBFS INT (USBFS interrupt) */
+#define USBFS_INT_IRQn          ((IRQn_Type)8)  /* USBFS INT (USBFS interrupt) */
+#define VECTOR_NUMBER_USBFS_RESUME ((IRQn_Type)9)  /* USBFS RESUME (USBFS resume interrupt) */
+#define USBFS_RESUME_IRQn          ((IRQn_Type)9)  /* USBFS RESUME (USBFS resume interrupt) */
+#define VECTOR_NUMBER_USBFS_FIFO_0 ((IRQn_Type)10)  /* USBFS FIFO 0 (DMA transfer request 0) */
+#define USBFS_FIFO_0_IRQn          ((IRQn_Type)10)  /* USBFS FIFO 0 (DMA transfer request 0) */
+#define VECTOR_NUMBER_USBFS_FIFO_1 ((IRQn_Type)11)  /* USBFS FIFO 1 (DMA transfer request 1) */
+#define USBFS_FIFO_1_IRQn          ((IRQn_Type)11)  /* USBFS FIFO 1 (DMA transfer request 1) */
+#define VECTOR_NUMBER_USBHS_USB_INT_RESUME ((IRQn_Type)12)  /* USBHS USB INT RESUME (USBHS interrupt) */
+#define USBHS_USB_INT_RESUME_IRQn          ((IRQn_Type)12)  /* USBHS USB INT RESUME (USBHS interrupt) */
+#define VECTOR_NUMBER_USBHS_FIFO_0 ((IRQn_Type)13)  /* USBHS FIFO 0 (DMA transfer request 0) */
+#define USBHS_FIFO_0_IRQn          ((IRQn_Type)13)  /* USBHS FIFO 0 (DMA transfer request 0) */
+#define VECTOR_NUMBER_USBHS_FIFO_1 ((IRQn_Type)14)  /* USBHS FIFO 1 (DMA transfer request 1) */
+#define USBHS_FIFO_1_IRQn          ((IRQn_Type)14)  /* USBHS FIFO 1 (DMA transfer request 1) */
+#define VECTOR_NUMBER_IIC0_RXI ((IRQn_Type)15)  /* IIC0 RXI (Receive data full) */
+#define IIC0_RXI_IRQn          ((IRQn_Type)15)  /* IIC0 RXI (Receive data full) */
+#define VECTOR_NUMBER_IIC0_TXI ((IRQn_Type)16)  /* IIC0 TXI (Transmit data empty) */
+#define IIC0_TXI_IRQn          ((IRQn_Type)16)  /* IIC0 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_IIC0_TEI ((IRQn_Type)17)  /* IIC0 TEI (Transmit end) */
+#define IIC0_TEI_IRQn          ((IRQn_Type)17)  /* IIC0 TEI (Transmit end) */
+#define VECTOR_NUMBER_IIC0_ERI ((IRQn_Type)18)  /* IIC0 ERI (Transfer error) */
+#define IIC0_ERI_IRQn          ((IRQn_Type)18)  /* IIC0 ERI (Transfer error) */
+#define VECTOR_NUMBER_AGT0_INT ((IRQn_Type)19)  /* AGT0 INT (AGT interrupt) */
+#define AGT0_INT_IRQn          ((IRQn_Type)19)  /* AGT0 INT (AGT interrupt) */
+#define VECTOR_NUMBER_AGT1_INT ((IRQn_Type)20)  /* AGT1 INT (AGT interrupt) */
+#define AGT1_INT_IRQn          ((IRQn_Type)20)  /* AGT1 INT (AGT interrupt) */
+#define VECTOR_NUMBER_SCI8_RXI ((IRQn_Type)21)  /* SCI8 RXI (Received data full) */
+#define SCI8_RXI_IRQn          ((IRQn_Type)21)  /* SCI8 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI8_TXI ((IRQn_Type)22)  /* SCI8 TXI (Transmit data empty) */
+#define SCI8_TXI_IRQn          ((IRQn_Type)22)  /* SCI8 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI8_TEI ((IRQn_Type)23)  /* SCI8 TEI (Transmit end) */
+#define SCI8_TEI_IRQn          ((IRQn_Type)23)  /* SCI8 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI8_ERI ((IRQn_Type)24)  /* SCI8 ERI (Receive error) */
+#define SCI8_ERI_IRQn          ((IRQn_Type)24)  /* SCI8 ERI (Receive error) */
+#define VECTOR_NUMBER_SPI1_RXI ((IRQn_Type)25)  /* SPI1 RXI (Receive buffer full) */
+#define SPI1_RXI_IRQn          ((IRQn_Type)25)  /* SPI1 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI1_TXI ((IRQn_Type)26)  /* SPI1 TXI (Transmit buffer empty) */
+#define SPI1_TXI_IRQn          ((IRQn_Type)26)  /* SPI1 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI1_TEI ((IRQn_Type)27)  /* SPI1 TEI (Transmission complete event) */
+#define SPI1_TEI_IRQn          ((IRQn_Type)27)  /* SPI1 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI1_ERI ((IRQn_Type)28)  /* SPI1 ERI (Error) */
+#define SPI1_ERI_IRQn          ((IRQn_Type)28)  /* SPI1 ERI (Error) */
+#ifdef __cplusplus
+}
+#endif
+#endif /* VECTOR_DATA_H */

From 174bb28d8e27c7b082d2c8d7b18f7bf2cdf2c62e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Sep 2023 10:03:31 +0200
Subject: [PATCH 0320/3129] tools/ci.sh: Add ARDUINO_PORTENTA_C33 to RA CI
 build.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 tools/ci.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 5ce742b01bed8..efa492bd19ed5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -249,6 +249,7 @@ function ci_qemu_arm_build {
 
 function ci_renesas_ra_setup {
     ci_gcc_arm_setup
+    sudo apt-get install protobuf-c-compiler
 }
 
 function ci_renesas_ra_board_build {
@@ -259,6 +260,8 @@ function ci_renesas_ra_board_build {
     make ${MAKEOPTS} -C ports/renesas-ra BOARD=EK_RA6M1
     make ${MAKEOPTS} -C ports/renesas-ra BOARD=EK_RA4M1
     make ${MAKEOPTS} -C ports/renesas-ra BOARD=EK_RA4W1
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=ARDUINO_PORTENTA_C33 submodules
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=ARDUINO_PORTENTA_C33
 }
 
 ########################################################################################

From 3e8aed9fcce9068f40780b23148feaa1e041a18a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Sep 2023 10:58:19 +1000
Subject: [PATCH 0321/3129] py/gc: Add "max new split" value in result of
 gc.mem_free().

Follow-up to 519c24dd487 when MICROPY_GC_SPLIT_HEAP_AUTO is enabled, based
on discussion at
https://github.com/orgs/micropython/discussions/12316#discussioncomment-6858007

gc.mem_free() is always a heuristic, but this makes it a more useful
heuristic for common use cases.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/gc.c    | 7 ++++++-
 py/gc.h    | 3 +++
 py/modgc.c | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/py/gc.c b/py/gc.c
index b2e4aa4aae8dd..80e5f80360685 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -701,6 +701,11 @@ void gc_info(gc_info_t *info) {
 
     info->used *= BYTES_PER_BLOCK;
     info->free *= BYTES_PER_BLOCK;
+
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    info->max_new_split = gc_get_max_new_split();
+    #endif
+
     GC_EXIT();
 }
 
@@ -1159,7 +1164,7 @@ void gc_dump_info(const mp_print_t *print) {
     mp_printf(print, "GC: total: %u, used: %u, free: %u",
         (uint)info.total, (uint)info.used, (uint)info.free);
     #if MICROPY_GC_SPLIT_HEAP_AUTO
-    mp_printf(print, ", max new split: %u", (uint)gc_get_max_new_split());
+    mp_printf(print, ", max new split: %u", (uint)info.max_new_split);
     #endif
     mp_printf(print, "\n No. of 1-blocks: %u, 2-blocks: %u, max blk sz: %u, max free sz: %u\n",
         (uint)info.num_1block, (uint)info.num_2block, (uint)info.max_block, (uint)info.max_free);
diff --git a/py/gc.h b/py/gc.h
index 7eec6265c87d5..36177633062b2 100644
--- a/py/gc.h
+++ b/py/gc.h
@@ -75,6 +75,9 @@ typedef struct _gc_info_t {
     size_t num_1block;
     size_t num_2block;
     size_t max_block;
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    size_t max_new_split;
+    #endif
 } gc_info_t;
 
 void gc_info(gc_info_t *info);
diff --git a/py/modgc.c b/py/modgc.c
index c11bcaecd7ddf..7b18045b083a3 100644
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -64,7 +64,12 @@ MP_DEFINE_CONST_FUN_OBJ_0(gc_isenabled_obj, gc_isenabled);
 STATIC mp_obj_t gc_mem_free(void) {
     gc_info_t info;
     gc_info(&info);
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    // Include max_new_split value here as a more useful heuristic
+    return MP_OBJ_NEW_SMALL_INT(info.free + info.max_new_split);
+    #else
     return MP_OBJ_NEW_SMALL_INT(info.free);
+    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_0(gc_mem_free_obj, gc_mem_free);
 

From 26160e8ed54410e3d630c03e1c46eb59e02c2594 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Sep 2023 11:06:23 +1000
Subject: [PATCH 0322/3129] docs/library/esp32: Update ESP32 idf_heap_info docs
 to match behaviour.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/esp32.rst | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index d6b4051a2fa2e..7701f43539819 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -56,15 +56,6 @@ Functions
     two most useful ones are predefined as `esp32.HEAP_DATA` for data heap regions and
     `esp32.HEAP_EXEC` for executable regions as used by the native code emitter.
 
-    Free IDF heap memory in the `esp32.HEAP_DATA` region is available to be
-    automatically added to the MicroPython heap to prevent a MicroPython
-    allocation from failing. However, the information returned here is otherwise
-    *not* useful to troubleshoot Python allocation failures, use
-    `micropython.mem_info()` instead. The "max new split" value in
-    `micropython.mem_info()` output corresponds to the largest free block of
-    ESP-IDF heap that could be automatically added on demand to the MicroPython
-    heap.
-
     The return value is a list of 4-tuples, where each 4-tuple corresponds to one heap
     and contains: the total bytes, the free bytes, the largest free block, and
     the minimum free seen over time.
@@ -75,6 +66,21 @@ Functions
         [(240, 0, 0, 0), (7288, 0, 0, 0), (16648, 4, 4, 4), (79912, 35712, 35512, 35108),
          (15072, 15036, 15036, 15036), (113840, 0, 0, 0)]
 
+    .. note:: Free IDF heap memory in the `esp32.HEAP_DATA` region is available
+       to be automatically added to the MicroPython heap to prevent a
+       MicroPython allocation from failing. However, the information returned
+       here is otherwise *not* useful to troubleshoot Python allocation
+       failures. :func:`micropython.mem_info()` and :func:`gc.mem_free()` should
+       be used instead:
+
+       The "max new split" value in :func:`micropython.mem_info()` output
+       corresponds to the largest free block of ESP-IDF heap that could be
+       automatically added on demand to the MicroPython heap.
+
+       The result of :func:`gc.mem_free()` is the total of the current "free"
+       and "max new split" values printed by :func:`micropython.mem_info()`.
+
+
 Flash partitions
 ----------------
 

From 92f379cce4cd5bc9d07f1ad76cd9674ca02f54e7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Sep 2023 11:05:47 +1000
Subject: [PATCH 0323/3129] docs/library/gc: Clarify mem_alloc and mem_free
 only for Python heap.

As raised in discussions of the ESP32 memory management changes.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/gc.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/library/gc.rst b/docs/library/gc.rst
index c823aed3e688b..2ba204e2293c0 100644
--- a/docs/library/gc.rst
+++ b/docs/library/gc.rst
@@ -24,7 +24,7 @@ Functions
 
 .. function:: mem_alloc()
 
-   Return the number of bytes of heap RAM that are allocated.
+   Return the number of bytes of heap RAM that are allocated by Python code.
 
    .. admonition:: Difference to CPython
       :class: attention
@@ -33,8 +33,8 @@ Functions
 
 .. function:: mem_free()
 
-   Return the number of bytes of available heap RAM, or -1 if this amount
-   is not known.
+   Return the number of bytes of heap RAM that is available for Python
+   code to allocate, or -1 if this amount is not known.
 
    .. admonition:: Difference to CPython
       :class: attention

From 7087880ce9407a64265df87ad451228d0dca2133 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 11 Sep 2023 16:17:43 +0200
Subject: [PATCH 0324/3129] esp32/machine_pin: Fix null pointer access in
 machine_pin_find.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/esp32/machine_pin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 835f16b1b066b..9f1bc579851e5 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -113,7 +113,7 @@ STATIC const machine_pin_obj_t *machine_pin_find(mp_obj_t pin_in) {
     // Try to find the pin in the board pins dict.
     if (mp_obj_is_str(pin_in)) {
         const machine_pin_obj_t *self = machine_pin_find_named(&machine_pin_board_pins_locals_dict, pin_in);
-        if (self->base.type != NULL) {
+        if (self && self->base.type != NULL) {
             return self;
         }
     }

From 6abe3e1714ca32524358e1e1ddde16872d7d7cea Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 10 Apr 2023 15:07:12 +0200
Subject: [PATCH 0325/3129] rp2/mpbthciport: Switch to static scheduler nodes.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/mpbthciport.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index d5b3c6073ade2..9a24ebdc32a9a 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -43,11 +43,9 @@ 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;
+static mp_sched_node_t mp_bluetooth_hci_sched_node;
 
 void mp_bluetooth_hci_init(void) {
-    events_task_is_scheduled = false;
 }
 
 static int64_t mp_bluetooth_hci_timer_callback(alarm_id_t id, void *user_data) {
@@ -65,25 +63,16 @@ void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
 
 // 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 HCI data, and run any callouts or events.
+STATIC void run_events_scheduled_task(mp_sched_node_t *node) {
+    (void)node;
+    // 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_sched_schedule_node(&mp_bluetooth_hci_sched_node, run_events_scheduled_task);
 }
 
 #if defined(MICROPY_HW_BLE_UART_ID)
@@ -91,7 +80,6 @@ void mp_bluetooth_hci_poll_now(void) {
 mp_obj_t mp_bthci_uart;
 
 STATIC void mp_bluetooth_hci_start_polling(void) {
-    events_task_is_scheduled = false;
     mp_bluetooth_hci_poll_now();
 }
 

From 1976781d33547d32c72971e8a9d6bb598d6fa93e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 10 Apr 2023 18:16:38 +0200
Subject: [PATCH 0326/3129] rp2/mpbthciport: Fix HCI UART config.

Fixes are:
- The baudrate argument is a keyword arg, it was passed before as a
  positional arg.
- Use the port and baudrate arguments passed from higher level code instead
  of the hard-coded port ID and baudrate, which would allow HCI drivers to
  change baudrates.
- Increase UART char timeout and RX buffer size.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/mpbthciport.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index 9a24ebdc32a9a..7722360920916 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -87,16 +87,18 @@ 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_SMALL_INT(port),
+        MP_OBJ_NEW_QSTR(MP_QSTR_baudrate), MP_OBJ_NEW_SMALL_INT(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_OBJ_NEW_QSTR(MP_QSTR_timeout_char), MP_OBJ_NEW_SMALL_INT(200),
+        MP_OBJ_NEW_QSTR(MP_QSTR_rxbuf), MP_OBJ_NEW_SMALL_INT(768),
     };
 
     // 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 = MP_OBJ_TYPE_GET_SLOT(&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, 1, 5, args);
 
     // Start the HCI polling to process any initial events/packets.
     mp_bluetooth_hci_start_polling();

From 9ea9e04ef63897c8e8349813cfc65d29d7f20078 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 10 Apr 2023 19:11:53 +0200
Subject: [PATCH 0327/3129] rp2/mpconfigport: Disable BLE locking when
 MICROPY_PY_BLUETOOTH enabled.

Bluetooth code runs in the scheduler, so no locking/mutex is required.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index df44831662443..056e2df4fe203 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -283,7 +283,7 @@ extern uint32_t rosc_random_u32(void);
 extern void lwip_lock_acquire(void);
 extern void lwip_lock_release(void);
 
-#if MICROPY_PY_BLUETOOTH_CYW43
+#if MICROPY_PY_BLUETOOTH || MICROPY_PY_BLUETOOTH_CYW43
 // 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;

From d30f61ba0d533f5889d036b24423521e8a2b77a4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 11 Apr 2023 13:06:58 +0200
Subject: [PATCH 0328/3129] drivers/ninaw10/nina_bt_hci: Make some minor fixes
 to HCI driver.

Fixes are:
- Reset the module first before changing GPIO1 direction.
- Skip spurious bytes received after reset.
- Use HCI UART ID and baudrate when reinitializing UART.
- Disable all printf output which causes unit-tests to fail.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/ninaw10/nina_bt_hci.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/ninaw10/nina_bt_hci.c b/drivers/ninaw10/nina_bt_hci.c
index 6dc3204471b0e..754e99ed76b45 100644
--- a/drivers/ninaw10/nina_bt_hci.c
+++ b/drivers/ninaw10/nina_bt_hci.c
@@ -50,7 +50,7 @@
 #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 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.
@@ -86,7 +86,7 @@ static int nina_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param
         buf[i] = mp_bluetooth_hci_uart_readchar();
 
         // There seems to be a sync issue with this fw/module.
-        if (i == 0 && buf[0] == 0xFF) {
+        if (i == 0 && (buf[0] == 0xFF || buf[0] == 0xFE)) {
             continue;
         }
 
@@ -121,19 +121,19 @@ static int nina_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param
 
 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_RESET, 0);
 
+    mp_hal_pin_output(MICROPY_HW_NINA_GPIO1);
     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_delay_ms(150);
 
     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
+    // The UART must be re-initialized 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);
+    mp_bluetooth_hci_uart_init(MICROPY_HW_BLE_UART_ID, MICROPY_HW_BLE_UART_BAUDRATE);
 
     // Send reset command
     return nina_hci_cmd(OGF_HOST_CTL, OCF_RESET, 0, NULL);

From 5473200aab492d64866511d96b6f4a7d4cb41393 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 11 Apr 2023 20:59:56 +0200
Subject: [PATCH 0329/3129] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Use
 standard HCI UART baudrate.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 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 98b9c0f6faa72..026702da4519e 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -39,7 +39,7 @@
 
 // Bluetooth config.
 #define MICROPY_HW_BLE_UART_ID          (1)
-#define MICROPY_HW_BLE_UART_BAUDRATE    (119600)
+#define MICROPY_HW_BLE_UART_BAUDRATE    (115200)
 
 // WiFi/NINA-W10 config.
 #define MICROPY_HW_WIFI_SPI_ID          (1)

From 9dd40d1b607dae7b943d57a61e83191687a5683e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Sep 2023 11:02:27 +1000
Subject: [PATCH 0330/3129] docs/conf.py: Add sphinxcontrib.jquery to
 extensions.

This is needed by recent versions of sphinx-rtd-theme.

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

diff --git a/docs/conf.py b/docs/conf.py
index a966b3a02570a..0dbbfe0f706cc 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,6 +51,7 @@
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
+    'sphinxcontrib.jquery',
 ]
 
 # Add any paths that contain templates here, relative to this directory.

From b0e03b3e07f4077d1686da0a2dcee3686e4a5f9e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Sep 2023 11:05:14 +1000
Subject: [PATCH 0331/3129] tools/autobuild: Include .bin firmware in
 renesas-ra build output.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 2b323ba9b0621..4b8cf315a2f9c 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -109,7 +109,7 @@ function build_nrf_boards {
 }
 
 function build_renesas_ra_boards {
-    build_boards ra_it.c $1 $2 hex
+    build_boards ra_it.c $1 $2 bin hex
 }
 
 function build_rp2_boards {

From 00930b213e55f4396c1e255092f09bdb8dd8c16f Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 28 Feb 2023 23:15:31 +0200
Subject: [PATCH 0332/3129] esp32/mphalport: Add function/line/file info to
 check_esp_err exception.

Currently, check_esp_err() raises an exception without a location in the
source code, eg:

    Traceback (most recent call last):
      File "<stdin>", line 8, in <module>
    OSError: (-258, 'ESP_ERR_INVALID_ARG')

This commit allows additional error reporting (function, line and file) to
be enabled via detailed exceptions.  Change the error reporting config to

    #define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_DETAILED)

and then exception messages from IDF errors look like:

    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    OSError: (-258, "0x0102 ESP_ERR_INVALID_ARG in function 'set_duty_u16'
    at line 342 in file './machine_pwm.c'")

Signed-off-by: Ihor Nehrutsa <IhorNehrutsa@gmail.com>
---
 ports/esp32/mphalport.c | 16 +++++++++++++++-
 ports/esp32/mphalport.h |  8 +++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index d7003a1437454..538b3e405c905 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -53,7 +53,12 @@ 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.
-void check_esp_err(esp_err_t code) {
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_NORMAL
+void check_esp_err_(esp_err_t code)
+#else
+void check_esp_err_(esp_err_t code, const char *func, const int line, const char *file)
+#endif
+{
     if (code != ESP_OK) {
         // map esp-idf error code to posix error code
         uint32_t pcode = -code;
@@ -75,7 +80,16 @@ void check_esp_err(esp_err_t code) {
             return;
         }
         o_str->base.type = &mp_type_str;
+        #if MICROPY_ERROR_REPORTING > MICROPY_ERROR_REPORTING_NORMAL
+        char err_msg[64];
+        esp_err_to_name_r(code, err_msg, sizeof(err_msg));
+        vstr_t vstr;
+        vstr_init(&vstr, 80);
+        vstr_printf(&vstr, "0x%04X %s in function '%s' at line %d in file '%s'", code, err_msg, func, line, file);
+        o_str->data = (const byte *)vstr_null_terminated_str(&vstr);
+        #else
         o_str->data = (const byte *)esp_err_to_name(code); // esp_err_to_name ret's ptr to const str
+        #endif
         o_str->len = strlen((char *)o_str->data);
         o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
         // raise
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 566d6609f110b..5e54c24bfea0e 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -55,7 +55,13 @@ extern TaskHandle_t mp_main_task_handle;
 extern ringbuf_t stdin_ringbuf;
 
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
-void check_esp_err(esp_err_t code);
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_NORMAL
+#define check_esp_err(code) check_esp_err_(code)
+void check_esp_err_(esp_err_t code);
+#else
+#define check_esp_err(code) check_esp_err_(code, __FUNCTION__, __LINE__, __FILE__)
+void check_esp_err_(esp_err_t code, const char *func, const int line, const char *file);
+#endif
 
 uint32_t mp_hal_ticks_us(void);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {

From fa685239687b0ee3d34788b2edd0711e9fc6bc3c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Sep 2023 10:07:21 +1000
Subject: [PATCH 0333/3129] py/nlrx64: Mark nlr_push() as naked function when
 possible.

Supported from GCC 8 and up, and Compiler Explorer suggests it works as
expected with Clang since 3.6 (2014).

- Fixes situation where building embedded MicroPython with -O0 and
  MICROPY_NLR_X64 crashes at runtime (due to nlr_push pushing the
  frame pointer register EBP). Closes #12421.

- Allows removing the macOS tweak to undo pushing EBP onto the stack
  in the generated function prelude.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/nlrx64.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/py/nlrx64.c b/py/nlrx64.c
index 6f006e755ec7c..6b7d0262f5491 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -35,8 +35,27 @@
 
 __attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr);
 
+#if !MICROPY_NLR_OS_WINDOWS
+#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 8)
+#define USE_NAKED 1
+#else
+// On older gcc the equivalent here is to force omit-frame-pointer
+__attribute__((optimize("omit-frame-pointer")))
+#endif
+#endif
+
+#if !defined(USE_NAKED)
+#define USE_NAKED 0
+#endif
+
+#if USE_NAKED
+// nlr_push prelude should never push frame pointer register ebp onto the stack
+__attribute__((naked))
+#endif
 unsigned int nlr_push(nlr_buf_t *nlr) {
+    #if !USE_NAKED
     (void)nlr;
+    #endif
 
     #if MICROPY_NLR_OS_WINDOWS
 
@@ -58,9 +77,6 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     #else
 
     __asm volatile (
-        #if defined(__APPLE__) && defined(__MACH__)
-        "pop    %rbp                \n" // undo function's prelude
-        #endif
         "movq   (%rsp), %rax        \n" // load return %rip
         "movq   %rax, 16(%rdi)      \n" // store %rip into nlr_buf
         "movq   %rbp, 24(%rdi)      \n" // store %rbp into nlr_buf
@@ -79,7 +95,9 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
 
     #endif
 
+    #if !USE_NAKED
     return 0; // needed to silence compiler warning
+    #endif
 }
 
 NORETURN void nlr_jump(void *val) {

From a3862e726728725248d42ea9173675d523c13911 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Sep 2023 11:33:41 +1000
Subject: [PATCH 0334/3129] stm32/powerctrlboot: Allow PLL1 Q and R outputs to
 be enabled on H5.

If a board needs these outputs then it can define MICROPY_HW_CLK_PLLQ/R.

It saves power to not enable them if they are not needed.

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

diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 220375a51e09f..c7802a5588474 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -218,13 +218,21 @@ void SystemClock_Config(void) {
 
     // Configure PLL1 for use as system clock.
     LL_RCC_PLL1_ConfigDomain_SYS(pll1_source, MICROPY_HW_CLK_PLLM, MICROPY_HW_CLK_PLLN, MICROPY_HW_CLK_PLLP);
-    LL_RCC_PLL1_SetQ(MICROPY_HW_CLK_PLLQ);
-    LL_RCC_PLL1_SetR(MICROPY_HW_CLK_PLLR);
     LL_RCC_PLL1_SetFRACN(MICROPY_HW_CLK_PLLFRAC);
     LL_RCC_PLL1_SetVCOInputRange(MICROPY_HW_CLK_PLLVCI_LL);
     LL_RCC_PLL1_SetVCOOutputRange(MICROPY_HW_CLK_PLLVCO_LL);
     LL_RCC_PLL1P_Enable();
 
+    #if defined(MICROPY_HW_CLK_PLLQ)
+    LL_RCC_PLL1_SetQ(MICROPY_HW_CLK_PLLQ);
+    LL_RCC_PLL1Q_Enable();
+    #endif
+
+    #if defined(MICROPY_HW_CLK_PLLR)
+    LL_RCC_PLL1_SetR(MICROPY_HW_CLK_PLLR);
+    LL_RCC_PLL1R_Enable();
+    #endif
+
     // Enable PLL1.
     LL_RCC_PLL1_Enable();
     while (!LL_RCC_PLL1_IsReady()) {

From dd58be19eef0be304e1b0530fe6e7408ab9b9b84 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Thu, 21 Sep 2023 11:40:26 +0200
Subject: [PATCH 0335/3129] esp32: Fix Partition.writeblocks() partial write
 corruption.

To simulate a partial erase, the code reads a native block, erases it,
and writes back the data before and after the erased area. However, the
current logic was filling the area after the erased block with data
from the beginning of the native block-aligned data, instead of applying
the proper offset.

Fixes #12474.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 ports/esp32/esp32_partition.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 17aa34e560e8a..3bca3b52731d8 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -200,7 +200,7 @@ STATIC mp_obj_t esp32_partition_writeblocks(size_t n_args, const mp_obj_t *args)
                     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));
+                    check_esp_err(esp_partition_write(self->part, top_addr, self->cache + (top_addr - addr), addr + NATIVE_BLOCK_SIZE_BYTES - top_addr));
                 }
                 o = 0;
                 addr += NATIVE_BLOCK_SIZE_BYTES;

From 13cc280eaeb2f01aa78631019057f6ff22d33384 Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Sat, 29 Jul 2023 19:49:12 +0200
Subject: [PATCH 0336/3129] stm32/adc: Fix STM32H5 support.

Fixed the preliminary STM32H5 ADC support for pyb.ADC:
- Run ADC on PCLK/16.
- Use STM32 ADC library channel literals (__HAL_ADC_DECIMAL_NB_TO_CHANNEL).
- Use correct temperature conversion for H5 (30C, 130C calibration points).

Signed-off-by: Rene Straub <rene@see5.ch>
---
 ports/stm32/adc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 20cd2499e13a9..7680ecbefd0f3 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -352,7 +352,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
     adch->Init.DMAContinuousRequests = DISABLE;
     #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
-    #if defined(STM32G4)
+    #if defined(STM32G4) || defined(STM32H5)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV16;
     #else
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
@@ -395,7 +395,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(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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);
@@ -897,6 +897,9 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
         return 0;
     }
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 100.0f;
+    #elif defined(STM32H5)
+    int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
+    float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 100.0f;
     #else
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 80.0f;

From 8f9bba0a1a36caf3afd86b27b1e860225f85cc6a Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Sat, 5 Aug 2023 14:21:41 +0200
Subject: [PATCH 0337/3129] stm32/adc: Add support for STM32H5 ADC2 inputs.

Select ADC instance based on pin information to support ADC2 inputs.
Display ADC instance number similar to machine_adc (STM32H5 only):
<ADC2 on Pin(Pin.cpu.F14, mode=Pin.ANALOG) channel=6>

Signed-off-by: Rene Straub <rene@see5.ch>
---
 ports/stm32/adc.c | 47 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 7680ecbefd0f3..d153f547ddec6 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -51,9 +51,14 @@
 ///     val = adc.read_core_vref()      # read MCU VREF
 
 /* ADC definitions */
+#if defined(STM32H5)
+// STM32H5 features two ADC instances, ADCx and pin_adc_table are set dynamically
+#define PIN_ADC_MASK            (PIN_ADC1 | PIN_ADC2)
+#else
 #define ADCx                    (ADC1)
 #define PIN_ADC_MASK            PIN_ADC1
 #define pin_adc_table           pin_adc1
+#endif
 
 #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
     defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -379,8 +384,8 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     #endif
 }
 
-STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
-    adc_obj->handle.Instance = ADCx;
+STATIC void adc_init_single(pyb_obj_adc_t *adc_obj, ADC_TypeDef *adc) {
+    adc_obj->handle.Instance = adc;
     adcx_init_periph(&adc_obj->handle, ADC_RESOLUTION_12B);
 
     #if (defined(STM32G4) || defined(STM32L4)) && defined(ADC_DUALMODE_REGSIMULT_INJECSIMULT)
@@ -495,7 +500,15 @@ STATIC uint32_t adc_config_and_read_channel(ADC_HandleTypeDef *adcHandle, uint32
 
 STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_obj_adc_t *self = MP_OBJ_TO_PTR(self_in);
+    #if defined STM32H5
+    unsigned adc_id = 1;
+    if (self->handle.Instance == ADC2) {
+        adc_id = 2;
+    }
+    mp_printf(print, "<ADC%u on ", adc_id);
+    #else
     mp_print_str(print, "<ADC on ");
+    #endif
     mp_obj_print_helper(print, self->pin_name, PRINT_STR);
     mp_printf(print, " channel=%u>", self->channel);
 }
@@ -510,6 +523,13 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     // 1st argument is the pin name
     mp_obj_t pin_obj = args[0];
 
+    #if defined(STM32H5)
+    // STM32H5 has two ADC instances where some pins are only available on ADC1 or ADC2 (but not both).
+    // Assume we're using a channel of ADC1. Can be overridden for ADC2 later in this function.
+    ADC_TypeDef *adc = ADC1;
+    const pin_obj_t *const *pin_adc_table = pin_adc1;
+    uint32_t num_adc_pins = MP_ARRAY_SIZE(pin_adc1);
+    #endif
     uint32_t channel;
 
     if (mp_obj_is_int(pin_obj)) {
@@ -520,6 +540,13 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
             // 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);
         }
+        #if defined(STM32H5)
+        if ((pin->adc_num & PIN_ADC2) == PIN_ADC2) {
+            adc = ADC2;
+            pin_adc_table = pin_adc2;
+            num_adc_pins = MP_ARRAY_SIZE(pin_adc2);
+        }
+        #endif
         channel = pin->adc_channel;
     }
 
@@ -528,20 +555,32 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     }
 
     // If this channel corresponds to a pin then configure the pin in ADC mode.
+    #if defined(STM32H5)
+    if (channel < num_adc_pins) {
+        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);
+        }
+    }
+    #else
     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);
         }
     }
+    #endif
 
     pyb_obj_adc_t *o = m_new_obj(pyb_obj_adc_t);
     memset(o, 0, sizeof(*o));
     o->base.type = &pyb_adc_type;
     o->pin_name = pin_obj;
     o->channel = channel;
-    adc_init_single(o);
-
+    #if defined(STM32H5)
+    adc_init_single(o, adc);
+    #else
+    adc_init_single(o, ADCx);
+    #endif
     return MP_OBJ_FROM_PTR(o);
 }
 

From 64d24fccd6d5469c38ea4440cd43a03aec750835 Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Sat, 5 Aug 2023 14:23:29 +0200
Subject: [PATCH 0338/3129] stm32/adc: Optimize sampling time for G4, H5, L4
 and WB MCUs.

Signed-off-by: Rene Straub <rene@see5.ch>
---
 ports/stm32/adc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index d153f547ddec6..6bd0f4ce25b6d 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -444,7 +444,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
     } else {
-        sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5;
+        sConfig.SamplingTime = ADC_SAMPLETIME_6CYCLES_5;
     }
     sConfig.SingleDiff = ADC_SINGLE_ENDED;
     sConfig.OffsetNumber = ADC_OFFSET_NONE;

From 72ef2e6291eedfe237b8b086a44ac570ce8b7f0d Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Wed, 2 Aug 2023 09:13:16 +0200
Subject: [PATCH 0339/3129] stm32/machine_adc: Fix and improve STM32H5 support.

Changes are:
- Run ADC on PCLK/16.
- Verify and optimize timings (ADC_STAB_DELAY_US, ADC_SAMPLETIME_DEFAULT).
- Add support for STM32H5 VBAT and COREVDD channels on ADC2.
- Replace ADC constants in machine_adc_locals_dict_table.
- Convert STM32 literal to channel numbers in adc_config_channel with
  corresponding STM32 LL library functions (__LL_ADC_IS_CHANNEL_INTERNAL(),
  __LL_ADC_CHANNEL_TO_DECIMAL_NB()).

Reasoning for the second last point: the STM32 driver literals are uint32_t
that don't work with MP_ROM_INT() which handles signed 31 bit integers
only.  Introduce enumerator machine_adc_internal_ch_t to define external
channels (0..19), internal channels (256..) and the special channel VREF
(0xffff).  Values are converted to STM32 literals with adc_ll_channel()
when required in adc_config_and_read_u16().

Signed-off-by: Rene Straub <rene@see5.ch>
---
 ports/stm32/machine_adc.c | 130 ++++++++++++++++++++++++++++++--------
 1 file changed, 104 insertions(+), 26 deletions(-)

diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index fee3d698dbb85..f41b80e0ad7b4 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -48,7 +48,9 @@
 #elif defined(STM32G4)
 #define ADC_STAB_DELAY_US (20)
 #elif defined(STM32H5)
-#define ADC_STAB_DELAY_US (1) // TODO: Check if this is enough
+// Stabilization delay = 1 conversion cycle
+// ADC clk = PDIV / 16 = 250 MHz / 16 = 15.625 MHz -> 64 ns -> select 1 us
+#define ADC_STAB_DELAY_US (1)
 #elif defined(STM32L4)
 #define ADC_STAB_DELAY_US (10)
 #elif defined(STM32WB)
@@ -61,9 +63,14 @@
 #elif defined(STM32F4) || defined(STM32F7)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_15CYCLES
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_480CYCLES
-#elif defined(STM32G4) || defined(STM32H5)
+#elif defined(STM32G4)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_247CYCLES_5
+#elif defined(STM32H5)
+// Worst case sampling time: slow channel, 12 bits, 680 ohms -> 165 ns
+// ADC clk = PDIV / 16 = 250 MHz / 16 = 15.625 MHz -> 64 ns -> 2.57 cycles -> select 6.5 cycles
+#define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_6CYCLES_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
@@ -81,8 +88,65 @@
 // 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)
+// Channel IDs for machine.ADC object
+typedef enum _machine_adc_internal_ch_t {
+    // Regular external ADC inputs (0..19)
+    MACHINE_ADC_EXT_CH_0 = 0,
+    MACHINE_ADC_EXT_CH_19 = 19,
+
+    // Internal ADC channels (256..)
+    MACHINE_ADC_INT_CH_VREFINT = 256,
+    MACHINE_ADC_INT_CH_TEMPSENSOR,
+    #if defined(ADC_CHANNEL_VBAT)
+    MACHINE_ADC_INT_CH_VBAT,
+    #endif
+    #if defined(ADC_CHANNEL_VDDCORE)
+    MACHINE_ADC_INT_CH_VDDCORE,
+    #endif
+
+    // This is a synthesised channel representing the maximum ADC reading (useful to scale other channels)
+    MACHINE_ADC_CH_VREF = 0xffff // 0xffff for backward compatibility
+} machine_adc_internal_ch_t;
+
+// Convert machine_adc_internal_ch_t value to STM32 library ADC channel literal.
+// This function is required as literals are uint32_t types that don't map with MP_ROM_INT (31 bit signed).
+STATIC uint32_t adc_ll_channel(uint32_t channel_id) {
+    uint32_t adc_ll_ch;
+    switch (channel_id) {
+        // external channels map 1:1
+        case MACHINE_ADC_EXT_CH_0 ... MACHINE_ADC_EXT_CH_19:
+            adc_ll_ch = channel_id;
+            break;
+
+        // internal channels are converted to STM32 ADC defines
+        case MACHINE_ADC_INT_CH_VREFINT:
+            adc_ll_ch = ADC_CHANNEL_VREFINT;
+            break;
+        case MACHINE_ADC_INT_CH_TEMPSENSOR:
+            #if defined(STM32G4)
+            adc_ll_ch = ADC_CHANNEL_TEMPSENSOR_ADC1;
+            #else
+            adc_ll_ch = ADC_CHANNEL_TEMPSENSOR;
+            #endif
+            break;
+        #if defined(ADC_CHANNEL_VBAT)
+        case MACHINE_ADC_INT_CH_VBAT:
+            adc_ll_ch = ADC_CHANNEL_VBAT;
+            break;
+        #endif
+        #if defined(ADC_CHANNEL_VDDCORE)
+        case MACHINE_ADC_INT_CH_VDDCORE:
+            adc_ll_ch = ADC_CHANNEL_VDDCORE;
+            break;
+        #endif
+
+        // To save code memory for costly error handling, default to Vref for unknown channels
+        default:
+            adc_ll_ch = ADC_CHANNEL_VREFINT;
+            break;
+    };
+    return adc_ll_ch;
+}
 
 static inline void adc_stabilisation_delay_us(uint32_t us) {
     mp_hal_delay_us(us + 1);
@@ -150,9 +214,9 @@ 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(STM32G4)
+    #elif defined(STM32G4) || defined(STM32H5)
     ADC12_COMMON->CCR = 7 << ADC_CCR_PRESC_Pos; // PCLK/16 (asynchronous clock mode)
-    #elif defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    #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;
@@ -352,9 +416,16 @@ STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
         #else
         adc_common->CCR |= ADC_CCR_VBATEN;
         #endif
+    #if defined(STM32H5)
+    } else if (channel == ADC_CHANNEL_VDDCORE) {
+        adc->OR |= ADC_OR_OP0; // Enable Vddcore channel on ADC2
+    #endif
+    }
+    #if defined(STM32G4) || defined(STM32H5)
+    // G4 and H5 use encoded literals for internal channels -> extract ADC channel for following code
+    if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) {
+        channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
     }
-    #if defined(STM32G4)
-    channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
     adc->DIFSEL &= ~(1 << channel); // Set channel to Single-ended.
     #endif
     adc->SQR1 = (channel & 0x1f) << ADC_SQR1_SQ1_Pos | (1 - 1) << ADC_SQR1_L_Pos;
@@ -391,10 +462,13 @@ STATIC uint32_t adc_read_channel(ADC_TypeDef *adc) {
 }
 
 uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time) {
-    if (channel == ADC_CHANNEL_VREF) {
+    if (channel == MACHINE_ADC_CH_VREF) {
         return 0xffff;
     }
 
+    // Map internal channel_id to STM32 ADC driver value/literal.
+    channel = adc_ll_channel(channel);
+
     // Select, configure and read the channel.
     adc_config_channel(adc, channel, sample_time);
     uint32_t raw = adc_read_channel(adc);
@@ -421,7 +495,7 @@ 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 channel; // one of machine_adc_internal_ch_t
     uint32_t sample_time;
 } machine_adc_obj_t;
 
@@ -452,20 +526,25 @@ 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)) {
+        channel = mp_obj_get_int(source);
         #if defined(STM32WL)
         adc = ADC;
+        #elif defined(STM32H5)
+        // on STM32H5 vbat and vddcore channels are on ADC2
+        if (channel == MACHINE_ADC_INT_CH_VBAT || channel == MACHINE_ADC_INT_CH_VDDCORE) {
+            adc = ADC2;
+        } else {
+            adc = ADC1;
+        }
         #else
         adc = ADC1;
         #endif
-        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 (channel == MACHINE_ADC_INT_CH_VREFINT || channel == MACHINE_ADC_INT_CH_TEMPSENSOR
             #if defined(ADC_CHANNEL_VBAT)
-            || channel == ADC_CHANNEL_VBAT
+            || channel == MACHINE_ADC_INT_CH_VBAT
+            #endif
+            #if defined(ADC_CHANNEL_VDDCORE)
+            || channel == MACHINE_ADC_INT_CH_VDDCORE
             #endif
             ) {
             sample_time = ADC_SAMPLETIME_DEFAULT_INT;
@@ -516,15 +595,14 @@ 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_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
+    { MP_ROM_QSTR(MP_QSTR_VREF), MP_ROM_INT(MACHINE_ADC_CH_VREF) },
+    { MP_ROM_QSTR(MP_QSTR_CORE_VREF), MP_ROM_INT(MACHINE_ADC_INT_CH_VREFINT) },
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(MACHINE_ADC_INT_CH_TEMPSENSOR) },
     #if defined(ADC_CHANNEL_VBAT)
-    { MP_ROM_QSTR(MP_QSTR_CORE_VBAT), MP_ROM_INT(ADC_CHANNEL_VBAT) },
+    { MP_ROM_QSTR(MP_QSTR_CORE_VBAT), MP_ROM_INT(MACHINE_ADC_INT_CH_VBAT) },
+    #endif
+    #if defined(ADC_CHANNEL_VDDCORE)
+    { MP_ROM_QSTR(MP_QSTR_CORE_VDD), MP_ROM_INT(MACHINE_ADC_INT_CH_VDDCORE) },
     #endif
 };
 STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);

From 08c661c930a8d6256e3065064820fa30d5485d39 Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Fri, 11 Aug 2023 21:26:50 +0200
Subject: [PATCH 0340/3129] stm32/dac: Add STM32H5 DAC support, with dma_nohal
 implementation.

Integrate DAC support for STM32H5.  Implement STM32H5 GPDMA driver. The DMA
driver is largely different from other STM32 variants.  To support the DAC
circular mode, memory based linked list DMA descriptors are used.

Signed-off-by: Rene Straub <rene@see5.ch>
---
 ports/stm32/dac.c |   4 ++
 ports/stm32/dma.c | 124 +++++++++++++++++++++++++++++++++++++++++++++-
 ports/stm32/dma.h |   6 +++
 3 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 7a446854f80a7..142b7ea387993 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -173,6 +173,8 @@ STATIC void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, ui
         #if defined(STM32G4)
         // For STM32G4, DAC registers have to be accessed by words (32-bit).
         dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_WORD;
+        #elif defined(STM32H5)
+        dma_align = 0;
         #else
         dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_BYTE;
         #endif
@@ -180,6 +182,8 @@ STATIC void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, ui
         #if defined(STM32G4)
         // For STM32G4, DAC registers have to be accessed by words (32-bit).
         dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_WORD;
+        #elif defined(STM32H5)
+        dma_align = 0;
         #else
         dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_HALFWORD;
         #endif
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 94c293c0d0ee7..298670f00e992 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -185,6 +185,24 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
 #endif
 
 #if defined(MICROPY_HW_ENABLE_DAC) && MICROPY_HW_ENABLE_DAC
+#if defined(STM32H5)
+// Default parameters to dma_init() for DAC tx
+static const DMA_InitTypeDef dma_init_struct_dac = {
+    .Request = 0, // set by dma_init_handle
+    .BlkHWRequest = DMA_BREQ_SINGLE_BURST,
+    .Direction = DMA_MEMORY_TO_PERIPH,
+    .SrcInc = DMA_SINC_INCREMENTED,
+    .DestInc = DMA_DINC_FIXED,
+    .SrcDataWidth = DMA_SRC_DATAWIDTH_BYTE,
+    .DestDataWidth = DMA_DEST_DATAWIDTH_WORD,
+    .Priority = DMA_HIGH_PRIORITY,
+    .SrcBurstLength = 1,
+    .DestBurstLength = 1,
+    .TransferAllocatedPort = DMA_SRC_ALLOCATED_PORT0 | DMA_DEST_ALLOCATED_PORT0,
+    .TransferEventMode = DMA_TCEM_BLOCK_TRANSFER,
+    .Mode = DMA_NORMAL, // DMA_NORMAL or DMA_PFCTRL (peripheral flow control mode)
+};
+#else
 // Default parameters to dma_init() for DAC tx
 static const DMA_InitTypeDef dma_init_struct_dac = {
     #if defined(STM32F4) || defined(STM32F7)
@@ -207,6 +225,7 @@ static const DMA_InitTypeDef dma_init_struct_dac = {
     #endif
 };
 #endif
+#endif
 
 #if MICROPY_HW_ENABLE_DCMI
 static const DMA_InitTypeDef dma_init_struct_dcmi = {
@@ -715,6 +734,10 @@ const dma_descr_t dma_SPI_1_RX = { GPDMA1_Channel0, GPDMA1_REQUEST_SPI1_RX, dma_
 const dma_descr_t dma_SPI_1_TX = { GPDMA1_Channel1, GPDMA1_REQUEST_SPI1_TX, dma_id_1, &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_2_RX = { GPDMA1_Channel2, GPDMA1_REQUEST_SPI2_RX, dma_id_2, &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_2_TX = { GPDMA1_Channel3, GPDMA1_REQUEST_SPI2_TX, dma_id_3, &dma_init_struct_spi_i2c };
+#if MICROPY_HW_ENABLE_DAC
+const dma_descr_t dma_DAC_1_TX = { GPDMA1_Channel4, GPDMA1_REQUEST_DAC1_CH1, dma_id_4, &dma_init_struct_dac };
+const dma_descr_t dma_DAC_2_TX = { GPDMA1_Channel5, GPDMA1_REQUEST_DAC1_CH2, dma_id_5, &dma_init_struct_dac };
+#endif
 
 static const uint8_t dma_irqn[NSTREAM] = {
     GPDMA1_Channel0_IRQn,
@@ -1613,7 +1636,106 @@ void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_a
     dma->CCR |= DMA_CCR_EN;
 }
 
-#elif defined(STM32G0) || defined(STM32H5) || defined(STM32WB) || defined(STM32WL)
+#elif defined(STM32H5)
+
+// Fully setup GPDMA linked list entry
+typedef struct _dma_ll_full_t {
+    __IO uint32_t CTR1;
+    __IO uint32_t CTR2;
+    __IO uint32_t CBR1;
+    __IO uint32_t CSAR;
+    __IO uint32_t CDAR;
+    __IO uint32_t CLLR;
+} dma_ll_full_t;
+
+// Align LL entry to 32 bytes to ensure it never crosses a 64 kB boundary
+__ALIGNED(32) static __IO dma_ll_full_t lli1;
+
+void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
+    DMA_Channel_TypeDef *dma = descr->instance;
+    const DMA_InitTypeDef *init = descr->init;
+
+    // Enable the DMA peripheral
+    dma_enable_clock(descr->id);
+
+    // - LSM = 0, normal linked list mode
+    // - No interrupts
+    // - Not suspended, out of reset, disabled
+    // - Priority as defined by user
+    dma->CCR = init->Priority;
+
+    uint32_t ctr1reg = 0;
+    ctr1reg |= init->SrcDataWidth;
+    ctr1reg |= init->SrcInc;
+    ctr1reg |= (((init->SrcBurstLength - 1) << DMA_CTR1_SBL_1_Pos)) & DMA_CTR1_SBL_1_Msk;
+    ctr1reg |= init->DestDataWidth;
+    ctr1reg |= init->DestInc;
+    ctr1reg |= (((init->DestBurstLength - 1) << DMA_CTR1_DBL_1_Pos)) & DMA_CTR1_DBL_1_Msk;
+
+    uint32_t ctr2reg = 0;
+    ctr2reg |= init->BlkHWRequest;
+    ctr2reg |= init->Direction;
+    ctr2reg |= init->Mode;
+    ctr2reg |= init->TransferEventMode;
+    ctr2reg |= init->TransferAllocatedPort;
+    uint32_t reqsel = descr->sub_instance;
+    ctr2reg |= (reqsel << DMA_CTR2_REQSEL_Pos) & DMA_CTR2_REQSEL_Msk;
+
+    dma->CBR1 = 0;  // set length to zero, so that GPDMA engine fetches first LL entry immediately
+    dma->CSAR = 0;
+    dma->CDAR = 0;
+
+    // Attach linked list entry
+    dma->CLBAR = (uint32_t)(&lli1) & 0xffff0000UL;  // upper 16 bits of linked list addresses
+
+    uint32_t cllrreg = 0;
+    cllrreg |= (DMA_CLLR_UT1 | DMA_CLLR_UT2 | DMA_CLLR_UB1 | DMA_CLLR_USA | DMA_CLLR_UDA | DMA_CLLR_ULL);
+    cllrreg |= (uint32_t)(&lli1) & 0x0000fffcUL;    // lower 16 bits of linked list entry address
+    dma->CLLR = cllrreg;
+
+    // Setup linked list control registers. Length and addresses are set in dma_nohal_start()
+    lli1.CTR1 = ctr1reg;
+    lli1.CTR2 = ctr2reg;
+
+    if ((config & DMA_CIRCULAR) == DMA_CIRCULAR) {
+        lli1.CLLR = cllrreg;    // pointer to itself for circular operation
+    } else {
+        lli1.CLLR = 0;  // No next node, this is end of linked list chain
+    }
+}
+
+void dma_nohal_deinit(const dma_descr_t *descr) {
+    DMA_Channel_TypeDef *dma = descr->instance;
+
+    if ((dma->CCR & DMA_CCR_EN) == DMA_CCR_EN) {
+        // Suspend currently running channel. Wait until done, then reset to clear FIFOs.
+        dma->CCR |= DMA_CCR_SUSP;
+
+        uint32_t t0 = mp_hal_ticks_ms();
+        while ((dma->CSR & DMA_CSR_SUSPF) != DMA_CSR_SUSPF) {
+            if (mp_hal_ticks_ms() - t0 >= 100) {
+                // Timeout.. Abort to avoid blocking system forever
+                break;
+            }
+        }
+
+        dma->CCR |= DMA_CCR_RESET;
+    }
+    dma->CCR &= ~DMA_CCR_EN;
+    dma->CCR = 0;
+    dma_deinit(descr);
+}
+
+void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_addr, uint16_t len) {
+    DMA_Channel_TypeDef *dma = descr->instance;
+    lli1.CBR1 = (len << DMA_CBR1_BNDT_Pos) & DMA_CBR1_BNDT_Msk;
+    lli1.CSAR = src_addr;
+    lli1.CDAR = dst_addr;
+
+    dma->CCR |= DMA_CCR_EN;
+}
+
+#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 2afc94754187f..fa3238413ea49 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -28,6 +28,12 @@
 
 typedef struct _dma_descr_t dma_descr_t;
 
+#if defined(STM32H5)
+// STM32H5 GPDMA doesn't feature circular mode directly, so define doesn't exist in
+// stm32 driver header. Define it here to make users like DAC driver happy.
+#define DMA_CIRCULAR 0x00000001
+#endif
+
 #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7)
 
 extern const dma_descr_t dma_I2C_1_RX;

From 82b4ab757603c52420f5e11470d0404ba93286ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Sep 2023 16:24:45 +1000
Subject: [PATCH 0341/3129] stm32/boards: Move includes to after defines in all
 hal_conf.h files.

The include of HAL headers should come after the HAL configuration defines,
so that the headers can see whether the defines were made or not, to
provide defaults and configure various things.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../stm32f4xx_hal_conf.h                      |  4 +-
 .../boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h  |  4 +-
 .../ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h |  4 +-
 .../ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h  |  4 +-
 .../B_L072Z_LRWAN1/stm32l0xx_hal_conf.h       |  4 +-
 .../B_L475E_IOT01A/stm32l4xx_hal_conf.h       |  4 +-
 .../stm32/boards/CERB40/stm32f4xx_hal_conf.h  |  4 +-
 .../boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h |  4 +-
 .../stm32f4xx_hal_conf.h                      |  4 +-
 .../stm32f4xx_hal_conf.h                      |  4 +-
 .../boards/HYDRABUS/stm32f4xx_hal_conf.h      |  4 +-
 .../boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h  |  4 +-
 .../boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h  |  7 +-
 .../boards/LIMIFROG/stm32l4xx_hal_conf.h      |  4 +-
 .../stm32f4xx_hal_conf.h                      |  4 +-
 .../boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h  |  4 +-
 .../NETDUINO_PLUS_2/stm32f4xx_hal_conf.h      |  4 +-
 .../boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h |  4 +-
 .../boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h |  4 +-
 .../boards/OLIMEX_E407/stm32f4xx_hal_conf.h   |  4 +-
 .../boards/OLIMEX_H407/stm32f4xx_hal_conf.h   |  4 +-
 .../boards/PYBD_SF2/stm32f7xx_hal_conf.h      |  4 +-
 .../boards/PYBLITEV10/stm32f4xx_hal_conf.h    |  4 +-
 .../stm32/boards/PYBV10/stm32f4xx_hal_conf.h  |  4 +-
 .../stm32/boards/PYBV11/stm32f4xx_hal_conf.h  |  4 +-
 ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h |  4 +-
 ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h |  4 +-
 .../stm32f4xx_hal_conf.h                      |  4 +-
 .../boards/STM32F411DISC/stm32f4xx_hal_conf.h |  4 +-
 .../boards/STM32F429DISC/stm32f4xx_hal_conf.h |  4 +-
 .../boards/STM32F439/stm32f4xx_hal_conf.h     |  4 +-
 .../boards/STM32F4DISC/stm32f4xx_hal_conf.h   |  4 +-
 .../boards/STM32F769DISC/stm32f7xx_hal_conf.h |  4 +-
 .../boards/STM32F7DISC/stm32f7xx_hal_conf.h   |  4 +-
 .../boards/STM32H573I_DK/stm32h5xx_hal_conf.h |  4 +-
 .../boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h |  4 +-
 .../boards/STM32L476DISC/stm32l4xx_hal_conf.h |  4 +-
 .../STM32L496GDISC/stm32l4xx_hal_conf.h       |  4 +-
 .../VCC_GND_F407VE/stm32f4xx_hal_conf.h       |  4 +-
 .../VCC_GND_F407ZG/stm32f4xx_hal_conf.h       |  4 +-
 .../VCC_GND_H743VI/stm32h7xx_hal_conf.h       |  4 +-
 ports/stm32/boards/stm32f0xx_hal_conf_base.h  | 50 +++++------
 ports/stm32/boards/stm32f4xx_hal_conf_base.h  | 66 +++++++-------
 ports/stm32/boards/stm32f7xx_hal_conf_base.h  | 64 +++++++-------
 ports/stm32/boards/stm32g4xx_hal_conf_base.h  | 88 +++++++++----------
 ports/stm32/boards/stm32h7xx_hal_conf_base.h  | 66 +++++++-------
 ports/stm32/boards/stm32l0xx_hal_conf_base.h  | 50 +++++------
 ports/stm32/boards/stm32l1xx_hal_conf_base.h  | 58 ++++++------
 ports/stm32/boards/stm32l4xx_hal_conf_base.h  | 64 +++++++-------
 ports/stm32/boards/stm32wbxx_hal_conf_base.h  | 42 ++++-----
 ports/stm32/boards/stm32wlxx_hal_conf_base.h  | 38 ++++----
 69 files changed, 409 insertions(+), 416 deletions(-)

diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h
index 9719157e55cdf..21285f2e33602 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h
index b3b2e00dbb902..71cbac4765d37 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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 (16000000)
 #define LSE_VALUE (32768)
@@ -48,4 +46,6 @@
 #include "stm32h7xx_hal_mmc.h"
 #endif
 
+#include "boards/stm32h7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h
index 737a2e5b0d242..dd71ad71b90e2 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -48,4 +46,6 @@
 #include "stm32h7xx_hal_mmc.h"
 #endif
 
+#include "boards/stm32h7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
index 737a2e5b0d242..dd71ad71b90e2 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -48,4 +46,6 @@
 #include "stm32h7xx_hal_mmc.h"
 #endif
 
+#include "boards/stm32h7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h b/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h
index c88a7065103d3..a2293de902fe3 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H
 
-#include "boards/stm32l0xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -15,4 +13,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l0xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H
diff --git a/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h b/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100644
--- a/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h b/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h
index 9719157e55cdf..21285f2e33602 100644
--- a/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h b/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h b/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h
index 7d6344f0a2453..9505fb778817a 100644
--- a/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h
index 7d6344f0a2453..9505fb778817a 100644
--- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h b/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h b/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h
index 7d6344f0a2453..9505fb778817a 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h b/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h
index bd70912748a55..dfa27200ecab4 100644
--- a/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h
@@ -5,10 +5,6 @@
 #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
@@ -20,4 +16,7 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+#include "stm32f4xx_hal_fmpi2c.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h b/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100644
--- a/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h b/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h
index f186d5a29228c..24d394c398e37 100644
--- a/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h b/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h
index b8b935915ff28..02da6f6576add 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -15,4 +13,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (0)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h b/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h
index f186d5a29228c..24d394c398e37 100644
--- a/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h
index d5b2c4f7a2e72..10db1b4e23bea 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32F0XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32F0XX_HAL_CONF_H
 
-#include "boards/stm32f0xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -15,4 +13,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f0xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F0XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h
index 9355a3867de50..8190f7248212b 100644
--- a/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h
@@ -4,8 +4,6 @@
 #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)
@@ -15,4 +13,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h
index e241921ddd25b..14b2c9228dcb4 100644
--- a/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h
index e241921ddd25b..14b2c9228dcb4 100644
--- a/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h
index e241921ddd25b..14b2c9228dcb4 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h
index 5e82fb4874d25..5aded589e7e7f 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT     (100)
 #define LSE_STARTUP_TIMEOUT     (5000)
 
+#include "boards/stm32g4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32G4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h
index 45400cdcd734b..311c1ff8015a9 100644
--- a/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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 (8000000)
 #define LSE_VALUE (32768)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32h7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h
index 45400cdcd734b..311c1ff8015a9 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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 (8000000)
 #define LSE_VALUE (32768)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32h7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h
index c88a7065103d3..a2293de902fe3 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H
 
-#include "boards/stm32l0xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -15,4 +13,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l0xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100755
--- a/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100644
--- a/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100755
--- a/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100644
--- a/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h b/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h
index 9719157e55cdf..21285f2e33602 100644
--- a/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h b/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h
index 9719157e55cdf..21285f2e33602 100644
--- a/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h b/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h
index 621b05c719e92..548f5b3f85a0a 100644
--- a/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h
+++ b/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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 (25000000)
 #define LSE_VALUE (32768)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h
index 9719157e55cdf..21285f2e33602 100644
--- a/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h
index 9719157e55cdf..21285f2e33602 100644
--- a/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h
index 9719157e55cdf..21285f2e33602 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h
index de19251e0808a..ddbeca1316913 100644
--- a/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h b/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h
index 621b05c719e92..548f5b3f85a0a 100644
--- a/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h
+++ b/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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 (25000000)
 #define LSE_VALUE (32768)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h b/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h
index 621b05c719e92..548f5b3f85a0a 100644
--- a/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h
+++ b/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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 (25000000)
 #define LSE_VALUE (32768)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h b/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h
index 6b32ffb18508d..a77b3a1c70638 100644
--- a/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h
+++ b/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h
@@ -10,10 +10,10 @@
 #define LSE_VALUE (32768)
 #define EXTERNAL_CLOCK_VALUE (12288000)
 
-#include "boards/stm32h5xx_hal_conf_base.h"
-
 // Oscillator timeouts in ms
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32h5xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H5XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h b/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h
index 70c3246a890e7..cad1a85762396 100644
--- a/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32h7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h b/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100644
--- a/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h b/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h
index fd380ab7357e2..98ef4b3714884 100644
--- a/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h
+++ b/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h
@@ -5,8 +5,6 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
 
-#include "boards/stm32l4xx_hal_conf_base.h"
-
 // Oscillator values in Hz
 #define HSE_VALUE (8000000)
 #define LSE_VALUE (32768)
@@ -17,4 +15,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32l4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h
index fe2069fe1418a..c22fb6177f5cc 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h
@@ -1,8 +1,6 @@
 #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)
@@ -12,4 +10,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h
index fe2069fe1418a..c22fb6177f5cc 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h
+++ b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h
@@ -1,8 +1,6 @@
 #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)
@@ -12,4 +10,6 @@
 #define HSE_STARTUP_TIMEOUT (100)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32f4xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h b/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h
index c4d148b0bbafe..c8f60c56055ef 100644
--- a/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h
@@ -5,8 +5,6 @@
 #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)
@@ -16,4 +14,6 @@
 #define HSE_STARTUP_TIMEOUT (5000)
 #define LSE_STARTUP_TIMEOUT (5000)
 
+#include "boards/stm32h7xx_hal_conf_base.h"
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/stm32f0xx_hal_conf_base.h b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
index 70e6ccf758d38..d60fb9eaf7df2 100644
--- a/ports/stm32/boards/stm32f0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
@@ -26,31 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32F0XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32F0XX_HAL_CONF_BASE_H
 
-// Include various HAL modules for convenience
-#include "stm32f0xx_hal_dma.h"
-#include "stm32f0xx_hal_adc.h"
-#include "stm32f0xx_hal_can.h"
-#include "stm32f0xx_hal_cortex.h"
-#include "stm32f0xx_hal_crc.h"
-#include "stm32f0xx_hal_dac.h"
-#include "stm32f0xx_hal_flash.h"
-#include "stm32f0xx_hal_gpio.h"
-#include "stm32f0xx_hal_i2c.h"
-#include "stm32f0xx_hal_i2s.h"
-#include "stm32f0xx_hal_iwdg.h"
-#include "stm32f0xx_hal_pcd.h"
-#include "stm32f0xx_hal_pwr.h"
-#include "stm32f0xx_hal_rcc.h"
-#include "stm32f0xx_hal_rtc.h"
-#include "stm32f0xx_hal_spi.h"
-#include "stm32f0xx_hal_tim.h"
-#include "stm32f0xx_hal_uart.h"
-#include "stm32f0xx_hal_usart.h"
-#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
 #define HAL_ADC_MODULE_ENABLED
@@ -87,6 +62,31 @@
 #define USE_RTOS        0
 #define USE_SPI_CRC     1
 
+// Include various HAL modules for convenience
+#include "stm32f0xx_hal_dma.h"
+#include "stm32f0xx_hal_adc.h"
+#include "stm32f0xx_hal_can.h"
+#include "stm32f0xx_hal_cortex.h"
+#include "stm32f0xx_hal_crc.h"
+#include "stm32f0xx_hal_dac.h"
+#include "stm32f0xx_hal_flash.h"
+#include "stm32f0xx_hal_gpio.h"
+#include "stm32f0xx_hal_i2c.h"
+#include "stm32f0xx_hal_i2s.h"
+#include "stm32f0xx_hal_iwdg.h"
+#include "stm32f0xx_hal_pcd.h"
+#include "stm32f0xx_hal_pwr.h"
+#include "stm32f0xx_hal_rcc.h"
+#include "stm32f0xx_hal_rtc.h"
+#include "stm32f0xx_hal_spi.h"
+#include "stm32f0xx_hal_tim.h"
+#include "stm32f0xx_hal_uart.h"
+#include "stm32f0xx_hal_usart.h"
+#include "stm32f0xx_hal_wwdg.h"
+#include "stm32f0xx_ll_adc.h"
+#include "stm32f0xx_ll_rtc.h"
+#include "stm32f0xx_ll_usart.h"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index d42f3ba19f4f8..59d73a3028cd4 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -26,39 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_BASE_H
 
-// Include various HAL modules for convenience
-#include "stm32f4xx_hal_dma.h"
-#include "stm32f4xx_hal_adc.h"
-#include "stm32f4xx_hal_can.h"
-#include "stm32f4xx_hal_cortex.h"
-#include "stm32f4xx_hal_crc.h"
-#include "stm32f4xx_hal_dac.h"
-#include "stm32f4xx_hal_dcmi.h"
-#include "stm32f4xx_hal_eth.h"
-#include "stm32f4xx_hal_flash.h"
-#include "stm32f4xx_hal_gpio.h"
-#include "stm32f4xx_hal_hash.h"
-#include "stm32f4xx_hal_hcd.h"
-#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"
-#include "stm32f4xx_hal_rtc.h"
-#include "stm32f4xx_hal_sd.h"
-#include "stm32f4xx_hal_sdram.h"
-#include "stm32f4xx_hal_spi.h"
-#include "stm32f4xx_hal_tim.h"
-#include "stm32f4xx_hal_uart.h"
-#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"
-#include "stm32f4xx_ll_usart.h"
-
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CAN_MODULE_ENABLED
@@ -101,6 +68,39 @@
 #define PREFETCH_ENABLE             1
 #define USE_RTOS                    0
 
+// Include various HAL modules for convenience
+#include "stm32f4xx_hal_dma.h"
+#include "stm32f4xx_hal_adc.h"
+#include "stm32f4xx_hal_can.h"
+#include "stm32f4xx_hal_cortex.h"
+#include "stm32f4xx_hal_crc.h"
+#include "stm32f4xx_hal_dac.h"
+#include "stm32f4xx_hal_dcmi.h"
+#include "stm32f4xx_hal_eth.h"
+#include "stm32f4xx_hal_flash.h"
+#include "stm32f4xx_hal_gpio.h"
+#include "stm32f4xx_hal_hash.h"
+#include "stm32f4xx_hal_hcd.h"
+#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"
+#include "stm32f4xx_hal_rtc.h"
+#include "stm32f4xx_hal_sd.h"
+#include "stm32f4xx_hal_sdram.h"
+#include "stm32f4xx_hal_spi.h"
+#include "stm32f4xx_hal_tim.h"
+#include "stm32f4xx_hal_uart.h"
+#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"
+#include "stm32f4xx_ll_usart.h"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32f7xx_hal_conf_base.h b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
index efb15d471dcc7..26908f2ebb38d 100644
--- a/ports/stm32/boards/stm32f7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
@@ -26,38 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_BASE_H
 
-// Include various HAL modules for convenience
-#include "stm32f7xx_hal_dma.h"
-#include "stm32f7xx_hal_adc.h"
-#include "stm32f7xx_hal_can.h"
-#include "stm32f7xx_hal_cortex.h"
-#include "stm32f7xx_hal_crc.h"
-#include "stm32f7xx_hal_dac.h"
-#include "stm32f7xx_hal_dcmi.h"
-#include "stm32f7xx_hal_flash.h"
-#include "stm32f7xx_hal_gpio.h"
-#include "stm32f7xx_hal_hash.h"
-#include "stm32f7xx_hal_hcd.h"
-#include "stm32f7xx_hal_i2c.h"
-#include "stm32f7xx_hal_i2s.h"
-#include "stm32f7xx_hal_iwdg.h"
-#include "stm32f7xx_hal_mmc.h"
-#include "stm32f7xx_hal_pcd.h"
-#include "stm32f7xx_hal_pwr.h"
-#include "stm32f7xx_hal_rcc.h"
-#include "stm32f7xx_hal_rtc.h"
-#include "stm32f7xx_hal_sd.h"
-#include "stm32f7xx_hal_sdram.h"
-#include "stm32f7xx_hal_spi.h"
-#include "stm32f7xx_hal_tim.h"
-#include "stm32f7xx_hal_uart.h"
-#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"
-#include "stm32f7xx_ll_usart.h"
-
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CAN_MODULE_ENABLED
@@ -97,6 +65,38 @@
 #define ART_ACCLERATOR_ENABLE   1
 #define USE_RTOS                0
 
+// Include various HAL modules for convenience
+#include "stm32f7xx_hal_dma.h"
+#include "stm32f7xx_hal_adc.h"
+#include "stm32f7xx_hal_can.h"
+#include "stm32f7xx_hal_cortex.h"
+#include "stm32f7xx_hal_crc.h"
+#include "stm32f7xx_hal_dac.h"
+#include "stm32f7xx_hal_dcmi.h"
+#include "stm32f7xx_hal_flash.h"
+#include "stm32f7xx_hal_gpio.h"
+#include "stm32f7xx_hal_hash.h"
+#include "stm32f7xx_hal_hcd.h"
+#include "stm32f7xx_hal_i2c.h"
+#include "stm32f7xx_hal_i2s.h"
+#include "stm32f7xx_hal_iwdg.h"
+#include "stm32f7xx_hal_mmc.h"
+#include "stm32f7xx_hal_pcd.h"
+#include "stm32f7xx_hal_pwr.h"
+#include "stm32f7xx_hal_rcc.h"
+#include "stm32f7xx_hal_rtc.h"
+#include "stm32f7xx_hal_sd.h"
+#include "stm32f7xx_hal_sdram.h"
+#include "stm32f7xx_hal_spi.h"
+#include "stm32f7xx_hal_tim.h"
+#include "stm32f7xx_hal_uart.h"
+#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"
+#include "stm32f7xx_ll_usart.h"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32g4xx_hal_conf_base.h b/ports/stm32/boards/stm32g4xx_hal_conf_base.h
index 034d396539488..e6f24c21a4948 100644
--- a/ports/stm32/boards/stm32g4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32g4xx_hal_conf_base.h
@@ -26,51 +26,6 @@
 #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
@@ -125,6 +80,49 @@
 #define  DATA_CACHE_ENABLE          1
 #define  USE_SPI_CRC                1
 
+// 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"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index 9c5ec8cb2c59a..7882adf151c12 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -26,39 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_BASE_H
 
-// Include various HAL modules for convenience
-#include "stm32h7xx_hal_dma.h"
-#include "stm32h7xx_hal_mdma.h"
-#include "stm32h7xx_hal_adc.h"
-#include "stm32h7xx_hal_cortex.h"
-#include "stm32h7xx_hal_crc.h"
-#include "stm32h7xx_hal_dac.h"
-#include "stm32h7xx_hal_dcmi.h"
-#include "stm32h7xx_hal_fdcan.h"
-#include "stm32h7xx_hal_flash.h"
-#include "stm32h7xx_hal_gpio.h"
-#include "stm32h7xx_hal_hash.h"
-#include "stm32h7xx_hal_hcd.h"
-#include "stm32h7xx_hal_i2c.h"
-#include "stm32h7xx_hal_i2s.h"
-#include "stm32h7xx_hal_iwdg.h"
-#include "stm32h7xx_hal_pcd.h"
-#include "stm32h7xx_hal_pwr.h"
-#include "stm32h7xx_hal_rcc.h"
-#include "stm32h7xx_hal_rtc.h"
-#include "stm32h7xx_hal_sd.h"
-#include "stm32h7xx_hal_sdram.h"
-#include "stm32h7xx_hal_spi.h"
-#include "stm32h7xx_hal_tim.h"
-#include "stm32h7xx_hal_uart.h"
-#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"
-
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CORTEX_MODULE_ENABLED
@@ -98,6 +65,39 @@
 #define USE_SD_TRANSCEIVER  0
 #define USE_SPI_CRC         1
 
+// Include various HAL modules for convenience
+#include "stm32h7xx_hal_dma.h"
+#include "stm32h7xx_hal_mdma.h"
+#include "stm32h7xx_hal_adc.h"
+#include "stm32h7xx_hal_cortex.h"
+#include "stm32h7xx_hal_crc.h"
+#include "stm32h7xx_hal_dac.h"
+#include "stm32h7xx_hal_dcmi.h"
+#include "stm32h7xx_hal_fdcan.h"
+#include "stm32h7xx_hal_flash.h"
+#include "stm32h7xx_hal_gpio.h"
+#include "stm32h7xx_hal_hash.h"
+#include "stm32h7xx_hal_hcd.h"
+#include "stm32h7xx_hal_i2c.h"
+#include "stm32h7xx_hal_i2s.h"
+#include "stm32h7xx_hal_iwdg.h"
+#include "stm32h7xx_hal_pcd.h"
+#include "stm32h7xx_hal_pwr.h"
+#include "stm32h7xx_hal_rcc.h"
+#include "stm32h7xx_hal_rtc.h"
+#include "stm32h7xx_hal_sd.h"
+#include "stm32h7xx_hal_sdram.h"
+#include "stm32h7xx_hal_spi.h"
+#include "stm32h7xx_hal_tim.h"
+#include "stm32h7xx_hal_uart.h"
+#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"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32l0xx_hal_conf_base.h b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
index 7b569907e8d6a..e33c0b2a1be17 100644
--- a/ports/stm32/boards/stm32l0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
@@ -26,31 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32L0XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32L0XX_HAL_CONF_BASE_H
 
-// Include various HAL modules for convenience
-#include "stm32l0xx_hal_dma.h"
-#include "stm32l0xx_hal_adc.h"
-#include "stm32l0xx_hal_cortex.h"
-#include "stm32l0xx_hal_crc.h"
-#include "stm32l0xx_hal_dac.h"
-#include "stm32l0xx_hal_flash.h"
-#include "stm32l0xx_hal_gpio.h"
-#include "stm32l0xx_hal_i2c.h"
-#include "stm32l0xx_hal_i2s.h"
-#include "stm32l0xx_hal_iwdg.h"
-#include "stm32l0xx_hal_pcd.h"
-#include "stm32l0xx_hal_pwr.h"
-#include "stm32l0xx_hal_rcc.h"
-#include "stm32l0xx_hal_rtc.h"
-#include "stm32l0xx_hal_spi.h"
-#include "stm32l0xx_hal_tim.h"
-#include "stm32l0xx_hal_uart.h"
-#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"
-
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
@@ -89,6 +64,31 @@
 #define USE_RTOS                0
 #define USE_SPI_CRC             0
 
+// Include various HAL modules for convenience
+#include "stm32l0xx_hal_dma.h"
+#include "stm32l0xx_hal_adc.h"
+#include "stm32l0xx_hal_cortex.h"
+#include "stm32l0xx_hal_crc.h"
+#include "stm32l0xx_hal_dac.h"
+#include "stm32l0xx_hal_flash.h"
+#include "stm32l0xx_hal_gpio.h"
+#include "stm32l0xx_hal_i2c.h"
+#include "stm32l0xx_hal_i2s.h"
+#include "stm32l0xx_hal_iwdg.h"
+#include "stm32l0xx_hal_pcd.h"
+#include "stm32l0xx_hal_pwr.h"
+#include "stm32l0xx_hal_rcc.h"
+#include "stm32l0xx_hal_rtc.h"
+#include "stm32l0xx_hal_spi.h"
+#include "stm32l0xx_hal_tim.h"
+#include "stm32l0xx_hal_uart.h"
+#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"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32l1xx_hal_conf_base.h b/ports/stm32/boards/stm32l1xx_hal_conf_base.h
index 5871e8a45a6f2..d23453b27a680 100644
--- a/ports/stm32/boards/stm32l1xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l1xx_hal_conf_base.h
@@ -26,36 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32L1XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32L1XX_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 "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_pcd.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"
-#include "stm32l1xx_ll_usb.h"
-
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
@@ -67,6 +37,7 @@
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
+#define HAL_PCD_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
 #define HAL_RTC_MODULE_ENABLED
@@ -98,6 +69,33 @@
 #define USE_SPI_CRC                 0
 #define USE_RTOS                    0
 
+// 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_pcd.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"
+#include "stm32l1xx_ll_usb.h"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32l4xx_hal_conf_base.h b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
index ce35dee28c1ec..9ee895229f92c 100644
--- a/ports/stm32/boards/stm32l4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
@@ -26,39 +26,6 @@
 #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 "Legacy/stm32l4xx_hal_can_legacy.h"
-#include "stm32l4xx_hal_cortex.h"
-#include "stm32l4xx_hal_crc.h"
-#include "stm32l4xx_hal_dac.h"
-#include "stm32l4xx_hal_dcmi.h"
-#include "stm32l4xx_hal_flash.h"
-#include "stm32l4xx_hal_gpio.h"
-#include "stm32l4xx_hal_hash.h"
-#include "stm32l4xx_hal_hcd.h"
-#include "stm32l4xx_hal_i2c.h"
-#include "stm32l4xx_hal_iwdg.h"
-#include "stm32l4xx_hal_pcd.h"
-#include "stm32l4xx_hal_pwr.h"
-#include "stm32l4xx_hal_rcc.h"
-#include "stm32l4xx_hal_rtc.h"
-#include "stm32l4xx_hal_sd.h"
-#include "stm32l4xx_hal_spi.h"
-#include "stm32l4xx_hal_tim.h"
-#include "stm32l4xx_hal_uart.h"
-#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"
-#include "stm32l4xx_ll_usb.h"
-
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
@@ -74,6 +41,7 @@
 #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
@@ -100,6 +68,36 @@
 #define USE_SPI_CRC                 0
 #define USE_RTOS                    0
 
+// Include various HAL modules for convenience
+#include "stm32l4xx_hal_dma.h"
+#include "stm32l4xx_hal_adc.h"
+#include "Legacy/stm32l4xx_hal_can_legacy.h"
+#include "stm32l4xx_hal_cortex.h"
+#include "stm32l4xx_hal_crc.h"
+#include "stm32l4xx_hal_dac.h"
+#include "stm32l4xx_hal_dcmi.h"
+#include "stm32l4xx_hal_flash.h"
+#include "stm32l4xx_hal_gpio.h"
+#include "stm32l4xx_hal_hash.h"
+#include "stm32l4xx_hal_hcd.h"
+#include "stm32l4xx_hal_i2c.h"
+#include "stm32l4xx_hal_iwdg.h"
+#include "stm32l4xx_hal_pcd.h"
+#include "stm32l4xx_hal_pwr.h"
+#include "stm32l4xx_hal_rcc.h"
+#include "stm32l4xx_hal_rtc.h"
+#include "stm32l4xx_hal_sd.h"
+#include "stm32l4xx_hal_spi.h"
+#include "stm32l4xx_hal_tim.h"
+#include "stm32l4xx_hal_uart.h"
+#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"
+#include "stm32l4xx_ll_usb.h"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32wbxx_hal_conf_base.h b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
index 25eb4b93ecd2f..79417d768faa6 100644
--- a/ports/stm32/boards/stm32wbxx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
@@ -26,27 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32WBXX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32WBXX_HAL_CONF_BASE_H
 
-// Include various HAL modules for convenience
-#include "stm32wbxx_hal_dma.h"
-#include "stm32wbxx_hal_adc.h"
-#include "stm32wbxx_hal_cortex.h"
-#include "stm32wbxx_hal_flash.h"
-#include "stm32wbxx_hal_gpio.h"
-#include "stm32wbxx_hal_i2c.h"
-#include "stm32wbxx_hal_pcd.h"
-#include "stm32wbxx_hal_pwr.h"
-#include "stm32wbxx_hal_rcc.h"
-#include "stm32wbxx_hal_rtc.h"
-#include "stm32wbxx_hal_spi.h"
-#include "stm32wbxx_hal_tim.h"
-#include "stm32wbxx_hal_uart.h"
-#include "stm32wbxx_hal_usart.h"
-#include "stm32wbxx_ll_adc.h"
-#include "stm32wbxx_ll_hsem.h"
-#include "stm32wbxx_ll_lpuart.h"
-#include "stm32wbxx_ll_rtc.h"
-#include "stm32wbxx_ll_usart.h"
-
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
@@ -77,6 +56,27 @@
 #define USE_SPI_CRC                 0
 #define USE_RTOS                    0
 
+// Include various HAL modules for convenience
+#include "stm32wbxx_hal_dma.h"
+#include "stm32wbxx_hal_adc.h"
+#include "stm32wbxx_hal_cortex.h"
+#include "stm32wbxx_hal_flash.h"
+#include "stm32wbxx_hal_gpio.h"
+#include "stm32wbxx_hal_i2c.h"
+#include "stm32wbxx_hal_pcd.h"
+#include "stm32wbxx_hal_pwr.h"
+#include "stm32wbxx_hal_rcc.h"
+#include "stm32wbxx_hal_rtc.h"
+#include "stm32wbxx_hal_spi.h"
+#include "stm32wbxx_hal_tim.h"
+#include "stm32wbxx_hal_uart.h"
+#include "stm32wbxx_hal_usart.h"
+#include "stm32wbxx_ll_adc.h"
+#include "stm32wbxx_ll_hsem.h"
+#include "stm32wbxx_ll_lpuart.h"
+#include "stm32wbxx_ll_rtc.h"
+#include "stm32wbxx_ll_usart.h"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
diff --git a/ports/stm32/boards/stm32wlxx_hal_conf_base.h b/ports/stm32/boards/stm32wlxx_hal_conf_base.h
index e98b0525bd1be..179f504656950 100644
--- a/ports/stm32/boards/stm32wlxx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32wlxx_hal_conf_base.h
@@ -26,25 +26,6 @@
 #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
@@ -72,6 +53,25 @@
 #define USE_SPI_CRC                 0
 #define USE_RTOS                    0
 
+// 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"
+
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 

From 88564c1406a9572de8a92a4bebcdbf55f3f18ec5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Sep 2023 15:33:56 +1000
Subject: [PATCH 0342/3129] stm32/uart: Generalise UART source clock
 calculation for H5 and H7 MCUs.

This gets the calculation working properly for H5 MCUs, and fixes the
switch statement to switch on csel&7 instead of csel&3.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                         |  1 +
 ports/stm32/boards/stm32h7xx_hal_conf_base.h |  1 +
 ports/stm32/uart.c                           | 63 +++++++++++---------
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 475d8f1004f08..58dc762006663 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -404,6 +404,7 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_tim.c \
 	hal_tim_ex.c \
 	hal_uart.c \
+	ll_rcc.c \
 	ll_utils.c \
 	)
 
diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index 7882adf151c12..670dee383f81f 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -95,6 +95,7 @@
 #include "stm32h7xx_ll_adc.h"
 #include "stm32h7xx_ll_lpuart.h"
 #include "stm32h7xx_ll_pwr.h"
+#include "stm32h7xx_ll_rcc.h"
 #include "stm32h7xx_ll_rtc.h"
 #include "stm32h7xx_ll_usart.h"
 
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 1823596df16c6..908361874d3f8 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -837,48 +837,57 @@ 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)
+
+    #elif defined(STM32H5) || defined(STM32H7)
+
     uint32_t csel;
+    unsigned int bus_pclk;
+
+    #if defined(STM32H5)
+    if (1 <= self->uart_id && self->uart_id <= 10) {
+        csel = RCC->CCIPR1 >> ((self->uart_id - 1) * 3);
+    } else {
+        csel = RCC->CCIPR2 >> ((self->uart_id - 11) * 3);
+    }
+    bus_pclk = self->uart_id == 1 ? 2 : 1;
+    #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     if (self->uart_id == 1 || self->uart_id == 6 || self->uart_id == 9 || self->uart_id == 10) {
         csel = RCC->CDCCIP2R >> 3;
+        bus_pclk = 2;
     } else {
         csel = RCC->CDCCIP2R;
+        bus_pclk = 1;
     }
-    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;
+    #else
     if (self->uart_id == 1 || self->uart_id == 6) {
         csel = RCC->D2CCIP2R >> 3;
+        bus_pclk = 2;
     } else {
         csel = RCC->D2CCIP2R;
+        bus_pclk = 1;
     }
-    switch (csel & 3) {
+    #endif
+
+    switch (csel & 7) {
         case 0:
-            if (self->uart_id == 1 || self->uart_id == 6) {
-                uart_clk = HAL_RCC_GetPCLK2Freq();
-            } else {
+            if (bus_pclk == 1) {
                 uart_clk = HAL_RCC_GetPCLK1Freq();
+            } else {
+                uart_clk = HAL_RCC_GetPCLK2Freq();
             }
             break;
+        case 1: {
+            LL_PLL_ClocksTypeDef PLL_Clocks;
+            LL_RCC_GetPLL2ClockFreq(&PLL_Clocks);
+            uart_clk = PLL_Clocks.PLL_Q_Frequency;
+            break;
+        }
+        case 2: {
+            LL_PLL_ClocksTypeDef PLL_Clocks;
+            LL_RCC_GetPLL3ClockFreq(&PLL_Clocks);
+            uart_clk = PLL_Clocks.PLL_Q_Frequency;
+            break;
+        }
         case 3:
             uart_clk = HSI_VALUE;
             break;

From 5dbd6fc70581e0264dbfc62a4313dca737124b5c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Sep 2023 17:31:54 +1000
Subject: [PATCH 0343/3129] stm32/dma: Remove unbalanced ).

This was added by mistake in 9e0f934cdf195ca8d06ce51eb89f89e590984176

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

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 298670f00e992..36f4a678597de 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -161,7 +161,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(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     .Request = 0,
     #endif
     .Direction = 0,

From 52f76cf4fc1287b000e510a8ed50297bbdb4d4de Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 28 Sep 2023 14:37:29 +1000
Subject: [PATCH 0344/3129] tests/stress/bytecode_limit.py: Reverse order of
 cases.

The PYBD_SF2 is right on the limit of being able to run this test and so
it succeeds the first two cases and fails the next two with MemoryError.

This causes it to SKIP, but that only works if it's the first thing
printed. So reverse the order of the tests so it fails on the biggest
one first.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/stress/bytecode_limit.py     | 2 +-
 tests/stress/bytecode_limit.py.exp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/stress/bytecode_limit.py b/tests/stress/bytecode_limit.py
index 8cca413cf2777..ad090637f6a68 100644
--- a/tests/stress/bytecode_limit.py
+++ b/tests/stress/bytecode_limit.py
@@ -3,7 +3,7 @@
 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):
+for n in (433, 432, 431, 430):
     try:
         exec("cond = 0\nif cond:\n" + body * n + "else:\n print('cond false')\n")
     except MemoryError:
diff --git a/tests/stress/bytecode_limit.py.exp b/tests/stress/bytecode_limit.py.exp
index 74ab06c09b674..1d892250b01e6 100644
--- a/tests/stress/bytecode_limit.py.exp
+++ b/tests/stress/bytecode_limit.py.exp
@@ -1,5 +1,5 @@
-cond false
-cond false
 RuntimeError
 RuntimeError
+cond false
+cond false
 [123]

From 3695211576ed69671b98412ff5278265ab65e6bd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Sep 2023 13:11:58 +1000
Subject: [PATCH 0345/3129] tests/float/float_format_ints.py: Put power-of-10
 test in separate file.

This test doesn't pass on builds with 30-bit floats (object repr C).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/float_format_ints.py         | 6 ------
 tests/float/float_format_ints_power10.py | 8 ++++++++
 tests/run-tests.py                       | 1 +
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 tests/float/float_format_ints_power10.py

diff --git a/tests/float/float_format_ints.py b/tests/float/float_format_ints.py
index 0bf4baf12d0a8..df4444166c5fa 100644
--- a/tests/float/float_format_ints.py
+++ b/tests/float/float_format_ints.py
@@ -12,12 +12,6 @@
             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))
diff --git a/tests/float/float_format_ints_power10.py b/tests/float/float_format_ints_power10.py
new file mode 100644
index 0000000000000..98900c135b2e4
--- /dev/null
+++ b/tests/float/float_format_ints_power10.py
@@ -0,0 +1,8 @@
+# Test that integers format to exact values.
+# This test requires at least 32-bit floats (won't work with 30-bit).
+
+# 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(i, "{:.7g}".format(float("1e" + str(i))))
diff --git a/tests/run-tests.py b/tests/run-tests.py
index de886b8ae7142..2d511c20ca7f8 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):
         )  # 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/float_format_ints_power10.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")

From a33766880e8fabfa421bee3252b486ebcfbde79b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Sep 2023 13:13:12 +1000
Subject: [PATCH 0346/3129] tests/extmod/deflate_decompress.py: Skip test when
 not enough memory.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/deflate_decompress.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/extmod/deflate_decompress.py b/tests/extmod/deflate_decompress.py
index 29d3ec2d71105..3ac8880af2636 100644
--- a/tests/extmod/deflate_decompress.py
+++ b/tests/extmod/deflate_decompress.py
@@ -6,6 +6,17 @@
     print("SKIP")
     raise SystemExit
 
+try:
+    # Check there's enough memory to deflate gzip streams.
+    # zlib.compress(b'', wbits=25)
+    empty_gzip = (
+        b"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    )
+    deflate.DeflateIO(io.BytesIO(empty_gzip)).read()
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
 # zlib.compress(b'micropython hello world hello world micropython', wbits=-9)
 data_raw = b'\xcb\xcdL.\xca/\xa8,\xc9\xc8\xcfS\xc8H\xcd\xc9\xc9W(\xcf/\xcaIAa\xe7"\xd4\x00\x00'
 # zlib.compress(b'micropython hello world hello world micropython', wbits=9)

From a7e2a6d9f2b0bfe3e6955331a2e35bc260354fd6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Sep 2023 13:37:31 +1000
Subject: [PATCH 0347/3129] tests/extmod/ssl_cadata.py: Skip test on axtls.

The axtls bindings don't support this.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/ssl_cadata.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/extmod/ssl_cadata.py b/tests/extmod/ssl_cadata.py
index a68cae1ecbb48..e66f6ca825baf 100644
--- a/tests/extmod/ssl_cadata.py
+++ b/tests/extmod/ssl_cadata.py
@@ -10,5 +10,9 @@
 # Invalid cadata.
 try:
     ssl.wrap_socket(io.BytesIO(), cadata=b"!")
+except TypeError:
+    # "cadata" keyword argument is not supported by axtls.
+    print("SKIP")
+    raise SystemExit
 except ValueError as er:
     print(repr(er))

From 7c88cdda49f98d76bc10b9d864fa1675acf46afc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Sep 2023 13:53:55 +1000
Subject: [PATCH 0348/3129] tests/float/math_domain.py: Tweak test to also pass
 with obj-repr-C.

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

diff --git a/tests/float/math_domain.py b/tests/float/math_domain.py
index 26e883ea64877..b1273c6c11cfc 100644
--- a/tests/float/math_domain.py
+++ b/tests/float/math_domain.py
@@ -28,7 +28,7 @@
     ("radians", math.radians),
     ("degrees", math.degrees),
 ):
-    for x in (0, 1, 1.1, -1, -1.1, inf, -inf, nan):
+    for x in (0, 1, 1.12, -1, -1.12, inf, -inf, nan):
         try:
             ans = "%.4f" % f(x)
         except ValueError:

From 62c3033ba6af8a498644716819ac91522d372305 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Sep 2023 15:28:42 +1000
Subject: [PATCH 0349/3129] tests/extmod/vfs_fat_finaliser.py: Tweak test so
 files are collected.

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

diff --git a/tests/extmod/vfs_fat_finaliser.py b/tests/extmod/vfs_fat_finaliser.py
index b6c7dffb8295f..a2cce7846c22b 100644
--- a/tests/extmod/vfs_fat_finaliser.py
+++ b/tests/extmod/vfs_fat_finaliser.py
@@ -64,7 +64,7 @@ def ioctl(self, op, arg):
 # in turn allocate new qstrs and/or a new qstr pool).
 f = None
 n = None
-names = ["x%d" % i for i in range(4)]
+names = ["x%d" % i for i in range(5)]
 
 # 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
@@ -74,12 +74,13 @@ def ioctl(self, op, arg):
     []
 
 # Run the test: create files without closing them, run GC, then read back files.
+# Only read back N-1 files because the last one may not be finalised due to
+# references to it being left on the C stack.
 for n in names:
     f = vfs.open(n, "w")
     f.write(n)
     f = None  # release f without closing
-    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 n in names:
+gc.collect()  # should finalise at least the first N-1 files by closing them
+for n in names[:-1]:
     with vfs.open(n, "r") as f:
         print(f.read())

From 03a3af417e749860b2771642a738151aef830586 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Sep 2023 13:09:53 +1000
Subject: [PATCH 0350/3129] esp8266/boards: Make sure modespnow.o is placed in
 irom0.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/esp8266_common.ld | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index 083e84d9afe5c..ed8c6a7fe8651 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -164,6 +164,7 @@ SECTIONS
         *machine_hspi.o(.literal*, .text*)
         *hspi.o(.literal*, .text*)
         *modesp.o(.literal* .text*)
+        *modespnow.o(.literal* .text*)
         *modos.o(.literal* .text*)
         *modlwip.o(.literal* .text*)
         *modsocket.o(.literal* .text*)

From 58f63497e5ee4d7915ea23929dad7d59712b7c01 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Sep 2023 13:36:25 +1000
Subject: [PATCH 0351/3129] extmod/modssl_axtls: Only close underlying socket
 once if it was used.

To match the behaviour of the mbedtls implementation, and pass the
ssl_basic.py test.

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

diff --git a/extmod/modssl_axtls.c b/extmod/modssl_axtls.c
index d169d89a2cfe0..6cb999c13b69f 100644
--- a/extmod/modssl_axtls.c
+++ b/extmod/modssl_axtls.c
@@ -208,7 +208,7 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     o->base.type = &ssl_socket_type;
     o->buf = NULL;
     o->bytes_left = 0;
-    o->sock = sock;
+    o->sock = MP_OBJ_NULL;
     o->blocking = true;
 
     uint32_t options = SSL_SERVER_VERIFY_LATER;
@@ -262,6 +262,10 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
         }
     }
 
+    // Populate the socket entry now that the SSLSocket is fully set up.
+    // This prevents closing the socket if an exception is raised above.
+    o->sock = sock;
+
     return o;
 }
 
@@ -348,11 +352,21 @@ STATIC mp_uint_t ssl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size
 
 STATIC mp_uint_t ssl_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);
-    if (request == MP_STREAM_CLOSE && self->ssl_sock != NULL) {
+    if (request == MP_STREAM_CLOSE) {
+        if (self->ssl_sock == NULL) {
+            // Already closed socket, do nothing.
+            return 0;
+        }
         ssl_free(self->ssl_sock);
         ssl_ctx_free(self->ssl_ctx);
         self->ssl_sock = NULL;
     }
+
+    if (self->sock == MP_OBJ_NULL) {
+        // Underlying socket may be null if the constructor raised an exception.
+        return 0;
+    }
+
     // Pass all requests down to the underlying socket
     return mp_get_stream(self->sock)->ioctl(self->sock, request, arg, errcode);
 }

From 2fcd28f7138ed0573da80305bec825ec38fcb013 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Sep 2023 17:29:12 +1000
Subject: [PATCH 0352/3129] py/mkrules.mk: Don't strip binary if STRIP variable
 is unset.

This provides a way to build a non-DEBUG host binary that still has symbols
and debug information.

Document this for the unix port, and update a comment in the unix port
Makefile.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/Makefile  |  4 ++--
 ports/unix/README.md | 14 ++++++++++++++
 py/mkrules.mk        |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index eae02bf257c42..52ae8314eb4ce 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -59,8 +59,8 @@ 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.
+# Note: Symbols and debug information will still be stripped from the final binary
+# unless "DEBUG=1" or "STRIP=" is passed to make, see README.md for details.
 CFLAGS += -g
 
 ifndef DEBUG
diff --git a/ports/unix/README.md b/ports/unix/README.md
index a1af289968586..e15fd93b2312d 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -72,3 +72,17 @@ 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 the SSL module, `MICROPY_PY_SSL` should be
 set to 1.
+
+Debug Symbols
+-------------
+
+By default, builds are stripped of symbols and debug information to save size.
+
+To build a debuggable version of the Unix port, there are two options
+
+1. Run `make [other arguments] DEBUG=1`. Note setting `DEBUG` also reduces the
+   optimisation level, so it's not a good option for builds that also want the
+   best performance.
+2. Run `make [other arguments] STRIP=`. Note that the value of `STRIP` is
+   empty. This will skip the build step that strips symbols and debug
+   information, but changes nothing else in the build configuration.
diff --git a/py/mkrules.mk b/py/mkrules.mk
index a3ff85ef821b3..ec36346b8afdf 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -212,7 +212,9 @@ $(BUILD)/$(PROG): $(OBJ)
 # we may want to compile using Thumb, but link with non-Thumb libc.
 	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
 ifndef DEBUG
+ifdef STRIP
 	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $@
+endif
 endif
 	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $@
 

From d83c1a43d4d31100f81bcd565236235efa9d1b90 Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 26 Sep 2023 11:40:17 +0300
Subject: [PATCH 0353/3129] py: Change ifdef DEBUG_PRINT to if DEBUG_PRINT.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 py/emitglue.c   | 4 ++--
 py/emitnative.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/emitglue.c b/py/emitglue.c
index 95be7f661abed..6ec6d6b885d4d 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -87,7 +87,7 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     mp_prof_extract_prelude(code, prelude);
     #endif
 
-    #ifdef DEBUG_PRINT
+    #if DEBUG_PRINT
     #if !(MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS)
     const size_t len = 0;
     #endif
@@ -149,7 +149,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     rc->n_pos_args = n_pos_args;
     rc->type_sig = type_sig;
 
-    #ifdef DEBUG_PRINT
+    #if 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++) {
         if (i > 0 && i % 16 == 0) {
diff --git a/py/emitnative.c b/py/emitnative.c
index c6e61500999c9..e6357b3f9f4a8 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -745,7 +745,7 @@ STATIC void adjust_stack(emit_t *emit, mp_int_t stack_size_delta) {
     if (emit->pass > MP_PASS_SCOPE && emit->stack_size > emit->scope->stack_size) {
         emit->scope->stack_size = emit->stack_size;
     }
-    #ifdef DEBUG_PRINT
+    #if DEBUG_PRINT
     DEBUG_printf("  adjust_stack; stack_size=%d+%d; stack now:", emit->stack_size - stack_size_delta, stack_size_delta);
     for (int i = 0; i < emit->stack_size; i++) {
         stack_info_t *si = &emit->stack_info[i];

From 276bfa3146534f5b6a0130309f3b166fb2a77e25 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 28 Sep 2023 12:26:51 +1000
Subject: [PATCH 0354/3129] py/lexer: Add missing initialisation for
 fstring_args_idx.

This was missed in 692d36d779192f32371f7f9daa845b566f26968d. Probably
never noticed because everything enables `MICROPY_GC_CONSERVATIVE_CLEAR`,
but found via ASAN thanks to @gwangmu & @chibinz.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/lexer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/lexer.c b/py/lexer.c
index b22cc2eaeaec4..6b28f2215227b 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -846,6 +846,7 @@ mp_lexer_t *mp_lexer_new(qstr src_name, mp_reader_t reader) {
     vstr_init(&lex->vstr, 32);
     #if MICROPY_PY_FSTRINGS
     vstr_init(&lex->fstring_args, 0);
+    lex->fstring_args_idx = 0;
     #endif
 
     // store sentinel for first indentation level

From 77ae0a0948d5c4de4efecefbba27f9aded9b79e2 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Wed, 27 Sep 2023 20:38:35 +1000
Subject: [PATCH 0355/3129] esp32/boards: Fix VBAT voltage calculation for UM
 S3 boards.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py | 3 ++-
 ports/esp32/boards/UM_PROS3/modules/pros3.py         | 3 ++-
 ports/esp32/boards/UM_TINYS3/modules/tinys3.py       | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
index 1ba919ceaeeb5..b6f486f3d811b 100644
--- a/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
+++ b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
@@ -65,8 +65,9 @@ def get_battery_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
+    adc.atten(ADC.ATTN_2_5DB)  # Needs 2.5DB attenuation for max voltage of 1.116V w/batt of 4.2V
     measuredvbat = adc.read()
-    measuredvbat /= 4095  # divide by 4095 as we are using the default ADC attenuation of 0dB
+    measuredvbat /= 3657  # Divide by 3657 as we are using 2.5dB attenuation, which is max input of 1.25V = 4095 counts
     measuredvbat *= 4.2  # Multiply by 4.2V, our max charge voltage for a 1S LiPo
     return round(measuredvbat, 2)
 
diff --git a/ports/esp32/boards/UM_PROS3/modules/pros3.py b/ports/esp32/boards/UM_PROS3/modules/pros3.py
index 7f95902936189..4e5b2e9656abe 100644
--- a/ports/esp32/boards/UM_PROS3/modules/pros3.py
+++ b/ports/esp32/boards/UM_PROS3/modules/pros3.py
@@ -41,8 +41,9 @@ def get_battery_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
+    adc.atten(ADC.ATTN_2_5DB)  # Needs 2.5DB attenuation for max voltage of 1.116V w/batt of 4.2V
     measuredvbat = adc.read()
-    measuredvbat /= 4095  # divide by 4095 as we are using the default ADC attenuation of 0dB
+    measuredvbat /= 3657  # Divide by 3657 as we are using 2.5dB attenuation, which is max input of 1.25V = 4095 counts
     measuredvbat *= 4.2  # Multiply by 4.2V, our max charge voltage for a 1S LiPo
     return round(measuredvbat, 2)
 
diff --git a/ports/esp32/boards/UM_TINYS3/modules/tinys3.py b/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
index 06bbb5ff827c6..6aa1f185f6aea 100644
--- a/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
+++ b/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
@@ -41,8 +41,9 @@ def get_battery_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
+    adc.atten(ADC.ATTN_2_5DB)  # Needs 2.5DB attenuation for max voltage of 1.116V w/batt of 4.2V
     measuredvbat = adc.read()
-    measuredvbat /= 4095  # divide by 4095 as we are using the default ADC attenuation of 0dB
+    measuredvbat /= 3657  # Divide by 3657 as we are using 2.5dB attenuation, which is max input of 1.25V = 4095 counts
     measuredvbat *= 4.2  # Multiply by 4.2V, our max charge voltage for a 1S LiPo
     return round(measuredvbat, 2)
 

From 79473691f2345bf343493143769e5730fe97cdf1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 28 Sep 2023 14:57:51 +1000
Subject: [PATCH 0356/3129] {mimxrt,powerpc,samd}/mpconfigport: Don't override
 parse chunk alloc.

This was copied from minimal/mpconfigport.h, but it doesn't make sense
for general ports.

Add a comment to minimal/mpconfigport.h to explain why it specifically
overrides it.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/mimxrt/mpconfigport.h  | 1 -
 ports/minimal/mpconfigport.h | 2 ++
 ports/powerpc/mpconfigport.h | 1 -
 ports/samd/mpconfigport.h    | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index fb4acede5901e..d1fe17ee10b53 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -42,7 +42,6 @@ uint32_t trng_random_u32(void);
 #else
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
 #endif
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT      (32)
 #define MICROPY_ALLOC_PATH_MAX              (256)
 
 // MicroPython emitters
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index 0f50f8d389cd9..56bef165facda 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -17,6 +17,8 @@
 #define MICROPY_ENABLE_EXTERNAL_IMPORT    (1)
 
 #define MICROPY_ALLOC_PATH_MAX            (256)
+
+// Use the minimum headroom in the chunk allocator for parse nodes.
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT    (16)
 
 // type definitions for the specific machine
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 084a461a4a738..06200a9969017 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -38,7 +38,6 @@
 #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)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index c983d7e6d669c..011119fd11719 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -34,7 +34,6 @@
 // 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)
 #define MICROPY_QSTR_BYTES_IN_HASH          (1)
 

From cf32c2feb519367e1f6ca1d6ed146269022090aa Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 28 Sep 2023 15:08:50 +1000
Subject: [PATCH 0357/3129] ports: Restrict board.json to standard features.

Applies to newly-added ARDUINO_PORTENTA_C33 and UM_NANOS3.

Makes the list match the standard features defined in
24a6e951ec7696b8d18d95fe5da36f7e489913d0.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/UM_NANOS3/board.json             |  2 +-
 .../boards/ARDUINO_PORTENTA_C33/board.json          | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/boards/UM_NANOS3/board.json b/ports/esp32/boards/UM_NANOS3/board.json
index 2eb40ac3c9efb..b213a8ad6bd43 100644
--- a/ports/esp32/boards/UM_NANOS3/board.json
+++ b/ports/esp32/boards/UM_NANOS3/board.json
@@ -6,7 +6,7 @@
     "features": [
         "Battery Charging",
         "RGB LED",
-        "SPIRAM",
+        "External RAM",
         "WiFi",
         "BLE"
     ],
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
index 18e6fe65e44d4..4c4d4e4326b3d 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
@@ -4,13 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "512KB SRAM",
-        "2MB Flash",
-        "16MB QSPI Flash",
-        "USB High Speed Phy",
-        "10/100 Ethernet Phy",
-        "ESP32 WiFi/BT Module",
-        "NXP SE050 crypto device"
+        "BLE",
+        "Ethernet",
+        "External Flash",
+        "Secure Element",
+        "USB-C",
+        "WiFi"
     ],
     "images": [
         "ABX00074_01.iso_1000x750.jpg"

From 88ecc78eb30aaea395c3e97ea097d6194a1f0baf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 28 Sep 2023 15:26:23 +1000
Subject: [PATCH 0358/3129] tools/autobuild/build-downloads.py: Verify standard
 features.

Defines the list of standard features and ensures that each board.json
only uses those ones. This list can be extended, but needs to be a
deliberate decision.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/autobuild/build-downloads.py | 46 ++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tools/autobuild/build-downloads.py b/tools/autobuild/build-downloads.py
index 0f532e8bf0792..c03d98aa5dea4 100755
--- a/tools/autobuild/build-downloads.py
+++ b/tools/autobuild/build-downloads.py
@@ -5,6 +5,42 @@
 import os
 import sys
 
+VALID_FEATURES = {
+    # Connectivity
+    "BLE",
+    "CAN",
+    "Ethernet",
+    "LoRa",
+    "USB",
+    "USB-C",
+    "WiFi",
+    # MCU features
+    "Dual-core",
+    "External Flash",
+    "External RAM",
+    # Form factor
+    "Feather",
+    # Connectors / sockets
+    "JST-PH",
+    "JST-SH",
+    "mikroBUS",
+    "microSD",
+    "SDCard",
+    # Sensors
+    "Environment Sensor",
+    "IMU",
+    # Other
+    "Audio Codec",
+    "Battery Charging",
+    "Camera",
+    "DAC",
+    "Display",
+    "Microphone",
+    "PoE",
+    "RGB LED",
+    "Secure Element",
+}
+
 
 def main(repo_path, output_path):
     boards_index = []
@@ -19,6 +55,16 @@ def main(repo_path, output_path):
         with open(board_json, "r") as f:
             blob = json.load(f)
 
+            features = set(blob.get("features", []))
+            if not features.issubset(VALID_FEATURES):
+                print(
+                    board_json,
+                    "unknown features:",
+                    features.difference(VALID_FEATURES),
+                    file=sys.stderr,
+                )
+                sys.exit(1)
+
             # 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))

From 58c2c503a93bde9b9a48c76151c6a52ff56ab4f9 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Fri, 11 Aug 2023 13:26:17 +0200
Subject: [PATCH 0359/3129] tools/mpremote: Add support for rfc2217, serial
 over TCP.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 docs/reference/mpremote.rst                 | 4 +++-
 tools/mpremote/mpremote/transport_serial.py | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index b826725360251..08ef5d31ff572 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -100,6 +100,8 @@ The full list of supported commands are:
     command output)
   - ``port:<path>``: connect to the device with the given path (the first column
     from the ``connect list`` command output
+  - ``rfc2217://<host>:<port>``: connect to the device using serial over TCP
+    (e.g. a networked serial port based on RFC2217)
   - any valid device name/path, to connect to that device
 
   **Note:** Instead of using the ``connect`` command, there are several
@@ -109,7 +111,7 @@ The full list of supported commands are:
 
   **Note:** The ``auto`` option will only detect USB serial ports, i.e. a serial
   port that has an associated USB VID/PID (i.e. CDC/ACM or FTDI-style
-  devices). Other types of serial ports
+  devices). Other types of serial ports will not be auto-detected.
 
 .. _mpremote_command_disconnect:
 
diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 09025c3098833..e04f5b4ac9ab8 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -76,7 +76,9 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True):
         delayed = False
         for attempt in range(wait + 1):
             try:
-                if os.name == "nt":
+                if device.startswith("rfc2217://"):
+                    self.serial = serial.serial_for_url(device, **serial_kwargs)
+                elif os.name == "nt":
                     self.serial = serial.Serial(**serial_kwargs)
                     self.serial.port = device
                     portinfo = list(serial.tools.list_ports.grep(device))  # type: ignore

From 584c495d3201bbf01190cff673533bc405cee53f Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Fri, 22 Sep 2023 18:46:08 +0530
Subject: [PATCH 0360/3129] shared/netutils/dhcpserver: Reply on correct netif.

The DHCP server broadcasts messages.  They are being sent via the default
netif which might be completely the wrong network.  We want to send
messages to the netif we got the original message from.

Original author: [Peter Harper](https://github.com/peterharperuk)
Source: https://github.com/raspberrypi/pico-examples/pull/392

Signed-off-by: Samveen <samveen@samveen.in>
---
 shared/netutils/dhcpserver.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/shared/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
index 50cd69a1eb586..dca95507d3f01 100644
--- a/shared/netutils/dhcpserver.c
+++ b/shared/netutils/dhcpserver.c
@@ -118,7 +118,7 @@ static int dhcp_socket_bind(struct udp_pcb **udp, uint32_t ip, uint16_t port) {
     return udp_bind(*udp, &addr, port);
 }
 
-static int dhcp_socket_sendto(struct udp_pcb **udp, const void *buf, size_t len, uint32_t ip, uint16_t port) {
+static int dhcp_socket_sendto(struct udp_pcb **udp, struct netif *netif, const void *buf, size_t len, uint32_t ip, uint16_t port) {
     if (len > 0xffff) {
         len = 0xffff;
     }
@@ -132,7 +132,12 @@ static int dhcp_socket_sendto(struct udp_pcb **udp, const void *buf, size_t len,
 
     ip_addr_t dest;
     IP4_ADDR(&dest, ip >> 24 & 0xff, ip >> 16 & 0xff, ip >> 8 & 0xff, ip & 0xff);
-    err_t err = udp_sendto(*udp, p, &dest, port);
+    err_t err;
+    if (netif != NULL) {
+        err = udp_sendto_if(*udp, p, &dest, port, netif);
+    } else {
+        err = udp_sendto(*udp, p, &dest, port);
+    }
 
     pbuf_free(p);
 
@@ -153,7 +158,7 @@ static uint8_t *opt_find(uint8_t *opt, uint8_t cmd) {
     return NULL;
 }
 
-static void opt_write_n(uint8_t **opt, uint8_t cmd, size_t n, void *data) {
+static void opt_write_n(uint8_t **opt, uint8_t cmd, size_t n, const void *data) {
     uint8_t *o = *opt;
     *o++ = cmd;
     *o++ = n;
@@ -281,7 +286,8 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
     opt_write_u32(&opt, DHCP_OPT_DNS, DEFAULT_DNS); // can have multiple addresses
     opt_write_u32(&opt, DHCP_OPT_IP_LEASE_TIME, DEFAULT_LEASE_TIME_S);
     *opt++ = DHCP_OPT_END;
-    dhcp_socket_sendto(&d->udp, &dhcp_msg, opt - (uint8_t *)&dhcp_msg, 0xffffffff, PORT_DHCP_CLIENT);
+    struct netif *netif = ip_current_input_netif();
+    dhcp_socket_sendto(&d->udp, netif, &dhcp_msg, opt - (uint8_t *)&dhcp_msg, 0xffffffff, PORT_DHCP_CLIENT);
 
 ignore_request:
     pbuf_free(p);

From 3c2b2f7a4d790c66dbe723c5ed59ec18472baa6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 21 Feb 2023 07:11:14 +0000
Subject: [PATCH 0361/3129] rp2/modmachine: Fix lightsleep while wifi is
 powered off.

While cyw43 is deinitialized, an interrupt occurs.  That is handled with
these lines: ports/rp2/mpnetworkport.c#L59-L61 and as pendsv is disabled
while in network code, the poll function then just waits there.

When deinit has finished, the poll func is executed, but skipped:
src/cyw43_ctrl.c#L222-L225 this skips the `CYW43_POST_POLL_HOOK` which
would re-enable interrupts, but also reset `cyw43_has_pending`.

And in that state, the lightsleep code, will skip sleeping as it thinks
there is a network packet pending to be handled.

With this change applied, lightsleep works as expected when the wifi chip
is enabled, and when it's powered off.
---
 ports/rp2/modmachine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 1efbb09312bf8..35c938b54bd4f 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -146,7 +146,7 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     uint32_t my_interrupts = save_and_disable_interrupts();
     #if MICROPY_PY_NETWORK_CYW43
-    if (cyw43_has_pending) {
+    if (cyw43_has_pending && cyw43_poll != NULL) {
         restore_interrupts(my_interrupts);
         return mp_const_none;
     }

From dd8a69b5f2996800bcd193dbfdc2e3bf0fb52d65 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Sep 2023 18:11:51 +1000
Subject: [PATCH 0362/3129] tests/README: Document ./run-internalbench.py.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/README.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/README.md b/tests/README.md
index b0bff4872edf3..c89930d0c088b 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -147,3 +147,30 @@ 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.
+
+## internal_bench
+
+The `internal_bench` directory contains a set of tests for benchmarking
+different internal Python features. By default, tests are run on the (unix or
+Windows) host, but the `--pyboard` option allows them to be run on an attached
+board instead.
+
+Tests are grouped by the first part of the file name, and the test runner compares
+output between each group of tests.
+
+The benchmarks measure the elapsed (wall time) for each test, according
+to MicroPython's own time module.
+
+If run without any arguments, all test groups are run. Otherwise, it's possible
+to manually specify which test cases to run.
+
+Example:
+
+```
+$ ./run-internalbench.py internal_bench/bytebuf-*.py
+internal_bench/bytebuf:
+    0.094s (+00.00%) internal_bench/bytebuf-1-inplace.py
+    0.471s (+399.24%) internal_bench/bytebuf-2-join_map_bytes.py
+    0.177s (+87.78%) internal_bench/bytebuf-3-bytarray_map.py
+1 tests performed (3 individual testcases)
+```

From b461d218d14cee9b5a1b3d2749ae14cbec1388a2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Sep 2023 18:12:11 +1000
Subject: [PATCH 0363/3129] tests/run-internalbench.py: Remove old CPython
 reference.

At one point it was possible to internal_bench CPython vs MicroPython, but
seemingly not any more.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/run-internalbench.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index 2cf7f3443bbca..c9f783e474c9c 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -8,16 +8,11 @@
 from glob import glob
 from collections import defaultdict
 
-# 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/build-standard/micropython.exe"
     )
 else:
-    CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
 

From 6662d84faa25a5c64bd4f5e07bc548ceaa7f2fb5 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Thu, 7 Sep 2023 08:52:39 +1000
Subject: [PATCH 0364/3129] esp32/boards: Add bootloader rollback support for
 all builds.

Add "CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y" to
ports/esp32/boards/sdkconfig.base so that all micropython esp32 images
support OTA rollback in the bootloader.  These images can then be converted
to OTA-capable images as required by user tools.

Also remove CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y from board-specific
sdkconfig files as this is now the default.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board | 1 -
 ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota        | 1 -
 ports/esp32/boards/SIL_WESP32/sdkconfig.board         | 1 -
 ports/esp32/boards/sdkconfig.base                     | 1 +
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
index 4d175f7ed77c7..888e225763d4e 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
@@ -17,6 +17,5 @@ CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Arduino"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Nano ESP32"
 
 # compatibility with Espressif Arduino core
-CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_ESP_ENABLE_COREDUMP_TO_FLASH=y
diff --git a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
index 4a164aa6f841b..e3a1f81fd3c9f 100644
--- a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
+++ b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
@@ -1,4 +1,3 @@
-CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB-ota.csv"
 
diff --git a/ports/esp32/boards/SIL_WESP32/sdkconfig.board b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
index be9e40c4c3ae5..741a4db439099 100644
--- a/ports/esp32/boards/SIL_WESP32/sdkconfig.board
+++ b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
@@ -13,7 +13,6 @@ 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"
 
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 4b7c852332da0..6526a803558e9 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -14,6 +14,7 @@ CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 # Bootloader config
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
+CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 
 # Change default log level to "ERROR" (instead of "INFO")
 CONFIG_LOG_DEFAULT_LEVEL_INFO=n

From d7f63f994f229610c44af9387cb8c9bad34c03fd Mon Sep 17 00:00:00 2001
From: dotnfc <dotnfc@163.com>
Date: Tue, 12 Sep 2023 17:15:27 +0800
Subject: [PATCH 0365/3129] esp32/main: Allow a board to override the
 MicroPython task stack size.

This allows the MicroPython task stack size to be overridden by the
mpconfigboard.h settings.

Signed-off-by: dotnfc <dotnfc@163.com>
---
 ports/esp32/main.c         | 7 +++----
 ports/esp32/mpconfigport.h | 5 +++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 1420dd579c5db..4a9c0060b2558 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -66,7 +66,6 @@
 
 // MicroPython runs as a task under FreeRTOS
 #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
@@ -87,7 +86,7 @@ int vprintf_null(const char *format, va_list ap) {
 void mp_task(void *pvParameter) {
     volatile uint32_t sp = (uint32_t)esp_cpu_get_sp();
     #if MICROPY_PY_THREAD
-    mp_thread_init(pxTaskGetStackStart(NULL), MP_TASK_STACK_SIZE / sizeof(uintptr_t));
+    mp_thread_init(pxTaskGetStackStart(NULL), MICROPY_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
     #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_init();
@@ -109,7 +108,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 - MP_TASK_STACK_LIMIT_MARGIN);
+    mp_stack_set_limit(MICROPY_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_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
@@ -206,7 +205,7 @@ void app_main(void) {
     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);
+    xTaskCreatePinnedToCore(mp_task, "mp_task", MICROPY_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/mpconfigport.h b/ports/esp32/mpconfigport.h
index ae73e02e41a53..da26a78ae7b5f 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -152,6 +152,11 @@
 #define MICROPY_FATFS_MAX_SS                (4096)
 #define MICROPY_FATFS_LFN_CODE_PAGE         437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 
+// task size
+#ifndef MICROPY_TASK_STACK_SIZE
+#define MICROPY_TASK_STACK_SIZE             (16 * 1024)
+#endif
+
 #define MP_STATE_PORT MP_STATE_VM
 
 // type definitions for the specific machine

From 61f331374da150f0d9f42d694d56b6b0dc9ee498 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 1 Sep 2023 16:02:29 +1000
Subject: [PATCH 0366/3129] stm32/usbd_msc_interface: Allow configuring the MSC
 inquiry response.

This was previously hard-coded to "MicroPy" / "pyboard Flash" / "1.00".

Now allow it to be overridden by a board.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/mpconfigboard_common.h | 15 +++++++++++++++
 ports/stm32/usbd_msc_interface.c   | 30 ++++++++++++++++--------------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 611a08252d51d..b6cc7f84db7e9 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -256,6 +256,21 @@
 #define MICROPY_HW_USB_INTERFACE_FS_STRING      "Pyboard Interface"
 #endif
 
+// Must be 8 bytes.
+#ifndef MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING
+#define MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING "MicroPy "
+#endif
+
+// Must be 16 bytes.
+#ifndef MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING
+#define MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING "pyboard Flash   "
+#endif
+
+// Must be 4 bytes.
+#ifndef MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING
+#define MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING "1.00"
+#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
diff --git a/ports/stm32/usbd_msc_interface.c b/ports/stm32/usbd_msc_interface.c
index cb1de96841553..a294a295b3eb4 100644
--- a/ports/stm32/usbd_msc_interface.c
+++ b/ports/stm32/usbd_msc_interface.c
@@ -90,20 +90,17 @@ STATIC const uint8_t usbd_msc_vpd83[4] = {
     0x00, 0x00, // page length (additional bytes beyond this entry)
 };
 
-STATIC const int8_t usbd_msc_inquiry_data[36] = {
-    0x00, // peripheral qualifier; peripheral device type
-    0x80, // 0x00 for a fixed drive, 0x80 for a removable drive
-    0x02, // version
-    0x02, // response data format
-    (STANDARD_INQUIRY_DATA_LEN - 5), // additional length
-    0x00, // various flags
-    0x00, // various flags
-    0x00, // various flags
-    '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
-};
+STATIC const int8_t usbd_msc_inquiry_data[STANDARD_INQUIRY_DATA_LEN] = \
+    "\x00"          // peripheral qualifier; peripheral device type
+    "\x80"          // 0x00 for a fixed drive, 0x80 for a removable drive
+    "\x02"          // version
+    "\x02"          // response data format
+    "\x1f"          // 0x1f = (STANDARD_INQUIRY_DATA_LEN - 5) = 0x24 - 5
+    "\x00\x00\x00"  // various flags
+    MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING   // 8 bytes
+    MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING  // 16 bytes
+    MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING // 4 bytes
+;
 
 // Set the logical units that will be exposed over MSC
 void usbd_msc_init_lu(size_t lu_n, const void *lu_data) {
@@ -210,6 +207,11 @@ STATIC int usbd_msc_Inquiry(uint8_t lun, const uint8_t *params, uint8_t *data_ou
         return -1;
     }
 
+    // These strings must be padded to the expected length. (+1 here for null terminator).
+    MP_STATIC_ASSERT(sizeof(MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING) == 8 + 1);
+    MP_STATIC_ASSERT(sizeof(MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING) == 16 + 1);
+    MP_STATIC_ASSERT(sizeof(MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING) == 4 + 1);
+
     uint8_t alloc_len = params[3] << 8 | params[4];
     int len = MIN(sizeof(usbd_msc_inquiry_data), alloc_len);
     memcpy(data_out, usbd_msc_inquiry_data, len);

From da6f1e1d1e2feb4b7aa4ee6c84e7e2c816d2bead Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 1 Sep 2023 16:03:27 +1000
Subject: [PATCH 0367/3129] rp2/msc_disk: Allow configuring the USB MSC inquiry
 response.

This was previously hard-coded to "Micropy" / "Mass Storage" / "1.0".

Now allow it to be overridden by a board.

Also change "Micropy" to "MicroPy" and "1.0" to "1.00" to match stm32.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/msc_disk.c         | 10 +++-------
 shared/tinyusb/tusb_config.h | 12 ++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/msc_disk.c b/ports/rp2/msc_disk.c
index 24bd51cec3f33..0937eeddf0d06 100644
--- a/ports/rp2/msc_disk.c
+++ b/ports/rp2/msc_disk.c
@@ -44,13 +44,9 @@ 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);
+    memcpy(vendor_id, MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING), 8));
+    memcpy(product_id, MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING), 16));
+    memcpy(product_rev, MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING), 4));
 }
 
 // Invoked when received Test Unit Ready command.
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index 96e883fc88861..266cb88cc2fe6 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -43,6 +43,18 @@
 #define MICROPY_HW_USB_CDC_INTERFACE_STRING "Board CDC"
 #endif
 
+#ifndef MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING
+#define MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING "MicroPy"
+#endif
+
+#ifndef MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING
+#define MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING "Mass Storage"
+#endif
+
+#ifndef MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING
+#define MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING "1.00"
+#endif
+
 #ifndef CFG_TUSB_RHPORT0_MODE
 #define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
 #endif

From 6a6a90507d0f7063ffe3b5b12ecf3855613a3b89 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 15 Sep 2023 15:07:18 +0200
Subject: [PATCH 0368/3129] stm32/boards/ARDUINO_GIGA: Update board config.

Changes are:
- Disable internal flash storage and use the external QSPI for storage.
- Disable default bootloader entry mode.  The bootloader entry function
  exists in board_init.c.
- Remove OSC enable/disable macros (this board doesn't have an OSC).

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index 29b61bd8ddd78..29f1e6140190a 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -30,7 +30,7 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (0)
 
 #define MICROPY_BOARD_STARTUP       GIGA_board_startup
 void GIGA_board_startup(void);
@@ -38,6 +38,7 @@ void GIGA_board_startup(void);
 #define MICROPY_BOARD_EARLY_INIT    GIGA_board_early_init
 void GIGA_board_early_init(void);
 
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) GIGA_board_enter_bootloader()
 void GIGA_board_enter_bootloader(void);
 
@@ -46,10 +47,6 @@ void GIGA_board_low_power(int mode);
 #define MICROPY_BOARD_ENTER_STOP    GIGA_board_low_power(1);
 #define MICROPY_BOARD_ENTER_STANDBY GIGA_board_low_power(2);
 
-void GIGA_board_osc_enable(int enable);
-#define MICROPY_BOARD_OSC_ENABLE    GIGA_board_osc_enable(1);
-#define MICROPY_BOARD_OSC_DISABLE   GIGA_board_osc_enable(0);
-
 // PLL1 480MHz/48MHz SDMMC and FDCAN
 // USB and RNG are clocked from the HSI48
 #define MICROPY_HW_CLK_PLLM             (4)

From 10f34b97d14dc3975fb021cd79d6ed95967e5a66 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Wed, 6 Sep 2023 17:10:06 +0100
Subject: [PATCH 0369/3129] tests/multi_net/ssl_cert_rsa.py: Update test
 certificate.

Update expired certificate, increase time validity period to five years and
fix command arguments typos in commentaries.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 tests/multi_net/ssl_cert_rsa.py | 197 ++++++++++++++++----------------
 1 file changed, 98 insertions(+), 99 deletions(-)

diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
index 872855edbaf2e..6454ad83aafeb 100644
--- a/tests/multi_net/ssl_cert_rsa.py
+++ b/tests/multi_net/ssl_cert_rsa.py
@@ -14,115 +14,114 @@
 # 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
+# $ openssl req -x509 -newkey rsa:4096 -keyout rsa_key.pem -out rsa_cert.pem -days 1825 -nodes
 #
 # 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
+# $ openssl x509 -in rsa_cert.pem -out rsa_cert.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"
+    b"308205b53082039da00302010202090090195a9382cbcbef300d06092a864886f70d01010b050030"
+    b"71310b3009060355040613024155310c300a06035504080c03466f6f310c300a06035504070c0342"
+    b"617231143012060355040a0c0b4d6963726f507974686f6e31143012060355040b0c0b4d6963726f"
+    b"507974686f6e311a301806035504030c116d6963726f707974686f6e2e6c6f63616c301e170d3233"
+    b"303731353136323034395a170d3238303731333136323034395a3071310b30090603550406130241"
+    b"55310c300a06035504080c03466f6f310c300a06035504070c0342617231143012060355040a0c0b"
+    b"4d6963726f507974686f6e31143012060355040b0c0b4d6963726f507974686f6e311a3018060355"
+    b"04030c116d6963726f707974686f6e2e6c6f63616c30820222300d06092a864886f70d0101010500"
+    b"0382020f003082020a0282020100944fdb40b587af0cf7e9696c355d24a70936874e6a3bd2598166"
+    b"ce2495aaf9b4af01b54471f7cbf3626ae0720bf0bfd520507f79ec553c62898bfd2598385f56061b"
+    b"0e8f452625c82d3c83e2a0d070ab9be2db21faf88c58e4a61d62f8ff43960aa1ffdadaad41f7cb2e"
+    b"b337070a39f08ff9fe20c09b19926cbbc4a5154b796ff7e7ce11334e090d360c81072af08758f6cd"
+    b"7bad75bc7b95b6dcc801c85de81d72806ca3ce0782bfcbdffce707f9fb1572a7db0d74445dc32d5f"
+    b"bea12a3ab1d47edf668ebfa60ed8b51e654e76292e3894ee574ea851064956906aa8afe00e67664e"
+    b"110b5a6ff7db51f7944463cdd626ff2ec7886c229f4ca5985168f20f8f210972b5ff9181d4f3beb8"
+    b"914ec5b24a0953253b3d42ab55e98bd70cb25e7a24c603b27ec83e1ce31c90b728b47a5f606ff2a1"
+    b"0ff784a016894c28f7e71f51a78b0a7601bbbc8c1b132b04e567394a327a7aa4674e8e4c0bfaec4b"
+    b"eeccf0ed09d1660933d718a2f34ff91d79d875a73fbac07182a9531ca52bd360e2678f95ff9b4ba2"
+    b"1490d7456548364b2eb335c207d6e1e48ccd7d8cb43868a334c095bd9673be7403f3b69b545ee904"
+    b"a3f513d2b2a2dd46f06820cd394819551dd05d9b34a8a3238a521f6c1c3592f76d5ef29e181c60ee"
+    b"bcaf4c63098794c15d4f82e7425e75ff8f5430247ecc0e7f2983b715506012f187d54a7b6729bc61"
+    b"fa4d10a9f22b0203010001a350304e301d0603551d0e041604147a6d126931b58fa1c3dff3c9215f"
+    b"6202e61fa8da301f0603551d230418301680147a6d126931b58fa1c3dff3c9215f6202e61fa8da30"
+    b"0c0603551d13040530030101ff300d06092a864886f70d01010b0500038202010051b3a4834d2bf1"
+    b"95ac645bca61e95289eff38d80ab2ee732c6ebd1370781b66955a7583c78831f9fb7d8b236a1b5ff"
+    b"c9183b4e17225951e1fb2c39f7218af30ec3fd8e4f697e0d10ecd05eb14208535dc55bc1e25d8a43"
+    b"050670d4de3e4cb8c884e6cbb6b884320d496b354acf5258bcb0ddaefd065ee8fccbddf3a2bfa10d"
+    b"bfeb8ab6b2580b50f0678760599269b612f81ba1310bfcd39427fec49211769c514cdd0305081d8a"
+    b"11ebe705496d4dcc31ac9fab96a2d298ee4423789baffbfa0fa82ee1b5113f9cf597647a36640cad"
+    b"abf535205c322e16153d6ab04b0817f57d8a9a6ca2db2ab10986ae9eab343547e52c78a641868bb5"
+    b"e2981182fcc55d86cdc6aa8478b226318a3be72fb726dd0b90f30df810c4d6c6b5a0ecb3c6cc375b"
+    b"8d3d244a07d8517ad390929be7b75f679beb63d8c1028905af2383144a4ed560e45907d301846acc"
+    b"9dbec86bcdd7fbf8a805b59f359c8bd997f5eb7b8aea6f7a538f9663ec2c12e07d4b37650e92b783"
+    b"74356daee4a501eeb27fef79b472b2fcce4363a9ff4d80f96a3b47dc4c4ef380ef231d193a517071"
+    b"b31078fa9f9a80cfd943f7e99e4ed8548c9ea80fd845ecc2c89726be273fa8b36680d645998fd1e6"
+    b"2367638f4953e9af68531aedb2ee49dffaaed07a4a5b97551712058219ac6f8da71710949f761271"
+    b"5273a348dcce40c556bdab00a4ae3a7b23a5934ac88b7640df"
 )
 
 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"
+    b"308209280201000282020100944fdb40b587af0cf7e9696c355d24a70936874e6a3bd2598166ce24"
+    b"95aaf9b4af01b54471f7cbf3626ae0720bf0bfd520507f79ec553c62898bfd2598385f56061b0e8f"
+    b"452625c82d3c83e2a0d070ab9be2db21faf88c58e4a61d62f8ff43960aa1ffdadaad41f7cb2eb337"
+    b"070a39f08ff9fe20c09b19926cbbc4a5154b796ff7e7ce11334e090d360c81072af08758f6cd7bad"
+    b"75bc7b95b6dcc801c85de81d72806ca3ce0782bfcbdffce707f9fb1572a7db0d74445dc32d5fbea1"
+    b"2a3ab1d47edf668ebfa60ed8b51e654e76292e3894ee574ea851064956906aa8afe00e67664e110b"
+    b"5a6ff7db51f7944463cdd626ff2ec7886c229f4ca5985168f20f8f210972b5ff9181d4f3beb8914e"
+    b"c5b24a0953253b3d42ab55e98bd70cb25e7a24c603b27ec83e1ce31c90b728b47a5f606ff2a10ff7"
+    b"84a016894c28f7e71f51a78b0a7601bbbc8c1b132b04e567394a327a7aa4674e8e4c0bfaec4beecc"
+    b"f0ed09d1660933d718a2f34ff91d79d875a73fbac07182a9531ca52bd360e2678f95ff9b4ba21490"
+    b"d7456548364b2eb335c207d6e1e48ccd7d8cb43868a334c095bd9673be7403f3b69b545ee904a3f5"
+    b"13d2b2a2dd46f06820cd394819551dd05d9b34a8a3238a521f6c1c3592f76d5ef29e181c60eebcaf"
+    b"4c63098794c15d4f82e7425e75ff8f5430247ecc0e7f2983b715506012f187d54a7b6729bc61fa4d"
+    b"10a9f22b0203010001028202000b41080520013cc242299f0b4bfd5663aa6a4dd8206d8ba7a90f11"
+    b"036babfea8bc42e7eb5aae8ff656f87f3188406b7e13a6a815ab5e4867bdc236a25caba26857ac43"
+    b"ed9134b4d73cbf83ce759f7b7d3a25fbb4d76376dae3f6caf210ace60703a58951a51852922803d2"
+    b"2b91c82fdf563d85101d2d67c259a7e1e318fb922a71e85015b40beed9e6c90a1d6e1fb45586dcce"
+    b"ceb9c964a356ade82b6275e5c01e492a753f940852df788eab454aadc7d1dc74ddcf7dc493a3e4c9"
+    b"0557bbfe747e701b4b27b5c518a29dbcd8385525a1bb835e72a489096e15387e2f70b112c6bbd79e"
+    b"a97ae2562f7947cd2367635e25b5656a54aac7f1c892243dc135e5025a44d724884b244e8fe4abb4"
+    b"c67bbd2e652d5fc5942b55c24b7f642f65b9b6d37110a955c63eb4f26435be056effbd777f14db8d"
+    b"3d8073f7583b24656edb19911e1307101443a50717c32dbb80b6212e6f0ee43f629b1e718a958a5c"
+    b"fdcd99762f5bff821ac49b0e77c9d1426f8bb31142df030549330dde5cc92fa20d09744ceac6ae02"
+    b"fb354e9b930173e08488375f7c795b3b934c72b58a3353332d5129d56151b57a793d99868885ebd4"
+    b"aac11ca03e09f5b6bd9dda5322a0ab81e468839ea373ecd2b5ac4ffc99740581b35add07f83ff18e"
+    b"c2111555ead17783294b2330ad874bd966c1d60b44e5f379650910a8a05eb92cb7550191c13251f5"
+    b"0a11afa7510282010100c5a4aa380f6bdd4b4524deb44425aa7ef61039a46ad0d09e2ca2cd7fb757"
+    b"ff325f81eaf3a2e790afb3ffb0d71f3ffa52db1a24d3149839f03d1acfe33ef721fe310895986c5a"
+    b"fe88ceb82318ed540456b8aa7e07dc7b982345c4f040b1544bd2ee1e4cb0315bd8db3794ea93d705"
+    b"f41cc1c06badf72de36d2b4a4399846d6c851260e5044e9495be8225307edb97071bdea08c99ccfe"
+    b"54219f6a785db47864e03cf2851abcb62941d3efeea7cdf136d9e23845cf9ea0323b156c686c6d30"
+    b"1cbb5a8c7f1db23a998bf549874b2c13685b20d200d2d91be92c40480a0cca18c28f654dd644c60d"
+    b"e8e03824c0ff83e7cbfc44b2aa16ad537a09565ed4afbe63b8930282010100c01a5e6108420c3d2e"
+    b"ccd0b559e08680f47b3e7271ee4ea9bf4740cc5c418a53225778eddb716447b02d234909f8291581"
+    b"a45be0591952bacda55e774338962502c1d73f2d5383259aaa69f2603fde216ca9557d8b4e629888"
+    b"c697fec1aaf9f99ebd223c06399cc13cd21bd01e3660acc148ba841e5c89b3f8f04efac07f8072a5"
+    b"bacb4f5cfece528496bb35e906361efdb89a17fe4999f47508d5e48914ac651172ddc994993b4672"
+    b"7ec62810d6c204af4b5fd52ba4f8cb3c8720fbd469b219868e28294e60276bc2483e78d96a0edf29"
+    b"e237fe6f1660705d5cd3590c476e37c5d367b19bfb0a1c29ef296dfd3e9fabf5b37e1fb7357a3032"
+    b"c8a641b467d7090282010100bc6d55bf66ac6e69017dba38e0b38c4dc8a8055c845d9a5702b51ff8"
+    b"4042cbd1298f0201cf70b7d75b634d247aed92e9056c72692f3c46188d190fd35647648824154c11"
+    b"ea54025149cbf1e224f9b1bd4007836a594117f5a0e1b62fe72037bddc38d4e231dc9fedb79ae8dd"
+    b"93e5602b3e6905fff02536aaf0d7b78517e4fece0b8c872ac9040d93781e9e92832604a80462ca49"
+    b"234fe1c3c0695061fdd9be4aaeb08447ce5c590f2250a01629586bf3e421c424c1d576ae2fa99010"
+    b"b7346460165ed61de8bac782d0928e4313bd59037051e6691e85e692c2a22bbaafbe555742bca7a8"
+    b"1fae4933e332df317b7f3551c7e91211d6a33c38c4b85a4b46d769b3028201003884497a00a4f5d6"
+    b"d63af9b830fe06744ff926512345ba2ce49280f4debb858799d5e4450e4798fa2251d54cbabb20d3"
+    b"2bf5fff5cc20d01f173b6cc467a9713ae849c11adc29f2ae90874c6e3b74eed42494d90afb7e0f31"
+    b"d323a23a181e4636f345af99bb371df01805b49b11186c6ec6daafcd08e5aeb99d268e05e5b65d42"
+    b"dd914c194841cacfaa24726594edf7e43c3f204ea8c85c9bf806a66efb097302b514773dc41324c6"
+    b"400f1e1b5180ed49d58cb6600fdc143a2ecf8e9ba84d8451502de890e6771181f981a9a782475aa2"
+    b"bb3ecbbc76503e0530e28b676a5e6585d114b63021b4c4afae82a74cadb1cbe61a7e393ff975a942"
+    b"1edebb531f51618902820100214d9f1efa774b9d4e0a996442c2744560c84b133045b1af9241d60f"
+    b"c2f82043ac169dc9496ebb5f26b5cb8a6636c57d44e06843bf1f082be42fe5933a7ab7a6878dccf3"
+    b"58606a9fd6984ea525fe34f9e86f7bae33e707be0dec8fbef2deed253c822f6b812e7bd8c64bc302"
+    b"5c9a9e58811d30981a329f7b130148b0eb2ac62cec516942f7530963edab832bd0bacf344b183b9d"
+    b"ba9d54535dceff640f94d79599edf8dd0c32029950ede63f2f579b0d3c9a13c04df73fec03c4bcbe"
+    b"ff7ecf69ba082445673a263685475b91390963e2d42705ba89ff107e96bbb7a887daa016f282f1e6"
+    b"bdd7b9bb14579166f8c13be876cdef07e13c6ef08ff49d4207c7c7ff"
 )
 
 

From c854d0e3e1a05c06fadf997963932f2da5477a39 Mon Sep 17 00:00:00 2001
From: Thomas <th.acker.0302@gmail.com>
Date: Fri, 8 Sep 2023 21:11:13 +0200
Subject: [PATCH 0370/3129] examples/unix/machine_bios.py: Fix typo.

Signed-off-by: Thomas <th.acker.0302@gmail.com>
---
 examples/unix/machine_bios.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/unix/machine_bios.py b/examples/unix/machine_bios.py
index 40aae4ccefe6d..4644d3e2b2a92 100644
--- a/examples/unix/machine_bios.py
+++ b/examples/unix/machine_bios.py
@@ -1,5 +1,5 @@
 # This example shows how to access Video BIOS memory area via machine.mem
-# It requires root privilege and x86 legacy harfware (which has mentioned
+# It requires root privilege and x86 legacy hardware (which has mentioned
 # Video BIOS at all).
 # It is expected to print 0xaa55, which is a signature at the start of
 # Video BIOS.

From cfe6a11e39725f42ac3fffac138d2de1587fe756 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 14 Sep 2023 14:07:04 +1000
Subject: [PATCH 0371/3129] extmod/asyncio/event.py: Fix ThreadSafeFlag.ioctl
 return.

iobase_ioctl expects that an ioctl method must return an integer, and will
raise otherwise.

This was tripping up aioble on Unix, where the new hybrid modselect.c
implementation will attempt to extract a file descriptor from the pollable
via ioctl(MP_STREAM_GET_FILENO).

However, ThreadSafeFlag's ioctl only supported MP_STREAM_POLL, and returned
None otherwise.

This makes it return `-1` (to match tests/extmod/select_poll_custom.py). It
should probably be `-22` (corresponding to MP_EINVAL), but the value is
never checked, and MP_EINVAL can be a different value on different ports.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/asyncio/event.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/asyncio/event.py b/extmod/asyncio/event.py
index e0b41f7324244..f11bb14e58403 100644
--- a/extmod/asyncio/event.py
+++ b/extmod/asyncio/event.py
@@ -49,7 +49,7 @@ def __init__(self):
         def ioctl(self, req, flags):
             if req == 3:  # MP_STREAM_POLL
                 return self.state * flags
-            return None
+            return -1  # Other requests are unsupported
 
         def set(self):
             self.state = 1

From fae83a6b4d0d7b3e4917fdeb9b7966a06161af54 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 14 Sep 2023 15:26:23 +1000
Subject: [PATCH 0372/3129] tests/extmod/asyncio_threadsafeflag.py: Update for
 unix select.

1. Remove the skip for detecting support for polling user-defined objects
   as this is always possible now on all ports.
2. Don't print when the scheduled task runs as the ordering of this
   relative to the other prints is dependent on other factors (e.g. if
   using the native emitter).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/extmod/asyncio_threadsafeflag.py     | 13 -------------
 tests/extmod/asyncio_threadsafeflag.py.exp |  2 --
 2 files changed, 15 deletions(-)

diff --git a/tests/extmod/asyncio_threadsafeflag.py b/tests/extmod/asyncio_threadsafeflag.py
index 46da1b7b487a8..e8798afcf5f52 100644
--- a/tests/extmod/asyncio_threadsafeflag.py
+++ b/tests/extmod/asyncio_threadsafeflag.py
@@ -16,17 +16,6 @@
     raise SystemExit
 
 
-try:
-    # Unix port can't select/poll on user-defined types.
-    import 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()
@@ -34,9 +23,7 @@ async def task(id, flag):
 
 
 def set_from_schedule(flag):
-    print("schedule")
     flag.set()
-    print("schedule done")
 
 
 async def main():
diff --git a/tests/extmod/asyncio_threadsafeflag.py.exp b/tests/extmod/asyncio_threadsafeflag.py.exp
index 757115ac4bdd4..0c62eae9d096e 100644
--- a/tests/extmod/asyncio_threadsafeflag.py.exp
+++ b/tests/extmod/asyncio_threadsafeflag.py.exp
@@ -9,8 +9,6 @@ yield
 task 2
 set event
 yield
-schedule
-schedule done
 wait task
 task 2 done
 ----

From fbe58553c2696b18a95e1284b32d7292d49bc486 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Sep 2023 16:15:30 +1000
Subject: [PATCH 0373/3129] extmod/btstack/btstack_hci_uart: Trigger a poll
 after UART data is sent.

Prior to this commit, BTstack would only be notified of sent UART data when
the mp_bluetooth_hci_poll() function was called for some other reason, eg
because of incoming data over UART.  This is highly suboptimal.

With this commit, BTstack is now notified immediately after UART data has
been sent out.  This improves the multi_bluetooth/perf_gatt_char_write.py
performance test by about a factor of 10x for write-without-response, and
about 4x for write-with-response (tested on LEGO_HUB_NO6 as instance1).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack_hci_uart.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extmod/btstack/btstack_hci_uart.c b/extmod/btstack/btstack_hci_uart.c
index f945efc762cbf..19cdfc4b9dae7 100644
--- a/extmod/btstack/btstack_hci_uart.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -36,6 +36,7 @@
 #include "extmod/mpbthci.h"
 #include "extmod/btstack/btstack_hci_uart.h"
 
+#include "mpbthciport.h"
 #include "mpbtstackport.h"
 
 #define HCI_TRACE (0)
@@ -129,6 +130,10 @@ STATIC void btstack_uart_send_block(const uint8_t *buf, uint16_t len) {
 
     mp_bluetooth_hci_uart_write(buf, len);
     send_done = true;
+
+    // Data has been written out synchronously on the UART, so trigger a poll which will
+    // then notify btstack (don't call send_handler here or it may call us recursively).
+    mp_bluetooth_hci_poll_now();
 }
 
 STATIC int btstack_uart_get_supported_sleep_modes(void) {

From 4b9c4591339ee2d903c393857f66a0ce0025aa95 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Sep 2023 09:30:11 +0200
Subject: [PATCH 0374/3129] mimxrt/sdio: Add support for the 117x series.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/sdio.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/sdio.c b/ports/mimxrt/sdio.c
index d97fef9e51296..2fa0f228fe3a5 100644
--- a/ports/mimxrt/sdio.c
+++ b/ports/mimxrt/sdio.c
@@ -38,8 +38,14 @@
 #if MICROPY_HW_SDIO_SDMMC == 1
 #define SDMMC                       USDHC1
 #define SDMMC_IRQn                  USDHC1_IRQn
+#ifdef MIMXRT117x_SERIES
+#define SDMMC_CLOCK_MUX             kCLOCK_USDHC1_ClockRoot_MuxSysPll2Pfd2
+#define SDMMC_CLOCK_ROOT            kCLOCK_Root_Usdhc1
+#else
 #define SDMMC_CLOCK_DIV             kCLOCK_Usdhc1Div
 #define SDMMC_CLOCK_MUX             kCLOCK_Usdhc1Mux
+#define SDMMC_CLOCK_ROOT            kCLOCK_Usdhc1ClkRoot
+#endif
 #ifndef MICROPY_HW_SDIO_CLK_ALT
 #define MICROPY_HW_SDIO_CMD_ALT     (0)
 #define MICROPY_HW_SDIO_CLK_ALT     (0)
@@ -51,8 +57,14 @@
 #else
 #define SDMMC                       USDHC2
 #define SDMMC_IRQn                  USDHC2_IRQn
+#ifdef MIMXRT117x_SERIES
+#define SDMMC_CLOCK_MUX             kCLOCK_USDHC2_ClockRoot_MuxSysPll2Pfd2
+#define SDMMC_CLOCK_ROOT            kCLOCK_Root_Usdhc2
+#else
 #define SDMMC_CLOCK_DIV             kCLOCK_Usdhc2Div
 #define SDMMC_CLOCK_MUX             kCLOCK_Usdhc2Mux
+#define SDMMC_CLOCK_ROOT            kCLOCK_Usdhc2ClkRoot
+#endif
 #ifndef MICROPY_HW_SDIO_CLK_ALT
 #define MICROPY_HW_SDIO_CMD_ALT     (6)
 #define MICROPY_HW_SDIO_CLK_ALT     (6)
@@ -95,7 +107,11 @@ typedef enum {
 } sdio_xfer_flags_t;
 
 static uint32_t sdio_base_clk(void) {
-    return CLOCK_GetSysPfdFreq(kCLOCK_Pfd0) / (CLOCK_GetDiv(kCLOCK_Usdhc1Div) + 1U);
+    #ifdef MIMXRT117x_SERIES
+    return CLOCK_GetRootClockFreq(SDMMC_CLOCK_ROOT);
+    #else
+    return CLOCK_GetClockRootFreq(SDMMC_CLOCK_ROOT);
+    #endif
 }
 
 static uint32_t sdio_response_type(uint32_t cmd) {
@@ -144,19 +160,30 @@ void sdio_init(uint32_t irq_pri) {
     machine_pin_config(MICROPY_HW_SDIO_D2, PIN_MODE_ALT, PIN_PULL_UP_100K, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_D2_ALT);
     machine_pin_config(MICROPY_HW_SDIO_D3, PIN_MODE_ALT, PIN_PULL_UP_100K, PIN_DRIVE_6, 0, MICROPY_HW_SDIO_D3_ALT);
 
+    #ifdef MIMXRT117x_SERIES
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd2, 24);
+
+    clock_root_config_t rootCfg = { 0 };
+    rootCfg.mux = SDMMC_CLOCK_MUX;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(SDMMC_CLOCK_ROOT, &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
     CLOCK_InitSysPfd(kCLOCK_Pfd0, 24U);
     CLOCK_SetDiv(SDMMC_CLOCK_DIV, 1U);  // USDHC_input_clk = PFD0_clk / 2
     CLOCK_SetMux(SDMMC_CLOCK_MUX, 1U);  // Select PFD0 as clock input for USDHC
+    #endif
 
     // Initialize USDHC
     const usdhc_config_t config = {
         .endianMode = kUSDHC_EndianModeLittle,
         .dataTimeout = 0xFU,
+        #ifndef MIMXRT117x_SERIES
         .readBurstLen = 0,
         .writeBurstLen = 0,
+        #endif
         .readWatermarkLevel = 128U,
         .writeWatermarkLevel = 128U,
     };

From 805c750164aed86db3875402bf26e7b12cbe85b1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Sep 2023 13:37:01 +0200
Subject: [PATCH 0375/3129] mimxrt/mimxrt_sdram: Allow boards to override the
 default SDRAM config.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mimxrt_sdram.c | 115 +++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 49 deletions(-)

diff --git a/ports/mimxrt/mimxrt_sdram.c b/ports/mimxrt/mimxrt_sdram.c
index c6c1776a554c0..ea53daf5ca704 100644
--- a/ports/mimxrt/mimxrt_sdram.c
+++ b/ports/mimxrt/mimxrt_sdram.c
@@ -42,10 +42,51 @@ extern uint8_t __sdram_start;
 #define SDRAM_PIN_CONFIG  (0xE1UL)
 #endif
 
-void mimxrt_sdram_init(void) {
+#ifndef MICROPY_HW_SDRAM_TIMING_TRC
+#if defined(MIMXRT117x_SERIES)
+#define MICROPY_HW_SDRAM_TIMING_TRC         (60)
+#define MICROPY_HW_SDRAM_TIMING_TRP         (15)
+#define MICROPY_HW_SDRAM_TIMING_TRCD        (15)
+#define MICROPY_HW_SDRAM_TIMING_TWR         (2)
+#define MICROPY_HW_SDRAM_TIMING_TRRD        (2)
+#define MICROPY_HW_SDRAM_TIMING_TXSR        (70)
+#define MICROPY_HW_SDRAM_TIMING_TRAS        (42)
+#define MICROPY_HW_SDRAM_TIMING_TREF        (64 * 1000000 / 8192) // 64ms/8192
+
+#define MICROPY_HW_SDRAM_CAS_LATENCY        (kSEMC_LatencyThree)
+#define MICROPY_HW_SDRAM_MEM_BUS_WIDTH      (kSEMC_PortSize32Bit)
+#define MICROPY_HW_SDRAM_COLUMN_BITS_NUM    (kSEMC_SdramColunm_9bit)
+#define MICROPY_HW_SDRAM_BURST_LENGTH       (kSEMC_Sdram_BurstLen8)
+#define MICROPY_HW_SDRAM_RBURST_LENGTH      (1)
+#define MICROPY_HW_SDRAM_DELAY_CHAIN        (2)
+#else
+#define MICROPY_HW_SDRAM_TIMING_TRC         (60)
+#define MICROPY_HW_SDRAM_TIMING_TRP         (18)
+#define MICROPY_HW_SDRAM_TIMING_TRCD        (18)
+#define MICROPY_HW_SDRAM_TIMING_TWR         (12)
+#define MICROPY_HW_SDRAM_TIMING_TRRD        (60)
+#define MICROPY_HW_SDRAM_TIMING_TXSR        (67)
+#define MICROPY_HW_SDRAM_TIMING_TRAS        (42)
+#define MICROPY_HW_SDRAM_TIMING_TREF        (64 * 1000000 / 8192) // 64ms/8192
+
+#define MICROPY_HW_SDRAM_CAS_LATENCY        (kSEMC_LatencyThree)
+#define MICROPY_HW_SDRAM_MEM_BUS_WIDTH      (kSEMC_PortSize16Bit)
+#define MICROPY_HW_SDRAM_COLUMN_BITS_NUM    (kSEMC_SdramColunm_9bit)
+#define MICROPY_HW_SDRAM_BURST_LENGTH       (kSEMC_Sdram_BurstLen1)
+#define MICROPY_HW_SDRAM_RBURST_LENGTH      (1)
+#endif
+#endif
 
-    #if !defined(MIMXRT117x_SERIES)
+void mimxrt_sdram_init(void) {
     // Set Clocks
+    #if defined(MIMXRT117x_SERIES)
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd1, 29);
+
+    clock_root_config_t rootCfg = { 0 };
+    rootCfg.mux = kCLOCK_SEMC_ClockRoot_MuxSysPll2Pfd1;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Semc, &rootCfg);
+    #else
     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
@@ -137,7 +178,7 @@ void mimxrt_sdram_init(void) {
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DQS, 1UL);
     IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DQS, SDRAM_PIN_CONFIG);
 
-    #if defined(MIMXRT117x_SERIES)
+    #if defined(MIMXRT_IOMUXC_SEMC_DATA16)
     // Data Pins 16..31
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA16, 0UL);
     IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA16, SDRAM_PIN_CONFIG);
@@ -209,62 +250,38 @@ void mimxrt_sdram_init(void) {
     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);
+    #endif
+
     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),
+        .portSize = MICROPY_HW_SDRAM_MEM_BUS_WIDTH,
+        .burstLen = MICROPY_HW_SDRAM_BURST_LENGTH,
+        .columnAddrBitNum = MICROPY_HW_SDRAM_COLUMN_BITS_NUM,
+        .casLatency = MICROPY_HW_SDRAM_CAS_LATENCY,
+        .tPrecharge2Act_Ns = MICROPY_HW_SDRAM_TIMING_TRP,
+        .tAct2ReadWrite_Ns = MICROPY_HW_SDRAM_TIMING_TRCD,
+        .tRefreshRecovery_Ns = MICROPY_HW_SDRAM_TIMING_TXSR,
+        .tSelfRefRecovery_Ns = MICROPY_HW_SDRAM_TIMING_TXSR,
+        .tWriteRecovery_Ns = MICROPY_HW_SDRAM_TIMING_TWR,
+        .tCkeOff_Ns = MICROPY_HW_SDRAM_TIMING_TRAS,
+        .tAct2Prechage_Ns = MICROPY_HW_SDRAM_TIMING_TRAS,
+        .tRefresh2Refresh_Ns = MICROPY_HW_SDRAM_TIMING_TRC,
+        .tAct2Act_Ns = MICROPY_HW_SDRAM_TIMING_TRRD,
         .tIdleTimeout_Ns = 0UL,
-        .refreshPeriod_nsPerRow = 64 * 1000000 / 8192,  // 64ms/8192
-        .refreshUrgThreshold = 64 * 1000000 / 8192,  // 64ms/8192
-        .refreshBurstLen = 1
+        .refreshPeriod_nsPerRow = MICROPY_HW_SDRAM_TIMING_TREF,
+        .refreshUrgThreshold = MICROPY_HW_SDRAM_TIMING_TREF,
+        .refreshBurstLen = MICROPY_HW_SDRAM_RBURST_LENGTH,
+        #ifdef MICROPY_HW_SDRAM_DELAY_CHAIN
+        .delayChain = MICROPY_HW_SDRAM_DELAY_CHAIN,
+        #endif
+        .tPrescalePeriod_Ns = 160 * (1000000000 / clock_freq),
     };
 
-    #endif
-
     (status_t)SEMC_ConfigureSDRAM(SEMC, kSEMC_SDRAM_CS0, &sdram_cfg, clock_freq);
 }
 

From 9d1a1ed42d96965f3b410a0bb542118f99e69c1b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Sep 2023 14:14:00 +0200
Subject: [PATCH 0376/3129] mimxrt/Makefile: Enable the FSL USDHC for supported
 MCU series.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index d5bb7081b01aa..d1ba9663c3aed 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -152,7 +152,7 @@ ifeq ($(MICROPY_HW_SDRAM_AVAIL),1)
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_semc.c
 endif
 
-ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
 endif
 

From 552b0bbe12a1e8a015d287e31f9cc615afa0a3b2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Sep 2023 15:19:46 +0200
Subject: [PATCH 0377/3129] mimxrt: Remove SDCARD Makefile config option.

This is option is no longer needed as a Makefile option as the USDHC driver
is enabled for all supported series.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile                                  | 2 --
 ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h  | 1 +
 ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk | 1 -
 ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h     | 1 +
 ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h     | 1 +
 ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h      | 1 +
 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk     | 1 -
 ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk    | 1 -
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk          | 1 -
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk          | 1 -
 ports/mimxrt/machine_sdcard.c                          | 5 +++--
 ports/mimxrt/mpconfigport.h                            | 3 +++
 ports/mimxrt/sdcard.c                                  | 2 ++
 20 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index d1ba9663c3aed..577cc9c1eea03 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -331,7 +331,6 @@ 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 += \
@@ -351,7 +350,6 @@ 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 \
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
index 7d759df5e6f47..241567ab73f37 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
@@ -7,6 +7,7 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
+#define MICROPY_HW_ENABLE_SDCARD    (0)
 
 // Define mapping logical UART # to hardware UART #
 // LPUART1 on USB_DBG  -> 0
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
index 236db27c87db3..a8f7add6d26ae 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1011
 MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
-MICROPY_PY_MACHINE_SDCARD = 0
 MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 26811fdab8be2..fc135c5e1b57e 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -7,6 +7,7 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
+#define MICROPY_HW_ENABLE_SDCARD    (0)
 
 // Define mapping logical UART # to hardware UART #
 // LPUART1 on USB_DBG  -> 0
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index 19db53c3f8710..dd525859063d9 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1011
 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
 
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
index 655bb62c27836..f47bbf4fa138b 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
@@ -10,6 +10,7 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 
 #define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
+#define MICROPY_PY_MACHINE_SDCARD    (0)
 
 // Define mapping logical UART # to hardware UART #
 // RX/TX      HW-UART    Logical UART
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
index ba7d61f6d4f0f..34e5cdee51134 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1015
 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
 
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 547b88d57de43..c98843a1a3c3d 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1021
 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
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 0cf2a348046e2..ef7bbc8f56cb9 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1052
 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
 
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index c2556a27248ac..3af7cd231a2ab 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1062
 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
 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index d3ba752419e0a..95cfb4585acc1 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1064
 MCU_VARIANT = MIMXRT1064DVL6A
 
 MICROPY_FLOAT_IMPL = double
-MICROPY_PY_MACHINE_SDCARD = 1
 MICROPY_HW_FLASH_TYPE = internal
 MICROPY_HW_FLASH_SIZE = 0x400000  # 4MB
 
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
index 25747a52c6be7..1488730f7c7cf 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
@@ -3,7 +3,6 @@ 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
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index 9443bb3732714..324cee9b14e9f 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -11,6 +11,7 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
+#define MICROPY_PY_MACHINE_SDCARD    (0)
 
 // Define mapping logical UART # to hardware UART #
 // LPUART1 on RX/TX    -> 1
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
index 135c43257c95e..58429d298118e 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1011
 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_RESERVED ?= 0x1000  # 4KB
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index ca27dff55f3a2..2cf7d33c6331d 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1052
 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
 	
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 4482c629f7dcc..07f174944b79c 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1062
 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_RESERVED ?= 0x1000  # 4KB
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index cf07144668e15..b297448a307e7 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1062
 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_RESERVED ?= 0x1000  # 4KB
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
index 496eb9353388a..b0bf8613c24ab 100644
--- a/ports/mimxrt/machine_sdcard.c
+++ b/ports/mimxrt/machine_sdcard.c
@@ -24,11 +24,12 @@
  * THE SOFTWARE.
  */
 
-#if MICROPY_PY_MACHINE_SDCARD
-
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "extmod/vfs.h"
+
+#if MICROPY_PY_MACHINE_SDCARD
+
 #include "ticks.h"
 
 #if defined(MIMXRT1170x_SERIES)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index d1fe17ee10b53..feb6cb2660787 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -87,6 +87,9 @@ uint32_t trng_random_u32(void);
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (0)
 #endif
+#ifndef MICROPY_PY_MACHINE_SDCARD
+#define MICROPY_PY_MACHINE_SDCARD           (1)
+#endif
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index 6dbd45303b63b..ae52ed5d2cd09 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
+
 #if MICROPY_PY_MACHINE_SDCARD
 
 #include "sdcard.h"

From 361ca7d5ee8d661b72af749a02d988d580b89bc2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 6 Sep 2023 12:33:55 +0200
Subject: [PATCH 0378/3129] mimxrt/mpbthciport: Enable flow control for BT HCI
 UART.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mpbthciport.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/mpbthciport.c b/ports/mimxrt/mpbthciport.c
index d8b384136452c..2540abca42f52 100644
--- a/ports/mimxrt/mpbthciport.c
+++ b/ports/mimxrt/mpbthciport.c
@@ -85,13 +85,14 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     mp_obj_t args[] = {
         MP_OBJ_NEW_SMALL_INT(port),
         MP_OBJ_NEW_QSTR(MP_QSTR_baudrate), MP_OBJ_NEW_SMALL_INT(baudrate),
+        MP_OBJ_NEW_QSTR(MP_QSTR_flow), MP_OBJ_NEW_SMALL_INT(3),
         MP_OBJ_NEW_QSTR(MP_QSTR_timeout), MP_OBJ_NEW_SMALL_INT(200),
         MP_OBJ_NEW_QSTR(MP_QSTR_timeout_char), MP_OBJ_NEW_SMALL_INT(200),
         MP_OBJ_NEW_QSTR(MP_QSTR_txbuf), MP_OBJ_NEW_SMALL_INT(768),
         MP_OBJ_NEW_QSTR(MP_QSTR_rxbuf), MP_OBJ_NEW_SMALL_INT(768),
     };
 
-    mp_bthci_uart = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, 1, 5, args);
+    mp_bthci_uart = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, 1, 6, args);
     MP_STATE_PORT(mp_bthci_uart) = mp_bthci_uart;
 
     // Start the HCI polling to process any initial events/packets.

From 52e3da0a0bdb88a0eb869e8df03b66ab7f7a74ea Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 6 Sep 2023 14:53:17 +0200
Subject: [PATCH 0379/3129] mimxrt/mbedtls: Enable certificate validity time
 validation.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mbedtls/mbedtls_config.h |  9 +++++++
 ports/mimxrt/mbedtls/mbedtls_port.c   | 36 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/ports/mimxrt/mbedtls/mbedtls_config.h b/ports/mimxrt/mbedtls/mbedtls_config.h
index 4140bb5145555..440498757085f 100644
--- a/ports/mimxrt/mbedtls/mbedtls_config.h
+++ b/ports/mimxrt/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 mimxrt_rtctime_seconds(time_t *timer);
+#define MBEDTLS_PLATFORM_TIME_MACRO mimxrt_rtctime_seconds
+
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
 
diff --git a/ports/mimxrt/mbedtls/mbedtls_port.c b/ports/mimxrt/mbedtls/mbedtls_port.c
index a9db174726adf..044de317f5260 100644
--- a/ports/mimxrt/mbedtls/mbedtls_port.c
+++ b/ports/mimxrt/mbedtls/mbedtls_port.c
@@ -24,9 +24,16 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+
 #ifdef MICROPY_SSL_MBEDTLS
 
 #include "mbedtls_config.h"
+#if defined(MBEDTLS_HAVE_TIME) || defined(MBEDTLS_HAVE_TIME_DATE)
+#include "fsl_snvs_lp.h"
+#include "shared/timeutils/timeutils.h"
+#endif
+
 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) {
@@ -38,4 +45,33 @@ int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t
     return 0;
 }
 
+#if defined(MBEDTLS_HAVE_TIME)
+time_t mimxrt_rtctime_seconds(time_t *timer) {
+    // Get date and date in CPython order.
+    snvs_lp_srtc_datetime_t date;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &date);
+    return timeutils_seconds_since_epoch(date.year, date.month, date.day, date.hour, date.minute, date.second);
+}
+#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
+
 #endif

From 0701341e7f68b9f0e83c7d61035f5f5f05b8c15b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 5 Sep 2023 16:29:51 +0200
Subject: [PATCH 0380/3129] mimxrt/machine_uart: Set the UART clock to a fixed
 40MHz value.

There is a single UART clock for all devices, so switching it for one will
affect all devices used at that time.  This commit fixes that issue by
keeping the clock at a fixed value.

This fixed clock still supports the common baud rates between 300 and
921600 baud.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/boards/MIMXRT1011_clock_config.c |  2 +-
 ports/mimxrt/boards/MIMXRT1011_clock_config.h |  2 +-
 ports/mimxrt/boards/MIMXRT1015_clock_config.c |  2 +-
 ports/mimxrt/boards/MIMXRT1015_clock_config.h |  2 +-
 ports/mimxrt/boards/MIMXRT1021_clock_config.c |  2 +-
 ports/mimxrt/boards/MIMXRT1021_clock_config.h |  2 +-
 ports/mimxrt/boards/MIMXRT1052_clock_config.c |  2 +-
 ports/mimxrt/boards/MIMXRT1052_clock_config.h |  2 +-
 ports/mimxrt/boards/MIMXRT1062_clock_config.c |  2 +-
 ports/mimxrt/boards/MIMXRT1062_clock_config.h |  2 +-
 ports/mimxrt/boards/MIMXRT1064_clock_config.c |  2 +-
 ports/mimxrt/boards/MIMXRT1064_clock_config.h |  2 +-
 ports/mimxrt/machine_uart.c                   | 13 -------------
 13 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1011_clock_config.c b/ports/mimxrt/boards/MIMXRT1011_clock_config.c
index cc889d314a920..33e1ecfec87ad 100644
--- a/ports/mimxrt/boards/MIMXRT1011_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1011_clock_config.c
@@ -241,7 +241,7 @@ void BOARD_BootClockRUN(void) {
     CLOCK_DisableClock(kCLOCK_Lpuart3);
     CLOCK_DisableClock(kCLOCK_Lpuart4);
     /* Set UART_CLK_PODF. */
-    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    CLOCK_SetDiv(kCLOCK_UartDiv, 1);
     /* Set Uart clock source. */
     CLOCK_SetMux(kCLOCK_UartMux, 0);
     /* Disable SPDIF clock gate. */
diff --git a/ports/mimxrt/boards/MIMXRT1011_clock_config.h b/ports/mimxrt/boards/MIMXRT1011_clock_config.h
index 76f3df422f9d0..145f3b50cb52d 100644
--- a/ports/mimxrt/boards/MIMXRT1011_clock_config.h
+++ b/ports/mimxrt/boards/MIMXRT1011_clock_config.h
@@ -71,7 +71,7 @@ void BOARD_InitBootClocks(void);
 #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_UART_CLK_ROOT 40000000UL
 #define BOARD_BOOTCLOCKRUN_USBPHY_CLK 0UL
 
 /*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
diff --git a/ports/mimxrt/boards/MIMXRT1015_clock_config.c b/ports/mimxrt/boards/MIMXRT1015_clock_config.c
index 7cc91f95111df..331af4b9e81e7 100644
--- a/ports/mimxrt/boards/MIMXRT1015_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1015_clock_config.c
@@ -257,7 +257,7 @@ void BOARD_BootClockRUN(void) {
     CLOCK_DisableClock(kCLOCK_Lpuart3);
     CLOCK_DisableClock(kCLOCK_Lpuart4);
     /* Set UART_CLK_PODF. */
-    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    CLOCK_SetDiv(kCLOCK_UartDiv, 1);
     /* Set Uart clock source. */
     CLOCK_SetMux(kCLOCK_UartMux, 0);
     /* Disable SPDIF clock gate. */
diff --git a/ports/mimxrt/boards/MIMXRT1015_clock_config.h b/ports/mimxrt/boards/MIMXRT1015_clock_config.h
index 65944077e5ca8..975ad52e0766b 100644
--- a/ports/mimxrt/boards/MIMXRT1015_clock_config.h
+++ b/ports/mimxrt/boards/MIMXRT1015_clock_config.h
@@ -74,7 +74,7 @@ void BOARD_InitBootClocks(void);
 #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_UART_CLK_ROOT              40000000UL
 #define BOARD_BOOTCLOCKRUN_USBPHY1_CLK                0UL
 
 /*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
diff --git a/ports/mimxrt/boards/MIMXRT1021_clock_config.c b/ports/mimxrt/boards/MIMXRT1021_clock_config.c
index 1b8792dd2de0c..f17e73beaebc8 100644
--- a/ports/mimxrt/boards/MIMXRT1021_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1021_clock_config.c
@@ -306,7 +306,7 @@ void BOARD_BootClockRUN(void) {
     CLOCK_DisableClock(kCLOCK_Lpuart7);
     CLOCK_DisableClock(kCLOCK_Lpuart8);
     /* Set UART_CLK_PODF. */
-    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    CLOCK_SetDiv(kCLOCK_UartDiv, 1);
     /* Set Uart clock source. */
     CLOCK_SetMux(kCLOCK_UartMux, 0);
     /* Disable SPDIF clock gate. */
diff --git a/ports/mimxrt/boards/MIMXRT1021_clock_config.h b/ports/mimxrt/boards/MIMXRT1021_clock_config.h
index 21d4e630ae301..6f7896bdc3fba 100644
--- a/ports/mimxrt/boards/MIMXRT1021_clock_config.h
+++ b/ports/mimxrt/boards/MIMXRT1021_clock_config.h
@@ -79,7 +79,7 @@ void BOARD_InitBootClocks(void);
 #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_UART_CLK_ROOT 40000000UL
 #define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
 #define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 176000000UL
 #define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 176000000UL
diff --git a/ports/mimxrt/boards/MIMXRT1052_clock_config.c b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
index fa7450d487a63..bff43ae5e54b2 100644
--- a/ports/mimxrt/boards/MIMXRT1052_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
@@ -311,7 +311,7 @@ void BOARD_BootClockRUN(void) {
     CLOCK_DisableClock(kCLOCK_Lpuart7);
     CLOCK_DisableClock(kCLOCK_Lpuart8);
     /* Set UART_CLK_PODF. */
-    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    CLOCK_SetDiv(kCLOCK_UartDiv, 1);
     /* Set Uart clock source. */
     CLOCK_SetMux(kCLOCK_UartMux, 0);
     /* Disable LCDIF clock gate. */
diff --git a/ports/mimxrt/boards/MIMXRT1052_clock_config.h b/ports/mimxrt/boards/MIMXRT1052_clock_config.h
index f213ac7e238dd..358a6f03b3668 100644
--- a/ports/mimxrt/boards/MIMXRT1052_clock_config.h
+++ b/ports/mimxrt/boards/MIMXRT1052_clock_config.h
@@ -83,7 +83,7 @@ void BOARD_InitBootClocks(void);
 #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_UART_CLK_ROOT 40000000UL
 #define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
 #define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
 #define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
diff --git a/ports/mimxrt/boards/MIMXRT1062_clock_config.c b/ports/mimxrt/boards/MIMXRT1062_clock_config.c
index 589ffb0b58311..f60797900d283 100644
--- a/ports/mimxrt/boards/MIMXRT1062_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1062_clock_config.c
@@ -324,7 +324,7 @@ void BOARD_BootClockRUN(void) {
     CLOCK_DisableClock(kCLOCK_Lpuart7);
     CLOCK_DisableClock(kCLOCK_Lpuart8);
     /* Set UART_CLK_PODF. */
-    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    CLOCK_SetDiv(kCLOCK_UartDiv, 1);
     /* Set Uart clock source. */
     CLOCK_SetMux(kCLOCK_UartMux, 0);
     /* Disable LCDIF clock gate. */
diff --git a/ports/mimxrt/boards/MIMXRT1062_clock_config.h b/ports/mimxrt/boards/MIMXRT1062_clock_config.h
index 0822024847717..0a6552664620d 100644
--- a/ports/mimxrt/boards/MIMXRT1062_clock_config.h
+++ b/ports/mimxrt/boards/MIMXRT1062_clock_config.h
@@ -86,7 +86,7 @@ void BOARD_InitBootClocks(void);
 #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_UART_CLK_ROOT 40000000UL
 #define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
 #define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
 #define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
diff --git a/ports/mimxrt/boards/MIMXRT1064_clock_config.c b/ports/mimxrt/boards/MIMXRT1064_clock_config.c
index 56dd75d7fbf6f..573b6a5c9a00b 100644
--- a/ports/mimxrt/boards/MIMXRT1064_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1064_clock_config.c
@@ -324,7 +324,7 @@ void BOARD_BootClockRUN(void) {
     CLOCK_DisableClock(kCLOCK_Lpuart7);
     CLOCK_DisableClock(kCLOCK_Lpuart8);
     /* Set UART_CLK_PODF. */
-    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    CLOCK_SetDiv(kCLOCK_UartDiv, 1);
     /* Set Uart clock source. */
     CLOCK_SetMux(kCLOCK_UartMux, 0);
     /* Disable LCDIF clock gate. */
diff --git a/ports/mimxrt/boards/MIMXRT1064_clock_config.h b/ports/mimxrt/boards/MIMXRT1064_clock_config.h
index 13bc925a105c3..80ca030eb6389 100644
--- a/ports/mimxrt/boards/MIMXRT1064_clock_config.h
+++ b/ports/mimxrt/boards/MIMXRT1064_clock_config.h
@@ -86,7 +86,7 @@ void BOARD_InitBootClocks(void);
 #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_UART_CLK_ROOT 40000000UL
 #define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
 #define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
 #define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index fba2b7fe30763..8e1505349ae25 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -153,24 +153,12 @@ static void machine_uart_ensure_active(machine_uart_obj_t *uart) {
     }
 }
 
-#if !defined(MIMXRT117x_SERIES)
-static inline void uart_set_clock_divider(uint32_t baudrate) {
-    // For baud rates < 460800 divide the clock by 10, supporting baud rates down to 50 baud.
-    if (baudrate >= 460800) {
-        CLOCK_SetDiv(kCLOCK_UartDiv, 0);
-    } else {
-        CLOCK_SetDiv(kCLOCK_UartDiv, 9);
-    }
-}
-#endif
-
 void machine_uart_set_baudrate(mp_obj_t uart_in, uint32_t baudrate) {
     machine_uart_obj_t *uart = MP_OBJ_TO_PTR(uart_in);
     #if defined(MIMXRT117x_SERIES)
     // Use the Lpuart1 clock value, which is set for All UART devices.
     LPUART_SetBaudRate(uart->lpuart, baudrate, CLOCK_GetRootClockFreq(kCLOCK_Root_Lpuart1));
     #else
-    uart_set_clock_divider(baudrate);
     LPUART_SetBaudRate(uart->lpuart, baudrate, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
     #endif
 }
@@ -315,7 +303,6 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         // Use the Lpuart1 clock value, which is set for All UART devices.
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetRootClockFreq(kCLOCK_Root_Lpuart1));
         #else
-        uart_set_clock_divider(self->config.baudRate_Bps);
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
         #endif
         LPUART_TransferCreateHandle(self->lpuart, &self->handle,  LPUART_UserCallback, self);

From abb44694d85bc8e139b9969f6d033d9fd946e641 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 6 Sep 2023 14:35:44 +0200
Subject: [PATCH 0381/3129] mimxrt/boards/MIMXRT1176_clock_config: Fix comments
 about UART clocks.

No functional change, and pretty obvious.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/boards/MIMXRT1176_clock_config.c | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1176_clock_config.c b/ports/mimxrt/boards/MIMXRT1176_clock_config.c
index ae02e30fa83b3..b6845b9890985 100644
--- a/ports/mimxrt/boards/MIMXRT1176_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1176_clock_config.c
@@ -382,62 +382,62 @@ void BOARD_BootClockRUN(void) {
     rootCfg.div = 1;
     CLOCK_SetRootClock(kCLOCK_Root_Can3, &rootCfg);
 
-    /* Configure LPUART1 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART1 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART1_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart1, &rootCfg);
 
-    /* Configure LPUART2 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART2 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART2_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart2, &rootCfg);
 
-    /* Configure LPUART3 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART3 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART3_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart3, &rootCfg);
 
-    /* Configure LPUART4 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART4 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART4_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart4, &rootCfg);
 
-    /* Configure LPUART5 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART5 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART5_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart5, &rootCfg);
 
-    /* Configure LPUART6 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART6 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART6_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart6, &rootCfg);
 
-    /* Configure LPUART7 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART7 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART7_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart7, &rootCfg);
 
-    /* Configure LPUART8 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART8 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART8_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart8, &rootCfg);
 
-    /* Configure LPUART9 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART9 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART9_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart9, &rootCfg);
 
-    /* Configure LPUART10 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART10 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART10_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart10, &rootCfg);
 
-    /* Configure LPUART11 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART11 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART11_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart11, &rootCfg);
 
-    /* Configure LPUART12 using SYS_PLL3_PFD3_CLK */
+    /* Configure LPUART12 using SYS_PLL2_PFD3_CLK */
     rootCfg.mux = kCLOCK_LPUART12_ClockRoot_MuxSysPll2Pfd3;
     rootCfg.div = 4;
     CLOCK_SetRootClock(kCLOCK_Root_Lpuart12, &rootCfg);

From 51ca23e4634788ddf8971de4d4b462bbeb4c7684 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 30 Sep 2023 08:17:33 +0200
Subject: [PATCH 0382/3129] mimxrt/boards: Fix naming of SD-card config option.

Commit 552b0bbe12a1e8a015d287e31f9cc615afa0a3b2 did not define
MICROPY_PY_MACHINE_SDCARD properly, and thus building the firmware failed.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h | 2 +-
 ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
index 241567ab73f37..784373c939478 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
@@ -7,7 +7,7 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
-#define MICROPY_HW_ENABLE_SDCARD    (0)
+#define MICROPY_PY_MACHINE_SDCARD    (0)
 
 // Define mapping logical UART # to hardware UART #
 // LPUART1 on USB_DBG  -> 0
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index fc135c5e1b57e..a616fbec64a59 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -7,7 +7,7 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
-#define MICROPY_HW_ENABLE_SDCARD    (0)
+#define MICROPY_PY_MACHINE_SDCARD    (0)
 
 // Define mapping logical UART # to hardware UART #
 // LPUART1 on USB_DBG  -> 0

From 6482eb142c6d9b88b3897356d00399226056c603 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 30 Sep 2023 08:27:22 +0200
Subject: [PATCH 0383/3129] mimxrt/mpbthciport: Allow disabling UART flow
 control for BLE.

Not all boards or BLE extensions have the flow control signals for BLE
available at suitable pins.  Actually none of the Adafruit extensions
match for flow control.

For consistency with the previous behaviour it is enabled by default.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/mpbthciport.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/mpbthciport.c b/ports/mimxrt/mpbthciport.c
index 2540abca42f52..4325655e57407 100644
--- a/ports/mimxrt/mpbthciport.c
+++ b/ports/mimxrt/mpbthciport.c
@@ -36,6 +36,10 @@
 
 #if MICROPY_PY_BLUETOOTH
 
+#ifndef MICROPY_HW_BLE_UART_FLOW_CONTROL
+#define MICROPY_HW_BLE_UART_FLOW_CONTROL (3)
+#endif
+
 #define DEBUG_printf(...) // mp_printf(&mp_plat_print, "mpbthciport.c: " __VA_ARGS__)
 #define ERROR_printf(...) mp_printf(&mp_plat_print, "mpbthciport.c: " __VA_ARGS__)
 
@@ -85,7 +89,7 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     mp_obj_t args[] = {
         MP_OBJ_NEW_SMALL_INT(port),
         MP_OBJ_NEW_QSTR(MP_QSTR_baudrate), MP_OBJ_NEW_SMALL_INT(baudrate),
-        MP_OBJ_NEW_QSTR(MP_QSTR_flow), MP_OBJ_NEW_SMALL_INT(3),
+        MP_OBJ_NEW_QSTR(MP_QSTR_flow), MP_OBJ_NEW_SMALL_INT(MICROPY_HW_BLE_UART_FLOW_CONTROL),
         MP_OBJ_NEW_QSTR(MP_QSTR_timeout), MP_OBJ_NEW_SMALL_INT(200),
         MP_OBJ_NEW_QSTR(MP_QSTR_timeout_char), MP_OBJ_NEW_SMALL_INT(200),
         MP_OBJ_NEW_QSTR(MP_QSTR_txbuf), MP_OBJ_NEW_SMALL_INT(768),

From 4e5611c55a4a82805ae972f8f9bc10ac2110ea19 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Sep 2023 22:10:10 +0200
Subject: [PATCH 0384/3129] mimxrt/machine_rtc: Improve the RTC init at boot.

By clearing the tamper bits and enabling access to the registers for all
code, just in case that this was set.  It keeps the clock running on
battery and the calibration setting.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/Makefile      | 1 +
 ports/mimxrt/machine_rtc.c | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 577cc9c1eea03..f44518a8aa132 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -137,6 +137,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_pwm.c \
 	$(MCU_DIR)/drivers/fsl_sai.c \
+	$(MCU_DIR)/drivers/fsl_snvs_hp.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_wdog.c \
 	$(MCU_DIR)/system_$(MCU_SERIES)$(MCU_CORE).c \
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 702c1b903e50e..54a19dacb4335 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -30,6 +30,7 @@
 #include "modmachine.h"
 #include "ticks.h"
 #include "fsl_snvs_lp.h"
+#include "fsl_snvs_hp.h"
 
 typedef struct _machine_rtc_obj_t {
     mp_obj_base_t base;
@@ -41,6 +42,12 @@ STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 // Start the RTC Timer.
 void machine_rtc_start(void) {
+    // Enable Non-Privileged Software Access
+    SNVS->HPCOMR |= SNVS_HPCOMR_NPSWA_EN_MASK;
+    // Do a basic init.
+    SNVS_LP_Init(SNVS);
+    // Disable all external Tamper
+    SNVS_LP_DisableAllExternalTamper(SNVS);
 
     SNVS_LP_SRTC_StartTimer(SNVS);
     // If the date is not set, set it to a more recent start date,

From 1660c787956968c6a2cc19919d16014ddcbdd4ed Mon Sep 17 00:00:00 2001
From: vsfos <vsfos@foxmail.com>
Date: Sat, 30 Sep 2023 02:41:00 +0800
Subject: [PATCH 0385/3129] unix/main: Fix memory leakage if
 MICROPY_USE_READLINE is disabled.

---
 ports/unix/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index b065706ba65a1..47973df8df2e9 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -296,10 +296,10 @@ STATIC int do_repl(void) {
         }
 
         int ret = execute_from_lexer(LEX_SRC_STR, line, MP_PARSE_SINGLE_INPUT, true);
+        free(line);
         if (ret & FORCED_EXIT) {
             return ret;
         }
-        free(line);
     }
 
     #endif

From 2772b88f6a57257bdf27d9eecbccdb98e4820a42 Mon Sep 17 00:00:00 2001
From: Wanlin Wang <dgideas@outlook.com>
Date: Sat, 30 Sep 2023 17:48:25 +0800
Subject: [PATCH 0386/3129] rp2/README: Fix name of RPI_PICO_W board.

Signed-off-by: Wanlin Wang <dgideas@outlook.com>
---
 ports/rp2/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/README.md b/ports/rp2/README.md
index 3f152b8181f98..e22fb3093d72b 100644
--- a/ports/rp2/README.md
+++ b/ports/rp2/README.md
@@ -40,9 +40,9 @@ 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
+    $ make BOARD=RPI_PICO_W submodules
+    $ make BOARD=RPI_PICO_W clean
+    $ make BOARD=RPI_PICO_W
 
 ## Deploying firmware to the device
 

From da193c42f6c767fe0c185e50598a48c95b562327 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 1 Oct 2023 16:33:27 +0200
Subject: [PATCH 0387/3129] ports: Rename Arduino board LED pins to be
 consistent.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv   | 6 +++---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv   | 6 +++---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/ARDUINO_GIGA/pins.csv                | 6 +++---
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h | 6 +++---
 ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv        | 6 +++---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h  | 6 +++---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv         | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
index 195d4d54ca374..1e6379a07b8ba 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
@@ -147,6 +147,6 @@ D5,P210
 LED1,P107
 LED2,P400
 LED3,P800
-LED_R,P107
-LED_G,P400
-LED_B,P800
+LED_RED,P107
+LED_GREEN,P400
+LED_BLUE,P800
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
index 1e42a4f8def2b..47d9b5b04326a 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
@@ -19,9 +19,9 @@ A2,GPIO28
 A3,GPIO29
 SDA,GPIO12
 SCL,GPIO13
-LEDR,EXT_GPIO0
-LEDG,EXT_GPIO1
-LEDB,EXT_GPIO2
+LED_RED,EXT_GPIO0
+LED_GREEN,EXT_GPIO1
+LED_BLUE,EXT_GPIO2
 D18,EXT_GPIO3
 D19,EXT_GPIO4
 D20,EXT_GPIO5
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index 29f1e6140190a..a9b8cbfc7b521 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -184,9 +184,9 @@ extern struct _spi_bdev_t spi_bdev;
 #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_LED1             (pyb_pin_LED_RED) // red
+#define MICROPY_HW_LED2             (pyb_pin_LED_GREEN) // green
+#define MICROPY_HW_LED3             (pyb_pin_LED_BLUE) // yellow
 #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/stm32/boards/ARDUINO_GIGA/pins.csv b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
index c27b5d8cd4f09..91c5c6d58616b 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/pins.csv
+++ b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
@@ -179,9 +179,9 @@ UART6_RX,PC7
 BOOT0,BOOT0
 DAC1,PA4
 DAC2,PA5
-LEDR,PI12
-LEDG,PJ13
-LEDB,PE3
+LED_RED,PI12
+LED_GREEN,PJ13
+LED_BLUE,PE3
 I2C1_SDA,PB9
 I2C1_SCL,PB8
 I2C2_SDA,PB11
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 276288d287cbc..7cb3d85d3ddf5 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -180,9 +180,9 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_CAN_IS_RESERVED(id) (id != PYB_CAN_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_LED1             (pyb_pin_LED_RED) // red
+#define MICROPY_HW_LED2             (pyb_pin_LED_GREEN) // green
+#define MICROPY_HW_LED3             (pyb_pin_LED_BLUE) // yellow
 #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/stm32/boards/ARDUINO_NICLA_VISION/pins.csv b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
index c092965aafe9b..8ff21e645331f 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
@@ -180,9 +180,9 @@ BOOT0,BOOT0
 OSCEN,PH1
 DAC1,-PA4
 DAC2,-PA5
-LEDR,PE3
-LEDG,PC13
-LEDB,-PF4
+LED_RED,PE3
+LED_GREEN,PC13
+LED_BLUE,-PF4
 I2C1_SCL,PB8
 I2C1_SDA,PB9
 I2C2_SCL,PF1
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 452ec00d7098e..349ca9e0010cb 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -177,9 +177,9 @@ extern struct _spi_bdev_t spi_bdev;
 #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_LED1             (pyb_pin_LED_RED) // red
+#define MICROPY_HW_LED2             (pyb_pin_LED_GREEN) // green
+#define MICROPY_HW_LED3             (pyb_pin_LED_BLUE) // yellow
 #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/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
index 6ab00f02ec402..ea8710b25f848 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -203,9 +203,9 @@ BOOT0,BOOT0
 OSCEN,PH1
 DAC1,PA4
 DAC2,-PA5
-LEDR,PK5
-LEDG,PK6
-LEDB,PK7
+LED_RED,PK5
+LED_GREEN,PK6
+LED_BLUE,PK7
 I2C1_SDA,PB7
 I2C1_SCL,PB6
 I2C3_SDA,PH8

From a93ebd0e0368a44f92322d0dbf45bab49165a891 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos.Verlinde@Microsoft.com>
Date: Fri, 22 Sep 2023 18:00:36 +0000
Subject: [PATCH 0388/3129] docs: Add requirements.txt file with dependencies
 for Sphinx.

Signed-off-by: Jos Verlinde <Jos.Verlinde@Microsoft.com>
---
 .github/workflows/docs.yml      | 2 +-
 docs/develop/gettingstarted.rst | 2 +-
 docs/requirements.txt           | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 docs/requirements.txt

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index afc3166f3d658..a0105d6ca60e7 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,6 +17,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
     - name: Install Python packages
-      run: pip install Sphinx
+      run: pip install -r docs/requirements.txt
     - name: Build docs
       run: make -C docs/ html
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 34ca1c9c63e6a..a17a320671f52 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -245,7 +245,7 @@ that you use a virtual environment:
 
    $ python3 -m venv env
    $ source env/bin/activate
-   $ pip install sphinx
+   $ pip install -r docs/requirements.txt
 
 Navigate to the ``docs`` directory:
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000000000..824e9799c773a
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,2 @@
+sphinx~=7.2.6
+sphinxcontrib.jquery==4.1

From 977dc9a369af2d51455c87c1978a5b4598702d35 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 11 Jul 2022 15:23:20 +1000
Subject: [PATCH 0389/3129] extmod/asyncio/stream.py: Fix cancellation handling
 of start_server.

The following code:

  server = await asyncio.start_server(...)
  async with server:
    ... code that raises ...

would lose the original exception because the server's task would not have
had a chance to be scheduled yet, and so awaiting the task in wait_closed
would raise the cancellation instead of the original exception.

Additionally, ensures that explicitly cancelling the parent task delivers
the cancellation correctly (previously was masked by the server loop), now
this only happens if the server was closed, not when the task was
cancelled.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/asyncio/stream.py                     | 26 ++++++++++++--
 tests/net_hosted/asyncio_start_server.py     | 38 ++++++++++++++++++++
 tests/net_hosted/asyncio_start_server.py.exp | 18 ++++++++++
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/extmod/asyncio/stream.py b/extmod/asyncio/stream.py
index c47c48cf09823..5547bfbd51e77 100644
--- a/extmod/asyncio/stream.py
+++ b/extmod/asyncio/stream.py
@@ -127,20 +127,30 @@ async def __aexit__(self, exc_type, exc, tb):
         await self.wait_closed()
 
     def close(self):
+        # Note: the _serve task must have already started by now due to the sleep
+        # in start_server, so `state` won't be clobbered at the start of _serve.
+        self.state = True
         self.task.cancel()
 
     async def wait_closed(self):
         await self.task
 
     async def _serve(self, s, cb):
+        self.state = False
         # Accept incoming connections
         while True:
             try:
                 yield core._io_queue.queue_read(s)
-            except core.CancelledError:
-                # Shutdown server
+            except core.CancelledError as er:
+                # The server task was cancelled, shutdown server and close socket.
                 s.close()
-                return
+                if self.state:
+                    # If the server was explicitly closed, ignore the cancellation.
+                    return
+                else:
+                    # Otherwise e.g. the parent task was cancelled, propagate
+                    # cancellation.
+                    raise er
             try:
                 s2, addr = s.accept()
             except:
@@ -167,6 +177,16 @@ async def start_server(cb, host, port, backlog=5):
     # Create and return server object and task.
     srv = Server()
     srv.task = core.create_task(srv._serve(s, cb))
+    try:
+        # Ensure that the _serve task has been scheduled so that it gets to
+        # handle cancellation.
+        await core.sleep_ms(0)
+    except core.CancelledError as er:
+        # If the parent task is cancelled during this first sleep, then
+        # we will leak the task and it will sit waiting for the socket, so
+        # cancel it.
+        srv.task.cancel()
+        raise er
     return srv
 
 
diff --git a/tests/net_hosted/asyncio_start_server.py b/tests/net_hosted/asyncio_start_server.py
index 316221898112f..e76faf7edb6a9 100644
--- a/tests/net_hosted/asyncio_start_server.py
+++ b/tests/net_hosted/asyncio_start_server.py
@@ -22,6 +22,44 @@ async def test():
         print("sleep")
         await asyncio.sleep(0)
 
+    # Test that cancellation works before the server starts if
+    # the subsequent code raises.
+    print("create server3")
+    server3 = await asyncio.start_server(None, "0.0.0.0", 8000)
+    try:
+        async with server3:
+            raise OSError
+    except OSError as er:
+        print("OSError")
+
+    # Test that closing doesn't raise CancelledError.
+    print("create server4")
+    server4 = await asyncio.start_server(None, "0.0.0.0", 8000)
+    server4.close()
+    await server4.wait_closed()
+    print("server4 closed")
+
+    # Test that cancelling the task will still raise CancelledError, checking
+    # edge cases around how many times the tasks have been re-scheduled by
+    # sleep.
+    async def task(n):
+        print("create task server", n)
+        srv = await asyncio.start_server(None, "0.0.0.0", 8000)
+        await srv.wait_closed()
+        # This should be unreachable.
+        print("task finished")
+
+    for num_sleep in range(0, 5):
+        print("sleep", num_sleep)
+        t = asyncio.create_task(task(num_sleep))
+        for _ in range(num_sleep):
+            await asyncio.sleep(0)
+        t.cancel()
+        try:
+            await t
+        except asyncio.CancelledError:
+            print("CancelledError")
+
     print("done")
 
 
diff --git a/tests/net_hosted/asyncio_start_server.py.exp b/tests/net_hosted/asyncio_start_server.py.exp
index 0fb8e6a63b079..58982a108ce1b 100644
--- a/tests/net_hosted/asyncio_start_server.py.exp
+++ b/tests/net_hosted/asyncio_start_server.py.exp
@@ -2,4 +2,22 @@ create server1
 create server2
 OSError
 sleep
+create server3
+OSError
+create server4
+server4 closed
+sleep 0
+CancelledError
+sleep 1
+create task server 1
+CancelledError
+sleep 2
+create task server 2
+CancelledError
+sleep 3
+create task server 3
+CancelledError
+sleep 4
+create task server 4
+CancelledError
 done

From 379b583b2fbff7772884f199ddb0d70fb8b86090 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 20 Sep 2023 14:41:01 +0200
Subject: [PATCH 0390/3129] drivers/esp_hosted: Fix pin IRQ.

This patch reinstalls the pin IRQ handler on WiFi init, as some
ports disable/remove pin IRQs on soft-reboot, or deinit the pins.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/esp-hosted/esp_hosted_hal.c      | 86 ++++++++++++++----------
 drivers/esp-hosted/esp_hosted_hal.h      |  1 +
 drivers/esp-hosted/esp_hosted_internal.h |  2 -
 drivers/esp-hosted/esp_hosted_wifi.c     |  4 ++
 4 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/drivers/esp-hosted/esp_hosted_hal.c b/drivers/esp-hosted/esp_hosted_hal.c
index d8e2e6ece495b..85cacc0a1bf24 100644
--- a/drivers/esp-hosted/esp_hosted_hal.c
+++ b/drivers/esp-hosted/esp_hosted_hal.c
@@ -41,12 +41,9 @@
 #include "esp_hosted_hal.h"
 #include "esp_hosted_wifi.h"
 
-#ifndef MICROPY_HW_WIFI_IRQ
-#define MICROPY_HW_WIFI_IRQ MICROPY_HW_WIFI_HANDSHAKE
-#endif
+extern void mod_network_poll_events(void);
 
 STATIC mp_obj_t esp_hosted_pin_irq_callback(mp_obj_t self_in) {
-    extern void mod_network_poll_events(void);
     mod_network_poll_events();
     return mp_const_none;
 }
@@ -64,34 +61,16 @@ MP_WEAK int esp_hosted_hal_init(uint32_t mode) {
     mp_hal_pin_input(MICROPY_HW_WIFI_HANDSHAKE);
     mp_hal_pin_input(MICROPY_HW_WIFI_DATAREADY);
 
-    // Enable Pin-IRQ for the handshake PIN to call esp_hosted_wifi_poll()
-    mp_obj_t irq_rising_attr[2];
-    mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ, MP_QSTR_IRQ_RISING, irq_rising_attr);
-
-    if (irq_rising_attr[0] != MP_OBJ_NULL && irq_rising_attr[1] == MP_OBJ_NULL) {  // value for IRQ rising found
-        mp_obj_t pin_args[] = {
-            NULL, // Method pointer
-            (mp_obj_t)MICROPY_HW_WIFI_IRQ,   // Pin object
-            (mp_obj_t)&esp_hosted_pin_irq_callback_obj,   // Callback function object
-            NULL,  // The Rising edge value is set below.
-            mp_const_true,  // Hard IRQ, since the actual polling is scheduled.
-        };
-        pin_args[3] = irq_rising_attr[0];
-        mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ, MP_QSTR_irq, pin_args);
-        if (pin_args[0] != MP_OBJ_NULL && pin_args[1] != MP_OBJ_NULL) {
-            mp_call_method_n_kw(3, 0, pin_args);
-        }
-    }
-
     // 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_OBJ_NEW_QSTR(MP_QSTR_phase), MP_OBJ_NEW_SMALL_INT(0),
         MP_OBJ_NEW_QSTR(MP_QSTR_polarity), MP_OBJ_NEW_SMALL_INT(1),
     };
 
     MP_STATE_PORT(mp_wifi_spi) =
-        MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, make_new)((mp_obj_t)&machine_spi_type, 2, 1, args);
+        MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, make_new)((mp_obj_t)&machine_spi_type, 2, 2, args);
 
     // SPI might change the direction/mode of CS pin,
     // set it to GPIO again just in case.
@@ -101,16 +80,8 @@ MP_WEAK int esp_hosted_hal_init(uint32_t mode) {
 }
 
 MP_WEAK int esp_hosted_hal_deinit(void) {
-    // Disable Pin-IRQ for the handshake PIN
-    mp_obj_t pin_args[] = {
-        NULL, // Method pointer
-        (mp_obj_t)MICROPY_HW_WIFI_IRQ,   // Pin object
-        mp_const_none  // Set to None
-    };
-    mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ, MP_QSTR_irq, pin_args);
-    if (pin_args[0] && pin_args[1]) {
-        mp_call_method_n_kw(1, 0, pin_args);
-    }
+    // Disable pin IRQ.
+    esp_hosted_hal_irq_enable(false);
 
     // Remove all network interfaces and reset wifi state.
     esp_hosted_wifi_deinit();
@@ -134,6 +105,43 @@ MP_WEAK int esp_hosted_hal_deinit(void) {
     return 0;
 }
 
+MP_WEAK void esp_hosted_hal_irq_enable(bool enable) {
+    #ifdef MICROPY_HW_WIFI_IRQ_PIN
+    // Disable Pin-IRQ for the handshake PIN
+    mp_obj_t pin_args[] = {
+        NULL, // Method pointer
+        (mp_obj_t)MICROPY_HW_WIFI_IRQ_PIN,   // Pin object
+        mp_const_none  // Set to None
+    };
+    mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ_PIN, MP_QSTR_irq, pin_args);
+    if (pin_args[0] && pin_args[1]) {
+        mp_call_method_n_kw(1, 0, pin_args);
+    }
+
+    if (enable) {
+        // Enable Pin-IRQ for the handshake PIN to call esp_hosted_wifi_poll()
+        mp_obj_t irq_rising_attr[2];
+        mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ_PIN, MP_QSTR_IRQ_RISING, irq_rising_attr);
+
+        if (irq_rising_attr[0] != MP_OBJ_NULL && irq_rising_attr[1] == MP_OBJ_NULL) {
+            // value for IRQ rising found
+            mp_obj_t pin_args[] = {
+                NULL, // Method pointer
+                (mp_obj_t)MICROPY_HW_WIFI_IRQ_PIN,   // Pin object
+                (mp_obj_t)&esp_hosted_pin_irq_callback_obj,   // Callback function object
+                NULL,  // The Rising edge value is set below.
+                mp_const_true,  // Hard IRQ, since the actual polling is scheduled.
+            };
+            pin_args[3] = irq_rising_attr[0];
+            mp_load_method_maybe((mp_obj_t)MICROPY_HW_WIFI_IRQ_PIN, MP_QSTR_irq, pin_args);
+            if (pin_args[0] != MP_OBJ_NULL && pin_args[1] != MP_OBJ_NULL) {
+                mp_call_method_n_kw(3, 0, pin_args);
+            }
+        }
+    }
+    #endif
+}
+
 MP_WEAK int esp_hosted_hal_atomic_enter(void) {
     #if MICROPY_ENABLE_SCHEDULER
     mp_sched_lock();
@@ -149,7 +157,7 @@ MP_WEAK int esp_hosted_hal_atomic_exit(void) {
 }
 
 MP_WEAK bool esp_hosted_hal_data_ready(void) {
-    return mp_hal_pin_read(MICROPY_HW_WIFI_DATAREADY) && mp_hal_pin_read(MICROPY_HW_WIFI_HANDSHAKE);
+    return mp_hal_pin_read(MICROPY_HW_WIFI_DATAREADY);
 }
 
 MP_WEAK int esp_hosted_hal_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size) {
@@ -158,7 +166,8 @@ MP_WEAK int esp_hosted_hal_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf,
 
     // Wait for handshake pin to go high.
     for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(1)) {
-        if (mp_hal_pin_read(MICROPY_HW_WIFI_HANDSHAKE)) {
+        if (mp_hal_pin_read(MICROPY_HW_WIFI_HANDSHAKE) &&
+           (rx_buf == NULL || mp_hal_pin_read(MICROPY_HW_WIFI_DATAREADY))) {
             break;
         }
         if ((mp_hal_ticks_ms() - start) >= 1000) {
@@ -171,6 +180,11 @@ MP_WEAK int esp_hosted_hal_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf,
     mp_hal_delay_us(10);
     spi_proto->transfer(mp_wifi_spi, size, tx_buf, rx_buf);
     mp_hal_pin_write(MICROPY_HW_WIFI_SPI_CS, 1);
+    mp_hal_delay_us(100);
+
+    if (esp_hosted_hal_data_ready()) {
+        mod_network_poll_events();
+    }
     return 0;
 }
 
diff --git a/drivers/esp-hosted/esp_hosted_hal.h b/drivers/esp-hosted/esp_hosted_hal.h
index abf060c8935e1..0bc7db928235a 100644
--- a/drivers/esp-hosted/esp_hosted_hal.h
+++ b/drivers/esp-hosted/esp_hosted_hal.h
@@ -68,6 +68,7 @@ typedef enum {
 // Note A default machine-based implementation is provided in esp_hosted_hal.c.
 int esp_hosted_hal_init(uint32_t mode);
 int esp_hosted_hal_deinit(void);
+void esp_hosted_hal_irq_enable(bool enable);
 bool esp_hosted_hal_data_ready(void);
 int esp_hosted_hal_atomic_enter(void);
 int esp_hosted_hal_atomic_exit(void);
diff --git a/drivers/esp-hosted/esp_hosted_internal.h b/drivers/esp-hosted/esp_hosted_internal.h
index f57cd210a18a5..ff8377e6745e2 100644
--- a/drivers/esp-hosted/esp_hosted_internal.h
+++ b/drivers/esp-hosted/esp_hosted_internal.h
@@ -29,8 +29,6 @@
 #ifndef MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_INTERNAL_H
 #define MICROPY_INCLUDED_DRIVERS_ESP_HOSTED_INTERNAL_H
 
-#define ESP_HOSTED_DEBUG            (0)
-
 #define ESP_FRAME_MAX_SIZE          (1600)
 #define ESP_FRAME_MAX_PAYLOAD       (ESP_FRAME_MAX_SIZE - sizeof(esp_header_t))
 #define ESP_FRAME_FLAGS_FRAGMENT    (1 << 0)
diff --git a/drivers/esp-hosted/esp_hosted_wifi.c b/drivers/esp-hosted/esp_hosted_wifi.c
index 3cc153205c972..d1b6333aa012c 100644
--- a/drivers/esp-hosted/esp_hosted_wifi.c
+++ b/drivers/esp-hosted/esp_hosted_wifi.c
@@ -476,6 +476,10 @@ int esp_hosted_wifi_init(uint32_t itf) {
         esp_hosted_netif_init(&esp_state, itf);
         info_printf("esp_hosted_init() initialized itf %lu\n", itf);
     }
+
+    // Re/enable IRQ pin.
+    esp_hosted_hal_irq_enable(true);
+
     return 0;
 }
 

From a43e13c67be565a1d053e745fb96c9a31b9f2c41 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 20 Sep 2023 14:44:51 +0200
Subject: [PATCH 0391/3129] drivers/esp-hosted: Fix MTU size.

The maximum SPI frame payload is 1600 - header_size.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/esp-hosted/esp_hosted_netif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/esp-hosted/esp_hosted_netif.c b/drivers/esp-hosted/esp_hosted_netif.c
index b471c3ad4c200..da911f3d62105 100644
--- a/drivers/esp-hosted/esp_hosted_netif.c
+++ b/drivers/esp-hosted/esp_hosted_netif.c
@@ -51,7 +51,7 @@
 static err_t netif_struct_init(struct netif *netif) {
     netif->linkoutput = esp_hosted_netif_output;
     netif->output = etharp_output;
-    netif->mtu = 1500;
+    netif->mtu = ESP_FRAME_MAX_PAYLOAD;
     netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP;
     esp_hosted_wifi_get_mac(netif->name[1] - '0', netif->hwaddr);
     netif->hwaddr_len = sizeof(netif->hwaddr);

From 279e2561f2abfae1fdf2b4b8a37bf228d499e4ba Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 20 Sep 2023 14:43:52 +0200
Subject: [PATCH 0392/3129] drivers/esp_hosted_hal: Add support for WiFI LED
 activity indicator.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/esp-hosted/esp_hosted_hal.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/esp-hosted/esp_hosted_hal.c b/drivers/esp-hosted/esp_hosted_hal.c
index 85cacc0a1bf24..4c3ecad130b77 100644
--- a/drivers/esp-hosted/esp_hosted_hal.c
+++ b/drivers/esp-hosted/esp_hosted_hal.c
@@ -37,6 +37,9 @@
 #include "modmachine.h"
 #include "extmod/machine_spi.h"
 #include "mpconfigboard.h"
+#ifdef MICROPY_HW_WIFI_LED
+#include "led.h"
+#endif
 
 #include "esp_hosted_hal.h"
 #include "esp_hosted_wifi.h"
@@ -44,6 +47,9 @@
 extern void mod_network_poll_events(void);
 
 STATIC mp_obj_t esp_hosted_pin_irq_callback(mp_obj_t self_in) {
+    #ifdef MICROPY_HW_WIFI_LED
+    led_toggle(MICROPY_HW_WIFI_LED);
+    #endif
     mod_network_poll_events();
     return mp_const_none;
 }

From 5c8099003c5db6c398efa611f041f8280e7a32e3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 20 Sep 2023 14:59:28 +0200
Subject: [PATCH 0393/3129] renesas-ra/boards/ARDUINO_PORTENTA_C33: Update WiFi
 config.

Changes are:
- Enable IRQ on WiFi data ready pin.
- Fix WiFi SPI clock (an exact 30MHz is not possible).
- Update WiFi pins.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .../ARDUINO_PORTENTA_C33/mpconfigboard.h      |  3 ++-
 .../ARDUINO_PORTENTA_C33/ra_gen/common_data.c | 24 +++++++++++++++++++
 .../ARDUINO_PORTENTA_C33/ra_gen/common_data.h | 12 +++++++++-
 .../ARDUINO_PORTENTA_C33/ra_gen/pin_data.c    |  2 ++
 .../ARDUINO_PORTENTA_C33/ra_gen/vector_data.c |  2 ++
 .../ARDUINO_PORTENTA_C33/ra_gen/vector_data.h |  4 +++-
 6 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
index ed19f60e9ea6b..aa1e28ab9d091 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
@@ -98,9 +98,10 @@ void PORTENTA_C33_board_enter_bootloader(void);
 // WiFi config.
 #define MICROPY_HW_WIFI_SPI_ID          (1)
 #define MICROPY_HW_WIFI_SPI_CS          (pin_P104)
-#define MICROPY_HW_WIFI_SPI_BAUDRATE    (30 * 1000 * 1000)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE    (25 * 1000 * 1000)
 #define MICROPY_HW_WIFI_DATAREADY       (pin_P803)
 #define MICROPY_HW_WIFI_HANDSHAKE       (pin_P806)
+#define MICROPY_HW_WIFI_IRQ_PIN         (MICROPY_HW_WIFI_DATAREADY)
 
 // ESP hosted control pins
 #define MICROPY_HW_ESP_HOSTED_RESET     (pin_P804)
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c
index 50a3f6046b1c8..edc031ea90752 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.c
@@ -1,5 +1,29 @@
 /* generated common source file - do not edit */
 #include "common_data.h"
+icu_instance_ctrl_t g_external_irq1_ctrl;
+const external_irq_cfg_t g_external_irq1_cfg =
+{ .channel = 2,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = NULL,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .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_irq1 =
+{ .p_ctrl = &g_external_irq1_ctrl, .p_cfg = &g_external_irq1_cfg, .p_api = &g_external_irq_on_icu };
 sce_instance_ctrl_t sce_ctrl;
 const sce_cfg_t sce_cfg =
 { .lifecycle = SCE_SSD };
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.h
index 0f5a143ff6a79..3573218160fc0 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.h
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/common_data.h
@@ -3,12 +3,22 @@
 #define COMMON_DATA_H_
 #include <stdint.h>
 #include "bsp_api.h"
-#include "r_sce.h"
 #include "r_icu.h"
 #include "r_external_irq_api.h"
+#include "r_sce.h"
 #include "r_ioport.h"
 #include "bsp_pin_cfg.h"
 FSP_HEADER
+/** 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 NULL
+void NULL(external_irq_callback_args_t *p_args);
+#endif
 extern sce_instance_ctrl_t sce_ctrl;
 extern const sce_cfg_t sce_cfg;
 /** External IRQ on ICU Instance. */
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c
index 895f662f27310..ac0f7b5ddf112 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/pin_data.c
@@ -34,6 +34,8 @@ const ioport_pin_cfg_t g_bsp_pin_cfg_data[] =
         | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9) },
     { .pin = BSP_IO_PORT_06_PIN_07, .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
         | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8) },
+    { .pin = BSP_IO_PORT_08_PIN_03, .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE
+        | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT) },
     { .pin = BSP_IO_PORT_10_PIN_00, .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN
         | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8) },
 };
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c
index ea8b0511ba178..cb4da4cf340d5 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.c
@@ -33,6 +33,7 @@ BSP_DONT_REMOVE const fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES] BS
     [26] = spi_txi_isr,         /* SPI1 TXI (Transmit buffer empty) */
     [27] = spi_tei_isr,         /* SPI1 TEI (Transmission complete event) */
     [28] = spi_eri_isr,         /* SPI1 ERI (Error) */
+    [29] = r_icu_isr,         /* ICU IRQ2 (External pin interrupt 2) */
 };
 const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
 {
@@ -65,5 +66,6 @@ const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENT
     [26] = BSP_PRV_IELS_ENUM(EVENT_SPI1_TXI),         /* SPI1 TXI (Transmit buffer empty) */
     [27] = BSP_PRV_IELS_ENUM(EVENT_SPI1_TEI),         /* SPI1 TEI (Transmission complete event) */
     [28] = BSP_PRV_IELS_ENUM(EVENT_SPI1_ERI),         /* SPI1 ERI (Error) */
+    [29] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ2),         /* ICU IRQ2 (External pin interrupt 2) */
 };
 #endif
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h
index 2342dbbab1a4b..c5ccb9e3cfdc8 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/ra_gen/vector_data.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 /* Number of interrupts allocated */
 #ifndef VECTOR_DATA_IRQ_COUNT
-#define VECTOR_DATA_IRQ_COUNT    (29)
+#define VECTOR_DATA_IRQ_COUNT    (30)
 #endif
 /* ISR prototypes */
 void sci_uart_rxi_isr(void);
@@ -92,6 +92,8 @@ void spi_eri_isr(void);
 #define SPI1_TEI_IRQn          ((IRQn_Type)27)  /* SPI1 TEI (Transmission complete event) */
 #define VECTOR_NUMBER_SPI1_ERI ((IRQn_Type)28)  /* SPI1 ERI (Error) */
 #define SPI1_ERI_IRQn          ((IRQn_Type)28)  /* SPI1 ERI (Error) */
+#define VECTOR_NUMBER_ICU_IRQ2 ((IRQn_Type)29)  /* ICU IRQ2 (External pin interrupt 2) */
+#define ICU_IRQ2_IRQn          ((IRQn_Type)29)  /* ICU IRQ2 (External pin interrupt 2) */
 #ifdef __cplusplus
 }
 #endif

From 9d5d2e8cf71321b4ba41bad127bf0ea0ff24ccbf Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 20 Sep 2023 15:03:44 +0200
Subject: [PATCH 0394/3129] renesas-ra: Tune lwip buffers and timing to improve
 network performance.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/lwip_inc/lwipopts.h | 14 ++++++++------
 ports/renesas-ra/mpnetworkport.c     |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ports/renesas-ra/lwip_inc/lwipopts.h b/ports/renesas-ra/lwip_inc/lwipopts.h
index 036da9bcef243..f7dc80cc38637 100644
--- a/ports/renesas-ra/lwip_inc/lwipopts.h
+++ b/ports/renesas-ra/lwip_inc/lwipopts.h
@@ -42,12 +42,14 @@
 extern uint32_t rng_read(void);
 #define LWIP_RAND() rng_read()
 
-// 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)
+#define MEM_SIZE                        (16 * 1024)
+#define TCP_MSS                         (1460)
+#define TCP_OVERSIZE                    (TCP_MSS)
+#define TCP_WND                         (8 * TCP_MSS)
+#define TCP_SND_BUF                     (8 * TCP_MSS)
+#define TCP_SND_QUEUELEN                (2 * (TCP_SND_BUF / TCP_MSS))
+#define TCP_QUEUE_OOSEQ                 (1)
+#define MEMP_NUM_TCP_SEG                (2 * TCP_SND_QUEUELEN)
 
 typedef uint32_t sys_prot_t;
 
diff --git a/ports/renesas-ra/mpnetworkport.c b/ports/renesas-ra/mpnetworkport.c
index 2bc6bf439980c..8e16c2b1b4f80 100644
--- a/ports/renesas-ra/mpnetworkport.c
+++ b/ports/renesas-ra/mpnetworkport.c
@@ -67,8 +67,8 @@ void mod_network_lwip_init(void) {
         timer_started = false;
     }
     // Start poll timer.
-    soft_timer_static_init(&network_timer, SOFT_TIMER_MODE_PERIODIC, 128, network_timer_callback);
-    soft_timer_reinsert(&network_timer, 128);
+    soft_timer_static_init(&network_timer, SOFT_TIMER_MODE_PERIODIC, 50, network_timer_callback);
+    soft_timer_reinsert(&network_timer, 50);
     timer_started = true;
 }
 #endif // MICROPY_PY_LWIP

From cf490a70917a1b2d38ba9b58e763e0837d0f7ca7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Oct 2023 11:24:50 +1100
Subject: [PATCH 0395/3129] all: Fix various spelling mistakes found by
 codespell 2.2.6.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/espnow.rst                    | 2 +-
 docs/library/wm8960.rst                    | 2 +-
 docs/reference/glossary.rst                | 2 +-
 examples/hwapi/README.md                   | 2 +-
 extmod/modbluetooth.c                      | 2 +-
 extmod/nimble/modbluetooth_nimble.c        | 2 +-
 ports/cc3200/application.lds               | 2 +-
 ports/cc3200/fatfs/src/drivers/sd_diskio.c | 2 +-
 ports/nrf/Makefile                         | 2 +-
 ports/nrf/drivers/bluetooth/ble_drv.c      | 2 +-
 ports/stm32/Makefile                       | 2 +-
 ports/stm32/timer.c                        | 2 +-
 ports/teensy/Makefile                      | 2 +-
 ports/teensy/timer.c                       | 2 +-
 py/formatfloat.c                           | 2 +-
 py/mkrules.mk                              | 2 +-
 py/mpconfig.h                              | 6 +++---
 py/obj.c                                   | 2 +-
 pyproject.toml                             | 2 +-
 tools/pydfu.py                             | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/library/espnow.rst b/docs/library/espnow.rst
index f344983700a13..f0b592dffc8ab 100644
--- a/docs/library/espnow.rst
+++ b/docs/library/espnow.rst
@@ -287,7 +287,7 @@ after reboot/reset). This reduces the reliability of receiving ESP-NOW messages
 
 .. method:: ESPNow.irecv([timeout_ms])
 
-    Works like `ESPNow.recv()` but will re-use internal bytearrays to store the
+    Works like `ESPNow.recv()` but will reuse internal bytearrays to store the
     return values: ``[mac, msg]``, so that no new memory is allocated on each
     call.
 
diff --git a/docs/library/wm8960.rst b/docs/library/wm8960.rst
index add003630eb8c..5abfb6a8a011c 100644
--- a/docs/library/wm8960.rst
+++ b/docs/library/wm8960.rst
@@ -251,7 +251,7 @@ controlling its operation:
 
 .. method:: WM8960.expand_3d(level)
 
-    Enable Stereo 3D exansion.  *level* is a number between 0 and 15.
+    Enable Stereo 3D expansion.  *level* is a number between 0 and 15.
     A value of 0 disables the expansion.
 
 .. method:: WM8960.mono(active)
diff --git a/docs/reference/glossary.rst b/docs/reference/glossary.rst
index d039bf7132f39..efaa8f607f72a 100644
--- a/docs/reference/glossary.rst
+++ b/docs/reference/glossary.rst
@@ -32,7 +32,7 @@ Glossary
 
     callee-owned tuple
         This is a MicroPython-specific construct where, for efficiency
-        reasons, some built-in functions or methods may re-use the same
+        reasons, some built-in functions or methods may reuse the same
         underlying tuple object to return data. This avoids having to allocate
         a new tuple for every call, and reduces heap fragmentation. Programs
         should not hold references to callee-owned tuples and instead only
diff --git a/examples/hwapi/README.md b/examples/hwapi/README.md
index a1b0c5642a2fb..929ef425fd49a 100644
--- a/examples/hwapi/README.md
+++ b/examples/hwapi/README.md
@@ -3,7 +3,7 @@ This directory shows the best practices for using MicroPython hardware API
 across various boards, with the aim to enable writing portable applications,
 which would work from a board to board, from a system to another systems.
 This is inherently a hard problem, because hardware is different from one
-board type to another, and even from examplar of board to another. For
+board type to another, and even from exemplar of board to another. For
 example, if your app requires an external LED, one user may connect it
 to one GPIO pin, while another user may find it much more convenient to
 use another pin. This of course applies to relays, buzzers, sensors, etc.
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 7b13f9556c4fe..3417df7a27fd3 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -504,7 +504,7 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
     // How many descriptors in the flattened list per characteristic.
     uint8_t *num_descriptors = m_new(uint8_t, len);
 
-    // Inititally allocate enough room for the number of characteristics.
+    // Initially allocate enough room for the number of characteristics.
     // Will be grown to accommodate descriptors as necessary.
     *num_handles = len;
     *handles = m_new(uint16_t, *num_handles);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e23ffbf0f9814..5e3e38ea67f16 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1856,7 +1856,7 @@ int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf
                 // 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
+                    // reuse 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);
diff --git a/ports/cc3200/application.lds b/ports/cc3200/application.lds
index 3f5e72f8bd650..2d7dd04621306 100644
--- a/ports/cc3200/application.lds
+++ b/ports/cc3200/application.lds
@@ -83,7 +83,7 @@ SECTIONS
     } > SRAM
 
     /* place here functions that are only called during boot up, */
-    /* that way, we can re-use this area for the MicroPython heap */
+    /* that way, we can reuse this area for the MicroPython heap */
     .boot :
     {
         . = ALIGN(8);
diff --git a/ports/cc3200/fatfs/src/drivers/sd_diskio.c b/ports/cc3200/fatfs/src/drivers/sd_diskio.c
index 329ae04b99104..e370ba538fd0e 100644
--- a/ports/cc3200/fatfs/src/drivers/sd_diskio.c
+++ b/ports/cc3200/fatfs/src/drivers/sd_diskio.c
@@ -363,7 +363,7 @@ DRESULT sd_disk_read (BYTE* pBuffer, DWORD ulSectorNumber, UINT SectorCount) {
 
 //*****************************************************************************
 //
-//! Wrties sector(s) to the disk drive.
+//! Writes sector(s) to the disk drive.
 //!
 //!
 //! This function writes specified number of sectors to the drive
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 5e9e31ad0140b..284b82281b240 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -536,7 +536,7 @@ SRC_QSTR += $(SRC_C) $(SRC_SHARED_C) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES)
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
-# 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
diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index 078c7d995bc07..b1caa187d5fc5 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -942,7 +942,7 @@ static void sd_evt_handler(uint32_t evt_id) {
             break;
     }
 #if MICROPY_HW_USB_CDC
-    // Farward SOC events to USB CDC driver.
+    // Forward SOC events to USB CDC driver.
     usb_cdc_sd_event_handler(evt_id);
 #endif
 }
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 58dc762006663..dcfc8dfd5413b 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -664,7 +664,7 @@ SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)
 
-# 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
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 5f2e213a0aa29..c15b84fe54f95 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -605,7 +605,7 @@ STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 ///   - `mode` can be one of:
 ///     - `Timer.UP` - configures the timer to count from 0 to ARR (default)
 ///     - `Timer.DOWN` - configures the timer to count from ARR down to 0.
-///     - `Timer.CENTER` - confgures the timer to count from 0 to ARR and
+///     - `Timer.CENTER` - configures the timer to count from 0 to ARR and
 ///       then back down to 0.
 ///
 ///   - `div` can be one of 1, 2, or 4. Divides the timer clock to determine
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index 70331c5dc7040..8f55e4bcba618 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -214,7 +214,7 @@ SRC_QSTR += $(SRC_C) $(STM_SRC_C) $(SHARED_SRC_C)
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
-# 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
diff --git a/ports/teensy/timer.c b/ports/teensy/timer.c
index 56d25e3312404..da18d6f4f5105 100644
--- a/ports/teensy/timer.c
+++ b/ports/teensy/timer.c
@@ -225,7 +225,7 @@ STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 ///
 ///   - `mode` can be one of:
 ///     - `Timer.UP` - configures the timer to count from 0 to MOD (default)
-///     - `Timer.CENTER` - confgures the timer to count from 0 to MOD and
+///     - `Timer.CENTER` - configures the timer to count from 0 to MOD and
 ///       then back down to 0.
 ///
 ///   - `callback` - as per Timer.callback()
diff --git a/py/formatfloat.c b/py/formatfloat.c
index 050d3a9dfb6c3..7cd471018da98 100644
--- a/py/formatfloat.c
+++ b/py/formatfloat.c
@@ -230,7 +230,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         }
     } else {
         // Build positive exponent.
-        // We don't modify f at this point to avoid innaccuracies from
+        // We don't modify f at this point to avoid inaccuracies 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.
diff --git a/py/mkrules.mk b/py/mkrules.mk
index ec36346b8afdf..421e638c22b3c 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -22,7 +22,7 @@ endif
 
 # QSTR generation uses the same CFLAGS, with these modifications.
 QSTR_GEN_FLAGS = -DNO_QSTR
-# Note: := to force evalulation immediately.
+# Note: := to force evaluation immediately.
 QSTR_GEN_CFLAGS := $(CFLAGS)
 QSTR_GEN_CFLAGS += $(QSTR_GEN_FLAGS)
 QSTR_GEN_CXXFLAGS := $(CXXFLAGS)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 433d6e50def2d..9a7eb1b15d055 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1136,7 +1136,7 @@ typedef double mp_float_t;
 #define MICROPY_PY_BUILTINS_RANGE_BINOP (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
-// Support for callling next() with second argument
+// Support for calling next() with second argument
 #ifndef MICROPY_PY_BUILTINS_NEXT2
 #define MICROPY_PY_BUILTINS_NEXT2 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
@@ -1155,13 +1155,13 @@ typedef double mp_float_t;
 #define MICROPY_PY_ALL_SPECIAL_METHODS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Whether to support all inplace arithmetic operarion methods
+// Whether to support all inplace arithmetic operation methods
 // (__imul__, etc.)
 #ifndef MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
 #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
-// Whether to support reverse arithmetic operarion methods
+// Whether to support reverse arithmetic operation methods
 // (__radd__, etc.). Additionally gated by
 // MICROPY_PY_ALL_SPECIAL_METHODS.
 #ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS
diff --git a/py/obj.c b/py/obj.c
index 64c52eeb76c16..d013eb3d02cf5 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -286,7 +286,7 @@ mp_obj_t mp_obj_equal_not_equal(mp_binary_op_t op, mp_obj_t o1, mp_obj_t o2) {
         o2 = temp;
     }
 
-    // equality not implemented, so fall back to pointer conparison
+    // equality not implemented, so fall back to pointer comparison
     return (o1 == o2) ? local_true : local_false;
 }
 
diff --git a/pyproject.toml b/pyproject.toml
index e3d70385c3f52..96e2e3a890ba4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ line-length = 99
 [tool.codespell]
 count = ""
 ignore-regex = '\b[A-Z]{3}\b'
-ignore-words-list = "ans,asend,deques,dout,extint,hsi,iput,mis,numer,technic,ure"
+ignore-words-list = "ans,asend,deques,dout,extint,hsi,iput,mis,numer,shft,technic,ure"
 quiet-level = 3
 skip = """
 */build*,\
diff --git a/tools/pydfu.py b/tools/pydfu.py
index a9da3a0f83fb9..e1e4074a6baff 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -8,7 +8,7 @@
 DFU, without requiring dfu-util.
 
 See app note AN3156 for a description of the DFU protocol.
-See document UM0391 for a dscription of the DFuse file.
+See document UM0391 for a description of the DFuse file.
 """
 
 from __future__ import print_function

From d6c55a40fe611201ae5a56e1738da443862911db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Oct 2023 12:09:44 +1100
Subject: [PATCH 0396/3129] top: Update .git-blame-ignore-revs for latest
 spelling fix 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 6f84de6f60ead..637f2ec3d1eb7 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,6 @@
+# all: Fix various spelling mistakes found by codespell 2.2.6.
+cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
+
 # all: Fix spelling mistakes based on codespell check.
 b1229efbd1509654dec6053865ab828d769e29db
 

From b329fdcb7394f7a30cb81c48e04ba3d557d29396 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 29 Sep 2023 22:49:49 +1000
Subject: [PATCH 0397/3129] extmod/modnetwork: Increase max hostname length to
 32.

This changes from the previous limit of 15 characters.  Although DHCP and
mDNS allow for up to 63, ESP32 and ESP8266 only allow 32, so this seems
like a reasonable limit to enforce across all ports (and avoids wasting the
additional memory).

Also clarifies that `MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN` does not include
the null terminator (which was unclear before).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/network.rst     | 5 +++++
 extmod/modnetwork.c          | 6 +++---
 extmod/modnetwork.h          | 6 ++++--
 extmod/network_cyw43.c       | 2 +-
 ports/esp32/network_wlan.c   | 2 +-
 ports/esp8266/network_wlan.c | 2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/library/network.rst b/docs/library/network.rst
index a14d6192ea061..cc508842942a5 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -188,6 +188,11 @@ The following are functions available in the network module.
     during connection. For this reason, you must set the hostname before
     activating/connecting your network interfaces.
 
+    The length of the hostname is limited to 32 characters.
+    :term:`MicroPython ports <MicroPython port>` may choose to set a lower
+    limit for memory reasons. If the given name does not fit, a `ValueError`
+    is raised.
+
     The default hostname is typically the name of the board.
 
 .. function:: phy_mode([mode])
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 7c1b91de45d04..378b45b9c81d3 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -35,7 +35,7 @@
 #if MICROPY_PY_NETWORK
 
 #include "shared/netutils/netutils.h"
-#include "modnetwork.h"
+#include "extmod/modnetwork.h"
 
 #if MICROPY_PY_NETWORK_CYW43
 // So that CYW43_LINK_xxx constants are available to MICROPY_PORT_NETWORK_INTERFACES.
@@ -56,7 +56,7 @@ char mod_network_country_code[2] = "XX";
 #error "MICROPY_PY_NETWORK_HOSTNAME_DEFAULT must be set in mpconfigport.h or mpconfigboard.h"
 #endif
 
-char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN] = MICROPY_PY_NETWORK_HOSTNAME_DEFAULT;
+char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1] = MICROPY_PY_NETWORK_HOSTNAME_DEFAULT;
 
 #ifdef MICROPY_PORT_NETWORK_INTERFACES
 
@@ -122,7 +122,7 @@ STATIC mp_obj_t network_hostname(size_t n_args, const mp_obj_t *args) {
     } else {
         size_t len;
         const char *str = mp_obj_str_get_data(args[0], &len);
-        if (len >= MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
+        if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
             mp_raise_ValueError(NULL);
         }
         strcpy(mod_network_hostname, str);
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index e775612fe7b13..e9769e309b2bd 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -56,10 +56,12 @@
 extern char mod_network_country_code[2];
 
 #ifndef MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN
-#define MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN (16)
+// Doesn't include the null terminator.
+#define MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN (32)
 #endif
 
-extern char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN];
+// This is a null-terminated string.
+extern char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1];
 
 #if MICROPY_PY_LWIP
 struct netif;
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 168bd3d52b52a..f26a835c16d50 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -500,7 +500,7 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                         // TODO: Deprecated. Use network.hostname(name) instead.
                         size_t len;
                         const char *str = mp_obj_str_get_data(e->value, &len);
-                        if (len >= MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
+                        if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
                             mp_raise_ValueError(NULL);
                         }
                         strcpy(mod_network_hostname, str);
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 58af9f3bc333f..f06143bf76d51 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -524,7 +524,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         // TODO: Deprecated. Use network.hostname(name) instead.
                         size_t len;
                         const char *str = mp_obj_str_get_data(kwargs->table[i].value, &len);
-                        if (len >= MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
+                        if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
                             mp_raise_ValueError(NULL);
                         }
                         strcpy(mod_network_hostname, str);
diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index 348d7f63550cf..012cc970b2761 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -404,7 +404,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         // TODO: Deprecated. Use network.hostname(name) instead.
                         size_t len;
                         const char *str = mp_obj_str_get_data(kwargs->table[i].value, &len);
-                        if (len >= MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
+                        if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
                             mp_raise_ValueError(NULL);
                         }
                         strcpy(mod_network_hostname, str);

From 65a3ce39a31e5ed7e5634c6905ca981039f42cb3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Oct 2023 13:32:48 +1100
Subject: [PATCH 0398/3129] extmod/modnetwork: Forward if.config(hostname) to
 network.hostname.

This removes the duplicate code in cyw43, esp32, esp8266 that implements
the same logic as network.hostname.

Renames the `mod_network_hostname` (where we store the hostname value in
`.data`) to `mod_network_hostname_data` to make way for calling the shared
function `mod_network_hostname`.

And uses memcpy for mod_network_hostname_data, because the length of source
is already known and removes reliance on string data being null-terminated.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modnetwork.c             | 11 ++++++-----
 extmod/modnetwork.h             |  7 ++++++-
 extmod/network_cyw43.c          |  9 ++-------
 ports/esp32/network_wlan.c      | 15 +++++----------
 ports/esp8266/network_wlan.c    | 13 ++++---------
 ports/mimxrt/cyw43_configport.h |  2 +-
 ports/mimxrt/eth.c              |  2 +-
 ports/rp2/cyw43_configport.h    |  2 +-
 ports/stm32/cyw43_configport.h  |  2 +-
 ports/stm32/eth.c               |  2 +-
 10 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 378b45b9c81d3..f5734af9b5afd 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -56,7 +56,7 @@ char mod_network_country_code[2] = "XX";
 #error "MICROPY_PY_NETWORK_HOSTNAME_DEFAULT must be set in mpconfigport.h or mpconfigboard.h"
 #endif
 
-char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1] = MICROPY_PY_NETWORK_HOSTNAME_DEFAULT;
+char mod_network_hostname_data[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1] = MICROPY_PY_NETWORK_HOSTNAME_DEFAULT;
 
 #ifdef MICROPY_PORT_NETWORK_INTERFACES
 
@@ -116,20 +116,21 @@ STATIC mp_obj_t network_country(size_t n_args, const mp_obj_t *args) {
 // TODO: Non-static to allow backwards-compatible pyb.country.
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj, 0, 1, network_country);
 
-STATIC mp_obj_t network_hostname(size_t n_args, const mp_obj_t *args) {
+mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
-        return mp_obj_new_str(mod_network_hostname, strlen(mod_network_hostname));
+        return mp_obj_new_str(mod_network_hostname_data, strlen(mod_network_hostname_data));
     } else {
         size_t len;
         const char *str = mp_obj_str_get_data(args[0], &len);
         if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
             mp_raise_ValueError(NULL);
         }
-        strcpy(mod_network_hostname, str);
+        memcpy(mod_network_hostname_data, str, len);
+        mod_network_hostname_data[len] = 0;
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_hostname_obj, 0, 1, network_hostname);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_hostname_obj, 0, 1, mod_network_hostname);
 
 STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) },
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index e9769e309b2bd..e3239c2a05fcc 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -61,7 +61,12 @@ extern char mod_network_country_code[2];
 #endif
 
 // This is a null-terminated string.
-extern char mod_network_hostname[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1];
+extern char mod_network_hostname_data[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1];
+
+// To support backwards-compatible (esp32, esp8266, cyw43)
+// `if.config(hostname=...)` to forward directly to the implementation of
+// `network.hostname(...)`.
+mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args);
 
 #if MICROPY_PY_LWIP
 struct netif;
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index f26a835c16d50..834f09eae956b 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -422,7 +422,7 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
             }
             case MP_QSTR_hostname: {
                 // TODO: Deprecated. Use network.hostname() instead.
-                return mp_obj_new_str(mod_network_hostname, strlen(mod_network_hostname));
+                return mod_network_hostname(0, NULL);
             }
             default:
                 mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
@@ -498,12 +498,7 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                     }
                     case MP_QSTR_hostname: {
                         // TODO: Deprecated. Use network.hostname(name) instead.
-                        size_t len;
-                        const char *str = mp_obj_str_get_data(e->value, &len);
-                        if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
-                            mp_raise_ValueError(NULL);
-                        }
-                        strcpy(mod_network_hostname, str);
+                        mod_network_hostname(1, &e->value);
                         break;
                     }
                     default:
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index f06143bf76d51..e1d16b4191d69 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -169,8 +169,8 @@ static void network_wlan_ip_event_handler(void *event_handler_arg, esp_event_bas
             if (!mdns_initialised) {
                 mdns_init();
                 #if MICROPY_HW_ENABLE_MDNS_RESPONDER
-                mdns_hostname_set(mod_network_hostname);
-                mdns_instance_name_set(mod_network_hostname);
+                mdns_hostname_set(mod_network_hostname_data);
+                mdns_instance_name_set(mod_network_hostname_data);
                 #endif
                 mdns_initialised = true;
             }
@@ -305,7 +305,7 @@ STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp
         esp_exceptions(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_sta_config));
     }
 
-    esp_exceptions(esp_netif_set_hostname(wlan_sta_obj.netif, mod_network_hostname));
+    esp_exceptions(esp_netif_set_hostname(wlan_sta_obj.netif, mod_network_hostname_data));
 
     wifi_sta_reconnects = 0;
     // connect to the WiFi AP
@@ -522,12 +522,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                     case MP_QSTR_hostname:
                     case MP_QSTR_dhcp_hostname: {
                         // TODO: Deprecated. Use network.hostname(name) instead.
-                        size_t len;
-                        const char *str = mp_obj_str_get_data(kwargs->table[i].value, &len);
-                        if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
-                            mp_raise_ValueError(NULL);
-                        }
-                        strcpy(mod_network_hostname, str);
+                        mod_network_hostname(1, &kwargs->table[i].value);
                         break;
                     }
                     case MP_QSTR_max_clients: {
@@ -630,7 +625,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
         case MP_QSTR_dhcp_hostname: {
             // TODO: Deprecated. Use network.hostname() instead.
             req_if = ESP_IF_WIFI_STA;
-            val = mp_obj_new_str(mod_network_hostname, strlen(mod_network_hostname));
+            val = mod_network_hostname(0, NULL);
             break;
         }
         case MP_QSTR_max_clients: {
diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index 012cc970b2761..b0e6b3aeb1753 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -152,7 +152,7 @@ STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
         error_check(wifi_station_set_config(&config), "Cannot set STA config");
     }
 
-    wifi_station_set_hostname(mod_network_hostname);
+    wifi_station_set_hostname(mod_network_hostname_data);
 
     error_check(wifi_station_connect(), "Cannot connect to AP");
 
@@ -402,12 +402,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                     case MP_QSTR_hostname:
                     case MP_QSTR_dhcp_hostname: {
                         // TODO: Deprecated. Use network.hostname(name) instead.
-                        size_t len;
-                        const char *str = mp_obj_str_get_data(kwargs->table[i].value, &len);
-                        if (len > MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN) {
-                            mp_raise_ValueError(NULL);
-                        }
-                        strcpy(mod_network_hostname, str);
+                        mod_network_hostname(1, &kwargs->table[i].value);
                         break;
                     }
                     case MP_QSTR_protocol: {
@@ -481,9 +476,9 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             break;
         case MP_QSTR_hostname:
         case MP_QSTR_dhcp_hostname: {
-            req_if = STATION_IF;
             // TODO: Deprecated. Use network.hostname() instead.
-            val = mp_obj_new_str(mod_network_hostname, strlen(mod_network_hostname));
+            req_if = STATION_IF;
+            val = mod_network_hostname(0, NULL);
             break;
         }
         case MP_QSTR_protocol: {
diff --git a/ports/mimxrt/cyw43_configport.h b/ports/mimxrt/cyw43_configport.h
index 5f96856474051..f1cfc86cb067b 100644
--- a/ports/mimxrt/cyw43_configport.h
+++ b/ports/mimxrt/cyw43_configport.h
@@ -61,7 +61,7 @@
 #define CYW43_THREAD_EXIT               MICROPY_PY_LWIP_EXIT
 #define CYW43_THREAD_LOCK_CHECK
 
-#define CYW43_HOST_NAME                 mod_network_hostname
+#define CYW43_HOST_NAME                 mod_network_hostname_data
 
 #define CYW43_SDPCM_SEND_COMMON_WAIT    __WFI();
 #define CYW43_DO_IOCTL_WAIT             __WFI();
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index d0df7610cc279..befccca1cd660 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -559,7 +559,7 @@ STATIC void eth_lwip_init(eth_t *self) {
     n->name[0] = 'e';
     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, mod_network_hostname);
+    netif_set_hostname(n, mod_network_hostname_data);
     netif_set_default(n);
     netif_set_up(n);
 
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 0c4a032100e8a..929d83537b5b7 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -48,7 +48,7 @@
 #define CYW43_THREAD_EXIT               MICROPY_PY_LWIP_EXIT
 #define CYW43_THREAD_LOCK_CHECK
 
-#define CYW43_HOST_NAME                 mod_network_hostname
+#define CYW43_HOST_NAME                 mod_network_hostname_data
 
 #define CYW43_SDPCM_SEND_COMMON_WAIT \
     if (get_core_num() == 0) { \
diff --git a/ports/stm32/cyw43_configport.h b/ports/stm32/cyw43_configport.h
index f2a880603ab04..1ea1ebde17ea2 100644
--- a/ports/stm32/cyw43_configport.h
+++ b/ports/stm32/cyw43_configport.h
@@ -62,7 +62,7 @@
 #define CYW43_THREAD_EXIT               MICROPY_PY_LWIP_EXIT
 #define CYW43_THREAD_LOCK_CHECK
 
-#define CYW43_HOST_NAME                 mod_network_hostname
+#define CYW43_HOST_NAME                 mod_network_hostname_data
 
 #define CYW43_SDPCM_SEND_COMMON_WAIT    __WFI();
 #define CYW43_DO_IOCTL_WAIT             __WFI();
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 0feacdae2d501..b01eee3f2b4a3 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -737,7 +737,7 @@ STATIC void eth_lwip_init(eth_t *self) {
     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, mod_network_hostname);
+    netif_set_hostname(n, mod_network_hostname_data);
     netif_set_default(n);
     netif_set_up(n);
 

From 1cd61149e4328154110d4b1e38bcbecdcc0ec386 Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Tue, 3 Oct 2023 12:21:50 +0200
Subject: [PATCH 0399/3129] esp32/boards/ARDUINO_NANO_ESP32: Use Arduino USB
 IDs.

The IDF-provided version of TinyUSB defaults to Espressif's standard
VID:PID unless specific sdkconfig options are present. The numbers
already defined for the CUSTOM_* config options were ignored otherwise.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
index 888e225763d4e..d586dd4ce40dd 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
@@ -11,6 +11,8 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="nano-esp32"
 
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
 CONFIG_TINYUSB_DESC_CUSTOM_VID=0x2341
 CONFIG_TINYUSB_DESC_CUSTOM_PID=0x056B
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Arduino"

From 92717a95c048932e1085ff34ca799835515e442b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 4 Oct 2023 15:44:25 +1100
Subject: [PATCH 0400/3129] tools/metrics.py: Fix esp32 and esp8266 board names
 after renaming.

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

diff --git a/tools/metrics.py b/tools/metrics.py
index 95156e3012d00..9c5ed1d7d5a60 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -64,8 +64,8 @@ def __init__(self, name, dir, output, make_flags=None):
     "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"),
-    "3": PortData("esp32", "esp32", "build-GENERIC/micropython.elf"),
+    "8": PortData("esp8266", "esp8266", "build-ESP8266_GENERIC/firmware.elf"),
+    "3": PortData("esp32", "esp32", "build-ESP32_GENERIC/micropython.elf"),
     "x": PortData("mimxrt", "mimxrt", "build-TEENSY40/firmware.elf"),
     "e": PortData("renesas-ra", "renesas-ra", "build-EK_RA6M2/firmware.elf"),
     "r": PortData("nrf", "nrf", "build-PCA10040/firmware.elf"),

From cac666f38cbce488a12c4fdcd28c2bb9d084368e Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 3 Oct 2023 13:12:42 +0200
Subject: [PATCH 0401/3129] extmod/vfs_posix_file: Fix flush handling in msvc
 builds.

Flushing console output in msvc builds always fails because that
output is not buffered so don't propagate that as an error (in a
simlar way as was done in 1c047742 for macOS).

Signed-off-by: stijn <stijn@ignitron.net>
---
 extmod/vfs_posix_file.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 488593230c744..81a608d2b66c2 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -153,11 +153,14 @@ STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_
     switch (request) {
         case MP_STREAM_FLUSH: {
             int ret;
-            // fsync(stdin/stdout/stderr) may fail with EINVAL (or ENOTSUP on macos),
-            // but don't propagate that error out.  Because data is not buffered by
-            // us, and stdin/out/err.flush() should just be a no-op.
-            #ifdef __APPLE__
+            // fsync(stdin/stdout/stderr) may fail with EINVAL (or ENOTSUP on macos or EBADF
+            // on windows), because the OS doesn't buffer these except for instance when they
+            // are redirected from/to file, but don't propagate that error out.  Because data
+            // is not buffered by us, and stdin/out/err.flush() should just be a no-op.
+            #if defined(__APPLE__)
             #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL || err == ENOTSUP)
+            #elif defined(_MSC_VER)
+            #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL || err == EBADF)
             #else
             #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL)
             #endif

From 5aec051f9f0e1be9750ca4f08478275f298087a3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 3 Oct 2023 17:51:55 +0200
Subject: [PATCH 0402/3129] stm32/i2c: Add support for I2C4 on H7 MCUs.

The current code assumes all I2Cs are on the same peripheral bus, which is
not true for I2C4 and the same goes for the clock enable code.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/i2c.c | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 65271b3525251..42aba2eccbe5b 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -285,8 +285,17 @@ int i2c_write(i2c_t *i2c, const uint8_t *src, size_t len, size_t next_len) {
 
 STATIC uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
 
+static uint32_t i2c_get_id(i2c_t *i2c) {
+    #if defined(STM32H7)
+    if (i2c == I2C4) {
+        return 3;
+    }
+    #endif
+    return ((uint32_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
+}
+
 int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t freq, uint16_t timeout_ms) {
-    uint32_t i2c_id = ((uint32_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
+    uint32_t i2c_id = i2c_get_id(i2c);
 
     // Init pins
     if (!mp_hal_pin_config_alt(scl, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, AF_FN_I2C, i2c_id + 1)) {
@@ -300,9 +309,22 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
     i2c_timeout_ms[i2c_id] = timeout_ms;
 
     // Enable I2C peripheral clock
-    RCC->APB1ENR |= RCC_APB1ENR_I2C1EN << i2c_id;
-    volatile uint32_t tmp = RCC->APB1ENR; // delay after RCC clock enable
+    volatile uint32_t tmp;
     (void)tmp;
+    switch (i2c_id) {
+        case 0:
+        case 1:
+        case 2:
+            RCC->APB1ENR |= RCC_APB1ENR_I2C1EN << i2c_id;
+            tmp = RCC->APB1ENR; // delay after RCC clock enable
+            break;
+        #if defined(STM32H7)
+        case 3:
+            RCC->APB4ENR |= RCC_APB4ENR_I2C4EN;
+            tmp = RCC->APB4ENR; // delay after RCC clock enable
+            break;
+        #endif
+    }
 
     // Initialise I2C peripheral
     i2c->CR1 = 0;
@@ -340,7 +362,8 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
 }
 
 STATIC int i2c_wait_cr2_clear(i2c_t *i2c, uint32_t mask) {
-    uint32_t i2c_id = ((uint32_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
+    uint32_t i2c_id = i2c_get_id(i2c);
+
     uint32_t t0 = HAL_GetTick();
     while (i2c->CR2 & mask) {
         if (HAL_GetTick() - t0 >= i2c_timeout_ms[i2c_id]) {
@@ -352,7 +375,8 @@ STATIC int i2c_wait_cr2_clear(i2c_t *i2c, uint32_t mask) {
 }
 
 STATIC int i2c_wait_isr_set(i2c_t *i2c, uint32_t mask) {
-    uint32_t i2c_id = ((uint32_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
+    uint32_t i2c_id = i2c_get_id(i2c);
+
     uint32_t t0 = HAL_GetTick();
     while (!(i2c->ISR & mask)) {
         if (HAL_GetTick() - t0 >= i2c_timeout_ms[i2c_id]) {

From 5d53783a461ff648c37a14f2e30dd468f293bebb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Oct 2023 11:20:05 +1100
Subject: [PATCH 0403/3129] lib/cyw43-driver: Update driver to latest version
 v1.0.2.

Includes more error checking, and a fix to handle buffer overflow when
getting STA MACs.

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 8ef38a6d32c54..2ab0db6e1fe92 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 8ef38a6d32c54f850bff8f189bdca19ded33792a
+Subproject commit 2ab0db6e1fe9265fa9802a95f7f4d60b7f0d655a

From 342ebcb41d14197b1a2424bac8ff131ddf8e841d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Oct 2023 11:21:34 +1100
Subject: [PATCH 0404/3129] lib/micropython-lib: Update submodule to latest.

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 c113611765278..e025c843b60e9 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit c113611765278b2fc8dcf8b2f2c3513b35a69b39
+Subproject commit e025c843b60e93689f0f991d753010bb5bd6a722

From 040a96d00eaec0990541debc0310a6ff56d082d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Oct 2023 14:04:45 +1100
Subject: [PATCH 0405/3129] docs,tools: Change remaining "urequests" references
 to "requests".

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst | 2 +-
 tools/manifestfile.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 5be737fa2d763..e03a5ffbc9d24 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -101,7 +101,7 @@ A useful function for connecting to your local WiFi network is::
         print('network config:', wlan.ifconfig())
 
 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
+to create and use TCP/UDP sockets as usual, and the ``requests`` module for
 convenient HTTP requests.
 
 After a call to ``wlan.connect()``, the device will by default retry to connect
diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index 3b613d9e1dcae..295170c34cabe 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -106,7 +106,7 @@ def __init__(self, is_require=False):
         self.stdlib = False
 
         # Allows a python-ecosys package to be annotated with the
-        # corresponding name in PyPI. e.g. micropython-lib/urequests is based
+        # corresponding name in PyPI. e.g. micropython-lib/requests is based
         # on pypi/requests.
         self.pypi = None
         # For a micropython package, this is the name that we will publish it

From d81cf0b9e39dd0526ccbf6c131e62cd8fb33f3e9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 5 Oct 2023 13:09:40 +1100
Subject: [PATCH 0406/3129] rp2/CMakeLists: Enable debug symbols in all builds.

Allows using gdb, addr2line, etc. on a "release" ELF file.

No impact to .bin or .uf2 size, only the .elf will get bigger.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 7718697b438f8..fae4cda756333 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -406,6 +406,7 @@ target_include_directories(${MICROPY_TARGET} PRIVATE
 target_compile_options(${MICROPY_TARGET} PRIVATE
     -Wall
     -Werror
+    -g  # always include debug information in the ELF
 )
 
 target_link_options(${MICROPY_TARGET} PRIVATE

From f0f173ff5c09ae1bd4edee72ef3ec67a96b87279 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Wed, 4 Oct 2023 13:51:41 +1100
Subject: [PATCH 0407/3129] esp32/boards/manifest.py: Freeze aioespnow into
 firmware by default.

Also remove corresponding commented line from esp8266/boards/manifest.py.
It doesn't have enough flash to have this frozen by default.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp32/boards/manifest.py   | 2 +-
 ports/esp8266/boards/manifest.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index 290d98c4e499c..135e2c4d2dfa0 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -5,7 +5,7 @@
 require("bundle-networking")
 
 # Require some micropython-lib modules.
-# require("aioespnow")
+require("aioespnow")
 require("dht")
 require("ds18x20")
 require("neopixel")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index 17f58feac88ae..10fa6da2796ed 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,5 +1,4 @@
 freeze("$(PORT_DIR)/modules")
-# require("aioespnow")
 require("bundle-networking")
 require("dht")
 require("ds18x20")

From c2e9a6f2a566ce4e1045f3ab93969a1b43543c6c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Oct 2023 13:25:55 +1100
Subject: [PATCH 0408/3129] esp8266/boards/ESP8266_GENERIC: Remove urllib from
 the 2MiB manifest.

No other network-enabled board has urllib.urequest frozen in to the
firmware, and esp8266 is relatively low on flash, so remove this module.

And (u)requests is already included by bundle-networking.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py b/ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py
index fd9c41dc5423f..e4f44b43b99d0 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py
+++ b/ports/esp8266/boards/ESP8266_GENERIC/manifest_2MiB.py
@@ -10,10 +10,6 @@
 # micropython-lib: file utilities
 require("upysh")
 
-# micropython-lib: requests
-require("urequests")
-require("urllib.urequest")
-
 # micropython-lib: umqtt
 require("umqtt.simple")
 require("umqtt.robust")

From 6f76d1c7fa28c4bcb94a1fa33e3cca1ba8c8cdfd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Oct 2023 16:32:19 +1100
Subject: [PATCH 0409/3129] rp2: Implement time.time_ns with time_us_64 so it
 has us resolution.

Currently on rp2 the time.time_ns() function has only seconds resolution.
This commit makes it have microsecond resolution, by using the output of
time_us_64() instead of the RTC.

Tested that it does not drift from the RTC over long periods of time.

Signed-off-by: Damien George <damien.p.george@gmail.com>
---
 ports/rp2/machine_rtc.c |  2 ++
 ports/rp2/main.c        |  1 +
 ports/rp2/mphalport.c   | 25 +++++++++++++++++++++++--
 ports/rp2/mphalport.h   |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index a9d3426cf8382..25d65eda69898 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -58,6 +58,7 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
         rtc_init();
         datetime_t t = { .month = 1, .day = 1 };
         rtc_set_datetime(&t);
+        mp_hal_time_ns_set_from_rtc();
     }
     // return constant object
     return (mp_obj_t)&machine_rtc_obj;
@@ -104,6 +105,7 @@ STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
         if (!rtc_set_datetime(&t)) {
             mp_raise_OSError(MP_EINVAL);
         }
+        mp_hal_time_ns_set_from_rtc();
 
     }
     return mp_const_none;
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index ff0384b95292b..72b243a5984c9 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -106,6 +106,7 @@ int main(int argc, char **argv) {
     };
     rtc_init();
     rtc_set_datetime(&t);
+    mp_hal_time_ns_set_from_rtc();
 
     // Initialise stack extents and GC heap.
     mp_stack_set_top(&__StackTop);
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 52d55198b7dc8..d1bba43642e36 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -39,6 +39,10 @@
 #include "lib/cyw43-driver/src/cyw43.h"
 #endif
 
+// This needs to be added to the result of time_us_64() to get the number of
+// microseconds since the Epoch.
+STATIC uint64_t time_us_64_offset_from_epoch;
+
 #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
@@ -176,11 +180,28 @@ void mp_hal_delay_ms(mp_uint_t ms) {
     }
 }
 
-uint64_t mp_hal_time_ns(void) {
+void mp_hal_time_ns_set_from_rtc(void) {
+    // Delay at least one RTC clock cycle so it's registers have updated with the most
+    // recent time settings.
+    sleep_us(23);
+
+    // Sample RTC and time_us_64() as close together as possible, so the offset
+    // calculated for the latter can be as accurate as possible.
     datetime_t t;
     rtc_get_datetime(&t);
+    uint64_t us = time_us_64();
+
+    // Calculate the difference between the RTC Epoch seconds and time_us_64().
     uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
-    return s * 1000000000ULL;
+    time_us_64_offset_from_epoch = (uint64_t)s * 1000000ULL - us;
+}
+
+uint64_t mp_hal_time_ns(void) {
+    // The RTC only has seconds resolution, so instead use time_us_64() to get a more
+    // precise measure of Epoch time.  Both these "clocks" are clocked from the same
+    // source so they remain synchronised, and only differ by a fixed offset (calculated
+    // in mp_hal_time_ns_set_from_rtc).
+    return (time_us_64_offset_from_epoch + time_us_64()) * 1000ULL;
 }
 
 // Generate a random locally administered MAC address (LAA)
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 8b4a5b609377b..95e7cba2c5428 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -39,6 +39,7 @@ extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
 void mp_hal_set_interrupt_char(int c);
+void mp_hal_time_ns_set_from_rtc(void);
 
 static inline void mp_hal_delay_us(mp_uint_t us) {
     sleep_us(us);

From e00a144008f368df878c12606fdbf651af2a1dc0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 6 Oct 2023 10:32:07 +1100
Subject: [PATCH 0410/3129] all: Bump version to 1.21.0.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 9a7eb1b15d055..eb3a0eb7368a6 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 20
+#define MICROPY_VERSION_MINOR 21
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From 69e34b6b6bdf45bc1111777c46839a8b5fcb30bd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Oct 2023 11:20:47 +1100
Subject: [PATCH 0411/3129] all: Switch to new preview build versioning scheme.

See https://github.com/micropython/micropython/issues/12127 for details.

Previously at the point when a release is made, we update mpconfig.h
and set a git tag. i.e. the version increments at the release.

Now the version increments immediately after the release. The workflow is:
1. Final commit in the cycle updates mpconfig.h to set (X, Y, 0, 0) (i.e.
   clear the pre-release state).
2. This commit is tagged "vX.Y.0".
3. First commit for the new cycle updates mpconfig.h to set (X, Y+1, 0, 1)
   (i.e. increment the minor version, set the pre-release state).
4. This commit is tagged "vX.Y+1.0-preview".

The idea is that a nightly build is actually a "preview" of the _next_
release. i.e. any documentation describing the current release may not
actually match the nightly build. So we use "preview" as our semver
pre-release identifier.

Changes in this commit:
 - Add MICROPY_VERSION_PRERELEASE to mpconfig.h to allow indicating that
   this is not a release version.
 - Remove unused MICROPY_VERSION integer.
 - Append "-preview" to MICROPY_VERSION_STRING when the pre-release state
   is set.
 - Update py/makeversionhdr.py to no longer generate MICROPY_GIT_HASH.
 - Remove the one place MICROPY_GIT_HASH was used (it can use
   MICROPY_GIT_TAG instead).
 - Update py/makeversionhdr.py to also understand
   MICROPY_VERSION_PRERELEASE in mpconfig.h.
 - Update py/makeversionhdr.py to convert the git-describe output into
   semver-compatible "X.Y.Z-preview.N.gHASH".
 - Update autobuild.sh to generate filenames using the new scheme.
 - Update remove_old_firmware.py to match new scheme.
 - Update mpremote's pyproject.toml to handle the "-preview" suffix in the
   tag. setuptools_scm maps to this "rc0" to match PEP440.
 - Fix docs heading where it incorrectly said "vvX.Y.Z" for release docs.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/conf.py                           |  4 +-
 docs/templates/layout.html             |  2 +-
 ports/cc3200/tools/update-wipy.py      |  4 +-
 py/makeversionhdr.py                   | 91 +++++++++++++-------------
 py/modsys.c                            | 20 ++++--
 py/mpconfig.h                          | 32 +++++----
 tools/autobuild/autobuild.sh           | 14 +++-
 tools/autobuild/remove_old_firmware.py | 22 ++++---
 tools/mpremote/pyproject.toml          |  7 +-
 9 files changed, 117 insertions(+), 79 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 0dbbfe0f706cc..49ddd22be9800 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,10 +21,12 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('.'))
 
-# The members of the html_context dict are available inside topindex.html
+# The MICROPY_VERSION env var should be "vX.Y.Z" (or unset).
 micropy_version = os.getenv('MICROPY_VERSION') or 'latest'
 micropy_all_versions = (os.getenv('MICROPY_ALL_VERSIONS') or 'latest').split(',')
 url_pattern = '%s/en/%%s' % (os.getenv('MICROPY_URL_PREFIX') or '/',)
+
+# The members of the html_context dict are available inside topindex.html
 html_context = {
     'cur_version':micropy_version,
     'all_versions':[
diff --git a/docs/templates/layout.html b/docs/templates/layout.html
index 8563f02af00a1..21dab5eb42f17 100644
--- a/docs/templates/layout.html
+++ b/docs/templates/layout.html
@@ -9,7 +9,7 @@
   {% if is_release %}
     <div class="wy-alert wy-alert-danger">
       <p>
-        This is the v{{ release }} version of the MicroPython
+        This is the {{ 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>
diff --git a/ports/cc3200/tools/update-wipy.py b/ports/cc3200/tools/update-wipy.py
index 7f5527a52bb5f..e37f3a0b09121 100644
--- a/ports/cc3200/tools/update-wipy.py
+++ b/ports/cc3200/tools/update-wipy.py
@@ -152,9 +152,9 @@ def find_tag(tag):
             with open(tag_file_path) as tag_file:
                 for line in tag_file:
                     bline = bytes(line, "ascii")
-                    if b"MICROPY_GIT_HASH" in bline:
+                    if b"MICROPY_GIT_TAG" in bline:
                         bline = (
-                            bline.lstrip(b"#define MICROPY_GIT_HASH ")
+                            bline.lstrip(b"#define MICROPY_GIT_TAG ")
                             .replace(b'"', b"")
                             .replace(b"\r", b"")
                             .replace(b"\n", b"")
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index e682a4e139ccd..2030bb02c4cdc 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -13,6 +13,14 @@
 import subprocess
 
 
+# The MicroPython repository tags a release commit as "vX.Y.Z", and the commit
+# immediately following as "vX.(Y+1).Z-preview".
+# This function will return:
+#   "vX.Y.Z" -- building at the release commit
+#   "vX.Y.Z-preview" -- building at the first commit in the next cycle
+#   "vX.Y.Z-preview.N.gHASH" -- building at any subsequent commit in the cycle
+#   "vX.Y.Z-preview.N.gHASH.dirty" -- building at any subsequent commit in the cycle
+#                                     with local changes
 def get_version_info_from_git(repo_path):
     # Python 2.6 doesn't have check_output, so check for that
     try:
@@ -29,47 +37,33 @@ def get_version_info_from_git(repo_path):
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         ).strip()
-    except subprocess.CalledProcessError as er:
-        if er.returncode == 128:
-            # git exit code of 128 means no repository found
-            return None
-        git_tag = ""
-    except OSError:
-        return None
-    try:
-        git_hash = subprocess.check_output(
-            ["git", "rev-parse", "--short", "HEAD"],
-            cwd=repo_path,
-            stderr=subprocess.STDOUT,
-            universal_newlines=True,
-        ).strip()
+        # Turn git-describe's output into semver compatible (dot-separated
+        # identifiers inside the prerelease field).
+        git_tag = git_tag.split("-", 1)
+        if len(git_tag) == 1:
+            return git_tag[0]
+        else:
+            return git_tag[0] + "-" + git_tag[1].replace("-", ".")
     except subprocess.CalledProcessError:
-        git_hash = "unknown"
-    except OSError:
         return None
-
-    try:
-        # Check if there are any modified files.
-        subprocess.check_call(
-            ["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", "--"],
-            cwd=repo_path,
-            stderr=subprocess.STDOUT,
-        )
-    except subprocess.CalledProcessError:
-        git_hash += "-dirty"
     except OSError:
         return None
 
-    return git_tag, git_hash
-
 
+# When building from a source tarball (or any situation where the git repo
+# isn't available), this function will use the info in mpconfig.h as a
+# fallback. The release commit sets MICROPY_VERSION_PRERELEASE to 0, and the
+# commit immediately following increments MICROPY_VERSION_MINOR and sets
+# MICROPY_VERSION_PRERELEASE back to 1.
+# This function will return:
+#    "vX.Y.Z" -- building at the release commit
+#    "vX.Y.Z-preview" -- building at any other commit
 def get_version_info_from_mpconfig(repo_path):
+    print(
+        "makeversionhdr.py: Warning: No git repo or tag info available, falling back to mpconfig.h version info.",
+        file=sys.stderr,
+    )
+
     with open(os.path.join(repo_path, "py", "mpconfig.h")) as f:
         for line in f:
             if line.startswith("#define MICROPY_VERSION_MAJOR "):
@@ -78,21 +72,30 @@ def get_version_info_from_mpconfig(repo_path):
                 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.%d" % (ver_major, ver_minor, ver_micro)
-                return git_tag, "<no hash>"
+            elif line.startswith("#define MICROPY_VERSION_PRERELEASE "):
+                ver_prerelease = int(line.strip().split()[2])
+                git_tag = "v%d.%d.%d%s" % (
+                    ver_major,
+                    ver_minor,
+                    ver_micro,
+                    "-preview" if ver_prerelease else "",
+                )
+                return git_tag
     return None
 
 
 def make_version_header(repo_path, filename):
-    info = None
+    git_tag = None
     if "MICROPY_GIT_TAG" in os.environ:
-        info = [os.environ["MICROPY_GIT_TAG"], os.environ["MICROPY_GIT_HASH"]]
-    if info is None:
-        info = get_version_info_from_git(repo_path)
-    if info is None:
-        info = get_version_info_from_mpconfig(repo_path)
+        git_tag = os.environ["MICROPY_GIT_TAG"]
+    if git_tag is None:
+        git_tag = get_version_info_from_git(repo_path)
+    if git_tag is None:
+        git_tag = get_version_info_from_mpconfig(repo_path)
 
-    git_tag, git_hash = info
+    if not git_tag:
+        print("makeversionhdr.py: Error: No version information available.")
+        sys.exit(1)
 
     build_date = datetime.date.today()
     if "SOURCE_DATE_EPOCH" in os.environ:
@@ -104,11 +107,9 @@ def make_version_header(repo_path, filename):
     file_data = """\
 // This file was generated by py/makeversionhdr.py
 #define MICROPY_GIT_TAG "%s"
-#define MICROPY_GIT_HASH "%s"
 #define MICROPY_BUILD_DATE "%s"
 """ % (
         git_tag,
-        git_hash,
         build_date.strftime("%Y-%m-%d"),
     )
 
diff --git a/py/modsys.c b/py/modsys.c
index 38105ee21894a..e40542467b32c 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -59,16 +59,24 @@ const mp_print_t mp_sys_stdout_print = {&mp_sys_stdout_obj, mp_stream_write_adap
 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)
-// TODO: CPython is now at 5-element array, but save 2 els so far...
-STATIC const mp_obj_tuple_t mp_sys_version_info_obj = {{&mp_type_tuple}, 3, {I(3), I(4), I(0)}};
+// TODO: CPython is now at 5-element array (major, minor, micro, releaselevel, serial), but save 2 els so far...
+STATIC const mp_rom_obj_tuple_t mp_sys_version_info_obj = {{&mp_type_tuple}, 3, {MP_ROM_INT(3), MP_ROM_INT(4), MP_ROM_INT(0)}};
 
 // sys.implementation object
 // this holds the MicroPython version
-STATIC const mp_obj_tuple_t mp_sys_implementation_version_info_obj = {
+STATIC const mp_rom_obj_tuple_t mp_sys_implementation_version_info_obj = {
     {&mp_type_tuple},
-    3,
-    { I(MICROPY_VERSION_MAJOR), I(MICROPY_VERSION_MINOR), I(MICROPY_VERSION_MICRO) }
+    4,
+    {
+        MP_ROM_INT(MICROPY_VERSION_MAJOR),
+        MP_ROM_INT(MICROPY_VERSION_MINOR),
+        MP_ROM_INT(MICROPY_VERSION_MICRO),
+        #if MICROPY_VERSION_PRERELEASE
+        MP_ROM_QSTR(MP_QSTR_preview),
+        #else
+        MP_ROM_QSTR(MP_QSTR_),
+        #endif
+    }
 };
 STATIC const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER_MACHINE);
 #if MICROPY_PERSISTENT_CODE_LOAD
diff --git a/py/mpconfig.h b/py/mpconfig.h
index eb3a0eb7368a6..a36f9658fbddf 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -26,22 +26,32 @@
 #ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
 #define MICROPY_INCLUDED_PY_MPCONFIG_H
 
-// Current version of MicroPython
+// Current version of MicroPython. This is used by sys.implementation.version
+// as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
+// are unavailable.
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 21
+#define MICROPY_VERSION_MINOR 22
 #define MICROPY_VERSION_MICRO 0
-
-// Combined version as a 32-bit number for convenience
-#define MICROPY_VERSION ( \
-    MICROPY_VERSION_MAJOR << 16 \
-        | MICROPY_VERSION_MINOR << 8 \
-        | MICROPY_VERSION_MICRO)
-
-// String version
-#define MICROPY_VERSION_STRING \
+#define MICROPY_VERSION_PRERELEASE 1
+
+// Combined version as a 32-bit number for convenience to allow version
+// comparison. Doesn't include prerelease state.
+// e.g. #if MICROPY_VERSION < MICROPY_MAKE_VERSION(1, 22, 0)
+#define MICROPY_MAKE_VERSION(major, minor, patch) (major << 16 | minor << 8 | patch)
+#define MICROPY_VERSION MICROPY_MAKE_VERSION(MICROPY_VERSION_MAJOR, MICROPY_VERSION_MINOR, MICROPY_VERSION_MICRO)
+
+// String version. This is only used directly for platform.platform and
+// os.uname().release. All other version info available in the firmware (e.g.
+// the REPL banner) comes from MICROPY_GIT_TAG.
+#define MICROPY_VERSION_STRING_BASE \
     MP_STRINGIFY(MICROPY_VERSION_MAJOR) "." \
     MP_STRINGIFY(MICROPY_VERSION_MINOR) "." \
     MP_STRINGIFY(MICROPY_VERSION_MICRO)
+#if MICROPY_VERSION_PRERELEASE
+#define MICROPY_VERSION_STRING MICROPY_VERSION_STRING_BASE "-preview"
+#else
+#define MICROPY_VERSION_STRING MICROPY_VERSION_STRING_BASE
+#endif
 
 // This file contains default configuration settings for MicroPython.
 // You can override any of the options below using mpconfigport.h file
diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index e1f2287ee597a..7854945bbee0b 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -54,9 +54,19 @@ pushd ${MICROPY_AUTOBUILD_MICROPYTHON_REPO}
 make -C mpy-cross
 
 # make the firmware tag
+# final filename will be <BOARD><-VARIANT>-<DATE>-v<SEMVER>.ext
+# where SEMVER is vX.Y.Z or vX.Y.Z-preview.N.gHASH or vX.Y.Z-preview.N.gHASH.dirty
 FW_DATE=$(date '+%Y%m%d')
-FW_GIT="$(git describe --dirty || echo unknown)"
-FW_TAG="-$FW_DATE-unstable-$FW_GIT"
+# same logic as makeversionhdr.py, convert git-describe output into semver-compatible
+FW_GIT_TAG="$(git describe --tags --dirty --always --match 'v[1-9].*')"
+FW_SEMVER_MAJOR_MINOR_PATCH="$(echo $FW_GIT_TAG | cut -d'-' -f1)"
+FW_SEMVER_PRERELEASE="$(echo $FW_GIT_TAG | cut -s -d'-' -f2-)"
+if [ -z "$FW_SEMVER_PRERELEASE" ]; then
+    FW_SEMVER="$FW_SEMVER_MAJOR_MINOR_PATCH"
+else
+    FW_SEMVER="$FW_SEMVER_MAJOR_MINOR_PATCH-$(echo $FW_SEMVER_PRERELEASE | tr - .)"
+fi
+FW_TAG="-$FW_DATE-$FW_SEMVER"
 
 # build new firmware
 cd ports/cc3200
diff --git a/tools/autobuild/remove_old_firmware.py b/tools/autobuild/remove_old_firmware.py
index e9d2e8aae8e98..a6203531c7661 100755
--- a/tools/autobuild/remove_old_firmware.py
+++ b/tools/autobuild/remove_old_firmware.py
@@ -14,7 +14,7 @@ def main():
 
     # SSH to get list of existing files.
     p = subprocess.run(
-        ["ssh", ssh_machine, "find", ssh_firmware_dir, "-name", "\\*-unstable-v\\*"],
+        ["ssh", ssh_machine, "find", ssh_firmware_dir, "-name", "\\*-preview.\\*"],
         capture_output=True,
     )
     if p.returncode != 0:
@@ -26,31 +26,33 @@ def main():
     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]+).",
+            rb"([a-z/.]+)/([A-Za-z0-9_-]+)-(20[0-9]{6})-(v[0-9.]+)-preview.([0-9]+).g[0-9a-f]+.",
             file,
         )
         if not m:
             continue
-        dir, board, date, version = m.groups()
+        dir, board, date, version, ncommits = 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)
+        if (date, version, ncommits) not in boards[board]:
+            boards[board][(date, version, ncommits)] = []
+        boards[board][(date, version, ncommits)].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 = [
+            (date, version, ncommits, files) for (date, version, ncommits), files in board.items()
+        ]
         filelist.sort(reverse=True)
         keep = []
-        for date, version, files in filelist:
-            if keep and version == keep[-1]:
+        for date, version, ncommits, files in filelist:
+            if keep and (version, ncommits) == keep[-1]:
                 remove.extend(files)
             elif len(keep) >= NUM_KEEP_PER_BOARD:
                 remove.extend(files)
             else:
-                keep.append(version)
+                keep.append((version, ncommits))
 
     if DEBUG:
         all_files.sort(reverse=True)
diff --git a/tools/mpremote/pyproject.toml b/tools/mpremote/pyproject.toml
index b01385c3d578b..746b40bfdd18d 100644
--- a/tools/mpremote/pyproject.toml
+++ b/tools/mpremote/pyproject.toml
@@ -36,9 +36,14 @@ mpremote = "mpremote.main:main"
 [tool.hatch.metadata.hooks.requirements_txt]
 files = ["requirements.txt"]
 
+# This will be PEP-440 normalised into either:
+# mpremote-X.Y.Z (on vX.Y.Z release tag)
+# mpremote-X.Y.Zrc0 (on vX.Y.Z-preview tag, i.e. first commit in the cycle)
+# mpremote-X.Y.Zrc0.postN+gHASH (N commits past vX.Y.Z-preview tag)
+# mpremote-X.Y.Zrc0.postN+gHASH.dDATE (N commits past vX.Y.Z-preview tag, dirty)
 [tool.hatch.version]
 source = "vcs"
-tag-pattern = "(?P<version>v(\\d+).(\\d+).(\\d+))"
+tag-pattern = "(?P<version>v(\\d+).(\\d+).(\\d+)(-preview)?)"
 raw-options = { root = "../..", version_scheme = "post-release" }
 
 [tool.hatch.build]

From 5232847771903e9022c8c67a436b0562e4530602 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 6 Oct 2023 15:57:15 +1100
Subject: [PATCH 0412/3129] README.md: Update CI badges.

- Fix URL for the unix badge.
- Add stm32 CI badge.
- Add docs CI badge (linking to the documentation)
- Make docs CI run on push (so we get a badge generated).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/docs.yml | 1 +
 README.md                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a0105d6ca60e7..e0b6fdaba0387 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,6 +1,7 @@
 name: Build docs
 
 on:
+  push:
   pull_request:
     paths:
       - docs/**
diff --git a/README.md b/README.md
index 6482899b251d9..e6c0a09b8b557 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) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
+[![Unix CI badge](https://github.com/micropython/micropython/actions/workflows/ports_unix.yml/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![STM32 CI badge](https://github.com/micropython/micropython/actions/workflows/ports_stm32.yml/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![Docs CI badge](https://github.com/micropython/micropython/actions/workflows/docs.yml/badge.svg)](https://docs.micropython.org/) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
 
 The MicroPython project
 =======================

From 3fb1bb131f43207e2201a61139cd3f6e82d6513f Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Fri, 6 Oct 2023 21:02:43 +0200
Subject: [PATCH 0413/3129] py/vm: Don't emit warning when using "raise ...
 from None".

"Raise SomeException() from None" is a common Python idiom to suppress
chained exceptions and thus shouldn't trigger a warning on a version of
Python that doesn't support them in the first place.
---
 py/vm.c                             | 6 ++++--
 tests/basics/exception_chain.py     | 9 +++++++++
 tests/basics/exception_chain.py.exp | 3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 385d13ee4097c..a7902d9276732 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1171,8 +1171,10 @@ unwind_jump:;
 
                 ENTRY(MP_BC_RAISE_FROM): {
                     MARK_EXC_IP_SELECTIVE();
-                    mp_warning(NULL, "exception chaining not supported");
-                    sp--; // ignore (pop) "from" argument
+                    mp_obj_t from_value = POP();
+                    if (from_value != mp_const_none) {
+                        mp_warning(NULL, "exception chaining not supported");
+                    }
                     mp_obj_t obj = mp_make_raise_obj(TOP());
                     RAISE(obj);
                 }
diff --git a/tests/basics/exception_chain.py b/tests/basics/exception_chain.py
index c3a7d6b113396..14dd6dfbade8e 100644
--- a/tests/basics/exception_chain.py
+++ b/tests/basics/exception_chain.py
@@ -1,6 +1,15 @@
 # Exception chaining is not supported, but check that basic
 # exception works as expected.
+
 try:
     raise Exception from None
 except Exception:
     print("Caught Exception")
+
+try:
+    try:
+        raise ValueError("Value")
+    except Exception as exc:
+        raise RuntimeError("Runtime") from exc
+except Exception as ex2:
+    print("Caught Exception:", ex2)
diff --git a/tests/basics/exception_chain.py.exp b/tests/basics/exception_chain.py.exp
index 13635b3cde0ac..4369e07a2c329 100644
--- a/tests/basics/exception_chain.py.exp
+++ b/tests/basics/exception_chain.py.exp
@@ -1,2 +1,3 @@
-Warning: exception chaining not supported
 Caught Exception
+Warning: exception chaining not supported
+Caught Exception: Runtime

From a06f4c8df499164721b2132859bef19da48d52d1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 7 Oct 2023 12:10:19 +0200
Subject: [PATCH 0414/3129] mimxrt/led: Fix LED init call from main, and
 simplify led_init.

led_init() was not called, and therefore the machine.LED class seemed not
to work.  led_init() now uses mp_hal_pin_output() to configure the pin.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/led.c  | 14 +-------------
 ports/mimxrt/main.c |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/ports/mimxrt/led.c b/ports/mimxrt/led.c
index 216affa227ec8..99876a5d9005d 100644
--- a/ports/mimxrt/led.c
+++ b/ports/mimxrt/led.c
@@ -52,19 +52,7 @@ void led_init(void) {
     // Turn off LEDs and initialize
     for (mp_int_t led = 0; led < NUM_LEDS; led++) {
         const machine_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);
+        mp_hal_pin_output(led_pin);
         MICROPY_HW_LED_OFF(led_pin);
     }
 }
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 993e598185702..f5d57d530e173 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -93,7 +93,7 @@ int main(void) {
     #endif
 
     for (;;) {
-        #if defined(MICROPY_HW_LED1)
+        #if defined(MICROPY_HW_LED1_PIN)
         led_init();
         #endif
 

From 9f835df35e1628974437cdf87334667a9e2ce3c5 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Tue, 10 Oct 2023 13:06:59 +1100
Subject: [PATCH 0415/3129] esp32,esp8266: Rename MICROPY_ESPNOW to
 MICROPY_PY_ESPNOW.

For consistency with other Python-level modules.

Also add the corresponding missing preprocessor guard to esp32/modespnow.c,
so that this port compiles if MICROPY_PY_ESPNOW and MICROPY_PY_NETWORK_WLAN
are set to 0.

Fixes #12622.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp32/main.c                            |  4 +-
 ports/esp32/modespnow.c                       | 55 ++++++++++---------
 ports/esp32/mpconfigport.h                    |  4 +-
 ports/esp8266/Makefile                        |  6 +-
 .../boards/ESP8266_GENERIC/mpconfigboard.mk   |  6 +-
 ports/esp8266/main.c                          |  4 +-
 ports/esp8266/modespnow.c                     |  2 +-
 7 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 4a9c0060b2558..b514f44e014f6 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -60,7 +60,7 @@
 #include "extmod/modbluetooth.h"
 #endif
 
-#if MICROPY_ESPNOW
+#if MICROPY_PY_ESPNOW
 #include "modespnow.h"
 #endif
 
@@ -152,7 +152,7 @@ void mp_task(void *pvParameter) {
     mp_bluetooth_deinit();
     #endif
 
-    #if MICROPY_ESPNOW
+    #if MICROPY_PY_ESPNOW
     espnow_deinit(mp_const_none);
     MP_STATE_PORT(espnow_singleton) = NULL;
     #endif
diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index 08836c0ad790e..77dc970f517d8 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -47,17 +47,20 @@
 #include "py/ringbuf.h"
 
 #include "mpconfigport.h"
+
+#if MICROPY_PY_ESPNOW
+
 #include "mphalport.h"
 #include "modnetwork.h"
 #include "modespnow.h"
 
-#ifndef MICROPY_ESPNOW_RSSI
+#ifndef MICROPY_PY_ESPNOW_RSSI
 // Include code to track rssi of peers
-#define MICROPY_ESPNOW_RSSI 1
+#define MICROPY_PY_ESPNOW_RSSI 1
 #endif
-#ifndef MICROPY_ESPNOW_EXTRA_PEER_METHODS
+#ifndef MICROPY_PY_ESPNOW_EXTRA_PEER_METHODS
 // Include mod_peer(),get_peer(),peer_count()
-#define MICROPY_ESPNOW_EXTRA_PEER_METHODS 1
+#define MICROPY_PY_ESPNOW_EXTRA_PEER_METHODS 1
 #endif
 
 // Relies on gcc Variadic Macros and Statement Expressions
@@ -71,10 +74,10 @@ static const uint8_t ESPNOW_MAGIC = 0x99;
 typedef struct {
     uint8_t magic;              // = ESPNOW_MAGIC
     uint8_t msg_len;            // Length of the message
-    #if MICROPY_ESPNOW_RSSI
+    #if MICROPY_PY_ESPNOW_RSSI
     uint32_t time_ms;           // Timestamp (ms) when packet is received
     int8_t rssi;                // RSSI value (dBm) (-127 to 0)
-    #endif // MICROPY_ESPNOW_RSSI
+    #endif // MICROPY_PY_ESPNOW_RSSI
 } __attribute__((packed)) espnow_hdr_t;
 
 typedef struct {
@@ -117,9 +120,9 @@ typedef struct _esp_espnow_obj_t {
     size_t peer_count;              // Cache the # of peers for send(sync=True)
     mp_obj_t recv_cb;               // Callback when a packet is received
     mp_obj_t recv_cb_arg;           // Argument passed to callback
-    #if MICROPY_ESPNOW_RSSI
+    #if MICROPY_PY_ESPNOW_RSSI
     mp_obj_t peers_table;           // A dictionary of discovered peers
-    #endif // MICROPY_ESPNOW_RSSI
+    #endif // MICROPY_PY_ESPNOW_RSSI
 } esp_espnow_obj_t;
 
 const mp_obj_type_t esp_espnow_type;
@@ -164,11 +167,11 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
     self->recv_timeout_ms = DEFAULT_RECV_TIMEOUT_MS;
     self->recv_buffer = NULL;       // Buffer is allocated in espnow_init()
     self->recv_cb = mp_const_none;
-    #if MICROPY_ESPNOW_RSSI
+    #if MICROPY_PY_ESPNOW_RSSI
     self->peers_table = mp_obj_new_dict(0);
     // Prevent user code modifying the dict
     mp_obj_dict_get_map(self->peers_table)->is_fixed = 1;
-    #endif // MICROPY_ESPNOW_RSSI
+    #endif // MICROPY_PY_ESPNOW_RSSI
 
     // Set the global singleton pointer for the espnow protocol.
     MP_STATE_PORT(espnow_singleton) = self;
@@ -305,7 +308,7 @@ STATIC mp_obj_t espnow_stats(mp_obj_t _) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_obj, espnow_stats);
 
-#if MICROPY_ESPNOW_RSSI
+#if MICROPY_PY_ESPNOW_RSSI
 // ### Maintaining the peer table and reading RSSI values
 //
 // We maintain a peers table for several reasons, to:
@@ -345,7 +348,7 @@ static mp_map_elem_t *_update_rssi(const uint8_t *peer, int8_t rssi, uint32_t ti
     list->items[1] = mp_obj_new_int(time_ms);
     return item;
 }
-#endif // MICROPY_ESPNOW_RSSI
+#endif // MICROPY_PY_ESPNOW_RSSI
 
 // Return C pointer to byte memory string/bytes/bytearray in obj.
 // Raise ValueError if the length does not match expected len.
@@ -413,11 +416,11 @@ STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
         msg->len += msg->free;   // Make all the space in msg array available
         msg->free = 0;
     }
-    #if MICROPY_ESPNOW_RSSI
+    #if MICROPY_PY_ESPNOW_RSSI
     uint8_t peer_buf[ESP_NOW_ETH_ALEN];
     #else
     uint8_t *peer_buf = _get_bytes_len_w(list->items[0], ESP_NOW_ETH_ALEN);
-    #endif // MICROPY_ESPNOW_RSSI
+    #endif // MICROPY_PY_ESPNOW_RSSI
     uint8_t *msg_buf = _get_bytes_len_w(msg, ESP_NOW_MAX_DATA_LEN);
 
     // Read the packet header from the incoming buffer
@@ -441,7 +444,7 @@ STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
         msg->free = size - msg_len;
     }
 
-    #if MICROPY_ESPNOW_RSSI
+    #if MICROPY_PY_ESPNOW_RSSI
     // Update rssi value in the peer device table
     mp_map_elem_t *entry = _update_rssi(peer_buf, hdr.rssi, hdr.time_ms);
     list->items[0] = entry->key;  // Set first element of list to peer
@@ -449,7 +452,7 @@ STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
         list->items[2] = MP_OBJ_NEW_SMALL_INT(hdr.rssi);
         list->items[3] = mp_obj_new_int(hdr.time_ms);
     }
-    #endif // MICROPY_ESPNOW_RSSI
+    #endif // MICROPY_PY_ESPNOW_RSSI
 
     return MP_OBJ_NEW_SMALL_INT(msg_len);
 }
@@ -561,10 +564,10 @@ STATIC void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, in
     espnow_hdr_t header;
     header.magic = ESPNOW_MAGIC;
     header.msg_len = msg_len;
-    #if MICROPY_ESPNOW_RSSI
+    #if MICROPY_PY_ESPNOW_RSSI
     header.rssi = recv_info->rx_ctrl->rssi;
     header.time_ms = mp_hal_ticks_ms();
-    #endif // MICROPY_ESPNOW_RSSI
+    #endif // MICROPY_PY_ESPNOW_RSSI
 
     ringbuf_put_bytes(buf, (uint8_t *)&header, sizeof(header));
     ringbuf_put_bytes(buf, recv_info->src_addr, ESP_NOW_ETH_ALEN);
@@ -710,7 +713,7 @@ STATIC mp_obj_t espnow_get_peers(mp_obj_t _) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
 
-#if MICROPY_ESPNOW_EXTRA_PEER_METHODS
+#if MICROPY_PY_ESPNOW_EXTRA_PEER_METHODS
 // ESPNow.get_peer(peer_mac): Get the peer info for peer_mac as a tuple.
 // Raise OSError if ESPNow.init() has not been called.
 // Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
@@ -777,11 +780,11 @@ STATIC const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_add_peer), MP_ROM_PTR(&espnow_add_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_del_peer), MP_ROM_PTR(&espnow_del_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_peers), MP_ROM_PTR(&espnow_get_peers_obj) },
-    #if MICROPY_ESPNOW_EXTRA_PEER_METHODS
+    #if MICROPY_PY_ESPNOW_EXTRA_PEER_METHODS
     { MP_ROM_QSTR(MP_QSTR_mod_peer), MP_ROM_PTR(&espnow_mod_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_peer), MP_ROM_PTR(&espnow_get_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_peer_count), MP_ROM_PTR(&espnow_peer_count_obj) },
-    #endif // MICROPY_ESPNOW_EXTRA_PEER_METHODS
+    #endif // MICROPY_PY_ESPNOW_EXTRA_PEER_METHODS
 };
 STATIC MP_DEFINE_CONST_DICT(esp_espnow_locals_dict, esp_espnow_locals_dict_table);
 
@@ -819,7 +822,7 @@ STATIC const mp_stream_p_t espnow_stream_p = {
     .ioctl = espnow_stream_ioctl,
 };
 
-#if MICROPY_ESPNOW_RSSI
+#if MICROPY_PY_ESPNOW_RSSI
 // Return reference to the dictionary of peers we have seen:
 //   {peer1: (rssi, time_sec), peer2: (rssi, time_msec), ...}
 // where:
@@ -838,16 +841,16 @@ STATIC void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
     dest[1] = MP_OBJ_SENTINEL;  // Attribute not found
 }
-#endif // MICROPY_ESPNOW_RSSI
+#endif // MICROPY_PY_ESPNOW_RSSI
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp_espnow_type,
     MP_QSTR_ESPNowBase,
     MP_TYPE_FLAG_NONE,
     make_new, espnow_make_new,
-    #if MICROPY_ESPNOW_RSSI
+    #if MICROPY_PY_ESPNOW_RSSI
     attr, espnow_attr,
-    #endif // MICROPY_ESPNOW_RSSI
+    #endif // MICROPY_PY_ESPNOW_RSSI
     protocol, &espnow_stream_p,
     locals_dict, &esp_espnow_locals_dict
     );
@@ -859,3 +862,5 @@ const mp_obj_module_t mp_module_espnow = {
 
 MP_REGISTER_MODULE(MP_QSTR__espnow, mp_module_espnow);
 MP_REGISTER_ROOT_POINTER(struct _esp_espnow_obj_t *espnow_singleton);
+
+#endif // MICROPY_PY_ESPNOW
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index da26a78ae7b5f..04a745262dcb2 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -72,8 +72,8 @@
 #define MICROPY_GC_SPLIT_HEAP_AUTO          (1)
 
 // extended modules
-#ifndef MICROPY_ESPNOW
-#define MICROPY_ESPNOW                      (1)
+#ifndef MICROPY_PY_ESPNOW
+#define MICROPY_PY_ESPNOW                   (1)
 #endif
 #ifndef MICROPY_PY_BLUETOOTH
 #define MICROPY_PY_BLUETOOTH                (1)
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index e4c907c57a6c5..75b40763381c9 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -78,8 +78,8 @@ 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
 
-ifeq ($(MICROPY_ESPNOW),1)
-CFLAGS += -DMICROPY_ESPNOW=1
+ifeq ($(MICROPY_PY_ESPNOW),1)
+CFLAGS += -DMICROPY_PY_ESPNOW=1
 LIBS += -lespnow
 endif
 
@@ -126,7 +126,7 @@ SRC_C = \
 	hspi.c \
 	$(wildcard $(BOARD_DIR)/*.c) \
 
-ifeq ($(MICROPY_ESPNOW),1)
+ifeq ($(MICROPY_PY_ESPNOW),1)
 SRC_C += \
 	modespnow.c
 endif
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
index 2eb78d7e85e5c..69dbeb5fb9988 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
@@ -1,7 +1,7 @@
 ifeq ($(BOARD_VARIANT),)
 LD_FILES = boards/esp8266_2MiB.ld
 
-MICROPY_ESPNOW ?= 1
+MICROPY_PY_ESPNOW ?= 1
 MICROPY_PY_BTREE ?= 1
 MICROPY_VFS_FAT ?= 1
 MICROPY_VFS_LFS2 ?= 1
@@ -16,7 +16,7 @@ endif
 ifeq ($(BOARD_VARIANT),FLASH_1M)
 LD_FILES = boards/esp8266_1MiB.ld
 
-MICROPY_ESPNOW ?= 1
+MICROPY_PY_ESPNOW ?= 1
 MICROPY_PY_BTREE ?= 1
 MICROPY_VFS_LFS2 ?= 1
 
@@ -29,7 +29,7 @@ endif
 ifeq ($(BOARD_VARIANT),OTA)
 LD_FILES = boards/esp8266_ota.ld
 
-MICROPY_ESPNOW ?= 1
+MICROPY_PY_ESPNOW ?= 1
 MICROPY_PY_BTREE ?= 1
 MICROPY_VFS_LFS2 ?= 1
 
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 3083fe364e77c..11ac5b63f56be 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -45,7 +45,7 @@
 #include "gccollect.h"
 #include "user_interface.h"
 
-#if MICROPY_ESPNOW
+#if MICROPY_PY_ESPNOW
 #include "modespnow.h"
 #endif
 
@@ -77,7 +77,7 @@ STATIC void mp_reset(void) {
         mp_os_dupterm_obj.fun.var(2, args);
     }
 
-    #if MICROPY_ESPNOW
+    #if MICROPY_PY_ESPNOW
     espnow_deinit(mp_const_none);
     #endif
 
diff --git a/ports/esp8266/modespnow.c b/ports/esp8266/modespnow.c
index 1f89204676c03..9aa5fdf9d8b9f 100644
--- a/ports/esp8266/modespnow.c
+++ b/ports/esp8266/modespnow.c
@@ -33,7 +33,7 @@
 
 #include "py/runtime.h"
 
-#if MICROPY_ESPNOW
+#if MICROPY_PY_ESPNOW
 
 #include "c_types.h"
 #include "espnow.h"

From d2a9d70c0977f02b4d52fa5e6d31f17c2a7aa313 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 11 Oct 2023 08:13:53 +1100
Subject: [PATCH 0416/3129] tools/ci.sh: Ensure enough commits are fetched for
 a common ancestor.

This commit updates the ci script to automatically fetch all upstream if
the common commit hasn't been found; this should preserve the speed of CI
checks for most PR's, and use a reliable but slow fetch if needed for older
ones.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 tools/ci.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index efa492bd19ed5..975ce86172e02 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -44,7 +44,9 @@ function ci_code_spell_run {
 
 function ci_commit_formatting_run {
     git remote add upstream https://github.com/micropython/micropython.git
-    git fetch --depth=100 upstream  master
+    git fetch --depth=100 upstream master
+    # If the common ancestor commit hasn't been found, fetch more.
+    git merge-base upstream/master HEAD || git fetch --unshallow upstream master
     # For a PR, upstream/master..HEAD ends with a merge commit into master, exclude that one.
     tools/verifygitlog.py -v upstream/master..HEAD --no-merges
 }
@@ -68,6 +70,8 @@ function ci_code_size_build {
     git checkout -b pull_request # save the current location
     git remote add upstream https://github.com/micropython/micropython.git
     git fetch --depth=100 upstream master
+    # If the common ancestor commit hasn't been found, fetch more.
+    git merge-base upstream/master HEAD || git fetch --unshallow 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 480659b1ac758c377568c93c0ccda6a232f744ca Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 11 Oct 2023 09:55:14 +0200
Subject: [PATCH 0417/3129] ports: Make all ports skip execution of main.py if
 boot.py fails.

That can be caused e.g. by an exception.  This feature is implemented in
some way already for the stm32, renesas-ra, mimxrt and samd ports.  This
commit adds it for the rp2, esp8266, esp32 and nrf ports.  No change for
the cc3200 and teensy ports.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/main.c   | 7 +++++--
 ports/esp8266/main.c | 4 ++--
 ports/nrf/main.c     | 6 ++++--
 ports/rp2/main.c     | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index b514f44e014f6..044b43655c66b 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -124,8 +124,11 @@ void mp_task(void *pvParameter) {
 
     // run boot-up scripts
     pyexec_frozen_module("_boot.py", false);
-    pyexec_file_if_exists("boot.py");
-    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+    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 != 0) {
         int ret = pyexec_file_if_exists("main.py");
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 11ac5b63f56be..7c940ac2a0082 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -83,8 +83,8 @@ STATIC void mp_reset(void) {
 
     #if MICROPY_MODULE_FROZEN
     pyexec_frozen_module("_boot.py", false);
-    pyexec_file_if_exists("boot.py");
-    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+    int ret = pyexec_file_if_exists("boot.py");
+    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
         pyexec_file_if_exists("main.py");
     }
     #endif
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 7f35c7f1b34be..650a47e1615ef 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -263,8 +263,10 @@ int main(int argc, char **argv) {
 
     #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");
+    ret = pyexec_file_if_exists("boot.py");
+    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
+        pyexec_file_if_exists("main.py");
+    }
     #endif
 
     for (;;) {
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 72b243a5984c9..682ea14476aaa 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -179,7 +179,7 @@ int main(int argc, char **argv) {
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
         }
-        if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+        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 5015779a6f4a180233a78ec8b5fd1ea095057a91 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 27 Sep 2023 13:43:50 +1000
Subject: [PATCH 0418/3129] py/builtinevex: Handle invalid filenames for
 execfile.

If a non-string buffer was passed to execfile, then it would be passed
as a non-null-terminated char* to mp_lexer_new_from_file.

This changes mp_lexer_new_from_file to take a qstr instead (as in almost
all cases a qstr will be created from this input anyway to set the
`__file__` attribute on the module).

This now makes execfile require a string (not generic buffer) argument,
which is probably a good fix to make anyway.

Fixes issue #12522.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/vfs_reader.c                       |  4 ++--
 mpy-cross/main.c                          |  4 ++--
 ports/esp8266/main.c                      |  2 +-
 ports/minimal/main.c                      |  2 +-
 ports/nrf/main.c                          |  6 +++---
 ports/pic16bit/main.c                     |  2 +-
 ports/powerpc/main.c                      |  2 +-
 ports/qemu-arm/main.c                     |  2 +-
 ports/qemu-arm/test_main.c                |  2 +-
 ports/teensy/lexerfrozen.c                |  2 +-
 ports/unix/main.c                         |  3 ++-
 ports/webassembly/main.c                  |  2 +-
 ports/zephyr/main.c                       |  2 +-
 py/builtinevex.c                          |  9 +++++----
 py/builtinimport.c                        | 23 +++++++++++++++--------
 py/lexer.c                                |  4 ++--
 py/lexer.h                                |  2 +-
 py/persistentcode.c                       |  8 ++++----
 py/persistentcode.h                       |  4 ++--
 py/reader.c                               |  6 +++---
 py/reader.h                               |  2 +-
 shared/memzip/lexermemzip.c               |  6 +++---
 shared/runtime/pyexec.c                   |  2 +-
 tests/micropython/builtin_execfile.py     |  6 ++++++
 tests/micropython/builtin_execfile.py.exp |  1 +
 25 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/extmod/vfs_reader.c b/extmod/vfs_reader.c
index d3904c5c50693..3c6ff52a991b0 100644
--- a/extmod/vfs_reader.c
+++ b/extmod/vfs_reader.c
@@ -69,10 +69,10 @@ STATIC void mp_reader_vfs_close(void *data) {
     m_del_obj(mp_reader_vfs_t, reader);
 }
 
-void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
+void mp_reader_new_file(mp_reader_t *reader, qstr filename) {
     mp_reader_vfs_t *rf = m_new_obj(mp_reader_vfs_t);
     mp_obj_t args[2] = {
-        mp_obj_new_str(filename, strlen(filename)),
+        MP_OBJ_NEW_QSTR(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);
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 3ef77d436f854..f05aef5dd8f44 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -71,7 +71,7 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
         if (strcmp(file, "-") == 0) {
             lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, STDIN_FILENO, false);
         } else {
-            lex = mp_lexer_new_from_file(file);
+            lex = mp_lexer_new_from_file(qstr_from_str(file));
         }
 
         qstr source_name;
@@ -104,7 +104,7 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
                 vstr_add_str(&vstr, output_file);
             }
 
-            mp_raw_code_save_file(&cm, vstr_null_terminated_str(&vstr));
+            mp_raw_code_save_file(&cm, qstr_from_strn(vstr.buf, vstr.len));
             vstr_clear(&vstr);
         }
 
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 7c940ac2a0082..87e72bace991d 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -141,7 +141,7 @@ void user_init(void) {
 }
 
 #if !MICROPY_VFS
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index 4990997531845..5f472c1afd657 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -73,7 +73,7 @@ void gc_collect(void) {
 }
 #endif
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 650a47e1615ef..cd22521f4a01f 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -302,8 +302,8 @@ int main(int argc, char **argv) {
 #if !MICROPY_VFS
 #if MICROPY_MBFS
 // Use micro:bit filesystem
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    return os_mbfs_new_reader(filename);
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
+    return os_mbfs_new_reader(qstr_str(filename));
 }
 
 mp_import_stat_t mp_import_stat(const char *path) {
@@ -317,7 +317,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
 #else
 // use dummy functions - no filesystem available
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/pic16bit/main.c b/ports/pic16bit/main.c
index e6481bafb6960..b1fe7321f0d46 100644
--- a/ports/pic16bit/main.c
+++ b/ports/pic16bit/main.c
@@ -102,7 +102,7 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/powerpc/main.c b/ports/powerpc/main.c
index f3abc64aa739e..4b668c861c96b 100644
--- a/ports/powerpc/main.c
+++ b/ports/powerpc/main.c
@@ -111,7 +111,7 @@ void gc_collect(void) {
     gc_dump_info(&mp_plat_print);
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/qemu-arm/main.c b/ports/qemu-arm/main.c
index 45da65f2a44aa..f57c03fb9ec84 100644
--- a/ports/qemu-arm/main.c
+++ b/ports/qemu-arm/main.c
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
 void gc_collect(void) {
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index 673311d1e5bb7..bd0a9918da565 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -34,7 +34,7 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/teensy/lexerfrozen.c b/ports/teensy/lexerfrozen.c
index 672a0ce08bc44..59ccdabf09102 100644
--- a/ports/teensy/lexerfrozen.c
+++ b/ports/teensy/lexerfrozen.c
@@ -9,6 +9,6 @@ mp_import_stat_t mp_import_stat(const char *path) {
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 47973df8df2e9..468fc409640b3 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -129,7 +129,8 @@ STATIC int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
             const vstr_t *vstr = source;
             lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, false);
         } else if (source_kind == LEX_SRC_FILENAME) {
-            lex = mp_lexer_new_from_file((const char *)source);
+            const char *filename = (const char *)source;
+            lex = mp_lexer_new_from_file(qstr_from_str(filename));
         } else { // LEX_SRC_STDIN
             lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, 0, false);
         }
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index e6273282608a6..c3cb8c1974ee9 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -124,7 +124,7 @@ void gc_collect(void) {
 }
 
 #if !MICROPY_VFS
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index a2dfb16602b1f..36bc628bbe953 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -189,7 +189,7 @@ void gc_collect(void) {
 }
 
 #if !MICROPY_READER_VFS
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(ENOENT);
 }
 #endif
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 97eab7fad94dd..73fca5d39bf52 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -136,17 +136,18 @@ STATIC mp_obj_t eval_exec_helper(size_t n_args, const mp_obj_t *args, mp_parse_i
     }
     #endif
 
-    // Extract the source code.
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
 
     // create the lexer
     // MP_PARSE_SINGLE_INPUT is used to indicate a file input
     mp_lexer_t *lex;
     if (MICROPY_PY_BUILTINS_EXECFILE && parse_input_kind == MP_PARSE_SINGLE_INPUT) {
-        lex = mp_lexer_new_from_file(bufinfo.buf);
+        lex = mp_lexer_new_from_file(mp_obj_str_get_qstr(args[0]));
         parse_input_kind = MP_PARSE_FILE_INPUT;
     } else {
+        // Extract the source code.
+        mp_buffer_info_t bufinfo;
+        mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
+
         lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, bufinfo.buf, bufinfo.len, 0);
     }
 
diff --git a/py/builtinimport.c b/py/builtinimport.c
index d4cd254fd6a16..009885498ca75 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -164,11 +164,11 @@ 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(const mp_module_context_t *context, const mp_raw_code_t *rc, const char *source_name) {
-    (void)source_name;
-
+STATIC void do_execute_raw_code(const mp_module_context_t *context, const mp_raw_code_t *rc, qstr source_name) {
     #if MICROPY_PY___FILE__
-    mp_store_attr(MP_OBJ_FROM_PTR(&context->module), 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(source_name));
+    #else
+    (void)source_name;
     #endif
 
     // execute the module in its context
@@ -224,7 +224,12 @@ 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, file_str + frozen_path_prefix_len);
+            #if MICROPY_PY___FILE__
+            qstr frozen_file_qstr = qstr_from_str(file_str + frozen_path_prefix_len);
+            #else
+            qstr frozen_file_qstr = MP_QSTRnull;
+            #endif
+            do_execute_raw_code(module_obj, frozen->rc, frozen_file_qstr);
             return;
         }
         #endif
@@ -232,14 +237,16 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
 
     #endif // MICROPY_MODULE_FROZEN
 
+    qstr file_qstr = qstr_from_str(file_str);
+
     // 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
     if (file_str[file->len - 3] == 'm') {
         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);
+        mp_raw_code_load_file(file_qstr, &cm);
+        do_execute_raw_code(cm.context, cm.rc, file_qstr);
         return;
     }
     #endif
@@ -247,7 +254,7 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
     // If we can compile scripts then load the file and compile and execute it.
     #if MICROPY_ENABLE_COMPILER
     {
-        mp_lexer_t *lex = mp_lexer_new_from_file(file_str);
+        mp_lexer_t *lex = mp_lexer_new_from_file(file_qstr);
         do_load_from_lexer(module_obj, lex);
         return;
     }
diff --git a/py/lexer.c b/py/lexer.c
index 6b28f2215227b..9587f6b164e2b 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -879,10 +879,10 @@ mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, size_t len
 
 #if MICROPY_READER_POSIX || MICROPY_READER_VFS
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_reader_t reader;
     mp_reader_new_file(&reader, filename);
-    return mp_lexer_new(qstr_from_str(filename), reader);
+    return mp_lexer_new(filename, reader);
 }
 
 #if MICROPY_HELPER_LEXER_UNIX
diff --git a/py/lexer.h b/py/lexer.h
index 8295dec0f715d..2d9d0447b8ba3 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -191,7 +191,7 @@ mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, size_t len
 
 // 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);
+mp_lexer_t *mp_lexer_new_from_file(qstr filename);
 
 #if MICROPY_HELPER_LEXER_UNIX
 mp_lexer_t *mp_lexer_new_from_fd(qstr filename, int fd, bool close_fd);
diff --git a/py/persistentcode.c b/py/persistentcode.c
index e1218e0b8a577..0feb93bdbe292 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -451,7 +451,7 @@ void mp_raw_code_load_mem(const byte *buf, size_t len, mp_compiled_module_t *con
 
 #if MICROPY_HAS_FILE_READER
 
-void mp_raw_code_load_file(const char *filename, mp_compiled_module_t *context) {
+void mp_raw_code_load_file(qstr filename, mp_compiled_module_t *context) {
     mp_reader_t reader;
     mp_reader_new_file(&reader, filename);
     mp_raw_code_load(&reader, context);
@@ -638,12 +638,12 @@ STATIC void fd_print_strn(void *env, const char *str, size_t len) {
     (void)ret;
 }
 
-void mp_raw_code_save_file(mp_compiled_module_t *cm, const char *filename) {
+void mp_raw_code_save_file(mp_compiled_module_t *cm, qstr filename) {
     MP_THREAD_GIL_EXIT();
-    int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+    int fd = open(qstr_str(filename), O_WRONLY | O_CREAT | O_TRUNC, 0644);
     MP_THREAD_GIL_ENTER();
     if (fd < 0) {
-        mp_raise_OSError_with_filename(errno, filename);
+        mp_raise_OSError_with_filename(errno, qstr_str(filename));
     }
     mp_print_t fd_print = {(void *)(intptr_t)fd, fd_print_strn};
     mp_raw_code_save(cm, &fd_print);
diff --git a/py/persistentcode.h b/py/persistentcode.h
index d363f544ad558..140a0e7e80cc1 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -113,10 +113,10 @@ enum {
 
 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_load_file(qstr 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);
+void mp_raw_code_save_file(mp_compiled_module_t *cm, qstr filename);
 
 void mp_native_relocate(void *reloc, uint8_t *text, uintptr_t reloc_text);
 
diff --git a/py/reader.c b/py/reader.c
index 57b12b3b655ca..d2af62cfb344d 100644
--- a/py/reader.c
+++ b/py/reader.c
@@ -134,12 +134,12 @@ void mp_reader_new_file_from_fd(mp_reader_t *reader, int fd, bool close_fd) {
 
 #if !MICROPY_VFS_POSIX
 // If MICROPY_VFS_POSIX is defined then this function is provided by the VFS layer
-void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
+void mp_reader_new_file(mp_reader_t *reader, qstr filename) {
     MP_THREAD_GIL_EXIT();
-    int fd = open(filename, O_RDONLY, 0644);
+    int fd = open(qstr_str(filename), O_RDONLY, 0644);
     MP_THREAD_GIL_ENTER();
     if (fd < 0) {
-        mp_raise_OSError_with_filename(errno, filename);
+        mp_raise_OSError_with_filename(errno, qstr_str(filename));
     }
     mp_reader_new_file_from_fd(reader, fd, true);
 }
diff --git a/py/reader.h b/py/reader.h
index 8511c72ce503b..5cb1e67966c61 100644
--- a/py/reader.h
+++ b/py/reader.h
@@ -40,7 +40,7 @@ typedef struct _mp_reader_t {
 } mp_reader_t;
 
 void mp_reader_new_mem(mp_reader_t *reader, const byte *buf, size_t len, size_t free_len);
-void mp_reader_new_file(mp_reader_t *reader, const char *filename);
+void mp_reader_new_file(mp_reader_t *reader, qstr filename);
 void mp_reader_new_file_from_fd(mp_reader_t *reader, int fd, bool close_fd);
 
 #endif // MICROPY_INCLUDED_PY_READER_H
diff --git a/shared/memzip/lexermemzip.c b/shared/memzip/lexermemzip.c
index 6b26961bdc8ee..1915a04c01eef 100644
--- a/shared/memzip/lexermemzip.c
+++ b/shared/memzip/lexermemzip.c
@@ -5,15 +5,15 @@
 #include "py/mperrno.h"
 #include "memzip.h"
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename)
+mp_lexer_t *mp_lexer_new_from_file(qstr filename)
 {
     void *data;
     size_t len;
 
-    if (memzip_locate(filename, &data, &len) != MZ_OK) {
+    if (memzip_locate(qstr_str(filename), &data, &len) != MZ_OK) {
         mp_raise_OSError(MP_ENOENT);
     }
 
-    return mp_lexer_new_from_str_len(qstr_from_str(filename), (const char *)data, (mp_uint_t)len, 0);
+    return mp_lexer_new_from_str_len(filename, (const char *)data, (mp_uint_t)len, 0);
 }
 
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index e32150e5e7331..9f6d9a100206e 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -100,7 +100,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             } 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);
+                lex = mp_lexer_new_from_file(qstr_from_str(source));
             } else {
                 lex = (mp_lexer_t *)source;
             }
diff --git a/tests/micropython/builtin_execfile.py b/tests/micropython/builtin_execfile.py
index 5a26ccf0ad353..9b6d6a0aa00bc 100644
--- a/tests/micropython/builtin_execfile.py
+++ b/tests/micropython/builtin_execfile.py
@@ -70,5 +70,11 @@ def open(self, file, mode):
 # Test execfile with a file that does exist.
 execfile("/test_mnt/test.py")
 
+# Test that it only works with string arguments.
+try:
+    execfile(b"aaa")
+except TypeError:
+    print("TypeError")
+
 # Unmount the VFS object.
 os.umount(fs)
diff --git a/tests/micropython/builtin_execfile.py.exp b/tests/micropython/builtin_execfile.py.exp
index 1d5d8ee571e75..49703d570763d 100644
--- a/tests/micropython/builtin_execfile.py.exp
+++ b/tests/micropython/builtin_execfile.py.exp
@@ -3,4 +3,5 @@ open /noexist.py rb
 OSError
 open /test.py rb
 123
+TypeError
 umount

From 05cb1406ad1b421a238faf763e19f4119f5f6bb2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Oct 2023 15:45:40 +1100
Subject: [PATCH 0419/3129] extmod/moductypes: Validate that uctypes.struct
 addr argument is an int.

Fixes issue #12660.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c               | 2 +-
 tests/extmod/uctypes_error.py     | 6 ++++++
 tests/extmod/uctypes_error.py.exp | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 63be621fbcbeb..f56567107df7e 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -96,7 +96,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 = mp_obj_malloc(mp_obj_uctypes_struct_t, type);
-    o->addr = (void *)(uintptr_t)mp_obj_int_get_truncated(args[0]);
+    o->addr = (void *)(uintptr_t)mp_obj_get_int_truncated(args[0]);
     o->desc = args[1];
     o->flags = LAYOUT_NATIVE;
     if (n_args == 3) {
diff --git a/tests/extmod/uctypes_error.py b/tests/extmod/uctypes_error.py
index d42956261589f..f8aea94a7f1a8 100644
--- a/tests/extmod/uctypes_error.py
+++ b/tests/extmod/uctypes_error.py
@@ -8,6 +8,12 @@
 
 data = bytearray(b"01234567")
 
+# first argument isn't an integer
+try:
+    uctypes.struct(data, {})
+except TypeError:
+    print("TypeError")
+
 # del subscr not supported
 S = uctypes.struct(uctypes.addressof(data), {})
 try:
diff --git a/tests/extmod/uctypes_error.py.exp b/tests/extmod/uctypes_error.py.exp
index f2e9c12f7f942..9910ced6c6ae9 100644
--- a/tests/extmod/uctypes_error.py.exp
+++ b/tests/extmod/uctypes_error.py.exp
@@ -3,3 +3,4 @@ TypeError
 TypeError
 TypeError
 TypeError
+TypeError

From 5f0bd33b732151bb7aa896307afae55400b15454 Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Fri, 6 Oct 2023 21:03:24 +0200
Subject: [PATCH 0420/3129] extmod/asyncio: Emit errors to stderr, not stdout.

Sometimes these are different file descriptors, not to mention the Unix
port, so use stderr to distinguish these error messages.

CPython prints to stdout, but it does it via a call to the logging module.
We don't want to introduce a dependency on logging, so printing to stderr
is a good alternative.  One can override default_exception_handler() if
needed.
---
 extmod/asyncio/core.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/asyncio/core.py b/extmod/asyncio/core.py
index be5119ba6118a..214cc52f45f53 100644
--- a/extmod/asyncio/core.py
+++ b/extmod/asyncio/core.py
@@ -272,9 +272,9 @@ def get_exception_handler():
         return Loop._exc_handler
 
     def default_exception_handler(loop, context):
-        print(context["message"])
-        print("future:", context["future"], "coro=", context["future"].coro)
-        sys.print_exception(context["exception"])
+        print(context["message"], file=sys.stderr)
+        print("future:", context["future"], "coro=", context["future"].coro, file=sys.stderr)
+        sys.print_exception(context["exception"], sys.stderr)
 
     def call_exception_handler(context):
         (Loop._exc_handler or Loop.default_exception_handler)(Loop, context)

From 4f5e165d0bf9ba338df3cdab4266556c4c5a70c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 7 Dec 2020 13:33:13 +0100
Subject: [PATCH 0421/3129] py/objboundmeth: Support comparing and hashing
 bound methods.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This behaviour matches CPython.  It's useful to be able to store bound
method objects in dicts/sets, and compare for equality, eg when storing
them in a list and using list.remove().

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 py/obj.h          |  1 +
 py/objboundmeth.c | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index de4c15b22c69c..3c2176832d096 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -828,6 +828,7 @@ extern const mp_obj_type_t mp_type_fun_bc;
 extern const mp_obj_type_t mp_type_module;
 extern const mp_obj_type_t mp_type_staticmethod;
 extern const mp_obj_type_t mp_type_classmethod;
+extern const mp_obj_type_t mp_type_bound_meth;
 extern const mp_obj_type_t mp_type_property;
 extern const mp_obj_type_t mp_type_stringio;
 extern const mp_obj_type_t mp_type_bytesio;
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index 8486f876f9a53..10f52016c58fb 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -83,6 +83,25 @@ STATIC mp_obj_t bound_meth_call(mp_obj_t self_in, size_t n_args, size_t n_kw, co
     return mp_call_method_self_n_kw(self->meth, self->self, n_args, n_kw, args);
 }
 
+STATIC mp_obj_t bound_meth_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+    mp_obj_bound_meth_t *self = MP_OBJ_TO_PTR(self_in);
+    switch (op) {
+        case MP_UNARY_OP_HASH:
+            return MP_OBJ_NEW_SMALL_INT((mp_uint_t)self->self ^ (mp_uint_t)self->meth);
+        default:
+            return MP_OBJ_NULL; // op not supported
+    }
+}
+
+STATIC mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+    if (!mp_obj_is_type(rhs_in, &mp_type_bound_meth) || op != MP_BINARY_OP_EQUAL) {
+        return MP_OBJ_NULL; // op not supported
+    }
+    mp_obj_bound_meth_t *lhs = MP_OBJ_TO_PTR(lhs_in);
+    mp_obj_bound_meth_t *rhs = MP_OBJ_TO_PTR(rhs_in);
+    return mp_obj_new_bool(lhs->self == rhs->self && lhs->meth == rhs->meth);
+}
+
 #if MICROPY_PY_FUNCTION_ATTRS
 STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
@@ -107,13 +126,15 @@ STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 #define BOUND_METH_TYPE_ATTR
 #endif
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bound_meth,
     MP_QSTR_bound_method,
     MP_TYPE_FLAG_NONE,
     BOUND_METH_TYPE_PRINT
     BOUND_METH_TYPE_ATTR
-    call, bound_meth_call
+    call, bound_meth_call,
+    unary_op, bound_meth_unary_op,
+    binary_op, bound_meth_binary_op
     );
 
 mp_obj_t mp_obj_new_bound_meth(mp_obj_t meth, mp_obj_t self) {

From 66c62353ce35d72d7322740ad88f3c4986f31e64 Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@productcreationstudio.com>
Date: Mon, 9 Oct 2023 10:14:57 -0700
Subject: [PATCH 0422/3129] tests/basics/boundmeth1.py: Add tests for bound
 method equality/hash.

This commit adds tests for bound method comparison and hashing to support
the changes in the previous commit.

Signed-off-by: Ned Konz <ned@productcreationstudio.com>
---
 tests/basics/boundmeth1.py | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/tests/basics/boundmeth1.py b/tests/basics/boundmeth1.py
index f483ba406de70..e72153a41a035 100644
--- a/tests/basics/boundmeth1.py
+++ b/tests/basics/boundmeth1.py
@@ -3,14 +3,18 @@
 # uPy and CPython differ when printing a bound method, so just print the type
 print(type(repr([].append)))
 
+
 class A:
     def f(self):
         return 0
+
     def g(self, a):
         return a
+
     def h(self, a, b, c, d, e, f):
         return a + b + c + d + e + f
 
+
 # bound method with no extra args
 m = A().f
 print(m())
@@ -27,4 +31,36 @@ def h(self, a, b, c, d, e, f):
 try:
     A().f.x = 1
 except AttributeError:
-    print('AttributeError')
+    print("AttributeError")
+
+# bound method comparison with same object
+a = A()
+m1 = a.f
+m2 = a.f
+print(m1 == a.f)  # should result in True
+print(m2 == a.f)  # should result in True
+print(m1 == m2)  # should result in True
+print(m1 != a.f)  # should result in False
+
+# bound method comparison with different objects
+a1 = A()
+a2 = A()
+m1 = a1.f
+m2 = a2.f
+print(m1 == a2.f)  # should result in False
+print(m2 == a1.f)  # should result in False
+print(m1 != a2.f)  # should result in True
+
+# bound method hashing
+a = A()
+m1 = a.f
+m2 = a.f
+print(hash(m1) == hash(a.f))  # should result in True
+print(hash(m2) == hash(a.f))  # should result in True
+print(hash(m1) == hash(m2))  # should result in True
+print(hash(m1) != hash(a.g))  # should result in True
+
+# bound method hashing with different objects
+a2 = A()
+m2 = a2.f
+print(hash(m1) == hash(a2.f))  # should result in False

From 516385c4ccbb1f7fa9dbd37a44ed8ae33dcf1942 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 13 Oct 2023 15:27:05 +1100
Subject: [PATCH 0423/3129] py/objboundmeth: Optimise check for types in
 binary_op.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objboundmeth.c          |  5 ++++-
 tests/basics/boundmeth1.py | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index 10f52016c58fb..b0be810c5c15e 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -94,7 +94,10 @@ STATIC mp_obj_t bound_meth_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 }
 
 STATIC mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
-    if (!mp_obj_is_type(rhs_in, &mp_type_bound_meth) || op != MP_BINARY_OP_EQUAL) {
+    // The MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE flag is clear for this type, so if this
+    // function is called with MP_BINARY_OP_EQUAL then lhs_in and rhs_in must have the
+    // same type, which is mp_type_bound_meth.
+    if (op != MP_BINARY_OP_EQUAL) {
         return MP_OBJ_NULL; // op not supported
     }
     mp_obj_bound_meth_t *lhs = MP_OBJ_TO_PTR(lhs_in);
diff --git a/tests/basics/boundmeth1.py b/tests/basics/boundmeth1.py
index e72153a41a035..fe1b454688d64 100644
--- a/tests/basics/boundmeth1.py
+++ b/tests/basics/boundmeth1.py
@@ -33,6 +33,8 @@ def h(self, a, b, c, d, e, f):
 except AttributeError:
     print("AttributeError")
 
+print("--------")
+
 # bound method comparison with same object
 a = A()
 m1 = a.f
@@ -51,6 +53,14 @@ def h(self, a, b, c, d, e, f):
 print(m2 == a1.f)  # should result in False
 print(m1 != a2.f)  # should result in True
 
+# bound method comparison with non-bound-method objects
+print(A().f == None)  # should result in False
+print(A().f != None)  # should result in True
+print(None == A().f)  # should result in False
+print(None != A().f)  # should result in True
+
+print("--------")
+
 # bound method hashing
 a = A()
 m1 = a.f

From 9c7ea9b14ac0378f580bd8ed55b22ef311eda20b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 13 Oct 2023 17:33:29 +1100
Subject: [PATCH 0424/3129] py/obj: Generalise mp_get_buffer so it can raise if
 a flag is set.

This allows mp_get_buffer_raise() to be changed to a simple inline function
that in the majority of cases costs the same (in code size) to call as the
original mp_get_buffer_raise(), because the flags argument is a constant.

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

diff --git a/py/obj.c b/py/obj.c
index d013eb3d02cf5..5e01198b6fb4c 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -577,18 +577,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_identity_obj, mp_identity);
 
 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 (!MP_OBJ_TYPE_HAS_SLOT(type, buffer)) {
-        return false;
+    if (MP_OBJ_TYPE_HAS_SLOT(type, buffer)
+        && MP_OBJ_TYPE_GET_SLOT(type, buffer)(obj, bufinfo, flags & MP_BUFFER_RW) == 0) {
+        return true;
     }
-    int ret = MP_OBJ_TYPE_GET_SLOT(type, buffer)(obj, bufinfo, flags);
-    if (ret != 0) {
-        return false;
-    }
-    return true;
-}
-
-void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
-    if (!mp_get_buffer(obj, bufinfo, flags)) {
+    if (flags & MP_BUFFER_RAISE_IF_UNSUPPORTED) {
         mp_raise_TypeError(MP_ERROR_TEXT("object with buffer protocol required"));
     }
+    return false;
 }
diff --git a/py/obj.h b/py/obj.h
index 3c2176832d096..56ae62172fcef 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -585,17 +585,25 @@ typedef struct _mp_getiter_iternext_custom_t {
 } mp_getiter_iternext_custom_t;
 
 // Buffer protocol
+
 typedef struct _mp_buffer_info_t {
     void *buf;      // can be NULL if len == 0
     size_t len;     // in bytes
     int typecode;   // as per binary.h
 } mp_buffer_info_t;
+
 #define MP_BUFFER_READ  (1)
 #define MP_BUFFER_WRITE (2)
 #define MP_BUFFER_RW (MP_BUFFER_READ | MP_BUFFER_WRITE)
+#define MP_BUFFER_RAISE_IF_UNSUPPORTED (4)
+
 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);
+
+static inline void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    mp_get_buffer(obj, bufinfo, flags | MP_BUFFER_RAISE_IF_UNSUPPORTED);
+}
 
 // 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

From 9b63421fb36a9674eda01c1bc111f070b7b81329 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 13 Oct 2023 17:37:56 +1100
Subject: [PATCH 0425/3129] py/dynruntime: Add mp_get_buffer.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h | 3 ++-
 py/nativeglue.c | 2 +-
 py/nativeglue.h | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 90c401ab4b07a..de9c93c65924b 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -125,7 +125,8 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #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)               (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_buffer(o, bufinfo, fl)       (mp_fun_table.get_buffer((o), (bufinfo), (fl)))
+#define mp_get_buffer_raise(o, bufinfo, fl) (mp_fun_table.get_buffer((o), (bufinfo), (fl) | MP_BUFFER_RAISE_IF_UNSUPPORTED))
 #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))
 
diff --git a/py/nativeglue.c b/py/nativeglue.c
index d92d815abdf5a..217c6b3df3b71 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -328,7 +328,7 @@ const mp_fun_table_t mp_fun_table = {
     mp_obj_new_float_from_d,
     mp_obj_get_float_to_f,
     mp_obj_get_float_to_d,
-    mp_get_buffer_raise,
+    mp_get_buffer,
     mp_get_stream_raise,
     &mp_plat_print,
     &mp_type_type,
diff --git a/py/nativeglue.h b/py/nativeglue.h
index 7b1ccd8d464fa..cf73ffbfc398e 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -154,7 +154,7 @@ typedef struct _mp_fun_table_t {
     mp_obj_t (*obj_new_float_from_d)(double d);
     float (*obj_get_float_to_f)(mp_obj_t o);
     double (*obj_get_float_to_d)(mp_obj_t o);
-    void (*get_buffer_raise)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
+    bool (*get_buffer)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
     const mp_stream_p_t *(*get_stream_raise)(mp_obj_t self_in, int flags);
     const mp_print_t *plat_print;
     const mp_obj_type_t *type_type;

From 6967ff3c581a66f73e9f3d78975f47528db39980 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 Oct 2023 10:48:36 +1100
Subject: [PATCH 0426/3129] py/persistentcode: Bump .mpy sub-version.

This is required because the previous commit changed the .mpy native ABI.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.h                       | 2 +-
 tests/micropython/import_mpy_native_gc.py | 4 ++--
 tools/mpy-tool.py                         | 2 +-
 tools/mpy_ld.py                           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/persistentcode.h b/py/persistentcode.h
index 140a0e7e80cc1..45a268d63fb91 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -35,7 +35,7 @@
 // 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
+#define MPY_SUB_VERSION 2
 
 // 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)
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 5f2a2a6f452ec..e0da8d2c37e4c 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -53,9 +53,9 @@ def open(self, path, mode):
 # cat features0.mpy | python -c 'import sys; print(sys.stdin.buffer.read())'
 features0_file_contents = {
     # -march=x64
-    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',
+    0x806: b'M\x06\x0a\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\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",
+    0x1006: b"M\x06\x12\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 5ef69b267aec7..fc3518d359ec8 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -88,7 +88,7 @@ def __str__(self):
 
 class Config:
     MPY_VERSION = 6
-    MPY_SUB_VERSION = 1
+    MPY_SUB_VERSION = 2
     MICROPY_LONGINT_IMPL_NONE = 0
     MICROPY_LONGINT_IMPL_LONGLONG = 1
     MICROPY_LONGINT_IMPL_MPZ = 2
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 7f0fcbca22ac2..d7d0b945c5db1 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -36,7 +36,7 @@
 
 # MicroPython constants
 MPY_VERSION = 6
-MPY_SUB_VERSION = 1
+MPY_SUB_VERSION = 2
 MP_CODE_BYTECODE = 2
 MP_CODE_NATIVE_VIPER = 4
 MP_NATIVE_ARCH_X86 = 1

From a1be5e1439c9c3056d9073981c4301bb1c5e17be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 Oct 2023 11:28:32 +1100
Subject: [PATCH 0427/3129] docs/reference/mpyfiles: Document change in .mpy
 sub-version.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpyfiles.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 1588eda570900..02bac3d411e02 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -86,7 +86,8 @@ and .mpy version.
 =================== ============
 MicroPython release .mpy version
 =================== ============
-v1.20 and up        6.1
+v1.22.0 and up      6.2
+v1.20 - v1.21.0     6.1
 v1.19.x             6
 v1.12 - v1.18       5
 v1.11               4
@@ -101,6 +102,7 @@ MicroPython repository at which the .mpy version was changed.
 =================== ========================================
 .mpy version change Git commit
 =================== ========================================
+6.1 to 6.2          6967ff3c581a66f73e9f3d78975f47528db39980
 6 to 6.1            d94141e1473aebae0d3c63aeaa8397651ad6fa01
 5 to 6              f2040bfc7ee033e48acef9f289790f3b4e6b74e5
 4 to 5              5716c5cf65e9b2cb46c2906f40302401bdd27517

From d040478d8aad7a05aac98651ec6ac5c2e9265a22 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Oct 2023 22:13:18 +1100
Subject: [PATCH 0428/3129] extmod/modframebuf: Validate FrameBuffer bounds
 against input buffer.

This ensures that the buffer is large enough for the specified width,
height, bits-per-pixel, and stride.

Also makes the legacy FrameBuffer1 constructor re-use the FrameBuffer
make_new to save some code size.

Fixes issue #12562.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modframebuf.c                | 74 +++++++++++++++--------------
 tests/extmod/framebuf_bounds.py     | 60 +++++++++++++++++++++++
 tests/extmod/framebuf_bounds.py.exp | 44 +++++++++++++++++
 3 files changed, 143 insertions(+), 35 deletions(-)
 create mode 100644 tests/extmod/framebuf_bounds.py
 create mode 100644 tests/extmod/framebuf_bounds.py.exp

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 87f7609dd8a85..eabe819973578 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -273,42 +273,59 @@ 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_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_in[0];
-
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
-    o->buf = bufinfo.buf;
+    mp_int_t width = mp_obj_get_int(args_in[1]);
+    mp_int_t height = mp_obj_get_int(args_in[2]);
+    mp_int_t format = mp_obj_get_int(args_in[3]);
+    mp_int_t stride = n_args >= 5 ? mp_obj_get_int(args_in[4]) : width;
 
-    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_in[4]);
-    } else {
-        o->stride = o->width;
+    if (width < 1 || height < 1 || width > 0xffff || height > 0xffff || stride > 0xffff || stride < width) {
+        mp_raise_ValueError(NULL);
     }
 
-    switch (o->format) {
+    size_t height_required = height;
+    size_t bpp = 1;
+
+    switch (format) {
         case FRAMEBUF_MVLSB:
-        case FRAMEBUF_RGB565:
+            height_required = (height + 7) & ~7;
             break;
         case FRAMEBUF_MHLSB:
         case FRAMEBUF_MHMSB:
-            o->stride = (o->stride + 7) & ~7;
+            stride = (stride + 7) & ~7;
             break;
         case FRAMEBUF_GS2_HMSB:
-            o->stride = (o->stride + 3) & ~3;
+            stride = (stride + 3) & ~3;
+            bpp = 2;
             break;
         case FRAMEBUF_GS4_HMSB:
-            o->stride = (o->stride + 1) & ~1;
+            stride = (stride + 1) & ~1;
+            bpp = 4;
             break;
         case FRAMEBUF_GS8:
+            bpp = 8;
+            break;
+        case FRAMEBUF_RGB565:
+            bpp = 16;
             break;
         default:
             mp_raise_ValueError(MP_ERROR_TEXT("invalid format"));
     }
 
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
+
+    if (height_required * stride * bpp / 8 > bufinfo.len) {
+        mp_raise_ValueError(NULL);
+    }
+
+    mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, type);
+    o->buf_obj = args_in[0];
+    o->buf = bufinfo.buf;
+    o->width = width;
+    o->height = height;
+    o->format = format;
+    o->stride = stride;
+
     return MP_OBJ_FROM_PTR(o);
 }
 
@@ -851,24 +868,11 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
-// this factory function is provided for backwards compatibility with old FrameBuffer1 class
+// This factory function is provided for backwards compatibility with the old
+// FrameBuffer1 class which did not support a format argument.
 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_obj_type_t *)&mp_type_framebuf);
-
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
-    o->buf = bufinfo.buf;
-
-    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_in[3]);
-    } else {
-        o->stride = o->width;
-    }
-
-    return MP_OBJ_FROM_PTR(o);
+    mp_obj_t args[] = {args_in[0], args_in[1], args_in[2], MP_OBJ_NEW_SMALL_INT(FRAMEBUF_MVLSB), n_args >= 4 ? args_in[3] : args_in[1] };
+    return framebuf_make_new(&mp_type_framebuf, 5, 0, args);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(legacy_framebuffer1_obj, 3, 4, legacy_framebuffer1);
 
diff --git a/tests/extmod/framebuf_bounds.py b/tests/extmod/framebuf_bounds.py
new file mode 100644
index 0000000000000..3035b365bbae7
--- /dev/null
+++ b/tests/extmod/framebuf_bounds.py
@@ -0,0 +1,60 @@
+try:
+    import framebuf
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def test_constructor(*args):
+    try:
+        framebuf.FrameBuffer(*args)
+        print("Valid")
+    except ValueError:
+        print("ValueError")
+
+
+print(framebuf.MONO_HLSB)
+test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB)
+test_constructor(bytearray(20), -1, 10, framebuf.MONO_HLSB)
+test_constructor(bytearray(20), 10, -1, framebuf.MONO_HLSB)
+test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, 11)
+test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, 10)
+test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, 9)
+test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, -1)
+
+print(framebuf.MONO_VLSB)
+test_constructor(bytearray(8), 8, 1, framebuf.MONO_VLSB)
+test_constructor(bytearray(7), 8, 1, framebuf.MONO_VLSB)
+test_constructor(bytearray(8), 8, 8, framebuf.MONO_VLSB)
+
+for f in (framebuf.MONO_HLSB, framebuf.MONO_HMSB):
+    print(f)
+    test_constructor(bytearray(1), 8, 1, f)
+    test_constructor(bytearray(0), 8, 1, f)
+    test_constructor(bytearray(8), 8, 8, f)
+    test_constructor(bytearray(9), 8, 9, f)
+    test_constructor(bytearray(9), 9, 8, f)
+
+print(framebuf.GS2_HMSB)
+test_constructor(bytearray(8), 4, 8, framebuf.GS2_HMSB)
+test_constructor(bytearray(15), 5, 8, framebuf.GS2_HMSB)
+test_constructor(bytearray(16), 5, 8, framebuf.GS2_HMSB)
+test_constructor(bytearray(9), 4, 9, framebuf.GS2_HMSB)
+
+print(framebuf.GS4_HMSB)
+test_constructor(bytearray(8), 2, 8, framebuf.GS4_HMSB)
+test_constructor(bytearray(15), 3, 8, framebuf.GS4_HMSB)
+test_constructor(bytearray(16), 3, 8, framebuf.GS4_HMSB)
+test_constructor(bytearray(9), 2, 9, framebuf.GS4_HMSB)
+
+print(framebuf.GS8)
+test_constructor(bytearray(63), 8, 8, framebuf.GS8)
+test_constructor(bytearray(64), 8, 8, framebuf.GS8)
+test_constructor(bytearray(64), 9, 8, framebuf.GS8)
+test_constructor(bytearray(64), 8, 9, framebuf.GS8)
+
+print(framebuf.RGB565)
+test_constructor(bytearray(127), 8, 8, framebuf.RGB565)
+test_constructor(bytearray(128), 8, 8, framebuf.RGB565)
+test_constructor(bytearray(128), 9, 8, framebuf.RGB565)
+test_constructor(bytearray(128), 8, 9, framebuf.RGB565)
diff --git a/tests/extmod/framebuf_bounds.py.exp b/tests/extmod/framebuf_bounds.py.exp
new file mode 100644
index 0000000000000..3125013bc9880
--- /dev/null
+++ b/tests/extmod/framebuf_bounds.py.exp
@@ -0,0 +1,44 @@
+3
+Valid
+ValueError
+ValueError
+Valid
+Valid
+ValueError
+ValueError
+0
+Valid
+ValueError
+Valid
+3
+Valid
+ValueError
+Valid
+Valid
+ValueError
+4
+Valid
+ValueError
+Valid
+Valid
+ValueError
+5
+Valid
+ValueError
+Valid
+Valid
+2
+Valid
+ValueError
+Valid
+Valid
+6
+ValueError
+Valid
+ValueError
+ValueError
+1
+ValueError
+Valid
+ValueError
+ValueError

From 03a9fa227d323da7b239a1ef3fa84b0ef45a1621 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Oct 2023 22:33:14 +1100
Subject: [PATCH 0429/3129] extmod/modframebuf: Fix FrameBuffer get-buffer
 implementation.

This wasn't correctly accounting for the bits-per-pixel and was returning a
bufinfo struct with the incorrect length.  Instead, just forward directly
to the underlying buffer object.

Fixes issue #12563.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modframebuf.c          | 6 +-----
 tests/extmod/framebuf1.py     | 6 ++++++
 tests/extmod/framebuf1.py.exp | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index eabe819973578..c62ac4fe39612 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -336,12 +336,8 @@ STATIC void framebuf_args(const mp_obj_t *args_in, mp_int_t *args_out, int n) {
 }
 
 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);
-    bufinfo->buf = self->buf;
-    bufinfo->len = self->stride * self->height * (self->format == FRAMEBUF_RGB565 ? 2 : 1);
-    bufinfo->typecode = 'B'; // view framebuf as bytes
-    return 0;
+    return mp_get_buffer(self->buf_obj, bufinfo, flags) ? 0 : 1;
 }
 
 STATIC mp_obj_t framebuf_fill(mp_obj_t self_in, mp_obj_t col_in) {
diff --git a/tests/extmod/framebuf1.py b/tests/extmod/framebuf1.py
index d35674a709ad8..b1173d5368288 100644
--- a/tests/extmod/framebuf1.py
+++ b/tests/extmod/framebuf1.py
@@ -109,3 +109,9 @@
 fbuf = framebuf.FrameBuffer1(buf, w, h)
 fbuf = framebuf.FrameBuffer1(buf, w, h, w)
 print(framebuf.MVLSB == framebuf.MONO_VLSB)
+
+# test get-buffer (returns the original buffer)
+fbuf = framebuf.FrameBuffer(bytearray(2), 8, 1, framebuf.MONO_HLSB)
+fbuf.pixel(0, 0, 1)
+fbuf.pixel(4, 0, 1)
+print(bytearray(fbuf))
diff --git a/tests/extmod/framebuf1.py.exp b/tests/extmod/framebuf1.py.exp
index b9cd97835d60c..4f18e48eca6f1 100644
--- a/tests/extmod/framebuf1.py.exp
+++ b/tests/extmod/framebuf1.py.exp
@@ -66,3 +66,4 @@ bytearray(b'\n\x15\n\x15\n\x15\n\x15\x00\x00\x00\x00\x00\x00\x00\x00')
 
 ValueError
 True
+bytearray(b'\x88\x00')

From 8eb7721b4aa838608d6e3b28b96992e3d2db42b4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Oct 2023 22:42:12 +1100
Subject: [PATCH 0430/3129] extmod/modframebuf: Remove FrameBuffer1 from natmod
 build.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/framebuf/framebuf.c | 1 -
 extmod/modframebuf.c                | 2 +-
 tests/extmod/framebuf1.py           | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index 32b67eabcf84f..badc7ab46d7fa 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -36,7 +36,6 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     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));
     mp_store_global(MP_QSTR_MVLSB, MP_OBJ_NEW_SMALL_INT(FRAMEBUF_MVLSB));
     mp_store_global(MP_QSTR_MONO_VLSB, MP_OBJ_NEW_SMALL_INT(FRAMEBUF_MVLSB));
     mp_store_global(MP_QSTR_RGB565, MP_OBJ_NEW_SMALL_INT(FRAMEBUF_RGB565));
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index c62ac4fe39612..92313bd4bbe83 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -864,6 +864,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
+#if !MICROPY_ENABLE_DYNRUNTIME
 // This factory function is provided for backwards compatibility with the old
 // FrameBuffer1 class which did not support a format argument.
 STATIC mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args_in) {
@@ -872,7 +873,6 @@ STATIC mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(legacy_framebuffer1_obj, 3, 4, legacy_framebuffer1);
 
-#if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t framebuf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_framebuf) },
     { MP_ROM_QSTR(MP_QSTR_FrameBuffer), MP_ROM_PTR(&mp_type_framebuf) },
diff --git a/tests/extmod/framebuf1.py b/tests/extmod/framebuf1.py
index b1173d5368288..f5e92579f2fd7 100644
--- a/tests/extmod/framebuf1.py
+++ b/tests/extmod/framebuf1.py
@@ -106,8 +106,9 @@
     print("ValueError")
 
 # test legacy constructor
-fbuf = framebuf.FrameBuffer1(buf, w, h)
-fbuf = framebuf.FrameBuffer1(buf, w, h, w)
+if hasattr(framebuf, "FrameBuffer1"):
+    fbuf = framebuf.FrameBuffer1(buf, w, h)
+    fbuf = framebuf.FrameBuffer1(buf, w, h, w)
 print(framebuf.MVLSB == framebuf.MONO_VLSB)
 
 # test get-buffer (returns the original buffer)

From ac4f79592b9779d827c24df2ef2ff9ad8b7f1db8 Mon Sep 17 00:00:00 2001
From: Thomas Ackermann <th.acker.0302@gmail.com>
Date: Fri, 13 Oct 2023 12:27:21 +0000
Subject: [PATCH 0431/3129] docs/library/io: Remove io.FileIO and
 io.TextIOWrapper.

FileIO and TextIOWrapper were removed in
e65d1e69e88268145ff0e7e73240f028885915be.  Remove them also from the
documentation.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
---
 docs/library/io.rst | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/docs/library/io.rst b/docs/library/io.rst
index 6b4b9f1a476f6..caa59895227d4 100644
--- a/docs/library/io.rst
+++ b/docs/library/io.rst
@@ -86,16 +86,6 @@ Functions
 Classes
 -------
 
-.. class:: FileIO(...)
-
-    This is type of a file open in binary mode, e.g. using ``open(name, "rb")``.
-    You should not instantiate this class directly.
-
-.. class:: TextIOWrapper(...)
-
-    This is type of a file open in text mode, e.g. using ``open(name, "rt")``.
-    You should not instantiate this class directly.
-
 .. class:: StringIO([string])
 .. class:: BytesIO([string])
 

From 4074f828dd107cb5eb469b0d7338d3b39d0a99e9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 11 Oct 2023 14:45:35 +0200
Subject: [PATCH 0432/3129] stm32/boards/ARDUINO_GIGA: Add QSPI fix/workaround
 to early init.

This workaround fixes an issue with some production boards that have
an older QSPI flash part revision, which can't handle floating pins.
Note those pins can be reconfigured and reused later.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/board_init.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/board_init.c b/ports/stm32/boards/ARDUINO_GIGA/board_init.c
index bdec04643bf42..b072f00a247c3 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/board_init.c
+++ b/ports/stm32/boards/ARDUINO_GIGA/board_init.c
@@ -35,6 +35,14 @@ void GIGA_board_startup(void) {
 void GIGA_board_early_init(void) {
     HAL_InitTick(0);
 
+    // The following pins need to be configured at this point to fix an
+    // issue with some boards that have an older QSPI flash part revision.
+    mp_hal_pin_config(pin_PD13, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    __HAL_RCC_GPIOD_CLK_DISABLE();
+
+    mp_hal_pin_config(pin_PF7, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    __HAL_RCC_GPIOF_CLK_DISABLE();
+
     #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE == 1
     // The Arduino/mbed bootloader uses the MPU to protect sector 1
     // which is used for the flash filesystem. The following code

From f84b4617cb6e15f943ea81efeeafa651a9553445 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 10 Oct 2023 09:36:18 +0200
Subject: [PATCH 0433/3129] rp2/cyw43_configport: Use m_tracked_calloc and
 m_tracked_free.

When using malloc and free there were out-of-memory situations depending on
the arm-none-eabi package version.  This commit changes malloc/free to use
the MicroPython GC heap instead.

Signed-off-by: robert-hh <robert@hammelrath.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake | 3 ---
 ports/rp2/cyw43_configport.h                    | 9 +++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
index 5610c313e6527..cea6c38d73b4e 100644
--- a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
@@ -2,9 +2,6 @@
 
 set(PICO_BOARD "pico_w")
 
-# The C malloc is needed by cyw43-driver Bluetooth
-set(MICROPY_C_HEAP_SIZE 4096)
-
 set(MICROPY_PY_LWIP ON)
 set(MICROPY_PY_NETWORK_CYW43 ON)
 
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 929d83537b5b7..8f64762df561c 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -90,13 +90,14 @@
 
 #define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
 
-// Bluetooth uses the C heap to load its firmware (provided by pico-sdk).
-// Space is reserved for this, see MICROPY_C_HEAP_SIZE.
+// Bluetooth requires dynamic memory allocation to load its firmware (the allocation
+// call is made from pico-sdk).  This allocation is always done at thread-level, not
+// from an IRQ, so is safe to delegate to the MicroPython GC heap.
 #ifndef cyw43_malloc
-#define cyw43_malloc malloc
+#define cyw43_malloc(nmemb) m_tracked_calloc(nmemb, 1)
 #endif
 #ifndef cyw43_free
-#define cyw43_free free
+#define cyw43_free m_tracked_free
 #endif
 
 void cyw43_post_poll_hook(void);

From 8b12923da2490d37d70d0f3e3c3ac948fd150a3a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 16 Oct 2023 15:15:07 +0200
Subject: [PATCH 0434/3129] stm32/boards/ARDUINO_GIGA: Fix name of pins in
 board init.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/board_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/board_init.c b/ports/stm32/boards/ARDUINO_GIGA/board_init.c
index b072f00a247c3..eec2494614c3e 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/board_init.c
+++ b/ports/stm32/boards/ARDUINO_GIGA/board_init.c
@@ -37,10 +37,10 @@ void GIGA_board_early_init(void) {
 
     // The following pins need to be configured at this point to fix an
     // issue with some boards that have an older QSPI flash part revision.
-    mp_hal_pin_config(pin_PD13, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pin_D13, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
     __HAL_RCC_GPIOD_CLK_DISABLE();
 
-    mp_hal_pin_config(pin_PF7, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pin_F7, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
     __HAL_RCC_GPIOF_CLK_DISABLE();
 
     #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE == 1

From 51da8cc28bb6073588e4938489194f2f937006df Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Mon, 14 Aug 2023 18:38:44 +0200
Subject: [PATCH 0435/3129] stm32/eth: Add Ethernet support for H5 MCUs.

This commit implements Ethernet support for STM32H5.  Changes are:

- Add Cortex-M33 MPU code.  Ethernet driver requires MPU to define cache
  strategy for DMA buffers (descriptors and frames).
- Add support for STM32H5 Ethernet controller.  The controller is mostly
  compatible with the STM32H7.  However the descriptor layout is different.
- Adapt clocking and reset for STM32H5.

Tested on NUCLEO-H563ZI and STM32H573I-DK, using ping and iperf3.  TCP
rates of 80-90 Mbits/sec were achievable.

Signed-off-by: Rene Straub <rene@see5.ch>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/eth.c | 116 +++++++++++++++++++++++++++++++++-------------
 ports/stm32/mpu.h |  52 ++++++++++++++++++++-
 2 files changed, 136 insertions(+), 32 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index b01eee3f2b4a3..363357dac9ecd 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -62,7 +62,19 @@
 #define PHY_SCSR_SPEED_100FULL  (6 << PHY_SCSR_SPEED_Pos)
 
 // ETH DMA RX and TX descriptor definitions
-#if defined(STM32H7)
+#if defined(STM32H5)
+#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_FD_Pos       (29)
+#define TX_DESCR_3_LD_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)
+#elif defined(STM32H7)
 #define RX_DESCR_3_OWN_Pos      (31)
 #define RX_DESCR_3_IOC_Pos      (30)
 #define RX_DESCR_3_BUF1V_Pos    (24)
@@ -135,7 +147,7 @@ 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)
+    #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
     uint32_t ar = ETH->MACMDIOAR;
@@ -161,7 +173,7 @@ STATIC void eth_phy_write(uint32_t reg, uint32_t val) {
 }
 
 STATIC uint32_t eth_phy_read(uint32_t reg) {
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
     uint32_t ar = ETH->MACMDIOAR;
@@ -202,7 +214,11 @@ void eth_init(eth_t *self, int mac_idx) {
     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)
+    #if defined(STM32H5)
+    __HAL_RCC_ETH_CLK_ENABLE();
+    __HAL_RCC_ETHTX_CLK_ENABLE();
+    __HAL_RCC_ETHRX_CLK_ENABLE();
+    #elif defined(STM32H7)
     __HAL_RCC_ETH1MAC_CLK_ENABLE();
     __HAL_RCC_ETH1TX_CLK_ENABLE();
     __HAL_RCC_ETH1RX_CLK_ENABLE();
@@ -218,11 +234,20 @@ void eth_set_trace(eth_t *self, uint32_t value) {
 STATIC int eth_mac_init(eth_t *self) {
     // Configure MPU
     uint32_t irq_state = mpu_config_start();
+    #if defined(STM32H5)
+    mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(16 * 1024));
+    #else
     mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(MPU_REGION_SIZE_16KB));
+    #endif
     mpu_config_end(irq_state);
 
     // Enable peripheral clock
-    #if defined(STM32H7)
+    #if defined(STM32H5)
+    __HAL_RCC_ETH_CLK_ENABLE();
+    __HAL_RCC_ETHTX_CLK_ENABLE();
+    __HAL_RCC_ETHRX_CLK_ENABLE();
+    __HAL_RCC_ETH_FORCE_RESET();
+    #elif defined(STM32H7)
     __HAL_RCC_ETH1MAC_CLK_ENABLE();
     __HAL_RCC_ETH1TX_CLK_ENABLE();
     __HAL_RCC_ETH1RX_CLK_ENABLE();
@@ -233,14 +258,23 @@ STATIC int eth_mac_init(eth_t *self) {
     #endif
 
     // Select RMII interface
-    #if defined(STM32H7)
+    #if defined(STM32H5)
+    __HAL_RCC_SBS_CLK_ENABLE();
+    SBS->PMCR = (SBS->PMCR & ~SBS_PMCR_ETH_SEL_PHY_Msk) | SBS_PMCR_ETH_SEL_PHY_2;
+    #elif 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)
+    #if defined(STM32H5)
+    __HAL_RCC_ETH_RELEASE_RESET();
+
+    __HAL_RCC_ETH_CLK_SLEEP_ENABLE();
+    __HAL_RCC_ETHTX_CLK_SLEEP_ENABLE();
+    __HAL_RCC_ETHRX_CLK_SLEEP_ENABLE();
+    #elif defined(STM32H7)
     __HAL_RCC_ETH1MAC_RELEASE_RESET();
 
     __HAL_RCC_ETH1MAC_CLK_SLEEP_ENABLE();
@@ -255,7 +289,7 @@ STATIC int eth_mac_init(eth_t *self) {
     #endif
 
     // Do a soft reset of the MAC core
-    #if defined(STM32H7)
+    #if defined(STM32H5) || 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
@@ -277,7 +311,23 @@ 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)
+    #if defined(STM32H5)
+    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 if (hclk < 250000000) {
+        cr_div |= ETH_MACMDIOAR_CR_DIV102;
+    } else {
+        cr_div |= ETH_MACMDIOAR_CR_DIV124;
+    }
+    ETH->MACMDIOAR = cr_div;
+    #elif defined(STM32H7)
     cr_div = ETH->MACMDIOAR & ~ETH_MACMDIOAR_CR;
     if (hclk < 35000000) {
         cr_div |= ETH_MACMDIOAR_CR_DIV16;
@@ -306,7 +356,7 @@ STATIC int eth_mac_init(eth_t *self) {
     ETH->MACMIIAR = cr_div;
     #endif
 
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     // don't skip 32bit words since our descriptors are continuous in memory
     ETH->DMACCR &= ~(ETH_DMACCR_DSL_Msk);
     #endif
@@ -351,7 +401,7 @@ STATIC int eth_mac_init(eth_t *self) {
     uint16_t phy_scsr = eth_phy_read(PHY_SCSR);
 
     // Burst mode configuration
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     ETH->DMASBMR = ETH->DMASBMR & ~ETH_DMASBMR_AAL & ~ETH_DMASBMR_FB;
     #else
     ETH->DMABMR = 0;
@@ -359,7 +409,7 @@ STATIC int eth_mac_init(eth_t *self) {
     mp_hal_delay_ms(2);
 
     // Select DMA interrupts
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     ETH->DMACIER = ETH->DMACIER
         | ETH_DMACIER_NIE // enable normal interrupts
         | ETH_DMACIER_RIE // enable RX interrupt
@@ -373,7 +423,7 @@ STATIC int eth_mac_init(eth_t *self) {
 
     // Configure RX descriptor lists
     for (size_t i = 0; i < RX_BUF_NUM; ++i) {
-        #if defined(STM32H7)
+        #if defined(STM32H5) || defined(STM32H7)
         eth_dma.rx_descr[i].rdes3 =
             1 << RX_DESCR_3_OWN_Pos
                 | (1 << RX_DESCR_3_BUF1V_Pos) // buf1 address valid
@@ -391,7 +441,7 @@ STATIC int eth_mac_init(eth_t *self) {
         #endif
     }
 
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     ETH->DMACRDLAR = (uint32_t)&eth_dma.rx_descr[0];
     #else
     ETH->DMARDLAR = (uint32_t)&eth_dma.rx_descr[0];
@@ -400,7 +450,7 @@ STATIC int eth_mac_init(eth_t *self) {
 
     // Configure TX descriptor lists
     for (size_t i = 0; i < TX_BUF_NUM; ++i) {
-        #if defined(STM32H7)
+        #if defined(STM32H5) || 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;
@@ -413,7 +463,7 @@ STATIC int eth_mac_init(eth_t *self) {
         #endif
     }
 
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     // set number of descriptors and buffers
     ETH->DMACTDRLR = TX_BUF_NUM - 1;
     ETH->DMACRDRLR = RX_BUF_NUM - 1;
@@ -425,7 +475,7 @@ STATIC int eth_mac_init(eth_t *self) {
     eth_dma.tx_descr_idx = 0;
 
     // Configure DMA
-    #if defined(STM32H7)
+    #if defined(STM32H5) || 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
@@ -439,7 +489,7 @@ STATIC int eth_mac_init(eth_t *self) {
     mp_hal_delay_ms(2);
 
     // Select MAC filtering options
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     ETH->MACPFR = ETH_MACPFR_RA; // pass all frames up
     #else
     ETH->MACFFR =
@@ -472,7 +522,7 @@ STATIC int eth_mac_init(eth_t *self) {
     mp_hal_delay_ms(2);
 
     // Start DMA layer
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     ETH->DMACRCR |= ETH_DMACRCR_SR; // start RX
     ETH->DMACTCR |= ETH_DMACTCR_ST; // start TX
     #else
@@ -493,7 +543,11 @@ 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)
+    #if defined(STM32H5)
+    __HAL_RCC_ETH_FORCE_RESET();
+    __HAL_RCC_ETH_RELEASE_RESET();
+    __HAL_RCC_ETH_CLK_DISABLE();
+    #elif defined(STM32H7)
     __HAL_RCC_ETH1MAC_FORCE_RESET();
     __HAL_RCC_ETH1MAC_RELEASE_RESET();
     __HAL_RCC_ETH1MAC_CLK_DISABLE();
@@ -513,7 +567,7 @@ 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 defined(STM32H5) || defined(STM32H7)
         if (!(tx_descr->tdes3 & (1 << TX_DESCR_3_OWN_Pos))) {
             break;
         }
@@ -527,7 +581,7 @@ STATIC int eth_tx_buf_get(size_t len, uint8_t **buf) {
         }
     }
 
-    #if defined(STM32H7)
+    #if defined(STM32H5) || 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;
@@ -549,7 +603,7 @@ 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)
+    #if defined(STM32H5) || defined(STM32H7)
     tx_descr->tdes3 =
         1 << TX_DESCR_3_OWN_Pos     // owned by DMA
             | 1 << TX_DESCR_3_LD_Pos // last segment
@@ -568,7 +622,7 @@ STATIC int eth_tx_buf_send(void) {
 
     // Notify ETH DMA that there is a new TX descriptor for sending
     __DMB();
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     if (ETH->DMACSR & ETH_DMACSR_TBU) {
         ETH->DMACSR = ETH_DMACSR_TBU;
     }
@@ -590,7 +644,7 @@ 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)
+    #if defined(STM32H5) || 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
@@ -607,7 +661,7 @@ STATIC void eth_dma_rx_free(void) {
 
     // Notify ETH DMA that there is a new RX descriptor available
     __DMB();
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     ETH->DMACRDTPR = (uint32_t)&rx_descr[eth_dma.rx_descr_idx];
     #else
     ETH->DMARPDR = 0;
@@ -615,7 +669,7 @@ STATIC void eth_dma_rx_free(void) {
 }
 
 void ETH_IRQHandler(void) {
-    #if defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7)
     uint32_t sr = ETH->DMACSR;
     ETH->DMACSR = ETH_DMACSR_NIS;
     uint32_t rx_interrupt = sr & ETH_DMACSR_RI;
@@ -625,13 +679,13 @@ void ETH_IRQHandler(void) {
     uint32_t rx_interrupt = sr & ETH_DMASR_RS;
     #endif
     if (rx_interrupt) {
-        #if defined(STM32H7)
+        #if defined(STM32H5) || defined(STM32H7)
         ETH->DMACSR = ETH_DMACSR_RI;
         #else
         ETH->DMASR = ETH_DMASR_RS;
         #endif
         for (;;) {
-            #if defined(STM32H7)
+            #if defined(STM32H5) || 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
@@ -646,13 +700,13 @@ void ETH_IRQHandler(void) {
             #endif
 
             // Get RX buffer containing new frame
-            #if defined(STM32H7)
+            #if defined(STM32H5) || 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)
+            #if defined(STM32H5) || 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;
diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index 106112073e477..e95a07da91a89 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_MPU_H
 #define MICROPY_INCLUDED_STM32_MPU_H
 
-#if defined(STM32F7) || defined(STM32H7) || defined(MICROPY_HW_ETH_MDC)
+#if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F7) || defined(STM32H7)
 
 #define MPU_REGION_ETH      (MPU_REGION_NUMBER0)
 #define MPU_REGION_QSPI1    (MPU_REGION_NUMBER1)
@@ -97,9 +97,16 @@ static inline void mpu_config_end(uint32_t irq_state) {
 
 #elif defined(STM32H5)
 
+#define MPU_REGION_SIG      (MPU_REGION_NUMBER0)
+#define MPU_REGION_ETH      (MPU_REGION_NUMBER1)
+
 #define ST_DEVICE_SIGNATURE_BASE (0x08fff800)
 #define ST_DEVICE_SIGNATURE_LIMIT (0x08ffffff)
 
+// STM32H5 Cortex-M33 MPU works differently from older cores.
+// Macro only takes region size in bytes, Attributes are coded in mpu_config_region().
+#define MPU_CONFIG_ETH(size) (size)
+
 static inline void mpu_init(void) {
     // Configure attribute 0, inner-outer non-cacheable (=0x44).
     __DMB();
@@ -125,6 +132,49 @@ static inline void mpu_init(void) {
     __ISB();
 }
 
+static inline uint32_t mpu_config_start(void) {
+    return disable_irq();
+}
+
+static inline void mpu_config_region(uint32_t region, uint32_t base_addr, uint32_t size) {
+    if (region == MPU_REGION_ETH) {
+        // Configure region 1 to make DMA memory non-cacheable.
+
+        __DMB();
+        // Configure attribute 1, inner-outer non-cacheable (=0x44).
+        MPU->MAIR0 = (MPU->MAIR0 & ~MPU_MAIR0_Attr1_Msk)
+            | 0x44 << MPU_MAIR0_Attr1_Pos;
+        __DMB();
+
+        // RBAR
+        //  BASE          Bits [31:5] of base address
+        //  SH[4:3]  00 = Non-shareable
+        //  AP[2:1]  01 = Read/write by any privilege level
+        //  XN[0]:    1 = No execution
+
+        // RLAR
+        //  LIMIT         Limit address. Contains bits[31:5] of the upper inclusive limit of the selected MPU memory region
+        //  AT[3:1] 001 = Attribute 1
+        //  EN[0]     1 = Enabled
+        MPU->RNR = region;
+        MPU->RBAR = (base_addr & MPU_RBAR_BASE_Msk)
+            | MPU_ACCESS_NOT_SHAREABLE << MPU_RBAR_SH_Pos
+            | MPU_REGION_ALL_RW << MPU_RBAR_AP_Pos
+            | MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RBAR_XN_Pos;
+        MPU->RLAR = ((base_addr + size - 1) & MPU_RLAR_LIMIT_Msk)
+            | MPU_ATTRIBUTES_NUMBER1 << MPU_RLAR_AttrIndx_Pos
+            | MPU_REGION_ENABLE << MPU_RLAR_EN_Pos;
+    }
+    __DMB();
+}
+
+static inline void mpu_config_end(uint32_t irq_state) {
+    __ISB();
+    __DSB();
+    __DMB();
+    enable_irq(irq_state);
+}
+
 #else
 
 static inline void mpu_init(void) {

From e15882ad2bfaf342e8e966a84877f338eabd1430 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 Oct 2023 11:44:16 +1100
Subject: [PATCH 0436/3129] stm32/boards/STM32H573I_DK: Enable ETH and DAC
 peripherals.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/STM32H573I_DK/manifest.py      |  2 ++
 ports/stm32/boards/STM32H573I_DK/mpconfigboard.h  | 13 ++++++++++++-
 ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk |  7 +++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ports/stm32/boards/STM32H573I_DK/manifest.py

diff --git a/ports/stm32/boards/STM32H573I_DK/manifest.py b/ports/stm32/boards/STM32H573I_DK/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/STM32H573I_DK/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
index 01064325dafba..fba14329a5ce9 100644
--- a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
+++ b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
@@ -6,7 +6,7 @@
 #define MICROPY_HW_ENABLE_RTC               (1)
 #define MICROPY_HW_ENABLE_RNG               (1)
 #define MICROPY_HW_ENABLE_ADC               (1)
-#define MICROPY_HW_ENABLE_DAC               (0) // requires DMA
+#define MICROPY_HW_ENABLE_DAC               (1)
 #define MICROPY_HW_ENABLE_USB               (1)
 #define MICROPY_HW_HAS_SWITCH               (1)
 #define MICROPY_HW_HAS_FLASH                (1)
@@ -106,6 +106,17 @@
 #define MICROPY_HW_USB_FS                   (1)
 #define MICROPY_HW_USB_MAIN_DEV             (USB_PHY_FS_ID)
 
+// 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)
+
 /******************************************************************************/
 // Variable and function declarations
 
diff --git a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk
index 99d3923f203c0..9da249879b88f 100644
--- a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.mk
@@ -13,3 +13,10 @@ else
 LD_FILES = boards/stm32h573xi.ld boards/common_basic.ld
 TEXT0_ADDR = 0x08000000
 endif
+
+# MicroPython settings
+MICROPY_PY_LWIP = 1
+MICROPY_PY_SSL = 1
+MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py

From 971f1cf987583d5607ec1563f9261b9b7fb0cafa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 Oct 2023 12:41:47 +1100
Subject: [PATCH 0437/3129] stm32/powerctrl: Add support for frequency scaling
 with HSI on H5 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/pllvalues.py | 14 ++++++++++----
 ports/stm32/powerctrl.c         | 22 +++++++++++++++++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 76320cc9c3838..2db6b5f257044 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -41,6 +41,15 @@ def __init__(
         range_vco_in=range(1, 2 + 1),
         range_vco_out=range(100, 432 + 1),
     ),
+    "stm32h5": MCU(
+        range_sysclk=range(2, 250 + 1, 2),
+        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, 836 + 1),  # 150-420=medium, 192-836=wide
+    ),
     "stm32h7": MCU(
         range_sysclk=range(2, 400 + 1, 2),  # above 400MHz currently unsupported
         range_m=range(1, 63 + 1),
@@ -274,9 +283,6 @@ def main():
         hse, hsi = search_header_for_hsx_values(argv[0][5:], [None, None])
         if hse is None:
             raise ValueError("%s does not contain a definition of HSE_VALUE" % argv[0])
-        if hsi is not None and hsi > 16:
-            # Currently, a HSI value greater than 16MHz is not supported
-            hsi = None
     else:
         # HSE given directly as an integer
         hse = int(argv[0])
@@ -289,7 +295,7 @@ def main():
             break
 
     # Relax constraint on PLLQ being 48MHz on MCUs which have separate PLLs for 48MHz
-    relax_pll48 = mcu_series.startswith(("stm32f413", "stm32f7", "stm32h7"))
+    relax_pll48 = mcu_series.startswith(("stm32f413", "stm32f7", "stm32h5", "stm32h7"))
 
     hse_valid_plls = compute_pll_table(hse, relax_pll48)
     if hsi is not None:
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 80195f04aeb38..03224f4d8b323 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -498,6 +498,9 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     RCC_OscInitStruct.OscillatorType = MICROPY_HW_RCC_OSCILLATOR_TYPE;
     RCC_OscInitStruct.HSEState = MICROPY_HW_RCC_HSE_STATE;
     RCC_OscInitStruct.HSIState = MICROPY_HW_RCC_HSI_STATE;
+    #if defined(STM32G0) || defined(STM32H5)
+    RCC_OscInitStruct.HSIDiv = RCC_HSI_DIV1;
+    #endif
     RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
     RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
     RCC_OscInitStruct.PLL.PLLSource = MICROPY_HW_RCC_PLL_SRC;
@@ -506,7 +509,24 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     RCC_OscInitStruct.PLL.PLLP = p;
     RCC_OscInitStruct.PLL.PLLQ = q;
 
-    #if defined(STM32H7)
+    #if defined(STM32H5)
+    RCC_OscInitStruct.PLL.PLLR = 0;
+    if (MICROPY_HW_CLK_VALUE / 1000000 <= 2 * m) {
+        RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1_VCIRANGE_0; // 1-2MHz
+    } else if (MICROPY_HW_CLK_VALUE / 1000000 <= 4 * m) {
+        RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1_VCIRANGE_1; // 2-4MHz
+    } else if (MICROPY_HW_CLK_VALUE / 1000000 <= 8 * m) {
+        RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1_VCIRANGE_2; // 4-8MHz
+    } else {
+        RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1_VCIRANGE_3; // 8-16MHz
+    }
+    if (MICROPY_HW_CLK_VALUE / 1000000 * n <= 420 * m) {
+        RCC_OscInitStruct.PLL.PLLVCOSEL = RCC_PLL1_VCORANGE_MEDIUM; // 150-420MHz
+    } else {
+        RCC_OscInitStruct.PLL.PLLVCOSEL = RCC_PLL1_VCORANGE_WIDE; // 192-836MHz
+    }
+    RCC_OscInitStruct.PLL.PLLFRACN = 0;
+    #elif defined(STM32H7)
     RCC_OscInitStruct.PLL.PLLR = 0;
     if (MICROPY_HW_CLK_VALUE / 1000000 <= 2 * m) {
         RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1VCIRANGE_0; // 1-2MHz

From c2361328e156a3de46aa69acdc11d111c26c5c98 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Oct 2023 12:47:04 +1100
Subject: [PATCH 0438/3129] github/workflows: Pin ruff to 0.1.0 and change
 flags for new version.

The `--format` flag was changed to `--output-format` in the recent update.

Pin to this version to prevent further updates from breaking (e.g. through
new rules or other changes).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/ruff.yml | 4 ++--
 .pre-commit-config.yaml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 806d95e8954b0..0374d766f5553 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -6,5 +6,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: pip install --user ruff
-    - run: ruff --format=github .
+    - run: pip install --user ruff==0.1.0
+    - run: ruff check --output-format=github .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e9815a4b2e64c..bfce6a2468b55 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,6 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.265
+    rev: v0.1.0
     hooks:
       - id: ruff

From 64ad6764240e5cf59a8c38272226569fdbf8071d Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Mon, 21 Aug 2023 20:03:52 -0700
Subject: [PATCH 0439/3129] mimxrt/boards: Define missing SNVS pins for all
 processors.

Signed-off-by: "Kwabena W. Agyeman" <kwagyeman@live.com>
---
 ports/mimxrt/boards/MIMXRT1011_af.csv | 1 +
 ports/mimxrt/boards/MIMXRT1015_af.csv | 1 +
 ports/mimxrt/boards/MIMXRT1021_af.csv | 1 +
 ports/mimxrt/boards/MIMXRT1052_af.csv | 3 +++
 ports/mimxrt/boards/MIMXRT1062_af.csv | 6 +++---
 ports/mimxrt/boards/MIMXRT1064_af.csv | 3 +++
 ports/mimxrt/boards/MIMXRT1176_af.csv | 2 ++
 ports/mimxrt/boards/make-pins.py      | 6 ++++--
 8 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1011_af.csv b/ports/mimxrt/boards/MIMXRT1011_af.csv
index 11dd08546332b..be8a9c634dd55 100644
--- a/ports/mimxrt/boards/MIMXRT1011_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1011_af.csv
@@ -42,3 +42,4 @@ GPIO_SD_10,FLEXSPI_A_SCLK,LPSPI2_SDO,LPUART2_TXD,,FLEXIO1_IO16,GPIO2_IO10,,,,,,,
 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
+PMIC_ON_REQ,SNVS_LP_PMIC_ON_REQ,,,,,GPIO5_IO00,,,,,,,ALT0
diff --git a/ports/mimxrt/boards/MIMXRT1015_af.csv b/ports/mimxrt/boards/MIMXRT1015_af.csv
index d9886625830a2..0d2504733c1b1 100644
--- a/ports/mimxrt/boards/MIMXRT1015_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1015_af.csv
@@ -55,3 +55,4 @@ 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
+PMIC_ON_REQ,SNVS_LP_PMIC_ON_REQ,,,,,GPIO5_IO01,,,,,,,ALT0
diff --git a/ports/mimxrt/boards/MIMXRT1021_af.csv b/ports/mimxrt/boards/MIMXRT1021_af.csv
index 3ce38eb0b9a46..79ef29927c978 100644
--- a/ports/mimxrt/boards/MIMXRT1021_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1021_af.csv
@@ -92,3 +92,4 @@ GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,ENET_RX_ER,SAI3_TX_DATA,LPSPI2_SDO,GP
 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
+PMIC_ON_REQ,SNVS_LP_PMIC_ON_REQ,,,,,GPIO5_IO01,,,,,,,ALT0
diff --git a/ports/mimxrt/boards/MIMXRT1052_af.csv b/ports/mimxrt/boards/MIMXRT1052_af.csv
index 754bf4ab7bf0f..ee11a12cfdc79 100644
--- a/ports/mimxrt/boards/MIMXRT1052_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1052_af.csv
@@ -123,3 +123,6 @@ GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,
 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
+WAKEUP,,,,,,GPIO5_IO00,,NMI_GLUE_NMI,,,,,ALT5
+PMIC_ON_REQ,SNVS_LP_PMIC_ON_REQ,,,,,GPIO5_IO01,,,,,,,ALT0
+PMIC_STBY_REQ,CCM_PMIC_VSTBY_REQ,,,,,GPIO5_IO02,,,,,,,ALT0
diff --git a/ports/mimxrt/boards/MIMXRT1062_af.csv b/ports/mimxrt/boards/MIMXRT1062_af.csv
index d2f0b22023cda..9af33137ab63f 100644
--- a/ports/mimxrt/boards/MIMXRT1062_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1062_af.csv
@@ -123,6 +123,6 @@ GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,
 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
-WAKEUP,,,,,,GPIO5_IO00,,NMI,,,,,ALT5
-PMIC_ON_REQ,SNVS_PMIC_ON_REQ,,,,,GPIO5_IO01,,,,,,,ALT0
-PMIC_STBY_REQ,CCM_PMIC_STBY_REQ,,,,,GPIO5_IO02,,,,,,,ALT0
+WAKEUP,,,,,,GPIO5_IO00,,NMI_GLUE_NMI,,,,,ALT5
+PMIC_ON_REQ,SNVS_LP_PMIC_ON_REQ,,,,,GPIO5_IO01,,,,,,,ALT0
+PMIC_STBY_REQ,CCM_PMIC_VSTBY_REQ,,,,,GPIO5_IO02,,,,,,,ALT0
diff --git a/ports/mimxrt/boards/MIMXRT1064_af.csv b/ports/mimxrt/boards/MIMXRT1064_af.csv
index 074a3f69ab3b4..bcd063ff3d1aa 100644
--- a/ports/mimxrt/boards/MIMXRT1064_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1064_af.csv
@@ -123,3 +123,6 @@ GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,
 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
+WAKEUP,,,,,,GPIO5_IO00,,NMI_GLUE_NMI,,,,,ALT5
+PMIC_ON_REQ,SNVS_LP_PMIC_ON_REQ,,,,,GPIO5_IO01,,,,,,,ALT0
+PMIC_STBY_REQ,CCM_PMIC_VSTBY_REQ,,,,,GPIO5_IO02,,,,,,,ALT0
diff --git a/ports/mimxrt/boards/MIMXRT1176_af.csv b/ports/mimxrt/boards/MIMXRT1176_af.csv
index 21fd2a24178ba..5e99a49003af7 100644
--- a/ports/mimxrt/boards/MIMXRT1176_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1176_af.csv
@@ -107,6 +107,8 @@ GPIO_LPSR_13,JTAG_MUX_MOD,MIC_BITSTREAM1,PIT2_TRIGGER1,,,GPIO6_IO13,,SAI4_RX_DAT
 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,,,,,,
+PMIC_ON_REQ_DIG,SNVS_LP_PMIC_ON_REQ,,,,,GPIO13_IO01,,,,,,,,
+PMIC_STBY_REQ_DIG,CCM_PMIC_VSTBY_REQ,,,,,GPIO13_IO02,,,,,,,,
 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,,,
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index 51ae9eb717c8c..5795e2f0421c1 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -25,8 +25,8 @@
     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+)",
     r"IOMUXC_[SNVS_]*(?P<pin>WAKEUP[_DIG]*)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
-    r"IOMUXC_SNVS_(?P<pin>PMIC_ON_REQ)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
-    r"IOMUXC_SNVS_(?P<pin>PMIC_STBY_REQ)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_[SNVS_]*(?P<pin>PMIC_ON_REQ[_DIG]*)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_[SNVS_]*(?P<pin>PMIC_STBY_REQ[_DIG]*)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
     r"IOMUXC_(?P<pin>GPIO_SNVS_\d\d_DIG)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
 ]
 
@@ -152,7 +152,9 @@ def print(self):
                 "WAKEUP": "PIN_SNVS",
                 "WAKEUP_DIG": "PIN_SNVS",
                 "PMIC_ON_REQ": "PIN_SNVS",
+                "PMIC_ON_REQ_DIG": "PIN_SNVS",
                 "PMIC_STBY_REQ": "PIN_SNVS",
+                "PMIC_STBY_REQ_DIG": "PIN_SNVS",
             }
 
             print(

From 433158076fba1de8dd48494dc35c3c3d1cd251e0 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Thu, 10 Aug 2023 11:16:19 -0700
Subject: [PATCH 0440/3129] mimxrt/machine_rtc: Add RTC alarm/wakeup
 functionality.

Following the documented Python machine.RTC API.

Signed-off-by: "Kwabena W. Agyeman" <kwagyeman@live.com>
---
 ports/mimxrt/machine_rtc.c | 224 ++++++++++++++++++++++++++++++++++++-
 ports/mimxrt/main.c        |   1 +
 ports/mimxrt/modmachine.h  |   1 +
 3 files changed, 225 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 54a19dacb4335..2a2800530128b 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -25,16 +25,117 @@
  * THE SOFTWARE.
  */
 
+#include "py/mperrno.h"
 #include "py/runtime.h"
+#include "shared/runtime/mpirq.h"
 #include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "ticks.h"
 #include "fsl_snvs_lp.h"
 #include "fsl_snvs_hp.h"
 
+STATIC mp_int_t timeout = 0;
+
+void machine_rtc_alarm_clear_en(void) {
+    SNVS_LP_SRTC_DisableInterrupts(SNVS, SNVS_LPCR_LPTA_EN_MASK);
+    while (SNVS->LPCR & SNVS_LPCR_LPTA_EN_MASK) {
+    }
+}
+
+void machine_rtc_alarm_set_en() {
+    SNVS_LP_SRTC_EnableInterrupts(SNVS, SNVS_LPCR_LPTA_EN_MASK);
+    while (!(SNVS->LPCR & SNVS_LPCR_LPTA_EN_MASK)) {
+    }
+}
+
+void machine_rtc_alarm_off(bool clear) {
+    machine_rtc_alarm_clear_en();
+    DisableIRQ(SNVS_HP_WRAPPER_IRQn);
+
+    if (clear) {
+        SNVS->LPTAR = 0;
+        timeout = 0;
+        SNVS->LPSR = SNVS_LPSR_LPTA_MASK;
+    }
+}
+
+void machine_rtc_alarm_on() {
+    EnableIRQ(SNVS_HP_WRAPPER_IRQn);
+    machine_rtc_alarm_set_en();
+}
+
+uint32_t machine_rtc_get_seconds() {
+    uint32_t seconds = 0;
+    uint32_t tmp = 0;
+
+    // Do consecutive reads until value is correct
+    do {
+        seconds = tmp;
+        tmp = (SNVS->LPSRTCMR << 17U);
+        tmp |= (SNVS->LPSRTCLR >> 15U);
+    } while (tmp != seconds);
+
+    return seconds;
+}
+
+void machine_rtc_alarm_helper(int seconds, bool repeat) {
+    machine_rtc_alarm_off(true);
+
+    SNVS->LPTAR = machine_rtc_get_seconds() + seconds;
+
+    if (repeat) {
+        timeout = seconds;
+    }
+
+    machine_rtc_alarm_on();
+}
+
+typedef struct _machine_rtc_irq_obj_t {
+    mp_irq_obj_t base;
+} machine_rtc_irq_obj_t;
+
+STATIC mp_uint_t machine_rtc_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    new_trigger /= 1000;
+    if (!new_trigger) {
+        machine_rtc_alarm_off(true);
+    } else {
+        machine_rtc_alarm_helper(new_trigger, true);
+    }
+    return 0;
+}
+
+STATIC mp_uint_t machine_rtc_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    return 0;
+}
+
+STATIC const mp_irq_methods_t machine_rtc_irq_methods = {
+    .trigger = machine_rtc_irq_trigger,
+    .info = machine_rtc_irq_info,
+};
+
+void SNVS_HP_WRAPPER_IRQHandler(void) {
+    if (SNVS->LPSR & SNVS_LPSR_LPTA_MASK) {
+        SNVS->LPSR = SNVS_LPSR_LPTA_MASK;
+        machine_rtc_irq_obj_t *irq = MP_STATE_PORT(machine_rtc_irq_object);
+        if (irq != NULL) {
+            mp_irq_handler(&irq->base);
+        }
+        if (timeout > 0) {
+            machine_rtc_alarm_clear_en();
+            SNVS->LPTAR += timeout;
+            machine_rtc_alarm_set_en();
+        }
+    }
+}
+
+// Deinit rtc IRQ handler.
+void machine_rtc_irq_deinit(void) {
+    machine_rtc_alarm_off(true);
+    MP_STATE_PORT(machine_rtc_irq_object) = NULL;
+}
+
 typedef struct _machine_rtc_obj_t {
     mp_obj_base_t base;
-    mp_obj_t callback;
 } machine_rtc_obj_t;
 
 // Singleton RTC object.
@@ -163,11 +264,130 @@ STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t cal_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_calibration_obj, machine_rtc_calibration);
 
+STATIC mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    STATIC const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id,                            MP_ARG_INT,  {.u_int = 0} },
+        { MP_QSTR_time,                          MP_ARG_OBJ,  {.u_obj = mp_const_none} },
+        { MP_QSTR_repeat,     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 - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), allowed_args, args);
+
+    // check the alarm id
+    if (args[0].u_int != 0) {
+        mp_raise_OSError(MP_ENODEV);
+    }
+
+    mp_int_t seconds = 0;
+    snvs_lp_srtc_datetime_t srtc_date;
+    bool repeat = args[2].u_bool;
+    if (mp_obj_is_type(args[1].u_obj, &mp_type_tuple)) { // datetime tuple given
+        // repeat cannot be used with a datetime tuple
+        if (repeat) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
+        }
+        // Set date and time.
+        mp_obj_t *items;
+        mp_int_t year;
+        mp_obj_get_array_fixed_n(args[1].u_obj, 8, &items);
+
+        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]);
+        // 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]);
+        machine_rtc_alarm_off(true);
+        if (SNVS_LP_SRTC_SetAlarm(SNVS, &srtc_date) != kStatus_Success) {
+            mp_raise_ValueError(NULL);
+        }
+        machine_rtc_alarm_on();
+    } else { // then it must be an integer
+        seconds = (args[1].u_obj == mp_const_none) ? 0 : (mp_obj_get_int(args[1].u_obj) / 1000);
+        machine_rtc_alarm_helper(seconds, repeat);
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_alarm_obj, 1, machine_rtc_alarm);
+
+STATIC mp_obj_t machine_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
+    // only alarm id 0 is available
+    if (n_args > 1 && mp_obj_get_int(args[1]) != 0) {
+        mp_raise_OSError(MP_ENODEV);
+    }
+    uint32_t seconds = machine_rtc_get_seconds();
+    uint32_t alarmSeconds = SNVS->LPTAR;
+    return mp_obj_new_int((alarmSeconds >= seconds) ? ((alarmSeconds - seconds) * 1000) : 0);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_alarm_left_obj, 1, 2, machine_rtc_alarm_left);
+
+STATIC mp_obj_t machine_rtc_alarm_cancel(size_t n_args, const mp_obj_t *args) {
+    // only alarm id 0 is available
+    if (n_args > 1 && mp_obj_get_int(args[1]) != 0) {
+        mp_raise_OSError(MP_ENODEV);
+    }
+    machine_rtc_alarm_off(true);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_alarm_cancel_obj, 1, 2, machine_rtc_alarm_cancel);
+
+STATIC mp_obj_t machine_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_trigger, ARG_handler, ARG_wake, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_trigger, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_handler, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_wake, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+
+    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);
+
+    // check we want alarm0
+    if (args[ARG_trigger].u_int != 0) {
+        mp_raise_OSError(MP_ENODEV);
+    }
+
+    machine_rtc_irq_obj_t *irq = MP_STATE_PORT(machine_rtc_irq_object);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(machine_rtc_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&machine_rtc_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(pos_args[0]);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        MP_STATE_PORT(machine_rtc_irq_object) = irq;
+    }
+
+    machine_rtc_alarm_off(false);
+
+    irq->base.handler = args[ARG_handler].u_obj;
+
+    if (SNVS->LPTAR) {
+        machine_rtc_alarm_on();
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_irq_obj, 1, machine_rtc_irq);
+
 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_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
+    { MP_ROM_QSTR(MP_QSTR_alarm), MP_ROM_PTR(&machine_rtc_alarm_obj) },
+    { MP_ROM_QSTR(MP_QSTR_alarm_left), MP_ROM_PTR(&machine_rtc_alarm_left_obj) },
+    { MP_ROM_QSTR(MP_QSTR_alarm_cancel), MP_ROM_PTR(&machine_rtc_alarm_cancel_obj) },
+    { MP_ROM_QSTR(MP_QSTR_cancel), MP_ROM_PTR(&machine_rtc_alarm_cancel_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_rtc_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ALARM0), MP_ROM_INT(0) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
@@ -178,3 +398,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     make_new, machine_rtc_make_new,
     locals_dict, &machine_rtc_locals_dict
     );
+
+MP_REGISTER_ROOT_POINTER(void *machine_rtc_irq_object);
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index f5d57d530e173..376d72f197f30 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -141,6 +141,7 @@ int main(void) {
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         machine_pin_irq_deinit();
+        machine_rtc_irq_deinit();
         #if MICROPY_PY_MACHINE_I2S
         machine_i2s_deinit_all();
         #endif
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 904419df2cc8a..d00d2031c4772 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -42,6 +42,7 @@ extern const mp_obj_type_t machine_wdt_type;
 
 void machine_adc_init(void);
 void machine_pin_irq_deinit(void);
+void machine_rtc_irq_deinit(void);
 void machine_pwm_deinit_all(void);
 void machine_uart_deinit_all(void);
 void machine_timer_init_PIT(void);

From e78471416bc77d5355e2181047e57f1e45d3654c Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Thu, 10 Aug 2023 11:18:48 -0700
Subject: [PATCH 0441/3129] mimxrt/modmachine: Add support for
 machine.deepsleep.

Signed-off-by: "Kwabena W. Agyeman" <kwagyeman@live.com>
---
 ports/mimxrt/Makefile      |  1 +
 ports/mimxrt/machine_rtc.c |  8 +++++++
 ports/mimxrt/modmachine.c  | 46 ++++++++++++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.h  |  2 +-
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index f44518a8aa132..3521f922887ff 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -128,6 +128,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_edma.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
 	$(MCU_DIR)/drivers/fsl_flexspi.c \
+	$(MCU_DIR)/drivers/fsl_gpc.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
 	$(MCU_DIR)/drivers/fsl_gpt.c \
 	$(MCU_DIR)/drivers/fsl_lpi2c.c \
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 2a2800530128b..169ec6b910eac 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -50,7 +50,11 @@ void machine_rtc_alarm_set_en() {
 
 void machine_rtc_alarm_off(bool clear) {
     machine_rtc_alarm_clear_en();
+    #ifdef MIMXRT117x_SERIES
+    DisableIRQ(SNVS_HP_NON_TZ_IRQn);
+    #else
     DisableIRQ(SNVS_HP_WRAPPER_IRQn);
+    #endif
 
     if (clear) {
         SNVS->LPTAR = 0;
@@ -60,7 +64,11 @@ void machine_rtc_alarm_off(bool clear) {
 }
 
 void machine_rtc_alarm_on() {
+    #ifdef MIMXRT117x_SERIES
+    EnableIRQ(SNVS_HP_NON_TZ_IRQn);
+    #else
     EnableIRQ(SNVS_HP_WRAPPER_IRQn);
+    #endif
     machine_rtc_alarm_set_en();
 }
 
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 423a67d6095f2..16eae22029b58 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -37,6 +37,12 @@
 #include "led.h"
 #include "pin.h"
 #include "modmachine.h"
+#include "fsl_gpc.h"
+#ifdef MIMXRT117x_SERIES
+#include "fsl_soc_src.h"
+#else
+#include "fsl_src.h"
+#endif
 #include "fsl_wdog.h"
 #if FSL_FEATURE_BOOT_ROM_HAS_ROMAPI
 #include "fsl_romapi.h"
@@ -74,6 +80,14 @@ STATIC mp_obj_t machine_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 STATIC mp_obj_t machine_reset_cause(void) {
+    #ifdef MIMXRT117x_SERIES
+    uint32_t user_reset_flag = kSRC_M7CoreIppUserResetFlag;
+    #else
+    uint32_t user_reset_flag = kSRC_IppUserResetFlag;
+    #endif
+    if (SRC->SRSR & user_reset_flag) {
+        return MP_OBJ_NEW_SMALL_INT(MP_DEEPSLEEP_RESET);
+    }
     uint16_t reset_cause =
         WDOG_GetStatusFlags(WDOG1) & (kWDOG_PowerOnResetFlag | kWDOG_TimeoutResetFlag | kWDOG_SoftwareResetFlag);
     if (reset_cause == kWDOG_PowerOnResetFlag) {
@@ -98,6 +112,37 @@ STATIC mp_obj_t machine_idle(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 
+STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    if (n_args != 0) {
+        mp_int_t seconds = mp_obj_get_int(args[0]) / 1000;
+        if (seconds > 0) {
+            machine_rtc_alarm_helper(seconds, false);
+            #ifdef MIMXRT117x_SERIES
+            GPC_CM_EnableIrqWakeup(GPC_CPU_MODE_CTRL_0, SNVS_HP_NON_TZ_IRQn, true);
+            #else
+            GPC_EnableIRQ(GPC, SNVS_HP_WRAPPER_IRQn);
+            #endif
+        }
+    }
+
+    #ifdef MIMXRT117x_SERIES
+    machine_pin_config(&pin_WAKEUP_DIG, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
+    GPC_CM_EnableIrqWakeup(GPC_CPU_MODE_CTRL_0, GPIO13_Combined_0_31_IRQn, true);
+    #elif defined IOMUXC_SNVS_WAKEUP_GPIO5_IO00
+    machine_pin_config(&pin_WAKEUP, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
+    GPC_EnableIRQ(GPC, GPIO5_Combined_0_15_IRQn);
+    #endif
+
+    SNVS->LPCR |= SNVS_LPCR_TOP_MASK;
+
+    while (true) {
+        ;
+    }
+
+    return mp_const_none;
+}
+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);
@@ -162,6 +207,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { 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_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) },
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index d00d2031c4772..478b1c77362a1 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -51,7 +51,7 @@ void mimxrt_sdram_init(void);
 void machine_i2s_init0();
 void machine_i2s_deinit_all(void);
 void machine_rtc_start(void);
-
+void machine_rtc_alarm_helper(int seconds, bool repeat);
 void machine_uart_set_baudrate(mp_obj_t uart, uint32_t baudrate);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H

From 3883f29485fad21105f6f965d56bfec842b8cfbb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Oct 2023 12:27:49 +1100
Subject: [PATCH 0442/3129] py/modthread: Initialise nlr_jump_callback_top on
 threads.

The main thread gets this because the thread state is in bss, but
subsequent threads need this field to be initialised.

Also added a note to mpstate.h to help avoid missing this in the future.

Fixes issue #12695.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/modthread.c | 1 +
 py/mpstate.h   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/py/modthread.c b/py/modthread.c
index 6b75474904f40..e4dcccd259d80 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -174,6 +174,7 @@ STATIC void *thread_entry(void *args_in) {
     // The GC starts off unlocked on this thread.
     ts.gc_lock_depth = 0;
 
+    ts.nlr_jump_callback_top = NULL;
     ts.mp_pending_exception = MP_OBJ_NULL;
 
     // set locals and globals from the calling context
diff --git a/py/mpstate.h b/py/mpstate.h
index 64915ab87dd40..0e0388e410ac9 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -249,8 +249,10 @@ typedef struct _mp_state_vm_t {
     #endif
 } mp_state_vm_t;
 
-// This structure holds state that is specific to a given thread.
-// Everything in this structure is scanned for root pointers.
+// This structure holds state that is specific to a given thread. Everything
+// in this structure is scanned for root pointers.  Anything added to this
+// structure must have corresponding initialisation added to thread_entry (in
+// py/modthread.c).
 typedef struct _mp_state_thread_t {
     // Stack top at the start of program
     char *stack_top;

From 86c7b957a85d69ffb19bc6e4db719e902abd3fc1 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Thu, 19 Oct 2023 18:13:54 +1100
Subject: [PATCH 0443/3129] esp32/boards: Update UM board image names for
 consistency.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_FEATHERS2NEO/board.json | 2 +-
 ports/esp32/boards/UM_TINYPICO/board.json     | 2 +-
 ports/esp32/boards/UM_TINYS2/board.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index dfa1f46dc365e..5b79d3195a763 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -17,7 +17,7 @@
         "5x5 RGB LED Matrix"
     ],
     "images": [
-        "FeatherS2_Neo_White_Product2.jpg"
+        "unexpectedmaker_feathers2neo.jpg"
     ],
     "mcu": "esp32s2",
     "product": "Feather S2 Neo",
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index bf0b3d2c8c621..6dbe762f3afd6 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -16,7 +16,7 @@
         "TinyPICO Compatible"
     ],
     "images": [
-        "tinypico-v2-both.jpg"
+        "unexpectedmaker_tinypico.jpg"
     ],
     "mcu": "esp32",
     "product": "TinyPICO",
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index 1b4c934dfaedb..9bbf9058bb8cf 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -16,7 +16,7 @@
         "TinyPICO Compatible"
     ],
     "images": [
-        "TinyS2+Product+Shot.jpg"
+        "unexpectedmaker_tinys2.jpg"
     ],
     "mcu": "esp32s2",
     "product": "Tiny S2",

From e3ba6f952bda153cfc3389eb48c7645d71b2b094 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Mon, 31 Jul 2023 18:25:26 +0200
Subject: [PATCH 0444/3129] extmod/vfs_posix: Fix relative root path.

A VfsPosix created with a relative root path would get confused when
chdir() was called on it and become unable to properly resolve absolute
paths, because changing directories effectively shifted its root. The
simplest fix for that would be to say "don't do that", but since the
unit tests themselves do it, fix it by making a relative path absolute
before storing it.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 extmod/vfs_posix.c            | 26 +++++++++++++++++++++++++-
 tests/extmod/vfs_posix.py     | 13 +++++++++++++
 tests/extmod/vfs_posix.py.exp |  1 +
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index d63bb5be7bff4..1505682f1141b 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -46,6 +46,9 @@
 #ifdef _MSC_VER
 #include <direct.h> // For mkdir etc.
 #endif
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 typedef struct _mp_obj_vfs_posix_t {
     mp_obj_base_t base;
@@ -107,7 +110,28 @@ STATIC mp_obj_t vfs_posix_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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]));
+        const char *root = mp_obj_str_get_str(args[0]);
+        // if the root is relative, make it absolute, otherwise we'll get confused by chdir
+        #ifdef _WIN32
+        char buf[MICROPY_ALLOC_PATH_MAX + 1];
+        DWORD result = GetFullPathNameA(root, sizeof(buf), buf, NULL);
+        if (result > 0 && result < sizeof(buf)) {
+            vstr_add_str(&vfs->root, buf);
+        } else {
+            mp_raise_OSError(GetLastError());
+        }
+        #else
+        if (root[0] != '\0' && root[0] != '/') {
+            char buf[MICROPY_ALLOC_PATH_MAX + 1];
+            const char *cwd = getcwd(buf, sizeof(buf));
+            if (cwd == NULL) {
+                mp_raise_OSError(errno);
+            }
+            vstr_add_str(&vfs->root, cwd);
+            vstr_add_char(&vfs->root, '/');
+        }
+        vstr_add_str(&vfs->root, root);
+        #endif
         vstr_add_char(&vfs->root, '/');
     }
     vfs->root_len = vfs->root.len;
diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index 05dc0f537e3ca..ebbd08a4a6859 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -99,6 +99,19 @@ def write_files_without_closing():
 print(type(list(vfs.ilistdir("."))[0][0]))
 print(type(list(vfs.ilistdir(b"."))[0][0]))
 
+# chdir should not affect absolute paths (regression test)
+vfs.mkdir("/subdir")
+vfs.mkdir("/subdir/micropy_test_dir")
+with vfs.open("/subdir/micropy_test_dir/test2", "w") as f:
+    f.write("wrong")
+vfs.chdir("/subdir")
+with vfs.open("/test2", "r") as f:
+    print(f.read())
+os.chdir(curdir)
+vfs.remove("/subdir/micropy_test_dir/test2")
+vfs.rmdir("/subdir/micropy_test_dir")
+vfs.rmdir("/subdir")
+
 # remove
 os.remove(temp_dir + "/test2")
 print(os.listdir(temp_dir))
diff --git a/tests/extmod/vfs_posix.py.exp b/tests/extmod/vfs_posix.py.exp
index 99922e621d4c2..bd1ec7bad67b2 100644
--- a/tests/extmod/vfs_posix.py.exp
+++ b/tests/extmod/vfs_posix.py.exp
@@ -10,6 +10,7 @@ next_file_no <= base_file_no True
 <class 'tuple'>
 <class 'str'>
 <class 'bytes'>
+hello
 []
 remove OSError
 False

From 5f7065f57a1ce445266a566685ad451edecc58c3 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Sun, 30 Jul 2023 17:26:04 +0200
Subject: [PATCH 0445/3129] extmod/vfs_posix: Fix accidentally passing tests.

These tests test an unrealistic situation and only pass by accident due
to a bug. The upcoming fix for the bug would make them fail.

The unrealistic situation is that VfsPosix methods are called with
relative paths while the current working directory is somewhere outside
of the root of the VFS. In the intended use of VFS objects via
os.mount() (as opposed to calling methods directly as the tests do),
this never happens, as mp_vfs_lookup_path() directs incoming calls to
the VFS that contains the CWD.

Make the testing situation realistic by changing the working directory
to the root of the VFS before calling methods on it, as the subsequent
relative path accesses expect.

Thanks to the preceding commit, the tests still pass, but still for the
wrong reason. The following commit "Fix relative paths on non-root VFS"
will make them pass for the correct reason.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 tests/extmod/vfs_posix.py                 | 6 ++++++
 tests/extmod/vfs_posix_ilistdir_del.py    | 9 +++++++++
 tests/extmod/vfs_posix_ilistdir_filter.py | 7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index ebbd08a4a6859..bc4c7c2014b6c 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -88,6 +88,9 @@ def write_files_without_closing():
 
 # construct new VfsPosix with path argument
 vfs = os.VfsPosix(temp_dir)
+# when VfsPosix is used the intended way via os.mount(), it can only be called
+# with relative paths when the CWD is inside or at its root, so simulate that
+os.chdir(temp_dir)
 print(list(i[0] for i in vfs.ilistdir(".")))
 
 # stat, statvfs (statvfs may not exist)
@@ -112,6 +115,9 @@ def write_files_without_closing():
 vfs.rmdir("/subdir/micropy_test_dir")
 vfs.rmdir("/subdir")
 
+# done with vfs, restore CWD
+os.chdir(curdir)
+
 # remove
 os.remove(temp_dir + "/test2")
 print(os.listdir(temp_dir))
diff --git a/tests/extmod/vfs_posix_ilistdir_del.py b/tests/extmod/vfs_posix_ilistdir_del.py
index edb50dfd6229c..8c8e6978b6540 100644
--- a/tests/extmod/vfs_posix_ilistdir_del.py
+++ b/tests/extmod/vfs_posix_ilistdir_del.py
@@ -11,7 +11,13 @@
 
 
 def test(testdir):
+    curdir = os.getcwd()
     vfs = os.VfsPosix(testdir)
+    # When VfsPosix is used the intended way via os.mount(), it can only be called
+    # with relative paths when the CWD is inside or at its root, so simulate that.
+    # (Although perhaps calling with a relative path was an oversight in this case
+    # and the respective line below was meant to read `vfs.rmdir("/" + dname)`.)
+    os.chdir(testdir)
     vfs.mkdir("/test_d1")
     vfs.mkdir("/test_d2")
     vfs.mkdir("/test_d3")
@@ -48,6 +54,9 @@ def test(testdir):
         vfs.open("/test", "w").close()
         vfs.remove("/test")
 
+    # Done with vfs, restore CWD.
+    os.chdir(curdir)
+
 
 # We need an empty directory for testing.
 # Skip the test if it already exists.
diff --git a/tests/extmod/vfs_posix_ilistdir_filter.py b/tests/extmod/vfs_posix_ilistdir_filter.py
index c32d1249710de..54012746057a8 100644
--- a/tests/extmod/vfs_posix_ilistdir_filter.py
+++ b/tests/extmod/vfs_posix_ilistdir_filter.py
@@ -10,7 +10,11 @@
 
 
 def test(testdir):
+    curdir = os.getcwd()
     vfs = os.VfsPosix(testdir)
+    # When VfsPosix is used the intended way via os.mount(), it can only be called
+    # with relative paths when the CWD is inside or at its root, so simulate that.
+    os.chdir(testdir)
 
     dirs = [".a", "..a", "...a", "a.b", "a..b"]
 
@@ -24,6 +28,9 @@ def test(testdir):
 
     print(dirs)
 
+    # Done with vfs, restore CWD.
+    os.chdir(curdir)
+
 
 # We need an empty directory for testing.
 # Skip the test if it already exists.

From 0c4fb1687193a6c6f5edbb9404ecb7e5d6f3bec3 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Sun, 30 Jul 2023 14:48:22 +0200
Subject: [PATCH 0446/3129] extmod/vfs_posix: Fix relative paths on non-root
 VFS.

The unwritten API contract expected of a VFS by mp_vfs_lookup_path() is
that paths passed in are relative to the root of the VFS if they start
with '/' and relative to the current directory of the VFS otherwise.
This was not correctly implemented in VfsPosix for instances with a
non-empty root - all paths were interpreted relative to the root. Fix
that. Since VfsPosix tracks its CWD using the "external" CWD of the Unix
process, the correct handling for relative paths is to pass them through
unmodified.

Also, when concatenating absolute paths, fix an off-by-one resulting in
a harmless double slash (the root path already has a trailing slash).

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 extmod/vfs_posix.c                  | 16 ++++---
 tests/extmod/vfs_posix_paths.py     | 73 +++++++++++++++++++++++++++++
 tests/extmod/vfs_posix_paths.py.exp | 13 +++++
 3 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 tests/extmod/vfs_posix_paths.py
 create mode 100644 tests/extmod/vfs_posix_paths.py.exp

diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 1505682f1141b..6df91a2732fd6 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -58,21 +58,23 @@ typedef struct _mp_obj_vfs_posix_t {
 } mp_obj_vfs_posix_t;
 
 STATIC const char *vfs_posix_get_path_str(mp_obj_vfs_posix_t *self, mp_obj_t path) {
-    if (self->root_len == 0) {
-        return mp_obj_str_get_str(path);
+    const char *path_str = mp_obj_str_get_str(path);
+    if (self->root_len == 0 || path_str[0] != '/') {
+        return path_str;
     } else {
-        self->root.len = self->root_len;
-        vstr_add_str(&self->root, mp_obj_str_get_str(path));
+        self->root.len = self->root_len - 1;
+        vstr_add_str(&self->root, path_str);
         return vstr_null_terminated_str(&self->root);
     }
 }
 
 STATIC mp_obj_t vfs_posix_get_path_obj(mp_obj_vfs_posix_t *self, mp_obj_t path) {
-    if (self->root_len == 0) {
+    const char *path_str = mp_obj_str_get_str(path);
+    if (self->root_len == 0 || path_str[0] != '/') {
         return path;
     } else {
-        self->root.len = self->root_len;
-        vstr_add_str(&self->root, mp_obj_str_get_str(path));
+        self->root.len = self->root_len - 1;
+        vstr_add_str(&self->root, path_str);
         return mp_obj_new_str(self->root.buf, self->root.len);
     }
 }
diff --git a/tests/extmod/vfs_posix_paths.py b/tests/extmod/vfs_posix_paths.py
new file mode 100644
index 0000000000000..8cdad77068f29
--- /dev/null
+++ b/tests/extmod/vfs_posix_paths.py
@@ -0,0 +1,73 @@
+# Test for VfsPosix with relative paths
+
+try:
+    import os
+
+    os.VfsPosix
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+# We need a directory for testing that doesn't already exist.
+# Skip the test if it does exist.
+temp_dir = "vfs_posix_paths_test_dir"
+try:
+    import os
+
+    os.stat(temp_dir)
+    print("SKIP")
+    raise SystemExit
+except OSError:
+    pass
+
+curdir = os.getcwd()
+os.mkdir(temp_dir)
+
+# construct new VfsPosix with absolute path argument
+temp_dir_abs = os.getcwd() + os.sep + temp_dir
+vfs = os.VfsPosix(temp_dir_abs)
+# when VfsPosix is used the intended way via os.mount(), it can only be called
+# with relative paths when the CWD is inside or at its root, so simulate that
+os.chdir(temp_dir_abs)
+vfs.mkdir("subdir")
+vfs.mkdir("subdir/one")
+print('listdir("/"):', sorted(i[0] for i in vfs.ilistdir("/")))
+print('listdir("."):', sorted(i[0] for i in vfs.ilistdir(".")))
+print('getcwd() in {"", "/"}:', vfs.getcwd() in {"", "/"})
+print('chdir("subdir"):', vfs.chdir("subdir"))
+print("getcwd():", vfs.getcwd())
+print('mkdir("two"):', vfs.mkdir("two"))
+f = vfs.open("file.py", "w")
+f.write("print('hello')")
+f.close()
+print('listdir("/"):', sorted(i[0] for i in vfs.ilistdir("/")))
+print('listdir("/subdir"):', sorted(i[0] for i in vfs.ilistdir("/subdir")))
+print('listdir("."):', sorted(i[0] for i in vfs.ilistdir(".")))
+try:
+    f = vfs.open("/subdir/file.py", "r")
+    print(f.read())
+    f.close()
+except Exception as e:
+    print(e)
+import sys
+
+sys.path.insert(0, "")
+try:
+    import file
+
+    print(file)
+except Exception as e:
+    print(e)
+del sys.path[0]
+vfs.remove("file.py")
+vfs.rmdir("two")
+vfs.rmdir("/subdir/one")
+vfs.chdir("/")
+vfs.rmdir("/subdir")
+
+# done with vfs, restore CWD
+os.chdir(curdir)
+
+# rmdir
+os.rmdir(temp_dir)
+print(temp_dir in os.listdir())
diff --git a/tests/extmod/vfs_posix_paths.py.exp b/tests/extmod/vfs_posix_paths.py.exp
new file mode 100644
index 0000000000000..5828453c92167
--- /dev/null
+++ b/tests/extmod/vfs_posix_paths.py.exp
@@ -0,0 +1,13 @@
+listdir("/"): ['subdir']
+listdir("."): ['subdir']
+getcwd() in {"", "/"}: True
+chdir("subdir"): None
+getcwd(): subdir
+mkdir("two"): None
+listdir("/"): ['subdir']
+listdir("/subdir"): ['file.py', 'one', 'two']
+listdir("."): ['file.py', 'one', 'two']
+print('hello')
+hello
+<module 'file' from 'file.py'>
+False

From be28829ae8d22e1a0373bda116022ee446fb2ed8 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Sun, 30 Jul 2023 14:48:22 +0200
Subject: [PATCH 0447/3129] extmod/vfs_posix: Fix getcwd() on non-root VFS.

The unwritten API contract expected of a VFS.getcwd() by mp_vfs_getcwd()
is that its return value should be either "" or "/" when the CWD is at
the root of the VFS and otherwise start with a slash and not end with a
slash. This was not correctly implemented in VfsPosix for instances with
a non-empty root - the required leading slash, if any, was cut off
because the root length includes a trailing slash. This would result in
missing slashes in the middle of the return value of os.getcwd() or in
uninitialized garbage from beyond a string's null terminator when the
CWD was at the VFS root.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 extmod/vfs_posix.c                  |  9 ++++++++-
 tests/extmod/vfs_posix_paths.py     | 19 +++++++++++++++++++
 tests/extmod/vfs_posix_paths.py.exp | 12 +++++++++++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 6df91a2732fd6..e29b47cccda83 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -186,7 +186,14 @@ STATIC mp_obj_t vfs_posix_getcwd(mp_obj_t self_in) {
     if (ret == NULL) {
         mp_raise_OSError(errno);
     }
-    ret += self->root_len;
+    if (self->root_len > 0) {
+        ret += self->root_len - 1;
+        #ifdef _WIN32
+        if (*ret == '\\') {
+            *(char *)ret = '/';
+        }
+        #endif
+    }
     return mp_obj_new_str(ret, strlen(ret));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_getcwd_obj, vfs_posix_getcwd);
diff --git a/tests/extmod/vfs_posix_paths.py b/tests/extmod/vfs_posix_paths.py
index 8cdad77068f29..5806a34521a23 100644
--- a/tests/extmod/vfs_posix_paths.py
+++ b/tests/extmod/vfs_posix_paths.py
@@ -68,6 +68,25 @@
 # done with vfs, restore CWD
 os.chdir(curdir)
 
+# some integration tests with a mounted VFS
+os.mount(os.VfsPosix(temp_dir_abs), "/mnt")
+os.mkdir("/mnt/dir")
+print('chdir("/mnt/dir"):', os.chdir("/mnt/dir"))
+print("getcwd():", os.getcwd())
+print('chdir("/mnt"):', os.chdir("/mnt"))
+print("getcwd():", os.getcwd())
+print('chdir("/"):', os.chdir("/"))
+print("getcwd():", os.getcwd())
+print('chdir("/mnt/dir"):', os.chdir("/mnt/dir"))
+print("getcwd():", os.getcwd())
+print('chdir(".."):', os.chdir(".."))
+print("getcwd():", os.getcwd())
+os.rmdir("/mnt/dir")
+os.umount("/mnt")
+
+# restore CWD
+os.chdir(curdir)
+
 # rmdir
 os.rmdir(temp_dir)
 print(temp_dir in os.listdir())
diff --git a/tests/extmod/vfs_posix_paths.py.exp b/tests/extmod/vfs_posix_paths.py.exp
index 5828453c92167..ecc13222aaaeb 100644
--- a/tests/extmod/vfs_posix_paths.py.exp
+++ b/tests/extmod/vfs_posix_paths.py.exp
@@ -2,7 +2,7 @@ listdir("/"): ['subdir']
 listdir("."): ['subdir']
 getcwd() in {"", "/"}: True
 chdir("subdir"): None
-getcwd(): subdir
+getcwd(): /subdir
 mkdir("two"): None
 listdir("/"): ['subdir']
 listdir("/subdir"): ['file.py', 'one', 'two']
@@ -10,4 +10,14 @@ listdir("."): ['file.py', 'one', 'two']
 print('hello')
 hello
 <module 'file' from 'file.py'>
+chdir("/mnt/dir"): None
+getcwd(): /mnt/dir
+chdir("/mnt"): None
+getcwd(): /mnt
+chdir("/"): None
+getcwd(): /
+chdir("/mnt/dir"): None
+getcwd(): /mnt/dir
+chdir(".."): None
+getcwd(): /mnt
 False

From 7be16e05402a49a432523d6a55e614c7d87627b6 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Wed, 2 Aug 2023 13:15:21 +0200
Subject: [PATCH 0448/3129] extmod/vfs_posix: Additional tests for coverage of
 error cases.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 tests/extmod/vfs_posix_enoent.py     | 42 ++++++++++++++++++++++++++++
 tests/extmod/vfs_posix_enoent.py.exp |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 tests/extmod/vfs_posix_enoent.py
 create mode 100644 tests/extmod/vfs_posix_enoent.py.exp

diff --git a/tests/extmod/vfs_posix_enoent.py b/tests/extmod/vfs_posix_enoent.py
new file mode 100644
index 0000000000000..e6010d79d58f0
--- /dev/null
+++ b/tests/extmod/vfs_posix_enoent.py
@@ -0,0 +1,42 @@
+# Test for VfsPosix error conditions
+
+try:
+    import os
+    import sys
+
+    os.VfsPosix
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+if sys.platform == "win32":
+    # Windows doesn't let you delete the current directory, so this cannot be
+    # tested.
+    print("SKIP")
+    raise SystemExit
+
+# We need an empty directory for testing.
+# Skip the test if it already exists.
+temp_dir = "vfs_posix_enoent_test_dir"
+try:
+    os.stat(temp_dir)
+    print("SKIP")
+    raise SystemExit
+except OSError:
+    pass
+
+curdir = os.getcwd()
+os.mkdir(temp_dir)
+os.chdir(temp_dir)
+os.rmdir(curdir + "/" + temp_dir)
+try:
+    print("getcwd():", os.getcwd())
+except OSError as e:
+    # expecting ENOENT = 2
+    print("getcwd():", repr(e))
+
+try:
+    print("VfsPosix():", os.VfsPosix("something"))
+except OSError as e:
+    # expecting ENOENT = 2
+    print("VfsPosix():", repr(e))
diff --git a/tests/extmod/vfs_posix_enoent.py.exp b/tests/extmod/vfs_posix_enoent.py.exp
new file mode 100644
index 0000000000000..f2d9a0d551068
--- /dev/null
+++ b/tests/extmod/vfs_posix_enoent.py.exp
@@ -0,0 +1,2 @@
+getcwd(): OSError(2,)
+VfsPosix(): OSError(2,)

From 9ed39553f2ffa542ab390d7bf460ac5593310577 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 11 Sep 2023 15:24:54 +0200
Subject: [PATCH 0449/3129] drivers/ninaw10: Add ioctl for reading analog pins.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/ninaw10/nina_wifi_drv.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 111ead003dee5..6e4df84294c3d 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -684,6 +684,14 @@ int nina_ioctl(uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface) {
                 return -1;
             }
             break;
+        case NINA_CMD_GET_ANALOG_READ: {
+            if (len != 2 || nina_send_command_read_vals(NINA_CMD_GET_ANALOG_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;
     }

From 7bbf7910fec6d3302bb839eaa0885d819faf8f15 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 11 Sep 2023 15:25:27 +0200
Subject: [PATCH 0450/3129] extmod/network_ninaw10: Raise an error if
 nina_ioctl fails.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/network_ninaw10.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 00f53eff137a8..399d02cd6e2db 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -121,7 +121,7 @@ STATIC void network_ninaw10_poll_connect(mp_sched_node_t *node) {
             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);
+            debug_printf("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"),
@@ -428,7 +428,11 @@ STATIC mp_obj_t network_ninaw10_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_
     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);
+    int ret = nina_ioctl(mp_obj_get_int(cmd_in), buf.len, buf.buf, self->itf);
+    if (ret != 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("ioctl %d failed %d"), mp_obj_get_int(cmd_in), ret);
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(network_ninaw10_ioctl_obj, network_ninaw10_ioctl);

From 4358faab0ccc71f8419f41c0c44ccf5e782c247d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 Oct 2023 12:32:45 +0200
Subject: [PATCH 0451/3129] drivers/ninaw10: Add support for external ADC
 channels.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/ninaw10/machine_pin_nina.c | 36 +++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/drivers/ninaw10/machine_pin_nina.c b/drivers/ninaw10/machine_pin_nina.c
index 025ecb66af0d2..c72ecee3dbb3e 100644
--- a/drivers/ninaw10/machine_pin_nina.c
+++ b/drivers/ninaw10/machine_pin_nina.c
@@ -42,9 +42,13 @@
 
 #define NINA_GPIO_MODE          (0x50)
 #define NINA_GPIO_READ          (0x53)
+#define NINA_GPIO_READ_ANALOG   (0x54)
 #define NINA_GPIO_WRITE         (0x51)
-#define NINA_GPIO_IS_INPUT_ONLY(p) ((p >= 34 && p <= 36) || (p == 39))
+#define NINA_GPIO_IS_INPUT_ONLY(p)  ((p >= 3 && p <= 6))
+#define NINA_GPIO_IS_ADC_CHANNEL(p) ((p >= 3 && p <= 6))
 
+// This maps logical pin ID (0..MICROPY_HW_PIN_EXT_COUNT) to
+// physical pins on the Nina module.
 static uint8_t pin_map[MICROPY_HW_PIN_EXT_COUNT] = {
     27, // LEDR
     25, // LEDG
@@ -55,10 +59,30 @@ static uint8_t pin_map[MICROPY_HW_PIN_EXT_COUNT] = {
     35, // A7
 };
 
+// This maps logical pin ID (0..MICROPY_HW_PIN_EXT_COUNT) to
+// ADC channel numbers on the Nina module.
+static uint8_t adc_map[MICROPY_HW_PIN_EXT_COUNT] = {
+    -1, // LEDR
+    -1, // LEDG
+    -1, // LEDB
+    6, // A4
+    3, // A5
+    0, // A6
+    7, // A7
+};
+
 void machine_pin_ext_init(void) {
     nina_init();
 }
 
+bool machine_pin_ext_is_adc_channel(const machine_pin_obj_t *self) {
+    return NINA_GPIO_IS_ADC_CHANNEL(self->id);
+}
+
+uint32_t machine_pin_ext_to_adc_channel(const machine_pin_obj_t *self) {
+    return adc_map[self->id];
+}
+
 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};
@@ -76,8 +100,14 @@ bool machine_pin_ext_get(machine_pin_obj_t *self) {
     return value;
 }
 
+uint16_t machine_pin_ext_read_u16(uint32_t channel) {
+    uint16_t buf = channel;
+    nina_ioctl(NINA_GPIO_READ_ANALOG, sizeof(buf), (uint8_t *)&buf, 0);
+    return buf;
+}
+
 void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value) {
-    if (mode == MACHINE_PIN_MODE_IN) {
+    if (mode == MACHINE_PIN_MODE_IN || mode == MACHINE_PIN_MODE_ANALOG) {
         mode = NINA_GPIO_INPUT;
         self->is_output = false;
     } else if (mode == MACHINE_PIN_MODE_OUT) {
@@ -89,7 +119,7 @@ void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value) {
     if (self->id >= 0 && self->id < MICROPY_HW_PIN_EXT_COUNT) {
         uint8_t buf[] = {pin_map[self->id], mode};
         if (mode == NINA_GPIO_OUTPUT) {
-            if (NINA_GPIO_IS_INPUT_ONLY(buf[0])) {
+            if (NINA_GPIO_IS_INPUT_ONLY(self->id)) {
                 mp_raise_ValueError("only Pin.IN is supported for this pin");
             }
             machine_pin_ext_set(self, value);

From 5e52389f993c7bd54bb25d8785f5abf3a4e771b0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 Oct 2023 12:36:11 +0200
Subject: [PATCH 0452/3129] rp2/machine_adc: Add support for external ADC
 channels.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/machine_adc.c | 40 ++++++++++++++++++++++++++++++++++++----
 ports/rp2/machine_pin.c |  2 +-
 ports/rp2/machine_pin.h |  7 ++++++-
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 9e3d7f57a86eb..5d6f0cc29cbc4 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -27,6 +27,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "hardware/adc.h"
+#include "machine_pin.h"
 
 #define ADC_IS_VALID_GPIO(gpio) ((gpio) >= 26 && (gpio) <= 29)
 #define ADC_CHANNEL_FROM_GPIO(gpio) ((gpio) - 26)
@@ -48,6 +49,9 @@ const mp_obj_type_t machine_adc_type;
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
     uint32_t channel;
+    #if MICROPY_HW_ADC_EXT_COUNT
+    uint32_t is_ext : 1;
+    #endif
 } machine_adc_obj_t;
 
 STATIC void machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -63,6 +67,9 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
     mp_obj_t source = all_args[0];
 
     uint32_t channel;
+    bool is_ext = false;
+    const machine_pin_obj_t *pin = NULL;
+
     if (mp_obj_is_int(source)) {
         // Get and validate channel number.
         channel = mp_obj_get_int(source);
@@ -72,18 +79,35 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     } else {
         // Get GPIO and check it has ADC capabilities.
-        channel = mp_hal_get_pin_obj(source);
-        if (!ADC_IS_VALID_GPIO(channel)) {
+        pin = machine_pin_find(source);
+        channel = pin->id;
+        bool valid_adc_pin = false;
+        #if MICROPY_HW_ADC_EXT_COUNT
+        is_ext = pin->is_ext;
+        if (is_ext) {
+            valid_adc_pin = machine_pin_ext_is_adc_channel(pin);
+        } else
+        #endif
+        {
+            valid_adc_pin = ADC_IS_VALID_GPIO(channel);
+        }
+        if (!valid_adc_pin) {
             mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't have ADC capabilities"));
         }
     }
 
     // Initialise the ADC peripheral if it's not already running.
-    if (!(adc_hw->cs & ADC_CS_EN_BITS)) {
+    if (!is_ext && !(adc_hw->cs & ADC_CS_EN_BITS)) {
         adc_init();
     }
 
-    if (ADC_IS_VALID_GPIO(channel)) {
+    if (is_ext) {
+        #if MICROPY_HW_ADC_EXT_COUNT
+        // Note external pins are mutable.
+        machine_pin_ext_config((machine_pin_obj_t *)pin, MACHINE_PIN_MODE_ANALOG, 0);
+        channel = machine_pin_ext_to_adc_channel(pin);
+        #endif
+    } else if (ADC_IS_VALID_GPIO(channel)) {
         // Configure the GPIO pin in ADC mode.
         adc_gpio_init(channel);
         channel = ADC_CHANNEL_FROM_GPIO(channel);
@@ -95,6 +119,9 @@ 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 = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
     o->channel = channel;
+    #if MICROPY_HW_ADC_EXT_COUNT
+    o->is_ext = is_ext;
+    #endif
 
     return MP_OBJ_FROM_PTR(o);
 }
@@ -102,6 +129,11 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
 // 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);
+    #if MICROPY_HW_ADC_EXT_COUNT
+    if (self->is_ext) {
+        return MP_OBJ_NEW_SMALL_INT(machine_pin_ext_read_u16(self->channel));
+    }
+    #endif
     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);
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index bdd80fb8f4fcb..3470f38696198 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -166,7 +166,7 @@ const machine_pin_af_obj_t *machine_pin_find_alt_by_index(const machine_pin_obj_
     return NULL;
 }
 
-static const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
+const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
     // Is already a object of the proper type
     if (mp_obj_is_type(pin, &machine_pin_type)) {
         return pin;
diff --git a/ports/rp2/machine_pin.h b/ports/rp2/machine_pin.h
index c10dc4f9e82f1..aa5ea641b7293 100644
--- a/ports/rp2/machine_pin.h
+++ b/ports/rp2/machine_pin.h
@@ -34,7 +34,8 @@ enum {
     MACHINE_PIN_MODE_IN = 0,
     MACHINE_PIN_MODE_OUT = 1,
     MACHINE_PIN_MODE_OPEN_DRAIN = 2,
-    MACHINE_PIN_MODE_ALT = 3
+    MACHINE_PIN_MODE_ALT = 3,
+    MACHINE_PIN_MODE_ANALOG = 4
 };
 
 typedef struct _machine_pin_af_obj_t {
@@ -71,10 +72,14 @@ 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);
+bool machine_pin_ext_is_adc_channel(const machine_pin_obj_t *self);
+uint32_t machine_pin_ext_to_adc_channel(const machine_pin_obj_t *self);
 void machine_pin_ext_set(machine_pin_obj_t *self, bool value);
 bool machine_pin_ext_get(machine_pin_obj_t *self);
+uint16_t machine_pin_ext_read_u16(uint32_t channel);
 void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value);
 
+const machine_pin_obj_t *machine_pin_find(mp_obj_t pin);
 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);

From 2590a34ed77059cf25ad99f57672612afeb59cc7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 Oct 2023 12:36:40 +0200
Subject: [PATCH 0453/3129] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Add
 external analog pins.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h | 1 +
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 026702da4519e..537c6d7057051 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -15,6 +15,7 @@
 
 // Enable externally controlled pins.
 #define MICROPY_HW_PIN_EXT_COUNT        (7)
+#define MICROPY_HW_ADC_EXT_COUNT        (4)
 
 // Enable USB Mass Storage with FatFS filesystem.
 #define MICROPY_HW_USB_MSC              (1)
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
index 47d9b5b04326a..0b1566cacf7f6 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
@@ -26,3 +26,7 @@ D18,EXT_GPIO3
 D19,EXT_GPIO4
 D20,EXT_GPIO5
 D21,EXT_GPIO6
+A4,EXT_GPIO3
+A5,EXT_GPIO4
+A6,EXT_GPIO5
+A7,EXT_GPIO6

From 60929ec7e2c19b896487491192361e44f7cee0d9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Oct 2023 18:19:03 +1100
Subject: [PATCH 0454/3129] extmod/machine_wdt: Factor ports' WDT Python
 bindings to common code.

There are currently 7 ports that implement machine.WDT and a lot of code is
duplicated across these implementations.  This commit factors the common
parts of all these implementations to a single location in
extmod/machine_wdt.c.  This common code provides the top-level Python
bindings (class and method wrappers), and then each port implements the
back end specific to that port.

With this refactor the ports remain functionally the same except for:

- The esp8266 WDT constructor now takes keyword arguments, and accepts the
  "timeout" argument but raises an exception if it's not the default value
  (this port doesn't support changing the timeout).

- The mimxrt and samd ports now interpret the argument to WDT.timeout_ms()
  as signed and if it's negative truncate it to the minimum timeout (rather
  than it being unsigned and a negative value truncating to the maximum
  timeout).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake                           |  1 +
 extmod/extmod.mk                              |  1 +
 extmod/machine_wdt.c                          | 95 +++++++++++++++++++
 ports/stm32/wdt.h => extmod/modmachine.h      | 22 ++++-
 ports/cc3200/application.mk                   |  1 -
 ports/cc3200/mods/{pybwdt.c => machine_wdt.c} | 66 ++++---------
 ports/cc3200/mods/modmachine.c                |  4 +-
 ports/cc3200/mods/pybwdt.h                    |  4 +-
 ports/cc3200/mpconfigport.h                   |  2 +
 ports/esp32/esp32_common.cmake                |  1 -
 ports/esp32/machine_wdt.c                     | 44 ++-------
 ports/esp32/modmachine.c                      |  3 +
 ports/esp32/modmachine.h                      |  1 -
 ports/esp32/mpconfigport.h                    |  2 +
 ports/esp8266/Makefile                        |  1 -
 ports/esp8266/machine_wdt.c                   | 38 ++------
 ports/esp8266/modmachine.c                    |  7 +-
 ports/esp8266/mpconfigport.h                  |  2 +
 ports/mimxrt/Makefile                         |  1 -
 ports/mimxrt/machine_wdt.c                    | 67 ++++---------
 ports/mimxrt/modmachine.c                     |  3 +
 ports/mimxrt/modmachine.h                     |  1 -
 ports/mimxrt/mpconfigport.h                   |  3 +
 ports/renesas-ra/modmachine.h                 |  1 -
 ports/rp2/CMakeLists.txt                      |  1 -
 ports/rp2/machine_wdt.c                       | 40 ++------
 ports/rp2/modmachine.c                        |  3 +
 ports/rp2/modmachine.h                        |  1 -
 ports/rp2/mpconfigport.h                      |  2 +
 ports/samd/Makefile                           |  1 -
 ports/samd/machine_wdt.c                      | 52 ++--------
 ports/samd/modmachine.c                       |  3 +
 ports/samd/modmachine.h                       |  1 -
 ports/samd/mpconfigport.h                     |  3 +
 ports/stm32/Makefile                          |  1 -
 ports/stm32/{wdt.c => machine_wdt.c}          | 52 +++-------
 ports/stm32/modmachine.c                      |  6 +-
 ports/stm32/mpconfigport.h                    |  2 +
 38 files changed, 235 insertions(+), 304 deletions(-)
 create mode 100644 extmod/machine_wdt.c
 rename ports/stm32/wdt.h => extmod/modmachine.h (63%)
 rename ports/cc3200/mods/{pybwdt.c => machine_wdt.c} (68%)
 rename ports/stm32/{wdt.c => machine_wdt.c} (60%)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index c8756a682ec95..063df70f5f853 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -14,6 +14,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/machine_pwm.c
     ${MICROPY_EXTMOD_DIR}/machine_signal.c
     ${MICROPY_EXTMOD_DIR}/machine_spi.c
+    ${MICROPY_EXTMOD_DIR}/machine_wdt.c
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
     ${MICROPY_EXTMOD_DIR}/modlwip.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index f776a7f69437e..a6c7826867731 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -11,6 +11,7 @@ SRC_EXTMOD_C += \
 	extmod/machine_signal.c \
 	extmod/machine_spi.c \
 	extmod/machine_timer.c \
+	extmod/machine_wdt.c \
 	extmod/modasyncio.c \
 	extmod/modbinascii.c \
 	extmod/modbluetooth.c \
diff --git a/extmod/machine_wdt.c b/extmod/machine_wdt.c
new file mode 100644
index 0000000000000..a49484ed80095
--- /dev/null
+++ b/extmod/machine_wdt.c
@@ -0,0 +1,95 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-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 "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_WDT
+
+#include "extmod/modmachine.h"
+
+// The port must provide implementations of these low-level WDT functions.
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms);
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self);
+#if MICROPY_PY_MACHINE_WDT_TIMEOUT_MS
+STATIC void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self_in, mp_int_t timeout_ms);
+#endif
+
+// The port provides implementations of the above in this file.
+#include MICROPY_PY_MACHINE_WDT_INCLUDEFILE
+
+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);
+
+    // Create WDT instance.
+    machine_wdt_obj_t *self = mp_machine_wdt_make_new_instance(args[ARG_id].u_int, args[ARG_timeout].u_int);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// WDT.feed()
+STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
+    machine_wdt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_machine_wdt_feed(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
+
+#if MICROPY_PY_MACHINE_WDT_TIMEOUT_MS
+// WDT.timeout_ms(timeout)
+STATIC mp_obj_t machine_wdt_timeout_ms(mp_obj_t self_in, mp_obj_t timeout_in) {
+    machine_wdt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t timeout_ms = mp_obj_get_int(timeout_in);
+    mp_machine_wdt_timeout_ms_set(self, timeout_ms);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_wdt_timeout_ms_obj, machine_wdt_timeout_ms);
+#endif
+
+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) },
+    #if MICROPY_PY_MACHINE_WDT_TIMEOUT_MS
+    { MP_ROM_QSTR(MP_QSTR_timeout_ms), MP_ROM_PTR(&machine_wdt_timeout_ms_obj) },
+    #endif
+};
+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
+    );
+
+#endif // MICROPY_PY_MACHINE_WDT
diff --git a/ports/stm32/wdt.h b/extmod/modmachine.h
similarity index 63%
rename from ports/stm32/wdt.h
rename to extmod/modmachine.h
index d60bb7e9e6425..794c62cde2e78 100644
--- a/ports/stm32/wdt.h
+++ b/extmod/modmachine.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 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
@@ -23,9 +23,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STM32_WDT_H
-#define MICROPY_INCLUDED_STM32_WDT_H
 
-extern const mp_obj_type_t pyb_wdt_type;
+#ifndef MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
+#define MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
 
-#endif // MICROPY_INCLUDED_STM32_WDT_H
+#include "py/obj.h"
+
+// A port must provide these types, but they are otherwise opaque.
+typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
+
+// These classes correspond to machine.Type entries in the machine module.
+// Their Python bindings are implemented in extmod, and their implementation
+// is provided by a port.
+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_timer_type;
+extern const mp_obj_type_t machine_wdt_type;
+
+#endif // MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index f4487d69d4646..deee201eefaba 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -93,7 +93,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	pybspi.c \
 	pybtimer.c \
 	pybuart.c \
-	pybwdt.c \
 	)
 
 APP_CC3100_SRC_C = $(addprefix drivers/cc3100/src/,\
diff --git a/ports/cc3200/mods/pybwdt.c b/ports/cc3200/mods/machine_wdt.c
similarity index 68%
rename from ports/cc3200/mods/pybwdt.c
rename to ports/cc3200/mods/machine_wdt.c
index 589f53cf1275d..b20ef7eb93cd5 100644
--- a/ports/cc3200/mods/pybwdt.c
+++ b/ports/cc3200/mods/machine_wdt.c
@@ -24,11 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
 
-#include "py/mpconfig.h"
-#include "py/obj.h"
-#include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "inc/hw_types.h"
@@ -40,8 +38,6 @@
 #include "prcm.h"
 #include "utils.h"
 #include "pybwdt.h"
-#include "mperror.h"
-
 
 /******************************************************************************
  DECLARE CONSTANTS
@@ -52,18 +48,18 @@
 /******************************************************************************
  DECLARE TYPES
  ******************************************************************************/
-typedef struct {
+typedef struct _machine_wdt_obj_t {
     mp_obj_base_t base;
     bool    servers;
     bool    servers_sleeping;
     bool    simplelink;
     bool    running;
-} pyb_wdt_obj_t;
+} machine_wdt_obj_t;
 
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC pyb_wdt_obj_t pyb_wdt_obj = {.servers = false, .servers_sleeping = false, .simplelink = false, .running = false};
+STATIC machine_wdt_obj_t machine_wdt_obj = {.servers = false, .servers_sleeping = false, .simplelink = false, .running = false};
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
@@ -74,39 +70,28 @@ void pybwdt_init0 (void) {
 }
 
 void pybwdt_srv_alive (void) {
-    pyb_wdt_obj.servers = true;
+    machine_wdt_obj.servers = true;
 }
 
 void pybwdt_srv_sleeping (bool state) {
-    pyb_wdt_obj.servers_sleeping = state;
+    machine_wdt_obj.servers_sleeping = state;
 }
 
 void pybwdt_sl_alive (void) {
-    pyb_wdt_obj.simplelink = true;
+    machine_wdt_obj.simplelink = true;
 }
 
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC const mp_arg_t pyb_wdt_init_args[] = {
-    { MP_QSTR_id,                             MP_ARG_OBJ,  {.u_obj = mp_const_none} },
-    { MP_QSTR_timeout,                        MP_ARG_INT,  {.u_int = 5000} },   // 5 s
-};
-STATIC mp_obj_t pyb_wdt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    // check the arguments
-    mp_map_t kw_args;
-    mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
-    mp_arg_val_t args[MP_ARRAY_SIZE(pyb_wdt_init_args)];
-    mp_arg_parse_all(n_args, all_args, &kw_args, MP_ARRAY_SIZE(args), pyb_wdt_init_args, args);
-
-    if (args[0].u_obj != mp_const_none && mp_obj_get_int(args[0].u_obj) > 0) {
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+    if (id != 0) {
         mp_raise_OSError(MP_ENODEV);
     }
-    uint timeout_ms = args[1].u_int;
     if (timeout_ms < PYBWDT_MIN_TIMEOUT_MS) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
-    if (pyb_wdt_obj.running) {
+    if (machine_wdt_obj.running) {
         mp_raise_OSError(MP_EPERM);
     }
 
@@ -116,10 +101,10 @@ STATIC mp_obj_t pyb_wdt_make_new(const mp_obj_type_t *type, size_t n_args, size_
     // Unlock to be able to configure the registers
     MAP_WatchdogUnlock(WDT_BASE);
 
-#ifdef DEBUG
+    #ifdef DEBUG
     // make the WDT stall when the debugger stops on a breakpoint
     MAP_WatchdogStallEnable (WDT_BASE);
-#endif
+    #endif
 
     // set the watchdog timer reload value
     // the WDT trigger a system reset after the second timeout
@@ -128,33 +113,16 @@ STATIC mp_obj_t pyb_wdt_make_new(const mp_obj_type_t *type, size_t n_args, size_
 
     // start the timer. Once it's started, it cannot be disabled.
     MAP_WatchdogEnable(WDT_BASE);
-    pyb_wdt_obj.base.type = &pyb_wdt_type;
-    pyb_wdt_obj.running = true;
+    machine_wdt_obj.base.type = &machine_wdt_type;
+    machine_wdt_obj.running = true;
 
-    return (mp_obj_t)&pyb_wdt_obj;
+    return &machine_wdt_obj;
 }
 
-STATIC mp_obj_t pyb_wdt_feed(mp_obj_t self_in) {
-    pyb_wdt_obj_t *self = self_in;
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     if ((self->servers || self->servers_sleeping) && self->simplelink && self->running) {
         self->servers = false;
         self->simplelink = false;
         MAP_WatchdogIntClear(WDT_BASE);
     }
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_wdt_feed_obj, pyb_wdt_feed);
-
-STATIC const mp_rom_map_elem_t pybwdt_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&pyb_wdt_feed_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(pybwdt_locals_dict, pybwdt_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_wdt_type,
-    MP_QSTR_WDT,
-    MP_TYPE_FLAG_NONE,
-    make_new, pyb_wdt_make_new,
-    locals_dict, &pybwdt_locals_dict
-    );
-
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index bdf963c31a601..107efaef160be 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -30,6 +30,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
@@ -51,7 +52,6 @@
 #include "pybadc.h"
 #include "pybi2c.h"
 #include "pybsd.h"
-#include "pybwdt.h"
 #include "pybsleep.h"
 #include "pybspi.h"
 #include "pybtimer.h"
@@ -189,7 +189,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&pyb_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&pyb_timer_type) },
-    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&pyb_wdt_type) },
+    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
     { MP_ROM_QSTR(MP_QSTR_SD),                  MP_ROM_PTR(&pyb_sd_type) },
 
     // class constants
diff --git a/ports/cc3200/mods/pybwdt.h b/ports/cc3200/mods/pybwdt.h
index 275c49435c547..e106ae30ea006 100644
--- a/ports/cc3200/mods/pybwdt.h
+++ b/ports/cc3200/mods/pybwdt.h
@@ -26,9 +26,7 @@
 #ifndef MICROPY_INCLUDED_CC3200_MODS_PYBWDT_H
 #define MICROPY_INCLUDED_CC3200_MODS_PYBWDT_H
 
-#include "py/obj.h"
-
-extern const mp_obj_type_t pyb_wdt_type;
+#include <stdbool.h>
 
 void pybwdt_init0 (void);
 void pybwdt_srv_alive (void);
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index b6b412f178f3e..6b2dc7ca0969e 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -120,6 +120,8 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS                (1)
 #define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
+#define MICROPY_PY_MACHINE_WDT                      (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE          "ports/cc3200/mods/machine_wdt.c"
 
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF      (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE        (0)
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index f5219048f35a6..e1dd546ea3efc 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -86,7 +86,6 @@ list(APPEND MICROPY_SOURCE_PORT
     esp32_ulp.c
     modesp32.c
     machine_hw_spi.c
-    machine_wdt.c
     mpthreadport.c
     machine_rtc.c
     machine_sdcard.c
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
index bf924c35e09b0..cee761f265e79 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -25,16 +25,11 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
-
-#include "py/nlr.h"
-#include "py/obj.h"
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
 
 #include "esp_task_wdt.h"
 
-const mp_obj_type_t machine_wdt_type;
-
 typedef struct _machine_wdt_obj_t {
     mp_obj_base_t base;
     esp_task_wdt_user_handle_t twdt_user_handle;
@@ -44,25 +39,17 @@ STATIC machine_wdt_obj_t wdt_default = {
     {&machine_wdt_type}, 0
 };
 
-STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, 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} }
-    };
-    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_id].u_int != 0) {
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+    if (id != 0) {
         mp_raise_ValueError(NULL);
     }
 
-    if (args[ARG_timeout].u_int <= 0) {
+    if (timeout_ms <= 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("WDT timeout too short"));
     }
 
     esp_task_wdt_config_t config = {
-        .timeout_ms = args[ARG_timeout].u_int,
+        .timeout_ms = timeout_ms,
         .idle_core_mask = 0,
         .trigger_panic = true,
     };
@@ -81,25 +68,10 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
     return &wdt_default;
 }
 
-STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
-    (void)self_in;
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+    (void)self;
     mp_int_t rs_code = esp_task_wdt_reset_user(wdt_default.twdt_user_handle);
     if (rs_code != ESP_OK) {
         mp_raise_OSError(rs_code);
     }
-    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);
-
-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/esp32/modmachine.c b/ports/esp32/modmachine.c
index 31fa589aed0a2..f8567973b07bb 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -47,6 +47,7 @@
 #include "extmod/machine_pwm.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
 
@@ -297,7 +298,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { 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) },
+    #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
+    #endif
     #if MICROPY_HW_ENABLE_SDCARD
     { MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&machine_sdcard_type) },
     #endif
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 24417f6107467..24f27101a82c7 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -10,7 +10,6 @@ typedef enum {
 } wake_type_t;
 
 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;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 04a745262dcb2..5d39323c58cc6 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -115,6 +115,8 @@
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (1)
 #endif
+#define MICROPY_PY_MACHINE_WDT              (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/esp32/machine_wdt.c"
 #define MICROPY_PY_NETWORK (1)
 #ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
 #if CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 75b40763381c9..5982987d7b614 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -116,7 +116,6 @@ SRC_C = \
 	machine_rtc.c \
 	machine_adc.c \
 	machine_uart.c \
-	machine_wdt.c \
 	machine_hspi.c \
 	modesp.c \
 	network_wlan.c \
diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index 39a5d51119efb..074ee56598cf7 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -24,27 +24,22 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
 
-#include "py/runtime.h"
 #include "user_interface.h"
-#include "etshal.h"
 #include "ets_alt_task.h"
 
-const mp_obj_type_t esp_wdt_type;
-
 typedef struct _machine_wdt_obj_t {
     mp_obj_base_t base;
 } machine_wdt_obj_t;
 
-STATIC machine_wdt_obj_t wdt_default = {{&esp_wdt_type}};
-
-STATIC mp_obj_t machine_wdt_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, 0, 1, false);
+STATIC machine_wdt_obj_t wdt_default = {{&machine_wdt_type}};
 
-    mp_int_t id = 0;
-    if (n_args > 0) {
-        id = mp_obj_get_int(args[0]);
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+    // The timeout on ESP8266 is fixed, so raise an exception if the argument is not the default.
+    if (timeout_ms != 5000) {
+        mp_raise_ValueError(NULL);
     }
 
     switch (id) {
@@ -57,22 +52,7 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
     }
 }
 
-STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
-    (void)self_in;
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+    (void)self;
     system_soft_wdt_feed();
-    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);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    esp_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/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 64346b4debdc4..eee5f3c683d7a 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -43,6 +43,7 @@
 #include "extmod/machine_pwm.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "modmachine.h"
 
 #include "xtirq.h"
@@ -58,8 +59,6 @@
 // #define MACHINE_WAKE_SLEEP (0x02)
 #define MACHINE_WAKE_DEEPSLEEP (0x04)
 
-extern const mp_obj_type_t esp_wdt_type;
-
 STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // get
@@ -423,7 +422,9 @@ 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_Timer), MP_ROM_PTR(&esp_timer_type) },
-    { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&esp_wdt_type) },
+    #if MICROPY_PY_MACHINE_WDT
+    { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
+    #endif
     { 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(&machine_pwm_type) },
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 18b2e47e29dc0..2a51f8bcbbce5 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -71,6 +71,8 @@
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
+#define MICROPY_PY_MACHINE_WDT      (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE "ports/esp8266/machine_wdt.c"
 #define MICROPY_PY_NETWORK (1)
 #ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp8266"
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 3521f922887ff..d29b38e04034c 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -205,7 +205,6 @@ SRC_C += \
 	machine_sdcard.c \
 	machine_spi.c \
 	machine_uart.c \
-	machine_wdt.c \
 	main.c \
 	mbedtls/mbedtls_port.c \
 	mimxrt_flash.c \
diff --git a/ports/mimxrt/machine_wdt.c b/ports/mimxrt/machine_wdt.c
index f5f14f9ef7b20..176e114f72960 100644
--- a/ports/mimxrt/machine_wdt.c
+++ b/ports/mimxrt/machine_wdt.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
 
 #include "fsl_wdog.h"
 
@@ -38,19 +38,8 @@ typedef struct _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);
-
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     // 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);
     }
@@ -58,51 +47,33 @@ 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).
     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;
+    if (timeout_ms < MIN_TIMEOUT) {
+        timeout_ms = MIN_TIMEOUT;
+    } else if (timeout_ms > MAX_TIMEOUT) {
+        timeout_ms = MAX_TIMEOUT;
     }
-    config.timeoutValue = (timeout / 500) - 1;
+    config.timeoutValue = (timeout_ms / 500) - 1;
     WDOG_Init(WDOG1, &config);
 
-    return MP_OBJ_FROM_PTR(&machine_wdt);
+    return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
-    (void)self_in;
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+    (void)self;
     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);
+STATIC void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self, mp_int_t timeout_ms) {
+    (void)self;
+
     // confine to the valid range
-    if (timeout < MIN_TIMEOUT) {
-        timeout = MIN_TIMEOUT;
-    } else if (timeout > MAX_TIMEOUT) {
-        timeout = MAX_TIMEOUT;
+    if (timeout_ms < MIN_TIMEOUT) {
+        timeout_ms = MIN_TIMEOUT;
+    } else if (timeout_ms > MAX_TIMEOUT) {
+        timeout_ms = MAX_TIMEOUT;
     }
-    timeout = (timeout / 500) - 1;
+    uint32_t timeout = (timeout_ms / 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);
-
-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/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 16eae22029b58..c2f3559cf82e6 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -33,6 +33,7 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "led.h"
 #include "pin.h"
@@ -204,7 +205,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #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) },
+    #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
     { MP_ROM_QSTR(MP_QSTR_deepsleep),           MP_ROM_PTR(&machine_deepsleep_obj) },
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 478b1c77362a1..cf40505ea5d1b 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -38,7 +38,6 @@ 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_wdt_type;
 
 void machine_adc_init(void);
 void machine_pin_irq_deinit(void);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index feb6cb2660787..1eb3b17112065 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -94,6 +94,9 @@ 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_MACHINE_WDT              (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/mimxrt/machine_wdt.c"
+#define MICROPY_PY_MACHINE_WDT_TIMEOUT_MS   (1)
 #define MICROPY_SOFT_TIMER_TICKS_MS         systick_ms
 #define MICROPY_PY_ONEWIRE                  (1)
 
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index 5dbda6bda8ae7..ec494b798c8a4 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -30,7 +30,6 @@
 #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;
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index fae4cda756333..b8cf4d7becfae 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -126,7 +126,6 @@ set(MICROPY_SOURCE_PORT
     machine_spi.c
     machine_timer.c
     machine_uart.c
-    machine_wdt.c
     main.c
     modmachine.c
     modrp2.c
diff --git a/ports/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
index 6574a6180f8a2..58c372176c721 100644
--- a/ports/rp2/machine_wdt.c
+++ b/ports/rp2/machine_wdt.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
 
 #include "hardware/watchdog.h"
 
@@ -38,49 +38,23 @@ typedef struct _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);
-
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     // 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).
-    uint32_t timeout = args[ARG_timeout].u_int;
+    uint32_t timeout = timeout_ms;
     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);
+    return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
-    (void)self_in;
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+    (void)self;
     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);
-
-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/rp2/modmachine.c b/ports/rp2/modmachine.c
index 35c938b54bd4f..eedeca1e3b46f 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -35,6 +35,7 @@
 #include "extmod/machine_pwm.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 
 #include "modmachine.h"
 #include "uart.h"
@@ -266,7 +267,9 @@ 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_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
+    #endif
 
     { 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) },
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 45ccd49e8ce60..559fb34814a9c 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -11,7 +11,6 @@ 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;
-extern const mp_obj_type_t machine_wdt_type;
 
 void machine_pin_init(void);
 void machine_pin_deinit(void);
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 056e2df4fe203..bf43b5ce7f6f6 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -122,6 +122,8 @@
 #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_MACHINE_WDT                  (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE      "ports/rp2/machine_wdt.c"
 #define MICROPY_PY_ONEWIRE                      (1)
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 6dd71bd93f4c5..8e4327073ca5b 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -104,7 +104,6 @@ SRC_C += \
 	machine_rtc.c \
 	machine_spi.c \
 	machine_uart.c \
-	machine_wdt.c \
 	main.c \
 	modmachine.c \
 	modsamd.c \
diff --git a/ports/samd/machine_wdt.c b/ports/samd/machine_wdt.c
index d7dcfcf54e673..d6fadfd1232db 100644
--- a/ports/samd/machine_wdt.c
+++ b/ports/samd/machine_wdt.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
 
 #include "sam.h"
 
@@ -76,27 +76,15 @@ STATIC void set_timeout(uint32_t timeout) {
     #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);
-
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     #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)
 
@@ -112,37 +100,17 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     #endif
 
-    set_timeout(timeout);
+    set_timeout(timeout_ms);
 
-    return MP_OBJ_FROM_PTR(&machine_wdt);
+    return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
-    (void)self_in;
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+    (void)self;
     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 void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self, mp_int_t timeout_ms) {
+    (void)self;
+    set_timeout(timeout_ms);
 }
-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 9d5b7c2e27241..97718401a30f5 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -31,6 +31,7 @@
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "drivers/dht/dht.h"
 #include "shared/runtime/pyexec.h"
 #include "modmachine.h"
@@ -261,7 +262,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
     #endif
+    #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
+    #endif
     #if MICROPY_PY_MACHINE_RTC
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
     #endif
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index b3ba44039a8d4..d62b14a0aa474 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -49,7 +49,6 @@ extern const mp_obj_type_t machine_timer_type;
 #if MICROPY_PY_MACHINE_UART
 extern const mp_obj_type_t machine_uart_type;
 #endif
-extern const mp_obj_type_t machine_wdt_type;
 #if MICROPY_PY_MACHINE_RTC
 extern const mp_obj_type_t machine_rtc_type;
 #endif
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 011119fd11719..3505d8db1e376 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -127,6 +127,9 @@
 #endif
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_DHT_READINTO     (1)
+#define MICROPY_PY_MACHINE_WDT              (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/samd/machine_wdt.c"
+#define MICROPY_PY_MACHINE_WDT_TIMEOUT_MS   (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_PLATFORM                 (1)
 #define MICROPY_PLATFORM_VERSION            "ASF4"
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index dcfc8dfd5413b..589ef4cdbb1d8 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -329,7 +329,6 @@ SRC_C += \
 	fdcan.c \
 	pyb_can.c \
 	usb.c \
-	wdt.c \
 	eth.c \
 	gccollect.c \
 	help.c \
diff --git a/ports/stm32/wdt.c b/ports/stm32/machine_wdt.c
similarity index 60%
rename from ports/stm32/wdt.c
rename to ports/stm32/machine_wdt.c
index e541e4d36b4fe..e0605751d1f4e 100644
--- a/ports/stm32/wdt.c
+++ b/ports/stm32/machine_wdt.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2016-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
@@ -24,40 +24,28 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
 
-#include "py/runtime.h"
-#include "wdt.h"
+#include "py/mphal.h"
 
 #if defined(STM32H7)
 #define IWDG (IWDG1)
 #endif
 
-typedef struct _pyb_wdt_obj_t {
+typedef struct _machine_wdt_obj_t {
     mp_obj_base_t base;
-} pyb_wdt_obj_t;
+} machine_wdt_obj_t;
 
-STATIC const pyb_wdt_obj_t pyb_wdt = {{&pyb_wdt_type}};
+STATIC const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
 
-STATIC mp_obj_t pyb_wdt_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_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} },
-    };
-    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_int_t id = args[ARG_id].u_int;
+STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     if (id != 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("WDT(%d) doesn't exist"), id);
     }
 
-    // timeout is in milliseconds
-    mp_int_t timeout = args[ARG_timeout].u_int;
-
     // compute prescaler
+    int32_t timeout = timeout_ms;
     uint32_t prescaler;
     for (prescaler = 0; prescaler < 6 && timeout >= 512; ++prescaler, timeout /= 2) {
     }
@@ -86,26 +74,10 @@ STATIC mp_obj_t pyb_wdt_make_new(const mp_obj_type_t *type, size_t n_args, size_
     // start the watch dog
     IWDG->KR = 0xcccc;
 
-    return MP_OBJ_FROM_PTR(&pyb_wdt);
+    return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC mp_obj_t pyb_wdt_feed(mp_obj_t self_in) {
-    (void)self_in;
+STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+    (void)self;
     IWDG->KR = 0xaaaa;
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_wdt_feed_obj, pyb_wdt_feed);
-
-STATIC const mp_rom_map_elem_t pyb_wdt_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&pyb_wdt_feed_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(pyb_wdt_locals_dict, pyb_wdt_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_wdt_type,
-    MP_QSTR_WDT,
-    MP_TYPE_FLAG_NONE,
-    make_new, pyb_wdt_make_new,
-    locals_dict, &pyb_wdt_locals_dict
-    );
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 69fe8f4f54a83..926dc30413e33 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -38,6 +38,7 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
@@ -56,7 +57,6 @@
 #include "i2c.h"
 #include "spi.h"
 #include "uart.h"
-#include "wdt.h"
 
 #if defined(STM32G0)
 // G0 has BOR and POR combined
@@ -447,7 +447,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { 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) },
+    #if MICROPY_PY_MACHINE_WDT
+    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     #if 0
     { MP_ROM_QSTR(MP_QSTR_HeartBeat),           MP_ROM_PTR(&pyb_heartbeat_type) },
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 2d2d81486bbb7..0e9df54ff469a 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -122,6 +122,8 @@
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_PY_MACHINE_WDT      (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE "ports/stm32/machine_wdt.c"
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)

From 7e7af715271c8c3ca3ec8c600b835aa388624461 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 20 Oct 2023 16:00:36 +1100
Subject: [PATCH 0455/3129] extmod/machine_pwm: Remove header file and move
 decls to .c file.

With public declarations moved to extmod/modmachine.h.  It's now mandatory
for a port to define MICROPY_PY_MACHINE_PWM_INCLUDEFILE if it enables
MICROPY_PY_MACHINE_PWM.  This follows how extmod/machine_wdt.c works.

All ports have been updated to work with this modified scheme.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_pwm.c                   | 21 ++++++++--
 extmod/machine_pwm.h                   | 55 --------------------------
 extmod/modmachine.h                    |  2 +
 ports/esp32/machine_pwm.c              |  6 +--
 ports/esp32/modmachine.c               |  1 -
 ports/esp8266/machine_pwm.c            |  6 +--
 ports/esp8266/modmachine.c             |  1 -
 ports/mimxrt/machine_pwm.c             |  5 ++-
 ports/mimxrt/modmachine.h              |  1 -
 ports/nrf/modules/machine/modmachine.c |  1 +
 ports/nrf/modules/machine/pwm.c        | 41 +++++++------------
 ports/nrf/modules/machine/pwm.h        |  2 -
 ports/nrf/modules/machine/soft_pwm.c   | 15 ++-----
 ports/renesas-ra/machine_pwm.c         | 10 ++---
 ports/renesas-ra/modmachine.c          |  2 +-
 ports/rp2/machine_pwm.c                |  6 +--
 ports/rp2/modmachine.c                 |  1 -
 ports/samd/machine_pwm.c               |  9 +----
 ports/samd/modmachine.h                |  3 --
 19 files changed, 57 insertions(+), 131 deletions(-)
 delete mode 100644 extmod/machine_pwm.h

diff --git a/extmod/machine_pwm.c b/extmod/machine_pwm.c
index 8a633b37939d4..13b96eb5d4ec7 100644
--- a/extmod/machine_pwm.c
+++ b/extmod/machine_pwm.c
@@ -28,11 +28,26 @@
 
 #if MICROPY_PY_MACHINE_PWM
 
-#include "extmod/machine_pwm.h"
+#include "extmod/modmachine.h"
 
-#ifdef MICROPY_PY_MACHINE_PWM_INCLUDEFILE
-#include MICROPY_PY_MACHINE_PWM_INCLUDEFILE
+// The port must provide implementations of these low-level PWM functions.
+STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+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);
+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);
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self);
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self);
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq);
+#if MICROPY_PY_MACHINE_PWM_DUTY
+STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self);
+STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty);
 #endif
+STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self);
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16);
+STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self);
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns);
+
+// The port provides implementations of the above in this file.
+#include MICROPY_PY_MACHINE_PWM_INCLUDEFILE
 
 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);
diff --git a/extmod/machine_pwm.h b/extmod/machine_pwm.h
deleted file mode 100644
index f0953014cab07..0000000000000
--- a/extmod/machine_pwm.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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/extmod/modmachine.h b/extmod/modmachine.h
index 794c62cde2e78..22bd0d625833d 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -30,12 +30,14 @@
 #include "py/obj.h"
 
 // A port must provide these types, but they are otherwise opaque.
+typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
 typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 
 // These classes correspond to machine.Type entries in the machine module.
 // Their Python bindings are implemented in extmod, and their implementation
 // is provided by a port.
 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_spi_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_wdt_type;
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 462d0fa79c740..03ef2d77fd299 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -27,11 +27,11 @@
  * THE SOFTWARE.
  */
 
-#include <math.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
 
-#include "py/runtime.h"
+#include <math.h>
 #include "py/mphal.h"
-
 #include "driver/ledc.h"
 #include "esp_err.h"
 #include "soc/gpio_sig_map.h"
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index f8567973b07bb..fe6d18e7863a3 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -44,7 +44,6 @@
 #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 "extmod/modmachine.h"
diff --git a/ports/esp8266/machine_pwm.c b/ports/esp8266/machine_pwm.c
index 58c8fa915fd56..b9e499d252bc1 100644
--- a/ports/esp8266/machine_pwm.c
+++ b/ports/esp8266/machine_pwm.c
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
 
+#include "py/mphal.h"
 #include "esppwm.h"
 
 typedef struct _machine_pwm_obj_t {
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index eee5f3c683d7a..95048952c42fa 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -40,7 +40,6 @@
 #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 "extmod/modmachine.h"
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index a50b67cc8ca29..7b95d78877cdf 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -25,9 +25,10 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
+
 #include "py/mphal.h"
-#include "modmachine.h"
 #include "pin.h"
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index cf40505ea5d1b..92d875b4d0848 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -32,7 +32,6 @@
 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;
 extern const mp_obj_type_t machine_spi_type;
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 616757a96aea6..59f163dee24cc 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -33,6 +33,7 @@
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
+#include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index 96917769eed49..f0c11fa8fc08c 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -25,15 +25,11 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
 
-#include "py/nlr.h"
-#include "py/runtime.h"
+#include <string.h>
 #include "py/mphal.h"
-
-#if MICROPY_PY_MACHINE_HW_PWM
-
 #include "pin.h"
 #include "genhdr/pins.h"
 #include "pwm.h"
@@ -154,11 +150,6 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 /* MicroPython bindings for machine API                                       */
 
 STATIC void machine_hard_pwm_start(const machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_deinit(const machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_freq_set(const machine_pwm_obj_t *self, mp_int_t freq);
-STATIC void mp_machine_pwm_duty_set(const machine_pwm_obj_t *self, mp_int_t duty);
-STATIC void mp_machine_pwm_duty_set_u16(const machine_pwm_obj_t *self, mp_int_t duty_u16);
-STATIC void mp_machine_pwm_duty_set_ns(const machine_pwm_obj_t *self, mp_int_t duty_ns);
 
 static const mp_arg_t allowed_args[] = {
     { MP_QSTR_pin,      MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -171,7 +162,7 @@ static const mp_arg_t allowed_args[] = {
     { MP_QSTR_channel,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
 };
 
-STATIC void mp_machine_pwm_init_helper(const machine_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_pin, ARG_freq, ARG_duty, ARG_duty_u16, ARG_duty_ns, ARG_invert, ARG_device, ARG_channel };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -245,7 +236,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     // start the PWM running for this channel
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
-    mp_machine_pwm_init_helper(self, n_args, all_args, &kw_args);
+    mp_machine_pwm_init_helper((machine_pwm_obj_t *)self, n_args, all_args, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -253,23 +244,23 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
 // Stop all PWM modules and release them
 void pwm_deinit_all(void) {
     for (int i = 0; i < MP_ARRAY_SIZE(machine_hard_pwm_instances); i++) {
-        mp_machine_pwm_deinit(&machine_hard_pwm_obj[i * NRF_PWM_CHANNEL_COUNT]);
+        mp_machine_pwm_deinit((machine_pwm_obj_t *)&machine_hard_pwm_obj[i * NRF_PWM_CHANNEL_COUNT]);
     }
     pwm_init0();
 }
 
 // Stop the PWM module, but do not release it.
-STATIC void mp_machine_pwm_deinit(const machine_pwm_obj_t *self) {
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     self->p_config->active = STOPPED;
     nrfx_pwm_stop(self->p_pwm, true);
     nrfx_pwm_uninit(self->p_pwm);
 }
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(const machine_pwm_obj_t *self) {
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     return MP_OBJ_NEW_SMALL_INT(self->p_config->freq);
 }
 
-STATIC void mp_machine_pwm_freq_set(const machine_pwm_obj_t *self, mp_int_t freq) {
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
 
     uint8_t div = 0;
     if (freq > (PWM_MAX_BASE_FREQ / 3) || freq <= (PWM_MIN_BASE_FREQ / PWM_MAX_PERIOD)) {
@@ -285,7 +276,7 @@ STATIC void mp_machine_pwm_freq_set(const machine_pwm_obj_t *self, mp_int_t freq
     machine_hard_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get(const machine_pwm_obj_t *self) {
+STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_PERCENT) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else if (self->p_config->duty_mode[self->channel] == DUTY_U16) {
@@ -295,13 +286,13 @@ STATIC mp_obj_t mp_machine_pwm_duty_get(const machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set(const machine_pwm_obj_t *self, mp_int_t duty) {
+STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     self->p_config->duty[self->channel] = duty;
     self->p_config->duty_mode[self->channel] = DUTY_PERCENT;
     machine_hard_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(const machine_pwm_obj_t *self) {
+STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_U16) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else if (self->p_config->duty_mode[self->channel] == DUTY_PERCENT) {
@@ -311,13 +302,13 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_u16(const machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_u16(const machine_pwm_obj_t *self, mp_int_t duty) {
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
     self->p_config->duty[self->channel] = duty;
     self->p_config->duty_mode[self->channel] = DUTY_U16;
     machine_hard_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_ns(const machine_pwm_obj_t *self) {
+STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_NS) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else {
@@ -325,7 +316,7 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_ns(const machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_ns(const machine_pwm_obj_t *self, mp_int_t duty) {
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
     self->p_config->duty[self->channel] = duty;
     self->p_config->duty_mode[self->channel] = DUTY_NS;
     machine_hard_pwm_start(self);
@@ -393,5 +384,3 @@ STATIC void machine_hard_pwm_start(const machine_pwm_obj_t *self) {
         0, // Loop disabled.
         0);
 }
-
-#endif // MICROPY_PY_MACHINE_HW_PWM
diff --git a/ports/nrf/modules/machine/pwm.h b/ports/nrf/modules/machine/pwm.h
index 4c0528fb4cf37..aceb76ba06fca 100644
--- a/ports/nrf/modules/machine/pwm.h
+++ b/ports/nrf/modules/machine/pwm.h
@@ -26,5 +26,3 @@
 
 void pwm_init0(void);
 void pwm_deinit_all(void);
-
-extern const mp_obj_type_t machine_pwm_type;
diff --git a/ports/nrf/modules/machine/soft_pwm.c b/ports/nrf/modules/machine/soft_pwm.c
index 27783328eb8cd..c69b5f0bbe022 100644
--- a/ports/nrf/modules/machine/soft_pwm.c
+++ b/ports/nrf/modules/machine/soft_pwm.c
@@ -24,12 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include "py/runtime.h"
-#include "py/mphal.h"
-
-#if MICROPY_PY_MACHINE_SOFT_PWM
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
 
+#include "py/mphal.h"
 #include "softpwm.h"
 
 typedef enum {
@@ -62,11 +60,6 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 // MicroPython bindings for machine API
 
 STATIC void machine_soft_pwm_start(machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq);
-STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty);
-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_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, ARG_duty_u16, ARG_duty_ns };
@@ -210,5 +203,3 @@ STATIC void machine_soft_pwm_start(machine_pwm_obj_t *self) {
         pwm_set_duty_cycle(self->pwm_pin, duty_width);
     }
 }
-
-#endif // MICROPY_PY_MACHINE_HW_PWM
diff --git a/ports/renesas-ra/machine_pwm.c b/ports/renesas-ra/machine_pwm.c
index f2199805a1e76..936f698e3398c 100644
--- a/ports/renesas-ra/machine_pwm.c
+++ b/ports/renesas-ra/machine_pwm.c
@@ -25,15 +25,13 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
+
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_pwm.h"
 #include "pin.h"
 #include "ra/ra_gpt.h"
-#include "modmachine.h"
-
-#if MICROPY_HW_ENABLE_HW_PWM
 
 typedef struct _machine_pwm_obj_t {
     mp_obj_base_t base;
@@ -353,5 +351,3 @@ STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns
         }
     }
 }
-
-#endif // MICROPY_HW_ENABLE_HW_PWM
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index bc85d9b7f88bb..6f7b8b8c07acb 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -40,7 +40,7 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
-#include "extmod/machine_pwm.h"
+#include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index a14ba0a43abb9..0248b3142a0b6 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
 
+#include "py/mphal.h"
 #include "hardware/clocks.h"
 #include "hardware/pwm.h"
 
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index eedeca1e3b46f..11de929e7b6be 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -32,7 +32,6 @@
 #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"
 #include "extmod/modmachine.h"
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index 1b5f6c3ed8dd1..196a9b14355d5 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -25,15 +25,12 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-
-#if MICROPY_PY_MACHINE_PWM
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_pwm.c via MICROPY_PY_MACHINE_PWM_INCLUDEFILE.
 
 #include <string.h>
 #include "py/mphal.h"
-#include "modmachine.h"
 #include "clock_config.h"
-
 #include "sam.h"
 #include "pin_af.h"
 
@@ -396,5 +393,3 @@ STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns
     duty_type_flags[self->device] &= ~(1 << self->channel);
     mp_machine_pwm_start(self);
 }
-
-#endif
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index d62b14a0aa474..faa43b7af7f7d 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -39,9 +39,6 @@ extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_i2c_type;
 #endif
 extern const mp_obj_type_t machine_pin_type;
-#if MICROPY_PY_MACHINE_PWM
-extern const mp_obj_type_t machine_pwm_type;
-#endif
 #if MICROPY_PY_MACHINE_SPI
 extern const mp_obj_type_t machine_spi_type;
 #endif

From f2f3ef162d8915096379030838c314071b445ef4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 9 Oct 2023 12:12:18 +1100
Subject: [PATCH 0456/3129] extmod/machine_i2s: Factor ports' I2S Python
 bindings to common code.

This factors the basic top-level I2S class code from the ports into
extmod/machine_i2s.c:
- I2S class definition and method table.
- The init and deinit method wrappers.
- The make_new code.

Further factoring will follow.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake                |   1 +
 extmod/extmod.mk                   |   1 +
 extmod/machine_i2s.c               | 111 +++++++++++++++++++++++++++++
 extmod/modmachine.h                |   2 +
 ports/esp32/esp32_common.cmake     |   1 -
 ports/esp32/machine_i2s.c          |  80 +++------------------
 ports/esp32/modmachine.h           |   1 -
 ports/esp32/mpconfigport.h         |   4 ++
 ports/mimxrt/Makefile              |   1 -
 ports/mimxrt/machine_i2s.c         |  76 ++------------------
 ports/mimxrt/modmachine.h          |   1 -
 ports/mimxrt/mpconfigport.h        |   3 +
 ports/rp2/CMakeLists.txt           |   2 -
 ports/rp2/machine_i2s.c            |  76 +++-----------------
 ports/rp2/modmachine.h             |   1 -
 ports/rp2/mpconfigport.h           |   4 ++
 ports/stm32/Makefile               |   1 -
 ports/stm32/dma.c                  |   8 +--
 ports/stm32/machine_i2s.c          |  83 +++------------------
 ports/stm32/main.c                 |   2 +-
 ports/stm32/modmachine.c           |   2 +-
 ports/stm32/modmachine.h           |   1 -
 ports/stm32/mpconfigboard_common.h |   4 +-
 ports/stm32/mpconfigport.h         |   3 +
 24 files changed, 172 insertions(+), 297 deletions(-)
 create mode 100644 extmod/machine_i2s.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 063df70f5f853..ccb6f0465bff2 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -9,6 +9,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/btstack/modbluetooth_btstack.c
     ${MICROPY_EXTMOD_DIR}/machine_bitstream.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
+    ${MICROPY_EXTMOD_DIR}/machine_i2s.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c
     ${MICROPY_EXTMOD_DIR}/machine_pulse.c
     ${MICROPY_EXTMOD_DIR}/machine_pwm.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index a6c7826867731..44b41f5ffb094 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -4,6 +4,7 @@
 SRC_EXTMOD_C += \
 	extmod/machine_bitstream.c \
 	extmod/machine_i2c.c \
+	extmod/machine_i2s.c \
 	extmod/machine_mem.c \
 	extmod/machine_pinbase.c \
 	extmod/machine_pulse.c \
diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
new file mode 100644
index 0000000000000..53de7293f2cfa
--- /dev/null
+++ b/extmod/machine_i2s.c
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Mike Teachman
+ * Copyright (c) 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 "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_I2S
+
+#include "extmod/modmachine.h"
+
+// The port must provide implementations of these low-level I2S functions.
+STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id);
+STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self);
+
+// The port provides implementations of the above in this file.
+#include MICROPY_PY_MACHINE_I2S_INCLUDEFILE
+
+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);
+    mp_int_t i2s_id = mp_obj_get_int(args[0]);
+
+    machine_i2s_obj_t *self = mp_machine_i2s_make_new_instance(i2s_id);
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
+    mp_machine_i2s_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// I2S.init(...)
+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]);
+    mp_machine_i2s_deinit(self);
+    mp_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);
+
+// I2S.deinit()
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_machine_i2s_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
+
+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) },
+    #if MICROPY_PY_MACHINE_I2S_FINALISER
+    { MP_ROM_QSTR(MP_QSTR___del__),         MP_ROM_PTR(&machine_i2s_deinit_obj) },
+    #endif
+
+    // 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(MICROPY_PY_MACHINE_I2S_CONSTANT_RX) },
+    { MP_ROM_QSTR(MP_QSTR_TX),              MP_ROM_INT(MICROPY_PY_MACHINE_I2S_CONSTANT_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 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,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2s_type,
+    MP_QSTR_I2S,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
+    make_new, machine_i2s_make_new,
+    print, machine_i2s_print,
+    protocol, &i2s_stream_p,
+    locals_dict, &machine_i2s_locals_dict
+    );
+
+#endif // MICROPY_PY_MACHINE_I2S
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 22bd0d625833d..b0235dcf645b5 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -30,6 +30,7 @@
 #include "py/obj.h"
 
 // A port must provide these types, but they are otherwise opaque.
+typedef struct _machine_i2s_obj_t machine_i2s_obj_t;
 typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
 typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 
@@ -37,6 +38,7 @@ typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 // Their Python bindings are implemented in extmod, and their implementation
 // is provided by a port.
 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_spi_type;
 extern const mp_obj_type_t machine_timer_type;
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index e1dd546ea3efc..2c82c1f10f3cf 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -70,7 +70,6 @@ list(APPEND MICROPY_SOURCE_PORT
     machine_adcblock.c
     machine_dac.c
     machine_i2c.c
-    machine_i2s.c
     machine_uart.c
     modmachine.c
     network_common.c
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 95751c87c3e60..5a78e3b740f2d 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -24,19 +24,11 @@
  * 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"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
+
+#include "py/mphal.h"
 #include "py/stream.h"
-#include "py/objstr.h"
-#include "modmachine.h"
-#include "mphalport.h"
 
 #if MICROPY_PY_MACHINE_I2S
 
@@ -360,7 +352,7 @@ STATIC void task_for_non_blocking_mode(void *self_in) {
     }
 }
 
-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) {
+STATIC void mp_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,
@@ -501,10 +493,8 @@ STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         );
 }
 
-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]);
+STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
+    i2s_port_t port = i2s_id;
     if (port < 0 || port >= I2S_NUM_AUTO) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
     }
@@ -520,23 +510,10 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
         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);
+    return self;
 }
 
-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);
-    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);
+STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     i2s_driver_uninstall(self->port);
 
     if (self->non_blocking_mode_task != NULL) {
@@ -550,9 +527,7 @@ STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
     }
 
     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);
@@ -660,26 +635,6 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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) },
-    { 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) },
-
-    // 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);
 
@@ -802,23 +757,6 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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,
-};
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_i2s_type,
-    MP_QSTR_I2S,
-    MP_TYPE_FLAG_ITER_IS_STREAM,
-    make_new, machine_i2s_make_new,
-    print, machine_i2s_print,
-    protocol, &i2s_stream_p,
-    locals_dict, &machine_i2s_locals_dict
-    );
-
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_AUTO]);
 
 #endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 24f27101a82c7..abf029c473d61 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -17,7 +17,6 @@ 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_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;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5d39323c58cc6..8b59dc1225aee 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -115,6 +115,10 @@
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (1)
 #endif
+#define MICROPY_PY_MACHINE_I2S_INCLUDEFILE  "ports/esp32/machine_i2s.c"
+#define MICROPY_PY_MACHINE_I2S_FINALISER    (1)
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_RX  (I2S_MODE_MASTER | I2S_MODE_RX)
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_TX  (I2S_MODE_MASTER | I2S_MODE_TX)
 #define MICROPY_PY_MACHINE_WDT              (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/esp32/machine_wdt.c"
 #define MICROPY_PY_NETWORK (1)
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index d29b38e04034c..2f4b13ad9264e 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -198,7 +198,6 @@ SRC_C += \
 	machine_adc.c \
 	machine_bitstream.c \
 	machine_i2c.c \
-	machine_i2s.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 7711219441bed..979872dd16dd3 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -25,19 +25,11 @@
  * 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"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
+
 #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
@@ -845,7 +837,7 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
     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) {
+STATIC void mp_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,
@@ -994,10 +986,7 @@ STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         );
 }
 
-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]);
-
+STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     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);
     }
@@ -1021,23 +1010,10 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
     // 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);
+    return 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);
-
+STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     // use self->i2s_inst as in indication that I2S object has already been de-initialized
     if (self->i2s_inst != NULL) {
         EDMA_AbortTransfer(&self->edmaHandle);
@@ -1059,9 +1035,7 @@ STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
         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);
@@ -1142,25 +1116,6 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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);
 
@@ -1259,23 +1214,6 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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,
-};
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_i2s_type,
-    MP_QSTR_I2S,
-    MP_TYPE_FLAG_ITER_IS_STREAM,
-    make_new, machine_i2s_make_new,
-    print, machine_i2s_print,
-    protocol, &i2s_stream_p,
-    locals_dict, &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/modmachine.h b/ports/mimxrt/modmachine.h
index 92d875b4d0848..fed75fdd54118 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -31,7 +31,6 @@
 
 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_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
 extern const mp_obj_type_t machine_spi_type;
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 1eb3b17112065..24c2436dbfcb3 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -87,6 +87,9 @@ uint32_t trng_random_u32(void);
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (0)
 #endif
+#define MICROPY_PY_MACHINE_I2S_INCLUDEFILE  "ports/mimxrt/machine_i2s.c"
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_RX  (RX)
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_TX  (TX)
 #ifndef MICROPY_PY_MACHINE_SDCARD
 #define MICROPY_PY_MACHINE_SDCARD           (1)
 #endif
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index b8cf4d7becfae..d5302e3369069 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -120,7 +120,6 @@ set(MICROPY_SOURCE_PORT
     machine_adc.c
     machine_bitstream.c
     machine_i2c.c
-    machine_i2s.c
     machine_pin.c
     machine_rtc.c
     machine_spi.c
@@ -149,7 +148,6 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${MICROPY_PORT_DIR}/machine_adc.c
     ${MICROPY_PORT_DIR}/machine_i2c.c
-    ${MICROPY_PORT_DIR}/machine_i2s.c
     ${MICROPY_PORT_DIR}/machine_pin.c
     ${MICROPY_PORT_DIR}/machine_rtc.c
     ${MICROPY_PORT_DIR}/machine_spi.c
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 5ad1a748b9b93..6ed982ba4501e 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -24,19 +24,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
 
-#include "py/obj.h"
-#include "py/runtime.h"
+#include <stdlib.h>
+#include <string.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"
@@ -771,7 +765,7 @@ 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) {
+STATIC void mp_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,
@@ -887,10 +881,7 @@ STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         );
 }
 
-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]);
-
+STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     if (i2s_id >= MAX_I2S_RP2) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
     }
@@ -905,23 +896,10 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
         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;
+    return self;
 }
-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);
 
+STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     // use self->pio as in indication that I2S object has already been de-initialized
     if (self->pio != NULL) {
         pio_deinit(self);
@@ -930,9 +908,7 @@ STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
         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);
@@ -1013,25 +989,6 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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);
 
@@ -1130,21 +1087,4 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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,
-};
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_i2s_type,
-    MP_QSTR_I2S,
-    MP_TYPE_FLAG_ITER_IS_STREAM,
-    make_new, machine_i2s_make_new,
-    print, machine_i2s_print,
-    protocol, &i2s_stream_p,
-    locals_dict, &machine_i2s_locals_dict
-    );
-
 MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 559fb34814a9c..39a6e9c81e4e2 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -5,7 +5,6 @@
 
 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_pin_type;
 extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_spi_type;
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index bf43b5ce7f6f6..5e6cf0b2d5cb4 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -118,6 +118,10 @@
 #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_I2S                  (1)
+#define MICROPY_PY_MACHINE_I2S_INCLUDEFILE      "ports/rp2/machine_i2s.c"
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_RX      (RX)
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_TX      (TX)
 #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/Makefile b/ports/stm32/Makefile
index 589ef4cdbb1d8..9c73c5c956f2b 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -335,7 +335,6 @@ SRC_C += \
 	machine_adc.c \
 	machine_bitstream.c \
 	machine_i2c.c \
-	machine_i2s.c \
 	machine_spi.c \
 	machine_uart.c \
 	modmachine.c \
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 36f4a678597de..0a5d25c16cc7a 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -131,7 +131,7 @@ static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
 };
 #endif
 
-#if MICROPY_HW_ENABLE_I2S
+#if MICROPY_PY_MACHINE_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 = {
@@ -314,7 +314,7 @@ 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
+#if MICROPY_PY_MACHINE_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
@@ -342,7 +342,7 @@ 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
+#if MICROPY_PY_MACHINE_I2S
 const dma_descr_t dma_I2S_1_RX = { DMA2_Stream2, DMA_CHANNEL_3, dma_id_10,  &dma_init_struct_i2s };
 #endif
 #if ENABLE_SDIO
@@ -356,7 +356,7 @@ 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
+#if MICROPY_PY_MACHINE_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
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index bb595a25790a7..58b85c7a79749 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -25,23 +25,17 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
 
-#include "py/obj.h"
-#include "py/runtime.h"
+#include <stdlib.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
+#if MICROPY_PY_MACHINE_I2S
+
 // The I2S module has 3 modes of operation:
 //
 // Mode1:  Blocking
@@ -591,7 +585,7 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
 
 void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s) {
     uint32_t errorCode = HAL_I2S_GetError(hi2s);
-    printf("I2S Error = %ld\n", errorCode);
+    mp_printf(MICROPY_ERROR_PRINTER, "I2S Error = %ld\n", errorCode);
 }
 
 void HAL_I2S_RxCpltCallback(I2S_HandleTypeDef *hi2s) {
@@ -671,7 +665,7 @@ void HAL_I2S_TxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
     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) {
+STATIC void mp_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,
@@ -839,9 +833,7 @@ STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         );
 }
 
-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]);
+STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     uint8_t i2s_id_zero_base = 0;
 
     if (0) {
@@ -870,24 +862,10 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
     // 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);
+    return 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);
-
+STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     if (self->ring_buffer_storage != NULL) {
         dma_deinit(self->dma_descr_tx);
         dma_deinit(self->dma_descr_rx);
@@ -906,10 +884,7 @@ STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
         m_free(self->ring_buffer_storage);
         self->ring_buffer_storage = 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);
@@ -990,25 +965,6 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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);
 
@@ -1107,23 +1063,6 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     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,
-};
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_i2s_type,
-    MP_QSTR_I2S,
-    MP_TYPE_FLAG_ITER_IS_STREAM,
-    make_new, machine_i2s_make_new,
-    print, machine_i2s_print,
-    protocol, &i2s_stream_p,
-    locals_dict, &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
+#endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 95b74c621a2d1..9e5dafc9f6e5f 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -528,7 +528,7 @@ void stm32_main(uint32_t reset_mode) {
     pyb_usb_init0();
     #endif
 
-    #if MICROPY_HW_ENABLE_I2S
+    #if MICROPY_PY_MACHINE_I2S
     machine_i2s_init0();
     #endif
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 926dc30413e33..a0e2da89f8965 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -443,7 +443,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_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
-    #if MICROPY_HW_ENABLE_I2S
+    #if MICROPY_PY_MACHINE_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) },
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 28d9c699d63fc..9838eafdb0f66 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -30,7 +30,6 @@
 
 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_spi_type;
 extern const mp_obj_type_t machine_timer_type;
 
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index b6cc7f84db7e9..6d9ef8de3b09f 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -591,10 +591,10 @@
 
 // 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_PY_MACHINE_I2S (1)
 #define MICROPY_HW_MAX_I2S (2)
 #else
-#define MICROPY_HW_ENABLE_I2S (0)
+#define MICROPY_PY_MACHINE_I2S (0)
 #define MICROPY_HW_MAX_I2S (0)
 #endif
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 0e9df54ff469a..1dae9f7f0826f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -117,6 +117,9 @@
 #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_I2S_INCLUDEFILE "ports/stm32/machine_i2s.c"
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_RX (I2S_MODE_MASTER_RX)
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_TX (I2S_MODE_MASTER_TX)
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)

From a2d7e0da0b7b4e822cb12390424e912ae0f13a18 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 9 Oct 2023 12:48:45 +1100
Subject: [PATCH 0457/3129] extmod/machine_i2s: Factor stream and ring-buf
 code.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2s.c        | 396 ++++++++++++++++++++++++++++++++++++
 ports/esp32/machine_i2s.c   | 123 -----------
 ports/mimxrt/machine_i2s.c  | 322 -----------------------------
 ports/mimxrt/mpconfigport.h |   1 +
 ports/rp2/machine_i2s.c     | 322 -----------------------------
 ports/rp2/mpconfigport.h    |   1 +
 ports/stm32/machine_i2s.c   | 322 -----------------------------
 ports/stm32/mpconfigport.h  |   1 +
 8 files changed, 399 insertions(+), 1089 deletions(-)

diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index 53de7293f2cfa..79ddfb20df586 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -26,11 +26,37 @@
  */
 
 #include "py/runtime.h"
+#include "py/stream.h"
 
 #if MICROPY_PY_MACHINE_I2S
 
 #include "extmod/modmachine.h"
 
+#if MICROPY_PY_MACHINE_I2S_RING_BUF
+
+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;
+
+STATIC void ringbuf_init(ring_buf_t *rbuf, uint8_t *buffer, size_t size);
+STATIC bool ringbuf_push(ring_buf_t *rbuf, uint8_t data);
+STATIC bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data);
+STATIC size_t ringbuf_available_data(ring_buf_t *rbuf);
+STATIC size_t ringbuf_available_space(ring_buf_t *rbuf);
+STATIC void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self);
+STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self);
+
+#endif // MICROPY_PY_MACHINE_I2S_RING_BUF
+
 // The port must provide implementations of these low-level I2S functions.
 STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
 STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id);
@@ -39,6 +65,220 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self);
 // The port provides implementations of the above in this file.
 #include MICROPY_PY_MACHINE_I2S_INCLUDEFILE
 
+#if MICROPY_PY_MACHINE_I2S_RING_BUF
+
+// 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 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 asyncio 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 == ASYNCIO) {
+                    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 == ASYNCIO) {
+                    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 asyncio 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 == ASYNCIO) {
+            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));
+        }
+    }
+}
+
+#endif // MICROPY_PY_MACHINE_I2S_RING_BUF
+
 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);
     mp_int_t i2s_id = mp_obj_get_int(args[0]);
@@ -91,6 +331,162 @@ STATIC const mp_rom_map_elem_t machine_i2s_locals_dict_table[] = {
 };
 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 != MICROPY_PY_MACHINE_I2S_CONSTANT_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) {
+        #if MICROPY_PY_MACHINE_I2S_RING_BUF
+        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;
+        #else
+        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);
+        #endif
+
+        return size;
+    } else { // blocking or asyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        #if MICROPY_PY_MACHINE_I2S_RING_BUF
+        uint32_t num_bytes_read = fill_appbuf_from_ringbuf(self, &appbuf);
+        #else
+        uint32_t num_bytes_read = fill_appbuf_from_dma(self, &appbuf);
+        #endif
+        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 != MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        #if MICROPY_PY_MACHINE_I2S_RING_BUF
+        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;
+        #else
+        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);
+        #endif
+
+        return size;
+    } else { // blocking or asyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        #if MICROPY_PY_MACHINE_I2S_RING_BUF
+        uint32_t num_bytes_written = copy_appbuf_to_ringbuf(self, &appbuf);
+        #else
+        uint32_t num_bytes_written = copy_appbuf_to_dma(self, &appbuf);
+        #endif
+        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 = ASYNCIO; // a call to ioctl() is an indication that asyncio is being used
+
+    if (request == MP_STREAM_POLL) {
+        ret = 0;
+
+        if (flags & MP_STREAM_POLL_RD) {
+            if (self->mode != MICROPY_PY_MACHINE_I2S_CONSTANT_RX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            #if MICROPY_PY_MACHINE_I2S_RING_BUF
+            if (!ringbuf_is_empty(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+            #else
+            // 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
+            i2s_event_t i2s_event;
+            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;
+                }
+            }
+            #endif
+        }
+
+        if (flags & MP_STREAM_POLL_WR) {
+            if (self->mode != MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            #if MICROPY_PY_MACHINE_I2S_RING_BUF
+            if (!ringbuf_is_full(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_WR;
+            }
+            #else
+            // 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
+            i2s_event_t i2s_event;
+            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;
+                }
+            }
+            #endif
+        }
+    } 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,
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 5a78e3b740f2d..12294adbbda57 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -28,7 +28,6 @@
 // extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
 
 #include "py/mphal.h"
-#include "py/stream.h"
 
 #if MICROPY_PY_MACHINE_I2S
 
@@ -635,128 +634,6 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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 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 asyncio 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 asyncio mode
-        mp_buffer_info_t appbuf;
-        appbuf.buf = (void *)buf_in;
-        appbuf.len = size;
-        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, 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;
-    self->io_mode = ASYNCIO; // a call to ioctl() is an indication that asyncio 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;
-}
-
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_AUTO]);
 
 #endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 979872dd16dd3..e704e4f1ecb5a 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -29,7 +29,6 @@
 // extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
 
 #include "py/mphal.h"
-#include "py/stream.h"
 #include "dma_manager.h"
 
 #include CLOCK_CONFIG_H
@@ -122,19 +121,6 @@ typedef enum {
     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;
@@ -285,59 +271,6 @@ void machine_i2s_deinit_all(void) {
     }
 }
 
-// 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) {
@@ -429,163 +362,6 @@ STATIC const uint32_t get_clock_divider(int32_t rate) {
     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 asyncio 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 == ASYNCIO) {
-                    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 == ASYNCIO) {
-                    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 asyncio 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 == ASYNCIO) {
-            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;
@@ -1116,104 +892,6 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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 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 asyncio 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 asyncio 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 = ASYNCIO; // a call to ioctl() is an indication that asyncio 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;
-}
-
 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/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 24c2436dbfcb3..d610e368b05c2 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -90,6 +90,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE  "ports/mimxrt/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX  (RX)
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_TX  (TX)
+#define MICROPY_PY_MACHINE_I2S_RING_BUF     (1)
 #ifndef MICROPY_PY_MACHINE_SDCARD
 #define MICROPY_PY_MACHINE_SDCARD           (1)
 #endif
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 6ed982ba4501e..84b22aef145ab 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "py/mphal.h"
-#include "py/stream.h"
 
 #include "hardware/pio.h"
 #include "hardware/clocks.h"
@@ -114,19 +113,6 @@ typedef enum {
     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;
@@ -228,59 +214,6 @@ void machine_i2s_init0(void) {
     }
 }
 
-// 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) {
@@ -297,163 +230,6 @@ STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
     }
 }
 
-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 asyncio 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 == ASYNCIO) {
-                    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 == ASYNCIO) {
-                    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 asyncio 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 == ASYNCIO) {
-            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
@@ -989,102 +765,4 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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 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 asyncio 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 asyncio 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 = ASYNCIO; // a call to ioctl() is an indication that asyncio 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;
-}
-
 MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 5e6cf0b2d5cb4..e35980d10bdff 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -122,6 +122,7 @@
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE      "ports/rp2/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX      (RX)
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_TX      (TX)
+#define MICROPY_PY_MACHINE_I2S_RING_BUF         (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/machine_i2s.c b/ports/stm32/machine_i2s.c
index 58b85c7a79749..a2ac973ad4721 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -30,7 +30,6 @@
 
 #include <stdlib.h>
 #include "py/mphal.h"
-#include "py/stream.h"
 #include "pin.h"
 #include "dma.h"
 
@@ -106,19 +105,6 @@ typedef enum {
     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;
@@ -162,59 +148,6 @@ void machine_i2s_init0() {
     }
 }
 
-// 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
@@ -277,163 +210,6 @@ STATIC int8_t get_dma_bits(uint16_t mode, int8_t bits) {
     }
 }
 
-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 asyncio 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 == ASYNCIO) {
-                    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 == ASYNCIO) {
-                    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 asyncio 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 == ASYNCIO) {
-            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;
@@ -965,104 +741,6 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 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 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 asyncio 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 asyncio 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 = ASYNCIO; // a call to ioctl() is an indication that asyncio 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;
-}
-
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
 
 #endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 1dae9f7f0826f..c27302d9bf1e5 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -120,6 +120,7 @@
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE "ports/stm32/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX (I2S_MODE_MASTER_RX)
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_TX (I2S_MODE_MASTER_TX)
+#define MICROPY_PY_MACHINE_I2S_RING_BUF (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)

From cdd9ad8d62cd69714665c086a9bebba92772afc3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Oct 2023 11:59:13 +1100
Subject: [PATCH 0458/3129] extmod/machine_i2s: Factor I2S.shift method.

It's exactly the same for all four port implementations.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2s.c       | 62 ++++++++++++++++++++++++++++++++++++++
 ports/esp32/machine_i2s.c  | 62 --------------------------------------
 ports/mimxrt/machine_i2s.c | 62 --------------------------------------
 ports/rp2/machine_i2s.c    | 62 --------------------------------------
 ports/stm32/machine_i2s.c  | 62 --------------------------------------
 5 files changed, 62 insertions(+), 248 deletions(-)

diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index 79ddfb20df586..e101d70ddf8ad 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -309,6 +309,68 @@ STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
 
+// 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) },
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 12294adbbda57..054ddb90cb2ac 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -572,68 +572,6 @@ STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
 }
 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));
-
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_AUTO]);
 
 #endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index e704e4f1ecb5a..5ed6588bb11ff 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -830,68 +830,6 @@ STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
 }
 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));
-
 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/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 84b22aef145ab..524139012fc0b 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -703,66 +703,4 @@ STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
 }
 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));
-
 MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index a2ac973ad4721..b42120e1be74d 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -679,68 +679,6 @@ STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
 }
 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));
-
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
 
 #endif // MICROPY_PY_MACHINE_I2S

From 14779868159a7a86e519541d5d6c562e9792a78e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Oct 2023 12:13:37 +1100
Subject: [PATCH 0459/3129] extmod/machine_i2s: Factor I2S.irq method.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2s.c       | 22 ++++++++++++++++++++++
 ports/esp32/machine_i2s.c  | 17 ++---------------
 ports/mimxrt/machine_i2s.c | 17 ++---------------
 ports/rp2/machine_i2s.c    | 17 ++---------------
 ports/stm32/machine_i2s.c  | 17 ++---------------
 5 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index e101d70ddf8ad..ea2a0e370a21e 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -61,6 +61,7 @@ STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self);
 STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
 STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id);
 STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self);
+STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self);
 
 // The port provides implementations of the above in this file.
 #include MICROPY_PY_MACHINE_I2S_INCLUDEFILE
@@ -309,6 +310,27 @@ STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
 
+// I2S.irq(handler)
+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;
+
+    mp_machine_i2s_irq_update(self);
+
+    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) {
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 054ddb90cb2ac..c7a53461c67af 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -528,15 +528,8 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     self->i2s_event_queue = NULL;
 }
 
-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;
-
+STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+    if (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));
@@ -563,14 +556,8 @@ STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
             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);
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_AUTO]);
 
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 5ed6588bb11ff..5556404f254e5 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -813,22 +813,9 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-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 void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+    (void)self;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM]);
 
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 524139012fc0b..4e49ad359029e 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -686,21 +686,8 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-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 void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+    (void)self;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
 
 MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index b42120e1be74d..f83ab4ea1a437 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -662,22 +662,9 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-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 void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+    (void)self;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
 

From 676f9bb78c6682b113f31b4c055a7029cf3942be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Oct 2023 12:31:04 +1100
Subject: [PATCH 0460/3129] extmod/machine_i2s: Factor print function.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2s.c        | 25 +++++++++++++++++++
 ports/esp32/machine_i2s.c   | 50 +++++++++++--------------------------
 ports/mimxrt/machine_i2s.c  | 21 ----------------
 ports/mimxrt/mpconfigport.h |  1 +
 ports/rp2/machine_i2s.c     | 19 --------------
 ports/stm32/machine_i2s.c   | 19 --------------
 6 files changed, 41 insertions(+), 94 deletions(-)

diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index ea2a0e370a21e..3e232d7a307dd 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -280,6 +280,31 @@ STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self) {
 
 #endif // MICROPY_PY_MACHINE_I2S_RING_BUF
 
+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"
+        #if MICROPY_PY_MACHINE_I2S_MCK
+        "mck="MP_HAL_PIN_FMT ",\n"
+        #endif
+        "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),
+        #if MICROPY_PY_MACHINE_I2S_MCK
+        mp_hal_pin_name(self->mck),
+        #endif
+        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);
     mp_int_t i2s_id = mp_obj_get_int(args[0]);
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index c7a53461c67af..6cc13b402e5da 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -109,7 +109,7 @@ typedef struct _non_blocking_descriptor_t {
 
 typedef struct _machine_i2s_obj_t {
     mp_obj_base_t base;
-    i2s_port_t port;
+    i2s_port_t i2s_id;
     mp_hal_pin_obj_t sck;
     mp_hal_pin_obj_t ws;
     mp_hal_pin_obj_t sd;
@@ -255,7 +255,7 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
         }
 
         esp_err_t ret = i2s_read(
-            self->port,
+            self->i2s_id,
             self->transform_buffer,
             num_bytes_requested_from_dma,
             &num_bytes_received_from_dma,
@@ -315,7 +315,7 @@ 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
     }
 
-    esp_err_t ret = i2s_write(self->port, appbuf->buf, appbuf->len, &num_bytes_written, delay);
+    esp_err_t ret = i2s_write(self->i2s_id, appbuf->buf, appbuf->len, &num_bytes_written, delay);
     check_esp_err(ret);
 
     if ((self->io_mode == ASYNCIO) && (num_bytes_written < appbuf->len)) {
@@ -444,17 +444,17 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_arg
     i2s_config.bits_per_chan = 0;
 
     // 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));
+    check_esp_err(i2s_driver_install(self->i2s_id, &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
     #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);
+    REG_SET_BIT(I2S_TX_CONF_REG(self->i2s_id), I2S_TX_MSB_SHIFT);
+    REG_SET_BIT(I2S_TX_CONF_REG(self->i2s_id), 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);
+    REG_SET_BIT(I2S_CONF_REG(self->i2s_id), I2S_TX_MSB_RIGHT);
+    REG_SET_BIT(I2S_CONF_REG(self->i2s_id), I2S_RX_MSB_RIGHT);
     #endif
 
     i2s_pin_config_t pin_config;
@@ -470,42 +470,22 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_arg
         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
-        );
+    check_esp_err(i2s_set_pin(self->i2s_id, &pin_config));
 }
 
 STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
-    i2s_port_t port = i2s_id;
-    if (port < 0 || port >= I2S_NUM_AUTO) {
+    if (i2s_id < 0 || i2s_id >= I2S_NUM_AUTO) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
     }
 
     machine_i2s_obj_t *self;
-    if (MP_STATE_PORT(machine_i2s_obj)[port] == NULL) {
+    if (MP_STATE_PORT(machine_i2s_obj)[i2s_id] == NULL) {
         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;
+        MP_STATE_PORT(machine_i2s_obj)[i2s_id] = self;
+        self->i2s_id = i2s_id;
     } else {
-        self = MP_STATE_PORT(machine_i2s_obj)[port];
+        self = MP_STATE_PORT(machine_i2s_obj)[i2s_id];
         machine_i2s_deinit(self);
     }
 
@@ -513,7 +493,7 @@ STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
 }
 
 STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
-    i2s_driver_uninstall(self->port);
+    i2s_driver_uninstall(self->i2s_id);
 
     if (self->non_blocking_mode_task != NULL) {
         vTaskDelete(self->non_blocking_mode_task);
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 5556404f254e5..dc1955e306d71 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -741,27 +741,6 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_arg
     }
 }
 
-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 machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     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);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index d610e368b05c2..492686843a925 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -90,6 +90,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE  "ports/mimxrt/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX  (RX)
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_TX  (TX)
+#define MICROPY_PY_MACHINE_I2S_MCK          (1)
 #define MICROPY_PY_MACHINE_I2S_RING_BUF     (1)
 #ifndef MICROPY_PY_MACHINE_SDCARD
 #define MICROPY_PY_MACHINE_SDCARD           (1)
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 4e49ad359029e..c1caac5dabb62 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -638,25 +638,6 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_arg
     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 machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     if (i2s_id >= MAX_I2S_RP2) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index f83ab4ea1a437..1ab80fb97b686 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -590,25 +590,6 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_arg
     }
 }
 
-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 machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     uint8_t i2s_id_zero_base = 0;
 

From 46ae3b5a34d33d3c696e1fb66661983315686712 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Oct 2023 12:53:42 +1100
Subject: [PATCH 0461/3129] extmod/machine_i2s: Factor init_helper argument
 parsing.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2s.c       | 42 +++++++++++++++++++++++++++++++++++---
 ports/esp32/machine_i2s.c  | 32 +----------------------------
 ports/mimxrt/machine_i2s.c | 35 ++-----------------------------
 ports/rp2/machine_i2s.c    | 32 +----------------------------
 ports/stm32/machine_i2s.c  | 32 +----------------------------
 5 files changed, 44 insertions(+), 129 deletions(-)

diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index 3e232d7a307dd..bbff560a0dddf 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -32,6 +32,21 @@
 
 #include "extmod/modmachine.h"
 
+// Arguments for I2S() constructor and I2S.init().
+enum {
+    ARG_sck,
+    ARG_ws,
+    ARG_sd,
+    #if MICROPY_PY_MACHINE_I2S_MCK
+    ARG_mck,
+    #endif
+    ARG_mode,
+    ARG_bits,
+    ARG_format,
+    ARG_rate,
+    ARG_ibuf,
+};
+
 #if MICROPY_PY_MACHINE_I2S_RING_BUF
 
 typedef struct _ring_buf_t {
@@ -58,7 +73,7 @@ STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self);
 #endif // MICROPY_PY_MACHINE_I2S_RING_BUF
 
 // The port must provide implementations of these low-level I2S functions.
-STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args);
 STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id);
 STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self);
 STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self);
@@ -280,6 +295,27 @@ STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self) {
 
 #endif // MICROPY_PY_MACHINE_I2S_RING_BUF
 
+MP_NOINLINE 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) {
+    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} },
+        #if MICROPY_PY_MACHINE_I2S_MCK
+        { MP_QSTR_mck,      MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = mp_const_none} },
+        #endif
+        { 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);
+
+    mp_machine_i2s_init_helper(self, args);
+}
+
 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"
@@ -313,7 +349,7 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
-    mp_machine_i2s_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+    machine_i2s_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -322,7 +358,7 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 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]);
     mp_machine_i2s_deinit(self);
-    mp_machine_i2s_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    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);
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 6cc13b402e5da..9a5e5c60335b7 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -351,37 +351,7 @@ STATIC void task_for_non_blocking_mode(void *self_in) {
     }
 }
 
-STATIC void mp_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 ----
-    //
-
+STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // are Pins valid?
     int8_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sck].u_obj);
     int8_t ws = args[ARG_ws].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_ws].u_obj);
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index dc1955e306d71..dcdebd4c7edfb 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -613,39 +613,7 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
     return true;
 }
 
-STATIC void mp_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 ----
-    //
-
+STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // is Mode valid?
     uint16_t i2s_mode = args[ARG_mode].u_int;
     if ((i2s_mode != (RX)) &&
@@ -672,6 +640,7 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_arg
     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;
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index c1caac5dabb62..9df0f09f24479 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -541,37 +541,7 @@ STATIC void dma_irq1_handler(void) {
     dma_irq_handler(1);
 }
 
-STATIC void mp_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 ----
-    //
-
+STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // 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);
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 1ab80fb97b686..6d195432fd7f0 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -441,39 +441,9 @@ void HAL_I2S_TxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
     feed_dma(self, TOP_HALF);
 }
 
-STATIC void mp_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);
-
+STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     memset(&self->hi2s, 0, sizeof(self->hi2s));
 
-    //
-    // ---- Check validity of arguments ----
-    //
-
     // are I2S pin assignments valid?
     const pin_af_obj_t *pin_af;
 

From 91a3f183916e1514fbb8dc58ca5b77acc59d4346 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Oct 2023 16:44:02 +1100
Subject: [PATCH 0462/3129] extmod/machine_i2s: Factor comments, some enums and
 macros.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2s.c       | 46 +++++++++++++++++++++++++++++++++++
 ports/esp32/machine_i2s.c  | 49 +-------------------------------------
 ports/mimxrt/machine_i2s.c | 49 ++------------------------------------
 ports/rp2/machine_i2s.c    | 47 ++----------------------------------
 ports/stm32/machine_i2s.c  | 49 +-------------------------------------
 5 files changed, 52 insertions(+), 188 deletions(-)

diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index bbff560a0dddf..cc97f011a6d42 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -32,6 +32,52 @@
 
 #include "extmod/modmachine.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
+// - implementation of asynchronous background operations is port specific
+//
+// Mode3: Asyncio
+// - implements the stream protocol
+// - asyncio 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)
+
+#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,
+    ASYNCIO
+} io_mode_t;
+
 // Arguments for I2S() constructor and I2S.init().
 enum {
     ARG_sck,
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 9a5e5c60335b7..89d460e452ff3 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -29,8 +29,6 @@
 
 #include "py/mphal.h"
 
-#if MICROPY_PY_MACHINE_I2S
-
 #include "driver/i2s.h"
 #include "soc/i2s_reg.h"
 #include "freertos/FreeRTOS.h"
@@ -38,38 +36,9 @@
 #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
+// Notes on this port's specific implementation of I2S:
 // - 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: Asyncio
-// - implements the stream protocol
-// - asyncio 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)
@@ -82,20 +51,6 @@
 // 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,
-    ASYNCIO
-} io_mode_t;
-
 typedef enum {
     I2S_TX_TRANSFER,
     I2S_RX_TRANSFER,
@@ -510,5 +465,3 @@ STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
 }
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_AUTO]);
-
-#endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index dcdebd4c7edfb..077c9e76fa8e6 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -37,38 +37,8 @@
 #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: Asyncio
-// - implements the stream protocol
-// - asyncio 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)
+// Notes on this port's specific implementation of I2S:
+// - the DMA callback is used to implement the asynchronous background operations, for non-blocking mode
 // - 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
@@ -88,8 +58,6 @@
 #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 SAI_CHANNEL_0 (0)
 #define SAI_NUM_AUDIO_CHANNELS (2U)
 
@@ -105,17 +73,6 @@ typedef enum {
     TX,
 } i2s_mode_t;
 
-typedef enum {
-    MONO,
-    STEREO
-} format_t;
-
-typedef enum {
-    BLOCKING,
-    NON_BLOCKING,
-    ASYNCIO
-} io_mode_t;
-
 typedef enum {
     TOP_HALF,
     BOTTOM_HALF
@@ -766,5 +723,3 @@ STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
 }
 
 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/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 9df0f09f24479..68a0f296a01fe 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -37,37 +37,8 @@
 #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: Asyncio
-// - implements the stream protocol
-// - asyncio 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)
+// Notes on this port's specific implementation of I2S:
+// - the DMA IRQ handler is used to implement the asynchronous background operations, for non-blocking mode
 // - 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
@@ -86,9 +57,6 @@
 #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)
 
@@ -97,17 +65,6 @@ typedef enum {
     TX
 } i2s_mode_t;
 
-typedef enum {
-    MONO,
-    STEREO
-} format_t;
-
-typedef enum {
-    BLOCKING,
-    NON_BLOCKING,
-    ASYNCIO
-} io_mode_t;
-
 typedef enum {
     GP_INPUT = 0,
     GP_OUTPUT = 1
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 6d195432fd7f0..dbcd9352d5bd0 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -33,39 +33,8 @@
 #include "pin.h"
 #include "dma.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
+// Notes on this port's specific implementation of I2S:
 // - the DMA callbacks (1/2 complete and complete) are used to implement the asynchronous background operations
-//
-// Mode3: Asyncio
-// - implements the stream protocol
-// - asyncio 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
@@ -86,20 +55,6 @@
 #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,
-    ASYNCIO
-} io_mode_t;
-
 typedef enum {
     TOP_HALF,
     BOTTOM_HALF
@@ -618,5 +573,3 @@ STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
 }
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
-
-#endif // MICROPY_PY_MACHINE_I2S

From bb4be837c3d439029c5c73928b0369ace8247525 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Oct 2023 10:39:39 +1100
Subject: [PATCH 0463/3129] py/makeqstrdefs.py: Print a nicer error when
 preprocessing stage fails.

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

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 64249f76ce3f2..57200e069ce6a 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -28,6 +28,10 @@
 _MODE_ROOT_POINTER = "root_pointer"
 
 
+class PreprocessorError(Exception):
+    pass
+
+
 def is_c_source(fname):
     return os.path.splitext(fname)[1] in [".c"]
 
@@ -57,7 +61,10 @@ def preprocess():
 
     def pp(flags):
         def run(files):
-            return subprocess.check_output(args.pp + flags + files)
+            try:
+                return subprocess.check_output(args.pp + flags + files)
+            except subprocess.CalledProcessError as er:
+                raise PreprocessorError(str(er))
 
         return run
 
@@ -208,7 +215,12 @@ class Args:
         for k, v in named_args.items():
             setattr(args, k, v)
 
-        preprocess()
+        try:
+            preprocess()
+        except PreprocessorError as er:
+            print(er)
+            sys.exit(1)
+
         sys.exit(0)
 
     args.mode = sys.argv[2]

From 48e0986666c9f2059c92253f3c0f9b4184d68816 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Oct 2023 10:55:15 +1100
Subject: [PATCH 0464/3129] nrf/boards: Automatically configure
 MICROPY_PY_MACHINE_PWM.

This commit makes it so that MICROPY_PY_MACHINE_PWM is enabled if at least
one of MICROPY_PY_MACHINE_HW_PWM and/or MICROPY_PY_MACHINE_SOFT_PWM are
enabled.  This simplifies the configuration for boards, and fixes DVK_BL652
which enabled PWM without selecting software or hardware implementations.

With this change, DVK_BL652 and EVK_NINA_B1 now enable (hardware) PWM.

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                 | 2 +-
 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                  | 4 +---
 ports/nrf/boards/PCA10001/mpconfigboard.h                  | 4 +---
 ports/nrf/boards/PCA10028/mpconfigboard.h                  | 4 +---
 ports/nrf/boards/PCA10031/mpconfigboard.h                  | 4 +---
 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                  | 1 -
 ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h          | 1 -
 ports/nrf/mpconfigport.h                                   | 1 +
 23 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
index 46960cab83bb1..9bf2a8d19191a 100644
--- a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
@@ -31,7 +31,6 @@
 #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_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
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 71349e08c4c83..0e6c5a44abf48 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
@@ -14,7 +14,6 @@
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) NANO33_board_enter_bootloader()
 
 #define MICROPY_PY_MACHINE_UART         (1)
-#define MICROPY_PY_MACHINE_PWM          (1)
 #define MICROPY_PY_MACHINE_HW_PWM       (1)
 #define MICROPY_PY_MACHINE_HW_SPI       (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER    (1)
diff --git a/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
index 271cef0323dfd..a16ce1a20d68f 100644
--- a/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
index 0ca3ca16127a6..b69f6a882ec69 100644
--- a/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/DVK_BL652/mpconfigboard.h b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
index e83e555178ffd..5eb666c9758b1 100644
--- a/ports/nrf/boards/DVK_BL652/mpconfigboard.h
+++ b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
@@ -29,7 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "bl652"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (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)
diff --git a/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
index 72aeb449285f8..8d3b3688f341c 100644
--- a/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
+++ b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
@@ -31,6 +31,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52"
 
 #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)
diff --git a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
index d4ce93a0aca15..17903e576dccc 100644
--- a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
+++ b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
@@ -46,7 +46,6 @@
 
 // Peripherals Config
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/FEATHER52/mpconfigboard.h b/ports/nrf/boards/FEATHER52/mpconfigboard.h
index cef44ca4032f5..f653832c620d3 100644
--- a/ports/nrf/boards/FEATHER52/mpconfigboard.h
+++ b/ports/nrf/boards/FEATHER52/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
index 63d2944f6c256..85b48e1fb26a3 100644
--- a/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
+++ b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
index 73b1c6ff74596..1f47e9b06d5b3 100644
--- a/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
+++ b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/MICROBIT/mpconfigboard.h b/ports/nrf/boards/MICROBIT/mpconfigboard.h
index 4c6e05120db8d..63f45587af8d2 100644
--- a/ports/nrf/boards/MICROBIT/mpconfigboard.h
+++ b/ports/nrf/boards/MICROBIT/mpconfigboard.h
@@ -30,7 +30,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MUSIC            (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
index feafe8a14314b..d502c86575c27 100644
--- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM      "nrf52840-MDK-USB-Dongle"
 
 #define MICROPY_PY_MACHINE_UART      (1)
-#define MICROPY_PY_MACHINE_PWM       (1)
 #define MICROPY_PY_MACHINE_HW_PWM    (1)
 #define MICROPY_PY_MACHINE_HW_SPI    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
index 012a04458eebf..d77e104ce2c8a 100644
--- a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
+++ b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "PARTICLE-XENON"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10000/mpconfigboard.h b/ports/nrf/boards/PCA10000/mpconfigboard.h
index e56e0edf8373b..2f551612ea6f7 100644
--- a/ports/nrf/boards/PCA10000/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10000/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-dongle"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (0)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (0)
 #define MICROPY_PY_MACHINE_ADC      (0)
 #define MICROPY_PY_MACHINE_TEMP     (1)
 
-#define MICROPY_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10001/mpconfigboard.h b/ports/nrf/boards/PCA10001/mpconfigboard.h
index a2e8455398470..2120ee0a88212 100644
--- a/ports/nrf/boards/PCA10001/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10001/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (0)
 #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_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10028/mpconfigboard.h b/ports/nrf/boards/PCA10028/mpconfigboard.h
index 7abb5845e3f87..f8e3541f3715c 100644
--- a/ports/nrf/boards/PCA10028/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10028/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_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_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10031/mpconfigboard.h b/ports/nrf/boards/PCA10031/mpconfigboard.h
index f162366233fd3..b618f61b50c3f 100644
--- a/ports/nrf/boards/PCA10031/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10031/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-dongle"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_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_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h
index 00a56c2ea2c5e..7202f6a0b1323 100644
--- a/ports/nrf/boards/PCA10040/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10040/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10056/mpconfigboard.h b/ports/nrf/boards/PCA10056/mpconfigboard.h
index fa39764a7eb94..f7daf48a62223 100644
--- a/ports/nrf/boards/PCA10056/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10056/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52840-PDK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10059/mpconfigboard.h b/ports/nrf/boards/PCA10059/mpconfigboard.h
index 904a0871e4da3..f4c78915c6a12 100644
--- a/ports/nrf/boards/PCA10059/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10059/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52840-Dongle"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10090/mpconfigboard.h b/ports/nrf/boards/PCA10090/mpconfigboard.h
index 95cf8d6544b03..f58ac8989b765 100644
--- a/ports/nrf/boards/PCA10090/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10090/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf9160-DK"
 
 #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_NRF (0)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
index 18fbe327d08ce..1a2d14f1d4e86 100644
--- a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
@@ -34,7 +34,6 @@
 
 #define MICROPY_HW_USB_CDC          (1)
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 3a311fe5d9abc..5a956311e2f81 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -196,6 +196,7 @@
 #define MICROPY_PY_MACHINE_SOFT_PWM (0)
 #endif
 
+#define MICROPY_PY_MACHINE_PWM      (MICROPY_PY_MACHINE_HW_PWM || MICROPY_PY_MACHINE_SOFT_PWM)
 #define MICROPY_PY_MACHINE_PWM_DUTY (1)
 
 #if MICROPY_PY_MACHINE_HW_PWM

From 95d8b5fd555ba26ebd79b29fade45d2bf0abc6c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Oct 2023 13:48:49 +1100
Subject: [PATCH 0465/3129] extmod/machine_adc: Factor ports' ADC Python
 bindings to common code.

No functional change, just code factoring to have the Python bindings in
one location, and all the ports use those same bindings.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake                    |   1 +
 extmod/extmod.mk                       |   1 +
 extmod/machine_adc.c                   | 183 +++++++++++++++++++++++++
 extmod/modmachine.h                    |  38 +++++
 ports/esp32/esp32_common.cmake         |   1 -
 ports/esp32/machine_adc.c              | 146 ++++++++------------
 ports/esp32/machine_adc.h              |   8 +-
 ports/esp32/machine_adcblock.c         |   2 +-
 ports/esp32/modmachine.c               |   2 +
 ports/esp32/modmachine.h               |   1 -
 ports/esp32/mpconfigport.h             |   7 +
 ports/esp8266/Makefile                 |   1 -
 ports/esp8266/machine_adc.c            |  43 ++----
 ports/esp8266/modmachine.c             |   2 +
 ports/esp8266/modmachine.h             |   1 -
 ports/esp8266/mpconfigport.h           |   3 +
 ports/mimxrt/Makefile                  |   1 -
 ports/mimxrt/machine_adc.c             |  45 ++----
 ports/mimxrt/modmachine.c              |   2 +
 ports/mimxrt/modmachine.h              |   1 -
 ports/mimxrt/mpconfigport.h            |   2 +
 ports/nrf/Makefile                     |   1 -
 ports/nrf/modules/machine/adc.c        |  55 ++------
 ports/nrf/modules/machine/adc.h        |   2 -
 ports/nrf/modules/machine/modmachine.c |   3 -
 ports/nrf/mpconfigport.h               |   1 +
 ports/renesas-ra/Makefile              |   1 -
 ports/renesas-ra/machine_adc.c         |  55 +++-----
 ports/renesas-ra/modmachine.c          |   2 +
 ports/renesas-ra/modmachine.h          |   1 -
 ports/renesas-ra/mpconfigport.h        |   3 +
 ports/rp2/CMakeLists.txt               |   1 -
 ports/rp2/machine_adc.c                |  35 ++---
 ports/rp2/modmachine.c                 |   2 +
 ports/rp2/modmachine.h                 |   1 -
 ports/rp2/mpconfigport.h               |   2 +
 ports/samd/Makefile                    |   1 -
 ports/samd/machine_adc.c               |  48 ++-----
 ports/samd/modmachine.h                |   3 -
 ports/samd/mpconfigport.h              |   2 +
 ports/stm32/Makefile                   |   1 -
 ports/stm32/machine_adc.c              |  59 ++++----
 ports/stm32/mboot/Makefile             |   2 +-
 ports/stm32/mboot/adc.c                |   3 +
 ports/stm32/modmachine.c               |   2 +
 ports/stm32/modmachine.h               |   1 -
 ports/stm32/mpconfigport.h             |   2 +
 47 files changed, 434 insertions(+), 346 deletions(-)
 create mode 100644 extmod/machine_adc.c
 create mode 100644 ports/stm32/mboot/adc.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index ccb6f0465bff2..6f01bafe4639a 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -7,6 +7,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_DIR}/shared/libc/abort_.c
     ${MICROPY_DIR}/shared/libc/printf.c
     ${MICROPY_EXTMOD_DIR}/btstack/modbluetooth_btstack.c
+    ${MICROPY_EXTMOD_DIR}/machine_adc.c
     ${MICROPY_EXTMOD_DIR}/machine_bitstream.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_i2s.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 44b41f5ffb094..76dfbf0a45a4a 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -2,6 +2,7 @@
 # and provides rules to build 3rd-party components for extmod modules.
 
 SRC_EXTMOD_C += \
+	extmod/machine_adc.c \
 	extmod/machine_bitstream.c \
 	extmod/machine_i2c.c \
 	extmod/machine_i2s.c \
diff --git a/extmod/machine_adc.c b/extmod/machine_adc.c
new file mode 100644
index 0000000000000..9849163de875b
--- /dev/null
+++ b/extmod/machine_adc.c
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_ADC
+
+#include "extmod/modmachine.h"
+
+// The port must provide implementations of these low-level ADC functions.
+
+STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self);
+
+#if MICROPY_PY_MACHINE_ADC_INIT
+STATIC void mp_machine_adc_init_helper(machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_DEINIT
+STATIC void mp_machine_adc_deinit(machine_adc_obj_t *self);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_BLOCK
+STATIC mp_obj_t mp_machine_adc_block(machine_adc_obj_t *self);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_READ_UV
+STATIC mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH
+STATIC void mp_machine_adc_atten_set(machine_adc_obj_t *self, mp_int_t atten);
+STATIC void mp_machine_adc_width_set(machine_adc_obj_t *self, mp_int_t width);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_READ
+STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self);
+#endif
+
+// The port provides implementations of the above in this file.
+#include MICROPY_PY_MACHINE_ADC_INCLUDEFILE
+
+#if MICROPY_PY_MACHINE_ADC_INIT
+// ADC.init(...)
+STATIC mp_obj_t machine_adc_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_machine_adc_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_init_obj, 1, machine_adc_init);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_DEINIT
+// ADC.deinit()
+STATIC mp_obj_t machine_adc_deinit(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_machine_adc_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_deinit_obj, machine_adc_deinit);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_BLOCK
+// ADC.block()
+STATIC mp_obj_t machine_adc_block(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_machine_adc_block(self);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_block_obj, machine_adc_block);
+#endif
+
+// ADC.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(mp_machine_adc_read_u16(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+
+#if MICROPY_PY_MACHINE_ADC_READ_UV
+// ADC.read_uv()
+STATIC mp_obj_t machine_adc_read_uv(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(mp_machine_adc_read_uv(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_uv_obj, machine_adc_read_uv);
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH
+
+// ADC.atten(value) -- this is a legacy method.
+STATIC mp_obj_t machine_adc_atten(mp_obj_t self_in, mp_obj_t atten_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t atten = mp_obj_get_int(atten_in);
+    mp_machine_adc_atten_set(self, atten);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_adc_atten_obj, machine_adc_atten);
+
+// ADC.width(value) -- this is a legacy method.
+STATIC mp_obj_t machine_adc_width(mp_obj_t self_in, mp_obj_t width_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t width = mp_obj_get_int(width_in);
+    mp_machine_adc_width_set(self, width);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_adc_width_obj, machine_adc_width);
+
+#endif
+
+#if MICROPY_PY_MACHINE_ADC_READ
+// ADC.read() -- this is a legacy method.
+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(mp_machine_adc_read(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_obj, machine_adc_read);
+#endif
+
+STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
+    #if MICROPY_PY_MACHINE_ADC_INIT
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_adc_init_obj) },
+    #endif
+    #if MICROPY_PY_MACHINE_ADC_DEINIT
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_adc_deinit_obj) },
+    #endif
+    #if MICROPY_PY_MACHINE_ADC_BLOCK
+    { MP_ROM_QSTR(MP_QSTR_block), MP_ROM_PTR(&machine_adc_block_obj) },
+    #endif
+
+    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
+    #if MICROPY_PY_MACHINE_ADC_READ_UV
+    { MP_ROM_QSTR(MP_QSTR_read_uv), MP_ROM_PTR(&machine_adc_read_uv_obj) },
+    #endif
+
+    // Legacy methods.
+    #if MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH
+    { MP_ROM_QSTR(MP_QSTR_atten), MP_ROM_PTR(&machine_adc_atten_obj) },
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&machine_adc_width_obj) },
+    #endif
+    #if MICROPY_PY_MACHINE_ADC_READ
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&machine_adc_read_obj) },
+    #endif
+
+    // A port must add ADC class constants defining the following macro.
+    // It can be defined to nothing if there are no constants.
+    MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS
+};
+STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    make_new, mp_machine_adc_make_new,
+    print, mp_machine_adc_print,
+    locals_dict, &machine_adc_locals_dict
+    );
+
+#endif // MICROPY_PY_MACHINE_ADC
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index b0235dcf645b5..e635eedaae0ae 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -29,7 +29,44 @@
 
 #include "py/obj.h"
 
+// Whether to enable the ADC.init() method.
+// Requires a port to implement mp_machine_adc_init_helper().
+#ifndef MICROPY_PY_MACHINE_ADC_INIT
+#define MICROPY_PY_MACHINE_ADC_INIT (0)
+#endif
+
+// Whether to enable the ADC.deinit() method.
+// Requires a port to implement mp_machine_adc_deinit().
+#ifndef MICROPY_PY_MACHINE_ADC_DEINIT
+#define MICROPY_PY_MACHINE_ADC_DEINIT (0)
+#endif
+
+// Whether to enable the ADC.block() method.
+// Requires a port to implement mp_machine_adc_block().
+#ifndef MICROPY_PY_MACHINE_ADC_BLOCK
+#define MICROPY_PY_MACHINE_ADC_BLOCK (0)
+#endif
+
+// Whether to enable the ADC.read_uv() method.
+// Requires a port to implement mp_machine_adc_read_uv().
+#ifndef MICROPY_PY_MACHINE_ADC_READ_UV
+#define MICROPY_PY_MACHINE_ADC_READ_UV (0)
+#endif
+
+// Whether to enable the ADC.atten() and ADC.width() methods.
+// Note: these are legacy and should not be used on new ports.
+#ifndef MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH
+#define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH (0)
+#endif
+
+// Whether to enable the ADC.read() method.
+// Note: this is legacy and should not be used on new ports.
+#ifndef MICROPY_PY_MACHINE_ADC_READ
+#define MICROPY_PY_MACHINE_ADC_READ (0)
+#endif
+
 // A port must provide these types, but they are otherwise opaque.
+typedef struct _machine_adc_obj_t machine_adc_obj_t;
 typedef struct _machine_i2s_obj_t machine_i2s_obj_t;
 typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
 typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
@@ -37,6 +74,7 @@ typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 // These classes correspond to machine.Type entries in the machine module.
 // Their Python bindings are implemented in extmod, and their implementation
 // is provided by a port.
+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;
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 2c82c1f10f3cf..4c90282c9f45e 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -66,7 +66,6 @@ list(APPEND MICROPY_SOURCE_PORT
     machine_timer.c
     machine_pin.c
     machine_touchpad.c
-    machine_adc.c
     machine_adcblock.c
     machine_dac.c
     machine_i2c.c
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 1e20186b97be9..42746cb4bd689 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -25,22 +25,53 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
 
 #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"
 
 #define ADCBLOCK1 (&madcblock_obj[0])
 #define ADCBLOCK2 (&madcblock_obj[1])
 
-STATIC const madc_obj_t madc_obj[] = {
+#if CONFIG_IDF_TARGET_ESP32
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_9_10_11 \
+    { 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) },
+#else
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_9_10_11
+#endif
+
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_12 \
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(12) },
+#else
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_12
+#endif
+
+#if CONFIG_IDF_TARGET_ESP32S2
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_13 \
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(13) },
+#else
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_13
+#endif
+
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS \
+    { 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) }, \
+    MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_9_10_11 \
+    MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_12 \
+    MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_13 \
+
+STATIC const machine_adc_obj_t madc_obj[] = {
     #if CONFIG_IDF_TARGET_ESP32
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_36},
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_37},
@@ -96,18 +127,18 @@ STATIC const madc_obj_t madc_obj[] = {
 // 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) {
+static inline adc_atten_t madc_atten_get(const machine_adc_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) {
+static inline void madc_atten_set(const machine_adc_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) {
+const machine_adc_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];
+        const machine_adc_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;
         }
@@ -115,12 +146,12 @@ const madc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t chann
     return NULL;
 }
 
-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);
+STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    const machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     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) {
+STATIC void madc_atten_helper(const machine_adc_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);
@@ -133,7 +164,7 @@ STATIC void madc_atten_helper(const madc_obj_t *self, mp_int_t 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) {
+void madc_init_helper(const machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {
         ARG_atten,
     };
@@ -153,10 +184,14 @@ void madc_init_helper(const madc_obj_t *self, size_t n_pos_args, const mp_obj_t
     }
 }
 
-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) {
+STATIC void mp_machine_adc_init_helper(machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    madc_init_helper(self, n_pos_args, pos_args, kw_args);
+}
+
+STATIC mp_obj_t mp_machine_adc_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);
+    const machine_adc_obj_t *self = madc_search_helper(NULL, -1, gpio_id);
     if (!self) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
     }
@@ -172,95 +207,32 @@ STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_pos_args, size
     return MP_OBJ_FROM_PTR(self);
 }
 
-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);
+STATIC mp_obj_t mp_machine_adc_block(machine_adc_obj_t *self) {
     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);
+STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
     mp_int_t raw = madcblock_read_helper(self->block, self->channel_id);
-    return MP_OBJ_NEW_SMALL_INT(raw);
+    return raw;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_obj, madc_read);
 
-STATIC mp_obj_t madc_read_u16(mp_obj_t self_in) {
-    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     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)
     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);
+    return u16;
 }
-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);
+STATIC mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self) {
     adc_atten_t atten = madc_atten_get(self);
-    return MP_OBJ_NEW_SMALL_INT(madcblock_read_uv_helper(self->block, self->channel_id, atten));
+    return madcblock_read_uv_helper(self->block, self->channel_id, atten);
 }
-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) {
-    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t atten = mp_obj_get_int(atten_in);
+STATIC void mp_machine_adc_atten_set(machine_adc_obj_t *self, mp_int_t atten) {
     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 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;
+STATIC void mp_machine_adc_width_set(machine_adc_obj_t *self, mp_int_t width) {
+    madcblock_bits_helper(self->block, width);
 }
-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) },
-
-    // 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_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(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);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adc_type,
-    MP_QSTR_ADC,
-    MP_TYPE_FLAG_NONE,
-    make_new, madc_make_new,
-    print, madc_print,
-    locals_dict, &madc_locals_dict
-    );
diff --git a/ports/esp32/machine_adc.h b/ports/esp32/machine_adc.h
index 0f229a2c5cca7..6d06486c30c63 100644
--- a/ports/esp32/machine_adc.h
+++ b/ports/esp32/machine_adc.h
@@ -3,14 +3,14 @@
 
 #include "machine_adcblock.h"
 
-typedef struct _madc_obj_t {
+typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
     madcblock_obj_t *block;
     adc_channel_t channel_id;
     gpio_num_t gpio_id;
-} madc_obj_t;
+} machine_adc_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);
+const machine_adc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id);
+void madc_init_helper(const machine_adc_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
index afe8fdea40b2a..8d5296e2e5c4a 100644
--- a/ports/esp32/machine_adcblock.c
+++ b/ports/esp32/machine_adcblock.c
@@ -157,7 +157,7 @@ STATIC mp_obj_t madcblock_connect(size_t n_pos_args, const mp_obj_t *pos_args, m
         mp_raise_TypeError(MP_ERROR_TEXT("too many positional args"));
     }
 
-    const madc_obj_t *adc = madc_search_helper(self, channel_id, gpio_id);
+    const machine_adc_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);
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index fe6d18e7863a3..b1c9011cb6ae8 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -312,7 +312,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #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
+    #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
+    #endif
     { 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) },
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index abf029c473d61..68b7d4ffd586a 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -12,7 +12,6 @@ typedef enum {
 extern const mp_obj_type_t machine_timer_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;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 8b59dc1225aee..1718f31f6cd19 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -96,6 +96,13 @@
 #define MICROPY_PY_OS_UNAME                 (1)
 #define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_ADC              (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
+#define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH  (1)
+#define MICROPY_PY_MACHINE_ADC_BLOCK        (1)
+#define MICROPY_PY_MACHINE_ADC_INIT         (1)
+#define MICROPY_PY_MACHINE_ADC_READ         (1)
+#define MICROPY_PY_MACHINE_ADC_READ_UV      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 5982987d7b614..0485f9bc0599a 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -114,7 +114,6 @@ SRC_C = \
 	machine_bitstream.c \
 	machine_pin.c \
 	machine_rtc.c \
-	machine_adc.c \
 	machine_uart.c \
 	machine_hspi.c \
 	modesp.c \
diff --git a/ports/esp8266/machine_adc.c b/ports/esp8266/machine_adc.c
index f4fd32db9c765..83384eea971a8 100644
--- a/ports/esp8266/machine_adc.c
+++ b/ports/esp8266/machine_adc.c
@@ -24,20 +24,19 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
 
-#include "py/runtime.h"
-#include "py/mphal.h"
 #include "user_interface.h"
 
+// The ADC class doesn't have any constants for this port.
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS
+
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
     bool isvdd;
 } machine_adc_obj_t;
 
-extern const mp_obj_type_t machine_adc_type;
-
 STATIC machine_adc_obj_t machine_adc_vdd3 = {{&machine_adc_type}, true};
 STATIC machine_adc_obj_t machine_adc_adc = {{&machine_adc_type}, false};
 
@@ -48,12 +47,13 @@ STATIC uint16_t adc_read(machine_adc_obj_t *self) {
         return system_adc_read();
     }
 }
-void machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+
+STATIC void mp_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(%u)", self->isvdd);
 }
 
-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) {
+STATIC mp_obj_t mp_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, 1, false);
 
     mp_int_t chn = mp_obj_get_int(args[0]);
@@ -69,31 +69,12 @@ mp_obj_t machine_adc_make_new(const mp_obj_type_t *type_in, size_t n_args, size_
 }
 
 // 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);
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     uint32_t value = adc_read(self);
-    return MP_OBJ_NEW_SMALL_INT(value * 65535 / 1024);
+    return value * 65535 / 1024;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
 
 // Legacy method
-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_int(adc_read(self));
+STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
+    return adc_read(self);
 }
-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_read_u16), MP_ROM_PTR(&machine_adc_read_u16_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);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adc_type,
-    MP_QSTR_ADC,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_adc_make_new,
-    print, machine_adc_print,
-    locals_dict, &machine_adc_locals_dict
-    );
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 95048952c42fa..43e94e0c8a7de 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -427,7 +427,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { 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(&machine_pwm_type) },
+    #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
+    #endif
     { 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) },
diff --git a/ports/esp8266/modmachine.h b/ports/esp8266/modmachine.h
index 9b7a5e3cb226e..469d25e81d892 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 machine_adc_type;
 extern const mp_obj_type_t pyb_rtc_type;
 extern const mp_obj_type_t pyb_uart_type;
 extern const mp_obj_type_t pyb_i2c_type;
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 2a51f8bcbbce5..4e3248513e2aa 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -61,6 +61,9 @@
 #define MICROPY_PY_LWIP             (1)
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_ADC      (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/esp8266/machine_adc.c"
+#define MICROPY_PY_MACHINE_ADC_READ (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 2f4b13ad9264e..b631c829bf0e4 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -195,7 +195,6 @@ SRC_C += \
 	hal/pwm_backport.c \
 	help.c \
 	led.c \
-	machine_adc.c \
 	machine_bitstream.c \
 	machine_i2c.c \
 	machine_led.c \
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index 36e5fafc984b8..0be5f9a7d2beb 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include "py/obj.h"
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
+
 #include "py/mphal.h"
 
 #if defined(MIMXRT117x_SERIES)
@@ -38,7 +38,8 @@
 #include "fsl_gpio.h"
 #include "fsl_iomuxc.h"
 
-#include "modmachine.h"
+// The ADC class doesn't have any constants for this port.
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS
 
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
@@ -50,9 +51,9 @@ typedef struct _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) {
+STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
-    machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // Get ADC adc id
     for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
@@ -63,11 +64,11 @@ STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t k
     }
 }
 
-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) {
+STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_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]);
+    const machine_pin_obj_t *pin = pin_find(all_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);
@@ -98,8 +99,7 @@ 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);
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     lpadc_conv_command_config_t adc_config;
     lpadc_conv_trigger_config_t trigger_config;
 
@@ -120,9 +120,8 @@ STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
     while (!LPADC_GetConvResult(self->adc, &result_struct)) {
     }
 
-    return MP_OBJ_NEW_SMALL_INT(result_struct.convValue * 2);
+    return 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
@@ -134,9 +133,7 @@ void machine_adc_init(void) {
 
 #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);
-
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     // Initiate conversion
     adc_channel_config_t channel_config = {
         .channelNumber = self->channel,
@@ -151,9 +148,8 @@ STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
 
     // 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);
+    return value * 65535 / self->resolution;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
 
 void machine_adc_init(void) {
     for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
@@ -173,18 +169,3 @@ 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/modmachine.c b/ports/mimxrt/modmachine.c
index c2f3559cf82e6..33394e62dd2bf 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -189,7 +189,9 @@ 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) },
+    #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
+    #endif
     { 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
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index fed75fdd54118..ff8ac0f085cb0 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -29,7 +29,6 @@
 
 #include "py/obj.h"
 
-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_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 492686843a925..9df6397a8755c 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -78,6 +78,8 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (trng_random_u32())
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_ADC              (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/mimxrt/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 284b82281b240..b5d832577376a 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -324,7 +324,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	machine/uart.c \
 	machine/spi.c \
 	machine/i2c.c \
-	machine/adc.c \
 	machine/pin.c \
 	machine/timer.c \
 	machine/rtcounter.c \
diff --git a/ports/nrf/modules/machine/adc.c b/ports/nrf/modules/machine/adc.c
index df9d23465a8d3..9bebcbe0869fe 100644
--- a/ports/nrf/modules/machine/adc.c
+++ b/ports/nrf/modules/machine/adc.c
@@ -24,15 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
 
-#include "py/nlr.h"
-#include "py/runtime.h"
 #include "py/mphal.h"
-
-#if MICROPY_PY_MACHINE_ADC
-
 #include "adc.h"
 
 #if NRF51
@@ -100,19 +95,23 @@ STATIC int adc_find(mp_obj_t id) {
     mp_raise_ValueError(MP_ERROR_TEXT("ADC doesn't exist"));
 }
 
-/// \method __str__()
-/// Return a string describing the ADC object.
-STATIC void machine_adc_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+/******************************************************************************/
+/* MicroPython bindings for machine API                                       */
+
+// These are ad-hoc legacy methods and need to be removed.
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&mp_machine_adc_value_obj) }, /* instance method */ \
+    { MP_ROM_QSTR(MP_QSTR_battery_level), MP_ROM_PTR(&mp_machine_adc_battery_level_obj) }, /* class method */ \
+
+// Return a string describing the ADC object.
+STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     machine_adc_obj_t *self = o;
 
     mp_printf(print, "ADC(%u)", self->id);
 }
 
-/******************************************************************************/
-/* MicroPython bindings for machine API                                       */
-
 // for make_new
-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) {
+STATIC mp_obj_t mp_machine_adc_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 };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1) } },
@@ -172,8 +171,7 @@ int16_t machine_adc_value_read(machine_adc_obj_t * adc_obj) {
 }
 
 // read_u16()
-STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
-    machine_adc_obj_t *self = self_in;
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     int16_t raw = machine_adc_value_read(self);
     #if defined(NRF52_SERIES)
     // raw is signed but the channel is in single-ended mode and this method cannot return negative values
@@ -182,9 +180,8 @@ STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
     }
     #endif
     // raw is an 8-bit value
-    return MP_OBJ_NEW_SMALL_INT(raw << 8 | raw);
+    return (raw << 8) | raw;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_machine_adc_read_u16_obj, machine_adc_read_u16);
 
 /// \method value()
 /// Read adc level.
@@ -282,25 +279,3 @@ mp_obj_t machine_adc_battery_level(void) {
     return MP_OBJ_NEW_SMALL_INT(batt_in_percent);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_machine_adc_battery_level_obj, machine_adc_battery_level);
-
-STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
-    // instance methods
-    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&mp_machine_adc_read_u16_obj) },
-    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&mp_machine_adc_value_obj) },
-
-    // class methods
-    { MP_ROM_QSTR(MP_QSTR_battery_level), MP_ROM_PTR(&mp_machine_adc_battery_level_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adc_type,
-    MP_QSTR_ADC,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_adc_make_new,
-    locals_dict, &machine_adc_locals_dict,
-    print, machine_adc_print
-    );
-
-#endif // MICROPY_PY_MACHINE_ADC
diff --git a/ports/nrf/modules/machine/adc.h b/ports/nrf/modules/machine/adc.h
index cefccff6b2c50..84e5cdbb85f3e 100644
--- a/ports/nrf/modules/machine/adc.h
+++ b/ports/nrf/modules/machine/adc.h
@@ -29,8 +29,6 @@
 
 typedef struct _machine_adc_obj_t machine_adc_obj_t;
 
-extern const mp_obj_type_t machine_adc_type;
-
 void adc_init0(void);
 
 int16_t machine_adc_value_read(machine_adc_obj_t * adc_obj);
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 59f163dee24cc..f8a6e424af90a 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -46,9 +46,6 @@
 #if MICROPY_PY_MACHINE_HW_PWM || MICROPY_PY_MACHINE_SOFT_PWM
 #include "pwm.h"
 #endif
-#if MICROPY_PY_MACHINE_ADC
-#include "adc.h"
-#endif
 #if MICROPY_PY_MACHINE_TEMP
 #include "temp.h"
 #endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 5a956311e2f81..79a74e8566ce7 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -179,6 +179,7 @@
 #ifndef MICROPY_PY_MACHINE_ADC
 #define MICROPY_PY_MACHINE_ADC      (0)
 #endif
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/nrf/modules/machine/adc.c"
 
 #ifndef MICROPY_PY_MACHINE_I2C
 #define MICROPY_PY_MACHINE_I2C      (0)
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 8126dbe7772d5..4630c30fc0e77 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -319,7 +319,6 @@ SRC_C += \
 	uart.c \
 	gccollect.c \
 	help.c \
-	machine_adc.c \
 	machine_dac.c \
 	machine_i2c.c \
 	machine_spi.c \
diff --git a/ports/renesas-ra/machine_adc.c b/ports/renesas-ra/machine_adc.c
index b71c3db4b0256..4ba30dff01e10 100644
--- a/ports/renesas-ra/machine_adc.c
+++ b/ports/renesas-ra/machine_adc.c
@@ -25,7 +25,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
+
 #include "py/mphal.h"
 #include "ra_adc.h"
 
@@ -47,7 +49,18 @@ typedef struct {
 /******************************************************************************/
 // MicroPython bindings for machine.ADC
 
-const mp_obj_type_t machine_adc_type;
+#if defined(ADC_CHANNEL_VBAT)
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VBAT \
+    { MP_ROM_QSTR(MP_QSTR_CORE_VBAT), MP_ROM_INT(ADC_CHANNEL_VBAT) },
+#else
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VBAT
+#endif
+
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS \
+    { 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) }, \
+    MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VBAT \
 
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
@@ -57,14 +70,14 @@ typedef struct _machine_adc_obj_t {
     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) {
+STATIC void mp_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) {
+STATIC mp_obj_t mp_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);
 
@@ -97,40 +110,14 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
     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_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
+    return 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);
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     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);
+    return 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);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adc_type,
-    MP_QSTR_ADC,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_adc_make_new,
-    locals_dict, &machine_adc_locals_dict,
-    print, machine_adc_print
-    );
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 6f7b8b8c07acb..9b93b69480f04 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -280,7 +280,9 @@ 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_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
+    #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
+    #endif
     #if MICROPY_PY_MACHINE_DAC
     { MP_ROM_QSTR(MP_QSTR_DAC),                 MP_ROM_PTR(&machine_dac_type) },
     #endif
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index ec494b798c8a4..1dd0eec758db8 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -32,7 +32,6 @@
 extern const mp_obj_type_t machine_timer_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;
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 255605a57e8c0..71d5cab82089b 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -130,6 +130,9 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_ADC      (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/renesas-ra/machine_adc.c"
+#define MICROPY_PY_MACHINE_ADC_READ (1)
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
 #define MICROPY_PY_MACHINE_BITSTREAM (1)
 #endif
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index d5302e3369069..c93a8a55d84fb 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -117,7 +117,6 @@ set(MICROPY_SOURCE_DRIVERS
 set(MICROPY_SOURCE_PORT
     fatfs_port.c
     help.c
-    machine_adc.c
     machine_bitstream.c
     machine_i2c.c
     machine_pin.c
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 5d6f0cc29cbc4..80c4d0533e251 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -24,7 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
+
 #include "py/mphal.h"
 #include "hardware/adc.h"
 #include "machine_pin.h"
@@ -44,7 +46,8 @@ STATIC uint16_t adc_config_and_read_u16(uint32_t channel) {
 /******************************************************************************/
 // MicroPython bindings for machine.ADC
 
-const mp_obj_type_t machine_adc_type;
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_CHANNEL_TEMPSENSOR) }, \
 
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
@@ -54,13 +57,13 @@ typedef struct _machine_adc_obj_t {
     #endif
 } machine_adc_obj_t;
 
-STATIC void machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void mp_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) {
+STATIC mp_obj_t mp_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);
 
@@ -127,29 +130,11 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
 }
 
 // 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);
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     #if MICROPY_HW_ADC_EXT_COUNT
     if (self->is_ext) {
-        return MP_OBJ_NEW_SMALL_INT(machine_pin_ext_read_u16(self->channel));
+        return machine_pin_ext_read_u16(self->channel);
     }
     #endif
-    return MP_OBJ_NEW_SMALL_INT(adc_config_and_read_u16(self->channel));
+    return 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);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adc_type,
-    MP_QSTR_ADC,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_adc_make_new,
-    print, machine_adc_print,
-    locals_dict, &machine_adc_locals_dict
-    );
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 11de929e7b6be..b47af1aba0d1d 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -254,7 +254,9 @@ 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) },
 
+    #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
+    #endif
     { 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) },
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 39a6e9c81e4e2..5feafdcea8853 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -3,7 +3,6 @@
 
 #include "py/obj.h"
 
-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_pin_type;
 extern const mp_obj_type_t machine_rtc_type;
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index e35980d10bdff..b69a06387e970 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -111,6 +111,8 @@
 #define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modtime.c"
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
+#define MICROPY_PY_MACHINE_ADC                  (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE      "ports/rp2/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM            (1)
 #define MICROPY_PY_MACHINE_PULSE                (1)
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 8e4327073ca5b..841e6a9928273 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -96,7 +96,6 @@ MPY_CROSS_FLAGS += -march=$(MPY_CROSS_MCU_ARCH)
 SRC_C += \
 	mcu/$(MCU_SERIES_LOWER)/clock_config.c \
 	help.c \
-	machine_adc.c \
 	machine_bitstream.c \
 	machine_dac.c \
 	machine_i2c.c \
diff --git a/ports/samd/machine_adc.c b/ports/samd/machine_adc.c
index 1d848e32bc506..981318d33f2ff 100644
--- a/ports/samd/machine_adc.c
+++ b/ports/samd/machine_adc.c
@@ -25,17 +25,12 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
 
-#if MICROPY_PY_MACHINE_ADC
-
-#include <stdint.h>
-#include "py/obj.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;
@@ -77,6 +72,9 @@ static uint8_t adc_vref_table[] = {
 
 #endif  // defined(MCU_SAMD21)
 
+// The ADC class doesn't have any constants for this port.
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS
+
 Adc *const adc_bases[] = ADC_INSTS;
 uint32_t busy_flags = 0;
 bool init_flags[2] = {false, false};
@@ -87,16 +85,16 @@ static uint8_t resolution[] = {
 
 extern mp_int_t log2i(mp_int_t num);
 
-STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
-    machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     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->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) {
+STATIC mp_obj_t mp_machine_adc_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, ARG_vref };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -140,8 +138,7 @@ STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
 }
 
 // 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);
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     Adc *adc = adc_bases[self->adc_config.device];
     // Set the reference voltage. Default: external AREFA.
     adc->REFCTRL.reg = adc_vref_table[self->vref];
@@ -155,18 +152,13 @@ STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
     while (adc->INTFLAG.bit.RESRDY == 0) {
     }
     // Get and return the result
-    return MP_OBJ_NEW_SMALL_INT(adc->RESULT.reg * (65536 / (1 << self->bits)));
+    return 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);
-
+STATIC void mp_machine_adc_deinit(machine_adc_obj_t *self) {
     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;
@@ -174,22 +166,6 @@ void adc_deinit_all(void) {
     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) {
@@ -270,5 +246,3 @@ static void adc_init(machine_adc_obj_t *self) {
     // Set the port as given in self->id as ADC
     mp_hal_set_pin_mux(self->id, ALT_FCT_ADC);
 }
-
-#endif
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index faa43b7af7f7d..81b30781711d3 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -29,9 +29,6 @@
 #include "py/obj.h"
 #include "shared/timeutils/timeutils.h"
 
-#if MICROPY_PY_MACHINE_ADC
-extern const mp_obj_type_t machine_adc_type;
-#endif
 #if MICROPY_PY_MACHINE_DAC
 extern const mp_obj_type_t machine_dac_type;
 #endif
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 3505d8db1e376..201e657c6894e 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -96,6 +96,8 @@
 #ifndef MICROPY_PY_MACHINE_ADC
 #define MICROPY_PY_MACHINE_ADC              (1)
 #endif
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/samd/machine_adc.c"
+#define MICROPY_PY_MACHINE_ADC_DEINIT       (1)
 #ifndef MICROPY_PY_MACHINE_DAC
 #define MICROPY_PY_MACHINE_DAC              (1)
 #endif
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 9c73c5c956f2b..d1248e0bb8e53 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -332,7 +332,6 @@ SRC_C += \
 	eth.c \
 	gccollect.c \
 	help.c \
-	machine_adc.c \
 	machine_bitstream.c \
 	machine_i2c.c \
 	machine_spi.c \
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index f41b80e0ad7b4..4b644e6c97113 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -24,7 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
+
 #include "py/mphal.h"
 #include "adc.h"
 
@@ -490,7 +492,26 @@ uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sa
 
 #if !BUILDING_MBOOT
 
-const mp_obj_type_t machine_adc_type;
+#if defined(ADC_CHANNEL_VBAT)
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VBAT \
+    { MP_ROM_QSTR(MP_QSTR_CORE_VBAT), MP_ROM_INT(MACHINE_ADC_INT_CH_VBAT) },
+#else
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VBAT
+#endif
+
+#if defined(ADC_CHANNEL_VDDCORE)
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VDD \
+    { MP_ROM_QSTR(MP_QSTR_CORE_VDD), MP_ROM_INT(MACHINE_ADC_INT_CH_VDDCORE) },
+#else
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VDD
+#endif
+
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_VREF), MP_ROM_INT(MACHINE_ADC_CH_VREF) }, \
+    { MP_ROM_QSTR(MP_QSTR_CORE_VREF), MP_ROM_INT(MACHINE_ADC_INT_CH_VREFINT) }, \
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(MACHINE_ADC_INT_CH_TEMPSENSOR) }, \
+    MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VBAT \
+    MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_CORE_VDD \
 
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
@@ -499,7 +520,7 @@ typedef struct _machine_adc_obj_t {
     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) {
+STATIC void mp_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);
     unsigned adc_id = 1;
     #if defined(ADC2)
@@ -516,7 +537,7 @@ STATIC void machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 }
 
 // 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) {
+STATIC mp_obj_t mp_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);
 
@@ -586,34 +607,8 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
 }
 
 // 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->adc, self->channel, self->sample_time));
+STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+    return adc_config_and_read_u16(self->adc, self->channel, self->sample_time);
 }
-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_VREF), MP_ROM_INT(MACHINE_ADC_CH_VREF) },
-    { MP_ROM_QSTR(MP_QSTR_CORE_VREF), MP_ROM_INT(MACHINE_ADC_INT_CH_VREFINT) },
-    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(MACHINE_ADC_INT_CH_TEMPSENSOR) },
-    #if defined(ADC_CHANNEL_VBAT)
-    { MP_ROM_QSTR(MP_QSTR_CORE_VBAT), MP_ROM_INT(MACHINE_ADC_INT_CH_VBAT) },
-    #endif
-    #if defined(ADC_CHANNEL_VDDCORE)
-    { MP_ROM_QSTR(MP_QSTR_CORE_VDD), MP_ROM_INT(MACHINE_ADC_INT_CH_VDDCORE) },
-    #endif
-};
-STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adc_type,
-    MP_QSTR_ADC,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_adc_make_new,
-    print, machine_adc_print,
-    locals_dict, &machine_adc_locals_dict
-    );
 
 #endif
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 630327d7002b6..54fc8f4830828 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -109,6 +109,7 @@ LIB_SRC_C += \
 	lib/uzlib/tinflate.c
 
 SRC_C += \
+	adc.c \
 	main.c \
 	elem.c \
 	fsload.c \
@@ -124,7 +125,6 @@ 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/adc.c b/ports/stm32/mboot/adc.c
new file mode 100644
index 0000000000000..c7b9749244d49
--- /dev/null
+++ b/ports/stm32/mboot/adc.c
@@ -0,0 +1,3 @@
+// Include the main ADC driver, so mboot can use adc_config() and adc_config_and_read_u16().
+#include "py/obj.h"
+#include "../machine_adc.c"
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index a0e2da89f8965..070d0e11694f3 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -430,7 +430,9 @@ 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_RTC),                 MP_ROM_PTR(&pyb_rtc_type) },
+    #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
+    #endif
     #if MICROPY_PY_MACHINE_I2C
     #if MICROPY_HW_ENABLE_HW_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 9838eafdb0f66..882057c601312 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -28,7 +28,6 @@
 
 #include "py/obj.h"
 
-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_spi_type;
 extern const mp_obj_type_t machine_timer_type;
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index c27302d9bf1e5..0cb929f5582ab 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -110,6 +110,8 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_ADC      (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/stm32/machine_adc.c"
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
 #define MICROPY_PY_MACHINE_BITSTREAM (1)
 #endif

From 5b4a2baff6b42b2b428cd58a95407a66387e4305 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Oct 2023 23:46:07 +1100
Subject: [PATCH 0466/3129] extmod/machine_uart: Factor ports' UART Python
 bindings to common code.

This is a code factoring to have the Python bindings in one location, and
all the ports use those same bindings.  For all ports except the two listed
below there is no functional change.

The nrf port has UART.sendbreak() removed, but this method previously did
nothing.

The zephyr port has the following methods added:
- UART.init(): supports setting timeout and timeout_char.
- UART.deinit(): does nothing, just returns None.
- UART.flush(): raises OSError(EINVAL) because it's not implemented.
- UART.any() and UART.txdone(): raise NotImplementedError.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/cyw43/cywbt.c                  |   2 +-
 extmod/extmod.cmake                    |   1 +
 extmod/extmod.mk                       |   1 +
 extmod/machine_uart.c                  | 187 +++++++++++++++++++++
 extmod/modmachine.h                    |  20 +++
 ports/esp32/esp32_common.cmake         |   1 -
 ports/esp32/machine_uart.c             | 107 +++---------
 ports/esp32/modmachine.c               |   2 +
 ports/esp32/modmachine.h               |   1 -
 ports/esp32/mpconfigport.h             |   3 +
 ports/esp8266/Makefile                 |   1 -
 ports/esp8266/machine_uart.c           |  99 ++++-------
 ports/esp8266/main.c                   |   3 +-
 ports/esp8266/modmachine.c             |   4 +-
 ports/esp8266/modmachine.h             |   1 -
 ports/esp8266/modos.c                  |   5 +-
 ports/esp8266/mpconfigport.h           |   2 +
 ports/mimxrt/Makefile                  |   1 -
 ports/mimxrt/machine_uart.c            | 111 ++++--------
 ports/mimxrt/modmachine.c              |   2 +
 ports/mimxrt/modmachine.h              |   1 -
 ports/mimxrt/mpconfigport.h            |   3 +
 ports/nrf/Makefile                     |   1 -
 ports/nrf/main.c                       |   1 +
 ports/nrf/modules/machine/modmachine.c |   1 -
 ports/nrf/modules/machine/uart.c       | 164 ++++++------------
 ports/nrf/modules/machine/uart.h       |  11 +-
 ports/nrf/modules/os/modos.c           |   2 +-
 ports/nrf/mpconfigport.h               |   3 +
 ports/nrf/mphalport.c                  |   2 +-
 ports/renesas-ra/Makefile              |   1 -
 ports/renesas-ra/machine_uart.c        | 196 +++++-----------------
 ports/renesas-ra/modmachine.c          |   2 +
 ports/renesas-ra/modmachine.h          |   1 -
 ports/renesas-ra/mpconfigport.h        |   5 +
 ports/rp2/CMakeLists.txt               |   1 -
 ports/rp2/machine_uart.c               | 110 +++---------
 ports/rp2/modmachine.c                 |   2 +
 ports/rp2/modmachine.h                 |   1 -
 ports/rp2/mpbthciport.c                |   1 +
 ports/rp2/mpconfigport.h               |   3 +
 ports/samd/Makefile                    |   1 -
 ports/samd/machine_i2c.c               |   2 -
 ports/samd/machine_spi.c               |   2 -
 ports/samd/machine_uart.c              | 133 +++------------
 ports/samd/modmachine.h                |   3 -
 ports/samd/mpconfigport.h              |   2 +
 ports/samd/samd_soc.c                  |  25 +++
 ports/samd/samd_soc.h                  |   2 +
 ports/stm32/Makefile                   |   1 -
 ports/stm32/machine_uart.c             | 224 ++++++-------------------
 ports/stm32/main.c                     |   7 +-
 ports/stm32/modmachine.c               |   4 +-
 ports/stm32/modos.c                    |   7 +-
 ports/stm32/modpyb.c                   |   5 +-
 ports/stm32/mpbthciport.c              |   7 +-
 ports/stm32/mpconfigport.h             |   5 +
 ports/stm32/mphalport.c                |   2 +-
 ports/stm32/uart.c                     |  54 +++---
 ports/stm32/uart.h                     |  35 ++--
 ports/zephyr/CMakeLists.txt            |   1 -
 ports/zephyr/machine_uart.c            |  63 +++----
 ports/zephyr/modmachine.c              |   3 +
 ports/zephyr/modmachine.h              |   1 -
 ports/zephyr/mpconfigport.h            |   2 +
 65 files changed, 661 insertions(+), 996 deletions(-)
 create mode 100644 extmod/machine_uart.c

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index bc6674ea2ef7c..d1b19382c599a 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -49,7 +49,7 @@ extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 #include "uart.h"
 
 // Provided by the port.
-extern pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
+extern machine_uart_obj_t mp_bluetooth_hci_uart_obj;
 
 STATIC void cywbt_wait_cts_low(void) {
     mp_hal_pin_config(CYW43_PIN_BT_CTS, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 6f01bafe4639a..a1a0a9f736163 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -16,6 +16,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/machine_pwm.c
     ${MICROPY_EXTMOD_DIR}/machine_signal.c
     ${MICROPY_EXTMOD_DIR}/machine_spi.c
+    ${MICROPY_EXTMOD_DIR}/machine_uart.c
     ${MICROPY_EXTMOD_DIR}/machine_wdt.c
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 76dfbf0a45a4a..8a48a4293698b 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -13,6 +13,7 @@ SRC_EXTMOD_C += \
 	extmod/machine_signal.c \
 	extmod/machine_spi.c \
 	extmod/machine_timer.c \
+	extmod/machine_uart.c \
 	extmod/machine_wdt.c \
 	extmod/modasyncio.c \
 	extmod/modbinascii.c \
diff --git a/extmod/machine_uart.c b/extmod/machine_uart.c
new file mode 100644
index 0000000000000..dd556bbbbfafa
--- /dev/null
+++ b/extmod/machine_uart.c
@@ -0,0 +1,187 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "py/runtime.h"
+#include "py/stream.h"
+
+#if MICROPY_PY_MACHINE_UART
+
+#include "extmod/modmachine.h"
+#include "shared/runtime/mpirq.h"
+
+// The port must provide implementations of these low-level UART functions.
+
+STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+STATIC void mp_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 mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self);
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self);
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self);
+
+#if MICROPY_PY_MACHINE_UART_SENDBREAK
+STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self);
+#endif
+
+#if MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR
+STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self);
+STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data);
+#endif
+
+#if MICROPY_PY_MACHINE_UART_IRQ
+STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args);
+#endif
+
+STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode);
+STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode);
+STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode);
+
+// The port provides implementations of the above in this file.
+#include MICROPY_PY_MACHINE_UART_INCLUDEFILE
+
+// UART.init(...)
+STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    mp_machine_uart_init_helper(MP_OBJ_TO_PTR(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);
+
+// UART.deinit()
+STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_machine_uart_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
+
+// UART.any()
+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(mp_machine_uart_any(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
+
+// UART.txdone()
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(mp_machine_uart_txdone(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
+#if MICROPY_PY_MACHINE_UART_SENDBREAK
+
+// UART.sendbreak()
+STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_machine_uart_sendbreak(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
+
+#endif
+
+#if MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR
+
+// UART.readchar()
+STATIC mp_obj_t machine_uart_readchar(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(mp_machine_uart_readchar(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_readchar_obj, machine_uart_readchar);
+
+// UART.writechar(char)
+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);
+    mp_machine_uart_writechar(self, mp_obj_get_int(char_in));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_uart_writechar_obj, machine_uart_writechar);
+
+#endif
+
+#if MICROPY_PY_MACHINE_UART_IRQ
+
+// UART.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];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args);
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    bool any_args = n_args > 1 || kw_args->used != 0;
+    return MP_OBJ_FROM_PTR(mp_machine_uart_irq(self, any_args, args));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_irq_obj, 1, machine_uart_irq);
+
+#endif
+
+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_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_any), MP_ROM_PTR(&machine_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
+
+    #if MICROPY_PY_MACHINE_UART_SENDBREAK
+    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+    #endif
+
+    #if MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR
+    { MP_ROM_QSTR(MP_QSTR_readchar), MP_ROM_PTR(&machine_uart_readchar_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writechar), MP_ROM_PTR(&machine_uart_writechar_obj) },
+    #endif
+
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_uart_irq_obj) },
+    #endif
+
+    // A port must add UART class constants defining the following macro.
+    // It can be defined to nothing if there are no constants.
+    MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
+};
+STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = mp_machine_uart_read,
+    .write = mp_machine_uart_write,
+    .ioctl = mp_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, mp_machine_uart_make_new,
+    print, mp_machine_uart_print,
+    protocol, &uart_stream_p,
+    locals_dict, &machine_uart_locals_dict
+    );
+
+#endif // MICROPY_PY_MACHINE_UART
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index e635eedaae0ae..c18c55553bbda 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -65,10 +65,29 @@
 #define MICROPY_PY_MACHINE_ADC_READ (0)
 #endif
 
+// Whether to enable the UART.sendbreak() method.
+// Requires a port to implement mp_machine_uart_sendbreak().
+#ifndef MICROPY_PY_MACHINE_UART_SENDBREAK
+#define MICROPY_PY_MACHINE_UART_SENDBREAK (0)
+#endif
+
+// Whether to enable the UART.readchar() and UART.writechar() methods.
+// Requires a port to implement mp_machine_uart_readchar() and mp_machine_uart_writechar().
+#ifndef MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR
+#define MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR (0)
+#endif
+
+// Whether to enable the UART.irq() method.
+// Requires a port to implement mp_machine_uart_irq().
+#ifndef MICROPY_PY_MACHINE_UART_IRQ
+#define MICROPY_PY_MACHINE_UART_IRQ (0)
+#endif
+
 // A port must provide these types, but they are otherwise opaque.
 typedef struct _machine_adc_obj_t machine_adc_obj_t;
 typedef struct _machine_i2s_obj_t machine_i2s_obj_t;
 typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
+typedef struct _machine_uart_obj_t machine_uart_obj_t;
 typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 
 // These classes correspond to machine.Type entries in the machine module.
@@ -80,6 +99,7 @@ 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_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_EXTMOD_MODMACHINE_H
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 4c90282c9f45e..8b3dac532ac2a 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -69,7 +69,6 @@ list(APPEND MICROPY_SOURCE_PORT
     machine_adcblock.c
     machine_dac.c
     machine_i2c.c
-    machine_uart.c
     modmachine.c
     network_common.c
     network_lan.c
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 0b4f5890badbb..f498ab5b32f7f 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2016-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
@@ -24,9 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
 #include "driver/uart.h"
 #include "freertos/FreeRTOS.h"
@@ -35,7 +34,6 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "modmachine.h"
 #include "uart.h"
 
 #if SOC_UART_SUPPORT_XTAL_CLK
@@ -75,7 +73,15 @@ STATIC const char *_parity_name[] = {"None", "1", "0"};
 /******************************************************************************/
 // MicroPython bindings for UART
 
-STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
+    { 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) }, \
+    { 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 void mp_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);
     uint32_t baudrate;
     uart_get_baudrate(self->uart_num, &baudrate);
@@ -127,7 +133,7 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
     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) {
+STATIC void mp_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, ARG_flow };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 0} },
@@ -303,7 +309,7 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     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) {
+STATIC mp_obj_t mp_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 id
@@ -372,7 +378,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
     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);
+    mp_machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
 
     // Make sure pins are connected.
     uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts);
@@ -380,30 +386,21 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_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) {
-    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);
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     uart_driver_delete(self->uart_num);
-    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);
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     size_t rxbufsize;
     uart_get_buffered_data_len(self->uart_num, &rxbufsize);
-    return MP_OBJ_NEW_SMALL_INT(rxbufsize);
+    return rxbufsize;
 }
-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);
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    return uart_wait_tx_done(self->uart_num, 0) == ESP_OK;
+}
 
+STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     // Save settings
     uint32_t baudrate;
     uart_get_baudrate(self->uart_num, &baudrate);
@@ -418,46 +415,9 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
 
     // Restore original setting
     uart_set_baudrate(self->uart_num, baudrate);
-
-    return mp_const_none;
 }
-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) },
-    { 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);
-
-STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t mp_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);
 
     // make sure we want at least 1 char
@@ -491,7 +451,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     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) {
+STATIC mp_uint_t mp_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);
 
     int bytes_written = uart_write_bytes(self->uart_num, buf_in, size);
@@ -505,7 +465,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, uintptr_t arg, int *errcode) {
+STATIC mp_uint_t mp_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) {
@@ -537,20 +497,3 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr
     }
     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
-    );
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index b1c9011cb6ae8..96df32d43593e 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -328,7 +328,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_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) },
+    #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
+    #endif
 
     // Reset reasons
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 68b7d4ffd586a..f60715f77a6b7 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -16,7 +16,6 @@ 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_spi_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;
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 1718f31f6cd19..39f91ab8314b3 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -126,6 +126,9 @@
 #define MICROPY_PY_MACHINE_I2S_FINALISER    (1)
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX  (I2S_MODE_MASTER | I2S_MODE_RX)
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_TX  (I2S_MODE_MASTER | I2S_MODE_TX)
+#define MICROPY_PY_MACHINE_UART             (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/esp32/machine_uart.c"
+#define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
 #define MICROPY_PY_MACHINE_WDT              (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/esp32/machine_wdt.c"
 #define MICROPY_PY_NETWORK (1)
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 0485f9bc0599a..b29df9fd2223c 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -114,7 +114,6 @@ SRC_C = \
 	machine_bitstream.c \
 	machine_pin.c \
 	machine_rtc.c \
-	machine_uart.c \
 	machine_hspi.c \
 	modesp.c \
 	network_wlan.c \
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index 873b12b2fab9c..f38858b0c2312 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2016-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
@@ -24,24 +24,19 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
+#include "py/mperrno.h"
+#include "py/mphal.h"
 #include "ets_sys.h"
 #include "user_interface.h"
 #include "uart.h"
 
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/mperrno.h"
-#include "py/mphal.h"
-#include "modmachine.h"
-
 // UartDev is defined and initialized in rom code.
 extern UartDevice UartDev;
 
-typedef struct _pyb_uart_obj_t {
+typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uint8_t uart_id;
     uint8_t bits;
@@ -50,21 +45,24 @@ typedef struct _pyb_uart_obj_t {
     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;
+} machine_uart_obj_t;
 
 STATIC const char *_parity_name[] = {"None", "1", "0"};
 
 /******************************************************************************/
 // 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);
+// The UART class doesn't have any constants for this port.
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
+
+STATIC void mp_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=%u, timeout=%u, timeout_char=%u)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
         self->stop, uart0_get_rxbuf_len() - 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) {
+STATIC void mp_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_rxbuf, ARG_timeout, ARG_timeout_char };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 0} },
@@ -192,7 +190,7 @@ STATIC void pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_o
     uart_setup(self->uart_id);
 }
 
-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 mp_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 id
@@ -202,7 +200,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 = mp_obj_malloc(pyb_uart_obj_t, &pyb_uart_type);
+    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
     self->uart_id = uart_id;
     self->baudrate = 115200;
     self->bits = 8;
@@ -214,47 +212,25 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
     // 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);
+    mp_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) {
-    pyb_uart_init_helper(args[0], n_args - 1, args + 1, kw_args);
-    return mp_const_none;
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+    (void)self;
 }
-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_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+    return uart_rx_any(self->uart_id);
 }
-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 bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    return uart_txdone(self->uart_id);
 }
-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) },
-    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_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);
+STATIC mp_uint_t mp_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);
 
     if (self->uart_id == 1) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("UART(1) can't read"));
@@ -282,8 +258,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 mp_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;
 
     /* TODO implement non-blocking
@@ -303,8 +279,8 @@ STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t
     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;
+STATIC mp_uint_t mp_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) {
         mp_uint_t flags = arg;
@@ -321,7 +297,7 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t a
         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) {
+            if (mp_machine_uart_txdone(self)) {
                 return 0;
             }
             MICROPY_EVENT_POLL_HOOK
@@ -336,21 +312,4 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t a
     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,
-};
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_uart_type,
-    MP_QSTR_UART,
-    MP_TYPE_FLAG_ITER_IS_STREAM,
-    make_new, pyb_uart_make_new,
-    print, pyb_uart_print,
-    protocol, &uart_stream_p,
-    locals_dict, &pyb_uart_locals_dict
-    );
-
 MP_REGISTER_ROOT_POINTER(byte * uart0_rxbuf);
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 87e72bace991d..33e0272f8076d 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -40,6 +40,7 @@
 #define USE_US_TIMER 1
 
 #include "extmod/misc.h"
+#include "extmod/modmachine.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
 #include "gccollect.h"
@@ -72,7 +73,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] = MP_OBJ_TYPE_GET_SLOT(&pyb_uart_type, make_new)(&pyb_uart_type, 2, 0, args);
+        args[0] = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)(&machine_uart_type, 2, 0, args);
         args[1] = MP_OBJ_NEW_SMALL_INT(1);
         mp_os_dupterm_obj.fun.var(2, args);
     }
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 43e94e0c8a7de..d7e8ed0333dca 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -430,7 +430,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     #endif
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
+    #if MICROPY_PY_MACHINE_UART
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_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_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
diff --git a/ports/esp8266/modmachine.h b/ports/esp8266/modmachine.h
index 469d25e81d892..0c6a6afbba470 100644
--- a/ports/esp8266/modmachine.h
+++ b/ports/esp8266/modmachine.h
@@ -5,7 +5,6 @@
 
 extern const mp_obj_type_t pyb_pin_type;
 extern const mp_obj_type_t pyb_rtc_type;
-extern const mp_obj_type_t pyb_uart_type;
 extern const mp_obj_type_t pyb_i2c_type;
 extern const mp_obj_type_t machine_hspi_type;
 
diff --git a/ports/esp8266/modos.c b/ports/esp8266/modos.c
index 78072d4f44869..0194bf25f0890 100644
--- a/ports/esp8266/modos.c
+++ b/ports/esp8266/modos.c
@@ -30,6 +30,7 @@
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "extmod/misc.h"
+#include "extmod/modmachine.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
@@ -53,10 +54,10 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
 void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
-    if (mp_obj_get_type(stream_attached) == &pyb_uart_type) {
+    if (mp_obj_get_type(stream_attached) == &machine_uart_type) {
         ++uart_attached_to_dupterm;
     }
-    if (mp_obj_get_type(stream_detached) == &pyb_uart_type) {
+    if (mp_obj_get_type(stream_detached) == &machine_uart_type) {
         --uart_attached_to_dupterm;
     }
 }
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 4e3248513e2aa..8493814b41e55 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -74,6 +74,8 @@
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
+#define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/esp8266/machine_uart.c"
 #define MICROPY_PY_MACHINE_WDT      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE "ports/esp8266/machine_wdt.c"
 #define MICROPY_PY_NETWORK (1)
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index b631c829bf0e4..6131a509d8944 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -202,7 +202,6 @@ SRC_C += \
 	machine_rtc.c \
 	machine_sdcard.c \
 	machine_spi.c \
-	machine_uart.c \
 	main.c \
 	mbedtls/mbedtls_port.c \
 	mimxrt_flash.c \
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 8e1505349ae25..7d228d91591de 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -25,8 +25,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/stream.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
+
 #include "py/mphal.h"
 #include "ticks.h"
 #include "fsl_common.h"
@@ -163,7 +164,16 @@ void machine_uart_set_baudrate(mp_obj_t uart_in, uint32_t baudrate) {
     #endif
 }
 
-STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+/******************************************************************************/
+// MicroPython bindings for UART
+
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
+    { 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 void mp_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, flow=%s, "
         "rxbuf=%d, txbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
@@ -174,7 +184,7 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
         _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) {
+STATIC void mp_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_flow,
            ARG_timeout, ARG_timeout_char, ARG_invert, ARG_rxbuf, ARG_txbuf};
     static const mp_arg_t allowed_args[] = {
@@ -328,11 +338,9 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         self->lpuart->STAT |= 1 << LPUART_STAT_BRK13_SHIFT;
         LPUART_EnableTx(self->lpuart, true);
     }
-
-    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) {
+STATIC mp_obj_t mp_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.
@@ -358,53 +366,33 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_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);
+        mp_machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+        return MP_OBJ_FROM_PTR(self);
     } else {
         return mp_const_none;
     }
 }
 
-// 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);
-
 // uart.deinit()
-STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
-    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     LPUART_SoftwareReset(self->lpuart);
-    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);
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     machine_uart_ensure_active(self);
     size_t count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
-    return MP_OBJ_NEW_SMALL_INT(count);
+    return 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);
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    return self->tx_status == kStatus_LPUART_TxIdle;
+}
+
+STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     machine_uart_ensure_active(self);
     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 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);
 
 // Reset all defined UARTs
 void machine_uart_deinit_all(void) {
@@ -415,31 +403,7 @@ void machine_uart_deinit_all(void) {
     }
 }
 
-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_RTS), MP_ROM_INT(UART_HWCONTROL_RTS) },
-    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) },
-
-    { 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) {
+STATIC mp_uint_t mp_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;
@@ -474,7 +438,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     return size;
 }
 
-STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t mp_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;
@@ -534,7 +498,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 mp_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) {
@@ -558,7 +522,7 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
             self->config.baudRate_Bps + ticks_us64();
 
         do {
-            if (machine_uart_txdone((mp_obj_t)self) == mp_const_true) {
+            if (mp_machine_uart_txdone(self)) {
                 return 0;
             }
             MICROPY_EVENT_POLL_HOOK
@@ -572,20 +536,3 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
     }
     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
-    );
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 33394e62dd2bf..ab7f1de4857fa 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -206,7 +206,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { 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) },
+    #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    #endif
     #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
     #endif
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index ff8ac0f085cb0..c6ac4eb390a57 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -34,7 +34,6 @@ 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;
 
 void machine_adc_init(void);
 void machine_pin_irq_deinit(void);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 9df6397a8755c..01502d547248f 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -105,6 +105,9 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/mimxrt/machine_wdt.c"
 #define MICROPY_PY_MACHINE_WDT_TIMEOUT_MS   (1)
 #define MICROPY_SOFT_TIMER_TICKS_MS         systick_ms
+#define MICROPY_PY_MACHINE_UART             (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/mimxrt/machine_uart.c"
+#define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 
 // fatfs configuration used in ffconf.h
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index b5d832577376a..ac86ad2b155f0 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -321,7 +321,6 @@ endif
 
 DRIVERS_SRC_C += $(addprefix modules/,\
 	machine/modmachine.c \
-	machine/uart.c \
 	machine/spi.c \
 	machine/i2c.c \
 	machine/pin.c \
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index cd22521f4a01f..959c31e2e7419 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -38,6 +38,7 @@
 #include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/compile.h"
+#include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "readline.h"
 #include "gccollect.h"
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index f8a6e424af90a..4d39a29b03617 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -39,7 +39,6 @@
 #include "lib/oofatfs/diskio.h"
 #include "gccollect.h"
 #include "pin.h"
-#include "uart.h"
 #include "spi.h"
 #include "i2c.h"
 #include "timer.h"
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index fd176549d0f9e..e0b56e831004d 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -26,13 +26,9 @@
  * THE SOFTWARE.
  */
 
-#include <stdbool.h>
-#include <string.h>
-#include <stdarg.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
-#include "py/nlr.h"
-#include "py/runtime.h"
-#include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/ringbuf.h"
@@ -41,9 +37,7 @@
 #include "shared/runtime/interrupt_char.h"
 
 #include "uart.h"
-#include "mpconfigboard.h"
 #include "nrf.h"
-#include "mphalport.h"
 
 #if NRFX_UART_ENABLED
 #include "nrfx_uart.h"
@@ -51,15 +45,12 @@
 #include "nrfx_uarte.h"
 #endif
 
-
-#if MICROPY_PY_MACHINE_UART
-
-typedef struct _machine_hard_uart_buf_t {
+typedef struct _machine_uart_buf_t {
     uint8_t tx_buf[1];
     uint8_t rx_buf[1];
     uint8_t rx_ringbuf_array[64];
     volatile ringbuf_t rx_ringbuf;
-} machine_hard_uart_buf_t;
+} machine_uart_buf_t;
 
 #if NRFX_UARTE_ENABLED
 
@@ -96,17 +87,17 @@ typedef struct _machine_hard_uart_buf_t {
 
 #endif
 
-typedef struct _machine_hard_uart_obj_t {
+typedef struct _machine_uart_obj_t {
     mp_obj_base_t       base;
     const nrfx_uart_t * p_uart;      // Driver instance
-    machine_hard_uart_buf_t buf;
+    machine_uart_buf_t buf;
     uint16_t timeout;       // timeout waiting for first char (in ms)
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
-} machine_hard_uart_obj_t;
+} machine_uart_obj_t;
 
 static const nrfx_uart_t instance0 = NRFX_UART_INSTANCE(0);
 
-STATIC machine_hard_uart_obj_t machine_hard_uart_obj[] = {
+STATIC machine_uart_obj_t machine_uart_obj[] = {
     {{&machine_uart_type}, .p_uart = &instance0}
 };
 
@@ -116,14 +107,14 @@ void uart_init0(void) {
 STATIC int uart_find(mp_obj_t id) {
     // given an integer id
     int uart_id = mp_obj_get_int(id);
-    if (uart_id >= 0 && uart_id < MP_ARRAY_SIZE(machine_hard_uart_obj)) {
+    if (uart_id >= 0 && uart_id < MP_ARRAY_SIZE(machine_uart_obj)) {
         return uart_id;
     }
     mp_raise_ValueError(MP_ERROR_TEXT("UART doesn't exist"));
 }
 
 STATIC void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context) {
-    machine_hard_uart_obj_t *self = p_context;
+    machine_uart_obj_t *self = p_context;
     if (p_event->type == NRFX_UART_EVT_RX_DONE) {
         nrfx_uart_rx(self->p_uart, &self->buf.rx_buf[0], 1);
         int chr = self->buf.rx_buf[0];
@@ -143,15 +134,15 @@ STATIC void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context
     }
 }
 
-bool uart_rx_any(machine_hard_uart_obj_t *self) {
+bool uart_rx_any(machine_uart_obj_t *self) {
     return self->buf.rx_ringbuf.iput != self->buf.rx_ringbuf.iget;
 }
 
-int uart_rx_char(machine_hard_uart_obj_t *self) {
+int uart_rx_char(machine_uart_obj_t *self) {
     return ringbuf_get((ringbuf_t *)&self->buf.rx_ringbuf);
 }
 
-STATIC nrfx_err_t uart_tx_char(machine_hard_uart_obj_t *self, int c) {
+STATIC nrfx_err_t uart_tx_char(machine_uart_obj_t *self, int c) {
     while (nrfx_uart_tx_in_progress(self->p_uart)) {
         ;
     }
@@ -160,13 +151,13 @@ STATIC nrfx_err_t uart_tx_char(machine_hard_uart_obj_t *self, int c) {
 }
 
 
-void uart_tx_strn(machine_hard_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) {
     for (const char *top = str + len; str < top; str++) {
         uart_tx_char(uart_obj, *str);
     }
 }
 
-void uart_tx_strn_cooked(machine_hard_uart_obj_t *uart_obj, const char *str, uint len) {
+void uart_tx_strn_cooked(machine_uart_obj_t *uart_obj, const char *str, uint len) {
     for (const char *top = str + len; str < top; str++) {
         if (*str == '\n') {
             uart_tx_char(uart_obj, '\r');
@@ -178,16 +169,24 @@ void uart_tx_strn_cooked(machine_hard_uart_obj_t *uart_obj, const char *str, uin
 /******************************************************************************/
 /* MicroPython bindings                                                      */
 
-STATIC void machine_hard_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+// The UART class doesn't have any constants for this port.
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
+
+STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_printf(print, "UART(0)");
 }
 
-/// \method init(id, baudrate)
-///
-/// Initialise the UART bus with the given parameters:
-///   - `id`is bus id.
-///   - `baudrate` is the clock rate.
-STATIC mp_obj_t machine_hard_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // Parse args (none supported at this stage).
+    mp_arg_parse_all(n_args, pos_args, kw_args, 0, NULL, NULL);
+}
+
+// UART(id, baudrate)
+//
+// Initialise the UART bus with the given parameters:
+//   - `id`is bus id.
+//   - `baudrate` is the clock rate.
+STATIC mp_obj_t mp_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_timeout, ARG_timeout_char };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -202,7 +201,7 @@ STATIC mp_obj_t machine_hard_uart_make_new(const mp_obj_type_t *type, size_t n_a
 
     // get static peripheral object
     int uart_id = uart_find(args[ARG_id].u_obj);
-    machine_hard_uart_obj_t *self = &machine_hard_uart_obj[uart_id];
+    machine_uart_obj_t *self = &machine_uart_obj[uart_id];
 
     nrfx_uart_config_t config;
 
@@ -267,78 +266,36 @@ STATIC mp_obj_t machine_hard_uart_make_new(const mp_obj_type_t *type, size_t n_a
     return MP_OBJ_FROM_PTR(self);
 }
 
-/// \method writechar(char)
-/// Write a single character on the bus.  `char` is an integer to write.
-/// Return value: `None`.
-STATIC mp_obj_t machine_hard_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
-    machine_hard_uart_obj_t *self = self_in;
-
-    // get the character to write (might be 9 bits)
-    int data = mp_obj_get_int(char_in);
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+    (void)self;
+}
 
+// Write a single character on the bus.  `data` is an integer to write.
+STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
     nrfx_err_t err = uart_tx_char(self, data);
     if (err != NRFX_SUCCESS) {
         mp_hal_raise(err);
     }
-
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_hard_uart_writechar_obj, machine_hard_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 machine_hard_uart_readchar(mp_obj_t self_in) {
-    machine_hard_uart_obj_t *self = self_in;
-    return MP_OBJ_NEW_SMALL_INT(uart_rx_char(self));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_hard_uart_readchar_obj, machine_hard_uart_readchar);
 
-// uart.any()
-STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
-    machine_hard_uart_obj_t *self = self_in;
-    return MP_OBJ_NEW_SMALL_INT(ringbuf_avail((ringbuf_t *)&self->buf.rx_ringbuf));
+// Receive a single character on the bus.
+// Return value: The character read, as an integer.  Returns -1 on timeout.
+STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
+    return uart_rx_char(self);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
 
-// uart.sendbreak()
-STATIC mp_obj_t machine_hard_uart_sendbreak(mp_obj_t self_in) {
-    return mp_const_none;
+// uart.any()
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+    return ringbuf_avail((ringbuf_t *)&self->buf.rx_ringbuf);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_hard_uart_sendbreak_obj, machine_hard_uart_sendbreak);
 
 // uart.txdone()
-STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
-    machine_hard_uart_obj_t *self = self_in;
-    return mp_obj_new_bool(!nrfx_uart_tx_in_progress(self->p_uart));
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    return !nrfx_uart_tx_in_progress(self->p_uart);
 }
-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_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_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
-/*
-    { 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(machine_hard_uart_locals_dict, machine_hard_uart_locals_dict_table);
-
-STATIC mp_uint_t machine_hard_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
-    machine_hard_uart_obj_t *self = self_in;
+STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = self_in;
     byte *buf = buf_in;
     uint32_t t = self->timeout + mp_hal_ticks_ms();
 
@@ -362,8 +319,8 @@ STATIC mp_uint_t machine_hard_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_
     return size;
 }
 
-STATIC mp_uint_t machine_hard_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
-    machine_hard_uart_obj_t *self = self_in;
+STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = self_in;
 
     nrfx_err_t err = nrfx_uart_tx(self->p_uart, buf_in, size);
     if (err == NRFX_SUCCESS) {
@@ -378,8 +335,8 @@ 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;
+STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    machine_uart_obj_t *self = self_in;
     (void)self;
     mp_uint_t ret = 0;
 
@@ -399,22 +356,3 @@ STATIC mp_uint_t machine_hard_uart_ioctl(mp_obj_t self_in, mp_uint_t request, ui
     }
     return MP_STREAM_ERROR;
 }
-
-STATIC const mp_stream_p_t uart_stream_p = {
-    .read = machine_hard_uart_read,
-    .write = machine_hard_uart_write,
-    .ioctl = machine_hard_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_hard_uart_make_new,
-    print, machine_hard_uart_print,
-    protocol, &uart_stream_p,
-    locals_dict, &machine_hard_uart_locals_dict
-    );
-
-#endif // MICROPY_PY_MACHINE_UART
diff --git a/ports/nrf/modules/machine/uart.h b/ports/nrf/modules/machine/uart.h
index eee0738fe1f99..741473ab7a4e3 100644
--- a/ports/nrf/modules/machine/uart.h
+++ b/ports/nrf/modules/machine/uart.h
@@ -31,16 +31,15 @@
 #include "pin.h"
 #include "genhdr/pins.h"
 
-typedef struct _machine_hard_uart_obj_t machine_hard_uart_obj_t;
-extern const mp_obj_type_t machine_uart_type;
+typedef struct _machine_uart_obj_t machine_uart_obj_t;
 
 void uart_init0(void);
 void uart_deinit(void);
 void uart_irq_handler(mp_uint_t uart_id);
 
-bool uart_rx_any(machine_hard_uart_obj_t *uart_obj);
-int uart_rx_char(machine_hard_uart_obj_t *uart_obj);
-void uart_tx_strn(machine_hard_uart_obj_t *uart_obj, const char *str, uint len);
-void uart_tx_strn_cooked(machine_hard_uart_obj_t *uart_obj, const char *str, uint len);
+bool uart_rx_any(machine_uart_obj_t *uart_obj);
+int uart_rx_char(machine_uart_obj_t *uart_obj);
+void uart_tx_strn(machine_uart_obj_t *uart_obj, const char *str, uint len);
+void uart_tx_strn_cooked(machine_uart_obj_t *uart_obj, const char *str, uint len);
 
 #endif
diff --git a/ports/nrf/modules/os/modos.c b/ports/nrf/modules/os/modos.c
index 7654ac119bf7e..ebe50455151c7 100644
--- a/ports/nrf/modules/os/modos.c
+++ b/ports/nrf/modules/os/modos.c
@@ -34,11 +34,11 @@
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "modules/os/microbitfs.h"
+#include "extmod/modmachine.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
 #include "genhdr/mpversion.h"
-#include "uart.h"
 
 #if MICROPY_HW_ENABLE_RNG
 #include "drivers/rng.h"
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 79a74e8566ce7..929065b49a302 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -206,6 +206,9 @@
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE "ports/nrf/modules/machine/soft_pwm.c"
 #endif
 
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/nrf/modules/machine/uart.c"
+#define MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR (1)
+
 #ifndef MICROPY_PY_MACHINE_TIMER_NRF
 #define MICROPY_PY_MACHINE_TIMER_NRF (1)
 #endif
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index a2eec7fceb1d2..7a51e187b77c8 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -378,4 +378,4 @@ 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);
+MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *board_stdio_uart);
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 4630c30fc0e77..fb7bb67e48ad3 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -322,7 +322,6 @@ SRC_C += \
 	machine_dac.c \
 	machine_i2c.c \
 	machine_spi.c \
-	machine_uart.c \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_sdcard.c \
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index f365223afaba8..6c520f941f870 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2021,2022 Renesas Electronics Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,12 +25,9 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
-#include "py/runtime.h"
-#include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "shared/runtime/interrupt_char.h"
@@ -41,44 +38,13 @@
 
 #define DEFAULT_UART_BAUDRATE (115200)
 
-STATIC const char *_parity_name[] = {"None", "ODD", "EVEN"};
+#define MICROPY_PY_MACHINE_UART_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) }, \
 
-/// \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 const char *_parity_name[] = {"None", "ODD", "EVEN"};
 
-STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void mp_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);
@@ -116,7 +82,7 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
 ///   - `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 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 void mp_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} },
@@ -238,7 +204,6 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
     #endif
 
     // enable_irq(irq_state);
-    return mp_const_none;
 }
 
 /// \classmethod \constructor(bus, ...)
@@ -256,7 +221,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
 ///   - `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 machine_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 mp_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);
 
@@ -335,43 +300,33 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     // start the 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);
+    mp_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) {
-    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(machine_uart_init_obj, 1, machine_uart_init);
-
-/// \method deinit()
-/// Turn off the UART bus.
-STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
-    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+// Turn off the UART bus.
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     uart_deinit(self);
-    return mp_const_none;
 }
-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 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));
+// Return number of characters waiting.
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+    return uart_rx_any(self);
 }
-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 machine_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
-    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+// Return `true` if all characters have been sent.
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    return !uart_tx_busy(self);
+}
 
-    // get the character to write (might be 9 bits)
-    uint16_t data = mp_obj_get_int(char_in);
+// Send a break condition.
+STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+    ra_sci_tx_break((uint32_t)self->uart_id);
+}
 
-    // write the character
+// Write a single character on the bus.  `data` is an integer to write.
+STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
     int errcode;
     if (uart_tx_wait(self, self->timeout)) {
         uart_tx_data(self, &data, 1, &errcode);
@@ -382,53 +337,26 @@ STATIC mp_obj_t machine_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
     if (errcode != 0) {
         mp_raise_OSError(errcode);
     }
-
-    return mp_const_none;
 }
-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 machine_uart_readchar(mp_obj_t self_in) {
-    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+// Receive a single character on the bus.
+// Return value: The character read, as an integer.  Returns -1 on timeout.
+STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     if (uart_rx_wait(self, self->timeout)) {
-        return MP_OBJ_NEW_SMALL_INT(uart_rx_char(self));
+        return uart_rx_char(self);
     } else {
         // return -1 on timeout
-        return MP_OBJ_NEW_SMALL_INT(-1);
+        return -1;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_readchar_obj, machine_uart_readchar);
-
-// uart.sendbreak()
-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(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];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args);
-    machine_uart_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
+STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
     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) {
+    if (any_args) {
         // 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)) {
@@ -450,41 +378,10 @@ STATIC mp_obj_t machine_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map
         uart_irq_config(self, true);
     }
 
-    return MP_OBJ_FROM_PTR(self->mp_irq_obj);
+    return self->mp_irq_obj;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_irq_obj, 1, machine_uart_irq);
-
-STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
-    // instance methods
-
-    { 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) },
-    /// \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(&machine_uart_irq_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(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) {
+
+STATIC mp_uint_t mp_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;
 
@@ -526,7 +423,7 @@ 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) {
+STATIC mp_uint_t mp_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;
 
@@ -555,7 +452,7 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
     }
 }
 
-STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+STATIC mp_uint_t mp_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) {
@@ -587,21 +484,4 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr
     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,
-    locals_dict, &machine_uart_locals_dict,
-    print, machine_uart_print,
-    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/modmachine.c b/ports/renesas-ra/modmachine.c
index 9b93b69480f04..62c9a392c0b0f 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -296,7 +296,9 @@ 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_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
+    #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     #if MICROPY_PY_MACHINE_PWM
     #if MICROPY_HW_ENABLE_HW_PWM
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index 1dd0eec758db8..ddf212221da98 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -37,7 +37,6 @@ 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_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;
 
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 71d5cab82089b..d3bc3235fd4d2 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -151,6 +151,11 @@
 #define MICROPY_PY_MACHINE_PWM_DUTY (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/renesas-ra/machine_pwm.c"
 #endif
+#define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/renesas-ra/machine_uart.c"
+#define MICROPY_PY_MACHINE_UART_IRQ (1)
+#define MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR (1)
+#define MICROPY_PY_MACHINE_UART_SENDBREAK (1)
 #if MICROPY_HW_ENABLE_HW_DAC
 #define MICROPY_PY_MACHINE_DAC      (1)
 #endif
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index c93a8a55d84fb..16f2d8a247752 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -123,7 +123,6 @@ set(MICROPY_SOURCE_PORT
     machine_rtc.c
     machine_spi.c
     machine_timer.c
-    machine_uart.c
     main.c
     modmachine.c
     modrp2.c
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 09870e78f0d73..044c905ff21bb 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2020-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
@@ -24,12 +24,12 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/stream.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
+
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "py/ringbuf.h"
-#include "modmachine.h"
 
 #include "hardware/irq.h"
 #include "hardware/uart.h"
@@ -183,7 +183,13 @@ STATIC void uart1_irq_handler(void) {
 /******************************************************************************/
 // MicroPython bindings for UART
 
-STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
+    { 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 void mp_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, "
         "txbuf=%d, rxbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
@@ -192,7 +198,7 @@ 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 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) {
+STATIC void mp_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[] = {
@@ -378,7 +384,7 @@ 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) {
+STATIC mp_obj_t mp_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.
@@ -393,20 +399,12 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     // 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);
+    mp_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);
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     uart_deinit(self->uart);
     if (self->uart_id == 0) {
         irq_set_enabled(UART0_IRQ, false);
@@ -416,63 +414,26 @@ STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
     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);
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     // get all bytes from the fifo first
     uart_drain_rx_fifo(self);
-    return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->read_buffer));
+    return 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);
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    return ringbuf_avail(&self->write_buffer) == 0
+           && (uart_get_hw(self->uart)->fr & UART_UARTFR_TXFE_BITS);
+}
+
+STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     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 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) },
 
-    { 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);
-
-STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t mp_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 = time_us_64() + (uint64_t)self->timeout * 1000;
     uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
@@ -502,7 +463,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     return size;
 }
 
-STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t mp_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);
     uint64_t t = time_us_64() + (uint64_t)self->timeout * 1000;
     uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
@@ -542,7 +503,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 mp_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) {
@@ -560,7 +521,7 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
         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) {
+            if (mp_machine_uart_txdone(self)) {
                 return 0;
             }
             MICROPY_EVENT_POLL_HOOK
@@ -574,22 +535,5 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
     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 *rp2_uart_rx_buffer[2]);
 MP_REGISTER_ROOT_POINTER(void *rp2_uart_tx_buffer[2]);
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index b47af1aba0d1d..94d87cf314346 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -267,7 +267,9 @@ 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_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
+    #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    #endif
     #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
     #endif
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 5feafdcea8853..4e4245ed38cc1 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -8,7 +8,6 @@ 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;
 extern const mp_obj_type_t machine_timer_type;
-extern const mp_obj_type_t machine_uart_type;
 
 void machine_pin_init(void);
 void machine_pin_deinit(void);
diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index 7722360920916..16d50ddacc3a7 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -28,6 +28,7 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/modmachine.h"
 #include "extmod/mpbthci.h"
 #include "modmachine.h"
 #include "mpbthciport.h"
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index b69a06387e970..0a6331273434d 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -129,6 +129,9 @@
 #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_MACHINE_UART                 (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE     "ports/rp2/machine_uart.c"
+#define MICROPY_PY_MACHINE_UART_SENDBREAK       (1)
 #define MICROPY_PY_MACHINE_WDT                  (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE      "ports/rp2/machine_wdt.c"
 #define MICROPY_PY_ONEWIRE                      (1)
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 841e6a9928273..7d27367b6b11a 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -102,7 +102,6 @@ SRC_C += \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_spi.c \
-	machine_uart.c \
 	main.c \
 	modmachine.c \
 	modsamd.c \
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index f3364950bdb71..5606d7b62796b 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -71,8 +71,6 @@ typedef struct _machine_i2c_obj_t {
     uint8_t *buf;
 } machine_i2c_obj_t;
 
-extern Sercom *sercom_instance[];
-
 STATIC void i2c_send_command(Sercom *i2c, uint8_t command) {
     i2c->I2CM.CTRLB.bit.CMD = command;
     while (i2c->I2CM.SYNCBUSY.bit.SYSOP) {
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 99eb4e17f6517..b00eb427169f4 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -60,8 +60,6 @@ typedef struct _machine_spi_obj_t {
     size_t rxlen;
 } machine_spi_obj_t;
 
-extern Sercom *sercom_instance[];
-
 void common_spi_irq_handler(int spi_id) {
     // handle Sercom IRQ RXC
     machine_spi_obj_t *self = MP_STATE_PORT(sercom_table[spi_id]);
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index b95e158b3cae7..c081b8814b9ae 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -24,17 +24,14 @@
  * 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_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
 #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)
@@ -43,6 +40,8 @@
 #define FLOW_CONTROL_RTS (1)
 #define FLOW_CONTROL_CTS (2)
 
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uint8_t id;
@@ -69,30 +68,6 @@ typedef struct _machine_uart_obj_t {
     #endif
 } machine_uart_obj_t;
 
-Sercom *sercom_instance[] = SERCOM_INSTS;
-MP_REGISTER_ROOT_POINTER(void *sercom_table[SERCOM_INST_NUM]);
-
-// Common Sercom functions used by all Serial devices
-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) {
-    }
-}
-
-void sercom_deinit_all(void) {
-    for (int i = 0; i < SERCOM_INST_NUM; i++) {
-        Sercom *uart = sercom_instance[i];
-        uart->USART.INTENCLR.reg = 0xff;
-        sercom_register_irq(i, NULL);
-        sercom_enable(uart, 0);
-        MP_STATE_PORT(sercom_table[i]) = NULL;
-    }
-}
-#endif
-
-#if MICROPY_PY_MACHINE_UART
-
 STATIC const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
 
 // Irq handler
@@ -137,7 +112,7 @@ void common_uart_irq_handler(int uart_id) {
     }
 }
 
-STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void mp_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"
@@ -160,7 +135,7 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
         );
 }
 
-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 void mp_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, ARG_rts, ARG_cts };
     static const mp_arg_t allowed_args[] = {
@@ -373,11 +348,9 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
 
         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) {
+STATIC mp_obj_t mp_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.
@@ -405,17 +378,12 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
     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);
-}
+    mp_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);
+    return MP_OBJ_FROM_PTR(self);
 }
-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);
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     // Check if it is the active object.
     if (MP_STATE_PORT(sercom_table)[self->id] == self) {
         Sercom *uart = sercom_instance[self->id];
@@ -426,18 +394,23 @@ STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
             sercom_enable(uart, 0);
         }
     }
-    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);
-    return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->read_buffer));
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+    return 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);
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    Sercom *uart = sercom_instance[self->id];
+
+    return uart->USART.INTFLAG.bit.DRE
+           #if MICROPY_HW_UART_TXBUF
+           && ringbuf_avail(&self->write_buffer) == 0
+           #endif
+           && uart->USART.INTFLAG.bit.TXC;
+}
+
+STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     uint32_t break_time_us = 13 * 1000000 / self->baudrate;
 
     // Wait for the tx buffer to drain.
@@ -457,43 +430,9 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
     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);
-
-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);
 
-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_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) },
-    { 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) {
+STATIC mp_uint_t mp_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);
     Sercom *uart = sercom_instance[self->id];
     uint64_t t = mp_hal_ticks_ms_64() + self->timeout;
@@ -523,7 +462,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     return size;
 }
 
-STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t mp_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 i = 0;
     const uint8_t *src = buf_in;
@@ -562,7 +501,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 mp_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;
     Sercom *uart = sercom_instance[self->id];
@@ -588,7 +527,7 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
             #endif
             ) * 13000 * 2 / self->baudrate;
         do {
-            if (machine_uart_txdone((mp_obj_t)self) == mp_const_true) {
+            if (mp_machine_uart_txdone(self)) {
                 return 0;
             }
             MICROPY_EVENT_POLL_HOOK
@@ -601,21 +540,3 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
     }
     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
-    );
-#endif
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 81b30781711d3..4f287bde35142 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -40,9 +40,6 @@ extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_spi_type;
 #endif
 extern const mp_obj_type_t machine_timer_type;
-#if MICROPY_PY_MACHINE_UART
-extern const mp_obj_type_t machine_uart_type;
-#endif
 #if MICROPY_PY_MACHINE_RTC
 extern const mp_obj_type_t machine_rtc_type;
 #endif
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 201e657c6894e..801408ed47e6f 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -116,6 +116,8 @@
 #ifndef MICROPY_PY_MACHINE_UART
 #define MICROPY_PY_MACHINE_UART             (1)
 #endif
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/samd/machine_uart.c"
+#define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
 #define MICROPY_PY_MACHINE_TIMER            (1)
 #define MICROPY_SOFT_TIMER_TICKS_MS         systick_ms
 #define MICROPY_PY_OS_DUPTERM               (3)
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index a81e7c68810da..ad5910301cfc3 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -128,3 +128,28 @@ void samd_init(void) {
     machine_rtc_start(false);
     #endif
 }
+
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
+
+Sercom *sercom_instance[] = SERCOM_INSTS;
+MP_REGISTER_ROOT_POINTER(void *sercom_table[SERCOM_INST_NUM]);
+
+// Common Sercom functions used by all Serial devices
+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) {
+    }
+}
+
+void sercom_deinit_all(void) {
+    for (int i = 0; i < SERCOM_INST_NUM; i++) {
+        Sercom *uart = sercom_instance[i];
+        uart->USART.INTENCLR.reg = 0xff;
+        sercom_register_irq(i, NULL);
+        sercom_enable(uart, 0);
+        MP_STATE_PORT(sercom_table[i]) = NULL;
+    }
+}
+
+#endif
diff --git a/ports/samd/samd_soc.h b/ports/samd/samd_soc.h
index e8560b50e8461..1848cf7db198a 100644
--- a/ports/samd/samd_soc.h
+++ b/ports/samd/samd_soc.h
@@ -30,6 +30,8 @@
 #include "sam.h"
 #include "clock_config.h"
 
+extern Sercom *sercom_instance[];
+
 void samd_init(void);
 void samd_main(void);
 
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d1248e0bb8e53..d3b80ab5b1466 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -335,7 +335,6 @@ SRC_C += \
 	machine_bitstream.c \
 	machine_i2c.c \
 	machine_spi.c \
-	machine_uart.c \
 	modmachine.c \
 	modpyb.c \
 	modstm.c \
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index ba8c1a91115dd..6f1a7f9a2d5fd 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2013-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
@@ -24,12 +24,11 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
+
 #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"
@@ -38,43 +37,13 @@
 #include "irq.h"
 #include "pendsv.h"
 
-/// \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
+#define MICROPY_PY_MACHINE_UART_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) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_FLAG_IDLE) }, \
 
-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 mp_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) {
         #if defined(LPUART1)
         if (self->uart_id == PYB_LPUART_1) {
@@ -171,7 +140,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 void mp_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_REQUIRED | MP_ARG_INT, {.u_int = 9600} },
         { MP_QSTR_bits, MP_ARG_INT, {.u_int = 8} },
@@ -292,8 +261,6 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
     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);
     }
-
-    return mp_const_none;
 }
 
 /// \classmethod \constructor(bus, ...)
@@ -311,7 +278,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 mp_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);
 
@@ -391,59 +358,56 @@ 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 - 1] == NULL) {
+    machine_uart_obj_t *self;
+    if (MP_STATE_PORT(machine_uart_obj_all)[uart_id - 1] == 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 - 1] = self;
+        MP_STATE_PORT(machine_uart_obj_all)[uart_id - 1] = self;
     } else {
         // reference existing UART object
-        self = MP_STATE_PORT(pyb_uart_obj_all)[uart_id - 1];
+        self = MP_STATE_PORT(machine_uart_obj_all)[uart_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_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+        mp_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_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);
+// Turn off the UART bus.
+STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     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));
+// Return number of characters waiting.
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+    return 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);
+// Since uart.write() waits up to the last byte, uart.txdone() always returns True.
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    (void)self;
+    return true;
+}
 
-    // get the character to write (might be 9 bits)
-    uint16_t data = mp_obj_get_int(char_in);
+// Send a break condition.
+STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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;
+    #endif
+}
 
+// Write a single character on the bus.  `data` is an integer to write.
+// The `data` can be up to 9 bits.
+STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
     // write the character
     int errcode;
     if (uart_tx_wait(self, self->timeout)) {
@@ -455,49 +419,26 @@ STATIC mp_obj_t pyb_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
     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);
+// Receive a single character on the bus.
+// Return value: The character read, as an integer.  Returns -1 on timeout.
+STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     if (uart_rx_wait(self, self->timeout)) {
-        return MP_OBJ_NEW_SMALL_INT(uart_rx_char(self));
+        return uart_rx_char(self);
     } else {
         // return -1 on timeout
-        return MP_OBJ_NEW_SMALL_INT(-1);
+        return -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);
-    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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;
-    #endif
-    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]);
 
+STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
     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) {
+    if (any_args) {
         // 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)) {
@@ -519,51 +460,11 @@ STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         uart_irq_config(self, true);
     }
 
-    return MP_OBJ_FROM_PTR(self->mp_irq_obj);
+    return self->mp_irq_obj;
 }
-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
-
-    { 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_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) },
-    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) },
-
-    // IRQ flags
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_FLAG_IDLE) },
-};
-
-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);
+STATIC mp_uint_t mp_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
@@ -604,8 +505,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 mp_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
@@ -631,8 +532,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 mp_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;
@@ -652,20 +553,3 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t a
     }
     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,
-};
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_uart_type,
-    MP_QSTR_UART,
-    MP_TYPE_FLAG_ITER_IS_STREAM,
-    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 9e5dafc9f6e5f..06ba74f759677 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -40,6 +40,7 @@
 #include "lib/littlefs/lfs1_util.h"
 #include "lib/littlefs/lfs2.h"
 #include "lib/littlefs/lfs2_util.h"
+#include "extmod/modmachine.h"
 #include "extmod/modnetwork.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
@@ -96,7 +97,7 @@ 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 machine_uart_obj_t pyb_uart_repl_obj;
 STATIC uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
 #endif
 
@@ -431,7 +432,7 @@ void stm32_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.base.type = &machine_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;
@@ -439,7 +440,7 @@ void stm32_main(uint32_t reset_mode) {
     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 - 1] = &pyb_uart_repl_obj;
+    MP_STATE_PORT(machine_uart_obj_all)[MICROPY_HW_UART_REPL - 1] = &pyb_uart_repl_obj;
     MP_STATE_PORT(pyb_stdio_uart) = &pyb_uart_repl_obj;
     #endif
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 070d0e11694f3..3bbac66879fc7 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -448,7 +448,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_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) },
+    #if MICROPY_PY_MACHINE_UART
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    #endif
     #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
     #endif
diff --git a/ports/stm32/modos.c b/ports/stm32/modos.c
index 43543aa55e2dd..bd0101cab9c73 100644
--- a/ports/stm32/modos.c
+++ b/ports/stm32/modos.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/runtime.h"
+#include "extmod/modmachine.h"
 #include "rng.h"
 #include "usb.h"
 #include "uart.h"
@@ -47,7 +48,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
 bool mp_os_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
            #if MICROPY_HW_ENABLE_USB
            || type == &pyb_usb_vcp_type
            #endif
@@ -55,7 +56,7 @@ bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) {
 }
 
 void mp_os_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 MICROPY_HW_ENABLE_USB
@@ -64,7 +65,7 @@ void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t s
     }
     #endif
 
-    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);
     }
     #if MICROPY_HW_ENABLE_USB
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 831ece74a944d..0bf2d6a2c3e94 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -52,6 +52,7 @@
 #include "usb.h"
 #include "portmodules.h"
 #include "modmachine.h"
+#include "extmod/modmachine.h"
 #include "extmod/modnetwork.h"
 #include "extmod/vfs.h"
 #include "extmod/modtime.h"
@@ -103,7 +104,7 @@ STATIC mp_obj_t pyb_repl_uart(size_t n_args, const mp_obj_t *args) {
                 uart_attach_to_repl(MP_STATE_PORT(pyb_stdio_uart), false);
                 MP_STATE_PORT(pyb_stdio_uart) = NULL;
             }
-        } else if (mp_obj_get_type(args[0]) == &pyb_uart_type) {
+        } else if (mp_obj_get_type(args[0]) == &machine_uart_type) {
             MP_STATE_PORT(pyb_stdio_uart) = MP_OBJ_TO_PTR(args[0]);
             uart_attach_to_repl(MP_STATE_PORT(pyb_stdio_uart), true);
         } else {
@@ -232,7 +233,7 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&pyb_i2c_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&pyb_spi_type) },
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
     #if MICROPY_HW_ENABLE_CAN
     { MP_ROM_QSTR(MP_QSTR_CAN), MP_ROM_PTR(&pyb_can_type) },
     #endif
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index fe061a1240885..e764c69844891 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -150,9 +150,10 @@ int mp_bluetooth_hci_uart_readpacket(mp_bluetooth_hci_uart_readchar_t handler) {
 /******************************************************************************/
 // HCI over UART
 
+#include "extmod/modmachine.h"
 #include "uart.h"
 
-pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
+machine_uart_obj_t mp_bluetooth_hci_uart_obj;
 mp_irq_obj_t mp_bluetooth_hci_uart_irq_obj;
 
 static uint8_t hci_uart_rxbuf[768];
@@ -169,13 +170,13 @@ 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.base.type = &machine_uart_type;
     mp_bluetooth_hci_uart_obj.uart_id = port;
     mp_bluetooth_hci_uart_obj.is_static = true;
     // 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;
+    MP_STATE_PORT(machine_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, baudrate, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, UART_HWCONTROL_RTS | UART_HWCONTROL_CTS);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 0cb929f5582ab..00ded86e169b0 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -128,6 +128,11 @@
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/stm32/machine_uart.c"
+#define MICROPY_PY_MACHINE_UART_IRQ (1)
+#define MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR (1)
+#define MICROPY_PY_MACHINE_UART_SENDBREAK (1)
 #define MICROPY_PY_MACHINE_WDT      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE "ports/stm32/machine_wdt.c"
 #endif
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 8edafa9bfc2fb..f8a5d66fc9152 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -182,4 +182,4 @@ void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
     }
 }
 
-MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_stdio_uart);
+MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *pyb_stdio_uart);
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 908361874d3f8..0d648a6fc1aeb 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -117,12 +117,12 @@
 
 #endif
 
-typedef struct _pyb_uart_irq_map_t {
+typedef struct _machine_uart_irq_map_t {
     uint16_t irq_en;
     uint16_t flag;
-} pyb_uart_irq_map_t;
+} machine_uart_irq_map_t;
 
-STATIC const pyb_uart_irq_map_t mp_uart_irq_map[] = {
+STATIC const machine_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(STM32G0) || defined(STM32WL)
@@ -162,18 +162,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) {
@@ -243,7 +243,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) {
     USART_TypeDef *UARTx;
     IRQn_Type irqn;
@@ -641,7 +641,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) {
         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) {
@@ -658,7 +658,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) {
     self->read_buf_head = 0;
     self->read_buf_tail = 0;
     self->read_buf_len = len;
@@ -670,7 +670,7 @@ 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;
 
     // Disable UART
@@ -809,11 +809,11 @@ void uart_deinit(pyb_uart_obj_t *self) {
     }
 }
 
-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;
 }
 
-uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
+uint32_t uart_get_source_freq(machine_uart_obj_t *self) {
     uint32_t uart_clk = 0;
 
     #if defined(STM32F0) || defined(STM32G0)
@@ -921,7 +921,7 @@ uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
     return uart_clk;
 }
 
-uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
+uint32_t uart_get_baudrate(machine_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)
@@ -938,7 +938,7 @@ uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
         LL_USART_OVERSAMPLING_16);
 }
 
-void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
+void uart_set_baudrate(machine_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),
@@ -956,7 +956,7 @@ void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
         LL_USART_OVERSAMPLING_16, baudrate);
 }
 
-mp_uint_t uart_rx_any(pyb_uart_obj_t *self) {
+mp_uint_t uart_rx_any(machine_uart_obj_t *self) {
     int buffer_bytes = self->read_buf_head - self->read_buf_tail;
     if (buffer_bytes < 0) {
         return buffer_bytes + self->read_buf_len;
@@ -970,7 +970,7 @@ mp_uint_t uart_rx_any(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) {
     uint32_t start = HAL_GetTick();
     for (;;) {
         if (self->read_buf_tail != self->read_buf_head || UART_RXNE_IS_SET(self->uartx)) {
@@ -984,7 +984,7 @@ 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) {
     if (self->read_buf_tail != self->read_buf_head) {
         // buffering via IRQ
         int data;
@@ -1023,7 +1023,7 @@ int uart_rx_char(pyb_uart_obj_t *self) {
 
 // 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)) {
@@ -1038,7 +1038,7 @@ bool uart_tx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
 
 // Waits at most timeout milliseconds for UART flag to be set.
 // Returns true if flag is/was set, false on timeout.
-STATIC bool uart_wait_flag_set(pyb_uart_obj_t *self, uint32_t flag, uint32_t timeout) {
+STATIC bool uart_wait_flag_set(machine_uart_obj_t *self, uint32_t flag, uint32_t timeout) {
     // Note: we don't use WFI to idle in this loop because UART tx doesn't generate
     // an interrupt and the flag can be set quickly if the baudrate is large.
     uint32_t start = HAL_GetTick();
@@ -1062,7 +1062,7 @@ STATIC bool uart_wait_flag_set(pyb_uart_obj_t *self, uint32_t flag, uint32_t tim
 // 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) {
     if (num_chars == 0) {
         *errcode = 0;
         return 0;
@@ -1124,7 +1124,7 @@ size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars,
     return num_tx;
 }
 
-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);
 }
@@ -1135,7 +1135,7 @@ void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
 // - 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];
+    machine_uart_obj_t *self = MP_STATE_PORT(machine_uart_obj_all)[uart_id - 1];
 
     if (self == NULL) {
         // UART object has not been set, so we can't do anything, not
@@ -1216,7 +1216,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
 }
 
 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);
@@ -1224,7 +1224,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) {
@@ -1238,4 +1238,4 @@ const mp_irq_methods_t uart_irq_methods = {
     .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]);
+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/stm32/uart.h b/ports/stm32/uart.h
index 61d1ac4397903..956cbb044f6c0 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -57,7 +57,7 @@ typedef enum {
 // 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 {
+typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     USART_TypeDef *uartx;
     pyb_uart_t uart_id : 8;
@@ -75,34 +75,33 @@ 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_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_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);
+void uart_attach_to_repl(machine_uart_obj_t *self, bool attached);
+uint32_t uart_get_source_freq(machine_uart_obj_t *self);
+uint32_t uart_get_baudrate(machine_uart_obj_t *self);
+void uart_set_baudrate(machine_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);
-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);
+mp_uint_t uart_rx_any(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);
 
-static inline bool uart_tx_avail(pyb_uart_obj_t *self) {
+static inline bool uart_tx_avail(machine_uart_obj_t *self) {
     #if defined(STM32F4) || defined(STM32L1)
     return self->uartx->SR & USART_SR_TXE;
     #elif defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index ddc613a2c0747..8834aae96f380 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -40,7 +40,6 @@ set(MICROPY_SOURCE_PORT
     machine_i2c.c
     machine_spi.c
     machine_pin.c
-    machine_uart.c
     modbluetooth_zephyr.c
     modmachine.c
     modsocket.c
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index b989c0f4817c4..2c4b3a470b58e 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -25,18 +25,16 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
 #include <zephyr/zephyr.h>
 #include <zephyr/drivers/uart.h>
 
-#include "py/runtime.h"
-#include "py/stream.h"
 #include "py/mperrno.h"
-#include "py/objstr.h"
-#include "modmachine.h"
+
+// The UART class doesn't have any constants for this port.
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
 
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
@@ -50,7 +48,7 @@ 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) {
+STATIC void mp_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);
@@ -60,7 +58,7 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
         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) {
+STATIC void mp_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} },
@@ -73,7 +71,7 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     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) {
+STATIC mp_obj_t mp_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);
 
     machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
@@ -84,20 +82,26 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
     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);
+    mp_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 void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+    (void)self;
+}
+
+STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+    (void)self;
+    mp_raise_NotImplementedError(NULL); // TODO
+}
 
-STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    (void)self;
+    mp_raise_NotImplementedError(NULL); // TODO
+}
+
+STATIC mp_uint_t mp_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;
@@ -118,7 +122,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     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) {
+STATIC mp_uint_t mp_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;
 
@@ -129,7 +133,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, uintptr_t arg, int *errcode) {
+STATIC mp_uint_t mp_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) {
@@ -146,20 +150,3 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr
     }
     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
-    );
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 633416805432a..14ddf027ad6cd 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -37,6 +37,7 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "modmachine.h"
 
 #if MICROPY_PY_MACHINE
@@ -74,7 +75,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_SPI
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
     #endif
+    #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_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) },
 
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index a605ada0de76c..520b363965ab1 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -6,7 +6,6 @@
 extern const mp_obj_type_t machine_pin_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);
 
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 2f3e314db6e8b..49d00f4ca6ba1 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -69,6 +69,8 @@
 #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_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/zephyr/machine_uart.c"
 #define MICROPY_PY_STRUCT           (0)
 #ifdef CONFIG_NETWORKING
 // If we have networking, we likely want errno comfort

From 90023b4dcf7bfeb6eccd5d0d13efc4832cf187e7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Oct 2023 11:39:40 +1100
Subject: [PATCH 0467/3129] extmod/modmachine: Clean up decls of machine types
 to use common ones.

The machine_i2c_type, machine_spi_type and machine_timer_type symbols are
already declared in extmod/modmachine.h and should not be declared anywhere
else.

Also move declarations of machine_pin_type and machine_rtc_type to the
common header in extmod.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/esp-hosted/esp_hosted_hal.c     |  3 +--
 drivers/ninaw10/nina_wifi_bsp.c         |  3 +--
 extmod/modmachine.h                     |  2 ++
 ports/esp32/boards/pins_prefix.c        |  2 +-
 ports/esp32/machine_hw_spi.c            |  2 +-
 ports/esp32/machine_i2c.c               |  2 +-
 ports/esp32/machine_pin.c               |  3 ++-
 ports/esp32/machine_rtc.c               |  2 +-
 ports/esp32/modmachine.h                |  5 -----
 ports/esp8266/modmachine.h              |  1 -
 ports/mimxrt/boards/mimxrt_prefix.c     |  1 +
 ports/mimxrt/machine_i2c.c              |  2 +-
 ports/mimxrt/machine_rtc.c              |  1 +
 ports/mimxrt/machine_spi.c              |  2 +-
 ports/mimxrt/machine_uart.c             |  2 --
 ports/mimxrt/modmachine.h               |  4 ----
 ports/mimxrt/pin.c                      |  1 +
 ports/mimxrt/pin.h                      |  1 -
 ports/nrf/modules/machine/i2c.c         |  1 +
 ports/nrf/modules/machine/i2c.h         |  2 --
 ports/nrf/modules/machine/modmachine.h  |  2 --
 ports/nrf/modules/machine/spi.c         |  1 +
 ports/nrf/modules/machine/spi.h         |  1 -
 ports/nrf/modules/machine/timer.c       |  2 +-
 ports/nrf/modules/machine/timer.h       |  2 --
 ports/renesas-ra/boards/ra_pin_prefix.c |  1 +
 ports/renesas-ra/machine_i2c.c          |  2 +-
 ports/renesas-ra/machine_pin.c          |  3 ++-
 ports/renesas-ra/machine_rtc.c          |  1 +
 ports/renesas-ra/machine_spi.c          |  2 +-
 ports/renesas-ra/main.c                 |  1 +
 ports/renesas-ra/modmachine.h           |  6 ------
 ports/renesas-ra/modos.c                |  1 +
 ports/renesas-ra/mpbthciport.c          |  2 +-
 ports/renesas-ra/pin.h                  |  1 -
 ports/renesas-ra/rtc.h                  |  1 -
 ports/renesas-ra/uart.h                 |  1 -
 ports/rp2/boards/rp2_prefix.c           |  1 +
 ports/rp2/machine_i2c.c                 |  2 +-
 ports/rp2/machine_pin.c                 |  3 ++-
 ports/rp2/machine_pin.h                 |  1 -
 ports/rp2/machine_rtc.c                 |  2 +-
 ports/rp2/machine_spi.c                 |  2 +-
 ports/rp2/modmachine.h                  |  6 ------
 ports/samd/machine_i2c.c                |  2 +-
 ports/samd/machine_rtc.c                |  2 +-
 ports/samd/machine_spi.c                |  2 +-
 ports/samd/modmachine.h                 | 11 -----------
 ports/samd/pin_af.c                     |  2 +-
 ports/samd/samd_spiflash.c              |  2 +-
 ports/stm32/machine_i2c.c               |  5 +----
 ports/stm32/machine_spi.c               |  1 +
 ports/stm32/modmachine.h                |  4 ----
 ports/stm32/spi.c                       |  1 +
 ports/stm32/spi.h                       |  1 -
 ports/zephyr/machine_i2c.c              |  2 +-
 ports/zephyr/machine_pin.c              |  1 +
 ports/zephyr/machine_spi.c              |  2 +-
 ports/zephyr/modmachine.h               |  4 ----
 59 files changed, 44 insertions(+), 87 deletions(-)

diff --git a/drivers/esp-hosted/esp_hosted_hal.c b/drivers/esp-hosted/esp_hosted_hal.c
index 4c3ecad130b77..e33b2cce475db 100644
--- a/drivers/esp-hosted/esp_hosted_hal.c
+++ b/drivers/esp-hosted/esp_hosted_hal.c
@@ -34,9 +34,8 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "modmachine.h"
 #include "extmod/machine_spi.h"
-#include "mpconfigboard.h"
+#include "extmod/modmachine.h"
 #ifdef MICROPY_HW_WIFI_LED
 #include "led.h"
 #endif
diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index c65fb111fb101..42770a33cc9c4 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -35,9 +35,8 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "modmachine.h"
 #include "extmod/machine_spi.h"
-#include "mpconfigboard.h"
+#include "extmod/modmachine.h"
 
 #include "nina_bsp.h"
 #include "nina_wifi_drv.h"
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index c18c55553bbda..2a7ce336e9ab2 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -96,7 +96,9 @@ typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 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_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;
diff --git a/ports/esp32/boards/pins_prefix.c b/ports/esp32/boards/pins_prefix.c
index 2733ddaab8654..61988be7e9a82 100644
--- a/ports/esp32/boards/pins_prefix.c
+++ b/ports/esp32/boards/pins_prefix.c
@@ -1,4 +1,4 @@
 #include "py/obj.h"
+#include "extmod/modmachine.h"
 #include "machine_pin.h"
-#include "modmachine.h"
 #include "genhdr/pins.h"
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index e09c493f5b945..3a1dd1064c6ec 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -32,7 +32,7 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "extmod/machine_spi.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #include "driver/spi_master.h"
 #include "soc/gpio_sig_map.h"
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index d498aa058d74b..4e3a9ee816d33 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #include "driver/i2c.h"
 #include "hal/i2c_ll.h"
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 9f1bc579851e5..d521e08e5141d 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -35,9 +35,10 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
+#include "extmod/virtpin.h"
 #include "mphalport.h"
 #include "modmachine.h"
-#include "extmod/virtpin.h"
 #include "machine_pin.h"
 #include "machine_rtc.h"
 #include "modesp32.h"
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 3d620336c9a91..f7b3ae66f2ee8 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -36,8 +36,8 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "shared/timeutils/timeutils.h"
-#include "modmachine.h"
 #include "machine_rtc.h"
 
 typedef struct _machine_rtc_obj_t {
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index f60715f77a6b7..7b26df609d76f 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -9,14 +9,9 @@ typedef enum {
     MACHINE_WAKE_DEEPSLEEP=0x04
 } wake_type_t;
 
-extern const mp_obj_type_t machine_timer_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_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_spi_type;
-extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
 
 void machine_init(void);
diff --git a/ports/esp8266/modmachine.h b/ports/esp8266/modmachine.h
index 0c6a6afbba470..5a90a6c6fe22e 100644
--- a/ports/esp8266/modmachine.h
+++ b/ports/esp8266/modmachine.h
@@ -5,7 +5,6 @@
 
 extern const mp_obj_type_t pyb_pin_type;
 extern const mp_obj_type_t pyb_rtc_type;
-extern const mp_obj_type_t pyb_i2c_type;
 extern const mp_obj_type_t machine_hspi_type;
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj);
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
index d7a2bcfc80d1d..3097535c524b2 100644
--- a/ports/mimxrt/boards/mimxrt_prefix.c
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -2,6 +2,7 @@
 
 #include "py/obj.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "pin.h"
 
 #define PIN_AF(_name, _af_mode, _input_daisy, _instance, _input_register, _pad_config) \
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index c0a3dee98a406..379001acdd014 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 #include CLOCK_CONFIG_H
 #include "pin.h"
 
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 169ec6b910eac..61b410a652cf8 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -29,6 +29,7 @@
 #include "py/runtime.h"
 #include "shared/runtime/mpirq.h"
 #include "shared/timeutils/timeutils.h"
+#include "extmod/modmachine.h"
 #include "modmachine.h"
 #include "ticks.h"
 #include "fsl_snvs_lp.h"
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index bafe94b970fba..879687bd112ee 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -29,7 +29,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_spi.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 #include CLOCK_CONFIG_H
 
 #include "fsl_cache.h"
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 7d228d91591de..4dbe1d2e5e8ec 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -73,8 +73,6 @@ typedef struct _iomux_table_t {
     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[] = {
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index c6ac4eb390a57..34e93260f2dac 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -29,11 +29,7 @@
 
 #include "py/obj.h"
 
-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;
 
 void machine_adc_init(void);
 void machine_pin_irq_deinit(void);
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
index fcc986328636a..4403f6ac77f77 100644
--- a/ports/mimxrt/pin.c
+++ b/ports/mimxrt/pin.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/runtime.h"
+#include "extmod/modmachine.h"
 #include "pin.h"
 
 
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index aa86f05e82d46..bf611aa9893a6 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -140,7 +140,6 @@ typedef struct _machine_pin_irq_obj_t {
 
 // ------------------------------------------------------------------------------------------------------------------ //
 
-extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pin_af_type;
 
 // ------------------------------------------------------------------------------------------------------------------ //
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index fad1b7336c955..8bb9613df86e3 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -35,6 +35,7 @@
 #if MICROPY_PY_MACHINE_I2C
 
 #include "extmod/machine_i2c.h"
+#include "extmod/modmachine.h"
 #include "i2c.h"
 #if NRFX_TWI_ENABLED
 #include "nrfx_twi.h"
diff --git a/ports/nrf/modules/machine/i2c.h b/ports/nrf/modules/machine/i2c.h
index 5c5befc285354..3c4fde983a62a 100644
--- a/ports/nrf/modules/machine/i2c.h
+++ b/ports/nrf/modules/machine/i2c.h
@@ -29,8 +29,6 @@
 
 #include "extmod/machine_i2c.h"
 
-extern const mp_obj_type_t machine_i2c_type;
-
 void i2c_init0(void);
 
 #endif // I2C_H__
diff --git a/ports/nrf/modules/machine/modmachine.h b/ports/nrf/modules/machine/modmachine.h
index e5412673f8228..45847d407f05f 100644
--- a/ports/nrf/modules/machine/modmachine.h
+++ b/ports/nrf/modules/machine/modmachine.h
@@ -28,8 +28,6 @@
 #ifndef __MICROPY_INCLUDED_NRF5_MODMACHINE_H__
 #define __MICROPY_INCLUDED_NRF5_MODMACHINE_H__
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/obj.h"
 
 void machine_init(void);
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 0dee20027b2d2..46f2eba292fa0 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -36,6 +36,7 @@
 #include "py/nlr.h"
 #include "py/mphal.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "pin.h"
 #include "genhdr/pins.h"
 #include "spi.h"
diff --git a/ports/nrf/modules/machine/spi.h b/ports/nrf/modules/machine/spi.h
index e1505781ac38d..1a1998d25aefe 100644
--- a/ports/nrf/modules/machine/spi.h
+++ b/ports/nrf/modules/machine/spi.h
@@ -27,7 +27,6 @@
 #include "py/obj.h"
 
 typedef struct _machine_hard_spi_obj_t machine_hard_spi_obj_t;
-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/timer.c b/ports/nrf/modules/machine/timer.c
index fbef0b0ef66f3..db9f04c2fa7f4 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "py/nlr.h"
 #include "py/runtime.h"
+#include "extmod/modmachine.h"
 #include "timer.h"
 #include "nrfx_timer.h"
 
diff --git a/ports/nrf/modules/machine/timer.h b/ports/nrf/modules/machine/timer.h
index bfbe07974b465..e483c3928ef61 100644
--- a/ports/nrf/modules/machine/timer.h
+++ b/ports/nrf/modules/machine/timer.h
@@ -27,8 +27,6 @@
 #ifndef TIMER_H__
 #define TIMER_H__
 
-extern const mp_obj_type_t machine_timer_type;
-
 void timer_init0(void);
 
 #endif // TIMER_H__
diff --git a/ports/renesas-ra/boards/ra_pin_prefix.c b/ports/renesas-ra/boards/ra_pin_prefix.c
index c9aa3d8882a5e..918c84e632413 100644
--- a/ports/renesas-ra/boards/ra_pin_prefix.c
+++ b/ports/renesas-ra/boards/ra_pin_prefix.c
@@ -4,6 +4,7 @@
 
 #include "py/obj.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "pin.h"
 
 #define PIN_AD(p_name, p_pin, ad_bit, ad_channel) \
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index 16bd589964983..a642b81176f75 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -32,7 +32,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #include "ra_i2c.h"
 
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
index 0e393b64e5543..70f98cd03a1ae 100644
--- a/ports/renesas-ra/machine_pin.c
+++ b/ports/renesas-ra/machine_pin.c
@@ -31,9 +31,10 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
+#include "extmod/virtpin.h"
 #include "shared/runtime/mpirq.h"
 #include "modmachine.h"
-#include "extmod/virtpin.h"
 
 #include "pin.h"
 #include "extint.h"
diff --git a/ports/renesas-ra/machine_rtc.c b/ports/renesas-ra/machine_rtc.c
index e699bea0bcc08..6637ea44ccbd3 100644
--- a/ports/renesas-ra/machine_rtc.c
+++ b/ports/renesas-ra/machine_rtc.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 
 #include "py/runtime.h"
+#include "extmod/modmachine.h"
 #include "shared/timeutils/timeutils.h"
 #include "extint.h"
 #include "rtc.h"
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index 6755ab73c23e5..977635f167d95 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -32,10 +32,10 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.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;
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index c4cb7cc9df043..761420423e2cf 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -41,6 +41,7 @@
 #include "lib/littlefs/lfs1_util.h"
 #include "lib/littlefs/lfs2.h"
 #include "lib/littlefs/lfs2_util.h"
+#include "extmod/modmachine.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index ddf212221da98..9bb3196b37ba0 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -29,15 +29,9 @@
 
 #include "py/obj.h"
 
-extern const mp_obj_type_t machine_timer_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_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_spi_type;
-extern const mp_obj_type_t machine_i2s_type;
-extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
 
 
diff --git a/ports/renesas-ra/modos.c b/ports/renesas-ra/modos.c
index 0884a0b2c0e23..8fd11007eaff0 100644
--- a/ports/renesas-ra/modos.c
+++ b/ports/renesas-ra/modos.c
@@ -26,6 +26,7 @@
  */
 
 #include "py/runtime.h"
+#include "extmod/modmachine.h"
 #include "uart.h"
 #include "rng.h"
 
diff --git a/ports/renesas-ra/mpbthciport.c b/ports/renesas-ra/mpbthciport.c
index 5092f8709a126..2e9f6d916698b 100644
--- a/ports/renesas-ra/mpbthciport.c
+++ b/ports/renesas-ra/mpbthciport.c
@@ -29,9 +29,9 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/modmachine.h"
 #include "extmod/mpbthci.h"
 #include "shared/runtime/softtimer.h"
-#include "modmachine.h"
 #include "mpbthciport.h"
 #include "uart.h"
 
diff --git a/ports/renesas-ra/pin.h b/ports/renesas-ra/pin.h
index 32aa96075478f..ac84b7f66b9e0 100644
--- a/ports/renesas-ra/pin.h
+++ b/ports/renesas-ra/pin.h
@@ -58,7 +58,6 @@ typedef struct {
     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
diff --git a/ports/renesas-ra/rtc.h b/ports/renesas-ra/rtc.h
index 793720341861e..5f7701185158a 100644
--- a/ports/renesas-ra/rtc.h
+++ b/ports/renesas-ra/rtc.h
@@ -28,7 +28,6 @@
 #define MICROPY_INCLUDED_RA_RTC_H
 
 #include "py/obj.h"
-extern const mp_obj_type_t machine_rtc_type;
 
 typedef struct
 {
diff --git a/ports/renesas-ra/uart.h b/ports/renesas-ra/uart.h
index 245be24d1a4d3..ee8eb321d552c 100644
--- a/ports/renesas-ra/uart.h
+++ b/ports/renesas-ra/uart.h
@@ -89,7 +89,6 @@ typedef struct _machine_uart_obj_t {
     mp_irq_obj_t *mp_irq_obj;           // user IRQ object
 } machine_uart_obj_t;
 
-extern const mp_obj_type_t machine_uart_type;
 extern const mp_irq_methods_t uart_irq_methods;
 
 void uart_init0(void);
diff --git a/ports/rp2/boards/rp2_prefix.c b/ports/rp2/boards/rp2_prefix.c
index 50f2852a8ac98..5e27364cc430b 100644
--- a/ports/rp2/boards/rp2_prefix.c
+++ b/ports/rp2/boards/rp2_prefix.c
@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include "py/obj.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "machine_pin.h"
 
 #define AF(af_idx, af_fn, af_unit)                      \
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index fc4c0723a50a8..467c4e7e630eb 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #include "hardware/i2c.h"
 
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 3470f38696198..77d9e13480007 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -29,10 +29,11 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
+#include "extmod/virtpin.h"
 #include "shared/runtime/mpirq.h"
 #include "modmachine.h"
 #include "machine_pin.h"
-#include "extmod/virtpin.h"
 
 #include "hardware/irq.h"
 #include "hardware/regs/intctrl.h"
diff --git a/ports/rp2/machine_pin.h b/ports/rp2/machine_pin.h
index aa5ea641b7293..d2a39f8e377d9 100644
--- a/ports/rp2/machine_pin.h
+++ b/ports/rp2/machine_pin.h
@@ -59,7 +59,6 @@ typedef struct _machine_pin_obj_t {
     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
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 25d65eda69898..eb2e1615b48f8 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -35,10 +35,10 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
+#include "extmod/modmachine.h"
 #include "shared/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;
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index b2b879c9a8ed1..3d7f2d6ab8b39 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_spi.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #include "hardware/spi.h"
 #include "hardware/dma.h"
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 4e4245ed38cc1..6ef7222791df2 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -3,12 +3,6 @@
 
 #include "py/obj.h"
 
-extern const mp_obj_type_t machine_i2c_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;
-extern const mp_obj_type_t machine_timer_type;
-
 void machine_pin_init(void);
 void machine_pin_deinit(void);
 void machine_i2s_init0(void);
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index 5606d7b62796b..afd5921d51ee3 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -32,7 +32,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
 #include "clock_config.h"
diff --git a/ports/samd/machine_rtc.c b/ports/samd/machine_rtc.c
index 57bfa998e583b..e6237f3f3609a 100644
--- a/ports/samd/machine_rtc.c
+++ b/ports/samd/machine_rtc.c
@@ -27,8 +27,8 @@
 
 #include "py/runtime.h"
 #include "shared/timeutils/timeutils.h"
-#include "modmachine.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "sam.h"
 
 #if MICROPY_PY_MACHINE_RTC
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index b00eb427169f4..9d9928bb0450a 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -31,7 +31,7 @@
 
 #include "py/mphal.h"
 #include "extmod/machine_spi.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
 #include "clock_config.h"
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 4f287bde35142..5baaf5f7e145c 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -32,17 +32,6 @@
 #if MICROPY_PY_MACHINE_DAC
 extern const mp_obj_type_t machine_dac_type;
 #endif
-#if MICROPY_PY_MACHINE_I2C
-extern const mp_obj_type_t machine_i2c_type;
-#endif
-extern const mp_obj_type_t machine_pin_type;
-#if MICROPY_PY_MACHINE_SPI
-extern const mp_obj_type_t machine_spi_type;
-#endif
-extern const mp_obj_type_t machine_timer_type;
-#if MICROPY_PY_MACHINE_RTC
-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);
 
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index 419b81477601c..6de9a74778729 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -31,9 +31,9 @@
 #include <stdint.h>
 #include "string.h"
 
-#include "modmachine.h"
 #include "py/runtime.h"
 #include "py/misc.h"
+#include "extmod/modmachine.h"
 #include "pin_af.h"
 #include "sam.h"
 
diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
index eaa0ec14348a8..833e3efa8d16f 100644
--- a/ports/samd/samd_spiflash.c
+++ b/ports/samd/samd_spiflash.c
@@ -31,8 +31,8 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "extmod/vfs.h"
-#include "modmachine.h"
 #include "pin_af.h"
 
 #if MICROPY_HW_SPIFLASH
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index f4b0b33125623..1876c9a1426e2 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -24,15 +24,12 @@
  * 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 "extmod/modmachine.h"
 #include "i2c.h"
-#include "modmachine.h"
 
 #if MICROPY_HW_ENABLE_HW_I2C
 
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index c6d60157315db..bc526635b4d3e 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "spi.h"
 
 /******************************************************************************/
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 882057c601312..096666eb5aad0 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -28,10 +28,6 @@
 
 #include "py/obj.h"
 
-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_timer_type;
-
 void machine_init(void);
 void machine_deinit(void);
 void machine_i2s_init0();
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 1f5996165ebe0..a2a337f1e69ec 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -29,6 +29,7 @@
 #include "py/mphal.h"
 #include "spi.h"
 #include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 
 // Possible DMA configurations for SPI buses:
 // SPI1_TX: DMA2_Stream3.CHANNEL_3 or DMA2_Stream5.CHANNEL_3
diff --git a/ports/stm32/spi.h b/ports/stm32/spi.h
index fe7f2f6614c3c..a8bc9d2cfdbe3 100644
--- a/ports/stm32/spi.h
+++ b/ports/stm32/spi.h
@@ -58,7 +58,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_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
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index c261ffad0d251..a4b48e996fd2a 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -37,7 +37,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_I2C
 
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index be0698651bbf6..d27b5900929f6 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -35,6 +35,7 @@
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "shared/runtime/mpirq.h"
 #include "modmachine.h"
 
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 507d839c66442..6475018b09bfc 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -36,7 +36,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_spi.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_SPI
 
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index 520b363965ab1..e3a69d8c1b77d 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -3,10 +3,6 @@
 
 #include "py/obj.h"
 
-extern const mp_obj_type_t machine_pin_type;
-extern const mp_obj_type_t machine_i2c_type;
-extern const mp_obj_type_t machine_spi_type;
-
 MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);
 
 typedef struct _machine_pin_obj_t {

From d336c1b79b38ac4024c2342e67640400e1f81532 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Oct 2023 12:06:19 +1100
Subject: [PATCH 0468/3129] extmod/modmachine: Consolidate simple machine
 headers into modmachine.h.

The contents of machine_bitstream.h, machine_pinbase.h, machine_pulse.h and
machine_signal.h have been moved into extmod/modmachine.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/dht/dht.c                      |  2 +-
 extmod/machine_bitstream.c             |  2 +-
 extmod/machine_bitstream.h             | 37 --------------------------
 extmod/machine_pinbase.c               |  3 +--
 extmod/machine_pinbase.h               | 33 -----------------------
 extmod/machine_pulse.c                 |  2 +-
 extmod/machine_pulse.h                 | 36 -------------------------
 extmod/machine_signal.c                |  3 +--
 extmod/machine_signal.h                | 33 -----------------------
 extmod/modmachine.h                    |  9 +++++++
 ports/esp32/modmachine.c               |  3 ---
 ports/esp8266/modmachine.c             |  3 ---
 ports/esp8266/modos.c                  |  1 -
 ports/mimxrt/modmachine.c              |  3 ---
 ports/nrf/modules/machine/modmachine.c |  1 -
 ports/qemu-arm/modmachine.c            |  3 +--
 ports/renesas-ra/modmachine.c          |  2 --
 ports/rp2/modmachine.c                 |  3 ---
 ports/samd/modmachine.c                |  3 ---
 ports/stm32/machine_bitstream.c        |  2 +-
 ports/stm32/modmachine.c               |  3 ---
 ports/unix/modmachine.c                |  4 +--
 ports/zephyr/modmachine.c              |  2 --
 23 files changed, 17 insertions(+), 176 deletions(-)
 delete mode 100644 extmod/machine_bitstream.h
 delete mode 100644 extmod/machine_pinbase.h
 delete mode 100644 extmod/machine_pulse.h
 delete mode 100644 extmod/machine_signal.h

diff --git a/drivers/dht/dht.c b/drivers/dht/dht.c
index 81754ac15f43f..73afdee581758 100644
--- a/drivers/dht/dht.c
+++ b/drivers/dht/dht.c
@@ -29,7 +29,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "extmod/machine_pulse.h"
+#include "extmod/modmachine.h"
 #include "drivers/dht/dht.h"
 
 // Allow the open-drain-high call to be DHT specific for ports that need it
diff --git a/extmod/machine_bitstream.c b/extmod/machine_bitstream.c
index 30f1ff1ea3da4..af093a4b5483d 100644
--- a/extmod/machine_bitstream.c
+++ b/extmod/machine_bitstream.c
@@ -27,7 +27,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/machine_bitstream.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_BITSTREAM
 
diff --git a/extmod/machine_bitstream.h b/extmod/machine_bitstream.h
deleted file mode 100644
index 2e759aedd5dc0..0000000000000
--- a/extmod/machine_bitstream.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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/extmod/machine_pinbase.c b/extmod/machine_pinbase.c
index 8607e6ed3de99..90c17d7ab6eb2 100644
--- a/extmod/machine_pinbase.c
+++ b/extmod/machine_pinbase.c
@@ -27,10 +27,9 @@
 #include "py/mpconfig.h"
 #if MICROPY_PY_MACHINE
 
-#include "py/obj.h"
 #include "py/runtime.h"
+#include "extmod/modmachine.h"
 #include "extmod/virtpin.h"
-#include "extmod/machine_pinbase.h"
 
 // PinBase class
 
diff --git a/extmod/machine_pinbase.h b/extmod/machine_pinbase.h
deleted file mode 100644
index c96abbc46c247..0000000000000
--- a/extmod/machine_pinbase.h
+++ /dev/null
@@ -1,33 +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.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_PINBASE_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_PINBASE_H
-
-#include "py/obj.h"
-
-extern const mp_obj_type_t machine_pinbase_type;
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_PINBASE_H
diff --git a/extmod/machine_pulse.c b/extmod/machine_pulse.c
index 7178b22d791ec..157566d9842fb 100644
--- a/extmod/machine_pulse.c
+++ b/extmod/machine_pulse.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mperrno.h"
-#include "extmod/machine_pulse.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_PULSE
 
diff --git a/extmod/machine_pulse.h b/extmod/machine_pulse.h
deleted file mode 100644
index e303dca02e8e5..0000000000000
--- a/extmod/machine_pulse.h
+++ /dev/null
@@ -1,36 +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.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_PULSE_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_PULSE_H
-
-#include "py/obj.h"
-#include "py/mphal.h"
-
-mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
-
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_PULSE_H
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index 7922ed70771e9..63fd0fe479a2b 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -29,10 +29,9 @@
 
 #include <string.h>
 
-#include "py/obj.h"
 #include "py/runtime.h"
+#include "extmod/modmachine.h"
 #include "extmod/virtpin.h"
-#include "extmod/machine_signal.h"
 
 // Signal class
 
diff --git a/extmod/machine_signal.h b/extmod/machine_signal.h
deleted file mode 100644
index df1c3e2e90f10..0000000000000
--- a/extmod/machine_signal.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 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.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_SIGNAL_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_SIGNAL_H
-
-#include "py/obj.h"
-
-extern const mp_obj_type_t machine_signal_type;
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_SIGNAL_H
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 2a7ce336e9ab2..4ef2bb3adb1a4 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -27,6 +27,7 @@
 #ifndef MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
 #define MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
 
+#include "py/mphal.h"
 #include "py/obj.h"
 
 // Whether to enable the ADC.init() method.
@@ -97,11 +98,19 @@ 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_pin_type;
+extern const mp_obj_type_t machine_pinbase_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_signal_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_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len);
+mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
+
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bitstream_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
+
 #endif // MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 96df32d43593e..bed29f7c0475a 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -40,10 +40,7 @@
 #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"
-#include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index d7e8ed0333dca..a28c7c87fe3a1 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -36,10 +36,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"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
diff --git a/ports/esp8266/modos.c b/ports/esp8266/modos.c
index 0194bf25f0890..0ddcba2a32a3e 100644
--- a/ports/esp8266/modos.c
+++ b/ports/esp8266/modos.c
@@ -35,7 +35,6 @@
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
 #include "genhdr/mpversion.h"
-#include "esp_mphal.h"
 #include "user_interface.h"
 
 STATIC const char *mp_os_uname_release(void) {
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index ab7f1de4857fa..c7d507074f053 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -27,11 +27,8 @@
 
 #include "py/runtime.h"
 #include "drivers/dht/dht.h"
-#include "extmod/machine_bitstream.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 "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 4d39a29b03617..df2662c62c735 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/machine_mem.h"
-#include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 0d712f792eabe..026ab8974db72 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -25,8 +25,7 @@
  */
 
 #include "extmod/machine_mem.h"
-#include "extmod/machine_pinbase.h"
-#include "extmod/machine_signal.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE
 
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 62c9a392c0b0f..8dbace21dafb9 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -36,8 +36,6 @@
 #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 "extmod/modmachine.h"
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 94d87cf314346..a111da0f00671 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -28,11 +28,8 @@
 #include "py/mphal.h"
 #include "drivers/dht/dht.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"
-#include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 97718401a30f5..4060ea51535f5 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -25,11 +25,8 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_bitstream.h"
 #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 "extmod/modmachine.h"
 #include "drivers/dht/dht.h"
diff --git a/ports/stm32/machine_bitstream.c b/ports/stm32/machine_bitstream.c
index 3e1a7d6f1b929..ed5cf1802eca9 100644
--- a/ports/stm32/machine_bitstream.c
+++ b/ports/stm32/machine_bitstream.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/machine_bitstream.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_BITSTREAM
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 3bbac66879fc7..98456dc6cbfc3 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -32,10 +32,7 @@
 #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"
-#include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index dd3cbf96c04c7..2c1e0bed60d7c 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -32,9 +32,7 @@
 #include "py/obj.h"
 
 #include "extmod/machine_mem.h"
-#include "extmod/machine_pinbase.h"
-#include "extmod/machine_signal.h"
-#include "extmod/machine_pulse.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PLAT_DEV_MEM
 #include <errno.h>
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 14ddf027ad6cd..8498db1f0389b 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -33,8 +33,6 @@
 #include "py/obj.h"
 #include "py/runtime.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 "extmod/modmachine.h"

From 6989aba93b917fd30ea81b2660d6518c84108db2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Oct 2023 17:37:39 +1100
Subject: [PATCH 0469/3129] nrf/modules/machine: Use SPI Python bindings
 provided by extmod.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/modules/machine/spi.c | 152 +++++++-------------------------
 ports/nrf/mpconfigport.h        |   5 +-
 2 files changed, 34 insertions(+), 123 deletions(-)

diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 46f2eba292fa0..663e71c072ae7 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -188,13 +188,14 @@ enum {
     ARG_INIT_firstbit
 };
 
-STATIC mp_obj_t machine_hard_spi_make_new(mp_arg_val_t *args);
-STATIC void machine_hard_spi_init(mp_obj_t self, mp_arg_val_t *args);
-STATIC void machine_hard_spi_deinit(mp_obj_t self);
+STATIC void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_arg_val_t *args);
 
-/* common code for both soft and hard implementations *************************/
+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(%u)", self->p_spi->drv_inst_idx);
+}
 
-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 *all_args) {
+STATIC 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) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 1000000} },
@@ -211,71 +212,6 @@ STATIC mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, s
     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_NEW_id].u_obj == MP_OBJ_NEW_SMALL_INT(-1)) {
-        // TODO: implement soft SPI
-        // return machine_soft_spi_make_new(args);
-        return mp_const_none;
-    } else {
-        // hardware peripheral id given
-        return machine_hard_spi_make_new(args);
-    }
-}
-
-STATIC mp_obj_t machine_spi_init(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_KW_ONLY | MP_ARG_INT, {.u_int = 1000000} },
-        { 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} },
-        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
-        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-    };
-
-    // parse args
-    mp_obj_t self = 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);
-
-    // dispatch to specific implementation
-    if (mp_obj_get_type(self) == &machine_spi_type) {
-        machine_hard_spi_init(self, args);
-    }
-
-    return mp_const_none;
-}
-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_spi_type) {
-        machine_hard_spi_deinit(self);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_spi_deinit_obj, machine_spi_deinit);
-
-STATIC const mp_rom_map_elem_t machine_spi_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_spi_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_spi_deinit_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_machine_spi_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_machine_spi_readinto_obj) },
-    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_machine_spi_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_write_readinto), MP_ROM_PTR(&mp_machine_spi_write_readinto_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_MSB), MP_ROM_INT(NRF_SPI_BIT_ORDER_MSB_FIRST) },
-    { MP_ROM_QSTR(MP_QSTR_LSB), MP_ROM_INT(NRF_SPI_BIT_ORDER_LSB_FIRST) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(machine_spi_locals_dict, machine_spi_locals_dict_table);
-
-/* code for hard implementation ***********************************************/
-
-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(%u)", self->p_spi->drv_inst_idx);
-}
-
-STATIC mp_obj_t machine_hard_spi_make_new(mp_arg_val_t *args) {
     // get static peripheral object
     int spi_id = spi_find(args[ARG_NEW_id].u_obj);
     const machine_hard_spi_obj_t *self = &machine_hard_spi_obj[spi_id];
@@ -303,16 +239,12 @@ STATIC mp_obj_t machine_hard_spi_make_new(mp_arg_val_t *args) {
     self->p_config->irq_priority = 6;
 #endif
 
-    mp_obj_t self_obj = MP_OBJ_FROM_PTR(self);
-    machine_hard_spi_init(self_obj, &args[1]); // Skip instance id param.
+    machine_hard_spi_init_helper(self, &args[1]); // Skip instance id param.
 
-    return self_obj;
+    return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void machine_hard_spi_init(mp_obj_t self_in, mp_arg_val_t *args) {
-
-    const machine_hard_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
+STATIC void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_arg_val_t *args) {
     int baudrate = args[ARG_INIT_baudrate].u_int;
 
     if (baudrate <= 125000) {
@@ -373,7 +305,24 @@ STATIC void machine_hard_spi_init(mp_obj_t self_in, mp_arg_val_t *args) {
     }
 }
 
-STATIC void machine_hard_spi_deinit(mp_obj_t self_in) {
+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) {
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000000} },
+        { 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} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    };
+
+    // parse args
+    machine_hard_spi_obj_t *self = (machine_hard_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);
+
+    machine_hard_spi_init_helper(self, args);
+}
+
+STATIC void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
     const machine_hard_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     nrfx_spi_uninit(self->p_spi);
 }
@@ -383,48 +332,9 @@ STATIC void machine_hard_spi_transfer(mp_obj_base_t *self_in, size_t len, const
     spi_transfer(self, len, src, dest);
 }
 
-
-STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *args) {
-    vstr_t vstr;
-    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_bytes_from_vstr(&vstr);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj, 2, 3, mp_machine_spi_read);
-
-STATIC mp_obj_t mp_machine_spi_readinto(size_t n_args, const mp_obj_t *args) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
-    memset(bufinfo.buf, n_args == 3 ? mp_obj_get_int(args[2]) : 0, bufinfo.len);
-    spi_transfer(args[0], bufinfo.len, bufinfo.buf, bufinfo.buf);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj, 2, 3, mp_machine_spi_readinto);
-
-STATIC mp_obj_t mp_machine_spi_write(mp_obj_t self, mp_obj_t wr_buf) {
-    mp_buffer_info_t src;
-    mp_get_buffer_raise(wr_buf, &src, MP_BUFFER_READ);
-    spi_transfer(self, src.len, (const uint8_t*)src.buf, NULL);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj, mp_machine_spi_write);
-
-STATIC mp_obj_t mp_machine_spi_write_readinto(mp_obj_t self, mp_obj_t wr_buf, mp_obj_t rd_buf) {
-    mp_buffer_info_t src;
-    mp_get_buffer_raise(wr_buf, &src, MP_BUFFER_READ);
-    mp_buffer_info_t dest;
-    mp_get_buffer_raise(rd_buf, &dest, MP_BUFFER_WRITE);
-    if (src.len != dest.len) {
-        mp_raise_ValueError(MP_ERROR_TEXT("buffers must be the same length"));
-    }
-    spi_transfer(self, src.len, src.buf, dest.buf);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj, mp_machine_spi_write_readinto);
-
-
 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,
 };
 
@@ -432,10 +342,10 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    make_new, machine_spi_make_new,
+    make_new, machine_hard_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
-    locals_dict, &machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_HW_SPI
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 929065b49a302..61e2421038241 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -161,8 +161,6 @@
 #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)
 
 #ifndef MICROPY_HW_LED_COUNT
 #define MICROPY_HW_LED_COUNT        (0)
@@ -189,6 +187,9 @@
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #endif
 
+#define MICROPY_PY_MACHINE_SPI      (MICROPY_PY_MACHINE_HW_SPI)
+#define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0)
+
 #ifndef MICROPY_PY_MACHINE_HW_PWM
 #define MICROPY_PY_MACHINE_HW_PWM   (0)
 #endif

From 3e2706a18dd4071d2d3040549786e659fc3b46b7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Oct 2023 15:20:03 +1100
Subject: [PATCH 0470/3129] extmod/modmachine: Consolidate mem, i2c and spi
 headers to modmachine.h.

The contents of machine_mem.h, machine_i2c.h and machine_spi.h have been
moved into extmod/modmachine.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/esp-hosted/esp_hosted_hal.c    |   1 -
 drivers/ninaw10/nina_wifi_bsp.c        |   1 -
 extmod/machine_i2c.c                   |   2 +-
 extmod/machine_i2c.h                   |  90 ----------------
 extmod/machine_mem.c                   |   2 +-
 extmod/machine_mem.h                   |  49 ---------
 extmod/machine_spi.c                   |   2 +-
 extmod/machine_spi.h                   |  69 ------------
 extmod/modmachine.h                    | 139 +++++++++++++++++++++++++
 extmod/network_wiznet5k.c              |   2 +-
 ports/cc3200/mpconfigport.h            |   1 +
 ports/esp32/machine_hw_spi.c           |   1 -
 ports/esp32/machine_i2c.c              |   1 -
 ports/esp32/modmachine.c               |   3 -
 ports/esp8266/machine_hspi.c           |   2 +-
 ports/esp8266/modmachine.c             |   3 -
 ports/mimxrt/machine_i2c.c             |   1 -
 ports/mimxrt/machine_spi.c             |   1 -
 ports/mimxrt/modmachine.c              |   3 -
 ports/nrf/modules/machine/i2c.c        |   1 -
 ports/nrf/modules/machine/i2c.h        |   2 +-
 ports/nrf/modules/machine/modmachine.c |   2 -
 ports/nrf/modules/machine/spi.c        |   1 -
 ports/qemu-arm/modmachine.c            |   1 -
 ports/renesas-ra/machine_i2c.c         |   1 -
 ports/renesas-ra/machine_spi.c         |   1 -
 ports/renesas-ra/modmachine.c          |   3 -
 ports/rp2/machine_i2c.c                |   1 -
 ports/rp2/machine_spi.c                |   1 -
 ports/rp2/modmachine.c                 |   3 -
 ports/samd/machine_i2c.c               |   1 -
 ports/samd/machine_spi.c               |   1 -
 ports/samd/modmachine.c                |   3 -
 ports/samd/samd_qspiflash.c            |   2 +-
 ports/samd/samd_spiflash.c             |   1 -
 ports/stm32/machine_i2c.c              |   1 -
 ports/stm32/machine_spi.c              |   1 -
 ports/stm32/modmachine.c               |   3 -
 ports/stm32/modstm.c                   |   2 +-
 ports/stm32/pyb_spi.c                  |   2 +-
 ports/stm32/spi.c                      |   1 -
 ports/unix/modmachine.c                |   1 -
 ports/zephyr/machine_i2c.c             |   1 -
 ports/zephyr/machine_spi.c             |   1 -
 ports/zephyr/modmachine.c              |   3 -
 45 files changed, 149 insertions(+), 265 deletions(-)
 delete mode 100644 extmod/machine_i2c.h
 delete mode 100644 extmod/machine_mem.h
 delete mode 100644 extmod/machine_spi.h

diff --git a/drivers/esp-hosted/esp_hosted_hal.c b/drivers/esp-hosted/esp_hosted_hal.c
index e33b2cce475db..bac8a89bd0941 100644
--- a/drivers/esp-hosted/esp_hosted_hal.c
+++ b/drivers/esp-hosted/esp_hosted_hal.c
@@ -34,7 +34,6 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #ifdef MICROPY_HW_WIFI_LED
 #include "led.h"
diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index 42770a33cc9c4..dc71c8260c61f 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -35,7 +35,6 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "nina_bsp.h"
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 3563b3243c36f..44e6921309e53 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -31,7 +31,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
-#include "extmod/machine_i2c.h"
+#include "extmod/modmachine.h"
 
 #define SOFT_I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
 
diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
deleted file mode 100644
index 600145bfedf4e..0000000000000
--- a/extmod/machine_i2c.h
+++ /dev/null
@@ -1,90 +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.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H
-
-#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_OBJ_TYPE_GET_SLOT(&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)
-
-#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;
-} mp_machine_i2c_buf_t;
-
-// I2C protocol
-// - 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 {
-    #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);
-    int (*read)(mp_obj_base_t *obj, uint8_t *dest, size_t len, bool nack);
-    int (*write)(mp_obj_base_t *obj, const uint8_t *src, size_t len);
-    int (*transfer)(mp_obj_base_t *obj, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
-    int (*transfer_single)(mp_obj_base_t *obj, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags);
-} mp_machine_i2c_p_t;
-
-typedef struct _mp_machine_soft_i2c_obj_t {
-    mp_obj_base_t base;
-    uint32_t us_delay;
-    uint32_t us_timeout;
-    mp_hal_pin_obj_t scl;
-    mp_hal_pin_obj_t sda;
-} 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_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);
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H
diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index f27356e028365..217c7ca0882b3 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_mem.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE
 
diff --git a/extmod/machine_mem.h b/extmod/machine_mem.h
deleted file mode 100644
index a48a52c820883..0000000000000
--- a/extmod/machine_mem.h
+++ /dev/null
@@ -1,49 +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.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H
-
-#include "py/obj.h"
-
-typedef struct _machine_mem_obj_t {
-    mp_obj_base_t base;
-    unsigned elem_size; // in bytes
-} machine_mem_obj_t;
-
-extern const mp_obj_type_t machine_mem_type;
-
-extern const machine_mem_obj_t machine_mem8_obj;
-extern const machine_mem_obj_t machine_mem16_obj;
-extern const machine_mem_obj_t machine_mem32_obj;
-
-#if defined(MICROPY_MACHINE_MEM_GET_READ_ADDR)
-uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
-#endif
-#if defined(MICROPY_MACHINE_MEM_GET_WRITE_ADDR)
-uintptr_t MICROPY_MACHINE_MEM_GET_WRITE_ADDR(mp_obj_t addr_o, uint align);
-#endif
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index 8c4d91a3cf632..e35e8b7fcc1ea 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -31,7 +31,7 @@
 
 #if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
 
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 
 // if a port didn't define MSB/LSB constants then provide them
 #ifndef MICROPY_PY_MACHINE_SPI_MSB
diff --git a/extmod/machine_spi.h b/extmod/machine_spi.h
deleted file mode 100644
index 93ee8d00ca32b..0000000000000
--- a/extmod/machine_spi.h
+++ /dev/null
@@ -1,69 +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.
- */
-#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H
-#define MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H
-
-#include "py/obj.h"
-#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_OBJ_TYPE_GET_SLOT(&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);
-    void (*deinit)(mp_obj_base_t *obj); // can be NULL
-    void (*transfer)(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest);
-} mp_machine_spi_p_t;
-
-typedef struct _mp_machine_soft_spi_obj_t {
-    mp_obj_base_t base;
-    mp_soft_spi_obj_t spi;
-} mp_machine_soft_spi_obj_t;
-
-extern const mp_machine_spi_p_t mp_machine_soft_spi_p;
-extern const mp_obj_type_t mp_machine_soft_spi_type;
-extern const mp_obj_dict_t mp_machine_spi_locals_dict;
-
-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);
-
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj);
-MP_DECLARE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj);
-
-#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 4ef2bb3adb1a4..6cace4f85187f 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -30,6 +30,10 @@
 #include "py/mphal.h"
 #include "py/obj.h"
 
+#if MICROPY_PY_MACHINE
+
+#include "drivers/bus/spi.h"
+
 // Whether to enable the ADC.init() method.
 // Requires a port to implement mp_machine_adc_init_helper().
 #ifndef MICROPY_PY_MACHINE_ADC_INIT
@@ -84,6 +88,44 @@
 #define MICROPY_PY_MACHINE_UART_IRQ (0)
 #endif
 
+// 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_OBJ_TYPE_GET_SLOT(&mp_machine_soft_i2c_type, make_new)(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
+        } \
+    } while (0)
+
+// 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_OBJ_TYPE_GET_SLOT(&mp_machine_soft_spi_type, make_new)(&mp_machine_soft_spi_type, n_args, n_kw, all_args); \
+        } \
+    } while (0)
+
+#if MICROPY_PY_MACHINE_I2C
+
+#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
+
+#endif
+
 // A port must provide these types, but they are otherwise opaque.
 typedef struct _machine_adc_obj_t machine_adc_obj_t;
 typedef struct _machine_i2s_obj_t machine_i2s_obj_t;
@@ -91,12 +133,76 @@ typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
 typedef struct _machine_uart_obj_t machine_uart_obj_t;
 typedef struct _machine_wdt_obj_t machine_wdt_obj_t;
 
+typedef struct _machine_mem_obj_t {
+    mp_obj_base_t base;
+    unsigned elem_size; // in bytes
+} machine_mem_obj_t;
+
+#if MICROPY_PY_MACHINE_I2C
+
+typedef struct _mp_machine_i2c_buf_t {
+    size_t len;
+    uint8_t *buf;
+} mp_machine_i2c_buf_t;
+
+// I2C protocol:
+// - 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 {
+    #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);
+    int (*read)(mp_obj_base_t *obj, uint8_t *dest, size_t len, bool nack);
+    int (*write)(mp_obj_base_t *obj, const uint8_t *src, size_t len);
+    int (*transfer)(mp_obj_base_t *obj, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
+    int (*transfer_single)(mp_obj_base_t *obj, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags);
+} mp_machine_i2c_p_t;
+
+// SoftI2C object.
+typedef struct _mp_machine_soft_i2c_obj_t {
+    mp_obj_base_t base;
+    uint32_t us_delay;
+    uint32_t us_timeout;
+    mp_hal_pin_obj_t scl;
+    mp_hal_pin_obj_t sda;
+} mp_machine_soft_i2c_obj_t;
+
+#endif
+
+#if MICROPY_PY_MACHINE_SPI
+
+// 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);
+    void (*deinit)(mp_obj_base_t *obj); // can be NULL
+    void (*transfer)(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest);
+} mp_machine_spi_p_t;
+
+// SoftSPI object.
+typedef struct _mp_machine_soft_spi_obj_t {
+    mp_obj_base_t base;
+    mp_soft_spi_obj_t spi;
+} mp_machine_soft_spi_obj_t;
+
+#endif
+
+// Objects for machine.mem8, machine.mem16 and machine.mem32.
+extern const machine_mem_obj_t machine_mem8_obj;
+extern const machine_mem_obj_t machine_mem16_obj;
+extern const machine_mem_obj_t machine_mem32_obj;
+
 // These classes correspond to machine.Type entries in the machine module.
 // Their Python bindings are implemented in extmod, and their implementation
 // is provided by a port.
 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_mem_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pinbase_type;
 extern const mp_obj_type_t machine_pwm_type;
@@ -107,10 +213,43 @@ 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_I2C
+extern const mp_obj_type_t mp_machine_soft_i2c_type;
+extern const mp_obj_dict_t mp_machine_i2c_locals_dict;
+#endif
+
+#if MICROPY_PY_MACHINE_SPI
+extern const mp_obj_type_t mp_machine_soft_spi_type;
+extern const mp_obj_dict_t mp_machine_spi_locals_dict;
+extern const mp_machine_spi_p_t mp_machine_soft_spi_p;
+#endif
+
+#if defined(MICROPY_MACHINE_MEM_GET_READ_ADDR)
+uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
+#endif
+#if defined(MICROPY_MACHINE_MEM_GET_WRITE_ADDR)
+uintptr_t MICROPY_MACHINE_MEM_GET_WRITE_ADDR(mp_obj_t addr_o, uint align);
+#endif
+
 void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len);
 mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bitstream_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
 
+#if MICROPY_PY_MACHINE_I2C
+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);
+#endif
+
+#if MICROPY_PY_MACHINE_SPI
+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);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj);
+MP_DECLARE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj);
+#endif
+
+#endif // MICROPY_PY_MACHINE
+
 #endif // MICROPY_INCLUDED_EXTMOD_MODMACHINE_H
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index eed656ee2419d..d49ee8614e710 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -38,7 +38,7 @@
 
 #include "shared/netutils/netutils.h"
 #include "extmod/modnetwork.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "extmod/virtpin.h"
 #include "modmachine.h"
 #include "drivers/bus/spi.h"
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 6b2dc7ca0969e..c19288fe89037 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -120,6 +120,7 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS                (1)
 #define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
+#define MICROPY_PY_MACHINE                          (1)
 #define MICROPY_PY_MACHINE_WDT                      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE          "ports/cc3200/mods/machine_wdt.c"
 
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 3a1dd1064c6ec..399cb902e8cc6 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "driver/spi_master.h"
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 4e3a9ee816d33..50d5681514ae7 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #include "driver/i2c.h"
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index bed29f7c0475a..be5348f0e604f 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -40,9 +40,6 @@
 #include "py/runtime.h"
 #include "shared/runtime/pyexec.h"
 #include "drivers/dht/dht.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index 2edb294adeff6..1a7de7f49bc17 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "modmachine.h"
 #include "hspi.h"
 
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index a28c7c87fe3a1..78d5bde26da8f 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -36,9 +36,6 @@
 // This needs to be set before we include the RTOS headers
 #define USE_US_TIMER 1
 
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "modmachine.h"
 
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index 379001acdd014..cef17272c4a22 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include CLOCK_CONFIG_H
 #include "pin.h"
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 879687bd112ee..35deaa7ae6ae9 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -28,7 +28,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include CLOCK_CONFIG_H
 
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index c7d507074f053..aa12f44d4786c 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -27,9 +27,6 @@
 
 #include "py/runtime.h"
 #include "drivers/dht/dht.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "led.h"
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 8bb9613df86e3..6d2b83a454380 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -34,7 +34,6 @@
 
 #if MICROPY_PY_MACHINE_I2C
 
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "i2c.h"
 #if NRFX_TWI_ENABLED
diff --git a/ports/nrf/modules/machine/i2c.h b/ports/nrf/modules/machine/i2c.h
index 3c4fde983a62a..9c69e3f4f9982 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__
 
-#include "extmod/machine_i2c.h"
+#include "extmod/modmachine.h"
 
 void i2c_init0(void);
 
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index df2662c62c735..9043b7a4410e0 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -30,8 +30,6 @@
 #include "py/gc.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 663e71c072ae7..d0234244afaf2 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -35,7 +35,6 @@
 
 #include "py/nlr.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "pin.h"
 #include "genhdr/pins.h"
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 026ab8974db72..8a22fe2bd8185 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "extmod/machine_mem.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index a642b81176f75..0e2d62f8a40c4 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #include "ra_i2c.h"
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index 977635f167d95..04505178dab57 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "pin.h"
 #include "spi.h"
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 8dbace21dafb9..c8edf61268e7d 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -35,9 +35,6 @@
 #include "py/objstr.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 467c4e7e630eb..570f05aaaf0d9 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #include "hardware/i2c.h"
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 3d7f2d6ab8b39..a3b82a0bc4634 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "hardware/spi.h"
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index a111da0f00671..29a8dbed2c8f6 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -28,9 +28,6 @@
 #include "py/mphal.h"
 #include "drivers/dht/dht.h"
 #include "shared/runtime/pyexec.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #include "modmachine.h"
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index afd5921d51ee3..ea5178dc061f9 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -31,7 +31,6 @@
 
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 9d9928bb0450a..3d5729c1f4264 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -30,7 +30,6 @@
 #if MICROPY_PY_MACHINE_SPI
 
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 4060ea51535f5..7c3d96eb01364 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -25,9 +25,6 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "drivers/dht/dht.h"
 #include "shared/runtime/pyexec.h"
diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
index 9bb79de5c5a28..054bfd231e041 100644
--- a/ports/samd/samd_qspiflash.c
+++ b/ports/samd/samd_qspiflash.c
@@ -35,7 +35,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "modmachine.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "extmod/vfs.h"
 #include "pin_af.h"
 #include "clock_config.h"
diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
index 833e3efa8d16f..f17d3c45ca524 100644
--- a/ports/samd/samd_spiflash.c
+++ b/ports/samd/samd_spiflash.c
@@ -30,7 +30,6 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "extmod/vfs.h"
 #include "pin_af.h"
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 1876c9a1426e2..8beefcad6d2f1 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -27,7 +27,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 #include "i2c.h"
 
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index bc526635b4d3e..b916252da35ef 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -25,7 +25,6 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "spi.h"
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 98456dc6cbfc3..83327bede0720 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -32,9 +32,6 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "drivers/dht/dht.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 251360594a657..896465d0cc927 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -29,7 +29,7 @@
 
 #include "py/obj.h"
 #include "py/objint.h"
-#include "extmod/machine_mem.h"
+#include "extmod/modmachine.h"
 #include "rfcore.h"
 #include "portmodules.h"
 #include "subghz.h"
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index a612f69505459..f36c048747f9d 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/machine_spi.h"
+#include "extmod/modmachine.h"
 #include "bufhelper.h"
 #include "spi.h"
 
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index a2a337f1e69ec..7b89b48b53e9e 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -28,7 +28,6 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "spi.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 // Possible DMA configurations for SPI buses:
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 2c1e0bed60d7c..d0c6a43bf86c1 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -31,7 +31,6 @@
 #include "py/runtime.h"
 #include "py/obj.h"
 
-#include "extmod/machine_mem.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PLAT_DEV_MEM
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index a4b48e996fd2a..36d88204f4a5b 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -36,7 +36,6 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_i2c.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_I2C
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 6475018b09bfc..5c882a6ae3c0e 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -35,7 +35,6 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 
 #if MICROPY_PY_MACHINE_SPI
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 8498db1f0389b..24e004b40cb94 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -32,9 +32,6 @@
 
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "extmod/machine_mem.h"
-#include "extmod/machine_i2c.h"
-#include "extmod/machine_spi.h"
 #include "extmod/modmachine.h"
 #include "modmachine.h"
 

From 3bf70f16e964370475114ff9658f58870ffaf768 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 10 Oct 2023 16:50:28 +1100
Subject: [PATCH 0471/3129] py/mkrules.mk: Add MICROPY_PREVIEW_VERSION_2.

This provides a way to enable features and changes slated for MicroPython
2.x, by running `make MICROPY_PREVIEW_VERSION_2=1`. Also supported for
the cmake ports (except Zephyr).

This is an alternative to having a 2.x development branch (or equivalently,
keeping a 1.x release branch). Any feature or change that needs to be
"hidden" until 2.x can use this flag (either in the Makefile or the
preprocessor).

A good example is changing function arguments or other public API features,
in particular to aid in improving consistency between ports.

When `MICROPY_PREVIEW_VERSION_2` is enabled, the REPL banner is amended to
say "MicroPython (with v2.0 preview) vX.Y.Z", and sys.implementation gets a
new field `_v2` set to `True`.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/ports_unix.yml | 12 ++++++++++
 ports/esp32/Makefile             |  4 ++++
 ports/rp2/Makefile               |  4 ++++
 py/mkrules.cmake                 | 10 ++++++++
 py/mkrules.mk                    |  7 ++++++
 py/modsys.c                      | 40 +++++++++++++++++++++++---------
 py/mpconfig.h                    | 10 ++++++++
 tools/ci.sh                      |  9 +++++++
 8 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 04dfd78525260..25dd52f31d29e 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -55,6 +55,18 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
+  standard_v2:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: source tools/ci.sh && ci_unix_standard_v2_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_standard_v2_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
   coverage:
     runs-on: ubuntu-latest
     steps:
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index bf275ffe661a5..ce574ce799ad7 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -52,6 +52,10 @@ ifdef BOARD_VARIANT
 	IDFPY_FLAGS += -D MICROPY_BOARD_VARIANT=$(BOARD_VARIANT)
 endif
 
+ifdef MICROPY_PREVIEW_VERSION_2
+	IDFPY_FLAGS += -D MICROPY_PREVIEW_VERSION_2=1
+endif
+
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 define RUN_IDF_PY
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 8399b9e98afba..11d2115a2fd21 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -48,6 +48,10 @@ ifdef BOARD_VARIANT
 CMAKE_ARGS += -DMICROPY_BOARD_VARIANT=$(BOARD_VARIANT)
 endif
 
+ifdef MICROPY_PREVIEW_VERSION_2
+CMAKE_ARGS += -DMICROPY_PREVIEW_VERSION_2=1
+endif
+
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 all:
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 02e3148f2be5f..6415b549aa8b5 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -15,6 +15,10 @@ 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")
 
+if(NOT MICROPY_PREVIEW_VERSION_2)
+    set(MICROPY_PREVIEW_VERSION_2 0)
+endif()
+
 # 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)
@@ -24,6 +28,12 @@ if(MICROPY_FROZEN_MANIFEST)
     )
 endif()
 
+if(MICROPY_PREVIEW_VERSION_2)
+    target_compile_definitions(${MICROPY_TARGET} PUBLIC
+        MICROPY_PREVIEW_VERSION_2=\(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)
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 421e638c22b3c..8b21c7974dce9 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -4,6 +4,13 @@ THIS_MAKEFILE = $(lastword $(MAKEFILE_LIST))
 include $(dir $(THIS_MAKEFILE))mkenv.mk
 endif
 
+# Enable in-progress/breaking changes that are slated for MicroPython 2.x.
+MICROPY_PREVIEW_VERSION_2 ?= 0
+
+ifeq ($(MICROPY_PREVIEW_VERSION_2),1)
+CFLAGS += -DMICROPY_PREVIEW_VERSION_2=1
+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'"
 
diff --git a/py/modsys.c b/py/modsys.c
index e40542467b32c..12fa1101b94fc 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -79,19 +79,26 @@ STATIC const mp_rom_obj_tuple_t mp_sys_implementation_version_info_obj = {
     }
 };
 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 \
+#define SYS_IMPLEMENTATION_ELEMS_BASE \
     MP_ROM_QSTR(MP_QSTR_micropython), \
     MP_ROM_PTR(&mp_sys_implementation_version_info_obj), \
     MP_ROM_PTR(&mp_sys_implementation_machine_obj)
+
+#if MICROPY_PERSISTENT_CODE_LOAD
+#define SYS_IMPLEMENTATION_ELEMS__MPY \
+    , MP_ROM_INT(MPY_FILE_HEADER_INT)
+#else
+#define SYS_IMPLEMENTATION_ELEMS__MPY
 #endif
+
 #if MICROPY_PY_ATTRTUPLE
+#if MICROPY_PREVIEW_VERSION_2
+#define SYS_IMPLEMENTATION_ELEMS__V2 \
+    , MP_ROM_TRUE
+#else
+#define SYS_IMPLEMENTATION_ELEMS__V2
+#endif
+
 STATIC const qstr impl_fields[] = {
     MP_QSTR_name,
     MP_QSTR_version,
@@ -99,19 +106,30 @@ STATIC const qstr impl_fields[] = {
     #if MICROPY_PERSISTENT_CODE_LOAD
     MP_QSTR__mpy,
     #endif
+    #if MICROPY_PREVIEW_VERSION_2
+    MP_QSTR__v2,
+    #endif
 };
 STATIC MP_DEFINE_ATTRTUPLE(
     mp_sys_implementation_obj,
     impl_fields,
-    3 + MICROPY_PERSISTENT_CODE_LOAD,
-    SYS_IMPLEMENTATION_ELEMS
+    3 + MICROPY_PERSISTENT_CODE_LOAD + MICROPY_PREVIEW_VERSION_2,
+    SYS_IMPLEMENTATION_ELEMS_BASE
+    SYS_IMPLEMENTATION_ELEMS__MPY
+    SYS_IMPLEMENTATION_ELEMS__V2
     );
 #else
 STATIC const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
     {&mp_type_tuple},
     3 + MICROPY_PERSISTENT_CODE_LOAD,
+    // Do not include SYS_IMPLEMENTATION_ELEMS__V2 because
+    // SYS_IMPLEMENTATION_ELEMS__MPY may be empty if
+    // MICROPY_PERSISTENT_CODE_LOAD is disabled, which means they'll share
+    // the same index. Cannot query _v2 if MICROPY_PY_ATTRTUPLE is
+    // disabled.
     {
-        SYS_IMPLEMENTATION_ELEMS
+        SYS_IMPLEMENTATION_ELEMS_BASE
+                                SYS_IMPLEMENTATION_ELEMS__MPY
     }
 };
 #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a36f9658fbddf..6995600abeb7e 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -53,6 +53,12 @@
 #define MICROPY_VERSION_STRING MICROPY_VERSION_STRING_BASE
 #endif
 
+// If this is enabled, then in-progress/breaking changes slated for the 2.x
+// release will be enabled.
+#ifndef MICROPY_PREVIEW_VERSION_2
+#define MICROPY_PREVIEW_VERSION_2 (0)
+#endif
+
 // This file contains default configuration settings for MicroPython.
 // You can override any of the options below using mpconfigport.h file
 // located in a directory of your port.
@@ -1828,8 +1834,12 @@ typedef double mp_float_t;
 
 // String used for the banner, and sys.version additional information
 #ifndef MICROPY_BANNER_NAME_AND_VERSION
+#if MICROPY_PREVIEW_VERSION_2
+#define MICROPY_BANNER_NAME_AND_VERSION "MicroPython (with v2.0 preview) " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
+#else
 #define MICROPY_BANNER_NAME_AND_VERSION "MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
 #endif
+#endif
 
 // String used for the second part of the banner, and sys.implementation._machine
 #ifndef MICROPY_BANNER_MACHINE
diff --git a/tools/ci.sh b/tools/ci.sh
index 975ce86172e02..a4cbb045a4577 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -462,6 +462,15 @@ function ci_unix_standard_run_tests {
     ci_unix_run_tests_full_helper standard
 }
 
+function ci_unix_standard_v2_build {
+    ci_unix_build_helper VARIANT=standard MICROPY_PREVIEW_VERSION_2=1
+    ci_unix_build_ffi_lib_helper gcc
+}
+
+function ci_unix_standard_v2_run_tests {
+    ci_unix_run_tests_full_helper standard
+}
+
 function ci_unix_coverage_setup {
     sudo pip3 install setuptools
     sudo pip3 install pyelftools

From 6cd99910cdb1e7a51cf41ed97e7fda077063df8c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Oct 2023 13:58:59 +1100
Subject: [PATCH 0472/3129] docs/reference/micropython2_migration: Add
 migration guide.

This is just scaffolding for now, but the idea is that there should be an
addition to this file for every commit that uses the
`MICROPY_PREVIEW_VERSION_2` macro.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/reference/index.rst                  |  1 +
 docs/reference/micropython2_migration.rst | 74 +++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 docs/reference/micropython2_migration.rst

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 8ac92c22ebc13..98f6b65737699 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -31,3 +31,4 @@ implementation and the best practices to use them.
    asm_thumb2_index.rst
    filesystem.rst
    pyboard.py.rst
+   micropython2_migration.rst
diff --git a/docs/reference/micropython2_migration.rst b/docs/reference/micropython2_migration.rst
new file mode 100644
index 0000000000000..954488b8cdf4b
--- /dev/null
+++ b/docs/reference/micropython2_migration.rst
@@ -0,0 +1,74 @@
+.. _micropython2_migration:
+
+MicroPython 2.0 Migration Guide
+===============================
+
+MicroPython 2.0 is the (currently in development, not yet available) next major
+release of MicroPython.
+
+After maintaining API compatibility for almost a decade with the ``1.x`` series, in
+order to unblock some project-wide improvements MicroPython 2.0 will introduce a
+small number of breaking API changes that will require some programs to be
+updated. This guide explains how to update your Python code to accommodate these
+changes.
+
+This document is a work-in-progress. As more work is done on MicroPython 2.0,
+more items will be added to the lists below.
+
+**Note:** There are currently no MicroPython 2.0 firmware builds available for
+download. You can build it yourself by enabling the ``MICROPY_PREVIEW_VERSION_2``
+config option. As it gets closer to being ready for release, builds will be
+provided for both ``1.x.y`` and ``2.0.0-preview``.
+
+Hardware and peripherals
+------------------------
+
+Overview
+~~~~~~~~
+
+The goal is to improve consistency in the :mod:`machine` APIs across different
+ports, making it easier to write code, documentation, and tutorials that work on
+any supported microcontroller.
+
+This means that some ports' APIs need to change to match other ports.
+
+Changes
+~~~~~~~
+
+*None yet*
+
+OS & filesystem
+---------------
+
+Overview
+~~~~~~~~
+
+The primary goal is to support the ability to execute :term:`.mpy files <.mpy
+file>` directly from the filesystem without first copying them into RAM. This
+improves code deployment time and reduces memory overhead and fragmentation.
+
+Additionally, a further goal is to support a more flexible way of configuring
+partitions, filesystem types, and options like USB mass storage.
+
+Changes
+~~~~~~~
+
+*None yet*
+
+CPython compatibility
+---------------------
+
+Overview
+~~~~~~~~
+
+The goal is to improve compatibility with CPython by removing MicroPython
+extensions from CPython APIs. In most cases this means moving existing
+MicroPython-specific functions or classes to new modules.
+
+This makes it easier to write code that works on both CPython and MicroPython,
+which is useful for development and testing.
+
+Changes
+~~~~~~~
+
+*None yet*

From b6c369a396d259ab237acec5570392a96d3f443f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 23 Oct 2023 15:57:09 +0200
Subject: [PATCH 0473/3129] py/asm{arm,thumb,x64,x86,xtensa}: Remove unused
 macros.

`ASM_MOV_REG_IMM_FIX_U16` and `ASM_MOV_REG_IMM_FIX_WORD` are no longer
used anywhere in the code.

See discussion in #12771.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.h    | 2 --
 py/asmthumb.h  | 1 -
 py/asmx64.h    | 2 --
 py/asmx86.h    | 2 --
 py/asmxtensa.h | 2 --
 5 files changed, 9 deletions(-)

diff --git a/py/asmarm.h b/py/asmarm.h
index 561d69a4b10a7..81c3f7b1cf416 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -183,8 +183,6 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 
 #define ASM_MOV_LOCAL_REG(as, local_num, reg_src) asm_arm_mov_local_reg((as), (local_num), (reg_src))
 #define ASM_MOV_REG_IMM(as, reg_dest, imm) asm_arm_mov_reg_i32_optimised((as), (reg_dest), (imm))
-#define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_arm_mov_reg_i32((as), (reg_dest), (imm))
-#define ASM_MOV_REG_IMM_FIX_WORD(as, reg_dest, imm) asm_arm_mov_reg_i32((as), (reg_dest), (imm))
 #define ASM_MOV_REG_LOCAL(as, reg_dest, local_num) asm_arm_mov_reg_local((as), (reg_dest), (local_num))
 #define ASM_MOV_REG_REG(as, reg_dest, reg_src) asm_arm_mov_reg_reg((as), (reg_dest), (reg_src))
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_arm_mov_reg_local_addr((as), (reg_dest), (local_num))
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 86b81665757eb..2829ac4c7e413 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -401,7 +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))
-#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))
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_thumb_mov_reg_local_addr((as), (reg_dest), (local_num))
diff --git a/py/asmx64.h b/py/asmx64.h
index d132ee193cf7d..a8efc2bf60161 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -186,8 +186,6 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 
 #define ASM_MOV_LOCAL_REG(as, local_num, reg_src) asm_x64_mov_r64_to_local((as), (reg_src), (local_num))
 #define ASM_MOV_REG_IMM(as, reg_dest, imm) asm_x64_mov_i64_to_r64_optimised((as), (imm), (reg_dest))
-#define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_x64_mov_i32_to_r64((as), (imm), (reg_dest))
-#define ASM_MOV_REG_IMM_FIX_WORD(as, reg_dest, imm) asm_x64_mov_i32_to_r64((as), (imm), (reg_dest))
 #define ASM_MOV_REG_LOCAL(as, reg_dest, local_num) asm_x64_mov_local_to_r64((as), (local_num), (reg_dest))
 #define ASM_MOV_REG_REG(as, reg_dest, reg_src) asm_x64_mov_r64_r64((as), (reg_dest), (reg_src))
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_x64_mov_local_addr_to_r64((as), (local_num), (reg_dest))
diff --git a/py/asmx86.h b/py/asmx86.h
index e02e6c95457c2..ac98643a6a866 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -181,8 +181,6 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
 
 #define ASM_MOV_LOCAL_REG(as, local_num, reg_src) asm_x86_mov_r32_to_local((as), (reg_src), (local_num))
 #define ASM_MOV_REG_IMM(as, reg_dest, imm) asm_x86_mov_i32_to_r32((as), (imm), (reg_dest))
-#define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_x86_mov_i32_to_r32((as), (imm), (reg_dest))
-#define ASM_MOV_REG_IMM_FIX_WORD(as, reg_dest, imm) asm_x86_mov_i32_to_r32((as), (imm), (reg_dest))
 #define ASM_MOV_REG_LOCAL(as, reg_dest, local_num) asm_x86_mov_local_to_r32((as), (local_num), (reg_dest))
 #define ASM_MOV_REG_REG(as, reg_dest, reg_src) asm_x86_mov_r32_r32((as), (reg_dest), (reg_src))
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_x86_mov_local_addr_to_r32((as), (local_num), (reg_dest))
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 5aa86d3b24411..5bd6426a14481 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -366,8 +366,6 @@ void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 
 #define ASM_MOV_LOCAL_REG(as, local_num, reg_src) asm_xtensa_mov_local_reg((as), ASM_NUM_REGS_SAVED + (local_num), (reg_src))
 #define ASM_MOV_REG_IMM(as, reg_dest, imm) asm_xtensa_mov_reg_i32_optimised((as), (reg_dest), (imm))
-#define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_xtensa_mov_reg_i32((as), (reg_dest), (imm))
-#define ASM_MOV_REG_IMM_FIX_WORD(as, reg_dest, imm) asm_xtensa_mov_reg_i32((as), (reg_dest), (imm))
 #define ASM_MOV_REG_LOCAL(as, reg_dest, local_num) asm_xtensa_mov_reg_local((as), (reg_dest), ASM_NUM_REGS_SAVED + (local_num))
 #define ASM_MOV_REG_REG(as, reg_dest, reg_src) asm_xtensa_op_mov_n((as), (reg_dest), (reg_src))
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_xtensa_mov_reg_local_addr((as), (reg_dest), ASM_NUM_REGS_SAVED + (local_num))

From 2fda94c28629f7c12dcab931b2bf4cc0f9c8f734 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 23 Oct 2023 12:08:17 +0200
Subject: [PATCH 0474/3129] extmod/network_ninaw10: Fix select flags handling
 in socket poll.

The flags returned from `select()` were misinterpreted to mean an error had
occurred for the socket, when it's actually just an exceptional condition
for the socket, such as OOB data.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/network_ninaw10.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 399d02cd6e2db..264eb1437e5e5 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -92,13 +92,8 @@ STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) {
             // 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) {
+        } else if (flags & SOCKET_POLL_RD) {
             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);
-            }
         }
     }
 }
@@ -451,7 +446,7 @@ STATIC int network_ninaw10_socket_poll(mod_network_socket_obj_t *socket, uint32_
     }
     mp_uint_t start = mp_hal_ticks_ms();
     for (; !(flags & rwf); mp_hal_delay_ms(5)) {
-        if (nina_socket_poll(socket->fileno, &flags) < 0 || (flags & SOCKET_POLL_ERR)) {
+        if (nina_socket_poll(socket->fileno, &flags) < 0) {
             nina_socket_errno(_errno);
             debug_printf("socket_poll(%d) -> errno %d flags %d\n", socket->fileno, *_errno, flags);
             return -1;

From 1a017511d0b25b8b4a6c3aaa2f2bc17e06b32fa2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 13 Oct 2023 14:47:59 +1100
Subject: [PATCH 0475/3129] tests/perf_bench: Add string/qstr/map tests.

These tests are designed to measure changes in performance relating to:
 - string interning / searching for existing strings
 - map lookup
 - string operations
 - string hashing

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/perf_bench/bm_wordcount.py |  45 ++++++++
 tests/perf_bench/core_locals.py  | 191 +++++++++++++++++++++++++++++++
 tests/perf_bench/core_str.py     |  65 +++++++++++
 3 files changed, 301 insertions(+)
 create mode 100644 tests/perf_bench/bm_wordcount.py
 create mode 100644 tests/perf_bench/core_locals.py
 create mode 100644 tests/perf_bench/core_str.py

diff --git a/tests/perf_bench/bm_wordcount.py b/tests/perf_bench/bm_wordcount.py
new file mode 100644
index 0000000000000..ef55046956a04
--- /dev/null
+++ b/tests/perf_bench/bm_wordcount.py
@@ -0,0 +1,45 @@
+# This tests using string as dictionary keys when they are not qstrs
+
+ZEN = "the zen of python beautiful is better than ugly explicit is better than implicit simple is better than complex complex is better than complicated flat is better than nested sparse is better than dense readability counts special cases arent special enough to break the rules although practicality beats purity errors should never pass silently unless explicitly silenced in the face of ambiguity refuse the temptation to guess there should be one and preferably only one obvious way to do it although that way may not be obvious at first unless youre dutch now is better than never although never is often better than right now if the implementation is hard to explain its a bad idea if the implementation is easy to explain it may be a good idea namespaces are one honking great idea  lets do more of those"
+
+
+def test(niter):
+    words = ZEN.split(" ")
+    for _ in range(niter):
+        counts = {}
+        for _ in range(niter):
+            for word in words:
+                counts[word] = counts.get(word, 0) + 1
+
+    return (
+        counts["python"],
+        counts["is"],
+        counts["than"],
+    )
+
+
+###########################################################################
+# Benchmark interface
+
+bm_params = {
+    (32, 10): (2,),
+    (50, 10): (4,),
+    (100, 10): (8,),
+    (500, 10): (40,),
+    (1000, 10): (80,),
+    (5000, 10): (400,),
+}
+
+
+def bm_setup(params):
+    (niter,) = params
+    state = None
+
+    def run():
+        nonlocal state
+        state = test(niter)
+
+    def result():
+        return niter, state
+
+    return run, result
diff --git a/tests/perf_bench/core_locals.py b/tests/perf_bench/core_locals.py
new file mode 100644
index 0000000000000..d28e078b26e1a
--- /dev/null
+++ b/tests/perf_bench/core_locals.py
@@ -0,0 +1,191 @@
+# This tests the performance of an instance class locals dict (importantly, that has all keys as qstrs)
+
+# These are all shorter than 10 characters, so will be interned by the parser.
+ZEN = [
+    "the",
+    "zen",
+    "of",
+    "python",
+    "beautiful",
+    "is",
+    "better",
+    "than",
+    "ugly",
+    "explicit",
+    "is",
+    "better",
+    "than",
+    "implicit",
+    "simple",
+    "is",
+    "better",
+    "than",
+    "complex",
+    "complex",
+    "is",
+    "better",
+    "than",
+    "complicate",
+    "flat",
+    "is",
+    "better",
+    "than",
+    "nested",
+    "sparse",
+    "is",
+    "better",
+    "than",
+    "dense",
+    "readabilit",
+    "counts",
+    "special",
+    "cases",
+    "arent",
+    "special",
+    "enough",
+    "to",
+    "break",
+    "the",
+    "rules",
+    "although",
+    "practicali",
+    "beats",
+    "purity",
+    "errors",
+    "should",
+    "never",
+    "pass",
+    "silently",
+    "unless",
+    "explicitly",
+    "silenced",
+    "in",
+    "the",
+    "face",
+    "of",
+    "ambiguity",
+    "refuse",
+    "the",
+    "temptation",
+    "to",
+    "guess",
+    "there",
+    "should",
+    "be",
+    "one",
+    "and",
+    "preferably",
+    "only",
+    "one",
+    "obvious",
+    "way",
+    "to",
+    "do",
+    "it",
+    "although",
+    "that",
+    "way",
+    "may",
+    "not",
+    "be",
+    "obvious",
+    "at",
+    "first",
+    "unless",
+    "youre",
+    "dutch",
+    "now",
+    "is",
+    "better",
+    "than",
+    "never",
+    "although",
+    "never",
+    "is",
+    "often",
+    "better",
+    "than",
+    "right",
+    "now",
+    "if",
+    "the",
+    "implementa",
+    "is",
+    "hard",
+    "to",
+    "explain",
+    "its",
+    "a",
+    "bad",
+    "idea",
+    "if",
+    "the",
+    "implementa",
+    "is",
+    "easy",
+    "to",
+    "explain",
+    "it",
+    "may",
+    "be",
+    "a",
+    "good",
+    "idea",
+    "namespaces",
+    "are",
+    "one",
+    "honking",
+    "great",
+    "idea",
+    "",
+    "lets",
+    "do",
+    "more",
+    "of",
+    "those",
+]
+
+
+class A:
+    pass
+
+
+def test(niter):
+    for _ in range(niter):
+        a = A()
+        for _ in range(niter):
+            for word in ZEN:
+                setattr(a, word, getattr(a, word, 0) + 1)
+
+    return (
+        getattr(a, "python"),
+        getattr(a, "is"),
+        getattr(a, "than"),
+    )
+
+
+###########################################################################
+# Benchmark interface
+
+bm_params = {
+    (32, 10): (2,),
+    (50, 10): (4,),
+    (100, 10): (8,),
+    (500, 10): (40,),
+    (1000, 10): (80,),
+    (5000, 10): (400,),
+}
+
+
+def bm_setup(params):
+    (niter,) = params
+    state = None
+
+    def run():
+        nonlocal state
+        state = test(niter)
+
+    def result():
+        return niter, state
+
+    return run, result
diff --git a/tests/perf_bench/core_str.py b/tests/perf_bench/core_str.py
new file mode 100644
index 0000000000000..ca827194d6fd7
--- /dev/null
+++ b/tests/perf_bench/core_str.py
@@ -0,0 +1,65 @@
+# This tests string handling operations
+
+ZEN = """
+The Zen of Python
+Beautiful is better than ugly.
+Explicit is better than implicit.
+Simple is better than complex.
+Complex is better than complicated.
+Flat is better than nested.
+Sparse is better than dense.
+Readability counts.
+Special cases aren't special enough to break the rules.
+Although practicality beats purity.
+Errors should never pass silently.
+Unless explicitly silenced.
+In the face of ambiguity, refuse the temptation to guess.
+There should be one-- and preferably only one --obvious way to do it.
+Although that way may not be obvious at first unless you're Dutch.
+Now is better than never.
+Although never is often better than *right* now.
+If the implementation is hard to explain, it's a bad idea.
+If the implementation is easy to explain, it may be a good idea.
+Namespaces are one honking great idea -- let's do more of those!
+"""
+
+
+def test(niter):
+    counts = {}
+    for _ in range(niter):
+        x = ZEN.replace("\n", " ").split(" ")
+        y = " ".join(x)
+        for i in range(50):
+            a = ZEN[i : i * 2]
+            b = a + "hello world"
+        for c in ZEN:
+            i = ord(c)
+            c = chr(i)
+    return (x[0], a)
+
+
+###########################################################################
+# Benchmark interface
+
+bm_params = {
+    (32, 10): (2,),
+    (50, 10): (3,),
+    (100, 10): (6,),
+    (500, 10): (30,),
+    (1000, 10): (60,),
+    (5000, 10): (300,),
+}
+
+
+def bm_setup(params):
+    (niter,) = params
+    state = None
+
+    def run():
+        nonlocal state
+        state = test(niter)
+
+    def result():
+        return niter, state
+
+    return run, result

From 78f4f30cb1aadbb46ad39220de5369e72c093509 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 9 Oct 2023 14:07:28 +1100
Subject: [PATCH 0476/3129] tests/extmod/asyncio_as_uasyncio.py: Fix qstr order
 dependency.

This test depends on the order in which qstrs are stored in ROM, which
affects the order in which `dir()` will probe the object to see what it
supports.  Because of the lazy-loading in asyncio/__init__.py, if it
tries to do e.g. `wait_for_ms` before `funcs` then it will import funcs,
making `funcs` later succeed. But in the other way around, `funcs` will
initially not be found.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/extmod/asyncio_as_uasyncio.py     | 31 +++++++++++++++++++++----
 tests/extmod/asyncio_as_uasyncio.py.exp |  2 --
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/tests/extmod/asyncio_as_uasyncio.py b/tests/extmod/asyncio_as_uasyncio.py
index 612292299c172..b021980590cdc 100644
--- a/tests/extmod/asyncio_as_uasyncio.py
+++ b/tests/extmod/asyncio_as_uasyncio.py
@@ -1,12 +1,33 @@
 try:
     import uasyncio
-    import asyncio
 except ImportError:
     print("SKIP")
     raise SystemExit
 
-x = set(dir(uasyncio))
-y = set(dir(asyncio)) - set(["event", "lock", "stream", "funcs"])
 
-print(x - y)
-print(y - x)
+# Sample of public symbols we expect to see from `asyncio`. Verify they're all
+# available on `uasyncio`.
+expected = [
+    "CancelledError",
+    "create_task",
+    "current_task",
+    "Event",
+    "gather",
+    "get_event_loop",
+    "Lock",
+    "Loop",
+    "open_connection",
+    "run",
+    "run_until_complete",
+    "sleep",
+    "sleep_ms",
+    "start_server",
+    "StreamReader",
+    "StreamWriter",
+    "Task",
+    "ThreadSafeFlag",
+    "wait_for",
+]
+
+for e in expected:
+    getattr(uasyncio, e)
diff --git a/tests/extmod/asyncio_as_uasyncio.py.exp b/tests/extmod/asyncio_as_uasyncio.py.exp
index 9405b80109126..e69de29bb2d1d 100644
--- a/tests/extmod/asyncio_as_uasyncio.py.exp
+++ b/tests/extmod/asyncio_as_uasyncio.py.exp
@@ -1,2 +0,0 @@
-set()
-set()

From e910533012b7298f5c11622d501878c678dbf45e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 27 Oct 2023 17:41:55 +1100
Subject: [PATCH 0477/3129] bare-arm/lib: Add minimal strncmp implementation.

Required by upcoming qstr sorting.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/bare-arm/lib.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/bare-arm/lib.c b/ports/bare-arm/lib.c
index 6ef450bea0f1a..61d3be64e3f44 100644
--- a/ports/bare-arm/lib.c
+++ b/ports/bare-arm/lib.c
@@ -109,16 +109,23 @@ char *strchr(const char *s, int c) {
     return NULL;
 }
 
-int strcmp(const char *s1, const char *s2) {
-    while (*s1 && *s2) {
+int strncmp(const char *s1, const char *s2, size_t n) {
+    while (*s1 && *s2 && n-- > 0) {
         int c = *s1++ - *s2++;
         if (c) {
             return c;
         }
     }
+    if (n == 0) {
+        return 0;
+    }
     return *s1 - *s2;
 }
 
+int strcmp(const char *s1, const char *s2) {
+    return strncmp(s1, s2, 0x7fffffff);
+}
+
 size_t strlen(const char *s) {
     const char *ss = s;
     while (*ss) {

From 64c79a54239d700ecb8d7f07b13388dc79f28993 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 15 Feb 2023 16:09:04 +1100
Subject: [PATCH 0478/3129] py/qstr: Add support for sorted qstr pools.

This provides a significant performance boost for qstr_find_strn, which is
called a lot during parsing and loading of .mpy files, as well as interning
of string objects (which happens in most string methods that return new
strings).

Also adds comments to explain the "static" qstrs.  These are part of the
.mpy ABI and avoid needing to duplicate string data for QSTRs known to
already be in the firmware.  The static pool isn't currently sorted, but in
the future we could either split the static pool into the sorted regions,
or in the next .mpy version just sort them.

Based on initial work done by @amirgon in #6896.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/makeqstrdata.py  | 114 ++++++++++++++++++++++++++++++++------------
 py/persistentcode.c |   5 ++
 py/qstr.c           |  98 +++++++++++++++++++++++++++++++------
 py/qstr.h           |  19 ++++++--
 tools/mpy-tool.py   |  18 ++++---
 5 files changed, 200 insertions(+), 54 deletions(-)

diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 71f529fb62900..2350fe04d29a6 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -52,7 +52,8 @@
 codepoint2name[ord("|")] = "pipe"
 codepoint2name[ord("~")] = "tilde"
 
-# static qstrs, should be sorted
+# static qstrs, these must maintain a specific order for .mpy compatibility
+# See QSTR_LAST_STATIC at the top of py/persistentcode.c
 
 static_qstr_list = [
     "",
@@ -222,6 +223,71 @@
     "zip",
 ]
 
+# Additional QSTRs that must have index <255 because they are stored in
+# `mp_binary_op_method_name` and `mp_unary_op_method_name` (see py/objtype.c).
+# These are not part of the .mpy compatibility list, but we place them in the
+# fixed unsorted pool (i.e. QDEF0) to ensure their indices are small.
+operator_qstr_list = {
+    "__bool__",
+    "__pos__",
+    "__neg__",
+    "__invert__",
+    "__abs__",
+    "__float__",
+    "__complex__",
+    "__sizeof__",
+    "__lt__",
+    "__gt__",
+    "__eq__",
+    "__le__",
+    "__ge__",
+    "__ne__",
+    "__contains__",
+    "__iadd__",
+    "__isub__",
+    "__imul__",
+    "__imatmul__",
+    "__ifloordiv__",
+    "__itruediv__",
+    "__imod__",
+    "__ipow__",
+    "__ior__",
+    "__ixor__",
+    "__iand__",
+    "__ilshift__",
+    "__irshift__",
+    "__add__",
+    "__sub__",
+    "__mul__",
+    "__matmul__",
+    "__floordiv__",
+    "__truediv__",
+    "__mod__",
+    "__divmod__",
+    "__pow__",
+    "__or__",
+    "__xor__",
+    "__and__",
+    "__lshift__",
+    "__rshift__",
+    "__radd__",
+    "__rsub__",
+    "__rmul__",
+    "__rmatmul__",
+    "__rfloordiv__",
+    "__rtruediv__",
+    "__rmod__",
+    "__rpow__",
+    "__ror__",
+    "__rxor__",
+    "__rand__",
+    "__rlshift__",
+    "__rrshift__",
+    "__get__",
+    "__set__",
+    "__delete__",
+}
+
 
 # this must match the equivalent function in qstr.c
 def compute_hash(qstr, bytes_hash):
@@ -244,22 +310,13 @@ def esc_char(m):
     return re.sub(r"[^A-Za-z0-9_]", esc_char, qst)
 
 
+static_qstr_list_ident = list(map(qstr_escape, static_qstr_list))
+
+
 def parse_input_headers(infiles):
     qcfgs = {}
     qstrs = {}
 
-    # add static qstrs
-    for qstr in static_qstr_list:
-        # work out the corresponding qstr name
-        ident = qstr_escape(qstr)
-
-        # don't add duplicates
-        assert ident not in qstrs
-
-        # add the qstr to the list, with order number to retain original order in file
-        order = len(qstrs) - 300000
-        qstrs[ident] = (order, ident, qstr)
-
     # read the qstrs in from the input files
     for infile in infiles:
         with open(infile, "rt") as f:
@@ -294,22 +351,12 @@ def parse_input_headers(infiles):
                 ident = qstr_escape(qstr)
 
                 # don't add duplicates
+                if ident in static_qstr_list_ident:
+                    continue
                 if ident in qstrs:
                     continue
 
-                # add the qstr to the list, with order number to retain original order in file
-                order = len(qstrs)
-                # but put special method names like __add__ at the top of list, so
-                # that their id's fit into a byte
-                if ident == "":
-                    # Sort empty qstr above all still
-                    order = -200000
-                elif ident == "__dir__":
-                    # Put __dir__ after empty qstr for builtin dir() to work
-                    order = -190000
-                elif ident.startswith("__"):
-                    order -= 100000
-                qstrs[ident] = (order, ident, qstr)
+                qstrs[ident] = (ident, qstr)
 
     if not qcfgs:
         sys.stderr.write("ERROR: Empty preprocessor output - check for errors above\n")
@@ -348,12 +395,19 @@ def print_qstr_data(qcfgs, qstrs):
     print("")
 
     # add NULL qstr with no hash or data
-    print('QDEF(MP_QSTRnull, 0, 0, "")')
+    print('QDEF0(MP_QSTRnull, 0, 0, "")')
+
+    # add static qstrs to the first unsorted pool
+    for qstr in static_qstr_list:
+        qbytes = make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr)
+        print("QDEF0(MP_QSTR_%s, %s)" % (qstr_escape(qstr), qbytes))
 
-    # go through each qstr and print it out
-    for order, ident, qstr in sorted(qstrs.values(), key=lambda x: x[0]):
+    # add remaining qstrs to the sorted (by value) pool (unless they're in
+    # operator_qstr_list, in which case add them to the unsorted pool)
+    for ident, qstr in sorted(qstrs.values(), key=lambda x: x[1]):
         qbytes = make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr)
-        print("QDEF(MP_QSTR_%s, %s)" % (ident, qbytes))
+        pool = 0 if qstr in operator_qstr_list else 1
+        print("QDEF%d(MP_QSTR_%s, %s)" % (pool, ident, qbytes))
 
 
 def do_work(infiles):
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 0feb93bdbe292..df1003babfa1d 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -40,6 +40,11 @@
 
 #include "py/smallint.h"
 
+// makeqstrdata.py has a fixed list of qstrs at the start that we can assume
+// are available with know indices on all MicroPython implementations, and
+// avoid needing to duplicate the string data in the .mpy file. This is the
+// last one in that list (anything with a qstr less than or equal to this is
+// assumed to be in the list).
 #define QSTR_LAST_STATIC MP_QSTR_zip
 
 #if MICROPY_DYNAMIC_COMPILER
diff --git a/py/qstr.c b/py/qstr.c
index ea700566f4f7d..0ae08354a5de5 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -33,9 +33,6 @@
 #include "py/gc.h"
 #include "py/runtime.h"
 
-// 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
-
 #if MICROPY_DEBUG_VERBOSE // print debugging info
 #define DEBUG_printf DEBUG_printf
 #else // don't print debugging info
@@ -74,38 +71,94 @@ size_t qstr_compute_hash(const byte *data, size_t len) {
     return hash;
 }
 
+// The first pool is the static qstr table. The contents must remain stable as
+// it is part of the .mpy ABI. See the top of py/persistentcode.c and
+// static_qstr_list in makeqstrdata.py. This pool is unsorted (although in a
+// future .mpy version we could re-order them and make it sorted). It also
+// contains additional qstrs that must have IDs <256, see operator_qstr_list
+// in makeqstrdata.py.
+const qstr_hash_t mp_qstr_const_hashes_static[] = {
+    #ifndef NO_QSTR
+#define QDEF0(id, hash, len, str) hash,
+#define QDEF1(id, hash, len, str)
+    #include "genhdr/qstrdefs.generated.h"
+#undef QDEF0
+#undef QDEF1
+    #endif
+};
+
+const qstr_len_t mp_qstr_const_lengths_static[] = {
+    #ifndef NO_QSTR
+#define QDEF0(id, hash, len, str) len,
+#define QDEF1(id, hash, len, str)
+    #include "genhdr/qstrdefs.generated.h"
+#undef QDEF0
+#undef QDEF1
+    #endif
+};
+
+const qstr_pool_t mp_qstr_const_pool_static = {
+    NULL,               // no previous pool
+    0,                  // no previous pool
+    false,              // is_sorted
+    MICROPY_ALLOC_QSTR_ENTRIES_INIT,
+    MP_QSTRnumber_of_static,   // corresponds to number of strings in array just below
+    (qstr_hash_t *)mp_qstr_const_hashes_static,
+    (qstr_len_t *)mp_qstr_const_lengths_static,
+    {
+        #ifndef NO_QSTR
+#define QDEF0(id, hash, len, str) str,
+#define QDEF1(id, hash, len, str)
+        #include "genhdr/qstrdefs.generated.h"
+#undef QDEF0
+#undef QDEF1
+        #endif
+    },
+};
+
+// The next pool is the remainder of the qstrs defined in the firmware. This
+// is sorted.
 const qstr_hash_t mp_qstr_const_hashes[] = {
     #ifndef NO_QSTR
-#define QDEF(id, hash, len, str) hash,
+#define QDEF0(id, hash, len, str)
+#define QDEF1(id, hash, len, str) hash,
     #include "genhdr/qstrdefs.generated.h"
-#undef QDEF
+#undef QDEF0
+#undef QDEF1
     #endif
 };
 
 const qstr_len_t mp_qstr_const_lengths[] = {
     #ifndef NO_QSTR
-#define QDEF(id, hash, len, str) len,
+#define QDEF0(id, hash, len, str)
+#define QDEF1(id, hash, len, str) len,
     #include "genhdr/qstrdefs.generated.h"
-#undef QDEF
+#undef QDEF0
+#undef QDEF1
     #endif
 };
 
 const qstr_pool_t mp_qstr_const_pool = {
-    NULL,               // no previous pool
-    0,                  // no previous pool
+    &mp_qstr_const_pool_static,
+    MP_QSTRnumber_of_static,
+    true,               // is_sorted
     MICROPY_ALLOC_QSTR_ENTRIES_INIT,
-    MP_QSTRnumber_of,   // corresponds to number of strings in array just below
+    MP_QSTRnumber_of - MP_QSTRnumber_of_static,   // 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, hash, len, str) str,
+#define QDEF0(id, hash, len, str)
+#define QDEF1(id, hash, len, str) str,
         #include "genhdr/qstrdefs.generated.h"
-#undef QDEF
+#undef QDEF0
+#undef QDEF1
         #endif
     },
 };
 
+// If frozen code is enabled, then there is an additional, sorted, ROM pool
+// containing additional qstrs required by the frozen code.
 #ifdef MICROPY_QSTR_EXTRA_POOL
 extern const qstr_pool_t MICROPY_QSTR_EXTRA_POOL;
 #define CONST_POOL MICROPY_QSTR_EXTRA_POOL
@@ -185,7 +238,24 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
 
     // search pools for the data
     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++) {
+        size_t low = 0;
+        size_t high = pool->len - 1;
+
+        // binary search inside the pool
+        if (pool->is_sorted) {
+            while (high - low > 1) {
+                size_t mid = (low + high) / 2;
+                int cmp = strncmp(str, pool->qstrs[mid], str_len);
+                if (cmp <= 0) {
+                    high = mid;
+                } else {
+                    low = mid;
+                }
+            }
+        }
+
+        // sequential search for the remaining strings
+        for (mp_uint_t at = low; at < high + 1; 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;
@@ -194,7 +264,7 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
     }
 
     // not found; return null qstr
-    return 0;
+    return MP_QSTRnull;
 }
 
 qstr qstr_from_str(const char *str) {
diff --git a/py/qstr.h b/py/qstr.h
index 0ef861f33e8d5..0c4fc4632cd53 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -38,9 +38,21 @@
 // first entry in enum will be MP_QSTRnull=0, which indicates invalid/no qstr
 enum {
     #ifndef NO_QSTR
-#define QDEF(id, hash, len, str) id,
+#define QDEF0(id, hash, len, str) id,
+#define QDEF1(id, hash, len, str)
     #include "genhdr/qstrdefs.generated.h"
-#undef QDEF
+#undef QDEF0
+#undef QDEF1
+    #endif
+    MP_QSTRnumber_of_static,
+    MP_QSTRstart_of_main = MP_QSTRnumber_of_static - 1, // unused but shifts the enum counter back one
+
+    #ifndef NO_QSTR
+#define QDEF0(id, hash, len, str)
+#define QDEF1(id, hash, len, str) id,
+    #include "genhdr/qstrdefs.generated.h"
+#undef QDEF0
+#undef QDEF1
     #endif
     MP_QSTRnumber_of, // no underscore so it can't clash with any of the above
 };
@@ -66,7 +78,8 @@ typedef uint16_t qstr_len_t;
 
 typedef struct _qstr_pool_t {
     const struct _qstr_pool_t *prev;
-    size_t total_prev_len;
+    size_t total_prev_len : (8 * sizeof(size_t) - 1);
+    size_t is_sorted : 1;
     size_t alloc;
     size_t len;
     qstr_hash_t *hashes;
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index fc3518d359ec8..95b2c492d9814 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1396,15 +1396,16 @@ def disassemble_mpy(compiled_modules):
         cm.disassemble()
 
 
-def freeze_mpy(base_qstrs, compiled_modules):
+def freeze_mpy(firmware_qstr_idents, compiled_modules):
     # add to qstrs
     new = {}
     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:
+        # don't add duplicates that are already in the firmware
+        if q is None or q.qstr_esc in firmware_qstr_idents or q.qstr_esc in new:
             continue
         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])
+    # Sort by string value (because this is a sorted pool).
+    new = sorted(new.values(), key=lambda x: x[2])
 
     print('#include "py/mpconfig.h"')
     print('#include "py/objint.h"')
@@ -1485,6 +1486,7 @@ def freeze_mpy(base_qstrs, compiled_modules):
     print("const qstr_pool_t mp_qstr_frozen_const_pool = {")
     print("    &mp_qstr_const_pool, // previous pool")
     print("    MP_QSTRnumber_of, // previous pool size")
+    print("    true, // is_sorted")
     print("    %u, // allocated entries" % qstr_pool_alloc)
     print("    %u, // used entries" % len(new))
     print("    (qstr_hash_t *)mp_qstr_frozen_const_hashes,")
@@ -1779,14 +1781,16 @@ def main():
     config.native_arch = MP_NATIVE_ARCH_NONE
 
     # set config values for qstrs, and get the existing base set of qstrs
+    # already in the firmware
     if args.qstr_header:
-        qcfgs, base_qstrs = qstrutil.parse_input_headers([args.qstr_header])
+        qcfgs, extra_qstrs = qstrutil.parse_input_headers([args.qstr_header])
+        firmware_qstr_idents = set(qstrutil.static_qstr_list_ident) | set(extra_qstrs.keys())
         config.MICROPY_QSTR_BYTES_IN_LEN = int(qcfgs["BYTES_IN_LEN"])
         config.MICROPY_QSTR_BYTES_IN_HASH = int(qcfgs["BYTES_IN_HASH"])
     else:
         config.MICROPY_QSTR_BYTES_IN_LEN = 1
         config.MICROPY_QSTR_BYTES_IN_HASH = 1
-        base_qstrs = list(qstrutil.static_qstr_list)
+        firmware_qstr_idents = set(qstrutil.static_qstr_list)
 
     # Create initial list of global qstrs.
     global_qstrs = GlobalQStrList()
@@ -1808,7 +1812,7 @@ def main():
 
     if args.freeze:
         try:
-            freeze_mpy(base_qstrs, compiled_modules)
+            freeze_mpy(firmware_qstr_idents, compiled_modules)
         except FreezeError as er:
             print(er, file=sys.stderr)
             sys.exit(1)

From bdae847082bb38c8b14c9711f74bcc91040d33ff Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Sun, 22 Oct 2023 18:58:44 +1100
Subject: [PATCH 0479/3129] esp32/boards/UM_TINYWATCHS3: Add new UM TinyWATCH
 S3 board.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_TINYWATCHS3/board.json  | 25 +++++++++
 ports/esp32/boards/UM_TINYWATCHS3/board.md    |  1 +
 ports/esp32/boards/UM_TINYWATCHS3/deploy.md   | 52 +++++++++++++++++++
 .../boards/UM_TINYWATCHS3/mpconfigboard.cmake | 10 ++++
 .../boards/UM_TINYWATCHS3/mpconfigboard.h     | 12 +++++
 ports/esp32/boards/UM_TINYWATCHS3/pins.csv    | 25 +++++++++
 .../boards/UM_TINYWATCHS3/sdkconfig.board     | 19 +++++++
 7 files changed, 144 insertions(+)
 create mode 100644 ports/esp32/boards/UM_TINYWATCHS3/board.json
 create mode 100644 ports/esp32/boards/UM_TINYWATCHS3/board.md
 create mode 100644 ports/esp32/boards/UM_TINYWATCHS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_TINYWATCHS3/pins.csv
 create mode 100644 ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board

diff --git a/ports/esp32/boards/UM_TINYWATCHS3/board.json b/ports/esp32/boards/UM_TINYWATCHS3/board.json
new file mode 100644
index 0000000000000..61dadcfb64b46
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYWATCHS3/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "USB-C",
+        "WiFi"
+    ],
+    "features_non_filterable": [
+        "Watch"
+    ],
+    "images": [
+        "unexpectedmaker_tinywatchs3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "TinyWATCH S3",
+    "thumbnail": "",
+    "url": "https://tinywatch.io",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/board.md b/ports/esp32/boards/UM_TINYWATCHS3/board.md
new file mode 100644
index 0000000000000..a0925ac49bb99
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYWATCHS3/board.md
@@ -0,0 +1 @@
+The following files are firmware for the TinyWATCH S3.
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/deploy.md b/ports/esp32/boards/UM_TINYWATCHS3/deploy.md
new file mode 100644
index 0000000000000..bad7d7c7d897b
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYWATCHS3/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 TinyWATCH S3, 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 `tinywatchs3-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 tinywatchs3-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 tinywatchs3-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 tinywatchs3-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..089149c44c54d
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
@@ -0,0 +1,10 @@
+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_TINYWATCHS3/sdkconfig.board
+)
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
new file mode 100644
index 0000000000000..ce8de58a01f2c
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME               "TinyWATCH S3"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S3-PICO-1-N8R2"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "TinyWATCHS3"
+
+#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_TINYWATCHS3/pins.csv b/ports/esp32/boards/UM_TINYWATCHS3/pins.csv
new file mode 100644
index 0000000000000..8a4bc46cd52ec
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYWATCHS3/pins.csv
@@ -0,0 +1,25 @@
+BMI_INT1,GPIO6
+BMI_INT2,GPIO7
+BUZZER,GPIO18
+FG_ALERT,GPIO14
+I2C_SCL,GPIO8
+I2C_SDA,GPIO9
+I2S_MIC_DATA,GPIO1
+I2S_MIC_BCLK,GPIO2
+I2S_MIC_WS,GPIO3
+RTC_INT,GPIO4
+SPI_USER_FLASH_CS,GPIO33
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+TFT_CS,GPIO16
+TFT_DC,GPIO15
+TFT_RESET,GPIO17
+TFT_BACKLIGHT,GPIO13
+TOUCH_I2C_SCL,GPIO10
+TOUCH_I2C_SDA,GPIO5
+TOUCH_INT,GPIO11
+TOUCH_RESET,GPIO12
+USER_BUTTON,GPIO0
+USER_PWR_SHUTDOWN,GPIO21
+VBUS_SENSE,GPIO34
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
new file mode 100644
index 0000000000000..8dec1b8c1892f
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
@@ -0,0 +1,19 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyWATCHS3"
+
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x81B1
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="TinyWATCHS3"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_tws3_"

From c146017f8ac9930bd1ae7ce6d8064f3681ba2feb Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 27 Oct 2023 18:57:52 +1100
Subject: [PATCH 0480/3129] esp32/boards: Update UM board settings to use
 custom PID/VID.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_FEATHERS3/sdkconfig.board   | 2 ++
 ports/esp32/boards/UM_NANOS3/sdkconfig.board      | 2 ++
 ports/esp32/boards/UM_PROS3/sdkconfig.board       | 2 ++
 ports/esp32/boards/UM_TINYS3/sdkconfig.board      | 2 ++
 ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
index 3c8df5e2a857b..c557141ebfc9b 100644
--- a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -14,6 +14,8 @@ CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS3"
 CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
 CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D7
 CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="FeatherS3"
 CONFIG_TINYUSB_DESC_SERIAL_STRING="_fs3_"
diff --git a/ports/esp32/boards/UM_NANOS3/sdkconfig.board b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
index 969bbc5be7fe4..31d7528317a1d 100644
--- a/ports/esp32/boards/UM_NANOS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
@@ -14,6 +14,8 @@ CONFIG_LWIP_LOCAL_HOSTNAME="UMNanoS3"
 CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
 CONFIG_TINYUSB_DESC_CUSTOM_PID=0x817A
 CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="NanoS3"
 CONFIG_TINYUSB_DESC_SERIAL_STRING="_ns3_"
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
index 5d1ac0f684177..0de84d57d01d9 100644
--- a/ports/esp32/boards/UM_PROS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -14,6 +14,8 @@ CONFIG_LWIP_LOCAL_HOSTNAME="UMProS3"
 CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
 CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D4
 CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
 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/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
index 7b913a565f96d..d1689aaf394c8 100644
--- a/ports/esp32/boards/UM_TINYS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -14,6 +14,8 @@ CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS3"
 CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
 CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D1
 CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="TinyS3"
 CONFIG_TINYUSB_DESC_SERIAL_STRING="_ts3_"
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
index 8dec1b8c1892f..d73f4fe0bc012 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
@@ -14,6 +14,8 @@ CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyWATCHS3"
 CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
 CONFIG_TINYUSB_DESC_CUSTOM_PID=0x81B1
 CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="TinyWATCHS3"
 CONFIG_TINYUSB_DESC_SERIAL_STRING="_tws3_"

From 1cf3085c575095f7f027171759f112033b4060af Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 8 Oct 2023 15:41:20 +0200
Subject: [PATCH 0481/3129] esp32/network_ppp: Allow building with IPv6
 disabled.

PPP code assumes that IPv6 support is enabled.  Whilst this is the default,
certain applications may want to disable IPv6 support if not needed (or to
reduce code size).

This makes the code build with CONFIG_LWIP_IPV6 disabled, reducing code by
about 30k in that case.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/network_ppp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index ea0dd1706e08a..d5f6715ea91b8 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -65,7 +65,11 @@ static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
 
     switch (err_code) {
         case PPPERR_NONE:
+            #if CONFIG_LWIP_IPV6
             self->connected = (pppif->ip_addr.u_addr.ip4.addr != 0);
+            #else
+            self->connected = (pppif->ip_addr.addr != 0);
+            #endif // CONFIG_LWIP_IPV6
             break;
         case PPPERR_USER:
             self->clean_close = true;
@@ -250,7 +254,11 @@ STATIC mp_obj_t ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
         ip_addr_t dns;
         mp_obj_t *items;
         mp_obj_get_array_fixed_n(args[1], 4, &items);
+        #if CONFIG_LWIP_IPV6
         netutils_parse_ipv4_addr(items[3], (uint8_t *)&dns.u_addr.ip4, NETUTILS_BIG);
+        #else
+        netutils_parse_ipv4_addr(items[3], (uint8_t *)&dns, NETUTILS_BIG);
+        #endif // CONFIG_LWIP_IPV6
         dns_setserver(0, &dns);
         return mp_const_none;
     }

From f74131134c7af52638348c65ecf1be5e769a5f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Fri, 25 Aug 2023 15:40:46 +0200
Subject: [PATCH 0482/3129] esp32: Poll serial/JTAG for unread data to prevent
 blocking.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If data is pushed over serial/JTAG too fast we may fill up stdin_ringbuf
and not be able to read all the data out of the serial/JTAG buffer. Thus
we need to explicitly poll and read the serial/JTAG RX buffer to prevent
blocking (since if the serial/JTAG buffer is already filled, we will not
get another interrupt to transfer it to the stdin ringbuffer).

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/mphalport.c       |  6 +++++
 ports/esp32/usb_serial_jtag.c | 46 ++++++++++++++++++++++++++---------
 ports/esp32/usb_serial_jtag.h |  1 +
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 538b3e405c905..79ddcd4827aa2 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -100,6 +100,9 @@ void check_esp_err_(esp_err_t code, const char *func, const int line, const char
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    usb_serial_jtag_poll_rx();
+    #endif
     if ((poll_flags & MP_STREAM_POLL_RD) && stdin_ringbuf.iget != stdin_ringbuf.iput) {
         ret |= MP_STREAM_POLL_RD;
     }
@@ -111,6 +114,9 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
+        #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+        usb_serial_jtag_poll_rx();
+        #endif
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c
index 3289a1b5c0783..f4b4b7cb95834 100644
--- a/ports/esp32/usb_serial_jtag.c
+++ b/ports/esp32/usb_serial_jtag.c
@@ -33,12 +33,39 @@
 #include "hal/usb_serial_jtag_ll.h"
 #include "esp_intr_alloc.h"
 #include "soc/periph_defs.h"
+#include "freertos/portmacro.h"
 
 #define USB_SERIAL_JTAG_BUF_SIZE (64)
 
+static DRAM_ATTR portMUX_TYPE rx_mux = portMUX_INITIALIZER_UNLOCKED;
 static uint8_t rx_buf[USB_SERIAL_JTAG_BUF_SIZE];
 static volatile bool terminal_connected = false;
 
+static void usb_serial_jtag_handle_rx(void) {
+    if (xPortInIsrContext()) {
+        portENTER_CRITICAL_ISR(&rx_mux);
+    } else {
+        portENTER_CRITICAL(&rx_mux);
+    }
+    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]);
+        }
+    }
+    if (xPortInIsrContext()) {
+        portEXIT_CRITICAL_ISR(&rx_mux);
+    } else {
+        portEXIT_CRITICAL(&rx_mux);
+    }
+}
+
 static void usb_serial_jtag_isr_handler(void *arg) {
     uint32_t flags = usb_serial_jtag_ll_get_intsts_mask();
 
@@ -48,18 +75,7 @@ static void usb_serial_jtag_isr_handler(void *arg) {
 
     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]);
-            }
-        }
+        usb_serial_jtag_handle_rx();
         mp_hal_wake_main_task_from_isr();
     }
 }
@@ -73,6 +89,12 @@ void usb_serial_jtag_init(void) {
         usb_serial_jtag_isr_handler, NULL, NULL));
 }
 
+void usb_serial_jtag_poll_rx(void) {
+    if (usb_serial_jtag_ll_rxfifo_data_available() && ringbuf_free(&stdin_ringbuf)) {
+        usb_serial_jtag_handle_rx();
+    }
+}
+
 void usb_serial_jtag_tx_strn(const char *str, size_t len) {
     while (len) {
         size_t l = len;
diff --git a/ports/esp32/usb_serial_jtag.h b/ports/esp32/usb_serial_jtag.h
index 4eebb19e4b896..9e108e82ccdaf 100644
--- a/ports/esp32/usb_serial_jtag.h
+++ b/ports/esp32/usb_serial_jtag.h
@@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_ESP32_USB_SERIAL_JTAG_H
 
 void usb_serial_jtag_init(void);
+void usb_serial_jtag_poll_rx(void);
 void usb_serial_jtag_tx_strn(const char *str, size_t len);
 
 #endif // MICROPY_INCLUDED_ESP32_USB_SERIAL_JTAG_H

From e676edac793c7722bc492a0099fb2f6ffa422184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 13 Sep 2023 15:09:25 +0200
Subject: [PATCH 0483/3129] esp32/mpconfigport: Remove port-specific GAP name.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead use the generic default defined in modbluetooth_nimble.c.
This then also allows custom boards to easily override the default
Bluetooth GAP name.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 39f91ab8314b3..b4ec082092089 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -160,7 +160,6 @@
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_SOCKET_EVENTS            (MICROPY_PY_WEBREPL)
 #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR    (1)
-#define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")
 
 // fatfs configuration
 #define MICROPY_FATFS_ENABLE_LFN            (1)

From f1d6af9819d2fd3d70c5d09005c0b460888f8301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 13 Sep 2023 15:07:47 +0200
Subject: [PATCH 0484/3129] esp32/machine_uart: Add error checking for IDF
 API's.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_uart.c | 76 +++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index f498ab5b32f7f..0e384dc07a2d7 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -84,7 +84,7 @@ STATIC const char *_parity_name[] = {"None", "1", "0"};
 STATIC void mp_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);
     uint32_t baudrate;
-    uart_get_baudrate(self->uart_num, &baudrate);
+    check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
     mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, rts=%d, cts=%d, txbuf=%u, rxbuf=%u, timeout=%u, timeout_char=%u",
         self->uart_num, baudrate, self->bits, _parity_name[self->parity],
         self->stop, self->tx, self->rx, self->rts, self->cts, self->txbuf, self->rxbuf, self->timeout, self->timeout_char);
@@ -177,22 +177,22 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
             .source_clk = UART_SOURCE_CLK,
         };
         uint32_t baudrate;
-        uart_get_baudrate(self->uart_num, &baudrate);
+        check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
         uartcfg.baud_rate = baudrate;
-        uart_get_word_length(self->uart_num, &uartcfg.data_bits);
-        uart_get_parity(self->uart_num, &uartcfg.parity);
-        uart_get_stop_bits(self->uart_num, &uartcfg.stop_bits);
-        uart_driver_delete(self->uart_num);
-        uart_param_config(self->uart_num, &uartcfg);
-        uart_driver_install(self->uart_num, self->rxbuf, self->txbuf, 0, NULL, 0);
+        check_esp_err(uart_get_word_length(self->uart_num, &uartcfg.data_bits));
+        check_esp_err(uart_get_parity(self->uart_num, &uartcfg.parity));
+        check_esp_err(uart_get_stop_bits(self->uart_num, &uartcfg.stop_bits));
+        check_esp_err(uart_driver_delete(self->uart_num));
+        check_esp_err(uart_param_config(self->uart_num, &uartcfg));
+        check_esp_err(uart_driver_install(self->uart_num, self->rxbuf, self->txbuf, 0, NULL, 0));
     }
 
     // set baudrate
     uint32_t baudrate = 115200;
     if (args[ARG_baudrate].u_int > 0) {
-        uart_set_baudrate(self->uart_num, args[ARG_baudrate].u_int);
+        check_esp_err(uart_set_baudrate(self->uart_num, args[ARG_baudrate].u_int));
     }
-    uart_get_baudrate(self->uart_num, &baudrate);
+    check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
 
     if (args[ARG_tx].u_obj != MP_OBJ_NULL) {
         self->tx = machine_pin_get_id(args[ARG_tx].u_obj);
@@ -209,26 +209,26 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     if (args[ARG_cts].u_obj != MP_OBJ_NULL) {
         self->cts = machine_pin_get_id(args[ARG_cts].u_obj);
     }
-    uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts);
+    check_esp_err(uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts));
 
     // set data bits
     switch (args[ARG_bits].u_int) {
         case 0:
             break;
         case 5:
-            uart_set_word_length(self->uart_num, UART_DATA_5_BITS);
+            check_esp_err(uart_set_word_length(self->uart_num, UART_DATA_5_BITS));
             self->bits = 5;
             break;
         case 6:
-            uart_set_word_length(self->uart_num, UART_DATA_6_BITS);
+            check_esp_err(uart_set_word_length(self->uart_num, UART_DATA_6_BITS));
             self->bits = 6;
             break;
         case 7:
-            uart_set_word_length(self->uart_num, UART_DATA_7_BITS);
+            check_esp_err(uart_set_word_length(self->uart_num, UART_DATA_7_BITS));
             self->bits = 7;
             break;
         case 8:
-            uart_set_word_length(self->uart_num, UART_DATA_8_BITS);
+            check_esp_err(uart_set_word_length(self->uart_num, UART_DATA_8_BITS));
             self->bits = 8;
             break;
         default:
@@ -239,15 +239,15 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     // set parity
     if (args[ARG_parity].u_obj != MP_OBJ_NULL) {
         if (args[ARG_parity].u_obj == mp_const_none) {
-            uart_set_parity(self->uart_num, UART_PARITY_DISABLE);
+            check_esp_err(uart_set_parity(self->uart_num, UART_PARITY_DISABLE));
             self->parity = 0;
         } else {
             mp_int_t parity = mp_obj_get_int(args[ARG_parity].u_obj);
             if (parity & 1) {
-                uart_set_parity(self->uart_num, UART_PARITY_ODD);
+                check_esp_err(uart_set_parity(self->uart_num, UART_PARITY_ODD));
                 self->parity = 1;
             } else {
-                uart_set_parity(self->uart_num, UART_PARITY_EVEN);
+                check_esp_err(uart_set_parity(self->uart_num, UART_PARITY_EVEN));
                 self->parity = 2;
             }
         }
@@ -259,11 +259,11 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         case 0:
             break;
         case 1:
-            uart_set_stop_bits(self->uart_num, UART_STOP_BITS_1);
+            check_esp_err(uart_set_stop_bits(self->uart_num, UART_STOP_BITS_1));
             self->stop = 1;
             break;
         case 2:
-            uart_set_stop_bits(self->uart_num, UART_STOP_BITS_2);
+            check_esp_err(uart_set_stop_bits(self->uart_num, UART_STOP_BITS_2));
             self->stop = 2;
             break;
         default:
@@ -283,10 +283,10 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         uint32_t char_time_ms = 12000 / baudrate + 1;
         uint32_t rx_timeout = self->timeout_char / char_time_ms;
         if (rx_timeout < 1) {
-            uart_set_rx_full_threshold(self->uart_num, 1);
-            uart_set_rx_timeout(self->uart_num, 1);
+            check_esp_err(uart_set_rx_full_threshold(self->uart_num, 1));
+            check_esp_err(uart_set_rx_timeout(self->uart_num, 1));
         } else {
-            uart_set_rx_timeout(self->uart_num, rx_timeout);
+            check_esp_err(uart_set_rx_timeout(self->uart_num, rx_timeout));
         }
     }
 
@@ -297,7 +297,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         }
         self->invert = args[ARG_invert].u_int;
     }
-    uart_set_line_inverse(self->uart_num, self->invert);
+    check_esp_err(uart_set_line_inverse(self->uart_num, self->invert));
 
     // set hardware flow control
     if (args[ARG_flow].u_int != -1) {
@@ -306,7 +306,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         }
         self->flowcontrol = args[ARG_flow].u_int;
     }
-    uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, UART_FIFO_LEN - UART_FIFO_LEN / 4);
+    check_esp_err(uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, UART_FIFO_LEN - UART_FIFO_LEN / 4));
 }
 
 STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -367,13 +367,13 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     #endif
     {
         // Remove any existing configuration
-        uart_driver_delete(self->uart_num);
+        check_esp_err(uart_driver_delete(self->uart_num));
 
         // init the peripheral
         // Setup
-        uart_param_config(self->uart_num, &uartcfg);
+        check_esp_err(uart_param_config(self->uart_num, &uartcfg));
 
-        uart_driver_install(uart_num, self->rxbuf, self->txbuf, 0, NULL, 0);
+        check_esp_err(uart_driver_install(uart_num, self->rxbuf, self->txbuf, 0, NULL, 0));
     }
 
     mp_map_t kw_args;
@@ -381,18 +381,18 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
 
     // Make sure pins are connected.
-    uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts);
+    check_esp_err(uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts));
 
     return MP_OBJ_FROM_PTR(self);
 }
 
 STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
-    uart_driver_delete(self->uart_num);
+    check_esp_err(uart_driver_delete(self->uart_num));
 }
 
 STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     size_t rxbufsize;
-    uart_get_buffered_data_len(self->uart_num, &rxbufsize);
+    check_esp_err(uart_get_buffered_data_len(self->uart_num, &rxbufsize));
     return rxbufsize;
 }
 
@@ -403,18 +403,18 @@ STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
 STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     // Save settings
     uint32_t baudrate;
-    uart_get_baudrate(self->uart_num, &baudrate);
+    check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
 
     // 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));
-    uart_set_baudrate(self->uart_num, baudrate * 6 / 15);
+    check_esp_err(uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000)));
+    check_esp_err(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));
+    check_esp_err(uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000)));
 
     // Restore original setting
-    uart_set_baudrate(self->uart_num, baudrate);
+    check_esp_err(uart_set_baudrate(self->uart_num, baudrate));
 }
 
 STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
@@ -472,7 +472,7 @@ STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
         mp_uint_t flags = arg;
         ret = 0;
         size_t rxbufsize;
-        uart_get_buffered_data_len(self->uart_num, &rxbufsize);
+        check_esp_err(uart_get_buffered_data_len(self->uart_num, &rxbufsize));
         if ((flags & MP_STREAM_POLL_RD) && rxbufsize > 0) {
             ret |= MP_STREAM_POLL_RD;
         }
@@ -483,7 +483,7 @@ STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
         // 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);
+        check_esp_err(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;

From a1d20e0747b4e140786d0a0fcdb6f7808714ed68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Fri, 25 Aug 2023 15:17:04 +0200
Subject: [PATCH 0485/3129] esp32/network_ppp: Reduce PPP thread CPU usage.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reduces the CPU usage by the PPP thread by sleeping for one tick if
there was nothing to read; preventing the loop using 100% CPU when the
read operation has a zero timeout and immediately returns.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/network_ppp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index d5f6715ea91b8..0d8046c97df82 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -108,9 +108,10 @@ static void pppos_client_task(void *self_in) {
     ppp_if_obj_t *self = (ppp_if_obj_t *)self_in;
     uint8_t buf[256];
 
-    while (ulTaskNotifyTake(pdTRUE, 0) == 0) {
+    int len = 0;
+    while (ulTaskNotifyTake(pdTRUE, len <= 0) == 0) {
         int err;
-        int len = mp_stream_rw(self->stream, buf, sizeof(buf), &err, 0);
+        len = mp_stream_rw(self->stream, buf, sizeof(buf), &err, 0);
         if (len > 0) {
             pppos_input_tcpip(self->pcb, (u8_t *)buf, len);
         }

From b2f220dff8b262bdd77c8ed6e2a9b2b8629411ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 29 Jun 2023 15:21:32 +0200
Subject: [PATCH 0486/3129] esp32/boards: Disable ALPN support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/boards/sdkconfig.base | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 6526a803558e9..5bd9b1aa6c0b4 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -51,6 +51,9 @@ CONFIG_LWIP_PPP_CHAP_SUPPORT=y
 # Use 4kiB output buffer instead of default 16kiB
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 
+# Disable ALPN support as it's not implemented in MicroPython
+CONFIG_MBEDTLS_SSL_ALPN=n
+
 # Allow mbedTLS to allocate from PSRAM or internal memory
 #
 # (The ESP-IDF default is internal-only, partly for physical security to prevent

From c4e63ace661df9748cfae451bde7781e61e0b3d9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 17 Oct 2023 21:48:18 +0200
Subject: [PATCH 0487/3129] esp32/network_lan: Fix and simplify the code for
 ETH-SPI devices.

SPI support was not enabled, and was not adapted for esp-idf v5.x.  This
change enables SPI ethernet for all boards and adapts the code for esp-idf
v5.x.  The change follows the sample implementation of @hemakumarm72, but
adds the changes for the other adapters as well.  Further, it simplifies
the code by removing actions from netwwork_lan.c which are done in the
esp-idf drivers later, like setting the default values for .command_bits
and .address_bits, and registering the SPI interface.

Tested with a Wiznet W5500 breakout.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/boards/sdkconfig.base |  5 ++++
 ports/esp32/network_lan.c         | 47 +++++++++----------------------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 5bd9b1aa6c0b4..372633e711a65 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -91,3 +91,8 @@ CONFIG_UART_ISR_IN_IRAM=y
 CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
+
+CONFIG_ETH_USE_SPI_ETHERNET=y
+CONFIG_ETH_SPI_ETHERNET_W5500=y
+CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL=y
+CONFIG_ETH_SPI_ETHERNET_DM9051=y
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 8557700446f40..0e42f403c559a 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -180,37 +180,15 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     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"));
-        }
-    }
+    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,
+        .command_bits = 0, // Can both be set to 0, as the respective
+        .address_bits = 0, // driver fills in proper default values.
+    };
     #endif
 
     switch (args[ARG_phy_type].u_int) {
@@ -236,7 +214,8 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         #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);
+            spi_host_device_t host = machine_hw_spi_get_host(args[ARG_spi].u_obj);
+            eth_ksz8851snl_config_t chip_config = ETH_KSZ8851SNL_DEFAULT_CONFIG(host, &devcfg);
             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);
@@ -245,7 +224,8 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         #endif
         #if CONFIG_ETH_SPI_ETHERNET_DM9051
         case PHY_DM9051: {
-            eth_dm9051_config_t chip_config = ETH_DM9051_DEFAULT_CONFIG(spi_handle);
+            spi_host_device_t host = machine_hw_spi_get_host(args[ARG_spi].u_obj);
+            eth_dm9051_config_t chip_config = ETH_DM9051_DEFAULT_CONFIG(host, &devcfg);
             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);
@@ -254,7 +234,8 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         #endif
         #if CONFIG_ETH_SPI_ETHERNET_W5500
         case PHY_W5500: {
-            eth_w5500_config_t chip_config = ETH_W5500_DEFAULT_CONFIG(spi_handle);
+            spi_host_device_t host = machine_hw_spi_get_host(args[ARG_spi].u_obj);
+            eth_w5500_config_t chip_config = ETH_W5500_DEFAULT_CONFIG(host, &devcfg);
             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);

From 9c244134fb4db921f721737763f81cd9300c2e86 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 19 Oct 2023 15:05:59 +0200
Subject: [PATCH 0488/3129] esp32/network_lan: Fix LAN.isconnected().

nic.isconnected() returns now "True", if a) the physical link is up and b)
an IP address is assigned.  The latter happens often by DHCP, in which case
an active connection can be assumed.  If the IP address is set manually,
nic.isconnected() would report "True" as well, if at least the physical
link is up.  This matches WLAN behaviour which returns "True" when the WLAN
has an IP address.

Before, the behaviour of nic.isconneceted() was erratic, returning "True"
sometimes even without a Ethernet cable attached.

Fixes issue #12741.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/network_lan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 0e42f403c559a..15a5110b1ee67 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -325,7 +325,7 @@ 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->base.active ? mp_obj_new_bool(self->phy->get_link(self->phy) == ETH_LINK_UP) : mp_const_false;
+    return mp_obj_new_bool(self->base.active && (eth_status == ETH_GOT_IP));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(lan_isconnected_obj, lan_isconnected);
 

From bbbd484f5ba27f31c142a6402662422c0634e271 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 20 Oct 2023 21:34:46 +0200
Subject: [PATCH 0489/3129] esp32/network_lan: Register the hostname setting
 for Ethernet.

Fixes issue #12817.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/network_lan.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 15a5110b1ee67..f66895f9e098a 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -44,6 +44,7 @@
 #endif
 
 #include "modnetwork.h"
+#include "extmod/modnetwork.h"
 
 typedef struct _lan_if_obj_t {
     base_if_obj_t base;
@@ -302,6 +303,7 @@ 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])) {
+            esp_netif_set_hostname(self->base.netif, mod_network_hostname_data);
             self->base.active = (esp_eth_start(self->eth_handle) == ESP_OK);
             if (!self->base.active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet enable failed"));

From a8dd69f20696d8135b6c4e05b9f1b2c934fad4a3 Mon Sep 17 00:00:00 2001
From: Pascal Brunot <pascal.brunot@gmail.com>
Date: Mon, 23 Oct 2023 20:28:38 +0200
Subject: [PATCH 0490/3129] esp32/modmachine: Fix deepsleep() when previous
 sleep delay was set.

Fixes issue #7158.

Signed-off-by: Pascal Brunot <pascal.brunot@gmail.com>
---
 ports/esp32/modmachine.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index be5348f0e604f..1e83935a8bbdb 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -115,6 +115,9 @@ STATIC mp_obj_t machine_sleep_helper(wake_type_t wake_type, size_t n_args, const
 
     mp_int_t expiry = args[ARG_sleep_ms].u_int;
 
+    // First, disable any previously set wake-up source
+    esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
+
     if (expiry != 0) {
         esp_sleep_enable_timer_wakeup(((uint64_t)expiry) * 1000);
     }

From e579ebb11b199ab04210fd8a82a3af5be6e4fdc5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 26 Oct 2023 17:42:10 +1100
Subject: [PATCH 0491/3129] teensy: Remove the teensy port.

This port is largely unmaintained, has limited features (the only hardware
support is for GPIO and timer, and no machine module), only supports a
small number of Teensy boards, and can be confused with the mimxrt support
for Teensy 4.x.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_teensy.yml |   28 -
 LICENSE                            |    2 -
 README.md                          |    1 -
 ports/teensy/Makefile              |  237 ---
 ports/teensy/README.md             |   72 -
 ports/teensy/add-memzip.sh         |   27 -
 ports/teensy/core/Arduino.h        |    3 -
 ports/teensy/core/HardwareSerial.h |  227 ---
 ports/teensy/core/analog.c         |  463 ------
 ports/teensy/core/avr_functions.h  |  107 --
 ports/teensy/core/core_pins.h      |  841 ----------
 ports/teensy/core/mk20dx128.c      |  662 --------
 ports/teensy/core/mk20dx128.h      | 2385 ----------------------------
 ports/teensy/core/pins_arduino.h   |  113 --
 ports/teensy/core/pins_teensy.c    |  817 ----------
 ports/teensy/core/usb_desc.c       |  895 -----------
 ports/teensy/core/usb_desc.h       |  313 ----
 ports/teensy/core/usb_dev.c        |  980 ------------
 ports/teensy/core/usb_dev.h        |  108 --
 ports/teensy/core/usb_mem.c        |  109 --
 ports/teensy/core/usb_mem.h        |   55 -
 ports/teensy/core/usb_names.h      |   57 -
 ports/teensy/core/usb_serial.c     |  273 ----
 ports/teensy/core/usb_serial.h     |  144 --
 ports/teensy/core/yield.c          |   32 -
 ports/teensy/hal_ftm.c             |  201 ---
 ports/teensy/hal_ftm.h             |  186 ---
 ports/teensy/hal_gpio.c            |  115 --
 ports/teensy/help.c                |   69 -
 ports/teensy/lcd.c                 |   14 -
 ports/teensy/led.c                 |  144 --
 ports/teensy/led.h                 |   14 -
 ports/teensy/lexerfrozen.c         |   14 -
 ports/teensy/lexermemzip.h         |    6 -
 ports/teensy/main.c                |  386 -----
 ports/teensy/make-pins.py          |  429 -----
 ports/teensy/manifest.py           |    1 -
 ports/teensy/memzip_files/boot.py  |   15 -
 ports/teensy/memzip_files/main.py  |   13 -
 ports/teensy/mk20dx256.ld          |  176 --
 ports/teensy/mk20dx256_af.csv      |   65 -
 ports/teensy/mk20dx256_prefix.c    |   33 -
 ports/teensy/modpyb.c              |  364 -----
 ports/teensy/mpconfigport.h        |  118 --
 ports/teensy/pin_defs_teensy.c     |   71 -
 ports/teensy/pin_defs_teensy.h     |   43 -
 ports/teensy/qstrdefsport.h        |    2 -
 ports/teensy/reg.c                 |   47 -
 ports/teensy/reg.h                 |   13 -
 ports/teensy/servo.c               |  264 ---
 ports/teensy/servo.h               |   11 -
 ports/teensy/std.h                 |   25 -
 ports/teensy/teensy_hal.c          |   86 -
 ports/teensy/teensy_hal.h          |  128 --
 ports/teensy/teensy_pins.csv       |   56 -
 ports/teensy/timer.c               | 1003 ------------
 ports/teensy/timer.h               |   34 -
 ports/teensy/uart.c                |  493 ------
 ports/teensy/uart.h                |   16 -
 ports/teensy/usb.c                 |   46 -
 ports/teensy/usb.h                 |   12 -
 tools/ci.sh                        |   13 -
 tools/codeformat.py                |    2 -
 63 files changed, 13679 deletions(-)
 delete mode 100644 .github/workflows/ports_teensy.yml
 delete mode 100644 ports/teensy/Makefile
 delete mode 100644 ports/teensy/README.md
 delete mode 100755 ports/teensy/add-memzip.sh
 delete mode 100644 ports/teensy/core/Arduino.h
 delete mode 100644 ports/teensy/core/HardwareSerial.h
 delete mode 100644 ports/teensy/core/analog.c
 delete mode 100644 ports/teensy/core/avr_functions.h
 delete mode 100644 ports/teensy/core/core_pins.h
 delete mode 100644 ports/teensy/core/mk20dx128.c
 delete mode 100644 ports/teensy/core/mk20dx128.h
 delete mode 100644 ports/teensy/core/pins_arduino.h
 delete mode 100644 ports/teensy/core/pins_teensy.c
 delete mode 100644 ports/teensy/core/usb_desc.c
 delete mode 100644 ports/teensy/core/usb_desc.h
 delete mode 100644 ports/teensy/core/usb_dev.c
 delete mode 100644 ports/teensy/core/usb_dev.h
 delete mode 100644 ports/teensy/core/usb_mem.c
 delete mode 100644 ports/teensy/core/usb_mem.h
 delete mode 100644 ports/teensy/core/usb_names.h
 delete mode 100644 ports/teensy/core/usb_serial.c
 delete mode 100644 ports/teensy/core/usb_serial.h
 delete mode 100644 ports/teensy/core/yield.c
 delete mode 100644 ports/teensy/hal_ftm.c
 delete mode 100644 ports/teensy/hal_ftm.h
 delete mode 100644 ports/teensy/hal_gpio.c
 delete mode 100644 ports/teensy/help.c
 delete mode 100644 ports/teensy/lcd.c
 delete mode 100644 ports/teensy/led.c
 delete mode 100644 ports/teensy/led.h
 delete mode 100644 ports/teensy/lexerfrozen.c
 delete mode 100644 ports/teensy/lexermemzip.h
 delete mode 100644 ports/teensy/main.c
 delete mode 100755 ports/teensy/make-pins.py
 delete mode 100644 ports/teensy/manifest.py
 delete mode 100644 ports/teensy/memzip_files/boot.py
 delete mode 100644 ports/teensy/memzip_files/main.py
 delete mode 100644 ports/teensy/mk20dx256.ld
 delete mode 100644 ports/teensy/mk20dx256_af.csv
 delete mode 100644 ports/teensy/mk20dx256_prefix.c
 delete mode 100644 ports/teensy/modpyb.c
 delete mode 100644 ports/teensy/mpconfigport.h
 delete mode 100644 ports/teensy/pin_defs_teensy.c
 delete mode 100644 ports/teensy/pin_defs_teensy.h
 delete mode 100644 ports/teensy/qstrdefsport.h
 delete mode 100644 ports/teensy/reg.c
 delete mode 100644 ports/teensy/reg.h
 delete mode 100644 ports/teensy/servo.c
 delete mode 100644 ports/teensy/servo.h
 delete mode 100644 ports/teensy/std.h
 delete mode 100644 ports/teensy/teensy_hal.c
 delete mode 100644 ports/teensy/teensy_hal.h
 delete mode 100644 ports/teensy/teensy_pins.csv
 delete mode 100644 ports/teensy/timer.c
 delete mode 100644 ports/teensy/timer.h
 delete mode 100644 ports/teensy/uart.c
 delete mode 100644 ports/teensy/uart.h
 delete mode 100644 ports/teensy/usb.c
 delete mode 100644 ports/teensy/usb.h

diff --git a/.github/workflows/ports_teensy.yml b/.github/workflows/ports_teensy.yml
deleted file mode 100644
index 291c8e303cd8f..0000000000000
--- a/.github/workflows/ports_teensy.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: teensy port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'shared/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/teensy/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install packages
-      run: source tools/ci.sh && ci_teensy_setup
-    - name: Build
-      run: source tools/ci.sh && ci_teensy_build
diff --git a/LICENSE b/LICENSE
index 07c88b0a03231..9bd457b42acea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -78,8 +78,6 @@ used during the build process and is not part of the compiled source code.
                 /*/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
diff --git a/README.md b/README.md
index e6c0a09b8b557..f5bc6d78f0a40 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,6 @@ In addition, the following ports are provided in this repository:
  - [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.
 
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
deleted file mode 100644
index 8f55e4bcba618..0000000000000
--- a/ports/teensy/Makefile
+++ /dev/null
@@ -1,237 +0,0 @@
-include ../../py/mkenv.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h $(GEN_PINS_QSTR)
-
-# 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
-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
-ifeq ($(USE_ARDUINO_TOOLCHAIN),)
-USE_ARDUINO_TOOLCHAIN = 0
-endif
-
-ifeq ($(USE_ARDUINO_TOOLCHAIN),1)
-ifeq ($(ARDUINO),)
-$(error USE_ARDUINO_TOOLCHAIN requires that ARDUINO be set)
-endif
-endif
-
-ifeq ($(USE_ARDUINO_TOOLCHAIN),1)
-$(info Using ARDUINO toolchain)
-CROSS_COMPILE ?= $(ARDUINO)/hardware/tools/arm-none-eabi/bin/arm-none-eabi-
-else
-$(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)
-
-INC += -I.
-INC += -I$(TOP)
-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
-
-ifeq ($(USE_ARDUINO_TOOLCHAIN),1)
-
-LIBGCC_FILE_NAME = $(ARDUINO)/hardware/tools/arm-none-eabi/lib/gcc/arm-none-eabi/4.7.2/thumb2/libgcc.a
-LIBM_FILE_NAME   = $(ARDUINO)/hardware/tools/arm-none-eabi/arm-none-eabi/lib/thumb2/libm.a
-LIBC_FILE_NAME   = $(ARDUINO)/hardware/tools/arm-none-eabi/arm-none-eabi/lib/thumb2/libc.a
-
-else
-
-LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
-LIBM_FILE_NAME   = $(shell $(CC) $(CFLAGS) -print-file-name=libm.a)
-LIBC_FILE_NAME   = $(shell $(CC) $(CFLAGS) -print-file-name=libc.a)
-
-endif
-
-#$(info %%%%% LIBGCC_FILE_NAME = $(LIBGCC_FILE_NAME))
-#$(info %%%%% LIBM_FILE_NAME = $(LIBM_FILE_NAME))
-#$(info %%%%% LIBC_FILE_NAME = $(LIBC_FILE_NAME))
-
-#$(info %%%%% dirname LIBGCC_FILE_NAME = $(dir $(LIBGCC_FILE_NAME)))
-#$(info %%%%% dirname LIBM_FILE_NAME = $(dir $(LIBM_FILE_NAME)))
-#$(info %%%%% dirname LIBC_FILE_NAME = $(dir $(LIBC_FILE_NAME)))
-
-LIBS  = -L $(dir $(LIBM_FILE_NAME)) -lm
-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
-else
-CFLAGS += -Os #-DNDEBUG
-endif
-CFLAGS += -fdata-sections -ffunction-sections
-LDFLAGS += -Wl,--gc-sections
-
-SRC_C += \
-	hal_ftm.c \
-	hal_gpio.c \
-	help.c \
-	main.c \
-	lcd.c \
-	led.c \
-	modpyb.c \
-	pin_defs_teensy.c \
-	reg.c \
-	teensy_hal.c \
-	timer.c \
-	uart.c \
-	usb.c \
-
-STM_SRC_C = $(addprefix ports/stm32/,\
-	irq.c \
-	pin.c \
-	pin_named_pins.c \
-	)
-
-SHARED_SRC_C = $(addprefix shared/,\
-	libc/string0.c \
-	readline/readline.c \
-	runtime/gchelper_native.c \
-	runtime/pyexec.c \
-	runtime/sys_stdio_mphal.c \
-	)
-
-SRC_TEENSY = $(addprefix core/,\
-	mk20dx128.c \
-	pins_teensy.c \
-	analog.c \
-	usb_desc.c \
-	usb_dev.c \
-	usb_mem.c \
-	usb_serial.c \
-	yield.c \
-	)
-
-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_thumb2.o
-OBJ += $(GEN_PINS_SRC:.c=.o)
-
-all: hex
-hex: $(BUILD)/micropython.hex
-
-ifeq ($(ARDUINO),)
-post_compile: $(BUILD)/micropython.hex
-	$(ECHO) "Please define ARDUINO (where TeensyDuino is installed)"
-	exit 1
-
-reboot:
-	$(ECHO) "Please define ARDUINO (where TeensyDuino is installed)"
-	exit 1
-
-else
-TOOLS_PATH = $(ARDUINO)/hardware/tools
-
-post_compile: $(BUILD)/micropython.hex
-	$(ECHO) "Preparing $@ for upload"
-	$(Q)$(TOOLS_PATH)/teensy_post_compile -file="$(basename $(<F))" -path="$(abspath $(<D))" -tools="$(TOOLS_PATH)"
-
-reboot:
-	$(ECHO) "REBOOT"
-	-$(Q)$(TOOLS_PATH)/teensy_reboot
-endif
-
-.PHONY: deploy
-deploy: post_compile reboot
-
-$(BUILD)/micropython.elf: $(OBJ)
-	$(ECHO) "LINK $@"
-	$(Q)$(CC) $(LDFLAGS) -o "$@" -Wl,-Map,$(@:.elf=.map) $^ $(LIBS)
-	$(Q)$(SIZE) $@
-
-$(BUILD)/%.hex: $(BUILD)/%.elf
-	$(ECHO) "HEX $<"
-	$(Q)$(OBJCOPY) -O ihex -R .eeprom "$<" "$@"
-
-# 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
-# SRC_QSTR
-SRC_QSTR_AUTO_DEPS +=
-
-# 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): | $(HEADER_BUILD)/pins.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
-$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qstr.h: teensy_%.csv $(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) --qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
-
-$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
-	$(call compile_c)
-
-$(BUILD)/%.pp: $(BUILD)/%.c
-	$(ECHO) "PreProcess $<"
-	$(Q)$(CC) $(CFLAGS) -E -Wp,-C,-dD,-dI -o $@ $<
-
-include $(TOP)/py/mkrules.mk
diff --git a/ports/teensy/README.md b/ports/teensy/README.md
deleted file mode 100644
index dacc463ccdcd5..0000000000000
--- a/ports/teensy/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Build Instructions for Teensy 3.1
-
-Currently the Teensy 3.1 port of MicroPython builds under Linux and not under Windows.
-
-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 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
-downloader included with TeensyDuino. The following assumes that you have
-TeensyDuino installed and set the ARDUINO environment variable pointing to the
-where Arduino with TeensyDuino is installed.
-
-```bash
-cd teensy
-ARDUINO=~/arduino-1.0.5 make
-```
-
-To upload MicroPython to the Teensy 3.1.
-
-Press the Program button on the Teensy 3.1
-```bash
-sudo ARDUINO=~/arduino-1.0.5/ make deploy
-```
-
-Currently, the Python prompt is through the USB serial interface, i.e.
-
-```bash
-minicom -D /dev/ttyACM0
-```
-
-## TIPS
-
-### Install 49-teensy.rules into /etc/udev/rules.d
-If you install the 49-teensy.rules file from http://www.pjrc.com/teensy/49-teensy.rules
-into your ```/etc/udev/rules.d``` folder then you won't need to use sudo:
-```bash
-sudo cp ~/Downloads/49-teensy.rules /etc/udev/rules.d
-sudo udevadm control --reload-rules
-```
-Unplug and replug the teensy board, and then you can use: ```ARDUINO=~/arduino-1.0.5/ make deploy```
-
-### Create a GNUmakefile to hold your ARDUINO setting.
-Create a file call GNUmakefile (note the lowercase m) in the teensy folder
-with the following contents:
-```make
-$(info Executing GNUmakefile)
-
-ARDUINO=${HOME}/arduino-1.0.5
-$(info ARDUINO=${ARDUINO})
-
-include Makefile
-```
-GNUmakefile is not checked into the source code control system, so it will
-retain your settings when updating your source tree. You can also add
-additional Makefile customizations this way.
-
-### Tips for OSX
-
-Set the ARDUINO environment variable to the location where Arduino with TeensyDuino is installed.
-```bash
-export ARDUINO=~/Downloads/Arduino.app/Contents/Java/
-```
-
-Search /dev/ for USB port name, which will be cu.usbmodem followed by a few numbers. The name of the port maybe different depending on the version of OSX.
-To access the Python prompt type: 
-
-```bash
-screen <devicename> 115200
-```
diff --git a/ports/teensy/add-memzip.sh b/ports/teensy/add-memzip.sh
deleted file mode 100755
index a00489effd77c..0000000000000
--- a/ports/teensy/add-memzip.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-if [ "$#" != 3 ]; then
-    echo "Usage: add-memzip.sh input.hex output.hex file-directory"
-    exit 1
-fi
-
-#set -x
-
-input_hex=$1
-output_hex=$2
-memzip_src_dir=$3
-
-input_bin=${input_hex}.bin
-output_bin=${output_hex}.bin
-zip_file=${output_hex}.zip
-zip_base=$(basename ${zip_file})
-zip_dir=$(dirname ${zip_file})
-abs_zip_dir=$(realpath ${zip_dir})
-
-rm -f ${zip_file}
-(cd ${memzip_src_dir}; zip -0 -r -D ${abs_zip_dir}/${zip_base} .)
-objcopy -I ihex -O binary ${input_hex} ${input_bin}
-cat ${input_bin} ${zip_file} > ${output_bin}
-objcopy -I binary -O ihex ${output_bin} ${output_hex}
-echo "Added ${memzip_src_dir} to ${input_hex} creating ${output_hex}"
-
diff --git a/ports/teensy/core/Arduino.h b/ports/teensy/core/Arduino.h
deleted file mode 100644
index 1b053f050734f..0000000000000
--- a/ports/teensy/core/Arduino.h
+++ /dev/null
@@ -1,3 +0,0 @@
-//#include "WProgram.h"
-#include "core_pins.h"
-#include "pins_arduino.h"
diff --git a/ports/teensy/core/HardwareSerial.h b/ports/teensy/core/HardwareSerial.h
deleted file mode 100644
index 439e0f7364f07..0000000000000
--- a/ports/teensy/core/HardwareSerial.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 HardwareSerial_h
-#define HardwareSerial_h
-
-#include "mk20dx128.h"
-#include <inttypes.h>
-
-// uncomment to enable 9 bit formats
-//#define SERIAL_9BIT_SUPPORT
-
-
-#define SERIAL_7E1 0x02
-#define SERIAL_7O1 0x03
-#define SERIAL_8N1 0x00
-#define SERIAL_8N2 0x04
-#define SERIAL_8E1 0x06
-#define SERIAL_8O1 0x07
-#define SERIAL_7E1_RXINV 0x12
-#define SERIAL_7O1_RXINV 0x13
-#define SERIAL_8N1_RXINV 0x10
-#define SERIAL_8N2_RXINV 0x14
-#define SERIAL_8E1_RXINV 0x16
-#define SERIAL_8O1_RXINV 0x17
-#define SERIAL_7E1_TXINV 0x22
-#define SERIAL_7O1_TXINV 0x23
-#define SERIAL_8N1_TXINV 0x20
-#define SERIAL_8N2_TXINV 0x24
-#define SERIAL_8E1_TXINV 0x26
-#define SERIAL_8O1_TXINV 0x27
-#define SERIAL_7E1_RXINV_TXINV 0x32
-#define SERIAL_7O1_RXINV_TXINV 0x33
-#define SERIAL_8N1_RXINV_TXINV 0x30
-#define SERIAL_8N2_RXINV_TXINV 0x34
-#define SERIAL_8E1_RXINV_TXINV 0x36
-#define SERIAL_8O1_RXINV_TXINV 0x37
-#ifdef SERIAL_9BIT_SUPPORT
-#define SERIAL_9N1 0x84
-#define SERIAL_9E1 0x8E
-#define SERIAL_9O1 0x8F
-#define SERIAL_9N1_RXINV 0x94
-#define SERIAL_9E1_RXINV 0x9E
-#define SERIAL_9O1_RXINV 0x9F
-#define SERIAL_9N1_TXINV 0xA4
-#define SERIAL_9E1_TXINV 0xAE
-#define SERIAL_9O1_TXINV 0xAF
-#define SERIAL_9N1_RXINV_TXINV 0xB4
-#define SERIAL_9E1_RXINV_TXINV 0xBE
-#define SERIAL_9O1_RXINV_TXINV 0xBF
-#endif
-// bit0: parity, 0=even, 1=odd
-// bit1: parity, 0=disable, 1=enable
-// bit2: mode, 1=9bit, 0=8bit
-// bit3: mode10: 1=10bit, 0=8bit
-// bit4: rxinv, 0=normal, 1=inverted
-// bit5: txinv, 0=normal, 1=inverted
-// bit6: unused
-// bit7: actual data goes into 9th bit
-
-
-#define BAUD2DIV(baud)  (((F_CPU * 2) + ((baud) >> 1)) / (baud))
-#define BAUD2DIV3(baud) (((F_BUS * 2) + ((baud) >> 1)) / (baud))
-
-// C language implementation
-//
-#ifdef __cplusplus
-extern "C" {
-#endif
-void serial_begin(uint32_t divisor);
-void serial_format(uint32_t format);
-void serial_end(void);
-void serial_set_transmit_pin(uint8_t pin);
-void serial_putchar(uint32_t c);
-void serial_write(const void *buf, unsigned int count);
-void serial_flush(void);
-int serial_available(void);
-int serial_getchar(void);
-int serial_peek(void);
-void serial_clear(void);
-void serial_print(const char *p);
-void serial_phex(uint32_t n);
-void serial_phex16(uint32_t n);
-void serial_phex32(uint32_t n);
-
-void serial2_begin(uint32_t divisor);
-void serial2_format(uint32_t format);
-void serial2_end(void);
-void serial2_putchar(uint32_t c);
-void serial2_write(const void *buf, unsigned int count);
-void serial2_flush(void);
-int serial2_available(void);
-int serial2_getchar(void);
-int serial2_peek(void);
-void serial2_clear(void);
-
-void serial3_begin(uint32_t divisor);
-void serial3_format(uint32_t format);
-void serial3_end(void);
-void serial3_putchar(uint32_t c);
-void serial3_write(const void *buf, unsigned int count);
-void serial3_flush(void);
-int serial3_available(void);
-int serial3_getchar(void);
-int serial3_peek(void);
-void serial3_clear(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-// C++ interface
-//
-#ifdef __cplusplus
-#include "Stream.h"
-class HardwareSerial : public Stream
-{
-public:
-	virtual void begin(uint32_t baud) { serial_begin(BAUD2DIV(baud)); }
-	virtual void begin(uint32_t baud, uint32_t format) {
-					  serial_begin(BAUD2DIV(baud));
-					  serial_format(format); }
-	virtual void end(void)		{ serial_end(); }
-	virtual void transmitterEnable(uint8_t pin) { serial_set_transmit_pin(pin); }
-	virtual int available(void)     { return serial_available(); }
-	virtual int peek(void)          { return serial_peek(); }
-	virtual int read(void)          { return serial_getchar(); }
-	virtual void flush(void)        { serial_flush(); }
-	virtual void clear(void)	{ serial_clear(); }
-	virtual size_t write(uint8_t c) { serial_putchar(c); return 1; }
-	virtual size_t write(unsigned long n)   { return write((uint8_t)n); }
-	virtual size_t write(long n)            { return write((uint8_t)n); }
-	virtual size_t write(unsigned int n)    { return write((uint8_t)n); }
-	virtual size_t write(int n)             { return write((uint8_t)n); }
-	virtual size_t write(const uint8_t *buffer, size_t size)
-					{ serial_write(buffer, size); return size; }
-        virtual size_t write(const char *str)	{ size_t len = strlen(str);
-					  serial_write((const uint8_t *)str, len);
-					  return len; }
-	virtual size_t write9bit(uint32_t c)	{ serial_putchar(c); return 1; }
-};
-extern HardwareSerial Serial1;
-
-class HardwareSerial2 : public HardwareSerial
-{
-public:
-	virtual void begin(uint32_t baud) { serial2_begin(BAUD2DIV(baud)); }
-	virtual void begin(uint32_t baud, uint32_t format) {
-					  serial2_begin(BAUD2DIV(baud));
-					  serial2_format(format); }
-	virtual void end(void)		{ serial2_end(); }
-	virtual int available(void)     { return serial2_available(); }
-	virtual int peek(void)          { return serial2_peek(); }
-	virtual int read(void)          { return serial2_getchar(); }
-	virtual void flush(void)        { serial2_flush(); }
-	virtual void clear(void)	{ serial2_clear(); }
-	virtual size_t write(uint8_t c) { serial2_putchar(c); return 1; }
-	virtual size_t write(unsigned long n)   { return write((uint8_t)n); }
-	virtual size_t write(long n)            { return write((uint8_t)n); }
-	virtual size_t write(unsigned int n)    { return write((uint8_t)n); }
-	virtual size_t write(int n)             { return write((uint8_t)n); }
-	virtual size_t write(const uint8_t *buffer, size_t size)
-					{ serial2_write(buffer, size); return size; }
-        virtual size_t write(const char *str)	{ size_t len = strlen(str);
-					  serial2_write((const uint8_t *)str, len);
-					  return len; }
-	virtual size_t write9bit(uint32_t c)	{ serial2_putchar(c); return 1; }
-};
-extern HardwareSerial2 Serial2;
-
-class HardwareSerial3 : public HardwareSerial
-{
-public:
-	virtual void begin(uint32_t baud) { serial3_begin(BAUD2DIV3(baud)); }
-	virtual void begin(uint32_t baud, uint32_t format) {
-					  serial3_begin(BAUD2DIV3(baud));
-					  serial3_format(format); }
-	virtual void end(void)          { serial3_end(); }
-	virtual int available(void)     { return serial3_available(); }
-	virtual int peek(void)          { return serial3_peek(); }
-	virtual int read(void)          { return serial3_getchar(); }
-	virtual void flush(void)        { serial3_flush(); }
-	virtual void clear(void)	{ serial3_clear(); }
-	virtual size_t write(uint8_t c) { serial3_putchar(c); return 1; }
-	virtual size_t write(unsigned long n)   { return write((uint8_t)n); }
-	virtual size_t write(long n)            { return write((uint8_t)n); }
-	virtual size_t write(unsigned int n)    { return write((uint8_t)n); }
-	virtual size_t write(int n)             { return write((uint8_t)n); }
-	virtual size_t write(const uint8_t *buffer, size_t size)
-					{ serial3_write(buffer, size); return size; }
-        virtual size_t write(const char *str)	{ size_t len = strlen(str);
-					  serial3_write((const uint8_t *)str, len);
-					  return len; }
-	virtual size_t write9bit(uint32_t c)	{ serial3_putchar(c); return 1; }
-};
-extern HardwareSerial3 Serial3;
-
-#endif
-#endif
diff --git a/ports/teensy/core/analog.c b/ports/teensy/core/analog.c
deleted file mode 100644
index f408ec9f12c8e..0000000000000
--- a/ports/teensy/core/analog.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be 
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows 
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 "core_pins.h"
-//#include "HardwareSerial.h"
-
-static uint8_t calibrating;
-static uint8_t analog_right_shift = 0;
-static uint8_t analog_config_bits = 10;
-static uint8_t analog_num_average = 4;
-static uint8_t analog_reference_internal = 0;
-
-// the alternate clock is connected to OSCERCLK (16 MHz).
-// datasheet says ADC clock should be 2 to 12 MHz for 16 bit mode
-// datasheet says ADC clock should be 1 to 18 MHz for 8-12 bit mode
-
-#if F_BUS == 60000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(2) + ADC_CFG1_ADICLK(1) // 7.5 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 15 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 15 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 15 MHz
-#elif F_BUS == 56000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(2) + ADC_CFG1_ADICLK(1) // 7 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 14 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 14 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 14 MHz
-#elif F_BUS == 48000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 12 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 12 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 12 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(1) // 24 MHz
-#elif F_BUS == 40000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 10 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 10 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 10 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(1) // 20 MHz
-#elif F_BUS == 36000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1) // 9 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(1) // 18 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(1) // 18 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(1) // 18 MHz
-#elif F_BUS == 24000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(0) // 12 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(0) // 12 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(0) // 12 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 24 MHz
-#elif F_BUS == 16000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 8 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 8 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 8 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 16 MHz
-#elif F_BUS == 8000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 8 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 8 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 8 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 8 MHz
-#elif F_BUS == 4000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 4 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 4 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 4 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 4 MHz
-#elif F_BUS == 2000000
-  #define ADC_CFG1_16BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 2 MHz
-  #define ADC_CFG1_12BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 2 MHz
-  #define ADC_CFG1_10BIT  ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 2 MHz
-  #define ADC_CFG1_8BIT   ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(0) // 2 MHz
-#else
-#error "F_BUS must be 60, 56, 48, 40, 36, 24, 4 or 2 MHz"
-#endif
-
-void analog_init(void)
-{
-	uint32_t num;
-
-	VREF_TRM = 0x60;
-	VREF_SC = 0xE1;		// enable 1.2 volt ref
-
-	if (analog_config_bits == 8) {
-		ADC0_CFG1 = ADC_CFG1_8BIT + ADC_CFG1_MODE(0);
-		ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(3);
-		#if defined(__MK20DX256__)
-		ADC1_CFG1 = ADC_CFG1_8BIT + ADC_CFG1_MODE(0);
-		ADC1_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(3);
-		#endif
-	} else if (analog_config_bits == 10) {
-		ADC0_CFG1 = ADC_CFG1_10BIT + ADC_CFG1_MODE(2) + ADC_CFG1_ADLSMP;
-		ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(3);
-		#if defined(__MK20DX256__)
-		ADC1_CFG1 = ADC_CFG1_10BIT + ADC_CFG1_MODE(2) + ADC_CFG1_ADLSMP;
-		ADC1_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(3);
-		#endif
-	} else if (analog_config_bits == 12) {
-		ADC0_CFG1 = ADC_CFG1_12BIT + ADC_CFG1_MODE(1) + ADC_CFG1_ADLSMP;
-		ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(2);
-		#if defined(__MK20DX256__)
-		ADC1_CFG1 = ADC_CFG1_12BIT + ADC_CFG1_MODE(1) + ADC_CFG1_ADLSMP;
-		ADC1_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(2);
-		#endif
-	} else {
-		ADC0_CFG1 = ADC_CFG1_16BIT + ADC_CFG1_MODE(3) + ADC_CFG1_ADLSMP;
-		ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(2);
-		#if defined(__MK20DX256__)
-		ADC1_CFG1 = ADC_CFG1_16BIT + ADC_CFG1_MODE(3) + ADC_CFG1_ADLSMP;
-		ADC1_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(2);
-		#endif
-	}
-
-	if (analog_reference_internal) {
-		ADC0_SC2 = ADC_SC2_REFSEL(1); // 1.2V ref
-		#if defined(__MK20DX256__)
-		ADC1_SC2 = ADC_SC2_REFSEL(1); // 1.2V ref
-		#endif
-	} else {
-		ADC0_SC2 = ADC_SC2_REFSEL(0); // vcc/ext ref
-		#if defined(__MK20DX256__)
-		ADC1_SC2 = ADC_SC2_REFSEL(0); // vcc/ext ref
-		#endif
-	}
-
-	num = analog_num_average;
-	if (num <= 1) {
-		ADC0_SC3 = ADC_SC3_CAL;  // begin cal
-		#if defined(__MK20DX256__)
-		ADC1_SC3 = ADC_SC3_CAL;  // begin cal
-		#endif
-	} else if (num <= 4) {
-		ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(0);
-		#if defined(__MK20DX256__)
-		ADC1_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(0);
-		#endif
-	} else if (num <= 8) {
-		ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(1);
-		#if defined(__MK20DX256__)
-		ADC1_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(1);
-		#endif
-	} else if (num <= 16) {
-		ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(2);
-		#if defined(__MK20DX256__)
-		ADC1_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(2);
-		#endif
-	} else {
-		ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(3);
-		#if defined(__MK20DX256__)
-		ADC1_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(3);
-		#endif
-	}
-	calibrating = 1;
-}
-
-static void wait_for_cal(void)
-{
-	uint16_t sum;
-
-	//serial_print("wait_for_cal\n");
-#if defined(__MK20DX128__)
-	while (ADC0_SC3 & ADC_SC3_CAL) {
-		// wait
-	}
-#elif defined(__MK20DX256__)
-	while ((ADC0_SC3 & ADC_SC3_CAL) || (ADC1_SC3 & ADC_SC3_CAL)) {
-		// wait
-	}
-#endif
-	__disable_irq();
-	if (calibrating) {
-		//serial_print("\n");
-		sum = ADC0_CLPS + ADC0_CLP4 + ADC0_CLP3 + ADC0_CLP2 + ADC0_CLP1 + ADC0_CLP0;
-		sum = (sum / 2) | 0x8000;
-		ADC0_PG = sum;
-		//serial_print("ADC0_PG = ");
-		//serial_phex16(sum);
-		//serial_print("\n");
-		sum = ADC0_CLMS + ADC0_CLM4 + ADC0_CLM3 + ADC0_CLM2 + ADC0_CLM1 + ADC0_CLM0;
-		sum = (sum / 2) | 0x8000;
-		ADC0_MG = sum;
-		//serial_print("ADC0_MG = ");
-		//serial_phex16(sum);
-		//serial_print("\n");
-#if defined(__MK20DX256__)
-		sum = ADC1_CLPS + ADC1_CLP4 + ADC1_CLP3 + ADC1_CLP2 + ADC1_CLP1 + ADC1_CLP0;
-		sum = (sum / 2) | 0x8000;
-		ADC1_PG = sum;
-		sum = ADC1_CLMS + ADC1_CLM4 + ADC1_CLM3 + ADC1_CLM2 + ADC1_CLM1 + ADC1_CLM0;
-		sum = (sum / 2) | 0x8000;
-		ADC1_MG = sum;
-#endif
-		calibrating = 0;
-	}
-	__enable_irq();
-}
-
-// ADCx_SC2[REFSEL] bit selects the voltage reference sources for ADC.
-//   VREFH/VREFL - connected as the primary reference option
-//   1.2 V VREF_OUT - connected as the VALT reference option
-
-
-#define DEFAULT         0
-#define INTERNAL        2
-#define INTERNAL1V2     2
-#define INTERNAL1V1     2
-#define EXTERNAL        0
-
-void analogReference(uint8_t type)
-{
-	if (type) {
-		// internal reference requested
-		if (!analog_reference_internal) {
-			analog_reference_internal = 1;
-			if (calibrating) {
-				ADC0_SC3 = 0; // cancel cal
-#if defined(__MK20DX256__)
-				ADC1_SC3 = 0; // cancel cal
-#endif
-			}
-			analog_init();
-		}
-	} else {
-		// vcc or external reference requested
-		if (analog_reference_internal) {
-			analog_reference_internal = 0;
-			if (calibrating) {
-				ADC0_SC3 = 0; // cancel cal
-#if defined(__MK20DX256__)
-				ADC1_SC3 = 0; // cancel cal
-#endif
-			}
-			analog_init();
-		}
-	}
-}
-
-
-void analogReadRes(unsigned int bits)
-{
-	unsigned int config;
-
-	if (bits >= 13) {
-		if (bits > 16) bits = 16;
-		config = 16;
-	} else if (bits >= 11) {
-		config = 12;
-	} else if (bits >= 9) {
-		config = 10;
-	} else {
-		config = 8;
-	}
-	analog_right_shift = config - bits;
-	if (config != analog_config_bits) {
-		analog_config_bits = config;
-		if (calibrating) ADC0_SC3 = 0; // cancel cal
-		analog_init();
-	}
-}
-
-void analogReadAveraging(unsigned int num)
-{
-
-	if (calibrating) wait_for_cal();
-	if (num <= 1) {
-		num = 0;
-		ADC0_SC3 = 0;
-	} else if (num <= 4) {
-		num = 4;
-		ADC0_SC3 = ADC_SC3_AVGE + ADC_SC3_AVGS(0);
-	} else if (num <= 8) {
-		num = 8;
-		ADC0_SC3 = ADC_SC3_AVGE + ADC_SC3_AVGS(1);
-	} else if (num <= 16) {
-		num = 16;
-		ADC0_SC3 = ADC_SC3_AVGE + ADC_SC3_AVGS(2);
-	} else {
-		num = 32;
-		ADC0_SC3 = ADC_SC3_AVGE + ADC_SC3_AVGS(3);
-	}
-	analog_num_average = num;
-}
-
-// The SC1A register is used for both software and hardware trigger modes of operation.
-
-#if defined(__MK20DX128__)
-static const uint8_t channel2sc1a[] = {
-	5, 14, 8, 9, 13, 12, 6, 7, 15, 4,
-	0, 19, 3, 21, 26, 22, 23
-};
-#elif defined(__MK20DX256__)
-static const uint8_t channel2sc1a[] = {
-	5, 14, 8, 9, 13, 12, 6, 7, 15, 4,
-	0, 19, 3, 19+128, 26, 18+128, 23,
-	5+192, 5+128, 4+128, 6+128, 7+128, 4+192
-// A15  26   E1   ADC1_SE5a  5+64
-// A16  27   C9   ADC1_SE5b  5
-// A17  28   C8   ADC1_SE4b  4
-// A18  29   C10  ADC1_SE6b  6
-// A19  30   C11  ADC1_SE7b  7
-// A20  31   E0   ADC1_SE4a  4+64
-};
-#endif
-
-
-
-// TODO: perhaps this should store the NVIC priority, so it works recursively?
-static volatile uint8_t analogReadBusyADC0 = 0;
-#if defined(__MK20DX256__)
-static volatile uint8_t analogReadBusyADC1 = 0;
-#endif
-
-int analogRead(uint8_t pin)
-{
-	int result;
-	uint8_t index, channel;
-
-	//serial_phex(pin);
-	//serial_print(" ");
-
-	if (pin <= 13) {
-		index = pin;      // 0-13 refer to A0-A13
-	} else if (pin <= 23) {
-		index = pin - 14; // 14-23 are A0-A9
-#if defined(__MK20DX256__)
-	} else if (pin >= 26 && pin <= 31) {
-		index = pin - 9;  // 26-31 are A15-A20
-#endif
-	} else if (pin >= 34 && pin <= 40) {
-		index = pin - 24;  // 34-37 are A10-A13, 38 is temp sensor,
-			    // 39 is vref, 40 is unused (A14 on Teensy 3.1)
-	} else {
-		return 0;   // all others are invalid
-	}
-
-	//serial_phex(index);
-	//serial_print(" ");
-
-	channel = channel2sc1a[index];
-	//serial_phex(channel);
-	//serial_print(" ");
-
-	//serial_print("analogRead");
-	//return 0;
-	if (calibrating) wait_for_cal();
-	//pin = 5; // PTD1/SE5b, pin 14, analog 0
-
-#if defined(__MK20DX256__)
-	if (channel & 0x80) goto beginADC1;
-#endif
-
-	__disable_irq();
-startADC0:
-	//serial_print("startADC0\n");
-	ADC0_SC1A = channel;
-	analogReadBusyADC0 = 1;
-	__enable_irq();
-	while (1) {
-		__disable_irq();
-		if ((ADC0_SC1A & ADC_SC1_COCO)) {
-			result = ADC0_RA;
-			analogReadBusyADC0 = 0;
-			__enable_irq();
-			result >>= analog_right_shift;
-			return result;
-		}
-		// detect if analogRead was used from an interrupt
-		// if so, our analogRead got canceled, so it must
-		// be restarted.
-		if (!analogReadBusyADC0) goto startADC0;
-		__enable_irq();
-		yield();
-	}
-
-#if defined(__MK20DX256__)
-beginADC1:
-	__disable_irq();
-startADC1:
-	//serial_print("startADC0\n");
-	// ADC1_CFG2[MUXSEL] bit selects between ADCx_SEn channels a and b.
-	if (channel & 0x40) {
-		ADC1_CFG2 &= ~ADC_CFG2_MUXSEL;
-	} else {
-		ADC1_CFG2 |= ADC_CFG2_MUXSEL;
-	}
-	ADC1_SC1A = channel & 0x3F;
-	analogReadBusyADC1 = 1;
-	__enable_irq();
-	while (1) {
-		__disable_irq();
-		if ((ADC1_SC1A & ADC_SC1_COCO)) {
-			result = ADC1_RA;
-			analogReadBusyADC1 = 0;
-			__enable_irq();
-			result >>= analog_right_shift;
-			return result;
-		}
-		// detect if analogRead was used from an interrupt
-		// if so, our analogRead got canceled, so it must
-		// be restarted.
-		if (!analogReadBusyADC1) goto startADC1;
-		__enable_irq();
-		yield();
-	}
-#endif
-}
-
-
-
-void analogWriteDAC0(int val)
-{
-#if defined(__MK20DX256__)
-	SIM_SCGC2 |= SIM_SCGC2_DAC0;
-	if (analog_reference_internal) {
-		DAC0_C0 = DAC_C0_DACEN;  // 1.2V ref is DACREF_1
-	} else {
-		DAC0_C0 = DAC_C0_DACEN | DAC_C0_DACRFS; // 3.3V VDDA is DACREF_2
-	}
-	if (val < 0) val = 0;  // TODO: saturate instruction?
-	else if (val > 4095) val = 4095;
-	*(int16_t *)&(DAC0_DAT0L) = val;
-#endif
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ports/teensy/core/avr_functions.h b/ports/teensy/core/avr_functions.h
deleted file mode 100644
index fe99f26f3e538..0000000000000
--- a/ports/teensy/core/avr_functions.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 _avr_functions_h_
-#define _avr_functions_h_
-
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void eeprom_initialize(void);
-uint8_t eeprom_read_byte(const uint8_t *addr) __attribute__ ((pure));
-uint16_t eeprom_read_word(const uint16_t *addr) __attribute__ ((pure));
-uint32_t eeprom_read_dword(const uint32_t *addr) __attribute__ ((pure));
-void eeprom_read_block(void *buf, const void *addr, uint32_t len);
-void eeprom_write_byte(uint8_t *addr, uint8_t value);
-void eeprom_write_word(uint16_t *addr, uint16_t value);
-void eeprom_write_dword(uint32_t *addr, uint32_t value);
-void eeprom_write_block(const void *buf, void *addr, uint32_t len);
-int eeprom_is_ready(void);
-#define eeprom_busy_wait() do {} while (!eeprom_is_ready())
-
-static inline float eeprom_read_float(const float *addr) __attribute__((pure, always_inline, unused));
-static inline float eeprom_read_float(const float *addr)
-{
-	union {float f; uint32_t u32;} u;
-	u.u32 = eeprom_read_dword((const uint32_t *)addr);
-	return u.f;
-}
-static inline void eeprom_write_float(float *addr, float value) __attribute__((always_inline, unused));
-static inline void eeprom_write_float(float *addr, float value)
-{
-	union {float f; uint32_t u32;} u;
-	u.f = value;
-	eeprom_write_dword((uint32_t *)addr, u.u32);
-}
-static inline void eeprom_update_byte(uint8_t *addr, uint8_t value) __attribute__((always_inline, unused));
-static inline void eeprom_update_byte(uint8_t *addr, uint8_t value)
-{
-	eeprom_write_byte(addr, value);
-}
-static inline void eeprom_update_word(uint16_t *addr, uint16_t value) __attribute__((always_inline, unused));
-static inline void eeprom_update_word(uint16_t *addr, uint16_t value)
-{
-	eeprom_write_word(addr, value);
-}
-static inline void eeprom_update_dword(uint32_t *addr, uint32_t value) __attribute__((always_inline, unused));
-static inline void eeprom_update_dword(uint32_t *addr, uint32_t value)
-{
-	eeprom_write_dword(addr, value);
-}
-static inline void eeprom_update_float(float *addr, float value) __attribute__((always_inline, unused));
-static inline void eeprom_update_float(float *addr, float value)
-{
-	union {float f; uint32_t u32;} u;
-	u.f = value;
-	eeprom_write_dword((uint32_t *)addr, u.u32);
-}
-static inline void eeprom_update_block(const void *buf, void *addr, uint32_t len) __attribute__((always_inline, unused));
-static inline void eeprom_update_block(const void *buf, void *addr, uint32_t len)
-{
-	eeprom_write_block(buf, addr, len);
-}
-
-
-char * ultoa(unsigned long val, char *buf, int radix);
-char * ltoa(long val, char *buf, int radix);
-static inline char * utoa(unsigned int val, char *buf, int radix) __attribute__((always_inline, unused));
-static inline char * utoa(unsigned int val, char *buf, int radix) { return ultoa(val, buf, radix); }
-static inline char * itoa(int val, char *buf, int radix) __attribute__((always_inline, unused));
-static inline char * itoa(int val, char *buf, int radix) { return ltoa(val, buf, radix); }
-char * dtostrf(float val, int width, unsigned int precision, char *buf);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ports/teensy/core/core_pins.h b/ports/teensy/core/core_pins.h
deleted file mode 100644
index 169bf3c160937..0000000000000
--- a/ports/teensy/core/core_pins.h
+++ /dev/null
@@ -1,841 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 _core_pins_h_
-#define _core_pins_h_
-
-#include "mk20dx128.h"
-#include "pins_arduino.h"
-
-
-#define HIGH		1
-#define LOW		0
-#define INPUT		0
-#define OUTPUT		1
-#define INPUT_PULLUP	2
-#define LSBFIRST	0
-#define MSBFIRST	1
-#define _BV(n)		(1<<(n))
-#define CHANGE		4
-#define FALLING		2
-#define RISING		3
-
-// Pin				Arduino
-//  0	B16			RXD
-//  1	B17			TXD
-//  2	D0
-//  3	A12	FTM1_CH0
-//  4	A13	FTM1_CH1
-//  5	D7	FTM0_CH7	OC0B/T1
-//  6	D4	FTM0_CH4	OC0A
-//  7	D2
-//  8	D3			ICP1
-//  9	C3	FTM0_CH2	OC1A
-// 10	C4	FTM0_CH3	SS/OC1B
-// 11	C6			MOSI/OC2A
-// 12	C7			MISO
-// 13	C5			SCK
-// 14	D1
-// 15	C0
-// 16	B0	(FTM1_CH0)
-// 17	B1	(FTM1_CH1)
-// 18	B3			SDA
-// 19	B2			SCL
-// 20	D5	FTM0_CH5
-// 21	D6	FTM0_CH6
-// 22	C1	FTM0_CH0
-// 23	C2	FTM0_CH1
-// 24	A5	(FTM0_CH2)
-// 25	B19
-// 26	E1
-// 27	C9
-// 28	C8
-// 29	C10
-// 30	C11
-// 31	E0
-// 32	B18
-// 33	A4	(FTM0_CH1)
-// (34)	analog only
-// (35)	analog only
-// (36)	analog only
-// (37)	analog only
-
-// not available to user:
-//	A0	FTM0_CH5	SWD Clock
-//	A1	FTM0_CH6	USB ID
-//	A2	FTM0_CH7	SWD Trace
-//	A3	FTM0_CH0	SWD Data
-
-#define CORE_NUM_TOTAL_PINS     34
-#define CORE_NUM_DIGITAL        34
-#define CORE_NUM_INTERRUPT      34
-#if defined(__MK20DX128__)
-#define CORE_NUM_ANALOG         14
-#define CORE_NUM_PWM            10
-#elif defined(__MK20DX256__)
-#define CORE_NUM_ANALOG         21
-#define CORE_NUM_PWM            12
-#endif
-
-#define CORE_PIN0_BIT		16
-#define CORE_PIN1_BIT		17
-#define CORE_PIN2_BIT		0
-#define CORE_PIN3_BIT		12
-#define CORE_PIN4_BIT		13
-#define CORE_PIN5_BIT		7
-#define CORE_PIN6_BIT		4
-#define CORE_PIN7_BIT		2
-#define CORE_PIN8_BIT		3
-#define CORE_PIN9_BIT		3
-#define CORE_PIN10_BIT		4
-#define CORE_PIN11_BIT		6
-#define CORE_PIN12_BIT		7
-#define CORE_PIN13_BIT		5
-#define CORE_PIN14_BIT		1
-#define CORE_PIN15_BIT		0
-#define CORE_PIN16_BIT		0
-#define CORE_PIN17_BIT		1
-#define CORE_PIN18_BIT		3
-#define CORE_PIN19_BIT		2
-#define CORE_PIN20_BIT		5
-#define CORE_PIN21_BIT		6
-#define CORE_PIN22_BIT		1
-#define CORE_PIN23_BIT		2
-#define CORE_PIN24_BIT		5
-#define CORE_PIN25_BIT		19
-#define CORE_PIN26_BIT		1
-#define CORE_PIN27_BIT		9
-#define CORE_PIN28_BIT		8
-#define CORE_PIN29_BIT		10
-#define CORE_PIN30_BIT		11
-#define CORE_PIN31_BIT		0
-#define CORE_PIN32_BIT		18
-#define CORE_PIN33_BIT		4
-
-#define CORE_PIN0_BITMASK	(1<<(CORE_PIN0_BIT))
-#define CORE_PIN1_BITMASK	(1<<(CORE_PIN1_BIT))
-#define CORE_PIN2_BITMASK	(1<<(CORE_PIN2_BIT))
-#define CORE_PIN3_BITMASK	(1<<(CORE_PIN3_BIT))
-#define CORE_PIN4_BITMASK	(1<<(CORE_PIN4_BIT))
-#define CORE_PIN5_BITMASK	(1<<(CORE_PIN5_BIT))
-#define CORE_PIN6_BITMASK	(1<<(CORE_PIN6_BIT))
-#define CORE_PIN7_BITMASK	(1<<(CORE_PIN7_BIT))
-#define CORE_PIN8_BITMASK	(1<<(CORE_PIN8_BIT))
-#define CORE_PIN9_BITMASK	(1<<(CORE_PIN9_BIT))
-#define CORE_PIN10_BITMASK	(1<<(CORE_PIN10_BIT))
-#define CORE_PIN11_BITMASK	(1<<(CORE_PIN11_BIT))
-#define CORE_PIN12_BITMASK	(1<<(CORE_PIN12_BIT))
-#define CORE_PIN13_BITMASK	(1<<(CORE_PIN13_BIT))
-#define CORE_PIN14_BITMASK	(1<<(CORE_PIN14_BIT))
-#define CORE_PIN15_BITMASK	(1<<(CORE_PIN15_BIT))
-#define CORE_PIN16_BITMASK	(1<<(CORE_PIN16_BIT))
-#define CORE_PIN17_BITMASK	(1<<(CORE_PIN17_BIT))
-#define CORE_PIN18_BITMASK	(1<<(CORE_PIN18_BIT))
-#define CORE_PIN19_BITMASK	(1<<(CORE_PIN19_BIT))
-#define CORE_PIN20_BITMASK	(1<<(CORE_PIN20_BIT))
-#define CORE_PIN21_BITMASK	(1<<(CORE_PIN21_BIT))
-#define CORE_PIN22_BITMASK	(1<<(CORE_PIN22_BIT))
-#define CORE_PIN23_BITMASK	(1<<(CORE_PIN23_BIT))
-#define CORE_PIN24_BITMASK	(1<<(CORE_PIN24_BIT))
-#define CORE_PIN25_BITMASK	(1<<(CORE_PIN25_BIT))
-#define CORE_PIN26_BITMASK	(1<<(CORE_PIN26_BIT))
-#define CORE_PIN27_BITMASK	(1<<(CORE_PIN27_BIT))
-#define CORE_PIN28_BITMASK	(1<<(CORE_PIN28_BIT))
-#define CORE_PIN29_BITMASK	(1<<(CORE_PIN29_BIT))
-#define CORE_PIN30_BITMASK	(1<<(CORE_PIN30_BIT))
-#define CORE_PIN31_BITMASK	(1<<(CORE_PIN31_BIT))
-#define CORE_PIN32_BITMASK	(1<<(CORE_PIN32_BIT))
-#define CORE_PIN33_BITMASK	(1<<(CORE_PIN33_BIT))
-
-#define CORE_PIN0_PORTREG	GPIOB_PDOR
-#define CORE_PIN1_PORTREG	GPIOB_PDOR
-#define CORE_PIN2_PORTREG	GPIOD_PDOR
-#define CORE_PIN3_PORTREG	GPIOA_PDOR
-#define CORE_PIN4_PORTREG	GPIOA_PDOR
-#define CORE_PIN5_PORTREG	GPIOD_PDOR
-#define CORE_PIN6_PORTREG	GPIOD_PDOR
-#define CORE_PIN7_PORTREG	GPIOD_PDOR
-#define CORE_PIN8_PORTREG	GPIOD_PDOR
-#define CORE_PIN9_PORTREG	GPIOC_PDOR
-#define CORE_PIN10_PORTREG	GPIOC_PDOR
-#define CORE_PIN11_PORTREG	GPIOC_PDOR
-#define CORE_PIN12_PORTREG	GPIOC_PDOR
-#define CORE_PIN13_PORTREG	GPIOC_PDOR
-#define CORE_PIN14_PORTREG	GPIOD_PDOR
-#define CORE_PIN15_PORTREG	GPIOC_PDOR
-#define CORE_PIN16_PORTREG	GPIOB_PDOR
-#define CORE_PIN17_PORTREG	GPIOB_PDOR
-#define CORE_PIN18_PORTREG	GPIOB_PDOR
-#define CORE_PIN19_PORTREG	GPIOB_PDOR
-#define CORE_PIN20_PORTREG	GPIOD_PDOR
-#define CORE_PIN21_PORTREG	GPIOD_PDOR
-#define CORE_PIN22_PORTREG	GPIOC_PDOR
-#define CORE_PIN23_PORTREG	GPIOC_PDOR
-#define CORE_PIN24_PORTREG	GPIOA_PDOR
-#define CORE_PIN25_PORTREG	GPIOB_PDOR
-#define CORE_PIN26_PORTREG	GPIOE_PDOR
-#define CORE_PIN27_PORTREG	GPIOC_PDOR
-#define CORE_PIN28_PORTREG	GPIOC_PDOR
-#define CORE_PIN29_PORTREG	GPIOC_PDOR
-#define CORE_PIN30_PORTREG	GPIOC_PDOR
-#define CORE_PIN31_PORTREG	GPIOE_PDOR
-#define CORE_PIN32_PORTREG	GPIOB_PDOR
-#define CORE_PIN33_PORTREG	GPIOA_PDOR
-
-#define CORE_PIN0_PORTSET	GPIOB_PSOR
-#define CORE_PIN1_PORTSET	GPIOB_PSOR
-#define CORE_PIN2_PORTSET	GPIOD_PSOR
-#define CORE_PIN3_PORTSET	GPIOA_PSOR
-#define CORE_PIN4_PORTSET	GPIOA_PSOR
-#define CORE_PIN5_PORTSET	GPIOD_PSOR
-#define CORE_PIN6_PORTSET	GPIOD_PSOR
-#define CORE_PIN7_PORTSET	GPIOD_PSOR
-#define CORE_PIN8_PORTSET	GPIOD_PSOR
-#define CORE_PIN9_PORTSET	GPIOC_PSOR
-#define CORE_PIN10_PORTSET	GPIOC_PSOR
-#define CORE_PIN11_PORTSET	GPIOC_PSOR
-#define CORE_PIN12_PORTSET	GPIOC_PSOR
-#define CORE_PIN13_PORTSET	GPIOC_PSOR
-#define CORE_PIN14_PORTSET	GPIOD_PSOR
-#define CORE_PIN15_PORTSET	GPIOC_PSOR
-#define CORE_PIN16_PORTSET	GPIOB_PSOR
-#define CORE_PIN17_PORTSET	GPIOB_PSOR
-#define CORE_PIN18_PORTSET	GPIOB_PSOR
-#define CORE_PIN19_PORTSET	GPIOB_PSOR
-#define CORE_PIN20_PORTSET	GPIOD_PSOR
-#define CORE_PIN21_PORTSET	GPIOD_PSOR
-#define CORE_PIN22_PORTSET	GPIOC_PSOR
-#define CORE_PIN23_PORTSET	GPIOC_PSOR
-#define CORE_PIN24_PORTSET	GPIOA_PSOR
-#define CORE_PIN25_PORTSET	GPIOB_PSOR
-#define CORE_PIN26_PORTSET	GPIOE_PSOR
-#define CORE_PIN27_PORTSET	GPIOC_PSOR
-#define CORE_PIN28_PORTSET	GPIOC_PSOR
-#define CORE_PIN29_PORTSET	GPIOC_PSOR
-#define CORE_PIN30_PORTSET	GPIOC_PSOR
-#define CORE_PIN31_PORTSET	GPIOE_PSOR
-#define CORE_PIN32_PORTSET	GPIOB_PSOR
-#define CORE_PIN33_PORTSET	GPIOA_PSOR
-
-#define CORE_PIN0_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN1_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN2_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN3_PORTCLEAR	GPIOA_PCOR
-#define CORE_PIN4_PORTCLEAR	GPIOA_PCOR
-#define CORE_PIN5_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN6_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN7_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN8_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN9_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN10_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN11_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN12_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN13_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN14_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN15_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN16_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN17_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN18_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN19_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN20_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN21_PORTCLEAR	GPIOD_PCOR
-#define CORE_PIN22_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN23_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN24_PORTCLEAR	GPIOA_PCOR
-#define CORE_PIN25_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN26_PORTCLEAR	GPIOE_PCOR
-#define CORE_PIN27_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN28_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN29_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN30_PORTCLEAR	GPIOC_PCOR
-#define CORE_PIN31_PORTCLEAR	GPIOE_PCOR
-#define CORE_PIN32_PORTCLEAR	GPIOB_PCOR
-#define CORE_PIN33_PORTCLEAR	GPIOA_PCOR
-
-#define CORE_PIN0_DDRREG	GPIOB_PDDR
-#define CORE_PIN1_DDRREG	GPIOB_PDDR
-#define CORE_PIN2_DDRREG	GPIOD_PDDR
-#define CORE_PIN3_DDRREG	GPIOA_PDDR
-#define CORE_PIN4_DDRREG	GPIOA_PDDR
-#define CORE_PIN5_DDRREG	GPIOD_PDDR
-#define CORE_PIN6_DDRREG	GPIOD_PDDR
-#define CORE_PIN7_DDRREG	GPIOD_PDDR
-#define CORE_PIN8_DDRREG	GPIOD_PDDR
-#define CORE_PIN9_DDRREG	GPIOC_PDDR
-#define CORE_PIN10_DDRREG	GPIOC_PDDR
-#define CORE_PIN11_DDRREG	GPIOC_PDDR
-#define CORE_PIN12_DDRREG	GPIOC_PDDR
-#define CORE_PIN13_DDRREG	GPIOC_PDDR
-#define CORE_PIN14_DDRREG	GPIOD_PDDR
-#define CORE_PIN15_DDRREG	GPIOC_PDDR
-#define CORE_PIN16_DDRREG	GPIOB_PDDR
-#define CORE_PIN17_DDRREG	GPIOB_PDDR
-#define CORE_PIN18_DDRREG	GPIOB_PDDR
-#define CORE_PIN19_DDRREG	GPIOB_PDDR
-#define CORE_PIN20_DDRREG	GPIOD_PDDR
-#define CORE_PIN21_DDRREG	GPIOD_PDDR
-#define CORE_PIN22_DDRREG	GPIOC_PDDR
-#define CORE_PIN23_DDRREG	GPIOC_PDDR
-#define CORE_PIN24_DDRREG	GPIOA_PDDR
-#define CORE_PIN25_DDRREG	GPIOB_PDDR
-#define CORE_PIN26_DDRREG	GPIOE_PDDR
-#define CORE_PIN27_DDRREG	GPIOC_PDDR
-#define CORE_PIN28_DDRREG	GPIOC_PDDR
-#define CORE_PIN29_DDRREG	GPIOC_PDDR
-#define CORE_PIN30_DDRREG	GPIOC_PDDR
-#define CORE_PIN31_DDRREG	GPIOE_PDDR
-#define CORE_PIN32_DDRREG	GPIOB_PDDR
-#define CORE_PIN33_DDRREG	GPIOA_PDDR
-
-#define CORE_PIN0_PINREG	GPIOB_PDIR
-#define CORE_PIN1_PINREG	GPIOB_PDIR
-#define CORE_PIN2_PINREG	GPIOD_PDIR
-#define CORE_PIN3_PINREG	GPIOA_PDIR
-#define CORE_PIN4_PINREG	GPIOA_PDIR
-#define CORE_PIN5_PINREG	GPIOD_PDIR
-#define CORE_PIN6_PINREG	GPIOD_PDIR
-#define CORE_PIN7_PINREG	GPIOD_PDIR
-#define CORE_PIN8_PINREG	GPIOD_PDIR
-#define CORE_PIN9_PINREG	GPIOC_PDIR
-#define CORE_PIN10_PINREG	GPIOC_PDIR
-#define CORE_PIN11_PINREG	GPIOC_PDIR
-#define CORE_PIN12_PINREG	GPIOC_PDIR
-#define CORE_PIN13_PINREG	GPIOC_PDIR
-#define CORE_PIN14_PINREG	GPIOD_PDIR
-#define CORE_PIN15_PINREG	GPIOC_PDIR
-#define CORE_PIN16_PINREG	GPIOB_PDIR
-#define CORE_PIN17_PINREG	GPIOB_PDIR
-#define CORE_PIN18_PINREG	GPIOB_PDIR
-#define CORE_PIN19_PINREG	GPIOB_PDIR
-#define CORE_PIN20_PINREG	GPIOD_PDIR
-#define CORE_PIN21_PINREG	GPIOD_PDIR
-#define CORE_PIN22_PINREG	GPIOC_PDIR
-#define CORE_PIN23_PINREG	GPIOC_PDIR
-#define CORE_PIN24_PINREG	GPIOA_PDIR
-#define CORE_PIN25_PINREG	GPIOB_PDIR
-#define CORE_PIN26_PINREG	GPIOE_PDIR
-#define CORE_PIN27_PINREG	GPIOC_PDIR
-#define CORE_PIN28_PINREG	GPIOC_PDIR
-#define CORE_PIN29_PINREG	GPIOC_PDIR
-#define CORE_PIN30_PINREG	GPIOC_PDIR
-#define CORE_PIN31_PINREG	GPIOE_PDIR
-#define CORE_PIN32_PINREG	GPIOB_PDIR
-#define CORE_PIN33_PINREG	GPIOA_PDIR
-
-#define CORE_PIN0_CONFIG	PORTB_PCR16
-#define CORE_PIN1_CONFIG	PORTB_PCR17
-#define CORE_PIN2_CONFIG	PORTD_PCR0
-#define CORE_PIN3_CONFIG	PORTA_PCR12
-#define CORE_PIN4_CONFIG	PORTA_PCR13
-#define CORE_PIN5_CONFIG	PORTD_PCR7
-#define CORE_PIN6_CONFIG	PORTD_PCR4
-#define CORE_PIN7_CONFIG	PORTD_PCR2
-#define CORE_PIN8_CONFIG	PORTD_PCR3
-#define CORE_PIN9_CONFIG	PORTC_PCR3
-#define CORE_PIN10_CONFIG	PORTC_PCR4
-#define CORE_PIN11_CONFIG	PORTC_PCR6
-#define CORE_PIN12_CONFIG	PORTC_PCR7
-#define CORE_PIN13_CONFIG	PORTC_PCR5
-#define CORE_PIN14_CONFIG	PORTD_PCR1
-#define CORE_PIN15_CONFIG	PORTC_PCR0
-#define CORE_PIN16_CONFIG	PORTB_PCR0
-#define CORE_PIN17_CONFIG	PORTB_PCR1
-#define CORE_PIN18_CONFIG	PORTB_PCR3
-#define CORE_PIN19_CONFIG	PORTB_PCR2
-#define CORE_PIN20_CONFIG	PORTD_PCR5
-#define CORE_PIN21_CONFIG	PORTD_PCR6
-#define CORE_PIN22_CONFIG	PORTC_PCR1
-#define CORE_PIN23_CONFIG	PORTC_PCR2
-#define CORE_PIN24_CONFIG	PORTA_PCR5
-#define CORE_PIN25_CONFIG	PORTB_PCR19
-#define CORE_PIN26_CONFIG	PORTE_PCR1
-#define CORE_PIN27_CONFIG	PORTC_PCR9
-#define CORE_PIN28_CONFIG	PORTC_PCR8
-#define CORE_PIN29_CONFIG	PORTC_PCR10
-#define CORE_PIN30_CONFIG	PORTC_PCR11
-#define CORE_PIN31_CONFIG	PORTE_PCR0
-#define CORE_PIN32_CONFIG	PORTB_PCR18
-#define CORE_PIN33_CONFIG	PORTA_PCR4
-
-#define CORE_ADC0_PIN		14
-#define CORE_ADC1_PIN		15
-#define CORE_ADC2_PIN		16
-#define CORE_ADC3_PIN		17
-#define CORE_ADC4_PIN		18
-#define CORE_ADC5_PIN		19
-#define CORE_ADC6_PIN		20
-#define CORE_ADC7_PIN		21
-#define CORE_ADC8_PIN		22
-#define CORE_ADC9_PIN		23
-#define CORE_ADC10_PIN		34
-#define CORE_ADC11_PIN		35
-#define CORE_ADC12_PIN		36
-#define CORE_ADC13_PIN		37
-
-#define CORE_RXD0_PIN		0
-#define CORE_TXD0_PIN		1
-#define CORE_RXD1_PIN		9
-#define CORE_TXD1_PIN		10
-#define CORE_RXD2_PIN		7
-#define CORE_TXD2_PIN		8
-
-#define CORE_INT0_PIN		0
-#define CORE_INT1_PIN		1
-#define CORE_INT2_PIN		2
-#define CORE_INT3_PIN		3
-#define CORE_INT4_PIN		4
-#define CORE_INT5_PIN		5
-#define CORE_INT6_PIN		6
-#define CORE_INT7_PIN		7
-#define CORE_INT8_PIN		8
-#define CORE_INT9_PIN		9
-#define CORE_INT10_PIN		10
-#define CORE_INT11_PIN		11
-#define CORE_INT12_PIN		12
-#define CORE_INT13_PIN		13
-#define CORE_INT14_PIN		14
-#define CORE_INT15_PIN		15
-#define CORE_INT16_PIN		16
-#define CORE_INT17_PIN		17
-#define CORE_INT18_PIN		18
-#define CORE_INT19_PIN		19
-#define CORE_INT20_PIN		20
-#define CORE_INT21_PIN		21
-#define CORE_INT22_PIN		22
-#define CORE_INT23_PIN		23
-#define CORE_INT24_PIN		24
-#define CORE_INT25_PIN		25
-#define CORE_INT26_PIN		26
-#define CORE_INT27_PIN		27
-#define CORE_INT28_PIN		28
-#define CORE_INT29_PIN		29
-#define CORE_INT30_PIN		30
-#define CORE_INT31_PIN		31
-#define CORE_INT32_PIN		32
-#define CORE_INT33_PIN		33
-#define CORE_INT_EVERY_PIN	1
-
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void digitalWrite(uint8_t pin, uint8_t val);
-static inline void digitalWriteFast(uint8_t pin, uint8_t val) __attribute__((always_inline, unused));
-static inline void digitalWriteFast(uint8_t pin, uint8_t val)
-{
-	if (__builtin_constant_p(pin)) {
-		if (val) {
-			if (pin == 0) {
-				CORE_PIN0_PORTSET = CORE_PIN0_BITMASK;
-			} else if (pin == 1) {
-				CORE_PIN1_PORTSET = CORE_PIN1_BITMASK;
-			} else if (pin == 2) {
-				CORE_PIN2_PORTSET = CORE_PIN2_BITMASK;
-			} else if (pin == 3) {
-				CORE_PIN3_PORTSET = CORE_PIN3_BITMASK;
-			} else if (pin == 4) {
-				CORE_PIN4_PORTSET = CORE_PIN4_BITMASK;
-			} else if (pin == 5) {
-				CORE_PIN5_PORTSET = CORE_PIN5_BITMASK;
-			} else if (pin == 6) {
-				CORE_PIN6_PORTSET = CORE_PIN6_BITMASK;
-			} else if (pin == 7) {
-				CORE_PIN7_PORTSET = CORE_PIN7_BITMASK;
-			} else if (pin == 8) {
-				CORE_PIN8_PORTSET = CORE_PIN8_BITMASK;
-			} else if (pin == 9) {
-				CORE_PIN9_PORTSET = CORE_PIN9_BITMASK;
-			} else if (pin == 10) {
-				CORE_PIN10_PORTSET = CORE_PIN10_BITMASK;
-			} else if (pin == 11) {
-				CORE_PIN11_PORTSET = CORE_PIN11_BITMASK;
-			} else if (pin == 12) {
-				CORE_PIN12_PORTSET = CORE_PIN12_BITMASK;
-			} else if (pin == 13) {
-				CORE_PIN13_PORTSET = CORE_PIN13_BITMASK;
-			} else if (pin == 14) {
-				CORE_PIN14_PORTSET = CORE_PIN14_BITMASK;
-			} else if (pin == 15) {
-				CORE_PIN15_PORTSET = CORE_PIN15_BITMASK;
-			} else if (pin == 16) {
-				CORE_PIN16_PORTSET = CORE_PIN16_BITMASK;
-			} else if (pin == 17) {
-				CORE_PIN17_PORTSET = CORE_PIN17_BITMASK;
-			} else if (pin == 18) {
-				CORE_PIN18_PORTSET = CORE_PIN18_BITMASK;
-			} else if (pin == 19) {
-				CORE_PIN19_PORTSET = CORE_PIN19_BITMASK;
-			} else if (pin == 20) {
-				CORE_PIN20_PORTSET = CORE_PIN20_BITMASK;
-			} else if (pin == 21) {
-				CORE_PIN21_PORTSET = CORE_PIN21_BITMASK;
-			} else if (pin == 22) {
-				CORE_PIN22_PORTSET = CORE_PIN22_BITMASK;
-			} else if (pin == 23) {
-				CORE_PIN23_PORTSET = CORE_PIN23_BITMASK;
-			} else if (pin == 24) {
-				CORE_PIN24_PORTSET = CORE_PIN24_BITMASK;
-			} else if (pin == 25) {
-				CORE_PIN25_PORTSET = CORE_PIN25_BITMASK;
-			} else if (pin == 26) {
-				CORE_PIN26_PORTSET = CORE_PIN26_BITMASK;
-			} else if (pin == 27) {
-				CORE_PIN27_PORTSET = CORE_PIN27_BITMASK;
-			} else if (pin == 28) {
-				CORE_PIN28_PORTSET = CORE_PIN28_BITMASK;
-			} else if (pin == 29) {
-				CORE_PIN29_PORTSET = CORE_PIN29_BITMASK;
-			} else if (pin == 30) {
-				CORE_PIN30_PORTSET = CORE_PIN30_BITMASK;
-			} else if (pin == 31) {
-				CORE_PIN31_PORTSET = CORE_PIN31_BITMASK;
-			} else if (pin == 32) {
-				CORE_PIN32_PORTSET = CORE_PIN32_BITMASK;
-			} else if (pin == 33) {
-				CORE_PIN33_PORTSET = CORE_PIN33_BITMASK;
-			}
-		} else {
-			if (pin == 0) {
-				CORE_PIN0_PORTCLEAR = CORE_PIN0_BITMASK;
-			} else if (pin == 1) {
-				CORE_PIN1_PORTCLEAR = CORE_PIN1_BITMASK;
-			} else if (pin == 2) {
-				CORE_PIN2_PORTCLEAR = CORE_PIN2_BITMASK;
-			} else if (pin == 3) {
-				CORE_PIN3_PORTCLEAR = CORE_PIN3_BITMASK;
-			} else if (pin == 4) {
-				CORE_PIN4_PORTCLEAR = CORE_PIN4_BITMASK;
-			} else if (pin == 5) {
-				CORE_PIN5_PORTCLEAR = CORE_PIN5_BITMASK;
-			} else if (pin == 6) {
-				CORE_PIN6_PORTCLEAR = CORE_PIN6_BITMASK;
-			} else if (pin == 7) {
-				CORE_PIN7_PORTCLEAR = CORE_PIN7_BITMASK;
-			} else if (pin == 8) {
-				CORE_PIN8_PORTCLEAR = CORE_PIN8_BITMASK;
-			} else if (pin == 9) {
-				CORE_PIN9_PORTCLEAR = CORE_PIN9_BITMASK;
-			} else if (pin == 10) {
-				CORE_PIN10_PORTCLEAR = CORE_PIN10_BITMASK;
-			} else if (pin == 11) {
-				CORE_PIN11_PORTCLEAR = CORE_PIN11_BITMASK;
-			} else if (pin == 12) {
-				CORE_PIN12_PORTCLEAR = CORE_PIN12_BITMASK;
-			} else if (pin == 13) {
-				CORE_PIN13_PORTCLEAR = CORE_PIN13_BITMASK;
-			} else if (pin == 14) {
-				CORE_PIN14_PORTCLEAR = CORE_PIN14_BITMASK;
-			} else if (pin == 15) {
-				CORE_PIN15_PORTCLEAR = CORE_PIN15_BITMASK;
-			} else if (pin == 16) {
-				CORE_PIN16_PORTCLEAR = CORE_PIN16_BITMASK;
-			} else if (pin == 17) {
-				CORE_PIN17_PORTCLEAR = CORE_PIN17_BITMASK;
-			} else if (pin == 18) {
-				CORE_PIN18_PORTCLEAR = CORE_PIN18_BITMASK;
-			} else if (pin == 19) {
-				CORE_PIN19_PORTCLEAR = CORE_PIN19_BITMASK;
-			} else if (pin == 20) {
-				CORE_PIN20_PORTCLEAR = CORE_PIN20_BITMASK;
-			} else if (pin == 21) {
-				CORE_PIN21_PORTCLEAR = CORE_PIN21_BITMASK;
-			} else if (pin == 22) {
-				CORE_PIN22_PORTCLEAR = CORE_PIN22_BITMASK;
-			} else if (pin == 23) {
-				CORE_PIN23_PORTCLEAR = CORE_PIN23_BITMASK;
-			} else if (pin == 24) {
-				CORE_PIN24_PORTCLEAR = CORE_PIN24_BITMASK;
-			} else if (pin == 25) {
-				CORE_PIN25_PORTCLEAR = CORE_PIN25_BITMASK;
-			} else if (pin == 26) {
-				CORE_PIN26_PORTCLEAR = CORE_PIN26_BITMASK;
-			} else if (pin == 27) {
-				CORE_PIN27_PORTCLEAR = CORE_PIN27_BITMASK;
-			} else if (pin == 28) {
-				CORE_PIN28_PORTCLEAR = CORE_PIN28_BITMASK;
-			} else if (pin == 29) {
-				CORE_PIN29_PORTCLEAR = CORE_PIN29_BITMASK;
-			} else if (pin == 30) {
-				CORE_PIN30_PORTCLEAR = CORE_PIN30_BITMASK;
-			} else if (pin == 31) {
-				CORE_PIN31_PORTCLEAR = CORE_PIN31_BITMASK;
-			} else if (pin == 32) {
-				CORE_PIN32_PORTCLEAR = CORE_PIN32_BITMASK;
-			} else if (pin == 33) {
-				CORE_PIN33_PORTCLEAR = CORE_PIN33_BITMASK;
-			}
-		}
-	} else {
-		if (val) {
-			*portSetRegister(pin) = 1;
-		} else {
-			*portClearRegister(pin) = 1;
-		}
-	}
-}
-
-uint8_t digitalRead(uint8_t pin);
-static inline uint8_t digitalReadFast(uint8_t pin) __attribute__((always_inline, unused));
-static inline uint8_t digitalReadFast(uint8_t pin)
-{
-	if (__builtin_constant_p(pin)) {
-		if (pin == 0) {
-			return (CORE_PIN0_PINREG & CORE_PIN0_BITMASK) ? 1 : 0;
-		} else if (pin == 1) {
-			return (CORE_PIN1_PINREG & CORE_PIN1_BITMASK) ? 1 : 0;
-		} else if (pin == 2) {
-			return (CORE_PIN2_PINREG & CORE_PIN2_BITMASK) ? 1 : 0;
-		} else if (pin == 3) {
-			return (CORE_PIN3_PINREG & CORE_PIN3_BITMASK) ? 1 : 0;
-		} else if (pin == 4) {
-			return (CORE_PIN4_PINREG & CORE_PIN4_BITMASK) ? 1 : 0;
-		} else if (pin == 5) {
-			return (CORE_PIN5_PINREG & CORE_PIN5_BITMASK) ? 1 : 0;
-		} else if (pin == 6) {
-			return (CORE_PIN6_PINREG & CORE_PIN6_BITMASK) ? 1 : 0;
-		} else if (pin == 7) {
-			return (CORE_PIN7_PINREG & CORE_PIN7_BITMASK) ? 1 : 0;
-		} else if (pin == 8) {
-			return (CORE_PIN8_PINREG & CORE_PIN8_BITMASK) ? 1 : 0;
-		} else if (pin == 9) {
-			return (CORE_PIN9_PINREG & CORE_PIN9_BITMASK) ? 1 : 0;
-		} else if (pin == 10) {
-			return (CORE_PIN10_PINREG & CORE_PIN10_BITMASK) ? 1 : 0;
-		} else if (pin == 11) {
-			return (CORE_PIN11_PINREG & CORE_PIN11_BITMASK) ? 1 : 0;
-		} else if (pin == 12) {
-			return (CORE_PIN12_PINREG & CORE_PIN12_BITMASK) ? 1 : 0;
-		} else if (pin == 13) {
-			return (CORE_PIN13_PINREG & CORE_PIN13_BITMASK) ? 1 : 0;
-		} else if (pin == 14) {
-			return (CORE_PIN14_PINREG & CORE_PIN14_BITMASK) ? 1 : 0;
-		} else if (pin == 15) {
-			return (CORE_PIN15_PINREG & CORE_PIN15_BITMASK) ? 1 : 0;
-		} else if (pin == 16) {
-			return (CORE_PIN16_PINREG & CORE_PIN16_BITMASK) ? 1 : 0;
-		} else if (pin == 17) {
-			return (CORE_PIN17_PINREG & CORE_PIN17_BITMASK) ? 1 : 0;
-		} else if (pin == 18) {
-			return (CORE_PIN18_PINREG & CORE_PIN18_BITMASK) ? 1 : 0;
-		} else if (pin == 19) {
-			return (CORE_PIN19_PINREG & CORE_PIN19_BITMASK) ? 1 : 0;
-		} else if (pin == 20) {
-			return (CORE_PIN20_PINREG & CORE_PIN20_BITMASK) ? 1 : 0;
-		} else if (pin == 21) {
-			return (CORE_PIN21_PINREG & CORE_PIN21_BITMASK) ? 1 : 0;
-		} else if (pin == 22) {
-			return (CORE_PIN22_PINREG & CORE_PIN22_BITMASK) ? 1 : 0;
-		} else if (pin == 23) {
-			return (CORE_PIN23_PINREG & CORE_PIN23_BITMASK) ? 1 : 0;
-		} else if (pin == 24) {
-			return (CORE_PIN24_PINREG & CORE_PIN24_BITMASK) ? 1 : 0;
-		} else if (pin == 25) {
-			return (CORE_PIN25_PINREG & CORE_PIN25_BITMASK) ? 1 : 0;
-		} else if (pin == 26) {
-			return (CORE_PIN26_PINREG & CORE_PIN26_BITMASK) ? 1 : 0;
-		} else if (pin == 27) {
-			return (CORE_PIN27_PINREG & CORE_PIN27_BITMASK) ? 1 : 0;
-		} else if (pin == 28) {
-			return (CORE_PIN28_PINREG & CORE_PIN28_BITMASK) ? 1 : 0;
-		} else if (pin == 29) {
-			return (CORE_PIN29_PINREG & CORE_PIN29_BITMASK) ? 1 : 0;
-		} else if (pin == 30) {
-			return (CORE_PIN30_PINREG & CORE_PIN30_BITMASK) ? 1 : 0;
-		} else if (pin == 31) {
-			return (CORE_PIN31_PINREG & CORE_PIN31_BITMASK) ? 1 : 0;
-		} else if (pin == 32) {
-			return (CORE_PIN32_PINREG & CORE_PIN32_BITMASK) ? 1 : 0;
-		} else if (pin == 33) {
-			return (CORE_PIN33_PINREG & CORE_PIN33_BITMASK) ? 1 : 0;
-		} else {
-			return 0;
-		}
-	} else {
-		return *portInputRegister(pin);
-	}
-}
-
-
-void pinMode(uint8_t pin, uint8_t mode);
-void init_pins(void);
-void analogWrite(uint8_t pin, int val);
-void analogWriteRes(uint32_t bits);
-static inline void analogWriteResolution(uint32_t bits) { analogWriteRes(bits); }
-void analogWriteFrequency(uint8_t pin, uint32_t frequency);
-void analogWriteDAC0(int val);
-void attachInterrupt(uint8_t pin, void (*function)(void), int mode);
-void detachInterrupt(uint8_t pin);
-void _init_Teensyduino_internal_(void);
-
-int analogRead(uint8_t pin);
-void analogReference(uint8_t type);
-void analogReadRes(unsigned int bits);
-static inline void analogReadResolution(unsigned int bits) { analogReadRes(bits); }
-void analogReadAveraging(unsigned int num);
-void analog_init(void);
-
-#define DEFAULT         0
-#define INTERNAL        2
-#define INTERNAL1V2     2
-#define INTERNAL1V1     2
-#define EXTERNAL        0
-
-int touchRead(uint8_t pin);
-
-
-static inline void shiftOut(uint8_t, uint8_t, uint8_t, uint8_t) __attribute__((always_inline, unused));
-extern void _shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t value) __attribute__((noinline));
-extern void shiftOut_lsbFirst(uint8_t dataPin, uint8_t clockPin, uint8_t value) __attribute__((noinline));
-extern void shiftOut_msbFirst(uint8_t dataPin, uint8_t clockPin, uint8_t value) __attribute__((noinline));
-
-static inline void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t value)
-{
-        if (__builtin_constant_p(bitOrder)) {
-                if (bitOrder == LSBFIRST) {
-                        shiftOut_lsbFirst(dataPin, clockPin, value);
-                } else {
-                        shiftOut_msbFirst(dataPin, clockPin, value);
-                }
-        } else {
-                _shiftOut(dataPin, clockPin, bitOrder, value);
-        }
-}
-
-static inline uint8_t shiftIn(uint8_t, uint8_t, uint8_t) __attribute__((always_inline, unused));
-extern uint8_t _shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder) __attribute__((noinline));
-extern uint8_t shiftIn_lsbFirst(uint8_t dataPin, uint8_t clockPin) __attribute__((noinline));
-extern uint8_t shiftIn_msbFirst(uint8_t dataPin, uint8_t clockPin) __attribute__((noinline));
-
-static inline uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder)
-{
-        if (__builtin_constant_p(bitOrder)) {
-                if (bitOrder == LSBFIRST) {
-                        return shiftIn_lsbFirst(dataPin, clockPin);
-                } else {
-                        return shiftIn_msbFirst(dataPin, clockPin);
-                }
-        } else {
-                return _shiftIn(dataPin, clockPin, bitOrder);
-        }
-}
-
-void _reboot_Teensyduino_(void) __attribute__((noreturn));
-void _restart_Teensyduino_(void) __attribute__((noreturn));
-
-void yield(void);
-
-void delay(uint32_t msec);
-
-extern volatile uint32_t systick_millis_count;
-
-static inline uint32_t millis(void) __attribute__((always_inline, unused));
-static inline uint32_t millis(void)
-{
-	volatile uint32_t ret = systick_millis_count; // single aligned 32 bit is atomic;
-	return ret;
-}
-
-uint32_t micros(void);
-
-static inline void delayMicroseconds(uint32_t) __attribute__((always_inline, unused));
-static inline void delayMicroseconds(uint32_t usec)
-{
-#if F_CPU == 168000000
-	uint32_t n = usec * 56;
-#elif F_CPU == 144000000
-	uint32_t n = usec * 48;
-#elif F_CPU == 120000000
-	uint32_t n = usec * 40;
-#elif F_CPU == 96000000
-	uint32_t n = usec << 5;
-#elif F_CPU == 72000000
-	uint32_t n = usec * 24;
-#elif F_CPU == 48000000
-	uint32_t n = usec << 4;
-#elif F_CPU == 24000000
-	uint32_t n = usec << 3;
-#elif F_CPU == 16000000
-	uint32_t n = usec << 2;
-#elif F_CPU == 8000000
-	uint32_t n = usec << 1;
-#elif F_CPU == 4000000
-	uint32_t n = usec;
-#elif F_CPU == 2000000
-	uint32_t n = usec >> 1;
-#endif
-    // changed because a delay of 1 micro Sec @ 2MHz will be 0
-	if (n == 0) return;
-	__asm__ volatile(
-		"L_%=_delayMicroseconds:"		"\n\t"
-#if F_CPU < 24000000
-		"nop"					"\n\t"
-#endif
-		"subs   %0, #1"				"\n\t"
-		"bne    L_%=_delayMicroseconds"		"\n"
-		: "+r" (n) :
-	);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-
-
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long rtc_get(void);
-void rtc_set(unsigned long t);
-void rtc_compensate(int adjust);
-#ifdef __cplusplus
-}
-class teensy3_clock_class
-{
-public:
-	static unsigned long get(void) __attribute__((always_inline)) { return rtc_get(); }
-	static void set(unsigned long t) __attribute__((always_inline)) { rtc_set(t); }
-	static void compensate(int adj) __attribute__((always_inline)) { rtc_compensate(adj); }
-};
-extern teensy3_clock_class Teensy3Clock;
-#endif
-
-
-
-
-#endif
diff --git a/ports/teensy/core/mk20dx128.c b/ports/teensy/core/mk20dx128.c
deleted file mode 100644
index f79bf436f4ffc..0000000000000
--- a/ports/teensy/core/mk20dx128.c
+++ /dev/null
@@ -1,662 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be 
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows 
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 "mk20dx128.h"
-
-
-extern unsigned long _stext;
-extern unsigned long _etext;
-extern unsigned long _sdata;
-extern unsigned long _edata;
-extern unsigned long _sbss;
-extern unsigned long _ebss;
-extern unsigned long _estack;
-//extern void __init_array_start(void);
-//extern void __init_array_end(void);
-
-
-
-extern int main (void);
-void ResetHandler(void);
-void _init_Teensyduino_internal_(void);
-void __libc_init_array(void);
-
-
-void fault_isr(void)
-{
-	while (1) {
-		// keep polling some communication while in fault
-		// mode, so we don't completely die.
-		if (SIM_SCGC4 & SIM_SCGC4_USBOTG) usb_isr();
-		if (SIM_SCGC4 & SIM_SCGC4_UART0) uart0_status_isr();
-		if (SIM_SCGC4 & SIM_SCGC4_UART1) uart1_status_isr();
-		if (SIM_SCGC4 & SIM_SCGC4_UART2) uart2_status_isr();
-	}
-}
-
-void unused_isr(void)
-{
-	fault_isr();
-}
-
-extern volatile uint32_t systick_millis_count;
-void systick_default_isr(void)
-{
-	systick_millis_count++;
-}
-
-void nmi_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void hard_fault_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void memmanage_fault_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void bus_fault_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void usage_fault_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void svcall_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void debugmonitor_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void pendablesrvreq_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void systick_isr(void)		__attribute__ ((weak, alias("systick_default_isr")));
-
-void dma_ch0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch2_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch3_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch4_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch5_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch6_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch7_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch8_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch9_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch10_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch11_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch12_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch13_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch14_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_ch15_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dma_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void mcm_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void flash_cmd_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void flash_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void low_voltage_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void wakeup_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void watchdog_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void i2c0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void i2c1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void i2c2_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void spi0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void spi1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void spi2_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void sdhc_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void can0_message_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void can0_bus_off_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void can0_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void can0_tx_warn_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void can0_rx_warn_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void can0_wakeup_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void i2s0_tx_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void i2s0_rx_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void uart0_lon_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart0_status_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart0_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart1_status_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart1_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart2_status_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart2_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart3_status_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart3_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart4_status_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart4_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart5_status_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void uart5_error_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void adc0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void adc1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void cmp0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void cmp1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void cmp2_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void ftm0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void ftm1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void ftm2_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void ftm3_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void cmt_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void rtc_alarm_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void rtc_seconds_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void pit0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void pit1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void pit2_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void pit3_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void pdb_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void usb_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void usb_charge_isr(void)	__attribute__ ((weak, alias("unused_isr")));
-void dac0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void dac1_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void tsi0_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void mcg_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void lptmr_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void porta_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void portb_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void portc_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void portd_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void porte_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-void software_isr(void)		__attribute__ ((weak, alias("unused_isr")));
-
-
-// TODO: create AVR-stype ISR() macro, with default linkage to undefined handler
-//
-__attribute__ ((section(".vectors"), used))
-void (* const gVectors[])(void) =
-{
-	(void (*)(void))((unsigned long)&_estack),	//  0 ARM: Initial Stack Pointer
-	ResetHandler,					//  1 ARM: Initial Program Counter
-	nmi_isr,					//  2 ARM: Non-maskable Interrupt (NMI)
-	hard_fault_isr,					//  3 ARM: Hard Fault
-	memmanage_fault_isr,				//  4 ARM: MemManage Fault
-	bus_fault_isr,					//  5 ARM: Bus Fault
-	usage_fault_isr,				//  6 ARM: Usage Fault
-	fault_isr,					//  7 --
-	fault_isr,					//  8 --
-	fault_isr,					//  9 --
-	fault_isr,					// 10 --
-	svcall_isr,					// 11 ARM: Supervisor call (SVCall)
-	debugmonitor_isr,				// 12 ARM: Debug Monitor
-	fault_isr,					// 13 --
-	pendablesrvreq_isr,				// 14 ARM: Pendable req serv(PendableSrvReq)
-	systick_isr,					// 15 ARM: System tick timer (SysTick)
-#if defined(__MK20DX128__)
-	dma_ch0_isr,					// 16 DMA channel 0 transfer complete
-	dma_ch1_isr,					// 17 DMA channel 1 transfer complete
-	dma_ch2_isr,					// 18 DMA channel 2 transfer complete
-	dma_ch3_isr,					// 19 DMA channel 3 transfer complete
-	dma_error_isr,					// 20 DMA error interrupt channel
-	unused_isr,					// 21 DMA --
-	flash_cmd_isr,					// 22 Flash Memory Command complete
-	flash_error_isr,				// 23 Flash Read collision
-	low_voltage_isr,				// 24 Low-voltage detect/warning
-	wakeup_isr,					// 25 Low Leakage Wakeup
-	watchdog_isr,					// 26 Both EWM and WDOG interrupt
-	i2c0_isr,					// 27 I2C0
-	spi0_isr,					// 28 SPI0
-	i2s0_tx_isr,					// 29 I2S0 Transmit
-	i2s0_rx_isr,					// 30 I2S0 Receive
-	uart0_lon_isr,					// 31 UART0 CEA709.1-B (LON) status
-	uart0_status_isr,				// 32 UART0 status
-	uart0_error_isr,				// 33 UART0 error
-	uart1_status_isr,				// 34 UART1 status
-	uart1_error_isr,				// 35 UART1 error
-	uart2_status_isr,				// 36 UART2 status
-	uart2_error_isr,				// 37 UART2 error
-	adc0_isr,					// 38 ADC0
-	cmp0_isr,					// 39 CMP0
-	cmp1_isr,					// 40 CMP1
-	ftm0_isr,					// 41 FTM0
-	ftm1_isr,					// 42 FTM1
-	cmt_isr,					// 43 CMT
-	rtc_alarm_isr,					// 44 RTC Alarm interrupt
-	rtc_seconds_isr,				// 45 RTC Seconds interrupt
-	pit0_isr,					// 46 PIT Channel 0
-	pit1_isr,					// 47 PIT Channel 1
-	pit2_isr,					// 48 PIT Channel 2
-	pit3_isr,					// 49 PIT Channel 3
-	pdb_isr,					// 50 PDB Programmable Delay Block
-	usb_isr,					// 51 USB OTG
-	usb_charge_isr,					// 52 USB Charger Detect
-	tsi0_isr,					// 53 TSI0
-	mcg_isr,					// 54 MCG
-	lptmr_isr,					// 55 Low Power Timer
-	porta_isr,					// 56 Pin detect (Port A)
-	portb_isr,					// 57 Pin detect (Port B)
-	portc_isr,					// 58 Pin detect (Port C)
-	portd_isr,					// 59 Pin detect (Port D)
-	porte_isr,					// 60 Pin detect (Port E)
-	software_isr,					// 61 Software interrupt
-#elif defined(__MK20DX256__)
-	dma_ch0_isr,					// 16 DMA channel 0 transfer complete
-	dma_ch1_isr,					// 17 DMA channel 1 transfer complete
-	dma_ch2_isr,					// 18 DMA channel 2 transfer complete
-	dma_ch3_isr,					// 19 DMA channel 3 transfer complete
-	dma_ch4_isr,					// 20 DMA channel 4 transfer complete
-	dma_ch5_isr,					// 21 DMA channel 5 transfer complete
-	dma_ch6_isr,					// 22 DMA channel 6 transfer complete
-	dma_ch7_isr,					// 23 DMA channel 7 transfer complete
-	dma_ch8_isr,					// 24 DMA channel 8 transfer complete
-	dma_ch9_isr,					// 25 DMA channel 9 transfer complete
-	dma_ch10_isr,					// 26 DMA channel 10 transfer complete
-	dma_ch11_isr,					// 27 DMA channel 10 transfer complete
-	dma_ch12_isr,					// 28 DMA channel 10 transfer complete
-	dma_ch13_isr,					// 29 DMA channel 10 transfer complete
-	dma_ch14_isr,					// 30 DMA channel 10 transfer complete
-	dma_ch15_isr,					// 31 DMA channel 10 transfer complete
-	dma_error_isr,					// 32 DMA error interrupt channel
-	unused_isr,					// 33 --
-	flash_cmd_isr,					// 34 Flash Memory Command complete
-	flash_error_isr,				// 35 Flash Read collision
-	low_voltage_isr,				// 36 Low-voltage detect/warning
-	wakeup_isr,					// 37 Low Leakage Wakeup
-	watchdog_isr,					// 38 Both EWM and WDOG interrupt
-	unused_isr,					// 39 --
-	i2c0_isr,					// 40 I2C0
-	i2c1_isr,					// 41 I2C1
-	spi0_isr,					// 42 SPI0
-	spi1_isr,					// 43 SPI1
-	unused_isr,					// 44 --
-	can0_message_isr,				// 45 CAN OR'ed Message buffer (0-15)
-	can0_bus_off_isr,				// 46 CAN Bus Off
-	can0_error_isr,					// 47 CAN Error
-	can0_tx_warn_isr,				// 48 CAN Transmit Warning
-	can0_rx_warn_isr,				// 49 CAN Receive Warning
-	can0_wakeup_isr,				// 50 CAN Wake Up
-	i2s0_tx_isr,					// 51 I2S0 Transmit
-	i2s0_rx_isr,					// 52 I2S0 Receive
-	unused_isr,					// 53 --
-	unused_isr,					// 54 --
-	unused_isr,					// 55 --
-	unused_isr,					// 56 --
-	unused_isr,					// 57 --
-	unused_isr,					// 58 --
-	unused_isr,					// 59 --
-	uart0_lon_isr,					// 60 UART0 CEA709.1-B (LON) status
-	uart0_status_isr,				// 61 UART0 status
-	uart0_error_isr,				// 62 UART0 error
-	uart1_status_isr,				// 63 UART1 status
-	uart1_error_isr,				// 64 UART1 error
-	uart2_status_isr,				// 65 UART2 status
-	uart2_error_isr,				// 66 UART2 error
-	unused_isr,					// 67 --
-	unused_isr,					// 68 --
-	unused_isr,					// 69 --
-	unused_isr,					// 70 --
-	unused_isr,					// 71 --
-	unused_isr,					// 72 --
-	adc0_isr,					// 73 ADC0
-	adc1_isr,					// 74 ADC1
-	cmp0_isr,					// 75 CMP0
-	cmp1_isr,					// 76 CMP1
-	cmp2_isr,					// 77 CMP2
-	ftm0_isr,					// 78 FTM0
-	ftm1_isr,					// 79 FTM1
-	ftm2_isr,					// 80 FTM2
-	cmt_isr,					// 81 CMT
-	rtc_alarm_isr,					// 82 RTC Alarm interrupt
-	rtc_seconds_isr,				// 83 RTC Seconds interrupt
-	pit0_isr,					// 84 PIT Channel 0
-	pit1_isr,					// 85 PIT Channel 1
-	pit2_isr,					// 86 PIT Channel 2
-	pit3_isr,					// 87 PIT Channel 3
-	pdb_isr,					// 88 PDB Programmable Delay Block
-	usb_isr,					// 89 USB OTG
-	usb_charge_isr,					// 90 USB Charger Detect
-	unused_isr,					// 91 --
-	unused_isr,					// 92 --
-	unused_isr,					// 93 --
-	unused_isr,					// 94 --
-	unused_isr,					// 95 --
-	unused_isr,					// 96 --
-	dac0_isr,					// 97 DAC0
-	unused_isr,					// 98 --
-	tsi0_isr,					// 99 TSI0
-	mcg_isr,					// 100 MCG
-	lptmr_isr,					// 101 Low Power Timer
-	unused_isr,					// 102 --
-	porta_isr,					// 103 Pin detect (Port A)
-	portb_isr,					// 104 Pin detect (Port B)
-	portc_isr,					// 105 Pin detect (Port C)
-	portd_isr,					// 106 Pin detect (Port D)
-	porte_isr,					// 107 Pin detect (Port E)
-	unused_isr,					// 108 --
-	unused_isr,					// 109 --
-	software_isr,					// 110 Software interrupt
-#endif
-};
-
-//void usb_isr(void)
-//{
-//}
-
-__attribute__ ((section(".flashconfig"), used))
-const uint8_t flashconfigbytes[16] = {
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF
-};
-
-
-// Automatically initialize the RTC.  When the build defines the compile
-// time, and the user has added a crystal, the RTC will automatically
-// begin at the time of the first upload.
-#ifndef TIME_T
-#define TIME_T 1349049600 // default 1 Oct 2012 (never used, Arduino sets this)
-#endif
-extern void rtc_set(unsigned long t);
-
-
-static void startup_default_early_hook(void) { WDOG_STCTRLH = WDOG_STCTRLH_ALLOWUPDATE; }
-static void startup_default_late_hook(void) {}
-void startup_early_hook(void)		__attribute__ ((weak, alias("startup_default_early_hook")));
-void startup_late_hook(void)		__attribute__ ((weak, alias("startup_default_late_hook")));
-
-__attribute__ ((section(".startup")))
-void ResetHandler(void)
-{
-	uint32_t *src = &_etext;
-	uint32_t *dest = &_sdata;
-	unsigned int i;
-#if F_CPU <= 2000000
-	volatile int n;
-#endif
-
-	WDOG_UNLOCK = WDOG_UNLOCK_SEQ1;
-	WDOG_UNLOCK = WDOG_UNLOCK_SEQ2;
-	__asm__ volatile ("nop");
-	__asm__ volatile ("nop");
-	// programs using the watchdog timer or needing to initialize hardware as
-	// early as possible can implement startup_early_hook()
-	startup_early_hook();
-
-	// enable clocks to always-used peripherals
-#if defined(__MK20DX128__)
-	SIM_SCGC5 = 0x00043F82;		// clocks active to all GPIO
-	SIM_SCGC6 = SIM_SCGC6_RTC | SIM_SCGC6_FTM0 | SIM_SCGC6_FTM1 | SIM_SCGC6_ADC0 | SIM_SCGC6_FTFL;
-#elif defined(__MK20DX256__)
-	SIM_SCGC3 = SIM_SCGC3_ADC1 | SIM_SCGC3_FTM2;
-	SIM_SCGC5 = 0x00043F82;		// clocks active to all GPIO
-	SIM_SCGC6 = SIM_SCGC6_RTC | SIM_SCGC6_FTM0 | SIM_SCGC6_FTM1 | SIM_SCGC6_ADC0 | SIM_SCGC6_FTFL;
-#endif
-	// if the RTC oscillator isn't enabled, get it started early
-	if (!(RTC_CR & RTC_CR_OSCE)) {
-		RTC_SR = 0;
-		RTC_CR = RTC_CR_SC16P | RTC_CR_SC4P | RTC_CR_OSCE;
-	}
-
-	// release I/O pins hold, if we woke up from VLLS mode
-	if (PMC_REGSC & PMC_REGSC_ACKISO) PMC_REGSC |= PMC_REGSC_ACKISO;
-
-    // since this is a write once register, make it visible to all F_CPU's
-    // so we can into other sleep modes in the future at any speed
-	SMC_PMPROT = SMC_PMPROT_AVLP | SMC_PMPROT_ALLS | SMC_PMPROT_AVLLS;
-    
-	// TODO: do this while the PLL is waiting to lock....
-	while (dest < &_edata) *dest++ = *src++;
-	dest = &_sbss;
-	while (dest < &_ebss) *dest++ = 0;
-	SCB_VTOR = 0;	// use vector table in flash
-
-	// default all interrupts to medium priority level
-	for (i=0; i < NVIC_NUM_INTERRUPTS; i++) NVIC_SET_PRIORITY(i, 128);
-
-	// hardware always starts in FEI mode
-	//  C1[CLKS] bits are written to 00
-	//  C1[IREFS] bit is written to 1
-	//  C6[PLLS] bit is written to 0
-// MCG_SC[FCDIV] defaults to divide by two for internal ref clock
-// I tried changing MSG_SC to divide by 1, it didn't work for me
-#if F_CPU <= 2000000
-	// use the internal oscillator
-	MCG_C1 = MCG_C1_CLKS(1) | MCG_C1_IREFS;
-	// wait for MCGOUT to use oscillator
-	while ((MCG_S & MCG_S_CLKST_MASK) != MCG_S_CLKST(1)) ;
-	for (n=0; n<10; n++) ; // TODO: why do we get 2 mA extra without this delay?
-	MCG_C2 = MCG_C2_IRCS;
-	while (!(MCG_S & MCG_S_IRCST)) ;
-	// now in FBI mode:
-	//  C1[CLKS] bits are written to 01
-	//  C1[IREFS] bit is written to 1
-	//  C6[PLLS] is written to 0
-	//  C2[LP] is written to 0
-	MCG_C2 = MCG_C2_IRCS | MCG_C2_LP;
-	// now in BLPI mode:
-	//  C1[CLKS] bits are written to 01
-	//  C1[IREFS] bit is written to 1
-	//  C6[PLLS] bit is written to 0
-	//  C2[LP] bit is written to 1
-#else
-	// enable capacitors for crystal
-	OSC0_CR = OSC_SC8P | OSC_SC2P;
-	// enable osc, 8-32 MHz range, low power mode
-	MCG_C2 = MCG_C2_RANGE0(2) | MCG_C2_EREFS;
-	// switch to crystal as clock source, FLL input = 16 MHz / 512
-	MCG_C1 =  MCG_C1_CLKS(2) | MCG_C1_FRDIV(4);
-	// wait for crystal oscillator to begin
-	while ((MCG_S & MCG_S_OSCINIT0) == 0) ;
-	// wait for FLL to use oscillator
-	while ((MCG_S & MCG_S_IREFST) != 0) ;
-	// wait for MCGOUT to use oscillator
-	while ((MCG_S & MCG_S_CLKST_MASK) != MCG_S_CLKST(2)) ;
-	// now in FBE mode
-	//  C1[CLKS] bits are written to 10
-	//  C1[IREFS] bit is written to 0
-	//  C1[FRDIV] must be written to divide xtal to 31.25-39 kHz
-	//  C6[PLLS] bit is written to 0
-	//  C2[LP] is written to 0
-  #if F_CPU <= 16000000
-	// if the crystal is fast enough, use it directly (no FLL or PLL)
-	MCG_C2 = MCG_C2_RANGE0(2) | MCG_C2_EREFS | MCG_C2_LP;
-	// BLPE mode:
-	//   C1[CLKS] bits are written to 10
-	//   C1[IREFS] bit is written to 0
-	//   C2[LP] bit is written to 1
-  #else
-	// if we need faster than the crystal, turn on the PLL
-    #if F_CPU == 72000000
-	MCG_C5 = MCG_C5_PRDIV0(5);		 // config PLL input for 16 MHz Crystal / 6 = 2.667 Hz
-    #else
-	MCG_C5 = MCG_C5_PRDIV0(3);		 // config PLL input for 16 MHz Crystal / 4 = 4 MHz
-    #endif
-    #if F_CPU == 168000000
-	MCG_C6 = MCG_C6_PLLS | MCG_C6_VDIV0(18); // config PLL for 168 MHz output
-    #elif F_CPU == 144000000
-	MCG_C6 = MCG_C6_PLLS | MCG_C6_VDIV0(12); // config PLL for 144 MHz output
-    #elif F_CPU == 120000000
-	MCG_C6 = MCG_C6_PLLS | MCG_C6_VDIV0(6); // config PLL for 120 MHz output
-    #elif F_CPU == 72000000
-	MCG_C6 = MCG_C6_PLLS | MCG_C6_VDIV0(3); // config PLL for 72 MHz output
-    #else
-	MCG_C6 = MCG_C6_PLLS | MCG_C6_VDIV0(0); // config PLL for 96 MHz output
-    #endif
-	// wait for PLL to start using xtal as its input
-	while (!(MCG_S & MCG_S_PLLST)) ;
-	// wait for PLL to lock
-	while (!(MCG_S & MCG_S_LOCK0)) ;
-	// now we're in PBE mode
-  #endif
-#endif
-
-	// now program the clock dividers
-#if F_CPU == 168000000
-	// config divisors: 168 MHz core, 56 MHz bus, 33.6 MHz flash, USB = 168 * 2 / 7
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(2) |	 SIM_CLKDIV1_OUTDIV4(4);
-	SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(6) | SIM_CLKDIV2_USBFRAC;
-#elif F_CPU == 144000000
-	// config divisors: 144 MHz core, 48 MHz bus, 28.8 MHz flash, USB = 144 / 3
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(2) |	 SIM_CLKDIV1_OUTDIV4(4);
-	SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(2);
-#elif F_CPU == 120000000
-	// config divisors: 120 MHz core, 60 MHz bus, 24 MHz flash, USB = 128 * 2 / 5
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(1) |	 SIM_CLKDIV1_OUTDIV4(4);
-	SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(4) | SIM_CLKDIV2_USBFRAC;
-#elif F_CPU == 96000000
-	// config divisors: 96 MHz core, 48 MHz bus, 24 MHz flash, USB = 96 / 2
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(1) |	 SIM_CLKDIV1_OUTDIV4(3);
-	SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(1);
-#elif F_CPU == 72000000
-	// config divisors: 72 MHz core, 36 MHz bus, 24 MHz flash, USB = 72 * 2 / 3
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(1) |	 SIM_CLKDIV1_OUTDIV4(2);
-	SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(2) | SIM_CLKDIV2_USBFRAC;
-#elif F_CPU == 48000000
-	// config divisors: 48 MHz core, 48 MHz bus, 24 MHz flash, USB = 96 / 2
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(1) | SIM_CLKDIV1_OUTDIV2(1) |	 SIM_CLKDIV1_OUTDIV4(3);
-	SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(1);
-#elif F_CPU == 24000000
-	// config divisors: 24 MHz core, 24 MHz bus, 24 MHz flash, USB = 96 / 2
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(3) | SIM_CLKDIV1_OUTDIV2(3) |	 SIM_CLKDIV1_OUTDIV4(3);
-	SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(1);
-#elif F_CPU == 16000000
-	// config divisors: 16 MHz core, 16 MHz bus, 16 MHz flash
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(0) |	 SIM_CLKDIV1_OUTDIV4(0);
-#elif F_CPU == 8000000
-	// config divisors: 8 MHz core, 8 MHz bus, 8 MHz flash
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(1) | SIM_CLKDIV1_OUTDIV2(1) |	 SIM_CLKDIV1_OUTDIV4(1);
-#elif F_CPU == 4000000
-    // config divisors: 4 MHz core, 4 MHz bus, 2 MHz flash
-    // since we are running from external clock 16MHz
-    // fix outdiv too -> cpu 16/4, bus 16/4, flash 16/4
-    // here we can go into vlpr?
-	// config divisors: 4 MHz core, 4 MHz bus, 4 MHz flash
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(3) | SIM_CLKDIV1_OUTDIV2(3) |	 SIM_CLKDIV1_OUTDIV4(3);
-#elif F_CPU == 2000000
-    // since we are running from the fast internal reference clock 4MHz
-    // but is divided down by 2 so we actually have a 2MHz, MCG_SC[FCDIV] default is 2
-    // fix outdiv -> cpu 2/1, bus 2/1, flash 2/2
-	// config divisors: 2 MHz core, 2 MHz bus, 1 MHz flash
-	SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(0) |	 SIM_CLKDIV1_OUTDIV4(1);
-#else
-#error "Error, F_CPU must be 168, 144, 120, 96, 72, 48, 24, 16, 8, 4, or 2 MHz"
-#endif
-
-#if F_CPU > 16000000
-	// switch to PLL as clock source, FLL input = 16 MHz / 512
-	MCG_C1 = MCG_C1_CLKS(0) | MCG_C1_FRDIV(4);
-	// wait for PLL clock to be used
-	while ((MCG_S & MCG_S_CLKST_MASK) != MCG_S_CLKST(3)) ;
-	// now we're in PEE mode
-	// USB uses PLL clock, trace is CPU clock, CLKOUT=OSCERCLK0
-	SIM_SOPT2 = SIM_SOPT2_USBSRC | SIM_SOPT2_PLLFLLSEL | SIM_SOPT2_TRACECLKSEL | SIM_SOPT2_CLKOUTSEL(6);
-#else
-	SIM_SOPT2 = SIM_SOPT2_TRACECLKSEL | SIM_SOPT2_CLKOUTSEL(3);
-#endif
-
-#if F_CPU <= 2000000
-    // since we are not going into "stop mode" i removed it
-	SMC_PMCTRL = SMC_PMCTRL_RUNM(2); // VLPR mode :-)
-#endif
-
-	// initialize the SysTick counter
-	SYST_RVR = (F_CPU / 1000) - 1;
-	SYST_CSR = SYST_CSR_CLKSOURCE | SYST_CSR_TICKINT | SYST_CSR_ENABLE;
-
-	//init_pins();
-	__enable_irq();
-
-	_init_Teensyduino_internal_();
-	if (RTC_SR & RTC_SR_TIF) {
-		// TODO: this should probably set the time more aggressively, if
-		// we could reliably detect the first reboot after programming.
-		rtc_set(TIME_T);
-	}
-
-	__libc_init_array();
-
-	startup_late_hook();
-	main();
-	while (1) ;
-}
-
-char *__brkval = (char *)&_ebss;
-
-void * _sbrk(int incr)
-{
-	char *prev = __brkval;
-	__brkval += incr;
-	return prev;
-}
-
-__attribute__((weak)) 
-int _read(int file, char *ptr, int len)
-{
-	return 0;
-}
-
-__attribute__((weak)) 
-int _close(int fd)
-{
-	return -1;
-}
-
-#include <sys/stat.h>
-
-__attribute__((weak)) 
-int _fstat(int fd, struct stat *st)
-{
-	st->st_mode = S_IFCHR;
-	return 0;
-}
-
-__attribute__((weak)) 
-int _isatty(int fd)
-{
-	return 1;
-}
-
-__attribute__((weak)) 
-int _lseek(int fd, long long offset, int whence)
-{
-	return -1;
-}
-
-__attribute__((weak)) 
-void _exit(int status)
-{
-	while (1);
-}
-
-__attribute__((weak)) 
-void __cxa_pure_virtual()
-{
-	while (1);
-}
-
-__attribute__((weak)) 
-int __cxa_guard_acquire (char *g) 
-{
-	return !(*g);
-}
-
-__attribute__((weak)) 
-void __cxa_guard_release(char *g)
-{
-	*g = 1;
-}
-
-int nvic_execution_priority(void)
-{
-	int priority=256;
-	uint32_t primask, faultmask, basepri, ipsr;
-
-	// full algorithm in ARM DDI0403D, page B1-639
-	// this isn't quite complete, but hopefully good enough
-	__asm__ volatile("mrs %0, faultmask\n" : "=r" (faultmask)::);
-	if (faultmask) return -1;
-	__asm__ volatile("mrs %0, primask\n" : "=r" (primask)::);
-	if (primask) return 0;
-	__asm__ volatile("mrs %0, ipsr\n" : "=r" (ipsr)::);
-	if (ipsr) {
-		if (ipsr < 16) priority = 0; // could be non-zero
-		else priority = NVIC_GET_PRIORITY(ipsr - 16);
-	}
-	__asm__ volatile("mrs %0, basepri\n" : "=r" (basepri)::);
-	if (basepri > 0 && basepri < priority) priority = basepri;
-	return priority;
-}
-
diff --git a/ports/teensy/core/mk20dx128.h b/ports/teensy/core/mk20dx128.h
deleted file mode 100644
index c6eda2837fbe7..0000000000000
--- a/ports/teensy/core/mk20dx128.h
+++ /dev/null
@@ -1,2385 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 _mk20dx128_h_
-#define _mk20dx128_h_
-
-//#ifdef F_CPU
-//#undef F_CPU
-//#endif
-//#define F_CPU 168000000
-//#define F_CPU 144000000
-//#define F_CPU 120000000
-//#define F_CPU 96000000
-//#define F_CPU 72000000
-//#define F_CPU 48000000
-//#define F_CPU 24000000
-
-#if (F_CPU == 168000000)
- #define F_BUS 56000000
- #define F_MEM 33600000
-#elif (F_CPU == 144000000)
- #define F_BUS 48000000
- #define F_MEM 28800000
-#elif (F_CPU == 120000000)
- #define F_BUS 60000000
- #define F_MEM 24000000
-#elif (F_CPU == 96000000)
- #define F_BUS 48000000
- #define F_MEM 24000000
-#elif (F_CPU == 72000000)
- #define F_BUS 36000000
- #define F_MEM 24000000
-#elif (F_CPU == 48000000)
- #define F_BUS 48000000
- #define F_MEM 24000000
-#elif (F_CPU == 24000000)
- #define F_BUS 24000000
- #define F_MEM 24000000
-#elif (F_CPU == 16000000)
- #define F_BUS 16000000
- #define F_MEM 16000000
-#elif (F_CPU == 8000000)
- #define F_BUS 8000000
- #define F_MEM 8000000
-#elif (F_CPU == 4000000)
- #define F_BUS 4000000
- #define F_MEM 4000000
-#elif (F_CPU == 2000000)
- #define F_BUS 2000000
- #define F_MEM 1000000
-#endif
-
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
-#include <stdint.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// chapter 11: Port control and interrupts (PORT)
-#define PORTA_PCR0		*(volatile uint32_t *)0x40049000 // Pin Control Register n
-#define PORT_PCR_ISF			(uint32_t)0x01000000		// Interrupt Status Flag
-#define PORT_PCR_IRQC(n)		(uint32_t)(((n) & 15) << 16)	// Interrupt Configuration
-#define PORT_PCR_IRQC_MASK		(uint32_t)0x000F0000
-#define PORT_PCR_LK			(uint32_t)0x00008000		// Lock Register
-#define PORT_PCR_MUX(n)			(uint32_t)(((n) & 7) << 8)	// Pin Mux Control
-#define PORT_PCR_MUX_MASK		(uint32_t)0x00000700
-#define PORT_PCR_DSE			(uint32_t)0x00000040		// Drive Strength Enable
-#define PORT_PCR_ODE			(uint32_t)0x00000020		// Open Drain Enable
-#define PORT_PCR_PFE			(uint32_t)0x00000010		// Passive Filter Enable
-#define PORT_PCR_SRE			(uint32_t)0x00000004		// Slew Rate Enable
-#define PORT_PCR_PE			(uint32_t)0x00000002		// Pull Enable
-#define PORT_PCR_PS			(uint32_t)0x00000001		// Pull Select
-#define PORTA_PCR1		*(volatile uint32_t *)0x40049004 // Pin Control Register n
-#define PORTA_PCR2		*(volatile uint32_t *)0x40049008 // Pin Control Register n
-#define PORTA_PCR3		*(volatile uint32_t *)0x4004900C // Pin Control Register n
-#define PORTA_PCR4		*(volatile uint32_t *)0x40049010 // Pin Control Register n
-#define PORTA_PCR5		*(volatile uint32_t *)0x40049014 // Pin Control Register n
-#define PORTA_PCR6		*(volatile uint32_t *)0x40049018 // Pin Control Register n
-#define PORTA_PCR7		*(volatile uint32_t *)0x4004901C // Pin Control Register n
-#define PORTA_PCR8		*(volatile uint32_t *)0x40049020 // Pin Control Register n
-#define PORTA_PCR9		*(volatile uint32_t *)0x40049024 // Pin Control Register n
-#define PORTA_PCR10		*(volatile uint32_t *)0x40049028 // Pin Control Register n
-#define PORTA_PCR11		*(volatile uint32_t *)0x4004902C // Pin Control Register n
-#define PORTA_PCR12		*(volatile uint32_t *)0x40049030 // Pin Control Register n
-#define PORTA_PCR13		*(volatile uint32_t *)0x40049034 // Pin Control Register n
-#define PORTA_PCR14		*(volatile uint32_t *)0x40049038 // Pin Control Register n
-#define PORTA_PCR15		*(volatile uint32_t *)0x4004903C // Pin Control Register n
-#define PORTA_PCR16		*(volatile uint32_t *)0x40049040 // Pin Control Register n
-#define PORTA_PCR17		*(volatile uint32_t *)0x40049044 // Pin Control Register n
-#define PORTA_PCR18		*(volatile uint32_t *)0x40049048 // Pin Control Register n
-#define PORTA_PCR19		*(volatile uint32_t *)0x4004904C // Pin Control Register n
-#define PORTA_PCR20		*(volatile uint32_t *)0x40049050 // Pin Control Register n
-#define PORTA_PCR21		*(volatile uint32_t *)0x40049054 // Pin Control Register n
-#define PORTA_PCR22		*(volatile uint32_t *)0x40049058 // Pin Control Register n
-#define PORTA_PCR23		*(volatile uint32_t *)0x4004905C // Pin Control Register n
-#define PORTA_PCR24		*(volatile uint32_t *)0x40049060 // Pin Control Register n
-#define PORTA_PCR25		*(volatile uint32_t *)0x40049064 // Pin Control Register n
-#define PORTA_PCR26		*(volatile uint32_t *)0x40049068 // Pin Control Register n
-#define PORTA_PCR27		*(volatile uint32_t *)0x4004906C // Pin Control Register n
-#define PORTA_PCR28		*(volatile uint32_t *)0x40049070 // Pin Control Register n
-#define PORTA_PCR29		*(volatile uint32_t *)0x40049074 // Pin Control Register n
-#define PORTA_PCR30		*(volatile uint32_t *)0x40049078 // Pin Control Register n
-#define PORTA_PCR31		*(volatile uint32_t *)0x4004907C // Pin Control Register n
-#define PORTA_GPCLR		*(volatile uint32_t *)0x40049080 // Global Pin Control Low Register
-#define PORTA_GPCHR		*(volatile uint32_t *)0x40049084 // Global Pin Control High Register
-#define PORTA_ISFR		*(volatile uint32_t *)0x400490A0 // Interrupt Status Flag Register
-#define PORTB_PCR0		*(volatile uint32_t *)0x4004A000 // Pin Control Register n
-#define PORTB_PCR1		*(volatile uint32_t *)0x4004A004 // Pin Control Register n
-#define PORTB_PCR2		*(volatile uint32_t *)0x4004A008 // Pin Control Register n
-#define PORTB_PCR3		*(volatile uint32_t *)0x4004A00C // Pin Control Register n
-#define PORTB_PCR4		*(volatile uint32_t *)0x4004A010 // Pin Control Register n
-#define PORTB_PCR5		*(volatile uint32_t *)0x4004A014 // Pin Control Register n
-#define PORTB_PCR6		*(volatile uint32_t *)0x4004A018 // Pin Control Register n
-#define PORTB_PCR7		*(volatile uint32_t *)0x4004A01C // Pin Control Register n
-#define PORTB_PCR8		*(volatile uint32_t *)0x4004A020 // Pin Control Register n
-#define PORTB_PCR9		*(volatile uint32_t *)0x4004A024 // Pin Control Register n
-#define PORTB_PCR10		*(volatile uint32_t *)0x4004A028 // Pin Control Register n
-#define PORTB_PCR11		*(volatile uint32_t *)0x4004A02C // Pin Control Register n
-#define PORTB_PCR12		*(volatile uint32_t *)0x4004A030 // Pin Control Register n
-#define PORTB_PCR13		*(volatile uint32_t *)0x4004A034 // Pin Control Register n
-#define PORTB_PCR14		*(volatile uint32_t *)0x4004A038 // Pin Control Register n
-#define PORTB_PCR15		*(volatile uint32_t *)0x4004A03C // Pin Control Register n
-#define PORTB_PCR16		*(volatile uint32_t *)0x4004A040 // Pin Control Register n
-#define PORTB_PCR17		*(volatile uint32_t *)0x4004A044 // Pin Control Register n
-#define PORTB_PCR18		*(volatile uint32_t *)0x4004A048 // Pin Control Register n
-#define PORTB_PCR19		*(volatile uint32_t *)0x4004A04C // Pin Control Register n
-#define PORTB_PCR20		*(volatile uint32_t *)0x4004A050 // Pin Control Register n
-#define PORTB_PCR21		*(volatile uint32_t *)0x4004A054 // Pin Control Register n
-#define PORTB_PCR22		*(volatile uint32_t *)0x4004A058 // Pin Control Register n
-#define PORTB_PCR23		*(volatile uint32_t *)0x4004A05C // Pin Control Register n
-#define PORTB_PCR24		*(volatile uint32_t *)0x4004A060 // Pin Control Register n
-#define PORTB_PCR25		*(volatile uint32_t *)0x4004A064 // Pin Control Register n
-#define PORTB_PCR26		*(volatile uint32_t *)0x4004A068 // Pin Control Register n
-#define PORTB_PCR27		*(volatile uint32_t *)0x4004A06C // Pin Control Register n
-#define PORTB_PCR28		*(volatile uint32_t *)0x4004A070 // Pin Control Register n
-#define PORTB_PCR29		*(volatile uint32_t *)0x4004A074 // Pin Control Register n
-#define PORTB_PCR30		*(volatile uint32_t *)0x4004A078 // Pin Control Register n
-#define PORTB_PCR31		*(volatile uint32_t *)0x4004A07C // Pin Control Register n
-#define PORTB_GPCLR		*(volatile uint32_t *)0x4004A080 // Global Pin Control Low Register
-#define PORTB_GPCHR		*(volatile uint32_t *)0x4004A084 // Global Pin Control High Register
-#define PORTB_ISFR		*(volatile uint32_t *)0x4004A0A0 // Interrupt Status Flag Register
-#define PORTC_PCR0		*(volatile uint32_t *)0x4004B000 // Pin Control Register n
-#define PORTC_PCR1		*(volatile uint32_t *)0x4004B004 // Pin Control Register n
-#define PORTC_PCR2		*(volatile uint32_t *)0x4004B008 // Pin Control Register n
-#define PORTC_PCR3		*(volatile uint32_t *)0x4004B00C // Pin Control Register n
-#define PORTC_PCR4		*(volatile uint32_t *)0x4004B010 // Pin Control Register n
-#define PORTC_PCR5		*(volatile uint32_t *)0x4004B014 // Pin Control Register n
-#define PORTC_PCR6		*(volatile uint32_t *)0x4004B018 // Pin Control Register n
-#define PORTC_PCR7		*(volatile uint32_t *)0x4004B01C // Pin Control Register n
-#define PORTC_PCR8		*(volatile uint32_t *)0x4004B020 // Pin Control Register n
-#define PORTC_PCR9		*(volatile uint32_t *)0x4004B024 // Pin Control Register n
-#define PORTC_PCR10		*(volatile uint32_t *)0x4004B028 // Pin Control Register n
-#define PORTC_PCR11		*(volatile uint32_t *)0x4004B02C // Pin Control Register n
-#define PORTC_PCR12		*(volatile uint32_t *)0x4004B030 // Pin Control Register n
-#define PORTC_PCR13		*(volatile uint32_t *)0x4004B034 // Pin Control Register n
-#define PORTC_PCR14		*(volatile uint32_t *)0x4004B038 // Pin Control Register n
-#define PORTC_PCR15		*(volatile uint32_t *)0x4004B03C // Pin Control Register n
-#define PORTC_PCR16		*(volatile uint32_t *)0x4004B040 // Pin Control Register n
-#define PORTC_PCR17		*(volatile uint32_t *)0x4004B044 // Pin Control Register n
-#define PORTC_PCR18		*(volatile uint32_t *)0x4004B048 // Pin Control Register n
-#define PORTC_PCR19		*(volatile uint32_t *)0x4004B04C // Pin Control Register n
-#define PORTC_PCR20		*(volatile uint32_t *)0x4004B050 // Pin Control Register n
-#define PORTC_PCR21		*(volatile uint32_t *)0x4004B054 // Pin Control Register n
-#define PORTC_PCR22		*(volatile uint32_t *)0x4004B058 // Pin Control Register n
-#define PORTC_PCR23		*(volatile uint32_t *)0x4004B05C // Pin Control Register n
-#define PORTC_PCR24		*(volatile uint32_t *)0x4004B060 // Pin Control Register n
-#define PORTC_PCR25		*(volatile uint32_t *)0x4004B064 // Pin Control Register n
-#define PORTC_PCR26		*(volatile uint32_t *)0x4004B068 // Pin Control Register n
-#define PORTC_PCR27		*(volatile uint32_t *)0x4004B06C // Pin Control Register n
-#define PORTC_PCR28		*(volatile uint32_t *)0x4004B070 // Pin Control Register n
-#define PORTC_PCR29		*(volatile uint32_t *)0x4004B074 // Pin Control Register n
-#define PORTC_PCR30		*(volatile uint32_t *)0x4004B078 // Pin Control Register n
-#define PORTC_PCR31		*(volatile uint32_t *)0x4004B07C // Pin Control Register n
-#define PORTC_GPCLR		*(volatile uint32_t *)0x4004B080 // Global Pin Control Low Register
-#define PORTC_GPCHR		*(volatile uint32_t *)0x4004B084 // Global Pin Control High Register
-#define PORTC_ISFR		*(volatile uint32_t *)0x4004B0A0 // Interrupt Status Flag Register
-#define PORTD_PCR0		*(volatile uint32_t *)0x4004C000 // Pin Control Register n
-#define PORTD_PCR1		*(volatile uint32_t *)0x4004C004 // Pin Control Register n
-#define PORTD_PCR2		*(volatile uint32_t *)0x4004C008 // Pin Control Register n
-#define PORTD_PCR3		*(volatile uint32_t *)0x4004C00C // Pin Control Register n
-#define PORTD_PCR4		*(volatile uint32_t *)0x4004C010 // Pin Control Register n
-#define PORTD_PCR5		*(volatile uint32_t *)0x4004C014 // Pin Control Register n
-#define PORTD_PCR6		*(volatile uint32_t *)0x4004C018 // Pin Control Register n
-#define PORTD_PCR7		*(volatile uint32_t *)0x4004C01C // Pin Control Register n
-#define PORTD_PCR8		*(volatile uint32_t *)0x4004C020 // Pin Control Register n
-#define PORTD_PCR9		*(volatile uint32_t *)0x4004C024 // Pin Control Register n
-#define PORTD_PCR10		*(volatile uint32_t *)0x4004C028 // Pin Control Register n
-#define PORTD_PCR11		*(volatile uint32_t *)0x4004C02C // Pin Control Register n
-#define PORTD_PCR12		*(volatile uint32_t *)0x4004C030 // Pin Control Register n
-#define PORTD_PCR13		*(volatile uint32_t *)0x4004C034 // Pin Control Register n
-#define PORTD_PCR14		*(volatile uint32_t *)0x4004C038 // Pin Control Register n
-#define PORTD_PCR15		*(volatile uint32_t *)0x4004C03C // Pin Control Register n
-#define PORTD_PCR16		*(volatile uint32_t *)0x4004C040 // Pin Control Register n
-#define PORTD_PCR17		*(volatile uint32_t *)0x4004C044 // Pin Control Register n
-#define PORTD_PCR18		*(volatile uint32_t *)0x4004C048 // Pin Control Register n
-#define PORTD_PCR19		*(volatile uint32_t *)0x4004C04C // Pin Control Register n
-#define PORTD_PCR20		*(volatile uint32_t *)0x4004C050 // Pin Control Register n
-#define PORTD_PCR21		*(volatile uint32_t *)0x4004C054 // Pin Control Register n
-#define PORTD_PCR22		*(volatile uint32_t *)0x4004C058 // Pin Control Register n
-#define PORTD_PCR23		*(volatile uint32_t *)0x4004C05C // Pin Control Register n
-#define PORTD_PCR24		*(volatile uint32_t *)0x4004C060 // Pin Control Register n
-#define PORTD_PCR25		*(volatile uint32_t *)0x4004C064 // Pin Control Register n
-#define PORTD_PCR26		*(volatile uint32_t *)0x4004C068 // Pin Control Register n
-#define PORTD_PCR27		*(volatile uint32_t *)0x4004C06C // Pin Control Register n
-#define PORTD_PCR28		*(volatile uint32_t *)0x4004C070 // Pin Control Register n
-#define PORTD_PCR29		*(volatile uint32_t *)0x4004C074 // Pin Control Register n
-#define PORTD_PCR30		*(volatile uint32_t *)0x4004C078 // Pin Control Register n
-#define PORTD_PCR31		*(volatile uint32_t *)0x4004C07C // Pin Control Register n
-#define PORTD_GPCLR		*(volatile uint32_t *)0x4004C080 // Global Pin Control Low Register
-#define PORTD_GPCHR		*(volatile uint32_t *)0x4004C084 // Global Pin Control High Register
-#define PORTD_ISFR		*(volatile uint32_t *)0x4004C0A0 // Interrupt Status Flag Register
-#define PORTE_PCR0		*(volatile uint32_t *)0x4004D000 // Pin Control Register n
-#define PORTE_PCR1		*(volatile uint32_t *)0x4004D004 // Pin Control Register n
-#define PORTE_PCR2		*(volatile uint32_t *)0x4004D008 // Pin Control Register n
-#define PORTE_PCR3		*(volatile uint32_t *)0x4004D00C // Pin Control Register n
-#define PORTE_PCR4		*(volatile uint32_t *)0x4004D010 // Pin Control Register n
-#define PORTE_PCR5		*(volatile uint32_t *)0x4004D014 // Pin Control Register n
-#define PORTE_PCR6		*(volatile uint32_t *)0x4004D018 // Pin Control Register n
-#define PORTE_PCR7		*(volatile uint32_t *)0x4004D01C // Pin Control Register n
-#define PORTE_PCR8		*(volatile uint32_t *)0x4004D020 // Pin Control Register n
-#define PORTE_PCR9		*(volatile uint32_t *)0x4004D024 // Pin Control Register n
-#define PORTE_PCR10		*(volatile uint32_t *)0x4004D028 // Pin Control Register n
-#define PORTE_PCR11		*(volatile uint32_t *)0x4004D02C // Pin Control Register n
-#define PORTE_PCR12		*(volatile uint32_t *)0x4004D030 // Pin Control Register n
-#define PORTE_PCR13		*(volatile uint32_t *)0x4004D034 // Pin Control Register n
-#define PORTE_PCR14		*(volatile uint32_t *)0x4004D038 // Pin Control Register n
-#define PORTE_PCR15		*(volatile uint32_t *)0x4004D03C // Pin Control Register n
-#define PORTE_PCR16		*(volatile uint32_t *)0x4004D040 // Pin Control Register n
-#define PORTE_PCR17		*(volatile uint32_t *)0x4004D044 // Pin Control Register n
-#define PORTE_PCR18		*(volatile uint32_t *)0x4004D048 // Pin Control Register n
-#define PORTE_PCR19		*(volatile uint32_t *)0x4004D04C // Pin Control Register n
-#define PORTE_PCR20		*(volatile uint32_t *)0x4004D050 // Pin Control Register n
-#define PORTE_PCR21		*(volatile uint32_t *)0x4004D054 // Pin Control Register n
-#define PORTE_PCR22		*(volatile uint32_t *)0x4004D058 // Pin Control Register n
-#define PORTE_PCR23		*(volatile uint32_t *)0x4004D05C // Pin Control Register n
-#define PORTE_PCR24		*(volatile uint32_t *)0x4004D060 // Pin Control Register n
-#define PORTE_PCR25		*(volatile uint32_t *)0x4004D064 // Pin Control Register n
-#define PORTE_PCR26		*(volatile uint32_t *)0x4004D068 // Pin Control Register n
-#define PORTE_PCR27		*(volatile uint32_t *)0x4004D06C // Pin Control Register n
-#define PORTE_PCR28		*(volatile uint32_t *)0x4004D070 // Pin Control Register n
-#define PORTE_PCR29		*(volatile uint32_t *)0x4004D074 // Pin Control Register n
-#define PORTE_PCR30		*(volatile uint32_t *)0x4004D078 // Pin Control Register n
-#define PORTE_PCR31		*(volatile uint32_t *)0x4004D07C // Pin Control Register n
-#define PORTE_GPCLR		*(volatile uint32_t *)0x4004D080 // Global Pin Control Low Register
-#define PORTE_GPCHR		*(volatile uint32_t *)0x4004D084 // Global Pin Control High Register
-#define PORTE_ISFR		*(volatile uint32_t *)0x4004D0A0 // Interrupt Status Flag Register
-
-// Chapter 12: System Integration Module (SIM)
-#define SIM_SOPT1		*(volatile uint32_t *)0x40047000 // System Options Register 1
-#define SIM_SOPT1CFG		*(volatile uint32_t *)0x40047004 // SOPT1 Configuration Register
-#define SIM_SOPT2		*(volatile uint32_t *)0x40048004 // System Options Register 2
-#define SIM_SOPT2_USBSRC		(uint32_t)0x00040000		// 0=USB_CLKIN, 1=FFL/PLL
-#define SIM_SOPT2_PLLFLLSEL		(uint32_t)0x00010000		// 0=FLL, 1=PLL
-#define SIM_SOPT2_TRACECLKSEL		(uint32_t)0x00001000		// 0=MCGOUTCLK, 1=CPU
-#define SIM_SOPT2_PTD7PAD		(uint32_t)0x00000800		// 0=normal, 1=double drive PTD7
-#define SIM_SOPT2_CLKOUTSEL(n)		(uint32_t)(((n) & 7) << 5)	// Selects the clock to output on the CLKOUT pin.
-#define SIM_SOPT2_RTCCLKOUTSEL		(uint32_t)0x00000010		// RTC clock out select
-#define SIM_SOPT4		*(volatile uint32_t *)0x4004800C // System Options Register 4
-#define SIM_SOPT5		*(volatile uint32_t *)0x40048010 // System Options Register 5
-#define SIM_SOPT7		*(volatile uint32_t *)0x40048018 // System Options Register 7
-#define SIM_SDID		*(const	   uint32_t *)0x40048024 // System Device Identification Register
-#define SIM_SCGC2		*(volatile uint32_t *)0x4004802C // System Clock Gating Control Register 2
-#define SIM_SCGC2_DAC0			(uint32_t)0x00001000		// DAC0 Clock Gate Control
-#define SIM_SCGC3		*(volatile uint32_t *)0x40048030 // System Clock Gating Control Register 3
-#define SIM_SCGC3_ADC1			(uint32_t)0x08000000		// ADC1 Clock Gate Control
-#define SIM_SCGC3_FTM2			(uint32_t)0x01000000		// FTM2 Clock Gate Control
-#define SIM_SCGC4		*(volatile uint32_t *)0x40048034 // System Clock Gating Control Register 4
-#define SIM_SCGC4_VREF			(uint32_t)0x00100000		// VREF Clock Gate Control
-#define SIM_SCGC4_CMP			(uint32_t)0x00080000		// Comparator Clock Gate Control
-#define SIM_SCGC4_USBOTG		(uint32_t)0x00040000		// USB Clock Gate Control
-#define SIM_SCGC4_UART2			(uint32_t)0x00001000		// UART2 Clock Gate Control
-#define SIM_SCGC4_UART1			(uint32_t)0x00000800		// UART1 Clock Gate Control
-#define SIM_SCGC4_UART0			(uint32_t)0x00000400		// UART0 Clock Gate Control
-#define SIM_SCGC4_I2C1			(uint32_t)0x00000080		// I2C1 Clock Gate Control
-#define SIM_SCGC4_I2C0			(uint32_t)0x00000040		// I2C0 Clock Gate Control
-#define SIM_SCGC4_CMT			(uint32_t)0x00000004		// CMT Clock Gate Control
-#define SIM_SCGC4_EWM			(uint32_t)0x00000002		// EWM Clock Gate Control
-#define SIM_SCGC5		*(volatile uint32_t *)0x40048038 // System Clock Gating Control Register 5
-#define SIM_SCGC5_PORTE			(uint32_t)0x00002000		// Port E Clock Gate Control
-#define SIM_SCGC5_PORTD			(uint32_t)0x00001000		// Port D Clock Gate Control
-#define SIM_SCGC5_PORTC			(uint32_t)0x00000800		// Port C Clock Gate Control
-#define SIM_SCGC5_PORTB			(uint32_t)0x00000400		// Port B Clock Gate Control
-#define SIM_SCGC5_PORTA			(uint32_t)0x00000200		// Port A Clock Gate Control
-#define SIM_SCGC5_TSI			(uint32_t)0x00000020		// Touch Sense Input TSI Clock Gate Control
-#define SIM_SCGC5_LPTIMER		(uint32_t)0x00000001		// Low Power Timer Access Control
-#define SIM_SCGC6		*(volatile uint32_t *)0x4004803C // System Clock Gating Control Register 6
-#define SIM_SCGC6_RTC			(uint32_t)0x20000000		// RTC Access
-#define SIM_SCGC6_ADC0			(uint32_t)0x08000000		// ADC0 Clock Gate Control
-#define SIM_SCGC6_FTM1			(uint32_t)0x02000000		// FTM1 Clock Gate Control
-#define SIM_SCGC6_FTM0			(uint32_t)0x01000000		// FTM0 Clock Gate Control
-#define SIM_SCGC6_PIT			(uint32_t)0x00800000		// PIT Clock Gate Control
-#define SIM_SCGC6_PDB			(uint32_t)0x00400000		// PDB Clock Gate Control
-#define SIM_SCGC6_USBDCD		(uint32_t)0x00200000		// USB DCD Clock Gate Control
-#define SIM_SCGC6_CRC			(uint32_t)0x00040000		// CRC Clock Gate Control
-#define SIM_SCGC6_I2S			(uint32_t)0x00008000		// I2S Clock Gate Control
-#define SIM_SCGC6_SPI1			(uint32_t)0x00002000		// SPI1 Clock Gate Control
-#define SIM_SCGC6_SPI0			(uint32_t)0x00001000		// SPI0 Clock Gate Control
-#define SIM_SCGC6_FLEXCAN0		(uint32_t)0x00000010		// FlexCAN0 Clock Gate Control
-#define SIM_SCGC6_DMAMUX		(uint32_t)0x00000002		// DMA Mux Clock Gate Control
-#define SIM_SCGC6_FTFL			(uint32_t)0x00000001		// Flash Memory Clock Gate Control
-#define SIM_SCGC7		*(volatile uint32_t *)0x40048040 // System Clock Gating Control Register 7
-#define SIM_SCGC7_DMA			(uint32_t)0x00000002		// DMA Clock Gate Control
-#define SIM_CLKDIV1		*(volatile uint32_t *)0x40048044 // System Clock Divider Register 1
-#define SIM_CLKDIV1_OUTDIV1(n)		(uint32_t)(((n) & 0x0F) << 28)	// divide value for the core/system clock
-#define SIM_CLKDIV1_OUTDIV2(n)		(uint32_t)(((n) & 0x0F) << 24)	// divide value for the peripheral clock
-#define SIM_CLKDIV1_OUTDIV4(n)		(uint32_t)(((n) & 0x0F) << 16)	// divide value for the flash clock
-#define SIM_CLKDIV2		*(volatile uint32_t *)0x40048048 // System Clock Divider Register 2
-#define SIM_CLKDIV2_USBDIV(n)		(uint32_t)(((n) & 0x07) << 1)
-#define SIM_CLKDIV2_USBFRAC		(uint32_t)0x01
-#define SIM_FCFG1		*(const	   uint32_t *)0x4004804C // Flash Configuration Register 1
-#define SIM_FCFG2		*(const	   uint32_t *)0x40048050 // Flash Configuration Register 2
-#define SIM_UIDH		*(const	   uint32_t *)0x40048054 // Unique Identification Register High
-#define SIM_UIDMH		*(const	   uint32_t *)0x40048058 // Unique Identification Register Mid-High
-#define SIM_UIDML		*(const	   uint32_t *)0x4004805C // Unique Identification Register Mid Low
-#define SIM_UIDL		*(const	   uint32_t *)0x40048060 // Unique Identification Register Low
-
-// Chapter 13: Reset Control Module (RCM)
-#define RCM_SRS0		*(volatile uint8_t  *)0x4007F000 // System Reset Status Register 0
-#define RCM_SRS1		*(volatile uint8_t  *)0x4007F001 // System Reset Status Register 1
-#define RCM_RPFC		*(volatile uint8_t  *)0x4007F004 // Reset Pin Filter Control Register
-#define RCM_RPFW		*(volatile uint8_t  *)0x4007F005 // Reset Pin Filter Width Register
-#define RCM_MR			*(volatile uint8_t  *)0x4007F007 // Mode Register
-
-// Chapter 14: System Mode Controller
-#define SMC_PMPROT		*(volatile uint8_t  *)0x4007E000 // Power Mode Protection Register
-#define SMC_PMPROT_AVLP			(uint8_t)0x20			// Allow very low power modes
-#define SMC_PMPROT_ALLS			(uint8_t)0x08			// Allow low leakage stop mode
-#define SMC_PMPROT_AVLLS		(uint8_t)0x02			// Allow very low leakage stop mode
-#define SMC_PMCTRL		*(volatile uint8_t  *)0x4007E001 // Power Mode Control Register
-#define SMC_PMCTRL_LPWUI		(uint8_t)0x80			// Low Power Wake Up on Interrupt
-#define SMC_PMCTRL_RUNM(n)		(uint8_t)(((n) & 0x03) << 5)	// Run Mode Control
-#define SMC_PMCTRL_STOPA		(uint8_t)0x08			// Stop Aborted
-#define SMC_PMCTRL_STOPM(n)		(uint8_t)((n) & 0x07)		// Stop Mode Control
-#define SMC_VLLSCTRL		*(volatile uint8_t  *)0x4007E002 // VLLS Control Register
-#define SMC_VLLSCTRL_PORPO		(uint8_t)0x20			// POR Power Option
-#define SMC_VLLSCTRL_VLLSM(n)		(uint8_t)((n) & 0x07)		// VLLS Mode Control
-#define SMC_PMSTAT		*(volatile uint8_t  *)0x4007E003 // Power Mode Status Register
-#define SMC_PMSTAT_RUN			(uint8_t)0x01			// Current power mode is RUN
-#define SMC_PMSTAT_STOP			(uint8_t)0x02			// Current power mode is STOP
-#define SMC_PMSTAT_VLPR			(uint8_t)0x04			// Current power mode is VLPR
-#define SMC_PMSTAT_VLPW			(uint8_t)0x08			// Current power mode is VLPW
-#define SMC_PMSTAT_VLPS			(uint8_t)0x10			// Current power mode is VLPS
-#define SMC_PMSTAT_LLS			(uint8_t)0x20			// Current power mode is LLS
-#define SMC_PMSTAT_VLLS			(uint8_t)0x40			// Current power mode is VLLS
-
-// Chapter 15: Power Management Controller
-#define PMC_LVDSC1		*(volatile uint8_t  *)0x4007D000 // Low Voltage Detect Status And Control 1 register
-#define PMC_LVDSC1_LVDF			(uint8_t)0x80			// Low-Voltage Detect Flag
-#define PMC_LVDSC1_LVDACK		(uint8_t)0x40			// Low-Voltage Detect Acknowledge
-#define PMC_LVDSC1_LVDIE		(uint8_t)0x20			// Low-Voltage Detect Interrupt Enable
-#define PMC_LVDSC1_LVDRE		(uint8_t)0x10			// Low-Voltage Detect Reset Enable
-#define PMC_LVDSC1_LVDV(n)		(uint8_t)((n) & 0x03)		// Low-Voltage Detect Voltage Select
-#define PMC_LVDSC2		*(volatile uint8_t  *)0x4007D001 // Low Voltage Detect Status And Control 2 register
-#define PMC_LVDSC2_LVWF			(uint8_t)0x80			// Low-Voltage Warning Flag
-#define PMC_LVDSC2_LVWACK		(uint8_t)0x40			// Low-Voltage Warning Acknowledge
-#define PMC_LVDSC2_LVWIE		(uint8_t)0x20			// Low-Voltage Warning Interrupt Enable
-#define PMC_LVDSC2_LVWV(n)		(uint8_t)((n) & 0x03)		// Low-Voltage Warning Voltage Select
-#define PMC_REGSC		*(volatile uint8_t  *)0x4007D002 // Regulator Status And Control register
-#define PMC_REGSC_BGEN			(uint8_t)0x10			// Bandgap Enable In VLPx Operation
-#define PMC_REGSC_ACKISO		(uint8_t)0x08			// Acknowledge Isolation
-#define PMC_REGSC_REGONS		(uint8_t)0x04			// Regulator In Run Regulation Status
-#define PMC_REGSC_BGBE			(uint8_t)0x01			// Bandgap Buffer Enable
-
-// Chapter 16: Low-Leakage Wakeup Unit (LLWU)
-#define LLWU_PE1		*(volatile uint8_t  *)0x4007C000 // LLWU Pin Enable 1 register
-#define LLWU_PE2		*(volatile uint8_t  *)0x4007C001 // LLWU Pin Enable 2 register
-#define LLWU_PE3		*(volatile uint8_t  *)0x4007C002 // LLWU Pin Enable 3 register
-#define LLWU_PE4		*(volatile uint8_t  *)0x4007C003 // LLWU Pin Enable 4 register
-#define LLWU_ME			*(volatile uint8_t  *)0x4007C004 // LLWU Module Enable register
-#define LLWU_F1			*(volatile uint8_t  *)0x4007C005 // LLWU Flag 1 register
-#define LLWU_F2			*(volatile uint8_t  *)0x4007C006 // LLWU Flag 2 register
-#define LLWU_F3			*(volatile uint8_t  *)0x4007C007 // LLWU Flag 3 register
-#define LLWU_FILT1		*(volatile uint8_t  *)0x4007C008 // LLWU Pin Filter 1 register
-#define LLWU_FILT2		*(volatile uint8_t  *)0x4007C009 // LLWU Pin Filter 2 register
-#define LLWU_RST		*(volatile uint8_t  *)0x4007C00A // LLWU Reset Enable register
-
-// Chapter 17: Miscellaneous Control Module (MCM)
-#define MCM_PLASC		*(volatile uint16_t *)0xE0080008 // Crossbar Switch (AXBS) Slave Configuration
-#define MCM_PLAMC		*(volatile uint16_t *)0xE008000A // Crossbar Switch (AXBS) Master Configuration
-#define MCM_PLACR		*(volatile uint32_t *)0xE008000C // Crossbar Switch (AXBS) Control Register (MK20DX128)
-#define MCM_PLACR_ARG			(uint32_t)0x00000200		// Arbitration select, 0=fixed, 1=round-robin
-#define MCM_CR			*(volatile uint32_t *)0xE008000C // RAM arbitration control register (MK20DX256)
-#define MCM_CR_SRAMLWP			(uint32_t)0x40000000		// SRAM_L write protect
-#define MCM_CR_SRAMLAP(n)		(uint32_t)(((n) & 0x03) << 28)	// SRAM_L priority, 0=RR, 1=favor DMA, 2=CPU, 3=DMA
-#define MCM_CR_SRAMUWP			(uint32_t)0x04000000		// SRAM_U write protect
-#define MCM_CR_SRAMUAP(n)		(uint32_t)(((n) & 0x03) << 24)	// SRAM_U priority, 0=RR, 1=favor DMA, 2=CPU, 3=DMA
-
-// Crossbar Switch (AXBS) - only programmable on MK20DX256
-#define AXBS_PRS0		*(volatile uint32_t *)0x40004000 // Priority Registers Slave 0
-#define AXBS_CRS0		*(volatile uint32_t *)0x40004010 // Control Register 0
-#define AXBS_PRS1		*(volatile uint32_t *)0x40004100 // Priority Registers Slave 1
-#define AXBS_CRS1		*(volatile uint32_t *)0x40004110 // Control Register 1
-#define AXBS_PRS2		*(volatile uint32_t *)0x40004200 // Priority Registers Slave 2
-#define AXBS_CRS2		*(volatile uint32_t *)0x40004210 // Control Register 2
-#define AXBS_PRS3		*(volatile uint32_t *)0x40004300 // Priority Registers Slave 3
-#define AXBS_CRS3		*(volatile uint32_t *)0x40004310 // Control Register 3
-#define AXBS_PRS4		*(volatile uint32_t *)0x40004400 // Priority Registers Slave 4
-#define AXBS_CRS4		*(volatile uint32_t *)0x40004410 // Control Register 4
-#define AXBS_PRS5		*(volatile uint32_t *)0x40004500 // Priority Registers Slave 5
-#define AXBS_CRS5		*(volatile uint32_t *)0x40004510 // Control Register 5
-#define AXBS_PRS6		*(volatile uint32_t *)0x40004600 // Priority Registers Slave 6
-#define AXBS_CRS6		*(volatile uint32_t *)0x40004610 // Control Register 6
-#define AXBS_PRS7		*(volatile uint32_t *)0x40004700 // Priority Registers Slave 7
-#define AXBS_CRS7		*(volatile uint32_t *)0x40004710 // Control Register 7
-#define AXBS_MGPCR0		*(volatile uint32_t *)0x40004800 // Master 0 General Purpose Control Register
-#define AXBS_MGPCR1		*(volatile uint32_t *)0x40004900 // Master 1 General Purpose Control Register
-#define AXBS_MGPCR2		*(volatile uint32_t *)0x40004A00 // Master 2 General Purpose Control Register
-#define AXBS_MGPCR3		*(volatile uint32_t *)0x40004B00 // Master 3 General Purpose Control Register
-#define AXBS_MGPCR4		*(volatile uint32_t *)0x40004C00 // Master 4 General Purpose Control Register
-#define AXBS_MGPCR5		*(volatile uint32_t *)0x40004D00 // Master 5 General Purpose Control Register
-#define AXBS_MGPCR6		*(volatile uint32_t *)0x40004E00 // Master 6 General Purpose Control Register
-#define AXBS_MGPCR7		*(volatile uint32_t *)0x40004F00 // Master 7 General Purpose Control Register
-#define AXBS_CRS_READONLY		(uint32_t)0x80000000
-#define AXBS_CRS_HALTLOWPRIORITY	(uint32_t)0x40000000
-#define AXBS_CRS_ARB_FIXED		(uint32_t)0x00000000
-#define AXBS_CRS_ARB_ROUNDROBIN		(uint32_t)0x00010000
-#define AXBS_CRS_PARK_FIXED		(uint32_t)0x00000000
-#define AXBS_CRS_PARK_PREVIOUS		(uint32_t)0x00000010
-#define AXBS_CRS_PARK_NONE		(uint32_t)0x00000020
-#define AXBS_CRS_PARK(n)		(uint32_t)(((n) & 7) << 0)
-
-
-
-// Chapter 20: Direct Memory Access Multiplexer (DMAMUX)
-#define DMAMUX0_CHCFG0		*(volatile uint8_t  *)0x40021000 // Channel Configuration register
-#define DMAMUX0_CHCFG1		*(volatile uint8_t  *)0x40021001 // Channel Configuration register
-#define DMAMUX0_CHCFG2		*(volatile uint8_t  *)0x40021002 // Channel Configuration register
-#define DMAMUX0_CHCFG3		*(volatile uint8_t  *)0x40021003 // Channel Configuration register
-#define DMAMUX0_CHCFG4		*(volatile uint8_t  *)0x40021004 // Channel Configuration register
-#define DMAMUX0_CHCFG5		*(volatile uint8_t  *)0x40021005 // Channel Configuration register
-#define DMAMUX0_CHCFG6		*(volatile uint8_t  *)0x40021006 // Channel Configuration register
-#define DMAMUX0_CHCFG7		*(volatile uint8_t  *)0x40021007 // Channel Configuration register
-#define DMAMUX0_CHCFG8		*(volatile uint8_t  *)0x40021008 // Channel Configuration register
-#define DMAMUX0_CHCFG9		*(volatile uint8_t  *)0x40021009 // Channel Configuration register
-#define DMAMUX0_CHCFG10		*(volatile uint8_t  *)0x4002100A // Channel Configuration register
-#define DMAMUX0_CHCFG11		*(volatile uint8_t  *)0x4002100B // Channel Configuration register
-#define DMAMUX0_CHCFG12		*(volatile uint8_t  *)0x4002100C // Channel Configuration register
-#define DMAMUX0_CHCFG13		*(volatile uint8_t  *)0x4002100D // Channel Configuration register
-#define DMAMUX0_CHCFG14		*(volatile uint8_t  *)0x4002100E // Channel Configuration register
-#define DMAMUX0_CHCFG15		*(volatile uint8_t  *)0x4002100F // Channel Configuration register
-#define DMAMUX_DISABLE			0
-#define DMAMUX_TRIG			64
-#define DMAMUX_ENABLE			128
-#define DMAMUX_SOURCE_UART0_RX		2
-#define DMAMUX_SOURCE_UART0_TX		3
-#define DMAMUX_SOURCE_UART1_RX		4
-#define DMAMUX_SOURCE_UART1_TX		5
-#define DMAMUX_SOURCE_UART2_RX		6
-#define DMAMUX_SOURCE_UART2_TX		7
-#define DMAMUX_SOURCE_I2S0_RX		14
-#define DMAMUX_SOURCE_I2S0_TX		15
-#define DMAMUX_SOURCE_SPI0_RX		16
-#define DMAMUX_SOURCE_SPI0_TX		17
-#define DMAMUX_SOURCE_I2C0		22
-#define DMAMUX_SOURCE_I2C1		23
-#define DMAMUX_SOURCE_FTM0_CH0		24
-#define DMAMUX_SOURCE_FTM0_CH1		25
-#define DMAMUX_SOURCE_FTM0_CH2		26
-#define DMAMUX_SOURCE_FTM0_CH3		27
-#define DMAMUX_SOURCE_FTM0_CH4		28
-#define DMAMUX_SOURCE_FTM0_CH5		29
-#define DMAMUX_SOURCE_FTM0_CH6		30
-#define DMAMUX_SOURCE_FTM0_CH7		31
-#define DMAMUX_SOURCE_FTM1_CH0		32
-#define DMAMUX_SOURCE_FTM1_CH1		33
-#define DMAMUX_SOURCE_FTM2_CH0		34
-#define DMAMUX_SOURCE_FTM2_CH1		35
-#define DMAMUX_SOURCE_ADC0		40
-#define DMAMUX_SOURCE_ADC1		41
-#define DMAMUX_SOURCE_CMP0		42
-#define DMAMUX_SOURCE_CMP1		43
-#define DMAMUX_SOURCE_CMP2		44
-#define DMAMUX_SOURCE_DAC0		45
-#define DMAMUX_SOURCE_CMT		47
-#define DMAMUX_SOURCE_PDB		48
-#define DMAMUX_SOURCE_PORTA		49
-#define DMAMUX_SOURCE_PORTB		50
-#define DMAMUX_SOURCE_PORTC		51
-#define DMAMUX_SOURCE_PORTD		52
-#define DMAMUX_SOURCE_PORTE		53
-#define DMAMUX_SOURCE_ALWAYS0		54
-#define DMAMUX_SOURCE_ALWAYS1		55
-#define DMAMUX_SOURCE_ALWAYS2		56
-#define DMAMUX_SOURCE_ALWAYS3		57
-#define DMAMUX_SOURCE_ALWAYS4		58
-#define DMAMUX_SOURCE_ALWAYS5		59
-#define DMAMUX_SOURCE_ALWAYS6		60
-#define DMAMUX_SOURCE_ALWAYS7		61
-#define DMAMUX_SOURCE_ALWAYS8		62
-#define DMAMUX_SOURCE_ALWAYS9		63
-
-// Chapter 21: Direct Memory Access Controller (eDMA)
-#define DMA_CR			*(volatile uint32_t *)0x40008000 // Control Register
-#define DMA_CR_CX			((uint32_t)(1<<17))	// Cancel Transfer
-#define DMA_CR_ECX			((uint32_t)(1<<16))	// Error Cancel Transfer
-#define DMA_CR_EMLM			((uint32_t)0x80)	// Enable Minor Loop Mapping
-#define DMA_CR_CLM			((uint32_t)0x40)	// Continuous Link Mode
-#define DMA_CR_HALT			((uint32_t)0x20)	// Halt DMA Operations
-#define DMA_CR_HOE			((uint32_t)0x10)	// Halt On Error
-#define DMA_CR_ERCA			((uint32_t)0x04)	// Enable Round Robin Channel Arbitration
-#define DMA_CR_EDBG			((uint32_t)0x02)	// Enable Debug
-#define DMA_ES			*(volatile uint32_t *)0x40008004 // Error Status Register
-#define DMA_ERQ			*(volatile uint32_t *)0x4000800C // Enable Request Register
-#define DMA_ERQ_ERQ0			((uint32_t)1<<0)	// Enable DMA Request 0
-#define DMA_ERQ_ERQ1			((uint32_t)1<<1)	// Enable DMA Request 1
-#define DMA_ERQ_ERQ2			((uint32_t)1<<2)	// Enable DMA Request 2
-#define DMA_ERQ_ERQ3			((uint32_t)1<<3)	// Enable DMA Request 3
-#define DMA_ERQ_ERQ4			((uint32_t)1<<4)	// Enable DMA Request 4
-#define DMA_ERQ_ERQ5			((uint32_t)1<<5)	// Enable DMA Request 5
-#define DMA_ERQ_ERQ6			((uint32_t)1<<6)	// Enable DMA Request 6
-#define DMA_ERQ_ERQ7			((uint32_t)1<<7)	// Enable DMA Request 7
-#define DMA_ERQ_ERQ8			((uint32_t)1<<8)	// Enable DMA Request 8
-#define DMA_ERQ_ERQ9			((uint32_t)1<<9)	// Enable DMA Request 9
-#define DMA_ERQ_ERQ10			((uint32_t)1<<10)	// Enable DMA Request 10
-#define DMA_ERQ_ERQ11			((uint32_t)1<<11)	// Enable DMA Request 11
-#define DMA_ERQ_ERQ12			((uint32_t)1<<12)	// Enable DMA Request 12
-#define DMA_ERQ_ERQ13			((uint32_t)1<<13)	// Enable DMA Request 13
-#define DMA_ERQ_ERQ14			((uint32_t)1<<14)	// Enable DMA Request 14
-#define DMA_ERQ_ERQ15			((uint32_t)1<<15)	// Enable DMA Request 15
-#define DMA_EEI			*(volatile uint32_t *)0x40008014 // Enable Error Interrupt Register
-#define DMA_EEI_EEI0			((uint32_t)1<<0)	// Enable Error Interrupt 0
-#define DMA_EEI_EEI1			((uint32_t)1<<1)	// Enable Error Interrupt 1
-#define DMA_EEI_EEI2			((uint32_t)1<<2)	// Enable Error Interrupt 2
-#define DMA_EEI_EEI3			((uint32_t)1<<3)	// Enable Error Interrupt 3
-#define DMA_EEI_EEI4			((uint32_t)1<<4)	// Enable Error Interrupt 4
-#define DMA_EEI_EEI5			((uint32_t)1<<5)	// Enable Error Interrupt 5
-#define DMA_EEI_EEI6			((uint32_t)1<<6)	// Enable Error Interrupt 6
-#define DMA_EEI_EEI7			((uint32_t)1<<7)	// Enable Error Interrupt 7
-#define DMA_EEI_EEI8			((uint32_t)1<<8)	// Enable Error Interrupt 8
-#define DMA_EEI_EEI9			((uint32_t)1<<9)	// Enable Error Interrupt 9
-#define DMA_EEI_EEI10			((uint32_t)1<<10)	// Enable Error Interrupt 10
-#define DMA_EEI_EEI11			((uint32_t)1<<11)	// Enable Error Interrupt 11
-#define DMA_EEI_EEI12			((uint32_t)1<<12)	// Enable Error Interrupt 12
-#define DMA_EEI_EEI13			((uint32_t)1<<13)	// Enable Error Interrupt 13
-#define DMA_EEI_EEI14			((uint32_t)1<<14)	// Enable Error Interrupt 14
-#define DMA_EEI_EEI15			((uint32_t)1<<15)	// Enable Error Interrupt 15
-#define DMA_CEEI		*(volatile uint8_t  *)0x40008018 // Clear Enable Error Interrupt Register
-#define DMA_CEEI_CEEI(n)		((uint8_t)(n & 15)<<0)	// Clear Enable Error Interrupt
-#define DMA_CEEI_CAEE			((uint8_t)1<<6)		// Clear All Enable Error Interrupts
-#define DMA_CEEI_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_SEEI		*(volatile uint8_t  *)0x40008019 // Set Enable Error Interrupt Register
-#define DMA_SEEI_SEEI(n)		((uint8_t)(n & 15)<<0)	// Set Enable Error Interrupt
-#define DMA_SEEI_SAEE			((uint8_t)1<<6)		// Set All Enable Error Interrupts
-#define DMA_SEEI_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_CERQ		*(volatile uint8_t  *)0x4000801A // Clear Enable Request Register
-#define DMA_CERQ_CERQ(n)		((uint8_t)(n & 15)<<0)	// Clear Enable Request
-#define DMA_CERQ_CAER			((uint8_t)1<<6)		// Clear All Enable Requests
-#define DMA_CERQ_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_SERQ		*(volatile uint8_t  *)0x4000801B // Set Enable Request Register
-#define DMA_SERQ_SERQ(n)		((uint8_t)(n & 15)<<0)	// Set Enable Request
-#define DMA_SERQ_SAER			((uint8_t)1<<6)		// Set All Enable Requests
-#define DMA_SERQ_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_CDNE		*(volatile uint8_t  *)0x4000801C // Clear DONE Status Bit Register
-#define DMA_CDNE_CDNE(n)		((uint8_t)(n & 15)<<0)	// Clear Done Bit
-#define DMA_CDNE_CADN			((uint8_t)1<<6)		// Clear All Done Bits
-#define DMA_CDNE_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_SSRT		*(volatile uint8_t  *)0x4000801D // Set START Bit Register
-#define DMA_SSRT_SSRT(n)		((uint8_t)(n & 15)<<0)	// Set Start Bit
-#define DMA_SSRT_SAST			((uint8_t)1<<6)		// Set All Start Bits
-#define DMA_SSRT_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_CERR		*(volatile uint8_t  *)0x4000801E // Clear Error Register
-#define DMA_CERR_CERR(n)		((uint8_t)(n & 15)<<0)	// Clear Error Indicator
-#define DMA_CERR_CAEI			((uint8_t)1<<6)		// Clear All Error Indicators
-#define DMA_CERR_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_CINT		*(volatile uint8_t  *)0x4000801F // Clear Interrupt Request Register
-#define DMA_CINT_CINT(n)		((uint8_t)(n & 15)<<0)	// Clear Interrupt Request
-#define DMA_CINT_CAIR			((uint8_t)1<<6)		// Clear All Interrupt Requests
-#define DMA_CINT_NOP			((uint8_t)1<<7)		// NOP
-#define DMA_INT			*(volatile uint32_t *)0x40008024 // Interrupt Request Register
-#define DMA_INT_INT0			((uint32_t)1<<0)	// Interrupt Request 0
-#define DMA_INT_INT1			((uint32_t)1<<1)	// Interrupt Request 1
-#define DMA_INT_INT2			((uint32_t)1<<2)	// Interrupt Request 2
-#define DMA_INT_INT3			((uint32_t)1<<3)	// Interrupt Request 3
-#define DMA_INT_INT4			((uint32_t)1<<4)	// Interrupt Request 4
-#define DMA_INT_INT5			((uint32_t)1<<5)	// Interrupt Request 5
-#define DMA_INT_INT6			((uint32_t)1<<6)	// Interrupt Request 6
-#define DMA_INT_INT7			((uint32_t)1<<7)	// Interrupt Request 7
-#define DMA_INT_INT8			((uint32_t)1<<8)	// Interrupt Request 8
-#define DMA_INT_INT9			((uint32_t)1<<9)	// Interrupt Request 9
-#define DMA_INT_INT10			((uint32_t)1<<10)	// Interrupt Request 10
-#define DMA_INT_INT11			((uint32_t)1<<11)	// Interrupt Request 11
-#define DMA_INT_INT12			((uint32_t)1<<12)	// Interrupt Request 12
-#define DMA_INT_INT13			((uint32_t)1<<13)	// Interrupt Request 13
-#define DMA_INT_INT14			((uint32_t)1<<14)	// Interrupt Request 14
-#define DMA_INT_INT15			((uint32_t)1<<15)	// Interrupt Request 15
-#define DMA_ERR			*(volatile uint32_t *)0x4000802C // Error Register
-#define DMA_ERR_ERR0			((uint32_t)1<<0)	// Error in Channel 0
-#define DMA_ERR_ERR1			((uint32_t)1<<1)	// Error in Channel 1
-#define DMA_ERR_ERR2			((uint32_t)1<<2)	// Error in Channel 2
-#define DMA_ERR_ERR3			((uint32_t)1<<3)	// Error in Channel 3
-#define DMA_ERR_ERR4			((uint32_t)1<<4)	// Error in Channel 4
-#define DMA_ERR_ERR5			((uint32_t)1<<5)	// Error in Channel 5
-#define DMA_ERR_ERR6			((uint32_t)1<<6)	// Error in Channel 6
-#define DMA_ERR_ERR7			((uint32_t)1<<7)	// Error in Channel 7
-#define DMA_ERR_ERR8			((uint32_t)1<<8)	// Error in Channel 8
-#define DMA_ERR_ERR9			((uint32_t)1<<9)	// Error in Channel 9
-#define DMA_ERR_ERR10			((uint32_t)1<<10)	// Error in Channel 10
-#define DMA_ERR_ERR11			((uint32_t)1<<11)	// Error in Channel 11
-#define DMA_ERR_ERR12			((uint32_t)1<<12)	// Error in Channel 12
-#define DMA_ERR_ERR13			((uint32_t)1<<13)	// Error in Channel 13
-#define DMA_ERR_ERR14			((uint32_t)1<<14)	// Error in Channel 14
-#define DMA_ERR_ERR15			((uint32_t)1<<15)	// Error in Channel 15
-#define DMA_HRS			*(volatile uint32_t *)0x40008034 // Hardware Request Status Register
-#define DMA_HRS_HRS0			((uint32_t)1<<0)	// Hardware Request Status Channel 0
-#define DMA_HRS_HRS1			((uint32_t)1<<1)	// Hardware Request Status Channel 1
-#define DMA_HRS_HRS2			((uint32_t)1<<2)	// Hardware Request Status Channel 2
-#define DMA_HRS_HRS3			((uint32_t)1<<3)	// Hardware Request Status Channel 3
-#define DMA_HRS_HRS4			((uint32_t)1<<4)	// Hardware Request Status Channel 4
-#define DMA_HRS_HRS5			((uint32_t)1<<5)	// Hardware Request Status Channel 5
-#define DMA_HRS_HRS6			((uint32_t)1<<6)	// Hardware Request Status Channel 6
-#define DMA_HRS_HRS7			((uint32_t)1<<7)	// Hardware Request Status Channel 7
-#define DMA_HRS_HRS8			((uint32_t)1<<8)	// Hardware Request Status Channel 8
-#define DMA_HRS_HRS9			((uint32_t)1<<9)	// Hardware Request Status Channel 9
-#define DMA_HRS_HRS10			((uint32_t)1<<10)	// Hardware Request Status Channel 10
-#define DMA_HRS_HRS11			((uint32_t)1<<11)	// Hardware Request Status Channel 11
-#define DMA_HRS_HRS12			((uint32_t)1<<12)	// Hardware Request Status Channel 12
-#define DMA_HRS_HRS13			((uint32_t)1<<13)	// Hardware Request Status Channel 13
-#define DMA_HRS_HRS14			((uint32_t)1<<14)	// Hardware Request Status Channel 14
-#define DMA_HRS_HRS15			((uint32_t)1<<15)	// Hardware Request Status Channel 15
-#define DMA_DCHPRI3		*(volatile uint8_t  *)0x40008100 // Channel n Priority Register
-#define DMA_DCHPRI2		*(volatile uint8_t  *)0x40008101 // Channel n Priority Register
-#define DMA_DCHPRI1		*(volatile uint8_t  *)0x40008102 // Channel n Priority Register
-#define DMA_DCHPRI0		*(volatile uint8_t  *)0x40008103 // Channel n Priority Register
-#define DMA_DCHPRI_CHPRI(n)		((uint8_t)(n & 15)<<0)	// Channel Arbitration Priority
-#define DMA_DCHPRI_DPA			((uint8_t)1<<6)		// Disable PreEmpt Ability
-#define DMA_DCHPRI_ECP			((uint8_t)1<<7)		// Enable PreEmption
-#define DMA_DCHPRI7		*(volatile uint8_t  *)0x40008104 // Channel n Priority Register
-#define DMA_DCHPRI6		*(volatile uint8_t  *)0x40008105 // Channel n Priority Register
-#define DMA_DCHPRI5		*(volatile uint8_t  *)0x40008106 // Channel n Priority Register
-#define DMA_DCHPRI4		*(volatile uint8_t  *)0x40008107 // Channel n Priority Register
-#define DMA_DCHPRI11		*(volatile uint8_t  *)0x40008108 // Channel n Priority Register
-#define DMA_DCHPRI10		*(volatile uint8_t  *)0x40008109 // Channel n Priority Register
-#define DMA_DCHPRI9		*(volatile uint8_t  *)0x4000810A // Channel n Priority Register
-#define DMA_DCHPRI8		*(volatile uint8_t  *)0x4000810B // Channel n Priority Register
-#define DMA_DCHPRI15		*(volatile uint8_t  *)0x4000810C // Channel n Priority Register
-#define DMA_DCHPRI14		*(volatile uint8_t  *)0x4000810D // Channel n Priority Register
-#define DMA_DCHPRI13		*(volatile uint8_t  *)0x4000810E // Channel n Priority Register
-#define DMA_DCHPRI12		*(volatile uint8_t  *)0x4000810F // Channel n Priority Register
-
-
-#define DMA_TCD_ATTR_SMOD(n)		(((n) & 0x1F) << 11)
-#define DMA_TCD_ATTR_SSIZE(n)		(((n) & 0x7) << 8)
-#define DMA_TCD_ATTR_DMOD(n)		(((n) & 0x1F) << 3)
-#define DMA_TCD_ATTR_DSIZE(n)		(((n) & 0x7) << 0)
-#define DMA_TCD_ATTR_SIZE_8BIT		0
-#define DMA_TCD_ATTR_SIZE_16BIT		1
-#define DMA_TCD_ATTR_SIZE_32BIT		2
-#define DMA_TCD_ATTR_SIZE_16BYTE	4
-#define DMA_TCD_ATTR_SIZE_32BYTE	5
-#define DMA_TCD_CSR_BWC(n)		(((n) & 0x3) << 14)
-#define DMA_TCD_CSR_MAJORLINKCH(n)	(((n) & 0x3) << 8)
-#define DMA_TCD_CSR_DONE		0x0080
-#define DMA_TCD_CSR_ACTIVE		0x0040
-#define DMA_TCD_CSR_MAJORELINK		0x0020
-#define DMA_TCD_CSR_ESG			0x0010
-#define DMA_TCD_CSR_DREQ		0x0008
-#define DMA_TCD_CSR_INTHALF		0x0004
-#define DMA_TCD_CSR_INTMAJOR		0x0002
-#define DMA_TCD_CSR_START		0x0001
-#define DMA_TCD_CITER_MASK		    ((uint16_t)0x7FFF)	   // Loop count mask
-#define DMA_TCD_CITER_ELINK		    ((uint16_t)1<<15)	   // Enable channel linking on minor-loop complete
-#define DMA_TCD_BITER_MASK		    ((uint16_t)0x7FFF)	   // Loop count mask
-#define DMA_TCD_BITER_ELINK		    ((uint16_t)1<<15)	   // Enable channel linking on minor-loop complete
-#define DMA_TCD_NBYTES_SMLOE		    ((uint32_t)1<<31)		    // Source Minor Loop Offset Enable
-#define DMA_TCD_NBYTES_DMLOE		    ((uint32_t)1<<30)		    // Destination Minor Loop Offset Enable
-#define DMA_TCD_NBYTES_MLOFFNO_NBYTES(n)    ((uint32_t)(n))		    // NBytes transfer count when minor loop disabled
-#define DMA_TCD_NBYTES_MLOFFYES_NBYTES(n)   ((uint32_t)(n & 0x1F))	    // NBytes transfer count when minor loop enabled
-#define DMA_TCD_NBYTES_MLOFFYES_MLOFF(n)    ((uint32_t)(n & 0xFFFFF)<<10)   // Offset
-
-#define DMA_TCD0_SADDR		*(volatile const void * volatile *)0x40009000 // TCD Source Address
-#define DMA_TCD0_SOFF		*(volatile int16_t *)0x40009004	 // TCD Signed Source Address Offset
-#define DMA_TCD0_ATTR		*(volatile uint16_t *)0x40009006 // TCD Transfer Attributes
-#define DMA_TCD0_NBYTES_MLNO	*(volatile uint32_t *)0x40009008 // TCD Minor Byte Count (Minor Loop Disabled)
-#define DMA_TCD0_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009008 // TCD Signed Minor Loop Offset (Minor Loop Enabled and Offset Disabled)
-#define DMA_TCD0_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009008 // TCD Signed Minor Loop Offset (Minor Loop and Offset Enabled)
-#define DMA_TCD0_SLAST		*(volatile int32_t *)0x4000900C	 // TCD Last Source Address Adjustment
-#define DMA_TCD0_DADDR		*(volatile void * volatile *)0x40009010 // TCD Destination Address
-#define DMA_TCD0_DOFF		*(volatile int16_t *)0x40009014	 // TCD Signed Destination Address Offset
-#define DMA_TCD0_CITER_ELINKYES *(volatile uint16_t *)0x40009016 // TCD Current Minor Loop Link, Major Loop Count, Channel Linking Enabled
-#define DMA_TCD0_CITER_ELINKNO	*(volatile uint16_t *)0x40009016 // ??
-#define DMA_TCD0_DLASTSGA	*(volatile int32_t *)0x40009018	 // TCD Last Destination Address Adjustment/Scatter Gather Address
-#define DMA_TCD0_CSR		*(volatile uint16_t *)0x4000901C // TCD Control and Status
-#define DMA_TCD0_BITER_ELINKYES *(volatile uint16_t *)0x4000901E // TCD Beginning Minor Loop Link, Major Loop Count, Channel Linking Enabled
-#define DMA_TCD0_BITER_ELINKNO	*(volatile uint16_t *)0x4000901E // TCD Beginning Minor Loop Link, Major Loop Count, Channel Linking Disabled
-
-#define DMA_TCD1_SADDR		*(volatile const void * volatile *)0x40009020 // TCD Source Address
-#define DMA_TCD1_SOFF		*(volatile int16_t *)0x40009024	 // TCD Signed Source Address Offset
-#define DMA_TCD1_ATTR		*(volatile uint16_t *)0x40009026 // TCD Transfer Attributes
-#define DMA_TCD1_NBYTES_MLNO	*(volatile uint32_t *)0x40009028 // TCD Minor Byte Count, Minor Loop Disabled
-#define DMA_TCD1_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009028 // TCD Signed Minor Loop Offset, Minor Loop Enabled and Offset Disabled
-#define DMA_TCD1_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009028 // TCD Signed Minor Loop Offset, Minor Loop and Offset Enabled
-#define DMA_TCD1_SLAST		*(volatile int32_t *)0x4000902C	 // TCD Last Source Address Adjustment
-#define DMA_TCD1_DADDR		*(volatile void * volatile *)0x40009030 // TCD Destination Address
-#define DMA_TCD1_DOFF		*(volatile int16_t *)0x40009034	 // TCD Signed Destination Address Offset
-#define DMA_TCD1_CITER_ELINKYES *(volatile uint16_t *)0x40009036 // TCD Current Minor Loop Link, Major Loop Count, Channel Linking Enabled
-#define DMA_TCD1_CITER_ELINKNO	*(volatile uint16_t *)0x40009036 // ??
-#define DMA_TCD1_DLASTSGA	*(volatile int32_t *)0x40009038	 // TCD Last Destination Address Adjustment/Scatter Gather Address
-#define DMA_TCD1_CSR		*(volatile uint16_t *)0x4000903C // TCD Control and Status
-#define DMA_TCD1_BITER_ELINKYES *(volatile uint16_t *)0x4000903E // TCD Beginning Minor Loop Link, Major Loop Count Channel Linking Enabled
-#define DMA_TCD1_BITER_ELINKNO	*(volatile uint16_t *)0x4000903E // TCD Beginning Minor Loop Link, Major Loop Count, Channel Linking Disabled
-
-#define DMA_TCD2_SADDR		*(volatile const void * volatile *)0x40009040 // TCD Source Address
-#define DMA_TCD2_SOFF		*(volatile int16_t *)0x40009044	 // TCD Signed Source Address Offset
-#define DMA_TCD2_ATTR		*(volatile uint16_t *)0x40009046 // TCD Transfer Attributes
-#define DMA_TCD2_NBYTES_MLNO	*(volatile uint32_t *)0x40009048 // TCD Minor Byte Count, Minor Loop Disabled
-#define DMA_TCD2_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009048 // TCD Signed Minor Loop Offset, Minor Loop Enabled and Offset Disabled
-#define DMA_TCD2_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009048 // TCD Signed Minor Loop Offset, Minor Loop and Offset Enabled
-#define DMA_TCD2_SLAST		*(volatile int32_t *)0x4000904C	 // TCD Last Source Address Adjustment
-#define DMA_TCD2_DADDR		*(volatile void * volatile *)0x40009050 // TCD Destination Address
-#define DMA_TCD2_DOFF		*(volatile int16_t *)0x40009054	 // TCD Signed Destination Address Offset
-#define DMA_TCD2_CITER_ELINKYES *(volatile uint16_t *)0x40009056 // TCD Current Minor Loop Link, Major Loop Count, Channel Linking Enabled
-#define DMA_TCD2_CITER_ELINKNO	*(volatile uint16_t *)0x40009056 // ??
-#define DMA_TCD2_DLASTSGA	*(volatile int32_t *)0x40009058	 // TCD Last Destination Address Adjustment/Scatter Gather Address
-#define DMA_TCD2_CSR		*(volatile uint16_t *)0x4000905C // TCD Control and Status
-#define DMA_TCD2_BITER_ELINKYES *(volatile uint16_t *)0x4000905E // TCD Beginning Minor Loop Link, Major Loop Count, Channel Linking Enabled
-#define DMA_TCD2_BITER_ELINKNO	*(volatile uint16_t *)0x4000905E // TCD Beginning Minor Loop Link, Major Loop Count, Channel Linking Disabled
-
-#define DMA_TCD3_SADDR		*(volatile const void * volatile *)0x40009060 // TCD Source Address
-#define DMA_TCD3_SOFF		*(volatile int16_t *)0x40009064	 // TCD Signed Source Address Offset
-#define DMA_TCD3_ATTR		*(volatile uint16_t *)0x40009066 // TCD Transfer Attributes
-#define DMA_TCD3_NBYTES_MLNO	*(volatile uint32_t *)0x40009068 // TCD Minor Byte Count, Minor Loop Disabled
-#define DMA_TCD3_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009068 // TCD Signed Minor Loop Offset, Minor Loop Enabled and Offset Disabled
-#define DMA_TCD3_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009068 // TCD Signed Minor Loop Offset, Minor Loop and Offset Enabled
-#define DMA_TCD3_SLAST		*(volatile int32_t *)0x4000906C	 // TCD Last Source Address Adjustment
-#define DMA_TCD3_DADDR		*(volatile void * volatile *)0x40009070 // TCD Destination Address
-#define DMA_TCD3_DOFF		*(volatile int16_t *)0x40009074	 // TCD Signed Destination Address Offset
-#define DMA_TCD3_CITER_ELINKYES *(volatile uint16_t *)0x40009076 // TCD Current Minor Loop Link, Major Loop Count, Channel Linking Enabled
-#define DMA_TCD3_CITER_ELINKNO	*(volatile uint16_t *)0x40009076 // ??
-#define DMA_TCD3_DLASTSGA	*(volatile int32_t *)0x40009078	 // TCD Last Destination Address Adjustment/Scatter Gather Address
-#define DMA_TCD3_CSR		*(volatile uint16_t *)0x4000907C // TCD Control and Status
-#define DMA_TCD3_BITER_ELINKYES *(volatile uint16_t *)0x4000907E // TCD Beginning Minor Loop Link, Major Loop Count ,Channel Linking Enabled
-#define DMA_TCD3_BITER_ELINKNO	*(volatile uint16_t *)0x4000907E // TCD Beginning Minor Loop Link, Major Loop Count ,Channel Linking Disabled
-
-#define DMA_TCD4_SADDR		*(volatile const void * volatile *)0x40009080 // TCD Source Addr
-#define DMA_TCD4_SOFF		*(volatile int16_t *)0x40009084	 // TCD Signed Source Address Offset
-#define DMA_TCD4_ATTR		*(volatile uint16_t *)0x40009086 // TCD Transfer Attributes
-#define DMA_TCD4_NBYTES_MLNO	*(volatile uint32_t *)0x40009088 // TCD Minor Byte Count
-#define DMA_TCD4_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009088 // TCD Signed Minor Loop Offset
-#define DMA_TCD4_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009088 // TCD Signed Minor Loop Offset
-#define DMA_TCD4_SLAST		*(volatile int32_t *)0x4000908C	 // TCD Last Source Addr Adj.
-#define DMA_TCD4_DADDR		*(volatile void * volatile *)0x40009090 // TCD Destination Address
-#define DMA_TCD4_DOFF		*(volatile int16_t *)0x40009094	 // TCD Signed Dest Address Offset
-#define DMA_TCD4_CITER_ELINKYES *(volatile uint16_t *)0x40009096 // TCD Current Minor Loop Link
-#define DMA_TCD4_CITER_ELINKNO	*(volatile uint16_t *)0x40009096 // ??
-#define DMA_TCD4_DLASTSGA	*(volatile int32_t *)0x40009098	 // TCD Last Destination Addr Adj
-#define DMA_TCD4_CSR		*(volatile uint16_t *)0x4000909C // TCD Control and Status
-#define DMA_TCD4_BITER_ELINKYES *(volatile uint16_t *)0x4000909E // TCD Beginning Minor Loop Link
-#define DMA_TCD4_BITER_ELINKNO	*(volatile uint16_t *)0x4000909E // TCD Beginning Minor Loop Link
-
-#define DMA_TCD5_SADDR		*(volatile const void * volatile *)0x400090A0 // TCD Source Addr
-#define DMA_TCD5_SOFF		*(volatile int16_t *)0x400090A4	 // TCD Signed Source Address Offset
-#define DMA_TCD5_ATTR		*(volatile uint16_t *)0x400090A6 // TCD Transfer Attributes
-#define DMA_TCD5_NBYTES_MLNO	*(volatile uint32_t *)0x400090A8 // TCD Minor Byte Count
-#define DMA_TCD5_NBYTES_MLOFFNO *(volatile uint32_t *)0x400090A8 // TCD Signed Minor Loop Offset
-#define DMA_TCD5_NBYTES_MLOFFYES *(volatile uint32_t *)0x400090A8 // TCD Signed Minor Loop Offset
-#define DMA_TCD5_SLAST		*(volatile int32_t *)0x400090AC	 // TCD Last Source Addr Adj.
-#define DMA_TCD5_DADDR		*(volatile void * volatile *)0x400090B0 // TCD Destination Address
-#define DMA_TCD5_DOFF		*(volatile int16_t *)0x400090B4	 // TCD Signed Dest Address Offset
-#define DMA_TCD5_CITER_ELINKYES *(volatile uint16_t *)0x400090B6 // TCD Current Minor Loop Link
-#define DMA_TCD5_CITER_ELINKNO	*(volatile uint16_t *)0x400090B6 // ??
-#define DMA_TCD5_DLASTSGA	*(volatile int32_t *)0x400090B8	 // TCD Last Destination Addr Adj
-#define DMA_TCD5_CSR		*(volatile uint16_t *)0x400090BC // TCD Control and Status
-#define DMA_TCD5_BITER_ELINKYES *(volatile uint16_t *)0x400090BE // TCD Beginning Minor Loop Link
-#define DMA_TCD5_BITER_ELINKNO	*(volatile uint16_t *)0x400090BE // TCD Beginning Minor Loop Link
-
-#define DMA_TCD6_SADDR		*(volatile const void * volatile *)0x400090C0 // TCD Source Addr
-#define DMA_TCD6_SOFF		*(volatile int16_t *)0x400090C4	 // TCD Signed Source Address Offset
-#define DMA_TCD6_ATTR		*(volatile uint16_t *)0x400090C6 // TCD Transfer Attributes
-#define DMA_TCD6_NBYTES_MLNO	*(volatile uint32_t *)0x400090C8 // TCD Minor Byte Count
-#define DMA_TCD6_NBYTES_MLOFFNO *(volatile uint32_t *)0x400090C8 // TCD Signed Minor Loop Offset
-#define DMA_TCD6_NBYTES_MLOFFYES *(volatile uint32_t *)0x400090C8 // TCD Signed Minor Loop Offset
-#define DMA_TCD6_SLAST		*(volatile int32_t *)0x400090CC	 // TCD Last Source Addr Adj.
-#define DMA_TCD6_DADDR		*(volatile void * volatile *)0x400090D0 // TCD Destination Address
-#define DMA_TCD6_DOFF		*(volatile int16_t *)0x400090D4	 // TCD Signed Dest Address Offset
-#define DMA_TCD6_CITER_ELINKYES *(volatile uint16_t *)0x400090D6 // TCD Current Minor Loop Link
-#define DMA_TCD6_CITER_ELINKNO	*(volatile uint16_t *)0x400090D6 // ??
-#define DMA_TCD6_DLASTSGA	*(volatile int32_t *)0x400090D8	 // TCD Last Destination Addr Adj
-#define DMA_TCD6_CSR		*(volatile uint16_t *)0x400090DC // TCD Control and Status
-#define DMA_TCD6_BITER_ELINKYES *(volatile uint16_t *)0x400090DE // TCD Beginning Minor Loop Link
-#define DMA_TCD6_BITER_ELINKNO	*(volatile uint16_t *)0x400090DE // TCD Beginning Minor Loop Link
-
-#define DMA_TCD7_SADDR		*(volatile const void * volatile *)0x400090E0 // TCD Source Addr
-#define DMA_TCD7_SOFF		*(volatile int16_t *)0x400090E4	 // TCD Signed Source Address Offset
-#define DMA_TCD7_ATTR		*(volatile uint16_t *)0x400090E6 // TCD Transfer Attributes
-#define DMA_TCD7_NBYTES_MLNO	*(volatile uint32_t *)0x400090E8 // TCD Minor Byte Count
-#define DMA_TCD7_NBYTES_MLOFFNO *(volatile uint32_t *)0x400090E8 // TCD Signed Minor Loop Offset
-#define DMA_TCD7_NBYTES_MLOFFYES *(volatile uint32_t *)0x400090E8 // TCD Signed Minor Loop Offset
-#define DMA_TCD7_SLAST		*(volatile int32_t *)0x400090EC	 // TCD Last Source Addr Adj.
-#define DMA_TCD7_DADDR		*(volatile void * volatile *)0x400090F0 // TCD Destination Address
-#define DMA_TCD7_DOFF		*(volatile int16_t *)0x400090F4	 // TCD Signed Dest Address Offset
-#define DMA_TCD7_CITER_ELINKYES *(volatile uint16_t *)0x400090F6 // TCD Current Minor Loop Link
-#define DMA_TCD7_CITER_ELINKNO	*(volatile uint16_t *)0x400090F6 // ??
-#define DMA_TCD7_DLASTSGA	*(volatile int32_t *)0x400090F8	 // TCD Last Destination Addr Adj
-#define DMA_TCD7_CSR		*(volatile uint16_t *)0x400090FC // TCD Control and Status
-#define DMA_TCD7_BITER_ELINKYES *(volatile uint16_t *)0x400090FE // TCD Beginning Minor Loop Link
-#define DMA_TCD7_BITER_ELINKNO	*(volatile uint16_t *)0x400090FE // TCD Beginning Minor Loop Link
-
-#define DMA_TCD8_SADDR		*(volatile const void * volatile *)0x40009100 // TCD Source Addr
-#define DMA_TCD8_SOFF		*(volatile int16_t *)0x40009104	 // TCD Signed Source Address Offset
-#define DMA_TCD8_ATTR		*(volatile uint16_t *)0x40009106 // TCD Transfer Attributes
-#define DMA_TCD8_NBYTES_MLNO	*(volatile uint32_t *)0x40009108 // TCD Minor Byte Count
-#define DMA_TCD8_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009108 // TCD Signed Minor Loop Offset
-#define DMA_TCD8_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009108 // TCD Signed Minor Loop Offset
-#define DMA_TCD8_SLAST		*(volatile int32_t *)0x4000910C	 // TCD Last Source Addr Adj.
-#define DMA_TCD8_DADDR		*(volatile void * volatile *)0x40009110 // TCD Destination Address
-#define DMA_TCD8_DOFF		*(volatile int16_t *)0x40009114	 // TCD Signed Dest Address Offset
-#define DMA_TCD8_CITER_ELINKYES *(volatile uint16_t *)0x40009116 // TCD Current Minor Loop Link
-#define DMA_TCD8_CITER_ELINKNO	*(volatile uint16_t *)0x40009116 // ??
-#define DMA_TCD8_DLASTSGA	*(volatile int32_t *)0x40009118	 // TCD Last Destination Addr Adj
-#define DMA_TCD8_CSR		*(volatile uint16_t *)0x4000911C // TCD Control and Status
-#define DMA_TCD8_BITER_ELINKYES *(volatile uint16_t *)0x4000911E // TCD Beginning Minor Loop Link
-#define DMA_TCD8_BITER_ELINKNO	*(volatile uint16_t *)0x4000911E // TCD Beginning Minor Loop Link
-
-#define DMA_TCD9_SADDR		*(volatile const void * volatile *)0x40009120 // TCD Source Addr
-#define DMA_TCD9_SOFF		*(volatile int16_t *)0x40009124	 // TCD Signed Source Address Offset
-#define DMA_TCD9_ATTR		*(volatile uint16_t *)0x40009126 // TCD Transfer Attributes
-#define DMA_TCD9_NBYTES_MLNO	*(volatile uint32_t *)0x40009128 // TCD Minor Byte Count
-#define DMA_TCD9_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009128 // TCD Signed Minor Loop Offset
-#define DMA_TCD9_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009128 // TCD Signed Minor Loop Offset
-#define DMA_TCD9_SLAST		*(volatile int32_t *)0x4000912C	 // TCD Last Source Addr Adj.
-#define DMA_TCD9_DADDR		*(volatile void * volatile *)0x40009130 // TCD Destination Address
-#define DMA_TCD9_DOFF		*(volatile int16_t *)0x40009134	 // TCD Signed Dest Address Offset
-#define DMA_TCD9_CITER_ELINKYES *(volatile uint16_t *)0x40009136 // TCD Current Minor Loop Link
-#define DMA_TCD9_CITER_ELINKNO	*(volatile uint16_t *)0x40009136 // ??
-#define DMA_TCD9_DLASTSGA	*(volatile int32_t *)0x40009138	 // TCD Last Destination Addr Adj
-#define DMA_TCD9_CSR		*(volatile uint16_t *)0x4000913C // TCD Control and Status
-#define DMA_TCD9_BITER_ELINKYES *(volatile uint16_t *)0x4000913E // TCD Beginning Minor Loop Link
-#define DMA_TCD9_BITER_ELINKNO	*(volatile uint16_t *)0x4000913E // TCD Beginning Minor Loop Link
-
-#define DMA_TCD10_SADDR		*(volatile const void * volatile *)0x40009140 // TCD Source Addr
-#define DMA_TCD10_SOFF		*(volatile int16_t *)0x40009144	 // TCD Signed Source Address Offset
-#define DMA_TCD10_ATTR		*(volatile uint16_t *)0x40009146 // TCD Transfer Attributes
-#define DMA_TCD10_NBYTES_MLNO	*(volatile uint32_t *)0x40009148 // TCD Minor Byte Count
-#define DMA_TCD10_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009148 // TCD Signed Minor Loop Offset
-#define DMA_TCD10_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009148 // TCD Signed Minor Loop Offset
-#define DMA_TCD10_SLAST		*(volatile int32_t *)0x4000914C	 // TCD Last Source Addr Adj.
-#define DMA_TCD10_DADDR		*(volatile void * volatile *)0x40009150 // TCD Destination Address
-#define DMA_TCD10_DOFF		*(volatile int16_t *)0x40009154	 // TCD Signed Dest Address Offset
-#define DMA_TCD10_CITER_ELINKYES *(volatile uint16_t *)0x40009156 // TCD Current Minor Loop Link
-#define DMA_TCD10_CITER_ELINKNO	*(volatile uint16_t *)0x40009156 // ??
-#define DMA_TCD10_DLASTSGA	*(volatile int32_t *)0x40009158	 // TCD Last Destination Addr Adj
-#define DMA_TCD10_CSR		*(volatile uint16_t *)0x4000915C // TCD Control and Status
-#define DMA_TCD10_BITER_ELINKYES *(volatile uint16_t *)0x4000915E // TCD Beginning Minor Loop Link
-#define DMA_TCD10_BITER_ELINKNO	*(volatile uint16_t *)0x4000915E // TCD Beginning Minor Loop Link
-
-#define DMA_TCD11_SADDR		*(volatile const void * volatile *)0x40009160 // TCD Source Addr
-#define DMA_TCD11_SOFF		*(volatile int16_t *)0x40009164	 // TCD Signed Source Address Offset
-#define DMA_TCD11_ATTR		*(volatile uint16_t *)0x40009166 // TCD Transfer Attributes
-#define DMA_TCD11_NBYTES_MLNO	*(volatile uint32_t *)0x40009168 // TCD Minor Byte Count
-#define DMA_TCD11_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009168 // TCD Signed Minor Loop Offset
-#define DMA_TCD11_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009168 // TCD Signed Minor Loop Offset
-#define DMA_TCD11_SLAST		*(volatile int32_t *)0x4000916C	 // TCD Last Source Addr Adj.
-#define DMA_TCD11_DADDR		*(volatile void * volatile *)0x40009170 // TCD Destination Address
-#define DMA_TCD11_DOFF		*(volatile int16_t *)0x40009174	 // TCD Signed Dest Address Offset
-#define DMA_TCD11_CITER_ELINKYES *(volatile uint16_t *)0x40009176 // TCD Current Minor Loop Link
-#define DMA_TCD11_CITER_ELINKNO	*(volatile uint16_t *)0x40009176 // ??
-#define DMA_TCD11_DLASTSGA	*(volatile int32_t *)0x40009178	 // TCD Last Destination Addr Adj
-#define DMA_TCD11_CSR		*(volatile uint16_t *)0x4000917C // TCD Control and Status
-#define DMA_TCD11_BITER_ELINKYES *(volatile uint16_t *)0x4000917E // TCD Beginning Minor Loop Link
-#define DMA_TCD11_BITER_ELINKNO	*(volatile uint16_t *)0x4000917E // TCD Beginning Minor Loop Link
-
-#define DMA_TCD12_SADDR		*(volatile const void * volatile *)0x40009180 // TCD Source Addr
-#define DMA_TCD12_SOFF		*(volatile int16_t *)0x40009184	 // TCD Signed Source Address Offset
-#define DMA_TCD12_ATTR		*(volatile uint16_t *)0x40009186 // TCD Transfer Attributes
-#define DMA_TCD12_NBYTES_MLNO	*(volatile uint32_t *)0x40009188 // TCD Minor Byte Count
-#define DMA_TCD12_NBYTES_MLOFFNO *(volatile uint32_t *)0x40009188 // TCD Signed Minor Loop Offset
-#define DMA_TCD12_NBYTES_MLOFFYES *(volatile uint32_t *)0x40009188 // TCD Signed Minor Loop Offset
-#define DMA_TCD12_SLAST		*(volatile int32_t *)0x4000918C	 // TCD Last Source Addr Adj.
-#define DMA_TCD12_DADDR		*(volatile void * volatile *)0x40009190 // TCD Destination Address
-#define DMA_TCD12_DOFF		*(volatile int16_t *)0x40009194	 // TCD Signed Dest Address Offset
-#define DMA_TCD12_CITER_ELINKYES *(volatile uint16_t *)0x40009196 // TCD Current Minor Loop Link
-#define DMA_TCD12_CITER_ELINKNO	*(volatile uint16_t *)0x40009196 // ??
-#define DMA_TCD12_DLASTSGA	*(volatile int32_t *)0x40009198	 // TCD Last Destination Addr Adj
-#define DMA_TCD12_CSR		*(volatile uint16_t *)0x4000919C // TCD Control and Status
-#define DMA_TCD12_BITER_ELINKYES *(volatile uint16_t *)0x4000919E // TCD Beginning Minor Loop Link
-#define DMA_TCD12_BITER_ELINKNO	*(volatile uint16_t *)0x4000919E // TCD Beginning Minor Loop Link
-
-#define DMA_TCD13_SADDR		*(volatile const void * volatile *)0x400091A0 // TCD Source Addr
-#define DMA_TCD13_SOFF		*(volatile int16_t *)0x400091A4	 // TCD Signed Source Address Offset
-#define DMA_TCD13_ATTR		*(volatile uint16_t *)0x400091A6 // TCD Transfer Attributes
-#define DMA_TCD13_NBYTES_MLNO	*(volatile uint32_t *)0x400091A8 // TCD Minor Byte Count
-#define DMA_TCD13_NBYTES_MLOFFNO *(volatile uint32_t *)0x400091A8 // TCD Signed Minor Loop Offset
-#define DMA_TCD13_NBYTES_MLOFFYES *(volatile uint32_t *)0x400091A8 // TCD Signed Minor Loop Offset
-#define DMA_TCD13_SLAST		*(volatile int32_t *)0x400091AC	 // TCD Last Source Addr Adj.
-#define DMA_TCD13_DADDR		*(volatile void * volatile *)0x400091B0 // TCD Destination Address
-#define DMA_TCD13_DOFF		*(volatile int16_t *)0x400091B4	 // TCD Signed Dest Address Offset
-#define DMA_TCD13_CITER_ELINKYES *(volatile uint16_t *)0x400091B6 // TCD Current Minor Loop Link
-#define DMA_TCD13_CITER_ELINKNO	*(volatile uint16_t *)0x400091B6 // ??
-#define DMA_TCD13_DLASTSGA	*(volatile int32_t *)0x400091B8	 // TCD Last Destination Addr Adj
-#define DMA_TCD13_CSR		*(volatile uint16_t *)0x400091BC // TCD Control and Status
-#define DMA_TCD13_BITER_ELINKYES *(volatile uint16_t *)0x400091BE // TCD Beginning Minor Loop Link
-#define DMA_TCD13_BITER_ELINKNO	*(volatile uint16_t *)0x400091BE // TCD Beginning Minor Loop Link
-
-#define DMA_TCD14_SADDR		*(volatile const void * volatile *)0x400091C0 // TCD Source Addr
-#define DMA_TCD14_SOFF		*(volatile int16_t *)0x400091C4	 // TCD Signed Source Address Offset
-#define DMA_TCD14_ATTR		*(volatile uint16_t *)0x400091C6 // TCD Transfer Attributes
-#define DMA_TCD14_NBYTES_MLNO	*(volatile uint32_t *)0x400091C8 // TCD Minor Byte Count
-#define DMA_TCD14_NBYTES_MLOFFNO *(volatile uint32_t *)0x400091C8 // TCD Signed Minor Loop Offset
-#define DMA_TCD14_NBYTES_MLOFFYES *(volatile uint32_t *)0x400091C8 // TCD Signed Minor Loop Offset
-#define DMA_TCD14_SLAST		*(volatile int32_t *)0x400091CC	 // TCD Last Source Addr Adj.
-#define DMA_TCD14_DADDR		*(volatile void * volatile *)0x400091D0 // TCD Destination Address
-#define DMA_TCD14_DOFF		*(volatile int16_t *)0x400091D4	 // TCD Signed Dest Address Offset
-#define DMA_TCD14_CITER_ELINKYES *(volatile uint16_t *)0x400091D6 // TCD Current Minor Loop Link
-#define DMA_TCD14_CITER_ELINKNO	*(volatile uint16_t *)0x400091D6 // ??
-#define DMA_TCD14_DLASTSGA	*(volatile int32_t *)0x400091D8	 // TCD Last Destination Addr Adj
-#define DMA_TCD14_CSR		*(volatile uint16_t *)0x400091DC // TCD Control and Status
-#define DMA_TCD14_BITER_ELINKYES *(volatile uint16_t *)0x400091DE // TCD Beginning Minor Loop Link
-#define DMA_TCD14_BITER_ELINKNO	*(volatile uint16_t *)0x400091DE // TCD Beginning Minor Loop Link
-
-#define DMA_TCD15_SADDR		*(volatile const void * volatile *)0x400091E0 // TCD Source Addr
-#define DMA_TCD15_SOFF		*(volatile int16_t *)0x400091E4	 // TCD Signed Source Address Offset
-#define DMA_TCD15_ATTR		*(volatile uint16_t *)0x400091E6 // TCD Transfer Attributes
-#define DMA_TCD15_NBYTES_MLNO	*(volatile uint32_t *)0x400091E8 // TCD Minor Byte Count
-#define DMA_TCD15_NBYTES_MLOFFNO *(volatile uint32_t *)0x400091E8 // TCD Signed Minor Loop Offset
-#define DMA_TCD15_NBYTES_MLOFFYES *(volatile uint32_t *)0x400091E8 // TCD Signed Minor Loop Offset
-#define DMA_TCD15_SLAST		*(volatile int32_t *)0x400091EC	 // TCD Last Source Addr Adj.
-#define DMA_TCD15_DADDR		*(volatile void * volatile *)0x400091F0 // TCD Destination Address
-#define DMA_TCD15_DOFF		*(volatile int16_t *)0x400091F4	 // TCD Signed Dest Address Offset
-#define DMA_TCD15_CITER_ELINKYES *(volatile uint16_t *)0x400091F6 // TCD Current Minor Loop Link
-#define DMA_TCD15_CITER_ELINKNO	*(volatile uint16_t *)0x400091F6 // ??
-#define DMA_TCD15_DLASTSGA	*(volatile int32_t *)0x400091F8	 // TCD Last Destination Addr Adj
-#define DMA_TCD15_CSR		*(volatile uint16_t *)0x400091FC // TCD Control and Status
-#define DMA_TCD15_BITER_ELINKYES *(volatile uint16_t *)0x400091FE // TCD Beginning Minor Loop Link
-#define DMA_TCD15_BITER_ELINKNO	*(volatile uint16_t *)0x400091FE // TCD Beginning Minor Loop Link
-
-
-// Chapter 22: External Watchdog Monitor (EWM)
-#define EWM_CTRL		*(volatile uint8_t  *)0x40061000 // Control Register
-#define EWM_SERV		*(volatile uint8_t  *)0x40061001 // Service Register
-#define EWM_CMPL		*(volatile uint8_t  *)0x40061002 // Compare Low Register
-#define EWM_CMPH		*(volatile uint8_t  *)0x40061003 // Compare High Register
-
-// Chapter 23: Watchdog Timer (WDOG)
-#define WDOG_STCTRLH		*(volatile uint16_t *)0x40052000 // Watchdog Status and Control Register High
-#define WDOG_STCTRLH_DISTESTWDOG	(uint16_t)0x4000		// Allows the WDOG's functional test mode to be disabled permanently.
-#define WDOG_STCTRLH_BYTESEL(n)		(uint16_t)(((n) & 3) << 12)	// selects the byte to be tested when the watchdog is in the byte test mode.
-#define WDOG_STCTRLH_TESTSEL		(uint16_t)0x0800
-#define WDOG_STCTRLH_TESTWDOG		(uint16_t)0x0400
-#define WDOG_STCTRLH_WAITEN		(uint16_t)0x0080
-#define WDOG_STCTRLH_STOPEN		(uint16_t)0x0040
-#define WDOG_STCTRLH_DBGEN		(uint16_t)0x0020
-#define WDOG_STCTRLH_ALLOWUPDATE	(uint16_t)0x0010
-#define WDOG_STCTRLH_WINEN		(uint16_t)0x0008
-#define WDOG_STCTRLH_IRQRSTEN		(uint16_t)0x0004
-#define WDOG_STCTRLH_CLKSRC		(uint16_t)0x0002
-#define WDOG_STCTRLH_WDOGEN		(uint16_t)0x0001
-#define WDOG_STCTRLL		*(volatile uint16_t *)0x40052002 // Watchdog Status and Control Register Low
-#define WDOG_TOVALH		*(volatile uint16_t *)0x40052004 // Watchdog Time-out Value Register High
-#define WDOG_TOVALL		*(volatile uint16_t *)0x40052006 // Watchdog Time-out Value Register Low
-#define WDOG_WINH		*(volatile uint16_t *)0x40052008 // Watchdog Window Register High
-#define WDOG_WINL		*(volatile uint16_t *)0x4005200A // Watchdog Window Register Low
-#define WDOG_REFRESH		*(volatile uint16_t *)0x4005200C // Watchdog Refresh register
-#define WDOG_UNLOCK		*(volatile uint16_t *)0x4005200E // Watchdog Unlock register
-#define WDOG_UNLOCK_SEQ1		(uint16_t)0xC520
-#define WDOG_UNLOCK_SEQ2		(uint16_t)0xD928
-#define WDOG_TMROUTH		*(volatile uint16_t *)0x40052010 // Watchdog Timer Output Register High
-#define WDOG_TMROUTL		*(volatile uint16_t *)0x40052012 // Watchdog Timer Output Register Low
-#define WDOG_RSTCNT		*(volatile uint16_t *)0x40052014 // Watchdog Reset Count register
-#define WDOG_PRESC		*(volatile uint16_t *)0x40052016 // Watchdog Prescaler register
-
-// Chapter 24: Multipurpose Clock Generator (MCG)
-#define MCG_C1			*(volatile uint8_t  *)0x40064000 // MCG Control 1 Register
-#define MCG_C1_IREFSTEN			(uint8_t)0x01			// Internal Reference Stop Enable, Controls whether or not the internal reference clock remains enabled when the MCG enters Stop mode.
-#define MCG_C1_IRCLKEN			(uint8_t)0x02			// Internal Reference Clock Enable, Enables the internal reference clock for use as MCGIRCLK.
-#define MCG_C1_IREFS			(uint8_t)0x04			// Internal Reference Select, Selects the reference clock source for the FLL.
-#define MCG_C1_FRDIV(n)			(uint8_t)(((n) & 0x07) << 3)	// FLL External Reference Divider, Selects the amount to divide down the external reference clock for the FLL
-#define MCG_C1_CLKS(n)			(uint8_t)(((n) & 0x03) << 6)	// Clock Source Select, Selects the clock source for MCGOUTCLK
-#define MCG_C2			*(volatile uint8_t  *)0x40064001 // MCG Control 2 Register
-#define MCG_C2_IRCS			(uint8_t)0x01			// Internal Reference Clock Select, Selects between the fast or slow internal reference clock source.
-#define MCG_C2_LP			(uint8_t)0x02			// Low Power Select, Controls whether the FLL or PLL is disabled in BLPI and BLPE modes.
-#define MCG_C2_EREFS			(uint8_t)0x04			// External Reference Select, Selects the source for the external reference clock.
-#define MCG_C2_HGO0			(uint8_t)0x08			// High Gain Oscillator Select, Controls the crystal oscillator mode of operation
-#define MCG_C2_RANGE0(n)		(uint8_t)(((n) & 0x03) << 4)	// Frequency Range Select, Selects the frequency range for the crystal oscillator
-#define MCG_C2_LOCRE0			(uint8_t)0x80			// Loss of Clock Reset Enable, Determines whether an interrupt or a reset request is made following a loss of OSC0
-#define MCG_C3			*(volatile uint8_t  *)0x40064002 // MCG Control 3 Register
-#define MCG_C3_SCTRIM(n)		(uint8_t)(n)			// Slow Internal Reference Clock Trim Setting
-#define MCG_C4			*(volatile uint8_t  *)0x40064003 // MCG Control 4 Register
-#define MCG_C4_SCFTRIM			(uint8_t)0x01			// Slow Internal Reference Clock Fine Trim
-#define MCG_C4_FCTRIM(n)		(uint8_t)(((n) & 0x0F) << 1)	// Fast Internal Reference Clock Trim Setting
-#define MCG_C4_DRST_DRS(n)		(uint8_t)(((n) & 0x03) << 5)	// DCO Range Select
-#define MCG_C4_DMX32			(uint8_t)0x80			// DCO Maximum Frequency with 32.768 kHz Reference, controls whether the DCO frequency range is narrowed
-#define MCG_C5			*(volatile uint8_t  *)0x40064004 // MCG Control 5 Register
-#define MCG_C5_PRDIV0(n)		(uint8_t)((n) & 0x1F)		// PLL External Reference Divider
-#define MCG_C5_PLLSTEN0			(uint8_t)0x20			// PLL Stop Enable
-#define MCG_C5_PLLCLKEN0		(uint8_t)0x40			// PLL Clock Enable
-#define MCG_C6			*(volatile uint8_t  *)0x40064005 // MCG Control 6 Register
-#define MCG_C6_VDIV0(n)			(uint8_t)((n) & 0x1F)		// VCO 0 Divider
-#define MCG_C6_CME0			(uint8_t)0x20			// Clock Monitor Enable
-#define MCG_C6_PLLS			(uint8_t)0x40			// PLL Select, Controls whether the PLL or FLL output is selected as the MCG source when CLKS[1:0]=00.
-#define MCG_C6_LOLIE0			(uint8_t)0x80			// Loss of Lock Interrupt Enable
-#define MCG_S			*(volatile uint8_t  *)0x40064006 // MCG Status Register
-#define MCG_S_IRCST			(uint8_t)0x01			// Internal Reference Clock Status
-#define MCG_S_OSCINIT0			(uint8_t)0x02			// OSC Initialization,	resets to 0, is set to 1 after the initialization cycles of the crystal oscillator
-#define MCG_S_CLKST(n)			(uint8_t)(((n) & 0x03) << 2)	// Clock Mode Status, 0=FLL is selected, 1= Internal ref, 2=External ref, 3=PLL
-#define MCG_S_CLKST_MASK		(uint8_t)0x0C
-#define MCG_S_IREFST			(uint8_t)0x10			// Internal Reference Status
-#define MCG_S_PLLST			(uint8_t)0x20			// PLL Select Status
-#define MCG_S_LOCK0			(uint8_t)0x40			// Lock Status, 0=PLL Unlocked, 1=PLL Locked
-#define MCG_S_LOLS0			(uint8_t)0x80			// Loss of Lock Status
-#define MCG_SC			*(volatile uint8_t  *)0x40064008 // MCG Status and Control Register
-#define MCG_SC_LOCS0			(uint8_t)0x01			// OSC0 Loss of Clock Status
-#define MCG_SC_FCRDIV(n)		(uint8_t)(((n) & 0x07) << 1)	// Fast Clock Internal Reference Divider
-#define MCG_SC_FLTPRSRV			(uint8_t)0x10			// FLL Filter Preserve Enable
-#define MCG_SC_ATMF			(uint8_t)0x20			// Automatic Trim Machine Fail Flag
-#define MCG_SC_ATMS			(uint8_t)0x40			// Automatic Trim Machine Select
-#define MCG_SC_ATME			(uint8_t)0x80			// Automatic Trim Machine Enable
-#define MCG_ATCVH		*(volatile uint8_t  *)0x4006400A // MCG Auto Trim Compare Value High Register
-#define MCG_ATCVL		*(volatile uint8_t  *)0x4006400B // MCG Auto Trim Compare Value Low Register
-#define MCG_C7			*(volatile uint8_t  *)0x4006400C // MCG Control 7 Register
-#define MCG_C8			*(volatile uint8_t  *)0x4006400D // MCG Control 8 Register
-
-// Chapter 25: Oscillator (OSC)
-#define OSC0_CR			*(volatile uint8_t  *)0x40065000 // OSC Control Register
-#define OSC_SC16P			(uint8_t)0x01			// Oscillator 16 pF Capacitor Load Configure
-#define OSC_SC8P			(uint8_t)0x02			// Oscillator 8 pF Capacitor Load Configure
-#define OSC_SC4P			(uint8_t)0x04			// Oscillator 4 pF Capacitor Load Configure
-#define OSC_SC2P			(uint8_t)0x08			// Oscillator 2 pF Capacitor Load Configure
-#define OSC_EREFSTEN			(uint8_t)0x20			// External Reference Stop Enable, Controls whether or not the external reference clock (OSCERCLK) remains enabled when MCU enters Stop mode.
-#define OSC_ERCLKEN			(uint8_t)0x80			// External Reference Enable, Enables external reference clock (OSCERCLK).
-
-// Chapter 27: Flash Memory Controller (FMC)
-#define FMC_PFAPR		*(volatile uint32_t *)0x4001F000	// Flash Access Protection
-#define FMC_PFB0CR		*(volatile uint32_t *)0x4001F004	// Flash Control
-#define FMC_TAGVDW0S0		*(volatile uint32_t *)0x4001F100	// Cache Tag Storage
-#define FMC_TAGVDW0S1		*(volatile uint32_t *)0x4001F104	// Cache Tag Storage
-#define FMC_TAGVDW1S0		*(volatile uint32_t *)0x4001F108	// Cache Tag Storage
-#define FMC_TAGVDW1S1		*(volatile uint32_t *)0x4001F10C	// Cache Tag Storage
-#define FMC_TAGVDW2S0		*(volatile uint32_t *)0x4001F110	// Cache Tag Storage
-#define FMC_TAGVDW2S1		*(volatile uint32_t *)0x4001F114	// Cache Tag Storage
-#define FMC_TAGVDW3S0		*(volatile uint32_t *)0x4001F118	// Cache Tag Storage
-#define FMC_TAGVDW3S1		*(volatile uint32_t *)0x4001F11C	// Cache Tag Storage
-#define FMC_DATAW0S0		*(volatile uint32_t *)0x4001F200	// Cache Data Storage
-#define FMC_DATAW0S1		*(volatile uint32_t *)0x4001F204	// Cache Data Storage
-#define FMC_DATAW1S0		*(volatile uint32_t *)0x4001F208	// Cache Data Storage
-#define FMC_DATAW1S1		*(volatile uint32_t *)0x4001F20C	// Cache Data Storage
-#define FMC_DATAW2S0		*(volatile uint32_t *)0x4001F210	// Cache Data Storage
-#define FMC_DATAW2S1		*(volatile uint32_t *)0x4001F214	// Cache Data Storage
-#define FMC_DATAW3S0		*(volatile uint32_t *)0x4001F218	// Cache Data Storage
-#define FMC_DATAW3S1		*(volatile uint32_t *)0x4001F21C	// Cache Data Storage
-
-// Chapter 28: Flash Memory Module (FTFL)
-#define FTFL_FSTAT		*(volatile uint8_t  *)0x40020000      // Flash Status Register
-#define FTFL_FSTAT_CCIF			(uint8_t)0x80			// Command Complete Interrupt Flag
-#define FTFL_FSTAT_RDCOLERR		(uint8_t)0x40			// Flash Read Collision Error Flag
-#define FTFL_FSTAT_ACCERR		(uint8_t)0x20			// Flash Access Error Flag
-#define FTFL_FSTAT_FPVIOL		(uint8_t)0x10			// Flash Protection Violation Flag
-#define FTFL_FSTAT_MGSTAT0		(uint8_t)0x01			// Memory Controller Command Completion Status Flag
-#define FTFL_FCNFG		*(volatile uint8_t  *)0x40020001      // Flash Configuration Register
-#define FTFL_FCNFG_CCIE			(uint8_t)0x80			// Command Complete Interrupt Enable
-#define FTFL_FCNFG_RDCOLLIE		(uint8_t)0x40			// Read Collision Error Interrupt Enable
-#define FTFL_FCNFG_ERSAREQ		(uint8_t)0x20			// Erase All Request
-#define FTFL_FCNFG_ERSSUSP		(uint8_t)0x10			// Erase Suspend
-#define FTFL_FCNFG_PFLSH		(uint8_t)0x04			// Flash memory configuration
-#define FTFL_FCNFG_RAMRDY		(uint8_t)0x02			// RAM Ready
-#define FTFL_FCNFG_EEERDY		(uint8_t)0x01			// EEPROM Ready
-#define FTFL_FSEC		*(const	   uint8_t  *)0x40020002      // Flash Security Register
-#define FTFL_FOPT		*(const	   uint8_t  *)0x40020003      // Flash Option Register
-#define FTFL_FCCOB3		*(volatile uint8_t  *)0x40020004      // Flash Common Command Object Registers
-#define FTFL_FCCOB2		*(volatile uint8_t  *)0x40020005
-#define FTFL_FCCOB1		*(volatile uint8_t  *)0x40020006
-#define FTFL_FCCOB0		*(volatile uint8_t  *)0x40020007
-#define FTFL_FCCOB7		*(volatile uint8_t  *)0x40020008
-#define FTFL_FCCOB6		*(volatile uint8_t  *)0x40020009
-#define FTFL_FCCOB5		*(volatile uint8_t  *)0x4002000A
-#define FTFL_FCCOB4		*(volatile uint8_t  *)0x4002000B
-#define FTFL_FCCOBB		*(volatile uint8_t  *)0x4002000C
-#define FTFL_FCCOBA		*(volatile uint8_t  *)0x4002000D
-#define FTFL_FCCOB9		*(volatile uint8_t  *)0x4002000E
-#define FTFL_FCCOB8		*(volatile uint8_t  *)0x4002000F
-#define FTFL_FPROT3		*(volatile uint8_t  *)0x40020010      // Program Flash Protection Registers
-#define FTFL_FPROT2		*(volatile uint8_t  *)0x40020011      // Program Flash Protection Registers
-#define FTFL_FPROT1		*(volatile uint8_t  *)0x40020012      // Program Flash Protection Registers
-#define FTFL_FPROT0		*(volatile uint8_t  *)0x40020013      // Program Flash Protection Registers
-#define FTFL_FEPROT		*(volatile uint8_t  *)0x40020016      // EEPROM Protection Register
-#define FTFL_FDPROT		*(volatile uint8_t  *)0x40020017      // Data Flash Protection Register
-
-// Chapter 30: Cyclic Redundancy Check (CRC)
-#define CRC_CRC			*(volatile uint32_t *)0x40032000 // CRC Data register
-#define CRC_GPOLY		*(volatile uint32_t *)0x40032004 // CRC Polynomial register
-#define CRC_CTRL		*(volatile uint32_t *)0x40032008 // CRC Control register
-
-// Chapter 31: Analog-to-Digital Converter (ADC)
-#define ADC0_SC1A		*(volatile uint32_t *)0x4003B000 // ADC status and control registers 1
-#define ADC0_SC1B		*(volatile uint32_t *)0x4003B004 // ADC status and control registers 1
-#define ADC_SC1_COCO			(uint32_t)0x80			// Conversion complete flag
-#define ADC_SC1_AIEN			(uint32_t)0x40			// Interrupt enable
-#define ADC_SC1_DIFF			(uint32_t)0x20			// Differential mode enable
-#define ADC_SC1_ADCH(n)			(uint32_t)((n) & 0x1F)		// Input channel select
-#define ADC0_CFG1		*(volatile uint32_t *)0x4003B008 // ADC configuration register 1
-#define ADC_CFG1_ADLPC			(uint32_t)0x80			// Low-power configuration
-#define ADC_CFG1_ADIV(n)		(uint32_t)(((n) & 3) << 5)	// Clock divide select, 0=direct, 1=div2, 2=div4, 3=div8
-#define ADC_CFG1_ADLSMP			(uint32_t)0x10			// Sample time configuration, 0=Short, 1=Long
-#define ADC_CFG1_MODE(n)		(uint32_t)(((n) & 3) << 2)	// Conversion mode, 0=8 bit, 1=12 bit, 2=10 bit, 3=16 bit
-#define ADC_CFG1_ADICLK(n)		(uint32_t)(((n) & 3) << 0)	// Input clock, 0=bus, 1=bus/2, 2=OSCERCLK, 3=async
-#define ADC0_CFG2		*(volatile uint32_t *)0x4003B00C // Configuration register 2
-#define ADC_CFG2_MUXSEL			(uint32_t)0x10			// 0=a channels, 1=b channels
-#define ADC_CFG2_ADACKEN		(uint32_t)0x08			// async clock enable
-#define ADC_CFG2_ADHSC			(uint32_t)0x04			// High speed configuration
-#define ADC_CFG2_ADLSTS(n)		(uint32_t)(((n) & 3) << 0)	// Sample time, 0=24 cycles, 1=12 cycles, 2=6 cycles, 3=2 cycles
-#define ADC0_RA			*(volatile uint32_t *)0x4003B010 // ADC data result register
-#define ADC0_RB			*(volatile uint32_t *)0x4003B014 // ADC data result register
-#define ADC0_CV1		*(volatile uint32_t *)0x4003B018 // Compare value registers
-#define ADC0_CV2		*(volatile uint32_t *)0x4003B01C // Compare value registers
-#define ADC0_SC2		*(volatile uint32_t *)0x4003B020 // Status and control register 2
-#define ADC_SC2_ADACT			(uint32_t)0x80			// Conversion active
-#define ADC_SC2_ADTRG			(uint32_t)0x40			// Conversion trigger select, 0=software, 1=hardware
-#define ADC_SC2_ACFE			(uint32_t)0x20			// Compare function enable
-#define ADC_SC2_ACFGT			(uint32_t)0x10			// Compare function greater than enable
-#define ADC_SC2_ACREN			(uint32_t)0x08			// Compare function range enable
-#define ADC_SC2_DMAEN			(uint32_t)0x04			// DMA enable
-#define ADC_SC2_REFSEL(n)		(uint32_t)(((n) & 3) << 0)	// Voltage reference, 0=vcc/external, 1=1.2 volts
-#define ADC0_SC3		*(volatile uint32_t *)0x4003B024 // Status and control register 3
-#define ADC_SC3_CAL			(uint32_t)0x80			// Calibration, 1=begin, stays set while cal in progress
-#define ADC_SC3_CALF			(uint32_t)0x40			// Calibration failed flag
-#define ADC_SC3_ADCO			(uint32_t)0x08			// Continuous conversion enable
-#define ADC_SC3_AVGE			(uint32_t)0x04			// Hardware average enable
-#define ADC_SC3_AVGS(n)			(uint32_t)(((n) & 3) << 0)	// avg select, 0=4 samples, 1=8 samples, 2=16 samples, 3=32 samples
-#define ADC0_OFS		*(volatile uint32_t *)0x4003B028 // ADC offset correction register
-#define ADC0_PG			*(volatile uint32_t *)0x4003B02C // ADC plus-side gain register
-#define ADC0_MG			*(volatile uint32_t *)0x4003B030 // ADC minus-side gain register
-#define ADC0_CLPD		*(volatile uint32_t *)0x4003B034 // ADC plus-side general calibration value register
-#define ADC0_CLPS		*(volatile uint32_t *)0x4003B038 // ADC plus-side general calibration value register
-#define ADC0_CLP4		*(volatile uint32_t *)0x4003B03C // ADC plus-side general calibration value register
-#define ADC0_CLP3		*(volatile uint32_t *)0x4003B040 // ADC plus-side general calibration value register
-#define ADC0_CLP2		*(volatile uint32_t *)0x4003B044 // ADC plus-side general calibration value register
-#define ADC0_CLP1		*(volatile uint32_t *)0x4003B048 // ADC plus-side general calibration value register
-#define ADC0_CLP0		*(volatile uint32_t *)0x4003B04C // ADC plus-side general calibration value register
-#define ADC0_PGA		*(volatile uint32_t *)0x4003B050 // ADC Programmable Gain Amplifier
-#define ADC_PGA_PGAEN			(uint32_t)0x00800000		// Enable
-#define ADC_PGA_PGALPB			(uint32_t)0x00100000		// Low-Power Mode Control, 0=low power, 1=normal
-#define ADC_PGA_PGAG(n)			(uint32_t)(((n) & 15) << 16)	// Gain, 0=1X, 1=2X, 2=4X, 3=8X, 4=16X, 5=32X, 6=64X
-#define ADC0_CLMD		*(volatile uint32_t *)0x4003B054 // ADC minus-side general calibration value register
-#define ADC0_CLMS		*(volatile uint32_t *)0x4003B058 // ADC minus-side general calibration value register
-#define ADC0_CLM4		*(volatile uint32_t *)0x4003B05C // ADC minus-side general calibration value register
-#define ADC0_CLM3		*(volatile uint32_t *)0x4003B060 // ADC minus-side general calibration value register
-#define ADC0_CLM2		*(volatile uint32_t *)0x4003B064 // ADC minus-side general calibration value register
-#define ADC0_CLM1		*(volatile uint32_t *)0x4003B068 // ADC minus-side general calibration value register
-#define ADC0_CLM0		*(volatile uint32_t *)0x4003B06C // ADC minus-side general calibration value register
-
-#define ADC1_SC1A		*(volatile uint32_t *)0x400BB000 // ADC status and control registers 1
-#define ADC1_SC1B		*(volatile uint32_t *)0x400BB004 // ADC status and control registers 1
-#define ADC1_CFG1		*(volatile uint32_t *)0x400BB008 // ADC configuration register 1
-#define ADC1_CFG2		*(volatile uint32_t *)0x400BB00C // Configuration register 2
-#define ADC1_RA			*(volatile uint32_t *)0x400BB010 // ADC data result register
-#define ADC1_RB			*(volatile uint32_t *)0x400BB014 // ADC data result register
-#define ADC1_CV1		*(volatile uint32_t *)0x400BB018 // Compare value registers
-#define ADC1_CV2		*(volatile uint32_t *)0x400BB01C // Compare value registers
-#define ADC1_SC2		*(volatile uint32_t *)0x400BB020 // Status and control register 2
-#define ADC1_SC3		*(volatile uint32_t *)0x400BB024 // Status and control register 3
-#define ADC1_OFS		*(volatile uint32_t *)0x400BB028 // ADC offset correction register
-#define ADC1_PG			*(volatile uint32_t *)0x400BB02C // ADC plus-side gain register
-#define ADC1_MG			*(volatile uint32_t *)0x400BB030 // ADC minus-side gain register
-#define ADC1_CLPD		*(volatile uint32_t *)0x400BB034 // ADC plus-side general calibration value register
-#define ADC1_CLPS		*(volatile uint32_t *)0x400BB038 // ADC plus-side general calibration value register
-#define ADC1_CLP4		*(volatile uint32_t *)0x400BB03C // ADC plus-side general calibration value register
-#define ADC1_CLP3		*(volatile uint32_t *)0x400BB040 // ADC plus-side general calibration value register
-#define ADC1_CLP2		*(volatile uint32_t *)0x400BB044 // ADC plus-side general calibration value register
-#define ADC1_CLP1		*(volatile uint32_t *)0x400BB048 // ADC plus-side general calibration value register
-#define ADC1_CLP0		*(volatile uint32_t *)0x400BB04C // ADC plus-side general calibration value register
-#define ADC1_PGA		*(volatile uint32_t *)0x400BB050 // ADC Programmable Gain Amplifier
-#define ADC1_CLMD		*(volatile uint32_t *)0x400BB054 // ADC minus-side general calibration value register
-#define ADC1_CLMS		*(volatile uint32_t *)0x400BB058 // ADC minus-side general calibration value register
-#define ADC1_CLM4		*(volatile uint32_t *)0x400BB05C // ADC minus-side general calibration value register
-#define ADC1_CLM3		*(volatile uint32_t *)0x400BB060 // ADC minus-side general calibration value register
-#define ADC1_CLM2		*(volatile uint32_t *)0x400BB064 // ADC minus-side general calibration value register
-#define ADC1_CLM1		*(volatile uint32_t *)0x400BB068 // ADC minus-side general calibration value register
-#define ADC1_CLM0		*(volatile uint32_t *)0x400BB06C // ADC minus-side general calibration value register
-
-#define DAC0_DAT0L		*(volatile uint8_t  *)0x400CC000 // DAC Data Low Register
-#define DAC0_DATH		*(volatile uint8_t  *)0x400CC001 // DAC Data High Register
-#define DAC0_DAT1L		*(volatile uint8_t  *)0x400CC002 // DAC Data Low Register
-#define DAC0_DAT2L		*(volatile uint8_t  *)0x400CC004 // DAC Data Low Register
-#define DAC0_DAT3L		*(volatile uint8_t  *)0x400CC006 // DAC Data Low Register
-#define DAC0_DAT4L		*(volatile uint8_t  *)0x400CC008 // DAC Data Low Register
-#define DAC0_DAT5L		*(volatile uint8_t  *)0x400CC00A // DAC Data Low Register
-#define DAC0_DAT6L		*(volatile uint8_t  *)0x400CC00C // DAC Data Low Register
-#define DAC0_DAT7L		*(volatile uint8_t  *)0x400CC00E // DAC Data Low Register
-#define DAC0_DAT8L		*(volatile uint8_t  *)0x400CC010 // DAC Data Low Register
-#define DAC0_DAT9L		*(volatile uint8_t  *)0x400CC012 // DAC Data Low Register
-#define DAC0_DAT10L		*(volatile uint8_t  *)0x400CC014 // DAC Data Low Register
-#define DAC0_DAT11L		*(volatile uint8_t  *)0x400CC016 // DAC Data Low Register
-#define DAC0_DAT12L		*(volatile uint8_t  *)0x400CC018 // DAC Data Low Register
-#define DAC0_DAT13L		*(volatile uint8_t  *)0x400CC01A // DAC Data Low Register
-#define DAC0_DAT14L		*(volatile uint8_t  *)0x400CC01C // DAC Data Low Register
-#define DAC0_DAT15L		*(volatile uint8_t  *)0x400CC01E // DAC Data Low Register
-#define DAC0_SR			*(volatile uint8_t  *)0x400CC020 // DAC Status Register
-#define DAC0_C0			*(volatile uint8_t  *)0x400CC021 // DAC Control Register
-#define DAC_C0_DACEN			0x80				// DAC Enable
-#define DAC_C0_DACRFS			0x40				// DAC Reference Select
-#define DAC_C0_DACTRGSEL		0x20				// DAC Trigger Select
-#define DAC_C0_DACSWTRG			0x10				// DAC Software Trigger
-#define DAC_C0_LPEN			0x08				// DAC Low Power Control
-#define DAC_C0_DACBWIEN			0x04				// DAC Buffer Watermark Interrupt Enable
-#define DAC_C0_DACBTIEN			0x02				// DAC Buffer Read Pointer Top Flag Interrupt Enable
-#define DAC_C0_DACBBIEN			0x01				// DAC Buffer Read Pointer Bottom Flag Interrupt Enable
-#define DAC0_C1			*(volatile uint8_t  *)0x400CC022 // DAC Control Register 1
-#define DAC_C1_DMAEN			0x80				// DMA Enable Select
-#define DAC_C1_DACBFWM(n)		(((n) & 3) << 3)		// DAC Buffer Watermark Select
-#define DAC_C1_DACBFMD(n)		(((n) & 3) << 0)		// DAC Buffer Work Mode Select
-#define DAC_C1_DACBFEN			0x00				// DAC Buffer Enable
-
-#define DAC0_C2			*(volatile uint8_t  *)0x400CC023 // DAC Control Register 2
-#define DAC_C2_DACBFRP(n)		(((n) & 15) << 4)		// DAC Buffer Read Pointer
-#define DAC_C2_DACBFUP(n)		(((n) & 15) << 0)		// DAC Buffer Upper Limit
-
-
-//#define MCG_C2_RANGE0(n)		(uint8_t)(((n) & 0x03) << 4)	// Frequency Range Select, Selects the frequency range for the crystal oscillator
-//#define MCG_C2_LOCRE0			(uint8_t)0x80			// Loss of Clock Reset Enable, Determines whether an interrupt or a reset request is made following a loss of OSC0
-
-// Chapter 32: Comparator (CMP)
-#define CMP0_CR0		*(volatile uint8_t  *)0x40073000 // CMP Control Register 0
-#define CMP0_CR1		*(volatile uint8_t  *)0x40073001 // CMP Control Register 1
-#define CMP0_FPR		*(volatile uint8_t  *)0x40073002 // CMP Filter Period Register
-#define CMP0_SCR		*(volatile uint8_t  *)0x40073003 // CMP Status and Control Register
-#define CMP0_DACCR		*(volatile uint8_t  *)0x40073004 // DAC Control Register
-#define CMP0_MUXCR		*(volatile uint8_t  *)0x40073005 // MUX Control Register
-#define CMP1_CR0		*(volatile uint8_t  *)0x40073008 // CMP Control Register 0
-#define CMP1_CR1		*(volatile uint8_t  *)0x40073009 // CMP Control Register 1
-#define CMP1_FPR		*(volatile uint8_t  *)0x4007300A // CMP Filter Period Register
-#define CMP1_SCR		*(volatile uint8_t  *)0x4007300B // CMP Status and Control Register
-#define CMP1_DACCR		*(volatile uint8_t  *)0x4007300C // DAC Control Register
-#define CMP1_MUXCR		*(volatile uint8_t  *)0x4007300D // MUX Control Register
-
-// Chapter 33: Voltage Reference (VREFV1)
-#define VREF_TRM		*(volatile uint8_t  *)0x40074000 // VREF Trim Register
-#define VREF_TRM_CHOPEN			(uint8_t)0x40			// Chop oscillator enable
-#define VREF_TRM_TRIM(n)		((n) & 0x3F)			// Trim bits
-#define VREF_SC			*(volatile uint8_t  *)0x40074001 // VREF Status and Control Register
-#define VREF_SC_VREFEN			(uint8_t)0x80			// Internal Voltage Reference enable
-#define VREF_SC_REGEN			(uint8_t)0x40			// Regulator enable
-#define VREF_SC_ICOMPEN			(uint8_t)0x20			// Second order curvature compensation enable
-#define VREF_SC_VREFST			(uint8_t)0x04			// Internal Voltage Reference stable flag
-#define VREF_SC_MODE_LV(n)		(uint8_t)(((n) & 3) << 0)	// Buffer Mode selection: 0=Bandgap on only
-									//  1=High power buffer mode,
-									//  2=Low-power buffer mode
-
-// Chapter 34: Programmable Delay Block (PDB)
-#define PDB0_SC			*(volatile uint32_t *)0x40036000 // Status and Control Register
-#define PDB_SC_LDMOD(n)			(((n) & 3) << 18)	// Load Mode Select
-#define PDB_SC_PDBEIE			0x00020000		// Sequence Error Interrupt Enable
-#define PDB_SC_SWTRIG			0x00010000		// Software Trigger
-#define PDB_SC_DMAEN			0x00008000		// DMA Enable
-#define PDB_SC_PRESCALER(n)		(((n) & 7) << 12)	// Prescaler Divider Select
-#define PDB_SC_TRGSEL(n)		(((n) & 15) << 8)	// Trigger Input Source Select
-#define PDB_SC_PDBEN			0x00000080		// PDB Enable
-#define PDB_SC_PDBIF			0x00000040		// PDB Interrupt Flag
-#define PDB_SC_PDBIE			0x00000020		// PDB Interrupt Enable.
-#define PDB_SC_MULT(n)			(((n) & 3) << 2)	// Multiplication Factor
-#define PDB_SC_CONT			0x00000002		// Continuous Mode Enable
-#define PDB_SC_LDOK			0x00000001		// Load OK
-#define PDB0_MOD		*(volatile uint32_t *)0x40036004 // Modulus Register
-#define PDB0_CNT		*(volatile uint32_t *)0x40036008 // Counter Register
-#define PDB0_IDLY		*(volatile uint32_t *)0x4003600C // Interrupt Delay Register
-#define PDB0_CH0C1		*(volatile uint32_t *)0x40036010 // Channel n Control Register 1
-#define PDB0_CH0S		*(volatile uint32_t *)0x40036014 // Channel n Status Register
-#define PDB0_CH0DLY0		*(volatile uint32_t *)0x40036018 // Channel n Delay 0 Register
-#define PDB0_CH0DLY1		*(volatile uint32_t *)0x4003601C // Channel n Delay 1 Register
-#define PDB0_POEN		*(volatile uint32_t *)0x40036190 // Pulse-Out n Enable Register
-#define PDB0_PO0DLY		*(volatile uint32_t *)0x40036194 // Pulse-Out n Delay Register
-#define PDB0_PO1DLY		*(volatile uint32_t *)0x40036198 // Pulse-Out n Delay Register
-
-// Chapter 35: FlexTimer Module (FTM)
-#define FTM0_SC			*(volatile uint32_t *)0x40038000 // Status And Control
-#define FTM_SC_TOF			0x80				// Timer Overflow Flag
-#define FTM_SC_TOIE			0x40				// Timer Overflow Interrupt Enable
-#define FTM_SC_CPWMS			0x20				// Center-Aligned PWM Select
-#define FTM_SC_CLKS(n)			(((n) & 3) << 3)		// Clock Source Selection
-#define FTM_SC_PS(n)			(((n) & 7) << 0)		// Prescale Factor Selection
-#define FTM0_CNT		*(volatile uint32_t *)0x40038004 // Counter
-#define FTM0_MOD		*(volatile uint32_t *)0x40038008 // Modulo
-#define FTM0_C0SC		*(volatile uint32_t *)0x4003800C // Channel 0 Status And Control
-#define FTM0_C0V		*(volatile uint32_t *)0x40038010 // Channel 0 Value
-#define FTM0_C1SC		*(volatile uint32_t *)0x40038014 // Channel 1 Status And Control
-#define FTM0_C1V		*(volatile uint32_t *)0x40038018 // Channel 1 Value
-#define FTM0_C2SC		*(volatile uint32_t *)0x4003801C // Channel 2 Status And Control
-#define FTM0_C2V		*(volatile uint32_t *)0x40038020 // Channel 2 Value
-#define FTM0_C3SC		*(volatile uint32_t *)0x40038024 // Channel 3 Status And Control
-#define FTM0_C3V		*(volatile uint32_t *)0x40038028 // Channel 3 Value
-#define FTM0_C4SC		*(volatile uint32_t *)0x4003802C // Channel 4 Status And Control
-#define FTM0_C4V		*(volatile uint32_t *)0x40038030 // Channel 4 Value
-#define FTM0_C5SC		*(volatile uint32_t *)0x40038034 // Channel 5 Status And Control
-#define FTM0_C5V		*(volatile uint32_t *)0x40038038 // Channel 5 Value
-#define FTM0_C6SC		*(volatile uint32_t *)0x4003803C // Channel 6 Status And Control
-#define FTM0_C6V		*(volatile uint32_t *)0x40038040 // Channel 6 Value
-#define FTM0_C7SC		*(volatile uint32_t *)0x40038044 // Channel 7 Status And Control
-#define FTM0_C7V		*(volatile uint32_t *)0x40038048 // Channel 7 Value
-#define FTM0_CNTIN		*(volatile uint32_t *)0x4003804C // Counter Initial Value
-#define FTM0_STATUS		*(volatile uint32_t *)0x40038050 // Capture And Compare Status
-#define FTM0_MODE		*(volatile uint32_t *)0x40038054 // Features Mode Selection
-#define FTM_MODE_FAULTIE		0x80				// Fault Interrupt Enable
-#define FTM_MODE_FAULTM(n)		(((n) & 3) << 5)		// Fault Control Mode
-#define FTM_MODE_CAPTEST		0x10				// Capture Test Mode Enable
-#define FTM_MODE_PWMSYNC		0x08				// PWM Synchronization Mode
-#define FTM_MODE_WPDIS			0x04				// Write Protection Disable
-#define FTM_MODE_INIT			0x02				// Initialize The Channels Output
-#define FTM_MODE_FTMEN			0x01				// FTM Enable
-#define FTM0_SYNC		*(volatile uint32_t *)0x40038058 // Synchronization
-#define FTM_SYNC_SWSYNC			0x80				//
-#define FTM_SYNC_TRIG2			0x40				//
-#define FTM_SYNC_TRIG1			0x20				//
-#define FTM_SYNC_TRIG0			0x10				//
-#define FTM_SYNC_SYNCHOM		0x08				//
-#define FTM_SYNC_REINIT			0x04				//
-#define FTM_SYNC_CNTMAX			0x02				//
-#define FTM_SYNC_CNTMIN			0x01				//
-#define FTM0_OUTINIT		*(volatile uint32_t *)0x4003805C // Initial State For Channels Output
-#define FTM0_OUTMASK		*(volatile uint32_t *)0x40038060 // Output Mask
-#define FTM0_COMBINE		*(volatile uint32_t *)0x40038064 // Function For Linked Channels
-#define FTM0_DEADTIME		*(volatile uint32_t *)0x40038068 // Deadtime Insertion Control
-#define FTM0_EXTTRIG		*(volatile uint32_t *)0x4003806C // FTM External Trigger
-#define FTM0_POL		*(volatile uint32_t *)0x40038070 // Channels Polarity
-#define FTM0_FMS		*(volatile uint32_t *)0x40038074 // Fault Mode Status
-#define FTM0_FILTER		*(volatile uint32_t *)0x40038078 // Input Capture Filter Control
-#define FTM0_FLTCTRL		*(volatile uint32_t *)0x4003807C // Fault Control
-#define FTM0_QDCTRL		*(volatile uint32_t *)0x40038080 // Quadrature Decoder Control And Status
-#define FTM0_CONF		*(volatile uint32_t *)0x40038084 // Configuration
-#define FTM0_FLTPOL		*(volatile uint32_t *)0x40038088 // FTM Fault Input Polarity
-#define FTM0_SYNCONF		*(volatile uint32_t *)0x4003808C // Synchronization Configuration
-#define FTM0_INVCTRL		*(volatile uint32_t *)0x40038090 // FTM Inverting Control
-#define FTM0_SWOCTRL		*(volatile uint32_t *)0x40038094 // FTM Software Output Control
-#define FTM0_PWMLOAD		*(volatile uint32_t *)0x40038098 // FTM PWM Load
-#define FTM1_SC			*(volatile uint32_t *)0x40039000 // Status And Control
-#define FTM1_CNT		*(volatile uint32_t *)0x40039004 // Counter
-#define FTM1_MOD		*(volatile uint32_t *)0x40039008 // Modulo
-#define FTM1_C0SC		*(volatile uint32_t *)0x4003900C // Channel 0 Status And Control
-#define FTM1_C0V		*(volatile uint32_t *)0x40039010 // Channel 0 Value
-#define FTM1_C1SC		*(volatile uint32_t *)0x40039014 // Channel 1 Status And Control
-#define FTM1_C1V		*(volatile uint32_t *)0x40039018 // Channel 1 Value
-#define FTM1_CNTIN		*(volatile uint32_t *)0x4003904C // Counter Initial Value
-#define FTM1_STATUS		*(volatile uint32_t *)0x40039050 // Capture And Compare Status
-#define FTM1_MODE		*(volatile uint32_t *)0x40039054 // Features Mode Selection
-#define FTM1_SYNC		*(volatile uint32_t *)0x40039058 // Synchronization
-#define FTM1_OUTINIT		*(volatile uint32_t *)0x4003905C // Initial State For Channels Output
-#define FTM1_OUTMASK		*(volatile uint32_t *)0x40039060 // Output Mask
-#define FTM1_COMBINE		*(volatile uint32_t *)0x40039064 // Function For Linked Channels
-#define FTM1_DEADTIME		*(volatile uint32_t *)0x40039068 // Deadtime Insertion Control
-#define FTM1_EXTTRIG		*(volatile uint32_t *)0x4003906C // FTM External Trigger
-#define FTM1_POL		*(volatile uint32_t *)0x40039070 // Channels Polarity
-#define FTM1_FMS		*(volatile uint32_t *)0x40039074 // Fault Mode Status
-#define FTM1_FILTER		*(volatile uint32_t *)0x40039078 // Input Capture Filter Control
-#define FTM1_FLTCTRL		*(volatile uint32_t *)0x4003907C // Fault Control
-#define FTM1_QDCTRL		*(volatile uint32_t *)0x40039080 // Quadrature Decoder Control And Status
-#define FTM1_CONF		*(volatile uint32_t *)0x40039084 // Configuration
-#define FTM1_FLTPOL		*(volatile uint32_t *)0x40039088 // FTM Fault Input Polarity
-#define FTM1_SYNCONF		*(volatile uint32_t *)0x4003908C // Synchronization Configuration
-#define FTM1_INVCTRL		*(volatile uint32_t *)0x40039090 // FTM Inverting Control
-#define FTM1_SWOCTRL		*(volatile uint32_t *)0x40039094 // FTM Software Output Control
-#define FTM1_PWMLOAD		*(volatile uint32_t *)0x40039098 // FTM PWM Load
-#define FTM2_SC			*(volatile uint32_t *)0x400B8000 // Status And Control
-#define FTM2_CNT		*(volatile uint32_t *)0x400B8004 // Counter
-#define FTM2_MOD		*(volatile uint32_t *)0x400B8008 // Modulo
-#define FTM2_C0SC		*(volatile uint32_t *)0x400B800C // Channel 0 Status And Control
-#define FTM2_C0V		*(volatile uint32_t *)0x400B8010 // Channel 0 Value
-#define FTM2_C1SC		*(volatile uint32_t *)0x400B8014 // Channel 1 Status And Control
-#define FTM2_C1V		*(volatile uint32_t *)0x400B8018 // Channel 1 Value
-#define FTM2_CNTIN		*(volatile uint32_t *)0x400B804C // Counter Initial Value
-#define FTM2_STATUS		*(volatile uint32_t *)0x400B8050 // Capture And Compare Status
-#define FTM2_MODE		*(volatile uint32_t *)0x400B8054 // Features Mode Selection
-#define FTM2_SYNC		*(volatile uint32_t *)0x400B8058 // Synchronization
-#define FTM2_OUTINIT		*(volatile uint32_t *)0x400B805C // Initial State For Channels Output
-#define FTM2_OUTMASK		*(volatile uint32_t *)0x400B8060 // Output Mask
-#define FTM2_COMBINE		*(volatile uint32_t *)0x400B8064 // Function For Linked Channels
-#define FTM2_DEADTIME		*(volatile uint32_t *)0x400B8068 // Deadtime Insertion Control
-#define FTM2_EXTTRIG		*(volatile uint32_t *)0x400B806C // FTM External Trigger
-#define FTM2_POL		*(volatile uint32_t *)0x400B8070 // Channels Polarity
-#define FTM2_FMS		*(volatile uint32_t *)0x400B8074 // Fault Mode Status
-#define FTM2_FILTER		*(volatile uint32_t *)0x400B8078 // Input Capture Filter Control
-#define FTM2_FLTCTRL		*(volatile uint32_t *)0x400B807C // Fault Control
-#define FTM2_QDCTRL		*(volatile uint32_t *)0x400B8080 // Quadrature Decoder Control And Status
-#define FTM2_CONF		*(volatile uint32_t *)0x400B8084 // Configuration
-#define FTM2_FLTPOL		*(volatile uint32_t *)0x400B8088 // FTM Fault Input Polarity
-#define FTM2_SYNCONF		*(volatile uint32_t *)0x400B808C // Synchronization Configuration
-#define FTM2_INVCTRL		*(volatile uint32_t *)0x400B8090 // FTM Inverting Control
-#define FTM2_SWOCTRL		*(volatile uint32_t *)0x400B8094 // FTM Software Output Control
-#define FTM2_PWMLOAD		*(volatile uint32_t *)0x400B8098 // FTM PWM Load
-
-// Chapter 36: Periodic Interrupt Timer (PIT)
-#define PIT_MCR			*(volatile uint32_t *)0x40037000 // PIT Module Control Register
-#define PIT_LDVAL0		*(volatile uint32_t *)0x40037100 // Timer Load Value Register
-#define PIT_CVAL0		*(volatile uint32_t *)0x40037104 // Current Timer Value Register
-#define PIT_TCTRL0		*(volatile uint32_t *)0x40037108 // Timer Control Register
-#define PIT_TFLG0		*(volatile uint32_t *)0x4003710C // Timer Flag Register
-#define PIT_LDVAL1		*(volatile uint32_t *)0x40037110 // Timer Load Value Register
-#define PIT_CVAL1		*(volatile uint32_t *)0x40037114 // Current Timer Value Register
-#define PIT_TCTRL1		*(volatile uint32_t *)0x40037118 // Timer Control Register
-#define PIT_TFLG1		*(volatile uint32_t *)0x4003711C // Timer Flag Register
-#define PIT_LDVAL2		*(volatile uint32_t *)0x40037120 // Timer Load Value Register
-#define PIT_CVAL2		*(volatile uint32_t *)0x40037124 // Current Timer Value Register
-#define PIT_TCTRL2		*(volatile uint32_t *)0x40037128 // Timer Control Register
-#define PIT_TFLG2		*(volatile uint32_t *)0x4003712C // Timer Flag Register
-#define PIT_LDVAL3		*(volatile uint32_t *)0x40037130 // Timer Load Value Register
-#define PIT_CVAL3		*(volatile uint32_t *)0x40037134 // Current Timer Value Register
-#define PIT_TCTRL3		*(volatile uint32_t *)0x40037138 // Timer Control Register
-#define PIT_TFLG3		*(volatile uint32_t *)0x4003713C // Timer Flag Register
-
-// Chapter 37: Low-Power Timer (LPTMR)
-#define LPTMR0_CSR		*(volatile uint32_t *)0x40040000 // Low Power Timer Control Status Register
-#define LPTMR0_PSR		*(volatile uint32_t *)0x40040004 // Low Power Timer Prescale Register
-#define LPTMR0_CMR		*(volatile uint32_t *)0x40040008 // Low Power Timer Compare Register
-#define LPTMR0_CNR		*(volatile uint32_t *)0x4004000C // Low Power Timer Counter Register
-
-// Chapter 38: Carrier Modulator Transmitter (CMT)
-#define CMT_CGH1		*(volatile uint8_t  *)0x40062000 // CMT Carrier Generator High Data Register 1
-#define CMT_CGL1		*(volatile uint8_t  *)0x40062001 // CMT Carrier Generator Low Data Register 1
-#define CMT_CGH2		*(volatile uint8_t  *)0x40062002 // CMT Carrier Generator High Data Register 2
-#define CMT_CGL2		*(volatile uint8_t  *)0x40062003 // CMT Carrier Generator Low Data Register 2
-#define CMT_OC			*(volatile uint8_t  *)0x40062004 // CMT Output Control Register
-#define CMT_MSC			*(volatile uint8_t  *)0x40062005 // CMT Modulator Status and Control Register
-#define CMT_CMD1		*(volatile uint8_t  *)0x40062006 // CMT Modulator Data Register Mark High
-#define CMT_CMD2		*(volatile uint8_t  *)0x40062007 // CMT Modulator Data Register Mark Low
-#define CMT_CMD3		*(volatile uint8_t  *)0x40062008 // CMT Modulator Data Register Space High
-#define CMT_CMD4		*(volatile uint8_t  *)0x40062009 // CMT Modulator Data Register Space Low
-#define CMT_PPS			*(volatile uint8_t  *)0x4006200A // CMT Primary Prescaler Register
-#define CMT_DMA			*(volatile uint8_t  *)0x4006200B // CMT Direct Memory Access Register
-
-// Chapter 39: Real Time Clock (RTC)
-#define RTC_TSR			*(volatile uint32_t *)0x4003D000 // RTC Time Seconds Register
-#define RTC_TPR			*(volatile uint32_t *)0x4003D004 // RTC Time Prescaler Register
-#define RTC_TAR			*(volatile uint32_t *)0x4003D008 // RTC Time Alarm Register
-#define RTC_TCR			*(volatile uint32_t *)0x4003D00C // RTC Time Compensation Register
-#define RTC_TCR_CIC(n)			(((n) & 255) << 24)		// Compensation Interval Counter
-#define RTC_TCR_TCV(n)			(((n) & 255) << 16)		// Time Compensation Value
-#define RTC_TCR_CIR(n)			(((n) & 255) << 8)		// Compensation Interval Register
-#define RTC_TCR_TCR(n)			(((n) & 255) << 0)		// Time Compensation Register
-#define RTC_CR			*(volatile uint32_t *)0x4003D010 // RTC Control Register
-#define RTC_CR_SC2P			(uint32_t)0x00002000		//
-#define RTC_CR_SC4P			(uint32_t)0x00001000		//
-#define RTC_CR_SC8P			(uint32_t)0x00000800		//
-#define RTC_CR_SC16P			(uint32_t)0x00000400		//
-#define RTC_CR_CLKO			(uint32_t)0x00000200		//
-#define RTC_CR_OSCE			(uint32_t)0x00000100		//
-#define RTC_CR_UM			(uint32_t)0x00000008		//
-#define RTC_CR_SUP			(uint32_t)0x00000004		//
-#define RTC_CR_WPE			(uint32_t)0x00000002		//
-#define RTC_CR_SWR			(uint32_t)0x00000001		//
-#define RTC_SR			*(volatile uint32_t *)0x4003D014 // RTC Status Register
-#define RTC_SR_TCE			(uint32_t)0x00000010		//
-#define RTC_SR_TAF			(uint32_t)0x00000004		//
-#define RTC_SR_TOF			(uint32_t)0x00000002		//
-#define RTC_SR_TIF			(uint32_t)0x00000001		//
-#define RTC_LR			*(volatile uint32_t *)0x4003D018 // RTC Lock Register
-#define RTC_IER			*(volatile uint32_t *)0x4003D01C // RTC Interrupt Enable Register
-#define RTC_WAR			*(volatile uint32_t *)0x4003D800 // RTC Write Access Register
-#define RTC_RAR			*(volatile uint32_t *)0x4003D804 // RTC Read Access Register
-
-// Chapter 40: Universal Serial Bus OTG Controller (USBOTG)
-#define USB0_PERID		*(const	   uint8_t  *)0x40072000 // Peripheral ID register
-#define USB0_IDCOMP		*(const	   uint8_t  *)0x40072004 // Peripheral ID Complement register
-#define USB0_REV		*(const	   uint8_t  *)0x40072008 // Peripheral Revision register
-#define USB0_ADDINFO		*(volatile uint8_t  *)0x4007200C // Peripheral Additional Info register
-#define USB0_OTGISTAT		*(volatile uint8_t  *)0x40072010 // OTG Interrupt Status register
-#define USB_OTGISTAT_IDCHG		(uint8_t)0x80			//
-#define USB_OTGISTAT_ONEMSEC		(uint8_t)0x40			//
-#define USB_OTGISTAT_LINE_STATE_CHG	(uint8_t)0x20			//
-#define USB_OTGISTAT_SESSVLDCHG		(uint8_t)0x08			//
-#define USB_OTGISTAT_B_SESS_CHG		(uint8_t)0x04			//
-#define USB_OTGISTAT_AVBUSCHG		(uint8_t)0x01			//
-#define USB0_OTGICR		*(volatile uint8_t  *)0x40072014 // OTG Interrupt Control Register
-#define USB_OTGICR_IDEN			(uint8_t)0x80			//
-#define USB_OTGICR_ONEMSECEN		(uint8_t)0x40			//
-#define USB_OTGICR_LINESTATEEN		(uint8_t)0x20			//
-#define USB_OTGICR_SESSVLDEN		(uint8_t)0x08			//
-#define USB_OTGICR_BSESSEN		(uint8_t)0x04			//
-#define USB_OTGICR_AVBUSEN		(uint8_t)0x01			//
-#define USB0_OTGSTAT		*(volatile uint8_t  *)0x40072018 // OTG Status register
-#define USB_OTGSTAT_ID			(uint8_t)0x80			//
-#define USB_OTGSTAT_ONEMSECEN		(uint8_t)0x40			//
-#define USB_OTGSTAT_LINESTATESTABLE	(uint8_t)0x20			//
-#define USB_OTGSTAT_SESS_VLD		(uint8_t)0x08			//
-#define USB_OTGSTAT_BSESSEND		(uint8_t)0x04			//
-#define USB_OTGSTAT_AVBUSVLD		(uint8_t)0x01			//
-#define USB0_OTGCTL		*(volatile uint8_t  *)0x4007201C // OTG Control Register
-#define USB_OTGCTL_DPHIGH		(uint8_t)0x80			//
-#define USB_OTGCTL_DPLOW		(uint8_t)0x20			//
-#define USB_OTGCTL_DMLOW		(uint8_t)0x10			//
-#define USB_OTGCTL_OTGEN		(uint8_t)0x04			//
-#define USB0_ISTAT		*(volatile uint8_t  *)0x40072080 // Interrupt Status Register
-#define USB_ISTAT_STALL			(uint8_t)0x80			//
-#define USB_ISTAT_ATTACH		(uint8_t)0x40			//
-#define USB_ISTAT_RESUME		(uint8_t)0x20			//
-#define USB_ISTAT_SLEEP			(uint8_t)0x10			//
-#define USB_ISTAT_TOKDNE		(uint8_t)0x08			//
-#define USB_ISTAT_SOFTOK		(uint8_t)0x04			//
-#define USB_ISTAT_ERROR			(uint8_t)0x02			//
-#define USB_ISTAT_USBRST		(uint8_t)0x01			//
-#define USB0_INTEN		*(volatile uint8_t  *)0x40072084 // Interrupt Enable Register
-#define USB_INTEN_STALLEN		(uint8_t)0x80			//
-#define USB_INTEN_ATTACHEN		(uint8_t)0x40			//
-#define USB_INTEN_RESUMEEN		(uint8_t)0x20			//
-#define USB_INTEN_SLEEPEN		(uint8_t)0x10			//
-#define USB_INTEN_TOKDNEEN		(uint8_t)0x08			//
-#define USB_INTEN_SOFTOKEN		(uint8_t)0x04			//
-#define USB_INTEN_ERROREN		(uint8_t)0x02			//
-#define USB_INTEN_USBRSTEN		(uint8_t)0x01			//
-#define USB0_ERRSTAT		*(volatile uint8_t  *)0x40072088 // Error Interrupt Status Register
-#define USB_ERRSTAT_BTSERR		(uint8_t)0x80			//
-#define USB_ERRSTAT_DMAERR		(uint8_t)0x20			//
-#define USB_ERRSTAT_BTOERR		(uint8_t)0x10			//
-#define USB_ERRSTAT_DFN8		(uint8_t)0x08			//
-#define USB_ERRSTAT_CRC16		(uint8_t)0x04			//
-#define USB_ERRSTAT_CRC5EOF		(uint8_t)0x02			//
-#define USB_ERRSTAT_PIDERR		(uint8_t)0x01			//
-#define USB0_ERREN		*(volatile uint8_t  *)0x4007208C // Error Interrupt Enable Register
-#define USB_ERREN_BTSERREN		(uint8_t)0x80			//
-#define USB_ERREN_DMAERREN		(uint8_t)0x20			//
-#define USB_ERREN_BTOERREN		(uint8_t)0x10			//
-#define USB_ERREN_DFN8EN		(uint8_t)0x08			//
-#define USB_ERREN_CRC16EN		(uint8_t)0x04			//
-#define USB_ERREN_CRC5EOFEN		(uint8_t)0x02			//
-#define USB_ERREN_PIDERREN		(uint8_t)0x01			//
-#define USB0_STAT		*(volatile uint8_t  *)0x40072090 // Status Register
-#define USB_STAT_TX			(uint8_t)0x08			//
-#define USB_STAT_ODD			(uint8_t)0x04			//
-#define USB_STAT_ENDP(n)		(uint8_t)((n) >> 4)		//
-#define USB0_CTL		*(volatile uint8_t  *)0x40072094 // Control Register
-#define USB_CTL_JSTATE			(uint8_t)0x80			//
-#define USB_CTL_SE0			(uint8_t)0x40			//
-#define USB_CTL_TXSUSPENDTOKENBUSY	(uint8_t)0x20			//
-#define USB_CTL_RESET			(uint8_t)0x10			//
-#define USB_CTL_HOSTMODEEN		(uint8_t)0x08			//
-#define USB_CTL_RESUME			(uint8_t)0x04			//
-#define USB_CTL_ODDRST			(uint8_t)0x02			//
-#define USB_CTL_USBENSOFEN		(uint8_t)0x01			//
-#define USB0_ADDR		*(volatile uint8_t  *)0x40072098 // Address Register
-#define USB0_BDTPAGE1		*(volatile uint8_t  *)0x4007209C // BDT Page Register 1
-#define USB0_FRMNUML		*(volatile uint8_t  *)0x400720A0 // Frame Number Register Low
-#define USB0_FRMNUMH		*(volatile uint8_t  *)0x400720A4 // Frame Number Register High
-#define USB0_TOKEN		*(volatile uint8_t  *)0x400720A8 // Token Register
-#define USB0_SOFTHLD		*(volatile uint8_t  *)0x400720AC // SOF Threshold Register
-#define USB0_BDTPAGE2		*(volatile uint8_t  *)0x400720B0 // BDT Page Register 2
-#define USB0_BDTPAGE3		*(volatile uint8_t  *)0x400720B4 // BDT Page Register 3
-#define USB0_ENDPT0		*(volatile uint8_t  *)0x400720C0 // Endpoint Control Register
-#define USB_ENDPT_HOSTWOHUB		(uint8_t)0x80			// host only, enable low speed
-#define USB_ENDPT_RETRYDIS		(uint8_t)0x40			// host only, set to disable NAK retry
-#define USB_ENDPT_EPCTLDIS		(uint8_t)0x10			// 0=control, 1=bulk, interrupt, isync
-#define USB_ENDPT_EPRXEN		(uint8_t)0x08			// enables the endpoint for RX transfers.
-#define USB_ENDPT_EPTXEN		(uint8_t)0x04			// enables the endpoint for TX transfers.
-#define USB_ENDPT_EPSTALL		(uint8_t)0x02			// set to stall endpoint
-#define USB_ENDPT_EPHSHK		(uint8_t)0x01			// enable handshaking during a transaction, generally set unless Isochronous
-#define USB0_ENDPT1		*(volatile uint8_t  *)0x400720C4 // Endpoint Control Register
-#define USB0_ENDPT2		*(volatile uint8_t  *)0x400720C8 // Endpoint Control Register
-#define USB0_ENDPT3		*(volatile uint8_t  *)0x400720CC // Endpoint Control Register
-#define USB0_ENDPT4		*(volatile uint8_t  *)0x400720D0 // Endpoint Control Register
-#define USB0_ENDPT5		*(volatile uint8_t  *)0x400720D4 // Endpoint Control Register
-#define USB0_ENDPT6		*(volatile uint8_t  *)0x400720D8 // Endpoint Control Register
-#define USB0_ENDPT7		*(volatile uint8_t  *)0x400720DC // Endpoint Control Register
-#define USB0_ENDPT8		*(volatile uint8_t  *)0x400720E0 // Endpoint Control Register
-#define USB0_ENDPT9		*(volatile uint8_t  *)0x400720E4 // Endpoint Control Register
-#define USB0_ENDPT10		*(volatile uint8_t  *)0x400720E8 // Endpoint Control Register
-#define USB0_ENDPT11		*(volatile uint8_t  *)0x400720EC // Endpoint Control Register
-#define USB0_ENDPT12		*(volatile uint8_t  *)0x400720F0 // Endpoint Control Register
-#define USB0_ENDPT13		*(volatile uint8_t  *)0x400720F4 // Endpoint Control Register
-#define USB0_ENDPT14		*(volatile uint8_t  *)0x400720F8 // Endpoint Control Register
-#define USB0_ENDPT15		*(volatile uint8_t  *)0x400720FC // Endpoint Control Register
-#define USB0_USBCTRL		*(volatile uint8_t  *)0x40072100 // USB Control Register
-#define USB_USBCTRL_SUSP		(uint8_t)0x80			// Places the USB transceiver into the suspend state.
-#define USB_USBCTRL_PDE			(uint8_t)0x40			// Enables the weak pulldowns on the USB transceiver.
-#define USB0_OBSERVE		*(volatile uint8_t  *)0x40072104 // USB OTG Observe Register
-#define USB_OBSERVE_DPPU		(uint8_t)0x80			//
-#define USB_OBSERVE_DPPD		(uint8_t)0x40			//
-#define USB_OBSERVE_DMPD		(uint8_t)0x10			//
-#define USB0_CONTROL		*(volatile uint8_t  *)0x40072108 // USB OTG Control Register
-#define USB_CONTROL_DPPULLUPNONOTG	(uint8_t)0x10			//  Provides control of the DP PULLUP in the USB OTG module, if USB is configured in non-OTG device mode.
-#define USB0_USBTRC0		*(volatile uint8_t  *)0x4007210C // USB Transceiver Control Register 0
-#define USB_USBTRC_USBRESET		(uint8_t)0x80			//
-#define USB_USBTRC_USBRESMEN		(uint8_t)0x20			//
-#define USB_USBTRC_SYNC_DET		(uint8_t)0x02			//
-#define USB_USBTRC_USB_RESUME_INT	(uint8_t)0x01			//
-#define USB0_USBFRMADJUST	*(volatile uint8_t  *)0x40072114 // Frame Adjust Register
-
-// Chapter 41: USB Device Charger Detection Module (USBDCD)
-#define USBDCD_CONTROL		*(volatile uint32_t *)0x40035000 // Control register
-#define USBDCD_CLOCK		*(volatile uint32_t *)0x40035004 // Clock register
-#define USBDCD_STATUS		*(volatile uint32_t *)0x40035008 // Status register
-#define USBDCD_TIMER0		*(volatile uint32_t *)0x40035010 // TIMER0 register
-#define USBDCD_TIMER1		*(volatile uint32_t *)0x40035014 // TIMER1 register
-#define USBDCD_TIMER2		*(volatile uint32_t *)0x40035018 // TIMER2 register
-
-// Chapter 43: SPI (DSPI)
-#define SPI0_MCR		*(volatile uint32_t *)0x4002C000 // DSPI Module Configuration Register
-#define SPI_MCR_MSTR			(uint32_t)0x80000000		// Master/Slave Mode Select
-#define SPI_MCR_CONT_SCKE		(uint32_t)0x40000000		//
-#define SPI_MCR_DCONF(n)		(((n) & 3) << 28)		//
-#define SPI_MCR_FRZ			(uint32_t)0x08000000		//
-#define SPI_MCR_MTFE			(uint32_t)0x04000000		//
-#define SPI_MCR_ROOE			(uint32_t)0x01000000		//
-#define SPI_MCR_PCSIS(n)		(((n) & 0x1F) << 16)		//
-#define SPI_MCR_DOZE			(uint32_t)0x00008000		//
-#define SPI_MCR_MDIS			(uint32_t)0x00004000		//
-#define SPI_MCR_DIS_TXF			(uint32_t)0x00002000		//
-#define SPI_MCR_DIS_RXF			(uint32_t)0x00001000		//
-#define SPI_MCR_CLR_TXF			(uint32_t)0x00000800		//
-#define SPI_MCR_CLR_RXF			(uint32_t)0x00000400		//
-#define SPI_MCR_SMPL_PT(n)		(((n) & 3) << 8)		//
-#define SPI_MCR_HALT			(uint32_t)0x00000001		//
-#define SPI0_TCR		*(volatile uint32_t *)0x4002C008 // DSPI Transfer Count Register
-#define SPI0_CTAR0		*(volatile uint32_t *)0x4002C00C // DSPI Clock and Transfer Attributes Register, In Master Mode
-#define SPI_CTAR_DBR			(uint32_t)0x80000000		// Double Baud Rate
-#define SPI_CTAR_FMSZ(n)		(((n) & 15) << 27)		// Frame Size (+1)
-#define SPI_CTAR_CPOL			(uint32_t)0x04000000		// Clock Polarity
-#define SPI_CTAR_CPHA			(uint32_t)0x02000000		// Clock Phase
-#define SPI_CTAR_LSBFE			(uint32_t)0x01000000		// LSB First
-#define SPI_CTAR_PCSSCK(n)		(((n) & 3) << 22)		// PCS to SCK Delay Prescaler
-#define SPI_CTAR_PASC(n)		(((n) & 3) << 20)		// After SCK Delay Prescaler
-#define SPI_CTAR_PDT(n)			(((n) & 3) << 18)		// Delay after Transfer Prescaler
-#define SPI_CTAR_PBR(n)			(((n) & 3) << 16)		// Baud Rate Prescaler
-#define SPI_CTAR_CSSCK(n)		(((n) & 15) << 12)		// PCS to SCK Delay Scaler
-#define SPI_CTAR_ASC(n)			(((n) & 15) << 8)		// After SCK Delay Scaler
-#define SPI_CTAR_DT(n)			(((n) & 15) << 4)		// Delay After Transfer Scaler
-#define SPI_CTAR_BR(n)			(((n) & 15) << 0)		// Baud Rate Scaler
-#define SPI0_CTAR0_SLAVE	*(volatile uint32_t *)0x4002C00C // DSPI Clock and Transfer Attributes Register, In Slave Mode
-#define SPI0_CTAR1		*(volatile uint32_t *)0x4002C010 // DSPI Clock and Transfer Attributes Register, In Master Mode
-#define SPI0_SR			*(volatile uint32_t *)0x4002C02C // DSPI Status Register
-#define SPI_SR_TCF			(uint32_t)0x80000000		// Transfer Complete Flag
-#define SPI_SR_TXRXS			(uint32_t)0x40000000		// TX and RX Status
-#define SPI_SR_EOQF			(uint32_t)0x10000000		// End of Queue Flag
-#define SPI_SR_TFUF			(uint32_t)0x08000000		// Transmit FIFO Underflow Flag
-#define SPI_SR_TFFF			(uint32_t)0x02000000		// Transmit FIFO Fill Flag
-#define SPI_SR_RFOF			(uint32_t)0x00080000		// Receive FIFO Overflow Flag
-#define SPI_SR_RFDF			(uint32_t)0x00020000		// Receive FIFO Drain Flag
-#define SPI0_RSER		*(volatile uint32_t *)0x4002C030 // DSPI DMA/Interrupt Request Select and Enable Register
-#define SPI_RSER_TCF_RE			(uint32_t)0x80000000		// Transmission Complete Request Enable
-#define SPI_RSER_EOQF_RE		(uint32_t)0x10000000		// DSPI Finished Request Request Enable
-#define SPI_RSER_TFUF_RE		(uint32_t)0x08000000		// Transmit FIFO Underflow Request Enable
-#define SPI_RSER_TFFF_RE		(uint32_t)0x02000000		// Transmit FIFO Fill Request Enable
-#define SPI_RSER_TFFF_DIRS		(uint32_t)0x01000000		// Transmit FIFO FIll Dma or Interrupt Request Select
-#define SPI_RSER_RFOF_RE		(uint32_t)0x00080000		// Receive FIFO Overflow Request Enable
-#define SPI_RSER_RFDF_RE		(uint32_t)0x00020000		// Receive FIFO Drain Request Enable
-#define SPI_RSER_RFDF_DIRS		(uint32_t)0x00010000		// Receive FIFO Drain DMA or Interrupt Request Select
-#define SPI0_PUSHR		*(volatile uint32_t *)0x4002C034 // DSPI PUSH TX FIFO Register In Master Mode
-#define SPI_PUSHR_CONT			(uint32_t)0x80000000		//
-#define SPI_PUSHR_CTAS(n)		(((n) & 7) << 28)		//
-#define SPI_PUSHR_EOQ			(uint32_t)0x08000000		//
-#define SPI_PUSHR_CTCNT			(uint32_t)0x04000000		//
-#define SPI_PUSHR_PCS(n)		(((n) & 31) << 16)		//
-#define SPI0_PUSHR_SLAVE	*(volatile uint32_t *)0x4002C034 // DSPI PUSH TX FIFO Register In Slave Mode
-#define SPI0_POPR		*(volatile uint32_t *)0x4002C038 // DSPI POP RX FIFO Register
-#define SPI0_TXFR0		*(volatile uint32_t *)0x4002C03C // DSPI Transmit FIFO Registers
-#define SPI0_TXFR1		*(volatile uint32_t *)0x4002C040 // DSPI Transmit FIFO Registers
-#define SPI0_TXFR2		*(volatile uint32_t *)0x4002C044 // DSPI Transmit FIFO Registers
-#define SPI0_TXFR3		*(volatile uint32_t *)0x4002C048 // DSPI Transmit FIFO Registers
-#define SPI0_RXFR0		*(volatile uint32_t *)0x4002C07C // DSPI Receive FIFO Registers
-#define SPI0_RXFR1		*(volatile uint32_t *)0x4002C080 // DSPI Receive FIFO Registers
-#define SPI0_RXFR2		*(volatile uint32_t *)0x4002C084 // DSPI Receive FIFO Registers
-#define SPI0_RXFR3		*(volatile uint32_t *)0x4002C088 // DSPI Receive FIFO Registers
-typedef struct {
-	volatile uint32_t	MCR;	// 0
-	volatile uint32_t	unused1;// 4
-	volatile uint32_t	TCR;	// 8
-	volatile uint32_t	CTAR0;	// c
-	volatile uint32_t	CTAR1;	// 10
-	volatile uint32_t	CTAR2;	// 14
-	volatile uint32_t	CTAR3;	// 18
-	volatile uint32_t	CTAR4;	// 1c
-	volatile uint32_t	CTAR5;	// 20
-	volatile uint32_t	CTAR6;	// 24
-	volatile uint32_t	CTAR7;	// 28
-	volatile uint32_t	SR;	// 2c
-	volatile uint32_t	RSER;	// 30
-	volatile uint32_t	PUSHR;	// 34
-	volatile uint32_t	POPR;	// 38
-	volatile uint32_t	TXFR[16]; // 3c
-	volatile uint32_t	RXFR[16]; // 7c
-} SPI_t;
-#define SPI0		(*(SPI_t *)0x4002C000)
-
-// Chapter 44: Inter-Integrated Circuit (I2C)
-#define I2C0_A1			*(volatile uint8_t  *)0x40066000 // I2C Address Register 1
-#define I2C0_F			*(volatile uint8_t  *)0x40066001 // I2C Frequency Divider register
-#define I2C0_C1			*(volatile uint8_t  *)0x40066002 // I2C Control Register 1
-#define I2C_C1_IICEN			(uint8_t)0x80			// I2C Enable
-#define I2C_C1_IICIE			(uint8_t)0x40			// I2C Interrupt Enable
-#define I2C_C1_MST			(uint8_t)0x20			// Master Mode Select
-#define I2C_C1_TX			(uint8_t)0x10			// Transmit Mode Select
-#define I2C_C1_TXAK			(uint8_t)0x08			// Transmit Acknowledge Enable
-#define I2C_C1_RSTA			(uint8_t)0x04			// Repeat START
-#define I2C_C1_WUEN			(uint8_t)0x02			// Wakeup Enable
-#define I2C_C1_DMAEN			(uint8_t)0x01			// DMA Enable
-#define I2C0_S			*(volatile uint8_t  *)0x40066003 // I2C Status register
-#define I2C_S_TCF			(uint8_t)0x80			// Transfer Complete Flag
-#define I2C_S_IAAS			(uint8_t)0x40			// Addressed As A Slave
-#define I2C_S_BUSY			(uint8_t)0x20			// Bus Busy
-#define I2C_S_ARBL			(uint8_t)0x10			// Arbitration Lost
-#define I2C_S_RAM			(uint8_t)0x08			// Range Address Match
-#define I2C_S_SRW			(uint8_t)0x04			// Slave Read/Write
-#define I2C_S_IICIF			(uint8_t)0x02			// Interrupt Flag
-#define I2C_S_RXAK			(uint8_t)0x01			// Receive Acknowledge
-#define I2C0_D			*(volatile uint8_t  *)0x40066004 // I2C Data I/O register
-#define I2C0_C2			*(volatile uint8_t  *)0x40066005 // I2C Control Register 2
-#define I2C_C2_GCAEN			(uint8_t)0x80			// General Call Address Enable
-#define I2C_C2_ADEXT			(uint8_t)0x40			// Address Extension
-#define I2C_C2_HDRS			(uint8_t)0x20			// High Drive Select
-#define I2C_C2_SBRC			(uint8_t)0x10			// Slave Baud Rate Control
-#define I2C_C2_RMEN			(uint8_t)0x08			// Range Address Matching Enable
-#define I2C_C2_AD(n)			((n) & 7)			// Slave Address, upper 3 bits
-#define I2C0_FLT		*(volatile uint8_t  *)0x40066006 // I2C Programmable Input Glitch Filter register
-#define I2C0_RA			*(volatile uint8_t  *)0x40066007 // I2C Range Address register
-#define I2C0_SMB		*(volatile uint8_t  *)0x40066008 // I2C SMBus Control and Status register
-#define I2C0_A2			*(volatile uint8_t  *)0x40066009 // I2C Address Register 2
-#define I2C0_SLTH		*(volatile uint8_t  *)0x4006600A // I2C SCL Low Timeout Register High
-#define I2C0_SLTL		*(volatile uint8_t  *)0x4006600B // I2C SCL Low Timeout Register Low
-
-#define I2C1_A1			*(volatile uint8_t  *)0x40067000 // I2C Address Register 1
-#define I2C1_F			*(volatile uint8_t  *)0x40067001 // I2C Frequency Divider register
-#define I2C1_C1			*(volatile uint8_t  *)0x40067002 // I2C Control Register 1
-#define I2C1_S			*(volatile uint8_t  *)0x40067003 // I2C Status register
-#define I2C1_D			*(volatile uint8_t  *)0x40067004 // I2C Data I/O register
-#define I2C1_C2			*(volatile uint8_t  *)0x40067005 // I2C Control Register 2
-#define I2C1_FLT		*(volatile uint8_t  *)0x40067006 // I2C Programmable Input Glitch Filter register
-#define I2C1_RA			*(volatile uint8_t  *)0x40067007 // I2C Range Address register
-#define I2C1_SMB		*(volatile uint8_t  *)0x40067008 // I2C SMBus Control and Status register
-#define I2C1_A2			*(volatile uint8_t  *)0x40067009 // I2C Address Register 2
-#define I2C1_SLTH		*(volatile uint8_t  *)0x4006700A // I2C SCL Low Timeout Register High
-#define I2C1_SLTL		*(volatile uint8_t  *)0x4006700B // I2C SCL Low Timeout Register Low
-
-// Chapter 45: Universal Asynchronous Receiver/Transmitter (UART)
-#define UART0_BDH		*(volatile uint8_t  *)0x4006A000 // UART Baud Rate Registers: High
-#define UART0_BDL		*(volatile uint8_t  *)0x4006A001 // UART Baud Rate Registers: Low
-#define UART0_C1		*(volatile uint8_t  *)0x4006A002 // UART Control Register 1
-#define UART_C1_LOOPS			(uint8_t)0x80			// When LOOPS is set, the RxD pin is disconnected from the UART and the transmitter output is internally connected to the receiver input
-#define UART_C1_UARTSWAI		(uint8_t)0x40			// UART Stops in Wait Mode
-#define UART_C1_RSRC			(uint8_t)0x20			// When LOOPS is set, the RSRC field determines the source for the receiver shift register input
-#define UART_C1_M			(uint8_t)0x10			// 9-bit or 8-bit Mode Select
-#define UART_C1_WAKE			(uint8_t)0x08			// Determines which condition wakes the UART
-#define UART_C1_ILT			(uint8_t)0x04			// Idle Line Type Select
-#define UART_C1_PE			(uint8_t)0x02			// Parity Enable
-#define UART_C1_PT			(uint8_t)0x01			// Parity Type, 0=even, 1=odd
-#define UART0_C2		*(volatile uint8_t  *)0x4006A003 // UART Control Register 2
-#define UART_C2_TIE			(uint8_t)0x80			// Transmitter Interrupt or DMA Transfer Enable.
-#define UART_C2_TCIE			(uint8_t)0x40			// Transmission Complete Interrupt Enable
-#define UART_C2_RIE			(uint8_t)0x20			// Receiver Full Interrupt or DMA Transfer Enable
-#define UART_C2_ILIE			(uint8_t)0x10			// Idle Line Interrupt Enable
-#define UART_C2_TE			(uint8_t)0x08			// Transmitter Enable
-#define UART_C2_RE			(uint8_t)0x04			// Receiver Enable
-#define UART_C2_RWU			(uint8_t)0x02			// Receiver Wakeup Control
-#define UART_C2_SBK			(uint8_t)0x01			// Send Break
-#define UART0_S1		*(volatile uint8_t  *)0x4006A004 // UART Status Register 1
-#define UART_S1_TDRE			(uint8_t)0x80			// Transmit Data Register Empty Flag
-#define UART_S1_TC			(uint8_t)0x40			// Transmit Complete Flag
-#define UART_S1_RDRF			(uint8_t)0x20			// Receive Data Register Full Flag
-#define UART_S1_IDLE			(uint8_t)0x10			// Idle Line Flag
-#define UART_S1_OR			(uint8_t)0x08			// Receiver Overrun Flag
-#define UART_S1_NF			(uint8_t)0x04			// Noise Flag
-#define UART_S1_FE			(uint8_t)0x02			// Framing Error Flag
-#define UART_S1_PF			(uint8_t)0x01			// Parity Error Flag
-#define UART0_S2		*(volatile uint8_t  *)0x4006A005 // UART Status Register 2
-#define UART0_C3		*(volatile uint8_t  *)0x4006A006 // UART Control Register 3
-#define UART0_D			*(volatile uint8_t  *)0x4006A007 // UART Data Register
-#define UART0_MA1		*(volatile uint8_t  *)0x4006A008 // UART Match Address Registers 1
-#define UART0_MA2		*(volatile uint8_t  *)0x4006A009 // UART Match Address Registers 2
-#define UART0_C4		*(volatile uint8_t  *)0x4006A00A // UART Control Register 4
-#define UART0_C5		*(volatile uint8_t  *)0x4006A00B // UART Control Register 5
-#define UART0_ED		*(volatile uint8_t  *)0x4006A00C // UART Extended Data Register
-#define UART0_MODEM		*(volatile uint8_t  *)0x4006A00D // UART Modem Register
-#define UART0_IR		*(volatile uint8_t  *)0x4006A00E // UART Infrared Register
-#define UART0_PFIFO		*(volatile uint8_t  *)0x4006A010 // UART FIFO Parameters
-#define UART_PFIFO_TXFE			(uint8_t)0x80
-#define UART_PFIFO_RXFE			(uint8_t)0x08
-#define UART0_CFIFO		*(volatile uint8_t  *)0x4006A011 // UART FIFO Control Register
-#define UART_CFIFO_TXFLUSH		(uint8_t)0x80			//
-#define UART_CFIFO_RXFLUSH		(uint8_t)0x40			//
-#define UART_CFIFO_RXOFE		(uint8_t)0x04			//
-#define UART_CFIFO_TXOFE		(uint8_t)0x02			//
-#define UART_CFIFO_RXUFE		(uint8_t)0x01			//
-#define UART0_SFIFO		*(volatile uint8_t  *)0x4006A012 // UART FIFO Status Register
-#define UART_SFIFO_TXEMPT		(uint8_t)0x80
-#define UART_SFIFO_RXEMPT		(uint8_t)0x40
-#define UART_SFIFO_RXOF			(uint8_t)0x04
-#define UART_SFIFO_TXOF			(uint8_t)0x02
-#define UART_SFIFO_RXUF			(uint8_t)0x01
-#define UART0_TWFIFO		*(volatile uint8_t  *)0x4006A013 // UART FIFO Transmit Watermark
-#define UART0_TCFIFO		*(volatile uint8_t  *)0x4006A014 // UART FIFO Transmit Count
-#define UART0_RWFIFO		*(volatile uint8_t  *)0x4006A015 // UART FIFO Receive Watermark
-#define UART0_RCFIFO		*(volatile uint8_t  *)0x4006A016 // UART FIFO Receive Count
-#define UART0_C7816		*(volatile uint8_t  *)0x4006A018 // UART 7816 Control Register
-#define UART0_IE7816		*(volatile uint8_t  *)0x4006A019 // UART 7816 Interrupt Enable Register
-#define UART0_IS7816		*(volatile uint8_t  *)0x4006A01A // UART 7816 Interrupt Status Register
-#define UART0_WP7816T0		*(volatile uint8_t  *)0x4006A01B // UART 7816 Wait Parameter Register
-#define UART0_WP7816T1		*(volatile uint8_t  *)0x4006A01B // UART 7816 Wait Parameter Register
-#define UART0_WN7816		*(volatile uint8_t  *)0x4006A01C // UART 7816 Wait N Register
-#define UART0_WF7816		*(volatile uint8_t  *)0x4006A01D // UART 7816 Wait FD Register
-#define UART0_ET7816		*(volatile uint8_t  *)0x4006A01E // UART 7816 Error Threshold Register
-#define UART0_TL7816		*(volatile uint8_t  *)0x4006A01F // UART 7816 Transmit Length Register
-#define UART0_C6		*(volatile uint8_t  *)0x4006A021 // UART CEA709.1-B Control Register 6
-#define UART0_PCTH		*(volatile uint8_t  *)0x4006A022 // UART CEA709.1-B Packet Cycle Time Counter High
-#define UART0_PCTL		*(volatile uint8_t  *)0x4006A023 // UART CEA709.1-B Packet Cycle Time Counter Low
-#define UART0_B1T		*(volatile uint8_t  *)0x4006A024 // UART CEA709.1-B Beta1 Timer
-#define UART0_SDTH		*(volatile uint8_t  *)0x4006A025 // UART CEA709.1-B Secondary Delay Timer High
-#define UART0_SDTL		*(volatile uint8_t  *)0x4006A026 // UART CEA709.1-B Secondary Delay Timer Low
-#define UART0_PRE		*(volatile uint8_t  *)0x4006A027 // UART CEA709.1-B Preamble
-#define UART0_TPL		*(volatile uint8_t  *)0x4006A028 // UART CEA709.1-B Transmit Packet Length
-#define UART0_IE		*(volatile uint8_t  *)0x4006A029 // UART CEA709.1-B Interrupt Enable Register
-#define UART0_WB		*(volatile uint8_t  *)0x4006A02A // UART CEA709.1-B WBASE
-#define UART0_S3		*(volatile uint8_t  *)0x4006A02B // UART CEA709.1-B Status Register
-#define UART0_S4		*(volatile uint8_t  *)0x4006A02C // UART CEA709.1-B Status Register
-#define UART0_RPL		*(volatile uint8_t  *)0x4006A02D // UART CEA709.1-B Received Packet Length
-#define UART0_RPREL		*(volatile uint8_t  *)0x4006A02E // UART CEA709.1-B Received Preamble Length
-#define UART0_CPW		*(volatile uint8_t  *)0x4006A02F // UART CEA709.1-B Collision Pulse Width
-#define UART0_RIDT		*(volatile uint8_t  *)0x4006A030 // UART CEA709.1-B Receive Indeterminate Time
-#define UART0_TIDT		*(volatile uint8_t  *)0x4006A031 // UART CEA709.1-B Transmit Indeterminate Time
-#define UART1_BDH		*(volatile uint8_t  *)0x4006B000 // UART Baud Rate Registers: High
-#define UART1_BDL		*(volatile uint8_t  *)0x4006B001 // UART Baud Rate Registers: Low
-#define UART1_C1		*(volatile uint8_t  *)0x4006B002 // UART Control Register 1
-#define UART1_C2		*(volatile uint8_t  *)0x4006B003 // UART Control Register 2
-#define UART1_S1		*(volatile uint8_t  *)0x4006B004 // UART Status Register 1
-#define UART1_S2		*(volatile uint8_t  *)0x4006B005 // UART Status Register 2
-#define UART1_C3		*(volatile uint8_t  *)0x4006B006 // UART Control Register 3
-#define UART1_D			*(volatile uint8_t  *)0x4006B007 // UART Data Register
-#define UART1_MA1		*(volatile uint8_t  *)0x4006B008 // UART Match Address Registers 1
-#define UART1_MA2		*(volatile uint8_t  *)0x4006B009 // UART Match Address Registers 2
-#define UART1_C4		*(volatile uint8_t  *)0x4006B00A // UART Control Register 4
-#define UART1_C5		*(volatile uint8_t  *)0x4006B00B // UART Control Register 5
-#define UART1_ED		*(volatile uint8_t  *)0x4006B00C // UART Extended Data Register
-#define UART1_MODEM		*(volatile uint8_t  *)0x4006B00D // UART Modem Register
-#define UART1_IR		*(volatile uint8_t  *)0x4006B00E // UART Infrared Register
-#define UART1_PFIFO		*(volatile uint8_t  *)0x4006B010 // UART FIFO Parameters
-#define UART1_CFIFO		*(volatile uint8_t  *)0x4006B011 // UART FIFO Control Register
-#define UART1_SFIFO		*(volatile uint8_t  *)0x4006B012 // UART FIFO Status Register
-#define UART1_TWFIFO		*(volatile uint8_t  *)0x4006B013 // UART FIFO Transmit Watermark
-#define UART1_TCFIFO		*(volatile uint8_t  *)0x4006B014 // UART FIFO Transmit Count
-#define UART1_RWFIFO		*(volatile uint8_t  *)0x4006B015 // UART FIFO Receive Watermark
-#define UART1_RCFIFO		*(volatile uint8_t  *)0x4006B016 // UART FIFO Receive Count
-#define UART1_C7816		*(volatile uint8_t  *)0x4006B018 // UART 7816 Control Register
-#define UART1_IE7816		*(volatile uint8_t  *)0x4006B019 // UART 7816 Interrupt Enable Register
-#define UART1_IS7816		*(volatile uint8_t  *)0x4006B01A // UART 7816 Interrupt Status Register
-#define UART1_WP7816T0		*(volatile uint8_t  *)0x4006B01B // UART 7816 Wait Parameter Register
-#define UART1_WP7816T1		*(volatile uint8_t  *)0x4006B01B // UART 7816 Wait Parameter Register
-#define UART1_WN7816		*(volatile uint8_t  *)0x4006B01C // UART 7816 Wait N Register
-#define UART1_WF7816		*(volatile uint8_t  *)0x4006B01D // UART 7816 Wait FD Register
-#define UART1_ET7816		*(volatile uint8_t  *)0x4006B01E // UART 7816 Error Threshold Register
-#define UART1_TL7816		*(volatile uint8_t  *)0x4006B01F // UART 7816 Transmit Length Register
-#define UART1_C6		*(volatile uint8_t  *)0x4006B021 // UART CEA709.1-B Control Register 6
-#define UART1_PCTH		*(volatile uint8_t  *)0x4006B022 // UART CEA709.1-B Packet Cycle Time Counter High
-#define UART1_PCTL		*(volatile uint8_t  *)0x4006B023 // UART CEA709.1-B Packet Cycle Time Counter Low
-#define UART1_B1T		*(volatile uint8_t  *)0x4006B024 // UART CEA709.1-B Beta1 Timer
-#define UART1_SDTH		*(volatile uint8_t  *)0x4006B025 // UART CEA709.1-B Secondary Delay Timer High
-#define UART1_SDTL		*(volatile uint8_t  *)0x4006B026 // UART CEA709.1-B Secondary Delay Timer Low
-#define UART1_PRE		*(volatile uint8_t  *)0x4006B027 // UART CEA709.1-B Preamble
-#define UART1_TPL		*(volatile uint8_t  *)0x4006B028 // UART CEA709.1-B Transmit Packet Length
-#define UART1_IE		*(volatile uint8_t  *)0x4006B029 // UART CEA709.1-B Interrupt Enable Register
-#define UART1_WB		*(volatile uint8_t  *)0x4006B02A // UART CEA709.1-B WBASE
-#define UART1_S3		*(volatile uint8_t  *)0x4006B02B // UART CEA709.1-B Status Register
-#define UART1_S4		*(volatile uint8_t  *)0x4006B02C // UART CEA709.1-B Status Register
-#define UART1_RPL		*(volatile uint8_t  *)0x4006B02D // UART CEA709.1-B Received Packet Length
-#define UART1_RPREL		*(volatile uint8_t  *)0x4006B02E // UART CEA709.1-B Received Preamble Length
-#define UART1_CPW		*(volatile uint8_t  *)0x4006B02F // UART CEA709.1-B Collision Pulse Width
-#define UART1_RIDT		*(volatile uint8_t  *)0x4006B030 // UART CEA709.1-B Receive Indeterminate Time
-#define UART1_TIDT		*(volatile uint8_t  *)0x4006B031 // UART CEA709.1-B Transmit Indeterminate Time
-#define UART2_BDH		*(volatile uint8_t  *)0x4006C000 // UART Baud Rate Registers: High
-#define UART2_BDL		*(volatile uint8_t  *)0x4006C001 // UART Baud Rate Registers: Low
-#define UART2_C1		*(volatile uint8_t  *)0x4006C002 // UART Control Register 1
-#define UART2_C2		*(volatile uint8_t  *)0x4006C003 // UART Control Register 2
-#define UART2_S1		*(volatile uint8_t  *)0x4006C004 // UART Status Register 1
-#define UART2_S2		*(volatile uint8_t  *)0x4006C005 // UART Status Register 2
-#define UART2_C3		*(volatile uint8_t  *)0x4006C006 // UART Control Register 3
-#define UART2_D			*(volatile uint8_t  *)0x4006C007 // UART Data Register
-#define UART2_MA1		*(volatile uint8_t  *)0x4006C008 // UART Match Address Registers 1
-#define UART2_MA2		*(volatile uint8_t  *)0x4006C009 // UART Match Address Registers 2
-#define UART2_C4		*(volatile uint8_t  *)0x4006C00A // UART Control Register 4
-#define UART2_C5		*(volatile uint8_t  *)0x4006C00B // UART Control Register 5
-#define UART2_ED		*(volatile uint8_t  *)0x4006C00C // UART Extended Data Register
-#define UART2_MODEM		*(volatile uint8_t  *)0x4006C00D // UART Modem Register
-#define UART2_IR		*(volatile uint8_t  *)0x4006C00E // UART Infrared Register
-#define UART2_PFIFO		*(volatile uint8_t  *)0x4006C010 // UART FIFO Parameters
-#define UART2_CFIFO		*(volatile uint8_t  *)0x4006C011 // UART FIFO Control Register
-#define UART2_SFIFO		*(volatile uint8_t  *)0x4006C012 // UART FIFO Status Register
-#define UART2_TWFIFO		*(volatile uint8_t  *)0x4006C013 // UART FIFO Transmit Watermark
-#define UART2_TCFIFO		*(volatile uint8_t  *)0x4006C014 // UART FIFO Transmit Count
-#define UART2_RWFIFO		*(volatile uint8_t  *)0x4006C015 // UART FIFO Receive Watermark
-#define UART2_RCFIFO		*(volatile uint8_t  *)0x4006C016 // UART FIFO Receive Count
-#define UART2_C7816		*(volatile uint8_t  *)0x4006C018 // UART 7816 Control Register
-#define UART2_IE7816		*(volatile uint8_t  *)0x4006C019 // UART 7816 Interrupt Enable Register
-#define UART2_IS7816		*(volatile uint8_t  *)0x4006C01A // UART 7816 Interrupt Status Register
-#define UART2_WP7816T0		*(volatile uint8_t  *)0x4006C01B // UART 7816 Wait Parameter Register
-#define UART2_WP7816T1		*(volatile uint8_t  *)0x4006C01B // UART 7816 Wait Parameter Register
-#define UART2_WN7816		*(volatile uint8_t  *)0x4006C01C // UART 7816 Wait N Register
-#define UART2_WF7816		*(volatile uint8_t  *)0x4006C01D // UART 7816 Wait FD Register
-#define UART2_ET7816		*(volatile uint8_t  *)0x4006C01E // UART 7816 Error Threshold Register
-#define UART2_TL7816		*(volatile uint8_t  *)0x4006C01F // UART 7816 Transmit Length Register
-#define UART2_C6		*(volatile uint8_t  *)0x4006C021 // UART CEA709.1-B Control Register 6
-#define UART2_PCTH		*(volatile uint8_t  *)0x4006C022 // UART CEA709.1-B Packet Cycle Time Counter High
-#define UART2_PCTL		*(volatile uint8_t  *)0x4006C023 // UART CEA709.1-B Packet Cycle Time Counter Low
-#define UART2_B1T		*(volatile uint8_t  *)0x4006C024 // UART CEA709.1-B Beta1 Timer
-#define UART2_SDTH		*(volatile uint8_t  *)0x4006C025 // UART CEA709.1-B Secondary Delay Timer High
-#define UART2_SDTL		*(volatile uint8_t  *)0x4006C026 // UART CEA709.1-B Secondary Delay Timer Low
-#define UART2_PRE		*(volatile uint8_t  *)0x4006C027 // UART CEA709.1-B Preamble
-#define UART2_TPL		*(volatile uint8_t  *)0x4006C028 // UART CEA709.1-B Transmit Packet Length
-#define UART2_IE		*(volatile uint8_t  *)0x4006C029 // UART CEA709.1-B Interrupt Enable Register
-#define UART2_WB		*(volatile uint8_t  *)0x4006C02A // UART CEA709.1-B WBASE
-#define UART2_S3		*(volatile uint8_t  *)0x4006C02B // UART CEA709.1-B Status Register
-#define UART2_S4		*(volatile uint8_t  *)0x4006C02C // UART CEA709.1-B Status Register
-#define UART2_RPL		*(volatile uint8_t  *)0x4006C02D // UART CEA709.1-B Received Packet Length
-#define UART2_RPREL		*(volatile uint8_t  *)0x4006C02E // UART CEA709.1-B Received Preamble Length
-#define UART2_CPW		*(volatile uint8_t  *)0x4006C02F // UART CEA709.1-B Collision Pulse Width
-#define UART2_RIDT		*(volatile uint8_t  *)0x4006C030 // UART CEA709.1-B Receive Indeterminate Time
-#define UART2_TIDT		*(volatile uint8_t  *)0x4006C031 // UART CEA709.1-B Transmit Indeterminate Time
-
-// Chapter 46: Synchronous Audio Interface (SAI)
-#define I2S0_TCSR		*(volatile uint32_t *)0x4002F000 // SAI Transmit Control Register
-#define I2S_TCSR_TE			(uint32_t)0x80000000	// Transmitter Enable
-#define I2S_TCSR_STOPE			(uint32_t)0x40000000	// Transmitter Enable in Stop mode
-#define I2S_TCSR_DBGE			(uint32_t)0x20000000	// Transmitter Enable in Debug mode
-#define I2S_TCSR_BCE			(uint32_t)0x10000000	// Bit Clock Enable
-#define I2S_TCSR_FR			(uint32_t)0x02000000	// FIFO Reset
-#define I2S_TCSR_SR			(uint32_t)0x01000000	// Software Reset
-#define I2S_TCSR_WSF			(uint32_t)0x00100000	// Word Start Flag
-#define I2S_TCSR_SEF			(uint32_t)0x00080000	// Sync Error Flag
-#define I2S_TCSR_FEF			(uint32_t)0x00040000	// FIFO Error Flag (underrun)
-#define I2S_TCSR_FWF			(uint32_t)0x00020000	// FIFO Warning Flag (empty)
-#define I2S_TCSR_FRF			(uint32_t)0x00010000	// FIFO Request Flag (Data Ready)
-#define I2S_TCSR_WSIE			(uint32_t)0x00001000	// Word Start Interrupt Enable
-#define I2S_TCSR_SEIE			(uint32_t)0x00000800	// Sync Error Interrupt Enable
-#define I2S_TCSR_FEIE			(uint32_t)0x00000400	// FIFO Error Interrupt Enable
-#define I2S_TCSR_FWIE			(uint32_t)0x00000200	// FIFO Warning Interrupt Enable
-#define I2S_TCSR_FRIE			(uint32_t)0x00000100	// FIFO Request Interrupt Enable
-#define I2S_TCSR_FWDE			(uint32_t)0x00000002	// FIFO Warning DMA Enable
-#define I2S_TCSR_FRDE			(uint32_t)0x00000001	// FIFO Request DMA Enable
-#define I2S0_TCR1		*(volatile uint32_t *)0x4002F004 // SAI Transmit Configuration 1 Register
-#define I2S_TCR1_TFW(n)			((uint32_t)n & 0x03)	      // Transmit FIFO watermark
-#define I2S0_TCR2		*(volatile uint32_t *)0x4002F008 // SAI Transmit Configuration 2 Register
-#define I2S_TCR2_DIV(n)			((uint32_t)n & 0xff)	      // Bit clock divide by (DIV+1)*2
-#define I2S_TCR2_BCD			((uint32_t)1<<24)	      // Bit clock direction
-#define I2S_TCR2_BCP			((uint32_t)1<<25)	      // Bit clock polarity
-#define I2S_TCR2_MSEL(n)		((uint32_t)(n & 3)<<26)	      // MCLK select, 0=bus clock, 1=I2S0_MCLK
-#define I2S_TCR2_BCI			((uint32_t)1<<28)	      // Bit clock input
-#define I2S_TCR2_BCS			((uint32_t)1<<29)	      // Bit clock swap
-#define I2S_TCR2_SYNC(n)		((uint32_t)(n & 3)<<30)	      // 0=async 1=sync with receiver
-#define I2S0_TCR3		*(volatile uint32_t *)0x4002F00C // SAI Transmit Configuration 3 Register
-#define I2S_TCR3_WDFL(n)		((uint32_t)n & 0x0f)	      // word flag configuration
-#define I2S_TCR3_TCE			((uint32_t)0x10000)	      // transmit channel enable
-#define I2S0_TCR4		*(volatile uint32_t *)0x4002F010 // SAI Transmit Configuration 4 Register
-#define I2S_TCR4_FSD			((uint32_t)1)		      // Frame Sync Direction
-#define I2S_TCR4_FSP			((uint32_t)2)		      // Frame Sync Polarity
-#define I2S_TCR4_FSE			((uint32_t)8)		      // Frame Sync Early
-#define I2S_TCR4_MF			((uint32_t)0x10)	      // MSB First
-#define I2S_TCR4_SYWD(n)		((uint32_t)(n & 0x1f)<<8)     // Sync Width
-#define I2S_TCR4_FRSZ(n)		((uint32_t)(n & 0x0f)<<16)    // Frame Size
-#define I2S0_TCR5		*(volatile uint32_t *)0x4002F014 // SAI Transmit Configuration 5 Register
-#define I2S_TCR5_FBT(n)			((uint32_t)(n & 0x1f)<<8)     // First Bit Shifted
-#define I2S_TCR5_W0W(n)			((uint32_t)(n & 0x1f)<<16)    // Word 0 Width
-#define I2S_TCR5_WNW(n)			((uint32_t)(n & 0x1f)<<24)    // Word N Width
-#define I2S0_TDR0		*(volatile uint32_t *)0x4002F020 // SAI Transmit Data Register
-#define I2S0_TDR1		*(volatile uint32_t *)0x4002F024 // SAI Transmit Data Register
-#define I2S0_TFR0		*(volatile uint32_t *)0x4002F040 // SAI Transmit FIFO Register
-#define I2S0_TFR1		*(volatile uint32_t *)0x4002F044 // SAI Transmit FIFO Register
-#define I2S_TFR_RFP(n)			((uint32_t)n & 7)	      // read FIFO pointer
-#define I2S_TFR_WFP(n)			((uint32_t)(n & 7)<<16)	      // write FIFO pointer
-#define I2S0_TMR		*(volatile uint32_t *)0x4002F060 // SAI Transmit Mask Register
-#define I2S_TMR_TWM(n)			((uint32_t)n & 0xFFFFFFFF)
-#define I2S0_RCSR		*(volatile uint32_t *)0x4002F080 // SAI Receive Control Register
-#define I2S_RCSR_RE			(uint32_t)0x80000000	// Receiver Enable
-#define I2S_RCSR_STOPE			(uint32_t)0x40000000	// Receiver Enable in Stop mode
-#define I2S_RCSR_DBGE			(uint32_t)0x20000000	// Receiver Enable in Debug mode
-#define I2S_RCSR_BCE			(uint32_t)0x10000000	// Bit Clock Enable
-#define I2S_RCSR_FR			(uint32_t)0x02000000	// FIFO Reset
-#define I2S_RCSR_SR			(uint32_t)0x01000000	// Software Reset
-#define I2S_RCSR_WSF			(uint32_t)0x00100000	// Word Start Flag
-#define I2S_RCSR_SEF			(uint32_t)0x00080000	// Sync Error Flag
-#define I2S_RCSR_FEF			(uint32_t)0x00040000	// FIFO Error Flag (underrun)
-#define I2S_RCSR_FWF			(uint32_t)0x00020000	// FIFO Warning Flag (empty)
-#define I2S_RCSR_FRF			(uint32_t)0x00010000	// FIFO Request Flag (Data Ready)
-#define I2S_RCSR_WSIE			(uint32_t)0x00001000	// Word Start Interrupt Enable
-#define I2S_RCSR_SEIE			(uint32_t)0x00000800	// Sync Error Interrupt Enable
-#define I2S_RCSR_FEIE			(uint32_t)0x00000400	// FIFO Error Interrupt Enable
-#define I2S_RCSR_FWIE			(uint32_t)0x00000200	// FIFO Warning Interrupt Enable
-#define I2S_RCSR_FRIE			(uint32_t)0x00000100	// FIFO Request Interrupt Enable
-#define I2S_RCSR_FWDE			(uint32_t)0x00000002	// FIFO Warning DMA Enable
-#define I2S_RCSR_FRDE			(uint32_t)0x00000001	// FIFO Request DMA Enable
-#define I2S0_RCR1		*(volatile uint32_t *)0x4002F084 // SAI Receive Configuration 1 Register
-#define I2S_RCR1_RFW(n)			((uint32_t)n & 0x03)	      // Receive FIFO watermark
-#define I2S0_RCR2		*(volatile uint32_t *)0x4002F088 // SAI Receive Configuration 2 Register
-#define I2S_RCR2_DIV(n)			((uint32_t)n & 0xff)	      // Bit clock divide by (DIV+1)*2
-#define I2S_RCR2_BCD			((uint32_t)1<<24)	      // Bit clock direction
-#define I2S_RCR2_BCP			((uint32_t)1<<25)	      // Bit clock polarity
-#define I2S_RCR2_MSEL(n)		((uint32_t)(n & 3)<<26)	      // MCLK select, 0=bus clock, 1=I2S0_MCLK
-#define I2S_RCR2_BCI			((uint32_t)1<<28)	      // Bit clock input
-#define I2S_RCR2_BCS			((uint32_t)1<<29)	      // Bit clock swap
-#define I2S_RCR2_SYNC(n)		((uint32_t)(n & 3)<<30)	      // 0=async 1=sync with receiver
-#define I2S0_RCR3		*(volatile uint32_t *)0x4002F08C // SAI Receive Configuration 3 Register
-#define I2S_RCR3_WDFL(n)		((uint32_t)n & 0x0f)	      // word flag configuration
-#define I2S_RCR3_RCE			((uint32_t)0x10000)	      // receive channel enable
-#define I2S0_RCR4		*(volatile uint32_t *)0x4002F090 // SAI Receive Configuration 4 Register
-#define I2S_RCR4_FSD			((uint32_t)1)		      // Frame Sync Direction
-#define I2S_RCR4_FSP			((uint32_t)2)		      // Frame Sync Polarity
-#define I2S_RCR4_FSE			((uint32_t)8)		      // Frame Sync Early
-#define I2S_RCR4_MF			((uint32_t)0x10)	      // MSB First
-#define I2S_RCR4_SYWD(n)		((uint32_t)(n & 0x1f)<<8)     // Sync Width
-#define I2S_RCR4_FRSZ(n)		((uint32_t)(n & 0x0f)<<16)    // Frame Size
-#define I2S0_RCR5		*(volatile uint32_t *)0x4002F094 // SAI Receive Configuration 5 Register
-#define I2S_RCR5_FBT(n)			((uint32_t)(n & 0x1f)<<8)     // First Bit Shifted
-#define I2S_RCR5_W0W(n)			((uint32_t)(n & 0x1f)<<16)    // Word 0 Width
-#define I2S_RCR5_WNW(n)			((uint32_t)(n & 0x1f)<<24)    // Word N Width
-#define I2S0_RDR0		*(volatile uint32_t *)0x4002F0A0 // SAI Receive Data Register
-#define I2S0_RDR1		*(volatile uint32_t *)0x4002F0A4 // SAI Receive Data Register
-#define I2S0_RFR0		*(volatile uint32_t *)0x4002F0C0 // SAI Receive FIFO Register
-#define I2S0_RFR1		*(volatile uint32_t *)0x4002F0C4 // SAI Receive FIFO Register
-#define I2S_RFR_RFP(n)			((uint32_t)n & 7)	      // read FIFO pointer
-#define I2S_RFR_WFP(n)			((uint32_t)(n & 7)<<16)	      // write FIFO pointer
-#define I2S0_RMR		*(volatile uint32_t *)0x4002F0E0 // SAI Receive Mask Register
-#define I2S_RMR_RWM(n)			((uint32_t)n & 0xFFFFFFFF)
-#define I2S0_MCR		*(volatile uint32_t *)0x4002F100 // SAI MCLK Control Register
-#define I2S_MCR_DUF			((uint32_t)1<<31)	      // Divider Update Flag
-#define I2S_MCR_MOE			((uint32_t)1<<30)	      // MCLK Output Enable
-#define I2S_MCR_MICS(n)			((uint32_t)(n & 3)<<24)	      // MCLK Input Clock Select
-#define I2S0_MDR		*(volatile uint32_t *)0x4002F104 // SAI MCLK Divide Register
-#define I2S_MDR_FRACT(n)		((uint32_t)(n & 0xff)<<12)    // MCLK Fraction
-#define I2S_MDR_DIVIDE(n)		((uint32_t)(n & 0xfff))	      // MCLK Divide
-
-// Chapter 47: General-Purpose Input/Output (GPIO)
-#define GPIOA_PDOR		*(volatile uint32_t *)0x400FF000 // Port Data Output Register
-#define GPIOA_PSOR		*(volatile uint32_t *)0x400FF004 // Port Set Output Register
-#define GPIOA_PCOR		*(volatile uint32_t *)0x400FF008 // Port Clear Output Register
-#define GPIOA_PTOR		*(volatile uint32_t *)0x400FF00C // Port Toggle Output Register
-#define GPIOA_PDIR		*(volatile uint32_t *)0x400FF010 // Port Data Input Register
-#define GPIOA_PDDR		*(volatile uint32_t *)0x400FF014 // Port Data Direction Register
-#define GPIOB_PDOR		*(volatile uint32_t *)0x400FF040 // Port Data Output Register
-#define GPIOB_PSOR		*(volatile uint32_t *)0x400FF044 // Port Set Output Register
-#define GPIOB_PCOR		*(volatile uint32_t *)0x400FF048 // Port Clear Output Register
-#define GPIOB_PTOR		*(volatile uint32_t *)0x400FF04C // Port Toggle Output Register
-#define GPIOB_PDIR		*(volatile uint32_t *)0x400FF050 // Port Data Input Register
-#define GPIOB_PDDR		*(volatile uint32_t *)0x400FF054 // Port Data Direction Register
-#define GPIOC_PDOR		*(volatile uint32_t *)0x400FF080 // Port Data Output Register
-#define GPIOC_PSOR		*(volatile uint32_t *)0x400FF084 // Port Set Output Register
-#define GPIOC_PCOR		*(volatile uint32_t *)0x400FF088 // Port Clear Output Register
-#define GPIOC_PTOR		*(volatile uint32_t *)0x400FF08C // Port Toggle Output Register
-#define GPIOC_PDIR		*(volatile uint32_t *)0x400FF090 // Port Data Input Register
-#define GPIOC_PDDR		*(volatile uint32_t *)0x400FF094 // Port Data Direction Register
-#define GPIOD_PDOR		*(volatile uint32_t *)0x400FF0C0 // Port Data Output Register
-#define GPIOD_PSOR		*(volatile uint32_t *)0x400FF0C4 // Port Set Output Register
-#define GPIOD_PCOR		*(volatile uint32_t *)0x400FF0C8 // Port Clear Output Register
-#define GPIOD_PTOR		*(volatile uint32_t *)0x400FF0CC // Port Toggle Output Register
-#define GPIOD_PDIR		*(volatile uint32_t *)0x400FF0D0 // Port Data Input Register
-#define GPIOD_PDDR		*(volatile uint32_t *)0x400FF0D4 // Port Data Direction Register
-#define GPIOE_PDOR		*(volatile uint32_t *)0x400FF100 // Port Data Output Register
-#define GPIOE_PSOR		*(volatile uint32_t *)0x400FF104 // Port Set Output Register
-#define GPIOE_PCOR		*(volatile uint32_t *)0x400FF108 // Port Clear Output Register
-#define GPIOE_PTOR		*(volatile uint32_t *)0x400FF10C // Port Toggle Output Register
-#define GPIOE_PDIR		*(volatile uint32_t *)0x400FF110 // Port Data Input Register
-#define GPIOE_PDDR		*(volatile uint32_t *)0x400FF114 // Port Data Direction Register
-
-// Chapter 48: Touch sense input (TSI)
-#define TSI0_GENCS		*(volatile uint32_t *)0x40045000 // General Control and Status Register
-#define TSI_GENCS_LPCLKS		(uint32_t)0x10000000		//
-#define TSI_GENCS_LPSCNITV(n)		(((n) & 15) << 24)		//
-#define TSI_GENCS_NSCN(n)		(((n) & 31) << 19)		//
-#define TSI_GENCS_PS(n)			(((n) & 7) << 16)		//
-#define TSI_GENCS_EOSF			(uint32_t)0x00008000		//
-#define TSI_GENCS_OUTRGF		(uint32_t)0x00004000		//
-#define TSI_GENCS_EXTERF		(uint32_t)0x00002000		//
-#define TSI_GENCS_OVRF			(uint32_t)0x00001000		//
-#define TSI_GENCS_SCNIP			(uint32_t)0x00000200		//
-#define TSI_GENCS_SWTS			(uint32_t)0x00000100		//
-#define TSI_GENCS_TSIEN			(uint32_t)0x00000080		//
-#define TSI_GENCS_TSIIE			(uint32_t)0x00000040		//
-#define TSI_GENCS_ERIE			(uint32_t)0x00000020		//
-#define TSI_GENCS_ESOR			(uint32_t)0x00000010		//
-#define TSI_GENCS_STM			(uint32_t)0x00000002		//
-#define TSI_GENCS_STPE			(uint32_t)0x00000001		//
-#define TSI0_SCANC		*(volatile uint32_t *)0x40045004 // SCAN Control Register
-#define TSI_SCANC_REFCHRG(n)		(((n) & 15) << 24)		//
-#define TSI_SCANC_EXTCHRG(n)		(((n) & 7) << 16)		//
-#define TSI_SCANC_SMOD(n)		(((n) & 255) << 8)		//
-#define TSI_SCANC_AMCLKS(n)		(((n) & 3) << 3)		//
-#define TSI_SCANC_AMPSC(n)		(((n) & 7) << 0)		//
-#define TSI0_PEN		*(volatile uint32_t *)0x40045008 // Pin Enable Register
-#define TSI0_WUCNTR		*(volatile uint32_t *)0x4004500C // Wake-Up Channel Counter Register
-#define TSI0_CNTR1		*(volatile uint32_t *)0x40045100 // Counter Register
-#define TSI0_CNTR3		*(volatile uint32_t *)0x40045104 // Counter Register
-#define TSI0_CNTR5		*(volatile uint32_t *)0x40045108 // Counter Register
-#define TSI0_CNTR7		*(volatile uint32_t *)0x4004510C // Counter Register
-#define TSI0_CNTR9		*(volatile uint32_t *)0x40045110 // Counter Register
-#define TSI0_CNTR11		*(volatile uint32_t *)0x40045114 // Counter Register
-#define TSI0_CNTR13		*(volatile uint32_t *)0x40045118 // Counter Register
-#define TSI0_CNTR15		*(volatile uint32_t *)0x4004511C // Counter Register
-#define TSI0_THRESHOLD		*(volatile uint32_t *)0x40045120 // Low Power Channel Threshold Register
-
-// Nested Vectored Interrupt Controller, Table 3-4 & ARMv7 ref, appendix B3.4 (page 750)
-#define NVIC_ENABLE_IRQ(n)	(*((volatile uint32_t *)0xE000E100 + (n >> 5)) = (1 << (n & 31)))
-#define NVIC_DISABLE_IRQ(n)	(*((volatile uint32_t *)0xE000E180 + (n >> 5)) = (1 << (n & 31)))
-#define NVIC_SET_PENDING(n)	(*((volatile uint32_t *)0xE000E200 + (n >> 5)) = (1 << (n & 31)))
-#define NVIC_CLEAR_PENDING(n)	(*((volatile uint32_t *)0xE000E280 + (n >> 5)) = (1 << (n & 31)))
-
-#define NVIC_ISER0		*(volatile uint32_t *)0xE000E100
-#define NVIC_ISER1		*(volatile uint32_t *)0xE000E104
-#define NVIC_ICER0		*(volatile uint32_t *)0xE000E180
-#define NVIC_ICER1		*(volatile uint32_t *)0xE000E184
-
-// 0 = highest priority
-// Cortex-M4: 0,16,32,48,64,80,96,112,128,144,160,176,192,208,224,240
-// Cortex-M0: 0,64,128,192
-#define NVIC_SET_PRIORITY(irqnum, priority)  (*((volatile uint8_t *)0xE000E400 + (irqnum)) = (uint8_t)(priority))
-#define NVIC_GET_PRIORITY(irqnum) (*((uint8_t *)0xE000E400 + (irqnum)))
-
-#if defined(__MK20DX128__)
-#define IRQ_DMA_CH0		0
-#define IRQ_DMA_CH1		1
-#define IRQ_DMA_CH2		2
-#define IRQ_DMA_CH3		3
-#define IRQ_DMA_ERROR		4
-#define IRQ_FTFL_COMPLETE	6
-#define IRQ_FTFL_COLLISION	7
-#define IRQ_LOW_VOLTAGE		8
-#define IRQ_LLWU		9
-#define IRQ_WDOG		10
-#define IRQ_I2C0		11
-#define IRQ_SPI0		12
-#define IRQ_I2S0_TX		13
-#define IRQ_I2S0_RX		14
-#define IRQ_UART0_LON		15
-#define IRQ_UART0_STATUS	16
-#define IRQ_UART0_ERROR		17
-#define IRQ_UART1_STATUS	18
-#define IRQ_UART1_ERROR		19
-#define IRQ_UART2_STATUS	20
-#define IRQ_UART2_ERROR		21
-#define IRQ_ADC0		22
-#define IRQ_CMP0		23
-#define IRQ_CMP1		24
-#define IRQ_FTM0		25
-#define IRQ_FTM1		26
-#define IRQ_CMT			27
-#define IRQ_RTC_ALARM		28
-#define IRQ_RTC_SECOND		29
-#define IRQ_PIT_CH0		30
-#define IRQ_PIT_CH1		31
-#define IRQ_PIT_CH2		32
-#define IRQ_PIT_CH3		33
-#define IRQ_PDB			34
-#define IRQ_USBOTG		35
-#define IRQ_USBDCD		36
-#define IRQ_TSI			37
-#define IRQ_MCG			38
-#define IRQ_LPTMR		39
-#define IRQ_PORTA		40
-#define IRQ_PORTB		41
-#define IRQ_PORTC		42
-#define IRQ_PORTD		43
-#define IRQ_PORTE		44
-#define IRQ_SOFTWARE		45
-#define NVIC_NUM_INTERRUPTS	46
-
-#elif defined(__MK20DX256__)
-#define IRQ_DMA_CH0		0
-#define IRQ_DMA_CH1		1
-#define IRQ_DMA_CH2		2
-#define IRQ_DMA_CH3		3
-#define IRQ_DMA_CH4		4
-#define IRQ_DMA_CH5		5
-#define IRQ_DMA_CH6		6
-#define IRQ_DMA_CH7		7
-#define IRQ_DMA_CH8		8
-#define IRQ_DMA_CH9		9
-#define IRQ_DMA_CH10		10
-#define IRQ_DMA_CH11		11
-#define IRQ_DMA_CH12		12
-#define IRQ_DMA_CH13		13
-#define IRQ_DMA_CH14		14
-#define IRQ_DMA_CH15		15
-#define IRQ_DMA_ERROR		16
-#define IRQ_FTFL_COMPLETE	18
-#define IRQ_FTFL_COLLISION	19
-#define IRQ_LOW_VOLTAGE		20
-#define IRQ_LLWU		21
-#define IRQ_WDOG		22
-#define IRQ_I2C0		24
-#define IRQ_I2C1		25
-#define IRQ_SPI0		26
-#define IRQ_SPI1		27
-#define IRQ_CAN_MESSAGE		29
-#define IRQ_CAN_BUS_OFF		30
-#define IRQ_CAN_ERROR		31
-#define IRQ_CAN_TX_WARN		32
-#define IRQ_CAN_RX_WARN		33
-#define IRQ_CAN_WAKEUP		34
-#define IRQ_I2S0_TX		35
-#define IRQ_I2S0_RX		36
-#define IRQ_UART0_LON		44
-#define IRQ_UART0_STATUS	45
-#define IRQ_UART0_ERROR		46
-#define IRQ_UART1_STATUS	47
-#define IRQ_UART1_ERROR		48
-#define IRQ_UART2_STATUS	49
-#define IRQ_UART2_ERROR		50
-#define IRQ_ADC0		57
-#define IRQ_ADC1		58
-#define IRQ_CMP0		59
-#define IRQ_CMP1		60
-#define IRQ_CMP2		61
-#define IRQ_FTM0		62
-#define IRQ_FTM1		63
-#define IRQ_FTM2		64
-#define IRQ_CMT			65
-#define IRQ_RTC_ALARM		66
-#define IRQ_RTC_SECOND		67
-#define IRQ_PIT_CH0		68
-#define IRQ_PIT_CH1		69
-#define IRQ_PIT_CH2		70
-#define IRQ_PIT_CH3		71
-#define IRQ_PDB			72
-#define IRQ_USBOTG		73
-#define IRQ_USBDCD		74
-#define IRQ_DAC0		81
-#define IRQ_TSI			83
-#define IRQ_MCG			84
-#define IRQ_LPTMR		85
-#define IRQ_PORTA		87
-#define IRQ_PORTB		88
-#define IRQ_PORTC		89
-#define IRQ_PORTD		90
-#define IRQ_PORTE		91
-#define IRQ_SOFTWARE		94
-#define NVIC_NUM_INTERRUPTS	95
-
-#endif
-
-
-
-
-
-#define __disable_irq() __asm__ volatile("CPSID i");
-#define __enable_irq()	__asm__ volatile("CPSIE i");
-
-// System Control Space (SCS), ARMv7 ref manual, B3.2, page 708
-#define SCB_CPUID		*(const	   uint32_t *)0xE000ED00 // CPUID Base Register
-#define SCB_ICSR		*(volatile uint32_t *)0xE000ED04 // Interrupt Control and State
-#define SCB_ICSR_PENDSTSET		(uint32_t)0x04000000
-#define SCB_VTOR		*(volatile uint32_t *)0xE000ED08 // Vector Table Offset
-#define SCB_AIRCR		*(volatile uint32_t *)0xE000ED0C // Application Interrupt and Reset Control
-#define SCB_SCR			*(volatile uint32_t *)0xE000ED10 // System Control Register
-#define SCB_CCR			*(volatile uint32_t *)0xE000ED14 // Configuration and Control
-#define SCB_SHPR1		*(volatile uint32_t *)0xE000ED18 // System Handler Priority Register 1
-#define SCB_SHPR2		*(volatile uint32_t *)0xE000ED1C // System Handler Priority Register 2
-#define SCB_SHPR3		*(volatile uint32_t *)0xE000ED20 // System Handler Priority Register 3
-#define SCB_SHCSR		*(volatile uint32_t *)0xE000ED24 // System Handler Control and State
-#define SCB_CFSR		*(volatile uint32_t *)0xE000ED28 // Configurable Fault Status Register
-#define SCB_HFSR		*(volatile uint32_t *)0xE000ED2C // HardFault Status
-#define SCB_DFSR		*(volatile uint32_t *)0xE000ED30 // Debug Fault Status
-#define SCB_MMFAR		*(volatile uint32_t *)0xE000ED34 // MemManage Fault Address
-
-#define SYST_CSR		*(volatile uint32_t *)0xE000E010 // SysTick Control and Status
-#define SYST_CSR_COUNTFLAG		(uint32_t)0x00010000
-#define SYST_CSR_CLKSOURCE		(uint32_t)0x00000004
-#define SYST_CSR_TICKINT		(uint32_t)0x00000002
-#define SYST_CSR_ENABLE			(uint32_t)0x00000001
-#define SYST_RVR		*(volatile uint32_t *)0xE000E014 // SysTick Reload Value Register
-#define SYST_CVR		*(volatile uint32_t *)0xE000E018 // SysTick Current Value Register
-#define SYST_CALIB		*(const	   uint32_t *)0xE000E01C // SysTick Calibration Value
-
-
-#define ARM_DEMCR		*(volatile uint32_t *)0xE000EDFC // Debug Exception and Monitor Control
-#define ARM_DEMCR_TRCENA		(1 << 24)	 // Enable debugging & monitoring blocks
-#define ARM_DWT_CTRL		*(volatile uint32_t *)0xE0001000 // DWT control register
-#define ARM_DWT_CTRL_CYCCNTENA		(1 << 0)		// Enable cycle count
-#define ARM_DWT_CYCCNT		*(volatile uint32_t *)0xE0001004 // Cycle count register
-
-extern int nvic_execution_priority(void);
-
-extern void nmi_isr(void);
-extern void hard_fault_isr(void);
-extern void memmanage_fault_isr(void);
-extern void bus_fault_isr(void);
-extern void usage_fault_isr(void);
-extern void svcall_isr(void);
-extern void debugmonitor_isr(void);
-extern void pendablesrvreq_isr(void);
-extern void systick_isr(void);
-extern void dma_ch0_isr(void);
-extern void dma_ch1_isr(void);
-extern void dma_ch2_isr(void);
-extern void dma_ch3_isr(void);
-extern void dma_ch4_isr(void);
-extern void dma_ch5_isr(void);
-extern void dma_ch6_isr(void);
-extern void dma_ch7_isr(void);
-extern void dma_ch8_isr(void);
-extern void dma_ch9_isr(void);
-extern void dma_ch10_isr(void);
-extern void dma_ch11_isr(void);
-extern void dma_ch12_isr(void);
-extern void dma_ch13_isr(void);
-extern void dma_ch14_isr(void);
-extern void dma_ch15_isr(void);
-extern void dma_error_isr(void);
-extern void mcm_isr(void);
-extern void flash_cmd_isr(void);
-extern void flash_error_isr(void);
-extern void low_voltage_isr(void);
-extern void wakeup_isr(void);
-extern void watchdog_isr(void);
-extern void i2c0_isr(void);
-extern void i2c1_isr(void);
-extern void i2c2_isr(void);
-extern void spi0_isr(void);
-extern void spi1_isr(void);
-extern void spi2_isr(void);
-extern void sdhc_isr(void);
-extern void can0_message_isr(void);
-extern void can0_bus_off_isr(void);
-extern void can0_error_isr(void);
-extern void can0_tx_warn_isr(void);
-extern void can0_rx_warn_isr(void);
-extern void can0_wakeup_isr(void);
-extern void i2s0_tx_isr(void);
-extern void i2s0_rx_isr(void);
-extern void uart0_lon_isr(void);
-extern void uart0_status_isr(void);
-extern void uart0_error_isr(void);
-extern void uart1_status_isr(void);
-extern void uart1_error_isr(void);
-extern void uart2_status_isr(void);
-extern void uart2_error_isr(void);
-extern void uart3_status_isr(void);
-extern void uart3_error_isr(void);
-extern void uart4_status_isr(void);
-extern void uart4_error_isr(void);
-extern void uart5_status_isr(void);
-extern void uart5_error_isr(void);
-extern void adc0_isr(void);
-extern void adc1_isr(void);
-extern void cmp0_isr(void);
-extern void cmp1_isr(void);
-extern void cmp2_isr(void);
-extern void ftm0_isr(void);
-extern void ftm1_isr(void);
-extern void ftm2_isr(void);
-extern void ftm3_isr(void);
-extern void cmt_isr(void);
-extern void rtc_alarm_isr(void);
-extern void rtc_seconds_isr(void);
-extern void pit0_isr(void);
-extern void pit1_isr(void);
-extern void pit2_isr(void);
-extern void pit3_isr(void);
-extern void pdb_isr(void);
-extern void usb_isr(void);
-extern void usb_charge_isr(void);
-extern void dac0_isr(void);
-extern void dac1_isr(void);
-extern void tsi0_isr(void);
-extern void mcg_isr(void);
-extern void lptmr_isr(void);
-extern void porta_isr(void);
-extern void portb_isr(void);
-extern void portc_isr(void);
-extern void portd_isr(void);
-extern void porte_isr(void);
-extern void software_isr(void);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ports/teensy/core/pins_arduino.h b/ports/teensy/core/pins_arduino.h
deleted file mode 100644
index 03674933c2f35..0000000000000
--- a/ports/teensy/core/pins_arduino.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 pins_macros_for_arduino_compatibility_h
-#define pins_macros_for_arduino_compatibility_h
-
-#include <stdint.h>
-
-const static uint8_t A0 = 14;
-const static uint8_t A1 = 15;
-const static uint8_t A2 = 16;
-const static uint8_t A3 = 17;
-const static uint8_t A4 = 18;
-const static uint8_t A5 = 19;
-const static uint8_t A6 = 20;
-const static uint8_t A7 = 21;
-const static uint8_t A8 = 22;
-const static uint8_t A9 = 23;
-const static uint8_t A10 = 34;
-const static uint8_t A11 = 35;
-const static uint8_t A12 = 36;
-const static uint8_t A13 = 37;
-const static uint8_t A14 = 40;
-
-const static uint8_t A15 = 26;
-const static uint8_t A16 = 27;
-const static uint8_t A17 = 28;
-const static uint8_t A18 = 29;
-const static uint8_t A19 = 30;
-const static uint8_t A20 = 31;
-
-const static uint8_t SS = 10;
-const static uint8_t MOSI = 11;
-const static uint8_t MISO = 12;
-const static uint8_t SCK = 13;
-const static uint8_t LED_BUILTIN = 13;
-const static uint8_t SDA = 18;
-const static uint8_t SCL = 19;
-
-
-#define NUM_DIGITAL_PINS 34
-#define NUM_ANALOG_INPUTS 14
-
-#define analogInputToDigitalPin(p) (((p) < 10) ? (p) + 14 : -1)
-#define digitalPinHasPWM(p) (((p) >= 3 && (p) <= 6) || (p) == 9 || (p) == 10 || ((p) >= 20 && (p) <= 23))
-
-#define NOT_AN_INTERRUPT -1
-#define digitalPinToInterrupt(p)  ((p) < NUM_DIGITAL_PINS ? (p) : -1)
-
-
-struct digital_pin_bitband_and_config_table_struct {
-        volatile uint32_t *reg;
-        volatile uint32_t *config;
-};
-extern const struct digital_pin_bitband_and_config_table_struct digital_pin_to_info_PGM[];
-
-// compatibility macros
-#define digitalPinToPort(pin) (pin)
-#define digitalPinToBitMask(pin) (1)
-#define portOutputRegister(pin) ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 0))
-#define portSetRegister(pin)    ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 32))
-#define portClearRegister(pin)  ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 64))
-#define portToggleRegister(pin) ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 96))
-#define portInputRegister(pin)  ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 128))
-#define portModeRegister(pin)   ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 160))
-#define portConfigRegister(pin) ((volatile uint32_t *)(digital_pin_to_info_PGM[(pin)].config))
-
-
-#define digitalPinToPortReg(pin) (portOutputRegister(pin))
-#define digitalPinToBit(pin) (1)
-
-
-#define NOT_ON_TIMER 0
-static inline uint8_t digitalPinToTimer(uint8_t) __attribute__((always_inline, unused));
-static inline uint8_t digitalPinToTimer(uint8_t pin)
-{
-	if (pin >= 3 && pin <= 6) return pin - 2;
-	if (pin >= 9 && pin <= 10) return pin - 4;
-	if (pin >= 20 && pin <= 23) return pin - 13;
-	return NOT_ON_TIMER;
-}
-
-
-
-
-#endif
diff --git a/ports/teensy/core/pins_teensy.c b/ports/teensy/core/pins_teensy.c
deleted file mode 100644
index 5817121fad389..0000000000000
--- a/ports/teensy/core/pins_teensy.c
+++ /dev/null
@@ -1,817 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be 
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows 
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 "core_pins.h"
-#include "pins_arduino.h"
-#include "HardwareSerial.h"
-
-#if 0
-// moved to pins_arduino.h
-struct digital_pin_bitband_and_config_table_struct {
-	volatile uint32_t *reg;
-	volatile uint32_t *config;
-};
-const struct digital_pin_bitband_and_config_table_struct digital_pin_to_info_PGM[];
-
-// compatibility macros
-#define digitalPinToPort(pin) (pin)
-#define digitalPinToBitMask(pin) (1)
-#define portOutputRegister(pin) ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 0))
-#define portSetRegister(pin)    ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 32))
-#define portClearRegister(pin)  ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 64))
-#define portToggleRegister(pin) ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 96))
-#define portInputRegister(pin)  ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 128))
-#define portModeRegister(pin)   ((volatile uint8_t *)(digital_pin_to_info_PGM[(pin)].reg + 160))
-#define portConfigRegister(pin) ((volatile uint32_t *)(digital_pin_to_info_PGM[(pin)].config))
-#endif
-
-//#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
-//#define analogInPinToBit(P) (P)
-
-#define GPIO_BITBAND_ADDR(reg, bit) (((uint32_t)&(reg) - 0x40000000) * 32 + (bit) * 4 + 0x42000000)
-#define GPIO_BITBAND_PTR(reg, bit) ((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit)))
-//#define GPIO_SET_BIT(reg, bit) (*GPIO_BITBAND_PTR((reg), (bit)) = 1)
-//#define GPIO_CLR_BIT(reg, bit) (*GPIO_BITBAND_PTR((reg), (bit)) = 0)
-
-const struct digital_pin_bitband_and_config_table_struct digital_pin_to_info_PGM[] = {
-	{GPIO_BITBAND_PTR(CORE_PIN0_PORTREG, CORE_PIN0_BIT), &CORE_PIN0_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN1_PORTREG, CORE_PIN1_BIT), &CORE_PIN1_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN2_PORTREG, CORE_PIN2_BIT), &CORE_PIN2_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN3_PORTREG, CORE_PIN3_BIT), &CORE_PIN3_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN4_PORTREG, CORE_PIN4_BIT), &CORE_PIN4_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN5_PORTREG, CORE_PIN5_BIT), &CORE_PIN5_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN6_PORTREG, CORE_PIN6_BIT), &CORE_PIN6_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN7_PORTREG, CORE_PIN7_BIT), &CORE_PIN7_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN8_PORTREG, CORE_PIN8_BIT), &CORE_PIN8_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN9_PORTREG, CORE_PIN9_BIT), &CORE_PIN9_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN10_PORTREG, CORE_PIN10_BIT), &CORE_PIN10_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN11_PORTREG, CORE_PIN11_BIT), &CORE_PIN11_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN12_PORTREG, CORE_PIN12_BIT), &CORE_PIN12_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN13_PORTREG, CORE_PIN13_BIT), &CORE_PIN13_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN14_PORTREG, CORE_PIN14_BIT), &CORE_PIN14_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN15_PORTREG, CORE_PIN15_BIT), &CORE_PIN15_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN16_PORTREG, CORE_PIN16_BIT), &CORE_PIN16_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN17_PORTREG, CORE_PIN17_BIT), &CORE_PIN17_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN18_PORTREG, CORE_PIN18_BIT), &CORE_PIN18_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN19_PORTREG, CORE_PIN19_BIT), &CORE_PIN19_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN20_PORTREG, CORE_PIN20_BIT), &CORE_PIN20_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN21_PORTREG, CORE_PIN21_BIT), &CORE_PIN21_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN22_PORTREG, CORE_PIN22_BIT), &CORE_PIN22_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN23_PORTREG, CORE_PIN23_BIT), &CORE_PIN23_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN24_PORTREG, CORE_PIN24_BIT), &CORE_PIN24_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN25_PORTREG, CORE_PIN25_BIT), &CORE_PIN25_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN26_PORTREG, CORE_PIN26_BIT), &CORE_PIN26_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN27_PORTREG, CORE_PIN27_BIT), &CORE_PIN27_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN28_PORTREG, CORE_PIN28_BIT), &CORE_PIN28_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN29_PORTREG, CORE_PIN29_BIT), &CORE_PIN29_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN30_PORTREG, CORE_PIN30_BIT), &CORE_PIN30_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN31_PORTREG, CORE_PIN31_BIT), &CORE_PIN31_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN32_PORTREG, CORE_PIN32_BIT), &CORE_PIN32_CONFIG},
-	{GPIO_BITBAND_PTR(CORE_PIN33_PORTREG, CORE_PIN33_BIT), &CORE_PIN33_CONFIG}
-};
-
-
-
-
-typedef void (*voidFuncPtr)(void);
-volatile static voidFuncPtr intFunc[CORE_NUM_DIGITAL];
-
-void init_pin_interrupts(void)
-{
-	//SIM_SCGC5 = 0x00043F82;		// clocks active to all GPIO
-	NVIC_ENABLE_IRQ(IRQ_PORTA);
-	NVIC_ENABLE_IRQ(IRQ_PORTB);
-	NVIC_ENABLE_IRQ(IRQ_PORTC);
-	NVIC_ENABLE_IRQ(IRQ_PORTD);
-	NVIC_ENABLE_IRQ(IRQ_PORTE);
-	// TODO: maybe these should be set to a lower priority
-	// so if the user puts lots of slow code on attachInterrupt
-	// fast interrupts will still be serviced quickly?
-}
-
-void attachInterrupt(uint8_t pin, void (*function)(void), int mode)
-{
-	volatile uint32_t *config;
-	uint32_t cfg, mask;
-
-	if (pin >= CORE_NUM_DIGITAL) return;
-	switch (mode) {
-	  case CHANGE:	mask = 0x0B; break;
-	  case RISING:	mask = 0x09; break;
-	  case FALLING:	mask = 0x0A; break;
-	  case LOW:	mask = 0x08; break;
-	  case HIGH:	mask = 0x0C; break;
-	  default: return;
-	}
-	mask = (mask << 16) | 0x01000000;
-	config = portConfigRegister(pin);
-
-	__disable_irq();
-	cfg = *config;
-	cfg &= ~0x000F0000;		// disable any previous interrupt
-	*config = cfg;
-	intFunc[pin] = function;	// set the function pointer
-	cfg |= mask;
-	*config = cfg;			// enable the new interrupt
-	__enable_irq();
-}
-
-void detachInterrupt(uint8_t pin)
-{
-	volatile uint32_t *config;
-
-	config = portConfigRegister(pin);
-	__disable_irq();
-	*config = ((*config & ~0x000F0000) | 0x01000000);
-	intFunc[pin] = NULL;
-	__enable_irq();
-}
-
-
-void porta_isr(void)
-{
-	uint32_t isfr = PORTA_ISFR;
-	PORTA_ISFR = isfr;
-	if ((isfr & CORE_PIN3_BITMASK) && intFunc[3]) intFunc[3]();
-	if ((isfr & CORE_PIN4_BITMASK) && intFunc[4]) intFunc[4]();
-	if ((isfr & CORE_PIN24_BITMASK) && intFunc[24]) intFunc[24]();
-	if ((isfr & CORE_PIN33_BITMASK) && intFunc[33]) intFunc[33]();
-}
-
-void portb_isr(void)
-{
-	uint32_t isfr = PORTB_ISFR;
-	PORTB_ISFR = isfr;
-	if ((isfr & CORE_PIN0_BITMASK) && intFunc[0]) intFunc[0]();
-	if ((isfr & CORE_PIN1_BITMASK) && intFunc[1]) intFunc[1]();
-	if ((isfr & CORE_PIN16_BITMASK) && intFunc[16]) intFunc[16]();
-	if ((isfr & CORE_PIN17_BITMASK) && intFunc[17]) intFunc[17]();
-	if ((isfr & CORE_PIN18_BITMASK) && intFunc[18]) intFunc[18]();
-	if ((isfr & CORE_PIN19_BITMASK) && intFunc[19]) intFunc[19]();
-	if ((isfr & CORE_PIN25_BITMASK) && intFunc[25]) intFunc[25]();
-	if ((isfr & CORE_PIN32_BITMASK) && intFunc[32]) intFunc[32]();
-}
-
-void portc_isr(void)
-{
-	// TODO: these are inefficient.  Use CLZ somehow....
-	uint32_t isfr = PORTC_ISFR;
-	PORTC_ISFR = isfr;
-	if ((isfr & CORE_PIN9_BITMASK) && intFunc[9]) intFunc[9]();
-	if ((isfr & CORE_PIN10_BITMASK) && intFunc[10]) intFunc[10]();
-	if ((isfr & CORE_PIN11_BITMASK) && intFunc[11]) intFunc[11]();
-	if ((isfr & CORE_PIN12_BITMASK) && intFunc[12]) intFunc[12]();
-	if ((isfr & CORE_PIN13_BITMASK) && intFunc[13]) intFunc[13]();
-	if ((isfr & CORE_PIN15_BITMASK) && intFunc[15]) intFunc[15]();
-	if ((isfr & CORE_PIN22_BITMASK) && intFunc[22]) intFunc[22]();
-	if ((isfr & CORE_PIN23_BITMASK) && intFunc[23]) intFunc[23]();
-	if ((isfr & CORE_PIN27_BITMASK) && intFunc[27]) intFunc[27]();
-	if ((isfr & CORE_PIN28_BITMASK) && intFunc[28]) intFunc[28]();
-	if ((isfr & CORE_PIN29_BITMASK) && intFunc[29]) intFunc[29]();
-	if ((isfr & CORE_PIN30_BITMASK) && intFunc[30]) intFunc[30]();
-}
-
-void portd_isr(void)
-{
-	uint32_t isfr = PORTD_ISFR;
-	PORTD_ISFR = isfr;
-	if ((isfr & CORE_PIN2_BITMASK) && intFunc[2]) intFunc[2]();
-	if ((isfr & CORE_PIN5_BITMASK) && intFunc[5]) intFunc[5]();
-	if ((isfr & CORE_PIN6_BITMASK) && intFunc[6]) intFunc[6]();
-	if ((isfr & CORE_PIN7_BITMASK) && intFunc[7]) intFunc[7]();
-	if ((isfr & CORE_PIN8_BITMASK) && intFunc[8]) intFunc[8]();
-	if ((isfr & CORE_PIN14_BITMASK) && intFunc[14]) intFunc[14]();
-	if ((isfr & CORE_PIN20_BITMASK) && intFunc[20]) intFunc[20]();
-	if ((isfr & CORE_PIN21_BITMASK) && intFunc[21]) intFunc[21]();
-}
-
-void porte_isr(void)
-{
-	uint32_t isfr = PORTE_ISFR;
-	PORTE_ISFR = isfr;
-	if ((isfr & CORE_PIN26_BITMASK) && intFunc[26]) intFunc[26]();
-	if ((isfr & CORE_PIN31_BITMASK) && intFunc[31]) intFunc[31]();
-}
-
-
-
-
-unsigned long rtc_get(void)
-{
-	return RTC_TSR;
-}
-
-void rtc_set(unsigned long t)
-{
-	RTC_SR = 0;
-	RTC_TPR = 0;
-	RTC_TSR = t;
-	RTC_SR = RTC_SR_TCE;
-}
-
-
-// adjust is the amount of crystal error to compensate, 1 = 0.1192 ppm
-// For example, adjust = -100 is slows the clock by 11.92 ppm
-//
-void rtc_compensate(int adjust)
-{
-	uint32_t comp, interval, tcr;
-
-	// This simple approach tries to maximize the interval.
-	// Perhaps minimizing TCR would be better, so the
-	// compensation is distributed more evenly across
-	// many seconds, rather than saving it all up and then
-	// altering one second up to +/- 0.38%
-	if (adjust >= 0) {
-		comp = adjust;
-		interval = 256;
-		while (1) {
-			tcr = comp * interval;
-			if (tcr < 128*256) break;
-			if (--interval == 1) break;
-		}
-		tcr = tcr >> 8;
-	} else {
-		comp = -adjust;
-		interval = 256;
-		while (1) {
-			tcr = comp * interval;
-			if (tcr < 129*256) break;
-			if (--interval == 1) break;
-		}
-		tcr = tcr >> 8;
-		tcr = 256 - tcr;
-	}
-	RTC_TCR = ((interval - 1) << 8) | tcr;
-}
-
-#if 0
-// TODO: build system should define this
-// so RTC is automatically initialized to approx correct time
-// at least when the program begins running right after upload
-#ifndef TIME_T
-#define TIME_T 1350160272
-#endif
-
-void init_rtc(void)
-{
-	serial_print("init_rtc\n");
-	//SIM_SCGC6 |= SIM_SCGC6_RTC;
-
-	// enable the RTC crystal oscillator, for approx 12pf crystal
-	if (!(RTC_CR & RTC_CR_OSCE)) {
-		serial_print("start RTC oscillator\n");
-		RTC_SR = 0;
-		RTC_CR = RTC_CR_SC16P | RTC_CR_SC4P | RTC_CR_OSCE;
-	}
-	// should wait for crystal to stabilize.....
-
-	serial_print("SR=");
-	serial_phex32(RTC_SR);
-	serial_print("\n");
-	serial_print("CR=");
-	serial_phex32(RTC_CR);
-	serial_print("\n");
-	serial_print("TSR=");
-	serial_phex32(RTC_TSR);
-	serial_print("\n");
-	serial_print("TCR=");
-	serial_phex32(RTC_TCR);
-	serial_print("\n");
-
-	if (RTC_SR & RTC_SR_TIF) {
-		// enable the RTC
-		RTC_SR = 0;
-		RTC_TPR = 0;
-		RTC_TSR = TIME_T;
-		RTC_SR = RTC_SR_TCE;
-	}
-}
-#endif
-
-extern void usb_init(void);
-
-
-// create a default PWM at the same 488.28 Hz as Arduino Uno
-
-#if F_BUS == 60000000
-#define DEFAULT_FTM_MOD (61440 - 1)
-#define DEFAULT_FTM_PRESCALE 1
-#elif F_BUS == 56000000
-#define DEFAULT_FTM_MOD (57344 - 1)
-#define DEFAULT_FTM_PRESCALE 1
-#elif F_BUS == 48000000
-#define DEFAULT_FTM_MOD (49152 - 1)
-#define DEFAULT_FTM_PRESCALE 1
-#elif F_BUS == 40000000
-#define DEFAULT_FTM_MOD (40960 - 1)
-#define DEFAULT_FTM_PRESCALE 1
-#elif F_BUS == 36000000
-#define DEFAULT_FTM_MOD (36864 - 1)
-#define DEFAULT_FTM_PRESCALE 1
-#elif F_BUS == 24000000
-#define DEFAULT_FTM_MOD (49152 - 1)
-#define DEFAULT_FTM_PRESCALE 0
-#elif F_BUS == 16000000
-#define DEFAULT_FTM_MOD (32768 - 1)
-#define DEFAULT_FTM_PRESCALE 0
-#elif F_BUS == 8000000
-#define DEFAULT_FTM_MOD (16384 - 1)
-#define DEFAULT_FTM_PRESCALE 0
-#elif F_BUS == 4000000
-#define DEFAULT_FTM_MOD (8192 - 1)
-#define DEFAULT_FTM_PRESCALE 0
-#elif F_BUS == 2000000
-#define DEFAULT_FTM_MOD (4096 - 1)
-#define DEFAULT_FTM_PRESCALE 0
-#endif
-
-//void init_pins(void)
-void _init_Teensyduino_internal_(void)
-{
-	init_pin_interrupts();
-
-	//SIM_SCGC6 |= SIM_SCGC6_FTM0;	// TODO: use bitband for atomic read-mod-write
-	//SIM_SCGC6 |= SIM_SCGC6_FTM1;
-	FTM0_CNT = 0;
-	FTM0_MOD = DEFAULT_FTM_MOD;
-	FTM0_C0SC = 0x28; // MSnB:MSnA = 10, ELSnB:ELSnA = 10
-	FTM0_C1SC = 0x28;
-	FTM0_C2SC = 0x28;
-	FTM0_C3SC = 0x28;
-	FTM0_C4SC = 0x28;
-	FTM0_C5SC = 0x28;
-	FTM0_C6SC = 0x28;
-	FTM0_C7SC = 0x28;
-	FTM0_SC = FTM_SC_CLKS(1) | FTM_SC_PS(DEFAULT_FTM_PRESCALE);
-	FTM1_CNT = 0;
-	FTM1_MOD = DEFAULT_FTM_MOD;
-	FTM1_C0SC = 0x28;
-	FTM1_C1SC = 0x28;
-	FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(DEFAULT_FTM_PRESCALE);
-#if defined(__MK20DX256__)
-	FTM2_CNT = 0;
-	FTM2_MOD = DEFAULT_FTM_MOD;
-	FTM2_C0SC = 0x28;
-	FTM2_C1SC = 0x28;
-	FTM2_SC = FTM_SC_CLKS(1) | FTM_SC_PS(DEFAULT_FTM_PRESCALE);
-#endif
-
-	analog_init();
-	//delay(100); // TODO: this is not necessary, right?
-	delay(4);
-	usb_init();
-}
-
-
-
-static uint8_t analog_write_res = 8;
-
-// SOPT4 is SIM select clocks?
-// FTM is clocked by the bus clock, either 24 or 48 MHz
-// input capture can be FTM1_CH0, CMP0 or CMP1 or USB start of frame
-// 24 MHz with reload 49152 to match Arduino's speed = 488.28125 Hz
-
-void analogWrite(uint8_t pin, int val)
-{
-	uint32_t cval, max;
-
-#if defined(__MK20DX256__)
-	if (pin == A14) {
-		uint8_t res = analog_write_res;
-		if (res < 12) {
-			val <<= 12 - res;
-		} else if (res > 12) {
-			val >>= res - 12;
-		}
-		analogWriteDAC0(val);
-		return;
-	}
-#endif
-
-	max = 1 << analog_write_res;
-	if (val <= 0) {
-		digitalWrite(pin, LOW);
-		pinMode(pin, OUTPUT);	// TODO: implement OUTPUT_LOW
-		return;
-	} else if (val >= max) {
-		digitalWrite(pin, HIGH);
-		pinMode(pin, OUTPUT);	// TODO: implement OUTPUT_HIGH
-		return;
-	}
-
-	//serial_print("analogWrite\n");
-	//serial_print("val = ");
-	//serial_phex32(val);
-	//serial_print("\n");
-	//serial_print("analog_write_res = ");
-	//serial_phex(analog_write_res);
-	//serial_print("\n");
-	if (pin == 3 || pin == 4) {
-		cval = ((uint32_t)val * (uint32_t)(FTM1_MOD + 1)) >> analog_write_res;
-#if defined(__MK20DX256__)
-	} else if (pin == 25 || pin == 32) {
-		cval = ((uint32_t)val * (uint32_t)(FTM2_MOD + 1)) >> analog_write_res;
-#endif
-	} else {
-		cval = ((uint32_t)val * (uint32_t)(FTM0_MOD + 1)) >> analog_write_res;
-	}
-	//serial_print("cval = ");
-	//serial_phex32(cval);
-	//serial_print("\n");
-	switch (pin) {
-	  case 3: // PTA12, FTM1_CH0
-		FTM1_C0V = cval;
-		CORE_PIN3_CONFIG = PORT_PCR_MUX(3) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 4: // PTA13, FTM1_CH1
-		FTM1_C1V = cval;
-		CORE_PIN4_CONFIG = PORT_PCR_MUX(3) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 5: // PTD7, FTM0_CH7
-		FTM0_C7V = cval;
-		CORE_PIN5_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 6: // PTD4, FTM0_CH4
-		FTM0_C4V = cval;
-		CORE_PIN6_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 9: // PTC3, FTM0_CH2
-		FTM0_C2V = cval;
-		CORE_PIN9_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 10: // PTC4, FTM0_CH3
-		FTM0_C3V = cval;
-		CORE_PIN10_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 20: // PTD5, FTM0_CH5
-		FTM0_C5V = cval;
-		CORE_PIN20_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 21: // PTD6, FTM0_CH6
-		FTM0_C6V = cval;
-		CORE_PIN21_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 22: // PTC1, FTM0_CH0
-		FTM0_C0V = cval;
-		CORE_PIN22_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 23: // PTC2, FTM0_CH1
-		FTM0_C1V = cval;
-		CORE_PIN23_CONFIG = PORT_PCR_MUX(4) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-#if defined(__MK20DX256__)
-	  case 32: // PTB18, FTM2_CH0
-		FTM2_C0V = cval;
-		CORE_PIN32_CONFIG = PORT_PCR_MUX(3) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-	  case 25: // PTB19, FTM1_CH1
-		FTM2_C1V = cval;
-		CORE_PIN25_CONFIG = PORT_PCR_MUX(3) | PORT_PCR_DSE | PORT_PCR_SRE;
-		break;
-#endif
-	  default:
-		digitalWrite(pin, (val > 127) ? HIGH : LOW);
-		pinMode(pin, OUTPUT);
-	}
-}
-
-void analogWriteRes(uint32_t bits)
-{
-	if (bits < 1) {
-		bits = 1;
-	} else if (bits > 16) {
-		bits = 16;
-	}
-	analog_write_res = bits;
-}
-
-void analogWriteFrequency(uint8_t pin, uint32_t frequency)
-{
-	uint32_t minfreq, prescale, mod;
-
-	//serial_print("analogWriteFrequency: pin = ");
-	//serial_phex(pin);
-	//serial_print(", freq = ");
-	//serial_phex32(frequency);
-	//serial_print("\n");
-	for (prescale = 0; prescale < 7; prescale++) {
-		minfreq = (F_BUS >> 16) >> prescale;
-		if (frequency > minfreq) break;
-	}
-	//serial_print("F_BUS = ");
-	//serial_phex32(F_BUS >> prescale);
-	//serial_print("\n");
-	//serial_print("prescale = ");
-	//serial_phex(prescale);
-	//serial_print("\n");
-	//mod = ((F_BUS >> prescale) / frequency) - 1;
-	mod = (((F_BUS >> prescale) + (frequency >> 1)) / frequency) - 1;
-	if (mod > 65535) mod = 65535;
-	//serial_print("mod = ");
-	//serial_phex32(mod);
-	//serial_print("\n");
-	if (pin == 3 || pin == 4) {
-		FTM1_SC = 0;
-		FTM1_CNT = 0;
-		FTM1_MOD = mod;
-		FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(prescale);
-	} else if (pin == 5 || pin == 6 || pin == 9 || pin == 10 ||
-	  (pin >= 20 && pin <= 23)) {
-		FTM0_SC = 0;
-		FTM0_CNT = 0;
-		FTM0_MOD = mod;
-		FTM0_SC = FTM_SC_CLKS(1) | FTM_SC_PS(prescale);
-	}
-}
-
-
-
-
-// TODO: startup code needs to initialize all pins to GPIO mode, input by default
-
-void digitalWrite(uint8_t pin, uint8_t val)
-{
-	if (pin >= CORE_NUM_DIGITAL) return;
-	if (*portModeRegister(pin)) {
-		if (val) {
-			*portSetRegister(pin) = 1;
-		} else {
-			*portClearRegister(pin) = 1;
-		}
-	} else {
-		volatile uint32_t *config = portConfigRegister(pin);
-		if (val) {
-			// TODO use bitband for atomic read-mod-write
-			*config |= (PORT_PCR_PE | PORT_PCR_PS);
-			//*config = PORT_PCR_MUX(1) | PORT_PCR_PE | PORT_PCR_PS;
-		} else {
-			// TODO use bitband for atomic read-mod-write
-			*config &= ~(PORT_PCR_PE);
-			//*config = PORT_PCR_MUX(1);
-		}
-	}
-
-}
-
-uint8_t digitalRead(uint8_t pin)
-{
-	if (pin >= CORE_NUM_DIGITAL) return 0;
-	return *portInputRegister(pin);
-}
-
-
-
-void pinMode(uint8_t pin, uint8_t mode)
-{
-	volatile uint32_t *config;
-
-	if (pin >= CORE_NUM_DIGITAL) return;
-	config = portConfigRegister(pin);
-
-	if (mode == OUTPUT) {
-		*portModeRegister(pin) = 1;
-		*config = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
-	} else {
-		*portModeRegister(pin) = 0;
-		if (mode == INPUT) {
-			*config = PORT_PCR_MUX(1);
-		} else {
-			*config = PORT_PCR_MUX(1) | PORT_PCR_PE | PORT_PCR_PS; // pullup
-		}
-	}
-}
-
-
-void _shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t value)
-{
-        if (bitOrder == LSBFIRST) {
-                shiftOut_lsbFirst(dataPin, clockPin, value);
-        } else {
-                shiftOut_msbFirst(dataPin, clockPin, value);
-        }
-}
-
-void shiftOut_lsbFirst(uint8_t dataPin, uint8_t clockPin, uint8_t value)
-{
-        uint8_t mask;
-        for (mask=0x01; mask; mask <<= 1) {
-                digitalWrite(dataPin, value & mask);
-                digitalWrite(clockPin, HIGH);
-                digitalWrite(clockPin, LOW);
-        }
-}
-
-void shiftOut_msbFirst(uint8_t dataPin, uint8_t clockPin, uint8_t value)
-{
-        uint8_t mask;
-        for (mask=0x80; mask; mask >>= 1) {
-                digitalWrite(dataPin, value & mask);
-                digitalWrite(clockPin, HIGH);
-                digitalWrite(clockPin, LOW);
-        }
-}
-
-uint8_t _shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder)
-{
-        if (bitOrder == LSBFIRST) {
-                return shiftIn_lsbFirst(dataPin, clockPin);
-        } else {
-                return shiftIn_msbFirst(dataPin, clockPin);
-        }
-}
-
-uint8_t shiftIn_lsbFirst(uint8_t dataPin, uint8_t clockPin)
-{
-        uint8_t mask, value=0;
-        for (mask=0x01; mask; mask <<= 1) {
-                digitalWrite(clockPin, HIGH);
-                if (digitalRead(dataPin)) value |= mask;
-                digitalWrite(clockPin, LOW);
-        }
-        return value;
-}
-
-uint8_t shiftIn_msbFirst(uint8_t dataPin, uint8_t clockPin)
-{
-        uint8_t mask, value=0;
-        for (mask=0x80; mask; mask >>= 1) {
-                digitalWrite(clockPin, HIGH);
-                if (digitalRead(dataPin)) value |= mask;
-                digitalWrite(clockPin, LOW);
-        }
-        return value;
-}
-
-
-
-// the systick interrupt is supposed to increment this at 1 kHz rate
-volatile uint32_t systick_millis_count = 0;
-
-//uint32_t systick_current, systick_count, systick_istatus;  // testing only
-
-uint32_t micros(void)
-{
-	uint32_t count, current, istatus;
-
-	__disable_irq();
-	current = SYST_CVR;
-	count = systick_millis_count;
-	istatus = SCB_ICSR;	// bit 26 indicates if systick exception pending
-	__enable_irq();
-	 //systick_current = current;
-	 //systick_count = count;
-	 //systick_istatus = istatus & SCB_ICSR_PENDSTSET ? 1 : 0;
-	if ((istatus & SCB_ICSR_PENDSTSET) && current > 50) count++;
-	current = ((F_CPU / 1000) - 1) - current;
-	return count * 1000 + current / (F_CPU / 1000000);
-}
-
-void delay(uint32_t ms)
-{
-	uint32_t start = micros();
-
-	if (ms > 0) {
-		while (1) {
-			if ((micros() - start) >= 1000) {
-				ms--;
-				if (ms == 0) return;
-				start += 1000;
-			}
-			yield();
-		}
-	}
-}
-
-// TODO: verify these result in correct timeouts...
-#if F_CPU == 168000000
-#define PULSEIN_LOOPS_PER_USEC 25
-#elif F_CPU == 144000000
-#define PULSEIN_LOOPS_PER_USEC 21
-#elif F_CPU == 120000000
-#define PULSEIN_LOOPS_PER_USEC 18
-#elif F_CPU == 96000000
-#define PULSEIN_LOOPS_PER_USEC 14
-#elif F_CPU == 72000000
-#define PULSEIN_LOOPS_PER_USEC 10
-#elif F_CPU == 48000000
-#define PULSEIN_LOOPS_PER_USEC 7
-#elif F_CPU == 24000000
-#define PULSEIN_LOOPS_PER_USEC 4
-#elif F_CPU == 16000000
-#define PULSEIN_LOOPS_PER_USEC 1
-#elif F_CPU == 8000000
-#define PULSEIN_LOOPS_PER_USEC 1
-#elif F_CPU == 4000000
-#define PULSEIN_LOOPS_PER_USEC 1
-#elif F_CPU == 2000000
-#define PULSEIN_LOOPS_PER_USEC 1
-#endif
-
-
-uint32_t pulseIn_high(volatile uint8_t *reg, uint32_t timeout)
-{
-	uint32_t timeout_count = timeout * PULSEIN_LOOPS_PER_USEC;
-	uint32_t usec_start, usec_stop;
-	
-	// wait for any previous pulse to end
-	while (*reg) {
-		if (--timeout_count == 0) return 0;
-	}
-	// wait for the pulse to start
-	while (!*reg) {
-		if (--timeout_count == 0) return 0;
-	}
-	usec_start = micros();
-	// wait for the pulse to stop
-	while (*reg) {
-		if (--timeout_count == 0) return 0;
-	}
-	usec_stop = micros();
-	return usec_stop - usec_start;
-}
-
-uint32_t pulseIn_low(volatile uint8_t *reg, uint32_t timeout)
-{
-	uint32_t timeout_count = timeout * PULSEIN_LOOPS_PER_USEC;
-	uint32_t usec_start, usec_stop;
-	
-	// wait for any previous pulse to end
-	while (!*reg) {
-		if (--timeout_count == 0) return 0;
-	}
-	// wait for the pulse to start
-	while (*reg) {
-		if (--timeout_count == 0) return 0;
-	}
-	usec_start = micros();
-	// wait for the pulse to stop
-	while (!*reg) {
-		if (--timeout_count == 0) return 0;
-	}
-	usec_stop = micros();
-	return usec_stop - usec_start;
-}
-
-// TODO: an inline version should handle the common case where state is const
-uint32_t pulseIn(uint8_t pin, uint8_t state, uint32_t timeout)
-{
-	if (pin >= CORE_NUM_DIGITAL) return 0;
-	if (state) return pulseIn_high(portInputRegister(pin), timeout);
-	return pulseIn_low(portInputRegister(pin), timeout);;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ports/teensy/core/usb_desc.c b/ports/teensy/core/usb_desc.c
deleted file mode 100644
index cc1103b9f0b59..0000000000000
--- a/ports/teensy/core/usb_desc.c
+++ /dev/null
@@ -1,895 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 F_CPU >= 20000000
-
-#include "usb_desc.h"
-#include "usb_names.h"
-#include "mk20dx128.h"
-#include "avr_functions.h"
-
-// USB Descriptors are binary data which the USB host reads to
-// automatically detect a USB device's capabilities.  The format
-// and meaning of every field is documented in numerous USB
-// standards.  When working with USB descriptors, despite the
-// complexity of the standards and poor writing quality in many
-// of those documents, remember descriptors are nothing more
-// than constant binary data that tells the USB host what the
-// device can do.  Computers will load drivers based on this data.
-// Those drivers then communicate on the endpoints specified by
-// the descriptors.
-
-// To configure a new combination of interfaces or make minor
-// changes to existing configuration (eg, change the name or ID
-// numbers), usually you would edit "usb_desc.h".  This file
-// is meant to be configured by the header, so generally it is
-// only edited to add completely new USB interfaces or features.
-
-
-
-// **************************************************************
-//   USB Device
-// **************************************************************
-
-#define LSB(n) ((n) & 255)
-#define MSB(n) (((n) >> 8) & 255)
-
-// USB Device Descriptor.  The USB host reads this first, to learn
-// what type of device is connected.
-static uint8_t device_descriptor[] = {
-        18,                                     // bLength
-        1,                                      // bDescriptorType
-        0x00, 0x02,                             // bcdUSB
-#ifdef DEVICE_CLASS
-        DEVICE_CLASS,                           // bDeviceClass
-#else
-	0,
-#endif
-#ifdef DEVICE_SUBCLASS
-        DEVICE_SUBCLASS,                        // bDeviceSubClass
-#else
-	0,
-#endif
-#ifdef DEVICE_PROTOCOL
-        DEVICE_PROTOCOL,                        // bDeviceProtocol
-#else
-	0,
-#endif
-        EP0_SIZE,                               // bMaxPacketSize0
-        LSB(VENDOR_ID), MSB(VENDOR_ID),         // idVendor
-        LSB(PRODUCT_ID), MSB(PRODUCT_ID),       // idProduct
-        0x00, 0x01,                             // bcdDevice
-        1,                                      // iManufacturer
-        2,                                      // iProduct
-        3,                                      // iSerialNumber
-        1                                       // bNumConfigurations
-};
-
-// These descriptors must NOT be "const", because the USB DMA
-// has trouble accessing flash memory with enough bandwidth
-// while the processor is executing from flash.
-
-
-
-// **************************************************************
-//   HID Report Descriptors
-// **************************************************************
-
-// Each HID interface needs a special report descriptor that tells
-// the meaning and format of the data.
-
-#ifdef KEYBOARD_INTERFACE
-// Keyboard Protocol 1, HID 1.11 spec, Appendix B, page 59-60
-static uint8_t keyboard_report_desc[] = {
-        0x05, 0x01,             //  Usage Page (Generic Desktop),
-        0x09, 0x06,             //  Usage (Keyboard),
-        0xA1, 0x01,             //  Collection (Application),
-        0x75, 0x01,             //  Report Size (1),
-        0x95, 0x08,             //  Report Count (8),
-        0x05, 0x07,             //  Usage Page (Key Codes),
-        0x19, 0xE0,             //  Usage Minimum (224),
-        0x29, 0xE7,             //  Usage Maximum (231),
-        0x15, 0x00,             //  Logical Minimum (0),
-        0x25, 0x01,             //  Logical Maximum (1),
-        0x81, 0x02,             //  Input (Data, Variable, Absolute), ;Modifier byte
-        0x95, 0x08,             //  Report Count (8),
-        0x75, 0x01,             //  Report Size (1),
-        0x15, 0x00,             //  Logical Minimum (0),
-        0x25, 0x01,             //  Logical Maximum (1),
-        0x05, 0x0C,             //  Usage Page (Consumer),
-        0x09, 0xE9,             //  Usage (Volume Increment),
-        0x09, 0xEA,             //  Usage (Volume Decrement),
-        0x09, 0xE2,             //  Usage (Mute),
-        0x09, 0xCD,             //  Usage (Play/Pause),
-        0x09, 0xB5,             //  Usage (Scan Next Track),
-        0x09, 0xB6,             //  Usage (Scan Previous Track),
-        0x09, 0xB7,             //  Usage (Stop),
-        0x09, 0xB8,             //  Usage (Eject),
-        0x81, 0x02,             //  Input (Data, Variable, Absolute), ;Media keys
-        0x95, 0x05,             //  Report Count (5),
-        0x75, 0x01,             //  Report Size (1),
-        0x05, 0x08,             //  Usage Page (LEDs),
-        0x19, 0x01,             //  Usage Minimum (1),
-        0x29, 0x05,             //  Usage Maximum (5),
-        0x91, 0x02,             //  Output (Data, Variable, Absolute), ;LED report
-        0x95, 0x01,             //  Report Count (1),
-        0x75, 0x03,             //  Report Size (3),
-        0x91, 0x03,             //  Output (Constant),                 ;LED report padding
-        0x95, 0x06,             //  Report Count (6),
-        0x75, 0x08,             //  Report Size (8),
-        0x15, 0x00,             //  Logical Minimum (0),
-        0x25, 0x7F,             //  Logical Maximum(104),
-        0x05, 0x07,             //  Usage Page (Key Codes),
-        0x19, 0x00,             //  Usage Minimum (0),
-        0x29, 0x7F,             //  Usage Maximum (104),
-        0x81, 0x00,             //  Input (Data, Array),                ;Normal keys
-        0xc0                    // End Collection
-};
-#endif
-
-#ifdef MOUSE_INTERFACE
-// Mouse Protocol 1, HID 1.11 spec, Appendix B, page 59-60, with wheel extension
-static uint8_t mouse_report_desc[] = {
-        0x05, 0x01,                     // Usage Page (Generic Desktop)
-        0x09, 0x02,                     // Usage (Mouse)
-        0xA1, 0x01,                     // Collection (Application)
-        0x85, 0x01,                     //   REPORT_ID (1)
-        0x05, 0x09,                     //   Usage Page (Button)
-        0x19, 0x01,                     //   Usage Minimum (Button #1)
-        0x29, 0x08,                     //   Usage Maximum (Button #8)
-        0x15, 0x00,                     //   Logical Minimum (0)
-        0x25, 0x01,                     //   Logical Maximum (1)
-        0x95, 0x08,                     //   Report Count (8)
-        0x75, 0x01,                     //   Report Size (1)
-        0x81, 0x02,                     //   Input (Data, Variable, Absolute)
-        0x05, 0x01,                     //   Usage Page (Generic Desktop)
-        0x09, 0x30,                     //   Usage (X)
-        0x09, 0x31,                     //   Usage (Y)
-        0x09, 0x38,                     //   Usage (Wheel)
-        0x15, 0x81,                     //   Logical Minimum (-127)
-        0x25, 0x7F,                     //   Logical Maximum (127)
-        0x75, 0x08,                     //   Report Size (8),
-        0x95, 0x03,                     //   Report Count (3),
-        0x81, 0x06,                     //   Input (Data, Variable, Relative)
-        0xC0,                           // End Collection
-        0x05, 0x01,                     // Usage Page (Generic Desktop)
-        0x09, 0x02,                     // Usage (Mouse)
-        0xA1, 0x01,                     // Collection (Application)
-        0x85, 0x02,                     //   REPORT_ID (2)
-        0x05, 0x01,                     //   Usage Page (Generic Desktop)
-        0x09, 0x30,                     //   Usage (X)
-        0x09, 0x31,                     //   Usage (Y)
-        0x15, 0x00,                     //   Logical Minimum (0)
-        0x26, 0xFF, 0x7F,               //   Logical Maximum (32767)
-        0x75, 0x10,                     //   Report Size (16),
-        0x95, 0x02,                     //   Report Count (2),
-        0x81, 0x02,                     //   Input (Data, Variable, Absolute)
-        0xC0                            // End Collection
-};
-#endif
-
-#ifdef JOYSTICK_INTERFACE
-static uint8_t joystick_report_desc[] = {
-        0x05, 0x01,                     // Usage Page (Generic Desktop)
-        0x09, 0x04,                     // Usage (Joystick)
-        0xA1, 0x01,                     // Collection (Application)
-        0x15, 0x00,                     // Logical Minimum (0)
-        0x25, 0x01,                     // Logical Maximum (1)
-        0x75, 0x01,                     // Report Size (1)
-        0x95, 0x20,                     // Report Count (32)
-        0x05, 0x09,                     // Usage Page (Button)
-        0x19, 0x01,                     // Usage Minimum (Button #1)
-        0x29, 0x20,                     // Usage Maximum (Button #32)
-        0x81, 0x02,                     // Input (variable,absolute)
-        0x15, 0x00,                     // Logical Minimum (0)
-        0x25, 0x07,                     // Logical Maximum (7)
-        0x35, 0x00,                     // Physical Minimum (0)
-        0x46, 0x3B, 0x01,               // Physical Maximum (315)
-        0x75, 0x04,                     // Report Size (4)
-        0x95, 0x01,                     // Report Count (1)
-        0x65, 0x14,                     // Unit (20)
-        0x05, 0x01,                     // Usage Page (Generic Desktop)
-        0x09, 0x39,                     // Usage (Hat switch)
-        0x81, 0x42,                     // Input (variable,absolute,null_state)
-        0x05, 0x01,                     // Usage Page (Generic Desktop)
-        0x09, 0x01,                     // Usage (Pointer)
-        0xA1, 0x00,                     // Collection ()
-        0x15, 0x00,                     //   Logical Minimum (0)
-        0x26, 0xFF, 0x03,               //   Logical Maximum (1023)
-        0x75, 0x0A,                     //   Report Size (10)
-        0x95, 0x04,                     //   Report Count (4)
-        0x09, 0x30,                     //   Usage (X)
-        0x09, 0x31,                     //   Usage (Y)
-        0x09, 0x32,                     //   Usage (Z)
-        0x09, 0x35,                     //   Usage (Rz)
-        0x81, 0x02,                     //   Input (variable,absolute)
-        0xC0,                           // End Collection
-        0x15, 0x00,                     // Logical Minimum (0)
-        0x26, 0xFF, 0x03,               // Logical Maximum (1023)
-        0x75, 0x0A,                     // Report Size (10)
-        0x95, 0x02,                     // Report Count (2)
-        0x09, 0x36,                     // Usage (Slider)
-        0x09, 0x36,                     // Usage (Slider)
-        0x81, 0x02,                     // Input (variable,absolute)
-        0xC0                            // End Collection
-};
-#endif
-
-#ifdef SEREMU_INTERFACE
-static uint8_t seremu_report_desc[] = {
-        0x06, 0xC9, 0xFF,                       // Usage Page 0xFFC9 (vendor defined)
-        0x09, 0x04,                             // Usage 0x04
-        0xA1, 0x5C,                             // Collection 0x5C
-        0x75, 0x08,                             // report size = 8 bits (global)
-        0x15, 0x00,                             // logical minimum = 0 (global)
-        0x26, 0xFF, 0x00,                       // logical maximum = 255 (global)
-        0x95, SEREMU_TX_SIZE,                   // report count (global)
-        0x09, 0x75,                             // usage (local)
-        0x81, 0x02,                             // Input
-        0x95, SEREMU_RX_SIZE,                   // report count (global)
-        0x09, 0x76,                             // usage (local)
-        0x91, 0x02,                             // Output
-        0x95, 0x04,                             // report count (global)
-        0x09, 0x76,                             // usage (local)
-        0xB1, 0x02,                             // Feature
-        0xC0                                    // end collection
-};
-#endif
-
-#ifdef RAWHID_INTERFACE
-static uint8_t rawhid_report_desc[] = {
-        0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE),
-        0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
-        0xA1, 0x01,                             // Collection 0x01
-        0x75, 0x08,                             // report size = 8 bits
-        0x15, 0x00,                             // logical minimum = 0
-        0x26, 0xFF, 0x00,                       // logical maximum = 255
-        0x95, RAWHID_TX_SIZE,                   // report count
-        0x09, 0x01,                             // usage
-        0x81, 0x02,                             // Input (array)
-        0x95, RAWHID_RX_SIZE,                   // report count
-        0x09, 0x02,                             // usage
-        0x91, 0x02,                             // Output (array)
-        0xC0                                    // end collection
-};
-#endif
-
-#ifdef FLIGHTSIM_INTERFACE
-static uint8_t flightsim_report_desc[] = {
-        0x06, 0x1C, 0xFF,                       // Usage page = 0xFF1C
-        0x0A, 0x39, 0xA7,                       // Usage = 0xA739
-        0xA1, 0x01,                             // Collection 0x01
-        0x75, 0x08,                             // report size = 8 bits
-        0x15, 0x00,                             // logical minimum = 0
-        0x26, 0xFF, 0x00,                       // logical maximum = 255
-        0x95, FLIGHTSIM_TX_SIZE,                // report count
-        0x09, 0x01,                             // usage
-        0x81, 0x02,                             // Input (array)
-        0x95, FLIGHTSIM_RX_SIZE,                // report count
-        0x09, 0x02,                             // usage
-        0x91, 0x02,                             // Output (array)
-        0xC0                                    // end collection
-};
-#endif
-
-
-
-// **************************************************************
-//   USB Configuration
-// **************************************************************
-
-// USB Configuration Descriptor.  This huge descriptor tells all
-// of the devices capbilities.
-static uint8_t config_descriptor[CONFIG_DESC_SIZE] = {
-        // configuration descriptor, USB spec 9.6.3, page 264-266, Table 9-10
-        9,                                      // bLength;
-        2,                                      // bDescriptorType;
-        LSB(CONFIG_DESC_SIZE),                 // wTotalLength
-        MSB(CONFIG_DESC_SIZE),
-        NUM_INTERFACE,                          // bNumInterfaces
-        1,                                      // bConfigurationValue
-        0,                                      // iConfiguration
-        0xC0,                                   // bmAttributes
-        50,                                     // bMaxPower
-
-#ifdef CDC_IAD_DESCRIPTOR
-        // interface association descriptor, USB ECN, Table 9-Z
-        8,                                      // bLength
-        11,                                     // bDescriptorType
-        CDC_STATUS_INTERFACE,                   // bFirstInterface
-        2,                                      // bInterfaceCount
-        0x02,                                   // bFunctionClass
-        0x02,                                   // bFunctionSubClass
-        0x01,                                   // bFunctionProtocol
-        4,                                      // iFunction
-#endif
-
-#ifdef CDC_DATA_INTERFACE
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        CDC_STATUS_INTERFACE,			// bInterfaceNumber
-        0,                                      // bAlternateSetting
-        1,                                      // bNumEndpoints
-        0x02,                                   // bInterfaceClass
-        0x02,                                   // bInterfaceSubClass
-        0x01,                                   // bInterfaceProtocol
-        0,                                      // iInterface
-        // CDC Header Functional Descriptor, CDC Spec 5.2.3.1, Table 26
-        5,                                      // bFunctionLength
-        0x24,                                   // bDescriptorType
-        0x00,                                   // bDescriptorSubtype
-        0x10, 0x01,                             // bcdCDC
-        // Call Management Functional Descriptor, CDC Spec 5.2.3.2, Table 27
-        5,                                      // bFunctionLength
-        0x24,                                   // bDescriptorType
-        0x01,                                   // bDescriptorSubtype
-        0x01,                                   // bmCapabilities
-        1,                                      // bDataInterface
-        // Abstract Control Management Functional Descriptor, CDC Spec 5.2.3.3, Table 28
-        4,                                      // bFunctionLength
-        0x24,                                   // bDescriptorType
-        0x02,                                   // bDescriptorSubtype
-        0x06,                                   // bmCapabilities
-        // Union Functional Descriptor, CDC Spec 5.2.3.8, Table 33
-        5,                                      // bFunctionLength
-        0x24,                                   // bDescriptorType
-        0x06,                                   // bDescriptorSubtype
-        CDC_STATUS_INTERFACE,                   // bMasterInterface
-        CDC_DATA_INTERFACE,                     // bSlaveInterface0
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        CDC_ACM_ENDPOINT | 0x80,                // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        CDC_ACM_SIZE, 0,                        // wMaxPacketSize
-        64,                                     // bInterval
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        CDC_DATA_INTERFACE,                     // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        2,                                      // bNumEndpoints
-        0x0A,                                   // bInterfaceClass
-        0x00,                                   // bInterfaceSubClass
-        0x00,                                   // bInterfaceProtocol
-        0,                                      // iInterface
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        CDC_RX_ENDPOINT,                        // bEndpointAddress
-        0x02,                                   // bmAttributes (0x02=bulk)
-        CDC_RX_SIZE, 0,                         // wMaxPacketSize
-        0,                                      // bInterval
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        CDC_TX_ENDPOINT | 0x80,                 // bEndpointAddress
-        0x02,                                   // bmAttributes (0x02=bulk)
-        CDC_TX_SIZE, 0,                         // wMaxPacketSize
-        0,                                      // bInterval
-#endif // CDC_DATA_INTERFACE
-
-#ifdef MIDI_INTERFACE
-        // Standard MS Interface Descriptor,
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        MIDI_INTERFACE,                         // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        2,                                      // bNumEndpoints
-        0x01,                                   // bInterfaceClass (0x01 = Audio)
-        0x03,                                   // bInterfaceSubClass (0x03 = MIDI)
-        0x00,                                   // bInterfaceProtocol (unused for MIDI)
-        0,                                      // iInterface
-        // MIDI MS Interface Header, USB MIDI 6.1.2.1, page 21, Table 6-2
-        7,                                      // bLength
-        0x24,                                   // bDescriptorType = CS_INTERFACE
-        0x01,                                   // bDescriptorSubtype = MS_HEADER
-        0x00, 0x01,                             // bcdMSC = revision 01.00
-        0x41, 0x00,                             // wTotalLength
-        // MIDI IN Jack Descriptor, B.4.3, Table B-7 (embedded), page 40
-        6,                                      // bLength
-        0x24,                                   // bDescriptorType = CS_INTERFACE
-        0x02,                                   // bDescriptorSubtype = MIDI_IN_JACK
-        0x01,                                   // bJackType = EMBEDDED
-        1,                                      // bJackID, ID = 1
-        0,                                      // iJack
-        // MIDI IN Jack Descriptor, B.4.3, Table B-8 (external), page 40
-        6,                                      // bLength
-        0x24,                                   // bDescriptorType = CS_INTERFACE
-        0x02,                                   // bDescriptorSubtype = MIDI_IN_JACK
-        0x02,                                   // bJackType = EXTERNAL
-        2,                                      // bJackID, ID = 2
-        0,                                      // iJack
-        // MIDI OUT Jack Descriptor, B.4.4, Table B-9, page 41
-        9,
-        0x24,                                   // bDescriptorType = CS_INTERFACE
-        0x03,                                   // bDescriptorSubtype = MIDI_OUT_JACK
-        0x01,                                   // bJackType = EMBEDDED
-        3,                                      // bJackID, ID = 3
-        1,                                      // bNrInputPins = 1 pin
-        2,                                      // BaSourceID(1) = 2
-        1,                                      // BaSourcePin(1) = first pin
-        0,                                      // iJack
-        // MIDI OUT Jack Descriptor, B.4.4, Table B-10, page 41
-        9,
-        0x24,                                   // bDescriptorType = CS_INTERFACE
-        0x03,                                   // bDescriptorSubtype = MIDI_OUT_JACK
-        0x02,                                   // bJackType = EXTERNAL
-        4,                                      // bJackID, ID = 4
-        1,                                      // bNrInputPins = 1 pin
-        1,                                      // BaSourceID(1) = 1
-        1,                                      // BaSourcePin(1) = first pin
-        0,                                      // iJack
-        // Standard Bulk OUT Endpoint Descriptor, B.5.1, Table B-11, pae 42
-        9,                                      // bLength
-        5,                                      // bDescriptorType = ENDPOINT
-        MIDI_RX_ENDPOINT,                       // bEndpointAddress
-        0x02,                                   // bmAttributes (0x02=bulk)
-        MIDI_RX_SIZE, 0,                        // wMaxPacketSize
-        0,                                      // bInterval
-        0,                                      // bRefresh
-        0,                                      // bSynchAddress
-        // Class-specific MS Bulk OUT Endpoint Descriptor, B.5.2, Table B-12, page 42
-        5,                                      // bLength
-        0x25,                                   // bDescriptorSubtype = CS_ENDPOINT
-        0x01,                                   // bJackType = MS_GENERAL
-        1,                                      // bNumEmbMIDIJack = 1 jack
-        1,                                      // BaAssocJackID(1) = jack ID #1
-        // Standard Bulk IN Endpoint Descriptor, B.5.1, Table B-11, pae 42
-        9,                                      // bLength
-        5,                                      // bDescriptorType = ENDPOINT
-        MIDI_TX_ENDPOINT | 0x80,                // bEndpointAddress
-        0x02,                                   // bmAttributes (0x02=bulk)
-        MIDI_TX_SIZE, 0,                        // wMaxPacketSize
-        0,                                      // bInterval
-        0,                                      // bRefresh
-        0,                                      // bSynchAddress
-        // Class-specific MS Bulk IN Endpoint Descriptor, B.5.2, Table B-12, page 42
-        5,                                      // bLength
-        0x25,                                   // bDescriptorSubtype = CS_ENDPOINT
-        0x01,                                   // bJackType = MS_GENERAL
-        1,                                      // bNumEmbMIDIJack = 1 jack
-        3,                                      // BaAssocJackID(1) = jack ID #3
-#endif // MIDI_INTERFACE
-
-#ifdef KEYBOARD_INTERFACE
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        KEYBOARD_INTERFACE,                     // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        1,                                      // bNumEndpoints
-        0x03,                                   // bInterfaceClass (0x03 = HID)
-        0x01,                                   // bInterfaceSubClass (0x01 = Boot)
-        0x01,                                   // bInterfaceProtocol (0x01 = Keyboard)
-        0,                                      // iInterface
-        // HID interface descriptor, HID 1.11 spec, section 6.2.1
-        9,                                      // bLength
-        0x21,                                   // bDescriptorType
-        0x11, 0x01,                             // bcdHID
-        0,                                      // bCountryCode
-        1,                                      // bNumDescriptors
-        0x22,                                   // bDescriptorType
-        LSB(sizeof(keyboard_report_desc)),      // wDescriptorLength
-        MSB(sizeof(keyboard_report_desc)),
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        KEYBOARD_ENDPOINT | 0x80,               // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        KEYBOARD_SIZE, 0,                       // wMaxPacketSize
-        KEYBOARD_INTERVAL,                      // bInterval
-#endif // KEYBOARD_INTERFACE
-
-#ifdef MOUSE_INTERFACE
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        MOUSE_INTERFACE,                        // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        1,                                      // bNumEndpoints
-        0x03,                                   // bInterfaceClass (0x03 = HID)
-        0x00,                                   // bInterfaceSubClass (0x01 = Boot)
-        0x00,                                   // bInterfaceProtocol (0x02 = Mouse)
-        0,                                      // iInterface
-        // HID interface descriptor, HID 1.11 spec, section 6.2.1
-        9,                                      // bLength
-        0x21,                                   // bDescriptorType
-        0x11, 0x01,                             // bcdHID
-        0,                                      // bCountryCode
-        1,                                      // bNumDescriptors
-        0x22,                                   // bDescriptorType
-        LSB(sizeof(mouse_report_desc)),         // wDescriptorLength
-        MSB(sizeof(mouse_report_desc)),
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        MOUSE_ENDPOINT | 0x80,                  // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        MOUSE_SIZE, 0,                          // wMaxPacketSize
-        MOUSE_INTERVAL,                         // bInterval
-#endif // MOUSE_INTERFACE
-
-#ifdef RAWHID_INTERFACE
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        RAWHID_INTERFACE,                       // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        2,                                      // bNumEndpoints
-        0x03,                                   // bInterfaceClass (0x03 = HID)
-        0x00,                                   // bInterfaceSubClass
-        0x00,                                   // bInterfaceProtocol
-        0,                                      // iInterface
-        // HID interface descriptor, HID 1.11 spec, section 6.2.1
-        9,                                      // bLength
-        0x21,                                   // bDescriptorType
-        0x11, 0x01,                             // bcdHID
-        0,                                      // bCountryCode
-        1,                                      // bNumDescriptors
-        0x22,                                   // bDescriptorType
-        LSB(sizeof(rawhid_report_desc)),        // wDescriptorLength
-        MSB(sizeof(rawhid_report_desc)),
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        RAWHID_TX_ENDPOINT | 0x80,              // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        RAWHID_TX_SIZE, 0,                      // wMaxPacketSize
-        RAWHID_TX_INTERVAL,                     // bInterval
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        RAWHID_RX_ENDPOINT,                     // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        RAWHID_RX_SIZE, 0,                      // wMaxPacketSize
-        RAWHID_RX_INTERVAL,			// bInterval
-#endif // RAWHID_INTERFACE
-
-#ifdef FLIGHTSIM_INTERFACE
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        FLIGHTSIM_INTERFACE,                    // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        2,                                      // bNumEndpoints
-        0x03,                                   // bInterfaceClass (0x03 = HID)
-        0x00,                                   // bInterfaceSubClass
-        0x00,                                   // bInterfaceProtocol
-        0,                                      // iInterface
-        // HID interface descriptor, HID 1.11 spec, section 6.2.1
-        9,                                      // bLength
-        0x21,                                   // bDescriptorType
-        0x11, 0x01,                             // bcdHID
-        0,                                      // bCountryCode
-        1,                                      // bNumDescriptors
-        0x22,                                   // bDescriptorType
-        LSB(sizeof(flightsim_report_desc)),     // wDescriptorLength
-        MSB(sizeof(flightsim_report_desc)),
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        FLIGHTSIM_TX_ENDPOINT | 0x80,           // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        FLIGHTSIM_TX_SIZE, 0,                   // wMaxPacketSize
-        FLIGHTSIM_TX_INTERVAL,                  // bInterval
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        FLIGHTSIM_RX_ENDPOINT,                  // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        FLIGHTSIM_RX_SIZE, 0,                   // wMaxPacketSize
-        FLIGHTSIM_RX_INTERVAL,			// bInterval
-#endif // FLIGHTSIM_INTERFACE
-
-#ifdef SEREMU_INTERFACE
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        SEREMU_INTERFACE,                       // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        2,                                      // bNumEndpoints
-        0x03,                                   // bInterfaceClass (0x03 = HID)
-        0x00,                                   // bInterfaceSubClass
-        0x00,                                   // bInterfaceProtocol
-        0,                                      // iInterface
-        // HID interface descriptor, HID 1.11 spec, section 6.2.1
-        9,                                      // bLength
-        0x21,                                   // bDescriptorType
-        0x11, 0x01,                             // bcdHID
-        0,                                      // bCountryCode
-        1,                                      // bNumDescriptors
-        0x22,                                   // bDescriptorType
-        LSB(sizeof(seremu_report_desc)),        // wDescriptorLength
-        MSB(sizeof(seremu_report_desc)),
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        SEREMU_TX_ENDPOINT | 0x80,              // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        SEREMU_TX_SIZE, 0,                      // wMaxPacketSize
-        SEREMU_TX_INTERVAL,                     // bInterval
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        SEREMU_RX_ENDPOINT,                     // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        SEREMU_RX_SIZE, 0,                      // wMaxPacketSize
-        SEREMU_RX_INTERVAL,			// bInterval
-#endif // SEREMU_INTERFACE
-
-#ifdef JOYSTICK_INTERFACE
-        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-        9,                                      // bLength
-        4,                                      // bDescriptorType
-        JOYSTICK_INTERFACE,                     // bInterfaceNumber
-        0,                                      // bAlternateSetting
-        1,                                      // bNumEndpoints
-        0x03,                                   // bInterfaceClass (0x03 = HID)
-        0x00,                                   // bInterfaceSubClass
-        0x00,                                   // bInterfaceProtocol
-        0,                                      // iInterface
-        // HID interface descriptor, HID 1.11 spec, section 6.2.1
-        9,                                      // bLength
-        0x21,                                   // bDescriptorType
-        0x11, 0x01,                             // bcdHID
-        0,                                      // bCountryCode
-        1,                                      // bNumDescriptors
-        0x22,                                   // bDescriptorType
-        LSB(sizeof(joystick_report_desc)),      // wDescriptorLength
-        MSB(sizeof(joystick_report_desc)),
-        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-        7,                                      // bLength
-        5,                                      // bDescriptorType
-        JOYSTICK_ENDPOINT | 0x80,               // bEndpointAddress
-        0x03,                                   // bmAttributes (0x03=intr)
-        JOYSTICK_SIZE, 0,                       // wMaxPacketSize
-        JOYSTICK_INTERVAL,                      // bInterval
-#endif // JOYSTICK_INTERFACE
-
-};
-
-
-// **************************************************************
-//   String Descriptors
-// **************************************************************
-
-// The descriptors above can provide human readable strings,
-// referenced by index numbers.  These descriptors are the
-// actual string data
-
-/* defined in usb_names.h
-struct usb_string_descriptor_struct {
-        uint8_t bLength;
-        uint8_t bDescriptorType;
-        uint16_t wString[];
-};
-*/
-
-extern struct usb_string_descriptor_struct usb_string_manufacturer_name
-        __attribute__ ((weak, alias("usb_string_manufacturer_name_default")));
-extern struct usb_string_descriptor_struct usb_string_product_name
-        __attribute__ ((weak, alias("usb_string_product_name_default")));
-extern struct usb_string_descriptor_struct usb_string_serial_number
-        __attribute__ ((weak, alias("usb_string_serial_number_default")));
-
-struct usb_string_descriptor_struct string0 = {
-        4,
-        3,
-        {0x0409}
-};
-
-struct usb_string_descriptor_struct usb_string_manufacturer_name_default = {
-        2 + MANUFACTURER_NAME_LEN * 2,
-        3,
-        MANUFACTURER_NAME
-};
-struct usb_string_descriptor_struct usb_string_product_name_default = {
-	2 + PRODUCT_NAME_LEN * 2,
-        3,
-        PRODUCT_NAME
-};
-struct usb_string_descriptor_struct usb_string_serial_number_default = {
-        12,
-        3,
-        {0,0,0,0,0,0,0,0,0,0}
-};
-
-void usb_init_serialnumber(void)
-{
-	char buf[11];
-	uint32_t i, num;
-
-	__disable_irq();
-	FTFL_FSTAT = FTFL_FSTAT_RDCOLERR | FTFL_FSTAT_ACCERR | FTFL_FSTAT_FPVIOL;
-	FTFL_FCCOB0 = 0x41;
-	FTFL_FCCOB1 = 15;
-	FTFL_FSTAT = FTFL_FSTAT_CCIF;
-	while (!(FTFL_FSTAT & FTFL_FSTAT_CCIF)) ; // wait
-	num = *(uint32_t *)&FTFL_FCCOB7;
-	__enable_irq();
-	// add extra zero to work around OS-X CDC-ACM driver bug
-	if (num < 10000000) num = num * 10;
-	ultoa(num, buf, 10);
-	for (i=0; i<10; i++) {
-		char c = buf[i];
-		if (!c) break;
-		usb_string_serial_number_default.wString[i] = c;
-	}
-	usb_string_serial_number_default.bLength = i * 2 + 2;
-}
-
-
-// **************************************************************
-//   Descriptors List
-// **************************************************************
-
-// This table provides access to all the descriptor data above.
-
-const usb_descriptor_list_t usb_descriptor_list[] = {
-	//wValue, wIndex, address,          length
-	{0x0100, 0x0000, device_descriptor, sizeof(device_descriptor)},
-	{0x0200, 0x0000, config_descriptor, sizeof(config_descriptor)},
-#ifdef SEREMU_INTERFACE
-	{0x2200, SEREMU_INTERFACE, seremu_report_desc, sizeof(seremu_report_desc)},
-	{0x2100, SEREMU_INTERFACE, config_descriptor+SEREMU_DESC_OFFSET, 9},
-#endif
-#ifdef KEYBOARD_INTERFACE
-        {0x2200, KEYBOARD_INTERFACE, keyboard_report_desc, sizeof(keyboard_report_desc)},
-        {0x2100, KEYBOARD_INTERFACE, config_descriptor+KEYBOARD_DESC_OFFSET, 9},
-#endif
-#ifdef MOUSE_INTERFACE
-        {0x2200, MOUSE_INTERFACE, mouse_report_desc, sizeof(mouse_report_desc)},
-        {0x2100, MOUSE_INTERFACE, config_descriptor+MOUSE_DESC_OFFSET, 9},
-#endif
-#ifdef JOYSTICK_INTERFACE
-        {0x2200, JOYSTICK_INTERFACE, joystick_report_desc, sizeof(joystick_report_desc)},
-        {0x2100, JOYSTICK_INTERFACE, config_descriptor+JOYSTICK_DESC_OFFSET, 9},
-#endif
-#ifdef RAWHID_INTERFACE
-	{0x2200, RAWHID_INTERFACE, rawhid_report_desc, sizeof(rawhid_report_desc)},
-	{0x2100, RAWHID_INTERFACE, config_descriptor+RAWHID_DESC_OFFSET, 9},
-#endif
-#ifdef FLIGHTSIM_INTERFACE
-	{0x2200, FLIGHTSIM_INTERFACE, flightsim_report_desc, sizeof(flightsim_report_desc)},
-	{0x2100, FLIGHTSIM_INTERFACE, config_descriptor+FLIGHTSIM_DESC_OFFSET, 9},
-#endif
-        {0x0300, 0x0000, (const uint8_t *)&string0, 0},
-        {0x0301, 0x0409, (const uint8_t *)&usb_string_manufacturer_name, 0},
-        {0x0302, 0x0409, (const uint8_t *)&usb_string_product_name, 0},
-        {0x0303, 0x0409, (const uint8_t *)&usb_string_serial_number, 0},
-        //{0x0301, 0x0409, (const uint8_t *)&string1, 0},
-        //{0x0302, 0x0409, (const uint8_t *)&string2, 0},
-        //{0x0303, 0x0409, (const uint8_t *)&string3, 0},
-	{0, 0, NULL, 0}
-};
-
-
-// **************************************************************
-//   Endpoint Configuration
-// **************************************************************
-
-#if 0
-// 0x00 = not used
-// 0x19 = Receive only
-// 0x15 = Transmit only
-// 0x1D = Transmit & Receive
-//
-const uint8_t usb_endpoint_config_table[NUM_ENDPOINTS] =
-{
-	0x00, 0x15, 0x19, 0x15, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-#endif
-
-
-const uint8_t usb_endpoint_config_table[NUM_ENDPOINTS] =
-{
-#if (defined(ENDPOINT1_CONFIG) && NUM_ENDPOINTS >= 1)
-	ENDPOINT1_CONFIG,
-#elif (NUM_ENDPOINTS >= 1)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT2_CONFIG) && NUM_ENDPOINTS >= 2)
-	ENDPOINT2_CONFIG,
-#elif (NUM_ENDPOINTS >= 2)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT3_CONFIG) && NUM_ENDPOINTS >= 3)
-	ENDPOINT3_CONFIG,
-#elif (NUM_ENDPOINTS >= 3)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT4_CONFIG) && NUM_ENDPOINTS >= 4)
-	ENDPOINT4_CONFIG,
-#elif (NUM_ENDPOINTS >= 4)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT5_CONFIG) && NUM_ENDPOINTS >= 5)
-	ENDPOINT5_CONFIG,
-#elif (NUM_ENDPOINTS >= 5)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT6_CONFIG) && NUM_ENDPOINTS >= 6)
-	ENDPOINT6_CONFIG,
-#elif (NUM_ENDPOINTS >= 6)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT7_CONFIG) && NUM_ENDPOINTS >= 7)
-	ENDPOINT7_CONFIG,
-#elif (NUM_ENDPOINTS >= 7)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT8_CONFIG) && NUM_ENDPOINTS >= 8)
-	ENDPOINT8_CONFIG,
-#elif (NUM_ENDPOINTS >= 8)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT9_CONFIG) && NUM_ENDPOINTS >= 9)
-	ENDPOINT9_CONFIG,
-#elif (NUM_ENDPOINTS >= 9)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT10_CONFIG) && NUM_ENDPOINTS >= 10)
-	ENDPOINT10_CONFIG,
-#elif (NUM_ENDPOINTS >= 10)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT11_CONFIG) && NUM_ENDPOINTS >= 11)
-	ENDPOINT11_CONFIG,
-#elif (NUM_ENDPOINTS >= 11)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT12_CONFIG) && NUM_ENDPOINTS >= 12)
-	ENDPOINT12_CONFIG,
-#elif (NUM_ENDPOINTS >= 12)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT13_CONFIG) && NUM_ENDPOINTS >= 13)
-	ENDPOINT13_CONFIG,
-#elif (NUM_ENDPOINTS >= 13)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT14_CONFIG) && NUM_ENDPOINTS >= 14)
-	ENDPOINT14_CONFIG,
-#elif (NUM_ENDPOINTS >= 14)
-	ENDPOINT_UNUSED,
-#endif
-#if (defined(ENDPOINT15_CONFIG) && NUM_ENDPOINTS >= 15)
-	ENDPOINT15_CONFIG,
-#elif (NUM_ENDPOINTS >= 15)
-	ENDPOINT_UNUSED,
-#endif
-};
-
-
-
-#endif // F_CPU >= 20 MHz
diff --git a/ports/teensy/core/usb_desc.h b/ports/teensy/core/usb_desc.h
deleted file mode 100644
index 49ecf86aebe2e..0000000000000
--- a/ports/teensy/core/usb_desc.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 _usb_desc_h_
-#define _usb_desc_h_
-
-#if F_CPU >= 20000000
-
-// This header is NOT meant to be included when compiling
-// user sketches in Arduino.  The low-level functions
-// provided by usb_dev.c are meant to be called only by
-// code which provides higher-level interfaces to the user.
-
-#include <stdint.h>
-#include <stddef.h>
-
-#define ENDPOINT_UNUSED			0x00
-#define ENDPOINT_TRANSIMIT_ONLY		0x15
-#define ENDPOINT_RECEIVE_ONLY		0x19
-#define ENDPOINT_TRANSMIT_AND_RECEIVE	0x1D
-
-/*
-To modify a USB Type to have different interfaces, start in this
-file.  Delete the XYZ_INTERFACE lines for any interfaces you
-wish to remove, and copy them from another USB Type for any you
-want to add.
-
-Give each interface a unique number, and edit NUM_INTERFACE to
-reflect the number of interfaces.
-
-Within each interface, make sure it uses a unique set of endpoints.
-Edit NUM_ENDPOINTS to be at least the largest endpoint number used.
-Then edit the ENDPOINT*_CONFIG lines so each endpoint is configured
-the proper way (transmit, receive, or both).
-
-The CONFIG_DESC_SIZE and any XYZ_DESC_OFFSET numbers must be
-edited to the correct sizes.  See usb_desc.c for the giant array
-of bytes.  Someday these may be done automatically..... (but how?)
-
-If you are using existing interfaces, the code in each file should
-automatically adapt to the changes you specify.  If you need to
-create a new type of interface, you'll need to write the code which
-sends and receives packets, and presents an API to the user.
-
-Finally, edit usb_inst.cpp, which creates instances of the C++
-objects for each combination.
-
-Some operating systems, especially Windows, may cache USB device
-info.  Changes to the device name may not update on the same
-computer unless the vendor or product ID numbers change, or the
-"bcdDevice" revision code is increased.
-
-If these instructions are missing steps or could be improved, please
-let me know?  http://forum.pjrc.com/forums/4-Suggestions-amp-Bug-Reports
-*/
-
-
-
-#if defined(USB_SERIAL)
-  #define VENDOR_ID		0x16C0
-  #define PRODUCT_ID		0x0483
-  #define DEVICE_CLASS		2	// 2 = Communication Class
-  #define MANUFACTURER_NAME	{'T','e','e','n','s','y','d','u','i','n','o'}
-  #define MANUFACTURER_NAME_LEN	11
-  #define PRODUCT_NAME		{'U','S','B',' ','S','e','r','i','a','l'}
-  #define PRODUCT_NAME_LEN	10
-  #define EP0_SIZE		64
-  #define NUM_ENDPOINTS		4
-  #define NUM_USB_BUFFERS	12
-  #define NUM_INTERFACE		2
-  #define CDC_STATUS_INTERFACE	0
-  #define CDC_DATA_INTERFACE	1
-  #define CDC_ACM_ENDPOINT	2
-  #define CDC_RX_ENDPOINT       3
-  #define CDC_TX_ENDPOINT       4
-  #define CDC_ACM_SIZE          16
-  #define CDC_RX_SIZE           64
-  #define CDC_TX_SIZE           64
-  #define CONFIG_DESC_SIZE	(9+9+5+5+4+5+7+9+7+7)
-  #define ENDPOINT2_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT3_CONFIG	ENDPOINT_RECEIVE_ONLY
-  #define ENDPOINT4_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-
-#elif defined(USB_HID)
-  #define VENDOR_ID		0x16C0
-  #define PRODUCT_ID		0x0482
-  #define MANUFACTURER_NAME	{'T','e','e','n','s','y','d','u','i','n','o'}
-  #define MANUFACTURER_NAME_LEN	11
-  #define PRODUCT_NAME		{'K','e','y','b','o','a','r','d','/','M','o','u','s','e','/','J','o','y','s','t','i','c','k'}
-  #define PRODUCT_NAME_LEN	23
-  #define EP0_SIZE		64
-  #define NUM_ENDPOINTS         5
-  #define NUM_USB_BUFFERS	24
-  #define NUM_INTERFACE		4
-  #define SEREMU_INTERFACE      2	// Serial emulation
-  #define SEREMU_TX_ENDPOINT    1
-  #define SEREMU_TX_SIZE        64
-  #define SEREMU_TX_INTERVAL    1
-  #define SEREMU_RX_ENDPOINT    2
-  #define SEREMU_RX_SIZE        32
-  #define SEREMU_RX_INTERVAL    2
-  #define KEYBOARD_INTERFACE    0	// Keyboard
-  #define KEYBOARD_ENDPOINT     3
-  #define KEYBOARD_SIZE         8
-  #define KEYBOARD_INTERVAL     1
-  #define MOUSE_INTERFACE       1	// Mouse
-  #define MOUSE_ENDPOINT        5
-  #define MOUSE_SIZE            8
-  #define MOUSE_INTERVAL        1
-  #define JOYSTICK_INTERFACE    3	// Joystick
-  #define JOYSTICK_ENDPOINT     4
-  #define JOYSTICK_SIZE         16
-  #define JOYSTICK_INTERVAL     2
-  #define KEYBOARD_DESC_OFFSET	(9 + 9)
-  #define MOUSE_DESC_OFFSET	(9 + 9+9+7 + 9)
-  #define SEREMU_DESC_OFFSET	(9 + 9+9+7 + 9+9+7 + 9)
-  #define JOYSTICK_DESC_OFFSET	(9 + 9+9+7 + 9+9+7 + 9+9+7+7 + 9)
-  #define CONFIG_DESC_SIZE	(9 + 9+9+7 + 9+9+7 + 9+9+7+7 + 9+9+7)
-  #define ENDPOINT1_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT2_CONFIG	ENDPOINT_RECEIVE_ONLY
-  #define ENDPOINT3_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT4_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT5_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-
-#elif defined(USB_SERIAL_HID)
-  #define VENDOR_ID		0x16C0
-  #define PRODUCT_ID		0x0487
-  #define DEVICE_CLASS		0xEF
-  #define DEVICE_SUBCLASS	0x02
-  #define DEVICE_PROTOCOL	0x01
-  #define MANUFACTURER_NAME	{'T','e','e','n','s','y','d','u','i','n','o'}
-  #define MANUFACTURER_NAME_LEN	11
-  #define PRODUCT_NAME		{'S','e','r','i','a','l','/','K','e','y','b','o','a','r','d','/','M','o','u','s','e','/','J','o','y','s','t','i','c','k'}
-  #define PRODUCT_NAME_LEN	30
-  #define EP0_SIZE		64
-  #define NUM_ENDPOINTS		6
-  #define NUM_USB_BUFFERS	30
-  #define NUM_INTERFACE		5
-  #define CDC_IAD_DESCRIPTOR	1
-  #define CDC_STATUS_INTERFACE	0
-  #define CDC_DATA_INTERFACE	1	// Serial
-  #define CDC_ACM_ENDPOINT	2
-  #define CDC_RX_ENDPOINT       3
-  #define CDC_TX_ENDPOINT       4
-  #define CDC_ACM_SIZE          16
-  #define CDC_RX_SIZE           64
-  #define CDC_TX_SIZE           64
-  #define KEYBOARD_INTERFACE    2	// Keyboard
-  #define KEYBOARD_ENDPOINT     1
-  #define KEYBOARD_SIZE         8
-  #define KEYBOARD_INTERVAL     1
-  #define MOUSE_INTERFACE       3	// Mouse
-  #define MOUSE_ENDPOINT        5
-  #define MOUSE_SIZE            8
-  #define MOUSE_INTERVAL        2
-  #define JOYSTICK_INTERFACE    4	// Joystick
-  #define JOYSTICK_ENDPOINT     6
-  #define JOYSTICK_SIZE         16
-  #define JOYSTICK_INTERVAL     1
-  #define KEYBOARD_DESC_OFFSET	(9+8 + 9+5+5+4+5+7+9+7+7 + 9)
-  #define MOUSE_DESC_OFFSET	(9+8 + 9+5+5+4+5+7+9+7+7 + 9+9+7 + 9)
-  #define JOYSTICK_DESC_OFFSET	(9+8 + 9+5+5+4+5+7+9+7+7 + 9+9+7 + 9+9+7 + 9)
-  #define CONFIG_DESC_SIZE	(9+8 + 9+5+5+4+5+7+9+7+7 + 9+9+7 + 9+9+7 + 9+9+7)
-  #define ENDPOINT1_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT2_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT3_CONFIG	ENDPOINT_RECEIVE_ONLY
-  #define ENDPOINT4_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT5_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT6_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-
-#elif defined(USB_MIDI)
-  #define VENDOR_ID		0x16C0
-  #define PRODUCT_ID		0x0485
-  #define MANUFACTURER_NAME	{'T','e','e','n','s','y','d','u','i','n','o'}
-  #define MANUFACTURER_NAME_LEN	11
-  #define PRODUCT_NAME		{'T','e','e','n','s','y',' ','M','I','D','I'}
-  #define PRODUCT_NAME_LEN	11
-  #define EP0_SIZE		64
-  #define NUM_ENDPOINTS         4
-  #define NUM_USB_BUFFERS	16
-  #define NUM_INTERFACE		2
-  #define SEREMU_INTERFACE      1	// Serial emulation
-  #define SEREMU_TX_ENDPOINT    1
-  #define SEREMU_TX_SIZE        64
-  #define SEREMU_TX_INTERVAL    1
-  #define SEREMU_RX_ENDPOINT    2
-  #define SEREMU_RX_SIZE        32
-  #define SEREMU_RX_INTERVAL    2
-  #define MIDI_INTERFACE        0	// MIDI
-  #define MIDI_TX_ENDPOINT      3
-  #define MIDI_TX_SIZE          64
-  #define MIDI_RX_ENDPOINT      4
-  #define MIDI_RX_SIZE          64
-  #define SEREMU_DESC_OFFSET	(9 + 9+7+6+6+9+9+9+5+9+5 + 9)
-  #define CONFIG_DESC_SIZE	(9 + 9+7+6+6+9+9+9+5+9+5 + 9+9+7+7)
-  #define ENDPOINT1_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT2_CONFIG	ENDPOINT_RECEIVE_ONLY
-  #define ENDPOINT3_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT4_CONFIG	ENDPOINT_RECEIVE_ONLY
-
-#elif defined(USB_RAWHID)
-  #define VENDOR_ID		0x16C0
-  #define PRODUCT_ID		0x0486
-  #define RAWHID_USAGE_PAGE	0xFFAB  // recommended: 0xFF00 to 0xFFFF
-  #define RAWHID_USAGE		0x0200  // recommended: 0x0100 to 0xFFFF
-  #define MANUFACTURER_NAME	{'T','e','e','n','s','y','d','u','i','n','o'}
-  #define MANUFACTURER_NAME_LEN	11
-  #define PRODUCT_NAME		{'T','e','e','n','s','y','d','u','i','n','o',' ','R','a','w','H','I','D'}
-  #define PRODUCT_NAME_LEN	18
-  #define EP0_SIZE		64
-  #define NUM_ENDPOINTS         6
-  #define NUM_USB_BUFFERS	12
-  #define NUM_INTERFACE		2
-  #define RAWHID_INTERFACE      0	// RawHID
-  #define RAWHID_TX_ENDPOINT    3
-  #define RAWHID_TX_SIZE        64
-  #define RAWHID_TX_INTERVAL    1
-  #define RAWHID_RX_ENDPOINT    4
-  #define RAWHID_RX_SIZE        64
-  #define RAWHID_RX_INTERVAL    1
-  #define SEREMU_INTERFACE      1	// Serial emulation
-  #define SEREMU_TX_ENDPOINT    1
-  #define SEREMU_TX_SIZE        64
-  #define SEREMU_TX_INTERVAL    1
-  #define SEREMU_RX_ENDPOINT    2
-  #define SEREMU_RX_SIZE        32
-  #define SEREMU_RX_INTERVAL    2
-  #define RAWHID_DESC_OFFSET	(9 + 9)
-  #define SEREMU_DESC_OFFSET	(9 + 9+9+7+7 + 9)
-  #define CONFIG_DESC_SIZE	(9 + 9+9+7+7 + 9+9+7+7)
-  #define ENDPOINT1_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT2_CONFIG	ENDPOINT_RECEIVE_ONLY
-  #define ENDPOINT3_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT4_CONFIG	ENDPOINT_RECEIVE_ONLY
-
-#elif defined(USB_FLIGHTSIM)
-  #define VENDOR_ID		0x16C0
-  #define PRODUCT_ID		0x0488
-  #define MANUFACTURER_NAME	{'T','e','e','n','s','y','d','u','i','n','o'}
-  #define MANUFACTURER_NAME_LEN	11
-  #define PRODUCT_NAME		{'T','e','e','n','s','y',' ','F','l','i','g','h','t',' ','S','i','m',' ','C','o','n','t','r','o','l','s'}
-  #define PRODUCT_NAME_LEN	26
-  #define EP0_SIZE		64
-  #define NUM_ENDPOINTS         4
-  #define NUM_USB_BUFFERS	20
-  #define NUM_INTERFACE		2
-  #define FLIGHTSIM_INTERFACE	0	// Flight Sim Control
-  #define FLIGHTSIM_TX_ENDPOINT	3
-  #define FLIGHTSIM_TX_SIZE	64
-  #define FLIGHTSIM_TX_INTERVAL	1
-  #define FLIGHTSIM_RX_ENDPOINT	4
-  #define FLIGHTSIM_RX_SIZE	64
-  #define FLIGHTSIM_RX_INTERVAL	1
-  #define SEREMU_INTERFACE      1	// Serial emulation
-  #define SEREMU_TX_ENDPOINT    1
-  #define SEREMU_TX_SIZE        64
-  #define SEREMU_TX_INTERVAL    1
-  #define SEREMU_RX_ENDPOINT    2
-  #define SEREMU_RX_SIZE        32
-  #define SEREMU_RX_INTERVAL    2
-  #define FLIGHTSIM_DESC_OFFSET	(9 + 9)
-  #define SEREMU_DESC_OFFSET	(9 + 9+9+7+7 + 9)
-  #define CONFIG_DESC_SIZE	(9 + 9+9+7+7 + 9+9+7+7)
-  #define ENDPOINT1_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT2_CONFIG	ENDPOINT_RECEIVE_ONLY
-  #define ENDPOINT3_CONFIG	ENDPOINT_TRANSIMIT_ONLY
-  #define ENDPOINT4_CONFIG	ENDPOINT_RECEIVE_ONLY
-
-#endif
-
-// NUM_ENDPOINTS = number of non-zero endpoints (0 to 15)
-extern const uint8_t usb_endpoint_config_table[NUM_ENDPOINTS];
-
-typedef struct {
-	uint16_t	wValue;
-	uint16_t	wIndex;
-	const uint8_t	*addr;
-	uint16_t	length;
-} usb_descriptor_list_t;
-
-extern const usb_descriptor_list_t usb_descriptor_list[];
-
-
-#endif // F_CPU >= 20 MHz
-
-#endif
diff --git a/ports/teensy/core/usb_dev.c b/ports/teensy/core/usb_dev.c
deleted file mode 100644
index 6cf85d3fd3984..0000000000000
--- a/ports/teensy/core/usb_dev.c
+++ /dev/null
@@ -1,980 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 F_CPU >= 20000000
-
-#include "mk20dx128.h"
-//#include "HardwareSerial.h"
-#include "usb_dev.h"
-#include "usb_mem.h"
-
-// buffer descriptor table
-
-typedef struct {
-	uint32_t desc;
-	void * addr;
-} bdt_t;
-
-__attribute__ ((section(".usbdescriptortable"), used))
-static bdt_t table[(NUM_ENDPOINTS+1)*4];
-
-static usb_packet_t *rx_first[NUM_ENDPOINTS];
-static usb_packet_t *rx_last[NUM_ENDPOINTS];
-static usb_packet_t *tx_first[NUM_ENDPOINTS];
-static usb_packet_t *tx_last[NUM_ENDPOINTS];
-uint16_t usb_rx_byte_count_data[NUM_ENDPOINTS];
-
-static uint8_t tx_state[NUM_ENDPOINTS];
-#define TX_STATE_BOTH_FREE_EVEN_FIRST	0
-#define TX_STATE_BOTH_FREE_ODD_FIRST	1
-#define TX_STATE_EVEN_FREE		2
-#define TX_STATE_ODD_FREE		3
-#define TX_STATE_NONE_FREE_EVEN_FIRST	4
-#define TX_STATE_NONE_FREE_ODD_FIRST	5
-
-#define BDT_OWN		0x80
-#define BDT_DATA1	0x40
-#define BDT_DATA0	0x00
-#define BDT_DTS		0x08
-#define BDT_STALL	0x04
-#define BDT_PID(n)	(((n) >> 2) & 15)
-
-#define BDT_DESC(count, data)	(BDT_OWN | BDT_DTS \
-				| ((data) ? BDT_DATA1 : BDT_DATA0) \
-				| ((count) << 16))
-
-#define TX   1
-#define RX   0
-#define ODD  1
-#define EVEN 0
-#define DATA0 0
-#define DATA1 1
-#define index(endpoint, tx, odd) (((endpoint) << 2) | ((tx) << 1) | (odd))
-#define stat2bufferdescriptor(stat) (table + ((stat) >> 2))
-
-
-static union {
- struct {
-  union {
-   struct {
-	uint8_t bmRequestType;
-	uint8_t bRequest;
-   };
-	uint16_t wRequestAndType;
-  };
-	uint16_t wValue;
-	uint16_t wIndex;
-	uint16_t wLength;
- };
- struct {
-	uint32_t word1;
-	uint32_t word2;
- };
-} setup;
-
-
-#define GET_STATUS		0
-#define CLEAR_FEATURE		1
-#define SET_FEATURE		3
-#define SET_ADDRESS		5
-#define GET_DESCRIPTOR		6
-#define SET_DESCRIPTOR		7
-#define GET_CONFIGURATION	8
-#define SET_CONFIGURATION	9
-#define GET_INTERFACE		10
-#define SET_INTERFACE		11
-#define SYNCH_FRAME		12
-
-// SETUP always uses a DATA0 PID for the data field of the SETUP transaction.
-// transactions in the data phase start with DATA1 and toggle (figure 8-12, USB1.1)
-// Status stage uses a DATA1 PID.
-
-static uint8_t ep0_rx0_buf[EP0_SIZE] __attribute__ ((aligned (4)));
-static uint8_t ep0_rx1_buf[EP0_SIZE] __attribute__ ((aligned (4)));
-static const uint8_t *ep0_tx_ptr = NULL;
-static uint16_t ep0_tx_len;
-static uint8_t ep0_tx_bdt_bank = 0;
-static uint8_t ep0_tx_data_toggle = 0;
-uint8_t usb_rx_memory_needed = 0;
-
-volatile uint8_t usb_configuration = 0;
-volatile uint8_t usb_reboot_timer = 0;
-
-
-static void endpoint0_stall(void)
-{
-	USB0_ENDPT0 = USB_ENDPT_EPSTALL | USB_ENDPT_EPRXEN | USB_ENDPT_EPTXEN | USB_ENDPT_EPHSHK;
-}
-
-
-static void endpoint0_transmit(const void *data, uint32_t len)
-{
-#if 0
-	serial_print("tx0:");
-	serial_phex32((uint32_t)data);
-	serial_print(",");
-	serial_phex16(len);
-	serial_print(ep0_tx_bdt_bank ? ", odd" : ", even");
-	serial_print(ep0_tx_data_toggle ? ", d1\n" : ", d0\n");
-#endif
-	table[index(0, TX, ep0_tx_bdt_bank)].addr = (void *)data;
-	table[index(0, TX, ep0_tx_bdt_bank)].desc = BDT_DESC(len, ep0_tx_data_toggle);
-	ep0_tx_data_toggle ^= 1;
-	ep0_tx_bdt_bank ^= 1;
-}
-
-static uint8_t reply_buffer[8];
-
-static void usb_setup(void)
-{
-	const uint8_t *data = NULL;
-	uint32_t datalen = 0;
-	const usb_descriptor_list_t *list;
-	uint32_t size;
-	volatile uint8_t *reg;
-	uint8_t epconf;
-	const uint8_t *cfg;
-	int i;
-
-	switch (setup.wRequestAndType) {
-	  case 0x0500: // SET_ADDRESS
-		break;
-	  case 0x0900: // SET_CONFIGURATION
-		//serial_print("configure\n");
-		usb_configuration = setup.wValue;
-		reg = &USB0_ENDPT1;
-		cfg = usb_endpoint_config_table;
-		// clear all BDT entries, free any allocated memory...
-		for (i=4; i < (NUM_ENDPOINTS+1)*4; i++) {
-			if (table[i].desc & BDT_OWN) {
-				usb_free((usb_packet_t *)((uint8_t *)(table[i].addr) - 8));
-			}
-		}
-		// free all queued packets
-		for (i=0; i < NUM_ENDPOINTS; i++) {
-			usb_packet_t *p, *n;
-			p = rx_first[i];
-			while (p) {
-				n = p->next;
-				usb_free(p);
-				p = n;
-			}
-			rx_first[i] = NULL;
-			rx_last[i] = NULL;
-			p = tx_first[i];
-			while (p) {
-				n = p->next;
-				usb_free(p);
-				p = n;
-			}
-			tx_first[i] = NULL;
-			tx_last[i] = NULL;
-			usb_rx_byte_count_data[i] = 0;
-			switch (tx_state[i]) {
-			  case TX_STATE_EVEN_FREE:
-			  case TX_STATE_NONE_FREE_EVEN_FIRST:
-				tx_state[i] = TX_STATE_BOTH_FREE_EVEN_FIRST;
-				break;
-			  case TX_STATE_ODD_FREE:
-			  case TX_STATE_NONE_FREE_ODD_FIRST:
-				tx_state[i] = TX_STATE_BOTH_FREE_ODD_FIRST;
-				break;
-			  default:
-				break;
-			}
-		}
-		usb_rx_memory_needed = 0;
-		for (i=1; i <= NUM_ENDPOINTS; i++) {
-			epconf = *cfg++;
-			*reg = epconf;
-			reg += 4;
-			if (epconf & USB_ENDPT_EPRXEN) {
-				usb_packet_t *p;
-				p = usb_malloc();
-				if (p) {
-					table[index(i, RX, EVEN)].addr = p->buf;
-					table[index(i, RX, EVEN)].desc = BDT_DESC(64, 0);
-				} else {
-					table[index(i, RX, EVEN)].desc = 0;
-					usb_rx_memory_needed++;
-				}
-				p = usb_malloc();
-				if (p) {
-					table[index(i, RX, ODD)].addr = p->buf;
-					table[index(i, RX, ODD)].desc = BDT_DESC(64, 1);
-				} else {
-					table[index(i, RX, ODD)].desc = 0;
-					usb_rx_memory_needed++;
-				}
-			}
-			table[index(i, TX, EVEN)].desc = 0;
-			table[index(i, TX, ODD)].desc = 0;
-		}
-		break;
-	  case 0x0880: // GET_CONFIGURATION
-		reply_buffer[0] = usb_configuration;
-		datalen = 1;
-		data = reply_buffer;
-		break;
-	  case 0x0080: // GET_STATUS (device)
-		reply_buffer[0] = 0;
-		reply_buffer[1] = 0;
-		datalen = 2;
-		data = reply_buffer;
-		break;
-	  case 0x0082: // GET_STATUS (endpoint)
-		if (setup.wIndex > NUM_ENDPOINTS) {
-			// TODO: do we need to handle IN vs OUT here?
-			endpoint0_stall();
-			return;
-		}
-		reply_buffer[0] = 0;
-		reply_buffer[1] = 0;
-		if (*(uint8_t *)(&USB0_ENDPT0 + setup.wIndex * 4) & 0x02) reply_buffer[0] = 1;
-		data = reply_buffer;
-		datalen = 2;
-		break;
-	  case 0x0102: // CLEAR_FEATURE (endpoint)
-		i = setup.wIndex & 0x7F;
-		if (i > NUM_ENDPOINTS || setup.wValue != 0) {
-			// TODO: do we need to handle IN vs OUT here?
-			endpoint0_stall();
-			return;
-		}
-		(*(uint8_t *)(&USB0_ENDPT0 + setup.wIndex * 4)) &= ~0x02;
-		// TODO: do we need to clear the data toggle here?
-		break;
-	  case 0x0302: // SET_FEATURE (endpoint)
-		i = setup.wIndex & 0x7F;
-		if (i > NUM_ENDPOINTS || setup.wValue != 0) {
-			// TODO: do we need to handle IN vs OUT here?
-			endpoint0_stall();
-			return;
-		}
-		(*(uint8_t *)(&USB0_ENDPT0 + setup.wIndex * 4)) |= 0x02;
-		// TODO: do we need to clear the data toggle here?
-		break;
-	  case 0x0680: // GET_DESCRIPTOR
-	  case 0x0681:
-		//serial_print("desc:");
-		//serial_phex16(setup.wValue);
-		//serial_print("\n");
-		for (list = usb_descriptor_list; 1; list++) {
-			if (list->addr == NULL) break;
-			//if (setup.wValue == list->wValue &&
-			//(setup.wIndex == list->wIndex) || ((setup.wValue >> 8) == 3)) {
-			if (setup.wValue == list->wValue && setup.wIndex == list->wIndex) {
-				data = list->addr;
-				if ((setup.wValue >> 8) == 3) {
-					// for string descriptors, use the descriptor's
-					// length field, allowing runtime configured
-					// length.
-					datalen = *(list->addr);
-				} else {
-					datalen = list->length;
-				}
-#if 0
-				serial_print("Desc found, ");
-				serial_phex32((uint32_t)data);
-				serial_print(",");
-				serial_phex16(datalen);
-				serial_print(",");
-				serial_phex(data[0]);
-				serial_phex(data[1]);
-				serial_phex(data[2]);
-				serial_phex(data[3]);
-				serial_phex(data[4]);
-				serial_phex(data[5]);
-				serial_print("\n");
-#endif
-				goto send;
-			}
-		}
-		//serial_print("desc: not found\n");
-		endpoint0_stall();
-		return;
-#if defined(CDC_STATUS_INTERFACE)
-	  case 0x2221: // CDC_SET_CONTROL_LINE_STATE
-		usb_cdc_line_rtsdtr = setup.wValue;
-		//serial_print("set control line state\n");
-		break;
-	  case 0x2321: // CDC_SEND_BREAK
-		break;
-	  case 0x2021: // CDC_SET_LINE_CODING
-		//serial_print("set coding, waiting...\n");
-		return;
-#endif
-
-// TODO: this does not work... why?
-#if defined(SEREMU_INTERFACE) || defined(KEYBOARD_INTERFACE)
-	  case 0x0921: // HID SET_REPORT
-		//serial_print(":)\n");
-		return;
-	  case 0x0A21: // HID SET_IDLE
-		break;
-	  // case 0xC940:
-#endif
-	  default:
-		endpoint0_stall();
-		return;
-	}
-	send:
-	//serial_print("setup send ");
-	//serial_phex32(data);
-	//serial_print(",");
-	//serial_phex16(datalen);
-	//serial_print("\n");
-
-	if (datalen > setup.wLength) datalen = setup.wLength;
-	size = datalen;
-	if (size > EP0_SIZE) size = EP0_SIZE;
-	endpoint0_transmit(data, size);
-	data += size;
-	datalen -= size;
-	if (datalen == 0 && size < EP0_SIZE) return;
-
-	size = datalen;
-	if (size > EP0_SIZE) size = EP0_SIZE;
-	endpoint0_transmit(data, size);
-	data += size;
-	datalen -= size;
-	if (datalen == 0 && size < EP0_SIZE) return;
-
-	ep0_tx_ptr = data;
-	ep0_tx_len = datalen;
-}
-
-
-
-//A bulk endpoint's toggle sequence is initialized to DATA0 when the endpoint
-//experiences any configuration event (configuration events are explained in
-//Sections 9.1.1.5 and 9.4.5).
-
-//Configuring a device or changing an alternate setting causes all of the status
-//and configuration values associated with endpoints in the affected interfaces
-//to be set to their default values. This includes setting the data toggle of
-//any endpoint using data toggles to the value DATA0.
-
-//For endpoints using data toggle, regardless of whether an endpoint has the
-//Halt feature set, a ClearFeature(ENDPOINT_HALT) request always results in the
-//data toggle being reinitialized to DATA0.
-
-
-
-// #define stat2bufferdescriptor(stat) (table + ((stat) >> 2))
-
-static void usb_control(uint32_t stat)
-{
-	bdt_t *b;
-	uint32_t pid, size;
-	uint8_t *buf;
-	const uint8_t *data;
-
-	b = stat2bufferdescriptor(stat);
-	pid = BDT_PID(b->desc);
-	//count = b->desc >> 16;
-	buf = b->addr;
-	//serial_print("pid:");
-	//serial_phex(pid);
-	//serial_print(", count:");
-	//serial_phex(count);
-	//serial_print("\n");
-
-	switch (pid) {
-	case 0x0D: // Setup received from host
-		//serial_print("PID=Setup\n");
-		//if (count != 8) ; // panic?
-		// grab the 8 byte setup info
-		setup.word1 = *(uint32_t *)(buf);
-		setup.word2 = *(uint32_t *)(buf + 4);
-
-		// give the buffer back
-		b->desc = BDT_DESC(EP0_SIZE, DATA1);
-		//table[index(0, RX, EVEN)].desc = BDT_DESC(EP0_SIZE, 1);
-		//table[index(0, RX, ODD)].desc = BDT_DESC(EP0_SIZE, 1);
-
-		// clear any leftover pending IN transactions
-		ep0_tx_ptr = NULL;
-		if (ep0_tx_data_toggle) {
-		}
-		//if (table[index(0, TX, EVEN)].desc & 0x80) {
-			//serial_print("leftover tx even\n");
-		//}
-		//if (table[index(0, TX, ODD)].desc & 0x80) {
-			//serial_print("leftover tx odd\n");
-		//}
-		table[index(0, TX, EVEN)].desc = 0;
-		table[index(0, TX, ODD)].desc = 0;
-		// first IN after Setup is always DATA1
-		ep0_tx_data_toggle = 1;
-
-#if 0
-		serial_print("bmRequestType:");
-		serial_phex(setup.bmRequestType);
-		serial_print(", bRequest:");
-		serial_phex(setup.bRequest);
-		serial_print(", wValue:");
-		serial_phex16(setup.wValue);
-		serial_print(", wIndex:");
-		serial_phex16(setup.wIndex);
-		serial_print(", len:");
-		serial_phex16(setup.wLength);
-		serial_print("\n");
-#endif
-		// actually "do" the setup request
-		usb_setup();
-		// unfreeze the USB, now that we're ready
-		USB0_CTL = USB_CTL_USBENSOFEN; // clear TXSUSPENDTOKENBUSY bit
-		break;
-	case 0x01:  // OUT transaction received from host
-	case 0x02:
-		//serial_print("PID=OUT\n");
-#ifdef CDC_STATUS_INTERFACE
-		if (setup.wRequestAndType == 0x2021 /*CDC_SET_LINE_CODING*/) {
-			int i;
-			uint8_t *dst = (uint8_t *)usb_cdc_line_coding;
-			//serial_print("set line coding ");
-			for (i=0; i<7; i++) {
-				//serial_phex(*buf);
-				*dst++ = *buf++;
-			}
-			//serial_phex32(usb_cdc_line_coding[0]);
-			//serial_print("\n");
-			if (usb_cdc_line_coding[0] == 134) usb_reboot_timer = 15;
-			endpoint0_transmit(NULL, 0);
-		}
-#endif
-#ifdef KEYBOARD_INTERFACE
-		if (setup.word1 == 0x02000921 && setup.word2 == ((1<<16)|KEYBOARD_INTERFACE)) {
-			keyboard_leds = buf[0];
-			endpoint0_transmit(NULL, 0);
-		}
-#endif
-#ifdef SEREMU_INTERFACE
-		if (setup.word1 == 0x03000921 && setup.word2 == ((4<<16)|SEREMU_INTERFACE)
-		  && buf[0] == 0xA9 && buf[1] == 0x45 && buf[2] == 0xC2 && buf[3] == 0x6B) {
-			usb_reboot_timer = 5;
-			endpoint0_transmit(NULL, 0);
-		}
-#endif
-		// give the buffer back
-		b->desc = BDT_DESC(EP0_SIZE, DATA1);
-		break;
-
-	case 0x09: // IN transaction completed to host
-		//serial_print("PID=IN:");
-		//serial_phex(stat);
-		//serial_print("\n");
-
-		// send remaining data, if any...
-		data = ep0_tx_ptr;
-		if (data) {
-			size = ep0_tx_len;
-			if (size > EP0_SIZE) size = EP0_SIZE;
-			endpoint0_transmit(data, size);
-			data += size;
-			ep0_tx_len -= size;
-			ep0_tx_ptr = (ep0_tx_len > 0 || size == EP0_SIZE) ? data : NULL;
-		}
-
-		if (setup.bRequest == 5 && setup.bmRequestType == 0) {
-			setup.bRequest = 0;
-			//serial_print("set address: ");
-			//serial_phex16(setup.wValue);
-			//serial_print("\n");
-			USB0_ADDR = setup.wValue;
-		}
-
-		break;
-	//default:
-		//serial_print("PID=unknown:");
-		//serial_phex(pid);
-		//serial_print("\n");
-	}
-	USB0_CTL = USB_CTL_USBENSOFEN; // clear TXSUSPENDTOKENBUSY bit
-}
-
-
-
-
-
-
-usb_packet_t *usb_rx(uint32_t endpoint)
-{
-	usb_packet_t *ret;
-	endpoint--;
-	if (endpoint >= NUM_ENDPOINTS) return NULL;
-	__disable_irq();
-	ret = rx_first[endpoint];
-	if (ret) {
-		rx_first[endpoint] = ret->next;
-		usb_rx_byte_count_data[endpoint] -= ret->len;
-	}
-	__enable_irq();
-	//serial_print("rx, epidx=");
-	//serial_phex(endpoint);
-	//serial_print(", packet=");
-	//serial_phex32(ret);
-	//serial_print("\n");
-	return ret;
-}
-
-static uint32_t usb_queue_byte_count(const usb_packet_t *p)
-{
-	uint32_t count=0;
-
-	__disable_irq();
-	for ( ; p; p = p->next) {
-		count += p->len;
-	}
-	__enable_irq();
-	return count;
-}
-
-// TODO: make this an inline function...
-/*
-uint32_t usb_rx_byte_count(uint32_t endpoint)
-{
-	endpoint--;
-	if (endpoint >= NUM_ENDPOINTS) return 0;
-	return usb_rx_byte_count_data[endpoint];
-	//return usb_queue_byte_count(rx_first[endpoint]);
-}
-*/
-
-uint32_t usb_tx_byte_count(uint32_t endpoint)
-{
-	endpoint--;
-	if (endpoint >= NUM_ENDPOINTS) return 0;
-	return usb_queue_byte_count(tx_first[endpoint]);
-}
-
-uint32_t usb_tx_packet_count(uint32_t endpoint)
-{
-	const usb_packet_t *p;
-	uint32_t count=0;
-
-	endpoint--;
-	if (endpoint >= NUM_ENDPOINTS) return 0;
-	__disable_irq();
-	for (p = tx_first[endpoint]; p; p = p->next) count++;
-	__enable_irq();
-	return count;
-}
-
-
-// Called from usb_free, but only when usb_rx_memory_needed > 0, indicating
-// receive endpoints are starving for memory.  The intention is to give
-// endpoints needing receive memory priority over the user's code, which is
-// likely calling usb_malloc to obtain memory for transmitting.  When the
-// user is creating data very quickly, their consumption could starve reception
-// without this prioritization.  The packet buffer (input) is assigned to the
-// first endpoint needing memory.
-//
-void usb_rx_memory(usb_packet_t *packet)
-{
-	unsigned int i;
-	const uint8_t *cfg;
-
-	cfg = usb_endpoint_config_table;
-	//serial_print("rx_mem:");
-	__disable_irq();
-	for (i=1; i <= NUM_ENDPOINTS; i++) {
-		if (*cfg++ & USB_ENDPT_EPRXEN) {
-			if (table[index(i, RX, EVEN)].desc == 0) {
-				table[index(i, RX, EVEN)].addr = packet->buf;
-				table[index(i, RX, EVEN)].desc = BDT_DESC(64, 0);
-				usb_rx_memory_needed--;
-				__enable_irq();
-				//serial_phex(i);
-				//serial_print(",even\n");
-				return;
-			}
-			if (table[index(i, RX, ODD)].desc == 0) {
-				table[index(i, RX, ODD)].addr = packet->buf;
-				table[index(i, RX, ODD)].desc = BDT_DESC(64, 1);
-				usb_rx_memory_needed--;
-				__enable_irq();
-				//serial_phex(i);
-				//serial_print(",odd\n");
-				return;
-			}
-		}
-	}
-	__enable_irq();
-	// we should never reach this point.  If we get here, it means
-	// usb_rx_memory_needed was set greater than zero, but no memory
-	// was actually needed.
-	usb_rx_memory_needed = 0;
-	usb_free(packet);
-	return;
-}
-
-//#define index(endpoint, tx, odd) (((endpoint) << 2) | ((tx) << 1) | (odd))
-//#define stat2bufferdescriptor(stat) (table + ((stat) >> 2))
-
-void usb_tx(uint32_t endpoint, usb_packet_t *packet)
-{
-	bdt_t *b = &table[index(endpoint, TX, EVEN)];
-	uint8_t next;
-
-	endpoint--;
-	if (endpoint >= NUM_ENDPOINTS) return;
-	__disable_irq();
-	//serial_print("txstate=");
-	//serial_phex(tx_state[endpoint]);
-	//serial_print("\n");
-	switch (tx_state[endpoint]) {
-	  case TX_STATE_BOTH_FREE_EVEN_FIRST:
-		next = TX_STATE_ODD_FREE;
-		break;
-	  case TX_STATE_BOTH_FREE_ODD_FIRST:
-		b++;
-		next = TX_STATE_EVEN_FREE;
-		break;
-	  case TX_STATE_EVEN_FREE:
-		next = TX_STATE_NONE_FREE_ODD_FIRST;
-		break;
-	  case TX_STATE_ODD_FREE:
-		b++;
-		next = TX_STATE_NONE_FREE_EVEN_FIRST;
-		break;
-	  default:
-		if (tx_first[endpoint] == NULL) {
-			tx_first[endpoint] = packet;
-		} else {
-			tx_last[endpoint]->next = packet;
-		}
-		tx_last[endpoint] = packet;
-		__enable_irq();
-		return;
-	}
-	tx_state[endpoint] = next;
-	b->addr = packet->buf;
-	b->desc = BDT_DESC(packet->len, ((uint32_t)b & 8) ? DATA1 : DATA0);
-	__enable_irq();
-}
-
-
-
-
-
-
-void _reboot_Teensyduino_(void)
-{
-	// TODO: initialize R0 with a code....
-	__asm__ volatile("bkpt");
-}
-
-
-
-void usb_isr(void)
-{
-	uint8_t status, stat, t;
-
-	//serial_print("isr");
-	//status = USB0_ISTAT;
-	//serial_phex(status);
-	//serial_print("\n");
-	restart:
-	status = USB0_ISTAT;
-
-	if ((status & USB_INTEN_SOFTOKEN /* 04 */ )) {
-		if (usb_configuration) {
-			t = usb_reboot_timer;
-			if (t) {
-				usb_reboot_timer = --t;
-				if (!t) _reboot_Teensyduino_();
-			}
-#ifdef CDC_DATA_INTERFACE
-			t = usb_cdc_transmit_flush_timer;
-			if (t) {
-				usb_cdc_transmit_flush_timer = --t;
-				if (t == 0) usb_serial_flush_callback();
-			}
-#endif
-#ifdef SEREMU_INTERFACE
-			t = usb_seremu_transmit_flush_timer;
-			if (t) {
-				usb_seremu_transmit_flush_timer = --t;
-				if (t == 0) usb_seremu_flush_callback();
-			}
-#endif
-#ifdef MIDI_INTERFACE
-                        usb_midi_flush_output();
-#endif
-#ifdef FLIGHTSIM_INTERFACE
-			usb_flightsim_flush_callback();
-#endif
-		}
-		USB0_ISTAT = USB_INTEN_SOFTOKEN;
-	}
-
-	if ((status & USB_ISTAT_TOKDNE /* 08 */ )) {
-		uint8_t endpoint;
-		stat = USB0_STAT;
-		//serial_print("token: ep=");
-		//serial_phex(stat >> 4);
-		//serial_print(stat & 0x08 ? ",tx" : ",rx");
-		//serial_print(stat & 0x04 ? ",odd\n" : ",even\n");
-		endpoint = stat >> 4;
-		if (endpoint == 0) {
-			usb_control(stat);
-		} else {
-			bdt_t *b = stat2bufferdescriptor(stat);
-			usb_packet_t *packet = (usb_packet_t *)((uint8_t *)(b->addr) - 8);
-#if 0
-			serial_print("ep:");
-			serial_phex(endpoint);
-			serial_print(", pid:");
-			serial_phex(BDT_PID(b->desc));
-			serial_print(((uint32_t)b & 8) ? ", odd" : ", even");
-			serial_print(", count:");
-			serial_phex(b->desc >> 16);
-			serial_print("\n");
-#endif
-			endpoint--;	// endpoint is index to zero-based arrays
-
-			if (stat & 0x08) { // transmit
-				usb_free(packet);
-				packet = tx_first[endpoint];
-				if (packet) {
-					//serial_print("tx packet\n");
-					tx_first[endpoint] = packet->next;
-					b->addr = packet->buf;
-					switch (tx_state[endpoint]) {
-					  case TX_STATE_BOTH_FREE_EVEN_FIRST:
-						tx_state[endpoint] = TX_STATE_ODD_FREE;
-						break;
-					  case TX_STATE_BOTH_FREE_ODD_FIRST:
-						tx_state[endpoint] = TX_STATE_EVEN_FREE;
-						break;
-					  case TX_STATE_EVEN_FREE:
-						tx_state[endpoint] = TX_STATE_NONE_FREE_ODD_FIRST;
-						break;
-					  case TX_STATE_ODD_FREE:
-						tx_state[endpoint] = TX_STATE_NONE_FREE_EVEN_FIRST;
-						break;
-					  default:
-						break;
-					}
-					b->desc = BDT_DESC(packet->len, ((uint32_t)b & 8) ? DATA1 : DATA0);
-				} else {
-					//serial_print("tx no packet\n");
-					switch (tx_state[endpoint]) {
-					  case TX_STATE_BOTH_FREE_EVEN_FIRST:
-					  case TX_STATE_BOTH_FREE_ODD_FIRST:
-						break;
-					  case TX_STATE_EVEN_FREE:
-						tx_state[endpoint] = TX_STATE_BOTH_FREE_EVEN_FIRST;
-						break;
-					  case TX_STATE_ODD_FREE:
-						tx_state[endpoint] = TX_STATE_BOTH_FREE_ODD_FIRST;
-						break;
-					  default:
-						tx_state[endpoint] = ((uint32_t)b & 8) ?
-						  TX_STATE_ODD_FREE : TX_STATE_EVEN_FREE;
-						break;
-					}
-				}
-			} else { // receive
-				packet->len = b->desc >> 16;
-				if (packet->len > 0) {
-					packet->index = 0;
-					packet->next = NULL;
-					if (rx_first[endpoint] == NULL) {
-						//serial_print("rx 1st, epidx=");
-						//serial_phex(endpoint);
-						//serial_print(", packet=");
-						//serial_phex32((uint32_t)packet);
-						//serial_print("\n");
-						rx_first[endpoint] = packet;
-					} else {
-						//serial_print("rx Nth, epidx=");
-						//serial_phex(endpoint);
-						//serial_print(", packet=");
-						//serial_phex32((uint32_t)packet);
-						//serial_print("\n");
-						rx_last[endpoint]->next = packet;
-					}
-					rx_last[endpoint] = packet;
-					usb_rx_byte_count_data[endpoint] += packet->len;
-					// TODO: implement a per-endpoint maximum # of allocated packets
-					// so a flood of incoming data on 1 endpoint doesn't starve
-					// the others if the user isn't reading it regularly
-					packet = usb_malloc();
-					if (packet) {
-						b->addr = packet->buf;
-						b->desc = BDT_DESC(64, ((uint32_t)b & 8) ? DATA1 : DATA0);
-					} else {
-						//serial_print("starving ");
-						//serial_phex(endpoint + 1);
-						//serial_print(((uint32_t)b & 8) ? ",odd\n" : ",even\n");
-						b->desc = 0;
-						usb_rx_memory_needed++;
-					}
-				} else {
-					b->desc = BDT_DESC(64, ((uint32_t)b & 8) ? DATA1 : DATA0);
-				}
-			}
-
-
-
-
-		}
-		USB0_ISTAT = USB_ISTAT_TOKDNE;
-		goto restart;
-	}
-
-
-
-	if (status & USB_ISTAT_USBRST /* 01 */ ) {
-		//serial_print("reset\n");
-
-		// initialize BDT toggle bits
-		USB0_CTL = USB_CTL_ODDRST;
-		ep0_tx_bdt_bank = 0;
-
-		// set up buffers to receive Setup and OUT packets
-		table[index(0, RX, EVEN)].desc = BDT_DESC(EP0_SIZE, 0);
-		table[index(0, RX, EVEN)].addr = ep0_rx0_buf;
-		table[index(0, RX, ODD)].desc = BDT_DESC(EP0_SIZE, 0);
-		table[index(0, RX, ODD)].addr = ep0_rx1_buf;
-		table[index(0, TX, EVEN)].desc = 0;
-		table[index(0, TX, ODD)].desc = 0;
-
-		// activate endpoint 0
-		USB0_ENDPT0 = USB_ENDPT_EPRXEN | USB_ENDPT_EPTXEN | USB_ENDPT_EPHSHK;
-
-		// clear all ending interrupts
-		USB0_ERRSTAT = 0xFF;
-		USB0_ISTAT = 0xFF;
-
-		// set the address to zero during enumeration
-		USB0_ADDR = 0;
-
-		// enable other interrupts
-		USB0_ERREN = 0xFF;
-		USB0_INTEN = USB_INTEN_TOKDNEEN |
-			USB_INTEN_SOFTOKEN |
-			USB_INTEN_STALLEN |
-			USB_INTEN_ERROREN |
-			USB_INTEN_USBRSTEN |
-			USB_INTEN_SLEEPEN;
-
-		// is this necessary?
-		USB0_CTL = USB_CTL_USBENSOFEN;
-		return;
-	}
-
-
-	if ((status & USB_ISTAT_STALL /* 80 */ )) {
-		//serial_print("stall:\n");
-		USB0_ENDPT0 = USB_ENDPT_EPRXEN | USB_ENDPT_EPTXEN | USB_ENDPT_EPHSHK;
-		USB0_ISTAT = USB_ISTAT_STALL;
-	}
-	if ((status & USB_ISTAT_ERROR /* 02 */ )) {
-		uint8_t err = USB0_ERRSTAT;
-		USB0_ERRSTAT = err;
-		//serial_print("err:");
-		//serial_phex(err);
-		//serial_print("\n");
-		USB0_ISTAT = USB_ISTAT_ERROR;
-	}
-
-	if ((status & USB_ISTAT_SLEEP /* 10 */ )) {
-		//serial_print("sleep\n");
-		USB0_ISTAT = USB_ISTAT_SLEEP;
-	}
-
-}
-
-
-
-void usb_init(void)
-{
-	int i;
-
-	//serial_begin(BAUD2DIV(115200));
-	//serial_print("usb_init\n");
-
-	usb_init_serialnumber();
-
-	for (i=0; i <= NUM_ENDPOINTS*4; i++) {
-		table[i].desc = 0;
-		table[i].addr = 0;
-	}
-
-	// this basically follows the flowchart in the Kinetis
-	// Quick Reference User Guide, Rev. 1, 03/2012, page 141
-
-	// assume 48 MHz clock already running
-	// SIM - enable clock
-	SIM_SCGC4 |= SIM_SCGC4_USBOTG;
-
-	// reset USB module
-	USB0_USBTRC0 = USB_USBTRC_USBRESET;
-	while ((USB0_USBTRC0 & USB_USBTRC_USBRESET) != 0) ; // wait for reset to end
-
-	// set desc table base addr
-	USB0_BDTPAGE1 = ((uint32_t)table) >> 8;
-	USB0_BDTPAGE2 = ((uint32_t)table) >> 16;
-	USB0_BDTPAGE3 = ((uint32_t)table) >> 24;
-
-	// clear all ISR flags
-	USB0_ISTAT = 0xFF;
-	USB0_ERRSTAT = 0xFF;
-	USB0_OTGISTAT = 0xFF;
-
-	USB0_USBTRC0 |= 0x40; // undocumented bit
-
-	// enable USB
-	USB0_CTL = USB_CTL_USBENSOFEN;
-	USB0_USBCTRL = 0;
-
-	// enable reset interrupt
-	USB0_INTEN = USB_INTEN_USBRSTEN;
-
-	// enable interrupt in NVIC...
-	NVIC_SET_PRIORITY(IRQ_USBOTG, 112);
-	NVIC_ENABLE_IRQ(IRQ_USBOTG);
-
-	// enable d+ pullup
-	USB0_CONTROL = USB_CONTROL_DPPULLUPNONOTG;
-}
-
-
-#else // F_CPU < 20 MHz
-
-void usb_init(void)
-{
-}
-
-#endif // F_CPU >= 20 MHz
diff --git a/ports/teensy/core/usb_dev.h b/ports/teensy/core/usb_dev.h
deleted file mode 100644
index 211cebec02e40..0000000000000
--- a/ports/teensy/core/usb_dev.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 _usb_dev_h_
-#define _usb_dev_h_
-
-#if F_CPU >= 20000000
-
-// This header is NOT meant to be included when compiling
-// user sketches in Arduino.  The low-level functions
-// provided by usb_dev.c are meant to be called only by
-// code which provides higher-level interfaces to the user.
-
-#include "usb_mem.h"
-#include "usb_desc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void usb_init(void);
-void usb_init_serialnumber(void);
-void usb_isr(void);
-usb_packet_t *usb_rx(uint32_t endpoint);
-uint32_t usb_tx_byte_count(uint32_t endpoint);
-uint32_t usb_tx_packet_count(uint32_t endpoint);
-void usb_tx(uint32_t endpoint, usb_packet_t *packet);
-void usb_tx_isr(uint32_t endpoint, usb_packet_t *packet);
-
-extern volatile uint8_t usb_configuration;
-
-extern uint16_t usb_rx_byte_count_data[NUM_ENDPOINTS];
-static inline uint32_t usb_rx_byte_count(uint32_t endpoint) __attribute__((always_inline));
-static inline uint32_t usb_rx_byte_count(uint32_t endpoint)
-{
-        endpoint--;
-        if (endpoint >= NUM_ENDPOINTS) return 0;
-        return usb_rx_byte_count_data[endpoint];
-}
-
-#ifdef CDC_DATA_INTERFACE
-extern uint32_t usb_cdc_line_coding[2];
-extern volatile uint8_t usb_cdc_line_rtsdtr;
-extern volatile uint8_t usb_cdc_transmit_flush_timer;
-extern void usb_serial_flush_callback(void);
-#endif
-
-#ifdef SEREMU_INTERFACE
-extern volatile uint8_t usb_seremu_transmit_flush_timer;
-extern void usb_seremu_flush_callback(void);
-#endif
-
-#ifdef KEYBOARD_INTERFACE
-extern uint8_t keyboard_modifier_keys;
-extern uint8_t keyboard_keys[6];
-extern uint8_t keyboard_protocol;
-extern uint8_t keyboard_idle_config;
-extern uint8_t keyboard_idle_count;
-extern volatile uint8_t keyboard_leds;
-#endif
-
-#ifdef MIDI_INTERFACE
-extern void usb_midi_flush_output(void);
-#endif
-
-#ifdef FLIGHTSIM_INTERFACE
-extern void usb_flightsim_flush_callback(void);
-#endif
-
-
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // F_CPU >= 20 MHz
-
-#endif
diff --git a/ports/teensy/core/usb_mem.c b/ports/teensy/core/usb_mem.c
deleted file mode 100644
index 2424327d3c6de..0000000000000
--- a/ports/teensy/core/usb_mem.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 F_CPU >= 20000000
-
-#include "mk20dx128.h"
-//#include "HardwareSerial.h"
-#include "usb_dev.h"
-#include "usb_mem.h"
-
-__attribute__ ((section(".usbbuffers"), used))
-unsigned char usb_buffer_memory[NUM_USB_BUFFERS * sizeof(usb_packet_t)];
-
-static uint32_t usb_buffer_available = 0xFFFFFFFF;
-
-// use bitmask and CLZ instruction to implement fast free list
-// http://www.archivum.info/gnu.gcc.help/2006-08/00148/Re-GCC-Inline-Assembly.html
-// http://gcc.gnu.org/ml/gcc/2012-06/msg00015.html
-// __builtin_clz()
-
-usb_packet_t * usb_malloc(void)
-{
-	unsigned int n, avail;
-	uint8_t *p;
-
-	__disable_irq();
-	avail = usb_buffer_available;
-	n = __builtin_clz(avail); // clz = count leading zeros
-	if (n >= NUM_USB_BUFFERS) {
-		__enable_irq();
-		return NULL;
-	}
-	//serial_print("malloc:");
-	//serial_phex(n);
-	//serial_print("\n");
-
-	usb_buffer_available = avail & ~(0x80000000 >> n);
-	__enable_irq();
-	p = usb_buffer_memory + (n * sizeof(usb_packet_t));
-	//serial_print("malloc:");
-	//serial_phex32((int)p);
-	//serial_print("\n");
-	*(uint32_t *)p = 0;
-	*(uint32_t *)(p + 4) = 0;
-	return (usb_packet_t *)p;
-}
-
-// for the receive endpoints to request memory
-extern uint8_t usb_rx_memory_needed;
-extern void usb_rx_memory(usb_packet_t *packet);
-
-void usb_free(usb_packet_t *p)
-{
-	unsigned int n, mask;
-
-	//serial_print("free:");
-	n = ((uint8_t *)p - usb_buffer_memory) / sizeof(usb_packet_t);
-	if (n >= NUM_USB_BUFFERS) return;
-	//serial_phex(n);
-	//serial_print("\n");
-
-	// if any endpoints are starving for memory to receive
-	// packets, give this memory to them immediately!
-	if (usb_rx_memory_needed && usb_configuration) {
-		//serial_print("give to rx:");
-		//serial_phex32((int)p);
-		//serial_print("\n");
-		usb_rx_memory(p);
-		return;
-	}
-
-	mask = (0x80000000 >> n);
-	__disable_irq();
-	usb_buffer_available |= mask;
-	__enable_irq();
-
-	//serial_print("free:");
-	//serial_phex32((int)p);
-	//serial_print("\n");
-}
-
-#endif // F_CPU >= 20 MHz
diff --git a/ports/teensy/core/usb_mem.h b/ports/teensy/core/usb_mem.h
deleted file mode 100644
index 94d1eb4d2ea03..0000000000000
--- a/ports/teensy/core/usb_mem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 _usb_mem_h_
-#define _usb_mem_h_
-
-#include <stdint.h>
-
-typedef struct usb_packet_struct {
-	uint16_t len;
-	uint16_t index;
-	struct usb_packet_struct *next;
-	uint8_t buf[64];
-} usb_packet_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-usb_packet_t * usb_malloc(void);
-void usb_free(usb_packet_t *p);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/ports/teensy/core/usb_names.h b/ports/teensy/core/usb_names.h
deleted file mode 100644
index 067cb95e9bf04..0000000000000
--- a/ports/teensy/core/usb_names.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 _usb_names_h_
-#define _usb_names_h_
-
-// These definitions are intended to allow users to override the default
-// USB manufacturer, product and serial number strings.
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct usb_string_descriptor_struct {
-	uint8_t bLength;
-	uint8_t bDescriptorType;
-	uint16_t wString[];
-};
-
-extern struct usb_string_descriptor_struct usb_string_manufacturer_name;
-extern struct usb_string_descriptor_struct usb_string_product_name;
-extern struct usb_string_descriptor_struct usb_string_serial_number;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ports/teensy/core/usb_serial.c b/ports/teensy/core/usb_serial.c
deleted file mode 100644
index 3b38ec8b62144..0000000000000
--- a/ports/teensy/core/usb_serial.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 "usb_dev.h"
-#include "usb_serial.h"
-#include "core_pins.h" // for yield()
-//#include "HardwareSerial.h"
-#include <string.h> // for memcpy()
-
-// defined by usb_dev.h -> usb_desc.h
-#if defined(CDC_STATUS_INTERFACE) && defined(CDC_DATA_INTERFACE)
-
-uint32_t usb_cdc_line_coding[2];
-volatile uint8_t usb_cdc_line_rtsdtr=0;
-volatile uint8_t usb_cdc_transmit_flush_timer=0;
-
-static usb_packet_t *rx_packet=NULL;
-static usb_packet_t *tx_packet=NULL;
-static volatile uint8_t tx_noautoflush=0;
-
-#define TRANSMIT_FLUSH_TIMEOUT	5   /* in milliseconds */
-
-// get the next character, or -1 if nothing received
-int usb_serial_getchar(void)
-{
-	unsigned int i;
-	int c;
-
-	if (!rx_packet) {
-		if (!usb_configuration) return -1;
-		rx_packet = usb_rx(CDC_RX_ENDPOINT);
-		if (!rx_packet) return -1;
-	}
-	i = rx_packet->index;
-	c = rx_packet->buf[i++];
-	if (i >= rx_packet->len) {
-		usb_free(rx_packet);
-		rx_packet = NULL;
-	} else {
-		rx_packet->index = i;
-	}
-	return c;
-}
-
-// peek at the next character, or -1 if nothing received
-int usb_serial_peekchar(void)
-{
-	if (!rx_packet) {
-		if (!usb_configuration) return -1;
-		rx_packet = usb_rx(CDC_RX_ENDPOINT);
-		if (!rx_packet) return -1;
-	}
-	if (!rx_packet) return -1;
-	return rx_packet->buf[rx_packet->index];
-}
-
-// number of bytes available in the receive buffer
-int usb_serial_available(void)
-{
-	int count;
-	count = usb_rx_byte_count(CDC_RX_ENDPOINT);
-	if (rx_packet) count += rx_packet->len - rx_packet->index;
-	return count;
-}
-
-// read a block of bytes to a buffer
-int usb_serial_read(void *buffer, uint32_t size)
-{
-	uint8_t *p = (uint8_t *)buffer;
-	uint32_t qty, count=0;
-
-	while (size) {
-		if (!usb_configuration) break;
-		if (!rx_packet) {
-			rx:
-			rx_packet = usb_rx(CDC_RX_ENDPOINT);
-			if (!rx_packet) break;
-			if (rx_packet->len == 0) {
-				usb_free(rx_packet);
-				goto rx;
-			}
-		}
-		qty = rx_packet->len - rx_packet->index;
-		if (qty > size) qty = size;
-		memcpy(p, rx_packet->buf + rx_packet->index, qty);
-		p += qty;
-		count += qty;
-		size -= qty;
-		rx_packet->index += qty;
-		if (rx_packet->index >= rx_packet->len) {
-			usb_free(rx_packet);
-			rx_packet = NULL;
-		}
-	}
-	return count;
-}
-
-// discard any buffered input
-void usb_serial_flush_input(void)
-{
-	usb_packet_t *rx;
-
-	if (!usb_configuration) return;
-	if (rx_packet) {
-		usb_free(rx_packet);
-		rx_packet = NULL;
-	}
-	while (1) {
-		rx = usb_rx(CDC_RX_ENDPOINT);
-		if (!rx) break;
-		usb_free(rx);
-	}
-}
-
-// Maximum number of transmit packets to queue so we don't starve other endpoints for memory
-#define TX_PACKET_LIMIT 8
-
-// When the PC isn't listening, how long do we wait before discarding data?  If this is
-// too short, we risk losing data during the stalls that are common with ordinary desktop
-// software.  If it's too long, we stall the user's program when no software is running.
-#define TX_TIMEOUT_MSEC 70
-
-#if F_CPU == 168000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 1100)
-#elif F_CPU == 144000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 932)
-#elif F_CPU == 120000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 764)
-#elif F_CPU == 96000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 596)
-#elif F_CPU == 72000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 512)
-#elif F_CPU == 48000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 428)
-#elif F_CPU == 24000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 262)
-#endif
-
-// When we've suffered the transmit timeout, don't wait again until the computer
-// begins accepting data.  If no software is running to receive, we'll just discard
-// data as rapidly as Serial.print() can generate it, until there's something to
-// actually receive it.
-static uint8_t transmit_previous_timeout=0;
-
-
-// transmit a character.  0 returned on success, -1 on error
-int usb_serial_putchar(uint8_t c)
-{
-	return usb_serial_write(&c, 1);
-}
-
-
-int usb_serial_write(const void *buffer, uint32_t size)
-{
-	uint32_t len;
-	uint32_t wait_count;
-	const uint8_t *src = (const uint8_t *)buffer;
-	uint8_t *dest;
-
-	tx_noautoflush = 1;
-	while (size > 0) {
-		if (!tx_packet) {
-			wait_count = 0;
-			while (1) {
-				if (!usb_configuration) {
-					tx_noautoflush = 0;
-					return -1;
-				}
-				if (usb_tx_packet_count(CDC_TX_ENDPOINT) < TX_PACKET_LIMIT) {
-					tx_noautoflush = 1;
-					tx_packet = usb_malloc();
-					if (tx_packet) break;
-					tx_noautoflush = 0;
-				}
-				if (++wait_count > TX_TIMEOUT || transmit_previous_timeout) {
-					transmit_previous_timeout = 1;
-					return -1;
-				}
-				yield();
-			}
-		}
-		transmit_previous_timeout = 0;
-		len = CDC_TX_SIZE - tx_packet->index;
-		if (len > size) len = size;
-		dest = tx_packet->buf + tx_packet->index;
-		tx_packet->index += len;
-		size -= len;
-		while (len-- > 0) *dest++ = *src++;
-		if (tx_packet->index >= CDC_TX_SIZE) {
-			tx_packet->len = CDC_TX_SIZE;
-			usb_tx(CDC_TX_ENDPOINT, tx_packet);
-			tx_packet = NULL;
-		}
-		usb_cdc_transmit_flush_timer = TRANSMIT_FLUSH_TIMEOUT;
-	}
-	tx_noautoflush = 0;
-	return 0;
-}
-
-void usb_serial_flush_output(void)
-{
-	if (!usb_configuration) return;
-	tx_noautoflush = 1;
-	if (tx_packet) {
-		usb_cdc_transmit_flush_timer = 0;
-		tx_packet->len = tx_packet->index;
-		usb_tx(CDC_TX_ENDPOINT, tx_packet);
-		tx_packet = NULL;
-	} else {
-		usb_packet_t *tx = usb_malloc();
-		if (tx) {
-			usb_cdc_transmit_flush_timer = 0;
-			usb_tx(CDC_TX_ENDPOINT, tx);
-		} else {
-			usb_cdc_transmit_flush_timer = 1;
-		}
-	}
-	tx_noautoflush = 0;
-}
-
-void usb_serial_flush_callback(void)
-{
-	if (tx_noautoflush) return;
-	if (tx_packet) {
-		tx_packet->len = tx_packet->index;
-		usb_tx(CDC_TX_ENDPOINT, tx_packet);
-		tx_packet = NULL;
-	} else {
-		usb_packet_t *tx = usb_malloc();
-		if (tx) {
-			usb_tx(CDC_TX_ENDPOINT, tx);
-		} else {
-			usb_cdc_transmit_flush_timer = 1;
-		}
-	}
-}
-
-
-
-
-
-
-
-
-
-#endif // CDC_STATUS_INTERFACE && CDC_DATA_INTERFACE
diff --git a/ports/teensy/core/usb_serial.h b/ports/teensy/core/usb_serial.h
deleted file mode 100644
index 9c0429d1982e8..0000000000000
--- a/ports/teensy/core/usb_serial.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 USBserial_h_
-#define USBserial_h_
-
-#if defined(USB_SERIAL) || defined(USB_SERIAL_HID)
-
-#include <inttypes.h>
-
-#if F_CPU >= 20000000
-
-// C language implementation
-#ifdef __cplusplus
-extern "C" {
-#endif
-int usb_serial_getchar(void);
-int usb_serial_peekchar(void);
-int usb_serial_available(void);
-int usb_serial_read(void *buffer, uint32_t size);
-void usb_serial_flush_input(void);
-int usb_serial_putchar(uint8_t c);
-int usb_serial_write(const void *buffer, uint32_t size);
-void usb_serial_flush_output(void);
-extern uint32_t usb_cdc_line_coding[2];
-extern volatile uint8_t usb_cdc_line_rtsdtr;
-extern volatile uint8_t usb_cdc_transmit_flush_timer;
-extern volatile uint8_t usb_configuration;
-#ifdef __cplusplus
-}
-#endif
-
-#define USB_SERIAL_DTR  0x01
-#define USB_SERIAL_RTS  0x02
-
-// C++ interface
-#ifdef __cplusplus
-#include "Stream.h"
-class usb_serial_class : public Stream
-{
-public:
-        void begin(long) { /* TODO: call a function that tries to wait for enumeration */ };
-        void end() { /* TODO: flush output and shut down USB port */ };
-        virtual int available() { return usb_serial_available(); }
-        virtual int read() { return usb_serial_getchar(); }
-        virtual int peek() { return usb_serial_peekchar(); }
-        virtual void flush() { usb_serial_flush_output(); }  // TODO: actually wait for data to leave USB...
-        virtual size_t write(uint8_t c) { return usb_serial_putchar(c); }
-        virtual size_t write(const uint8_t *buffer, size_t size) { return usb_serial_write(buffer, size); }
-	size_t write(unsigned long n) { return write((uint8_t)n); }
-	size_t write(long n) { return write((uint8_t)n); }
-	size_t write(unsigned int n) { return write((uint8_t)n); }
-	size_t write(int n) { return write((uint8_t)n); }
-	using Print::write;
-        void send_now(void) { usb_serial_flush_output(); }
-        uint32_t baud(void) { return usb_cdc_line_coding[0]; }
-        uint8_t stopbits(void) { uint8_t b = usb_cdc_line_coding[1]; if (!b) b = 1; return b; }
-        uint8_t paritytype(void) { return usb_cdc_line_coding[1] >> 8; } // 0=none, 1=odd, 2=even
-        uint8_t numbits(void) { return usb_cdc_line_coding[1] >> 16; }
-        uint8_t dtr(void) { return (usb_cdc_line_rtsdtr & USB_SERIAL_DTR) ? 1 : 0; }
-        uint8_t rts(void) { return (usb_cdc_line_rtsdtr & USB_SERIAL_RTS) ? 1 : 0; }
-        operator bool() { return usb_configuration && (usb_cdc_line_rtsdtr & (USB_SERIAL_DTR | USB_SERIAL_RTS)); }
-	size_t readBytes(char *buffer, size_t length) {
-		size_t count=0;
-		unsigned long startMillis = millis();
-		do {
-			count += usb_serial_read(buffer + count, length - count);
-			if (count >= length) return count;
-		} while(millis() - startMillis < _timeout);
-		setReadError();
-		return count;
-	}
-
-};
-extern usb_serial_class Serial;
-#endif // __cplusplus
-
-
-#else  // F_CPU < 20 MHz
-
-// Allow Arduino programs using Serial to compile, but Serial will do nothing.
-#ifdef __cplusplus
-#include "Stream.h"
-class usb_serial_class : public Stream
-{
-public:
-        void begin(long) { };
-        void end() { };
-        virtual int available() { return 0; }
-        virtual int read() { return -1; }
-        virtual int peek() { return -1; }
-        virtual void flush() { }
-        virtual size_t write(uint8_t c) { return 1; }
-        virtual size_t write(const uint8_t *buffer, size_t size) { return size; }
-	size_t write(unsigned long n) { return 1; }
-	size_t write(long n) { return 1; }
-	size_t write(unsigned int n) { return 1; }
-	size_t write(int n) { return 1; }
-	using Print::write;
-        void send_now(void) { }
-        uint32_t baud(void) { return 0; }
-        uint8_t stopbits(void) { return 1; }
-        uint8_t paritytype(void) { return 0; }
-        uint8_t numbits(void) { return 8; }
-        uint8_t dtr(void) { return 1; }
-        uint8_t rts(void) { return 1; }
-        operator bool() { return true; }
-};
-
-extern usb_serial_class Serial;
-#endif // __cplusplus
-
-#endif // F_CPU
-
-#endif // USB_SERIAL || USB_SERIAL_HID
-
-#endif // USBserial_h_
diff --git a/ports/teensy/core/yield.c b/ports/teensy/core/yield.c
deleted file mode 100644
index 06c741a673080..0000000000000
--- a/ports/teensy/core/yield.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be 
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows 
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION 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 yield(void) __attribute__ ((weak));
-void yield(void) {};
diff --git a/ports/teensy/hal_ftm.c b/ports/teensy/hal_ftm.c
deleted file mode 100644
index 7ae70b2bbba64..0000000000000
--- a/ports/teensy/hal_ftm.c
+++ /dev/null
@@ -1,201 +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 <stdint.h>
-#include <mk20dx128.h>
-#include "teensy_hal.h"
-
-void HAL_FTM_Base_Init(FTM_HandleTypeDef *hftm) {
-    /* Check the parameters */
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-    assert_param(IS_FTM_PRESCALERSHIFT(hftm->Init.PrescalerShift));
-    assert_param(IS_FTM_COUNTERMODE(hftm->Init.CounterMode));
-    assert_param(IS_FTM_PERIOD(hftm->Init.Period));
-
-    hftm->State = HAL_FTM_STATE_BUSY;
-
-    FTMx->MODE = FTM_MODE_WPDIS;
-    FTMx->SC = 0;
-    FTMx->MOD = hftm->Init.Period;
-    uint32_t sc = FTM_SC_PS(hftm->Init.PrescalerShift);
-    if (hftm->Init.CounterMode == FTM_COUNTERMODE_CENTER) {
-        sc |= FTM_SC_CPWMS;
-    }
-    FTMx->SC = sc;
-
-    hftm->State = HAL_FTM_STATE_READY;
-}
-
-void HAL_FTM_Base_Start(FTM_HandleTypeDef *hftm) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-
-    hftm->State = HAL_FTM_STATE_BUSY;
-
-    FTMx->CNT = 0;
-    FTMx->SC &= ~FTM_SC_CLKS(3);
-    FTMx->SC |= FTM_SC_CLKS(1);
-
-    hftm->State = HAL_FTM_STATE_READY;
-}
-
-void HAL_FTM_Base_Start_IT(FTM_HandleTypeDef *hftm) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-
-    hftm->State = HAL_FTM_STATE_BUSY;
-
-    FTMx->CNT = 0;
-    FTMx->SC |= FTM_SC_CLKS(1) | FTM_SC_TOIE;
-
-    hftm->State = HAL_FTM_STATE_READY;
-}
-
-void HAL_FTM_Base_DeInit(FTM_HandleTypeDef *hftm) {
-    assert_param(IS_FTM_INSTANCE(hftm->Instance));
-
-    hftm->State = HAL_FTM_STATE_BUSY;
-
-    __HAL_FTM_DISABLE_TOF_IT(hftm);
-
-    hftm->State = HAL_FTM_STATE_RESET;
-}
-
-void HAL_FTM_OC_Init(FTM_HandleTypeDef *hftm) {
-    HAL_FTM_Base_Init(hftm);
-}
-
-void HAL_FTM_OC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-    assert_param(IS_FTM_CHANNEL(channel));
-    assert_param(IS_FTM_OC_MODE(sConfig->OCMode));
-    assert_param(IS_FTM_OC_PULSE(sConfig->Pulse));
-    assert_param(IS_FTM_OC_POLARITY(sConfig->OCPolarity));
-
-    hftm->State = HAL_FTM_STATE_BUSY;
-
-    FTMx->channel[channel].CSC = sConfig->OCMode;
-    FTMx->channel[channel].CV = sConfig->Pulse;
-    if (sConfig->OCPolarity & 1) {
-        FTMx->POL |= (1 << channel);
-    } else {
-        FTMx->POL &= ~(1 << channel);
-    }
-
-    hftm->State = HAL_FTM_STATE_READY;
-}
-
-void HAL_FTM_OC_Start(FTM_HandleTypeDef *hftm, uint32_t channel) {
-    // Nothing else to do
-}
-
-void HAL_FTM_OC_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-
-    FTMx->channel[channel].CSC |= FTM_CSC_CHIE;
-}
-
-void HAL_FTM_OC_DeInit(FTM_HandleTypeDef *hftm) {
-    HAL_FTM_Base_DeInit(hftm);
-}
-
-void HAL_FTM_PWM_Init(FTM_HandleTypeDef *hftm) {
-    HAL_FTM_Base_Init(hftm);
-}
-
-void HAL_FTM_PWM_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-    assert_param(IS_FTM_CHANNEL(channel));
-    assert_param(IS_FTM_PWM_MODE(sConfig->OCMode));
-    assert_param(IS_FTM_OC_PULSE(sConfig->Pulse));
-    assert_param(IS_FTM_OC_POLARITY(sConfig->OCPolarity));
-
-    hftm->State = HAL_FTM_STATE_BUSY;
-
-    FTMx->channel[channel].CSC = sConfig->OCMode;
-    FTMx->channel[channel].CV = sConfig->Pulse;
-    if (sConfig->OCPolarity & 1) {
-        FTMx->POL |= (1 << channel);
-    } else {
-        FTMx->POL &= ~(1 << channel);
-    }
-
-    hftm->State = HAL_FTM_STATE_READY;
-}
-
-void HAL_FTM_PWM_Start(FTM_HandleTypeDef *hftm, uint32_t channel) {
-    // Nothing else to do
-}
-
-void HAL_FTM_PWM_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-
-    FTMx->channel[channel].CSC |= FTM_CSC_CHIE;
-}
-
-void HAL_FTM_PWM_DeInit(FTM_HandleTypeDef *hftm) {
-    HAL_FTM_Base_DeInit(hftm);
-}
-
-void HAL_FTM_IC_Init(FTM_HandleTypeDef *hftm) {
-    HAL_FTM_Base_Init(hftm);
-}
-
-void HAL_FTM_IC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_IC_InitTypeDef *sConfig, uint32_t channel) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-    assert_param(IS_FTM_CHANNEL(channel));
-    assert_param(IS_FTM_IC_POLARITY(sConfig->ICPolarity));
-
-    hftm->State = HAL_FTM_STATE_BUSY;
-
-    FTMx->channel[channel].CSC = sConfig->ICPolarity;
-
-    hftm->State = HAL_FTM_STATE_READY;
-}
-
-void HAL_FTM_IC_Start(FTM_HandleTypeDef *hftm, uint32_t channel) {
-    // FTM_TypeDef *FTMx = hftm->Instance;
-    // assert_param(IS_FTM_INSTANCE(FTMx));
-
-    // Nothing else to do
-}
-
-void HAL_FTM_IC_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel) {
-    FTM_TypeDef *FTMx = hftm->Instance;
-    assert_param(IS_FTM_INSTANCE(FTMx));
-
-    FTMx->channel[channel].CSC |= FTM_CSC_CHIE;
-}
-
-void HAL_FTM_IC_DeInit(FTM_HandleTypeDef *hftm) {
-    HAL_FTM_Base_DeInit(hftm);
-}
diff --git a/ports/teensy/hal_ftm.h b/ports/teensy/hal_ftm.h
deleted file mode 100644
index 17503c8f2d3b6..0000000000000
--- a/ports/teensy/hal_ftm.h
+++ /dev/null
@@ -1,186 +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_TEENSY_HAL_FTM_H
-#define MICROPY_INCLUDED_TEENSY_HAL_FTM_H
-
-#define FTM0    ((FTM_TypeDef *)&FTM0_SC)
-#define FTM1    ((FTM_TypeDef *)&FTM1_SC)
-#define FTM2    ((FTM_TypeDef *)&FTM2_SC)
-
-typedef struct {
-    volatile uint32_t CSC;      // Channel x Status And Control
-    volatile uint32_t CV;               // Channel x Value
-} FTM_ChannelTypeDef;
-
-typedef struct {
-    volatile uint32_t SC;               // Status And Control
-    volatile uint32_t CNT;              // Counter
-    volatile uint32_t MOD;              // Modulo
-    FTM_ChannelTypeDef channel[8];
-    volatile uint32_t CNTIN;    // Counter Initial Value
-    volatile uint32_t STATUS;   // Capture And Compare Status
-    volatile uint32_t MODE;             // Features Mode Selection
-    volatile uint32_t SYNC;             // Synchronization
-    volatile uint32_t OUTINIT;  // Initial State For Channels Output
-    volatile uint32_t OUTMASK;  // Output Mask
-    volatile uint32_t COMBINE;  // Function For Linked Channels
-    volatile uint32_t DEADTIME; // Deadtime Insertion Control
-    volatile uint32_t EXTTRIG;  // FTM External Trigger
-    volatile uint32_t POL;              // Channels Polarity
-    volatile uint32_t FMS;              // Fault Mode Status
-    volatile uint32_t FILTER;   // Input Capture Filter Control
-    volatile uint32_t FLTCTRL;  // Fault Control
-    volatile uint32_t QDCTRL;   // Quadrature Decoder Control And Status
-    volatile uint32_t CONF;             // Configuration
-    volatile uint32_t FLTPOL;   // FTM Fault Input Polarity
-    volatile uint32_t SYNCONF;  // Synchronization Configuration
-    volatile uint32_t INVCTRL;  // FTM Inverting Control
-    volatile uint32_t SWOCTRL;  // FTM Software Output Control
-    volatile uint32_t PWMLOAD;  // FTM PWM Load
-} FTM_TypeDef;
-
-typedef struct {
-    uint32_t PrescalerShift;    // Sets the prescaler to 1 << PrescalerShift
-    uint32_t CounterMode;       // One of FTM_COUNTERMODE_xxx
-    uint32_t Period;            // Specifies the Period for determining timer overflow
-} FTM_Base_InitTypeDef;
-
-typedef struct {
-    uint32_t OCMode;            // One of FTM_OCMODE_xxx
-    uint32_t Pulse;             // Specifies initial pulse width (0-0xffff)
-    uint32_t OCPolarity;        // One of FTM_OCPOLRITY_xxx
-} FTM_OC_InitTypeDef;
-
-typedef struct {
-    uint32_t ICPolarity;        // Specifies Rising/Falling/Both
-} FTM_IC_InitTypeDef;
-
-#define IS_FTM_INSTANCE(INSTANCE)   (((INSTANCE) == FTM0) || \
-    ((INSTANCE) == FTM1) || \
-    ((INSTANCE) == FTM2))
-
-#define IS_FTM_PRESCALERSHIFT(PRESCALERSHIFT) (((PRESCALERSHIFT)&~7) == 0)
-
-#define FTM_COUNTERMODE_UP      (0)
-#define FTM_COUNTERMODE_CENTER  (FTM_SC_CPWMS)
-
-#define IS_FTM_COUNTERMODE(MODE) (((MODE) == FTM_COUNTERMODE_UP) || \
-    ((MODE) == FTM_COUNTERMODE_CENTER))
-
-#define IS_FTM_PERIOD(PERIOD)   (((PERIOD) & 0xFFFF0000) == 0)
-
-#define FTM_CSC_CHF     0x80
-#define FTM_CSC_CHIE    0x40
-#define FTM_CSC_MSB     0x20
-#define FTM_CSC_MSA     0x10
-#define FTM_CSC_ELSB    0x08
-#define FTM_CSC_ELSA    0x04
-#define FTM_CSC_DMA     0x01
-
-#define FTM_OCMODE_TIMING   (0)
-#define FTM_OCMODE_ACTIVE   (FTM_CSC_MSA | FTM_CSC_ELSB | FTM_CSC_ELSA)
-#define FTM_OCMODE_INACTIVE (FTM_CSC_MSA | FTM_CSC_ELSB)
-#define FTM_OCMODE_TOGGLE   (FTM_CSC_MSA | FTM_CSC_ELSA)
-#define FTM_OCMODE_PWM1     (FTM_CSC_MSB | FTM_CSC_ELSB)
-#define FTM_OCMODE_PWM2     (FTM_CSC_MSB | FTM_CSC_ELSA)
-
-#define IS_FTM_OC_MODE(mode)        ((mode) == FTM_OCMODE_TIMING || \
-    (mode) == FTM_OCMODE_ACTIVE || \
-    (mode) == FTM_OCMODE_INACTIVE || \
-    (mode) == FTM_OCMODE_TOGGLE)
-
-#define IS_FTM_PWM_MODE(mode)       ((mode) == FTM_OCMODE_PWM1 || \
-    (mode) == FTM_OCMODE_PWM2)
-
-#define IS_FTM_CHANNEL(channel)     (((channel) & ~7) == 0)
-
-#define IS_FTM_PULSE(pulse)         (((pulse) & ~0xffff) == 0)
-
-#define FTM_OCPOLARITY_HIGH     (0)
-#define FTM_OCPOLARITY_LOW      (1)
-
-#define IS_FTM_OC_POLARITY(polarity) ((polarity) == FTM_OCPOLARITY_HIGH || \
-    (polarity) == FTM_OCPOLARITY_LOW)
-
-#define FTM_ICPOLARITY_RISING   (FTM_CSC_ELSA)
-#define FTM_ICPOLARITY_FALLING  (FTM_CSC_ELSB)
-#define FTM_ICPOLARITY_BOTH     (FTM_CSC_ELSA | FTM_CSC_ELSB)
-
-#define IS_FTM_IC_POLARITY(polarity) ((polarity) == FTM_ICPOLARITY_RISING || \
-    (polarity) == FTM_ICPOLARITY_FALLING || \
-    (polarity) == FTM_ICPOLARITY_BOTH)
-
-typedef enum {
-    HAL_FTM_STATE_RESET     = 0x00,
-    HAL_FTM_STATE_READY     = 0x01,
-    HAL_FTM_STATE_BUSY      = 0x02,
-} HAL_FTM_State;
-
-typedef struct {
-    FTM_TypeDef *Instance;
-    FTM_Base_InitTypeDef Init;
-    HAL_FTM_State State;
-
-} FTM_HandleTypeDef;
-
-#define __HAL_FTM_GET_TOF_FLAG(HANDLE)     (((HANDLE)->Instance->SC & FTM_SC_TOF) != 0)
-#define __HAL_FTM_CLEAR_TOF_FLAG(HANDLE)    ((HANDLE)->Instance->SC &= ~FTM_SC_TOF)
-
-#define __HAL_FTM_GET_TOF_IT(HANDLE)       (((HANDLE)->Instance->SC & FTM_SC_TOIE) != 0)
-#define __HAL_FTM_ENABLE_TOF_IT(HANDLE)     ((HANDLE)->Instance->SC |= FTM_SC_TOIE)
-#define __HAL_FTM_DISABLE_TOF_IT(HANDLE)    ((HANDLE)->Instance->SC &= ~FTM_SC_TOIE)
-
-#define __HAL_FTM_GET_CH_FLAG(HANDLE, CH)  (((HANDLE)->Instance->channel[CH].CSC & FTM_CSC_CHF) != 0)
-#define __HAL_FTM_CLEAR_CH_FLAG(HANDLE, CH) ((HANDLE)->Instance->channel[CH].CSC &= ~FTM_CSC_CHF)
-
-#define __HAL_FTM_GET_CH_IT(HANDLE, CH)    (((HANDLE)->Instance->channel[CH].CSC & FTM_CSC_CHIE) != 0)
-#define __HAL_FTM_ENABLE_CH_IT(HANDLE, CH)  ((HANDLE)->Instance->channel[CH].CSC |= FTM_CSC_CHIE)
-#define __HAL_FTM_DISABLE_CH_IT(HANDLE, CH) ((HANDLE)->Instance->channel[CH].CSC &= ~FTM_CSC_CHIE)
-
-void HAL_FTM_Base_Init(FTM_HandleTypeDef *hftm);
-void HAL_FTM_Base_Start(FTM_HandleTypeDef *hftm);
-void HAL_FTM_Base_Start_IT(FTM_HandleTypeDef *hftm);
-void HAL_FTM_Base_DeInit(FTM_HandleTypeDef *hftm);
-
-void HAL_FTM_OC_Init(FTM_HandleTypeDef *hftm);
-void HAL_FTM_OC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel);
-void HAL_FTM_OC_Start(FTM_HandleTypeDef *hftm, uint32_t channel);
-void HAL_FTM_OC_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel);
-void HAL_FTM_OC_DeInit(FTM_HandleTypeDef *hftm);
-
-void HAL_FTM_PWM_Init(FTM_HandleTypeDef *hftm);
-void HAL_FTM_PWM_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel);
-void HAL_FTM_PWM_Start(FTM_HandleTypeDef *hftm, uint32_t channel);
-void HAL_FTM_PWM_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel);
-void HAL_FTM_PWM_DeInit(FTM_HandleTypeDef *hftm);
-
-void HAL_FTM_IC_Init(FTM_HandleTypeDef *hftm);
-void HAL_FTM_IC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_IC_InitTypeDef *sConfig, uint32_t channel);
-void HAL_FTM_IC_Start(FTM_HandleTypeDef *hftm, uint32_t channel);
-void HAL_FTM_IC_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel);
-void HAL_FTM_IC_DeInit(FTM_HandleTypeDef *hftm);
-
-#endif // MICROPY_INCLUDED_TEENSY_HAL_FTM_H
diff --git a/ports/teensy/hal_gpio.c b/ports/teensy/hal_gpio.c
deleted file mode 100644
index e8bc1eb5ce1c0..0000000000000
--- a/ports/teensy/hal_gpio.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <stdint.h>
-#include <mk20dx128.h>
-#include "teensy_hal.h"
-
-#define GPIO_NUMBER 32
-
-void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init) {
-    /* Check the parameters */
-    assert_param(IS_GPIO_PIN(GPIO_Init->Pin));
-    assert_param(IS_GPIO_MODE(GPIO_Init->Mode));
-    assert_param(IS_GPIO_PULL(GPIO_Init->Pull));
-
-    /* Configure the port pins */
-    for (uint32_t position = 0; position < GPIO_NUMBER; position++) {
-        uint32_t bitmask = 1 << position;
-        if ((GPIO_Init->Pin & bitmask) == 0) {
-            continue;
-        }
-        volatile uint32_t *port_pcr = GPIO_PIN_TO_PORT_PCR(GPIOx, position);
-
-        /*--------------------- GPIO Mode Configuration ------------------------*/
-        /* In case of Alternate function mode selection */
-        if ((GPIO_Init->Mode == GPIO_MODE_AF_PP) || (GPIO_Init->Mode == GPIO_MODE_AF_OD)) {
-            /* Check the Alternate function parameter */
-            assert_param(IS_GPIO_AF(GPIO_Init->Alternate));
-        } else if (GPIO_Init->Mode == GPIO_MODE_ANALOG) {
-            GPIO_Init->Alternate = 0;
-        } else {
-            GPIO_Init->Alternate = 1;
-        }
-
-        /* Configure Alternate function mapped with the current IO */
-        *port_pcr &= ~PORT_PCR_MUX_MASK;
-        *port_pcr |= PORT_PCR_MUX(GPIO_Init->Alternate);
-
-        /* Configure IO Direction mode (Input, Output, Alternate or Analog) */
-        if (GPIO_Init->Mode == GPIO_MODE_INPUT || GPIO_Init->Mode == GPIO_MODE_ANALOG) {
-            GPIOx->PDDR &= ~bitmask;
-        } else {
-            GPIOx->PDDR |= bitmask;
-        }
-
-        /* In case of Output or Alternate function mode selection */
-        if ((GPIO_Init->Mode == GPIO_MODE_OUTPUT_PP) || (GPIO_Init->Mode == GPIO_MODE_AF_PP) ||
-            (GPIO_Init->Mode == GPIO_MODE_OUTPUT_OD) || (GPIO_Init->Mode == GPIO_MODE_AF_OD)) {
-            /* Check the Speed parameter */
-            assert_param(IS_GPIO_SPEED(GPIO_Init->Speed));
-
-            *port_pcr |= PORT_PCR_DSE;
-
-            /* Configure the IO Speed */
-            if (GPIO_Init->Speed > GPIO_SPEED_FREQ_MEDIUM) {
-                *port_pcr &= ~PORT_PCR_SRE;
-            } else {
-                *port_pcr |= PORT_PCR_SRE;
-            }
-
-            /* Configure the IO Output Type */
-            if (GPIO_Init->Mode & GPIO_OUTPUT_TYPE) {
-                *port_pcr |= PORT_PCR_ODE;  // OD
-            } else {
-                *port_pcr &= ~PORT_PCR_ODE; // PP
-            }
-        } else {
-            *port_pcr &= ~PORT_PCR_DSE;
-        }
-
-        /* Activate the Pull-up or Pull down resistor for the current IO */
-        if (GPIO_Init->Pull == GPIO_NOPULL) {
-            *port_pcr &= ~PORT_PCR_PE;
-        } else {
-            *port_pcr |= PORT_PCR_PE;
-            if (GPIO_Init->Pull == GPIO_PULLDOWN) {
-                *port_pcr &= ~PORT_PCR_PS;
-            } else {
-                *port_pcr |= PORT_PCR_PS;
-            }
-        }
-
-        #if 0
-        /*--------------------- EXTI Mode Configuration ------------------------*/
-        /* Configure the External Interrupt or event for the current IO */
-        if ((GPIO_Init->Mode & EXTI_MODE) == EXTI_MODE) {
-            /* Enable SYSCFG Clock */
-            __SYSCFG_CLK_ENABLE();
-
-            temp = ((uint32_t)0x0F) << (4 * (position & 0x03));
-            SYSCFG->EXTICR[position >> 2] &= ~temp;
-            SYSCFG->EXTICR[position >> 2] |= ((uint32_t)(__HAL_GET_GPIO_SOURCE(GPIOx)) << (4 * (position & 0x03)));
-
-            /* Clear EXTI line configuration */
-            EXTI->IMR &= ~((uint32_t)iocurrent);
-            EXTI->EMR &= ~((uint32_t)iocurrent);
-
-            if ((GPIO_Init->Mode & GPIO_MODE_IT) == GPIO_MODE_IT) {
-                EXTI->IMR |= iocurrent;
-            }
-            if ((GPIO_Init->Mode & GPIO_MODE_EVT) == GPIO_MODE_EVT) {
-                EXTI->EMR |= iocurrent;
-            }
-
-            /* Clear Rising Falling edge configuration */
-            EXTI->RTSR &= ~((uint32_t)iocurrent);
-            EXTI->FTSR &= ~((uint32_t)iocurrent);
-
-            if ((GPIO_Init->Mode & RISING_EDGE) == RISING_EDGE) {
-                EXTI->RTSR |= iocurrent;
-            }
-            if ((GPIO_Init->Mode & FALLING_EDGE) == FALLING_EDGE) {
-                EXTI->FTSR |= iocurrent;
-            }
-        }
-        #endif
-    }
-}
diff --git a/ports/teensy/help.c b/ports/teensy/help.c
deleted file mode 100644
index e2857aedfd038..0000000000000
--- a/ports/teensy/help.c
+++ /dev/null
@@ -1,69 +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 "py/builtin.h"
-
-const char teensy_help_text[] =
-    "Welcome to MicroPython!\n"
-    "\n"
-    "For online docs please visit http://docs.micropython.org/\n"
-    "\n"
-    "Quick overview of commands for the board:\n"
-    "  pyb.info()    -- print some general information\n"
-    "  pyb.gc()      -- run the garbage collector\n"
-    "  pyb.delay(n)  -- wait for n milliseconds\n"
-    "  pyb.Switch()  -- create a switch object\n"
-    "                   Switch methods: (), callback(f)\n"
-    "  pyb.LED(n)    -- create an LED object for LED n (n=1,2,3,4)\n"
-    "                   LED methods: on(), off(), toggle(), intensity(<n>)\n"
-    "  pyb.Pin(pin)  -- get a pin, eg pyb.Pin('X1')\n"
-    "  pyb.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
-    "                   Pin methods: init(..), value([v]), high(), low()\n"
-    "  pyb.ExtInt(pin, m, p, callback) -- create an external interrupt object\n"
-    "  pyb.ADC(pin)  -- make an analog object from a pin\n"
-    "                   ADC methods: read(), read_timed(buf, freq)\n"
-    "  pyb.DAC(port) -- make a DAC object\n"
-    "                   DAC methods: triangle(freq), write(n), write_timed(buf, freq)\n"
-    "  pyb.RTC()     -- make an RTC object; methods: datetime([val])\n"
-    "  pyb.rng()     -- get a 30-bit hardware random number\n"
-    "  pyb.Servo(n)  -- create Servo object for servo n (n=1,2,3,4)\n"
-    "                   Servo methods: calibration(..), angle([x, [t]]), speed([x, [t]])\n"
-    "  pyb.Accel()   -- create an Accelerometer object\n"
-    "                   Accelerometer methods: x(), y(), z(), tilt(), filtered_xyz()\n"
-    "\n"
-    "Pins are numbered X1-X12, X17-X22, Y1-Y12, or by their MCU name\n"
-    "Pin IO modes are: pyb.Pin.IN, pyb.Pin.OUT_PP, pyb.Pin.OUT_OD\n"
-    "Pin pull modes are: pyb.Pin.PULL_NONE, pyb.Pin.PULL_UP, pyb.Pin.PULL_DOWN\n"
-    "Additional serial bus objects: pyb.I2C(n), pyb.SPI(n), pyb.UART(n)\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"
-    "\n"
-    "For further help on a specific object, type help(obj)\n"
-;
diff --git a/ports/teensy/lcd.c b/ports/teensy/lcd.c
deleted file mode 100644
index e5d6115d7513c..0000000000000
--- a/ports/teensy/lcd.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "py/obj.h"
-#include "../stm32/lcd.h"
-
-void lcd_init(void) {
-}
-
-void lcd_print_str(const char *str) {
-    (void)str;
-}
-
-void lcd_print_strn(const char *str, unsigned int len) {
-    (void)str;
-    (void)len;
-}
diff --git a/ports/teensy/led.c b/ports/teensy/led.c
deleted file mode 100644
index 46c6ae492f851..0000000000000
--- a/ports/teensy/led.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include <stdio.h>
-
-#include "Arduino.h"
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "led.h"
-#include "pin.h"
-#include "genhdr/pins.h"
-
-typedef struct _pyb_led_obj_t {
-    mp_obj_base_t base;
-    mp_uint_t led_id;
-    const pin_obj_t *led_pin;
-} pyb_led_obj_t;
-
-STATIC const pyb_led_obj_t pyb_led_obj[] = {
-    {{&pyb_led_type}, 1, &MICROPY_HW_LED1},
-    #if defined(MICROPY_HW_LED2)
-    {{&pyb_led_type}, 2, &MICROPY_HW_LED2},
-    #if defined(MICROPY_HW_LED3)
-    {{&pyb_led_type}, 3, &MICROPY_HW_LED3},
-    #if defined(MICROPY_HW_LED4)
-    {{&pyb_led_type}, 4, &MICROPY_HW_LED4},
-    #endif
-    #endif
-    #endif
-};
-#define NUM_LEDS MP_ARRAY_SIZE(pyb_led_obj)
-
-void led_init(void) {
-    /* GPIO structure */
-    GPIO_InitTypeDef GPIO_InitStructure;
-
-    /* Configure I/O speed, mode, output type and pull */
-    GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_LOW;
-    GPIO_InitStructure.Mode = MICROPY_HW_LED_OTYPE;
-    GPIO_InitStructure.Pull = GPIO_NOPULL;
-
-    /* Turn off LEDs and initialize */
-    for (int led = 0; led < NUM_LEDS; led++) {
-        const pin_obj_t *led_pin = pyb_led_obj[led].led_pin;
-        MICROPY_HW_LED_OFF(led_pin);
-        GPIO_InitStructure.Pin = led_pin->pin_mask;
-        HAL_GPIO_Init(led_pin->gpio, &GPIO_InitStructure);
-    }
-}
-
-void led_state(pyb_led_t led, int state) {
-    if (led < 1 || led > NUM_LEDS) {
-        return;
-    }
-    const pin_obj_t *led_pin = pyb_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(pyb_led_t led) {
-    if (led < 1 || led > NUM_LEDS) {
-        return;
-    }
-    const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
-    GPIO_TypeDef *gpio = led_pin->gpio;
-
-    // We don't know if we're turning the LED on or off, but we don't really
-    // care. Just invert the state.
-    if (gpio->PDOR & led_pin->pin_mask) {
-        // pin is high, make it low
-        gpio->PCOR = led_pin->pin_mask;
-    } else {
-        // pin is low, make it high
-        gpio->PSOR = led_pin->pin_mask;
-    }
-}
-
-/******************************************************************************/
-/* MicroPython bindings                                                       */
-
-void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    pyb_led_obj_t *self = self_in;
-    (void)kind;
-    mp_printf(print, "<LED %lu>", self->led_id);
-}
-
-STATIC mp_obj_t led_obj_make_new(const mp_obj_type_t *type, uint n_args, uint 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 does not exist"), led_id);
-    }
-
-    // return static led object
-    return (mp_obj_t)&pyb_led_obj[led_id - 1];
-}
-
-mp_obj_t led_obj_on(mp_obj_t self_in) {
-    pyb_led_obj_t *self = self_in;
-    led_state(self->led_id, 1);
-    return mp_const_none;
-}
-
-mp_obj_t led_obj_off(mp_obj_t self_in) {
-    pyb_led_obj_t *self = self_in;
-    led_state(self->led_id, 0);
-    return mp_const_none;
-}
-
-mp_obj_t led_obj_toggle(mp_obj_t self_in) {
-    pyb_led_obj_t *self = 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);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_led_type,
-    MP_QSTR_LED,
-    MP_TYPE_FLAG_NONE,
-    make_new, led_obj_make_new,
-    print, led_obj_print,
-    locals_dict, &led_locals_dict
-    );
diff --git a/ports/teensy/led.h b/ports/teensy/led.h
deleted file mode 100644
index 5c45166ef25d4..0000000000000
--- a/ports/teensy/led.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef MICROPY_INCLUDED_TEENSY_LED_H
-#define MICROPY_INCLUDED_TEENSY_LED_H
-
-typedef enum {
-    PYB_LED_BUILTIN = 1,
-} pyb_led_t;
-
-void led_init(void);
-void led_state(pyb_led_t led, int state);
-void led_toggle(pyb_led_t led);
-
-extern const mp_obj_type_t pyb_led_type;
-
-#endif // MICROPY_INCLUDED_TEENSY_LED_H
diff --git a/ports/teensy/lexerfrozen.c b/ports/teensy/lexerfrozen.c
deleted file mode 100644
index 59ccdabf09102..0000000000000
--- a/ports/teensy/lexerfrozen.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdio.h>
-
-#include "py/builtin.h"
-#include "py/lexer.h"
-#include "py/runtime.h"
-#include "py/mperrno.h"
-
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
diff --git a/ports/teensy/lexermemzip.h b/ports/teensy/lexermemzip.h
deleted file mode 100644
index cd7326a435286..0000000000000
--- a/ports/teensy/lexermemzip.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MICROPY_INCLUDED_TEENSY_LEXERMEMZIP_H
-#define MICROPY_INCLUDED_TEENSY_LEXERMEMZIP_H
-
-mp_lexer_t *mp_lexer_new_from_memzip_file(const char *filename);
-
-#endif // MICROPY_INCLUDED_TEENSY_LEXERMEMZIP_H
diff --git a/ports/teensy/main.c b/ports/teensy/main.c
deleted file mode 100644
index fa27326e932df..0000000000000
--- a/ports/teensy/main.c
+++ /dev/null
@@ -1,386 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "py/lexer.h"
-#include "py/runtime.h"
-#include "py/stackctrl.h"
-#include "py/gc.h"
-#include "py/mphal.h"
-#include "gccollect.h"
-#include "shared/readline/readline.h"
-#include "shared/runtime/gchelper.h"
-#include "shared/runtime/pyexec.h"
-#include "lexermemzip.h"
-
-#include "Arduino.h"
-
-#include "servo.h"
-#include "led.h"
-#include "uart.h"
-#include "pin.h"
-
-extern uint32_t _heap_start;
-
-void flash_error(int n) {
-    for (int i = 0; i < n; i++) {
-        led_state(PYB_LED_BUILTIN, 1);
-        delay(250);
-        led_state(PYB_LED_BUILTIN, 0);
-        delay(250);
-    }
-}
-
-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);
-    __fatal_error("");
-}
-
-void __assert_func(const char *file, int line, const char *func, const char *expr) {
-
-    printf("Assertion failed: %s, file %s, line %d\n", expr, file, line);
-    __fatal_error("");
-}
-
-mp_obj_t pyb_analog_read(mp_obj_t pin_obj) {
-    uint pin = mp_obj_get_int(pin_obj);
-    int val = analogRead(pin);
-    return MP_OBJ_NEW_SMALL_INT(val);
-}
-
-mp_obj_t pyb_analog_write(mp_obj_t pin_obj, mp_obj_t val_obj) {
-    uint pin = mp_obj_get_int(pin_obj);
-    int val = mp_obj_get_int(val_obj);
-    analogWrite(pin, val);
-    return mp_const_none;
-}
-
-mp_obj_t pyb_analog_write_resolution(mp_obj_t res_obj) {
-    int res = mp_obj_get_int(res_obj);
-    analogWriteResolution(res);
-    return mp_const_none;
-}
-
-mp_obj_t pyb_analog_write_frequency(mp_obj_t pin_obj, mp_obj_t freq_obj) {
-    uint pin = mp_obj_get_int(pin_obj);
-    int freq = mp_obj_get_int(freq_obj);
-    analogWriteFrequency(pin, freq);
-    return mp_const_none;
-}
-
-#if 0
-// get lots of info about the board
-static mp_obj_t pyb_info(void) {
-    // get and print unique id; 96 bits
-    {
-        byte *id = (byte *)0x40048058;
-        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]);
-    }
-
-    // get and print clock speeds
-    printf("CPU=%u\nBUS=%u\nMEM=%u\n", F_CPU, F_BUS, F_MEM);
-
-    // to print info about memory
-    {
-        printf("_sdata=%p\n", &_sdata);
-        printf("_edata=%p\n", &_edata);
-        printf("_sbss=%p\n", &_sbss);
-        printf("_ebss=%p\n", &_ebss);
-        printf("_estack=%p\n", &_estack);
-        printf("_etext=%p\n", &_etext);
-        printf("_heap_start=%p\n", &_heap_start);
-    }
-
-    // GC info
-    {
-        gc_info_t info;
-        gc_info(&info);
-        printf("GC:\n");
-        printf("  %u total\n", info.total);
-        printf("  %u used %u free\n", info.used, info.free);
-        printf("  1=%u 2=%u m=%u\n", info.num_1block, info.num_2block, info.max_block);
-    }
-
-    #if 0
-    // free space on flash
-    {
-        DWORD nclst;
-        FATFS *fatfs;
-        f_getfree("0:", &nclst, &fatfs);
-        printf("LFS free: %u bytes\n", (uint)(nclst * fatfs->csize * 512));
-    }
-    #endif
-
-    return mp_const_none;
-}
-
-#endif
-
-#define RAM_START (0x1FFF8000) // fixed for chip
-#define HEAP_END  (0x20006000) // tunable
-#define RAM_END   (0x20008000) // fixed for chip
-
-#if 0
-
-void gc_helper_get_regs_and_clean_stack(mp_uint_t *regs, mp_uint_t heap_end);
-
-mp_obj_t pyb_gc(void) {
-    gc_collect();
-    return mp_const_none;
-}
-
-mp_obj_t pyb_gpio(int n_args, mp_obj_t *args) {
-    // assert(1 <= n_args && n_args <= 2);
-
-    uint pin = mp_obj_get_int(args[0]);
-    if (pin > CORE_NUM_DIGITAL) {
-        goto pin_error;
-    }
-
-    if (n_args == 1) {
-        // get pin
-        pinMode(pin, INPUT);
-        return MP_OBJ_NEW_SMALL_INT(digitalRead(pin));
-    }
-
-    // set pin
-    pinMode(pin, OUTPUT);
-    digitalWrite(pin, mp_obj_is_true(args[1]));
-    return mp_const_none;
-
-pin_error:
-    mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("pin %d does not exist"), pin);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_gpio_obj, 1, 2, pyb_gpio);
-
-#if 0
-mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
-    mp_obj_t *items = mp_obj_get_array_fixed_n(arg, 4);
-    uint8_t data[4];
-    data[0] = mp_obj_get_int(items[0]);
-    data[1] = mp_obj_get_int(items[1]);
-    data[2] = mp_obj_get_int(items[2]);
-    data[3] = mp_obj_get_int(items[3]);
-    usb_hid_send_report(data);
-    return mp_const_none;
-}
-#endif
-
-#endif // 0
-
-STATIC mp_obj_t pyb_config_source_dir = MP_OBJ_NULL;
-STATIC mp_obj_t pyb_config_main = MP_OBJ_NULL;
-STATIC mp_obj_t pyb_config_usb_mode = MP_OBJ_NULL;
-
-mp_obj_t pyb_source_dir(mp_obj_t source_dir) {
-    if (mp_obj_is_str(source_dir)) {
-        pyb_config_source_dir = source_dir;
-    }
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(pyb_source_dir_obj, pyb_source_dir);
-
-mp_obj_t pyb_main(mp_obj_t main) {
-    if (mp_obj_is_str(main)) {
-        pyb_config_main = main;
-    }
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(pyb_main_obj, pyb_main);
-
-STATIC mp_obj_t pyb_usb_mode(mp_obj_t usb_mode) {
-    if (mp_obj_is_str(usb_mode)) {
-        pyb_config_usb_mode = usb_mode;
-    }
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_mode_obj, pyb_usb_mode);
-
-#if 0
-
-mp_obj_t pyb_delay(mp_obj_t count) {
-    delay(mp_obj_get_int(count));
-    return mp_const_none;
-}
-
-mp_obj_t pyb_led(mp_obj_t state) {
-    led_state(PYB_LED_BUILTIN, mp_obj_is_true(state));
-    return state;
-}
-
-#endif  // 0
-
-#if 0
-char *strdup(const char *str) {
-    uint32_t len = strlen(str);
-    char *s2 = m_new(char, len + 1);
-    memcpy(s2, str, len);
-    s2[len] = 0;
-    return s2;
-}
-#endif
-
-int main(void) {
-    // TODO: Put this in a more common initialization function.
-    // Turn on STKALIGN which keeps the stack 8-byte aligned for interrupts
-    // (per EABI)
-    #define SCB_CCR_STKALIGN (1 << 9)
-    SCB_CCR |= SCB_CCR_STKALIGN;
-
-    mp_stack_ctrl_init();
-    mp_stack_set_limit(10240);
-
-    pinMode(LED_BUILTIN, OUTPUT);
-    led_init();
-
-//    int first_soft_reset = true;
-
-soft_reset:
-
-    led_state(PYB_LED_BUILTIN, 1);
-
-    // GC init
-    gc_init(&_heap_start, (void *)HEAP_END);
-
-    // MicroPython init
-    mp_init();
-
-    readline_init0();
-
-    pin_init0();
-
-    #if 0
-    // add some functions to the python namespace
-    {
-        mp_store_name(MP_QSTR_help, mp_make_function_n(0, pyb_help));
-        mp_obj_t m = mp_obj_new_module(MP_QSTR_pyb);
-        mp_store_attr(m, MP_QSTR_info, mp_make_function_n(0, pyb_info));
-        mp_store_attr(m, MP_QSTR_source_dir, mp_make_function_n(1, pyb_source_dir));
-        mp_store_attr(m, MP_QSTR_main, mp_make_function_n(1, pyb_main));
-        mp_store_attr(m, MP_QSTR_gc, mp_make_function_n(0, pyb_gc));
-        mp_store_attr(m, MP_QSTR_delay, mp_make_function_n(1, pyb_delay));
-        mp_store_attr(m, MP_QSTR_led, mp_make_function_n(1, pyb_led));
-        mp_store_attr(m, MP_QSTR_LED, (mp_obj_t)&pyb_led_type);
-        mp_store_attr(m, MP_QSTR_analogRead, mp_make_function_n(1, pyb_analog_read));
-        mp_store_attr(m, MP_QSTR_analogWrite, mp_make_function_n(2, pyb_analog_write));
-        mp_store_attr(m, MP_QSTR_analogWriteResolution, mp_make_function_n(1, pyb_analog_write_resolution));
-        mp_store_attr(m, MP_QSTR_analogWriteFrequency, mp_make_function_n(2, pyb_analog_write_frequency));
-
-        mp_store_attr(m, MP_QSTR_gpio, (mp_obj_t)&pyb_gpio_obj);
-        mp_store_attr(m, MP_QSTR_Servo, mp_make_function_n(0, pyb_Servo));
-        mp_store_name(MP_QSTR_pyb, m);
-    }
-    #endif
-
-    #if MICROPY_MODULE_FROZEN
-    pyexec_frozen_module("boot.py", false);
-    #else
-    if (!pyexec_file_if_exists("/boot.py")) {
-        flash_error(4);
-    }
-    #endif
-
-    // Turn bootup LED off
-    led_state(PYB_LED_BUILTIN, 0);
-
-    // run main script
-    #if MICROPY_MODULE_FROZEN
-    pyexec_frozen_module("main.py", true);
-    #else
-    {
-        vstr_t *vstr = vstr_new(16);
-        vstr_add_str(vstr, "/");
-        if (pyb_config_main == MP_OBJ_NULL) {
-            vstr_add_str(vstr, "main.py");
-        } else {
-            vstr_add_str(vstr, mp_obj_str_get_str(pyb_config_main));
-        }
-        if (!pyexec_file_if_exists(vstr_null_terminated_str(vstr))) {
-            flash_error(3);
-        }
-        vstr_free(vstr);
-    }
-    #endif
-
-    // enter REPL
-    // 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;
-            }
-        }
-    }
-
-    printf("MPY: soft reboot\n");
-
-//    first_soft_reset = false;
-    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.
-void __libc_init_array(void) {
-}
-
-// ultoa is used by usb_init_serialnumber. Normally ultoa would be provided
-// by nonstd.c from the teensy core, but it conflicts with some of the
-// MicroPython functions in string0.c, so we provide ultoa here.
-char *ultoa(unsigned long val, char *buf, int radix) {
-    unsigned digit;
-    int i = 0, j;
-    char t;
-
-    while (1) {
-        digit = val % radix;
-        buf[i] = ((digit < 10) ? '0' + digit : 'A' + digit - 10);
-        val /= radix;
-        if (val == 0) {
-            break;
-        }
-        i++;
-    }
-    buf[i + 1] = 0;
-    for (j = 0; j < i; j++, i--) {
-        t = buf[j];
-        buf[j] = buf[i];
-        buf[i] = t;
-    }
-    return buf;
-}
diff --git a/ports/teensy/make-pins.py b/ports/teensy/make-pins.py
deleted file mode 100755
index 844e2d8bc3ebc..0000000000000
--- a/ports/teensy/make-pins.py
+++ /dev/null
@@ -1,429 +0,0 @@
-#!/usr/bin/env python
-"""Creates the pin file for the Teensy."""
-
-from __future__ import print_function
-
-import argparse
-import sys
-import csv
-
-SUPPORTED_FN = {
-    "FTM": ["CH0", "CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "QD_PHA", "QD_PHB"],
-    "I2C": ["SDA", "SCL"],
-    "UART": ["RX", "TX", "CTS", "RTS"],
-    "SPI": ["NSS", "SCK", "MISO", "MOSI"],
-}
-
-
-def parse_port_pin(name_str):
-    """Parses a string and returns a (port-num, pin-num) tuple."""
-    if len(name_str) < 4:
-        raise ValueError("Expecting pin name to be at least 4 characters.")
-    if name_str[0:2] != "PT":
-        raise ValueError("Expecting pin name to start with PT")
-    if name_str[2] not in ("A", "B", "C", "D", "E", "Z"):
-        raise ValueError("Expecting pin port to be between A and E or Z")
-    port = ord(name_str[2]) - ord("A")
-    pin_str = name_str[3:].split("/")[0]
-    if not pin_str.isdigit():
-        raise ValueError("Expecting numeric pin number.")
-    return (port, int(pin_str))
-
-
-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
-    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(
-            "({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}".format(
-                self.idx, self.func, fn_num, self.pin_type, self.ptr(), self.af_str
-            )
-        )
-
-    def qstr_list(self):
-        return [self.mux_name()]
-
-
-class Pin(object):
-    """Holds the information associated with a pin."""
-
-    def __init__(self, port, pin):
-        self.port = port
-        self.pin = pin
-        self.alt_fn = []
-        self.alt_fn_count = 0
-        self.adc_num = 0
-        self.adc_channel = 0
-        self.board_pin = False
-
-    def port_letter(self):
-        return chr(self.port + ord("A"))
-
-    def cpu_pin_name(self):
-        return "{:s}{:d}".format(self.port_letter(), self.pin)
-
-    def is_board_pin(self):
-        return self.board_pin
-
-    def set_is_board_pin(self):
-        self.board_pin = True
-
-    def parse_adc(self, adc_str):
-        if adc_str[:3] != "ADC":
-            return
-        (adc, channel) = adc_str.split("_")
-        for idx in range(3, len(adc)):
-            adc_num = int(adc[idx])  # 1, 2, or 3
-            self.adc_num |= 1 << (adc_num - 1)
-        self.adc_channel = int(channel[2:])
-
-    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 adc_num_str(self):
-        str = ""
-        for adc_num in range(1, 4):
-            if self.adc_num & (1 << (adc_num - 1)):
-                if len(str) > 0:
-                    str += " | "
-                str += "PIN_ADC"
-                str += chr(ord("0") + adc_num)
-        if len(str) == 0:
-            str = "0"
-        return str
-
-    def print(self):
-        if self.alt_fn_count == 0:
-            print("// ", end="")
-        print("const 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(
-            "const pin_obj_t pin_{:s} = PIN({:s}, {:d}, {:d}, {:s}, {:s}, {:d});".format(
-                self.cpu_pin_name(),
-                self.port_letter(),
-                self.pin,
-                self.alt_fn_count,
-                self.alt_fn_name(null_if_0=True),
-                self.adc_num_str(),
-                self.adc_channel,
-            )
-        )
-        print("")
-
-    def print_header(self, hdr_file):
-        hdr_file.write("extern const pin_obj_t pin_{:s};\n".format(self.cpu_pin_name()))
-        if self.alt_fn_count > 0:
-            hdr_file.write(
-                "extern const pin_af_obj_t pin_{:s}_af[];\n".format(self.cpu_pin_name())
-            )
-
-    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
-
-    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
-
-    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:
-                    (port_num, pin_num) = parse_port_pin(row[pinname_col])
-                except:
-                    continue
-                pin = Pin(port_num, pin_num)
-                for af_idx in range(af_col, len(row)):
-                    if af_idx >= af_col:
-                        pin.parse_af(af_idx - af_col, 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:
-                try:
-                    (port_num, pin_num) = parse_port_pin(row[1])
-                except:
-                    continue
-                pin = self.find_pin(port_num, pin_num)
-                if pin:
-                    pin.set_is_board_pin()
-                    self.board_pins.append(NamedPin(row[0], 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}) }},".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_adc(self, adc_num):
-        print("")
-        print("const pin_obj_t * const pin_adc{:d}[] = {{".format(adc_num))
-        for channel in range(16):
-            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}, // {:d}".format(pin.cpu_pin_name(), channel))
-                    adc_found = True
-                    break
-            if not adc_found:
-                print("  NULL,    // {:d}".format(channel))
-        print("};")
-
-    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)
-            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")
-
-    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="mk20dx256_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="mk20dx256_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, 4, 3)
-
-    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_adc(1)
-    pins.print_adc(2)
-    pins.print_adc(3)
-    pins.print_header(args.hdr_filename)
-    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/teensy/manifest.py b/ports/teensy/manifest.py
deleted file mode 100644
index 1fefd686878d8..0000000000000
--- a/ports/teensy/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-freeze_as_str("$(PORT_DIR)/memzip_files")
diff --git a/ports/teensy/memzip_files/boot.py b/ports/teensy/memzip_files/boot.py
deleted file mode 100644
index e2279896d5b41..0000000000000
--- a/ports/teensy/memzip_files/boot.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import pyb
-
-print("Executing boot.py")
-
-
-def pins():
-    for pin_name in dir(pyb.Pin.board):
-        pin = pyb.Pin(pin_name)
-        print("{:10s} {:s}".format(pin_name, str(pin)))
-
-
-def af():
-    for pin_name in dir(pyb.Pin.board):
-        pin = pyb.Pin(pin_name)
-        print("{:10s} {:s}".format(pin_name, str(pin.af_list())))
diff --git a/ports/teensy/memzip_files/main.py b/ports/teensy/memzip_files/main.py
deleted file mode 100644
index a3b3904e89089..0000000000000
--- a/ports/teensy/memzip_files/main.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import pyb
-
-print("Executing main.py")
-
-led = pyb.LED(1)
-
-led.on()
-pyb.delay(100)
-led.off()
-pyb.delay(100)
-led.on()
-pyb.delay(100)
-led.off()
diff --git a/ports/teensy/mk20dx256.ld b/ports/teensy/mk20dx256.ld
deleted file mode 100644
index bff0a8c4aa7b7..0000000000000
--- a/ports/teensy/mk20dx256.ld
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-MEMORY
-{
-        FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 256K
-        RAM  (rwx) : ORIGIN = 0x1FFF8000, LENGTH = 64K
-}
-
-/* produce a link error if there is not this amount of RAM for these sections */
-_minimum_stack_size = 2K;
-_minimum_heap_size = 16K;
-
-/* INCLUDE common.ld */
-
-/* Teensyduino Core Library
- * http://www.pjrc.com/teensy/
- * Copyright (c) 2013 PJRC.COM, LLC.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 2. If the Software is incorporated into a build system that allows
- * selection among a list of target devices, then similar target
- * devices manufactured by PJRC.COM must be included in the list of
- * target devices and selectable in the same manner.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-
-
-SECTIONS
-{
-    .text : {
-        . = 0;
-        KEEP(*(.vectors))
-        *(.startup*)
-        /* TODO: does linker detect startup overflow onto flashconfig? */
-        . = 0x400;
-        KEEP(*(.flashconfig*))
-        *(.text*)
-        *(.rodata*)
-        . = ALIGN(4);
-        KEEP(*(.init))
-        . = ALIGN(4);
-        __preinit_array_start = .;
-        KEEP (*(.preinit_array))
-        __preinit_array_end = .;
-        __init_array_start = .;
-        KEEP (*(SORT(.init_array.*)))
-        KEEP (*(.init_array))
-        __init_array_end = .;
-    } > FLASH = 0xFF
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-    } > FLASH
-    _etext = .;
-
-    .usbdescriptortable (NOLOAD) : {
-        /* . = ORIGIN(RAM); */
-        . = ALIGN(512);
-        *(.usbdescriptortable*)
-    } > RAM
-
-    .dmabuffers (NOLOAD) : {
-        . = ALIGN(4);
-        *(.dmabuffers*)
-    } > RAM
-
-    .usbbuffers (NOLOAD) : {
-        . = ALIGN(4);
-        *(.usbbuffers*)
-    } > RAM
-
-    /* used by the startup to initialize data */
-    _sidata = LOADADDR(.data);
-
-    .data : AT (_etext) {
-        . = ALIGN(4);
-        _sdata = .;
-        _ram_start = .;
-        *(.data*)
-        . = ALIGN(4);
-        _edata = .;
-    } > RAM
-
-        /*
-     * _staticfs is the place in flash where the static filesystem which
-     * is concatenated to the .hex file will wind up.
-         */
-    _staticfs = LOADADDR(.data) + SIZEOF(.data);
-
-    .noinit (NOLOAD) : {
-        *(.noinit*)
-    } > RAM
-
-    .bss : {
-        . = ALIGN(4);
-        _sbss = .;
-        *(.bss*)
-        *(COMMON)
-        . = ALIGN(4);
-        _ebss = .;
-        __bss_end = .;
-    } > 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 */
-        . = . + _minimum_heap_size;
-    } >RAM
-
-    /* this just checks there is enough RAM for the stack */
-    .stack :
-        {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
-
-    _estack = ORIGIN(RAM) + LENGTH(RAM);
-    _ram_end = ORIGIN(RAM) + LENGTH(RAM);
-    _heap_end = ORIGIN(RAM) + 0xe000;
-}
-
-
-
-
diff --git a/ports/teensy/mk20dx256_af.csv b/ports/teensy/mk20dx256_af.csv
deleted file mode 100644
index 571587de6b4e8..0000000000000
--- a/ports/teensy/mk20dx256_af.csv
+++ /dev/null
@@ -1,65 +0,0 @@
-Pin,Name,Default,ALT0,ALT1,ALT2,ALT3,ALT4,ALT5,ALT6,ALT7,EzPort
-1,PTE0,ADC1_SE4a,ADC1_SE4a,PTE0,SPI1_PCS1,UART1_TX,,,I2C1_SDA,RTC_CLKOUT,
-2,PTE1/LLWU_P0,ADC1_SE5a,ADC1_SE5a,PTE1/LLWU_P0,SPI1_SOUT,UART1_RX,,,I2C1_SCL,SPI1_SIN,
-3,VDD,VDD,VDD,,,,,,,,
-4,VSS,VSS,VSS,,,,,,,,
-5,USB0_DP,USB0_DP,USB0_DP,,,,,,,,
-6,USB0_DM,USB0_DM,USB0_DM,,,,,,,,
-7,VOUT33,VOUT33,VOUT33,,,,,,,,
-8,VREGIN,VREGIN,VREGIN,,,,,,,,
-9,PGA0_DP/ADC0_DP0/ADC1_DP3,PGA0_DP/ADC0_DP0/ADC1_DP3,PGA0_DP/ADC0_DP0/ADC1_DP3,PTZ0,,,,,,,
-10,PGA0_DM/ADC0_DM0/ADC1_DM3,PGA0_DM/ADC0_DM0/ADC1_DM3,PGA0_DM/ADC0_DM0/ADC1_DM3,PTZ1,,,,,,,
-11,PGA1_DP/ADC1_DP0/ADC0_DP3,PGA1_DP/ADC1_DP0/ADC0_DP3,PGA1_DP/ADC1_DP0/ADC0_DP3,PTZ2,,,,,,,
-12,PGA1_DM/ADC1_DM0/ADC0_DM3,PGA1_DM/ADC1_DM0/ADC0_DM3,PGA1_DM/ADC1_DM0/ADC0_DM3,PTZ3,,,,,,,
-13,VDDA,VDDA,VDDA,,,,,,,,
-14,VREFH,VREFH,VREFH,,,,,,,,
-15,VREFL,VREFL,VREFL,,,,,,,,
-16,VSSA,VSSA,VSSA,,,,,,,,
-17,VREF_OUT/CMP1_IN5/CMP0_IN5/ADC1_SE18,VREF_OUT/CMP1_IN5/CMP0_IN5/ADC1_SE18,VREF_OUT/CMP1_IN5/CMP0_IN5/ADC1_SE18,PTZ4,,,,,,,
-18,DAC0_OUT/CMP1_IN3/ADC0_SE23,DAC0_OUT/CMP1_IN3/ADC0_SE23,DAC0_OUT/CMP1_IN3/ADC0_SE23,PTZ5,,,,,,,
-19,XTAL32,XTAL32,XTAL32,,,,,,,,
-20,EXTAL32,EXTAL32,EXTAL32,,,,,,,,
-21,VBAT,VBAT,VBAT,,,,,,,,
-22,PTA0,JTAG_TCLK/SWD_CLK/EZP_CLK,TSI0_CH1,PTA0,UART0_CTS_b/UART0_COL_b,FTM0_CH5,,,,JTAG_TCLK/SWD_CLK,EZP_CLK
-23,PTA1,JTAG_TDI/EZP_DI,TSI0_CH2,PTA1,UART0_RX,FTM0_CH6,,,,JTAG_TDI,EZP_DI
-24,PTA2,JTAG_TDO/TRACE_SWO/EZP_DO,TSI0_CH3,PTA2,UART0_TX,FTM0_CH7,,,,JTAG_TDO/TRACE_SWO,EZP_DO
-25,PTA3,JTAG_TMS/SWD_DIO,TSI0_CH4,PTA3,UART0_RTS_b,FTM0_CH0,,,,JTAG_TMS/SWD_DIO,
-26,PTA4/LLWU_P3,NMI_b/EZP_CS_b,TSI0_CH5,PTA4/LLWU_P3,,FTM0_CH1,,,NMI_b,EZP_CS_b,
-27,PTA5,DISABLED,,PTA5,USB_CLKIN,FTM0_CH2,,CMP2_OUT,I2S0_TX_BCLK,JTAG_TRST_b,
-28,PTA12,CMP2_IN0,CMP2_IN0,PTA12,CAN0_TX,FTM1_CH0,,,I2S0_TXD0,FTM1_QD_PHA,
-29,PTA13/LLWU_P4,CMP2_IN1,CMP2_IN1,PTA13/LLWU_P4,CAN0_RX,FTM1_CH1,,,I2S0_TX_FS,FTM1_QD_PHB,
-30,VDD,VDD,VDD,,,,,,,,
-31,VSS,VSS,VSS,,,,,,,,
-32,PTA18,EXTAL0,EXTAL0,PTA18,,FTM0_FLT2,FTM_CLKIN0,,,,
-33,PTA19,XTAL0,XTAL0,PTA19,,FTM1_FLT0,FTM_CLKIN1,,LPTMR0_ALT1,,
-34,RESET_b,RESET_b,RESET_b,,,,,,,,
-35,PTB0/LLWU_P5,ADC0_SE8/ADC1_SE8/TSI0_CH0,ADC0_SE8/ADC1_SE8/TSI0_CH0,PTB0/LLWU_P5,I2C0_SCL,FTM1_CH0,,,FTM1_QD_PHA,,
-36,PTB1,ADC0_SE9/ADC1_SE9/TSI0_CH6,ADC0_SE9/ADC1_SE9/TSI0_CH6,PTB1,I2C0_SDA,FTM1_CH1,,,FTM1_QD_PHB,,
-37,PTB2,ADC0_SE12/TSI0_CH7,ADC0_SE12/TSI0_CH7,PTB2,I2C0_SCL,UART0_RTS_b,,,FTM0_FLT3,,
-38,PTB3,ADC0_SE13/TSI0_CH8,ADC0_SE13/TSI0_CH8,PTB3,I2C0_SDA,UART0_CTS_b/UART0_COL_b,,,FTM0_FLT0,,
-39,PTB16,TSI0_CH9,TSI0_CH9,PTB16,SPI1_SOUT,UART0_RX,,FB_AD17,EWM_IN,,
-40,PTB17,TSI0_CH10,TSI0_CH10,PTB17,SPI1_SIN,UART0_TX,,FB_AD16,EWM_OUT_b,,
-41,PTB18,TSI0_CH11,TSI0_CH11,PTB18,CAN0_TX,FTM2_CH0,I2S0_TX_BCLK,FB_AD15,FTM2_QD_PHA,,
-42,PTB19,TSI0_CH12,TSI0_CH12,PTB19,CAN0_RX,FTM2_CH1,I2S0_TX_FS,FB_OE_b,FTM2_QD_PHB,,
-43,PTC0,ADC0_SE14/TSI0_CH13,ADC0_SE14/TSI0_CH13,PTC0,SPI0_PCS4,PDB0_EXTRG,,FB_AD14,I2S0_TXD1,,
-44,PTC1/LLWU_P6,ADC0_SE15/TSI0_CH14,ADC0_SE15/TSI0_CH14,PTC1/LLWU_P6,SPI0_PCS3,UART1_RTS_b,FTM0_CH0,FB_AD13,I2S0_TXD0,,
-45,PTC2,ADC0_SE4b/CMP1_IN0/TSI0_CH15,ADC0_SE4b/CMP1_IN0/TSI0_CH15,PTC2,SPI0_PCS2,UART1_CTS_b,FTM0_CH1,FB_AD12,I2S0_TX_FS,,
-46,PTC3/LLWU_P7,CMP1_IN1,CMP1_IN1,PTC3/LLWU_P7,SPI0_PCS1,UART1_RX,FTM0_CH2,CLKOUT,I2S0_TX_BCLK,,
-47,VSS,VSS,VSS,,,,,,,,
-48,VDD,VDD,VDD,,,,,,,,
-49,PTC4/LLWU_P8,DISABLED,,PTC4/LLWU_P8,SPI0_PCS0,UART1_TX,FTM0_CH3,FB_AD11,CMP1_OUT,,
-50,PTC5/LLWU_P9,DISABLED,,PTC5/LLWU_P9,SPI0_SCK,LPTMR0_ALT2,I2S0_RXD0,FB_AD10,CMP0_OUT,,
-51,PTC6/LLWU_P10,CMP0_IN0,CMP0_IN0,PTC6/LLWU_P10,SPI0_SOUT,PDB0_EXTRG,I2S0_RX_BCLK,FB_AD9,I2S0_MCLK,,
-52,PTC7,CMP0_IN1,CMP0_IN1,PTC7,SPI0_SIN,USB_SOF_OUT,I2S0_RX_FS,FB_AD8,,,
-53,PTC8,ADC1_SE4b/CMP0_IN2,ADC1_SE4b/CMP0_IN2,PTC8,,,I2S0_MCLK,FB_AD7,,,
-54,PTC9,ADC1_SE5b/CMP0_IN3,ADC1_SE5b/CMP0_IN3,PTC9,,,I2S0_RX_BCLK,FB_AD6,FTM2_FLT0,,
-55,PTC10,ADC1_SE6b,ADC1_SE6b,PTC10,I2C1_SCL,,I2S0_RX_FS,FB_AD5,,,
-56,PTC11/LLWU_P11,ADC1_SE7b,ADC1_SE7b,PTC11/LLWU_P11,I2C1_SDA,,I2S0_RXD1,FB_RW_b,,,
-57,PTD0/LLWU_P12,DISABLED,,PTD0/LLWU_P12,SPI0_PCS0,UART2_RTS_b,,FB_ALE/FB_CS1_b/FB_TS_b,,,
-58,PTD1,ADC0_SE5b,ADC0_SE5b,PTD1,SPI0_SCK,UART2_CTS_b,,FB_CS0_b,,,
-59,PTD2/LLWU_P13,DISABLED,,PTD2/LLWU_P13,SPI0_SOUT,UART2_RX,,FB_AD4,,,
-60,PTD3,DISABLED,,PTD3,SPI0_SIN,UART2_TX,,FB_AD3,,,
-61,PTD4/LLWU_P14,DISABLED,,PTD4/LLWU_P14,SPI0_PCS1,UART0_RTS_b,FTM0_CH4,FB_AD2,EWM_IN,,
-62,PTD5,ADC0_SE6b,ADC0_SE6b,PTD5,SPI0_PCS2,UART0_CTS_b/UART0_COL_b,FTM0_CH5,FB_AD1,EWM_OUT_b,,
-63,PTD6/LLWU_P15,ADC0_SE7b,ADC0_SE7b,PTD6/LLWU_P15,SPI0_PCS3,UART0_RX,FTM0_CH6,FB_AD0,FTM0_FLT0f,,
-64,PTD7,DISABLED,,PTD7,CMT_IRO,UART0_TX,FTM0_CH7,,FTM0_FLT1,,
diff --git a/ports/teensy/mk20dx256_prefix.c b/ports/teensy/mk20dx256_prefix.c
deleted file mode 100644
index 4790bb83ca9e0..0000000000000
--- a/ports/teensy/mk20dx256_prefix.c
+++ /dev/null
@@ -1,33 +0,0 @@
-// stm32fxx-prefix.c becomes the initial portion of the generated pins file.
-
-#include <stdio.h>
-#include <mk20dx128.h>
-
-#include "py/obj.h"
-#include "teensy_hal.h"
-#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) \
-    }
-
-#define PIN(p_port, p_pin, p_num_af, 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 = (p_num_af), \
-        .pin_mask = (1 << (p_pin)), \
-        .gpio = GPIO##p_port, \
-        .af = p_af, \
-        .adc_num = p_adc_num, \
-        .adc_channel = p_adc_channel, \
-    }
diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c
deleted file mode 100644
index 5dae8f73e5e33..0000000000000
--- a/ports/teensy/modpyb.c
+++ /dev/null
@@ -1,364 +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 <stdint.h>
-#include <stdio.h>
-#include <mk20dx128.h>
-#include "Arduino.h"
-
-#include "py/obj.h"
-#include "py/gc.h"
-#include "py/mphal.h"
-
-#include "shared/runtime/pyexec.h"
-
-#include "gccollect.h"
-#include "systick.h"
-#include "led.h"
-#include "pin.h"
-#include "timer.h"
-#include "extint.h"
-#include "usrsw.h"
-#include "rng.h"
-#include "uart.h"
-#include "storage.h"
-#include "sdcard.h"
-#include "accel.h"
-#include "servo.h"
-#include "dac.h"
-#include "usb.h"
-#include "portmodules.h"
-#include "modmachine.h"
-
-/// \module pyb - functions related to the pyboard
-///
-/// The `pyb` module contains specific functions related to the pyboard.
-
-/// \function bootloader()
-/// Activate the bootloader without BOOT* pins.
-STATIC mp_obj_t pyb_bootloader(void) {
-    printf("bootloader command not current supported\n");
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_bootloader_obj, pyb_bootloader);
-
-/// \function info([dump_alloc_table])
-/// Print out lots of information about the board.
-STATIC mp_obj_t pyb_info(uint n_args, const mp_obj_t *args) {
-    // get and print unique id; 96 bits
-    {
-        byte *id = (byte *)0x40048058;
-        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]);
-    }
-
-    // get and print clock speeds
-    printf("CPU=%u\nBUS=%u\nMEM=%u\n", F_CPU, F_BUS, F_MEM);
-
-    // 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("_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
-    {
-        uint 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("  " 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(&mp_plat_print);
-    }
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj, 0, 1, pyb_info);
-
-/// \function unique_id()
-/// Returns a string of 12 bytes (96 bits), which is the unique ID for the MCU.
-STATIC mp_obj_t pyb_unique_id(void) {
-    byte *id = (byte *)0x40048058;
-    return mp_obj_new_bytes(id, 12);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_unique_id_obj, pyb_unique_id);
-
-/// \function freq()
-/// Return a tuple of clock frequencies: (SYSCLK, HCLK, PCLK1, PCLK2).
-// TODO should also be able to set frequency via this function
-STATIC mp_obj_t pyb_freq(void) {
-    mp_obj_t tuple[3] = {
-        mp_obj_new_int(F_CPU),
-        mp_obj_new_int(F_BUS),
-        mp_obj_new_int(F_MEM),
-    };
-    return mp_obj_new_tuple(3, tuple);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_freq_obj, pyb_freq);
-
-/// \function sync()
-/// Sync all file systems.
-STATIC mp_obj_t pyb_sync(void) {
-    printf("sync not currently implemented\n");
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_sync_obj, pyb_sync);
-
-/// \function millis()
-/// Returns the number of milliseconds since the board was last reset.
-///
-/// The result is always a MicroPython smallint (31-bit signed number), so
-/// after 2^30 milliseconds (about 12.4 days) this will start to return
-/// negative numbers.
-STATIC mp_obj_t pyb_millis(void) {
-    // We want to "cast" the 32 bit unsigned into a small-int.  This means
-    // copying the MSB down 1 bit (extending the sign down), which is
-    // equivalent to just using the MP_OBJ_NEW_SMALL_INT macro.
-    return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_millis_obj, pyb_millis);
-
-/// \function elapsed_millis(start)
-/// Returns the number of milliseconds which have elapsed since `start`.
-///
-/// This function takes care of counter wrap, and always returns a positive
-/// number. This means it can be used to measure periods up to about 12.4 days.
-///
-/// Example:
-///     start = pyb.millis()
-///     while pyb.elapsed_millis(start) < 1000:
-///         # Perform some operation
-STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
-    uint32_t startMillis = mp_obj_get_int(start);
-    uint32_t currMillis = mp_hal_ticks_ms();
-    return MP_OBJ_NEW_SMALL_INT((currMillis - startMillis) & 0x3fffffff);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
-
-/// \function micros()
-/// Returns the number of microseconds since the board was last reset.
-///
-/// The result is always a MicroPython smallint (31-bit signed number), so
-/// after 2^30 microseconds (about 17.8 minutes) this will start to return
-/// negative numbers.
-STATIC mp_obj_t pyb_micros(void) {
-    // We want to "cast" the 32 bit unsigned into a small-int.  This means
-    // copying the MSB down 1 bit (extending the sign down), which is
-    // equivalent to just using the MP_OBJ_NEW_SMALL_INT macro.
-    return MP_OBJ_NEW_SMALL_INT(micros());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_micros_obj, pyb_micros);
-
-/// \function elapsed_micros(start)
-/// Returns the number of microseconds which have elapsed since `start`.
-///
-/// This function takes care of counter wrap, and always returns a positive
-/// number. This means it can be used to measure periods up to about 17.8 minutes.
-///
-/// Example:
-///     start = pyb.micros()
-///     while pyb.elapsed_micros(start) < 1000:
-///         # Perform some operation
-STATIC mp_obj_t pyb_elapsed_micros(mp_obj_t start) {
-    uint32_t startMicros = mp_obj_get_int(start);
-    uint32_t currMicros = micros();
-    return MP_OBJ_NEW_SMALL_INT((currMicros - startMicros) & 0x3fffffff);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);
-
-/// \function delay(ms)
-/// Delay for the given number of milliseconds.
-STATIC mp_obj_t pyb_delay(mp_obj_t ms_in) {
-    mp_int_t ms = mp_obj_get_int(ms_in);
-    if (ms >= 0) {
-        mp_hal_delay_ms(ms);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_delay_obj, pyb_delay);
-
-/// \function udelay(us)
-/// Delay for the given number of microseconds.
-STATIC mp_obj_t pyb_udelay(mp_obj_t usec_in) {
-    mp_int_t usec = mp_obj_get_int(usec_in);
-    delayMicroseconds(usec);
-    return mp_const_none;
-}
-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;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_stop_obj, pyb_stop);
-
-STATIC mp_obj_t pyb_standby(void) {
-    printf("standby not currently implemented\n");
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_standby_obj, pyb_standby);
-
-/// \function have_cdc()
-/// Return True if USB is connected as a serial device, False otherwise.
-STATIC mp_obj_t pyb_have_cdc(void) {
-    return mp_obj_new_bool(usb_vcp_is_connected());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_have_cdc_obj, pyb_have_cdc);
-
-/// \function hid((buttons, x, y, z))
-/// Takes a 4-tuple (or list) and sends it to the USB host (the PC) to
-/// signal a HID mouse-motion event.
-STATIC mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
-    #if 1
-    printf("hid_send_report not currently implemented\n");
-    #else
-    mp_obj_t *items;
-    mp_obj_get_array_fixed_n(arg, 4, &items);
-    uint8_t data[4];
-    data[0] = mp_obj_get_int(items[0]);
-    data[1] = mp_obj_get_int(items[1]);
-    data[2] = mp_obj_get_int(items[2]);
-    data[3] = mp_obj_get_int(items[3]);
-    usb_hid_send_report(data);
-    #endif
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_hid_send_report_obj, pyb_hid_send_report);
-
-MP_DECLARE_CONST_FUN_OBJ_1(pyb_source_dir_obj); // defined in main.c
-MP_DECLARE_CONST_FUN_OBJ_1(pyb_main_obj); // defined in main.c
-MP_DECLARE_CONST_FUN_OBJ_1(pyb_usb_mode_obj); // defined in main.c
-
-STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pyb) },
-
-    { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&pyb_bootloader_obj) },
-    { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&pyb_info_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unique_id), MP_ROM_PTR(&pyb_unique_id_obj) },
-    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&pyb_freq_obj) },
-    #if MICROPY_REPL_INFO
-    { 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(&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) },
-    { MP_ROM_QSTR(MP_QSTR_source_dir), MP_ROM_PTR(&pyb_source_dir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_main), MP_ROM_PTR(&pyb_main_obj) },
-    { MP_ROM_QSTR(MP_QSTR_usb_mode), MP_ROM_PTR(&pyb_usb_mode_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_have_cdc), MP_ROM_PTR(&pyb_have_cdc_obj) },
-    { MP_ROM_QSTR(MP_QSTR_hid), MP_ROM_PTR(&pyb_hid_send_report_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_millis), MP_ROM_PTR(&pyb_millis_obj) },
-    { MP_ROM_QSTR(MP_QSTR_elapsed_millis), MP_ROM_PTR(&pyb_elapsed_millis_obj) },
-    { MP_ROM_QSTR(MP_QSTR_micros), MP_ROM_PTR(&pyb_micros_obj) },
-    { MP_ROM_QSTR(MP_QSTR_elapsed_micros), MP_ROM_PTR(&pyb_elapsed_micros_obj) },
-    { MP_ROM_QSTR(MP_QSTR_delay), MP_ROM_PTR(&pyb_delay_obj) },
-    { MP_ROM_QSTR(MP_QSTR_udelay), MP_ROM_PTR(&pyb_udelay_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&pyb_sync_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&pyb_timer_type) },
-
-// #if MICROPY_HW_ENABLE_RNG
-//    { MP_ROM_QSTR(MP_QSTR_rng), MP_ROM_PTR(&pyb_rng_get_obj) },
-// #endif
-
-// #if MICROPY_HW_ENABLE_RTC
-//    { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&pyb_rtc_type) },
-// #endif
-
-    { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pin_type) },
-//    { MP_ROM_QSTR(MP_QSTR_ExtInt), MP_ROM_PTR(&extint_type) },
-
-    #if MICROPY_HW_ENABLE_SERVO
-    { MP_ROM_QSTR(MP_QSTR_pwm), MP_ROM_PTR(&pyb_pwm_set_obj) },
-    { MP_ROM_QSTR(MP_QSTR_servo), MP_ROM_PTR(&pyb_servo_set_obj) },
-    { MP_ROM_QSTR(MP_QSTR_Servo), MP_ROM_PTR(&pyb_servo_type) },
-    #endif
-
-    #if MICROPY_HW_HAS_SWITCH
-    { MP_ROM_QSTR(MP_QSTR_Switch), MP_ROM_PTR(&pyb_switch_type) },
-    #endif
-
-// #if MICROPY_HW_HAS_SDCARD
-//    { MP_ROM_QSTR(MP_QSTR_SD), MP_ROM_PTR(&pyb_sdcard_obj) },
-// #endif
-
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pyb_led_type) },
-//    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&pyb_i2c_type) },
-//    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&pyb_spi_type) },
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
-
-//    { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&pyb_adc_type) },
-//    { MP_ROM_QSTR(MP_QSTR_ADCAll), MP_ROM_PTR(&pyb_adc_all_type) },
-
-// #if MICROPY_HW_ENABLE_DAC
-//    { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&pyb_dac_type) },
-// #endif
-
-// #if MICROPY_HW_HAS_MMA7660
-//    { MP_ROM_QSTR(MP_QSTR_Accel), MP_ROM_PTR(&pyb_accel_type) },
-// #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);
-
-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);
diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
deleted file mode 100644
index f67eb66fab48e..0000000000000
--- a/ports/teensy/mpconfigport.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <stdint.h>
-
-// options to control how MicroPython is built
-
-#define MICROPY_ALLOC_PATH_MAX      (128)
-#define MICROPY_EMIT_THUMB          (1)
-#define MICROPY_EMIT_INLINE_THUMB   (1)
-#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_ENABLE_SOURCE_LINE  (1)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-
-#define MICROPY_PY_BUILTINS_INPUT   (1)
-#define MICROPY_PY_BUILTINS_HELP    (1)
-#define MICROPY_PY_BUILTINS_HELP_TEXT teensy_help_text
-
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_FROZENSET        (1)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
-#define MICROPY_PY_CMATH            (1)
-
-#define MICROPY_TIMER_REG           (0)
-#define MICROPY_REG                 (MICROPY_TIMER_REG)
-
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (0)
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-
-// 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) }, \
-
-#define MP_STATE_PORT MP_STATE_VM
-
-// type definitions for the specific machine
-
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-
-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;
-
-// 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.
-
-__attribute__((always_inline)) static inline uint32_t __get_PRIMASK(void) {
-    uint32_t result;
-    __asm volatile ("MRS %0, primask" : "=r" (result));
-    return result;
-}
-
-__attribute__((always_inline)) static inline void __set_PRIMASK(uint32_t priMask) {
-    __asm volatile ("MSR primask, %0" : : "r" (priMask) : "memory");
-}
-
-__attribute__((always_inline)) static inline void enable_irq(mp_uint_t state) {
-    __set_PRIMASK(state);
-}
-
-__attribute__((always_inline)) static inline mp_uint_t disable_irq(void) {
-    mp_uint_t state = __get_PRIMASK();
-    __asm__ volatile ("CPSID i");
-    return state;
-}
-
-#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
-#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
-
-// We need to provide a declaration/definition of alloca()
-#include <alloca.h>
-
-// The following would be from a board specific file, if one existed
-
-#define MICROPY_HW_BOARD_NAME       "Teensy-3.1"
-#define MICROPY_HW_MCU_NAME         "MK20DX256"
-
-#define MICROPY_HW_HAS_SWITCH       (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_LED1             (pin_C5)
-#define MICROPY_HW_LED_OTYPE        (GPIO_MODE_OUTPUT_PP)
-#define MICROPY_HW_LED_ON(pin)      (pin->gpio->PSOR = pin->pin_mask)
-#define MICROPY_HW_LED_OFF(pin)     (pin->gpio->PCOR = pin->pin_mask)
-
-#if 0
-// 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)
-#endif
-
-#define MICROPY_MATH_SQRT_ASM     (1)
-
-#define MICROPY_MPHALPORT_H     "teensy_hal.h"
-#define MICROPY_PIN_DEFS_PORT_H "pin_defs_teensy.h"
diff --git a/ports/teensy/pin_defs_teensy.c b/ports/teensy/pin_defs_teensy.c
deleted file mode 100644
index 9041a379e1d28..0000000000000
--- a/ports/teensy/pin_defs_teensy.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <stdint.h>
-#include <mk20dx128.h>
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "pin.h"
-
-// 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 pin_obj_t *pin) {
-    if (pin->gpio == NULL) {
-        // Analog only pin
-        return GPIO_MODE_ANALOG;
-    }
-    volatile uint32_t *port_pcr = GPIO_PIN_TO_PORT_PCR(pin->gpio, pin->pin);
-    uint32_t pcr = *port_pcr;
-    uint32_t af = (pcr & PORT_PCR_MUX_MASK) >> 8;
-    if (af == 0) {
-        return GPIO_MODE_ANALOG;
-    }
-    if (af == 1) {
-        if (pin->gpio->PDDR & (1 << pin->pin)) {
-            if (pcr & PORT_PCR_ODE) {
-                return GPIO_MODE_OUTPUT_OD;
-            }
-            return GPIO_MODE_OUTPUT_PP;
-        }
-        return GPIO_MODE_INPUT;
-    }
-
-    if (pcr & PORT_PCR_ODE) {
-        return GPIO_MODE_AF_OD;
-    }
-    return GPIO_MODE_AF_PP;
-}
-
-// 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 pin_obj_t *pin) {
-    if (pin->gpio == NULL) {
-        // Analog only pin
-        return GPIO_NOPULL;
-    }
-    volatile uint32_t *port_pcr = GPIO_PIN_TO_PORT_PCR(pin->gpio, pin->pin);
-
-    uint32_t pcr = *port_pcr;
-    uint32_t af = (pcr & PORT_PCR_MUX_MASK) >> 8;
-
-    // pull is only valid for digital modes (hence the af > 0 test)
-
-    if (af > 0 && (pcr & PORT_PCR_PE) != 0) {
-        if (pcr & PORT_PCR_PS) {
-            return GPIO_PULLUP;
-        }
-        return GPIO_PULLDOWN;
-    }
-    return GPIO_NOPULL;
-}
-
-// Returns the af (alternate function) index currently set for a pin.
-
-uint32_t pin_get_af(const pin_obj_t *pin) {
-    if (pin->gpio == NULL) {
-        // Analog only pin
-        return 0;
-    }
-    volatile uint32_t *port_pcr = GPIO_PIN_TO_PORT_PCR(pin->gpio, pin->pin);
-    return (*port_pcr & PORT_PCR_MUX_MASK) >> 8;
-}
diff --git a/ports/teensy/pin_defs_teensy.h b/ports/teensy/pin_defs_teensy.h
deleted file mode 100644
index fa248483e9016..0000000000000
--- a/ports/teensy/pin_defs_teensy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-enum {
-    PORT_A,
-    PORT_B,
-    PORT_C,
-    PORT_D,
-    PORT_E,
-    PORT_Z,
-};
-
-enum {
-    AF_FN_FTM,
-    AF_FN_I2C,
-    AF_FN_UART,
-    AF_FN_SPI
-};
-
-enum {
-    AF_PIN_TYPE_FTM_CH0 = 0,
-    AF_PIN_TYPE_FTM_CH1,
-    AF_PIN_TYPE_FTM_CH2,
-    AF_PIN_TYPE_FTM_CH3,
-    AF_PIN_TYPE_FTM_CH4,
-    AF_PIN_TYPE_FTM_CH5,
-    AF_PIN_TYPE_FTM_CH6,
-    AF_PIN_TYPE_FTM_CH7,
-    AF_PIN_TYPE_FTM_QD_PHA,
-    AF_PIN_TYPE_FTM_QD_PHB,
-
-    AF_PIN_TYPE_I2C_SDA = 0,
-    AF_PIN_TYPE_I2C_SCL,
-
-    AF_PIN_TYPE_SPI_MOSI = 0,
-    AF_PIN_TYPE_SPI_MISO,
-    AF_PIN_TYPE_SPI_SCK,
-    AF_PIN_TYPE_SPI_NSS,
-
-    AF_PIN_TYPE_UART_TX = 0,
-    AF_PIN_TYPE_UART_RX,
-    AF_PIN_TYPE_UART_CTS,
-    AF_PIN_TYPE_UART_RTS,
-};
-
-typedef GPIO_TypeDef pin_gpio_t;
diff --git a/ports/teensy/qstrdefsport.h b/ports/teensy/qstrdefsport.h
deleted file mode 100644
index 00d3e2ae3c555..0000000000000
--- a/ports/teensy/qstrdefsport.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// qstrs specific to this port
-// *FORMAT-OFF*
diff --git a/ports/teensy/reg.c b/ports/teensy/reg.c
deleted file mode 100644
index 97a9e6082cc2b..0000000000000
--- a/ports/teensy/reg.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "py/runtime.h"
-#include "reg.h"
-
-#if MICROPY_REG
-
-mp_obj_t reg_cmd(void *base, reg_t *reg, mp_uint_t num_regs, uint n_args, const mp_obj_t *args) {
-    if (n_args == 0) {
-        // dump all regs
-
-        for (mp_uint_t reg_idx = 0; reg_idx < num_regs; reg_idx++, reg++) {
-            printf("  %-8s @0x%08x = 0x%08lx\n",
-                reg->name, (mp_uint_t)base + reg->offset, *(uint32_t *)((uint8_t *)base + reg->offset));
-        }
-        return mp_const_none;
-    }
-
-    mp_uint_t addr = 0;
-
-    if (mp_obj_is_str(args[0])) {
-        const char *name = mp_obj_str_get_str(args[0]);
-        mp_uint_t reg_idx;
-        for (reg_idx = 0; reg_idx < num_regs; reg_idx++, reg++) {
-            if (strcmp(name, reg->name) == 0) {
-                break;
-            }
-        }
-        if (reg_idx >= num_regs) {
-            printf("Unknown register: '%s'\n", name);
-            return mp_const_none;
-        }
-        addr = (mp_uint_t)base + reg->offset;
-    } else {
-        addr = (mp_uint_t)base + mp_obj_get_int(args[0]);
-    }
-
-    if (n_args < 2) {
-        // get
-        printf("0x%08lx\n", *(uint32_t *)addr);
-    } else {
-        *(uint32_t *)addr = mp_obj_get_int(args[1]);
-    }
-    return mp_const_none;
-}
-
-#endif
diff --git a/ports/teensy/reg.h b/ports/teensy/reg.h
deleted file mode 100644
index 8202b537b19e9..0000000000000
--- a/ports/teensy/reg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef MICROPY_INCLUDED_TEENSY_REG_H
-#define MICROPY_INCLUDED_TEENSY_REG_H
-
-typedef struct {
-    const char *name;
-    mp_uint_t offset;
-} reg_t;
-
-#define REG_ENTRY(st, name) { #name, offsetof(st, name) }
-
-mp_obj_t reg_cmd(void *base, reg_t *reg, mp_uint_t num_reg, uint n_args, const mp_obj_t *args);
-
-#endif // MICROPY_INCLUDED_TEENSY_REG_H
diff --git a/ports/teensy/servo.c b/ports/teensy/servo.c
deleted file mode 100644
index bc9b6fdcfb57a..0000000000000
--- a/ports/teensy/servo.c
+++ /dev/null
@@ -1,264 +0,0 @@
-#include <stdio.h>
-#include "misc.h"
-#include "mpconfig.h"
-#include "qstr.h"
-#include "nlr.h"
-#include "obj.h"
-#include "servo.h"
-
-#include "Arduino.h"
-
-#define MAX_SERVOS  12
-#define INVALID_SERVO   -1
-
-#define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo
-#define MAX_PULSE_WIDTH      2400     // the longest pulse sent to a servo
-#define DEFAULT_PULSE_WIDTH  1500     // default pulse width when servo is attached
-#define REFRESH_INTERVAL    20000     // minumim time to refresh servos in microseconds
-
-#define PDB_CONFIG (PDB_SC_TRGSEL(15) | PDB_SC_PDBEN | PDB_SC_PDBIE \
-    | PDB_SC_CONT | PDB_SC_PRESCALER(2) | PDB_SC_MULT(0))
-#define PDB_PRESCALE 4
-#define usToTicks(us)    ((us) * (F_BUS / 1000) / PDB_PRESCALE / 1000)
-#define ticksToUs(ticks) ((ticks) * PDB_PRESCALE * 1000 / (F_BUS / 1000))
-
-static uint16_t servo_active_mask = 0;
-static uint16_t servo_allocated_mask = 0;
-static uint8_t servo_pin[MAX_SERVOS];
-static uint16_t servo_ticks[MAX_SERVOS];
-
-typedef struct _pyb_servo_obj_t {
-    mp_obj_base_t base;
-    uint servo_id;
-    uint min_usecs;
-    uint max_usecs;
-} pyb_servo_obj_t;
-
-#define clamp(v, min_val, max_val) ((v) < (min_val) ? (min_val) : (v) > (max_val) ? (max_val) : (v))
-
-static float map_uint_to_float(uint x, uint in_min, uint in_max, float out_min, float out_max) {
-    return (float)(x - in_min) * (out_max - out_min) / (float)(in_max - in_min) + (float)out_min;
-}
-
-static uint map_float_to_uint(float x, float in_min, float in_max, uint out_min, uint out_max) {
-    return (int)((x - in_min) * (float)(out_max - out_min) / (in_max - in_min) + (float)out_min);
-}
-
-static mp_obj_t servo_obj_attach(mp_obj_t self_in, mp_obj_t pin_obj) {
-    pyb_servo_obj_t *self = self_in;
-    uint pin = mp_obj_get_int(pin_obj);
-    if (pin > CORE_NUM_DIGITAL) {
-        goto pin_error;
-    }
-
-    pinMode(pin, OUTPUT);
-    servo_pin[self->servo_id] = pin;
-    servo_active_mask |= (1 << self->servo_id);
-    if (!(SIM_SCGC6 & SIM_SCGC6_PDB)) {
-        SIM_SCGC6 |= SIM_SCGC6_PDB; // TODO: use bitband for atomic bitset
-        PDB0_MOD = 0xFFFF;
-        PDB0_CNT = 0;
-        PDB0_IDLY = 0;
-        PDB0_SC = PDB_CONFIG;
-        // TODO: maybe this should be a higher priority than most
-        // other interrupts (init all to some default?)
-        PDB0_SC = PDB_CONFIG | PDB_SC_SWTRIG;
-    }
-    NVIC_ENABLE_IRQ(IRQ_PDB);
-    return mp_const_none;
-
-pin_error:
-    mp_raise_msg_varg(MP_QSTR_ValueError, MP_ERROR_TEXT("pin %d does not exist"), pin);
-}
-
-static mp_obj_t servo_obj_detach(mp_obj_t self_in) {
-    // pyb_servo_obj_t *self = self_in;
-    return mp_const_none;
-}
-
-static mp_obj_t servo_obj_pin(mp_obj_t self_in) {
-    pyb_servo_obj_t *self = self_in;
-    return MP_OBJ_NEW_SMALL_INT(servo_pin[self->servo_id]);
-}
-
-static mp_obj_t servo_obj_min_usecs(int n_args, const mp_obj_t *args) {
-    pyb_servo_obj_t *self = args[0];
-    if (n_args == 1) {
-        // get min
-        return MP_OBJ_NEW_SMALL_INT(self->min_usecs);
-    }
-    // Set min
-    self->min_usecs = mp_obj_get_int(args[1]);
-    return mp_const_none;
-}
-
-static mp_obj_t servo_obj_max_usecs(int n_args, const mp_obj_t *args) {
-    pyb_servo_obj_t *self = args[0];
-    if (n_args == 1) {
-        // get max
-        return MP_OBJ_NEW_SMALL_INT(self->max_usecs);
-    }
-    // Set max
-    self->max_usecs = mp_obj_get_int(args[1]);
-    return mp_const_none;
-}
-
-static mp_obj_t servo_obj_angle(int n_args, const mp_obj_t *args) {
-    pyb_servo_obj_t *self = args[0];
-    if (n_args == 1) {
-        // get
-        float angle = map_uint_to_float(servo_ticks[self->servo_id],
-            usToTicks(self->min_usecs),
-            usToTicks(self->max_usecs),
-            0.0, 180.0);
-        return mp_obj_new_float(angle);
-    }
-    // Set
-    float angle = mp_obj_get_float(args[1]);
-    if (angle < 0.0F) {
-        angle = 0.0F;
-    }
-    if (angle > 180.0F) {
-        angle = 180.0F;
-    }
-    servo_ticks[self->servo_id] = map_float_to_uint(angle,
-        0.0F, 180.0F,
-        usToTicks(self->min_usecs),
-        usToTicks(self->max_usecs));
-    return mp_const_none;
-}
-
-static mp_obj_t servo_obj_usecs(int n_args, const mp_obj_t *args) {
-    pyb_servo_obj_t *self = args[0];
-    uint usecs;
-    if (n_args == 1) {
-        // get
-        return MP_OBJ_NEW_SMALL_INT(ticksToUs(servo_ticks[self->servo_id]));
-    }
-    // Set
-    usecs = mp_obj_get_int(args[1]);
-
-    if (self->min_usecs < self->max_usecs) {
-        usecs = clamp(usecs, self->min_usecs, self->max_usecs);
-    } else {
-        usecs = clamp(usecs, self->max_usecs, self->min_usecs);
-    }
-    servo_ticks[self->servo_id] = usToTicks(usecs);
-    return mp_const_none;
-}
-
-static mp_obj_t servo_obj_attached(mp_obj_t self_in) {
-    pyb_servo_obj_t *self = self_in;
-    uint attached = (servo_active_mask & (1 << self->servo_id)) != 0;
-    return MP_OBJ_NEW_SMALL_INT(attached);
-}
-
-static void servo_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
-    pyb_servo_obj_t *self = self_in;
-    (void)kind;
-    print(env, "<Servo %lu>", self->servo_id);
-}
-
-static MP_DEFINE_CONST_FUN_OBJ_2(servo_obj_attach_obj, servo_obj_attach);
-static MP_DEFINE_CONST_FUN_OBJ_1(servo_obj_detach_obj, servo_obj_detach);
-static MP_DEFINE_CONST_FUN_OBJ_1(servo_obj_pin_obj, servo_obj_pin);
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(servo_obj_min_usecs_obj, 1, 2, servo_obj_min_usecs);
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(servo_obj_max_usecs_obj, 1, 2, servo_obj_max_usecs);
-static MP_DEFINE_CONST_FUN_OBJ_1(servo_obj_attached_obj, servo_obj_attached);
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(servo_obj_angle_obj, 1, 2, servo_obj_angle);
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(servo_obj_usecs_obj, 1, 2, servo_obj_usecs);
-
-static const mp_method_t servo_methods[] = {
-    { "attach", &servo_obj_attach_obj },
-    { "detach", &servo_obj_detach_obj },
-    { "pin", &servo_obj_pin_obj },
-    { "min_usecs", &servo_obj_min_usecs_obj },
-    { "max_usecs", &servo_obj_max_usecs_obj },
-    { "attached", &servo_obj_attached_obj },
-    { "angle", &servo_obj_angle_obj },
-    { "usecs", &servo_obj_usecs_obj },
-    { NULL, NULL },
-};
-
-/*
- * Notes:
- *
- * ISR needs to know pin #, ticks
- */
-
-static const mp_obj_type_t servo_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Servo,
-    .print = servo_obj_print,
-    .methods = servo_methods,
-};
-
-/* servo = pyb.Servo(pin, [min_uecs, [max_usecs]]) */
-
-mp_obj_t pyb_Servo(void) {
-    uint16_t mask;
-    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;
-
-    /* Find an unallocated servo id */
-
-    self->servo_id = 0;
-    for (mask = 1; mask < (1 << MAX_SERVOS); mask <<= 1) {
-        if (!(servo_allocated_mask & mask)) {
-            servo_allocated_mask |= mask;
-            servo_active_mask &= ~mask;
-            servo_ticks[self->servo_id] = usToTicks(DEFAULT_PULSE_WIDTH);
-            return self;
-        }
-        self->servo_id++;
-    }
-    m_del_obj(pyb_servo_obj_t, self);
-    mp_raise_ValueError(MP_ERROR_TEXT("No available servo ids"));
-    return mp_const_none;
-}
-
-void pdb_isr(void) {
-    static int8_t channel = 0, channel_high = MAX_SERVOS;
-    static uint32_t tick_accum = 0;
-    uint32_t ticks;
-    int32_t wait_ticks;
-
-    // first, if any channel was left high from the previous
-    // run, now is the time to shut it off
-    if (servo_active_mask & (1 << channel_high)) {
-        digitalWrite(servo_pin[channel_high], LOW);
-        channel_high = MAX_SERVOS;
-    }
-    // search for the next channel to turn on
-    while (channel < MAX_SERVOS) {
-        if (servo_active_mask & (1 << channel)) {
-            digitalWrite(servo_pin[channel], HIGH);
-            channel_high = channel;
-            ticks = servo_ticks[channel];
-            tick_accum += ticks;
-            PDB0_IDLY += ticks;
-            PDB0_SC = PDB_CONFIG | PDB_SC_LDOK;
-            channel++;
-            return;
-        }
-        channel++;
-    }
-    // when all channels have output, wait for the
-    // minimum refresh interval
-    wait_ticks = usToTicks(REFRESH_INTERVAL) - tick_accum;
-    if (wait_ticks < usToTicks(100)) {
-        wait_ticks = usToTicks(100);
-    } else if (wait_ticks > 60000) {
-        wait_ticks = 60000;
-    }
-    tick_accum += wait_ticks;
-    PDB0_IDLY += wait_ticks;
-    PDB0_SC = PDB_CONFIG | PDB_SC_LDOK;
-    // if this wait is enough to satisfy the refresh
-    // interval, next time begin again at channel zero
-    if (tick_accum >= usToTicks(REFRESH_INTERVAL)) {
-        tick_accum = 0;
-        channel = 0;
-    }
-}
diff --git a/ports/teensy/servo.h b/ports/teensy/servo.h
deleted file mode 100644
index 1ad34353d9a01..0000000000000
--- a/ports/teensy/servo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef MICROPY_INCLUDED_TEENSY_SERVO_H
-#define MICROPY_INCLUDED_TEENSY_SERVO_H
-
-void servo_init(void);
-
-extern const mp_obj_type_t pyb_servo_type;
-
-MP_DECLARE_CONST_FUN_OBJ_2(pyb_servo_set_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(pyb_pwm_set_obj);
-
-#endif // MICROPY_INCLUDED_TEENSY_SERVO_H
diff --git a/ports/teensy/std.h b/ports/teensy/std.h
deleted file mode 100644
index ef55d22ddc182..0000000000000
--- a/ports/teensy/std.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef MICROPY_INCLUDED_TEENSY_STD_H
-#define MICROPY_INCLUDED_TEENSY_STD_H
-
-typedef unsigned int size_t;
-
-void __assert_func(void);
-
-void *malloc(size_t n);
-void free(void *ptr);
-void *realloc(void *ptr, size_t n);
-
-void *memcpy(void *dest, const void *src, size_t n);
-void *memmove(void *dest, const void *src, size_t n);
-void *memset(void *s, int c, size_t n);
-
-size_t strlen(const char *str);
-int strcmp(const char *s1, const char *s2);
-int strncmp(const char *s1, const char *s2, size_t n);
-char *strcpy(char *dest, const char *src);
-char *strcat(char *dest, const char *src);
-
-int printf(const char *fmt, ...);
-int snprintf(char *str, size_t size, const char *fmt, ...);
-
-#endif // MICROPY_INCLUDED_TEENSY_STD_H
diff --git a/ports/teensy/teensy_hal.c b/ports/teensy/teensy_hal.c
deleted file mode 100644
index 62a826517721d..0000000000000
--- a/ports/teensy/teensy_hal.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/mphal.h"
-#include "usb.h"
-#include "uart.h"
-#include "Arduino.h"
-
-mp_uint_t mp_hal_ticks_ms(void) {
-    return millis();
-}
-
-void mp_hal_delay_ms(mp_uint_t ms) {
-    delay(ms);
-}
-
-void mp_hal_set_interrupt_char(int c) {
-    // The teensy 3.1 usb stack doesn't currently have the notion of generating
-    // an exception when a certain character is received. That just means that
-    // you can't press Control-C and get your python script to stop.
-}
-
-uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
-    uintptr_t ret = 0;
-    if (poll_flags & MP_STREAM_POLL_RD) {
-        if (usb_vcp_rx_num()) {
-            ret |= MP_STREAM_POLL_RD;
-        }
-        if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) {
-            ret |= MP_STREAM_POLL_RD;
-        }
-    }
-    if (poll_flags & MP_STREAM_POLL_WR) {
-        if (MP_STATE_PORT(pyb_stdio_uart) != NULL || usb_vcp_is_enabled()) {
-            ret |= MP_STREAM_POLL_WR;
-        }
-    }
-    return ret;
-}
-
-int mp_hal_stdin_rx_chr(void) {
-    for (;;) {
-        byte c;
-        if (usb_vcp_recv_byte(&c) != 0) {
-            return c;
-        } else 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));
-        }
-        __WFI();
-    }
-}
-
-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(pyb_stdio_uart) != NULL) {
-        uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
-    }
-    if (usb_vcp_is_enabled()) {
-        usb_vcp_send_strn(str, len);
-    }
-}
-
-void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
-    // send stdout to UART and USB CDC VCP
-    if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
-        void uart_tx_strn_cooked(pyb_uart_obj_t *uart_obj, const char *str, uint len);
-        uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len);
-    }
-    if (usb_vcp_is_enabled()) {
-        usb_vcp_send_strn_cooked(str, len);
-    }
-}
-
-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);
diff --git a/ports/teensy/teensy_hal.h b/ports/teensy/teensy_hal.h
deleted file mode 100644
index 515d2d0efb4ac..0000000000000
--- a/ports/teensy/teensy_hal.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <mk20dx128.h>
-#include "hal_ftm.h"
-
-#ifdef  USE_FULL_ASSERT
-  #define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
-void assert_failed(uint8_t *file, uint32_t line);
-#else
-  #define assert_param(expr) ((void)0)
-#endif /* USE_FULL_ASSERT */
-
-#define HAL_NVIC_EnableIRQ(irq)    NVIC_ENABLE_IRQ(irq)
-
-#define GPIOA   ((GPIO_TypeDef *)&GPIOA_PDOR)
-#define GPIOB   ((GPIO_TypeDef *)&GPIOB_PDOR)
-#define GPIOC   ((GPIO_TypeDef *)&GPIOC_PDOR)
-#define GPIOD   ((GPIO_TypeDef *)&GPIOD_PDOR)
-#define GPIOE   ((GPIO_TypeDef *)&GPIOE_PDOR)
-#define GPIOZ   ((GPIO_TypeDef *)NULL)
-
-#define I2C0    ((I2C_TypeDef *)0x40066000)
-#define I2C1    ((I2C_TypeDef *)0x40067000)
-
-#undef  SPI0
-#define SPI0    ((SPI_TypeDef *)0x4002C000)
-#define SPI1    ((SPI_TypeDef *)0x4002D000)
-
-#define UART0   ((UART_TypeDef *)&UART0_BDH)
-#define UART1   ((UART_TypeDef *)&UART1_BDH)
-#define UART2   ((UART_TypeDef *)&UART2_BDH)
-
-typedef struct {
-    uint32_t dummy;
-} I2C_TypeDef;
-
-typedef struct {
-    uint32_t dummy;
-} UART_TypeDef;
-
-typedef struct {
-    uint32_t dummy;
-} SPI_TypeDef;
-
-typedef struct {
-    volatile uint32_t PDOR;         // Output register
-    volatile uint32_t PSOR;         // Set output register
-    volatile uint32_t PCOR;         // Clear output register
-    volatile uint32_t PTOR;         // Toggle output register
-    volatile uint32_t PDIR;         // Data Input register
-    volatile uint32_t PDDR;         // Data Direction register
-} GPIO_TypeDef;
-
-#define GPIO_OUTPUT_TYPE    ((uint32_t)0x00000010)  // Indicates OD
-
-#define GPIO_MODE_INPUT     ((uint32_t)0x00000000)
-#define GPIO_MODE_OUTPUT_PP ((uint32_t)0x00000001)
-#define GPIO_MODE_OUTPUT_OD ((uint32_t)0x00000011)
-#define GPIO_MODE_AF_PP     ((uint32_t)0x00000002)
-#define GPIO_MODE_AF_OD     ((uint32_t)0x00000012)
-#define GPIO_MODE_ANALOG    ((uint32_t)0x00000003)
-#define GPIO_MODE_IT_RISING ((uint32_t)1)
-#define GPIO_MODE_IT_FALLING ((uint32_t)2)
-
-#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_ANALOG))
-
-#define GPIO_NOPULL         ((uint32_t)0)
-#define GPIO_PULLUP         ((uint32_t)1)
-#define GPIO_PULLDOWN       ((uint32_t)2)
-
-#define IS_GPIO_PULL(PULL) (((PULL) == GPIO_NOPULL) || ((PULL) == GPIO_PULLUP) || \
-    ((PULL) == GPIO_PULLDOWN))
-
-#define GPIO_SPEED_FREQ_LOW       ((uint32_t)0)
-#define GPIO_SPEED_FREQ_MEDIUM    ((uint32_t)1)
-#define GPIO_SPEED_FREQ_HIGH      ((uint32_t)2)
-#define GPIO_SPEED_FREQ_VERY_HIGH ((uint32_t)3)
-
-#define IS_GPIO_AF(af)      ((af) >= 0 && (af) <= 7)
-
-typedef struct {
-    uint32_t Pin;
-    uint32_t Mode;
-    uint32_t Pull;
-    uint32_t Speed;
-    uint32_t Alternate;
-} GPIO_InitTypeDef;
-
-#define GPIO_PORT_TO_PORT_NUM(GPIOx) \
-    ((&GPIOx->PDOR - &GPIOA_PDOR) / (&GPIOB_PDOR - &GPIOA_PDOR))
-
-#define GPIO_PIN_TO_PORT_PCR(GPIOx, pin) \
-    (&PORTA_PCR0 + (GPIO_PORT_TO_PORT_NUM(GPIOx) * 0x400) + (pin))
-
-#define GPIO_AF2_I2C0   2
-#define GPIO_AF2_I2C1   2
-#define GPIO_AF2_SPI0   2
-#define GPIO_AF3_FTM0   3
-#define GPIO_AF3_FTM1   3
-#define GPIO_AF3_FTM2   3
-#define GPIO_AF3_UART0  3
-#define GPIO_AF3_UART1  3
-#define GPIO_AF3_UART2  3
-#define GPIO_AF4_FTM0   4
-#define GPIO_AF6_FTM1   6
-#define GPIO_AF6_FTM2   6
-#define GPIO_AF6_I2C1   6
-#define GPIO_AF7_FTM1   7
-
-__attribute__((always_inline)) static inline void __WFI(void) {
-    __asm volatile ("wfi");
-}
-
-void mp_hal_set_interrupt_char(int c);
-
-void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio);
-
-void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *init);
-
-struct _pin_obj_t;
-#define mp_hal_pin_obj_t const struct _pin_obj_t *
-#define mp_hal_pin_high(p) (((p)->gpio->PSOR) = (p)->pin_mask)
-#define mp_hal_pin_low(p)  (((p)->gpio->PCOR) = (p)->pin_mask)
-#define mp_hal_pin_read(p) (((p)->gpio->PDIR >> (p)->pin) & 1)
-#define mp_hal_pin_write(p, v)  ((v) ? mp_hal_pin_high(p) : mp_hal_pin_low(p))
diff --git a/ports/teensy/teensy_pins.csv b/ports/teensy/teensy_pins.csv
deleted file mode 100644
index 10887e212014e..0000000000000
--- a/ports/teensy/teensy_pins.csv
+++ /dev/null
@@ -1,56 +0,0 @@
-D0,PTB16
-D1,PTB17
-D2,PTD0
-D3,PTA12
-D4,PTA13
-D5,PTD7
-D6,PTD4
-D7,PTD2
-D8,PTD3
-D9,PTC3
-D10,PTC4
-D11,PTC6
-D12,PTC7
-D13,PTC5
-D14,PTD1
-D15,PTC0
-D16,PTB0
-D17,PTB1
-D18,PTB3
-D19,PTB2
-D20,PTD5
-D21,PTD6
-D22,PTC1
-D23,PTC2
-D24,PTA5
-D25,PTB19
-D26,PTE1
-D27,PTC9
-D28,PTC8
-D29,PTC10
-D30,PTC11
-D31,PTE0
-D32,PTB18
-D33,PTA4
-A0,PTD1
-A1,PTC0
-A2,PTB0
-A3,PTB1
-A4,PTB3
-A5,PTB2
-A6,PTD5
-A7,PTD6
-A8,PTC1
-A9,PTC2
-A10,PTZ0
-A11,PTZ1
-A12,PTZ2
-A13,PTZ3
-A14,PTZ5
-A15,PTE1
-A16,PTC9
-A17,PTC8
-A18,PTC10
-A19,PTC11
-A20,PTE0
-LED,PTC5
diff --git a/ports/teensy/timer.c b/ports/teensy/timer.c
deleted file mode 100644
index da18d6f4f5105..0000000000000
--- a/ports/teensy/timer.c
+++ /dev/null
@@ -1,1003 +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 <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stddef.h>
-
-#include "py/runtime.h"
-#include "py/gc.h"
-#include "py/mphal.h"
-#include "pin.h"
-#include "reg.h"
-#include "timer.h"
-
-typedef enum {
-    CHANNEL_MODE_PWM_NORMAL,
-    CHANNEL_MODE_PWM_INVERTED,
-    CHANNEL_MODE_OC_TIMING,
-    CHANNEL_MODE_OC_ACTIVE,
-    CHANNEL_MODE_OC_INACTIVE,
-    CHANNEL_MODE_OC_TOGGLE,
-//    CHANNEL_MODE_OC_FORCED_ACTIVE,
-//    CHANNEL_MODE_OC_FORCED_INACTIVE,
-    CHANNEL_MODE_IC,
-} pyb_channel_mode;
-
-STATIC const struct {
-    qstr name;
-    uint32_t oc_mode;
-} channel_mode_info[] = {
-    { MP_QSTR_PWM,                FTM_OCMODE_PWM1 },
-    { MP_QSTR_PWM_INVERTED,       FTM_OCMODE_PWM2 },
-    { MP_QSTR_OC_TIMING,          FTM_OCMODE_TIMING },
-    { MP_QSTR_OC_ACTIVE,          FTM_OCMODE_ACTIVE },
-    { MP_QSTR_OC_INACTIVE,        FTM_OCMODE_INACTIVE },
-    { MP_QSTR_OC_TOGGLE,          FTM_OCMODE_TOGGLE },
-//    { MP_QSTR_OC_FORCED_ACTIVE,   FTM_OCMODE_FORCED_ACTIVE },
-//    { MP_QSTR_OC_FORCED_INACTIVE, FTM_OCMODE_FORCED_INACTIVE },
-    { MP_QSTR_IC,                 0 },
-};
-
-struct _pyb_timer_obj_t;
-
-typedef struct _pyb_timer_channel_obj_t {
-    mp_obj_base_t base;
-    struct _pyb_timer_obj_t *timer;
-    uint8_t channel;
-    uint8_t mode;
-    mp_obj_t callback;
-    struct _pyb_timer_channel_obj_t *next;
-} pyb_timer_channel_obj_t;
-
-typedef struct _pyb_timer_obj_t {
-    mp_obj_base_t base;
-    uint8_t tim_id;
-    uint8_t irqn;
-    mp_obj_t callback;
-    FTM_HandleTypeDef ftm;
-    pyb_timer_channel_obj_t *channel;
-} pyb_timer_obj_t;
-
-// Used to do callbacks to Python code on interrupt
-STATIC pyb_timer_obj_t *pyb_timer_obj_all[3];
-#define PYB_TIMER_OBJ_ALL_NUM MP_ARRAY_SIZE(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);
-STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback);
-
-void timer_init0(void) {
-    for (uint i = 0; i < PYB_TIMER_OBJ_ALL_NUM; i++) {
-        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 = pyb_timer_obj_all[i];
-        if (tim != NULL) {
-            pyb_timer_deinit(tim);
-        }
-    }
-}
-
-mp_uint_t get_prescaler_shift(mp_int_t prescaler) {
-    mp_uint_t prescaler_shift;
-    for (prescaler_shift = 0; prescaler_shift < 8; prescaler_shift++) {
-        if (prescaler == (1 << prescaler_shift)) {
-            return prescaler_shift;
-        }
-    }
-    mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("prescaler must be a power of 2 between 1 and 128, not %d"), prescaler);
-}
-
-/******************************************************************************/
-/* MicroPython bindings                                                       */
-
-STATIC const mp_obj_type_t pyb_timer_channel_type;
-
-// Helper function for determining the period used for calculating percent
-STATIC uint32_t compute_period(pyb_timer_obj_t *self) {
-    // In center mode,  compare == period corresponds to 100%
-    // In edge mode, compare == (period + 1) corresponds to 100%
-    FTM_TypeDef *FTMx = self->ftm.Instance;
-    uint32_t period = (FTMx->MOD & 0xffff);
-    if ((FTMx->SC & FTM_SC_CPWMS) == 0) {
-        // Edge mode
-        period++;
-    }
-    return period;
-}
-
-// Helper function to compute PWM value from timer period and percent value.
-// 'val' can be an int or a float between 0 and 100 (out of range values are
-// clamped).
-STATIC uint32_t compute_pwm_value_from_percent(uint32_t period, mp_obj_t percent_in) {
-    uint32_t cmp;
-    if (0) {
-    #if MICROPY_PY_BUILTINS_FLOAT
-    } else if (mp_obj_is_type(percent_in, &mp_type_float)) {
-        float percent = mp_obj_get_float(percent_in);
-        if (percent <= 0.0) {
-            cmp = 0;
-        } else if (percent >= 100.0) {
-            cmp = period;
-        } else {
-            cmp = percent / 100.0 * ((float)period);
-        }
-    #endif
-    } else {
-        mp_int_t percent = mp_obj_get_int(percent_in);
-        if (percent <= 0) {
-            cmp = 0;
-        } else if (percent >= 100) {
-            cmp = period;
-        } else {
-            cmp = ((uint32_t)percent * period) / 100;
-        }
-    }
-    return cmp;
-}
-
-// Helper function to compute percentage from timer perion and PWM value.
-STATIC mp_obj_t compute_percent_from_pwm_value(uint32_t period, uint32_t cmp) {
-    #if MICROPY_PY_BUILTINS_FLOAT
-    float percent = (float)cmp * 100.0 / (float)period;
-    if (cmp >= period) {
-        percent = 100.0;
-    } else {
-        percent = (float)cmp * 100.0 / (float)period;
-    }
-    return mp_obj_new_float(percent);
-    #else
-    mp_int_t percent;
-    if (cmp >= period) {
-        percent = 100;
-    } else {
-        percent = cmp * 100 / period;
-    }
-    return mp_obj_new_int(percent);
-    #endif
-}
-
-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 = self_in;
-
-    if (self->ftm.State == HAL_FTM_STATE_RESET) {
-        mp_printf(print, "Timer(%u)", self->tim_id);
-    } else {
-        mp_printf(print, "Timer(%u, prescaler=%u, period=%u, mode=%s)",
-            self->tim_id,
-            1 << (self->ftm.Instance->SC & 7),
-                self->ftm.Instance->MOD & 0xffff,
-                self->ftm.Init.CounterMode == FTM_COUNTERMODE_UP ? "UP" : "CENTER");
-    }
-}
-
-/// \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
-///     tim.init(prescaler=83, period=999)  # set the prescaler and period directly
-///
-/// Keyword arguments:
-///
-///   - `freq` - specifies the periodic frequency of the timer. You might also
-///              view this as the frequency with which the timer goes through
-///              one complete cycle.
-///
-///   - `prescaler` 1, 2, 4, 8 16 32, 64 or 128 - specifies the value to be loaded into the
-///                 timer's prescaler. The timer clock source is divided by
-///     (`prescaler`) to arrive at the timer clock.
-///
-///   - `period` [0-0xffff] - Specifies the value to be loaded into the timer's
-///     Modulo Register (MOD). This determines the period of the timer (i.e.
-///     when the counter cycles). The timer counter will roll-over after
-///     `period` timer clock cycles. In center mode, a compare register > 0x7fff
-///     doesn't seem to work properly, so keep this in mind.
-///
-///   - `mode` can be one of:
-///     - `Timer.UP` - configures the timer to count from 0 to MOD (default)
-///     - `Timer.CENTER` - configures the timer to count from 0 to MOD and
-///       then back down to 0.
-///
-///   - `callback` - as per Timer.callback()
-///
-///  You must either specify freq or both of period and prescaler.
-STATIC const mp_arg_t pyb_timer_init_args[] = {
-    { MP_QSTR_freq,             MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-    { MP_QSTR_prescaler,        MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-    { MP_QSTR_period,           MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-    { MP_QSTR_mode,             MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = FTM_COUNTERMODE_UP} },
-    { MP_QSTR_callback,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-};
-#define PYB_TIMER_INIT_NUM_ARGS MP_ARRAY_SIZE(pyb_timer_init_args)
-
-STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, uint n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    // parse args
-    mp_arg_val_t vals[PYB_TIMER_INIT_NUM_ARGS];
-    mp_arg_parse_all(n_args, args, kw_args, PYB_TIMER_INIT_NUM_ARGS, pyb_timer_init_args, vals);
-
-    FTM_HandleTypeDef *ftm = &self->ftm;
-
-    // set the TIM configuration values
-    FTM_Base_InitTypeDef *init = &ftm->Init;
-
-    if (vals[0].u_int != 0xffffffff) {
-        // set prescaler and period from frequency
-
-        if (vals[0].u_int == 0) {
-            mp_raise_ValueError(MP_ERROR_TEXT("can't have 0 frequency"));
-        }
-
-        uint32_t period = MAX(1, F_BUS / vals[0].u_int);
-        uint32_t prescaler_shift = 0;
-        while (period > 0xffff && prescaler_shift < 7) {
-            period >>= 1;
-            prescaler_shift++;
-        }
-        if (period > 0xffff) {
-            period = 0xffff;
-        }
-        init->PrescalerShift = prescaler_shift;
-        init->Period = period;
-    } else if (vals[1].u_int != 0xffffffff && vals[2].u_int != 0xffffffff) {
-        // set prescaler and period directly
-        init->PrescalerShift = get_prescaler_shift(vals[1].u_int);
-        init->Period = vals[2].u_int;
-        if (!IS_FTM_PERIOD(init->Period)) {
-            mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("period must be between 0 and 65535, not %d"), init->Period);
-        }
-    } else {
-        mp_raise_TypeError(MP_ERROR_TEXT("must specify either freq, or prescaler and period"));
-    }
-
-    init->CounterMode = vals[3].u_int;
-    if (!IS_FTM_COUNTERMODE(init->CounterMode)) {
-        mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("invalid counter mode: %d"), init->CounterMode);
-    }
-
-    // Currently core/mk20dx128.c sets SIM_SCGC6_FTM0, SIM_SCGC6_FTM1, SIM_SCGC3_FTM2
-    // so we don't need to do it here.
-
-    NVIC_SET_PRIORITY(self->irqn, 0xe); // next-to lowest priority
-
-    HAL_FTM_Base_Init(ftm);
-    if (vals[4].u_obj == mp_const_none) {
-        HAL_FTM_Base_Start(ftm);
-    } else {
-        pyb_timer_callback(self, vals[4].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);
-
-    // create new Timer object
-    pyb_timer_obj_t *tim = m_new_obj(pyb_timer_obj_t);
-    memset(tim, 0, sizeof(*tim));
-
-    tim->base.type = &pyb_timer_type;
-    tim->callback = mp_const_none;
-    tim->channel = NULL;
-
-    // get FTM number
-    tim->tim_id = mp_obj_get_int(args[0]);
-
-    switch (tim->tim_id) {
-        case 0:
-            tim->ftm.Instance = FTM0;
-            tim->irqn = IRQ_FTM0;
-            break;
-        case 1:
-            tim->ftm.Instance = FTM1;
-            tim->irqn = IRQ_FTM1;
-            break;
-        case 2:
-            tim->ftm.Instance = FTM2;
-            tim->irqn = IRQ_FTM2;
-            break;
-        default:
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Timer %d does not exist"), tim->tim_id);
-    }
-
-    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);
-    }
-
-    // set the global variable for interrupt callbacks
-    if (tim->tim_id < PYB_TIMER_OBJ_ALL_NUM) {
-        pyb_timer_obj_all[tim->tim_id] = tim;
-    }
-
-    return (mp_obj_t)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(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 = self_in;
-
-    // Disable the base interrupt
-    pyb_timer_callback(self_in, mp_const_none);
-
-    pyb_timer_channel_obj_t *chan = self->channel;
-    self->channel = NULL;
-
-    // Disable the channel interrupts
-    while (chan != NULL) {
-        pyb_timer_channel_callback(chan, mp_const_none);
-        pyb_timer_channel_obj_t *prev_chan = chan;
-        chan = chan->next;
-        prev_chan->next = NULL;
-    }
-
-    HAL_FTM_Base_DeInit(&self->ftm);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
-
-/// \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).
-///
-/// Otherwise, 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.
-///
-/// Keyword arguments:
-///
-///   - `mode` can be one of:
-///     - `Timer.PWM` - configure the timer in PWM mode (active high).
-///     - `Timer.PWM_INVERTED` - configure the timer in PWM mode (active low).
-///     - `Timer.OC_TIMING` - indicates that no pin is driven.
-///     - `Timer.OC_ACTIVE` - the pin will be made active when a compare
-///        match occurs (active is determined by polarity)
-///     - `Timer.OC_INACTIVE` - the pin will be made inactive when a compare
-///        match occurs.
-///     - `Timer.OC_TOGGLE` - the pin will be toggled when an compare match occurs.
-///     - `Timer.IC` - configure the timer in Input Capture mode.
-///
-///   - `callback` - as per TimerChannel.callback()
-///
-///   - `pin` None (the default) or a Pin object. If specified (and not None)
-///           this will cause the alternate function of the the indicated pin
-///      to be configured for this timer channel. An error will be raised if
-///      the pin doesn't support any alternate functions for this timer channel.
-///
-/// Keyword arguments for Timer.PWM modes:
-///
-///   - `pulse_width` - determines the initial pulse width value to use.
-///   - `pulse_width_percent` - determines the initial pulse width percentage to use.
-///
-/// Keyword arguments for Timer.OC modes:
-///
-///   - `compare` - determines the initial value of the compare register.
-///
-///   - `polarity` can be one of:
-///     - `Timer.HIGH` - output is active high
-///     - `Timer.LOW` - output is active low
-///
-/// Optional keyword arguments for Timer.IC modes:
-///
-///   - `polarity` can be one of:
-///     - `Timer.RISING` - captures on rising edge.
-///     - `Timer.FALLING` - captures on falling edge.
-///     - `Timer.BOTH` - captures on both edges.
-///
-/// PWM Example:
-///
-///     timer = pyb.Timer(0, prescaler=128, period=37500, counter_mode=pyb.Timer.COUNTER_MODE_CENTER)
-///     ch0 = t0.channel(0, pyb.Timer.PWM, pin=pyb.Pin.board.D22, pulse_width=(t0.period() + 1) // 4)
-///     ch1 = t0.channel(1, pyb.Timer.PWM, pin=pyb.Pin.board.D23, pulse_width=(t0.period() + 1) // 2)
-STATIC const mp_arg_t pyb_timer_channel_args[] = {
-    { MP_QSTR_callback,            MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-    { MP_QSTR_pin,                 MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-    { MP_QSTR_pulse_width,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-    { MP_QSTR_pulse_width_percent, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-    { MP_QSTR_compare,             MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-    { MP_QSTR_polarity,            MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-};
-#define PYB_TIMER_CHANNEL_NUM_ARGS MP_ARRAY_SIZE(pyb_timer_channel_args)
-
-STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    pyb_timer_obj_t *self = args[0];
-    mp_int_t channel = mp_obj_get_int(args[1]);
-
-    if (channel < 0 || channel > 7) {
-        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) {
-        if (chan) {
-            return 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(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 vals[PYB_TIMER_CHANNEL_NUM_ARGS];
-    mp_arg_parse_all(n_args - 3, args + 3, kw_args, PYB_TIMER_CHANNEL_NUM_ARGS, pyb_timer_channel_args, vals);
-
-    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->mode = mp_obj_get_int(args[2]);
-    chan->callback = vals[0].u_obj;
-
-    mp_obj_t pin_obj = vals[1].u_obj;
-    if (pin_obj != mp_const_none) {
-        if (!mp_obj_is_type(pin_obj, &pin_type)) {
-            mp_raise_ValueError(MP_ERROR_TEXT("pin argument needs to be be a Pin type"));
-        }
-        const pin_obj_t *pin = pin_obj;
-        const pin_af_obj_t *af = pin_find_af(pin, AF_FN_FTM, self->tim_id);
-        if (af == NULL) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("pin %s doesn't have an af for TIM%d"), qstr_str(pin->name), self->tim_id);
-        }
-        // pin.init(mode=AF_PP, af=idx)
-        const mp_obj_t args[6] = {
-            (mp_obj_t)&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_call_method_n_kw(0, 2, args);
-    }
-
-    // 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;
-
-    switch (chan->mode) {
-
-        case CHANNEL_MODE_PWM_NORMAL:
-        case CHANNEL_MODE_PWM_INVERTED: {
-            FTM_OC_InitTypeDef oc_config;
-            oc_config.OCMode = channel_mode_info[chan->mode].oc_mode;
-            if (vals[3].u_obj != mp_const_none) {
-                // pulse width ratio given
-                uint32_t period = compute_period(self);
-                oc_config.Pulse = compute_pwm_value_from_percent(period, vals[3].u_obj);
-            } else {
-                // use absolute pulse width value (defaults to 0 if nothing given)
-                oc_config.Pulse = vals[2].u_int;
-            }
-            oc_config.OCPolarity = FTM_OCPOLARITY_HIGH;
-
-            HAL_FTM_PWM_ConfigChannel(&self->ftm, &oc_config, channel);
-            if (chan->callback == mp_const_none) {
-                HAL_FTM_PWM_Start(&self->ftm, channel);
-            } else {
-                HAL_FTM_PWM_Start_IT(&self->ftm, channel);
-            }
-            break;
-        }
-
-        case CHANNEL_MODE_OC_TIMING:
-        case CHANNEL_MODE_OC_ACTIVE:
-        case CHANNEL_MODE_OC_INACTIVE:
-        case CHANNEL_MODE_OC_TOGGLE: {
-            FTM_OC_InitTypeDef oc_config;
-            oc_config.OCMode = channel_mode_info[chan->mode].oc_mode;
-            oc_config.Pulse = vals[4].u_int;
-            oc_config.OCPolarity = vals[5].u_int;
-            if (oc_config.OCPolarity == 0xffffffff) {
-                oc_config.OCPolarity = FTM_OCPOLARITY_HIGH;
-            }
-
-            if (!IS_FTM_OC_POLARITY(oc_config.OCPolarity)) {
-                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid polarity (%d)"), oc_config.OCPolarity);
-            }
-            HAL_FTM_OC_ConfigChannel(&self->ftm, &oc_config, channel);
-            if (chan->callback == mp_const_none) {
-                HAL_FTM_OC_Start(&self->ftm, channel);
-            } else {
-                HAL_FTM_OC_Start_IT(&self->ftm, channel);
-            }
-            break;
-        }
-
-        case CHANNEL_MODE_IC: {
-            FTM_IC_InitTypeDef ic_config;
-
-            ic_config.ICPolarity = vals[5].u_int;
-            if (ic_config.ICPolarity == 0xffffffff) {
-                ic_config.ICPolarity = FTM_ICPOLARITY_RISING;
-            }
-
-            if (!IS_FTM_IC_POLARITY(ic_config.ICPolarity)) {
-                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid polarity (%d)"), ic_config.ICPolarity);
-            }
-            HAL_FTM_IC_ConfigChannel(&self->ftm, &ic_config, chan->channel);
-            if (chan->callback == mp_const_none) {
-                HAL_FTM_IC_Start(&self->ftm, channel);
-            } else {
-                HAL_FTM_IC_Start_IT(&self->ftm, channel);
-            }
-            break;
-        }
-
-        default:
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid mode (%d)"), chan->mode);
-    }
-
-    return chan;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_obj, 2, pyb_timer_channel);
-
-/// \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 = args[0];
-    if (n_args == 1) {
-        // get
-        return mp_obj_new_int(self->ftm.Instance->CNT);
-    }
-    // set - In order to write to CNT we need to set CNTIN
-    self->ftm.Instance->CNTIN = mp_obj_get_int(args[1]);
-    self->ftm.Instance->CNT = 0;    // write any value to load CNTIN into CNT
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_counter_obj, 1, 2, pyb_timer_counter);
-
-/// \method prescaler([value])
-/// Get or set the prescaler for the timer.
-STATIC mp_obj_t pyb_timer_prescaler(size_t n_args, const mp_obj_t *args) {
-    pyb_timer_obj_t *self = args[0];
-    if (n_args == 1) {
-        // get
-        return mp_obj_new_int(1 << (self->ftm.Instance->SC & 7));
-    }
-
-    // set
-    mp_uint_t prescaler_shift = get_prescaler_shift(mp_obj_get_int(args[1]));
-
-    mp_uint_t sc = self->ftm.Instance->SC;
-    sc &= ~7;
-    sc |= FTM_SC_PS(prescaler_shift);
-    self->ftm.Instance->SC = sc;
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_prescaler_obj, 1, 2, pyb_timer_prescaler);
-
-/// \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 = args[0];
-    if (n_args == 1) {
-        // get
-        return mp_obj_new_int(self->ftm.Instance->MOD & 0xffff);
-    }
-
-    // set
-    mp_int_t period = mp_obj_get_int(args[1]) & 0xffff;
-    self->ftm.Instance->CNT = 0;
-    self->ftm.Instance->MOD = period;
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_period_obj, 1, 2, pyb_timer_period);
-
-/// \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 = self_in;
-    if (callback == mp_const_none) {
-        // stop interrupt (but not timer)
-        __HAL_FTM_DISABLE_TOF_IT(&self->ftm);
-        self->callback = mp_const_none;
-    } else if (mp_obj_is_callable(callback)) {
-        self->callback = callback;
-        HAL_NVIC_EnableIRQ(self->irqn);
-        // start timer, so that it interrupts on overflow
-        HAL_FTM_Base_Start_IT(&self->ftm);
-    } 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);
-
-#if MICROPY_TIMER_REG
-reg_t timer_reg[] = {
-    REG_ENTRY(FTM_TypeDef, SC),
-    REG_ENTRY(FTM_TypeDef, CNT),
-    REG_ENTRY(FTM_TypeDef, MOD),
-    REG_ENTRY(FTM_TypeDef, CNTIN),
-    REG_ENTRY(FTM_TypeDef, STATUS),
-    REG_ENTRY(FTM_TypeDef, MODE),
-    REG_ENTRY(FTM_TypeDef, SYNC),
-    REG_ENTRY(FTM_TypeDef, OUTINIT),
-    REG_ENTRY(FTM_TypeDef, OUTMASK),
-    REG_ENTRY(FTM_TypeDef, COMBINE),
-    REG_ENTRY(FTM_TypeDef, DEADTIME),
-    REG_ENTRY(FTM_TypeDef, EXTTRIG),
-    REG_ENTRY(FTM_TypeDef, POL),
-    REG_ENTRY(FTM_TypeDef, FMS),
-    REG_ENTRY(FTM_TypeDef, FILTER),
-    REG_ENTRY(FTM_TypeDef, FLTCTRL),
-    REG_ENTRY(FTM_TypeDef, QDCTRL),
-    REG_ENTRY(FTM_TypeDef, CONF),
-    REG_ENTRY(FTM_TypeDef, FLTPOL),
-    REG_ENTRY(FTM_TypeDef, SYNCONF),
-    REG_ENTRY(FTM_TypeDef, INVCTRL),
-    REG_ENTRY(FTM_TypeDef, SWOCTRL),
-    REG_ENTRY(FTM_TypeDef, PWMLOAD),
-};
-
-mp_obj_t pyb_timer_reg(uint n_args, const mp_obj_t *args) {
-    pyb_timer_obj_t *self = args[0];
-    return reg_cmd(self->ftm.Instance, timer_reg, MP_ARRAY_SIZE(timer_reg), n_args - 1, args + 1);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_reg_obj, 1, 3, pyb_timer_reg);
-#endif // MICROPY_TIMER_REG
-
-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) },
-    { MP_ROM_QSTR(MP_QSTR_channel), MP_ROM_PTR(&pyb_timer_channel_obj) },
-    { MP_ROM_QSTR(MP_QSTR_counter), MP_ROM_PTR(&pyb_timer_counter_obj) },
-    { MP_ROM_QSTR(MP_QSTR_prescaler), MP_ROM_PTR(&pyb_timer_prescaler_obj) },
-    { MP_ROM_QSTR(MP_QSTR_period), MP_ROM_PTR(&pyb_timer_period_obj) },
-    { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&pyb_timer_callback_obj) },
-    #if MICROPY_TIMER_REG
-    { MP_ROM_QSTR(MP_QSTR_reg), MP_ROM_PTR(&pyb_timer_reg_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_UP),              MP_ROM_INT(FTM_COUNTERMODE_UP) },
-    { MP_ROM_QSTR(MP_QSTR_CENTER),          MP_ROM_INT(FTM_COUNTERMODE_CENTER) },
-    { MP_ROM_QSTR(MP_QSTR_PWM),             MP_ROM_INT(CHANNEL_MODE_PWM_NORMAL) },
-    { MP_ROM_QSTR(MP_QSTR_PWM_INVERTED),    MP_ROM_INT(CHANNEL_MODE_PWM_INVERTED) },
-    { MP_ROM_QSTR(MP_QSTR_OC_TIMING),       MP_ROM_INT(CHANNEL_MODE_OC_TIMING) },
-    { MP_ROM_QSTR(MP_QSTR_OC_ACTIVE),       MP_ROM_INT(CHANNEL_MODE_OC_ACTIVE) },
-    { MP_ROM_QSTR(MP_QSTR_OC_INACTIVE),     MP_ROM_INT(CHANNEL_MODE_OC_INACTIVE) },
-    { MP_ROM_QSTR(MP_QSTR_OC_TOGGLE),       MP_ROM_INT(CHANNEL_MODE_OC_TOGGLE) },
-    { MP_ROM_QSTR(MP_QSTR_IC),              MP_ROM_INT(CHANNEL_MODE_IC) },
-    { MP_ROM_QSTR(MP_QSTR_HIGH),            MP_ROM_INT(FTM_OCPOLARITY_HIGH) },
-    { MP_ROM_QSTR(MP_QSTR_LOW),             MP_ROM_INT(FTM_OCPOLARITY_LOW) },
-    { MP_ROM_QSTR(MP_QSTR_RISING),          MP_ROM_INT(FTM_ICPOLARITY_RISING) },
-    { MP_ROM_QSTR(MP_QSTR_FALLING),         MP_ROM_INT(FTM_ICPOLARITY_FALLING) },
-    { MP_ROM_QSTR(MP_QSTR_BOTH),            MP_ROM_INT(FTM_ICPOLARITY_BOTH) },
-};
-STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_timer_type,
-    MP_QSTR_Timer,
-    MP_TYPE_FLAG_NONE,
-    make_new, pyb_timer_make_new,
-    print, pyb_timer_print,
-    locals_dict, &pyb_timer_locals_dict
-    );
-
-/// \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 = self_in;
-
-    mp_printf(print, "TimerChannel(timer=%u, channel=%u, mode=%s)",
-        self->timer->tim_id,
-        self->channel,
-        qstr_str(channel_mode_info[self->mode].name));
-}
-
-/// \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 = args[0];
-    FTM_TypeDef *FTMx = self->timer->ftm.Instance;
-    if (n_args == 1) {
-        // get
-        return mp_obj_new_int(FTMx->channel[self->channel].CV & 0xffff);
-    }
-
-    mp_int_t pw = mp_obj_get_int(args[1]);
-
-    // set
-    FTMx->channel[self->channel].CV = pw & 0xffff;
-    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 pulse_width_percent([value])
-/// Get or set the pulse width percentage associated with a channel.  The value
-/// is a number between 0 and 100 and sets the percentage of the timer period
-/// 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%.
-STATIC mp_obj_t pyb_timer_channel_pulse_width_percent(size_t n_args, const mp_obj_t *args) {
-    pyb_timer_channel_obj_t *self = args[0];
-    FTM_TypeDef *FTMx = self->timer->ftm.Instance;
-    uint32_t period = compute_period(self->timer);
-    if (n_args == 1) {
-        // get
-        uint32_t cmp = FTMx->channel[self->channel].CV & 0xffff;
-        return compute_percent_from_pwm_value(period, cmp);
-    } else {
-        // set
-        uint32_t cmp = compute_pwm_value_from_percent(period, args[1]);
-        FTMx->channel[self->channel].CV = cmp & 0xffff;
-        return mp_const_none;
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_pulse_width_percent_obj, 1, 2, pyb_timer_channel_pulse_width_percent);
-
-/// \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 = self_in;
-    if (callback == mp_const_none) {
-        // stop interrupt (but not timer)
-        __HAL_FTM_DISABLE_CH_IT(&self->timer->ftm, self->channel);
-        self->callback = mp_const_none;
-    } else if (mp_obj_is_callable(callback)) {
-        self->callback = callback;
-        HAL_NVIC_EnableIRQ(self->timer->irqn);
-        // start timer, so that it interrupts on overflow
-        switch (self->mode) {
-            case CHANNEL_MODE_PWM_NORMAL:
-            case CHANNEL_MODE_PWM_INVERTED:
-                HAL_FTM_PWM_Start_IT(&self->timer->ftm, self->channel);
-                break;
-            case CHANNEL_MODE_OC_TIMING:
-            case CHANNEL_MODE_OC_ACTIVE:
-            case CHANNEL_MODE_OC_INACTIVE:
-            case CHANNEL_MODE_OC_TOGGLE:
-                HAL_FTM_OC_Start_IT(&self->timer->ftm, self->channel);
-                break;
-            case CHANNEL_MODE_IC:
-                HAL_FTM_IC_Start_IT(&self->timer->ftm, self->channel);
-                break;
-        }
-    } 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);
-
-#if MICROPY_TIMER_REG
-reg_t timer_channel_reg[] = {
-    REG_ENTRY(FTM_ChannelTypeDef, CSC),
-    REG_ENTRY(FTM_ChannelTypeDef, CV),
-};
-
-mp_obj_t pyb_timer_channel_reg(uint n_args, const mp_obj_t *args) {
-    pyb_timer_channel_obj_t *self = args[0];
-    return reg_cmd(&self->timer->ftm.Instance->channel[self->channel],
-        timer_channel_reg, MP_ARRAY_SIZE(timer_channel_reg),
-        n_args - 1, args + 1);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_reg_obj, 1, 3, pyb_timer_channel_reg);
-#endif
-
-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_pulse_width), MP_ROM_PTR(&pyb_timer_channel_capture_compare_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pulse_width_percent), MP_ROM_PTR(&pyb_timer_channel_pulse_width_percent_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) },
-    #if MICROPY_TIMER_REG
-    { MP_ROM_QSTR(MP_QSTR_reg), MP_ROM_PTR(&pyb_timer_channel_reg_obj) },
-    #endif
-};
-STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
-
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_timer_channel_type,
-    MP_QSTR_TimerChannel,
-    MP_TYPE_FLAG_NONE,
-    print, pyb_timer_channel_print,
-    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) {
-    // execute callback if it's set
-    if (callback == mp_const_none) {
-        return false;
-    }
-    bool handled = false;
-
-    // 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, self);
-        nlr_pop();
-        handled = true;
-    } else {
-        // Uncaught exception; disable the callback so it doesn't run again.
-        self->callback = mp_const_none;
-        if (channel == 0xffffffff) {
-            printf("Uncaught exception in Timer(" UINT_FMT
-                ") interrupt handler\n", self->tim_id);
-        } else {
-            printf("Uncaught exception in Timer(" UINT_FMT ") channel "
-                UINT_FMT " interrupt handler\n", self->tim_id, channel);
-        }
-        mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
-    }
-    gc_unlock();
-    return handled;
-}
-
-STATIC void ftm_irq_handler(uint tim_id) {
-    if (tim_id >= PYB_TIMER_OBJ_ALL_NUM) {
-        return;
-    }
-    // get the timer object
-    pyb_timer_obj_t *self = pyb_timer_obj_all[tim_id];
-    if (self == NULL) {
-        // timer object has not been set, so we can't do anything
-        printf("No timer object for id=%d\n", tim_id);
-        return;
-    }
-    FTM_HandleTypeDef *hftm = &self->ftm;
-
-    bool handled = false;
-
-    // Check for timer (versus timer channel) interrupt.
-    if (__HAL_FTM_GET_TOF_IT(hftm) && __HAL_FTM_GET_TOF_FLAG(hftm)) {
-        __HAL_FTM_CLEAR_TOF_FLAG(hftm);
-        if (ftm_handle_irq_callback(self, 0xffffffff, self->callback)) {
-            handled = true;
-        } else {
-            __HAL_FTM_DISABLE_TOF_IT(&self->ftm);
-            printf("No callback for Timer %d TOF (now disabled)\n", tim_id);
-        }
-    }
-
-    uint32_t processed = 0;
-
-    // Check to see if a timer channel interrupt is pending
-    pyb_timer_channel_obj_t *chan = self->channel;
-    while (chan != NULL) {
-        processed |= (1 << chan->channel);
-        if (__HAL_FTM_GET_CH_IT(&self->ftm, chan->channel) && __HAL_FTM_GET_CH_FLAG(&self->ftm, chan->channel)) {
-            __HAL_FTM_CLEAR_CH_FLAG(&self->ftm, chan->channel);
-            if (ftm_handle_irq_callback(self, chan->channel, chan->callback)) {
-                handled = true;
-            } else {
-                __HAL_FTM_DISABLE_CH_IT(&self->ftm, chan->channel);
-                printf("No callback for Timer %d channel %u (now disabled)\n",
-                    self->tim_id, chan->channel);
-            }
-        }
-        chan = chan->next;
-    }
-
-    if (!handled) {
-        // An interrupt occurred for a channel we didn't process. Find it and
-        // turn it off.
-        for (mp_uint_t channel = 0; channel < 8; channel++) {
-            if ((processed & (1 << channel)) == 0) {
-                if (__HAL_FTM_GET_CH_FLAG(&self->ftm, channel) != 0) {
-                    __HAL_FTM_CLEAR_CH_FLAG(&self->ftm, channel);
-                    __HAL_FTM_DISABLE_CH_IT(&self->ftm, channel);
-                    printf("Unhandled interrupt Timer %d channel %u (now disabled)\n",
-                        tim_id, channel);
-                }
-            }
-        }
-    }
-}
-
-void ftm0_isr(void) {
-    ftm_irq_handler(0);
-}
-
-void ftm1_isr(void) {
-    ftm_irq_handler(1);
-}
-
-void ftm2_isr(void) {
-    ftm_irq_handler(2);
-}
diff --git a/ports/teensy/timer.h b/ports/teensy/timer.h
deleted file mode 100644
index 75c2e654e2c57..0000000000000
--- a/ports/teensy/timer.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.
- */
-#ifndef MICROPY_INCLUDED_TEENSY_TIMER_H
-#define MICROPY_INCLUDED_TEENSY_TIMER_H
-
-extern const mp_obj_type_t pyb_timer_type;
-
-void timer_init0(void);
-void timer_deinit(void);
-
-#endif // MICROPY_INCLUDED_TEENSY_TIMER_H
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
deleted file mode 100644
index e71f676d0ae18..0000000000000
--- a/ports/teensy/uart.c
+++ /dev/null
@@ -1,493 +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 <stdio.h>
-#include <string.h>
-
-#include "py/runtime.h"
-#include "bufhelper.h"
-#include "uart.h"
-
-/// \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.
-///
-/// See usage model of I2C.  UART is very similar.  Main difference is
-/// parameters to init the UART bus:
-///
-///     from pyb import UART
-///
-///     uart = UART(1, 9600)                         # init with given baudrate
-///     uart.init(9600, bits=8, stop=1, parity=None) # init with given parameters
-///
-/// Bits can be 8 or 9, stop can be 1 or 2, parity can be None, 0 (even), 1 (odd).
-///
-/// Extra method:
-///
-///     uart.any()               # returns True if any characters waiting
-
-struct _pyb_uart_obj_t {
-    mp_obj_base_t base;
-    pyb_uart_t uart_id;
-    bool is_enabled;
-//    UART_HandleTypeDef uart;
-};
-
-pyb_uart_obj_t *pyb_uart_global_debug = NULL;
-
-// assumes Init parameters have been set up correctly
-bool uart_init2(pyb_uart_obj_t *uart_obj) {
-    #if 0
-    USART_TypeDef *UARTx = NULL;
-
-    uint32_t GPIO_Pin = 0;
-    uint8_t GPIO_AF_UARTx = 0;
-    GPIO_TypeDef *GPIO_Port = NULL;
-
-    switch (uart_obj->uart_id) {
-        // USART1 is on PA9/PA10 (CK on PA8), PB6/PB7
-        case PYB_UART_1:
-            UARTx = USART1;
-            GPIO_AF_UARTx = GPIO_AF7_USART1;
-
-            #if defined(PYBV4) || defined(PYBV10)
-            GPIO_Port = GPIOB;
-            GPIO_Pin = GPIO_PIN_6 | GPIO_PIN_7;
-            #else
-            GPIO_Port = GPIOA;
-            GPIO_Pin = GPIO_PIN_9 | GPIO_PIN_10;
-            #endif
-
-            __USART1_CLK_ENABLE();
-            break;
-
-        // USART2 is on PA2/PA3 (CK on PA4), PD5/PD6 (CK on PD7)
-        case PYB_UART_2:
-            UARTx = USART2;
-            GPIO_AF_UARTx = GPIO_AF7_USART2;
-
-            GPIO_Port = GPIOA;
-            GPIO_Pin = GPIO_PIN_2 | GPIO_PIN_3;
-
-            __USART2_CLK_ENABLE();
-            break;
-
-        // USART3 is on PB10/PB11 (CK on PB12), PC10/PC11 (CK on PC12), PD8/PD9 (CK on PD10)
-        case PYB_UART_3:
-            UARTx = USART3;
-            GPIO_AF_UARTx = GPIO_AF7_USART3;
-
-            #if defined(PYBV3) || defined(PYBV4) | defined(PYBV10)
-            GPIO_Port = GPIOB;
-            GPIO_Pin = GPIO_PIN_10 | GPIO_PIN_11;
-            #else
-            GPIO_Port = GPIOD;
-            GPIO_Pin = GPIO_PIN_8 | GPIO_PIN_9;
-            #endif
-            __USART3_CLK_ENABLE();
-            break;
-
-        // UART4 is on PA0/PA1, PC10/PC11
-        case PYB_UART_4:
-            UARTx = UART4;
-            GPIO_AF_UARTx = GPIO_AF8_UART4;
-
-            GPIO_Port = GPIOA;
-            GPIO_Pin = GPIO_PIN_0 | GPIO_PIN_1;
-
-            __UART4_CLK_ENABLE();
-            break;
-
-        // USART6 is on PC6/PC7 (CK on PC8)
-        case PYB_UART_6:
-            UARTx = USART6;
-            GPIO_AF_UARTx = GPIO_AF8_USART6;
-
-            GPIO_Port = GPIOC;
-            GPIO_Pin = GPIO_PIN_6 | GPIO_PIN_7;
-
-            __USART6_CLK_ENABLE();
-            break;
-
-        default:
-            return false;
-    }
-
-    // init GPIO
-    GPIO_InitTypeDef GPIO_InitStructure;
-    GPIO_InitStructure.Pin = GPIO_Pin;
-    GPIO_InitStructure.Speed = GPIO_SPEED_HIGH;
-    GPIO_InitStructure.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStructure.Pull = GPIO_PULLUP;
-    GPIO_InitStructure.Alternate = GPIO_AF_UARTx;
-    HAL_GPIO_Init(GPIO_Port, &GPIO_InitStructure);
-
-    // init UARTx
-    uart_obj->uart.Instance = UARTx;
-    HAL_UART_Init(&uart_obj->uart);
-
-    uart_obj->is_enabled = true;
-    #endif
-    return true;
-}
-
-bool uart_init(pyb_uart_obj_t *uart_obj, uint32_t baudrate) {
-    #if 0
-    UART_HandleTypeDef *uh = &uart_obj->uart;
-    memset(uh, 0, sizeof(*uh));
-    uh->Init.BaudRate = baudrate;
-    uh->Init.WordLength = UART_WORDLENGTH_8B;
-    uh->Init.StopBits = UART_STOPBITS_1;
-    uh->Init.Parity = UART_PARITY_NONE;
-    uh->Init.Mode = UART_MODE_TX_RX;
-    uh->Init.HwFlowCtl = UART_HWCONTROL_NONE;
-    uh->Init.OverSampling = UART_OVERSAMPLING_16;
-    #endif
-    return uart_init2(uart_obj);
-}
-
-mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj) {
-    #if 0
-    return __HAL_UART_GET_FLAG(&uart_obj->uart, UART_FLAG_RXNE);
-    #else
-    return 0;
-    #endif
-}
-
-int uart_rx_char(pyb_uart_obj_t *uart_obj) {
-    uint8_t ch;
-    #if 0
-    if (HAL_UART_Receive(&uart_obj->uart, &ch, 1, 0) != HAL_OK) {
-        ch = 0;
-    }
-    #else
-    ch = 'A';
-    #endif
-    return ch;
-}
-
-void uart_tx_char(pyb_uart_obj_t *uart_obj, int c) {
-    #if 0
-    uint8_t ch = c;
-    HAL_UART_Transmit(&uart_obj->uart, &ch, 1, 100000);
-    #endif
-}
-
-void uart_tx_str(pyb_uart_obj_t *uart_obj, const char *str) {
-    #if 0
-    HAL_UART_Transmit(&uart_obj->uart, (uint8_t *)str, strlen(str), 100000);
-    #endif
-}
-
-void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
-    #if 0
-    HAL_UART_Transmit(&uart_obj->uart, (uint8_t *)str, len, 100000);
-    #endif
-}
-
-void uart_tx_strn_cooked(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
-    for (const char *top = str + len; str < top; str++) {
-        if (*str == '\n') {
-            uart_tx_char(uart_obj, '\r');
-        }
-        uart_tx_char(uart_obj, *str);
-    }
-}
-
-/******************************************************************************/
-/* MicroPython bindings                                                      */
-
-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 = self_in;
-    if (!self->is_enabled) {
-        mp_printf(print, "UART(%lu)", self->uart_id);
-    } else {
-        #if 0
-        mp_printf(print, "UART(%lu, baudrate=%u, bits=%u, stop=%u",
-            self->uart_id, self->uart.Init.BaudRate,
-            self->uart.Init.WordLength == UART_WORDLENGTH_8B ? 8 : 9,
-            self->uart.Init.StopBits == UART_STOPBITS_1 ? 1 : 2);
-        if (self->uart.Init.Parity == UART_PARITY_NONE) {
-            mp_print_str(print, ", parity=None)");
-        } else {
-            mp_printf(print, ", parity=%u)", self->uart.Init.Parity == UART_PARITY_EVEN ? 0 : 1);
-        }
-        #endif
-    }
-}
-
-/// \method init(baudrate, *, bits=8, stop=1, parity=None)
-///
-/// Initialise the SPI bus with the given parameters:
-///
-///   - `baudrate` is the clock rate.
-///   - `bits` is the number of bits per byte, 8 or 9.
-///   - `stop` is the number of stop bits, 1 or 2.
-///   - `parity` is the parity, `None`, 0 (even) or 1 (odd).
-STATIC const mp_arg_t pyb_uart_init_args[] = {
-    { MP_QSTR_baudrate, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 9600} },
-    { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT,  {.u_int = 8} },
-    { MP_QSTR_stop,     MP_ARG_KW_ONLY | MP_ARG_INT,  {.u_int = 1} },
-    { MP_QSTR_parity,   MP_ARG_KW_ONLY | MP_ARG_OBJ,  {.u_obj = mp_const_none} },
-};
-#define PYB_UART_INIT_NUM_ARGS MP_ARRAY_SIZE(pyb_uart_init_args)
-
-STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, uint n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    // parse args
-    mp_arg_val_t vals[PYB_UART_INIT_NUM_ARGS];
-    mp_arg_parse_all(n_args, args, kw_args, PYB_UART_INIT_NUM_ARGS, pyb_uart_init_args, vals);
-    #if 0
-    // set the UART configuration values
-    memset(&self->uart, 0, sizeof(self->uart));
-    UART_InitTypeDef *init = &self->uart.Init;
-    init->BaudRate = vals[0].u_int;
-    init->WordLength = vals[1].u_int == 8 ? UART_WORDLENGTH_8B : UART_WORDLENGTH_9B;
-    switch (vals[2].u_int) {
-        case 1:
-            init->StopBits = UART_STOPBITS_1;
-            break;
-        default:
-            init->StopBits = UART_STOPBITS_2;
-            break;
-    }
-    if (vals[3].u_obj == mp_const_none) {
-        init->Parity = UART_PARITY_NONE;
-    } else {
-        mp_int_t parity = mp_obj_get_int(vals[3].u_obj);
-        init->Parity = (parity & 1) ? UART_PARITY_ODD : UART_PARITY_EVEN;
-    }
-    init->Mode = UART_MODE_TX_RX;
-    init->HwFlowCtl = UART_HWCONTROL_NONE;
-    init->OverSampling = UART_OVERSAMPLING_16;
-
-    // init UART (if it fails, it's because the port doesn't exist)
-    if (!uart_init2(self)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART port %d does not exist"), self->uart_id);
-    }
-    #endif
-
-    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, uint n_args, uint n_kw, const mp_obj_t *args) {
-    // check arguments
-    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
-
-    // create object
-    pyb_uart_obj_t *o = mp_obj_malloc(pyb_uart_obj_t, &pyb_uart_type);
-
-    // work out port
-    o->uart_id = 0;
-    #if 0
-    if (mp_obj_is_str(args[0])) {
-        const char *port = mp_obj_str_get_str(args[0]);
-        if (0) {
-        #if defined(PYBV10)
-        } else if (strcmp(port, "XA") == 0) {
-            o->uart_id = PYB_UART_XA;
-        } else if (strcmp(port, "XB") == 0) {
-            o->uart_id = PYB_UART_XB;
-        } else if (strcmp(port, "YA") == 0) {
-            o->uart_id = PYB_UART_YA;
-        } else if (strcmp(port, "YB") == 0) {
-            o->uart_id = PYB_UART_YB;
-        #endif
-        } else {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART port %s does not exist"), port);
-        }
-    } else {
-        o->uart_id = mp_obj_get_int(args[0]);
-    }
-    #endif
-
-    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_uart_init_helper(o, n_args - 1, args + 1, &kw_args);
-    }
-
-    return o;
-}
-
-STATIC mp_obj_t pyb_uart_init(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    return pyb_uart_init_helper(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 = self_in;
-    // TODO
-    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 = self_in;
-    if (uart_rx_any(self)) {
-        return mp_const_true;
-    } else {
-        return mp_const_false;
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_any_obj, pyb_uart_any);
-
-/// \method send(send, *, timeout=5000)
-/// Send data on the bus:
-///
-///   - `send` is the data to send (an integer to send, or a buffer object).
-///   - `timeout` is the timeout in milliseconds to wait for the send.
-///
-/// Return value: `None`.
-STATIC const mp_arg_t pyb_uart_send_args[] = {
-    { MP_QSTR_send,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-    { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} },
-};
-#define PYB_UART_SEND_NUM_ARGS MP_ARRAY_SIZE(pyb_uart_send_args)
-
-STATIC mp_obj_t pyb_uart_send(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    // TODO assumes transmission size is 8-bits wide
-
-    pyb_uart_obj_t *self = args[0];
-
-    // parse args
-    mp_arg_val_t vals[PYB_UART_SEND_NUM_ARGS];
-    mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_UART_SEND_NUM_ARGS, pyb_uart_send_args, vals);
-
-    #if 0
-    // get the buffer to send from
-    mp_buffer_info_t bufinfo;
-    uint8_t data[1];
-    pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data);
-
-    // send the data
-    HAL_StatusTypeDef status = HAL_UART_Transmit(&self->uart, bufinfo.buf, bufinfo.len, vals[1].u_int);
-
-    if (status != HAL_OK) {
-        // TODO really need a HardwareError object, or something
-        mp_raise_msg_varg(&mp_type_Exception, MP_ERROR_TEXT("HAL_UART_Transmit failed with code %d"), status);
-    }
-    #else
-    (void)self;
-    #endif
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_send_obj, 1, pyb_uart_send);
-
-/// \method recv(recv, *, timeout=5000)
-///
-/// Receive data on the bus:
-///
-///   - `recv` can be an integer, which is the number of bytes to receive,
-///     or a mutable buffer, which will be filled with received bytes.
-///   - `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,
-/// otherwise the same buffer that was passed in to `recv`.
-#if 0
-STATIC const mp_arg_t pyb_uart_recv_args[] = {
-    { MP_QSTR_recv,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-    { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} },
-};
-#define PYB_UART_RECV_NUM_ARGS MP_ARRAY_SIZE(pyb_uart_recv_args)
-#endif
-
-STATIC mp_obj_t pyb_uart_recv(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    // TODO assumes transmission size is 8-bits wide
-
-    pyb_uart_obj_t *self = args[0];
-
-    #if 0
-    // parse args
-    mp_arg_val_t vals[PYB_UART_RECV_NUM_ARGS];
-    mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_UART_RECV_NUM_ARGS, pyb_uart_recv_args, vals);
-
-    // get the buffer to receive into
-    mp_buffer_info_t bufinfo;
-    mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &bufinfo);
-
-    // receive the data
-    HAL_StatusTypeDef status = HAL_UART_Receive(&self->uart, bufinfo.buf, bufinfo.len, vals[1].u_int);
-
-    if (status != HAL_OK) {
-        // TODO really need a HardwareError object, or something
-        mp_raise_msg_varg(&mp_type_Exception, MP_ERROR_TEXT("HAL_UART_Receive failed with code %d"), status);
-    }
-
-    // return the received data
-    if (o_ret == MP_OBJ_NULL) {
-        return vals[0].u_obj;
-    } else {
-        return mp_obj_str_builder_end(o_ret);
-    }
-    #else
-    (void)self;
-    return mp_const_none;
-    #endif
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_recv_obj, 1, pyb_uart_recv);
-
-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) },
-    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&pyb_uart_send_obj) },
-    { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&pyb_uart_recv_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, pyb_uart_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    pyb_uart_type,
-    MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
-    make_new, pyb_uart_make_new,
-    print, pyb_uart_print,
-    locals_dict, &pyb_uart_locals_dict
-    );
diff --git a/ports/teensy/uart.h b/ports/teensy/uart.h
deleted file mode 100644
index fd9b26f951a18..0000000000000
--- a/ports/teensy/uart.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MICROPY_INCLUDED_TEENSY_UART_H
-#define MICROPY_INCLUDED_TEENSY_UART_H
-
-typedef enum {
-    PYB_UART_NONE = 0,
-} pyb_uart_t;
-
-typedef struct _pyb_uart_obj_t pyb_uart_obj_t;
-
-extern const mp_obj_type_t pyb_uart_type;
-
-mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj);
-int uart_rx_char(pyb_uart_obj_t *uart_obj);
-void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len);
-
-#endif // MICROPY_INCLUDED_TEENSY_UART_H
diff --git a/ports/teensy/usb.c b/ports/teensy/usb.c
deleted file mode 100644
index a906f91288b40..0000000000000
--- a/ports/teensy/usb.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <string.h>
-
-#include "py/runtime.h"
-
-#include "Arduino.h"
-
-#include "usb.h"
-#include "usb_serial.h"
-
-bool usb_vcp_is_connected(void) {
-    return usb_configuration && (usb_cdc_line_rtsdtr & (USB_SERIAL_DTR | USB_SERIAL_RTS));
-}
-
-bool usb_vcp_is_enabled(void) {
-    return true;
-}
-
-int usb_vcp_rx_num(void) {
-    return usb_serial_available();
-}
-
-int usb_vcp_recv_byte(uint8_t *ptr) {
-    int ch = usb_serial_getchar();
-    if (ch < 0) {
-        return 0;
-    }
-    *ptr = ch;
-    return 1;
-}
-
-void usb_vcp_send_str(const char *str) {
-    usb_vcp_send_strn(str, strlen(str));
-}
-
-void usb_vcp_send_strn(const char *str, int len) {
-    usb_serial_write(str, len);
-}
-
-void usb_vcp_send_strn_cooked(const char *str, int len) {
-    for (const char *top = str + len; str < top; str++) {
-        if (*str == '\n') {
-            usb_serial_putchar('\r');
-        }
-        usb_serial_putchar(*str);
-    }
-}
diff --git a/ports/teensy/usb.h b/ports/teensy/usb.h
deleted file mode 100644
index 7ca0eacb9bbf2..0000000000000
--- a/ports/teensy/usb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef MICROPY_INCLUDED_TEENSY_USB_H
-#define MICROPY_INCLUDED_TEENSY_USB_H
-
-bool usb_vcp_is_connected(void);
-bool usb_vcp_is_enabled(void);
-int usb_vcp_rx_num(void);
-int usb_vcp_recv_byte(uint8_t *ptr);
-void usb_vcp_send_str(const char *str);
-void usb_vcp_send_strn(const char *str, int len);
-void usb_vcp_send_strn_cooked(const char *str, int len);
-
-#endif // MICROPY_INCLUDED_TEENSY_USB_H
diff --git a/tools/ci.sh b/tools/ci.sh
index a4cbb045a4577..53e3425699908 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -356,19 +356,6 @@ function ci_stm32_nucleo_build {
     diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu
 }
 
-########################################################################################
-# ports/teensy
-
-function ci_teensy_setup {
-    ci_gcc_arm_setup
-}
-
-function ci_teensy_build {
-    make ${MAKEOPTS} -C mpy-cross
-    make ${MAKEOPTS} -C ports/teensy submodules
-    make ${MAKEOPTS} -C ports/teensy
-}
-
 ########################################################################################
 # ports/unix
 
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 761bde3a81ed3..aee9894345d68 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -76,8 +76,6 @@
     # 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 a614c1d5016e5448c3e1c36caea4667c985eb7f0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 31 Oct 2023 13:31:54 +1100
Subject: [PATCH 0492/3129] extmod: Remove empty utime_mphal.h file.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/utime_mphal.h | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 extmod/utime_mphal.h

diff --git a/extmod/utime_mphal.h b/extmod/utime_mphal.h
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/extmod/utime_mphal.h
+++ /dev/null
@@ -1 +0,0 @@
-

From 4cffa848f60b4d403a8edb4c87a6cd12e6d89993 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Nov 2023 10:38:52 +1100
Subject: [PATCH 0493/3129] esp32/boards: Reduce size of D2WD and OTA firmware.

Commit c4e63ace661df9748cfae451bde7781e61e0b3d9 enabled the SPI Ethernet
driver and that cost about 13k of firwmare size, pushing the firmware over
the limit of the D2WD and OTA board variants available size.

To fix, disable SPI Ethernet on the D2WD variant, and build the OTA variant
with size optimisation rather than performance optimisation.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd | 3 +++
 ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
index 7b4313b7deef1..f6e07893e937d 100644
--- a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
+++ b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
@@ -3,6 +3,9 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=n
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 
+# Disable SPI Ethernet driver to reduce firmware size.
+CONFIG_ETH_USE_SPI_ETHERNET=n
+
 CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
diff --git a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
index e3a1f81fd3c9f..352dd96f2323f 100644
--- a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
+++ b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.ota
@@ -2,4 +2,6 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB-ota.csv"
 
 # Reduce firmware size to fit in the OTA partition.
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_PERF=n
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y

From 95ce61d0ad05af7b5ce258f1faa01a259dd1275a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 31 Oct 2023 13:28:25 +0100
Subject: [PATCH 0494/3129] esp32: Use better build settings for ESP32-C3.

ESP32-C3 is not Xtensa-based, so build settings are now tailored a bit
better following that fact.  ESP-IDF 5.x already adds architecture-specific
modules by itself so there is no need to specify either the `xtensa` or the
`riscv` module in the build settings.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/esp32_common.cmake          | 3 ++-
 ports/esp32/main_esp32c3/CMakeLists.txt | 1 -
 py/mkrules.cmake                        | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 8b3dac532ac2a..f66c59e341c36 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -134,7 +134,6 @@ list(APPEND IDF_COMPONENTS
     spi_flash
     ulp
     vfs
-    xtensa
 )
 
 # Register the main IDF component.
@@ -161,7 +160,9 @@ idf_component_register(
 set(MICROPY_TARGET ${COMPONENT_TARGET})
 
 # Define mpy-cross flags, for use with frozen code.
+if(NOT IDF_TARGET STREQUAL "esp32c3")
 set(MICROPY_CROSS_FLAGS -march=xtensawin)
+endif()
 
 # Set compile options for this port.
 target_compile_definitions(${MICROPY_TARGET} PUBLIC
diff --git a/ports/esp32/main_esp32c3/CMakeLists.txt b/ports/esp32/main_esp32c3/CMakeLists.txt
index 307c0f32183a9..c9f1e5bcb49cd 100644
--- a/ports/esp32/main_esp32c3/CMakeLists.txt
+++ b/ports/esp32/main_esp32c3/CMakeLists.txt
@@ -9,6 +9,5 @@ if(NOT MICROPY_PORT_DIR)
 endif()
 
 list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
-list(APPEND IDF_COMPONENTS riscv)
 
 include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 6415b549aa8b5..7622cd903a883 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -212,10 +212,16 @@ if(MICROPY_FROZEN_MANIFEST)
         )
     endif()
 
+    if(NOT MICROPY_CROSS_FLAGS)
+        set(MICROPY_CROSS_FLAGS "")
+    else()
+        set(MICROPY_CROSS_FLAGS "-f${MICROPY_CROSS_FLAGS}")
+    endif()
+
     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}
+        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}" ${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS
             ${MICROPY_QSTRDEFS_GENERATED}
             ${MICROPY_ROOT_POINTERS}

From d8a263435fc9e043dda9ba2f903c9348559f6582 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 1 Nov 2023 15:26:16 +1100
Subject: [PATCH 0495/3129] esp32/mphalport: Add function to wake main from
 separate FreeRTOS task.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/esp32/mphalport.c | 7 ++++++-
 ports/esp32/mphalport.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 79ddcd4827aa2..8e14bda595f3b 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -214,7 +214,12 @@ uint64_t mp_hal_time_ns(void) {
     return ns;
 }
 
-// Wake up the main task if it is sleeping
+// Wake up the main task if it is sleeping.
+void mp_hal_wake_main_task(void) {
+    xTaskNotifyGive(mp_main_task_handle);
+}
+
+// Wake up the main task if it is sleeping, to be called from an ISR.
 void mp_hal_wake_main_task_from_isr(void) {
     BaseType_t xHigherPriorityTaskWoken = pdFALSE;
     vTaskNotifyGiveFromISR(mp_main_task_handle, &xHigherPriorityTaskWoken);
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 5e54c24bfea0e..d77e2dd0df309 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -83,6 +83,7 @@ uint32_t mp_hal_get_cpu_freq(void);
 #define mp_hal_quiet_timing_exit(irq_state) MICROPY_END_ATOMIC_SECTION(irq_state)
 
 // Wake up the main task if it is sleeping
+void mp_hal_wake_main_task(void);
 void mp_hal_wake_main_task_from_isr(void);
 
 // C-level pin HAL

From 06a7bf967c58644a0d341764994bdcc9253b4527 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 1 Nov 2023 11:06:10 +1100
Subject: [PATCH 0496/3129] esp32/usb: Wake main thread when USB receives data.

This improves (decreases) the latency on stdin, on SoCs with built-in USB
and using TinyUSB, like S2 and S3.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/esp32/usb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 2e417755c9abf..316482e1898a0 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -40,8 +40,10 @@
 
 static uint8_t usb_rx_buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE];
 
+// This is called from FreeRTOS task "tusb_tsk" in espressif__esp_tinyusb (not an ISR).
 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?
+    // espressif__esp_tinyusb places tinyusb rx data onto freertos ringbuffer which
+    // this function forwards onto our stdin_ringbuf.
     for (;;) {
         size_t len = 0;
         esp_err_t ret = tinyusb_cdcacm_read(itf, usb_rx_buf, sizeof(usb_rx_buf), &len);
@@ -58,6 +60,7 @@ static void usb_callback_rx(int itf, cdcacm_event_t *event) {
                 ringbuf_put(&stdin_ringbuf, usb_rx_buf[i]);
             }
         }
+        mp_hal_wake_main_task();
     }
 }
 

From 7ad84e0422a521fe97ce5d742df280c6b8a3ff87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 29 Jun 2023 14:17:56 +0200
Subject: [PATCH 0497/3129] lib/littlefs: Update LittleFS to v2.8.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/extmod.mk         |    2 +-
 lib/littlefs/lfs2.c      | 1007 ++++++++++++++++++++++++++++----------
 lib/littlefs/lfs2.h      |   82 +++-
 lib/littlefs/lfs2_util.h |   10 +-
 4 files changed, 842 insertions(+), 259 deletions(-)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 8a48a4293698b..c4b2c3d9c5247 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -106,7 +106,7 @@ SRC_THIRDPARTY_C += $(addprefix $(LITTLEFS_DIR)/,\
 	lfs2_util.c \
 	)
 
-$(BUILD)/$(LITTLEFS_DIR)/lfs2.o: CFLAGS += -Wno-missing-field-initializers
+$(BUILD)/$(LITTLEFS_DIR)/lfs2.o: CFLAGS += -Wno-shadow
 endif
 
 ################################################################################
diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index a9fcffafd818a..d89c42fd59a21 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -46,8 +46,8 @@ static int lfs2_bd_read(lfs2_t *lfs2,
         lfs2_block_t block, lfs2_off_t off,
         void *buffer, lfs2_size_t size) {
     uint8_t *data = buffer;
-    if (block >= lfs2->cfg->block_count ||
-            off+size > lfs2->cfg->block_size) {
+    if (off+size > lfs2->cfg->block_size
+            || (lfs2->block_count && block >= lfs2->block_count)) {
         return LFS2_ERR_CORRUPT;
     }
 
@@ -104,7 +104,7 @@ static int lfs2_bd_read(lfs2_t *lfs2,
         }
 
         // load to cache, first condition can no longer fail
-        LFS2_ASSERT(block < lfs2->cfg->block_count);
+        LFS2_ASSERT(!lfs2->block_count || block < lfs2->block_count);
         rcache->block = block;
         rcache->off = lfs2_aligndown(off, lfs2->cfg->read_size);
         rcache->size = lfs2_min(
@@ -135,14 +135,14 @@ static int lfs2_bd_cmp(lfs2_t *lfs2,
         uint8_t dat[8];
 
         diff = lfs2_min(size-i, sizeof(dat));
-        int res = lfs2_bd_read(lfs2,
+        int err = lfs2_bd_read(lfs2,
                 pcache, rcache, hint-i,
                 block, off+i, &dat, diff);
-        if (res) {
-            return res;
+        if (err) {
+            return err;
         }
 
-        res = memcmp(dat, data + i, diff);
+        int res = memcmp(dat, data + i, diff);
         if (res) {
             return res < 0 ? LFS2_CMP_LT : LFS2_CMP_GT;
         }
@@ -151,11 +151,32 @@ static int lfs2_bd_cmp(lfs2_t *lfs2,
     return LFS2_CMP_EQ;
 }
 
+static int lfs2_bd_crc(lfs2_t *lfs2,
+        const lfs2_cache_t *pcache, lfs2_cache_t *rcache, lfs2_size_t hint,
+        lfs2_block_t block, lfs2_off_t off, lfs2_size_t size, uint32_t *crc) {
+    lfs2_size_t diff = 0;
+
+    for (lfs2_off_t i = 0; i < size; i += diff) {
+        uint8_t dat[8];
+        diff = lfs2_min(size-i, sizeof(dat));
+        int err = lfs2_bd_read(lfs2,
+                pcache, rcache, hint-i,
+                block, off+i, &dat, diff);
+        if (err) {
+            return err;
+        }
+
+        *crc = lfs2_crc(*crc, &dat, diff);
+    }
+
+    return 0;
+}
+
 #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) {
-        LFS2_ASSERT(pcache->block < lfs2->cfg->block_count);
+        LFS2_ASSERT(pcache->block < lfs2->block_count);
         lfs2_size_t diff = lfs2_alignup(pcache->size, lfs2->cfg->prog_size);
         int err = lfs2->cfg->prog(lfs2->cfg, pcache->block,
                 pcache->off, pcache->buffer, diff);
@@ -208,7 +229,7 @@ static int lfs2_bd_prog(lfs2_t *lfs2,
         lfs2_block_t block, lfs2_off_t off,
         const void *buffer, lfs2_size_t size) {
     const uint8_t *data = buffer;
-    LFS2_ASSERT(block == LFS2_BLOCK_INLINE || block < lfs2->cfg->block_count);
+    LFS2_ASSERT(block == LFS2_BLOCK_INLINE || block < lfs2->block_count);
     LFS2_ASSERT(off + size <= lfs2->cfg->block_size);
 
     while (size > 0) {
@@ -252,7 +273,7 @@ static int lfs2_bd_prog(lfs2_t *lfs2,
 
 #ifndef LFS2_READONLY
 static int lfs2_bd_erase(lfs2_t *lfs2, lfs2_block_t block) {
-    LFS2_ASSERT(block < lfs2->cfg->block_count);
+    LFS2_ASSERT(block < lfs2->block_count);
     int err = lfs2->cfg->erase(lfs2->cfg, block);
     LFS2_ASSERT(err <= 0);
     return err;
@@ -279,14 +300,12 @@ static inline int lfs2_pair_cmp(
              paira[0] == pairb[1] || paira[1] == pairb[0]);
 }
 
-#ifndef LFS2_READONLY
-static inline bool lfs2_pair_sync(
+static inline bool lfs2_pair_issync(
         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]);
@@ -325,6 +344,10 @@ static inline uint16_t lfs2_tag_type1(lfs2_tag_t tag) {
     return (tag & 0x70000000) >> 20;
 }
 
+static inline uint16_t lfs2_tag_type2(lfs2_tag_t tag) {
+    return (tag & 0x78000000) >> 20;
+}
+
 static inline uint16_t lfs2_tag_type3(lfs2_tag_t tag) {
     return (tag & 0x7ff00000) >> 20;
 }
@@ -386,7 +409,7 @@ static inline bool lfs2_gstate_hasorphans(const lfs2_gstate_t *a) {
 }
 
 static inline uint8_t lfs2_gstate_getorphans(const lfs2_gstate_t *a) {
-    return lfs2_tag_size(a->tag);
+    return lfs2_tag_size(a->tag) & 0x1ff;
 }
 
 static inline bool lfs2_gstate_hasmove(const lfs2_gstate_t *a) {
@@ -394,6 +417,10 @@ static inline bool lfs2_gstate_hasmove(const lfs2_gstate_t *a) {
 }
 #endif
 
+static inline bool lfs2_gstate_needssuperblock(const lfs2_gstate_t *a) {
+    return lfs2_tag_size(a->tag) >> 9;
+}
+
 static inline bool lfs2_gstate_hasmovehere(const lfs2_gstate_t *a,
         const lfs2_block_t *pair) {
     return lfs2_tag_type1(a->tag) && lfs2_pair_cmp(a->pair, pair) == 0;
@@ -413,6 +440,24 @@ static inline void lfs2_gstate_tole32(lfs2_gstate_t *a) {
 }
 #endif
 
+// operations on forward-CRCs used to track erased state
+struct lfs2_fcrc {
+    lfs2_size_t size;
+    uint32_t crc;
+};
+
+static void lfs2_fcrc_fromle32(struct lfs2_fcrc *fcrc) {
+    fcrc->size = lfs2_fromle32(fcrc->size);
+    fcrc->crc = lfs2_fromle32(fcrc->crc);
+}
+
+#ifndef LFS2_READONLY
+static void lfs2_fcrc_tole32(struct lfs2_fcrc *fcrc) {
+    fcrc->size = lfs2_tole32(fcrc->size);
+    fcrc->crc = lfs2_tole32(fcrc->crc);
+}
+#endif
+
 // other endianness operations
 static void lfs2_ctz_fromle32(struct lfs2_ctz *ctz) {
     ctz->head = lfs2_fromle32(ctz->head);
@@ -473,6 +518,28 @@ static void lfs2_mlist_append(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
     lfs2->mlist = mlist;
 }
 
+// some other filesystem operations
+static uint32_t lfs2_fs_disk_version(lfs2_t *lfs2) {
+    (void)lfs2;
+#ifdef LFS2_MULTIVERSION
+    if (lfs2->cfg->disk_version) {
+        return lfs2->cfg->disk_version;
+    } else
+#endif
+    {
+        return LFS2_DISK_VERSION;
+    }
+}
+
+static uint16_t lfs2_fs_disk_version_major(lfs2_t *lfs2) {
+    return 0xffff & (lfs2_fs_disk_version(lfs2) >> 16);
+
+}
+
+static uint16_t lfs2_fs_disk_version_minor(lfs2_t *lfs2) {
+    return 0xffff & (lfs2_fs_disk_version(lfs2) >> 0);
+}
+
 
 /// Internal operations predeclared here ///
 #ifndef LFS2_READONLY
@@ -500,6 +567,8 @@ static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t dir[2],
 static int lfs2_fs_forceconsistency(lfs2_t *lfs2);
 #endif
 
+static void lfs2_fs_prepsuperblock(lfs2_t *lfs2, bool needssuperblock);
+
 #ifdef LFS2_MIGRATE
 static int lfs21_traverse(lfs2_t *lfs2,
         int (*cb)(void*, lfs2_block_t), void *data);
@@ -528,7 +597,7 @@ static int lfs2_rawunmount(lfs2_t *lfs2);
 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)
-            + lfs2->cfg->block_count) % lfs2->cfg->block_count;
+            + lfs2->block_count) % lfs2->block_count;
 
     if (off < lfs2->free.size) {
         lfs2->free.buffer[off / 32] |= 1U << (off % 32);
@@ -542,7 +611,7 @@ static int lfs2_alloc_lookahead(void *p, lfs2_block_t block) {
 // 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;
+    lfs2->free.ack = lfs2->block_count;
 }
 
 // drop the lookahead buffer, this is done during mounting and failed
@@ -553,6 +622,26 @@ static void lfs2_alloc_drop(lfs2_t *lfs2) {
     lfs2_alloc_ack(lfs2);
 }
 
+#ifndef LFS2_READONLY
+static int lfs2_fs_rawgc(lfs2_t *lfs2) {
+    // Move free offset at the first unused block (lfs2->free.i)
+    // lfs2->free.i is equal lfs2->free.size when all blocks are used
+    lfs2->free.off = (lfs2->free.off + lfs2->free.i) % lfs2->block_count;
+    lfs2->free.size = lfs2_min(8*lfs2->cfg->lookahead_size, lfs2->free.ack);
+    lfs2->free.i = 0;
+
+    // find mask of free blocks from tree
+    memset(lfs2->free.buffer, 0, lfs2->cfg->lookahead_size);
+    int err = lfs2_fs_rawtraverse(lfs2, lfs2_alloc_lookahead, lfs2, true);
+    if (err) {
+        lfs2_alloc_drop(lfs2);
+        return err;
+    }
+
+    return 0;
+}
+#endif
+
 #ifndef LFS2_READONLY
 static int lfs2_alloc(lfs2_t *lfs2, lfs2_block_t *block) {
     while (true) {
@@ -563,7 +652,7 @@ static int lfs2_alloc(lfs2_t *lfs2, lfs2_block_t *block) {
 
             if (!(lfs2->free.buffer[off / 32] & (1U << (off % 32)))) {
                 // found a free block
-                *block = (lfs2->free.off + off) % lfs2->cfg->block_count;
+                *block = (lfs2->free.off + off) % lfs2->block_count;
 
                 // eagerly find next off so an alloc ack can
                 // discredit old lookahead blocks
@@ -585,16 +674,8 @@ static int lfs2_alloc(lfs2_t *lfs2, lfs2_block_t *block) {
             return LFS2_ERR_NOSPC;
         }
 
-        lfs2->free.off = (lfs2->free.off + lfs2->free.size)
-                % lfs2->cfg->block_count;
-        lfs2->free.size = lfs2_min(8*lfs2->cfg->lookahead_size, lfs2->free.ack);
-        lfs2->free.i = 0;
-
-        // find mask of free blocks from tree
-        memset(lfs2->free.buffer, 0, lfs2->cfg->lookahead_size);
-        int err = lfs2_fs_rawtraverse(lfs2, lfs2_alloc_lookahead, lfs2, true);
-        if (err) {
-            lfs2_alloc_drop(lfs2);
+        int err = lfs2_fs_rawgc(lfs2);
+        if(err) {
             return err;
         }
     }
@@ -808,7 +889,7 @@ static int lfs2_dir_traverse(lfs2_t *lfs2,
     // iterate over directory and attrs
     lfs2_tag_t tag;
     const void *buffer;
-    struct lfs2_diskoff disk;
+    struct lfs2_diskoff disk = {0};
     while (true) {
         {
             if (off+lfs2_tag_dsize(ptag) < dir->off) {
@@ -998,7 +1079,8 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
 
     // if either block address is invalid we return LFS2_ERR_CORRUPT here,
     // otherwise later writes to the pair could fail
-    if (pair[0] >= lfs2->cfg->block_count || pair[1] >= lfs2->cfg->block_count) {
+    if (lfs2->block_count 
+            && (pair[0] >= lfs2->block_count || pair[1] >= lfs2->block_count)) {
         return LFS2_ERR_CORRUPT;
     }
 
@@ -1035,6 +1117,11 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
         bool tempsplit = false;
         lfs2_stag_t tempbesttag = besttag;
 
+        // assume not erased until proven otherwise
+        bool maybeerased = false;
+        bool hasfcrc = false;
+        struct lfs2_fcrc fcrc;
+
         dir->rev = lfs2_tole32(dir->rev);
         uint32_t crc = lfs2_crc(0xffffffff, &dir->rev, sizeof(dir->rev));
         dir->rev = lfs2_fromle32(dir->rev);
@@ -1049,7 +1136,6 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
             if (err) {
                 if (err == LFS2_ERR_CORRUPT) {
                     // can't continue?
-                    dir->erased = false;
                     break;
                 }
                 return err;
@@ -1058,19 +1144,19 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
             crc = lfs2_crc(crc, &tag, sizeof(tag));
             tag = lfs2_frombe32(tag) ^ ptag;
 
-            // next commit not yet programmed or we're not in valid range
+            // next commit not yet programmed?
             if (!lfs2_tag_isvalid(tag)) {
-                dir->erased = (lfs2_tag_type1(ptag) == LFS2_TYPE_CRC &&
-                        dir->off % lfs2->cfg->prog_size == 0);
+                // we only might be erased if the last tag was a crc
+                maybeerased = (lfs2_tag_type2(ptag) == LFS2_TYPE_CCRC);
                 break;
+            // out of range?
             } else if (off + lfs2_tag_dsize(tag) > lfs2->cfg->block_size) {
-                dir->erased = false;
                 break;
             }
 
             ptag = tag;
 
-            if (lfs2_tag_type1(tag) == LFS2_TYPE_CRC) {
+            if (lfs2_tag_type2(tag) == LFS2_TYPE_CCRC) {
                 // check the crc attr
                 uint32_t dcrc;
                 err = lfs2_bd_read(lfs2,
@@ -1078,7 +1164,6 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
                         dir->pair[0], off+sizeof(tag), &dcrc, sizeof(dcrc));
                 if (err) {
                     if (err == LFS2_ERR_CORRUPT) {
-                        dir->erased = false;
                         break;
                     }
                     return err;
@@ -1086,7 +1171,6 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
                 dcrc = lfs2_fromle32(dcrc);
 
                 if (crc != dcrc) {
-                    dir->erased = false;
                     break;
                 }
 
@@ -1108,26 +1192,21 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
                 dir->tail[1] = temptail[1];
                 dir->split = tempsplit;
 
-                // reset crc
+                // reset crc, hasfcrc
                 crc = 0xffffffff;
                 continue;
             }
 
             // crc the entry first, hopefully leaving it in the cache
-            for (lfs2_off_t j = sizeof(tag); j < lfs2_tag_dsize(tag); j++) {
-                uint8_t dat;
-                err = lfs2_bd_read(lfs2,
-                        NULL, &lfs2->rcache, lfs2->cfg->block_size,
-                        dir->pair[0], off+j, &dat, 1);
-                if (err) {
-                    if (err == LFS2_ERR_CORRUPT) {
-                        dir->erased = false;
-                        break;
-                    }
-                    return err;
+            err = lfs2_bd_crc(lfs2,
+                    NULL, &lfs2->rcache, lfs2->cfg->block_size,
+                    dir->pair[0], off+sizeof(tag),
+                    lfs2_tag_dsize(tag)-sizeof(tag), &crc);
+            if (err) {
+                if (err == LFS2_ERR_CORRUPT) {
+                    break;
                 }
-
-                crc = lfs2_crc(crc, &dat, 1);
+                return err;
             }
 
             // directory modification tags?
@@ -1154,11 +1233,24 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
                         dir->pair[0], off+sizeof(tag), &temptail, 8);
                 if (err) {
                     if (err == LFS2_ERR_CORRUPT) {
-                        dir->erased = false;
                         break;
                     }
+                    return err;
                 }
                 lfs2_pair_fromle32(temptail);
+            } else if (lfs2_tag_type3(tag) == LFS2_TYPE_FCRC) {
+                err = lfs2_bd_read(lfs2,
+                        NULL, &lfs2->rcache, lfs2->cfg->block_size,
+                        dir->pair[0], off+sizeof(tag),
+                        &fcrc, sizeof(fcrc));
+                if (err) {
+                    if (err == LFS2_ERR_CORRUPT) {
+                        break;
+                    }
+                }
+
+                lfs2_fcrc_fromle32(&fcrc);
+                hasfcrc = true;
             }
 
             // found a match for our fetcher?
@@ -1167,7 +1259,6 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
                         dir->pair[0], off+sizeof(tag)});
                 if (res < 0) {
                     if (res == LFS2_ERR_CORRUPT) {
-                        dir->erased = false;
                         break;
                     }
                     return res;
@@ -1189,35 +1280,67 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
             }
         }
 
-        // consider what we have good enough
-        if (dir->off > 0) {
-            // synthetic move
-            if (lfs2_gstate_hasmovehere(&lfs2->gdisk, dir->pair)) {
-                if (lfs2_tag_id(lfs2->gdisk.tag) == lfs2_tag_id(besttag)) {
-                    besttag |= 0x80000000;
-                } else if (besttag != -1 &&
-                        lfs2_tag_id(lfs2->gdisk.tag) < lfs2_tag_id(besttag)) {
-                    besttag -= LFS2_MKTAG(0, 1, 0);
+        // found no valid commits?
+        if (dir->off == 0) {
+            // try the other block?
+            lfs2_pair_swap(dir->pair);
+            dir->rev = revs[(r+1)%2];
+            continue;
+        }
+
+        // did we end on a valid commit? we may have an erased block
+        dir->erased = false;
+        if (maybeerased && dir->off % lfs2->cfg->prog_size == 0) {
+        #ifdef LFS2_MULTIVERSION
+            // note versions < lfs22.1 did not have fcrc tags, if
+            // we're < lfs22.1 treat missing fcrc as erased data
+            //
+            // we don't strictly need to do this, but otherwise writing
+            // to lfs22.0 disks becomes very inefficient
+            if (lfs2_fs_disk_version(lfs2) < 0x00020001) {
+                dir->erased = true;
+
+            } else
+        #endif
+            if (hasfcrc) {
+                // check for an fcrc matching the next prog's erased state, if
+                // this failed most likely a previous prog was interrupted, we
+                // need a new erase
+                uint32_t fcrc_ = 0xffffffff;
+                int err = lfs2_bd_crc(lfs2,
+                        NULL, &lfs2->rcache, lfs2->cfg->block_size,
+                        dir->pair[0], dir->off, fcrc.size, &fcrc_);
+                if (err && err != LFS2_ERR_CORRUPT) {
+                    return err;
                 }
-            }
 
-            // found tag? or found best id?
-            if (id) {
-                *id = lfs2_min(lfs2_tag_id(besttag), dir->count);
+                // found beginning of erased part?
+                dir->erased = (fcrc_ == fcrc.crc);
             }
+        }
 
-            if (lfs2_tag_isvalid(besttag)) {
-                return besttag;
-            } else if (lfs2_tag_id(besttag) < dir->count) {
-                return LFS2_ERR_NOENT;
-            } else {
-                return 0;
+        // synthetic move
+        if (lfs2_gstate_hasmovehere(&lfs2->gdisk, dir->pair)) {
+            if (lfs2_tag_id(lfs2->gdisk.tag) == lfs2_tag_id(besttag)) {
+                besttag |= 0x80000000;
+            } else if (besttag != -1 &&
+                    lfs2_tag_id(lfs2->gdisk.tag) < lfs2_tag_id(besttag)) {
+                besttag -= LFS2_MKTAG(0, 1, 0);
             }
         }
 
-        // failed, try the other block?
-        lfs2_pair_swap(dir->pair);
-        dir->rev = revs[(r+1)%2];
+        // found tag? or found best id?
+        if (id) {
+            *id = lfs2_min(lfs2_tag_id(besttag), dir->count);
+        }
+
+        if (lfs2_tag_isvalid(besttag)) {
+            return besttag;
+        } else if (lfs2_tag_id(besttag) < dir->count) {
+            return LFS2_ERR_NOENT;
+        } else {
+            return 0;
+        }
     }
 
     LFS2_ERROR("Corrupted dir pair at {0x%"PRIx32", 0x%"PRIx32"}",
@@ -1491,9 +1614,15 @@ static int lfs2_dir_commitattr(lfs2_t *lfs2, struct lfs2_commit *commit,
 #endif
 
 #ifndef LFS2_READONLY
+
 static int lfs2_dir_commitcrc(lfs2_t *lfs2, struct lfs2_commit *commit) {
     // align to program units
-    const lfs2_off_t end = lfs2_alignup(commit->off + 2*sizeof(uint32_t),
+    //
+    // this gets a bit complex as we have two types of crcs:
+    // - 5-word crc with fcrc to check following prog (middle of block)
+    // - 2-word crc with no following prog (end of block)
+    const lfs2_off_t end = lfs2_alignup(
+            lfs2_min(commit->off + 5*sizeof(uint32_t), lfs2->cfg->block_size),
             lfs2->cfg->prog_size);
 
     lfs2_off_t off1 = 0;
@@ -1503,89 +1632,128 @@ static int lfs2_dir_commitcrc(lfs2_t *lfs2, struct lfs2_commit *commit) {
     // padding is not crced, which lets fetches skip padding but
     // makes committing a bit more complicated
     while (commit->off < end) {
-        lfs2_off_t off = commit->off + sizeof(lfs2_tag_t);
-        lfs2_off_t noff = lfs2_min(end - off, 0x3fe) + off;
+        lfs2_off_t noff = (
+                lfs2_min(end - (commit->off+sizeof(lfs2_tag_t)), 0x3fe)
+                + (commit->off+sizeof(lfs2_tag_t)));
+        // too large for crc tag? need padding commits
         if (noff < end) {
-            noff = lfs2_min(noff, end - 2*sizeof(uint32_t));
+            noff = lfs2_min(noff, end - 5*sizeof(uint32_t));
         }
 
-        // read erased state from next program unit
-        lfs2_tag_t tag = 0xffffffff;
-        int err = lfs2_bd_read(lfs2,
-                NULL, &lfs2->rcache, sizeof(tag),
-                commit->block, noff, &tag, sizeof(tag));
-        if (err && err != LFS2_ERR_CORRUPT) {
-            return err;
-        }
+        // space for fcrc?
+        uint8_t eperturb = (uint8_t)-1;
+        if (noff >= end && noff <= lfs2->cfg->block_size - lfs2->cfg->prog_size) {
+            // first read the leading byte, this always contains a bit
+            // we can perturb to avoid writes that don't change the fcrc
+            int err = lfs2_bd_read(lfs2,
+                    NULL, &lfs2->rcache, lfs2->cfg->prog_size,
+                    commit->block, noff, &eperturb, 1);
+            if (err && err != LFS2_ERR_CORRUPT) {
+                return err;
+            }
 
-        // build crc tag
-        bool reset = ~lfs2_frombe32(tag) >> 31;
-        tag = LFS2_MKTAG(LFS2_TYPE_CRC + reset, 0x3ff, noff - off);
+        #ifdef LFS2_MULTIVERSION
+            // unfortunately fcrcs break mdir fetching < lfs22.1, so only write
+            // these if we're a >= lfs22.1 filesystem
+            if (lfs2_fs_disk_version(lfs2) <= 0x00020000) {
+                // don't write fcrc
+            } else
+        #endif
+            {
+                // find the expected fcrc, don't bother avoiding a reread
+                // of the eperturb, it should still be in our cache
+                struct lfs2_fcrc fcrc = {
+                    .size = lfs2->cfg->prog_size,
+                    .crc = 0xffffffff
+                };
+                err = lfs2_bd_crc(lfs2,
+                        NULL, &lfs2->rcache, lfs2->cfg->prog_size,
+                        commit->block, noff, fcrc.size, &fcrc.crc);
+                if (err && err != LFS2_ERR_CORRUPT) {
+                    return err;
+                }
+
+                lfs2_fcrc_tole32(&fcrc);
+                err = lfs2_dir_commitattr(lfs2, commit,
+                        LFS2_MKTAG(LFS2_TYPE_FCRC, 0x3ff, sizeof(struct lfs2_fcrc)),
+                        &fcrc);
+                if (err) {
+                    return err;
+                }
+            }
+        }
 
-        // write out crc
-        uint32_t footer[2];
-        footer[0] = lfs2_tobe32(tag ^ commit->ptag);
-        commit->crc = lfs2_crc(commit->crc, &footer[0], sizeof(footer[0]));
-        footer[1] = lfs2_tole32(commit->crc);
-        err = lfs2_bd_prog(lfs2,
+        // build commit crc
+        struct {
+            lfs2_tag_t tag;
+            uint32_t crc;
+        } ccrc;
+        lfs2_tag_t ntag = LFS2_MKTAG(
+                LFS2_TYPE_CCRC + (((uint8_t)~eperturb) >> 7), 0x3ff,
+                noff - (commit->off+sizeof(lfs2_tag_t)));
+        ccrc.tag = lfs2_tobe32(ntag ^ commit->ptag);
+        commit->crc = lfs2_crc(commit->crc, &ccrc.tag, sizeof(lfs2_tag_t));
+        ccrc.crc = lfs2_tole32(commit->crc);
+
+        int err = lfs2_bd_prog(lfs2,
                 &lfs2->pcache, &lfs2->rcache, false,
-                commit->block, commit->off, &footer, sizeof(footer));
+                commit->block, commit->off, &ccrc, sizeof(ccrc));
         if (err) {
             return err;
         }
 
         // keep track of non-padding checksum to verify
         if (off1 == 0) {
-            off1 = commit->off + sizeof(uint32_t);
+            off1 = commit->off + sizeof(lfs2_tag_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"
-    }
+        commit->off = noff;
+        // perturb valid bit?
+        commit->ptag = ntag ^ ((0x80UL & ~eperturb) << 24);
+        // reset crc for next commit
+        commit->crc = 0xffffffff;
 
-    // flush buffers
-    int err = lfs2_bd_sync(lfs2, &lfs2->pcache, &lfs2->rcache, false);
-    if (err) {
-        return err;
+        // manually flush here since we don't prog the padding, this confuses
+        // the caching layer
+        if (noff >= end || noff >= lfs2->pcache.off + lfs2->cfg->cache_size) {
+            // flush buffers
+            int err = lfs2_bd_sync(lfs2, &lfs2->pcache, &lfs2->rcache, false);
+            if (err) {
+                return err;
+            }
+        }
     }
 
     // successful commit, check checksums to make sure
+    //
+    // note that we don't need to check padding commits, worst
+    // case if they are corrupted we would have had to compact anyways
     lfs2_off_t off = commit->begin;
-    lfs2_off_t noff = off1;
-    while (off < end) {
-        uint32_t crc = 0xffffffff;
-        for (lfs2_off_t i = off; i < noff+sizeof(uint32_t); i++) {
-            // check against written crc, may catch blocks that
-            // become readonly and match our commit size exactly
-            if (i == off1 && crc != crc1) {
-                return LFS2_ERR_CORRUPT;
-            }
-
-            // leave it up to caching to make this efficient
-            uint8_t dat;
-            err = lfs2_bd_read(lfs2,
-                    NULL, &lfs2->rcache, noff+sizeof(uint32_t)-i,
-                    commit->block, i, &dat, 1);
-            if (err) {
-                return err;
-            }
+    uint32_t crc = 0xffffffff;
+    int err = lfs2_bd_crc(lfs2,
+            NULL, &lfs2->rcache, off1+sizeof(uint32_t),
+            commit->block, off, off1-off, &crc);
+    if (err) {
+        return err;
+    }
 
-            crc = lfs2_crc(crc, &dat, 1);
-        }
+    // check non-padding commits against known crc
+    if (crc != crc1) {
+        return LFS2_ERR_CORRUPT;
+    }
 
-        // detected write error?
-        if (crc != 0) {
-            return LFS2_ERR_CORRUPT;
-        }
+    // make sure to check crc in case we happen to pick
+    // up an unrelated crc (frozen block?)
+    err = lfs2_bd_crc(lfs2,
+            NULL, &lfs2->rcache, sizeof(uint32_t),
+            commit->block, off1, sizeof(uint32_t), &crc);
+    if (err) {
+        return err;
+    }
 
-        // skip padding
-        off = lfs2_min(end - noff, 0x3fe) + noff;
-        if (off < end) {
-            off = lfs2_min(off, end - 2*sizeof(uint32_t));
-        }
-        noff = off + sizeof(uint32_t);
+    if (crc != 0) {
+        return LFS2_ERR_CORRUPT;
     }
 
     return 0;
@@ -1926,11 +2094,20 @@ static int lfs2_dir_splittingcompact(lfs2_t *lfs2, lfs2_mdir_t *dir,
                 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.
+            // space is complicated, we need room for:
+            //
+            // - tail:         4+2*4 = 12 bytes
+            // - gstate:       4+3*4 = 16 bytes
+            // - move delete:  4     = 4 bytes
+            // - crc:          4+4   = 8 bytes
+            //                 total = 40 bytes
+            //
+            // And we cap at half a block to avoid degenerate cases with
+            // nearly-full metadata blocks.
+            //
             if (end - split < 0xff
-                    && size <= lfs2_min(lfs2->cfg->block_size - 36,
+                    && size <= lfs2_min(
+                        lfs2->cfg->block_size - 40,
                         lfs2_alignup(
                             (lfs2->cfg->metadata_max
                                 ? lfs2->cfg->metadata_max
@@ -1976,7 +2153,7 @@ static int lfs2_dir_splittingcompact(lfs2_t *lfs2, lfs2_mdir_t *dir,
 
         // 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) {
+        if ((lfs2_size_t)size < lfs2->block_count/2) {
             LFS2_DEBUG("Expanding superblock at rev %"PRIu32, dir->rev);
             int err = lfs2_dir_split(lfs2, dir, attrs, attrcount,
                     source, begin, end);
@@ -2594,11 +2771,6 @@ static int lfs2_dir_rawseek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
     dir->id = (off > 0 && lfs2_pair_cmp(dir->head, lfs2->root) == 0);
 
     while (off > 0) {
-        int diff = lfs2_min(dir->m.count - dir->id, off);
-        dir->id += diff;
-        dir->pos += diff;
-        off -= diff;
-
         if (dir->id == dir->m.count) {
             if (!dir->m.split) {
                 return LFS2_ERR_INVAL;
@@ -2611,6 +2783,11 @@ static int lfs2_dir_rawseek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
 
             dir->id = 0;
         }
+
+        int diff = lfs2_min(dir->m.count - dir->id, off);
+        dir->id += diff;
+        dir->pos += diff;
+        off -= diff;
     }
 
     return 0;
@@ -3347,7 +3524,7 @@ static lfs2_ssize_t lfs2_file_flushedwrite(lfs2_t *lfs2, lfs2_file_t *file,
                     // find out which block we're extending from
                     int err = lfs2_ctz_find(lfs2, NULL, &file->cache,
                             file->ctz.head, file->ctz.size,
-                            file->pos-1, &file->block, &file->off);
+                            file->pos-1, &file->block, &(lfs2_off_t){0});
                     if (err) {
                         file->flags |= LFS2_F_ERRED;
                         return err;
@@ -3525,26 +3702,55 @@ static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t siz
     lfs2_off_t pos = file->pos;
     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) {
-            return err;
-        }
+        // revert to inline file?
+        if (size <= lfs2_min(0x3fe, lfs2_min(
+                lfs2->cfg->cache_size,
+                (lfs2->cfg->metadata_max ?
+                    lfs2->cfg->metadata_max : lfs2->cfg->block_size) / 8))) {
+            // flush+seek to head
+            lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_SET);
+            if (res < 0) {
+                return (int)res;
+            }
 
-        // lookup new head in ctz skip list
-        err = lfs2_ctz_find(lfs2, NULL, &file->cache,
-                file->ctz.head, file->ctz.size,
-                size, &file->block, &file->off);
-        if (err) {
-            return err;
-        }
+            // read our data into rcache temporarily
+            lfs2_cache_drop(lfs2, &lfs2->rcache);
+            res = lfs2_file_flushedread(lfs2, file,
+                    lfs2->rcache.buffer, size);
+            if (res < 0) {
+                return (int)res;
+            }
 
-        // 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;
+            file->ctz.head = LFS2_BLOCK_INLINE;
+            file->ctz.size = size;
+            file->flags |= LFS2_F_DIRTY | LFS2_F_READING | LFS2_F_INLINE;
+            file->cache.block = file->ctz.head;
+            file->cache.off = 0;
+            file->cache.size = lfs2->cfg->cache_size;
+            memcpy(file->cache.buffer, lfs2->rcache.buffer, size);
+
+        } else {
+            // need to flush since directly changing metadata
+            int err = lfs2_file_flush(lfs2, file);
+            if (err) {
+                return err;
+            }
+
+            // lookup new head in ctz skip list
+            err = lfs2_ctz_find(lfs2, NULL, &file->cache,
+                    file->ctz.head, file->ctz.size,
+                    size-1, &file->block, &(lfs2_off_t){0});
+            if (err) {
+                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
         lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_END);
@@ -3902,8 +4108,24 @@ static int lfs2_rawremoveattr(lfs2_t *lfs2, const char *path, uint8_t type) {
 /// Filesystem operations ///
 static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     lfs2->cfg = cfg;
+    lfs2->block_count = cfg->block_count;  // May be 0
     int err = 0;
 
+#ifdef LFS2_MULTIVERSION
+    // this driver only supports minor version < current minor version
+    LFS2_ASSERT(!lfs2->cfg->disk_version || (
+            (0xffff & (lfs2->cfg->disk_version >> 16))
+                    == LFS2_DISK_VERSION_MAJOR
+                && (0xffff & (lfs2->cfg->disk_version >> 0))
+                    <= LFS2_DISK_VERSION_MINOR));
+#endif
+
+    // check that bool is a truthy-preserving type
+    //
+    // note the most common reason for this failure is a before-c99 compiler,
+    // which littlefs currently does not support
+    LFS2_ASSERT((bool)0x80000000);
+
     // validate that the lfs2-cfg sizes were initiated properly before
     // performing any arithmetic logics with them
     LFS2_ASSERT(lfs2->cfg->read_size != 0);
@@ -3916,7 +4138,10 @@ static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     LFS2_ASSERT(lfs2->cfg->cache_size % lfs2->cfg->prog_size == 0);
     LFS2_ASSERT(lfs2->cfg->block_size % lfs2->cfg->cache_size == 0);
 
-    // check that the block size is large enough to fit ctz pointers
+    // check that the block size is large enough to fit all ctz pointers
+    LFS2_ASSERT(lfs2->cfg->block_size >= 128);
+    // this is the exact calculation for all ctz pointers, if this fails
+    // and the simpler assert above does not, math must be broken
     LFS2_ASSERT(4*lfs2_npw2(0xffffffff / (lfs2->cfg->block_size-2*4))
             <= lfs2->cfg->block_size);
 
@@ -4026,6 +4251,8 @@ static int lfs2_deinit(lfs2_t *lfs2) {
     return 0;
 }
 
+
+
 #ifndef LFS2_READONLY
 static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     int err = 0;
@@ -4035,11 +4262,13 @@ static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
             return err;
         }
 
+        LFS2_ASSERT(cfg->block_count != 0);
+
         // create free lookahead
         memset(lfs2->free.buffer, 0, lfs2->cfg->lookahead_size);
         lfs2->free.off = 0;
         lfs2->free.size = lfs2_min(8*lfs2->cfg->lookahead_size,
-                lfs2->cfg->block_count);
+                lfs2->block_count);
         lfs2->free.i = 0;
         lfs2_alloc_ack(lfs2);
 
@@ -4052,9 +4281,9 @@ static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
         // write one superblock
         lfs2_superblock_t superblock = {
-            .version     = LFS2_DISK_VERSION,
+            .version     = lfs2_fs_disk_version(lfs2),
             .block_size  = lfs2->cfg->block_size,
-            .block_count = lfs2->cfg->block_count,
+            .block_count = lfs2->block_count,
             .name_max    = lfs2->name_max,
             .file_max    = lfs2->file_max,
             .attr_max    = lfs2->attr_max,
@@ -4100,14 +4329,23 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
     // scan directory blocks for superblock and any global updates
     lfs2_mdir_t dir = {.tail = {0, 1}};
-    lfs2_block_t cycle = 0;
+    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
+    lfs2_size_t tortoise_i = 1;
+    lfs2_size_t tortoise_period = 1;
     while (!lfs2_pair_isnull(dir.tail)) {
-        if (cycle >= lfs2->cfg->block_count/2) {
-            // loop detected
+        // detect cycles with Brent's algorithm
+        if (lfs2_pair_issync(dir.tail, tortoise)) {
+            LFS2_WARN("Cycle detected in tail list");
             err = LFS2_ERR_CORRUPT;
             goto cleanup;
         }
-        cycle += 1;
+        if (tortoise_i == tortoise_period) {
+            tortoise[0] = dir.tail[0];
+            tortoise[1] = dir.tail[1];
+            tortoise_i = 0;
+            tortoise_period *= 2;
+        }
+        tortoise_i += 1;
 
         // fetch next block in tail list
         lfs2_stag_t tag = lfs2_dir_fetchmatch(lfs2, &dir, dir.tail,
@@ -4141,14 +4379,33 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
             // check version
             uint16_t major_version = (0xffff & (superblock.version >> 16));
             uint16_t minor_version = (0xffff & (superblock.version >>  0));
-            if ((major_version != LFS2_DISK_VERSION_MAJOR ||
-                 minor_version > LFS2_DISK_VERSION_MINOR)) {
-                LFS2_ERROR("Invalid version v%"PRIu16".%"PRIu16,
-                        major_version, minor_version);
+            if (major_version != lfs2_fs_disk_version_major(lfs2)
+                    || minor_version > lfs2_fs_disk_version_minor(lfs2)) {
+                LFS2_ERROR("Invalid version "
+                        "v%"PRIu16".%"PRIu16" != v%"PRIu16".%"PRIu16,
+                        major_version,
+                        minor_version,
+                        lfs2_fs_disk_version_major(lfs2),
+                        lfs2_fs_disk_version_minor(lfs2));
                 err = LFS2_ERR_INVAL;
                 goto cleanup;
             }
 
+            // found older minor version? set an in-device only bit in the
+            // gstate so we know we need to rewrite the superblock before
+            // the first write
+            if (minor_version < lfs2_fs_disk_version_minor(lfs2)) {
+                LFS2_DEBUG("Found older minor version "
+                        "v%"PRIu16".%"PRIu16" < v%"PRIu16".%"PRIu16,
+                        major_version,
+                        minor_version,
+                        lfs2_fs_disk_version_major(lfs2),
+                        lfs2_fs_disk_version_minor(lfs2));
+                // note this bit is reserved on disk, so fetching more gstate
+                // will not interfere here
+                lfs2_fs_prepsuperblock(lfs2, true);
+            }
+
             // check superblock configuration
             if (superblock.name_max) {
                 if (superblock.name_max > lfs2->name_max) {
@@ -4183,16 +4440,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) {
+            // this is where we get the block_count from disk if block_count=0
+            if (lfs2->cfg->block_count
+                    && 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;
             }
 
+            lfs2->block_count = superblock.block_count;
+
             if (superblock.block_size != lfs2->cfg->block_size) {
                 LFS2_ERROR("Invalid block size (%"PRIu32" != %"PRIu32")",
-                        superblock.block_count, lfs2->cfg->block_count);
+                        superblock.block_size, lfs2->cfg->block_size);
                 err = LFS2_ERR_INVAL;
                 goto cleanup;
             }
@@ -4205,12 +4466,6 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
         }
     }
 
-    // found superblock?
-    if (lfs2_pair_isnull(lfs2->root)) {
-        err = LFS2_ERR_INVAL;
-        goto cleanup;
-    }
-
     // update littlefs with gstate
     if (!lfs2_gstate_iszero(&lfs2->gstate)) {
         LFS2_DEBUG("Found pending gstate 0x%08"PRIx32"%08"PRIx32"%08"PRIx32,
@@ -4223,7 +4478,7 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
     // 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->free.off = lfs2->seed % lfs2->block_count;
     lfs2_alloc_drop(lfs2);
 
     return 0;
@@ -4239,6 +4494,46 @@ static int lfs2_rawunmount(lfs2_t *lfs2) {
 
 
 /// Filesystem filesystem operations ///
+static int lfs2_fs_rawstat(lfs2_t *lfs2, struct lfs2_fsinfo *fsinfo) {
+    // if the superblock is up-to-date, we must be on the most recent
+    // minor version of littlefs
+    if (!lfs2_gstate_needssuperblock(&lfs2->gstate)) {
+        fsinfo->disk_version = lfs2_fs_disk_version(lfs2);
+
+    // otherwise we need to read the minor version on disk
+    } else {
+        // fetch the superblock
+        lfs2_mdir_t dir;
+        int err = lfs2_dir_fetch(lfs2, &dir, lfs2->root);
+        if (err) {
+            return err;
+        }
+
+        lfs2_superblock_t superblock;
+        lfs2_stag_t tag = lfs2_dir_get(lfs2, &dir, LFS2_MKTAG(0x7ff, 0x3ff, 0),
+                LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, 0, sizeof(superblock)),
+                &superblock);
+        if (tag < 0) {
+            return tag;
+        }
+        lfs2_superblock_fromle32(&superblock);
+
+        // read the on-disk version
+        fsinfo->disk_version = superblock.version;
+    }
+
+    // filesystem geometry
+    fsinfo->block_size = lfs2->cfg->block_size;
+    fsinfo->block_count = lfs2->block_count;
+
+    // other on-disk configuration, we cache all of these for internal use
+    fsinfo->name_max = lfs2->name_max;
+    fsinfo->file_max = lfs2->file_max;
+    fsinfo->attr_max = lfs2->attr_max;
+
+    return 0;
+}
+
 int lfs2_fs_rawtraverse(lfs2_t *lfs2,
         int (*cb)(void *data, lfs2_block_t block), void *data,
         bool includeorphans) {
@@ -4258,13 +4553,22 @@ int lfs2_fs_rawtraverse(lfs2_t *lfs2,
     }
 #endif
 
-    lfs2_block_t cycle = 0;
+    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
+    lfs2_size_t tortoise_i = 1;
+    lfs2_size_t tortoise_period = 1;
     while (!lfs2_pair_isnull(dir.tail)) {
-        if (cycle >= lfs2->cfg->block_count/2) {
-            // loop detected
+        // detect cycles with Brent's algorithm
+        if (lfs2_pair_issync(dir.tail, tortoise)) {
+            LFS2_WARN("Cycle detected in tail list");
             return LFS2_ERR_CORRUPT;
         }
-        cycle += 1;
+        if (tortoise_i == tortoise_period) {
+            tortoise[0] = dir.tail[0];
+            tortoise[1] = dir.tail[1];
+            tortoise_i = 0;
+            tortoise_period *= 2;
+        }
+        tortoise_i += 1;
 
         for (int i = 0; i < 2; i++) {
             int err = cb(data, dir.tail[i]);
@@ -4343,13 +4647,22 @@ static int lfs2_fs_pred(lfs2_t *lfs2,
     // iterate over all directory directory entries
     pdir->tail[0] = 0;
     pdir->tail[1] = 1;
-    lfs2_block_t cycle = 0;
+    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
+    lfs2_size_t tortoise_i = 1;
+    lfs2_size_t tortoise_period = 1;
     while (!lfs2_pair_isnull(pdir->tail)) {
-        if (cycle >= lfs2->cfg->block_count/2) {
-            // loop detected
+        // detect cycles with Brent's algorithm
+        if (lfs2_pair_issync(pdir->tail, tortoise)) {
+            LFS2_WARN("Cycle detected in tail list");
             return LFS2_ERR_CORRUPT;
         }
-        cycle += 1;
+        if (tortoise_i == tortoise_period) {
+            tortoise[0] = pdir->tail[0];
+            tortoise[1] = pdir->tail[1];
+            tortoise_i = 0;
+            tortoise_period *= 2;
+        }
+        tortoise_i += 1;
 
         if (lfs2_pair_cmp(pdir->tail, pair) == 0) {
             return 0;
@@ -4399,13 +4712,22 @@ static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t pair[2],
     // use fetchmatch with callback to find pairs
     parent->tail[0] = 0;
     parent->tail[1] = 1;
-    lfs2_block_t cycle = 0;
+    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
+    lfs2_size_t tortoise_i = 1;
+    lfs2_size_t tortoise_period = 1;
     while (!lfs2_pair_isnull(parent->tail)) {
-        if (cycle >= lfs2->cfg->block_count/2) {
-            // loop detected
+        // detect cycles with Brent's algorithm
+        if (lfs2_pair_issync(parent->tail, tortoise)) {
+            LFS2_WARN("Cycle detected in tail list");
             return LFS2_ERR_CORRUPT;
         }
-        cycle += 1;
+        if (tortoise_i == tortoise_period) {
+            tortoise[0] = parent->tail[0];
+            tortoise[1] = parent->tail[1];
+            tortoise_i = 0;
+            tortoise_period *= 2;
+        }
+        tortoise_i += 1;
 
         lfs2_stag_t tag = lfs2_dir_fetchmatch(lfs2, parent, parent->tail,
                 LFS2_MKTAG(0x7ff, 0, 0x3ff),
@@ -4422,9 +4744,15 @@ static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t pair[2],
 }
 #endif
 
+static void lfs2_fs_prepsuperblock(lfs2_t *lfs2, bool needssuperblock) {
+    lfs2->gstate.tag = (lfs2->gstate.tag & ~LFS2_MKTAG(0, 0, 0x200))
+            | (uint32_t)needssuperblock << 9;
+}
+
 #ifndef LFS2_READONLY
 static int lfs2_fs_preporphans(lfs2_t *lfs2, int8_t orphans) {
-    LFS2_ASSERT(lfs2_tag_size(lfs2->gstate.tag) > 0 || orphans >= 0);
+    LFS2_ASSERT(lfs2_tag_size(lfs2->gstate.tag) > 0x000 || orphans >= 0);
+    LFS2_ASSERT(lfs2_tag_size(lfs2->gstate.tag) < 0x1ff || 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));
@@ -4443,6 +4771,45 @@ static void lfs2_fs_prepmove(lfs2_t *lfs2,
 }
 #endif
 
+#ifndef LFS2_READONLY
+static int lfs2_fs_desuperblock(lfs2_t *lfs2) {
+    if (!lfs2_gstate_needssuperblock(&lfs2->gstate)) {
+        return 0;
+    }
+
+    LFS2_DEBUG("Rewriting superblock {0x%"PRIx32", 0x%"PRIx32"}",
+            lfs2->root[0],
+            lfs2->root[1]);
+
+    lfs2_mdir_t root;
+    int err = lfs2_dir_fetch(lfs2, &root, lfs2->root);
+    if (err) {
+        return err;
+    }
+
+    // write a new superblock
+    lfs2_superblock_t superblock = {
+        .version     = lfs2_fs_disk_version(lfs2),
+        .block_size  = lfs2->cfg->block_size,
+        .block_count = lfs2->block_count,
+        .name_max    = lfs2->name_max,
+        .file_max    = lfs2->file_max,
+        .attr_max    = lfs2->attr_max,
+    };
+
+    lfs2_superblock_tole32(&superblock);
+    err = lfs2_dir_commit(lfs2, &root, LFS2_MKATTRS(
+            {LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, 0, sizeof(superblock)),
+                &superblock}));
+    if (err) {
+        return err;
+    }
+
+    lfs2_fs_prepsuperblock(lfs2, false);
+    return 0;
+}
+#endif
+
 #ifndef LFS2_READONLY
 static int lfs2_fs_demove(lfs2_t *lfs2) {
     if (!lfs2_gstate_hasmove(&lfs2->gdisk)) {
@@ -4455,6 +4822,10 @@ static int lfs2_fs_demove(lfs2_t *lfs2) {
             lfs2->gdisk.pair[1],
             lfs2_tag_id(lfs2->gdisk.tag));
 
+    // no other gstate is supported at this time, so if we found something else
+    // something most likely went wrong in gstate calculation
+    LFS2_ASSERT(lfs2_tag_type3(lfs2->gdisk.tag) == LFS2_TYPE_DELETE);
+
     // fetch and delete the moved entry
     lfs2_mdir_t movedir;
     int err = lfs2_dir_fetch(lfs2, &movedir, lfs2->gdisk.pair);
@@ -4481,12 +4852,20 @@ static int lfs2_fs_deorphan(lfs2_t *lfs2, bool powerloss) {
         return 0;
     }
 
-    int8_t found = 0;
-restart:
-    {
+    // Check for orphans in two separate passes:
+    // - 1 for half-orphans (relocations)
+    // - 2 for full-orphans (removes/renames)
+    //
+    // Two separate passes are needed as half-orphans can contain outdated
+    // references to full-orphans, effectively hiding them from the deorphan
+    // search.
+    //
+    int pass = 0;
+    while (pass < 2) {
         // Fix any orphans
         lfs2_mdir_t pdir = {.split = true, .tail = {0, 1}};
         lfs2_mdir_t dir;
+        bool moreorphans = false;
 
         // iterate over all directory directory entries
         while (!lfs2_pair_isnull(pdir.tail)) {
@@ -4504,42 +4883,7 @@ static int lfs2_fs_deorphan(lfs2_t *lfs2, bool powerloss) {
                     return tag;
                 }
 
-                // 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]);
-
-                    // 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;
-                }
-
-                if (tag != LFS2_ERR_NOENT) {
+                if (pass == 0 && 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);
@@ -4548,7 +4892,7 @@ static int lfs2_fs_deorphan(lfs2_t *lfs2, bool powerloss) {
                     }
                     lfs2_pair_fromle32(pair);
 
-                    if (!lfs2_pair_sync(pair, pdir.tail)) {
+                    if (!lfs2_pair_issync(pair, pdir.tail)) {
                         // we have desynced
                         LFS2_DEBUG("Fixing half-orphan "
                                 "{0x%"PRIx32", 0x%"PRIx32"} "
@@ -4578,33 +4922,69 @@ static int lfs2_fs_deorphan(lfs2_t *lfs2, bool powerloss) {
                             return state;
                         }
 
-                        found += 1;
-
                         // did our commit create more orphans?
                         if (state == LFS2_OK_ORPHANED) {
-                            goto restart;
+                            moreorphans = true;
                         }
 
                         // 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 (pass == 1 && tag == LFS2_ERR_NOENT && powerloss) {
+                    // we are an orphan
+                    LFS2_DEBUG("Fixing orphan {0x%"PRIx32", 0x%"PRIx32"}",
+                            pdir.tail[0], pdir.tail[1]);
+
+                    // 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;
+                    }
+
+                    // did our commit create more orphans?
+                    if (state == LFS2_OK_ORPHANED) {
+                        moreorphans = true;
+                    }
+
+                    // refetch tail
+                    continue;
+                }
             }
 
             pdir = dir;
         }
+
+        pass = moreorphans ? 0 : pass+1;
     }
 
     // mark orphans as fixed
-    return lfs2_fs_preporphans(lfs2, -lfs2_min(
-            lfs2_gstate_getorphans(&lfs2->gstate),
-            found));
+    return lfs2_fs_preporphans(lfs2, -lfs2_gstate_getorphans(&lfs2->gstate));
 }
 #endif
 
 #ifndef LFS2_READONLY
 static int lfs2_fs_forceconsistency(lfs2_t *lfs2) {
-    int err = lfs2_fs_demove(lfs2);
+    int err = lfs2_fs_desuperblock(lfs2);
+    if (err) {
+        return err;
+    }
+
+    err = lfs2_fs_demove(lfs2);
     if (err) {
         return err;
     }
@@ -4618,6 +4998,36 @@ static int lfs2_fs_forceconsistency(lfs2_t *lfs2) {
 }
 #endif
 
+#ifndef LFS2_READONLY
+static int lfs2_fs_rawmkconsistent(lfs2_t *lfs2) {
+    // lfs2_fs_forceconsistency does most of the work here
+    int err = lfs2_fs_forceconsistency(lfs2);
+    if (err) {
+        return err;
+    }
+
+    // do we have any pending gstate?
+    lfs2_gstate_t delta = {0};
+    lfs2_gstate_xor(&delta, &lfs2->gdisk);
+    lfs2_gstate_xor(&delta, &lfs2->gstate);
+    if (!lfs2_gstate_iszero(&delta)) {
+        // lfs2_dir_commit will implicitly write out any pending gstate
+        lfs2_mdir_t root;
+        err = lfs2_dir_fetch(lfs2, &root, lfs2->root);
+        if (err) {
+            return err;
+        }
+
+        err = lfs2_dir_commit(lfs2, &root, NULL, 0);
+        if (err) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+#endif
+
 static int lfs2_fs_size_count(void *p, lfs2_block_t block) {
     (void)block;
     lfs2_size_t *size = p;
@@ -4635,6 +5045,45 @@ static lfs2_ssize_t lfs2_fs_rawsize(lfs2_t *lfs2) {
     return size;
 }
 
+#ifndef LFS2_READONLY
+static int lfs2_fs_rawgrow(lfs2_t *lfs2, lfs2_size_t block_count) {
+    // shrinking is not supported
+    LFS2_ASSERT(block_count >= lfs2->block_count);
+
+    if (block_count > lfs2->block_count) {
+        lfs2->block_count = block_count;
+
+        // fetch the root
+        lfs2_mdir_t root;
+        int err = lfs2_dir_fetch(lfs2, &root, lfs2->root);
+        if (err) {
+            return err;
+        }
+
+        // update the superblock
+        lfs2_superblock_t superblock;
+        lfs2_stag_t tag = lfs2_dir_get(lfs2, &root, LFS2_MKTAG(0x7ff, 0x3ff, 0),
+                LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, 0, sizeof(superblock)),
+                &superblock);
+        if (tag < 0) {
+            return tag;
+        }
+        lfs2_superblock_fromle32(&superblock);
+
+        superblock.block_count = lfs2->block_count;
+
+        lfs2_superblock_tole32(&superblock);
+        err = lfs2_dir_commit(lfs2, &root, LFS2_MKATTRS(
+                {tag, &superblock}));
+        if (err) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+#endif
+
 #ifdef LFS2_MIGRATE
 ////// Migration from littelfs v1 below this //////
 
@@ -5058,6 +5507,10 @@ static int lfs21_unmount(lfs2_t *lfs2) {
 /// v1 migration ///
 static int lfs2_rawmigrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     struct lfs21 lfs21;
+
+    // Indeterminate filesystem size not allowed for migration.
+    LFS2_ASSERT(cfg->block_count != 0);
+
     int err = lfs21_mount(lfs2, &lfs21, cfg);
     if (err) {
         return err;
@@ -5754,6 +6207,20 @@ int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir) {
     return err;
 }
 
+int lfs2_fs_stat(lfs2_t *lfs2, struct lfs2_fsinfo *fsinfo) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_fs_stat(%p, %p)", (void*)lfs2, (void*)fsinfo);
+
+    err = lfs2_fs_rawstat(lfs2, fsinfo);
+
+    LFS2_TRACE("lfs2_fs_stat -> %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) {
@@ -5783,6 +6250,54 @@ int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void *, lfs2_block_t), void *data)
     return err;
 }
 
+#ifndef LFS2_READONLY
+int lfs2_fs_gc(lfs2_t *lfs2) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_fs_gc(%p)", (void*)lfs2);
+
+    err = lfs2_fs_rawgc(lfs2);
+
+    LFS2_TRACE("lfs2_fs_gc -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+#ifndef LFS2_READONLY
+int lfs2_fs_mkconsistent(lfs2_t *lfs2) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_fs_mkconsistent(%p)", (void*)lfs2);
+
+    err = lfs2_fs_rawmkconsistent(lfs2);
+
+    LFS2_TRACE("lfs2_fs_mkconsistent -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+#ifndef LFS2_READONLY
+int lfs2_fs_grow(lfs2_t *lfs2, lfs2_size_t block_count) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_fs_grow(%p, %"PRIu32")", (void*)lfs2, block_count);
+
+    err = lfs2_fs_rawgrow(lfs2, block_count);
+
+    LFS2_TRACE("lfs2_fs_grow -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
 #ifdef LFS2_MIGRATE
 int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     int err = LFS2_LOCK(cfg);
diff --git a/lib/littlefs/lfs2.h b/lib/littlefs/lfs2.h
index 715764f7ce982..4c426fc4c7096 100644
--- a/lib/littlefs/lfs2.h
+++ b/lib/littlefs/lfs2.h
@@ -8,8 +8,6 @@
 #ifndef LFS2_H
 #define LFS2_H
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "lfs2_util.h"
 
 #ifdef __cplusplus
@@ -23,14 +21,14 @@ extern "C"
 // Software library version
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_VERSION 0x00020005
+#define LFS2_VERSION 0x00020008
 #define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
 #define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >>  0))
 
 // Version of On-disk data structures
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_DISK_VERSION 0x00020000
+#define LFS2_DISK_VERSION 0x00020001
 #define LFS2_DISK_VERSION_MAJOR (0xffff & (LFS2_DISK_VERSION >> 16))
 #define LFS2_DISK_VERSION_MINOR (0xffff & (LFS2_DISK_VERSION >>  0))
 
@@ -114,6 +112,8 @@ enum lfs2_type {
     LFS2_TYPE_SOFTTAIL       = 0x600,
     LFS2_TYPE_HARDTAIL       = 0x601,
     LFS2_TYPE_MOVESTATE      = 0x7ff,
+    LFS2_TYPE_CCRC           = 0x500,
+    LFS2_TYPE_FCRC           = 0x5ff,
 
     // internal chip sources
     LFS2_FROM_NOOP           = 0x000,
@@ -263,6 +263,14 @@ struct lfs2_config {
     // can help bound the metadata compaction time. Must be <= block_size.
     // Defaults to block_size when zero.
     lfs2_size_t metadata_max;
+
+#ifdef LFS2_MULTIVERSION
+    // On-disk version to use when writing in the form of 16-bit major version
+    // + 16-bit minor version. This limiting metadata to what is supported by
+    // older minor versions. Note that some features will be lost. Defaults to 
+    // to the most recent minor version when zero.
+    uint32_t disk_version;
+#endif
 };
 
 // File info structure
@@ -280,6 +288,27 @@ struct lfs2_info {
     char name[LFS2_NAME_MAX+1];
 };
 
+// Filesystem info structure
+struct lfs2_fsinfo {
+    // On-disk version.
+    uint32_t disk_version;
+
+    // Size of a logical block in bytes.
+    lfs2_size_t block_size;
+
+    // Number of logical blocks in filesystem.
+    lfs2_size_t block_count;
+
+    // Upper limit on the length of file names in bytes.
+    lfs2_size_t name_max;
+
+    // Upper limit on the size of files in bytes.
+    lfs2_size_t file_max;
+
+    // Upper limit on the size of custom attributes in bytes.
+    lfs2_size_t attr_max;
+};
+
 // Custom attribute structure, used to describe custom attributes
 // committed atomically during file writes.
 struct lfs2_attr {
@@ -410,6 +439,7 @@ typedef struct lfs2 {
     } free;
 
     const struct lfs2_config *cfg;
+    lfs2_size_t block_count;
     lfs2_size_t name_max;
     lfs2_size_t file_max;
     lfs2_size_t attr_max;
@@ -534,8 +564,8 @@ int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file,
 // are values from the enum lfs2_open_flags that are bitwise-ored together.
 //
 // The config struct provides additional config options per file as described
-// above. The config struct must be allocated while the file is open, and the
-// config struct must be zeroed for defaults and backwards compatibility.
+// above. The config struct must remain allocated while the file is open, and
+// the config struct must be zeroed for defaults and backwards compatibility.
 //
 // Returns a negative error code on failure.
 int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
@@ -659,6 +689,12 @@ int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir);
 
 /// Filesystem-level filesystem operations
 
+// Find on-disk info about the filesystem
+//
+// Fills out the fsinfo structure based on the filesystem found on-disk.
+// Returns a negative error code on failure.
+int lfs2_fs_stat(lfs2_t *lfs2, struct lfs2_fsinfo *fsinfo);
+
 // Finds the current size of the filesystem
 //
 // Note: Result is best effort. If files share COW structures, the returned
@@ -676,6 +712,40 @@ 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);
 
+// Attempt to proactively find free blocks
+//
+// Calling this function is not required, but may allowing the offloading of
+// the expensive block allocation scan to a less time-critical code path.
+//
+// Note: littlefs currently does not persist any found free blocks to disk.
+// This may change in the future.
+//
+// Returns a negative error code on failure. Finding no free blocks is
+// not an error.
+int lfs2_fs_gc(lfs2_t *lfs2);
+
+#ifndef LFS2_READONLY
+// Attempt to make the filesystem consistent and ready for writing
+//
+// Calling this function is not required, consistency will be implicitly
+// enforced on the first operation that writes to the filesystem, but this
+// function allows the work to be performed earlier and without other
+// filesystem changes.
+//
+// Returns a negative error code on failure.
+int lfs2_fs_mkconsistent(lfs2_t *lfs2);
+#endif
+
+#ifndef LFS2_READONLY
+// Grows the filesystem to a new size, updating the superblock with the new
+// block count.
+//
+// Note: This is irreversible.
+//
+// Returns a negative error code on failure.
+int lfs2_fs_grow(lfs2_t *lfs2, lfs2_size_t block_count);
+#endif
+
 #ifndef LFS2_READONLY
 #ifdef LFS2_MIGRATE
 // Attempts to migrate a previous version of littlefs
diff --git a/lib/littlefs/lfs2_util.h b/lib/littlefs/lfs2_util.h
index 6a4c8ffb50471..dd2cbcc106d84 100644
--- a/lib/littlefs/lfs2_util.h
+++ b/lib/littlefs/lfs2_util.h
@@ -167,10 +167,9 @@ static inline int lfs2_scmp(uint32_t a, uint32_t b) {
 
 // Convert between 32-bit little-endian and native order
 static inline uint32_t lfs2_fromle32(uint32_t a) {
-#if !defined(LFS2_NO_INTRINSICS) && ( \
-    (defined(  BYTE_ORDER  ) && defined(  ORDER_LITTLE_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
+#if (defined(  BYTE_ORDER  ) && defined(  ORDER_LITTLE_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
     (defined(__BYTE_ORDER  ) && defined(__ORDER_LITTLE_ENDIAN  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
-    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
     return a;
 #elif !defined(LFS2_NO_INTRINSICS) && ( \
     (defined(  BYTE_ORDER  ) && defined(  ORDER_BIG_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
@@ -196,10 +195,9 @@ static inline uint32_t lfs2_frombe32(uint32_t a) {
     (defined(__BYTE_ORDER  ) && defined(__ORDER_LITTLE_ENDIAN  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
     (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
     return __builtin_bswap32(a);
-#elif !defined(LFS2_NO_INTRINSICS) && ( \
-    (defined(  BYTE_ORDER  ) && defined(  ORDER_BIG_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
+#elif (defined(  BYTE_ORDER  ) && defined(  ORDER_BIG_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
     (defined(__BYTE_ORDER  ) && defined(__ORDER_BIG_ENDIAN  ) && __BYTE_ORDER   == __ORDER_BIG_ENDIAN  ) || \
-    (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
+    (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
     return a;
 #else
     return (((uint8_t*)&a)[0] << 24) |

From 303ccca7c62bd48b9f6a519549caf0d0f3d2624e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 21 Oct 2023 17:40:27 +1100
Subject: [PATCH 0498/3129] all: Replace "black" with "ruff format".

- Add config for [tool.ruff.format] to pyproject.toml.
- Update pre-commit to run both ruff and ruff-format (and only check C
  files when running codeformat.py)
- Update CI.
- Simplify codeformat.py to remove all the Python-specific logic (just run
  "ruff format" directly).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/code_formatting.yml |  4 +--
 .github/workflows/ruff.yml            |  5 ++--
 .pre-commit-config.yaml               |  7 +++--
 pyproject.toml                        | 22 +++++++++-----
 tools/ci.sh                           | 11 ++++---
 tools/codeformat.py                   | 42 ++++++---------------------
 6 files changed, 38 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index cab0ae55b2b18..53055a8441d6c 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -13,9 +13,9 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
     - name: Install packages
-      run: source tools/ci.sh && ci_code_formatting_setup
+      run: source tools/ci.sh && ci_c_code_formatting_setup
     - name: Run code formatting
-      run: source tools/ci.sh && ci_code_formatting_run
+      run: source tools/ci.sh && ci_c_code_formatting_run
     - name: Check code formatting
       run: git diff --exit-code
 
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 0374d766f5553..1159a1882d60e 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -1,10 +1,11 @@
 # https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-name: Python code lint with ruff
+name: Python code lint and formatting with ruff
 on: [push, pull_request]
 jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: pip install --user ruff==0.1.0
+    - run: pip install --user ruff==0.1.3
     - run: ruff check --output-format=github .
+    - run: ruff format --diff .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bfce6a2468b55..3004bc5677214 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,8 +2,8 @@ repos:
   - repo: local
     hooks:
       - id: codeformat
-        name: MicroPython codeformat.py for changed files
-        entry: tools/codeformat.py -v -f
+        name: MicroPython codeformat.py for changed C files
+        entry: tools/codeformat.py -v -c -f
         language: python
       - id: verifygitlog
         name: MicroPython git commit message format checker
@@ -12,6 +12,7 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.0
+    rev: v0.1.3
     hooks:
       - id: ruff
+      - id: ruff-format
diff --git a/pyproject.toml b/pyproject.toml
index 96e2e3a890ba4..6c813f5a1ff40 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,3 @@
-[tool.black]
-line-length = 99
-
 [tool.codespell]
 count = ""
 ignore-regex = '\b[A-Z]{3}\b'
@@ -24,7 +21,12 @@ ACKNOWLEDGEMENTS,\
 """
 
 [tool.ruff]
-exclude = ["lib", "tests"]
+# Exclude third-party code from linting and formatting
+extend-exclude = ["lib"]
+line-length = 99
+target-version = "py37"
+
+[tool.ruff.lint]
 extend-select = ["C9", "PLC"]
 ignore = [
   "E401",
@@ -37,15 +39,21 @@ ignore = [
   "F405",
   "PLC1901",
 ]
-line-length = 337
-target-version = "py37"
 
 [tool.ruff.mccabe]
 max-complexity = 40
 
 [tool.ruff.per-file-ignores]
+# Exclude all tests from linting (does not apply to formatting).
+"tests/**/*.py" = ["ALL"]
 "ports/cc3200/tools/uniflash.py" = ["E711"]
-
 # manifest.py files are evaluated with some global names pre-defined
 "**/manifest.py" = ["F821"]
 "ports/**/boards/**/manifest_*.py" = ["F821"]
+
+[tool.ruff.format]
+# Exclude third-party code, and exclude the following tests:
+#   basics: needs careful attention before applying automatic formatting
+#   repl_: not real python files
+#   viper_args: uses f(*)
+exclude = ["tests/basics/*.py", "tests/*/repl_*.py", "tests/micropython/viper_args.py"]
diff --git a/tools/ci.sh b/tools/ci.sh
index 53e3425699908..8dcbbf776513f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -15,17 +15,16 @@ function ci_gcc_arm_setup {
 }
 
 ########################################################################################
-# code formatting
+# c code formatting
 
-function ci_code_formatting_setup {
+function ci_c_code_formatting_setup {
     sudo apt-get install uncrustify
-    pip3 install black
     uncrustify --version
-    black --version
 }
 
-function ci_code_formatting_run {
-    tools/codeformat.py -v
+function ci_c_code_formatting_run {
+    # Only run on C files. The ruff rule runs separately on Python.
+    tools/codeformat.py -v -c
 }
 
 ########################################################################################
diff --git a/tools/codeformat.py b/tools/codeformat.py
index aee9894345d68..bd37aec467f18 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -34,7 +34,6 @@
 
 # Relative to top-level repo dir.
 PATHS = [
-    # C
     "drivers/ninaw10/*.[ch]",
     "extmod/*.[ch]",
     "extmod/btstack/*.[ch]",
@@ -47,14 +46,6 @@
     "mpy-cross/*.[ch]",
     "ports/**/*.[ch]",
     "py/*.[ch]",
-    # Python
-    "drivers/**/*.py",
-    "examples/**/*.py",
-    "extmod/**/*.py",
-    "ports/**/*.py",
-    "py/**/*.py",
-    "tools/**/*.py",
-    "tests/**/*.py",
 ]
 
 EXCLUSIONS = [
@@ -78,23 +69,12 @@
     "ports/stm32/usbhost/**/*.[ch]",
     # STM32 build includes generated Python code.
     "ports/*/build*",
-    # not real python files
-    "tests/**/repl_*.py",
-    # needs careful attention before applying automatic formatting
-    "tests/basics/*.py",
 ]
 
 # Path to repo top-level dir.
 TOP = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 
 UNCRUSTIFY_CFG = os.path.join(TOP, "tools/uncrustify.cfg")
-PYPROJECT_TOML = os.path.join(TOP, "pyproject.toml")
-
-C_EXTS = (
-    ".c",
-    ".h",
-)
-PY_EXTS = (".py",)
 
 
 def list_files(paths, exclusions=None, prefix=""):
@@ -182,16 +162,11 @@ def main():
     else:
         files = list_files(PATHS, EXCLUSIONS, TOP)
 
-    # Extract files matching a specific language.
-    def lang_files(exts):
-        for file in files:
-            if os.path.splitext(file)[1].lower() in exts:
-                yield file
-
     # Run tool on N files at a time (to avoid making the command line too long).
-    def batch(cmd, files, N=200):
+    def batch(cmd, N=200):
+        files_iter = iter(files)
         while True:
-            file_args = list(itertools.islice(files, N))
+            file_args = list(itertools.islice(files_iter, N))
             if not file_args:
                 break
             subprocess.check_call(cmd + file_args)
@@ -201,18 +176,19 @@ def batch(cmd, files, N=200):
         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):
+        batch(command)
+        for file in files:
             fixup_c(file)
 
-    # Format Python files with black.
+    # Format Python files with "ruff format" (using config in pyproject.toml).
     if format_py:
-        command = ["black", "--fast", "--config={}".format(PYPROJECT_TOML)]
+        command = ["ruff", "format"]
         if args.v:
             command.append("-v")
         else:
             command.append("-q")
-        batch(command, lang_files(PY_EXTS))
+        command.append(".")
+        subprocess.check_call(command, cwd=TOP)
 
 
 if __name__ == "__main__":

From bbd8760bd9a2302e5abee29db279102bb11d7732 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 21 Oct 2023 17:40:27 +1100
Subject: [PATCH 0499/3129] all: Update Python formatting to ruff-format.

This updates a small number of files that change with ruff-format's (vs
black's) rules.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/conf.py                                  | 193 ++++++++++--------
 docs/readthedocs/settings/local_settings.py   |   7 +-
 ports/rp2/modules/rp2.py                      |   2 +-
 .../stm32/boards/NUCLEO_WB55/rfcore_debug.py  |   9 +-
 shared/memzip/make-memzip.py                  |  62 +++---
 tests/misc/rge_sm.py                          |   4 +-
 tools/mpremote/mpremote/transport_serial.py   |   2 +-
 tools/mpy-tool.py                             |  10 +-
 tools/pyboard.py                              |   2 +-
 9 files changed, 160 insertions(+), 131 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 49ddd22be9800..728e3c4285d82 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,58 +19,56 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath("."))
 
 # The MICROPY_VERSION env var should be "vX.Y.Z" (or unset).
-micropy_version = os.getenv('MICROPY_VERSION') or 'latest'
-micropy_all_versions = (os.getenv('MICROPY_ALL_VERSIONS') or 'latest').split(',')
-url_pattern = '%s/en/%%s' % (os.getenv('MICROPY_URL_PREFIX') or '/',)
+micropy_version = os.getenv("MICROPY_VERSION") or "latest"
+micropy_all_versions = (os.getenv("MICROPY_ALL_VERSIONS") or "latest").split(",")
+url_pattern = "%s/en/%%s" % (os.getenv("MICROPY_URL_PREFIX") or "/",)
 
 # The members of the html_context dict are available inside topindex.html
 html_context = {
-    'cur_version':micropy_version,
-    'all_versions':[
-        (ver, url_pattern % ver) for ver in micropy_all_versions
+    "cur_version": micropy_version,
+    "all_versions": [(ver, url_pattern % ver) for ver in micropy_all_versions],
+    "downloads": [
+        ("PDF", url_pattern % micropy_version + "/micropython-docs.pdf"),
     ],
-    'downloads':[
-        ('PDF', url_pattern % micropy_version + '/micropython-docs.pdf'),
-    ],
-    'is_release': micropy_version != 'latest',
+    "is_release": micropy_version != "latest",
 }
 
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinxcontrib.jquery',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinxcontrib.jquery",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['templates']
+templates_path = ["templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'MicroPython'
-copyright = '- The MicroPython Documentation is Copyright © 2014-2023, Damien P. George, Paul Sokolovsky, and contributors'
+project = "MicroPython"
+copyright = "- The MicroPython Documentation is Copyright © 2014-2023, 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
@@ -82,41 +80,41 @@
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['build', '.venv']
+exclude_patterns = ["build", ".venv"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-default_role = 'any'
+default_role = "any"
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False
 
 # Global include files. Sphinx docs suggest using rst_epilog in preference
 # of rst_prolog, so we follow. Absolute paths below mean "from the base
@@ -128,144 +126,148 @@
 # -- Options for HTML output ----------------------------------------------
 
 # on_rtd is whether we are on readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
     try:
         import sphinx_rtd_theme
-        html_theme = 'sphinx_rtd_theme'
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']
+
+        html_theme = "sphinx_rtd_theme"
+        html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
     except:
-        html_theme = 'default'
-        html_theme_path = ['.']
+        html_theme = "default"
+        html_theme_path = ["."]
 else:
-    html_theme_path = ['.']
+    html_theme_path = ["."]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = ['.']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = '../../logo/trans-logo.png'
+# html_logo = '../../logo/trans-logo.png'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'static/favicon.ico'
+html_favicon = "static/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['static']
+html_static_path = ["static"]
 
 # Add a custom CSS file for HTML generation
 html_css_files = [
-    'custom.css',
+    "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.
-#html_extra_path = []
+# html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-html_last_updated_fmt = '%d %b %Y'
+html_last_updated_fmt = "%d %b %Y"
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 html_additional_pages = {"index": "topindex.html"}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'MicroPythondoc'
+htmlhelp_basename = "MicroPythondoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-# Include 3 levels of headers in PDF ToC
-'preamble': r'\setcounter{tocdepth}{2}',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
+    # Include 3 levels of headers in PDF ToC
+    "preamble": r"\setcounter{tocdepth}{2}",
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'MicroPython.tex', 'MicroPython Documentation',
-   'Damien P. George, Paul Sokolovsky, and contributors', 'manual'),
+    (
+        master_doc,
+        "MicroPython.tex",
+        "MicroPython Documentation",
+        "Damien P. George, Paul Sokolovsky, and contributors",
+        "manual",
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 # Enable better Unicode support so that `make latexpdf` doesn't fail
 latex_engine = "xelatex"
@@ -275,12 +277,17 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'micropython', 'MicroPython Documentation',
-     ['Damien P. George, Paul Sokolovsky, and contributors'], 1),
+    (
+        "index",
+        "micropython",
+        "MicroPython Documentation",
+        ["Damien P. George, Paul Sokolovsky, and contributors"],
+        1,
+    ),
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -289,23 +296,29 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'MicroPython', 'MicroPython Documentation',
-   'Damien P. George, Paul Sokolovsky, and contributors', 'MicroPython', 'One line description of project.',
-   'Miscellaneous'),
+    (
+        master_doc,
+        "MicroPython",
+        "MicroPython Documentation",
+        "Damien P. George, Paul Sokolovsky, and contributors",
+        "MicroPython",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+# texinfo_no_detailmenu = False
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'python': ('https://docs.python.org/3.5', None)}
+intersphinx_mapping = {"python": ("https://docs.python.org/3.5", None)}
diff --git a/docs/readthedocs/settings/local_settings.py b/docs/readthedocs/settings/local_settings.py
index 8d2bac7a7690d..c6145dcc52adf 100644
--- a/docs/readthedocs/settings/local_settings.py
+++ b/docs/readthedocs/settings/local_settings.py
@@ -1,9 +1,10 @@
 import os
 
 # Directory that the project lives in, aka ../..
-SITE_ROOT = '/'.join(os.path.dirname(__file__).split('/')[0:-2])
+SITE_ROOT = "/".join(os.path.dirname(__file__).split("/")[0:-2])
 
 TEMPLATE_DIRS = (
-    "%s/templates/" % SITE_ROOT, # Your custom template directory, before the RTD one to override it.
-    "%s/readthedocs/templates/" % SITE_ROOT, # Default RTD template dir
+    "%s/templates/"
+    % SITE_ROOT,  # Your custom template directory, before the RTD one to override it.
+    "%s/readthedocs/templates/" % SITE_ROOT,  # Default RTD template dir
 )
diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index a34e8e92a34aa..9d13bf1b52cd5 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -32,7 +32,7 @@ def __init__(
         autopull=False,
         push_thresh=32,
         pull_thresh=32,
-        fifo_join=0
+        fifo_join=0,
     ):
         # array is a built-in module so importing it here won't require
         # scanning the filesystem.
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
index db533f18dc662..ccf770c01022e 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
@@ -114,7 +114,14 @@ def ipcc_init():
     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
+    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)
diff --git a/shared/memzip/make-memzip.py b/shared/memzip/make-memzip.py
index cc0df82077432..92a5d6168bb1d 100755
--- a/shared/memzip/make-memzip.py
+++ b/shared/memzip/make-memzip.py
@@ -15,65 +15,67 @@
 import sys
 import types
 
+
 def create_zip(zip_filename, zip_dir):
     abs_zip_filename = os.path.abspath(zip_filename)
     save_cwd = os.getcwd()
     os.chdir(zip_dir)
     if os.path.exists(abs_zip_filename):
         os.remove(abs_zip_filename)
-    subprocess.check_call(['zip', '-0', '-r', '-D', abs_zip_filename, '.'])
+    subprocess.check_call(["zip", "-0", "-r", "-D", abs_zip_filename, "."])
     os.chdir(save_cwd)
 
+
 def create_c_from_file(c_filename, zip_filename):
-    with open(zip_filename, 'rb') as zip_file:
-        with open(c_filename, 'wb') as c_file:
-            print('#include <stdint.h>', file=c_file)
-            print('', file=c_file)
-            print('const uint8_t memzip_data[] = {', file=c_file)
+    with open(zip_filename, "rb") as zip_file:
+        with open(c_filename, "wb") as c_file:
+            print("#include <stdint.h>", file=c_file)
+            print("", file=c_file)
+            print("const uint8_t memzip_data[] = {", file=c_file)
             while True:
                 buf = zip_file.read(16)
                 if not buf:
                     break
-                print('   ', end='', file=c_file)
+                print("   ", end="", file=c_file)
                 for byte in buf:
                     if isinstance(byte, types.StringType):
-                        print(' 0x{:02x},'.format(ord(byte)), end='', file=c_file)
+                        print(" 0x{:02x},".format(ord(byte)), end="", file=c_file)
                     else:
-                        print(' 0x{:02x},'.format(byte), end='', file=c_file)
-                print('', file=c_file)
-            print('};', file=c_file)
+                        print(" 0x{:02x},".format(byte), end="", file=c_file)
+                print("", file=c_file)
+            print("};", file=c_file)
+
 
 def main():
     parser = argparse.ArgumentParser(
-        prog='make-memzip.py',
-        usage='%(prog)s [options] [command]',
-        description='Generates a C source memzip file.'
+        prog="make-memzip.py",
+        usage="%(prog)s [options] [command]",
+        description="Generates a C source memzip file.",
     )
     parser.add_argument(
-        '-z', '--zip-file',
-        dest='zip_filename',
-        help='Specifies the name of the created zip file.',
-        default='memzip_files.zip'
+        "-z",
+        "--zip-file",
+        dest="zip_filename",
+        help="Specifies the name of the created zip file.",
+        default="memzip_files.zip",
     )
     parser.add_argument(
-        '-c', '--c-file',
-        dest='c_filename',
-        help='Specifies the name of the created C source file.',
-        default='memzip_files.c'
-    )
-    parser.add_argument(
-        dest='source_dir',
-        default='memzip_files'
+        "-c",
+        "--c-file",
+        dest="c_filename",
+        help="Specifies the name of the created C source file.",
+        default="memzip_files.c",
     )
+    parser.add_argument(dest="source_dir", default="memzip_files")
     args = parser.parse_args(sys.argv[1:])
 
-    print('args.zip_filename =', args.zip_filename)
-    print('args.c_filename =', args.c_filename)
-    print('args.source_dir =', args.source_dir)
+    print("args.zip_filename =", args.zip_filename)
+    print("args.c_filename =", args.c_filename)
+    print("args.source_dir =", args.source_dir)
 
     create_zip(args.zip_filename, args.source_dir)
     create_c_from_file(args.c_filename, args.zip_filename)
 
+
 if __name__ == "__main__":
     main()
-
diff --git a/tests/misc/rge_sm.py b/tests/misc/rge_sm.py
index 00b0a7a021678..5e071687c495d 100644
--- a/tests/misc/rge_sm.py
+++ b/tests/misc/rge_sm.py
@@ -136,6 +136,4 @@ def singleTraj(system, trajStart, h=0.02, tend=1.0):
 # phaseDiagram(sysSM, (lambda i, j: [0.354, 0.654, 1.278, 0.8 + 0.2 * i, 0.1 + 0.1 * j]), (lambda a: (a[4], a[5])), h=0.1, tend=math.log(10**17))
 
 # 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)
-)  # true values
+singleTraj(sysSM, [0.354, 0.654, 1.278, 0.983, 0.131], h=0.5, tend=math.log(10**17))  # true values
diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index e04f5b4ac9ab8..23a379d16b488 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -331,7 +331,7 @@ def repr_consumer(b):
     def fs_stat(self, src):
         try:
             self.exec("import os")
-            return os.stat_result(self.eval("os.stat(%s)" % (("'%s'" % src)), parse=True))
+            return os.stat_result(self.eval("os.stat(%s)" % ("'%s'" % src), parse=True))
         except TransportError as e:
             reraise_filesystem_error(e, src)
 
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 95b2c492d9814..8d86c10173c82 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1454,7 +1454,15 @@ def freeze_mpy(firmware_qstr_idents, compiled_modules):
     # 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
+    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
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 723e43c01e134..c422b64ac5516 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -546,7 +546,7 @@ def repr_consumer(b):
     def fs_stat(self, src):
         try:
             self.exec_("import os")
-            return os.stat_result(self.eval("os.stat(%s)" % (("'%s'" % src)), parse=True))
+            return os.stat_result(self.eval("os.stat(%s)" % ("'%s'" % src), parse=True))
         except PyboardError as e:
             raise e.convert(src)
 

From aa329d11ea375b692342e76304b764b688a5f371 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Nov 2023 13:32:19 +1100
Subject: [PATCH 0500/3129] 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 637f2ec3d1eb7..690e5f46a4fc0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,6 @@
+# all: Update Python formatting to ruff-format.
+bbd8760bd9a2302e5abee29db279102bb11d7732
+
 # all: Fix various spelling mistakes found by codespell 2.2.6.
 cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
 

From 2eda5138701d6a7d36f8d8e3700d136b3c1161b7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 15:57:02 +1000
Subject: [PATCH 0501/3129] py/mkrules.mk: Add rule for compiling
 auto-generated source files.

This prevents each port Makefile from having to add an explicit rule for
`build-BOARD/pins_BOARD.c`.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/application.mk | 3 ---
 ports/mimxrt/Makefile       | 3 ---
 ports/nrf/Makefile          | 3 ---
 ports/renesas-ra/Makefile   | 3 ---
 ports/stm32/Makefile        | 3 ---
 py/mkrules.mk               | 4 ++++
 shared/memzip/README.md     | 3 ---
 7 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index deee201eefaba..7a8fb8d943978 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -241,6 +241,3 @@ $(OBJ): | $(GEN_PINS_HDR)
 $(GEN_PINS_SRC) $(GEN_PINS_HDR) $(GEN_PINS_QSTR): $(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) --qstr $(GEN_PINS_QSTR) > $(GEN_PINS_SRC)
-
-$(BUILD)/pins.o: $(BUILD)/pins.c
-	$(call compile_c)
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 6131a509d8944..c22c5442a9d08 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -510,7 +510,4 @@ $(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)
 
-$(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 ac86ad2b155f0..abc1ed497d6a8 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -547,9 +547,6 @@ $(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)
 
-$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
-	$(call compile_c)
-
 $(PY_BUILD)/nlr%.o: CFLAGS += -Os -fno-lto
 
 include ../../py/mkrules.mk
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index fb7bb67e48ad3..943ed6d9bf6bb 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -586,9 +586,6 @@ $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_
 	$(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/stm32/Makefile b/ports/stm32/Makefile
index d3b80ab5b1466..8d920ae95308a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -684,9 +684,6 @@ $(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)
 
-$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
-	$(call compile_c)
-
 modmachine.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 8b21c7974dce9..5076559328343 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -97,6 +97,10 @@ $(BUILD)/%.pp: %.c
 	$(ECHO) "PreProcess $<"
 	$(Q)$(CPP) $(CFLAGS) -Wp,-C,-dD,-dI -o $@ $<
 
+# Special case for compiling auto-generated source files.
+$(BUILD)/%.o: $(BUILD)/%.c
+	$(call compile_c)
+
 # The following rule uses | to create an order only prerequisite. Order only
 # prerequisites only get built if they don't exist. They don't cause timestamp
 # checking to be performed.
diff --git a/shared/memzip/README.md b/shared/memzip/README.md
index 3938e3198c953..6ffe1d2c6fb82 100644
--- a/shared/memzip/README.md
+++ b/shared/memzip/README.md
@@ -18,9 +18,6 @@ OBJ += $(BUILD)/memzip-files.o
 
 MAKE_MEMZIP = ../shared/memzip/make-memzip.py
 
-$(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)

From c3c7c602da724b697a71c19ebce3e49c67e760f6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 14:41:25 +1000
Subject: [PATCH 0502/3129] rp2/boards/make-pins.py: Don't generate qstrs.

Also remove af-const header, as this is left over from the STM32 version
and unused.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/CMakeLists.txt      |  5 ++-
 ports/rp2/boards/make-pins.py | 65 -----------------------------------
 2 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 16f2d8a247752..4a0d2fbad73ce 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -479,7 +479,6 @@ 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")
 
@@ -494,9 +493,9 @@ target_sources(${MICROPY_TARGET} PRIVATE
 
 # Generate pins
 add_custom_command(
-    OUTPUT ${GEN_PINS_HDR} ${GEN_PINS_SRC} ${GEN_PINS_QSTR}
+    OUTPUT ${GEN_PINS_HDR} ${GEN_PINS_SRC}
     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}
+    --hdr ${GEN_PINS_HDR} --af-py ${GEN_PINS_AF_PY} > ${GEN_PINS_SRC}
     DEPENDS
         ${GEN_PINS_AF_CSV}
         ${GEN_PINS_BOARD_CSV}
diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index 97c0ff6384bb3..4029d7b1cfca7 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -68,15 +68,6 @@ def __init__(self, idx, af_str):
     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:
@@ -88,9 +79,6 @@ def print(self):
             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."""
@@ -164,13 +152,6 @@ def print_header(self, hdr_file):
         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):
@@ -303,37 +284,6 @@ def print_header(self, hdr_filename, obj_decls):
                         )
                     )
 
-    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)
@@ -359,12 +309,6 @@ def main():
         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",
@@ -384,13 +328,6 @@ def main():
         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",
@@ -419,8 +356,6 @@ def main():
             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)
 
 

From fc54d25a456359fdf044f28d2700b658e323c6e5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 15:21:32 +1000
Subject: [PATCH 0503/3129] stm32/boards/make-pins.py: Don't generate qstrs.

Qstrs are picked up from the generated pin source files in the usual qstr
processing stage.

Similarly for the stm constant qstrs.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/Makefile            | 26 +++++++++-------------
 ports/stm32/boards/make-pins.py | 38 ---------------------------------
 ports/stm32/make-stmconst.py    | 30 ++++++--------------------
 ports/stm32/mboot/Makefile      |  3 +--
 4 files changed, 17 insertions(+), 80 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8d920ae95308a..3bb18ee3cbe48 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -25,12 +25,11 @@ 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 = $(GEN_PINS_QSTR) $(GEN_STMCONST_QSTR)
-
 # 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
+
+# Files that are generated and needed before the QSTR build.
+QSTR_GLOBAL_DEPENDENCIES += mpconfigboard_common.h $(BOARD_DIR)/mpconfigboard.h $(GEN_STMCONST_HDR)
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
@@ -71,7 +70,6 @@ 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
@@ -86,7 +84,6 @@ 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
 
@@ -655,7 +652,7 @@ $(BUILD)/firmware.elf: $(OBJ)
 	$(call GENERATE_ELF,$@,$^)
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(GEN_PINS_SRC)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)
@@ -676,13 +673,12 @@ main.c: $(GEN_CDCINF_HEADER)
 
 # Use a pattern rule here so that make will only call make-pins.py once to make
 # both pins_$(BOARD).c and pins.h
-$(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)
+$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_BUILD)/%_af_defs.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) --hdr-obj-decls \
-		--qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) \
-		--af-defs $(GEN_PINS_AF_DEFS) --af-defs-cmp-strings \
-		--af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
+		--af-const $(GEN_PINS_AF_CONST) --af-defs $(GEN_PINS_AF_DEFS) \
+		--af-defs-cmp-strings --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
 
 modmachine.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
@@ -690,11 +686,9 @@ $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
 	$(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
-# make both modstm_const.h and modstm_qstr.h
-$(HEADER_BUILD)/%_const.h $(BUILD)/%_qstr.h: $(CMSIS_MCU_HDR) make-stmconst.py | $(HEADER_BUILD)
+$(HEADER_BUILD)/modstm_const.h: $(CMSIS_MCU_HDR) make-stmconst.py | $(HEADER_BUILD)
 	$(ECHO) "GEN stmconst $@"
-	$(Q)$(PYTHON) make-stmconst.py --qstr $(GEN_STMCONST_QSTR) --mpz $(GEN_STMCONST_MPZ) $(CMSIS_MCU_HDR) > $(GEN_STMCONST_HDR)
+	$(Q)$(PYTHON) make-stmconst.py --mpz $(GEN_STMCONST_MPZ) $(CMSIS_MCU_HDR) > $(GEN_STMCONST_HDR)
 
 $(GEN_CDCINF_HEADER): $(GEN_CDCINF_FILE) $(FILE2H) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index a3e6ee0669d01..f0fcb824375c8 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -188,9 +188,6 @@ def print(self):
         )
         print_conditional_endif(cond_var)
 
-    def qstr_list(self):
-        return [self.mux_name()]
-
 
 class Pin(object):
     """Holds the information associated with a pin."""
@@ -301,13 +298,6 @@ def print_header(self, hdr_file):
         if self.alt_fn_count > 0:
             hdr_file.write("extern const 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):
@@ -462,26 +452,6 @@ def print_header(self, hdr_filename, obj_decls):
                     )
                 )
 
-    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:
-                if not named_pin.is_hidden():
-                    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_af_hdr(self, af_const_filename):
         with open(af_const_filename, "wt") as af_const_file:
             af_hdr_set = set([])
@@ -597,13 +567,6 @@ def main():
         help="Specifies beginning portion of generated pins file",
         default="stm32f4xx_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",
@@ -640,7 +603,6 @@ def main():
     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)
     pins.print_af_py(args.af_py_filename)
     pins.print_af_defs(args.af_defs_filename, args.af_defs_cmp_strings)
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 4e4f2d7155f87..6d64fe3cfaf4f 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -183,22 +183,20 @@ def print_int_obj(val, needed_mpzs):
         needed_mpzs.add(val)
 
 
-def print_periph(periph_name, periph_val, needed_qstrs, needed_mpzs):
+def print_periph(periph_name, periph_val, needed_mpzs):
     qstr = periph_name.upper()
     print("{ MP_ROM_QSTR(MP_QSTR_%s), " % qstr, end="")
     print_int_obj(periph_val, needed_mpzs)
     print(" },")
-    needed_qstrs.add(qstr)
 
 
-def print_regs(reg_name, reg_defs, needed_qstrs, needed_mpzs):
+def print_regs(reg_name, reg_defs, needed_mpzs):
     reg_name = reg_name.upper()
     for r in reg_defs:
         qstr = reg_name + "_" + r[0]
         print("{ MP_ROM_QSTR(MP_QSTR_%s), " % qstr, end="")
         print_int_obj(r[1], needed_mpzs)
         print(" }, // %s-bits, %s" % (r[2], r[3]))
-        needed_qstrs.add(qstr)
 
 
 # This version of print regs groups registers together into submodules (eg GPIO submodule).
@@ -208,7 +206,7 @@ def print_regs(reg_name, reg_defs, needed_qstrs, needed_mpzs):
 # As such, we don't use this version.
 # And for the number of constants we have, this function seems to use about the same amount
 # of ROM as print_regs.
-def print_regs_as_submodules(reg_name, reg_defs, modules, needed_qstrs):
+def print_regs_as_submodules(reg_name, reg_defs, modules):
     mod_name_lower = reg_name.lower() + "_"
     mod_name_upper = mod_name_lower.upper()
     modules.append((mod_name_lower, mod_name_upper))
@@ -220,14 +218,12 @@ def print_regs_as_submodules(reg_name, reg_defs, modules, needed_qstrs):
 """
         % (mod_name_lower, mod_name_upper)
     )
-    needed_qstrs.add(mod_name_upper)
 
     for r in reg_defs:
         print(
             "    { MP_ROM_QSTR(MP_QSTR_%s), MP_ROM_INT(%#x) }, // %s-bits, %s"
             % (r[0], r[1], r[2], r[3])
         )
-        needed_qstrs.add(r[0])
 
     print(
         """};
@@ -247,13 +243,6 @@ def print_regs_as_submodules(reg_name, reg_defs, modules, needed_qstrs):
 def main():
     cmd_parser = argparse.ArgumentParser(description="Extract ST constants from a C header file.")
     cmd_parser.add_argument("file", nargs=1, help="input file")
-    cmd_parser.add_argument(
-        "-q",
-        "--qstr",
-        dest="qstr_filename",
-        default="build/stmconst_qstr.h",
-        help="Specified the name of the generated qstr header file",
-    )
     cmd_parser.add_argument(
         "--mpz",
         dest="mpz_filename",
@@ -269,14 +258,13 @@ def main():
         reg_defs["GPIO"].append(["BSRRL", 0x18, 16, "legacy register"])
         reg_defs["GPIO"].append(["BSRRH", 0x1A, 16, "legacy register"])
 
-    needed_qstrs = set()
     needed_mpzs = set()
 
     print("// Automatically generated from %s by make-stmconst.py" % args.file[0])
     print("")
 
     for periph_name, periph_val in periphs:
-        print_periph(periph_name, periph_val, needed_qstrs, needed_mpzs)
+        print_periph(periph_name, periph_val, needed_mpzs)
 
     for reg in (
         "ADC",
@@ -309,8 +297,8 @@ def main():
         "IPCC",
     ):
         if reg in reg_defs:
-            print_regs(reg, reg_defs[reg], needed_qstrs, needed_mpzs)
-        # print_regs_as_submodules(reg, reg_defs[reg], modules, needed_qstrs)
+            print_regs(reg, reg_defs[reg], needed_mpzs)
+        # print_regs_as_submodules(reg, reg_defs[reg], modules)
 
     # print("#define MOD_STM_CONST_MODULES \\")
     # for mod_lower, mod_upper in modules:
@@ -318,12 +306,6 @@ def main():
 
     print("")
 
-    with open(args.qstr_filename, "wt") as qstr_file:
-        print("#if MICROPY_PY_STM_CONST", file=qstr_file)
-        for qstr in sorted(needed_qstrs):
-            print("Q({})".format(qstr), file=qstr_file)
-        print("#endif // MICROPY_PY_STM_CONST", file=qstr_file)
-
     with open(args.mpz_filename, "wt") as mpz_file:
         for mpz in sorted(needed_mpzs):
             assert 0 <= mpz <= 0xFFFFFFFF
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 54fc8f4830828..a37b046ca564b 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -227,7 +227,6 @@ 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
 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
@@ -246,7 +245,7 @@ $(GEN_ROOT_POINTERS): | $(HEADER_BUILD)
 $(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) \
-		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) \
+		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) \
 		--af-const $(GEN_PINS_AF_CONST) --af-defs $(GEN_PINS_AF_DEFS) \
 		--af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
 

From 3f99dbd634f728e98ef5b14f838ecb62ff946d0a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 15:25:44 +1000
Subject: [PATCH 0504/3129] nrf/boards/make-pins.py: Don't generate qstrs.

The output pins.c can be processed for qstrs like any other C file.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/nrf/Makefile            |  9 ++++-----
 ports/nrf/boards/make-pins.py | 31 -------------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index abc1ed497d6a8..7d7589cc20a74 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -51,7 +51,7 @@ endif
 -include boards/$(BOARD)/modules/boardmodules.mk
 
 # qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h $(GEN_PINS_QSTR)
+QSTR_DEFS = qstrdefsport.h
 
 # MicroPython feature configurations
 ifeq ($(DEBUG), 0)
@@ -118,7 +118,6 @@ 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
 
@@ -528,7 +527,7 @@ $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(Q)$(SIZE) $@
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_SHARED_C) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES)
+SRC_QSTR += $(SRC_C) $(SRC_SHARED_C) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(GEN_PINS_SRC)
 
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
@@ -543,9 +542,9 @@ $(OBJ): | $(HEADER_BUILD)/pins.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 $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qstr.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h: boards/$(BOARD)/%.csv $(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) --qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
 
 $(PY_BUILD)/nlr%.o: CFLAGS += -Os -fno-lto
 
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 720df6e49ee86..b535e2418bbb1 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -82,9 +82,6 @@ def print(self):
             )
         )
 
-    def qstr_list(self):
-        return [self.mux_name()]
-
 
 class Pin(object):
     """Holds the information associated with a pin."""
@@ -182,13 +179,6 @@ def print_header(self, hdr_file):
                 "extern const pin_af_obj_t pin_{:s}_af[];\n".format(self.cpu_pin_name())
             )
 
-    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):
@@ -312,19 +302,6 @@ def print_header(self, hdr_filename):
             hdr_file.write("extern const pin_obj_t * const pin_adc2[];\n")
             hdr_file.write("extern const pin_obj_t * const pin_adc3[];\n")
 
-    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([])
@@ -393,13 +370,6 @@ def main():
         help="Specifies beginning portion of generated pins file",
         default="nrf52_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",
@@ -430,7 +400,6 @@ def main():
     pins.print_const_table()
     pins.print()
     pins.print_header(args.hdr_filename)
-    pins.print_qstr(args.qstr_filename)
     pins.print_af_hdr(args.af_const_filename)
     pins.print_af_py(args.af_py_filename)
 

From df28aa1a595afcefaa164e61af38b9b17d83fa6b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 15:36:33 +1000
Subject: [PATCH 0505/3129] renesas-ra/boards/make-pins.py: Don't generate
 qstrs.

The output pins.c can be processed for qstrs like any other C file.

Also remove af_const from Makefile (unimplemented in make-pins.py) and fix
target dependency on ad_const.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/renesas-ra/Makefile            | 19 ++++++--------
 ports/renesas-ra/boards/make-pins.py | 39 ----------------------------
 2 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 943ed6d9bf6bb..e77843b1e31b6 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -27,12 +27,11 @@ USE_FSP_LPM ?= 1
 USE_FSP_QSPI ?= 0
 FSP_BOARD_NAME ?= $(shell echo $(BOARD) | tr '[:upper:]' '[:lower:]')
 
-# 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)
+QSTR_DEFS += qstrdefsport.h
+
+# Files that are generated and needed before the QSTR build.
+QSTR_GLOBAL_DEPENDENCIES += mpconfigboard_common.h $(BOARD_DIR)/mpconfigboard.h
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
@@ -557,16 +556,14 @@ AF_FILE = boards/ra6m5_af.csv
 endif
 GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+# Currently unused.
 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) $(SHARED_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(GEN_PINS_SRC)
 
 # 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
@@ -582,9 +579,9 @@ $(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)
+$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_ad_const.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)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --ad-const $(GEN_PINS_AD_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
 
 CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
 
diff --git a/ports/renesas-ra/boards/make-pins.py b/ports/renesas-ra/boards/make-pins.py
index 5147d27940bdb..4127c9ff1151e 100644
--- a/ports/renesas-ra/boards/make-pins.py
+++ b/ports/renesas-ra/boards/make-pins.py
@@ -41,9 +41,6 @@ def print_header(self, hdr_file):
         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):
@@ -98,15 +95,6 @@ def print_header(self, hdr_file):
         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):
@@ -209,19 +197,6 @@ def print_header(self, hdr_filename):
                     )
                 )
 
-    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_ad_hdr(self, ad_const_filename):
         with open(ad_const_filename, "wt") as ad_const_file:
             for named_pin in self.cpu_pins:
@@ -265,12 +240,6 @@ def main():
         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",
@@ -283,13 +252,6 @@ def main():
         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",
@@ -319,7 +281,6 @@ def main():
 
     pins.print()
     pins.print_header(args.hdr_filename)
-    pins.print_qstr(args.qstr_filename)
     pins.print_ad_hdr(args.ad_const_filename)
 
 

From cb37b7bba756115029d9b973c753eb4b81be5ab7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 4 Aug 2023 23:15:25 +1000
Subject: [PATCH 0506/3129] cc3200/boards/make-pins.py: Don't generate qstrs.

The output pins.c can be processed for qstrs like any other C file.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/Makefile            |  2 +-
 ports/cc3200/application.mk      |  7 +++----
 ports/cc3200/boards/make-pins.py | 24 ------------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/ports/cc3200/Makefile b/ports/cc3200/Makefile
index f89a927c0e43e..099fa295c5906 100644
--- a/ports/cc3200/Makefile
+++ b/ports/cc3200/Makefile
@@ -36,7 +36,7 @@ FLASH_SIZE_LAUNCHXL = 1M
 
 ifeq ($(BTARGET), application)
 # qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
+QSTR_DEFS = qstrdefsport.h
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 7a8fb8d943978..15a5824c3675c 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -164,7 +164,7 @@ OBJ += $(BUILD)/shared/runtime/gchelper_thumb2.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) $(APP_HAL_SRC_C)
+SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C) $(APP_HAL_SRC_C) $(GEN_PINS_SRC)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
@@ -228,7 +228,6 @@ AF_FILE = boards/cc3200_af.csv
 PREFIX_FILE = boards/cc3200_prefix.c
 GEN_PINS_SRC = $(BUILD)/pins.c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
 
 # 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
@@ -238,6 +237,6 @@ GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
 $(OBJ): | $(GEN_PINS_HDR)
 
 # Call make-pins.py to generate both pins_gen.c and pins.h
-$(GEN_PINS_SRC) $(GEN_PINS_HDR) $(GEN_PINS_QSTR): $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+$(GEN_PINS_SRC) $(GEN_PINS_HDR): $(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) --qstr $(GEN_PINS_QSTR) > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
diff --git a/ports/cc3200/boards/make-pins.py b/ports/cc3200/boards/make-pins.py
index 6608be438a218..cd4abb93d2a6b 100644
--- a/ports/cc3200/boards/make-pins.py
+++ b/ports/cc3200/boards/make-pins.py
@@ -185,22 +185,6 @@ def print_header(self, hdr_filename):
                 if pin.board_pin:
                     pin.print_header(hdr_file)
 
-    def print_qstr(self, qstr_filename):
-        with open(qstr_filename, "wt") as qstr_file:
-            pin_qstr_set = set([])
-            af_qstr_set = set([])
-            for pin in self.board_pins:
-                if pin.board_pin:
-                    pin_qstr_set |= set([pin.name])
-                    for af in pin.afs:
-                        af_qstr_set |= set([af.name])
-            print("// Board pins", file=qstr_file)
-            for qstr in sorted(pin_qstr_set):
-                print("Q({})".format(qstr), file=qstr_file)
-            print("\n// Pin AFs", file=qstr_file)
-            for qstr in sorted(af_qstr_set):
-                print("Q({})".format(qstr), file=qstr_file)
-
 
 def main():
     parser = argparse.ArgumentParser(
@@ -228,13 +212,6 @@ def main():
         help="Specifies beginning portion of generated pins file",
         default="cc3200_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",
@@ -262,7 +239,6 @@ def main():
         with open(args.prefix_filename, "r") as prefix_file:
             print(prefix_file.read())
     pins.print()
-    pins.print_qstr(args.qstr_filename)
     pins.print_header(args.hdr_filename)
 
 

From 59f3c7facbb6100108750efa857f1550f23f2482 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 15:02:41 +1000
Subject: [PATCH 0507/3129] examples/pins.py: Remove this pins printing
 example.

It's not supported on all ports, adds complexity to the build to generate
pins_af.py, and can mostly be replicated just by printing the pin objects.

Remove support for generating pins_af.py from all ports (nrf, stm32,
renesas-ra, mimxrt, rp2).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/pins.py                     | 60 ----------------------------
 ports/mimxrt/Makefile                |  1 -
 ports/nrf/Makefile                   |  3 +-
 ports/nrf/boards/make-pins.py        | 18 ---------
 ports/renesas-ra/Makefile            |  3 +-
 ports/renesas-ra/boards/make-pins.py |  6 ---
 ports/rp2/CMakeLists.txt             |  3 +-
 ports/rp2/boards/make-pins.py        | 18 ---------
 ports/stm32/Makefile                 |  3 +-
 ports/stm32/boards/make-pins.py      | 20 ----------
 ports/stm32/mboot/Makefile           |  3 +-
 11 files changed, 5 insertions(+), 133 deletions(-)
 delete mode 100644 examples/pins.py

diff --git a/examples/pins.py b/examples/pins.py
deleted file mode 100644
index 3a8472e8a6849..0000000000000
--- a/examples/pins.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Print a nice list of pins, their current settings, and available afs.
-# Requires pins_af.py from ports/stm32/build-PYBV10/ directory.
-
-import pyb
-import pins_af
-
-
-def af():
-    max_name_width = 0
-    max_af_width = 0
-    for pin_entry in pins_af.PINS_AF:
-        max_name_width = max(max_name_width, len(pin_entry[0]))
-        for af_entry in pin_entry[1:]:
-            max_af_width = max(max_af_width, len(af_entry[1]))
-    for pin_entry in pins_af.PINS_AF:
-        pin_name = pin_entry[0]
-        print("%-*s " % (max_name_width, pin_name), end="")
-        for af_entry in pin_entry[1:]:
-            print("%2d: %-*s " % (af_entry[0], max_af_width, af_entry[1]), end="")
-        print("")
-
-
-def pins():
-    mode_str = {
-        pyb.Pin.IN: "IN",
-        pyb.Pin.OUT_PP: "OUT_PP",
-        pyb.Pin.OUT_OD: "OUT_OD",
-        pyb.Pin.AF_PP: "AF_PP",
-        pyb.Pin.AF_OD: "AF_OD",
-        pyb.Pin.ANALOG: "ANALOG",
-    }
-    pull_str = {pyb.Pin.PULL_NONE: "", pyb.Pin.PULL_UP: "PULL_UP", pyb.Pin.PULL_DOWN: "PULL_DOWN"}
-    width = [0, 0, 0, 0]
-    rows = []
-    for pin_entry in pins_af.PINS_AF:
-        row = []
-        pin_name = pin_entry[0]
-        pin = pyb.Pin(pin_name)
-        pin_mode = pin.mode()
-        row.append(pin_name)
-        row.append(mode_str[pin_mode])
-        row.append(pull_str[pin.pull()])
-        if pin_mode == pyb.Pin.AF_PP or pin_mode == pyb.Pin.AF_OD:
-            pin_af = pin.af()
-            for af_entry in pin_entry[1:]:
-                if pin_af == af_entry[0]:
-                    af_str = "%d: %s" % (pin_af, af_entry[1])
-                    break
-            else:
-                af_str = "%d" % pin_af
-        else:
-            af_str = ""
-        row.append(af_str)
-        for col in range(len(width)):
-            width[col] = max(width[col], len(row[col]))
-        rows.append(row)
-    for row in rows:
-        for col in range(len(width)):
-            print("%-*s " % (width[col], row[col]), end="")
-        print("")
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index c22c5442a9d08..51cf5178bac2a 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -62,7 +62,6 @@ BOARD_PINS = $(BOARD_DIR)/pins.csv
 PREFIX_FILE = boards/mimxrt_prefix.c
 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_SRC = $(BUILD)/pins_gen.c
 
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 7d7589cc20a74..cb81ad847f35b 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -119,7 +119,6 @@ PREFIX_FILE = boards/$(MCU_VARIANT)_prefix.c
 GEN_PINS_SRC = $(BUILD)/pins_gen.c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.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
 
@@ -544,7 +543,7 @@ $(OBJ): | $(HEADER_BUILD)/pins.h
 # both pins_gen.c and pins.h
 $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h: boards/$(BOARD)/%.csv $(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) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --af-const $(GEN_PINS_AF_CONST) > $(GEN_PINS_SRC)
 
 $(PY_BUILD)/nlr%.o: CFLAGS += -Os -fno-lto
 
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index b535e2418bbb1..6bfb662514426 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -320,17 +320,6 @@ def print_af_hdr(self, af_const_filename):
                 val = "MP_ROM_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(
@@ -351,12 +340,6 @@ def main():
         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",
@@ -401,7 +384,6 @@ def main():
     pins.print()
     pins.print_header(args.hdr_filename)
     pins.print_af_hdr(args.af_const_filename)
-    pins.print_af_py(args.af_py_filename)
 
 
 if __name__ == "__main__":
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index e77843b1e31b6..8c09dc91bd0a1 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -558,7 +558,6 @@ GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 # Currently unused.
 GEN_PINS_AD_CONST = $(HEADER_BUILD)/pins_ad_const.h
-GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 
 FILE2H = $(TOP)/tools/file2h.py
 
@@ -581,7 +580,7 @@ $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
 .PRECIOUS: $(GEN_PINS_SRC)
 $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_ad_const.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) --ad-const $(GEN_PINS_AD_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --ad-const $(GEN_PINS_AD_CONST) > $(GEN_PINS_SRC)
 
 CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
 
diff --git a/ports/renesas-ra/boards/make-pins.py b/ports/renesas-ra/boards/make-pins.py
index 4127c9ff1151e..43267a1fa3d7f 100644
--- a/ports/renesas-ra/boards/make-pins.py
+++ b/ports/renesas-ra/boards/make-pins.py
@@ -240,12 +240,6 @@ def main():
         help="Specifies header file for AD function constants.",
         default="build/pins_ad_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",
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 4a0d2fbad73ce..f643b66793475 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -480,7 +480,6 @@ 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_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")
@@ -495,7 +494,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
 add_custom_command(
     OUTPUT ${GEN_PINS_HDR} ${GEN_PINS_SRC}
     COMMAND ${Python3_EXECUTABLE} ${GEN_PINS_MKPINS} ${GEN_PINS_CSV_ARG} --af ${GEN_PINS_AF_CSV} --prefix ${GEN_PINS_PREFIX}
-    --hdr ${GEN_PINS_HDR} --af-py ${GEN_PINS_AF_PY} > ${GEN_PINS_SRC}
+    --hdr ${GEN_PINS_HDR} > ${GEN_PINS_SRC}
     DEPENDS
         ${GEN_PINS_AF_CSV}
         ${GEN_PINS_BOARD_CSV}
diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index 4029d7b1cfca7..9c66248885c62 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -284,17 +284,6 @@ def print_header(self, hdr_filename, obj_decls):
                         )
                     )
 
-    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(
@@ -309,12 +298,6 @@ def main():
         help="Specifies the alternate function file for the chip",
         default="rp2_af.csv",
     )
-    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",
@@ -356,7 +339,6 @@ def main():
             print(prefix_file.read())
     pins.print()
     pins.print_header(args.hdr_filename, True)
-    pins.print_af_py(args.af_py_filename)
 
 
 if __name__ == "__main__":
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 3bb18ee3cbe48..5b853592c9a0d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -72,7 +72,6 @@ GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.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
@@ -678,7 +677,7 @@ $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) \
 		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --hdr-obj-decls \
 		--af-const $(GEN_PINS_AF_CONST) --af-defs $(GEN_PINS_AF_DEFS) \
-		--af-defs-cmp-strings --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
+		--af-defs-cmp-strings > $(GEN_PINS_SRC)
 
 modmachine.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index f0fcb824375c8..99b507a3a870a 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -503,19 +503,6 @@ def print_af_defs(self, af_defs_filename, cmp_strings):
                 print("\n".join(sorted(pins)), file=af_defs_file)
                 print("    (0xffffffffffffffffULL))\n", file=af_defs_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:
-                if named_pin.is_hidden():
-                    continue
-                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(
@@ -536,12 +523,6 @@ def main():
         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",
@@ -604,7 +585,6 @@ def main():
         pins.print_adc(i)
     pins.print_header(args.hdr_filename, args.hdr_obj_decls)
     pins.print_af_hdr(args.af_const_filename)
-    pins.print_af_py(args.af_py_filename)
     pins.print_af_defs(args.af_defs_filename, args.af_defs_cmp_strings)
 
 
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index a37b046ca564b..fab8ce2159012 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -229,7 +229,6 @@ GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.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
 
 $(OBJ): $(GEN_QSTRDEFS_GENERATED) $(GEN_ROOT_POINTERS) $(GEN_PINS_AF_DEFS)
 
@@ -247,7 +246,7 @@ $(GEN_PINS_AF_DEFS): $(BOARD_PINS) $(MAKE_PINS) ../$(AF_FILE) $(PREFIX_FILE) | $
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af ../$(AF_FILE) \
 		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) \
 		--af-const $(GEN_PINS_AF_CONST) --af-defs $(GEN_PINS_AF_DEFS) \
-		--af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
+		> $(GEN_PINS_SRC)
 
 #########################################
 

From 1ee5731122ba1c43705c1287da85de800b283036 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 16:20:50 +1000
Subject: [PATCH 0508/3129] ports: Remove SRC_QSTR_AUTO_DEPS from all ports'
 Makefiles.

It's unused.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/application.mk | 3 ---
 ports/esp8266/Makefile      | 2 --
 ports/nrf/Makefile          | 4 ----
 ports/pic16bit/Makefile     | 3 ---
 ports/stm32/Makefile        | 5 ++---
 ports/unix/Makefile         | 3 ---
 ports/windows/Makefile      | 3 ---
 7 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 15a5824c3675c..7c6773ef4be4c 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -165,9 +165,6 @@ 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) $(APP_HAL_SRC_C) $(GEN_PINS_SRC)
-# Append any auto-generated sources that are needed by sources listed in
-# SRC_QSTR
-SRC_QSTR_AUTO_DEPS +=
 
 # Add the linker script
 LINKER_SCRIPT = application.lds
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index b29df9fd2223c..cea0e789c63f8 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -187,8 +187,6 @@ OBJ += $(addprefix $(BUILD)/, $(DRIVERS_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 +=
 
 all: $(FWBIN)
 
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index cb81ad847f35b..2f9b93d7ffdfd 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -528,10 +528,6 @@ $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SRC_SHARED_C) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(GEN_PINS_SRC)
 
-# Append any auto-generated sources that are needed by sources listed in
-# SRC_QSTR
-SRC_QSTR_AUTO_DEPS +=
-
 # 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
diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile
index d2c8df4707e0d..6d061514f9583 100644
--- a/ports/pic16bit/Makefile
+++ b/ports/pic16bit/Makefile
@@ -51,9 +51,6 @@ OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o))
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C)
-# Append any auto-generated sources that are needed by sources listed in
-# SRC_QSTR
-SRC_QSTR_AUTO_DEPS +=
 
 all: $(BUILD)/firmware.hex
 
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 5b853592c9a0d..8d521182ffe7d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -652,9 +652,6 @@ $(BUILD)/firmware.elf: $(OBJ)
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(GEN_PINS_SRC)
-# Append any auto-generated sources that are needed by sources listed in
-# SRC_QSTR
-SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)
 
 # 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
@@ -668,6 +665,8 @@ $(OBJ): | $(GEN_PINS_HDR)
 $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
 
 # main.c can't be even preprocessed without $(GEN_CDCINF_HEADER)
+# As main.c is in SRC_QSTR this will also ensure that GEN_CDCINF_HEADER
+# will be run before QSTR extraction.
 main.c: $(GEN_CDCINF_HEADER)
 
 # Use a pattern rule here so that make will only call make-pins.py once to make
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 52ae8314eb4ce..9f5e01a5ff9b7 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -229,9 +229,6 @@ OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
 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 +=
 
 ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 31ac8d8b8847a..47ce664d7bde6 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -82,9 +82,6 @@ LIB += -lws2_32
 
 # List of sources for qstr extraction
 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 +=
 
 ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMPZ_DIG_SIZE=16

From 9cabee8252a01212651b52ea8c196d7effca1648 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 3 Aug 2023 16:48:52 +1000
Subject: [PATCH 0509/3129] ports: Standardise arguments and output for
 make-pins.py script.

All ports now use `--board-csv`, `--prefix`, `--output-souce`,
`--output-header` and no longer write to stdout.  This matches the esp32
implementation.

Ports that have an AF input use `--af-csv` (to match `--board-csv`).

Any additional output files are now prefixed with `output-` (e.g.
`--output-af-const`).

Default arguments are removed (all makefiles should always specify all
arguments, using default values is likely an error).

Replaced the `af-defs-cmp-strings` and `hdr-obj-decls` args for stm32 with
just `mboot-mode`.  Previously they were set on the regular build, now the
logic is reversed so mboot sets it.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/application.mk          |   3 +-
 ports/cc3200/boards/make-pins.py     | 134 +++++------
 ports/esp32/boards/make-pins.py      |   6 +-
 ports/mimxrt/Makefile                |   6 +-
 ports/mimxrt/boards/make-pins.py     | 203 ++++++++--------
 ports/nrf/Makefile                   |   3 +-
 ports/nrf/boards/make-pins.py        | 250 +++++++++-----------
 ports/renesas-ra/Makefile            |   3 +-
 ports/renesas-ra/boards/make-pins.py | 198 +++++++---------
 ports/rp2/CMakeLists.txt             |   5 +-
 ports/rp2/boards/make-pins.py        | 206 ++++++++---------
 ports/stm32/Makefile                 |   7 +-
 ports/stm32/boards/make-pins.py      | 332 ++++++++++++---------------
 ports/stm32/mboot/Makefile           |   8 +-
 14 files changed, 610 insertions(+), 754 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 7c6773ef4be4c..6959c64b666e8 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -236,4 +236,5 @@ $(OBJ): | $(GEN_PINS_HDR)
 # Call make-pins.py to generate both pins_gen.c and pins.h
 $(GEN_PINS_SRC) $(GEN_PINS_HDR): $(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)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR)
diff --git a/ports/cc3200/boards/make-pins.py b/ports/cc3200/boards/make-pins.py
index cd4abb93d2a6b..da04d8e36cee9 100644
--- a/ports/cc3200/boards/make-pins.py
+++ b/ports/cc3200/boards/make-pins.py
@@ -44,11 +44,12 @@ def __init__(self, name, idx, fn, unit, type):
         self.unit = unit
         self.type = type
 
-    def print(self):
+    def print(self, out_source):
         print(
             "    AF({:16s}, {:4d}, {:8s}, {:4d}, {:8s}),    // {}".format(
                 self.name, self.idx, self.fn, self.unit, self.type, self.name
-            )
+            ),
+            file=out_source,
         )
 
 
@@ -66,13 +67,13 @@ def __init__(self, name, port, gpio_bit, pin_num):
     def add_af(self, af):
         self.afs.append(af)
 
-    def print(self):
-        print("// {}".format(self.name))
+    def print(self, out_source):
+        print("// {}".format(self.name), file=out_source)
         if len(self.afs):
-            print("const pin_af_t pin_{}_af[] = {{".format(self.name))
+            print("const pin_af_t pin_{}_af[] = {{".format(self.name), file=out_source)
             for af in self.afs:
-                af.print()
-            print("};")
+                af.print(out_source)
+            print("};", file=out_source)
             print(
                 "pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, pin_{}_af, {});\n".format(
                     self.name,
@@ -82,17 +83,19 @@ def print(self):
                     self.pin_num,
                     self.name,
                     len(self.afs),
-                )
+                ),
+                file=out_source,
             )
         else:
             print(
                 "pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, NULL, 0);\n".format(
                     self.name, self.name, self.port, self.gpio_bit, self.pin_num
-                )
+                ),
+                file=out_source,
             )
 
-    def print_header(self, hdr_file):
-        hdr_file.write("extern pin_obj_t pin_{:s};\n".format(self.name))
+    def print_header(self, out_header):
+        print("extern pin_obj_t pin_{:s};".format(self.name), file=out_header)
 
 
 class Pins:
@@ -153,93 +156,72 @@ def parse_board_file(self, filename, cpu_pin_col):
                 if pin:
                     pin.board_pin = True
 
-    def print_named(self, label, pins):
-        print("")
+    def print_named(self, label, pins, out_source):
+        print("", file=out_source)
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            file=out_source,
         )
         for pin in pins:
             if pin.board_pin:
                 print(
                     "    {{ MP_ROM_QSTR(MP_QSTR_{:6s}), MP_ROM_PTR(&pin_{:6s}) }},".format(
                         pin.name, pin.name
-                    )
+                    ),
+                    file=out_source,
                 )
-        print("};")
+        print("};", file=out_source)
         print(
             "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
                 label, label
-            )
+            ),
+            file=out_source,
         )
 
-    def print(self):
+    def print(self, out_source):
         for pin in self.board_pins:
             if pin.board_pin:
-                pin.print()
-        self.print_named("board", self.board_pins)
-        print("")
+                pin.print(out_source)
+        self.print_named("board", self.board_pins, out_source)
+        print("", file=out_source)
 
-    def print_header(self, hdr_filename):
-        with open(hdr_filename, "wt") as hdr_file:
-            for pin in self.board_pins:
-                if pin.board_pin:
-                    pin.print_header(hdr_file)
+    def print_header(self, out_header):
+        for pin in self.board_pins:
+            if pin.board_pin:
+                pin.print_header(out_header)
 
 
 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="cc3200_af.csv",
-    )
-    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="cc3200_prefix.c",
-    )
-    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:])
+    parser = argparse.ArgumentParser(description="Generate board specific pin file")
+    parser.add_argument("--board-csv")
+    parser.add_argument("--af-csv")
+    parser.add_argument("--prefix")
+    parser.add_argument("--output-source")
+    parser.add_argument("--output-header")
+    args = parser.parse_args()
 
     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, 3)
-
-    if args.board_filename:
-        print("// --board {:s}".format(args.board_filename))
-        pins.parse_board_file(args.board_filename, 1)
-
-    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)
+    with open(args.output_source, "w") as out_source:
+        print("// This file was automatically generated by make-pins.py", file=out_source)
+        print("//", file=out_source)
+        if args.af_csv:
+            print("// --af {:s}".format(args.af_csv), file=out_source)
+            pins.parse_af_file(args.af_csv, 0, 1, 3)
+
+        if args.board_csv:
+            print("// --board {:s}".format(args.board_csv), file=out_source)
+            pins.parse_board_file(args.board_csv, 1)
+
+        if args.prefix:
+            print("// --prefix {:s}".format(args.prefix), file=out_source)
+            print("", file=out_source)
+            with open(args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), file=out_source)
+        pins.print(out_source)
+
+    with open(args.output_header, "w") as out_header:
+        pins.print_header(out_header)
 
 
 if __name__ == "__main__":
diff --git a/ports/esp32/boards/make-pins.py b/ports/esp32/boards/make-pins.py
index e0f988549b7f3..4813724dd6d88 100755
--- a/ports/esp32/boards/make-pins.py
+++ b/ports/esp32/boards/make-pins.py
@@ -154,20 +154,18 @@ def main():
     parser.add_argument("--prefix")
     parser.add_argument("--output-source")
     parser.add_argument("--output-header")
-    args = parser.parse_args(sys.argv[1:])
+    args = parser.parse_args()
 
     pins = Pins()
     pins.create_pins()
 
-    if args.board_csv:
-        pins.parse_board_file(args.board_csv)
-
     with open(args.output_source, "w") as out_source:
         print("// This file was automatically generated by make-pins.py", file=out_source)
         print("//", file=out_source)
 
         if args.board_csv:
             print("// --board-csv {:s}".format(args.board_csv), file=out_source)
+            pins.parse_board_file(args.board_csv)
 
         if args.prefix:
             print("// --prefix {:s}".format(args.prefix), file=out_source)
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 51cf5178bac2a..879ee05f4a448 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -505,8 +505,8 @@ $(GEN_FLEXRAM_CONFIG_SRC):
 # 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)\
-		--iomux $(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h) \
-		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) \
+	    --prefix $(PREFIX_FILE) --iomux $(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR)
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index 5795e2f0421c1..d6752af1e910a 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -93,34 +93,36 @@ def parse_af(self, af_idx, af_strs_in):
     def add_af(self, af):
         self.alt_fn.append(af)
 
-    def print_pin_af(self):
+    def print_pin_af(self, out_source):
         if self.alt_fn:
             print(
                 "static const machine_pin_af_obj_t pin_{0}_af[{1}] = {{".format(
                     self.name, len(self.alt_fn)
-                )
+                ),
+                file=out_source,
             )
             for af in self.alt_fn:
-                af.print()
-            print("};")
+                af.print(out_source)
+            print("};", file=out_source)
         else:
             raise ValueError("Pin '{}' has no alternative functions".format(self.name))
 
-    def print_pin_adc(self):
+    def print_pin_adc(self, out_source):
         if self.adc_fns:
             print(
                 "static const machine_pin_adc_obj_t pin_{0}_adc[{1}] = {{".format(
                     self.name, len(self.adc_fns)
-                )
+                ),
+                file=out_source,
             )
             for adc_fn in self.adc_fns:
-                adc_fn.print()
-            print("};")
+                adc_fn.print(out_source)
+            print("};", file=out_source)
 
-    def print(self):
+    def print(self, out_source):
         if self.alt_fn:
-            self.print_pin_af()
-            self.print_pin_adc()
+            self.print_pin_af(out_source)
+            self.print_pin_adc(out_source)
 
             options = {
                 "GPIO_LPSR_00": "PIN_LPSR",
@@ -165,12 +167,13 @@ def print(self):
                     int(self.pin),
                     len(self.adc_fns),
                     "pin_{}_adc".format(self.name) if self.adc_fns else "NULL",
-                )
+                ),
+                file=out_source,
             )
         else:
             raise ValueError("Pin '{}' has no alternative functions".format(self.name))
 
-    def print_header(self, hdr_file):
+    def print_header(self, out_header):
         pass
 
 
@@ -182,9 +185,9 @@ def __init__(self, instance, channel, peripheral="ADC"):
         self.instance = instance
         self.channel = channel
 
-    def print(self):
+    def print(self, out_source):
         """Prints the C representation of this AF."""
-        print(f"    PIN_ADC({self.peripheral}{self.instance}, {self.channel}),")
+        print(f"    PIN_ADC({self.peripheral}{self.instance}, {self.channel}),", file=out_source)
 
 
 class AlternateFunction(object):
@@ -197,12 +200,13 @@ def __init__(self, idx, input_reg, input_daisy, af_str):
         self.input_daisy = input_daisy
         self.instance = self.af_str.split("_")[0]
 
-    def print(self):
+    def print(self, out_source):
         """Prints the C representation of this AF."""
         print(
             "    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"
-            )
+            ),
+            file=out_source,
         )
 
 
@@ -292,54 +296,62 @@ def parse_af_file(self, filename, iomux_filename):
                 self.cpu_pins.append(pin)
 
     @staticmethod
-    def print_named(label, pins):
-        print("")
+    def print_named(label, pins, out_source):
+        print("", file=out_source)
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            file=out_source,
         )
         for pin in pins:
-            print(
-                "    {{ MP_ROM_QSTR(MP_QSTR_{}), MP_ROM_PTR(&pin_{}) }},".format(pin.name, pin.pad)
+            (
+                print(
+                    "    {{ MP_ROM_QSTR(MP_QSTR_{}), MP_ROM_PTR(&pin_{}) }},".format(
+                        pin.name, pin.pad
+                    ),
+                    file=out_source,
+                ),
             )
-        print("};")
+        print("};", file=out_source)
         print(
             "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
                 label, label
-            )
+            ),
+            file=out_source,
         )
 
-    def print(self):
+    def print(self, out_source):
         # Print Pin Object declarations
         for pin in self.cpu_pins:
-            pin.print()
+            pin.print(out_source)
 
-        print("")
-        print("const machine_pin_obj_t* machine_pin_board_pins [] = {")
+        print("", file=out_source)
+        print("const machine_pin_obj_t* machine_pin_board_pins [] = {", file=out_source)
         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_{},".format(pin.pad), file=out_source)
+        print("};", file=out_source)
+        print(
+            "const uint32_t num_board_pins = {:d};".format(len(self.board_pins)), file=out_source
+        )
         # 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")
-
-            hdr_file.write("\n// Defines\n")
-            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 module_instance_factory(pins, output_file, name):
+        self.print_named("cpu", self.cpu_pins, out_source)
+        self.print_named("board", self.board_pins, out_source)
+        print("", file=out_source)
+
+    def print_header(self, out_header):
+        for pin in self.cpu_pins:
+            print("extern const machine_pin_obj_t pin_{};".format(pin.name), file=out_header)
+        print("extern const machine_pin_obj_t* machine_pin_board_pins[];", file=out_header)
+        print("extern const uint32_t num_board_pins;", file=out_header)
+        print("extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;", file=out_header)
+        print("extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;", file=out_header)
+        print("", file=out_header)
+        print("// Defines", file=out_header)
+        module_instance_factory(self.cpu_pins, out_header, "USDHC")
+        module_instance_factory(self.cpu_pins, out_header, "FLEXPWM")
+        module_instance_factory(self.cpu_pins, out_header, "TMR")
+
+
+def module_instance_factory(pins, out_header, name):
     module_pin = filter(lambda p: any([af for af in p.alt_fn if name in af.af_str]), pins)
 
     module_instances = dict()
@@ -357,80 +369,47 @@ def module_instance_factory(pins, output_file, name):
                     )
 
     for k, v in module_instances.items():
-        output_file.write(f"// {k}\n")
-        output_file.write(f"#define {k}_AVAIL (1)\n")
+        print(f"// {k}", file=out_header)
+        print(f"#define {k}_AVAIL (1)", file=out_header)
         if name == "FLEXPWM":
-            output_file.write(f"#define {k} {k[-4:]}\n")
+            print(f"#define {k} {k[-4:]}", file=out_header)
         for i in v:
-            output_file.write(i + "\n")
+            print(i, file=out_header)
 
 
 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(
-        "-i",
-        "--iomux",
-        dest="iomux_filename",
-        help="Specifies the fsl_iomuxc.h file for the chip",
-        default="fsl_iomuxc.h",
-    )
-    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",
-    )
+    parser = argparse.ArgumentParser(description="Generate board specific pin file")
+    parser.add_argument("--board-csv")
+    parser.add_argument("--af-csv")
+    parser.add_argument("--prefix")
+    parser.add_argument("--iomux-header")
+    parser.add_argument("--output-source")
+    parser.add_argument("--output-header")
+    args = parser.parse_args()
 
     pins = Pins()
 
-    # test code
-    args = parser.parse_args()
-    #
+    with open(args.output_source, "w") as out_source:
+        if args.af_csv:
+            print("// --af {:s}".format(args.af_csv), file=out_source)
+            pins.parse_af_file(args.af_csv, args.iomux_header)
 
-    if args.af_filename:
-        print("// --af {:s}".format(args.af_filename))
-        pins.parse_af_file(args.af_filename, args.iomux_filename)
+        if args.board_csv:
+            print("// --board {:s}".format(args.board_csv), file=out_source)
+            pins.parse_board_file(args.board_csv)
 
-    if args.board_filename:
-        print("// --board {:s}".format(args.board_filename))
-        pins.parse_board_file(args.board_filename)
+        if args.output_header:
+            print("// --hdr {:s}".format(args.output_header), file=out_source)
 
-    if args.hdr_filename:
-        print("// --hdr {:s}".format(args.hdr_filename))
+        if args.prefix:
+            print("// --prefix {:s}".format(args.prefix), file=out_source)
+            with open(args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), file=out_source)
 
-    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(out_source)
 
-    pins.print()
-    pins.print_header(args.hdr_filename)
+    with open(args.output_header, "w") as out_header:
+        pins.print_header(out_header)
 
 
 if __name__ == "__main__":
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 2f9b93d7ffdfd..d0ecddd6157a3 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -539,7 +539,8 @@ $(OBJ): | $(HEADER_BUILD)/pins.h
 # both pins_gen.c and pins.h
 $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h: boards/$(BOARD)/%.csv $(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) --af-const $(GEN_PINS_AF_CONST) > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) --output-af-const $(GEN_PINS_AF_CONST)
 
 $(PY_BUILD)/nlr%.o: CFLAGS += -Os -fno-lto
 
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 6bfb662514426..6932a18d648ac 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -67,19 +67,20 @@ def ptr(self):
     def mux_name(self):
         return "AF{:d}_{:s}".format(self.idx, self.ptr())
 
-    def print(self):
+    def print(self, out_source):
         """Prints the C representation of this AF."""
         if self.supported:
-            print("  AF", end="")
+            print("  AF", end="", file=out_source)
         else:
-            print("  //", end="")
+            print("  //", end="", file=out_source)
         fn_num = self.fn_num
         if fn_num is None:
             fn_num = 0
         print(
             "({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}".format(
                 self.idx, self.func, fn_num, self.pin_type, self.ptr(), self.af_str
-            )
+            ),
+            file=out_source,
         )
 
 
@@ -144,23 +145,24 @@ def adc_num_str(self):
             str = "0"
         return str
 
-    def print_const_table_entry(self):
+    def print_const_table_entry(self, out_source):
         print(
             "  PIN({:d}, {:s}, {:s}, {:d}),".format(
                 self.pin, self.alt_fn_name(null_if_0=True), self.adc_num_str(), self.adc_channel
-            )
+            ),
+            file=out_source,
         )
 
-    def print(self):
+    def print(self, out_source):
         if self.alt_fn_count == 0:
-            print("// ", end="")
-        print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()))
+            print("// ", end="", file=out_source)
+        print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()), file=out_source)
         for alt_fn in self.alt_fn:
-            alt_fn.print()
+            alt_fn.print(out_source)
         if self.alt_fn_count == 0:
-            print("// ", end="")
-        print("};")
-        print("")
+            print("// ", end="", file=out_source)
+        print("};", file=out_source)
+        print("", file=out_source)
         print(
             "const pin_obj_t pin_{:s} = PIN({:d}, {:s}, {:s}, {:d});".format(
                 self.cpu_pin_name(),
@@ -168,15 +170,17 @@ def print(self):
                 self.alt_fn_name(null_if_0=True),
                 self.adc_num_str(),
                 self.adc_channel,
-            )
+            ),
+            file=out_source,
         )
-        print("")
+        print("", file=out_source)
 
-    def print_header(self, hdr_file):
-        hdr_file.write("extern const pin_obj_t pin_{:s};\n".format(self.cpu_pin_name()))
+    def print_header(self, out_header):
+        print("extern const pin_obj_t pin_{:s};".format(self.cpu_pin_name()), file=out_header)
         if self.alt_fn_count > 0:
-            hdr_file.write(
-                "extern const pin_af_obj_t pin_{:s}_af[];\n".format(self.cpu_pin_name())
+            print(
+                "extern const pin_af_obj_t pin_{:s}_af[];\n".format(self.cpu_pin_name()),
+                file=out_header,
             )
 
 
@@ -232,9 +236,10 @@ def parse_board_file(self, filename):
                     pin.set_is_board_pin()
                     self.board_pins.append(NamedPin(row[0], pin))
 
-    def print_named(self, label, named_pins):
+    def print_named(self, label, named_pins, out_source):
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            file=out_source,
         )
         for named_pin in named_pins:
             pin = named_pin.pin()
@@ -242,148 +247,109 @@ def print_named(self, label, named_pins):
                 print(
                     "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&machine_board_pin_obj[{:d}]) }},".format(
                         named_pin.name(), pin.board_index
-                    )
+                    ),
+                    file=out_source,
                 )
-        print("};")
+        print("};", file=out_source)
         print(
             "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
                 label, label
-            )
+            ),
+            file=out_source,
         )
 
-    def print_const_table(self):
+    def print_const_table(self, out_source):
         num_board_pins = 0
         for named_pin in self.cpu_pins:
             pin = named_pin.pin()
             if pin.is_board_pin():
                 pin.set_board_index(num_board_pins)
                 num_board_pins += 1
-        print("")
-        print("const uint8_t machine_pin_num_of_board_pins = {:d};".format(num_board_pins))
-        print("")
-        print("const pin_obj_t machine_board_pin_obj[{:d}] = {{".format(num_board_pins))
+        print("", file=out_source)
+        print(
+            "const uint8_t machine_pin_num_of_board_pins = {:d};".format(num_board_pins),
+            file=out_source,
+        )
+        print("", file=out_source)
+        print(
+            "const pin_obj_t machine_board_pin_obj[{:d}] = {{".format(num_board_pins),
+            file=out_source,
+        )
         for named_pin in self.cpu_pins:
             pin = named_pin.pin()
             if pin.is_board_pin():
-                pin.print_const_table_entry()
-        print("};")
-
-    def print(self):
-        self.print_named("cpu", self.cpu_pins)
-        print("")
-        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(16):
-            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}, // {:d}".format(pin.cpu_pin_name(), channel))
-                    adc_found = True
-                    break
-            if not adc_found:
-                print("  NULL,    // {:d}".format(channel))
-        print("};")
-
-    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)
-            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")
-
-    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_ROM_QSTR(MP_QSTR_{}),".format(mux_name)
-                val = "MP_ROM_INT(GPIO_{})".format(mux_name)
-                print("    { %-*s %s }," % (mux_name_width + 26, key, val), file=af_const_file)
+                pin.print_const_table_entry(out_source)
+        print("};", file=out_source)
+
+    def print(self, out_source):
+        self.print_named("cpu", self.cpu_pins, out_source)
+        print("", file=out_source)
+        self.print_named("board", self.board_pins, out_source)
+
+    def print_header(self, out_header):
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            if pin.is_board_pin():
+                pin.print_header(out_header)
+        print("extern const pin_obj_t * const pin_adc1[];", file=out_header)
+        print("extern const pin_obj_t * const pin_adc2[];", file=out_header)
+        print("extern const pin_obj_t * const pin_adc3[];", file=out_header)
+
+    def print_af_hdr(self, out_af_const):
+        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_ROM_QSTR(MP_QSTR_{}),".format(mux_name)
+            val = "MP_ROM_INT(GPIO_{})".format(mux_name)
+            print("    { %-*s %s }," % (mux_name_width + 26, key, val), file=out_af_const)
 
 
 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="nrf.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(
-        "-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="nrf52_prefix.c",
-    )
-    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:])
+    parser = argparse.ArgumentParser(description="Generate board specific pin file")
+    parser.add_argument("--board-csv")
+    parser.add_argument("--af-csv")
+    parser.add_argument("--prefix")
+    parser.add_argument("--output-source")
+    parser.add_argument("--output-header")
+    parser.add_argument("--output-af-const")
+    args = parser.parse_args()
 
     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, 1, 2, 2)
-
-    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_const_table()
-    pins.print()
-    pins.print_header(args.hdr_filename)
-    pins.print_af_hdr(args.af_const_filename)
+    with open(args.output_source, "w") as out_source:
+        print("// This file was automatically generated by make-pins.py", file=out_source)
+        print("//", file=out_source)
+        if args.af_csv:
+            print("// --af {:s}".format(args.af_csv), file=out_source)
+            pins.parse_af_file(args.af_csv, 1, 2, 2)
+
+        if args.board_csv:
+            print("// --board {:s}".format(args.board_csv), file=out_source)
+            pins.parse_board_file(args.board_csv)
+
+        if args.prefix:
+            print("// --prefix {:s}".format(args.prefix), file=out_source)
+            print("", file=out_source)
+            with open(args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), file=out_source)
+
+        pins.print_const_table(out_source)
+        pins.print(out_source)
+
+    with open(args.output_header, "w") as out_header:
+        pins.print_header(out_header)
+
+    with open(args.output_af_const, "w") as out_af_const:
+        pins.print_af_hdr(out_af_const)
 
 
 if __name__ == "__main__":
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 8c09dc91bd0a1..4e31029073085 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -580,7 +580,8 @@ $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
 .PRECIOUS: $(GEN_PINS_SRC)
 $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_ad_const.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) --ad-const $(GEN_PINS_AD_CONST) > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) --output-ad-const $(GEN_PINS_AD_CONST)
 
 CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
 
diff --git a/ports/renesas-ra/boards/make-pins.py b/ports/renesas-ra/boards/make-pins.py
index 43267a1fa3d7f..5eebbb49269ac 100644
--- a/ports/renesas-ra/boards/make-pins.py
+++ b/ports/renesas-ra/boards/make-pins.py
@@ -28,18 +28,19 @@ def bit(self):
     def channel(self):
         return self._channel
 
-    def print(self):
+    def print(self, out_source):
         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
-            )
+            ),
+            file=out_source,
         )
-        print("")
+        print("", file=out_source)
 
-    def print_header(self, hdr_file):
+    def print_header(self, out_header):
         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))
+        print("extern const pin_ad_obj_t pin_{:s}_ad_obj;".format(n), file=out_header)
+        print("#define pin_{:s}_ad (&pin_{:s}_ad_obj)".format(n, n), file=out_header)
 
 
 class Pin(object):
@@ -78,22 +79,23 @@ def parse_ad(self, ad_str):
             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):
+    def print(self, out_source):
         pin_ad_name = "NULL"
         for pin_ad in self._pin_ad:
-            pin_ad.print()
+            pin_ad.print(out_source)
             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
-            )
+            ),
+            file=out_source,
         )
-        print("")
+        print("", file=out_source)
 
-    def print_header(self, hdr_file):
+    def print_header(self, out_header):
         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))
+        print("extern const machine_pin_obj_t pin_{:s}_obj;".format(n), file=out_header)
+        print("#define pin_{:s} (&pin_{:s}_obj)".format(n, n), file=out_header)
 
 
 class NamedPin(object):
@@ -152,9 +154,10 @@ def parse_board_file(self, filename):
                     pin.set_is_board_pin()
                     self.board_pins.append(NamedPin(board_pin_name, pin))
 
-    def print_named(self, label, named_pins):
+    def print_named(self, label, named_pins, out_source):
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            file=out_source,
         )
         for named_pin in named_pins:
             pin = named_pin.pin()
@@ -162,120 +165,93 @@ def print_named(self, label, named_pins):
                 print(
                     "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}_obj) }},".format(
                         named_pin.name(), pin.cpu_pin_name()
-                    )
+                    ),
+                    file=out_source,
                 )
-        print("};")
+        print("};", file=out_source)
         print(
             "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
                 label, label
-            )
+            ),
+            file=out_source,
         )
 
-    def print(self):
+    def print(self, out_source):
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            if pin.is_board_pin():
+                pin.print(out_source)
+        self.print_named("cpu", self.cpu_pins, out_source)
+        print("", file=out_source)
+        self.print_named("board", self.board_pins, out_source)
+
+    def print_header(self, out_header):
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            if pin.is_board_pin():
+                pin.print_header(out_header)
+            pin_ads = pin.pin_ad()
+            for pin_ad in pin_ads:
+                pin_ad.print_header(out_header)
+        # provide #define's mapping board to cpu name
+        for named_pin in self.board_pins:
+            print(
+                "#define pyb_pin_{:s} pin_{:s}".format(
+                    named_pin.name(), named_pin.pin().cpu_pin_name()
+                ),
+                file=out_header,
+            )
+
+    def print_ad_hdr(self, out_ad_const):
         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()
+                    print(
+                        "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_INT(GPIO_{:s}) }}, \n".format(
+                            pin_ad.name(), pin_ad.name()
+                        ),
+                        file=out_ad_const,
                     )
-                )
-
-    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-defs",
-        dest="af_defs_filename",
-        help="Specifies the filename for the alternate function defines.",
-        default="build/pins_af_defs.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:])
+    parser = argparse.ArgumentParser(description="Generate board specific pin file")
+    parser.add_argument("--board-csv")
+    parser.add_argument("--af-csv")
+    parser.add_argument("--prefix")
+    parser.add_argument("--output-source")
+    parser.add_argument("--output-header")
+    parser.add_argument("--output-ad-const")
+    args = parser.parse_args()
 
     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_ad_hdr(args.ad_const_filename)
+    with open(args.output_source, "w") as out_source:
+        print("// This file was automatically generated by make-pins.py", file=out_source)
+        print("//", file=out_source)
+        if args.af_csv:
+            print("// --af {:s}".format(args.af_csv), file=out_source)
+            pins.parse_af_file(args.af_csv)
+
+        if args.board_csv:
+            print("// --board {:s}".format(args.board_csv), file=out_source)
+            pins.parse_board_file(args.board_csv)
+
+        if args.prefix:
+            print("// --prefix {:s}".format(args.prefix), file=out_source)
+            print("", file=out_source)
+            with open(args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), file=out_source)
+
+        pins.print(out_source)
+
+    with open(args.output_header, "w") as out_header:
+        pins.print_header(out_header)
+
+    with open(args.output_ad_const, "w") as out_ad_const:
+        pins.print_ad_hdr(out_ad_const)
 
 
 if __name__ == "__main__":
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index f643b66793475..7b715c31faeb7 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -483,7 +483,7 @@ set(GEN_PINS_AF_CONST "${MICROPY_GENHDR_DIR}/pins_af_const.h")
 
 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}")
+    set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
 endif()
 
 target_sources(${MICROPY_TARGET} PRIVATE
@@ -493,8 +493,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
 # Generate pins
 add_custom_command(
     OUTPUT ${GEN_PINS_HDR} ${GEN_PINS_SRC}
-    COMMAND ${Python3_EXECUTABLE} ${GEN_PINS_MKPINS} ${GEN_PINS_CSV_ARG} --af ${GEN_PINS_AF_CSV} --prefix ${GEN_PINS_PREFIX}
-    --hdr ${GEN_PINS_HDR} > ${GEN_PINS_SRC}
+    COMMAND ${Python3_EXECUTABLE} ${GEN_PINS_MKPINS} ${GEN_PINS_CSV_ARG} --af-csv ${GEN_PINS_AF_CSV} --prefix ${GEN_PINS_PREFIX} --output-source ${GEN_PINS_SRC} --output-header ${GEN_PINS_HDR}
     DEPENDS
         ${GEN_PINS_AF_CSV}
         ${GEN_PINS_BOARD_CSV}
diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index 9c66248885c62..4cf73d9900fb1 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -68,16 +68,19 @@ def __init__(self, idx, af_str):
     def is_supported(self):
         return self.supported
 
-    def print(self):
+    def print(self, out_source):
         """Prints the C representation of this AF."""
         if self.supported:
-            print("  AF", end="")
+            print("  AF", end="", file=out_source)
         else:
-            print("  //", end="")
+            print("  //", end="", file=out_source)
         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))
+        print(
+            "({:d}, {:4s}, {:d}), // {:s}".format(self.idx, self.func, fn_num, self.af_str),
+            file=out_source,
+        )
 
 
 class Pin(object):
@@ -116,19 +119,19 @@ def alt_fn_name(self, null_if_0=False):
             return "NULL"
         return "pin_{:s}_af".format(self.cpu_pin_name())
 
-    def print(self):
+    def print(self, out_source):
         if self.is_ext:
-            print("#if (MICROPY_HW_PIN_EXT_COUNT > {:d})".format(self.pin))
+            print("#if (MICROPY_HW_PIN_EXT_COUNT > {:d})".format(self.pin), file=out_source)
 
         if self.alt_fn_count == 0:
-            print("// ", end="")
-        print("const machine_pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()))
+            print("// ", end="", file=out_source)
+        print("const machine_pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()), file=out_source)
         for alt_fn in self.alt_fn:
-            alt_fn.print()
+            alt_fn.print(out_source)
         if self.alt_fn_count == 0:
-            print("// ", end="")
-        print("};")
-        print("")
+            print("// ", end="", file=out_source)
+        print("};", file=out_source)
+        print("", file=out_source)
         print(
             "{:s}machine_pin_obj_t pin_{:s} = PIN({:d}, {:s}, {:d}, {:d}, {:s});".format(
                 "" if self.is_ext else "const ",
@@ -138,19 +141,21 @@ def print(self):
                 self.is_ext,
                 self.alt_fn_count,
                 self.alt_fn_name(null_if_0=True),
-            )
+            ),
+            file=out_source,
         )
         if self.is_ext:
-            print("#endif")
-        print("")
+            print("#endif", file=out_source)
+        print("", file=out_source)
 
-    def print_header(self, hdr_file):
+    def print_header(self, out_header):
         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)
+        print(
+            "extern{:s}machine_pin_obj_t pin_{:s};".format(" " if self.is_ext else " const ", n),
+            file=out_header,
         )
         if self.alt_fn_count > 0:
-            hdr_file.write("extern const machine_pin_af_obj_t pin_{:s}_af[];\n".format(n))
+            print("extern const machine_pin_af_obj_t pin_{:s}_af[];".format(n), file=out_header)
 
 
 class NamedPin(object):
@@ -219,126 +224,107 @@ def parse_board_file(self, filename):
                     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))
+    def print_table(self, label, named_pins, out_source):
+        print("", file=out_source)
+        print(
+            "const machine_pin_obj_t *machine_pin_{:s}_pins[] = {{".format(label), file=out_source
+        )
         for pin in named_pins:
             if not pin.pin().is_ext:
-                print("    &pin_{},".format(pin.name()))
-        print("};")
-        print("")
+                print("    &pin_{},".format(pin.name()), file=out_source)
+        print("};", file=out_source)
+        print("", file=out_source)
 
-    def print_named(self, label, named_pins):
-        print("")
+    def print_named(self, label, named_pins, out_source):
+        print("", file=out_source)
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            file=out_source,
         )
         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("  #if (MICROPY_HW_PIN_EXT_COUNT > {:d})".format(pin.pin), file=out_source)
             print(
                 "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}) }},".format(
                     named_pin.name(), pin.cpu_pin_name()
-                )
+                ),
+                file=out_source,
             )
             if pin.is_ext:
-                print("  #endif")
+                print("  #endif", file=out_source)
 
-        print("};")
+        print("};", file=out_source)
         print(
             "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
                 label, label
-            )
+            ),
+            file=out_source,
         )
-        print("")
+        print("", file=out_source)
 
-    def print(self):
+    def print(self, out_source):
         for pin in self.cpu_pins:
-            pin.pin().print()
+            pin.pin().print(out_source)
 
         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()
-                        )
-                    )
+                pin.pin().print(out_source)
+
+        self.print_table("cpu", self.cpu_pins, out_source)
+        self.print_named("cpu", self.cpu_pins + self.ext_pins, out_source)
+        self.print_named("board", self.board_pins, out_source)
+
+    def print_header(self, out_header):
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            pin.print_header(out_header)
+        for named_pin in self.board_pins:
+            pin = named_pin.pin()
+            if pin.is_ext:
+                pin.print_header(out_header)
+        # provide #define's mapping board to cpu name
+        for named_pin in self.board_pins:
+            if named_pin.pin().is_board_pin():
+                print(
+                    "#define pin_{:s} pin_{:s}".format(
+                        named_pin.name(), named_pin.pin().cpu_pin_name()
+                    ),
+                    file=out_header,
+                )
 
 
 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(
-        "-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(
-        "-r",
-        "--hdr",
-        dest="hdr_filename",
-        help="Specifies name of generated pin header file",
-        default="build/pins.h",
-    )
-    args = parser.parse_args(sys.argv[1:])
+    parser = argparse.ArgumentParser(description="Generate board specific pin file")
+    parser.add_argument("--board-csv")
+    parser.add_argument("--af-csv")
+    parser.add_argument("--prefix")
+    parser.add_argument("--output-source")
+    parser.add_argument("--output-header")
+    args = parser.parse_args()
 
     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)
+    with open(args.output_source, "w") as out_source:
+        print("// This file was automatically generated by make-pins.py", file=out_source)
+        print("//", file=out_source)
+        if args.af_csv:
+            print("// --af {:s}".format(args.af_csv), file=out_source)
+            pins.parse_af_file(args.af_csv, 0, 1)
+
+        if args.board_csv:
+            print("// --board {:s}".format(args.board_csv), file=out_source)
+            pins.parse_board_file(args.board_csv)
+
+        if args.prefix:
+            print("// --prefix {:s}".format(args.prefix), file=out_source)
+            print("", file=out_source)
+            with open(args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), file=out_source)
+        pins.print(out_source)
+
+    with open(args.output_header, "w") as out_header:
+        pins.print_header(out_header)
 
 
 if __name__ == "__main__":
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8d521182ffe7d..edebd2db9d8f0 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -673,10 +673,9 @@ main.c: $(GEN_CDCINF_HEADER)
 # both pins_$(BOARD).c and pins.h
 $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_BUILD)/%_af_defs.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) --hdr-obj-decls \
-		--af-const $(GEN_PINS_AF_CONST) --af-defs $(GEN_PINS_AF_DEFS) \
-		--af-defs-cmp-strings > $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) \
+		--output-af-const $(GEN_PINS_AF_CONST) --output-af-defs $(GEN_PINS_AF_DEFS)
 
 modmachine.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 99b507a3a870a..92e8d7673406a 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -116,7 +116,7 @@ def conditional_var(name_num):
     return var
 
 
-def print_conditional_if(cond_var, file=None):
+def print_conditional_if(cond_var, file):
     if cond_var:
         cond_str = []
         for var in cond_var:
@@ -127,7 +127,7 @@ def print_conditional_if(cond_var, file=None):
         print("#if " + " || ".join(cond_str), file=file)
 
 
-def print_conditional_endif(cond_var, file=None):
+def print_conditional_endif(cond_var, file):
     if cond_var:
         print("#endif", file=file)
 
@@ -169,24 +169,25 @@ def ptr(self):
     def mux_name(self):
         return "AF{:d}_{:s}".format(self.idx, self.ptr())
 
-    def print(self):
+    def print(self, out_source):
         """Prints the C representation of this AF."""
         cond_var = None
         if self.supported:
             cond_var = conditional_var("{}{}".format(self.func, self.fn_num))
-            print_conditional_if(cond_var)
-            print("  AF", end="")
+            print_conditional_if(cond_var, file=out_source)
+            print("  AF", end="", file=out_source)
         else:
-            print("  //", end="")
+            print("  //", end="", file=out_source)
         fn_num = self.fn_num
         if fn_num is None:
             fn_num = 0
         print(
             "({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}".format(
                 self.idx, self.func, fn_num, self.pin_type, self.ptr(), self.af_str
-            )
+            ),
+            file=out_source,
         )
-        print_conditional_endif(cond_var)
+        print_conditional_endif(cond_var, file=out_source)
 
 
 class Pin(object):
@@ -269,16 +270,16 @@ def adc_num_str(self):
             str = "0"
         return str
 
-    def print(self):
+    def print(self, out_source):
         if self.alt_fn_count == 0:
-            print("// ", end="")
-        print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()))
+            print("// ", end="", file=out_source)
+        print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()), file=out_source)
         for alt_fn in self.alt_fn:
-            alt_fn.print()
+            alt_fn.print(out_source)
         if self.alt_fn_count == 0:
-            print("// ", end="")
-        print("};")
-        print("")
+            print("// ", end="", file=out_source)
+        print("};", file=out_source)
+        print("", file=out_source)
         print(
             "const pin_obj_t pin_{:s}_obj = PIN({:s}, {:d}, {:s}, {:s}, {:d});".format(
                 self.cpu_pin_name(),
@@ -287,16 +288,17 @@ def print(self):
                 self.alt_fn_name(null_if_0=True),
                 self.adc_num_str(),
                 self.adc_channel,
-            )
+            ),
+            file=out_source,
         )
-        print("")
+        print("", file=out_source)
 
-    def print_header(self, hdr_file):
+    def print_header(self, out_header):
         n = self.cpu_pin_name()
-        hdr_file.write("extern const pin_obj_t pin_{:s}_obj;\n".format(n))
-        hdr_file.write("#define pin_{:s} (&pin_{:s}_obj)\n".format(n, n))
+        print("extern const pin_obj_t pin_{:s}_obj;".format(n), file=out_header)
+        print("#define pin_{:s} (&pin_{:s}_obj)".format(n, n), file=out_header)
         if self.alt_fn_count > 0:
-            hdr_file.write("extern const pin_af_obj_t pin_{:s}_af[];\n".format(n))
+            print("extern const pin_af_obj_t pin_{:s}_af[];".format(n), file=out_header)
 
 
 class NamedPin(object):
@@ -377,9 +379,10 @@ def parse_board_file(self, filename):
                     if row[0]:  # Only add board pins that have a name
                         self.board_pins.append(NamedPin(row[0], pin))
 
-    def print_named(self, label, named_pins):
+    def print_named(self, label, named_pins, out_source):
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            file=out_source,
         )
         for named_pin in named_pins:
             pin = named_pin.pin()
@@ -387,25 +390,27 @@ def print_named(self, label, named_pins):
                 print(
                     "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}_obj) }},".format(
                         named_pin.name(), pin.cpu_pin_name()
-                    )
+                    ),
+                    file=out_source,
                 )
-        print("};")
+        print("};", file=out_source)
         print(
             "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
                 label, label
-            )
+            ),
+            file=out_source,
         )
 
-    def print(self):
+    def print(self, out_source):
         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)
+                pin.print(out_source)
+        self.print_named("cpu", self.cpu_pins, out_source)
+        print("", file=out_source)
+        self.print_named("board", self.board_pins, out_source)
 
-    def print_adc(self, adc_num):
+    def print_adc(self, adc_num, out_source):
         adc_pins = {}
         for named_pin in self.cpu_pins:
             pin = named_pin.pin()
@@ -421,171 +426,134 @@ def print_adc(self, adc_num):
             # 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))
+        print("", file=out_source)
+        print(
+            "const pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(adc_num, table_size),
+            file=out_source,
+        )
         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("};")
+            print("  [{:d}] = {},".format(channel, obj), file=out_source)
+        print("};", file=out_source)
 
-    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()
-                    if pin.is_board_pin():
-                        pin.print_header(hdr_file)
-                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(
-                    "#define pyb_pin_{:s} pin_{:s}\n".format(
-                        named_pin.name(), named_pin.pin().cpu_pin_name()
-                    )
-                )
-
-    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
+    def print_header(self, out_header, obj_decls):
+        if obj_decls:
             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):
-                af_words = mux_name.split("_")  # ex mux_name: AF9_I2C2
-                cond_var = conditional_var(af_words[1])
-                print_conditional_if(cond_var, file=af_const_file)
-                key = "MP_ROM_QSTR(MP_QSTR_{}),".format(mux_name)
-                val = "MP_ROM_INT(GPIO_{})".format(mux_name)
-                print("    { %-*s %s }," % (mux_name_width + 26, key, val), file=af_const_file)
-                print_conditional_endif(cond_var, file=af_const_file)
-
-    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:
-                    func = "%s%d" % (af.func, af.fn_num) if af.fn_num else af.func
-                    pin_type = (af.pin_type or "NULL").split("(")[0]
-                    tok = "#define STATIC_AF_%s_%s(pin_obj) ( \\" % (func, pin_type)
-                    if tok not in STATIC_AF_TOKENS:
-                        STATIC_AF_TOKENS[tok] = []
-                    if cmp_strings:
-                        pin_name = named_pin.pin().cpu_pin_name()
-                        cmp_str = (
-                            '    ((strcmp( #pin_obj , "(&pin_%s_obj)") '
-                            ' & strcmp( #pin_obj , "((&pin_%s_obj))")) == 0) ? (%d) : \\'
-                            % (pin_name, pin_name, af.idx)
-                        )
-                    else:
-                        cmp_str = "    ((pin_obj) == (pin_%s)) ? (%d) : \\" % (
-                            named_pin.pin().cpu_pin_name(),
-                            af.idx,
-                        )
-                    STATIC_AF_TOKENS[tok].append(cmp_str)
-
-            for tok, pins in STATIC_AF_TOKENS.items():
-                print(tok, file=af_defs_file)
-                print("\n".join(sorted(pins)), file=af_defs_file)
-                print("    (0xffffffffffffffffULL))\n", file=af_defs_file)
+                    pin.print_header(out_header)
+            for adc_num, table_size in self.adc_table_size.items():
+                print(
+                    "extern const pin_obj_t * const pin_adc{:d}[{:d}];".format(
+                        adc_num, table_size
+                    ),
+                    file=out_header,
+                )
+        # provide #define's mapping board to cpu name
+        for named_pin in self.board_pins:
+            print(
+                "#define pyb_pin_{:s} pin_{:s}".format(
+                    named_pin.name(), named_pin.pin().cpu_pin_name()
+                ),
+                file=out_header,
+            )
+
+    def print_af_hdr(self, out_af_const):
+        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):
+            af_words = mux_name.split("_")  # ex mux_name: AF9_I2C2
+            cond_var = conditional_var(af_words[1])
+            print_conditional_if(cond_var, file=out_af_const)
+            key = "MP_ROM_QSTR(MP_QSTR_{}),".format(mux_name)
+            val = "MP_ROM_INT(GPIO_{})".format(mux_name)
+            print("    { %-*s %s }," % (mux_name_width + 26, key, val), file=out_af_const)
+            print_conditional_endif(cond_var, file=out_af_const)
+
+    def print_af_defs(self, out_af_defs, cmp_strings):
+        STATIC_AF_TOKENS = {}
+        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]
+                tok = "#define STATIC_AF_%s_%s(pin_obj) ( \\" % (func, pin_type)
+                if tok not in STATIC_AF_TOKENS:
+                    STATIC_AF_TOKENS[tok] = []
+                if cmp_strings:
+                    pin_name = named_pin.pin().cpu_pin_name()
+                    cmp_str = (
+                        '    ((strcmp( #pin_obj , "(&pin_%s_obj)") '
+                        ' & strcmp( #pin_obj , "((&pin_%s_obj))")) == 0) ? (%d) : \\'
+                        % (pin_name, pin_name, af.idx)
+                    )
+                else:
+                    cmp_str = "    ((pin_obj) == (pin_%s)) ? (%d) : \\" % (
+                        named_pin.pin().cpu_pin_name(),
+                        af.idx,
+                    )
+                STATIC_AF_TOKENS[tok].append(cmp_str)
+
+        for tok, pins in STATIC_AF_TOKENS.items():
+            print(tok, file=out_af_defs)
+            print("\n".join(sorted(pins)), file=out_af_defs)
+            print("    (0xffffffffffffffffULL))\n", file=out_af_defs)
 
 
 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="stm32f4xx_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-defs",
-        dest="af_defs_filename",
-        help="Specifies the filename for the alternate function defines.",
-        default="build/pins_af_defs.h",
-    )
-    parser.add_argument(
-        "--af-defs-cmp-strings",
-        dest="af_defs_cmp_strings",
-        help="Whether to compare pin name strings for the alternate function defines instead of object values",
-        action="store_true",
-    )
-    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="stm32f4xx_prefix.c",
-    )
-    parser.add_argument(
-        "-r",
-        "--hdr",
-        dest="hdr_filename",
-        help="Specifies name of generated pin header file",
-        default="build/pins.h",
-    )
-    parser.add_argument(
-        "--hdr-obj-decls",
-        dest="hdr_obj_decls",
-        help="Whether to include declarations for pin objects in pin header file",
-        action="store_true",
-    )
-    args = parser.parse_args(sys.argv[1:])
+    parser = argparse.ArgumentParser(description="Generate board specific pin file")
+    parser.add_argument("--board-csv")
+    parser.add_argument("--af-csv")
+    parser.add_argument("--prefix")
+    parser.add_argument("--output-source")
+    parser.add_argument("--output-header")
+    parser.add_argument("--output-af-const")
+    parser.add_argument("--output-af-defs")
+    parser.add_argument("--mboot-mode", action="store_true")
+    args = parser.parse_args()
 
     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, 1, 2)
-
-    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()
-    for i in range(1, 4):
-        pins.print_adc(i)
-    pins.print_header(args.hdr_filename, args.hdr_obj_decls)
-    pins.print_af_hdr(args.af_const_filename)
-    pins.print_af_defs(args.af_defs_filename, args.af_defs_cmp_strings)
+    with open(args.output_source, "w") as out_source:
+        print("// This file was automatically generated by make-pins.py", file=out_source)
+        print("//", file=out_source)
+        if args.af_csv:
+            print("// --af {:s}".format(args.af_csv), file=out_source)
+            pins.parse_af_file(args.af_csv, 1, 2)
+
+        if args.board_csv:
+            print("// --board {:s}".format(args.board_csv), file=out_source)
+            pins.parse_board_file(args.board_csv)
+
+        if args.prefix:
+            print("// --prefix {:s}".format(args.prefix), file=out_source)
+            print("", file=out_source)
+            with open(args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), file=out_source)
+
+        pins.print(out_source)
+        for i in range(1, 4):
+            pins.print_adc(i, out_source)
+
+    with open(args.output_header, "w") as out_header:
+        pins.print_header(out_header, not args.mboot_mode)
+
+    with open(args.output_af_const, "w") as out_af_const:
+        pins.print_af_hdr(out_af_const)
+
+    with open(args.output_af_defs, "w") as out_af_defs:
+        pins.print_af_defs(out_af_defs, not args.mboot_mode)
 
 
 if __name__ == "__main__":
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index fab8ce2159012..7be5cca69d7ad 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -243,10 +243,10 @@ $(GEN_ROOT_POINTERS): | $(HEADER_BUILD)
 
 $(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) \
-		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) \
-		--af-const $(GEN_PINS_AF_CONST) --af-defs $(GEN_PINS_AF_DEFS) \
-		> $(GEN_PINS_SRC)
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv ../$(AF_FILE) --prefix $(PREFIX_FILE) \
+		--output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) \
+		--output-af-const $(GEN_PINS_AF_CONST) --output-af-defs $(GEN_PINS_AF_DEFS) \
+		--mboot-mode
 
 #########################################
 

From b0aec6a0ff71e6dc02495756c881593bc1bc90dc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 7 Aug 2023 15:52:39 +1000
Subject: [PATCH 0510/3129] esp32/machine_pin: Make irq object a sub-field of
 pin object.

This simplifies pin generation.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/make-pins.py | 13 +++--
 ports/esp32/machine_pin.c       | 87 ++++++++++++++++++---------------
 ports/esp32/machine_pin.h       | 10 ++--
 3 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/ports/esp32/boards/make-pins.py b/ports/esp32/boards/make-pins.py
index 4813724dd6d88..2054274690f59 100755
--- a/ports/esp32/boards/make-pins.py
+++ b/ports/esp32/boards/make-pins.py
@@ -78,17 +78,17 @@ def parse_board_file(self, filename):
                 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, out_source):
+    def print_cpu_table(self, out_source):
         print("", file=out_source)
         print(
-            "const machine_{}_obj_t machine_{}_obj_table[GPIO_NUM_MAX] = {{".format(label, label),
+            "const machine_pin_obj_t machine_pin_obj_table[GPIO_NUM_MAX] = {",
             file=out_source,
         )
-        for pin in named_pins:
+        for pin in self.cpu_pins:
             print("    #if MICROPY_HW_ENABLE_{}".format(pin.name()), file=out_source)
             print(
-                "    [GPIO_NUM_{}] = {{ .base = {{ .type = &machine_{}_type }} }},".format(
-                    pin.pin().pin, label
+                "    [GPIO_NUM_{}] = {{ .base = {{ .type = &machine_pin_type }}, .irq = {{ .base = {{ .type = &machine_pin_irq_type }} }} }},".format(
+                    pin.pin().pin,
                 ),
                 file=out_source,
             )
@@ -121,8 +121,7 @@ def print_named(self, label, named_pins, out_source):
         )
 
     def print_tables(self, out_source):
-        self.print_table("pin", self.cpu_pins, out_source)
-        self.print_table("pin_irq", self.cpu_pins, out_source)
+        self.print_cpu_table(out_source)
         self.print_named("board", self.board_pins, out_source)
 
     def print_header(self, out_header):
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index d521e08e5141d..34c6512c8da79 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -58,9 +58,10 @@
 #define GPIO_FIRST_NON_OUTPUT (46)
 #endif
 
-// Return the gpio_num_t index for a given pin or pin-irq object.
-#define PIN_OBJ_INDEX(self) ((self) - &machine_pin_obj_table[0])
-#define PIN_IRQ_OBJ_INDEX(self) ((self) - &machine_pin_irq_obj_table[0])
+// Return the gpio_num_t index for a given machine_pin_obj_t pointer.
+#define PIN_OBJ_PTR_INDEX(self) ((self) - &machine_pin_obj_table[0])
+// Return the machine_pin_obj_t pointer corresponding to a machine_pin_irq_obj_t pointer.
+#define PIN_OBJ_PTR_FROM_IRQ_OBJ_PTR(self) ((machine_pin_obj_t *)((uintptr_t)(self) - offsetof(machine_pin_obj_t, irq)))
 
 STATIC 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;
@@ -90,7 +91,7 @@ void machine_pins_deinit(void) {
 
 STATIC void machine_pin_isr_handler(void *arg) {
     machine_pin_obj_t *self = arg;
-    mp_obj_t handler = MP_STATE_PORT(machine_pin_irq_handler)[PIN_OBJ_INDEX(self)];
+    mp_obj_t handler = MP_STATE_PORT(machine_pin_irq_handler)[PIN_OBJ_PTR_INDEX(self)];
     mp_sched_schedule(handler, MP_OBJ_FROM_PTR(self));
     mp_hal_wake_main_task_from_isr();
 }
@@ -124,12 +125,12 @@ STATIC const machine_pin_obj_t *machine_pin_find(mp_obj_t pin_in) {
 
 gpio_num_t machine_pin_get_id(mp_obj_t pin_in) {
     const machine_pin_obj_t *self = machine_pin_find(pin_in);
-    return PIN_OBJ_INDEX(self);
+    return PIN_OBJ_PTR_INDEX(self);
 }
 
 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)", PIN_OBJ_INDEX(self));
+    mp_printf(print, "Pin(%u)", PIN_OBJ_PTR_INDEX(self));
 }
 
 // pin.init(mode=None, pull=-1, *, value, drive, hold)
@@ -147,34 +148,36 @@ 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);
 
+    gpio_num_t index = PIN_OBJ_PTR_INDEX(self);
+
     // 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(PIN_OBJ_INDEX(self))) {
+        if (rtc_gpio_is_valid_gpio(index)) {
             #if !CONFIG_IDF_TARGET_ESP32C3
-            rtc_gpio_deinit(PIN_OBJ_INDEX(self));
+            rtc_gpio_deinit(index);
             #endif
         }
     }
 
     #if CONFIG_IDF_TARGET_ESP32C3
-    if (PIN_OBJ_INDEX(self) == 18 || PIN_OBJ_INDEX(self) == 19) {
+    if (index == 18 || index == 19) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
 
     // configure the pin for gpio
-    esp_rom_gpio_pad_select_gpio(PIN_OBJ_INDEX(self));
+    esp_rom_gpio_pad_select_gpio(index);
 
     // set initial value (do this before configuring mode/pull)
     if (args[ARG_value].u_obj != MP_OBJ_NULL) {
-        gpio_set_level(PIN_OBJ_INDEX(self), mp_obj_is_true(args[ARG_value].u_obj));
+        gpio_set_level(index, 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(PIN_OBJ_INDEX(self))) {
+    if (args[ARG_drive].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(index)) {
         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(PIN_OBJ_INDEX(self), strength);
+            gpio_set_drive_capability(index, strength);
         }
     }
 
@@ -182,11 +185,11 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     if (args[ARG_mode].u_obj != mp_const_none) {
         mp_int_t pin_io_mode = mp_obj_get_int(args[ARG_mode].u_obj);
         #ifdef GPIO_FIRST_NON_OUTPUT
-        if (PIN_OBJ_INDEX(self) >= GPIO_FIRST_NON_OUTPUT && (pin_io_mode & GPIO_MODE_DEF_OUTPUT)) {
+        if (index >= GPIO_FIRST_NON_OUTPUT && (pin_io_mode & GPIO_MODE_DEF_OUTPUT)) {
             mp_raise_ValueError(MP_ERROR_TEXT("pin can only be input"));
         }
         #endif
-        gpio_set_direction(PIN_OBJ_INDEX(self), pin_io_mode);
+        gpio_set_direction(index, pin_io_mode);
     }
 
     // configure pull
@@ -196,24 +199,24 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
             mode = mp_obj_get_int(args[ARG_pull].u_obj);
         }
         if (mode & GPIO_PULL_DOWN) {
-            gpio_pulldown_en(PIN_OBJ_INDEX(self));
+            gpio_pulldown_en(index);
         } else {
-            gpio_pulldown_dis(PIN_OBJ_INDEX(self));
+            gpio_pulldown_dis(index);
         }
         if (mode & GPIO_PULL_UP) {
-            gpio_pullup_en(PIN_OBJ_INDEX(self));
+            gpio_pullup_en(index);
         } else {
-            gpio_pullup_dis(PIN_OBJ_INDEX(self));
+            gpio_pullup_dis(index);
         }
     }
 
     // configure pad hold
-    if (args[ARG_hold].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(PIN_OBJ_INDEX(self))) {
+    if (args[ARG_hold].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(index)) {
         // always disable pad hold to apply outstanding config changes
-        gpio_hold_dis(PIN_OBJ_INDEX(self));
+        gpio_hold_dis(index);
         // (re-)enable pad hold if requested
         if (mp_obj_is_true(args[ARG_hold].u_obj)) {
-            gpio_hold_en(PIN_OBJ_INDEX(self));
+            gpio_hold_en(index);
         }
     }
 
@@ -241,12 +244,13 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
 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_num_t index = PIN_OBJ_PTR_INDEX(self);
     if (n_args == 0) {
         // get pin
-        return MP_OBJ_NEW_SMALL_INT(gpio_get_level(PIN_OBJ_INDEX(self)));
+        return MP_OBJ_NEW_SMALL_INT(gpio_get_level(index));
     } else {
         // set pin
-        gpio_set_level(PIN_OBJ_INDEX(self), mp_obj_is_true(args[0]));
+        gpio_set_level(index, mp_obj_is_true(args[0]));
         return mp_const_none;
     }
 }
@@ -266,7 +270,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_
 // pin.off()
 STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_level(PIN_OBJ_INDEX(self), 0);
+    gpio_set_level(PIN_OBJ_PTR_INDEX(self), 0);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
@@ -274,7 +278,7 @@ 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 = MP_OBJ_TO_PTR(self_in);
-    gpio_set_level(PIN_OBJ_INDEX(self), 1);
+    gpio_set_level(PIN_OBJ_PTR_INDEX(self), 1);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
@@ -293,6 +297,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) {
         // configure irq
+        gpio_num_t index = PIN_OBJ_PTR_INDEX(self);
         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;
@@ -311,20 +316,20 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
                 mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
             }
 
-            if (!RTC_IS_VALID_EXT_PIN(PIN_OBJ_INDEX(self))) {
+            if (!RTC_IS_VALID_EXT_PIN(index)) {
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid pin for wake"));
             }
 
             if (machine_rtc_config.ext0_pin == -1) {
-                machine_rtc_config.ext0_pin = PIN_OBJ_INDEX(self);
-            } else if (machine_rtc_config.ext0_pin != PIN_OBJ_INDEX(self)) {
+                machine_rtc_config.ext0_pin = index;
+            } else if (machine_rtc_config.ext0_pin != index) {
                 mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
             }
 
             machine_rtc_config.ext0_level = trigger == GPIO_INTR_LOW_LEVEL ? 0 : 1;
             machine_rtc_config.ext0_wake_types = wake;
         } else {
-            if (machine_rtc_config.ext0_pin == PIN_OBJ_INDEX(self)) {
+            if (machine_rtc_config.ext0_pin == index) {
                 machine_rtc_config.ext0_pin = -1;
             }
 
@@ -332,15 +337,15 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
                 handler = MP_OBJ_NULL;
                 trigger = 0;
             }
-            gpio_isr_handler_remove(PIN_OBJ_INDEX(self));
-            MP_STATE_PORT(machine_pin_irq_handler)[PIN_OBJ_INDEX(self)] = handler;
-            gpio_set_intr_type(PIN_OBJ_INDEX(self), trigger);
-            gpio_isr_handler_add(PIN_OBJ_INDEX(self), machine_pin_isr_handler, (void *)self);
+            gpio_isr_handler_remove(index);
+            MP_STATE_PORT(machine_pin_irq_handler)[index] = handler;
+            gpio_set_intr_type(index, trigger);
+            gpio_isr_handler_add(index, machine_pin_isr_handler, (void *)self);
         }
     }
 
     // return the irq object
-    return MP_OBJ_FROM_PTR(&machine_pin_irq_obj_table[PIN_OBJ_INDEX(self)]);
+    return MP_OBJ_FROM_PTR(&self->irq);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
 
@@ -381,13 +386,14 @@ 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;
+    gpio_num_t index = PIN_OBJ_PTR_INDEX(self);
 
     switch (request) {
         case MP_PIN_READ: {
-            return gpio_get_level(PIN_OBJ_INDEX(self));
+            return gpio_get_level(index);
         }
         case MP_PIN_WRITE: {
-            gpio_set_level(PIN_OBJ_INDEX(self), arg);
+            gpio_set_level(index, arg);
             return 0;
         }
     }
@@ -417,16 +423,17 @@ MP_DEFINE_CONST_OBJ_TYPE(
 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_table[PIN_IRQ_OBJ_INDEX(self)]);
+    machine_pin_isr_handler((void *)PIN_OBJ_PTR_FROM_IRQ_OBJ_PTR(self));
     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[PIN_IRQ_OBJ_INDEX(self)].int_type;
+    gpio_num_t index = PIN_OBJ_PTR_INDEX(PIN_OBJ_PTR_FROM_IRQ_OBJ_PTR(self));
+    uint32_t orig_trig = GPIO.pin[index].int_type;
     if (n_args == 2) {
         // set trigger
-        gpio_set_intr_type(PIN_IRQ_OBJ_INDEX(self), mp_obj_get_int(args[1]));
+        gpio_set_intr_type(index, mp_obj_get_int(args[1]));
     }
     // return original trigger value
     return MP_OBJ_NEW_SMALL_INT(orig_trig);
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
index dbbaac2219be9..53f9c6bdad7cd 100644
--- a/ports/esp32/machine_pin.h
+++ b/ports/esp32/machine_pin.h
@@ -146,18 +146,18 @@
 
 #endif
 
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-} machine_pin_obj_t;
-
 typedef struct _machine_pin_irq_obj_t {
     mp_obj_base_t base;
 } machine_pin_irq_obj_t;
 
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    machine_pin_irq_obj_t irq;
+} machine_pin_obj_t;
+
 extern const mp_obj_type_t machine_pin_irq_type;
 
 extern const machine_pin_obj_t machine_pin_obj_table[GPIO_NUM_MAX];
-extern const machine_pin_irq_obj_t machine_pin_irq_obj_table[GPIO_NUM_MAX];
 
 extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
 

From 4bd6ec9ae40770c337b470293da078cc09ade0d5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 7 Aug 2023 17:08:10 +1000
Subject: [PATCH 0511/3129] tools/boardgen.py: Add initial implementation of a
 common make-pins.py.

For now, this implements the functionality required for esp32 and rp2,
including support for numeric pins, rp2 alternate functions, and rp2
extended pins.

This also updates the rp2 port to use the same structure for pins.h and
pins.csv as for esp32, and moves the pin definitions directly into the
table (rather than having a table of pointers), which is a small code size
improvement.

Support for "hidden" pins in pins.csv is added (matching the stm32
implementation).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/make-pins.py | 203 +++----------
 ports/rp2/CMakeLists.txt        |   1 -
 ports/rp2/boards/make-pins.py   | 414 +++++++-------------------
 ports/rp2/machine_pin.c         |  18 +-
 ports/rp2/machine_pin.h         |   4 +-
 tools/boardgen.py               | 506 ++++++++++++++++++++++++++++++++
 6 files changed, 669 insertions(+), 477 deletions(-)
 create mode 100644 tools/boardgen.py

diff --git a/ports/esp32/boards/make-pins.py b/ports/esp32/boards/make-pins.py
index 2054274690f59..49b10f0ce15c9 100755
--- a/ports/esp32/boards/make-pins.py
+++ b/ports/esp32/boards/make-pins.py
@@ -1,182 +1,67 @@
 #!/usr/bin/env python
 
-import argparse
+import os
 import sys
-import csv
-import re
 
-MAX_CPU_PINS = 49
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../tools"))
+import boardgen
 
 
-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 characters.")
-    if not name_str.startswith("GPIO"):
-        raise ValueError("Expecting pin name to start with GPIO")
-    return int(re.findall(r"\d+$", name_str)[0])
+# Pins start at zero, and the highest pin index on any ESP32* chip is 48.
+NUM_GPIOS = 49
 
 
-class Pin:
-    def __init__(self, pin):
-        self.pin = pin
-        self.is_board = False
+class Esp32Pin(boardgen.Pin):
+    # Required by NumericPinGenerator.
+    def index(self):
+        return int(self._cpu_pin_name[4:])
 
-    def cpu_pin_name(self):
-        return "GPIO{:d}".format(self.pin)
+    # The IDF provides `GPIO_NUM_x = x` as an enum.
+    def index_name(self):
+        return "GPIO_NUM_{:d}".format(self.index())
 
-    def is_board_pin(self):
-        return self.is_board
+    # Emit the combined struct which contains both the pin and irq instances.
+    def definition(self):
+        return "{ .base = { .type = &machine_pin_type }, .irq = { .base = { .type = &machine_pin_irq_type } } }"
 
-    def set_is_board_pin(self):
-        self.is_board = True
+    # This script isn't family-aware, so we always emit the maximum number of
+    # pins and rely on the `MICROPY_HW_ENABLE_GPIOn` macros defined in
+    # machine_pin.h to figure out which ones are actually available.
+    def enable_macro(self):
+        return "MICROPY_HW_ENABLE_{}".format(self._cpu_pin_name)
 
+    # ESP32 cpu names must be "GPIOn".
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
 
-class NamedPin:
-    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:
-    def __init__(self):
-        self.cpu_pins = []  # list of NamedPin objects
-        self.board_pins = []  # list of NamedPin objects
-
-    def find_pin(self, pin_name):
-        for pin in self.cpu_pins:
-            if pin.name() == pin_name:
-                return pin.pin()
-
-    def create_pins(self):
-        for pin_num in range(MAX_CPU_PINS):
-            pin = Pin(pin_num)
-            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]
-                parse_pin(cpu_pin_name)
-                pin = self.find_pin(cpu_pin_name)
-                if not pin:
-                    raise ValueError("Unknown pin {}".format(cpu_pin_name))
-                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_cpu_table(self, out_source):
-        print("", file=out_source)
-        print(
-            "const machine_pin_obj_t machine_pin_obj_table[GPIO_NUM_MAX] = {",
-            file=out_source,
-        )
-        for pin in self.cpu_pins:
-            print("    #if MICROPY_HW_ENABLE_{}".format(pin.name()), file=out_source)
-            print(
-                "    [GPIO_NUM_{}] = {{ .base = {{ .type = &machine_pin_type }}, .irq = {{ .base = {{ .type = &machine_pin_irq_type }} }} }},".format(
-                    pin.pin().pin,
-                ),
-                file=out_source,
-            )
-            print("    #endif", file=out_source)
-        print("};", file=out_source)
-
-    def print_named(self, label, named_pins, out_source):
-        print("", file=out_source)
-        print(
-            "STATIC const mp_rom_map_elem_t machine_pin_{:s}_pins_locals_dict_table[] = {{".format(
-                label
-            ),
-            file=out_source,
-        )
-        for named_pin in named_pins:
-            pin = named_pin.pin()
-            print(
-                "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}) }},".format(
-                    named_pin.name(), pin.cpu_pin_name()
-                ),
-                file=out_source,
+        if not cpu_pin_name.startswith("GPIO") or not cpu_pin_name[4:].isnumeric():
+            raise boardgen.PinGeneratorError(
+                "Invalid cpu pin name '{}', must be 'GPIOn'".format(cpu_pin_name)
             )
 
-        print("};", file=out_source)
-        print(
-            "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, machine_pin_{:s}_pins_locals_dict_table);".format(
-                label, label
-            ),
-            file=out_source,
-        )
-
-    def print_tables(self, out_source):
-        self.print_cpu_table(out_source)
-        self.print_named("board", self.board_pins, out_source)
-
-    def print_header(self, out_header):
-        # Provide #defines for each cpu pin.
-        for named_pin in self.cpu_pins:
-            pin = named_pin.pin()
-            n = pin.cpu_pin_name()
-            print("#if MICROPY_HW_ENABLE_{}".format(n), file=out_header)
-            print(
-                "#define pin_{:s} (machine_pin_obj_table[{}])".format(n, pin.pin),
-                file=out_header,
-            )
-            print("#endif", file=out_header)
-
-        # Provide #define's mapping board to cpu name.
-        for named_pin in self.board_pins:
-            if named_pin.pin().is_board_pin():
-                print(
-                    "#define pin_{:s} pin_{:s}".format(
-                        named_pin.name(), named_pin.pin().cpu_pin_name()
-                    ),
-                    file=out_header,
-                )
-
+        if not (0 <= int(cpu_pin_name[4:]) < NUM_GPIOS):
+            raise boardgen.PinGeneratorError("Unknown cpu pin '{}'".format(cpu_pin_name))
 
-def main():
-    parser = argparse.ArgumentParser(description="Generate board specific pin file")
-    parser.add_argument("--board-csv")
-    parser.add_argument("--prefix")
-    parser.add_argument("--output-source")
-    parser.add_argument("--output-header")
-    args = parser.parse_args()
 
-    pins = Pins()
-    pins.create_pins()
-
-    with open(args.output_source, "w") as out_source:
-        print("// This file was automatically generated by make-pins.py", file=out_source)
-        print("//", file=out_source)
-
-        if args.board_csv:
-            print("// --board-csv {:s}".format(args.board_csv), file=out_source)
-            pins.parse_board_file(args.board_csv)
+class Esp32PinGenerator(boardgen.NumericPinGenerator):
+    def __init__(self):
+        # Use custom pin type above.
+        super().__init__(pin_type=Esp32Pin)
 
-        if args.prefix:
-            print("// --prefix {:s}".format(args.prefix), file=out_source)
-            print("", file=out_source)
-            with open(args.prefix, "r") as prefix_file:
-                print(prefix_file.read(), end="", file=out_source)
+        # Pre-define the pins (i.e. don't require them to be listed in pins.csv).
+        for i in range(NUM_GPIOS):
+            self.add_cpu_pin("GPIO{}".format(i))
 
-        pins.print_tables(out_source)
+    # Only use pre-defined cpu pins (do not let board.csv create them).
+    def find_pin_by_cpu_pin_name(self, cpu_pin_name, create=True):
+        return super().find_pin_by_cpu_pin_name(cpu_pin_name, create=False)
 
-    with open(args.output_header, "w") as out_header:
-        pins.print_header(out_header)
+    # This is provided by the IDF and is one more than the highest available
+    # GPIO num.
+    def cpu_table_size(self):
+        return "GPIO_NUM_MAX"
 
 
 if __name__ == "__main__":
-    main()
+    Esp32PinGenerator().main()
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 7b715c31faeb7..4f76c5864fc2a 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -479,7 +479,6 @@ 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_AF_CONST "${MICROPY_GENHDR_DIR}/pins_af_const.h")
 
 if(EXISTS "${MICROPY_BOARDS_DIR}/${MICROPY_BOARD}/pins.csv")
     set(GEN_PINS_BOARD_CSV "${MICROPY_BOARDS_DIR}/${MICROPY_BOARD}/pins.csv")
diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index 4cf73d9900fb1..cbc3424705def 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -1,331 +1,133 @@
 #!/usr/bin/env python
 """Creates the pin file for the RP2."""
 
-from __future__ import print_function
-
-import argparse
-import sys
-import csv
+import os
 import re
+import sys
 
-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 characters.")
-    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
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../tools"))
+import boardgen
 
-        self.func = ""
-        self.fn_num = None
-        self.pin_type = ""
-        self.supported = False
+# This is NUM_BANK0_GPIOS. Pin indices are 0 to 29 (inclusive).
+NUM_GPIOS = 30
+# Up to 10 additional extended pins (e.g. via the wifi chip).
+NUM_EXT_GPIOS = 10
 
-        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
+class Rp2Pin(boardgen.Pin):
+    def __init__(self, cpu_pin_name):
+        super().__init__(cpu_pin_name)
+        self._afs = []
 
-    def print(self, out_source):
-        """Prints the C representation of this AF."""
-        if self.supported:
-            print("  AF", end="", file=out_source)
+        if self.name().startswith("EXT_"):
+            self._index = None
+            self._ext_index = int(self.name()[8:])  # "EXT_GPIOn"
         else:
-            print("  //", end="", file=out_source)
-        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),
-            file=out_source,
-        )
-
-
-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, out_source):
-        if self.is_ext:
-            print("#if (MICROPY_HW_PIN_EXT_COUNT > {:d})".format(self.pin), file=out_source)
-
-        if self.alt_fn_count == 0:
-            print("// ", end="", file=out_source)
-        print("const machine_pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()), file=out_source)
-        for alt_fn in self.alt_fn:
-            alt_fn.print(out_source)
-        if self.alt_fn_count == 0:
-            print("// ", end="", file=out_source)
-        print("};", file=out_source)
-        print("", file=out_source)
-        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),
-            ),
-            file=out_source,
-        )
-        if self.is_ext:
-            print("#endif", file=out_source)
-        print("", file=out_source)
-
-    def print_header(self, out_header):
-        n = self.cpu_pin_name()
-        print(
-            "extern{:s}machine_pin_obj_t pin_{:s};".format(" " if self.is_ext else " const ", n),
-            file=out_header,
-        )
-        if self.alt_fn_count > 0:
-            print("extern const machine_pin_af_obj_t pin_{:s}_af[];".format(n), file=out_header)
-
-
-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:
-                    # 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:
-                    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, out_source):
-        print("", file=out_source)
-        print(
-            "const machine_pin_obj_t *machine_pin_{:s}_pins[] = {{".format(label), file=out_source
-        )
-        for pin in named_pins:
-            if not pin.pin().is_ext:
-                print("    &pin_{},".format(pin.name()), file=out_source)
-        print("};", file=out_source)
-        print("", file=out_source)
+            self._index = int(self.name()[4:])  # "GPIOn"
+            self._ext_index = None
+
+    # Required by NumericPinGenerator.
+    def index(self):
+        return self._index
+
+    # Use the PIN() macro defined in rp2_prefix.c for defining the pin
+    # objects.
+    def definition(self):
+        if self._index is not None:
+            return "PIN({:d}, GPIO{:d}, 0, {:d}, pin_GPIO{:d}_af)".format(
+                self._index, self._index, len(self._afs), self.index()
+            )
+        else:
+            return "PIN({:d}, EXT_GPIO{:d}, 1, 0, NULL)".format(self._ext_index, self._ext_index)
+
+    # External pins need to be mutable (because they track the output state).
+    def is_const(self):
+        return self._index is not None
+
+    # Add conditional macros only around the external pins based on how many
+    # are enabled.
+    def enable_macro(self):
+        if self._ext_index is not None:
+            return "(MICROPY_HW_PIN_EXT_COUNT > {:d})".format(self._ext_index)
+
+    def add_af(self, af_idx, _af_name, af):
+        if self._index is None:
+            raise boardgen.PinGeneratorError(
+                "Cannot add AF for ext pin '{:s}'".format(self.name())
+            )
 
-    def print_named(self, label, named_pins, out_source):
-        print("", file=out_source)
-        print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
-            file=out_source,
-        )
-        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), file=out_source)
+        # <af><unit>_<pin>
+        m = re.match("([A-Z][A-Z0-9][A-Z]+)(([0-9]+)(_.*)?)?", af)
+        af_fn = m.group(1)
+        af_unit = int(m.group(3)) if m.group(3) is not None else 0
+        if af_fn == "PIO":
+            # Pins can be either PIO unit (unlike, say, I2C where a
+            # pin can only be I2C0 _or_ I2C1, both sharing the same AF
+            # index), so each PIO unit has a distinct AF index.
+            af_fn = "{:s}{:d}".format(af_fn, af_unit)
+        self._afs.append((af_idx + 1, af_fn, af_unit, af))
+
+    # This will be called at the start of the output (after the prefix). Use
+    # it to emit the af objects (via the AF() macro in rp2_prefix.c).
+    def print_source(self, out_source):
+        if self._index is not None:
             print(
-                "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}) }},".format(
-                    named_pin.name(), pin.cpu_pin_name()
-                ),
+                "const machine_pin_af_obj_t pin_GPIO{:d}_af[] = {{".format(self.index()),
                 file=out_source,
             )
-            if pin.is_ext:
-                print("  #endif", file=out_source)
-
-        print("};", file=out_source)
-        print(
-            "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
-                label, label
-            ),
-            file=out_source,
-        )
-        print("", file=out_source)
-
-    def print(self, out_source):
-        for pin in self.cpu_pins:
-            pin.pin().print(out_source)
-
-        for pin in self.ext_pins:
-            if pin.pin().is_ext:
-                pin.pin().print(out_source)
-
-        self.print_table("cpu", self.cpu_pins, out_source)
-        self.print_named("cpu", self.cpu_pins + self.ext_pins, out_source)
-        self.print_named("board", self.board_pins, out_source)
-
-    def print_header(self, out_header):
-        for named_pin in self.cpu_pins:
-            pin = named_pin.pin()
-            pin.print_header(out_header)
-        for named_pin in self.board_pins:
-            pin = named_pin.pin()
-            if pin.is_ext:
-                pin.print_header(out_header)
-        # provide #define's mapping board to cpu name
-        for named_pin in self.board_pins:
-            if named_pin.pin().is_board_pin():
+            for af_idx, af_fn, af_unit, af in self._afs:
                 print(
-                    "#define pin_{:s} pin_{:s}".format(
-                        named_pin.name(), named_pin.pin().cpu_pin_name()
-                    ),
-                    file=out_header,
+                    "    AF({:d}, {:4s}, {:d}), // {:s}".format(af_idx, af_fn, af_unit, af),
+                    file=out_source,
                 )
+            print("};", file=out_source)
+            print(file=out_source)
+
+    # rp2 cpu names must be "GPIOn" or "EXT_GPIOn".
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
+
+        if cpu_pin_name.startswith("GPIO") and cpu_pin_name[4:].isnumeric():
+            if not (0 <= int(cpu_pin_name[4:]) < NUM_GPIOS):
+                raise boardgen.PinGeneratorError("Unknown cpu pin '{}'".format(cpu_pin_name))
+        elif cpu_pin_name.startswith("EXT_GPIO") and cpu_pin_name[8:].isnumeric():
+            if not (0 <= int(cpu_pin_name[8:]) < NUM_EXT_GPIOS):
+                raise boardgen.PinGeneratorError("Unknown ext pin '{}'".format(cpu_pin_name))
+        else:
+            raise boardgen.PinGeneratorError(
+                "Invalid cpu pin name '{}', must be 'GPIOn' or 'EXT_GPIOn'".format(cpu_pin_name)
+            )
 
 
-def main():
-    parser = argparse.ArgumentParser(description="Generate board specific pin file")
-    parser.add_argument("--board-csv")
-    parser.add_argument("--af-csv")
-    parser.add_argument("--prefix")
-    parser.add_argument("--output-source")
-    parser.add_argument("--output-header")
-    args = parser.parse_args()
-
-    pins = Pins()
+class Rp2PinGenerator(boardgen.NumericPinGenerator):
+    def __init__(self):
+        # Use custom pin type above, and also enable the --af-csv argument.
+        super().__init__(
+            pin_type=Rp2Pin,
+            enable_af=True,
+        )
 
-    with open(args.output_source, "w") as out_source:
-        print("// This file was automatically generated by make-pins.py", file=out_source)
-        print("//", file=out_source)
-        if args.af_csv:
-            print("// --af {:s}".format(args.af_csv), file=out_source)
-            pins.parse_af_file(args.af_csv, 0, 1)
+        # Pre-define the pins (i.e. don't require them to be listed in pins.csv).
+        for i in range(NUM_GPIOS):
+            self.add_cpu_pin("GPIO{}".format(i))
+        for i in range(NUM_EXT_GPIOS):
+            self.add_cpu_pin("EXT_GPIO{}".format(i))
 
-        if args.board_csv:
-            print("// --board {:s}".format(args.board_csv), file=out_source)
-            pins.parse_board_file(args.board_csv)
+    # Provided by pico-sdk.
+    def cpu_table_size(self):
+        return "NUM_BANK0_GPIOS"
 
-        if args.prefix:
-            print("// --prefix {:s}".format(args.prefix), file=out_source)
-            print("", file=out_source)
-            with open(args.prefix, "r") as prefix_file:
-                print(prefix_file.read(), file=out_source)
-        pins.print(out_source)
+    # Only use pre-defined cpu pins (do not let board.csv create them).
+    def find_pin_by_cpu_pin_name(self, cpu_pin_name, create=True):
+        return super().find_pin_by_cpu_pin_name(cpu_pin_name, create=False)
 
-    with open(args.output_header, "w") as out_header:
-        pins.print_header(out_header)
+    # NumericPinGenerator doesn't include the cpu dict by default (only the
+    # board dict), so add that to the output for rp2.
+    def print_source(self, out_source):
+        super().print_source(out_source)
+        self.print_cpu_locals_dict(out_source)
 
 
 if __name__ == "__main__":
-    main()
+    Rp2PinGenerator().main()
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 77d9e13480007..b277a939e5abe 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -69,14 +69,14 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
-    locals_dict, &pin_cpu_pins_locals_dict
+    locals_dict, &machine_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
+    locals_dict, &machine_pin_board_pins_locals_dict
     );
 
 typedef struct _machine_pin_irq_obj_t {
@@ -86,7 +86,7 @@ typedef struct _machine_pin_irq_obj_t {
 } machine_pin_irq_obj_t;
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
-extern const machine_pin_obj_t *machine_pin_cpu_pins[NUM_BANK0_GPIOS];
+extern const machine_pin_obj_t machine_pin_obj_table[NUM_BANK0_GPIOS];
 
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
 uint32_t machine_pin_open_drain_mask;
@@ -170,18 +170,18 @@ const machine_pin_af_obj_t *machine_pin_find_alt_by_index(const machine_pin_obj_
 const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
     // Is already a object of the proper type
     if (mp_obj_is_type(pin, &machine_pin_type)) {
-        return pin;
+        return MP_OBJ_TO_PTR(pin);
     }
     if (mp_obj_is_str(pin)) {
         const char *name = mp_obj_str_get_str(pin);
         // Try to find the pin in the board pins first.
-        const machine_pin_obj_t *self = machine_pin_find_named(&pin_board_pins_locals_dict, pin);
+        const machine_pin_obj_t *self = machine_pin_find_named(&machine_pin_board_pins_locals_dict, pin);
         if (self != NULL) {
             return 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, pin);
+        self = machine_pin_find_named(&machine_pin_cpu_pins_locals_dict, pin);
         if (self != NULL) {
             return self;
         }
@@ -189,8 +189,8 @@ const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
     } else if (mp_obj_is_int(pin)) {
         // get the wanted pin object
         int wanted_pin = mp_obj_get_int(pin);
-        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_cpu_pins)) {
-            return machine_pin_cpu_pins[wanted_pin];
+        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj_table)) {
+            return &machine_pin_obj_table[wanted_pin];
         }
     }
     mp_raise_ValueError("invalid pin");
@@ -432,7 +432,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_obj_table[pin]);
         irq->base.handler = mp_const_none;
         irq->base.ishard = false;
         MP_STATE_PORT(machine_pin_irq_obj[pin]) = irq;
diff --git a/ports/rp2/machine_pin.h b/ports/rp2/machine_pin.h
index d2a39f8e377d9..b3349188e8ba1 100644
--- a/ports/rp2/machine_pin.h
+++ b/ports/rp2/machine_pin.h
@@ -65,10 +65,10 @@ extern const mp_obj_type_t machine_pin_af_type;
 #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_dict_t machine_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;
+extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
 
 void machine_pin_ext_init(void);
 bool machine_pin_ext_is_adc_channel(const machine_pin_obj_t *self);
diff --git a/tools/boardgen.py b/tools/boardgen.py
new file mode 100644
index 0000000000000..bef8e74727097
--- /dev/null
+++ b/tools/boardgen.py
@@ -0,0 +1,506 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2023 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 contains common functionality to assist a port in implementing
+# make-pins.py, which is used to emit compile-time definitions of pin, AF, and
+# ADC objects based on inputs from the vendor HAL/SDK and the board
+# definition's pins.csv.
+
+# 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
+#
+# 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
+
+import argparse
+import csv
+import os
+import sys
+
+
+class PinGeneratorError(Exception):
+    pass
+
+
+# A port should define a subclass of Pin that knows how to validate cpu/board
+# names and emits the required structures.
+class Pin:
+    def __init__(self, cpu_pin_name):
+        self._cpu_pin_name = cpu_pin_name
+        # Optional aliases for the board from pins.csv. Each entry is a tuple
+        # of (name, hidden). Hidden board pins are in pins.csv with with a "-"
+        # prefix and will available to C but not Python.
+        self._board_pin_names = set()
+        # An unavailable pin is one that is not explicitly mentioned at all in
+        # pins.csv (or added explicitly with PinGenerator.add_cpu_pin).
+        self._available = False
+        # A hidden pin is one that is in pins.csv with a "-" prefix and will
+        # be still available to C but not Python.
+        self._hidden = False
+        # Reference to the PinGenerator instance.
+        self._generator = None
+
+    # The name of the pin to use in MP_QSTR_{} or pin_{}. Defaults to the cpu name.
+    def name(self):
+        return self._cpu_pin_name
+
+    # Add a board alias (e.g. from pins.csv).
+    def add_board_pin_name(self, board_pin_name, hidden=False):
+        self._board_pin_names.add(
+            (
+                board_pin_name,
+                hidden,
+            )
+        )
+
+    # Override this to handle an af specified in af.csv.
+    def add_af(self, af_idx, af_name, af):
+        raise NotImplementedError
+
+    # Override this to verify that naming matches the MCU standard (e.g. "GPIOn" or "PXn").
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        if not cpu_pin_name.strip():
+            raise PinGeneratorError("Missing cpu pin name")
+
+    # Override this to provide additional validation of board names.
+    @staticmethod
+    def validate_board_pin_name(board_pin_name):
+        # TODO: ensure this is a valid Python/C identifier and can be used as MP_QSTR_foo.
+        pass
+
+    # Must be implemented when using NumericPinGenerator.
+    # Returns the integer index, or None to exclude this pin from the table.
+    def index(self):
+        raise NotImplementedError
+
+    # Can be overridden when using NumericPinGenerator.
+    # Returns a string which is a C expression that evaluates to the index
+    # e.g. `GPIO_NUM_7`.
+    # This is used whenever the index is emitted in source code and defaults
+    # to just returning the pin index as a literal.
+    # Return None to exclude this pin from the table.
+    def index_name(self):
+        i = self.index()
+        return str(i) if i is not None else None
+
+    # Returns an expression that defines the pin. e.g. `{ .base { ... }, .x }`.
+    # This is used as the RHS of the `const machine_pin_obj_t
+    # pin_EXT_GPIO0_obj =` statements for named pins, and elements of
+    # `machine_pin_obj_table` for numeric pins.
+    # This will typically might be implemented as an invocation of a macro
+    # defined in the port-specific prefix.
+    def definition(self):
+        raise NotImplementedError
+
+    # Whether the pin object should be declared as "const". This should be True
+    # for most pins, but some special cases (e.g. external pins on rp2) might
+    # need mutable pin objects (e.g. to track current pin state).
+    def is_const(self):
+        return True
+
+    # Optionally return a preprocessor expression that can be used to suppress
+    # this pin (e.g. `MICROPY_HW_ENABLE_GPIOn`).
+    def enable_macro(self):
+        return None
+
+    # Override this to output any additional per-pin definitions or other
+    # content that should appear at the start of the source output.
+    # This could be used to define additional objects such as IRQs or AFs.
+    def print_source(self, out_source):
+        pass
+
+
+# A port should define a subclass of PinGenerator (or NumericPinGenerator).
+class PinGenerator:
+    def __init__(self, pin_type, enable_af=False):
+        self._pins = []
+        self._pin_type = pin_type
+        self._enable_af = enable_af
+
+    # Allows a port to define a known cpu pin (without relying on it being in the
+    # csv file).
+    def add_cpu_pin(self, cpu_pin_name, available=True):
+        pin = self._pin_type(cpu_pin_name)
+        pin._available = available
+        self._pins.append(pin)
+        pin._generator = self
+        return pin
+
+    # Iterate just the available pins (i.e. ones in pins.csv).
+    def available_pins(self, exclude_hidden=False):
+        for pin in self._pins:
+            if not pin._available:
+                continue
+            if exclude_hidden and pin._hidden:
+                continue
+            yield pin
+
+    # Allows a port to add additional command-line arguments to be handled.
+    def extra_args(self, parser):
+        pass
+
+    # Load board->cpu mapping from csv.
+    def parse_board_csv(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for linenum, row in enumerate(rows):
+                try:
+                    # Skip empty lines, and lines starting with "#".
+                    if len(row) == 0 or row[0].startswith("#"):
+                        continue
+
+                    # Lines must be pairs of names.
+                    if len(row) != 2:
+                        raise PinGeneratorError("Expecting two entries in each row")
+                    board_pin_name, cpu_pin_name = (x.strip() for x in row)
+
+                    # All rows must include a cpu name.
+                    cpu_hidden = False
+                    if cpu_pin_name.startswith("-"):
+                        cpu_hidden = True
+                        cpu_pin_name = cpu_pin_name[1:]
+                    self._pin_type.validate_cpu_pin_name(cpu_pin_name)
+                    pin = self.find_pin_by_cpu_pin_name(cpu_pin_name, create=True)
+                    pin._available = True  # It's in pins.csv so must be available.
+                    pin._hidden = cpu_hidden  # Optionally don't make available to Python.
+
+                    # Rows can optionally alias to a board name.
+                    if board_pin_name:
+                        board_hidden = False
+                        if board_pin_name.startswith("-"):
+                            board_hidden = True
+                            board_pin_name = board_pin_name[1:]
+                        self._pin_type.validate_board_pin_name(board_pin_name)
+                        pin.add_board_pin_name(board_pin_name, board_hidden)
+
+                # Inject "file:line: " into the exception.
+                except PinGeneratorError as er:
+                    raise PinGeneratorError("{}:{}: {}".format(filename, linenum, er))
+
+    def parse_af_csv(self, filename, header_rows=1, pin_col=0, af_col=1):
+        headings = {}
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for linenum, row in enumerate(rows):
+                try:
+                    # Skip empty lines, and lines starting with "#".
+                    if len(row) == 0 or row[0].startswith("#"):
+                        continue
+
+                    # Consume `header_rows` non-blank/comment rows at the start.
+                    if header_rows:
+                        if not headings:
+                            # If this is the first header row then initialise
+                            # the headings dict.
+                            for af_idx, header in enumerate(row[af_col:]):
+                                headings[af_idx] = header.strip()
+                        header_rows -= 1
+                        continue
+
+                    # Lines must be pairs of names.
+                    if len(row) <= max(pin_col, af_col):
+                        raise PinGeneratorError(
+                            "Expecting {} entries in each row".format(max(pin_col, af_col))
+                        )
+
+                    cpu_pin_name = row[pin_col].strip()
+                    if cpu_pin_name == "-":
+                        continue
+                    self._pin_type.validate_cpu_pin_name(cpu_pin_name)
+                    pin = self.find_pin_by_cpu_pin_name(cpu_pin_name, create=True)
+
+                    for af_idx, af in enumerate(row[af_col:]):
+                        af = af.strip()
+                        if not af:
+                            continue
+                        pin.add_af(af_idx, headings.get(af_idx, ""), af)
+
+                # Inject "file:line: " into the exception.
+                except PinGeneratorError as er:
+                    raise PinGeneratorError("{}:{}: {}".format(filename, linenum, er))
+
+    # Find an existing pin.
+    def find_pin_by_cpu_pin_name(self, cpu_pin_name, create=True):
+        for pin in self._pins:
+            if pin._cpu_pin_name == cpu_pin_name:
+                return pin
+        if create:
+            return self.add_cpu_pin(cpu_pin_name, available=False)
+        else:
+            raise PinGeneratorError("Unknown cpu pin {}".format(cpu_pin_name))
+
+    # Print the locals dict for Pin.board.
+    def print_board_locals_dict(self, out_source):
+        print(file=out_source)
+        print(
+            "STATIC const mp_rom_map_elem_t machine_pin_board_pins_locals_dict_table[] = {",
+            file=out_source,
+        )
+        for pin in self.available_pins():
+            for board_pin_name, board_hidden in pin._board_pin_names:
+                if board_hidden:
+                    # Don't include hidden pins in Pins.board.
+                    continue
+
+                # We don't use the enable macro for board pins, because they
+                # shouldn't be referenced in pins.csv unless they're
+                # available.
+                print(
+                    "    {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(pin_{:s}) }},".format(
+                        board_pin_name,
+                        pin.name(),
+                    ),
+                    file=out_source,
+                )
+        print("};", file=out_source)
+        print(
+            "MP_DEFINE_CONST_DICT(machine_pin_board_pins_locals_dict, machine_pin_board_pins_locals_dict_table);",
+            file=out_source,
+        )
+
+    # Print the locals dict for Pin.cpu.
+    def print_cpu_locals_dict(self, out_source):
+        print(file=out_source)
+        print(
+            "STATIC const mp_rom_map_elem_t machine_pin_cpu_pins_locals_dict_table[] = {",
+            file=out_source,
+        )
+        for pin in self.available_pins(exclude_hidden=True):
+            m = pin.enable_macro()
+            if m:
+                print("    #if {}".format(m), file=out_source)
+            print(
+                "    {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(pin_{:s}) }},".format(
+                    pin.name(),
+                    pin.name(),
+                ),
+                file=out_source,
+            )
+            if m:
+                print("    #endif", file=out_source)
+        print("};", file=out_source)
+        print(
+            "MP_DEFINE_CONST_DICT(machine_pin_cpu_pins_locals_dict, machine_pin_cpu_pins_locals_dict_table);",
+            file=out_source,
+        )
+
+    # NumericPinGenerator can override this to use an entry in machine_pin_obj_table.
+    def _cpu_pin_pointer(self, pin):
+        return "&pin_{:s}_obj".format(pin.name())
+
+    # Print the pin_CPUNAME and pin_BOARDNAME macros.
+    def print_defines(self, out_header):
+        # Provide #defines for each cpu pin.
+        for pin in self.available_pins():
+            print(file=out_header)
+            m = pin.enable_macro()
+            if m:
+                print("#if {}".format(m), file=out_header)
+
+            # #define pin_CPUNAME (...)
+            print(
+                "#define pin_{:s} ({:s})".format(pin.name(), self._cpu_pin_pointer(pin)),
+                file=out_header,
+            )
+
+            # #define pin_BOARDNAME (pin_CPUNAME)
+            for board_pin_name, _board_hidden in pin._board_pin_names:
+                # Note: Hidden board pins are still available to C via the macro.
+                print(
+                    "#define pin_{:s} (pin_{:s})".format(
+                        board_pin_name,
+                        pin.name(),
+                    ),
+                    file=out_header,
+                )
+
+            if m:
+                print("#endif", file=out_header)
+
+    def print_source(self, out_source):
+        raise NotImplementedError
+
+    def print_header(self, out_header):
+        self.print_defines(out_header)
+
+    # A port can override this if it has extra input files (e.g. af.csv) to load.
+    def load_inputs(self, out_source):
+        # Optionally load pins.csv to get cpu->board name mappings.
+        if self._enable_af and self.args.af_csv:
+            print("// --af-csv {:s}".format(self.args.af_csv), file=out_source)
+            self.parse_af_csv(self.args.af_csv)
+
+        # Optionally load pins.csv to get cpu->board name mappings.
+        if self.args.board_csv:
+            print("// --board-csv {:s}".format(self.args.board_csv), file=out_source)
+            self.parse_board_csv(self.args.board_csv)
+
+        # Prepend the prefix file to the start of the output.
+        if self.args.prefix:
+            print("// --prefix {:s}".format(self.args.prefix), file=out_source)
+            print(file=out_source)
+            with open(self.args.prefix, "r") as prefix_file:
+                print(prefix_file.read(), end="", file=out_source)
+
+    # A port can override this to do extra work after the main source+header
+    # have been written, such as generating additional header files.
+    def generate_extra_files(self):
+        pass
+
+    def main(self):
+        parser = argparse.ArgumentParser(description="Generate board specific pin file")
+        parser.add_argument("--board-csv")
+        if self._enable_af:
+            parser.add_argument("--af-csv")
+        parser.add_argument("--prefix")
+        parser.add_argument("--output-source")
+        parser.add_argument("--output-header")
+        self.extra_args(parser)
+        self.args = parser.parse_args()
+
+        try:
+            with open(self.args.output_source, "w") as out_source:
+                print("// This file was automatically generated by make-pins.py", file=out_source)
+                print("//", file=out_source)
+
+                # Load additional files (including port-specific ones).
+                self.load_inputs(out_source)
+
+                # Allow a port to print arbitrary per-pin content.
+                for pin in self.available_pins():
+                    pin.print_source(out_source)
+
+                # Print the tables and dictionaries.
+                self.print_source(out_source)
+
+            with open(self.args.output_header, "w") as out_header:
+                self.print_header(out_header)
+
+            self.generate_extra_files()
+        except PinGeneratorError as er:
+            print(er)
+            sys.exit(1)
+
+
+# For ports that use numeric pin identifiers (e.g. ESP32, rp2).
+# This emits the machine_pin_obj_t instances as an array (machine_pin_obj_table).
+class NumericPinGenerator(PinGenerator):
+    # This should return a const expression that is the number of GPIO pins
+    # for this board.
+    def cpu_table_size(self):
+        raise NotImplementedError
+
+    def print_cpu_table(self, out_source):
+        # Print machine_pin_obj_table, where each element is `[n] = {obj}`.
+        print(file=out_source)
+        print(
+            "const machine_pin_obj_t machine_pin_obj_table[{}] = {{".format(self.cpu_table_size()),
+            file=out_source,
+        )
+        for pin in self.available_pins():
+            n = pin.index_name()
+            if n is None:
+                continue
+
+            m = pin.enable_macro()
+            if m:
+                print("    #if {}".format(m), file=out_source)
+            print(
+                "    [{:s}] = {:s},".format(
+                    pin.index_name(),
+                    pin.definition(),
+                ),
+                file=out_source,
+            )
+            if m:
+                print("    #endif", file=out_source)
+        print("};", file=out_source)
+
+        # For pins that do not have an index, print them out in the same style as PinGenerator.
+        print(file=out_source)
+        for pin in self.available_pins():
+            n = pin.index_name()
+            if n is not None:
+                continue
+
+            m = pin.enable_macro()
+            if m:
+                print("#if {}".format(m), file=out_source)
+            print(
+                "{:s}machine_pin_obj_t pin_{:s}_obj = {:s};".format(
+                    "const " if pin.is_const() else "",
+                    pin.name(),
+                    pin.definition(),
+                ),
+                file=out_source,
+            )
+            if m:
+                print("#endif", file=out_source)
+
+    # Replace PinGenerator's implementation to print the numeric table.
+    def print_source(self, out_source):
+        self.print_cpu_table(out_source)
+        self.print_board_locals_dict(out_source)
+
+    def _cpu_pin_pointer(self, pin):
+        n = pin.index_name()
+        if n is not None:
+            return "&machine_pin_obj_table[{:s}]".format(pin.index_name())
+        else:
+            return super()._cpu_pin_pointer(pin)

From 98dff07bb4ff98a178cac912270ee8a11e1bf570 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 10 Aug 2023 23:40:20 +1000
Subject: [PATCH 0512/3129] stm32/boards: Fix errors in pins.csv and af.csv.

Fixes are:
- Comment out lines in pins.csv that do not have valid CPU pins.
  It's useful to keep these in the file as "documentation" but in order to
  make make-pins.py stricter they need to be commented out.
- Fix some typos (missing P prefix) in pins.csv.
  This resulted in some missing board pins.
- Fix some typos in af.csv files.
  Some typos of "ADC" and some other that were previously ignored.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../boards/ADAFRUIT_F405_EXPRESS/pins.csv     |  4 +--
 ports/stm32/boards/ARDUINO_GIGA/pins.csv      |  6 ++--
 .../boards/ARDUINO_NICLA_VISION/pins.csv      |  2 +-
 .../stm32/boards/ARDUINO_PORTENTA_H7/pins.csv |  2 +-
 ports/stm32/boards/CERB40/pins.csv            | 12 ++++----
 .../boards/GARATRONIC_NADHAT_F405/pins.csv    | 18 ++++++------
 .../GARATRONIC_PYBSTICK26_F411/pins.csv       | 18 ++++++------
 ports/stm32/boards/HYDRABUS/pins.csv          |  2 +-
 .../boards/MIKROE_CLICKER2_STM32/pins.csv     | 18 ++++++------
 ports/stm32/boards/NUCLEO_F412ZG/pins.csv     |  8 +++---
 ports/stm32/boards/NUCLEO_F413ZH/pins.csv     |  8 +++---
 ports/stm32/boards/NUCLEO_G0B1RE/pins.csv     |  2 +-
 ports/stm32/boards/NUCLEO_G474RE/pins.csv     |  2 +-
 ports/stm32/boards/NUCLEO_L073RZ/pins.csv     |  5 +---
 ports/stm32/boards/PYBLITEV10/pins.csv        | 20 ++++++-------
 ports/stm32/boards/PYBV10/pins.csv            | 20 ++++++-------
 ports/stm32/boards/PYBV11/pins.csv            | 20 ++++++-------
 ports/stm32/boards/PYBV4/pins.csv             | 20 ++++++-------
 ports/stm32/boards/STM32F439/pins.csv         |  2 +-
 ports/stm32/boards/STM32H573I_DK/pins.csv     |  4 +--
 ports/stm32/boards/STM32H7B3I_DK/pins.csv     |  4 +--
 ports/stm32/boards/VCC_GND_F407VE/pins.csv    | 24 ++++++++--------
 ports/stm32/boards/VCC_GND_F407ZG/pins.csv    | 28 +++++++++----------
 ports/stm32/boards/stm32h743_af.csv           |  4 +--
 ports/stm32/boards/stm32h7b3_af.csv           | 13 +++------
 25 files changed, 129 insertions(+), 137 deletions(-)

diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/pins.csv b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/pins.csv
index 15e810e1ae546..7c5c7b62fabbf 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/pins.csv
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/pins.csv
@@ -1,5 +1,5 @@
-POWER,3.3V
-GND,GND
+#POWER,3.3V
+#GND,GND
 USB_ID,PA10
 USB_DM,PA11
 USB_DP,PA12
diff --git a/ports/stm32/boards/ARDUINO_GIGA/pins.csv b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
index 91c5c6d58616b..56e63232908ce 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/pins.csv
+++ b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
@@ -176,7 +176,7 @@ UART6_TX,PG14
 UART6_RX,PC7
 -USB_DM,PA11
 -USB_DP,PA12
-BOOT0,BOOT0
+#BOOT0,BOOT0
 DAC1,PA4
 DAC2,PA5
 LED_RED,PI12
@@ -209,11 +209,11 @@ I2C4_SCL,PB6
 -QSPI2_D1,PD12
 -QSPI2_D2,PE2
 -QSPI2_D3,PF6
--SPI1_NSS,NC
+#-SPI1_NSS,NC
 -SPI1_SCK,PB3
 -SPI1_MISO,PG9
 -SPI1_MOSI,PD7
 -SPI5_NSS,PK1
 -SPI5_SCK,PH6
 -SPI5_MISO,PJ11
--SPI5_MOSI,PJ10
\ No newline at end of file
+-SPI5_MOSI,PJ10
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
index 8ff21e645331f..2838510ee3126 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
@@ -176,7 +176,7 @@ UART8_TX,PJ8
 UART8_RX,PJ9
 USB_DM,PA11
 USB_DP,PA12
-BOOT0,BOOT0
+#BOOT0,BOOT0
 OSCEN,PH1
 DAC1,-PA4
 DAC2,-PA5
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
index ea8710b25f848..4ac406fe3a743 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -199,7 +199,7 @@ UART8_RX,PJ9
 -USB_HS_RST,PJ4
 -USB_DM,PA11
 -USB_DP,PA12
-BOOT0,BOOT0
+#BOOT0,BOOT0
 OSCEN,PH1
 DAC1,PA4
 DAC2,-PA5
diff --git a/ports/stm32/boards/CERB40/pins.csv b/ports/stm32/boards/CERB40/pins.csv
index cca0bc0536b51..a319089a66af7 100644
--- a/ports/stm32/boards/CERB40/pins.csv
+++ b/ports/stm32/boards/CERB40/pins.csv
@@ -1,5 +1,5 @@
-JP1,3.3V
-JP2,GND
+#JP1,3.3V
+#JP2,GND
 JP3,PA8
 JP4,PA13
 JP5,PA7
@@ -12,13 +12,13 @@ JP11,PB9
 JP12,PB3
 JP13,PD2
 JP14,PC12
-JP15,VBAT
+#JP15,VBAT
 JP16,PB8
-JP17,Loader
+#JP17,Loader
 JP18,PB7
 JP19,PB6
 JP20,PB5
-JP21,Reset
+#JP21,Reset
 JP22,PC0
 JP23,PC1
 JP24,PC2
@@ -37,7 +37,7 @@ JP36,PC6
 JP37,PC7
 JP38,PC8
 JP39,PC9
-JP40,VUSB
+#JP40,VUSB
 UART1_TX,PA9
 UART1_RX,PA10
 UART3_TX,PD8
diff --git a/ports/stm32/boards/GARATRONIC_NADHAT_F405/pins.csv b/ports/stm32/boards/GARATRONIC_NADHAT_F405/pins.csv
index 0a030e985c275..866716397d9af 100644
--- a/ports/stm32/boards/GARATRONIC_NADHAT_F405/pins.csv
+++ b/ports/stm32/boards/GARATRONIC_NADHAT_F405/pins.csv
@@ -10,18 +10,18 @@ X9,PB6
 X10,PB7
 X11,PC4
 X12,PC5
-X13,Reset
-X14,GND
-X15,3.3V
-X16,VIN
+#X13,Reset
+#X14,GND
+#X15,3.3V
+#X16,VIN
 X17,PB3
 X18,PC13
 X19,PC0
 X20,PC1
 X21,PC2
 X22,PC3
-X23,A3.3V
-X24,AGND
+#X23,A3.3V
+#X24,AGND
 Y1,PC6
 Y2,PC7
 Y3,PB8
@@ -35,9 +35,9 @@ Y10,PB11
 Y11,PB0
 Y12,PB1
 Y13,PB2
-Y14,GND
-Y15,3.3V
-Y16,VIN
+#Y14,GND
+#Y15,3.3V
+#Y16,VIN
 SW,PB3
 LED_RED,PA13
 LED_GREEN,PA14
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv
index c52e65cf792c3..ecdbe99c0fd0a 100644
--- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv
@@ -1,32 +1,32 @@
-S1,3.3V
-S2,VBUS
+#S1,3.3V
+#S2,VBUS
 S3,PB9
-S4,VIN
+#S4,VIN
 S5,PB8
-S6,GND
+#S6,GND
 S7,PB6
 S8,PA2
-S9,GND
+#S9,GND
 S10,PA3
 S11,PB3
 S12,PA0
 S13,PB10
 S13A,PC3
-S14,Reset
+#S14,Reset
 S15,PB12
 S15A,PC5
 S16,PB13
 S16A,PC6
-S17,GND
+#S17,GND
 S18,PB14
 S18A,PC7
 S19,PA7
-S20,GND
+#S20,GND
 S21,PB4
 S22,PA10
 S23,PA5
 S24,PA15
-S25,GND
+#S25,GND
 S26,PA4
 SW,PC13
 SW2,PB6
diff --git a/ports/stm32/boards/HYDRABUS/pins.csv b/ports/stm32/boards/HYDRABUS/pins.csv
index 47e1f431398dd..5e1cf682dc8d2 100644
--- a/ports/stm32/boards/HYDRABUS/pins.csv
+++ b/ports/stm32/boards/HYDRABUS/pins.csv
@@ -44,7 +44,7 @@ PA10,PA10
 PA11,PA11
 PA12,PA12
 PD2,PD2
-BOOT0,BOOT0
+#BOOT0,BOOT0
 PA15,PA15
 UART3_TX,PD8
 UART3_RX,PD9
diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv b/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv
index c04d2b8c4ac86..60868ea0c9d22 100644
--- a/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv
+++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv
@@ -22,8 +22,8 @@ MB2_RX,PD9
 MB2_TX,PD8
 MB2_SCL,PB10
 MB2_SDA,PB11
-PIN1,VSYS
-PIN2,GND
+#PIN1,VSYS
+#PIN2,GND
 PIN3,PC0
 PIN4,PC1
 PIN5,PC2
@@ -46,11 +46,11 @@ PIN21,PD10
 PIN22,PB13
 PIN23,PB14
 PIN24,PB15
-PIN25,3.3V
-PIN26,GND
-PIN27,RST
-PIN28,GND
-PIN30,NC
+#PIN25,3.3V
+#PIN26,GND
+#PIN27,RST
+#PIN28,GND
+#PIN30,NC
 PIN31,PB9
 PIN32,PB8
 PIN33,PE5
@@ -71,8 +71,8 @@ PIN47,PA1
 PIN48,PA0
 PIN49,PB10
 PIN50,PB11
-PIN51,3.3V
-PIN52,GND
+#PIN51,3.3V
+#PIN52,GND
 OSC32_OUT,PC15
 OSC32_IN,PC14
 VSENSE,PC5
diff --git a/ports/stm32/boards/NUCLEO_F412ZG/pins.csv b/ports/stm32/boards/NUCLEO_F412ZG/pins.csv
index 31dcb99ed616c..bdfb64619b072 100644
--- a/ports/stm32/boards/NUCLEO_F412ZG/pins.csv
+++ b/ports/stm32/boards/NUCLEO_F412ZG/pins.csv
@@ -112,7 +112,7 @@ PG14,PG14
 PG15,PG15
 PH0,PH0
 PH1,PH1
-SW,C13
-LED_RED,B14
-LED_GREEN,B0
-LED_BLUE,B7
+SW,PC13
+LED_RED,PB14
+LED_GREEN,PB0
+LED_BLUE,PB7
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/pins.csv b/ports/stm32/boards/NUCLEO_F413ZH/pins.csv
index 31dcb99ed616c..bdfb64619b072 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/pins.csv
+++ b/ports/stm32/boards/NUCLEO_F413ZH/pins.csv
@@ -112,7 +112,7 @@ PG14,PG14
 PG15,PG15
 PH0,PH0
 PH1,PH1
-SW,C13
-LED_RED,B14
-LED_GREEN,B0
-LED_BLUE,B7
+SW,PC13
+LED_RED,PB14
+LED_GREEN,PB0
+LED_BLUE,PB7
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/pins.csv b/ports/stm32/boards/NUCLEO_G0B1RE/pins.csv
index 9c03b1b68a64e..b2af175b123ec 100644
--- a/ports/stm32/boards/NUCLEO_G0B1RE/pins.csv
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/pins.csv
@@ -25,7 +25,7 @@ PA1,PA1
 PA10,PA10
 PA11,PA11
 PA12,PA12
-PA13,TMS
+#PA13,TMS
 PA15,PA15
 PA2,PA2
 PA3,PA3
diff --git a/ports/stm32/boards/NUCLEO_G474RE/pins.csv b/ports/stm32/boards/NUCLEO_G474RE/pins.csv
index 473a5e26bce28..30b23799527eb 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/pins.csv
+++ b/ports/stm32/boards/NUCLEO_G474RE/pins.csv
@@ -1,7 +1,7 @@
 A0,PA0
 A1,PA1
 A2,PA4
-A3,BPB0
+A3,PB0
 A4,PC1
 A5,PC0
 D0,PC5
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/pins.csv b/ports/stm32/boards/NUCLEO_L073RZ/pins.csv
index 7386425acf81a..9ff62598f3149 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/pins.csv
+++ b/ports/stm32/boards/NUCLEO_L073RZ/pins.csv
@@ -28,7 +28,7 @@ SCK,PA5
 MISO,PA6
 MOSI,PA7
 CS,PB6
-BOOT0,PF11
+#BOOT0,BOOT0
 SWDIO,PA13
 SWCLK,PA14
 USER_B1,PC13
@@ -82,6 +82,3 @@ LED_GREEN,PA5
 ,PC14
 ,PC15
 ,PD2
-,PF0
-,PF1
-,PF11
diff --git a/ports/stm32/boards/PYBLITEV10/pins.csv b/ports/stm32/boards/PYBLITEV10/pins.csv
index 838587c1bcca0..4f5261c3f0418 100644
--- a/ports/stm32/boards/PYBLITEV10/pins.csv
+++ b/ports/stm32/boards/PYBLITEV10/pins.csv
@@ -10,18 +10,18 @@ X9,PB6
 X10,PB7
 X11,PC4
 X12,PC5
-X13,Reset
-X14,GND
-X15,3.3V
-X16,VIN
+#X13,Reset
+#X14,GND
+#X15,3.3V
+#X16,VIN
 X17,PB3
 X18,PC13
 X19,PC0
 X20,PC1
 X21,PC2
 X22,PC3
-X23,A3.3V
-X24,AGND
+#X23,A3.3V
+#X24,AGND
 Y1,PC6
 Y2,PC7
 Y3,PB10
@@ -34,10 +34,10 @@ Y9,PA8
 Y10,PB8
 Y11,PB0
 Y12,PB1
-Y13,Reset
-Y14,GND
-Y15,3.3V
-Y16,VIN
+#Y13,Reset
+#Y14,GND
+#Y15,3.3V
+#Y16,VIN
 SW,PB3
 LED_BLUE,PB4
 LED_RED,PA13
diff --git a/ports/stm32/boards/PYBV10/pins.csv b/ports/stm32/boards/PYBV10/pins.csv
index cee80a1aa1cf9..dc3e48f138595 100644
--- a/ports/stm32/boards/PYBV10/pins.csv
+++ b/ports/stm32/boards/PYBV10/pins.csv
@@ -10,18 +10,18 @@ X9,PB6
 X10,PB7
 X11,PC4
 X12,PC5
-X13,Reset
-X14,GND
-X15,3.3V
-X16,VIN
+#X13,Reset
+#X14,GND
+#X15,3.3V
+#X16,VIN
 X17,PB3
 X18,PC13
 X19,PC0
 X20,PC1
 X21,PC2
 X22,PC3
-X23,A3.3V
-X24,AGND
+#X23,A3.3V
+#X24,AGND
 Y1,PC6
 Y2,PC7
 Y3,PB8
@@ -34,10 +34,10 @@ Y9,PB10
 Y10,PB11
 Y11,PB0
 Y12,PB1
-Y13,Reset
-Y14,GND
-Y15,3.3V
-Y16,VIN
+#Y13,Reset
+#Y14,GND
+#Y15,3.3V
+#Y16,VIN
 SW,PB3
 LED_RED,PA13
 LED_GREEN,PA14
diff --git a/ports/stm32/boards/PYBV11/pins.csv b/ports/stm32/boards/PYBV11/pins.csv
index cee80a1aa1cf9..dc3e48f138595 100644
--- a/ports/stm32/boards/PYBV11/pins.csv
+++ b/ports/stm32/boards/PYBV11/pins.csv
@@ -10,18 +10,18 @@ X9,PB6
 X10,PB7
 X11,PC4
 X12,PC5
-X13,Reset
-X14,GND
-X15,3.3V
-X16,VIN
+#X13,Reset
+#X14,GND
+#X15,3.3V
+#X16,VIN
 X17,PB3
 X18,PC13
 X19,PC0
 X20,PC1
 X21,PC2
 X22,PC3
-X23,A3.3V
-X24,AGND
+#X23,A3.3V
+#X24,AGND
 Y1,PC6
 Y2,PC7
 Y3,PB8
@@ -34,10 +34,10 @@ Y9,PB10
 Y10,PB11
 Y11,PB0
 Y12,PB1
-Y13,Reset
-Y14,GND
-Y15,3.3V
-Y16,VIN
+#Y13,Reset
+#Y14,GND
+#Y15,3.3V
+#Y16,VIN
 SW,PB3
 LED_RED,PA13
 LED_GREEN,PA14
diff --git a/ports/stm32/boards/PYBV4/pins.csv b/ports/stm32/boards/PYBV4/pins.csv
index cee80a1aa1cf9..dc3e48f138595 100644
--- a/ports/stm32/boards/PYBV4/pins.csv
+++ b/ports/stm32/boards/PYBV4/pins.csv
@@ -10,18 +10,18 @@ X9,PB6
 X10,PB7
 X11,PC4
 X12,PC5
-X13,Reset
-X14,GND
-X15,3.3V
-X16,VIN
+#X13,Reset
+#X14,GND
+#X15,3.3V
+#X16,VIN
 X17,PB3
 X18,PC13
 X19,PC0
 X20,PC1
 X21,PC2
 X22,PC3
-X23,A3.3V
-X24,AGND
+#X23,A3.3V
+#X24,AGND
 Y1,PC6
 Y2,PC7
 Y3,PB8
@@ -34,10 +34,10 @@ Y9,PB10
 Y10,PB11
 Y11,PB0
 Y12,PB1
-Y13,Reset
-Y14,GND
-Y15,3.3V
-Y16,VIN
+#Y13,Reset
+#Y14,GND
+#Y15,3.3V
+#Y16,VIN
 SW,PB3
 LED_RED,PA13
 LED_GREEN,PA14
diff --git a/ports/stm32/boards/STM32F439/pins.csv b/ports/stm32/boards/STM32F439/pins.csv
index cc9443dea5f2d..5287dec097f38 100644
--- a/ports/stm32/boards/STM32F439/pins.csv
+++ b/ports/stm32/boards/STM32F439/pins.csv
@@ -44,7 +44,7 @@ PA10,PA10
 PA11,PA11
 PA12,PA12
 PD2,PD2
-BOOT0,BOOT0
+#BOOT0,BOOT0
 PA15,PA15
 PA13,PA13
 PA14,PA14
diff --git a/ports/stm32/boards/STM32H573I_DK/pins.csv b/ports/stm32/boards/STM32H573I_DK/pins.csv
index 5672bc4922f4e..5317d4da61b4d 100644
--- a/ports/stm32/boards/STM32H573I_DK/pins.csv
+++ b/ports/stm32/boards/STM32H573I_DK/pins.csv
@@ -142,8 +142,8 @@
 ,PI13
 ,PI14
 ,PI15
-LED1,G11
-LED2,G2
+LED1,PG11
+LED2,PG2
 SW,PC13
 UART3_TX,PB10
 UART3_RX,PB11
diff --git a/ports/stm32/boards/STM32H7B3I_DK/pins.csv b/ports/stm32/boards/STM32H7B3I_DK/pins.csv
index e005e38af70d0..68e8d1ac7b58b 100644
--- a/ports/stm32/boards/STM32H7B3I_DK/pins.csv
+++ b/ports/stm32/boards/STM32H7B3I_DK/pins.csv
@@ -144,8 +144,8 @@
 ,PI15
 DAC1,PA4
 DAC2,PA5
-LED1,G11
-LED2,G2
+LED1,PG11
+LED2,PG2
 SW,PC13
 I2C1_SDA,PB9
 I2C1_SCL,PB8
diff --git a/ports/stm32/boards/VCC_GND_F407VE/pins.csv b/ports/stm32/boards/VCC_GND_F407VE/pins.csv
index f04d96771b05d..8d37e01b0d1b5 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/pins.csv
+++ b/ports/stm32/boards/VCC_GND_F407VE/pins.csv
@@ -1,9 +1,9 @@
-P1_1,GND
-P1_2,GND
-P1_3,VBAT
-P1_4,VCC_3V3
-P1_5,VIN_5V
-P1_6,VIN_5V
+#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
@@ -84,12 +84,12 @@ 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
+#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
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/pins.csv b/ports/stm32/boards/VCC_GND_F407ZG/pins.csv
index 780523a075f41..f992c9ae5e915 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/pins.csv
+++ b/ports/stm32/boards/VCC_GND_F407ZG/pins.csv
@@ -1,9 +1,9 @@
-P1_1,GND
-P1_2,GND
-P1_3,VBAT
-P1_4,VCC_3V3
-P1_5,VIN_5V
-P1_6,VIN_5V
+#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
@@ -40,8 +40,8 @@ P1_39,PG1
 P1_40,PE7
 P1_41,PE8
 P1_42,PE9
-P1_43,GND
-P1_44,GND
+#P1_43,GND
+#P1_44,GND
 P2_1,PG7
 P2_2,PG6
 P2_3,PG5
@@ -80,10 +80,10 @@ 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_1,GND
+#P4_2,GND
+#P4_3,VCC_3V3
+#P4_4,VCC_3V3
 P4_5,PB9
 P4_6,PB8
 P4_7,PB7
@@ -122,8 +122,8 @@ P4_39,PC8
 P4_40,PC7
 P4_41,PC6
 P4_42,PG8
-P4_43,GND
-P4_44,GND
+#P4_43,GND
+#P4_44,GND
 DAC1,PA4
 DAC2,PA5
 SRAM_CS,PG10
diff --git a/ports/stm32/boards/stm32h743_af.csv b/ports/stm32/boards/stm32h743_af.csv
index 32e67e2bdc09d..4b8ef6afdd69a 100644
--- a/ports/stm32/boards/stm32h743_af.csv
+++ b/ports/stm32/boards/stm32h743_af.csv
@@ -92,8 +92,8 @@ PortF,PF8,,TIM16_CH1N,,,,SPI5_MISO,SAI1_SCK_B,UART7_RTS,SAI4_SCK_B,TIM13_CH1,QUA
 PortF,PF9,,TIM17_CH1N,,,,SPI5_MOSI,SAI1_FS_B,UART7_CTS,SAI4_FS_B,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,ADC3_INP2
 PortF,PF10,,TIM16_BKIN,SAI1_D3,,,,,,,QUADSPI_CLK,SAI4_D3,,,DCMI_D11,LCD_DE,EVENTOUT,ADC3_INN2/ADC3_INP6
 PortF,PF11,,,,,,SPI5_MOSI,,,,,SAI2_SD_B,,FMC_SDNRAS,DCMI_D12,,EVENTOUT,ADC1_INP2
-PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,ADC1_INN2/DC1_INP6
-PortF,PF13,,,,DFSDM_DATIN6,I2C4_SMBA,,,,,,,,FMC_A7,,,EVENTOUT,ACD2_INP2
+PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,ADC1_INN2/ADC1_INP6
+PortF,PF13,,,,DFSDM_DATIN6,I2C4_SMBA,,,,,,,,FMC_A7,,,EVENTOUT,ADC2_INP2
 PortF,PF14,,,,DFSDM_CKIN6,I2C4_SCL,,,,,,,,FMC_A8,,,EVENTOUT,ADC2_INN2/ADC2_INP6
 PortF,PF15,,,,,I2C4_SDA,,,,,,,,FMC_A9,,,EVENTOUT,
 PortG,PG0,,,,,,,,,,,,,FMC_A10,,,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h7b3_af.csv b/ports/stm32/boards/stm32h7b3_af.csv
index 0e1747161f3a3..e14ff481e81c5 100644
--- a/ports/stm32/boards/stm32h7b3_af.csv
+++ b/ports/stm32/boards/stm32h7b3_af.csv
@@ -1,7 +1,6 @@
 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,,
@@ -9,7 +8,6 @@ PortA,PA12,,TIM1_ETR,,LPUART1_DE/LPUART1_RTS,,I2S2_CK/SPI2_SCK,UART4_TX,USART1_D
 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,
@@ -40,12 +38,10 @@ PortC,PC10,,,,DFSDM1_CKIN5,DFSDM2_CKIN0,,I2S3_CK/SPI3_SCK,USART3_TX,UART4_TX,OCT
 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,PC14,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortC,PC15,,,,,,,,,,,,,,,,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,,
@@ -68,7 +64,6 @@ PortD,PD6,,,SAI1_D1,DFSDM1_CKIN4,DFSDM1_DATIN1,I2S3_SDO/SPI3_MOSI,SAI1_SD_A,USAR
 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,,
@@ -117,8 +112,8 @@ PortG,PG6,,TIM17_BKIN,,,,,,,,,OCTOSPIM_P1_NCS,,FMC_NE3,DCMI_D12/PSSI_D12,LTDC_R7
 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,PH0,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortH,PH1,,,,,,,,,,,,,,,,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,,

From 286b1b3ed9da4db156a7fc3fc4f191efb9125aa0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 2 Nov 2023 14:34:34 +1100
Subject: [PATCH 0513/3129] stm32/boards: Format stm32 alternate function csv
 files.

Changes are:
- Pad all cells to make them easier to read.
- Ensure all files have exactly 19 columns (Port,Pin,AF0-15,ADC)

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/stm32f091_af.csv | 180 +++++++--------
 ports/stm32/boards/stm32f401_af.csv | 166 +++++++-------
 ports/stm32/boards/stm32f405_af.csv | 284 +++++++++++------------
 ports/stm32/boards/stm32f411_af.csv | 168 +++++++-------
 ports/stm32/boards/stm32f412_af.csv | 232 +++++++++----------
 ports/stm32/boards/stm32f413_af.csv | 232 +++++++++----------
 ports/stm32/boards/stm32f429_af.csv | 340 ++++++++++++++--------------
 ports/stm32/boards/stm32f439_af.csv | 340 ++++++++++++++--------------
 ports/stm32/boards/stm32f446_af.csv | 232 +++++++++----------
 ports/stm32/boards/stm32f479_af.csv | 322 +++++++++++++-------------
 ports/stm32/boards/stm32f722_af.csv | 292 ++++++++++++------------
 ports/stm32/boards/stm32f746_af.csv | 340 ++++++++++++++--------------
 ports/stm32/boards/stm32f767_af.csv | 340 ++++++++++++++--------------
 ports/stm32/boards/stm32g0b1_af.csv | 192 ++++++++--------
 ports/stm32/boards/stm32g474_af.csv | 218 +++++++++---------
 ports/stm32/boards/stm32h573_af.csv | 284 +++++++++++------------
 ports/stm32/boards/stm32h723_af.csv | 232 +++++++++----------
 ports/stm32/boards/stm32h743_af.csv | 340 ++++++++++++++--------------
 ports/stm32/boards/stm32h7b3_af.csv | 340 ++++++++++++++--------------
 ports/stm32/boards/stm32l072_af.csv | 168 +++++++-------
 ports/stm32/boards/stm32l152_af.csv | 234 +++++++++----------
 ports/stm32/boards/stm32l432_af.csv |  56 ++---
 ports/stm32/boards/stm32l452_af.csv | 170 +++++++-------
 ports/stm32/boards/stm32l476_af.csv | 232 +++++++++----------
 ports/stm32/boards/stm32l496_af.csv | 284 +++++++++++------------
 ports/stm32/boards/stm32wb55_af.csv | 148 ++++++------
 ports/stm32/boards/stm32wl55_af.csv |  90 ++++----
 27 files changed, 3228 insertions(+), 3228 deletions(-)

diff --git a/ports/stm32/boards/stm32f091_af.csv b/ports/stm32/boards/stm32f091_af.csv
index 8074fd22b7131..5e44697776b13 100644
--- a/ports/stm32/boards/stm32f091_af.csv
+++ b/ports/stm32/boards/stm32f091_af.csv
@@ -1,90 +1,90 @@
-Port,Pin,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,,,,,,,,,
-,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,,,,,,,,,ADC
-PortA,PA0,,USART2_CTS,TIM2_CH1_ETR,TSC_G1_IO1,USART4_TX,,,COMP1_OUT,,,,,,,,,ADC1_IN0
-PortA,PA1,EVENTOUT,USART2_RTS,TIM2_CH2,TSC_G1_IO2,USART4_RX,TIM15_CH1N,,,,,,,,,,,ADC1_IN1
-PortA,PA2,TIM15_CH1,USART2_TX,TIM2_CH3,TSC_G1_IO3,,,,COMP2_OUT,,,,,,,,,ADC1_IN2
-PortA,PA3,TIM15_CH2,USART2_RX,TIM2_CH4,TSC_G1_IO4,,,,,,,,,,,,,ADC1_IN3
-PortA,PA4,SPI1_NSS/I2S1_WS,USART2_CK,,TSC_G2_IO1,TIM14_CH1,USART6_TX,,,,,,,,,,,ADC1_IN4
-PortA,PA5,SPI1_SCK/I2S1_CK,CEC,TIM2_CH1_ETR,TSC_G2_IO2,,USART6_RX,,,,,,,,,,,ADC1_IN5
-PortA,PA6,SPI1_MISO/I2S1_MCK,TIM3_CH1,TIM1_BKIN,TSC_G2_IO3,USART3_CTS,TIM16_CH1,EVENTOUT,COMP1_OUT,,,,,,,,,ADC1_IN6
-PortA,PA7,SPI1_MOSI/I2S1_SD,TIM3_CH2,TIM1_CH1N,TSC_G2_IO4,TIM14_CH1,TIM17_CH1,EVENTOUT,COMP2_OUT,,,,,,,,,ADC1_IN7
-PortA,PA8,MCO,USART1_CK,TIM1_CH1,EVENTOUT,CRS_SYNC,,,,,,,,,,,,
-PortA,PA9,TIM15_BKIN,USART1_TX,TIM1_CH2,TSC_G4_IO1,I2C1_SCL,MCO,,,,,,,,,,,
-PortA,PA10,TIM17_BKIN,USART1_RX,TIM1_CH3,TSC_G4_IO2,I2C1_SDA,,,,,,,,,,,,
-PortA,PA11,EVENTOUT,USART1_CTS,TIM1_CH4,TSC_G4_IO3,CAN1_RX,I2C2_SCL,,COMP1_OUT,,,,,,,,,
-PortA,PA12,EVENTOUT,USART1_RTS,TIM1_ETR,TSC_G4_IO4,CAN1_TX,I2C2_SDA,,COMP2_OUT,,,,,,,,,
-PortA,PA13,SWDIO,IR_OUT,,,,,,,,,,,,,,,
-PortA,PA14,SWCLK,USART2_TX,,,,,,,,,,,,,,,
-PortA,PA15,SPI1_NSS/I2S1_WS,USART2_RX,TIM2_CH1_ETR,EVENTOUT,USART4_RTS,,,,,,,,,,,,
-PortB,PB0,EVENTOUT,TIM3_CH3,TIM1_CH2N,TSC_G3_IO2,USART3_CK,,,,,,,,,,,,ADC1_IN8
-PortB,PB1,TIM14_CH1,TIM3_CH4,TIM1_CH3N,TSC_G3_IO3,USART3_RTS,,,,,,,,,,,,ADC1_IN9
-PortB,PB2,,,,TSC_G3_IO4,,,,,,,,,,,,,
-PortB,PB3,SPI1_SCK/I2S1_CK,EVENTOUT,TIM2_CH2,TSC_G5_IO1,USART5_TX,,,,,,,,,,
-PortB,PB4,SPI1_MISO/I2S1_MCK,TIM3_CH1,EVENTOUT,TSC_G5_IO2,USART5_RX,TIM17_BKIN,,,,,,,,,
-PortB,PB5,SPI1_MOSI/I2S1_SD,TIM3_CH2,TIM16_BKIN,I2C1_SMBA,USART5_CK/USART5_RTS,,,,,,,,,,
-PortB,PB6,USART1_TX,I2C1_SCL,TIM16_CH1N,TSC_G5_IO3,,,,,,,,,,,
-PortB,PB7,USART1_RX,I2C1_SDA,TIM17_CH1N,TSC_G5_IO4,USART4_CTS,,,,,,,,,,
-PortB,PB8,CEC,I2C1_SCL,TIM16_CH1,TSC_SYNC,CAN1_RX,,,,,,,,,,
-PortB,PB9,IR_OUT,I2C1_SDA,TIM17_CH1,EVENTOUT,CAN1_TX,SPI2_NSS/I2S2_WS,,,,,,,,,
-PortB,PB10,CEC,I2C2_SCL,TIM2_CH3,TSC_SYNC,USART3_TX,SPI2_SCK/I2S2_CK,,,,,,,,,
-PortB,PB11,EVENTOUT,I2C2_SDA,TIM2_CH4,TSC_G6_IO1,USART3_RX,,,,,,,,,,
-PortB,PB12,SPI2_NSS/I2S2_WS,EVENTOUT,TIM1_BKIN,TSC_G6_IO2,USART3_CK,TIM15_BKIN,,,,,,,,,
-PortB,PB13,SPI2_SCK/I2S2_CK,,TIM1_CH1N,TSC_G6_IO3,USART3_CTS,I2C2_SCL,,,,,,,,,
-PortB,PB14,SPI2_MISO/I2S2_MCK,TIM15_CH1,TIM1_CH2N,TSC_G6_IO4,USART3_RTS,I2C2_SDA,,,,,,,,,
-PortB,PB15,SPI2_MOSI/I2S2_SD,TIM15_CH2,TIM1_CH3N,TIM15_CH1N,,,,,,,,,,,
-PortC,PC0,EVENTOUT,USART7_TX,USART6_TX,,,,,,,,,,,,,,ADC1_IN10
-PortC,PC1,EVENTOUT,USART7_RX,USART6_RX,,,,,,,,,,,,,,ADC1_IN11
-PortC,PC2,EVENTOUT,SPI2_MISO/I2S2_MCK,USART8_TX,,,,,,,,,,,,,,ADC1_IN12
-PortC,PC3,EVENTOUT,SPI2_MOSI/I2S2_SD,USART8_RX,,,,,,,,,,,,,,ADC1_IN13
-PortC,PC4,EVENTOUT,USART3_TX,,,,,,,,,,,,,,,ADC1_IN14
-PortC,PC5,TSC_G3_IO1,USART3_RX,,,,,,,,,,,,,,,ADC1_IN15
-PortC,PC6,TIM3_CH1,USART7_TX,,,,,,,,,,,,,,,
-PortC,PC7,TIM3_CH2,USART7_RX,,,,,,,,,,,,,,,
-PortC,PC8,TIM3_CH3,USART8_TX,,,,,,,,,,,,,,,
-PortC,PC9,TIM3_CH4,USART8_RX,,,,,,,,,,,,,,,
-PortC,PC10,USART4_TX,USART3_TX,,,,,,,,,,,,,,,
-PortC,PC11,USART4_RX,USART3_RX,,,,,,,,,,,,,,,
-PortC,PC12,USART4_CK,USART3_CK,USART5_TX,,,,,,,,,,,,,,
-PortC,PC13,,,,,,,,,,,,,,,,,
-PortC,PC14,,,,,,,,,,,,,,,,,
-PortC,PC15,,,,,,,,,,,,,,,,,
-PortD,PD0,CAN1_RX,SPI2_NSS/I2S2_WS,,,,,,,,,,,,,,,
-PortD,PD1,CAN1_TX,SPI2_SCK/I2S2_CK,,,,,,,,,,,,,,,
-PortD,PD2,TIM3_ETR,USART3_RTS,USART5_RX,,,,,,,,,,,,,,
-PortD,PD3,USART2_CTS,SPI2_MISO/I2S2_MCK,,,,,,,,,,,,,,,
-PortD,PD4,USART2_RTS,SPI2_MOSI/I2S2_SD,,,,,,,,,,,,,,,
-PortD,PD5,USART2_TX,,,,,,,,,,,,,,,,
-PortD,PD6,USART2_RX,,,,,,,,,,,,,,,,
-PortD,PD7,USART2_CK,,,,,,,,,,,,,,,,
-PortD,PD8,USART3_TX,,,,,,,,,,,,,,,,
-PortD,PD9,USART3_RX,,,,,,,,,,,,,,,,
-PortD,PD10,USART3_CK,,,,,,,,,,,,,,,,
-PortD,PD11,USART3_CTS,,,,,,,,,,,,,,,,
-PortD,PD12,USART3_RTS,TSC_G8_IO1,USART8_CK/USART8_RTS,,,,,,,,,,,,,,
-PortD,PD13,USART8_TX,TSC_G8_IO2,,,,,,,,,,,,,,,
-PortD,PD14,USART8_RX,TSC_G8_IO3,,,,,,,,,,,,,,,
-PortD,PD15,CRS_SYNC,TSC_G8_IO4,USART7_CK/USART7_RTS,,,,,,,,,,,,,,
-PortE,PE0,TIM16_CH1,EVENTOUT,,,,,,,,,,,,,,,
-PortE,PE1,TIM17_CH1,EVENTOUT,,,,,,,,,,,,,,,
-PortE,PE2,TIM3_ETR,TSC_G7_IO1,,,,,,,,,,,,,,,
-PortE,PE3,TIM3_CH1,TSC_G7_IO2,,,,,,,,,,,,,,,
-PortE,PE4,TIM3_CH2,TSC_G7_IO3,,,,,,,,,,,,,,,
-PortE,PE5,TIM3_CH3,TSC_G7_IO4,,,,,,,,,,,,,,,
-PortE,PE6,TIM3_CH4,,,,,,,,,,,,,,,,
-PortE,PE7,TIM1_ETR,USART5_CK/USART5_RTS,,,,,,,,,,,,,,,
-PortE,PE8,TIM1_CH1N,USART4_TX,,,,,,,,,,,,,,,
-PortE,PE9,TIM1_CH1,USART4_RX,,,,,,,,,,,,,,,
-PortE,PE10,TIM1_CH2N,USART5_TX,,,,,,,,,,,,,,,
-PortE,PE11,TIM1_CH2,USART5_RX,,,,,,,,,,,,,,,
-PortE,PE12,TIM1_CH3N,SPI1_NSS/I2S1_WS,,,,,,,,,,,,,,,
-PortE,PE13,TIM1_CH3,SPI1_SCK/I2S1_CK,,,,,,,,,,,,,,,
-PortE,PE14,TIM1_CH4,SPI1_MISO/I2S1_MCK,,,,,,,,,,,,,,,
-PortE,PE15,TIM1_BKIN,SPI1_MOSI/I2S1_SD,,,,,,,,,,,,,,,
-PortF,PF0,CRS_SYNC,I2C1_SDA,,,,,,,,,,,,,,,
-PortF,PF1,,I2C1_SCL,,,,,,,,,,,,,,,
-PortF,PF2,EVENTOUT,USART7_TX,USART7_CK/USART7_RTS,,,,,,,,,,,,,,
-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,,,,,,,,,,,,,,,,,
+Port ,Pin ,AF0               ,AF1                 ,AF2                 ,AF3       ,AF4                 ,AF5             ,AF6     ,AF7      ,,,,,,,,,ADC
+     ,    ,AF0               ,AF1                 ,AF2                 ,AF3       ,AF4                 ,AF5             ,AF6     ,AF7      ,,,,,,,,,ADC
+PortA,PA0 ,                  ,USART2_CTS          ,TIM2_CH1_ETR        ,TSC_G1_IO1,USART4_TX           ,                ,        ,COMP1_OUT,,,,,,,,,ADC1_IN0
+PortA,PA1 ,EVENTOUT          ,USART2_RTS          ,TIM2_CH2            ,TSC_G1_IO2,USART4_RX           ,TIM15_CH1N      ,        ,         ,,,,,,,,,ADC1_IN1
+PortA,PA2 ,TIM15_CH1         ,USART2_TX           ,TIM2_CH3            ,TSC_G1_IO3,                    ,                ,        ,COMP2_OUT,,,,,,,,,ADC1_IN2
+PortA,PA3 ,TIM15_CH2         ,USART2_RX           ,TIM2_CH4            ,TSC_G1_IO4,                    ,                ,        ,         ,,,,,,,,,ADC1_IN3
+PortA,PA4 ,SPI1_NSS/I2S1_WS  ,USART2_CK           ,                    ,TSC_G2_IO1,TIM14_CH1           ,USART6_TX       ,        ,         ,,,,,,,,,ADC1_IN4
+PortA,PA5 ,SPI1_SCK/I2S1_CK  ,CEC                 ,TIM2_CH1_ETR        ,TSC_G2_IO2,                    ,USART6_RX       ,        ,         ,,,,,,,,,ADC1_IN5
+PortA,PA6 ,SPI1_MISO/I2S1_MCK,TIM3_CH1            ,TIM1_BKIN           ,TSC_G2_IO3,USART3_CTS          ,TIM16_CH1       ,EVENTOUT,COMP1_OUT,,,,,,,,,ADC1_IN6
+PortA,PA7 ,SPI1_MOSI/I2S1_SD ,TIM3_CH2            ,TIM1_CH1N           ,TSC_G2_IO4,TIM14_CH1           ,TIM17_CH1       ,EVENTOUT,COMP2_OUT,,,,,,,,,ADC1_IN7
+PortA,PA8 ,MCO               ,USART1_CK           ,TIM1_CH1            ,EVENTOUT  ,CRS_SYNC            ,                ,        ,         ,,,,,,,,,
+PortA,PA9 ,TIM15_BKIN        ,USART1_TX           ,TIM1_CH2            ,TSC_G4_IO1,I2C1_SCL            ,MCO             ,        ,         ,,,,,,,,,
+PortA,PA10,TIM17_BKIN        ,USART1_RX           ,TIM1_CH3            ,TSC_G4_IO2,I2C1_SDA            ,                ,        ,         ,,,,,,,,,
+PortA,PA11,EVENTOUT          ,USART1_CTS          ,TIM1_CH4            ,TSC_G4_IO3,CAN1_RX             ,I2C2_SCL        ,        ,COMP1_OUT,,,,,,,,,
+PortA,PA12,EVENTOUT          ,USART1_RTS          ,TIM1_ETR            ,TSC_G4_IO4,CAN1_TX             ,I2C2_SDA        ,        ,COMP2_OUT,,,,,,,,,
+PortA,PA13,SWDIO             ,IR_OUT              ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortA,PA14,SWCLK             ,USART2_TX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortA,PA15,SPI1_NSS/I2S1_WS  ,USART2_RX           ,TIM2_CH1_ETR        ,EVENTOUT  ,USART4_RTS          ,                ,        ,         ,,,,,,,,,
+PortB,PB0 ,EVENTOUT          ,TIM3_CH3            ,TIM1_CH2N           ,TSC_G3_IO2,USART3_CK           ,                ,        ,         ,,,,,,,,,ADC1_IN8
+PortB,PB1 ,TIM14_CH1         ,TIM3_CH4            ,TIM1_CH3N           ,TSC_G3_IO3,USART3_RTS          ,                ,        ,         ,,,,,,,,,ADC1_IN9
+PortB,PB2 ,                  ,                    ,                    ,TSC_G3_IO4,                    ,                ,        ,         ,,,,,,,,,
+PortB,PB3 ,SPI1_SCK/I2S1_CK  ,EVENTOUT            ,TIM2_CH2            ,TSC_G5_IO1,USART5_TX           ,                ,        ,         ,,,,,,,,,
+PortB,PB4 ,SPI1_MISO/I2S1_MCK,TIM3_CH1            ,EVENTOUT            ,TSC_G5_IO2,USART5_RX           ,TIM17_BKIN      ,        ,         ,,,,,,,,,
+PortB,PB5 ,SPI1_MOSI/I2S1_SD ,TIM3_CH2            ,TIM16_BKIN          ,I2C1_SMBA ,USART5_CK/USART5_RTS,                ,        ,         ,,,,,,,,,
+PortB,PB6 ,USART1_TX         ,I2C1_SCL            ,TIM16_CH1N          ,TSC_G5_IO3,                    ,                ,        ,         ,,,,,,,,,
+PortB,PB7 ,USART1_RX         ,I2C1_SDA            ,TIM17_CH1N          ,TSC_G5_IO4,USART4_CTS          ,                ,        ,         ,,,,,,,,,
+PortB,PB8 ,CEC               ,I2C1_SCL            ,TIM16_CH1           ,TSC_SYNC  ,CAN1_RX             ,                ,        ,         ,,,,,,,,,
+PortB,PB9 ,IR_OUT            ,I2C1_SDA            ,TIM17_CH1           ,EVENTOUT  ,CAN1_TX             ,SPI2_NSS/I2S2_WS,        ,         ,,,,,,,,,
+PortB,PB10,CEC               ,I2C2_SCL            ,TIM2_CH3            ,TSC_SYNC  ,USART3_TX           ,SPI2_SCK/I2S2_CK,        ,         ,,,,,,,,,
+PortB,PB11,EVENTOUT          ,I2C2_SDA            ,TIM2_CH4            ,TSC_G6_IO1,USART3_RX           ,                ,        ,         ,,,,,,,,,
+PortB,PB12,SPI2_NSS/I2S2_WS  ,EVENTOUT            ,TIM1_BKIN           ,TSC_G6_IO2,USART3_CK           ,TIM15_BKIN      ,        ,         ,,,,,,,,,
+PortB,PB13,SPI2_SCK/I2S2_CK  ,                    ,TIM1_CH1N           ,TSC_G6_IO3,USART3_CTS          ,I2C2_SCL        ,        ,         ,,,,,,,,,
+PortB,PB14,SPI2_MISO/I2S2_MCK,TIM15_CH1           ,TIM1_CH2N           ,TSC_G6_IO4,USART3_RTS          ,I2C2_SDA        ,        ,         ,,,,,,,,,
+PortB,PB15,SPI2_MOSI/I2S2_SD ,TIM15_CH2           ,TIM1_CH3N           ,TIM15_CH1N,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC0 ,EVENTOUT          ,USART7_TX           ,USART6_TX           ,          ,                    ,                ,        ,         ,,,,,,,,,ADC1_IN10
+PortC,PC1 ,EVENTOUT          ,USART7_RX           ,USART6_RX           ,          ,                    ,                ,        ,         ,,,,,,,,,ADC1_IN11
+PortC,PC2 ,EVENTOUT          ,SPI2_MISO/I2S2_MCK  ,USART8_TX           ,          ,                    ,                ,        ,         ,,,,,,,,,ADC1_IN12
+PortC,PC3 ,EVENTOUT          ,SPI2_MOSI/I2S2_SD   ,USART8_RX           ,          ,                    ,                ,        ,         ,,,,,,,,,ADC1_IN13
+PortC,PC4 ,EVENTOUT          ,USART3_TX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,ADC1_IN14
+PortC,PC5 ,TSC_G3_IO1        ,USART3_RX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,ADC1_IN15
+PortC,PC6 ,TIM3_CH1          ,USART7_TX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC7 ,TIM3_CH2          ,USART7_RX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC8 ,TIM3_CH3          ,USART8_TX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC9 ,TIM3_CH4          ,USART8_RX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC10,USART4_TX         ,USART3_TX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC11,USART4_RX         ,USART3_RX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC12,USART4_CK         ,USART3_CK           ,USART5_TX           ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC13,                  ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC14,                  ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortC,PC15,                  ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD0 ,CAN1_RX           ,SPI2_NSS/I2S2_WS    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD1 ,CAN1_TX           ,SPI2_SCK/I2S2_CK    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD2 ,TIM3_ETR          ,USART3_RTS          ,USART5_RX           ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD3 ,USART2_CTS        ,SPI2_MISO/I2S2_MCK  ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD4 ,USART2_RTS        ,SPI2_MOSI/I2S2_SD   ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD5 ,USART2_TX         ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD6 ,USART2_RX         ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD7 ,USART2_CK         ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD8 ,USART3_TX         ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD9 ,USART3_RX         ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD10,USART3_CK         ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD11,USART3_CTS        ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD12,USART3_RTS        ,TSC_G8_IO1          ,USART8_CK/USART8_RTS,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD13,USART8_TX         ,TSC_G8_IO2          ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD14,USART8_RX         ,TSC_G8_IO3          ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortD,PD15,CRS_SYNC          ,TSC_G8_IO4          ,USART7_CK/USART7_RTS,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE0 ,TIM16_CH1         ,EVENTOUT            ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE1 ,TIM17_CH1         ,EVENTOUT            ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE2 ,TIM3_ETR          ,TSC_G7_IO1          ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE3 ,TIM3_CH1          ,TSC_G7_IO2          ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE4 ,TIM3_CH2          ,TSC_G7_IO3          ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE5 ,TIM3_CH3          ,TSC_G7_IO4          ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE6 ,TIM3_CH4          ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE7 ,TIM1_ETR          ,USART5_CK/USART5_RTS,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE8 ,TIM1_CH1N         ,USART4_TX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE9 ,TIM1_CH1          ,USART4_RX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE10,TIM1_CH2N         ,USART5_TX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE11,TIM1_CH2          ,USART5_RX           ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE12,TIM1_CH3N         ,SPI1_NSS/I2S1_WS    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE13,TIM1_CH3          ,SPI1_SCK/I2S1_CK    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE14,TIM1_CH4          ,SPI1_MISO/I2S1_MCK  ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortE,PE15,TIM1_BKIN         ,SPI1_MOSI/I2S1_SD   ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortF,PF0 ,CRS_SYNC          ,I2C1_SDA            ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortF,PF1 ,                  ,I2C1_SCL            ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
+PortF,PF2 ,EVENTOUT          ,USART7_TX           ,USART7_CK/USART7_RTS,          ,                    ,                ,        ,         ,,,,,,,,,
+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,                  ,                    ,                    ,          ,                    ,                ,        ,         ,,,,,,,,,
diff --git a/ports/stm32/boards/stm32f401_af.csv b/ports/stm32/boards/stm32f401_af.csv
index 1acb8e4313293..28266da944cf0 100644
--- a/ports/stm32/boards/stm32f401_af.csv
+++ b/ports/stm32/boards/stm32f401_af.csv
@@ -1,83 +1,83 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS_AF,TIM1/TIM2,TIM3/TIM4/TIM5,TIM9/TIM10/TIM11,I2C1/I2C2/I2C3,SPI1/SPI2/I2S2/SPI3/I2S3/SPI4,SPI2/I2S2/SPI3/I2S3,SPI3/I2S3/USART1/USART2,USART6,I2C2/I2C3,OTG1_FS,,SDIO,,,,ADC
-PortA,PA0,,TIM2_CH1/TIM2_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/TIM2_ETR,,,,SPI1_SCK,,,,,,,,,,EVENTOUT,ADC1_IN5
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,,,SPI1_MISO,,,,,,,,,,EVENTOUT,ADC1_IN6
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,,,SPI1_MOSI,,,,,,,,,,EVENTOUT,ADC1_IN7
-PortA,PA8,MCO_1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,,,,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,,,USART1_TX,,,OTG_FS_VBUS,,,,,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,,,,,USART1_RX,,,OTG_FS_ID,,,,,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,,,,,USART1_CTS,USART6_TX,,OTG_FS_DM,,,,,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,,,,,USART1_RTS,USART6_RX,,OTG_FS_DP,,,,,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,,,,,,,,,,,,,EVENTOUT,ADC1_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,,,,,,,,,,,,,EVENTOUT,ADC1_IN9
-PortB,PB2,,,,,,,,,,,,,,,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,SPI3_SCK/I2S3_CK,,,I2C2_SDA,,,,,,EVENTOUT,
-PortB,PB4,JTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,I2S3ext_SD,,I2C3_SDA,,,,,,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,,,,,,,,SDIO_D4,,,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,,,,SDIO_D5,,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,,,,,,,,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,,,,,,,,,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,,SPI2_SCK/I2S2_CK,,,,,,,,,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,,,SPI2_MISO,I2S2ext_SD,,,,,,,,,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,,,,SPI2_MOSI/I2S2_SD,,,,,,,,,,EVENTOUT,
-PortC,PC0,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN10
-PortC,PC1,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN11
-PortC,PC2,,,,,,SPI2_MISO,I2S2ext_SD,,,,,,,,,EVENTOUT,ADC1_IN12
-PortC,PC3,,,,,,SPI2_MOSI/I2S2_SD,,,,,,,,,,EVENTOUT,ADC1_IN13
-PortC,PC4,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN14
-PortC,PC5,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN15
-PortC,PC6,,,TIM3_CH1,,,I2S2_MCK,,,USART6_TX,,,,SDIO_D6,,,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,,,,I2S3_MCK,,USART6_RX,,,,SDIO_D7,,,EVENTOUT,
-PortC,PC8,,,TIM3_CH3,,,,,,USART6_CK,,,,SDIO_D0,,,EVENTOUT,
-PortC,PC9,MCO_2,,TIM3_CH4,,I2C3_SDA,I2S_CKIN,,,,,,,SDIO_D1,,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,,,,,,SDIO_D2,,,EVENTOUT,
-PortC,PC11,,,,,,I2S3ext_SD,SPI3_MISO,,,,,,SDIO_D3,,,EVENTOUT,
-PortC,PC12,,,,,,,SPI3_MOSI/I2S3_SD,,,,,,SDIO_CK,,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD1,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD2,,,TIM3_ETR,,,,,,,,,,SDIO_CMD,,,EVENTOUT,
-PortD,PD3,,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS,,,,,,,,EVENTOUT,
-PortD,PD4,,,,,,,,USART2_RTS,,,,,,,,EVENTOUT,
-PortD,PD5,,,,,,,,USART2_TX,,,,,,,,EVENTOUT,
-PortD,PD6,,,,,,SPI3_MOSI/I2S3_SD,,USART2_RX,,,,,,,,EVENTOUT,
-PortD,PD7,,,,,,,,USART2_CK,,,,,,,,EVENTOUT,
-PortD,PD8,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD9,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD10,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD11,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,,,,,,,,,,,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,,,,,,,,,,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,,,,,,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,,,,,,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,,,,,,,,,,,,,EVENTOUT,
-PortE,PE1,,TIM1_CH2N,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE2,TRACECLK,,,,,SPI4_SCK,,,,,,,,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE4,TRACED1,,,,,SPI4_NSS,,,,,,,,,,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,,,,,,,,,,EVENTOUT,
-PortE,PE6,TRACED3,,,TIM9_CH2,,SPI4_MOSI,,,,,,,,,,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,SPI4_NSS,,,,,,,,,,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,,,,,,,,,,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,,,,,,,,,,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,,,,,,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
+Port ,Pin ,AF0          ,AF1              ,AF2           ,AF3             ,AF4           ,AF5                          ,AF6                ,AF7                    ,AF8      ,AF9      ,AF10       ,AF11,AF12    ,AF13,AF14,AF15    ,ADC
+     ,    ,SYS_AF       ,TIM1/TIM2        ,TIM3/TIM4/TIM5,TIM9/TIM10/TIM11,I2C1/I2C2/I2C3,SPI1/SPI2/I2S2/SPI3/I2S3/SPI4,SPI2/I2S2/SPI3/I2S3,SPI3/I2S3/USART1/USART2,USART6   ,I2C2/I2C3,OTG1_FS    ,    ,SDIO    ,    ,    ,        ,ADC
+PortA,PA0 ,             ,TIM2_CH1/TIM2_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/TIM2_ETR,              ,                ,              ,SPI1_SCK                     ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN5
+PortA,PA6 ,             ,TIM1_BKIN        ,TIM3_CH1      ,                ,              ,SPI1_MISO                    ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN6
+PortA,PA7 ,             ,TIM1_CH1N        ,TIM3_CH2      ,                ,              ,SPI1_MOSI                    ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN7
+PortA,PA8 ,MCO_1        ,TIM1_CH1         ,              ,                ,I2C3_SCL      ,                             ,                   ,USART1_CK              ,         ,         ,OTG_FS_SOF ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,              ,                ,I2C3_SMBA     ,                             ,                   ,USART1_TX              ,         ,         ,OTG_FS_VBUS,    ,        ,    ,    ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3         ,              ,                ,              ,                             ,                   ,USART1_RX              ,         ,         ,OTG_FS_ID  ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4         ,              ,                ,              ,                             ,                   ,USART1_CTS             ,USART6_TX,         ,OTG_FS_DM  ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR         ,              ,                ,              ,                             ,                   ,USART1_RTS             ,USART6_RX,         ,OTG_FS_DP  ,    ,        ,    ,    ,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      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN9
+PortB,PB2 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2         ,              ,                ,              ,SPI1_SCK                     ,SPI3_SCK/I2S3_CK   ,                       ,         ,I2C2_SDA ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB4 ,JTRST        ,                 ,TIM3_CH1      ,                ,              ,SPI1_MISO                    ,SPI3_MISO          ,I2S3ext_SD             ,         ,I2C3_SDA ,           ,    ,        ,    ,    ,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      ,                             ,                   ,                       ,         ,         ,           ,    ,SDIO_D4 ,    ,    ,EVENTOUT,
+PortB,PB9 ,             ,                 ,TIM4_CH4      ,TIM11_CH1       ,I2C1_SDA      ,SPI2_NSS/I2S2_WS             ,                   ,                       ,         ,         ,           ,    ,SDIO_D5 ,    ,    ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3         ,              ,                ,I2C2_SCL      ,SPI2_SCK/I2S2_CK             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN        ,              ,                ,I2C2_SMBA     ,SPI2_NSS/I2S2_WS             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N        ,              ,                ,              ,SPI2_SCK/I2S2_CK             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N        ,              ,                ,              ,SPI2_MISO                    ,I2S2ext_SD         ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N        ,              ,                ,              ,SPI2_MOSI/I2S2_SD            ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortC,PC0 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN10
+PortC,PC1 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN11
+PortC,PC2 ,             ,                 ,              ,                ,              ,SPI2_MISO                    ,I2S2ext_SD         ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN12
+PortC,PC3 ,             ,                 ,              ,                ,              ,SPI2_MOSI/I2S2_SD            ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN13
+PortC,PC4 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN14
+PortC,PC5 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN15
+PortC,PC6 ,             ,                 ,TIM3_CH1      ,                ,              ,I2S2_MCK                     ,                   ,                       ,USART6_TX,         ,           ,    ,SDIO_D6 ,    ,    ,EVENTOUT,
+PortC,PC7 ,             ,                 ,TIM3_CH2      ,                ,              ,                             ,I2S3_MCK           ,                       ,USART6_RX,         ,           ,    ,SDIO_D7 ,    ,    ,EVENTOUT,
+PortC,PC8 ,             ,                 ,TIM3_CH3      ,                ,              ,                             ,                   ,                       ,USART6_CK,         ,           ,    ,SDIO_D0 ,    ,    ,EVENTOUT,
+PortC,PC9 ,MCO_2        ,                 ,TIM3_CH4      ,                ,I2C3_SDA      ,I2S_CKIN                     ,                   ,                       ,         ,         ,           ,    ,SDIO_D1 ,    ,    ,EVENTOUT,
+PortC,PC10,             ,                 ,              ,                ,              ,                             ,SPI3_SCK/I2S3_CK   ,                       ,         ,         ,           ,    ,SDIO_D2 ,    ,    ,EVENTOUT,
+PortC,PC11,             ,                 ,              ,                ,              ,I2S3ext_SD                   ,SPI3_MISO          ,                       ,         ,         ,           ,    ,SDIO_D3 ,    ,    ,EVENTOUT,
+PortC,PC12,             ,                 ,              ,                ,              ,                             ,SPI3_MOSI/I2S3_SD  ,                       ,         ,         ,           ,    ,SDIO_CK ,    ,    ,EVENTOUT,
+PortC,PC13,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortC,PC14,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortC,PC15,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD0 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD1 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD2 ,             ,                 ,TIM3_ETR      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,SDIO_CMD,    ,    ,EVENTOUT,
+PortD,PD3 ,             ,                 ,              ,                ,              ,SPI2_SCK/I2S2_CK             ,                   ,USART2_CTS             ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD4 ,             ,                 ,              ,                ,              ,                             ,                   ,USART2_RTS             ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD5 ,             ,                 ,              ,                ,              ,                             ,                   ,USART2_TX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD6 ,             ,                 ,              ,                ,              ,SPI3_MOSI/I2S3_SD            ,                   ,USART2_RX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD7 ,             ,                 ,              ,                ,              ,                             ,                   ,USART2_CK              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD8 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD9 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD10,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD11,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD14,             ,                 ,TIM4_CH3      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD15,             ,                 ,TIM4_CH4      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE0 ,             ,                 ,TIM4_ETR      ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE1 ,             ,TIM1_CH2N        ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                 ,              ,                ,              ,SPI4_SCK                     ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                 ,              ,                ,              ,SPI4_NSS                     ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                 ,              ,TIM9_CH1        ,              ,SPI4_MISO                    ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,                 ,              ,TIM9_CH2        ,              ,SPI4_MOSI                    ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR         ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,              ,                ,              ,SPI4_NSS                     ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,              ,                ,              ,SPI4_SCK                     ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,              ,                ,              ,SPI4_MISO                    ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,              ,                ,              ,SPI4_MOSI                    ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN        ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortH,PH0 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortH,PH1 ,             ,                 ,              ,                ,              ,                             ,                   ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32f405_af.csv b/ports/stm32/boards/stm32f405_af.csv
index 2602db877504d..d30779d45f189 100644
--- a/ports/stm32/boards/stm32f405_af.csv
+++ b/ports/stm32/boards/stm32f405_af.csv
@@ -1,142 +1,142 @@
-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/SPI2/I2S2/I2S2ext,SPI3/I2Sext/I2S3,USART1/2/3/I2S3ext,UART4/5/USART6,CAN1/CAN2/TIM12/13/14,OTG_FS/OTG_HS,ETH,FSMC/SDIO/OTG_FS,DCMI,,,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,,,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,,EVENTOUT,ADC123_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,,,,ETH_MDIO,,,,EVENTOUT,ADC123_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,,,USART2_RX,,,OTG_HS_ULPI_D0,ETH_MII_COL,,,,EVENTOUT,ADC123_IN3
-PortA,PA4,,,,,,SPI1_NSS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,OTG_HS_SOF,DCMI_HSYNC,,EVENTOUT,ADC12_IN4
-PortA,PA5,,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK,,,,,OTG_HS_ULPI_CK,,,,,EVENTOUT,ADC12_IN5
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO,,,,TIM13_CH1,,,,DCMI_PIXCK,,EVENTOUT,ADC12_IN6
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI,,,,TIM14_CH1,,ETH_MII_RX_DV/ETH_RMII_CRS_DV,,,,EVENTOUT,ADC12_IN7
-PortA,PA8,MCO1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,,,,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,,,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,,CAN1_TX,OTG_FS_DP,,,,,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,,,,,,,OTG_HS_ULPI_D1,ETH_MII_RXD2,,,,EVENTOUT,ADC12_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,,,,,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,,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,I2S3ext_SD,,,,,,,,EVENTOUT,
-PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI/I2S3_SD,,,CAN2_RX,OTG_HS_ULPI_D7,ETH_PPS_OUT,,DCMI_D10,,EVENTOUT,
-PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,CAN2_TX,,,,DCMI_D5,,EVENTOUT,
-PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,,USART1_RX,,,,,FSMC_NL,DCMI_VSYNC,,EVENTOUT,
-PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,,,,CAN1_RX,,ETH_MII_TXD3,SDIO_D4,DCMI_D6,,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,CAN1_TX,,,SDIO_D5,DCMI_D7,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,,USART3_TX,,,OTG_HS_ULPI_D3,ETH_MII_RX_ER,,,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C2_SDA,,,USART3_RX,,,OTG_HS_ULPI_D4,ETH_MII_TX_EN/ETH_RMII_TX_EN,,,,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,I2S2ext_SD,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,,,,,EVENTOUT,ADC123_IN10
-PortC,PC1,,,,,,,,,,,,ETH_MDC,,,,EVENTOUT,ADC123_IN11
-PortC,PC2,,,,,,SPI2_MISO,I2S2ext_SD,,,,OTG_HS_ULPI_DIR,ETH_MII_TXD2,,,,EVENTOUT,ADC123_IN12
-PortC,PC3,,,,,,SPI2_MOSI/I2S2_SD,,,,,OTG_HS_ULPI_NXT,ETH_MII_TX_CLK,,,,EVENTOUT,ADC123_IN13
-PortC,PC4,,,,,,,,,,,,ETH_MII_RXD0/ETH_RMII_RXD0,,,,EVENTOUT,ADC123_IN14
-PortC,PC5,,,,,,,,,,,,ETH_MII_RXD1/ETH_RMII_RXD1,,,,EVENTOUT,ADC123_IN15
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,,I2S2_MCK,,,USART6_TX,,,,SDIO_D6,DCMI_D0,,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,,,I2S3_MCK,,USART6_RX,,,,SDIO_D7,DCMI_D1,,EVENTOUT,
-PortC,PC8,,,TIM3_CH3,TIM8_CH3,,,,,USART6_CK,,,,SDIO_D0,DCMI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,,,,,,SDIO_D1,DCMI_D3,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,,,,SDIO_D2,DCMI_D8,,EVENTOUT,
-PortC,PC11,,,,,,I2S3ext_SD,SPI3_MISO,USART3_RX,UART4_RX,,,,SDIO_D3,DCMI_D4,,EVENTOUT,
-PortC,PC12,,,,,,,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,,,FSMC_D2,,,EVENTOUT,
-PortD,PD1,,,,,,,,,,CAN1_TX,,,FSMC_D3,,,EVENTOUT,
-PortD,PD2,,,TIM3_ETR,,,,,,UART5_RX,,,,SDIO_CMD,DCMI_D11,,EVENTOUT,
-PortD,PD3,,,,,,,,USART2_CTS,,,,,FSMC_CLK,,,EVENTOUT,
-PortD,PD4,,,,,,,,USART2_RTS,,,,,FSMC_NOE,,,EVENTOUT,
-PortD,PD5,,,,,,,,USART2_TX,,,,,FSMC_NWE,,,EVENTOUT,
-PortD,PD6,,,,,,,,USART2_RX,,,,,FSMC_NWAIT,,,EVENTOUT,
-PortD,PD7,,,,,,,,USART2_CK,,,,,FSMC_NE1/FSMC_NCE2,,,EVENTOUT,
-PortD,PD8,,,,,,,,USART3_TX,,,,,FSMC_D13,,,EVENTOUT,
-PortD,PD9,,,,,,,,USART3_RX,,,,,FSMC_D14,,,EVENTOUT,
-PortD,PD10,,,,,,,,USART3_CK,,,,,FSMC_D15,,,EVENTOUT,
-PortD,PD11,,,,,,,,USART3_CTS,,,,,FSMC_A16,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,,,,,USART3_RTS,,,,,FSMC_A17,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,,,,,,,,,FSMC_A18,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,,,,,FSMC_D0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,,,,,FSMC_D1,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,,,,,,,,,,FSMC_NBL0,DCMI_D2,,EVENTOUT,
-PortE,PE1,,,,,,,,,,,,,FSMC_NBL1,DCMI_D3,,EVENTOUT,
-PortE,PE2,TRACECLK,,,,,,,,,,,ETH_MII_TXD3,FSMC_A23,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,,,,,,,,,FSMC_A19,,,EVENTOUT,
-PortE,PE4,TRACED1,,,,,,,,,,,,FSMC_A20,DCMI_D4,,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,,,,,,,,FSMC_A21,DCMI_D6,,EVENTOUT,
-PortE,PE6,TRACED3,,,TIM9_CH2,,,,,,,,,FSMC_A22,DCMI_D7,,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,,,,,,,FSMC_D4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,,,,,,,FSMC_D5,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,,,,,,,FSMC_D6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,,,,,FSMC_D7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,,,,,,,,FSMC_D8,,,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,,,,,,,,FSMC_D9,,,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,,,,,,,,FSMC_D10,,,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,,,,,,,,FSMC_D11,,,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,,,,,,,,FSMC_D12,,,EVENTOUT,
-PortF,PF0,,,,,I2C2_SDA,,,,,,,,FSMC_A0,,,EVENTOUT,
-PortF,PF1,,,,,I2C2_SCL,,,,,,,,FSMC_A1,,,EVENTOUT,
-PortF,PF2,,,,,I2C2_SMBA,,,,,,,,FSMC_A2,,,EVENTOUT,
-PortF,PF3,,,,,,,,,,,,,FSMC_A3,,,EVENTOUT,ADC3_IN9
-PortF,PF4,,,,,,,,,,,,,FSMC_A4,,,EVENTOUT,ADC3_IN14
-PortF,PF5,,,,,,,,,,,,,FSMC_A5,,,EVENTOUT,ADC3_IN15
-PortF,PF6,,,,TIM10_CH1,,,,,,,,,FSMC_NIORD,,,EVENTOUT,ADC3_IN4
-PortF,PF7,,,,TIM11_CH1,,,,,,,,,FSMC_NREG,,,EVENTOUT,ADC3_IN5
-PortF,PF8,,,,,,,,,,TIM13_CH1,,,FSMC_NIOWR,,,EVENTOUT,ADC3_IN6
-PortF,PF9,,,,,,,,,,TIM14_CH1,,,FSMC_CD,,,EVENTOUT,ADC3_IN7
-PortF,PF10,,,,,,,,,,,,,FSMC_INTR,,,EVENTOUT,ADC3_IN8
-PortF,PF11,,,,,,,,,,,,,,DCMI_D12,,EVENTOUT,
-PortF,PF12,,,,,,,,,,,,,FSMC_A6,,,EVENTOUT,
-PortF,PF13,,,,,,,,,,,,,FSMC_A7,,,EVENTOUT,
-PortF,PF14,,,,,,,,,,,,,FSMC_A8,,,EVENTOUT,
-PortF,PF15,,,,,,,,,,,,,FSMC_A9,,,EVENTOUT,
-PortG,PG0,,,,,,,,,,,,,FSMC_A10,,,EVENTOUT,
-PortG,PG1,,,,,,,,,,,,,FSMC_A11,,,EVENTOUT,
-PortG,PG2,,,,,,,,,,,,,FSMC_A12,,,EVENTOUT,
-PortG,PG3,,,,,,,,,,,,,FSMC_A13,,,EVENTOUT,
-PortG,PG4,,,,,,,,,,,,,FSMC_A14,,,EVENTOUT,
-PortG,PG5,,,,,,,,,,,,,FSMC_A15,,,EVENTOUT,
-PortG,PG6,,,,,,,,,,,,,FSMC_INT2,,,EVENTOUT,
-PortG,PG7,,,,,,,,,USART6_CK,,,,FSMC_INT3,,,EVENTOUT,
-PortG,PG8,,,,,,,,,USART6_RTS,,,ETH_PPS_OUT,,,,EVENTOUT,
-PortG,PG9,,,,,,,,,USART6_RX,,,,FSMC_NE2/FSMC_NCE3,,,EVENTOUT,
-PortG,PG10,,,,,,,,,,,,,FSMC_NCE4_1/FSMC_NE3,,,EVENTOUT,
-PortG,PG11,,,,,,,,,,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,FSMC_NCE4_2,,,EVENTOUT,
-PortG,PG12,,,,,,,,,USART6_RTS,,,,FSMC_NE4,,,EVENTOUT,
-PortG,PG13,,,,,,,,,USART6_CTS,,,ETH_MII_TXD0/ETH_RMII_TXD0,FSMC_A24,,,EVENTOUT,
-PortG,PG14,,,,,,,,,USART6_TX,,,ETH_MII_TXD1/ETH_RMII_TXD1,FSMC_A25,,,EVENTOUT,
-PortG,PG15,,,,,,,,,USART6_CTS,,,,,DCMI_D13,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH2,,,,,,,,,,,,ETH_MII_CRS,,,,EVENTOUT,
-PortH,PH3,,,,,,,,,,,,ETH_MII_COL,,,,EVENTOUT,
-PortH,PH4,,,,,I2C2_SCL,,,,,,OTG_HS_ULPI_NXT,,,,,EVENTOUT,
-PortH,PH5,,,,,I2C2_SDA,,,,,,,,,,,EVENTOUT,
-PortH,PH6,,,,,I2C2_SMBA,,,,,TIM12_CH1,,ETH_MII_RXD2,,,,EVENTOUT,
-PortH,PH7,,,,,I2C3_SCL,,,,,,,ETH_MII_RXD3,,,,EVENTOUT,
-PortH,PH8,,,,,I2C3_SDA,,,,,,,,,DCMI_HSYNC,,EVENTOUT,
-PortH,PH9,,,,,I2C3_SMBA,,,,,TIM12_CH2,,,,DCMI_D0,,EVENTOUT,
-PortH,PH10,,,TIM5_CH1,,,,,,,,,,,DCMI_D1,,EVENTOUT,
-PortH,PH11,,,TIM5_CH2,,,,,,,,,,,DCMI_D2,,EVENTOUT,
-PortH,PH12,,,TIM5_CH3,,,,,,,,,,,DCMI_D3,,EVENTOUT,
-PortH,PH13,,,,TIM8_CH1N,,,,,,CAN1_TX,,,,,,EVENTOUT,
-PortH,PH14,,,,TIM8_CH2N,,,,,,,,,,DCMI_D4,,EVENTOUT,
-PortH,PH15,,,,TIM8_CH3N,,,,,,,,,,DCMI_D11,,EVENTOUT,
-PortI,PI0,,,TIM5_CH4,,,SPI2_NSS/I2S2_WS,,,,,,,,DCMI_D13,,EVENTOUT,
-PortI,PI1,,,,,,SPI2_SCK/I2S2_CK,,,,,,,,DCMI_D8,,EVENTOUT,
-PortI,PI2,,,,TIM8_CH4,,SPI2_MISO,I2S2ext_SD,,,,,,,DCMI_D9,,EVENTOUT,
-PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SD,,,,,,,,DCMI_D10,,EVENTOUT,
-PortI,PI4,,,,TIM8_BKIN,,,,,,,,,,DCMI_D5,,EVENTOUT,
-PortI,PI5,,,,TIM8_CH1,,,,,,,,,,DCMI_VSYNC,,EVENTOUT,
-PortI,PI6,,,,TIM8_CH2,,,,,,,,,,DCMI_D6,,EVENTOUT,
-PortI,PI7,,,,TIM8_CH3,,,,,,,,,,DCMI_D7,,EVENTOUT,
-PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI9,,,,,,,,,,CAN1_RX,,,,,,EVENTOUT,
-PortI,PI10,,,,,,,,,,,,ETH_MII_RX_ER,,,,EVENTOUT,
-PortI,PI11,,,,,,,,,,,OTG_HS_ULPI_DIR,,,,,EVENTOUT,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5                   ,AF6              ,AF7               ,AF8           ,AF9                  ,AF10           ,AF11                           ,AF12                ,AF13      ,AF14,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/SPI2/I2S2/I2S2ext,SPI3/I2Sext/I2S3 ,USART1/2/3/I2S3ext,UART4/5/USART6,CAN1/CAN2/TIM12/13/14,OTG_FS/OTG_HS  ,ETH                            ,FSMC/SDIO/OTG_FS    ,DCMI      ,    ,        ,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      ,                     ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                    ,          ,    ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                      ,                 ,USART2_TX         ,              ,                     ,               ,ETH_MDIO                       ,                    ,          ,    ,EVENTOUT,ADC123_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                      ,                 ,USART2_RX         ,              ,                     ,OTG_HS_ULPI_D0 ,ETH_MII_COL                    ,                    ,          ,    ,EVENTOUT,ADC123_IN3
+PortA,PA4 ,             ,                 ,        ,            ,         ,SPI1_NSS              ,SPI3_NSS/I2S3_WS ,USART2_CK         ,              ,                     ,               ,                               ,OTG_HS_SOF          ,DCMI_HSYNC,    ,EVENTOUT,ADC12_IN4
+PortA,PA5 ,             ,TIM2_CH1/TIM2_ETR,        ,TIM8_CH1N   ,         ,SPI1_SCK              ,                 ,                  ,              ,                     ,OTG_HS_ULPI_CK ,                               ,                    ,          ,    ,EVENTOUT,ADC12_IN5
+PortA,PA6 ,             ,TIM1_BKIN        ,TIM3_CH1,TIM8_BKIN   ,         ,SPI1_MISO             ,                 ,                  ,              ,TIM13_CH1            ,               ,                               ,                    ,DCMI_PIXCK,    ,EVENTOUT,ADC12_IN6
+PortA,PA7 ,             ,TIM1_CH1N        ,TIM3_CH2,TIM8_CH1N   ,         ,SPI1_MOSI             ,                 ,                  ,              ,TIM14_CH1            ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                    ,          ,    ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                      ,                 ,USART1_CK         ,              ,                     ,OTG_FS_SOF     ,                               ,                    ,          ,    ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                      ,                 ,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        ,              ,CAN1_TX              ,OTG_FS_DP      ,                               ,                    ,          ,    ,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   ,         ,                      ,                 ,                  ,              ,                     ,OTG_HS_ULPI_D1 ,ETH_MII_RXD2                   ,                    ,          ,    ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                      ,                 ,                  ,              ,                     ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                    ,          ,    ,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        ,I2S3ext_SD        ,              ,                     ,               ,                               ,                    ,          ,    ,EVENTOUT,
+PortB,PB5 ,             ,                 ,TIM3_CH2,            ,I2C1_SMBA,SPI1_MOSI             ,SPI3_MOSI/I2S3_SD,                  ,              ,CAN2_RX              ,OTG_HS_ULPI_D7 ,ETH_PPS_OUT                    ,                    ,DCMI_D10  ,    ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                      ,                 ,USART1_TX         ,              ,CAN2_TX              ,               ,                               ,                    ,DCMI_D5   ,    ,EVENTOUT,
+PortB,PB7 ,             ,                 ,TIM4_CH2,            ,I2C1_SDA ,                      ,                 ,USART1_RX         ,              ,                     ,               ,                               ,FSMC_NL             ,DCMI_VSYNC,    ,EVENTOUT,
+PortB,PB8 ,             ,                 ,TIM4_CH3,TIM10_CH1   ,I2C1_SCL ,                      ,                 ,                  ,              ,CAN1_RX              ,               ,ETH_MII_TXD3                   ,SDIO_D4             ,DCMI_D6   ,    ,EVENTOUT,
+PortB,PB9 ,             ,                 ,TIM4_CH4,TIM11_CH1   ,I2C1_SDA ,SPI2_NSS/I2S2_WS      ,                 ,                  ,              ,CAN1_TX              ,               ,                               ,SDIO_D5             ,DCMI_D7   ,    ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3         ,        ,            ,I2C2_SCL ,SPI2_SCK/I2S2_CK      ,                 ,USART3_TX         ,              ,                     ,OTG_HS_ULPI_D3 ,ETH_MII_RX_ER                  ,                    ,          ,    ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4         ,        ,            ,I2C2_SDA ,                      ,                 ,USART3_RX         ,              ,                     ,OTG_HS_ULPI_D4 ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,                    ,          ,    ,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             ,I2S2ext_SD       ,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,                               ,                    ,          ,    ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MDC                        ,                    ,          ,    ,EVENTOUT,ADC123_IN11
+PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO             ,I2S2ext_SD       ,                  ,              ,                     ,OTG_HS_ULPI_DIR,ETH_MII_TXD2                   ,                    ,          ,    ,EVENTOUT,ADC123_IN12
+PortC,PC3 ,             ,                 ,        ,            ,         ,SPI2_MOSI/I2S2_SD     ,                 ,                  ,              ,                     ,OTG_HS_ULPI_NXT,ETH_MII_TX_CLK                 ,                    ,          ,    ,EVENTOUT,ADC123_IN13
+PortC,PC4 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_RXD0/ETH_RMII_RXD0     ,                    ,          ,    ,EVENTOUT,ADC123_IN14
+PortC,PC5 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                    ,          ,    ,EVENTOUT,ADC123_IN15
+PortC,PC6 ,             ,                 ,TIM3_CH1,TIM8_CH1    ,         ,I2S2_MCK              ,                 ,                  ,USART6_TX     ,                     ,               ,                               ,SDIO_D6             ,DCMI_D0   ,    ,EVENTOUT,
+PortC,PC7 ,             ,                 ,TIM3_CH2,TIM8_CH2    ,         ,                      ,I2S3_MCK         ,                  ,USART6_RX     ,                     ,               ,                               ,SDIO_D7             ,DCMI_D1   ,    ,EVENTOUT,
+PortC,PC8 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                      ,                 ,                  ,USART6_CK     ,                     ,               ,                               ,SDIO_D0             ,DCMI_D2   ,    ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN              ,                 ,                  ,              ,                     ,               ,                               ,SDIO_D1             ,DCMI_D3   ,    ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,            ,         ,                      ,SPI3_SCK/I2S3_CK ,USART3_TX         ,UART4_TX      ,                     ,               ,                               ,SDIO_D2             ,DCMI_D8   ,    ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD            ,SPI3_MISO        ,USART3_RX         ,UART4_RX      ,                     ,               ,                               ,SDIO_D3             ,DCMI_D4   ,    ,EVENTOUT,
+PortC,PC12,             ,                 ,        ,            ,         ,                      ,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              ,               ,                               ,FSMC_D2             ,          ,    ,EVENTOUT,
+PortD,PD1 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,CAN1_TX              ,               ,                               ,FSMC_D3             ,          ,    ,EVENTOUT,
+PortD,PD2 ,             ,                 ,TIM3_ETR,            ,         ,                      ,                 ,                  ,UART5_RX      ,                     ,               ,                               ,SDIO_CMD            ,DCMI_D11  ,    ,EVENTOUT,
+PortD,PD3 ,             ,                 ,        ,            ,         ,                      ,                 ,USART2_CTS        ,              ,                     ,               ,                               ,FSMC_CLK            ,          ,    ,EVENTOUT,
+PortD,PD4 ,             ,                 ,        ,            ,         ,                      ,                 ,USART2_RTS        ,              ,                     ,               ,                               ,FSMC_NOE            ,          ,    ,EVENTOUT,
+PortD,PD5 ,             ,                 ,        ,            ,         ,                      ,                 ,USART2_TX         ,              ,                     ,               ,                               ,FSMC_NWE            ,          ,    ,EVENTOUT,
+PortD,PD6 ,             ,                 ,        ,            ,         ,                      ,                 ,USART2_RX         ,              ,                     ,               ,                               ,FSMC_NWAIT          ,          ,    ,EVENTOUT,
+PortD,PD7 ,             ,                 ,        ,            ,         ,                      ,                 ,USART2_CK         ,              ,                     ,               ,                               ,FSMC_NE1/FSMC_NCE2  ,          ,    ,EVENTOUT,
+PortD,PD8 ,             ,                 ,        ,            ,         ,                      ,                 ,USART3_TX         ,              ,                     ,               ,                               ,FSMC_D13            ,          ,    ,EVENTOUT,
+PortD,PD9 ,             ,                 ,        ,            ,         ,                      ,                 ,USART3_RX         ,              ,                     ,               ,                               ,FSMC_D14            ,          ,    ,EVENTOUT,
+PortD,PD10,             ,                 ,        ,            ,         ,                      ,                 ,USART3_CK         ,              ,                     ,               ,                               ,FSMC_D15            ,          ,    ,EVENTOUT,
+PortD,PD11,             ,                 ,        ,            ,         ,                      ,                 ,USART3_CTS        ,              ,                     ,               ,                               ,FSMC_A16            ,          ,    ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                      ,                 ,USART3_RTS        ,              ,                     ,               ,                               ,FSMC_A17            ,          ,    ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A18            ,          ,    ,EVENTOUT,
+PortD,PD14,             ,                 ,TIM4_CH3,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D0             ,          ,    ,EVENTOUT,
+PortD,PD15,             ,                 ,TIM4_CH4,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D1             ,          ,    ,EVENTOUT,
+PortE,PE0 ,             ,                 ,TIM4_ETR,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_NBL0           ,DCMI_D2   ,    ,EVENTOUT,
+PortE,PE1 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_NBL1           ,DCMI_D3   ,    ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_TXD3                   ,FSMC_A23            ,          ,    ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A19            ,          ,    ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A20            ,DCMI_D4   ,    ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                 ,        ,TIM9_CH1    ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A21            ,DCMI_D6   ,    ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,                 ,        ,TIM9_CH2    ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A22            ,DCMI_D7   ,    ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR         ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D4             ,          ,    ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D5             ,          ,    ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D6             ,          ,    ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D7             ,          ,    ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D8             ,          ,    ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D9             ,          ,    ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D10            ,          ,    ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D11            ,          ,    ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN        ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_D12            ,          ,    ,EVENTOUT,
+PortF,PF0 ,             ,                 ,        ,            ,I2C2_SDA ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A0             ,          ,    ,EVENTOUT,
+PortF,PF1 ,             ,                 ,        ,            ,I2C2_SCL ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A1             ,          ,    ,EVENTOUT,
+PortF,PF2 ,             ,                 ,        ,            ,I2C2_SMBA,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A2             ,          ,    ,EVENTOUT,
+PortF,PF3 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A3             ,          ,    ,EVENTOUT,ADC3_IN9
+PortF,PF4 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A4             ,          ,    ,EVENTOUT,ADC3_IN14
+PortF,PF5 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A5             ,          ,    ,EVENTOUT,ADC3_IN15
+PortF,PF6 ,             ,                 ,        ,TIM10_CH1   ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_NIORD          ,          ,    ,EVENTOUT,ADC3_IN4
+PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_NREG           ,          ,    ,EVENTOUT,ADC3_IN5
+PortF,PF8 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,TIM13_CH1            ,               ,                               ,FSMC_NIOWR          ,          ,    ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,TIM14_CH1            ,               ,                               ,FSMC_CD             ,          ,    ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_INTR           ,          ,    ,EVENTOUT,ADC3_IN8
+PortF,PF11,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D12  ,    ,EVENTOUT,
+PortF,PF12,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A6             ,          ,    ,EVENTOUT,
+PortF,PF13,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A7             ,          ,    ,EVENTOUT,
+PortF,PF14,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A8             ,          ,    ,EVENTOUT,
+PortF,PF15,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A9             ,          ,    ,EVENTOUT,
+PortG,PG0 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A10            ,          ,    ,EVENTOUT,
+PortG,PG1 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A11            ,          ,    ,EVENTOUT,
+PortG,PG2 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A12            ,          ,    ,EVENTOUT,
+PortG,PG3 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A13            ,          ,    ,EVENTOUT,
+PortG,PG4 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A14            ,          ,    ,EVENTOUT,
+PortG,PG5 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_A15            ,          ,    ,EVENTOUT,
+PortG,PG6 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_INT2           ,          ,    ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,USART6_CK     ,                     ,               ,                               ,FSMC_INT3           ,          ,    ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,USART6_RTS    ,                     ,               ,ETH_PPS_OUT                    ,                    ,          ,    ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,USART6_RX     ,                     ,               ,                               ,FSMC_NE2/FSMC_NCE3  ,          ,    ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,FSMC_NCE4_1/FSMC_NE3,          ,    ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FSMC_NCE4_2         ,          ,    ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,            ,         ,                      ,                 ,                  ,USART6_RTS    ,                     ,               ,                               ,FSMC_NE4            ,          ,    ,EVENTOUT,
+PortG,PG13,             ,                 ,        ,            ,         ,                      ,                 ,                  ,USART6_CTS    ,                     ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FSMC_A24            ,          ,    ,EVENTOUT,
+PortG,PG14,             ,                 ,        ,            ,         ,                      ,                 ,                  ,USART6_TX     ,                     ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FSMC_A25            ,          ,    ,EVENTOUT,
+PortG,PG15,             ,                 ,        ,            ,         ,                      ,                 ,                  ,USART6_CTS    ,                     ,               ,                               ,                    ,DCMI_D13  ,    ,EVENTOUT,
+PortH,PH0 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,          ,    ,EVENTOUT,
+PortH,PH1 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,          ,    ,EVENTOUT,
+PortH,PH2 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_CRS                    ,                    ,          ,    ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_COL                    ,                    ,          ,    ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                      ,                 ,                  ,              ,                     ,OTG_HS_ULPI_NXT,                               ,                    ,          ,    ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,          ,    ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,                      ,                 ,                  ,              ,TIM12_CH1            ,               ,ETH_MII_RXD2                   ,                    ,          ,    ,EVENTOUT,
+PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_RXD3                   ,                    ,          ,    ,EVENTOUT,
+PortH,PH8 ,             ,                 ,        ,            ,I2C3_SDA ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_HSYNC,    ,EVENTOUT,
+PortH,PH9 ,             ,                 ,        ,            ,I2C3_SMBA,                      ,                 ,                  ,              ,TIM12_CH2            ,               ,                               ,                    ,DCMI_D0   ,    ,EVENTOUT,
+PortH,PH10,             ,                 ,TIM5_CH1,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D1   ,    ,EVENTOUT,
+PortH,PH11,             ,                 ,TIM5_CH2,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D2   ,    ,EVENTOUT,
+PortH,PH12,             ,                 ,TIM5_CH3,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D3   ,    ,EVENTOUT,
+PortH,PH13,             ,                 ,        ,TIM8_CH1N   ,         ,                      ,                 ,                  ,              ,CAN1_TX              ,               ,                               ,                    ,          ,    ,EVENTOUT,
+PortH,PH14,             ,                 ,        ,TIM8_CH2N   ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D4   ,    ,EVENTOUT,
+PortH,PH15,             ,                 ,        ,TIM8_CH3N   ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D11  ,    ,EVENTOUT,
+PortI,PI0 ,             ,                 ,TIM5_CH4,            ,         ,SPI2_NSS/I2S2_WS      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D13  ,    ,EVENTOUT,
+PortI,PI1 ,             ,                 ,        ,            ,         ,SPI2_SCK/I2S2_CK      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D8   ,    ,EVENTOUT,
+PortI,PI2 ,             ,                 ,        ,TIM8_CH4    ,         ,SPI2_MISO             ,I2S2ext_SD       ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D9   ,    ,EVENTOUT,
+PortI,PI3 ,             ,                 ,        ,TIM8_ETR    ,         ,SPI2_MOSI/I2S2_SD     ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D10  ,    ,EVENTOUT,
+PortI,PI4 ,             ,                 ,        ,TIM8_BKIN   ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D5   ,    ,EVENTOUT,
+PortI,PI5 ,             ,                 ,        ,TIM8_CH1    ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_VSYNC,    ,EVENTOUT,
+PortI,PI6 ,             ,                 ,        ,TIM8_CH2    ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D6   ,    ,EVENTOUT,
+PortI,PI7 ,             ,                 ,        ,TIM8_CH3    ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,DCMI_D7   ,    ,EVENTOUT,
+PortI,PI8 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,                               ,                    ,          ,    ,EVENTOUT,
+PortI,PI9 ,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,CAN1_RX              ,               ,                               ,                    ,          ,    ,EVENTOUT,
+PortI,PI10,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,               ,ETH_MII_RX_ER                  ,                    ,          ,    ,EVENTOUT,
+PortI,PI11,             ,                 ,        ,            ,         ,                      ,                 ,                  ,              ,                     ,OTG_HS_ULPI_DIR,                               ,                    ,          ,    ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32f411_af.csv b/ports/stm32/boards/stm32f411_af.csv
index d5b7a61deb53e..752048a40501f 100644
--- a/ports/stm32/boards/stm32f411_af.csv
+++ b/ports/stm32/boards/stm32f411_af.csv
@@ -1,84 +1,84 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS_AF,TIM1/TIM2,TIM3/TIM4/TIM5,TIM9/TIM10/TIM11,I2C1/I2C2/I2C3,SPI1/I2S1/SPI2/I2S2/SPI3/I2S3,SPI2/I2S2/SPI3/I2S3/SPI4/I2S4/SPI5/I2S5,SPI3/I2S3/USART1/USART2,USART6,I2C2/I2C3,,,SDIO,,,,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,,,,,USART2_CTS,,,,,,,,EVENTOUT,ADC1_IN0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,SPI4_MOSI/I2S4_SD,,USART2_RTS,,,,,,,,EVENTOUT,ADC1_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,I2S2_CKIN,,USART2_TX,,,,,,,,EVENTOUT,ADC1_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,I2S2_MCK,,USART2_RX,,,,,,,,EVENTOUT,ADC1_IN3
-PortA,PA4,,,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,,,,EVENTOUT,ADC1_IN4
-PortA,PA5,,TIM2_CH1/TIM2_ETR,,,,SPI1_SCK/I2S1_CK,,,,,,,,,,EVENTOUT,ADC1_IN5
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,,,SPI1_MISO,I2S2_MCK,,,,,,SDIO_CMD,,,EVENTOUT,ADC1_IN6
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,,,SPI1_MOSI/I2S1_SD,,,,,,,,,,EVENTOUT,ADC1_IN7
-PortA,PA8,MCO_1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,USB_FS_SOF,,SDIO_D1,,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,,,USART1_TX,,,USB_FS_VBUS,,SDIO_D2,,,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,,,,SPI5_MOSI/I2S5_SD,USART1_RX,,,USB_FS_ID,,,,,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,,,,SPI4_MISO,USART1_CTS,USART6_TX,,USB_FS_DM,,,,,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,,,,SPI5_MISO,USART1_RTS,USART6_RX,,USB_FS_DP,,,,,EVENTOUT,
-PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA15,JTDI,TIM2_CH1/TIM2_ETR,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART1_TX,,,,,,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,,,,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,ADC1_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,,,,SPI5_NSS/I2S5_WS,,,,,,,,,EVENTOUT,ADC1_IN9
-PortB,PB2,,,,,,,,,,,,,,,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,USART1_RX,,I2C2_SDA,,,,,,EVENTOUT,
-PortB,PB4,JTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,I2S3ext_SD,,I2C3_SDA,,,SDIO_D0,,,EVENTOUT,
-PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI/I2S1_SD,SPI3_MOSI/I2S3_SD,,,,,,SDIO_D3,,,EVENTOUT,
-PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,,,,,,,EVENTOUT,
-PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,,USART1_RX,,,,,SDIO_D0,,,EVENTOUT,
-PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,SPI5_MOSI/I2S5_SD,,,I2C3_SDA,,,SDIO_D4,,,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,I2C2_SDA,,,SDIO_D5,,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,I2S3_MCK,,,,,,SDIO_D7,,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C2_SDA,I2S2_CKIN,,,,,,,,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,SPI4_NSS/I2S4_WS,SPI3_SCK/I2S3_CK,,,,,,,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,,SPI2_SCK/I2S2_CK,SPI4_SCK/I2S4_CK,,,,,,,,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,,,SPI2_MISO,I2S2ext_SD,,,,,,SDIO_D6,,,EVENTOUT,
-PortB,PB15,RTC_50Hz,TIM1_CH3N,,,,SPI2_MOSI/I2S2_SD,,,,,,,SDIO_CK,,,EVENTOUT,
-PortC,PC0,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN10
-PortC,PC1,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN11
-PortC,PC2,,,,,,SPI2_MISO,I2S2ext_SD,,,,,,,,,EVENTOUT,ADC1_IN12
-PortC,PC3,,,,,,SPI2_MOSI/I2S2_SD,,,,,,,,,,EVENTOUT,ADC1_IN13
-PortC,PC4,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN14
-PortC,PC5,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN15
-PortC,PC6,,,TIM3_CH1,,,I2S2_MCK,,,USART6_TX,,,,SDIO_D6,,,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,,,SPI2_SCK/I2S2_CK,I2S3_MCK,,USART6_RX,,,,SDIO_D7,,,EVENTOUT,
-PortC,PC8,,,TIM3_CH3,,,,,,USART6_CK,,,,SDIO_D0,,,EVENTOUT,
-PortC,PC9,MCO_2,,TIM3_CH4,,I2C3_SDA,I2S2_CKIN,,,,,,,SDIO_D1,,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,,,,,,SDIO_D2,,,EVENTOUT,
-PortC,PC11,,,,,,I2S3ext_SD,SPI3_MISO,,,,,,SDIO_D3,,,EVENTOUT,
-PortC,PC12,,,,,,,SPI3_MOSI/I2S3_SD,,,,,,SDIO_CK,,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD1,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD2,,,TIM3_ETR,,,,,,,,,,SDIO_CMD,,,EVENTOUT,
-PortD,PD3,,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS,,,,,,,,EVENTOUT,
-PortD,PD4,,,,,,,,USART2_RTS,,,,,,,,EVENTOUT,
-PortD,PD5,,,,,,,,USART2_TX,,,,,,,,EVENTOUT,
-PortD,PD6,,,,,,SPI3_MOSI/I2S3_SD,,USART2_RX,,,,,,,,EVENTOUT,
-PortD,PD7,,,,,,,,USART2_CK,,,,,,,,EVENTOUT,
-PortD,PD8,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD9,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD10,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD11,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,,,,,,,,,,,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,,,,,,,,,,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,,,,,,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,,,,,,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,,,,,,,,,,,,,EVENTOUT,
-PortE,PE1,,,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE2,TRACECLK,,,,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE4,TRACED1,,,,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,,,,,,,,,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SPI5_MISO,,,,,,,,,EVENTOUT,
-PortE,PE6,TRACED3,,,TIM9_CH2,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,,,,,,,,,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,,,,,,,,,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,SPI5_MISO,,,,,,,,,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,,,,,,,,,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
+Port ,Pin ,AF0          ,AF1              ,AF2           ,AF3             ,AF4           ,AF5                          ,AF6                                    ,AF7                    ,AF8      ,AF9      ,AF10       ,AF11,AF12    ,AF13,AF14,AF15    ,ADC
+     ,    ,SYS_AF       ,TIM1/TIM2        ,TIM3/TIM4/TIM5,TIM9/TIM10/TIM11,I2C1/I2C2/I2C3,SPI1/I2S1/SPI2/I2S2/SPI3/I2S3,SPI2/I2S2/SPI3/I2S3/SPI4/I2S4/SPI5/I2S5,SPI3/I2S3/USART1/USART2,USART6   ,I2C2/I2C3,           ,    ,SDIO    ,    ,    ,        ,ADC
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1      ,                ,              ,                             ,                                       ,USART2_CTS             ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN0
+PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2      ,                ,              ,SPI4_MOSI/I2S4_SD            ,                                       ,USART2_RTS             ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3      ,TIM9_CH1        ,              ,I2S2_CKIN                    ,                                       ,USART2_TX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4      ,TIM9_CH2        ,              ,I2S2_MCK                     ,                                       ,USART2_RX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN3
+PortA,PA4 ,             ,                 ,              ,                ,              ,SPI1_NSS/I2S1_WS             ,SPI3_NSS/I2S3_WS                       ,USART2_CK              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN4
+PortA,PA5 ,             ,TIM2_CH1/TIM2_ETR,              ,                ,              ,SPI1_SCK/I2S1_CK             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN5
+PortA,PA6 ,             ,TIM1_BKIN        ,TIM3_CH1      ,                ,              ,SPI1_MISO                    ,I2S2_MCK                               ,                       ,         ,         ,           ,    ,SDIO_CMD,    ,    ,EVENTOUT,ADC1_IN6
+PortA,PA7 ,             ,TIM1_CH1N        ,TIM3_CH2      ,                ,              ,SPI1_MOSI/I2S1_SD            ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN7
+PortA,PA8 ,MCO_1        ,TIM1_CH1         ,              ,                ,I2C3_SCL      ,                             ,                                       ,USART1_CK              ,         ,         ,USB_FS_SOF ,    ,SDIO_D1 ,    ,    ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,              ,                ,I2C3_SMBA     ,                             ,                                       ,USART1_TX              ,         ,         ,USB_FS_VBUS,    ,SDIO_D2 ,    ,    ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3         ,              ,                ,              ,                             ,SPI5_MOSI/I2S5_SD                      ,USART1_RX              ,         ,         ,USB_FS_ID  ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4         ,              ,                ,              ,                             ,SPI4_MISO                              ,USART1_CTS             ,USART6_TX,         ,USB_FS_DM  ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR         ,              ,                ,              ,                             ,SPI5_MISO                              ,USART1_RTS             ,USART6_RX,         ,USB_FS_DP  ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1/TIM2_ETR,              ,                ,              ,SPI1_NSS/I2S1_WS             ,SPI3_NSS/I2S3_WS                       ,USART1_TX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N        ,TIM3_CH3      ,                ,              ,                             ,SPI5_SCK/I2S5_CK                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4      ,                ,              ,                             ,SPI5_NSS/I2S5_WS                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN9
+PortB,PB2 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2         ,              ,                ,              ,SPI1_SCK/I2S1_CK             ,SPI3_SCK/I2S3_CK                       ,USART1_RX              ,         ,I2C2_SDA ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB4 ,JTRST        ,                 ,TIM3_CH1      ,                ,              ,SPI1_MISO                    ,SPI3_MISO                              ,I2S3ext_SD             ,         ,I2C3_SDA ,           ,    ,SDIO_D0 ,    ,    ,EVENTOUT,
+PortB,PB5 ,             ,                 ,TIM3_CH2      ,                ,I2C1_SMBA     ,SPI1_MOSI/I2S1_SD            ,SPI3_MOSI/I2S3_SD                      ,                       ,         ,         ,           ,    ,SDIO_D3 ,    ,    ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1      ,                ,I2C1_SCL      ,                             ,                                       ,USART1_TX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB7 ,             ,                 ,TIM4_CH2      ,                ,I2C1_SDA      ,                             ,                                       ,USART1_RX              ,         ,         ,           ,    ,SDIO_D0 ,    ,    ,EVENTOUT,
+PortB,PB8 ,             ,                 ,TIM4_CH3      ,TIM10_CH1       ,I2C1_SCL      ,                             ,SPI5_MOSI/I2S5_SD                      ,                       ,         ,I2C3_SDA ,           ,    ,SDIO_D4 ,    ,    ,EVENTOUT,
+PortB,PB9 ,             ,                 ,TIM4_CH4      ,TIM11_CH1       ,I2C1_SDA      ,SPI2_NSS/I2S2_WS             ,                                       ,                       ,         ,I2C2_SDA ,           ,    ,SDIO_D5 ,    ,    ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3         ,              ,                ,I2C2_SCL      ,SPI2_SCK/I2S2_CK             ,I2S3_MCK                               ,                       ,         ,         ,           ,    ,SDIO_D7 ,    ,    ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4         ,              ,                ,I2C2_SDA      ,I2S2_CKIN                    ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN        ,              ,                ,I2C2_SMBA     ,SPI2_NSS/I2S2_WS             ,SPI4_NSS/I2S4_WS                       ,SPI3_SCK/I2S3_CK       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N        ,              ,                ,              ,SPI2_SCK/I2S2_CK             ,SPI4_SCK/I2S4_CK                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N        ,              ,                ,              ,SPI2_MISO                    ,I2S2ext_SD                             ,                       ,         ,         ,           ,    ,SDIO_D6 ,    ,    ,EVENTOUT,
+PortB,PB15,RTC_50Hz     ,TIM1_CH3N        ,              ,                ,              ,SPI2_MOSI/I2S2_SD            ,                                       ,                       ,         ,         ,           ,    ,SDIO_CK ,    ,    ,EVENTOUT,
+PortC,PC0 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN10
+PortC,PC1 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN11
+PortC,PC2 ,             ,                 ,              ,                ,              ,SPI2_MISO                    ,I2S2ext_SD                             ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN12
+PortC,PC3 ,             ,                 ,              ,                ,              ,SPI2_MOSI/I2S2_SD            ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN13
+PortC,PC4 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN14
+PortC,PC5 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,ADC1_IN15
+PortC,PC6 ,             ,                 ,TIM3_CH1      ,                ,              ,I2S2_MCK                     ,                                       ,                       ,USART6_TX,         ,           ,    ,SDIO_D6 ,    ,    ,EVENTOUT,
+PortC,PC7 ,             ,                 ,TIM3_CH2      ,                ,              ,SPI2_SCK/I2S2_CK             ,I2S3_MCK                               ,                       ,USART6_RX,         ,           ,    ,SDIO_D7 ,    ,    ,EVENTOUT,
+PortC,PC8 ,             ,                 ,TIM3_CH3      ,                ,              ,                             ,                                       ,                       ,USART6_CK,         ,           ,    ,SDIO_D0 ,    ,    ,EVENTOUT,
+PortC,PC9 ,MCO_2        ,                 ,TIM3_CH4      ,                ,I2C3_SDA      ,I2S2_CKIN                    ,                                       ,                       ,         ,         ,           ,    ,SDIO_D1 ,    ,    ,EVENTOUT,
+PortC,PC10,             ,                 ,              ,                ,              ,                             ,SPI3_SCK/I2S3_CK                       ,                       ,         ,         ,           ,    ,SDIO_D2 ,    ,    ,EVENTOUT,
+PortC,PC11,             ,                 ,              ,                ,              ,I2S3ext_SD                   ,SPI3_MISO                              ,                       ,         ,         ,           ,    ,SDIO_D3 ,    ,    ,EVENTOUT,
+PortC,PC12,             ,                 ,              ,                ,              ,                             ,SPI3_MOSI/I2S3_SD                      ,                       ,         ,         ,           ,    ,SDIO_CK ,    ,    ,EVENTOUT,
+PortC,PC13,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortC,PC14,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortC,PC15,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD0 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD1 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD2 ,             ,                 ,TIM3_ETR      ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,SDIO_CMD,    ,    ,EVENTOUT,
+PortD,PD3 ,             ,                 ,              ,                ,              ,SPI2_SCK/I2S2_CK             ,                                       ,USART2_CTS             ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD4 ,             ,                 ,              ,                ,              ,                             ,                                       ,USART2_RTS             ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD5 ,             ,                 ,              ,                ,              ,                             ,                                       ,USART2_TX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD6 ,             ,                 ,              ,                ,              ,SPI3_MOSI/I2S3_SD            ,                                       ,USART2_RX              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD7 ,             ,                 ,              ,                ,              ,                             ,                                       ,USART2_CK              ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD8 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD9 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD10,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD11,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1      ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2      ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD14,             ,                 ,TIM4_CH3      ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortD,PD15,             ,                 ,TIM4_CH4      ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE0 ,             ,                 ,TIM4_ETR      ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE1 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                 ,              ,                ,              ,SPI4_SCK/I2S4_CK             ,SPI5_SCK/I2S5_CK                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                 ,              ,                ,              ,SPI4_NSS/I2S4_WS             ,SPI5_NSS/I2S5_WS                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                 ,              ,TIM9_CH1        ,              ,SPI4_MISO                    ,SPI5_MISO                              ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,                 ,              ,TIM9_CH2        ,              ,SPI4_MOSI/I2S4_SD            ,SPI5_MOSI/I2S5_SD                      ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR         ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,              ,                ,              ,SPI4_NSS/I2S4_WS             ,SPI5_NSS/I2S5_WS                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,              ,                ,              ,SPI4_SCK/I2S4_CK             ,SPI5_SCK/I2S5_CK                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,              ,                ,              ,SPI4_MISO                    ,SPI5_MISO                              ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,              ,                ,              ,SPI4_MOSI/I2S4_SD            ,SPI5_MOSI/I2S5_SD                      ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN        ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortH,PH0 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
+PortH,PH1 ,             ,                 ,              ,                ,              ,                             ,                                       ,                       ,         ,         ,           ,    ,        ,    ,    ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32f412_af.csv b/ports/stm32/boards/stm32f412_af.csv
index 90eb3d1df6503..b6281c1e420bc 100644
--- a/ports/stm32/boards/stm32f412_af.csv
+++ b/ports/stm32/boards/stm32f412_af.csv
@@ -1,116 +1,116 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS_AF,TIM1/TIM2,TIM3/TIM4/TIM5,TIM8/9/10/11,I2C1/2/3/I2CFMP1,SPI1/2/3/4/I2S1/2/3/4,SPI2/3/4/5/I2S2/3/4/5/DFSDM1/2,SPI3/I2S3/USART1/2/3,USART3/6/CAN1/DFSDM1,I2C2/I2C3/I2CFMP1/CAN1/2/TIM12/13/14/QUADSPI,DFSDM1/QUADSPI/FSMC/OTG1_FS,,FSMC /SDIO,,,SYS_AF,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,,,,,,,,EVENTOUT,ADC1_IN0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,SPI4_MOSI/I2S4_SD,,USART2_RTS,,QUADSPI_BK1_IO3,,,,,,EVENTOUT,ADC1_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,I2S2_CKIN,,USART2_TX,,,,,FSMC_D4,,,EVENTOUT,ADC1_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,I2S2_MCK,,USART2_RX,,,,,FSMC_D5,,,EVENTOUT,ADC1_IN3
-PortA,PA4,,,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,DFSDM1_DATIN1,,,,FSMC_D6,,,EVENTOUT,ADC1_IN4
-PortA,PA5,,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,DFSDM1_CKIN1,,,,FSMC_D7,,,EVENTOUT,ADC1_IN5
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO,I2S2_MCK,,,TIM13_CH1,QUADSPI_BK2_IO0,,SDIO_CMD,,,EVENTOUT,ADC1_IN6
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SD,,,,TIM14_CH1,QUADSPI_BK2_IO1,,,,,EVENTOUT,ADC1_IN7
-PortA,PA8,MCO_1,TIM1_CH1,,,I2C3_SCL,,DFSDM1_CKOUT,USART1_CK,,,USB_FS_SOF,,SDIO_D1,,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,,USB_FS_VBUS,,SDIO_D2,,,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,,,SPI2_MOSI/I2S2_SD,SPI5_MOSI/I2S5_SD,USART1_RX,,,USB_FS_ID,,,,,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,,,SPI2_NSS/I2S2_WS,SPI4_MISO,USART1_CTS,USART6_TX,CAN1_RX,USB_FS_DM,,,,,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,,,SPI2_MISO,SPI5_MISO,USART1_RTS,USART6_RX,CAN1_TX,USB_FS_DP,,,,,EVENTOUT,
-PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA15,JTDI,TIM2_CH1/TIM2_ETR,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART1_TX,,,,,,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,ADC1_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,SPI5_NSS/I2S5_WS,,DFSDM1_DATIN0,QUADSPI_CLK,,,,,,EVENTOUT,ADC1_IN9
-PortB,PB2,,,,,,,DFSDM1_CKIN0,,,QUADSPI_CLK,,,,,,EVENTOUT,
-PortB,PB3,JTDO,TIM2_CH2,,,I2CFMP1_SDA,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,USART1_RX,UART7_RX,I2C2_SDA,,,,,,EVENTOUT,
-PortB,PB4,JTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,I2S3ext_SD,UART7_TX,I2C3_SDA,,,SDIO_D0,,,EVENTOUT,
-PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI/I2S1_SD,SPI3_MOSI/I2S3_SD,,,CAN2_RX,,,SDIO_D3,,,EVENTOUT,
-PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,DFSDM2_CKIN7,USART1_TX,,CAN2_TX,QUADSPI_BK1_NCS,,SDIO_D0,,,EVENTOUT,
-PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,DFSDM2_DATIN7,USART1_RX,,,,,FSMC_NL,,,EVENTOUT,
-PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,SPI5_MOSI/I2S5_SD,,CAN1_RX,I2C3_SDA,,,SDIO_D4,,,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,DFSDM2_DATIN1,,CAN1_TX,I2C2_SDA,,,SDIO_D5,,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,I2S3_MCK,USART3_TX,,I2CFMP4_SCL,,,SDIO_D7,,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C2_SDA,I2S2_CKIN,,USART3_RX,,,,,,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,SPI4_NSS/I2S4_WS,SPI3_SCK/I2S3_CK,USART3__CK,CAN2_RX,DFSDM1_DATIN1,,FSMC_D13/FSMC_DA13,,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,I2CFMP1_SMBA,SPI2_SCK/I2S2_CK,SPI4_SCK/I2S4_CK,,USART3_CTS,CAN2_TX,DFSDM1_CKIN1,,,,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,I2CFMP1_SDA,SPI2_MISO,I2S2ext_SD,USART3_RTS,DFSDM1_DATIN2,TIM12_CH1,FSMC_D0,,SDIO_D6,,,EVENTOUT,
-PortB,PB15,RTC_50HZ,TIM1_CH3N,,TIM8_CH3N,I2CFMP1_SCL,SPI2_MOSI/I2S2_SD,,,DFSDM1_CKIN2,TIM12_CH2,,,SDIO_CK,,,EVENTOUT,
-PortC,PC0,,,,,,,,SAI1_MCLK_B,,,,,,,,EVENTOUT,ADC1_IN10
-PortC,PC1,,,,,,,,SAI1_SD_B,,,,,,,,EVENTOUT,ADC1_IN11
-PortC,PC2,,,,,,SPI2_MISO,I2S2ext_SD,SAI1_SCK_B,DFSDM1_CKOUT,,,,FSMC_NWE,,,EVENTOUT,ADC1_IN12
-PortC,PC3,,,,,,SPI2_MOSI/I2S2_SD,,SAI1_FS_B,,,,,FSMC_A0,,,EVENTOUT,ADC1_IN13
-PortC,PC4,,,,,,I2S1_MCK,,,,,QUADSPI_BK2_IO2,,FSMC_NE4,,,EVENTOUT,ADC1_IN14
-PortC,PC5,,,,,I2CFMP1_SMBA,,,USART3_RX,,,QUADSPI_BK2_IO3,,FSMC_NOE,,,EVENTOUT,ADC1_IN15
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,2CFMP1_SCL,I2S2_MCK,DFSDM1_CKIN3,,USART6_TX,,FSMC_D1,,SDIO_D6,,,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,I2CFMP1_SDA,SPI2_SCK/I2S2_CK,I2S3_MCK,,USART6_RX,,DFSDM1_DATIN3,,SDIO_D7,,,EVENTOUT,
-PortC,PC8,,,TIM3_CH3,TIM8_CH3,,,,,USART6_CK,QUADSPI_BK1_IO2,,,SDIO_D0,,,EVENTOUT,
-PortC,PC9,MCO_2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S2_CKIN,,,,QUADSPI_BK1_IO0,,,SDIO_D1,,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,,QUADSPI_BK1_IO1,,,SDIO_D2,,,EVENTOUT,
-PortC,PC11,,,,,,I2S3ext_SD,SPI3_MISO,USART3_RX,,QUADSPI_BK2_NCS,FSMC_D2,,SDIO_D3,,,EVENTOUT,
-PortC,PC12,,,,,,,SPI3_MOSI/I2S3_SD,USART3_CK,,,FSMC_D3,,SDIO_CK,,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,,,,,,,CAN1_RX,,,FSMC_D2/FSMC_DA2,,,EVENTOUT,
-PortD,PD1,,,,,,,,,,CAN1_TX,,,FSMC_D3/FSMC_DA3,,,EVENTOUT,
-PortD,PD2,,,TIM3_ETR,,,,,,,,FSMC_NWE,,SDIO_CMD,,,EVENTOUT,
-PortD,PD3,TRACED1,,,,,SPI2_SCK/I2S2_CK,DFSDM1_DATIN0,USART2_CTS,,QUADSPI_CLK,,,FSMC_CLK,,,EVENTOUT,
-PortD,PD4,,,,,,,DFSDM1_CKIN0,USART2_RTS,,,,,FSMC_NOE,,,EVENTOUT,
-PortD,PD5,,,,,,,,USART2_TX,,,,,FSMC_NWE,,,EVENTOUT,
-PortD,PD6,,,,,,SPI3_MOSI/I2S3_SD,DFSDM1_DATIN1,USART2_RX,,,,,FSMC_NWAIT,,,EVENTOUT,
-PortD,PD7,,,,,,,DFSDM1_CKIN1,USART2_CK,,,,,FSMC_NE1,,,EVENTOUT,
-PortD,PD8,,,,,,,,USART3_TX,,,,,FSMC_D13/FSMC_DA13,,,EVENTOUT,
-PortD,PD9,,,,,,,,USART3_RX,,,,,FSMC_D14/FSMC_DA14,,,EVENTOUT,
-PortD,PD10,,,,,,,,USART3_CK,,,,,FSMC_D15/FSMC_DA15,,,EVENTOUT,
-PortD,PD11,,,,,I2CFMP1_SMBA,,,USART3_CTS,,QUADSPI_BK1_IO0,,,FSMC_A16,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,,I2CFMP1_SCL,,,USART3_RTS,,QUADSPI_BK1_IO1,,,FSMC_A17,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,I2CFMP1_SDA,,,,,QUADSPI_BK1_IO3,,,FSMC_A18,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,I2CFMP1_SCL,,,,,,,,FSMC_D0/FSMC_DA0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,I2CFMP1_SDA,,,,,,,,FSMC_D1/FSMC_DA1,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,,,,,,,,,,FSMC_NBL0,,,EVENTOUT,
-PortE,PE1,,,,,,,,,,,,,FSMC_NBL1,,,EVENTOUT,
-PortE,PE2,TRACECLK,,,,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,SAI1_MCLK_A,,QUADSPI_BK1_IO2,,,FSMC_A23,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,,,,SAI1_SD_B,,,,,FSMC_A19,,,EVENTOUT,
-PortE,PE4,TRACED1,,,,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,SAI1_SD_A,DFSDM1_DATIN3,,,,FSMC_A20,,,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SPI5_MISO,SAI1_SCK_A,DFSDM1_CKIN3,,,,FSMC_A21,,,EVENTOUT,
-PortE,PE6,TRACED3,,,TIM9_CH2,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,SAI1_FS_A,,,,,FSMC_A22,,,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,DFSDM1_DATIN2,,,,QUADSPI_BK2_IO0,,FSMC_D4/FSMC_DA4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,DFSDM1_CKIN2,,,,QUADSPI_BK2_IO1,,FSMC_D5/FSMC_DA5,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,DFSDM1_CKOUT,,,,QUADSPI_BK2_IO2,,FSMC_D6/FSMC_DA6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,,,QUADSPI_BK2_IO3,,FSMC_D7/FSMC_DA7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,,,,,,FSMC_D8/FSMC_DA8,,,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,,,,,,FSMC_D9/FSMC_DA9,,,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,SPI5_MISO,,,,,,FSMC_D10/FSMC_DA10,,,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,,,,,,FSMC_D11/FSMC_DA11,,,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,,,,,,,,FSMC_D12/FSMC_DA12,,,EVENTOUT,
-PortF,PF0,,,,,I2C2_SDA,,,,,,,,FSMC_A0,,,EVENTOUT,
-PortF,PF1,,,,,I2C2_SCL,,,,,,,,FSMC_A1,,,EVENTOUT,
-PortF,PF2,,,,,I2C2_SMBA,,,,,,,,FSMC_A2,,,EVENTOUT,
-PortF,PF3,,,TIM5_CH1,,,,,,,,,,FSMC_A3,,,EVENTOUT,
-PortF,PF4,,,TIM5_CH2,,,,,,,,,,FSMC_A4,,,EVENTOUT,
-PortF,PF5,,,TIM5_CH3,,,,,,,,,,FSMC_A5,,,EVENTOUT,
-PortF,PF6,TRACED0,,,TIM10_CH1,,,,SAI1_SD_B,,QUADSPI_BK1_IO3,,,,,,EVENTOUT,
-PortF,PF7,TRACED1,,,TIM11_CH1,,,,SAI1_MCLK_B,,QUADSPI_BK1_IO2,,,,,,EVENTOUT,
-PortF,PF8,,,,,,,,SAI1_SCK_B,,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,
-PortF,PF9,,,,,,,,SAI1_FS_B,,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,
-PortF,PF10,,TIM1_ETR,TIM5_CH4,,,,,,,,,,,,,EVENTOUT,
-PortF,PF11,,,,TIM8_ETR,,,,,,,,,,,,EVENTOUT,
-PortF,PF12,,,,TIM8_BKIN,,,,,,,,,FSMC_A6,,,EVENTOUT,
-PortF,PF13,,,,,I2CFMP1_SMBA,,,,,,,,FSMC_A7,,,EVENTOUT,
-PortF,PF14,,,,,I2CFMP1_SCL,,,,,,,,FSMC_A8,,,EVENTOUT,
-PortF,PF15,,,,,I2CFMP1_SDA,,,,,,,,FSMC_A9,,,EVENTOUT,
-PortG,PG0,,,,,,,,,,CAN1_RX,,,FSMC_A10,,,EVENTOUT,
-PortG,PG1,,,,,,,,,,CAN1_TX,,,FSMC_A11,,,EVENTOUT,
-PortG,PG2,,,,,,,,,,,,,FSMC_A12,,,EVENTOUT,
-PortG,PG3,,,,,,,,,,,,,FSMC_A13,,,EVENTOUT,
-PortG,PG4,,,,,,,,,,,,,FSMC_A14,,,EVENTOUT,
-PortG,PG5,,,,,,,,,,,,,FSMC_A15,,,EVENTOUT,
-PortG,PG6,,,,,,,,,,,QUADSPI_BK1_NCS,,,,,EVENTOUT,
-PortG,PG7,,,,,,,,,USART6_CK,,,,,,,EVENTOUT,
-PortG,PG8,,,,,,,,,USART6_RTS,,,,,,,EVENTOUT,
-PortG,PG9,,,,,,,,,USART6_RX,QUADSPI_BK2_IO2,,,FSMC_NE2,,,EVENTOUT,
-PortG,PG10,,,,,,,,,,,,,FSMC_NE3,,,EVENTOUT,
-PortG,PG11,,,,,,,,,,CAN2_RX,,,,,,EVENTOUT,
-PortG,PG12,,,,,,,,,USART6_RTS,CAN2_TX,,,FSMC_NE4,,,EVENTOUT,
-PortG,PG13,TRACED2,,,,,,,,USART6_CTS,,,,FSMC_A24,,,EVENTOUT,
-PortG,PG14,TRACED3,,,,,,,,USART6_TX,QUADSPI_BK2_IO3,,,FSMC_A25,,,EVENTOUT,
-PortG,PG15,,,,,,,,,USART6_CTS,,,,,,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
+Port ,Pin ,AF0       ,AF1              ,AF2           ,AF3         ,AF4             ,AF5                  ,AF6                           ,AF7                 ,AF8                 ,AF9                                         ,AF10                       ,AF11,AF12              ,AF13,AF14,AF15    ,ADC
+     ,    ,SYS_AF    ,TIM1/TIM2        ,TIM3/TIM4/TIM5,TIM8/9/10/11,I2C1/2/3/I2CFMP1,SPI1/2/3/4/I2S1/2/3/4,SPI2/3/4/5/I2S2/3/4/5/DFSDM1/2,SPI3/I2S3/USART1/2/3,USART3/6/CAN1/DFSDM1,I2C2/I2C3/I2CFMP1/CAN1/2/TIM12/13/14/QUADSPI,DFSDM1/QUADSPI/FSMC/OTG1_FS,    ,FSMC /SDIO        ,    ,    ,SYS_AF  ,ADC
+PortA,PA0 ,          ,TIM2_CH1/TIM2_ETR,TIM5_CH1      ,TIM8_ETR    ,                ,                     ,                              ,USART2_CTS          ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,ADC1_IN0
+PortA,PA1 ,          ,TIM2_CH2         ,TIM5_CH2      ,            ,                ,SPI4_MOSI/I2S4_SD    ,                              ,USART2_RTS          ,                    ,QUADSPI_BK1_IO3                             ,                           ,    ,                  ,    ,    ,EVENTOUT,ADC1_IN1
+PortA,PA2 ,          ,TIM2_CH3         ,TIM5_CH3      ,TIM9_CH1    ,                ,I2S2_CKIN            ,                              ,USART2_TX           ,                    ,                                            ,                           ,    ,FSMC_D4           ,    ,    ,EVENTOUT,ADC1_IN2
+PortA,PA3 ,          ,TIM2_CH4         ,TIM5_CH4      ,TIM9_CH2    ,                ,I2S2_MCK             ,                              ,USART2_RX           ,                    ,                                            ,                           ,    ,FSMC_D5           ,    ,    ,EVENTOUT,ADC1_IN3
+PortA,PA4 ,          ,                 ,              ,            ,                ,SPI1_NSS/I2S1_WS     ,SPI3_NSS/I2S3_WS              ,USART2_CK           ,DFSDM1_DATIN1       ,                                            ,                           ,    ,FSMC_D6           ,    ,    ,EVENTOUT,ADC1_IN4
+PortA,PA5 ,          ,TIM2_CH1/TIM2_ETR,              ,TIM8_CH1N   ,                ,SPI1_SCK/I2S1_CK     ,                              ,                    ,DFSDM1_CKIN1        ,                                            ,                           ,    ,FSMC_D7           ,    ,    ,EVENTOUT,ADC1_IN5
+PortA,PA6 ,          ,TIM1_BKIN        ,TIM3_CH1      ,TIM8_BKIN   ,                ,SPI1_MISO            ,I2S2_MCK                      ,                    ,                    ,TIM13_CH1                                   ,QUADSPI_BK2_IO0            ,    ,SDIO_CMD          ,    ,    ,EVENTOUT,ADC1_IN6
+PortA,PA7 ,          ,TIM1_CH1N        ,TIM3_CH2      ,TIM8_CH1N   ,                ,SPI1_MOSI/I2S1_SD    ,                              ,                    ,                    ,TIM14_CH1                                   ,QUADSPI_BK2_IO1            ,    ,                  ,    ,    ,EVENTOUT,ADC1_IN7
+PortA,PA8 ,MCO_1     ,TIM1_CH1         ,              ,            ,I2C3_SCL        ,                     ,DFSDM1_CKOUT                  ,USART1_CK           ,                    ,                                            ,USB_FS_SOF                 ,    ,SDIO_D1           ,    ,    ,EVENTOUT,
+PortA,PA9 ,          ,TIM1_CH2         ,              ,            ,I2C3_SMBA       ,SPI2_SCK/I2S2_CK     ,                              ,USART1_TX           ,                    ,                                            ,USB_FS_VBUS                ,    ,SDIO_D2           ,    ,    ,EVENTOUT,
+PortA,PA10,          ,TIM1_CH3         ,              ,            ,                ,SPI2_MOSI/I2S2_SD    ,SPI5_MOSI/I2S5_SD             ,USART1_RX           ,                    ,                                            ,USB_FS_ID                  ,    ,                  ,    ,    ,EVENTOUT,
+PortA,PA11,          ,TIM1_CH4         ,              ,            ,                ,SPI2_NSS/I2S2_WS     ,SPI4_MISO                     ,USART1_CTS          ,USART6_TX           ,CAN1_RX                                     ,USB_FS_DM                  ,    ,                  ,    ,    ,EVENTOUT,
+PortA,PA12,          ,TIM1_ETR         ,              ,            ,                ,SPI2_MISO            ,SPI5_MISO                     ,USART1_RTS          ,USART6_RX           ,CAN1_TX                                     ,USB_FS_DP                  ,    ,                  ,    ,    ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortA,PA15,JTDI      ,TIM2_CH1/TIM2_ETR,              ,            ,                ,SPI1_NSS/I2S1_WS     ,SPI3_NSS/I2S3_WS              ,USART1_TX           ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortB,PB0 ,          ,TIM1_CH2N        ,TIM3_CH3      ,TIM8_CH2N   ,                ,                     ,SPI5_SCK/I2S5_CK              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,ADC1_IN8
+PortB,PB1 ,          ,TIM1_CH3N        ,TIM3_CH4      ,TIM8_CH3N   ,                ,                     ,SPI5_NSS/I2S5_WS              ,                    ,DFSDM1_DATIN0       ,QUADSPI_CLK                                 ,                           ,    ,                  ,    ,    ,EVENTOUT,ADC1_IN9
+PortB,PB2 ,          ,                 ,              ,            ,                ,                     ,DFSDM1_CKIN0                  ,                    ,                    ,QUADSPI_CLK                                 ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortB,PB3 ,JTDO      ,TIM2_CH2         ,              ,            ,I2CFMP1_SDA     ,SPI1_SCK/I2S1_CK     ,SPI3_SCK/I2S3_CK              ,USART1_RX           ,UART7_RX            ,I2C2_SDA                                    ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortB,PB4 ,JTRST     ,                 ,TIM3_CH1      ,            ,                ,SPI1_MISO            ,SPI3_MISO                     ,I2S3ext_SD          ,UART7_TX            ,I2C3_SDA                                    ,                           ,    ,SDIO_D0           ,    ,    ,EVENTOUT,
+PortB,PB5 ,          ,                 ,TIM3_CH2      ,            ,I2C1_SMBA       ,SPI1_MOSI/I2S1_SD    ,SPI3_MOSI/I2S3_SD             ,                    ,                    ,CAN2_RX                                     ,                           ,    ,SDIO_D3           ,    ,    ,EVENTOUT,
+PortB,PB6 ,          ,                 ,TIM4_CH1      ,            ,I2C1_SCL        ,                     ,DFSDM2_CKIN7                  ,USART1_TX           ,                    ,CAN2_TX                                     ,QUADSPI_BK1_NCS            ,    ,SDIO_D0           ,    ,    ,EVENTOUT,
+PortB,PB7 ,          ,                 ,TIM4_CH2      ,            ,I2C1_SDA        ,                     ,DFSDM2_DATIN7                 ,USART1_RX           ,                    ,                                            ,                           ,    ,FSMC_NL           ,    ,    ,EVENTOUT,
+PortB,PB8 ,          ,                 ,TIM4_CH3      ,TIM10_CH1   ,I2C1_SCL        ,                     ,SPI5_MOSI/I2S5_SD             ,                    ,CAN1_RX             ,I2C3_SDA                                    ,                           ,    ,SDIO_D4           ,    ,    ,EVENTOUT,
+PortB,PB9 ,          ,                 ,TIM4_CH4      ,TIM11_CH1   ,I2C1_SDA        ,SPI2_NSS/I2S2_WS     ,DFSDM2_DATIN1                 ,                    ,CAN1_TX             ,I2C2_SDA                                    ,                           ,    ,SDIO_D5           ,    ,    ,EVENTOUT,
+PortB,PB10,          ,TIM2_CH3         ,              ,            ,I2C2_SCL        ,SPI2_SCK/I2S2_CK     ,I2S3_MCK                      ,USART3_TX           ,                    ,I2CFMP4_SCL                                 ,                           ,    ,SDIO_D7           ,    ,    ,EVENTOUT,
+PortB,PB11,          ,TIM2_CH4         ,              ,            ,I2C2_SDA        ,I2S2_CKIN            ,                              ,USART3_RX           ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortB,PB12,          ,TIM1_BKIN        ,              ,            ,I2C2_SMBA       ,SPI2_NSS/I2S2_WS     ,SPI4_NSS/I2S4_WS              ,SPI3_SCK/I2S3_CK    ,USART3__CK          ,CAN2_RX                                     ,DFSDM1_DATIN1              ,    ,FSMC_D13/FSMC_DA13,    ,    ,EVENTOUT,
+PortB,PB13,          ,TIM1_CH1N        ,              ,            ,I2CFMP1_SMBA    ,SPI2_SCK/I2S2_CK     ,SPI4_SCK/I2S4_CK              ,                    ,USART3_CTS          ,CAN2_TX                                     ,DFSDM1_CKIN1               ,    ,                  ,    ,    ,EVENTOUT,
+PortB,PB14,          ,TIM1_CH2N        ,              ,TIM8_CH2N   ,I2CFMP1_SDA     ,SPI2_MISO            ,I2S2ext_SD                    ,USART3_RTS          ,DFSDM1_DATIN2       ,TIM12_CH1                                   ,FSMC_D0                    ,    ,SDIO_D6           ,    ,    ,EVENTOUT,
+PortB,PB15,RTC_50HZ  ,TIM1_CH3N        ,              ,TIM8_CH3N   ,I2CFMP1_SCL     ,SPI2_MOSI/I2S2_SD    ,                              ,                    ,DFSDM1_CKIN2        ,TIM12_CH2                                   ,                           ,    ,SDIO_CK           ,    ,    ,EVENTOUT,
+PortC,PC0 ,          ,                 ,              ,            ,                ,                     ,                              ,SAI1_MCLK_B         ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,ADC1_IN10
+PortC,PC1 ,          ,                 ,              ,            ,                ,                     ,                              ,SAI1_SD_B           ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,ADC1_IN11
+PortC,PC2 ,          ,                 ,              ,            ,                ,SPI2_MISO            ,I2S2ext_SD                    ,SAI1_SCK_B          ,DFSDM1_CKOUT        ,                                            ,                           ,    ,FSMC_NWE          ,    ,    ,EVENTOUT,ADC1_IN12
+PortC,PC3 ,          ,                 ,              ,            ,                ,SPI2_MOSI/I2S2_SD    ,                              ,SAI1_FS_B           ,                    ,                                            ,                           ,    ,FSMC_A0           ,    ,    ,EVENTOUT,ADC1_IN13
+PortC,PC4 ,          ,                 ,              ,            ,                ,I2S1_MCK             ,                              ,                    ,                    ,                                            ,QUADSPI_BK2_IO2            ,    ,FSMC_NE4          ,    ,    ,EVENTOUT,ADC1_IN14
+PortC,PC5 ,          ,                 ,              ,            ,I2CFMP1_SMBA    ,                     ,                              ,USART3_RX           ,                    ,                                            ,QUADSPI_BK2_IO3            ,    ,FSMC_NOE          ,    ,    ,EVENTOUT,ADC1_IN15
+PortC,PC6 ,          ,                 ,TIM3_CH1      ,TIM8_CH1    ,2CFMP1_SCL      ,I2S2_MCK             ,DFSDM1_CKIN3                  ,                    ,USART6_TX           ,                                            ,FSMC_D1                    ,    ,SDIO_D6           ,    ,    ,EVENTOUT,
+PortC,PC7 ,          ,                 ,TIM3_CH2      ,TIM8_CH2    ,I2CFMP1_SDA     ,SPI2_SCK/I2S2_CK     ,I2S3_MCK                      ,                    ,USART6_RX           ,                                            ,DFSDM1_DATIN3              ,    ,SDIO_D7           ,    ,    ,EVENTOUT,
+PortC,PC8 ,          ,                 ,TIM3_CH3      ,TIM8_CH3    ,                ,                     ,                              ,                    ,USART6_CK           ,QUADSPI_BK1_IO2                             ,                           ,    ,SDIO_D0           ,    ,    ,EVENTOUT,
+PortC,PC9 ,MCO_2     ,                 ,TIM3_CH4      ,TIM8_CH4    ,I2C3_SDA        ,I2S2_CKIN            ,                              ,                    ,                    ,QUADSPI_BK1_IO0                             ,                           ,    ,SDIO_D1           ,    ,    ,EVENTOUT,
+PortC,PC10,          ,                 ,              ,            ,                ,                     ,SPI3_SCK/I2S3_CK              ,USART3_TX           ,                    ,QUADSPI_BK1_IO1                             ,                           ,    ,SDIO_D2           ,    ,    ,EVENTOUT,
+PortC,PC11,          ,                 ,              ,            ,                ,I2S3ext_SD           ,SPI3_MISO                     ,USART3_RX           ,                    ,QUADSPI_BK2_NCS                             ,FSMC_D2                    ,    ,SDIO_D3           ,    ,    ,EVENTOUT,
+PortC,PC12,          ,                 ,              ,            ,                ,                     ,SPI3_MOSI/I2S3_SD             ,USART3_CK           ,                    ,                                            ,FSMC_D3                    ,    ,SDIO_CK           ,    ,    ,EVENTOUT,
+PortC,PC13,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortC,PC14,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortC,PC15,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortD,PD0 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,CAN1_RX                                     ,                           ,    ,FSMC_D2/FSMC_DA2  ,    ,    ,EVENTOUT,
+PortD,PD1 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,CAN1_TX                                     ,                           ,    ,FSMC_D3/FSMC_DA3  ,    ,    ,EVENTOUT,
+PortD,PD2 ,          ,                 ,TIM3_ETR      ,            ,                ,                     ,                              ,                    ,                    ,                                            ,FSMC_NWE                   ,    ,SDIO_CMD          ,    ,    ,EVENTOUT,
+PortD,PD3 ,TRACED1   ,                 ,              ,            ,                ,SPI2_SCK/I2S2_CK     ,DFSDM1_DATIN0                 ,USART2_CTS          ,                    ,QUADSPI_CLK                                 ,                           ,    ,FSMC_CLK          ,    ,    ,EVENTOUT,
+PortD,PD4 ,          ,                 ,              ,            ,                ,                     ,DFSDM1_CKIN0                  ,USART2_RTS          ,                    ,                                            ,                           ,    ,FSMC_NOE          ,    ,    ,EVENTOUT,
+PortD,PD5 ,          ,                 ,              ,            ,                ,                     ,                              ,USART2_TX           ,                    ,                                            ,                           ,    ,FSMC_NWE          ,    ,    ,EVENTOUT,
+PortD,PD6 ,          ,                 ,              ,            ,                ,SPI3_MOSI/I2S3_SD    ,DFSDM1_DATIN1                 ,USART2_RX           ,                    ,                                            ,                           ,    ,FSMC_NWAIT        ,    ,    ,EVENTOUT,
+PortD,PD7 ,          ,                 ,              ,            ,                ,                     ,DFSDM1_CKIN1                  ,USART2_CK           ,                    ,                                            ,                           ,    ,FSMC_NE1          ,    ,    ,EVENTOUT,
+PortD,PD8 ,          ,                 ,              ,            ,                ,                     ,                              ,USART3_TX           ,                    ,                                            ,                           ,    ,FSMC_D13/FSMC_DA13,    ,    ,EVENTOUT,
+PortD,PD9 ,          ,                 ,              ,            ,                ,                     ,                              ,USART3_RX           ,                    ,                                            ,                           ,    ,FSMC_D14/FSMC_DA14,    ,    ,EVENTOUT,
+PortD,PD10,          ,                 ,              ,            ,                ,                     ,                              ,USART3_CK           ,                    ,                                            ,                           ,    ,FSMC_D15/FSMC_DA15,    ,    ,EVENTOUT,
+PortD,PD11,          ,                 ,              ,            ,I2CFMP1_SMBA    ,                     ,                              ,USART3_CTS          ,                    ,QUADSPI_BK1_IO0                             ,                           ,    ,FSMC_A16          ,    ,    ,EVENTOUT,
+PortD,PD12,          ,                 ,TIM4_CH1      ,            ,I2CFMP1_SCL     ,                     ,                              ,USART3_RTS          ,                    ,QUADSPI_BK1_IO1                             ,                           ,    ,FSMC_A17          ,    ,    ,EVENTOUT,
+PortD,PD13,          ,                 ,TIM4_CH2      ,            ,I2CFMP1_SDA     ,                     ,                              ,                    ,                    ,QUADSPI_BK1_IO3                             ,                           ,    ,FSMC_A18          ,    ,    ,EVENTOUT,
+PortD,PD14,          ,                 ,TIM4_CH3      ,            ,I2CFMP1_SCL     ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_D0/FSMC_DA0  ,    ,    ,EVENTOUT,
+PortD,PD15,          ,                 ,TIM4_CH4      ,            ,I2CFMP1_SDA     ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_D1/FSMC_DA1  ,    ,    ,EVENTOUT,
+PortE,PE0 ,          ,                 ,TIM4_ETR      ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_NBL0         ,    ,    ,EVENTOUT,
+PortE,PE1 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_NBL1         ,    ,    ,EVENTOUT,
+PortE,PE2 ,TRACECLK  ,                 ,              ,            ,                ,SPI4_SCK/I2S4_CK     ,SPI5_SCK/I2S5_CK              ,SAI1_MCLK_A         ,                    ,QUADSPI_BK1_IO2                             ,                           ,    ,FSMC_A23          ,    ,    ,EVENTOUT,
+PortE,PE3 ,TRACED0   ,                 ,              ,            ,                ,                     ,                              ,SAI1_SD_B           ,                    ,                                            ,                           ,    ,FSMC_A19          ,    ,    ,EVENTOUT,
+PortE,PE4 ,TRACED1   ,                 ,              ,            ,                ,SPI4_NSS/I2S4_WS     ,SPI5_NSS/I2S5_WS              ,SAI1_SD_A           ,DFSDM1_DATIN3       ,                                            ,                           ,    ,FSMC_A20          ,    ,    ,EVENTOUT,
+PortE,PE5 ,TRACED2   ,                 ,              ,TIM9_CH1    ,                ,SPI4_MISO            ,SPI5_MISO                     ,SAI1_SCK_A          ,DFSDM1_CKIN3        ,                                            ,                           ,    ,FSMC_A21          ,    ,    ,EVENTOUT,
+PortE,PE6 ,TRACED3   ,                 ,              ,TIM9_CH2    ,                ,SPI4_MOSI/I2S4_SD    ,SPI5_MOSI/I2S5_SD             ,SAI1_FS_A           ,                    ,                                            ,                           ,    ,FSMC_A22          ,    ,    ,EVENTOUT,
+PortE,PE7 ,          ,TIM1_ETR         ,              ,            ,                ,                     ,DFSDM1_DATIN2                 ,                    ,                    ,                                            ,QUADSPI_BK2_IO0            ,    ,FSMC_D4/FSMC_DA4  ,    ,    ,EVENTOUT,
+PortE,PE8 ,          ,TIM1_CH1N        ,              ,            ,                ,                     ,DFSDM1_CKIN2                  ,                    ,                    ,                                            ,QUADSPI_BK2_IO1            ,    ,FSMC_D5/FSMC_DA5  ,    ,    ,EVENTOUT,
+PortE,PE9 ,          ,TIM1_CH1         ,              ,            ,                ,                     ,DFSDM1_CKOUT                  ,                    ,                    ,                                            ,QUADSPI_BK2_IO2            ,    ,FSMC_D6/FSMC_DA6  ,    ,    ,EVENTOUT,
+PortE,PE10,          ,TIM1_CH2N        ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,QUADSPI_BK2_IO3            ,    ,FSMC_D7/FSMC_DA7  ,    ,    ,EVENTOUT,
+PortE,PE11,          ,TIM1_CH2         ,              ,            ,                ,SPI4_NSS/I2S4_WS     ,SPI5_NSS/I2S5_WS              ,                    ,                    ,                                            ,                           ,    ,FSMC_D8/FSMC_DA8  ,    ,    ,EVENTOUT,
+PortE,PE12,          ,TIM1_CH3N        ,              ,            ,                ,SPI4_SCK/I2S4_CK     ,SPI5_SCK/I2S5_CK              ,                    ,                    ,                                            ,                           ,    ,FSMC_D9/FSMC_DA9  ,    ,    ,EVENTOUT,
+PortE,PE13,          ,TIM1_CH3         ,              ,            ,                ,SPI4_MISO            ,SPI5_MISO                     ,                    ,                    ,                                            ,                           ,    ,FSMC_D10/FSMC_DA10,    ,    ,EVENTOUT,
+PortE,PE14,          ,TIM1_CH4         ,              ,            ,                ,SPI4_MOSI/I2S4_SD    ,SPI5_MOSI/I2S5_SD             ,                    ,                    ,                                            ,                           ,    ,FSMC_D11/FSMC_DA11,    ,    ,EVENTOUT,
+PortE,PE15,          ,TIM1_BKIN        ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_D12/FSMC_DA12,    ,    ,EVENTOUT,
+PortF,PF0 ,          ,                 ,              ,            ,I2C2_SDA        ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A0           ,    ,    ,EVENTOUT,
+PortF,PF1 ,          ,                 ,              ,            ,I2C2_SCL        ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A1           ,    ,    ,EVENTOUT,
+PortF,PF2 ,          ,                 ,              ,            ,I2C2_SMBA       ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A2           ,    ,    ,EVENTOUT,
+PortF,PF3 ,          ,                 ,TIM5_CH1      ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A3           ,    ,    ,EVENTOUT,
+PortF,PF4 ,          ,                 ,TIM5_CH2      ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A4           ,    ,    ,EVENTOUT,
+PortF,PF5 ,          ,                 ,TIM5_CH3      ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A5           ,    ,    ,EVENTOUT,
+PortF,PF6 ,TRACED0   ,                 ,              ,TIM10_CH1   ,                ,                     ,                              ,SAI1_SD_B           ,                    ,QUADSPI_BK1_IO3                             ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortF,PF7 ,TRACED1   ,                 ,              ,TIM11_CH1   ,                ,                     ,                              ,SAI1_MCLK_B         ,                    ,QUADSPI_BK1_IO2                             ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortF,PF8 ,          ,                 ,              ,            ,                ,                     ,                              ,SAI1_SCK_B          ,                    ,TIM13_CH1                                   ,QUADSPI_BK1_IO0            ,    ,                  ,    ,    ,EVENTOUT,
+PortF,PF9 ,          ,                 ,              ,            ,                ,                     ,                              ,SAI1_FS_B           ,                    ,TIM14_CH1                                   ,QUADSPI_BK1_IO1            ,    ,                  ,    ,    ,EVENTOUT,
+PortF,PF10,          ,TIM1_ETR         ,TIM5_CH4      ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortF,PF11,          ,                 ,              ,TIM8_ETR    ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortF,PF12,          ,                 ,              ,TIM8_BKIN   ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A6           ,    ,    ,EVENTOUT,
+PortF,PF13,          ,                 ,              ,            ,I2CFMP1_SMBA    ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A7           ,    ,    ,EVENTOUT,
+PortF,PF14,          ,                 ,              ,            ,I2CFMP1_SCL     ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A8           ,    ,    ,EVENTOUT,
+PortF,PF15,          ,                 ,              ,            ,I2CFMP1_SDA     ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A9           ,    ,    ,EVENTOUT,
+PortG,PG0 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,CAN1_RX                                     ,                           ,    ,FSMC_A10          ,    ,    ,EVENTOUT,
+PortG,PG1 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,CAN1_TX                                     ,                           ,    ,FSMC_A11          ,    ,    ,EVENTOUT,
+PortG,PG2 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A12          ,    ,    ,EVENTOUT,
+PortG,PG3 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A13          ,    ,    ,EVENTOUT,
+PortG,PG4 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A14          ,    ,    ,EVENTOUT,
+PortG,PG5 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_A15          ,    ,    ,EVENTOUT,
+PortG,PG6 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,QUADSPI_BK1_NCS            ,    ,                  ,    ,    ,EVENTOUT,
+PortG,PG7 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,USART6_CK           ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortG,PG8 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,USART6_RTS          ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortG,PG9 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,USART6_RX           ,QUADSPI_BK2_IO2                             ,                           ,    ,FSMC_NE2          ,    ,    ,EVENTOUT,
+PortG,PG10,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,FSMC_NE3          ,    ,    ,EVENTOUT,
+PortG,PG11,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,CAN2_RX                                     ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortG,PG12,          ,                 ,              ,            ,                ,                     ,                              ,                    ,USART6_RTS          ,CAN2_TX                                     ,                           ,    ,FSMC_NE4          ,    ,    ,EVENTOUT,
+PortG,PG13,TRACED2   ,                 ,              ,            ,                ,                     ,                              ,                    ,USART6_CTS          ,                                            ,                           ,    ,FSMC_A24          ,    ,    ,EVENTOUT,
+PortG,PG14,TRACED3   ,                 ,              ,            ,                ,                     ,                              ,                    ,USART6_TX           ,QUADSPI_BK2_IO3                             ,                           ,    ,FSMC_A25          ,    ,    ,EVENTOUT,
+PortG,PG15,          ,                 ,              ,            ,                ,                     ,                              ,                    ,USART6_CTS          ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortH,PH0 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
+PortH,PH1 ,          ,                 ,              ,            ,                ,                     ,                              ,                    ,                    ,                                            ,                           ,    ,                  ,    ,    ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32f413_af.csv b/ports/stm32/boards/stm32f413_af.csv
index 428ce44cfcbbe..c564ea090b45a 100644
--- a/ports/stm32/boards/stm32f413_af.csv
+++ b/ports/stm32/boards/stm32f413_af.csv
@@ -1,116 +1,116 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS_AF,TIM1/TIM2/LPTIM1,TIM3/TIM4/TIM5,TIM8/9/10/11/DFSDM2,I2C1/2/3/I2CFMP1,SPI1/2/3/4/I2S1/2/3/4,SPI2/3/4/5/I2S2/3/4/5/DFSDM1/2,SPI3/I2S3/USART1/2/3/DFSDM2,USART3/4/5/6/7/8/CAN1/DFSDM1,I2C2/I2C3/I2CFMP1/CAN1/2/TIM12/13/14/QUADSPI,SAI1/DFSDM1/DFSDM2/QUADSPI/FSMC/OTG1_FS,UART4/5/9/10/CAN3,FSMC /SDIO,,RNG,SYS_AF,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,,,,,,EVENTOUT,ADC1_IN0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,SPI4_MOSI/I2S4_SD,,USART2_RTS,UART4_RX,QUADSPI_BK1_IO3,,,,,,EVENTOUT,ADC1_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,I2S2_CKIN,,USART2_TX,,,,,FSMC_D4,,,EVENTOUT,ADC1_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,I2S2_MCK,,USART2_RX,,,SAI1_SD_B,,FSMC_D5,,,EVENTOUT,ADC1_IN3
-PortA,PA4,,,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,DFSDM1_DATIN1,,,,FSMC_D6,,,EVENTOUT,ADC1_IN4
-PortA,PA5,,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,DFSDM1_CKIN1,,,,FSMC_D7,,,EVENTOUT,ADC1_IN5
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO,I2S2_MCK,DFSDM2_CKIN1,,TIM13_CH1,QUADSPI_BK2_IO0,,SDIO_CMD,,,EVENTOUT,ADC1_IN6
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SD,,DFSDM2_DATIN1,,TIM14_CH1,QUADSPI_BK2_IO1,,,,,EVENTOUT,ADC1_IN7
-PortA,PA8,MCO_1,TIM1_CH1,,,I2C3_SCL,,DFSDM1_CKOUT,USART1_CK,UART7_RX,,USB_FS_SOF,CAN3_RX,SDIO_D1,,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,DFSDM2_CKIN3,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,,USB_FS_VBUS,,SDIO_D2,,,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,DFSDM2_DATIN3,,SPI2_MOSI/I2S2_SD,SPI5_MOSI/I2S5_SD,USART1_RX,,,USB_FS_ID,,,,,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,DFSDM2_CKIN5,,SPI2_NSS/I2S2_WS,SPI4_MISO,USART1_CTS,USART6_TX,CAN1_RX,USB_FS_DM,UART4_RX,,,,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,DFSDM2_DATIN5,,SPI2_MISO,SPI5_MISO,USART1_RTS,USART6_RX,CAN1_TX,USB_FS_DP,UART4_TX,,,,EVENTOUT,
-PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA15,JTDI,TIM2_CH1/TIM2_ETR,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART1_TX,UART7_TX,,SAI1_MCLK_A,CAN3_TX,,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,SPI5_SCK/I2S5_CK,,,,,,,,,EVENTOUT,ADC1_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,SPI5_NSS/I2S5_WS,,DFSDM1_DATIN0,QUADSPI_CLK,,,,,,EVENTOUT,ADC1_IN9
-PortB,PB2,,LPTIM1_OUT,,,,,DFSDM1_CKIN0,,,QUADSPI_CLK,,,,,,EVENTOUT,
-PortB,PB3,JTDO,TIM2_CH2,,,I2CFMP1_SDA,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,USART1_RX,UART7_RX,I2C2_SDA,SAI1_SD_A,CAN3_RX,,,,EVENTOUT,
-PortB,PB4,JTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,I2S3ext_SD,UART7_TX,I2C3_SDA,SAI1_SCK_A,CAN3_TX,SDIO_D0,,,EVENTOUT,
-PortB,PB5,,LPTIM1_IN1,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI/I2S1_SD,SPI3_MOSI/I2S3_SD,,,CAN2_RX,SAI1_FS_A,UART5_RX,SDIO_D3,,,EVENTOUT,
-PortB,PB6,,LPTIM1_ETR,TIM4_CH1,,I2C1_SCL,,DFSDM2_CKIN7,USART1_TX,,CAN2_TX,QUADSPI_BK1_NCS,UART5_TX,SDIO_D0,,,EVENTOUT,
-PortB,PB7,,LPTIM1_IN2,TIM4_CH2,,I2C1_SDA,,DFSDM2_DATIN7,USART1_RX,,,,,FSMC_NL,,,EVENTOUT,
-PortB,PB8,,LPTIM1_OUT,TIM4_CH3,TIM10_CH1,I2C1_SCL,,SPI5_MOSI/I2S5_SD,DFSDM2_CKIN1,CAN1_RX,I2C3_SDA,,UART5_RX,SDIO_D4,,,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,DFSDM2_DATIN1,,CAN1_TX,I2C2_SDA,,UART5_TX,SDIO_D5,,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,I2S3_MCK,USART3_TX,,I2CFMP4_SCL,DFSDM2_CKOUT,,SDIO_D7,,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C2_SDA,I2S2_CKIN,,USART3_RX,,,,,,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,SPI4_NSS/I2S4_WS,SPI3_SCK/I2S3_CK,USART3__CK,CAN2_RX,DFSDM1_DATIN1,UART5_RX,FSMC_D13/FSMC_DA13,,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,I2CFMP1_SMBA,SPI2_SCK/I2S2_CK,SPI4_SCK/I2S4_CK,,USART3_CTS,CAN2_TX,DFSDM1_CKIN1,UART5_TX,,,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,I2CFMP1_SDA,SPI2_MISO,I2S2ext_SD,USART3_RTS,DFSDM1_DATIN2,TIM12_CH1,FSMC_D0,,SDIO_D6,,,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,,TIM8_CH3N,I2CFMP1_SCL,SPI2_MOSI/I2S2_SD,,,DFSDM1_CKIN2,TIM12_CH2,,,SDIO_CK,,,EVENTOUT,
-PortC,PC0,,LPTIM1_IN1,,DFSDM2_CKIN4,,,,SAI1_MCLK_B,,,,,,,,EVENTOUT,ADC1_IN10
-PortC,PC1,,LPTIM1_OUT,,DFSDM2_DATIN4,,,,SAI1_SD_B,,,,,,,,EVENTOUT,ADC1_IN11
-PortC,PC2,,LPTIM1_IN2,,DFSDM2_DATIN7,,SPI2_MISO,I2S2ext_SD,SAI1_SCK_B,DFSDM1_CKOUT,,,,FSMC_NWE,,,EVENTOUT,ADC1_IN12
-PortC,PC3,,LPTIM1_ETR,,DFSDM2_CKIN7,,SPI2_MOSI/I2S2_SD,,SAI1_FS_B,,,,,FSMC_A0,,,EVENTOUT,ADC1_IN13
-PortC,PC4,,,,DFSDM2_CKIN2,,I2S1_MCK,,,,,QUADSPI_BK2_IO2,,FSMC_NE4,,,EVENTOUT,ADC1_IN14
-PortC,PC5,,,,DFSDM2_DATIN2,I2CFMP1_SMBA,,,USART3_RX,,,QUADSPI_BK2_IO3,,FSMC_NOE,,,EVENTOUT,ADC1_IN15
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,2CFMP1_SCL,I2S2_MCK,DFSDM1_CKIN3,DFSDM2_DATIN6,USART6_TX,,FSMC_D1,,SDIO_D6,,,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,I2CFMP1_SDA,SPI2_SCK/I2S2_CK,I2S3_MCK,DFSDM2_CKIN6,USART6_RX,,DFSDM1_DATIN3,,SDIO_D7,,,EVENTOUT,
-PortC,PC8,,,TIM3_CH3,TIM8_CH3,,,,DFSDM2_CKIN3,USART6_CK,QUADSPI_BK1_IO2,,,SDIO_D0,,,EVENTOUT,
-PortC,PC9,MCO_2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S2_CKIN,,DFSDM2_DATIN3,,QUADSPI_BK1_IO0,,,SDIO_D1,,,EVENTOUT,
-PortC,PC10,,,,DFSDM2_CKIN5,,,SPI3_SCK/I2S3_CK,USART3_TX,,QUADSPI_BK1_IO1,,,SDIO_D2,,,EVENTOUT,
-PortC,PC11,,,,DFSDM2_DATIN5,,I2S3ext_SD,SPI3_MISO,USART3_RX,UART4_RX,QUADSPI_BK2_NCS,FSMC_D2,,SDIO_D3,,,EVENTOUT,
-PortC,PC12,,,,,,,SPI3_MOSI/I2S3_SD,USART3_CK,UART5_TX,,FSMC_D3,,SDIO_CK,,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,DFSDM2_CKIN6,,,,,,CAN1_RX,,UART4_RX,FSMC_D2/FSMC_DA2,,,EVENTOUT,
-PortD,PD1,,,,DFSDM2_DATIN6,,,,,,CAN1_TX,,UART4_TX,FSMC_D3/FSMC_DA3,,,EVENTOUT,
-PortD,PD2,,,TIM3_ETR,DFSDM2_CKOUT,,,,,UART5_RX,,FSMC_NWE,,SDIO_CMD,,,EVENTOUT,
-PortD,PD3,TRACED1,,,,,SPI2_SCK/I2S2_CK,DFSDM1_DATIN0,USART2_CTS,,QUADSPI_CLK,,,FSMC_CLK,,,EVENTOUT,
-PortD,PD4,,,,,,,DFSDM1_CKIN0,USART2_RTS,,,,,FSMC_NOE,,,EVENTOUT,
-PortD,PD5,,,,DFSDM2_CKOUT,,,,USART2_TX,,,,,FSMC_NWE,,,EVENTOUT,
-PortD,PD6,,,,,,SPI3_MOSI/I2S3_SD,DFSDM1_DATIN1,USART2_RX,,,,,FSMC_NWAIT,,,EVENTOUT,
-PortD,PD7,,,,,,,DFSDM1_CKIN1,USART2_CK,,,,,FSMC_NE1,,,EVENTOUT,
-PortD,PD8,,,,,,,,USART3_TX,,,,,FSMC_D13/FSMC_DA13,,,EVENTOUT,
-PortD,PD9,,,,,,,,USART3_RX,,,,,FSMC_D14/FSMC_DA14,,,EVENTOUT,
-PortD,PD10,,,,,,,,USART3_CK,UART4_TX,,,,FSMC_D15/FSMC_DA15,,,EVENTOUT,
-PortD,PD11,,,,DFSDM2_DATIN2,I2CFMP1_SMBA,,,USART3_CTS,,QUADSPI_BK1_IO0,,,FSMC_A16,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,DFSDM2_CKIN2,I2CFMP1_SCL,,,USART3_RTS,,QUADSPI_BK1_IO1,,,FSMC_A17,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,I2CFMP1_SDA,,,,,QUADSPI_BK1_IO3,,,FSMC_A18,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,I2CFMP1_SCL,,,,,,DFSDM2_CKIN0,UART9_RX,FSMC_D0/FSMC_DA0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,I2CFMP1_SDA,,,,,,DFSDM2_DATIN0,UART9_TX,FSMC_D1/FSMC_DA1,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,DFSDM2_CKIN4,,,,,UART8_RX,,,,FSMC_NBL0,,,EVENTOUT,
-PortE,PE1,,,,DFSDM2_DATIN4,,,,,UART8_TX,,,,FSMC_NBL1,,,EVENTOUT,
-PortE,PE2,TRACECLK,,,,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,SAI1_MCLK_A,,QUADSPI_BK1_IO2,,UART10_RX,FSMC_A23,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,,,,SAI1_SD_B,,,,UART10_TX,FSMC_A19,,,EVENTOUT,
-PortE,PE4,TRACED1,,,,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,SAI1_SD_A,DFSDM1_DATIN3,,,,FSMC_A20,,,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SPI5_MISO,SAI1_SCK_A,DFSDM1_CKIN3,,,,FSMC_A21,,,EVENTOUT,
-PortE,PE6,TRACED3,,,TIM9_CH2,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,SAI1_FS_A,,,,,FSMC_A22,,,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,DFSDM1_DATIN2,,UART7_RX,,QUADSPI_BK2_IO0,,FSMC_D4/FSMC_DA4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,DFSDM1_CKIN2,,UART7_TX,,QUADSPI_BK2_IO1,,FSMC_D5/FSMC_DA5,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,DFSDM1_CKOUT,,,,QUADSPI_BK2_IO2,,FSMC_D6/FSMC_DA6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,DFSDM2_DATIN0,,,,,,,QUADSPI_BK2_IO3,,FSMC_D7/FSMC_DA7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,DFSDM2_CKIN0,,SPI4_NSS/I2S4_WS,SPI5_NSS/I2S5_WS,,,,,,FSMC_D8/FSMC_DA8,,,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,DFSDM2_DATIN7,,SPI4_SCK/I2S4_CK,SPI5_SCK/I2S5_CK,,,,,,FSMC_D9/FSMC_DA9,,,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,DFSDM2_CKIN7,,SPI4_MISO,SPI5_MISO,,,,,,FSMC_D10/FSMC_DA10,,,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI/I2S4_SD,SPI5_MOSI/I2S5_SD,,,,DFSDM2_DATIN1,,FSMC_D11/FSMC_DA11,,,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,,,,,,DFSDM2_CKIN1,,FSMC_D12/FSMC_DA12,,,EVENTOUT,
-PortF,PF0,,,,,I2C2_SDA,,,,,,,,FSMC_A0,,,EVENTOUT,
-PortF,PF1,,,,,I2C2_SCL,,,,,,,,FSMC_A1,,,EVENTOUT,
-PortF,PF2,,,,,I2C2_SMBA,,,,,,,,FSMC_A2,,,EVENTOUT,
-PortF,PF3,,,TIM5_CH1,,,,,,,,,,FSMC_A3,,,EVENTOUT,
-PortF,PF4,,,TIM5_CH2,,,,,,,,,,FSMC_A4,,,EVENTOUT,
-PortF,PF5,,,TIM5_CH3,,,,,,,,,,FSMC_A5,,,EVENTOUT,
-PortF,PF6,TRACED0,,,TIM10_CH1,,,,SAI1_SD_B,UART7_RX,QUADSPI_BK1_IO3,,,,,,EVENTOUT,
-PortF,PF7,TRACED1,,,TIM11_CH1,,,,SAI1_MCLK_B,UART7_TX,QUADSPI_BK1_IO2,,,,,,EVENTOUT,
-PortF,PF8,,,,,,,,SAI1_SCK_B,UART8_RX,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,
-PortF,PF9,,,,,,,,SAI1_FS_B,UART8_TX,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,
-PortF,PF10,,TIM1_ETR,TIM5_CH4,,,,,,,,,,,,,EVENTOUT,
-PortF,PF11,,,,TIM8_ETR,,,,,,,,,,,,EVENTOUT,
-PortF,PF12,,,,TIM8_BKIN,,,,,,,,,FSMC_A6,,,EVENTOUT,
-PortF,PF13,,,,,I2CFMP1_SMBA,,,,,,,,FSMC_A7,,,EVENTOUT,
-PortF,PF14,,,,,I2CFMP1_SCL,,,,,,,,FSMC_A8,,,EVENTOUT,
-PortF,PF15,,,,,I2CFMP1_SDA,,,,,,,,FSMC_A9,,,EVENTOUT,
-PortG,PG0,,,,,,,,,,CAN1_RX,,UART9_RX,FSMC_A10,,,EVENTOUT,
-PortG,PG1,,,,,,,,,,CAN1_TX,,UART9_TX,FSMC_A11,,,EVENTOUT,
-PortG,PG2,,,,,,,,,,,,,FSMC_A12,,,EVENTOUT,
-PortG,PG3,,,,,,,,,,,,,FSMC_A13,,,EVENTOUT,
-PortG,PG4,,,,,,,,,,,,,FSMC_A14,,,EVENTOUT,
-PortG,PG5,,,,,,,,,,,,,FSMC_A15,,,EVENTOUT,
-PortG,PG6,,,,,,,,,,,QUADSPI_BK1_NCS,,,,,EVENTOUT,
-PortG,PG7,,,,,,,,,USART6_CK,,,,,,,EVENTOUT,
-PortG,PG8,,,,,,,,,USART6_RTS,,,,,,,EVENTOUT,
-PortG,PG9,,,,,,,,,USART6_RX,QUADSPI_BK2_IO2,,,FSMC_NE2,,,EVENTOUT,
-PortG,PG10,,,,,,,,,,,,,FSMC_NE3,,,EVENTOUT,
-PortG,PG11,,,,,,,,,,CAN2_RX,,UART10_RX,,,,EVENTOUT,
-PortG,PG12,,,,,,,,,USART6_RTS,CAN2_TX,,UART10_TX,FSMC_NE4,,,EVENTOUT,
-PortG,PG13,TRACED2,,,,,,,,USART6_CTS,,,,FSMC_A24,,,EVENTOUT,
-PortG,PG14,TRACED3,,,,,,,,USART6_TX,QUADSPI_BK2_IO3,,,FSMC_A25,,,EVENTOUT,
-PortG,PG15,,,,,,,,,USART6_CTS,,,,,,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
+Port ,Pin ,AF0       ,AF1              ,AF2           ,AF3                ,AF4             ,AF5                  ,AF6                           ,AF7                        ,AF8                         ,AF9                                         ,AF10                                   ,AF11             ,AF12              ,AF13,AF14,AF15    ,ADC
+     ,    ,SYS_AF    ,TIM1/TIM2/LPTIM1 ,TIM3/TIM4/TIM5,TIM8/9/10/11/DFSDM2,I2C1/2/3/I2CFMP1,SPI1/2/3/4/I2S1/2/3/4,SPI2/3/4/5/I2S2/3/4/5/DFSDM1/2,SPI3/I2S3/USART1/2/3/DFSDM2,USART3/4/5/6/7/8/CAN1/DFSDM1,I2C2/I2C3/I2CFMP1/CAN1/2/TIM12/13/14/QUADSPI,SAI1/DFSDM1/DFSDM2/QUADSPI/FSMC/OTG1_FS,UART4/5/9/10/CAN3,FSMC /SDIO        ,    ,RNG ,SYS_AF  ,ADC
+PortA,PA0 ,          ,TIM2_CH1/TIM2_ETR,TIM5_CH1      ,TIM8_ETR           ,                ,                     ,                              ,USART2_CTS                 ,UART4_TX                    ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,ADC1_IN0
+PortA,PA1 ,          ,TIM2_CH2         ,TIM5_CH2      ,                   ,                ,SPI4_MOSI/I2S4_SD    ,                              ,USART2_RTS                 ,UART4_RX                    ,QUADSPI_BK1_IO3                             ,                                       ,                 ,                  ,    ,    ,EVENTOUT,ADC1_IN1
+PortA,PA2 ,          ,TIM2_CH3         ,TIM5_CH3      ,TIM9_CH1           ,                ,I2S2_CKIN            ,                              ,USART2_TX                  ,                            ,                                            ,                                       ,                 ,FSMC_D4           ,    ,    ,EVENTOUT,ADC1_IN2
+PortA,PA3 ,          ,TIM2_CH4         ,TIM5_CH4      ,TIM9_CH2           ,                ,I2S2_MCK             ,                              ,USART2_RX                  ,                            ,                                            ,SAI1_SD_B                              ,                 ,FSMC_D5           ,    ,    ,EVENTOUT,ADC1_IN3
+PortA,PA4 ,          ,                 ,              ,                   ,                ,SPI1_NSS/I2S1_WS     ,SPI3_NSS/I2S3_WS              ,USART2_CK                  ,DFSDM1_DATIN1               ,                                            ,                                       ,                 ,FSMC_D6           ,    ,    ,EVENTOUT,ADC1_IN4
+PortA,PA5 ,          ,TIM2_CH1/TIM2_ETR,              ,TIM8_CH1N          ,                ,SPI1_SCK/I2S1_CK     ,                              ,                           ,DFSDM1_CKIN1                ,                                            ,                                       ,                 ,FSMC_D7           ,    ,    ,EVENTOUT,ADC1_IN5
+PortA,PA6 ,          ,TIM1_BKIN        ,TIM3_CH1      ,TIM8_BKIN          ,                ,SPI1_MISO            ,I2S2_MCK                      ,DFSDM2_CKIN1               ,                            ,TIM13_CH1                                   ,QUADSPI_BK2_IO0                        ,                 ,SDIO_CMD          ,    ,    ,EVENTOUT,ADC1_IN6
+PortA,PA7 ,          ,TIM1_CH1N        ,TIM3_CH2      ,TIM8_CH1N          ,                ,SPI1_MOSI/I2S1_SD    ,                              ,DFSDM2_DATIN1              ,                            ,TIM14_CH1                                   ,QUADSPI_BK2_IO1                        ,                 ,                  ,    ,    ,EVENTOUT,ADC1_IN7
+PortA,PA8 ,MCO_1     ,TIM1_CH1         ,              ,                   ,I2C3_SCL        ,                     ,DFSDM1_CKOUT                  ,USART1_CK                  ,UART7_RX                    ,                                            ,USB_FS_SOF                             ,CAN3_RX          ,SDIO_D1           ,    ,    ,EVENTOUT,
+PortA,PA9 ,          ,TIM1_CH2         ,              ,DFSDM2_CKIN3       ,I2C3_SMBA       ,SPI2_SCK/I2S2_CK     ,                              ,USART1_TX                  ,                            ,                                            ,USB_FS_VBUS                            ,                 ,SDIO_D2           ,    ,    ,EVENTOUT,
+PortA,PA10,          ,TIM1_CH3         ,              ,DFSDM2_DATIN3      ,                ,SPI2_MOSI/I2S2_SD    ,SPI5_MOSI/I2S5_SD             ,USART1_RX                  ,                            ,                                            ,USB_FS_ID                              ,                 ,                  ,    ,    ,EVENTOUT,
+PortA,PA11,          ,TIM1_CH4         ,              ,DFSDM2_CKIN5       ,                ,SPI2_NSS/I2S2_WS     ,SPI4_MISO                     ,USART1_CTS                 ,USART6_TX                   ,CAN1_RX                                     ,USB_FS_DM                              ,UART4_RX         ,                  ,    ,    ,EVENTOUT,
+PortA,PA12,          ,TIM1_ETR         ,              ,DFSDM2_DATIN5      ,                ,SPI2_MISO            ,SPI5_MISO                     ,USART1_RTS                 ,USART6_RX                   ,CAN1_TX                                     ,USB_FS_DP                              ,UART4_TX         ,                  ,    ,    ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortA,PA15,JTDI      ,TIM2_CH1/TIM2_ETR,              ,                   ,                ,SPI1_NSS/I2S1_WS     ,SPI3_NSS/I2S3_WS              ,USART1_TX                  ,UART7_TX                    ,                                            ,SAI1_MCLK_A                            ,CAN3_TX          ,                  ,    ,    ,EVENTOUT,
+PortB,PB0 ,          ,TIM1_CH2N        ,TIM3_CH3      ,TIM8_CH2N          ,                ,                     ,SPI5_SCK/I2S5_CK              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,ADC1_IN8
+PortB,PB1 ,          ,TIM1_CH3N        ,TIM3_CH4      ,TIM8_CH3N          ,                ,                     ,SPI5_NSS/I2S5_WS              ,                           ,DFSDM1_DATIN0               ,QUADSPI_CLK                                 ,                                       ,                 ,                  ,    ,    ,EVENTOUT,ADC1_IN9
+PortB,PB2 ,          ,LPTIM1_OUT       ,              ,                   ,                ,                     ,DFSDM1_CKIN0                  ,                           ,                            ,QUADSPI_CLK                                 ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortB,PB3 ,JTDO      ,TIM2_CH2         ,              ,                   ,I2CFMP1_SDA     ,SPI1_SCK/I2S1_CK     ,SPI3_SCK/I2S3_CK              ,USART1_RX                  ,UART7_RX                    ,I2C2_SDA                                    ,SAI1_SD_A                              ,CAN3_RX          ,                  ,    ,    ,EVENTOUT,
+PortB,PB4 ,JTRST     ,                 ,TIM3_CH1      ,                   ,                ,SPI1_MISO            ,SPI3_MISO                     ,I2S3ext_SD                 ,UART7_TX                    ,I2C3_SDA                                    ,SAI1_SCK_A                             ,CAN3_TX          ,SDIO_D0           ,    ,    ,EVENTOUT,
+PortB,PB5 ,          ,LPTIM1_IN1       ,TIM3_CH2      ,                   ,I2C1_SMBA       ,SPI1_MOSI/I2S1_SD    ,SPI3_MOSI/I2S3_SD             ,                           ,                            ,CAN2_RX                                     ,SAI1_FS_A                              ,UART5_RX         ,SDIO_D3           ,    ,    ,EVENTOUT,
+PortB,PB6 ,          ,LPTIM1_ETR       ,TIM4_CH1      ,                   ,I2C1_SCL        ,                     ,DFSDM2_CKIN7                  ,USART1_TX                  ,                            ,CAN2_TX                                     ,QUADSPI_BK1_NCS                        ,UART5_TX         ,SDIO_D0           ,    ,    ,EVENTOUT,
+PortB,PB7 ,          ,LPTIM1_IN2       ,TIM4_CH2      ,                   ,I2C1_SDA        ,                     ,DFSDM2_DATIN7                 ,USART1_RX                  ,                            ,                                            ,                                       ,                 ,FSMC_NL           ,    ,    ,EVENTOUT,
+PortB,PB8 ,          ,LPTIM1_OUT       ,TIM4_CH3      ,TIM10_CH1          ,I2C1_SCL        ,                     ,SPI5_MOSI/I2S5_SD             ,DFSDM2_CKIN1               ,CAN1_RX                     ,I2C3_SDA                                    ,                                       ,UART5_RX         ,SDIO_D4           ,    ,    ,EVENTOUT,
+PortB,PB9 ,          ,                 ,TIM4_CH4      ,TIM11_CH1          ,I2C1_SDA        ,SPI2_NSS/I2S2_WS     ,DFSDM2_DATIN1                 ,                           ,CAN1_TX                     ,I2C2_SDA                                    ,                                       ,UART5_TX         ,SDIO_D5           ,    ,    ,EVENTOUT,
+PortB,PB10,          ,TIM2_CH3         ,              ,                   ,I2C2_SCL        ,SPI2_SCK/I2S2_CK     ,I2S3_MCK                      ,USART3_TX                  ,                            ,I2CFMP4_SCL                                 ,DFSDM2_CKOUT                           ,                 ,SDIO_D7           ,    ,    ,EVENTOUT,
+PortB,PB11,          ,TIM2_CH4         ,              ,                   ,I2C2_SDA        ,I2S2_CKIN            ,                              ,USART3_RX                  ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortB,PB12,          ,TIM1_BKIN        ,              ,                   ,I2C2_SMBA       ,SPI2_NSS/I2S2_WS     ,SPI4_NSS/I2S4_WS              ,SPI3_SCK/I2S3_CK           ,USART3__CK                  ,CAN2_RX                                     ,DFSDM1_DATIN1                          ,UART5_RX         ,FSMC_D13/FSMC_DA13,    ,    ,EVENTOUT,
+PortB,PB13,          ,TIM1_CH1N        ,              ,                   ,I2CFMP1_SMBA    ,SPI2_SCK/I2S2_CK     ,SPI4_SCK/I2S4_CK              ,                           ,USART3_CTS                  ,CAN2_TX                                     ,DFSDM1_CKIN1                           ,UART5_TX         ,                  ,    ,    ,EVENTOUT,
+PortB,PB14,          ,TIM1_CH2N        ,              ,TIM8_CH2N          ,I2CFMP1_SDA     ,SPI2_MISO            ,I2S2ext_SD                    ,USART3_RTS                 ,DFSDM1_DATIN2               ,TIM12_CH1                                   ,FSMC_D0                                ,                 ,SDIO_D6           ,    ,    ,EVENTOUT,
+PortB,PB15,RTC_REFIN ,TIM1_CH3N        ,              ,TIM8_CH3N          ,I2CFMP1_SCL     ,SPI2_MOSI/I2S2_SD    ,                              ,                           ,DFSDM1_CKIN2                ,TIM12_CH2                                   ,                                       ,                 ,SDIO_CK           ,    ,    ,EVENTOUT,
+PortC,PC0 ,          ,LPTIM1_IN1       ,              ,DFSDM2_CKIN4       ,                ,                     ,                              ,SAI1_MCLK_B                ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,ADC1_IN10
+PortC,PC1 ,          ,LPTIM1_OUT       ,              ,DFSDM2_DATIN4      ,                ,                     ,                              ,SAI1_SD_B                  ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,ADC1_IN11
+PortC,PC2 ,          ,LPTIM1_IN2       ,              ,DFSDM2_DATIN7      ,                ,SPI2_MISO            ,I2S2ext_SD                    ,SAI1_SCK_B                 ,DFSDM1_CKOUT                ,                                            ,                                       ,                 ,FSMC_NWE          ,    ,    ,EVENTOUT,ADC1_IN12
+PortC,PC3 ,          ,LPTIM1_ETR       ,              ,DFSDM2_CKIN7       ,                ,SPI2_MOSI/I2S2_SD    ,                              ,SAI1_FS_B                  ,                            ,                                            ,                                       ,                 ,FSMC_A0           ,    ,    ,EVENTOUT,ADC1_IN13
+PortC,PC4 ,          ,                 ,              ,DFSDM2_CKIN2       ,                ,I2S1_MCK             ,                              ,                           ,                            ,                                            ,QUADSPI_BK2_IO2                        ,                 ,FSMC_NE4          ,    ,    ,EVENTOUT,ADC1_IN14
+PortC,PC5 ,          ,                 ,              ,DFSDM2_DATIN2      ,I2CFMP1_SMBA    ,                     ,                              ,USART3_RX                  ,                            ,                                            ,QUADSPI_BK2_IO3                        ,                 ,FSMC_NOE          ,    ,    ,EVENTOUT,ADC1_IN15
+PortC,PC6 ,          ,                 ,TIM3_CH1      ,TIM8_CH1           ,2CFMP1_SCL      ,I2S2_MCK             ,DFSDM1_CKIN3                  ,DFSDM2_DATIN6              ,USART6_TX                   ,                                            ,FSMC_D1                                ,                 ,SDIO_D6           ,    ,    ,EVENTOUT,
+PortC,PC7 ,          ,                 ,TIM3_CH2      ,TIM8_CH2           ,I2CFMP1_SDA     ,SPI2_SCK/I2S2_CK     ,I2S3_MCK                      ,DFSDM2_CKIN6               ,USART6_RX                   ,                                            ,DFSDM1_DATIN3                          ,                 ,SDIO_D7           ,    ,    ,EVENTOUT,
+PortC,PC8 ,          ,                 ,TIM3_CH3      ,TIM8_CH3           ,                ,                     ,                              ,DFSDM2_CKIN3               ,USART6_CK                   ,QUADSPI_BK1_IO2                             ,                                       ,                 ,SDIO_D0           ,    ,    ,EVENTOUT,
+PortC,PC9 ,MCO_2     ,                 ,TIM3_CH4      ,TIM8_CH4           ,I2C3_SDA        ,I2S2_CKIN            ,                              ,DFSDM2_DATIN3              ,                            ,QUADSPI_BK1_IO0                             ,                                       ,                 ,SDIO_D1           ,    ,    ,EVENTOUT,
+PortC,PC10,          ,                 ,              ,DFSDM2_CKIN5       ,                ,                     ,SPI3_SCK/I2S3_CK              ,USART3_TX                  ,                            ,QUADSPI_BK1_IO1                             ,                                       ,                 ,SDIO_D2           ,    ,    ,EVENTOUT,
+PortC,PC11,          ,                 ,              ,DFSDM2_DATIN5      ,                ,I2S3ext_SD           ,SPI3_MISO                     ,USART3_RX                  ,UART4_RX                    ,QUADSPI_BK2_NCS                             ,FSMC_D2                                ,                 ,SDIO_D3           ,    ,    ,EVENTOUT,
+PortC,PC12,          ,                 ,              ,                   ,                ,                     ,SPI3_MOSI/I2S3_SD             ,USART3_CK                  ,UART5_TX                    ,                                            ,FSMC_D3                                ,                 ,SDIO_CK           ,    ,    ,EVENTOUT,
+PortC,PC13,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortC,PC14,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortC,PC15,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortD,PD0 ,          ,                 ,              ,DFSDM2_CKIN6       ,                ,                     ,                              ,                           ,                            ,CAN1_RX                                     ,                                       ,UART4_RX         ,FSMC_D2/FSMC_DA2  ,    ,    ,EVENTOUT,
+PortD,PD1 ,          ,                 ,              ,DFSDM2_DATIN6      ,                ,                     ,                              ,                           ,                            ,CAN1_TX                                     ,                                       ,UART4_TX         ,FSMC_D3/FSMC_DA3  ,    ,    ,EVENTOUT,
+PortD,PD2 ,          ,                 ,TIM3_ETR      ,DFSDM2_CKOUT       ,                ,                     ,                              ,                           ,UART5_RX                    ,                                            ,FSMC_NWE                               ,                 ,SDIO_CMD          ,    ,    ,EVENTOUT,
+PortD,PD3 ,TRACED1   ,                 ,              ,                   ,                ,SPI2_SCK/I2S2_CK     ,DFSDM1_DATIN0                 ,USART2_CTS                 ,                            ,QUADSPI_CLK                                 ,                                       ,                 ,FSMC_CLK          ,    ,    ,EVENTOUT,
+PortD,PD4 ,          ,                 ,              ,                   ,                ,                     ,DFSDM1_CKIN0                  ,USART2_RTS                 ,                            ,                                            ,                                       ,                 ,FSMC_NOE          ,    ,    ,EVENTOUT,
+PortD,PD5 ,          ,                 ,              ,DFSDM2_CKOUT       ,                ,                     ,                              ,USART2_TX                  ,                            ,                                            ,                                       ,                 ,FSMC_NWE          ,    ,    ,EVENTOUT,
+PortD,PD6 ,          ,                 ,              ,                   ,                ,SPI3_MOSI/I2S3_SD    ,DFSDM1_DATIN1                 ,USART2_RX                  ,                            ,                                            ,                                       ,                 ,FSMC_NWAIT        ,    ,    ,EVENTOUT,
+PortD,PD7 ,          ,                 ,              ,                   ,                ,                     ,DFSDM1_CKIN1                  ,USART2_CK                  ,                            ,                                            ,                                       ,                 ,FSMC_NE1          ,    ,    ,EVENTOUT,
+PortD,PD8 ,          ,                 ,              ,                   ,                ,                     ,                              ,USART3_TX                  ,                            ,                                            ,                                       ,                 ,FSMC_D13/FSMC_DA13,    ,    ,EVENTOUT,
+PortD,PD9 ,          ,                 ,              ,                   ,                ,                     ,                              ,USART3_RX                  ,                            ,                                            ,                                       ,                 ,FSMC_D14/FSMC_DA14,    ,    ,EVENTOUT,
+PortD,PD10,          ,                 ,              ,                   ,                ,                     ,                              ,USART3_CK                  ,UART4_TX                    ,                                            ,                                       ,                 ,FSMC_D15/FSMC_DA15,    ,    ,EVENTOUT,
+PortD,PD11,          ,                 ,              ,DFSDM2_DATIN2      ,I2CFMP1_SMBA    ,                     ,                              ,USART3_CTS                 ,                            ,QUADSPI_BK1_IO0                             ,                                       ,                 ,FSMC_A16          ,    ,    ,EVENTOUT,
+PortD,PD12,          ,                 ,TIM4_CH1      ,DFSDM2_CKIN2       ,I2CFMP1_SCL     ,                     ,                              ,USART3_RTS                 ,                            ,QUADSPI_BK1_IO1                             ,                                       ,                 ,FSMC_A17          ,    ,    ,EVENTOUT,
+PortD,PD13,          ,                 ,TIM4_CH2      ,                   ,I2CFMP1_SDA     ,                     ,                              ,                           ,                            ,QUADSPI_BK1_IO3                             ,                                       ,                 ,FSMC_A18          ,    ,    ,EVENTOUT,
+PortD,PD14,          ,                 ,TIM4_CH3      ,                   ,I2CFMP1_SCL     ,                     ,                              ,                           ,                            ,                                            ,DFSDM2_CKIN0                           ,UART9_RX         ,FSMC_D0/FSMC_DA0  ,    ,    ,EVENTOUT,
+PortD,PD15,          ,                 ,TIM4_CH4      ,                   ,I2CFMP1_SDA     ,                     ,                              ,                           ,                            ,                                            ,DFSDM2_DATIN0                          ,UART9_TX         ,FSMC_D1/FSMC_DA1  ,    ,    ,EVENTOUT,
+PortE,PE0 ,          ,                 ,TIM4_ETR      ,DFSDM2_CKIN4       ,                ,                     ,                              ,                           ,UART8_RX                    ,                                            ,                                       ,                 ,FSMC_NBL0         ,    ,    ,EVENTOUT,
+PortE,PE1 ,          ,                 ,              ,DFSDM2_DATIN4      ,                ,                     ,                              ,                           ,UART8_TX                    ,                                            ,                                       ,                 ,FSMC_NBL1         ,    ,    ,EVENTOUT,
+PortE,PE2 ,TRACECLK  ,                 ,              ,                   ,                ,SPI4_SCK/I2S4_CK     ,SPI5_SCK/I2S5_CK              ,SAI1_MCLK_A                ,                            ,QUADSPI_BK1_IO2                             ,                                       ,UART10_RX        ,FSMC_A23          ,    ,    ,EVENTOUT,
+PortE,PE3 ,TRACED0   ,                 ,              ,                   ,                ,                     ,                              ,SAI1_SD_B                  ,                            ,                                            ,                                       ,UART10_TX        ,FSMC_A19          ,    ,    ,EVENTOUT,
+PortE,PE4 ,TRACED1   ,                 ,              ,                   ,                ,SPI4_NSS/I2S4_WS     ,SPI5_NSS/I2S5_WS              ,SAI1_SD_A                  ,DFSDM1_DATIN3               ,                                            ,                                       ,                 ,FSMC_A20          ,    ,    ,EVENTOUT,
+PortE,PE5 ,TRACED2   ,                 ,              ,TIM9_CH1           ,                ,SPI4_MISO            ,SPI5_MISO                     ,SAI1_SCK_A                 ,DFSDM1_CKIN3                ,                                            ,                                       ,                 ,FSMC_A21          ,    ,    ,EVENTOUT,
+PortE,PE6 ,TRACED3   ,                 ,              ,TIM9_CH2           ,                ,SPI4_MOSI/I2S4_SD    ,SPI5_MOSI/I2S5_SD             ,SAI1_FS_A                  ,                            ,                                            ,                                       ,                 ,FSMC_A22          ,    ,    ,EVENTOUT,
+PortE,PE7 ,          ,TIM1_ETR         ,              ,                   ,                ,                     ,DFSDM1_DATIN2                 ,                           ,UART7_RX                    ,                                            ,QUADSPI_BK2_IO0                        ,                 ,FSMC_D4/FSMC_DA4  ,    ,    ,EVENTOUT,
+PortE,PE8 ,          ,TIM1_CH1N        ,              ,                   ,                ,                     ,DFSDM1_CKIN2                  ,                           ,UART7_TX                    ,                                            ,QUADSPI_BK2_IO1                        ,                 ,FSMC_D5/FSMC_DA5  ,    ,    ,EVENTOUT,
+PortE,PE9 ,          ,TIM1_CH1         ,              ,                   ,                ,                     ,DFSDM1_CKOUT                  ,                           ,                            ,                                            ,QUADSPI_BK2_IO2                        ,                 ,FSMC_D6/FSMC_DA6  ,    ,    ,EVENTOUT,
+PortE,PE10,          ,TIM1_CH2N        ,              ,DFSDM2_DATIN0      ,                ,                     ,                              ,                           ,                            ,                                            ,QUADSPI_BK2_IO3                        ,                 ,FSMC_D7/FSMC_DA7  ,    ,    ,EVENTOUT,
+PortE,PE11,          ,TIM1_CH2         ,              ,DFSDM2_CKIN0       ,                ,SPI4_NSS/I2S4_WS     ,SPI5_NSS/I2S5_WS              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_D8/FSMC_DA8  ,    ,    ,EVENTOUT,
+PortE,PE12,          ,TIM1_CH3N        ,              ,DFSDM2_DATIN7      ,                ,SPI4_SCK/I2S4_CK     ,SPI5_SCK/I2S5_CK              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_D9/FSMC_DA9  ,    ,    ,EVENTOUT,
+PortE,PE13,          ,TIM1_CH3         ,              ,DFSDM2_CKIN7       ,                ,SPI4_MISO            ,SPI5_MISO                     ,                           ,                            ,                                            ,                                       ,                 ,FSMC_D10/FSMC_DA10,    ,    ,EVENTOUT,
+PortE,PE14,          ,TIM1_CH4         ,              ,                   ,                ,SPI4_MOSI/I2S4_SD    ,SPI5_MOSI/I2S5_SD             ,                           ,                            ,                                            ,DFSDM2_DATIN1                          ,                 ,FSMC_D11/FSMC_DA11,    ,    ,EVENTOUT,
+PortE,PE15,          ,TIM1_BKIN        ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,DFSDM2_CKIN1                           ,                 ,FSMC_D12/FSMC_DA12,    ,    ,EVENTOUT,
+PortF,PF0 ,          ,                 ,              ,                   ,I2C2_SDA        ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A0           ,    ,    ,EVENTOUT,
+PortF,PF1 ,          ,                 ,              ,                   ,I2C2_SCL        ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A1           ,    ,    ,EVENTOUT,
+PortF,PF2 ,          ,                 ,              ,                   ,I2C2_SMBA       ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A2           ,    ,    ,EVENTOUT,
+PortF,PF3 ,          ,                 ,TIM5_CH1      ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A3           ,    ,    ,EVENTOUT,
+PortF,PF4 ,          ,                 ,TIM5_CH2      ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A4           ,    ,    ,EVENTOUT,
+PortF,PF5 ,          ,                 ,TIM5_CH3      ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A5           ,    ,    ,EVENTOUT,
+PortF,PF6 ,TRACED0   ,                 ,              ,TIM10_CH1          ,                ,                     ,                              ,SAI1_SD_B                  ,UART7_RX                    ,QUADSPI_BK1_IO3                             ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortF,PF7 ,TRACED1   ,                 ,              ,TIM11_CH1          ,                ,                     ,                              ,SAI1_MCLK_B                ,UART7_TX                    ,QUADSPI_BK1_IO2                             ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortF,PF8 ,          ,                 ,              ,                   ,                ,                     ,                              ,SAI1_SCK_B                 ,UART8_RX                    ,TIM13_CH1                                   ,QUADSPI_BK1_IO0                        ,                 ,                  ,    ,    ,EVENTOUT,
+PortF,PF9 ,          ,                 ,              ,                   ,                ,                     ,                              ,SAI1_FS_B                  ,UART8_TX                    ,TIM14_CH1                                   ,QUADSPI_BK1_IO1                        ,                 ,                  ,    ,    ,EVENTOUT,
+PortF,PF10,          ,TIM1_ETR         ,TIM5_CH4      ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortF,PF11,          ,                 ,              ,TIM8_ETR           ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortF,PF12,          ,                 ,              ,TIM8_BKIN          ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A6           ,    ,    ,EVENTOUT,
+PortF,PF13,          ,                 ,              ,                   ,I2CFMP1_SMBA    ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A7           ,    ,    ,EVENTOUT,
+PortF,PF14,          ,                 ,              ,                   ,I2CFMP1_SCL     ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A8           ,    ,    ,EVENTOUT,
+PortF,PF15,          ,                 ,              ,                   ,I2CFMP1_SDA     ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A9           ,    ,    ,EVENTOUT,
+PortG,PG0 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,CAN1_RX                                     ,                                       ,UART9_RX         ,FSMC_A10          ,    ,    ,EVENTOUT,
+PortG,PG1 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,CAN1_TX                                     ,                                       ,UART9_TX         ,FSMC_A11          ,    ,    ,EVENTOUT,
+PortG,PG2 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A12          ,    ,    ,EVENTOUT,
+PortG,PG3 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A13          ,    ,    ,EVENTOUT,
+PortG,PG4 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A14          ,    ,    ,EVENTOUT,
+PortG,PG5 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_A15          ,    ,    ,EVENTOUT,
+PortG,PG6 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,QUADSPI_BK1_NCS                        ,                 ,                  ,    ,    ,EVENTOUT,
+PortG,PG7 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,USART6_CK                   ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortG,PG8 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,USART6_RTS                  ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortG,PG9 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,USART6_RX                   ,QUADSPI_BK2_IO2                             ,                                       ,                 ,FSMC_NE2          ,    ,    ,EVENTOUT,
+PortG,PG10,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,FSMC_NE3          ,    ,    ,EVENTOUT,
+PortG,PG11,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,CAN2_RX                                     ,                                       ,UART10_RX        ,                  ,    ,    ,EVENTOUT,
+PortG,PG12,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,USART6_RTS                  ,CAN2_TX                                     ,                                       ,UART10_TX        ,FSMC_NE4          ,    ,    ,EVENTOUT,
+PortG,PG13,TRACED2   ,                 ,              ,                   ,                ,                     ,                              ,                           ,USART6_CTS                  ,                                            ,                                       ,                 ,FSMC_A24          ,    ,    ,EVENTOUT,
+PortG,PG14,TRACED3   ,                 ,              ,                   ,                ,                     ,                              ,                           ,USART6_TX                   ,QUADSPI_BK2_IO3                             ,                                       ,                 ,FSMC_A25          ,    ,    ,EVENTOUT,
+PortG,PG15,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,USART6_CTS                  ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortH,PH0 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
+PortH,PH1 ,          ,                 ,              ,                   ,                ,                     ,                              ,                           ,                            ,                                            ,                                       ,                 ,                  ,    ,    ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32f429_af.csv b/ports/stm32/boards/stm32f429_af.csv
index 002d634a20eac..e9cf2880b4699 100644
--- a/ports/stm32/boards/stm32f429_af.csv
+++ b/ports/stm32/boards/stm32f429_af.csv
@@ -1,170 +1,170 @@
-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,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH,FMC/SDIO/OTG2_FS,DCMI,LCD,SYS,
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,,ETH_MII_CRS,,,,EVENTOUT,
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS,UART4_RX,,,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,,EVENTOUT,ADC123_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,,,,ETH_MDIO,,,,EVENTOUT,ADC123_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,,,USART2_RX,,,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,,,,,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,,ETH_MII_RX_DV/ETH_RMII_CRS_DV,,,,EVENTOUT,ADC12_IN7
-PortA,PA8,MCO1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,,,,LCD_R6,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,,,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,,,,EVENTOUT,ADC12_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,,,,LCD_R6,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,,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,I2S3ext_SD,,,,,,,,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,,EVENTOUT,
-PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,CAN2_TX,,,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,,,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,,,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,I2S2ext_SD,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,,,EVENTOUT,ADC123_IN10
-PortC,PC1,,,,,,,,,,,,ETH_MDC,,,,EVENTOUT,ADC123_IN11
-PortC,PC2,,,,,,SPI2_MISO,I2S2ext_SD,,,,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,,,,EVENTOUT,ADC12_IN14
-PortC,PC5,,,,,,,,,,,,ETH_MII_RXD1/ETH_RMII_RXD1,,,,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,,,TIM3_CH3,TIM8_CH3,,,,,USART6_CK,,,,SDIO_D0,DCMI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,,,,,,SDIO_D1,DCMI_D3,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,,,,SDIO_D2,DCMI_D8,LCD_R2,EVENTOUT,
-PortC,PC11,,,,,,I2S3ext_SD,SPI3_MISO,USART3_RX,UART4_RX,,,,SDIO_D3,DCMI_D4,,EVENTOUT,
-PortC,PC12,,,,,,,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,,,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/FMC_NCE2,,,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,,,,,FMC_A16,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,,,,,USART3_RTS,,,,,FMC_A17,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,,,,,,,,,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,,,,,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,,,,FMC_D4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,,,UART7_TX,,,,FMC_D5,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,,,,,,,FMC_D6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,,,,,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,,,,FMC_NIORD,,,EVENTOUT,ADC3_IN4
-PortF,PF7,,,,TIM11_CH1,,SPI5_SCK,SAI1_MCLK_B,,UART7_TX,,,,FMC_NREG,,,EVENTOUT,ADC3_IN5
-PortF,PF8,,,,,,SPI5_MISO,SAI1_SCK_B,,,TIM13_CH1,,,FMC_NIOWR,,,EVENTOUT,ADC3_IN6
-PortF,PF9,,,,,,SPI5_MOSI,SAI1_FS_B,,,TIM14_CH1,,,FMC_CD,,,EVENTOUT,ADC3_IN7
-PortF,PF10,,,,,,,,,,,,,FMC_INTR,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,,,,,,,,,,,,,FMC_INT2,DCMI_D12,LCD_R7,EVENTOUT,
-PortG,PG7,,,,,,,,,USART6_CK,,,,FMC_INT3,DCMI_D13,LCD_CLK,EVENTOUT,
-PortG,PG8,,,,,,SPI6_NSS,,,USART6_RTS,,,ETH_PPS_OUT,FMC_SDCLK,,,EVENTOUT,
-PortG,PG9,,,,,,,,,USART6_RX,,,,FMC_NE2/FMC_NCE3,DCMI_VSYNC(1),,EVENTOUT,
-PortG,PG10,,,,,,,,,,LCD_G3,,,FMC_NCE4_1/FMC_NE3,DCMI_D2,LCD_B2,EVENTOUT,
-PortG,PG11,,,,,,,,,,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,FMC_NCE4_2,DCMI_D3,LCD_B3,EVENTOUT,
-PortG,PG12,,,,,,SPI6_MISO,,,USART6_RTS,LCD_B4,,,FMC_NE4,,LCD_B1,EVENTOUT,
-PortG,PG13,,,,,,SPI6_SCK,,,USART6_CTS,,,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,,,EVENTOUT,
-PortG,PG14,,,,,,SPI6_MOSI,,,USART6_TX,,,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_A25,,,EVENTOUT,
-PortG,PG15,,,,,,,,,USART6_CTS,,,,FMC_SDNCAS,DCMI_D13,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH2,,,,,,,,,,,,ETH_MII_CRS,FMC_SDCKE0,,LCD_R0,EVENTOUT,
-PortH,PH3,,,,,,,,,,,,ETH_MII_COL,FMC_SDNE0,,LCD_R1,EVENTOUT,
-PortH,PH4,,,,,I2C2_SCL,,,,,,OTG_HS_ULPI_NXT,,,,,EVENTOUT,
-PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,,,,,,FMC_SDNWE,,,EVENTOUT,
-PortH,PH6,,,,,I2C2_SMBA,SPI5_SCK,,,,TIM12_CH1,,,FMC_SDNE1,DCMI_D8,,,
-PortH,PH7,,,,,I2C3_SCL,SPI5_MISO,,,,,,ETH_MII_RXD3,FMC_SDCKE1,DCMI_D9,,,
-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,I2S2ext_SD,,,,,,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,,,,,,,,,,,OTG_HS_ULPI_DIR,,,,,EVENTOUT,
-PortI,PI12,,,,,,,,,,,,,,,LCD_HSYNC,EVENTOUT,
-PortI,PI13,,,,,,,,,,,,,,,LCD_VSYNC,EVENTOUT,
-PortI,PI14,,,,,,,,,,,,,,,LCD_CLK,EVENTOUT,
-PortI,PI15,,,,,,,,,,,,,,,LCD_R0,EVENTOUT,
-PortJ,PJ0,,,,,,,,,,,,,,,LCD_R1,EVENTOUT,
-PortJ,PJ1,,,,,,,,,,,,,,,LCD_R2,EVENTOUT,
-PortJ,PJ2,,,,,,,,,,,,,,,LCD_R3,EVENTOUT,
-PortJ,PJ3,,,,,,,,,,,,,,,LCD_R4,EVENTOUT,
-PortJ,PJ4,,,,,,,,,,,,,,,LCD_R5,EVENTOUT,
-PortJ,PJ5,,,,,,,,,,,,,,,LCD_R6,EVENTOUT,
-PortJ,PJ6,,,,,,,,,,,,,,,LCD_R7,EVENTOUT,
-PortJ,PJ7,,,,,,,,,,,,,,,LCD_G0,EVENTOUT,
-PortJ,PJ8,,,,,,,,,,,,,,,LCD_G1,EVENTOUT,
-PortJ,PJ9,,,,,,,,,,,,,,,LCD_G2,EVENTOUT,
-PortJ,PJ10,,,,,,,,,,,,,,,LCD_G3,EVENTOUT,
-PortJ,PJ11,,,,,,,,,,,,,,,LCD_G4,EVENTOUT,
-PortJ,PJ12,,,,,,,,,,,,,,,LCD_B0,EVENTOUT,
-PortJ,PJ13,,,,,,,,,,,,,,,LCD_B1,EVENTOUT,
-PortJ,PJ14,,,,,,,,,,,,,,,LCD_B2,EVENTOUT,
-PortJ,PJ15,,,,,,,,,,,,,,,LCD_B3,EVENTOUT,
-PortK,PK0,,,,,,,,,,,,,,,LCD_G5,EVENTOUT,
-PortK,PK1,,,,,,,,,,,,,,,LCD_G6,EVENTOUT,
-PortK,PK2,,,,,,,,,,,,,,,LCD_G7,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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7            ,AF8               ,AF9                   ,AF10           ,AF11                           ,AF12              ,AF13         ,AF14     ,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/2/3/4/5/6   ,SPI2/3/SAI1      ,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH                            ,FMC/SDIO/OTG2_FS  ,DCMI         ,LCD      ,SYS     ,
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR    ,         ,                 ,                 ,USART2_CTS     ,UART4_TX          ,                      ,               ,ETH_MII_CRS                    ,                  ,             ,         ,EVENTOUT,
+PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2,            ,         ,                 ,                 ,USART2_RTS     ,UART4_RX          ,                      ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,             ,         ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                 ,                 ,USART2_TX      ,                  ,                      ,               ,ETH_MDIO                       ,                  ,             ,         ,EVENTOUT,ADC123_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                 ,                 ,USART2_RX      ,                  ,                      ,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 ,                               ,                  ,             ,         ,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             ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                  ,             ,         ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                 ,                 ,USART1_CK      ,                  ,                      ,OTG_FS_SOF     ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                 ,                 ,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                   ,                  ,             ,         ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,LCD_R6                ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                  ,             ,         ,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        ,I2S3ext_SD     ,                  ,                      ,               ,                               ,                  ,             ,         ,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     ,         ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                 ,                 ,USART1_TX      ,                  ,CAN2_TX               ,               ,                               ,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      ,                  ,                      ,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   ,                  ,             ,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        ,I2S2ext_SD       ,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         ,             ,         ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MDC                        ,                  ,             ,         ,EVENTOUT,ADC123_IN11
+PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,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     ,                  ,             ,         ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                  ,             ,         ,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 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,SDIO_D0           ,DCMI_D2      ,         ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN         ,                 ,               ,                  ,                      ,               ,                               ,SDIO_D1           ,DCMI_D3      ,         ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,            ,         ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX      ,UART4_TX          ,                      ,               ,                               ,SDIO_D2           ,DCMI_D8      ,LCD_R2   ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD       ,SPI3_MISO        ,USART3_RX      ,UART4_RX          ,                      ,               ,                               ,SDIO_D3           ,DCMI_D4      ,         ,EVENTOUT,
+PortC,PC12,             ,                 ,        ,            ,         ,                 ,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 ,             ,                 ,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/FMC_NCE2  ,             ,         ,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     ,                  ,                      ,               ,                               ,FMC_A16           ,             ,         ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                 ,                 ,USART3_RTS     ,                  ,                      ,               ,                               ,FMC_A17           ,             ,         ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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      ,               ,                  ,                      ,               ,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          ,                      ,               ,                               ,FMC_D4            ,             ,         ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                 ,                 ,               ,UART7_TX          ,                      ,               ,                               ,FMC_D5            ,             ,         ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D6            ,             ,         ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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          ,                      ,               ,                               ,FMC_NIORD         ,             ,         ,EVENTOUT,ADC3_IN4
+PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,SPI5_SCK         ,SAI1_MCLK_B      ,               ,UART7_TX          ,                      ,               ,                               ,FMC_NREG          ,             ,         ,EVENTOUT,ADC3_IN5
+PortF,PF8 ,             ,                 ,        ,            ,         ,SPI5_MISO        ,SAI1_SCK_B       ,               ,                  ,TIM13_CH1             ,               ,                               ,FMC_NIOWR         ,             ,         ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,            ,         ,SPI5_MOSI        ,SAI1_FS_B        ,               ,                  ,TIM14_CH1             ,               ,                               ,FMC_CD            ,             ,         ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INTR          ,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 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INT2          ,DCMI_D12     ,LCD_R7   ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,FMC_INT3          ,DCMI_D13     ,LCD_CLK  ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,            ,         ,SPI6_NSS         ,                 ,               ,USART6_RTS        ,                      ,               ,ETH_PPS_OUT                    ,FMC_SDCLK         ,             ,         ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_RX         ,                      ,               ,                               ,FMC_NE2/FMC_NCE3  ,DCMI_VSYNC(1),         ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,LCD_G3                ,               ,                               ,FMC_NCE4_1/FMC_NE3,DCMI_D2      ,LCD_B2   ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FMC_NCE4_2        ,DCMI_D3      ,LCD_B3   ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,            ,         ,SPI6_MISO        ,                 ,               ,USART6_RTS        ,LCD_B4                ,               ,                               ,FMC_NE4           ,             ,LCD_B1   ,EVENTOUT,
+PortG,PG13,             ,                 ,        ,            ,         ,SPI6_SCK         ,                 ,               ,USART6_CTS        ,                      ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,             ,         ,EVENTOUT,
+PortG,PG14,             ,                 ,        ,            ,         ,SPI6_MOSI        ,                 ,               ,USART6_TX         ,                      ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FMC_A25           ,             ,         ,EVENTOUT,
+PortG,PG15,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CTS        ,                      ,               ,                               ,FMC_SDNCAS        ,DCMI_D13     ,         ,EVENTOUT,
+PortH,PH0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
+PortH,PH1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
+PortH,PH2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_CRS                    ,FMC_SDCKE0        ,             ,LCD_R0   ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_COL                    ,FMC_SDNE0         ,             ,LCD_R1   ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_NXT,                               ,                  ,             ,         ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,SPI5_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_SDNWE         ,             ,         ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,SPI5_SCK         ,                 ,               ,                  ,TIM12_CH1             ,               ,                               ,FMC_SDNE1         ,DCMI_D8      ,         ,        ,
+PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,SPI5_MISO        ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD3                   ,FMC_SDCKE1        ,DCMI_D9      ,         ,        ,
+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        ,I2S2ext_SD       ,               ,                  ,                      ,               ,                               ,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,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_DIR,                               ,                  ,             ,         ,EVENTOUT,
+PortI,PI12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_HSYNC,EVENTOUT,
+PortI,PI13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_VSYNC,EVENTOUT,
+PortI,PI14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_CLK  ,EVENTOUT,
+PortI,PI15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R0   ,EVENTOUT,
+PortJ,PJ0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R1   ,EVENTOUT,
+PortJ,PJ1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R2   ,EVENTOUT,
+PortJ,PJ2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R3   ,EVENTOUT,
+PortJ,PJ3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R4   ,EVENTOUT,
+PortJ,PJ4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R5   ,EVENTOUT,
+PortJ,PJ5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
+PortJ,PJ6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R7   ,EVENTOUT,
+PortJ,PJ7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G0   ,EVENTOUT,
+PortJ,PJ8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G1   ,EVENTOUT,
+PortJ,PJ9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G2   ,EVENTOUT,
+PortJ,PJ10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G3   ,EVENTOUT,
+PortJ,PJ11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G4   ,EVENTOUT,
+PortJ,PJ12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B0   ,EVENTOUT,
+PortJ,PJ13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B1   ,EVENTOUT,
+PortJ,PJ14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B2   ,EVENTOUT,
+PortJ,PJ15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B3   ,EVENTOUT,
+PortK,PK0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G5   ,EVENTOUT,
+PortK,PK1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G6   ,EVENTOUT,
+PortK,PK2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G7   ,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,
diff --git a/ports/stm32/boards/stm32f439_af.csv b/ports/stm32/boards/stm32f439_af.csv
index 4fc1f1116c633..94466c6c1a0b6 100644
--- a/ports/stm32/boards/stm32f439_af.csv
+++ b/ports/stm32/boards/stm32f439_af.csv
@@ -1,170 +1,170 @@
-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,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH,FMC/SDIO/OTG2_FS,DCMI,LCD,SYS,
-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,,,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,,EVENTOUT,ADC123_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,,,,ETH_MDIO,,,,EVENTOUT,ADC123_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,,,USART2_RX,,,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,,,,,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,,ETH_MII_RX_DV/ETH_RMII_CRS_DV,,,,EVENTOUT,ADC12_IN7
-PortA,PA8,MCO1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,,,,LCD_R6,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,,,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,,,,EVENTOUT,ADC12_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,,,,LCD_R6,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,,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,I2S3ext_SD,,,,,,,,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,,EVENTOUT,
-PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,CAN2_TX,,,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,,,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,,,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,I2S2ext_SD,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,,,EVENTOUT,ADC123_IN10
-PortC,PC1,,,,,,,,,,,,ETH_MDC,,,,EVENTOUT,ADC123_IN11
-PortC,PC2,,,,,,SPI2_MISO,I2S2ext_SD,,,,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,,,,EVENTOUT,ADC12_IN14
-PortC,PC5,,,,,,,,,,,,ETH_MII_RXD1/ETH_RMII_RXD1,,,,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,,,TIM3_CH3,TIM8_CH3,,,,,USART6_CK,,,,SDIO_D0,DCMI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,,,,,,SDIO_D1,DCMI_D3,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,,,,SDIO_D2,DCMI_D8,LCD_R2,EVENTOUT,
-PortC,PC11,,,,,,I2S3ext_SD,SPI3_MISO,USART3_RX,UART4_RX,,,,SDIO_D3,DCMI_D4,,EVENTOUT,
-PortC,PC12,,,,,,,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,,,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,,,,,,I2S3_SD,SAI1_SD_A,USART2_RX,,,,,FMC_NWAIT,DCMI_D10,LCD_B2,EVENTOUT,
-PortD,PD7,,,,,,,,USART2_CK,,,,,FMC_NE1/FMC_NCE2,,,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,,,,,FMC_A16,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,,,,,USART3_RTS,,,,,FMC_A17,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,,,,,,,,,,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,,,,,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,,,,FMC_D4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,,,UART7_TX,,,,FMC_D5,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,,,,,,,FMC_D6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,,,,,FMC_D7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,SPI4_NSS,SPI3_NSS,,,,,,FMC_D8,,LCD_G3,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,SPI3_SCK,,,,,,FMC_D9,,LCD_B4,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,SPI3_MISO,,,,,,FMC_D10,,LCD_DE,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,SP3_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,,,,FMC_NIORD,,,EVENTOUT,ADC3_IN4
-PortF,PF7,,,,TIM11_CH1,,SPI5_SCK,SAI1_MCLK_B,,UART7_TX,,,,FMC_NREG,,,EVENTOUT,ADC3_IN5
-PortF,PF8,,,,,,SPI5_MISO,SAI1_SCK_B,,,TIM13_CH1,,,FMC_NIOWR,,,EVENTOUT,ADC3_IN6
-PortF,PF9,,,,,,SPI5_MOSI,SAI1_FS_B,,,TIM14_CH1,,,FMC_CD,,,EVENTOUT,ADC3_IN7
-PortF,PF10,,,,,,,,,,,,,FMC_INTR,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,,,,,,,,,,,,,FMC_INT2,DCMI_D12,LCD_R7,EVENTOUT,
-PortG,PG7,,,,,,,,,USART6_CK,,,,FMC_INT3,DCMI_D13,LCD_CLK,EVENTOUT,
-PortG,PG8,,,,,,SPI6_NSS,,,USART6_RTS,,,ETH_PPS_OUT,FMC_SDCLK,,,EVENTOUT,
-PortG,PG9,,,,,,,,,USART6_RX,,,,FMC_NE2/FMC_NCE3,DCMI_VSYNC(1),,EVENTOUT,
-PortG,PG10,,,,,,,,,,LCD_G3,,,FMC_NCE4_1/FMC_NE3,DCMI_D2,LCD_B2,EVENTOUT,
-PortG,PG11,,,,,,,,,,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,FMC_NCE4_2,DCMI_D3,LCD_B3,EVENTOUT,
-PortG,PG12,,,,,,SPI6_MISO,,,USART6_RTS,LCD_B4,,,FMC_NE4,,LCD_B1,EVENTOUT,
-PortG,PG13,,,,,,SPI6_SCK,,,USART6_CTS,,,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,,,EVENTOUT,
-PortG,PG14,,,,,,SPI6_MOSI,,,USART6_TX,,,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_A25,,,EVENTOUT,
-PortG,PG15,,,,,,,,,USART6_CTS,,,,FMC_SDNCAS,DCMI_D13,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH2,,,,,,,,,,,,ETH_MII_CRS,FMC_SDCKE0,,LCD_R0,EVENTOUT,
-PortH,PH3,,,,,,,,,,,,ETH_MII_COL,FMC_SDNE0,,LCD_R1,EVENTOUT,
-PortH,PH4,,,,,I2C2_SCL,,,,,,OTG_HS_ULPI_NXT,,,,,EVENTOUT,
-PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,,,,,,FMC_SDNWE,,,EVENTOUT,
-PortH,PH6,,,,,I2C2_SMBA,SPI5_SCK,,,,TIM12_CH1,,,FMC_SDNE1,DCMI_D8,,,
-PortH,PH7,,,,,I2C3_SCL,SPI5_MISO,,,,,,ETH_MII_RXD3,FMC_SDCKE1,DCMI_D9,,,
-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,I2S2ext_SD,,,,,,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,,,,,,,,,,,OTG_HS_ULPI_DIR,,,,,EVENTOUT,
-PortI,PI12,,,,,,,,,,,,,,,LCD_HSYNC,EVENTOUT,
-PortI,PI13,,,,,,,,,,,,,,,LCD_VSYNC,EVENTOUT,
-PortI,PI14,,,,,,,,,,,,,,,LCD_CLK,EVENTOUT,
-PortI,PI15,,,,,,,,,,,,,,,LCD_R0,EVENTOUT,
-PortJ,PJ0,,,,,,,,,,,,,,,LCD_R1,EVENTOUT,
-PortJ,PJ1,,,,,,,,,,,,,,,LCD_R2,EVENTOUT,
-PortJ,PJ2,,,,,,,,,,,,,,,LCD_R3,EVENTOUT,
-PortJ,PJ3,,,,,,,,,,,,,,,LCD_R4,EVENTOUT,
-PortJ,PJ4,,,,,,,,,,,,,,,LCD_R5,EVENTOUT,
-PortJ,PJ5,,,,,,,,,,,,,,,LCD_R6,EVENTOUT,
-PortJ,PJ6,,,,,,,,,,,,,,,LCD_R7,EVENTOUT,
-PortJ,PJ7,,,,,,,,,,,,,,,LCD_G0,EVENTOUT,
-PortJ,PJ8,,,,,,,,,,,,,,,LCD_G1,EVENTOUT,
-PortJ,PJ9,,,,,,,,,,,,,,,LCD_G2,EVENTOUT,
-PortJ,PJ10,,,,,,,,,,,,,,,LCD_G3,EVENTOUT,
-PortJ,PJ11,,,,,,,,,,,,,,,LCD_G4,EVENTOUT,
-PortJ,PJ12,,,,,,,,,,,,,,,LCD_B0,EVENTOUT,
-PortJ,PJ13,,,,,,,,,,,,,,,LCD_B1,EVENTOUT,
-PortJ,PJ14,,,,,,,,,,,,,,,LCD_B2,EVENTOUT,
-PortJ,PJ15,,,,,,,,,,,,,,,LCD_B3,EVENTOUT,
-PortK,PK0,,,,,,,,,,,,,,,LCD_G5,EVENTOUT,
-PortK,PK1,,,,,,,,,,,,,,,LCD_G6,EVENTOUT,
-PortK,PK2,,,,,,,,,,,,,,,LCD_G7,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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7            ,AF8               ,AF9                   ,AF10           ,AF11                           ,AF12              ,AF13         ,AF14     ,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/2/3/4/5/6   ,SPI2/3/SAI1      ,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH                            ,FMC/SDIO/OTG2_FS  ,DCMI         ,LCD      ,SYS     ,
+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          ,                      ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,             ,         ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                 ,                 ,USART2_TX      ,                  ,                      ,               ,ETH_MDIO                       ,                  ,             ,         ,EVENTOUT,ADC123_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                 ,                 ,USART2_RX      ,                  ,                      ,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 ,                               ,                  ,             ,         ,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             ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                  ,             ,         ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                 ,                 ,USART1_CK      ,                  ,                      ,OTG_FS_SOF     ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                 ,                 ,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                   ,                  ,             ,         ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,LCD_R6                ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                  ,             ,         ,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        ,I2S3ext_SD     ,                  ,                      ,               ,                               ,                  ,             ,         ,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     ,         ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                 ,                 ,USART1_TX      ,                  ,CAN2_TX               ,               ,                               ,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      ,                  ,                      ,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   ,                  ,             ,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        ,I2S2ext_SD       ,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         ,             ,         ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MDC                        ,                  ,             ,         ,EVENTOUT,ADC123_IN11
+PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,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     ,                  ,             ,         ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                  ,             ,         ,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 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,SDIO_D0           ,DCMI_D2      ,         ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN         ,                 ,               ,                  ,                      ,               ,                               ,SDIO_D1           ,DCMI_D3      ,         ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,            ,         ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX      ,UART4_TX          ,                      ,               ,                               ,SDIO_D2           ,DCMI_D8      ,LCD_R2   ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD       ,SPI3_MISO        ,USART3_RX      ,UART4_RX          ,                      ,               ,                               ,SDIO_D3           ,DCMI_D4      ,         ,EVENTOUT,
+PortC,PC12,             ,                 ,        ,            ,         ,                 ,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 ,             ,                 ,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 ,             ,                 ,        ,            ,         ,I2S3_SD          ,SAI1_SD_A        ,USART2_RX      ,                  ,                      ,               ,                               ,FMC_NWAIT         ,DCMI_D10     ,LCD_B2   ,EVENTOUT,
+PortD,PD7 ,             ,                 ,        ,            ,         ,                 ,                 ,USART2_CK      ,                  ,                      ,               ,                               ,FMC_NE1/FMC_NCE2  ,             ,         ,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     ,                  ,                      ,               ,                               ,FMC_A16           ,             ,         ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                 ,                 ,USART3_RTS     ,                  ,                      ,               ,                               ,FMC_A17           ,             ,         ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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      ,               ,                  ,                      ,               ,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          ,                      ,               ,                               ,FMC_D4            ,             ,         ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                 ,                 ,               ,UART7_TX          ,                      ,               ,                               ,FMC_D5            ,             ,         ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D6            ,             ,         ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D7            ,             ,         ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,        ,            ,         ,SPI4_NSS         ,SPI3_NSS         ,               ,                  ,                      ,               ,                               ,FMC_D8            ,             ,LCD_G3   ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,        ,            ,         ,SPI4_SCK         ,SPI3_SCK         ,               ,                  ,                      ,               ,                               ,FMC_D9            ,             ,LCD_B4   ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,        ,            ,         ,SPI4_MISO        ,SPI3_MISO        ,               ,                  ,                      ,               ,                               ,FMC_D10           ,             ,LCD_DE   ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,        ,            ,         ,SPI4_MOSI        ,SP3_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          ,                      ,               ,                               ,FMC_NIORD         ,             ,         ,EVENTOUT,ADC3_IN4
+PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,SPI5_SCK         ,SAI1_MCLK_B      ,               ,UART7_TX          ,                      ,               ,                               ,FMC_NREG          ,             ,         ,EVENTOUT,ADC3_IN5
+PortF,PF8 ,             ,                 ,        ,            ,         ,SPI5_MISO        ,SAI1_SCK_B       ,               ,                  ,TIM13_CH1             ,               ,                               ,FMC_NIOWR         ,             ,         ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,            ,         ,SPI5_MOSI        ,SAI1_FS_B        ,               ,                  ,TIM14_CH1             ,               ,                               ,FMC_CD            ,             ,         ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INTR          ,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 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INT2          ,DCMI_D12     ,LCD_R7   ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,FMC_INT3          ,DCMI_D13     ,LCD_CLK  ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,            ,         ,SPI6_NSS         ,                 ,               ,USART6_RTS        ,                      ,               ,ETH_PPS_OUT                    ,FMC_SDCLK         ,             ,         ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_RX         ,                      ,               ,                               ,FMC_NE2/FMC_NCE3  ,DCMI_VSYNC(1),         ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,LCD_G3                ,               ,                               ,FMC_NCE4_1/FMC_NE3,DCMI_D2      ,LCD_B2   ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FMC_NCE4_2        ,DCMI_D3      ,LCD_B3   ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,            ,         ,SPI6_MISO        ,                 ,               ,USART6_RTS        ,LCD_B4                ,               ,                               ,FMC_NE4           ,             ,LCD_B1   ,EVENTOUT,
+PortG,PG13,             ,                 ,        ,            ,         ,SPI6_SCK         ,                 ,               ,USART6_CTS        ,                      ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,             ,         ,EVENTOUT,
+PortG,PG14,             ,                 ,        ,            ,         ,SPI6_MOSI        ,                 ,               ,USART6_TX         ,                      ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FMC_A25           ,             ,         ,EVENTOUT,
+PortG,PG15,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CTS        ,                      ,               ,                               ,FMC_SDNCAS        ,DCMI_D13     ,         ,EVENTOUT,
+PortH,PH0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
+PortH,PH1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
+PortH,PH2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_CRS                    ,FMC_SDCKE0        ,             ,LCD_R0   ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_COL                    ,FMC_SDNE0         ,             ,LCD_R1   ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_NXT,                               ,                  ,             ,         ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,SPI5_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_SDNWE         ,             ,         ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,SPI5_SCK         ,                 ,               ,                  ,TIM12_CH1             ,               ,                               ,FMC_SDNE1         ,DCMI_D8      ,         ,        ,
+PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,SPI5_MISO        ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD3                   ,FMC_SDCKE1        ,DCMI_D9      ,         ,        ,
+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        ,I2S2ext_SD       ,               ,                  ,                      ,               ,                               ,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,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_DIR,                               ,                  ,             ,         ,EVENTOUT,
+PortI,PI12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_HSYNC,EVENTOUT,
+PortI,PI13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_VSYNC,EVENTOUT,
+PortI,PI14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_CLK  ,EVENTOUT,
+PortI,PI15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R0   ,EVENTOUT,
+PortJ,PJ0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R1   ,EVENTOUT,
+PortJ,PJ1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R2   ,EVENTOUT,
+PortJ,PJ2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R3   ,EVENTOUT,
+PortJ,PJ3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R4   ,EVENTOUT,
+PortJ,PJ4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R5   ,EVENTOUT,
+PortJ,PJ5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
+PortJ,PJ6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R7   ,EVENTOUT,
+PortJ,PJ7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G0   ,EVENTOUT,
+PortJ,PJ8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G1   ,EVENTOUT,
+PortJ,PJ9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G2   ,EVENTOUT,
+PortJ,PJ10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G3   ,EVENTOUT,
+PortJ,PJ11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G4   ,EVENTOUT,
+PortJ,PJ12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B0   ,EVENTOUT,
+PortJ,PJ13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B1   ,EVENTOUT,
+PortJ,PJ14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B2   ,EVENTOUT,
+PortJ,PJ15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B3   ,EVENTOUT,
+PortK,PK0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G5   ,EVENTOUT,
+PortK,PK1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G6   ,EVENTOUT,
+PortK,PK2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G7   ,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,
diff --git a/ports/stm32/boards/stm32f446_af.csv b/ports/stm32/boards/stm32f446_af.csv
index 0838ed089d8f2..0e80bbb9b0ad2 100644
--- a/ports/stm32/boards/stm32f446_af.csv
+++ b/ports/stm32/boards/stm32f446_af.csv
@@ -1,116 +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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3             ,AF4           ,AF5              ,AF6              ,AF7                            ,AF8                       ,AF9                       ,AF10                        ,AF11   ,AF12            ,AF13       ,AF14,AF15    ,ADC
+     ,    ,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,
diff --git a/ports/stm32/boards/stm32f479_af.csv b/ports/stm32/boards/stm32f479_af.csv
index 7cbb242a52ef3..a86926a84c265 100644
--- a/ports/stm32/boards/stm32f479_af.csv
+++ b/ports/stm32/boards/stm32f479_af.csv
@@ -1,161 +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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7              ,AF8               ,AF9                           ,AF10                   ,AF11                           ,AF12            ,AF13        ,AF14     ,AF15    ,ADC
+     ,    ,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,
diff --git a/ports/stm32/boards/stm32f722_af.csv b/ports/stm32/boards/stm32f722_af.csv
index 24500f50576eb..f353cde7ddbca 100644
--- a/ports/stm32/boards/stm32f722_af.csv
+++ b/ports/stm32/boards/stm32f722_af.csv
@@ -1,146 +1,146 @@
-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/LPTIM1,I2C1/2/3/USART1,SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5,SPI2/I2S2/SPI3/I2S3/SPI3/I2S3/SAI1/UART4,SPI2/I2S2/SPI3/I2S3/USART1/2/3/UART5,SAI2/USART6/UART4/5/7/8/OTG1_FS,CAN1/TIM12/13/14/QUADSPI/FMC/OTG2_HS,SAI2/QUADSPI/SDMMC2/OTG2_HS/OTG1_FS,SDMMC2,UART7/FMC/SDMMC1/OTG2_FS,,,SYS,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,SAI2_SD_B,,,,,EVENTOUT,ADC123_IN0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS,UART4_RX,QUADSPI_BK1_IO3,SAI2_MCK_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,,,,USART2_RX,,,OTG_HS_ULPI_D0,,,,,EVENTOUT,ADC123_IN3
-PortA,PA4,,,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,OTG_HS_SOF,,,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,,,,TIM13_CH1,,,,,,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,,TIM8_BKIN2,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,,,,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,,,,,,,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,,,,,USART1_RX,,,OTG_FS_ID,,,,,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,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,,UART4_RTS,,,,,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,,,UART4_CTS,,OTG_HS_ULPI_D1,,,,,EVENTOUT,ADC12_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,,,,,OTG_HS_ULPI_D2,,,,,EVENTOUT,ADC12_IN9
-PortB,PB2,,,,,,,SAI1_SD_A,SPI3_MOSI/I2S3_SD,,QUADSPI_CLK,,,,,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,,,,SDMMC2_D2,,,,,EVENTOUT,
-PortB,PB4,NJTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,SPI2_NSS/I2S2_WS,,,SDMMC2_D3,,,,,EVENTOUT,
-PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI/I2S1_SD,SPI3_MOSI/I2S3_SD,,,,OTG_HS_ULPI_D7,,FMC_SDCKE1,,,EVENTOUT,
-PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,,QUADSPI_BK1_NCS,,FMC_SDNE1,,,EVENTOUT,
-PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,,USART1_RX,,,,,FMC_NL,,,EVENTOUT,
-PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,,,,CAN1_RX,SDMMC2_D4,,SDMMC1_D4,,,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,CAN1_TX,SDMMC2_D5,,SDMMC1_D5,,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,,USART3_TX,,,OTG_HS_ULPI_D3,,,,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C2_SDA,,,USART3_RX,,,OTG_HS_ULPI_D4,,,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,,USART3_CK,,,OTG_HS_ULPI_D5,,OTG_HS_ID,,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,,SPI2_SCK/I2S2_CK,,USART3_CTS,,,OTG_HS_ULPI_D6,,,,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,,SPI2_MISO,,USART3_RTS,,TIM12_CH1,SDMMC2_D0,,OTG_HS_DM,,,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,,TIM8_CH3N,,SPI2_MOSI/I2S2_SD,,,,TIM12_CH2,SDMMC2_D1,,OTG_HS_DP,,,EVENTOUT,
-PortC,PC0,,,,,,,,,SAI2_FS_B,,OTG_HS_ULPI_STP,,FMC_SDNWE,,,EVENTOUT,ADC123_IN10
-PortC,PC1,TRACED0,,,,,SPI2_MOSI/I2S2_SD,SAI1_SD_A,,,,,,,,,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,,,,,,,FMC_SDNE0,,,EVENTOUT,ADC12_IN14
-PortC,PC5,,,,,,,,,,,,,FMC_SDCKE0,,,EVENTOUT,ADC12_IN15
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,,I2S2_MCK,,,USART6_TX,,SDMMC2_D6,,SDMMC1_D6,,,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,,,I2S3_MCK,,USART6_RX,,SDMMC2_D7,,SDMMC1_D7,,,EVENTOUT,
-PortC,PC8,TRACED1,,TIM3_CH3,TIM8_CH3,,,,UART5_RTS,USART6_CK,,,,SDMMC1_D0,,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,UART5_CTS,,QUADSPI_BK1_IO0,,,SDMMC1_D1,,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,QUADSPI_BK1_IO1,,,SDMMC1_D2,,,EVENTOUT,
-PortC,PC11,,,,,,,SPI3_MISO,USART3_RX,UART4_RX,QUADSPI_BK2_NCS,,,SDMMC1_D3,,,EVENTOUT,
-PortC,PC12,TRACED3,,,,,,SPI3_MOSI/I2S3_SD,USART3_CK,UART5_TX,,,,SDMMC1_CK,,,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,,,,SDMMC1_CMD,,,EVENTOUT,
-PortD,PD3,,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS,,,,,FMC_CLK,,,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,,,,SDMMC2_CK,FMC_NWAIT,,,EVENTOUT,
-PortD,PD7,,,,,,,,USART2_CK,,,,SDMMC2_CMD,FMC_NE1,,,EVENTOUT,
-PortD,PD8,,,,,,,,USART3_TX,,,,,FMC_D13,,,EVENTOUT,
-PortD,PD9,,,,,,,,USART3_RX,,,,,FMC_D14,,,EVENTOUT,
-PortD,PD10,,,,,,,,USART3_CK,,,,,FMC_D15,,,EVENTOUT,
-PortD,PD11,,,,,,,,USART3_CTS,,QUADSPI_BK1_IO0,SAI2_SD_A,,FMC_A16/FMC_CLE,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,LPTIM1_IN1,,,,USART3_RTS,,QUADSPI_BK1_IO1,SAI2_FS_A,,FMC_A17/FMC_ALE,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,LPTIM1_OUT,,,,,,QUADSPI_BK1_IO3,SAI2_SCK_A,,FMC_A18,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,UART8_CTS,,,,FMC_D0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,UART8_RTS,,,,FMC_D1,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,LPTIM1_ETR,,,,,UART8_RX,,SAI2_MCK_A,,FMC_NBL0,,,EVENTOUT,
-PortE,PE1,,,,LPTIM1_IN2,,,,,UART8_TX,,,,FMC_NBL1,,,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,,,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SAI1_SCK_A,,,,,,FMC_A21,,,EVENTOUT,
-PortE,PE6,TRACED3,TIM1_BKIN2,,TIM9_CH2,,SPI4_MOSI,SAI1_SD_A,,,,SAI2_MCK_B,,FMC_A22,,,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,,,,,,,UART7_RTS,,QUADSPI_BK2_IO2,,FMC_D6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,UART7_CTS,,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_MCK_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,,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,,UART7_RTS,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,ADC3_IN6
-PortF,PF9,,,,,,SPI5_MOSI,SAI1_FS_B,,UART7_CTS,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,ADC3_IN7
-PortF,PF10,,,,,,,,,,,,,,,,EVENTOUT,ADC3_IN8
-PortF,PF11,,,,,,SPI5_MOSI,,,,,SAI2_SD_B,,FMC_SDNRAS,,,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,,,,,,,,,,,,,,,,EVENTOUT,
-PortG,PG7,,,,,,,,,USART6_CK,,,,FMC_INT,,,EVENTOUT,
-PortG,PG8,,,,,,,,,USART6_RTS,,,,FMC_SDCLK,,,EVENTOUT,
-PortG,PG9,,,,,,,,,USART6_RX,QUADSPI_BK2_IO2,SAI2_FS_B,SDMMC2_D0,FMC_NE2/FMC_NCE,,,EVENTOUT,
-PortG,PG10,,,,,,,,,,,SAI2_SD_B,SDMMC2_D1,FMC_NE3,,,EVENTOUT,
-PortG,PG11,,,,,,,,,,,SDMMC2_D2,,,,,EVENTOUT,
-PortG,PG12,,,,LPTIM1_IN1,,,,,USART6_RTS,,,SDMMC2_D3,FMC_NE4,,,EVENTOUT,
-PortG,PG13,TRACED0,,,LPTIM1_OUT,,,,,USART6_CTS,,,,FMC_A24,,,EVENTOUT,
-PortG,PG14,TRACED1,,,LPTIM1_ETR,,,,,USART6_TX,QUADSPI_BK2_IO3,,,FMC_A25,,,EVENTOUT,
-PortG,PG15,,,,,,,,,USART6_CTS,,,,FMC_SDNCAS,,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH2,,,,LPTIM1_IN2,,,,,,QUADSPI_BK2_IO0,SAI2_SCK_B,,FMC_SDCKE0,,,EVENTOUT,
-PortH,PH3,,,,,,,,,,QUADSPI_BK2_IO1,SAI2_MCK_B,,FMC_SDNE0,,,EVENTOUT,
-PortH,PH4,,,,,I2C2_SCL,,,,,,OTG_HS_ULPI_NXT,,,,,EVENTOUT,
-PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,,,,,,FMC_SDNWE,,,EVENTOUT,
-PortH,PH6,,,,,I2C2_SMBA,SPI5_SCK,,,,TIM12_CH1,,,FMC_SDNE1,,,EVENTOUT,
-PortH,PH7,,,,,I2C3_SCL,SPI5_MISO,,,,,,,FMC_SDCKE1,,,EVENTOUT,
-PortH,PH8,,,,,I2C3_SDA,,,,,,,,FMC_D16,,,EVENTOUT,
-PortH,PH9,,,,,I2C3_SMBA,,,,,TIM12_CH2,,,FMC_D17,,,EVENTOUT,
-PortH,PH10,,,TIM5_CH1,,,,,,,,,,FMC_D18,,,EVENTOUT,
-PortH,PH11,,,TIM5_CH2,,,,,,,,,,FMC_D19,,,EVENTOUT,
-PortH,PH12,,,TIM5_CH3,,,,,,,,,,FMC_D20,,,EVENTOUT,
-PortH,PH13,,,,TIM8_CH1N,,,,,UART4_TX,CAN1_TX,,,FMC_D21,,,EVENTOUT,
-PortH,PH14,,,,TIM8_CH2N,,,,,UART4_RX,CAN1_RX,,,FMC_D22,,,EVENTOUT,
-PortH,PH15,,,,TIM8_CH3N,,,,,,,,,FMC_D23,,,EVENTOUT,
-PortI,PI0,,,TIM5_CH4,,,SPI2_NSS/I2S2_WS,,,,,,,FMC_D24,,,EVENTOUT,
-PortI,PI1,,,,TIM8_BKIN2,,SPI2_SCK/I2S2_CK,,,,,,,FMC_D25,,,EVENTOUT,
-PortI,PI2,,,,TIM8_CH4,,SPI2_MISO,,,,,,,FMC_D26,,,EVENTOUT,
-PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SD,,,,,,,FMC_D27,,,EVENTOUT,
-PortI,PI4,,,,TIM8_BKIN,,,,,,,SAI2_MCK_A,,FMC_NBL2,,,EVENTOUT,
-PortI,PI5,,,,TIM8_CH1,,,,,,,SAI2_SCK_A,,FMC_NBL3,,,EVENTOUT,
-PortI,PI6,,,,TIM8_CH2,,,,,,,SAI2_SD_A,,FMC_D28,,,EVENTOUT,
-PortI,PI7,,,,TIM8_CH3,,,,,,,SAI2_FS_A,,FMC_D29,,,EVENTOUT,
-PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI9,,,,,,,,,UART4_RX,CAN1_RX,,,FMC_D30,,,EVENTOUT,
-PortI,PI10,,,,,,,,,,,,,FMC_D31,,,EVENTOUT,
-PortI,PI11,,,,,,,,,,,OTG_HS_ULPI_DIR,,,,,EVENTOUT,
-PortI,PI12,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI13,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI14,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI15,,,,,,,,,,,,,,,,EVENTOUT,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3                ,AF4            ,AF5                                 ,AF6                                     ,AF7                                 ,AF8                            ,AF9                                 ,AF10                               ,AF11      ,AF12                    ,AF13,AF14,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11/LPTIM1,I2C1/2/3/USART1,SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5,SPI2/I2S2/SPI3/I2S3/SPI3/I2S3/SAI1/UART4,SPI2/I2S2/SPI3/I2S3/USART1/2/3/UART5,SAI2/USART6/UART4/5/7/8/OTG1_FS,CAN1/TIM12/13/14/QUADSPI/FMC/OTG2_HS,SAI2/QUADSPI/SDMMC2/OTG2_HS/OTG1_FS,SDMMC2    ,UART7/FMC/SDMMC1/OTG2_FS,    ,    ,SYS     ,ADC
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR           ,               ,                                    ,                                        ,USART2_CTS                          ,UART4_TX                       ,                                    ,SAI2_SD_B                          ,          ,                        ,    ,    ,EVENTOUT,ADC123_IN0
+PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2,                   ,               ,                                    ,                                        ,USART2_RTS                          ,UART4_RX                       ,QUADSPI_BK1_IO3                     ,SAI2_MCK_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           ,               ,                                    ,                                        ,USART2_RX                           ,                               ,                                    ,OTG_HS_ULPI_D0                     ,          ,                        ,    ,    ,EVENTOUT,ADC123_IN3
+PortA,PA4 ,             ,                 ,        ,                   ,               ,SPI1_NSS/I2S1_WS                    ,SPI3_NSS/I2S3_WS                        ,USART2_CK                           ,                               ,                                    ,                                   ,          ,OTG_HS_SOF              ,    ,    ,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                           ,                                        ,                                    ,                               ,TIM13_CH1                           ,                                   ,          ,                        ,    ,    ,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         ,        ,TIM8_BKIN2         ,I2C3_SCL       ,                                    ,                                        ,USART1_CK                           ,                               ,                                    ,OTG_FS_SOF                         ,          ,                        ,    ,    ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,                   ,I2C3_SMBA      ,SPI2_SCK/I2S2_CK                    ,                                        ,USART1_TX                           ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3         ,        ,                   ,               ,                                    ,                                        ,USART1_RX                           ,                               ,                                    ,OTG_FS_ID                          ,          ,                        ,    ,    ,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,        ,                   ,               ,SPI1_NSS/I2S1_WS                    ,SPI3_NSS/I2S3_WS                        ,                                    ,UART4_RTS                      ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N        ,TIM3_CH3,TIM8_CH2N          ,               ,                                    ,                                        ,                                    ,UART4_CTS                      ,                                    ,OTG_HS_ULPI_D1                     ,          ,                        ,    ,    ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N          ,               ,                                    ,                                        ,                                    ,                               ,                                    ,OTG_HS_ULPI_D2                     ,          ,                        ,    ,    ,EVENTOUT,ADC12_IN9
+PortB,PB2 ,             ,                 ,        ,                   ,               ,                                    ,SAI1_SD_A                               ,SPI3_MOSI/I2S3_SD                   ,                               ,QUADSPI_CLK                         ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2         ,        ,                   ,               ,SPI1_SCK/I2S1_CK                    ,SPI3_SCK/I2S3_CK                        ,                                    ,                               ,                                    ,SDMMC2_D2                          ,          ,                        ,    ,    ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,                 ,TIM3_CH1,                   ,               ,SPI1_MISO                           ,SPI3_MISO                               ,SPI2_NSS/I2S2_WS                    ,                               ,                                    ,SDMMC2_D3                          ,          ,                        ,    ,    ,EVENTOUT,
+PortB,PB5 ,             ,                 ,TIM3_CH2,                   ,I2C1_SMBA      ,SPI1_MOSI/I2S1_SD                   ,SPI3_MOSI/I2S3_SD                       ,                                    ,                               ,                                    ,OTG_HS_ULPI_D7                     ,          ,FMC_SDCKE1              ,    ,    ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1,                   ,I2C1_SCL       ,                                    ,                                        ,USART1_TX                           ,                               ,                                    ,QUADSPI_BK1_NCS                    ,          ,FMC_SDNE1               ,    ,    ,EVENTOUT,
+PortB,PB7 ,             ,                 ,TIM4_CH2,                   ,I2C1_SDA       ,                                    ,                                        ,USART1_RX                           ,                               ,                                    ,                                   ,          ,FMC_NL                  ,    ,    ,EVENTOUT,
+PortB,PB8 ,             ,                 ,TIM4_CH3,TIM10_CH1          ,I2C1_SCL       ,                                    ,                                        ,                                    ,                               ,CAN1_RX                             ,SDMMC2_D4                          ,          ,SDMMC1_D4               ,    ,    ,EVENTOUT,
+PortB,PB9 ,             ,                 ,TIM4_CH4,TIM11_CH1          ,I2C1_SDA       ,SPI2_NSS/I2S2_WS                    ,                                        ,                                    ,                               ,CAN1_TX                             ,SDMMC2_D5                          ,          ,SDMMC1_D5               ,    ,    ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3         ,        ,                   ,I2C2_SCL       ,SPI2_SCK/I2S2_CK                    ,                                        ,USART3_TX                           ,                               ,                                    ,OTG_HS_ULPI_D3                     ,          ,                        ,    ,    ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4         ,        ,                   ,I2C2_SDA       ,                                    ,                                        ,USART3_RX                           ,                               ,                                    ,OTG_HS_ULPI_D4                     ,          ,                        ,    ,    ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN        ,        ,                   ,I2C2_SMBA      ,SPI2_NSS/I2S2_WS                    ,                                        ,USART3_CK                           ,                               ,                                    ,OTG_HS_ULPI_D5                     ,          ,OTG_HS_ID               ,    ,    ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N        ,        ,                   ,               ,SPI2_SCK/I2S2_CK                    ,                                        ,USART3_CTS                          ,                               ,                                    ,OTG_HS_ULPI_D6                     ,          ,                        ,    ,    ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N        ,        ,TIM8_CH2N          ,               ,SPI2_MISO                           ,                                        ,USART3_RTS                          ,                               ,TIM12_CH1                           ,SDMMC2_D0                          ,          ,OTG_HS_DM               ,    ,    ,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N        ,        ,TIM8_CH3N          ,               ,SPI2_MOSI/I2S2_SD                   ,                                        ,                                    ,                               ,TIM12_CH2                           ,SDMMC2_D1                          ,          ,OTG_HS_DP               ,    ,    ,EVENTOUT,
+PortC,PC0 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,SAI2_FS_B                      ,                                    ,OTG_HS_ULPI_STP                    ,          ,FMC_SDNWE               ,    ,    ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,TRACED0      ,                 ,        ,                   ,               ,SPI2_MOSI/I2S2_SD                   ,SAI1_SD_A                               ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,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                            ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_SDNE0               ,    ,    ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_SDCKE0              ,    ,    ,EVENTOUT,ADC12_IN15
+PortC,PC6 ,             ,                 ,TIM3_CH1,TIM8_CH1           ,               ,I2S2_MCK                            ,                                        ,                                    ,USART6_TX                      ,                                    ,SDMMC2_D6                          ,          ,SDMMC1_D6               ,    ,    ,EVENTOUT,
+PortC,PC7 ,             ,                 ,TIM3_CH2,TIM8_CH2           ,               ,                                    ,I2S3_MCK                                ,                                    ,USART6_RX                      ,                                    ,SDMMC2_D7                          ,          ,SDMMC1_D7               ,    ,    ,EVENTOUT,
+PortC,PC8 ,TRACED1      ,                 ,TIM3_CH3,TIM8_CH3           ,               ,                                    ,                                        ,UART5_RTS                           ,USART6_CK                      ,                                    ,                                   ,          ,SDMMC1_D0               ,    ,    ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4           ,I2C3_SDA       ,I2S_CKIN                            ,                                        ,UART5_CTS                           ,                               ,QUADSPI_BK1_IO0                     ,                                   ,          ,SDMMC1_D1               ,    ,    ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,                   ,               ,                                    ,SPI3_SCK/I2S3_CK                        ,USART3_TX                           ,UART4_TX                       ,QUADSPI_BK1_IO1                     ,                                   ,          ,SDMMC1_D2               ,    ,    ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,                   ,               ,                                    ,SPI3_MISO                               ,USART3_RX                           ,UART4_RX                       ,QUADSPI_BK2_NCS                     ,                                   ,          ,SDMMC1_D3               ,    ,    ,EVENTOUT,
+PortC,PC12,TRACED3      ,                 ,        ,                   ,               ,                                    ,SPI3_MOSI/I2S3_SD                       ,USART3_CK                           ,UART5_TX                       ,                                    ,                                   ,          ,SDMMC1_CK               ,    ,    ,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                       ,                                    ,                                   ,          ,SDMMC1_CMD              ,    ,    ,EVENTOUT,
+PortD,PD3 ,             ,                 ,        ,                   ,               ,SPI2_SCK/I2S2_CK                    ,                                        ,USART2_CTS                          ,                               ,                                    ,                                   ,          ,FMC_CLK                 ,    ,    ,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                           ,                               ,                                    ,                                   ,SDMMC2_CK ,FMC_NWAIT               ,    ,    ,EVENTOUT,
+PortD,PD7 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,USART2_CK                           ,                               ,                                    ,                                   ,SDMMC2_CMD,FMC_NE1                 ,    ,    ,EVENTOUT,
+PortD,PD8 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,USART3_TX                           ,                               ,                                    ,                                   ,          ,FMC_D13                 ,    ,    ,EVENTOUT,
+PortD,PD9 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,USART3_RX                           ,                               ,                                    ,                                   ,          ,FMC_D14                 ,    ,    ,EVENTOUT,
+PortD,PD10,             ,                 ,        ,                   ,               ,                                    ,                                        ,USART3_CK                           ,                               ,                                    ,                                   ,          ,FMC_D15                 ,    ,    ,EVENTOUT,
+PortD,PD11,             ,                 ,        ,                   ,               ,                                    ,                                        ,USART3_CTS                          ,                               ,QUADSPI_BK1_IO0                     ,SAI2_SD_A                          ,          ,FMC_A16/FMC_CLE         ,    ,    ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,LPTIM1_IN1         ,               ,                                    ,                                        ,USART3_RTS                          ,                               ,QUADSPI_BK1_IO1                     ,SAI2_FS_A                          ,          ,FMC_A17/FMC_ALE         ,    ,    ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,LPTIM1_OUT         ,               ,                                    ,                                        ,                                    ,                               ,QUADSPI_BK1_IO3                     ,SAI2_SCK_A                         ,          ,FMC_A18                 ,    ,    ,EVENTOUT,
+PortD,PD14,             ,                 ,TIM4_CH3,                   ,               ,                                    ,                                        ,                                    ,UART8_CTS                      ,                                    ,                                   ,          ,FMC_D0                  ,    ,    ,EVENTOUT,
+PortD,PD15,             ,                 ,TIM4_CH4,                   ,               ,                                    ,                                        ,                                    ,UART8_RTS                      ,                                    ,                                   ,          ,FMC_D1                  ,    ,    ,EVENTOUT,
+PortE,PE0 ,             ,                 ,TIM4_ETR,LPTIM1_ETR         ,               ,                                    ,                                        ,                                    ,UART8_RX                       ,                                    ,SAI2_MCK_A                         ,          ,FMC_NBL0                ,    ,    ,EVENTOUT,
+PortE,PE1 ,             ,                 ,        ,LPTIM1_IN2         ,               ,                                    ,                                        ,                                    ,UART8_TX                       ,                                    ,                                   ,          ,FMC_NBL1                ,    ,    ,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                 ,    ,    ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                 ,        ,TIM9_CH1           ,               ,SPI4_MISO                           ,SAI1_SCK_A                              ,                                    ,                               ,                                    ,                                   ,          ,FMC_A21                 ,    ,    ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,TIM1_BKIN2       ,        ,TIM9_CH2           ,               ,SPI4_MOSI                           ,SAI1_SD_A                               ,                                    ,                               ,                                    ,SAI2_MCK_B                         ,          ,FMC_A22                 ,    ,    ,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         ,        ,                   ,               ,                                    ,                                        ,                                    ,UART7_RTS                      ,                                    ,QUADSPI_BK2_IO2                    ,          ,FMC_D6                  ,    ,    ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,                   ,               ,                                    ,                                        ,                                    ,UART7_CTS                      ,                                    ,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_MCK_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          ,               ,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                              ,                                    ,UART7_RTS                      ,TIM13_CH1                           ,QUADSPI_BK1_IO0                    ,          ,                        ,    ,    ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,                   ,               ,SPI5_MOSI                           ,SAI1_FS_B                               ,                                    ,UART7_CTS                      ,TIM14_CH1                           ,QUADSPI_BK1_IO1                    ,          ,                        ,    ,    ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,ADC3_IN8
+PortF,PF11,             ,                 ,        ,                   ,               ,SPI5_MOSI                           ,                                        ,                                    ,                               ,                                    ,SAI2_SD_B                          ,          ,FMC_SDNRAS              ,    ,    ,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 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,USART6_CK                      ,                                    ,                                   ,          ,FMC_INT                 ,    ,    ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,USART6_RTS                     ,                                    ,                                   ,          ,FMC_SDCLK               ,    ,    ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,USART6_RX                      ,QUADSPI_BK2_IO2                     ,SAI2_FS_B                          ,SDMMC2_D0 ,FMC_NE2/FMC_NCE         ,    ,    ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,SAI2_SD_B                          ,SDMMC2_D1 ,FMC_NE3                 ,    ,    ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,SDMMC2_D2                          ,          ,                        ,    ,    ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,LPTIM1_IN1         ,               ,                                    ,                                        ,                                    ,USART6_RTS                     ,                                    ,                                   ,SDMMC2_D3 ,FMC_NE4                 ,    ,    ,EVENTOUT,
+PortG,PG13,TRACED0      ,                 ,        ,LPTIM1_OUT         ,               ,                                    ,                                        ,                                    ,USART6_CTS                     ,                                    ,                                   ,          ,FMC_A24                 ,    ,    ,EVENTOUT,
+PortG,PG14,TRACED1      ,                 ,        ,LPTIM1_ETR         ,               ,                                    ,                                        ,                                    ,USART6_TX                      ,QUADSPI_BK2_IO3                     ,                                   ,          ,FMC_A25                 ,    ,    ,EVENTOUT,
+PortG,PG15,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,USART6_CTS                     ,                                    ,                                   ,          ,FMC_SDNCAS              ,    ,    ,EVENTOUT,
+PortH,PH0 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortH,PH1 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortH,PH2 ,             ,                 ,        ,LPTIM1_IN2         ,               ,                                    ,                                        ,                                    ,                               ,QUADSPI_BK2_IO0                     ,SAI2_SCK_B                         ,          ,FMC_SDCKE0              ,    ,    ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,QUADSPI_BK2_IO1                     ,SAI2_MCK_B                         ,          ,FMC_SDNE0               ,    ,    ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,                   ,I2C2_SCL       ,                                    ,                                        ,                                    ,                               ,                                    ,OTG_HS_ULPI_NXT                    ,          ,                        ,    ,    ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,                   ,I2C2_SDA       ,SPI5_NSS                            ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_SDNWE               ,    ,    ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,                   ,I2C2_SMBA      ,SPI5_SCK                            ,                                        ,                                    ,                               ,TIM12_CH1                           ,                                   ,          ,FMC_SDNE1               ,    ,    ,EVENTOUT,
+PortH,PH7 ,             ,                 ,        ,                   ,I2C3_SCL       ,SPI5_MISO                           ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_SDCKE1              ,    ,    ,EVENTOUT,
+PortH,PH8 ,             ,                 ,        ,                   ,I2C3_SDA       ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D16                 ,    ,    ,EVENTOUT,
+PortH,PH9 ,             ,                 ,        ,                   ,I2C3_SMBA      ,                                    ,                                        ,                                    ,                               ,TIM12_CH2                           ,                                   ,          ,FMC_D17                 ,    ,    ,EVENTOUT,
+PortH,PH10,             ,                 ,TIM5_CH1,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D18                 ,    ,    ,EVENTOUT,
+PortH,PH11,             ,                 ,TIM5_CH2,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D19                 ,    ,    ,EVENTOUT,
+PortH,PH12,             ,                 ,TIM5_CH3,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D20                 ,    ,    ,EVENTOUT,
+PortH,PH13,             ,                 ,        ,TIM8_CH1N          ,               ,                                    ,                                        ,                                    ,UART4_TX                       ,CAN1_TX                             ,                                   ,          ,FMC_D21                 ,    ,    ,EVENTOUT,
+PortH,PH14,             ,                 ,        ,TIM8_CH2N          ,               ,                                    ,                                        ,                                    ,UART4_RX                       ,CAN1_RX                             ,                                   ,          ,FMC_D22                 ,    ,    ,EVENTOUT,
+PortH,PH15,             ,                 ,        ,TIM8_CH3N          ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D23                 ,    ,    ,EVENTOUT,
+PortI,PI0 ,             ,                 ,TIM5_CH4,                   ,               ,SPI2_NSS/I2S2_WS                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D24                 ,    ,    ,EVENTOUT,
+PortI,PI1 ,             ,                 ,        ,TIM8_BKIN2         ,               ,SPI2_SCK/I2S2_CK                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D25                 ,    ,    ,EVENTOUT,
+PortI,PI2 ,             ,                 ,        ,TIM8_CH4           ,               ,SPI2_MISO                           ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D26                 ,    ,    ,EVENTOUT,
+PortI,PI3 ,             ,                 ,        ,TIM8_ETR           ,               ,SPI2_MOSI/I2S2_SD                   ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D27                 ,    ,    ,EVENTOUT,
+PortI,PI4 ,             ,                 ,        ,TIM8_BKIN          ,               ,                                    ,                                        ,                                    ,                               ,                                    ,SAI2_MCK_A                         ,          ,FMC_NBL2                ,    ,    ,EVENTOUT,
+PortI,PI5 ,             ,                 ,        ,TIM8_CH1           ,               ,                                    ,                                        ,                                    ,                               ,                                    ,SAI2_SCK_A                         ,          ,FMC_NBL3                ,    ,    ,EVENTOUT,
+PortI,PI6 ,             ,                 ,        ,TIM8_CH2           ,               ,                                    ,                                        ,                                    ,                               ,                                    ,SAI2_SD_A                          ,          ,FMC_D28                 ,    ,    ,EVENTOUT,
+PortI,PI7 ,             ,                 ,        ,TIM8_CH3           ,               ,                                    ,                                        ,                                    ,                               ,                                    ,SAI2_FS_A                          ,          ,FMC_D29                 ,    ,    ,EVENTOUT,
+PortI,PI8 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortI,PI9 ,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,UART4_RX                       ,CAN1_RX                             ,                                   ,          ,FMC_D30                 ,    ,    ,EVENTOUT,
+PortI,PI10,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,FMC_D31                 ,    ,    ,EVENTOUT,
+PortI,PI11,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,OTG_HS_ULPI_DIR                    ,          ,                        ,    ,    ,EVENTOUT,
+PortI,PI12,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortI,PI13,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortI,PI14,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
+PortI,PI15,             ,                 ,        ,                   ,               ,                                    ,                                        ,                                    ,                               ,                                    ,                                   ,          ,                        ,    ,    ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32f746_af.csv b/ports/stm32/boards/stm32f746_af.csv
index d9e42008d616f..167feb6d62a0a 100644
--- a/ports/stm32/boards/stm32f746_af.csv
+++ b/ports/stm32/boards/stm32f746_af.csv
@@ -1,170 +1,170 @@
-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/LPTIM1/CEC,I2C1/2/3/4/CEC,SPI1/2/3/4/5/6,SPI3/SAI1,SPI2/3/USART1/2/3/UART5/SPDIFRX,SAI2/USART6/UART4/5/7/8/SPDIFRX,CAN1/2/TIM12/13/14/QUADSPI/LCD,SAI2/QUADSPI/OTG2_HS/OTG1_FS,ETH/OTG1_FS,FMC/SDMMC1/OTG2_FS,DCMI,LCD,SYS,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,SAI2_SD_B,ETH_MII_CRS,,,,EVENTOUT,ADC123_IN0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS,UART4_RX,QUADSPI_BK1_IO3,SAI2_MCK_B,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,LCD_R2,EVENTOUT,ADC123_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,SAI2_SCK_B,,,ETH_MDIO,,,LCD_R1,EVENTOUT,ADC123_IN2
-PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,,,USART2_RX,,,OTG_HS_ULPI_D0,ETH_MII_COL,,,LCD_B5,EVENTOUT,ADC123_IN3
-PortA,PA4,,,,,,SPI1_NSS/I2S1_WS,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/I2S1_CK,,,,,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/I2S1_SD,,,,TIM14_CH1,,ETH_MII_RX_DV/ETH_RMII_CRS_DV,FMC_SDNWE,,,EVENTOUT,ADC12_IN7
-PortA,PA8,MCO1,TIM1_CH1,,TIM8_BKIN2,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,SAI2_FS_B,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,,,HDMI_CEC,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,,UART4_RTS,,,,,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,,,UART4_CTS,LCD_R3,OTG_HS_ULPI_D1,ETH_MII_RXD2,,,,EVENTOUT,ADC12_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,,,,LCD_R6,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,,EVENTOUT,ADC12_IN9
-PortB,PB2,,,,,,,SAI1_SD_A,SPI3_MOSI/I2S3_SD,,QUADSPI_CLK,,,,,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,,,,,,,,,EVENTOUT,
-PortB,PB4,NJTRST,,TIM3_CH1,,,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,ETH_PPS_OUT,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,,,,,FMC_NL,DCMI_VSYNC,,EVENTOUT,
-PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,,,,CAN1_RX,,ETH_MII_TXD3,SDMMC1_D4,DCMI_D6,LCD_B6,EVENTOUT,
-PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,CAN1_TX,,,SDMMC1_D5,DCMI_D7,LCD_B7,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,,USART3_TX,,,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,,,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,,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,,,,,,,,,SAI2_FS_B,,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,,,,,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,,,,,,I2S1_MCK,,,SPDIFRX_IN2,,,ETH_MII_RXD0/ETH_RMII_RXD0,FMC_SDNE0,,,EVENTOUT,ADC12_IN14
-PortC,PC5,,,,,,,,,SPDIFRX_IN3,,,ETH_MII_RXD1/ETH_RMII_RXD1,FMC_SDCKE0,,,EVENTOUT,ADC12_IN15
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,,I2S2_MCK,,,USART6_TX,,,,SDMMC1_D6,DCMI_D0,LCD_HSYNC,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,,,I2S3_MCK,,USART6_RX,,,,SDMMC1_D7,DCMI_D1,LCD_G6,EVENTOUT,
-PortC,PC8,TRACED1,,TIM3_CH3,TIM8_CH3,,,,UART5_RTS,USART6_CK,,,,SDMMC1_D0,DCMI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,UART5_CTS,,QUADSPI_BK1_IO0,,,SDMMC1_D1,DCMI_D3,,EVENTOUT,
-PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,QUADSPI_BK1_IO1,,,SDMMC1_D2,DCMI_D8,LCD_R2,EVENTOUT,
-PortC,PC11,,,,,,,SPI3_MISO,USART3_RX,UART4_RX,QUADSPI_BK2_NCS,,,SDMMC1_D3,DCMI_D4,,EVENTOUT,
-PortC,PC12,TRACED3,,,,,,SPI3_MOSI/I2S3_SD,USART3_CK,UART5_TX,,,,SDMMC1_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,,,,SDMMC1_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,SPDIFRX_IN0,,,,FMC_NE1,,,EVENTOUT,
-PortD,PD8,,,,,,,,USART3_TX,SPDIFRX_IN1,,,,FMC_D13,,,EVENTOUT,
-PortD,PD9,,,,,,,,USART3_RX,,,,,FMC_D14,,,EVENTOUT,
-PortD,PD10,,,,,,,,USART3_CK,,,,,FMC_D15,,LCD_B3,EVENTOUT,
-PortD,PD11,,,,,I2C4_SMBA,,,USART3_CTS,,QUADSPI_BK1_IO0,SAI2_SD_A,,FMC_A16/FMC_CLE,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,LPTIM1_IN1,I2C4_SCL,,,USART3_RTS,,QUADSPI_BK1_IO1,SAI2_FS_A,,FMC_A17/FMC_ALE,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,LPTIM1_OUT,I2C4_SDA,,,,,QUADSPI_BK1_IO3,SAI2_SCK_A,,FMC_A18,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,UART8_CTS,,,,FMC_D0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,UART8_RTS,,,,FMC_D1,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,LPTIM1_ETR,,,,,UART8_RX,,SAI2_MCK_A,,FMC_NBL0,DCMI_D2,,EVENTOUT,
-PortE,PE1,,,,LPTIM1_IN2,,,,,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,TIM1_BKIN2,,TIM9_CH2,,SPI4_MOSI,SAI1_SD_A,,,,SAI2_MCK_B,,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,,,,,,,UART7_RTS,,QUADSPI_BK2_IO2,,FMC_D6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,,,UART7_CTS,,QUADSPI_BK2_IO3,,FMC_D7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,SPI4_NSS,,,,,SAI2_SD_B,,FMC_D8,,LCD_G3,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,,,,,SAI2_SCK_B,,FMC_D9,,LCD_B4,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,,,,,SAI2_FS_B,,FMC_D10,,LCD_DE,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI2_MCK_B,,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,,UART7_RTS,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,ADC3_IN6
-PortF,PF9,,,,,,SPI5_MOSI,SAI1_FS_B,,UART7_CTS,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,ADC3_IN7
-PortF,PF10,,,,,,,,,,,,,,DCMI_D11,LCD_DE,EVENTOUT,ADC3_IN8
-PortF,PF11,,,,,,SPI5_MOSI,,,,,SAI2_SD_B,,FMC_SDNRAS,DCMI_D12,,EVENTOUT,
-PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,
-PortF,PF13,,,,,I2C4_SMBA,,,,,,,,FMC_A7,,,EVENTOUT,
-PortF,PF14,,,,,I2C4_SCL,,,,,,,,FMC_A8,,,EVENTOUT,
-PortF,PF15,,,,,I2C4_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,,,,,,,,,,,,,,DCMI_D12,LCD_R7,EVENTOUT,
-PortG,PG7,,,,,,,,,USART6_CK,,,,FMC_INT,DCMI_D13,LCD_CLK,EVENTOUT,
-PortG,PG8,,,,,,SPI6_NSS,,SPDIFRX_IN2,USART6_RTS,,,ETH_PPS_OUT,FMC_SDCLK,,,EVENTOUT,
-PortG,PG9,,,,,,,,SPDIFRX_IN3,USART6_RX,QUADSPI_BK2_IO2,SAI2_FS_B,,FMC_NE2/FMC_NCE,DCMI_VSYNC,,EVENTOUT,
-PortG,PG10,,,,,,,,,,LCD_G3,SAI2_SD_B,,FMC_NE3,DCMI_D2,LCD_B2,EVENTOUT,
-PortG,PG11,,,,,,,,SPDIFRX_IN0,,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DCMI_D3,LCD_B3,EVENTOUT,
-PortG,PG12,,,,LPTIM1_IN1,,SPI6_MISO,,SPDIFRX_IN1,USART6_RTS,LCD_B4,,,FMC_NE4,,LCD_B1,EVENTOUT,
-PortG,PG13,TRACED0,,,LPTIM1_OUT,,SPI6_SCK,,,USART6_CTS,,,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,,LCD_R0,EVENTOUT,
-PortG,PG14,TRACED1,,,LPTIM1_ETR,,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,,,,LPTIM1_IN2,,,,,,QUADSPI_BK2_IO0,SAI2_SCK_B,ETH_MII_CRS,FMC_SDCKE0,,LCD_R0,EVENTOUT,
-PortH,PH3,,,,,,,,,,QUADSPI_BK2_IO1,SAI2_MCK_B,ETH_MII_COL,FMC_SDNE0,,LCD_R1,EVENTOUT,
-PortH,PH4,,,,,I2C2_SCL,,,,,,OTG_HS_ULPI_NXT,,,,,EVENTOUT,
-PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,,,,,,FMC_SDNWE,,,EVENTOUT,
-PortH,PH6,,,,,I2C2_SMBA,SPI5_SCK,,,,TIM12_CH1,,ETH_MII_RXD2,FMC_SDNE1,DCMI_D8,,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,,I2C4_SMBA,,,,,,,,FMC_D18,DCMI_D1,LCD_R4,EVENTOUT,
-PortH,PH11,,,TIM5_CH2,,I2C4_SCL,,,,,,,,FMC_D19,DCMI_D2,LCD_R5,EVENTOUT,
-PortH,PH12,,,TIM5_CH3,,I2C4_SDA,,,,,,,,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,,,,TIM8_BKIN2,,SPI2_SCK/I2S2_CK,,,,,,,FMC_D25,DCMI_D8,LCD_G6,EVENTOUT,
-PortI,PI2,,,,TIM8_CH4,,SPI2_MISO,,,,,,,FMC_D26,DCMI_D9,LCD_G7,EVENTOUT,
-PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SD,,,,,,,FMC_D27,DCMI_D10,,EVENTOUT,
-PortI,PI4,,,,TIM8_BKIN,,,,,,,SAI2_MCK_A,,FMC_NBL2,DCMI_D5,LCD_B4,EVENTOUT,
-PortI,PI5,,,,TIM8_CH1,,,,,,,SAI2_SCK_A,,FMC_NBL3,DCMI_VSYNC,LCD_B5,EVENTOUT,
-PortI,PI6,,,,TIM8_CH2,,,,,,,SAI2_SD_A,,FMC_D28,DCMI_D6,LCD_B6,EVENTOUT,
-PortI,PI7,,,,TIM8_CH3,,,,,,,SAI2_FS_A,,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,,,,,,,,,,,OTG_HS_ULPI_DIR,,,,,EVENTOUT,
-PortI,PI12,,,,,,,,,,,,,,,LCD_HSYNC,EVENTOUT,
-PortI,PI13,,,,,,,,,,,,,,,LCD_VSYNC,EVENTOUT,
-PortI,PI14,,,,,,,,,,,,,,,LCD_CLK,EVENTOUT,
-PortI,PI15,,,,,,,,,,,,,,,LCD_R0,EVENTOUT,
-PortJ,PJ0,,,,,,,,,,,,,,,LCD_R1,EVENTOUT,
-PortJ,PJ1,,,,,,,,,,,,,,,LCD_R2,EVENTOUT,
-PortJ,PJ2,,,,,,,,,,,,,,,LCD_R3,EVENTOUT,
-PortJ,PJ3,,,,,,,,,,,,,,,LCD_R4,EVENTOUT,
-PortJ,PJ4,,,,,,,,,,,,,,,LCD_R5,EVENTOUT,
-PortJ,PJ5,,,,,,,,,,,,,,,LCD_R6,EVENTOUT,
-PortJ,PJ6,,,,,,,,,,,,,,,LCD_R7,EVENTOUT,
-PortJ,PJ7,,,,,,,,,,,,,,,LCD_G0,EVENTOUT,
-PortJ,PJ8,,,,,,,,,,,,,,,LCD_G1,EVENTOUT,
-PortJ,PJ9,,,,,,,,,,,,,,,LCD_G2,EVENTOUT,
-PortJ,PJ10,,,,,,,,,,,,,,,LCD_G3,EVENTOUT,
-PortJ,PJ11,,,,,,,,,,,,,,,LCD_G4,EVENTOUT,
-PortJ,PJ12,,,,,,,,,,,,,,,LCD_B0,EVENTOUT,
-PortJ,PJ13,,,,,,,,,,,,,,,LCD_B1,EVENTOUT,
-PortJ,PJ14,,,,,,,,,,,,,,,LCD_B2,EVENTOUT,
-PortJ,PJ15,,,,,,,,,,,,,,,LCD_B3,EVENTOUT,
-PortK,PK0,,,,,,,,,,,,,,,LCD_G5,EVENTOUT,
-PortK,PK1,,,,,,,,,,,,,,,LCD_G6,EVENTOUT,
-PortK,PK2,,,,,,,,,,,,,,,LCD_G7,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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3                    ,AF4           ,AF5              ,AF6              ,AF7                            ,AF8                            ,AF9                           ,AF10                        ,AF11                           ,AF12              ,AF13       ,AF14     ,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11/LPTIM1/CEC,I2C1/2/3/4/CEC,SPI1/2/3/4/5/6   ,SPI3/SAI1        ,SPI2/3/USART1/2/3/UART5/SPDIFRX,SAI2/USART6/UART4/5/7/8/SPDIFRX,CAN1/2/TIM12/13/14/QUADSPI/LCD,SAI2/QUADSPI/OTG2_HS/OTG1_FS,ETH/OTG1_FS                    ,FMC/SDMMC1/OTG2_FS,DCMI       ,LCD      ,SYS     ,ADC
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR               ,              ,                 ,                 ,USART2_CTS                     ,UART4_TX                       ,                              ,SAI2_SD_B                   ,ETH_MII_CRS                    ,                  ,           ,         ,EVENTOUT,ADC123_IN0
+PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2,                       ,              ,                 ,                 ,USART2_RTS                     ,UART4_RX                       ,QUADSPI_BK1_IO3               ,SAI2_MCK_B                  ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,           ,LCD_R2   ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1               ,              ,                 ,                 ,USART2_TX                      ,SAI2_SCK_B                     ,                              ,                            ,ETH_MDIO                       ,                  ,           ,LCD_R1   ,EVENTOUT,ADC123_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2               ,              ,                 ,                 ,USART2_RX                      ,                               ,                              ,OTG_HS_ULPI_D0              ,ETH_MII_COL                    ,                  ,           ,LCD_B5   ,EVENTOUT,ADC123_IN3
+PortA,PA4 ,             ,                 ,        ,                       ,              ,SPI1_NSS/I2S1_WS ,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/I2S1_CK ,                 ,                               ,                               ,                              ,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/I2S1_SD,                 ,                               ,                               ,TIM14_CH1                     ,                            ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,FMC_SDNWE         ,           ,         ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,TIM8_BKIN2             ,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                     ,SAI2_FS_B                      ,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,        ,                       ,HDMI_CEC      ,SPI1_NSS/I2S1_WS ,SPI3_NSS/I2S3_WS ,                               ,UART4_RTS                      ,                              ,                            ,                               ,                  ,           ,         ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N        ,TIM3_CH3,TIM8_CH2N              ,              ,                 ,                 ,                               ,UART4_CTS                      ,LCD_R3                        ,OTG_HS_ULPI_D1              ,ETH_MII_RXD2                   ,                  ,           ,         ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N              ,              ,                 ,                 ,                               ,                               ,LCD_R6                        ,OTG_HS_ULPI_D2              ,ETH_MII_RXD3                   ,                  ,           ,         ,EVENTOUT,ADC12_IN9
+PortB,PB2 ,             ,                 ,        ,                       ,              ,                 ,SAI1_SD_A        ,SPI3_MOSI/I2S3_SD              ,                               ,QUADSPI_CLK                   ,                            ,                               ,                  ,           ,         ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2         ,        ,                       ,              ,SPI1_SCK/I2S1_CK ,SPI3_SCK/I2S3_CK ,                               ,                               ,                              ,                            ,                               ,                  ,           ,         ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,                 ,TIM3_CH1,                       ,              ,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              ,ETH_PPS_OUT                    ,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                      ,                               ,                              ,                            ,                               ,FMC_NL            ,DCMI_VSYNC ,         ,EVENTOUT,
+PortB,PB8 ,             ,                 ,TIM4_CH3,TIM10_CH1              ,I2C1_SCL      ,                 ,                 ,                               ,                               ,CAN1_RX                       ,                            ,ETH_MII_TXD3                   ,SDMMC1_D4         ,DCMI_D6    ,LCD_B6   ,EVENTOUT,
+PortB,PB9 ,             ,                 ,TIM4_CH4,TIM11_CH1              ,I2C1_SDA      ,SPI2_NSS/I2S2_WS ,                 ,                               ,                               ,CAN1_TX                       ,                            ,                               ,SDMMC1_D5         ,DCMI_D7    ,LCD_B7   ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3         ,        ,                       ,I2C2_SCL      ,SPI2_SCK/I2S2_CK ,                 ,USART3_TX                      ,                               ,                              ,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   ,                  ,           ,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        ,                 ,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 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,SAI2_FS_B                      ,                              ,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        ,                 ,                               ,                               ,                              ,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 ,             ,                 ,        ,                       ,              ,I2S1_MCK         ,                 ,                               ,SPDIFRX_IN2                    ,                              ,                            ,ETH_MII_RXD0/ETH_RMII_RXD0     ,FMC_SDNE0         ,           ,         ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,SPDIFRX_IN3                    ,                              ,                            ,ETH_MII_RXD1/ETH_RMII_RXD1     ,FMC_SDCKE0        ,           ,         ,EVENTOUT,ADC12_IN15
+PortC,PC6 ,             ,                 ,TIM3_CH1,TIM8_CH1               ,              ,I2S2_MCK         ,                 ,                               ,USART6_TX                      ,                              ,                            ,                               ,SDMMC1_D6         ,DCMI_D0    ,LCD_HSYNC,EVENTOUT,
+PortC,PC7 ,             ,                 ,TIM3_CH2,TIM8_CH2               ,              ,                 ,I2S3_MCK         ,                               ,USART6_RX                      ,                              ,                            ,                               ,SDMMC1_D7         ,DCMI_D1    ,LCD_G6   ,EVENTOUT,
+PortC,PC8 ,TRACED1      ,                 ,TIM3_CH3,TIM8_CH3               ,              ,                 ,                 ,UART5_RTS                      ,USART6_CK                      ,                              ,                            ,                               ,SDMMC1_D0         ,DCMI_D2    ,         ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4               ,I2C3_SDA      ,I2S_CKIN         ,                 ,UART5_CTS                      ,                               ,QUADSPI_BK1_IO0               ,                            ,                               ,SDMMC1_D1         ,DCMI_D3    ,         ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,                       ,              ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX                      ,UART4_TX                       ,QUADSPI_BK1_IO1               ,                            ,                               ,SDMMC1_D2         ,DCMI_D8    ,LCD_R2   ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,                       ,              ,                 ,SPI3_MISO        ,USART3_RX                      ,UART4_RX                       ,QUADSPI_BK2_NCS               ,                            ,                               ,SDMMC1_D3         ,DCMI_D4    ,         ,EVENTOUT,
+PortC,PC12,TRACED3      ,                 ,        ,                       ,              ,                 ,SPI3_MOSI/I2S3_SD,USART3_CK                      ,UART5_TX                       ,                              ,                            ,                               ,SDMMC1_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                       ,                              ,                            ,                               ,SDMMC1_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                      ,SPDIFRX_IN0                    ,                              ,                            ,                               ,FMC_NE1           ,           ,         ,EVENTOUT,
+PortD,PD8 ,             ,                 ,        ,                       ,              ,                 ,                 ,USART3_TX                      ,SPDIFRX_IN1                    ,                              ,                            ,                               ,FMC_D13           ,           ,         ,EVENTOUT,
+PortD,PD9 ,             ,                 ,        ,                       ,              ,                 ,                 ,USART3_RX                      ,                               ,                              ,                            ,                               ,FMC_D14           ,           ,         ,EVENTOUT,
+PortD,PD10,             ,                 ,        ,                       ,              ,                 ,                 ,USART3_CK                      ,                               ,                              ,                            ,                               ,FMC_D15           ,           ,LCD_B3   ,EVENTOUT,
+PortD,PD11,             ,                 ,        ,                       ,I2C4_SMBA     ,                 ,                 ,USART3_CTS                     ,                               ,QUADSPI_BK1_IO0               ,SAI2_SD_A                   ,                               ,FMC_A16/FMC_CLE   ,           ,         ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,LPTIM1_IN1             ,I2C4_SCL      ,                 ,                 ,USART3_RTS                     ,                               ,QUADSPI_BK1_IO1               ,SAI2_FS_A                   ,                               ,FMC_A17/FMC_ALE   ,           ,         ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,LPTIM1_OUT             ,I2C4_SDA      ,                 ,                 ,                               ,                               ,QUADSPI_BK1_IO3               ,SAI2_SCK_A                  ,                               ,FMC_A18           ,           ,         ,EVENTOUT,
+PortD,PD14,             ,                 ,TIM4_CH3,                       ,              ,                 ,                 ,                               ,UART8_CTS                      ,                              ,                            ,                               ,FMC_D0            ,           ,         ,EVENTOUT,
+PortD,PD15,             ,                 ,TIM4_CH4,                       ,              ,                 ,                 ,                               ,UART8_RTS                      ,                              ,                            ,                               ,FMC_D1            ,           ,         ,EVENTOUT,
+PortE,PE0 ,             ,                 ,TIM4_ETR,LPTIM1_ETR             ,              ,                 ,                 ,                               ,UART8_RX                       ,                              ,SAI2_MCK_A                  ,                               ,FMC_NBL0          ,DCMI_D2    ,         ,EVENTOUT,
+PortE,PE1 ,             ,                 ,        ,LPTIM1_IN2             ,              ,                 ,                 ,                               ,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      ,TIM1_BKIN2       ,        ,TIM9_CH2               ,              ,SPI4_MOSI        ,SAI1_SD_A        ,                               ,                               ,                              ,SAI2_MCK_B                  ,                               ,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         ,        ,                       ,              ,                 ,                 ,                               ,UART7_RTS                      ,                              ,QUADSPI_BK2_IO2             ,                               ,FMC_D6            ,           ,         ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,                       ,              ,                 ,                 ,                               ,UART7_CTS                      ,                              ,QUADSPI_BK2_IO3             ,                               ,FMC_D7            ,           ,         ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,        ,                       ,              ,SPI4_NSS         ,                 ,                               ,                               ,                              ,SAI2_SD_B                   ,                               ,FMC_D8            ,           ,LCD_G3   ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,        ,                       ,              ,SPI4_SCK         ,                 ,                               ,                               ,                              ,SAI2_SCK_B                  ,                               ,FMC_D9            ,           ,LCD_B4   ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,        ,                       ,              ,SPI4_MISO        ,                 ,                               ,                               ,                              ,SAI2_FS_B                   ,                               ,FMC_D10           ,           ,LCD_DE   ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,        ,                       ,              ,SPI4_MOSI        ,                 ,                               ,                               ,                              ,SAI2_MCK_B                  ,                               ,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       ,                               ,UART7_RTS                      ,TIM13_CH1                     ,QUADSPI_BK1_IO0             ,                               ,                  ,           ,         ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,                       ,              ,SPI5_MOSI        ,SAI1_FS_B        ,                               ,UART7_CTS                      ,TIM14_CH1                     ,QUADSPI_BK1_IO1             ,                               ,                  ,           ,         ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,DCMI_D11   ,LCD_DE   ,EVENTOUT,ADC3_IN8
+PortF,PF11,             ,                 ,        ,                       ,              ,SPI5_MOSI        ,                 ,                               ,                               ,                              ,SAI2_SD_B                   ,                               ,FMC_SDNRAS        ,DCMI_D12   ,         ,EVENTOUT,
+PortF,PF12,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_A6            ,           ,         ,EVENTOUT,
+PortF,PF13,             ,                 ,        ,                       ,I2C4_SMBA     ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_A7            ,           ,         ,EVENTOUT,
+PortF,PF14,             ,                 ,        ,                       ,I2C4_SCL      ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_A8            ,           ,         ,EVENTOUT,
+PortF,PF15,             ,                 ,        ,                       ,I2C4_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 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,DCMI_D12   ,LCD_R7   ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,USART6_CK                      ,                              ,                            ,                               ,FMC_INT           ,DCMI_D13   ,LCD_CLK  ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,                       ,              ,SPI6_NSS         ,                 ,SPDIFRX_IN2                    ,USART6_RTS                     ,                              ,                            ,ETH_PPS_OUT                    ,FMC_SDCLK         ,           ,         ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,                       ,              ,                 ,                 ,SPDIFRX_IN3                    ,USART6_RX                      ,QUADSPI_BK2_IO2               ,SAI2_FS_B                   ,                               ,FMC_NE2/FMC_NCE   ,DCMI_VSYNC ,         ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,LCD_G3                        ,SAI2_SD_B                   ,                               ,FMC_NE3           ,DCMI_D2    ,LCD_B2   ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,                       ,              ,                 ,                 ,SPDIFRX_IN0                    ,                               ,                              ,                            ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,                  ,DCMI_D3    ,LCD_B3   ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,LPTIM1_IN1             ,              ,SPI6_MISO        ,                 ,SPDIFRX_IN1                    ,USART6_RTS                     ,LCD_B4                        ,                            ,                               ,FMC_NE4           ,           ,LCD_B1   ,EVENTOUT,
+PortG,PG13,TRACED0      ,                 ,        ,LPTIM1_OUT             ,              ,SPI6_SCK         ,                 ,                               ,USART6_CTS                     ,                              ,                            ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,           ,LCD_R0   ,EVENTOUT,
+PortG,PG14,TRACED1      ,                 ,        ,LPTIM1_ETR             ,              ,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 ,             ,                 ,        ,LPTIM1_IN2             ,              ,                 ,                 ,                               ,                               ,QUADSPI_BK2_IO0               ,SAI2_SCK_B                  ,ETH_MII_CRS                    ,FMC_SDCKE0        ,           ,LCD_R0   ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,QUADSPI_BK2_IO1               ,SAI2_MCK_B                  ,ETH_MII_COL                    ,FMC_SDNE0         ,           ,LCD_R1   ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,                       ,I2C2_SCL      ,                 ,                 ,                               ,                               ,                              ,OTG_HS_ULPI_NXT             ,                               ,                  ,           ,         ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,                       ,I2C2_SDA      ,SPI5_NSS         ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_SDNWE         ,           ,         ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,                       ,I2C2_SMBA     ,SPI5_SCK         ,                 ,                               ,                               ,TIM12_CH1                     ,                            ,ETH_MII_RXD2                   ,FMC_SDNE1         ,DCMI_D8    ,         ,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,                       ,I2C4_SMBA     ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_D18           ,DCMI_D1    ,LCD_R4   ,EVENTOUT,
+PortH,PH11,             ,                 ,TIM5_CH2,                       ,I2C4_SCL      ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_D19           ,DCMI_D2    ,LCD_R5   ,EVENTOUT,
+PortH,PH12,             ,                 ,TIM5_CH3,                       ,I2C4_SDA      ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,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 ,             ,                 ,        ,TIM8_BKIN2             ,              ,SPI2_SCK/I2S2_CK ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_D25           ,DCMI_D8    ,LCD_G6   ,EVENTOUT,
+PortI,PI2 ,             ,                 ,        ,TIM8_CH4               ,              ,SPI2_MISO        ,                 ,                               ,                               ,                              ,                            ,                               ,FMC_D26           ,DCMI_D9    ,LCD_G7   ,EVENTOUT,
+PortI,PI3 ,             ,                 ,        ,TIM8_ETR               ,              ,SPI2_MOSI/I2S2_SD,                 ,                               ,                               ,                              ,                            ,                               ,FMC_D27           ,DCMI_D10   ,         ,EVENTOUT,
+PortI,PI4 ,             ,                 ,        ,TIM8_BKIN              ,              ,                 ,                 ,                               ,                               ,                              ,SAI2_MCK_A                  ,                               ,FMC_NBL2          ,DCMI_D5    ,LCD_B4   ,EVENTOUT,
+PortI,PI5 ,             ,                 ,        ,TIM8_CH1               ,              ,                 ,                 ,                               ,                               ,                              ,SAI2_SCK_A                  ,                               ,FMC_NBL3          ,DCMI_VSYNC ,LCD_B5   ,EVENTOUT,
+PortI,PI6 ,             ,                 ,        ,TIM8_CH2               ,              ,                 ,                 ,                               ,                               ,                              ,SAI2_SD_A                   ,                               ,FMC_D28           ,DCMI_D6    ,LCD_B6   ,EVENTOUT,
+PortI,PI7 ,             ,                 ,        ,TIM8_CH3               ,              ,                 ,                 ,                               ,                               ,                              ,SAI2_FS_A                   ,                               ,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,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,OTG_HS_ULPI_DIR             ,                               ,                  ,           ,         ,EVENTOUT,
+PortI,PI12,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_HSYNC,EVENTOUT,
+PortI,PI13,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_VSYNC,EVENTOUT,
+PortI,PI14,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_CLK  ,EVENTOUT,
+PortI,PI15,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R0   ,EVENTOUT,
+PortJ,PJ0 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R1   ,EVENTOUT,
+PortJ,PJ1 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R2   ,EVENTOUT,
+PortJ,PJ2 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R3   ,EVENTOUT,
+PortJ,PJ3 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R4   ,EVENTOUT,
+PortJ,PJ4 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R5   ,EVENTOUT,
+PortJ,PJ5 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R6   ,EVENTOUT,
+PortJ,PJ6 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_R7   ,EVENTOUT,
+PortJ,PJ7 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G0   ,EVENTOUT,
+PortJ,PJ8 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G1   ,EVENTOUT,
+PortJ,PJ9 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G2   ,EVENTOUT,
+PortJ,PJ10,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G3   ,EVENTOUT,
+PortJ,PJ11,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G4   ,EVENTOUT,
+PortJ,PJ12,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_B0   ,EVENTOUT,
+PortJ,PJ13,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_B1   ,EVENTOUT,
+PortJ,PJ14,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_B2   ,EVENTOUT,
+PortJ,PJ15,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_B3   ,EVENTOUT,
+PortK,PK0 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G5   ,EVENTOUT,
+PortK,PK1 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G6   ,EVENTOUT,
+PortK,PK2 ,             ,                 ,        ,                       ,              ,                 ,                 ,                               ,                               ,                              ,                            ,                               ,                  ,           ,LCD_G7   ,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,
diff --git a/ports/stm32/boards/stm32f767_af.csv b/ports/stm32/boards/stm32f767_af.csv
index 0c8069ec26129..c86c3bfe314a1 100644
--- a/ports/stm32/boards/stm32f767_af.csv
+++ b/ports/stm32/boards/stm32f767_af.csv
@@ -1,170 +1,170 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS,I2C4/UART5/TIM1/2,TIM3/4/5,TIM8/9/10/11/LPTIM1/DFSDM1/CEC,I2C1/2/3/4/USART1/CEC,SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,SPI2/I2S2/SPI3/I2S3/SAI1/I2C4/UART4/DFSDM1,SPI2/I2S2/SPI3/I2S3/SPI6/USART1/2/3/UART5/DFSDM1/SPDIF,SPI6/SAI2/USART6/UART4/5/7/8/OTG_FS/SPDIF,CAN1/2/TIM12/13/14/QUADSPI/FMC/LCD,SAI2/QUADSPI/SDMMC2/DFSDM1/OTG2_HS/OTG1_FS/LCD,I2C4/CAN3/SDMMC2/ETH,UART7/FMC/SDMMC1/MDIOS/OTG2_FS,DCMI/LCD/DSI,LCD,SYS,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,SAI2_SD_B,ETH_MII_CRS,,,,EVENTOUT,ADC123_IN0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS,UART4_RX,QUADSPI_BK1_IO3,SAI2_MCK_B,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,LCD_R2,EVENTOUT,ADC123_IN1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,SAI2_SCK_B,,,ETH_MDIO,MDIOS_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/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,SPI6_NSS,,,,OTG_HS_SOF,DCMI_HSYNC,LCD_VSYNC,EVENTOUT,ADC12_IN4
-PortA,PA5,,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,SPI6_SCK,,OTG_HS_ULPI_CK,,,,LCD_R4,EVENTOUT,ADC12_IN5
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO,,,SPI6_MISO,TIM13_CH1,,,MDIOS_MDC,DCMI_PIXCLK,LCD_G2,EVENTOUT,ADC12_IN6
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SD,,,SPI6_MOSI,TIM14_CH1,,ETH_MII_RX_DV/ETH_RMII_CRS_DV,FMC_SDNWE,,,EVENTOUT,ADC12_IN7
-PortA,PA8,MCO1,TIM1_CH1,,TIM8_BKIN2,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,CAN3_RX,UART7_RX,LCD_B3,LCD_R6,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,,,,,DCMI_D0,LCD_R5,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,,,,,USART1_RX,,LCD_B4,OTG_FS_ID,,MDIOS_MDIO,DCMI_D1,LCD_B1,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,,,SPI2_NSS/I2S2_WS,UART4_RX,USART1_CTS,,CAN1_RX,OTG_FS_DM,,,,LCD_R4,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,,,SPI2_SCK/I2S2_CK,UART4_TX,USART1_RTS,SAI2_FS_B,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,,,HDMI_CEC,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,SPI6_NSS,UART4_RTS,,,CAN3_TX,UART7_TX,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,DFSDM1_CKOUT,,UART4_CTS,LCD_R3,OTG_HS_ULPI_D1,ETH_MII_RXD2,,,LCD_G1,EVENTOUT,ADC12_IN8
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,DFSDM1_DATAIN1,,,LCD_R6,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,LCD_G0,EVENTOUT,ADC12_IN9
-PortB,PB2,,,,,,,SAI1_SD_A,SPI3_MOSI/I2S3_SD,,QUADSPI_CLK,DFSDM1_CKIN1,,,,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,,SPI6_SCK,,SDMMC2_D2,CAN3_RX,UART7_RX,,,EVENTOUT,
-PortB,PB4,NJTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,SPI2_NSS/I2S2_WS,SPI6_MISO,,SDMMC2_D3,CAN3_TX,UART7_TX,,,EVENTOUT,
-PortB,PB5,,UART5_RX,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI/I2S1_SD,SPI3_MOSI/I2S3_SD,,SPI6_MOSI,CAN2_RX,OTG_HS_ULPI_D7,ETH_PPS_OUT,FMC_SDCKE1,DCMI_D10,LCD_G7,EVENTOUT,
-PortB,PB6,,UART5_TX,TIM4_CH1,HDMI_CEC,I2C1_SCL,,DFSDM1_DATAIN5,USART1_TX,,CAN2_TX,QUADSPI_BK1_NCS,I2C4_SCL,FMC_SDNE1,DCMI_D5,,EVENTOUT,
-PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,DFSDM1_CKIN5,USART1_RX,,,,I2C4_SDA,FMC_NL,DCMI_VSYNC,,EVENTOUT,
-PortB,PB8,,I2C4_SCL,TIM4_CH3,TIM10_CH1,I2C1_SCL,,DFSDM1_CKIN7,UART5_RX,,CAN1_RX,SDMMC2_D4,ETH_MII_TXD3,SDMMC1_D4,DCMI_D6,LCD_B6,EVENTOUT,
-PortB,PB9,,I2C4_SDA,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,DFSDM1_DATAIN7,UART5_TX,,CAN1_TX,SDMMC2_D5,I2C4_SMBA,SDMMC1_D5,DCMI_D7,LCD_B7,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,DFSDM1_DATAIN7,USART3_TX,,QUADSPI_BK1_NCS,OTG_HS_ULPI_D3,ETH_MII_RX_ER,,,LCD_G4,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C2_SDA,,DFSDM1_CKIN7,USART3_RX,,,OTG_HS_ULPI_D4,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DSI_TE,LCD_G5,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,DFSDM1_DATAIN1,USART3_CK,UART5_RX,CAN2_RX,OTG_HS_ULPI_D5,ETH_MII_TXD0/ETH_RMII_TXD0,OTG_HS_ID,,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,,SPI2_SCK/I2S2_CK,DFSDM1_CKIN1,USART3_CTS,UART5_TX,CAN2_TX,OTG_HS_ULPI_D6,ETH_MII_TXD1/ETH_RMII_TXD1,,,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,USART1_TX,SPI2_MISO,DFSDM1_DATAIN2,USART3_RTS,UART4_RTS,TIM12_CH1,SDMMC2_D0,,OTG_HS_DM,,,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,,TIM8_CH3N,USART1_RX,SPI2_MOSI/I2S2_SD,DFSDM1_CKIN2,,UART4_CTS,TIM12_CH2,SDMMC2_D1,,OTG_HS_DP,,,EVENTOUT,
-PortC,PC0,,,,DFSDM1_CKIN0,,,DFSDM1_DATAIN4,,SAI2_FS_B,,OTG_HS_ULPI_STP,,FMC_SDNWE,,LCD_R5,EVENTOUT,ADC123_IN10
-PortC,PC1,TRACED0,,,DFSDM1_DATAIN0,,SPI2_MOSI/I2S2_SD,SAI1_SD_A,,,,DFSDM1_CKIN4,ETH_MDC,MDIOS_MDC,,,EVENTOUT,ADC123_IN11
-PortC,PC2,,,,DFSDM1_CKIN1,,SPI2_MISO,DFSDM1_CKOUT,,,,OTG_HS_ULPI_DIR,ETH_MII_TXD2,FMC_SDNE0,,,EVENTOUT,ADC123_IN12
-PortC,PC3,,,,DFSDM1_DATAIN1,,SPI2_MOSI/I2S2_SD,,,,,OTG_HS_ULPI_NXT,ETH_MII_TX_CLK,FMC_SDCKE0,,,EVENTOUT,ADC123_IN13
-PortC,PC4,,,,DFSDM1_CKIN2,,I2S1_MCK,,,SPDIFRX_IN2,,,ETH_MII_RXD0/ETH_RMII_RXD0,FMC_SDNE0,,,EVENTOUT,ADC12_IN14
-PortC,PC5,,,,DFSDM1_DATAIN2,,,,,SPDIFRX_IN3,,,ETH_MII_RXD1/ETH_RMII_RXD1,FMC_SDCKE0,,,EVENTOUT,ADC12_IN15
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,,I2S2_MCK,,DFSDM1_CKIN3,USART6_TX,FMC_NWAIT,SDMMC2_D6,,SDMMC1_D6,DCMI_D0,LCD_HSYNC,EVENTOUT,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,,,I2S3_MCK,DFSDM1_DATAIN3,USART6_RX,FMC_NE1,SDMMC2_D7,,SDMMC1_D7,DCMI_D1,LCD_G6,EVENTOUT,
-PortC,PC8,TRACED1,,TIM3_CH3,TIM8_CH3,,,,UART5_RTS,USART6_CK,FMC_NE2/FMC_NCE,,,SDMMC1_D0,DCMI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,UART5_CTS,,QUADSPI_BK1_IO0,LCD_G3,,SDMMC1_D1,DCMI_D3,LCD_B2,EVENTOUT,
-PortC,PC10,,,,DFSDM1_CKIN5,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,QUADSPI_BK1_IO1,,,SDMMC1_D2,DCMI_D8,LCD_R2,EVENTOUT,
-PortC,PC11,,,,DFSDM1_DATAIN5,,,SPI3_MISO,USART3_RX,UART4_RX,QUADSPI_BK2_NCS,,,SDMMC1_D3,DCMI_D4,,EVENTOUT,
-PortC,PC12,TRACED3,,,,,,SPI3_MOSI/I2S3_SD,USART3_CK,UART5_TX,,,,SDMMC1_CK,DCMI_D9,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,DFSDM1_CKIN6,,,DFSDM1_DATAIN7,,UART4_RX,CAN1_RX,,,FMC_D2,,,EVENTOUT,
-PortD,PD1,,,,DFSDM1_DATAIN6,,,DFSDM1_CKIN7,,UART4_TX,CAN1_TX,,,FMC_D3,,,EVENTOUT,
-PortD,PD2,TRACED2,,TIM3_ETR,,,,,,UART5_RX,,,,SDMMC1_CMD,DCMI_D11,,EVENTOUT,
-PortD,PD3,,,,DFSDM1_CKOUT,,SPI2_SCK/I2S2_CK,DFSDM1_DATAIN0,USART2_CTS,,,,,FMC_CLK,DCMI_D5,LCD_G7,EVENTOUT,
-PortD,PD4,,,,,,,DFSDM1_CKIN0,USART2_RTS,,,,,FMC_NOE,,,EVENTOUT,
-PortD,PD5,,,,,,,,USART2_TX,,,,,FMC_NWE,,,EVENTOUT,
-PortD,PD6,,,,DFSDM1_CKIN4,,SPI3_MOSI/I2S3_SD,SAI1_SD_A,USART2_RX,,,DFSDM1_DATAIN1,SDMMC2_CK,FMC_NWAIT,DCMI_D10,LCD_B2,EVENTOUT,
-PortD,PD7,,,,DFSDM1_DATAIN4,,SPI1_MOSI/I2S1_SD,DFSDM1_CKIN1,USART2_CK,SPDIFRX_IN0,,,SDMMC2_CMD,FMC_NE1,,,EVENTOUT,
-PortD,PD8,,,,DFSDM1_CKIN3,,,,USART3_TX,SPDIFRX_IN1,,,,FMC_D13,,,EVENTOUT,
-PortD,PD9,,,,DFSDM1_DATAIN3,,,,USART3_RX,,,,,FMC_D14,,,EVENTOUT,
-PortD,PD10,,,,DFSDM1_CKOUT,,,,USART3_CK,,,,,FMC_D15,,LCD_B3,EVENTOUT,
-PortD,PD11,,,,,I2C4_SMBA,,,USART3_CTS,,QUADSPI_BK1_IO0,SAI2_SD_A,,FMC_A16/FMC_CLE,,,EVENTOUT,
-PortD,PD12,,,TIM4_CH1,LPTIM1_IN1,I2C4_SCL,,,USART3_RTS,,QUADSPI_BK1_IO1,SAI2_FS_A,,FMC_A17/FMC_ALE,,,EVENTOUT,
-PortD,PD13,,,TIM4_CH2,LPTIM1_OUT,I2C4_SDA,,,,,QUADSPI_BK1_IO3,SAI2_SCK_A,,FMC_A18,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,UART8_CTS,,,,FMC_D0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,UART8_RTS,,,,FMC_D1,,,EVENTOUT,
-PortE,PE0,,,TIM4_ETR,LPTIM1_ETR,,,,,UART8_RX,,SAI2_MCK_A,,FMC_NBL0,DCMI_D2,,EVENTOUT,
-PortE,PE1,,,,LPTIM1_IN2,,,,,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,,,,DFSDM1_DATAIN3,,FMC_A20,DCMI_D4,LCD_B0,EVENTOUT,
-PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SAI1_SCK_A,,,,DFSDM1_CKIN3,,FMC_A21,DCMI_D6,LCD_G0,EVENTOUT,
-PortE,PE6,TRACED3,TIM1_BKIN2,,TIM9_CH2,,SPI4_MOSI,SAI1_SD_A,,,,SAI2_MCK_B,,FMC_A22,DCMI_D7,LCD_G1,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,DFSDM1_DATAIN2,,UART7_RX,,QUADSPI_BK2_IO0,,FMC_D4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,DFSDM1_CKIN2,,UART7_TX,,QUADSPI_BK2_IO1,,FMC_D5,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,DFSDM1_CKOUT,,UART7_RTS,,QUADSPI_BK2_IO2,,FMC_D6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,DFSDM1_DATAIN4,,UART7_CTS,,QUADSPI_BK2_IO3,,FMC_D7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,,SPI4_NSS,DFSDM1_CKIN4,,,,SAI2_SD_B,,FMC_D8,,LCD_G3,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,DFSDM1_DATAIN5,,,,SAI2_SCK_B,,FMC_D9,,LCD_B4,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,DFSDM1_CKIN5,,,,SAI2_FS_B,,FMC_D10,,LCD_DE,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI2_MCK_B,,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,,UART7_RTS,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,ADC3_IN6
-PortF,PF9,,,,,,SPI5_MOSI,SAI1_FS_B,,UART7_CTS,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,ADC3_IN7
-PortF,PF10,,,,,,,,,,QUADSPI_CLK,,,,DCMI_D11,LCD_DE,EVENTOUT,ADC3_IN8
-PortF,PF11,,,,,,SPI5_MOSI,,,,,SAI2_SD_B,,FMC_SDNRAS,DCMI_D12,,EVENTOUT,
-PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,
-PortF,PF13,,,,,I2C4_SMBA,,DFSDM1_DATAIN6,,,,,,FMC_A7,,,EVENTOUT,
-PortF,PF14,,,,,I2C4_SCL,,DFSDM1_CKIN6,,,,,,FMC_A8,,,EVENTOUT,
-PortF,PF15,,,,,I2C4_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,,,,,,,,,,,,,FMC_NE3,DCMI_D12,LCD_R7,EVENTOUT,
-PortG,PG7,,,,,,,SAI1_MCLK_A,,USART6_CK,,,,FMC_INT,DCMI_D13,LCD_CLK,EVENTOUT,
-PortG,PG8,,,,,,SPI6_NSS,,SPDIFRX_IN2,USART6_RTS,,,ETH_PPS_OUT,FMC_SDCLK,,LCD_G7,EVENTOUT,
-PortG,PG9,,,,,,SPI1_MISO,,SPDIFRX_IN3,USART6_RX,QUADSPI_BK2_IO2,SAI2_FS_B,SDMMC2_D0,FMC_NE2/FMC_NCE,DCMI_VSYNC,,EVENTOUT,
-PortG,PG10,,,,,,SPI1_NSS/I2S1_WS,,,,LCD_G3,SAI2_SD_B,SDMMC2_D1,FMC_NE3,DCMI_D2,LCD_B2,EVENTOUT,
-PortG,PG11,,,,,,SPI1_SCK/I2S1_CK,,SPDIFRX_IN0,,,SDMMC2_D2,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DCMI_D3,LCD_B3,EVENTOUT,
-PortG,PG12,,,,LPTIM1_IN1,,SPI6_MISO,,SPDIFRX_IN1,USART6_RTS,LCD_B4,,SDMMC2_D3,FMC_NE4,,LCD_B1,EVENTOUT,
-PortG,PG13,TRACED0,,,LPTIM1_OUT,,SPI6_SCK,,,USART6_CTS,,,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,,LCD_R0,EVENTOUT,
-PortG,PG14,TRACED1,,,LPTIM1_ETR,,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,,,,LPTIM1_IN2,,,,,,QUADSPI_BK2_IO0,SAI2_SCK_B,ETH_MII_CRS,FMC_SDCKE0,,LCD_R0,EVENTOUT,
-PortH,PH3,,,,,,,,,,QUADSPI_BK2_IO1,SAI2_MCK_B,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,DCMI_D8,,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,,I2C4_SMBA,,,,,,,,FMC_D18,DCMI_D1,LCD_R4,EVENTOUT,
-PortH,PH11,,,TIM5_CH2,,I2C4_SCL,,,,,,,,FMC_D19,DCMI_D2,LCD_R5,EVENTOUT,
-PortH,PH12,,,TIM5_CH3,,I2C4_SDA,,,,,,,,FMC_D20,DCMI_D3,LCD_R6,EVENTOUT,
-PortH,PH13,,,,TIM8_CH1N,,,,,UART4_TX,CAN1_TX,,,FMC_D21,,LCD_G2,EVENTOUT,
-PortH,PH14,,,,TIM8_CH2N,,,,,UART4_RX,CAN1_RX,,,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,,,,TIM8_BKIN2,,SPI2_SCK/I2S2_CK,,,,,,,FMC_D25,DCMI_D8,LCD_G6,EVENTOUT,
-PortI,PI2,,,,TIM8_CH4,,SPI2_MISO,,,,,,,FMC_D26,DCMI_D9,LCD_G7,EVENTOUT,
-PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SD,,,,,,,FMC_D27,DCMI_D10,,EVENTOUT,
-PortI,PI4,,,,TIM8_BKIN,,,,,,,SAI2_MCK_A,,FMC_NBL2,DCMI_D5,LCD_B4,EVENTOUT,
-PortI,PI5,,,,TIM8_CH1,,,,,,,SAI2_SCK_A,,FMC_NBL3,DCMI_VSYNC,LCD_B5,EVENTOUT,
-PortI,PI6,,,,TIM8_CH2,,,,,,,SAI2_SD_A,,FMC_D28,DCMI_D6,LCD_B6,EVENTOUT,
-PortI,PI7,,,,TIM8_CH3,,,,,,,SAI2_FS_A,,FMC_D29,DCMI_D7,LCD_B7,EVENTOUT,
-PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI9,,,,,,,,,UART4_RX,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,,,,,,,,,,,,,,DSI_TE,LCD_R3,EVENTOUT,
-PortJ,PJ3,,,,,,,,,,,,,,,LCD_R4,EVENTOUT,
-PortJ,PJ4,,,,,,,,,,,,,,,LCD_R5,EVENTOUT,
-PortJ,PJ5,,,,,,,,,,,,,,,LCD_R6,EVENTOUT,
-PortJ,PJ6,,,,,,,,,,,,,,,LCD_R7,EVENTOUT,
-PortJ,PJ7,,,,,,,,,,,,,,,LCD_G0,EVENTOUT,
-PortJ,PJ8,,,,,,,,,,,,,,,LCD_G1,EVENTOUT,
-PortJ,PJ9,,,,,,,,,,,,,,,LCD_G2,EVENTOUT,
-PortJ,PJ10,,,,,,,,,,,,,,,LCD_G3,EVENTOUT,
-PortJ,PJ11,,,,,,,,,,,,,,,LCD_G4,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,PK0,,,,,,,,,,,,,,,LCD_G5,EVENTOUT,
-PortK,PK1,,,,,,,,,,,,,,,LCD_G6,EVENTOUT,
-PortK,PK2,,,,,,,,,,,,,,,LCD_G7,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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3                           ,AF4                  ,AF5                                   ,AF6                                       ,AF7                                                   ,AF8                                      ,AF9                               ,AF10                                          ,AF11                           ,AF12                          ,AF13        ,AF14     ,AF15    ,ADC
+     ,    ,SYS          ,I2C4/UART5/TIM1/2,TIM3/4/5,TIM8/9/10/11/LPTIM1/DFSDM1/CEC,I2C1/2/3/4/USART1/CEC,SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,SPI2/I2S2/SPI3/I2S3/SAI1/I2C4/UART4/DFSDM1,SPI2/I2S2/SPI3/I2S3/SPI6/USART1/2/3/UART5/DFSDM1/SPDIF,SPI6/SAI2/USART6/UART4/5/7/8/OTG_FS/SPDIF,CAN1/2/TIM12/13/14/QUADSPI/FMC/LCD,SAI2/QUADSPI/SDMMC2/DFSDM1/OTG2_HS/OTG1_FS/LCD,I2C4/CAN3/SDMMC2/ETH           ,UART7/FMC/SDMMC1/MDIOS/OTG2_FS,DCMI/LCD/DSI,LCD      ,SYS     ,ADC
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR                      ,                     ,                                      ,                                          ,USART2_CTS                                            ,UART4_TX                                 ,                                  ,SAI2_SD_B                                     ,ETH_MII_CRS                    ,                              ,            ,         ,EVENTOUT,ADC123_IN0
+PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2,                              ,                     ,                                      ,                                          ,USART2_RTS                                            ,UART4_RX                                 ,QUADSPI_BK1_IO3                   ,SAI2_MCK_B                                    ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                              ,            ,LCD_R2   ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1                      ,                     ,                                      ,                                          ,USART2_TX                                             ,SAI2_SCK_B                               ,                                  ,                                              ,ETH_MDIO                       ,MDIOS_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/I2S1_WS                      ,SPI3_NSS/I2S3_WS                          ,USART2_CK                                             ,SPI6_NSS                                 ,                                  ,                                              ,                               ,OTG_HS_SOF                    ,DCMI_HSYNC  ,LCD_VSYNC,EVENTOUT,ADC12_IN4
+PortA,PA5 ,             ,TIM2_CH1/TIM2_ETR,        ,TIM8_CH1N                     ,                     ,SPI1_SCK/I2S1_CK                      ,                                          ,                                                      ,SPI6_SCK                                 ,                                  ,OTG_HS_ULPI_CK                                ,                               ,                              ,            ,LCD_R4   ,EVENTOUT,ADC12_IN5
+PortA,PA6 ,             ,TIM1_BKIN        ,TIM3_CH1,TIM8_BKIN                     ,                     ,SPI1_MISO                             ,                                          ,                                                      ,SPI6_MISO                                ,TIM13_CH1                         ,                                              ,                               ,MDIOS_MDC                     ,DCMI_PIXCLK ,LCD_G2   ,EVENTOUT,ADC12_IN6
+PortA,PA7 ,             ,TIM1_CH1N        ,TIM3_CH2,TIM8_CH1N                     ,                     ,SPI1_MOSI/I2S1_SD                     ,                                          ,                                                      ,SPI6_MOSI                                ,TIM14_CH1                         ,                                              ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,FMC_SDNWE                     ,            ,         ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,TIM8_BKIN2                    ,I2C3_SCL             ,                                      ,                                          ,USART1_CK                                             ,                                         ,                                  ,OTG_FS_SOF                                    ,CAN3_RX                        ,UART7_RX                      ,LCD_B3      ,LCD_R6   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,                              ,I2C3_SMBA            ,SPI2_SCK/I2S2_CK                      ,                                          ,USART1_TX                                             ,                                         ,                                  ,                                              ,                               ,                              ,DCMI_D0     ,LCD_R5   ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3         ,        ,                              ,                     ,                                      ,                                          ,USART1_RX                                             ,                                         ,LCD_B4                            ,OTG_FS_ID                                     ,                               ,MDIOS_MDIO                    ,DCMI_D1     ,LCD_B1   ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4         ,        ,                              ,                     ,SPI2_NSS/I2S2_WS                      ,UART4_RX                                  ,USART1_CTS                                            ,                                         ,CAN1_RX                           ,OTG_FS_DM                                     ,                               ,                              ,            ,LCD_R4   ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR         ,        ,                              ,                     ,SPI2_SCK/I2S2_CK                      ,UART4_TX                                  ,USART1_RTS                                            ,SAI2_FS_B                                ,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,        ,                              ,HDMI_CEC             ,SPI1_NSS/I2S1_WS                      ,SPI3_NSS/I2S3_WS                          ,SPI6_NSS                                              ,UART4_RTS                                ,                                  ,                                              ,CAN3_TX                        ,UART7_TX                      ,            ,         ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N        ,TIM3_CH3,TIM8_CH2N                     ,                     ,                                      ,DFSDM1_CKOUT                              ,                                                      ,UART4_CTS                                ,LCD_R3                            ,OTG_HS_ULPI_D1                                ,ETH_MII_RXD2                   ,                              ,            ,LCD_G1   ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N                     ,                     ,                                      ,DFSDM1_DATAIN1                            ,                                                      ,                                         ,LCD_R6                            ,OTG_HS_ULPI_D2                                ,ETH_MII_RXD3                   ,                              ,            ,LCD_G0   ,EVENTOUT,ADC12_IN9
+PortB,PB2 ,             ,                 ,        ,                              ,                     ,                                      ,SAI1_SD_A                                 ,SPI3_MOSI/I2S3_SD                                     ,                                         ,QUADSPI_CLK                       ,DFSDM1_CKIN1                                  ,                               ,                              ,            ,         ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2         ,        ,                              ,                     ,SPI1_SCK/I2S1_CK                      ,SPI3_SCK/I2S3_CK                          ,                                                      ,SPI6_SCK                                 ,                                  ,SDMMC2_D2                                     ,CAN3_RX                        ,UART7_RX                      ,            ,         ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,                 ,TIM3_CH1,                              ,                     ,SPI1_MISO                             ,SPI3_MISO                                 ,SPI2_NSS/I2S2_WS                                      ,SPI6_MISO                                ,                                  ,SDMMC2_D3                                     ,CAN3_TX                        ,UART7_TX                      ,            ,         ,EVENTOUT,
+PortB,PB5 ,             ,UART5_RX         ,TIM3_CH2,                              ,I2C1_SMBA            ,SPI1_MOSI/I2S1_SD                     ,SPI3_MOSI/I2S3_SD                         ,                                                      ,SPI6_MOSI                                ,CAN2_RX                           ,OTG_HS_ULPI_D7                                ,ETH_PPS_OUT                    ,FMC_SDCKE1                    ,DCMI_D10    ,LCD_G7   ,EVENTOUT,
+PortB,PB6 ,             ,UART5_TX         ,TIM4_CH1,HDMI_CEC                      ,I2C1_SCL             ,                                      ,DFSDM1_DATAIN5                            ,USART1_TX                                             ,                                         ,CAN2_TX                           ,QUADSPI_BK1_NCS                               ,I2C4_SCL                       ,FMC_SDNE1                     ,DCMI_D5     ,         ,EVENTOUT,
+PortB,PB7 ,             ,                 ,TIM4_CH2,                              ,I2C1_SDA             ,                                      ,DFSDM1_CKIN5                              ,USART1_RX                                             ,                                         ,                                  ,                                              ,I2C4_SDA                       ,FMC_NL                        ,DCMI_VSYNC  ,         ,EVENTOUT,
+PortB,PB8 ,             ,I2C4_SCL         ,TIM4_CH3,TIM10_CH1                     ,I2C1_SCL             ,                                      ,DFSDM1_CKIN7                              ,UART5_RX                                              ,                                         ,CAN1_RX                           ,SDMMC2_D4                                     ,ETH_MII_TXD3                   ,SDMMC1_D4                     ,DCMI_D6     ,LCD_B6   ,EVENTOUT,
+PortB,PB9 ,             ,I2C4_SDA         ,TIM4_CH4,TIM11_CH1                     ,I2C1_SDA             ,SPI2_NSS/I2S2_WS                      ,DFSDM1_DATAIN7                            ,UART5_TX                                              ,                                         ,CAN1_TX                           ,SDMMC2_D5                                     ,I2C4_SMBA                      ,SDMMC1_D5                     ,DCMI_D7     ,LCD_B7   ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3         ,        ,                              ,I2C2_SCL             ,SPI2_SCK/I2S2_CK                      ,DFSDM1_DATAIN7                            ,USART3_TX                                             ,                                         ,QUADSPI_BK1_NCS                   ,OTG_HS_ULPI_D3                                ,ETH_MII_RX_ER                  ,                              ,            ,LCD_G4   ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4         ,        ,                              ,I2C2_SDA             ,                                      ,DFSDM1_CKIN7                              ,USART3_RX                                             ,                                         ,                                  ,OTG_HS_ULPI_D4                                ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,                              ,DSI_TE      ,LCD_G5   ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN        ,        ,                              ,I2C2_SMBA            ,SPI2_NSS/I2S2_WS                      ,DFSDM1_DATAIN1                            ,USART3_CK                                             ,UART5_RX                                 ,CAN2_RX                           ,OTG_HS_ULPI_D5                                ,ETH_MII_TXD0/ETH_RMII_TXD0     ,OTG_HS_ID                     ,            ,         ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N        ,        ,                              ,                     ,SPI2_SCK/I2S2_CK                      ,DFSDM1_CKIN1                              ,USART3_CTS                                            ,UART5_TX                                 ,CAN2_TX                           ,OTG_HS_ULPI_D6                                ,ETH_MII_TXD1/ETH_RMII_TXD1     ,                              ,            ,         ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N        ,        ,TIM8_CH2N                     ,USART1_TX            ,SPI2_MISO                             ,DFSDM1_DATAIN2                            ,USART3_RTS                                            ,UART4_RTS                                ,TIM12_CH1                         ,SDMMC2_D0                                     ,                               ,OTG_HS_DM                     ,            ,         ,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N        ,        ,TIM8_CH3N                     ,USART1_RX            ,SPI2_MOSI/I2S2_SD                     ,DFSDM1_CKIN2                              ,                                                      ,UART4_CTS                                ,TIM12_CH2                         ,SDMMC2_D1                                     ,                               ,OTG_HS_DP                     ,            ,         ,EVENTOUT,
+PortC,PC0 ,             ,                 ,        ,DFSDM1_CKIN0                  ,                     ,                                      ,DFSDM1_DATAIN4                            ,                                                      ,SAI2_FS_B                                ,                                  ,OTG_HS_ULPI_STP                               ,                               ,FMC_SDNWE                     ,            ,LCD_R5   ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,TRACED0      ,                 ,        ,DFSDM1_DATAIN0                ,                     ,SPI2_MOSI/I2S2_SD                     ,SAI1_SD_A                                 ,                                                      ,                                         ,                                  ,DFSDM1_CKIN4                                  ,ETH_MDC                        ,MDIOS_MDC                     ,            ,         ,EVENTOUT,ADC123_IN11
+PortC,PC2 ,             ,                 ,        ,DFSDM1_CKIN1                  ,                     ,SPI2_MISO                             ,DFSDM1_CKOUT                              ,                                                      ,                                         ,                                  ,OTG_HS_ULPI_DIR                               ,ETH_MII_TXD2                   ,FMC_SDNE0                     ,            ,         ,EVENTOUT,ADC123_IN12
+PortC,PC3 ,             ,                 ,        ,DFSDM1_DATAIN1                ,                     ,SPI2_MOSI/I2S2_SD                     ,                                          ,                                                      ,                                         ,                                  ,OTG_HS_ULPI_NXT                               ,ETH_MII_TX_CLK                 ,FMC_SDCKE0                    ,            ,         ,EVENTOUT,ADC123_IN13
+PortC,PC4 ,             ,                 ,        ,DFSDM1_CKIN2                  ,                     ,I2S1_MCK                              ,                                          ,                                                      ,SPDIFRX_IN2                              ,                                  ,                                              ,ETH_MII_RXD0/ETH_RMII_RXD0     ,FMC_SDNE0                     ,            ,         ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,DFSDM1_DATAIN2                ,                     ,                                      ,                                          ,                                                      ,SPDIFRX_IN3                              ,                                  ,                                              ,ETH_MII_RXD1/ETH_RMII_RXD1     ,FMC_SDCKE0                    ,            ,         ,EVENTOUT,ADC12_IN15
+PortC,PC6 ,             ,                 ,TIM3_CH1,TIM8_CH1                      ,                     ,I2S2_MCK                              ,                                          ,DFSDM1_CKIN3                                          ,USART6_TX                                ,FMC_NWAIT                         ,SDMMC2_D6                                     ,                               ,SDMMC1_D6                     ,DCMI_D0     ,LCD_HSYNC,EVENTOUT,
+PortC,PC7 ,             ,                 ,TIM3_CH2,TIM8_CH2                      ,                     ,                                      ,I2S3_MCK                                  ,DFSDM1_DATAIN3                                        ,USART6_RX                                ,FMC_NE1                           ,SDMMC2_D7                                     ,                               ,SDMMC1_D7                     ,DCMI_D1     ,LCD_G6   ,EVENTOUT,
+PortC,PC8 ,TRACED1      ,                 ,TIM3_CH3,TIM8_CH3                      ,                     ,                                      ,                                          ,UART5_RTS                                             ,USART6_CK                                ,FMC_NE2/FMC_NCE                   ,                                              ,                               ,SDMMC1_D0                     ,DCMI_D2     ,         ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4                      ,I2C3_SDA             ,I2S_CKIN                              ,                                          ,UART5_CTS                                             ,                                         ,QUADSPI_BK1_IO0                   ,LCD_G3                                        ,                               ,SDMMC1_D1                     ,DCMI_D3     ,LCD_B2   ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,DFSDM1_CKIN5                  ,                     ,                                      ,SPI3_SCK/I2S3_CK                          ,USART3_TX                                             ,UART4_TX                                 ,QUADSPI_BK1_IO1                   ,                                              ,                               ,SDMMC1_D2                     ,DCMI_D8     ,LCD_R2   ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,DFSDM1_DATAIN5                ,                     ,                                      ,SPI3_MISO                                 ,USART3_RX                                             ,UART4_RX                                 ,QUADSPI_BK2_NCS                   ,                                              ,                               ,SDMMC1_D3                     ,DCMI_D4     ,         ,EVENTOUT,
+PortC,PC12,TRACED3      ,                 ,        ,                              ,                     ,                                      ,SPI3_MOSI/I2S3_SD                         ,USART3_CK                                             ,UART5_TX                                 ,                                  ,                                              ,                               ,SDMMC1_CK                     ,DCMI_D9     ,         ,EVENTOUT,
+PortC,PC13,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,         ,EVENTOUT,
+PortC,PC14,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,         ,EVENTOUT,
+PortC,PC15,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,         ,EVENTOUT,
+PortD,PD0 ,             ,                 ,        ,DFSDM1_CKIN6                  ,                     ,                                      ,DFSDM1_DATAIN7                            ,                                                      ,UART4_RX                                 ,CAN1_RX                           ,                                              ,                               ,FMC_D2                        ,            ,         ,EVENTOUT,
+PortD,PD1 ,             ,                 ,        ,DFSDM1_DATAIN6                ,                     ,                                      ,DFSDM1_CKIN7                              ,                                                      ,UART4_TX                                 ,CAN1_TX                           ,                                              ,                               ,FMC_D3                        ,            ,         ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,                 ,TIM3_ETR,                              ,                     ,                                      ,                                          ,                                                      ,UART5_RX                                 ,                                  ,                                              ,                               ,SDMMC1_CMD                    ,DCMI_D11    ,         ,EVENTOUT,
+PortD,PD3 ,             ,                 ,        ,DFSDM1_CKOUT                  ,                     ,SPI2_SCK/I2S2_CK                      ,DFSDM1_DATAIN0                            ,USART2_CTS                                            ,                                         ,                                  ,                                              ,                               ,FMC_CLK                       ,DCMI_D5     ,LCD_G7   ,EVENTOUT,
+PortD,PD4 ,             ,                 ,        ,                              ,                     ,                                      ,DFSDM1_CKIN0                              ,USART2_RTS                                            ,                                         ,                                  ,                                              ,                               ,FMC_NOE                       ,            ,         ,EVENTOUT,
+PortD,PD5 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,USART2_TX                                             ,                                         ,                                  ,                                              ,                               ,FMC_NWE                       ,            ,         ,EVENTOUT,
+PortD,PD6 ,             ,                 ,        ,DFSDM1_CKIN4                  ,                     ,SPI3_MOSI/I2S3_SD                     ,SAI1_SD_A                                 ,USART2_RX                                             ,                                         ,                                  ,DFSDM1_DATAIN1                                ,SDMMC2_CK                      ,FMC_NWAIT                     ,DCMI_D10    ,LCD_B2   ,EVENTOUT,
+PortD,PD7 ,             ,                 ,        ,DFSDM1_DATAIN4                ,                     ,SPI1_MOSI/I2S1_SD                     ,DFSDM1_CKIN1                              ,USART2_CK                                             ,SPDIFRX_IN0                              ,                                  ,                                              ,SDMMC2_CMD                     ,FMC_NE1                       ,            ,         ,EVENTOUT,
+PortD,PD8 ,             ,                 ,        ,DFSDM1_CKIN3                  ,                     ,                                      ,                                          ,USART3_TX                                             ,SPDIFRX_IN1                              ,                                  ,                                              ,                               ,FMC_D13                       ,            ,         ,EVENTOUT,
+PortD,PD9 ,             ,                 ,        ,DFSDM1_DATAIN3                ,                     ,                                      ,                                          ,USART3_RX                                             ,                                         ,                                  ,                                              ,                               ,FMC_D14                       ,            ,         ,EVENTOUT,
+PortD,PD10,             ,                 ,        ,DFSDM1_CKOUT                  ,                     ,                                      ,                                          ,USART3_CK                                             ,                                         ,                                  ,                                              ,                               ,FMC_D15                       ,            ,LCD_B3   ,EVENTOUT,
+PortD,PD11,             ,                 ,        ,                              ,I2C4_SMBA            ,                                      ,                                          ,USART3_CTS                                            ,                                         ,QUADSPI_BK1_IO0                   ,SAI2_SD_A                                     ,                               ,FMC_A16/FMC_CLE               ,            ,         ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,LPTIM1_IN1                    ,I2C4_SCL             ,                                      ,                                          ,USART3_RTS                                            ,                                         ,QUADSPI_BK1_IO1                   ,SAI2_FS_A                                     ,                               ,FMC_A17/FMC_ALE               ,            ,         ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,LPTIM1_OUT                    ,I2C4_SDA             ,                                      ,                                          ,                                                      ,                                         ,QUADSPI_BK1_IO3                   ,SAI2_SCK_A                                    ,                               ,FMC_A18                       ,            ,         ,EVENTOUT,
+PortD,PD14,             ,                 ,TIM4_CH3,                              ,                     ,                                      ,                                          ,                                                      ,UART8_CTS                                ,                                  ,                                              ,                               ,FMC_D0                        ,            ,         ,EVENTOUT,
+PortD,PD15,             ,                 ,TIM4_CH4,                              ,                     ,                                      ,                                          ,                                                      ,UART8_RTS                                ,                                  ,                                              ,                               ,FMC_D1                        ,            ,         ,EVENTOUT,
+PortE,PE0 ,             ,                 ,TIM4_ETR,LPTIM1_ETR                    ,                     ,                                      ,                                          ,                                                      ,UART8_RX                                 ,                                  ,SAI2_MCK_A                                    ,                               ,FMC_NBL0                      ,DCMI_D2     ,         ,EVENTOUT,
+PortE,PE1 ,             ,                 ,        ,LPTIM1_IN2                    ,                     ,                                      ,                                          ,                                                      ,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                                 ,                                                      ,                                         ,                                  ,DFSDM1_DATAIN3                                ,                               ,FMC_A20                       ,DCMI_D4     ,LCD_B0   ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                 ,        ,TIM9_CH1                      ,                     ,SPI4_MISO                             ,SAI1_SCK_A                                ,                                                      ,                                         ,                                  ,DFSDM1_CKIN3                                  ,                               ,FMC_A21                       ,DCMI_D6     ,LCD_G0   ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,TIM1_BKIN2       ,        ,TIM9_CH2                      ,                     ,SPI4_MOSI                             ,SAI1_SD_A                                 ,                                                      ,                                         ,                                  ,SAI2_MCK_B                                    ,                               ,FMC_A22                       ,DCMI_D7     ,LCD_G1   ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR         ,        ,                              ,                     ,                                      ,DFSDM1_DATAIN2                            ,                                                      ,UART7_RX                                 ,                                  ,QUADSPI_BK2_IO0                               ,                               ,FMC_D4                        ,            ,         ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,        ,                              ,                     ,                                      ,DFSDM1_CKIN2                              ,                                                      ,UART7_TX                                 ,                                  ,QUADSPI_BK2_IO1                               ,                               ,FMC_D5                        ,            ,         ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,        ,                              ,                     ,                                      ,DFSDM1_CKOUT                              ,                                                      ,UART7_RTS                                ,                                  ,QUADSPI_BK2_IO2                               ,                               ,FMC_D6                        ,            ,         ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,                              ,                     ,                                      ,DFSDM1_DATAIN4                            ,                                                      ,UART7_CTS                                ,                                  ,QUADSPI_BK2_IO3                               ,                               ,FMC_D7                        ,            ,         ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,        ,                              ,                     ,SPI4_NSS                              ,DFSDM1_CKIN4                              ,                                                      ,                                         ,                                  ,SAI2_SD_B                                     ,                               ,FMC_D8                        ,            ,LCD_G3   ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,        ,                              ,                     ,SPI4_SCK                              ,DFSDM1_DATAIN5                            ,                                                      ,                                         ,                                  ,SAI2_SCK_B                                    ,                               ,FMC_D9                        ,            ,LCD_B4   ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,        ,                              ,                     ,SPI4_MISO                             ,DFSDM1_CKIN5                              ,                                                      ,                                         ,                                  ,SAI2_FS_B                                     ,                               ,FMC_D10                       ,            ,LCD_DE   ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,        ,                              ,                     ,SPI4_MOSI                             ,                                          ,                                                      ,                                         ,                                  ,SAI2_MCK_B                                    ,                               ,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                                ,                                                      ,UART7_RTS                                ,TIM13_CH1                         ,QUADSPI_BK1_IO0                               ,                               ,                              ,            ,         ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,                              ,                     ,SPI5_MOSI                             ,SAI1_FS_B                                 ,                                                      ,UART7_CTS                                ,TIM14_CH1                         ,QUADSPI_BK1_IO1                               ,                               ,                              ,            ,         ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,QUADSPI_CLK                       ,                                              ,                               ,                              ,DCMI_D11    ,LCD_DE   ,EVENTOUT,ADC3_IN8
+PortF,PF11,             ,                 ,        ,                              ,                     ,SPI5_MOSI                             ,                                          ,                                                      ,                                         ,                                  ,SAI2_SD_B                                     ,                               ,FMC_SDNRAS                    ,DCMI_D12    ,         ,EVENTOUT,
+PortF,PF12,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_A6                        ,            ,         ,EVENTOUT,
+PortF,PF13,             ,                 ,        ,                              ,I2C4_SMBA            ,                                      ,DFSDM1_DATAIN6                            ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_A7                        ,            ,         ,EVENTOUT,
+PortF,PF14,             ,                 ,        ,                              ,I2C4_SCL             ,                                      ,DFSDM1_CKIN6                              ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_A8                        ,            ,         ,EVENTOUT,
+PortF,PF15,             ,                 ,        ,                              ,I2C4_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 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_NE3                       ,DCMI_D12    ,LCD_R7   ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,                              ,                     ,                                      ,SAI1_MCLK_A                               ,                                                      ,USART6_CK                                ,                                  ,                                              ,                               ,FMC_INT                       ,DCMI_D13    ,LCD_CLK  ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,                              ,                     ,SPI6_NSS                              ,                                          ,SPDIFRX_IN2                                           ,USART6_RTS                               ,                                  ,                                              ,ETH_PPS_OUT                    ,FMC_SDCLK                     ,            ,LCD_G7   ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,                              ,                     ,SPI1_MISO                             ,                                          ,SPDIFRX_IN3                                           ,USART6_RX                                ,QUADSPI_BK2_IO2                   ,SAI2_FS_B                                     ,SDMMC2_D0                      ,FMC_NE2/FMC_NCE               ,DCMI_VSYNC  ,         ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,                              ,                     ,SPI1_NSS/I2S1_WS                      ,                                          ,                                                      ,                                         ,LCD_G3                            ,SAI2_SD_B                                     ,SDMMC2_D1                      ,FMC_NE3                       ,DCMI_D2     ,LCD_B2   ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,                              ,                     ,SPI1_SCK/I2S1_CK                      ,                                          ,SPDIFRX_IN0                                           ,                                         ,                                  ,SDMMC2_D2                                     ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,                              ,DCMI_D3     ,LCD_B3   ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,LPTIM1_IN1                    ,                     ,SPI6_MISO                             ,                                          ,SPDIFRX_IN1                                           ,USART6_RTS                               ,LCD_B4                            ,                                              ,SDMMC2_D3                      ,FMC_NE4                       ,            ,LCD_B1   ,EVENTOUT,
+PortG,PG13,TRACED0      ,                 ,        ,LPTIM1_OUT                    ,                     ,SPI6_SCK                              ,                                          ,                                                      ,USART6_CTS                               ,                                  ,                                              ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24                       ,            ,LCD_R0   ,EVENTOUT,
+PortG,PG14,TRACED1      ,                 ,        ,LPTIM1_ETR                    ,                     ,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 ,             ,                 ,        ,LPTIM1_IN2                    ,                     ,                                      ,                                          ,                                                      ,                                         ,QUADSPI_BK2_IO0                   ,SAI2_SCK_B                                    ,ETH_MII_CRS                    ,FMC_SDCKE0                    ,            ,LCD_R0   ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,QUADSPI_BK2_IO1                   ,SAI2_MCK_B                                    ,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                     ,DCMI_D8     ,         ,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,                              ,I2C4_SMBA            ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_D18                       ,DCMI_D1     ,LCD_R4   ,EVENTOUT,
+PortH,PH11,             ,                 ,TIM5_CH2,                              ,I2C4_SCL             ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_D19                       ,DCMI_D2     ,LCD_R5   ,EVENTOUT,
+PortH,PH12,             ,                 ,TIM5_CH3,                              ,I2C4_SDA             ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_D20                       ,DCMI_D3     ,LCD_R6   ,EVENTOUT,
+PortH,PH13,             ,                 ,        ,TIM8_CH1N                     ,                     ,                                      ,                                          ,                                                      ,UART4_TX                                 ,CAN1_TX                           ,                                              ,                               ,FMC_D21                       ,            ,LCD_G2   ,EVENTOUT,
+PortH,PH14,             ,                 ,        ,TIM8_CH2N                     ,                     ,                                      ,                                          ,                                                      ,UART4_RX                                 ,CAN1_RX                           ,                                              ,                               ,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 ,             ,                 ,        ,TIM8_BKIN2                    ,                     ,SPI2_SCK/I2S2_CK                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_D25                       ,DCMI_D8     ,LCD_G6   ,EVENTOUT,
+PortI,PI2 ,             ,                 ,        ,TIM8_CH4                      ,                     ,SPI2_MISO                             ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_D26                       ,DCMI_D9     ,LCD_G7   ,EVENTOUT,
+PortI,PI3 ,             ,                 ,        ,TIM8_ETR                      ,                     ,SPI2_MOSI/I2S2_SD                     ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,FMC_D27                       ,DCMI_D10    ,         ,EVENTOUT,
+PortI,PI4 ,             ,                 ,        ,TIM8_BKIN                     ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,SAI2_MCK_A                                    ,                               ,FMC_NBL2                      ,DCMI_D5     ,LCD_B4   ,EVENTOUT,
+PortI,PI5 ,             ,                 ,        ,TIM8_CH1                      ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,SAI2_SCK_A                                    ,                               ,FMC_NBL3                      ,DCMI_VSYNC  ,LCD_B5   ,EVENTOUT,
+PortI,PI6 ,             ,                 ,        ,TIM8_CH2                      ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,SAI2_SD_A                                     ,                               ,FMC_D28                       ,DCMI_D6     ,LCD_B6   ,EVENTOUT,
+PortI,PI7 ,             ,                 ,        ,TIM8_CH3                      ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,SAI2_FS_A                                     ,                               ,FMC_D29                       ,DCMI_D7     ,LCD_B7   ,EVENTOUT,
+PortI,PI8 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,         ,EVENTOUT,
+PortI,PI9 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,UART4_RX                                 ,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 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,DSI_TE      ,LCD_R3   ,EVENTOUT,
+PortJ,PJ3 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_R4   ,EVENTOUT,
+PortJ,PJ4 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_R5   ,EVENTOUT,
+PortJ,PJ5 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_R6   ,EVENTOUT,
+PortJ,PJ6 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_R7   ,EVENTOUT,
+PortJ,PJ7 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G0   ,EVENTOUT,
+PortJ,PJ8 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G1   ,EVENTOUT,
+PortJ,PJ9 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G2   ,EVENTOUT,
+PortJ,PJ10,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G3   ,EVENTOUT,
+PortJ,PJ11,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G4   ,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,PK0 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G5   ,EVENTOUT,
+PortK,PK1 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G6   ,EVENTOUT,
+PortK,PK2 ,             ,                 ,        ,                              ,                     ,                                      ,                                          ,                                                      ,                                         ,                                  ,                                              ,                               ,                              ,            ,LCD_G7   ,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,
diff --git a/ports/stm32/boards/stm32g0b1_af.csv b/ports/stm32/boards/stm32g0b1_af.csv
index bea1c1e156337..609360fb229b7 100644
--- a/ports/stm32/boards/stm32g0b1_af.csv
+++ b/ports/stm32/boards/stm32g0b1_af.csv
@@ -1,96 +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,,,,,,,,,,,,,,,,
+Port ,Pin ,AF0                           ,AF1                           ,AF2              ,AF3                           ,AF4                           ,AF5                           ,AF6                   ,AF7      ,AF8                           ,AF9      ,AF10                  ,AF11,AF12,AF13,AF14,AF15,ADC
+     ,    ,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/stm32g474_af.csv b/ports/stm32/boards/stm32g474_af.csv
index 0108ee90138ae..34ab2858374b3 100644
--- a/ports/stm32/boards/stm32g474_af.csv
+++ b/ports/stm32/boards/stm32g474_af.csv
@@ -1,109 +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
+Port ,Pin ,AF0         ,AF1                   ,AF2                              ,AF3                                             ,AF4                    ,AF5                                                  ,AF6                                        ,AF7                     ,AF8                                     ,AF9                 ,AF10                  ,AF11                ,AF12                        ,AF13                  ,AF14                      ,AF15    ,ADC
+     ,    ,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
+PortA,PA0 ,            ,TIM2_CH1              ,TIM5_CH1                         ,                                                ,                       ,                                                     ,                                           ,USART2_CTS              ,COMP1_OUT                               ,TIM8_BKIN           ,TIM8_ETR              ,                    ,                            ,                      ,TIM2_ETR                  ,EVENTOUT,ADC12_IN1
+PortA,PA1 ,RTC_REFIN   ,TIM2_CH2              ,TIM5_CH2                         ,                                                ,                       ,                                                     ,                                           ,USART2_RTS_DE           ,                                        ,TIM15_CH1N          ,                      ,                    ,                            ,                      ,                          ,EVENTOUT,ADC12_IN2
+PortA,PA2 ,            ,TIM2_CH3              ,TIM5_CH3                         ,                                                ,                       ,                                                     ,                                           ,USART2_TX               ,COMP2_OUT                               ,TIM15_CH1           ,QUADSPI1_BK1_NCS      ,                    ,LPUART1_TX                  ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC1_IN3
+PortA,PA3 ,            ,TIM2_CH4              ,TIM5_CH4                         ,SAI1_CK1                                        ,                       ,                                                     ,                                           ,USART2_RX               ,                                        ,TIM15_CH2           ,QUADSPI1_CLK          ,                    ,LPUART1_RX                  ,SAI1_MCLK_A           ,                          ,EVENTOUT,ADC1_IN4
+PortA,PA4 ,            ,                      ,TIM3_CH2                         ,                                                ,                       ,SPI1_NSS                                             ,SPI3_NSS/I2S3_WS                           ,USART2_CK               ,                                        ,                    ,                      ,                    ,                            ,SAI1_FS_B             ,                          ,EVENTOUT,ADC2_IN17
+PortA,PA5 ,            ,TIM2_CH1              ,TIM2_ETR                         ,                                                ,                       ,SPI1_SCK                                             ,                                           ,                        ,                                        ,                    ,                      ,                    ,                            ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC2_IN13
+PortA,PA6 ,            ,TIM16_CH1             ,TIM3_CH1                         ,                                                ,TIM8_BKIN              ,SPI1_MISO                                            ,TIM1_BKIN                                  ,                        ,COMP1_OUT                               ,                    ,QUADSPI1_BK1_IO3      ,                    ,LPUART1_CTS                 ,                      ,                          ,EVENTOUT,ADC2_IN3
+PortA,PA7 ,            ,TIM17_CH1             ,TIM3_CH2                         ,                                                ,TIM8_CH1N              ,SPI1_MOSI                                            ,TIM1_CH1N                                  ,                        ,COMP2_OUT                               ,                    ,QUADSPI1_BK1_IO2      ,                    ,                            ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC2_IN4
+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
+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
+PortB,PB1 ,            ,                      ,TIM3_CH4                         ,                                                ,TIM8_CH3N              ,                                                     ,TIM1_CH3N                                  ,                        ,COMP4_OUT                               ,                    ,QUADSPI1_BK1_IO0      ,                    ,LPUART1_RTS_DE              ,HRTIM1_SCOUT          ,                          ,EVENTOUT,ADC3_IN1/ADC1_IN12
+PortB,PB2 ,RTC_OUT2    ,LPTIM1_OUT            ,TIM5_CH1                         ,TIM20_CH1                                       ,I2C3_SMBA              ,                                                     ,                                           ,                        ,                                        ,                    ,QUADSPI1_BK2_IO1      ,                    ,                            ,HRTIM1_SCIN           ,                          ,EVENTOUT,ADC2_IN12
+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,
+PortB,PB11,            ,TIM2_CH4              ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_RX               ,LPUART1_TX                              ,                    ,QUADSPI1_BK1_NCS      ,                    ,                            ,HRTIM1_FLT4           ,                          ,EVENTOUT,ADC12_IN14
+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
+PortB,PB13,            ,                      ,                                 ,                                                ,                       ,SPI2_SCK/I2S2_CK                                     ,TIM1_CH1N                                  ,USART3_CTS              ,LPUART1_CTS                             ,CAN2_TX             ,                      ,                    ,                            ,HRTIM1_CHC2           ,                          ,EVENTOUT,ADC3_IN5
+PortB,PB14,            ,TIM15_CH1             ,                                 ,                                                ,                       ,SPI2_MISO                                            ,TIM1_CH2N                                  ,USART3_RTS_DE           ,COMP4_OUT                               ,                    ,                      ,                    ,                            ,HRTIM1_CHD1           ,                          ,EVENTOUT,ADC4_IN4/ADC1_IN5
+PortB,PB15,RTC_REFIN   ,TIM15_CH2             ,TIM15_CH1N                       ,COMP3_OUT                                       ,TIM1_CH3N              ,SPI2_MOSI/I2S2_SD                                    ,                                           ,                        ,                                        ,                    ,                      ,                    ,                            ,HRTIM1_CHD2           ,                          ,EVENTOUT,ADC4_IN5/ADC2_IN15
+PortC,PC0 ,            ,LPTIM1_IN1            ,TIM1_CH1                         ,                                                ,                       ,                                                     ,                                           ,                        ,LPUART1_RX                              ,                    ,                      ,                    ,                            ,                      ,                          ,EVENTOUT,ADC12_IN6
+PortC,PC1 ,            ,LPTIM1_OUT            ,TIM1_CH2                         ,                                                ,                       ,                                                     ,                                           ,                        ,LPUART1_TX                              ,                    ,QUADSPI1_BK2_IO0      ,                    ,                            ,SAI1_SD_A             ,                          ,EVENTOUT,ADC12_IN7
+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
+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
+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
+PortD,PD9 ,            ,                      ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_RX               ,                                        ,                    ,                      ,                    ,FMC_D14                     ,                      ,                          ,EVENTOUT,ADC4_IN13/ADC5_IN13
+PortD,PD10,            ,                      ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_CK               ,                                        ,                    ,                      ,                    ,FMC_D15                     ,                      ,                          ,EVENTOUT,ADC345_IN7
+PortD,PD11,            ,TIM5_ETR              ,                                 ,                                                ,I2C4_SMBA              ,                                                     ,                                           ,USART3_CTS              ,                                        ,                    ,                      ,                    ,FMC_A16                     ,                      ,                          ,EVENTOUT,ADC345_IN8
+PortD,PD12,            ,                      ,TIM4_CH1                         ,                                                ,                       ,                                                     ,                                           ,USART3_RTS_DE           ,                                        ,                    ,                      ,                    ,FMC_A17                     ,                      ,                          ,EVENTOUT,ADC345_IN9
+PortD,PD13,            ,                      ,TIM4_CH2                         ,                                                ,                       ,                                                     ,                                           ,                        ,                                        ,                    ,                      ,                    ,FMC_A18                     ,                      ,                          ,EVENTOUT,ADC345_IN10
+PortD,PD14,            ,                      ,TIM4_CH3                         ,                                                ,                       ,                                                     ,                                           ,                        ,                                        ,                    ,                      ,                    ,FMC_D0                      ,                      ,                          ,EVENTOUT,ADC345_IN11
+PortD,PD15,            ,                      ,TIM4_CH4                         ,                                                ,                       ,                                                     ,SPI2_NSS                                   ,                        ,                                        ,                    ,                      ,                    ,FMC_D1                      ,                      ,                          ,EVENTOUT,
+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
+PortE,PE8 ,            ,TIM5_CH3              ,TIM1_CH1N                        ,                                                ,                       ,                                                     ,                                           ,                        ,                                        ,                    ,                      ,                    ,FMC_D5                      ,SAI1_SCK_B            ,                          ,EVENTOUT,ADC345_IN6
+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
+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/stm32h573_af.csv b/ports/stm32/boards/stm32h573_af.csv
index bdc29ebe2a0a3..b47bb3c8ff0f2 100644
--- a/ports/stm32/boards/stm32h573_af.csv
+++ b/ports/stm32/boards/stm32h573_af.csv
@@ -1,142 +1,142 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS,LPTIM1/TIM1/2/16/17,LPTIM3/PDM_SAI1/TIM3/4/5/12/15,I3C1/LPTIM2/3/LPUART1/OCTOSPI/TIM1/8,CEC/DCMI/I2C1/2/3/4/LPTIM1/2/SPI1/I2S1/TIM15/USART1,CEC/I3C1/LPTIM1/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,I2C4/OCTOSPI/SAI1/SPI3/I2S3/SPI4/UART4/12/USART10/USB_PD,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/UART7/8/12/USART1/2/3/6/10/11,LPUART1/SAI2/SDMMC1/SPI6/UART4/5/8,FDCAN1/2/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/OCTOSPI/SDMMC2/TIM13/14,CRS/FMC[NAND16]/OCTOSPI/SAI2/SDMMC2/TIM8/USB_,ETH[MII/RMII]/FMC[NAND16]/OCTOSPI/SDMMC2/UART7/9/USB_PD,FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/FMC[SDRAM_16bit]/SDMMC1,DCMI/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/LPTIM5,LPTIM3/4/5/6/TIM2/UART5,SYS,ADC
-PortA,PA0,,TIM2_CH1,TIM5_CH1,TIM8_ETR,TIM15_BKIN,SPI6_NSS,SPI3_RDY,USART2_CTS/USART2_NSS,UART4_TX,SDMMC2_CMD,SAI2_SD_B,ETH_MII_CRS,,,TIM2_ETR,EVENTOUT,ADC12_INP0/ADC12_INN1
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,TIM15_CH1N,LPTIM1_IN1,OCTOSPI1_DQS,USART2_RTS,UART4_RX,OCTOSPI1_IO3,SAI2_MCLK_B,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,,EVENTOUT,ADC12_INP1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,,TIM15_CH1,LPTIM1_IN2,,USART2_TX,SAI2_SCK_B,,,ETH_MDIO,,,,EVENTOUT,ADC12_INP14
-PortA,PA3,,TIM2_CH4,TIM5_CH4,OCTOSPI1_CLK,TIM15_CH2,SPI2_NSS/I2S2_WS,SAI1_SD_B,USART2_RX,,,,ETH_MII_COL,,,,EVENTOUT,ADC12_INP15
-PortA,PA4,,,TIM5_ETR,LPTIM2_CH1,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,SPI6_NSS,,,,,DCMI_HSYNC/PSSI_DE,,EVENTOUT,ADC12_INP18
-PortA,PA5,,TIM2_CH1,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,SPI6_SCK,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,,PSSI_D14,TIM2_ETR,EVENTOUT,ADC12_INP19/ADC12_INN18
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO/I2S1_SDI,OCTOSPI1_IO3,USART11_TX,SPI6_MISO,TIM13_CH1,,,,DCMI_PIXCLK/PSSI_PDCK,,EVENTOUT,ADC12_INP3
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SDO,,USART11_RX,SPI6_MOSI,TIM14_CH1,OCTOSPI1_IO2,ETH_MII_RX_DV/ETH_RMII_CRS_DV,FMC_SDNWE,FMC_NWE,,EVENTOUT,ADC12_INP7/ADC12_INN3
-PortA,PA8,MCO1,TIM1_CH1,,TIM8_BKIN2,I2C3_SCL,SPI1_RDY,,USART1_CK,,,USB_SOF,UART7_RX,FMC_NOE,DCMI_D3/PSSI_D3,,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,LPUART1_TX,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,,,ETH_MII_TX_ER,FMC_NWE,DCMI_D0/PSSI_D0,,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,LPUART1_RX,LPTIM2_IN2,,UCPD1_FRSTX,USART1_RX,,FDCAN2_TX,,,SDMMC1_D0,DCMI_D1/PSSI_D1,,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,LPUART1_CTS,,SPI2_NSS/I2S2_WS,UART4_RX,USART1_CTS/USART1_NSS,,FDCAN1_RX,USB_DM,,,,,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,LPUART1_RTS,,SPI2_SCK/I2S2_CK,UART4_TX,USART1_RTS,SAI2_FS_B,FDCAN1_TX,USB_DP,,,,,EVENTOUT,
-PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA15,JTDI,TIM2_CH1,LPTIM3_IN2,,HDMI_CEC,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,SPI6_NSS,UART4_RTS,,,UART7_TX,FMC_NBL1,DCMI_D11/PSSI_D11,TIM2_ETR,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,OCTOSPI1_IO1,USART11_CK,UART4_CTS,,,ETH_MII_RXD2,,,LPTIM3_CH1,EVENTOUT,ADC12_INP9/ADC12_INN5
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,OCTOSPI1_IO0,,,,,ETH_MII_RXD3,,,LPTIM3_CH2,EVENTOUT,ADC12_INP5
-PortB,PB2,RTC_OUT2,,SAI1_D1,TIM8_CH4N,SPI1_RDY,LPTIM1_CH1,SAI1_SD_A,SPI3_MOSI/I2S3_SDO,,OCTOSPI1_CLK,OCTOSPI1_DQS,,SDMMC1_CMD,LPTIM5_ETR,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,I2C2_SDA,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,UART12_CTS/UART12_NSS,SPI6_SCK,SDMMC2_D2,CRS_SYNC,UART7_RX,,,LPTIM6_ETR,EVENTOUT,
-PortB,PB4,NJTRST,TIM16_BKIN,TIM3_CH1,OCTOSPI1_CLK,LPTIM1_CH2,SPI1_MISO/I2S1_SDI,SPI3_MISO/I2S3_SDI,SPI2_NSS/I2S2_WS,SPI6_MISO,SDMMC2_D3,,UART7_TX,,DCMI_D7/PSSI_D7,,EVENTOUT,
-PortB,PB5,,TIM17_BKIN,TIM3_CH2,OCTOSPI1_NCLK,I2C1_SMBA,SPI1_MOSI/I2S1_SDO,I2C4_SMBA,SPI3_MOSI/I2S3_SDO,SPI6_MOSI,FDCAN2_RX,,ETH_PPS_OUT,FMC_SDCKE1,DCMI_D10/PSSI_D10,UART5_RX,EVENTOUT,
-PortB,PB6,,TIM16_CH1N,TIM4_CH1,I3C1_SCL,I2C1_SCL,HDMI_CEC,I2C4_SCL,USART1_TX,LPUART1_TX,FDCAN2_TX,OCTOSPI1_NCS,,FMC_SDNE1,DCMI_D5/PSSI_D5,UART5_TX,EVENTOUT,
-PortB,PB7,,TIM17_CH1N,TIM4_CH2,I3C1_SDA,I2C1_SDA,,I2C4_SDA,USART1_RX,LPUART1_RX,FDCAN1_TX,SDMMC2_D5,SDMMC2_CKIN,FMC_NL,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
-PortB,PB8,,TIM16_CH1,TIM4_CH3,I3C1_SCL,I2C1_SCL,SPI4_RDY,I2C4_SCL,SDMMC1_CKIN,UART4_RX,FDCAN1_RX,SDMMC2_D4,ETH_MII_TXD3,SDMMC1_D4,DCMI_D6/PSSI_D6,,EVENTOUT,
-PortB,PB9,,TIM17_CH1,TIM4_CH4,I3C1_SDA,I2C1_SDA,SPI2_NSS/I2S2_WS,I2C4_SDA,SDMMC1_CDIR,UART4_TX,FDCAN1_TX,SDMMC2_D5,SDMMC2_CKIN,SDMMC1_D5,DCMI_D7/PSSI_D7,,EVENTOUT,
-PortB,PB10,,TIM2_CH3,LPTIM3_CH1,LPTIM2_IN1,I2C2_SCL,SPI2_SCK/I2S2_CK,,USART3_TX,,OCTOSPI1_NCS,,ETH_MII_RX_ER,,,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,LPTIM2_ETR,I2C2_SDA,SPI2_RDY,SPI4_RDY,USART3_RX,,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,FMC_NBL1,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,OCTOSPI1_NCLK,I2C2_SDA,SPI2_NSS/I2S2_WS,UCPD1_FRSTX,USART3_CK,,FDCAN2_RX,,ETH_MII_TXD0/ETH_RMII_TXD0,,,UART5_RX,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,LPTIM3_IN1,LPTIM2_CH1,I2C2_SMBA,SPI2_SCK/I2S2_CK,,USART3_CTS/USART3_NSS,,FDCAN2_TX,,,SDMMC1_D0,,UART5_TX,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,TIM12_CH1,TIM8_CH2N,USART1_TX,SPI2_MISO/I2S2_SDI,,USART3_RTS,UART4_RTS,SDMMC2_D0,,,,,LPTIM3_ETR,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,TIM12_CH2,TIM8_CH3N,USART1_RX,SPI2_MOSI/I2S2_SDO,,USART11_CTS/USART11_NSS,UART4_CTS,SDMMC2_D1,OCTOSPI1_CLK,ETH_MII_TXD1/ETH_RMII_TXD1,,DCMI_D2/PSSI_D2,UART5_RX,EVENTOUT,
-PortC,PC0,,TIM16_BKIN,,,,,SAI1_MCLK_A,SPI2_RDY,SAI2_FS_B,FMC_A25,OCTOSPI1_IO7,,FMC_SDNWE,,,EVENTOUT,ADC12_INP10
-PortC,PC1,TRACED0,,SAI1_D1,,,SPI2_MOSI/I2S2_SDO,SAI1_SD_A,USART11_RTS,SAI2_SD_A,SDMMC2_CK,OCTOSPI1_IO4,ETH_MDC,,,,EVENTOUT,ADC12_INP11/ADC12_INN10
-PortC,PC2,PWR_CSLEEP,TIM17_CH1,TIM4_CH4,,,SPI2_MISO/I2S2_SDI,OCTOSPI1_IO5,,,OCTOSPI1_IO2,,ETH_MII_TXD2,FMC_SDNE0,,,EVENTOUT,ADC12_INP12/ADC12_INN11
-PortC,PC3,PWR_CSTOP,,SAI1_D3,LPTIM3_CH1,,SPI2_MOSI/I2S2_SDO,OCTOSPI1_IO6,,,OCTOSPI1_IO0,,ETH_MII_TX_CLK,FMC_SDCKE0,,,EVENTOUT,ADC12_INP13/ADC12_INN12
-PortC,PC4,,TIM2_CH4,SAI1_CK1,LPTIM2_ETR,,I2S1_MCK,,USART3_RX,,,,ETH_MII_RXD0/ETH_RMII_RXD0,FMC_SDNE0,,,EVENTOUT,ADC12_INP4
-PortC,PC5,,TIM1_CH4N,SAI1_D3,,PSSI_D15,,SAI1_FS_A,UART12_RTS,,,OCTOSPI1_DQS,ETH_MII_RXD1/ETH_RMII_RXD1,FMC_SDCKE0,,,EVENTOUT,ADC12_INP8/ADC12_INN4
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,,I2S2_MCK,SAI1_SCK_A,USART6_TX,SDMMC1_D0DIR,FMC_NWAIT,SDMMC2_D6,OCTOSPI1_IO5,SDMMC1_D6,DCMI_D0/PSSI_D0,,EVENTOUT,
-PortC,PC7,TRGIO,,TIM3_CH2,TIM8_CH2,,,I2S3_MCK,USART6_RX,SDMMC1_D123DIR,FMC_NE1,SDMMC2_D7,OCTOSPI1_IO6,SDMMC1_D7,DCMI_D1/PSSI_D1,,EVENTOUT,
-PortC,PC8,TRACED1,,TIM3_CH3,TIM8_CH3,,,,USART6_CK,UART5_RTS,FMC_NE2/FMC_NCE,FMC_INT,FMC_ALE,SDMMC1_D0,DCMI_D2/PSSI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,AUDIOCLK,,,UART5_CTS,OCTOSPI1_IO0,,FMC_CLE,SDMMC1_D1,DCMI_D3/PSSI_D3,,EVENTOUT,
-PortC,PC10,,,LPTIM3_ETR,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,OCTOSPI1_IO1,,ETH_MII_TXD0/ETH_RMII_TXD0,SDMMC1_D2,DCMI_D8/PSSI_D8,,EVENTOUT,
-PortC,PC11,,,LPTIM3_IN1,,,,SPI3_MISO/I2S3_SDI,USART3_RX,UART4_RX,OCTOSPI1_NCS,,,SDMMC1_D3,DCMI_D4/PSSI_D4,,EVENTOUT,
-PortC,PC12,TRACED3,,TIM15_CH1,,,SPI6_SCK,SPI3_MOSI/I2S3_SDO,USART3_CK,UART5_TX,,,,SDMMC1_CK,DCMI_D9/PSSI_D9,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,TIM8_CH4N,,,,,UART4_RX,FDCAN1_RX,,UART9_CTS,FMC_D2/FMC_AD2,,,EVENTOUT,
-PortD,PD1,,,,,,,,,UART4_TX,FDCAN1_TX,,,FMC_D3/FMC_AD3,,,EVENTOUT,
-PortD,PD2,TRACED2,,TIM3_ETR,,TIM15_BKIN,,,,UART5_RX,,,,SDMMC1_CMD,DCMI_D11/PSSI_D11,LPTIM4_ETR,EVENTOUT,
-PortD,PD3,,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS/USART2_NSS,,,,,FMC_CLK,DCMI_D5/PSSI_D5,,EVENTOUT,
-PortD,PD4,,,,,,,,USART2_RTS,,,OCTOSPI1_IO4,,FMC_NOE,,,EVENTOUT,
-PortD,PD5,,TIM1_CH4N,,,,SPI2_RDY,,USART2_TX,,FDCAN1_TX,OCTOSPI1_IO5,,FMC_NWE,,,EVENTOUT,
-PortD,PD6,,,SAI1_D1,,,SPI3_MOSI/I2S3_SDO,SAI1_SD_A,USART2_RX,,,OCTOSPI1_IO6,SDMMC2_CK,FMC_NWAIT,DCMI_D10/PSSI_D10,,EVENTOUT,
-PortD,PD7,,,,,,SPI1_MOSI/I2S1_SDO,,USART2_CK,,,OCTOSPI1_IO7,SDMMC2_CMD,FMC_NE1/FMC_NCE,,LPTIM4_OUT,EVENTOUT,
-PortD,PD8,,,,,,,,USART3_TX,,,,,FMC_D13/FMC_AD13,,,EVENTOUT,
-PortD,PD9,,,,,,,,USART3_RX,,FDCAN2_RX,,,FMC_D14/FMC_AD14,,,EVENTOUT,
-PortD,PD10,,,,LPTIM2_CH2,,,,USART3_CK,,,,,FMC_D15/FMC_AD15,,,EVENTOUT,
-PortD,PD11,,,SAI1_CK1,LPTIM2_IN2,I2C4_SMBA,,,USART3_CTS/USART3_NSS,UART4_RX,OCTOSPI1_IO0,SAI2_SD_A,,FMC_A16/FMC_CLE,,,EVENTOUT,
-PortD,PD12,,LPTIM1_IN1,TIM4_CH1,LPTIM2_IN1,I2C4_SCL,I3C1_SCL,SAI1_D1,USART3_RTS,UART4_TX,OCTOSPI1_IO1,SAI2_FS_A,,FMC_A17/FMC_ALE,DCMI_D12/PSSI_D12,,EVENTOUT,
-PortD,PD13,,LPTIM1_CH1,TIM4_CH2,LPTIM2_CH1,I2C4_SDA,I3C1_SDA,,,,OCTOSPI1_IO3,SAI2_SCK_A,UART9_RTS,FMC_A18,DCMI_D13/PSSI_D13,LPTIM4_IN1,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,UART8_CTS,,,UART9_RX,FMC_D0/FMC_AD0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,UART8_RTS,,,UART9_TX,FMC_D1/FMC_AD1,,,EVENTOUT,
-PortE,PE0,,LPTIM1_ETR,TIM4_ETR,LPTIM2_CH2,LPTIM2_ETR,,SPI3_RDY,,UART8_RX,FDCAN1_RX,SAI2_MCLK_A,,FMC_NBL0,DCMI_D2/PSSI_D2,,EVENTOUT,
-PortE,PE1,,LPTIM1_IN2,,,,,,,UART8_TX,FDCAN1_TX,,,FMC_NBL1,DCMI_D3/PSSI_D3,,EVENTOUT,
-PortE,PE2,TRACECLK,LPTIM1_IN2,SAI1_CK1,,,SPI4_SCK,SAI1_MCLK_A,USART10_RX,UART8_TX,OCTOSPI1_IO2,,ETH_MII_TXD3,FMC_A23,DCMI_D3/PSSI_D3,,EVENTOUT,
-PortE,PE3,TRACED0,,,,TIM15_BKIN,,SAI1_SD_B,USART10_TX,,,,,FMC_A19,,,EVENTOUT,
-PortE,PE4,TRACED1,,SAI1_D2,,TIM15_CH1N,SPI4_NSS,SAI1_FS_A,,,,,,FMC_A20,DCMI_D4/PSSI_D4,,EVENTOUT,
-PortE,PE5,TRACED2,,SAI1_CK2,,TIM15_CH1,SPI4_MISO,SAI1_SCK_A,,,,,,FMC_A21,DCMI_D6/PSSI_D6,,EVENTOUT,
-PortE,PE6,TRACED3,TIM1_BKIN2,SAI1_D1,,TIM15_CH2,SPI4_MOSI,SAI1_SD_A,,,,SAI2_MCLK_B,,FMC_A22,DCMI_D7/PSSI_D7,,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,,,,UART12_RTS,UART7_RX,,,OCTOSPI1_IO4,,FMC_D4/FMC_AD4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,,,,UART12_CTS/UART12_NSS,UART7_TX,,,OCTOSPI1_IO5,,FMC_D5/FMC_AD5,,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,,,,UART12_RX,UART7_RTS,,,OCTOSPI1_IO6,,FMC_D6/FMC_AD6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,,,,UART12_TX,UART7_CTS,,,OCTOSPI1_IO7,,FMC_D7/FMC_AD7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,,SPI1_RDY,SPI4_NSS,OCTOSPI1_NCS,,,,SAI2_SD_B,,FMC_D8/FMC_AD8,,,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,,,,,SAI2_SCK_B,,FMC_D9/FMC_AD9,,,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,,,,,SAI2_FS_B,,FMC_D10/FMC_AD10,,,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI2_MCLK_B,,FMC_D11/FMC_AD11,,,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,TIM1_CH4N,,,,USART10_CK,,,,,FMC_D12/FMC_AD12,,,EVENTOUT,
-PortF,PF0,,,,,I2C2_SDA,,,,,,,,FMC_A0,LPTIM5_CH1,,EVENTOUT,
-PortF,PF1,,,,,I2C2_SCL,,,,,,,,FMC_A1,LPTIM5_CH2,,EVENTOUT,
-PortF,PF2,,,LPTIM3_CH2,LPTIM3_IN2,I2C2_SMBA,,UART12_TX,USART11_CK,,,,,FMC_A2,LPTIM5_IN1,,EVENTOUT,
-PortF,PF3,,,LPTIM3_IN1,,,,,USART11_TX,,,,,FMC_A3,LPTIM5_IN2,,EVENTOUT,
-PortF,PF4,,,LPTIM3_ETR,,,,,USART11_RX,,,,,FMC_A4,,,EVENTOUT,
-PortF,PF5,,,LPTIM3_CH1,,I2C4_SCL,I3C1_SCL,UART12_RX,USART11_CTS/USART11_NSS,,,,,FMC_A5,,LPTIM3_IN1,EVENTOUT,
-PortF,PF6,,TIM16_CH1,,,,SPI5_NSS,SAI1_SD_B,UART7_RX,,,OCTOSPI1_IO3,,,LPTIM5_CH1,,EVENTOUT,
-PortF,PF7,,TIM17_CH1,,,,SPI5_SCK,SAI1_MCLK_B,UART7_TX,,,OCTOSPI1_IO2,,,LPTIM5_CH2,,EVENTOUT,
-PortF,PF8,,TIM16_CH1N,,,,SPI5_MISO,SAI1_SCK_B,UART7_RTS,,TIM13_CH1,OCTOSPI1_IO0,,,LPTIM5_IN1,,EVENTOUT,
-PortF,PF9,,TIM17_CH1N,,,,SPI5_MOSI,SAI1_FS_B,UART7_CTS,,TIM14_CH1,OCTOSPI1_IO1,,,LPTIM5_IN2,,EVENTOUT,
-PortF,PF10,,TIM16_BKIN,SAI1_D3,,PSSI_D15,,,,,OCTOSPI1_CLK,,,,DCMI_D11/PSSI_D11,,EVENTOUT,
-PortF,PF11,,,,,,SPI5_MOSI,,,,OCTOSPI1_NCLK,SAI2_SD_B,,FMC_NRAS,DCMI_D12/PSSI_D12,LPTIM6_CH1,EVENTOUT,ADC1_INP2
-PortF,PF12,,,,,,,,,,,,,FMC_A6,,LPTIM6_CH2,EVENTOUT,ADC1_INP6/ADC1_INN2
-PortF,PF13,,,,,I2C4_SMBA,,,,,,,,FMC_A7,,LPTIM6_IN1,EVENTOUT,ADC2_INP2
-PortF,PF14,,,,,,,,,,,,,FMC_A8,,LPTIM6_IN2,EVENTOUT,ADC2_INP6/ADC2_INN2
-PortF,PF15,,,,,I2C4_SDA,I3C1_SDA,,,,,,,FMC_A9,,,EVENTOUT,
-PortG,PG0,,,,,,,,,,,,UART9_RX,FMC_A10,,LPTIM4_IN1,EVENTOUT,
-PortG,PG1,,,,,,,,SPI2_MOSI/I2S2_SDO,,,,UART9_TX,FMC_A11,,,EVENTOUT,
-PortG,PG2,,,,TIM8_BKIN,,,,UART12_RX,,,,,FMC_A12,,LPTIM6_ETR,EVENTOUT,
-PortG,PG3,,,,TIM8_BKIN2,,,,UART12_TX,,,,,FMC_A13,LPTIM5_ETR,,EVENTOUT,
-PortG,PG4,,TIM1_BKIN2,,,,,,,,,,,FMC_A14/FMC_BA0,,LPTIM4_ETR,EVENTOUT,
-PortG,PG5,,TIM1_ETR,,,,,,,,,,,FMC_A15/FMC_BA1,,,EVENTOUT,
-PortG,PG6,,TIM17_BKIN,,I3C1_SDA,I2C4_SDA,SPI1_RDY,,,,,OCTOSPI1_NCS,UCPD1_FRSTX,FMC_NE3,DCMI_D12/PSSI_D12,,EVENTOUT,
-PortG,PG7,,,SAI1_CK2,I3C1_SCL,I2C4_SCL,,SAI1_MCLK_A,USART6_CK,,,,UCPD1_FRSTX,FMC_INT,DCMI_D13/PSSI_D13,,EVENTOUT,
-PortG,PG8,,,,TIM8_ETR,,SPI6_NSS,,USART6_RTS,,,,ETH_PPS_OUT,FMC_SDCLK,,,EVENTOUT,
-PortG,PG9,,,,,,SPI1_MISO/I2S1_SDI,,USART6_RX,,OCTOSPI1_IO6,SAI2_FS_B,SDMMC2_D0,FMC_NE2/FMC_NCE,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
-PortG,PG10,,,,,,SPI1_NSS/I2S1_WS,,,,,SAI2_SD_B,SDMMC2_D1,FMC_NE3,DCMI_D2/PSSI_D2,,EVENTOUT,
-PortG,PG11,,LPTIM1_IN2,,,,SPI1_SCK/I2S1_CK,USART10_RX,USART11_RTS,,,SDMMC2_D2,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DCMI_D3/PSSI_D3,,EVENTOUT,
-PortG,PG12,,LPTIM1_IN1,,,PSSI_D15,SPI6_MISO,USART10_TX,USART6_RTS,,,SDMMC2_D3,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_NE4,DCMI_D11/PSSI_D11,LPTIM5_CH1,EVENTOUT,
-PortG,PG13,TRACED0,LPTIM1_CH1,,,,SPI6_SCK,USART10_CTS/USART10_NSS,USART6_CTS/USART6_NSS,,,SDMMC2_D6,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,LPTIM5_CH2,,EVENTOUT,
-PortG,PG14,TRACED1,LPTIM1_ETR,,,LPTIM1_CH2,SPI6_MOSI,USART10_RTS,USART6_TX,,OCTOSPI1_IO7,SDMMC2_D7,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_A25,LPTIM5_IN1,,EVENTOUT,
-PortG,PG15,,,,,,SPI4_RDY,USART10_CK,USART6_CTS/USART6_NSS,,,,,FMC_NCAS,DCMI_D13/PSSI_D13,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH2,,LPTIM1_IN2,,,,,,,,OCTOSPI1_IO4,SAI2_SCK_B,ETH_MII_CRS,FMC_SDCKE0,,,EVENTOUT,
-PortH,PH3,,,,,,,,,,OCTOSPI1_IO5,SAI2_MCLK_B,ETH_MII_COL,FMC_SDNE0,,,EVENTOUT,
-PortH,PH4,,,,,I2C2_SCL,SPI5_RDY,,SPI6_RDY,,,,,,PSSI_D14,,EVENTOUT,
-PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,SPI6_RDY,,,,,FMC_SDNWE,,,EVENTOUT,
-PortH,PH6,,TIM1_CH3N,TIM12_CH1,TIM8_CH1,I2C2_SMBA,SPI5_SCK,,,,,,ETH_MII_RXD2,FMC_SDNE1,DCMI_D8/PSSI_D8,,EVENTOUT,
-PortH,PH7,,TIM1_CH3,,TIM8_CH1N,I2C3_SCL,SPI5_MISO,,,,,,ETH_MII_RXD3,FMC_SDCKE1,DCMI_D9/PSSI_D9,,EVENTOUT,
-PortH,PH8,,TIM1_CH2N,TIM5_ETR,TIM8_CH2,I2C3_SDA,SPI5_MOSI,,,,,,,,DCMI_HSYNC/PSSI_DE,,EVENTOUT,
-PortH,PH9,,TIM1_CH2,TIM12_CH2,TIM8_CH2N,I2C3_SMBA,SPI5_NSS,,,,,,,,DCMI_D0/PSSI_D0,,EVENTOUT,
-PortH,PH10,,TIM1_CH1N,TIM5_CH1,TIM8_CH3,I2C4_SMBA,SPI5_RDY,,,,,,,,DCMI_D1/PSSI_D1,,EVENTOUT,
-PortH,PH11,,TIM1_CH1,TIM5_CH2,TIM8_CH3N,I2C4_SCL,I3C1_SCL,,,,,,,,DCMI_D2/PSSI_D2,,EVENTOUT,
-PortH,PH12,,TIM1_BKIN,TIM5_CH3,TIM8_BKIN,I2C4_SDA,I3C1_SDA,,,,,TIM8_CH4N,,,DCMI_D3/PSSI_D3,,EVENTOUT,
-PortH,PH13,,LPTIM1_IN2,,TIM8_CH1N,,,,UART8_TX,UART4_TX,FDCAN1_TX,,,,DCMI_D3/PSSI_D3,,EVENTOUT,
-PortH,PH14,,,,TIM8_CH2N,,,,,UART4_RX,FDCAN1_RX,,,,DCMI_D4/PSSI_D4,,EVENTOUT,
-PortH,PH15,,,,TIM8_CH3N,,,,,,,,,,DCMI_D11/PSSI_D11,,EVENTOUT,
-PortI,PI0,,,TIM5_CH4,,,SPI2_NSS/I2S2_WS,,,,,,,,DCMI_D13/PSSI_D13,,EVENTOUT,
-PortI,PI1,,,,TIM8_BKIN2,,SPI2_SCK/I2S2_CK,,,,,,,,DCMI_D8/PSSI_D8,,EVENTOUT,
-PortI,PI2,,,,TIM8_CH4,,SPI2_MISO/I2S2_SDI,,,,,,,,DCMI_D9/PSSI_D9,,EVENTOUT,
-PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SDO,,,,,,,,DCMI_D10/PSSI_D10,,EVENTOUT,
-PortI,PI4,,,,TIM8_BKIN,,,,SPI2_RDY,,,SAI2_MCLK_A,,,DCMI_D5/PSSI_D5,,EVENTOUT,
-PortI,PI5,,,,TIM8_CH1,,,,,,,SAI2_SCK_A,,,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
-PortI,PI6,,,,TIM8_CH2,,,,,,,SAI2_SD_A,,,DCMI_D6/PSSI_D6,,EVENTOUT,
-PortI,PI7,,,,TIM8_CH3,,,,,,,SAI2_FS_A,,,DCMI_D7/PSSI_D7,,EVENTOUT,
-PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI9,,,,,,,,,UART4_RX,FDCAN1_RX,,,,,,EVENTOUT,
-PortI,PI10,,,,,,,,,,FDCAN1_RX,,ETH_MII_RX_ER,,PSSI_D14,,EVENTOUT,
-PortI,PI11,,,,,,,,,,,,,,PSSI_D15,,EVENTOUT,
+Port ,Pin ,AF0          ,AF1                ,AF2                           ,AF3                                 ,AF4                                                ,AF5                                                   ,AF6                                                     ,AF7                                                          ,AF8                               ,AF9                                                                  ,AF10                                         ,AF11                                                   ,AF12                                                        ,AF13                                            ,AF14                   ,AF15    ,ADC
+     ,    ,SYS          ,LPTIM1/TIM1/2/16/17,LPTIM3/PDM_SAI1/TIM3/4/5/12/15,I3C1/LPTIM2/3/LPUART1/OCTOSPI/TIM1/8,CEC/DCMI/I2C1/2/3/4/LPTIM1/2/SPI1/I2S1/TIM15/USART1,CEC/I3C1/LPTIM1/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,I2C4/OCTOSPI/SAI1/SPI3/I2S3/SPI4/UART4/12/USART10/USB_PD,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/UART7/8/12/USART1/2/3/6/10/11,LPUART1/SAI2/SDMMC1/SPI6/UART4/5/8,FDCAN1/2/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/OCTOSPI/SDMMC2/TIM13/14,CRS/FMC[NAND16]/OCTOSPI/SAI2/SDMMC2/TIM8/USB_,ETH[MII/RMII]/FMC[NAND16]/OCTOSPI/SDMMC2/UART7/9/USB_PD,FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/FMC[SDRAM_16bit]/SDMMC1,DCMI/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/LPTIM5,LPTIM3/4/5/6/TIM2/UART5,SYS     ,ADC
+PortA,PA0 ,             ,TIM2_CH1           ,TIM5_CH1                      ,TIM8_ETR                            ,TIM15_BKIN                                         ,SPI6_NSS                                              ,SPI3_RDY                                                ,USART2_CTS/USART2_NSS                                        ,UART4_TX                          ,SDMMC2_CMD                                                           ,SAI2_SD_B                                    ,ETH_MII_CRS                                            ,                                                            ,                                                ,TIM2_ETR               ,EVENTOUT,ADC12_INP0/ADC12_INN1
+PortA,PA1 ,             ,TIM2_CH2           ,TIM5_CH2                      ,                                    ,TIM15_CH1N                                         ,LPTIM1_IN1                                            ,OCTOSPI1_DQS                                            ,USART2_RTS                                                   ,UART4_RX                          ,OCTOSPI1_IO3                                                         ,SAI2_MCLK_B                                  ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK                        ,                                                            ,                                                ,                       ,EVENTOUT,ADC12_INP1
+PortA,PA2 ,             ,TIM2_CH3           ,TIM5_CH3                      ,                                    ,TIM15_CH1                                          ,LPTIM1_IN2                                            ,                                                        ,USART2_TX                                                    ,SAI2_SCK_B                        ,                                                                     ,                                             ,ETH_MDIO                                               ,                                                            ,                                                ,                       ,EVENTOUT,ADC12_INP14
+PortA,PA3 ,             ,TIM2_CH4           ,TIM5_CH4                      ,OCTOSPI1_CLK                        ,TIM15_CH2                                          ,SPI2_NSS/I2S2_WS                                      ,SAI1_SD_B                                               ,USART2_RX                                                    ,                                  ,                                                                     ,                                             ,ETH_MII_COL                                            ,                                                            ,                                                ,                       ,EVENTOUT,ADC12_INP15
+PortA,PA4 ,             ,                   ,TIM5_ETR                      ,LPTIM2_CH1                          ,                                                   ,SPI1_NSS/I2S1_WS                                      ,SPI3_NSS/I2S3_WS                                        ,USART2_CK                                                    ,SPI6_NSS                          ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_HSYNC/PSSI_DE                              ,                       ,EVENTOUT,ADC12_INP18
+PortA,PA5 ,             ,TIM2_CH1           ,                              ,TIM8_CH1N                           ,                                                   ,SPI1_SCK/I2S1_CK                                      ,                                                        ,                                                             ,SPI6_SCK                          ,                                                                     ,                                             ,ETH_MII_TX_EN/ETH_RMII_TX_EN                           ,                                                            ,PSSI_D14                                        ,TIM2_ETR               ,EVENTOUT,ADC12_INP19/ADC12_INN18
+PortA,PA6 ,             ,TIM1_BKIN          ,TIM3_CH1                      ,TIM8_BKIN                           ,                                                   ,SPI1_MISO/I2S1_SDI                                    ,OCTOSPI1_IO3                                            ,USART11_TX                                                   ,SPI6_MISO                         ,TIM13_CH1                                                            ,                                             ,                                                       ,                                                            ,DCMI_PIXCLK/PSSI_PDCK                           ,                       ,EVENTOUT,ADC12_INP3
+PortA,PA7 ,             ,TIM1_CH1N          ,TIM3_CH2                      ,TIM8_CH1N                           ,                                                   ,SPI1_MOSI/I2S1_SDO                                    ,                                                        ,USART11_RX                                                   ,SPI6_MOSI                         ,TIM14_CH1                                                            ,OCTOSPI1_IO2                                 ,ETH_MII_RX_DV/ETH_RMII_CRS_DV                          ,FMC_SDNWE                                                   ,FMC_NWE                                         ,                       ,EVENTOUT,ADC12_INP7/ADC12_INN3
+PortA,PA8 ,MCO1         ,TIM1_CH1           ,                              ,TIM8_BKIN2                          ,I2C3_SCL                                           ,SPI1_RDY                                              ,                                                        ,USART1_CK                                                    ,                                  ,                                                                     ,USB_SOF                                      ,UART7_RX                                               ,FMC_NOE                                                     ,DCMI_D3/PSSI_D3                                 ,                       ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2           ,                              ,LPUART1_TX                          ,I2C3_SMBA                                          ,SPI2_SCK/I2S2_CK                                      ,                                                        ,USART1_TX                                                    ,                                  ,                                                                     ,                                             ,ETH_MII_TX_ER                                          ,FMC_NWE                                                     ,DCMI_D0/PSSI_D0                                 ,                       ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3           ,                              ,LPUART1_RX                          ,LPTIM2_IN2                                         ,                                                      ,UCPD1_FRSTX                                             ,USART1_RX                                                    ,                                  ,FDCAN2_TX                                                            ,                                             ,                                                       ,SDMMC1_D0                                                   ,DCMI_D1/PSSI_D1                                 ,                       ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4           ,                              ,LPUART1_CTS                         ,                                                   ,SPI2_NSS/I2S2_WS                                      ,UART4_RX                                                ,USART1_CTS/USART1_NSS                                        ,                                  ,FDCAN1_RX                                                            ,USB_DM                                       ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR           ,                              ,LPUART1_RTS                         ,                                                   ,SPI2_SCK/I2S2_CK                                      ,UART4_TX                                                ,USART1_RTS                                                   ,SAI2_FS_B                         ,FDCAN1_TX                                                            ,USB_DP                                       ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1           ,LPTIM3_IN2                    ,                                    ,HDMI_CEC                                           ,SPI1_NSS/I2S1_WS                                      ,SPI3_NSS/I2S3_WS                                        ,SPI6_NSS                                                     ,UART4_RTS                         ,                                                                     ,                                             ,UART7_TX                                               ,FMC_NBL1                                                    ,DCMI_D11/PSSI_D11                               ,TIM2_ETR               ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N          ,TIM3_CH3                      ,TIM8_CH2N                           ,                                                   ,                                                      ,OCTOSPI1_IO1                                            ,USART11_CK                                                   ,UART4_CTS                         ,                                                                     ,                                             ,ETH_MII_RXD2                                           ,                                                            ,                                                ,LPTIM3_CH1             ,EVENTOUT,ADC12_INP9/ADC12_INN5
+PortB,PB1 ,             ,TIM1_CH3N          ,TIM3_CH4                      ,TIM8_CH3N                           ,                                                   ,                                                      ,OCTOSPI1_IO0                                            ,                                                             ,                                  ,                                                                     ,                                             ,ETH_MII_RXD3                                           ,                                                            ,                                                ,LPTIM3_CH2             ,EVENTOUT,ADC12_INP5
+PortB,PB2 ,RTC_OUT2     ,                   ,SAI1_D1                       ,TIM8_CH4N                           ,SPI1_RDY                                           ,LPTIM1_CH1                                            ,SAI1_SD_A                                               ,SPI3_MOSI/I2S3_SDO                                           ,                                  ,OCTOSPI1_CLK                                                         ,OCTOSPI1_DQS                                 ,                                                       ,SDMMC1_CMD                                                  ,LPTIM5_ETR                                      ,                       ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2           ,                              ,                                    ,I2C2_SDA                                           ,SPI1_SCK/I2S1_CK                                      ,SPI3_SCK/I2S3_CK                                        ,UART12_CTS/UART12_NSS                                        ,SPI6_SCK                          ,SDMMC2_D2                                                            ,CRS_SYNC                                     ,UART7_RX                                               ,                                                            ,                                                ,LPTIM6_ETR             ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,TIM16_BKIN         ,TIM3_CH1                      ,OCTOSPI1_CLK                        ,LPTIM1_CH2                                         ,SPI1_MISO/I2S1_SDI                                    ,SPI3_MISO/I2S3_SDI                                      ,SPI2_NSS/I2S2_WS                                             ,SPI6_MISO                         ,SDMMC2_D3                                                            ,                                             ,UART7_TX                                               ,                                                            ,DCMI_D7/PSSI_D7                                 ,                       ,EVENTOUT,
+PortB,PB5 ,             ,TIM17_BKIN         ,TIM3_CH2                      ,OCTOSPI1_NCLK                       ,I2C1_SMBA                                          ,SPI1_MOSI/I2S1_SDO                                    ,I2C4_SMBA                                               ,SPI3_MOSI/I2S3_SDO                                           ,SPI6_MOSI                         ,FDCAN2_RX                                                            ,                                             ,ETH_PPS_OUT                                            ,FMC_SDCKE1                                                  ,DCMI_D10/PSSI_D10                               ,UART5_RX               ,EVENTOUT,
+PortB,PB6 ,             ,TIM16_CH1N         ,TIM4_CH1                      ,I3C1_SCL                            ,I2C1_SCL                                           ,HDMI_CEC                                              ,I2C4_SCL                                                ,USART1_TX                                                    ,LPUART1_TX                        ,FDCAN2_TX                                                            ,OCTOSPI1_NCS                                 ,                                                       ,FMC_SDNE1                                                   ,DCMI_D5/PSSI_D5                                 ,UART5_TX               ,EVENTOUT,
+PortB,PB7 ,             ,TIM17_CH1N         ,TIM4_CH2                      ,I3C1_SDA                            ,I2C1_SDA                                           ,                                                      ,I2C4_SDA                                                ,USART1_RX                                                    ,LPUART1_RX                        ,FDCAN1_TX                                                            ,SDMMC2_D5                                    ,SDMMC2_CKIN                                            ,FMC_NL                                                      ,DCMI_VSYNC/PSSI_RDY                             ,                       ,EVENTOUT,
+PortB,PB8 ,             ,TIM16_CH1          ,TIM4_CH3                      ,I3C1_SCL                            ,I2C1_SCL                                           ,SPI4_RDY                                              ,I2C4_SCL                                                ,SDMMC1_CKIN                                                  ,UART4_RX                          ,FDCAN1_RX                                                            ,SDMMC2_D4                                    ,ETH_MII_TXD3                                           ,SDMMC1_D4                                                   ,DCMI_D6/PSSI_D6                                 ,                       ,EVENTOUT,
+PortB,PB9 ,             ,TIM17_CH1          ,TIM4_CH4                      ,I3C1_SDA                            ,I2C1_SDA                                           ,SPI2_NSS/I2S2_WS                                      ,I2C4_SDA                                                ,SDMMC1_CDIR                                                  ,UART4_TX                          ,FDCAN1_TX                                                            ,SDMMC2_D5                                    ,SDMMC2_CKIN                                            ,SDMMC1_D5                                                   ,DCMI_D7/PSSI_D7                                 ,                       ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3           ,LPTIM3_CH1                    ,LPTIM2_IN1                          ,I2C2_SCL                                           ,SPI2_SCK/I2S2_CK                                      ,                                                        ,USART3_TX                                                    ,                                  ,OCTOSPI1_NCS                                                         ,                                             ,ETH_MII_RX_ER                                          ,                                                            ,                                                ,                       ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4           ,                              ,LPTIM2_ETR                          ,I2C2_SDA                                           ,SPI2_RDY                                              ,SPI4_RDY                                                ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,ETH_MII_TX_EN/ETH_RMII_TX_EN                           ,FMC_NBL1                                                    ,                                                ,                       ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN          ,                              ,OCTOSPI1_NCLK                       ,I2C2_SDA                                           ,SPI2_NSS/I2S2_WS                                      ,UCPD1_FRSTX                                             ,USART3_CK                                                    ,                                  ,FDCAN2_RX                                                            ,                                             ,ETH_MII_TXD0/ETH_RMII_TXD0                             ,                                                            ,                                                ,UART5_RX               ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N          ,LPTIM3_IN1                    ,LPTIM2_CH1                          ,I2C2_SMBA                                          ,SPI2_SCK/I2S2_CK                                      ,                                                        ,USART3_CTS/USART3_NSS                                        ,                                  ,FDCAN2_TX                                                            ,                                             ,                                                       ,SDMMC1_D0                                                   ,                                                ,UART5_TX               ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N          ,TIM12_CH1                     ,TIM8_CH2N                           ,USART1_TX                                          ,SPI2_MISO/I2S2_SDI                                    ,                                                        ,USART3_RTS                                                   ,UART4_RTS                         ,SDMMC2_D0                                                            ,                                             ,                                                       ,                                                            ,                                                ,LPTIM3_ETR             ,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N          ,TIM12_CH2                     ,TIM8_CH3N                           ,USART1_RX                                          ,SPI2_MOSI/I2S2_SDO                                    ,                                                        ,USART11_CTS/USART11_NSS                                      ,UART4_CTS                         ,SDMMC2_D1                                                            ,OCTOSPI1_CLK                                 ,ETH_MII_TXD1/ETH_RMII_TXD1                             ,                                                            ,DCMI_D2/PSSI_D2                                 ,UART5_RX               ,EVENTOUT,
+PortC,PC0 ,             ,TIM16_BKIN         ,                              ,                                    ,                                                   ,                                                      ,SAI1_MCLK_A                                             ,SPI2_RDY                                                     ,SAI2_FS_B                         ,FMC_A25                                                              ,OCTOSPI1_IO7                                 ,                                                       ,FMC_SDNWE                                                   ,                                                ,                       ,EVENTOUT,ADC12_INP10
+PortC,PC1 ,TRACED0      ,                   ,SAI1_D1                       ,                                    ,                                                   ,SPI2_MOSI/I2S2_SDO                                    ,SAI1_SD_A                                               ,USART11_RTS                                                  ,SAI2_SD_A                         ,SDMMC2_CK                                                            ,OCTOSPI1_IO4                                 ,ETH_MDC                                                ,                                                            ,                                                ,                       ,EVENTOUT,ADC12_INP11/ADC12_INN10
+PortC,PC2 ,PWR_CSLEEP   ,TIM17_CH1          ,TIM4_CH4                      ,                                    ,                                                   ,SPI2_MISO/I2S2_SDI                                    ,OCTOSPI1_IO5                                            ,                                                             ,                                  ,OCTOSPI1_IO2                                                         ,                                             ,ETH_MII_TXD2                                           ,FMC_SDNE0                                                   ,                                                ,                       ,EVENTOUT,ADC12_INP12/ADC12_INN11
+PortC,PC3 ,PWR_CSTOP    ,                   ,SAI1_D3                       ,LPTIM3_CH1                          ,                                                   ,SPI2_MOSI/I2S2_SDO                                    ,OCTOSPI1_IO6                                            ,                                                             ,                                  ,OCTOSPI1_IO0                                                         ,                                             ,ETH_MII_TX_CLK                                         ,FMC_SDCKE0                                                  ,                                                ,                       ,EVENTOUT,ADC12_INP13/ADC12_INN12
+PortC,PC4 ,             ,TIM2_CH4           ,SAI1_CK1                      ,LPTIM2_ETR                          ,                                                   ,I2S1_MCK                                              ,                                                        ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,ETH_MII_RXD0/ETH_RMII_RXD0                             ,FMC_SDNE0                                                   ,                                                ,                       ,EVENTOUT,ADC12_INP4
+PortC,PC5 ,             ,TIM1_CH4N          ,SAI1_D3                       ,                                    ,PSSI_D15                                           ,                                                      ,SAI1_FS_A                                               ,UART12_RTS                                                   ,                                  ,                                                                     ,OCTOSPI1_DQS                                 ,ETH_MII_RXD1/ETH_RMII_RXD1                             ,FMC_SDCKE0                                                  ,                                                ,                       ,EVENTOUT,ADC12_INP8/ADC12_INN4
+PortC,PC6 ,             ,                   ,TIM3_CH1                      ,TIM8_CH1                            ,                                                   ,I2S2_MCK                                              ,SAI1_SCK_A                                              ,USART6_TX                                                    ,SDMMC1_D0DIR                      ,FMC_NWAIT                                                            ,SDMMC2_D6                                    ,OCTOSPI1_IO5                                           ,SDMMC1_D6                                                   ,DCMI_D0/PSSI_D0                                 ,                       ,EVENTOUT,
+PortC,PC7 ,TRGIO        ,                   ,TIM3_CH2                      ,TIM8_CH2                            ,                                                   ,                                                      ,I2S3_MCK                                                ,USART6_RX                                                    ,SDMMC1_D123DIR                    ,FMC_NE1                                                              ,SDMMC2_D7                                    ,OCTOSPI1_IO6                                           ,SDMMC1_D7                                                   ,DCMI_D1/PSSI_D1                                 ,                       ,EVENTOUT,
+PortC,PC8 ,TRACED1      ,                   ,TIM3_CH3                      ,TIM8_CH3                            ,                                                   ,                                                      ,                                                        ,USART6_CK                                                    ,UART5_RTS                         ,FMC_NE2/FMC_NCE                                                      ,FMC_INT                                      ,FMC_ALE                                                ,SDMMC1_D0                                                   ,DCMI_D2/PSSI_D2                                 ,                       ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                   ,TIM3_CH4                      ,TIM8_CH4                            ,I2C3_SDA                                           ,AUDIOCLK                                              ,                                                        ,                                                             ,UART5_CTS                         ,OCTOSPI1_IO0                                                         ,                                             ,FMC_CLE                                                ,SDMMC1_D1                                                   ,DCMI_D3/PSSI_D3                                 ,                       ,EVENTOUT,
+PortC,PC10,             ,                   ,LPTIM3_ETR                    ,                                    ,                                                   ,                                                      ,SPI3_SCK/I2S3_CK                                        ,USART3_TX                                                    ,UART4_TX                          ,OCTOSPI1_IO1                                                         ,                                             ,ETH_MII_TXD0/ETH_RMII_TXD0                             ,SDMMC1_D2                                                   ,DCMI_D8/PSSI_D8                                 ,                       ,EVENTOUT,
+PortC,PC11,             ,                   ,LPTIM3_IN1                    ,                                    ,                                                   ,                                                      ,SPI3_MISO/I2S3_SDI                                      ,USART3_RX                                                    ,UART4_RX                          ,OCTOSPI1_NCS                                                         ,                                             ,                                                       ,SDMMC1_D3                                                   ,DCMI_D4/PSSI_D4                                 ,                       ,EVENTOUT,
+PortC,PC12,TRACED3      ,                   ,TIM15_CH1                     ,                                    ,                                                   ,SPI6_SCK                                              ,SPI3_MOSI/I2S3_SDO                                      ,USART3_CK                                                    ,UART5_TX                          ,                                                                     ,                                             ,                                                       ,SDMMC1_CK                                                   ,DCMI_D9/PSSI_D9                                 ,                       ,EVENTOUT,
+PortC,PC13,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortC,PC14,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortC,PC15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortD,PD0 ,             ,                   ,                              ,TIM8_CH4N                           ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_RX                          ,FDCAN1_RX                                                            ,                                             ,UART9_CTS                                              ,FMC_D2/FMC_AD2                                              ,                                                ,                       ,EVENTOUT,
+PortD,PD1 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_TX                          ,FDCAN1_TX                                                            ,                                             ,                                                       ,FMC_D3/FMC_AD3                                              ,                                                ,                       ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,                   ,TIM3_ETR                      ,                                    ,TIM15_BKIN                                         ,                                                      ,                                                        ,                                                             ,UART5_RX                          ,                                                                     ,                                             ,                                                       ,SDMMC1_CMD                                                  ,DCMI_D11/PSSI_D11                               ,LPTIM4_ETR             ,EVENTOUT,
+PortD,PD3 ,             ,                   ,                              ,                                    ,                                                   ,SPI2_SCK/I2S2_CK                                      ,                                                        ,USART2_CTS/USART2_NSS                                        ,                                  ,                                                                     ,                                             ,                                                       ,FMC_CLK                                                     ,DCMI_D5/PSSI_D5                                 ,                       ,EVENTOUT,
+PortD,PD4 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RTS                                                   ,                                  ,                                                                     ,OCTOSPI1_IO4                                 ,                                                       ,FMC_NOE                                                     ,                                                ,                       ,EVENTOUT,
+PortD,PD5 ,             ,TIM1_CH4N          ,                              ,                                    ,                                                   ,SPI2_RDY                                              ,                                                        ,USART2_TX                                                    ,                                  ,FDCAN1_TX                                                            ,OCTOSPI1_IO5                                 ,                                                       ,FMC_NWE                                                     ,                                                ,                       ,EVENTOUT,
+PortD,PD6 ,             ,                   ,SAI1_D1                       ,                                    ,                                                   ,SPI3_MOSI/I2S3_SDO                                    ,SAI1_SD_A                                               ,USART2_RX                                                    ,                                  ,                                                                     ,OCTOSPI1_IO6                                 ,SDMMC2_CK                                              ,FMC_NWAIT                                                   ,DCMI_D10/PSSI_D10                               ,                       ,EVENTOUT,
+PortD,PD7 ,             ,                   ,                              ,                                    ,                                                   ,SPI1_MOSI/I2S1_SDO                                    ,                                                        ,USART2_CK                                                    ,                                  ,                                                                     ,OCTOSPI1_IO7                                 ,SDMMC2_CMD                                             ,FMC_NE1/FMC_NCE                                             ,                                                ,LPTIM4_OUT             ,EVENTOUT,
+PortD,PD8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,FMC_D13/FMC_AD13                                            ,                                                ,                       ,EVENTOUT,
+PortD,PD9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RX                                                    ,                                  ,FDCAN2_RX                                                            ,                                             ,                                                       ,FMC_D14/FMC_AD14                                            ,                                                ,                       ,EVENTOUT,
+PortD,PD10,             ,                   ,                              ,LPTIM2_CH2                          ,                                                   ,                                                      ,                                                        ,USART3_CK                                                    ,                                  ,                                                                     ,                                             ,                                                       ,FMC_D15/FMC_AD15                                            ,                                                ,                       ,EVENTOUT,
+PortD,PD11,             ,                   ,SAI1_CK1                      ,LPTIM2_IN2                          ,I2C4_SMBA                                          ,                                                      ,                                                        ,USART3_CTS/USART3_NSS                                        ,UART4_RX                          ,OCTOSPI1_IO0                                                         ,SAI2_SD_A                                    ,                                                       ,FMC_A16/FMC_CLE                                             ,                                                ,                       ,EVENTOUT,
+PortD,PD12,             ,LPTIM1_IN1         ,TIM4_CH1                      ,LPTIM2_IN1                          ,I2C4_SCL                                           ,I3C1_SCL                                              ,SAI1_D1                                                 ,USART3_RTS                                                   ,UART4_TX                          ,OCTOSPI1_IO1                                                         ,SAI2_FS_A                                    ,                                                       ,FMC_A17/FMC_ALE                                             ,DCMI_D12/PSSI_D12                               ,                       ,EVENTOUT,
+PortD,PD13,             ,LPTIM1_CH1         ,TIM4_CH2                      ,LPTIM2_CH1                          ,I2C4_SDA                                           ,I3C1_SDA                                              ,                                                        ,                                                             ,                                  ,OCTOSPI1_IO3                                                         ,SAI2_SCK_A                                   ,UART9_RTS                                              ,FMC_A18                                                     ,DCMI_D13/PSSI_D13                               ,LPTIM4_IN1             ,EVENTOUT,
+PortD,PD14,             ,                   ,TIM4_CH3                      ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART8_CTS                         ,                                                                     ,                                             ,UART9_RX                                               ,FMC_D0/FMC_AD0                                              ,                                                ,                       ,EVENTOUT,
+PortD,PD15,             ,                   ,TIM4_CH4                      ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART8_RTS                         ,                                                                     ,                                             ,UART9_TX                                               ,FMC_D1/FMC_AD1                                              ,                                                ,                       ,EVENTOUT,
+PortE,PE0 ,             ,LPTIM1_ETR         ,TIM4_ETR                      ,LPTIM2_CH2                          ,LPTIM2_ETR                                         ,                                                      ,SPI3_RDY                                                ,                                                             ,UART8_RX                          ,FDCAN1_RX                                                            ,SAI2_MCLK_A                                  ,                                                       ,FMC_NBL0                                                    ,DCMI_D2/PSSI_D2                                 ,                       ,EVENTOUT,
+PortE,PE1 ,             ,LPTIM1_IN2         ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART8_TX                          ,FDCAN1_TX                                                            ,                                             ,                                                       ,FMC_NBL1                                                    ,DCMI_D3/PSSI_D3                                 ,                       ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,LPTIM1_IN2         ,SAI1_CK1                      ,                                    ,                                                   ,SPI4_SCK                                              ,SAI1_MCLK_A                                             ,USART10_RX                                                   ,UART8_TX                          ,OCTOSPI1_IO2                                                         ,                                             ,ETH_MII_TXD3                                           ,FMC_A23                                                     ,DCMI_D3/PSSI_D3                                 ,                       ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                   ,                              ,                                    ,TIM15_BKIN                                         ,                                                      ,SAI1_SD_B                                               ,USART10_TX                                                   ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A19                                                     ,                                                ,                       ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                   ,SAI1_D2                       ,                                    ,TIM15_CH1N                                         ,SPI4_NSS                                              ,SAI1_FS_A                                               ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A20                                                     ,DCMI_D4/PSSI_D4                                 ,                       ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                   ,SAI1_CK2                      ,                                    ,TIM15_CH1                                          ,SPI4_MISO                                             ,SAI1_SCK_A                                              ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A21                                                     ,DCMI_D6/PSSI_D6                                 ,                       ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,TIM1_BKIN2         ,SAI1_D1                       ,                                    ,TIM15_CH2                                          ,SPI4_MOSI                                             ,SAI1_SD_A                                               ,                                                             ,                                  ,                                                                     ,SAI2_MCLK_B                                  ,                                                       ,FMC_A22                                                     ,DCMI_D7/PSSI_D7                                 ,                       ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR           ,                              ,                                    ,                                                   ,                                                      ,UART12_RTS                                              ,UART7_RX                                                     ,                                  ,                                                                     ,OCTOSPI1_IO4                                 ,                                                       ,FMC_D4/FMC_AD4                                              ,                                                ,                       ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N          ,                              ,                                    ,                                                   ,                                                      ,UART12_CTS/UART12_NSS                                   ,UART7_TX                                                     ,                                  ,                                                                     ,OCTOSPI1_IO5                                 ,                                                       ,FMC_D5/FMC_AD5                                              ,                                                ,                       ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1           ,                              ,                                    ,                                                   ,                                                      ,UART12_RX                                               ,UART7_RTS                                                    ,                                  ,                                                                     ,OCTOSPI1_IO6                                 ,                                                       ,FMC_D6/FMC_AD6                                              ,                                                ,                       ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N          ,                              ,                                    ,                                                   ,                                                      ,UART12_TX                                               ,UART7_CTS                                                    ,                                  ,                                                                     ,OCTOSPI1_IO7                                 ,                                                       ,FMC_D7/FMC_AD7                                              ,                                                ,                       ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2           ,                              ,                                    ,SPI1_RDY                                           ,SPI4_NSS                                              ,OCTOSPI1_NCS                                            ,                                                             ,                                  ,                                                                     ,SAI2_SD_B                                    ,                                                       ,FMC_D8/FMC_AD8                                              ,                                                ,                       ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N          ,                              ,                                    ,                                                   ,SPI4_SCK                                              ,                                                        ,                                                             ,                                  ,                                                                     ,SAI2_SCK_B                                   ,                                                       ,FMC_D9/FMC_AD9                                              ,                                                ,                       ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3           ,                              ,                                    ,                                                   ,SPI4_MISO                                             ,                                                        ,                                                             ,                                  ,                                                                     ,SAI2_FS_B                                    ,                                                       ,FMC_D10/FMC_AD10                                            ,                                                ,                       ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4           ,                              ,                                    ,                                                   ,SPI4_MOSI                                             ,                                                        ,                                                             ,                                  ,                                                                     ,SAI2_MCLK_B                                  ,                                                       ,FMC_D11/FMC_AD11                                            ,                                                ,                       ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN          ,                              ,TIM1_CH4N                           ,                                                   ,                                                      ,                                                        ,USART10_CK                                                   ,                                  ,                                                                     ,                                             ,                                                       ,FMC_D12/FMC_AD12                                            ,                                                ,                       ,EVENTOUT,
+PortF,PF0 ,             ,                   ,                              ,                                    ,I2C2_SDA                                           ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A0                                                      ,LPTIM5_CH1                                      ,                       ,EVENTOUT,
+PortF,PF1 ,             ,                   ,                              ,                                    ,I2C2_SCL                                           ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A1                                                      ,LPTIM5_CH2                                      ,                       ,EVENTOUT,
+PortF,PF2 ,             ,                   ,LPTIM3_CH2                    ,LPTIM3_IN2                          ,I2C2_SMBA                                          ,                                                      ,UART12_TX                                               ,USART11_CK                                                   ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A2                                                      ,LPTIM5_IN1                                      ,                       ,EVENTOUT,
+PortF,PF3 ,             ,                   ,LPTIM3_IN1                    ,                                    ,                                                   ,                                                      ,                                                        ,USART11_TX                                                   ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A3                                                      ,LPTIM5_IN2                                      ,                       ,EVENTOUT,
+PortF,PF4 ,             ,                   ,LPTIM3_ETR                    ,                                    ,                                                   ,                                                      ,                                                        ,USART11_RX                                                   ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A4                                                      ,                                                ,                       ,EVENTOUT,
+PortF,PF5 ,             ,                   ,LPTIM3_CH1                    ,                                    ,I2C4_SCL                                           ,I3C1_SCL                                              ,UART12_RX                                               ,USART11_CTS/USART11_NSS                                      ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A5                                                      ,                                                ,LPTIM3_IN1             ,EVENTOUT,
+PortF,PF6 ,             ,TIM16_CH1          ,                              ,                                    ,                                                   ,SPI5_NSS                                              ,SAI1_SD_B                                               ,UART7_RX                                                     ,                                  ,                                                                     ,OCTOSPI1_IO3                                 ,                                                       ,                                                            ,LPTIM5_CH1                                      ,                       ,EVENTOUT,
+PortF,PF7 ,             ,TIM17_CH1          ,                              ,                                    ,                                                   ,SPI5_SCK                                              ,SAI1_MCLK_B                                             ,UART7_TX                                                     ,                                  ,                                                                     ,OCTOSPI1_IO2                                 ,                                                       ,                                                            ,LPTIM5_CH2                                      ,                       ,EVENTOUT,
+PortF,PF8 ,             ,TIM16_CH1N         ,                              ,                                    ,                                                   ,SPI5_MISO                                             ,SAI1_SCK_B                                              ,UART7_RTS                                                    ,                                  ,TIM13_CH1                                                            ,OCTOSPI1_IO0                                 ,                                                       ,                                                            ,LPTIM5_IN1                                      ,                       ,EVENTOUT,
+PortF,PF9 ,             ,TIM17_CH1N         ,                              ,                                    ,                                                   ,SPI5_MOSI                                             ,SAI1_FS_B                                               ,UART7_CTS                                                    ,                                  ,TIM14_CH1                                                            ,OCTOSPI1_IO1                                 ,                                                       ,                                                            ,LPTIM5_IN2                                      ,                       ,EVENTOUT,
+PortF,PF10,             ,TIM16_BKIN         ,SAI1_D3                       ,                                    ,PSSI_D15                                           ,                                                      ,                                                        ,                                                             ,                                  ,OCTOSPI1_CLK                                                         ,                                             ,                                                       ,                                                            ,DCMI_D11/PSSI_D11                               ,                       ,EVENTOUT,
+PortF,PF11,             ,                   ,                              ,                                    ,                                                   ,SPI5_MOSI                                             ,                                                        ,                                                             ,                                  ,OCTOSPI1_NCLK                                                        ,SAI2_SD_B                                    ,                                                       ,FMC_NRAS                                                    ,DCMI_D12/PSSI_D12                               ,LPTIM6_CH1             ,EVENTOUT,ADC1_INP2
+PortF,PF12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A6                                                      ,                                                ,LPTIM6_CH2             ,EVENTOUT,ADC1_INP6/ADC1_INN2
+PortF,PF13,             ,                   ,                              ,                                    ,I2C4_SMBA                                          ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A7                                                      ,                                                ,LPTIM6_IN1             ,EVENTOUT,ADC2_INP2
+PortF,PF14,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A8                                                      ,                                                ,LPTIM6_IN2             ,EVENTOUT,ADC2_INP6/ADC2_INN2
+PortF,PF15,             ,                   ,                              ,                                    ,I2C4_SDA                                           ,I3C1_SDA                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A9                                                      ,                                                ,                       ,EVENTOUT,
+PortG,PG0 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,UART9_RX                                               ,FMC_A10                                                     ,                                                ,LPTIM4_IN1             ,EVENTOUT,
+PortG,PG1 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,SPI2_MOSI/I2S2_SDO                                           ,                                  ,                                                                     ,                                             ,UART9_TX                                               ,FMC_A11                                                     ,                                                ,                       ,EVENTOUT,
+PortG,PG2 ,             ,                   ,                              ,TIM8_BKIN                           ,                                                   ,                                                      ,                                                        ,UART12_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A12                                                     ,                                                ,LPTIM6_ETR             ,EVENTOUT,
+PortG,PG3 ,             ,                   ,                              ,TIM8_BKIN2                          ,                                                   ,                                                      ,                                                        ,UART12_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A13                                                     ,LPTIM5_ETR                                      ,                       ,EVENTOUT,
+PortG,PG4 ,             ,TIM1_BKIN2         ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A14/FMC_BA0                                             ,                                                ,LPTIM4_ETR             ,EVENTOUT,
+PortG,PG5 ,             ,TIM1_ETR           ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A15/FMC_BA1                                             ,                                                ,                       ,EVENTOUT,
+PortG,PG6 ,             ,TIM17_BKIN         ,                              ,I3C1_SDA                            ,I2C4_SDA                                           ,SPI1_RDY                                              ,                                                        ,                                                             ,                                  ,                                                                     ,OCTOSPI1_NCS                                 ,UCPD1_FRSTX                                            ,FMC_NE3                                                     ,DCMI_D12/PSSI_D12                               ,                       ,EVENTOUT,
+PortG,PG7 ,             ,                   ,SAI1_CK2                      ,I3C1_SCL                            ,I2C4_SCL                                           ,                                                      ,SAI1_MCLK_A                                             ,USART6_CK                                                    ,                                  ,                                                                     ,                                             ,UCPD1_FRSTX                                            ,FMC_INT                                                     ,DCMI_D13/PSSI_D13                               ,                       ,EVENTOUT,
+PortG,PG8 ,             ,                   ,                              ,TIM8_ETR                            ,                                                   ,SPI6_NSS                                              ,                                                        ,USART6_RTS                                                   ,                                  ,                                                                     ,                                             ,ETH_PPS_OUT                                            ,FMC_SDCLK                                                   ,                                                ,                       ,EVENTOUT,
+PortG,PG9 ,             ,                   ,                              ,                                    ,                                                   ,SPI1_MISO/I2S1_SDI                                    ,                                                        ,USART6_RX                                                    ,                                  ,OCTOSPI1_IO6                                                         ,SAI2_FS_B                                    ,SDMMC2_D0                                              ,FMC_NE2/FMC_NCE                                             ,DCMI_VSYNC/PSSI_RDY                             ,                       ,EVENTOUT,
+PortG,PG10,             ,                   ,                              ,                                    ,                                                   ,SPI1_NSS/I2S1_WS                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SAI2_SD_B                                    ,SDMMC2_D1                                              ,FMC_NE3                                                     ,DCMI_D2/PSSI_D2                                 ,                       ,EVENTOUT,
+PortG,PG11,             ,LPTIM1_IN2         ,                              ,                                    ,                                                   ,SPI1_SCK/I2S1_CK                                      ,USART10_RX                                              ,USART11_RTS                                                  ,                                  ,                                                                     ,SDMMC2_D2                                    ,ETH_MII_TX_EN/ETH_RMII_TX_EN                           ,                                                            ,DCMI_D3/PSSI_D3                                 ,                       ,EVENTOUT,
+PortG,PG12,             ,LPTIM1_IN1         ,                              ,                                    ,PSSI_D15                                           ,SPI6_MISO                                             ,USART10_TX                                              ,USART6_RTS                                                   ,                                  ,                                                                     ,SDMMC2_D3                                    ,ETH_MII_TXD1/ETH_RMII_TXD1                             ,FMC_NE4                                                     ,DCMI_D11/PSSI_D11                               ,LPTIM5_CH1             ,EVENTOUT,
+PortG,PG13,TRACED0      ,LPTIM1_CH1         ,                              ,                                    ,                                                   ,SPI6_SCK                                              ,USART10_CTS/USART10_NSS                                 ,USART6_CTS/USART6_NSS                                        ,                                  ,                                                                     ,SDMMC2_D6                                    ,ETH_MII_TXD0/ETH_RMII_TXD0                             ,FMC_A24                                                     ,LPTIM5_CH2                                      ,                       ,EVENTOUT,
+PortG,PG14,TRACED1      ,LPTIM1_ETR         ,                              ,                                    ,LPTIM1_CH2                                         ,SPI6_MOSI                                             ,USART10_RTS                                             ,USART6_TX                                                    ,                                  ,OCTOSPI1_IO7                                                         ,SDMMC2_D7                                    ,ETH_MII_TXD1/ETH_RMII_TXD1                             ,FMC_A25                                                     ,LPTIM5_IN1                                      ,                       ,EVENTOUT,
+PortG,PG15,             ,                   ,                              ,                                    ,                                                   ,SPI4_RDY                                              ,USART10_CK                                              ,USART6_CTS/USART6_NSS                                        ,                                  ,                                                                     ,                                             ,                                                       ,FMC_NCAS                                                    ,DCMI_D13/PSSI_D13                               ,                       ,EVENTOUT,
+PortH,PH0 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortH,PH1 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortH,PH2 ,             ,LPTIM1_IN2         ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,OCTOSPI1_IO4                                                         ,SAI2_SCK_B                                   ,ETH_MII_CRS                                            ,FMC_SDCKE0                                                  ,                                                ,                       ,EVENTOUT,
+PortH,PH3 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,OCTOSPI1_IO5                                                         ,SAI2_MCLK_B                                  ,ETH_MII_COL                                            ,FMC_SDNE0                                                   ,                                                ,                       ,EVENTOUT,
+PortH,PH4 ,             ,                   ,                              ,                                    ,I2C2_SCL                                           ,SPI5_RDY                                              ,                                                        ,SPI6_RDY                                                     ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,PSSI_D14                                        ,                       ,EVENTOUT,
+PortH,PH5 ,             ,                   ,                              ,                                    ,I2C2_SDA                                           ,SPI5_NSS                                              ,                                                        ,SPI6_RDY                                                     ,                                  ,                                                                     ,                                             ,                                                       ,FMC_SDNWE                                                   ,                                                ,                       ,EVENTOUT,
+PortH,PH6 ,             ,TIM1_CH3N          ,TIM12_CH1                     ,TIM8_CH1                            ,I2C2_SMBA                                          ,SPI5_SCK                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH_MII_RXD2                                           ,FMC_SDNE1                                                   ,DCMI_D8/PSSI_D8                                 ,                       ,EVENTOUT,
+PortH,PH7 ,             ,TIM1_CH3           ,                              ,TIM8_CH1N                           ,I2C3_SCL                                           ,SPI5_MISO                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH_MII_RXD3                                           ,FMC_SDCKE1                                                  ,DCMI_D9/PSSI_D9                                 ,                       ,EVENTOUT,
+PortH,PH8 ,             ,TIM1_CH2N          ,TIM5_ETR                      ,TIM8_CH2                            ,I2C3_SDA                                           ,SPI5_MOSI                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_HSYNC/PSSI_DE                              ,                       ,EVENTOUT,
+PortH,PH9 ,             ,TIM1_CH2           ,TIM12_CH2                     ,TIM8_CH2N                           ,I2C3_SMBA                                          ,SPI5_NSS                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D0/PSSI_D0                                 ,                       ,EVENTOUT,
+PortH,PH10,             ,TIM1_CH1N          ,TIM5_CH1                      ,TIM8_CH3                            ,I2C4_SMBA                                          ,SPI5_RDY                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D1/PSSI_D1                                 ,                       ,EVENTOUT,
+PortH,PH11,             ,TIM1_CH1           ,TIM5_CH2                      ,TIM8_CH3N                           ,I2C4_SCL                                           ,I3C1_SCL                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D2/PSSI_D2                                 ,                       ,EVENTOUT,
+PortH,PH12,             ,TIM1_BKIN          ,TIM5_CH3                      ,TIM8_BKIN                           ,I2C4_SDA                                           ,I3C1_SDA                                              ,                                                        ,                                                             ,                                  ,                                                                     ,TIM8_CH4N                                    ,                                                       ,                                                            ,DCMI_D3/PSSI_D3                                 ,                       ,EVENTOUT,
+PortH,PH13,             ,LPTIM1_IN2         ,                              ,TIM8_CH1N                           ,                                                   ,                                                      ,                                                        ,UART8_TX                                                     ,UART4_TX                          ,FDCAN1_TX                                                            ,                                             ,                                                       ,                                                            ,DCMI_D3/PSSI_D3                                 ,                       ,EVENTOUT,
+PortH,PH14,             ,                   ,                              ,TIM8_CH2N                           ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_RX                          ,FDCAN1_RX                                                            ,                                             ,                                                       ,                                                            ,DCMI_D4/PSSI_D4                                 ,                       ,EVENTOUT,
+PortH,PH15,             ,                   ,                              ,TIM8_CH3N                           ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D11/PSSI_D11                               ,                       ,EVENTOUT,
+PortI,PI0 ,             ,                   ,TIM5_CH4                      ,                                    ,                                                   ,SPI2_NSS/I2S2_WS                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D13/PSSI_D13                               ,                       ,EVENTOUT,
+PortI,PI1 ,             ,                   ,                              ,TIM8_BKIN2                          ,                                                   ,SPI2_SCK/I2S2_CK                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D8/PSSI_D8                                 ,                       ,EVENTOUT,
+PortI,PI2 ,             ,                   ,                              ,TIM8_CH4                            ,                                                   ,SPI2_MISO/I2S2_SDI                                    ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D9/PSSI_D9                                 ,                       ,EVENTOUT,
+PortI,PI3 ,             ,                   ,                              ,TIM8_ETR                            ,                                                   ,SPI2_MOSI/I2S2_SDO                                    ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,DCMI_D10/PSSI_D10                               ,                       ,EVENTOUT,
+PortI,PI4 ,             ,                   ,                              ,TIM8_BKIN                           ,                                                   ,                                                      ,                                                        ,SPI2_RDY                                                     ,                                  ,                                                                     ,SAI2_MCLK_A                                  ,                                                       ,                                                            ,DCMI_D5/PSSI_D5                                 ,                       ,EVENTOUT,
+PortI,PI5 ,             ,                   ,                              ,TIM8_CH1                            ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SAI2_SCK_A                                   ,                                                       ,                                                            ,DCMI_VSYNC/PSSI_RDY                             ,                       ,EVENTOUT,
+PortI,PI6 ,             ,                   ,                              ,TIM8_CH2                            ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SAI2_SD_A                                    ,                                                       ,                                                            ,DCMI_D6/PSSI_D6                                 ,                       ,EVENTOUT,
+PortI,PI7 ,             ,                   ,                              ,TIM8_CH3                            ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SAI2_FS_A                                    ,                                                       ,                                                            ,DCMI_D7/PSSI_D7                                 ,                       ,EVENTOUT,
+PortI,PI8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortI,PI9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_RX                          ,FDCAN1_RX                                                            ,                                             ,                                                       ,                                                            ,                                                ,                       ,EVENTOUT,
+PortI,PI10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,FDCAN1_RX                                                            ,                                             ,ETH_MII_RX_ER                                          ,                                                            ,PSSI_D14                                        ,                       ,EVENTOUT,
+PortI,PI11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,PSSI_D15                                        ,                       ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h723_af.csv b/ports/stm32/boards/stm32h723_af.csv
index 701e9381b209f..aa873797863cd 100644
--- a/ports/stm32/boards/stm32h723_af.csv
+++ b/ports/stm32/boards/stm32h723_af.csv
@@ -1,116 +1,116 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS,FMC/LPTIM1/SAI4/TIM16/17/TIM1x/TIM2x,FDCAN3/PDM_SAI1/TIM3/4/5/12/15,DFSDM1/LCD/LPTIM2/3/4/5/LPUART1/OCTOSPIM_P1/2/TIM8,CEC/DCMI/PSSI/DFSDM1/I2C1/2/3/4/5/LPTIM2/OCTOSPIM_P1/TIM15/USART1/10,CEC/FDCAN3/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,DFSDM1/I2C4/5/OCTOSPIM_P1/SAI1/SPI3/I2S3/UART4,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/UART7/USART1/2/3/6,LPUART1/SAI4/SDMMC1/SPDIFRX1/SPI6/UART4/5/8,FDCAN1/2/FMC/LCD/OCTOSPIM_P1/2/SAI4/SDMMC2/SPDIFRX1/TIM13/14,CRS/FMC/LCD/OCTOSPIM_P1/OTG1_FS/OTG1_HS/SAI4/SDMMC2/TIM8,DFSDM1/ETH/I2C4/LCD/MDIOS/OCTOSPIM_P1/SDMMC2/SWPMI1/TIM1x/TIM8/UART7/9/USART10,FMC/LCD/MDIOS/OCTOSPIM_P1/SDMMC1/TIM1x/TIM8,COMP/DCMI/PSSI/LCD/TIM1x/TIM23,LCD/TIM24/UART5,SYS,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,TIM15_BKIN,SPI6_NSS/I2S6_WS,,USART2_CTS/USART2_NSS,UART4_TX,SDMMC2_CMD,SAI4_SD_B,ETH_MII_CRS,FMC_A19,,,EVENTOUT,ADC1_INP16
-PortA,PA1,,TIM2_CH2,TIM5_CH2,LPTIM3_OUT,TIM15_CH1N,,,USART2_RTS/USART2_DE,UART4_RX,OCTOSPIM_P1_IO3,SAI4_MCLK_B,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,OCTOSPIM_P1_DQS,,LCD_R2,EVENTOUT,ADC1_INP17/ADC1_INN16
-PortA,PA2,,TIM2_CH3,TIM5_CH3,LPTIM4_OUT,TIM15_CH1,,OCTOSPIM_P1_IO0,USART2_TX,SAI4_SCK_B,,,ETH_MDIO,MDIOS_MDIO,,LCD_R1,EVENTOUT,ADC12_INP14
-PortA,PA3,,TIM2_CH4,TIM5_CH4,LPTIM5_OUT,TIM15_CH2,I2S6_MCK,OCTOSPIM_P1_IO2,USART2_RX,,LCD_B2,OTG_HS_ULPI_D0,ETH_MII_COL,OCTOSPIM_P1_CLK,,LCD_B5,EVENTOUT,ADC12_INP15
-PortA,PA4,D1PWREN,,TIM5_ETR,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,SPI6_NSS/I2S6_WS,,,,FMC_D8/FMC_AD8,DCMI_HSYNC/PSSI_DE,LCD_VSYNC,EVENTOUT,ADC12_INP18
-PortA,PA5,D2PWREN,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,SPI6_SCK/I2S6_CK,,OTG_HS_ULPI_CK,,FMC_D9/FMC_AD9,PSSI_D14,LCD_R4,EVENTOUT,ADC12_INP19/ADC12_INN18
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO/I2S1_SDI,OCTOSPIM_P1_IO3,,SPI6_MISO/I2S6_SDI,TIM13_CH1,TIM8_BKIN_COMP12,MDIOS_MDC,TIM1_BKIN_COMP12,DCMI_PIXCLK/PSSI_PDCK,LCD_G2,EVENTOUT,ADC12_INP3
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SDO,,,SPI6_MOSI/I2S6_SDO,TIM14_CH1,OCTOSPIM_P1_IO2,ETH_MII_RX_DV/ETH_RMII_CRS_DV,FMC_SDNWE,,LCD_VSYNC,EVENTOUT,ADC12_INP7/ADC12_INN3
-PortA,PA8,MCO1,TIM1_CH1,,TIM8_BKIN2,I2C3_SCL,,I2C5_SCL,USART1_CK,,,OTG_HS_SOF,UART7_RX,TIM8_BKIN2_COMP12,LCD_B3,LCD_R6,EVENTOUT,
-PortA,PA9,,TIM1_CH2,,LPUART1_TX,I2C3_SMBA,SPI2_SCK/I2S2_CK,I2C5_SMBA,USART1_TX,,,,ETH_TX_ER,,DCMI_D0/PSSI_D0,LCD_R5,EVENTOUT,
-PortA,PA10,,TIM1_CH3,,LPUART1_RX,,,,USART1_RX,,,OTG_HS_ID,MDIOS_MDIO,LCD_B4,DCMI_D1/PSSI_D1,LCD_B1,EVENTOUT,
-PortA,PA11,,TIM1_CH4,,LPUART1_CTS,,SPI2_NSS/I2S2_WS,UART4_RX,USART1_CTS/USART1_NSS,,FDCAN1_RX,,,,,LCD_R4,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,LPUART1_RTS/LPUART1_DE,,SPI2_SCK/I2S2_CK,UART4_TX,USART1_RTS/USART1_DE,SAI4_FS_B,FDCAN1_TX,,,TIM1_BKIN2,,LCD_R5,EVENTOUT,
-PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
-PortA,PA15,JTDI,TIM2_CH1/TIM2_ETR,,,CEC,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,SPI6_NSS/I2S6_WS,UART4_RTS/UART4_DE,LCD_R3,,UART7_TX,,,LCD_B6,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,OCTOSPIM_P1_IO1,,DFSDM1_CKOUT,,UART4_CTS,LCD_R3,OTG_HS_ULPI_D1,ETH_MII_RXD2,,,LCD_G1,EVENTOUT,ADC12_INP9/ADC12_INN5
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,OCTOSPIM_P1_IO0,,DFSDM1_DATIN1,,,LCD_R6,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,LCD_G0,EVENTOUT,ADC12_INP5
-PortB,PB2,RTC_OUT,SAI4_D1,SAI1_D1,,DFSDM1_CKIN1,,SAI1_SD_A,SPI3_MOSI/I2S3_SDO,SAI4_SD_A,OCTOSPIM_P1_CLK,OCTOSPIM_P1_DQS,ETH_TX_ER,,TIM23_ETR,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,,SPI6_SCK/I2S6_CK,SDMMC2_D2,CRS_SYNC,UART7_RX,,,TIM24_ETR,EVENTOUT,
-PortB,PB4,NJTRST,TIM16_BKIN,TIM3_CH1,,,SPI1_MISO/I2S1_SDI,SPI3_MISO/I2S3_SDI,SPI2_NSS/I2S2_WS,SPI6_MISO/I2S6_SDI,SDMMC2_D3,,UART7_TX,,,,EVENTOUT,
-PortB,PB5,,TIM17_BKIN,TIM3_CH2,LCD_B5,I2C1_SMBA,SPI1_MOSI/I2S1_SDO,I2C4_SMBA,SPI3_MOSI/I2S3_SDO,SPI6_MOSI/I2S6_SDO,FDCAN2_RX,OTG_HS_ULPI_D7,ETH_PPS_OUT,FMC_SDCKE1,DCMI_D10/PSSI_D10,UART5_RX,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,
-PortB,PB7,,TIM17_CH1N,TIM4_CH2,,I2C1_SDA,,I2C4_SDA,USART1_RX,LPUART1_RX,,,DFSDM1_CKIN5,FMC_NL,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
-PortB,PB8,,TIM16_CH1,TIM4_CH3,DFSDM1_CKIN7,I2C1_SCL,,I2C4_SCL,SDMMC1_CKIN,UART4_RX,FDCAN1_RX,SDMMC2_D4,ETH_MII_TXD3,SDMMC1_D4,DCMI_D6/PSSI_D6,LCD_B6,EVENTOUT,
-PortB,PB9,,TIM17_CH1,TIM4_CH4,DFSDM1_DATIN7,I2C1_SDA,SPI2_NSS/I2S2_WS,I2C4_SDA,SDMMC1_CDIR,UART4_TX,FDCAN1_TX,SDMMC2_D5,I2C4_SMBA,SDMMC1_D5,DCMI_D7/PSSI_D7,LCD_B7,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,LPTIM2_IN1,I2C2_SCL,SPI2_SCK/I2S2_CK,DFSDM1_DATIN7,USART3_TX,,OCTOSPIM_P1_NCS,OTG_HS_ULPI_D3,ETH_MII_RX_ER,,,LCD_G4,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,LPTIM2_ETR,I2C2_SDA,,DFSDM1_CKIN7,USART3_RX,,,OTG_HS_ULPI_D4,ETH_MII_TX_EN/ETH_RMII_TX_EN,,,LCD_G5,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,OCTOSPIM_P1_NCLK,I2C2_SMBA,SPI2_NSS/I2S2_WS,DFSDM1_DATIN1,USART3_CK,,FDCAN2_RX,OTG_HS_ULPI_D5,ETH_MII_TXD0/ETH_RMII_TXD0,OCTOSPIM_P1_IO0,TIM1_BKIN_COMP12,UART5_RX,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,LPTIM2_OUT,OCTOSPIM_P1_IO2,SPI2_SCK/I2S2_CK,DFSDM1_CKIN1,USART3_CTS/USART3_NSS,,FDCAN2_TX,OTG_HS_ULPI_D6,ETH_MII_TXD1/ETH_RMII_TXD1,SDMMC1_D0,DCMI_D2/PSSI_D2,UART5_TX,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,TIM12_CH1,TIM8_CH2N,USART1_TX,SPI2_MISO/I2S2_SDI,DFSDM1_DATIN2,USART3_RTS/USART3_DE,UART4_RTS/UART4_DE,SDMMC2_D0,,,FMC_D10/FMC_AD10,,LCD_CLK,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,TIM12_CH2,TIM8_CH3N,USART1_RX,SPI2_MOSI/I2S2_SDO,DFSDM1_CKIN2,,UART4_CTS,SDMMC2_D1,,,FMC_D11/FMC_AD11,,LCD_G7,EVENTOUT,
-PortC,PC0,,FMC_D12/FMC_AD12,,DFSDM1_CKIN0,,,DFSDM1_DATIN4,,SAI4_FS_B,FMC_A25,OTG_HS_ULPI_STP,LCD_G2,FMC_SDNWE,,LCD_R5,EVENTOUT,ADC123_INP10
-PortC,PC1,TRACED0,SAI4_D1,SAI1_D1,DFSDM1_DATIN0,DFSDM1_CKIN4,SPI2_MOSI/I2S2_SDO,SAI1_SD_A,,SAI4_SD_A,SDMMC2_CK,OCTOSPIM_P1_IO4,ETH_MDC,MDIOS_MDC,,LCD_G5,EVENTOUT,ADC123_INP11/ADC123_INN10
-PortC,PC2,PWR_DEEPSLEEP,,,DFSDM1_CKIN1,OCTOSPIM_P1_IO5,SPI2_MISO/I2S2_SDI,DFSDM1_CKOUT,,,OCTOSPIM_P1_IO2,OTG_HS_ULPI_DIR,ETH_MII_TXD2,FMC_SDNE0,,,EVENTOUT,ADC123_INP12/ADC123_INN11
-PortC,PC3,PWR_SLEEP,,,DFSDM1_DATIN1,OCTOSPIM_P1_IO6,SPI2_MOSI/I2S2_SDO,,,,OCTOSPIM_P1_IO0,OTG_HS_ULPI_NXT,ETH_MII_TX_CLK,FMC_SDCKE0,,,EVENTOUT,ADC123_INP13/ADC123_INN12
-PortC,PC4,PWR_DEEPSLEEP,FMC_A22,,DFSDM1_CKIN2,,I2S1_MCK,,,,SPDIFRX1_IN3,SDMMC2_CKIN,ETH_MII_RXD0/ETH_RMII_RXD0,FMC_SDNE0,,LCD_R7,EVENTOUT,ADC12_INP4
-PortC,PC5,PWR_SLEEP,SAI4_D3,SAI1_D3,DFSDM1_DATIN2,PSSI_D15,,,,,SPDIFRX1_IN4,OCTOSPIM_P1_DQS,ETH_MII_RXD1/ETH_RMII_RXD1,FMC_SDCKE0,COMP1_OUT,LCD_DE,EVENTOUT,ADC12_INP8/ADC12_INN4
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,DFSDM1_CKIN3,I2S2_MCK,,USART6_TX,SDMMC1_D0DIR,FMC_NWAIT,SDMMC2_D6,,SDMMC1_D6,DCMI_D0/PSSI_D0,LCD_HSYNC,EVENTOUT,
-PortC,PC7,DBTRGIO,,TIM3_CH2,TIM8_CH2,DFSDM1_DATIN3,,I2S3_MCK,USART6_RX,SDMMC1_D123DIR,FMC_NE1,SDMMC2_D7,SWPMI_TX,SDMMC1_D7,DCMI_D1/PSSI_D1,LCD_G6,EVENTOUT,
-PortC,PC8,TRACED1,,TIM3_CH3,TIM8_CH3,,,,USART6_CK,UART5_RTS/UART5_DE,FMC_NE2/FMC_NCE,FMC_INT,SWPMI_RX,SDMMC1_D0,DCMI_D2/PSSI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,I2C5_SDA,,UART5_CTS,OCTOSPIM_P1_IO0,LCD_G3,SWPMI_SUSPEND,SDMMC1_D1,DCMI_D3/PSSI_D3,LCD_B2,EVENTOUT,
-PortC,PC10,,,,DFSDM1_CKIN5,I2C5_SDA,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,OCTOSPIM_P1_IO1,LCD_B1,SWPMI_RX,SDMMC1_D2,DCMI_D8/PSSI_D8,LCD_R2,EVENTOUT,
-PortC,PC11,,,,DFSDM1_DATIN5,I2C5_SCL,,SPI3_MISO/I2S3_SDI,USART3_RX,UART4_RX,OCTOSPIM_P1_NCS,,,SDMMC1_D3,DCMI_D4/PSSI_D4,LCD_B4,EVENTOUT,
-PortC,PC12,TRACED3,FMC_D6/FMC_AD6,TIM15_CH1,,I2C5_SMBA,SPI6_SCK/I2S6_CK,SPI3_MOSI/I2S3_SDO,USART3_CK,UART5_TX,,,,SDMMC1_CK,DCMI_D9/PSSI_D9,LCD_R6,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,DFSDM1_CKIN6,,,,,UART4_RX,FDCAN1_RX,,UART9_CTS,FMC_D2/FMC_AD2,,LCD_B1,EVENTOUT,
-PortD,PD1,,,,DFSDM1_DATIN6,,,,,UART4_TX,FDCAN1_TX,,,FMC_D3/FMC_AD3,,,EVENTOUT,
-PortD,PD2,TRACED2,FMC_D7/FMC_AD7,TIM3_ETR,,TIM15_BKIN,,,,UART5_RX,LCD_B7,,,SDMMC1_CMD,DCMI_D11/PSSI_D11,LCD_B2,EVENTOUT,
-PortD,PD3,,,,DFSDM1_CKOUT,,SPI2_SCK/I2S2_CK,,USART2_CTS/USART2_NSS,,,,,FMC_CLK,DCMI_D5/PSSI_D5,LCD_G7,EVENTOUT,
-PortD,PD4,,,,,,,,USART2_RTS/USART2_DE,,,OCTOSPIM_P1_IO4,,FMC_NOE,,,EVENTOUT,
-PortD,PD5,,,,,,,,USART2_TX,,,OCTOSPIM_P1_IO5,,FMC_NWE,,,EVENTOUT,
-PortD,PD6,,SAI4_D1,SAI1_D1,DFSDM1_CKIN4,DFSDM1_DATIN1,SPI3_MOSI/I2S3_SDO,SAI1_SD_A,USART2_RX,SAI4_SD_A,,OCTOSPIM_P1_IO6,SDMMC2_CK,FMC_NWAIT,DCMI_D10/PSSI_D10,LCD_B2,EVENTOUT,
-PortD,PD7,,,,DFSDM1_DATIN4,,SPI1_MOSI/I2S1_SDO,DFSDM1_CKIN1,USART2_CK,,SPDIFRX1_IN1,OCTOSPIM_P1_IO7,SDMMC2_CMD,FMC_NE1,,,EVENTOUT,
-PortD,PD8,,,,DFSDM1_CKIN3,,,,USART3_TX,,SPDIFRX1_IN2,,,FMC_D13/FMC_AD13,,,EVENTOUT,
-PortD,PD9,,,,DFSDM1_DATIN3,,,,USART3_RX,,,,,FMC_D14/FMC_AD14,,,EVENTOUT,
-PortD,PD10,,,,DFSDM1_CKOUT,,,,USART3_CK,,,,,FMC_D15/FMC_AD15,,LCD_B3,EVENTOUT,
-PortD,PD11,,,,LPTIM2_IN2,I2C4_SMBA,,,USART3_CTS/USART3_NSS,,OCTOSPIM_P1_IO0,SAI4_SD_A,,FMC_A16/FMC_CLE,,,EVENTOUT,
-PortD,PD12,,LPTIM1_IN1,TIM4_CH1,LPTIM2_IN1,I2C4_SCL,FDCAN3_RX,,USART3_RTS/USART3_DE,,OCTOSPIM_P1_IO1,SAI4_FS_A,,FMC_A17/FMC_ALE,DCMI_D12/PSSI_D12,,EVENTOUT,
-PortD,PD13,,LPTIM1_OUT,TIM4_CH2,,I2C4_SDA,FDCAN3_TX,,,,OCTOSPIM_P1_IO3,SAI4_SCK_A,UART9_RTS/UART9_DE,FMC_A18,DCMI_D13/PSSI_D13,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,,,UART8_CTS,,,UART9_RX,FMC_D0/FMC_AD0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,,,UART8_RTS/UART8_DE,,,UART9_TX,FMC_D1/FMC_AD1,,,EVENTOUT,
-PortE,PE0,,LPTIM1_ETR,TIM4_ETR,,LPTIM2_ETR,,,,UART8_RX,,SAI4_MCLK_A,,FMC_NBL0,DCMI_D2/PSSI_D2,LCD_R0,EVENTOUT,
-PortE,PE1,,LPTIM1_IN2,,,,,,,UART8_TX,,,,FMC_NBL1,DCMI_D3/PSSI_D3,LCD_R6,EVENTOUT,
-PortE,PE2,TRACECLK,,SAI1_CK1,,USART10_RX,SPI4_SCK,SAI1_MCLK_A,,SAI4_MCLK_A,OCTOSPIM_P1_IO2,SAI4_CK1,ETH_MII_TXD3,FMC_A23,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,TIM15_BKIN,,SAI1_SD_B,,SAI4_SD_B,,,USART10_TX,FMC_A19,,,EVENTOUT,
-PortE,PE4,TRACED1,,SAI1_D2,DFSDM1_DATIN3,TIM15_CH1N,SPI4_NSS,SAI1_FS_A,,SAI4_FS_A,,SAI4_D2,,FMC_A20,DCMI_D4/PSSI_D4,LCD_B0,EVENTOUT,
-PortE,PE5,TRACED2,,SAI1_CK2,DFSDM1_CKIN3,TIM15_CH1,SPI4_MISO,SAI1_SCK_A,,SAI4_SCK_A,,SAI4_CK2,,FMC_A21,DCMI_D6/PSSI_D6,LCD_G0,EVENTOUT,
-PortE,PE6,TRACED3,TIM1_BKIN2,SAI1_D1,,TIM15_CH2,SPI4_MOSI,SAI1_SD_A,,SAI4_SD_A,SAI4_D1,SAI4_MCLK_B,TIM1_BKIN2_COMP12,FMC_A22,DCMI_D7/PSSI_D7,LCD_G1,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,DFSDM1_DATIN2,,,,UART7_RX,,,OCTOSPIM_P1_IO4,,FMC_D4/FMC_AD4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,DFSDM1_CKIN2,,,,UART7_TX,,,OCTOSPIM_P1_IO5,,FMC_D5/FMC_AD5,COMP2_OUT,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,DFSDM1_CKOUT,,,,UART7_RTS/UART7_DE,,,OCTOSPIM_P1_IO6,,FMC_D6/FMC_AD6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,DFSDM1_DATIN4,,,,UART7_CTS,,,OCTOSPIM_P1_IO7,,FMC_D7/FMC_AD7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,DFSDM1_CKIN4,,SPI4_NSS,,,,,SAI4_SD_B,OCTOSPIM_P1_NCS,FMC_D8/FMC_AD8,,LCD_G3,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,DFSDM1_DATIN5,,SPI4_SCK,,,,,SAI4_SCK_B,,FMC_D9/FMC_AD9,COMP1_OUT,LCD_B4,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,DFSDM1_CKIN5,,SPI4_MISO,,,,,SAI4_FS_B,,FMC_D10/FMC_AD10,COMP2_OUT,LCD_DE,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI4_MCLK_B,,FMC_D11/FMC_AD11,,LCD_CLK,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,,,,,,,USART10_CK,FMC_D12/FMC_AD12,TIM1_BKIN_COMP12,LCD_R7,EVENTOUT,
-PortF,PF0,,,,,I2C2_SDA,,I2C5_SDA,,,OCTOSPIM_P2_IO0,,,FMC_A0,TIM23_CH1,,EVENTOUT,
-PortF,PF1,,,,,I2C2_SCL,,I2C5_SCL,,,OCTOSPIM_P2_IO1,,,FMC_A1,TIM23_CH2,,EVENTOUT,
-PortF,PF2,,,,,I2C2_SMBA,,I2C5_SMBA,,,OCTOSPIM_P2_IO2,,,FMC_A2,TIM23_CH3,,EVENTOUT,
-PortF,PF3,,,,,,,,,,OCTOSPIM_P2_IO3,,,FMC_A3,TIM23_CH4,,EVENTOUT,ADC3_INP5
-PortF,PF4,,,,,,,,,,OCTOSPIM_P2_CLK,,,FMC_A4,,,EVENTOUT,ADC3_INP9/ADC3_INN5
-PortF,PF5,,,,,,,,,,OCTOSPIM_P2_NCLK,,,FMC_A5,,,EVENTOUT,ADC3_INP4
-PortF,PF6,,TIM16_CH1,FDCAN3_RX,,,SPI5_NSS,SAI1_SD_B,UART7_RX,SAI4_SD_B,,OCTOSPIM_P1_IO3,,,TIM23_CH1,,EVENTOUT,ADC3_INP8/ADC3_INN4
-PortF,PF7,,TIM17_CH1,FDCAN3_TX,,,SPI5_SCK,SAI1_MCLK_B,UART7_TX,SAI4_MCLK_B,,OCTOSPIM_P1_IO2,,,TIM23_CH2,,EVENTOUT,ADC3_INP3
-PortF,PF8,,TIM16_CH1N,,,,SPI5_MISO,SAI1_SCK_B,UART7_RTS/UART7_DE,SAI4_SCK_B,TIM13_CH1,OCTOSPIM_P1_IO0,,,TIM23_CH3,,EVENTOUT,ADC3_INP7/ADC3_INN3
-PortF,PF9,,TIM17_CH1N,,,,SPI5_MOSI,SAI1_FS_B,UART7_CTS,SAI4_FS_B,TIM14_CH1,OCTOSPIM_P1_IO1,,,TIM23_CH4,,EVENTOUT,ADC3_INP2
-PortF,PF10,,TIM16_BKIN,SAI1_D3,,PSSI_D15,,,,,OCTOSPIM_P1_CLK,SAI4_D3,,,DCMI_D11/PSSI_D11,LCD_DE,EVENTOUT,ADC3_INP6/ADC3_INN2
-PortF,PF11,,,,,,SPI5_MOSI,,,,OCTOSPIM_P1_NCLK,SAI4_SD_B,,FMC_NRAS,DCMI_D12/PSSI_D12,TIM24_CH1,EVENTOUT,ADC1_INP2
-PortF,PF12,,,,,,,,,,OCTOSPIM_P2_DQS,,,FMC_A6,,TIM24_CH2,EVENTOUT,ADC1_INP5/ADC1_INN2
-PortF,PF13,,,,DFSDM1_DATIN6,I2C4_SMBA,,,,,,,,FMC_A7,,TIM24_CH3,EVENTOUT,ADC2_INP2
-PortF,PF14,,,,DFSDM1_CKIN6,I2C4_SCL,,,,,,,,FMC_A8,,TIM24_CH4,EVENTOUT,ADC2_INP6/ADC2_INN2
-PortF,PF15,,,,,I2C4_SDA,,,,,,,,FMC_A9,,,EVENTOUT,
-PortG,PG0,,,,,,,,,,OCTOSPIM_P2_IO4,,UART9_RX,FMC_A10,,,EVENTOUT,
-PortG,PG1,,,,,,,,,,OCTOSPIM_P2_IO5,,UART9_TX,FMC_A11,,,EVENTOUT,
-PortG,PG2,,,,TIM8_BKIN,,,,,,,,TIM8_BKIN_COMP12,FMC_A12,,TIM24_ETR,EVENTOUT,
-PortG,PG3,,,,TIM8_BKIN2,,,,,,,,TIM8_BKIN2_COMP12,FMC_A13,TIM23_ETR,,EVENTOUT,
-PortG,PG4,,TIM1_BKIN2,,,,,,,,,,TIM1_BKIN2_COMP12,FMC_A14/FMC_BA0,,,EVENTOUT,
-PortG,PG5,,TIM1_ETR,,,,,,,,,,,FMC_A15/FMC_BA1,,,EVENTOUT,
-PortG,PG6,,TIM17_BKIN,,,,,,,,,OCTOSPIM_P1_NCS,,FMC_NE3,DCMI_D12/PSSI_D12,LCD_R7,EVENTOUT,
-PortG,PG7,,,,,,,SAI1_MCLK_A,USART6_CK,,OCTOSPIM_P2_DQS,,,FMC_INT,DCMI_D13/PSSI_D13,LCD_CLK,EVENTOUT,
-PortG,PG8,,,,TIM8_ETR,,SPI6_NSS/I2S6_WS,,USART6_RTS/USART6_DE,SPDIFRX1_IN3,,,ETH_PPS_OUT,FMC_SDCLK,,LCD_G7,EVENTOUT,
-PortG,PG9,,,FDCAN3_TX,,,SPI1_MISO/I2S1_SDI,,USART6_RX,SPDIFRX1_IN4,OCTOSPIM_P1_IO6,SAI4_FS_B,SDMMC2_D0,FMC_NE2/FMC_NCE,DCMI_VSYNC/PSSI_RDY,,EVENTOUT,
-PortG,PG10,,,FDCAN3_RX,OCTOSPIM_P2_IO6,,SPI1_NSS/I2S1_WS,,,,LCD_G3,SAI4_SD_B,SDMMC2_D1,FMC_NE3,DCMI_D2/PSSI_D2,LCD_B2,EVENTOUT,
-PortG,PG11,,LPTIM1_IN2,,,USART10_RX,SPI1_SCK/I2S1_CK,,,SPDIFRX1_IN1,OCTOSPIM_P2_IO7,SDMMC2_D2,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DCMI_D3/PSSI_D3,LCD_B3,EVENTOUT,
-PortG,PG12,,LPTIM1_IN1,,OCTOSPIM_P2_NCS,USART10_TX,SPI6_MISO/I2S6_SDI,,USART6_RTS/USART6_DE,SPDIFRX1_IN2,LCD_B4,SDMMC2_D3,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_NE4,TIM23_CH1,LCD_B1,EVENTOUT,
-PortG,PG13,TRACED0,LPTIM1_OUT,,,USART10_CTS/USART10_NSS,SPI6_SCK/I2S6_CK,,USART6_CTS/USART6_NSS,,,SDMMC2_D6,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,TIM23_CH2,LCD_R0,EVENTOUT,
-PortG,PG14,TRACED1,LPTIM1_ETR,,,USART10_RTS/USART10_DE,SPI6_MOSI/I2S6_SDO,,USART6_TX,,OCTOSPIM_P1_IO7,SDMMC2_D7,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_A25,TIM23_CH3,LCD_B0,EVENTOUT,
-PortG,PG15,,,,,,,,USART6_CTS/USART6_NSS,,OCTOSPIM_P2_DQS,,USART10_CK,FMC_NCAS,DCMI_D13/PSSI_D13,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
+Port ,Pin ,AF0          ,AF1                                 ,AF2                           ,AF3                                               ,AF4                                                                 ,AF5                                              ,AF6                                           ,AF7                                               ,AF8                                        ,AF9                                                         ,AF10                                                    ,AF11                                                                          ,AF12                                       ,AF13                          ,AF14           ,AF15    ,ADC
+     ,    ,SYS          ,FMC/LPTIM1/SAI4/TIM16/17/TIM1x/TIM2x,FDCAN3/PDM_SAI1/TIM3/4/5/12/15,DFSDM1/LCD/LPTIM2/3/4/5/LPUART1/OCTOSPIM_P1/2/TIM8,CEC/DCMI/PSSI/DFSDM1/I2C1/2/3/4/5/LPTIM2/OCTOSPIM_P1/TIM15/USART1/10,CEC/FDCAN3/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,DFSDM1/I2C4/5/OCTOSPIM_P1/SAI1/SPI3/I2S3/UART4,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/UART7/USART1/2/3/6,LPUART1/SAI4/SDMMC1/SPDIFRX1/SPI6/UART4/5/8,FDCAN1/2/FMC/LCD/OCTOSPIM_P1/2/SAI4/SDMMC2/SPDIFRX1/TIM13/14,CRS/FMC/LCD/OCTOSPIM_P1/OTG1_FS/OTG1_HS/SAI4/SDMMC2/TIM8,DFSDM1/ETH/I2C4/LCD/MDIOS/OCTOSPIM_P1/SDMMC2/SWPMI1/TIM1x/TIM8/UART7/9/USART10,FMC/LCD/MDIOS/OCTOSPIM_P1/SDMMC1/TIM1x/TIM8,COMP/DCMI/PSSI/LCD/TIM1x/TIM23,LCD/TIM24/UART5,SYS     ,ADC
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR                   ,TIM5_CH1                      ,TIM8_ETR                                          ,TIM15_BKIN                                                          ,SPI6_NSS/I2S6_WS                                 ,                                              ,USART2_CTS/USART2_NSS                             ,UART4_TX                                   ,SDMMC2_CMD                                                  ,SAI4_SD_B                                               ,ETH_MII_CRS                                                                   ,FMC_A19                                    ,                              ,               ,EVENTOUT,ADC1_INP16
+PortA,PA1 ,             ,TIM2_CH2                            ,TIM5_CH2                      ,LPTIM3_OUT                                        ,TIM15_CH1N                                                          ,                                                 ,                                              ,USART2_RTS/USART2_DE                              ,UART4_RX                                   ,OCTOSPIM_P1_IO3                                             ,SAI4_MCLK_B                                             ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK                                               ,OCTOSPIM_P1_DQS                            ,                              ,LCD_R2         ,EVENTOUT,ADC1_INP17/ADC1_INN16
+PortA,PA2 ,             ,TIM2_CH3                            ,TIM5_CH3                      ,LPTIM4_OUT                                        ,TIM15_CH1                                                           ,                                                 ,OCTOSPIM_P1_IO0                               ,USART2_TX                                         ,SAI4_SCK_B                                 ,                                                            ,                                                        ,ETH_MDIO                                                                      ,MDIOS_MDIO                                 ,                              ,LCD_R1         ,EVENTOUT,ADC12_INP14
+PortA,PA3 ,             ,TIM2_CH4                            ,TIM5_CH4                      ,LPTIM5_OUT                                        ,TIM15_CH2                                                           ,I2S6_MCK                                         ,OCTOSPIM_P1_IO2                               ,USART2_RX                                         ,                                           ,LCD_B2                                                      ,OTG_HS_ULPI_D0                                          ,ETH_MII_COL                                                                   ,OCTOSPIM_P1_CLK                            ,                              ,LCD_B5         ,EVENTOUT,ADC12_INP15
+PortA,PA4 ,D1PWREN      ,                                    ,TIM5_ETR                      ,                                                  ,                                                                    ,SPI1_NSS/I2S1_WS                                 ,SPI3_NSS/I2S3_WS                              ,USART2_CK                                         ,SPI6_NSS/I2S6_WS                           ,                                                            ,                                                        ,                                                                              ,FMC_D8/FMC_AD8                             ,DCMI_HSYNC/PSSI_DE            ,LCD_VSYNC      ,EVENTOUT,ADC12_INP18
+PortA,PA5 ,D2PWREN      ,TIM2_CH1/TIM2_ETR                   ,                              ,TIM8_CH1N                                         ,                                                                    ,SPI1_SCK/I2S1_CK                                 ,                                              ,                                                  ,SPI6_SCK/I2S6_CK                           ,                                                            ,OTG_HS_ULPI_CK                                          ,                                                                              ,FMC_D9/FMC_AD9                             ,PSSI_D14                      ,LCD_R4         ,EVENTOUT,ADC12_INP19/ADC12_INN18
+PortA,PA6 ,             ,TIM1_BKIN                           ,TIM3_CH1                      ,TIM8_BKIN                                         ,                                                                    ,SPI1_MISO/I2S1_SDI                               ,OCTOSPIM_P1_IO3                               ,                                                  ,SPI6_MISO/I2S6_SDI                         ,TIM13_CH1                                                   ,TIM8_BKIN_COMP12                                        ,MDIOS_MDC                                                                     ,TIM1_BKIN_COMP12                           ,DCMI_PIXCLK/PSSI_PDCK         ,LCD_G2         ,EVENTOUT,ADC12_INP3
+PortA,PA7 ,             ,TIM1_CH1N                           ,TIM3_CH2                      ,TIM8_CH1N                                         ,                                                                    ,SPI1_MOSI/I2S1_SDO                               ,                                              ,                                                  ,SPI6_MOSI/I2S6_SDO                         ,TIM14_CH1                                                   ,OCTOSPIM_P1_IO2                                         ,ETH_MII_RX_DV/ETH_RMII_CRS_DV                                                 ,FMC_SDNWE                                  ,                              ,LCD_VSYNC      ,EVENTOUT,ADC12_INP7/ADC12_INN3
+PortA,PA8 ,MCO1         ,TIM1_CH1                            ,                              ,TIM8_BKIN2                                        ,I2C3_SCL                                                            ,                                                 ,I2C5_SCL                                      ,USART1_CK                                         ,                                           ,                                                            ,OTG_HS_SOF                                              ,UART7_RX                                                                      ,TIM8_BKIN2_COMP12                          ,LCD_B3                        ,LCD_R6         ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2                            ,                              ,LPUART1_TX                                        ,I2C3_SMBA                                                           ,SPI2_SCK/I2S2_CK                                 ,I2C5_SMBA                                     ,USART1_TX                                         ,                                           ,                                                            ,                                                        ,ETH_TX_ER                                                                     ,                                           ,DCMI_D0/PSSI_D0               ,LCD_R5         ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3                            ,                              ,LPUART1_RX                                        ,                                                                    ,                                                 ,                                              ,USART1_RX                                         ,                                           ,                                                            ,OTG_HS_ID                                               ,MDIOS_MDIO                                                                    ,LCD_B4                                     ,DCMI_D1/PSSI_D1               ,LCD_B1         ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4                            ,                              ,LPUART1_CTS                                       ,                                                                    ,SPI2_NSS/I2S2_WS                                 ,UART4_RX                                      ,USART1_CTS/USART1_NSS                             ,                                           ,FDCAN1_RX                                                   ,                                                        ,                                                                              ,                                           ,                              ,LCD_R4         ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR                            ,                              ,LPUART1_RTS/LPUART1_DE                            ,                                                                    ,SPI2_SCK/I2S2_CK                                 ,UART4_TX                                      ,USART1_RTS/USART1_DE                              ,SAI4_FS_B                                  ,FDCAN1_TX                                                   ,                                                        ,                                                                              ,TIM1_BKIN2                                 ,                              ,LCD_R5         ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1/TIM2_ETR                   ,                              ,                                                  ,CEC                                                                 ,SPI1_NSS/I2S1_WS                                 ,SPI3_NSS/I2S3_WS                              ,SPI6_NSS/I2S6_WS                                  ,UART4_RTS/UART4_DE                         ,LCD_R3                                                      ,                                                        ,UART7_TX                                                                      ,                                           ,                              ,LCD_B6         ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N                           ,TIM3_CH3                      ,TIM8_CH2N                                         ,OCTOSPIM_P1_IO1                                                     ,                                                 ,DFSDM1_CKOUT                                  ,                                                  ,UART4_CTS                                  ,LCD_R3                                                      ,OTG_HS_ULPI_D1                                          ,ETH_MII_RXD2                                                                  ,                                           ,                              ,LCD_G1         ,EVENTOUT,ADC12_INP9/ADC12_INN5
+PortB,PB1 ,             ,TIM1_CH3N                           ,TIM3_CH4                      ,TIM8_CH3N                                         ,OCTOSPIM_P1_IO0                                                     ,                                                 ,DFSDM1_DATIN1                                 ,                                                  ,                                           ,LCD_R6                                                      ,OTG_HS_ULPI_D2                                          ,ETH_MII_RXD3                                                                  ,                                           ,                              ,LCD_G0         ,EVENTOUT,ADC12_INP5
+PortB,PB2 ,RTC_OUT      ,SAI4_D1                             ,SAI1_D1                       ,                                                  ,DFSDM1_CKIN1                                                        ,                                                 ,SAI1_SD_A                                     ,SPI3_MOSI/I2S3_SDO                                ,SAI4_SD_A                                  ,OCTOSPIM_P1_CLK                                             ,OCTOSPIM_P1_DQS                                         ,ETH_TX_ER                                                                     ,                                           ,TIM23_ETR                     ,               ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2                            ,                              ,                                                  ,                                                                    ,SPI1_SCK/I2S1_CK                                 ,SPI3_SCK/I2S3_CK                              ,                                                  ,SPI6_SCK/I2S6_CK                           ,SDMMC2_D2                                                   ,CRS_SYNC                                                ,UART7_RX                                                                      ,                                           ,                              ,TIM24_ETR      ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,TIM16_BKIN                          ,TIM3_CH1                      ,                                                  ,                                                                    ,SPI1_MISO/I2S1_SDI                               ,SPI3_MISO/I2S3_SDI                            ,SPI2_NSS/I2S2_WS                                  ,SPI6_MISO/I2S6_SDI                         ,SDMMC2_D3                                                   ,                                                        ,UART7_TX                                                                      ,                                           ,                              ,               ,EVENTOUT,
+PortB,PB5 ,             ,TIM17_BKIN                          ,TIM3_CH2                      ,LCD_B5                                            ,I2C1_SMBA                                                           ,SPI1_MOSI/I2S1_SDO                               ,I2C4_SMBA                                     ,SPI3_MOSI/I2S3_SDO                                ,SPI6_MOSI/I2S6_SDO                         ,FDCAN2_RX                                                   ,OTG_HS_ULPI_D7                                          ,ETH_PPS_OUT                                                                   ,FMC_SDCKE1                                 ,DCMI_D10/PSSI_D10             ,UART5_RX       ,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,
+PortB,PB7 ,             ,TIM17_CH1N                          ,TIM4_CH2                      ,                                                  ,I2C1_SDA                                                            ,                                                 ,I2C4_SDA                                      ,USART1_RX                                         ,LPUART1_RX                                 ,                                                            ,                                                        ,DFSDM1_CKIN5                                                                  ,FMC_NL                                     ,DCMI_VSYNC/PSSI_RDY           ,               ,EVENTOUT,
+PortB,PB8 ,             ,TIM16_CH1                           ,TIM4_CH3                      ,DFSDM1_CKIN7                                      ,I2C1_SCL                                                            ,                                                 ,I2C4_SCL                                      ,SDMMC1_CKIN                                       ,UART4_RX                                   ,FDCAN1_RX                                                   ,SDMMC2_D4                                               ,ETH_MII_TXD3                                                                  ,SDMMC1_D4                                  ,DCMI_D6/PSSI_D6               ,LCD_B6         ,EVENTOUT,
+PortB,PB9 ,             ,TIM17_CH1                           ,TIM4_CH4                      ,DFSDM1_DATIN7                                     ,I2C1_SDA                                                            ,SPI2_NSS/I2S2_WS                                 ,I2C4_SDA                                      ,SDMMC1_CDIR                                       ,UART4_TX                                   ,FDCAN1_TX                                                   ,SDMMC2_D5                                               ,I2C4_SMBA                                                                     ,SDMMC1_D5                                  ,DCMI_D7/PSSI_D7               ,LCD_B7         ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3                            ,                              ,LPTIM2_IN1                                        ,I2C2_SCL                                                            ,SPI2_SCK/I2S2_CK                                 ,DFSDM1_DATIN7                                 ,USART3_TX                                         ,                                           ,OCTOSPIM_P1_NCS                                             ,OTG_HS_ULPI_D3                                          ,ETH_MII_RX_ER                                                                 ,                                           ,                              ,LCD_G4         ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4                            ,                              ,LPTIM2_ETR                                        ,I2C2_SDA                                                            ,                                                 ,DFSDM1_CKIN7                                  ,USART3_RX                                         ,                                           ,                                                            ,OTG_HS_ULPI_D4                                          ,ETH_MII_TX_EN/ETH_RMII_TX_EN                                                  ,                                           ,                              ,LCD_G5         ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN                           ,                              ,OCTOSPIM_P1_NCLK                                  ,I2C2_SMBA                                                           ,SPI2_NSS/I2S2_WS                                 ,DFSDM1_DATIN1                                 ,USART3_CK                                         ,                                           ,FDCAN2_RX                                                   ,OTG_HS_ULPI_D5                                          ,ETH_MII_TXD0/ETH_RMII_TXD0                                                    ,OCTOSPIM_P1_IO0                            ,TIM1_BKIN_COMP12              ,UART5_RX       ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N                           ,                              ,LPTIM2_OUT                                        ,OCTOSPIM_P1_IO2                                                     ,SPI2_SCK/I2S2_CK                                 ,DFSDM1_CKIN1                                  ,USART3_CTS/USART3_NSS                             ,                                           ,FDCAN2_TX                                                   ,OTG_HS_ULPI_D6                                          ,ETH_MII_TXD1/ETH_RMII_TXD1                                                    ,SDMMC1_D0                                  ,DCMI_D2/PSSI_D2               ,UART5_TX       ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N                           ,TIM12_CH1                     ,TIM8_CH2N                                         ,USART1_TX                                                           ,SPI2_MISO/I2S2_SDI                               ,DFSDM1_DATIN2                                 ,USART3_RTS/USART3_DE                              ,UART4_RTS/UART4_DE                         ,SDMMC2_D0                                                   ,                                                        ,                                                                              ,FMC_D10/FMC_AD10                           ,                              ,LCD_CLK        ,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N                           ,TIM12_CH2                     ,TIM8_CH3N                                         ,USART1_RX                                                           ,SPI2_MOSI/I2S2_SDO                               ,DFSDM1_CKIN2                                  ,                                                  ,UART4_CTS                                  ,SDMMC2_D1                                                   ,                                                        ,                                                                              ,FMC_D11/FMC_AD11                           ,                              ,LCD_G7         ,EVENTOUT,
+PortC,PC0 ,             ,FMC_D12/FMC_AD12                    ,                              ,DFSDM1_CKIN0                                      ,                                                                    ,                                                 ,DFSDM1_DATIN4                                 ,                                                  ,SAI4_FS_B                                  ,FMC_A25                                                     ,OTG_HS_ULPI_STP                                         ,LCD_G2                                                                        ,FMC_SDNWE                                  ,                              ,LCD_R5         ,EVENTOUT,ADC123_INP10
+PortC,PC1 ,TRACED0      ,SAI4_D1                             ,SAI1_D1                       ,DFSDM1_DATIN0                                     ,DFSDM1_CKIN4                                                        ,SPI2_MOSI/I2S2_SDO                               ,SAI1_SD_A                                     ,                                                  ,SAI4_SD_A                                  ,SDMMC2_CK                                                   ,OCTOSPIM_P1_IO4                                         ,ETH_MDC                                                                       ,MDIOS_MDC                                  ,                              ,LCD_G5         ,EVENTOUT,ADC123_INP11/ADC123_INN10
+PortC,PC2 ,PWR_DEEPSLEEP,                                    ,                              ,DFSDM1_CKIN1                                      ,OCTOSPIM_P1_IO5                                                     ,SPI2_MISO/I2S2_SDI                               ,DFSDM1_CKOUT                                  ,                                                  ,                                           ,OCTOSPIM_P1_IO2                                             ,OTG_HS_ULPI_DIR                                         ,ETH_MII_TXD2                                                                  ,FMC_SDNE0                                  ,                              ,               ,EVENTOUT,ADC123_INP12/ADC123_INN11
+PortC,PC3 ,PWR_SLEEP    ,                                    ,                              ,DFSDM1_DATIN1                                     ,OCTOSPIM_P1_IO6                                                     ,SPI2_MOSI/I2S2_SDO                               ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_IO0                                             ,OTG_HS_ULPI_NXT                                         ,ETH_MII_TX_CLK                                                                ,FMC_SDCKE0                                 ,                              ,               ,EVENTOUT,ADC123_INP13/ADC123_INN12
+PortC,PC4 ,PWR_DEEPSLEEP,FMC_A22                             ,                              ,DFSDM1_CKIN2                                      ,                                                                    ,I2S1_MCK                                         ,                                              ,                                                  ,                                           ,SPDIFRX1_IN3                                                ,SDMMC2_CKIN                                             ,ETH_MII_RXD0/ETH_RMII_RXD0                                                    ,FMC_SDNE0                                  ,                              ,LCD_R7         ,EVENTOUT,ADC12_INP4
+PortC,PC5 ,PWR_SLEEP    ,SAI4_D3                             ,SAI1_D3                       ,DFSDM1_DATIN2                                     ,PSSI_D15                                                            ,                                                 ,                                              ,                                                  ,                                           ,SPDIFRX1_IN4                                                ,OCTOSPIM_P1_DQS                                         ,ETH_MII_RXD1/ETH_RMII_RXD1                                                    ,FMC_SDCKE0                                 ,COMP1_OUT                     ,LCD_DE         ,EVENTOUT,ADC12_INP8/ADC12_INN4
+PortC,PC6 ,             ,                                    ,TIM3_CH1                      ,TIM8_CH1                                          ,DFSDM1_CKIN3                                                        ,I2S2_MCK                                         ,                                              ,USART6_TX                                         ,SDMMC1_D0DIR                               ,FMC_NWAIT                                                   ,SDMMC2_D6                                               ,                                                                              ,SDMMC1_D6                                  ,DCMI_D0/PSSI_D0               ,LCD_HSYNC      ,EVENTOUT,
+PortC,PC7 ,DBTRGIO      ,                                    ,TIM3_CH2                      ,TIM8_CH2                                          ,DFSDM1_DATIN3                                                       ,                                                 ,I2S3_MCK                                      ,USART6_RX                                         ,SDMMC1_D123DIR                             ,FMC_NE1                                                     ,SDMMC2_D7                                               ,SWPMI_TX                                                                      ,SDMMC1_D7                                  ,DCMI_D1/PSSI_D1               ,LCD_G6         ,EVENTOUT,
+PortC,PC8 ,TRACED1      ,                                    ,TIM3_CH3                      ,TIM8_CH3                                          ,                                                                    ,                                                 ,                                              ,USART6_CK                                         ,UART5_RTS/UART5_DE                         ,FMC_NE2/FMC_NCE                                             ,FMC_INT                                                 ,SWPMI_RX                                                                      ,SDMMC1_D0                                  ,DCMI_D2/PSSI_D2               ,               ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                                    ,TIM3_CH4                      ,TIM8_CH4                                          ,I2C3_SDA                                                            ,I2S_CKIN                                         ,I2C5_SDA                                      ,                                                  ,UART5_CTS                                  ,OCTOSPIM_P1_IO0                                             ,LCD_G3                                                  ,SWPMI_SUSPEND                                                                 ,SDMMC1_D1                                  ,DCMI_D3/PSSI_D3               ,LCD_B2         ,EVENTOUT,
+PortC,PC10,             ,                                    ,                              ,DFSDM1_CKIN5                                      ,I2C5_SDA                                                            ,                                                 ,SPI3_SCK/I2S3_CK                              ,USART3_TX                                         ,UART4_TX                                   ,OCTOSPIM_P1_IO1                                             ,LCD_B1                                                  ,SWPMI_RX                                                                      ,SDMMC1_D2                                  ,DCMI_D8/PSSI_D8               ,LCD_R2         ,EVENTOUT,
+PortC,PC11,             ,                                    ,                              ,DFSDM1_DATIN5                                     ,I2C5_SCL                                                            ,                                                 ,SPI3_MISO/I2S3_SDI                            ,USART3_RX                                         ,UART4_RX                                   ,OCTOSPIM_P1_NCS                                             ,                                                        ,                                                                              ,SDMMC1_D3                                  ,DCMI_D4/PSSI_D4               ,LCD_B4         ,EVENTOUT,
+PortC,PC12,TRACED3      ,FMC_D6/FMC_AD6                      ,TIM15_CH1                     ,                                                  ,I2C5_SMBA                                                           ,SPI6_SCK/I2S6_CK                                 ,SPI3_MOSI/I2S3_SDO                            ,USART3_CK                                         ,UART5_TX                                   ,                                                            ,                                                        ,                                                                              ,SDMMC1_CK                                  ,DCMI_D9/PSSI_D9               ,LCD_R6         ,EVENTOUT,
+PortC,PC13,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,EVENTOUT,
+PortC,PC14,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,EVENTOUT,
+PortC,PC15,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,EVENTOUT,
+PortD,PD0 ,             ,                                    ,                              ,DFSDM1_CKIN6                                      ,                                                                    ,                                                 ,                                              ,                                                  ,UART4_RX                                   ,FDCAN1_RX                                                   ,                                                        ,UART9_CTS                                                                     ,FMC_D2/FMC_AD2                             ,                              ,LCD_B1         ,EVENTOUT,
+PortD,PD1 ,             ,                                    ,                              ,DFSDM1_DATIN6                                     ,                                                                    ,                                                 ,                                              ,                                                  ,UART4_TX                                   ,FDCAN1_TX                                                   ,                                                        ,                                                                              ,FMC_D3/FMC_AD3                             ,                              ,               ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,FMC_D7/FMC_AD7                      ,TIM3_ETR                      ,                                                  ,TIM15_BKIN                                                          ,                                                 ,                                              ,                                                  ,UART5_RX                                   ,LCD_B7                                                      ,                                                        ,                                                                              ,SDMMC1_CMD                                 ,DCMI_D11/PSSI_D11             ,LCD_B2         ,EVENTOUT,
+PortD,PD3 ,             ,                                    ,                              ,DFSDM1_CKOUT                                      ,                                                                    ,SPI2_SCK/I2S2_CK                                 ,                                              ,USART2_CTS/USART2_NSS                             ,                                           ,                                                            ,                                                        ,                                                                              ,FMC_CLK                                    ,DCMI_D5/PSSI_D5               ,LCD_G7         ,EVENTOUT,
+PortD,PD4 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,USART2_RTS/USART2_DE                              ,                                           ,                                                            ,OCTOSPIM_P1_IO4                                         ,                                                                              ,FMC_NOE                                    ,                              ,               ,EVENTOUT,
+PortD,PD5 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,USART2_TX                                         ,                                           ,                                                            ,OCTOSPIM_P1_IO5                                         ,                                                                              ,FMC_NWE                                    ,                              ,               ,EVENTOUT,
+PortD,PD6 ,             ,SAI4_D1                             ,SAI1_D1                       ,DFSDM1_CKIN4                                      ,DFSDM1_DATIN1                                                       ,SPI3_MOSI/I2S3_SDO                               ,SAI1_SD_A                                     ,USART2_RX                                         ,SAI4_SD_A                                  ,                                                            ,OCTOSPIM_P1_IO6                                         ,SDMMC2_CK                                                                     ,FMC_NWAIT                                  ,DCMI_D10/PSSI_D10             ,LCD_B2         ,EVENTOUT,
+PortD,PD7 ,             ,                                    ,                              ,DFSDM1_DATIN4                                     ,                                                                    ,SPI1_MOSI/I2S1_SDO                               ,DFSDM1_CKIN1                                  ,USART2_CK                                         ,                                           ,SPDIFRX1_IN1                                                ,OCTOSPIM_P1_IO7                                         ,SDMMC2_CMD                                                                    ,FMC_NE1                                    ,                              ,               ,EVENTOUT,
+PortD,PD8 ,             ,                                    ,                              ,DFSDM1_CKIN3                                      ,                                                                    ,                                                 ,                                              ,USART3_TX                                         ,                                           ,SPDIFRX1_IN2                                                ,                                                        ,                                                                              ,FMC_D13/FMC_AD13                           ,                              ,               ,EVENTOUT,
+PortD,PD9 ,             ,                                    ,                              ,DFSDM1_DATIN3                                     ,                                                                    ,                                                 ,                                              ,USART3_RX                                         ,                                           ,                                                            ,                                                        ,                                                                              ,FMC_D14/FMC_AD14                           ,                              ,               ,EVENTOUT,
+PortD,PD10,             ,                                    ,                              ,DFSDM1_CKOUT                                      ,                                                                    ,                                                 ,                                              ,USART3_CK                                         ,                                           ,                                                            ,                                                        ,                                                                              ,FMC_D15/FMC_AD15                           ,                              ,LCD_B3         ,EVENTOUT,
+PortD,PD11,             ,                                    ,                              ,LPTIM2_IN2                                        ,I2C4_SMBA                                                           ,                                                 ,                                              ,USART3_CTS/USART3_NSS                             ,                                           ,OCTOSPIM_P1_IO0                                             ,SAI4_SD_A                                               ,                                                                              ,FMC_A16/FMC_CLE                            ,                              ,               ,EVENTOUT,
+PortD,PD12,             ,LPTIM1_IN1                          ,TIM4_CH1                      ,LPTIM2_IN1                                        ,I2C4_SCL                                                            ,FDCAN3_RX                                        ,                                              ,USART3_RTS/USART3_DE                              ,                                           ,OCTOSPIM_P1_IO1                                             ,SAI4_FS_A                                               ,                                                                              ,FMC_A17/FMC_ALE                            ,DCMI_D12/PSSI_D12             ,               ,EVENTOUT,
+PortD,PD13,             ,LPTIM1_OUT                          ,TIM4_CH2                      ,                                                  ,I2C4_SDA                                                            ,FDCAN3_TX                                        ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_IO3                                             ,SAI4_SCK_A                                              ,UART9_RTS/UART9_DE                                                            ,FMC_A18                                    ,DCMI_D13/PSSI_D13             ,               ,EVENTOUT,
+PortD,PD14,             ,                                    ,TIM4_CH3                      ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,UART8_CTS                                  ,                                                            ,                                                        ,UART9_RX                                                                      ,FMC_D0/FMC_AD0                             ,                              ,               ,EVENTOUT,
+PortD,PD15,             ,                                    ,TIM4_CH4                      ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,UART8_RTS/UART8_DE                         ,                                                            ,                                                        ,UART9_TX                                                                      ,FMC_D1/FMC_AD1                             ,                              ,               ,EVENTOUT,
+PortE,PE0 ,             ,LPTIM1_ETR                          ,TIM4_ETR                      ,                                                  ,LPTIM2_ETR                                                          ,                                                 ,                                              ,                                                  ,UART8_RX                                   ,                                                            ,SAI4_MCLK_A                                             ,                                                                              ,FMC_NBL0                                   ,DCMI_D2/PSSI_D2               ,LCD_R0         ,EVENTOUT,
+PortE,PE1 ,             ,LPTIM1_IN2                          ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,UART8_TX                                   ,                                                            ,                                                        ,                                                                              ,FMC_NBL1                                   ,DCMI_D3/PSSI_D3               ,LCD_R6         ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                                    ,SAI1_CK1                      ,                                                  ,USART10_RX                                                          ,SPI4_SCK                                         ,SAI1_MCLK_A                                   ,                                                  ,SAI4_MCLK_A                                ,OCTOSPIM_P1_IO2                                             ,SAI4_CK1                                                ,ETH_MII_TXD3                                                                  ,FMC_A23                                    ,                              ,               ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                                    ,                              ,                                                  ,TIM15_BKIN                                                          ,                                                 ,SAI1_SD_B                                     ,                                                  ,SAI4_SD_B                                  ,                                                            ,                                                        ,USART10_TX                                                                    ,FMC_A19                                    ,                              ,               ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                                    ,SAI1_D2                       ,DFSDM1_DATIN3                                     ,TIM15_CH1N                                                          ,SPI4_NSS                                         ,SAI1_FS_A                                     ,                                                  ,SAI4_FS_A                                  ,                                                            ,SAI4_D2                                                 ,                                                                              ,FMC_A20                                    ,DCMI_D4/PSSI_D4               ,LCD_B0         ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                                    ,SAI1_CK2                      ,DFSDM1_CKIN3                                      ,TIM15_CH1                                                           ,SPI4_MISO                                        ,SAI1_SCK_A                                    ,                                                  ,SAI4_SCK_A                                 ,                                                            ,SAI4_CK2                                                ,                                                                              ,FMC_A21                                    ,DCMI_D6/PSSI_D6               ,LCD_G0         ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,TIM1_BKIN2                          ,SAI1_D1                       ,                                                  ,TIM15_CH2                                                           ,SPI4_MOSI                                        ,SAI1_SD_A                                     ,                                                  ,SAI4_SD_A                                  ,SAI4_D1                                                     ,SAI4_MCLK_B                                             ,TIM1_BKIN2_COMP12                                                             ,FMC_A22                                    ,DCMI_D7/PSSI_D7               ,LCD_G1         ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR                            ,                              ,DFSDM1_DATIN2                                     ,                                                                    ,                                                 ,                                              ,UART7_RX                                          ,                                           ,                                                            ,OCTOSPIM_P1_IO4                                         ,                                                                              ,FMC_D4/FMC_AD4                             ,                              ,               ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N                           ,                              ,DFSDM1_CKIN2                                      ,                                                                    ,                                                 ,                                              ,UART7_TX                                          ,                                           ,                                                            ,OCTOSPIM_P1_IO5                                         ,                                                                              ,FMC_D5/FMC_AD5                             ,COMP2_OUT                     ,               ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1                            ,                              ,DFSDM1_CKOUT                                      ,                                                                    ,                                                 ,                                              ,UART7_RTS/UART7_DE                                ,                                           ,                                                            ,OCTOSPIM_P1_IO6                                         ,                                                                              ,FMC_D6/FMC_AD6                             ,                              ,               ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N                           ,                              ,DFSDM1_DATIN4                                     ,                                                                    ,                                                 ,                                              ,UART7_CTS                                         ,                                           ,                                                            ,OCTOSPIM_P1_IO7                                         ,                                                                              ,FMC_D7/FMC_AD7                             ,                              ,               ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2                            ,                              ,DFSDM1_CKIN4                                      ,                                                                    ,SPI4_NSS                                         ,                                              ,                                                  ,                                           ,                                                            ,SAI4_SD_B                                               ,OCTOSPIM_P1_NCS                                                               ,FMC_D8/FMC_AD8                             ,                              ,LCD_G3         ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N                           ,                              ,DFSDM1_DATIN5                                     ,                                                                    ,SPI4_SCK                                         ,                                              ,                                                  ,                                           ,                                                            ,SAI4_SCK_B                                              ,                                                                              ,FMC_D9/FMC_AD9                             ,COMP1_OUT                     ,LCD_B4         ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3                            ,                              ,DFSDM1_CKIN5                                      ,                                                                    ,SPI4_MISO                                        ,                                              ,                                                  ,                                           ,                                                            ,SAI4_FS_B                                               ,                                                                              ,FMC_D10/FMC_AD10                           ,COMP2_OUT                     ,LCD_DE         ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4                            ,                              ,                                                  ,                                                                    ,SPI4_MOSI                                        ,                                              ,                                                  ,                                           ,                                                            ,SAI4_MCLK_B                                             ,                                                                              ,FMC_D11/FMC_AD11                           ,                              ,LCD_CLK        ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN                           ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,USART10_CK                                                                    ,FMC_D12/FMC_AD12                           ,TIM1_BKIN_COMP12              ,LCD_R7         ,EVENTOUT,
+PortF,PF0 ,             ,                                    ,                              ,                                                  ,I2C2_SDA                                                            ,                                                 ,I2C5_SDA                                      ,                                                  ,                                           ,OCTOSPIM_P2_IO0                                             ,                                                        ,                                                                              ,FMC_A0                                     ,TIM23_CH1                     ,               ,EVENTOUT,
+PortF,PF1 ,             ,                                    ,                              ,                                                  ,I2C2_SCL                                                            ,                                                 ,I2C5_SCL                                      ,                                                  ,                                           ,OCTOSPIM_P2_IO1                                             ,                                                        ,                                                                              ,FMC_A1                                     ,TIM23_CH2                     ,               ,EVENTOUT,
+PortF,PF2 ,             ,                                    ,                              ,                                                  ,I2C2_SMBA                                                           ,                                                 ,I2C5_SMBA                                     ,                                                  ,                                           ,OCTOSPIM_P2_IO2                                             ,                                                        ,                                                                              ,FMC_A2                                     ,TIM23_CH3                     ,               ,EVENTOUT,
+PortF,PF3 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,OCTOSPIM_P2_IO3                                             ,                                                        ,                                                                              ,FMC_A3                                     ,TIM23_CH4                     ,               ,EVENTOUT,ADC3_INP5
+PortF,PF4 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,OCTOSPIM_P2_CLK                                             ,                                                        ,                                                                              ,FMC_A4                                     ,                              ,               ,EVENTOUT,ADC3_INP9/ADC3_INN5
+PortF,PF5 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,OCTOSPIM_P2_NCLK                                            ,                                                        ,                                                                              ,FMC_A5                                     ,                              ,               ,EVENTOUT,ADC3_INP4
+PortF,PF6 ,             ,TIM16_CH1                           ,FDCAN3_RX                     ,                                                  ,                                                                    ,SPI5_NSS                                         ,SAI1_SD_B                                     ,UART7_RX                                          ,SAI4_SD_B                                  ,                                                            ,OCTOSPIM_P1_IO3                                         ,                                                                              ,                                           ,TIM23_CH1                     ,               ,EVENTOUT,ADC3_INP8/ADC3_INN4
+PortF,PF7 ,             ,TIM17_CH1                           ,FDCAN3_TX                     ,                                                  ,                                                                    ,SPI5_SCK                                         ,SAI1_MCLK_B                                   ,UART7_TX                                          ,SAI4_MCLK_B                                ,                                                            ,OCTOSPIM_P1_IO2                                         ,                                                                              ,                                           ,TIM23_CH2                     ,               ,EVENTOUT,ADC3_INP3
+PortF,PF8 ,             ,TIM16_CH1N                          ,                              ,                                                  ,                                                                    ,SPI5_MISO                                        ,SAI1_SCK_B                                    ,UART7_RTS/UART7_DE                                ,SAI4_SCK_B                                 ,TIM13_CH1                                                   ,OCTOSPIM_P1_IO0                                         ,                                                                              ,                                           ,TIM23_CH3                     ,               ,EVENTOUT,ADC3_INP7/ADC3_INN3
+PortF,PF9 ,             ,TIM17_CH1N                          ,                              ,                                                  ,                                                                    ,SPI5_MOSI                                        ,SAI1_FS_B                                     ,UART7_CTS                                         ,SAI4_FS_B                                  ,TIM14_CH1                                                   ,OCTOSPIM_P1_IO1                                         ,                                                                              ,                                           ,TIM23_CH4                     ,               ,EVENTOUT,ADC3_INP2
+PortF,PF10,             ,TIM16_BKIN                          ,SAI1_D3                       ,                                                  ,PSSI_D15                                                            ,                                                 ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_CLK                                             ,SAI4_D3                                                 ,                                                                              ,                                           ,DCMI_D11/PSSI_D11             ,LCD_DE         ,EVENTOUT,ADC3_INP6/ADC3_INN2
+PortF,PF11,             ,                                    ,                              ,                                                  ,                                                                    ,SPI5_MOSI                                        ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_NCLK                                            ,SAI4_SD_B                                               ,                                                                              ,FMC_NRAS                                   ,DCMI_D12/PSSI_D12             ,TIM24_CH1      ,EVENTOUT,ADC1_INP2
+PortF,PF12,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,OCTOSPIM_P2_DQS                                             ,                                                        ,                                                                              ,FMC_A6                                     ,                              ,TIM24_CH2      ,EVENTOUT,ADC1_INP5/ADC1_INN2
+PortF,PF13,             ,                                    ,                              ,DFSDM1_DATIN6                                     ,I2C4_SMBA                                                           ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,FMC_A7                                     ,                              ,TIM24_CH3      ,EVENTOUT,ADC2_INP2
+PortF,PF14,             ,                                    ,                              ,DFSDM1_CKIN6                                      ,I2C4_SCL                                                            ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,FMC_A8                                     ,                              ,TIM24_CH4      ,EVENTOUT,ADC2_INP6/ADC2_INN2
+PortF,PF15,             ,                                    ,                              ,                                                  ,I2C4_SDA                                                            ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,FMC_A9                                     ,                              ,               ,EVENTOUT,
+PortG,PG0 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,OCTOSPIM_P2_IO4                                             ,                                                        ,UART9_RX                                                                      ,FMC_A10                                    ,                              ,               ,EVENTOUT,
+PortG,PG1 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,OCTOSPIM_P2_IO5                                             ,                                                        ,UART9_TX                                                                      ,FMC_A11                                    ,                              ,               ,EVENTOUT,
+PortG,PG2 ,             ,                                    ,                              ,TIM8_BKIN                                         ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,TIM8_BKIN_COMP12                                                              ,FMC_A12                                    ,                              ,TIM24_ETR      ,EVENTOUT,
+PortG,PG3 ,             ,                                    ,                              ,TIM8_BKIN2                                        ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,TIM8_BKIN2_COMP12                                                             ,FMC_A13                                    ,TIM23_ETR                     ,               ,EVENTOUT,
+PortG,PG4 ,             ,TIM1_BKIN2                          ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,TIM1_BKIN2_COMP12                                                             ,FMC_A14/FMC_BA0                            ,                              ,               ,EVENTOUT,
+PortG,PG5 ,             ,TIM1_ETR                            ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,FMC_A15/FMC_BA1                            ,                              ,               ,EVENTOUT,
+PortG,PG6 ,             ,TIM17_BKIN                          ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,OCTOSPIM_P1_NCS                                         ,                                                                              ,FMC_NE3                                    ,DCMI_D12/PSSI_D12             ,LCD_R7         ,EVENTOUT,
+PortG,PG7 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,SAI1_MCLK_A                                   ,USART6_CK                                         ,                                           ,OCTOSPIM_P2_DQS                                             ,                                                        ,                                                                              ,FMC_INT                                    ,DCMI_D13/PSSI_D13             ,LCD_CLK        ,EVENTOUT,
+PortG,PG8 ,             ,                                    ,                              ,TIM8_ETR                                          ,                                                                    ,SPI6_NSS/I2S6_WS                                 ,                                              ,USART6_RTS/USART6_DE                              ,SPDIFRX1_IN3                               ,                                                            ,                                                        ,ETH_PPS_OUT                                                                   ,FMC_SDCLK                                  ,                              ,LCD_G7         ,EVENTOUT,
+PortG,PG9 ,             ,                                    ,FDCAN3_TX                     ,                                                  ,                                                                    ,SPI1_MISO/I2S1_SDI                               ,                                              ,USART6_RX                                         ,SPDIFRX1_IN4                               ,OCTOSPIM_P1_IO6                                             ,SAI4_FS_B                                               ,SDMMC2_D0                                                                     ,FMC_NE2/FMC_NCE                            ,DCMI_VSYNC/PSSI_RDY           ,               ,EVENTOUT,
+PortG,PG10,             ,                                    ,FDCAN3_RX                     ,OCTOSPIM_P2_IO6                                   ,                                                                    ,SPI1_NSS/I2S1_WS                                 ,                                              ,                                                  ,                                           ,LCD_G3                                                      ,SAI4_SD_B                                               ,SDMMC2_D1                                                                     ,FMC_NE3                                    ,DCMI_D2/PSSI_D2               ,LCD_B2         ,EVENTOUT,
+PortG,PG11,             ,LPTIM1_IN2                          ,                              ,                                                  ,USART10_RX                                                          ,SPI1_SCK/I2S1_CK                                 ,                                              ,                                                  ,SPDIFRX1_IN1                               ,OCTOSPIM_P2_IO7                                             ,SDMMC2_D2                                               ,ETH_MII_TX_EN/ETH_RMII_TX_EN                                                  ,                                           ,DCMI_D3/PSSI_D3               ,LCD_B3         ,EVENTOUT,
+PortG,PG12,             ,LPTIM1_IN1                          ,                              ,OCTOSPIM_P2_NCS                                   ,USART10_TX                                                          ,SPI6_MISO/I2S6_SDI                               ,                                              ,USART6_RTS/USART6_DE                              ,SPDIFRX1_IN2                               ,LCD_B4                                                      ,SDMMC2_D3                                               ,ETH_MII_TXD1/ETH_RMII_TXD1                                                    ,FMC_NE4                                    ,TIM23_CH1                     ,LCD_B1         ,EVENTOUT,
+PortG,PG13,TRACED0      ,LPTIM1_OUT                          ,                              ,                                                  ,USART10_CTS/USART10_NSS                                             ,SPI6_SCK/I2S6_CK                                 ,                                              ,USART6_CTS/USART6_NSS                             ,                                           ,                                                            ,SDMMC2_D6                                               ,ETH_MII_TXD0/ETH_RMII_TXD0                                                    ,FMC_A24                                    ,TIM23_CH2                     ,LCD_R0         ,EVENTOUT,
+PortG,PG14,TRACED1      ,LPTIM1_ETR                          ,                              ,                                                  ,USART10_RTS/USART10_DE                                              ,SPI6_MOSI/I2S6_SDO                               ,                                              ,USART6_TX                                         ,                                           ,OCTOSPIM_P1_IO7                                             ,SDMMC2_D7                                               ,ETH_MII_TXD1/ETH_RMII_TXD1                                                    ,FMC_A25                                    ,TIM23_CH3                     ,LCD_B0         ,EVENTOUT,
+PortG,PG15,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,USART6_CTS/USART6_NSS                             ,                                           ,OCTOSPIM_P2_DQS                                             ,                                                        ,USART10_CK                                                                    ,FMC_NCAS                                   ,DCMI_D13/PSSI_D13             ,               ,EVENTOUT,
+PortH,PH0 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,EVENTOUT,
+PortH,PH1 ,             ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h743_af.csv b/ports/stm32/boards/stm32h743_af.csv
index 4b8ef6afdd69a..2287209c49001 100644
--- a/ports/stm32/boards/stm32h743_af.csv
+++ b/ports/stm32/boards/stm32h743_af.csv
@@ -1,170 +1,170 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS,TIM1/2/16/17/LPTIM1/HRTIM1,SAI1/TIM3/4/5/12/HRTIM1,LPUART/TIM8/LPTIM2/3/4/5/HRTIM1/DFSDM,I2C1/2/3/4/USART1/TIM15/LPTIM2/DFSDM/CEC,SPI1/2/3/4/5/6/CEC,SPI2/3/SAI1/3/I2C4/UART4/DFSDM,SPI2/3/6/USART1/2/3/6/UART7/SDMMC1,SPI6/SAI2/4/UART4/5/8/LPUART/SDMMC1/SPDIFRX,SAI4/FDCAN1/2/TIM13/14/QUADSPI/FMC/SDMMC2/LCD/SPDIFRX,SAI2/4/TIM8/QUADSPI/SDMMC2/OTG1_HS/OTG2_FS/LCD,I2C4/UART7/SWPMI1/TIM1/8/DFSDM/SDMMC2/MDIOS/ETH,TIM1/8/FMC/SDMMC1/MDIOS/OTG1_FS/LCD,TIM1/DCMI/LCD/COMP,UART5/LCD,SYS,ADC
-PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,TIM15_BKIN,,,USART2_CTS/USART2_NSS,UART4_TX,SDMMC2_CMD,SAI2_SD_B,ETH_MII_CRS,,,,EVENTOUT,ADC1_INP16/ADC12_INN1/ADC12_INP0
-PortA,PA1,,TIM2_CH2,TIM5_CH2,LPTIM3_OUT,TIM15_CH1N,,,USART2_RTS,UART4_RX,QUADSPI_BK1_IO3,SAI2_MCK_B,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,LCD_R2,EVENTOUT,ADC1_INN16/ADC1_INP17/ADC12_INP1
-PortA,PA2,,TIM2_CH3,TIM5_CH3,LPTIM4_OUT,TIM15_CH1,,,USART2_TX,SAI2_SCK_B,,,ETH_MDIO,MDIOS_MDIO,,LCD_R1,EVENTOUT,ADC12_INP14
-PortA,PA3,,TIM2_CH4,TIM5_CH4,LPTIM5_OUT,TIM15_CH2,,,USART2_RX,,LCD_B2,OTG_HS_ULPI_D0,ETH_MII_COL,,,LCD_B5,EVENTOUT,ADC12_INP15
-PortA,PA4,,,TIM5_ETR,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,SPI6_NSS,,,,OTG_HS_SOF,DCMI_HSYNC,LCD_VSYNC,EVENTOUT,ADC12_INP18
-PortA,PA5,,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,SPI6_SCK,,OTG_HS_ULPI_CK,,,,LCD_R4,EVENTOUT,ADC12_INN18/ADC12_INP19
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO/I2S1_SDI,,,SPI6_MISO,TIM13_CH1,TIM8_BKIN_COMP12,MDIOS_MDC,TIM1_BKIN_COMP12,DCMI_PIXCLK,LCD_G2,EVENTOUT,ADC12_INP3
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SDO,,,SPI6_MOSI,TIM14_CH1,,ETH_MII_RX_DV/ETH_RMII_CRS_DV,FMC_SDNWE,,,EVENTOUT,ADC12_INN3/ADC12_INP7
-PortA,PA8,MCO1,TIM1_CH1,HRTIM_CHB2,TIM8_BKIN2,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,UART7_RX,TIM8_BKIN2_COMP12,LCD_B3,LCD_R6,EVENTOUT,
-PortA,PA9,,TIM1_CH2,HRTIM_CHC1,LPUART1_TX,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,CAN1_RXFD,,ETH_TX_ER,,DCMI_D0,LCD_R5,EVENTOUT,
-PortA,PA10,,TIM1_CH3,HRTIM_CHC2,LPUART1_RX,,,,USART1_RX,,CAN1_TXFD,OTG_FS_ID,MDIOS_MDIO,LCD_B4,DCMI_D1,LCD_B1,EVENTOUT,
-PortA,PA11,,TIM1_CH4,HRTIM_CHD1,LPUART1_CTS,,SPI2_NSS/I2S2_WS,UART4_RX,USART1_CTS/USART1_NSS,,CAN1_RX,OTG_FS_DM,,,,LCD_R4,EVENTOUT,
-PortA,PA12,,TIM1_ETR,HRTIM_CHD2,LPUART1_RTS,,SPI2_SCK/I2S2_CK,UART4_TX,USART1_RTS,SAI2_FS_B,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,HRTIM_FLT1,,HDMI_CEC,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,SPI6_NSS,UART4_RTS,,,UART7_TX,,,,EVENTOUT,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,DFSDM_CKOUT,,UART4_CTS,LCD_R3,OTG_HS_ULPI_D1,ETH_MII_RXD2,,,LCD_G1,EVENTOUT,ADC12_INN5/ADC12_INP9
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,DFSDM_DATIN1,,,LCD_R6,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,LCD_G0,EVENTOUT,ADC12_INP5
-PortB,PB2,,,SAI1_D1,,DFSDM_CKIN1,,SAI1_SD_A,SPI3_MOSI/I2S3_SDO,SAI4_SD_A,QUADSPI_CLK,SAI4_D1,ETH_TX_ER,,,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,HRTIM_FLT4,,,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,,SPI6_SCK,SDMMC2_D2,,UART7_RX,,,,EVENTOUT,
-PortB,PB4,NJTRST,TIM16_BKIN,TIM3_CH1,HRTIM_EEV6,,SPI1_MISO/I2S1_SDI,SPI3_MISO/I2S3_SDI,SPI2_NSS/I2S2_WS,SPI6_MISO,SDMMC2_D3,,UART7_TX,,,,EVENTOUT,
-PortB,PB5,,TIM17_BKIN,TIM3_CH2,HRTIM_EEV7,I2C1_SMBA,SPI1_MOSI/I2S1_SDO,I2C4_SMBA,SPI3_MOSI/I2S3_SDO,SPI6_MOSI,CAN2_RX,OTG_HS_ULPI_D7,ETH_PPS_OUT,FMC_SDCKE1,DCMI_D10,UART5_RX,EVENTOUT,
-PortB,PB6,,TIM16_CH1N,TIM4_CH1,HRTIM_EEV8,I2C1_SCL,HDMI_CEC,I2C4_SCL,USART1_TX,LPUART1_TX,CAN2_TX,QUADSPI_BK1_NCS,DFSDM_DATIN5,FMC_SDNE1,DCMI_D5,UART5_TX,EVENTOUT,
-PortB,PB7,,TIM17_CH1N,TIM4_CH2,HRTIM_EEV9,I2C1_SDA,,I2C4_SDA,USART1_RX,LPUART1_RX,CAN2_TXFD,,DFSDM_CKIN5,FMC_NL,DCMI_VSYNC,,EVENTOUT,
-PortB,PB8,,TIM16_CH1,TIM4_CH3,DFSDM_CKIN7,I2C1_SCL,,I2C4_SCL,SDMMC1_CKIN,UART4_RX,CAN1_RX,SDMMC2_D4,ETH_MII_TXD3,SDMMC1_D4,DCMI_D6,LCD_B6,EVENTOUT,
-PortB,PB9,,TIM17_CH1,TIM4_CH4,DFSDM_DATIN7,I2C1_SDA,SPI2_NSS/I2S2_WS,I2C4_SDA,SDMMC1_CDIR,UART4_TX,CAN1_TX,SDMMC2_D5,I2C4_SMBA,SDMMC1_D5,DCMI_D7,LCD_B7,EVENTOUT,
-PortB,PB10,,TIM2_CH3,HRTIM_SCOUT,LPTIM2_IN1,I2C2_SCL,SPI2_SCK/I2S2_CK,DFSDM_DATIN7,USART3_TX,,QUADSPI_BK1_NCS,OTG_HS_ULPI_D3,ETH_MII_RX_ER,,,LCD_G4,EVENTOUT,
-PortB,PB11,,TIM2_CH4,HRTIM_SCIN,LPTIM2_ETR,I2C2_SDA,,DFSDM_CKIN7,USART3_RX,,,OTG_HS_ULPI_D4,ETH_MII_TX_EN/ETH_RMII_TX_EN,,,LCD_G5,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,DFSDM_DATIN1,USART3_CK,,CAN2_RX,OTG_HS_ULPI_D5,ETH_MII_TXD0/ETH_RMII_TXD0,OTG_HS_ID,TIM1_BKIN_COMP12,UART5_RX,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,LPTIM2_OUT,,SPI2_SCK/I2S2_CK,DFSDM_CKIN1,USART3_CTS/USART3_NSS,,CAN2_TX,OTG_HS_ULPI_D6,ETH_MII_TXD1/ETH_RMII_TXD1,,,UART5_TX,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,TIM12_CH1,TIM8_CH2N,USART1_TX,SPI2_MISO/I2S2_SDI,DFSDM_DATIN2,USART3_RTS,UART4_RTS,SDMMC2_D0,,,OTG_HS_DM,,,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,TIM12_CH2,TIM8_CH3N,USART1_RX,SPI2_MOSI/I2S2_SDO,DFSDM_CKIN2,,UART4_CTS,SDMMC2_D1,,,OTG_HS_DP,,,EVENTOUT,
-PortC,PC0,,,,DFSDM_CKIN0,,,DFSDM_DATIN4,,SAI2_FS_B,,OTG_HS_ULPI_STP,,FMC_SDNWE,,LCD_R5,EVENTOUT,ADC123_INP10
-PortC,PC1,TRACED0,,SAI1_D1,DFSDM_DATIN0,DFSDM_CKIN4,SPI2_MOSI/I2S2_SDO,SAI1_SD_A,,SAI4_SD_A,SDMMC2_CK,SAI4_D1,ETH_MDC,MDIOS_MDC,,,EVENTOUT,ADC123_INN10/ADC123_INP11
-PortC,PC2,,,,DFSDM_CKIN1,,SPI2_MISO/I2S2_SDI,DFSDM_CKOUT,,,,OTG_HS_ULPI_DIR,ETH_MII_TXD2,FMC_SDNE0,,,EVENTOUT,ADC123_INN11/ADC123_INP12/ADC3_INN1/ADC3_INP0
-PortC,PC3,,,,DFSDM_DATIN1,,SPI2_MOSI/I2S2_SDO,,,,,OTG_HS_ULPI_NXT,ETH_MII_TX_CLK,FMC_SDCKE0,,,EVENTOUT,ADC12_INN12/ADC12_INP13/ADC3_INP1
-PortC,PC4,,,,DFSDM_CKIN2,,I2S1_MCK,,,,SPDIFRX_IN2,,ETH_MII_RXD0/ETH_RMII_RXD0,FMC_SDNE0,,,EVENTOUT,ADC12_INP4
-PortC,PC5,,,SAI1_D3,DFSDM_DATIN2,,,,,,SPDIFRX_IN3,SAI4_D3,ETH_MII_RXD1/ETH_RMII_RXD1,FMC_SDCKE0,COMP_1_OUT,,EVENTOUT,ADC12_INN4/ADC12_INP8
-PortC,PC6,,HRTIM_CHA1,TIM3_CH1,TIM8_CH1,DFSDM_CKIN3,I2S2_MCK,,USART6_TX,SDMMC1_D0DIR,FMC_NWAIT,SDMMC2_D6,,SDMMC1_D6,DCMI_D0,LCD_HSYNC,EVENTOUT,
-PortC,PC7,TRGIO,HRTIM_CHA2,TIM3_CH2,TIM8_CH2,DFSDM_DATIN3,,I2S3_MCK,USART6_RX,SDMMC1_D123DIR,FMC_NE1,SDMMC2_D7,SWPMI_TX,SDMMC1_D7,DCMI_D1,LCD_G6,EVENTOUT,
-PortC,PC8,TRACED1,HRTIM_CHB1,TIM3_CH3,TIM8_CH3,,,,USART6_CK,UART5_RTS,FMC_NE2/FMC_NCE,,SWPMI_RX,SDMMC1_D0,DCMI_D2,,EVENTOUT,
-PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,,UART5_CTS,QUADSPI_BK1_IO0,LCD_G3,SWPMI_SUSPEND,SDMMC1_D1,DCMI_D3,LCD_B2,EVENTOUT,
-PortC,PC10,,,HRTIM_EEV1,DFSDM_CKIN5,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,QUADSPI_BK1_IO1,,,SDMMC1_D2,DCMI_D8,LCD_R2,EVENTOUT,
-PortC,PC11,,,HRTIM_FLT2,DFSDM_DATIN5,,,SPI3_MISO/I2S3_SDI,USART3_RX,UART4_RX,QUADSPI_BK2_NCS,,,SDMMC1_D3,DCMI_D4,,EVENTOUT,
-PortC,PC12,TRACED3,,HRTIM_EEV2,,,,SPI3_MOSI/I2S3_SDO,USART3_CK,UART5_TX,,,,SDMMC1_CK,DCMI_D9,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,DFSDM_CKIN6,,,SAI3_SCK_A,,UART4_RX,CAN1_RX,,,FMC_D2/FMC_DA2,,,EVENTOUT,
-PortD,PD1,,,,DFSDM_DATIN6,,,SAI3_SD_A,,UART4_TX,CAN1_TX,,,FMC_D3/FMC_DA3,,,EVENTOUT,
-PortD,PD2,TRACED2,,TIM3_ETR,,,,,,UART5_RX,,,,SDMMC1_CMD,DCMI_D11,,EVENTOUT,
-PortD,PD3,,,,DFSDM_CKOUT,,SPI2_SCK/I2S2_CK,,USART2_CTS/USART2_NSS,,,,,FMC_CLK,DCMI_D5,LCD_G7,EVENTOUT,
-PortD,PD4,,,HRTIM_FLT3,,,,SAI3_FS_A,USART2_RTS,,CAN1_RXFD,,,FMC_NOE,,,EVENTOUT,
-PortD,PD5,,,HRTIM_EEV3,,,,,USART2_TX,,CAN1_TXFD,,,FMC_NWE,,,EVENTOUT,
-PortD,PD6,,,SAI1_D1,DFSDM_CKIN4,DFSDM_DATIN1,SPI3_MOSI/I2S3_SDO,SAI1_SD_A,USART2_RX,SAI4_SD_A,CAN2_RXFD,SAI4_D1,SDMMC2_CK,FMC_NWAIT,DCMI_D10,LCD_B2,EVENTOUT,
-PortD,PD7,,,,DFSDM_DATIN4,,SPI1_MOSI/I2S1_SDO,DFSDM_CKIN1,USART2_CK,,SPDIFRX_IN0,,SDMMC2_CMD,FMC_NE1,,,EVENTOUT,
-PortD,PD8,,,,DFSDM_CKIN3,,,SAI3_SCK_B,USART3_TX,,SPDIFRX_IN1,,,FMC_D13/FMC_DA13,,,EVENTOUT,
-PortD,PD9,,,,DFSDM_DATIN3,,,SAI3_SD_B,USART3_RX,,CAN2_RXFD,,,FMC_D14/FMC_DA14,,,EVENTOUT,
-PortD,PD10,,,,DFSDM_CKOUT,,,SAI3_FS_B,USART3_CK,,CAN2_TXFD,,,FMC_D15/FMC_DA15,,LCD_B3,EVENTOUT,
-PortD,PD11,,,,LPTIM2_IN2,I2C4_SMBA,,,USART3_CTS/USART3_NSS,,QUADSPI_BK1_IO0,SAI2_SD_A,,FMC_A16,,,EVENTOUT,
-PortD,PD12,,LPTIM1_IN1,TIM4_CH1,LPTIM2_IN1,I2C4_SCL,,,USART3_RTS,,QUADSPI_BK1_IO1,SAI2_FS_A,,FMC_A17,,,EVENTOUT,
-PortD,PD13,,LPTIM1_OUT,TIM4_CH2,,I2C4_SDA,,,,,QUADSPI_BK1_IO3,SAI2_SCK_A,,FMC_A18,,,EVENTOUT,
-PortD,PD14,,,TIM4_CH3,,,,SAI3_MCLK_B,,UART8_CTS,,,,FMC_D0/FMC_DA0,,,EVENTOUT,
-PortD,PD15,,,TIM4_CH4,,,,SAI3_MCLK_A,,UART8_RTS,,,,FMC_D1/FMC_DA1,,,EVENTOUT,
-PortE,PE0,,LPTIM1_ETR,TIM4_ETR,HRTIM_SCIN,LPTIM2_ETR,,,,UART8_RX,CAN1_RXFD,SAI2_MCK_A,,FMC_NBL0,DCMI_D2,,EVENTOUT,
-PortE,PE1,,LPTIM1_IN2,,HRTIM_SCOUT,,,,,UART8_TX,CAN1_TXFD,,,FMC_NBL1,DCMI_D3,,EVENTOUT,
-PortE,PE2,TRACECLK,,SAI1_CK1,,,SPI4_SCK,SAI1_MCLK_A,,SAI4_MCLK_A,QUADSPI_BK1_IO2,SAI4_CK1,ETH_MII_TXD3,FMC_A23,,,EVENTOUT,
-PortE,PE3,TRACED0,,,,TIM15_BKIN,,SAI1_SD_B,,SAI4_SD_B,,,,FMC_A19,,,EVENTOUT,
-PortE,PE4,TRACED1,,SAI1_D2,DFSDM_DATIN3,TIM15_CH1N,SPI4_NSS,SAI1_FS_A,,SAI4_FS_A,,SAI4_D2,,FMC_A20,DCMI_D4,LCD_B0,EVENTOUT,
-PortE,PE5,TRACED2,,SAI1_CK2,DFSDM_CKIN3,TIM15_CH1,SPI4_MISO,SAI1_SCK_A,,SAI4_SCK_A,,SAI4_CK2,,FMC_A21,DCMI_D6,LCD_G0,EVENTOUT,
-PortE,PE6,TRACED3,TIM1_BKIN2,SAI1_D1,,TIM15_CH2,SPI4_MOSI,SAI1_SD_A,,SAI4_SD_A,SAI4_D1,SAI2_MCK_B,TIM1_BKIN2_COMP12,FMC_A22,DCMI_D7,LCD_G1,EVENTOUT,
-PortE,PE7,,TIM1_ETR,,DFSDM_DATIN2,,,,UART7_RX,,,QUADSPI_BK2_IO0,,FMC_D4/FMC_DA4,,,EVENTOUT,
-PortE,PE8,,TIM1_CH1N,,DFSDM_CKIN2,,,,UART7_TX,,,QUADSPI_BK2_IO1,,FMC_D5/FMC_DA5,COMP_2_OUT,,EVENTOUT,
-PortE,PE9,,TIM1_CH1,,DFSDM_CKOUT,,,,UART7_RTS,,,QUADSPI_BK2_IO2,,FMC_D6/FMC_DA6,,,EVENTOUT,
-PortE,PE10,,TIM1_CH2N,,DFSDM_DATIN4,,,,UART7_CTS,,,QUADSPI_BK2_IO3,,FMC_D7/FMC_DA7,,,EVENTOUT,
-PortE,PE11,,TIM1_CH2,,DFSDM_CKIN4,,SPI4_NSS,,,,,SAI2_SD_B,,FMC_D8/FMC_DA8,,LCD_G3,EVENTOUT,
-PortE,PE12,,TIM1_CH3N,,DFSDM_DATIN5,,SPI4_SCK,,,,,SAI2_SCK_B,,FMC_D9/FMC_DA9,COMP_1_OUT,LCD_B4,EVENTOUT,
-PortE,PE13,,TIM1_CH3,,DFSDM_CKIN5,,SPI4_MISO,,,,,SAI2_FS_B,,FMC_D10/FMC_DA10,COMP_2_OUT,LCD_DE,EVENTOUT,
-PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI2_MCK_B,,FMC_D11/FMC_DA11,,LCD_CLK,EVENTOUT,
-PortE,PE15,,TIM1_BKIN,,,,HDMI__TIM1_BKIN,,,,,,,FMC_D12/FMC_DA12,TIM1_BKIN_COMP12,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_INP5
-PortF,PF4,,,,,,,,,,,,,FMC_A4,,,EVENTOUT,ADC3_INN5/ADC3_INP9
-PortF,PF5,,,,,,,,,,,,,FMC_A5,,,EVENTOUT,ADC3_INP4
-PortF,PF6,,TIM16_CH1,,,,SPI5_NSS,SAI1_SD_B,UART7_RX,SAI4_SD_B,QUADSPI_BK1_IO3,,,,,,EVENTOUT,ADC3_INN4/ADC3_INP8
-PortF,PF7,,TIM17_CH1,,,,SPI5_SCK,SAI1_MCLK_B,UART7_TX,SAI4_MCLK_B,QUADSPI_BK1_IO2,,,,,,EVENTOUT,ADC3_INP3
-PortF,PF8,,TIM16_CH1N,,,,SPI5_MISO,SAI1_SCK_B,UART7_RTS,SAI4_SCK_B,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,ADC3_INN3/ADC3_INP7
-PortF,PF9,,TIM17_CH1N,,,,SPI5_MOSI,SAI1_FS_B,UART7_CTS,SAI4_FS_B,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,ADC3_INP2
-PortF,PF10,,TIM16_BKIN,SAI1_D3,,,,,,,QUADSPI_CLK,SAI4_D3,,,DCMI_D11,LCD_DE,EVENTOUT,ADC3_INN2/ADC3_INP6
-PortF,PF11,,,,,,SPI5_MOSI,,,,,SAI2_SD_B,,FMC_SDNRAS,DCMI_D12,,EVENTOUT,ADC1_INP2
-PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,ADC1_INN2/ADC1_INP6
-PortF,PF13,,,,DFSDM_DATIN6,I2C4_SMBA,,,,,,,,FMC_A7,,,EVENTOUT,ADC2_INP2
-PortF,PF14,,,,DFSDM_CKIN6,I2C4_SCL,,,,,,,,FMC_A8,,,EVENTOUT,ADC2_INN2/ADC2_INP6
-PortF,PF15,,,,,I2C4_SDA,,,,,,,,FMC_A9,,,EVENTOUT,
-PortG,PG0,,,,,,,,,,,,,FMC_A10,,,EVENTOUT,
-PortG,PG1,,,,,,,,,,,,,FMC_A11,,,EVENTOUT,
-PortG,PG2,,,,TIM8_BKIN,,,,,,,,TIM8_BKIN_COMP12,FMC_A12,,,EVENTOUT,
-PortG,PG3,,,,TIM8_BKIN2,,,,,,,,TIM8_BKIN2_COMP12,FMC_A13,,,EVENTOUT,
-PortG,PG4,,TIM1_BKIN2,,,,,,,,,,TIM1_BKIN2_COMP12,FMC_A14/FMC_BA0,,,EVENTOUT,
-PortG,PG5,,TIM1_ETR,,,,,,,,,,,FMC_A15/FMC_BA1,,,EVENTOUT,
-PortG,PG6,,TIM17_BKIN,HRTIM_CHE1,,,,,,,,QUADSPI_BK1_NCS,,FMC_NE3,DCMI_D12,LCD_R7,EVENTOUT,
-PortG,PG7,,,HRTIM_CHE2,,,,SAI1_MCLK_A,USART6_CK,,,,,FMC_INT,DCMI_D13,LCD_CLK,EVENTOUT,
-PortG,PG8,,,,TIM8_ETR,,SPI6_NSS,,USART6_RTS,SPDIFRX_IN2,,,ETH_PPS_OUT,FMC_SDCLK,,LCD_G7,EVENTOUT,
-PortG,PG9,,,,,,SPI1_MISO/I2S1_SDI,,USART6_RX,SPDIFRX_IN3,QUADSPI_BK2_IO2,SAI2_FS_B,,FMC_NE2/FMC_NCE,DCMI_VSYNC,,EVENTOUT,
-PortG,PG10,,,HRTIM_FLT5,,,SPI1_NSS/I2S1_WS,,,,LCD_G3,SAI2_SD_B,,FMC_NE3,DCMI_D2,LCD_B2,EVENTOUT,
-PortG,PG11,,,HRTIM_EEV4,,,SPI1_SCK/I2S1_CK,,,SPDIFRX_IN0,,SDMMC2_D2,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DCMI_D3,LCD_B3,EVENTOUT,
-PortG,PG12,,LPTIM1_IN1,HRTIM_EEV5,,,SPI6_MISO,,USART6_RTS,SPDIFRX_IN1,LCD_B4,,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_NE4,,LCD_B1,EVENTOUT,
-PortG,PG13,TRACED0,LPTIM1_OUT,HRTIM_EEV10,,,SPI6_SCK,,USART6_CTS/USART6_NSS,,,,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,,LCD_R0,EVENTOUT,
-PortG,PG14,TRACED1,LPTIM1_ETR,,,,SPI6_MOSI,,USART6_TX,,QUADSPI_BK2_IO3,,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_A25,,LCD_B0,EVENTOUT,
-PortG,PG15,,,,,,,,USART6_CTS/USART6_NSS,,,,,FMC_SDNCAS,DCMI_D13,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH2,,LPTIM1_IN2,,,,,,,,QUADSPI_BK2_IO0,SAI2_SCK_B,ETH_MII_CRS,FMC_SDCKE0,,LCD_R0,EVENTOUT,ADC3_INP13
-PortH,PH3,,,,,,,,,,QUADSPI_BK2_IO1,SAI2_MCK_B,ETH_MII_COL,FMC_SDNE0,,LCD_R1,EVENTOUT,ADC3_INN13/ADC3_INP14
-PortH,PH4,,,,,I2C2_SCL,,,,,LCD_G5,OTG_HS_ULPI_NXT,,,,LCD_G4,EVENTOUT,ADC3_INN14/ADC3_INP15
-PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,,,,,,FMC_SDNWE,,,EVENTOUT,ADC3_INN15/ADC3_INP16
-PortH,PH6,,,TIM12_CH1,,I2C2_SMBA,SPI5_SCK,,,,,,ETH_MII_RXD2,FMC_SDNE1,DCMI_D8,,EVENTOUT,
-PortH,PH7,,,,,I2C3_SCL,SPI5_MISO,,,,,,ETH_MII_RXD3,FMC_SDCKE1,DCMI_D9,,EVENTOUT,
-PortH,PH8,,,TIM5_ETR,,I2C3_SDA,,,,,,,,FMC_D16,DCMI_HSYNC,LCD_R2,EVENTOUT,
-PortH,PH9,,,TIM12_CH2,,I2C3_SMBA,,,,,,,,FMC_D17,DCMI_D0,LCD_R3,EVENTOUT,
-PortH,PH10,,,TIM5_CH1,,I2C4_SMBA,,,,,,,,FMC_D18,DCMI_D1,LCD_R4,EVENTOUT,
-PortH,PH11,,,TIM5_CH2,,I2C4_SCL,,,,,,,,FMC_D19,DCMI_D2,LCD_R5,EVENTOUT,
-PortH,PH12,,,TIM5_CH3,,I2C4_SDA,,,,,,,,FMC_D20,DCMI_D3,LCD_R6,EVENTOUT,
-PortH,PH13,,,,TIM8_CH1N,,,,,UART4_TX,CAN1_TX,,,FMC_D21,,LCD_G2,EVENTOUT,
-PortH,PH14,,,,TIM8_CH2N,,,,,UART4_RX,CAN1_RX,,,FMC_D22,DCMI_D4,LCD_G3,EVENTOUT,
-PortH,PH15,,,,TIM8_CH3N,,,,,,CAN1_TXFD,,,FMC_D23,DCMI_D11,LCD_G4,EVENTOUT,
-PortI,PI0,,,TIM5_CH4,,,SPI2_NSS/I2S2_WS,,,,CAN1_RXFD,,,FMC_D24,DCMI_D13,LCD_G5,EVENTOUT,
-PortI,PI1,,,,TIM8_BKIN2,,SPI2_SCK/I2S2_CK,,,,,,TIM8_BKIN2_COMP12,FMC_D25,DCMI_D8,LCD_G6,EVENTOUT,
-PortI,PI2,,,,TIM8_CH4,,SPI2_MISO/I2S2_SDI,,,,,,,FMC_D26,DCMI_D9,LCD_G7,EVENTOUT,
-PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SDO,,,,,,,FMC_D27,DCMI_D10,,EVENTOUT,
-PortI,PI4,,,,TIM8_BKIN,,,,,,,SAI2_MCK_A,TIM8_BKIN_COMP12,FMC_NBL2,DCMI_D5,LCD_B4,EVENTOUT,
-PortI,PI5,,,,TIM8_CH1,,,,,,,SAI2_SCK_A,,FMC_NBL3,DCMI_VSYNC,LCD_B5,EVENTOUT,
-PortI,PI6,,,,TIM8_CH2,,,,,,,SAI2_SD_A,,FMC_D28,DCMI_D6,LCD_B6,EVENTOUT,
-PortI,PI7,,,,TIM8_CH3,,,,,,,SAI2_FS_A,,FMC_D29,DCMI_D7,LCD_B7,EVENTOUT,
-PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT,
-PortI,PI9,,,,,,,,,UART4_RX,CAN1_RX,,,FMC_D30,,LCD_VSYNC,EVENTOUT,
-PortI,PI10,,,,,,,,,,CAN1_RXFD,,ETH_MII_RX_ER,FMC_D31,,LCD_HSYNC,EVENTOUT,
-PortI,PI11,,,,,,,,,,LCD_G6,OTG_HS_ULPI_DIR,,,,,EVENTOUT,
-PortI,PI12,,,,,,,,,,,,ETH_TX_ER,,,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,,,,,,,,,,,,,,,LCD_R3,EVENTOUT,
-PortJ,PJ3,,,,,,,,,,,,,,,LCD_R4,EVENTOUT,
-PortJ,PJ4,,,,,,,,,,,,,,,LCD_R5,EVENTOUT,
-PortJ,PJ5,,,,,,,,,,,,,,,LCD_R6,EVENTOUT,
-PortJ,PJ6,,,,TIM8_CH2,,,,,,,,,,,LCD_R7,EVENTOUT,
-PortJ,PJ7,TRGIN,,,TIM8_CH2N,,,,,,,,,,,LCD_G0,EVENTOUT,
-PortJ,PJ8,,TIM1_CH3N,,TIM8_CH1,,,,,UART8_TX,,,,,,LCD_G1,EVENTOUT,
-PortJ,PJ9,,TIM1_CH3,,TIM8_CH1N,,,,,UART8_RX,,,,,,LCD_G2,EVENTOUT,
-PortJ,PJ10,,TIM1_CH2N,,TIM8_CH2,,SPI5_MOSI,,,,,,,,,LCD_G3,EVENTOUT,
-PortJ,PJ11,,TIM1_CH2,,TIM8_CH2N,,SPI5_MISO,,,,,,,,,LCD_G4,EVENTOUT,
-PortJ,PJ12,TRGOUT,,,,,,,,,LCD_G3,,,,,LCD_B0,EVENTOUT,
-PortJ,PJ13,,,,,,,,,,LCD_B4,,,,,LCD_B1,EVENTOUT,
-PortJ,PJ14,,,,,,,,,,,,,,,LCD_B2,EVENTOUT,
-PortJ,PJ15,,,,,,,,,,,,,,,LCD_B3,EVENTOUT,
-PortK,PK0,,TIM1_CH1N,,TIM8_CH3,,SPI5_SCK,,,,,,,,,LCD_G5,EVENTOUT,
-PortK,PK1,,TIM1_CH1,,TIM8_CH3N,,SPI5_NSS,,,,,,,,,LCD_G6,EVENTOUT,
-PortK,PK2,,TIM1_BKIN,,TIM8_BKIN,,,,,,,TIM8_BKIN_COMP12,TIM1_BKIN_COMP12,,,LCD_G7,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,
+Port ,Pin ,AF0          ,AF1                       ,AF2                    ,AF3                                  ,AF4                                     ,AF5               ,AF6                           ,AF7                               ,AF8                                        ,AF9                                                  ,AF10                                          ,AF11                                           ,AF12                               ,AF13              ,AF14     ,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2/16/17/LPTIM1/HRTIM1,SAI1/TIM3/4/5/12/HRTIM1,LPUART/TIM8/LPTIM2/3/4/5/HRTIM1/DFSDM,I2C1/2/3/4/USART1/TIM15/LPTIM2/DFSDM/CEC,SPI1/2/3/4/5/6/CEC,SPI2/3/SAI1/3/I2C4/UART4/DFSDM,SPI2/3/6/USART1/2/3/6/UART7/SDMMC1,SPI6/SAI2/4/UART4/5/8/LPUART/SDMMC1/SPDIFRX,SAI4/FDCAN1/2/TIM13/14/QUADSPI/FMC/SDMMC2/LCD/SPDIFRX,SAI2/4/TIM8/QUADSPI/SDMMC2/OTG1_HS/OTG2_FS/LCD,I2C4/UART7/SWPMI1/TIM1/8/DFSDM/SDMMC2/MDIOS/ETH,TIM1/8/FMC/SDMMC1/MDIOS/OTG1_FS/LCD,TIM1/DCMI/LCD/COMP,UART5/LCD,SYS     ,ADC
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR         ,TIM5_CH1               ,TIM8_ETR                             ,TIM15_BKIN                              ,                  ,                              ,USART2_CTS/USART2_NSS             ,UART4_TX                                   ,SDMMC2_CMD                                           ,SAI2_SD_B                                     ,ETH_MII_CRS                                    ,                                   ,                  ,         ,EVENTOUT,ADC1_INP16/ADC12_INN1/ADC12_INP0
+PortA,PA1 ,             ,TIM2_CH2                  ,TIM5_CH2               ,LPTIM3_OUT                           ,TIM15_CH1N                              ,                  ,                              ,USART2_RTS                        ,UART4_RX                                   ,QUADSPI_BK1_IO3                                      ,SAI2_MCK_B                                    ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK                ,                                   ,                  ,LCD_R2   ,EVENTOUT,ADC1_INN16/ADC1_INP17/ADC12_INP1
+PortA,PA2 ,             ,TIM2_CH3                  ,TIM5_CH3               ,LPTIM4_OUT                           ,TIM15_CH1                               ,                  ,                              ,USART2_TX                         ,SAI2_SCK_B                                 ,                                                     ,                                              ,ETH_MDIO                                       ,MDIOS_MDIO                         ,                  ,LCD_R1   ,EVENTOUT,ADC12_INP14
+PortA,PA3 ,             ,TIM2_CH4                  ,TIM5_CH4               ,LPTIM5_OUT                           ,TIM15_CH2                               ,                  ,                              ,USART2_RX                         ,                                           ,LCD_B2                                               ,OTG_HS_ULPI_D0                                ,ETH_MII_COL                                    ,                                   ,                  ,LCD_B5   ,EVENTOUT,ADC12_INP15
+PortA,PA4 ,             ,                          ,TIM5_ETR               ,                                     ,                                        ,SPI1_NSS/I2S1_WS  ,SPI3_NSS/I2S3_WS              ,USART2_CK                         ,SPI6_NSS                                   ,                                                     ,                                              ,                                               ,OTG_HS_SOF                         ,DCMI_HSYNC        ,LCD_VSYNC,EVENTOUT,ADC12_INP18
+PortA,PA5 ,             ,TIM2_CH1/TIM2_ETR         ,                       ,TIM8_CH1N                            ,                                        ,SPI1_SCK/I2S1_CK  ,                              ,                                  ,SPI6_SCK                                   ,                                                     ,OTG_HS_ULPI_CK                                ,                                               ,                                   ,                  ,LCD_R4   ,EVENTOUT,ADC12_INN18/ADC12_INP19
+PortA,PA6 ,             ,TIM1_BKIN                 ,TIM3_CH1               ,TIM8_BKIN                            ,                                        ,SPI1_MISO/I2S1_SDI,                              ,                                  ,SPI6_MISO                                  ,TIM13_CH1                                            ,TIM8_BKIN_COMP12                              ,MDIOS_MDC                                      ,TIM1_BKIN_COMP12                   ,DCMI_PIXCLK       ,LCD_G2   ,EVENTOUT,ADC12_INP3
+PortA,PA7 ,             ,TIM1_CH1N                 ,TIM3_CH2               ,TIM8_CH1N                            ,                                        ,SPI1_MOSI/I2S1_SDO,                              ,                                  ,SPI6_MOSI                                  ,TIM14_CH1                                            ,                                              ,ETH_MII_RX_DV/ETH_RMII_CRS_DV                  ,FMC_SDNWE                          ,                  ,         ,EVENTOUT,ADC12_INN3/ADC12_INP7
+PortA,PA8 ,MCO1         ,TIM1_CH1                  ,HRTIM_CHB2             ,TIM8_BKIN2                           ,I2C3_SCL                                ,                  ,                              ,USART1_CK                         ,                                           ,                                                     ,OTG_FS_SOF                                    ,UART7_RX                                       ,TIM8_BKIN2_COMP12                  ,LCD_B3            ,LCD_R6   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2                  ,HRTIM_CHC1             ,LPUART1_TX                           ,I2C3_SMBA                               ,SPI2_SCK/I2S2_CK  ,                              ,USART1_TX                         ,                                           ,CAN1_RXFD                                            ,                                              ,ETH_TX_ER                                      ,                                   ,DCMI_D0           ,LCD_R5   ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3                  ,HRTIM_CHC2             ,LPUART1_RX                           ,                                        ,                  ,                              ,USART1_RX                         ,                                           ,CAN1_TXFD                                            ,OTG_FS_ID                                     ,MDIOS_MDIO                                     ,LCD_B4                             ,DCMI_D1           ,LCD_B1   ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4                  ,HRTIM_CHD1             ,LPUART1_CTS                          ,                                        ,SPI2_NSS/I2S2_WS  ,UART4_RX                      ,USART1_CTS/USART1_NSS             ,                                           ,CAN1_RX                                              ,OTG_FS_DM                                     ,                                               ,                                   ,                  ,LCD_R4   ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR                  ,HRTIM_CHD2             ,LPUART1_RTS                          ,                                        ,SPI2_SCK/I2S2_CK  ,UART4_TX                      ,USART1_RTS                        ,SAI2_FS_B                                  ,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         ,HRTIM_FLT1             ,                                     ,HDMI_CEC                                ,SPI1_NSS/I2S1_WS  ,SPI3_NSS/I2S3_WS              ,SPI6_NSS                          ,UART4_RTS                                  ,                                                     ,                                              ,UART7_TX                                       ,                                   ,                  ,         ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N                 ,TIM3_CH3               ,TIM8_CH2N                            ,                                        ,                  ,DFSDM_CKOUT                   ,                                  ,UART4_CTS                                  ,LCD_R3                                               ,OTG_HS_ULPI_D1                                ,ETH_MII_RXD2                                   ,                                   ,                  ,LCD_G1   ,EVENTOUT,ADC12_INN5/ADC12_INP9
+PortB,PB1 ,             ,TIM1_CH3N                 ,TIM3_CH4               ,TIM8_CH3N                            ,                                        ,                  ,DFSDM_DATIN1                  ,                                  ,                                           ,LCD_R6                                               ,OTG_HS_ULPI_D2                                ,ETH_MII_RXD3                                   ,                                   ,                  ,LCD_G0   ,EVENTOUT,ADC12_INP5
+PortB,PB2 ,             ,                          ,SAI1_D1                ,                                     ,DFSDM_CKIN1                             ,                  ,SAI1_SD_A                     ,SPI3_MOSI/I2S3_SDO                ,SAI4_SD_A                                  ,QUADSPI_CLK                                          ,SAI4_D1                                       ,ETH_TX_ER                                      ,                                   ,                  ,         ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2                  ,HRTIM_FLT4             ,                                     ,                                        ,SPI1_SCK/I2S1_CK  ,SPI3_SCK/I2S3_CK              ,                                  ,SPI6_SCK                                   ,SDMMC2_D2                                            ,                                              ,UART7_RX                                       ,                                   ,                  ,         ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,TIM16_BKIN                ,TIM3_CH1               ,HRTIM_EEV6                           ,                                        ,SPI1_MISO/I2S1_SDI,SPI3_MISO/I2S3_SDI            ,SPI2_NSS/I2S2_WS                  ,SPI6_MISO                                  ,SDMMC2_D3                                            ,                                              ,UART7_TX                                       ,                                   ,                  ,         ,EVENTOUT,
+PortB,PB5 ,             ,TIM17_BKIN                ,TIM3_CH2               ,HRTIM_EEV7                           ,I2C1_SMBA                               ,SPI1_MOSI/I2S1_SDO,I2C4_SMBA                     ,SPI3_MOSI/I2S3_SDO                ,SPI6_MOSI                                  ,CAN2_RX                                              ,OTG_HS_ULPI_D7                                ,ETH_PPS_OUT                                    ,FMC_SDCKE1                         ,DCMI_D10          ,UART5_RX ,EVENTOUT,
+PortB,PB6 ,             ,TIM16_CH1N                ,TIM4_CH1               ,HRTIM_EEV8                           ,I2C1_SCL                                ,HDMI_CEC          ,I2C4_SCL                      ,USART1_TX                         ,LPUART1_TX                                 ,CAN2_TX                                              ,QUADSPI_BK1_NCS                               ,DFSDM_DATIN5                                   ,FMC_SDNE1                          ,DCMI_D5           ,UART5_TX ,EVENTOUT,
+PortB,PB7 ,             ,TIM17_CH1N                ,TIM4_CH2               ,HRTIM_EEV9                           ,I2C1_SDA                                ,                  ,I2C4_SDA                      ,USART1_RX                         ,LPUART1_RX                                 ,CAN2_TXFD                                            ,                                              ,DFSDM_CKIN5                                    ,FMC_NL                             ,DCMI_VSYNC        ,         ,EVENTOUT,
+PortB,PB8 ,             ,TIM16_CH1                 ,TIM4_CH3               ,DFSDM_CKIN7                          ,I2C1_SCL                                ,                  ,I2C4_SCL                      ,SDMMC1_CKIN                       ,UART4_RX                                   ,CAN1_RX                                              ,SDMMC2_D4                                     ,ETH_MII_TXD3                                   ,SDMMC1_D4                          ,DCMI_D6           ,LCD_B6   ,EVENTOUT,
+PortB,PB9 ,             ,TIM17_CH1                 ,TIM4_CH4               ,DFSDM_DATIN7                         ,I2C1_SDA                                ,SPI2_NSS/I2S2_WS  ,I2C4_SDA                      ,SDMMC1_CDIR                       ,UART4_TX                                   ,CAN1_TX                                              ,SDMMC2_D5                                     ,I2C4_SMBA                                      ,SDMMC1_D5                          ,DCMI_D7           ,LCD_B7   ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3                  ,HRTIM_SCOUT            ,LPTIM2_IN1                           ,I2C2_SCL                                ,SPI2_SCK/I2S2_CK  ,DFSDM_DATIN7                  ,USART3_TX                         ,                                           ,QUADSPI_BK1_NCS                                      ,OTG_HS_ULPI_D3                                ,ETH_MII_RX_ER                                  ,                                   ,                  ,LCD_G4   ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4                  ,HRTIM_SCIN             ,LPTIM2_ETR                           ,I2C2_SDA                                ,                  ,DFSDM_CKIN7                   ,USART3_RX                         ,                                           ,                                                     ,OTG_HS_ULPI_D4                                ,ETH_MII_TX_EN/ETH_RMII_TX_EN                   ,                                   ,                  ,LCD_G5   ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN                 ,                       ,                                     ,I2C2_SMBA                               ,SPI2_NSS/I2S2_WS  ,DFSDM_DATIN1                  ,USART3_CK                         ,                                           ,CAN2_RX                                              ,OTG_HS_ULPI_D5                                ,ETH_MII_TXD0/ETH_RMII_TXD0                     ,OTG_HS_ID                          ,TIM1_BKIN_COMP12  ,UART5_RX ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N                 ,                       ,LPTIM2_OUT                           ,                                        ,SPI2_SCK/I2S2_CK  ,DFSDM_CKIN1                   ,USART3_CTS/USART3_NSS             ,                                           ,CAN2_TX                                              ,OTG_HS_ULPI_D6                                ,ETH_MII_TXD1/ETH_RMII_TXD1                     ,                                   ,                  ,UART5_TX ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N                 ,TIM12_CH1              ,TIM8_CH2N                            ,USART1_TX                               ,SPI2_MISO/I2S2_SDI,DFSDM_DATIN2                  ,USART3_RTS                        ,UART4_RTS                                  ,SDMMC2_D0                                            ,                                              ,                                               ,OTG_HS_DM                          ,                  ,         ,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N                 ,TIM12_CH2              ,TIM8_CH3N                            ,USART1_RX                               ,SPI2_MOSI/I2S2_SDO,DFSDM_CKIN2                   ,                                  ,UART4_CTS                                  ,SDMMC2_D1                                            ,                                              ,                                               ,OTG_HS_DP                          ,                  ,         ,EVENTOUT,
+PortC,PC0 ,             ,                          ,                       ,DFSDM_CKIN0                          ,                                        ,                  ,DFSDM_DATIN4                  ,                                  ,SAI2_FS_B                                  ,                                                     ,OTG_HS_ULPI_STP                               ,                                               ,FMC_SDNWE                          ,                  ,LCD_R5   ,EVENTOUT,ADC123_INP10
+PortC,PC1 ,TRACED0      ,                          ,SAI1_D1                ,DFSDM_DATIN0                         ,DFSDM_CKIN4                             ,SPI2_MOSI/I2S2_SDO,SAI1_SD_A                     ,                                  ,SAI4_SD_A                                  ,SDMMC2_CK                                            ,SAI4_D1                                       ,ETH_MDC                                        ,MDIOS_MDC                          ,                  ,         ,EVENTOUT,ADC123_INN10/ADC123_INP11
+PortC,PC2 ,             ,                          ,                       ,DFSDM_CKIN1                          ,                                        ,SPI2_MISO/I2S2_SDI,DFSDM_CKOUT                   ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_DIR                               ,ETH_MII_TXD2                                   ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC123_INN11/ADC123_INP12/ADC3_INN1/ADC3_INP0
+PortC,PC3 ,             ,                          ,                       ,DFSDM_DATIN1                         ,                                        ,SPI2_MOSI/I2S2_SDO,                              ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_NXT                               ,ETH_MII_TX_CLK                                 ,FMC_SDCKE0                         ,                  ,         ,EVENTOUT,ADC12_INN12/ADC12_INP13/ADC3_INP1
+PortC,PC4 ,             ,                          ,                       ,DFSDM_CKIN2                          ,                                        ,I2S1_MCK          ,                              ,                                  ,                                           ,SPDIFRX_IN2                                          ,                                              ,ETH_MII_RXD0/ETH_RMII_RXD0                     ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC12_INP4
+PortC,PC5 ,             ,                          ,SAI1_D3                ,DFSDM_DATIN2                         ,                                        ,                  ,                              ,                                  ,                                           ,SPDIFRX_IN3                                          ,SAI4_D3                                       ,ETH_MII_RXD1/ETH_RMII_RXD1                     ,FMC_SDCKE0                         ,COMP_1_OUT        ,         ,EVENTOUT,ADC12_INN4/ADC12_INP8
+PortC,PC6 ,             ,HRTIM_CHA1                ,TIM3_CH1               ,TIM8_CH1                             ,DFSDM_CKIN3                             ,I2S2_MCK          ,                              ,USART6_TX                         ,SDMMC1_D0DIR                               ,FMC_NWAIT                                            ,SDMMC2_D6                                     ,                                               ,SDMMC1_D6                          ,DCMI_D0           ,LCD_HSYNC,EVENTOUT,
+PortC,PC7 ,TRGIO        ,HRTIM_CHA2                ,TIM3_CH2               ,TIM8_CH2                             ,DFSDM_DATIN3                            ,                  ,I2S3_MCK                      ,USART6_RX                         ,SDMMC1_D123DIR                             ,FMC_NE1                                              ,SDMMC2_D7                                     ,SWPMI_TX                                       ,SDMMC1_D7                          ,DCMI_D1           ,LCD_G6   ,EVENTOUT,
+PortC,PC8 ,TRACED1      ,HRTIM_CHB1                ,TIM3_CH3               ,TIM8_CH3                             ,                                        ,                  ,                              ,USART6_CK                         ,UART5_RTS                                  ,FMC_NE2/FMC_NCE                                      ,                                              ,SWPMI_RX                                       ,SDMMC1_D0                          ,DCMI_D2           ,         ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                          ,TIM3_CH4               ,TIM8_CH4                             ,I2C3_SDA                                ,I2S_CKIN          ,                              ,                                  ,UART5_CTS                                  ,QUADSPI_BK1_IO0                                      ,LCD_G3                                        ,SWPMI_SUSPEND                                  ,SDMMC1_D1                          ,DCMI_D3           ,LCD_B2   ,EVENTOUT,
+PortC,PC10,             ,                          ,HRTIM_EEV1             ,DFSDM_CKIN5                          ,                                        ,                  ,SPI3_SCK/I2S3_CK              ,USART3_TX                         ,UART4_TX                                   ,QUADSPI_BK1_IO1                                      ,                                              ,                                               ,SDMMC1_D2                          ,DCMI_D8           ,LCD_R2   ,EVENTOUT,
+PortC,PC11,             ,                          ,HRTIM_FLT2             ,DFSDM_DATIN5                         ,                                        ,                  ,SPI3_MISO/I2S3_SDI            ,USART3_RX                         ,UART4_RX                                   ,QUADSPI_BK2_NCS                                      ,                                              ,                                               ,SDMMC1_D3                          ,DCMI_D4           ,         ,EVENTOUT,
+PortC,PC12,TRACED3      ,                          ,HRTIM_EEV2             ,                                     ,                                        ,                  ,SPI3_MOSI/I2S3_SDO            ,USART3_CK                         ,UART5_TX                                   ,                                                     ,                                              ,                                               ,SDMMC1_CK                          ,DCMI_D9           ,         ,EVENTOUT,
+PortC,PC13,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,
+PortC,PC14,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,
+PortC,PC15,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,
+PortD,PD0 ,             ,                          ,                       ,DFSDM_CKIN6                          ,                                        ,                  ,SAI3_SCK_A                    ,                                  ,UART4_RX                                   ,CAN1_RX                                              ,                                              ,                                               ,FMC_D2/FMC_DA2                     ,                  ,         ,EVENTOUT,
+PortD,PD1 ,             ,                          ,                       ,DFSDM_DATIN6                         ,                                        ,                  ,SAI3_SD_A                     ,                                  ,UART4_TX                                   ,CAN1_TX                                              ,                                              ,                                               ,FMC_D3/FMC_DA3                     ,                  ,         ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,                          ,TIM3_ETR               ,                                     ,                                        ,                  ,                              ,                                  ,UART5_RX                                   ,                                                     ,                                              ,                                               ,SDMMC1_CMD                         ,DCMI_D11          ,         ,EVENTOUT,
+PortD,PD3 ,             ,                          ,                       ,DFSDM_CKOUT                          ,                                        ,SPI2_SCK/I2S2_CK  ,                              ,USART2_CTS/USART2_NSS             ,                                           ,                                                     ,                                              ,                                               ,FMC_CLK                            ,DCMI_D5           ,LCD_G7   ,EVENTOUT,
+PortD,PD4 ,             ,                          ,HRTIM_FLT3             ,                                     ,                                        ,                  ,SAI3_FS_A                     ,USART2_RTS                        ,                                           ,CAN1_RXFD                                            ,                                              ,                                               ,FMC_NOE                            ,                  ,         ,EVENTOUT,
+PortD,PD5 ,             ,                          ,HRTIM_EEV3             ,                                     ,                                        ,                  ,                              ,USART2_TX                         ,                                           ,CAN1_TXFD                                            ,                                              ,                                               ,FMC_NWE                            ,                  ,         ,EVENTOUT,
+PortD,PD6 ,             ,                          ,SAI1_D1                ,DFSDM_CKIN4                          ,DFSDM_DATIN1                            ,SPI3_MOSI/I2S3_SDO,SAI1_SD_A                     ,USART2_RX                         ,SAI4_SD_A                                  ,CAN2_RXFD                                            ,SAI4_D1                                       ,SDMMC2_CK                                      ,FMC_NWAIT                          ,DCMI_D10          ,LCD_B2   ,EVENTOUT,
+PortD,PD7 ,             ,                          ,                       ,DFSDM_DATIN4                         ,                                        ,SPI1_MOSI/I2S1_SDO,DFSDM_CKIN1                   ,USART2_CK                         ,                                           ,SPDIFRX_IN0                                          ,                                              ,SDMMC2_CMD                                     ,FMC_NE1                            ,                  ,         ,EVENTOUT,
+PortD,PD8 ,             ,                          ,                       ,DFSDM_CKIN3                          ,                                        ,                  ,SAI3_SCK_B                    ,USART3_TX                         ,                                           ,SPDIFRX_IN1                                          ,                                              ,                                               ,FMC_D13/FMC_DA13                   ,                  ,         ,EVENTOUT,
+PortD,PD9 ,             ,                          ,                       ,DFSDM_DATIN3                         ,                                        ,                  ,SAI3_SD_B                     ,USART3_RX                         ,                                           ,CAN2_RXFD                                            ,                                              ,                                               ,FMC_D14/FMC_DA14                   ,                  ,         ,EVENTOUT,
+PortD,PD10,             ,                          ,                       ,DFSDM_CKOUT                          ,                                        ,                  ,SAI3_FS_B                     ,USART3_CK                         ,                                           ,CAN2_TXFD                                            ,                                              ,                                               ,FMC_D15/FMC_DA15                   ,                  ,LCD_B3   ,EVENTOUT,
+PortD,PD11,             ,                          ,                       ,LPTIM2_IN2                           ,I2C4_SMBA                               ,                  ,                              ,USART3_CTS/USART3_NSS             ,                                           ,QUADSPI_BK1_IO0                                      ,SAI2_SD_A                                     ,                                               ,FMC_A16                            ,                  ,         ,EVENTOUT,
+PortD,PD12,             ,LPTIM1_IN1                ,TIM4_CH1               ,LPTIM2_IN1                           ,I2C4_SCL                                ,                  ,                              ,USART3_RTS                        ,                                           ,QUADSPI_BK1_IO1                                      ,SAI2_FS_A                                     ,                                               ,FMC_A17                            ,                  ,         ,EVENTOUT,
+PortD,PD13,             ,LPTIM1_OUT                ,TIM4_CH2               ,                                     ,I2C4_SDA                                ,                  ,                              ,                                  ,                                           ,QUADSPI_BK1_IO3                                      ,SAI2_SCK_A                                    ,                                               ,FMC_A18                            ,                  ,         ,EVENTOUT,
+PortD,PD14,             ,                          ,TIM4_CH3               ,                                     ,                                        ,                  ,SAI3_MCLK_B                   ,                                  ,UART8_CTS                                  ,                                                     ,                                              ,                                               ,FMC_D0/FMC_DA0                     ,                  ,         ,EVENTOUT,
+PortD,PD15,             ,                          ,TIM4_CH4               ,                                     ,                                        ,                  ,SAI3_MCLK_A                   ,                                  ,UART8_RTS                                  ,                                                     ,                                              ,                                               ,FMC_D1/FMC_DA1                     ,                  ,         ,EVENTOUT,
+PortE,PE0 ,             ,LPTIM1_ETR                ,TIM4_ETR               ,HRTIM_SCIN                           ,LPTIM2_ETR                              ,                  ,                              ,                                  ,UART8_RX                                   ,CAN1_RXFD                                            ,SAI2_MCK_A                                    ,                                               ,FMC_NBL0                           ,DCMI_D2           ,         ,EVENTOUT,
+PortE,PE1 ,             ,LPTIM1_IN2                ,                       ,HRTIM_SCOUT                          ,                                        ,                  ,                              ,                                  ,UART8_TX                                   ,CAN1_TXFD                                            ,                                              ,                                               ,FMC_NBL1                           ,DCMI_D3           ,         ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                          ,SAI1_CK1               ,                                     ,                                        ,SPI4_SCK          ,SAI1_MCLK_A                   ,                                  ,SAI4_MCLK_A                                ,QUADSPI_BK1_IO2                                      ,SAI4_CK1                                      ,ETH_MII_TXD3                                   ,FMC_A23                            ,                  ,         ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                          ,                       ,                                     ,TIM15_BKIN                              ,                  ,SAI1_SD_B                     ,                                  ,SAI4_SD_B                                  ,                                                     ,                                              ,                                               ,FMC_A19                            ,                  ,         ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                          ,SAI1_D2                ,DFSDM_DATIN3                         ,TIM15_CH1N                              ,SPI4_NSS          ,SAI1_FS_A                     ,                                  ,SAI4_FS_A                                  ,                                                     ,SAI4_D2                                       ,                                               ,FMC_A20                            ,DCMI_D4           ,LCD_B0   ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                          ,SAI1_CK2               ,DFSDM_CKIN3                          ,TIM15_CH1                               ,SPI4_MISO         ,SAI1_SCK_A                    ,                                  ,SAI4_SCK_A                                 ,                                                     ,SAI4_CK2                                      ,                                               ,FMC_A21                            ,DCMI_D6           ,LCD_G0   ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,TIM1_BKIN2                ,SAI1_D1                ,                                     ,TIM15_CH2                               ,SPI4_MOSI         ,SAI1_SD_A                     ,                                  ,SAI4_SD_A                                  ,SAI4_D1                                              ,SAI2_MCK_B                                    ,TIM1_BKIN2_COMP12                              ,FMC_A22                            ,DCMI_D7           ,LCD_G1   ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR                  ,                       ,DFSDM_DATIN2                         ,                                        ,                  ,                              ,UART7_RX                          ,                                           ,                                                     ,QUADSPI_BK2_IO0                               ,                                               ,FMC_D4/FMC_DA4                     ,                  ,         ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N                 ,                       ,DFSDM_CKIN2                          ,                                        ,                  ,                              ,UART7_TX                          ,                                           ,                                                     ,QUADSPI_BK2_IO1                               ,                                               ,FMC_D5/FMC_DA5                     ,COMP_2_OUT        ,         ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1                  ,                       ,DFSDM_CKOUT                          ,                                        ,                  ,                              ,UART7_RTS                         ,                                           ,                                                     ,QUADSPI_BK2_IO2                               ,                                               ,FMC_D6/FMC_DA6                     ,                  ,         ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N                 ,                       ,DFSDM_DATIN4                         ,                                        ,                  ,                              ,UART7_CTS                         ,                                           ,                                                     ,QUADSPI_BK2_IO3                               ,                                               ,FMC_D7/FMC_DA7                     ,                  ,         ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2                  ,                       ,DFSDM_CKIN4                          ,                                        ,SPI4_NSS          ,                              ,                                  ,                                           ,                                                     ,SAI2_SD_B                                     ,                                               ,FMC_D8/FMC_DA8                     ,                  ,LCD_G3   ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N                 ,                       ,DFSDM_DATIN5                         ,                                        ,SPI4_SCK          ,                              ,                                  ,                                           ,                                                     ,SAI2_SCK_B                                    ,                                               ,FMC_D9/FMC_DA9                     ,COMP_1_OUT        ,LCD_B4   ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3                  ,                       ,DFSDM_CKIN5                          ,                                        ,SPI4_MISO         ,                              ,                                  ,                                           ,                                                     ,SAI2_FS_B                                     ,                                               ,FMC_D10/FMC_DA10                   ,COMP_2_OUT        ,LCD_DE   ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4                  ,                       ,                                     ,                                        ,SPI4_MOSI         ,                              ,                                  ,                                           ,                                                     ,SAI2_MCK_B                                    ,                                               ,FMC_D11/FMC_DA11                   ,                  ,LCD_CLK  ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN                 ,                       ,                                     ,                                        ,HDMI__TIM1_BKIN   ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D12/FMC_DA12                   ,TIM1_BKIN_COMP12  ,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_INP5
+PortF,PF4 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A4                             ,                  ,         ,EVENTOUT,ADC3_INN5/ADC3_INP9
+PortF,PF5 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A5                             ,                  ,         ,EVENTOUT,ADC3_INP4
+PortF,PF6 ,             ,TIM16_CH1                 ,                       ,                                     ,                                        ,SPI5_NSS          ,SAI1_SD_B                     ,UART7_RX                          ,SAI4_SD_B                                  ,QUADSPI_BK1_IO3                                      ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,ADC3_INN4/ADC3_INP8
+PortF,PF7 ,             ,TIM17_CH1                 ,                       ,                                     ,                                        ,SPI5_SCK          ,SAI1_MCLK_B                   ,UART7_TX                          ,SAI4_MCLK_B                                ,QUADSPI_BK1_IO2                                      ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,ADC3_INP3
+PortF,PF8 ,             ,TIM16_CH1N                ,                       ,                                     ,                                        ,SPI5_MISO         ,SAI1_SCK_B                    ,UART7_RTS                         ,SAI4_SCK_B                                 ,TIM13_CH1                                            ,QUADSPI_BK1_IO0                               ,                                               ,                                   ,                  ,         ,EVENTOUT,ADC3_INN3/ADC3_INP7
+PortF,PF9 ,             ,TIM17_CH1N                ,                       ,                                     ,                                        ,SPI5_MOSI         ,SAI1_FS_B                     ,UART7_CTS                         ,SAI4_FS_B                                  ,TIM14_CH1                                            ,QUADSPI_BK1_IO1                               ,                                               ,                                   ,                  ,         ,EVENTOUT,ADC3_INP2
+PortF,PF10,             ,TIM16_BKIN                ,SAI1_D3                ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,QUADSPI_CLK                                          ,SAI4_D3                                       ,                                               ,                                   ,DCMI_D11          ,LCD_DE   ,EVENTOUT,ADC3_INN2/ADC3_INP6
+PortF,PF11,             ,                          ,                       ,                                     ,                                        ,SPI5_MOSI         ,                              ,                                  ,                                           ,                                                     ,SAI2_SD_B                                     ,                                               ,FMC_SDNRAS                         ,DCMI_D12          ,         ,EVENTOUT,ADC1_INP2
+PortF,PF12,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A6                             ,                  ,         ,EVENTOUT,ADC1_INN2/ADC1_INP6
+PortF,PF13,             ,                          ,                       ,DFSDM_DATIN6                         ,I2C4_SMBA                               ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A7                             ,                  ,         ,EVENTOUT,ADC2_INP2
+PortF,PF14,             ,                          ,                       ,DFSDM_CKIN6                          ,I2C4_SCL                                ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A8                             ,                  ,         ,EVENTOUT,ADC2_INN2/ADC2_INP6
+PortF,PF15,             ,                          ,                       ,                                     ,I2C4_SDA                                ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A9                             ,                  ,         ,EVENTOUT,
+PortG,PG0 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A10                            ,                  ,         ,EVENTOUT,
+PortG,PG1 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A11                            ,                  ,         ,EVENTOUT,
+PortG,PG2 ,             ,                          ,                       ,TIM8_BKIN                            ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,TIM8_BKIN_COMP12                               ,FMC_A12                            ,                  ,         ,EVENTOUT,
+PortG,PG3 ,             ,                          ,                       ,TIM8_BKIN2                           ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,TIM8_BKIN2_COMP12                              ,FMC_A13                            ,                  ,         ,EVENTOUT,
+PortG,PG4 ,             ,TIM1_BKIN2                ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,TIM1_BKIN2_COMP12                              ,FMC_A14/FMC_BA0                    ,                  ,         ,EVENTOUT,
+PortG,PG5 ,             ,TIM1_ETR                  ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_A15/FMC_BA1                    ,                  ,         ,EVENTOUT,
+PortG,PG6 ,             ,TIM17_BKIN                ,HRTIM_CHE1             ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,QUADSPI_BK1_NCS                               ,                                               ,FMC_NE3                            ,DCMI_D12          ,LCD_R7   ,EVENTOUT,
+PortG,PG7 ,             ,                          ,HRTIM_CHE2             ,                                     ,                                        ,                  ,SAI1_MCLK_A                   ,USART6_CK                         ,                                           ,                                                     ,                                              ,                                               ,FMC_INT                            ,DCMI_D13          ,LCD_CLK  ,EVENTOUT,
+PortG,PG8 ,             ,                          ,                       ,TIM8_ETR                             ,                                        ,SPI6_NSS          ,                              ,USART6_RTS                        ,SPDIFRX_IN2                                ,                                                     ,                                              ,ETH_PPS_OUT                                    ,FMC_SDCLK                          ,                  ,LCD_G7   ,EVENTOUT,
+PortG,PG9 ,             ,                          ,                       ,                                     ,                                        ,SPI1_MISO/I2S1_SDI,                              ,USART6_RX                         ,SPDIFRX_IN3                                ,QUADSPI_BK2_IO2                                      ,SAI2_FS_B                                     ,                                               ,FMC_NE2/FMC_NCE                    ,DCMI_VSYNC        ,         ,EVENTOUT,
+PortG,PG10,             ,                          ,HRTIM_FLT5             ,                                     ,                                        ,SPI1_NSS/I2S1_WS  ,                              ,                                  ,                                           ,LCD_G3                                               ,SAI2_SD_B                                     ,                                               ,FMC_NE3                            ,DCMI_D2           ,LCD_B2   ,EVENTOUT,
+PortG,PG11,             ,                          ,HRTIM_EEV4             ,                                     ,                                        ,SPI1_SCK/I2S1_CK  ,                              ,                                  ,SPDIFRX_IN0                                ,                                                     ,SDMMC2_D2                                     ,ETH_MII_TX_EN/ETH_RMII_TX_EN                   ,                                   ,DCMI_D3           ,LCD_B3   ,EVENTOUT,
+PortG,PG12,             ,LPTIM1_IN1                ,HRTIM_EEV5             ,                                     ,                                        ,SPI6_MISO         ,                              ,USART6_RTS                        ,SPDIFRX_IN1                                ,LCD_B4                                               ,                                              ,ETH_MII_TXD1/ETH_RMII_TXD1                     ,FMC_NE4                            ,                  ,LCD_B1   ,EVENTOUT,
+PortG,PG13,TRACED0      ,LPTIM1_OUT                ,HRTIM_EEV10            ,                                     ,                                        ,SPI6_SCK          ,                              ,USART6_CTS/USART6_NSS             ,                                           ,                                                     ,                                              ,ETH_MII_TXD0/ETH_RMII_TXD0                     ,FMC_A24                            ,                  ,LCD_R0   ,EVENTOUT,
+PortG,PG14,TRACED1      ,LPTIM1_ETR                ,                       ,                                     ,                                        ,SPI6_MOSI         ,                              ,USART6_TX                         ,                                           ,QUADSPI_BK2_IO3                                      ,                                              ,ETH_MII_TXD1/ETH_RMII_TXD1                     ,FMC_A25                            ,                  ,LCD_B0   ,EVENTOUT,
+PortG,PG15,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,USART6_CTS/USART6_NSS             ,                                           ,                                                     ,                                              ,                                               ,FMC_SDNCAS                         ,DCMI_D13          ,         ,EVENTOUT,
+PortH,PH0 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,
+PortH,PH1 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,
+PortH,PH2 ,             ,LPTIM1_IN2                ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,QUADSPI_BK2_IO0                                      ,SAI2_SCK_B                                    ,ETH_MII_CRS                                    ,FMC_SDCKE0                         ,                  ,LCD_R0   ,EVENTOUT,ADC3_INP13
+PortH,PH3 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,QUADSPI_BK2_IO1                                      ,SAI2_MCK_B                                    ,ETH_MII_COL                                    ,FMC_SDNE0                          ,                  ,LCD_R1   ,EVENTOUT,ADC3_INN13/ADC3_INP14
+PortH,PH4 ,             ,                          ,                       ,                                     ,I2C2_SCL                                ,                  ,                              ,                                  ,                                           ,LCD_G5                                               ,OTG_HS_ULPI_NXT                               ,                                               ,                                   ,                  ,LCD_G4   ,EVENTOUT,ADC3_INN14/ADC3_INP15
+PortH,PH5 ,             ,                          ,                       ,                                     ,I2C2_SDA                                ,SPI5_NSS          ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_SDNWE                          ,                  ,         ,EVENTOUT,ADC3_INN15/ADC3_INP16
+PortH,PH6 ,             ,                          ,TIM12_CH1              ,                                     ,I2C2_SMBA                               ,SPI5_SCK          ,                              ,                                  ,                                           ,                                                     ,                                              ,ETH_MII_RXD2                                   ,FMC_SDNE1                          ,DCMI_D8           ,         ,EVENTOUT,
+PortH,PH7 ,             ,                          ,                       ,                                     ,I2C3_SCL                                ,SPI5_MISO         ,                              ,                                  ,                                           ,                                                     ,                                              ,ETH_MII_RXD3                                   ,FMC_SDCKE1                         ,DCMI_D9           ,         ,EVENTOUT,
+PortH,PH8 ,             ,                          ,TIM5_ETR               ,                                     ,I2C3_SDA                                ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D16                            ,DCMI_HSYNC        ,LCD_R2   ,EVENTOUT,
+PortH,PH9 ,             ,                          ,TIM12_CH2              ,                                     ,I2C3_SMBA                               ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D17                            ,DCMI_D0           ,LCD_R3   ,EVENTOUT,
+PortH,PH10,             ,                          ,TIM5_CH1               ,                                     ,I2C4_SMBA                               ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D18                            ,DCMI_D1           ,LCD_R4   ,EVENTOUT,
+PortH,PH11,             ,                          ,TIM5_CH2               ,                                     ,I2C4_SCL                                ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D19                            ,DCMI_D2           ,LCD_R5   ,EVENTOUT,
+PortH,PH12,             ,                          ,TIM5_CH3               ,                                     ,I2C4_SDA                                ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D20                            ,DCMI_D3           ,LCD_R6   ,EVENTOUT,
+PortH,PH13,             ,                          ,                       ,TIM8_CH1N                            ,                                        ,                  ,                              ,                                  ,UART4_TX                                   ,CAN1_TX                                              ,                                              ,                                               ,FMC_D21                            ,                  ,LCD_G2   ,EVENTOUT,
+PortH,PH14,             ,                          ,                       ,TIM8_CH2N                            ,                                        ,                  ,                              ,                                  ,UART4_RX                                   ,CAN1_RX                                              ,                                              ,                                               ,FMC_D22                            ,DCMI_D4           ,LCD_G3   ,EVENTOUT,
+PortH,PH15,             ,                          ,                       ,TIM8_CH3N                            ,                                        ,                  ,                              ,                                  ,                                           ,CAN1_TXFD                                            ,                                              ,                                               ,FMC_D23                            ,DCMI_D11          ,LCD_G4   ,EVENTOUT,
+PortI,PI0 ,             ,                          ,TIM5_CH4               ,                                     ,                                        ,SPI2_NSS/I2S2_WS  ,                              ,                                  ,                                           ,CAN1_RXFD                                            ,                                              ,                                               ,FMC_D24                            ,DCMI_D13          ,LCD_G5   ,EVENTOUT,
+PortI,PI1 ,             ,                          ,                       ,TIM8_BKIN2                           ,                                        ,SPI2_SCK/I2S2_CK  ,                              ,                                  ,                                           ,                                                     ,                                              ,TIM8_BKIN2_COMP12                              ,FMC_D25                            ,DCMI_D8           ,LCD_G6   ,EVENTOUT,
+PortI,PI2 ,             ,                          ,                       ,TIM8_CH4                             ,                                        ,SPI2_MISO/I2S2_SDI,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D26                            ,DCMI_D9           ,LCD_G7   ,EVENTOUT,
+PortI,PI3 ,             ,                          ,                       ,TIM8_ETR                             ,                                        ,SPI2_MOSI/I2S2_SDO,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,FMC_D27                            ,DCMI_D10          ,         ,EVENTOUT,
+PortI,PI4 ,             ,                          ,                       ,TIM8_BKIN                            ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,SAI2_MCK_A                                    ,TIM8_BKIN_COMP12                               ,FMC_NBL2                           ,DCMI_D5           ,LCD_B4   ,EVENTOUT,
+PortI,PI5 ,             ,                          ,                       ,TIM8_CH1                             ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,SAI2_SCK_A                                    ,                                               ,FMC_NBL3                           ,DCMI_VSYNC        ,LCD_B5   ,EVENTOUT,
+PortI,PI6 ,             ,                          ,                       ,TIM8_CH2                             ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,SAI2_SD_A                                     ,                                               ,FMC_D28                            ,DCMI_D6           ,LCD_B6   ,EVENTOUT,
+PortI,PI7 ,             ,                          ,                       ,TIM8_CH3                             ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,SAI2_FS_A                                     ,                                               ,FMC_D29                            ,DCMI_D7           ,LCD_B7   ,EVENTOUT,
+PortI,PI8 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,EVENTOUT,
+PortI,PI9 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,UART4_RX                                   ,CAN1_RX                                              ,                                              ,                                               ,FMC_D30                            ,                  ,LCD_VSYNC,EVENTOUT,
+PortI,PI10,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,CAN1_RXFD                                            ,                                              ,ETH_MII_RX_ER                                  ,FMC_D31                            ,                  ,LCD_HSYNC,EVENTOUT,
+PortI,PI11,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,LCD_G6                                               ,OTG_HS_ULPI_DIR                               ,                                               ,                                   ,                  ,         ,EVENTOUT,
+PortI,PI12,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,ETH_TX_ER                                      ,                                   ,                  ,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 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_R3   ,EVENTOUT,
+PortJ,PJ3 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_R4   ,EVENTOUT,
+PortJ,PJ4 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_R5   ,EVENTOUT,
+PortJ,PJ5 ,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_R6   ,EVENTOUT,
+PortJ,PJ6 ,             ,                          ,                       ,TIM8_CH2                             ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_R7   ,EVENTOUT,
+PortJ,PJ7 ,TRGIN        ,                          ,                       ,TIM8_CH2N                            ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_G0   ,EVENTOUT,
+PortJ,PJ8 ,             ,TIM1_CH3N                 ,                       ,TIM8_CH1                             ,                                        ,                  ,                              ,                                  ,UART8_TX                                   ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_G1   ,EVENTOUT,
+PortJ,PJ9 ,             ,TIM1_CH3                  ,                       ,TIM8_CH1N                            ,                                        ,                  ,                              ,                                  ,UART8_RX                                   ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_G2   ,EVENTOUT,
+PortJ,PJ10,             ,TIM1_CH2N                 ,                       ,TIM8_CH2                             ,                                        ,SPI5_MOSI         ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_G3   ,EVENTOUT,
+PortJ,PJ11,             ,TIM1_CH2                  ,                       ,TIM8_CH2N                            ,                                        ,SPI5_MISO         ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_G4   ,EVENTOUT,
+PortJ,PJ12,TRGOUT       ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,LCD_G3                                               ,                                              ,                                               ,                                   ,                  ,LCD_B0   ,EVENTOUT,
+PortJ,PJ13,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,LCD_B4                                               ,                                              ,                                               ,                                   ,                  ,LCD_B1   ,EVENTOUT,
+PortJ,PJ14,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_B2   ,EVENTOUT,
+PortJ,PJ15,             ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_B3   ,EVENTOUT,
+PortK,PK0 ,             ,TIM1_CH1N                 ,                       ,TIM8_CH3                             ,                                        ,SPI5_SCK          ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_G5   ,EVENTOUT,
+PortK,PK1 ,             ,TIM1_CH1                  ,                       ,TIM8_CH3N                            ,                                        ,SPI5_NSS          ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,LCD_G6   ,EVENTOUT,
+PortK,PK2 ,             ,TIM1_BKIN                 ,                       ,TIM8_BKIN                            ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,TIM8_BKIN_COMP12                              ,TIM1_BKIN_COMP12                               ,                                   ,                  ,LCD_G7   ,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,
diff --git a/ports/stm32/boards/stm32h7b3_af.csv b/ports/stm32/boards/stm32h7b3_af.csv
index e14ff481e81c5..0846689a0769d 100644
--- a/ports/stm32/boards/stm32h7b3_af.csv
+++ b/ports/stm32/boards/stm32h7b3_af.csv
@@ -1,170 +1,170 @@
-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,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,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,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
-PortC,PC15,,,,,,,,,,,,,,,,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,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,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,,
-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,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
-PortH,PH1,,,,,,,,,,,,,,,,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,,
+Port ,Pin ,AF0             ,AF1                ,AF2                    ,AF3                                       ,AF4                                                  ,AF5                                               ,AF6                                           ,AF7                                                    ,AF8                                             ,AF9                                                    ,AF10                                                    ,AF11                                                                    ,AF12                             ,AF13                           ,AF14      ,AF15    ,ADC
+     ,    ,SYS             ,LPTIM1/TIM1/2/16/17,PDM_SAI1/TIM3/4/5/12/15,DFSDM1/LPTIM2/3/LPUART1/OCTOSPIM_P1/2/TIM8,CEC/DCMI/PSSI/DFSDM1/2/I2C1/2/3/4/LPTIM2/TIM15/USART1,CEC/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/SPI6/I2S6,DFSDM1/2/I2C4/OCTOSPIM_P1/SAI1/SPI3/I2S3/UART4,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/I2S6/UART7/USART1/2/3/6,LPUART1/SAI2/SDMMC1/SPDIFRX1/SPI6/I2S6/UART4/5/8,FDCAN1/2/FMC/LCD/OCTOSPIM_P1/2/SDMMC2/SPDIFRX1/TIM13/14,CRS/FMC/LCD/OCTOSPIM_P1/OTG1_FS/OTG1_HS/SAI2/SDMMC2/TIM8,DFSDM1/2/I2C4/LCD/MDIOS/OCTOSPIM_P1/SDMMC2/SWPMI1/TIM1/8/UART7/9/USART10,FMC/LCD/MDIOS/SDMMC1/TIM1/8      ,COMP/DCMI/PSSI/LCD/TIM1        ,LCD/UART5 ,SYS     ,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,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,ADC1_INN16/ADC1_INP17
+PortA,PA2 ,                ,TIM2_CH3           ,TIM5_CH3               ,                                          ,TIM15_CH1                                            ,                                                  ,DFSDM2_CKIN1                                  ,USART2_TX                                              ,SAI2_SCK_B                                      ,                                                       ,                                                        ,                                                                        ,MDIOS_MDIO                       ,                               ,LTDC_R1   ,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,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,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,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,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,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,
+PortA,PA9 ,                ,TIM1_CH2           ,                       ,LPUART1_TX                                ,I2C3_SMBA                                            ,I2S2_CK/SPI2_SCK                                  ,                                              ,USART1_TX                                              ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,DCMI_D0/PSSI_D0                ,LTDC_R5   ,EVENTOUT,
+PortA,PA10,                ,TIM1_CH3           ,                       ,LPUART1_RX                                ,                                                     ,                                                  ,                                              ,USART1_RX                                              ,                                                ,                                                       ,USB_OTG_HS_ID                                           ,MDIOS_MDIO                                                              ,LTDC_B4                          ,DCMI_D1/PSSI_D1                ,LTDC_B1   ,EVENTOUT,
+PortA,PA11,                ,TIM1_CH4           ,                       ,LPUART1_CTS                               ,                                                     ,I2S2_WS/SPI2_NSS                                  ,UART4_RX                                      ,USART1_CTS/USART1_NSS                                  ,                                                ,FDCAN1_RX                                              ,                                                        ,                                                                        ,                                 ,                               ,LTDC_R4   ,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,
+PortA,PA13,DEBUG_JTMS/SWDIO,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortA,PA14,DEBUG_JTCK/SWCLK,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,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,
+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,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,ADC1_INP5/ADC2_INP5
+PortB,PB2 ,RTC_OUT_ALARM   ,                   ,SAI1_D1                ,                                          ,DFSDM1_CKIN1                                         ,                                                  ,SAI1_SD_A                                     ,I2S3_SDO/SPI3_MOSI                                     ,                                                ,OCTOSPIM_P1_CLK                                        ,OCTOSPIM_P1_DQS                                         ,                                                                        ,                                 ,                               ,          ,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,
+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,
+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,
+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,
+PortB,PB7 ,                ,TIM17_CH1N         ,TIM4_CH2               ,                                          ,I2C1_SDA                                             ,                                                  ,I2C4_SDA                                      ,USART1_RX                                              ,LPUART1_RX                                      ,                                                       ,                                                        ,DFSDM1_CKIN5                                                            ,FMC_NL                           ,DCMI_VSYNC/PSSI_RDY            ,          ,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,
+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,
+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,
+PortB,PB11,                ,TIM2_CH4           ,                       ,LPTIM2_ETR                                ,I2C2_SDA                                             ,                                                  ,DFSDM1_CKIN7                                  ,USART3_RX                                              ,                                                ,                                                       ,USB_OTG_HS_ULPI_D4                                      ,                                                                        ,                                 ,                               ,LTDC_G5   ,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,
+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,
+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,
+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,
+PortC,PC0 ,                ,                   ,                       ,DFSDM1_CKIN0                              ,                                                     ,                                                  ,DFSDM1_DATIN4                                 ,                                                       ,SAI2_FS_B                                       ,FMC_A25                                                ,USB_OTG_HS_ULPI_STP                                     ,LTDC_G2                                                                 ,FMC_SDNWE                        ,                               ,LTDC_R5   ,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,ADC1_INN10/ADC1_INP11/ADC2_INN10/ADC2_INP11
+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,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,ADC2_INP1
+PortC,PC4 ,                ,                   ,                       ,DFSDM1_CKIN2                              ,                                                     ,I2S1_MCK                                          ,                                              ,                                                       ,                                                ,SPDIFRX_IN3                                            ,                                                        ,                                                                        ,FMC_SDNE0                        ,                               ,LTDC_R7   ,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,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,
+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,
+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,
+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,
+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,
+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,
+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,
+PortC,PC13,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortC,PC14,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortC,PC15,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortD,PD0 ,                ,                   ,                       ,DFSDM1_CKIN6                              ,                                                     ,                                                  ,                                              ,                                                       ,UART4_RX                                        ,FDCAN1_RX                                              ,                                                        ,UART9_CTS                                                               ,FMC_D2/FMC_DA2                   ,                               ,LTDC_B1   ,EVENTOUT,
+PortD,PD1 ,                ,                   ,                       ,DFSDM1_DATIN6                             ,                                                     ,                                                  ,                                              ,                                                       ,UART4_TX                                        ,FDCAN1_TX                                              ,                                                        ,                                                                        ,FMC_D3/FMC_DA3                   ,                               ,          ,EVENTOUT,
+PortD,PD2 ,DEBUG_TRACED2   ,                   ,TIM3_ETR               ,                                          ,TIM15_BKIN                                           ,                                                  ,                                              ,                                                       ,UART5_RX                                        ,LTDC_B7                                                ,                                                        ,                                                                        ,SDMMC1_CMD                       ,DCMI_D11/PSSI_D11              ,LTDC_B2   ,EVENTOUT,
+PortD,PD3 ,                ,                   ,                       ,DFSDM1_CKOUT                              ,                                                     ,I2S2_CK/SPI2_SCK                                  ,                                              ,USART2_CTS/USART2_NSS                                  ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_CLK                          ,DCMI_D5/PSSI_D5                ,LTDC_G7   ,EVENTOUT,
+PortD,PD4 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,USART2_DE/USART2_RTS                                   ,                                                ,                                                       ,OCTOSPIM_P1_IO4                                         ,                                                                        ,FMC_NOE                          ,                               ,          ,EVENTOUT,
+PortD,PD5 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,USART2_TX                                              ,                                                ,                                                       ,OCTOSPIM_P1_IO5                                         ,                                                                        ,FMC_NWE                          ,                               ,          ,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,
+PortD,PD7 ,                ,                   ,                       ,DFSDM1_DATIN4                             ,                                                     ,I2S1_SDO/SPI1_MOSI                                ,DFSDM1_CKIN1                                  ,USART2_CK                                              ,                                                ,SPDIFRX_IN1                                            ,OCTOSPIM_P1_IO7                                         ,SDMMC2_CMD                                                              ,FMC_NE1                          ,                               ,          ,EVENTOUT,
+PortD,PD8 ,                ,                   ,                       ,DFSDM1_CKIN3                              ,                                                     ,                                                  ,                                              ,USART3_TX                                              ,                                                ,SPDIFRX_IN2                                            ,                                                        ,                                                                        ,FMC_D13/FMC_DA13                 ,                               ,          ,EVENTOUT,
+PortD,PD9 ,                ,                   ,                       ,DFSDM1_DATIN3                             ,                                                     ,                                                  ,                                              ,USART3_RX                                              ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D14/FMC_DA14                 ,                               ,          ,EVENTOUT,
+PortD,PD10,                ,                   ,                       ,DFSDM1_CKOUT                              ,DFSDM2_CKOUT                                         ,                                                  ,                                              ,USART3_CK                                              ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D15/FMC_DA15                 ,                               ,LTDC_B3   ,EVENTOUT,
+PortD,PD11,                ,                   ,                       ,LPTIM2_IN2                                ,I2C4_SMBA                                            ,                                                  ,                                              ,USART3_CTS/USART3_NSS                                  ,                                                ,OCTOSPIM_P1_IO0                                        ,SAI2_SD_A                                               ,                                                                        ,FMC_A16/FMC_CLE                  ,                               ,          ,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,
+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,
+PortD,PD14,                ,                   ,TIM4_CH3               ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,UART8_CTS                                       ,                                                       ,                                                        ,UART9_RX                                                                ,FMC_D0/FMC_DA0                   ,                               ,          ,EVENTOUT,
+PortD,PD15,                ,                   ,TIM4_CH4               ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,UART8_DE/UART8_RTS                              ,                                                       ,                                                        ,UART9_TX                                                                ,FMC_D1/FMC_DA1                   ,                               ,          ,EVENTOUT,
+PortE,PE0 ,                ,LPTIM1_ETR         ,TIM4_ETR               ,                                          ,LPTIM2_ETR                                           ,                                                  ,                                              ,                                                       ,UART8_RX                                        ,                                                       ,SAI2_MCLK_A                                             ,                                                                        ,FMC_NBL0                         ,DCMI_D2/PSSI_D2                ,LTDC_R0   ,EVENTOUT,
+PortE,PE1 ,                ,LPTIM1_IN2         ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,UART8_TX                                        ,                                                       ,                                                        ,                                                                        ,FMC_NBL1                         ,DCMI_D3/PSSI_D3                ,LTDC_R6   ,EVENTOUT,
+PortE,PE2 ,DEBUG_TRACECLK  ,                   ,SAI1_CK1               ,                                          ,                                                     ,SPI4_SCK                                          ,SAI1_MCLK_A                                   ,                                                       ,                                                ,OCTOSPIM_P1_IO2                                        ,                                                        ,USART10_RX                                                              ,FMC_A23                          ,                               ,          ,EVENTOUT,
+PortE,PE3 ,DEBUG_TRACED0   ,                   ,                       ,                                          ,TIM15_BKIN                                           ,                                                  ,SAI1_SD_B                                     ,                                                       ,                                                ,                                                       ,                                                        ,USART10_TX                                                              ,FMC_A19                          ,                               ,          ,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,
+PortE,PE5 ,DEBUG_TRACED2   ,                   ,SAI1_CK2               ,DFSDM1_CKIN3                              ,TIM15_CH1                                            ,SPI4_MISO                                         ,SAI1_SCK_A                                    ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_A21                          ,DCMI_D6/PSSI_D6                ,LTDC_G0   ,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,
+PortE,PE7 ,                ,TIM1_ETR           ,                       ,DFSDM1_DATIN2                             ,                                                     ,                                                  ,                                              ,UART7_RX                                               ,                                                ,                                                       ,OCTOSPIM_P1_IO4                                         ,                                                                        ,FMC_D4/FMC_DA4                   ,                               ,          ,EVENTOUT,
+PortE,PE8 ,                ,TIM1_CH1N          ,                       ,DFSDM1_CKIN2                              ,                                                     ,                                                  ,                                              ,UART7_TX                                               ,                                                ,                                                       ,OCTOSPIM_P1_IO5                                         ,                                                                        ,FMC_D5/FMC_DA5                   ,COMP2_OUT                      ,          ,EVENTOUT,
+PortE,PE9 ,                ,TIM1_CH1           ,                       ,DFSDM1_CKOUT                              ,                                                     ,                                                  ,                                              ,UART7_DE/UART7_RTS                                     ,                                                ,                                                       ,OCTOSPIM_P1_IO6                                         ,                                                                        ,FMC_D6/FMC_DA6                   ,                               ,          ,EVENTOUT,
+PortE,PE10,                ,TIM1_CH2N          ,                       ,DFSDM1_DATIN4                             ,                                                     ,                                                  ,                                              ,UART7_CTS                                              ,                                                ,                                                       ,OCTOSPIM_P1_IO7                                         ,                                                                        ,FMC_D7/FMC_DA7                   ,                               ,          ,EVENTOUT,
+PortE,PE11,                ,TIM1_CH2           ,                       ,DFSDM1_CKIN4                              ,                                                     ,SPI4_NSS                                          ,                                              ,                                                       ,                                                ,                                                       ,SAI2_SD_B                                               ,OCTOSPIM_P1_NCS                                                         ,FMC_D8/FMC_DA8                   ,                               ,LTDC_G3   ,EVENTOUT,
+PortE,PE12,                ,TIM1_CH3N          ,                       ,DFSDM1_DATIN5                             ,                                                     ,SPI4_SCK                                          ,                                              ,                                                       ,                                                ,                                                       ,SAI2_SCK_B                                              ,                                                                        ,FMC_D9/FMC_DA9                   ,COMP1_OUT                      ,LTDC_B4   ,EVENTOUT,
+PortE,PE13,                ,TIM1_CH3           ,                       ,DFSDM1_CKIN5                              ,                                                     ,SPI4_MISO                                         ,                                              ,                                                       ,                                                ,                                                       ,SAI2_FS_B                                               ,                                                                        ,FMC_D10/FMC_DA10                 ,COMP2_OUT                      ,LTDC_DE   ,EVENTOUT,
+PortE,PE14,                ,TIM1_CH4           ,                       ,                                          ,                                                     ,SPI4_MOSI                                         ,                                              ,                                                       ,                                                ,                                                       ,SAI2_MCLK_B                                             ,                                                                        ,FMC_D11/FMC_DA11                 ,                               ,LTDC_CLK  ,EVENTOUT,
+PortE,PE15,                ,TIM1_BKIN          ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,USART10_CK                                                              ,FMC_D12/FMC_DA12                 ,TIM1_BKIN_COMP1/TIM1_BKIN_COMP2,LTDC_R7   ,EVENTOUT,
+PortF,PF0 ,                ,                   ,                       ,                                          ,I2C2_SDA                                             ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_IO0                                        ,                                                        ,                                                                        ,FMC_A0                           ,                               ,          ,EVENTOUT,
+PortF,PF1 ,                ,                   ,                       ,                                          ,I2C2_SCL                                             ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_IO1                                        ,                                                        ,                                                                        ,FMC_A1                           ,                               ,          ,EVENTOUT,
+PortF,PF2 ,                ,                   ,                       ,                                          ,I2C2_SMBA                                            ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_IO2                                        ,                                                        ,                                                                        ,FMC_A2                           ,                               ,          ,EVENTOUT,
+PortF,PF3 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_IO3                                        ,                                                        ,                                                                        ,FMC_A3                           ,                               ,          ,EVENTOUT,
+PortF,PF4 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_CLK                                        ,                                                        ,                                                                        ,FMC_A4                           ,                               ,          ,EVENTOUT,
+PortF,PF5 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_NCLK                                       ,                                                        ,                                                                        ,FMC_A5                           ,                               ,          ,EVENTOUT,
+PortF,PF6 ,                ,TIM16_CH1          ,                       ,                                          ,                                                     ,SPI5_NSS                                          ,SAI1_SD_B                                     ,UART7_RX                                               ,                                                ,                                                       ,OCTOSPIM_P1_IO3                                         ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortF,PF7 ,                ,TIM17_CH1          ,                       ,                                          ,                                                     ,SPI5_SCK                                          ,SAI1_MCLK_B                                   ,UART7_TX                                               ,                                                ,                                                       ,OCTOSPIM_P1_IO2                                         ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortF,PF8 ,                ,TIM16_CH1N         ,                       ,                                          ,                                                     ,SPI5_MISO                                         ,SAI1_SCK_B                                    ,UART7_DE/UART7_RTS                                     ,                                                ,TIM13_CH1                                              ,OCTOSPIM_P1_IO0                                         ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortF,PF9 ,                ,TIM17_CH1N         ,                       ,                                          ,                                                     ,SPI5_MOSI                                         ,SAI1_FS_B                                     ,UART7_CTS                                              ,                                                ,TIM14_CH1                                              ,OCTOSPIM_P1_IO1                                         ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortF,PF10,                ,TIM16_BKIN         ,SAI1_D3                ,                                          ,PSSI_D15                                             ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P1_CLK                                        ,                                                        ,                                                                        ,                                 ,DCMI_D11/PSSI_D11              ,LTDC_DE   ,EVENTOUT,
+PortF,PF11,                ,                   ,                       ,                                          ,                                                     ,SPI5_MOSI                                         ,                                              ,                                                       ,                                                ,OCTOSPIM_P1_NCLK                                       ,SAI2_SD_B                                               ,                                                                        ,FMC_SDNRAS                       ,DCMI_D12/PSSI_D12              ,          ,EVENTOUT,ADC1_INP2
+PortF,PF12,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_DQS                                        ,                                                        ,                                                                        ,FMC_A6                           ,                               ,          ,EVENTOUT,ADC1_INN2/ADC1_INP6
+PortF,PF13,                ,                   ,                       ,DFSDM1_DATIN6                             ,I2C4_SMBA                                            ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_A7                           ,                               ,          ,EVENTOUT,ADC2_INP2
+PortF,PF14,                ,                   ,                       ,DFSDM1_CKIN6                              ,I2C4_SCL                                             ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_A8                           ,                               ,          ,EVENTOUT,ADC2_INN2/ADC2_INP6
+PortF,PF15,                ,                   ,                       ,                                          ,I2C4_SDA                                             ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_A9                           ,                               ,          ,EVENTOUT,
+PortG,PG0 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_IO4                                        ,                                                        ,UART9_RX                                                                ,FMC_A10                          ,                               ,          ,EVENTOUT,
+PortG,PG1 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P2_IO5                                        ,                                                        ,UART9_TX                                                                ,FMC_A11                          ,                               ,          ,EVENTOUT,
+PortG,PG2 ,                ,                   ,                       ,TIM8_BKIN                                 ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,TIM8_BKIN_COMP1/TIM8_BKIN_COMP2                                         ,FMC_A12                          ,                               ,          ,EVENTOUT,
+PortG,PG3 ,                ,                   ,                       ,TIM8_BKIN2                                ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,TIM8_BKIN2_COMP1/TIM8_BKIN2_COMP2                                       ,FMC_A13                          ,                               ,          ,EVENTOUT,
+PortG,PG4 ,                ,TIM1_BKIN2         ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,TIM1_BKIN2_COMP1/TIM1_BKIN2_COMP2                                       ,FMC_A14/FMC_BA0                  ,                               ,          ,EVENTOUT,
+PortG,PG5 ,                ,TIM1_ETR           ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_A15/FMC_BA1                  ,                               ,          ,EVENTOUT,
+PortG,PG6 ,                ,TIM17_BKIN         ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,OCTOSPIM_P1_NCS                                         ,                                                                        ,FMC_NE3                          ,DCMI_D12/PSSI_D12              ,LTDC_R7   ,EVENTOUT,
+PortG,PG7 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,SAI1_MCLK_A                                   ,USART6_CK                                              ,                                                ,OCTOSPIM_P2_DQS                                        ,                                                        ,                                                                        ,FMC_INT                          ,DCMI_D13/PSSI_D13              ,LTDC_CLK  ,EVENTOUT,
+PortG,PG8 ,                ,                   ,                       ,TIM8_ETR                                  ,                                                     ,I2S6_WS/SPI6_NSS                                  ,                                              ,USART6_DE/USART6_RTS                                   ,SPDIFRX_IN3                                     ,                                                       ,                                                        ,                                                                        ,FMC_SDCLK                        ,                               ,LTDC_G7   ,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,
+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,
+PortG,PG11,                ,LPTIM1_IN2         ,                       ,                                          ,                                                     ,I2S1_CK/SPI1_SCK                                  ,                                              ,                                                       ,SPDIFRX_IN1                                     ,OCTOSPIM_P2_IO7                                        ,SDMMC2_D2                                               ,USART10_RX                                                              ,                                 ,DCMI_D3/PSSI_D3                ,LTDC_B3   ,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,
+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,
+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,
+PortG,PG15,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,USART6_CTS/USART6_NSS                                  ,                                                ,OCTOSPIM_P2_DQS                                        ,                                                        ,USART10_CK                                                              ,FMC_SDNCAS                       ,DCMI_D13/PSSI_D13              ,          ,EVENTOUT,
+PortH,PH0 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortH,PH1 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortH,PH2 ,                ,LPTIM1_IN2         ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P1_IO4                                        ,SAI2_SCK_B                                              ,                                                                        ,FMC_SDCKE0                       ,                               ,LTDC_R0   ,EVENTOUT,
+PortH,PH3 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,OCTOSPIM_P1_IO5                                        ,SAI2_MCLK_B                                             ,                                                                        ,FMC_SDNE0                        ,                               ,LTDC_R1   ,EVENTOUT,
+PortH,PH4 ,                ,                   ,                       ,                                          ,I2C2_SCL                                             ,                                                  ,                                              ,                                                       ,                                                ,LTDC_G5                                                ,USB_OTG_HS_ULPI_NXT                                     ,                                                                        ,                                 ,PSSI_D14                       ,LTDC_G4   ,EVENTOUT,
+PortH,PH5 ,                ,                   ,                       ,                                          ,I2C2_SDA                                             ,SPI5_NSS                                          ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_SDNWE                        ,                               ,          ,EVENTOUT,
+PortH,PH6 ,                ,                   ,TIM12_CH1              ,                                          ,I2C2_SMBA                                            ,SPI5_SCK                                          ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_SDNE1                        ,DCMI_D8/PSSI_D8                ,          ,EVENTOUT,
+PortH,PH7 ,                ,                   ,                       ,                                          ,I2C3_SCL                                             ,SPI5_MISO                                         ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_SDCKE1                       ,DCMI_D9/PSSI_D9                ,          ,EVENTOUT,
+PortH,PH8 ,                ,                   ,TIM5_ETR               ,                                          ,I2C3_SDA                                             ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D16                          ,DCMI_HSYNC/PSSI_DE             ,LTDC_R2   ,EVENTOUT,
+PortH,PH9 ,                ,                   ,TIM12_CH2              ,                                          ,I2C3_SMBA                                            ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D17                          ,DCMI_D0/PSSI_D0                ,LTDC_R3   ,EVENTOUT,
+PortH,PH10,                ,                   ,TIM5_CH1               ,                                          ,I2C4_SMBA                                            ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D18                          ,DCMI_D1/PSSI_D1                ,LTDC_R4   ,EVENTOUT,
+PortH,PH11,                ,                   ,TIM5_CH2               ,                                          ,I2C4_SCL                                             ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D19                          ,DCMI_D2/PSSI_D2                ,LTDC_R5   ,EVENTOUT,
+PortH,PH12,                ,                   ,TIM5_CH3               ,                                          ,I2C4_SDA                                             ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D20                          ,DCMI_D3/PSSI_D3                ,LTDC_R6   ,EVENTOUT,
+PortH,PH13,                ,                   ,                       ,TIM8_CH1N                                 ,                                                     ,                                                  ,                                              ,                                                       ,UART4_TX                                        ,FDCAN1_TX                                              ,                                                        ,                                                                        ,FMC_D21                          ,                               ,LTDC_G2   ,EVENTOUT,
+PortH,PH14,                ,                   ,                       ,TIM8_CH2N                                 ,                                                     ,                                                  ,                                              ,                                                       ,UART4_RX                                        ,FDCAN1_RX                                              ,                                                        ,                                                                        ,FMC_D22                          ,DCMI_D4/PSSI_D4                ,LTDC_G3   ,EVENTOUT,
+PortH,PH15,                ,                   ,                       ,TIM8_CH3N                                 ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D23                          ,DCMI_D11/PSSI_D11              ,LTDC_G4   ,EVENTOUT,
+PortI,PI0 ,                ,                   ,TIM5_CH4               ,                                          ,                                                     ,I2S2_WS/SPI2_NSS                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D24                          ,DCMI_D13/PSSI_D13              ,LTDC_G5   ,EVENTOUT,
+PortI,PI1 ,                ,                   ,                       ,TIM8_BKIN2                                ,                                                     ,I2S2_CK/SPI2_SCK                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,TIM8_BKIN2_COMP1/TIM8_BKIN2_COMP2                                       ,FMC_D25                          ,DCMI_D8/PSSI_D8                ,LTDC_G6   ,EVENTOUT,
+PortI,PI2 ,                ,                   ,                       ,TIM8_CH4                                  ,                                                     ,I2S2_SDI/SPI2_MISO                                ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D26                          ,DCMI_D9/PSSI_D9                ,LTDC_G7   ,EVENTOUT,
+PortI,PI3 ,                ,                   ,                       ,TIM8_ETR                                  ,                                                     ,I2S2_SDO/SPI2_MOSI                                ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D27                          ,DCMI_D10/PSSI_D10              ,          ,EVENTOUT,
+PortI,PI4 ,                ,                   ,                       ,TIM8_BKIN                                 ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,SAI2_MCLK_A                                             ,TIM8_BKIN_COMP1/TIM8_BKIN_COMP2                                         ,FMC_NBL2                         ,DCMI_D5/PSSI_D5                ,LTDC_B4   ,EVENTOUT,
+PortI,PI5 ,                ,                   ,                       ,TIM8_CH1                                  ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,SAI2_SCK_A                                              ,                                                                        ,FMC_NBL3                         ,DCMI_VSYNC/PSSI_RDY            ,LTDC_B5   ,EVENTOUT,
+PortI,PI6 ,                ,                   ,                       ,TIM8_CH2                                  ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,SAI2_SD_A                                               ,                                                                        ,FMC_D28                          ,DCMI_D6/PSSI_D6                ,LTDC_B6   ,EVENTOUT,
+PortI,PI7 ,                ,                   ,                       ,TIM8_CH3                                  ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,SAI2_FS_A                                               ,                                                                        ,FMC_D29                          ,DCMI_D7/PSSI_D7                ,LTDC_B7   ,EVENTOUT,
+PortI,PI8 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
+PortI,PI9 ,                ,                   ,                       ,OCTOSPIM_P2_IO0                           ,                                                     ,                                                  ,                                              ,                                                       ,UART4_RX                                        ,FDCAN1_RX                                              ,                                                        ,                                                                        ,FMC_D30                          ,                               ,LTDC_VSYNC,EVENTOUT,
+PortI,PI10,                ,                   ,                       ,OCTOSPIM_P2_IO1                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,FMC_D31                          ,PSSI_D14                       ,LTDC_HSYNC,EVENTOUT,
+PortI,PI11,                ,                   ,                       ,OCTOSPIM_P2_IO2                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,LTDC_G6                                                ,USB_OTG_HS_ULPI_DIR                                     ,                                                                        ,                                 ,PSSI_D15                       ,          ,EVENTOUT,
+PortI,PI12,                ,                   ,                       ,OCTOSPIM_P2_IO3                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_HSYNC,EVENTOUT,
+PortI,PI13,                ,                   ,                       ,OCTOSPIM_P2_CLK                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_VSYNC,EVENTOUT,
+PortI,PI14,                ,                   ,                       ,OCTOSPIM_P2_NCLK                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_CLK  ,EVENTOUT,
+PortI,PI15,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,LTDC_G2                                                ,                                                        ,                                                                        ,                                 ,                               ,LTDC_R0   ,EVENTOUT,
+PortJ,PJ0 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,LTDC_R7                                                ,                                                        ,                                                                        ,                                 ,                               ,LTDC_R1   ,EVENTOUT,
+PortJ,PJ1 ,                ,                   ,                       ,OCTOSPIM_P2_IO4                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_R2   ,EVENTOUT,
+PortJ,PJ2 ,                ,                   ,                       ,OCTOSPIM_P2_IO5                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_R3   ,EVENTOUT,
+PortJ,PJ3 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,UART9_DE/UART9_RTS                                                      ,                                 ,                               ,LTDC_R4   ,EVENTOUT,
+PortJ,PJ4 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,UART9_CTS                                                               ,                                 ,                               ,LTDC_R5   ,EVENTOUT,
+PortJ,PJ5 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_R6   ,EVENTOUT,
+PortJ,PJ6 ,                ,                   ,                       ,TIM8_CH2                                  ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_R7   ,EVENTOUT,
+PortJ,PJ7 ,DEBUG_TRGIN     ,                   ,                       ,TIM8_CH2N                                 ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_G0   ,EVENTOUT,
+PortJ,PJ8 ,                ,TIM1_CH3N          ,                       ,TIM8_CH1                                  ,                                                     ,                                                  ,                                              ,                                                       ,UART8_TX                                        ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_G1   ,EVENTOUT,
+PortJ,PJ9 ,                ,TIM1_CH3           ,                       ,TIM8_CH1N                                 ,                                                     ,                                                  ,                                              ,                                                       ,UART8_RX                                        ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_G2   ,EVENTOUT,
+PortJ,PJ10,                ,TIM1_CH2N          ,                       ,TIM8_CH2                                  ,                                                     ,SPI5_MOSI                                         ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_G3   ,EVENTOUT,
+PortJ,PJ11,                ,TIM1_CH2           ,                       ,TIM8_CH2N                                 ,                                                     ,SPI5_MISO                                         ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_G4   ,EVENTOUT,
+PortJ,PJ12,DEBUG_TRGOUT    ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,LTDC_G3                                                ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B0   ,EVENTOUT,
+PortJ,PJ13,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,LTDC_B4                                                ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B1   ,EVENTOUT,
+PortJ,PJ14,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B2   ,EVENTOUT,
+PortJ,PJ15,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B3   ,EVENTOUT,
+PortK,PK0 ,                ,TIM1_CH1N          ,                       ,TIM8_CH3                                  ,                                                     ,SPI5_SCK                                          ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_G5   ,EVENTOUT,
+PortK,PK1 ,                ,TIM1_CH1           ,                       ,TIM8_CH3N                                 ,                                                     ,SPI5_NSS                                          ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_G6   ,EVENTOUT,
+PortK,PK2 ,                ,TIM1_BKIN          ,                       ,TIM8_BKIN                                 ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,TIM8_BKIN_COMP1/TIM8_BKIN_COMP2                         ,TIM1_BKIN_COMP1/TIM1_BKIN_COMP2                                         ,                                 ,                               ,LTDC_G7   ,EVENTOUT,
+PortK,PK3 ,                ,                   ,                       ,OCTOSPIM_P2_IO6                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B4   ,EVENTOUT,
+PortK,PK4 ,                ,                   ,                       ,OCTOSPIM_P2_IO7                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B5   ,EVENTOUT,
+PortK,PK5 ,                ,                   ,                       ,OCTOSPIM_P2_NCS                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B6   ,EVENTOUT,
+PortK,PK6 ,                ,                   ,                       ,OCTOSPIM_P2_DQS                           ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_B7   ,EVENTOUT,
+PortK,PK7 ,                ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,LTDC_DE   ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32l072_af.csv b/ports/stm32/boards/stm32l072_af.csv
index c9155bd444976..3de03b0bc4e4a 100644
--- a/ports/stm32/boards/stm32l072_af.csv
+++ b/ports/stm32/boards/stm32l072_af.csv
@@ -1,84 +1,84 @@
-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/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
-PortA,PA5,SPI1_SCK,,TIM2_ETR,TSC_G2_IO2,,TIM2_CH1,,,,ADC_IN5
-PortA,PA6,SPI1_MISO,,TIM3_CH1,TSC_G2_IO3,LPUART1_CTS,TIM22_CH1,EVENTOUT,COMP1_OUT,,ADC_IN6
-PortA,PA7,SPI1_MOSI,,TIM3_CH2,TSC_G2_IO4,,TIM22_CH2,EVENTOUT,COMP2_OUT,,ADC_IN7
-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/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/USART4_DE,,,
-PortB,PB0,EVENTOUT,,TIM3_CH3,TSC_G3_IO2,,,,,,ADC_IN8
-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/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/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/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/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
-PortC,PC2,LPTIM1_IN2,,SPI2_MISO/I2S2_MCK,TSC_G7_IO3,,,,,,ADC_IN12
-PortC,PC3,LPTIM1_ETR,,SPI2_MOSI/I2S2_SD,TSC_G7_IO4,,,,,,ADC_IN13
-PortC,PC4,EVENTOUT,,LPUART1_TX,,,,,,,ADC_IN14
-PortC,PC5,LPUART1_RX,,TSC_G3_IO1,,,,,,,ADC_IN15
-PortC,PC6,TIM22_CH1,,TIM3_CH1,TSC_G8_IO1,,,,,,
-PortC,PC7,TIM22_CH2,,TIM3_CH2,TSC_G8_IO2,,,,,,
-PortC,PC8,TIM22_ETR,,TIM3_CH3,TSC_G8_IO3,,,,,,
-PortC,PC9,TIM21_ETR,,USB_NOE/TIM3_CH4,TSC_G8_IO4,,,,I2C3_SDA,,
-PortC,PC10,LPUART1_TX,,,,,,USART4_TX,,,
-PortC,PC11,LPUART1_RX,,,,,,USART4_RX,,,
-PortC,PC12,,,USART5_TX,,,,USART4_CK,,,
-PortC,PC13,,,,,,,,,,
-PortC,PC14,,,,,,,,,,
-PortC,PC15,,,,,,,,,,
-PortD,PD0,TIM21_CH1,SPI2_NSS/I2S2_WS,,,,,,,,
-PortD,PD1,,SPI2_SCK/I2S2_CK,,,,,,,,
-PortD,PD2,LPUART1_RTS/LPUART1_DE,,TIM3_ETR,,,,USART5_RX,,,
-PortD,PD3,USART2_CTS,,SPI2_MISO/I2S2_MCK,,,,,,,
-PortD,PD4,USART2_RTS/USART2_DE,SPI2_MOSI/I2S2_SD,,,,,,,,
-PortD,PD5,USART2_TX,,,,,,,,,
-PortD,PD6,USART2_RX,,,,,,,,,
-PortD,PD7,USART2_CK,TIM21_CH2,,,,,,,,
-PortD,PD8,LPUART1_TX,,,,,,,,,
-PortD,PD9,LPUART1_RX,,,,,,,,,
-PortD,PD10,,,,,,,,,,
-PortD,PD11,LPUART1_CTS,,,,,,,,,
-PortD,PD12,LPUART1_RTS/LPUART1_DE,,,,,,,,,
-PortD,PD13,,,,,,,,,,
-PortD,PD14,,,,,,,,,,
-PortD,PD15,USB_CRS_SYNC,,,,,,,,,
-PortE,PE0,,,EVENTOUT,,,,,,,
-PortE,PE1,,,EVENTOUT,,,,,,,
-PortE,PE2,,,TIM3_ETR,,,,,,,
-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/USART5_DE,,,
-PortE,PE8,,,,,,,USART4_TX,,,
-PortE,PE9,TIM2_CH1,,TIM2_ETR,,,,USART4_RX,,,
-PortE,PE10,TIM2_CH2,,,,,,USART5_TX,,,
-PortE,PE11,TIM2_CH3,,,,,,USART5_RX,,,
-PortE,PE12,TIM2_CH4,,SPI1_NSS,,,,,,,
-PortE,PE13,,,SPI1_SCK,,,,,,,
-PortE,PE14,,,SPI1_MISO,,,,,,,
-PortE,PE15,,,SPI1_MOSI,,,,,,,
-PortH,PH0,USB_CRS_SYNC,,,,,,,,,
-PortH,PH1,,,,,,,,,,
+Port ,Pin ,AF0                                                                      ,AF1                        ,AF2                                                            ,AF3              ,AF4                                   ,AF5                             ,AF6                                        ,AF7                      ,,,,,,,,,ADC
+     ,    ,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                ,,,,,,,,,ADC1_IN0
+PortA,PA1 ,EVENTOUT                                                                 ,                           ,TIM2_CH2                                                       ,TSC_G1_IO2       ,USART2_RTS/USART2_DE                  ,TIM21_ETR                       ,USART4_RX                                  ,                         ,,,,,,,,,ADC1_IN1
+PortA,PA2 ,TIM21_CH1                                                                ,                           ,TIM2_CH3                                                       ,TSC_G1_IO3       ,USART2_TX                             ,                                ,LPUART1_TX                                 ,COMP2_OUT                ,,,,,,,,,ADC1_IN2
+PortA,PA3 ,TIM21_CH2                                                                ,                           ,TIM2_CH4                                                       ,TSC_G1_IO4       ,USART2_RX                             ,                                ,LPUART1_RX                                 ,                         ,,,,,,,,,ADC1_IN3
+PortA,PA4 ,SPI1_NSS                                                                 ,                           ,                                                               ,TSC_G2_IO1       ,USART2_CK                             ,TIM22_ETR                       ,                                           ,                         ,,,,,,,,,ADC1_IN4
+PortA,PA5 ,SPI1_SCK                                                                 ,                           ,TIM2_ETR                                                       ,TSC_G2_IO2       ,                                      ,TIM2_CH1                        ,                                           ,                         ,,,,,,,,,ADC1_IN5
+PortA,PA6 ,SPI1_MISO                                                                ,                           ,TIM3_CH1                                                       ,TSC_G2_IO3       ,LPUART1_CTS                           ,TIM22_CH1                       ,EVENTOUT                                   ,COMP1_OUT                ,,,,,,,,,ADC1_IN6
+PortA,PA7 ,SPI1_MOSI                                                                ,                           ,TIM3_CH2                                                       ,TSC_G2_IO4       ,                                      ,TIM22_CH2                       ,EVENTOUT                                   ,COMP2_OUT                ,,,,,,,,,ADC1_IN7
+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/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/USART4_DE                       ,                         ,,,,,,,,,
+PortB,PB0 ,EVENTOUT                                                                 ,                           ,TIM3_CH3                                                       ,TSC_G3_IO2       ,                                      ,                                ,                                           ,                         ,,,,,,,,,ADC1_IN8
+PortB,PB1 ,                                                                         ,                           ,TIM3_CH4                                                       ,TSC_G3_IO3       ,LPUART1_RTS/LPUART1_DE                ,                                ,                                           ,                         ,,,,,,,,,ADC1_IN9
+PortB,PB2 ,                                                                         ,                           ,LPTIM1_OUT                                                     ,TSC_G3_IO4       ,                                      ,                                ,                                           ,I2C3_SMBA                ,,,,,,,,,
+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/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/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/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                 ,,,,,,,,,ADC1_IN10
+PortC,PC1 ,LPTIM1_OUT                                                               ,                           ,EVENTOUT                                                       ,TSC_G7_IO2       ,                                      ,                                ,LPUART1_TX                                 ,I2C3_SDA                 ,,,,,,,,,ADC1_IN11
+PortC,PC2 ,LPTIM1_IN2                                                               ,                           ,SPI2_MISO/I2S2_MCK                                             ,TSC_G7_IO3       ,                                      ,                                ,                                           ,                         ,,,,,,,,,ADC1_IN12
+PortC,PC3 ,LPTIM1_ETR                                                               ,                           ,SPI2_MOSI/I2S2_SD                                              ,TSC_G7_IO4       ,                                      ,                                ,                                           ,                         ,,,,,,,,,ADC1_IN13
+PortC,PC4 ,EVENTOUT                                                                 ,                           ,LPUART1_TX                                                     ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,ADC1_IN14
+PortC,PC5 ,LPUART1_RX                                                               ,                           ,TSC_G3_IO1                                                     ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,ADC1_IN15
+PortC,PC6 ,TIM22_CH1                                                                ,                           ,TIM3_CH1                                                       ,TSC_G8_IO1       ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortC,PC7 ,TIM22_CH2                                                                ,                           ,TIM3_CH2                                                       ,TSC_G8_IO2       ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortC,PC8 ,TIM22_ETR                                                                ,                           ,TIM3_CH3                                                       ,TSC_G8_IO3       ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortC,PC9 ,TIM21_ETR                                                                ,                           ,USB_NOE/TIM3_CH4                                               ,TSC_G8_IO4       ,                                      ,                                ,                                           ,I2C3_SDA                 ,,,,,,,,,
+PortC,PC10,LPUART1_TX                                                               ,                           ,                                                               ,                 ,                                      ,                                ,USART4_TX                                  ,                         ,,,,,,,,,
+PortC,PC11,LPUART1_RX                                                               ,                           ,                                                               ,                 ,                                      ,                                ,USART4_RX                                  ,                         ,,,,,,,,,
+PortC,PC12,                                                                         ,                           ,USART5_TX                                                      ,                 ,                                      ,                                ,USART4_CK                                  ,                         ,,,,,,,,,
+PortC,PC13,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortC,PC14,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortC,PC15,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD0 ,TIM21_CH1                                                                ,SPI2_NSS/I2S2_WS           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD1 ,                                                                         ,SPI2_SCK/I2S2_CK           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD2 ,LPUART1_RTS/LPUART1_DE                                                   ,                           ,TIM3_ETR                                                       ,                 ,                                      ,                                ,USART5_RX                                  ,                         ,,,,,,,,,
+PortD,PD3 ,USART2_CTS                                                               ,                           ,SPI2_MISO/I2S2_MCK                                             ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD4 ,USART2_RTS/USART2_DE                                                     ,SPI2_MOSI/I2S2_SD          ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD5 ,USART2_TX                                                                ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD6 ,USART2_RX                                                                ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD7 ,USART2_CK                                                                ,TIM21_CH2                  ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD8 ,LPUART1_TX                                                               ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD9 ,LPUART1_RX                                                               ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD10,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD11,LPUART1_CTS                                                              ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD12,LPUART1_RTS/LPUART1_DE                                                   ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD13,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD14,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortD,PD15,USB_CRS_SYNC                                                             ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortE,PE0 ,                                                                         ,                           ,EVENTOUT                                                       ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortE,PE1 ,                                                                         ,                           ,EVENTOUT                                                       ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortE,PE2 ,                                                                         ,                           ,TIM3_ETR                                                       ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+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/USART5_DE             ,                         ,,,,,,,,,
+PortE,PE8 ,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,USART4_TX                                  ,                         ,,,,,,,,,
+PortE,PE9 ,TIM2_CH1                                                                 ,                           ,TIM2_ETR                                                       ,                 ,                                      ,                                ,USART4_RX                                  ,                         ,,,,,,,,,
+PortE,PE10,TIM2_CH2                                                                 ,                           ,                                                               ,                 ,                                      ,                                ,USART5_TX                                  ,                         ,,,,,,,,,
+PortE,PE11,TIM2_CH3                                                                 ,                           ,                                                               ,                 ,                                      ,                                ,USART5_RX                                  ,                         ,,,,,,,,,
+PortE,PE12,TIM2_CH4                                                                 ,                           ,SPI1_NSS                                                       ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortE,PE13,                                                                         ,                           ,SPI1_SCK                                                       ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortE,PE14,                                                                         ,                           ,SPI1_MISO                                                      ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortE,PE15,                                                                         ,                           ,SPI1_MOSI                                                      ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortH,PH0 ,USB_CRS_SYNC                                                             ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
+PortH,PH1 ,                                                                         ,                           ,                                                               ,                 ,                                      ,                                ,                                           ,                         ,,,,,,,,,
diff --git a/ports/stm32/boards/stm32l152_af.csv b/ports/stm32/boards/stm32l152_af.csv
index a6f8e80c3028a..c4694713c88c7 100644
--- a/ports/stm32/boards/stm32l152_af.csv
+++ b/ports/stm32/boards/stm32l152_af.csv
@@ -1,117 +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,,,,,,,,,,,,,,,,,
+Port ,Pin ,AF0       ,AF1         ,AF2           ,AF3             ,AF4      ,AF5              ,AF6              ,AF7                 ,AF8        ,AF9,AF10,AF11,AF12,AF13,AF14,AF15    ,ADC
+     ,    ,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/stm32l432_af.csv b/ports/stm32/boards/stm32l432_af.csv
index debfcd7b3548a..a7afcd9fdf690 100644
--- a/ports/stm32/boards/stm32l432_af.csv
+++ b/ports/stm32/boards/stm32l432_af.csv
@@ -1,28 +1,28 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,,,
-,,SYS_AF,TIM1/TIM2/LPTIM1,TIM1/TIM2,USART2,I2C1/I2C2/I2C3,SPI1/SPI2,SPI3,USART1/USART2/USART3,LPUART1,CAN1/TSC,USB/QUADSPI,,COMP1/COMP2/SWPMI1,SAI1,TIM2/TIM15/TIM16/LPTIM2,EVENTOUT,ADC,COMP,DAC
-PortA,PA0,,TIM2_CH1,,,,,,USART2_CTS,,,,,COMP1_OUT,SAI1_EXTCLK,TIM2_ETR,EVENTOUT,ADC1_IN5,COMP1_INM,
-PortA,PA1,,TIM2_CH2,,,I2C1_SMBA,SPI1_SCK,,USART2_RTS/USART2_DE,,,,,,,TIM15_CH1N,EVENTOUT,ADC1_IN6,COMP1_INP,
-PortA,PA2,,TIM2_CH3,,,,,,USART2_TX,LPUART1_TX,,QUADSPI_BK1_NCS,,COMP2_OUT,,TIM15_CH1,EVENTOUT,ADC1_IN7,COMP2_INM,
-PortA,PA3,,TIM2_CH4,,,,,,USART2_RX,LPUART1_RX,,QUADSPI_CLK,,,SAI1_MCLK_A,TIM15_CH2,EVENTOUT,ADC1_IN8,COMP2_INP,
-PortA,PA4,,,,,,SPI1_NSS,SPI3_NSS,USART2_CK,,,,,,SAI1_FS_B,LPTIM2_OUT,EVENTOUT,ADC1_IN9,COMP1_INM/COMP2_INM,DAC1_OUT1
-PortA,PA5,,TIM2_CH1,TIM2_ETR,,,SPI1_SCK,,,,,,,,,LPTIM2_ETR,EVENTOUT,ADC1_IN10,COMP1_INM/COMP2_INM,DAC1_OUT2
-PortA,PA6,,TIM1_BKIN,,,,SPI1_MISO,COMP1_OUT,USART3_CTS,,,QUADSPI_BK1_IO3,,TIM1_BKIN_COMP2,,TIM16_CH1,EVENTOUT,ADC1_IN11,,
-PortA,PA7,,TIM1_CH1N,,,I2C3_SCL,SPI1_MOSI,,,,,QUADSPI_BK1_IO2,,COMP2_OUT,,,EVENTOUT,ADC1_IN12,,
-PortA,PA8,MCO,TIM1_CH1,,,,,,USART1_CK,,,,,SWPMI1_IO,SAI1_SCLK_A,LPTIM2_OUT,EVENTOUT,,,
-PortA,PA9,,TIM1_CH2,,,I2C1_SCL,,,USART1_TX,,,,,,SAI1_FS_A,TIM15_BKIN,EVENTOUT,,,
-PortA,PA10,,TIM1_CH3,,,I2C1_SDA,,,USART1_RX,,,USB_CRS_SYNC,,,SAI1_SD_A,,EVENTOUT,,,
-PortA,PA11,,TIM1_CH4,TIM1_BKIN2,,,SPI1_MISO,COMP1_OUT,USART1_CTS,,CAN1_RX,USB_DM,,TIM1_BKIN2_COMP1,,,EVENTOUT,,,
-PortA,PA12,,TIM1_ETR,,,,SPI1_MOSI,,USART1_RTS/USART1_DE,,CAN1_TX,USB_DP,,,,,EVENTOUT,,,
-PortA,PA13,JTMS/SWDIO,IR_OUT,,,,,,,,,USB_NOE,,SWPMI1_TX,,,EVENTOUT,,,
-PortA,PA14,JTCK/SWCLK,LPTIM1_OUT,,,I2C1_SMBA,,,,,,,,SWPMI1_RX,SAI1_SD_B,,EVENTOUT,,,
-PortA,PA15,JTDI,TIM2_CH1,TIM2_ETR,USART2_RX,,SPI1_NSS,SPI3_NSS,USART3_RTS/USART3_DE,,TSC_G3_IO1,,,SWPMI1_SUSPEND,SAI1_FS_B,,EVENTOUT,,,
-PortB,PB0,,TIM1_CH2N,,,,SPI1_NSS,,USART3_CK,,,QUADSPI_BK1_IO1,,COMP1_OUT,SA1_EXTCLK,,EVENTOUT,ADC1_IN15,,
-PortB,PB1,,TIM1_CH3N,,,,,,USART3_RTS/USART3_DE,LPUART1_RTS/LPUART1_DE,,QUADSPI_BK1_IO0,,,,LPTIM2_IN1,EVENTOUT,ADC1_IN16,COMP1_INM,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,SPI3_SCK,USART1_RTS/USART1_DE,,,,,,SAI1_SCK_B,,EVENTOUT,,COMP2_INM,
-PortB,PB4,NJTRST,,,,I2C3_SDA,SPI1_MISO,SPI3_MISO,USART1_CTS,,TSC_G2_IO1,,,,SAI1_MCLK_B,,EVENTOUT,,COMP2_INP,
-PortB,PB5,,LPTIM1_IN1,,,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI,USART1_CK,,TSC_G2_IO2,,,COMP2_OUT,SAI1_SD_B,TIM16_BKIN,EVENTOUT,,,
-PortB,PB6,,LPTIM1_ETR,,,I2C1_SCL,,,USART1_TX,,TSC_G2_IO3,,,,SAI1_FS_B,TIM16_CH1N,EVENTOUT,,COMP2_INP,
-PortB,PB7,,LPTIM1_IN2,,,I2C1_SDA,,,USART1_RX,,TSC_G2_IO4,,,,,,EVENTOUT,,COMP2_INM,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH3,,,,,,,,,,,,,,,,EVENTOUT,,,
+Port ,Pin ,AF0          ,AF1             ,AF2       ,AF3      ,AF4           ,AF5      ,AF6      ,AF7                 ,AF8                   ,AF9       ,AF10           ,AF11,AF12              ,AF13       ,AF14                   ,AF15    ,ADC
+     ,    ,SYS_AF       ,TIM1/TIM2/LPTIM1,TIM1/TIM2 ,USART2   ,I2C1/I2C2/I2C3,SPI1/SPI2,SPI3     ,USART1/USART2/USART3,LPUART1               ,CAN1/TSC  ,USB/QUADSPI    ,    ,COMP1/COMP2/SWPMI1,SAI1       ,TIM2/TIM15/TIM16/LPTIM2,EVENTOUT,ADC
+PortA,PA0 ,             ,TIM2_CH1        ,          ,         ,              ,         ,         ,USART2_CTS          ,                      ,          ,               ,    ,COMP1_OUT         ,SAI1_EXTCLK,TIM2_ETR               ,EVENTOUT,ADC1_IN5
+PortA,PA1 ,             ,TIM2_CH2        ,          ,         ,I2C1_SMBA     ,SPI1_SCK ,         ,USART2_RTS/USART2_DE,                      ,          ,               ,    ,                  ,           ,TIM15_CH1N             ,EVENTOUT,ADC1_IN6
+PortA,PA2 ,             ,TIM2_CH3        ,          ,         ,              ,         ,         ,USART2_TX           ,LPUART1_TX            ,          ,QUADSPI_BK1_NCS,    ,COMP2_OUT         ,           ,TIM15_CH1              ,EVENTOUT,ADC1_IN7
+PortA,PA3 ,             ,TIM2_CH4        ,          ,         ,              ,         ,         ,USART2_RX           ,LPUART1_RX            ,          ,QUADSPI_CLK    ,    ,                  ,SAI1_MCLK_A,TIM15_CH2              ,EVENTOUT,ADC1_IN8
+PortA,PA4 ,             ,                ,          ,         ,              ,SPI1_NSS ,SPI3_NSS ,USART2_CK           ,                      ,          ,               ,    ,                  ,SAI1_FS_B  ,LPTIM2_OUT             ,EVENTOUT,ADC1_IN9
+PortA,PA5 ,             ,TIM2_CH1        ,TIM2_ETR  ,         ,              ,SPI1_SCK ,         ,                    ,                      ,          ,               ,    ,                  ,           ,LPTIM2_ETR             ,EVENTOUT,ADC1_IN10
+PortA,PA6 ,             ,TIM1_BKIN       ,          ,         ,              ,SPI1_MISO,COMP1_OUT,USART3_CTS          ,                      ,          ,QUADSPI_BK1_IO3,    ,TIM1_BKIN_COMP2   ,           ,TIM16_CH1              ,EVENTOUT,ADC1_IN11
+PortA,PA7 ,             ,TIM1_CH1N       ,          ,         ,I2C3_SCL      ,SPI1_MOSI,         ,                    ,                      ,          ,QUADSPI_BK1_IO2,    ,COMP2_OUT         ,           ,                       ,EVENTOUT,ADC1_IN12
+PortA,PA8 ,MCO          ,TIM1_CH1        ,          ,         ,              ,         ,         ,USART1_CK           ,                      ,          ,               ,    ,SWPMI1_IO         ,SAI1_SCLK_A,LPTIM2_OUT             ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2        ,          ,         ,I2C1_SCL      ,         ,         ,USART1_TX           ,                      ,          ,               ,    ,                  ,SAI1_FS_A  ,TIM15_BKIN             ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3        ,          ,         ,I2C1_SDA      ,         ,         ,USART1_RX           ,                      ,          ,USB_CRS_SYNC   ,    ,                  ,SAI1_SD_A  ,                       ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4        ,TIM1_BKIN2,         ,              ,SPI1_MISO,COMP1_OUT,USART1_CTS          ,                      ,CAN1_RX   ,USB_DM         ,    ,TIM1_BKIN2_COMP1  ,           ,                       ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR        ,          ,         ,              ,SPI1_MOSI,         ,USART1_RTS/USART1_DE,                      ,CAN1_TX   ,USB_DP         ,    ,                  ,           ,                       ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,IR_OUT          ,          ,         ,              ,         ,         ,                    ,                      ,          ,USB_NOE        ,    ,SWPMI1_TX         ,           ,                       ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,LPTIM1_OUT      ,          ,         ,I2C1_SMBA     ,         ,         ,                    ,                      ,          ,               ,    ,SWPMI1_RX         ,SAI1_SD_B  ,                       ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1        ,TIM2_ETR  ,USART2_RX,              ,SPI1_NSS ,SPI3_NSS ,USART3_RTS/USART3_DE,                      ,TSC_G3_IO1,               ,    ,SWPMI1_SUSPEND    ,SAI1_FS_B  ,                       ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N       ,          ,         ,              ,SPI1_NSS ,         ,USART3_CK           ,                      ,          ,QUADSPI_BK1_IO1,    ,COMP1_OUT         ,SA1_EXTCLK ,                       ,EVENTOUT,ADC1_IN15
+PortB,PB1 ,             ,TIM1_CH3N       ,          ,         ,              ,         ,         ,USART3_RTS/USART3_DE,LPUART1_RTS/LPUART1_DE,          ,QUADSPI_BK1_IO0,    ,                  ,           ,LPTIM2_IN1             ,EVENTOUT,ADC1_IN16
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2        ,          ,         ,              ,SPI1_SCK ,SPI3_SCK ,USART1_RTS/USART1_DE,                      ,          ,               ,    ,                  ,SAI1_SCK_B ,                       ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,                ,          ,         ,I2C3_SDA      ,SPI1_MISO,SPI3_MISO,USART1_CTS          ,                      ,TSC_G2_IO1,               ,    ,                  ,SAI1_MCLK_B,                       ,EVENTOUT,
+PortB,PB5 ,             ,LPTIM1_IN1      ,          ,         ,I2C1_SMBA     ,SPI1_MOSI,SPI3_MOSI,USART1_CK           ,                      ,TSC_G2_IO2,               ,    ,COMP2_OUT         ,SAI1_SD_B  ,TIM16_BKIN             ,EVENTOUT,
+PortB,PB6 ,             ,LPTIM1_ETR      ,          ,         ,I2C1_SCL      ,         ,         ,USART1_TX           ,                      ,TSC_G2_IO3,               ,    ,                  ,SAI1_FS_B  ,TIM16_CH1N             ,EVENTOUT,
+PortB,PB7 ,             ,LPTIM1_IN2      ,          ,         ,I2C1_SDA      ,         ,         ,USART1_RX           ,                      ,TSC_G2_IO4,               ,    ,                  ,           ,                       ,EVENTOUT,
+PortC,PC14,             ,                ,          ,         ,              ,         ,         ,                    ,                      ,          ,               ,    ,                  ,           ,                       ,EVENTOUT,
+PortC,PC15,             ,                ,          ,         ,              ,         ,         ,                    ,                      ,          ,               ,    ,                  ,           ,                       ,EVENTOUT,
+PortH,PH3 ,             ,                ,          ,         ,              ,         ,         ,                    ,                      ,          ,               ,    ,                  ,           ,                       ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32l452_af.csv b/ports/stm32/boards/stm32l452_af.csv
index 1de5c211d2128..641cbd6e0e461 100644
--- a/ports/stm32/boards/stm32l452_af.csv
+++ b/ports/stm32/boards/stm32l452_af.csv
@@ -1,85 +1,85 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,,,
-,,SYS_AF,TIM1/TIM2/LPTIM1,I2C4/TIM1/TIM2/TIM3,I2C4/USART2/CAN1/TIM1,I2C1/I2C2/I2C3/I2C4,SPI1/SPI2/I2C4,SPI3/DFSDM/COMP1,USART1/USART2/USART3,UART4/LPUART1/CAN1,CAN1/TSC,CAN1/USB/QUADSPI,,SDMMC1/COMP1/COMP2,SAI1,TIM2/TIM15/TIM16/LPTIM2,EVENTOUT,ADC,COMP,DAC
-PortA,PA0,,TIM2_CH1,,,,,,USART2_CTS,UART4_TX,,,,COMP1_OUT,SAI1_EXTCLK,TIM2_ETR,EVENTOUT,ADC12_IN5,COMP1_INM,
-PortA,PA1,,TIM2_CH2,,,I2C1_SMBA,SPI1_SCK,,USART2_RTS/USART2_DE,UART4_RX,,,,,,TIM15_CH1N,EVENTOUT,ADC12_IN6,COMP1_INP,
-PortA,PA2,,TIM2_CH3,,,,,,USART2_TX,LPUART1_TX,,QUADSPI_BK1_NCS,,COMP2_OUT,,TIM15_CH1,EVENTOUT,ADC12_IN7,COMP2_INM,
-PortA,PA3,,TIM2_CH4,,,,,,USART2_RX,LPUART1_RX,,QUADSPI_CLK,,,SAI1_MCLK_A,TIM15_CH2,EVENTOUT,ADC12_IN8,COMP2_INP,
-PortA,PA4,,,,,,SPI1_NSS,SPI3_NSS,USART2_CK,,,,,,SAI1_FS_B,LPTIM2_OUT,EVENTOUT,ADC12_IN9,COMP1_INM/COMP2_INM,DAC1_OUT1
-PortA,PA5,,TIM2_CH1,TIM2_ETR,,,SPI1_SCK,DFSDM1_CKOUT,,,,,,,,LPTIM2_ETR,EVENTOUT,ADC12_IN10,COMP1_INM/COMP2_INM,
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,,,SPI1_MISO,COMP1_OUT,USART3_CTS,LPUART1_CTS,,QUADSPI_BK1_IO3,,TIM1_BKIN_COMP2,,TIM16_CH1,EVENTOUT,ADC12_IN11,,
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,,I2C3_SCL,SPI1_MOSI,DFSDM1_DATIN0,,,,QUADSPI_BK1_IO2,,COMP2_OUT,,,EVENTOUT,ADC12_IN12,,
-PortA,PA8,MCO,TIM1_CH1,,,,,DFSDM1_CKIN1,USART1_CK,,,,,,SAI1_SCK_A,LPTIM2_OUT,EVENTOUT,,,
-PortA,PA9,,TIM1_CH2,,,I2C1_SCL,,DFSDM1_DATIN1,USART1_TX,,,,,,SAI1_FS_A,TIM15_BKIN,EVENTOUT,,,
-PortA,PA10,,TIM1_CH3,,,I2C1_SDA,,,USART1_RX,,,USBCRS_SYNC,,,SAI1_SD_A,,EVENTOUT,,,
-PortA,PA11,,TIM1_CH4,TIM1_BKIN2,,,SPI1_MISO,COMP1_OUT,USART1_CTS,,CAN1_RX,USBDM,,TIM1_BKIN2_COMP1,,,EVENTOUT,,,
-PortA,PA12,,TIM1_ETR,,,,SPI1_MOSI,,USART1_RTS/USART1_DE,,CAN1_TX,USBDP,,,,,EVENTOUT,,,
-PortA,PA13,JTMS/SWDIO,IR_OUT,,,,,,,,,USBNOE,,,SAI1_SD_B,,EVENTOUT,,,
-PortA,PA14,JTCK/SWCLK,LPTIM1_OUT,,,I2C1_SMBA,I2C4_SMBA,,,,,,,,SAI1_FS_B,,EVENTOUT,,,
-PortA,PA15,JTDI,TIM2_CH1,TIM2_ETR,USART2_RX,,SPI1_NSS,SPI3_NSS,USART3_RTS/USART3_DE,UART4_RTS/UART4_DE,TSC_G3_IO1,,,,,,EVENTOUT,,,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,,,SPI1_NSS,DFSDM1_CKIN0,USART3_CK,,,QUADSPI_BK1_IO1,,COMP1_OUT,SAI1_EXTCLK,,EVENTOUT,ADC12_IN15,,
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,,,,DFSDM_DATIN0,USART3_RTS/USART3_DE,LPUART1_RTS/LPUART1_DE,,QUADSPI_BK1_IO0,,,,LPTIM2_IN1,EVENTOUT,ADC12_IN16,COMP1_INN,
-PortB,PB2,RTC_OUT,LPTIM1_OUT,,,I2C3_SMBA,,DFSDM_CKIN0,,,,,,,,,EVENTOUT,,COMP1_INP,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,SPI3_SCK,USART1_RTS/USART1_DE,,,,,,SAI1_SCK_B,,EVENTOUT,,COMP2_INM,
-PortB,PB4,NJTRST,,TIM3_CH1,,I2C3_SDA,SPI1_MISO,SPI3_MISO,USART1_CTS,,TSC_G2_IO1,,,,SAI1_MCLK_B,,EVENTOUT,,COMP2_INP,
-PortB,PB5,,LPTIM1_IN1,TIM3_CH2,CAN1_RX,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI,USART1_CK,,TSC_G2_IO2,,,COMP2_OUT,SAI1_SD_B,TIM16_BKIN,EVENTOUT,,,
-PortB,PB6,,LPTIM1_ETR,,,I2C1_SCL,I2C4_SCL,,USART1_TX,CAN1_TX,TSC_G2_IO3,,,,SAI1_FS_B,TIM16_CH1N,EVENTOUT,,COMP2_INP,
-PortB,PB7,,LPTIM1_IN2,,,I2C1_SDA,I2C4_SDA,,USART1_RX,UART4_CTS,TSC_G2_IO4,,,,,,EVENTOUT,,COMP2_INM,
-PortB,PB8,,,,,I2C1_SCL,,,,,CAN1_RX,,,SDMMC1_D4,SAI1_MCLK_A,TIM16_CH1,EVENTOUT,,,
-PortB,PB9,,IR_OUT,,,I2C1_SDA,SPI2_NSS,,,,CAN1_TX,,,SDMMC1_D5,SAI1_FS_A,,EVENTOUT,,,
-PortB,PB10,,TIM2_CH3,,I2C4_SCL,I2C2_SCL,SPI2_SCK,,USART3_TX,LPUART1_RX,TSC_SYNC,QUADSPI_CLK,,COMP1_OUT,SAI1_SCK_A,,EVENTOUT,,,
-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/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,,
-PortC,PC2,,LPTIM1_IN2,,,,SPI2_MISO,DFSDM_CKOUT,,,,,,,,,EVENTOUT,ADC123_IN3,,
-PortC,PC3,,LPTIM1_ETR,,,,SPI2_MOSI,,,,,,,,SAI1_SD_A,LPTIM2_ETR,EVENTOUT,ADC123_IN4,,
-PortC,PC4,,,,,,,,USART3_TX,,,,,,,,EVENTOUT,ADC12_IN13,COMP1_INM,
-PortC,PC5,,,,,,,,USART3_RX,,,,,,,,EVENTOUT,ADC12_IN14,COMP1_INP,
-PortC,PC6,,,TIM3_CH1,,,,DFSDM_CKIN3,,,TSC_G4_IO1,,,SDMMC1_D6,,,EVENTOUT,,,
-PortC,PC7,,,TIM3_CH2,,,,DFSDM_DATIN3,,,TSC_G4_IO2,,,SDMMC1_D7,,,EVENTOUT,,,
-PortC,PC8,,,TIM3_CH3,,,,,,,TSC_G4_IO3,,,SDMMC1_D0,,,EVENTOUT,,,
-PortC,PC9,,,TIM3_CH4,,,,,,,TSC_G4_IO4,USBNOE,,SDMMC1_D1,,,EVENTOUT,,,
-PortC,PC10,TRACED1,,,,,,SPI3_SCK,USART3_TX,UART4_TX,TSC_G3_IO2,,,SDMMC1_D2,,,EVENTOUT,,,
-PortC,PC11,,,,,,,SPI3_MISO,USART3_RX,UART4_RX,TSC_G3_IO3,,,SDMMC1_D3,,,EVENTOUT,,,
-PortC,PC12,TRACED3,,,,,,SPI3_MOSI,USART3_CK,,TSC_G3_IO4,,,SDMMC1_CK,,,EVENTOUT,,,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortD,PD0,,,,,,SPI2_NSS,,,,CAN1_RX,,,,,,EVENTOUT,,,
-PortD,PD1,,,,,,SPI2_SCK,,,,CAN1_TX,,,,,,EVENTOUT,,,
-PortD,PD2,TRACED2,,TIM3_ETR,,,,,USART3_RTS/USART3_DE,,TSC_SYNC,,,SDMMC1_CMD,,,EVENTOUT,,,
-PortD,PD3,,,,,,SPI2_MISO,DFSDM_DATIN0,USART2_CTS,,,QUADSPI_BK2_NCS,,,,,EVENTOUT,,,
-PortD,PD4,,,,,,SPI2_MOSI,DFSDM_CKIN0,USART2_RTS/USART2_DE,,,QUADSPI_BK2_IO0,,,,,EVENTOUT,,,
-PortD,PD5,,,,,,,,USART2_TX,,,QUADSPI_BK2_IO1,,,,,EVENTOUT,,,
-PortD,PD6,,,,,,,DFSDM_DATIN1,USART2_RX,,,QUADSPI_BK2_IO2,,,SAI1_SD_A,,EVENTOUT,,,
-PortD,PD7,,,,,,,DFSDM_CKIN1,USART2_CK,,,QUADSPI_BK2_IO3,,,,,EVENTOUT,,,
-PortD,PD8,,,,,,,,USART3_TX,,,,,,,,EVENTOUT,,,
-PortD,PD9,,,,,,,,USART3_RX,,,,,,,,EVENTOUT,,,
-PortD,PD10,,,,,,,,USART3_CK,,TSC_G6_IO1,,,,,,EVENTOUT,,,
-PortD,PD11,,,,,I2C4_SMBA,,,USART3_CTS,,TSC_G6_IO2,,,,,LPTIM2_ETR,EVENTOUT,,,
-PortD,PD12,,,,,I2C4_SCL,,,USART3_RTS/USART3_DE,,TSC_G6_IO3,,,,,LPTIM2_IN1,EVENTOUT,,,
-PortD,PD13,,,,,I2C4_SDA,,,,,TSC_G6_IO4,,,,,LPTIM2_OUT,EVENTOUT,,,
-PortD,PD14,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortD,PD15,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortE,PE0,,,,,,,,,,,,,,,TIM16_CH1,EVENTOUT,,,
-PortE,PE1,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortE,PE2,TRACECLK,,TIM3_ETR,,,,,,,TSC_G7_IO1,,,,SAI1_MCLK_A,,EVENTOUT,,,
-PortE,PE3,TRACED0,,TIM3_CH1,,,,,,,TSC_G7_IO2,,,,SAI1_SD_B,,EVENTOUT,,,
-PortE,PE4,TRACED1,,TIM3_CH2,,,,DFSDM_DATIN3,,,TSC_G7_IO3,,,,SAI1_FS_A,,EVENTOUT,,,
-PortE,PE5,TRACED2,,TIM3_CH3,,,,DFSDM_CKIN3,,,TSC_G7_IO4,,,,SAI1_SCK_A,,EVENTOUT,,,
-PortE,PE6,TRACED3,,TIM3_CH4,,,,,,,,,,,SAI1_SD_A,,EVENTOUT,,,
-PortE,PE7,,TIM1_ETR,,,,,DFSDM_DATIN2,,,,,,,SAI1_SD_B,,EVENTOUT,,,
-PortE,PE8,,TIM1_CH1N,,,,,DFSDM_CKIN2,,,,,,,SAI1_SCK_B,,EVENTOUT,,,
-PortE,PE9,,TIM1_CH1,,,,,DFSDM_CKOUT,,,,,,,SAI1_FS_B,,EVENTOUT,,,
-PortE,PE10,,TIM1_CH2N,,,,,,,,TSC_G5_IO1,QUADSPI_CLK,,,SAI1_MCLK_B,,EVENTOUT,,,
-PortE,PE11,,TIM1_CH2,,,,,,,,TSC_G5_IO2,QUADSPI_BK1_NCS,,,,,EVENTOUT,,,
-PortE,PE12,,TIM1_CH3N,,,,SPI1_NSS,,,,TSC_G5_IO3,QUADSPI_BK1_IO0,,,,,EVENTOUT,,,
-PortE,PE13,,TIM1_CH3,,,,SPI1_SCK,,,,TSC_G5_IO4,QUADSPI_BK1_IO1,,,,,EVENTOUT,,,
-PortE,PE14,,TIM1_CH4,TIM1_BKIN2,TIM1_BKIN2_COMP2,,SPI1_MISO,,,,,QUADSPI_BK1_IO2,,,,,EVENTOUT,,,
-PortE,PE15,,TIM1_BKIN,,TIM1_BKIN_COMP1,,SPI1_MOSI,,,,,QUADSPI_BK1_IO3,,,,,EVENTOUT,,,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH3,,,,,,,,,,,,,,,,,,,
+Port ,Pin ,AF0          ,AF1             ,AF2                ,AF3                  ,AF4                ,AF5           ,AF6             ,AF7                 ,AF8                   ,AF9       ,AF10            ,AF11,AF12              ,AF13       ,AF14                   ,AF15    ,ADC
+     ,    ,SYS_AF       ,TIM1/TIM2/LPTIM1,I2C4/TIM1/TIM2/TIM3,I2C4/USART2/CAN1/TIM1,I2C1/I2C2/I2C3/I2C4,SPI1/SPI2/I2C4,SPI3/DFSDM/COMP1,USART1/USART2/USART3,UART4/LPUART1/CAN1    ,CAN1/TSC  ,CAN1/USB/QUADSPI,    ,SDMMC1/COMP1/COMP2,SAI1       ,TIM2/TIM15/TIM16/LPTIM2,EVENTOUT,ADC
+PortA,PA0 ,             ,TIM2_CH1        ,                   ,                     ,                   ,              ,                ,USART2_CTS          ,UART4_TX              ,          ,                ,    ,COMP1_OUT         ,SAI1_EXTCLK,TIM2_ETR               ,EVENTOUT,ADC12_IN5
+PortA,PA1 ,             ,TIM2_CH2        ,                   ,                     ,I2C1_SMBA          ,SPI1_SCK      ,                ,USART2_RTS/USART2_DE,UART4_RX              ,          ,                ,    ,                  ,           ,TIM15_CH1N             ,EVENTOUT,ADC12_IN6
+PortA,PA2 ,             ,TIM2_CH3        ,                   ,                     ,                   ,              ,                ,USART2_TX           ,LPUART1_TX            ,          ,QUADSPI_BK1_NCS ,    ,COMP2_OUT         ,           ,TIM15_CH1              ,EVENTOUT,ADC12_IN7
+PortA,PA3 ,             ,TIM2_CH4        ,                   ,                     ,                   ,              ,                ,USART2_RX           ,LPUART1_RX            ,          ,QUADSPI_CLK     ,    ,                  ,SAI1_MCLK_A,TIM15_CH2              ,EVENTOUT,ADC12_IN8
+PortA,PA4 ,             ,                ,                   ,                     ,                   ,SPI1_NSS      ,SPI3_NSS        ,USART2_CK           ,                      ,          ,                ,    ,                  ,SAI1_FS_B  ,LPTIM2_OUT             ,EVENTOUT,ADC12_IN9
+PortA,PA5 ,             ,TIM2_CH1        ,TIM2_ETR           ,                     ,                   ,SPI1_SCK      ,DFSDM1_CKOUT    ,                    ,                      ,          ,                ,    ,                  ,           ,LPTIM2_ETR             ,EVENTOUT,ADC12_IN10
+PortA,PA6 ,             ,TIM1_BKIN       ,TIM3_CH1           ,                     ,                   ,SPI1_MISO     ,COMP1_OUT       ,USART3_CTS          ,LPUART1_CTS           ,          ,QUADSPI_BK1_IO3 ,    ,TIM1_BKIN_COMP2   ,           ,TIM16_CH1              ,EVENTOUT,ADC12_IN11
+PortA,PA7 ,             ,TIM1_CH1N       ,TIM3_CH2           ,                     ,I2C3_SCL           ,SPI1_MOSI     ,DFSDM1_DATIN0   ,                    ,                      ,          ,QUADSPI_BK1_IO2 ,    ,COMP2_OUT         ,           ,                       ,EVENTOUT,ADC12_IN12
+PortA,PA8 ,MCO          ,TIM1_CH1        ,                   ,                     ,                   ,              ,DFSDM1_CKIN1    ,USART1_CK           ,                      ,          ,                ,    ,                  ,SAI1_SCK_A ,LPTIM2_OUT             ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2        ,                   ,                     ,I2C1_SCL           ,              ,DFSDM1_DATIN1   ,USART1_TX           ,                      ,          ,                ,    ,                  ,SAI1_FS_A  ,TIM15_BKIN             ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3        ,                   ,                     ,I2C1_SDA           ,              ,                ,USART1_RX           ,                      ,          ,USBCRS_SYNC     ,    ,                  ,SAI1_SD_A  ,                       ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4        ,TIM1_BKIN2         ,                     ,                   ,SPI1_MISO     ,COMP1_OUT       ,USART1_CTS          ,                      ,CAN1_RX   ,USBDM           ,    ,TIM1_BKIN2_COMP1  ,           ,                       ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR        ,                   ,                     ,                   ,SPI1_MOSI     ,                ,USART1_RTS/USART1_DE,                      ,CAN1_TX   ,USBDP           ,    ,                  ,           ,                       ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,IR_OUT          ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,USBNOE          ,    ,                  ,SAI1_SD_B  ,                       ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,LPTIM1_OUT      ,                   ,                     ,I2C1_SMBA          ,I2C4_SMBA     ,                ,                    ,                      ,          ,                ,    ,                  ,SAI1_FS_B  ,                       ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1        ,TIM2_ETR           ,USART2_RX            ,                   ,SPI1_NSS      ,SPI3_NSS        ,USART3_RTS/USART3_DE,UART4_RTS/UART4_DE    ,TSC_G3_IO1,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N       ,TIM3_CH3           ,                     ,                   ,SPI1_NSS      ,DFSDM1_CKIN0    ,USART3_CK           ,                      ,          ,QUADSPI_BK1_IO1 ,    ,COMP1_OUT         ,SAI1_EXTCLK,                       ,EVENTOUT,ADC12_IN15
+PortB,PB1 ,             ,TIM1_CH3N       ,TIM3_CH4           ,                     ,                   ,              ,DFSDM_DATIN0    ,USART3_RTS/USART3_DE,LPUART1_RTS/LPUART1_DE,          ,QUADSPI_BK1_IO0 ,    ,                  ,           ,LPTIM2_IN1             ,EVENTOUT,ADC12_IN16
+PortB,PB2 ,RTC_OUT      ,LPTIM1_OUT      ,                   ,                     ,I2C3_SMBA          ,              ,DFSDM_CKIN0     ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2        ,                   ,                     ,                   ,SPI1_SCK      ,SPI3_SCK        ,USART1_RTS/USART1_DE,                      ,          ,                ,    ,                  ,SAI1_SCK_B ,                       ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,                ,TIM3_CH1           ,                     ,I2C3_SDA           ,SPI1_MISO     ,SPI3_MISO       ,USART1_CTS          ,                      ,TSC_G2_IO1,                ,    ,                  ,SAI1_MCLK_B,                       ,EVENTOUT,
+PortB,PB5 ,             ,LPTIM1_IN1      ,TIM3_CH2           ,CAN1_RX              ,I2C1_SMBA          ,SPI1_MOSI     ,SPI3_MOSI       ,USART1_CK           ,                      ,TSC_G2_IO2,                ,    ,COMP2_OUT         ,SAI1_SD_B  ,TIM16_BKIN             ,EVENTOUT,
+PortB,PB6 ,             ,LPTIM1_ETR      ,                   ,                     ,I2C1_SCL           ,I2C4_SCL      ,                ,USART1_TX           ,CAN1_TX               ,TSC_G2_IO3,                ,    ,                  ,SAI1_FS_B  ,TIM16_CH1N             ,EVENTOUT,
+PortB,PB7 ,             ,LPTIM1_IN2      ,                   ,                     ,I2C1_SDA           ,I2C4_SDA      ,                ,USART1_RX           ,UART4_CTS             ,TSC_G2_IO4,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortB,PB8 ,             ,                ,                   ,                     ,I2C1_SCL           ,              ,                ,                    ,                      ,CAN1_RX   ,                ,    ,SDMMC1_D4         ,SAI1_MCLK_A,TIM16_CH1              ,EVENTOUT,
+PortB,PB9 ,             ,IR_OUT          ,                   ,                     ,I2C1_SDA           ,SPI2_NSS      ,                ,                    ,                      ,CAN1_TX   ,                ,    ,SDMMC1_D5         ,SAI1_FS_A  ,                       ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3        ,                   ,I2C4_SCL             ,I2C2_SCL           ,SPI2_SCK      ,                ,USART3_TX           ,LPUART1_RX            ,TSC_SYNC  ,QUADSPI_CLK     ,    ,COMP1_OUT         ,SAI1_SCK_A ,                       ,EVENTOUT,
+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/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
+PortC,PC2 ,             ,LPTIM1_IN2      ,                   ,                     ,                   ,SPI2_MISO     ,DFSDM_CKOUT     ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,ADC123_IN3
+PortC,PC3 ,             ,LPTIM1_ETR      ,                   ,                     ,                   ,SPI2_MOSI     ,                ,                    ,                      ,          ,                ,    ,                  ,SAI1_SD_A  ,LPTIM2_ETR             ,EVENTOUT,ADC123_IN4
+PortC,PC4 ,             ,                ,                   ,                     ,                   ,              ,                ,USART3_TX           ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,ADC12_IN13
+PortC,PC5 ,             ,                ,                   ,                     ,                   ,              ,                ,USART3_RX           ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,ADC12_IN14
+PortC,PC6 ,             ,                ,TIM3_CH1           ,                     ,                   ,              ,DFSDM_CKIN3     ,                    ,                      ,TSC_G4_IO1,                ,    ,SDMMC1_D6         ,           ,                       ,EVENTOUT,
+PortC,PC7 ,             ,                ,TIM3_CH2           ,                     ,                   ,              ,DFSDM_DATIN3    ,                    ,                      ,TSC_G4_IO2,                ,    ,SDMMC1_D7         ,           ,                       ,EVENTOUT,
+PortC,PC8 ,             ,                ,TIM3_CH3           ,                     ,                   ,              ,                ,                    ,                      ,TSC_G4_IO3,                ,    ,SDMMC1_D0         ,           ,                       ,EVENTOUT,
+PortC,PC9 ,             ,                ,TIM3_CH4           ,                     ,                   ,              ,                ,                    ,                      ,TSC_G4_IO4,USBNOE          ,    ,SDMMC1_D1         ,           ,                       ,EVENTOUT,
+PortC,PC10,TRACED1      ,                ,                   ,                     ,                   ,              ,SPI3_SCK        ,USART3_TX           ,UART4_TX              ,TSC_G3_IO2,                ,    ,SDMMC1_D2         ,           ,                       ,EVENTOUT,
+PortC,PC11,             ,                ,                   ,                     ,                   ,              ,SPI3_MISO       ,USART3_RX           ,UART4_RX              ,TSC_G3_IO3,                ,    ,SDMMC1_D3         ,           ,                       ,EVENTOUT,
+PortC,PC12,TRACED3      ,                ,                   ,                     ,                   ,              ,SPI3_MOSI       ,USART3_CK           ,                      ,TSC_G3_IO4,                ,    ,SDMMC1_CK         ,           ,                       ,EVENTOUT,
+PortC,PC13,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortC,PC14,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortC,PC15,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD0 ,             ,                ,                   ,                     ,                   ,SPI2_NSS      ,                ,                    ,                      ,CAN1_RX   ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD1 ,             ,                ,                   ,                     ,                   ,SPI2_SCK      ,                ,                    ,                      ,CAN1_TX   ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,                ,TIM3_ETR           ,                     ,                   ,              ,                ,USART3_RTS/USART3_DE,                      ,TSC_SYNC  ,                ,    ,SDMMC1_CMD        ,           ,                       ,EVENTOUT,
+PortD,PD3 ,             ,                ,                   ,                     ,                   ,SPI2_MISO     ,DFSDM_DATIN0    ,USART2_CTS          ,                      ,          ,QUADSPI_BK2_NCS ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD4 ,             ,                ,                   ,                     ,                   ,SPI2_MOSI     ,DFSDM_CKIN0     ,USART2_RTS/USART2_DE,                      ,          ,QUADSPI_BK2_IO0 ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD5 ,             ,                ,                   ,                     ,                   ,              ,                ,USART2_TX           ,                      ,          ,QUADSPI_BK2_IO1 ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD6 ,             ,                ,                   ,                     ,                   ,              ,DFSDM_DATIN1    ,USART2_RX           ,                      ,          ,QUADSPI_BK2_IO2 ,    ,                  ,SAI1_SD_A  ,                       ,EVENTOUT,
+PortD,PD7 ,             ,                ,                   ,                     ,                   ,              ,DFSDM_CKIN1     ,USART2_CK           ,                      ,          ,QUADSPI_BK2_IO3 ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD8 ,             ,                ,                   ,                     ,                   ,              ,                ,USART3_TX           ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD9 ,             ,                ,                   ,                     ,                   ,              ,                ,USART3_RX           ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD10,             ,                ,                   ,                     ,                   ,              ,                ,USART3_CK           ,                      ,TSC_G6_IO1,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD11,             ,                ,                   ,                     ,I2C4_SMBA          ,              ,                ,USART3_CTS          ,                      ,TSC_G6_IO2,                ,    ,                  ,           ,LPTIM2_ETR             ,EVENTOUT,
+PortD,PD12,             ,                ,                   ,                     ,I2C4_SCL           ,              ,                ,USART3_RTS/USART3_DE,                      ,TSC_G6_IO3,                ,    ,                  ,           ,LPTIM2_IN1             ,EVENTOUT,
+PortD,PD13,             ,                ,                   ,                     ,I2C4_SDA           ,              ,                ,                    ,                      ,TSC_G6_IO4,                ,    ,                  ,           ,LPTIM2_OUT             ,EVENTOUT,
+PortD,PD14,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortD,PD15,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortE,PE0 ,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,TIM16_CH1              ,EVENTOUT,
+PortE,PE1 ,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                ,TIM3_ETR           ,                     ,                   ,              ,                ,                    ,                      ,TSC_G7_IO1,                ,    ,                  ,SAI1_MCLK_A,                       ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                ,TIM3_CH1           ,                     ,                   ,              ,                ,                    ,                      ,TSC_G7_IO2,                ,    ,                  ,SAI1_SD_B  ,                       ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                ,TIM3_CH2           ,                     ,                   ,              ,DFSDM_DATIN3    ,                    ,                      ,TSC_G7_IO3,                ,    ,                  ,SAI1_FS_A  ,                       ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                ,TIM3_CH3           ,                     ,                   ,              ,DFSDM_CKIN3     ,                    ,                      ,TSC_G7_IO4,                ,    ,                  ,SAI1_SCK_A ,                       ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,                ,TIM3_CH4           ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,SAI1_SD_A  ,                       ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR        ,                   ,                     ,                   ,              ,DFSDM_DATIN2    ,                    ,                      ,          ,                ,    ,                  ,SAI1_SD_B  ,                       ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N       ,                   ,                     ,                   ,              ,DFSDM_CKIN2     ,                    ,                      ,          ,                ,    ,                  ,SAI1_SCK_B ,                       ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1        ,                   ,                     ,                   ,              ,DFSDM_CKOUT     ,                    ,                      ,          ,                ,    ,                  ,SAI1_FS_B  ,                       ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N       ,                   ,                     ,                   ,              ,                ,                    ,                      ,TSC_G5_IO1,QUADSPI_CLK     ,    ,                  ,SAI1_MCLK_B,                       ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2        ,                   ,                     ,                   ,              ,                ,                    ,                      ,TSC_G5_IO2,QUADSPI_BK1_NCS ,    ,                  ,           ,                       ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N       ,                   ,                     ,                   ,SPI1_NSS      ,                ,                    ,                      ,TSC_G5_IO3,QUADSPI_BK1_IO0 ,    ,                  ,           ,                       ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3        ,                   ,                     ,                   ,SPI1_SCK      ,                ,                    ,                      ,TSC_G5_IO4,QUADSPI_BK1_IO1 ,    ,                  ,           ,                       ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4        ,TIM1_BKIN2         ,TIM1_BKIN2_COMP2     ,                   ,SPI1_MISO     ,                ,                    ,                      ,          ,QUADSPI_BK1_IO2 ,    ,                  ,           ,                       ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN       ,                   ,TIM1_BKIN_COMP1      ,                   ,SPI1_MOSI     ,                ,                    ,                      ,          ,QUADSPI_BK1_IO3 ,    ,                  ,           ,                       ,EVENTOUT,
+PortH,PH0 ,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortH,PH1 ,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,EVENTOUT,
+PortH,PH3 ,             ,                ,                   ,                     ,                   ,              ,                ,                    ,                      ,          ,                ,    ,                  ,           ,                       ,        ,
diff --git a/ports/stm32/boards/stm32l476_af.csv b/ports/stm32/boards/stm32l476_af.csv
index df824ed7080fc..bb99d39735ac4 100644
--- a/ports/stm32/boards/stm32l476_af.csv
+++ b/ports/stm32/boards/stm32l476_af.csv
@@ -1,116 +1,116 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,,
-,,SYS_AF,TIM1/TIM2/TIM5/TIM8/LPTIM1,TIM1/TIM2/TIM3/TIM4/TIM5,TIM8,I2C1/I2C2/I2C3,SPI1/SPI2,SPI3/DFSDM,USART1/USART2/USART3,UART4/UART5/LPUART1,CAN1/TSC,OTG_FS/QUADSPI,LCD,SDMMC1/COMP1/COMP2/FMC/SWPMI1,SAI1/SAI2,TIM2/TIM15/TIM16/TIM17/LPTIM2,EVENTOUT,ADC,COMP
-PortA,PA0,,TIM2_CH1,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,,,,SAI1_EXTCLK,TIM2_ETR,EVENTOUT,ADC12_IN5,
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS/USART2_DE,UART4_RX,,,LCD_SEG0,,,TIM15_CH1N,EVENTOUT,ADC12_IN6,
-PortA,PA2,,TIM2_CH3,TIM5_CH3,,,,,USART2_TX,,,,LCD_SEG1,,SAI2_EXTCLK,TIM15_CH1,EVENTOUT,ADC12_IN7,
-PortA,PA3,,TIM2_CH4,TIM5_CH4,,,,,USART2_RX,,,,LCD_SEG2,,,TIM15_CH2,EVENTOUT,ADC12_IN8,
-PortA,PA4,,,,,,SPI1_NSS,SPI3_NSS,USART2_CK,,,,,,SAI1_FS_B,LPTIM2_OUT,EVENTOUT,ADC12_IN9,
-PortA,PA5,,TIM2_CH1,TIM2_ETR,TIM8_CH1N,,SPI1_SCK,,,,,,,,,LPTIM2_ETR,EVENTOUT,ADC12_IN10,
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO,,USART3_CTS,,,QUADSPI_BK1_IO3,LCD_SEG3,TIM1_BKIN_COMP2,TIM8_BKIN_COMP2,TIM16_CH1,EVENTOUT,ADC12_IN11,
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI,,,,,QUADSPI_BK1_IO2,LCD_SEG4,,,TIM17_CH1,EVENTOUT,ADC12_IN12,
-PortA,PA8,MCO,TIM1_CH1,,,,,,USART1_CK,,,OTG_FS_SOF,LCD_COM0,,,LPTIM2_OUT,EVENTOUT,,
-PortA,PA9,,TIM1_CH2,,,,,,USART1_TX,,,,LCD_COM1,,,TIM15_BKIN,EVENTOUT,,
-PortA,PA10,,TIM1_CH3,,,,,,USART1_RX,,,OTG_FS_ID,LCD_COM2,,,TIM17_BKIN,EVENTOUT,,
-PortA,PA11,,TIM1_CH4,TIM1_BKIN2,,,,,USART1_CTS,,CAN1_RX,OTG_FS_DM,,TIM1_BKIN2_COMP1,,,EVENTOUT,,
-PortA,PA12,,TIM1_ETR,,,,,,USART1_RTS/USART1_DE,,CAN1_TX,OTG_FS_DP,,,,,EVENTOUT,,
-PortA,PA13,JTMS/SWDIO,IR_OUT,,,,,,,,,OTG_FS_NOE,,,,,EVENTOUT,,
-PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,,
-PortA,PA15,JTDI,TIM2_CH1,TIM2_ETR,,,SPI1_NSS,SPI3_NSS,,UART4_RTS/UART4_DE,TSC_G3_IO1,,LCD_SEG17,,SAI2_FS_B,,EVENTOUT,,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,,USART3_CK,,,QUADSPI_BK1_IO1,LCD_SEG5,COMP1_OUT,,,EVENTOUT,ADC12_IN15,
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,DFSDM_DATIN0,USART3_RTS/USART3_DE,,,QUADSPI_BK1_IO0,LCD_SEG6,,,LPTIM2_IN1,EVENTOUT,ADC12_IN16,COMP1_INN
-PortB,PB2,RTC_OUT,LPTIM1_OUT,,,I2C3_SMBA,,DFSDM_CKIN0,,,,,,,,,EVENTOUT,,COMP1_INP
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,SPI3_SCK,USART1_RTS/USART1_DE,,,,LCD_SEG7,,SAI1_SCK_B,,EVENTOUT,,COMP2_INM
-PortB,PB4,NJTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,USART1_CTS,UART5_RTS/UART5_DE,TSC_G2_IO1,,LCD_SEG8,,SAI1_MCLK_B,TIM17_BKIN,EVENTOUT,,COMP2_INP
-PortB,PB5,,LPTIM1_IN1,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI,USART1_CK,UART5_CTS,TSC_G2_IO2,,LCD_SEG9,COMP2_OUT,SAI1_SD_B,TIM16_BKIN,EVENTOUT,,
-PortB,PB6,,LPTIM1_ETR,TIM4_CH1,TIM8_BKIN2,I2C1_SCL,,DFSDM_DATIN5,USART1_TX,,TSC_G2_IO3,,,TIM8_BKIN2_COMP2,SAI1_FS_B,TIM16_CH1N,EVENTOUT,,COMP2_INP
-PortB,PB7,,LPTIM1_IN2,TIM4_CH2,TIM8_BKIN,I2C1_SDA,,DFSDM_CKIN5,USART1_RX,UART4_CTS,TSC_G2_IO4,,LCD_SEG21,FMC_NL,TIM8_BKIN_COMP1,TIM17_CH1N,EVENTOUT,,COMP2_INM
-PortB,PB8,,,TIM4_CH3,,I2C1_SCL,,DFSDM_DATIN6,,,CAN1_RX,,LCD_SEG16,SDMMC1_D4,SAI1_MCLK_A,TIM16_CH1,EVENTOUT,,
-PortB,PB9,,IR_OUT,TIM4_CH4,,I2C1_SDA,SPI2_NSS,DFSDM_CKIN6,,,CAN1_TX,,LCD_COM3,SDMMC1_D5,SAI1_FS_A,TIM17_CH1,EVENTOUT,,
-PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK,DFSDM_DATIN7,USART3_TX,LPUART1_RX,,QUADSPI_CLK,LCD_SEG10,COMP1_OUT,SAI1_SCK_A,,EVENTOUT,,
-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/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,
-PortC,PC2,,LPTIM1_IN2,,,,SPI2_MISO,DFSDM_CKOUT,,,,,LCD_SEG20,,,,EVENTOUT,ADC123_IN3,
-PortC,PC3,,LPTIM1_ETR,,,,SPI2_MOSI,,,,,,LCD_VLCD,,SAI1_SD_A,LPTIM2_ETR,EVENTOUT,ADC123_IN4,
-PortC,PC4,,,,,,,,USART3_TX,,,,LCD_SEG22,,,,EVENTOUT,ADC12_IN13,COMP1_INM
-PortC,PC5,,,,,,,,USART3_RX,,,,LCD_SEG23,,,,EVENTOUT,ADC12_IN14,COMP1_INP
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,,,DFSDM_CKIN3,,,TSC_G4_IO1,,LCD_SEG24,SDMMC1_D6,SAI2_MCLK_A,,EVENTOUT,,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,,,DFSDM_DATIN3,,,TSC_G4_IO2,,LCD_SEG25,SDMMC1_D7,SAI2_MCLK_B,,EVENTOUT,,
-PortC,PC8,,,TIM3_CH3,TIM8_CH3,,,,,,TSC_G4_IO3,,LCD_SEG26,SDMMC1_D0,,,EVENTOUT,,
-PortC,PC9,,TIM8_BKIN2,TIM3_CH4,TIM8_CH4,,,,,,TSC_G4_IO4,OTG_FS_NOE,LCD_SEG27,SDMMC1_D1,SAI2_EXTCLK,TIM8_BKIN2_COMP1,EVENTOUT,,
-PortC,PC10,,,,,,,SPI3_SCK,USART3_TX,UART4_TX,TSC_G3_IO2,,LCD_COM4/LCD_SEG28/LCD_SEG40,SDMMC1_D2,SAI2_SCK_B,,EVENTOUT,,
-PortC,PC11,,,,,,,SPI3_MISO,USART3_RX,UART4_RX,TSC_G3_IO3,,LCD_COM5/LCD_SEG29/LCD_SEG41,SDMMC1_D3,SAI2_MCLK_B,,EVENTOUT,,
-PortC,PC12,,,,,,,SPI3_MOSI,USART3_CK,UART5_TX,TSC_G3_IO4,,LCD_COM6/LCD_SEG30/LCD_SEG42,SDMMC1_CK,SAI2_SD_B,,EVENTOUT,,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,,
-PortD,PD0,,,,,,SPI2_NSS,DFSDM_DATIN7,,,CAN1_RX,,,FMC_D2,,,EVENTOUT,,
-PortD,PD1,,,,,,SPI2_SCK,DFSDM_CKIN7,,,CAN1_TX,,,FMC_D3,,,EVENTOUT,,
-PortD,PD2,,,TIM3_ETR,,,,,USART3_RTS/USART3_DE,UART5_RX,TSC_SYNC,,LCD_COM7/LCD_SEG31/LCD_SEG43,SDMMC1_CMD,,,EVENTOUT,,
-PortD,PD3,,,,,,SPI2_MISO,DFSDM_DATIN0,USART2_CTS,,,,,FMC_CLK,,,EVENTOUT,,
-PortD,PD4,,,,,,SPI2_MOSI,DFSDM_CKIN0,USART2_RTS/USART2_DE,,,,,FMC_NOE,,,EVENTOUT,,
-PortD,PD5,,,,,,,,USART2_TX,,,,,FMC_NWE,,,EVENTOUT,,
-PortD,PD6,,,,,,,DFSDM_DATIN1,USART2_RX,,,,,FMC_NWAIT,SAI1_SD_A,,EVENTOUT,,
-PortD,PD7,,,,,,,DFSDM_CKIN1,USART2_CK,,,,,FMC_NE1,,,EVENTOUT,,
-PortD,PD8,,,,,,,,USART3_TX,,,,LCD_SEG28,FMC_D13,,,EVENTOUT,,
-PortD,PD9,,,,,,,,USART3_RX,,,,LCD_SEG29,FMC_D14,SAI2_MCLK_A,,EVENTOUT,,
-PortD,PD10,,,,,,,,USART3_CK,,TSC_G6_IO1,,LCD_SEG30,FMC_D15,SAI2_SCK_A,,EVENTOUT,,
-PortD,PD11,,,,,,,,USART3_CTS,,TSC_G6_IO2,,LCD_SEG31,FMC_A16,SAI2_SD_A,LPTIM2_ETR,EVENTOUT,,
-PortD,PD12,,,TIM4_CH1,,,,,USART3_RTS/USART3_DE,,TSC_G6_IO3,,LCD_SEG32,FMC_A17,SAI2_FS_A,LPTIM2_IN1,EVENTOUT,,
-PortD,PD13,,,TIM4_CH2,,,,,,,TSC_G6_IO4,,LCD_SEG33,FMC_A18,,LPTIM2_OUT,EVENTOUT,,
-PortD,PD14,,,TIM4_CH3,,,,,,,,,LCD_SEG34,FMC_D0,,,EVENTOUT,,
-PortD,PD15,,,TIM4_CH4,,,,,,,,,LCD_SEG35,FMC_D1,,,EVENTOUT,,
-PortE,PE0,,,TIM4_ETR,,,,,,,,,LCD_SEG36,FMC_NBL0,,TIM16_CH1,EVENTOUT,,
-PortE,PE1,,,,,,,,,,,,LCD_SEG37,FMC_NBL1,,TIM17_CH1,EVENTOUT,,
-PortE,PE2,TRACECLK,,TIM3_ETR,,,,,,,TSC_G7_IO1,,LCD_SEG38,FMC_A23,SAI1_MCLK_A,,EVENTOUT,,
-PortE,PE3,TRACED0,,TIM3_CH1,,,,,,,TSC_G7_IO2,,LCD_SEG39,FMC_A19,SAI1_SD_B,,EVENTOUT,,
-PortE,PE4,TRACED1,,TIM3_CH2,,,,DFSDM_DATIN3,,,TSC_G7_IO3,,,FMC_A20,SAI1_FS_A,,EVENTOUT,,
-PortE,PE5,TRACED2,,TIM3_CH3,,,,DFSDM_CKIN3,,,TSC_G7_IO4,,,FMC_A21,SAI1_SCK_A,,EVENTOUT,,
-PortE,PE6,TRACED3,,TIM3_CH4,,,,,,,,,,FMC_A22,SAI1_SD_A,,EVENTOUT,,
-PortE,PE7,,TIM1_ETR,,,,,DFSDM_DATIN2,,,,,,FMC_D4,SAI1_SD_B,,EVENTOUT,,
-PortE,PE8,,TIM1_CH1N,,,,,DFSDM_CKIN2,,,,,,FMC_D5,SAI1_SCK_B,,EVENTOUT,,
-PortE,PE9,,TIM1_CH1,,,,,DFSDM_CKOUT,,,,,,FMC_D6,SAI1_FS_B,,EVENTOUT,,
-PortE,PE10,,TIM1_CH2N,,,,,DFSDM_DATIN4,,,TSC_G5_IO1,QUADSPI_CLK,,FMC_D7,SAI1_MCLK_B,,EVENTOUT,,
-PortE,PE11,,TIM1_CH2,,,,,DFSDM_CKIN4,,,TSC_G5_IO2,QUADSPI_NCS,,FMC_D8,,,EVENTOUT,,
-PortE,PE12,,TIM1_CH3N,,,,SPI1_NSS,DFSDM_DATIN5,,,TSC_G5_IO3,QUADSPI_BK1_IO0,,FMC_D9,,,EVENTOUT,,
-PortE,PE13,,TIM1_CH3,,,,SPI1_SCK,DFSDM_CKIN5,,,TSC_G5_IO4,QUADSPI_BK1_IO1,,FMC_D10,,,EVENTOUT,,
-PortE,PE14,,TIM1_CH4,TIM1_BKIN2,TIM1_BKIN2_COMP2,,SPI1_MISO,,,,,QUADSPI_BK1_IO2,,FMC_D11,,,EVENTOUT,,
-PortE,PE15,,TIM1_BKIN,,TIM1_BKIN_COMP1,,SPI1_MOSI,,,,,QUADSPI_BK1_IO3,,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_IN6,
-PortF,PF4,,,,,,,,,,,,,FMC_A4,,,EVENTOUT,ADC3_IN7,
-PortF,PF5,,,,,,,,,,,,,FMC_A5,,,EVENTOUT,ADC3_IN8,
-PortF,PF6,,TIM5_ETR,TIM5_CH1,,,,,,,,,,,SAI1_SD_B,,EVENTOUT,ADC3_IN9,
-PortF,PF7,,,TIM5_CH2,,,,,,,,,,,SAI1_MCLK_B,,EVENTOUT,ADC3_IN10,
-PortF,PF8,,,TIM5_CH3,,,,,,,,,,,SAI1_SCK_B,,EVENTOUT,ADC3_IN11,
-PortF,PF9,,,TIM5_CH4,,,,,,,,,,,SAI1_FS_B,TIM15_CH1,EVENTOUT,ADC3_IN12,
-PortF,PF10,,,,,,,,,,,,,,,TIM15_CH2,EVENTOUT,ADC3_IN13,
-PortF,PF11,,,,,,,,,,,,,,,,EVENTOUT,,
-PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,,
-PortF,PF13,,,,,,,DFSDM_DATIN6,,,,,,FMC_A7,,,EVENTOUT,,
-PortF,PF14,,,,,,,DFSDM_CKIN6,,,TSC_G8_IO1,,,FMC_A8,,,EVENTOUT,,
-PortF,PF15,,,,,,,,,,TSC_G8_IO2,,,FMC_A9,,,EVENTOUT,,
-PortG,PG0,,,,,,,,,,TSC_G8_IO3,,,FMC_A10,,,EVENTOUT,,
-PortG,PG1,,,,,,,,,,TSC_G8_IO4,,,FMC_A11,,,EVENTOUT,,
-PortG,PG2,,,,,,SPI1_SCK,,,,,,,FMC_A12,SAI2_SCK_B,,EVENTOUT,,
-PortG,PG3,,,,,,SPI1_MISO,,,,,,,FMC_A13,SAI2_FS_B,,EVENTOUT,,
-PortG,PG4,,,,,,SPI1_MOSI,,,,,,,FMC_A14,SAI2_MCLK_B,,EVENTOUT,,
-PortG,PG5,,,,,,SPI1_NSS,,,LPUART1_CTS,,,,FMC_A15,SAI2_SD_B,,EVENTOUT,,
-PortG,PG6,,,,,I2C3_SMBA,,,,LPUART1_RTS/LPUART1_DE,,,,,,,EVENTOUT,,
-PortG,PG7,,,,,I2C3_SCL,,,,LPUART1_TX,,,,FMC_INT3,,,EVENTOUT,,
-PortG,PG8,,,,,I2C3_SDA,,,,LPUART1_RX,,,,,,,EVENTOUT,,
-PortG,PG9,,,,,,,SPI3_SCK,USART1_TX,,,,,FMC_NCE3/FMC_NE2,SAI2_SCK_A,TIM15_CH1N,EVENTOUT,,
-PortG,PG10,,LPTIM1_IN1,,,,,SPI3_MISO,USART1_RX,,,,,FMC_NE3,SAI2_FS_A,TIM15_CH1,EVENTOUT,,
-PortG,PG11,,LPTIM1_IN2,,,,,SPI3_MOSI,USART1_CTS,,,,,,SAI2_MCLK_A,TIM15_CH2,EVENTOUT,,
-PortG,PG12,,LPTIM1_ETR,,,,,SPI3_NSS,USART1_RTS/USART1_DE,,,,,FMC_NE4,SAI2_SD_A,,EVENTOUT,,
-PortG,PG13,,,,,I2C1_SDA,,,USART1_CK,,,,,FMC_A24,,,EVENTOUT,,
-PortG,PG14,,,,,I2C1_SCL,,,,,,,,FMC_A25,,,EVENTOUT,,
-PortG,PG15,,LPTIM1_OUT,,,I2C1_SMBA,,,,,,,,,,,EVENTOUT,,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,,
+Port ,Pin ,AF0          ,AF1                       ,AF2                     ,AF3             ,AF4           ,AF5      ,AF6         ,AF7                 ,AF8                   ,AF9       ,AF10           ,AF11                        ,AF12                         ,AF13           ,AF14                         ,AF15    ,ADC
+     ,    ,SYS_AF       ,TIM1/TIM2/TIM5/TIM8/LPTIM1,TIM1/TIM2/TIM3/TIM4/TIM5,TIM8            ,I2C1/I2C2/I2C3,SPI1/SPI2,SPI3/DFSDM  ,USART1/USART2/USART3,UART4/UART5/LPUART1   ,CAN1/TSC  ,OTG_FS/QUADSPI ,LCD                         ,SDMMC1/COMP1/COMP2/FMC/SWPMI1,SAI1/SAI2      ,TIM2/TIM15/TIM16/TIM17/LPTIM2,EVENTOUT,ADC
+PortA,PA0 ,             ,TIM2_CH1                  ,TIM5_CH1                ,TIM8_ETR        ,              ,         ,            ,USART2_CTS          ,UART4_TX              ,          ,               ,                            ,                             ,SAI1_EXTCLK    ,TIM2_ETR                     ,EVENTOUT,ADC12_IN5
+PortA,PA1 ,             ,TIM2_CH2                  ,TIM5_CH2                ,                ,              ,         ,            ,USART2_RTS/USART2_DE,UART4_RX              ,          ,               ,LCD_SEG0                    ,                             ,               ,TIM15_CH1N                   ,EVENTOUT,ADC12_IN6
+PortA,PA2 ,             ,TIM2_CH3                  ,TIM5_CH3                ,                ,              ,         ,            ,USART2_TX           ,                      ,          ,               ,LCD_SEG1                    ,                             ,SAI2_EXTCLK    ,TIM15_CH1                    ,EVENTOUT,ADC12_IN7
+PortA,PA3 ,             ,TIM2_CH4                  ,TIM5_CH4                ,                ,              ,         ,            ,USART2_RX           ,                      ,          ,               ,LCD_SEG2                    ,                             ,               ,TIM15_CH2                    ,EVENTOUT,ADC12_IN8
+PortA,PA4 ,             ,                          ,                        ,                ,              ,SPI1_NSS ,SPI3_NSS    ,USART2_CK           ,                      ,          ,               ,                            ,                             ,SAI1_FS_B      ,LPTIM2_OUT                   ,EVENTOUT,ADC12_IN9
+PortA,PA5 ,             ,TIM2_CH1                  ,TIM2_ETR                ,TIM8_CH1N       ,              ,SPI1_SCK ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,LPTIM2_ETR                   ,EVENTOUT,ADC12_IN10
+PortA,PA6 ,             ,TIM1_BKIN                 ,TIM3_CH1                ,TIM8_BKIN       ,              ,SPI1_MISO,            ,USART3_CTS          ,                      ,          ,QUADSPI_BK1_IO3,LCD_SEG3                    ,TIM1_BKIN_COMP2              ,TIM8_BKIN_COMP2,TIM16_CH1                    ,EVENTOUT,ADC12_IN11
+PortA,PA7 ,             ,TIM1_CH1N                 ,TIM3_CH2                ,TIM8_CH1N       ,              ,SPI1_MOSI,            ,                    ,                      ,          ,QUADSPI_BK1_IO2,LCD_SEG4                    ,                             ,               ,TIM17_CH1                    ,EVENTOUT,ADC12_IN12
+PortA,PA8 ,MCO          ,TIM1_CH1                  ,                        ,                ,              ,         ,            ,USART1_CK           ,                      ,          ,OTG_FS_SOF     ,LCD_COM0                    ,                             ,               ,LPTIM2_OUT                   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2                  ,                        ,                ,              ,         ,            ,USART1_TX           ,                      ,          ,               ,LCD_COM1                    ,                             ,               ,TIM15_BKIN                   ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3                  ,                        ,                ,              ,         ,            ,USART1_RX           ,                      ,          ,OTG_FS_ID      ,LCD_COM2                    ,                             ,               ,TIM17_BKIN                   ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4                  ,TIM1_BKIN2              ,                ,              ,         ,            ,USART1_CTS          ,                      ,CAN1_RX   ,OTG_FS_DM      ,                            ,TIM1_BKIN2_COMP1             ,               ,                             ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR                  ,                        ,                ,              ,         ,            ,USART1_RTS/USART1_DE,                      ,CAN1_TX   ,OTG_FS_DP      ,                            ,                             ,               ,                             ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,IR_OUT                    ,                        ,                ,              ,         ,            ,                    ,                      ,          ,OTG_FS_NOE     ,                            ,                             ,               ,                             ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1                  ,TIM2_ETR                ,                ,              ,SPI1_NSS ,SPI3_NSS    ,                    ,UART4_RTS/UART4_DE    ,TSC_G3_IO1,               ,LCD_SEG17                   ,                             ,SAI2_FS_B      ,                             ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N                 ,TIM3_CH3                ,TIM8_CH2N       ,              ,         ,            ,USART3_CK           ,                      ,          ,QUADSPI_BK1_IO1,LCD_SEG5                    ,COMP1_OUT                    ,               ,                             ,EVENTOUT,ADC12_IN15
+PortB,PB1 ,             ,TIM1_CH3N                 ,TIM3_CH4                ,TIM8_CH3N       ,              ,         ,DFSDM_DATIN0,USART3_RTS/USART3_DE,                      ,          ,QUADSPI_BK1_IO0,LCD_SEG6                    ,                             ,               ,LPTIM2_IN1                   ,EVENTOUT,ADC12_IN16
+PortB,PB2 ,RTC_OUT      ,LPTIM1_OUT                ,                        ,                ,I2C3_SMBA     ,         ,DFSDM_CKIN0 ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2                  ,                        ,                ,              ,SPI1_SCK ,SPI3_SCK    ,USART1_RTS/USART1_DE,                      ,          ,               ,LCD_SEG7                    ,                             ,SAI1_SCK_B     ,                             ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,                          ,TIM3_CH1                ,                ,              ,SPI1_MISO,SPI3_MISO   ,USART1_CTS          ,UART5_RTS/UART5_DE    ,TSC_G2_IO1,               ,LCD_SEG8                    ,                             ,SAI1_MCLK_B    ,TIM17_BKIN                   ,EVENTOUT,
+PortB,PB5 ,             ,LPTIM1_IN1                ,TIM3_CH2                ,                ,I2C1_SMBA     ,SPI1_MOSI,SPI3_MOSI   ,USART1_CK           ,UART5_CTS             ,TSC_G2_IO2,               ,LCD_SEG9                    ,COMP2_OUT                    ,SAI1_SD_B      ,TIM16_BKIN                   ,EVENTOUT,
+PortB,PB6 ,             ,LPTIM1_ETR                ,TIM4_CH1                ,TIM8_BKIN2      ,I2C1_SCL      ,         ,DFSDM_DATIN5,USART1_TX           ,                      ,TSC_G2_IO3,               ,                            ,TIM8_BKIN2_COMP2             ,SAI1_FS_B      ,TIM16_CH1N                   ,EVENTOUT,
+PortB,PB7 ,             ,LPTIM1_IN2                ,TIM4_CH2                ,TIM8_BKIN       ,I2C1_SDA      ,         ,DFSDM_CKIN5 ,USART1_RX           ,UART4_CTS             ,TSC_G2_IO4,               ,LCD_SEG21                   ,FMC_NL                       ,TIM8_BKIN_COMP1,TIM17_CH1N                   ,EVENTOUT,
+PortB,PB8 ,             ,                          ,TIM4_CH3                ,                ,I2C1_SCL      ,         ,DFSDM_DATIN6,                    ,                      ,CAN1_RX   ,               ,LCD_SEG16                   ,SDMMC1_D4                    ,SAI1_MCLK_A    ,TIM16_CH1                    ,EVENTOUT,
+PortB,PB9 ,             ,IR_OUT                    ,TIM4_CH4                ,                ,I2C1_SDA      ,SPI2_NSS ,DFSDM_CKIN6 ,                    ,                      ,CAN1_TX   ,               ,LCD_COM3                    ,SDMMC1_D5                    ,SAI1_FS_A      ,TIM17_CH1                    ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3                  ,                        ,                ,I2C2_SCL      ,SPI2_SCK ,DFSDM_DATIN7,USART3_TX           ,LPUART1_RX            ,          ,QUADSPI_CLK    ,LCD_SEG10                   ,COMP1_OUT                    ,SAI1_SCK_A     ,                             ,EVENTOUT,
+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/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
+PortC,PC2 ,             ,LPTIM1_IN2                ,                        ,                ,              ,SPI2_MISO,DFSDM_CKOUT ,                    ,                      ,          ,               ,LCD_SEG20                   ,                             ,               ,                             ,EVENTOUT,ADC123_IN3
+PortC,PC3 ,             ,LPTIM1_ETR                ,                        ,                ,              ,SPI2_MOSI,            ,                    ,                      ,          ,               ,LCD_VLCD                    ,                             ,SAI1_SD_A      ,LPTIM2_ETR                   ,EVENTOUT,ADC123_IN4
+PortC,PC4 ,             ,                          ,                        ,                ,              ,         ,            ,USART3_TX           ,                      ,          ,               ,LCD_SEG22                   ,                             ,               ,                             ,EVENTOUT,ADC12_IN13
+PortC,PC5 ,             ,                          ,                        ,                ,              ,         ,            ,USART3_RX           ,                      ,          ,               ,LCD_SEG23                   ,                             ,               ,                             ,EVENTOUT,ADC12_IN14
+PortC,PC6 ,             ,                          ,TIM3_CH1                ,TIM8_CH1        ,              ,         ,DFSDM_CKIN3 ,                    ,                      ,TSC_G4_IO1,               ,LCD_SEG24                   ,SDMMC1_D6                    ,SAI2_MCLK_A    ,                             ,EVENTOUT,
+PortC,PC7 ,             ,                          ,TIM3_CH2                ,TIM8_CH2        ,              ,         ,DFSDM_DATIN3,                    ,                      ,TSC_G4_IO2,               ,LCD_SEG25                   ,SDMMC1_D7                    ,SAI2_MCLK_B    ,                             ,EVENTOUT,
+PortC,PC8 ,             ,                          ,TIM3_CH3                ,TIM8_CH3        ,              ,         ,            ,                    ,                      ,TSC_G4_IO3,               ,LCD_SEG26                   ,SDMMC1_D0                    ,               ,                             ,EVENTOUT,
+PortC,PC9 ,             ,TIM8_BKIN2                ,TIM3_CH4                ,TIM8_CH4        ,              ,         ,            ,                    ,                      ,TSC_G4_IO4,OTG_FS_NOE     ,LCD_SEG27                   ,SDMMC1_D1                    ,SAI2_EXTCLK    ,TIM8_BKIN2_COMP1             ,EVENTOUT,
+PortC,PC10,             ,                          ,                        ,                ,              ,         ,SPI3_SCK    ,USART3_TX           ,UART4_TX              ,TSC_G3_IO2,               ,LCD_COM4/LCD_SEG28/LCD_SEG40,SDMMC1_D2                    ,SAI2_SCK_B     ,                             ,EVENTOUT,
+PortC,PC11,             ,                          ,                        ,                ,              ,         ,SPI3_MISO   ,USART3_RX           ,UART4_RX              ,TSC_G3_IO3,               ,LCD_COM5/LCD_SEG29/LCD_SEG41,SDMMC1_D3                    ,SAI2_MCLK_B    ,                             ,EVENTOUT,
+PortC,PC12,             ,                          ,                        ,                ,              ,         ,SPI3_MOSI   ,USART3_CK           ,UART5_TX              ,TSC_G3_IO4,               ,LCD_COM6/LCD_SEG30/LCD_SEG42,SDMMC1_CK                    ,SAI2_SD_B      ,                             ,EVENTOUT,
+PortC,PC13,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortC,PC14,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortC,PC15,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortD,PD0 ,             ,                          ,                        ,                ,              ,SPI2_NSS ,DFSDM_DATIN7,                    ,                      ,CAN1_RX   ,               ,                            ,FMC_D2                       ,               ,                             ,EVENTOUT,
+PortD,PD1 ,             ,                          ,                        ,                ,              ,SPI2_SCK ,DFSDM_CKIN7 ,                    ,                      ,CAN1_TX   ,               ,                            ,FMC_D3                       ,               ,                             ,EVENTOUT,
+PortD,PD2 ,             ,                          ,TIM3_ETR                ,                ,              ,         ,            ,USART3_RTS/USART3_DE,UART5_RX              ,TSC_SYNC  ,               ,LCD_COM7/LCD_SEG31/LCD_SEG43,SDMMC1_CMD                   ,               ,                             ,EVENTOUT,
+PortD,PD3 ,             ,                          ,                        ,                ,              ,SPI2_MISO,DFSDM_DATIN0,USART2_CTS          ,                      ,          ,               ,                            ,FMC_CLK                      ,               ,                             ,EVENTOUT,
+PortD,PD4 ,             ,                          ,                        ,                ,              ,SPI2_MOSI,DFSDM_CKIN0 ,USART2_RTS/USART2_DE,                      ,          ,               ,                            ,FMC_NOE                      ,               ,                             ,EVENTOUT,
+PortD,PD5 ,             ,                          ,                        ,                ,              ,         ,            ,USART2_TX           ,                      ,          ,               ,                            ,FMC_NWE                      ,               ,                             ,EVENTOUT,
+PortD,PD6 ,             ,                          ,                        ,                ,              ,         ,DFSDM_DATIN1,USART2_RX           ,                      ,          ,               ,                            ,FMC_NWAIT                    ,SAI1_SD_A      ,                             ,EVENTOUT,
+PortD,PD7 ,             ,                          ,                        ,                ,              ,         ,DFSDM_CKIN1 ,USART2_CK           ,                      ,          ,               ,                            ,FMC_NE1                      ,               ,                             ,EVENTOUT,
+PortD,PD8 ,             ,                          ,                        ,                ,              ,         ,            ,USART3_TX           ,                      ,          ,               ,LCD_SEG28                   ,FMC_D13                      ,               ,                             ,EVENTOUT,
+PortD,PD9 ,             ,                          ,                        ,                ,              ,         ,            ,USART3_RX           ,                      ,          ,               ,LCD_SEG29                   ,FMC_D14                      ,SAI2_MCLK_A    ,                             ,EVENTOUT,
+PortD,PD10,             ,                          ,                        ,                ,              ,         ,            ,USART3_CK           ,                      ,TSC_G6_IO1,               ,LCD_SEG30                   ,FMC_D15                      ,SAI2_SCK_A     ,                             ,EVENTOUT,
+PortD,PD11,             ,                          ,                        ,                ,              ,         ,            ,USART3_CTS          ,                      ,TSC_G6_IO2,               ,LCD_SEG31                   ,FMC_A16                      ,SAI2_SD_A      ,LPTIM2_ETR                   ,EVENTOUT,
+PortD,PD12,             ,                          ,TIM4_CH1                ,                ,              ,         ,            ,USART3_RTS/USART3_DE,                      ,TSC_G6_IO3,               ,LCD_SEG32                   ,FMC_A17                      ,SAI2_FS_A      ,LPTIM2_IN1                   ,EVENTOUT,
+PortD,PD13,             ,                          ,TIM4_CH2                ,                ,              ,         ,            ,                    ,                      ,TSC_G6_IO4,               ,LCD_SEG33                   ,FMC_A18                      ,               ,LPTIM2_OUT                   ,EVENTOUT,
+PortD,PD14,             ,                          ,TIM4_CH3                ,                ,              ,         ,            ,                    ,                      ,          ,               ,LCD_SEG34                   ,FMC_D0                       ,               ,                             ,EVENTOUT,
+PortD,PD15,             ,                          ,TIM4_CH4                ,                ,              ,         ,            ,                    ,                      ,          ,               ,LCD_SEG35                   ,FMC_D1                       ,               ,                             ,EVENTOUT,
+PortE,PE0 ,             ,                          ,TIM4_ETR                ,                ,              ,         ,            ,                    ,                      ,          ,               ,LCD_SEG36                   ,FMC_NBL0                     ,               ,TIM16_CH1                    ,EVENTOUT,
+PortE,PE1 ,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,LCD_SEG37                   ,FMC_NBL1                     ,               ,TIM17_CH1                    ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                          ,TIM3_ETR                ,                ,              ,         ,            ,                    ,                      ,TSC_G7_IO1,               ,LCD_SEG38                   ,FMC_A23                      ,SAI1_MCLK_A    ,                             ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                          ,TIM3_CH1                ,                ,              ,         ,            ,                    ,                      ,TSC_G7_IO2,               ,LCD_SEG39                   ,FMC_A19                      ,SAI1_SD_B      ,                             ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                          ,TIM3_CH2                ,                ,              ,         ,DFSDM_DATIN3,                    ,                      ,TSC_G7_IO3,               ,                            ,FMC_A20                      ,SAI1_FS_A      ,                             ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                          ,TIM3_CH3                ,                ,              ,         ,DFSDM_CKIN3 ,                    ,                      ,TSC_G7_IO4,               ,                            ,FMC_A21                      ,SAI1_SCK_A     ,                             ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,                          ,TIM3_CH4                ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,FMC_A22                      ,SAI1_SD_A      ,                             ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR                  ,                        ,                ,              ,         ,DFSDM_DATIN2,                    ,                      ,          ,               ,                            ,FMC_D4                       ,SAI1_SD_B      ,                             ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N                 ,                        ,                ,              ,         ,DFSDM_CKIN2 ,                    ,                      ,          ,               ,                            ,FMC_D5                       ,SAI1_SCK_B     ,                             ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1                  ,                        ,                ,              ,         ,DFSDM_CKOUT ,                    ,                      ,          ,               ,                            ,FMC_D6                       ,SAI1_FS_B      ,                             ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N                 ,                        ,                ,              ,         ,DFSDM_DATIN4,                    ,                      ,TSC_G5_IO1,QUADSPI_CLK    ,                            ,FMC_D7                       ,SAI1_MCLK_B    ,                             ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2                  ,                        ,                ,              ,         ,DFSDM_CKIN4 ,                    ,                      ,TSC_G5_IO2,QUADSPI_NCS    ,                            ,FMC_D8                       ,               ,                             ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N                 ,                        ,                ,              ,SPI1_NSS ,DFSDM_DATIN5,                    ,                      ,TSC_G5_IO3,QUADSPI_BK1_IO0,                            ,FMC_D9                       ,               ,                             ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3                  ,                        ,                ,              ,SPI1_SCK ,DFSDM_CKIN5 ,                    ,                      ,TSC_G5_IO4,QUADSPI_BK1_IO1,                            ,FMC_D10                      ,               ,                             ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4                  ,TIM1_BKIN2              ,TIM1_BKIN2_COMP2,              ,SPI1_MISO,            ,                    ,                      ,          ,QUADSPI_BK1_IO2,                            ,FMC_D11                      ,               ,                             ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN                 ,                        ,TIM1_BKIN_COMP1 ,              ,SPI1_MOSI,            ,                    ,                      ,          ,QUADSPI_BK1_IO3,                            ,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_IN6
+PortF,PF4 ,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,FMC_A4                       ,               ,                             ,EVENTOUT,ADC3_IN7
+PortF,PF5 ,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,FMC_A5                       ,               ,                             ,EVENTOUT,ADC3_IN8
+PortF,PF6 ,             ,TIM5_ETR                  ,TIM5_CH1                ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,SAI1_SD_B      ,                             ,EVENTOUT,ADC3_IN9
+PortF,PF7 ,             ,                          ,TIM5_CH2                ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,SAI1_MCLK_B    ,                             ,EVENTOUT,ADC3_IN10
+PortF,PF8 ,             ,                          ,TIM5_CH3                ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,SAI1_SCK_B     ,                             ,EVENTOUT,ADC3_IN11
+PortF,PF9 ,             ,                          ,TIM5_CH4                ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,SAI1_FS_B      ,TIM15_CH1                    ,EVENTOUT,ADC3_IN12
+PortF,PF10,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,TIM15_CH2                    ,EVENTOUT,ADC3_IN13
+PortF,PF11,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortF,PF12,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,FMC_A6                       ,               ,                             ,EVENTOUT,
+PortF,PF13,             ,                          ,                        ,                ,              ,         ,DFSDM_DATIN6,                    ,                      ,          ,               ,                            ,FMC_A7                       ,               ,                             ,EVENTOUT,
+PortF,PF14,             ,                          ,                        ,                ,              ,         ,DFSDM_CKIN6 ,                    ,                      ,TSC_G8_IO1,               ,                            ,FMC_A8                       ,               ,                             ,EVENTOUT,
+PortF,PF15,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,TSC_G8_IO2,               ,                            ,FMC_A9                       ,               ,                             ,EVENTOUT,
+PortG,PG0 ,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,TSC_G8_IO3,               ,                            ,FMC_A10                      ,               ,                             ,EVENTOUT,
+PortG,PG1 ,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,TSC_G8_IO4,               ,                            ,FMC_A11                      ,               ,                             ,EVENTOUT,
+PortG,PG2 ,             ,                          ,                        ,                ,              ,SPI1_SCK ,            ,                    ,                      ,          ,               ,                            ,FMC_A12                      ,SAI2_SCK_B     ,                             ,EVENTOUT,
+PortG,PG3 ,             ,                          ,                        ,                ,              ,SPI1_MISO,            ,                    ,                      ,          ,               ,                            ,FMC_A13                      ,SAI2_FS_B      ,                             ,EVENTOUT,
+PortG,PG4 ,             ,                          ,                        ,                ,              ,SPI1_MOSI,            ,                    ,                      ,          ,               ,                            ,FMC_A14                      ,SAI2_MCLK_B    ,                             ,EVENTOUT,
+PortG,PG5 ,             ,                          ,                        ,                ,              ,SPI1_NSS ,            ,                    ,LPUART1_CTS           ,          ,               ,                            ,FMC_A15                      ,SAI2_SD_B      ,                             ,EVENTOUT,
+PortG,PG6 ,             ,                          ,                        ,                ,I2C3_SMBA     ,         ,            ,                    ,LPUART1_RTS/LPUART1_DE,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortG,PG7 ,             ,                          ,                        ,                ,I2C3_SCL      ,         ,            ,                    ,LPUART1_TX            ,          ,               ,                            ,FMC_INT3                     ,               ,                             ,EVENTOUT,
+PortG,PG8 ,             ,                          ,                        ,                ,I2C3_SDA      ,         ,            ,                    ,LPUART1_RX            ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortG,PG9 ,             ,                          ,                        ,                ,              ,         ,SPI3_SCK    ,USART1_TX           ,                      ,          ,               ,                            ,FMC_NCE3/FMC_NE2             ,SAI2_SCK_A     ,TIM15_CH1N                   ,EVENTOUT,
+PortG,PG10,             ,LPTIM1_IN1                ,                        ,                ,              ,         ,SPI3_MISO   ,USART1_RX           ,                      ,          ,               ,                            ,FMC_NE3                      ,SAI2_FS_A      ,TIM15_CH1                    ,EVENTOUT,
+PortG,PG11,             ,LPTIM1_IN2                ,                        ,                ,              ,         ,SPI3_MOSI   ,USART1_CTS          ,                      ,          ,               ,                            ,                             ,SAI2_MCLK_A    ,TIM15_CH2                    ,EVENTOUT,
+PortG,PG12,             ,LPTIM1_ETR                ,                        ,                ,              ,         ,SPI3_NSS    ,USART1_RTS/USART1_DE,                      ,          ,               ,                            ,FMC_NE4                      ,SAI2_SD_A      ,                             ,EVENTOUT,
+PortG,PG13,             ,                          ,                        ,                ,I2C1_SDA      ,         ,            ,USART1_CK           ,                      ,          ,               ,                            ,FMC_A24                      ,               ,                             ,EVENTOUT,
+PortG,PG14,             ,                          ,                        ,                ,I2C1_SCL      ,         ,            ,                    ,                      ,          ,               ,                            ,FMC_A25                      ,               ,                             ,EVENTOUT,
+PortG,PG15,             ,LPTIM1_OUT                ,                        ,                ,I2C1_SMBA     ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH0 ,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH1 ,             ,                          ,                        ,                ,              ,         ,            ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32l496_af.csv b/ports/stm32/boards/stm32l496_af.csv
index 311770a055a84..a0d77f1e10cd8 100644
--- a/ports/stm32/boards/stm32l496_af.csv
+++ b/ports/stm32/boards/stm32l496_af.csv
@@ -1,142 +1,142 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,,,
-,,SYS_AF,TIM1/TIM2/TIM5/TIM8/LPTIM1,TIM1/TIM2/TIM3/TIM4/TIM5,TIM8,I2C1/I2C2/I2C3,SPI1/SPI2,SPI3/DFSDM,USART1/USART2/USART3,UART4/UART5/LPUART1,CAN1/TSC,OTG_FS/QUADSPI,LCD,SDMMC1/COMP1/COMP2/FMC/SWPMI1,SAI1/SAI2,TIM2/TIM15/TIM16/TIM17/LPTIM2,EVENTOUT,ADC,COMP,DAC
-PortA,PA0,,TIM2_CH1,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,,,,SAI1_EXTCLK,TIM2_ETR,EVENTOUT,ADC12_IN5,,
-PortA,PA1,,TIM2_CH2,TIM5_CH2,,I2C1_SMBA,SPI1_SCK,,USART2_RTS/USART2_DE,UART4_RX,,,LCD_SEG0,,,TIM15_CH1N,EVENTOUT,ADC12_IN6,,
-PortA,PA2,,TIM2_CH3,TIM5_CH3,,,,,USART2_TX,LPUART1_TX,,QUADSPI_BK1_NCS,LCD_SEG1,,SAI2_EXTCLK,TIM15_CH1,EVENTOUT,ADC12_IN7,,
-PortA,PA3,,TIM2_CH4,TIM5_CH4,,,,,USART2_RX,LPUART1_RX,,QUADSPI_CLK,LCD_SEG2,,SAI1_MCLK_A,TIM15_CH2,EVENTOUT,ADC12_IN8,,
-PortA,PA4,,,,,,SPI1_NSS,SPI3_NSS,USART2_CK,,,DCMI_HSYNC,,,SAI1_FS_B,LPTIM2_OUT,EVENTOUT,ADC12_IN9,,DAC1_OUT1
-PortA,PA5,,TIM2_CH1,TIM2_ETR,TIM8_CH1N,,SPI1_SCK,,,,,,,,,LPTIM2_ETR,EVENTOUT,ADC12_IN10,,DAC1_OUT2
-PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,DCMI_PIXCLK,SPI1_MISO,,USART3_CTS,LPUART1_CTS,,QUADSPI_BK1_IO3,LCD_SEG3,TIM1_BKIN_COMP2,TIM8_BKIN_COMP2,TIM16_CH1,EVENTOUT,ADC12_IN11,,
-PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,I2C3_SCL,SPI1_MOSI,,,,,QUADSPI_BK1_IO2,LCD_SEG4,,,TIM17_CH1,EVENTOUT,ADC12_IN12,,
-PortA,PA8,MCO,TIM1_CH1,,,,,,USART1_CK,,,OTG_FS_SOF,LCD_COM0,SWPMI1_IO,SAI1_SCK_A,LPTIM2_OUT,EVENTOUT,,,
-PortA,PA9,,TIM1_CH2,,SPI2_SCK,I2C1_SCL,DCMI_D0,,USART1_TX,,,,LCD_COM1,,SAI1_FS_A,TIM15_BKIN,EVENTOUT,,,
-PortA,PA10,,TIM1_CH3,,,I2C1_SDA,DCMI_D1,,USART1_RX,,,OTG_FS_ID,LCD_COM2,,SAI1_SD_A,TIM17_BKIN,EVENTOUT,,,
-PortA,PA11,,TIM1_CH4,TIM1_BKIN2,,,SPI1_MISO,,USART1_CTS,,CAN1_RX,OTG_FS_DM,,TIM1_BKIN2_COMP1,,,EVENTOUT,,,
-PortA,PA12,,TIM1_ETR,,,,SPI1_MOSI,,USART1_RTS/USART1_DE,,CAN1_TX,OTG_FS_DP,,,,,EVENTOUT,,,
-PortA,PA13,JTMS/SWDIO,IR_OUT,,,,,,,,,OTG_FS_NOE,,SWPMI1_TX,SAI1_SD_B,,EVENTOUT,,,
-PortA,PA14,JTCK/SWCLK,LPTIM1_OUT,,,I2C1_SMBA,I2C4_SMBA,,,,,OTG_FS_SOF,,SWPMI1_RX,SAI1_FS_B,,EVENTOUT,,,
-PortA,PA15,JTDI,TIM2_CH1,TIM2_ETR,USART2_RX,,SPI1_NSS,SPI3_NSS,USART3_RTS/USART3_DE,UART4_RTS/UART4_DE,TSC_G3_IO1,,LCD_SEG17,SWPMI1_SUSPEND,SAI2_FS_B,,EVENTOUT,,,
-PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,SPI1_NSS,,USART3_CK,,,QUADSPI_BK1_IO1,LCD_SEG5,COMP1_OUT,SAI1_EXTCLK,,EVENTOUT,ADC12_IN15,,
-PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,DFSDM1_DATIN0,USART3_RTS/USART3_DE,LPUART1_RTS/LPUART1_DE,,QUADSPI_BK1_IO0,LCD_SEG6,,,LPTIM2_IN1,EVENTOUT,ADC12_IN16,COMP1_INM,
-PortB,PB2,RTC_OUT,LPTIM1_OUT,,,I2C3_SMBA,,DFSDM1_CKIN0,,,,,LCD_VLCD,,,,EVENTOUT,,COMP1_INP,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,SPI3_SCK,USART1_RTS/USART1_DE,,,OTG_FS_CRS_SYNC,LCD_SEG7,,SAI1_SCK_B,,EVENTOUT,,COMP2_INM,
-PortB,PB4,NJTRST,,TIM3_CH1,,I2C3_SDA,SPI1_MISO,SPI3_MISO,USART1_CTS,UART5_RTS/UART5_DE,TSC_G2_IO1,DCMI_D12,LCD_SEG8,,SAI1_MCLK_B,TIM17_BKIN,EVENTOUT,,COMP2_INP,
-PortB,PB5,,LPTIM1_IN1,TIM3_CH2,CAN2_RX,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI,USART1_CK,UART5_CTS,TSC_G2_IO2,DCMI_D10,LCD_SEG9,COMP2_OUT,SAI1_SD_B,TIM16_BKIN,EVENTOUT,,,
-PortB,PB6,,LPTIM1_ETR,TIM4_CH1,TIM8_BKIN2,I2C1_SCL,I2C4_SCL,DFSDM1_DATIN5,USART1_TX,CAN2_TX,TSC_G2_IO3,DCMI_D5,,TIM8_BKIN2_COMP2,SAI1_FS_B,TIM16_CH1N,EVENTOUT,,COMP2_INP,
-PortB,PB7,,LPTIM1_IN2,TIM4_CH2,TIM8_BKIN,I2C1_SDA,I2C4_SDA,DFSDM1_CKIN5,USART1_RX,UART4_CTS,TSC_G2_IO4,DCMI_VSYNC,LCD_SEG21,FMC_NL,TIM8_BKIN_COMP1,TIM17_CH1N,EVENTOUT,,COMP2_INM,
-PortB,PB8,,,TIM4_CH3,,I2C1_SCL,,DFSDM1_DATIN6,,,CAN1_RX,DCMI_D6,LCD_SEG16,SDMMC1_D4,SAI1_MCLK_A,TIM16_CH1,EVENTOUT,,,
-PortB,PB9,,IR_OUT,TIM4_CH4,,I2C1_SDA,SPI2_NSS,DFSDM1_CKIN6,,,CAN1_TX,DCMI_D7,LCD_COM3,SDMMC1_D5,SAI1_FS_A,TIM17_CH1,EVENTOUT,,,
-PortB,PB10,,TIM2_CH3,,I2C4_SCL,I2C2_SCL,SPI2_SCK,DFSDM1_DATIN7,USART3_TX,LPUART1_RX,TSC_SYNC,QUADSPI_CLK,LCD_SEG10,COMP1_OUT,SAI1_SCK_A,,EVENTOUT,,,
-PortB,PB11,,TIM2_CH4,,I2C4_SDA,I2C2_SDA,,DFSDM1_CKIN7,USART3_RX,LPUART1_TX,,QUADSPI_BK1_NCS,LCD_SEG11,COMP2_OUT,,,EVENTOUT,,,
-PortB,PB12,,TIM1_BKIN,,TIM1_BKIN_COMP2,I2C2_SMBA,SPI2_NSS,DFSDM1_DATIN1,USART3_CK,LPUART1_RTS/LPUART1_DE,TSC_G1_IO1,CAN2_RX,LCD_SEG12,SWPMI1_IO,SAI2_FS_A,TIM15_BKIN,EVENTOUT,,,
-PortB,PB13,,TIM1_CH1N,,,I2C2_SCL,SPI2_SCK,DFSDM1_CKIN1,USART3_CTS,LPUART1_CTS,TSC_G1_IO2,CAN2_TX,LCD_SEG13,SWPMI1_TX,SAI2_SCK_A,TIM15_CH1N,EVENTOUT,,,
-PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,I2C2_SDA,SPI2_MISO,DFSDM1_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,DFSDM1_CKIN2,,,TSC_G1_IO4,,LCD_SEG15,SWPMI1_SUSPEND,SAI2_SD_A,TIM15_CH2,EVENTOUT,,,
-PortC,PC0,,LPTIM1_IN1,I2C4_SCL,,I2C3_SCL,,DFSDM1_DATIN4,,LPUART1_RX,,,LCD_SEG18,,,LPTIM2_IN1,EVENTOUT,ADC123_IN1,,
-PortC,PC1,TRACED0,LPTIM1_OUT,I2C4_SDA,SPI2_MOSI,I2C3_SDA,,DFSDM1_CKIN4,,LPUART1_TX,,QUADSPI_BK2_IO0,LCD_SEG19,,SAI1_SD_A,,EVENTOUT,ADC123_IN2,,
-PortC,PC2,,LPTIM1_IN2,,,,SPI2_MISO,DFSDM1_CKOUT,,,,QUADSPI_BK2_IO1,LCD_SEG20,,,,EVENTOUT,ADC123_IN3,,
-PortC,PC3,,LPTIM1_ETR,,,,SPI2_MOSI,,,,,QUADSPI_BK2_IO2,LCD_VLCD,,SAI1_SD_A,LPTIM2_ETR,EVENTOUT,ADC123_IN4,,
-PortC,PC4,,,,,,,,USART3_TX,,,QUADSPI_BK2_IO3,LCD_SEG22,,,,EVENTOUT,ADC12_IN13,COMP1_INM,
-PortC,PC5,,,,,,,,USART3_RX,,,,LCD_SEG23,,,,EVENTOUT,ADC12_IN14,COMP1_INP,
-PortC,PC6,,,TIM3_CH1,TIM8_CH1,,,DFSDM1_CKIN3,,,TSC_G4_IO1,DCMI_D0,LCD_SEG24,SDMMC1_D6,SAI2_MCLK_A,,EVENTOUT,,,
-PortC,PC7,,,TIM3_CH2,TIM8_CH2,,,DFSDM1_DATIN3,,,TSC_G4_IO2,DCMI_D1,LCD_SEG25,SDMMC1_D7,SAI2_MCLK_B,,EVENTOUT,,,
-PortC,PC8,,,TIM3_CH3,TIM8_CH3,,,,,,TSC_G4_IO3,DCMI_D2,LCD_SEG26,SDMMC1_D0,,,EVENTOUT,,,
-PortC,PC9,,TIM8_BKIN2,TIM3_CH4,TIM8_CH4,DCMI_D3,,I2C3_SDA,,,TSC_G4_IO4,OTG_FS_NOE,LCD_SEG27,SDMMC1_D1,SAI2_EXTCLK,TIM8_BKIN2_COMP1,EVENTOUT,,,
-PortC,PC10,TRACED1,,,,,,SPI3_SCK,USART3_TX,UART4_TX,TSC_G3_IO2,DCMI_D8,LCD_COM4/LCD_SEG28/LCD_SEG40,SDMMC1_D2,SAI2_SCK_B,,EVENTOUT,,,
-PortC,PC11,,,,,,QUADSPI_BK2_NCS,SPI3_MISO,USART3_RX,UART4_RX,TSC_G3_IO3,DCMI_D4,LCD_COM5/LCD_SEG29/LCD_SEG41,SDMMC1_D3,SAI2_MCLK_B,,EVENTOUT,,,
-PortC,PC12,TRACED3,,,,,,SPI3_MOSI,USART3_CK,UART5_TX,TSC_G3_IO4,DCMI_D9,LCD_COM6/LCD_SEG30/LCD_SEG42,SDMMC1_CK,SAI2_SD_B,,EVENTOUT,,,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortD,PD0,,,,,,SPI2_NSS,DFSDM1_DATIN7,,,CAN1_RX,,,FMC_D2,,,EVENTOUT,,,
-PortD,PD1,,,,,,SPI2_SCK,DFSDM1_CKIN7,,,CAN1_TX,,,FMC_D3,,,EVENTOUT,,,
-PortD,PD2,TRACED2,,TIM3_ETR,,,,,USART3_RTS/USART3_DE,UART5_RX,TSC_SYNC,DCMI_D11,LCD_COM7/LCD_SEG31/LCD_SEG43,SDMMC1_CMD,,,EVENTOUT,,,
-PortD,PD3,,,,SPI2_SCK,DCMI_D5,SPI2_MISO,DFSDM1_DATIN0,USART2_CTS,,,QUADSPI_BK2_NCS,,FMC_CLK,,,EVENTOUT,,,
-PortD,PD4,,,,,,SPI2_MOSI,DFSDM1_CKIN0,USART2_RTS/USART2_DE,,,QUADSPI_BK2_IO0,,FMC_NOE,,,EVENTOUT,,,
-PortD,PD5,,,,,,,,USART2_TX,,,QUADSPI_BK2_IO1,,FMC_NWE,,,EVENTOUT,,,
-PortD,PD6,,,,,DCMI_D10,QUADSPI_BK2_IO1,DFSDM1_DATIN1,USART2_RX,,,QUADSPI_BK2_IO2,,FMC_NWAIT,SAI1_SD_A,,EVENTOUT,,,
-PortD,PD7,,,,,,,DFSDM1_CKIN1,USART2_CK,,,QUADSPI_BK2_IO3,,FMC_NE1,,,EVENTOUT,,,
-PortD,PD8,,,,,,,,USART3_TX,,,DCMI_HSYNC,LCD_SEG28,FMC_D13,,,EVENTOUT,,,
-PortD,PD9,,,,,,,,USART3_RX,,,DCMI_PIXCLK,LCD_SEG29,FMC_D14,SAI2_MCLK_A,,EVENTOUT,,,
-PortD,PD10,,,,,,,,USART3_CK,,TSC_G6_IO1,,LCD_SEG30,FMC_D15,SAI2_SCK_A,,EVENTOUT,,,
-PortD,PD11,,,,,I2C4_SMBA,,,USART3_CTS,,TSC_G6_IO2,,LCD_SEG31,FMC_A16,SAI2_SD_A,LPTIM2_ETR,EVENTOUT,,,
-PortD,PD12,,,TIM4_CH1,,I2C4_SCL,,,USART3_RTS/USART3_DE,,TSC_G6_IO3,,LCD_SEG32,FMC_A17,SAI2_FS_A,LPTIM2_IN1,EVENTOUT,,,
-PortD,PD13,,,TIM4_CH2,,I2C4_SDA,,,,,TSC_G6_IO4,,LCD_SEG33,FMC_A18,,LPTIM2_OUT,EVENTOUT,,,
-PortD,PD14,,,TIM4_CH3,,,,,,,,,LCD_SEG34,FMC_D0,,,EVENTOUT,,,
-PortD,PD15,,,TIM4_CH4,,,,,,,,,LCD_SEG35,FMC_D1,,,EVENTOUT,,,
-PortE,PE0,,,TIM4_ETR,,,,,,,,DCMI_D2,LCD_SEG36,FMC_NBL0,,TIM16_CH1,EVENTOUT,,,
-PortE,PE1,,,,,,,,,,,DCMI_D3,LCD_SEG37,FMC_NBL1,,TIM17_CH1,EVENTOUT,,,
-PortE,PE2,TRACECLK,,TIM3_ETR,,,,,,,TSC_G7_IO1,,LCD_SEG38,FMC_A23,SAI1_MCLK_A,,EVENTOUT,,,
-PortE,PE3,TRACED0,,TIM3_CH1,,,,,,,TSC_G7_IO2,,LCD_SEG39,FMC_A19,SAI1_SD_B,,EVENTOUT,,,
-PortE,PE4,TRACED1,,TIM3_CH2,,,,DFSDM1_DATIN3,,,TSC_G7_IO3,DCMI_D4,,FMC_A20,SAI1_FS_A,,EVENTOUT,,,
-PortE,PE5,TRACED2,,TIM3_CH3,,,,DFSDM1_CKIN3,,,TSC_G7_IO4,DCMI_D6,,FMC_A21,SAI1_SCK_A,,EVENTOUT,,,
-PortE,PE6,TRACED3,,TIM3_CH4,,,,,,,,DCMI_D7,,FMC_A22,SAI1_SD_A,,EVENTOUT,,,
-PortE,PE7,,TIM1_ETR,,,,,DFSDM1_DATIN2,,,,,,FMC_D4,SAI1_SD_B,,EVENTOUT,,,
-PortE,PE8,,TIM1_CH1N,,,,,DFSDM1_CKIN2,,,,,,FMC_D5,SAI1_SCK_B,,EVENTOUT,,,
-PortE,PE9,,TIM1_CH1,,,,,DFSDM1_CKOUT,,,,,,FMC_D6,SAI1_FS_B,,EVENTOUT,,,
-PortE,PE10,,TIM1_CH2N,,,,,DFSDM1_DATIN4,,,TSC_G5_IO1,QUADSPI_CLK,,FMC_D7,SAI1_MCLK_B,,EVENTOUT,,,
-PortE,PE11,,TIM1_CH2,,,,,DFSDM1_CKIN4,,,TSC_G5_IO2,QUADSPI_BK1_NCS,,FMC_D8,,,EVENTOUT,,,
-PortE,PE12,,TIM1_CH3N,,,,SPI1_NSS,DFSDM1_DATIN5,,,TSC_G5_IO3,QUADSPI_BK1_IO0,,FMC_D9,,,EVENTOUT,,,
-PortE,PE13,,TIM1_CH3,,,,SPI1_SCK,DFSDM1_CKIN5,,,TSC_G5_IO4,QUADSPI_BK1_IO1,,FMC_D10,,,EVENTOUT,,,
-PortE,PE14,,TIM1_CH4,TIM1_BKIN2,TIM1_BKIN2_COMP2,,SPI1_MISO,,,,,QUADSPI_BK1_IO2,,FMC_D11,,,EVENTOUT,,,
-PortE,PE15,,TIM1_BKIN,,TIM1_BKIN_COMP1,,SPI1_MOSI,,,,,QUADSPI_BK1_IO3,,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_IN6,,
-PortF,PF4,,,,,,,,,,,,,FMC_A4,,,EVENTOUT,ADC3_IN7,,
-PortF,PF5,,,,,,,,,,,,,FMC_A5,,,EVENTOUT,ADC3_IN8,,
-PortF,PF6,,TIM5_ETR,TIM5_CH1,,,,,,,,QUADSPI_BK1_IO3,,,SAI1_SD_B,,EVENTOUT,ADC3_IN9,,
-PortF,PF7,,,TIM5_CH2,,,,,,,,QUADSPI_BK1_IO2,,,SAI1_MCLK_B,,EVENTOUT,ADC3_IN10,,
-PortF,PF8,,,TIM5_CH3,,,,,,,,QUADSPI_BK1_IO0,,,SAI1_SCK_B,,EVENTOUT,ADC3_IN11,,
-PortF,PF9,,,TIM5_CH4,,,,,,,,QUADSPI_BK1_IO1,,,SAI1_FS_B,TIM15_CH1,EVENTOUT,ADC3_IN12,,
-PortF,PF10,,,,QUADSPI_CLK,,,,,,,DCMI_D11,,,,TIM15_CH2,EVENTOUT,ADC3_IN13,,
-PortF,PF11,,,,,,,,,,,DCMI_D12,,,,,EVENTOUT,,,
-PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,,,
-PortF,PF13,,,,,I2C4_SMBA,,DFSDM1_DATIN6,,,,,,FMC_A7,,,EVENTOUT,,,
-PortF,PF14,,,,,I2C4_SCL,,DFSDM1_CKIN6,,,TSC_G8_IO1,,,FMC_A8,,,EVENTOUT,,,
-PortF,PF15,,,,,I2C4_SDA,,,,,TSC_G8_IO2,,,FMC_A9,,,EVENTOUT,,,
-PortG,PG0,,,,,,,,,,TSC_G8_IO3,,,FMC_A10,,,EVENTOUT,,,
-PortG,PG1,,,,,,,,,,TSC_G8_IO4,,,FMC_A11,,,EVENTOUT,,,
-PortG,PG2,,,,,,SPI1_SCK,,,,,,,FMC_A12,SAI2_SCK_B,,EVENTOUT,,,
-PortG,PG3,,,,,,SPI1_MISO,,,,,,,FMC_A13,SAI2_FS_B,,EVENTOUT,,,
-PortG,PG4,,,,,,SPI1_MOSI,,,,,,,FMC_A14,SAI2_MCLK_B,,EVENTOUT,,,
-PortG,PG5,,,,,,SPI1_NSS,,,LPUART1_CTS,,,,FMC_A15,SAI2_SD_B,,EVENTOUT,,,
-PortG,PG6,,,,,I2C3_SMBA,,,,LPUART1_RTS/LPUART1_DE,,,,,,,EVENTOUT,,,
-PortG,PG7,,,,,I2C3_SCL,,,,LPUART1_TX,,,,FMC_INT,SAI1_MCLK_A,,EVENTOUT,,,
-PortG,PG8,,,,,I2C3_SDA,,,,LPUART1_RX,,,,,,,EVENTOUT,,,
-PortG,PG9,,,,,,,SPI3_SCK,USART1_TX,,,,,FMC_NCE/FMC_NE2,SAI2_SCK_A,TIM15_CH1N,EVENTOUT,,,
-PortG,PG10,,LPTIM1_IN1,,,,,SPI3_MISO,USART1_RX,,,,,FMC_NE3,SAI2_FS_A,TIM15_CH1,EVENTOUT,,,
-PortG,PG11,,LPTIM1_IN2,,,,,SPI3_MOSI,USART1_CTS,,,,,,SAI2_MCLK_A,TIM15_CH2,EVENTOUT,,,
-PortG,PG12,,LPTIM1_ETR,,,,,SPI3_NSS,USART1_RTS/USART1_DE,,,,,FMC_NE4,SAI2_SD_A,,EVENTOUT,,,
-PortG,PG13,,,,,I2C1_SDA,,,USART1_CK,,,,,FMC_A24,,,EVENTOUT,,,
-PortG,PG14,,,,,I2C1_SCL,,,,,,,,FMC_A25,,,EVENTOUT,,,
-PortG,PG15,,LPTIM1_OUT,,,I2C1_SMBA,,,,,,DCMI_D13,,,,,EVENTOUT,,,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH2,,,,QUADSPI_BK2_IO0,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH3,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH4,,,,,I2C2_SCL,,,,,,,,,,,EVENTOUT,,,
-PortH,PH5,,,,,I2C2_SDA,,,,,,DCMI_PIXCLK,,,,,EVENTOUT,,,
-PortH,PH6,,,,,I2C2_SMBA,,,,,,DCMI_D8,,,,,EVENTOUT,,,
-PortH,PH7,,,,,I2C3_SCL,,,,,,DCMI_D9,,,,,EVENTOUT,,,
-PortH,PH8,,,,,I2C3_SDA,,,,,,DCMI_HSYNC,,,,,EVENTOUT,,,
-PortH,PH9,,,,,I2C3_SMBA,,,,,,DCMI_D0,,,,,EVENTOUT,,,
-PortH,PH10,,,TIM5_CH1,,,,,,,,DCMI_D1,,,,,EVENTOUT,,,
-PortH,PH11,,,TIM5_CH2,,,,,,,,DCMI_D2,,,,,EVENTOUT,,,
-PortH,PH12,,,TIM5_CH3,,,,,,,,DCMI_D3,,,,,EVENTOUT,,,
-PortH,PH13,,,,TIM8_CH1N,,,,,,CAN1_TX,,,,,,EVENTOUT,,,
-PortH,PH14,,,,TIM8_CH2N,,,,,,,DCMI_D4,,,,,EVENTOUT,,,
-PortH,PH15,,,,TIM8_CH3N,,,,,,,DCMI_D11,,,,,EVENTOUT,,,
-PortI,PI0,,,TIM5_CH4,,,SPI2_NSS,,,,,DCMI_D13,,,,,EVENTOUT,,,
-PortI,PI1,,,,,,SPI2_SCK,,,,,DCMI_D8,,,,,EVENTOUT,,,
-PortI,PI2,,,,TIM8_CH4,,SPI2_MISO,,,,,DCMI_D9,,,,,EVENTOUT,,,
-PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI,,,,,DCMI_D10,,,,,EVENTOUT,,,
-PortI,PI4,,,,TIM8_BKIN,,,,,,,DCMI_D5,,,,,EVENTOUT,,,
-PortI,PI5,,,,TIM8_CH1,,,,,,,DCMI_VSYNC,,,,,EVENTOUT,,,
-PortI,PI6,,,,TIM8_CH2,,,,,,,DCMI_D6,,,,,EVENTOUT,,,
-PortI,PI7,,,,TIM8_CH3,,,,,,,DCMI_D7,,,,,EVENTOUT,,,
-PortI,PI8,,,,,,,,,,,DCMI_D12,,,,,EVENTOUT,,,
-PortI,PI9,,,,,,,,,,CAN1_RX,,,,,,EVENTOUT,,,
-PortI,PI10,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortI,PI11,,,,,,,,,,,,,,,,EVENTOUT,,,
+Port ,Pin ,AF0          ,AF1                       ,AF2                     ,AF3             ,AF4           ,AF5            ,AF6          ,AF7                 ,AF8                   ,AF9       ,AF10           ,AF11                        ,AF12                         ,AF13           ,AF14                         ,AF15    ,ADC
+     ,    ,SYS_AF       ,TIM1/TIM2/TIM5/TIM8/LPTIM1,TIM1/TIM2/TIM3/TIM4/TIM5,TIM8            ,I2C1/I2C2/I2C3,SPI1/SPI2      ,SPI3/DFSDM   ,USART1/USART2/USART3,UART4/UART5/LPUART1   ,CAN1/TSC  ,OTG_FS/QUADSPI ,LCD                         ,SDMMC1/COMP1/COMP2/FMC/SWPMI1,SAI1/SAI2      ,TIM2/TIM15/TIM16/TIM17/LPTIM2,EVENTOUT,ADC
+PortA,PA0 ,             ,TIM2_CH1                  ,TIM5_CH1                ,TIM8_ETR        ,              ,               ,             ,USART2_CTS          ,UART4_TX              ,          ,               ,                            ,                             ,SAI1_EXTCLK    ,TIM2_ETR                     ,EVENTOUT,ADC12_IN5
+PortA,PA1 ,             ,TIM2_CH2                  ,TIM5_CH2                ,                ,I2C1_SMBA     ,SPI1_SCK       ,             ,USART2_RTS/USART2_DE,UART4_RX              ,          ,               ,LCD_SEG0                    ,                             ,               ,TIM15_CH1N                   ,EVENTOUT,ADC12_IN6
+PortA,PA2 ,             ,TIM2_CH3                  ,TIM5_CH3                ,                ,              ,               ,             ,USART2_TX           ,LPUART1_TX            ,          ,QUADSPI_BK1_NCS,LCD_SEG1                    ,                             ,SAI2_EXTCLK    ,TIM15_CH1                    ,EVENTOUT,ADC12_IN7
+PortA,PA3 ,             ,TIM2_CH4                  ,TIM5_CH4                ,                ,              ,               ,             ,USART2_RX           ,LPUART1_RX            ,          ,QUADSPI_CLK    ,LCD_SEG2                    ,                             ,SAI1_MCLK_A    ,TIM15_CH2                    ,EVENTOUT,ADC12_IN8
+PortA,PA4 ,             ,                          ,                        ,                ,              ,SPI1_NSS       ,SPI3_NSS     ,USART2_CK           ,                      ,          ,DCMI_HSYNC     ,                            ,                             ,SAI1_FS_B      ,LPTIM2_OUT                   ,EVENTOUT,ADC12_IN9
+PortA,PA5 ,             ,TIM2_CH1                  ,TIM2_ETR                ,TIM8_CH1N       ,              ,SPI1_SCK       ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,LPTIM2_ETR                   ,EVENTOUT,ADC12_IN10
+PortA,PA6 ,             ,TIM1_BKIN                 ,TIM3_CH1                ,TIM8_BKIN       ,DCMI_PIXCLK   ,SPI1_MISO      ,             ,USART3_CTS          ,LPUART1_CTS           ,          ,QUADSPI_BK1_IO3,LCD_SEG3                    ,TIM1_BKIN_COMP2              ,TIM8_BKIN_COMP2,TIM16_CH1                    ,EVENTOUT,ADC12_IN11
+PortA,PA7 ,             ,TIM1_CH1N                 ,TIM3_CH2                ,TIM8_CH1N       ,I2C3_SCL      ,SPI1_MOSI      ,             ,                    ,                      ,          ,QUADSPI_BK1_IO2,LCD_SEG4                    ,                             ,               ,TIM17_CH1                    ,EVENTOUT,ADC12_IN12
+PortA,PA8 ,MCO          ,TIM1_CH1                  ,                        ,                ,              ,               ,             ,USART1_CK           ,                      ,          ,OTG_FS_SOF     ,LCD_COM0                    ,SWPMI1_IO                    ,SAI1_SCK_A     ,LPTIM2_OUT                   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2                  ,                        ,SPI2_SCK        ,I2C1_SCL      ,DCMI_D0        ,             ,USART1_TX           ,                      ,          ,               ,LCD_COM1                    ,                             ,SAI1_FS_A      ,TIM15_BKIN                   ,EVENTOUT,
+PortA,PA10,             ,TIM1_CH3                  ,                        ,                ,I2C1_SDA      ,DCMI_D1        ,             ,USART1_RX           ,                      ,          ,OTG_FS_ID      ,LCD_COM2                    ,                             ,SAI1_SD_A      ,TIM17_BKIN                   ,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4                  ,TIM1_BKIN2              ,                ,              ,SPI1_MISO      ,             ,USART1_CTS          ,                      ,CAN1_RX   ,OTG_FS_DM      ,                            ,TIM1_BKIN2_COMP1             ,               ,                             ,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR                  ,                        ,                ,              ,SPI1_MOSI      ,             ,USART1_RTS/USART1_DE,                      ,CAN1_TX   ,OTG_FS_DP      ,                            ,                             ,               ,                             ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,IR_OUT                    ,                        ,                ,              ,               ,             ,                    ,                      ,          ,OTG_FS_NOE     ,                            ,SWPMI1_TX                    ,SAI1_SD_B      ,                             ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,LPTIM1_OUT                ,                        ,                ,I2C1_SMBA     ,I2C4_SMBA      ,             ,                    ,                      ,          ,OTG_FS_SOF     ,                            ,SWPMI1_RX                    ,SAI1_FS_B      ,                             ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1                  ,TIM2_ETR                ,USART2_RX       ,              ,SPI1_NSS       ,SPI3_NSS     ,USART3_RTS/USART3_DE,UART4_RTS/UART4_DE    ,TSC_G3_IO1,               ,LCD_SEG17                   ,SWPMI1_SUSPEND               ,SAI2_FS_B      ,                             ,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N                 ,TIM3_CH3                ,TIM8_CH2N       ,              ,SPI1_NSS       ,             ,USART3_CK           ,                      ,          ,QUADSPI_BK1_IO1,LCD_SEG5                    ,COMP1_OUT                    ,SAI1_EXTCLK    ,                             ,EVENTOUT,ADC12_IN15
+PortB,PB1 ,             ,TIM1_CH3N                 ,TIM3_CH4                ,TIM8_CH3N       ,              ,               ,DFSDM1_DATIN0,USART3_RTS/USART3_DE,LPUART1_RTS/LPUART1_DE,          ,QUADSPI_BK1_IO0,LCD_SEG6                    ,                             ,               ,LPTIM2_IN1                   ,EVENTOUT,ADC12_IN16
+PortB,PB2 ,RTC_OUT      ,LPTIM1_OUT                ,                        ,                ,I2C3_SMBA     ,               ,DFSDM1_CKIN0 ,                    ,                      ,          ,               ,LCD_VLCD                    ,                             ,               ,                             ,EVENTOUT,
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2                  ,                        ,                ,              ,SPI1_SCK       ,SPI3_SCK     ,USART1_RTS/USART1_DE,                      ,          ,OTG_FS_CRS_SYNC,LCD_SEG7                    ,                             ,SAI1_SCK_B     ,                             ,EVENTOUT,
+PortB,PB4 ,NJTRST       ,                          ,TIM3_CH1                ,                ,I2C3_SDA      ,SPI1_MISO      ,SPI3_MISO    ,USART1_CTS          ,UART5_RTS/UART5_DE    ,TSC_G2_IO1,DCMI_D12       ,LCD_SEG8                    ,                             ,SAI1_MCLK_B    ,TIM17_BKIN                   ,EVENTOUT,
+PortB,PB5 ,             ,LPTIM1_IN1                ,TIM3_CH2                ,CAN2_RX         ,I2C1_SMBA     ,SPI1_MOSI      ,SPI3_MOSI    ,USART1_CK           ,UART5_CTS             ,TSC_G2_IO2,DCMI_D10       ,LCD_SEG9                    ,COMP2_OUT                    ,SAI1_SD_B      ,TIM16_BKIN                   ,EVENTOUT,
+PortB,PB6 ,             ,LPTIM1_ETR                ,TIM4_CH1                ,TIM8_BKIN2      ,I2C1_SCL      ,I2C4_SCL       ,DFSDM1_DATIN5,USART1_TX           ,CAN2_TX               ,TSC_G2_IO3,DCMI_D5        ,                            ,TIM8_BKIN2_COMP2             ,SAI1_FS_B      ,TIM16_CH1N                   ,EVENTOUT,
+PortB,PB7 ,             ,LPTIM1_IN2                ,TIM4_CH2                ,TIM8_BKIN       ,I2C1_SDA      ,I2C4_SDA       ,DFSDM1_CKIN5 ,USART1_RX           ,UART4_CTS             ,TSC_G2_IO4,DCMI_VSYNC     ,LCD_SEG21                   ,FMC_NL                       ,TIM8_BKIN_COMP1,TIM17_CH1N                   ,EVENTOUT,
+PortB,PB8 ,             ,                          ,TIM4_CH3                ,                ,I2C1_SCL      ,               ,DFSDM1_DATIN6,                    ,                      ,CAN1_RX   ,DCMI_D6        ,LCD_SEG16                   ,SDMMC1_D4                    ,SAI1_MCLK_A    ,TIM16_CH1                    ,EVENTOUT,
+PortB,PB9 ,             ,IR_OUT                    ,TIM4_CH4                ,                ,I2C1_SDA      ,SPI2_NSS       ,DFSDM1_CKIN6 ,                    ,                      ,CAN1_TX   ,DCMI_D7        ,LCD_COM3                    ,SDMMC1_D5                    ,SAI1_FS_A      ,TIM17_CH1                    ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3                  ,                        ,I2C4_SCL        ,I2C2_SCL      ,SPI2_SCK       ,DFSDM1_DATIN7,USART3_TX           ,LPUART1_RX            ,TSC_SYNC  ,QUADSPI_CLK    ,LCD_SEG10                   ,COMP1_OUT                    ,SAI1_SCK_A     ,                             ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4                  ,                        ,I2C4_SDA        ,I2C2_SDA      ,               ,DFSDM1_CKIN7 ,USART3_RX           ,LPUART1_TX            ,          ,QUADSPI_BK1_NCS,LCD_SEG11                   ,COMP2_OUT                    ,               ,                             ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN                 ,                        ,TIM1_BKIN_COMP2 ,I2C2_SMBA     ,SPI2_NSS       ,DFSDM1_DATIN1,USART3_CK           ,LPUART1_RTS/LPUART1_DE,TSC_G1_IO1,CAN2_RX        ,LCD_SEG12                   ,SWPMI1_IO                    ,SAI2_FS_A      ,TIM15_BKIN                   ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N                 ,                        ,                ,I2C2_SCL      ,SPI2_SCK       ,DFSDM1_CKIN1 ,USART3_CTS          ,LPUART1_CTS           ,TSC_G1_IO2,CAN2_TX        ,LCD_SEG13                   ,SWPMI1_TX                    ,SAI2_SCK_A     ,TIM15_CH1N                   ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N                 ,                        ,TIM8_CH2N       ,I2C2_SDA      ,SPI2_MISO      ,DFSDM1_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      ,DFSDM1_CKIN2 ,                    ,                      ,TSC_G1_IO4,               ,LCD_SEG15                   ,SWPMI1_SUSPEND               ,SAI2_SD_A      ,TIM15_CH2                    ,EVENTOUT,
+PortC,PC0 ,             ,LPTIM1_IN1                ,I2C4_SCL                ,                ,I2C3_SCL      ,               ,DFSDM1_DATIN4,                    ,LPUART1_RX            ,          ,               ,LCD_SEG18                   ,                             ,               ,LPTIM2_IN1                   ,EVENTOUT,ADC123_IN1
+PortC,PC1 ,TRACED0      ,LPTIM1_OUT                ,I2C4_SDA                ,SPI2_MOSI       ,I2C3_SDA      ,               ,DFSDM1_CKIN4 ,                    ,LPUART1_TX            ,          ,QUADSPI_BK2_IO0,LCD_SEG19                   ,                             ,SAI1_SD_A      ,                             ,EVENTOUT,ADC123_IN2
+PortC,PC2 ,             ,LPTIM1_IN2                ,                        ,                ,              ,SPI2_MISO      ,DFSDM1_CKOUT ,                    ,                      ,          ,QUADSPI_BK2_IO1,LCD_SEG20                   ,                             ,               ,                             ,EVENTOUT,ADC123_IN3
+PortC,PC3 ,             ,LPTIM1_ETR                ,                        ,                ,              ,SPI2_MOSI      ,             ,                    ,                      ,          ,QUADSPI_BK2_IO2,LCD_VLCD                    ,                             ,SAI1_SD_A      ,LPTIM2_ETR                   ,EVENTOUT,ADC123_IN4
+PortC,PC4 ,             ,                          ,                        ,                ,              ,               ,             ,USART3_TX           ,                      ,          ,QUADSPI_BK2_IO3,LCD_SEG22                   ,                             ,               ,                             ,EVENTOUT,ADC12_IN13
+PortC,PC5 ,             ,                          ,                        ,                ,              ,               ,             ,USART3_RX           ,                      ,          ,               ,LCD_SEG23                   ,                             ,               ,                             ,EVENTOUT,ADC12_IN14
+PortC,PC6 ,             ,                          ,TIM3_CH1                ,TIM8_CH1        ,              ,               ,DFSDM1_CKIN3 ,                    ,                      ,TSC_G4_IO1,DCMI_D0        ,LCD_SEG24                   ,SDMMC1_D6                    ,SAI2_MCLK_A    ,                             ,EVENTOUT,
+PortC,PC7 ,             ,                          ,TIM3_CH2                ,TIM8_CH2        ,              ,               ,DFSDM1_DATIN3,                    ,                      ,TSC_G4_IO2,DCMI_D1        ,LCD_SEG25                   ,SDMMC1_D7                    ,SAI2_MCLK_B    ,                             ,EVENTOUT,
+PortC,PC8 ,             ,                          ,TIM3_CH3                ,TIM8_CH3        ,              ,               ,             ,                    ,                      ,TSC_G4_IO3,DCMI_D2        ,LCD_SEG26                   ,SDMMC1_D0                    ,               ,                             ,EVENTOUT,
+PortC,PC9 ,             ,TIM8_BKIN2                ,TIM3_CH4                ,TIM8_CH4        ,DCMI_D3       ,               ,I2C3_SDA     ,                    ,                      ,TSC_G4_IO4,OTG_FS_NOE     ,LCD_SEG27                   ,SDMMC1_D1                    ,SAI2_EXTCLK    ,TIM8_BKIN2_COMP1             ,EVENTOUT,
+PortC,PC10,TRACED1      ,                          ,                        ,                ,              ,               ,SPI3_SCK     ,USART3_TX           ,UART4_TX              ,TSC_G3_IO2,DCMI_D8        ,LCD_COM4/LCD_SEG28/LCD_SEG40,SDMMC1_D2                    ,SAI2_SCK_B     ,                             ,EVENTOUT,
+PortC,PC11,             ,                          ,                        ,                ,              ,QUADSPI_BK2_NCS,SPI3_MISO    ,USART3_RX           ,UART4_RX              ,TSC_G3_IO3,DCMI_D4        ,LCD_COM5/LCD_SEG29/LCD_SEG41,SDMMC1_D3                    ,SAI2_MCLK_B    ,                             ,EVENTOUT,
+PortC,PC12,TRACED3      ,                          ,                        ,                ,              ,               ,SPI3_MOSI    ,USART3_CK           ,UART5_TX              ,TSC_G3_IO4,DCMI_D9        ,LCD_COM6/LCD_SEG30/LCD_SEG42,SDMMC1_CK                    ,SAI2_SD_B      ,                             ,EVENTOUT,
+PortC,PC13,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortC,PC14,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortC,PC15,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortD,PD0 ,             ,                          ,                        ,                ,              ,SPI2_NSS       ,DFSDM1_DATIN7,                    ,                      ,CAN1_RX   ,               ,                            ,FMC_D2                       ,               ,                             ,EVENTOUT,
+PortD,PD1 ,             ,                          ,                        ,                ,              ,SPI2_SCK       ,DFSDM1_CKIN7 ,                    ,                      ,CAN1_TX   ,               ,                            ,FMC_D3                       ,               ,                             ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,                          ,TIM3_ETR                ,                ,              ,               ,             ,USART3_RTS/USART3_DE,UART5_RX              ,TSC_SYNC  ,DCMI_D11       ,LCD_COM7/LCD_SEG31/LCD_SEG43,SDMMC1_CMD                   ,               ,                             ,EVENTOUT,
+PortD,PD3 ,             ,                          ,                        ,SPI2_SCK        ,DCMI_D5       ,SPI2_MISO      ,DFSDM1_DATIN0,USART2_CTS          ,                      ,          ,QUADSPI_BK2_NCS,                            ,FMC_CLK                      ,               ,                             ,EVENTOUT,
+PortD,PD4 ,             ,                          ,                        ,                ,              ,SPI2_MOSI      ,DFSDM1_CKIN0 ,USART2_RTS/USART2_DE,                      ,          ,QUADSPI_BK2_IO0,                            ,FMC_NOE                      ,               ,                             ,EVENTOUT,
+PortD,PD5 ,             ,                          ,                        ,                ,              ,               ,             ,USART2_TX           ,                      ,          ,QUADSPI_BK2_IO1,                            ,FMC_NWE                      ,               ,                             ,EVENTOUT,
+PortD,PD6 ,             ,                          ,                        ,                ,DCMI_D10      ,QUADSPI_BK2_IO1,DFSDM1_DATIN1,USART2_RX           ,                      ,          ,QUADSPI_BK2_IO2,                            ,FMC_NWAIT                    ,SAI1_SD_A      ,                             ,EVENTOUT,
+PortD,PD7 ,             ,                          ,                        ,                ,              ,               ,DFSDM1_CKIN1 ,USART2_CK           ,                      ,          ,QUADSPI_BK2_IO3,                            ,FMC_NE1                      ,               ,                             ,EVENTOUT,
+PortD,PD8 ,             ,                          ,                        ,                ,              ,               ,             ,USART3_TX           ,                      ,          ,DCMI_HSYNC     ,LCD_SEG28                   ,FMC_D13                      ,               ,                             ,EVENTOUT,
+PortD,PD9 ,             ,                          ,                        ,                ,              ,               ,             ,USART3_RX           ,                      ,          ,DCMI_PIXCLK    ,LCD_SEG29                   ,FMC_D14                      ,SAI2_MCLK_A    ,                             ,EVENTOUT,
+PortD,PD10,             ,                          ,                        ,                ,              ,               ,             ,USART3_CK           ,                      ,TSC_G6_IO1,               ,LCD_SEG30                   ,FMC_D15                      ,SAI2_SCK_A     ,                             ,EVENTOUT,
+PortD,PD11,             ,                          ,                        ,                ,I2C4_SMBA     ,               ,             ,USART3_CTS          ,                      ,TSC_G6_IO2,               ,LCD_SEG31                   ,FMC_A16                      ,SAI2_SD_A      ,LPTIM2_ETR                   ,EVENTOUT,
+PortD,PD12,             ,                          ,TIM4_CH1                ,                ,I2C4_SCL      ,               ,             ,USART3_RTS/USART3_DE,                      ,TSC_G6_IO3,               ,LCD_SEG32                   ,FMC_A17                      ,SAI2_FS_A      ,LPTIM2_IN1                   ,EVENTOUT,
+PortD,PD13,             ,                          ,TIM4_CH2                ,                ,I2C4_SDA      ,               ,             ,                    ,                      ,TSC_G6_IO4,               ,LCD_SEG33                   ,FMC_A18                      ,               ,LPTIM2_OUT                   ,EVENTOUT,
+PortD,PD14,             ,                          ,TIM4_CH3                ,                ,              ,               ,             ,                    ,                      ,          ,               ,LCD_SEG34                   ,FMC_D0                       ,               ,                             ,EVENTOUT,
+PortD,PD15,             ,                          ,TIM4_CH4                ,                ,              ,               ,             ,                    ,                      ,          ,               ,LCD_SEG35                   ,FMC_D1                       ,               ,                             ,EVENTOUT,
+PortE,PE0 ,             ,                          ,TIM4_ETR                ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D2        ,LCD_SEG36                   ,FMC_NBL0                     ,               ,TIM16_CH1                    ,EVENTOUT,
+PortE,PE1 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D3        ,LCD_SEG37                   ,FMC_NBL1                     ,               ,TIM17_CH1                    ,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,                          ,TIM3_ETR                ,                ,              ,               ,             ,                    ,                      ,TSC_G7_IO1,               ,LCD_SEG38                   ,FMC_A23                      ,SAI1_MCLK_A    ,                             ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                          ,TIM3_CH1                ,                ,              ,               ,             ,                    ,                      ,TSC_G7_IO2,               ,LCD_SEG39                   ,FMC_A19                      ,SAI1_SD_B      ,                             ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                          ,TIM3_CH2                ,                ,              ,               ,DFSDM1_DATIN3,                    ,                      ,TSC_G7_IO3,DCMI_D4        ,                            ,FMC_A20                      ,SAI1_FS_A      ,                             ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                          ,TIM3_CH3                ,                ,              ,               ,DFSDM1_CKIN3 ,                    ,                      ,TSC_G7_IO4,DCMI_D6        ,                            ,FMC_A21                      ,SAI1_SCK_A     ,                             ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,                          ,TIM3_CH4                ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D7        ,                            ,FMC_A22                      ,SAI1_SD_A      ,                             ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR                  ,                        ,                ,              ,               ,DFSDM1_DATIN2,                    ,                      ,          ,               ,                            ,FMC_D4                       ,SAI1_SD_B      ,                             ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N                 ,                        ,                ,              ,               ,DFSDM1_CKIN2 ,                    ,                      ,          ,               ,                            ,FMC_D5                       ,SAI1_SCK_B     ,                             ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1                  ,                        ,                ,              ,               ,DFSDM1_CKOUT ,                    ,                      ,          ,               ,                            ,FMC_D6                       ,SAI1_FS_B      ,                             ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N                 ,                        ,                ,              ,               ,DFSDM1_DATIN4,                    ,                      ,TSC_G5_IO1,QUADSPI_CLK    ,                            ,FMC_D7                       ,SAI1_MCLK_B    ,                             ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2                  ,                        ,                ,              ,               ,DFSDM1_CKIN4 ,                    ,                      ,TSC_G5_IO2,QUADSPI_BK1_NCS,                            ,FMC_D8                       ,               ,                             ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N                 ,                        ,                ,              ,SPI1_NSS       ,DFSDM1_DATIN5,                    ,                      ,TSC_G5_IO3,QUADSPI_BK1_IO0,                            ,FMC_D9                       ,               ,                             ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3                  ,                        ,                ,              ,SPI1_SCK       ,DFSDM1_CKIN5 ,                    ,                      ,TSC_G5_IO4,QUADSPI_BK1_IO1,                            ,FMC_D10                      ,               ,                             ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4                  ,TIM1_BKIN2              ,TIM1_BKIN2_COMP2,              ,SPI1_MISO      ,             ,                    ,                      ,          ,QUADSPI_BK1_IO2,                            ,FMC_D11                      ,               ,                             ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN                 ,                        ,TIM1_BKIN_COMP1 ,              ,SPI1_MOSI      ,             ,                    ,                      ,          ,QUADSPI_BK1_IO3,                            ,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_IN6
+PortF,PF4 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,FMC_A4                       ,               ,                             ,EVENTOUT,ADC3_IN7
+PortF,PF5 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,FMC_A5                       ,               ,                             ,EVENTOUT,ADC3_IN8
+PortF,PF6 ,             ,TIM5_ETR                  ,TIM5_CH1                ,                ,              ,               ,             ,                    ,                      ,          ,QUADSPI_BK1_IO3,                            ,                             ,SAI1_SD_B      ,                             ,EVENTOUT,ADC3_IN9
+PortF,PF7 ,             ,                          ,TIM5_CH2                ,                ,              ,               ,             ,                    ,                      ,          ,QUADSPI_BK1_IO2,                            ,                             ,SAI1_MCLK_B    ,                             ,EVENTOUT,ADC3_IN10
+PortF,PF8 ,             ,                          ,TIM5_CH3                ,                ,              ,               ,             ,                    ,                      ,          ,QUADSPI_BK1_IO0,                            ,                             ,SAI1_SCK_B     ,                             ,EVENTOUT,ADC3_IN11
+PortF,PF9 ,             ,                          ,TIM5_CH4                ,                ,              ,               ,             ,                    ,                      ,          ,QUADSPI_BK1_IO1,                            ,                             ,SAI1_FS_B      ,TIM15_CH1                    ,EVENTOUT,ADC3_IN12
+PortF,PF10,             ,                          ,                        ,QUADSPI_CLK     ,              ,               ,             ,                    ,                      ,          ,DCMI_D11       ,                            ,                             ,               ,TIM15_CH2                    ,EVENTOUT,ADC3_IN13
+PortF,PF11,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D12       ,                            ,                             ,               ,                             ,EVENTOUT,
+PortF,PF12,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,FMC_A6                       ,               ,                             ,EVENTOUT,
+PortF,PF13,             ,                          ,                        ,                ,I2C4_SMBA     ,               ,DFSDM1_DATIN6,                    ,                      ,          ,               ,                            ,FMC_A7                       ,               ,                             ,EVENTOUT,
+PortF,PF14,             ,                          ,                        ,                ,I2C4_SCL      ,               ,DFSDM1_CKIN6 ,                    ,                      ,TSC_G8_IO1,               ,                            ,FMC_A8                       ,               ,                             ,EVENTOUT,
+PortF,PF15,             ,                          ,                        ,                ,I2C4_SDA      ,               ,             ,                    ,                      ,TSC_G8_IO2,               ,                            ,FMC_A9                       ,               ,                             ,EVENTOUT,
+PortG,PG0 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,TSC_G8_IO3,               ,                            ,FMC_A10                      ,               ,                             ,EVENTOUT,
+PortG,PG1 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,TSC_G8_IO4,               ,                            ,FMC_A11                      ,               ,                             ,EVENTOUT,
+PortG,PG2 ,             ,                          ,                        ,                ,              ,SPI1_SCK       ,             ,                    ,                      ,          ,               ,                            ,FMC_A12                      ,SAI2_SCK_B     ,                             ,EVENTOUT,
+PortG,PG3 ,             ,                          ,                        ,                ,              ,SPI1_MISO      ,             ,                    ,                      ,          ,               ,                            ,FMC_A13                      ,SAI2_FS_B      ,                             ,EVENTOUT,
+PortG,PG4 ,             ,                          ,                        ,                ,              ,SPI1_MOSI      ,             ,                    ,                      ,          ,               ,                            ,FMC_A14                      ,SAI2_MCLK_B    ,                             ,EVENTOUT,
+PortG,PG5 ,             ,                          ,                        ,                ,              ,SPI1_NSS       ,             ,                    ,LPUART1_CTS           ,          ,               ,                            ,FMC_A15                      ,SAI2_SD_B      ,                             ,EVENTOUT,
+PortG,PG6 ,             ,                          ,                        ,                ,I2C3_SMBA     ,               ,             ,                    ,LPUART1_RTS/LPUART1_DE,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortG,PG7 ,             ,                          ,                        ,                ,I2C3_SCL      ,               ,             ,                    ,LPUART1_TX            ,          ,               ,                            ,FMC_INT                      ,SAI1_MCLK_A    ,                             ,EVENTOUT,
+PortG,PG8 ,             ,                          ,                        ,                ,I2C3_SDA      ,               ,             ,                    ,LPUART1_RX            ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortG,PG9 ,             ,                          ,                        ,                ,              ,               ,SPI3_SCK     ,USART1_TX           ,                      ,          ,               ,                            ,FMC_NCE/FMC_NE2              ,SAI2_SCK_A     ,TIM15_CH1N                   ,EVENTOUT,
+PortG,PG10,             ,LPTIM1_IN1                ,                        ,                ,              ,               ,SPI3_MISO    ,USART1_RX           ,                      ,          ,               ,                            ,FMC_NE3                      ,SAI2_FS_A      ,TIM15_CH1                    ,EVENTOUT,
+PortG,PG11,             ,LPTIM1_IN2                ,                        ,                ,              ,               ,SPI3_MOSI    ,USART1_CTS          ,                      ,          ,               ,                            ,                             ,SAI2_MCLK_A    ,TIM15_CH2                    ,EVENTOUT,
+PortG,PG12,             ,LPTIM1_ETR                ,                        ,                ,              ,               ,SPI3_NSS     ,USART1_RTS/USART1_DE,                      ,          ,               ,                            ,FMC_NE4                      ,SAI2_SD_A      ,                             ,EVENTOUT,
+PortG,PG13,             ,                          ,                        ,                ,I2C1_SDA      ,               ,             ,USART1_CK           ,                      ,          ,               ,                            ,FMC_A24                      ,               ,                             ,EVENTOUT,
+PortG,PG14,             ,                          ,                        ,                ,I2C1_SCL      ,               ,             ,                    ,                      ,          ,               ,                            ,FMC_A25                      ,               ,                             ,EVENTOUT,
+PortG,PG15,             ,LPTIM1_OUT                ,                        ,                ,I2C1_SMBA     ,               ,             ,                    ,                      ,          ,DCMI_D13       ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH0 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH1 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH2 ,             ,                          ,                        ,QUADSPI_BK2_IO0 ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH3 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH4 ,             ,                          ,                        ,                ,I2C2_SCL      ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH5 ,             ,                          ,                        ,                ,I2C2_SDA      ,               ,             ,                    ,                      ,          ,DCMI_PIXCLK    ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH6 ,             ,                          ,                        ,                ,I2C2_SMBA     ,               ,             ,                    ,                      ,          ,DCMI_D8        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH7 ,             ,                          ,                        ,                ,I2C3_SCL      ,               ,             ,                    ,                      ,          ,DCMI_D9        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH8 ,             ,                          ,                        ,                ,I2C3_SDA      ,               ,             ,                    ,                      ,          ,DCMI_HSYNC     ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH9 ,             ,                          ,                        ,                ,I2C3_SMBA     ,               ,             ,                    ,                      ,          ,DCMI_D0        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH10,             ,                          ,TIM5_CH1                ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D1        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH11,             ,                          ,TIM5_CH2                ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D2        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH12,             ,                          ,TIM5_CH3                ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D3        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH13,             ,                          ,                        ,TIM8_CH1N       ,              ,               ,             ,                    ,                      ,CAN1_TX   ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH14,             ,                          ,                        ,TIM8_CH2N       ,              ,               ,             ,                    ,                      ,          ,DCMI_D4        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortH,PH15,             ,                          ,                        ,TIM8_CH3N       ,              ,               ,             ,                    ,                      ,          ,DCMI_D11       ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI0 ,             ,                          ,TIM5_CH4                ,                ,              ,SPI2_NSS       ,             ,                    ,                      ,          ,DCMI_D13       ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI1 ,             ,                          ,                        ,                ,              ,SPI2_SCK       ,             ,                    ,                      ,          ,DCMI_D8        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI2 ,             ,                          ,                        ,TIM8_CH4        ,              ,SPI2_MISO      ,             ,                    ,                      ,          ,DCMI_D9        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI3 ,             ,                          ,                        ,TIM8_ETR        ,              ,SPI2_MOSI      ,             ,                    ,                      ,          ,DCMI_D10       ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI4 ,             ,                          ,                        ,TIM8_BKIN       ,              ,               ,             ,                    ,                      ,          ,DCMI_D5        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI5 ,             ,                          ,                        ,TIM8_CH1        ,              ,               ,             ,                    ,                      ,          ,DCMI_VSYNC     ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI6 ,             ,                          ,                        ,TIM8_CH2        ,              ,               ,             ,                    ,                      ,          ,DCMI_D6        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI7 ,             ,                          ,                        ,TIM8_CH3        ,              ,               ,             ,                    ,                      ,          ,DCMI_D7        ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI8 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,DCMI_D12       ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI9 ,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,CAN1_RX   ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI10,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
+PortI,PI11,             ,                          ,                        ,                ,              ,               ,             ,                    ,                      ,          ,               ,                            ,                             ,               ,                             ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32wb55_af.csv b/ports/stm32/boards/stm32wb55_af.csv
index d6e1c3f77334c..3d319b03cfc17 100644
--- a/ports/stm32/boards/stm32wb55_af.csv
+++ b/ports/stm32/boards/stm32wb55_af.csv
@@ -1,74 +1,74 @@
-Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
-,,SYS_AF,TIM1/TIM2/LPTIM1,TIM1/TIM2,SPI2/SAI1/TIM1,I2C1/I2C3,SPI1/SPI2,RF,USART1,LPUART1,TSC,USB/QUADSPI,LCD,COMP1/COMP2/TIM1,SAI1,TIM2/TIM16/TIM17/LPTIM2,EVENTOUT,ADC
-PortA,PA0,,TIM2_CH1,,,,,,,,,,,COMP1_OUT,SAI1_EXTCLK,TIM2_ETR,EVENTOUT,ADC1_IN5
-PortA,PA1,,TIM2_CH2,,,I2C1_SMBA,SPI1_SCK,,,,,,LCD_SEG0,,,,EVENTOUT,ADC1_IN6
-PortA,PA2,LSCO,TIM2_CH3,,,,,,,LPUART1_TX,,QUADSPI_BK1_NCS,LCD_SEG1,COMP2_OUT,,,EVENTOUT,ADC1_IN7
-PortA,PA3,,TIM2_CH4,,SAI1_PDM_CK1,,,,,LPUART1_RX,,QUADSPI_CLK,LCD_SEG2,,SAI1_MCLK_A,,EVENTOUT,ADC1_IN8
-PortA,PA4,,,,,,SPI1_NSS,,,,,,LCD_SEG5,,SAI1_FS_B,LPTIM2_OUT,EVENTOUT,ADC1_IN9
-PortA,PA5,,TIM2_CH1,TIM2_ETR,,,SPI1_SCK,,,,,,,,SAI1_SD_B,LPTIM2_ETR,EVENTOUT,ADC1_IN10
-PortA,PA6,,TIM1_BKIN,,,,SPI1_MISO,,,LPUART1_CTS,,QUADSPI_BK1_IO3,LCD_SEG3,TIM1_BKIN,,TIM16_CH1,EVENTOUT,ADC1_IN11
-PortA,PA7,,TIM1_CH1N,,,I2C3_SCL,SPI1_MOSI,,,,,QUADSPI_BK1_IO2,LCD_SEG4,COMP2_OUT,,TIM17_CH1,EVENTOUT,ADC1_IN12
-PortA,PA8,MCO,TIM1_CH1,,SAI1_PDM_CK2,,,,USART1_CK,,,,LCD_COM0,,SAI1_SCK_A,LPTIM2_OUT,EVENTOUT,ADC1_IN15
-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/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/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/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,
-PortB,PB7,,LPTIM1_IN2,,TIM1_BKIN,I2C1_SDA,,,USART1_RX,,TSC_G2_IO4,,LCD_SEG21,,,TIM17_CH1N,EVENTOUT,
-PortB,PB8,,TIM1_CH2N,,SAI1_PDM_CK1,I2C1_SCL,,,,,,QUADSPI_BK1_IO1,LCD_SEG16,,SAI1_MCLK_A,TIM16_CH1,EVENTOUT,
-PortB,PB9,,TIM1_CH3N,,SAI1_PDM_DI2,I2C1_SDA,SPI2_NSS,,,IR_OUT,TSC_G7_IO4,QUADSPI_BK1_IO0,LCD_COM3,,SAI1_FS_A,TIM17_CH1,EVENTOUT,
-PortB,PB10,,TIM2_CH3,,,I2C3_SCL,SPI2_SCK,,,LPUART1_RX,TSC_SYNC,QUADSPI_CLK,LCD_SEG10,COMP1_OUT,SAI1_SCK_A,,EVENTOUT,
-PortB,PB11,,TIM2_CH4,,,I2C3_SDA,,,,LPUART1_TX,,QUADSPI_BK1_NCS,LCD_SEG11,COMP2_OUT,,,EVENTOUT,
-PortB,PB12,,TIM1_BKIN,,TIM1_BKIN,I2C3_SMBA,SPI2_NSS,,,LPUART1_RTS,TSC_G1_IO1,,LCD_SEG12,,SAI1_FS_A,,EVENTOUT,
-PortB,PB13,,TIM1_CH1N,,,I2C3_SCL,SPI2_SCK,,,LPUART1_CTS,TSC_G1_IO2,,LCD_SEG13,,SAI1_SCK_A,,EVENTOUT,
-PortB,PB14,,TIM1_CH2N,,,I2C3_SDA,SPI2_MISO,,,,TSC_G1_IO3,,LCD_SEG14,,SAI1_MCLK_A,,EVENTOUT,
-PortB,PB15,RTC_REFIN,TIM1_CH3N,,,,SPI2_MOSI,,,,TSC_G1_IO4,,LCD_SEG15,,SAI1_SD_A,,EVENTOUT,
-PortC,PC0,,LPTIM1_IN1,,,I2C3_SCL,,,,LPUART1_RX,,,LCD_SEG18,,,LPTIM2_IN1,EVENTOUT,ADC1_IN1
-PortC,PC1,,LPTIM1_OUT,,SPI2_MOSI,I2C3_SDA,,,,LPUART1_TX,,,LCD_SEG19,,,,EVENTOUT,ADC1_IN2
-PortC,PC2,,LPTIM1_IN2,,,,SPI2_MISO,,,,,,LCD_SEG20,,,,EVENTOUT,ADC1_IN3
-PortC,PC3,,LPTIM1_ETR,,SAI1_PDM_DI1,,SPI2_MOSI,,,,,,LCD_VLCD,,SAI1_SD_A,LPTIM2_ETR,EVENTOUT,ADC1_IN4
-PortC,PC4,,,,,,,,,,,,LCD_SEG22,,,,EVENTOUT,ADC1_IN13
-PortC,PC5,,,,SAI1_PDM_DI3,,,,,,,,LCD_SEG23,,,,EVENTOUT,ADC1_IN14
-PortC,PC6,,,,,,,,,,TSC_G4_IO1,,LCD_SEG24,,,,EVENTOUT,
-PortC,PC7,,,,,,,,,,TSC_G4_IO2,,LCD_SEG25,,,,EVENTOUT,
-PortC,PC8,,,,,,,,,,TSC_G4_IO3,,LCD_SEG26,,,,EVENTOUT,
-PortC,PC9,,,,TIM1_BKIN,,,,,,TSC_G4_IO4,USB_NOE,LCD_SEG27,,SAI1_SCK_B,,EVENTOUT,
-PortC,PC10,TRACED1,,,,,,,,,TSC_G3_IO2,,LCD_COM4LCD_SEG28LCD_SEG40,,,,EVENTOUT,
-PortC,PC11,,,,,,,,,,TSC_G3_IO3,,LCD_COM5LCD_SEG29LCD_SEG41,,,,EVENTOUT,
-PortC,PC12,TRACED3,,,,,,,,,TSC_G3_IO4,,LCD_COM6LCD_SEG30LCD_SEG42,,,,EVENTOUT,
-PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
-PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
-PortD,PD0,,,,,,SPI2_NSS,,,,,,,,,,EVENTOUT,
-PortD,PD1,,,,,,SPI2_SCK,,,,,,,,,,EVENTOUT,
-PortD,PD2,TRACED2,,,,,,,,,TSC_SYNC,,LCD_COM7LCD_SEG31LCD_SEG43,,,,EVENTOUT,
-PortD,PD3,,,,SPI2_SCK,,SPI2_MISO,,,,,QUADSPI_BK1_NCS,,,,,EVENTOUT,
-PortD,PD4,,,,,,SPI2_MOSI,,,,TSC_G5_IO1,QUADSPI_BK1_IO0,,,,,EVENTOUT,
-PortD,PD5,,,,,,,,,,TSC_G5_IO2,QUADSPI_BK1_IO1,,,SAI1_MCLK_B,,EVENTOUT,
-PortD,PD6,,,,SAI1_PDM_DI1,,,,,,TSC_G5_IO3,QUADSPI_BK1_IO2,,,SAI1_SD_A,,EVENTOUT,
-PortD,PD7,,,,,,,,,,TSC_G5_IO4,QUADSPI_BK1_IO3,LCD_SEG39,,,,EVENTOUT,
-PortD,PD8,,,TIM1_BKIN2,,,,,,,,,LCD_SEG28,,,,EVENTOUT,
-PortD,PD9,TRACED0,,,,,,,,,,,LCD_SEG29,,,,EVENTOUT,
-PortD,PD10,TRIG_INOUT,,,,,,,,,TSC_G6_IO1,,LCD_SEG30,,,,EVENTOUT,
-PortD,PD11,,,,,,,,,,TSC_G6_IO2,,LCD_SEG31,,,LPTIM2_ETR,EVENTOUT,
-PortD,PD12,,,,,,,,,,TSC_G6_IO3,,LCD_SEG32,,,LPTIM2_IN1,EVENTOUT,
-PortD,PD13,,,,,,,,,,TSC_G6_IO4,,LCD_SEG33,,,LPTIM2_OUT,EVENTOUT,
-PortD,PD14,,TIM1_CH1,,,,,,,,,,LCD_SEG34,,,,EVENTOUT,
-PortD,PD15,,TIM1_CH2,,,,,,,,,,LCD_SEG35,,,,EVENTOUT,
-PortE,PE0,,TIM1_ETR,,,,,,,,TSC_G7_IO3,,LCD_SEG36,,,TIM16_CH1,EVENTOUT,
-PortE,PE1,,,,,,,,,,TSC_G7_IO2,,LCD_SEG37,,,TIM17_CH1,EVENTOUT,
-PortE,PE2,TRACECK,,,SAI1_PDM_CK1,,,,,,TSC_G7_IO1,,LCD_SEG38,,SAI1_MCLK_A,,EVENTOUT,
-PortE,PE3,,,,,,,,,,,,,,,,EVENTOUT,
-PortE,PE4,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
-PortH,PH3,LSCO,,,,,,,,,,,,,,,EVENTOUT,
+Port ,Pin ,AF0          ,AF1             ,AF2       ,AF3           ,AF4      ,AF5      ,AF6      ,AF7                 ,AF8                   ,AF9       ,AF10           ,AF11                      ,AF12            ,AF13       ,AF14                   ,AF15    ,ADC
+     ,    ,SYS_AF       ,TIM1/TIM2/LPTIM1,TIM1/TIM2 ,SPI2/SAI1/TIM1,I2C1/I2C3,SPI1/SPI2,RF       ,USART1              ,LPUART1               ,TSC       ,USB/QUADSPI    ,LCD                       ,COMP1/COMP2/TIM1,SAI1       ,TIM2/TIM16/TIM17/LPTIM2,EVENTOUT,ADC
+PortA,PA0 ,             ,TIM2_CH1        ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,COMP1_OUT       ,SAI1_EXTCLK,TIM2_ETR               ,EVENTOUT,ADC1_IN5
+PortA,PA1 ,             ,TIM2_CH2        ,          ,              ,I2C1_SMBA,SPI1_SCK ,         ,                    ,                      ,          ,               ,LCD_SEG0                  ,                ,           ,                       ,EVENTOUT,ADC1_IN6
+PortA,PA2 ,LSCO         ,TIM2_CH3        ,          ,              ,         ,         ,         ,                    ,LPUART1_TX            ,          ,QUADSPI_BK1_NCS,LCD_SEG1                  ,COMP2_OUT       ,           ,                       ,EVENTOUT,ADC1_IN7
+PortA,PA3 ,             ,TIM2_CH4        ,          ,SAI1_PDM_CK1  ,         ,         ,         ,                    ,LPUART1_RX            ,          ,QUADSPI_CLK    ,LCD_SEG2                  ,                ,SAI1_MCLK_A,                       ,EVENTOUT,ADC1_IN8
+PortA,PA4 ,             ,                ,          ,              ,         ,SPI1_NSS ,         ,                    ,                      ,          ,               ,LCD_SEG5                  ,                ,SAI1_FS_B  ,LPTIM2_OUT             ,EVENTOUT,ADC1_IN9
+PortA,PA5 ,             ,TIM2_CH1        ,TIM2_ETR  ,              ,         ,SPI1_SCK ,         ,                    ,                      ,          ,               ,                          ,                ,SAI1_SD_B  ,LPTIM2_ETR             ,EVENTOUT,ADC1_IN10
+PortA,PA6 ,             ,TIM1_BKIN       ,          ,              ,         ,SPI1_MISO,         ,                    ,LPUART1_CTS           ,          ,QUADSPI_BK1_IO3,LCD_SEG3                  ,TIM1_BKIN       ,           ,TIM16_CH1              ,EVENTOUT,ADC1_IN11
+PortA,PA7 ,             ,TIM1_CH1N       ,          ,              ,I2C3_SCL ,SPI1_MOSI,         ,                    ,                      ,          ,QUADSPI_BK1_IO2,LCD_SEG4                  ,COMP2_OUT       ,           ,TIM17_CH1              ,EVENTOUT,ADC1_IN12
+PortA,PA8 ,MCO          ,TIM1_CH1        ,          ,SAI1_PDM_CK2  ,         ,         ,         ,USART1_CK           ,                      ,          ,               ,LCD_COM0                  ,                ,SAI1_SCK_A ,LPTIM2_OUT             ,EVENTOUT,ADC1_IN15
+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/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/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/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,
+PortB,PB7 ,             ,LPTIM1_IN2      ,          ,TIM1_BKIN     ,I2C1_SDA ,         ,         ,USART1_RX           ,                      ,TSC_G2_IO4,               ,LCD_SEG21                 ,                ,           ,TIM17_CH1N             ,EVENTOUT,
+PortB,PB8 ,             ,TIM1_CH2N       ,          ,SAI1_PDM_CK1  ,I2C1_SCL ,         ,         ,                    ,                      ,          ,QUADSPI_BK1_IO1,LCD_SEG16                 ,                ,SAI1_MCLK_A,TIM16_CH1              ,EVENTOUT,
+PortB,PB9 ,             ,TIM1_CH3N       ,          ,SAI1_PDM_DI2  ,I2C1_SDA ,SPI2_NSS ,         ,                    ,IR_OUT                ,TSC_G7_IO4,QUADSPI_BK1_IO0,LCD_COM3                  ,                ,SAI1_FS_A  ,TIM17_CH1              ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3        ,          ,              ,I2C3_SCL ,SPI2_SCK ,         ,                    ,LPUART1_RX            ,TSC_SYNC  ,QUADSPI_CLK    ,LCD_SEG10                 ,COMP1_OUT       ,SAI1_SCK_A ,                       ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4        ,          ,              ,I2C3_SDA ,         ,         ,                    ,LPUART1_TX            ,          ,QUADSPI_BK1_NCS,LCD_SEG11                 ,COMP2_OUT       ,           ,                       ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN       ,          ,TIM1_BKIN     ,I2C3_SMBA,SPI2_NSS ,         ,                    ,LPUART1_RTS           ,TSC_G1_IO1,               ,LCD_SEG12                 ,                ,SAI1_FS_A  ,                       ,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N       ,          ,              ,I2C3_SCL ,SPI2_SCK ,         ,                    ,LPUART1_CTS           ,TSC_G1_IO2,               ,LCD_SEG13                 ,                ,SAI1_SCK_A ,                       ,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N       ,          ,              ,I2C3_SDA ,SPI2_MISO,         ,                    ,                      ,TSC_G1_IO3,               ,LCD_SEG14                 ,                ,SAI1_MCLK_A,                       ,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N       ,          ,              ,         ,SPI2_MOSI,         ,                    ,                      ,TSC_G1_IO4,               ,LCD_SEG15                 ,                ,SAI1_SD_A  ,                       ,EVENTOUT,
+PortC,PC0 ,             ,LPTIM1_IN1      ,          ,              ,I2C3_SCL ,         ,         ,                    ,LPUART1_RX            ,          ,               ,LCD_SEG18                 ,                ,           ,LPTIM2_IN1             ,EVENTOUT,ADC1_IN1
+PortC,PC1 ,             ,LPTIM1_OUT      ,          ,SPI2_MOSI     ,I2C3_SDA ,         ,         ,                    ,LPUART1_TX            ,          ,               ,LCD_SEG19                 ,                ,           ,                       ,EVENTOUT,ADC1_IN2
+PortC,PC2 ,             ,LPTIM1_IN2      ,          ,              ,         ,SPI2_MISO,         ,                    ,                      ,          ,               ,LCD_SEG20                 ,                ,           ,                       ,EVENTOUT,ADC1_IN3
+PortC,PC3 ,             ,LPTIM1_ETR      ,          ,SAI1_PDM_DI1  ,         ,SPI2_MOSI,         ,                    ,                      ,          ,               ,LCD_VLCD                  ,                ,SAI1_SD_A  ,LPTIM2_ETR             ,EVENTOUT,ADC1_IN4
+PortC,PC4 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,LCD_SEG22                 ,                ,           ,                       ,EVENTOUT,ADC1_IN13
+PortC,PC5 ,             ,                ,          ,SAI1_PDM_DI3  ,         ,         ,         ,                    ,                      ,          ,               ,LCD_SEG23                 ,                ,           ,                       ,EVENTOUT,ADC1_IN14
+PortC,PC6 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G4_IO1,               ,LCD_SEG24                 ,                ,           ,                       ,EVENTOUT,
+PortC,PC7 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G4_IO2,               ,LCD_SEG25                 ,                ,           ,                       ,EVENTOUT,
+PortC,PC8 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G4_IO3,               ,LCD_SEG26                 ,                ,           ,                       ,EVENTOUT,
+PortC,PC9 ,             ,                ,          ,TIM1_BKIN     ,         ,         ,         ,                    ,                      ,TSC_G4_IO4,USB_NOE        ,LCD_SEG27                 ,                ,SAI1_SCK_B ,                       ,EVENTOUT,
+PortC,PC10,TRACED1      ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G3_IO2,               ,LCD_COM4LCD_SEG28LCD_SEG40,                ,           ,                       ,EVENTOUT,
+PortC,PC11,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G3_IO3,               ,LCD_COM5LCD_SEG29LCD_SEG41,                ,           ,                       ,EVENTOUT,
+PortC,PC12,TRACED3      ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G3_IO4,               ,LCD_COM6LCD_SEG30LCD_SEG42,                ,           ,                       ,EVENTOUT,
+PortC,PC13,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortC,PC14,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortC,PC15,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortD,PD0 ,             ,                ,          ,              ,         ,SPI2_NSS ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortD,PD1 ,             ,                ,          ,              ,         ,SPI2_SCK ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_SYNC  ,               ,LCD_COM7LCD_SEG31LCD_SEG43,                ,           ,                       ,EVENTOUT,
+PortD,PD3 ,             ,                ,          ,SPI2_SCK      ,         ,SPI2_MISO,         ,                    ,                      ,          ,QUADSPI_BK1_NCS,                          ,                ,           ,                       ,EVENTOUT,
+PortD,PD4 ,             ,                ,          ,              ,         ,SPI2_MOSI,         ,                    ,                      ,TSC_G5_IO1,QUADSPI_BK1_IO0,                          ,                ,           ,                       ,EVENTOUT,
+PortD,PD5 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G5_IO2,QUADSPI_BK1_IO1,                          ,                ,SAI1_MCLK_B,                       ,EVENTOUT,
+PortD,PD6 ,             ,                ,          ,SAI1_PDM_DI1  ,         ,         ,         ,                    ,                      ,TSC_G5_IO3,QUADSPI_BK1_IO2,                          ,                ,SAI1_SD_A  ,                       ,EVENTOUT,
+PortD,PD7 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G5_IO4,QUADSPI_BK1_IO3,LCD_SEG39                 ,                ,           ,                       ,EVENTOUT,
+PortD,PD8 ,             ,                ,TIM1_BKIN2,              ,         ,         ,         ,                    ,                      ,          ,               ,LCD_SEG28                 ,                ,           ,                       ,EVENTOUT,
+PortD,PD9 ,TRACED0      ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,LCD_SEG29                 ,                ,           ,                       ,EVENTOUT,
+PortD,PD10,TRIG_INOUT   ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G6_IO1,               ,LCD_SEG30                 ,                ,           ,                       ,EVENTOUT,
+PortD,PD11,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G6_IO2,               ,LCD_SEG31                 ,                ,           ,LPTIM2_ETR             ,EVENTOUT,
+PortD,PD12,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G6_IO3,               ,LCD_SEG32                 ,                ,           ,LPTIM2_IN1             ,EVENTOUT,
+PortD,PD13,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G6_IO4,               ,LCD_SEG33                 ,                ,           ,LPTIM2_OUT             ,EVENTOUT,
+PortD,PD14,             ,TIM1_CH1        ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,LCD_SEG34                 ,                ,           ,                       ,EVENTOUT,
+PortD,PD15,             ,TIM1_CH2        ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,LCD_SEG35                 ,                ,           ,                       ,EVENTOUT,
+PortE,PE0 ,             ,TIM1_ETR        ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G7_IO3,               ,LCD_SEG36                 ,                ,           ,TIM16_CH1              ,EVENTOUT,
+PortE,PE1 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,TSC_G7_IO2,               ,LCD_SEG37                 ,                ,           ,TIM17_CH1              ,EVENTOUT,
+PortE,PE2 ,TRACECK      ,                ,          ,SAI1_PDM_CK1  ,         ,         ,         ,                    ,                      ,TSC_G7_IO1,               ,LCD_SEG38                 ,                ,SAI1_MCLK_A,                       ,EVENTOUT,
+PortE,PE3 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortE,PE4 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortH,PH0 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortH,PH1 ,             ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
+PortH,PH3 ,LSCO         ,                ,          ,              ,         ,         ,         ,                    ,                      ,          ,               ,                          ,                ,           ,                       ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32wl55_af.csv b/ports/stm32/boards/stm32wl55_af.csv
index 219b8b08b7853..c5ef81a4ac4e5 100644
--- a/ports/stm32/boards/stm32wl55_af.csv
+++ b/ports/stm32/boards/stm32wl55_af.csv
@@ -1,45 +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,
+Port ,Pin ,AF0          ,AF1             ,AF2       ,AF3               ,AF4           ,AF5              ,AF6    ,AF7          ,AF8           ,AF9,AF10,AF11,AF12            ,AF13                   ,AF14                   ,AF15    ,ADC
+     ,    ,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,

From b4236c7368a8f43a399b48a758f8c36063066d9b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 9 Aug 2023 02:14:13 +1000
Subject: [PATCH 0514/3129] stm32: Rename pin_obj_t to machine_pin_obj_t.

This is now consistent with other ports.

Also renamed `pin_{board/cpu}_pins_locals_dict` to
`machine_pin_{board/cpu}_pins_locals_dict`.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/adc.c               | 10 ++++-----
 ports/stm32/boards/make-pins.py | 14 +++++++-----
 ports/stm32/can.c               |  2 +-
 ports/stm32/dac.c               |  2 +-
 ports/stm32/extint.c            |  8 +++----
 ports/stm32/extint.h            |  4 ++--
 ports/stm32/fdcan.c             |  2 +-
 ports/stm32/lcd.c               |  8 +++----
 ports/stm32/led.c               | 14 ++++++------
 ports/stm32/machine_adc.c       |  2 +-
 ports/stm32/mphalport.h         |  4 ++--
 ports/stm32/pin.c               | 40 ++++++++++++++++-----------------
 ports/stm32/pin.h               | 38 +++++++++----------------------
 ports/stm32/pin_defs_stm32.c    |  6 ++---
 ports/stm32/pin_defs_stm32.h    |  2 ++
 ports/stm32/pin_named_pins.c    | 12 +++++-----
 ports/stm32/pyb_i2c.c           |  4 ++--
 ports/stm32/servo.c             |  2 +-
 ports/stm32/spi.c               |  2 +-
 ports/stm32/timer.c             |  2 +-
 ports/stm32/uart.c              |  2 +-
 21 files changed, 84 insertions(+), 96 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 6bd0f4ce25b6d..ddb8a35703bb4 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -527,7 +527,7 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     // STM32H5 has two ADC instances where some pins are only available on ADC1 or ADC2 (but not both).
     // Assume we're using a channel of ADC1. Can be overridden for ADC2 later in this function.
     ADC_TypeDef *adc = ADC1;
-    const pin_obj_t *const *pin_adc_table = pin_adc1;
+    const machine_pin_obj_t *const *pin_adc_table = pin_adc1;
     uint32_t num_adc_pins = MP_ARRAY_SIZE(pin_adc1);
     #endif
     uint32_t channel;
@@ -535,7 +535,7 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     if (mp_obj_is_int(pin_obj)) {
         channel = adc_get_internal_channel(mp_obj_get_int(pin_obj));
     } else {
-        const pin_obj_t *pin = pin_find(pin_obj);
+        const machine_pin_obj_t *pin = pin_find(pin_obj);
         if ((pin->adc_num & PIN_ADC_MASK) == 0) {
             // 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);
@@ -557,14 +557,14 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     // If this channel corresponds to a pin then configure the pin in ADC mode.
     #if defined(STM32H5)
     if (channel < num_adc_pins) {
-        const pin_obj_t *pin = pin_adc_table[channel];
+        const machine_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);
         }
     }
     #else
     if (channel < MP_ARRAY_SIZE(pin_adc_table)) {
-        const pin_obj_t *pin = pin_adc_table[channel];
+        const machine_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);
         }
@@ -862,7 +862,7 @@ void adc_init_all(pyb_adc_all_obj_t *adc_all, uint32_t resolution, uint32_t en_m
         // only initialise those channels that are selected with the en_mask
         if (en_mask & (1 << channel)) {
             // If this channel corresponds to a pin then configure the pin in ADC mode.
-            const pin_obj_t *pin = pin_adcall_table[channel];
+            const machine_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 92e8d7673406a..303f2df2645e5 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -281,7 +281,7 @@ def print(self, out_source):
         print("};", file=out_source)
         print("", file=out_source)
         print(
-            "const pin_obj_t pin_{:s}_obj = PIN({:s}, {:d}, {:s}, {:s}, {:d});".format(
+            "const machine_pin_obj_t pin_{:s}_obj = PIN({:s}, {:d}, {:s}, {:s}, {:d});".format(
                 self.cpu_pin_name(),
                 self.port_letter(),
                 self.pin,
@@ -295,7 +295,7 @@ def print(self, out_source):
 
     def print_header(self, out_header):
         n = self.cpu_pin_name()
-        print("extern const pin_obj_t pin_{:s}_obj;".format(n), file=out_header)
+        print("extern const machine_pin_obj_t pin_{:s}_obj;".format(n), file=out_header)
         print("#define pin_{:s} (&pin_{:s}_obj)".format(n, n), file=out_header)
         if self.alt_fn_count > 0:
             print("extern const pin_af_obj_t pin_{:s}_af[];".format(n), file=out_header)
@@ -381,7 +381,9 @@ def parse_board_file(self, filename):
 
     def print_named(self, label, named_pins, out_source):
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            "STATIC const mp_rom_map_elem_t machine_pin_{:s}_pins_locals_dict_table[] = {{".format(
+                label
+            ),
             file=out_source,
         )
         for named_pin in named_pins:
@@ -395,7 +397,7 @@ def print_named(self, label, named_pins, out_source):
                 )
         print("};", file=out_source)
         print(
-            "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+            "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, machine_pin_{:s}_pins_locals_dict_table);".format(
                 label, label
             ),
             file=out_source,
@@ -428,7 +430,7 @@ def print_adc(self, adc_num, out_source):
         self.adc_table_size[adc_num] = table_size
         print("", file=out_source)
         print(
-            "const pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(adc_num, table_size),
+            "const machine_pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(adc_num, table_size),
             file=out_source,
         )
         for channel in range(table_size):
@@ -447,7 +449,7 @@ def print_header(self, out_header, obj_decls):
                     pin.print_header(out_header)
             for adc_num, table_size in self.adc_table_size.items():
                 print(
-                    "extern const pin_obj_t * const pin_adc{:d}[{:d}];".format(
+                    "extern const machine_pin_obj_t * const pin_adc{:d}[{:d}];".format(
                         adc_num, table_size
                     ),
                     file=out_header,
diff --git a/ports/stm32/can.c b/ports/stm32/can.c
index bcc6983594967..9248e216c9782 100644
--- a/ports/stm32/can.c
+++ b/ports/stm32/can.c
@@ -65,7 +65,7 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
 
     CAN_TypeDef *CANx = NULL;
     uint32_t sce_irq = 0;
-    const pin_obj_t *pins[2];
+    const machine_pin_obj_t *pins[2];
 
     switch (can_obj->can_id) {
         #if defined(MICROPY_HW_CAN1_TX)
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 142b7ea387993..252af369c0087 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -324,7 +324,7 @@ STATIC mp_obj_t pyb_dac_make_new(const mp_obj_type_t *type, size_t n_args, size_
     if (mp_obj_is_int(args[0])) {
         dac_id = mp_obj_get_int(args[0]);
     } else {
-        const pin_obj_t *pin = pin_find(args[0]);
+        const machine_pin_obj_t *pin = pin_find(args[0]);
         if (pin == pin_A4) {
             dac_id = 1;
         } else if (pin == pin_A5) {
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 7698569149561..f6db1e632880a 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -244,7 +244,7 @@ STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
 // 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 pin_obj_t *pin = NULL;
+    const machine_pin_obj_t *pin = NULL;
     uint v_line;
 
     if (mp_obj_is_int(pin_obj)) {
@@ -318,7 +318,7 @@ uint extint_register(mp_obj_t pin_obj, uint32_t mode, uint32_t pull, mp_obj_t ca
 }
 
 // This function is intended to be used by the Pin.irq() method
-void extint_register_pin(const pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj) {
+void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj) {
     uint32_t line = pin->pin;
 
     // Check if the ExtInt line is already in use by another Pin/ExtInt
@@ -327,7 +327,7 @@ void extint_register_pin(const pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_
         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 pin_obj_t *other_pin = MP_OBJ_TO_PTR(pyb_extint_callback_arg[line]);
+            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);
         }
@@ -370,7 +370,7 @@ void extint_register_pin(const pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_
     }
 }
 
-void extint_set(const pin_obj_t *pin, uint32_t mode) {
+void extint_set(const machine_pin_obj_t *pin, uint32_t mode) {
     uint32_t line = pin->pin;
 
     mp_obj_t *cb = &MP_STATE_PORT(pyb_extint_callback)[line];
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 919e4bb2e8483..d5abb04d654e4 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -70,8 +70,8 @@
 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 pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj);
-void extint_set(const pin_obj_t *pin, uint32_t mode);
+void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj);
+void extint_set(const machine_pin_obj_t *pin, uint32_t mode);
 
 void extint_enable(uint line);
 void extint_disable(uint line);
diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index bcf3e8d6a31d9..640244a3b9d8b 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -137,7 +137,7 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     #endif
 
     FDCAN_GlobalTypeDef *CANx = NULL;
-    const pin_obj_t *pins[2];
+    const machine_pin_obj_t *pins[2];
 
     switch (can_obj->can_id) {
         #if defined(MICROPY_HW_CAN1_TX)
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index e5d7f30efbd02..a78718872baed 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -89,10 +89,10 @@ typedef struct _pyb_lcd_obj_t {
 
     // hardware control for the LCD
     const spi_t *spi;
-    const pin_obj_t *pin_cs1;
-    const pin_obj_t *pin_rst;
-    const pin_obj_t *pin_a0;
-    const pin_obj_t *pin_bl;
+    const machine_pin_obj_t *pin_cs1;
+    const machine_pin_obj_t *pin_rst;
+    const machine_pin_obj_t *pin_a0;
+    const machine_pin_obj_t *pin_bl;
 
     // character buffer for stdout-like output
     char char_buffer[LCD_CHAR_BUF_W * LCD_CHAR_BUF_H];
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index e70c22532c5b3..39b1f7e388814 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -47,7 +47,7 @@
 typedef struct _pyb_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;
 } pyb_led_obj_t;
 
 STATIC const pyb_led_obj_t pyb_led_obj[] = {
@@ -73,7 +73,7 @@ STATIC const pyb_led_obj_t pyb_led_obj[] = {
 void led_init(void) {
     /* Turn off LEDs and initialize */
     for (int led = 0; led < NUM_LEDS; led++) {
-        const pin_obj_t *led_pin = pyb_led_obj[led].led_pin;
+        const machine_pin_obj_t *led_pin = pyb_led_obj[led].led_pin;
         mp_hal_gpio_clock_enable(led_pin->gpio);
         MICROPY_HW_LED_OFF(led_pin);
         mp_hal_pin_output(led_pin);
@@ -143,7 +143,7 @@ static inline bool led_pwm_is_enabled(int led) {
 // this function has a large stack so it should not be inlined
 STATIC void led_pwm_init(int led) __attribute__((noinline));
 STATIC void led_pwm_init(int led) {
-    const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
     const led_pwm_config_t *pwm_cfg = &led_pwm_config[led - 1];
 
     // GPIO configuration
@@ -192,7 +192,7 @@ STATIC void led_pwm_init(int led) {
 
 STATIC void led_pwm_deinit(int led) {
     // make the LED's pin a standard GPIO output pin
-    const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
     GPIO_TypeDef *g = led_pin->gpio;
     uint32_t pin = led_pin->pin;
     static const int mode = 1; // output
@@ -211,7 +211,7 @@ void led_state(pyb_led_t led, int state) {
         return;
     }
 
-    const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
     if (state == 0) {
         // turn LED off
         MICROPY_HW_LED_OFF(led_pin);
@@ -241,7 +241,7 @@ void led_toggle(pyb_led_t led) {
     #endif
 
     // toggle the output data register to toggle the LED state
-    const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
     led_pin->gpio->ODR ^= led_pin->pin_mask;
 }
 
@@ -261,7 +261,7 @@ int led_get_intensity(pyb_led_t led) {
     }
     #endif
 
-    const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
     GPIO_TypeDef *gpio = led_pin->gpio;
 
     if (gpio->ODR & led_pin->pin_mask) {
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 4b644e6c97113..91094427b86cc 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -571,7 +571,7 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
             sample_time = ADC_SAMPLETIME_DEFAULT_INT;
         }
     } else {
-        const pin_obj_t *pin = pin_find(source);
+        const machine_pin_obj_t *pin = pin_find(source);
         if (pin->adc_num & PIN_ADC1) {
             #if defined(STM32WL)
             adc = ADC;
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 2757d39841306..410aa5a8deeb9 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -90,7 +90,7 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 #define MP_HAL_PIN_SPEED_HIGH           (GPIO_SPEED_FREQ_HIGH)
 #define MP_HAL_PIN_SPEED_VERY_HIGH      (GPIO_SPEED_FREQ_VERY_HIGH)
 
-#define mp_hal_pin_obj_t const pin_obj_t *
+#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)     mp_hal_pin_config((p), MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0)
@@ -114,7 +114,7 @@ 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);
+void extint_register_pin(const machine_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);
 
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index f2db0e20e84f9..599d61de41682 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -97,10 +97,10 @@ void pin_init0(void) {
 }
 
 // C API used to convert a user-supplied pin name into an ordinal pin number.
-const pin_obj_t *pin_find(mp_obj_t user_obj) {
+const machine_pin_obj_t *pin_find(mp_obj_t user_obj) {
     const mp_print_t *print = &mp_plat_print;
 
-    const pin_obj_t *pin_obj;
+    const machine_pin_obj_t *pin_obj;
 
     // If a pin was provided, then use it
     if (mp_obj_is_type(user_obj, &pin_type)) {
@@ -149,7 +149,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
     }
 
     // See if the pin name matches a board pin
-    pin_obj = pin_find_named_pin(&pin_board_pins_locals_dict, user_obj);
+    pin_obj = pin_find_named_pin(&machine_pin_board_pins_locals_dict, user_obj);
     if (pin_obj) {
         if (pin_class_debug) {
             mp_printf(print, "Pin.board maps ");
@@ -162,7 +162,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
     }
 
     // See if the pin name matches a cpu pin
-    pin_obj = pin_find_named_pin(&pin_cpu_pins_locals_dict, user_obj);
+    pin_obj = pin_find_named_pin(&machine_pin_cpu_pins_locals_dict, user_obj);
     if (pin_obj) {
         if (pin_class_debug) {
             mp_printf(print, "Pin.cpu maps ");
@@ -180,7 +180,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
 /// \method __str__()
 /// Return a string describing the pin object.
 STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // pin name
     mp_printf(print, "Pin(Pin.cpu.%q, mode=Pin.", self->name);
@@ -238,7 +238,7 @@ STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     }
 }
 
-STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *pin, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
+STATIC mp_obj_t pin_obj_init_helper(const machine_pin_obj_t *pin, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
 
 /// \classmethod \constructor(id, ...)
 /// Create a new Pin object associated with the id.  If additional arguments are given,
@@ -247,7 +247,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);
 
     // Run an argument through the mapper and return the result.
-    const pin_obj_t *pin = pin_find(args[0]);
+    const machine_pin_obj_t *pin = pin_find(args[0]);
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
@@ -265,7 +265,7 @@ 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 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);
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    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));
@@ -303,7 +303,7 @@ STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_map_dict_obj, MP_ROM_PTR(&pin_map_dic
 /// \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) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(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;
@@ -327,7 +327,7 @@ 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, 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 mp_obj_t 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}},
@@ -402,14 +402,14 @@ STATIC mp_obj_t pin_value(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
 
 STATIC mp_obj_t pin_off(mp_obj_t self_in) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_hal_pin_low(self);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_off_obj, pin_off);
 
 STATIC mp_obj_t pin_on(mp_obj_t self_in) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_hal_pin_high(self);
     return mp_const_none;
 }
@@ -423,7 +423,7 @@ STATIC mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         { 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} },
     };
-    pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    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);
 
@@ -441,7 +441,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
 /// \method name()
 /// Get the pin name.
 STATIC mp_obj_t pin_name(mp_obj_t self_in) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_QSTR(self->name);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_name_obj, pin_name);
@@ -449,11 +449,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_name_obj, pin_name);
 /// \method names()
 /// Returns the cpu and board names for this pin.
 STATIC mp_obj_t pin_names(mp_obj_t self_in) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t result = mp_obj_new_list(0, NULL);
     mp_obj_list_append(result, MP_OBJ_NEW_QSTR(self->name));
 
-    const mp_map_t *map = &pin_board_pins_locals_dict.map;
+    const mp_map_t *map = &machine_pin_board_pins_locals_dict.map;
     mp_map_elem_t *elem = map->table;
 
     for (mp_uint_t i = 0; i < map->used; i++, elem++) {
@@ -468,7 +468,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_names_obj, pin_names);
 /// \method port()
 /// Get the pin port.
 STATIC mp_obj_t pin_port(mp_obj_t self_in) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->port);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_port_obj, pin_port);
@@ -476,7 +476,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_port_obj, pin_port);
 /// \method pin()
 /// Get the pin number.
 STATIC mp_obj_t pin_pin(mp_obj_t self_in) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->pin);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_pin_obj, pin_pin);
@@ -484,7 +484,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_pin_obj, pin_pin);
 /// \method gpio()
 /// Returns the base address of the GPIO block associated with this pin.
 STATIC mp_obj_t pin_gpio(mp_obj_t self_in) {
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT((intptr_t)self->gpio);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_gpio_obj, pin_gpio);
@@ -572,7 +572,7 @@ STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, 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;
-    pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     switch (request) {
         case MP_PIN_READ: {
diff --git a/ports/stm32/pin.h b/ports/stm32/pin.h
index 2397a9d48ee95..d16c176380262 100644
--- a/ports/stm32/pin.h
+++ b/ports/stm32/pin.h
@@ -53,7 +53,7 @@ typedef struct {
     uint32_t pin_mask;
     pin_gpio_t *gpio;
     const pin_af_obj_t *af;
-} pin_obj_t;
+} machine_pin_obj_t;
 
 extern const mp_obj_type_t pin_type;
 extern const mp_obj_type_t pin_af_type;
@@ -61,38 +61,22 @@ 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 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[];
-
-// extern pin_map_obj_t pin_map_obj;
-
-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;
+extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;
+extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
 
 MP_DECLARE_CONST_FUN_OBJ_KW(pin_init_obj);
 
 void pin_init0(void);
-uint32_t pin_get_mode(const pin_obj_t *pin);
-uint32_t pin_get_pull(const pin_obj_t *pin);
-uint32_t pin_get_af(const pin_obj_t *pin);
-const pin_obj_t *pin_find(mp_obj_t user_obj);
-const 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 pin_obj_t *pin, uint8_t fn, uint8_t unit);
-const pin_af_obj_t *pin_find_af_by_index(const pin_obj_t *pin, mp_uint_t af_idx);
-const pin_af_obj_t *pin_find_af_by_name(const pin_obj_t *pin, const char *name);
+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_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 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_STM32_PIN_H
diff --git a/ports/stm32/pin_defs_stm32.c b/ports/stm32/pin_defs_stm32.c
index 070005d217d36..8a946fdd3cf9d 100644
--- a/ports/stm32/pin_defs_stm32.c
+++ b/ports/stm32/pin_defs_stm32.c
@@ -5,7 +5,7 @@
 // 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 pin_obj_t *pin) {
+uint32_t pin_get_mode(const machine_pin_obj_t *pin) {
     GPIO_TypeDef *gpio = pin->gpio;
     uint32_t mode = (gpio->MODER >> (pin->pin * 2)) & 3;
     if (mode == GPIO_MODE_OUTPUT_PP || mode == GPIO_MODE_AF_PP) {
@@ -19,12 +19,12 @@ uint32_t pin_get_mode(const pin_obj_t *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 pin_obj_t *pin) {
+uint32_t pin_get_pull(const machine_pin_obj_t *pin) {
     return (pin->gpio->PUPDR >> (pin->pin * 2)) & 3;
 }
 
 // Returns the af (alternate function) index currently set for a pin.
 
-uint32_t pin_get_af(const pin_obj_t *pin) {
+uint32_t pin_get_af(const machine_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 1f950c1179833..6c67b6492422b 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -133,6 +133,8 @@ enum {
     PIN_ADC1  = (1 << 0),
     PIN_ADC2  = (1 << 1),
     PIN_ADC3  = (1 << 2),
+    PIN_ADC4  = (1 << 3),
+    PIN_ADC5  = (1 << 4),
 };
 
 typedef GPIO_TypeDef pin_gpio_t;
diff --git a/ports/stm32/pin_named_pins.c b/ports/stm32/pin_named_pins.c
index 8eeb4ed32b118..7a27158a6dcfa 100644
--- a/ports/stm32/pin_named_pins.c
+++ b/ports/stm32/pin_named_pins.c
@@ -35,17 +35,17 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
-    locals_dict, &pin_cpu_pins_locals_dict
+    locals_dict, &machine_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
+    locals_dict, &machine_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 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) {
@@ -54,7 +54,7 @@ const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t na
     return NULL;
 }
 
-const pin_af_obj_t *pin_find_af(const pin_obj_t *pin, uint8_t fn, uint8_t unit) {
+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) {
@@ -64,7 +64,7 @@ const pin_af_obj_t *pin_find_af(const pin_obj_t *pin, uint8_t fn, uint8_t unit)
     return NULL;
 }
 
-const pin_af_obj_t *pin_find_af_by_index(const pin_obj_t *pin, mp_uint_t af_idx) {
+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) {
@@ -75,7 +75,7 @@ const pin_af_obj_t *pin_find_af_by_index(const pin_obj_t *pin, mp_uint_t af_idx)
 }
 
 /* unused
-const pin_af_obj_t *pin_find_af_by_name(const pin_obj_t *pin, const char *name) {
+const pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name) {
     const pin_af_obj_t *af = pin->af;
     for (mp_uint_t i = 0; i < pin->num_af; i++, af++) {
         if (strcmp(name, qstr_str(af->name)) == 0) {
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 915eabe0b2f8c..fa38ef372dabe 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -290,8 +290,8 @@ void i2c_init0(void) {
 
 int pyb_i2c_init(I2C_HandleTypeDef *i2c) {
     int i2c_unit;
-    const pin_obj_t *scl_pin;
-    const pin_obj_t *sda_pin;
+    const machine_pin_obj_t *scl_pin;
+    const machine_pin_obj_t *sda_pin;
 
     if (0) {
     #if defined(MICROPY_HW_I2C1_SCL)
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index e0aa2d6b69f83..07cc4eab88536 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -48,7 +48,7 @@
 
 typedef struct _pyb_servo_obj_t {
     mp_obj_base_t base;
-    const pin_obj_t *pin;
+    const machine_pin_obj_t *pin;
     uint8_t pulse_min;          // units of 10us
     uint8_t pulse_max;          // units of 10us
     uint8_t pulse_centre;       // units of 10us
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 7b89b48b53e9e..47714a28725ba 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -341,7 +341,7 @@ void spi_set_params(const spi_t *spi_obj, uint32_t prescale, int32_t baudrate,
 int spi_init(const spi_t *self, bool enable_nss_pin) {
     SPI_HandleTypeDef *spi = self->spi;
     uint32_t irqn = 0;
-    const pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
+    const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
 
     if (0) {
     #if defined(MICROPY_HW_SPI1_SCK)
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index c15b84fe54f95..41e5c6157d5ac 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1199,7 +1199,7 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
         if (!mp_obj_is_type(pin_obj, &pin_type)) {
             mp_raise_ValueError(MP_ERROR_TEXT("pin argument needs to be be a Pin type"));
         }
-        const pin_obj_t *pin = MP_OBJ_TO_PTR(pin_obj);
+        const machine_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 alt for Timer(%d)"), pin->name, self->tim_id);
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 0d648a6fc1aeb..83e9e0fdd8597 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -250,7 +250,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     uint8_t uart_fn = AF_FN_UART;
     int uart_unit;
 
-    const pin_obj_t *pins[4] = {0};
+    const machine_pin_obj_t *pins[4] = {0};
 
     switch (uart_obj->uart_id) {
         #if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)

From 724ebb9916d2e29595fc2098e6ae1e7c4f1e3f52 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 9 Aug 2023 02:14:13 +1000
Subject: [PATCH 0515/3129] stm32/boards/make-pins.py: Update to use
 tools/boardgen.py.

Requires additions to tools/boardgen.py for stm32 pin generation.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/make-pins.py | 802 ++++++++++++--------------------
 tools/boardgen.py               |  78 +++-
 2 files changed, 370 insertions(+), 510 deletions(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 303f2df2645e5..10472a093f661 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -1,59 +1,17 @@
 #!/usr/bin/env python
 
-"""
-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 can contain empty lines, comments (a line beginning with "#")
-or pin definition lines.  Pin definition lines must be 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 collections import defaultdict, namedtuple
+import os
+import re
+import sys
 
-from __future__ import print_function
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../tools"))
+import boardgen
 
-import argparse
-import sys
-import csv
 
 # Must have matching entries in AF_FN_* enum in ../pin_defs_stm32.h
-SUPPORTED_FN = {
+SUPPORTED_AF = {
     "TIM": ["CH1", "CH2", "CH3", "CH4", "CH1N", "CH2N", "CH3N", "CH1_ETR", "ETR", "BKIN"],
     "I2C": ["SDA", "SCL"],
     "I2S": ["CK", "MCK", "SD", "WS", "EXTSD"],
@@ -65,6 +23,8 @@
     "CAN": ["TX", "RX"],
 }
 
+# Only make these AFs available if we actually enable those peripherals (by
+# assigning default pins in mpconfigboard.h).
 CONDITIONAL_VAR = {
     "I2C": "MICROPY_HW_I2C{num}_SCL",
     "I2S": "MICROPY_HW_I2S{num}",
@@ -76,487 +36,337 @@
     "CAN": "MICROPY_HW_CAN{num}_TX",
 }
 
+# Contains the result of parsing an cell from af.csv.
+PinAf = namedtuple(
+    "PinAf",
+    [
+        "af_idx",  # int, 0-15
+        "af_fn",  # e.g. "I2C"
+        "af_unit",  # int, e.g. 1 (for I2C1) or None (for OTG_HS_ULPI_CK)
+        "af_pin",  # e.g. "SDA"
+        "af_supported",  # bool, see table above
+        "af_name",  # e.g. "I2C1_SDA"
+    ],
+)
+
+
+class Stm32Pin(boardgen.Pin):
+    def __init__(self, cpu_pin_name):
+        super().__init__(cpu_pin_name)
+
+        # P<port><num> (already verified by validate_cpu_pin_name).
+        self._port = cpu_pin_name[1]
+        self._pin = int(cpu_pin_name[2:])
+
+        # List of PinAf instances.
+        self._afs = []
+
+        # The channel that this pin uses on each of the listed units.
+        self._adc_channel = 0
+        # e.g. ADC123 -> [1,2,3]
+        self._adc_units = []
+
+    # Called for each AF defined in the csv file for this pin. e.g. "SPI2_NSS/I2S2_WS"
+    def add_af(self, af_idx, af_name, af):
+        if af_idx > 16:
+            # The AF csv files should not have more than 16 AFs + 1 ADC list.
+            return
 
-def parse_port_pin(name_str):
-    """Parses a string and returns a (port-num, pin-num) tuple."""
-    if len(name_str) < 3:
-        raise ValueError("Expecting pin name to be at least 3 characters.")
-    if name_str[0] != "P":
-        raise ValueError("Expecting pin name to start with P")
-    if name_str[1] < "A" or name_str[1] > "K":
-        raise ValueError("Expecting pin port to be between A and K")
-    port = ord(name_str[1]) - ord("A")
-    pin_str = name_str[2:]
-    if not pin_str.isdigit():
-        raise ValueError("Expecting numeric pin number.")
-    return (port, int(pin_str))
-
-
-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
-    return name, num
-
-
-def conditional_var(name_num):
-    # Try the specific instance first. For example, if name_num is UART4_RX
-    # then try UART4 first, and then try UART second.
-    name, num = split_name_num(name_num)
-    var = []
-    if name in CONDITIONAL_VAR:
-        var.append(CONDITIONAL_VAR[name].format(num=num))
-    if name_num in CONDITIONAL_VAR:
-        var.append(CONDITIONAL_VAR[name_num])
-    return var
-
-
-def print_conditional_if(cond_var, file):
-    if cond_var:
-        cond_str = []
-        for var in cond_var:
-            if var.find("ENABLE") >= 0:
-                cond_str.append("(defined({0}) && {0})".format(var))
-            else:
-                cond_str.append("defined({0})".format(var))
-        print("#if " + " || ".join(cond_str), file=file)
-
-
-def print_conditional_endif(cond_var, file):
-    if cond_var:
-        print("#endif", file=file)
-
-
-class AlternateFunction(object):
-    """Holds the information associated with a pins alternate function."""
-
-    def __init__(self, idx, af_str):
-        self.idx = idx
-        # Special case. We change I2S2ext_SD into I2S2_EXTSD so that it parses
-        # the same way the other peripherals do.
-        af_str = af_str.replace("ext_", "_EXT")
-
-        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, out_source):
-        """Prints the C representation of this AF."""
-        cond_var = None
-        if self.supported:
-            cond_var = conditional_var("{}{}".format(self.func, self.fn_num))
-            print_conditional_if(cond_var, file=out_source)
-            print("  AF", end="", file=out_source)
-        else:
-            print("  //", end="", file=out_source)
-        fn_num = self.fn_num
-        if fn_num is None:
-            fn_num = 0
-        print(
-            "({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}".format(
-                self.idx, self.func, fn_num, self.pin_type, self.ptr(), self.af_str
-            ),
-            file=out_source,
-        )
-        print_conditional_endif(cond_var, file=out_source)
-
-
-class Pin(object):
-    """Holds the information associated with a pin."""
+        # AF 16 is the ADC, which is special cased below.
+        if af_idx == 16:
+            if af_name != "ADC":
+                raise boardgen.PinGeneratorError(
+                    "Invalid AF column name '{:s}' for ADC column with index {:d}.".format(
+                        af_name, af_idx
+                    )
+                )
+            return self.add_adc(af)
 
-    def __init__(self, port, pin):
-        self.port = port
-        self.pin = pin
-        self.alt_fn = []
-        self.alt_fn_count = 0
-        self.adc_num = 0
-        self.adc_channel = 0
-        self.board_pin = False
+        if af_name != "AF{:d}".format(af_idx):
+            raise boardgen.PinGeneratorError(
+                "Invalid AF column name '{:s}' for AF index {:d}.".format(af_name, af_idx)
+            )
 
-    def port_letter(self):
-        return chr(self.port + ord("A"))
+        # If there is a slash, then the slash separates multiple aliases for
+        # the same alternate function.
+        for af_name in af.split("/"):
+            if not af_name.strip():
+                continue
+            # This matches <fn><unit>_<pin>, with consideration for:
+            #  - fn may contain a digit (e.g. I2C)
+            #  - there may be an "ext" after the unit
+            m = re.match("([A-Z0-9]+[A-Z])(([0-9]+)(ext)?)?(_(.*))?", af_name)
+            if not m:
+                raise boardgen.PinGeneratorError(
+                    "Invalid af '{:s}' for pin '{:s}'".format(af_name, self.name())
+                )
+            else:
+                af_fn = m.group(1)
+                af_unit = int(m.group(3)) if m.group(3) is not None else None
+                af_ext = m.group(4) == "ext"
+                af_pin = m.group(6)
 
-    def cpu_pin_name(self):
-        return "{:s}{:d}".format(self.port_letter(), self.pin)
+                # Special case. We change I2S2ext_SD into I2S2_EXTSD so that it parses
+                # the same way the other peripherals do.
+                if af_ext:
+                    af_pin = "EXT" + af_pin
 
-    def is_board_pin(self):
-        return self.board_pin
+                af_supported = af_fn in SUPPORTED_AF and af_pin in SUPPORTED_AF[af_fn]
 
-    def set_is_board_pin(self):
-        self.board_pin = True
+                self._afs.append(PinAf(af_idx, af_fn, af_unit, af_pin, af_supported, af_name))
 
-    def parse_adc(self, adc_str):
-        if adc_str[:3] != "ADC":
+    # ADCs are slash separated "ADC<list of units>_<mode><channel>", where unit=1,2,3,4,5 and mode=IN,INN,INP
+    def add_adc(self, adc):
+        if not adc.strip():
             return
-        adc, channel = None, None
 
-        if adc_str.find("_INP") != -1:
-            # STM32H7xx, entries have the form: ADCxx_IN[PN]yy/...
-            sep = "_INP"
-        else:
-            # all other MCUs, entries have the form: ADCxx_INyy
-            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 :]
+        # TODO: This needs to be improved to support the case where a pin can
+        # be the P for one channel, and the N for a different channel.
+        # e.g. "ADC123_INP12/ADC123_INN11".
+        for adc_name in adc.split("/"):
+            m = re.match("ADC([1-5]+)_(IN[NP]?)([0-9]+)$", adc_name)
+            if not m:
+                raise boardgen.PinGeneratorError(
+                    "Invalid adc '{:s}' for pin '{:s}'".format(adc_name, self.name())
+                )
+            adc_units = [int(x) for x in m.group(1)]
+            _adc_mode = m.group(2)
+            adc_channel = int(m.group(3))
+
+            # Pick the entry with the most ADC units, e.g. "ADC1_INP16/ADC12_INN1/ADC12_INP0" --> "ADC12_INN1".
+            if len(adc_units) > len(self._adc_units):
+                self._adc_units = adc_units
+                self._adc_channel = adc_channel
+
+    # STM32-specific behavior, strip the "P" from the start of the name when emitting this pin.
+    # e.g. the #define is pin_A11 not pin_PA11. Fortunately we don't have to special case this
+    # as there are no places where emit the full "PA11" name.
+    def name(self):
+        return self._cpu_pin_name[1:]
+
+    # Use the PIN() macro defined in stm32f4xx_prefix.c for defining the pin
+    # objects.
+    def definition(self):
+        # Generate bitfield of supported ADC units where lsb is unit 1 (e.g. [1,3] --> 0b101).
+        adc_units_bitfield = (
+            " | ".join("PIN_ADC{}".format(unit) for unit in self._adc_units) or "0"
+        )
 
-        for idx in range(3, len(adc)):
-            adc_num = int(adc[idx])  # 1, 2, or 3
-            self.adc_num |= 1 << (adc_num - 1)
-        self.adc_channel = int(channel)
+        # PIN(p_port, p_pin, p_af, p_adc_num, p_adc_channel)
+        return "PIN({:s}, {:d}, pin_{:s}_af, {:s}, {:d})".format(
+            self._port, self._pin, self.name(), adc_units_bitfield, self._adc_channel
+        )
 
-    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 adc_num_str(self):
-        str = ""
-        for adc_num in range(1, 4):
-            if self.adc_num & (1 << (adc_num - 1)):
-                if len(str) > 0:
-                    str += " | "
-                str += "PIN_ADC"
-                str += chr(ord("0") + adc_num)
-        if len(str) == 0:
-            str = "0"
-        return str
-
-    def print(self, out_source):
-        if self.alt_fn_count == 0:
-            print("// ", end="", file=out_source)
-        print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()), file=out_source)
-        for alt_fn in self.alt_fn:
-            alt_fn.print(out_source)
-        if self.alt_fn_count == 0:
-            print("// ", end="", file=out_source)
+    # This will be called at the start of the output (after the prefix). Use
+    # it to emit the af objects (via the AF() macro).
+    def print_source(self, out_source):
+        print(file=out_source)
+        print("const pin_af_obj_t pin_{:s}_af[] = {{".format(self.name()), file=out_source)
+        for af in self._afs:
+            if af.af_fn in CONDITIONAL_VAR:
+                print(
+                    "    #if defined({:s})".format(
+                        CONDITIONAL_VAR[af.af_fn].format(num=af.af_unit)
+                    ),
+                    file=out_source,
+                )
+            if af.af_supported:
+                print("    ", end="", file=out_source)
+            else:
+                print("    // ", end="", file=out_source)
+            # AF(af_idx, af_fn, af_unit, af_type, af_ptr)
+            print(
+                "AF({:d}, {:s}, {:d}, {:s}, {:s}{:s}),  // {:s}".format(
+                    af.af_idx,
+                    af.af_fn,
+                    af.af_unit or 0,
+                    af.af_pin or "NONE",
+                    af.af_fn,
+                    "" if af.af_unit is None else str(af.af_unit),
+                    af.af_name,
+                ),
+                file=out_source,
+            )
+            if af.af_fn in CONDITIONAL_VAR:
+                print("    #endif", file=out_source)
         print("};", file=out_source)
-        print("", file=out_source)
-        print(
-            "const machine_pin_obj_t pin_{:s}_obj = PIN({:s}, {:d}, {:s}, {:s}, {:d});".format(
-                self.cpu_pin_name(),
-                self.port_letter(),
-                self.pin,
-                self.alt_fn_name(null_if_0=True),
-                self.adc_num_str(),
-                self.adc_channel,
-            ),
-            file=out_source,
-        )
-        print("", file=out_source)
 
-    def print_header(self, out_header):
-        n = self.cpu_pin_name()
-        print("extern const machine_pin_obj_t pin_{:s}_obj;".format(n), file=out_header)
-        print("#define pin_{:s} (&pin_{:s}_obj)".format(n, n), file=out_header)
-        if self.alt_fn_count > 0:
-            print("extern const pin_af_obj_t pin_{:s}_af[];".format(n), file=out_header)
-
-
-class NamedPin(object):
-    def __init__(self, name, pin):
-        if name.startswith("-"):
-            self._is_hidden = True
-            self._name = name[1:]
-        else:
-            self._is_hidden = False
-            self._name = name
-        self._pin = pin
+    # STM32 cpu names must be "P<port><num>".
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
 
-    def set_hidden(self, value):
-        self._is_hidden = value
+        if not re.match("P[A-K][0-9]+$", cpu_pin_name):
+            raise boardgen.PinGeneratorError("Invalid cpu pin name '{}'".format(cpu_pin_name))
 
-    def is_hidden(self):
-        return self._is_hidden
 
-    def pin(self):
-        return self._pin
+class Stm32PinGenerator(boardgen.PinGenerator):
+    def __init__(self):
+        # Use custom pin type above, and also enable the --af-csv argument so
+        # that add_af gets called on each pin.
+        super().__init__(
+            pin_type=Stm32Pin,
+            enable_af=True,
+        )
 
-    def name(self):
-        return self._name
+    # STM32-specific behavior, we use pin_A0 for the cpu names, but
+    # pyb_pin_X11 for the board names.
+    def board_name_define_prefix(self):
+        return "pyb_"
+
+    # Override the default implementation just to change the default arguments
+    # (extra header row, skip first column).
+    def parse_af_csv(self, filename):
+        return super().parse_af_csv(filename, header_rows=2, pin_col=1, af_col=2)
+
+    # Find which ADCs are used on this chip and on how many pins and the
+    # maximum channel number for each.
+    def count_adc_pins(self):
+        adc_units = defaultdict(lambda: (0, 0))
+        for pin in self._pins:  # All pins
+            for unit in pin._adc_units:
+                num, max_channel = adc_units[unit]
+                if pin._available:
+                    adc_units[unit] = num + 1, max(max_channel, pin._adc_channel)
+        return adc_units.items()
+
+    # Print table of pins for each ADC (indexed by channel).
+    def print_adcs(self, out_source):
+        for adc_unit, (num_pins, max_channel) in self.count_adc_pins():
+            print(file=out_source)
+            print(
+                "const machine_pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(
+                    adc_unit, max_channel + 1
+                ),
+                file=out_source,
+            )
+            # Don't include pins that weren't in pins.csv.
+            for pin in self.available_pins():
+                if adc_unit in pin._adc_units:
+                    print(
+                        "    [{:d}] = {:s},".format(pin._adc_channel, self._cpu_pin_pointer(pin)),
+                        file=out_source,
+                    )
+            print("};", file=out_source)
 
+    # Print externs for the adc pin tables.
+    def print_adc_externs(self, out_source):
+        print(file=out_source)
+        for adc_unit, (num_pins, max_channel) in self.count_adc_pins():
+            print(
+                "extern const machine_pin_obj_t * const pin_adc{:d}[{:d}];".format(
+                    adc_unit, max_channel + 1
+                ),
+                file=out_source,
+            )
 
-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:
-            pin = named_pin.pin()
-            if pin.port == port_num and pin.pin == pin_num:
-                return named_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:
-                    (port_num, pin_num) = parse_port_pin(row[pinname_col])
-                except:
-                    continue
-                pin = Pin(port_num, pin_num)
-                for af_idx in range(af_col, len(row)):
-                    if af_idx < af_col + 16:
-                        pin.parse_af(af_idx - af_col, row[af_idx])
-                    elif af_idx == af_col + 16:
-                        pin.parse_adc(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]
-                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(cpu_pin_name)
-                except:
-                    continue
-                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))
-
-    def print_named(self, label, named_pins, out_source):
-        print(
-            "STATIC const mp_rom_map_elem_t machine_pin_{:s}_pins_locals_dict_table[] = {{".format(
-                label
-            ),
-            file=out_source,
-        )
-        for named_pin in named_pins:
-            pin = named_pin.pin()
-            if pin.is_board_pin() and not named_pin.is_hidden():
-                print(
-                    "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}_obj) }},".format(
-                        named_pin.name(), pin.cpu_pin_name()
-                    ),
-                    file=out_source,
-                )
-        print("};", file=out_source)
-        print(
-            "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, machine_pin_{:s}_pins_locals_dict_table);".format(
-                label, label
-            ),
-            file=out_source,
-        )
+    # Append ADC definitions to the end of the source output.
+    def print_source(self, out_source):
+        super().print_source(out_source)
+        self.print_adcs(out_source)
 
-    def print(self, out_source):
-        for named_pin in self.cpu_pins:
-            pin = named_pin.pin()
-            if pin.is_board_pin():
-                pin.print(out_source)
-        self.print_named("cpu", self.cpu_pins, out_source)
-        print("", file=out_source)
-        self.print_named("board", self.board_pins, out_source)
-
-    def print_adc(self, adc_num, out_source):
-        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
+    # Append ADC externs to the end of the header output, and don't include
+    # externs in mboot mode.
+    def print_header(self, out_header):
+        if self.args.mboot_mode:
+            self.print_defines(out_header, cpu=False)
         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("", file=out_source)
-        print(
-            "const machine_pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(adc_num, table_size),
-            file=out_source,
-        )
-        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), file=out_source)
-        print("};", file=out_source)
+            super().print_header(out_header)
+            self.print_adc_externs(out_header)
+
+    # This is a set of map entries `MP_QSTR_AF<num>_<fn>` -> `GPIO_AF<num>_<fn>`
+    # that become part of the locals dict of machine.Pin.
+    def print_af_const(self, out_af_const):
+        # Extract all unique "AF<num>_<fn>" values.
+        names = set()
+        for pin in self.available_pins():
+            for af in pin._afs:
+                if not af.af_supported:
+                    continue
+                key = (
+                    "AF{:d}_{:s}{:d}".format(af.af_idx, af.af_fn, af.af_unit),
+                    af.af_fn,
+                    af.af_unit,
+                )
+                names.add(key)
 
-    def print_header(self, out_header, obj_decls):
-        if obj_decls:
-            for named_pin in self.cpu_pins:
-                pin = named_pin.pin()
-                if pin.is_board_pin():
-                    pin.print_header(out_header)
-            for adc_num, table_size in self.adc_table_size.items():
+        # Generate the table.
+        for key in sorted(names):
+            name, af_fn, af_unit = key
+            if af_fn in CONDITIONAL_VAR:
                 print(
-                    "extern const machine_pin_obj_t * const pin_adc{:d}[{:d}];".format(
-                        adc_num, table_size
-                    ),
-                    file=out_header,
+                    "    #if defined({:s})".format(CONDITIONAL_VAR[af_fn].format(num=af_unit)),
+                    file=out_af_const,
                 )
-        # provide #define's mapping board to cpu name
-        for named_pin in self.board_pins:
             print(
-                "#define pyb_pin_{:s} pin_{:s}".format(
-                    named_pin.name(), named_pin.pin().cpu_pin_name()
+                "    {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_INT(GPIO_{:s}) }},".format(name, name),
+                file=out_af_const,
+            )
+            if af_fn in CONDITIONAL_VAR:
+                print("    #endif", file=out_af_const)
+
+    # Output macros to compile-time match a pin object to its AF. See
+    # mp_hal_pin_config_alt_static and mp_hal_pin_config_alt_static_speed in
+    # pin_static_af.h.
+    def print_af_defs(self, out_af_defs):
+        # Get the set of unique "<fn><unit>_<pinfn>" (e.g. I2C1_SDA) and which
+        # pins can be used for each.
+        af_defs = defaultdict(list)
+        for pin in self._pins:
+            for af in pin._afs:
+                key = af.af_fn, af.af_unit, af.af_pin
+                af_defs[key].append((pin, af.af_idx))
+
+        # Emit a macro for each that will match a pin object to the
+        # corresponding af index for that pin doing that function.
+        for key, pins in af_defs.items():
+            af_fn, af_unit, af_pin = key
+            print(file=out_af_defs)
+            print(
+                "#define STATIC_AF_{:s}{:s}_{:s}(pin_obj) ( \\".format(
+                    af_fn, "" if af_unit is None else str(af_unit), af_pin or "NULL"
                 ),
-                file=out_header,
+                file=out_af_defs,
             )
-
-    def print_af_hdr(self, out_af_const):
-        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):
-            af_words = mux_name.split("_")  # ex mux_name: AF9_I2C2
-            cond_var = conditional_var(af_words[1])
-            print_conditional_if(cond_var, file=out_af_const)
-            key = "MP_ROM_QSTR(MP_QSTR_{}),".format(mux_name)
-            val = "MP_ROM_INT(GPIO_{})".format(mux_name)
-            print("    { %-*s %s }," % (mux_name_width + 26, key, val), file=out_af_const)
-            print_conditional_endif(cond_var, file=out_af_const)
-
-    def print_af_defs(self, out_af_defs, cmp_strings):
-        STATIC_AF_TOKENS = {}
-        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]
-                tok = "#define STATIC_AF_%s_%s(pin_obj) ( \\" % (func, pin_type)
-                if tok not in STATIC_AF_TOKENS:
-                    STATIC_AF_TOKENS[tok] = []
-                if cmp_strings:
-                    pin_name = named_pin.pin().cpu_pin_name()
-                    cmp_str = (
-                        '    ((strcmp( #pin_obj , "(&pin_%s_obj)") '
-                        ' & strcmp( #pin_obj , "((&pin_%s_obj))")) == 0) ? (%d) : \\'
-                        % (pin_name, pin_name, af.idx)
+            for pin, af_idx in pins:
+                if self.args.mboot_mode:
+                    print(
+                        "    ((pin_obj) == (pin_{:s})) ? ({:d}) : \\".format(pin.name(), af_idx),
+                        file=out_af_defs,
                     )
                 else:
-                    cmp_str = "    ((pin_obj) == (pin_%s)) ? (%d) : \\" % (
-                        named_pin.pin().cpu_pin_name(),
-                        af.idx,
+                    # Match either "(pin_A11_obj)" (if using pin_A11 or
+                    # pyb_pin_X11) or "((pin_A11_obj))" (if going via another
+                    # macro e.g. MICROPY_HW_QSPIFLASH_CS).
+                    # TODO: Why do we need do do string matching? (i.e. why can't the mboot behavior be used always?).
+                    print(
+                        '    ((strcmp( #pin_obj , "(&pin_{:s}_obj)") & strcmp( #pin_obj , "((&pin_{:s}_obj))")) == 0) ? ({:d}) : \\'.format(
+                            pin.name(), pin.name(), af_idx
+                        ),
+                        file=out_af_defs,
                     )
-                STATIC_AF_TOKENS[tok].append(cmp_str)
-
-        for tok, pins in STATIC_AF_TOKENS.items():
-            print(tok, file=out_af_defs)
-            print("\n".join(sorted(pins)), file=out_af_defs)
-            print("    (0xffffffffffffffffULL))\n", file=out_af_defs)
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Generate board specific pin file")
-    parser.add_argument("--board-csv")
-    parser.add_argument("--af-csv")
-    parser.add_argument("--prefix")
-    parser.add_argument("--output-source")
-    parser.add_argument("--output-header")
-    parser.add_argument("--output-af-const")
-    parser.add_argument("--output-af-defs")
-    parser.add_argument("--mboot-mode", action="store_true")
-    args = parser.parse_args()
-
-    pins = Pins()
-
-    with open(args.output_source, "w") as out_source:
-        print("// This file was automatically generated by make-pins.py", file=out_source)
-        print("//", file=out_source)
-        if args.af_csv:
-            print("// --af {:s}".format(args.af_csv), file=out_source)
-            pins.parse_af_file(args.af_csv, 1, 2)
-
-        if args.board_csv:
-            print("// --board {:s}".format(args.board_csv), file=out_source)
-            pins.parse_board_file(args.board_csv)
-
-        if args.prefix:
-            print("// --prefix {:s}".format(args.prefix), file=out_source)
-            print("", file=out_source)
-            with open(args.prefix, "r") as prefix_file:
-                print(prefix_file.read(), file=out_source)
+            print("    (0xffffffffffffffffULL))", file=out_af_defs)
 
-        pins.print(out_source)
-        for i in range(1, 4):
-            pins.print_adc(i, out_source)
+    # Additional stm32-specific outputs that will be written in
+    # generate_extra_files().
+    def extra_args(self, parser):
+        parser.add_argument("--output-af-const")
+        parser.add_argument("--output-af-defs")
 
-    with open(args.output_header, "w") as out_header:
-        pins.print_header(out_header, not args.mboot_mode)
+        # In mboot mode the af-defs use object rather than string comparison,
+        # and we don't include externs in the header file.
+        parser.add_argument("--mboot-mode", action="store_true")
 
-    with open(args.output_af_const, "w") as out_af_const:
-        pins.print_af_hdr(out_af_const)
+    # Called in main() after everything else is done to write additional files.
+    def generate_extra_files(self):
+        if self.args.output_af_const:
+            with open(self.args.output_af_const, "w") as out_af_const:
+                self.print_af_const(out_af_const)
 
-    with open(args.output_af_defs, "w") as out_af_defs:
-        pins.print_af_defs(out_af_defs, not args.mboot_mode)
+        if self.args.output_af_defs:
+            with open(self.args.output_af_defs, "w") as out_af_defs:
+                self.print_af_defs(out_af_defs)
 
 
 if __name__ == "__main__":
-    main()
+    Stm32PinGenerator().main()
diff --git a/tools/boardgen.py b/tools/boardgen.py
index bef8e74727097..caa9fe851c768 100644
--- a/tools/boardgen.py
+++ b/tools/boardgen.py
@@ -344,8 +344,13 @@ def print_cpu_locals_dict(self, out_source):
     def _cpu_pin_pointer(self, pin):
         return "&pin_{:s}_obj".format(pin.name())
 
+    # Allow a port to prefix the board pin macro names with something.
+    # e.g. STM32 does pyb_pin_NAME whereas other ports using pin_NAME.
+    def board_name_define_prefix(self):
+        return ""
+
     # Print the pin_CPUNAME and pin_BOARDNAME macros.
-    def print_defines(self, out_header):
+    def print_defines(self, out_header, cpu=True, board=True):
         # Provide #defines for each cpu pin.
         for pin in self.available_pins():
             print(file=out_header)
@@ -354,29 +359,70 @@ def print_defines(self, out_header):
                 print("#if {}".format(m), file=out_header)
 
             # #define pin_CPUNAME (...)
-            print(
-                "#define pin_{:s} ({:s})".format(pin.name(), self._cpu_pin_pointer(pin)),
-                file=out_header,
-            )
-
-            # #define pin_BOARDNAME (pin_CPUNAME)
-            for board_pin_name, _board_hidden in pin._board_pin_names:
-                # Note: Hidden board pins are still available to C via the macro.
+            if cpu:
                 print(
-                    "#define pin_{:s} (pin_{:s})".format(
-                        board_pin_name,
-                        pin.name(),
-                    ),
+                    "#define pin_{:s} ({:s})".format(pin.name(), self._cpu_pin_pointer(pin)),
                     file=out_header,
                 )
 
+            # #define pin_BOARDNAME (pin_CPUNAME)
+            if board:
+                for board_pin_name, _board_hidden in pin._board_pin_names:
+                    # Note: Hidden board pins are still available to C via the macro.
+                    # Note: The RHS isn't wrapped in (), which is necessary to make the
+                    # STATIC_AF_ macro work on STM32.
+                    print(
+                        "#define {:s}pin_{:s} pin_{:s}".format(
+                            self.board_name_define_prefix(),
+                            board_pin_name,
+                            pin.name(),
+                        ),
+                        file=out_header,
+                    )
+
+            if m:
+                print("#endif", file=out_header)
+
+    def print_pin_objects(self, out_source):
+        print(file=out_source)
+        for pin in self.available_pins():
+            m = pin.enable_macro()
+            if m:
+                print("#if {}".format(m), file=out_source)
+            print(
+                "{:s}machine_pin_obj_t pin_{:s}_obj = {:s};".format(
+                    "const " if pin.is_const() else "",
+                    pin.name(),
+                    pin.definition(),
+                ),
+                file=out_source,
+            )
+            if m:
+                print("#endif", file=out_source)
+
+    def print_pin_object_externs(self, out_header):
+        print(file=out_header)
+        for pin in self.available_pins():
+            m = pin.enable_macro()
+            if m:
+                print("#if {}".format(m), file=out_header)
+            print(
+                "extern {:s}machine_pin_obj_t pin_{:s}_obj;".format(
+                    "const " if pin.is_const() else "",
+                    pin.name(),
+                ),
+                file=out_header,
+            )
             if m:
                 print("#endif", file=out_header)
 
     def print_source(self, out_source):
-        raise NotImplementedError
+        self.print_pin_objects(out_source)
+        self.print_cpu_locals_dict(out_source)
+        self.print_board_locals_dict(out_source)
 
     def print_header(self, out_header):
+        self.print_pin_object_externs(out_header)
         self.print_defines(out_header)
 
     # A port can override this if it has extra input files (e.g. af.csv) to load.
@@ -498,6 +544,10 @@ def print_source(self, out_source):
         self.print_cpu_table(out_source)
         self.print_board_locals_dict(out_source)
 
+    # Replace PinGenerator's implementation to only print the defines.
+    def print_header(self, out_header):
+        self.print_defines(out_header)
+
     def _cpu_pin_pointer(self, pin):
         n = pin.index_name()
         if n is not None:

From ff6c2adfd74b6b2382414bfd6a931ffce4da92bd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 2 Nov 2023 15:16:28 +1100
Subject: [PATCH 0516/3129] stm32/boards/make-pins.py: Add initial support for
 H7 dual-pad pins.

This fixes the H7 af.csv files to include the dual-pad information, by
listing the ADCs supported on the _C pad with a C_ADC prefix.

Minimal change to make-pins.py to ignore these entries. This will be
implemented later to emit constants (similar to ADC.CORE_TEMP) to access
these channels.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/make-pins.py     |  5 +++++
 ports/stm32/boards/stm32h723_af.csv |  4 ++--
 ports/stm32/boards/stm32h743_af.csv |  8 ++++----
 ports/stm32/boards/stm32h7b3_af.csv | 24 ++++++++++++------------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 10472a093f661..31e7bdb0e2f29 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -124,6 +124,11 @@ def add_adc(self, adc):
         # be the P for one channel, and the N for a different channel.
         # e.g. "ADC123_INP12/ADC123_INN11".
         for adc_name in adc.split("/"):
+            if adc_name.startswith("C_"):
+                # Currently unsupported, H7 dual-pad. The C_ADC entries should
+                # only be available directly from machine.ADC (not via the pin
+                # object).
+                continue
             m = re.match("ADC([1-5]+)_(IN[NP]?)([0-9]+)$", adc_name)
             if not m:
                 raise boardgen.PinGeneratorError(
diff --git a/ports/stm32/boards/stm32h723_af.csv b/ports/stm32/boards/stm32h723_af.csv
index aa873797863cd..71873e670b3d0 100644
--- a/ports/stm32/boards/stm32h723_af.csv
+++ b/ports/stm32/boards/stm32h723_af.csv
@@ -34,8 +34,8 @@ PortB,PB14,             ,TIM1_CH2N                           ,TIM12_CH1
 PortB,PB15,RTC_REFIN    ,TIM1_CH3N                           ,TIM12_CH2                     ,TIM8_CH3N                                         ,USART1_RX                                                           ,SPI2_MOSI/I2S2_SDO                               ,DFSDM1_CKIN2                                  ,                                                  ,UART4_CTS                                  ,SDMMC2_D1                                                   ,                                                        ,                                                                              ,FMC_D11/FMC_AD11                           ,                              ,LCD_G7         ,EVENTOUT,
 PortC,PC0 ,             ,FMC_D12/FMC_AD12                    ,                              ,DFSDM1_CKIN0                                      ,                                                                    ,                                                 ,DFSDM1_DATIN4                                 ,                                                  ,SAI4_FS_B                                  ,FMC_A25                                                     ,OTG_HS_ULPI_STP                                         ,LCD_G2                                                                        ,FMC_SDNWE                                  ,                              ,LCD_R5         ,EVENTOUT,ADC123_INP10
 PortC,PC1 ,TRACED0      ,SAI4_D1                             ,SAI1_D1                       ,DFSDM1_DATIN0                                     ,DFSDM1_CKIN4                                                        ,SPI2_MOSI/I2S2_SDO                               ,SAI1_SD_A                                     ,                                                  ,SAI4_SD_A                                  ,SDMMC2_CK                                                   ,OCTOSPIM_P1_IO4                                         ,ETH_MDC                                                                       ,MDIOS_MDC                                  ,                              ,LCD_G5         ,EVENTOUT,ADC123_INP11/ADC123_INN10
-PortC,PC2 ,PWR_DEEPSLEEP,                                    ,                              ,DFSDM1_CKIN1                                      ,OCTOSPIM_P1_IO5                                                     ,SPI2_MISO/I2S2_SDI                               ,DFSDM1_CKOUT                                  ,                                                  ,                                           ,OCTOSPIM_P1_IO2                                             ,OTG_HS_ULPI_DIR                                         ,ETH_MII_TXD2                                                                  ,FMC_SDNE0                                  ,                              ,               ,EVENTOUT,ADC123_INP12/ADC123_INN11
-PortC,PC3 ,PWR_SLEEP    ,                                    ,                              ,DFSDM1_DATIN1                                     ,OCTOSPIM_P1_IO6                                                     ,SPI2_MOSI/I2S2_SDO                               ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_IO0                                             ,OTG_HS_ULPI_NXT                                         ,ETH_MII_TX_CLK                                                                ,FMC_SDCKE0                                 ,                              ,               ,EVENTOUT,ADC123_INP13/ADC123_INN12
+PortC,PC2 ,PWR_DEEPSLEEP,                                    ,                              ,DFSDM1_CKIN1                                      ,OCTOSPIM_P1_IO5                                                     ,SPI2_MISO/I2S2_SDI                               ,DFSDM1_CKOUT                                  ,                                                  ,                                           ,OCTOSPIM_P1_IO2                                             ,OTG_HS_ULPI_DIR                                         ,ETH_MII_TXD2                                                                  ,FMC_SDNE0                                  ,                              ,               ,EVENTOUT,ADC123_INP12/ADC123_INN11/C_ADC3_INN1/C_ADC3_INP0
+PortC,PC3 ,PWR_SLEEP    ,                                    ,                              ,DFSDM1_DATIN1                                     ,OCTOSPIM_P1_IO6                                                     ,SPI2_MOSI/I2S2_SDO                               ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_IO0                                             ,OTG_HS_ULPI_NXT                                         ,ETH_MII_TX_CLK                                                                ,FMC_SDCKE0                                 ,                              ,               ,EVENTOUT,ADC12_INP13/ADC12_INN12/C_ADC3_INP1
 PortC,PC4 ,PWR_DEEPSLEEP,FMC_A22                             ,                              ,DFSDM1_CKIN2                                      ,                                                                    ,I2S1_MCK                                         ,                                              ,                                                  ,                                           ,SPDIFRX1_IN3                                                ,SDMMC2_CKIN                                             ,ETH_MII_RXD0/ETH_RMII_RXD0                                                    ,FMC_SDNE0                                  ,                              ,LCD_R7         ,EVENTOUT,ADC12_INP4
 PortC,PC5 ,PWR_SLEEP    ,SAI4_D3                             ,SAI1_D3                       ,DFSDM1_DATIN2                                     ,PSSI_D15                                                            ,                                                 ,                                              ,                                                  ,                                           ,SPDIFRX1_IN4                                                ,OCTOSPIM_P1_DQS                                         ,ETH_MII_RXD1/ETH_RMII_RXD1                                                    ,FMC_SDCKE0                                 ,COMP1_OUT                     ,LCD_DE         ,EVENTOUT,ADC12_INP8/ADC12_INN4
 PortC,PC6 ,             ,                                    ,TIM3_CH1                      ,TIM8_CH1                                          ,DFSDM1_CKIN3                                                        ,I2S2_MCK                                         ,                                              ,USART6_TX                                         ,SDMMC1_D0DIR                               ,FMC_NWAIT                                                   ,SDMMC2_D6                                               ,                                                                              ,SDMMC1_D6                                  ,DCMI_D0/PSSI_D0               ,LCD_HSYNC      ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h743_af.csv b/ports/stm32/boards/stm32h743_af.csv
index 2287209c49001..4a291265c48fb 100644
--- a/ports/stm32/boards/stm32h743_af.csv
+++ b/ports/stm32/boards/stm32h743_af.csv
@@ -1,7 +1,7 @@
 Port ,Pin ,AF0          ,AF1                       ,AF2                    ,AF3                                  ,AF4                                     ,AF5               ,AF6                           ,AF7                               ,AF8                                        ,AF9                                                  ,AF10                                          ,AF11                                           ,AF12                               ,AF13              ,AF14     ,AF15    ,ADC
      ,    ,SYS          ,TIM1/2/16/17/LPTIM1/HRTIM1,SAI1/TIM3/4/5/12/HRTIM1,LPUART/TIM8/LPTIM2/3/4/5/HRTIM1/DFSDM,I2C1/2/3/4/USART1/TIM15/LPTIM2/DFSDM/CEC,SPI1/2/3/4/5/6/CEC,SPI2/3/SAI1/3/I2C4/UART4/DFSDM,SPI2/3/6/USART1/2/3/6/UART7/SDMMC1,SPI6/SAI2/4/UART4/5/8/LPUART/SDMMC1/SPDIFRX,SAI4/FDCAN1/2/TIM13/14/QUADSPI/FMC/SDMMC2/LCD/SPDIFRX,SAI2/4/TIM8/QUADSPI/SDMMC2/OTG1_HS/OTG2_FS/LCD,I2C4/UART7/SWPMI1/TIM1/8/DFSDM/SDMMC2/MDIOS/ETH,TIM1/8/FMC/SDMMC1/MDIOS/OTG1_FS/LCD,TIM1/DCMI/LCD/COMP,UART5/LCD,SYS     ,ADC
-PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR         ,TIM5_CH1               ,TIM8_ETR                             ,TIM15_BKIN                              ,                  ,                              ,USART2_CTS/USART2_NSS             ,UART4_TX                                   ,SDMMC2_CMD                                           ,SAI2_SD_B                                     ,ETH_MII_CRS                                    ,                                   ,                  ,         ,EVENTOUT,ADC1_INP16/ADC12_INN1/ADC12_INP0
-PortA,PA1 ,             ,TIM2_CH2                  ,TIM5_CH2               ,LPTIM3_OUT                           ,TIM15_CH1N                              ,                  ,                              ,USART2_RTS                        ,UART4_RX                                   ,QUADSPI_BK1_IO3                                      ,SAI2_MCK_B                                    ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK                ,                                   ,                  ,LCD_R2   ,EVENTOUT,ADC1_INN16/ADC1_INP17/ADC12_INP1
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR         ,TIM5_CH1               ,TIM8_ETR                             ,TIM15_BKIN                              ,                  ,                              ,USART2_CTS/USART2_NSS             ,UART4_TX                                   ,SDMMC2_CMD                                           ,SAI2_SD_B                                     ,ETH_MII_CRS                                    ,                                   ,                  ,         ,EVENTOUT,ADC1_INP16/C_ADC12_INN1/C_ADC12_INP0
+PortA,PA1 ,             ,TIM2_CH2                  ,TIM5_CH2               ,LPTIM3_OUT                           ,TIM15_CH1N                              ,                  ,                              ,USART2_RTS                        ,UART4_RX                                   ,QUADSPI_BK1_IO3                                      ,SAI2_MCK_B                                    ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK                ,                                   ,                  ,LCD_R2   ,EVENTOUT,ADC1_INN16/ADC1_INP17/C_ADC12_INP1
 PortA,PA2 ,             ,TIM2_CH3                  ,TIM5_CH3               ,LPTIM4_OUT                           ,TIM15_CH1                               ,                  ,                              ,USART2_TX                         ,SAI2_SCK_B                                 ,                                                     ,                                              ,ETH_MDIO                                       ,MDIOS_MDIO                         ,                  ,LCD_R1   ,EVENTOUT,ADC12_INP14
 PortA,PA3 ,             ,TIM2_CH4                  ,TIM5_CH4               ,LPTIM5_OUT                           ,TIM15_CH2                               ,                  ,                              ,USART2_RX                         ,                                           ,LCD_B2                                               ,OTG_HS_ULPI_D0                                ,ETH_MII_COL                                    ,                                   ,                  ,LCD_B5   ,EVENTOUT,ADC12_INP15
 PortA,PA4 ,             ,                          ,TIM5_ETR               ,                                     ,                                        ,SPI1_NSS/I2S1_WS  ,SPI3_NSS/I2S3_WS              ,USART2_CK                         ,SPI6_NSS                                   ,                                                     ,                                              ,                                               ,OTG_HS_SOF                         ,DCMI_HSYNC        ,LCD_VSYNC,EVENTOUT,ADC12_INP18
@@ -34,8 +34,8 @@ PortB,PB14,             ,TIM1_CH2N                 ,TIM12_CH1              ,TIM8
 PortB,PB15,RTC_REFIN    ,TIM1_CH3N                 ,TIM12_CH2              ,TIM8_CH3N                            ,USART1_RX                               ,SPI2_MOSI/I2S2_SDO,DFSDM_CKIN2                   ,                                  ,UART4_CTS                                  ,SDMMC2_D1                                            ,                                              ,                                               ,OTG_HS_DP                          ,                  ,         ,EVENTOUT,
 PortC,PC0 ,             ,                          ,                       ,DFSDM_CKIN0                          ,                                        ,                  ,DFSDM_DATIN4                  ,                                  ,SAI2_FS_B                                  ,                                                     ,OTG_HS_ULPI_STP                               ,                                               ,FMC_SDNWE                          ,                  ,LCD_R5   ,EVENTOUT,ADC123_INP10
 PortC,PC1 ,TRACED0      ,                          ,SAI1_D1                ,DFSDM_DATIN0                         ,DFSDM_CKIN4                             ,SPI2_MOSI/I2S2_SDO,SAI1_SD_A                     ,                                  ,SAI4_SD_A                                  ,SDMMC2_CK                                            ,SAI4_D1                                       ,ETH_MDC                                        ,MDIOS_MDC                          ,                  ,         ,EVENTOUT,ADC123_INN10/ADC123_INP11
-PortC,PC2 ,             ,                          ,                       ,DFSDM_CKIN1                          ,                                        ,SPI2_MISO/I2S2_SDI,DFSDM_CKOUT                   ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_DIR                               ,ETH_MII_TXD2                                   ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC123_INN11/ADC123_INP12/ADC3_INN1/ADC3_INP0
-PortC,PC3 ,             ,                          ,                       ,DFSDM_DATIN1                         ,                                        ,SPI2_MOSI/I2S2_SDO,                              ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_NXT                               ,ETH_MII_TX_CLK                                 ,FMC_SDCKE0                         ,                  ,         ,EVENTOUT,ADC12_INN12/ADC12_INP13/ADC3_INP1
+PortC,PC2 ,             ,                          ,                       ,DFSDM_CKIN1                          ,                                        ,SPI2_MISO/I2S2_SDI,DFSDM_CKOUT                   ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_DIR                               ,ETH_MII_TXD2                                   ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC123_INN11/ADC123_INP12/C_ADC3_INN1/C_ADC3_INP0
+PortC,PC3 ,             ,                          ,                       ,DFSDM_DATIN1                         ,                                        ,SPI2_MOSI/I2S2_SDO,                              ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_NXT                               ,ETH_MII_TX_CLK                                 ,FMC_SDCKE0                         ,                  ,         ,EVENTOUT,ADC12_INN12/ADC12_INP13/C_ADC3_INP1
 PortC,PC4 ,             ,                          ,                       ,DFSDM_CKIN2                          ,                                        ,I2S1_MCK          ,                              ,                                  ,                                           ,SPDIFRX_IN2                                          ,                                              ,ETH_MII_RXD0/ETH_RMII_RXD0                     ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC12_INP4
 PortC,PC5 ,             ,                          ,SAI1_D3                ,DFSDM_DATIN2                         ,                                        ,                  ,                              ,                                  ,                                           ,SPDIFRX_IN3                                          ,SAI4_D3                                       ,ETH_MII_RXD1/ETH_RMII_RXD1                     ,FMC_SDCKE0                         ,COMP_1_OUT        ,         ,EVENTOUT,ADC12_INN4/ADC12_INP8
 PortC,PC6 ,             ,HRTIM_CHA1                ,TIM3_CH1               ,TIM8_CH1                             ,DFSDM_CKIN3                             ,I2S2_MCK          ,                              ,USART6_TX                         ,SDMMC1_D0DIR                               ,FMC_NWAIT                                            ,SDMMC2_D6                                     ,                                               ,SDMMC1_D6                          ,DCMI_D0           ,LCD_HSYNC,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h7b3_af.csv b/ports/stm32/boards/stm32h7b3_af.csv
index 0846689a0769d..1acef21f37e56 100644
--- a/ports/stm32/boards/stm32h7b3_af.csv
+++ b/ports/stm32/boards/stm32h7b3_af.csv
@@ -1,13 +1,13 @@
 Port ,Pin ,AF0             ,AF1                ,AF2                    ,AF3                                       ,AF4                                                  ,AF5                                               ,AF6                                           ,AF7                                                    ,AF8                                             ,AF9                                                    ,AF10                                                    ,AF11                                                                    ,AF12                             ,AF13                           ,AF14      ,AF15    ,ADC
      ,    ,SYS             ,LPTIM1/TIM1/2/16/17,PDM_SAI1/TIM3/4/5/12/15,DFSDM1/LPTIM2/3/LPUART1/OCTOSPIM_P1/2/TIM8,CEC/DCMI/PSSI/DFSDM1/2/I2C1/2/3/4/LPTIM2/TIM15/USART1,CEC/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/SPI6/I2S6,DFSDM1/2/I2C4/OCTOSPIM_P1/SAI1/SPI3/I2S3/UART4,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/I2S6/UART7/USART1/2/3/6,LPUART1/SAI2/SDMMC1/SPDIFRX1/SPI6/I2S6/UART4/5/8,FDCAN1/2/FMC/LCD/OCTOSPIM_P1/2/SDMMC2/SPDIFRX1/TIM13/14,CRS/FMC/LCD/OCTOSPIM_P1/OTG1_FS/OTG1_HS/SAI2/SDMMC2/TIM8,DFSDM1/2/I2C4/LCD/MDIOS/OCTOSPIM_P1/SDMMC2/SWPMI1/TIM1/8/UART7/9/USART10,FMC/LCD/MDIOS/SDMMC1/TIM1/8      ,COMP/DCMI/PSSI/LCD/TIM1        ,LCD/UART5 ,SYS     ,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,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,ADC1_INN16/ADC1_INP17
+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,ADC1_INP16/C_ADC1_INP0/C_ADC1_INN1
+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,ADC1_INN16/ADC1_INP17/C_ADC1_INP1
 PortA,PA2 ,                ,TIM2_CH3           ,TIM5_CH3               ,                                          ,TIM15_CH1                                            ,                                                  ,DFSDM2_CKIN1                                  ,USART2_TX                                              ,SAI2_SCK_B                                      ,                                                       ,                                                        ,                                                                        ,MDIOS_MDIO                       ,                               ,LTDC_R1   ,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,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,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,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,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,ADC1_INN3/ADC1_INP7/ADC2_INN3/ADC2_INP7
+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,ADC12_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,ADC12_INN3/ADC12_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,
 PortA,PA9 ,                ,TIM1_CH2           ,                       ,LPUART1_TX                                ,I2C3_SMBA                                            ,I2S2_CK/SPI2_SCK                                  ,                                              ,USART1_TX                                              ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,DCMI_D0/PSSI_D0                ,LTDC_R5   ,EVENTOUT,
 PortA,PA10,                ,TIM1_CH3           ,                       ,LPUART1_RX                                ,                                                     ,                                                  ,                                              ,USART1_RX                                              ,                                                ,                                                       ,USB_OTG_HS_ID                                           ,MDIOS_MDIO                                                              ,LTDC_B4                          ,DCMI_D1/PSSI_D1                ,LTDC_B1   ,EVENTOUT,
@@ -16,8 +16,8 @@ PortA,PA12,                ,TIM1_ETR           ,                       ,LPUART1_
 PortA,PA13,DEBUG_JTMS/SWDIO,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,EVENTOUT,
 PortA,PA14,DEBUG_JTCK/SWCLK,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,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,
-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,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,ADC1_INP5/ADC2_INP5
+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,ADC12_INN5/ADC12_INP9
+PortB,PB1 ,                ,TIM1_CH3N          ,TIM3_CH4               ,TIM8_CH3N                                 ,                                                     ,                                                  ,DFSDM1_DATIN1                                 ,                                                       ,                                                ,LTDC_R6                                                ,USB_OTG_HS_ULPI_D2                                      ,OCTOSPIM_P1_IO0                                                         ,                                 ,                               ,LTDC_G0   ,EVENTOUT,ADC12_INP5
 PortB,PB2 ,RTC_OUT_ALARM   ,                   ,SAI1_D1                ,                                          ,DFSDM1_CKIN1                                         ,                                                  ,SAI1_SD_A                                     ,I2S3_SDO/SPI3_MOSI                                     ,                                                ,OCTOSPIM_P1_CLK                                        ,OCTOSPIM_P1_DQS                                         ,                                                                        ,                                 ,                               ,          ,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,
 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,
@@ -32,12 +32,12 @@ PortB,PB12,                ,TIM1_BKIN          ,                       ,OCTOSPIM
 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,
 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,
 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,
-PortC,PC0 ,                ,                   ,                       ,DFSDM1_CKIN0                              ,                                                     ,                                                  ,DFSDM1_DATIN4                                 ,                                                       ,SAI2_FS_B                                       ,FMC_A25                                                ,USB_OTG_HS_ULPI_STP                                     ,LTDC_G2                                                                 ,FMC_SDNWE                        ,                               ,LTDC_R5   ,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,ADC1_INN10/ADC1_INP11/ADC2_INN10/ADC2_INP11
-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,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,ADC2_INP1
-PortC,PC4 ,                ,                   ,                       ,DFSDM1_CKIN2                              ,                                                     ,I2S1_MCK                                          ,                                              ,                                                       ,                                                ,SPDIFRX_IN3                                            ,                                                        ,                                                                        ,FMC_SDNE0                        ,                               ,LTDC_R7   ,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,ADC1_INN4/ADC1_INP8/ADC2_INN4/ADC2_INP8
+PortC,PC0 ,                ,                   ,                       ,DFSDM1_CKIN0                              ,                                                     ,                                                  ,DFSDM1_DATIN4                                 ,                                                       ,SAI2_FS_B                                       ,FMC_A25                                                ,USB_OTG_HS_ULPI_STP                                     ,LTDC_G2                                                                 ,FMC_SDNWE                        ,                               ,LTDC_R5   ,EVENTOUT,ADC12_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,ADC12_INN10/ADC12_INP11
+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,ADC12_INN11/ADC12_INP12/C_ADC2_INP0/C_ADC2_INN1
+PortC,PC3 ,PWR_CSLEEP      ,                   ,                       ,DFSDM1_DATIN1                             ,                                                     ,I2S2_SDO/SPI2_MOSI                                ,                                              ,                                                       ,                                                ,OCTOSPIM_P1_IO0                                        ,USB_OTG_HS_ULPI_NXT                                     ,OCTOSPIM_P1_IO6                                                         ,FMC_SDCKE0                       ,                               ,          ,EVENTOUT,ADC12_INP13,ADC12_INN12/C_ADC2_INP1
+PortC,PC4 ,                ,                   ,                       ,DFSDM1_CKIN2                              ,                                                     ,I2S1_MCK                                          ,                                              ,                                                       ,                                                ,SPDIFRX_IN3                                            ,                                                        ,                                                                        ,FMC_SDNE0                        ,                               ,LTDC_R7   ,EVENTOUT,ADC12_INP4
+PortC,PC5 ,                ,                   ,SAI1_D3                ,DFSDM1_DATIN2                             ,PSSI_D15                                             ,                                                  ,                                              ,                                                       ,                                                ,SPDIFRX_IN4                                            ,OCTOSPIM_P1_DQS                                         ,                                                                        ,FMC_SDCKE0                       ,COMP1_OUT                      ,LTDC_DE   ,EVENTOUT,ADC12_INN4/ADC12_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,
 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,
 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,

From 4d568a5bd73530830dab104d53292120f0e31d3d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 14 Aug 2023 11:17:18 +1000
Subject: [PATCH 0517/3129] samd/boards/make-pins.py: Update to use
 tools/boardgen.py.

This replaces the previous make-pin-table.py with an implementation based
on boardgen.py.

- MICROPY_PY_MACHINE_PIN_BOARD_CPU macro is removed. This isn't optional
  on other ports, so no need for it to be optional on SAMD.
- pin_af_table is removed, and lookups just search the cpu dict instead
  (this saves N*wordsize bytes of firmware size to have this extra table).
- pins.csv is now BOARD,CPU to match other ports.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/samd/Makefile                           |  23 +-
 .../ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv      |  75 +++----
 .../ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv      |  77 ++++---
 .../ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv    |  71 +++----
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv    |  77 ++++---
 .../boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv | 111 +++++-----
 .../samd/boards/ADAFRUIT_TRINKET_M0/pins.csv  |  29 ++-
 ports/samd/boards/MINISAM_M4/pins.csv         |  73 +++----
 .../samd/boards/SAMD21_XPLAINED_PRO/pins.csv  |  97 ++++-----
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv | 139 ++++++------
 ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv  |  41 ++--
 .../SPARKFUN_SAMD51_THING_PLUS/pins.csv       |  71 +++----
 ports/samd/boards/make-pin-table.py           | 201 ------------------
 ports/samd/boards/make-pins.py                |  95 +++++++++
 ports/samd/boards/pins_prefix.c               |  21 ++
 ports/samd/machine_adc.c                      |   4 +-
 ports/samd/machine_dac.c                      |   2 +-
 ports/samd/machine_pin.c                      |  19 +-
 ports/samd/machine_pwm.c                      |   4 +-
 ports/samd/machine_uart.c                     |   6 +-
 ports/samd/mcu/samd21/mpconfigmcu.h           |   4 -
 ports/samd/mcu/samd21/pin-af-table.csv        | 107 +++++-----
 ports/samd/mcu/samd51/mpconfigmcu.h           |   4 -
 ports/samd/mcu/samd51/pin-af-table.csv        | 201 +++++++++---------
 ports/samd/pin_af.c                           |  59 ++---
 ports/samd/pin_af.h                           |   5 +-
 26 files changed, 715 insertions(+), 901 deletions(-)
 delete mode 100644 ports/samd/boards/make-pin-table.py
 create mode 100644 ports/samd/boards/make-pins.py
 create mode 100644 ports/samd/boards/pins_prefix.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 7d27367b6b11a..291a894ab7b07 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -56,10 +56,12 @@ 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-table.py
-PIN_AF_TABLE_CSV = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
+MAKE_PINS = boards/make-pins.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
-GEN_PIN_AF = pin_af_table.c
+PREFIX_FILE = boards/pins_prefix.c
+AF_FILE = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
+GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 
 CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
@@ -179,7 +181,7 @@ DRIVERS_SRC_C += \
 	drivers/bus/softspi.c \
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(SRC_CXX)
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(SRC_CXX) $(GEN_PINS_SRC)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
@@ -190,6 +192,7 @@ 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)
 
 all: $(BUILD)/firmware.uf2
 
@@ -203,10 +206,14 @@ $(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) | $(HEADER_BUILD)
+# pin_af.c: $(BUILD)/$(GEN_PIN_AF) | $(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) --board $(BOARD_PINS) --table $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_$(BOARD).c and pins.h
+$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h: $(BOARD_DIR)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) \
+	    --mcu $(MCU_SERIES)
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
index 65362770624de..8993419a268c5 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -1,43 +1,38 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines starting with # are ignored
+LED_TX,PA27
+LED_RX,PB03
 
-PIN_PA27,LED_TX
-PIN_PB03,LED_RX
+D0,PA11
+D1,PA10
+FLASH_MOSI,PA08
+FLASH_MISO,PA14
+FLASH_SCK,PA09
+D5,PA15
+D6,PA20
+D7,PA21
+D8,PA06
+D9,PA07
+D10,PA18
+D11,PA16
+D12,PA19
+D13,PA17
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PB02
+TX,PB22
+RX,PB23
+SCL,PA23
+SDA,PA22
+MOSI,PB10
+MISO,PA12
+SCK,PB11
+NEOPIXEL,PA06
+FLASH_CS,PA13
 
-PIN_PA11,D0
-PIN_PA10,D1
-PIN_PA08,FLASH_MOSI
-PIN_PA14,FLASH_MISO
-PIN_PA09,FLASH_SCK
-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_PB10,MOSI
-PIN_PA12,MISO
-PIN_PB11,SCK
-PIN_PA06,NEOPIXEL
-PIN_PA13,FLASH_CS
+USB_DM,PA24
+USB_DP,PA25
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
index df3373f246a84..ec7a8bc1638da 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -1,44 +1,39 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PB17
+D1,PB16
+D4,PA14
+D5,PA16
+D6,PA18
+D8,PB03
+D9,PA19
+D10,PA20
+D11,PA21
+D12,PA22
+D13,PA23
+A0,PA02
+A1,PA05
+A2,PB08
+A3,PB09
+A4,PA04
+A5,PB06
+SCL,PA13
+SDA,PA12
+MOSI,PB23
+MISO,PB22
+SCK,PA17
+VDIV,PB01
+AREF,PA03
+NEOPIXEL,PB03
 
-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
-PIN_PB03,NEOPIXEL
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
index 04b1a717bd2cd..845cefb8a972b 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -1,40 +1,35 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PA11
+D1,PA10
+D2,PA14
+D3,PA09
+D4,PA08
+D5,PA15
+D7,PA21
+D9,PA07
+D10,PA18
+D11,PA16
+D12,PA19
+D13,PA17
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PB02
+SDA,PA22
+SCL,PA23
+MOSI,PB10
+MISO,PA12
+SCK,PB11
+DOTSTAR_CLK,PA00
+DOTSTAR_DATA,PA01
+FLASH_MOSI,PB22
+FLASH_MISO,PB03
+FLASH_SCK,PB23
+FLASH_CS,PA27
 
-PIN_PA11,D0
-PIN_PA10,D1
-PIN_PA14,D2
-PIN_PA09,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,MOSI
-PIN_PA12,MISO
-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
+USB_DM,PA24
+USB_DP,PA25
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
index b63a1f4b13554..c82beccfa2be3 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -1,44 +1,39 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PA16
+D1,PA17
+D2,PA07
+D3,PB22
+D4,PA14
+D5,PA15
+D7,PA18
+D9,PA19
+D10,PA20
+D11,PA21
+D12,PA23
+D13,PA22
+A0,PA02
+A1,PA05
+A2,PB08
+A3,PB09
+A4,PA04
+A5,PA06
+SDA,PA12
+SCL,PA13
+MOSI,PA00
+MISO,PB23
+SCK,PA01
+DOTSTAR_CLK,PB02
+DOTSTAR_DATA,PB03
 
-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,MOSI
-PIN_PB23,MISO
-PIN_PA01,SCK
-PIN_PB02,DOTSTAR_CLK
-PIN_PB03,DOTSTAR_DATA
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv
index 0bda767600e12..cee4bf02b7a39 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv
@@ -1,66 +1,61 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
-
-PIN_PA02,A0
-PIN_PA05,A1
-PIN_PA06,A2
-PIN_PB00,A3
-PIN_PB08,A4
-PIN_PB09,A5
-PIN_PA03,AREF
-
-PIN_PA23,D0
-PIN_PA22,D1
-PIN_PB17,D2
-PIN_PB16,D3
-PIN_PB13,D4
-PIN_PB14,D5
-PIN_PB15,D6
-PIN_PB12,D7
-PIN_PA21,D8
-PIN_PA20,D9
-PIN_PA18,D10
-PIN_PA19,D11
-PIN_PA17,D12
-PIN_PA16,D13
-
-PIN_PB02,SDA
-PIN_PB03,SCL
-
-PIN_PA13,SCK
-PIN_PA12,MOSI
-PIN_PA14,MISO
-
-PIN_PB22,NEOPIXEL
-PIN_PB06,RXLED
-PIN_PB07,TXLED
+A0,PA02
+A1,PA05
+A2,PA06
+A3,PB00
+A4,PB08
+A5,PB09
+AREF,PA03
+
+D0,PA23
+D1,PA22
+D2,PB17
+D3,PB16
+D4,PB13
+D5,PB14
+D6,PB15
+D7,PB12
+D8,PA21
+D9,PA20
+D10,PA18
+D11,PA19
+D12,PA17
+D13,PA16
+
+SDA,PB02
+SCL,PB03
+
+SCK,PA13
+MOSI,PA12
+MISO,PA14
+
+NEOPIXEL,PB22
+RXLED,PB06
+TXLED,PB07
 
 # Airlift
-PIN_PB05,ESP_RESET
-PIN_PB04,ESP_BUSY
-PIN_PA15,ESP_CS
-PIN_PB01,ESP_GPIO0
-PIN_PA07,ESP_RX
-PIN_PA04,ESP_TX
-PIN_PB23,ESP_RTS
+ESP_RESET,PB05
+ESP_BUSY,PB04
+ESP_CS,PA15
+ESP_GPIO0,PB01
+ESP_RX,PA07
+ESP_TX,PA04
+ESP_RTS,PB23
 
 # QSPI flash
-PIN_PA08,FLASH_MOSI
-PIN_PA09,FLASH_MISO
-PIN_PA10,FLASH_WP
-PIN_PA11,FLASH_HOLD
-PIN_PB10,FLASH_SCK
-PIN_PB11,FLASH_CS
+FLASH_MOSI,PA08
+FLASH_MISO,PA09
+FLASH_WP,PA10
+FLASH_HOLD,PA11
+FLASH_SCK,PB10
+FLASH_CS,PB11
 
 # USB
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-PIN_PA17,USB_HOSTEN
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
+#USB_HOSTEN,PA17
 
 # JLink
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
-PIN_PB30,SWO
+SWCLK,PA30
+SWDIO,PA31
+SWO,PB30
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
index b5f1c9801b154..47306f8de1ce0 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
@@ -1,20 +1,15 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PA08
+D1,PA02
+D2,PA09
+D3,PA07
+D4,PA06
+DOTSTAR_DATA,PA00
+DOTSTAR_CLK,PA01
 
-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
 
-PIN_PA10,LED
+USB_DM,PA24
+USB_DP,PA25
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
index 3ea5f85cbacb9..3c1ab4c6038d3 100644
--- a/ports/samd/boards/MINISAM_M4/pins.csv
+++ b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -1,43 +1,38 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PA06
+A6,PA07
+RX,PA16
+TX,PA17
+D3,PA19
+D4,PA20
+D5,PA21
+LED,PA15
+BUTTON,PA00
+AREF,PA03
+SDA,PA12
+SCL,PA13
+MOSI,PB22
+MISO,PB23
+SCK,PA01
+DOTSTAR_DATA,PB03
+DOTSTAR_CLK,PB02
 
-PIN_PA02,A0
-PIN_PB08,A1
-PIN_PB09,A2
-PIN_PA04,A3
-PIN_PA05,A4
-PIN_PA06,A5
-PIN_PA07,A6
-PIN_PA16,RX
-PIN_PA17,TX
-PIN_PA19,D3
-PIN_PA20,D4
-PIN_PA21,D5
-PIN_PA15,LED
-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
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+LED,PA15
 
-PIN_PA15,LED
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
index 5990c373bf934..69d0c136d08ef 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
@@ -1,60 +1,55 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ 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
+EXT1_PIN3,PB00
+EXT1_PIN4,PB01
+EXT1_PIN5,PB06
+EXT1_PIN6,PB07
+EXT1_PIN7,PB02
+EXT1_PIN8,PB03
+EXT1_PIN9,PB04
+EXT1_PIN10,PB05
+EXT1_PIN11,PA08
+EXT1_PIN12,PA09
+EXT1_PIN13,PB09
+EXT1_PIN14,PB08
+EXT1_PIN15,PA05
+EXT1_PIN16,PA06
+EXT1_PIN17,PA04
+EXT1_PIN18,PA07
 
 # 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
+EXT2_PIN3,PA10
+EXT2_PIN4,PA11
+EXT2_PIN5,PA20
+EXT2_PIN6,PA21
+EXT2_PIN7,PB12
+EXT2_PIN8,PB13
+EXT2_PIN9,PB14
+EXT2_PIN10,PB15
+EXT2_PIN13,PB11
+EXT2_PIN14,PB10
+EXT2_PIN15,PA17
+EXT2_PIN16,PA18
+EXT2_PIN17,PA16
+EXT2_PIN18,PA19
 
 # 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
+EXT3_PIN3,PA02
+EXT3_PIN4,PA03
+EXT3_PIN6,PA15
+EXT3_PIN7,PA12
+EXT3_PIN8,PA13
+EXT3_PIN9,PA28
+EXT3_PIN10,PA27
+EXT3_PIN15,PB17
+EXT3_PIN16,PB22
+EXT3_PIN17,PB16
+EXT3_PIN18,PB23
 
-PIN_PB30,LED
+LED,PB30
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
+USB_DM,PA24
+USB_DP,PA25
 
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
 
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
index c32108b9f72a0..f263253cbaae4 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -1,76 +1,71 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+A0_D0,PB08
+A1_D1,PB09
+A2_D2,PA07
+A3_D3,PB04
+A4_D4,PB05
+A5_D5,PB06
+A6_D6,PA04
+A7_D7,PB07
+A8_D8,PA06
+SWITCH_X,PD08
+SWITCH_Y,PD09
+SWITCH_Z,PD10
+SWITCH_B,PD12
+SWITCH_U,PD20
+BUTTON_1,PC26
+BUTTON_2,PC27
+BUTTON_3,PC28
+ENABLE_5V,PC14
+ENABLE_3V3,PC15
+TX,PB26
+RX,PB27
+SDA0,PA13
+SCL0,PA12
+SDA1,PA17
+SCL1,PA16
+MOSI,PB02
+MISO,PB00
+SCK,PB03
+CS,PB01
+GPCLK0,PB15
+GPCLK1,PB12
+GPCLK2,PB13
+SD_MOSI,PC16
+SD_MISO,PC18
+SD_SCK,PC17
+SD_CS,PC19
+SD_DET,PD21
+I2S_LRCLK,PA20
+I2S_SDIN,PA21
+I2S_SDOUT,PA22
+I2C_BCLK,PB16
+LCD_MISO,PB18
+LCD_MOSI,PB19
+LCD_SCK,PB20
+LCD_CS,PB21
+LCD_BACKLIGHT,PC05
+LCD_D_C,PC06
+LCD_RESET,PC07
+LCD_XL,PC10
+LCD_YU,PC11
+LCD_XR,PC12
+LCD_YD,PC13
+MIC,PC30
+BUZZER,PD11
 
-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_PC14,ENABLE_5V
-PIN_PC15,ENABLE_3V3
-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
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+LED_BLUE,PA15
+LED_LCD,PC05
 
-PIN_PA15,LED_BLUE
-PIN_PC05,LED_LCD
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv b/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
index 2f1c180e8ac6a..969c60028b41b 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
@@ -1,26 +1,21 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+A0_D0,PA02
+A1_D1,PA04
+A2_D2,PA10
+A3_D3,PA11
+A4_D4,PA08
+A5_D5,PA09
+A6_D6,PB08
+A7_D7,PB09
+A8_D8,PA07
+A9_D9,PA05
+A10_D10,PA06
 
-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
+USER_LED,PA17
+RX_LED,PA18
+TX_LED,PA19
 
-PIN_PA17,USER_LED
-PIN_PA18,RX_LED
-PIN_PA19,TX_LED
+USB_DM,PA24
+USB_DP,PA25
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
index d807b505a7044..0ae269724da85 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
@@ -1,41 +1,36 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PA13
+D1,PA12
+D4,PA06
+D5,PA15
+D6,PA20
+D7,PA21
+D9,PA07
+D10,PA18
+D11,PA16
+D12,PA19
+D13,PA17
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PB02
+SDA,PA22
+SCL,PA23
+MOSI,PB12
+MISO,PB11
+SCK,PB13
+FLASH_MOSI,PA08
+FLASH_SCK,PA09
+FLASH_CS,PA10
+FLASH_MISO,PA11
 
-PIN_PA13,D0
-PIN_PA12,D1
-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
+RXLED,PB03
+TXLED,PA27
 
-PIN_PB03,RXLED
-PIN_PA27,TXLED
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31
diff --git a/ports/samd/boards/make-pin-table.py b/ports/samd/boards/make-pin-table.py
deleted file mode 100644
index a187f2a711aaa..0000000000000
--- a/ports/samd/boards/make-pin-table.py
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/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
-//
-
-// The Pin objects which are available on a board
-
-"""
-
-
-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:
-            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 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 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)
-
-            # 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("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 = "MP_QSTR_%s" % self.pin_names[pin][0]
-                        type = self.pin_names[pin][1]
-                    else:
-                        name = "MP_QSTR_"
-                        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(
-                                ", 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")
-                    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 = "MP_QSTR_%s" % self.pin_names[pin][0]
-                        type = self.pin_names[pin][1]
-                    else:
-                        name = "MP_QSTR_"
-                        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(
-                                ", 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")
-
-            # 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():
-    parser = argparse.ArgumentParser(
-        prog="make-pin-af.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-af-table.csv filename",
-    )
-    parser.add_argument(
-        "-b",
-        "--board",
-        dest="pin_filename",
-        help="Specifies the pins.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.pin_filename:
-        pins.parse_pin_file(args.pin_filename)
-
-    if args.table_filename:
-        pins.print_table(args.table_filename, args.mcu_name)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/ports/samd/boards/make-pins.py b/ports/samd/boards/make-pins.py
new file mode 100644
index 0000000000000..302eeae624b18
--- /dev/null
+++ b/ports/samd/boards/make-pins.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+
+from collections import defaultdict, namedtuple
+import os
+import re
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../tools"))
+import boardgen
+
+
+# These are the columns of the af.csv as well as the arguments to the PIN()
+# macro in samd_prefix.c.
+AFS = {
+    "SAMD21": ["eic", "adc0", "sercom1", "sercom2", "tcc1", "tcc2"],
+    "SAMD51": ["eic", "adc0", "adc1", "sercom1", "sercom2", "tc", "tcc1", "tcc2"],
+}
+
+
+class SamdPin(boardgen.Pin):
+    def __init__(self, cpu_pin_name):
+        super().__init__(cpu_pin_name)
+
+        # P<port><num> (already verified by validate_cpu_pin_name).
+        self._port = cpu_pin_name[1]
+        self._pin = int(cpu_pin_name[2:])
+
+        # List of uint8 values from the af.csv. Default to 0xff if not
+        # present.
+        self._afs = defaultdict(lambda: 0xFF)
+
+    # Called for each AF defined in the csv file for this pin.
+    def add_af(self, af_idx, af_name, af):
+        # samd-specific: Any pin in the af.csv is implicitly part of the board
+        # pins.csv and will therefore be in the Pin.cpu dict. This is
+        # equivalent to adding `,Pxy` to the board.csv for every pin in the
+        # af.csv.
+        self._available = True
+
+        name = AFS[self._generator.args.mcu][af_idx]
+        assert name == af_name.lower()
+        if name == "eic" or name.startswith("adc"):
+            # eic and adc columns are decimal.
+            v = int(af)
+        else:
+            # hex, high nibble is device number, low nibble is pad number.
+            v = int(af, 16)
+        self._afs[AFS[self._generator.args.mcu][af_idx]] = v
+
+    # Use the PIN() macro defined in samd_prefix.c for defining the pin
+    # objects.
+    def definition(self):
+        # SAMD21: PIN(p_name, p_eic, p_adc0, p_sercom1, p_sercom2, p_tcc1, p_tcc2)
+        # SAMD51: PIN(p_name, p_eic, p_adc0, p_adc1, p_sercom1, p_sercom2, p_tc, p_tcc1, p_tcc2)
+        return "PIN({:s}, {})".format(
+            self.name(),
+            ", ".join("0x{:02x}".format(self._afs[x]) for x in AFS[self._generator.args.mcu]),
+        )
+
+    # Wrap all definitions to ensure that the ASF defines this pin for this
+    # particular MCU.
+    def enable_macro(self):
+        return "defined(PIN_{})".format(self.name())
+
+    # SAMD cpu names must be "P<port><num>", with zero-prefixed two-digit <num>.
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
+
+        if not re.match("P[A-D][0-9][0-9]$", cpu_pin_name):
+            raise boardgen.PinGeneratorError("Invalid cpu pin name '{}'".format(cpu_pin_name))
+
+
+class SamdPinGenerator(boardgen.PinGenerator):
+    def __init__(self):
+        # Use custom pin type above, and also enable the --af-csv argument so
+        # that add_af gets called on each pin.
+        super().__init__(
+            pin_type=SamdPin,
+            enable_af=True,
+        )
+
+    # Override the default implementation just to change the default arguments
+    # (extra header row, skip first column).
+    def parse_af_csv(self, filename):
+        return super().parse_af_csv(filename, header_rows=1, pin_col=0, af_col=1)
+
+    # We need to know the mcu to emit the correct AF list.
+    def extra_args(self, parser):
+        parser.add_argument("--mcu")
+
+
+if __name__ == "__main__":
+    SamdPinGenerator().main()
diff --git a/ports/samd/boards/pins_prefix.c b/ports/samd/boards/pins_prefix.c
new file mode 100644
index 0000000000000..4f0095d332130
--- /dev/null
+++ b/ports/samd/boards/pins_prefix.c
@@ -0,0 +1,21 @@
+// pins_prefix.c becomes the initial portion of the generated pins file.
+
+#include <stdio.h>
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "extmod/modmachine.h"
+#include "pin_af.h"
+#include "genhdr/pins.h"
+
+#if defined(MCU_SAMD21)
+
+#define PIN(p_name, p_eic, p_adc0, p_sercom1, p_sercom2, p_tcc1, p_tcc2) \
+    {{&machine_pin_type}, PIN_##p_name, MP_QSTR_##p_name, p_eic, p_adc0, p_sercom1, p_sercom2, p_tcc1, p_tcc2 }
+
+#elif defined(MCU_SAMD51)
+
+#define PIN(p_name, p_eic, p_adc0, p_adc1, p_sercom1, p_sercom2, p_tc, p_tcc1, p_tcc2) \
+    {{&machine_pin_type}, PIN_##p_name, MP_QSTR_##p_name, p_eic, p_adc0, p_adc1, p_sercom1, p_sercom2, p_tc, p_tcc1, p_tcc2 }
+
+#endif
diff --git a/ports/samd/machine_adc.c b/ports/samd/machine_adc.c
index 981318d33f2ff..2e4d4ed842326 100644
--- a/ports/samd/machine_adc.c
+++ b/ports/samd/machine_adc.c
@@ -89,8 +89,8 @@ STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     (void)kind;
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_printf(print, "ADC(%s, device=%u, channel=%u, bits=%u, average=%u, vref=%d)",
-        pin_name(self->id), self->adc_config.device,
+    mp_printf(print, "ADC(%q, device=%u, channel=%u, bits=%u, average=%u, vref=%d)",
+        pin_find_by_id(self->id)->name, self->adc_config.device,
         self->adc_config.channel, self->bits, 1 << self->avg, self->vref);
 }
 
diff --git a/ports/samd/machine_dac.c b/ports/samd/machine_dac.c
index 195c06e4f4a83..5c9d77624dce4 100644
--- a/ports/samd/machine_dac.c
+++ b/ports/samd/machine_dac.c
@@ -152,7 +152,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, vref=%d)", self->id, pin_name(self->gpio_id), self->vref);
+    mp_printf(print, "DAC(%u, Pin=%q, vref=%d)", self->id, pin_find_by_id(self->gpio_id)->name, self->vref);
 }
 
 STATIC mp_obj_t dac_write(mp_obj_t self_in, mp_obj_t value_in) {
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index f8e1b962804c0..30b254722b842 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -54,8 +54,7 @@ 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
+// Pin mapping dictionaries generated by make-pins.py.
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
@@ -69,7 +68,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     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;
 
@@ -90,11 +88,10 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         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)",
-        pin_name(self->pin_id),
+    mp_printf(print, "Pin(Pin.cpu.%q, mode=%s, pull=%s)",
+        self->name,
         mode_str,
-        pull_str[mp_hal_get_pull_mode(self->pin_id)],
-        "ABCD"[self->pin_id / 32], self->pin_id % 32);
+        pull_str[mp_hal_get_pull_mode(self->pin_id)]);
 }
 
 STATIC void pin_validate_drive(bool strength) {
@@ -292,7 +289,7 @@ 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_obj_ptr(self->pin_id)->eic;
+    uint8_t eic_id = self->eic;
     machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
     if (irq != NULL && irq->pin_id != self->pin_id) {
         mp_raise_ValueError(MP_ERROR_TEXT("IRQ already used"));
@@ -428,11 +425,9 @@ 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
+    { 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(GPIO_MODE_IN) },
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index 196a9b14355d5..6fc8145372bce 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -114,8 +114,8 @@ STATIC void mp_machine_pwm_stop(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);
-    mp_printf(print, "PWM(%s, device=%u, channel=%u, output=%u)",
-        pin_name(self->pin_id), self->device, self->channel, self->output);
+    mp_printf(print, "PWM(%q, device=%u, channel=%u, output=%u)",
+        pin_find_by_id(self->pin_id)->name, self->device, self->channel, self->output);
 }
 
 // called by the constructor and init()
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index c081b8814b9ae..ada193020b94b 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -120,7 +120,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         ", txbuf=%d"
         #endif
         #if MICROPY_HW_UART_RTSCTS
-        ", rts=%s, cts=%s"
+        ", rts=%q, cts=%q"
         #endif
         ")",
         self->id, self->baudrate, self->bits, _parity_name[self->parity],
@@ -129,8 +129,8 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         , self->write_buffer.size - 1
         #endif
         #if MICROPY_HW_UART_RTSCTS
-        , self->rts != 0xff ? pin_name(self->rts) : "None"
-        , self->cts != 0xff ? pin_name(self->cts) : "None"
+        , self->rts != 0xff ? pin_find_by_id(self->rts)->name : MP_QSTR_None
+        , self->cts != 0xff ? pin_find_by_id(self->cts)->name : MP_QSTR_None
         #endif
         );
 }
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index f70981acd53c1..1a3d9587291fe 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -37,10 +37,6 @@ unsigned long trng_random_u32(int delay);
 
 #define MICROPY_PY_OS_URANDOM           (1)
 
-#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                    (54000000)
diff --git a/ports/samd/mcu/samd21/pin-af-table.csv b/ports/samd/mcu/samd21/pin-af-table.csv
index b74db0c8efcaf..37bb592597edc 100644
--- a/ports/samd/mcu/samd21/pin-af-table.csv
+++ b/ports/samd/mcu/samd21/pin-af-table.csv
@@ -9,57 +9,56 @@
 # 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,8,,52,70,
-pb01,1,9,,53,71,
-pb02,2,10,,50,60,
-pb03,3,11,,51,61,
+Pin,EIC,ADC0,SERCOM1,SERCOM2,TCC1,TCC2
+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,8,,52,70,
+PB01,1,9,,53,71,
+PB02,2,10,,50,60,
+PB03,3,11,,51,61,
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 399b48c040d69..7c95c341b9aef 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -30,10 +30,6 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
 
-#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/mcu/samd51/pin-af-table.csv b/ports/samd/mcu/samd51/pin-af-table.csv
index 249ce6865c678..69f51a33ca170 100644
--- a/ports/samd/mcu/samd51/pin-af-table.csv
+++ b/ports/samd/mcu/samd51/pin-af-table.csv
@@ -10,104 +10,103 @@
 # 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,
+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,
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index 6de9a74778729..ca11e3b7a8f3b 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -40,30 +40,26 @@
 
 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 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];
+const machine_pin_obj_t *pin_find_by_id(int pin_id) {
+    const mp_map_t *cpu_map = &machine_pin_cpu_pins_locals_dict.map;
+    for (uint i = 0; i < cpu_map->alloc; i++) {
+        machine_pin_obj_t *pin = MP_OBJ_TO_PTR(cpu_map->table[i].value);
+        if (pin->pin_id == pin_id) {
+            return pin;
         }
     }
     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) {
+    mp_map_elem_t *named_elem = mp_map_lookup((mp_map_t *)&named_pins->map, name, MP_MAP_LOOKUP);
+    if (named_elem != NULL) {
         return named_elem->value;
     }
     return NULL;
 }
-#endif
 
 const machine_pin_obj_t *pin_find(mp_obj_t pin) {
     // Is already a object of the proper type
@@ -72,10 +68,9 @@ const machine_pin_obj_t *pin_find(mp_obj_t pin) {
     }
     if (mp_obj_is_small_int(pin)) {
         // Pin defined by pin number for PAnn, PBnn, etc.
-        return get_pin_obj_ptr(mp_obj_get_int(pin));
+        return pin_find_by_id(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);
@@ -87,47 +82,17 @@ const machine_pin_obj_t *pin_find(mp_obj_t 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);
-        // 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');
-            return get_pin_obj_ptr(num);
-        } else {
-            for (int i = 0; i < MP_ARRAY_SIZE(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];
-                }
-            }
-        }
-    }
-    #endif // MICROPY_PY_MACHINE_PIN_BOARD_CPU
 
     mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
 }
 
-const char *pin_name(int id) {
-    for (int i = 0; i < sizeof(pin_af_table); i++) {
-        if (pin_af_table[i]->pin_id == id) {
-            return qstr_str(pin_af_table[i]->name);
-        }
-    }
-    return "-";
-}
-
 #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
 // Test, whether 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 machine_pin_obj_t *pct_ptr = get_pin_obj_ptr(pin_id);
+    const machine_pin_obj_t *pct_ptr = pin_find_by_id(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) {
@@ -144,7 +109,7 @@ 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 machine_pin_obj_t *pct_ptr = get_pin_obj_ptr(pin_id);
+    const machine_pin_obj_t *pct_ptr = pin_find_by_id(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)
@@ -166,7 +131,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 machine_pin_obj_t *pct_ptr = get_pin_obj_ptr(pin_id);
+    const machine_pin_obj_t *pct_ptr = pin_find_by_id(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 3a15ae7f356a9..83839a0503255 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -92,14 +92,11 @@ typedef struct _pwm_config_t {
 #define ALT_FCT_SERCOM1   2
 #define ALT_FCT_SERCOM2   3
 
-#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);
 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_by_id(int pin_id);
 const machine_pin_obj_t *pin_find(mp_obj_t pin);

From c0b64a3f23639bcc52d1488728771560bc9a1d0a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Aug 2023 16:45:09 +1000
Subject: [PATCH 0518/3129] mimxrt/boards/make-pins.py: Update to use
 tools/boardgen.py.

Minor change to remove support for using numeric IDs for machine.Pin.  This
was previously based on the index of the pin in the board csv, but this is
different (and incompatible) with other ports.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/mimxrt/Makefile                         |   1 -
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   4 -
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv   |   9 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   4 -
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv   |  10 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   4 -
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv   |  10 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   4 -
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv   |  10 +
 .../boards/MIMXRT1170_EVK/mpconfigboard.h     |   4 -
 ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv   |  10 +
 .../boards/SEEED_ARCH_MIX/mpconfigboard.h     |   5 -
 ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv   |  12 +-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |   4 -
 ports/mimxrt/boards/TEENSY41/pins.csv         |   9 +
 ports/mimxrt/boards/make-pins.py              | 520 ++++++------------
 ports/mimxrt/boards/mimxrt_prefix.c           |   6 +-
 ports/mimxrt/eth.c                            |  20 +-
 ports/mimxrt/led.c                            |   8 +-
 ports/mimxrt/machine_pwm.c                    |   5 +-
 ports/mimxrt/pin.c                            |   8 -
 ports/mimxrt/pin.h                            |   3 -
 22 files changed, 260 insertions(+), 410 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 879ee05f4a448..bdf66926b60fb 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -61,7 +61,6 @@ AF_FILE = boards/$(MCU_SERIES)_af.csv
 BOARD_PINS = $(BOARD_DIR)/pins.csv
 PREFIX_FILE = boards/mimxrt_prefix.c
 GEN_FLEXRAM_CONFIG_SRC = $(BUILD)/flexram_config.s
-GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 GEN_PINS_SRC = $(BUILD)/pins_gen.c
 
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 8b7316c8dabfc..b4f777cf93b00 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -170,10 +170,6 @@
 #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 }, \
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
index e1f2669b08ece..e524958dc803b 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
@@ -38,3 +38,12 @@ SD_RX,GPIO_AD_B1_05
 SCK_TX,GPIO_AD_B1_01
 WS_TX,GPIO_AD_B1_02
 SD_TX,GPIO_AD_B1_03
+-ENET_RESET,-GPIO_AD_B0_04
+-ENET_INT,-GPIO_AD_B1_06
+-SD_CMD,-GPIO_SD_B0_02
+-SD_CLK,-GPIO_SD_B0_03
+-SD_CD,-GPIO_SD_B0_06
+-SD_DATA0,-GPIO_SD_B0_04
+-SD_DATA1,-GPIO_SD_B0_05
+-SD_DATA2,-GPIO_SD_B0_00
+-SD_DATA3,-GPIO_SD_B0_01
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 74666562a81d5..59a5c4fa69f84 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -160,10 +160,6 @@
 #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 }, \
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
index 4bdd9e4f033cf..dc624b6d28aa6 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
@@ -36,3 +36,13 @@ SD_RX,GPIO_AD_B1_12
 SCK_TX,GPIO_AD_B1_14
 WS_TX,GPIO_AD_B1_15
 SD_TX,GPIO_AD_B1_13
+
+-ENET_RESET,-GPIO_AD_B0_09
+-ENET_INT,-GPIO_AD_B0_10
+-SD_CMD,-GPIO_SD_B0_00
+-SD_CLK,-GPIO_SD_B0_01
+-SD_CD_B,-GPIO_B1_12
+-SD_DATA0,-GPIO_SD_B0_02
+-SD_DATA1,-GPIO_SD_B0_03
+-SD_DATA2,-GPIO_SD_B0_04
+-SD_DATA3,-GPIO_SD_B0_05
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 824f9977c2710..58ecd74e3b516 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -158,10 +158,6 @@
 #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 }, \
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
index 4bdd9e4f033cf..dc624b6d28aa6 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
@@ -36,3 +36,13 @@ SD_RX,GPIO_AD_B1_12
 SCK_TX,GPIO_AD_B1_14
 WS_TX,GPIO_AD_B1_15
 SD_TX,GPIO_AD_B1_13
+
+-ENET_RESET,-GPIO_AD_B0_09
+-ENET_INT,-GPIO_AD_B0_10
+-SD_CMD,-GPIO_SD_B0_00
+-SD_CLK,-GPIO_SD_B0_01
+-SD_CD_B,-GPIO_B1_12
+-SD_DATA0,-GPIO_SD_B0_02
+-SD_DATA1,-GPIO_SD_B0_03
+-SD_DATA2,-GPIO_SD_B0_04
+-SD_DATA3,-GPIO_SD_B0_05
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index cb64d2b9d24f8..3170849fe7093 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -158,10 +158,6 @@
 #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 }, \
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
index 4bdd9e4f033cf..dc624b6d28aa6 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
@@ -36,3 +36,13 @@ SD_RX,GPIO_AD_B1_12
 SCK_TX,GPIO_AD_B1_14
 WS_TX,GPIO_AD_B1_15
 SD_TX,GPIO_AD_B1_13
+
+-ENET_RESET,-GPIO_AD_B0_09
+-ENET_INT,-GPIO_AD_B0_10
+-SD_CMD,-GPIO_SD_B0_00
+-SD_CLK,-GPIO_SD_B0_01
+-SD_CD_B,-GPIO_B1_12
+-SD_DATA0,-GPIO_SD_B0_02
+-SD_DATA1,-GPIO_SD_B0_03
+-SD_DATA2,-GPIO_SD_B0_04
+-SD_DATA3,-GPIO_SD_B0_05
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
index 8ce91adbaf23e..131c5e1725477 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
@@ -155,10 +155,6 @@
 #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 }, \
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv
index 77f87e8ba15c7..30062fe3445ff 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv
@@ -57,3 +57,13 @@ SD_RX,GPIO_AD_20
 SCK_TX,GPIO_AD_22
 WS_TX,GPIO_AD_23
 SD_TX,GPIO_AD_21
+
+-ENET_RESET,-GPIO_LPSR_12
+-ENET_INT,-GPIO_AD_12
+-ENET_1_RESET,-GPIO_DISP_B2_13
+-SD_CMD,-GPIO_SD_B1_00
+-SD_CLK,-GPIO_SD_B1_01
+-SD_DATA0,-GPIO_SD_B1_02
+-SD_DATA1,-GPIO_SD_B1_03
+-SD_DATA2,-GPIO_SD_B1_04
+-SD_DATA3,-GPIO_SD_B1_05
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
index edda72f2660d1..627b1aa3b1311 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -127,11 +127,6 @@
 #define ENET_PHY_OPS        phylan8720_ops
 #define ENET_TX_CLK_OUTPUT  false
 
-// 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 }, \
     { IOMUXC_GPIO_B1_05_ENET_RX_DATA01, 0, 0xB0E9u }, \
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv b/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
index 6b757fae4b07c..785a442dbca18 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
@@ -9,7 +9,7 @@ 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_15,GPIO_AD_B0_15
 J3_16,GPIO_AD_B1_00
 J3_17,GPIO_AD_B1_01
 J3_19,GPIO_AD_B0_13
@@ -67,3 +67,13 @@ SD_RX,GPIO_AD_B1_12
 SCK_TX,GPIO_AD_B1_14
 WS_TX,GPIO_AD_B1_15
 SD_TX,GPIO_AD_B1_13
+
+# No ethernet reset and interrupt pin by intention
+
+-SD_CMD,-GPIO_SD_B0_00
+-SD_CLK,-GPIO_SD_B0_01
+-SD_CD_B,-GPIO_B1_12
+-SD_DATA0,-GPIO_SD_B0_02
+-SD_DATA1,-GPIO_SD_B0_03
+-SD_DATA2,-GPIO_SD_B0_04
+-SD_DATA3,-GPIO_SD_B0_05
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 09addbe52c219..bff319c6d1576 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -125,10 +125,6 @@
 #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 }, \
diff --git a/ports/mimxrt/boards/TEENSY41/pins.csv b/ports/mimxrt/boards/TEENSY41/pins.csv
index b28a22312c707..e09c979620a23 100755
--- a/ports/mimxrt/boards/TEENSY41/pins.csv
+++ b/ports/mimxrt/boards/TEENSY41/pins.csv
@@ -88,3 +88,12 @@ SD_RX,GPIO_B1_00
 SCK_TX,GPIO_EMC_06
 WS_TX,GPIO_EMC_05
 SD_TX,GPIO_EMC_04
+
+-ENET_RESET,-GPIO_B0_14
+-ENET_INT,-GPIO_B0_15
+-SD_CMD,-GPIO_SD_B0_00
+-SD_CLK,-GPIO_SD_B0_01
+-SD_DATA0,-GPIO_SD_B0_02
+-SD_DATA1,-GPIO_SD_B0_03
+-SD_DATA2,-GPIO_SD_B0_04
+-SD_DATA3,-GPIO_SD_B0_05
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index d6752af1e910a..55c7f5bd02738 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -1,19 +1,15 @@
 #!/usr/bin/env python
-"""Creates the pin file for the MIMXRT10xx."""
 
-from __future__ import print_function
-
-import argparse
-import sys
-import csv
+from collections import defaultdict
+import os
 import re
+import sys
 
-SUPPORTED_AFS = {"GPIO", "USDHC", "FLEXPWM", "TMR"}
-MAX_AF = 10  # AF0 .. AF9
-ADC_COL = 11
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../tools"))
+import boardgen
 
 
-regexes = [
+IOMUX_REGEXS = [
     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+)",
@@ -30,387 +26,197 @@
     r"IOMUXC_(?P<pin>GPIO_SNVS_\d\d_DIG)_(?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:
-        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_fns = []
-        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):
-        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:
-            self.adc_fns.append(
-                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"),
+SUPPORTED_AF_FNS = {"GPIO", "USDHC", "FLEXPWM", "TMR"}
+
+
+class MimxrtPin(boardgen.Pin):
+    def __init__(self, cpu_pin_name):
+        super().__init__(cpu_pin_name)
+
+        self._afs = []
+        self._adc_fns = []
+
+    # Called for each AF defined in the csv file for this pin.
+    def add_af(self, af_idx, af_name, af):
+        # mimxrt-specific: Any pin in the af.csv is implicitly part of the board
+        # pins.csv and will therefore be in the Pin.cpu dict. This is
+        # equivalent to adding `,CPUNAME` to the board.csv for every pin in the
+        # af.csv.
+        self._available = True
+
+        if af_name == "ALT5":
+            m = re.match("GPIO([0-9]+)_IO([0-9]+)", af)
+            self._port = int(m.group(1))
+            self._pin = int(m.group(2))
+
+        if af_name.startswith("ALT"):
+            instance = af.split("_")[0]
+            fn = re.match("^([A-Z][A-Z0-9]+[A-Z])[0-9]*$", instance).group(1)
+            if fn not in SUPPORTED_AF_FNS:
+                return
+            iomux_config = self._generator._iomux_pin_config[self.name()]
+            input_reg = iomux_config[af_idx]["inputRegister"].strip("U")
+            input_daisy = int(iomux_config[af_idx]["inputDaisy"].strip("U"), 16)
+            self._afs.append((af_idx, input_reg, input_daisy, instance, fn, af))
+
+        elif af_name == "ADC":
+            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, af, re.MULTILINE)
+            for match in matches:
+                self._adc_fns.append(
+                    (int(match.group("instance")), int(match.group("channel")), "ADC")
                 )
-            )
 
-    def parse_af(self, af_idx, af_strs_in):
-        pass
-
-    def add_af(self, af):
-        self.alt_fn.append(af)
+            matches = re.finditer(lpadc_regex, af, re.MULTILINE)
+            for match in matches:
+                self._adc_fns.append(
+                    (int(match.group("instance")), int(match.group("channel")), "LPADC")
+                )
 
-    def print_pin_af(self, out_source):
-        if self.alt_fn:
-            print(
-                "static const machine_pin_af_obj_t pin_{0}_af[{1}] = {{".format(
-                    self.name, len(self.alt_fn)
-                ),
-                file=out_source,
-            )
-            for af in self.alt_fn:
-                af.print(out_source)
-            print("};", file=out_source)
+    # Use the PIN() macro defined in samd_prefix.c for defining the pin
+    # objects.
+    def definition(self):
+        if "_LPSR_" in self.name():
+            macro = "PIN_LPSR"
+        elif (
+            "_SNVS_" in self.name()
+            or self.name().startswith("PMIC_")
+            or self.name().startswith("WAKEUP")
+        ):
+            macro = "PIN_SNVS"
         else:
-            raise ValueError("Pin '{}' has no alternative functions".format(self.name))
+            macro = "PIN"
+
+        # PIN(_name, _gpio, _pin, _af_list, _adc_list_len, _adc_list)
+        return "{:s}({:s}, GPIO{:d}, {:d}, pin_{:s}_af, {:d}, {:s})".format(
+            macro,
+            self.name(),
+            self._port,
+            self._pin,
+            self.name(),
+            len(self._adc_fns),
+            "pin_{:s}_adc".format(self.name()) if self._adc_fns else "NULL",
+        )
 
-    def print_pin_adc(self, out_source):
-        if self.adc_fns:
+    # This will be called at the start of the output (after the prefix) for
+    # each pin. Use it to emit the af and adc objects.
+    def print_source(self, out_source):
+        print(
+            "static const machine_pin_af_obj_t pin_{:s}_af[] = {{".format(self.name()),
+            file=out_source,
+        )
+        for af_idx, input_reg, input_daisy, instance, _fn, af in self._afs:
             print(
-                "static const machine_pin_adc_obj_t pin_{0}_adc[{1}] = {{".format(
-                    self.name, len(self.adc_fns)
+                "    PIN_AF({:s}, PIN_AF_MODE_ALT{:d}, {:d}, {:s}, {:s}, {:s}),".format(
+                    af, af_idx, input_daisy, instance, input_reg, "0x10B0U"
                 ),
                 file=out_source,
             )
-            for adc_fn in self.adc_fns:
-                adc_fn.print(out_source)
-            print("};", file=out_source)
-
-    def print(self, out_source):
-        if self.alt_fn:
-            self.print_pin_af(out_source)
-            self.print_pin_adc(out_source)
-
-            options = {
-                "GPIO_LPSR_00": "PIN_LPSR",
-                "GPIO_LPSR_01": "PIN_LPSR",
-                "GPIO_LPSR_02": "PIN_LPSR",
-                "GPIO_LPSR_03": "PIN_LPSR",
-                "GPIO_LPSR_04": "PIN_LPSR",
-                "GPIO_LPSR_05": "PIN_LPSR",
-                "GPIO_LPSR_06": "PIN_LPSR",
-                "GPIO_LPSR_07": "PIN_LPSR",
-                "GPIO_LPSR_08": "PIN_LPSR",
-                "GPIO_LPSR_09": "PIN_LPSR",
-                "GPIO_LPSR_10": "PIN_LPSR",
-                "GPIO_LPSR_11": "PIN_LPSR",
-                "GPIO_LPSR_12": "PIN_LPSR",
-                "GPIO_LPSR_13": "PIN_LPSR",
-                "GPIO_LPSR_14": "PIN_LPSR",
-                "GPIO_LPSR_15": "PIN_LPSR",
-                "GPIO_SNVS_00_DIG": "PIN_SNVS",
-                "GPIO_SNVS_01_DIG": "PIN_SNVS",
-                "GPIO_SNVS_02_DIG": "PIN_SNVS",
-                "GPIO_SNVS_03_DIG": "PIN_SNVS",
-                "GPIO_SNVS_04_DIG": "PIN_SNVS",
-                "GPIO_SNVS_05_DIG": "PIN_SNVS",
-                "GPIO_SNVS_06_DIG": "PIN_SNVS",
-                "GPIO_SNVS_07_DIG": "PIN_SNVS",
-                "GPIO_SNVS_08_DIG": "PIN_SNVS",
-                "GPIO_SNVS_09_DIG": "PIN_SNVS",
-                "WAKEUP": "PIN_SNVS",
-                "WAKEUP_DIG": "PIN_SNVS",
-                "PMIC_ON_REQ": "PIN_SNVS",
-                "PMIC_ON_REQ_DIG": "PIN_SNVS",
-                "PMIC_STBY_REQ": "PIN_SNVS",
-                "PMIC_STBY_REQ_DIG": "PIN_SNVS",
-            }
+        print("};", file=out_source)
+        print(file=out_source)
 
+        if self._adc_fns:
             print(
-                "const machine_pin_obj_t pin_{0} = {1}({0}, {2}, {3}, pin_{0}_af, {4}, {5});\n".format(
-                    self.name,
-                    options.get(self.name, "PIN"),
-                    self.gpio,
-                    int(self.pin),
-                    len(self.adc_fns),
-                    "pin_{}_adc".format(self.name) if self.adc_fns else "NULL",
-                ),
+                "static const machine_pin_adc_obj_t pin_{:s}_adc[] = {{".format(self.name()),
                 file=out_source,
             )
-        else:
-            raise ValueError("Pin '{}' has no alternative functions".format(self.name))
-
-    def print_header(self, out_header):
-        pass
-
-
-class AdcFunction(object):
-    """Holds the information associated with a pins ADC function."""
-
-    def __init__(self, instance, channel, peripheral="ADC"):
-        self.peripheral = peripheral
-        self.instance = instance
-        self.channel = channel
-
-    def print(self, out_source):
-        """Prints the C representation of this AF."""
-        print(f"    PIN_ADC({self.peripheral}{self.instance}, {self.channel}),", file=out_source)
+            for instance, channel, peripheral in self._adc_fns:
+                print(
+                    "    PIN_ADC({:s}{:d}, {:d}),".format(peripheral, instance, channel),
+                    file=out_source,
+                )
+            print("};", file=out_source)
 
+    # mimxrt cpu names must be "GPIO_<funcs>_<num>", with zero-prefixed two-digit <num>.
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
 
-class AlternateFunction(object):
-    """Holds the information associated with a pins alternate function."""
+        if not re.match(
+            "^((GPIO_((SNVS|EMC|LPSR|DISP)_)?([AS]D_)?(B[012]_)?[0-9][0-9])|WAKEUP|PMIC_(ON|STBY)_REQ)(_DIG)?$",
+            cpu_pin_name,
+        ):
+            raise boardgen.PinGeneratorError("Invalid cpu pin name '{}'".format(cpu_pin_name))
 
-    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, out_source):
-        """Prints the C representation of this AF."""
-        print(
-            "    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"
-            ),
-            file=out_source,
+class MimxrtPinGenerator(boardgen.PinGenerator):
+    def __init__(self):
+        # Use custom pin type above, and also enable the --af-csv argument so
+        # that add_af gets called on each pin.
+        super().__init__(
+            pin_type=MimxrtPin,
+            enable_af=True,
         )
+        self._iomux_pin_config = {}
 
-
-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:
-                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))
-
-    def parse_af_file(self, filename, iomux_filename):
-        iomux_pin_config = dict()
+    # Load the iomux configuration from fsl_iomuxc.h.
+    def load_iomux_header(self, iomux_filename):
         with open(iomux_filename, "r") as ipt:
             input_str = ipt.read()
-            for regex in regexes:
+            for regex in IOMUX_REGEXS:
                 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")] = {
+                    if match.group("pin") not in self._iomux_pin_config:
+                        self._iomux_pin_config[match.group("pin")] = {
                             int((match.groupdict()["muxMode"].strip("U")), 16): match.groupdict()
                         }
                     else:
-                        iomux_pin_config[match.group("pin")][
+                        self._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)
-            # Extract indexes from header row
-            pad_col = header.index("Pad")
-            adc_col = header.index("ADC")
-            #
-            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[(pad_col + 1) : adc_col]):
-                    if af and af_supported(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,
+    # Also load the iomux header.
+    def load_inputs(self, out_source):
+        if self.args.iomux_header:
+            print("// --iomux-header {:s}".format(self.args.iomux_header), file=out_source)
+            self.load_iomux_header(self.args.iomux_header)
+
+        super().load_inputs(out_source)
+
+    # Provide a macro for each supported (pin,af) that can be used to
+    # initialise a struct containing a machine_pin_obj_t* and the
+    # corresponding af for that pin. e.g. A mimxrt_sdcard_pin_t instance can
+    # be initialised with GPIO_SD_B0_00_USDHC1_CMD which tells it how to get
+    # the CMD pin of the USDHC1 function on the GPIO_SD_B0_00 pin.
+    def print_module_instances(self, out_header):
+        print(file=out_header)
+        for match_fn in ("USDHC", "FLEXPWM", "TMR"):
+            module_instances = defaultdict(list)
+            for pin in self.available_pins():
+                for i, (_af_idx, _input_reg, _input_daisy, instance, fn, af) in enumerate(
+                    pin._afs
+                ):
+                    if fn == match_fn:
+                        module_instances[instance].append(
+                            "#define {:s}_{:s} pin_{:s}, {:d}".format(
+                                pin.name(), af, pin.name(), i
                             )
                         )
+            for k, v in module_instances.items():
+                print("// {:s}".format(k), file=out_header)
+                print("#define {:s}_AVAIL (1)".format(k), file=out_header)
+                if match_fn == "FLEXPWM":
+                    print("#define {:s} {:s}".format(k, k[-4:]), file=out_header)
+                for i in v:
+                    print(i, file=out_header)
+
+    # Override to also print the module instances.
+    def print_header(self, out_header):
+        super().print_header(out_header)
+        self.print_module_instances(out_header)
 
-                pin.parse_adc(row[adc_col])
-
-                self.cpu_pins.append(pin)
-
-    @staticmethod
-    def print_named(label, pins, out_source):
-        print("", file=out_source)
-        print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
-            file=out_source,
-        )
-        for pin in pins:
-            (
-                print(
-                    "    {{ MP_ROM_QSTR(MP_QSTR_{}), MP_ROM_PTR(&pin_{}) }},".format(
-                        pin.name, pin.pad
-                    ),
-                    file=out_source,
-                ),
-            )
-        print("};", file=out_source)
-        print(
-            "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
-                label, label
-            ),
-            file=out_source,
-        )
-
-    def print(self, out_source):
-        # Print Pin Object declarations
-        for pin in self.cpu_pins:
-            pin.print(out_source)
-
-        print("", file=out_source)
-        print("const machine_pin_obj_t* machine_pin_board_pins [] = {", file=out_source)
-        for pin in self.board_pins:
-            print("    &pin_{},".format(pin.pad), file=out_source)
-        print("};", file=out_source)
-        print(
-            "const uint32_t num_board_pins = {:d};".format(len(self.board_pins)), file=out_source
-        )
-        # Print Pin mapping dictionaries
-        self.print_named("cpu", self.cpu_pins, out_source)
-        self.print_named("board", self.board_pins, out_source)
-        print("", file=out_source)
+    # Override the default implementation just to change the default arguments
+    # (extra header row, skip first column).
+    def parse_af_csv(self, filename):
+        return super().parse_af_csv(filename, header_rows=1, pin_col=0, af_col=1)
 
-    def print_header(self, out_header):
-        for pin in self.cpu_pins:
-            print("extern const machine_pin_obj_t pin_{};".format(pin.name), file=out_header)
-        print("extern const machine_pin_obj_t* machine_pin_board_pins[];", file=out_header)
-        print("extern const uint32_t num_board_pins;", file=out_header)
-        print("extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;", file=out_header)
-        print("extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;", file=out_header)
-        print("", file=out_header)
-        print("// Defines", file=out_header)
-        module_instance_factory(self.cpu_pins, out_header, "USDHC")
-        module_instance_factory(self.cpu_pins, out_header, "FLEXPWM")
-        module_instance_factory(self.cpu_pins, out_header, "TMR")
-
-
-def module_instance_factory(pins, out_header, name):
-    module_pin = filter(lambda p: any([af for af in p.alt_fn if name in af.af_str]), pins)
-
-    module_instances = dict()
-    for pin in module_pin:
-        for idx, alt_fn in enumerate(pin.alt_fn):
-            if name in alt_fn.instance:
-                format_string = "#define {0}_{1} &pin_{0}, {2}"
-                if alt_fn.instance not in module_instances:
-                    module_instances[alt_fn.instance] = [
-                        format_string.format(pin.name, alt_fn.af_str, idx)
-                    ]
-                else:
-                    module_instances[alt_fn.instance].append(
-                        format_string.format(pin.name, alt_fn.af_str, idx)
-                    )
-
-    for k, v in module_instances.items():
-        print(f"// {k}", file=out_header)
-        print(f"#define {k}_AVAIL (1)", file=out_header)
-        if name == "FLEXPWM":
-            print(f"#define {k} {k[-4:]}", file=out_header)
-        for i in v:
-            print(i, file=out_header)
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Generate board specific pin file")
-    parser.add_argument("--board-csv")
-    parser.add_argument("--af-csv")
-    parser.add_argument("--prefix")
-    parser.add_argument("--iomux-header")
-    parser.add_argument("--output-source")
-    parser.add_argument("--output-header")
-    args = parser.parse_args()
-
-    pins = Pins()
-
-    with open(args.output_source, "w") as out_source:
-        if args.af_csv:
-            print("// --af {:s}".format(args.af_csv), file=out_source)
-            pins.parse_af_file(args.af_csv, args.iomux_header)
-
-        if args.board_csv:
-            print("// --board {:s}".format(args.board_csv), file=out_source)
-            pins.parse_board_file(args.board_csv)
-
-        if args.output_header:
-            print("// --hdr {:s}".format(args.output_header), file=out_source)
-
-        if args.prefix:
-            print("// --prefix {:s}".format(args.prefix), file=out_source)
-            with open(args.prefix, "r") as prefix_file:
-                print(prefix_file.read(), file=out_source)
-
-        pins.print(out_source)
-
-    with open(args.output_header, "w") as out_header:
-        pins.print_header(out_header)
+    # We need to know the mcu to emit the correct AF list.
+    def extra_args(self, parser):
+        parser.add_argument("--iomux-header")
 
 
 if __name__ == "__main__":
-    main()
+    MimxrtPinGenerator().main()
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
index 3097535c524b2..49d6e67dc4083 100644
--- a/ports/mimxrt/boards/mimxrt_prefix.c
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -30,7 +30,7 @@
         .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 = (uint8_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .af_list_len = MP_ARRAY_SIZE(_af_list), \
         .adc_list_len = (_adc_list_len), \
         .af_list = (_af_list), \
         .adc_list = (_adc_list), \
@@ -44,7 +44,7 @@
         .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)), \
+        .af_list_len = MP_ARRAY_SIZE(_af_list), \
         .adc_list_len = (_adc_list_len), \
         .af_list = (_af_list), \
         .adc_list = (_adc_list), \
@@ -58,7 +58,7 @@
         .pin = (uint32_t)(_pin), \
         .muxRegister = (uint32_t)&(IOMUXC_SNVS->SW_MUX_CTL_PAD_##_name), \
         .configRegister = (uint32_t)&(IOMUXC_SNVS->SW_PAD_CTL_PAD_##_name), \
-        .af_list_len = (uint8_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .af_list_len = MP_ARRAY_SIZE(_af_list), \
         .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 befccca1cd660..ed9db81298094 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -365,7 +365,15 @@ void eth_init_0(eth_t *self, int eth_id, const phy_operations_t *phy_ops, int ph
 
     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);
+    const machine_pin_obj_t *reset_pin = NULL;
+    #if defined(pin_ENET_RESET)
+    reset_pin = pin_ENET_RESET;
+    #endif
+    const machine_pin_obj_t *int_pin = NULL;
+    #if defined(pin_ENET_INT)
+    int_pin = pin_ENET_INT;
+    #endif
+    eth_gpio_init(iomux_table_enet, ARRAY_SIZE(iomux_table_enet), reset_pin, int_pin);
 
     mp_hal_get_mac(0, hw_addr);
 
@@ -411,7 +419,15 @@ void eth_init_1(eth_t *self, int eth_id, const phy_operations_t *phy_ops, int ph
 
     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);
+    const machine_pin_obj_t *reset_pin = NULL;
+    #if defined(pin_ENET_1_INT)
+    reset_pin = pin_ENET_1_RESET;
+    #endif
+    const machine_pin_obj_t *int_pin = NULL;
+    #if defined(pin_ENET_1_INT)
+    int_pin = pin_ENET_1_INT;
+    #endif
+    eth_gpio_init(iomux_table_enet_1, ARRAY_SIZE(iomux_table_enet_1), reset_pin, int_pin);
 
     #if defined MIMXRT117x_SERIES
     NVIC_SetPriority(ENET_1G_MAC0_Tx_Rx_1_IRQn, IRQ_PRI_PENDSV);
diff --git a/ports/mimxrt/led.c b/ports/mimxrt/led.c
index 99876a5d9005d..eb4d42cd9fdbe 100644
--- a/ports/mimxrt/led.c
+++ b/ports/mimxrt/led.c
@@ -34,13 +34,13 @@
 #if defined(MICROPY_HW_LED1_PIN)
 
 const machine_led_obj_t machine_led_obj[] = {
-    { .base = {&machine_led_type}, .led_id = 1U, .led_pin = &MICROPY_HW_LED1_PIN, },
+    { .base = {&machine_led_type}, .led_id = 1U, .led_pin = MICROPY_HW_LED1_PIN, },
     #if defined(MICROPY_HW_LED2_PIN)
-    { .base = {&machine_led_type}, .led_id = 2U, .led_pin = &MICROPY_HW_LED2_PIN, },
+    { .base = {&machine_led_type}, .led_id = 2U, .led_pin = MICROPY_HW_LED2_PIN, },
     #if defined(MICROPY_HW_LED3_PIN)
-    { .base = {&machine_led_type}, .led_id = 3U, .led_pin = &MICROPY_HW_LED3_PIN, },
+    { .base = {&machine_led_type}, .led_id = 3U, .led_pin = MICROPY_HW_LED3_PIN, },
     #if defined(MICROPY_HW_LED4_PIN)
-    { .base = {&machine_led_type}, .led_id = 4U, .led_pin = &MICROPY_HW_LED4_PIN, },
+    { .base = {&machine_led_type}, .led_id = 4U, .led_pin = MICROPY_HW_LED4_PIN, },
     #endif
     #endif
     #endif
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index 7b95d78877cdf..98545eec95c51 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -191,8 +191,9 @@ STATIC const machine_pin_af_obj_t *af_name_decode_qtmr(const machine_pin_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]) {
+    const mp_map_t *board_map = &machine_pin_board_pins_locals_dict.map;
+    for (uint i = 0; i < board_map->alloc; i++) {
+        if (pin == MP_OBJ_TO_PTR(board_map->table[i].value)) {
             return true;
         }
     }
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
index 4403f6ac77f77..b7b33da5aeab5 100644
--- a/ports/mimxrt/pin.c
+++ b/ports/mimxrt/pin.c
@@ -152,14 +152,6 @@ const machine_pin_obj_t *pin_find(mp_obj_t 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) {
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index bf611aa9893a6..13b313c41f409 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -147,9 +147,6 @@ extern const mp_obj_type_t machine_pin_af_type;
 // Include board specific pins
 #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;
 

From 1f804e03f64b0ec7e29e27333dc6a2a7c5148aef Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 24 Aug 2023 23:22:16 +1000
Subject: [PATCH 0519/3129] renesas-ra/boards/make-pins.py: Update to use
 tools/boardgen.py.

This removes previously unused functionality to generate pins_ad_const.h,
as well as the unused handling of pin AF in machine_pin.c.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/renesas-ra/Makefile               |   6 +-
 ports/renesas-ra/boards/make-pins.py    | 315 ++++++------------------
 ports/renesas-ra/boards/ra_pin_prefix.c |  10 +-
 ports/renesas-ra/machine_pin.c          |  33 +--
 ports/renesas-ra/pin.h                  |  43 +---
 5 files changed, 95 insertions(+), 312 deletions(-)

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 4e31029073085..6d6eeb7dbf8c5 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -556,8 +556,6 @@ AF_FILE = boards/ra6m5_af.csv
 endif
 GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-# Currently unused.
-GEN_PINS_AD_CONST = $(HEADER_BUILD)/pins_ad_const.h
 
 FILE2H = $(TOP)/tools/file2h.py
 
@@ -578,10 +576,10 @@ $(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)/%_ad_const.h: $(BOARD_DIR)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h: $(BOARD_DIR)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
-	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) --output-ad-const $(GEN_PINS_AD_CONST)
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR)
 
 CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
 
diff --git a/ports/renesas-ra/boards/make-pins.py b/ports/renesas-ra/boards/make-pins.py
index 5eebbb49269ac..edc4cf7209b79 100644
--- a/ports/renesas-ra/boards/make-pins.py
+++ b/ports/renesas-ra/boards/make-pins.py
@@ -1,258 +1,89 @@
 #!/usr/bin/env python
-"""Creates the pin file for the RAxxx."""
 
-from __future__ import print_function
-
-import argparse
+import os
+import re
 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, out_source):
-        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
-            ),
-            file=out_source,
-        )
-        print("", file=out_source)
-
-    def print_header(self, out_header):
-        n = self.cpu_pin_name()
-        print("extern const pin_ad_obj_t pin_{:s}_ad_obj;".format(n), file=out_header)
-        print("#define pin_{:s}_ad (&pin_{:s}_ad_obj)".format(n, n), file=out_header)
-
-
-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, out_source):
-        pin_ad_name = "NULL"
-        for pin_ad in self._pin_ad:
-            pin_ad.print(out_source)
-            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
-            ),
-            file=out_source,
-        )
-        print("", file=out_source)
-
-    def print_header(self, out_header):
-        n = self.cpu_pin_name()
-        print("extern const machine_pin_obj_t pin_{:s}_obj;".format(n), file=out_header)
-        print("#define pin_{:s} (&pin_{:s}_obj)".format(n, n), file=out_header)
 
-
-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], 16)
-                    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, out_source):
-        print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
-            file=out_source,
-        )
-        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()
-                    ),
-                    file=out_source,
-                )
-        print("};", file=out_source)
-        print(
-            "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
-                label, label
-            ),
-            file=out_source,
-        )
-
-    def print(self, out_source):
-        for named_pin in self.cpu_pins:
-            pin = named_pin.pin()
-            if pin.is_board_pin():
-                pin.print(out_source)
-        self.print_named("cpu", self.cpu_pins, out_source)
-        print("", file=out_source)
-        self.print_named("board", self.board_pins, out_source)
-
-    def print_header(self, out_header):
-        for named_pin in self.cpu_pins:
-            pin = named_pin.pin()
-            if pin.is_board_pin():
-                pin.print_header(out_header)
-            pin_ads = pin.pin_ad()
-            for pin_ad in pin_ads:
-                pin_ad.print_header(out_header)
-        # provide #define's mapping board to cpu name
-        for named_pin in self.board_pins:
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../tools"))
+import boardgen
+
+
+class RenesasRaPin(boardgen.Pin):
+    def __init__(self, cpu_pin_name):
+        super().__init__(cpu_pin_name)
+
+        self._port = int(cpu_pin_name[1], 16)
+        self._bit = int(cpu_pin_name[2:])
+
+        self._adc_name = None
+        self._adc_bits = 0
+        self._adc_channel = 0
+
+    def add_adc(self, adc):
+        # The previous version of make-pins.py handled len==4 to mean
+        # adc_bits=8, but this is not used in any of the current af.csv files,
+        # so this needs to be validated.
+        assert len(adc) == 5 and (adc.startswith("AN0") or adc.startswith("AN1"))
+        self._adc_name = adc
+        self._adc_bit = 12
+        self._adc_channel = int(adc[2:])
+
+    # Called for each AF defined in the csv file for this pin.
+    def add_af(self, af_idx, af_name, af):
+        if af_idx == 0 and af:
+            assert af_name == "Analog"
+            self.add_adc(af)
+
+    # Use the PIN() macro defined in ra_pin_prefix.c for defining the pin
+    # objects.
+    def definition(self):
+        # PIN(p_name, p_pin, p_adc)
+        adc = "&pin_{}_adc_obj".format(self.name()) if self._adc_name else "NULL"
+        return "PIN({:s}, {:d}, {:s})".format(self.name(), self._port * 16 + self._bit, adc)
+
+    # This will be called at the start of the output (after the prefix). Use
+    # it to emit the ADC objects (via the PIN_ADC() macro).
+    def print_source(self, out_source):
+        # PIN_ADC(p_name, p_pin, adc_bit, adc_channel)
+        if self._adc_name:
             print(
-                "#define pyb_pin_{:s} pin_{:s}".format(
-                    named_pin.name(), named_pin.pin().cpu_pin_name()
+                "const machine_pin_adc_obj_t pin_{}_adc_obj = PIN_ADC({:s}, {:d}, {:d}, {:d});".format(
+                    self.name(),
+                    self._adc_name,
+                    self._port * 16 + self._bit,
+                    self._adc_bits,
+                    self._adc_channel,
                 ),
-                file=out_header,
+                file=out_source,
             )
 
-    def print_ad_hdr(self, out_ad_const):
-        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:
-                    print(
-                        "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_INT(GPIO_{:s}) }}, \n".format(
-                            pin_ad.name(), pin_ad.name()
-                        ),
-                        file=out_ad_const,
-                    )
-
+    # RA cpu names must be "PXNN", where X is hexadecimal port, NN is decimal bit offset.
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
 
-def main():
-    parser = argparse.ArgumentParser(description="Generate board specific pin file")
-    parser.add_argument("--board-csv")
-    parser.add_argument("--af-csv")
-    parser.add_argument("--prefix")
-    parser.add_argument("--output-source")
-    parser.add_argument("--output-header")
-    parser.add_argument("--output-ad-const")
-    args = parser.parse_args()
+        if not re.match("^P[0-9A-F][0-9][0-9]$", cpu_pin_name):
+            raise boardgen.PinGeneratorError("Invalid cpu pin name '{}'".format(cpu_pin_name))
 
-    pins = Pins()
 
-    with open(args.output_source, "w") as out_source:
-        print("// This file was automatically generated by make-pins.py", file=out_source)
-        print("//", file=out_source)
-        if args.af_csv:
-            print("// --af {:s}".format(args.af_csv), file=out_source)
-            pins.parse_af_file(args.af_csv)
-
-        if args.board_csv:
-            print("// --board {:s}".format(args.board_csv), file=out_source)
-            pins.parse_board_file(args.board_csv)
-
-        if args.prefix:
-            print("// --prefix {:s}".format(args.prefix), file=out_source)
-            print("", file=out_source)
-            with open(args.prefix, "r") as prefix_file:
-                print(prefix_file.read(), file=out_source)
-
-        pins.print(out_source)
+class RenesasRaPinGenerator(boardgen.PinGenerator):
+    def __init__(self):
+        # Use custom pin type above, and also enable the --af-csv argument so
+        # that add_af gets called on each pin.
+        super().__init__(
+            pin_type=RenesasRaPin,
+            enable_af=True,
+        )
 
-    with open(args.output_header, "w") as out_header:
-        pins.print_header(out_header)
+    # Override the default implementation just to change the default arguments.
+    def parse_af_csv(self, filename):
+        return super().parse_af_csv(filename, header_rows=1, pin_col=0, af_col=3)
 
-    with open(args.output_ad_const, "w") as out_ad_const:
-        pins.print_ad_hdr(out_ad_const)
+    # Renesas-specific behavior, we use pin_PNNN for the cpu names, but
+    # pyb_pin_FOO for the board names.
+    def board_name_define_prefix(self):
+        return "pyb_"
 
 
 if __name__ == "__main__":
-    main()
+    RenesasRaPinGenerator().main()
diff --git a/ports/renesas-ra/boards/ra_pin_prefix.c b/ports/renesas-ra/boards/ra_pin_prefix.c
index 918c84e632413..c52e9738661be 100644
--- a/ports/renesas-ra/boards/ra_pin_prefix.c
+++ b/ports/renesas-ra/boards/ra_pin_prefix.c
@@ -7,19 +7,19 @@
 #include "extmod/modmachine.h"
 #include "pin.h"
 
-#define PIN_AD(p_name, p_pin, ad_bit, ad_channel) \
+#define PIN_ADC(p_name, p_pin, adc_bits, adc_channel) \
     { \
         { &machine_pin_type }, \
         .name = MP_QSTR_##p_name, \
         .pin = p_pin, \
-        .bit = ad_bit, \
-        .channel = ad_channel \
+        .bit = adc_bits, \
+        .channel = adc_channel \
     }
 
-#define PIN(p_name, p_pin, p_ad) \
+#define PIN(p_name, p_pin, p_adc) \
     { \
         { &machine_pin_type }, \
         .name = MP_QSTR_##p_name, \
         .pin = p_pin, \
-        .ad = p_ad, \
+        .ad = p_adc, \
     }
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
index 70f98cd03a1ae..e11188118c4bd 100644
--- a/ports/renesas-ra/machine_pin.c
+++ b/ports/renesas-ra/machine_pin.c
@@ -56,13 +56,13 @@ const machine_pin_obj_t *machine_pin_find(mp_obj_t user_obj) {
     }
 
     // See if the pin name matches a board pin
-    pin_obj = pin_find_named_pin(&pin_board_pins_locals_dict, user_obj);
+    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(&pin_cpu_pins_locals_dict, user_obj);
+    pin_obj = pin_find_named_pin(&machine_pin_cpu_pins_locals_dict, user_obj);
     if (pin_obj) {
         return pin_obj;
     }
@@ -134,12 +134,7 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         // 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);
-            }
+            mp_printf(print, ", alt=%d)", af_idx);
         } else {
             mp_print_str(print, ")");
         }
@@ -306,8 +301,8 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_pin_high_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) },
+    { 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(MP_HAL_PIN_MODE_INPUT) },
@@ -391,17 +386,17 @@ uint32_t pin_get_af(const machine_pin_obj_t *pin) {
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    pin_cpu_pins_obj_type,
+    machine_pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
-    locals_dict, &pin_cpu_pins_locals_dict
+    locals_dict, &machine_pin_cpu_pins_locals_dict
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    pin_board_pins_obj_type,
+    machine_pin_board_pins_obj_type,
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
-    locals_dict, &pin_board_pins_locals_dict
+    locals_dict, &machine_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) {
@@ -412,13 +407,3 @@ 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_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;
-}
diff --git a/ports/renesas-ra/pin.h b/ports/renesas-ra/pin.h
index ac84b7f66b9e0..76d6c0b1e430d 100644
--- a/ports/renesas-ra/pin.h
+++ b/ports/renesas-ra/pin.h
@@ -31,57 +31,29 @@
 #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;
+} machine_pin_adc_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;
+    const machine_pin_adc_obj_t *ad;
 } machine_pin_obj_t;
 
-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_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 pin_cpu_pins_locals_dict;
-extern const mp_obj_dict_t pin_board_pins_locals_dict;
+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 machine_pin_init(void);
 uint32_t pin_get_mode(const machine_pin_obj_t *pin);
@@ -90,8 +62,5 @@ 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

From 6ef9b29f88ed20a43140211732754f8f7d8e6133 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 25 Aug 2023 16:15:46 +1000
Subject: [PATCH 0520/3129] {cc3200,nrf}/boards/make-pins.py: Add a note about
 tools/boardgen.py.

It's not worth the effort to update these ports to use boardgen.py, but
put a note just in case anyone uses this as a reference for a new port.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/boards/make-pins.py | 3 +++
 ports/nrf/boards/make-pins.py    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ports/cc3200/boards/make-pins.py b/ports/cc3200/boards/make-pins.py
index da04d8e36cee9..f1bdf15a301a0 100644
--- a/ports/cc3200/boards/make-pins.py
+++ b/ports/cc3200/boards/make-pins.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 """Generates the pins file for the CC3200."""
 
+# Do not use this as a reference for new ports. See tools/boardgen.py and e.g.
+# ports/stm32/boards/make-pins.py.
+
 from __future__ import print_function
 
 import argparse
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 6932a18d648ac..57e815a43d949 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 """Creates the pin file for the nRF5."""
 
+# Do not use this as a reference for new ports. See tools/boardgen.py and e.g.
+# ports/stm32/boards/make-pins.py.
+
 from __future__ import print_function
 
 import argparse

From 9a4d4db3a147d5a2a02b62a805912bac08a89107 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Nov 2023 15:21:51 +1100
Subject: [PATCH 0521/3129] py/runtime: Remove declaration of function from
 inside function.

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

diff --git a/py/runtime.c b/py/runtime.c
index b4d5250e83a6f..6d8eddedc8646 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -40,6 +40,7 @@
 #include "py/objmodule.h"
 #include "py/objgenerator.h"
 #include "py/smallint.h"
+#include "py/stream.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
 #include "py/stackctrl.h"
@@ -1327,7 +1328,6 @@ 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);

From c85db05244ef6185fbb3c218c508ddd179830942 Mon Sep 17 00:00:00 2001
From: Mathieu Serandour <mathieu.serandour@numworks.fr>
Date: Tue, 24 Oct 2023 15:54:09 +0200
Subject: [PATCH 0522/3129] py/lexer: Change token position for new lines.

Set the position of new line tokens as the end of the preceding line
instead of the beginning of the next line.  This is done by first moving
the pointer to the end of the current line to skip any whitespace, record
the position for the token, then finaly skip any other line and whitespace.

The previous behavior was to skip every new line and whitespace, including
the indent of the next line, before recording the token position.

(Note that both lex->emit_dent and lex->nested_bracket_level equal 0 if
had_physical_newline == true, which allows simplifying the if-logic for
MP_TOKEN_NEWLINE.)

And update the cmd_parsetree.py test expected output, because the position
of the new-line token has changed.

Fixes issue #12792.

Signed-off-by: Mathieu Serandour <mathieu.serandour@numworks.fr>
---
 py/lexer.c                         | 31 +++++++++++++++++++-----------
 tests/cmdline/cmd_parsetree.py.exp |  2 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/py/lexer.c b/py/lexer.c
index 9587f6b164e2b..5e911a1a23337 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -527,14 +527,14 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
     vstr_cut_tail_bytes(&lex->vstr, n_closing);
 }
 
+// This function returns whether it has crossed a newline or not.
+// It therefore always return true if stop_at_newline is true
 STATIC bool skip_whitespace(mp_lexer_t *lex, bool stop_at_newline) {
-    bool had_physical_newline = false;
     while (!is_end(lex)) {
         if (is_physical_newline(lex)) {
             if (stop_at_newline && lex->nested_bracket_level == 0) {
-                break;
+                return true;
             }
-            had_physical_newline = true;
             next_char(lex);
         } else if (is_whitespace(lex)) {
             next_char(lex);
@@ -543,16 +543,16 @@ STATIC bool skip_whitespace(mp_lexer_t *lex, bool stop_at_newline) {
             while (!is_end(lex) && !is_physical_newline(lex)) {
                 next_char(lex);
             }
-            // had_physical_newline will be set on next loop
+            // will return true on next loop
         } else if (is_char_and(lex, '\\', '\n')) {
-            // line-continuation, so don't set had_physical_newline
+            // line-continuation, so don't return true
             next_char(lex);
             next_char(lex);
         } else {
             break;
         }
     }
-    return had_physical_newline;
+    return false;
 }
 
 void mp_lexer_to_next(mp_lexer_t *lex) {
@@ -577,7 +577,10 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
     vstr_reset(&lex->vstr);
 
     // skip white space and comments
-    bool had_physical_newline = skip_whitespace(lex, false);
+    // set the newline tokens at the line and column of the preceding line:
+    // only advance on the pointer until a new line is crossed, save the
+    // line and column, and then readvance it
+    bool had_physical_newline = skip_whitespace(lex, true);
 
     // set token source information
     lex->tok_line = lex->line;
@@ -591,7 +594,12 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
         lex->tok_kind = MP_TOKEN_INDENT;
         lex->emit_dent -= 1;
 
-    } else if (had_physical_newline && lex->nested_bracket_level == 0) {
+    } else if (had_physical_newline) {
+        // The cursor is at the end of the previous line, pointing to a
+        // physical newline. Skip any remaining whitespace, comments, and
+        // newlines.
+        skip_whitespace(lex, false);
+
         lex->tok_kind = MP_TOKEN_NEWLINE;
 
         size_t num_spaces = lex->column - 1;
@@ -862,9 +870,10 @@ mp_lexer_t *mp_lexer_new(qstr src_name, mp_reader_t reader) {
     // preload first token
     mp_lexer_to_next(lex);
 
-    // Check that the first token is in the first column.  If it's not then we
-    // convert the token kind to INDENT so that the parser gives a syntax error.
-    if (lex->tok_column != 1) {
+    // Check that the first token is in the first column unless it is a
+    // newline. Otherwise we convert the token kind to INDENT so that
+    // the parser gives a syntax error.
+    if (lex->tok_column != 1 && lex->tok_kind != MP_TOKEN_NEWLINE) {
         lex->tok_kind = MP_TOKEN_INDENT;
     }
 
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 3049267c0b957..6ec553b8a9ae2 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -1,5 +1,5 @@
 ----------------
-[   4] \(rule\|file_input_2\)(1) (n=10)
+[   1] file_input_2(1) (n=10)
          tok(6)
 [   4]   \(rule\|for_stmt\)(22) (n=4)
            id(i)

From b6a977848407a4ced45d118cf926bd915cc89dfb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 3 Nov 2023 14:19:55 +1100
Subject: [PATCH 0523/3129] py/misc: Change sizeof to offsetof for
 variable-length alloc.

This fixes the case where e.g.

    struct foo_t {
      mp_obj_t x;
      uint16_t y;
      char buf[];
    };

will have `sizeof(struct foo_t)==8`, but `offsetof(struct foo_t, buf)==6`.

When computing the size to allocate for `m_new_obj_var` we need to use
offsetof to avoid over-allocating. This is important especially when it
might cause it to spill over into another GC block.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modre.c                      |  4 ++--
 extmod/nimble/modbluetooth_nimble.c |  2 +-
 extmod/vfs_lfsx_file.c              |  4 ++--
 ports/unix/coverage.c               |  2 +-
 py/misc.h                           | 14 +++++++-------
 py/modthread.c                      |  4 ++--
 py/objexcept.c                      |  2 +-
 py/objfun.c                         | 10 +++++-----
 py/objnamedtuple.c                  |  2 +-
 py/objtuple.c                       |  2 +-
 py/objtype.c                        |  2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/extmod/modre.c b/extmod/modre.c
index 7f00b1c23c4ae..c24c07d0951b5 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -207,12 +207,12 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     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);
+    mp_obj_match_t *match = m_new_obj_var(mp_obj_match_t, caps, char *, caps_num);
     // cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char
     memset((char *)match->caps, 0, caps_num * sizeof(char *));
     int res = re1_5_recursiveloopprog(&self->re, &subj, match->caps, caps_num, is_anchored);
     if (res == 0) {
-        m_del_var(mp_obj_match_t, char *, caps_num, match);
+        m_del_var(mp_obj_match_t, caps, char *, caps_num, match);
         return mp_const_none;
     }
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 5e3e38ea67f16..3cdf4d1a7811f 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1701,7 +1701,7 @@ STATIC int create_l2cap_channel(uint16_t mtu, mp_bluetooth_nimble_l2cap_channel_
     // 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_bluetooth_nimble_l2cap_channel_t *chan = m_new_obj_var(mp_bluetooth_nimble_l2cap_channel_t, sdu_mem, 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.
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index 879ba78973db7..b9f332339733e 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -90,9 +90,9 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
     }
 
     #if LFS_BUILD_VERSION == 1
-    MP_OBJ_VFS_LFSx_FILE *o = m_new_obj_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, uint8_t, self->lfs.cfg->prog_size);
+    MP_OBJ_VFS_LFSx_FILE *o = m_new_obj_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, file_buffer, uint8_t, self->lfs.cfg->prog_size);
     #else
-    MP_OBJ_VFS_LFSx_FILE *o = m_new_obj_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, uint8_t, self->lfs.cfg->cache_size);
+    MP_OBJ_VFS_LFSx_FILE *o = m_new_obj_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, file_buffer, uint8_t, self->lfs.cfg->cache_size);
     #endif
     o->base.type = type;
     o->vfs = self;
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index f3bb3d450f65e..88dd48bfabeb8 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -545,7 +545,7 @@ STATIC mp_obj_t extra_coverage(void) {
         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);
+        mp_code_state_t *code_state = m_new_obj_var(mp_code_state_t, state, mp_obj_t, 1);
         code_state->fun_bc = &fun_bc;
         code_state->ip = (const byte *)"\x00"; // just needed for an invalid opcode
         code_state->sp = &code_state->state[0];
diff --git a/py/misc.h b/py/misc.h
index 32061a009ed31..352a9f34c451d 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -71,26 +71,26 @@ typedef unsigned int uint;
 #define m_new0(type, num) ((type *)(m_malloc0(sizeof(type) * (num))))
 #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)))
+#define m_new_obj_var(obj_type, var_field, var_type, var_num) ((obj_type *)m_malloc(offsetof(obj_type, var_field) + sizeof(var_type) * (var_num)))
+#define m_new_obj_var0(obj_type, var_field, var_type, var_num) ((obj_type *)m_malloc0(offsetof(obj_type, var_field) + sizeof(var_type) * (var_num)))
+#define m_new_obj_var_maybe(obj_type, var_field, var_type, var_num) ((obj_type *)m_malloc_maybe(offsetof(obj_type, var_field) + sizeof(var_type) * (var_num)))
 #if MICROPY_ENABLE_FINALISER
 #define m_new_obj_with_finaliser(type) ((type *)(m_malloc_with_finaliser(sizeof(type))))
-#define m_new_obj_var_with_finaliser(type, var_type, var_num) ((type *)m_malloc_with_finaliser(sizeof(type) + sizeof(var_type) * (var_num)))
+#define m_new_obj_var_with_finaliser(type, var_field, var_type, var_num) ((type *)m_malloc_with_finaliser(offsetof(type, var_field) + sizeof(var_type) * (var_num)))
 #else
 #define m_new_obj_with_finaliser(type) m_new_obj(type)
-#define m_new_obj_var_with_finaliser(type, var_type, var_num) m_new_obj_var(type, var_type, var_num)
+#define m_new_obj_var_with_finaliser(type, var_field, var_type, var_num) m_new_obj_var(type, var_field, var_type, var_num)
 #endif
 #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
 #define m_renew(type, ptr, old_num, new_num) ((type *)(m_realloc((ptr), sizeof(type) * (old_num), sizeof(type) * (new_num))))
 #define m_renew_maybe(type, ptr, old_num, new_num, allow_move) ((type *)(m_realloc_maybe((ptr), sizeof(type) * (old_num), sizeof(type) * (new_num), (allow_move))))
 #define m_del(type, ptr, num) m_free(ptr, sizeof(type) * (num))
-#define m_del_var(obj_type, var_type, var_num, ptr) (m_free(ptr, sizeof(obj_type) + sizeof(var_type) * (var_num)))
+#define m_del_var(obj_type, var_field, var_type, var_num, ptr) (m_free(ptr, offsetof(obj_type, var_field) + sizeof(var_type) * (var_num)))
 #else
 #define m_renew(type, ptr, old_num, new_num) ((type *)(m_realloc((ptr), sizeof(type) * (new_num))))
 #define m_renew_maybe(type, ptr, old_num, new_num, allow_move) ((type *)(m_realloc_maybe((ptr), sizeof(type) * (new_num), (allow_move))))
 #define m_del(type, ptr, num) ((void)(num), m_free(ptr))
-#define m_del_var(obj_type, var_type, var_num, ptr) ((void)(var_num), m_free(ptr))
+#define m_del_var(obj_type, var_field, var_type, var_num, ptr) ((void)(var_num), m_free(ptr))
 #endif
 #define m_del_obj(type, ptr) (m_del(type, ptr, 1))
 
diff --git a/py/modthread.c b/py/modthread.c
index e4dcccd259d80..3a8a1e03ce12b 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -235,7 +235,7 @@ STATIC mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args)
     // check for keyword arguments
     if (n_args == 2) {
         // just position arguments
-        th_args = m_new_obj_var(thread_entry_args_t, mp_obj_t, pos_args_len);
+        th_args = m_new_obj_var(thread_entry_args_t, args, mp_obj_t, pos_args_len);
         th_args->n_kw = 0;
     } else {
         // positional and keyword arguments
@@ -243,7 +243,7 @@ STATIC mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args)
             mp_raise_TypeError(MP_ERROR_TEXT("expecting a dict for keyword args"));
         }
         mp_map_t *map = &((mp_obj_dict_t *)MP_OBJ_TO_PTR(args[2]))->map;
-        th_args = m_new_obj_var(thread_entry_args_t, mp_obj_t, pos_args_len + 2 * map->used);
+        th_args = m_new_obj_var(thread_entry_args_t, args, mp_obj_t, pos_args_len + 2 * map->used);
         th_args->n_kw = map->used;
         // copy across the keyword arguments
         for (size_t i = 0, n = pos_args_len; i < map->alloc; ++i) {
diff --git a/py/objexcept.c b/py/objexcept.c
index a90405c525484..a54b81370d9bc 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -221,7 +221,7 @@ mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type, size_t n_args, siz
         o_tuple = (mp_obj_tuple_t *)&mp_const_empty_tuple_obj;
     } else {
         // Try to allocate memory for the tuple containing the args
-        o_tuple = m_new_obj_var_maybe(mp_obj_tuple_t, mp_obj_t, n_args);
+        o_tuple = m_new_obj_var_maybe(mp_obj_tuple_t, items, mp_obj_t, n_args);
 
         #if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
         // If we are called by mp_obj_new_exception_msg_varg then it will have
diff --git a/py/objfun.c b/py/objfun.c
index 94b33cd5bd89c..e2136968b621f 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -215,7 +215,7 @@ mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t self_in, size_t n_args
     // RuntimeError should be raised instead. So, we use m_new_obj_var_maybe(),
     // return NULL, then vm.c takes the needed action (either raise
     // RuntimeError or fallback to stack allocation).
-    code_state = m_new_obj_var_maybe(mp_code_state_t, byte, state_size);
+    code_state = m_new_obj_var_maybe(mp_code_state_t, state, byte, state_size);
     if (!code_state) {
         return NULL;
     }
@@ -247,10 +247,10 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     // allocate state for locals and stack
     mp_code_state_t *code_state = NULL;
     #if MICROPY_ENABLE_PYSTACK
-    code_state = mp_pystack_alloc(sizeof(mp_code_state_t) + state_size);
+    code_state = mp_pystack_alloc(offsetof(mp_code_state_t, state) + state_size);
     #else
     if (state_size > VM_MAX_STATE_ON_STACK) {
-        code_state = m_new_obj_var_maybe(mp_code_state_t, byte, state_size);
+        code_state = m_new_obj_var_maybe(mp_code_state_t, state, byte, state_size);
         #if MICROPY_DEBUG_VM_STACK_OVERFLOW
         if (code_state != NULL) {
             memset(code_state->state, 0, state_size);
@@ -258,7 +258,7 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         #endif
     }
     if (code_state == NULL) {
-        code_state = alloca(sizeof(mp_code_state_t) + state_size);
+        code_state = alloca(offsetof(mp_code_state_t, state) + state_size);
         #if MICROPY_DEBUG_VM_STACK_OVERFLOW
         memset(code_state->state, 0, state_size);
         #endif
@@ -320,7 +320,7 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     #else
     // free the state if it was allocated on the heap
     if (state_size != 0) {
-        m_del_var(mp_code_state_t, byte, state_size, code_state);
+        m_del_var(mp_code_state_t, state, byte, state_size, code_state);
     }
     #endif
 
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 75e21494b4d36..e586f089458d8 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -143,7 +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_var0(mp_obj_namedtuple_type_t, qstr, n_fields);
+    mp_obj_namedtuple_type_t *o = m_new_obj_var0(mp_obj_namedtuple_type_t, fields, 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/objtuple.c b/py/objtuple.c
index 0318a35db6349..969c488ee2318 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -264,7 +264,7 @@ void mp_obj_tuple_get(mp_obj_t self_in, size_t *len, mp_obj_t **items) {
 void mp_obj_tuple_del(mp_obj_t self_in) {
     assert(mp_obj_is_type(self_in, &mp_type_tuple));
     mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    m_del_var(mp_obj_tuple_t, mp_obj_t, self->len, self);
+    m_del_var(mp_obj_tuple_t, items, mp_obj_t, self->len, self);
 }
 
 /******************************************************************************/
diff --git a/py/objtype.c b/py/objtype.c
index 772f25d744d0a..d21c2a4b5b509 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1155,7 +1155,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     // (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));
+    mp_obj_type_t *o = m_new_obj_var0(mp_obj_type_t, slots, void *, 10 + (bases_len ? 1 : 0) + (base_protocol ? 1 : 0));
     o->base.type = &mp_type_type;
     o->flags = base_flags;
     o->name = name;

From e5014a4d7953808355c1882a65d6d7824cdd0001 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 16 Oct 2023 17:20:40 +0200
Subject: [PATCH 0524/3129] stm32: Add configuration options for analog
 switches.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h    |  6 ++++++
 .../stm32/boards/ARDUINO_NICLA_VISION/board_init.c |  5 -----
 .../boards/ARDUINO_NICLA_VISION/mpconfigboard.h    |  7 +++++++
 .../boards/ARDUINO_PORTENTA_H7/mpconfigboard.h     |  6 ++++++
 ports/stm32/system_stm32.c                         | 14 ++++++++++++++
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index a9b8cbfc7b521..ec9bbed5ea6e0 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -104,6 +104,12 @@ void GIGA_board_low_power(int mode);
 // SMPS configuration
 #define MICROPY_HW_PWR_SMPS_CONFIG      (PWR_LDO_SUPPLY)
 
+// Configure the analog switches for dual-pad pins.
+#define MICROPY_HW_ANALOG_SWITCH_PA0    (SYSCFG_SWITCH_PA0_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PA1    (SYSCFG_SWITCH_PA1_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PC2    (SYSCFG_SWITCH_PC2_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PC3    (SYSCFG_SWITCH_PC3_OPEN)
+
 // There is an external 32kHz oscillator
 #define RTC_ASYNCH_PREDIV           (0)
 #define RTC_SYNCH_PREDIV            (0x7fff)
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/board_init.c b/ports/stm32/boards/ARDUINO_NICLA_VISION/board_init.c
index ed8c60927571c..ec78b09de32b3 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/board_init.c
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/board_init.c
@@ -65,11 +65,6 @@ void NICLAV_board_early_init(void) {
     }
     #endif
 
-    // Make sure PC2 and PC3 and PC2_C and PC3_C pads are connected
-    // through the analog switch for ULPI NXT and DIR pins.
-    HAL_SYSCFG_AnalogSwitchConfig(SYSCFG_SWITCH_PC2, SYSCFG_SWITCH_PC2_CLOSE);
-    HAL_SYSCFG_AnalogSwitchConfig(SYSCFG_SWITCH_PC3, SYSCFG_SWITCH_PC3_CLOSE);
-
     #if MICROPY_HW_USB_HS_ULPI3320
     // Make sure UPLI is Not in low-power mode.
     ulpi_leave_low_power();
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 7cb3d85d3ddf5..3cae9b25fa344 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -107,6 +107,13 @@ void NICLAV_board_osc_enable(int enable);
 // SMPS configuration
 #define MICROPY_HW_PWR_SMPS_CONFIG      (PWR_LDO_SUPPLY)
 
+// Configure the analog switches for dual-pad pins.
+#define MICROPY_HW_ANALOG_SWITCH_PA0    (SYSCFG_SWITCH_PA0_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PA1    (SYSCFG_SWITCH_PA1_OPEN)
+// PC2_C and PC3_C, which are connected to ULPI NXT and DIR pins.
+#define MICROPY_HW_ANALOG_SWITCH_PC2    (SYSCFG_SWITCH_PC2_CLOSE)
+#define MICROPY_HW_ANALOG_SWITCH_PC3    (SYSCFG_SWITCH_PC3_CLOSE)
+
 // There is an external 32kHz oscillator
 #define RTC_ASYNCH_PREDIV           (0)
 #define RTC_SYNCH_PREDIV            (0x7fff)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 349ca9e0010cb..133158c60add4 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -109,6 +109,12 @@ void PORTENTA_board_osc_enable(int enable);
 // SMPS configuration
 #define MICROPY_HW_PWR_SMPS_CONFIG      (PWR_SMPS_1V8_SUPPLIES_LDO)
 
+// Configure the analog switches for dual-pad pins.
+#define MICROPY_HW_ANALOG_SWITCH_PA0    (SYSCFG_SWITCH_PA0_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PA1    (SYSCFG_SWITCH_PA1_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PC2    (SYSCFG_SWITCH_PC2_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PC3    (SYSCFG_SWITCH_PC3_OPEN)
+
 // There is an external 32kHz oscillator
 #define RTC_ASYNCH_PREDIV           (0)
 #define RTC_SYNCH_PREDIV            (0x7fff)
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index de1897b4a6008..2cff36c3a611c 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -587,6 +587,20 @@ MP_WEAK void SystemClock_Config(void) {
     // Enable the Debug Module in low-power modes.
     DBGMCU->CR |= (DBGMCU_CR_DBG_SLEEPD1 | DBGMCU_CR_DBG_STOPD1 | DBGMCU_CR_DBG_STANDBYD1);
     #endif
+
+    // Configure the analog switches
+    #ifdef MICROPY_HW_ANALOG_SWITCH_PA0
+    HAL_SYSCFG_AnalogSwitchConfig(SYSCFG_SWITCH_PA0, MICROPY_HW_ANALOG_SWITCH_PA0);
+    #endif
+    #ifdef MICROPY_HW_ANALOG_SWITCH_PA1
+    HAL_SYSCFG_AnalogSwitchConfig(SYSCFG_SWITCH_PA1, MICROPY_HW_ANALOG_SWITCH_PA1);
+    #endif
+    #ifdef MICROPY_HW_ANALOG_SWITCH_PC2
+    HAL_SYSCFG_AnalogSwitchConfig(SYSCFG_SWITCH_PC2, MICROPY_HW_ANALOG_SWITCH_PC2);
+    #endif
+    #ifdef MICROPY_HW_ANALOG_SWITCH_PC3
+    HAL_SYSCFG_AnalogSwitchConfig(SYSCFG_SWITCH_PC3, MICROPY_HW_ANALOG_SWITCH_PC3);
+    #endif
 }
 
 #endif

From 47ea831c0e741722a9e7a94bb453947cff5f66d8 Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Sat, 21 Oct 2023 15:03:53 +0200
Subject: [PATCH 0525/3129] stm32: Add STM32H5 support for sleep mode.

Update rtc, machine and powerctrl drivers to support STM32H5 sleep
modes. This makes RTC alarm wakeup working from lightsleep() and
deepsleep().

Changes:
- Determine start reason for machine.reset_cause() in modmachine.c.
- Add proper interrupt clear code in rtc.c.
- Add wakeup functionality in powerctrl_enter_stop_mode(). Remember
  and restore voltage scaling level. Restart HSI48 if it was on before
  entering sleep mode.
- Clear DBGMCU_CR in SystemClock_Config() as for other variants.
  Otherwise debug flags prevent entering sleep mode.

Implementation Notes:
- rtc.c: EXTI_RTSTR1 bits are not present for H5. Code sequence from
  G0/G4/L4/WB/WL would be invalid. RTSTR is only defined for external
  (GPIO) interrupts. Maybe this is also true for other STM32 variants.
- powerctrl_enter_stop_mode() uses complicated, nested conditionals
  to select STM32 variants. To make code slightly better readable,
  comment have been added. A non-nested, #if/#elif sequence would
  make the code more readable. I leave this to the original authors.

Signed-off-by: Rene Straub <rene@see5.ch>
---
 ports/stm32/modmachine.c    |  6 ++++++
 ports/stm32/powerctrl.c     | 27 +++++++++++++++++++++++----
 ports/stm32/powerctrlboot.c |  4 ++++
 ports/stm32/rtc.c           |  8 ++++++--
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 83327bede0720..67fcffb0f1349 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -108,6 +108,12 @@ void machine_init(void) {
         reset_cause = PYB_RESET_DEEPSLEEP;
         PWR->CR1 |= PWR_CR1_CSBF;
     } else
+    #elif defined(STM32H5)
+    if (PWR->PMSR & PWR_PMSR_STOPF || PWR->PMSR & PWR_PMSR_SBF) {
+        // came out of standby or stop mode
+        reset_cause = PYB_RESET_DEEPSLEEP;
+        PWR->PMCR |= PWR_PMCR_CSSF;
+    } else
     #elif defined(STM32H7)
     if (PWR->CPUCR & PWR_CPUCR_SBF || PWR->CPUCR & PWR_CPUCR_STOPF) {
         // came out of standby or stop mode
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 03224f4d8b323..1bb66c9781aec 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -48,6 +48,8 @@
 #define POWERCTRL_GET_VOLTAGE_SCALING() PWR_REGULATOR_VOLTAGE_SCALE0
 #elif defined(STM32H723xx)
 #define POWERCTRL_GET_VOLTAGE_SCALING() LL_PWR_GetRegulVoltageScaling()
+#elif defined(STM32H5)
+#define POWERCTRL_GET_VOLTAGE_SCALING() LL_PWR_GetRegulVoltageScaling()
 #else
 #define POWERCTRL_GET_VOLTAGE_SCALING()     \
     (((PWR->CSR1 & PWR_CSR1_ACTVOS) && (SYSCFG->PWRCR & SYSCFG_PWRCR_ODEN)) ? \
@@ -797,6 +799,14 @@ void powerctrl_enter_stop_mode(void) {
     HAL_PWREx_EnableFlashPowerDown();
     #endif
 
+    #if defined(STM32H5)
+    // 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();
+    #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;
@@ -837,9 +847,9 @@ void powerctrl_enter_stop_mode(void) {
     while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_HSI48) {
     }
 
-    #else
+    #else // defined(STM32F0)
 
-    #if defined(STM32H7)
+    #if defined(STM32H5) || 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()) {
@@ -879,7 +889,7 @@ void powerctrl_enter_stop_mode(void) {
     while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL1) {
     }
 
-    #else
+    #else // defined(STM32H5)
 
     // enable PLL
     __HAL_RCC_PLL_ENABLE();
@@ -899,7 +909,7 @@ void powerctrl_enter_stop_mode(void) {
     }
     #endif
 
-    #endif
+    #endif // defined(STM32H5)
 
     powerctrl_disable_hsi_if_unused();
 
@@ -912,6 +922,15 @@ void powerctrl_enter_stop_mode(void) {
     }
     #endif
 
+    #if defined(STM32H5)
+    if (rcc_cr & RCC_CR_HSI48ON) {
+        // Enable HSI48.
+        LL_RCC_HSI48_Enable();
+        while (!LL_RCC_HSI48_IsReady()) {
+        }
+    }
+    #endif
+
     #if defined(STM32H7)
     // Enable HSI
     if (rcc_cr & RCC_CR_HSION) {
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index c7802a5588474..31dae527c1e5e 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -298,6 +298,10 @@ void SystemClock_Config(void) {
     LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_PLL3Q);
 
     #endif
+
+    #ifdef NDEBUG
+    DBGMCU->CR = 0;
+    #endif
 }
 
 #elif defined(STM32L0)
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 3b05fb40ebfff..b209ea83540d8 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -756,9 +756,11 @@ 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(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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(STM32H5)
+        EXTI->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
         EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
@@ -768,8 +770,10 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #endif
 
         // clear interrupt flags
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
         RTC->ICSR &= ~RTC_ICSR_WUTWF;
+        #elif defined(STM32H5)
+        RTC->SCR = RTC_SCR_CWUTF;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         RTC->SR &= ~RTC_SR_WUTF;
         #else

From d95f5aa01131f3aa669867ebdde391f9db277846 Mon Sep 17 00:00:00 2001
From: Maarten van der Schrieck <maarten@thingsconnected.nl>
Date: Tue, 24 Oct 2023 10:16:00 +0200
Subject: [PATCH 0526/3129] rp2/machine_uart: Fix handling of serial break
 condition.

The FIFO reports not only the bytes read, but also 4 error bits. These were
not checked, leading to NUL value read in case of break and possible
garbage bytes being written on parity/framing error.

This patch addresses the issue that NUL bytes are incorrectly read on
break, and at least provides the boilerplate code and comments for error
handling, that may be implemented in the future.

Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>
---
 ports/rp2/machine_uart.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 044c905ff21bb..dae57012a8d3d 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -140,8 +140,27 @@ static inline void read_mutex_unlock(machine_uart_obj_t *u) {
 STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self) {
     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);
+            // Get a byte from uart and put into the buffer. Every entry from
+            // the FIFO is accompanied by 4 error bits, that may be used for
+            // error handling.
+            uint16_t c = uart_get_hw(self->uart)->dr;
+            if (c & UART_UARTDR_OE_BITS) {
+                // Overrun Error: We missed at least one byte. Not much we can do here.
+            }
+            if (c & UART_UARTDR_BE_BITS) {
+                // Break Error: RX was held low for longer than one character
+                // (11 bits). We did *not* read the zero byte that we seemed to
+                // read from dr.
+                continue;
+            }
+            if (c & UART_UARTDR_PE_BITS) {
+                // Parity Error: The byte we read is invalid.
+            }
+            if (c & UART_UARTDR_FE_BITS) {
+                // Framing Error: We did not receive a valid stop bit.
+            }
+
+            ringbuf_put(&(self->read_buffer), c);
         }
         read_mutex_unlock(self);
     }

From b41055a5a3e1c51ee7ea274da4744dd47c211b3a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 25 Oct 2023 09:05:54 +0200
Subject: [PATCH 0527/3129] rp2/machine_adc: Refactor channel/pin validation
 code.

This patch ensures that integer channel numbers passed to the ADC
constructor (including temperature sensor) are interpreted as raw
channel numbers, and not cause any GPIO pins to be initialized.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/machine_adc.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 80c4d0533e251..3a7a71a741124 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -69,21 +69,21 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
 
     mp_obj_t source = all_args[0];
 
-    uint32_t channel;
+    uint32_t channel = -1;
     bool is_ext = false;
     const machine_pin_obj_t *pin = NULL;
 
     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))) {
+        if (ADC_IS_VALID_GPIO(channel)) {
+            channel = ADC_CHANNEL_FROM_GPIO(channel);
+        } else if (!(channel >= 0 && channel <= ADC_CHANNEL_TEMPSENSOR)) {
             mp_raise_ValueError(MP_ERROR_TEXT("invalid channel"));
         }
-
     } else {
         // Get GPIO and check it has ADC capabilities.
         pin = machine_pin_find(source);
-        channel = pin->id;
         bool valid_adc_pin = false;
         #if MICROPY_HW_ADC_EXT_COUNT
         is_ext = pin->is_ext;
@@ -92,7 +92,7 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
         } else
         #endif
         {
-            valid_adc_pin = ADC_IS_VALID_GPIO(channel);
+            valid_adc_pin = ADC_IS_VALID_GPIO(pin->id);
         }
         if (!valid_adc_pin) {
             mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't have ADC capabilities"));
@@ -104,16 +104,18 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
         adc_init();
     }
 
-    if (is_ext) {
-        #if MICROPY_HW_ADC_EXT_COUNT
-        // Note external pins are mutable.
-        machine_pin_ext_config((machine_pin_obj_t *)pin, MACHINE_PIN_MODE_ANALOG, 0);
-        channel = machine_pin_ext_to_adc_channel(pin);
-        #endif
-    } else if (ADC_IS_VALID_GPIO(channel)) {
-        // Configure the GPIO pin in ADC mode.
-        adc_gpio_init(channel);
-        channel = ADC_CHANNEL_FROM_GPIO(channel);
+    if (pin) {
+        if (is_ext) {
+            #if MICROPY_HW_ADC_EXT_COUNT
+            // Note external pins are mutable.
+            machine_pin_ext_config((machine_pin_obj_t *)pin, MACHINE_PIN_MODE_ANALOG, 0);
+            channel = machine_pin_ext_to_adc_channel(pin);
+            #endif
+        } else {
+            // Configure the GPIO pin in ADC mode.
+            adc_gpio_init(pin->id);
+            channel = ADC_CHANNEL_FROM_GPIO(pin->id);
+        }
     } else if (channel == ADC_CHANNEL_TEMPSENSOR) {
         // Enable temperature sensor.
         adc_set_temp_sensor_enabled(1);

From 8c432ea2d437255eefb4aff18764936ad11b70c7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 31 Oct 2023 16:42:10 +1100
Subject: [PATCH 0528/3129] rp2: Remove 1ms timeout to make idle waiting
 tickless.

The main motivation for doing this was to reduce the latency when the
system is woken by a USB interrupt.  The best_effort_wfe_or_timeout()
function calls into the pico-sdk dynamic timer framework which sets up a
new dynamic timer instance each time, and then has to tear it down before
continuing after a WFE.

Testing Python interrupt latency, it seems to be improved by about 12us
(from average of 46us to 34us running a Pin IRQ).  C-based "scheduled
nodes" should see even lower latency.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/modmachine.c   | 2 +-
 ports/rp2/mpconfigport.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 29a8dbed2c8f6..4c428cbddf3ed 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -111,7 +111,7 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
 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));
+    __wfe();
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 0a6331273434d..84a961db43e8a 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -274,7 +274,7 @@ extern void mp_thread_end_atomic_section(uint32_t);
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         MICROPY_EVENT_POLL_HOOK_FAST; \
-        best_effort_wfe_or_timeout(make_timeout_time_ms(1)); \
+        __wfe(); \
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))

From 841422817e069087df9d10d37bd8896a51f2f356 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 3 Nov 2023 18:43:58 +1100
Subject: [PATCH 0529/3129] stm32/boards/make-pins.py: Fix H7 ADC generation.

Fixes are:
- Only emit ADC table entries for pins that aren't cpu-hidden
  (i.e. ignore `X,-Y` rows).
- Only use the P channels on H7.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/make-pins.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 31e7bdb0e2f29..9f9950ff1746a 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -135,7 +135,11 @@ def add_adc(self, adc):
                     "Invalid adc '{:s}' for pin '{:s}'".format(adc_name, self.name())
                 )
             adc_units = [int(x) for x in m.group(1)]
-            _adc_mode = m.group(2)
+            adc_mode = m.group(2)
+            if adc_mode == "INN":
+                # On H7 we have INN/INP, all other parts use IN only. Only use
+                # IN or INP channels.
+                continue
             adc_channel = int(m.group(3))
 
             # Pick the entry with the most ADC units, e.g. "ADC1_INP16/ADC12_INN1/ADC12_INP0" --> "ADC12_INN1".
@@ -247,6 +251,8 @@ def print_adcs(self, out_source):
             )
             # Don't include pins that weren't in pins.csv.
             for pin in self.available_pins():
+                if pin._hidden:
+                    continue
                 if adc_unit in pin._adc_units:
                     print(
                         "    [{:d}] = {:s},".format(pin._adc_channel, self._cpu_pin_pointer(pin)),

From c028f956fc0fc93f1ca00950203693d4c59254e4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 4 Nov 2023 09:00:33 +1100
Subject: [PATCH 0530/3129] stm32/boards/stm32f4x9_af.csv: Fix DCMI_VSYNC.

This incorrectly had a `(1)` on the end.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/stm32f429_af.csv | 340 ++++++++++++++--------------
 ports/stm32/boards/stm32f439_af.csv | 340 ++++++++++++++--------------
 2 files changed, 340 insertions(+), 340 deletions(-)

diff --git a/ports/stm32/boards/stm32f429_af.csv b/ports/stm32/boards/stm32f429_af.csv
index e9cf2880b4699..afa3250e116df 100644
--- a/ports/stm32/boards/stm32f429_af.csv
+++ b/ports/stm32/boards/stm32f429_af.csv
@@ -1,170 +1,170 @@
-Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7            ,AF8               ,AF9                   ,AF10           ,AF11                           ,AF12              ,AF13         ,AF14     ,AF15    ,ADC
-     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/2/3/4/5/6   ,SPI2/3/SAI1      ,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH                            ,FMC/SDIO/OTG2_FS  ,DCMI         ,LCD      ,SYS     ,
-PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR    ,         ,                 ,                 ,USART2_CTS     ,UART4_TX          ,                      ,               ,ETH_MII_CRS                    ,                  ,             ,         ,EVENTOUT,
-PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2,            ,         ,                 ,                 ,USART2_RTS     ,UART4_RX          ,                      ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,             ,         ,EVENTOUT,ADC123_IN1
-PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                 ,                 ,USART2_TX      ,                  ,                      ,               ,ETH_MDIO                       ,                  ,             ,         ,EVENTOUT,ADC123_IN2
-PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                 ,                 ,USART2_RX      ,                  ,                      ,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 ,                               ,                  ,             ,         ,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             ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                  ,             ,         ,EVENTOUT,ADC12_IN7
-PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                 ,                 ,USART1_CK      ,                  ,                      ,OTG_FS_SOF     ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
-PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                 ,                 ,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                   ,                  ,             ,         ,EVENTOUT,ADC12_IN8
-PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,LCD_R6                ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                  ,             ,         ,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        ,I2S3ext_SD     ,                  ,                      ,               ,                               ,                  ,             ,         ,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     ,         ,EVENTOUT,
-PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                 ,                 ,USART1_TX      ,                  ,CAN2_TX               ,               ,                               ,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      ,                  ,                      ,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   ,                  ,             ,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        ,I2S2ext_SD       ,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         ,             ,         ,EVENTOUT,ADC123_IN10
-PortC,PC1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MDC                        ,                  ,             ,         ,EVENTOUT,ADC123_IN11
-PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,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     ,                  ,             ,         ,EVENTOUT,ADC12_IN14
-PortC,PC5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                  ,             ,         ,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 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,SDIO_D0           ,DCMI_D2      ,         ,EVENTOUT,
-PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN         ,                 ,               ,                  ,                      ,               ,                               ,SDIO_D1           ,DCMI_D3      ,         ,EVENTOUT,
-PortC,PC10,             ,                 ,        ,            ,         ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX      ,UART4_TX          ,                      ,               ,                               ,SDIO_D2           ,DCMI_D8      ,LCD_R2   ,EVENTOUT,
-PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD       ,SPI3_MISO        ,USART3_RX      ,UART4_RX          ,                      ,               ,                               ,SDIO_D3           ,DCMI_D4      ,         ,EVENTOUT,
-PortC,PC12,             ,                 ,        ,            ,         ,                 ,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 ,             ,                 ,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/FMC_NCE2  ,             ,         ,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     ,                  ,                      ,               ,                               ,FMC_A16           ,             ,         ,EVENTOUT,
-PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                 ,                 ,USART3_RTS     ,                  ,                      ,               ,                               ,FMC_A17           ,             ,         ,EVENTOUT,
-PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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      ,               ,                  ,                      ,               ,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          ,                      ,               ,                               ,FMC_D4            ,             ,         ,EVENTOUT,
-PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                 ,                 ,               ,UART7_TX          ,                      ,               ,                               ,FMC_D5            ,             ,         ,EVENTOUT,
-PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D6            ,             ,         ,EVENTOUT,
-PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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          ,                      ,               ,                               ,FMC_NIORD         ,             ,         ,EVENTOUT,ADC3_IN4
-PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,SPI5_SCK         ,SAI1_MCLK_B      ,               ,UART7_TX          ,                      ,               ,                               ,FMC_NREG          ,             ,         ,EVENTOUT,ADC3_IN5
-PortF,PF8 ,             ,                 ,        ,            ,         ,SPI5_MISO        ,SAI1_SCK_B       ,               ,                  ,TIM13_CH1             ,               ,                               ,FMC_NIOWR         ,             ,         ,EVENTOUT,ADC3_IN6
-PortF,PF9 ,             ,                 ,        ,            ,         ,SPI5_MOSI        ,SAI1_FS_B        ,               ,                  ,TIM14_CH1             ,               ,                               ,FMC_CD            ,             ,         ,EVENTOUT,ADC3_IN7
-PortF,PF10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INTR          ,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 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INT2          ,DCMI_D12     ,LCD_R7   ,EVENTOUT,
-PortG,PG7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,FMC_INT3          ,DCMI_D13     ,LCD_CLK  ,EVENTOUT,
-PortG,PG8 ,             ,                 ,        ,            ,         ,SPI6_NSS         ,                 ,               ,USART6_RTS        ,                      ,               ,ETH_PPS_OUT                    ,FMC_SDCLK         ,             ,         ,EVENTOUT,
-PortG,PG9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_RX         ,                      ,               ,                               ,FMC_NE2/FMC_NCE3  ,DCMI_VSYNC(1),         ,EVENTOUT,
-PortG,PG10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,LCD_G3                ,               ,                               ,FMC_NCE4_1/FMC_NE3,DCMI_D2      ,LCD_B2   ,EVENTOUT,
-PortG,PG11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FMC_NCE4_2        ,DCMI_D3      ,LCD_B3   ,EVENTOUT,
-PortG,PG12,             ,                 ,        ,            ,         ,SPI6_MISO        ,                 ,               ,USART6_RTS        ,LCD_B4                ,               ,                               ,FMC_NE4           ,             ,LCD_B1   ,EVENTOUT,
-PortG,PG13,             ,                 ,        ,            ,         ,SPI6_SCK         ,                 ,               ,USART6_CTS        ,                      ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,             ,         ,EVENTOUT,
-PortG,PG14,             ,                 ,        ,            ,         ,SPI6_MOSI        ,                 ,               ,USART6_TX         ,                      ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FMC_A25           ,             ,         ,EVENTOUT,
-PortG,PG15,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CTS        ,                      ,               ,                               ,FMC_SDNCAS        ,DCMI_D13     ,         ,EVENTOUT,
-PortH,PH0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
-PortH,PH1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
-PortH,PH2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_CRS                    ,FMC_SDCKE0        ,             ,LCD_R0   ,EVENTOUT,
-PortH,PH3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_COL                    ,FMC_SDNE0         ,             ,LCD_R1   ,EVENTOUT,
-PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_NXT,                               ,                  ,             ,         ,EVENTOUT,
-PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,SPI5_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_SDNWE         ,             ,         ,EVENTOUT,
-PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,SPI5_SCK         ,                 ,               ,                  ,TIM12_CH1             ,               ,                               ,FMC_SDNE1         ,DCMI_D8      ,         ,        ,
-PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,SPI5_MISO        ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD3                   ,FMC_SDCKE1        ,DCMI_D9      ,         ,        ,
-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        ,I2S2ext_SD       ,               ,                  ,                      ,               ,                               ,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,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_DIR,                               ,                  ,             ,         ,EVENTOUT,
-PortI,PI12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_HSYNC,EVENTOUT,
-PortI,PI13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_VSYNC,EVENTOUT,
-PortI,PI14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_CLK  ,EVENTOUT,
-PortI,PI15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R0   ,EVENTOUT,
-PortJ,PJ0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R1   ,EVENTOUT,
-PortJ,PJ1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R2   ,EVENTOUT,
-PortJ,PJ2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R3   ,EVENTOUT,
-PortJ,PJ3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R4   ,EVENTOUT,
-PortJ,PJ4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R5   ,EVENTOUT,
-PortJ,PJ5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
-PortJ,PJ6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R7   ,EVENTOUT,
-PortJ,PJ7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G0   ,EVENTOUT,
-PortJ,PJ8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G1   ,EVENTOUT,
-PortJ,PJ9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G2   ,EVENTOUT,
-PortJ,PJ10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G3   ,EVENTOUT,
-PortJ,PJ11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G4   ,EVENTOUT,
-PortJ,PJ12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B0   ,EVENTOUT,
-PortJ,PJ13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B1   ,EVENTOUT,
-PortJ,PJ14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B2   ,EVENTOUT,
-PortJ,PJ15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B3   ,EVENTOUT,
-PortK,PK0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G5   ,EVENTOUT,
-PortK,PK1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G6   ,EVENTOUT,
-PortK,PK2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G7   ,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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7            ,AF8               ,AF9                   ,AF10           ,AF11                           ,AF12              ,AF13       ,AF14     ,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/2/3/4/5/6   ,SPI2/3/SAI1      ,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH                            ,FMC/SDIO/OTG2_FS  ,DCMI       ,LCD      ,SYS     ,
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR    ,         ,                 ,                 ,USART2_CTS     ,UART4_TX          ,                      ,               ,ETH_MII_CRS                    ,                  ,           ,         ,EVENTOUT,
+PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2,            ,         ,                 ,                 ,USART2_RTS     ,UART4_RX          ,                      ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,           ,         ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                 ,                 ,USART2_TX      ,                  ,                      ,               ,ETH_MDIO                       ,                  ,           ,         ,EVENTOUT,ADC123_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                 ,                 ,USART2_RX      ,                  ,                      ,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 ,                               ,                  ,           ,         ,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             ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                  ,           ,         ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                 ,                 ,USART1_CK      ,                  ,                      ,OTG_FS_SOF     ,                               ,                  ,           ,LCD_R6   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                 ,                 ,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                   ,                  ,           ,         ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,LCD_R6                ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                  ,           ,         ,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        ,I2S3ext_SD     ,                  ,                      ,               ,                               ,                  ,           ,         ,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   ,         ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                 ,                 ,USART1_TX      ,                  ,CAN2_TX               ,               ,                               ,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      ,                  ,                      ,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   ,                  ,           ,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        ,I2S2ext_SD       ,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         ,           ,         ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MDC                        ,                  ,           ,         ,EVENTOUT,ADC123_IN11
+PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,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     ,                  ,           ,         ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                  ,           ,         ,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 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,SDIO_D0           ,DCMI_D2    ,         ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN         ,                 ,               ,                  ,                      ,               ,                               ,SDIO_D1           ,DCMI_D3    ,         ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,            ,         ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX      ,UART4_TX          ,                      ,               ,                               ,SDIO_D2           ,DCMI_D8    ,LCD_R2   ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD       ,SPI3_MISO        ,USART3_RX      ,UART4_RX          ,                      ,               ,                               ,SDIO_D3           ,DCMI_D4    ,         ,EVENTOUT,
+PortC,PC12,             ,                 ,        ,            ,         ,                 ,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 ,             ,                 ,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/FMC_NCE2  ,           ,         ,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     ,                  ,                      ,               ,                               ,FMC_A16           ,           ,         ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                 ,                 ,USART3_RTS     ,                  ,                      ,               ,                               ,FMC_A17           ,           ,         ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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      ,               ,                  ,                      ,               ,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          ,                      ,               ,                               ,FMC_D4            ,           ,         ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                 ,                 ,               ,UART7_TX          ,                      ,               ,                               ,FMC_D5            ,           ,         ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D6            ,           ,         ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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          ,                      ,               ,                               ,FMC_NIORD         ,           ,         ,EVENTOUT,ADC3_IN4
+PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,SPI5_SCK         ,SAI1_MCLK_B      ,               ,UART7_TX          ,                      ,               ,                               ,FMC_NREG          ,           ,         ,EVENTOUT,ADC3_IN5
+PortF,PF8 ,             ,                 ,        ,            ,         ,SPI5_MISO        ,SAI1_SCK_B       ,               ,                  ,TIM13_CH1             ,               ,                               ,FMC_NIOWR         ,           ,         ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,            ,         ,SPI5_MOSI        ,SAI1_FS_B        ,               ,                  ,TIM14_CH1             ,               ,                               ,FMC_CD            ,           ,         ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INTR          ,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 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INT2          ,DCMI_D12   ,LCD_R7   ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,FMC_INT3          ,DCMI_D13   ,LCD_CLK  ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,            ,         ,SPI6_NSS         ,                 ,               ,USART6_RTS        ,                      ,               ,ETH_PPS_OUT                    ,FMC_SDCLK         ,           ,         ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_RX         ,                      ,               ,                               ,FMC_NE2/FMC_NCE3  ,DCMI_VSYNC ,         ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,LCD_G3                ,               ,                               ,FMC_NCE4_1/FMC_NE3,DCMI_D2    ,LCD_B2   ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FMC_NCE4_2        ,DCMI_D3    ,LCD_B3   ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,            ,         ,SPI6_MISO        ,                 ,               ,USART6_RTS        ,LCD_B4                ,               ,                               ,FMC_NE4           ,           ,LCD_B1   ,EVENTOUT,
+PortG,PG13,             ,                 ,        ,            ,         ,SPI6_SCK         ,                 ,               ,USART6_CTS        ,                      ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,           ,         ,EVENTOUT,
+PortG,PG14,             ,                 ,        ,            ,         ,SPI6_MOSI        ,                 ,               ,USART6_TX         ,                      ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FMC_A25           ,           ,         ,EVENTOUT,
+PortG,PG15,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CTS        ,                      ,               ,                               ,FMC_SDNCAS        ,DCMI_D13   ,         ,EVENTOUT,
+PortH,PH0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,         ,EVENTOUT,
+PortH,PH1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,         ,EVENTOUT,
+PortH,PH2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_CRS                    ,FMC_SDCKE0        ,           ,LCD_R0   ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_COL                    ,FMC_SDNE0         ,           ,LCD_R1   ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_NXT,                               ,                  ,           ,         ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,SPI5_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_SDNWE         ,           ,         ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,SPI5_SCK         ,                 ,               ,                  ,TIM12_CH1             ,               ,                               ,FMC_SDNE1         ,DCMI_D8    ,         ,        ,
+PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,SPI5_MISO        ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD3                   ,FMC_SDCKE1        ,DCMI_D9    ,         ,        ,
+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        ,I2S2ext_SD       ,               ,                  ,                      ,               ,                               ,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,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_DIR,                               ,                  ,           ,         ,EVENTOUT,
+PortI,PI12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_HSYNC,EVENTOUT,
+PortI,PI13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_VSYNC,EVENTOUT,
+PortI,PI14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_CLK  ,EVENTOUT,
+PortI,PI15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R0   ,EVENTOUT,
+PortJ,PJ0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R1   ,EVENTOUT,
+PortJ,PJ1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R2   ,EVENTOUT,
+PortJ,PJ2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R3   ,EVENTOUT,
+PortJ,PJ3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R4   ,EVENTOUT,
+PortJ,PJ4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R5   ,EVENTOUT,
+PortJ,PJ5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R6   ,EVENTOUT,
+PortJ,PJ6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R7   ,EVENTOUT,
+PortJ,PJ7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G0   ,EVENTOUT,
+PortJ,PJ8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G1   ,EVENTOUT,
+PortJ,PJ9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G2   ,EVENTOUT,
+PortJ,PJ10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G3   ,EVENTOUT,
+PortJ,PJ11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G4   ,EVENTOUT,
+PortJ,PJ12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B0   ,EVENTOUT,
+PortJ,PJ13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B1   ,EVENTOUT,
+PortJ,PJ14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B2   ,EVENTOUT,
+PortJ,PJ15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B3   ,EVENTOUT,
+PortK,PK0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G5   ,EVENTOUT,
+PortK,PK1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G6   ,EVENTOUT,
+PortK,PK2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G7   ,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,
diff --git a/ports/stm32/boards/stm32f439_af.csv b/ports/stm32/boards/stm32f439_af.csv
index 94466c6c1a0b6..f7069fb579cce 100644
--- a/ports/stm32/boards/stm32f439_af.csv
+++ b/ports/stm32/boards/stm32f439_af.csv
@@ -1,170 +1,170 @@
-Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7            ,AF8               ,AF9                   ,AF10           ,AF11                           ,AF12              ,AF13         ,AF14     ,AF15    ,ADC
-     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/2/3/4/5/6   ,SPI2/3/SAI1      ,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH                            ,FMC/SDIO/OTG2_FS  ,DCMI         ,LCD      ,SYS     ,
-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          ,                      ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,             ,         ,EVENTOUT,ADC123_IN1
-PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                 ,                 ,USART2_TX      ,                  ,                      ,               ,ETH_MDIO                       ,                  ,             ,         ,EVENTOUT,ADC123_IN2
-PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                 ,                 ,USART2_RX      ,                  ,                      ,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 ,                               ,                  ,             ,         ,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             ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                  ,             ,         ,EVENTOUT,ADC12_IN7
-PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                 ,                 ,USART1_CK      ,                  ,                      ,OTG_FS_SOF     ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
-PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                 ,                 ,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                   ,                  ,             ,         ,EVENTOUT,ADC12_IN8
-PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,LCD_R6                ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                  ,             ,         ,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        ,I2S3ext_SD     ,                  ,                      ,               ,                               ,                  ,             ,         ,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     ,         ,EVENTOUT,
-PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                 ,                 ,USART1_TX      ,                  ,CAN2_TX               ,               ,                               ,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      ,                  ,                      ,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   ,                  ,             ,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        ,I2S2ext_SD       ,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         ,             ,         ,EVENTOUT,ADC123_IN10
-PortC,PC1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MDC                        ,                  ,             ,         ,EVENTOUT,ADC123_IN11
-PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,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     ,                  ,             ,         ,EVENTOUT,ADC12_IN14
-PortC,PC5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                  ,             ,         ,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 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,SDIO_D0           ,DCMI_D2      ,         ,EVENTOUT,
-PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN         ,                 ,               ,                  ,                      ,               ,                               ,SDIO_D1           ,DCMI_D3      ,         ,EVENTOUT,
-PortC,PC10,             ,                 ,        ,            ,         ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX      ,UART4_TX          ,                      ,               ,                               ,SDIO_D2           ,DCMI_D8      ,LCD_R2   ,EVENTOUT,
-PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD       ,SPI3_MISO        ,USART3_RX      ,UART4_RX          ,                      ,               ,                               ,SDIO_D3           ,DCMI_D4      ,         ,EVENTOUT,
-PortC,PC12,             ,                 ,        ,            ,         ,                 ,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 ,             ,                 ,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 ,             ,                 ,        ,            ,         ,I2S3_SD          ,SAI1_SD_A        ,USART2_RX      ,                  ,                      ,               ,                               ,FMC_NWAIT         ,DCMI_D10     ,LCD_B2   ,EVENTOUT,
-PortD,PD7 ,             ,                 ,        ,            ,         ,                 ,                 ,USART2_CK      ,                  ,                      ,               ,                               ,FMC_NE1/FMC_NCE2  ,             ,         ,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     ,                  ,                      ,               ,                               ,FMC_A16           ,             ,         ,EVENTOUT,
-PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                 ,                 ,USART3_RTS     ,                  ,                      ,               ,                               ,FMC_A17           ,             ,         ,EVENTOUT,
-PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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      ,               ,                  ,                      ,               ,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          ,                      ,               ,                               ,FMC_D4            ,             ,         ,EVENTOUT,
-PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                 ,                 ,               ,UART7_TX          ,                      ,               ,                               ,FMC_D5            ,             ,         ,EVENTOUT,
-PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D6            ,             ,         ,EVENTOUT,
-PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D7            ,             ,         ,EVENTOUT,
-PortE,PE11,             ,TIM1_CH2         ,        ,            ,         ,SPI4_NSS         ,SPI3_NSS         ,               ,                  ,                      ,               ,                               ,FMC_D8            ,             ,LCD_G3   ,EVENTOUT,
-PortE,PE12,             ,TIM1_CH3N        ,        ,            ,         ,SPI4_SCK         ,SPI3_SCK         ,               ,                  ,                      ,               ,                               ,FMC_D9            ,             ,LCD_B4   ,EVENTOUT,
-PortE,PE13,             ,TIM1_CH3         ,        ,            ,         ,SPI4_MISO        ,SPI3_MISO        ,               ,                  ,                      ,               ,                               ,FMC_D10           ,             ,LCD_DE   ,EVENTOUT,
-PortE,PE14,             ,TIM1_CH4         ,        ,            ,         ,SPI4_MOSI        ,SP3_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          ,                      ,               ,                               ,FMC_NIORD         ,             ,         ,EVENTOUT,ADC3_IN4
-PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,SPI5_SCK         ,SAI1_MCLK_B      ,               ,UART7_TX          ,                      ,               ,                               ,FMC_NREG          ,             ,         ,EVENTOUT,ADC3_IN5
-PortF,PF8 ,             ,                 ,        ,            ,         ,SPI5_MISO        ,SAI1_SCK_B       ,               ,                  ,TIM13_CH1             ,               ,                               ,FMC_NIOWR         ,             ,         ,EVENTOUT,ADC3_IN6
-PortF,PF9 ,             ,                 ,        ,            ,         ,SPI5_MOSI        ,SAI1_FS_B        ,               ,                  ,TIM14_CH1             ,               ,                               ,FMC_CD            ,             ,         ,EVENTOUT,ADC3_IN7
-PortF,PF10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INTR          ,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 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INT2          ,DCMI_D12     ,LCD_R7   ,EVENTOUT,
-PortG,PG7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,FMC_INT3          ,DCMI_D13     ,LCD_CLK  ,EVENTOUT,
-PortG,PG8 ,             ,                 ,        ,            ,         ,SPI6_NSS         ,                 ,               ,USART6_RTS        ,                      ,               ,ETH_PPS_OUT                    ,FMC_SDCLK         ,             ,         ,EVENTOUT,
-PortG,PG9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_RX         ,                      ,               ,                               ,FMC_NE2/FMC_NCE3  ,DCMI_VSYNC(1),         ,EVENTOUT,
-PortG,PG10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,LCD_G3                ,               ,                               ,FMC_NCE4_1/FMC_NE3,DCMI_D2      ,LCD_B2   ,EVENTOUT,
-PortG,PG11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FMC_NCE4_2        ,DCMI_D3      ,LCD_B3   ,EVENTOUT,
-PortG,PG12,             ,                 ,        ,            ,         ,SPI6_MISO        ,                 ,               ,USART6_RTS        ,LCD_B4                ,               ,                               ,FMC_NE4           ,             ,LCD_B1   ,EVENTOUT,
-PortG,PG13,             ,                 ,        ,            ,         ,SPI6_SCK         ,                 ,               ,USART6_CTS        ,                      ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,             ,         ,EVENTOUT,
-PortG,PG14,             ,                 ,        ,            ,         ,SPI6_MOSI        ,                 ,               ,USART6_TX         ,                      ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FMC_A25           ,             ,         ,EVENTOUT,
-PortG,PG15,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CTS        ,                      ,               ,                               ,FMC_SDNCAS        ,DCMI_D13     ,         ,EVENTOUT,
-PortH,PH0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
-PortH,PH1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,         ,EVENTOUT,
-PortH,PH2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_CRS                    ,FMC_SDCKE0        ,             ,LCD_R0   ,EVENTOUT,
-PortH,PH3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_COL                    ,FMC_SDNE0         ,             ,LCD_R1   ,EVENTOUT,
-PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_NXT,                               ,                  ,             ,         ,EVENTOUT,
-PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,SPI5_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_SDNWE         ,             ,         ,EVENTOUT,
-PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,SPI5_SCK         ,                 ,               ,                  ,TIM12_CH1             ,               ,                               ,FMC_SDNE1         ,DCMI_D8      ,         ,        ,
-PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,SPI5_MISO        ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD3                   ,FMC_SDCKE1        ,DCMI_D9      ,         ,        ,
-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        ,I2S2ext_SD       ,               ,                  ,                      ,               ,                               ,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,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_DIR,                               ,                  ,             ,         ,EVENTOUT,
-PortI,PI12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_HSYNC,EVENTOUT,
-PortI,PI13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_VSYNC,EVENTOUT,
-PortI,PI14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_CLK  ,EVENTOUT,
-PortI,PI15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R0   ,EVENTOUT,
-PortJ,PJ0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R1   ,EVENTOUT,
-PortJ,PJ1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R2   ,EVENTOUT,
-PortJ,PJ2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R3   ,EVENTOUT,
-PortJ,PJ3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R4   ,EVENTOUT,
-PortJ,PJ4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R5   ,EVENTOUT,
-PortJ,PJ5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R6   ,EVENTOUT,
-PortJ,PJ6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_R7   ,EVENTOUT,
-PortJ,PJ7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G0   ,EVENTOUT,
-PortJ,PJ8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G1   ,EVENTOUT,
-PortJ,PJ9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G2   ,EVENTOUT,
-PortJ,PJ10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G3   ,EVENTOUT,
-PortJ,PJ11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G4   ,EVENTOUT,
-PortJ,PJ12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B0   ,EVENTOUT,
-PortJ,PJ13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B1   ,EVENTOUT,
-PortJ,PJ14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B2   ,EVENTOUT,
-PortJ,PJ15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_B3   ,EVENTOUT,
-PortK,PK0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G5   ,EVENTOUT,
-PortK,PK1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G6   ,EVENTOUT,
-PortK,PK2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,             ,LCD_G7   ,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,
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7            ,AF8               ,AF9                   ,AF10           ,AF11                           ,AF12              ,AF13       ,AF14     ,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/2/3/4/5/6   ,SPI2/3/SAI1      ,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH                            ,FMC/SDIO/OTG2_FS  ,DCMI       ,LCD      ,SYS     ,
+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          ,                      ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,           ,         ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                 ,                 ,USART2_TX      ,                  ,                      ,               ,ETH_MDIO                       ,                  ,           ,         ,EVENTOUT,ADC123_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                 ,                 ,USART2_RX      ,                  ,                      ,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 ,                               ,                  ,           ,         ,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             ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                  ,           ,         ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                 ,                 ,USART1_CK      ,                  ,                      ,OTG_FS_SOF     ,                               ,                  ,           ,LCD_R6   ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                 ,                 ,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                   ,                  ,           ,         ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,LCD_R6                ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                  ,           ,         ,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        ,I2S3ext_SD     ,                  ,                      ,               ,                               ,                  ,           ,         ,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   ,         ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                 ,                 ,USART1_TX      ,                  ,CAN2_TX               ,               ,                               ,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      ,                  ,                      ,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   ,                  ,           ,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        ,I2S2ext_SD       ,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         ,           ,         ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MDC                        ,                  ,           ,         ,EVENTOUT,ADC123_IN11
+PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,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     ,                  ,           ,         ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                  ,           ,         ,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 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,SDIO_D0           ,DCMI_D2    ,         ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN         ,                 ,               ,                  ,                      ,               ,                               ,SDIO_D1           ,DCMI_D3    ,         ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,            ,         ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX      ,UART4_TX          ,                      ,               ,                               ,SDIO_D2           ,DCMI_D8    ,LCD_R2   ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD       ,SPI3_MISO        ,USART3_RX      ,UART4_RX          ,                      ,               ,                               ,SDIO_D3           ,DCMI_D4    ,         ,EVENTOUT,
+PortC,PC12,             ,                 ,        ,            ,         ,                 ,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 ,             ,                 ,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 ,             ,                 ,        ,            ,         ,I2S3_SD          ,SAI1_SD_A        ,USART2_RX      ,                  ,                      ,               ,                               ,FMC_NWAIT         ,DCMI_D10   ,LCD_B2   ,EVENTOUT,
+PortD,PD7 ,             ,                 ,        ,            ,         ,                 ,                 ,USART2_CK      ,                  ,                      ,               ,                               ,FMC_NE1/FMC_NCE2  ,           ,         ,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     ,                  ,                      ,               ,                               ,FMC_A16           ,           ,         ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                 ,                 ,USART3_RTS     ,                  ,                      ,               ,                               ,FMC_A17           ,           ,         ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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      ,               ,                  ,                      ,               ,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          ,                      ,               ,                               ,FMC_D4            ,           ,         ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                 ,                 ,               ,UART7_TX          ,                      ,               ,                               ,FMC_D5            ,           ,         ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D6            ,           ,         ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D7            ,           ,         ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,        ,            ,         ,SPI4_NSS         ,SPI3_NSS         ,               ,                  ,                      ,               ,                               ,FMC_D8            ,           ,LCD_G3   ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,        ,            ,         ,SPI4_SCK         ,SPI3_SCK         ,               ,                  ,                      ,               ,                               ,FMC_D9            ,           ,LCD_B4   ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,        ,            ,         ,SPI4_MISO        ,SPI3_MISO        ,               ,                  ,                      ,               ,                               ,FMC_D10           ,           ,LCD_DE   ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,        ,            ,         ,SPI4_MOSI        ,SP3_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          ,                      ,               ,                               ,FMC_NIORD         ,           ,         ,EVENTOUT,ADC3_IN4
+PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,SPI5_SCK         ,SAI1_MCLK_B      ,               ,UART7_TX          ,                      ,               ,                               ,FMC_NREG          ,           ,         ,EVENTOUT,ADC3_IN5
+PortF,PF8 ,             ,                 ,        ,            ,         ,SPI5_MISO        ,SAI1_SCK_B       ,               ,                  ,TIM13_CH1             ,               ,                               ,FMC_NIOWR         ,           ,         ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,            ,         ,SPI5_MOSI        ,SAI1_FS_B        ,               ,                  ,TIM14_CH1             ,               ,                               ,FMC_CD            ,           ,         ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INTR          ,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 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INT2          ,DCMI_D12   ,LCD_R7   ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,FMC_INT3          ,DCMI_D13   ,LCD_CLK  ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,            ,         ,SPI6_NSS         ,                 ,               ,USART6_RTS        ,                      ,               ,ETH_PPS_OUT                    ,FMC_SDCLK         ,           ,         ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_RX         ,                      ,               ,                               ,FMC_NE2/FMC_NCE3  ,DCMI_VSYNC ,         ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,LCD_G3                ,               ,                               ,FMC_NCE4_1/FMC_NE3,DCMI_D2    ,LCD_B2   ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FMC_NCE4_2        ,DCMI_D3    ,LCD_B3   ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,            ,         ,SPI6_MISO        ,                 ,               ,USART6_RTS        ,LCD_B4                ,               ,                               ,FMC_NE4           ,           ,LCD_B1   ,EVENTOUT,
+PortG,PG13,             ,                 ,        ,            ,         ,SPI6_SCK         ,                 ,               ,USART6_CTS        ,                      ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,           ,         ,EVENTOUT,
+PortG,PG14,             ,                 ,        ,            ,         ,SPI6_MOSI        ,                 ,               ,USART6_TX         ,                      ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FMC_A25           ,           ,         ,EVENTOUT,
+PortG,PG15,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CTS        ,                      ,               ,                               ,FMC_SDNCAS        ,DCMI_D13   ,         ,EVENTOUT,
+PortH,PH0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,         ,EVENTOUT,
+PortH,PH1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,         ,EVENTOUT,
+PortH,PH2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_CRS                    ,FMC_SDCKE0        ,           ,LCD_R0   ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_COL                    ,FMC_SDNE0         ,           ,LCD_R1   ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_NXT,                               ,                  ,           ,         ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,SPI5_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_SDNWE         ,           ,         ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,SPI5_SCK         ,                 ,               ,                  ,TIM12_CH1             ,               ,                               ,FMC_SDNE1         ,DCMI_D8    ,         ,        ,
+PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,SPI5_MISO        ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD3                   ,FMC_SDCKE1        ,DCMI_D9    ,         ,        ,
+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        ,I2S2ext_SD       ,               ,                  ,                      ,               ,                               ,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,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_DIR,                               ,                  ,           ,         ,EVENTOUT,
+PortI,PI12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_HSYNC,EVENTOUT,
+PortI,PI13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_VSYNC,EVENTOUT,
+PortI,PI14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_CLK  ,EVENTOUT,
+PortI,PI15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R0   ,EVENTOUT,
+PortJ,PJ0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R1   ,EVENTOUT,
+PortJ,PJ1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R2   ,EVENTOUT,
+PortJ,PJ2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R3   ,EVENTOUT,
+PortJ,PJ3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R4   ,EVENTOUT,
+PortJ,PJ4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R5   ,EVENTOUT,
+PortJ,PJ5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R6   ,EVENTOUT,
+PortJ,PJ6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_R7   ,EVENTOUT,
+PortJ,PJ7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G0   ,EVENTOUT,
+PortJ,PJ8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G1   ,EVENTOUT,
+PortJ,PJ9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G2   ,EVENTOUT,
+PortJ,PJ10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G3   ,EVENTOUT,
+PortJ,PJ11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G4   ,EVENTOUT,
+PortJ,PJ12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B0   ,EVENTOUT,
+PortJ,PJ13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B1   ,EVENTOUT,
+PortJ,PJ14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B2   ,EVENTOUT,
+PortJ,PJ15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_B3   ,EVENTOUT,
+PortK,PK0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G5   ,EVENTOUT,
+PortK,PK1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G6   ,EVENTOUT,
+PortK,PK2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,LCD_G7   ,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 09c9c8ac3038bba46fa7b57634eff3ed646bacb4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 4 Nov 2023 11:00:06 +1100
Subject: [PATCH 0531/3129] stm32/boards/stm32g474_af.csv: Fix final row ADC
 column.

The original file was missing a trailing , on the final row.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/stm32g474_af.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/stm32g474_af.csv b/ports/stm32/boards/stm32g474_af.csv
index 34ab2858374b3..5853f5f9008af 100644
--- a/ports/stm32/boards/stm32g474_af.csv
+++ b/ports/stm32/boards/stm32g474_af.csv
@@ -106,4 +106,4 @@ PortG,PG6 ,            ,                      ,TIM20_BKIN
 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
+PortG,PG10,MCO         ,                      ,                                 ,                                                ,                       ,                                                     ,                                           ,                        ,                                        ,                    ,                      ,                    ,                            ,                      ,                          ,EVENTOUT,

From ae3b1cfab1387c4d875ec67bdeda885f87e52967 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 3 Nov 2023 22:20:06 +0100
Subject: [PATCH 0532/3129] mimxrt/modmachine: Fix settings for the MIMXRT1170
 board.

These were not changed with commit c0b64a3f2 for using tools/boardgen.py.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/modmachine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index aa12f44d4786c..57090bda270cb 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -121,10 +121,10 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     }
 
     #ifdef MIMXRT117x_SERIES
-    machine_pin_config(&pin_WAKEUP_DIG, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
+    machine_pin_config(pin_WAKEUP_DIG, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
     GPC_CM_EnableIrqWakeup(GPC_CPU_MODE_CTRL_0, GPIO13_Combined_0_31_IRQn, true);
     #elif defined IOMUXC_SNVS_WAKEUP_GPIO5_IO00
-    machine_pin_config(&pin_WAKEUP, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
+    machine_pin_config(pin_WAKEUP, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
     GPC_EnableIRQ(GPC, GPIO5_Combined_0_15_IRQn);
     #endif
 

From e63d7189bc2b6dfa1e8f5a799d9f17e17f792155 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Nov 2023 15:20:31 +0100
Subject: [PATCH 0533/3129] docs/mimxrt: Change the examples which denote a Pin
 with a number.

This option was removed in PR #12211.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/mimxrt/quickref.rst | 44 +++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index ab8bf8831bbb0..578364c55a4ce 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -92,9 +92,7 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
 
 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'
+- 'D0-Dxx', or 'A0-Ann' for Teensy 4.0, MIMXRT10xx-EVK ns Olimex board,
 - 'J3_xx', 'J4_xx', 'J5_xx' for the Seeed ARCH MIX board,
 
 or the pin names of the Pin.board or Pin.cpu classes.
@@ -106,9 +104,9 @@ Notes:
 * 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.
+    - '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
@@ -146,22 +144,22 @@ handling signal groups. ::
     from machine import Pin, PWM
 
     # create PWM object from a pin and set the frequency and duty cycle
-    pwm2 = PWM(Pin(2), freq=2000, duty_u16=32768)
+    pwm2 = PWM(Pin('D2'), freq=2000, duty_u16=32768)
     pwm2.freq()             # get the current frequency
     pwm2.freq(1000)         # set/change the frequency
     pwm2.duty_u16()         # get the current duty cycle, range 0-65535
     pwm2.duty_u16(200)      # set the 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)
+    pwm2 = PWM(('D2', 'D3'), 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)
+    # Start with Pin('D4') at submodule 0, which creates the sync pulse.
+    pwm4 = PWM(Pin('D4'), freq=1000, align=PWM.HEAD)
+    # Pins D5, D6, and D9 are pins at the same module
+    pwm5 = PWM(Pin('D5'), freq=1000, duty_u16=10000, align=PWM.HEAD, sync=True)
+    pwm6 = PWM(Pin('D6', freq=1000, duty_u16=20000, align=PWM.HEAD, sync=True)
+    pwm9 = PWM(Pin('D9'), freq=1000, duty_u16=30000, align=PWM.HEAD, sync=True)
 
     pwm3                    # show the PWM objects properties
 
@@ -256,7 +254,7 @@ Use the :ref:`machine.ADC <machine.ADC>` class::
 
     from machine import ADC
 
-    adc = ADC(Pin(32))          # create ADC object on ADC pin
+    adc = ADC(Pin('A2'))        # 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
@@ -274,7 +272,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=100000, polarity=1, phase=0, sck=Pin('D0'), mosi=Pin('D2'), miso=Pin('D4'))
 
     spi.init(baudrate=200000) # set the baudrate
 
@@ -303,7 +301,7 @@ rates (up to 30Mhz).  Hardware SPI is accessed via the
     from machine import SPI, Pin
 
     spi = SPI(0, 10000000)
-    cs_pin = Pin(6, Pin.OUT, value=1)
+    cs_pin = Pin('D6', Pin.OUT, value=1)
     cs_pin(0)
     spi.write('Hello World')
     cs_pin(1)
@@ -331,7 +329,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('D5'), sda=Pin('D4'), freq=100000)
 
     i2c.scan()              # scan for devices
 
@@ -365,7 +363,7 @@ See :ref:`machine.I2S <machine.I2S>`. Example using a Teensy 4.1 board with a si
 external Codec like UDA1334.::
 
     from machine import I2S, Pin
-    i2s = I2S(2, sck=Pin(26), ws=Pin(27), sd=Pin(7),
+    i2s = I2S(2, sck=Pin('D26'), ws=Pin('D27'), sd=Pin('D7'),
         mode=I2S.TX, bts=16,format=I2S.STEREO,
         rate=44100,ibuf=40000)
     i2s.write(buf)             # write buffer of audio samples to I2S device
@@ -397,7 +395,7 @@ 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),
+    i2s = I2S(1, sck=Pin('D21'), ws=Pin('D20'), sd=Pin('D7'), mck=Pin('D23'),
         mode=I2S.TX, bits=16,rate=44100,format=I2S.STEREO,
         ibuf=40000,
     )
@@ -475,7 +473,7 @@ 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 = onewire.OneWire(Pin('D12')) # 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
@@ -505,12 +503,12 @@ The DHT driver is implemented in software and works on all pins::
     import dht
     import machine
 
-    d = dht.DHT11(machine.Pin(4))
+    d = dht.DHT11(machine.Pin('D4'))
     d.measure()
     d.temperature() # eg. 23 (°C)
     d.humidity()    # eg. 41 (% RH)
 
-    d = dht.DHT22(machine.Pin(4))
+    d = dht.DHT22(machine.Pin('D4'))
     d.measure()
     d.temperature() # eg. 23.6 (°C)
     d.humidity()    # eg. 41.3 (% RH)

From 47ed06bda21799b3378091c2a41a47b64187dfc0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 4 Nov 2023 11:08:37 +1100
Subject: [PATCH 0534/3129] stm32/boards/make-pins.py: Only support ADC1-3.

e.g. The STM32G4 includes ADC4 & ADC5 which is not currently supported
by the stm32 driver.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/make-pins.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 9f9950ff1746a..bfa22d7974967 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -49,6 +49,11 @@
     ],
 )
 
+# Only support ADC1, ADC2, ADC3 for now (e.g. cannot support ADC4 & ADC5 on
+# STM32G4).
+MIN_ADC_UNIT = 1
+MAX_ADC_UNIT = 3
+
 
 class Stm32Pin(boardgen.Pin):
     def __init__(self, cpu_pin_name):
@@ -134,7 +139,7 @@ def add_adc(self, adc):
                 raise boardgen.PinGeneratorError(
                     "Invalid adc '{:s}' for pin '{:s}'".format(adc_name, self.name())
                 )
-            adc_units = [int(x) for x in m.group(1)]
+            adc_units = [int(x) for x in m.group(1) if MIN_ADC_UNIT <= int(x) <= MAX_ADC_UNIT]
             adc_mode = m.group(2)
             if adc_mode == "INN":
                 # On H7 we have INN/INP, all other parts use IN only. Only use

From 6866d17d8f414140fd79be526c46ef236a29be06 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 28 Aug 2023 19:11:28 +0200
Subject: [PATCH 0535/3129] docs/samd: Fix the pinout for SAMD21 Itsy Bitsy
 Express M0.

And the "Pin", "GPIO" and "Name" key explanations.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/pinout.rst | 80 ++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 5fe1e14ecb374..272f7c58df087 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -17,44 +17,53 @@ 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     -
+  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
+ 21 PA21           D7   5   -    5/3     3/3   7/1    0/7
+  7 PA07           D9   7   7     -      0/3   1/1     - 
+ 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
+  0 PA00  DOTSTAR_CLK   0   -     -      1/0   2/0     - 
+  1 PA01 DOTSTAR_DATA   1   -     -      1/1   2/1     - 
+ 27 PA27     FLASH_CS  15   -     -       -     -      - 
+ 35 PB03   FLASH_MISO   3  11     -      5/1   6/1     - 
+ 54 PB22   FLASH_MOSI   6   -     -      5/2   7/0     - 
+ 55 PB23    FLASH_SCK   7   -     -      5/3   7/1     - 
+ 12 PA12         MISO  12   -    2/0     4/0   2/0    0/6
+ 42 PB10         MOSI  10   -     -      4/2   5/0    0/4
+ 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
+  3 PA03                3   1     -       -     -      - 
+  6 PA06                6   6     -      0/2   1/0     - 
+ 13 PA13               13   -    2/1     4/1   2/0    0/7
+ 20 PA20                4   -    5/2     3/2   7/0    0/4
+ 28 PA28                8   -     -       -     -      - 
 === ==== ============ ==== ==== ====== ====== ====== ======
 
 
 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")``.
+  as a number.
+- *GPIO* - The GPIO name, which can be used as argument to ``machine.Pin("name")``.
+- *Pin Name* - The boards name, which can be used as 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
@@ -183,10 +192,9 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
 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")``.
+  as a number.
+- *GPIO* - The GPIO name, which can be used as argument to ``machine.Pin("name")``.
+- *Pin Name* - The boards name, which can be used as 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

From 2c1f23820572e36a1d12597dff3261242fd6573c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 7 Sep 2023 15:59:34 +0200
Subject: [PATCH 0536/3129] samd/mpconfigport: Set MICROPY_USE_INTERNAL_ERRNO
 to 1.

Without this, error codes can be misleading.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 801408ed47e6f..91a7c1a10d879 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -56,6 +56,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_USE_INTERNAL_ERRNO          (1)
 #define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_STATIC_NODES      (1)
 #define MICROPY_HW_ENABLE_USBDEV            (1)

From 59afeb056ac3657eebfffc16136d7eedbbc378e2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Sep 2023 09:08:24 +0200
Subject: [PATCH 0537/3129] samd/machine_uart: Add machine_uart_set_baudrate()
 function.

Changing the baudrate requires a complete re-configuration of the Sercom
device, which is put into a separate rather large function.  This new
machine_uart_set_baudrate() function will be useful for future drivers such
as Bluetooth.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_uart.c | 159 +++++++++++++++++++++-----------------
 1 file changed, 86 insertions(+), 73 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index ada193020b94b..de6c92c5f5e78 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -49,6 +49,7 @@ typedef struct _machine_uart_obj_t {
     uint8_t bits;
     uint8_t parity;
     uint8_t stop;
+    uint8_t flow_control;
     uint8_t tx;
     uint8_t rx;
     sercom_pad_config_t tx_pad_config;
@@ -112,6 +113,85 @@ void common_uart_irq_handler(int uart_id) {
     }
 }
 
+// Configure the Sercom device
+STATIC void machine_sercom_configure(machine_uart_obj_t *self) {
+    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;
+    } else
+    #endif
+    if (self->tx_pad_config.pad_nr != 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid UART pin"));
+    }
+    #if MICROPY_HW_UART_RTSCTS
+    if ((self->flow_control & FLOW_CONTROL_RTS) && self->rts_pad_config.pad_nr == 2) {
+        txpo = 2;
+        mp_hal_set_pin_mux(self->rts, self->rts_pad_config.alt_fct);
+    }
+    if ((self->flow_control & FLOW_CONTROL_CTS) && self->cts_pad_config.pad_nr == 3) {
+        txpo = 2;
+        mp_hal_set_pin_mux(self->cts, self->cts_pad_config.alt_fct);
+    }
+    #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_peripheral_freq()
+    // baud rate; 65536 * (1 - 16 * 115200/bus_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);
+
+    // Enable RXC interrupt
+    uart->USART.INTENSET.reg = SERCOM_USART_INTENSET_RXC;
+    #if defined(MCU_SAMD21)
+    NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
+    #elif defined(MCU_SAMD51)
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 2);
+    #endif
+    #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);
+}
+
+void machine_uart_set_baudrate(mp_obj_t self_in, uint32_t baudrate) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->baudrate = baudrate;
+    machine_sercom_configure(self);
+}
+
 STATIC void mp_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, "
@@ -194,22 +274,22 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     if (args[ARG_rx].u_obj != mp_const_none) {
         self->rx = mp_hal_get_pin_obj(args[ARG_rx].u_obj);
     }
+    self->flow_control = 0;
     #if MICROPY_HW_UART_RTSCTS
-    uint8_t flow_control = 0;
     // Set RTS/CTS pins if configured.
     if (args[ARG_rts].u_obj != mp_const_none) {
         self->rts = mp_hal_get_pin_obj(args[ARG_rts].u_obj);
         self->rts_pad_config = get_sercom_config(self->rts, self->id);
-        flow_control = FLOW_CONTROL_RTS;
+        self->flow_control = FLOW_CONTROL_RTS;
     }
     if (args[ARG_cts].u_obj != mp_const_none) {
         self->cts = mp_hal_get_pin_obj(args[ARG_cts].u_obj);
         self->cts_pad_config = get_sercom_config(self->cts, self->id);
-        flow_control |= FLOW_CONTROL_CTS;
+        self->flow_control |= FLOW_CONTROL_CTS;
     }
     // rts only flow control is not allowed. Otherwise the state of the
     // cts pin is undefined.
-    if (flow_control == FLOW_CONTROL_RTS) {
+    if (self->flow_control == FLOW_CONTROL_RTS) {
         mp_raise_ValueError(MP_ERROR_TEXT("cts missing for flow control"));
     }
     #endif
@@ -278,75 +358,8 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         // 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;
-        } else
-        #endif
-        if (self->tx_pad_config.pad_nr != 0) {
-            mp_raise_ValueError(MP_ERROR_TEXT("invalid UART pin"));
-        }
-        #if MICROPY_HW_UART_RTSCTS
-        if ((flow_control & FLOW_CONTROL_RTS) && self->rts_pad_config.pad_nr == 2) {
-            txpo = 2;
-            mp_hal_set_pin_mux(self->rts, self->rts_pad_config.alt_fct);
-        }
-        if ((flow_control & FLOW_CONTROL_CTS) && self->cts_pad_config.pad_nr == 3) {
-            txpo = 2;
-            mp_hal_set_pin_mux(self->cts, self->cts_pad_config.alt_fct);
-        }
-        #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_peripheral_freq()
-        // baud rate; 65536 * (1 - 16 * 115200/bus_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);
-
-        // Enable RXC interrupt
-        uart->USART.INTENSET.reg = SERCOM_USART_INTENSET_RXC;
-        #if defined(MCU_SAMD21)
-        NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
-        #elif defined(MCU_SAMD51)
-        NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 2);
-        #endif
-        #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);
+        // Configure the sercom module
+        machine_sercom_configure(self);
     }
 }
 

From c35cc63366a924b818eaaf4f0bd1c11eeb236d79 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Nov 2023 19:00:56 +0100
Subject: [PATCH 0538/3129] samd/pin_af: Fix a typo in a conditional compile.

Thanks to @ricksorensen for finding it.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/pin_af.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index ca11e3b7a8f3b..a73c6591dd9a4 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -112,7 +112,7 @@ adc_config_t get_adc_config(int pin_id, int32_t flag) {
     const machine_pin_obj_t *pct_ptr = pin_find_by_id(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)
+    #if defined(MCU_SAMD51)
     } else if (pct_ptr->adc1 != 0xff && (flag & (1 << (pct_ptr->adc1 + 16))) == 0) {
         return (adc_config_t) {1, pct_ptr->adc1};
     #endif

From bea6ff82fadf37555a3a282105f861a914475bb6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 2 Nov 2023 13:19:09 +0100
Subject: [PATCH 0539/3129] tools/tinytest-codegen.py: Externalise tests list.

Remove port-specific test directories and excluded tests from
tinytest-codegen, and let it read said information from an external file.
This way tinytest-codegen is not limited to always generate tests for the
`qemu-arm` target.

This allows having port-specific test directory and excluded tests for more
than one QEMU bare-metal target.

The `qemu-arm` port Makefile was modified to work with the generator
changes and a tests profile file was added to said port.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu-arm/Makefile.test     |   4 +-
 ports/qemu-arm/tests_profile.txt |  16 +++++
 tools/tinytest-codegen.py        | 116 +++++++++++++++++--------------
 3 files changed, 82 insertions(+), 54 deletions(-)
 create mode 100644 ports/qemu-arm/tests_profile.txt

diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test
index e0f3a541695d8..cb5b0927c8c9a 100644
--- a/ports/qemu-arm/Makefile.test
+++ b/ports/qemu-arm/Makefile.test
@@ -13,10 +13,12 @@ CFLAGS += -DTEST
 
 .PHONY: $(BUILD)/genhdr/tests.h
 
+TESTS_PROFILE = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))/tests_profile.txt
+
 $(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 $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
+	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py --profile $(TESTS_PROFILE) $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
 
 $(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
 
diff --git a/ports/qemu-arm/tests_profile.txt b/ports/qemu-arm/tests_profile.txt
new file mode 100644
index 0000000000000..c55185a0eb3c5
--- /dev/null
+++ b/ports/qemu-arm/tests_profile.txt
@@ -0,0 +1,16 @@
+# Port-specific test directories.
+
+test_dirs.add(("inlineasm", "qemu-arm"))
+
+# Port-specific tests exclusion list.
+
+exclude_tests.add(
+    (
+        # inline asm FP tests (require Cortex-M4)
+        "inlineasm/asmfpaddsub.py",
+        "inlineasm/asmfpcmp.py",
+        "inlineasm/asmfpldrstr.py",
+        "inlineasm/asmfpmuldiv.py",
+        "inlineasm/asmfpsqrt.py",
+    )
+)
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index 7f6c86243badb..8178b5602058b 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -32,6 +32,12 @@ def script_to_map(test_file):
     return r
 
 
+def load_profile(profile_file, test_dirs, exclude_tests):
+    profile_globals = {"test_dirs": test_dirs, "exclude_tests": exclude_tests}
+    exec(profile_file.read(), profile_globals)
+    return profile_globals["test_dirs"], profile_globals["exclude_tests"]
+
+
 test_function = (
     "void {name}(void* data) {{\n"
     "  static const char pystr[] = {script};\n"
@@ -50,58 +56,55 @@ def script_to_map(test_file):
 testgroup_member = '  {{ "{name}", {name}_tests }},'
 
 ## XXX: may be we could have `--without <groups>` argument...
-# currently these tests are selected because they pass on qemu-arm
-test_dirs = (
-    "basics",
-    "micropython",
-    "misc",
-    "extmod",
-    "float",
-    "inlineasm",
-    "qemu-arm",
-)  # 'import', 'io',)
-exclude_tests = (
-    # pattern matching in .exp
-    "basics/bytes_compare3.py",
-    "extmod/ticks_diff.py",
-    "extmod/time_ms_us.py",
-    # unicode char issue
-    "extmod/json_loads.py",
-    # doesn't output to python stdout
-    "extmod/re_debug.py",
-    "extmod/vfs_basic.py",
-    "extmod/vfs_fat_ramdisk.py",
-    "extmod/vfs_fat_fileio.py",
-    "extmod/vfs_fat_fsusermount.py",
-    "extmod/vfs_fat_oldproto.py",
-    # rounding issues
-    "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",
-    "inlineasm/asmfpcmp.py",
-    "inlineasm/asmfpldrstr.py",
-    "inlineasm/asmfpmuldiv.py",
-    "inlineasm/asmfpsqrt.py",
-    # different filename in output
-    "micropython/emg_exc.py",
-    "micropython/heapalloc_traceback.py",
-    # don't have emergency exception buffer
-    "micropython/heapalloc_exc_compressed_emg_exc.py",
-    # pattern matching in .exp
-    "micropython/meminfo.py",
-    # needs sys stdfiles
-    "misc/print_exception.py",
-    # settrace .exp files are too large
-    "misc/sys_settrace_loop.py",
-    "misc/sys_settrace_generator.py",
-    "misc/sys_settrace_features.py",
-    # don't have f-string
-    "basics/string_fstring.py",
-    "basics/string_fstring_debug.py",
+
+test_dirs = set(
+    (
+        "basics",
+        "extmod",
+        "float",
+        "micropython",
+        "misc",
+    )
+)
+
+exclude_tests = set(
+    (
+        # pattern matching in .exp
+        "basics/bytes_compare3.py",
+        "extmod/ticks_diff.py",
+        "extmod/time_ms_us.py",
+        # unicode char issue
+        "extmod/json_loads.py",
+        # doesn't output to python stdout
+        "extmod/re_debug.py",
+        "extmod/vfs_basic.py",
+        "extmod/vfs_fat_ramdisk.py",
+        "extmod/vfs_fat_fileio.py",
+        "extmod/vfs_fat_fsusermount.py",
+        "extmod/vfs_fat_oldproto.py",
+        # rounding issues
+        "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",
+        # different filename in output
+        "micropython/emg_exc.py",
+        "micropython/heapalloc_traceback.py",
+        # don't have emergency exception buffer
+        "micropython/heapalloc_exc_compressed_emg_exc.py",
+        # pattern matching in .exp
+        "micropython/meminfo.py",
+        # needs sys stdfiles
+        "misc/print_exception.py",
+        # settrace .exp files are too large
+        "misc/sys_settrace_loop.py",
+        "misc/sys_settrace_generator.py",
+        "misc/sys_settrace_features.py",
+        # don't have f-string
+        "basics/string_fstring.py",
+        "basics/string_fstring_debug.py",
+    )
 )
 
 output = []
@@ -112,11 +115,18 @@ def script_to_map(test_file):
 )
 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")
+argparser.add_argument(
+    "--profile",
+    type=argparse.FileType("rt", encoding="utf-8"),
+    help="optional profile file providing test directories and exclusion list",
+)
 args = argparser.parse_args()
 
 if not args.stdin:
+    if args.profile:
+        test_dirs, exclude_tests = load_profile(args.profile, test_dirs, exclude_tests)
     if args.exclude:
-        exclude_tests += tuple(args.exclude)
+        exclude_tests = exclude_tests.union(args.exclude)
     for group in test_dirs:
         tests += [test for test in glob("{}/*.py".format(group)) if test not in exclude_tests]
 else:

From 9be0623d4ce518eead8ea477a4615cb8c3e357d8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 6 Nov 2023 15:06:28 +1100
Subject: [PATCH 0540/3129] shared/libc/string0: Don't deref args for n==0
 case.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

C99 says that strncmp has UB for either string being NULL, so the
current behavior is technically correct, but it's an easy fix to handle
this case correctly.

7.1.4: "unless explicitly stated otherwise in the detailed
description... if an argument to a function has ...null pointer.. the
behavior is undefined".

7.21.1: "Unless explicitly stated otherwise in the description of a
particular function in this subclause, pointer arguments on such a call
shall still have valid values, as described in 7.1.4".

Also make the same change for the minimal version in bare-arm/lib.c.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/bare-arm/lib.c  | 3 ++-
 shared/libc/string0.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/bare-arm/lib.c b/ports/bare-arm/lib.c
index 61d3be64e3f44..1574d5c902e49 100644
--- a/ports/bare-arm/lib.c
+++ b/ports/bare-arm/lib.c
@@ -110,8 +110,9 @@ char *strchr(const char *s, int c) {
 }
 
 int strncmp(const char *s1, const char *s2, size_t n) {
-    while (*s1 && *s2 && n-- > 0) {
+    while (n > 0 && *s1 && *s2) {
         int c = *s1++ - *s2++;
+        --n;
         if (c) {
             return c;
         }
diff --git a/shared/libc/string0.c b/shared/libc/string0.c
index a3b268e44164c..3909f70ed804b 100644
--- a/shared/libc/string0.c
+++ b/shared/libc/string0.c
@@ -154,7 +154,7 @@ int strcmp(const char *s1, const char *s2) {
 }
 
 int strncmp(const char *s1, const char *s2, size_t n) {
-    while (*s1 && *s2 && n > 0) {
+    while (n > 0 && *s1 && *s2) {
         char c1 = *s1++; // XXX UTF8 get char, next char
         char c2 = *s2++; // XXX UTF8 get char, next char
         n--;

From 4212799fd8bded69e5cf47faf2ebd675906ac151 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 6 Nov 2023 15:08:11 +1100
Subject: [PATCH 0541/3129] py/qstr: Special case qstr_find_strn for empty
 string.

This handles the case where an empty bytes/bytearray/str could pass in
NULL as the str argument (with length zero). This would result in UB in
strncmp. Even though our bare-metal implementation of strncmp handles
this, best to avoid it for when we're using system strncmp.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/qstr.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/py/qstr.c b/py/qstr.c
index 0ae08354a5de5..dc89013f86f86 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -233,6 +233,11 @@ 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) {
+    if (str_len == 0) {
+        // strncmp behaviour is undefined for str==NULL.
+        return MP_QSTR_;
+    }
+
     // work out hash of str
     size_t str_hash = qstr_compute_hash((const byte *)str, str_len);
 

From 03eae48847c61985afece342df971f149c8ffa42 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Oct 2023 19:13:11 +1100
Subject: [PATCH 0542/3129] extmod/machine_adc_block: Factor esp32 ADCBlock
 bindings to common code.

This is a code factoring to have the Python bindings in one location, and
all the ports use those same bindings.  At this stage only esp32 implements
this class, so the code for the bindings comes from that port.

The documentation is also updated to reflect the esp32's behaviour of
ADCBlock.connect().

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.ADCBlock.rst |   9 +-
 extmod/extmod.cmake               |   1 +
 extmod/extmod.mk                  |   1 +
 extmod/machine_adc_block.c        | 128 +++++++++++++++++++
 extmod/modmachine.h               |   2 +
 ports/esp32/adc.c                 |  92 ++++++++++++++
 ports/esp32/adc.h                 |  60 +++++++++
 ports/esp32/esp32_common.cmake    |   2 +-
 ports/esp32/machine_adc.c         |  10 +-
 ports/esp32/machine_adc.h         |  16 ---
 ports/esp32/machine_adc_block.c   |  72 +++++++++++
 ports/esp32/machine_adcblock.c    | 204 ------------------------------
 ports/esp32/machine_adcblock.h    |  22 ----
 ports/esp32/modmachine.c          |   4 +-
 ports/esp32/modmachine.h          |   1 -
 ports/esp32/mpconfigport.h        |   3 +-
 ports/renesas-ra/modmachine.h     |   1 -
 17 files changed, 371 insertions(+), 257 deletions(-)
 create mode 100644 extmod/machine_adc_block.c
 create mode 100644 ports/esp32/adc.c
 create mode 100644 ports/esp32/adc.h
 delete mode 100644 ports/esp32/machine_adc.h
 create mode 100644 ports/esp32/machine_adc_block.c
 delete mode 100644 ports/esp32/machine_adcblock.c
 delete mode 100644 ports/esp32/machine_adcblock.h

diff --git a/docs/library/machine.ADCBlock.rst b/docs/library/machine.ADCBlock.rst
index 56a468dd621b2..eb94362d5597c 100644
--- a/docs/library/machine.ADCBlock.rst
+++ b/docs/library/machine.ADCBlock.rst
@@ -39,9 +39,9 @@ Methods
    Configure the ADC peripheral.  *bits* will set the resolution of the
    conversion process.
 
-.. method:: ADCBlock.connect(channel)
-            ADCBlock.connect(source)
-            ADCBlock.connect(channel, source)
+.. 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.
@@ -56,3 +56,6 @@ Methods
 
    If both *channel* and *source* are given then they are connected together
    and made ready for sampling.
+
+   Any additional keyword arguments are used to configure the returned ADC object,
+   via its :meth:`init <machine.ADC.init>` method.
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index a1a0a9f736163..5bfdf65513819 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -8,6 +8,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_DIR}/shared/libc/printf.c
     ${MICROPY_EXTMOD_DIR}/btstack/modbluetooth_btstack.c
     ${MICROPY_EXTMOD_DIR}/machine_adc.c
+    ${MICROPY_EXTMOD_DIR}/machine_adc_block.c
     ${MICROPY_EXTMOD_DIR}/machine_bitstream.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_i2s.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index c4b2c3d9c5247..a04856bce2050 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -3,6 +3,7 @@
 
 SRC_EXTMOD_C += \
 	extmod/machine_adc.c \
+	extmod/machine_adc_block.c \
 	extmod/machine_bitstream.c \
 	extmod/machine_i2c.c \
 	extmod/machine_i2s.c \
diff --git a/extmod/machine_adc_block.c b/extmod/machine_adc_block.c
new file mode 100644
index 0000000000000..f80e2dae4cc75
--- /dev/null
+++ b/extmod/machine_adc_block.c
@@ -0,0 +1,128 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jonathan Hogg
+ * Copyright (c) 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 "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_ADC_BLOCK
+
+#include "py/mphal.h"
+#include "extmod/modmachine.h"
+
+// The port must provide implementations of these low-level ADCBlock functions.
+STATIC void mp_machine_adc_block_print(const mp_print_t *print, machine_adc_block_obj_t *self);
+STATIC machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit);
+STATIC void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_t bits);
+STATIC machine_adc_obj_t *mp_machine_adc_block_connect(machine_adc_block_obj_t *self, mp_int_t channel_id, mp_hal_pin_obj_t pin, mp_map_t *kw_args);
+
+// The port provides implementations of the above in this file.
+#include MICROPY_PY_MACHINE_ADC_BLOCK_INCLUDEFILE
+
+STATIC void machine_adc_block_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_adc_block_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_machine_adc_block_print(print, self);
+}
+
+STATIC void machine_adc_block_init_helper(machine_adc_block_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;
+    mp_machine_adc_block_bits_set(self, bits);
+}
+
+STATIC mp_obj_t machine_adc_block_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);
+    mp_int_t unit = mp_obj_get_int(args[0]);
+    machine_adc_block_obj_t *self = mp_machine_adc_block_get(unit);
+    if (self == NULL) {
+        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);
+    machine_adc_block_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_adc_block_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_adc_block_obj_t *self = pos_args[0];
+    machine_adc_block_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_block_init_obj, 1, machine_adc_block_init);
+
+STATIC mp_obj_t machine_adc_block_connect(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_adc_block_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_int_t channel_id = -1;
+    mp_hal_pin_obj_t pin = -1;
+    if (n_pos_args == 2) {
+        if (mp_obj_is_int(pos_args[1])) {
+            channel_id = mp_obj_get_int(pos_args[1]);
+        } else {
+            pin = mp_hal_get_pin_obj(pos_args[1]);
+        }
+    } else if (n_pos_args == 3) {
+        channel_id = mp_obj_get_int(pos_args[1]);
+        pin = mp_hal_get_pin_obj(pos_args[2]);
+    } else {
+        mp_raise_TypeError(MP_ERROR_TEXT("too many positional args"));
+    }
+
+    machine_adc_obj_t *adc = mp_machine_adc_block_connect(self, channel_id, pin, kw_args);
+    if (adc == NULL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("no matching ADC"));
+    }
+
+    return MP_OBJ_FROM_PTR(adc);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_block_connect_obj, 2, machine_adc_block_connect);
+
+STATIC const mp_rom_map_elem_t machine_adc_block_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_adc_block_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&machine_adc_block_connect_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_adc_block_locals_dict, machine_adc_block_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_block_type,
+    MP_QSTR_ADCBlock,
+    MP_TYPE_FLAG_NONE,
+    make_new, machine_adc_block_make_new,
+    print, machine_adc_block_print,
+    locals_dict, &machine_adc_block_locals_dict
+    );
+
+#endif // MICROPY_PY_MACHINE_ADC_BLOCK
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 6cace4f85187f..0744ef788979f 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -128,6 +128,7 @@
 
 // A port must provide these types, but they are otherwise opaque.
 typedef struct _machine_adc_obj_t machine_adc_obj_t;
+typedef struct _machine_adc_block_obj_t machine_adc_block_obj_t;
 typedef struct _machine_i2s_obj_t machine_i2s_obj_t;
 typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
 typedef struct _machine_uart_obj_t machine_uart_obj_t;
@@ -200,6 +201,7 @@ extern const machine_mem_obj_t machine_mem32_obj;
 // Their Python bindings are implemented in extmod, and their implementation
 // is provided by a port.
 extern const mp_obj_type_t machine_adc_type;
+extern const mp_obj_type_t machine_adc_block_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_mem_type;
diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
new file mode 100644
index 0000000000000..c5886624ecb5a
--- /dev/null
+++ b/ports/esp32/adc.c
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "adc.h"
+#include "driver/adc.h"
+
+#define DEFAULT_VREF 1100
+
+void madcblock_bits_helper(machine_adc_block_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]);
+        }
+    }
+}
+
+mp_int_t madcblock_read_helper(machine_adc_block_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(machine_adc_block_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;
+}
diff --git a/ports/esp32/adc.h b/ports/esp32/adc.h
new file mode 100644
index 0000000000000..ae5c0d3c378c5
--- /dev/null
+++ b/ports/esp32/adc.h
@@ -0,0 +1,60 @@
+/*
+ * 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) 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_ESP32_ADC_H
+#define MICROPY_INCLUDED_ESP32_ADC_H
+
+#include "py/runtime.h"
+#include "esp_adc_cal.h"
+
+#define ADC_ATTEN_MAX SOC_ADC_ATTEN_NUM
+
+typedef struct _machine_adc_block_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];
+} machine_adc_block_obj_t;
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    machine_adc_block_obj_t *block;
+    adc_channel_t channel_id;
+    gpio_num_t gpio_id;
+} machine_adc_obj_t;
+
+extern machine_adc_block_obj_t madcblock_obj[];
+
+void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t bits);
+mp_int_t madcblock_read_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id);
+mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten);
+
+const machine_adc_obj_t *madc_search_helper(machine_adc_block_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id);
+void madc_init_helper(const machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+
+#endif // MICROPY_INCLUDED_ESP32_ADC_H
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index f66c59e341c36..40ae98822d43a 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -53,6 +53,7 @@ list(APPEND MICROPY_SOURCE_DRIVERS
 )
 
 list(APPEND MICROPY_SOURCE_PORT
+    adc.c
     main.c
     ppp_set_auth.c
     uart.c
@@ -66,7 +67,6 @@ list(APPEND MICROPY_SOURCE_PORT
     machine_timer.c
     machine_pin.c
     machine_touchpad.c
-    machine_adcblock.c
     machine_dac.c
     machine_i2c.c
     modmachine.c
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 42746cb4bd689..b5233e4ddadd8 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -28,13 +28,9 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
 
-#include "esp_log.h"
-
-#include "driver/gpio.h"
-#include "driver/adc.h"
-
 #include "py/mphal.h"
-#include "machine_adc.h"
+#include "adc.h"
+#include "driver/adc.h"
 
 #define ADCBLOCK1 (&madcblock_obj[0])
 #define ADCBLOCK2 (&madcblock_obj[1])
@@ -136,7 +132,7 @@ static inline void madc_atten_set(const machine_adc_obj_t *self, adc_atten_t att
     madc_obj_atten[self - &madc_obj[0]] = atten + 1;
 }
 
-const machine_adc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id) {
+const machine_adc_obj_t *madc_search_helper(machine_adc_block_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 machine_adc_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)) {
diff --git a/ports/esp32/machine_adc.h b/ports/esp32/machine_adc.h
deleted file mode 100644
index 6d06486c30c63..0000000000000
--- a/ports/esp32/machine_adc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MICROPY_INCLUDED_MACHINE_ADC_H
-#define MICROPY_INCLUDED_MACHINE_ADC_H
-
-#include "machine_adcblock.h"
-
-typedef struct _machine_adc_obj_t {
-    mp_obj_base_t base;
-    madcblock_obj_t *block;
-    adc_channel_t channel_id;
-    gpio_num_t gpio_id;
-} machine_adc_obj_t;
-
-const machine_adc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id);
-void madc_init_helper(const machine_adc_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_adc_block.c b/ports/esp32/machine_adc_block.c
new file mode 100644
index 0000000000000..f2975ff2f21d2
--- /dev/null
+++ b/ports/esp32/machine_adc_block.c
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+// This file is never compiled standalone, it's included directly from
+// extmod/machine_adc_block.c via MICROPY_PY_MACHINE_ADC_BLOCK_INCLUDEFILE.
+
+#include "py/mphal.h"
+#include "adc.h"
+#include "driver/adc.h"
+
+machine_adc_block_obj_t madcblock_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+    {{&machine_adc_block_type}, ADC_UNIT_1, 12, -1, {0}},
+    {{&machine_adc_block_type}, ADC_UNIT_2, 12, -1, {0}},
+    #elif CONFIG_IDF_TARGET_ESP32S2
+    {{&machine_adc_block_type}, ADC_UNIT_1, 13, -1, {0}},
+    {{&machine_adc_block_type}, ADC_UNIT_2, 13, -1, {0}},
+    #endif
+};
+
+STATIC void mp_machine_adc_block_print(const mp_print_t *print, machine_adc_block_obj_t *self) {
+    mp_printf(print, "ADCBlock(%u, bits=%u)", self->unit_id, self->bits);
+}
+
+STATIC void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_t bits) {
+    if (bits != -1) {
+        madcblock_bits_helper(self, bits);
+    } else if (self->width == -1) {
+        madcblock_bits_helper(self, self->bits);
+    }
+}
+
+STATIC machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit) {
+    for (int i = 0; i < MP_ARRAY_SIZE(madcblock_obj); i++) {
+        if (unit == madcblock_obj[i].unit_id) {
+            return &madcblock_obj[i];
+        }
+    }
+    return NULL;
+}
+
+STATIC machine_adc_obj_t *mp_machine_adc_block_connect(machine_adc_block_obj_t *self, mp_int_t channel_id, mp_hal_pin_obj_t gpio_id, mp_map_t *kw_args) {
+    const machine_adc_obj_t *adc = madc_search_helper(self, channel_id, gpio_id);
+    if (adc == NULL) {
+        return NULL;
+    }
+    madc_init_helper(adc, 0, NULL, kw_args);
+    return (machine_adc_obj_t *)adc;
+}
diff --git a/ports/esp32/machine_adcblock.c b/ports/esp32/machine_adcblock.c
deleted file mode 100644
index 8d5296e2e5c4a..0000000000000
--- a/ports/esp32/machine_adcblock.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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 || 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
-    {{&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 machine_adc_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);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adcblock_type,
-    MP_QSTR_ADCBlock,
-    MP_TYPE_FLAG_NONE,
-    make_new, madcblock_make_new,
-    print, madcblock_print,
-    locals_dict, &madcblock_locals_dict
-    );
diff --git a/ports/esp32/machine_adcblock.h b/ports/esp32/machine_adcblock.h
deleted file mode 100644
index 7c9249b072c18..0000000000000
--- a/ports/esp32/machine_adcblock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef MICROPY_INCLUDED_MACHINE_ADCBLOCK_H
-#define MICROPY_INCLUDED_MACHINE_ADCBLOCK_H
-
-#include "esp_adc_cal.h"
-
-#define ADC_ATTEN_MAX SOC_ADC_ATTEN_NUM
-
-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/modmachine.c b/ports/esp32/modmachine.c
index 1e83935a8bbdb..461ddacdad1d1 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -312,7 +312,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     #endif
-    { MP_ROM_QSTR(MP_QSTR_ADCBlock), MP_ROM_PTR(&machine_adcblock_type) },
+    #if MICROPY_PY_MACHINE_ADC_BLOCK
+    { MP_ROM_QSTR(MP_QSTR_ADCBlock), MP_ROM_PTR(&machine_adc_block_type) },
+    #endif
     #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 7b26df609d76f..06a1d7b0e2b61 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -10,7 +10,6 @@ typedef enum {
 } wake_type_t;
 
 extern const mp_obj_type_t machine_touchpad_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_sdcard_type;
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b4ec082092089..706baae5b29a2 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -99,10 +99,11 @@
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH  (1)
-#define MICROPY_PY_MACHINE_ADC_BLOCK        (1)
 #define MICROPY_PY_MACHINE_ADC_INIT         (1)
 #define MICROPY_PY_MACHINE_ADC_READ         (1)
 #define MICROPY_PY_MACHINE_ADC_READ_UV      (1)
+#define MICROPY_PY_MACHINE_ADC_BLOCK        (1)
+#define MICROPY_PY_MACHINE_ADC_BLOCK_INCLUDEFILE "ports/esp32/machine_adc_block.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index 9bb3196b37ba0..22d1fc475e797 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -30,7 +30,6 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_touchpad_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_sdcard_type;
 

From 958c6d917dac86e844458974e6faa8f9552c04f7 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 15 Nov 2022 15:13:29 +0100
Subject: [PATCH 0543/3129] windows: Use the MicroPython logo as application
 icon.

Add a .ico file with common icon image size, created from
vector-logo-2.png, and embed it into the resulting executable.

Signed-off-by: stijn <stijn@ignitron.net>
---
 .gitattributes                    |   1 +
 logo/vector-logo-2.ico            | Bin 0 -> 170356 bytes
 ports/windows/Makefile            |   6 ++++++
 ports/windows/README.md           |  10 ++++++++++
 ports/windows/micropython.rc      |   1 +
 ports/windows/micropython.vcxproj |   3 +++
 py/mkenv.mk                       |   1 +
 7 files changed, 22 insertions(+)
 create mode 100644 logo/vector-logo-2.ico
 create mode 100644 ports/windows/micropython.rc

diff --git a/.gitattributes b/.gitattributes
index e6d31d6aa31fc..fe0c4b47e0994 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,7 @@
 
 # These are binary so should never be modified by git.
 *.a binary
+*.ico binary
 *.png binary
 *.jpg binary
 *.dxf binary
diff --git a/logo/vector-logo-2.ico b/logo/vector-logo-2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..24b12812cf49e2dd31050869020c2a359152d2e2
GIT binary patch
literal 170356
zcmXuK1zgkL_dmX(84c1Kjev9sNVk-Pq;yIvF_0RKG$P$$fRuoMAZ#=Wk`hV`K}lf<
z$jJTn{(rvzJsx|!cJFKV+!N1x&UxK)UjP6QKmz#h0|dYUM$rI32;p~3%>UYgq(HzR
zq0iCrf9*H90Kk3{5TL61fA`e^fLwMEKwSL)?(+cvJ@y~~9R7c88UVmG9t5BvT>qo*
z2>}2oUxENBCPq3?a#nHx007m~)inL@?tfoWV#3Al$s2b7AevE6Q_URl{ZDCd1l!p)
zzC2VwQp&90#fRHwpU3yU`+0Xa3}kfNXs?7W`f_MEnb>&!nGbPuH<+!-s&NYN8Ih10
zg@0Uw9V+hd-p?qNZz);bJCaW|n%RjsT-ciMZ$5gEK+y?6Fm8h%0uo+Cn#lSrE}p%C
z_z`~xt}K=j%?Mngd={Hq{3W1>vSiGj>b-!^uCM|qo9w?k<``;CifEnymI{M^=%r>S
zm$iPdl7=R34QQm1?8J=$QIUwsD9ic3k8URXpW6gk4q%IM09nxEmRPZmDxjnwdyG~*
z4S{?%uP#`>u+w5qQwXat{X2o`9r162f0-X>Vc%V0G3nP-Ds=y51#nN}Pyjl;DWp%l
z>vJR*=4B+dl)$d8BqB?9paWT&JmnAg%>O@rqXUIZz?9rZYHWJMKOnemG#NX@j<kfD
zJq59MndZyg0>%Qj;Jq;~UtDkaF5(1Tn6RN0ETpu7b5JhOg$(>@Y@ZZNPwGZEq!9^a
zdy!a8qc*3r6oGoAItGb88$tyeL~NoHp=>TF78H{+WOY4Y+pohmRGz&>GeGX=P`O}d
z49Eux-*LoiP(`rEz1wY_5OAL?o4C7GGVnl$L(9)k^xnOD?`%6Vw#uGmoUKKdJBl*{
zqA0Iu$qxThCAqUQmUH-XSy544^!XQu`3|3@sw8!;drax+=@&8!cGZfdMjVS;S0cR;
z@#dlcqhTt-u<YDX5a%GxO>8Xa8ivOuDa*^h$xLi)6uoYnHIgz!+9qp0cL%L$?2>#$
zI`OWYY48%shyKqx5TO7lcTIR$Sl0~-OudbEG=WjvoV-@C7A8^wUa>D4IBz)tI;qDl
zTAc=lc{faIh8@HN1*c%)+m#Yzy(yOm-IGGgalfy7dX%m^H!^0$y7wioU0|05y`IzD
zD;q}zmkBY^@OEN?y$W~{G-AC6A>F5Jew}L65YPs944Z$C#N!0x`}b#?KJE%#|LItp
z@9ypnE}wi&O-;S`pUjbGE3aW8i%#<qvHng;mjp7>CD0SV1*4^1<=N?J`h6T28FN!B
z7I|CbYH4Zd!ccBSy6({N^535e7LO9A-q);F;!6VP#Pm#VQ=|?c@_U=t#rJma5x%RB
zjeAfi^rAn3BA62TGc)?C`rzy`^s?8mSav7%mYA#_rb+j6%YTUHF(UqGVeu{cDAgft
zX~$z|fLi5U_ljTXy(zd~*Dt1(Ur!3}5&PajC8l4Kk^~4>OqSd=Tl*Ni*O{O~L%MDG
zDEKAS_WeAOX@W5&8_zo0+P3fKi^_1s;;9v<MRuGNy{XvEor3;-!o*S(NVp7ls=yh@
z*H6R8CMJG;+-r3CT5=@wcWiRfW9hvcJT{stq&Sek6k8(*#KOXIQQy?7aPVzy@bgRI
z)7Rxu;mg@z`m^PynT=jWRBdp#k^dI<NC5o&=3-h0)({#Jav%ZRzq1;3>3dH~%1q}m
zsj}jd!0_;PvtbMv9ELKDaml!wxWB(YrkK^EG&4J^*4S|VBGTC>jj9+xMVSk(rAms^
zpuWeTRj9O9{NoS5jLf$PE96SB&|4>Z6cT9)=Mff8C8FS$yZ9Z_t*56a0ei*sJ0+br
z!4N<~`~+yJrUpDeKYtMpmw;eUy~8=I|5Ub6s>G@f9?)7_TNC<4^S|f=jP|`n-a6r*
zQc=1BTs=HCju8B(szHx*76y)081`K&Y7%|R4I^DaNr0N#+RD1>r{RJORn^sTs&Lh)
zC}pFq!B_hP1WAdDJ1VoQvZjC6HC=>=2Uh||cz$(w#4fH?SGKfd7yI`XdXz`zRaSCk
zDE-xK?E1}`Ct@w>>`-pJIsfZP`d&q1Vj?#D)9(R$SB63Y68LE>Q2xk=BEgsWk3y{b
zK^1v<OxIPZqO8*sTT>d;-{kz3nO7(GPIp6B!(K-n4c*$yw|kOugB_sWQ!e)(Pf`8R
z;lEH{SNF~W`QL(2Eg^l!ZRFk9`c>gRjFU4%xS(Stq`0x}@p7KM!}({+puV-H(4e4g
zhs*B^?;b^+l$5Yv&)fQQJat>YINdwFx{5fyb|~L};WjXgjHhR=m0N2W;jBM9IZ31W
ztO~Dih&um8MiM(-cF(q{q2XKfX}!Y`UrM2rhqf14^?Gf-{fwEJ*~CL<52Jr%tr80R
zf~Yw(7iul0>o+|W#uMYXarCuR(aX<|^Jti$p`xOq{!9xCK4D>sBn>;&M~@!8d(@pr
z!ik765ro9N(xSuF)z^ppTk>dFy^de}7%UtY7Y8U+{o`6L%~n0YAM+OZ#8r1h{W!(B
zM(50Ml>I=uqN}U0-FqPe(OOsMgbYzAjlf^7Z6(~Y$Jnl2Fg>rz%E?hDShb-68gpN?
zE57@%x48Cxexi!Yw>k^lb@k<OEE;~;d)cVRkUmPO&Zb9M49J0TVv=+_V5<BPH)OZl
zzd(KiXMufdlV-;EhOpRxIg-wmgMes2=Ey+TR@oO?9d`82>++0OULrPa$pqS_4<9DJ
z@{0J^TK?<r7qPAV)=8>p?a)v;G-g{PmX(ziarviXBI#T+m!3_J{J+_@z~!<qSFVPT
z4DFjR@*I+g=A(-j#>!&^WU-tA>*}5ivv^>R5Zi}`TNisxTYdOzF#-fU2u>*C;Awev
zRaI>3q;m23@m6)65SyHzD?zgL$pSh5)i+Msj~2pCrgh#nHp-S45iciB*9;Qk&V~+4
z-n2dWwgWg)aa&QfN%n)yls|aIWj}N|aAb!-JM+oc(|`YVE$zeH7F%9>6-5m|<+cg^
z)N<E^MLmbV+EUq*^7uL@EF{!Vh3@ZHzi#MQW&L(;X=__AX458E_9F0}<ZIM_Q^h=g
zbE8J-WCOZTtT>d8?;T!ztmXi{sANJbZk0Se+1=e0<ns0LnQQv=&*r+oC1YBw@9Ih9
z%Ew?H$oc7l!vY04xpo^7tU;=I?QkLb?~C&7=T*GVrF#;rL<#6;=5YtxO2m(XFAOW>
zm?4fUyQ)nj*B%x11o8)+8z&uWQHuIj8kJeAv$OOs#W1Jgr{C%=_ryM(<PdtQRZgZf
zE(j5|78bUdeevmRwfl!=g+O_P>ExF$v%nRii<XL88N5h5T$F-M)@PrXJmAjEBTJGK
zdbKrBc(od+`=^h$nu@YEwyv)3L<N678Sdh;L5k*JXP<M3IMTZQnJPA)`uzDxS{mi`
zXW^zfIp6O!p~1oFZ`&9DTYGU-3W8UWw^+ZAo>p{MXSy-tBtrtTplsb*EX_<B2vgNQ
zjuY9bVi8-H@p;ONjS9=bte96`7ibdLJ3KZ?W$v(Ri}U(u1hzn!IeNGJYE$5}q@;va
z=rV`z{>ca|TFL2QWeQ<&><W|wsN*7ER;aiX@Ol5tqRl~DNiPX3B&NHLcw`AFjA5lp
zB7G}5VppA)iZ*=kz{v2}cPd&B`r}mI71N(^r;=sAd|4ZPF<U<G5Pco|sk&N&5P1pC
za^^a!Z*^*_Vl8Z|be&B7_hqynDV}OT?8rE-M`TTkGUD-j<HmGSpJ0*mEYLEw9jWQx
zGg}NrvfPxWk5Soa3#iAt=kU&81~Zf*W)iFeG6seMe22XWA$Yu0G5_;teN$7@?VTN`
zkqi!>)t<XT65Di`Te|8wVIp9Z95TPE?|^e-YtbTB)@KlHTJyShbDeEBh<f``MX1e(
zjDm)h_rbBfEGMub39|79(20NCO<ARN8|$kfjS84oJO|4_h{*OKYi~+;>eKh=DUjXt
zr9V(e;F9+T%_4{G3kq^98HRg9875UG?jZdl+WBxqnRsV3OuCtJRMvhHoCi14i~`sJ
zHfgNeEgXq+LJG)zNP2jOB{2)b&rS+9OtN`v<!H5~vdDV?`vv<id<XnUb9@580#2jN
zZ1NldKx6^ODdfxr=ADcZ<DV(zA<9-yE?~47ztl$_^0be1z}1(1!#)A@9$Y21_zQmZ
zh(TQC0b$x@`Vv$E!;;MsEX`!_E^%n}r(3$*C|XjsLHfp)oR}_24_i)K%PY;pr+^VI
zui?EI>MSbWgyFzDvj512B8)_U94VU+TOkG}X0dd8J4cstf?wV2&sI%2$9Qfa-x?K9
zjRZuuE#wCFigC!#FRJIA73-0I7hHP{-$0UQ7p@c6(GYn6*k1hSyGW=8Pv*sM*puGi
z-9?)jpWO#-L{11zJ^bS&Qlz8oOm0P50a<4(2Jo}U0(q(RX`lca<lVIGZ_y59XPQyk
zJtJ?E%TcjDgJ+8hN3W-c5svh#e;p;NSi$1PNPU+Si{##RXQ3=ra-JEyY0Dlc2Sgx4
z!oYh2E8A_+jguDO#y#Xv`rTW_Mtw%FmiEu4>RLK&jE{B^lEq6<&Rxvl%sm|-RY<J!
z*Zt;K)2eoKy6&+iDe)Xoc^bl_fnK5^U<|1=XicS>2RdFEjrL$z=M0RNj!kYYZ;bm0
zBURThjlW|;Gt(+D_8&QMu-6rtY8knkA2%9L21g<?2YM48koI4EKOp7)*CJy><I$V7
zk|9b)5aWrX1d~+P9B|36%Ej*)5AIoK`TOF@WIobnr4LFC0F7zm;x0qk|MX&@Y|d*d
zXIFT40(#pWKaoPW-O}p;BI^(Di+0tkG6d)W2>OHhiL9%{nBJ0K*4#x1IGvWinH1;9
zT?MqH^bu47^Z^w_)Npge^a}>?h`zrTd~=xt58~*V?)NVS=z;zlZ>_l-WP((u{wedr
zR;^qUk30=jP3qmY=4-xG=9B#g{*QtyeC!FplYFxfB3?u$P6S!&QDKPv?YZTcJpF@m
zanZP$%<*q_1|QhO3_he458yXzFRwV<{im^^3)(K<r}rlS$u)*P_1?Y->KFHSlC1dp
zi-I$72vNlyn{{eOOAtSi4@g&1-aNoY22k*kKjsJ#Ng7^F=E%%kvj5cg{~K*FO`;k~
z;|t<VRXs#UadE634_&FY;4k?v2Y(Puz#^VJ4gd_g94s*F0WQrt1+d-UBe4gg?Y*$=
z!vCLxTlc$rVyL1RkAQ<k0KNBhnImXi<*g6Hn?RmxEnfjgIuw7*m<~0Q6KQ-J$(SD~
zZC&P3QvL->QS#?nhSpw-MA(0VPJ^Z4hB0KjQ$KlTC~5c|D$ZP0D#A$1{-j+N+cpb;
z`3S-kL{Ng-e}g$Z*}3W1OCHy&WdB&Ob$WUgR35&chtUK6r+BrB?-!aI@c5FMcP=vt
zk<@D&rvuSNs9PI1I+Vp9$CP(uA^(B;1CM3}(C3i09q!u}9^-0z)R2jk`+@l;`x8yF
zU$Rf{r|}=CDyUM3T|sjvs>QIGnS$^!Rg?+f;9WxRVwiiZUzIk|_W}a~_SqLx<UvwE
zn;w%{lG*3UW#m;F8q_rkTq7D!$a>vQqhCYqJ@s+6Kave#9Ry@wzUL#cLCX9FH&H*7
zjXlt;0*X#O!Wz-r;T$?$?#yTp8nArWm;2fBROMg`R8Ab~n{+U!)@xI>mG-?r^S|k^
zVBzL>)lJ`6ze)O`z>m~$)2UedxJsK5Qcj~`{x|d2%XxSHwXa0l$6l}giFtiTRJpYy
zg~+z$DIkaVKfkaF?0;}912tJmJ)zJ?h88>iGP-@M%p#V7rhCJu5n?<3xS`uInC%K@
zfp8OuAO5SnC0Kq)CopUXQ}50`_mEXQ(Ts8-T~yCSJGw|Z{pUh>)Ior@fBj}`YI4#s
z9ija()a<MbzsH_-uh3=3u_ZF#hP<(R3+uZAPTq1yGDwNX^dBiWSE-EsGOsFxYF1im
z4?<}cWtRlLYyW2)>K@bvGnu3UcB*?yi4;iUBYE{3oh7{pPiV<jjcuS_^xJ0p@ngMI
zTRUs;O;L<g_?pZgZ2d2BN5l;WDj^wbD;ZVP!h3J2AcCMRI|OY@Hqfe%qU?eug343o
zxknt=_TLuE{!EhPovg=goC`=|v1)JXmUv9YvMjVe(>~UhBOCUFJ%CPv#VF^{F$wU3
zl)%)j5YU;UCLXMYyKHU#q+zoS5EOECli-4w<kFuzuSk5I6gPNLMsu}BfxVg^^{@bx
z>*%w)NJh;|I%_AVkHr&QUjj{lN;5jb*%x}X$5-$WBq|_M2-Feb5{Y@%)`c!4CR+N-
zL2i;ef*XI%uuT+o16sbcAFR)ZMlcqnzL8|Ag~!mu`~etnFQ%xDC52<OG5o0Ny@0j*
z*kdtNtw;a3bAd$qHl*ap4*(=(X-$4I<22?IZ_e(5=mXue#|@cbI~Ho<S$G|f_#6u(
zlwfqzb~K_^a)iW0Tbi)_ab5w&18+Q(r&q!F2+CKMsQ#gf{o0F6wph_^sj8!6VW$Ji
z;a3(l&t3jL!zUEmgZkFj?-TWsmL%DkU+Y>8#7-<yp=#m?a*~N*y*1s49V2DzuGtnl
z=?mLG<?~_|D%y4C@TtbJ?;^AXVi@2SRkRMhjDFEt5e)Fii9SdK`&)NY8X5jqoBn(u
zw<>Dl?v>pRo6g{!C`p#M`=*y=-VYhaq~>+^@7mM-B_@Eq71{kQG_?xF+nwr&GI|iX
zQWsrsh*VFD@{_Ek<cVlt_CF#aEC~D1wZjS1l+5JFlTxvNt+Tk8WD;|qrd&1qd^2_l
zyLUKn_jT;7T8*P8yR9H3{Z3XP|Bqzin($51T~>@gbw7u(>g(Eke;^i$Vc>o-&dB>?
z%f`{db-@?qwHOJ=q543ab+rhY1L*KPg?R17-&&0+iz<*|dqSRt-;|dI4FL<6Fh=Re
z$~^OH(<IbAfVE5Et3yWSHdpK<sF#A>xD8vc+l-H@`Wa~qI&+!?8z>Mkdo@KH{aqVF
zQ$geC$(+|m(e&w#JuZiQ^s`oc=sQ=(l}Vb5EKs{47SoE|U|WY#qebuUW`Ni!B4A_3
z9T4JvM26t$8Z}{iikz_Fw#bi~>!%yMi;!g^X{_t-KMy#t4w&B&kLKKTk9$1R{dU#1
zIJKZdjhQ{>6+aH6fjEaE-0u1`(MzG9i(t4hrtpQoE%T{wsBxSRW_nrV!QB)lru~Fx
z!z2*K7L|{@TD;XN=`=4QkArh1c+FP8sU@XqvUI7{qE&)|(T$IqBS|7UIc5Fh61A~I
zJKyTL#-H*9#2?9Po(xs9O*R3dH0PF^)>w>}cBAS3BTEK7`t&HZV4ckHZa&4bUx0#|
zMB1sUDkL&MZuZ>Vk@)AjO2S}$Zwd`o05d&m)_}T;diEl+-)AtXluTZRR+HP;8)*!3
z0Q{y+B8^a98jcg;eR<|Ocx>f)ZkmwY@1J<H+cGCbQ8xVH`UNW?9q?^~ADxCGNn+j~
zMa590{K^N-(x6pH-)R1g1r3ItSUV}>SxpbUE9g7vyDyDR31RasHA$8Gt&!fWMzs_+
zI|cdRfCRWOL`zNZTP0-aGwtc>zSORUWN5^`J#OM#9~6=BM!)=ZvOZCBb{Zkl?N-xC
zfUD;4ISjZJZh0y2TvUaF-@WUs8EPD_@|I5g3IoDyd*kiJk>f!JXpuJTBL(hOUgc}q
z9C`w?k>kTTe56^2NVd$xfmz33iikyGnNKv>vE4qaBn{eU=%8IS-fW$er4Y-$AF1-Z
zBBjw~YESUKymtxF^Wu%FesI6wWQ?56x`1M3BaGMu6ks&i9ZhD6&L7jQ%+vuLl|-}7
zOh#yI?$~2Q_lIF-gbdIiGHq&3#V1LoI&BrpW1-!rEtC;uboJ7~El5gLt>!AMs^&U)
zkh@ue$dMj3H$tkY=(@ds+i&N>%mQ?`aB3Rt-J#w`i(f!?Bejz0xgKJ5j==@>cz#}p
zlOw5@*YBa>+!#ZE8SGy2;a4~1?3YyerIcGR>Q>>}bi`wFMACW}W5AyY6OXh5R!v<@
z&>#b8)*_@?T}?V=i>7o9CB)0@=<=M9W4xsn<4zTg88^p$k;9n1zE50{F@15L))}{1
zI5WB-+y`u`B#TI9I4seLkV3`pkceC28#EcOAu-V|EPl>B=T4!JqVJ>Htk_pY#`5d|
zqwE3QHTvSN)*m%SHz<q~>8a9{R49AWberGaj2x2{m?YP5+Z07L>PX`M@tJd<X2|jb
zJ`jrsuWLS!RnE{-CP{R(WMfwvLCheuEV=7LwG|>Rln`!=lq_N4#o1Ah-VVwE4GL0J
z6tl-wzRco@=q4enQi8h4$8g8nbbrTHf2aFs%X>l}(CV^nAPM@pwFO?|{~ayApOh%8
zExI(^0NPd%QKWRYL@T(MEQs=^hsqvJ#5j)Yd{WPCJA`n$INL-Ot49m|ERsjdznhc4
zi~{2Xa;R1mhbKFn{v$|lp_}3>tLm57M(n*qx8CUc;mu9rpb!(?RPgARM6FhC$W%HF
zN{LPfYyeZGz|uXKxe?(>1f;X=pwP*}KZ9ySxZLCpZv&%ZJ&9EK>d2Rdt^NZ*96e59
zhJ!SdJ}R7OuD#!ZGmm55Cl2YPD>3}HXt&RTK0u+ePWo?U)L^l^jbzq2?IF##<)&L+
zPMnTcCRwaCvsv~$I-t8Pif?r*2S7E9)&lCPi5=6(6TV03LENnpR0QLP>S{d{y~VBZ
zY5&q<TN5KhS=h4=!Tr38{hWl&6c~E7W(7WN5ce+{lK+quL-mGy(_KqhS~DK-^Dbbb
zftpr1b^4lWL+m0DK#~1h9R~hQGs0DxE)Bm+?G-K#)-^*N#tX>cev3;d^y8EK;jN56
zhOyVOl!V>LsBzWCk+^L3B4<~Ne_-gS{z+`$k9+8~M}RAuQE<TnO8lX7$`MSO%{>pD
z$a)0qIT0N%R(|p;Dfw<z8576GnN3J)hnMc?RL(y(0H->_Ndya*yuOXG`<W}|P0Ch+
z%$4Vir9ry)ZWDKqh=vR##bN6Yut#EA7kO8qv6JUOXfa?ogB|l!_u@+AXHpdt*Fxjl
z9Oamx!4(<cS`+J9A0_H7df{ta!mOKffSz(mWE+jDIE1<vQm&*C4&D`yg_sN)SBylc
z?eF?WDy50EFfn=v=aBU%cE(hvJq@J_oV#Mch+`x%<~1m^TT}<=BL&0LfE2b|26+|6
zn|YE_G&Zz^S}ArV&T*XJ%zOlaH!*hQR5VRyMDODZD_b9p?$?Lt)hPlCbFSUuNjY5)
z+1--3KlFiX`pQT6>N;N`cVkkG<Gag{AN&yhFFb+yrCdfTeDhhB@q+Jkd0N0G8lNLw
zg02N<8w6-elI@~_J0f|vx;2>kJ@Z*Q&Nb<?cL76M%VUGJLJZxNPvKXABg}ZFy|4@m
z*YVrrvILeyMj=rYc2wD4JGXf1>R5^;eYe9g7Q8&}!k%0yPO$isxgL@S54=ahC|Ps`
z4xSvRsKKsqexCb@P4<+v36hxO+yP9VSc(|N!5GCdqWUoL*9(z#HSYz7A>5sm=drOU
zHqF}ecAk3QD);hKWPP?$LjU5eW26+V0BT)Rh|VI-@0Sop`Zs(yLqv*G(IP-=&*@ik
zO4|hPuGeq_N!R>DOF}ozeRsyG&aM36xg<kCwT2qx>;=4~V=tRx0m*!==0ZX1)zl8?
zq?t~~Cz-GAh{JGDXZ&h{C&Wbp%HWDrq8<#hv>-Jso%%+-utw4pNxBdL`l?LT8<hR-
z>d!swJS!rQ&n`TXmMJaUr=GYXTb@i;3xaRh-mpn=#Sc}X<UJgS+=qJ$JWBe6X<qUt
zFr#%6^8_DO8V5uRLcr7BU5TD-E@*M*ex;NeasTfF-mdxsMsL|UD6)88#ENWu9m!7p
zCS=_5L2C4Qh<MffZ@8Y+%3o7jx-I3g#bA=^g|CxfKa}Tr@S;!W;j@6vh;3NnKl{ZG
z6lFG|7E$@7LX!>4@Vod(d->49IU*}+s|V{1XX|{`0dkBu=_(bHWKO;ccs+g~{u7?d
z)o$rW-iCR$a+MtXLsag^@>EYF6|i!uc-$=Fg+vsMAtTx{O|7Qd&+8|or=2zN?A?0j
z0M3Cu6X*Lr4L_tKR5>~ipc^2HpdVA;09lASPINAsYm$%uaE#rmi)rGjUyVa;s1}dT
zaiI)HM{bB(*quu)IWes95ZyBrzMF=s2uL!4e43fm-i}>;==mo$L8=ytyCoVkVxLqx
zfgOH~`1J_4_?AXG5(v<*5n&!27EJD8(DKvZp>9NO*Yzn4E*u#;f26PFR=b(xs*4ih
zv5bJ4luR4-t~A_yB(YxuMh5<7-Uqq^`!u=fqg5|hqIka-E<v)GDQHF*{V+ex3AHKe
zI3B=bL7PPx?pLZJw1T=eKd5QAadLF`5AzcaDS4$sVAyAa>5f0yG4#LVGC81IoLsSK
zR4iTr{b+5cOl~q21yj7kLpVfS9)f>H_SKr$sMXO5X+op$jN2jC(Die&Me#IEQbO%-
z*dVL8Er65KF3CWc+&h<ww|<Kv*~YQ`sKIQ^+`<TJWqyObW>~ySNj<0e?3kfO%^9ff
zSvVY8@QF&1*6>|iywF0nuE2&ZjdzoGxxLeWTPbuKh_r9-RO8MQc?<(V$|jK&HpwUk
z9HJ;DY)|_kIw9G0EzWfsH>8hKkc`<9NRD~QU6KtHZ=mUo<g5vYzey&~bk0H^)qVsO
zX*@@=itLCB&-Z_2DzIRrWsas%=;pa(pyeQH_WP3Zx$%fc*cA{MY?q0X>n}*m6||2<
z;GHcaNPd1XVXsy^r@N=J8Q<4{OqWO)5#V}ZN-p9rBNi}wy_O<xzp5V2;v*fEMZ|&%
zP1C?fC$}EQ5UO7(5+nmPlL4wB{M<v@pEI3LzRIS+8J^=n+EQfd$rYu@EVNXzPC$Lc
zmgJymCxvw`HMk{RC0a<N%#U&_d82ND(b_QSI$&hu{e`jcON-tv@MBiTe?ctJMD80T
zRVuN`^EX>uRp0RT7{jWE-ydTlHFX<@ocCUHPiNQD=FBp`-Sr+F?|(D3YGsLM7z6dV
z-MNYk4tjgMj>2<U+mQ2kloxdj>FWMwC+gja7m&u)!#-#VNO~uizbAVuA@6uhuKXF2
z6&ruF#Y0g+KTX-em8!Xz2Nk3d--r|)RFHnPQ>0mOu6C*;9Xo9RIzG4K{eY0>KFS0{
z{{5tann`;4fX^<hiWD&_RGMe%U;%Uh+#Hc!9XstnPQEnt8{>htduhL6O#N7riZAMb
z+4OR0&6DS!;%E<!+EJD?#cM9gciG+=DwikoJ25IlUA~15zqxebi(&Bmi-rngV25!F
z?|mk9N>W?XMl$5rd_QIKkC^Nt>&-9-Xw*D3^F*7r^zqeK#^k-<F@rkk00XHb*G-#y
z5Nn3zyvXqE*beOHd04DbKIIZAMc?FmmQ2Q3X)Hk&1cc^3q?Ps)UU0Cz_x6)_Z^$Ed
z5pP7=2>A_m@45V`G_*)@J@X8$0z<Yj;08h~dPu*2gx`}<ICOZxt1vYymTBSGE40a2
zZ}$%VnPxtF2Q$RHkdas*g{QVYHAH82?;d^~%Xj=n-Gw>j?>xAJ_$2%Npd2YJ^GN;Y
zOO?<2;!@;h+-t2<V7aY08*03F>cy2o%`hgIU%5f?HueE`jJ0mf-bV5`-^HK8VJ2-I
zfGm-dlR}jMj?Vvipdu$XDc8aVk><w}8%4W!4GAAZ0uK_*r_#mC3RgOuIj&A*5$BHz
z?8*CX6iPz5m(Q7l&h&yDAHH;jIA`gaDYmi62E78cvJW58PXof4X)i6Cd3kDq4(e6x
zUA#0=MANy$8=I{@-|Ra#B0HZ#rO$L=<DkJy1TSqmA1yGROwesJ6odT9fO{$`-Gr2@
zZn)XV+D7%At<>HP!wJ%;a?yp~u>VXW+5B1RuJj-__XNswD^ewg|HJg+!mZdXh4ua&
z%pw#x$QKLPMo*K$<3%KzXzpBbaU4X`?<%f$l*d&w(TCvP3iaSb?XI6~A0!!<gV%5n
zky0`H8;d=y?My|6=YOFf@jP77BU)&MF7gRatKM|AS@ee6MU4FSMlE#)&Yu*H@|7M+
zLVa8n6H&Osq=3E0iwq;sP+lwrw=mw%^4h90Qv>qrHnv&=W9F}F$xFITtPEB{0}FTp
zD(F#Mx~zw9nSZ_FOYXoi@UrktEKVClNI(xybw|=4Zk&1)VdB)}xk)5)M^r%%xlsb^
z0|-q=qm{@PgV58pWq{=sFzU#<^Ta&hE>GQVzF6!ARbnkg8Yh7K<OE%GXGU<dt-99I
z(InFx@4Ez4i}QM=2w%|6wTR8ud`+DUBM}Bf5!o3;1gi+8hbjq2kq0GUb{^wK9$PIr
zYTgwI;I2&arU7N9i)t2f%%}B3grh~cN^&Uj+fWVDQt6rMb}}xvBZ^Grv&bBQ0g9&l
z&q>J4qsw%E2&>S2A-9p0y7UE_zKN<o>hz-VTLg88#z~t|G*itTk0@<*^vL>ffmGzL
zrZq9D=J;pHgRdzhG096<KbbbxuOExtaTkWz)ezkGp`Y7|8=hllIua4&A3cd1N}F5t
zzDIF%4GNN~|6}`y{@9RBFEdHTIU#;0Hv8!@Cr`cmlkBv@`^jQgJTr)q&YvAb>xF*;
z&a@HFZc&cx{LRnQWL8eE`NP+C-T=wf#nLMs8YCEtB;fs!tI14Res)w64K%NmspiZv
zKD^xr3|Xna1W=*0;Q8<8va9aj(Jytk^jd9PZ8PUqVHUURDds1_8HYu+@~#;SWf@F@
zm!vWF@eS&uL|4}o7~}GU7t}cxpSmc*iFwC6p78Yi?InGtmca{on~`j+YQcAMhV#Y_
zWe&U@VOCLndFbbppt39)24D>c=4bbDABSjd7iZ0R++T38(?$Gz%KWx_xB+~h)!*l{
zpMLD6cA=3A>A?@+LhqgRPrC=%^}VqoeG6PRIz_+Q6kPl)l4|ILy|NFJ^R<<1iUQTR
zdaNmAre7t2#}bt*63f_=Ar)K_yJFxX`Yz8tq=<YqS=5|<qMZPvE|Z-K&D8oQCc)8o
zKDV48dIyr#Yj-+im1+ak+P7K(80vjk!1Zg_BI7Wwk|@EFkj|4M?>~u+_Fa)td`jJ*
z4~MaYU6Qq(+>OtlW6UyQTl0~#cQRBsXtRF7P=BcPMODj)*Cvp391JdY&9UYe%W6S6
z;{w^H-R2@auVQwk<NYYlFKg7qi9S#dJW|Ab55;_iHn)l?H2QO|;dE}8Th1Cv_S%$<
zG*u<mI4p4uO>XM<Ne`^KUgj~?z_rTgr+;vH1;C2{soA&&dft(LkBLl!ADnR{Q+Y7;
zK<IsbM<sEU9jtNfhMkE=99nGu9ax}FFqe{+*DhDxXTqZId}>CUh&-LaJlj$W3~|-Z
ztV91~X%3LJ3l>%Crn@;~?dfCraFF|FUZ+yfxC-EwkX0@W$!Rei#bEiG5sd{P;fDiR
zm8(XfYA=hM&D0+Z(&Ch7p8XiK!#vadT(uKKA#jq$m77Eo&S>?GD04r4YuC*=kQ+hc
zFmWp#UzwWiHTe5FKzp6}+g0Zz+r$d-qkwA{Y}B7*4Sh8`T@nT=X^=_wa#6sW-FFOv
zbE<L!Pr}<`4*e*&j9zQ=T8~hlP!3GmC;eH$Ub{Fw<W~o6@PSl%R>7eV?yn=lnQ>-J
zY#C~)ADxxU?1>#N<s)_}5&jfCCuIy*K21r958wFni)L7Xs8>kC?qa_djUL}O<@#da
zCuw>Xp=RX~)<n;R4*R`6$bZ5+x-bF;3hYy&QiHL5rOoesPe7c|vAJ&YvAl8qmV5`P
z;dsGrdfZAjvgKlrC19;SU~*4;&~>x2_OPBJ^nE}DttweS-f2oz5S%EN%Ougw>>5Lw
zK?tqyaYEd!XI#R^CIG)@uvPDPm`L1HceU_$vdwG)PM3fy_gigjjEPV0V}xI)B&od7
zetlI$rutEIr^lKl;Nn5RZuZoYSl5khh<apd0V#Nxyy-44L_RvtlSro9aW*8(5J)wV
zEbGR=7#^2H<@FQJySz2HD4>?aX}Wn61AYu56hM0Bfrmk;j2oO#FB$Z~il_$pEB)jG
z_an(m29H>aXc1S(UOx-G)cUC*_6rI3mMF1M-uMWZh=dh5uJzt#V6hQd#sfhG#6wQF
zxIlMkrpdK`JjwRyV6U+oAFq0}0x5q6`C0;YxJQ>EEcN)%MT+>&&HxU+8TX@jJ$RsY
za}Kj><`|MP?d;L!4j%TM(p{dMh`nOBdR+6faNXeeQyo)RUkj@ZbkhD6nCdf}KZL)%
zH$AWEBaNU14RJDUO%}yP>C`*b2|&aY&_8J4yS*oi{<7$(Cb_8*0%$60r{8Amu4%XS
zj&qs5QtnJ5L1kr8(lL@JVvA{UsR(PL!5+icPmo1~%e`PQ^&0zU$D~AG(@?Grn5f2<
z<H|8H`uzt7Sp>y{1iV3KOcGE<={?YXg-bKwTumKf&G{wNW(-B`FV}CFp6!02GZAmh
zysjiQJJ~iiKnLW}Rh0u>sy$LiJm8`NbMcI+J-`f1{Ja9c!J^WnHwr{dJ02lLUE04w
ze!n%@h^?@V|D=Qb3Yhzc)>iT1OjLlio!8!<Jg9(o4Z43h<Vk<Z*8Nk5Hs(Fahp3(f
zL$ooE$Q4^L##?SwDdB-*NTgy#0Gu{Pn^z)@q2}42B>T>$TaATG(;x#n@k8MOT6(qP
z`%I;883z?8ICN>zN}BYD65Slc0{qJ3j#7)BdP2Tv{Ol_=3)VOMEVzmWlExpz>3OGv
zuvnl2uO@ToX(sK>Vzxu|rwq`*K=UdczPy|&jB`WBrY*)$pO;~asFxm;RM}1mu;+-l
z!0{tJlXaqjrhgHXRdt0>b?53=^R_Z&OA_|a*4j>8;-mi<;dcGk|HyP-lc`l*SCK%d
zctHU?4;0x^jJL6a&GA8gbqOw?G22S<j6bsg1GKSIX_5|i02vS)v^p=_fdNLg#(g!{
zqlwynm8$9Cz_^`!BvXkZ8`W4+2?Oqu1goFc>h~+8^S5%!wXql@40WKZD)4b&(zD~a
z(62t*$J}dSx*6HueX@JAh-LI$%K_R+Ie~2}Pq_c)rRK_hg-dEyf^K(aLi>hWkK3(0
zHp&#v4Qy4kacfJUwNB2})=fo4bNLXa2osXXY4Yf-mPwTYN%<^N_<n7$aDcUJ4K>=~
zW5rjBHCu|aGRW*P4LXxH%DD|Z^ixcCQ`$V6;Fh`XwBDo+PENRS*9?51S~|D@{N6<O
zL?BwiUEiltDg6@-3SZyKA2_=2`itWBpzjVxugb8kR>DVOPe~uUOk$EPR@NjpHuKOm
z{sjYozD~}&Ct0x+PlYA@DAE>YlH-p;1WtG!Uf-h)uW#^Yypo24uQ(An3*3=IWw^&?
zXjlohVHSh44jA&~iTXhO1ETv_UgBfWmZwP}aP4!_LPYa-iZ8Ypo%;1d0SzM|S|lu;
zROA(M>1u$MX1$$G4Vc6FOvv=!8Gz@r=h1~zaH~)CdU|@mc{%3Ct^Tdam(7n%(p$gV
z&fTok;fMeHD>dZ-m~0}K+*6u|^tLT3$KV1_XS8LXoIWGegk(*HOVi)|_Og-$rTi7p
zUV$~3hYr^D34r_~eaL$(a8i|u0J&wN=q~zjkuXy0x7Y!S1VGuf>Uaw?WdMK*b}x$*
zMXIibr1&ezCC3r<Cw|gD=9Lq|lg<1W+Bh?AE-)+RTz+3TIgmAx#^NqDZNZBy=c+B5
ziHaiJuuB+K#8m*|1bq8UW_pecA1c@LfwT7sZAs9Zv?FqLtJ9G>mVIqpuvUMP%xN|*
zM2nT7mZfik`)w(CkQIAOKDU+}*B70l&#9;Lj~fPCw?>|*)OnyZzh5MN?rUd>3gNjr
zWEm@wevk|8`>6gzyhPz$W4>K7GojkF8Q>IO*ZK%!L}I$0W`}EFi|QN}+_okvqG-IQ
z7XMhf9OajS`Y9b`)fOu<I2J6QquR>3BY5Oc)lSGUQ2t^s6JgQOES%A|K2q{Y(ZqXL
zqHXuq(|FcXZ=t4Bxp?lGcF8|%RaG0U8_pS2kfJc17>(C*wtbmgR*W1q?|Gmwzq8@;
zXoddmRSIixnk{x?>7wxOGtMyJ4T3F#d3Mz^gyrghB4E|20-`C5cq)8ED9q;!%&7<7
z<sO39u{Bze5}jjfEuAb?u8s`17uNAcasASp4#m3Lp&AfMEk$TUr6!}E-aAz~Th11C
zpF|Q-WrObsm;(4lmP1tK!TTwDEASm+vlA!^Z~xK>HX?$g$U~3msJgwCU>upDp9*Kw
zA{U~h>~DNEdNw&BL(b<M0r-T<;#%?BsIf^{6T%%yo(yY1T)gHa_zh7-Q!eDuiOUY3
zz&AKC#7P))8ts}J$-rS_Uful_0nHQKr74ny#GY_4<8eVS7v*glNip&cLg`sQZuzA;
zpclS;MZCYAxTiv#nwos|Y@`lKNLoDaNJPcy`U7LC-BGksJWbtp0iV$U%WBP0x0J4A
zl|Hb4m`{~z>4uesv6Vd|anIGe#?z)cq7BAQ?i;^=@Mh}x$=n}-Ya#8$q}xVA6)g%%
zHSFR(S*9=m5{%yf>#>J#i~4?Ob8J}PT{bR;>(&%V@i$`25gi4}4-w1Qv02P(OEnAH
z_^XPKj^5C#qn7x>7^k5<)qbQVzzJF*1-N0@bQV_{Te076mk&`_P-<ri2|`he#bm<B
zZ>!bpPqOkcS6gQZ=5CX!z7{Rz9j_m$eEz5Wr4Uqyv3kJRB>!=*##TQU1t#@Y|I_-K
z-NU#$Q;S@z!~epU4#G_@@NTvD9|zRw=qCy5V?O$$$GvFHD!b)oAkyE+W(`2itOr6T
zR{X?C#)8u?vi_NGZ^-U0&c<^RoDJ=jsEX1l_woh&9S%NoGB|j(gZ(6o$$7ywai^)C
zDlo$y5BFKr<7SU#$h$#;-$+dnBw8n`U!};DMZX-vNQ)L7+-w`Y=a)T*t@lr|lpVk;
z!kAt<x^}}^(VTQhncPlynt7|<XGRhwy@LFM9w}$V^bxOKqAXR2%kPprE?zH%HeYEh
z+EJV~Os(>*M16{z@{~TXWa#V!NJ@zaf8hQEOrivhKe_+Ssi$n^AuQppA^mXQ?nv<8
zA=}fDrDh(X^abawvpwwclg?jUh~r0I;dB%hNN>@kdeQg_2h+EVj1kJXSunQTk{Rkn
z3e1K7;VY5{5Q48N)%(@iKXHdWR5Hq)zj?_ngU|WYMl|ge#>EmCe`x*c-g84drH|P0
z@j^e!N%sWv(^`!=vTM??#|nU_{JCPDQpf&P8nBluj<C^1iGXIZQ|C4kiKHCYMQ|r!
zk~8(S6uU*5!rMEy7-3pP(PiNx44cpMT%sNtH@Sj9o3E0oL8aNsfYcneFNQ9RC$yFK
zh8N4cl>#FNh7V8B^}?8g*O*@~f9~nVXHj+Aq}!009h0Luj0YTGxes@`k@Q|d7V#(f
zOYbL}b|cfk34jb$*5UXsGS4Eh#d1#fsjn^~w%PN@mFX$IV9J{MeVfpRlWK=>bGiQZ
zP?U=>CUpzdm87O7s}8!>yg~)iCDCQ8+N$(CPPz6#VA8ZIyb>>9Vm~Hlj@NpiEEX|!
zLc38$Oyk8Yt$lieR`IZ~#%}5eVzOVa)U}@nmOPYFO>Yco;oskH`3$pt-~GDliV3}7
zR`H6YEDFjQLA3gVdB@*T-K>_{`5k|Aug%vuGkTSYdz1Z>eyL?I<cUjCc@?4<3tx!4
z1;S}iWT>^Q{bfOj26l>dahaUYdRk^RRjBekB<i1@mE`>rl|x^8v~`Qx<3H5p)aCc+
zzbeu_|H7;X>HZ?fp4hHo;>+Ru0F?SUolHq07IrD`WCyEmo2Qhq`gmP*dHeCnvyb6v
zRqzUNjgpLYZul2d-}aoe`S8xgPZuhUgcTnAm!&?kkDF>nXAL>B7VCS;b3g5ok$jMZ
zT^O*ZmyQ#`e{q^;#Qc}y?(((t6=rywOfLna&b!+GYXoliqEY+1fRUbo8^|Q9j8+cV
z`ZwF4hXLb;+Wlg^AXt2wek?r187vgAqZcr)7H~-suyAa$z`cw4vFG?ryEBqA;<rdA
z##2yOgVa&_7}eQCJ>aeAh|1B4zG5GpXpa9gCm##b0qdG$T7N_Wf?OoCko)G<uPbGr
zr0M|XJ=Y7&qhySZz9LE^w5|L{$!xpVe=%bBA0wjKf`$XpwXaZtN$8ibxY^9O{wv+3
zR>nws>pzFjh@<|VZ3Ew?n8ZkP-&^cle5hrwz<^T>;4_<JFZc`zAeJ0ze?n#Y>KQ5R
z!%iYZIxdhc30(JFVkQv){d^xo2xcS3$nLT@5(g$7TR3UGEb6it^TC=fN##t?%ACB6
zJ)YFL9TZ1;ap{=w3p8skAM{ZgLpmsZ#XS8oH@icB{7>@jvaBpY5R*Tms5o2uqZ9f5
z9bj4)LZHlY4Y8aW?`heXv?bTC_=8tblJmXPdhQ11bL#qF^`O!W)T{|Ertp-uf)J7e
zDXzAxw_zH-Yh1dv@8i;sj~><BTfWSGM5V(Gc7Q9)DDsJ0kU2`2<~Ud*PwH$9cuf?c
zIOUxB8(y9-4;j;VnQuMF5Z8*+db)mgjCp>%{#C%OEySh1fZqGV=YN?xy!O%4lJbGH
zxi6XZ)LuPw<YoHy%&ERMN@M^$`!}WLD5LctT7<7J(1AzcROTCp8N@Y&ZKi7S8-f)6
z_}g0Pi^=f4L?F~Avbm8Z?=Y58(aDUW?QF<*f=E@5wj@l_E>MC!IN1{rZn7VqbzE4;
zrTn5o3+(+k;RomHHBnxATXrAi5w4JL{Us^c6*&v13#ugJpNlpnn~|S^76=O$cos#j
z-u-Z$<Xp#%ho{~YnUu_VxJ!X@;LQIwnIz_@`RjQd8l8%nOvSuE#?-;|a*|W#jS!m_
zh`)vfwnPG)pf5~lu9qfx6t|a9G(O8zzIhh>D|fzj1Uze66vsfmU5{L*2}0osx@ls=
zBo#KSDT8z|-&U#DEYnE39~^7=J=h{Ck@Rk9yq{AtAKL#)^vyx+@T#YduLwI;fgGEt
z5{YsMl}L#<rLKgeIOAr-?(m_$vDDZ01VBjs*oOA27`sI2{HbJ0zXxfVMH!wYDgt(Q
z-?HZatk)$Q%|)B@#%N?0u^DNy;*0;%`z5$7zv9Bb48lZJrFJ>kKoz6N2n9anK>p2N
z65NXocOCy3kPQIYBMbJA*NL%I$>olb?LHk!#BS%!736teV+LNKTNUAsUAUrWn5|57
zaDIP}P~ou$^pejMKVo(UJ5{D|iWeDKPqX~!;i>9(=Y9D%GS9#2<}Vl+BaD~>kPAfi
z&>k)<m4<_=`ioEGL5UT70FEfnGqoh+D#^$|=hGGwi-Lz_BOKt@<)AMav42f9+U1DW
z;HFY-uZ1vYYWH=Vq1;U5l5RLt3}WNEgwBVdB3iC^c4dmIlz>g%TRTNJoRV8^`i^z9
zF|nTRcdd2F{D_~Z?FPzb5$)&?igZE?Lp_{z=p!z*^}4Qy1%?vG$NAq&D%5V>7{&eW
zL-5%lfbT8<WzSev?TLQWSGJmsR(!Dj;PLRYt|;Gc444and-TRH&LNWANX4KZ8UBtw
zfI9x(dP7Uso#V{wz@PZv?tC$)qxxHtoW*LHK$ksgbcJ#MW96plBZK@&m<~ScL3S~?
z;~JdDK|*DCv-EMgMXzP>FJtvtWi;vPBPjlYTIuNLr~wKgsPi-2gC~;GAb3p^VbuLA
zw{H065GbY@a*x={A29;CzKYCvs||RYoH)#-+hOzc<&4gfbj|uEWlj3Ro@Si_NDblj
z(qQr4KN{R-SitU)i7CkD`N{I(4!uQdGxHPj^|V&Ez5RqgGFUW8vmb}g8dY%c)OYg8
z$Q1hf^K<=MH^i3ZeCNc!hO{U8EQT_92D>fr^eaNnJjK`qW+!}c@egN^H2otK!>xxO
zICvPe9y2N3&Uyj<<z`|*L_~x=jQ(<-x-W7mZ&y(~-~M*Ket2@WqKR$w8gO$=s&u2&
z7QBBW|C}c2XersZiH0_U?}A3#;Du>c>d^~bdgg%zZ+`N7z_#?mcLr3iSb>{PZPyCq
zZ!J3-Z^RX7$AMALDc5^oxT(L&hwvV(Y|nf0-v&uM)JXb_xbz>I=|NpwJYVEpi0e0*
zP_#q=gS3BH;^L~H(lTURgf}aurfBd<ZU1yBc5f~8hl<6uW*`|lYJf==QT43U8)o>4
zNpa5Cwc5Rk?|_4PL?K=elE&7P2F43>w6@QXYp^a3)_6nPinTYe5cwKWE*YYkSvOZ}
zZ3S0X)ezauP4x#74Ed@~**-)G+!!yGW_Ow8$k3Cs%WH9Y&AAzG^2jNY(^KqEVQilO
zru3|$BXfnDT7qLzgNdmA{EcSxH`2<E)rBmygbrOT5&Lti*VKQ;h<f`ZzLCPgqcd62
zC8^1gOvcxlXAuhhxFl{O1!JCLyunKu8k)+rPUyjngJv)lab?$|67#ZL97%o-cNoac
ztvP^e`Khrp2;ibW$&cGV<g3CiJ;fvwW#uukn3C^*vaT3yDP%rL9dStU09iGXY9Ym<
zK+5>rQzW&wJx6u@sV*vBvne0(SoIqHQ}JP1z6vhX-3<H^_7{PA$^GEgkY3I3qQb%#
z&kybHj6p+bJRu5c#|<oaZxv}-bY19r*DXxDoE8OJYF&A{YkFzsNoFX`$~JFyMP`T!
zqZh@Qq|+a?PtA$^bnjNppg9kKacZ1b-n;hu!H30beHwwU*1EkYDU^1V;#s_UHtS!s
zTIX+)fWzqZ?P{kTQ)`ygR4vDb)u&k$eVy_bU0RIJBaLe;f7tigVxE=73FHrqC85tp
z2G%Jm>*h>W?z95~_pWtPm<o*DYEs0{!8v8`ymQ{(vZZ4G1u=)W)0$ULSGu#}?Uz8M
z;;s*Zq%Iw&S*ux63ww)+*Vnm@_{msoQBeP0)<5qcg2J~9D;t?sqp9s9q4v@AAAH#g
zZ;DBYP%XOPg#^trdGR=|4L-ne3wRnpp8T0kiSrG2c(1;xa~&;;CdVqjgSK-N@#G!9
zs*<`Ok#d43(H^a&6*8zlz4kDXc&RL0AJS6+cx9Z#BE>Bn9o4(fMy~cOO$;}ffQ`#U
zQ|w`)g)yZQQ{P}=pX!Z^ER_E#<T9aV!UDEIR`T@j=Bi$m?>0sAH{U0bL<t7^F%E$J
z#8v$=*jxKx-!E#Y(2N9;T|n{bQ$OP8KAm!3Pj;vMuwOK#mSKAK=v3`ZX>+6zIqhu;
z%jni~o$;8jXO;u0{%Kc9Bp~cHtpC}e+KSQJWj0}<tbabQ>86>Te0Hy`4!x7{j{FZG
zCeI<{ghPRjLEKwi&d`2h_fB_$l-!b|T9h3wNG44-9Kb40lPWyLD2IiW?y|L)bG6y7
zvxrOeqp~FAn;fau-GFai*duyJLk^`DQ=4ethRng;I4+hWi#1SYpQv!CA3xy;xIDIp
zy^x`#*bUJe_m^|_U~(+cO{f1s(q|%aVqj-wlf(B6C~@sm(|2T92Wjk0R6Vl*0Vu^$
zO-)=qx9RswT=i6!=zDzC2G=hkZu%@|xsHe=<7^-|$ET@I`VW6%`qn_ui8R8SZ|~C?
zy^@=@5SlAu0#B&;^|xIPx44g~@^q*MQW)OcbM6|<p)*Sde5CDCiV%J;eg{5d;i1H@
zS~ZdIj{T+XX2mU*mljYT9l=kW)})uoY1dK`MR&d{^7hwl|ID=w$<pNP4ZPj+k+sYo
zSl@wa{ID$~8?E}>%0_`j%1D`*^Am@p<gdVxR}mhzN#k_;#~Key@*KN3^$y6G1^%Ez
zF)s}<A>>Yo<s9AIpNZ5RI=x~tjIUrs!glZVsZR$`G?Y|d=C=|uj64tHGpIa0<6mie
z9s>OFy5FLeu<)_FI^18^@9H`XTP3abasvb;j<+GH=^FQUWt|Bk#U>A&w)$eCz+^-=
z^fJTVpncJZf;jP>LSOl`EOqLBZQo({$HPp}LQ&U(o-p4ts^?7WvW*onv|kzp=}0jD
zkG=PRs-o-CgvmMQoJBGyQF0a}C<>C31W8H~$vGpElq?xRkqjb&WE7Ajpn@Pt1VM6?
z%<S@i{np#P=9|^MR!{#uGkuqjRduUw)j2ynd+(~^9GhZw|Fa0XG2Qd5-5ILf^Q*ft
zB;MHJBxr4R{7QPt^c(fLB@E3Q>YJUJEyCw0-D>jcn8tnbUYh%mbsnO)P0r}#O|w+z
zSw7F3W{ilO?P?*_>Rcyh6VXUh%Bwp6Jr;AJL~3%sg&~$>^E;X0>fG~#pETLb6~yu?
z$8yO*WHCl-y`(ucS}5eP$*p@NeDD_d@O#T!eL+<uA%->Al|RZ!J&`7>bXpEtCt0c<
z5x0{#i+ypP;pd2oi-|VvnM@7YfWEa!njj0I#v!)N@}{D1yv{T;$wM^u^6YHROIss6
zu}+tS8KU0Y)TOx;$5>Wb8@1??%R?t0L&X|Y#YV%h)Rx1=rM6#8LAnzfJ8@lkp83Ux
zs~`P^QE^8Se*(qFi2uy!R`Lr~&mtD0#LdOs{KW6aj63h2F`0=fRAo)lSRpFr6mh<o
zT_cE_`b23sL04za`b;5>08Q2BMNv#iRt8%^Q?fy^IU9EF{C;2jo>y+Z?%EN0Wf^Tx
zQA{+(_hL2UU9k=fbp@v-Nh^AejD1czqB$w|gwi*(YTb7^uSJAy^=;#?e9jZsc@bbR
zQ}&ibmFtFQ>(6Y`FY!z7W;sQR*igd~LLLkfD!ngjP0ujlGtlk#XZ=3+g_uK!yTfg!
zDfC+qFHbBh%D3qZv{HKJ(o6?!r-c~T7xbLrhNgB}oYzHro{LvKS5Uk0z!k&RJC}{J
zZuheGo?#TpXA;&B+fMe02g+Dl=26pb2AeC+57k}=O0q3}d6yE(m;Sb!WymRvfI)ft
zJJXAwbM?$-^Ndt^uNDLh)N&0Ysa4CjZSPoLx8fl~iGn|$GiV^IpF|yPkSC00jId<R
zydQk`+V&}DsE9JL$j~R^{>h7XeQPBGbSKYfZk;Zak-5_!`RRr4<0(p(R)h|qa^ZNc
zJm&v|nQWhEwZ|F|TR<9Ya;5X*Ci!#x4Z}K;Xv`0>L>Wt{Hw|NoDYOdl<Vv=z$%<6U
zrdJm*TCiS;v_~qjm+RE1UVMH*50?d9sfGwG@K?vCePy4z*UeOQjM*dBP#n$cLL46E
zWQsi1N$E5U5#x1HxFo#KS{FUe=G0CedK&8p#I;Syjt!wr80Y1NExK7?^L58C)Wnq@
zSJ@C25fr}j`{b3-t<+NCv`_k+?5CQsY<9wVwx9&`HRs@#y6zu^m-6WbjRX@5-|Di#
zI3nK<C9dO0O!(zpz>wQ&KMB8PPvsKHXG}m!!XU-nI@ZH-Kalzxo*3z{rH82BxbCN4
zLS>$O;~i0>9v4t!@WN4iuxC!_BpO0U^IAjQI!Pt$B+y>5HEFjq>hpgf|4Q~l=oV%`
z3x3llZ}AKxxrk)B!nPBwjT47O+*a2Sj*Hvc{`<wmY^ZsK?{ryEh?5!uFI{iZVR9~>
z?{K+8{Ph~z0S~S^%ig88TLu^Qa3{v8ZjF&Een^nUOpXd&Y%2R8jPu3t-H&qyZ@YBQ
zoU1mICs$su$8~-YwlIEqTtsO++uNm)pZJMX;yiwg%rz^DgOBWDXAIv`4~)XiqF>7i
zh(3uvhl0tjGEqC<#r-|n3}13)+GC^X;Wxhiy;l9WFsXdw&^^|>NrkEx$>ljK3F^^$
z7Wy=5tpZA(nVl_#i%=ieF}Teo%G)^&a#zKdWhfGG%ilt~7VI6>G;Fof=t1pN9%<zk
zD~&QHtkvox_0C`VxsWrF^me|q*-JvY2Fr|e5^Ed{9Xh`EF(mTDNhqSJ`;w~$`UgW{
z0r@yAW>I(FpvjK=`tf{irVMDHl8l)5m8+r9PRA9mh?3-|RSQf!O0*s>6v0kPM8QjJ
zc-WiR_qBGiiS;cmHGf#Kc*p9h(6d(OA|-F0#68hDj^ME$k0lm5*VIrsC=3+CP$Ye3
zU%@L#y}2B6!*_YIN8+lc=qBupLgPv!YHlkJ7@N|UmPXh=i2jadm+&ow9Di25fb<Fu
zcb06&SbxlB`OML+Px^da<tt?g@!wY0@!QNlw=>_ojMel+guMKc*}JB<wZgp^0l|D0
z#OTCq^PG*$a@EXvt0$K=X^Pk}eMZsERYkN%4W`DV2!yw0GRSiq(6gN*c0+{(>EB<B
zI#$ZMFkvQJEWw{?sb8XsqpkP-+dXtaQd7$6JE`}IW!5azt|pRN+Ab2gV?Lmsj(2}y
zyvICbBVo(@7Wd)9jScdoENZ+SzxEpHP=|+enAWXJ?7KpCi^r%l%ALd(5!-vpb?>&C
zCszx&ue;|-DtLr`Lp_K2I1R19<#URM24e?RV<6o}f)3)Th?YQ_&4+vf5iRB@?pt}&
z*q+VUcNUyHf<x@eyV%dQ*Cck^^QtRiJkmm;tHjxtWZO?AH*L9K>$D!!al7@`U{H#z
zR|A#VPZHG39Bggs&2VpX(ojoxNrsI)qFyVCRu8G%JjOUPzDdX6MS?bXKtty4=r6-}
zOk~hP8W70tR8={YODrJy(XQI!-R5yZUaxY2QGu)v%2J?A=ssFQB;D><wmt{<dj`Rx
zIF*?$wy%v7a)ifsz2Mo+?nP-+enMlE6pD_AKiWu>a~&@}+>g`yAajwyjtza&#x%%U
z@Q7seJ<WrRUxb_wP^8sX-w~6DE=hCTsyjc#A%A+ok$$%J>BiGX^C8|Z>9QR{7Et*3
zgs^U{vFBagF>qCUg%*F1&uG^`v|QJbB55E^AJgw;S<14Ww-HHi?eHxt;G5z8;jfu8
z&-_8-X%+?<`UPsX`Q!+y89aqZYBQ0aC?RSg167^o&wuH%s}-W!#c*(QFYx4$eR;?6
zX3q4W?5HR>8!gj!cC>f)M}_+6E%M^N;6M|!$ic7#e1_*60m5Go>Jl?#B(IZ9ZydlM
z{1CE+oXRxq{lYrRM7fyA)|i8K7AbL1z4w!xe}kwa<)*~4UHt~vGoBz%$C-K4jg&mX
zzHZFa$de+%nJ|L$(xNzwt|p5UKWEECum6;Kab0rn=fe9Y?4K={>~uvnlg6`LPRwV1
zw1j3g7CNl=-N<`sdL<*2wd!EdjLV@#9pwtjMa2y-^c_QipEV@H7HlFxVGd2b`JdzU
zy~uI>@EXleMp)C(CJtv7^fo$v%pR1HPRPE+&5@-$^`q^3{`lsPD|i?(E+f2^e#`X&
z`seenWuZTbwZkb}`SD@)lr2bc#tNQpJ0|e$d~7=G#IRco8z+)jQlp)6?PM66!dU;<
z=1y4ol$pof`mmxpr!V9lwbOP7&jTMj+ngnNN9s3~itqhz>#H}ll#tRgi{a5K+oPyH
zB2h`MGWaEnF?~WSy;rNdOG(`>7>Fi!nwN&28EbiS)!*f_B9|sBPq8??!6feTLs?(5
zPGX_{dY3(;MM6RqSHq8on>gzRYL>PB!)(U!c)WD8SDo7ib0WJwE2Tb-bG}J>{F7{d
z%{##yg>}yBrO3Vo_3<}_p`tw$p6jFcB-<;_sTpq)ahAV!Q(SRGOC$2b+9#a5x3WrD
zx0>WOY7^P<HQl9Mq0)`~V_o~9K-E%)|FtKW2kH5@;-Yc(5-@bnTT9Ju-lY+7Qqu|_
ziBHn2D7gIdOusBLbt<^rj2q>OM)IL=|Hk>WI8_x<hB%||-a%6VV{aJO0!RW*ee36B
z?HsTov5K<@0uT88j@j&6m)zRPuWEE<ow9QE2G13-lgAODxnL;Zx03ghRqvqIki6{I
zq^F4|7tGtf%l5=0dWya)FLJ25R3liF(dF0C#xnIxMMazOrw?~Xt>bUh_Ru$@+-Ald
zxcA{<-ctvjoroFivykM>Ux(E%B?$(FwLJufb8K@i5&RlkV8XOL?R~2DdFreGj!Xe_
z7+#Jnefe3*$L^d>E!rJ>6>musY3%Ye;s;x;R<@)@N+G^!8YD+wT~K6ODA#Hz9zMB8
zbNn6OWjl1Eb9rdQcdOd+l)ylUe4#HWhRl_!s92+rH7r5(cDxAhqzU1&SjT4vyQ*5Y
zOey^4EzJ6F<O!+HVFIFyOTiChQ7f8Qj~H)aUJYcz^Y~u9{HUyke83#Hx6!8Mpj&fA
ziByXvbkSf7N5v*z>E4`og?jrtueno}m6dSOha2|^-{@l-XXHt>#kMNhwu=jfJ%|hM
z+v#SZcE?8zY+w$!f7yEH5Tk&6N&L{cFw=i<%KxjHW}!txqCih7yE_%nUJp0zj|!=E
zulfbN{WWvz*5Z<O+RF-8<=!-^k84vGwz^Wfv@uBJDMq#Bk!WFA_3>%$KOw59ZF}pO
zJ2B(_iv09|y?(~J{>-rcL}#p?{q${N$;|zp_hnqFUtEN4b#>kHp)_&DH95ddlhGJZ
z!C^}d(XO8}ci9zJ#&@|ilcF(G^B|$Oj|HWP`0f<J^c309WxdX#%y<f1#^`7FRpe7<
z1IKtPX1p+@_nHm!UtIaxd<RGDWt-H?4Q)avhme%1{U3eGt^y_=RDPS%X*by{jU0t<
zs*si~%MEsjpRzPD{JMY@^oo?tEBo1AsBdI63yQGSx?5*k>MKv?SDuv)vnSmuQZ*(S
z4k9n3Std`(CDxU_Y|cq<gb-jYtx{+D-4tNZ!Rkuxn0+cFgMTqAqO6ddHGHTx3`1Fn
zCTOsU_-vB$(iEofOrl)-SK49k+ixSQ?~J2L-S2Uj5*MmVF?`N_YwL+Wo!`$nA?Na0
zjn?|0GFfy&qw$%14U2G6T8TGkOf3voD8f*D<~i2v!iA?J@8CL_5MO^MMVMC5&WEjg
zDX$Y#MWEXaw@o5T(L$SA;ugkzX$+F<HVxJ0s4cD&bE(%%dg0BT)}otZ<5;4MAI9;O
ztW5IYX;R=RC&Np%0aF}RT^pVZJE!UW)v<<iS}ez{Ml*7)R%%(F&1`7a2vI56;vVqQ
zTD_ZU4vML@$_O1}w83G2$|~A%#yOnO(K#xID}H<pV`@3v^K<*;)%Kd+ye6q?^8lW{
zzThw3mAUd;xL1bX8m7!Y{%m;nts+q)I|iefeNcQ0s%c7gU``{--3GB?G!twrzi;%<
zoFm3n?d+0|`tJ-o4t^vX9_Hu@JasatzE;<+_*zY?O*|a_JhT<{*C~Co*UQ?SVT%2J
z+KtH$`KmP3Hrf3)to;#zcLbPfH&~Rybt#8Mx<9gXuo@TLh+^&Ke~D8<7j5#)Xy+v1
zRv#UKd<F9%`pm9|m|2UtEx~<ah3QJ=5Hu^6UgiDGA2X@uqL3isHM_25`w=!D7>`}D
zT;8b9V;41o?1?2brt3=w_f{aCU=eE%L5?CB-QMdPf=nWFy@RSBKd`aw&KK=HXNef`
zP*b`}F3dZd*V4|qZS$ly=GpMNbI?&v@Og7;%Lm~~;RNE=4J?9`csE$P*r{F1jobZ+
zR4{si{q72JRm}!f?H<i!uYRzrlDZ+|(m_1q&Rlb>|1oN0u&;%Xl`>qRz>y?IlW&+I
ziNk7*n(BD0kmbgSc+O~UBelR0#~X`}*nRIqy99#6pDQ1r-4ttky_`EKVlI-FEU2!}
z7^-PE*y4{FiFJwgnjwMK>Ia&UI#a#ba`V>YAGDky3fT>86$eT#(~mX+#iPX1ImW_c
z*&3N?^(4wW^Q+)dNR{V>>vPr9jJ}+B!7marX3*H|S2m>wh_K(RhB*^=V5jJLE-CJR
z@|>x)QmIr@7{WOQqDN;6K+X1}6dUc1X{^vOB=~iz%0|sv^K`%tSKdmK0#BcS^9mhM
zetgHgzG6#aj9ZUi{jP5J9w}!~9@BoGkJpE1&f5|*5$>~<Zu_}9A6I{B({A1=e}^7m
zAG{#k?HuS9Hi5hJ{Mr-j5e>^8J_Bj|1+CN{a!2k4&0>c#dgnG)<SeH&3(7lKP(HB^
ze5PLyZkgh*VS7Zv7!^1(-M!Oz;T+Yfc2xiMuUA>~qSZZD`ju|QoWE6CUE*~t8rk`X
zQiCj7l%p1PzfH`mNY;&Y;Ya&z!H7X~o^2F8HsxGwn>RZdS{t3cE~8fOVjKLUtcW6f
z1M!7<Y?9+M#~U+0PAk81b;KfY-kTBfJ6YbSkeZix!gIW1SAQSZ?j+0~HU4u)aa~)2
zE1IAQ%2~5+0}iHAwc_4Urys3|-nPObZHTDWM(V3D3KZ=u!pph}gF-upVM2Ysi1y#w
z5*xm+>_1{@B9Qbc7|c=%Wv6b>PZw%LvwhrAd!4H<`2d$md{)QKxgx^7g?08OZ?hNo
z*JE-+k@g?z$&NGn;vI8>5AR@n;V59%@mp7Ue@&I~QAQMGZC>9gIfAVQJ8x0m_2@`k
zcuafaLs>NAf>kKWj;{K$u5hkacuQG?lzI4JQPjBP3p@cCVp&(FzMON^H@GbLvhnVD
zc7&S;kLuGN>9-dTB%l5|F<WF#xIcM<u1Kb&D(IJEE|6xyHOx7YM<-T+CS}}8uf&s@
z%}s3?Q0}^E922%@uwPcv@-n>qbv#z4cn1stlquHJ`<iM0=wf{#hOQF6-Ev3`JcNx9
z7MjHLG$CL%r|3x}4y<*xN#|W;d@=L$a_2pD_ckT-kQyp_84OX^6--K+&z2I_u{7dw
zTKepn`EBM*L7B|avd)qHk(W<dMjnaqZymM!Gw`YF$u*M(`1<Y~^*)$Q3~aU3h@BIA
zQus>_ReYLI>b~~gC%L->=<95BZ8y5T9+0|pN^9eFnMv!`&sGS}JY!&M&&HEIUmKZg
zN%Ipc&->cAt>;1EeW_<XMcyp@<X_V(cUWBa2x;!`?@895+SdOft)IEK|52s#USinf
z4vY1C+w0<X`gJ_}eRP)t%zROde(zn@*Mt~hG!gzJLO3iGkBw!l(>P1MPMwID{Hj>2
zoIW!P3Nfi)Grrj0Me&WxS){S$r5LUbp#mLU*gIP;LGj_d{$Gnio&v`+*c-_eG&kZR
zXN;XgJh@GD_{@&|#Gj<lvIYe(AA4M4xPke0Nj2>Q2ZONL8j3Sc_86J#0DnoC61AdG
zN7BddB;R(^4$wY(V^a0oSkTnHGkITvmik1%>Yc~rv+`KcV1h?3{kHpq!b9t$y8B!6
zE{m*ge5+X-oex}&PBzxY7ms7PF~nUMzOgmZxl+l-)_1huyOaGBue0ixI)|3$bp~JD
zz-YWtCfxJP7=^+5!Gw$(pS2B|$;IjvG+Le|`p%)2JBMYihhS%i32TS(3Pcp7DBct^
zaiKcimVH(pYTCc?zES9QTvfHCyl4ttF%h>U*M&)izOGr@r>)|GkqtNNPpYEC$ne_A
zh_A@DR%y&`oJ+#dz0ScD82O+xd^g4TtqYD1_IJ;+0}>|x>#CuXzURNEyC3oK?w(6+
z&2(;O^z3%$58cSp+b}!lS8nj_)Lq)GE$w1e3Dep!N`Q-l^4oW8twgE1vH}%}C!&-B
zQm9+KY`lIFI^FxG4U!kv;#{*wokECjRj(1H6X!@!yQq4q#vKyq^*x|JBlLJUv@Um|
zygyu=_Zr_U;0DH7)~{cNZiA;0OM-GV`wSP$S5U2;ROC@lL%y>N+FG|n7Pg-2YF#x?
z&|7*<JhSOJJIVN=Dn9E1?UG9;tIOtVmj(5W^~l)<xgMUD6*aH@n>`bwRuN<dQe<6Z
zK`*_dO60BZO?HL7Tvd*(TwZs^W!)sIDN?deOi<7Xwz>AKmj#Q>sy@TW8t+2`VWlg+
z$g6JGz*+Z=Uzz7PnK=n?$QAr${1${ae!dv$(pd@d=B{+asq5NL#~+@p8*KHCq<c{j
zj&hGOz(w$Q9`}pq<~^@1pJ!Zg-#Hg=ev83vGQ=FC4yriDTk~Ptn&f7x-<2Hd-nsT|
zaF~+ymt!FHYH!c`Fy{a>H-57K^g1Uw3yeUK6=hDRrh<gRvKUPYs@5}q!uz7F<brK=
z4NaNsug=4hXkl_9Lju7jf$iNVMEm_`ZJy;~VH4vTLidG#P<E1p*prohA<*|@7SoMC
zNn=pmCf!yXjXe&|wT#2~W*yJ$M)K92n$JkH@OJvAQXzQG>hhM7G_cj6vJ!3WjEFCr
zwN9GOP9QzVZ*ws3`Hi?uPxH`qKQ_+Gtg5Ex2Yyya&J3l(`v#YNXXX4!k5?txBSRJk
zFZAQ<dVRaJ-|jgdcsqQARlCK1bw&#<jh36_Lb)H^#&(ZvwN74Z=6YLiZ(f0~+qeD(
zf%~(ET8a4QC_;9PE!w1?J;NyOsx(bjYtuH+dquTruxd3oea!?T`RT^+R#hZ}l27Mr
z8Ung)G;~t5N;ZDV0Xgc^9bW@C683Pp2$U;VlpDQH52}2dCVcYB$x|3nzhII@FA=w%
zO%m}wq>Fv(KC5poik0HPu7!1Opom_%`mU7UN$R&Zq89?GzItWF+FTZWAN7!lpn-?G
z!BM;|kU4VMIm}dxJzk2`kcmYod`i>t;$Zy&^C*Mwe%leDS%p&%8ZWA-Scl$p5Ia%$
zqqxYq_>fCAEWL{x<Q2R1pOh;PF$W|u%MZ|wS1NqVLmZ4a_<r73vd3kpr4e{dqb)}`
zEF7)58dQIQ#WeEOREY0-@{_2|nb)4PaCPQp+>!S)MVDtb#pgwf(VM-ha2(a9Pu@Gr
zR@hh8;5MIKHgI0Dew>XZcgWe7d7f2iJt%CKF2iy}Y~O|5Z-dq8dBhs7V4k`|8t(FE
zr=+kV|KUuO8@S%DEA8MV3JJapL0ctn-0#-3JdJF|`=!SInDXYtCZ~j6TTh2tit9-P
zB+$3EmF2JBU}aaj`B`&LOhySOx3YU<KQrnPhjo4<{ppGG{>l1V>dImXFCvDE#7sWw
ziUla=nTUwbDBav2W_`nHj3$Y=Po88FyMBsyN<H^FM+Y-Cn>cIo+jl4X&^Q5Fg|*#)
z?*c#5c<t}yy@Ekd{4uo1E&2EpT_?R?Z%Obf-Mt}A#zc@-;wvw(?>QCv!;F6Nqq<hG
zyLPys32JW~>eZt8w-RWg`6qY#mdna2{Vsj=;eE3e6L#S|U5*6(fQjw#O;g=<3obV~
z5(?}Ec-}-1lQlgo(B9-a@lj25YH-Zz_hq?bWA91Kd+o0jcM|mUh*po4D&FPj*heQt
zUEWqyVqY0!#g%t%!dxEJkm+m=St=wTc79pWAQNtXt(^(4iBb%e0Yz=IwQuR#O|(mw
zzI~~}Gde@r*}3vL|CRaLuN}4a_=nu6j(*$<E4G6c<Uxe=J-8b0X@rI=Gf6o7DPSbt
zc#>N``qs#yEuT?fs8zpC$?ZMk=S}c%h(POs6Oq=6tJXv5;u6vdPa%u1SZ}vwr|NyH
z*?2V+A8Yj|hVUkY6%JqT(Q#>vRpnHDn(sh$VJWf7W`T;}y<aGkhP2#yW3p#xDQZ_*
znV-MgIoJz)w<vMJUeP)H4%!Oq^&8)By(~&dN$%b;P1SH)&C)LTl$@U8a6j!rQlR3y
zJ3?F`!_&m8jBFAzO}+t6jiJ5g(gW_kQYO50ImtM_=B3_v_(Mv}1DE|gvOOpJ@Z@zB
z3~`!}_imT2+787LZKkp;Kh{%W$a*mqkF)zh=rJWeZklo)y`jHShudjJM&5J1_84`v
z7ctJZ3tBu*Xf)UiMBJbFc@y#7`Xjm>f!jYQ7KG_DtCUs8VtA&ZGGG^aTT5Qk3HDm<
zQbdV)`hAqbh(tlC=Nyx5e~`)pWnrC<-M7<n>~9?r*)d(7ZhXSWo&CNiEP)u$-D2sM
zmv8dp%fy6jk;^Q+T6FhfC9W1M=080c9xIr%+mMjp>d>klE*yI1ZDz_-f1O2`@;zSO
z3wp6TsRV7;o(ztD92)$D!E$r)QOV2zXV3-tk=%NDx=4!e(FvtS>`z~^l$_>Ya=U;P
z%aOt5FOcm<z5OJ=`^wQ89k*X~`)tDcRgFiVCY*@Zgnr_;JJjOQ$e=5wsB(mc4)4|%
zkoz3v)@jF-zSoF0N#VRe8^8S1vOgorFyEd{w~b`yoqGRX{cP?*LONP-Ubiz}cSMrn
zGf}#jI!{F{{=Tei`Nf@jPgkCcazh*_2}_sx`Pmj{D{uGF*Nn_mh9@MV89NkA1oO(<
zMAs71)1@dpSL#r_DJw^Cq*8zrURW_Fp{5uw8}psq4+h$aMGNolYtHxUxjpJJX2eeG
zz*(d(@68%^oOsrdAA2lxuFXFI-+hj1jF$cQOM0bC+_Og8V*2G6#`Rn)Ir@&TGz=jN
zH`O!mIE1YbsA*I&)NB@4(N6iwCDA<2M#C>D<ohCp!z<RBaL)Leo^md}JIi7XPK@OQ
z^$%4X`B6(>eu{Z{)%;l(Tnv73rJGJSqLf$<WK;}ecWe#UUf}hWJsy9c^^#Oe{xXh@
zE%)Pj+9F!gM{FcPrwVp!VTU)>3&#md%_4Chd|KCl_xn+psQXHTXl<$+mKthtmluQi
zrP!!-?iLZmbk^HxqKZ_sB;2*fr%H;Ib{GDoPpNbCYE-q^T*unONW!@9!N!k{F_9RF
zLGLF*O(u9AimV55xpG_n4Q%t(>t%6c{ps8;AMSPcCRouh(0pMnu0<)Lj2>r>P>^g+
zkdV^KK~v-Ww%{OPSI2Ox+vRx4=ezV<$qfqSMmLEtYt5aV;J|K{uCW`p?%XJ9?ISxd
z6{V^va+ZHznL3bEepzzs$Op^X)=J~mitu|D(q#v^b75033?_;3*Ku_&IeaS3&|@cW
zhMgYF@5JpX8QoWA+**(A6TYFGRf?3-Z1spqSbu*>+%sp{g43jqwSei2SEAQ+&kn|g
zNn_BCWHqoN@!5V&nwN!fWJq|!G`O6}Yh8)-T7qp3elN=eChFX;JC0GDL9x1N#zZtP
z=7SRNt}rHbg?6~nzmQ#bN^~#eN=#X5%ROdR%%dsm3>xTGQ}>iBoucBd8zv}zVMw_o
zl7B&4ORb5=yacOkt~Eo-(l?YK_RcbS-uh;o<WDJZq3cb|_<QO!AC~Ts5n$n-vu99M
z5Qw=)ZS7l_Y|s^C5<7p8zgASwK9HAC^>VlStu3CstAH-Wd%U5!WPJaz^A%l^Pjm}k
z8pdeIPOPT9qa|D&LYsGMZKoX`y2<$BgK;+VtM#^hVF?1>QH9K*y@{u7-^jT7qE?Kj
z3F$NP1=EsDE|B^(U9`S8mg6V0LlH)zNw$F*_N?@St|3kY`7f-r+GH3kKX+NO&HqD^
zm!fFU$B()(4<5i6=WmyHubY}abT)sSvWoguyIVV4<b0tNs~);y<qKj-?0LD&WS)Wi
z3|m*Ubaa_x)Yo#051Q*I8uFex{u*G#OlNugEn$5?n|vBg+q>l;ok*|ywh=2yl*ku?
zKy8K=MZO(nY?2?B9QC&9#-ldC;JYKFsWAu@Xo(d4e{>Hz|718jYnNtNUca!q?vI)k
zWuIuLoOa+7^6F{^ww#<?4vb`r7L3Br&tLoM)m1K1iJ)DzmM)n%^#&6GJbZj^Zf@3d
zDn7zb3kyGd{;cZT7;CPhN2xWkarJs#ZzXfXp=CF2hqk@P^aTw6l#ZoM#a|K`@fcmt
zW)`~*HWZle9p*L@Uu<L*){5&@4xsv8^k7u>iJ*KfXTGsG+f?9-h8Olar*aBUlBZV~
zzJA3NrTSr&haEFXI*SeOSgzOG4&WquiKuyWml;12%CcpsA+5#H$HnqU=bs_&5lWoR
z-6!!&8J<0P46kV&p45%MD2XX4!HA_&iOIiaV4$X|iq%m5C_P;rhGd74@b7tg7Ob1D
zT*PtG4NC8R^3Xk~ASkISAf(9t`~19)k<k@6J|=wl=<sl?)}FkhqXWiezj6J#qJsku
zh-U=`)psU74GQCKwcSe4`=Eu^x+U?3kJeJYm~%lT!&rLZi~TJ(yMk+tayaXEDYvmY
zH4PtgZy#wAM9y@WZLAe}q}+NVr}gMdU^>xI{ga5wuHCDhZ>BTOtdbO4T{wxb=M5r4
zg{;5+ifk>uJa}$QsWW1Ak5`(B7zVTMT)jW?<%_zzyRedy(&Lnri~fiAM0({ekl=in
zn$otiVn11sD6T5N^}_a|^ZInCB-3g#Ls6))ah*kc>O5DB;?0{>Ha0fjzkkmyA?@#8
z|1~l`eg%G2QgR)74Z<OcL|4(Fp`o!@9e-&#(t2!p)ZTo+rKGSj*{3_i<2Ky+{Kv)X
zkNQ(gJnn2*ns&x=ySEcu-MRhgDEGd^siy>`nvU|Ku!!1_b@(W0+b+Gae0-l6!RkVN
z*{=ee;3!oJwu|gT&Lo{oUQakx7AaK}Mnpo|EWB9x1O#jco?M#se`6-7rKJT1_$V<^
z!O)Nv#>v-tu(Gis1ah~mroqf=#cr)>?QNy9u&ZUxLgm96kjDy#zqC+b@YB=NqoAVt
z=AxVuZ6Ty~`}TQI^uC`gV!8qX@8+USv>M7sK7Lg8@DR-?(z$jG8HT^1{D!fyM!e{k
ziFaX&H{KE_ErjU4vctL?8GE`WT+T=>G|GA-UQ2RssZxf77Mto+y0sukgEUwibJ+PS
z*6!i}rFw+A@v5HQQyAVH#;89$I<j|g$ba=Jb!X?^!e9=wSf0Z7r^UsQ5fNCh4;bKS
zZS7;26v11@tRnUB(8tKQz&808`@+e#8vceycVQP-?0nY`)@{^5H0|f5rB7feZjs_$
z7GGaqdpo<_SFgnV5|);hbeJy+3CV-nR##UG;q0_p&~+7LnEyKyY^KbNM3*U)#>alS
zu#$iBQ|8fAY(*Uw@w^^pHX?G*l=yNd3|DPXZH>zmk8L`-dEi%DS2z6iYivH(<K*PT
zoE*7ZuB(fSxp{donEX{&*9$5tDln4#hAh}ysd-C)mxYA|Z}oe*(9*+#0W5|GbIv5s
zu*^P)tVUmQU+9C`LEPna6UN7lV90coG*L&Yr%#{iU@vSR*f}{B78OOvv&h@noJ&ql
zhPe#FKheS^pd0Au=!J!a*K~B+YVAk5`}zu@qxK!q*mNP?@~=@6VetOrzAn6z0K)0{
zg@uc^2N<@tw^2!l;auRS&z~n@J-4SzPfrJ{p854#0ma4G#Us%ZtExH_x_amM`5(TK
zrXBk7;e$L_MM+6gMutNMg@Wm5;MY%|cKxj}3`E%)3vQWY2bzu^ff;(2lrKke#k9}N
z%tTJq-SO4XdAtIhEBvvrz*BS$8x3`Qe0;3R3cIPPiGrG1*#B^6qlB0QFMRRm&wS`&
zbF(b4efk9}ESUVE-b7${czAJj)#k&Z=~FH|qR0+T4EjbTr#AsP_)SY~uN+E8inQ1T
z1&QOklwigbdwYAZS-8N)(TSHd(-Uo-qAcz6mo8nhwzd7X>(hasKe765-YxtD3pz|d
zL=+(@B}I=G+&bRg-j1fHmlczbQC(9L2t(XA-j(i>DVGki=}mbal+T3+{Fj(mB_J%k
z{Q&0DxD4l;s#x~nmcM$Hcz1VqXJ;oNHT5!ZL)xb1&aYo1AS``-YPd*Wj$BS(Umw@`
z$kAmRm>oz(2Q)+wNo#CmWar>e-H%RxQ`1PYd}7u1aAygc3=M)#SbBL$IFUJKM3j_#
z|MBBda<YoCF+F(py?ghr0g+l-!UzDuep$uE#R#35nli%3^||%+Y1P%$8?tZTzP&0g
zE`H{+_VqPwMv+W(Z0|V=yoXX(E#t|92^93MN-h=7o}QlG322$tEGK}*zZv`TB|RfO
z-Mc%MR(RO7yt{M=na3eB)Bet#xASfnz%)11FV2E>I64+oRgtRb!0aQcAJvCN`1|sO
zh6k!Q6Wa=LKp*0XSy@`pIuwu*G<;-iObr?i5dfScoLaniMBUz=`}OPBBBG*0AR=%~
ziG1566=2SW@*3~$h33P<!(Gt($P?|`(TT*BxMPc(UPMz9)77KtK`@a7yX27m&6`u^
z#>Pj=Ha7G6S=v7YQAH{6hK7d~!4u#@y1Kg8OiUPV2D98E6A=*+l8{hSP*BiyOMHD5
zR23|bqBYVzI7ob%3_NUcbuuzb#EApHR9*6j5JH`q8Pj~*`ucj;^6o|W;gu_RFt<c@
z_CTp&&EncxQC?nff2MfkwvDFN*xaTNkPCRy^NNbwy(#?P7Z$GT=qUL3NP?v#C%+U1
zOIZ$<pUJANtvw1RbDtF@ws#I3Y39TFIndiXQNHYh!y1%bR8*Au#%w)5CMG7Gl9F<E
z{j*0FH~<|z{nFYRr<7FY(n#^6>})0*GBDO*U|&Z^UKltZp_;5L#yAf6R+SW{3kXwW
zozRsKvcQvB>FSd<9qky6pI9xbt)&3B04E2DLo+@M54RU-WwtZ<xl<1I_n(6%KB*n~
z^oeqBCiA|(tu3dpZJz~9%5Yj&SH}oE*#XeFXWBLI=E30JcflFBX!m7Z-P)rEUgo4h
zJ1HMLKGnaSb=l!Fd$S+Od$V*S_3`7cA>V0)q@^{Ll+eq{$|SP1VM-$zw%6TsJUV*G
zFoA-LTOw}DG&5Des|hV&NAOJWmK*x|;`ZF#VtaT;ri)rgvY?|A{QUL(`}e>7I$By^
zC%*jp>s@hRJxDKxz@+Zn;lFd|jt=YH$PUtGs?3axXB8F2O-(YT>L~Rl<?^nsn-z`@
z4r@HTyp1&bkE%Af%_{V_eVUF|UahCPS-4YrN@lU<4$N(eEH%XCa}f{|JAZxYsGn72
zA32yMB`ycP(^p^B1I(=g1a&!_wycK?$m;Rq$KZQppP4RRytufsQdm<X?8g_AKXw}O
zJotodXR{o)=9$*02k=M7s3k<nlamvjQA;Bux*FSlJo8B7Iww{^K|w#pkOUPyJxVZD
z9}Nu+V~7iP?%rJ^(;AU3DZv5>O_e-<{``iXsNMT_r>)kz=-2w0)6&ylkFVZ0&&tUO
zG_kc^$Z9C3M&H@nt9Bd}XlQ8Y?(etRTlwNDoQv4a$_fWCHu#cCIIV~2Z3_z)2Gzdq
z?x+|Jk@(`-tcU1i0;vz|M~cE__CZ6ymPlj;kD#uiq@YMhPNw{<tVP@`+Ajmv2UA)|
zN=lBsc0Zq$l?Af6VPxd6JJSM&v{hhOWBXb}%NI?(?K}luc+<?0#y+b$U5JT$zvz_S
zi<@_Lj!w)Toj~)<?l?PN9qjHl5CIyYaO7y~3%+Y_-!|(a1j*Od)|M)TCeT`?W9m+R
zhOEEO<JEZ=iN(c5oJ_2$z3hkR<RvAlWjkQ>aQ(<-V@={_bqwHH%R9sKZaQXW+TgQ5
zj4NMXKdP$}d*9pJ(afba!o|abW&vJ_4%}?)=I*Wmd{Q+#Hi6;??%ZsR7NGq`x!Be6
z4Mr}yF@OAWT99?sd~a$bJ1*yu-p!k*FUrf;4!|cXE@chmpk4Vrwai0ELST{~E<wTK
z`g$7POKCbGrj7S62nh+bAK{S}TM5x9>*+yv^4V~GuUXo#_vCTmojZ39Sa5FF2j<2h
z@?DRNjO;M<v}KrzRlPG_8x50iL8L3VGFf~zhY5Vp>~w3(4Z@vfP2L55{#E0c{5RnH
z0aDkT#&^m0YsQ0Yb6e}D#ioeI$kFQQUFg@Fk`q5=`JSNji(NBTP-x>cO|b!@_YfBm
z;R6ygH_*}1F@!8l?A$%m_=~s~g@w~$zL==*`3SdXWZ2o;<LVoxZ|XzFN=FyN7BoiL
z@$RF1sp{?WDX3P!4Ie>Bb9Z-tj6I!Ei>!m`JyVy0oD#zF=Q3kzCwqGc8yS+2NQ+JH
zH^-4*mEOeE8o_F8Xy7y|6A@hGobhda-MZZRZZqIRJ<iNS@hJ<KnM$iw@K*M+N^Nku
z8s+slFImsdiW(dzO^!VGwh+u|!<P=p*G){0JymqHgVmZ8G&JxtiXLW|Slg1^)YT0;
zOXoxjmN(cp6`%(HoK<UwnTI+a(m8R6L;nh-_aR7NprO7obFP>CL>K97XJ-NPidYf{
z<QHavExHWHrKhgDy+(uI29}nUo#@-!FCDZp_s>C&AsYE|oj;^iY(_+Ru3R*mnDtY@
z;QA7F`~<cIj^BQBu<XqFR!$544cjNL){<>43YmGC;?JXegxpIcEu;OzhYz2#q&&s!
zGVXV;e5t9~-r8#KbLOOmO5nll?5vBMj#Ijuxw(1$$Q95_eZG#K9z<&->3P9B{CMg!
zK@zsDLj&%OPuSf(J-GVAdiwe>DHX{cCMx8p!oGVemDqu`g^W3amw`4?%a=WXJMl%d
z+@F{H%n`dY&inG^%Lx&!?W>j8)5p0a8~TOy#rXTg%DwpqUT?<O&s#hZ91ec<us<d%
zN;To(7>|GB(TdKX>Q1yCUt*YE>nP;;R|np|Z%`TCRZJ*XZoI#mUsLl4=8>}POG^}b
z{j99);p4{?3j<m7_ZNc_Lha9om<Scgj13Qy8He7nl51bOciqrX9U>+$#q5qt#i#}s
z1)h{IOpMb#FhF!UV0>bN8+hr;cu!9c?QEMMH#hF>7d$bFIyytVP@Kr6i`_9&)B9AM
zaQz^9Z)TK@@{524wU8aoq1a4gmDGCl2jdH@Izc*VcA~cm7>JIk?c%rhqH{Gc7fmZI
z+8kP@r->=he0+V6j3F|7f$YQGwm)OOP7>eh(F2GBmpQ1@J;tC@Y!rAPc*?l544zy1
z`uY+{7Q2_n(!4s$5rzRfj=&sSNgai3f`ugNr^bcsLdKvn<5xtZpFXWZKL$J`vs5Ci
zocTBIYikdL;2tt}X}I}N)>EZnenlndY_@j}pNhf7N9UAyrZ98gswRKjttA`x=kDUK
zqk@$(AoswJqoXZmW@e|N#UlsoB#&Bkaj~(mxcK?uwg88vn~u3TGsJ2L?<(`GY1)^C
zlM)_1QUVvwyA}oI&YLOMd(<y4@Wg%+e;?}XU?ZC&sM!tfID4f5$Vu$(R|z)nKF#qZ
zNSA*MWWi)Q=}=U?fB#-hOG{<c!_CbtV`O-^xnlXy7$Unk>JJ0=4G+_tD3urJLowUI
zciA3T32yut%Q}C3v23i^8wK|m6UCE_{~g5)^Gc{~MMHT(NePh%6%|#0U5~&@c}2xp
zZc9s`nYXvMtDasmopFehmcT`=5U-{&U>7y;Td8o()wUnoRaRYb8>e+G7JgBtOW?PV
z=s+!#l$og!5D-w$X$?HB)5JY@ZZ(Z3&}leswrvzbI^E>mUlx$!@y#8Lr|=u^=^7as
z1!`zKXpUbw<ea(O8s6%t)>}SgZJT3}a~|#7KIv}jud*XP<GNDpXr?}tH}btxe$H>y
z(1J#mR??vI*O%L$LHC5zpg$&`ftanfzrTO>vu07GgpT-UsCOafeyr5Pr_Mw}Bh>N$
zCc6S@wV&cN9xN>iDb;}ZKY#x0GGA<X2YbkMAB0_ZXM#$A=s{|&)&0Wilu0zG@hrfU
z`#n57UZtj_WaA#UNynX@29&k5m}k(gXKfrsd#x(0_>go>J!-wt$rp5_w4ueJ!kHU<
zcjk6$a@4wocRpj;X~d@Ds0U1?7a7bCS%8$*eP#xR((<yhJD)`EY#twMk65we+S>nU
zZAF13c~<Pl=fPc{rrDi&2qjlEG<y2_AO=AK0_x3cY?M0A9!p*;i1K3c6XxcH+(Wbe
z)2C06GQPW$ZOOUn^tIkq8TYk1)jNxa&GIbQa?;Z;jm)~#>*?)Y&5=Dh0J_{Iik$28
zUu<g`s$WGtCDh?<x+|Mapoxddv0o**f%grg>WT__KB+ZJy7tLR_}qtMY(e8XO;*XI
zN``&yfPm8_D1gM58nTHK2UHjt8D|Gns)R}UzUM=v{(9H5K7Xi0CT)*LnUgC$5yRc<
z{bgL3F)$_u519}OYUqLj_BX?sOny)`sH@`w-HC{cLt#a7|La>$u$30t-3!s3aHp_@
z2iV-XuD160O?9=K+DPqX(#usZAH-cmZEtxLh24TnBZlEmzTv^?`t<64VA=}0&;>m9
z=E(0f3|L>43VZFH@DG|oHV4;DYVC&bfJv~wFE=nbI6C^idiwO-d3JWIL*VnQo3|~U
z+;j{Lzd!)J#-$9UFhVCJIAQd8Y5nXb0@Ra}lR6_7M9O6>+1M>G%cY69IovvfL>NrX
za+}9&o8Sh0l-9Vb1OxbYo;@8Tgt#B!V`FU%)ub&I4b$<bR$kES_Fgdd^qVuDBo1-x
zo}`yP8;`bfGDI*?aA{pp>QOgajj*jpjrQy<LZDn1?MqLO$wz7;U32r6H>IU3nF6WH
zQY4eFyZH!3=~dDyIjNz*OUTOV?@Jdh*dpm;KzD!JJ1`Iz!;z*JdxJ4NJRG7UI4dNg
zkPIFN$O)u6Dl;@!RbBXsFDPc;#n(9b+Woe{ym(JL$<AjebaOC6+w@09M$VKwL!I}Y
zrQtBP&~NI@v(Y_&&9#d%O736A`SwZ<j=BoUro|9}VoH}JnYz$<>XVWBhh<UYF9Pez
zm+dmBFdQH>OubSj^Ko=^9QAIRx&%qx!AS8{{acS7^wHvg`9p)x^Ss7k^TvT&QOMm7
z@*A3hFQ?awi;6h6l!~6&&bYmPR#L(yDw+&DhlhvP{=*iy<S}F_Z)dxbY9D20K7hLV
z<ZxF+Osq~aYakdH*dFEXtHxcJfb_^5>OxOb)5+$NGH0{^Jd;?jjZwv8N6{~dI~XYJ
zR|{S9Jz4H2D~8?iC9%zpi<KScos;BDA`x4J8$=UOCpXtyc0|N}`}VDcC&o=AO5Gv?
z8|LvVAtUmJn>C$3wslNQr1N{!g=h%kecU7%C@3hx*m0pJ>h#w|l=6$PTi`a$v9YFy
zEVLh{T8wyfzwYkj6>V+puZ4^wz0P_EH8nM;8(z|RAt50XKbM!CdAYd_RXOgL6A%#C
zL9{RVvS=kp!t(7UHmP62@@imffpP>F>J6pEvNSRbA-q!I2?g8S6S94RZ&F@T1HO9=
z>4o`RP^S7Q<$ZwCu$Hl*oVkn(&#dAVRG~%2I*+}#e+*tlN`Z=TsD6OfaWkK!W!-{A
zCja6mO|nW=vLsyF>&fNIkkdw<up?XouY<px1?KLIdnDY$Mnf<>J}yavgFy!+5|1YF
zDQJ+nqM{;jdfttZsd0Gy=}hLR8p*!Ya4mZ_ww#@8c1c<_hR_v`Sz2o<qXe8wwJgnH
zx?vn|G=sb=VFpw}4bOto(o*qzre_MkCWa8A1BX0h=-I4>;1*B5B=uVjfs2_>`Z7cv
zl^>Ch+||AbwOr&0tw1X8O4%#1!6=~Tl4F<~7U~P-bF1KBdQkGT@Ii7tBC;w+Ltc7b
z0y~hJtj3dVh;t;gg=ilwQQf}vBb5(t5g%%2Xm~pMf))A;l70*B;lbRjL<}L)L<~l|
zON+UoX1fP|{_<eTc_}F=FX0lefpaOLz|nyl-R&6)KozBP_-tC*NiuKi;m+bUE(&oX
zXP*s_6%@r#rT`5%O*V+?f&nJLDN=wb9SawliKX?xYyw02nO}(Q({0dOFuC9lg*#$9
z?R`d7K}kqRKMJ0vZ5cID)XQIOY<e$U+x}zQkR7)T3J<x_(a{RXb&l#LR-27RJ>F)R
zK(=w&($ezlfQqeyo3XL+@NH5owBTnFevl1AJ^^zp%EN97L%8*K53)>iIce$RTRuLA
z&cQWhOvl%_L`bLJm~}duN7;pEz1ucz9gJ>PB}z+{CFRUFR2c5qKmU{F%wWzHXP=r(
zYoFR>qIv(W=_qCK$P#uP6*YB>l^rfdXj?O61HT}cG~nao!)-m)#~Z|igyEN!(yKO~
zhXe<s!epRd>RqiUT+`>O7W&ddOG@Ag!HX9!UwWjvX1g>_YIQOBuCxTgRGW8n^+bhG
zb>h89^K6yr{V3{*(sMHx=`PK<w%VgaC$J<{V(uqxKK`;+Ol?S6#A;|7{f;-@Ui6CY
zqZt<oqu$<Lxh9Y0&+Xu{a?eV9B)WOPimt%Srq^E_St-EnAze`$xC?>;#g7k^Q!-FH
zzJgqZG5RU->C8;--tqR}dKvcgy%|HP8|e?}L)4TWMv__**YsUhSuEREvqNcA2#VSW
z#W~w;C4aXXBe9;I(ASZal*D8@Y7S?gzFU4D?g>b}c=19U`0o4e-a~XqEcW*9n`>$H
z4_F8-3J3VQyo;qhLr?LQ&Tbw{4j{&mn}X{EbO(~Gu9-!VxiRMkQb39sAB#mojC*>(
zYVF~LXUM8qaRWcect+u3+n%JBAO#+`Do2~qqYb?46docjL@v_TdOor*lO)lfVQuI_
z?U7n!?}`4D<SC(+GEsoA;y0qs6y}Q}Z$#D947wDzm_71dePh=G@{Z;p$c!f}m4C02
z%9dp`o^FvR;zNVsVLBa+GuWYaeIy!(mI0GOYwyxHVMefLP;sL6OHujU(o&}>4DXFO
zk0EbHb&QPooz%suH}~c3t{>rvp>`^SQ07x_k~NZOwJJZF55V?Cbw4M4x<B_xeA-Vq
ztkh^CcGb*6V3>AKGc3xD^T>pDQSpiWAetbm@vVU&rvCEyP$uOg9#x!%39n{y`|{b^
zfQqK!b*39yWluy5*szr@#IK_<p{(7uUKS>w8+Ijs)~Td6aKIe=AZVM!dG88Gm3?5x
zgVLQ*R{teIv{P$_xesQ3ci*_%?#`T1*@vDO=gaIX<e!O)y+biZr@<yuCi_fUCG7uB
z!^~Qb@3QWPa#z28gAb7+nuc*AnGzHd_!5}hDjur`m*ZnBtuKD;?RGem^?km}A)jE^
zUoyFMJlU!gRmtp<?tMfLQ`!(jSTVgqZ^4#*So*<MtGzkxa4fDgN|1%9t{}K3m^_F_
zequWwOL@_O^!C(9cgb{j^9yJ32aR`?RLuxk6rFbm3DV;4tS~yEjcIVy<Akcsb{BMC
zv9aB(WuptGueu%CwLxhW9=D^i&%8myc6^@2+C?Pdmp_A@a?~=d^8RuZQK~k@c$C-1
z5nvi!*5<f;!@D{>;1*2BEE{C=bSopC@D1Tt42F<<u}hsaF%I5G%67P@g}XkYF3h*6
zp2Q}!St=iLb>^c#&-bI!*?x7Qio+)SKx!K06pK%pXT5>{NHa{Z?Hw1)hr!I+cI8tz
zf&T`}E-q)O2Tqn|sgF!-?Gv*|32tiCV)WZIzb=>w_eT+~&==nl%-?-X*JT~?Q!*i1
z{O<Cvao&^DU`EWbcp-tGC=naRY`AACewfaz>5fP5oA>CZw>1ixPoB1(dv{{as`u!K
zC;vn2*sgKnRNPJCfS|<jq=zR#XT*%tj@9(8R5&Q`QCHDcE?2Y&;ez!b<O@{f9}BVu
zA5@f4LX_Y5|F-|n`CnF67Uf@o2)5Ay3V<<y%)g^IL~yJkAmJ|{>&SQirVm`p8ZZc8
z1z-aR0RN(W|E3fD_d)+l3H)oB!ZscN6Tkwf184z^04D(b|K-V0P_SXY0Kg6K2Cxb^
z`wPf=BLLZl9D^MDPd{+2NWd;Y7~lrT2M_{q0Ej*O!xsMON&b7sKb64W<@Yz462p2i
zzzHA)H~@G93;{=g|C#<V;3DS$Hh@aNBH)kC|Jf2b200e_4f0!bz`yvwwITr905QM|
zz$^gaf<!<x00Z#HR{z@;{)P1Z=Nllef5-{e5g*6>YxxkCh)g*EivYyeWB_{rF94$d
zV|Xp;=3i%qh=;-eK<uFaFatON{4;(3v+t4LAivEAAm>8PiJTj0XE@-G{-4A86o3bS
z#Dq=&Jpi#)2LN(BJ^<~n_22zO&h!8J=kM}>btIM}K7+`|8Gz`S0niKR0`LOn0l9!b
z`u7CA>%;aDl;QRu&&z;hz$oAl@XvJn@BJP**Jr?EfEqkCO@?c3!(9~-SUv+x0TBK7
z16l$6fS-UY06X9%Km&jZK>CO*f7=1F{D0~5_kRB+hd=VT2HRBt762ksMAwMUy8(z#
z{n3Apyu3WZ|9hZ^aCo3{A8g=+i;HUk3kz!(Wclya?Z4}Ixc9aT_m?-|`n#;Gtmg30
zxCYiI6%`e^VA%)wqyHbUo&k^pAo1xwKpgN2AOt}80O7cQ*a5Qsf8*z0_wlcOBmGDG
z2g&0u0s;a107<}8z&F4@^bfwq4cjmpzf|%0^XH9W{g;4%z!Et*`6evSq@|_LE?l^9
z2G4BH;4QI#mrnmJHUqYG#=yXECMG8K`&wXcXJlk#o1&tkJ8<oJxaY3}%VB6&3$zt!
z_uuu8^vfM!4mbl`1zZP|0q6iozJLw*hb{cyU<ZHi&tLsRIGzzu0nh*-u^W-cO@JQ&
z$*C^^e(N9n9O2Y185x;wHa0djST4egPHQ0dWw>+oTMw{(#>~uo#=^pK2D&(dW6pSZ
zc+Oz>&HpePfV+9WZ3{U!Vq>7|Gj?|NGYJWaGw}a2Xxk~=JzIt6Hv51<Xv<YNb_sYX
z4f=q@s=w?17`C+m;Q*w+i0!)o5U#)nU;!`z|3})w-`o9HKajo<0<r;i0E7b%0EoT~
z0Ej&F{@UIJnMuHU0myHTgM&i_{Cx;yx&zM?7GV1Xw$Fg~5t*McF)^J%-2bg}gag1X
zet*x)%X@~6jr|{{e<C8HGvxgA^z^^^1+h8A79jTg<^)bo&fj)`*aO(c2|SZuhW$ri
zk5yo&2v_YxzuW+(u>ME?VX(dh5Cb4QFaux)!~%i<h_4`=fGqz@+rr=5_g8xn8%8({
zv2moINDj0BC;%Y-y$A3G{MJ9nMHhf<?}F~ML5{V+r3WC#Z{XWUp#L)j@Q%@Mc_X?&
z<d5hc{O-3uBHzK&qTf14Lqq!y)BT^=@aLS!^^j{(Q&XSO(b4_3MI`nhoP)#%WQlAe
zaRT0sKLjpVf_|OA%TtNaUL*z_0Vim}G8FJf|D~`#2|!}p2S6Ku7LW(H1wizV*usCA
zyz#F#{jp1=U4P;i;^UbBr2RdA0f~omfP4TF-x2-$fX)%#KZdt6ZNR6H+W8ptJqvo@
zM|>RdbtKLraz%Xlk6dB@83M?|&LIB(*7g66nEyxje_x`aqMrS+1*BaF2LLzyjz5Tv
zBJlv>gFpL_HY0Wl$LvAgg46`ZU?Z;3Kcv5#f7K8#VEvE&2VlJkfYcBx07RCo0E8n{
z0Do-ZkL-Uh|1<K1zpnlF>;BRC71&n-K=`W=fcQG1^LKzQ03QI+e;(LA!tcA_<Kdt`
zSFnK-kk>cxt8K7@-#X^w<NGZ?kk@Y;KzJ45`aiyh@GzniMCXV;{;r?@%=JIEfGm-G
z0P%e!1|d9!*e=p;<a;DvK=KBJvk>keB_-X0<toTw8}=K*u}BT^6>Q-=EdQ>5#9mSX
z3V<U3!XKglB!5C=iufJEwSU*if2b+^>vR8gJ><HA0K_JdTE-u62#^Bg0T5mP(f_-@
z^0;r%&tiy&H(=i$^nU?lwTk#K;v>iskrTxD-&~K#50M?>--taR@gC7F;(Pyp>inPC
z*PnJ_U|^gfxhcW{h%Nky2S{#;<furlisTPSpW(Puu!U9Fw*}jCu>T6!$S}y~4cG#r
z-@ogBAGVP^(Gq~<%t#K2)DeikQ3H^A>OU-RgmeAfrjS^UoSz<01W*Sc+>NvYiQ&Eg
zgwy|_f6zG+%icnNdcYr)VYvYPUV;8D0GFR4{YU&A@oT7~|8-sUoA(j!M|>QS?H|tl
zXY&8A^!*=Oz`?=!?eB=~B6f`UKEeS=JV5%5eE%oTA-OFavjj0@4`RrBuziG6mw_Ks
z0P?W@cl{s1HlqJ1zzzWMK}SFm01trZ3mxze9fExR&7Z%1hx{G^KHxFH8i3^PNIL=m
zNY0Mrvj5OOv=fQ#xq$D$-SXhW1JIu>=+`XR!0+50$%_zuBYuGBACU(VLlOBPzK^UU
zxjW+H|5-5|1oOWwhWzORF){HO<bc094!K8x*Z|UZg!hnK0f`w%{(t~%;|Oxc1=xQC
z@_GUMhsYSIA)Emgu>ME?|AW0Vfzzq_|M-~=gJJBuF~+{{J7eFo6Co|4l2*~8kfi!0
z;*TOE+CyoPR3_QiWGVY3LJKM(<ow^Cd!IX=nT8olp`JUh_uS>V_uO;7+ga{5lI34O
z<0!LX7Zd=sy9a@MR<_`bTc_3l*k5`d3_~Cq_JI6e`u!ag?;ZV<pKIYE))muRk^edP
z_HpvRgLrmA?IG2J(yijVWT0}ZK2&`!JJ2@n7W>!eJUM&vw`b{JWmX$jeF$$%No`!&
zg5sX)Kg9;*cpMq+MZSMxGfxvk?_t^NLp;H<r+?MO+d$)x8{jj@4U?dIYIU#u*k3-s
z99BXp*bOrwLI3Ey6YHm_yLyxVQCh}sw^N>@(zo=k_M6J1`dd0zy{9s({U-gZ-7Hyo
zKBDFS0{*t3dO$HiHX&b-?4*0I-y_+nu9WPM*Kf#lpJdJUe)yXD5QnL2D>3)<uX=Yq
zEP!(GGfYOVsh-$h`d<pN0qOr+nCWY~A3?Vx(BEy?fZFam@Z-a3-zcAI??~rr18H40
zEWcNOSvIfV$jD`HyDJY@0%|MB{$&%Y1Eg>Hh2o`rNcDjiJN?_rw4)9ZZ+}29zj9m$
zY({;Et-d~lr+>B4wa=tfE1w<NKSBS#cHFn<@(uE)_T~}J`yFlD{qkYym~}_5%D?g~
z)VA^ZYs$Z8^H)<l?jr2t^o1NNJCJ<ThfrOh7@&5M=AJL9?WCBY_Jg+JZ>J+8BlqKf
zhggqC?rLjqL{A^1yRyvBTmL*`ke=g~lFkawU61)5;?DtW?ptiYX}e4J@@whYi&={I
z%CBO8P<cEqL>~W=V`K~GZ4X{d2oDc;;--8^aY5~4uP#-6p+2S8e!&0KhuA~RP#<C`
z`e=$C)rWYVJfwP}&5<8lT0=U&;OE<j@uygKuCM5P!i)E^Q{_wjUBxH$dAyj$39pD4
zdxhk~vxD=t1;qo!PyF2Rd&ytz1^J+CLG`M9QR5|E+lv@+0zE2jpJ3Zt$RJw^2Ed)6
zrZx=cT&p<8A6^?&KCYPKe?G-_#UjNaT^~{YluwSovLT-)ES)tOvRIQjmo=ej$S?U0
zp<NPM(3;@Pe)(s6P&nJt1M?vE4brt`U0=|+V`}+}OfJY4{AH~6lw_~AwE7TgAIcUK
zAJoQDEcV(D?0XEotdwp+I+m`zsS*nV;4?S`PWk1-ish=?m9F~gYP-wMv@HE=UtMQa
zzP#g7Klfz!7ulSDTEXZfEjmh<!JVf;S83337}o%$YyB3H)tcOlAr`G_O}R$aRBmZa
z)oZNDTa@#Wm+&IiWNBbcrpoAAHlcj6J%}_yB1wZW=k)9wQJQ_qxMXJTpluLQ(wdCy
zlRk?5v8^zU3)Xc=mG!LUydYcf+6hWm^?-a6e|P*;ZEnSDwZT2#^gF+FEL}_I()|x`
z*8It*rFYqyVu1FQ&UOBC9e2*(q?1f}kzF)0LN_5?tIv!*WuiZr0soW!lqa1dB$=2Z
zKTOYcpFGGqlw+mqQZ=oqCY?63rb<)v+XNc3%)DB2YignEdhM-=?Fb!Q>a$#f-!gK}
z5YCy0G@{r)6Z-RH669Y_>?~9^#<|ny2Ff79^I&`AJ&n?#Ji+A2i4*74`<ZjN=km7$
zEhqi`tm|qkcy)yQUOp?|O@)pQr1m^YKNabnHIIqTBbiFCX(Y=C<b_;wB6I1gHhQYm
z5Sel<S9&c`*_vV%tjQl^O%CLoiMX8szsi&oe?<q{N9kooC)Ln*lP=Kt3{6?~ry1+b
z*{8*|XXaJvk`8{F0UeegjpFrLM~{kYxyV;cd2FMQHIdk8I<|YdNz1uqJK-t^%SuD}
z(cFuPib=BVNa8_O@}Iqc8*?JbyV6nKvr+eCVjtP^McRV&Bzs86qnFpKVV;Q?UA`8&
z!!OHJ!A2-Yfg;vOXO6y@H^GM+Vk5E5t*L{()Wz3}5r-x34A@eI8tlvQt<mo_U9D-;
z&6>9Uu&o9DUlScSYGqA_?k-hpqBr7-Y^p*dSMQQpdeW>#OlgYEG$!3j*oyKc9apMn
zP5rjyp*42ff;7ofEht}yxJFt!UiKSHp6j)9<BwvF>^prX_xGIGLrspa&haIyVIRa3
z`NJ7~U2t6ROT$0CD|=aSAvgX|2|eaS7m~G>rKgV2sfRV4d%ARC-sO60+N0}2h23)L
z_-y!bUeYK?{SqC6{}#2TFle8A$UBl4k_DQgt4<u-sjEwcithQ+QWvQ0;OQV2I%$c`
zC=aEG1+ukbrL1Xp9p`47<_WM~k^E|(jMz>iY_$!)x5frrV82zdnF!*S($+p%a}w7`
zU-2sgHsQoGwtMG3Gf!#<=T%1}lU{P?xN^412jpWae>gF>NHJnUIb@4JRjE#_N5++_
z(w3ucD1vUK(=)P4d0BlGuE`j#(HiPXqp@f$Cl@=VrvlUi<**MY&g0uUcSGV&qo%|K
z;)CW5Sg+fFw9u*YlArcc4PrrM@>+_#=gD^_E}TzZ|GKYd3wlQ3-)#qfEqltk{U?rb
z+NRj3?8rm5<8MFON4E3#=12OM9RzG4IXNqKlpt1DqkgYmi`YROTdFj51HQ?)#Xq2*
zzgz$Q>Hm9eLB6E;Tms$Iq7H4`k~+CPZNoOiVV1p^>)C+XUk#|=Uz%mj*L$tm`>QoS
z9I@sn*!zPu+jm*BY`HZrzDPP8pW6F{m5*xmt!YJ@p?N3T5agi|?YBCOX*Xh9S*b_-
z^Pv5`^?z>eZwFUzTu|&RT*R90H(E3CWotfLYt5$p*6jSvn)u^z0!~@;?h4v<__M!!
zRZmyO=bK|69njVFy{#EEn0-I8=I~K#PFriNk6*Eki4#eK`q@7XZ&@+Dc@JxP3~<{d
z*WYW+x<9O0&-uTCjVy2Yo%O@kO#Ohir!OzE%jc$B^WX?;uDt>Kpv{oU*Y@+${`=>i
zEu5lk$=QN_Prlq2vb{KcvC@>&YrCCq8aghfn0tIh{AuxKYrg-}n*Hc%4}1$dPFu5$
zZChDhf<4r2{@45~o%9*qHh3o5dFkngtDfe1is^<f_Z~=W1N%vbYwyX*qHZ^9-acr}
zhv>LoM|?b&H7~ERW)<gOMLyQTm#~3+ea*Hfu~nTfM{aB0T*SH9_AS3}{2BXOOnw`m
zIZrzBleoWk=C|{eUCR4=w&3afIOV+)7J|lzFaF#bPrY>^GM<gS-$XyUEd3hV*BbM4
z+DE~z9^{|?Z6o<b3u5VuZ{sgdxbhqSCb~y<yI?y=-;(bp*Z|AXN9Wtzbo9JWMe6q(
z?nM4CS~GLLH6N_7=96{SeEyX+pRPiOA6hf~DSR2fe4X=nG2kfi;MQBw1MwzPDPqnr
z@{A2j9{DR-Gi)3ALVq*R@8Hj<E3m6J{jB-uBr%EYi(o0gt$@|a*Kz6v`jtAqCc0jZ
z-oN3utq{-e^T<!(;_mO|DqAyT6k`PRA0(4Yp@Wpu(74}JXbYMmp##i;!*Fr=h`fdv
zu%Gr8Wv%lAKJz7Y@dE1VS@g5f=?&8uFKOl4L)IMh;fe2W#Gzwi>4smZU+dvxY=2^k
zHKW;oIP(X`T65P(Yi>g~w>*Nr9%Edmw;LzqKRxfVW+igo#yJ%uz606L0r(LP!LRVU
z*0G!Yhpaitvg&~8(;3$zUgV9XUMJqv`xX5Y3p56J9p`_FeV#;jPow82$Y0Thj2}=}
zjMzZD|BW`rPozN`V@A9+ukEsC*0<K&iB6R-jp;p#J+3@Pj3AATq_qVe8Bh5`U7e4d
zgiVv~xYww&uwj3{xL92zK0Y4Zj)p3rcOxX7!r9OOrocY9KsyNHIP5v-Gs=%n(o^=V
zr|3gd?o#`({TnGa@v&YD;^Pv0gWr~7FC(Y9V|$^<P3M;EL<qVOx|X7AGeOABxd!LU
zU&D4B&v_(Q#R<iWr27AfZ3mJ6FK~qAV{i(#?x0Osg0X<Y)^uG<J<YbVA8-zQu~1!X
zEspK45i^Jzb*cZWkoRmcZvF~XWb6Tb6)fjoi^x%sm|uW#tNe^d__YHy#!~}%bh_P|
z0nb_U{HNATTF5vT`>LEJDiA~VxwgCHduwjG&mB{~VEOyx;vTP9zX=|Nl8~BvL1i1d
zHuN-X2REPRJ*WON)SYGw%mU<SV!>DDPrkF}<6YL={e&xnjL0cxd2FN$ZTvxu^^Ri<
zmt)$0$oSeP#9ZvDCG(~qA#-%DbfQaAr+$NP5sMcgyV<L)dEs4rbqc;Z5uci2&3o9`
zR_sGD;1~E68&DiL{wHn12eB#asWm>>k8N#EP-k^_(+<y!?SkqBBb$t1IWM+b+^run
z*Q4Ljoc&wVc5LJ3DVlsmHKX3BjZIX>9<Z$l<PeHIdGb@+Bp15(t|e%^al!)HkDUKY
zSaY0sN7;3)!#n2u=Xz(s3Q+xC5H55o!hwTe9jFa?0eO<YW<my$#C_zIJr84PHEEM$
z=f$fN4~PSeu#xMjqwhdZcM%WzBZu4J7Pt|5Kv(DlO|hGZQm*_SAdZfFg}8y-qtQ$D
zTyEWw4O_~R&DZ|pylPASkA1iQaK``FY$WER&zSnw45U8Lx#|%E(r~OnM<xb30rna4
z4z_@8W!r^r_frQPW}N>he*Fj60I-?n*k3#73cc8N%MtQ_kaDnZ|1H+^UBqwGs0Z)n
ze6`6JdGn9+HCqxBmRa)!WnWG{Rxlq#e$|FOKbaq4|M}1Za=@jU@{mw(h=cQQE2`~x
zEoFasJ@o)`O^0n4?}^Ot>At^HuT$pU&<n1E&d?sNf#%Q{Vxcxf5sP(AUDpJ4?L~f6
zsxoOjYR!1`^!5t3jWzE}mXZ6jQ{C$X1qz`rWd8>7;TLo?=wWma%=uon=3&z9bsD`s
zNZM>Oj{x>zeu86wj)RC7A?%ZueKSIK$PY!J3{-)-&;*okmEn5m3wOZ-FhtP4xR1PD
zH-$D5GRPiH`uJ5A?C!e3*1WRUng#5)fIN1+pO~Zkr092ght=!Q68!J)VD*wt=igS8
zoj1IZwj6q?*M(Tw3>nSGr;%xQ$|*UugVrEjHv;Lp7F2_ZP!>u;;UAGdx|TeoJ6)6Q
zH-dKf0k>`S4g08{umjZARy$xH?8Tqru)Xd#<Ma8f>C=z2u%Eodk)hNZ_p?t2<gR--
zOdePSdwlF;PTVl~GZl!T0bvX=I_M-Z4VwtZCNgt;E{KBSPyuQ{eNdTHzHXpcCR@J`
z2E#D&HE=t&J`TUAimpSb3+rN!ao7RBPuxwK)QM-;|9AYRciz;3H1JPNsc$P5BF5kF
z0>0H49;Kg$Psu-;fplFDr0c36UCWnBfc#4G%m+CkD`fZ-x#RDWM}eaF_Iqw0d>uM)
z`rzneGi-tFunTtc+g?yVU>|zZSW>?HZW_(*rLDkk^3U3@lQ#0lfsI)M^8asO8|(yh
zL1&)Vh=Jk)b%yy3s0R$b8jLQ}kX8m?Uh^`KfznVJYJ=jK>|FJj>a^Z)Ck%pnNVn0G
z98Vn<N&b4iiqDW{gL_Cnk^ier_ciE#t}+k|muotATT%CSlp;pws)zs1CO)DMPuKDh
zPuG%@bS;@l*I6I}!a*`s+zkdZ+LcA_LbUBZrJm&XmB?r{>8^vXU=w@;8Y9{X-*Vg@
z*axzKpP6^K7T-;S%;(WgWZSKzp?--Y=RwR@0`ZCtJxw3@3O2(Q*bedV9eA;Uc1uER
zIEEb&+d?>ZI?k1e^i`&UPz=gLbx@3x53~jKJ8l5QhV~1o6DnW_*{PF0pw0UXX*>G=
zgSqbGyBi9@l{V>pd5PPKAz|o{m>M1D>bf}PD-4o_be#kKqHE+9gg)q?JAS2D>-d=B
z?hSw}dOgb6AIC0bzvZwBG!C~OHp17i6?Q;8e1{&shaWg5p88kUgYpskM^SGKVOw{6
zFOy<_MwkxEVW|(=WzM>6LUDn*+ldWdGxuV{w=8?HfjY{G4V;ILh8r6wOBngcKpqsw
z@_^(}3Mzqoq9L>b#fFxfuz@=4N9?bI|GRBPy^HQrw(0&Z`%zo*HrQu^GE?4JuCCQy
ziiC`i4#JRyd?b;s@f}BI(zWDw7*y}dza-;Y!~<+<<cEw6lg487z6=xt){s_8b%6B0
zVk_||H~!a)_9DkT$hKCCi3b@-ADb|rfam{;0kQ?zfM*BVwhFwsfUX#rG&DTi*szPa
zVgv082B6%$s~jqm7aPcLTFS2&Cm+z*NKsHbNA;j$LoL$F5{t|VAfsT8b>2Vscj@d>
zryD~XeYXkekFI6={<=OvS*S0acD4LNb*R6te`5Uyz$cyfD!&r)yP|G8c``DOBTe;}
z6a&;>QXSxpv3-sFw!u#D#sgIcNdI#d(yvNS-8+%%GpwsER%;q*E5<f~w_prB0DYhv
zbo4>{)mc{@x*LYUSa=l{fb2r{AY1T{4QflOuJ{pT&t7aGwgvlQLwfQj|Huu6K(V0+
zwik-6y7B+Kp5waI3O&#C`WRDy>rJ$|ojC6KwREjE^dXQOlImJMBP1{R`*u*hD_?sX
zs1x&H12eFPPo;l!z8pDe?0pHg^eHy;A;-K;oSykPd}hsC`1a@MV;6QO{g0bYokW};
z%<oUL-XF?5LfX=QPRIqJzIAO&i8Sm(oI`1b4xno@<CxC}<@+0uJ*X_ZK<!ACQL#bg
zS8R}6j^gL|MF_U6Hjm<DHf$qpJAQNW@W1oa!R6XLEhpw$!u7tgN!N<s{<`*btT-uo
zh%N91%z&YAGqi;2P!jS2aWJM5<LubZ0^~Cn89x0keJkq7YK`!l;<UBcFLPF6D>@OG
zv(Wy)W@dimw*PcJHY@u)y@P8Dq|p}&_a<#*tb0)NM3YV_{4mPhR<bN(vi)cy+(g|>
zENFQR@uD_uxnjhkNOb1t#@#o;R%8<ep(&^=@4;G7Z1@^v51ij=N6OX}8x-^86Y>w$
z6~u-h(TQc}9Q`ksLeKNO`SBmdjmML3>D<$`bQ}-6KxG%w`2u(hnt^1Nj+lr4<;K^m
zRAfxH72_z~=_l6VH{?*f7T08!(gqyPauxOs!)MsPAUbZ;k-q&S^yw!N+h@_&n+tQS
znS%UR?RBpS-Q1sXo6__h$=f67{s#OlAIE8osyDG=1o{|6oNoIu+aid;^{^G<*L3!M
z_cSpEpIrPKv4`~DU%^;LYd2qNqs0`Vt&<m>v7BHF*esn`w+@-ioV+`A*?Q(1LGfW5
z>;%b(be+2IXXf7mWu#FAdQbh;FfnEvv6m3w%fIxj@=4dSeZ_N?`)#-$ke6hY79FO6
zYWVvbZ_<xvKi!*g8kt*UKM9>`KaI(I_s^%nR&-DGQ=IF4^tSvDcMN?a`>PGG6}+(^
zwFAEWld%|lxL9r4{?r$P*mfPq<iy5w4RG87(m}V=4q-!_KSvBPxEOtOeD`VWSli#>
zxJB5E&aoffAg=J-qm#FR4{!~W<NlAlUelg*bGzFUY#|ftP2m4vF|78nj`>$0*+@>?
z;X9ZQ#3X)%TyQl^xs3^9d}1{DR#`THZ2e0gpD@1-asv7+5RDJsg>2u$$C1sAx475l
z4*f!#4*9%1oi;jhtz607-;-rbWyZ<g;2IM8ScV>!V<#z%1?)V*^@D3@TXCMJ(EB|c
z*9qUw-jsG2K3l4cdyk;*D^`4$J%*4+p0{-FA1_^wYx;Fv-QL;{oA@7bW-K<6&CT20
z_qq2K94Fl$j??ZyuLFlMo<+Ke#&L-&PTeM(mK_jB{?f;kE!+*{%b1annrnAgf_-RA
zXog{M&y97fn5%p%VFuveDwFEk?)T$Q*vKa2wHt1Ki2iUj^dfx|_ndpP^PrbHTr)yv
z8Xwh|Lfsz3b>hlAj`<XymOm~5XDopAvyBC8Mc1*UQ@W)!kDugv6UVp3ezMdfPx)aK
zOoTBol77oz+F{sc<{Q|j1MP;!ELS83MUjt;?1OCtgJ+X<>vIkA1KOHDa-SJ#AA|$2
zin!kYVeE+*<L&FrBU$eZufsAQOPNbn*ft$Q_K%0sa5YV_#)Ka*bgo^ymj0iIB7nTo
zrf1CkWos6qD~;hT!!KX@+`V5$zw23uYWU<`=wi$Uu9^SF{=|^<*|8gZapYID>pAXS
zboeoP{~S^?7O=&q|KiQ4`|<xiq|xFCI;}~*O2HO52yD|epAddmJ6vPXr8!3}e7f0T
z#^{L69Vt_5?78+mv@dJ1pDzYzd_vDC41bn*w9~!+Yahq!KE;fbOXZUtJNjqYnM=>u
znbQ`M?&m=)IPbB)kNMT&`()LbG$wr$b=OY@Co^1NNvP-5HVP;HJ-wWJsF2G9%G;tB
zZFPJhM?T^)au~gY_Bwt!nctrT)zddoALKyJdN$|&`P{?Bw%O?aL-eu`l8yx=Hy*qN
z{WWYsEXUsm9(AwBH0C^+YLh?Wz0-f+#e6UP1lXO%D%2m##`!c(T?I6b-x*{-_roLP
zZP04k64VFf8o2#S>9ufCZ1@pk6tR37I!)_qC$#9swT?QZ?de~0*+eY70IeWc<NPl{
zCb$|W*}!#}?)Of-R~x-b54Sz7@vIxiQSTFP^~_ziJm~#CYsTW&Gm!N-WI7b?hMS-x
zG+}$*2apT0y5?c*gV^yF`hO4Ie*&rlma=Un`>us`n&ZRk(77`n%<<dUzf~v3|H>1O
z4^jWHPb_v2QJ-`bn}|V9A8i|RwZ-=X`>AgpO!^tvU*p!Lp*Co|R%xgnc@#9BG#Q(D
znshq!<2>?f@~eA-tJEP4$}RgJGKG3?D>hKq{XLN#C`JV9UfoyWYH9P4)w50$Oepcb
z-s9FhMqI6Tw_9e#aXs%H+Z`WY!#$Sh=YPmg<FU7cu8&;<8Vjue8ZXcM8OM@VbQRjz
z2Z#aa<Q;VSF~@$v@1Oqa-kUpk64%cA(;sY4TLFLXKa73>zv<rL?tRgBLF@|scHx*>
z_;&>L0Vgo#V^{_2;cM6lUM%2v#R84vYYboc(b#<>kbT|^_rVBI+?vgPGfAWGqtqW!
z94j9O^;yQe@7m`p8yNSkc;+{EpJVLze~{8UJJ{u_m`0jRCD7*&ZmeuD!Yyw$WOCy)
zVm-bknMroK9x9zQhni3d@<V2j+=G7RSbRp;?)tsys{`0R16|%n+^o`=zF~Ia2{ENQ
z%iXYnJ2~GI)96c3Z)-gG&PUJzcGqd0dyh#~j*n0q44ZK3-DS*|12*aOQxyxo1uqs*
zUueuWJ!$0u<x$sfT7qIhKX@2M!7H!;-rh`E?;+M@BOPp@QY`J)IQJUXGoO%We8IC1
zSNG|!3eBc2lfz6zd31V+zV~)~fwJc*$2Hd_Zp_s6?_SUj8bW0#0=j0ZF>#HDI@b%N
zd--NNS5{RzF^01PyLytbpVDq@%@>0o4#6JQy5qsB1JqB~Sisk$rLlmgrnr5GhI8C&
z@ro@GeMpl!$b0}Rfwr1Ma<Sk?e)Ee3x_%iA6+!v$05`$CFdQbr98mjY$^vYqA;)6_
zYU>P|#uz3srQJYxn`;AirB19@&0d2{TJ%zun3}y6z8sBT;$OPf-3{b7b)YOnf#jJM
zpA4ezcCHcaVg4$hZ!V5FZ3)RKT?F-NDb`t5ds6L(SE*B%pl9_dR+2{2`vSJJeFpxf
zv7U0+O*7V2muDPGI;3G9g3<6iyauv|&w;j`Gd8o6`FEgLa1gv$z&Ul@rX(nCwSep3
zc6bP$ftTSE_>4H%8-459MCH5JGqgoHkM4<f^*`*Y(QN86db<hEij2DvcZtpQW}z$O
zpf+?hC=QCF8IfVAeEk^EhH}QlXEK++5bt$gc-{)w3OcHSu7ktaj_z|(Z{PnG?Lh2h
zA!*3Z&NddXh4XwuJkO1<=e?G;1^X6dTZU<*6$G5anJewgP!Lo<H;3LZ65fSPun&F)
z#RA%xx)&^xv~=xGv7iC8hZ{k$;4zp0vmp+jA4(k3{i=F4rc!%iT^7=zJPbahPOMkW
zUe_Q~?p+CGtgk=%N9KyTikaCU9dZjscg}Tx>Iml==~CuhA>17+DAkt!)|<5BX!EJQ
z=z)FY>%i~GtMhQ`SGLV1-K1jydOqt*e%k=51Gd8YBV1#zgS<;)M?bpyO1qG>&_hr)
zZ1hoV@h<v=*hhxStmkms?5=LuPkO2ikH8|39niK={)0~9)7YS5K?$e<YRf3jDc(H@
zYU56a`7m-e^*~;ZmEL84j{f!h#lLCNeL>$j@6yWuk=vfjMA^g8m#%L)zAitK92HxU
z36+7<Pl{<wn~K;t;Hay2`I2IX;%miq_*{PC2fBEHcsvJP&m&EZ1uWrrjR${9y05IE
zUpbc;{04o7clbS?d+Y8X{fr#D(jD6g-N`vgOZS(Apvwr3&qsR2vB&b8shc=9`d0kA
zoZEItu!RB~qqf7RfGs&?@x=nQSyi9O*6Tw%Q2y_MVK5$M!9%ZMZ;>49=w5U6`_y;-
zw@hIaWSZmuX{IAT^y1vlC7+=#bguPF{#)TaD1p!6_jMjd=Rdi6zX3T(@A4(J6(rLl
zq!Tg9tp~b2Nen<=AF_Quv31I7#uhlf9QrJbpX+&px-IEX_MlHjeLkA@gs%7Hne4VR
zgNY|7iR%{d0=7X~{$oCBlQw|n*je4TNV7A3PFzUPnSA&jz$X1;f$smy#c`_Rs_S^@
z3b(=o@H9-tUb_s#mVNb^`_0j-ZM-ifTP@EHTobN{d=`UzWe;oz{LATYqZifnA=LGC
z(C6(Z&>`~a2x_O*hVl>tl4(W=RXX^8Hst>pv3O)0*LQB9US+*(E!tJ%xjwgn`j$8_
znz%CiOScY~$2oOPC*v*nG&%}G2UOCoK8rG62Ato2%*SinslD168*94?JG`5EqM+|M
z`EPlc3fPI$E}$)=c7bAn?s-)HHJ;HHRJOZ8?SjXUMegDpqcqH8@Nb;jQ>dNpILlzl
zNnPOdvn6ZQqmn;98Qq1L|9c90N2bz`b8qMj=ERHa=t1v>)0omtkI^37M_V6%oV&|?
zw(2&v_2L|x(f2z1y?R~rTOB|CmE)D(Yk=)JI>4r!{{K<toF|N9vZAMG@Q>%$v%T9!
z(s}?p$nQIrdWA-cdoAG*bJ`o~%P1D8Pg@KW3uM#Rg4zYwe!}mWbo_772>z{81q${8
zZ5_sh^HAPu5DQfS-G!jXn)BQ^>G^wM<RiId0NpR@j0IpHPMpQBoq9v*;5#{@7<-w;
zn9E7}0qpxY^>&SB)VI?ZE0{x@0lhA!&e8MOUGaV8A#@va+0uH52FC}PV;gkX68u=P
zAU%2T+IIdr>_d7zv9*e{1zbIHTw7QR)L~9ui3Q5P+CBxK94HpFJV=|U75g~n{fK!+
z_%~0wK3o>=ftNwgEscg<CT&6bLc82JnXKONB}bNu`v*We8wlAnUjC;khR$9=-t*B%
z9Qs;}yk8);=-rSv;-f{&^2{-9gKfxt0CkL>^9x$QoHm=&{_MisoP<?y)V-%~9NWGJ
z*&K0S<B*XYueP1yc|B+Y*F!(-s6BR;tDMpSY|pU)<rO_Uu>jjl%f2}vhI%5`ZR8=8
z-;AE!YYYFSN$ni9b!8Lpo3KLo#_nYNU3xzR(!1)`tuP7Xqru;C?7cA685h2F0_{Nb
zuloYj4_FNo7b55UwD+R84!hZH1B{r0+=G1S9A&PysB|5w>uwW3<8VJX{X*v&eH_0X
z2K?CT=cyf{cwP;fKxgO!J+R9h*qYO)>&SdDa9-zn!cOL25(_31d+M?r49<1lr<m*B
z$^YtfC(m}BGHE|RHptM4^Pb+N8|i%)yakGv>Gl4ScR<g+Y2u!9o^{Vx0-xVP{ZG9<
z0l814UHLZlqHA&WS~D()AAe2y>I;TS|AT?{faBxRQxPy5fcu!7Z_2M=&Nl3a3(;=O
zQNHkX|F)gRFY7{UP%NnTBJGP%_LF|2pgdHD(vTAzy)!p^U?BY4<32?^=aiFQ7a0Po
zD`U0G6f+e&cfotm9kQNazb`<~I46D9wHMotnJV=4sx+s)R)(>+v9z(Cpq-b2YcjKW
zMhx9-f)_s~4og2bfzGoVzJXp~^sJTMiK3|>JOe)hzhPg_egB)7D;5xE)V5PRFA7ya
zv7jk77oJaP3FTRw0@YPoR@~CJc`C!dt-nW+E@-ODQQSLN9GUfpQGo8~1mZLD_r-7%
zobB4EuA8YnK_4A|o3Pw{A4@^ftKNir1b(6IkFGYNpDCZ9w=mM}42m!DApK8;2+%!j
zMq?M6LZBYJ2EVv*y(IfQ0_%YGgJPE2cKM+URM|^=v8d9K-P{1Jp)*_ujER~Opn5Mb
zC6+)rR@EL{f}FQ8S1f)7x<FP)X;L5KTT`M2{e9Yk1Bt`B?{4@jJR^o)^qklR=2JgI
z|7p-q8$ef1-MoSM7f=tJci<>5{*&tGrXU;p8Q3ohZifZL0@?>^+hvEmq!W@^>AVMN
zATXVu1Qgrzfu4ChA3sqny_b9JPMR(Qx!#I?^HZnK{f@dH-`6!k)d3Seq%E&HxD!bK
z+d=(_RWJg=)DC<UlAB})wO}l41!8(8j%ffR(ff4T296CK<+n}{nEqJ_WZ`u4oO^9_
zzo5P=@Hut0_pI=G^#9QR;ji-FzM%dcZAPcBMxEh|P0@Csp$_M|2TQhA2vjG%1-pT|
z-MM$~CzgjnItWbvyaXz7O8KUHFWxeAu4_W8V99UT1nonoe>R%A^#3)ihNZ9q?uQU`
zX?mqH>uM_$g*MO~s)4ozrpqURDV*B<w!$dlz3PAkKQi_+hPpo-{i=Pw1l0CddwwNI
z|I1)5#DMt(uGV{SFQ4Qu|Cxiyg4-8RUt9Ou<d5dMVJX^ZVdzz;{k{)&z*iu@m;Qz7
zf!iQR&)%uM9+<8!38-#<3D7;`Ev4>d?7j!f4QZQoMXyug0PKftz?hul_x}2SlWklh
z;01;d4uR?Fl7QM}e>m^Y$Pvq!z;OCzkK_N7(dj&&zBe*g-LJO4;=ZSUZ+<P?)aN&i
zudbs1=X0w%yFdI2(qR%pSkD3)kL>_Y!F*8M_jIr2Dd6<u-yn@ZTOJ`?1ydFB_%0lG
z?(-=a#h7eU?hWt5{a3W>`%@Qm>&dm@T3l<&;p+!#ETAGh315I03l_1ge!cU3%-UB$
z+5gK~)Hv;Ru+!1Ip4A>ptY632&c0*r^SB4;2mT2AU@QH=1&sMUHXd6*$7$3iOb2Qo
z&|h$3f!c&aLDve*v!HfGV7l@oAl=^v2c7rFKSVs=$oQ}H{2lB9J^!I=|65?quRI@!
zO>Aaa*8>(acKg^&uHlrIo}o6p1?m&df&Ac%2WdPqFkN{P(Di|X&UOB=v)y}qq+5;k
zYrJnAX#9T_=$?Q_U*evSN8IN|KW9D8$ICmo*OPvN?hkdY*}lSDbwMlXU-xJ<xblkr
zpU+WAB(TM~#@qW*p7Fr%m!r=m@C8V}3*l2(0D2DR-f8p)3v(TC7xxOVJ_mF^wwV44
z&-T(zaPG-f`%wKr(si%dKlq=Q_LU_7T^ss8XDnCmmoCM1zb@!*9^<?ppiAlYUGVh#
z7RztL?fAdmL-F9J+!N0FG?)UDVG@k}o#*)ma1V##Kus72S;5SPz_{*}V*};L%081d
zANBX=JkL{sdq}Z^SO0XMzny_Dr-Q$KUu3=0GsJk>dv`A6ULe-Tz_aiS=)Qb0lr}+G
z_5XvQBPbS_&7gaO0@IZtfd|OOX;bG${PsA{4|6@YD(&})`2ToxI1ZkJ(ctM<I=<yI
z?%TVK`-OjWpFbbYwqY<7hQK2}`hLwbsa!vH#sFfZ|HGhbJAvu)OF(0?^Bq6F{tZ{p
zH_oLmhhCrfgXcle;S=yUB&XkpPPxzO>$$u^Fc9vC``}*C^BJP{(~J>le8A}g>K?9c
zm%r$N93X)h*li;6@}8Y<TpbS~?%)42{)_()Mt6Gt`fU2Whu`jkJK+xK2YMbu&u8_8
zTYPkh=NX>j@_mmX0qI{65~xouem8lmGp<LQ-Sgi8=*{!rl=R!1eQ$yrLC<9A-rb(i
z9j=3J&=p%MJq+Ee9pKo&H0FVEAcSz4ryDu{X;Zj8?fH|*`>(%#d!fsu`qlH8*FqQQ
z1RbG0w1c*AjgNYp=r0gwT>a~w0M$K#>GDcoD5vKcj9Xm)y-@wOM#p-tQ_q#_8QrF!
zd$=1xLudf?PH>O6`T~ys>%OqF-Gj_ef$1NTz;m33G21)O?Z2tfZ>)3-b)YuXgc?vC
zs`@B63H_@bXyPFX0@LM{z<5s2a~|lw6*`jtHiM-8Tc2$y>9-2|RDz070m?yHC=I2c
zBt)%ZJSbB7=ee+}?wzccS5tq_*+-Eq&-D@iFNJ=KqvK*w1Y$tXpcaBCC<uAJXH3}X
z2WSkS>fckOK&s~<0gc7;Y<_3Pedx=l<iAPv8||mx0xai;ywWr1Iq#g11F}I@h~#>4
zXf65wZ&2qv@)_9m?~#D+v;Nbhug^PH7_Yxr{boVOnIRKogbWZ4=^!nHF}@ho*wcUD
zUXZ^>r{|NZV(=joMoi92Y);94Q`9dy4uufV_Xb6fU`)w*M+o|No)>fODXVcl84c|F
zw@5(uVti$Svf#5kyK&L_m7b|boNrb!p5VL}gnpm%EIQ-K&U4}|nLGD`2I~L6MWyGJ
zsP6gUnOyp0p)Yg)R!aVxl78ji$9x=RE~r<W?*SZP&V2>Wd%~Rdf0^^jX<+BSO9Ho(
zFwbh<j&9_;XY*g_HYNQ^$DZD4>p9=z;u^5?-Ve=pLRrvztep1({9R=Vq?>vPlxJ7^
z;}y{hZGZ$FdwTTuUoCsvrE9JkB<Pm=0iEMNVLl5s!9kGEbB)+}*Xv^DIlwFj-CrJ<
zF24jakOju$xtGUzW>5N+E=5xPZeiPG7zLlf0XPKG@d9WA8G-vk96x`R`F_|3Kfq|v
z{XovUA@qD%V7f9SFpz9e2lPfa@>#((U`Magt#l_{RtClk95jyC3+BUc8x)k!Mnx5{
zHELA1Wy+McX`N>T^YGi-uou38hM@Bp)j5Ib%8@{6va;9xUe;1{q<AgA^%%!;7Mmtb
zh^<zwn(f)Mr)}D_iH(TJ!1f56Cr<%8a^w?s$BrHLSH3xT;J^VpWy%zrFQ4=;n^_AQ
z`ws`_y*;|$G%#H`63{)M&%4*>??gxP*FC<u;(A_mnb%I3Fv0%(^UwD1;luW)pMJ6*
zeKgMw9C*K-Jb9AyoAmEL&73(C8_C4++*9VXFPwKbJ;u4z?+8p+mIU;^2Vy`jboCDG
zhIqKm=FOYSe(=Hjj%t@ISz=>jW9^V3LmWFecI=qF@4owN)~s1=y?XWRo;`aKOyI<c
z6Si;PzNF#R8RiX^vtC)n4&=rs0ky|;J%Ic3>Y%ePV66=fE^9}O;O0N3KmPc`wr$(i
zHg4S5zVgZ|_SRc(wd2Q+w|CrehaEe1tPSP6!`kjYty#0i=E^0T;(ana1O$QU%9TJQ
zSz|m%_i0svzBXshXuDy<SB^>#9z1Bvl`CgUlqg|4cI;>i7cOjj^yp#p=g)6z*RE~D
z!ouvFIdlBgZ;u~8Zksi0CjAe-a*G|vnV$smvHUg=2aGLWzMNC%OR0+Wty;B`E*+{?
zt!fu6Sm4-%wka<B@WT&@^sklv{rhYG84&36A%v@7()+*eh8?wP)v~|+_FIBZ7cN}r
z_<H5amF+w4yyI-&vSo`C_jm5xnXsS#!qA~ZrT;ic4}t0GkwEtvHENvr<(FUl)oBkM
zI^?wf6Ky=l%IMJ=_c3cgb`_Ye9tqSfRjSnQ`}XZShjvr`Y0Q{0(*IfrwEeFh-7BYM
zbL7bJ<Jz@rQ&#dh_IUj9$EE)j5E%29RIi>XTS!RA+No2go<qAS|8(!Y_e%eBAn@Gp
z)uVgmRPFV#UAlC!8p}y;I(qb|9W`o{-M)Q$az8uAwQ18v`VTz!FNt1#Q^TA&bN;$~
zIWL4rW>WvYb?es7IDl*+>9l_RdRw4C0lmvt@01EmSDysbXPeWlTQ{4Wex>h;6DM-L
zFD=)AMkd-vV*y>ecIDb&&{Wb0yu<zK)4iADhT-Ai2cLcRS$pc#siZD$7cE+3`Tb8g
z+PQOQ#~z-0?m64AVM9y%VH1hy`eI<ZdL^LigHL46ocT}n<unfHKh2migKNWSzG9y?
zFdlS&*U#`d)Pulu^-CZ-MVN(;+g`nT+4=M5+m$O<I@kFbBlv^gZuJ#WZN_M*0D<uy
zpHTiKvjUVu-)T^+x5NX*_hYP&0o_NI(xl^yrnFPw_bXZg8pFF2)SrJ9^uEy4jO!~d
zjDVI9n67>as7;WX>v_7@ClA~O8=*J^rmI&1dT)zjfb^f5sRcW2fs?>JW`Qw4WN<Z4
z8Oi*cFacDbr!?ta&xtSua;LO&;P)$D0vf|tdr$X=EP#R#nEqQ5Q2c)!euO^%t)ibP
ztuqF4Jc_^AGs7YAQE?&1dDz{X<Q@+gZ_OSzk@^Zol(!+yO^zp~o$0ifx^Mlkw;ttg
z@a?XrXf!44PIT3J!tQ(tUF$==!*xrawer}6X-J~o^?pwO-E}~s-HnMoo^Y(QaH-d$
z;u5ES)!!pNG;w)?;uEi@O)5`6ZE8<z<NOam<9_OO^p!|Ku_)MYf9cyl0mmf$&WO4b
z8HDq@UxLo>N%y~q^{6E0OS&Gb-~A*oMC*P9a#qh+s8c*Yi}g9sP)`CWttUPHEbDPz
zdcNP|y>(yuN!Jqu<V65)e{Vg`6mm8>;-yUSy3KAVFT--nXAcLV<oZ5$X4`RD$=wM*
z+tX33*U{U0ya}Df`mZCy*!UsduguRR?rh}uD8FANb1yUQ<|OO<?q%Njo%1DHC%-;n
zxQEB5upXD>cM9(lu6umab(7@xRIHx~w<O8_SM>VOB>79ldLntnC6Q0k_4p+6W<9C?
z66qiNO7weDeIw9BzhCtF&?NSkbUn^Qxt8JkALnoFY>Q7fB+>7OGoQI#RX-e$`YzG$
zr-uwrw0_(sSsyYo@$a#TR_!Toy@YW;Ope5PnQ0;ZGmYVEXb~>%hRgGxXK_q2M6s;^
z+zr#<Ty<<ta^3-E`p~krB|DK;1bhJPp$O!HM0rT|z<=4sq-FN4*JoY|o`t92ahL~5
z?}x&2Ol=qrx?k=HD1r$sYny)4KH4{7BCTxjCG>??;7+IpRUnZbwEl0Kl9Vw6>)~)O
z)PncnQIO3~2Fd?}UAuN^EKA>{s{ncidLdAuCCJ>9ebTx1(Z2VCj!nlsFquhnE!+n4
z;Zc|h<Dog+3}KKS67<2bSLNhi2H$cT=JNZzFcX@<YUl?a!Z4T$&-47?V>N5mT+X$l
zeiVK#9Dt-UPVKsmotr*=`ulkXX&Y(F{^eVb!gQDjPr_VKY?=UBAqIjWK^I!S(x;^P
zWjzPTzAC{IXbD@P2dqFIvd0hV)T#4$-MV#O;<=5LF)=Yqxv&3JR8-Vy-M4cQvUiTv
zwZI}pity}zjXw((EV!_G_3GQv#p9fFCg+#DpMW`V4=jg{5C=s;`IWz3(R%R9pL{qi
zRE9gC4SWUdU>kIR&GqZo?@HO1SE*8EFwfA$l`miZo9O81@AdpV*UKGw=@}ZKXJ;=|
z2f1_Swt5b$LWK%Wnq|wDb=JA(Za3%N%lTdh`P?i}ogf?O1)D&5{u*k-K!^s#%@A<(
zak>1#JHOvN7t1+8c0C+q*DHPNDvNx33uSc5RI+5rr(}o7<45FvTyjn-qda-?=-xz|
zJ$v>GmcP=-n>Vk;?wxldlrCM`7A;!TR;pCVf$hgw{uNe}mnr0LG4v#_8$h-qUsc{U
zSKbw`8bUtE0{@s_Bt4gJy(aVG@RSeLogad1e>r8jj`=2Ryfg7-ccDUsUPIQ0vG)^t
zK2$Qt4sEew#cc87#T|RkmMxnV#Ow=}ds2Uih={O}k&#yZpz}!wdQMfoA)mkoq>ocP
zzq+4T^&WZtnt0WXd4kQb+!fZrEucE=cBlyDAdw!leyOG;X{Tdd@kQsZ4)4ID@FGkB
z+5UUPm)nr{>WURB-bI}K2|Hee%uiBACl1IC6>B5|*=CtCWo(8F8FZhX^PF~4`CY1Y
zJp-IBT{@d3OBP4&@-LlRdBG<gy+}Xg?>M&d6?xx}e)>_Ct(2)VWm^TR!#{z+pfW!P
zjiEb)g5;B+kMq@o|FOPhrCAUZV<cz!pYqWk)OM82CkyO-C~cP|lw~|N|2uW)4=SJR
zOtO}ZYguLG*%`;~Boo>?x)1h}*?UU*(z$|zgB^X#50w`^yRA4V-%uUo%kyb`<7btH
zcEKp>?QbZf>|bqI$$tinho?cd*cL`ZBou@oNYI6rQ=0tt&&qOrC=Z`Q3)ljRkBTjd
zG4Ej;k28M}yIF?s#^JXo$?Hjf|7P9d3y%C13l!7;NqMKF59wbzP~K!O(uMMj&pLXL
zPKc4Gd~K+YsJph}8$&6(+EC*tzvAy~7ywH_b;bfH46@g7aP*K0`754D$1UMYXb0Ot
z_0cB$up8%GhR;5PJ$ynQH)2D({e4(=Bza^1j;(9XJ)oB~rl%y+3;A6(p?XJo^~v1v
zQN<*cN9|ZIUJ<)?uzfeWn1Nm<B9ph_Ze;WY+yEOvvQzs*v0CvW#cSg1(;F0DRCjI$
zryYRY<y)KZ&Br<C7UJT5eDkRCCOc8yJbO`_Lo%05$<Jk97b1_#d5jkmRTjNNLgkT-
zN&YIU^r8BU`s)buL)hGM{N@F8um}_*zJgBRwVk%H+>kPzb7CLKUwtFh|C_P#PWaik
z$oeH@eUNh;XZf_w@5M{S8tFlCMKV`i%1QoJ=zdQ1MbxHM-Qcy^w5)hVeSI1|oWutA
z;5)OBo!WhBGpP+F+g0pNQU2KZO~`vSvb~)c_alC`gm&Ty$y+he^FP(4oYOgX#*7&q
znd==h|2DZNEsqyRr3?AH{K9L`d3{IOB62#4d{!gF@7b>pGTqjoL4(+H8b9~qk;c>L
z?FfFgS8ZdZC0Tp*soE}jXODEDyh!GkuP*i4Op0&Py|*sk^ItwMUp$SB1ZkWdFRrS-
zP&|@M<Oh<Md_!{bwe{47+D{xgf<81Rm<RkP-8<g|#=u6#T#hR}#X9L#a#oy^4l-rR
z<eW$6X5YULeUDM+&|K|Ok6`4Sj@YK}!4@dRH#~R`P=?Ix%R9o;^N!dwY<Kdd<LSSJ
zW@8)gcS<XA0`GTCfPQrv#x}w@K7@UPlJ(tG=|bm}9jbpP8Od(t8<L%LB0b1Y*oO;P
z&V8nmwPY^YuLl3IbjP06UzGe6V>AwSUNK$rO3S-WGf?gj#?bUF<Os@|K7w`1DY<Iy
zufvdZd>?`RCF87l`8G~%;CmSQ=5onu?!0_GzN^}t?<lq7drBSnE=xzYS4Ykqn;l)`
z<=tFioJ;8{9mzBpeM$Bi3i92BXy%2;M*;Mhn|;w+2)_rX;h1y!i>HSa{X(%o@mMnR
z;)d1}mDMe`WG>k!_nWg#c7DMzUF8qsosyx*Up8BecTLu6#rJ2*Vs~sSj=h$uVoh`j
zzDW{gO)kibd?K+~=}W&i=G}zNySlVsE?W9%(S_}u*#<GBk&bs67DGSzO1b`$8#xyv
zjr>J;e?D?nIWuDGIgx#~+`La8Ul8eh`iewHd1E-fDBr{>O`cd*8Pbz(e$vm3zl7@D
zxlU~I^l?_%>3o+rHYd@m@}9pi_8W_>V&}P$LrY}Wt~=iX>}E}yYprR`x+snewSNKh
zQ5heoSs$BkXieQld_RnNb?m$t`_yH*OAl*0ppzKnmJvDU<{0^xe64OX(!Gv-(Ro^Y
zq*h~Bf6dWdGtSc#{Yv*bSIs7_o|}=6TFuc7`j8*zM-TG9D0C2^_u8`UjLmv_NYO9+
zj`2VKpI??7G9nwr_h@XhN)5`6JnNvBT8b|<@sVQ4gxH~SN(S0jeF)*i6}D-6Zr<U_
z_<@N*M)}ca(tbwv9O#eulmY+GO-yUplyCpFz^|YYGS>ORvHxt?c1@j|m{%Oz&#3o;
z`s~N4hZ4#B%x~U4iGAYg(Z!kkCs(FRvrT&P^eFvEuO6PhJpFq6UR=KXed5a3g~}}Z
z%!aMXMss1)nSJrvlS5A8b&s3*&iV7!JU@+Z+P`4U<4^Ei)Z2+Mb%{0Du(xk=bH$h3
z`CW2xj_kyiOvDn&J-Pia-8RYpPw;f|cb_kH>8squN?Oyak2PbbTJzo_YvMLovv@1>
zZ}=|oEpB}A<WRnfHGS^nd*Z{b88gwE<?Ae;k+HgU%kcg&^Tr$2&<FpEEET((c0=Ci
z@7cGk`FMvlA90R(o2+?v75aOKHbNR=P8q&$JBaVoQWxo55!BP(xi8J!lfQJ~>BBpR
z-hbgOr+zNGEmIR35JQRQDWxHwFIA3j?h&tR5NlWLvV4-kg?pgPF5opSX3~fF0`{r&
z6o;dbVOiRim8b(n3F31xWIc8~I{4Go0q^xTty-e95Mqn!NRG{vi|>S!);mXt^X;jJ
zZ?<OXNo!Vfj&-mB)*Pko??sy{t2Hw|wkG~G+kdv^RhCu1D;@csd?lswo&WDANpmMu
zg^{oo&hI?gi_?yXqaFSQ-?V(1Jon~%sg$)$TVz(BwjFh?>RYv0o||FK``Dap?ZHvl
z`ghnNwm$nyYhGvjtE;UUHxK<FTeTPOCBD49)S6|xt=V)4-Ta1pkn^?!)+}6(&Cjvs
z_dl%RoeO5zP-0k4@-UV<{Tbp4@un5|8H0=`LVwcDQOKI7SCR+T=bf--!7*zVF`u*;
zJ!9`x$?uYbmRIpxKE*<en~hy%pnXt_eOT^vJ$`{boUe@jy8j8%&^JErfEe(m!YmAc
zH6Y!j?p(oDiNDxOR%DYOd6c9~HP)bq#>fME9rqTp-h+KDpsh(;QFUHEWFa}Lt(_Bp
z$X1Z{UOu<YsCY1Fv^86iK|Jh+y>I}2hQn|Kjsvf|FrP0Xu5)bNakNA6hg>%!>tcNG
z`~$vo&biyNz1}_8LPqQ(mgSqsUq|Fh8>lMn(~4|Ue<T=xZqSZ6G{Tx^W|3cXT($=J
z4Yg+EG;6-5T+hEt`6{GNE`OEZ@5pok^n@I6wka1s+z6k+QAox4@LwJ(;AUkY|Dl!K
z7&?Y>j7A2HyV9ntPkDM##;0h5&qNm=@h$K#hzr<w%O%Kx?dq?#xq%qH%bJ%zr;eRu
z&7F@D`|q>nKGL3s9d7;6@~JRv9}W{g+9R_P9f;*DH`t6U^FTPdL?<E9Ks-;^oEXy$
zUH73+aTo2?dpTwR`61o1w*t0Zl5`4SFIlh!^|{nHll`mw_4#ed?{3VRvkBc%mQ=}w
zWBFhP=(+f7Aklq!te<Pj%#Uqh794`qoinB^-|K$Rjj0t{(pMUYj6SjEmY=M-?KE@b
z)(g5pN6<Ien_{<lZ@`DLTXWsr_)Sf|(_4!eg5G-cWB)tQ*LAed>mZ9J*1YgCzJR>n
zn@`<}oNtb^=2p@vF^oLs0c2~?RnXVeuRjxCjw5@{5zRjO?r#lf1Z|)z+(f?mowVkj
zUm>16lHZotQJL20p@6H0rroW1ah>JW<HSnztiJWRWwMvwUx2!x`}i(&(y_5H8NP?J
zpEnowHefn^Smad<TWd{zdr)qbu|4QJ%1s~^YC>g@JfhcNr^uf1R8zQ=H4jZB#_z-4
zkjXZFSKS;>I-8N@^mot~a=D&3(u^2V8XhH<cm08OE4nwm;d@}+`A*AW=10&4ItV4b
zaMIDY{PIFkr~tL0DJYLU;Wiim4{^*r-=O>d;~Tx$MD8Ni^d67=*?#{l>NcN$B$kQl
z(I=ohoa-K9em<{BY3Y8-Ct({<E<e&_BnIDtOp$wq*XYat;mW!m<&eGU`?Y1D7!(4P
zU*DhQ{&tggw3}9G{QsqumRH+bvmQ1gt8ZXCsBOaM3;6sAIw1!2y%Twc5#wJ#{%mV7
zhZr6~I>^fTz7;k~C1Ow>pEZH~fc~8CCgD55<S)%Be1mkAk0{W$u&Y9Skgarqo8V5k
zgL5``2EQ)EoVfMKPRdY@^c)$ezEr(=AE+MvyC>D#8q3x>b#7v2R_voaadeGq*GXla
zoia$)=_zj-2%+pj*rW4Jz#hbhJoq=VU&%fz`E4yS{|Yw4R@e!<IqrKn#6HvBB=!_Q
z_Q-hv+lt>tTCCH+p?Lu-U=`qlG&bFD4DDe4EqMNMh~?kN2mTX6Uea-nNYctf`bD5T
z)B^czJLmyTKgNH`po53e88MQCLG`8T&3}5z%?WRUEhYrt%!%w}*V!Nwgj1F@l*y6x
z3G#~HI^Sp`9yoTW@=G3-@SV2Se1=UfLG~+P4acpAO|S)az_+Bg2jl|-1{1re3!Wj(
zzQ3T0Dx}jGmVxBI6c)o0-?H?v7B<2b*a7h%-yqgG-;+|TqMi*RA7SJn1Lsm%3PK5}
z0`iTjq@ANKZH!#(Z(jeWg`VVmyx%0<A`?Q)4kK@Wku~<^$oinKjQFt=n-vdKZgfTg
zO_zbhe2!l%`7>V!8(<TBjqJBUJj;9Gd-iF6Ep_)G<j;Cn;!HUHLuIa~!+7!p+CW2y
z_05|x?*x4T+cgv5eOL|B$1ad9?1clM{8AswKSQvcw46T^`pC`sVj$mJ=qa4vo%YG4
zjPpsvo8oG1W2*n+ev{@1`N0+wzAdP7NXB9hsGPFLS%ALOR;5A2>xrn>p2hwt*Qdnh
zSBV!-yhgw23F<@IL+z1g+aA=p{pinPdpp^ub_3cew1Y-)Oe@;4A=E#*mXbC-gc09~
zi3Rf`t3u54Vy{`S=d{R-?M}>2!#oF61LZ;aSp=J58|;MLpuGPG{`EMzNVkKuNZ)Pa
z=vjr!HPL6g)0an2&dPVZ5BWQ>+VqFI)S1!5sTkV(l)HIz>SpHZll6R(_Qo6ZkEla(
zQmz6;kukq_Mdo)5b^F5u(8oK=s26@9Hgnv43#}Q9{Oiv}<`J}MsUPq99KV>(I`Zy0
z!J5g~z^mU{^VVi-UWv12=ooa7%hf{x&Xbwr9DSfOf{d#R<#!Dz?_Y!Tq4LOvWK+@w
zI;SDUvG-gq!TZk3v-Ts%2W52H8?@J)JgeTL{PO=$>gK3I#AxQj9wVMmCcf2We!{MJ
zKc_PuoC#YD!#;JLY|tdeC9toh$E^7h`EG`-uoKiDUW#p&)P7&O?Zg`BEkh>KewlHD
z<<{Iihk7(Oar!27w16135*?7Q#mH_4KH8-_`7+i#g}%N(pAQYC&451TH;yiHGQSpH
zffcY8I9Ed5p|U;&!Ri-P_sQXM&8Yi3Go~kbE1%+h=!jh-lZv&8B`-175>J1pE8{@V
z)5b(jy>F&n(TsYnJhm7_{AS<w1CbLpwip>NBi63O&y&`}>I;0fnYMdHWRD*2V7<}|
z(%|@r*4T49+LVpaCBKJb&zXy&_ZZ@JVRT!ZdY=3gXPe~w;3L)?JnD{TY{MR2e4F2!
zkndpkcjtRw*R#y_L~W`?tXJ1QvmyL)3Ep?!g2d4;xqX8Ctb$jelJZ9X>sH3QenN)G
zXbv&GdVOSpZE4)J>tM?NG2;dw5lbWKlcA5-{$PJ({@E$F9$wCTHS1r3*B6ivEFdn#
zptt_W{}$HEzR3BItz!fGm=mAE@U3j$(~iVfDt|>>iz7~<_p0}^4gEw?CvcB}sT*s}
zC~RUq`|^1lGnX>_<=Q|Y(i{Mv!cyo1p?bEd-es1(clri&JGQv(jw1MRdg{MW`jIa%
zj`baJnKDP0a_?JscsAo$=;S%ds@Q$Que7JD(Y9+(-}X3qLgpXCB3K5i@dNe66oa+^
zpAj^lBKPPr^o{U2^;b(wK_10`*yGfh$Y1UHV2)QixG<={-4=So0BnBXX3mY=tF+|&
z#J&=w_aHH46uy)$938RVp*MO=Lt5C9bAJ(fGuVmApnDfIei`fu;PTF$>c2jD*l+S+
z``xg!Y|)gdF4Q7E5N94BCQbO=nkOm$J)pi!3#bN>4>0zVpYh>u7<0zf=Yhsq7N4}{
z!#(u179*E8tr`C=?b2V^PW+8QKAjf2ebl1Jj1H6gonQRSsV_Os>F*+I^+9ryp8A9h
zLE|BJ0nbvK7mkrOHr=ToZA<dtU3<}3=;xg4x_gO7p`;}pIA}cWE=U7c(v+3^nAV%-
z@6lGF%(*LIdpWJ?Jc@emu%%h<j*)d{-T=x$KFA0mUl6~E1>Hwmno7X_PkuoBx{>jn
zYQ(L^*e=U`9<t_>9mF$Yb!qh6kor+J9X$uxD5i5vLVbykIBk{#%<-|{6UY`{(%6S|
z-WqO%2Vg9`&2KN^PuCJN6@Q|LXJhAM3kQjfok_!yz3iU)?n<%yMCy+;p_x{j8q`g-
zUqk-Lr#tev-&anJb1DXC{3knQO$+MxbHRhp7(f<$z6Rrv$g~1=VAed0QC`dV^@qru
zSiXi>qW;)sj@!s_^_mj*hcX7owt@>uOY$eSIq_L>Xbo(Fov;_snfl%u^U1+68tYMC
zwhO2Ze+;I<NBG=$&RMZ0ewhP5nTRbcp&rl4@%k3KDVeC$SI$ZX6O?YT$uSW7LH3Q_
z#&;=C6Q~I4!>j+OF-Z0Coqp%N%!wQ6b2DyH6`f>s+o1WWD+Y7Cu2C)LxD~_?|9W@}
z>2&YQF`cPD`7Q4z<X@1qssp}a*zWW<MlvTBnmE`7=+UVc{&2_LqDZ?cXsqo97zm?b
zHoWs4V?Owtu8p<0hyF-8jy1o+<!*1DP2;>TAb5_`4vc=-m5XdF7ldPT!N<w}uMiI-
zpfGkwomuw*`n4;mOMfD!Q@80_^27N3`yBTPvi*W%mos0>I-h!U>S5Kv!zU0=%A;HC
zIy-U=LT5ph(P4M`0?kN=^{{N5Cq2;CVSw3fv#(-KOwqW4#&|R?SQ27EvGH~o22<dj
z->BaQx$Ozv$Hzg?=xhSG0=7Tw-1nM`c%GH~hhghMzmsqI{`c?|bVD}yavl8S)*Zwf
z_ETLf8?3aQwntg&NAxobna{`0RS$p6@y~xo`(!+I%hT@lz{%9-Sqc&RSK?R5kpxUo
z2ja_7WQu(kA?}yuw^Gkh&s;;g#5X5~qj!R$8=sJG5cPt_+2o%ZUsIc)7btE%3p2=n
z>wfGPtmFTHR#$+W&z1#ZW9W7hJe<7B*0E`4d{Mr?9(rT5`4}H~i?%89?N0exg6aj?
zpvF$qyhz(AhM0@&rthYWkNj#Q+ve91r_swj$Y0kq7ve{%gR{JVJ~_@AQ_H~ob$pGq
zRj(_)NTyBjy(Xkr9$$+jZATA9nU97&fG>oiLydK6oU<Nug4;m8@YH_Vu!?O)*KlLc
zR`@GqdspgGuD$gmzu2fV9=w=2atq0dERmPwE<5w&o`+@GpvK_UcTx<Gu7LdTg)+6#
z#k*V&Uc=b*5!$G4B9EDFUqJUHg!KWAHFF>hNUom%J`jc;Jek(z9POd=4)X8>+qIwe
z?*ydnTnFG7U7skxe!5=N9Il5u4&fg)*vD*!yjO^v&z22!25P_*E=la>+v@mi6|Upw
zIBqf#uN&eMlDq6oW4V%hu;i{dMZ44SnMYMt+Nh0?J9fT^{YFwBcfFJAPLr|CTWAAu
z%!BAOs6NNb*S>~gI*#i>n&SuZ!65dNO!Je5+5t^L`tP~Ty*91uMmUMvw^hA>j^zuA
zpT$A-d)a3=hjit<SJLV1uzaOYp=7Wqv;fsvZ<tKPk>bcha+gdJ<c@tgZIgA(sqaid
z-Iuh+ltH$yqpyYRyNqMh9<R{^nY5%mioV7m;}FRjn|6-x&fI(r?;4X0Jt)p^0pd?6
za+FMqLM_nstee@^{zGDz>V%505cUCf5QHAWck&ytG=%;DgBuVHSL<|x39We2gcDza
zk*8ztp4?@-qoES*i(rjuRfGy$-;FoD+5YY?+yk}T9TTlaZ0gj9>oTM<<zw0=YTGP@
zpJ5WD`<Y{#!b99E&O1<L+mqpYWQtv@u24Nw9vXq#$g$JNQyBY{gbvUZT7c?`V7+*8
zAzZ2LPO_G&DJw6Bo6idiDbr@4Zgtv2&ogg8j0%q<73vO?(U+S1{BDyi-$_%M_GIhc
zj1y0xUMS^`M{GuJGZ*7WIXIsB!MVP^jCpA=!$4y*@;lC%j`WFThI&Ke_aPh`2{E8p
z*Z?~ZFQDV3yKg}Lw*%rp<2>iOUy7fvnyECmWW2+54(zf4wqB8WhI!<^J7h_w6p?KE
z$i!4&Okxl1CUl^7&~oa@uaMg-$UCFj_^-fT*a)ikgA^-r`qEPxJ>d&<j2`OoJ30?y
z3@IIHsO~Siopx9L)9i!KIM>k&FwYO3EwK2nnKDq4av<BR09rrSRF7xuelRzUVC)9l
zetM2Oo~`RL(-&d?S&*mXk35|=?i<W=pCG|*NfO2X%(Xz>5c-p00D?<b_`)n=7&;3I
zmCXmfzmP;|tcJi)?kPNJaz}9;k#@^UV!z}+d>U~(GjjX@h#^ipQguNmkerjf?@afT
zRfEB>kWU^+?kk}aTrF)Ivigrsvfagw{HM`YUwVSE3F`4$O^|bOSPyFFtOV+51`h~l
zhdCxTg<LAW6a=Lon9eQ%#+J+nCOCvX88Jv>^OfrmJJKWP$AP-RiT#qj?EedB4(3Hr
zJ2)_1oCGApx14Kg1v*k^-bT#6iI_bd8Sewhe*>ufBl)j@=ODv=j;nNWrw$yA1QeGQ
zum5!VLgBROgX<z+bm5FMtM4!uBzyUQ^za$f1Tzj)hXkezlYnBgWWU>FVXUA^Rr;>P
zAHE%HTDD|-s0?Fzk;pkWbOYKmjt=Alk3uM8QKrm=o%%n2R1qZb4$nsZX>PrnacFFN
z=V5F1(U09n8|YicGS<`YeS>!BP4_acp*~a*coyUb@`)(5>mT^fOY-~$P>4eoI?t|8
z|Jc0;UDsW{flaUx=FpFReVu!+=yKMlv8?w(gs4wE7?wbLFrPw7{S0;qOg;&OGk?i>
zPlN6QU5#ud-zA{2(1j2OLuNCc%9z_+`or(BJ{M--AFc0Wyp34p=s@kGP}Rew0@6*j
z1ln>h;_s$WPvU)3Wcs};-#N&47QE@>Zeo4G@;u}Bqcv06HVIyU=eP#efOr&~4cXJj
zHMvi5X7zmoQ_2!Z%Pw!5!ql@5EMUBiw$A@{ossYJ$alPt-tRItPa9~&Z;VT@Z6u6<
z$Kk<4+-uPa*%$KRJQI}i*#mnNLj-$F(}$7i5yplGpa;gs{N+0w`RcmhL%(x9_yE`I
zwG0n{?qL|<qYM48blH)AT5!I}s(xHxI=2Mcn~*do&2{g&_v8%1wjX4?A*p=tMaH_1
z?k>>%JGzdq>$QF17PuL1pk654L$Vhd6Ag?roLlz#b&v_C{c`<=GxF_^ER&P3?qAcr
z3OzyhQ0Q7pSI|9Gx_;gfYJWmq93lDd0kvlX)43(^yoo4`9KUm)J@n+OYqm+{+ktJm
zj@Sltf1U1O(RKZ1&;%MmJ^UwgtmOYI=(==ZI=cjP&FXa%QGzxkab5Q7$+tDj$;r0?
z+halZH`IYzPy?z#6{rlkhe-aqCeZrqrw;sr1SJ1AO!{Kj?LOCjQ<85b<XZvCL0Kpb
zC80PJg(8sa9meXy)DPBmw!n052~09+7)L0-%e7yB`IbSJN#(0+xX};=x`!=4<b~Xj
z6S70*RmeZHe4zKaPaXIb2|R2<vLMg3uKoJUSNBCFC*Q1WkAzH+5i&qHq=hsPx(V6m
z49Guq=GBH+@rQ{dW_b3SqI{8Y2;*_OuO;YD7hX=oXPAL?=YESklK+jV%ff$pucDNG
zj|m&@XTRr?FJqvF{(<f{bU4oZ7%&Fm++(C=;*ZJxC+X_`mcVpw325w%ds15aWSE?M
zC1X#{^nrEHpo5lwfnR-d#vq*K513~-M!Jp9ed@rkJ_!soJe=fSSC{=tzO>^VS!#Jd
zP(L{LJV@SRH;jW$@E|ZY?c9^d{fi6?aS1Ij2AX>F;{K3eo^yK!xyhCf0@qob`KQb^
zu9gGJ!Ba4oZ#=ZMg$tM9z1OAr){)ve@}Etx4PwD8flR5-!hd>C#h|(F^F&*b9epu}
z_nAlYUhooj;J^WPz<_&s$8~AG6IR*|A3n^+$M3Q~^IZM>`SYE3hx0lf_8$-7YWqL<
zpO)zP7rq_$=kvV7|B&Ba*lL4<n%NE=+SqN|w%J9C7TNdTf8XxdvE9y|J<E3N*wN0M
zIn$m#ecEc8H}6BfR}sZ=x-QIhv@8F<{qvX5-+Kh_wJ|ef?}m$8Tm~k##M<4vzlGhF
z?@HLgg9qD5lP1~69(&C8>C?w~@BZGsdmZ_oJbBXIc;gL{{g+Vo@6GDJHg%0xE_3e#
zuWJVlVt}7%*|KHMw+{GDhvnNUmT#sw-{;Wx^bQ<2;OwJ+Z}47R-orobUn`w|reLKx
zjh+cOHj#IwXxhJjzaw{j6XJjW`=4E~V1aGlzP)|zwbv5jkM@(E_?BTD$I6!i(}hbw
z_i2uM;RP=4`X<GoB}<mrqeqWATNH1SPG5cXmA=2Zo@29J_^AU&`XtbM#E20|MSRZn
z4I4JteEITi;P~tTDPFV$TK4SO^N&-!?>V*8iWMvLO|s>jIneIEXz`nZd=F?F--Z8+
z_}8voYuBw?_m}OnXV2C*Hm7oGT~`Q97bk%bzBe{*%$PBMk@MWSb8U+jE$qI1`x1UT
zapHvS+qds=PTAq&P8&GdPXd+sKHR?b>(?j9Sqp0O>zillgDqXU)NbCqnf~x_wSDvq
zOd$673GgBp6-V^l-BW7YcvF0QyuR7Hi{FOj%$ai;b?$z?pZO8%fqM=wQsBuP9?7;D
zd=K%o+C%F9wrkh!B;U0jz&9DSyZ)7g%v$kH(p#Vo@T76^b3Knc8scFqJPPU~oNa2$
z54q0vV_^FQNkH~o5c0#>o?Da;bcC4@0fFh#Ngy9d#hfEK-Rt=*d<(anW52*p7bbzu
z9QHNnnr?E>cgZJI|5gX-A~0QA38<d^KUf1%mp18tE;Y5`K0h8c+}D;n9TXQb)VCb3
zTx51vhH5#;S=OZ_rXgC1cNTS@jkQDFW$onK#o5WXi|zr}V7za#dLY6##p*$6-;_Bu
z%kkdcBzk7?pIwSObGi`!Jo}f+zq~f#0OX)vp)*A#mQ}(5u?W%I$A5W<-}bXDvx}z-
zqvbd^AxC+><q*H^j_!Qh|FRtK9_wsB+p@3p&OW}<yGG+C8l`jDxKO1O>nz6?RCVnv
z+QUOkP@K=kROG`6%R|j+cXxIi>ROv~NaE#$T{t#j8S{&B_T?WrN?1nh$u3iZgzYRR
zWZ`VfNFrgM)GVJZowIExp9$%oZP~wEEXP{kMA?UU%l<M!hOr6T<5IPJCY^Y{G~<1m
zQ(}j+Ow-Jnjz>-NEg|$eQD>G<`7PIpJ+s|iEP+|nhoKN;3h|$*J{23SHF2pY`mV;0
zaF+8y3m64@FNQa%{wxGH!$&aBw_J$1esd;{X%3Hr(#Q#EA>ka}ewTCZpC6XPAQEEX
zc6b1$z|^{R>((Zpx>nHwRJUycOwf6LL=j2L+NR&MPd1Ke%dyYHG*DVMKwXG{5V$O|
z@INoh!H@xJ!*%cwOowq?zx-eA+O=P;QKQB?d~5w}%CriOg35a?j`FSXRYi&vnOD7f
z^*6a5{W|H5CcS5wOBNa@X%E#QJp{quDhvPgeakv;WoQkLz>Dxd7>nLsCEqXeo%+S_
z1LHSG_1*dc1qyI4Psq8-?fe!N7Uq1LUdQNI(m25N-xbxWRhvfIGdRcd$l@vH6JQ85
zg|eVLCCEX`7c(VIi*@;QNoWW<?^t*mCc{gV`GrcADlH+u-!Y#4oAO_VXZZE4c$J+o
zL+88YDd^s+{9N0xQBhIOu}VW}k>-(d<;v}<T)FZJor`l$0@;J)u6!s@u}~P&L4qvK
zM-KkS`O+!KTz)4#j{w=BY<vQ?J)vsVs!Pb%H{|md<x?<*WTT^_opNxU-s*ezDV00v
z@3IxHF*s?&#KbshdNSo)zp}iEb1y{}ldy*|<mY7=2akf{g?utMq$+N*pC>QHvFuO_
z?t_Oxwl<yfjH+3)<|NJ;$NAU7A@Xus`BItjS(_tA4x66uCa1>Mla~2x>q;wQ#*9wd
zMT-`-B}<m{Y~nPs|CKzfCQqM{w`t^2wlEcBmxG`ms4R-jq2QF0b0wPCE;-eN-f%xm
zfyt!z6!&Aigs$gNPTBV%Z1I%JtbAyEoUvIO5fO1o%S`5ywHe7GbLPx8SFT)+e-I-q
zGLV0qByWe2#ZvM*m)QG?@=h7XgZxBg>JByFFa27!sg9Kmjpexi5qDofo^O$M9P#HT
z&U0Mn(fOq7+_`geKVoF6eEMu<xtQ(L5ze_8o7KGlPM(l~BMb6)3|ag{eitK)S18M?
zlxsAoEix7U^3H_Tty`<keVzTMQC^jKAL$&Co|Uf3%=o(##}uP<{)@@~r94*g#fzJY
zwaP1Y;P{BjfGqY_tXOdgJ|dr((W_T4|Nfn9p%Ag=R^;_9Wj(Ai>v*N3IIMWgHM$Fm
zV`nX=-utb0lI#7Lde>S|8sv#ggS5_XdM~V&69{El_2;?eF8@%>RUA?bmXCU}plrXu
z_R!E!wLJ@g%02_O!zsr4ow~Ph;lhqjYyGToOz+K3lac2$$fL@UE(7^voAXTz<q^{G
z9<5Nyk*6@v-IV10!^Pcs@yfi1xDoHk<$hoNmXYVuBKgfZKAdBaM>_6rOrM{$LCay0
zq|I+$`DK48*dXO}VzJ_rVspWQ1s&O_tiCd<?4)@H&#(NqCA+M1hfp?^U*C!?SDW|F
z^DIhH?p>}}i}#aPaw!-?84K~eZgZX;?Z`8v+(+KLGt2GxesEjf8w~lP-S_ZIj(J%w
zTMc<+<Gr@Ic-KG$-sf4G=aWcB-)zzMD@s;nTY2Pyd~@<lnPjMMTp6Pg5|OA(T9+)6
z+kVNmWgzca$g{pfR5O-mH=FPs2&j%+GV)tEdDVA#vw`;0w!Fx#QWc&hEXp$}>9Be1
zJ3Tg4sfL?Q1<Kik`@I`OIrhthT~x2fv!6a$t6ib*bLqRriNB?CPFY;CGAASFgtQ&|
zpgj8KlxL^PZ$9)@1{*2Pv#@!v7h-9`G5+akU;NmC*yE(3biB0u_dWNrXA|B$`SYDS
z4Rph~Q`(2vV@grB>-+E?hf%ywek$*67=hmKT^*YjU%s99myDUnw~oHxoj+T6@8nxN
z*NeWrv}NNZ(Y1VF*kryjHih@mj79JDv7H?F%Qe^nzD0W|;TZ4Ol;@rd{C#9G>HL1q
zw4{rY*m6<)HxvFDPI)pwD7uqAis7G4$X7$&+qE>FZ_52a*-rBQq9Z)N-yc1r^M=^)
z4R`R~{Xu*m;V#~-a5wLn+G7p(_nDh+cE35H?@H9Zk@vmqBTn??eI$$AccN}!2<x41
zct#YtOqj(xl6Wp<{F}%FUn_~cqY7V$EPkfUA3!AN`RO;|AS9nwdd`vmRh~ut65Cxy
zjC+Foprd;q=UasD@=SLx^nxBc_v8I#l%a7Co^x&Ne)oB%bbXxfJyTY0<K?j$-m~=^
z-#h0SoR_EL57+a2cO2!x-}Q~BTi)k6Z_=yq|J|JjcvVFf$LHncg@lAa=%IxYn$nwq
zlt>6tM4EJ@Nbgme0s*C08(kEnufQrrRuN)Bq)1gjTp=uWP*KW8+TGv(-uEE1(A~iO
zzJKQB-YMtIoayJx)Zi|kmpBW7G};Vv+P(tCIKKk9(iySQ^||MyB6s|3=Ir$@w1?^+
zu0#K&_dnui7N`Vd58-<>Ca3_WgYUsL;-a15pm&p^6Lz??@wK1k{Dvu%{ZRNtrfaVO
z8{vN&HtX-vh8KkPe%#GCgYq6iIaBVPpC!K*bKmT7%Ks;Ls0Yt`koU>RQv_`pGL`~=
zq12nq$bBSrpy=z!|4eM*Nvk6HP#SqD1Rdd#$YL=0L7sg|e)b&a^a<Cb-R|SZ!B=sh
ze*b!p_CJe&k>G2PxUN8>A2c_G=gyQb>DBv&GZoG`HvKg%=MJc{xVaWkN5bd>>Nw@~
z_Ezoy`Vu)Ne@4B+85je(|G78yqCa<+9ivaELEg>>N2pVOk`A&Wdt2FxMgrOVR|O40
z+Y7WKzY~speggR@{3Lgp^`YMUoA!ZvbBTZT^E<!*5D9Me$wh!ZKx;Q=0WzA4{2xYn
z>~QY0C<8sR-<CabR*(*aK)buSbEf?Y@&}a`t`Xp@GjIf`4s6&?xDuSJvH_V{OZyrH
z-JgT6fNXOP1LQ-tQ983efHo!cJZ&hv>yCqRpcZHW+Wd;VO{U*$NqLYT{()Lg`v|lH
z;owf6j6~21Y%?hzhtK~&2kFXwHw2neQ2x40*S>e^6f{$Yft6_I-*@i4)?JTZ;`acE
z2S0*c#1Y+yGkz%h;)4l;Oxyf_gexE?_FYPQaSwqX0e)qZ=ce5VB9GIN7deSb=M+39
z_n(ZTV(3$YHbJXszRORJ>Bjv5>BFz<G_+9XY#Tvj(Z1h9bnXGrk)a%SUh@BE(6xaw
zT=Olmzmv1nzJT|iEwlPF%C9H<Q?5Dc5vBs54)_tyLp$hKivRg-pO@brcPv;16hC=q
z%Le5x+3*lYDrgEPt<VvCbLm{Xz`M*m`PmSiXUf)2`+Hpd-U6mV2lXyvW6H7><?saM
zP>4Is$%ht$DCdUGJ#Q_0QD>j!%&m7g(~oZrX+L_Ak6EIr+ns4EsKW}^eGXygayHQf
z`a$ASo0BOVIm<>`^f4R=#nL(02gp~Oj$d%e3)d7}*Iam4J9al8&TfC^kaMq^(p6o3
zj&`du{MCnk+T+!f&ss19dDeJ1Yktn~!O#3%oUe!6?x2qBrJUlC+bQtZcqaMrC+$3O
zw0MCwbPRdOSfVE3d%Wh{gE473a-NR<eg<d6t>mnlmiQqrOfJv`ke+=%r{qF(J*76U
z&D~_&8yE6ac#(4^J9Kaejww)%bLl>D?jVh>#hEV6pby&XkAmi$oY%FC{D9Yu$ffRl
z)qSJ7XYLUHkA?SobMQ~y2|@17n*d%?tbo6Hj4@tDj>x;BO(^@kwCnhpy@0#wXb0Y0
zjhu&4N8E(T14z@p<6{zT`i;<==^pT}C^^HdWSm_;Gv=c&Zc3j^xoE8O%q#SB|K@%-
zcx-k8nvsX+KXlIb)7grf!KPF6(?{tG{^IO8c#nCNdO_QevJP~A3TW?juT~I#bAc%E
zG=6&=qR*pmj3%9E>Vxj<*4VE(^+|V28h`L8$Ss|*iuZ_jqSX+I^V|z}Icw@JgoX&t
zNP2-bjP|H6v^D_hr_~R7D7%_{IYadfcYM+2b*24k!T+6xa^J`{-YusOjU^AL7eNi6
zU2?n!d<&?{ezXf=$coONsS6bU6!Kym^7cea(#}Bs&ZeCpUxHH;#@3fBPu&-d_wsq%
z<R0>ud3XS4LXo!ant2@B3Ig?q{>Px@ZOZXUWFV4xaBJqP$U?tq)Dz@m(+SQwJ;%J~
zQ~Li7j1l-huqk0i1LWJh2eyMFfN$zsbv}vCL23zJ0Q1R*(d1vrO2`N8eF^HGZP%OR
zxbAM{Njb);CrsXnjM?Em0(vyw@q<>KiyKgndD2tl31w4&Ha%M*?#}+wIbU=Oez$|&
z@U-C|W!sQ?{xf0P5xzXU)+H~h(7#qBF1{J+hwSZj$6p#`LE|i)$JGN&1=GJ`9P|X=
z!trO{X_E48F_}a>nT%iPE|Z2aips{&e%W@suTb96)aRv)$4=6=L0_>S=#v|9Pxw~)
z2IP6#$DCz26<L@7?JH^1kmK}xbB{+}x+2HK6%h}gtI0#^cACPxFG~EQz+v)<{LV(a
zj{=SRhJ!H&Xe)~I-L`{IN>?-qmTu`270kZ{<_AZe`)M|k_8YXvl_?u|QC%$!B(u7M
z%e9E{c`bNtgZ$D?Pgub@rtrS-Gw$M}O-S(uem)?MY+xbn20UsUqc|R?T`B((`C0})
z$c4e5-+wvx2tN<;UE^QLLirwiGYf$KEpc-Do;81}%vlmMxd-VJXy0$LQ(hPOMlS4o
zDSv}5_%#{-GPS#L&NQ^Y`XPM<`7o6BU>e^72J-z7D9HRG{Fr^dz3W%<4!$(+vFAMB
z!{Z3vmB!y<KwXn8WF>zKuc!Xy()va1+h^x?LfToa##Va?4NY*LGbR|Cbnl{FCpP2u
zXTQ4uV+PkVrdYL~%p1t+lCK%}bhpfaDV*_)>;yN*AAP!Mr}@<sqFdpNVc^T3{K`Nc
zlmPWX#TnF<y!h=0$PZUr@;STKF@}P>J>DhCn|{y-F0j~`iHyCLL0c^4QThWyHv~?b
z<Ov*M3RgOB`cVI?!?V_NmVJRNQ#b7MM&7_p1Ml|Or8ly$5A{~w(axkKA9BNgY1)9G
z>?iO;T4o-Y45Gl_CHEwC-6sQNJdNsx=GxNXz&_@(<|wntoNJS5(w{XEWPUrcvV`^`
zGzK1N$C)UxB%}4GN4)Ih;x}<+-o_Ef3C2xd8$y5JPWvwJm8bW-qbH49e8g`aa2-)}
zxoVgcLC4IHxz3t^?tAp8{E-E_&u2Vjf+iAyckW^rEBR`kWb8#*r<}@ft<Bu84;kdz
zWJ=dy9gOjg?s2!z)c-fG+Kcx<se>>Vc{PJ&$d&z9zrMfTcp!JBNl6=)iaDcwCnDoO
zd;TW=g?_BJd7j5#GL-K-%52GWbrTr4%j7S}dJW^Y3XBzV(XV@|!S_hO*xv3hBWe3=
z8;m<jFc}5*uuss-lq`45Ol6F-<9pTuPdj%^tfN01zkqpD4f?Xi@V^!`(H#DnWJLd+
zlG4KDD|*7d(*YApmW-TxKWA)VZ)b_cl`@P6k2?1Yc<R9ab0By=i6*s9eWx`2UE#w`
zSols;sVVbS#=R@xb+Pyb1J*Idr9Yg(Z_Q^WA`=z+Fs_M$|7^P<P;LMH{xmX0>zy^7
zR<W-G|Cl-3XTFaS|BU-O?Pe^@@8`fE(Di55G%CS=kj8b|tGM5v2`1_V_&duQ2Ic!K
zJoW*-faWe;K}XOIJOf&Tva^r@e~pLh-sjBwqtmh6JT}iV9lZRt!qwchDQE<q0-7s7
z2{fOp0V@5#nD-%Mz;wUQ`46HT*PAl`U|qn=Uv=CV5Dm1xr*)n3;1QttqvkqA85@T&
zUv}<=zMr!ofbxIO<b4a7hA*uR+Wg^aEk|o+`GDrRTJOvOw05ZZf5=$z|I+=;JhW>J
zH^ZbGe>s1d;ZO70v>**g1vK9e1Od$HJ-B|;#sACqIsYQRv+=aQV6O%F`16NHH!|)A
zba%9&ZM4tym7C!G{}o&_;Q`>k6jNIIGS>F(^K`|ZKwn^=KPs2?95zUudsbQdvG)`Q
z;F|sq0RPPSQpeeQqBft$;cF-8Zn<2njdSS{$Dg2|SIY_y*ZLOgLeANqf5Ch02Y`RE
z(1Sbt&O7VGyU-i1ZT0BU)tWG2jMcn(N6vHUX6@Yh1!wJSvno|;0{<OAs?CJU^nmb>
z4no?`bw9SpGufIl<z?%`57$|P2M@NEE?r`ur>L_Q_2_-twCRq(_hSzT?>;svv!-_-
zBBGM@-FHW<S+i!@`lu~iwzSYyw}uaAF`wu6-+#Bz#a>UK>ntMqqPyQ*dpV;>nKGp|
z=`2T`tuuA%RL(j5);?F~x8HuV`A<klu*j1y;qF10`&?B>*sM%CZ~#S^>pWimwf>Ru
zs=yDx3+$kt;ascpKK6CaVdDJw<Bvad?u_LB@7T-xf8=P+cJ107IC=7<odt4x^yp!q
z`KYpAxpL(NY-*%)_Mkp4WT4mR(WB3vI(5p@xqsxxQEW6;H*3}`9{U9Liyq9npQu1n
zg@%Ss<!sf2wr$&<!p=nNy^{BwAOsr(9Q(W_`-lE{03Yoe)&kW*Vm(}~kyik%fp;H-
zUk~1+@_qtH|2pxLlYd?Vk0gHi0RGnaW)gS~Bra$DPAm`nd+#0&%_tTUp{6*F)n*)a
zU+kj}q(Lj?mN>a?-_aw(j_Y4%LL=85r@x6@=il4^8|MV|o&Ay8CPxIt>VwOBGzxB<
z_kY`kaGx8m_bE6-K`zHV+{pFuX(t4~c0!eLKZ^4w8J>7I(b=x;Sn<wlE6(f2dR?@m
z?dJ-Yi0#)ma+&g6Gdu)2?|td`(vA0~d;EH?ijyb7-*L|s^SZsgZb{q%<We!v8eBXl
zg5AeEIVS=eL!T|N&-K}kH|5(1+Wk}{Cppgxx`B_p&~Lr-<J?c#qrLzdf_&gIn{NKc
z+ueH<-xUbp|Lh<J^ps63?o{R~v+29qkn(Ks4LAcRJRAD0ceCi@JK<M$x378aaJ%ul
z3djO3+9C7%n)b-VaZ`^kyw_E{via82iF8Nfz6Kq0I6vTBY(RHn<9Uqp7|zO`lLW2_
z**#(dc~*Y0gWajHibHV`=P2CvKsMDXqgy(Q0{>U$vmfu$fij>C@sGfL1)JU3*sCss
z=B?226E>V@eD<h1OCTxwW&bIgRrvJTf1V+ZABk%VaV}TfN`tgwaa#hN<q!svJWGP_
ziD?hz|DvE77)o3(VLv<*`{Bjja}d76jy6H|r?MxNJ*w>aZ{;ii`IRlb>^BvMY_G`&
z*<l}18l<&EX_B_=|DOYmKp~(rLN3zk6C~b=zq~-_XAB~oY@%mi=e>Y)71lEbJqXRG
zm5$CFkd3#_!oRK!>~-YlT5_d0WWyhh&7W*h8RyDAS?60EB<&5N0bX>rg>1C@gC{|5
z;3MBOZrs?-cb)$+9h>}lrAn1rOZff7^QYp|*#NQymo5IiwD(lpv;np~xa|MEy!<Iz
zL=&{>d<gN<?;`R1pe!@O>s;h;H)Z%MWqDrbV`R&g&9<eN4fnP3?uPGVH*5sAH@xqE
z7yl>5)%9KVC@d_@KBGglh$iy$SJ8-!&15XDb8GaB2V2P71j$AOcHy$US6#c@7M}Fz
zFm1c%pb&ohJFsn=X>$UC&}YoS9%oMM9&)qyQH;Hi3g|QQE+mq0fgl)vY0-_$=)e<3
z9K2T?7vbZ};Yl>8-BR12dawF|?EY6YdujLPjj`)slJ(FJnq{}0H4ijGXWl~W-9TfB
z^4K}$cWnB~RYiZ}adc5*aD{06LVpN!XD3`9_U|%hM+cTLvV{)ieg2~C`IN#>8pmcj
z74Piwx!lG~v?WR3&DJ~e!~{?lDalXS-DZzq--SGtJ*VtUQ$t4>G{~-4cFE+QZO<t?
z!ZhT${6^+uUy3{krYys=5r+3F1KCsi`Q*(h1M-<c&P80zZ{8*STlBcD<41L(aB=oa
z+pu3e2tC@mPF$j|#WUE_vA48%33j&qp*hs~ru>zi_*3oKUnfkhMvgso$#PCUC|_<w
z)75+|A<R$L43{Pg`*<Bmqb7M)hW#w^G6ET>!&-Kg8tD0Lu*|>M-&l^mV-0Aj`!sw0
zlPvS{9Q1)-#U|uybYiw+Px>TfQH*_IzV%$n9y#CE{ekXuJbXWet~37MBcAfeUP<IC
zuf0cnBVG<ev&Jf#SC#}5!9j2-oX%AUg7(nY(XSqdETe-mh_su>vTxa$v`4c~I}%&7
z%FqU%(pz1)&N8b$!-n&B%N%3>ro&)#{n6Xb7=z6BLeBdkZ!OSIAIf{a6+ySBIQ%u~
z%e!jS8+ceke$;I4$YWx9oV=H^+X(OwNIXB{U)iCU!C)6)U%|^ua0cikZ_5oNk2kZg
z{xfC3o?6TW_Ljdx#wnYI9nim+j}7X(mU#tt4Et;^j>SK2CH{9oyKL|L4v`=5mJQyD
zo?^fHB=#Lg9b46Uiz$Qd#D#2)qil=7vqOW%e`;@ffe3J;Ckq}rf=|F{lesMA`aW&V
zX=L7V_DnNDdukA{jB=@uEd0l@CH$7}--G?fkn`5)PJD|0F3_<Y8~_Kw4*(wA&>wt;
zc9(dhH(nXkKTqCoamuGmE7kkYpaK2W+gf`HL)~?v37kQm5pN)Q?oJ?1_%O%8FJKtD
zPKzu|8qt5^+g9H10S7?);pl+uqFt<szfl0WGtYw;z;u9I*|sr15hwK_fOu1rMg(!?
z|DHCi_66FcR?vRC59>@%&EXgj(xHrPdj|4T_a0_|?xN6>wKBRY)QP^J1Mhl`rVhVE
z9oU2o%oN(9t+e@7C_CgYZ+ZU5PpiJj25nBNoX{IZe6&}#jqg{uM*#VvvT^s5+-NQ6
zb{`aFn=W_uPmx_uf9h99%D6SQ*F&+LgXTw|qrjus6uyNG=3(^D{v`h?hYkC%p&^g!
z5UyYo^b#k~-Z!8=jDc79Yto8(Q4xEcci@>l+3<&<y9Ss8sK2%yU{%%C?6*t26E07E
zbU%MF{<Ua7s-hD}nYSjrr;&%A&{ldNIzrI-f#ukeZAX@6N3;(5>%WGbz{kkOVCdNo
z|KCzxxMe>_*L(r>zYp<rqrT5W$F7mnHmAsfUwAWZPqEk72^x@rJ9_*WuZ%I}hai*D
zv=!sYudf}wCe^nL>*)*nS!ThnmYMV~$^l-+FQPv0q))(aS>(-6G7sIVx3clgM7T<z
z6TA+Ar>^i>xHP;xOP#0var>V}S6qAKwqe>GQLn%$3-&Pi2BDWjp4FqhC`#ICp~DUB
zfzTdamiD3{^dKWk_Bys)Tj8hrP-Kg|_G=35)C&~)jDbhl>B>%7Ixf<28V+8ij<rBO
zYjvjHW>tTxw)`$Vp86)V`8ksl+Jh622htCq?iMAzy2wZAmE?1K<R6~ir(ImQ9l730
zpY|O6mhvCof~N6%Bz<`^!q$O@iM*%2q=)u$pd*-klJX@?is0WM{BG*#WiWnK)}SlE
zIBFyLK7ex|XoKp)3yU=-!+F|~aZbO}i9Rd#O=M^>x^+{boBj+XI$LkXwhw~F@*Akr
zUA*>{d=LD~(KV7TRu}RnQ$g)BUqjdYj*253+uZIf-_A0@j~+1((Z)&FM>g7apEUS)
zlkMSO&6~*iw2x@}$;VfhQC`#eJ{i8#GhP{+U_3ujhY431o@?MQM+?5shQA-_$Duu9
zIOP+nbz+Tc?&9Mnt{RHZW&Df0X#7``?mqAqbBP9P*_Mbgq3JuD#smK{LupGpAp46b
zt2ESm6nTxwO*<Ue+nAc)+O|r;zd5>I6_B+Q`KhlJ4jEH)FMh_6MrI{+51;hL6k-k<
zjqOC1x}+289hQWcta+E4I@G~w>#)VyO<n8>?O%ark_jyf7BnVoG^Q8(jsNRsP1t<$
zJNqo&=K!MnPTNbOxY0wmX2?ndS>|EjOA^;Vpp?lP`Gc9ajXA(vXd8$pWXimT423_3
zXC8$Uy`HAXRbRqK=tVMlf|=`XG6iZ=KP21lgFPS))ZPP)SufE^v6=ip`H>8sN1{bU
zDdvv5O^F!VRob0wov53Gp<V6%xO0daZ9p=8Jf51S`cwZli>a?Wj$)I3*fLA$zxvYF
zhCdDcw5O(Y9Mq$`mF%88oFli_jQEFzs4%Ytlc@v!meQB;`#IX8aLH5DQKn5rk{$J)
zpx&m|unVTc3dUp5I|&S8EZmv)5fvz=3G}V2sLv6|kh@Vbqu*^pBbJyp(AtMF1RE)+
z@zIw8jSHl|-U>9~Th_XifxWkvoLC4pX$pN}>cm4MbT$AQ3p@d&mt7S^0gX8$X;WPR
z(~=YM&=QPZ{HLb$L1!!`eevQzb7jqIHO|ZpG%w8X1?^F`MTEI>?co2(lH2%aUu-f%
zo5nU8-=_o8feryFFEB;`9^l@K{1nidQ*xpoa)SC9H}e)ZH2N{NcQHP@sJqOV(>|l<
zG%oF_$vuYvzE1o9neU0yMz5eVyTYtH=xiz0OFSOUSyr>(F@d%CR{Un3V9#NKwZ@d(
zo|KFQR%)#2@4wt?+_;N1X3Qw7d-uWISv<koz55F*CZ-4UmyU;UZS5w<r!r&g?@E_`
z*4n)JGpk9HCRWd$J-GwEzIE)_G2QWgA$|HV>3}6S+41G2=!$9Ew(SAYJ7K~EYwg;#
z*8279ZGEnN`}SGv&1o+?89xE0bLY-;Pn<YmUHOQ9_Ix$)PSy{5xt+M9)z+ny9&KD)
zoOS;EdEMK6nmwv&$(neGV~;1iYuB!uj~qE-?ccxOs#UAjm$9+2U)QNqX9l0C=gIqF
zFW0btSg~r=s-HJ%)aYaO+|}M_-XhvFdR?64`yl%wt`NvvyLN3Kq0D{liDxR`i)8F-
ze9#djUO$%ZxaR41?U4f5FtSSeRH^00(m3NXNViXd;WZyvxtB}pXuB+>`2N@HTY2K-
zIfZjEiivPGgv_w(yO3f}_kDC-<;FSmihehqt%RItiQ!tuLn=FN3W);$qc$Zs?mBL)
z_kApCSMqnI8|Qt0W%zh+xOi_m3D<GYdHr2z>%@Pqqg*Y><OEURqMlZoo72;h4uucs
zB<Ob<+)_X~N*#z&^4}k9@j|}~^Q|j>+Jh2=k-p2tc=S7|=Ssi)pOSd;gSz}4jE=-?
z`j~a-8|*|cBA&P;N^ol99DDbN`L-K-fpz%Rx%C4H`y`P5iuB2@OG~0}0r<}eYVfWv
z{7fUwHRv|%MaSj$T)A?cm!6Px7!svz|4wv<{CW9R7=<N{sl?TrIIDpi{PqBw7UHlU
z-lqqT@xCj%MlaD%{S#e^o$zy%e(9X<ZjfHj&Ft|@Z$>&e3Zt-!Lvbli;+Eb|XVR(!
z()!XzkESvDG|SL6*@7;|kLbnxCA}Nz-`t5VkMv%oTO%DC#i_VSW3$pC&AQ(7`=C$q
zIkYB7uSIuNT-0l^^#%f%-;m!rJ6bvx(h*6QnKk!ptnub&eLD-^Q-NUC0BC6f(lFNu
z1pdr7sJV)R{d>i!xRr*|;<xrMHD<KSPkdgkm%@96O%X(TnV2KyVQst!^RNi!j0KrL
z7IzT&5Npw4%*~)Da}M@3ia{GRMdX9F^p5U^Xz`|_G?L6yzT324l5I!NqU0m&;jq>e
zS%CD&gK9NdOJEH)I@;#Xqzh-yu8OmV7b*InRcFR0j_2CH$Kz)opv8t~<ynSm>|eBJ
zjjl9v{3je;g4j9iAAqK;0l&z4*8=7|dssgm%e(OEtO*Qfjo?MrXV$Yn0$qJZ;kIKv
zo^SaIUrC4d;CF!$Ku-kd2{wZ>#uZ9lKFR*|0ODN7S_AXniu=$ffTk|PI1hD=W!@tF
zd8}zQe4V_1p1JU1@|(1CZ($FFHLb_rV;|sU)+<<J>^BQt8_L7!9zMm@{+-4hS3c?o
zTTt#Fn=E}Vm;%30j<lxQ%L)7udWN!ph`X0L?7;-`fp}|>zI!}ze+Hn_6_4K&&~(AO
zj{h5btN(=dD%!i!e)+|EcV*(2{%_FP`0b`VjuPjmthFy8JZaQr?_&yly|kP&ygy+b
zdj)%y)2IjRL*;AET1-FWvp)X2K?m<;H|qWsc{xVCXsNsnzLZ8%znXX9OvZC2HTl|L
z2z!#f*h`Fsk4Bukv59p=;`@Sl2a$fcnaJcg(w~5A%t2n7vCh?>eU85DV?PQF$OJa4
z>?w>T#hYB4$dk^btMj2L)|j;4<b1#{DS!5GDwEFKZ#lR6BlhIrtrzj;<-0*f{K%^;
zrzrOykP+mdBk4X?n|e@@@A+1-e<Iz9n|xRXO<(mjQ;d9<ZbimJ$N=d?lCKR0A$RP5
z#32WLk-1Fdv-aIQQ^@mwQ0GWr`+mJy+Zce1maj{@<;Qr7t(9AO+_@T>z=gjV7rbPf
zL_Mdj<@<#?J{h^A{3pCk{N#74>7+jb8h7x09`$A*W&JL?G-o+C4mzqsmw!N;TS?mM
zmwmDlQJkwh%4A;lUy~YsTpLdrzXlsj*U87thy|>@&St-NF8N#Yka3MUXu`;+lF(QL
znQ%`eFIJp2nObb5J<E0L>1$stN)i)<eeW=itb5CtD(W-Rn4(cHo3^nR%$zvN1scro
zukpxuw$`gAVCH{J_=+<osK9jg>FeV^J9l2-+~(sV`En#-%dVOYvc=yMX&$W;Z@Nq+
zuNU!g1!Ix28dFQY^CNFe48o}As_Hi>^7y=|Cxk(qn?3Mc5A8Q4XkRlT8wNQw-8V7P
zOJ{G{xe7Z!Zz{rD^yK!7H1*qkVpi-vZ&vQ3E&3OG^RFQP-4bZV6VEAbG2)x@?lQT{
zk2CF&^Et@&$nQBH^c(5}byR1fyTXRwR4ljeDcBV4_Oa>ohofVm5%<%eDX6lYJ}B=(
zqQ1)oei^Z0CZg{S6LpTZm^5{kK1Le$T6P}lXK<_c@txwb5O?>V6eeZcH6}f2`PQIy
zMuq=*>N{oN>ir?f1>W5xuZ*q2^9&u3_wUf(UCmfG&dQo)4rAjFc-KhzuZH6uJ|T1t
zu}6v(n`I3gIK=AEp|`bs`7*0sy=RYe29?^Ud;K6^S(=R>KkerQ3+7wXrcJfJ`Q{sI
z_3D-TT&};(2HOA4H{W<iwy0VU)Ee5FHEZ@Vw$=FQZ+WnJZ?$8`jx(!PtvWqp#*F<#
zh71`&!uPoBFJmobOiawc1`Qf$+^Vr;9&ig|jLYJ><$svtDNJ#Y2R(NEw%4Te<5nIm
zN6>jyj;Gy-rPmOy46k?be5Zj=?S(d5EBipj8)ofi86!dVb0A(|xgs(2UXUN*9Jo-&
zwkM-UGdaP<bqfEh*C{k-X8vke_jg4{M`z^!7}m_ka>w3Wf@&_Yi@DuA-i_fKON>=B
zj2t=Ar7#MsJM5yOqDnCL?1qifQfx}T!A|B>V4}Ia>;d$SZwK(R1ixJgQyhEi0N(dy
z4!b8jJo8C=UMxL%&FgfhnDoa3g84tdhMR98%zK$bpCrs~Y<YT9H_qDgK0gm*RggNA
zv1M7tuMabZujS}w%LbqXgN<wv^rytde9Sv9J;QJ955$>(jHgXb#>G*Lx9c$e7)1ZS
za20bj#()K0!(E1+?s&ep6kVqYqc&Ls7d>f=U!mS6?W!{-`yR%Uj2{<%?%WMjY&7#Y
z;>$E2cdIjxN>_U#VJ;s$x%%Zd;V&F9wHXiBVtzGqBl=h%4`aT(j63VS!5p9u<I--2
zjcHlJPBrl#Hv_1wBNv#QAD=h*S98w~<EN3hY0>2heTR6q5${gMkxiEp?CQRh=_FIM
ztR{HO2owC?+oodQnWp!wvnIp%Urg|nl_txgBPMk8yC%F%wZzF@{B28jGySW!!eer0
z$!}`*`QBujg=jZ#Y5eNs<9&#!sHLr>o(Ku7$21=GvYEL1tm(*nEJxSHgy3!Yqyk?0
z<{zBiM6LhI-cygJAI-CLD=f1rdXtZzC)fn9j0;F}*b2+|r4<mgggKt)^76VtRH=fy
zweH?+=E>Q!mRP-ePn=BpSLb;WaXj`|_LLhoeE9CRZCig>uwb5@u}OHp>eHl2lMUxr
plw}X23TrYs@L-qFl^)}+(Xz+lQ}2a%aGab=pjZ;)9RFVc{{uv1>@ENR

literal 0
HcmV?d00001

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 47ce664d7bde6..2215ce38d1e98 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -102,3 +102,9 @@ test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 test_full: test
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	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
+
+$(BUILD)/$(PROG): $(BUILD)/micropython.res
+
+$(BUILD)/%.res: %.rc
+	$(ECHO) "WINDRES $<"
+	$(Q)$(WINDRES) $< -O coff -o $@
diff --git a/ports/windows/README.md b/ports/windows/README.md
index 7b5f92f10a4e1..2b3ed44599918 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -135,3 +135,13 @@ For more info, see https://www.winehq.org/docs/wineusr-guide/cui-programs .
 If built without line editing and history capabilities
 (MICROPY_USE_READLINE=0), the resulting binary can be run using the standard
 `wine` tool.
+
+
+Generating the icon file
+------------------------
+The windows builds use a .ico file for the executable logo.
+To generate such file from a .png file use ImageMagick, as was done for the icons in the logo/ directory:
+
+    magick convert vector-logo-2.png -define icon:auto-resize="256,128,96,64,48,32,16" vector-logo-2.ico
+
+Note that for versions prior to 7.0 the command is `convert` instead of `magick convert`.
diff --git a/ports/windows/micropython.rc b/ports/windows/micropython.rc
new file mode 100644
index 0000000000000..8d92bb0d81ea2
--- /dev/null
+++ b/ports/windows/micropython.rc
@@ -0,0 +1 @@
+app     ICON    "../../logo/vector-logo-2.ico"
diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index de04975cd498d..d5affd9e23ba4 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -103,6 +103,9 @@
     <ClInclude Include="$(PyBaseDir)ports\windows\*.h" />
     <ClInclude Include="$(PyBaseDir)ports\windows\msvc\*.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="micropython.rc" />
+  </ItemGroup>
   <Import Project="msvc/genhdr.targets" />
   <Import Project="$(CustomPropsFile)" Condition="exists('$(CustomPropsFile)')" />
   <Target Name="GenerateMicroPythonSources" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders;FreezeModules">
diff --git a/py/mkenv.mk b/py/mkenv.mk
index d3dddcc32d9e8..b52dafbc9d0f6 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -54,6 +54,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
 SIZE = $(CROSS_COMPILE)size
 STRIP = $(CROSS_COMPILE)strip
 AR = $(CROSS_COMPILE)ar
+WINDRES = $(CROSS_COMPILE)windres
 
 MAKE_MANIFEST = $(PYTHON) $(TOP)/tools/makemanifest.py
 MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py

From dff293840e381444bcd843a325ab3dd7da685733 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Nov 2023 23:34:08 +1100
Subject: [PATCH 0544/3129] extmod/machine_i2c: Do a fast poll during
 I2C.scan().

Fixes issue #12912.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 44e6921309e53..6cc2aa5bbf0e9 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -328,7 +328,12 @@ 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
+        // This scan loop may run for some time, so process any pending events/exceptions,
+        // or allow the port to run any necessary background tasks.  But do it as fast as
+        // possible, in particular we are not waiting on any events.
+        #if defined(MICROPY_EVENT_POLL_HOOK_FAST)
+        MICROPY_EVENT_POLL_HOOK_FAST;
+        #elif defined(MICROPY_EVENT_POLL_HOOK)
         MICROPY_EVENT_POLL_HOOK
         #endif
     }

From 4cf741062b20fa34062d236d56b2168515e990b4 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 31 Oct 2023 15:14:05 +1100
Subject: [PATCH 0545/3129] extmod/vfs_reader: Add file ioctl to set read
 buffer size.

Can be used to speed up importing a file from a vfs based filesystem.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/vfs_reader.c            | 50 ++++++++++++++++++++++++----------
 py/stream.h                    |  1 +
 tests/extmod/vfs_userfs.py     | 18 +++++++++++-
 tests/extmod/vfs_userfs.py.exp | 16 +++++++++++
 4 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/extmod/vfs_reader.c b/extmod/vfs_reader.c
index 3c6ff52a991b0..13fc31bee5080 100644
--- a/extmod/vfs_reader.c
+++ b/extmod/vfs_reader.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -34,33 +35,39 @@
 
 #if MICROPY_READER_VFS
 
+#ifndef MICROPY_READER_VFS_DEFAULT_BUFFER_SIZE
+#define MICROPY_READER_VFS_DEFAULT_BUFFER_SIZE (2 * MICROPY_BYTES_PER_GC_BLOCK - offsetof(mp_reader_vfs_t, buf))
+#endif
+#define MICROPY_READER_VFS_MIN_BUFFER_SIZE (MICROPY_BYTES_PER_GC_BLOCK - offsetof(mp_reader_vfs_t, buf))
+#define MICROPY_READER_VFS_MAX_BUFFER_SIZE (255)
+
 typedef struct _mp_reader_vfs_t {
     mp_obj_t file;
-    uint16_t len;
-    uint16_t pos;
-    byte buf[24];
+    uint8_t bufpos;
+    uint8_t buflen;
+    uint8_t bufsize;
+    byte buf[];
 } 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)) {
+    if (reader->bufpos >= reader->buflen) {
+        if (reader->buflen < reader->bufsize) {
             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);
+            reader->buflen = mp_stream_rw(reader->file, reader->buf, reader->bufsize, &errcode, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
             if (errcode != 0) {
                 // TODO handle errors properly
                 return MP_READER_EOF;
             }
-            if (reader->len == 0) {
+            if (reader->buflen == 0) {
                 return MP_READER_EOF;
             }
-            reader->pos = 0;
+            reader->bufpos = 0;
         }
     }
-    return reader->buf[reader->pos++];
+    return reader->buf[reader->bufpos++];
 }
 
 STATIC void mp_reader_vfs_close(void *data) {
@@ -70,18 +77,31 @@ STATIC void mp_reader_vfs_close(void *data) {
 }
 
 void mp_reader_new_file(mp_reader_t *reader, qstr filename) {
-    mp_reader_vfs_t *rf = m_new_obj(mp_reader_vfs_t);
     mp_obj_t args[2] = {
         MP_OBJ_NEW_QSTR(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);
+    mp_obj_t file = mp_vfs_open(MP_ARRAY_SIZE(args), &args[0], (mp_map_t *)&mp_const_empty_map);
+
+    const mp_stream_p_t *stream_p = mp_get_stream(file);
+    int errcode = 0;
+    mp_uint_t bufsize = stream_p->ioctl(file, MP_STREAM_GET_BUFFER_SIZE, 0, &errcode);
+    if (bufsize == MP_STREAM_ERROR || bufsize == 0) {
+        // bufsize == 0 is included here to support mpremote v1.21 and older where mount file ioctl
+        // returned 0 by default.
+        bufsize = MICROPY_READER_VFS_DEFAULT_BUFFER_SIZE;
+    } else {
+        bufsize = MIN(MICROPY_READER_VFS_MAX_BUFFER_SIZE, MAX(MICROPY_READER_VFS_MIN_BUFFER_SIZE, bufsize));
+    }
+
+    mp_reader_vfs_t *rf = m_new_obj_var(mp_reader_vfs_t, buf, byte, bufsize);
+    rf->file = file;
+    rf->bufsize = bufsize;
+    rf->buflen = mp_stream_rw(rf->file, rf->buf, rf->bufsize, &errcode, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
     if (errcode != 0) {
         mp_raise_OSError(errcode);
     }
-    rf->pos = 0;
+    rf->bufpos = 0;
     reader->data = rf;
     reader->readbyte = mp_reader_vfs_readbyte;
     reader->close = mp_reader_vfs_close;
diff --git a/py/stream.h b/py/stream.h
index 6b5c85ab15c2b..e6e6f283df177 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -43,6 +43,7 @@
 #define MP_STREAM_GET_DATA_OPTS (8)  // Get data/message options
 #define MP_STREAM_SET_DATA_OPTS (9)  // Set data/message options
 #define MP_STREAM_GET_FILENO    (10) // Get fileno of underlying file
+#define MP_STREAM_GET_BUFFER_SIZE (11) // Get preferred buffer size for file
 
 // These poll ioctl values are compatible with Linux
 #define MP_STREAM_POLL_RD       (0x0001)
diff --git a/tests/extmod/vfs_userfs.py b/tests/extmod/vfs_userfs.py
index 36f1088870d81..5c487315eb5eb 100644
--- a/tests/extmod/vfs_userfs.py
+++ b/tests/extmod/vfs_userfs.py
@@ -16,6 +16,8 @@
 
 
 class UserFile(io.IOBase):
+    buffer_size = 16
+
     def __init__(self, mode, data):
         assert isinstance(data, bytes)
         self.is_text = mode.find("b") == -1
@@ -39,7 +41,11 @@ def readinto(self, buf):
 
     def ioctl(self, req, arg):
         print("ioctl", req, arg)
-        return 0
+        if req == 4:  # MP_STREAM_CLOSE
+            return 0
+        if req == 11:  # MP_STREAM_GET_BUFFER_SIZE
+            return UserFile.buffer_size
+        return -1
 
 
 class UserFS:
@@ -70,6 +76,8 @@ def open(self, path, mode):
     "/usermod2.py": b"print('in usermod2')",
     "/usermod3.py": b"syntax error",
     "/usermod4.mpy": b"syntax error",
+    "/usermod5.py": b"print('in usermod5')",
+    "/usermod6.py": b"print('in usermod6')",
 }
 os.mount(UserFS(user_files), "/userfs")
 
@@ -93,6 +101,14 @@ def open(self, path, mode):
 except ValueError:
     print("ValueError in usermod4")
 
+# Test an import with largest buffer size
+UserFile.buffer_size = 255
+import usermod5
+
+# Test an import with over-size buffer size (should be safely limited internally)
+UserFile.buffer_size = 1024
+import usermod6
+
 # unmount and undo path addition
 os.umount("/userfs")
 sys.path.pop()
diff --git a/tests/extmod/vfs_userfs.py.exp b/tests/extmod/vfs_userfs.py.exp
index 05cff0452c68f..be8011d567eb9 100644
--- a/tests/extmod/vfs_userfs.py.exp
+++ b/tests/extmod/vfs_userfs.py.exp
@@ -3,21 +3,37 @@ some data in a text file
 stat /usermod1
 stat /usermod1.py
 open /usermod1.py rb
+ioctl 11 0
 ioctl 4 0
 in usermod1
 stat /usermod2
 stat /usermod2.py
 open /usermod2.py rb
+ioctl 11 0
 ioctl 4 0
 in usermod2
 stat /usermod3
 stat /usermod3.py
 open /usermod3.py rb
+ioctl 11 0
 ioctl 4 0
 SyntaxError in usermod3
 stat /usermod4
 stat /usermod4.py
 stat /usermod4.mpy
 open /usermod4.mpy rb
+ioctl 11 0
 ioctl 4 0
 ValueError in usermod4
+stat /usermod5
+stat /usermod5.py
+open /usermod5.py rb
+ioctl 11 0
+ioctl 4 0
+in usermod5
+stat /usermod6
+stat /usermod6.py
+open /usermod6.py rb
+ioctl 11 0
+ioctl 4 0
+in usermod6

From bbc5a18d092425bee802d88a5c9ed3516056bdd5 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 1 Nov 2023 15:14:37 +1100
Subject: [PATCH 0546/3129] tools/mpremote: Add ioctl to specify large read
 buffer size.

Speeds up importing files from mounted filesystem.

Also fix the return code for invalid / unsupported ioctl requests.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 tools/mpremote/mpremote/transport_serial.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 23a379d16b488..3b4cd00078752 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -753,6 +753,13 @@ def ioctl(self, request, arg):
             machine.mem32[arg] = self.seek(machine.mem32[arg], machine.mem32[arg + 4])
         elif request == 4:  # CLOSE
             self.close()
+        elif request == 11:  # BUFFER_SIZE
+            # This is used as the vfs_reader buffer. n + 4 should be less than 255 to
+            # fit in stdin ringbuffer on supported ports. n + 7 should be multiple of 16
+            # to efficiently use gc blocks in mp_reader_vfs_t.
+            return 249
+        else:
+            return -1
         return 0
 
     def flush(self):

From 2d363a23cb9e825200e772f973eab921a69e0646 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 25 Oct 2023 11:04:54 +1100
Subject: [PATCH 0547/3129] shared/tinyusb: Schedule TinyUSB task function from
 dcd_event_handler.

dcd_event_handler() is called from the IRQ when a new DCD event is queued
for processing by the TinyUSB thread mode task.  This lets us queue the
handler to run immediately when MicroPython resumes.

Currently this relies on a linker --wrap hack to work, but a PR has been
submitted to TinyUSB to allow the function to be called inline from
dcd_event_handler() itself.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd.c | 23 +++++++++++++++++++++++
 shared/tinyusb/mp_usbd.h |  3 ---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
index ea1de674bc1b4..87c10310f7bea 100644
--- a/shared/tinyusb/mp_usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -27,17 +27,40 @@
 #include <stdlib.h>
 
 #include "py/mpconfig.h"
+#include "py/runtime.h"
 
 #if MICROPY_HW_ENABLE_USBDEV
 
 #ifndef NO_QSTR
 #include "tusb.h" // TinyUSB is not available when running the string preprocessor
+#include "device/dcd.h"
 #include "device/usbd.h"
 #include "device/usbd_pvt.h"
 #endif
 
+// Legacy TinyUSB task function wrapper, called by some ports from the interpreter hook
 void usbd_task(void) {
     tud_task_ext(0, false);
 }
 
+// TinyUSB task function wrapper, as scheduled from the USB IRQ
+static void mp_usbd_task(mp_sched_node_t *node);
+
+extern void __real_dcd_event_handler(dcd_event_t const *event, bool in_isr);
+
+// If -Wl,--wrap=dcd_event_handler is passed to the linker, then this wrapper
+// will be called and allows MicroPython to schedule the TinyUSB task when
+// dcd_event_handler() is called from an ISR.
+TU_ATTR_FAST_FUNC void __wrap_dcd_event_handler(dcd_event_t const *event, bool in_isr) {
+    static mp_sched_node_t usbd_task_node;
+
+    __real_dcd_event_handler(event, in_isr);
+    mp_sched_schedule_node(&usbd_task_node, mp_usbd_task);
+}
+
+static void mp_usbd_task(mp_sched_node_t *node) {
+    (void)node;
+    tud_task_ext(0, false);
+}
+
 #endif
diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 3a93b929c586d..2e4feaca9fa19 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -29,9 +29,6 @@
 
 #include "py/obj.h"
 
-// Call instead of tud_task()
-void mp_usbd_task(void);
-
 // Function to be implemented in port code.
 // Can write a string up to MICROPY_HW_USB_DESC_STR_MAX characters long, plus terminating byte.
 extern void mp_usbd_port_get_serial_number(char *buf);

From bcbdee235719d459a4cd60d51021454fba54cd0f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 25 Oct 2023 13:50:53 +1100
Subject: [PATCH 0548/3129] rp2: Change to use TinyUSB dcd_event_handler hook.

This change:
- Has a small code size reduction.
- Should slightly improve overall performance.  The old hook code
  seemed to use between 0.1% and 1.6% of the total CPU time doing no-op
  calls even when no USB work was required.
- USB performance is mostly the same, there is a small increase in
  latency for some workloads that seems to because sometimes the hook
  usbd_task() is called at the right time to line up with the next USB host
  request.  This only happened semi-randomly due to the timing of the hook.
  Improving the wakeup latency by switching rp2 to tickless WFE allows the
  usbd_task() to run in time for the next USB host request almost always,
  improving performance and more than offsetting this impact.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/mpconfigport.h | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 4f76c5864fc2a..15f6f6ca1c288 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -406,6 +406,7 @@ target_compile_options(${MICROPY_TARGET} PRIVATE
 
 target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}
+    -Wl,--wrap=dcd_event_handler
 )
 
 set_source_files_properties(
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 84a961db43e8a..61749f108aafc 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -250,23 +250,8 @@ extern void mp_thread_end_atomic_section(uint32_t);
 #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 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) { \
-        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_FAST \
     do { \
-        if (get_core_num() == 0) { MICROPY_HW_USBDEV_TASK_HOOK } \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
     } while (0)

From 26d5032980335ccdfe81234ad7a24030a580f6d3 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 1 Nov 2023 15:30:05 +1100
Subject: [PATCH 0549/3129] samd: Switch TinyUSB to run via a scheduled task.

Previously the TinyUSB task was run in the ISR immediately after the
interrupt handler.  This approach gives very similar performance (no change
in CDC throughput tests) but reduces the amount of time spent in the ISR,
and allows TinyUSB callbacks to run in thread mode.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/samd/Makefile    |  3 +++
 ports/samd/samd_isr.c  |  8 ++++----
 ports/samd/samd_soc.h  |  4 ----
 ports/samd/tusb_port.c | 27 ---------------------------
 4 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 291a894ab7b07..12223e6ded8f4 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -93,6 +93,8 @@ LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
+LDFLAGS += --wrap=dcd_event_handler
+
 MPY_CROSS_FLAGS += -march=$(MPY_CROSS_MCU_ARCH)
 
 SRC_C += \
@@ -131,6 +133,7 @@ SHARED_SRC_C += \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
 	shared/tinyusb/mp_cdc_common.c \
+	shared/tinyusb/mp_usbd.c
 
 ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
 	hal/src/hal_atomic.c \
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index a12140313b24c..7c4c1d060f768 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -310,10 +310,10 @@ const ISR isr_vector[] __attribute__((section(".isr_vector"))) = {
     &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
+    &USB_Handler_wrapper, // 80 Universal Serial Bus (USB): USB_EORSM_DNRS, ...
+    &USB_Handler_wrapper, // 81 Universal Serial Bus (USB): USB_SOF_HSOF
+    &USB_Handler_wrapper, // 82 Universal Serial Bus (USB): USB_TRCPT0_0 - _7
+    &USB_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
diff --git a/ports/samd/samd_soc.h b/ports/samd/samd_soc.h
index 1848cf7db198a..90a5a57ffa14e 100644
--- a/ports/samd/samd_soc.h
+++ b/ports/samd/samd_soc.h
@@ -36,10 +36,6 @@ void samd_init(void);
 void samd_main(void);
 
 void USB_Handler_wrapper(void);
-void USB_0_Handler_wrapper(void);
-void USB_1_Handler_wrapper(void);
-void USB_2_Handler_wrapper(void);
-void USB_3_Handler_wrapper(void);
 
 void sercom_enable(Sercom *spi, int state);
 void sercom_register_irq(int sercom_id, void (*sercom_irq_handler));
diff --git a/ports/samd/tusb_port.c b/ports/samd/tusb_port.c
index 2098334fbae61..e56ef0fd6af00 100644
--- a/ports/samd/tusb_port.c
+++ b/ports/samd/tusb_port.c
@@ -117,33 +117,6 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
     return desc_str;
 }
 
-#if defined(MCU_SAMD21)
-
 void USB_Handler_wrapper(void) {
     tud_int_handler(0);
-    tud_task();
-}
-
-#elif defined(MCU_SAMD51)
-
-void USB_0_Handler_wrapper(void) {
-    tud_int_handler(0);
-    tud_task();
-}
-
-void USB_1_Handler_wrapper(void) {
-    tud_int_handler(0);
-    tud_task();
 }
-
-void USB_2_Handler_wrapper(void) {
-    tud_int_handler(0);
-    tud_task();
-}
-
-void USB_3_Handler_wrapper(void) {
-    tud_int_handler(0);
-    tud_task();
-}
-
-#endif

From 4679a90097cc881c9d53d6e0dd0dde1c4c2de99c Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Wed, 8 Nov 2023 15:50:47 +1100
Subject: [PATCH 0550/3129] CODECONVENTIONS: Update for change from black to
 ruff format.

Also add notes on running pre-commit manually.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 CODECONVENTIONS.md | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index d44b382b25ead..d6b0a5926bf4b 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -53,13 +53,16 @@ are then certifying and signing off against the following:
 Code auto-formatting
 ====================
 
-Both C and Python code are auto-formatted using the `tools/codeformat.py`
-script.  This uses [uncrustify](https://github.com/uncrustify/uncrustify) to
-format C code and [black](https://github.com/psf/black) to format Python code.
-After making changes, and before committing, run this tool to reformat your
-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.
+Both C and Python code formatting are controlled for consistency across the
+MicroPython codebase.  C code is formatted using the `tools/codeformat.py`
+script which uses [uncrustify](https://github.com/uncrustify/uncrustify).
+Python code is linted and formatted using
+[ruff & ruff format](https://github.com/astral-sh/ruff).
+After making changes, and before committing, run  `tools/codeformat.py` to
+reformat your C code and `ruff format` for any Python code.  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.
 
 uncrustify
 ==========
@@ -151,12 +154,22 @@ Tips:
 * To ignore the pre-commit message format check temporarily, start the commit
   message subject line with "WIP" (for "Work In Progress").
 
+Running pre-commit manually
+===========================
+
+Once pre-commit is installed as per the previous section it can be manually
+run against the MicroPython python codebase to update file formatting on
+demand, with either:
+* `pre-commit run --all-files` to fix all files in the MicroPython codebase
+* `pre-commit run --file ./path/to/my/file` to fix just one file
+* `pre-commit run --file ./path/to/my/folder/*` to fix just one folder
+
 Python code conventions
 =======================
 
 Python code follows [PEP 8](https://legacy.python.org/dev/peps/pep-0008/) and
-is auto-formatted using [black](https://github.com/psf/black) with a line-length
-of 99 characters.
+is auto-formatted using [ruff format](https://docs.astral.sh/ruff/formatter)
+with a line-length of 99 characters.
 
 Naming conventions:
 - Module names are short and all lowercase; eg pyb, stm.

From f07f90f1abfd6784db9c47a5602fae319991f8e7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 19 Oct 2023 12:43:17 +0200
Subject: [PATCH 0551/3129] mimxrt/boards/OLIMEX_RT1010: Adjust the UART pin
 assignment.

Olimex asked for that, getting a UART at the UEXT1 connector as well.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/mimxrt/pinout.rst                            | 2 +-
 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/mimxrt/pinout.rst b/docs/mimxrt/pinout.rst
index b5a7fbbfe08ce..16bb4722734a2 100644
--- a/docs/mimxrt/pinout.rst
+++ b/docs/mimxrt/pinout.rst
@@ -28,7 +28,7 @@ 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
 Adafruit Metro M7     -           D0/D1        D7/D3        A1/A0
-Olimex RT1010Py       -          RxD/TxD       D5/D6           -
+Olimex RT1010Py       -          RxD/TxD       D7/D8        D5/D6
 Seeed ARCH MIX        -         J3_19/J3_20  J4_16/J4_17  J4_06/J4_07
 =================  ===========  ===========  ===========  ===========
 
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index 324cee9b14e9f..1ad2e9df5ebad 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -18,18 +18,18 @@
 // 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 MICROPY_HW_UART_INDEX   { 0, 1, 3, 4 }
 
 #define IOMUX_TABLE_UART \
     { IOMUXC_GPIO_10_LPUART1_TXD }, { IOMUXC_GPIO_09_LPUART1_RXD }, \
     { 0 }, { 0 }, \
-    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_08_LPUART3_TXD }, { IOMUXC_GPIO_07_LPUART3_RXD }, \
     { IOMUXC_GPIO_06_LPUART4_TXD }, { IOMUXC_GPIO_05_LPUART4_RXD },
 
 #define IOMUX_TABLE_UART_CTS_RTS \
     { IOMUXC_GPIO_08_LPUART1_CTS_B }, { IOMUXC_GPIO_07_LPUART1_RTS_B }, \
     { 0 }, { 0 }, \
-    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_14_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_13_LPUART3_RTS_B }, \
     { IOMUXC_GPIO_AD_14_LPUART4_CTS_B }, { IOMUXC_GPIO_AD_13_LPUART4_RTS_B },
 
 #define MICROPY_HW_SPI_INDEX { 0, 1, 2 }

From fbb7c32040c407a60126a879dc2afe07a0ef6e5d Mon Sep 17 00:00:00 2001
From: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: Tue, 24 Oct 2023 10:24:26 +1000
Subject: [PATCH 0552/3129] esp32/esp32_rmt: Change RMT.source_freq() to class
 method.

To create an esp32.RMT() instance with an optimum (i.e. highest resolution)
clock_div is currently awkward because you need to know the source clock
frequency to calculate the best clock_div, but unfortunately that is only
currently available as an source_freq() method on the instance after you
have already created it.  So RMT.source_freq() should really be a class
method, not an instance method.  This change is backwards compatible for
existing code because you can still reference that function from an
instance, or now also, from the class.

Signed-off-by: Mark Blakeney <mark.blakeney@bullet-systems.net>
---
 docs/library/esp32.rst  | 2 +-
 ports/esp32/esp32_rmt.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 7701f43539819..796dbbbc54a1d 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -226,7 +226,7 @@ For more details see Espressif's `ESP-IDF RMT documentation.
     ``100``) and the output level to apply the carrier to (a boolean as per
     *idle_level*).
 
-.. method:: RMT.source_freq()
+.. classmethod:: RMT.source_freq()
 
     Returns the source clock frequency. Currently the source clock is not
     configurable so this will always return 80MHz.
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index f92af636f55a2..14caffddad116 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -206,10 +206,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_deinit_obj, esp32_rmt_deinit);
 // Return the source frequency.
 // Currently only the APB clock (80MHz) can be used but it is possible other
 // clock sources will added in the future.
-STATIC mp_obj_t esp32_rmt_source_freq(mp_obj_t self_in) {
+STATIC mp_obj_t esp32_rmt_source_freq() {
     return mp_obj_new_int(APB_CLK_FREQ);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_source_freq_obj, esp32_rmt_source_freq);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp32_rmt_source_freq_obj, esp32_rmt_source_freq);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_source_obj, MP_ROM_PTR(&esp32_rmt_source_freq_obj));
 
 // Return the clock divider.
 STATIC mp_obj_t esp32_rmt_clock_div(mp_obj_t self_in) {
@@ -357,7 +358,6 @@ STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_bitstream_channel_obj, MP_ROM_
 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) },
-    { MP_ROM_QSTR(MP_QSTR_source_freq), MP_ROM_PTR(&esp32_rmt_source_freq_obj) },
     { MP_ROM_QSTR(MP_QSTR_clock_div), MP_ROM_PTR(&esp32_rmt_clock_div_obj) },
     { 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) },
@@ -365,6 +365,9 @@ STATIC const mp_rom_map_elem_t esp32_rmt_locals_dict_table[] = {
 
     // Static methods
     { MP_ROM_QSTR(MP_QSTR_bitstream_channel), MP_ROM_PTR(&esp32_rmt_bitstream_channel_obj) },
+
+    // Class methods
+    { MP_ROM_QSTR(MP_QSTR_source_freq), MP_ROM_PTR(&esp32_rmt_source_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_rmt_locals_dict, esp32_rmt_locals_dict_table);
 

From 2888c5b23057b056bdeed6fcd2af414ddf2ef0c4 Mon Sep 17 00:00:00 2001
From: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: Tue, 31 Oct 2023 14:24:43 +1000
Subject: [PATCH 0553/3129] esp32/esp32_rmt: Add RMT.PULSE_MAX constant.

If you have a variable frequency and pulse width, and you want to optimize
pulse resolution, then you must do a calculation beforehand to ensure you
normalize the array to keep all list values within bound.  That calculation
requires RMT.source_freq(), RMT.clock_div(), and this 32767 constant.

Signed-off-by: Mark Blakeney <mark.blakeney@bullet-systems.net>
---
 docs/library/esp32.rst  | 17 ++++++++++++-----
 ports/esp32/esp32_rmt.c |  3 +++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 796dbbbc54a1d..422329bf1e801 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -193,7 +193,7 @@ 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
-multiplying the resolution by a 15-bit (0-32,768) number. There are eight
+multiplying the resolution by a 15-bit (1-``PULSE_MAX``) number. There are eight
 channels (0-7) and each can have a different clock divider.
 
 So, in the example above, the 80MHz clock is divided by 8. Thus the
@@ -264,10 +264,10 @@ For more details see Espressif's `ESP-IDF RMT documentation.
     **Mode 3:** *duration* and *data* are lists or tuples of equal length,
     specifying individual durations and the output level for each.
 
-    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.
+    Durations are in integer units of the channel resolution (as
+    described above), between 1 and ``PULSE_MAX`` 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 an earlier sequence is in progress then this method will
     block until that transmission is complete before beginning the new sequence.
@@ -290,6 +290,13 @@ For more details see Espressif's `ESP-IDF RMT documentation.
     Passing in no argument will not change the channel.  This function returns
     the current channel number.
 
+Constants
+---------
+
+.. data:: RMT.PULSE_MAX
+
+   Maximum integer that can be set for a pulse duration.
+
 Ultra-Low-Power co-processor
 ----------------------------
 
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 14caffddad116..5d53018f4ba15 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -368,6 +368,9 @@ STATIC const mp_rom_map_elem_t esp32_rmt_locals_dict_table[] = {
 
     // Class methods
     { MP_ROM_QSTR(MP_QSTR_source_freq), MP_ROM_PTR(&esp32_rmt_source_obj) },
+
+    // Constants
+    { MP_ROM_QSTR(MP_QSTR_PULSE_MAX), MP_ROM_INT(32767) },
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_rmt_locals_dict, esp32_rmt_locals_dict_table);
 

From af52e1ff24b0b543f6fdb3bc937713a6ab94d506 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 8 Nov 2023 13:01:08 +1100
Subject: [PATCH 0554/3129] stm32/boards/NUCLEO_WL55: Freeze LoRa driver.

This adds the sync version of the LoRa driver (and the base WL55 driver).

Adds +13.6kiB (212.6 -> 226.2). Limit for this board is 232kiB.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/NUCLEO_WL55/manifest.py      | 6 ++++++
 ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 ports/stm32/boards/NUCLEO_WL55/manifest.py

diff --git a/ports/stm32/boards/NUCLEO_WL55/manifest.py b/ports/stm32/boards/NUCLEO_WL55/manifest.py
new file mode 100644
index 0000000000000..8998166a3e5a0
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WL55/manifest.py
@@ -0,0 +1,6 @@
+# Don't include default frozen modules because MCU is tight on flash space.
+
+# Only install the sync version of the LoRa driver because this board doesn't
+# have asyncio by default.
+require("lora-sync")
+require("lora-stm32wl5")
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
index 210f3058c1bea..ced2e7619b954 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
@@ -9,5 +9,5 @@ TEXT0_ADDR = 0x08000000
 MICROPY_VFS_FAT = 0
 MICROPY_VFS_LFS2 = 1
 
-# Don't include default frozen modules because MCU is tight on flash space
-FROZEN_MANIFEST ?=
+# Board-specific manifest (doesn't include default modules, adds LoRa driver).
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py

From 3b954698fa036ab34fe578ce46ff9fa5cf6ca4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 30 Oct 2023 15:25:38 +0100
Subject: [PATCH 0555/3129] extmod/modbluetooth: Initialise
 nlr_jump_callback_top for IRQ handlers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Similar to 3883f29485fad21105f6f965d56bfec842b8cfbb where this change was
implemented for threads: when the Bluetooth IRQ handler is called the
thread state is not not zero-initialized and thus we need to manually set
this to NULL.

Fixes issue #12239.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/modbluetooth.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 3417df7a27fd3..cef5151cc9ddc 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1276,6 +1276,7 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
         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.nlr_jump_callback_top = NULL;
         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

From 365913953a4e050eab45c00e637e92f612400b11 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 6 Nov 2023 15:48:13 +0100
Subject: [PATCH 0556/3129] extmod/vfs_posix_file: Make standard file objects
 non-const.

Fixes undefined behavior when calling vfs_posix_file_ioctl with
MP_STREAM_CLOSE as request because that casts away the constness and
assigns -1 to the object's fd member.

Fixes issue #12670.

Signed-off-by: stijn <stijn@ignitron.net>
---
 extmod/vfs_posix_file.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 81a608d2b66c2..2f70789543911 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -279,14 +279,14 @@ STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
 
 #if MICROPY_PY_SYS_STDIO_BUFFER
 
-const mp_obj_vfs_posix_file_t mp_sys_stdin_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDIN_FILENO};
-const mp_obj_vfs_posix_file_t mp_sys_stdout_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDOUT_FILENO};
-const mp_obj_vfs_posix_file_t mp_sys_stderr_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDERR_FILENO};
+mp_obj_vfs_posix_file_t mp_sys_stdin_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDIN_FILENO};
+mp_obj_vfs_posix_file_t mp_sys_stdout_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDOUT_FILENO};
+mp_obj_vfs_posix_file_t mp_sys_stderr_buffer_obj = {{&mp_type_vfs_posix_fileio}, STDERR_FILENO};
 
 // Forward declarations.
-const mp_obj_vfs_posix_file_t mp_sys_stdin_obj;
-const mp_obj_vfs_posix_file_t mp_sys_stdout_obj;
-const mp_obj_vfs_posix_file_t mp_sys_stderr_obj;
+mp_obj_vfs_posix_file_t mp_sys_stdin_obj;
+mp_obj_vfs_posix_file_t mp_sys_stdout_obj;
+mp_obj_vfs_posix_file_t mp_sys_stderr_obj;
 
 STATIC void vfs_posix_textio_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
@@ -332,8 +332,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
     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};
-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};
+mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_vfs_posix_textio}, STDIN_FILENO};
+mp_obj_vfs_posix_file_t mp_sys_stdout_obj = {{&mp_type_vfs_posix_textio}, STDOUT_FILENO};
+mp_obj_vfs_posix_file_t mp_sys_stderr_obj = {{&mp_type_vfs_posix_textio}, STDERR_FILENO};
 
 #endif // MICROPY_VFS_POSIX

From d46dc5e1738d843b83f1668798669ff177119d03 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Nov 2023 16:56:06 +1100
Subject: [PATCH 0557/3129] shared/tinyusb: Expose mp_usbd_task as a public
 function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/mpconfigport.h |  2 +-
 shared/tinyusb/mp_usbd.c        | 17 ++++++++---------
 shared/tinyusb/mp_usbd.h        |  3 +++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index d3bc3235fd4d2..222d5b919d479 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -272,7 +272,7 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
 
 #if MICROPY_HW_ENABLE_USBDEV
-#define MICROPY_HW_USBDEV_TASK_HOOK extern void usbd_task(void); usbd_task();
+#define MICROPY_HW_USBDEV_TASK_HOOK extern void mp_usbd_task(void); mp_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 (--vm_hook_divisor == 0) { \
diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
index 87c10310f7bea..55af3d4fb4792 100644
--- a/shared/tinyusb/mp_usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -38,16 +38,15 @@
 #include "device/usbd_pvt.h"
 #endif
 
-// Legacy TinyUSB task function wrapper, called by some ports from the interpreter hook
-void usbd_task(void) {
-    tud_task_ext(0, false);
-}
-
 // TinyUSB task function wrapper, as scheduled from the USB IRQ
-static void mp_usbd_task(mp_sched_node_t *node);
+static void mp_usbd_task_callback(mp_sched_node_t *node);
 
 extern void __real_dcd_event_handler(dcd_event_t const *event, bool in_isr);
 
+void mp_usbd_task(void) {
+    tud_task_ext(0, false);
+}
+
 // If -Wl,--wrap=dcd_event_handler is passed to the linker, then this wrapper
 // will be called and allows MicroPython to schedule the TinyUSB task when
 // dcd_event_handler() is called from an ISR.
@@ -55,12 +54,12 @@ TU_ATTR_FAST_FUNC void __wrap_dcd_event_handler(dcd_event_t const *event, bool i
     static mp_sched_node_t usbd_task_node;
 
     __real_dcd_event_handler(event, in_isr);
-    mp_sched_schedule_node(&usbd_task_node, mp_usbd_task);
+    mp_sched_schedule_node(&usbd_task_node, mp_usbd_task_callback);
 }
 
-static void mp_usbd_task(mp_sched_node_t *node) {
+static void mp_usbd_task_callback(mp_sched_node_t *node) {
     (void)node;
-    tud_task_ext(0, false);
+    mp_usbd_task();
 }
 
 #endif
diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 2e4feaca9fa19..340637c95f9c3 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -29,6 +29,9 @@
 
 #include "py/obj.h"
 
+// Call this to explicitly run the TinyUSB device task.
+void mp_usbd_task(void);
+
 // Function to be implemented in port code.
 // Can write a string up to MICROPY_HW_USB_DESC_STR_MAX characters long, plus terminating byte.
 extern void mp_usbd_port_get_serial_number(char *buf);

From a00c9d56db775ee5fc14c2db60eb07bab8e872dd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Nov 2023 16:56:21 +1100
Subject: [PATCH 0558/3129] rp2/mphalport: Run TinyUSB stack while waiting for
 CDC input/output.

The recent change in bcbdee235719d459a4cd60d51021454fba54cd0f means that
TinyUSB can no longer be run from within a soft (or hard) IRQ handler, ie
when the scheduler is locked.  That means that Python code that calls
`print(...)` from within a scheduled function may block indefinitely if the
USB CDC buffers are full.

This commit fixes that problem by explicitly running the TinyUSB stack when
waiting within stdio tx/rx functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mphalport.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index d1bba43642e36..4b1c1fa1f5bfb 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -30,6 +30,7 @@
 #include "extmod/misc.h"
 #include "shared/runtime/interrupt_char.h"
 #include "shared/timeutils/timeutils.h"
+#include "shared/tinyusb/mp_usbd.h"
 #include "tusb.h"
 #include "uart.h"
 #include "hardware/rtc.h"
@@ -54,6 +55,19 @@ ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
 
 #endif
 
+#if MICROPY_HW_USB_CDC
+// Explicitly run the USB stack in case the scheduler is locked (eg we are in an
+// interrupt handler) and there is in/out data pending on the USB CDC interface.
+#define MICROPY_EVENT_POLL_HOOK_WITH_USB \
+    do { \
+        MICROPY_EVENT_POLL_HOOK; \
+        mp_usbd_task(); \
+    } while (0)
+
+#else
+#define MICROPY_EVENT_POLL_HOOK_WITH_USB MICROPY_EVENT_POLL_HOOK
+#endif
+
 #if MICROPY_HW_USB_CDC
 
 uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
@@ -135,7 +149,7 @@ int mp_hal_stdin_rx_chr(void) {
             return dupterm_c;
         }
         #endif
-        MICROPY_EVENT_POLL_HOOK
+        MICROPY_EVENT_POLL_HOOK_WITH_USB;
     }
 }
 
@@ -155,7 +169,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             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
+                MICROPY_EVENT_POLL_HOOK_WITH_USB;
             }
             if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
                 break;

From 033361da4a90a441ecb372ca6c541575aef8d8a7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 10 Nov 2023 07:53:23 +1100
Subject: [PATCH 0559/3129] samd/mphalport: Run TinyUSB stack while waiting for
 CDC input/output.

See the commit a00c9d56db for a detailed description of the problem, a
regression introduced in 26d503298.

Same approach here as the linked fix for rp2 (applied unconditionally here
as this port only supports USB-CDC for stdin/stdout).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/samd/mphalport.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index dc38ea2964eb9..3c803403f213a 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -29,6 +29,7 @@
 #include "py/mphal.h"
 #include "py/stream.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared/tinyusb/mp_usbd.h"
 #include "extmod/misc.h"
 #include "samd_soc.h"
 #include "tusb.h"
@@ -42,6 +43,14 @@ 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 };
 
+// Explicitly run the USB stack in case the scheduler is locked (eg we are in an
+// interrupt handler) and there is in/out data pending on the USB CDC interface.
+#define MICROPY_EVENT_POLL_HOOK_WITH_USB \
+    do { \
+        MICROPY_EVENT_POLL_HOOK; \
+        mp_usbd_task(); \
+    } while (0)
+
 uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
 
 void poll_cdc_interfaces(void) {
@@ -187,7 +196,7 @@ int mp_hal_stdin_rx_chr(void) {
             return dupterm_c;
         }
         #endif
-        MICROPY_EVENT_POLL_HOOK
+        MICROPY_EVENT_POLL_HOOK_WITH_USB;
     }
 }
 
@@ -201,7 +210,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             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
+                MICROPY_EVENT_POLL_HOOK_WITH_USB;
             }
             if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
                 break;

From 5e3f0e7f8580d854eb451adbf164a9ab97386d4c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Nov 2023 09:48:33 +1100
Subject: [PATCH 0560/3129] samd: Switch to shared TinyUSB implementation.

Functionality and code size don't really change, but removes port-specific
code in favour of shared code.

(The MSC implemented in shared/tinyusb depends on some functions in the
pico-sdk, so this change doesn't make this available for samd.)

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/samd/Makefile                  |   6 +-
 ports/samd/mcu/samd21/mpconfigmcu.mk |   2 +
 ports/samd/mcu/samd51/mpconfigmcu.mk |   2 +
 ports/samd/mpconfigport.h            |  16 ++++
 ports/samd/tusb_port.c               | 122 ---------------------------
 ports/samd/{tusb_config.h => usbd.c} |  35 ++++----
 6 files changed, 41 insertions(+), 142 deletions(-)
 delete mode 100644 ports/samd/tusb_port.c
 rename ports/samd/{tusb_config.h => usbd.c} (64%)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 12223e6ded8f4..95d0f3bd18f48 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -55,6 +55,7 @@ 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
+INC += -I$(TOP)/shared/tinyusb/
 
 MAKE_PINS = boards/make-pins.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
@@ -117,7 +118,7 @@ SRC_C += \
 	samd_qspiflash.c \
 	samd_soc.c \
 	samd_spiflash.c \
-	tusb_port.c \
+	usbd.c \
 
 SHARED_SRC_C += \
 	drivers/dht/dht.c \
@@ -133,7 +134,8 @@ SHARED_SRC_C += \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
 	shared/tinyusb/mp_cdc_common.c \
-	shared/tinyusb/mp_usbd.c
+	shared/tinyusb/mp_usbd.c \
+	shared/tinyusb/mp_usbd_descriptor.c \
 
 ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
 	hal/src/hal_atomic.c \
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index 35f442d86990a..b3092837cbd15 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
 
+CFLAGS_MCU += -DCFG_TUSB_MCU=OPT_MCU_SAMD21
+
 MPY_CROSS_MCU_ARCH = armv6m
 
 MICROPY_HW_CODESIZE ?= 184K
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index c706331aca459..0201bacffeef1 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
 
+CFLAGS_MCU += -DCFG_TUSB_MCU=OPT_MCU_SAMD51
+
 MPY_CROSS_MCU_ARCH = armv7m
 
 MICROPY_HW_CODESIZE ?= 368K
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 91a7c1a10d879..497ca9a87004e 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -62,6 +62,13 @@
 #define MICROPY_HW_ENABLE_USBDEV            (1)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 
+#if MICROPY_HW_ENABLE_USBDEV
+// Enable USB-CDC serial port
+#ifndef MICROPY_HW_USB_CDC
+#define MICROPY_HW_USB_CDC (1)
+#endif
+#endif
+
 // Control over Python builtins
 #define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
@@ -141,6 +148,15 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
+// Miscellaneous settings
+
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID (0xf055)
+#endif
+#ifndef MICROPY_HW_USB_PID
+#define MICROPY_HW_USB_PID (0x9802)
+#endif
+
 // Additional entries for use with pendsv_schedule_dispatch.
 #ifndef MICROPY_BOARD_PENDSV_ENTRIES
 #define MICROPY_BOARD_PENDSV_ENTRIES
diff --git a/ports/samd/tusb_port.c b/ports/samd/tusb_port.c
deleted file mode 100644
index e56ef0fd6af00..0000000000000
--- a/ports/samd/tusb_port.c
+++ /dev/null
@@ -1,122 +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 "samd_soc.h"
-#include "tusb.h"
-
-#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)
-
-#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_ENDOINT0_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,
-        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;
-}
-
-void USB_Handler_wrapper(void) {
-    tud_int_handler(0);
-}
diff --git a/ports/samd/tusb_config.h b/ports/samd/usbd.c
similarity index 64%
rename from ports/samd/tusb_config.h
rename to ports/samd/usbd.c
index 07fa680cbbb6b..90f2e1bfd95ed 100644
--- a/ports/samd/tusb_config.h
+++ b/ports/samd/usbd.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2023 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
@@ -23,25 +23,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_SAMD_TUSB_CONFIG_H
-#define MICROPY_INCLUDED_SAMD_TUSB_CONFIG_H
 
-// Common configuration
+#include "py/mpconfig.h"
 
-#if defined(MCU_SAMD21)
-#define CFG_TUSB_MCU                OPT_MCU_SAMD21
-#elif defined(MCU_SAMD51)
-#define CFG_TUSB_MCU                OPT_MCU_SAMD51
-#endif
-#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
-#define CFG_TUSB_MEM_SECTION
-#define CFG_TUSB_MEM_ALIGN          TU_ATTR_ALIGNED(4)
+#if MICROPY_HW_ENABLE_USBDEV
+
+#include "mp_usbd.h"
+#include "string.h"
+#include "tusb.h"
 
-// Device configuration
+#define SERIAL_TODO "000000000000" // TODO
 
-#define CFG_TUD_ENDOINT0_SIZE       (64)
-#define CFG_TUD_CDC                 (1)
-#define CFG_TUD_CDC_RX_BUFSIZE      (64)
-#define CFG_TUD_CDC_TX_BUFSIZE      (64)
+void mp_usbd_port_get_serial_number(char *serial_buf) {
+    MP_STATIC_ASSERT(sizeof(SERIAL_TODO) <= MICROPY_HW_USB_DESC_STR_MAX);
+    strcpy(serial_buf, SERIAL_TODO);
+}
 
-#endif // MICROPY_INCLUDED_SAMD_TUSB_CONFIG_H
+void USB_Handler_wrapper(void) {
+    tud_int_handler(0);
+}
+
+#endif

From f567a9255a2f801c8e47d8a1468f1c0415971fe4 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Nov 2023 10:34:57 +1100
Subject: [PATCH 0561/3129] shared/tinyusb: Add a helper for hex string
 conversion.

Change the rp2 and renesas-ra ports to use the helper function.

Saves copy-pasta, at the small cost of one more function call in the
firmware (if not using LTO).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/renesas-ra/usbd.c  | 11 ++---------
 ports/rp2/usbd.c         | 11 ++---------
 shared/tinyusb/mp_usbd.c | 10 ++++++++++
 shared/tinyusb/mp_usbd.h |  5 +++++
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ports/renesas-ra/usbd.c b/ports/renesas-ra/usbd.c
index 7047503864f61..e7252b5f7acfb 100644
--- a/ports/renesas-ra/usbd.c
+++ b/ports/renesas-ra/usbd.c
@@ -34,15 +34,8 @@
 
 void mp_usbd_port_get_serial_number(char *serial_buf) {
     const bsp_unique_id_t *id = R_BSP_UniqueIdGet();
-    // convert to hex
-    int hexlen = sizeof(id->unique_id_bytes) * 2;
-    MP_STATIC_ASSERT(hexlen <= MICROPY_HW_USB_DESC_STR_MAX);
-    for (int i = 0; i < hexlen; i += 2) {
-        static const char *hexdig = "0123456789abcdef";
-        serial_buf[i] = hexdig[id->unique_id_bytes[i / 2] >> 4];
-        serial_buf[i + 1] = hexdig[id->unique_id_bytes[i / 2] & 0x0f];
-    }
-    serial_buf[hexlen] = 0;
+    MP_STATIC_ASSERT(sizeof(id->unique_id_bytes) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
+    mp_usbd_hex_str(serial_buf, id->unique_id_bytes, sizeof(id->unique_id_bytes));
 }
 
 #endif
diff --git a/ports/rp2/usbd.c b/ports/rp2/usbd.c
index 568b6284169b2..8724f802f074d 100644
--- a/ports/rp2/usbd.c
+++ b/ports/rp2/usbd.c
@@ -36,15 +36,8 @@
 void mp_usbd_port_get_serial_number(char *serial_buf) {
     pico_unique_board_id_t id;
     pico_get_unique_board_id(&id);
-    // convert to hex
-    int hexlen = sizeof(id.id) * 2;
-    MP_STATIC_ASSERT(hexlen <= MICROPY_HW_USB_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;
+    MP_STATIC_ASSERT(sizeof(id.id) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
+    mp_usbd_hex_str(serial_buf, id.id, sizeof(id.id));
 }
 
 #endif
diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
index 55af3d4fb4792..74b3f074927b8 100644
--- a/shared/tinyusb/mp_usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -62,4 +62,14 @@ static void mp_usbd_task_callback(mp_sched_node_t *node) {
     mp_usbd_task();
 }
 
+void mp_usbd_hex_str(char *out_str, const uint8_t *bytes, size_t bytes_len) {
+    size_t hex_len = bytes_len * 2;
+    for (int i = 0; i < hex_len; i += 2) {
+        static const char *hexdig = "0123456789abcdef";
+        out_str[i] = hexdig[bytes[i / 2] >> 4];
+        out_str[i + 1] = hexdig[bytes[i / 2] & 0x0f];
+    }
+    out_str[hex_len] = 0;
+}
+
 #endif
diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 340637c95f9c3..83a8f8617c08d 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -36,4 +36,9 @@ void mp_usbd_task(void);
 // Can write a string up to MICROPY_HW_USB_DESC_STR_MAX characters long, plus terminating byte.
 extern void mp_usbd_port_get_serial_number(char *buf);
 
+// Most ports need to write a hexadecimal serial number from a byte array, this
+// is a helper function for this. out_str must be long enough to hold a string of total
+// length (2 * bytes_len + 1) (including NUL terminator).
+void mp_usbd_hex_str(char *out_str, const uint8_t *bytes, size_t bytes_len);
+
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H

From 8b1980ad450ea2b34af4b831a8c655ba08dee800 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Nov 2023 10:37:04 +1100
Subject: [PATCH 0562/3129] samd: Use unique id for USB serial number.

Replaces the previous all-zeroes "TODO" serial number.

Requires refactoring the low-level unique_id routine out from modmachine.c.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/samd/modmachine.c   | 42 +++------------------------------------
 ports/samd/mpconfigport.h |  5 +++++
 ports/samd/samd_soc.c     | 36 +++++++++++++++++++++++++++++++++
 ports/samd/samd_soc.h     |  8 ++++++++
 ports/samd/usbd.c         |  9 +++++----
 5 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 7c3d96eb01364..8c4808075e7a3 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -92,45 +92,9 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
 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
-    // 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)
-    // >>> binascii.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));
+    samd_unique_id_t id;
+    samd_get_unique_id(&id);
+    return mp_obj_new_bytes((byte *)&id.bytes, sizeof(id.bytes));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 497ca9a87004e..3684457b48e06 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -67,6 +67,11 @@
 #ifndef MICROPY_HW_USB_CDC
 #define MICROPY_HW_USB_CDC (1)
 #endif
+// SAMD unique ID is 16 bytes (hex string == 32)
+#ifndef MICROPY_HW_USB_DESC_STR_MAX
+#define MICROPY_HW_USB_DESC_STR_MAX (32)
+#endif
+
 #endif
 
 // Control over Python builtins
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index ad5910301cfc3..dcfff9dc22744 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -153,3 +153,39 @@ void sercom_deinit_all(void) {
 }
 
 #endif
+
+void samd_get_unique_id(samd_unique_id_t *id) {
+    // 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)
+    // >>> binascii.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
+
+    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)
+            id->bytes[4 * i + k] = (*(id_addresses[i]) >> (24 - k * 8)) & 0xff;
+        }
+    }
+}
diff --git a/ports/samd/samd_soc.h b/ports/samd/samd_soc.h
index 90a5a57ffa14e..707d2f8edfa98 100644
--- a/ports/samd/samd_soc.h
+++ b/ports/samd/samd_soc.h
@@ -30,6 +30,10 @@
 #include "sam.h"
 #include "clock_config.h"
 
+typedef struct _samd_unique_id_t {
+    uint8_t bytes[16];
+} samd_unique_id_t;
+
 extern Sercom *sercom_instance[];
 
 void samd_init(void);
@@ -40,6 +44,10 @@ void USB_Handler_wrapper(void);
 void sercom_enable(Sercom *spi, int state);
 void sercom_register_irq(int sercom_id, void (*sercom_irq_handler));
 
+// Each device has a unique 128-bit serial number. The uniqueness of the serial number is
+// guaranteed only when using all 128 bits.
+void samd_get_unique_id(samd_unique_id_t *id);
+
 #define SERCOM_IRQ_TYPE_UART  (0)
 #define SERCOM_IRQ_TYPE_SPI   (1)
 #define SERCOM_IRQ_TYPE_I2C   (2)
diff --git a/ports/samd/usbd.c b/ports/samd/usbd.c
index 90f2e1bfd95ed..2e3200ad7d2b0 100644
--- a/ports/samd/usbd.c
+++ b/ports/samd/usbd.c
@@ -31,12 +31,13 @@
 #include "mp_usbd.h"
 #include "string.h"
 #include "tusb.h"
-
-#define SERIAL_TODO "000000000000" // TODO
+#include "samd_soc.h"
 
 void mp_usbd_port_get_serial_number(char *serial_buf) {
-    MP_STATIC_ASSERT(sizeof(SERIAL_TODO) <= MICROPY_HW_USB_DESC_STR_MAX);
-    strcpy(serial_buf, SERIAL_TODO);
+    samd_unique_id_t id;
+    samd_get_unique_id(&id);
+    MP_STATIC_ASSERT(sizeof(id.bytes) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
+    mp_usbd_hex_str(serial_buf, id.bytes, sizeof(id.bytes));
 }
 
 void USB_Handler_wrapper(void) {

From 37c1c5fa49aec4b6e5813719341af442fa45a9d9 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 7 Jun 2023 13:35:02 +1000
Subject: [PATCH 0563/3129] stm32/mpu: Enable STM32WB mpu use to support qspi
 flash.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/mpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index e95a07da91a89..b3e2aec2d8078 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_MPU_H
 #define MICROPY_INCLUDED_STM32_MPU_H
 
-#if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F7) || defined(STM32H7)
+#if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
 
 #define MPU_REGION_ETH      (MPU_REGION_NUMBER0)
 #define MPU_REGION_QSPI1    (MPU_REGION_NUMBER1)

From 1879db7105e5139160d79193fc95964662792401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Fri, 3 Nov 2023 11:17:42 +0100
Subject: [PATCH 0564/3129] extmod/extmod.mk: Allow enabling lwip loopback
 support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enabling MICROPY_PY_LWIP_LOOPBACK via make will turn on loopback support.

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 extmod/extmod.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index a04856bce2050..84573ec861066 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -267,6 +267,9 @@ SRC_THIRDPARTY_C += $(addprefix $(LWIP_DIR)/,\
 	core/ipv6/nd6.c \
 	netif/ethernet.c \
 	)
+ifeq ($(MICROPY_PY_LWIP_LOOPBACK),1)
+CFLAGS_EXTMOD += -DLWIP_NETIF_LOOPBACK=1
+endif
 ifeq ($(MICROPY_PY_LWIP_SLIP),1)
 CFLAGS_EXTMOD += -DMICROPY_PY_LWIP_SLIP=1
 SRC_THIRDPARTY_C += $(LWIP_DIR)/netif/slipif.c

From a23dbdca7944e03a990f04f5aede0c1fb93d6919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Fri, 3 Nov 2023 11:18:05 +0100
Subject: [PATCH 0565/3129] stm32: Add optional lwip loopback support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MICROPY_PY_LWIP_LOOPBACK must be set at the make level to enable this.

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 ports/stm32/lwip_inc/lwipopts.h | 3 +++
 ports/stm32/mpnetworkport.c     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/ports/stm32/lwip_inc/lwipopts.h b/ports/stm32/lwip_inc/lwipopts.h
index 7b2460fa80aaa..f641cf515add2 100644
--- a/ports/stm32/lwip_inc/lwipopts.h
+++ b/ports/stm32/lwip_inc/lwipopts.h
@@ -24,6 +24,9 @@
 #define LWIP_NETIF_HOSTNAME             1
 #define LWIP_NETIF_EXT_STATUS_CALLBACK  1
 
+#define LWIP_LOOPIF_MULTICAST           1
+#define LWIP_LOOPBACK_MAX_PBUFS         8
+
 #define LWIP_IPV6                       0
 #define LWIP_DHCP                       1
 #define LWIP_DHCP_CHECK_LINK_UP         1
diff --git a/ports/stm32/mpnetworkport.c b/ports/stm32/mpnetworkport.c
index 62f780a35a042..3b9591213a8d2 100644
--- a/ports/stm32/mpnetworkport.c
+++ b/ports/stm32/mpnetworkport.c
@@ -72,6 +72,10 @@ STATIC void pyb_lwip_poll(void) {
 
     // Run the lwIP internal updates
     sys_check_timeouts();
+
+    #if LWIP_NETIF_LOOPBACK
+    netif_poll_all();
+    #endif
 }
 
 void mod_network_lwip_poll_wrapper(uint32_t ticks_ms) {

From 36e162f11602a23682dd482efbc69e0483924800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Fri, 3 Nov 2023 11:19:53 +0100
Subject: [PATCH 0566/3129] tests/net_hosted/asyncio_loopback.py: Add loopback
 test.
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>
---
 tests/net_hosted/asyncio_loopback.py     | 64 ++++++++++++++++++++++++
 tests/net_hosted/asyncio_loopback.py.exp | 14 ++++++
 2 files changed, 78 insertions(+)
 create mode 100644 tests/net_hosted/asyncio_loopback.py
 create mode 100644 tests/net_hosted/asyncio_loopback.py.exp

diff --git a/tests/net_hosted/asyncio_loopback.py b/tests/net_hosted/asyncio_loopback.py
new file mode 100644
index 0000000000000..fd4674544ce71
--- /dev/null
+++ b/tests/net_hosted/asyncio_loopback.py
@@ -0,0 +1,64 @@
+# Test network loopback behaviour
+
+try:
+    import asyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+async def client(host, port):
+    print(f"client open_connection to {host}:{port}")
+    reader, writer = await asyncio.open_connection(host, port)
+
+    data_in = b"A" * 100
+
+    print("client writing")
+    writer.write(data_in)
+    await writer.drain()
+
+    await asyncio.sleep(0.1)
+
+    print("client reading")
+    data = await reader.readexactly(100)
+    print(f"client got {len(data)} bytes")
+
+    assert data_in == data
+
+    print("client closing")
+
+    writer.close()
+    await writer.wait_closed()
+
+    print("client closed")
+
+
+async def echo_handler(reader, writer):
+    print("handler reading")
+    await asyncio.sleep(0.1)
+    data = await reader.readexactly(100)
+    print(f"handler got {len(data)} bytes")
+
+    print("handler writing")
+    writer.write(data)
+    await writer.drain()
+
+    print("handler closing")
+
+    writer.close()
+    await writer.wait_closed()
+
+    print("handler closed")
+
+
+async def test(host, port):
+    print(f"create server on {host}:{port}")
+    server = await asyncio.start_server(echo_handler, host, port)
+
+    async with server:
+        print("server started")
+        await client("127.0.0.1", 8080)
+    print("server closed")
+
+
+asyncio.run(test("0.0.0.0", 8080))
diff --git a/tests/net_hosted/asyncio_loopback.py.exp b/tests/net_hosted/asyncio_loopback.py.exp
new file mode 100644
index 0000000000000..7110b35e12caa
--- /dev/null
+++ b/tests/net_hosted/asyncio_loopback.py.exp
@@ -0,0 +1,14 @@
+create server on 0.0.0.0:8080
+server started
+client open_connection to 127.0.0.1:8080
+client writing
+handler reading
+client reading
+handler got 100 bytes
+handler writing
+handler closing
+handler closed
+client got 100 bytes
+client closing
+client closed
+server closed

From 70feb123bf60fa59e731d7c66b07fcb87a486227 Mon Sep 17 00:00:00 2001
From: ThomHPL <thomas.herpoel@gmail.com>
Date: Thu, 16 Nov 2023 03:28:59 +0100
Subject: [PATCH 0567/3129] stm32/boards/NUCLEO_F446RE: Add UARTs 1, 3 and 4.

Signed-off-by: ThomHPL <thomas.herpoel@gmail.com>
---
 .../stm32/boards/NUCLEO_F446RE/mpconfigboard.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
index 88bfd39b41664..a0a6dbf8c51e0 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
@@ -16,10 +16,20 @@
 #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_UART6_TX     (pin_C6)
-#define MICROPY_HW_UART6_RX     (pin_C7)
+#define MICROPY_HW_UART1_TX     (pin_B6)    // Arduino D10, pin 17 on CN10
+#define MICROPY_HW_UART1_RX     (pin_B7)    //              pin 21 on CN7
+#define MICROPY_HW_UART2_TX     (pin_A2)    // Arduino D1,  pin 35 on CN10
+#define MICROPY_HW_UART2_RX     (pin_A3)    // Arduino D0,  pin 37 on CN10
+#define MICROPY_HW_UART2_RTS    (pin_A1)    // Arduino A1,  pin 30 on CN7
+#define MICROPY_HW_UART2_CTS    (pin_A0)    // Arduino A0,  pin 28 on CN7
+#define MICROPY_HW_UART3_TX     (pin_B10)   // Arduino D6,  pin 25 on CN10
+#define MICROPY_HW_UART3_RX     (pin_C5)    //              pin  6 on CN10
+#define MICROPY_HW_UART3_RTS    (pin_B14)   //              pin 28 on CN10
+#define MICROPY_HW_UART3_CTS    (pin_B13)   //              pin 30 on CN10
+#define MICROPY_HW_UART4_TX     (pin_A0)    // Arduino A0,  pin 28 on CN7
+#define MICROPY_HW_UART4_RX     (pin_A1)    // Arduino A1,  pin 30 on CN7
+#define MICROPY_HW_UART6_TX     (pin_C6)    //              pin  4 on CN10
+#define MICROPY_HW_UART6_RX     (pin_C7)    // Arduino D9,  pin 19 on CN10
 // 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

From 0cc100be2c08f6b4e53a208dea8ef7953dc29cea Mon Sep 17 00:00:00 2001
From: Rene Straub <rene@see5.ch>
Date: Sun, 6 Aug 2023 11:18:53 +0200
Subject: [PATCH 0568/3129] stm32/boards/NUCLEO_H563ZI: Add new NUCLEO-H563ZI
 board definition.

Configuration:
- Clock is HSE, CPU runs at 250MHz.
- REPL on USB and UART connected to the ST-Link interface.
- Storage is configured for internal flash memory.
- Three LEDs and one user button.
- Ethernet is enabled.

Signed-off-by: Rene Straub <rene@see5.ch>
---
 ports/stm32/boards/NUCLEO_H563ZI/board.json   |  15 ++
 .../boards/NUCLEO_H563ZI/mpconfigboard.h      |  91 ++++++++++++
 .../boards/NUCLEO_H563ZI/mpconfigboard.mk     |  23 ++++
 ports/stm32/boards/NUCLEO_H563ZI/pins.csv     | 130 ++++++++++++++++++
 .../boards/NUCLEO_H563ZI/stm32h5xx_hal_conf.h |  19 +++
 5 files changed, 278 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_H563ZI/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_H563ZI/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_H563ZI/stm32h5xx_hal_conf.h

diff --git a/ports/stm32/boards/NUCLEO_H563ZI/board.json b/ports/stm32/boards/NUCLEO_H563ZI/board.json
new file mode 100644
index 0000000000000..b9c4e41b3eb30
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H563ZI/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_h563zi.jpg"
+    ],
+    "mcu": "stm32h5",
+    "product": "Nucleo H563ZI",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.h
new file mode 100644
index 0000000000000..1e802eda5b04a
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.h
@@ -0,0 +1,91 @@
+#define MICROPY_HW_BOARD_NAME               "NUCLEO_H563ZI"
+#define MICROPY_HW_MCU_NAME                 "STM32H563ZI"
+
+#define MICROPY_PY_PYB_LEGACY               (0)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (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               (1)
+#define MICROPY_HW_HAS_FLASH                (1)
+
+// The board has a 8MHz oscillator, the following gives 250MHz CPU speed
+#define MICROPY_HW_CLK_USE_BYPASS           (1)
+#define MICROPY_HW_CLK_PLLM                 (2)
+#define MICROPY_HW_CLK_PLLN                 (125)
+#define MICROPY_HW_CLK_PLLP                 (2)
+#define MICROPY_HW_CLK_PLLQ                 (2)
+#define MICROPY_HW_CLK_PLLR                 (2)
+#define MICROPY_HW_CLK_PLLVCI_LL            (LL_RCC_PLLINPUTRANGE_4_8)
+#define MICROPY_HW_CLK_PLLVCO_LL            (LL_RCC_PLLVCORANGE_WIDE)
+#define MICROPY_HW_CLK_PLLFRAC              (0)
+
+// PLL3 with Q output at 48MHz for USB
+// #define MICROPY_HW_CLK_USE_PLL3_FOR_USB
+#define MICROPY_HW_CLK_PLL3M                (8)
+#define MICROPY_HW_CLK_PLL3N                (192)
+#define MICROPY_HW_CLK_PLL3P                (2)
+#define MICROPY_HW_CLK_PLL3Q                (4)
+#define MICROPY_HW_CLK_PLL3R                (2)
+#define MICROPY_HW_CLK_PLL3FRAC             (0)
+#define MICROPY_HW_CLK_PLL3VCI_LL           (LL_RCC_PLLINPUTRANGE_1_2)
+#define MICROPY_HW_CLK_PLL3VCO_LL           (LL_RCC_PLLVCORANGE_MEDIUM)
+
+// 5 wait states, according to Table 37, Reference Manual (RM0481 Rev 1)
+#define MICROPY_HW_FLASH_LATENCY            FLASH_LATENCY_5
+
+// There is an external 32kHz oscillator
+#define MICROPY_HW_RTC_USE_LSE              (1)
+
+// UART config
+#define MICROPY_HW_UART1_TX                 (pin_B6) // SB14: Arduino Connector CN10-Pin14 (D1)
+#define MICROPY_HW_UART1_RX                 (pin_B7) // SB63: Arduino Connector CN10-Pin16 (D0)
+#define MICROPY_HW_UART3_TX                 (pin_D8) // SB23: ST-Link
+#define MICROPY_HW_UART3_RX                 (pin_D9) // SB18: ST-Link
+
+// Connect REPL to UART3 which is provided on ST-Link USB interface
+#define MICROPY_HW_UART_REPL                PYB_UART_3
+#define MICROPY_HW_UART_REPL_BAUD           115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL                 (pin_B8) // Arduino Connector CN7-Pin2 (D15)
+#define MICROPY_HW_I2C1_SDA                 (pin_B9) // Arduino Connector CN7-Pin4 (D14)
+#define MICROPY_HW_I2C2_SCL                 (pin_F1) // Connector CN9-Pin19
+#define MICROPY_HW_I2C2_SDA                 (pin_F0) // Connector CN9-Pin21
+
+// SPI buses
+// PD14 according to datasheet not working as SPI1_NSS, have to use as GPIO, not as AF
+#define MICROPY_HW_SPI1_NSS                 (pin_D14) // Arduino Connector CN7-Pin16 (D10)
+#define MICROPY_HW_SPI1_SCK                 (pin_A5) // Arduino Connector CN7-Pin10 (D13)
+#define MICROPY_HW_SPI1_MISO                (pin_G9) // Arduino Connector CN7-Pin12 (D12)
+#define MICROPY_HW_SPI1_MOSI                (pin_B5) // Arduino Connector CN7-Pin14 (D11)
+
+// 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_F4) // Orange
+#define MICROPY_HW_LED3                     (pin_G4) // 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)
+#define MICROPY_HW_USB_MAIN_DEV             (USB_PHY_FS_ID)
+
+// 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_B15)
diff --git a/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk
new file mode 100644
index 0000000000000..a55a54d1c76d1
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk
@@ -0,0 +1,23 @@
+USE_MBOOT ?= 0
+
+# MCU settings
+MCU_SERIES = h5
+CMSIS_MCU = STM32H573xx
+MICROPY_FLOAT_IMPL = single
+AF_FILE = boards/stm32h573_af.csv
+
+ifeq ($(USE_MBOOT),1)
+# When using Mboot everything goes after the bootloader
+# TODO: not tested
+LD_FILES = boards/stm32h573xi.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08008000
+else
+# When not using Mboot everything goes at the start of flash
+LD_FILES = boards/stm32h573xi.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+endif
+
+# MicroPython settings
+MICROPY_PY_LWIP = 1
+MICROPY_PY_SSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/NUCLEO_H563ZI/pins.csv b/ports/stm32/boards/NUCLEO_H563ZI/pins.csv
new file mode 100644
index 0000000000000..1f83e8a505b8f
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H563ZI/pins.csv
@@ -0,0 +1,130 @@
+,PA0
+,PA1
+,PA2
+,PA3
+,PA4
+,PA5
+,PA7
+,PA8
+,PA9
+,PA10
+,PA11
+,PA12
+,PA13
+,PA14
+,PA15
+,PB0
+,PB2
+,PB3
+,PB4
+,PB5
+,PB6
+,PB7
+,PB8
+,PB9
+,PB10
+,PB11
+,PB12
+,PB13
+,PB14
+,PB15
+,PC1
+,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
+,PE0
+,PE1
+,PE2
+,PE3
+,PE4
+,PE5
+,PE6
+,PE7
+,PE8
+,PE10
+,PE12
+,PE15
+,PF0
+,PF1
+,PF2
+,PF4
+,PF5
+,PF6
+,PF7
+,PF8
+,PF9
+,PF10
+,PF12
+,PF13
+,PF14
+,PF15
+,PG0
+,PG1
+,PG2
+,PG3
+,PG4
+,PG5
+,PG6
+,PG7
+,PG8
+,PG9
+,PG10
+,PG11
+,PG13
+,PG15
+A0,PA6
+A1,PC0
+A2,PC3
+A3,PB1
+A4,PC2
+A5,PF11
+D2,PG14
+D3,PE13
+D4,PE14
+D5,PE11
+D6,PE9
+D7,PG12
+D8,PF3
+D9,PD15
+UART1_TX,PB6
+UART1_RX,PB7
+UART3_TX,PD8
+UART3_RX,PD9
+LED_GREEN,PB0
+LED_ORANGE,PF4
+LED_RED,PG4
+SW,PC13
+I2C1_SDA,PB9
+I2C1_SCL,PB8
+I2C2_SDA,PF1
+I2C2_SCL,PF0
+USB_DM,PA11
+USB_DP,PA12
+SPI_A_CS,PD14
+SPI_A_SCK,PA5
+SPI_A_MOSI,PB5
+SPI_A_MISO,PG9
diff --git a/ports/stm32/boards/NUCLEO_H563ZI/stm32h5xx_hal_conf.h b/ports/stm32/boards/NUCLEO_H563ZI/stm32h5xx_hal_conf.h
new file mode 100644
index 0000000000000..f86c9300e387e
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H563ZI/stm32h5xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2023 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32H5XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32H5XX_HAL_CONF_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)
+
+#include "boards/stm32h5xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32H5XX_HAL_CONF_H

From c34941109fa9390c1b41200064eaa17c7aeb7961 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Nov 2023 18:29:39 +1100
Subject: [PATCH 0569/3129] stm32/sdcard: Add SD card support for H5 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 2 +-
 ports/stm32/dma.c    | 2 +-
 ports/stm32/sdcard.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index edebd2db9d8f0..56b5a1020c5ec 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -408,7 +408,7 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7 l4))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h5 h7 l4))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_sd.c \
 	ll_sdmmc.c \
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 0a5d25c16cc7a..af56d812367c7 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -156,7 +156,7 @@ static const DMA_InitTypeDef dma_init_struct_i2s = {
 };
 #endif
 
-#if ENABLE_SDIO && !defined(STM32H7)
+#if ENABLE_SDIO && !defined(STM32H5) && !defined(STM32H7)
 // Parameters to dma_init() for SDIO tx and rx.
 static const DMA_InitTypeDef dma_init_struct_sdio = {
     #if defined(STM32F4) || defined(STM32F7)
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index d09ee21d09bf5..a903f79ed2161 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -40,7 +40,7 @@
 
 #if MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD
 
-#if defined(STM32F7) || defined(STM32H7) || defined(STM32L4)
+#if defined(STM32F7) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4)
 
 // 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.
@@ -104,7 +104,7 @@
 #define SDIO_HARDWARE_FLOW_CONTROL_DISABLE  SDMMC_HARDWARE_FLOW_CONTROL_DISABLE
 #define SDIO_HARDWARE_FLOW_CONTROL_ENABLE   SDMMC_HARDWARE_FLOW_CONTROL_ENABLE
 
-#if defined(STM32H7)
+#if defined(STM32H5) || defined(STM32H7)
 #define SDIO_TRANSFER_CLK_DIV               SDMMC_NSpeed_CLK_DIV
 #define SDIO_USE_GPDMA                      0
 #else
@@ -268,7 +268,7 @@ STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
     // SD device interface configuration
     sdmmc_handle.sd.Instance = SDIO;
     sdmmc_handle.sd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
-    #ifndef STM32H7
+    #if !defined(STM32H5) && !defined(STM32H7)
     sdmmc_handle.sd.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
     #endif
     sdmmc_handle.sd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;

From 92741a34388e85d07e26511ff81b27af99445f00 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Nov 2023 14:17:16 +1100
Subject: [PATCH 0570/3129] stm32/boards/STM32H573I_DK: Enable the SD card.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/STM32H573I_DK/mpconfigboard.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
index fba14329a5ce9..c8e0340af1ec6 100644
--- a/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
+++ b/ports/stm32/boards/STM32H573I_DK/mpconfigboard.h
@@ -8,6 +8,7 @@
 #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)
 
@@ -106,6 +107,11 @@
 #define MICROPY_HW_USB_FS                   (1)
 #define MICROPY_HW_USB_MAIN_DEV             (USB_PHY_FS_ID)
 
+// SD card
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_H14)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+
 // Ethernet via RMII
 #define MICROPY_HW_ETH_MDC                  (pin_C1)
 #define MICROPY_HW_ETH_MDIO                 (pin_A2)

From a968888f69d94890e8851efe38ace3b9448552d7 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 13 Nov 2023 16:04:40 +0100
Subject: [PATCH 0571/3129] py/obj: Fix mp_obj_is_type compilation with C++.

Fixes issue #12951.

Signed-off-by: stijn <stijn@ignitron.net>
---
 examples/usercmodule/cppexample/example.cpp |  7 +++++++
 py/misc.h                                   | 11 ++++++++---
 py/obj.h                                    |  8 ++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/examples/usercmodule/cppexample/example.cpp b/examples/usercmodule/cppexample/example.cpp
index 06809732a4d7b..2df832baa76f5 100644
--- a/examples/usercmodule/cppexample/example.cpp
+++ b/examples/usercmodule/cppexample/example.cpp
@@ -1,9 +1,16 @@
 extern "C" {
 #include <examplemodule.h>
+#include <py/objstr.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) {
+    // The following no-ops are just here to verify the static assertions used in
+    // the public API all compile with C++.
+    MP_STATIC_ASSERT_STR_ARRAY_COMPATIBLE;
+    if (mp_obj_is_type(a_obj, &mp_type_BaseException)) {
+    }
+
     // 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);
diff --git a/py/misc.h b/py/misc.h
index 352a9f34c451d..e19a535720fb1 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -52,10 +52,15 @@ 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)
+// In C++ things like comparing extern const pointers are not constant-expressions so cannot be used
+// in MP_STATIC_ASSERT. Note that not all possible compiler versions will reject this. Some gcc versions
+// do, others only with -Werror=vla, msvc always does.
+// The (void) is needed to avoid "left operand of comma operator has no effect [-Werror=unused-value]"
+// when using this macro on the left-hand side of a comma.
+#if defined(_MSC_VER) || defined(__cplusplus)
+#define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)1)
 #else
-#define MP_STATIC_ASSERT_NOT_MSC(cond) MP_STATIC_ASSERT(cond)
+#define MP_STATIC_ASSERT_NONCONSTEXPR(cond) MP_STATIC_ASSERT(cond)
 #endif
 
 // Round-up integer division
diff --git a/py/obj.h b/py/obj.h
index 56ae62172fcef..c7b7db0c38346 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -928,10 +928,10 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 // 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), 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_NONCONSTEXPR((t) != &mp_type_bool), assert((t) != &mp_type_bool),         \
+    MP_STATIC_ASSERT_NONCONSTEXPR((t) != &mp_type_int), assert((t) != &mp_type_int),           \
+    MP_STATIC_ASSERT_NONCONSTEXPR((t) != &mp_type_str), assert((t) != &mp_type_str),           \
+    MP_STATIC_ASSERT_NONCONSTEXPR((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))

From 6f0193335af497c4e14d67c4224f8e35d3755ba8 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Thu, 9 Nov 2023 11:21:00 +0100
Subject: [PATCH 0572/3129] ports: Fix incorrect identifiers on Arduino boards.

This commit changes the Arduino board identifiers to correspond to their
official names.  This helps to identify boards at runtime.  At the moment
the Arduino Portenta H7 is reported as PORTENTA which is unfortunate as now
there is another Portenta board (Portenta C33) supported in MicroPython.

Also made the other identifiers for flash and network name consistent,
removed the incorrectly used MICROPY_PY_SYS_PLATFORM identifiers, and added
missing MICROPY_PY_NETWORK_HOSTNAME_DEFAULT identifiers.

Boards affected:
- stm32: ARDUINO_PORTENTA_H7, ARDUINO_GIGA, ARDUINO_NICLA_VISION
- renesas-ra: ARDUINO_PORTENTA_C33
- esp32: ARDUINO_NANO_ESP32
- rp2: ARDUINO_NANO_RP2040_CONNECT

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h     | 3 +++
 .../boards/ARDUINO_PORTENTA_C33/mpconfigboard.h           | 6 +++++-
 .../boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h    | 3 +++
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h           | 8 +++++---
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h   | 8 +++++---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h    | 8 ++++----
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
index 3e98bb99d7027..ec85a7bb36929 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
@@ -1,6 +1,9 @@
 #define MICROPY_HW_BOARD_NAME               "Arduino Nano ESP32"
 #define MICROPY_HW_MCU_NAME                 "ESP32S3"
 
+// Network config
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nano-esp32"
+
 #define MICROPY_PY_MACHINE_DAC              (0)
 
 #define MICROPY_HW_I2C0_SCL                 (12)
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
index aa1e28ab9d091..da452f6871832 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
@@ -5,10 +5,14 @@
  */
 
 // MCU config
-#define MICROPY_HW_BOARD_NAME       "PORTENTA C33"
+#define MICROPY_HW_BOARD_NAME       "Arduino Portenta C33"
 #define MICROPY_HW_MCU_NAME         "RA6M5"
 #define MICROPY_HW_MCU_SYSCLK       200000000
 #define MICROPY_HW_MCU_PCLK         100000000
+#define MICROPY_HW_FLASH_FS_LABEL   "Portenta C33"
+
+// Network config
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-portenta-c33"
 
 // module config
 #define MICROPY_EMIT_THUMB          (1)
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 537c6d7057051..b969341a7fe1e 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -4,6 +4,9 @@
 #define MICROPY_HW_BOARD_NAME           "Arduino Nano RP2040 Connect"
 #define MICROPY_HW_FLASH_STORAGE_BYTES  (8 * 1024 * 1024)
 
+// Network config
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nano-rp2040-connect"
+
 // Enable networking.
 #define MICROPY_PY_NETWORK              (1)
 
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index ec9bbed5ea6e0..b278fa005b757 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -4,10 +4,12 @@
  * Copyright (c) 2023 Arduino SA
  */
 
-#define MICROPY_HW_BOARD_NAME       "GIGA"
+#define MICROPY_HW_BOARD_NAME       "Arduino GIGA R1 WiFi"
 #define MICROPY_HW_MCU_NAME         "STM32H747"
-#define MICROPY_PY_SYS_PLATFORM     "Giga"
-#define MICROPY_HW_FLASH_FS_LABEL   "Giga"
+#define MICROPY_HW_FLASH_FS_LABEL   "GIGA R1 WiFi"
+
+// Network config
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-giga-r1-wifi"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
 #define UINT_FMT                    "%u"
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 3cae9b25fa344..3a2def4d4044f 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -4,10 +4,12 @@
  * Copyright (c) 2023 Arduino SA
  */
 
-#define MICROPY_HW_BOARD_NAME       "NICLAVISION"
+#define MICROPY_HW_BOARD_NAME       "Arduino Nicla Vision"
 #define MICROPY_HW_MCU_NAME         "STM32H747"
-#define MICROPY_PY_SYS_PLATFORM     "Nicla Vision"
-#define MICROPY_HW_FLASH_FS_LABEL   "niclavision"
+#define MICROPY_HW_FLASH_FS_LABEL   "Nicla Vision"
+
+// Network config
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nicla-vision"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
 #define UINT_FMT                    "%u"
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 133158c60add4..e2e6956a47d68 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -4,12 +4,12 @@
  * Copyright (c) 2022 Arduino SA
  */
 
-#define MICROPY_HW_BOARD_NAME       "PORTENTA"
+#define MICROPY_HW_BOARD_NAME       "Arduino Portenta H7"
 #define MICROPY_HW_MCU_NAME         "STM32H747"
-#define MICROPY_PY_SYS_PLATFORM     "Portenta"
-#define MICROPY_HW_FLASH_FS_LABEL   "portenta"
+#define MICROPY_HW_FLASH_FS_LABEL   "Portenta H7"
 
-#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "Portenta"
+// Network config
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-portenta-h7"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
 #define UINT_FMT                    "%u"

From 6117aa686f5faac6692f0def91be8e40a696aca3 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Wed, 15 Nov 2023 11:38:01 +0100
Subject: [PATCH 0573/3129] renesas-ra/boards/ARDUINO_PORTENTA_C33: Fix
 incorrect I2C pins.

Also change the number of the interface to 0 as it's connected to IIC0.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
index da452f6871832..52346dedc44ee 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
@@ -63,8 +63,8 @@ void PORTENTA_C33_board_enter_bootloader(void);
 #endif
 
 // I2C
-#define MICROPY_HW_I2C2_SCL         (pin_P407)
-#define MICROPY_HW_I2C2_SDA         (pin_P408)
+#define MICROPY_HW_I2C0_SCL         (pin_P408)
+#define MICROPY_HW_I2C0_SDA         (pin_P407)
 
 // SPI
 #define MICROPY_HW_SPI1_SSL         (pin_P104)

From 57cce79a46f6ab7e990a626251ca8f9d59cd095a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Nov 2023 17:35:28 +1100
Subject: [PATCH 0574/3129] esp32/modsocket: Implement socket connect timeout.

LWIP doesn't implement a timeout for blocking connect(), and such a timeout
is not required by POSIX.  However, CPython will use the socket timeout for
blocking connect on most platforms.  The "principle of least surprise"
suggests we should support it on ESP32 as well (not to mention it's
useful!).

This provides the additional improvement that external exceptions (like
KeyboardInterrupt) are now handled immediately if they happen during
connect().  Previously Ctrl-C would not terminate a blocking connect until
connect() returned, but now it will.

Fixes issue #8326.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/modsocket.c | 92 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 87 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index fe76b5f7601c2..cacc52dec5685 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -82,6 +82,8 @@ typedef struct _socket_obj_t {
     #endif
 } socket_obj_t;
 
+STATIC const char *TAG = "modsocket";
+
 void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms);
 
 #if MICROPY_PY_SOCKET_EVENTS
@@ -364,16 +366,96 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 STATIC mp_obj_t socket_connect(const mp_obj_t arg0, const mp_obj_t arg1) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
     struct addrinfo *res;
+    bool blocking = false;
+    int flags;
+    int raise_err = 0;
+
     _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();
+
+    flags = fcntl(self->fd, F_GETFL);
+
+    blocking = (flags & O_NONBLOCK) == 0;
+
+    if (blocking) {
+        // For blocking sockets, make the socket temporarily non-blocking and emulate
+        // blocking using select.
+        //
+        // This has two benefits:
+        //
+        // - Allows handling external exceptions while waiting for connect.
+        //
+        // - Allows emulating a connect timeout, which is not supported by LWIP or
+        //   required by POSIX but is normal behaviour for CPython.
+        if (fcntl(self->fd, F_SETFL, flags | O_NONBLOCK) < 0) {
+            ESP_LOGE(TAG, "fcntl set failed %d", errno); // Unexpected internal failure
+            raise_err = errno;
+        }
+    }
+
+    if (raise_err == 0) {
+        // Try performing the actual connect. Expected to always return immediately.
+        int r = lwip_connect(self->fd, res->ai_addr, res->ai_addrlen);
+        if (r != 0) {
+            raise_err = errno;
+        }
+    }
+
+    if (blocking) {
+        // Set the socket back to blocking. We can still pass it to select() in this state.
+        int r = fcntl(self->fd, F_SETFL, flags);
+        if (r != 0 && (raise_err == 0 || raise_err == EINPROGRESS)) {
+            ESP_LOGE(TAG, "fcntl restore failed %d", errno); // Unexpected internal failure
+            raise_err = errno;
+        }
+    }
+
     lwip_freeaddrinfo(res);
-    if (r != 0) {
-        mp_raise_OSError(errno);
+
+    if (blocking && raise_err == EINPROGRESS) {
+        // Keep calling select() until the socket is marked writable (i.e. connected),
+        // or an error or a timeout occurs
+
+        // Note: _socket_settimeout() always sets self->retries != 0 on blocking sockets.
+
+        for (unsigned int i = 0; i <= self->retries; i++) {
+            struct timeval timeout = {
+                .tv_sec = 0,
+                .tv_usec = SOCKET_POLL_US,
+            };
+            fd_set wfds;
+            FD_ZERO(&wfds);
+            FD_SET(self->fd, &wfds);
+
+            int r = select(self->fd + 1, NULL, &wfds, NULL, &timeout);
+            if (r < 0) {
+                // Error condition
+                raise_err = errno;
+                break;
+            } else if (r > 0) {
+                // Select indicated the socket is writable. Check for any error.
+                socklen_t socklen = sizeof(raise_err);
+                r = getsockopt(self->fd, SOL_SOCKET, SO_ERROR, &raise_err, &socklen);
+                if (r < 0) {
+                    raise_err = errno;
+                }
+                break;
+            } else {
+                // Select timed out
+                raise_err = ETIMEDOUT;
+
+                MP_THREAD_GIL_ENTER();
+                check_for_exceptions();
+                MP_THREAD_GIL_EXIT();
+            }
+        }
     }
 
+    MP_THREAD_GIL_ENTER();
+    if (raise_err) {
+        mp_raise_OSError(raise_err);
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
@@ -847,7 +929,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_socket_getaddrinfo_obj, 2, 6, esp
 STATIC mp_obj_t esp_socket_initialize() {
     static int initialized = 0;
     if (!initialized) {
-        ESP_LOGI("modsocket", "Initializing");
+        ESP_LOGI(TAG, "Initializing");
         esp_netif_init();
         initialized = 1;
     }

From fce8d9fd55409ab1027beee5671bc653fb5beb97 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 9 Nov 2023 10:30:23 +1100
Subject: [PATCH 0575/3129] esp32/modsocket: Try garbage collection if the
 socket limit is reached.

If the hard socket limit (default 16) is reached then it's possible that
socket allocation fails but garbage collection would allow it to succeed.

Perform a GC pass and try again before giving up, similar to the logic
elsewhere in MicroPython that tries a GC pass before raising MemoryError.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/modsocket.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index cacc52dec5685..ca8c63030cd74 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "py/gc.h"
 #include "py/runtime0.h"
 #include "py/nlr.h"
 #include "py/objlist.h"
@@ -274,6 +275,13 @@ 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 && errno == ENFILE) {
+        // ESP32 LWIP has a hard socket limit, ENFILE is returned when this is
+        // reached. Similar to the logic elsewhere for MemoryError, try running
+        // GC before failing outright.
+        gc_collect();
+        sock->fd = lwip_socket(sock->domain, sock->type, sock->proto);
+    }
     if (sock->fd < 0) {
         mp_raise_OSError(errno);
     }

From f397a3ec318f3ad05aa287764ae7cef32202380f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Nov 2023 22:28:57 +1100
Subject: [PATCH 0576/3129] py/objslice: Validate that the argument to
 indices() is an integer.

Otherwise passing in a non-integer can lead to an invalid memory access.

Thanks to Junwha Hong and Wonil Jang @S2Lab, UNIST for finding the issue.

Fixes issue #13007.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objslice.c                 | 2 +-
 tests/basics/slice_indices.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/py/objslice.c b/py/objslice.c
index 75fa3bc3f55e3..dcd6af8b2856f 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -54,7 +54,7 @@ STATIC mp_obj_t slice_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
 
 #if MICROPY_PY_BUILTINS_SLICE_INDICES
 STATIC mp_obj_t slice_indices(mp_obj_t self_in, mp_obj_t length_obj) {
-    mp_int_t length = mp_obj_int_get_checked(length_obj);
+    mp_int_t length = mp_obj_get_int(length_obj);
     mp_bound_slice_t bound_indices;
     mp_obj_slice_indices(self_in, length, &bound_indices);
 
diff --git a/tests/basics/slice_indices.py b/tests/basics/slice_indices.py
index b7f439ccca267..ccd7667e9b36a 100644
--- a/tests/basics/slice_indices.py
+++ b/tests/basics/slice_indices.py
@@ -25,3 +25,8 @@ def __getitem__(self, idx):
 print(A()[2:7:-2].indices(5))
 print(A()[7:2:2].indices(5))
 print(A()[7:2:-2].indices(5))
+
+try:
+    print(A()[::].indices(None))
+except TypeError:
+    print("TypeError")

From 917b56137fd8b8729531452b2aefa5aa1b1666c9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 7 Nov 2023 14:11:05 +1100
Subject: [PATCH 0577/3129] esp32/boards/sdkconfig.base: Fix increasing log
 level via esp.osdebug().

At some point the config changed such that no messages above Error level
were compiled into the final binary.

Fixes issue #12815.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/sdkconfig.base | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 372633e711a65..2a7c9a1c5b8ce 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -17,9 +17,18 @@ CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=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
+
+# Set the maximum included log level higher than the default,
+# so esp.osdebug() can enable more logging at runtime.
+#
+# To increase the max log verbosity to Debug or Verbose instead, comment
+# CONFIG_LOG_MAXIMUM_LEVEL_INFO=y and uncomment one of the other settings.
+#
+# If not needed, the next line can be commented entirely to save binary size.
+CONFIG_LOG_MAXIMUM_LEVEL_INFO=y
+#CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+#CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE=y
 
 # Main XTAL Config
 # Only on: ESP32

From a800ed5ae34f8a9bbe075e007de55109f33c7592 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 7 Nov 2023 14:11:20 +1100
Subject: [PATCH 0578/3129] docs/library/esp: Correct the description of
 esp.osdebug().

The behaviour described in the docs was not correct for either port.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/esp.rst | 40 ++++++++++++++++++++++++++++++++++++----
 ports/esp32/modesp.c |  4 ++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/docs/library/esp.rst b/docs/library/esp.rst
index 8920c8241ea0c..9c20b5e8b2d89 100644
--- a/docs/library/esp.rst
+++ b/docs/library/esp.rst
@@ -62,12 +62,35 @@ Functions
 
 .. function:: flash_erase(sector_no)
 
-.. function:: osdebug(level)
+.. function:: osdebug(uart_no)
 
-    Turn esp os debugging messages on or off.
+    .. note:: This is the ESP8266 form of this function.
 
-    The *level* parameter sets the threshold for the log messages for all esp components.
-    The log levels are defined as constants:
+    Change the level of OS serial debug log messages. On boot,
+    OS serial debug log messages are disabled.
+
+    ``uart_no`` is the number of the UART peripheral which should receive
+    OS-level output, or ``None`` to disable OS serial debug log messages.
+
+.. function:: osdebug(uart_no, [level])
+    :no-index:
+
+    .. note:: This is the ESP32 form of this function.
+
+    Change the level of OS serial debug log messages. On boot, OS
+    serial debug log messages are limited to Error output only.
+
+    The behaviour of this function depends on the arguments passed to it. The
+    following combinations are supported:
+
+    ``osdebug(None)`` restores the default OS debug log message level
+    (``LOG_ERROR``).
+
+    ``osdebug(0)`` enables all available OS debug log messages (in the
+    default build configuration this is ``LOG_INFO``).
+
+    ``osdebug(0, level)`` sets the OS debug log message level to the
+     specified value. The log levels are defined as constants:
 
         * ``LOG_NONE`` -- No log output
         * ``LOG_ERROR`` -- Critical errors, software module can not recover on its own
@@ -77,6 +100,15 @@ Functions
         * ``LOG_VERBOSE`` -- Bigger chunks of debugging information, or frequent messages
           which can potentially flood the output
 
+    .. note:: ``LOG_DEBUG`` and ``LOG_VERBOSE`` are not compiled into the
+              MicroPython binary by default, to save size. A custom build with a
+              modified "``sdkconfig``" source file is needed to see any output
+              at these log levels.
+
+    .. note:: Log output on ESP32 is automatically suspended in "Raw REPL" mode,
+              to prevent communications issues. This means OS level logging is never
+              seen when using ``mpremote run`` and similar tools.
+
 .. function:: set_native_code_location(start, length)
 
     **Note**: ESP8266 only
diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 4726ce5874209..f51ba6ab34d50 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -37,12 +37,12 @@
 #include "py/mphal.h"
 
 STATIC mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) {
-    esp_log_level_t level = LOG_LOCAL_LEVEL;
+    esp_log_level_t level = LOG_LOCAL_LEVEL; // Maximum available level
     if (n_args == 2) {
         level = mp_obj_get_int(args[1]);
     }
     if (args[0] == mp_const_none) {
-        // Disable logging
+        // Set logging back to boot default of ESP_LOG_ERROR
         esp_log_level_set("*", ESP_LOG_ERROR);
     } else {
         // Enable logging at the given level

From a85c3c45a6edc75da649492092e5ffdafae55d6a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Nov 2023 10:39:12 +1100
Subject: [PATCH 0579/3129] esp32/boards/ESP32_GENERIC: Reduce size of D2WD
 variant to fit in flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
index f6e07893e937d..2ac983693d3ff 100644
--- a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
+++ b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
@@ -3,6 +3,10 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=n
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 
+# Change maximum log level to error, to reduce firmware size.
+CONFIG_LOG_MAXIMUM_LEVEL_ERROR=y
+CONFIG_LOG_MAXIMUM_LEVEL_INFO=n
+
 # Disable SPI Ethernet driver to reduce firmware size.
 CONFIG_ETH_USE_SPI_ETHERNET=n
 

From f72a7dde18600379471189b6727bb65bd2834519 Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Wed, 8 Nov 2023 03:04:28 -0800
Subject: [PATCH 0580/3129] esp32/uart: Preserve console UART clock, fix UART
 console with DFS.

In commit 7c929d44 the console UART was changed to use the UART HAL.
Starting the UART HAL will change the UART clock from whatever it was
already configured at to UART_SCLK_DEFAULT.  There is no "initialize at
existing settings" option.

This clock doesn't work with DFS.

The ESP-IDF code already takes this into account, and when DFS is enabled
it will configure the console UART to use the correct platform-specific
clock that will work with DFS.

The UART HAL init undoes this and sets it back to default.

This change will query the clock before the HAL init, then use the HAL
function to restore it back.  Thus keeping the clock at the "correct"
value, which depends on platform, DFS status, and so on.

The clock frequency will be found using the UART driver function ESP-IDF
code uses for this.  The existing code hard-coded a path that worked if the
clock was the APB clock and would fail otherwise.

The UART_NUM_0 define is removed because driver/uart.h already provides
this same macro.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 ports/esp32/uart.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index fc69e279e33dd..e0c8141a89f1e 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -34,12 +34,9 @@
 #if MICROPY_HW_ENABLE_UART_REPL
 
 #include <stdio.h>
+#include "driver/uart.h" // For uart_get_sclk_freq()
 #include "hal/uart_hal.h"
 
-// Backwards compatibility for when MICROPY_HW_UART_REPL was a ESP-IDF UART
-// driver enum. Only UART_NUM_0 was supported with that version of the driver.
-#define UART_NUM_0 0
-
 STATIC void uart_irq_handler(void *arg);
 
 // Declaring the HAL structure on the stack saves a tiny amount of static RAM
@@ -53,16 +50,14 @@ STATIC void uart_irq_handler(void *arg);
 
 void uart_stdout_init(void) {
     uart_hal_context_t repl_hal = REPL_HAL_DEFN();
+    uart_sclk_t sclk;
     uint32_t sclk_freq;
 
-    #if UART_SCLK_DEFAULT == SOC_MOD_CLK_APB
-    sclk_freq = APB_CLK_FREQ; // Assumes no frequency scaling
-    #else
-    // ESP32-H2 and ESP32-C2, I think
-    #error "This SoC uses a different default UART SCLK source, code needs updating."
-    #endif
+    uart_hal_get_sclk(&repl_hal, &sclk); // To restore SCLK after uart_hal_init() resets it
+    ESP_ERROR_CHECK(uart_get_sclk_freq(sclk, &sclk_freq));
 
     uart_hal_init(&repl_hal, MICROPY_HW_UART_REPL); // Sets defaults: 8n1, no flow control
+    uart_hal_set_sclk(&repl_hal, sclk);
     uart_hal_set_baudrate(&repl_hal, MICROPY_HW_UART_REPL_BAUD, sclk_freq);
     uart_hal_rxfifo_rst(&repl_hal);
     uart_hal_txfifo_rst(&repl_hal);

From 92f046971100eee91e8f7e935ffcfdc324f511cb Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Mon, 13 Nov 2023 17:56:11 -0800
Subject: [PATCH 0581/3129] esp32/uart: Make compatible with sclk type change
 in ESP-IDF 5.3.

This type changes when they add LP-UART support for the ESP32-C6 in the dev
version of ESP-IDF 5.3.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 ports/esp32/uart.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index e0c8141a89f1e..b82a638a5b27a 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -50,7 +50,11 @@ STATIC void uart_irq_handler(void *arg);
 
 void uart_stdout_init(void) {
     uart_hal_context_t repl_hal = REPL_HAL_DEFN();
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
     uart_sclk_t sclk;
+    #else
+    soc_module_clk_t sclk;
+    #endif
     uint32_t sclk_freq;
 
     uart_hal_get_sclk(&repl_hal, &sclk); // To restore SCLK after uart_hal_init() resets it

From 960eef70e8a0073440d6d7edc2c05f6e2237e0af Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 Nov 2023 16:46:55 +1100
Subject: [PATCH 0582/3129] esp32/network_wlan: Reduce RAM usage if SPIRAM
 fails to initialise.

In ESP-IDF, enabling SPIRAM in menuconfig sets some Kconfig options:

- "Wi-Fi Cache TX Buffers" enabled. By default this tries to allocate 32 of
these when Wi-Fi is initialised, which requires 54,400 bytes of free heap.

- Switches "Type of WiFi TX buffers" from Dynamic to Static. This
pre-allocates all of the Wi-Fi transmit buffers.

Not a problem if PSRAM is initialised, but it's quite a lot of RAM if PSRAM
failed to initialise! As we use the same config for PSRAM & no-PSRAM builds
now, this either causes Wi-Fi to fail to initialise (seen on S2) or will
eat quite a lot of RAM.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/network_wlan.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index e1d16b4191d69..e9918efa5ed0b 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -41,6 +41,7 @@
 
 #include "esp_wifi.h"
 #include "esp_log.h"
+#include "esp_psram.h"
 
 #ifndef NO_QSTR
 #include "mdns.h"
@@ -206,6 +207,23 @@ void esp_initialise_wifi(void) {
         wlan_ap_obj.active = false;
 
         wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+        #if CONFIG_SPIRAM_IGNORE_NOTFOUND
+        if (!esp_psram_is_initialized()) {
+            // If PSRAM failed to initialize, disable "Wi-Fi Cache TX Buffers"
+            // (default SPIRAM config ESP32_WIFI_CACHE_TX_BUFFER_NUM==32, this is 54,400 bytes of heap)
+            cfg.cache_tx_buf_num = 0;
+            cfg.feature_caps &= ~CONFIG_FEATURE_CACHE_TX_BUF_BIT;
+
+            // Set some other options back to the non-SPIRAM default values
+            // to save more RAM.
+            //
+            // These can be determined from ESP-IDF components/esp_wifi/Kconfig and the
+            // WIFI_INIT_CONFIG_DEFAULT macro
+            cfg.tx_buf_type = 1; // Dynamic, this "magic number" is defined in IDF KConfig
+            cfg.static_tx_buf_num = 0; // Probably don't need, due to tx_buf_type
+            cfg.dynamic_tx_buf_num = 32; // ESP-IDF default value (maximum)
+        }
+        #endif
         ESP_LOGD("modnetwork", "Initializing WiFi");
         esp_exceptions(esp_wifi_init(&cfg));
         esp_exceptions(esp_wifi_set_storage(WIFI_STORAGE_RAM));

From d6154925d5340e1fb3b2db073bd343da1154f163 Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Thu, 9 Nov 2023 16:18:39 +0200
Subject: [PATCH 0583/3129] esp32/network_wlan: Fix network.WLAN.status() to
 return better info.

Prior to this change, after calling connect() the status() method for the
STA interface would either return STAT_GOT_IP or STAT_CONNECTION.  The
latter would be returned because wifi_sta_connect_requested==true and
conf_wifi_sta_reconnects==0 by default.  As such there was no way to know
anything about errors when attempting to connect, such as a bad password.

Now, status() can return STAT_NO_AP_FOUND and STAT_WRONG_PASSWORD when
those conditions are met.

Fixes issue #12930.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/network_wlan.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index e9918efa5ed0b..e8c75c619df6c 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -107,21 +107,21 @@ static void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_b
             switch (disconn->reason) {
                 case WIFI_REASON_BEACON_TIMEOUT:
                     // AP has dropped out; try to reconnect.
-                    message = "\nbeacon timeout";
+                    message = "beacon 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";
+                    message = "no AP found";
                     break;
                 case WIFI_REASON_AUTH_FAIL:
                     // Password may be wrong, or it just failed to connect; try to reconnect.
-                    message = "\nauthentication failed";
+                    message = "authentication failed";
                     break;
                 default:
                     // Let other errors through and try to reconnect.
                     break;
             }
-            ESP_LOGI("wifi", "STA_DISCONNECTED, reason:%d%s", disconn->reason, message);
+            ESP_LOGI("wifi", "STA_DISCONNECTED, reason:%d:%s", disconn->reason, message);
 
             wifi_sta_connected = false;
             if (wifi_sta_connect_requested) {
@@ -351,6 +351,14 @@ STATIC mp_obj_t network_wlan_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_disconn_reason == WIFI_REASON_NO_AP_FOUND) {
+                return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND);
+            } else if ((wifi_sta_disconn_reason == WIFI_REASON_AUTH_FAIL) || (wifi_sta_disconn_reason == WIFI_REASON_CONNECTION_FAIL)) {
+                // wrong password
+                return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_AUTH_FAIL);
+            } else if (wifi_sta_disconn_reason == WIFI_REASON_ASSOC_LEAVE) {
+                // After wlan.disconnect()
+                return MP_OBJ_NEW_SMALL_INT(STAT_IDLE);
             } else if (wifi_sta_connect_requested
                        && (conf_wifi_sta_reconnects == 0
                            || wifi_sta_reconnects < conf_wifi_sta_reconnects)) {

From 094b52b8ad13be1e919354b188ad3dbe94fc4bf5 Mon Sep 17 00:00:00 2001
From: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: Mon, 20 Nov 2023 15:46:08 +1000
Subject: [PATCH 0584/3129] esp32/esp32_rmt: Fix RMT looping.

Commit 7ea06a3e2638e0fb82240c0b88c9cd1ecaf942f5 moved the
`rmt_write_items()` call to fix RMT looping for ESP32-S3, but broke it for
the other ESP32s.  This commit conditionally compiles the location of that
call.

Signed-off-by: Mark Blakeney <mark.blakeney@bullet-systems.net>
---
 ports/esp32/esp32_rmt.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 5d53018f4ba15..77a31ebc0f66e 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -323,12 +323,18 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *args) {
         check_esp_err(rmt_wait_tx_done(self->channel_id, portMAX_DELAY));
     }
 
+    #if !CONFIG_IDF_TARGET_ESP32S3
+    check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false));
+    #endif
+
     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));
     }
 
+    #if CONFIG_IDF_TARGET_ESP32S3
     check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false));
+    #endif
 
     return mp_const_none;
 }

From 992cd6455522da04bd209e7f7b0915ba7bbfc2f0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 9 Nov 2023 17:57:40 +1100
Subject: [PATCH 0585/3129] py/mkrules: Add support for custom manifest
 variables.

This allows e.g. a board (or make command line) to set

    MICROPY_MANIFEST_MY_VARIABLE = path/to/somewhere
    set(MICROPY_MANIFEST_MY_VARIABLE path/to/somewhere)

and then in the manifest.py they can query this, e.g. via

    include("$(MY_VARIABLE)/path/manifest.py")

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mkrules.cmake | 19 ++++++++++++++++++-
 py/mkrules.mk    | 13 ++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 7622cd903a883..743302aea98e8 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -218,10 +218,27 @@ if(MICROPY_FROZEN_MANIFEST)
         set(MICROPY_CROSS_FLAGS "-f${MICROPY_CROSS_FLAGS}")
     endif()
 
+    # Set default path variables to be passed to makemanifest.py. These will
+    # be available in path substitutions. Additional variables can be set
+    # per-board in mpconfigboard.cmake.
+    set(MICROPY_MANIFEST_PORT_DIR ${MICROPY_PORT_DIR})
+    set(MICROPY_MANIFEST_BOARD_DIR ${MICROPY_BOARD_DIR})
+    set(MICROPY_MANIFEST_MPY_DIR ${MICROPY_DIR})
+    set(MICROPY_MANIFEST_MPY_LIB_DIR ${MICROPY_LIB_DIR})
+
+    # Find all MICROPY_MANIFEST_* variables and turn them into command line arguments.
+    get_cmake_property(_manifest_vars VARIABLES)
+    list(FILTER _manifest_vars INCLUDE REGEX "MICROPY_MANIFEST_.*")
+    foreach(_manifest_var IN LISTS _manifest_vars)
+        list(APPEND _manifest_var_args "-v")
+        string(REGEX REPLACE "MICROPY_MANIFEST_(.*)" "\\1" _manifest_var_name ${_manifest_var})
+        list(APPEND _manifest_var_args "${_manifest_var_name}=${${_manifest_var}}")
+    endforeach()
+
     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}" ${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
+        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} ${_manifest_var_args} -b "${CMAKE_BINARY_DIR}" ${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS
             ${MICROPY_QSTRDEFS_GENERATED}
             ${MICROPY_ROOT_POINTERS}
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 5076559328343..7ecb2a5f66b38 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -199,10 +199,21 @@ CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 
+# Set default path variables to be passed to makemanifest.py. These will be
+# available in path substitutions. Additional variables can be set per-board
+# in mpconfigboard.mk or on the make command line.
+MICROPY_MANIFEST_MPY_LIB_DIR = $(MPY_LIB_DIR)
+MICROPY_MANIFEST_PORT_DIR = $(shell pwd)
+MICROPY_MANIFEST_BOARD_DIR = $(BOARD_DIR)
+MICROPY_MANIFEST_MPY_DIR = $(TOP)
+
+# Find all MICROPY_MANIFEST_* variables and turn them into command line arguments.
+MANIFEST_VARIABLES = $(foreach var,$(filter MICROPY_MANIFEST_%, $(.VARIABLES)),-v "$(subst MICROPY_MANIFEST_,,$(var))=$($(var))")
+
 # 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 -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)
+	$(Q)$(MAKE_MANIFEST) -o $@ $(MANIFEST_VARIABLES) -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
 endif
 
 ifneq ($(PROG),)

From cfcd0c4022c571a174efd0400496d679fbe369e2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 21 Nov 2023 08:58:36 +0100
Subject: [PATCH 0586/3129] stm32: Add missing header include for debug builds.

Debug build fails if string.h header is not included.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/i2c.c           | 1 +
 ports/stm32/machine_i2s.c   | 1 +
 ports/stm32/pin_static_af.h | 3 +++
 ports/stm32/spi.c           | 1 +
 4 files changed, 6 insertions(+)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 42aba2eccbe5b..52f227a950eb9 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include <string.h>
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index dbcd9352d5bd0..b3e1cee34f324 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -29,6 +29,7 @@
 // extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
 
 #include <stdlib.h>
+#include <string.h>
 #include "py/mphal.h"
 #include "pin.h"
 #include "dma.h"
diff --git a/ports/stm32/pin_static_af.h b/ports/stm32/pin_static_af.h
index 49580a2787467..86ae90ba4c6cf 100644
--- a/ports/stm32/pin_static_af.h
+++ b/ports/stm32/pin_static_af.h
@@ -26,6 +26,9 @@
 #ifndef MICROPY_INCLUDED_STM32_PIN_STATIC_AF_H
 #define MICROPY_INCLUDED_STM32_PIN_STATIC_AF_H
 
+// For debug builds some of the macros expand to use strcmp.
+#include <string.h>
+
 #include "py/mphal.h"
 #include "genhdr/pins.h"
 #include "genhdr/pins_af_defs.h"
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 47714a28725ba..ee2301c803b8a 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include <string.h>
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"

From 9c7067d9ad91a303389ec0add306bedac55e18f9 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 23 Nov 2023 11:49:57 -0600
Subject: [PATCH 0587/3129] py/modbuiltins: Share vstr_add_char's
 implementation of utf8 encoding.

This saves ~84 bytes on trinket m0, and saves 112 bytes on PYBV10.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/modbuiltins.c | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index da29e5b67da85..4ff7d445097df 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -137,30 +137,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_callable_obj, mp_builtin_callable);
 STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
     #if MICROPY_PY_BUILTINS_STR_UNICODE
     mp_uint_t c = mp_obj_get_int(o_in);
-    uint8_t str[4];
-    int len = 0;
-    if (c < 0x80) {
-        *str = c;
-        len = 1;
-    } else if (c < 0x800) {
-        str[0] = (c >> 6) | 0xC0;
-        str[1] = (c & 0x3F) | 0x80;
-        len = 2;
-    } else if (c < 0x10000) {
-        str[0] = (c >> 12) | 0xE0;
-        str[1] = ((c >> 6) & 0x3F) | 0x80;
-        str[2] = (c & 0x3F) | 0x80;
-        len = 3;
-    } else if (c < 0x110000) {
-        str[0] = (c >> 18) | 0xF0;
-        str[1] = ((c >> 12) & 0x3F) | 0x80;
-        str[2] = ((c >> 6) & 0x3F) | 0x80;
-        str[3] = (c & 0x3F) | 0x80;
-        len = 4;
-    } else {
+    if (c >= 0x110000) {
         mp_raise_ValueError(MP_ERROR_TEXT("chr() arg not in range(0x110000)"));
     }
-    return mp_obj_new_str_via_qstr((char *)str, len);
+    VSTR_FIXED(buf, 4);
+    vstr_add_char(&buf, c);
+    return mp_obj_new_str_via_qstr(buf.buf, buf.len);
     #else
     mp_int_t ord = mp_obj_get_int(o_in);
     if (0 <= ord && ord <= 0xff) {

From 516cc280e03b35469096db5f7de141a1018a185f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Nov 2023 13:19:31 +1100
Subject: [PATCH 0588/3129] shared/runtime/softtimer: Generalise soft_timer to
 work without SysTick.

If a port defines MICROPY_SOFT_TIMER_TICKS_MS then soft_timer assumes a
SysTick back end, and provides a soft_timer_next variable that sets when
the next call to soft_timer_handler() should occur.

Otherwise, a port should provide soft_timer_get_ms() and
soft_timer_schedule_at_ms() with appropriate semantics (see comments).

Existing users of soft_timer should continue to work as they did.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/mphalport.h |  3 ++
 ports/samd/mphalport.h       |  3 ++
 shared/runtime/softtimer.c   | 75 ++++++++++++++++++------------------
 shared/runtime/softtimer.h   | 20 ++++++++++
 4 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index 2b25a36fbf853..e29a7fec7b815 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -29,6 +29,9 @@
 #include "pin.h"
 #include "py/ringbuf.h"
 
+#define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV)
+#define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state)
+
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 extern const unsigned char mp_hal_status_to_errno_table[4];
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 83ccf44222d3e..ee33e74462868 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -35,6 +35,9 @@
 #include "hpl_time_measure.h"
 #include "sam.h"
 
+#define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV)
+#define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state)
+
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 extern int mp_interrupt_char;
diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
index 267610b2694da..468fa95b7208c 100644
--- a/shared/runtime/softtimer.c
+++ b/shared/runtime/softtimer.c
@@ -30,42 +30,43 @@
 #include "py/runtime.h"
 #include "softtimer.h"
 
+#ifdef MICROPY_SOFT_TIMER_TICKS_MS
+
 extern __IO uint32_t MICROPY_SOFT_TIMER_TICKS_MS;
 
 volatile uint32_t soft_timer_next;
 
+static inline uint32_t soft_timer_get_ms(void) {
+    return MICROPY_SOFT_TIMER_TICKS_MS;
+}
+
+static void soft_timer_schedule_at_ms(uint32_t ticks_ms) {
+    uint32_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+    uint32_t uw_tick = MICROPY_SOFT_TIMER_TICKS_MS;
+    if (soft_timer_ticks_diff(ticks_ms, uw_tick) <= 0) {
+        soft_timer_next = uw_tick + 1;
+    } else {
+        soft_timer_next = ticks_ms;
+    }
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+}
+
+#endif
+
 // 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 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 interpreted 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;
-}
-
-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) {
-        soft_timer_next = uw_tick + 1;
-    } else {
-        soft_timer_next = ticks_ms;
-    }
-    enable_irq(irq_state);
+    return soft_timer_ticks_diff(e1->expiry_ms, e2->expiry_ms) < 0;
 }
 
 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);
+    MICROPY_PY_PENDSV_ENTER;
     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) {
@@ -76,14 +77,14 @@ void soft_timer_deinit(void) {
         }
     }
     soft_timer_heap = heap_to;
-    restore_irq_pri(irq_state);
+    MICROPY_PY_PENDSV_EXIT;
 }
 
 // Must be executed at IRQ_PRI_PENDSV
 void soft_timer_handler(void) {
-    uint32_t ticks_ms = MICROPY_SOFT_TIMER_TICKS_MS;
+    uint32_t ticks_ms = soft_timer_get_ms();
     soft_timer_entry_t *heap = soft_timer_heap;
-    while (heap != NULL && ticks_diff(heap->expiry_ms, ticks_ms) <= 0) {
+    while (heap != NULL && soft_timer_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) {
@@ -97,19 +98,17 @@ void soft_timer_handler(void) {
         }
     }
     soft_timer_heap = heap;
-    if (heap == NULL) {
-        // No more timers left, set largest delay possible
-        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);
+
+    // Schedule the port's timer to call us back at the correct time.
+    if (heap != NULL) {
+        soft_timer_schedule_at_ms(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);
+    MICROPY_PY_PENDSV_ENTER;
     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) {
@@ -121,7 +120,7 @@ void soft_timer_gc_mark_all(void) {
         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);
+    MICROPY_PY_PENDSV_EXIT;
 }
 
 void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
@@ -134,18 +133,18 @@ 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 = MICROPY_SOFT_TIMER_TICKS_MS + initial_delta_ms;
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    entry->expiry_ms = soft_timer_get_ms() + initial_delta_ms;
+    MICROPY_PY_PENDSV_ENTER;
     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);
+        // This new timer became the earliest one so schedule a callback.
+        soft_timer_schedule_at_ms(entry->expiry_ms);
     }
-    restore_irq_pri(irq_state);
+    MICROPY_PY_PENDSV_EXIT;
 }
 
 void soft_timer_remove(soft_timer_entry_t *entry) {
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    MICROPY_PY_PENDSV_ENTER;
     soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
-    restore_irq_pri(irq_state);
+    MICROPY_PY_PENDSV_EXIT;
 }
diff --git a/shared/runtime/softtimer.h b/shared/runtime/softtimer.h
index 8603ea13f0707..fe5d02b90787b 100644
--- a/shared/runtime/softtimer.h
+++ b/shared/runtime/softtimer.h
@@ -48,6 +48,13 @@ typedef struct _soft_timer_entry_t {
 
 extern volatile uint32_t soft_timer_next;
 
+static inline int32_t soft_timer_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 interpreted to be earlier than
+    // t0 (negative result).
+    return t1 - t0;
+}
+
 void soft_timer_deinit(void);
 void soft_timer_handler(void);
 void soft_timer_gc_mark_all(void);
@@ -63,4 +70,17 @@ static inline void soft_timer_reinsert(soft_timer_entry_t *entry, uint32_t initi
     soft_timer_insert(entry, initial_delta_ms);
 }
 
+#if !defined(MICROPY_SOFT_TIMER_TICKS_MS)
+// IF MICROPY_SOFT_TIMER_TICKS_MS is not defined then the port must provide the
+// following timer functions:
+// - soft_timer_get_ms() must return a 32-bit millisecond counter that wraps around.
+// - soft_timer_schedule_at_ms(ticks_ms) must schedule a callback of soft_timer_handler()
+//   when the above millisecond counter reaches the given ticks_ms value.  If ticks_ms
+//   is behind the current counter (using int32_t arithmetic) then the callback should
+//   be scheduled immediately.  The callback of soft_timer_handler() should be made at
+//   pend-SV IRQ level, or equivalent.
+uint32_t soft_timer_get_ms(void);
+void soft_timer_schedule_at_ms(uint32_t ticks_ms);
+#endif
+
 #endif // MICROPY_INCLUDED_SHARED_RUNTIME_SOFTTIMER_H

From c9a9b2e682f040d2c5cfce97bb4858d3e871bf4e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Nov 2023 13:21:13 +1100
Subject: [PATCH 0589/3129] rp2: Integrate soft_timer using the alarm pool.

The alarm pool is used to schedule the callback to soft_timer_handler().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/main.c         |  2 ++
 ports/rp2/mphalport.c    | 23 +++++++++++++++++++++++
 ports/rp2/mphalport.h    |  4 ++++
 ports/rp2/pendsv.h       |  1 +
 5 files changed, 31 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 15f6f6ca1c288..0f8c6d8e88a98 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -102,6 +102,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/pyexec.c
     ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
+    ${MICROPY_DIR}/shared/runtime/softtimer.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
     ${MICROPY_DIR}/shared/tinyusb/mp_cdc_common.c
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 682ea14476aaa..43680a46cd68f 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -37,6 +37,7 @@
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/runtime/softtimer.h"
 #include "tusb.h"
 #include "uart.h"
 #include "modmachine.h"
@@ -212,6 +213,7 @@ int main(int argc, char **argv) {
         #if MICROPY_PY_THREAD
         mp_thread_deinit();
         #endif
+        soft_timer_deinit();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 4b1c1fa1f5bfb..c567a560b1bf9 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -29,8 +29,10 @@
 #include "py/mphal.h"
 #include "extmod/misc.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared/runtime/softtimer.h"
 #include "shared/timeutils/timeutils.h"
 #include "shared/tinyusb/mp_usbd.h"
+#include "pendsv.h"
 #include "tusb.h"
 #include "uart.h"
 #include "hardware/rtc.h"
@@ -44,6 +46,8 @@
 // microseconds since the Epoch.
 STATIC uint64_t time_us_64_offset_from_epoch;
 
+static alarm_id_t soft_timer_alarm_id = 0;
+
 #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
@@ -260,3 +264,22 @@ void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
 uint32_t storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
     panic_unsupported();
 }
+
+static int64_t soft_timer_callback(alarm_id_t id, void *user_data) {
+    soft_timer_alarm_id = 0;
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+    return 0; // don't reschedule this alarm
+}
+
+uint32_t soft_timer_get_ms(void) {
+    return mp_hal_ticks_ms();
+}
+
+void soft_timer_schedule_at_ms(uint32_t ticks_ms) {
+    if (soft_timer_alarm_id != 0) {
+        cancel_alarm(soft_timer_alarm_id);
+    }
+    int32_t ms = soft_timer_ticks_diff(ticks_ms, mp_hal_ticks_ms());
+    ms = MAX(0, ms);
+    soft_timer_alarm_id = add_alarm_in_ms(ms, soft_timer_callback, NULL, true);
+}
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 95e7cba2c5428..b8133c783e28f 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -31,10 +31,14 @@
 #include "hardware/clocks.h"
 #include "hardware/structs/systick.h"
 #include "RP2040.h" // cmsis, for __WFI
+#include "pendsv.h"
 
 #define SYSTICK_MAX (0xffffff)
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
+#define MICROPY_PY_PENDSV_ENTER   pendsv_suspend()
+#define MICROPY_PY_PENDSV_EXIT    pendsv_resume()
+
 extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
index 294cef3c70b64..fd21ad9ef6621 100644
--- a/ports/rp2/pendsv.h
+++ b/ports/rp2/pendsv.h
@@ -29,6 +29,7 @@
 #include <stddef.h>
 
 enum {
+    PENDSV_DISPATCH_SOFT_TIMER,
     #if MICROPY_PY_LWIP
     PENDSV_DISPATCH_LWIP,
     #endif

From 633c6047227fa9d50a1d1156030c80771ddd1b7c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Nov 2023 13:23:46 +1100
Subject: [PATCH 0590/3129] rp2/mpbthciport: Rework HCI polling timer to use
 soft_timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpbthciport.c  | 33 ++++++++++++++++-----------------
 ports/rp2/mpnimbleport.c |  5 ++---
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index 16d50ddacc3a7..1aacbe881f9f0 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -30,36 +30,37 @@
 #include "extmod/modbluetooth.h"
 #include "extmod/modmachine.h"
 #include "extmod/mpbthci.h"
+#include "shared/runtime/softtimer.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];
 
+// Soft timer and scheduling node for scheduling a HCI poll.
+static soft_timer_entry_t mp_bluetooth_hci_soft_timer;
 static mp_sched_node_t mp_bluetooth_hci_sched_node;
 
-void mp_bluetooth_hci_init(void) {
+// This is called by soft_timer and executes at PendSV level.
+static void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
+    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_init(void) {
+    soft_timer_static_init(
+        &mp_bluetooth_hci_soft_timer,
+        SOFT_TIMER_MODE_ONE_SHOT,
+        0,
+        mp_bluetooth_hci_soft_timer_callback
+        );
 }
 
 void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
-    if (poll_timer_id != 0) {
-        cancel_alarm(poll_timer_id);
-    }
-    poll_timer_id = add_alarm_in_ms(ms, mp_bluetooth_hci_timer_callback, NULL, true);
+    soft_timer_reinsert(&mp_bluetooth_hci_soft_timer, ms);
 }
 
 // For synchronous mode, we run all BLE stack code inside a scheduled task.
@@ -110,10 +111,8 @@ 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;
+    soft_timer_remove(&mp_bluetooth_hci_soft_timer);
+
     return 0;
 }
 
diff --git a/ports/rp2/mpnimbleport.c b/ports/rp2/mpnimbleport.c
index 74e9ecb02602a..fbeaf2beca805 100644
--- a/ports/rp2/mpnimbleport.c
+++ b/ports/rp2/mpnimbleport.c
@@ -69,9 +69,8 @@ void mp_bluetooth_hci_poll(void) {
 // --- Port-specific helpers for the generic NimBLE bindings. -----------------
 
 void mp_bluetooth_nimble_hci_uart_wfi(void) {
-    #if defined(__WFI)
-    __WFI();
-    #endif
+    best_effort_wfe_or_timeout(make_timeout_time_ms(1));
+
     // 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);

From fc94399ffe3c0c794319dd2641386b1ad896ec4f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Nov 2023 13:26:27 +1100
Subject: [PATCH 0591/3129] rp2/mpnetworkport: Rework lwIP polling to use
 soft_timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/cyw43_configport.h |  4 +---
 ports/rp2/mpnetworkport.c    | 36 ++++++++++++++++++------------------
 ports/rp2/pendsv.h           |  3 ---
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 8f64762df561c..a3a5c48e5ee68 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -104,11 +104,9 @@ 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();
+        best_effort_wfe_or_timeout(make_timeout_time_ms(1));
     }
-    restore_interrupts(my_interrupts);
 }
 
 static inline void cyw43_delay_us(uint32_t us) {
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index dac04760b8462..09a543c2db34f 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -30,13 +30,14 @@
 
 #if MICROPY_PY_LWIP
 
+#include "shared/runtime/softtimer.h"
 #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;
+// Soft timer for running lwIP in the background.
+static soft_timer_entry_t mp_network_soft_timer;
 
 #if MICROPY_PY_NETWORK_CYW43
 #include "lib/cyw43-driver/src/cyw43.h"
@@ -56,6 +57,7 @@ static void gpio_irq_handler(void) {
         // 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;
+        __SEV();
         pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
         CYW43_STAT_INC(IRQ_COUNT);
     }
@@ -88,11 +90,6 @@ u32_t sys_now(void) {
     return mp_hal_ticks_ms();
 }
 
-STATIC void lwip_poll(void) {
-    // Run the lwIP internal updates
-    sys_check_timeouts();
-}
-
 void lwip_lock_acquire(void) {
     // Prevent PendSV from running.
     pendsv_suspend();
@@ -103,22 +100,25 @@ void lwip_lock_release(void) {
     pendsv_resume();
 }
 
-STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
-    pendsv_schedule_dispatch(PENDSV_DISPATCH_LWIP, lwip_poll);
+// This is called by soft_timer and executes at PendSV level.
+static void mp_network_soft_timer_callback(soft_timer_entry_t *self) {
+    // Run the lwIP internal updates.
+    sys_check_timeouts();
+
     #if MICROPY_PY_NETWORK_WIZNET5K
-    pendsv_schedule_dispatch(PENDSV_DISPATCH_WIZNET, wiznet5k_poll);
+    wiznet5k_poll();
     #endif
-    return LWIP_TICK_RATE_MS * 1000;
 }
 
 void mod_network_lwip_init(void) {
-    #if MICROPY_PY_NETWORK_WIZNET5K
-    wiznet5k_deinit();
-    #endif
-    if (lwip_alarm_id != -1) {
-        cancel_alarm(lwip_alarm_id);
-    }
-    lwip_alarm_id = add_alarm_in_us(LWIP_TICK_RATE_MS * 1000, alarm_callback, mp_const_true, true);
+    soft_timer_static_init(
+        &mp_network_soft_timer,
+        SOFT_TIMER_MODE_PERIODIC,
+        LWIP_TICK_RATE_MS,
+        mp_network_soft_timer_callback
+        );
+
+    soft_timer_reinsert(&mp_network_soft_timer, LWIP_TICK_RATE_MS);
 }
 
 #endif // MICROPY_PY_LWIP
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
index fd21ad9ef6621..bc8e8d61c8c0f 100644
--- a/ports/rp2/pendsv.h
+++ b/ports/rp2/pendsv.h
@@ -30,9 +30,6 @@
 
 enum {
     PENDSV_DISPATCH_SOFT_TIMER,
-    #if MICROPY_PY_LWIP
-    PENDSV_DISPATCH_LWIP,
-    #endif
     #if MICROPY_PY_NETWORK_CYW43
     PENDSV_DISPATCH_CYW43,
     #endif

From 12ef8a5ba2558a1dd9209c2b1b843a28fb2b584e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Nov 2023 16:17:24 +1100
Subject: [PATCH 0592/3129] rp2/mphalport: Optimise exit of mp_hal_delay_ms
 loop.

best_effort_wfe_or_timeout() already calls time_reached() and returns the
result of it, so no need to call it again.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mphalport.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index c567a560b1bf9..1fb833f2e5dc2 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -192,10 +192,9 @@ 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)) {
+    do {
         MICROPY_EVENT_POLL_HOOK_FAST;
-        best_effort_wfe_or_timeout(t);
-    }
+    } while (!best_effort_wfe_or_timeout(t));
 }
 
 void mp_hal_time_ns_set_from_rtc(void) {

From e182f3862e2c8ab731d169b70e83a6535c01a3f2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Nov 2023 16:18:55 +1100
Subject: [PATCH 0593/3129] rp2/cyw43_configport: Implement cyw43_delay_ms as
 mp_hal_delay_ms.

They do the same thing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/cyw43_configport.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index a3a5c48e5ee68..96324ee5ec966 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -116,12 +116,7 @@ static inline void cyw43_delay_us(uint32_t 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) {
-        cyw43_yield();
-        MICROPY_EVENT_POLL_HOOK_FAST;
-    }
+    mp_hal_delay_ms(ms);
 }
 
 #define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK_FAST

From 6ba57f760cfcfed64157ef7dd030d76738cb0e24 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Nov 2023 11:40:21 +1100
Subject: [PATCH 0594/3129] lib/uzlib: For matches of the same length, take the
 closest one.

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

diff --git a/lib/uzlib/lz77.c b/lib/uzlib/lz77.c
index 117ce50f70f20..8d6920665e547 100644
--- a/lib/uzlib/lz77.c
+++ b/lib/uzlib/lz77.c
@@ -28,13 +28,13 @@ void uzlib_lz77_init(uzlib_lz77_state_t *state, uint8_t *hist, size_t hist_max)
     state->hist_len = 0;
 }
 
-// Push the given byte to the history.
 // Search back in the history for the maximum match of the given src data,
 // with support for searching beyond the end of the history and into the src buffer
 // (effectively the history and src buffer are concatenated).
 static size_t uzlib_lz77_search_max_match(uzlib_lz77_state_t *state, const uint8_t *src, size_t len, size_t *longest_offset) {
     size_t longest_len = 0;
     for (size_t hist_search = 0; hist_search < state->hist_len; ++hist_search) {
+        // Search for a match.
         size_t match_len;
         for (match_len = 0; match_len <= MATCH_LEN_MAX && match_len < len; ++match_len) {
             uint8_t hist;
@@ -47,7 +47,11 @@ static size_t uzlib_lz77_search_max_match(uzlib_lz77_state_t *state, const uint8
                 break;
             }
         }
-        if (match_len >= MATCH_LEN_MIN && match_len > longest_len) {
+
+        // Take this match if its length is at least the minimum, and larger than previous matches.
+        // If the length is the same as the previous longest then take this match as well, because
+        // this match will be closer (more recent in the history) and take less bits to encode.
+        if (match_len >= MATCH_LEN_MIN && match_len >= longest_len) {
             longest_len = match_len;
             *longest_offset = state->hist_len - hist_search;
         }

From c554df57f618fb8c42fcd120ce227a425e44c4bc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Nov 2023 11:43:43 +1100
Subject: [PATCH 0595/3129] tests/extmod/deflate_compress.py: Add a test for
 optimal compression.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/deflate_compress.py     | 6 ++++++
 tests/extmod/deflate_compress.py.exp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/tests/extmod/deflate_compress.py b/tests/extmod/deflate_compress.py
index 612af663e4fd7..981a986cbf53a 100644
--- a/tests/extmod/deflate_compress.py
+++ b/tests/extmod/deflate_compress.py
@@ -146,3 +146,9 @@ def check_header(n, a, b):
     next_len = len(result)
     print(next_len < prev_len and decompress(result, deflate.RAW, wbits) == buf)
     prev_len = next_len
+
+# Verify that compression is optimal: in the bytes below, the final "123" should be
+# compressed by referencing the "123" just before it, and not the one all the way back
+# at the start of the bytes.
+compressed = compress(b"1234567890abcdefghijklmnopqrstuvwxyz123123", deflate.RAW)
+print(len(compressed), compressed)
diff --git a/tests/extmod/deflate_compress.py.exp b/tests/extmod/deflate_compress.py.exp
index 5da70f491bdef..7b00fa3cb29d6 100644
--- a/tests/extmod/deflate_compress.py.exp
+++ b/tests/extmod/deflate_compress.py.exp
@@ -39,3 +39,4 @@ True
 True
 True
 True
+41 b'3426153\xb7\xb04HLJNIMK\xcf\xc8\xcc\xca\xce\xc9\xcd\xcb/(,*.)-+\xaf\xa8\xac\x02\xaa\x01"\x00'

From 911662cc10971b1b0054fe0b19686e4a1683b9bd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Nov 2023 15:21:34 +1100
Subject: [PATCH 0596/3129] esp8266/machine_spi: Rename machine_hspi to
 machine_spi.

This renames the type, functions and file to match other ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/Makefile                        |  2 +-
 ports/esp8266/boards/esp8266_common.ld        |  1 -
 .../esp8266/{machine_hspi.c => machine_spi.c} | 34 +++++++++----------
 ports/esp8266/modmachine.c                    |  2 +-
 ports/esp8266/modmachine.h                    |  1 -
 5 files changed, 19 insertions(+), 21 deletions(-)
 rename ports/esp8266/{machine_hspi.c => machine_spi.c} (85%)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index cea0e789c63f8..88c129952e4cd 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -114,7 +114,7 @@ SRC_C = \
 	machine_bitstream.c \
 	machine_pin.c \
 	machine_rtc.c \
-	machine_hspi.c \
+	machine_spi.c \
 	modesp.c \
 	network_wlan.c \
 	ets_alt_task.c \
diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index ed8c6a7fe8651..cf4883acc9d20 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -161,7 +161,6 @@ SECTIONS
         *modmachine.o(.literal*, .text*)
         *machine_wdt.o(.literal*, .text*)
         *machine_spi.o(.literal*, .text*)
-        *machine_hspi.o(.literal*, .text*)
         *hspi.o(.literal*, .text*)
         *modesp.o(.literal* .text*)
         *modespnow.o(.literal* .text*)
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_spi.c
similarity index 85%
rename from ports/esp8266/machine_hspi.c
rename to ports/esp8266/machine_spi.c
index 1a7de7f49bc17..b7f8ecf240010 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_spi.c
@@ -41,14 +41,14 @@
 
 #if MICROPY_PY_MACHINE_SPI
 
-typedef struct _machine_hspi_obj_t {
+typedef struct _machine_spi_obj_t {
     mp_obj_base_t base;
     uint32_t baudrate;
     uint8_t polarity;
     uint8_t phase;
-} machine_hspi_obj_t;
+} machine_spi_obj_t;
 
-STATIC void machine_hspi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     (void)self_in;
 
     if (dest == NULL) {
@@ -94,14 +94,14 @@ STATIC void machine_hspi_transfer(mp_obj_base_t *self_in, size_t len, const uint
 /******************************************************************************/
 // MicroPython bindings for HSPI
 
-STATIC void machine_hspi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    machine_hspi_obj_t *self = MP_OBJ_TO_PTR(self_in);
+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, "HSPI(id=1, baudrate=%u, polarity=%u, phase=%u)",
         self->baudrate, self->polarity, self->phase);
 }
 
-STATIC void machine_hspi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    machine_hspi_obj_t *self = (machine_hspi_obj_t *)self_in;
+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) {
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
 
     enum { ARG_baudrate, ARG_polarity, ARG_phase };
     static const mp_arg_t allowed_args[] = {
@@ -150,7 +150,7 @@ STATIC void machine_hspi_init(mp_obj_base_t *self_in, size_t n_args, const mp_ob
     spi_mode(HSPI, self->phase, self->polarity);
 }
 
-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_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_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, args);
 
     // args[0] holds the id of the peripheral
@@ -159,29 +159,29 @@ 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 = mp_obj_malloc(machine_hspi_obj_t, &machine_hspi_type);
+    machine_spi_obj_t *self = mp_obj_malloc(machine_spi_obj_t, &machine_spi_type);
     // set defaults
     self->baudrate = 80000000L;
     self->polarity = 0;
     self->phase = 0;
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    machine_hspi_init((mp_obj_base_t *)self, n_args - 1, args + 1, &kw_args);
+    machine_spi_init((mp_obj_base_t *)self, n_args - 1, args + 1, &kw_args);
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC const mp_machine_spi_p_t machine_hspi_p = {
-    .init = machine_hspi_init,
-    .transfer = machine_hspi_transfer,
+STATIC const mp_machine_spi_p_t machine_spi_p = {
+    .init = machine_spi_init,
+    .transfer = machine_spi_transfer,
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hspi_type,
+    machine_spi_type,
     MP_QSTR_HSPI,
     MP_TYPE_FLAG_NONE,
-    make_new, machine_hspi_make_new,
-    print, machine_hspi_print,
-    protocol, &machine_hspi_p,
+    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/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 78d5bde26da8f..3daf5ad876185 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -432,7 +432,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_hspi_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
 
diff --git a/ports/esp8266/modmachine.h b/ports/esp8266/modmachine.h
index 5a90a6c6fe22e..ff8670687bed1 100644
--- a/ports/esp8266/modmachine.h
+++ b/ports/esp8266/modmachine.h
@@ -5,7 +5,6 @@
 
 extern const mp_obj_type_t pyb_pin_type;
 extern const mp_obj_type_t pyb_rtc_type;
-extern const mp_obj_type_t machine_hspi_type;
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj);
 

From b4d288ae4478886a0d547a176f090de678bff70e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Nov 2023 15:56:11 +1100
Subject: [PATCH 0597/3129] nrf: Use MICROPY_PY_MACHINE_SPI instead of
 MICROPY_PY_MACHINE_HW_SPI.

MICROPY_PY_MACHINE_SPI is defined in mpconfigport.h to be equal to
MICROPY_PY_MACHINE_HW_SPI, so they are equivalent options.  The former one
is preferred because it's used by all other ports.

The default in mpconfigport.h is to enable this option, and all boards that
enable SPI have this removed from their mpconfigboard.h file so they pick
up the default.

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                  | 2 +-
 ports/nrf/boards/PCA10001/mpconfigboard.h                  | 2 +-
 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                  | 1 -
 ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h          | 1 -
 ports/nrf/boards/WT51822_S4AT/mpconfigboard.h              | 1 -
 ports/nrf/main.c                                           | 2 +-
 ports/nrf/modules/machine/modmachine.c                     | 2 +-
 ports/nrf/modules/machine/spi.c                            | 4 ++--
 ports/nrf/mpconfigport.h                                   | 6 ++----
 ports/nrf/nrfx_config.h                                    | 6 +++---
 28 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
index 9bf2a8d19191a..87e9f8ed2e682 100644
--- a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf9160"
 
 #define MICROPY_PY_MACHINE_UART     (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      (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 0e6c5a44abf48..69d715f18b70c 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
@@ -15,7 +15,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_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 a16ce1a20d68f..6b1b4e0074c0f 100644
--- a/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
@@ -33,7 +33,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_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 b69f6a882ec69..417b49fce617a 100644
--- a/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
@@ -33,7 +33,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_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 5eb666c9758b1..fe77fe1957452 100644
--- a/ports/nrf/boards/DVK_BL652/mpconfigboard.h
+++ b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
@@ -30,7 +30,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_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 8d3b3688f341c..dd64ffb8b7f5a 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_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)
diff --git a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
index 17903e576dccc..98bd71eec870c 100644
--- a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
+++ b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
@@ -47,7 +47,6 @@
 // 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_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 f653832c620d3..7dcc7357a6975 100644
--- a/ports/nrf/boards/FEATHER52/mpconfigboard.h
+++ b/ports/nrf/boards/FEATHER52/mpconfigboard.h
@@ -30,7 +30,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_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 85b48e1fb26a3..6d1c5364b53f3 100644
--- a/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
+++ b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
@@ -33,7 +33,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_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 1f47e9b06d5b3..aacb49e71501c 100644
--- a/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
+++ b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
@@ -33,7 +33,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_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 63f45587af8d2..3f9f873ff7d14 100644
--- a/ports/nrf/boards/MICROBIT/mpconfigboard.h
+++ b/ports/nrf/boards/MICROBIT/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MUSIC            (1)
 #define MICROPY_PY_MACHINE_SOFT_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)
diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
index d502c86575c27..94624be028a17 100644
--- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
@@ -30,7 +30,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_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 d77e104ce2c8a..343fa4c2f3944 100644
--- a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
+++ b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
@@ -30,7 +30,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_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 2f551612ea6f7..a450c3c36e477 100644
--- a/ports/nrf/boards/PCA10000/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10000/mpconfigboard.h
@@ -30,7 +30,7 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_SOFT_PWM (1)
-#define MICROPY_PY_MACHINE_HW_SPI   (0)
+#define MICROPY_PY_MACHINE_SPI      (0)
 #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 2120ee0a88212..929189188ec37 100644
--- a/ports/nrf/boards/PCA10001/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10001/mpconfigboard.h
@@ -30,7 +30,7 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_SOFT_PWM (1)
-#define MICROPY_PY_MACHINE_HW_SPI   (0)
+#define MICROPY_PY_MACHINE_SPI      (0)
 #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 f8e3541f3715c..3dc8ed3459b53 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_SOFT_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)
diff --git a/ports/nrf/boards/PCA10031/mpconfigboard.h b/ports/nrf/boards/PCA10031/mpconfigboard.h
index b618f61b50c3f..e74e83c663e00 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_SOFT_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)
diff --git a/ports/nrf/boards/PCA10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h
index 7202f6a0b1323..b965bf319d082 100644
--- a/ports/nrf/boards/PCA10040/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10040/mpconfigboard.h
@@ -30,7 +30,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_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 f7daf48a62223..5b1b3a36ee26a 100644
--- a/ports/nrf/boards/PCA10056/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10056/mpconfigboard.h
@@ -30,7 +30,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_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 f4c78915c6a12..1c87731584de7 100644
--- a/ports/nrf/boards/PCA10059/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10059/mpconfigboard.h
@@ -30,7 +30,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_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 f58ac8989b765..1989fd0476456 100644
--- a/ports/nrf/boards/PCA10090/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10090/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf9160-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_TIMER_NRF (0)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
diff --git a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
index 1a2d14f1d4e86..25a34541a4a53 100644
--- a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
@@ -35,7 +35,6 @@
 #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)
diff --git a/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
index 7997aa2697dc2..e9865cb4d66d3 100644
--- a/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
+++ b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51"
 
 #define MICROPY_PY_MACHINE_UART     (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)
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 959c31e2e7419..8e57be8decdd9 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -137,7 +137,7 @@ int main(int argc, char **argv) {
     mp_init();
     readline_init0();
 
-    #if MICROPY_PY_MACHINE_HW_SPI
+    #if MICROPY_PY_MACHINE_SPI
     spi_init0();
     #endif
 
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 9043b7a4410e0..0bacc24eea699 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -219,7 +219,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),               MP_ROM_PTR(&machine_uart_type) },
 #endif
-#if MICROPY_PY_MACHINE_HW_SPI
+#if MICROPY_PY_MACHINE_SPI
     { MP_ROM_QSTR(MP_QSTR_SPI),                MP_ROM_PTR(&machine_spi_type) },
 #endif
 #if MICROPY_PY_MACHINE_I2C
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index d0234244afaf2..cb09a23491630 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -31,7 +31,7 @@
 
 #include "py/runtime.h"
 
-#if MICROPY_PY_MACHINE_HW_SPI
+#if MICROPY_PY_MACHINE_SPI
 
 #include "py/nlr.h"
 #include "py/mphal.h"
@@ -347,4 +347,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &mp_machine_spi_locals_dict
     );
 
-#endif // MICROPY_PY_MACHINE_HW_SPI
+#endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 61e2421038241..e18e55fb315ee 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -183,11 +183,9 @@
 #define MICROPY_PY_MACHINE_I2C      (0)
 #endif
 
-#ifndef MICROPY_PY_MACHINE_HW_SPI
-#define MICROPY_PY_MACHINE_HW_SPI   (1)
+#ifndef MICROPY_PY_MACHINE_SPI
+#define MICROPY_PY_MACHINE_SPI      (1)
 #endif
-
-#define MICROPY_PY_MACHINE_SPI      (MICROPY_PY_MACHINE_HW_SPI)
 #define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0)
 
 #ifndef MICROPY_PY_MACHINE_HW_PWM
diff --git a/ports/nrf/nrfx_config.h b/ports/nrf/nrfx_config.h
index 4669a0905641c..c38af62145f4d 100644
--- a/ports/nrf/nrfx_config.h
+++ b/ports/nrf/nrfx_config.h
@@ -103,7 +103,7 @@
 #endif
 
 #if defined(NRF51) || defined(NRF52832)
-  #define NRFX_SPI_ENABLED (MICROPY_PY_MACHINE_HW_SPI)
+  #define NRFX_SPI_ENABLED (MICROPY_PY_MACHINE_SPI)
   #define NRFX_SPI0_ENABLED 1
   #define NRFX_SPI1_ENABLED 1
 
@@ -111,13 +111,13 @@
     #define NRFX_SPI2_ENABLED 1
   #endif
 #elif defined(NRF52840)
-  #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_HW_SPI)
+  #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_SPI)
   #define NRFX_SPIM0_ENABLED 1
   #define NRFX_SPIM1_ENABLED 1
   #define NRFX_SPIM2_ENABLED 1
   #define NRFX_SPIM3_ENABLED (NRF52840)
 #elif defined(NRF9160_XXAA)
-  #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_HW_SPI)
+  #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_SPI)
   #define NRFX_SPIM0_ENABLED 1
   #define NRFX_SPIM1_ENABLED 1
 

From e120c00c9590b5691a8a4560382ad70ffb7a1c5d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Nov 2023 11:35:31 +1100
Subject: [PATCH 0598/3129] stm32/modmachine: Only enable machine.I2C if
 hardware I2C is enabled.

Prior to this change, if a board did not define any hardware I2C pins, via
MICROPY_HW_I2Cx_SCL, then machine.I2C would alias to machine.SoftI2C.

That doesn't really make sense, and SoftI2C should always be used if there
is no hardware implementation.  So this commit makes it so that machine.I2C
is only available if at least one set of I2C hardware pins are defined via
the MICROPY_HW_I2Cx_SCL/SDA macros.

For all boards that define at least one set of I2C hardware pins (which is
most of them) this commit is a no-op.  The only boards that change are:
LEGO_HUB_NO6, LEGO_HUB_NO7, STM32H7B3I_DK.

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

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 00ded86e169b0..e5bcf4d701c1f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -117,7 +117,7 @@
 #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_I2C      (MICROPY_HW_ENABLE_HW_I2C)
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE "ports/stm32/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX (I2S_MODE_MASTER_RX)

From 7b2f13fb69d95980c8e517d1944bc1e9d7ed5489 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Nov 2023 11:46:54 +1100
Subject: [PATCH 0599/3129] renesas-ra: Consolidate MICROPY_PY_MACHINE_I2C
 option.

MICROPY_HW_ENABLE_HW_I2C and MICROPY_PY_MACHINE_I2C are equivalent, so
just use the latter.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/machine_i2c.c          | 4 ++--
 ports/renesas-ra/mpconfigboard_common.h | 4 ++--
 ports/renesas-ra/mpconfigport.h         | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index 0e2d62f8a40c4..dc14be9594116 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -35,7 +35,7 @@
 
 #include "ra_i2c.h"
 
-#if MICROPY_HW_ENABLE_HW_I2C
+#if MICROPY_PY_MACHINE_I2C
 
 #define DEFAULT_I2C_FREQ (400000)
 #define DEFAULT_I2C_TIMEOUT (1000)
@@ -165,4 +165,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     protocol, &machine_i2c_p
     );
 
-#endif // MICROPY_HW_ENABLE_HW_I2C
+#endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/renesas-ra/mpconfigboard_common.h b/ports/renesas-ra/mpconfigboard_common.h
index f8990f489e3b2..479c9f61d1a68 100644
--- a/ports/renesas-ra/mpconfigboard_common.h
+++ b/ports/renesas-ra/mpconfigboard_common.h
@@ -256,9 +256,9 @@
 // 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)
+#define MICROPY_PY_MACHINE_I2C (1)
 #else
-#define MICROPY_HW_ENABLE_HW_I2C (0)
+#define MICROPY_PY_MACHINE_I2C (0)
 #endif
 
 #if defined(MICROPY_HW_PWM_0A) || defined(MICROPY_HW_PWM_0B) \
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 222d5b919d479..94e07b33913af 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -138,7 +138,6 @@
 #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)

From 14432b5da022e32c035c47c7f6c44b5e97d16c89 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Nov 2023 14:43:40 +1100
Subject: [PATCH 0600/3129] extmod/modmachine: Make I2C/SPI defns available
 when soft impl enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 0744ef788979f..488aef4afda19 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -114,7 +114,7 @@
         } \
     } while (0)
 
-#if MICROPY_PY_MACHINE_I2C
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 
 #define MP_MACHINE_I2C_FLAG_READ (0x01) // if not set then it's a write
 #define MP_MACHINE_I2C_FLAG_STOP (0x02)
@@ -139,7 +139,7 @@ typedef struct _machine_mem_obj_t {
     unsigned elem_size; // in bytes
 } machine_mem_obj_t;
 
-#if MICROPY_PY_MACHINE_I2C
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 
 typedef struct _mp_machine_i2c_buf_t {
     size_t len;
@@ -175,7 +175,7 @@ typedef struct _mp_machine_soft_i2c_obj_t {
 
 #endif
 
-#if MICROPY_PY_MACHINE_SPI
+#if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
 
 // SPI protocol.
 typedef struct _mp_machine_spi_p_t {
@@ -215,16 +215,20 @@ 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_I2C
+#if MICROPY_PY_MACHINE_SOFTI2C
 extern const mp_obj_type_t mp_machine_soft_i2c_type;
+#endif
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 extern const mp_obj_dict_t mp_machine_i2c_locals_dict;
 #endif
 
-#if MICROPY_PY_MACHINE_SPI
+#if MICROPY_PY_MACHINE_SOFTSPI
 extern const mp_obj_type_t mp_machine_soft_spi_type;
-extern const mp_obj_dict_t mp_machine_spi_locals_dict;
 extern const mp_machine_spi_p_t mp_machine_soft_spi_p;
 #endif
+#if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
+extern const mp_obj_dict_t mp_machine_spi_locals_dict;
+#endif
 
 #if defined(MICROPY_MACHINE_MEM_GET_READ_ADDR)
 uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);

From 7d39db2503cab67f03216161b0e829939f80fff7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Nov 2023 13:00:02 +1100
Subject: [PATCH 0601/3129] extmod/modmachine: Factor ports' machine module
 dict to common code.

This is a code factoring to have the dict for the machine module in one
location, and all the ports use that same dict.  The machine.soft_reset()
function implementation is also factored because it's the same for all
ports that did already implement it.  Eventually more functions/bindings
can be factored.

All ports remain functionally the same, except:
- cc3200 port: gains soft_reset, mem8, mem16, mem32, Signal; loses POWER_ON
  (which was a legacy constant, replaced long ago by PWRON_RESET)
- nrf port: gains Signal
- qemu-arm port: gains soft_reset
- unix port: gains soft_reset
- zephyr port: gains soft_reset, mem8, mem16, mem32

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake                    |   1 +
 extmod/extmod.mk                       |   1 +
 extmod/modmachine.c                    | 125 +++++++++++++++++++
 ports/cc3200/application.mk            |   1 -
 ports/cc3200/mods/modmachine.c         | 115 ++++++++---------
 ports/cc3200/mpconfigport.h            |   1 +
 ports/esp32/esp32_common.cmake         |   1 -
 ports/esp32/modmachine.c               | 164 ++++++++-----------------
 ports/esp32/mpconfigport.h             |   2 +
 ports/esp8266/Makefile                 |   1 -
 ports/esp8266/main.c                   |   3 -
 ports/esp8266/modmachine.c             | 124 +++++--------------
 ports/esp8266/mpconfigport.h           |   6 +-
 ports/mimxrt/Makefile                  |   1 -
 ports/mimxrt/modmachine.c              | 119 ++++++------------
 ports/mimxrt/mpconfigport.h            |   2 +
 ports/nrf/Makefile                     |   1 -
 ports/nrf/modules/machine/modmachine.c | 132 ++++++++------------
 ports/nrf/mpconfigport.h               |   1 +
 ports/qemu-arm/Makefile                |   1 -
 ports/qemu-arm/modmachine.c            |  31 ++---
 ports/qemu-arm/mpconfigport.h          |   1 +
 ports/renesas-ra/Makefile              |   1 -
 ports/renesas-ra/modmachine.c          | 126 ++++++-------------
 ports/renesas-ra/mpconfigport.h        |   5 +-
 ports/rp2/CMakeLists.txt               |   2 -
 ports/rp2/modmachine.c                 |  99 ++++-----------
 ports/rp2/mpconfigport.h               |   2 +
 ports/samd/Makefile                    |   1 -
 ports/samd/modmachine.c                | 128 ++++++-------------
 ports/samd/mpconfigport.h              |   1 +
 ports/stm32/Makefile                   |   3 +-
 ports/stm32/modmachine.c               | 149 ++++++----------------
 ports/stm32/mpconfigport.h             |   2 +
 ports/unix/Makefile                    |   1 -
 ports/unix/modmachine.c                |  53 +++-----
 ports/unix/mpconfigport.h              |   3 +
 ports/windows/Makefile                 |   1 -
 ports/windows/micropython.vcxproj      |   1 -
 ports/windows/mpconfigport.h           |   1 +
 ports/windows/msvc/sources.props       |   1 +
 ports/zephyr/CMakeLists.txt            |   1 -
 ports/zephyr/modmachine.c              |  56 +++------
 ports/zephyr/mpconfigport.h            |   1 +
 44 files changed, 550 insertions(+), 922 deletions(-)
 create mode 100644 extmod/modmachine.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 5bfdf65513819..b9a1d67034959 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -22,6 +22,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
     ${MICROPY_EXTMOD_DIR}/modlwip.c
+    ${MICROPY_EXTMOD_DIR}/modmachine.c
     ${MICROPY_EXTMOD_DIR}/modnetwork.c
     ${MICROPY_EXTMOD_DIR}/modonewire.c
     ${MICROPY_EXTMOD_DIR}/modasyncio.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 84573ec861066..7aba7d93eb061 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -27,6 +27,7 @@ SRC_EXTMOD_C += \
 	extmod/modheapq.c \
 	extmod/modjson.c \
 	extmod/modlwip.c \
+	extmod/modmachine.c \
 	extmod/modnetwork.c \
 	extmod/modonewire.c \
 	extmod/modos.c \
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
new file mode 100644
index 0000000000000..e0bef3a73f13c
--- /dev/null
+++ b/extmod/modmachine.c
@@ -0,0 +1,125 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "py/runtime.h"
+
+#if MICROPY_PY_MACHINE
+
+#include "extmod/modmachine.h"
+#include "shared/runtime/pyexec.h"
+
+#if MICROPY_PY_MACHINE_DHT_READINTO
+#include "drivers/dht/dht.h"
+#endif
+
+// The port can provide additional machine-module implementation in this file.
+#ifdef MICROPY_PY_MACHINE_INCLUDEFILE
+#include MICROPY_PY_MACHINE_INCLUDEFILE
+#endif
+
+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 const mp_rom_map_elem_t machine_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
+
+    // Memory access objects.
+    { 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) },
+
+    // Reset related functions.
+    { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) },
+
+    // Functions for bit protocols.
+    #if MICROPY_PY_MACHINE_BITSTREAM
+    { MP_ROM_QSTR(MP_QSTR_bitstream), MP_ROM_PTR(&machine_bitstream_obj) },
+    #endif
+    #if MICROPY_PY_MACHINE_DHT_READINTO
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
+    #endif
+    #if MICROPY_PY_MACHINE_PULSE
+    { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    #endif
+
+    // Class for Signal.
+    { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
+
+    // Classes for software bus protocols.
+    #if MICROPY_PY_MACHINE_SOFTI2C
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_SOFTSPI
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    #endif
+
+    // Classes for hardware peripherals.
+    #if MICROPY_PY_MACHINE_ADC
+    { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_ADC_BLOCK
+    { MP_ROM_QSTR(MP_QSTR_ADCBlock), MP_ROM_PTR(&machine_adc_block_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_DAC
+    { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_I2C
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_I2S
+    { MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_PWM
+    { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_SPI
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_UART
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_WDT
+    { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
+    #endif
+
+    // A port can add extra entries to the module by defining the following macro.
+    #ifdef MICROPY_PY_MACHINE_EXTRA_GLOBALS
+    MICROPY_PY_MACHINE_EXTRA_GLOBALS
+    #endif
+};
+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,
+};
+
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 6959c64b666e8..9fc58553cd3d2 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -76,7 +76,6 @@ APP_MISC_SRC_C = $(addprefix misc/,\
 	)
 
 APP_MODS_SRC_C = $(addprefix mods/,\
-	modmachine.c \
 	modnetwork.c \
 	modos.c \
 	modsocket.c \
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 107efaef160be..8673c62865d40 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2015 Daniel Campora
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,29 +25,22 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
+
 #include <stdio.h>
 
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "extmod/modmachine.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
 #include "inc/hw_uart.h"
 #include "rom_map.h"
-#include "prcm.h"
 #include "pybuart.h"
 #include "pybpin.h"
 #include "pybrtc.h"
 #include "simplelink.h"
-#include "modnetwork.h"
 #include "modwlan.h"
-#include "modos.h"
-#include "FreeRTOS.h"
-#include "portable.h"
-#include "task.h"
 #include "random.h"
 #include "pybadc.h"
 #include "pybi2c.h"
@@ -55,9 +48,51 @@
 #include "pybsleep.h"
 #include "pybspi.h"
 #include "pybtimer.h"
-#include "utils.h"
-#include "gccollect.h"
 
+#ifdef DEBUG
+#define MICROPY_PY_MACHINE_INFO_ENTRY { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&machine_info_obj) },
+#else
+#define MICROPY_PY_MACHINE_INFO_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) }, \
+    MICROPY_PY_MACHINE_INFO_ENTRY \
+    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_main),                MP_ROM_PTR(&machine_main_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_rng),                 MP_ROM_PTR(&machine_rng_get_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_wake_reason),         MP_ROM_PTR(&machine_wake_reason_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) }, \
+    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&pyb_adc_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&pyb_i2c_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&pyb_spi_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&pyb_timer_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_SD),                  MP_ROM_PTR(&pyb_sd_type) }, \
+    \
+    /* class constants */ \
+    { MP_ROM_QSTR(MP_QSTR_IDLE),                MP_ROM_INT(PYB_PWR_MODE_ACTIVE) }, \
+    { MP_ROM_QSTR(MP_QSTR_SLEEP),               MP_ROM_INT(PYB_PWR_MODE_LPDS) }, \
+    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP),           MP_ROM_INT(PYB_PWR_MODE_HIBERNATE) }, \
+    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(PYB_SLP_PWRON_RESET) }, \
+    { MP_ROM_QSTR(MP_QSTR_HARD_RESET),          MP_ROM_INT(PYB_SLP_HARD_RESET) }, \
+    { MP_ROM_QSTR(MP_QSTR_WDT_RESET),           MP_ROM_INT(PYB_SLP_WDT_RESET) }, \
+    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET),     MP_ROM_INT(PYB_SLP_HIB_RESET) }, \
+    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET),          MP_ROM_INT(PYB_SLP_SOFT_RESET) }, \
+    { MP_ROM_QSTR(MP_QSTR_WLAN_WAKE),           MP_ROM_INT(PYB_SLP_WAKED_BY_WLAN) }, \
+    { MP_ROM_QSTR(MP_QSTR_PIN_WAKE),            MP_ROM_INT(PYB_SLP_WAKED_BY_GPIO) }, \
+    { MP_ROM_QSTR(MP_QSTR_RTC_WAKE),            MP_ROM_INT(PYB_SLP_WAKED_BY_RTC) }, \
 
 #ifdef DEBUG
 extern OsiTaskHandle    mpTaskHandle;
@@ -161,58 +196,4 @@ STATIC mp_obj_t machine_wake_reason (void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_wake_reason_obj, machine_wake_reason);
 
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
-
-    { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
-#ifdef DEBUG
-    { MP_ROM_QSTR(MP_QSTR_info),                MP_ROM_PTR(&machine_info_obj) },
-#endif
-    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
-    { MP_ROM_QSTR(MP_QSTR_main),                MP_ROM_PTR(&machine_main_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rng),                 MP_ROM_PTR(&machine_rng_get_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_wake_reason),         MP_ROM_PTR(&machine_wake_reason_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) },
-    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&pyb_adc_type) },
-    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&pyb_i2c_type) },
-    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&pyb_spi_type) },
-    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
-    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&pyb_timer_type) },
-    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
-    { MP_ROM_QSTR(MP_QSTR_SD),                  MP_ROM_PTR(&pyb_sd_type) },
-
-    // class constants
-    { MP_ROM_QSTR(MP_QSTR_IDLE),                MP_ROM_INT(PYB_PWR_MODE_ACTIVE) },
-    { MP_ROM_QSTR(MP_QSTR_SLEEP),               MP_ROM_INT(PYB_PWR_MODE_LPDS) },
-    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP),           MP_ROM_INT(PYB_PWR_MODE_HIBERNATE) },
-    { MP_ROM_QSTR(MP_QSTR_POWER_ON),            MP_ROM_INT(PYB_SLP_PWRON_RESET) }, // legacy constant
-    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(PYB_SLP_PWRON_RESET) },
-    { MP_ROM_QSTR(MP_QSTR_HARD_RESET),          MP_ROM_INT(PYB_SLP_HARD_RESET) },
-    { MP_ROM_QSTR(MP_QSTR_WDT_RESET),           MP_ROM_INT(PYB_SLP_WDT_RESET) },
-    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET),     MP_ROM_INT(PYB_SLP_HIB_RESET) },
-    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET),          MP_ROM_INT(PYB_SLP_SOFT_RESET) },
-    { MP_ROM_QSTR(MP_QSTR_WLAN_WAKE),           MP_ROM_INT(PYB_SLP_WAKED_BY_WLAN) },
-    { MP_ROM_QSTR(MP_QSTR_PIN_WAKE),            MP_ROM_INT(PYB_SLP_WAKED_BY_GPIO) },
-    { MP_ROM_QSTR(MP_QSTR_RTC_WAKE),            MP_ROM_INT(PYB_SLP_WAKED_BY_RTC) },
-};
-
-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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
 MP_REGISTER_ROOT_POINTER(mp_obj_t machine_config_main);
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index c19288fe89037..f2dff028fc3fb 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -121,6 +121,7 @@
 #define MICROPY_PY_TIME_TIME_TIME_NS                (1)
 #define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
 #define MICROPY_PY_MACHINE                          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE              "ports/cc3200/mods/modmachine.c"
 #define MICROPY_PY_MACHINE_WDT                      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE          "ports/cc3200/mods/machine_wdt.c"
 
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 40ae98822d43a..71b42a590da5e 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -69,7 +69,6 @@ list(APPEND MICROPY_SOURCE_PORT
     machine_touchpad.c
     machine_dac.c
     machine_i2c.c
-    modmachine.c
     network_common.c
     network_lan.c
     network_ppp.c
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 461ddacdad1d1..a1bd9a5cb985a 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -5,7 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2016 Paul Sokolovsky
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -27,8 +27,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stdio.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -36,15 +36,60 @@
 #include "esp_sleep.h"
 #include "esp_pm.h"
 
-#include "py/obj.h"
-#include "py/runtime.h"
-#include "shared/runtime/pyexec.h"
-#include "drivers/dht/dht.h"
-#include "extmod/modmachine.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
 
-#if MICROPY_PY_MACHINE
+#if MICROPY_HW_ENABLE_SDCARD
+#define MICROPY_PY_MACHINE_SDCARD_ENTRY { MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&machine_sdcard_type) },
+#else
+#define MICROPY_PY_MACHINE_SDCARD_ENTRY
+#endif
+
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#define MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
+#else
+#define MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_unique_id), MP_ROM_PTR(&machine_unique_id_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_idle), MP_ROM_PTR(&machine_idle_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_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_Timer), MP_ROM_PTR(&machine_timer_type) }, \
+    MICROPY_PY_MACHINE_SDCARD_ENTRY \
+    { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) }, \
+    MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY \
+    { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) }, \
+    \
+    /* wake abilities */ \
+    { MP_ROM_QSTR(MP_QSTR_SLEEP), MP_ROM_INT(MACHINE_WAKE_SLEEP) }, \
+    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP), MP_ROM_INT(MACHINE_WAKE_DEEPSLEEP) }, \
+    \
+    /* Reset reasons */ \
+    { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_HARD_RESET), MP_ROM_INT(MP_HARD_RESET) }, \
+    { 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_DEEPSLEEP_RESET), MP_ROM_INT(MP_DEEPSLEEP_RESET) }, \
+    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET), MP_ROM_INT(MP_SOFT_RESET) }, \
+    \
+    /* Wake reasons */ \
+    { MP_ROM_QSTR(MP_QSTR_wake_reason), MP_ROM_PTR(&machine_wake_reason_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_PIN_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_EXT0) }, \
+    { MP_ROM_QSTR(MP_QSTR_EXT0_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_EXT0) }, \
+    { MP_ROM_QSTR(MP_QSTR_EXT1_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_EXT1) }, \
+    { MP_ROM_QSTR(MP_QSTR_TIMER_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_TIMER) }, \
+    { MP_ROM_QSTR(MP_QSTR_TOUCHPAD_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_TOUCHPAD) }, \
+    { MP_ROM_QSTR(MP_QSTR_ULP_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_ULP) }, \
 
 typedef enum {
     MP_PWRON_RESET = 1,
@@ -231,12 +276,6 @@ STATIC mp_obj_t machine_reset(void) {
 }
 STATIC 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);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
-
 STATIC mp_obj_t machine_unique_id(void) {
     uint8_t chipid[6];
     esp_efuse_mac_get_default(chipid);
@@ -264,98 +303,3 @@ STATIC mp_obj_t machine_enable_irq(mp_obj_t state_in) {
     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_machine) },
-
-    { 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_freq), MP_ROM_PTR(&machine_freq_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_unique_id), MP_ROM_PTR(&machine_unique_id_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_idle), MP_ROM_PTR(&machine_idle_obj) },
-    { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_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_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_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) },
-    #if MICROPY_PY_MACHINE_WDT
-    { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
-    #endif
-    #if MICROPY_HW_ENABLE_SDCARD
-    { MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&machine_sdcard_type) },
-    #endif
-
-    // wake abilities
-    { MP_ROM_QSTR(MP_QSTR_SLEEP), MP_ROM_INT(MACHINE_WAKE_SLEEP) },
-    { 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 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-    { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_ADC
-    { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_ADC_BLOCK
-    { MP_ROM_QSTR(MP_QSTR_ADCBlock), MP_ROM_PTR(&machine_adc_block_type) },
-    #endif
-    #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_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_spi_type) },
-    { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
-    #endif
-
-    // Reset reasons
-    { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
-    { MP_ROM_QSTR(MP_QSTR_HARD_RESET), MP_ROM_INT(MP_HARD_RESET) },
-    { 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_DEEPSLEEP_RESET), MP_ROM_INT(MP_DEEPSLEEP_RESET) },
-    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET), MP_ROM_INT(MP_SOFT_RESET) },
-
-    // Wake reasons
-    { MP_ROM_QSTR(MP_QSTR_wake_reason), MP_ROM_PTR(&machine_wake_reason_obj) },
-    { MP_ROM_QSTR(MP_QSTR_PIN_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_EXT0) },
-    { MP_ROM_QSTR(MP_QSTR_EXT0_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_EXT0) },
-    { MP_ROM_QSTR(MP_QSTR_EXT1_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_EXT1) },
-    { MP_ROM_QSTR(MP_QSTR_TIMER_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_TIMER) },
-    { MP_ROM_QSTR(MP_QSTR_TOUCHPAD_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_TOUCHPAD) },
-    { MP_ROM_QSTR(MP_QSTR_ULP_WAKE), MP_ROM_INT(ESP_SLEEP_WAKEUP_ULP) },
-};
-
-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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 706baae5b29a2..8a21cabb7d478 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -96,6 +96,7 @@
 #define MICROPY_PY_OS_UNAME                 (1)
 #define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/esp32/modmachine.c"
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH  (1)
@@ -106,6 +107,7 @@
 #define MICROPY_PY_MACHINE_ADC_BLOCK_INCLUDEFILE "ports/esp32/machine_adc_block.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
+#define MICROPY_PY_MACHINE_DHT_READINTO     (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_DUTY         (1)
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 88c129952e4cd..4f5c2c36e4c5f 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -110,7 +110,6 @@ SRC_C = \
 	uart.c \
 	esppwm.c \
 	espapa102.c \
-	modmachine.c \
 	machine_bitstream.c \
 	machine_pin.c \
 	machine_rtc.c \
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 33e0272f8076d..d0f52ed56639f 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -36,9 +36,6 @@
 #include "py/mphal.h"
 #include "py/gc.h"
 
-// This needs to be defined before any ESP SDK headers are included
-#define USE_US_TIMER 1
-
 #include "extmod/misc.h"
 #include "extmod/modmachine.h"
 #include "shared/readline/readline.h"
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 3daf5ad876185..b15515acd7a89 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2016 Paul Sokolovsky
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,20 +25,10 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stdio.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
-#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
-
-#include "extmod/modmachine.h"
 #include "modmachine.h"
-
 #include "xtirq.h"
 #include "os_type.h"
 #include "osapi.h"
@@ -46,12 +36,39 @@
 #include "ets_alt_task.h"
 #include "user_interface.h"
 
-#if MICROPY_PY_MACHINE
-
 // #define MACHINE_WAKE_IDLE (0x01)
 // #define MACHINE_WAKE_SLEEP (0x02)
 #define MACHINE_WAKE_DEEPSLEEP (0x04)
 
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_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_unique_id), MP_ROM_PTR(&machine_unique_id_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_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_Timer), MP_ROM_PTR(&esp_timer_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pyb_pin_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) }, \
+    \
+    /* wake abilities */ \
+    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP), MP_ROM_INT(MACHINE_WAKE_DEEPSLEEP) }, \
+    \
+    /* reset causes */ \
+    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET), MP_ROM_INT(REASON_DEFAULT_RST) }, \
+    { MP_ROM_QSTR(MP_QSTR_HARD_RESET), MP_ROM_INT(REASON_EXT_SYS_RST) }, \
+    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET), MP_ROM_INT(REASON_DEEP_SLEEP_AWAKE) }, \
+    { MP_ROM_QSTR(MP_QSTR_WDT_RESET), MP_ROM_INT(REASON_WDT_RST) }, \
+    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET), MP_ROM_INT(REASON_SOFT_RESTART) }, \
+
 STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // get
@@ -74,12 +91,6 @@ STATIC mp_obj_t machine_reset(void) {
 }
 STATIC 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);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
-
 STATIC mp_obj_t machine_reset_cause(void) {
     return MP_OBJ_NEW_SMALL_INT(system_get_rst_info()->reason);
 }
@@ -386,74 +397,3 @@ mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t
         }
     }
 }
-
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
-    { 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_freq), MP_ROM_PTR(&machine_freq_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_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unique_id), MP_ROM_PTR(&machine_unique_id_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_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_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) },
-    #if MICROPY_PY_MACHINE_WDT
-    { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
-    #endif
-    { 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(&machine_pwm_type) },
-    #if MICROPY_PY_MACHINE_ADC
-    { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_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_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_spi_type) },
-    { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
-    #endif
-
-    // wake abilities
-    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP), MP_ROM_INT(MACHINE_WAKE_DEEPSLEEP) },
-
-    // reset causes
-    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET), MP_ROM_INT(REASON_DEFAULT_RST) },
-    { MP_ROM_QSTR(MP_QSTR_HARD_RESET), MP_ROM_INT(REASON_EXT_SYS_RST) },
-    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET), MP_ROM_INT(REASON_DEEP_SLEEP_AWAKE) },
-    { MP_ROM_QSTR(MP_QSTR_WDT_RESET), MP_ROM_INT(REASON_WDT_RST) },
-    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET), MP_ROM_INT(REASON_SOFT_RESTART) },
-};
-
-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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 8493814b41e55..fa9acce6c7351 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -1,6 +1,9 @@
 // Options to control how MicroPython is built for this port,
 // overriding defaults in py/mpconfig.h.
 
+// This needs to be defined before any ESP SDK headers are included.
+#define USE_US_TIMER 1
+
 // Board-specific definitions
 #include "mpconfigboard.h"
 
@@ -61,16 +64,17 @@
 #define MICROPY_PY_LWIP             (1)
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/esp8266/modmachine.c"
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/esp8266/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_READ (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM (1)
+#define MICROPY_PY_MACHINE_DHT_READINTO (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PWM      (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)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index bdf66926b60fb..542382b6fa87a 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -204,7 +204,6 @@ SRC_C += \
 	mbedtls/mbedtls_port.c \
 	mimxrt_flash.c \
 	mimxrt_sdram.c \
-	modmachine.c \
 	modmimxrt.c \
 	mphalport.c \
 	mpnetworkport.c \
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 57090bda270cb..ecd79d22309d6 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2023 Damien P. George
  * Copyright (c) 2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,10 +25,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "drivers/dht/dht.h"
-#include "extmod/modmachine.h"
-#include "shared/runtime/pyexec.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
+
 #include "led.h"
 #include "pin.h"
 #include "modmachine.h"
@@ -43,10 +42,43 @@
 #include "fsl_romapi.h"
 #endif
 
-#if MICROPY_PY_MACHINE
-
 #include CPU_HEADER_H
 
+#if defined(MICROPY_HW_LED1_PIN)
+#define MICROPY_PY_MACHINE_LED_ENTRY { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&machine_led_type) },
+#else
+#define MICROPY_PY_MACHINE_LED_ENTRY
+#endif
+
+#if MICROPY_PY_MACHINE_SDCARD
+#define MICROPY_PY_MACHINE_SDCARD_ENTRY { MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&machine_sdcard_type) },
+#else
+#define MICROPY_PY_MACHINE_SDCARD_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { 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_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
+    MICROPY_PY_MACHINE_LED_ENTRY \
+    { 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) }, \
+    MICROPY_PY_MACHINE_SDCARD_ENTRY \
+    \
+    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_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_bootloader),          MP_ROM_PTR(&machine_bootloader_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) }, \
+
 typedef enum {
     MP_PWRON_RESET = 1,
     MP_HARD_RESET,
@@ -62,12 +94,6 @@ STATIC mp_obj_t machine_unique_id(void) {
 }
 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;
@@ -168,70 +194,3 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
-
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_machine) },
-    { 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) },
-    { 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 defined(MICROPY_HW_LED1_PIN)
-    { 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) },
-    #if MICROPY_PY_MACHINE_ADC
-    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
-    #endif
-    { 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_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) },
-    { 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) },
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_WDT
-    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
-    #endif
-
-    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_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_bootloader),          MP_ROM_PTR(&machine_bootloader_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_dht_readinto),        MP_ROM_PTR(&dht_readinto_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);
-
-const mp_obj_module_t mp_module_machine = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&machine_module_globals,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 01502d547248f..f831dee364f8b 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -78,10 +78,12 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (trng_random_u32())
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/mimxrt/modmachine.c"
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/mimxrt/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
+#define MICROPY_PY_MACHINE_DHT_READINTO     (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/mimxrt/machine_pwm.c"
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index d0ecddd6157a3..0a57471849bb0 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -318,7 +318,6 @@ SRC_C += $(addprefix lib/tinyusb/src/,\
 endif
 
 DRIVERS_SRC_C += $(addprefix modules/,\
-	machine/modmachine.c \
 	machine/spi.c \
 	machine/i2c.c \
 	machine/pin.c \
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 0bacc24eea699..b5d078ae51db5 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2016 Glenn Ruben Bakke
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,14 +24,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
+
 #include <stdio.h>
 
 #include "modmachine.h"
 #include "py/gc.h"
-#include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/modmachine.h"
-#include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "gccollect.h"
@@ -49,8 +50,6 @@
 #include "rtcounter.h"
 #endif
 
-#if MICROPY_PY_MACHINE
-
 #define PYB_RESET_HARD      (0)
 #define PYB_RESET_WDT       (1)
 #define PYB_RESET_SOFT      (2)
@@ -60,6 +59,55 @@
 #define PYB_RESET_DIF       (18)
 #define PYB_RESET_NFC       (19)
 
+#if MICROPY_PY_MACHINE_RTCOUNTER
+#define MICROPY_PY_MACHINE_RTCOUNTER_ENTRY { MP_ROM_QSTR(MP_QSTR_RTCounter), MP_ROM_PTR(&machine_rtcounter_type) },
+#else
+#define MICROPY_PY_MACHINE_RTCOUNTER_ENTRY
+#endif
+
+#if MICROPY_PY_MACHINE_TIMER_NRF
+#define MICROPY_PY_MACHINE_TIMER_ENTRY { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) },
+#else
+#define MICROPY_PY_MACHINE_TIMER_ENTRY
+#endif
+
+#if MICROPY_PY_MACHINE_TEMP
+#define MICROPY_PY_MACHINE_TEMP_ENTRY { MP_ROM_QSTR(MP_QSTR_Temp), MP_ROM_PTR(&machine_temp_type) },
+#else
+#define MICROPY_PY_MACHINE_TEMP_ENTRY
+#endif
+
+#if defined(NRF52_SERIES)
+#define MICROPY_PY_MACHINE_NFC_RESET_ENTRY { MP_ROM_QSTR(MP_QSTR_NFC_RESET), MP_ROM_INT(PYB_RESET_NFC) },
+#else
+#define MICROPY_PY_MACHINE_NFC_RESET_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { 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_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_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_Pin),                MP_ROM_PTR(&pin_type) }, \
+    \
+    MICROPY_PY_MACHINE_RTCOUNTER_ENTRY \
+    MICROPY_PY_MACHINE_TIMER_ENTRY \
+    MICROPY_PY_MACHINE_TEMP_ENTRY \
+    { 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_SOFT_RESET),         MP_ROM_INT(PYB_RESET_SOFT) }, \
+    { MP_ROM_QSTR(MP_QSTR_LOCKUP_RESET),       MP_ROM_INT(PYB_RESET_LOCKUP) }, \
+    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),        MP_ROM_INT(PYB_RESET_POWER_ON) }, \
+    { MP_ROM_QSTR(MP_QSTR_LPCOMP_RESET),       MP_ROM_INT(PYB_RESET_LPCOMP) }, \
+    { MP_ROM_QSTR(MP_QSTR_DEBUG_IF_RESET),     MP_ROM_INT(PYB_RESET_DIF) }, \
+    MICROPY_PY_MACHINE_NFC_RESET_ENTRY \
+
 STATIC uint32_t reset_cause;
 
 void machine_init(void) {
@@ -141,12 +189,6 @@ STATIC mp_obj_t machine_reset(void) {
 }
 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);
-
 NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
     for (;;) {
@@ -197,69 +239,3 @@ STATIC mp_obj_t machine_disable_irq(void) {
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
-
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),           MP_ROM_QSTR(MP_QSTR_machine) },
-    { 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_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_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_uart_type) },
-#endif
-#if MICROPY_PY_MACHINE_SPI
-    { 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_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) },
-#endif
-#if MICROPY_PY_MACHINE_RTCOUNTER
-    { MP_ROM_QSTR(MP_QSTR_RTCounter),          MP_ROM_PTR(&machine_rtcounter_type) },
-#endif
-#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 || MICROPY_PY_MACHINE_SOFT_PWM
-    { 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) },
-#endif
-    { 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_SOFT_RESET),         MP_ROM_INT(PYB_RESET_SOFT) },
-    { MP_ROM_QSTR(MP_QSTR_LOCKUP_RESET),       MP_ROM_INT(PYB_RESET_LOCKUP) },
-    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),        MP_ROM_INT(PYB_RESET_POWER_ON) },
-    { MP_ROM_QSTR(MP_QSTR_LPCOMP_RESET),       MP_ROM_INT(PYB_RESET_LPCOMP) },
-    { MP_ROM_QSTR(MP_QSTR_DEBUG_IF_RESET),     MP_ROM_INT(PYB_RESET_DIF) },
-#if defined(NRF52_SERIES)
-    { MP_ROM_QSTR(MP_QSTR_NFC_RESET),          MP_ROM_INT(PYB_RESET_NFC) },
-#endif
-};
-
-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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index e18e55fb315ee..f3e71f675d04d 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -159,6 +159,7 @@
 #define MICROPY_PY_RANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/nrf/modules/machine/modmachine.c"
 #define MICROPY_PY_MACHINE_PULSE    (0)
 #define MICROPY_PY_MACHINE_SOFTI2C  (MICROPY_PY_MACHINE_I2C)
 
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 599caf026605e..9b5cfc4af0f41 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -78,7 +78,6 @@ LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 SRC_COMMON_C = \
 	startup.c \
 	uart.c \
-	modmachine.c \
 	shared/libc/string0.c \
 	shared/runtime/sys_stdio_mphal.c \
 
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 8a22fe2bd8185..1134ab4103c88 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2017 Damien P. George
+ * Copyright (c) 2017-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
@@ -24,28 +24,11 @@
  * THE SOFTWARE.
  */
 
-#include "extmod/modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
-#if MICROPY_PY_MACHINE
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) }, \
 
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
-
-    { 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_PinBase), MP_ROM_PTR(&machine_pinbase_type) },
-    { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
+// This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
+int pyexec_system_exit = 0;
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 4341fba58f366..36ce2db848b19 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -47,6 +47,7 @@
 #define MICROPY_PY_HEAPQ            (1)
 #define MICROPY_PY_HASHLIB          (1)
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/qemu-arm/modmachine.c"
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_USE_INTERNAL_PRINTF (1)
 #define MICROPY_VFS                 (1)
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 6d6eeb7dbf8c5..3512e4a94d16c 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -324,7 +324,6 @@ SRC_C += \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_sdcard.c \
-	modmachine.c \
 	extint.c \
 	usrsw.c \
 	flash.c \
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index c8edf61268e7d..4617f0af0cd8d 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2021,2022 Renesas Electronics Corporation
  * Copyright (c) 2023 Vekatech Ltd.
  *
@@ -26,21 +26,17 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
 #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/modmachine.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"
@@ -53,14 +49,44 @@
 #include "spi.h"
 #include "uart.h"
 
-#if MICROPY_PY_MACHINE
-
 #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)
 
+#if MICROPY_HW_HAS_SDHI_CARD
+#define MICROPY_PY_MACHINE_SDCARD_ENTRY { MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&machine_sdcard_type) },
+#else
+#define MICROPY_PY_MACHINE_SDCARD_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { 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_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) }, \
+    \
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) }, \
+    \
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
+    MICROPY_PY_MACHINE_SDCARD_ENTRY \
+    \
+    { 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) }, \
+
 STATIC uint32_t reset_cause;
 
 void get_unique_id(uint8_t *id) {
@@ -173,12 +199,6 @@ STATIC mp_obj_t machine_reset(void) {
 }
 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.
 NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_STORAGE
@@ -246,79 +266,3 @@ 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_machine) },
-    { 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(&machine_rtc_type) },
-    #if MICROPY_PY_MACHINE_ADC
-    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_DAC
-    { MP_ROM_QSTR(MP_QSTR_DAC),                 MP_ROM_PTR(&machine_dac_type) },
-    #endif
-    #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_spi_type) },
-    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
-    #if MICROPY_PY_MACHINE_PWM
-    #if MICROPY_HW_ENABLE_HW_PWM
-    { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
-    #endif
-    #endif
-    #if MICROPY_HW_HAS_SDHI_CARD
-    { MP_ROM_QSTR(MP_QSTR_SDCard),              MP_ROM_PTR(&machine_sdcard_type) },
-    #endif
-    { 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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 94e07b33913af..7fdb363883d1e 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -130,12 +130,11 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/renesas-ra/modmachine.c"
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/renesas-ra/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_READ (1)
-#ifndef MICROPY_PY_MACHINE_BITSTREAM
-#define MICROPY_PY_MACHINE_BITSTREAM (1)
-#endif
+#define MICROPY_PY_MACHINE_DHT_READINTO (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 0f8c6d8e88a98..dcf13287244c2 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -125,7 +125,6 @@ set(MICROPY_SOURCE_PORT
     machine_spi.c
     machine_timer.c
     main.c
-    modmachine.c
     modrp2.c
     mphalport.c
     mpnetworkport.c
@@ -153,7 +152,6 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_PORT_DIR}/machine_timer.c
     ${MICROPY_PORT_DIR}/machine_uart.c
     ${MICROPY_PORT_DIR}/machine_wdt.c
-    ${MICROPY_PORT_DIR}/modmachine.c
     ${MICROPY_PORT_DIR}/modrp2.c
     ${MICROPY_PORT_DIR}/modos.c
     ${MICROPY_PORT_DIR}/rp2_flash.c
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 4c428cbddf3ed..6ec2811f98f92 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2020-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
@@ -24,12 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "drivers/dht/dht.h"
-#include "shared/runtime/pyexec.h"
-#include "extmod/modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
+#include "py/mphal.h"
 #include "modmachine.h"
 #include "uart.h"
 #include "hardware/clocks.h"
@@ -46,11 +44,30 @@
 #include "lib/cyw43-driver/src/cyw43.h"
 #endif
 
-#if MICROPY_PY_MACHINE
-
 #define RP2_RESET_PWRON (1)
 #define RP2_RESET_WDT (3)
 
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { 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_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_Pin),                 MP_ROM_PTR(&machine_pin_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_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_obj_t machine_unique_id(void) {
     pico_unique_board_id_t id;
     pico_get_unique_board_id(&id);
@@ -58,12 +75,6 @@ STATIC mp_obj_t machine_unique_id(void) {
 }
 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 (;;) {
@@ -221,63 +232,3 @@ STATIC mp_obj_t machine_enable_irq(mp_obj_t state_in) {
     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_machine) },
-    { 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) },
-
-    #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_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) },
-    { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
-
-    #if MICROPY_PY_MACHINE_ADC
-    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
-    #endif
-    { 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) },
-    { 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) },
-    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_WDT
-    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
-    #endif
-
-    { 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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 61749f108aafc..f197d36cc4a72 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -111,10 +111,12 @@
 #define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modtime.c"
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/rp2/modmachine.c"
 #define MICROPY_PY_MACHINE_ADC                  (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE      "ports/rp2/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM            (1)
+#define MICROPY_PY_MACHINE_DHT_READINTO         (1)
 #define MICROPY_PY_MACHINE_PULSE                (1)
 #define MICROPY_PY_MACHINE_PWM                  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE      "ports/rp2/machine_pwm.c"
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 95d0f3bd18f48..f6409d17e8f7c 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -108,7 +108,6 @@ SRC_C += \
 	machine_rtc.c \
 	machine_spi.c \
 	main.c \
-	modmachine.c \
 	modsamd.c \
 	mphalport.c \
 	pendsv.c \
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 8c4808075e7a3..9b2e88ba60f73 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-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
@@ -24,10 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "extmod/modmachine.h"
-#include "drivers/dht/dht.h"
-#include "shared/runtime/pyexec.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
+
 #include "modmachine.h"
 #include "samd_soc.h"
 
@@ -37,7 +36,6 @@
 #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 *)(HMCRAMC0_ADDR + HMCRAMC0_SIZE - 4))
 #elif defined(MCU_SAMD51)
@@ -50,15 +48,41 @@
 
 #define LIGHTSLEEP_CPU_FREQ 200000
 
+#if MICROPY_PY_MACHINE_RTC
+#define MICROPY_PY_MACHINE_RTC_ENTRY { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
+#else
+#define MICROPY_PY_MACHINE_RTC_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { 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) }, \
+    { 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_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
+    MICROPY_PY_MACHINE_RTC_ENTRY \
+    \
+    { 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_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_deepsleep),           MP_ROM_PTR(&machine_lightsleep_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) }, \
+
 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
@@ -181,83 +205,3 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     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_machine) },
-    { 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) },
-    { 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) },
-
-    #if MICROPY_PY_MACHINE_ADC
-    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_DAC
-    { MP_ROM_QSTR(MP_QSTR_DAC),                 MP_ROM_PTR(&machine_dac_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) },
-    #if MICROPY_PY_MACHINE_PWM
-    { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_SOFTI2C
-    { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_SOFTSPI
-    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_SPI
-    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_WDT
-    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
-    #endif
-    #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) },
-    { 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) },
-    #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_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deepsleep),           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) },
-    #endif
-
-    // 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);
-
-const mp_obj_module_t mp_module_machine = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&machine_module_globals,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 3684457b48e06..bef705e50f116 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -93,6 +93,7 @@
 #define MICROPY_PY_TIME_TIME_TIME_NS        (1)
 #define MICROPY_PY_TIME_INCLUDEFILE         "ports/samd/modtime.c"
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/samd/modmachine.c"
 #define MICROPY_PY_OS                       (1)
 #define MICROPY_PY_OS_INCLUDEFILE           "ports/samd/modos.c"
 #define MICROPY_READER_VFS                  (1)
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 56b5a1020c5ec..0bae26f2f139d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -331,7 +331,6 @@ SRC_C += \
 	machine_bitstream.c \
 	machine_i2c.c \
 	machine_spi.c \
-	modmachine.c \
 	modpyb.c \
 	modstm.c \
 	network_lan.c \
@@ -677,7 +676,7 @@ $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_
 	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) \
 		--output-af-const $(GEN_PINS_AF_CONST) --output-af-defs $(GEN_PINS_AF_DEFS)
 
-modmachine.c: $(GEN_PLLFREQTABLE_HDR)
+powerctrl.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PLLVALUES) -c -m $(CMSIS_MCU_LOWER) file:$(BOARD_DIR)/stm32$(MCU_SERIES)xx_hal_conf.h > $@
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 67fcffb0f1349..fcdab9dfc1b29 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-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
@@ -24,16 +24,13 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
+#include <string.h>
 #include "modmachine.h"
 #include "py/gc.h"
-#include "py/runtime.h"
 #include "py/mperrno.h"
-#include "py/mphal.h"
-#include "drivers/dht/dht.h"
-#include "extmod/modmachine.h"
-#include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
@@ -50,7 +47,6 @@
 #include "rtc.h"
 #include "i2c.h"
 #include "spi.h"
-#include "uart.h"
 
 #if defined(STM32G0)
 // G0 has BOR and POR combined
@@ -93,6 +89,39 @@
 #define PYB_RESET_WDT       (3)
 #define PYB_RESET_DEEPSLEEP (4)
 
+#if MICROPY_HW_ENABLE_RNG
+#define MICROPY_PY_MACHINE_RNG_ENTRY { MP_ROM_QSTR(MP_QSTR_rng), MP_ROM_PTR(&pyb_rng_get_obj) },
+#else
+#define MICROPY_PY_MACHINE_RNG_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { 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_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
+    MICROPY_PY_MACHINE_RNG_ENTRY \
+    { 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) }, \
+    \
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&pin_type) }, \
+    \
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&pyb_rtc_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) }, \
+
 STATIC uint32_t reset_cause;
 
 void machine_init(void) {
@@ -269,12 +298,6 @@ STATIC mp_obj_t machine_reset(void) {
 }
 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.
 NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_USB
@@ -388,101 +411,3 @@ STATIC mp_obj_t machine_reset_cause(void) {
     return MP_OBJ_NEW_SMALL_INT(reset_cause);
 }
 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_machine) },
-    { 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) },
-    #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(&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) },
-    #if 0
-    { 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(&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_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) },
-    { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&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) },
-    #if MICROPY_PY_MACHINE_ADC
-    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_I2C
-    #if MICROPY_HW_ENABLE_HW_I2C
-    { 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_spi_type) },
-    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_I2S
-    { MP_ROM_QSTR(MP_QSTR_I2S),                 MP_ROM_PTR(&machine_i2s_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_WDT
-    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
-    #if 0
-    { MP_ROM_QSTR(MP_QSTR_HeartBeat),           MP_ROM_PTR(&pyb_heartbeat_type) },
-    { MP_ROM_QSTR(MP_QSTR_SD),                  MP_ROM_PTR(&pyb_sd_type) },
-
-    // class constants
-    { MP_ROM_QSTR(MP_QSTR_IDLE),                MP_ROM_INT(PYB_PWR_MODE_ACTIVE) },
-    { MP_ROM_QSTR(MP_QSTR_SLEEP),               MP_ROM_INT(PYB_PWR_MODE_LPDS) },
-    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP),           MP_ROM_INT(PYB_PWR_MODE_HIBERNATE) },
-    #endif
-    { 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) },
-    #if 0
-    { MP_ROM_QSTR(MP_QSTR_WLAN_WAKE),           MP_ROM_INT(PYB_SLP_WAKED_BY_WLAN) },
-    { MP_ROM_QSTR(MP_QSTR_PIN_WAKE),            MP_ROM_INT(PYB_SLP_WAKED_BY_GPIO) },
-    { MP_ROM_QSTR(MP_QSTR_RTC_WAKE),            MP_ROM_INT(PYB_SLP_WAKED_BY_RTC) },
-    #endif
-};
-
-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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index e5bcf4d701c1f..d9056ec339e8d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -110,11 +110,13 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/stm32/modmachine.c"
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/stm32/machine_adc.c"
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
 #define MICROPY_PY_MACHINE_BITSTREAM (1)
 #endif
+#define MICROPY_PY_MACHINE_DHT_READINTO (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_I2C      (MICROPY_HW_ENABLE_HW_I2C)
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 9f5e01a5ff9b7..d5bd6d4098add 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -200,7 +200,6 @@ SRC_C += \
 	unix_mphal.c \
 	mpthreadport.c \
 	input.c \
-	modmachine.c \
 	alloc.c \
 	fatfs_port.c \
 	mpbthciport.c \
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index d0c6a43bf86c1..91e3e61340e1c 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2015 Paul Sokolovsky
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,13 +25,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-
-#include "py/runtime.h"
-#include "py/obj.h"
-
-#include "extmod/modmachine.h"
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
 #if MICROPY_PLAT_DEV_MEM
 #include <errno.h>
@@ -41,7 +36,18 @@
 #define MICROPY_PAGE_MASK (MICROPY_PAGE_SIZE - 1)
 #endif
 
-#if MICROPY_PY_MACHINE
+#ifdef MICROPY_UNIX_MACHINE_IDLE
+#define MICROPY_PY_MACHINE_IDLE_ENTRY { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
+#else
+#define MICROPY_PY_MACHINE_IDLE_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    MICROPY_PY_MACHINE_IDLE_ENTRY \
+    { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) }, \
+
+// This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
+int pyexec_system_exit = 0;
 
 uintptr_t mod_machine_mem_get_addr(mp_obj_t addr_o, uint align) {
     uintptr_t addr = mp_obj_get_int_truncated(addr_o);
@@ -81,32 +87,3 @@ STATIC mp_obj_t machine_idle(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 #endif
-
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
-
-    { 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) },
-
-    #ifdef MICROPY_UNIX_MACHINE_IDLE
-    { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
-    #endif
-
-    { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) },
-    { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
-    #if MICROPY_PY_MACHINE_PULSE
-    { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
-    #endif
-};
-
-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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 2de05a0a6c866..dfb99d51b1161 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -134,6 +134,9 @@ typedef long mp_off_t;
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
+// Implementation of the machine module.
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/unix/modmachine.c"
+
 // 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
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 2215ce38d1e98..94bd3f99f9415 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -56,7 +56,6 @@ SRC_C = \
 	shared/runtime/gchelper_generic.c \
 	ports/unix/main.c \
 	ports/unix/input.c \
-	ports/unix/modmachine.c \
 	ports/unix/gccollect.c \
 	windows_mphal.c \
 	realpath.c \
diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index d5affd9e23ba4..9326f3f4cde18 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -94,7 +94,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\modmachine.c" />
     <ClCompile Include="$(PyVariantDir)*.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index de209423dd091..9dce520c28a9e 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -154,6 +154,7 @@
 #define MICROPY_PY_BINASCII_CRC32   (1)
 #define MICROPY_PY_RANDOM           (1)
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/unix/modmachine.c"
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_MACHINE_MEM_GET_READ_ADDR   mod_machine_mem_get_addr
 #define MICROPY_MACHINE_MEM_GET_WRITE_ADDR  mod_machine_mem_get_addr
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index 53c4fdddfd65f..f7c4c6bcac01b 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -14,6 +14,7 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modmachine.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modos.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modrandom.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 8834aae96f380..743907e623a25 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -41,7 +41,6 @@ set(MICROPY_SOURCE_PORT
     machine_spi.c
     machine_pin.c
     modbluetooth_zephyr.c
-    modmachine.c
     modsocket.c
     modzephyr.c
     modzsensor.c
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 24e004b40cb94..701420fadbe9e 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2016 Paul Sokolovsky
  * Copyright (c) 2016 Linaro Limited
  *
@@ -26,16 +26,25 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
+
 #include <stdio.h>
 #include <zephyr/sys/reboot.h>
 
-#include "py/obj.h"
-#include "py/runtime.h"
-#include "extmod/modmachine.h"
 #include "modmachine.h"
 
-#if MICROPY_PY_MACHINE
+#ifdef CONFIG_REBOOT
+#define MICROPY_PY_MACHINE_RESET_ENTRY { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) },
+#else
+#define MICROPY_PY_MACHINE_RESET_ENTRY
+#endif
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    MICROPY_PY_MACHINE_RESET_ENTRY \
+    { 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) }, \
+    { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) }, \
 
 STATIC mp_obj_t machine_reset(void) {
     sys_reboot(SYS_REBOOT_COLD);
@@ -55,38 +64,3 @@ STATIC mp_obj_t machine_idle(void) {
     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_machine) },
-    #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_i2c_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_SPI
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
-    #endif
-    #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_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) },
-
-    // reset causes
-    /*{ MP_ROM_QSTR(MP_QSTR_PWRON_RESET), MP_ROM_INT(REASON_DEFAULT_RST) },*/
-};
-
-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,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_machine, mp_module_machine);
-
-#endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 49d00f4ca6ba1..918f0fb15a00b 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -64,6 +64,7 @@
 #define MICROPY_PY_IO               (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_MACHINE          (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB (SPI_TRANSFER_MSB)

From 30a63a204dc6ad02c996d5c40c34b67c85c650e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Nov 2023 16:36:52 +1100
Subject: [PATCH 0602/3129] extmod/modmachine: Provide common Python bindings
 for machine.idle().

And use it in all ports.  The ports are unchanged, except esp8266 which now
just returns None from this function instead of the time elapsed (to match
other ports), and qemu-arm which gains this function.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.c                    | 13 +++++++++++++
 ports/cc3200/mods/modmachine.c         |  5 +----
 ports/esp32/modmachine.c               |  5 +----
 ports/esp8266/modmachine.c             |  7 +------
 ports/mimxrt/modmachine.c              |  5 +----
 ports/nrf/modules/machine/modmachine.c |  5 +----
 ports/qemu-arm/modmachine.c            |  4 ++++
 ports/renesas-ra/modmachine.c          |  5 +----
 ports/renesas-ra/modmachine.h          |  1 -
 ports/rp2/modmachine.c                 |  5 +----
 ports/samd/modmachine.c                |  5 +----
 ports/stm32/modmachine.c               |  5 +----
 ports/stm32/modmachine.h               |  1 -
 ports/stm32/modpyb.c                   |  8 +++++++-
 ports/unix/modmachine.c                | 17 +++++------------
 ports/zephyr/modmachine.c              |  5 +----
 16 files changed, 39 insertions(+), 57 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index e0bef3a73f13c..311d5dc037b9b 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -35,6 +35,10 @@
 #include "drivers/dht/dht.h"
 #endif
 
+// The port must provide implementations of these low-level machine functions.
+
+STATIC void mp_machine_idle(void);
+
 // The port can provide additional machine-module implementation in this file.
 #ifdef MICROPY_PY_MACHINE_INCLUDEFILE
 #include MICROPY_PY_MACHINE_INCLUDEFILE
@@ -46,6 +50,12 @@ STATIC mp_obj_t machine_soft_reset(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 
+STATIC mp_obj_t machine_idle(void) {
+    mp_machine_idle();
+    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_machine) },
 
@@ -57,6 +67,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     // Reset related functions.
     { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) },
 
+    // Power related functions.
+    { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
+
     // Functions for bit protocols.
     #if MICROPY_PY_MACHINE_BITSTREAM
     { MP_ROM_QSTR(MP_QSTR_bitstream), MP_ROM_PTR(&machine_bitstream_obj) },
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 8673c62865d40..1df11c9d2895f 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -62,7 +62,6 @@
     { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_main),                MP_ROM_PTR(&machine_main_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_rng),                 MP_ROM_PTR(&machine_rng_get_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) }, \
@@ -168,11 +167,9 @@ STATIC mp_obj_t machine_main(mp_obj_t main) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(machine_main_obj, machine_main);
 
-STATIC mp_obj_t machine_idle(void) {
+STATIC void mp_machine_idle(void) {
     __WFI();
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 
 STATIC mp_obj_t machine_lightsleep(void) {
     pyb_sleep_sleep();
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index a1bd9a5cb985a..1946d43db6afa 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -58,7 +58,6 @@
     { 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_idle), MP_ROM_PTR(&machine_idle_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_obj) }, \
     \
     { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) }, \
@@ -283,13 +282,11 @@ 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) {
+STATIC void mp_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);
 
 STATIC mp_obj_t machine_disable_irq(void) {
     uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index b15515acd7a89..cce6b01ce7319 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -45,7 +45,6 @@
     { 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_unique_id), MP_ROM_PTR(&machine_unique_id_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) }, \
@@ -102,14 +101,10 @@ 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) {
-    uint32_t t = mp_hal_ticks_cpu();
+STATIC void mp_machine_idle(void) {
     asm ("waiti 0");
-    t = mp_hal_ticks_cpu() - t;
     ets_event_poll(); // handle any events after possibly a long wait (eg feed WDT)
-    return MP_OBJ_NEW_SMALL_INT(t);
 }
-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) {
     uint32_t max_us = 0xffffffff;
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index ecd79d22309d6..b0c41fe1af970 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -67,7 +67,6 @@
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) }, \
     MICROPY_PY_MACHINE_SDCARD_ENTRY \
     \
-    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_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) }, \
@@ -127,11 +126,9 @@ 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) {
+STATIC void mp_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_deepsleep(size_t n_args, const mp_obj_t *args) {
     if (n_args != 0) {
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index b5d078ae51db5..3e3f185f6c3f2 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -89,7 +89,6 @@
     { 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_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) }, \
@@ -196,11 +195,9 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
 
-STATIC mp_obj_t machine_idle(void) {
+STATIC void mp_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_lightsleep(void) {
     __WFE();
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 1134ab4103c88..59694f92fcf68 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -32,3 +32,7 @@
 
 // This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
 int pyexec_system_exit = 0;
+
+STATIC void mp_machine_idle(void) {
+    // Do nothing.
+}
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 4617f0af0cd8d..e0b34666feb81 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -67,7 +67,6 @@
     { 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) }, \
-    { 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) }, \
@@ -236,11 +235,9 @@ 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) {
+STATIC void mp_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) {
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index 22d1fc475e797..b8f8b631f2ac2 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -47,7 +47,6 @@ 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);
 
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 6ec2811f98f92..65a5f75c58276 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -54,7 +54,6 @@
     { 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) }, \
     \
@@ -121,11 +120,9 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
 
-STATIC mp_obj_t machine_idle(void) {
+STATIC void mp_machine_idle(void) {
     __wfe();
-    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) {
     mp_int_t delay_ms = 0;
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 9b2e88ba60f73..60b09cb0a381d 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -64,7 +64,6 @@
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
     MICROPY_PY_MACHINE_RTC_ENTRY \
     \
-    { 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) }, \
@@ -122,11 +121,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) {
+STATIC void mp_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();
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index fcdab9dfc1b29..8378fb3feb91d 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -102,7 +102,6 @@
     { MP_ROM_QSTR(MP_QSTR_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
     MICROPY_PY_MACHINE_RNG_ENTRY \
-    { 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) }, \
@@ -381,11 +380,9 @@ 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) {
+STATIC void mp_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) {
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 096666eb5aad0..a234325fd7116 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -39,7 +39,6 @@ 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_reset_cause_obj);
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 0bf2d6a2c3e94..165c982f5daf7 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -65,6 +65,12 @@ STATIC mp_obj_t pyb_fault_debug(mp_obj_t value) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_fault_debug_obj, pyb_fault_debug);
 
+STATIC mp_obj_t pyb_idle(void) {
+    __WFI();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_idle_obj, pyb_idle);
+
 #if MICROPY_PY_PYB_LEGACY
 
 // Returns the number of milliseconds which have elapsed since `start`.
@@ -144,7 +150,7 @@ 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(&machine_idle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wfi), MP_ROM_PTR(&pyb_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
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 91e3e61340e1c..9eacd5539fa4c 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -36,14 +36,7 @@
 #define MICROPY_PAGE_MASK (MICROPY_PAGE_SIZE - 1)
 #endif
 
-#ifdef MICROPY_UNIX_MACHINE_IDLE
-#define MICROPY_PY_MACHINE_IDLE_ENTRY { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
-#else
-#define MICROPY_PY_MACHINE_IDLE_ENTRY
-#endif
-
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    MICROPY_PY_MACHINE_IDLE_ENTRY \
     { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) }, \
 
 // This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
@@ -80,10 +73,10 @@ uintptr_t mod_machine_mem_get_addr(mp_obj_t addr_o, uint align) {
     return addr;
 }
 
-#ifdef MICROPY_UNIX_MACHINE_IDLE
-STATIC mp_obj_t machine_idle(void) {
+STATIC void mp_machine_idle(void) {
+    #ifdef MICROPY_UNIX_MACHINE_IDLE
     MICROPY_UNIX_MACHINE_IDLE
-    return mp_const_none;
+    #else
+    // Do nothing.
+    #endif
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
-#endif
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 701420fadbe9e..16109a3af83ca 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -43,7 +43,6 @@
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     MICROPY_PY_MACHINE_RESET_ENTRY \
     { 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) }, \
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) }, \
 
 STATIC mp_obj_t machine_reset(void) {
@@ -59,8 +58,6 @@ 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) {
+STATIC void mp_machine_idle(void) {
     k_yield();
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);

From e68aa40d2a6fa37fc551006f9c6f8928a75220a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Nov 2023 09:35:42 +1100
Subject: [PATCH 0603/3129] extmod/modmachine: Add MICROPY_PY_MACHINE_PIN_BASE
 option.

And use it in qemu-arm, unix and windows ports to enable PinBase.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_pinbase.c                     | 8 ++++----
 extmod/modmachine.c                          | 5 ++++-
 ports/qemu-arm/modmachine.c                  | 3 ---
 ports/qemu-arm/mpconfigport.h                | 1 +
 ports/unix/modmachine.c                      | 3 ---
 ports/unix/variants/mpconfigvariant_common.h | 1 +
 ports/windows/mpconfigport.h                 | 1 +
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extmod/machine_pinbase.c b/extmod/machine_pinbase.c
index 90c17d7ab6eb2..981dadf0f5e73 100644
--- a/extmod/machine_pinbase.c
+++ b/extmod/machine_pinbase.c
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpconfig.h"
-#if MICROPY_PY_MACHINE
-
 #include "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_PIN_BASE
+
 #include "extmod/modmachine.h"
 #include "extmod/virtpin.h"
 
@@ -84,4 +84,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     protocol, &pinbase_pin_p
     );
 
-#endif // MICROPY_PY_MACHINE
+#endif // MICROPY_PY_MACHINE_PIN_BASE
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 311d5dc037b9b..e3baea521031b 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -81,7 +81,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
     #endif
 
-    // Class for Signal.
+    // Classes for PinBase and Signal.
+    #if MICROPY_PY_MACHINE_PIN_BASE
+    { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
 
     // Classes for software bus protocols.
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 59694f92fcf68..72eaad6eab392 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -27,9 +27,6 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
-#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) }, \
-
 // This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
 int pyexec_system_exit = 0;
 
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 36ce2db848b19..3efa1412df1ae 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -48,6 +48,7 @@
 #define MICROPY_PY_HASHLIB          (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/qemu-arm/modmachine.c"
+#define MICROPY_PY_MACHINE_PIN_BASE (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_USE_INTERNAL_PRINTF (1)
 #define MICROPY_VFS                 (1)
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 9eacd5539fa4c..40d08d9111422 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -36,9 +36,6 @@
 #define MICROPY_PAGE_MASK (MICROPY_PAGE_SIZE - 1)
 #endif
 
-#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) }, \
-
 // This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
 int pyexec_system_exit = 0;
 
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 082938ed5f4f3..981babca9f10b 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -116,3 +116,4 @@
 // Enable the "machine" module, mostly for machine.mem*.
 #define MICROPY_PY_MACHINE             (1)
 #define MICROPY_PY_MACHINE_PULSE       (1)
+#define MICROPY_PY_MACHINE_PIN_BASE    (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 9dce520c28a9e..2e1521b9c7ef9 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -156,6 +156,7 @@
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/unix/modmachine.c"
 #define MICROPY_PY_MACHINE_PULSE    (1)
+#define MICROPY_PY_MACHINE_PIN_BASE (1)
 #define MICROPY_MACHINE_MEM_GET_READ_ADDR   mod_machine_mem_get_addr
 #define MICROPY_MACHINE_MEM_GET_WRITE_ADDR  mod_machine_mem_get_addr
 

From 48b5a7b06079f0d0aa4780016f015ff023875680 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Nov 2023 18:24:40 +1100
Subject: [PATCH 0604/3129] extmod/modmachine: Provide common Python bindings
 for bootloader().

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.c                    | 14 ++++++++++++++
 extmod/modmachine.h                    |  2 ++
 ports/esp32/modmachine.c               |  4 +---
 ports/esp32/modmachine.h               |  1 -
 ports/esp32/mpconfigport.h             |  1 +
 ports/mimxrt/modmachine.c              |  4 +---
 ports/mimxrt/mpconfigport.h            |  1 +
 ports/nrf/modules/machine/modmachine.c |  4 +---
 ports/nrf/modules/machine/modmachine.h |  1 -
 ports/renesas-ra/modmachine.c          |  4 +---
 ports/renesas-ra/modmachine.h          |  1 -
 ports/renesas-ra/mpconfigport.h        |  1 +
 ports/rp2/modmachine.c                 |  4 +---
 ports/rp2/modmachine.h                 |  1 -
 ports/rp2/mpconfigport.h               |  1 +
 ports/samd/modmachine.c                |  4 +---
 ports/samd/modmachine.h                |  2 --
 ports/samd/mpconfigport.h              |  1 +
 ports/stm32/modmachine.c               |  4 +---
 ports/stm32/modmachine.h               |  2 --
 ports/stm32/mpconfigport.h             |  1 +
 shared/tinyusb/mp_cdc_common.c         |  2 +-
 22 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index e3baea521031b..789d324d661fe 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -39,6 +39,10 @@
 
 STATIC void mp_machine_idle(void);
 
+#if MICROPY_PY_MACHINE_BOOTLOADER
+NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args);
+#endif
+
 // The port can provide additional machine-module implementation in this file.
 #ifdef MICROPY_PY_MACHINE_INCLUDEFILE
 #include MICROPY_PY_MACHINE_INCLUDEFILE
@@ -50,6 +54,13 @@ STATIC mp_obj_t machine_soft_reset(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 
+#if MICROPY_PY_MACHINE_BOOTLOADER
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+    mp_machine_bootloader(n_args, args);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
+#endif
+
 STATIC mp_obj_t machine_idle(void) {
     mp_machine_idle();
     return mp_const_none;
@@ -66,6 +77,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 
     // Reset related functions.
     { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) },
+    #if MICROPY_PY_MACHINE_BOOTLOADER
+    { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_obj) },
+    #endif
 
     // Power related functions.
     { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 488aef4afda19..b0253bbb8c998 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -237,9 +237,11 @@ uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
 uintptr_t MICROPY_MACHINE_MEM_GET_WRITE_ADDR(mp_obj_t addr_o, uint align);
 #endif
 
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len);
 mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
 
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bitstream_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
 
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 1946d43db6afa..18bc0965a2ce0 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -58,7 +58,6 @@
     { 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_bootloader), MP_ROM_PTR(&machine_bootloader_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) }, \
@@ -248,12 +247,11 @@ 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);
 
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN void mp_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);
 
 void machine_init(void) {
     is_soft_reset = 0;
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 06a1d7b0e2b61..9a5e6a566eb83 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -21,6 +21,5 @@ void machine_pwm_deinit_all(void);
 // TODO: void machine_rmt_deinit_all(void);
 void machine_timer_deinit_all(void);
 void machine_i2s_init0();
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 
 #endif // MICROPY_INCLUDED_ESP32_MODMACHINE_H
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 8a21cabb7d478..ef55d9ae358ee 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -97,6 +97,7 @@
 #define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/esp32/modmachine.c"
+#define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH  (1)
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index b0c41fe1af970..8bcf10122c625 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -71,7 +71,6 @@
     \
     { 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_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) }, \
     \
     /* Reset reasons */ \
     { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(MP_PWRON_RESET) }, \
@@ -174,7 +173,7 @@ 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);
 
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if defined(MICROPY_BOARD_ENTER_BOOTLOADER)
     // If a board has a custom bootloader, call it first.
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
@@ -190,4 +189,3 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
         ;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index f831dee364f8b..ad35bfe8c5907 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -79,6 +79,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (trng_random_u32())
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/mimxrt/modmachine.c"
+#define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/mimxrt/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 3e3f185f6c3f2..54e45b4d0ffad 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -86,7 +86,6 @@
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { 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_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) }, \
@@ -188,12 +187,11 @@ STATIC mp_obj_t machine_reset(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN void mp_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 void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
diff --git a/ports/nrf/modules/machine/modmachine.h b/ports/nrf/modules/machine/modmachine.h
index 45847d407f05f..5aab2a60292c5 100644
--- a/ports/nrf/modules/machine/modmachine.h
+++ b/ports/nrf/modules/machine/modmachine.h
@@ -36,6 +36,5 @@ 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/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index e0b34666feb81..b4479e1260ca3 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -65,7 +65,6 @@
     { 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_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_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) }, \
@@ -199,7 +198,7 @@ STATIC mp_obj_t machine_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 // Activate the bootloader without BOOT* pins.
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_STORAGE
     storage_flush();
     #endif
@@ -217,7 +216,6 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
         ;
     }
 }
-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) {
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index b8f8b631f2ac2..d9e6961063965 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -39,7 +39,6 @@ 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);
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 7fdb363883d1e..66655a89760e2 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -131,6 +131,7 @@
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/renesas-ra/modmachine.c"
+#define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/renesas-ra/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_READ (1)
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 65a5f75c58276..8cd9dd462e27c 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -51,7 +51,6 @@
     { 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_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_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) }, \
@@ -94,14 +93,13 @@ STATIC mp_obj_t machine_reset_cause(void) {
 }
 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) {
+NORETURN void mp_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 (;;) {
     }
 }
-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 6ef7222791df2..3d0c726cd917e 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -9,6 +9,5 @@ void machine_i2s_init0(void);
 void machine_pwm_deinit_all(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 f197d36cc4a72..8e9d29cf76dc9 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -112,6 +112,7 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/rp2/modmachine.c"
+#define MICROPY_PY_MACHINE_BOOTLOADER           (1)
 #define MICROPY_PY_MACHINE_ADC                  (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE      "ports/rp2/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 60b09cb0a381d..3271e160e1a0b 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -56,7 +56,6 @@
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { 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) }, \
     { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) }, \
     \
@@ -92,14 +91,13 @@ STATIC mp_obj_t machine_reset(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN void mp_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();
 }
-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 5baaf5f7e145c..e1279a2886d0c 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -33,8 +33,6 @@
 extern const mp_obj_type_t machine_dac_type;
 #endif
 
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
-
 void rtc_gettime(timeutils_struct_time_t *tm);
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index bef705e50f116..90d014e81170e 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -94,6 +94,7 @@
 #define MICROPY_PY_TIME_INCLUDEFILE         "ports/samd/modtime.c"
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/samd/modmachine.c"
+#define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_OS                       (1)
 #define MICROPY_PY_OS_INCLUDEFILE           "ports/samd/modos.c"
 #define MICROPY_READER_VFS                  (1)
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 8378fb3feb91d..781ceea7d3387 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -99,7 +99,6 @@
     { 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_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
     MICROPY_PY_MACHINE_RNG_ENTRY \
     { MP_ROM_QSTR(MP_QSTR_sleep),               MP_ROM_PTR(&machine_lightsleep_obj) }, \
@@ -298,7 +297,7 @@ STATIC mp_obj_t machine_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 // Activate the bootloader without BOOT* pins.
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_USB
     pyb_usb_dev_deinit();
     #endif
@@ -322,7 +321,6 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
         ;
     }
 }
-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) {
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index a234325fd7116..8c9e1241b1a08 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -31,12 +31,10 @@
 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);
 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_VAR_BETWEEN(machine_lightsleep_obj);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index d9056ec339e8d..db48c8c3b6cd2 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -111,6 +111,7 @@
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/stm32/modmachine.c"
+#define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/stm32/machine_adc.c"
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
diff --git a/shared/tinyusb/mp_cdc_common.c b/shared/tinyusb/mp_cdc_common.c
index 4ccae4bac125e..8278685262fa1 100644
--- a/shared/tinyusb/mp_cdc_common.c
+++ b/shared/tinyusb/mp_cdc_common.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "modmachine.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_HW_USB_CDC_1200BPS_TOUCH && MICROPY_HW_ENABLE_USBDEV
 

From e1ec6af654b1c5c4a973b6c6b029ee68bb92eb89 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Nov 2023 18:25:30 +1100
Subject: [PATCH 0605/3129] extmod/modmachine: Provide common bindings for 6
 bare-metal functions.

Minor changes for consistency are:
- nrf gains: unique_id(), freq() [they do nothing]
- samd: deepsleep() now resets after calling lightsleep()
- esp32: lightsleep()/deepsleep() no longer take kw arg "sleep", instead
  it's positional to match others.  also, passing 0 here will now do a 0ms
  sleep instead of acting like nothing was passed.
  reset_cause() no longer takes any args (before it would just ignore them)
- mimxrt: freq() with an argument and lightsleep() both raise
  NotImplementedError

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.c                    |  64 ++++++++++++
 extmod/modmachine.h                    |   6 ++
 ports/cc3200/mods/modmachine.c         |  41 +++-----
 ports/cc3200/mpconfigport.h            |   1 +
 ports/esp32/modmachine.c               | 135 ++++++++++---------------
 ports/esp32/mpconfigport.h             |   1 +
 ports/esp8266/modmachine.c             |  54 ++++------
 ports/esp8266/mpconfigport.h           |   1 +
 ports/mimxrt/modmachine.c              |  39 ++++---
 ports/mimxrt/mpconfigport.h            |   1 +
 ports/nrf/modules/machine/modmachine.c |  37 +++----
 ports/nrf/modules/machine/modmachine.h |   5 -
 ports/nrf/mpconfigport.h               |   1 +
 ports/renesas-ra/modmachine.c          |  42 +++-----
 ports/renesas-ra/modmachine.h          |  12 ---
 ports/renesas-ra/mpconfigport.h        |   1 +
 ports/renesas-ra/powerctrl.c           |   4 +-
 ports/renesas-ra/powerctrl.h           |   2 +-
 ports/rp2/modmachine.c                 |  62 ++++--------
 ports/rp2/mpconfigport.h               |   1 +
 ports/samd/modmachine.c                |  50 ++++-----
 ports/samd/mpconfigport.h              |   1 +
 ports/stm32/modmachine.c               | 114 +++++++++------------
 ports/stm32/modmachine.h               |   7 --
 ports/stm32/mpconfigport.h             |   1 +
 ports/stm32/powerctrl.c                |   6 +-
 ports/stm32/powerctrl.h                |   2 +-
 ports/zephyr/modmachine.c              |   4 +-
 ports/zephyr/modmachine.h              |   2 -
 29 files changed, 316 insertions(+), 381 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 789d324d661fe..d56b938bb37b7 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -43,6 +43,16 @@ STATIC void mp_machine_idle(void);
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args);
 #endif
 
+#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+STATIC mp_obj_t mp_machine_unique_id(void);
+NORETURN STATIC void mp_machine_reset(void);
+STATIC mp_int_t mp_machine_reset_cause(void);
+STATIC mp_obj_t mp_machine_get_freq(void);
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args);
+STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args);
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
+#endif
+
 // The port can provide additional machine-module implementation in this file.
 #ifdef MICROPY_PY_MACHINE_INCLUDEFILE
 #include MICROPY_PY_MACHINE_INCLUDEFILE
@@ -67,6 +77,46 @@ STATIC mp_obj_t machine_idle(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 
+#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+
+STATIC mp_obj_t machine_unique_id(void) {
+    return mp_machine_unique_id();
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
+
+NORETURN STATIC mp_obj_t machine_reset(void) {
+    mp_machine_reset();
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
+
+STATIC mp_obj_t machine_reset_cause(void) {
+    return MP_OBJ_NEW_SMALL_INT(mp_machine_reset_cause());
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
+
+STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        return mp_machine_get_freq();
+    } else {
+        mp_machine_set_freq(n_args, args);
+        return mp_const_none;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
+
+STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    mp_machine_lightsleep(n_args, args);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lightsleep);
+
+NORETURN STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    mp_machine_deepsleep(n_args, args);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsleep);
+
+#endif
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
 
@@ -75,14 +125,28 @@ 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) },
 
+    // Miscellaneous functions.
+    #if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+    { MP_ROM_QSTR(MP_QSTR_unique_id), MP_ROM_PTR(&machine_unique_id_obj) },
+    #endif
+
     // Reset related functions.
     { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) },
     #if MICROPY_PY_MACHINE_BOOTLOADER
     { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_obj) },
     #endif
+    #if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+    { 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) },
+    #endif
 
     // Power related functions.
     { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
+    #if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_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) },
+    #endif
 
     // Functions for bit protocols.
     #if MICROPY_PY_MACHINE_BITSTREAM
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index b0253bbb8c998..d186ce661510c 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -241,6 +241,12 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len);
 mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
 
+MP_DECLARE_CONST_FUN_OBJ_0(machine_unique_id_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(machine_reset_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(machine_reset_cause_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_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_VAR_BETWEEN(machine_bootloader_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bitstream_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 1df11c9d2895f..5eb7e2ef155fa 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -56,16 +56,10 @@
 #endif
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) }, \
     MICROPY_PY_MACHINE_INFO_ENTRY \
-    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
-    { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_main),                MP_ROM_PTR(&machine_main_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_rng),                 MP_ROM_PTR(&machine_rng_get_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_wake_reason),         MP_ROM_PTR(&machine_wake_reason_obj) }, \
     \
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) }, \
@@ -99,24 +93,20 @@ extern OsiTaskHandle    svTaskHandle;
 extern OsiTaskHandle    xSimpleLinkSpawnTaskHndl;
 #endif
 
-
-/// \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;
 
-STATIC mp_obj_t machine_reset(void) {
+NORETURN STATIC void mp_machine_reset(void) {
     // disable wlan
     wlan_stop(SL_STOP_TIMEOUT_LONG);
     // reset the cpu and it's peripherals
     MAP_PRCMMCUReset(true);
-    return mp_const_none;
+    for (;;) {
+    }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 #ifdef DEBUG
 STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
@@ -145,17 +135,19 @@ STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
 #endif
 
-STATIC mp_obj_t machine_freq(void) {
+STATIC mp_obj_t mp_machine_get_freq(void) {
     return mp_obj_new_int(HAL_FCPU_HZ);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
 
-STATIC mp_obj_t machine_unique_id(void) {
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+STATIC mp_obj_t mp_machine_unique_id(void) {
     uint8_t mac[SL_BSSID_LENGTH];
     wlan_get_mac (mac);
     return mp_obj_new_bytes(mac, SL_BSSID_LENGTH);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
 STATIC mp_obj_t machine_main(mp_obj_t main) {
     if (mp_obj_is_str(main)) {
@@ -171,22 +163,19 @@ STATIC void mp_machine_idle(void) {
     __WFI();
 }
 
-STATIC mp_obj_t machine_lightsleep(void) {
+STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     pyb_sleep_sleep();
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_lightsleep_obj, machine_lightsleep);
 
-STATIC mp_obj_t machine_deepsleep (void) {
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     pyb_sleep_deepsleep();
-    return mp_const_none;
+    for (;;) {
+    }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_deepsleep_obj, machine_deepsleep);
 
-STATIC mp_obj_t machine_reset_cause (void) {
-    return mp_obj_new_int(pyb_sleep_get_reset_cause());
+STATIC mp_int_t mp_machine_reset_cause(void) {
+    return pyb_sleep_get_reset_cause();
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
 STATIC mp_obj_t machine_wake_reason (void) {
     return mp_obj_new_int(pyb_sleep_get_wake_reason());
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index f2dff028fc3fb..7c527324596f8 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -122,6 +122,7 @@
 #define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
 #define MICROPY_PY_MACHINE                          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE              "ports/cc3200/mods/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS         (1)
 #define MICROPY_PY_MACHINE_WDT                      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE          "ports/cc3200/mods/machine_wdt.c"
 
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 18bc0965a2ce0..0170655ba3214 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -52,12 +52,7 @@
 #endif
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_obj) }, \
-    { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) }, \
-    { MP_ROM_QSTR(MP_QSTR_unique_id), MP_ROM_PTR(&machine_unique_id_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_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&machine_enable_irq_obj) }, \
@@ -73,7 +68,6 @@
     { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP), MP_ROM_INT(MACHINE_WAKE_DEEPSLEEP) }, \
     \
     /* Reset reasons */ \
-    { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_HARD_RESET), MP_ROM_INT(MP_HARD_RESET) }, \
     { 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) }, \
@@ -103,65 +97,51 @@ STATIC bool is_soft_reset = 0;
 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
-        return mp_obj_new_int(esp_rom_get_cpu_ticks_per_us() * 1000000);
-    } else {
-        // set
-        mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
-        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;
-        #elif CONFIG_IDF_TARGET_ESP32C3
-        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;
+STATIC mp_obj_t mp_machine_get_freq(void) {
+    return mp_obj_new_int(esp_rom_get_cpu_ticks_per_us() * 1000000);
+}
+
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
+    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
-        pm.max_freq_mhz = freq;
-        pm.min_freq_mhz = freq;
-        pm.light_sleep_enable = false;
-        esp_err_t ret = esp_pm_configure(&pm);
-        if (ret != ESP_OK) {
-            mp_raise_ValueError(NULL);
-        }
-        while (esp_rom_get_cpu_ticks_per_us() != freq) {
-            vTaskDelay(1);
-        }
-        return mp_const_none;
+    }
+    #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;
+    #elif CONFIG_IDF_TARGET_ESP32S3
+    esp_pm_config_esp32s3_t pm;
+    #endif
+    pm.max_freq_mhz = freq;
+    pm.min_freq_mhz = freq;
+    pm.light_sleep_enable = false;
+    esp_err_t ret = esp_pm_configure(&pm);
+    if (ret != ESP_OK) {
+        mp_raise_ValueError(NULL);
+    }
+    while (esp_rom_get_cpu_ticks_per_us() != freq) {
+        vTaskDelay(1);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
-
-STATIC mp_obj_t machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-
-    enum {ARG_sleep_ms};
-    const mp_arg_t allowed_args[] = {
-        { MP_QSTR_sleep_ms, 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_int_t expiry = args[ARG_sleep_ms].u_int;
 
+STATIC void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_obj_t *args) {
     // First, disable any previously set wake-up source
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
 
-    if (expiry != 0) {
+    // Set the expiry time of the sleep, if given.
+    if (n_args != 0) {
+        mp_int_t expiry = mp_obj_get_int(args[0]);
         esp_sleep_enable_timer_wakeup(((uint64_t)expiry) * 1000);
     }
 
@@ -199,53 +179,45 @@ STATIC mp_obj_t machine_sleep_helper(wake_type_t wake_type, size_t n_args, const
             esp_deep_sleep_start();
             break;
     }
-    return mp_const_none;
 }
 
-STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    return machine_sleep_helper(MACHINE_WAKE_SLEEP, n_args, pos_args, kw_args);
+STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    machine_sleep_helper(MACHINE_WAKE_SLEEP, n_args, args);
 };
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_lightsleep_obj, 0, machine_lightsleep);
 
-STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    return machine_sleep_helper(MACHINE_WAKE_DEEPSLEEP, n_args, pos_args, kw_args);
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    machine_sleep_helper(MACHINE_WAKE_DEEPSLEEP, n_args, args);
+    mp_machine_reset();
 };
-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) {
+STATIC mp_int_t mp_machine_reset_cause(void) {
     if (is_soft_reset) {
-        return MP_OBJ_NEW_SMALL_INT(MP_SOFT_RESET);
+        return MP_SOFT_RESET;
     }
     switch (esp_reset_reason()) {
         case ESP_RST_POWERON:
         case ESP_RST_BROWNOUT:
-            return MP_OBJ_NEW_SMALL_INT(MP_PWRON_RESET);
-            break;
+            return MP_PWRON_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;
+            return MP_WDT_RESET;
 
         case ESP_RST_DEEPSLEEP:
-            return MP_OBJ_NEW_SMALL_INT(MP_DEEPSLEEP_RESET);
-            break;
+            return MP_DEEPSLEEP_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;
+            return MP_HARD_RESET;
 
         case ESP_RST_SDIO:
         case ESP_RST_UNKNOWN:
         default:
-            return MP_OBJ_NEW_SMALL_INT(0);
-            break;
+            return 0;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_reset_cause_obj, 0,  machine_reset_cause);
 
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
@@ -267,18 +239,15 @@ STATIC mp_obj_t machine_wake_reason(size_t n_args, const mp_obj_t *pos_args, mp_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_wake_reason_obj, 0,  machine_wake_reason);
 
-STATIC mp_obj_t machine_reset(void) {
+NORETURN STATIC void mp_machine_reset(void) {
     esp_restart();
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-STATIC mp_obj_t machine_unique_id(void) {
+STATIC mp_obj_t mp_machine_unique_id(void) {
     uint8_t chipid[6];
     esp_efuse_mac_get_default(chipid);
     return mp_obj_new_bytes(chipid, 6);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
 STATIC void mp_machine_idle(void) {
     MP_THREAD_GIL_EXIT();
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index ef55d9ae358ee..083f1d11cff16 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -97,6 +97,7 @@
 #define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/esp32/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index cce6b01ce7319..d55a656ce0f6a 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -41,13 +41,7 @@
 #define MACHINE_WAKE_DEEPSLEEP (0x04)
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_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_unique_id), MP_ROM_PTR(&machine_unique_id_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_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&machine_enable_irq_obj) }, \
@@ -68,45 +62,42 @@
     { MP_ROM_QSTR(MP_QSTR_WDT_RESET), MP_ROM_INT(REASON_WDT_RST) }, \
     { MP_ROM_QSTR(MP_QSTR_SOFT_RESET), MP_ROM_INT(REASON_SOFT_RESTART) }, \
 
-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(system_get_cpu_freq() * 1000000);
-    } else {
-        // set
-        mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
-        if (freq != 80 && freq != 160) {
-            mp_raise_ValueError(MP_ERROR_TEXT("frequency can only be either 80Mhz or 160MHz"));
-        }
-        system_update_cpu_freq(freq);
-        return mp_const_none;
+STATIC mp_obj_t mp_machine_get_freq(void) {
+    return mp_obj_new_int(system_get_cpu_freq() * 1000000);
+}
+
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
+    if (freq != 80 && freq != 160) {
+        mp_raise_ValueError(MP_ERROR_TEXT("frequency can only be either 80Mhz or 160MHz"));
     }
+    system_update_cpu_freq(freq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
 
-STATIC mp_obj_t machine_reset(void) {
+NORETURN STATIC void mp_machine_reset(void) {
     system_restart();
-    return mp_const_none;
+
+    // we must not return
+    for (;;) {
+        ets_loop_iter();
+    }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-STATIC mp_obj_t machine_reset_cause(void) {
-    return MP_OBJ_NEW_SMALL_INT(system_get_rst_info()->reason);
+STATIC mp_int_t mp_machine_reset_cause(void) {
+    return system_get_rst_info()->reason;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
-STATIC mp_obj_t machine_unique_id(void) {
+STATIC mp_obj_t mp_machine_unique_id(void) {
     uint32_t id = system_get_chip_id();
     return mp_obj_new_bytes((byte *)&id, sizeof(id));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
 STATIC void mp_machine_idle(void) {
     asm ("waiti 0");
     ets_event_poll(); // handle any events after possibly a long wait (eg feed WDT)
 }
 
-STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     uint32_t max_us = 0xffffffff;
     if (n_args == 1) {
         mp_int_t max_ms = mp_obj_get_int(args[0]);
@@ -124,11 +115,9 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
             asm ("waiti 0");
         }
     }
-    return mp_const_none;
 }
-STATIC 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) {
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     // default to sleep forever
     uint32_t sleep_us = 0;
 
@@ -171,10 +160,7 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
         // we must not return
         ets_loop_iter();
     }
-
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsleep);
 
 // These values are from the datasheet
 #define ESP_TIMER_US_MIN (100)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index fa9acce6c7351..1925fc3e72402 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -65,6 +65,7 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/esp8266/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/esp8266/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_READ (1)
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 8bcf10122c625..b299112d952d1 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -57,18 +57,12 @@
 #endif
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { 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_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) }, \
-    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
     MICROPY_PY_MACHINE_LED_ENTRY \
     { 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) }, \
     MICROPY_PY_MACHINE_SDCARD_ENTRY \
     \
-    { 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) }, \
     \
@@ -85,27 +79,27 @@ typedef enum {
     MP_SOFT_RESET
 } reset_reason_t;
 
-STATIC mp_obj_t machine_unique_id(void) {
+STATIC mp_obj_t mp_machine_unique_id(void) {
     unsigned char id[8];
     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);
 
-STATIC mp_obj_t machine_reset(void) {
+NORETURN STATIC void mp_machine_reset(void) {
     WDOG_TriggerSystemSoftwareReset(WDOG1);
-    return mp_const_none;
+    while (true) {
+        ;
+    }
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-STATIC mp_obj_t machine_reset_cause(void) {
+STATIC mp_int_t mp_machine_reset_cause(void) {
     #ifdef MIMXRT117x_SERIES
     uint32_t user_reset_flag = kSRC_M7CoreIppUserResetFlag;
     #else
     uint32_t user_reset_flag = kSRC_IppUserResetFlag;
     #endif
     if (SRC->SRSR & user_reset_flag) {
-        return MP_OBJ_NEW_SMALL_INT(MP_DEEPSLEEP_RESET);
+        return MP_DEEPSLEEP_RESET;
     }
     uint16_t reset_cause =
         WDOG_GetStatusFlags(WDOG1) & (kWDOG_PowerOnResetFlag | kWDOG_TimeoutResetFlag | kWDOG_SoftwareResetFlag);
@@ -116,20 +110,26 @@ STATIC mp_obj_t machine_reset_cause(void) {
     } else {
         reset_cause = MP_SOFT_RESET;
     }
-    return MP_OBJ_NEW_SMALL_INT(reset_cause);
+    return reset_cause;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
-STATIC mp_obj_t machine_freq(void) {
+STATIC mp_obj_t mp_machine_get_freq(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq());
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
+
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    mp_raise_NotImplementedError(NULL);
+}
 
 STATIC void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
 }
 
-STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     if (n_args != 0) {
         mp_int_t seconds = mp_obj_get_int(args[0]) / 1000;
         if (seconds > 0) {
@@ -155,10 +155,7 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     while (true) {
         ;
     }
-
-    return mp_const_none;
 }
-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();
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index ad35bfe8c5907..8150e3b1f5381 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -79,6 +79,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (trng_random_u32())
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/mimxrt/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/mimxrt/machine_adc.c"
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 54e45b4d0ffad..7cdeb78c0a310 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -85,13 +85,9 @@
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { 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_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) }, \
-    { 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_Pin),                MP_ROM_PTR(&pin_type) }, \
     \
     MICROPY_PY_MACHINE_RTCOUNTER_ENTRY \
@@ -178,14 +174,16 @@ STATIC mp_obj_t machine_info(mp_uint_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
+
+STATIC mp_obj_t mp_machine_unique_id(void) {
+    return mp_const_empty_bytes;
+}
 
 // Resets the board in a manner similar to pushing the external RESET button.
-STATIC mp_obj_t machine_reset(void) {
+NORETURN STATIC void mp_machine_reset(void) {
     NVIC_SystemReset();
-    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
@@ -197,22 +195,25 @@ STATIC void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
 }
 
-STATIC mp_obj_t machine_lightsleep(void) {
+STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     __WFE();
-    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_lightsleep_obj, machine_lightsleep);
 
-STATIC mp_obj_t machine_deepsleep(void) {
-    __WFI();
-    return mp_const_none;
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    mp_machine_reset();
+}
+
+STATIC mp_int_t mp_machine_reset_cause(void) {
+    return reset_cause;
+}
+
+STATIC mp_obj_t mp_machine_get_freq(void) {
+    mp_raise_NotImplementedError(NULL);
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_deepsleep_obj, machine_deepsleep);
 
-STATIC mp_obj_t machine_reset_cause(void) {
-    return MP_OBJ_NEW_SMALL_INT(reset_cause);
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    mp_raise_NotImplementedError(NULL);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
 STATIC mp_obj_t machine_enable_irq(void) {
 #ifndef BLUETOOTH_SD
diff --git a/ports/nrf/modules/machine/modmachine.h b/ports/nrf/modules/machine/modmachine.h
index 5aab2a60292c5..4574dc00103c1 100644
--- a/ports/nrf/modules/machine/modmachine.h
+++ b/ports/nrf/modules/machine/modmachine.h
@@ -32,9 +32,4 @@
 
 void machine_init(void);
 
-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);
-
 #endif // __MICROPY_INCLUDED_NRF5_MODMACHINE_H__
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index f3e71f675d04d..264b0dfe8dc74 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -160,6 +160,7 @@
 #define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/nrf/modules/machine/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
 #define MICROPY_PY_MACHINE_SOFTI2C  (MICROPY_PY_MACHINE_I2C)
 
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index b4479e1260ca3..5bfbb919f44b4 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -63,13 +63,7 @@
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { 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_freq),                MP_ROM_PTR(&machine_freq_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) }, \
     \
@@ -183,19 +177,16 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
 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) {
+STATIC mp_obj_t mp_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) {
+NORETURN STATIC void mp_machine_reset(void) {
     powerctrl_mcu_reset();
-    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 // Activate the bootloader without BOOT* pins.
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
@@ -218,17 +209,13 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
 }
 
 // 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;
-    }
+STATIC mp_obj_t mp_machine_get_freq(void) {
+    return mp_obj_new_int(SystemCoreClock);
+}
+
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("machine.freq set not supported yet"));
 }
-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
@@ -237,27 +224,22 @@ STATIC void mp_machine_idle(void) {
     __WFI();
 }
 
-STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+STATIC void mp_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]};
         machine_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) {
+NORETURN STATIC void mp_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]};
         machine_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_int_t mp_machine_reset_cause(void) {
+    return reset_cause;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index d9e6961063965..e64b6cc3d7acb 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -33,25 +33,13 @@ extern const mp_obj_type_t machine_touchpad_type;
 extern const mp_obj_type_t machine_dac_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_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/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 66655a89760e2..99286fa530079 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -131,6 +131,7 @@
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/renesas-ra/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/renesas-ra/machine_adc.c"
diff --git a/ports/renesas-ra/powerctrl.c b/ports/renesas-ra/powerctrl.c
index 26dc1cbe3a8f3..548d31679adaa 100644
--- a/ports/renesas-ra/powerctrl.c
+++ b/ports/renesas-ra/powerctrl.c
@@ -245,7 +245,7 @@ void powerctrl_enter_stop_mode(void) {
     enable_irq(irq_state);
 }
 
-void powerctrl_enter_standby_mode(void) {
+NORETURN void powerctrl_enter_standby_mode(void) {
     rtc_init_finalise();
 
     #if defined(MICROPY_BOARD_ENTER_STANDBY)
@@ -301,4 +301,6 @@ void powerctrl_enter_standby_mode(void) {
     // enter standby mode
 
     // we never return; MCU is reset on exit from standby
+
+    powerctrl_mcu_reset();
 }
diff --git a/ports/renesas-ra/powerctrl.h b/ports/renesas-ra/powerctrl.h
index 1743150b329f2..34c40ea1adc32 100644
--- a/ports/renesas-ra/powerctrl.h
+++ b/ports/renesas-ra/powerctrl.h
@@ -37,6 +37,6 @@ 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);
+NORETURN void powerctrl_enter_standby_mode(void);
 
 #endif // MICROPY_INCLUDED_RA_POWERCTRL_H
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 8cd9dd462e27c..2e9d1f20c0909 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -48,14 +48,6 @@
 #define RP2_RESET_WDT (3)
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { 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_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_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) }, \
     \
@@ -66,32 +58,28 @@
     { 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_obj_t machine_unique_id(void) {
+STATIC mp_obj_t mp_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_reset(void) {
+NORETURN STATIC void mp_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) {
+STATIC mp_int_t mp_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);
+    return reset_cause;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
@@ -101,28 +89,26 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-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(mp_hal_get_cpu_freq());
-    } 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"));
-        }
-        #if MICROPY_HW_ENABLE_UART_REPL
-        setup_default_uart();
-        mp_uart_init();
-        #endif
-        return mp_const_none;
+STATIC mp_obj_t mp_machine_get_freq(void) {
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq());
+}
+
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    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"));
     }
+    #if MICROPY_HW_ENABLE_UART_REPL
+    setup_default_uart();
+    mp_uart_init();
+    #endif
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
 
 STATIC void mp_machine_idle(void) {
     __wfe();
 }
 
-STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_int_t delay_ms = 0;
     bool use_timer_alarm = false;
 
@@ -131,7 +117,7 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         if (delay_ms <= 1) {
             // Sleep is too small, just use standard delay.
             mp_hal_delay_ms(delay_ms);
-            return mp_const_none;
+            return;
         }
         use_timer_alarm = delay_ms < (1ULL << 32) / 1000;
         if (use_timer_alarm) {
@@ -148,7 +134,7 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_PY_NETWORK_CYW43
     if (cyw43_has_pending && cyw43_poll != NULL) {
         restore_interrupts(my_interrupts);
-        return mp_const_none;
+        return;
     }
     #endif
     // Disable USB and ADC clocks.
@@ -204,16 +190,12 @@ 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;
 }
-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();
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    mp_machine_lightsleep(n_args, args);
+    mp_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();
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 8e9d29cf76dc9..ee1f24b87a728 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -112,6 +112,7 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/rp2/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS     (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER           (1)
 #define MICROPY_PY_MACHINE_ADC                  (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE      "ports/rp2/machine_adc.c"
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 3271e160e1a0b..9d53048b133b2 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -55,19 +55,12 @@
 #endif
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) }, \
-    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_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_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
     MICROPY_PY_MACHINE_RTC_ENTRY \
     \
     { 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_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) }, \
-    { MP_ROM_QSTR(MP_QSTR_deepsleep),           MP_ROM_PTR(&machine_lightsleep_obj) }, \
     \
     /* Class constants. */ \
     /* Use numerical constants instead of the symbolic names, */ \
@@ -81,15 +74,13 @@
 extern bool EIC_occured;
 extern uint32_t _dbl_tap_addr;
 
-STATIC mp_obj_t machine_reset(void) {
+NORETURN STATIC void mp_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;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_LOADER;
@@ -99,25 +90,22 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     NVIC_SystemReset();
 }
 
-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 {
-        uint32_t freq = mp_obj_get_int(args[0]);
-        if (freq >= 1000000 && freq <= MAX_CPU_FREQ) {
-            set_cpu_freq(freq);
-        }
-        return mp_const_none;
+STATIC mp_obj_t mp_machine_get_freq(void) {
+    return MP_OBJ_NEW_SMALL_INT(get_cpu_freq());
+}
+
+STATIC void mp_machine_set_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);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
 
-STATIC mp_obj_t machine_unique_id(void) {
+STATIC mp_obj_t mp_machine_unique_id(void) {
     samd_unique_id_t id;
     samd_get_unique_id(&id);
     return mp_obj_new_bytes((byte *)&id.bytes, sizeof(id.bytes));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
 STATIC void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
@@ -136,18 +124,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) {
+STATIC mp_int_t mp_machine_reset_cause(void) {
     #if defined(MCU_SAMD21)
-    return MP_OBJ_NEW_SMALL_INT(PM->RCAUSE.reg);
+    return PM->RCAUSE.reg;
     #elif defined(MCU_SAMD51)
-    return MP_OBJ_NEW_SMALL_INT(RSTC->RCAUSE.reg);
+    return RSTC->RCAUSE.reg;
     #else
-    return MP_OBJ_NEW_SMALL_INT(0);
+    return 0;
     #endif
 }
-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) {
+STATIC void mp_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) {
@@ -197,6 +184,9 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     #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);
+
+NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    mp_machine_lightsleep(n_args, args);
+    mp_machine_reset();
+}
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 90d014e81170e..1c29b024cffaf 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -94,6 +94,7 @@
 #define MICROPY_PY_TIME_INCLUDEFILE         "ports/samd/modtime.c"
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/samd/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_OS                       (1)
 #define MICROPY_PY_OS_INCLUDEFILE           "ports/samd/modos.c"
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 781ceea7d3387..206d28a89e25d 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -97,14 +97,8 @@
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { 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_freq),                MP_ROM_PTR(&machine_freq_obj) }, \
     MICROPY_PY_MACHINE_RNG_ENTRY \
     { 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) }, \
@@ -283,18 +277,15 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
 
 // Returns a string of 12 bytes (96 bits), which is the unique ID for the MCU.
-STATIC mp_obj_t machine_unique_id(void) {
+STATIC mp_obj_t mp_machine_unique_id(void) {
     byte *id = (byte *)MP_HAL_UNIQUE_ID_ADDRESS;
     return mp_obj_new_bytes(id, 12);
 }
-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) {
+NORETURN STATIC void mp_machine_reset(void) {
     powerctrl_mcu_reset();
-    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 // Activate the bootloader without BOOT* pins.
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
@@ -323,57 +314,53 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
 }
 
 // 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
-        mp_obj_t tuple[] = {
-            mp_obj_new_int(HAL_RCC_GetSysClockFreq()),
-            mp_obj_new_int(HAL_RCC_GetHCLKFreq()),
-            mp_obj_new_int(HAL_RCC_GetPCLK1Freq()),
-            #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(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]);
-        mp_int_t ahb = sysclk;
-        #if defined(STM32H7)
-        if (ahb > 200000000) {
-            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;
+STATIC mp_obj_t mp_machine_get_freq(void) {
+    mp_obj_t tuple[] = {
+        mp_obj_new_int(HAL_RCC_GetSysClockFreq()),
+        mp_obj_new_int(HAL_RCC_GetHCLKFreq()),
+        mp_obj_new_int(HAL_RCC_GetPCLK1Freq()),
+        #if !defined(STM32F0) && !defined(STM32G0)
+        mp_obj_new_int(HAL_RCC_GetPCLK2Freq()),
         #endif
-        if (n_args > 1) {
-            ahb = mp_obj_get_int(args[1]);
-            if (n_args > 2) {
-                apb1 = mp_obj_get_int(args[2]);
-                if (n_args > 3) {
-                    apb2 = mp_obj_get_int(args[3]);
-                }
+    };
+    return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
+}
+
+STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    #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]);
+    mp_int_t ahb = sysclk;
+    #if defined(STM32H7)
+    if (ahb > 200000000) {
+        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) {
+            apb1 = mp_obj_get_int(args[2]);
+            if (n_args > 3) {
+                apb2 = mp_obj_get_int(args[3]);
             }
         }
-        int ret = powerctrl_set_sysclk(sysclk, ahb, apb1, apb2);
-        if (ret == -MP_EINVAL) {
-            mp_raise_ValueError(MP_ERROR_TEXT("invalid freq"));
-        } else if (ret < 0) {
-            MICROPY_BOARD_FATAL_ERROR("can't change freq");
-        }
-        return mp_const_none;
-        #endif
     }
+    int ret = powerctrl_set_sysclk(sysclk, ahb, apb1, apb2);
+    if (ret == -MP_EINVAL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid freq"));
+    } else if (ret < 0) {
+        MICROPY_BOARD_FATAL_ERROR("can't change freq");
+    }
+    #endif
 }
-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
@@ -382,27 +369,22 @@ STATIC void mp_machine_idle(void) {
     __WFI();
 }
 
-STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+STATIC void mp_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) {
+STATIC void mp_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_int_t mp_machine_reset_cause(void) {
+    return reset_cause;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 8c9e1241b1a08..899a29be8ebfe 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -33,13 +33,6 @@ 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);
-MP_DECLARE_CONST_FUN_OBJ_0(machine_reset_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_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_reset_cause_obj);
 
 MP_DECLARE_CONST_FUN_OBJ_0(machine_disable_irq_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index db48c8c3b6cd2..e11e7210304a7 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -111,6 +111,7 @@
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/stm32/modmachine.c"
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/stm32/machine_adc.c"
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 1bb66c9781aec..712021edb63ce 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -993,7 +993,7 @@ void powerctrl_enter_stop_mode(void) {
     enable_irq(irq_state);
 }
 
-void powerctrl_enter_standby_mode(void) {
+NORETURN void powerctrl_enter_standby_mode(void) {
     rtc_init_finalise();
 
     #if defined(MICROPY_BOARD_ENTER_STANDBY)
@@ -1114,5 +1114,7 @@ void powerctrl_enter_standby_mode(void) {
 
     // enter standby mode
     HAL_PWR_EnterSTANDBYMode();
-    // we never return; MCU is reset on exit from standby
+
+    // MCU is reset on exit from standby, but just in case it's not, do an explicit reset.
+    powerctrl_mcu_reset();
 }
diff --git a/ports/stm32/powerctrl.h b/ports/stm32/powerctrl.h
index e9adc529653fa..5b9240561182f 100644
--- a/ports/stm32/powerctrl.h
+++ b/ports/stm32/powerctrl.h
@@ -47,6 +47,6 @@ 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);
-void powerctrl_enter_standby_mode(void);
+NORETURN void powerctrl_enter_standby_mode(void);
 
 #endif // MICROPY_INCLUDED_STM32_POWERCTRL_H
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 16109a3af83ca..7015989784f5c 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -50,13 +50,13 @@ STATIC mp_obj_t machine_reset(void) {
     // Won't get here, Zephyr has infiniloop on its side
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 STATIC mp_obj_t machine_reset_cause(void) {
     printf("Warning: %s is not implemented\n", __func__);
     return MP_OBJ_NEW_SMALL_INT(42);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
 STATIC void mp_machine_idle(void) {
     k_yield();
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index e3a69d8c1b77d..19dbe6a16a02d 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -3,8 +3,6 @@
 
 #include "py/obj.h"
 
-MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);
-
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     const struct device *port;

From f523b86541440cc756aa0b2379538ee5e7864803 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Nov 2023 11:43:15 +1100
Subject: [PATCH 0606/3129] extmod/modmachine: Provide common implementation of
 disable/enable_irq.

The ports esp32, mimxrt, rp2 and samd all shared exactly the same
implementation of machine.disable_irq() and machine.enable_irq(),
implemented in terms of MICROPY_{BEGIN,END}_ATOMIC_SECTION.  This commit
factors these implementations into extmod/modmachine.c.

The cc3200, esp8266, nrf, renesas-ra and stm32 ports do not yet use this
common implementation.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.c         | 23 +++++++++++++++++++++++
 ports/esp32/modmachine.c    | 16 ----------------
 ports/esp32/mpconfigport.h  |  1 +
 ports/mimxrt/modmachine.c   | 16 ----------------
 ports/mimxrt/mpconfigport.h |  1 +
 ports/rp2/modmachine.c      | 16 ----------------
 ports/rp2/mpconfigport.h    |  1 +
 ports/samd/modmachine.c     | 16 ----------------
 ports/samd/mpconfigport.h   |  1 +
 9 files changed, 27 insertions(+), 64 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index d56b938bb37b7..a64b8ba79d43a 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -117,6 +117,23 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsle
 
 #endif
 
+#if MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ
+
+STATIC mp_obj_t machine_disable_irq(void) {
+    uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
+    return mp_obj_new_int(state);
+}
+STATIC 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;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
+
+#endif
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
 
@@ -148,6 +165,12 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deepsleep), MP_ROM_PTR(&machine_deepsleep_obj) },
     #endif
 
+    // Interrupt related functions.
+    #if MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ
+    { 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) },
+    #endif
+
     // Functions for bit protocols.
     #if MICROPY_PY_MACHINE_BITSTREAM
     { MP_ROM_QSTR(MP_QSTR_bitstream), MP_ROM_PTR(&machine_bitstream_obj) },
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 0170655ba3214..a3437f10c154a 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -54,9 +54,6 @@
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&machine_lightsleep_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_Timer), MP_ROM_PTR(&machine_timer_type) }, \
     MICROPY_PY_MACHINE_SDCARD_ENTRY \
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) }, \
@@ -254,16 +251,3 @@ STATIC void mp_machine_idle(void) {
     taskYIELD();
     MP_THREAD_GIL_ENTER();
 }
-
-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);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 083f1d11cff16..35943c47b6d64 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -99,6 +99,7 @@
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/esp32/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH  (1)
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index b299112d952d1..b87747b409c9f 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -63,9 +63,6 @@
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) }, \
     MICROPY_PY_MACHINE_SDCARD_ENTRY \
     \
-    { 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) }, \
-    \
     /* 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) }, \
@@ -157,19 +154,6 @@ NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-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);
-
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if defined(MICROPY_BOARD_ENTER_BOOTLOADER)
     // If a board has a custom bootloader, call it first.
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 8150e3b1f5381..51f057ca823bb 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -81,6 +81,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/mimxrt/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/mimxrt/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 2e9d1f20c0909..70b22dac01fc3 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -48,9 +48,6 @@
 #define RP2_RESET_WDT (3)
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
-    { 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_Pin),                 MP_ROM_PTR(&machine_pin_type) }, \
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) }, \
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
@@ -196,16 +193,3 @@ NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_lightsleep(n_args, args);
     mp_machine_reset();
 }
-
-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);
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index ee1f24b87a728..6942d26714e99 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -114,6 +114,7 @@
 #define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/rp2/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS     (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER           (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC                  (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE      "ports/rp2/machine_adc.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 9d53048b133b2..9aab705bf70a8 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -59,9 +59,6 @@
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
     MICROPY_PY_MACHINE_RTC_ENTRY \
     \
-    { 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) }, \
-    \
     /* Class constants. */ \
     /* Use numerical constants instead of the symbolic names, */ \
     /* since the names differ between SAMD21 and SAMD51. */ \
@@ -111,19 +108,6 @@ STATIC void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
 }
 
-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 mp_int_t mp_machine_reset_cause(void) {
     #if defined(MCU_SAMD21)
     return PM->RCAUSE.reg;
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 1c29b024cffaf..72cbb7d20844a 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -96,6 +96,7 @@
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/samd/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_OS                       (1)
 #define MICROPY_PY_OS_INCLUDEFILE           "ports/samd/modos.c"
 #define MICROPY_READER_VFS                  (1)

From 4bf7987f0abfde47b0bac4e2e8546979802ba3c6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Nov 2023 11:51:36 +1100
Subject: [PATCH 0607/3129] cc3200/mods/modmachine: Use common implementation
 of disable/enable_irq.

This commit changes the cc3200 port to use the common machine
implementation of machine.disable_irq() and machine.enable_irq().  This
eliminates its dependency on the stm32 port's code.  The behaviour of
cc3200 for these functions is changed:
- disable_irq() now returns an (opaque) integer rather than a bool
- enable_irq(state) must be passed and argument, which is the return value
  of disable_irq() rather than a bool

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/application.mk    | 1 -
 ports/cc3200/mods/modmachine.c | 6 ------
 ports/cc3200/mpconfigport.h    | 1 +
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 9fc58553cd3d2..4a6828ea864da 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -153,7 +153,6 @@ APP_SHARED_SRC_C = $(addprefix shared/,\
 
 APP_STM_SRC_C = $(addprefix ports/stm32/,\
 	bufhelper.c \
-	irq.c \
 	)
 
 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))
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 5eb7e2ef155fa..6e50553365887 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -62,9 +62,6 @@
     { MP_ROM_QSTR(MP_QSTR_sleep),               MP_ROM_PTR(&machine_lightsleep_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(&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) }, \
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&pyb_adc_type) }, \
@@ -93,9 +90,6 @@ extern OsiTaskHandle    svTaskHandle;
 extern OsiTaskHandle    xSimpleLinkSpawnTaskHndl;
 #endif
 
-MP_DECLARE_CONST_FUN_OBJ_0(machine_disable_irq_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj);
-
 /******************************************************************************/
 // MicroPython bindings;
 
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 7c527324596f8..64098c3fc08a4 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -123,6 +123,7 @@
 #define MICROPY_PY_MACHINE                          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE              "ports/cc3200/mods/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS         (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ   (1)
 #define MICROPY_PY_MACHINE_WDT                      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE          "ports/cc3200/mods/machine_wdt.c"
 

From 39d4153a8d91f1db3f2f034e5fa448b79ca14bc7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Nov 2023 12:00:16 +1100
Subject: [PATCH 0608/3129] esp8266/esp_mphal: Make atomic section more atomic.

By disabling ets_loop_iter when the atomic section is active.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/esp_mphal.c    | 15 +++++++++++++++
 ports/esp8266/mpconfigport.h |  8 +++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 7606bd4f63131..06502e85c4876 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -166,6 +166,21 @@ void mp_hal_signal_dupterm_input(void) {
     system_os_post(DUPTERM_TASK_ID, 0, 0);
 }
 
+// this bit is unused in the Xtensa PS register
+#define ETS_LOOP_ITER_BIT (12)
+
+uint32_t esp_disable_irq(void) {
+    uint32_t state = disable_irq();
+    state = (state & ~(1 << ETS_LOOP_ITER_BIT)) | (ets_loop_iter_disable << ETS_LOOP_ITER_BIT);
+    ets_loop_iter_disable = 1;
+    return state;
+}
+
+void esp_enable_irq(uint32_t state) {
+    ets_loop_iter_disable = (state >> ETS_LOOP_ITER_BIT) & 1;
+    enable_irq(state & ~(1 << ETS_LOOP_ITER_BIT));
+}
+
 // Get pointer to esf_buf bookkeeping structure
 void *ets_get_esf_buf_ctlblk(void) {
     // Get literal ptr before start of esf_rx_buf_alloc func
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 1925fc3e72402..ec36291ed3a35 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -126,9 +126,8 @@
 #define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
 #define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
 
-#include "xtirq.h"
-#define MICROPY_BEGIN_ATOMIC_SECTION() disable_irq()
-#define MICROPY_END_ATOMIC_SECTION(state) enable_irq(state)
+#define MICROPY_BEGIN_ATOMIC_SECTION() esp_disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state) esp_enable_irq(state)
 
 // type definitions for the specific machine
 
@@ -173,3 +172,6 @@ extern const struct _mp_print_t mp_debug_print;
 #define WDEV_HWRNG ((volatile uint32_t *)0x3ff20e44)
 
 #define _assert(expr) ((expr) ? (void)0 : __assert_func(__FILE__, __LINE__, __func__, #expr))
+
+uint32_t esp_disable_irq(void);
+void esp_enable_irq(uint32_t state);

From cc8fc450a67204f254356454d34e27c19cea6d10 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Nov 2023 12:00:27 +1100
Subject: [PATCH 0609/3129] esp8266/modmachine: Use common implementation of
 disable/enable_irq.

Now that the MICROPY_BEGIN_ATOMIC_SECTION/MICROPY_END_ATOMIC_SECTION macros
act the same as disable_irq/enable_irq, it's possible to use the common
extmod implementation of these machine functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/modmachine.c   | 22 ----------------------
 ports/esp8266/mpconfigport.h |  1 +
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index d55a656ce0f6a..f41c84e14d58f 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -43,9 +43,6 @@
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&machine_lightsleep_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_Timer), MP_ROM_PTR(&esp_timer_type) }, \
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pyb_pin_type) }, \
@@ -331,25 +328,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &esp_timer_locals_dict
     );
 
-// this bit is unused in the Xtensa PS register
-#define ETS_LOOP_ITER_BIT (12)
-
-STATIC mp_obj_t machine_disable_irq(void) {
-    uint32_t state = disable_irq();
-    state = (state & ~(1 << ETS_LOOP_ITER_BIT)) | (ets_loop_iter_disable << ETS_LOOP_ITER_BIT);
-    ets_loop_iter_disable = 1;
-    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);
-    ets_loop_iter_disable = (state >> ETS_LOOP_ITER_BIT) & 1;
-    enable_irq(state & ~(1 << ETS_LOOP_ITER_BIT));
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
-
 // Custom version of this function that feeds system WDT if necessary
 mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us) {
     int nchanges = 2;
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index ec36291ed3a35..ad9fefe0cd31b 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -66,6 +66,7 @@
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/esp8266/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/esp8266/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_READ (1)

From e3c4c32c640465a3596acdb1bd6a2b8f1eb89a29 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Nov 2023 12:21:54 +1100
Subject: [PATCH 0610/3129] nrf: Use dupterm_objs[0] instead of
 board_stdio_uart.

To make this a little more consistent with other ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/main.c             |  2 +-
 ports/nrf/modules/os/modos.c |  8 ++++----
 ports/nrf/mpconfigport.h     |  1 +
 ports/nrf/mphalport.c        | 20 +++++++++-----------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 8e57be8decdd9..bcd0bb9d7151c 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -171,7 +171,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_uart_type, make_new)((mp_obj_t)&machine_uart_type, MP_ARRAY_SIZE(args), 0, args);
+        MP_STATE_VM(dupterm_objs[0]) = 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/os/modos.c b/ports/nrf/modules/os/modos.c
index ebe50455151c7..6ff7200a12b6a 100644
--- a/ports/nrf/modules/os/modos.c
+++ b/ports/nrf/modules/os/modos.c
@@ -118,16 +118,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 // TODO should accept any object with read/write methods.
 STATIC mp_obj_t os_dupterm(mp_uint_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
-        if (MP_STATE_PORT(board_stdio_uart) == NULL) {
+        if (MP_STATE_VM(dupterm_objs[0]) == MP_OBJ_NULL) {
             return mp_const_none;
         } else {
-            return MP_STATE_PORT(board_stdio_uart);
+            return MP_STATE_VM(dupterm_objs[0]);
         }
     } else {
         if (args[0] == mp_const_none) {
-            MP_STATE_PORT(board_stdio_uart) = NULL;
+            MP_STATE_VM(dupterm_objs[0]) = MP_OBJ_NULL;
         } else if (mp_obj_get_type(args[0]) == &machine_uart_type) {
-            MP_STATE_PORT(board_stdio_uart) = args[0];
+            MP_STATE_VM(dupterm_objs[0]) = args[0];
         } else {
             mp_raise_ValueError(MP_ERROR_TEXT("need a UART object"));
         }
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 264b0dfe8dc74..85db26364849c 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -135,6 +135,7 @@
 
 // Use port specific os module rather than extmod variant.
 #define MICROPY_PY_OS               (0)
+#define MICROPY_PY_OS_DUPTERM       (1)
 
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 7a51e187b77c8..f6c934a8b5fbe 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -175,11 +175,11 @@ void mp_hal_set_interrupt_char(int c) {
 #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
-        && uart_rx_any(MP_STATE_PORT(board_stdio_uart))) {
+    if ((poll_flags & MP_STREAM_POLL_RD) && MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL
+        && uart_rx_any(MP_STATE_VM(dupterm_objs[0]))) {
         ret |= MP_STREAM_POLL_RD;
     }
-    if ((poll_flags & MP_STREAM_POLL_WR) && MP_STATE_PORT(board_stdio_uart) != NULL) {
+    if ((poll_flags & MP_STREAM_POLL_WR) && MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
         ret |= MP_STREAM_POLL_WR;
     }
     return ret;
@@ -187,8 +187,8 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 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))) {
-            return uart_rx_char(MP_STATE_PORT(board_stdio_uart));
+        if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL && uart_rx_any(MP_STATE_VM(dupterm_objs[0]))) {
+            return uart_rx_char(MP_STATE_VM(dupterm_objs[0]));
         }
         MICROPY_EVENT_POLL_HOOK
     }
@@ -197,14 +197,14 @@ int mp_hal_stdin_rx_chr(void) {
 }
 
 void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-    if (MP_STATE_PORT(board_stdio_uart) != NULL) {
-        uart_tx_strn(MP_STATE_PORT(board_stdio_uart), str, len);
+    if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
+        uart_tx_strn(MP_STATE_VM(dupterm_objs[0]), str, len);
     }
 }
 
 void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
-    if (MP_STATE_PORT(board_stdio_uart) != NULL) {
-        uart_tx_strn_cooked(MP_STATE_PORT(board_stdio_uart), str, len);
+    if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
+        uart_tx_strn_cooked(MP_STATE_VM(dupterm_objs[0]), str, len);
     }
 }
 #endif
@@ -377,5 +377,3 @@ const char *nrfx_error_code_lookup(uint32_t err_code) {
 }
 
 #endif // NRFX_LOG_ENABLED
-
-MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *board_stdio_uart);

From 22d9116c8c53463805dcd30fbeb78fbfa84c0e98 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Nov 2023 12:18:10 +1100
Subject: [PATCH 0611/3129] nrf: Convert os module to use extmod version.

The os.dupterm() function has changed on this port, it now matches the
semantics used by all other ports (except it's restricted to accept only
machine.UART objects).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modos.c               |  15 ++++
 ports/nrf/Makefile           |   1 -
 ports/nrf/modules/os/modos.c | 169 +++--------------------------------
 ports/nrf/mpconfigport.h     |  17 +++-
 4 files changed, 42 insertions(+), 160 deletions(-)

diff --git a/extmod/modos.c b/extmod/modos.c
index 6df49d7f84972..da14fd81f8805 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -48,6 +48,13 @@
 #include "extmod/vfs_posix.h"
 #endif
 
+#if MICROPY_MBFS
+#if MICROPY_VFS
+#error "MICROPY_MBFS requires MICROPY_VFS to be disabled"
+#endif
+#include "ports/nrf/modules/os/microbitfs.h"
+#endif
+
 #if MICROPY_PY_OS_UNAME
 #include "genhdr/mpversion.h"
 #endif
@@ -187,6 +194,14 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_VfsPosix), MP_ROM_PTR(&mp_type_vfs_posix) },
     #endif
     #endif
+
+    #if MICROPY_MBFS
+    // For special micro:bit filesystem only.
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&os_mbfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&os_mbfs_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&os_mbfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_mbfs_remove_obj) },
+    #endif
 };
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
 
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 0a57471849bb0..45e44aed5aefe 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -324,7 +324,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	machine/timer.c \
 	machine/rtcounter.c \
 	machine/temp.c \
-	os/modos.c \
 	os/microbitfs.c \
 	board/modboard.c \
 	board/led.c \
diff --git a/ports/nrf/modules/os/modos.c b/ports/nrf/modules/os/modos.c
index 6ff7200a12b6a..31bf1b2920ef1 100644
--- a/ports/nrf/modules/os/modos.c
+++ b/ports/nrf/modules/os/modos.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2013-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
@@ -24,84 +24,16 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modos.c via MICROPY_PY_OS_INCLUDEFILE.
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
-#include "py/objtuple.h"
-#include "py/objstr.h"
-#include "lib/oofatfs/ff.h"
-#include "lib/oofatfs/diskio.h"
-#include "modules/os/microbitfs.h"
 #include "extmod/modmachine.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-#include "genhdr/mpversion.h"
-
-#if MICROPY_HW_ENABLE_RNG
 #include "drivers/rng.h"
-#endif // MICROPY_HW_ENABLE_RNG
-
-/// \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_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);
-
-#if MICROPY_VFS
-/// \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);
-#endif
 
-#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_OS_URANDOM
+// Return a bytes object with n random bytes, generated by the hardware random number generator.
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -110,91 +42,14 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
 
-#if MICROPY_PY_MACHINE_UART
-// Get or set the UART object that the REPL is repeated on.
+#if MICROPY_PY_OS_DUPTERM
 // TODO should accept any object with read/write methods.
-STATIC mp_obj_t os_dupterm(mp_uint_t n_args, const mp_obj_t *args) {
-    if (n_args == 0) {
-        if (MP_STATE_VM(dupterm_objs[0]) == MP_OBJ_NULL) {
-            return mp_const_none;
-        } else {
-            return MP_STATE_VM(dupterm_objs[0]);
-        }
-    } else {
-        if (args[0] == mp_const_none) {
-            MP_STATE_VM(dupterm_objs[0]) = MP_OBJ_NULL;
-        } else if (mp_obj_get_type(args[0]) == &machine_uart_type) {
-            MP_STATE_VM(dupterm_objs[0]) = args[0];
-        } else {
-            mp_raise_ValueError(MP_ERROR_TEXT("need a UART object"));
-        }
-        return mp_const_none;
+void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
+    if (!(stream_attached == mp_const_none || mp_obj_get_type(stream_attached) == &machine_uart_type)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("need a UART object"));
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_dupterm_obj, 0, 1, os_dupterm);
-#endif // MICROPY_PY_MACHINE_UART
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
-
-    { 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_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) },
-
-#elif MICROPY_MBFS
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&os_mbfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&os_mbfs_ilistdir_obj) }, // uses ~136 bytes
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&os_mbfs_stat_obj) },         // uses ~228 bytes
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_mbfs_remove_obj) },
-#endif
-
-    /// \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
-#if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mod_os_dupterm_obj) },
-#endif
-#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
-};
-
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_os = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&os_module_globals,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_os, mp_module_os);
+#endif // MICROPY_PY_OS_DUPTERM
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 85db26364849c..3ab1e0814f875 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -76,6 +76,10 @@
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN      (CORE_FEAT)
 #endif
 
+#ifndef MICROPY_PY_SYS_PLATFORM
+#define MICROPY_PY_SYS_PLATFORM            "nrf"
+#endif
+
 #ifndef MICROPY_PY_SYS_STDFILES
 #define MICROPY_PY_SYS_STDFILES            (CORE_FEAT)
 #endif
@@ -92,6 +96,10 @@
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (CORE_FEAT)
 #endif
 
+#ifndef MICROPY_HW_ENABLE_RNG
+#define MICROPY_HW_ENABLE_RNG       (0)
+#endif
+
 #ifndef MICROPY_EMIT_THUMB
 #define MICROPY_EMIT_THUMB          (EXTRA_FEAT)
 #endif
@@ -133,9 +141,14 @@
     #define MICROPY_FATFS_MAX_SS       (4096)
 #endif
 
-// Use port specific os module rather than extmod variant.
-#define MICROPY_PY_OS               (0)
+#define MICROPY_PY_OS               (1)
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/nrf/modules/os/modos.c"
 #define MICROPY_PY_OS_DUPTERM       (1)
+#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
+#define MICROPY_PY_OS_SEP           (1)
+#define MICROPY_PY_OS_SYNC          (MICROPY_VFS)
+#define MICROPY_PY_OS_UNAME         (1)
+#define MICROPY_PY_OS_URANDOM       (MICROPY_HW_ENABLE_RNG)
 
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)

From 1c0e4644c7c9a9bc627b0a0197bc5702b43043c1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Nov 2023 13:19:28 +1100
Subject: [PATCH 0612/3129] cc3200: Convert dupterm to use common extmod
 implementation.

Tested on a WIPY.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/ftp/ftp.c        |  1 -
 ports/cc3200/hal/cc3200_hal.c | 33 +++++++-----------------
 ports/cc3200/mods/modos.c     | 48 ++---------------------------------
 ports/cc3200/mods/modos.h     | 47 ----------------------------------
 ports/cc3200/mods/pybuart.c   |  3 +--
 ports/cc3200/mpconfigport.h   |  1 +
 ports/cc3200/mptask.c         |  4 ---
 7 files changed, 13 insertions(+), 124 deletions(-)
 delete mode 100644 ports/cc3200/mods/modos.h

diff --git a/ports/cc3200/ftp/ftp.c b/ports/cc3200/ftp/ftp.c
index 5d4fc6fb5f2d0..fc071fc9513d4 100644
--- a/ports/cc3200/ftp/ftp.c
+++ b/ports/cc3200/ftp/ftp.c
@@ -48,7 +48,6 @@
 #include "fifo.h"
 #include "socketfifo.h"
 #include "updater.h"
-#include "modos.h"
 
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS
diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index 4d9d7647d3dec..b75a40151f86e 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -36,6 +36,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/objstr.h"
+#include "extmod/misc.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_nvic.h"
@@ -49,7 +50,6 @@
 #include "pybuart.h"
 #include "utils.h"
 #include "irq.h"
-#include "modos.h"
 
 #ifdef USE_FREERTOS
 #include "FreeRTOS.h"
@@ -142,14 +142,7 @@ void mp_hal_delay_ms(mp_uint_t delay) {
 }
 
 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)) {
-            uart_tx_strn(MP_STATE_PORT(os_term_dup_obj)->stream_o, str, len);
-        } else {
-            MP_STATE_PORT(os_term_dup_obj)->write[2] = mp_obj_new_str_of_type(&mp_type_str, (const byte *)str, len);
-            mp_call_method_n_kw(1, 0, MP_STATE_PORT(os_term_dup_obj)->write);
-        }
-    }
+    mp_os_dupterm_tx_strn(str, len);
     // and also to telnet
     telnet_tx_strn(str, len);
 }
@@ -159,22 +152,14 @@ int mp_hal_stdin_rx_chr(void) {
         // read telnet first
         if (telnet_rx_any()) {
             return telnet_rx_char();
-        } else if (MP_STATE_PORT(os_term_dup_obj)) { // then the stdio_dup
-            if (mp_obj_is_type(MP_STATE_PORT(os_term_dup_obj)->stream_o, &pyb_uart_type)) {
-                if (uart_rx_any(MP_STATE_PORT(os_term_dup_obj)->stream_o)) {
-                    return uart_rx_char(MP_STATE_PORT(os_term_dup_obj)->stream_o);
-                }
-            } else {
-                MP_STATE_PORT(os_term_dup_obj)->read[2] = mp_obj_new_int(1);
-                mp_obj_t data = mp_call_method_n_kw(1, 0, MP_STATE_PORT(os_term_dup_obj)->read);
-                // data len is > 0
-                if (mp_obj_is_true(data)) {
-                    mp_buffer_info_t bufinfo;
-                    mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
-                    return ((int *)(bufinfo.buf))[0];
-                }
-            }
         }
+
+        // then dupterm
+        int dupterm_c = mp_os_dupterm_rx_chr();
+        if (dupterm_c >= 0) {
+            return dupterm_c;
+        }
+
         mp_hal_delay_ms(1);
     }
 }
diff --git a/ports/cc3200/mods/modos.c b/ports/cc3200/mods/modos.c
index 1a854750f2340..5228d1f4ba243 100644
--- a/ports/cc3200/mods/modos.c
+++ b/ports/cc3200/mods/modos.c
@@ -35,8 +35,8 @@
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "genhdr/mpversion.h"
-#include "modos.h"
 #include "sflash_diskio.h"
+#include "extmod/misc.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "random.h"
@@ -55,25 +55,6 @@
 ///
 /// On boot up, the current directory is `/flash`.
 
-/******************************************************************************
- DECLARE PRIVATE DATA
- ******************************************************************************/
-STATIC os_term_dup_obj_t os_term_dup_obj;
-
-/******************************************************************************
- DEFINE PUBLIC FUNCTIONS
- ******************************************************************************/
-
-void osmount_unmount_all (void) {
-    //TODO
-    /*
-    for (mp_uint_t i = 0; i < MP_STATE_PORT(mount_obj_list).len; i++) {
-        os_fs_mount_t *mount_obj = ((os_fs_mount_t *)(MP_STATE_PORT(mount_obj_list).items[i]));
-        unmount(mount_obj);
-    }
-    */
-}
-
 /******************************************************************************/
 // MicroPython bindings
 //
@@ -120,31 +101,6 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
-STATIC mp_obj_t os_dupterm(uint n_args, const mp_obj_t *args) {
-    if (n_args == 0) {
-        if (MP_STATE_PORT(os_term_dup_obj) == MP_OBJ_NULL) {
-            return mp_const_none;
-        } else {
-            return MP_STATE_PORT(os_term_dup_obj)->stream_o;
-        }
-    } else {
-        mp_obj_t stream_o = args[0];
-        if (stream_o == mp_const_none) {
-            MP_STATE_PORT(os_term_dup_obj) = MP_OBJ_NULL;
-        } else {
-            if (!mp_obj_is_type(stream_o, &pyb_uart_type)) {
-                // must be a stream-like object providing at least read and write methods
-                mp_load_method(stream_o, MP_QSTR_read, os_term_dup_obj.read);
-                mp_load_method(stream_o, MP_QSTR_write, os_term_dup_obj.write);
-            }
-            os_term_dup_obj.stream_o = stream_o;
-            MP_STATE_PORT(os_term_dup_obj) = &os_term_dup_obj;
-        }
-        return mp_const_none;
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_dupterm_obj, 0, 1, os_dupterm);
-
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_os) },
 
@@ -170,7 +126,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { 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_VfsFat),          MP_ROM_PTR(&mp_fat_vfs_type) },
-    { MP_ROM_QSTR(MP_QSTR_dupterm),         MP_ROM_PTR(&os_dupterm_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dupterm),         MP_ROM_PTR(&mp_os_dupterm_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
diff --git a/ports/cc3200/mods/modos.h b/ports/cc3200/mods/modos.h
deleted file mode 100644
index 5fa2a967d4347..0000000000000
--- a/ports/cc3200/mods/modos.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2015 Daniel Campora
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION 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_CC3200_MODS_MODOS_H
-#define MICROPY_INCLUDED_CC3200_MODS_MODOS_H
-
-#include "py/obj.h"
-
-/******************************************************************************
- DEFINE PUBLIC TYPES
- ******************************************************************************/
-
-typedef struct _os_term_dup_obj_t {
-    mp_obj_t stream_o;
-    mp_obj_t read[3];
-    mp_obj_t write[3];
-} os_term_dup_obj_t;
-
-/******************************************************************************
- DECLARE PUBLIC FUNCTIONS
- ******************************************************************************/
-void osmount_unmount_all (void);
-
-#endif // MICROPY_INCLUDED_CC3200_MODS_MODOS_H
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 5d6ad075275d5..c9a753da04853 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -50,7 +50,6 @@
 #include "pin.h"
 #include "pybpin.h"
 #include "pins.h"
-#include "modos.h"
 
 /// \moduleref pyb
 /// \class UART - duplex serial communication bus
@@ -249,7 +248,7 @@ STATIC void UARTGenericIntHandler(uint32_t uart_id) {
         MAP_UARTIntClear(self->reg, UART_INT_RX | UART_INT_RT);
         while (UARTCharsAvail(self->reg)) {
             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) {
+            if (MP_STATE_VM(dupterm_objs[0]) == MP_OBJ_FROM_PTR(self) && data == mp_interrupt_char) {
                 // raise an exception when interrupts are finished
                 mp_sched_keyboard_interrupt();
             } else { // there's always a read buffer available
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 64098c3fc08a4..cb0167ae09b22 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -115,6 +115,7 @@
 #define MICROPY_PY_RE                               (1)
 #define MICROPY_PY_HEAPQ                            (0)
 #define MICROPY_PY_HASHLIB                          (0)
+#define MICROPY_PY_OS_DUPTERM                       (1)
 #define MICROPY_PY_SELECT                           (1)
 #define MICROPY_PY_TIME                             (1)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index abf8484b0d42a..83b5c091b80e3 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -70,7 +70,6 @@
 #include "cryptohash.h"
 #include "mpirq.h"
 #include "updater.h"
-#include "modos.h"
 #include "antenna.h"
 #include "task.h"
 
@@ -247,9 +246,6 @@ void TASK_MicroPython(void *pvParameters) {
     // clean-up the user socket space
     modusocket_close_all_user_sockets();
 
-    // unmount all user file systems
-    osmount_unmount_all();
-
     // wait for pending transactions to complete
     mp_hal_delay_ms(20);
 

From 49fa3ce65deb1b6de75a210698e46e342ff73bca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Nov 2023 17:12:38 +1100
Subject: [PATCH 0613/3129] cc3200: Convert os module to use extmod version.

Changes:
- os.uname() is removed to save space; sys.version and sys.implementation
  can be used instead.
- os.sync() now uses the common extmod version and syncs by calling the FAT
  FS sync function, which eventually calls sflash_disk_flush().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/application.mk |   1 -
 ports/cc3200/mods/modos.c   | 106 ++----------------------------------
 ports/cc3200/mpconfigport.h |   4 ++
 3 files changed, 9 insertions(+), 102 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 4a6828ea864da..b40cfcd07c661 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -77,7 +77,6 @@ APP_MISC_SRC_C = $(addprefix misc/,\
 
 APP_MODS_SRC_C = $(addprefix mods/,\
 	modnetwork.c \
-	modos.c \
 	modsocket.c \
 	modssl.c \
 	modwipy.c \
diff --git a/ports/cc3200/mods/modos.c b/ports/cc3200/mods/modos.c
index 5228d1f4ba243..c62c5e22c45b4 100644
--- a/ports/cc3200/mods/modos.c
+++ b/ports/cc3200/mods/modos.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2015 Daniel Campora
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,72 +25,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modos.c via MICROPY_PY_OS_INCLUDEFILE.
 
-#include "py/objtuple.h"
-#include "py/objstr.h"
 #include "py/runtime.h"
-#include "shared/timeutils/timeutils.h"
-#include "lib/oofatfs/ff.h"
-#include "lib/oofatfs/diskio.h"
-#include "genhdr/mpversion.h"
-#include "sflash_diskio.h"
-#include "extmod/misc.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
 #include "random.h"
-#include "version.h"
-#include "pybsd.h"
-#include "pybuart.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 serial flash filesystem
-///
-/// On boot up, the current directory is `/flash`.
-
-/******************************************************************************/
-// MicroPython bindings
-//
-
-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, WIPY_SW_VERSION_NUMBER);
-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_sync(void) {
-    sflash_disk_flush();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync);
-
-STATIC mp_obj_t os_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -99,41 +40,4 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&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_os) },
-
-    { 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_rename),          MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove),          MP_ROM_PTR(&mp_vfs_remove_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_unlink),          MP_ROM_PTR(&mp_vfs_remove_obj) },     // unlink aliases to remove
-
-    { MP_ROM_QSTR(MP_QSTR_sync),            MP_ROM_PTR(&os_sync_obj) },
-    { MP_ROM_QSTR(MP_QSTR_urandom),         MP_ROM_PTR(&os_urandom_obj) },
-
-    // MicroPython additions
-    // removed: mkfs
-    // renamed: unmount -> umount
-    { 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_VfsFat),          MP_ROM_PTR(&mp_fat_vfs_type) },
-    { MP_ROM_QSTR(MP_QSTR_dupterm),         MP_ROM_PTR(&mp_os_dupterm_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_os = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&os_module_globals,
-};
-
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_os, mp_module_os);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index cb0167ae09b22..d9087efdd5c81 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -115,7 +115,11 @@
 #define MICROPY_PY_RE                               (1)
 #define MICROPY_PY_HEAPQ                            (0)
 #define MICROPY_PY_HASHLIB                          (0)
+#define MICROPY_PY_OS                               (1)
+#define MICROPY_PY_OS_INCLUDEFILE                   "ports/cc3200/mods/modos.c"
 #define MICROPY_PY_OS_DUPTERM                       (1)
+#define MICROPY_PY_OS_SYNC                          (1)
+#define MICROPY_PY_OS_URANDOM                       (1)
 #define MICROPY_PY_SELECT                           (1)
 #define MICROPY_PY_TIME                             (1)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)

From 7a6489aaa51f0981b7920445667bda49f18dde36 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Dec 2023 13:59:12 +1100
Subject: [PATCH 0614/3129] cc3200: Eliminate dependency on stm32's irq.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/hal/cc3200_asm.h | 12 ++++++++++--
 ports/cc3200/hal/cc3200_hal.c |  1 -
 ports/cc3200/mpthreadport.c   |  1 -
 ports/cc3200/telnet/telnet.c  |  1 -
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/cc3200/hal/cc3200_asm.h b/ports/cc3200/hal/cc3200_asm.h
index 742c9a6f7f6b5..2a9fc506ce104 100644
--- a/ports/cc3200/hal/cc3200_asm.h
+++ b/ports/cc3200/hal/cc3200_asm.h
@@ -32,8 +32,11 @@
 //
 // 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.
+// value from disable_irq back to enable_irq.
+
+// these states correspond to values from query_irq, enable_irq and disable_irq
+#define IRQ_STATE_DISABLED (0x00000001)
+#define IRQ_STATE_ENABLED  (0x00000000)
 
 #ifndef __disable_irq
 #define __disable_irq() __asm__ volatile ("cpsid i");
@@ -79,6 +82,11 @@ static inline void __set_BASEPRI(uint32_t value) {
     __asm volatile ("msr basepri, %0" : : "r" (value) : "memory");
 }
 
+__attribute__(( always_inline ))
+static inline uint32_t query_irq(void) {
+    return __get_PRIMASK();
+}
+
 __attribute__(( always_inline ))
 static inline void enable_irq(mp_uint_t state) {
     __set_PRIMASK(state);
diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index b75a40151f86e..56dd2b2b82646 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -49,7 +49,6 @@
 #include "telnet.h"
 #include "pybuart.h"
 #include "utils.h"
-#include "irq.h"
 
 #ifdef USE_FREERTOS
 #include "FreeRTOS.h"
diff --git a/ports/cc3200/mpthreadport.c b/ports/cc3200/mpthreadport.c
index 5b4771f3956fd..c3f5f38d061a6 100644
--- a/ports/cc3200/mpthreadport.c
+++ b/ports/cc3200/mpthreadport.c
@@ -32,7 +32,6 @@
 #include "py/mphal.h"
 #include "mptask.h"
 #include "task.h"
-#include "irq.h"
 
 #if MICROPY_PY_THREAD
 
diff --git a/ports/cc3200/telnet/telnet.c b/ports/cc3200/telnet/telnet.c
index 86843c78f6c9e..595be06f2fe49 100644
--- a/ports/cc3200/telnet/telnet.c
+++ b/ports/cc3200/telnet/telnet.c
@@ -37,7 +37,6 @@
 #include "debug.h"
 #include "serverstask.h"
 #include "genhdr/mpversion.h"
-#include "irq.h"
 
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS

From 7d784e53853db7935112d5952aee13c19b539255 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Dec 2023 13:56:34 +1100
Subject: [PATCH 0615/3129] cc3200/application.mk: Don't add stm32 to build
 include path.

Or this port may end up accidentally including unwanted headers from stm32.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/application.mk | 1 -
 ports/cc3200/mods/pybadc.c  | 2 +-
 ports/cc3200/mods/pybi2c.c  | 2 +-
 ports/cc3200/mods/pybspi.c  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index b40cfcd07c661..6f4452da6bf5d 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -18,7 +18,6 @@ APP_INC += -Iutil
 APP_INC += -Ibootmgr
 APP_INC += -I$(BUILD)
 APP_INC += -I$(BUILD)/genhdr
-APP_INC += -I$(TOP)/ports/stm32
 
 APP_CPPDEFINES = -Dgcc -DTARGET_IS_CC3200 -DSL_FULL -DUSE_FREERTOS
 
diff --git a/ports/cc3200/mods/pybadc.c b/ports/cc3200/mods/pybadc.c
index 74664282560d2..6f9f1f19ae47d 100644
--- a/ports/cc3200/mods/pybadc.c
+++ b/ports/cc3200/mods/pybadc.c
@@ -32,7 +32,7 @@
 #include "py/binary.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
-#include "bufhelper.h"
+#include "ports/stm32/bufhelper.h"
 #include "inc/hw_types.h"
 #include "inc/hw_adc.h"
 #include "inc/hw_ints.h"
diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
index 5d77dc8367c4a..a413eddeb2e3c 100644
--- a/ports/cc3200/mods/pybi2c.c
+++ b/ports/cc3200/mods/pybi2c.c
@@ -31,7 +31,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "bufhelper.h"
+#include "ports/stm32/bufhelper.h"
 #include "inc/hw_types.h"
 #include "inc/hw_i2c.h"
 #include "inc/hw_ints.h"
diff --git a/ports/cc3200/mods/pybspi.c b/ports/cc3200/mods/pybspi.c
index 61086ec2e1d84..fa38f0c6576c7 100644
--- a/ports/cc3200/mods/pybspi.c
+++ b/ports/cc3200/mods/pybspi.c
@@ -30,7 +30,7 @@
 
 #include "py/runtime.h"
 #include "py/mperrno.h"
-#include "bufhelper.h"
+#include "ports/stm32/bufhelper.h"
 #include "inc/hw_types.h"
 #include "inc/hw_mcspi.h"
 #include "inc/hw_ints.h"

From bfdf500ea5756a4f0f2f8b384389b6f70af69526 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Dec 2023 13:24:19 +1100
Subject: [PATCH 0616/3129] py/mphal: Move configuration of ATOMIC_SECTION
 macros to mphal.h.

MICROPY_BEGIN_ATOMIC_SECTION/MICROPY_END_ATOMIC_SECTION belong more to the
MicroPython HAL rather than build configuration settings, so move their
default configuration to py/mphal.h, and require all users of these macros
to include py/mphal.h (here, py/objexcept.c and py/scheduler.c).

This helps ports separate configuration from their HAL implementations, and
can improve build times (because mpconfig.h is included everywhere, whereas
mphal.h is not).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h  | 8 --------
 py/mphal.h     | 8 ++++++++
 py/objexcept.c | 2 ++
 py/scheduler.c | 1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 6995600abeb7e..d14b1aa044533 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1850,14 +1850,6 @@ typedef double mp_float_t;
 #endif
 #endif
 
-// On embedded platforms, these will typically enable/disable irqs.
-#ifndef MICROPY_BEGIN_ATOMIC_SECTION
-#define MICROPY_BEGIN_ATOMIC_SECTION() (0)
-#endif
-#ifndef MICROPY_END_ATOMIC_SECTION
-#define MICROPY_END_ATOMIC_SECTION(state) (void)(state)
-#endif
-
 // Allow to override static modifier for global objects, e.g. to use with
 // object code analysis tools which don't support static symbols.
 #ifndef STATIC
diff --git a/py/mphal.h b/py/mphal.h
index 0d4b1224e5cec..19fceef71853d 100644
--- a/py/mphal.h
+++ b/py/mphal.h
@@ -35,6 +35,14 @@
 #include <mphalport.h>
 #endif
 
+// On embedded platforms, these will typically enable/disable irqs.
+#ifndef MICROPY_BEGIN_ATOMIC_SECTION
+#define MICROPY_BEGIN_ATOMIC_SECTION() (0)
+#endif
+#ifndef MICROPY_END_ATOMIC_SECTION
+#define MICROPY_END_ATOMIC_SECTION(state) (void)(state)
+#endif
+
 #ifndef mp_hal_stdio_poll
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags);
 #endif
diff --git a/py/objexcept.c b/py/objexcept.c
index a54b81370d9bc..fe74458cae8c3 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -81,6 +81,8 @@ void mp_init_emergency_exception_buf(void) {
 #else
 #define mp_emergency_exception_buf_size MP_STATE_VM(mp_emergency_exception_buf_size)
 
+#include "py/mphal.h" // for MICROPY_BEGIN_ATOMIC_SECTION/MICROPY_END_ATOMIC_SECTION
+
 void mp_init_emergency_exception_buf(void) {
     mp_emergency_exception_buf_size = 0;
     MP_STATE_VM(mp_emergency_exception_buf) = NULL;
diff --git a/py/scheduler.c b/py/scheduler.c
index 165b26dc86521..b9a43bfbdb6f4 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 
+#include "py/mphal.h"
 #include "py/runtime.h"
 
 // Schedules an exception on the main thread (for exceptions "thrown" by async

From ad806df857b52e9814dbd857b14f09b63eb847fe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Dec 2023 13:29:42 +1100
Subject: [PATCH 0617/3129] ports: Move definitions of ATOMIC_SECTION macros to
 mphalport.h.

Also move MICROPY_PY_PENDSV_ENTER/REENTER/EXIT to mphalport.h, for ports
where these are not already there.

This helps separate the hardware implementation of these macros from the
MicroPython configuration (eg for renesas-ra and stm32, the IRQ static
inline helper functions can now be moved to irq.h).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/hal/cc3200_hal.h   |  7 +++++++
 ports/cc3200/mods/pybrtc.c      |  2 +-
 ports/cc3200/mpconfigport.h     |  6 ------
 ports/esp32/mpconfigport.h      |  7 -------
 ports/esp32/mphalport.h         |  7 +++++++
 ports/esp8266/esp_mphal.h       |  6 ++++++
 ports/esp8266/mpconfigport.h    |  6 ------
 ports/mimxrt/mpconfigport.h     | 22 ----------------------
 ports/mimxrt/mphalport.h        | 22 ++++++++++++++++++++++
 ports/renesas-ra/irq.h          | 17 ++++++++++++++++-
 ports/renesas-ra/mpconfigport.h | 21 ---------------------
 ports/renesas-ra/mphalport.h    |  3 +++
 ports/rp2/modrp2.c              |  1 +
 ports/rp2/mpconfigport.h        |  6 ------
 ports/rp2/mphalport.h           |  7 +++++++
 ports/rp2/mpthreadport.c        |  1 +
 ports/rp2/rp2_flash.c           |  1 +
 ports/samd/mpconfigport.h       | 12 ------------
 ports/samd/mphalport.h          | 13 +++++++++++++
 ports/stm32/irq.h               | 17 ++++++++++++++++-
 ports/stm32/mpconfigport.h      | 27 ---------------------------
 ports/stm32/mphalport.h         | 13 ++++++++++++-
 ports/stm32/mpu.h               |  2 ++
 ports/unix/mpconfigport.h       |  6 ------
 ports/unix/mphalport.h          |  6 ++++++
 ports/zephyr/mpconfigport.h     |  3 ---
 ports/zephyr/mphalport.h        |  3 +++
 27 files changed, 124 insertions(+), 120 deletions(-)

diff --git a/ports/cc3200/hal/cc3200_hal.h b/ports/cc3200/hal/cc3200_hal.h
index 9e57d39e2e708..d07a9a17035bf 100644
--- a/ports/cc3200/hal/cc3200_hal.h
+++ b/ports/cc3200/hal/cc3200_hal.h
@@ -30,6 +30,10 @@
 #include "hal/utils.h"
 #include "hal/systick.h"
 
+// assembly functions to handle critical sections, interrupt
+// disabling/enabling and sleep mode enter/exit
+#include "cc3200_asm.h"
+
 /******************************************************************************
  DEFINE CONSTANTS
  ******************************************************************************/
@@ -55,6 +59,9 @@
                                               " isb \n");   \
                                      }
 
+#define MICROPY_BEGIN_ATOMIC_SECTION()              disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)           enable_irq(state)
+
 /******************************************************************************
  DECLARE PUBLIC FUNCTIONS
  ******************************************************************************/
diff --git a/ports/cc3200/mods/pybrtc.c b/ports/cc3200/mods/pybrtc.c
index e79fb29d00d00..340e86e158883 100644
--- a/ports/cc3200/mods/pybrtc.c
+++ b/ports/cc3200/mods/pybrtc.c
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpconfig.h"
+#include "py/mphal.h"
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index d9087efdd5c81..fe579c08747b9 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -161,14 +161,8 @@ 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 MICROPY_BEGIN_ATOMIC_SECTION()              disable_irq()
-#define MICROPY_END_ATOMIC_SECTION(state)           enable_irq(state)
 #define MICROPY_EVENT_POLL_HOOK                     __WFI();
 
-// assembly functions to handle critical sections, interrupt
-// disabling/enabling and sleep mode enter/exit
-#include "cc3200_asm.h"
-
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 35943c47b6d64..ff6f6ab8d0ae7 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -187,13 +187,6 @@ 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)
 
-// Note: these "critical nested" macros do not ensure cross-CPU exclusion,
-// the only disable interrupts on the current CPU.  To full manage exclusion
-// one should use portENTER_CRITICAL/portEXIT_CRITICAL instead.
-#include "freertos/FreeRTOS.h"
-#define MICROPY_BEGIN_ATOMIC_SECTION() portSET_INTERRUPT_MASK_FROM_ISR()
-#define MICROPY_END_ATOMIC_SECTION(state) portCLEAR_INTERRUPT_MASK_FROM_ISR(state)
-
 #if MICROPY_PY_SOCKET_EVENTS
 #define MICROPY_PY_SOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler();
 #else
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index d77e2dd0df309..9a7c39487d808 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -63,6 +63,13 @@ void check_esp_err_(esp_err_t code);
 void check_esp_err_(esp_err_t code, const char *func, const int line, const char *file);
 #endif
 
+// Note: these "critical nested" macros do not ensure cross-CPU exclusion,
+// the only disable interrupts on the current CPU.  To full manage exclusion
+// one should use portENTER_CRITICAL/portEXIT_CRITICAL instead.
+#include "freertos/FreeRTOS.h"
+#define MICROPY_BEGIN_ATOMIC_SECTION() portSET_INTERRUPT_MASK_FROM_ISR()
+#define MICROPY_END_ATOMIC_SECTION(state) portCLEAR_INTERRUPT_MASK_FROM_ISR(state)
+
 uint32_t mp_hal_ticks_us(void);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
     uint32_t ccount;
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index b0351877e8cfd..73a36a4b65fce 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -29,6 +29,9 @@
 #include "shared/runtime/interrupt_char.h"
 #include "xtirq.h"
 
+#define MICROPY_BEGIN_ATOMIC_SECTION() esp_disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state) esp_enable_irq(state)
+
 void mp_sched_keyboard_interrupt(void);
 
 struct _mp_print_t;
@@ -66,6 +69,9 @@ uint32_t mp_hal_get_cpu_freq(void);
 void uart_task_init();
 void dupterm_task_init();
 
+uint32_t esp_disable_irq(void);
+void esp_enable_irq(uint32_t state);
+
 void ets_event_poll(void);
 #define ETS_POLL_WHILE(cond) { while (cond) ets_event_poll(); }
 
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index ad9fefe0cd31b..07586a0ea5a95 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -127,9 +127,6 @@
 #define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
 #define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
 
-#define MICROPY_BEGIN_ATOMIC_SECTION() esp_disable_irq()
-#define MICROPY_END_ATOMIC_SECTION(state) esp_enable_irq(state)
-
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
@@ -173,6 +170,3 @@ extern const struct _mp_print_t mp_debug_print;
 #define WDEV_HWRNG ((volatile uint32_t *)0x3ff20e44)
 
 #define _assert(expr) ((expr) ? (void)0 : __assert_func(__FILE__, __LINE__, __func__, #expr))
-
-uint32_t esp_disable_irq(void);
-void esp_enable_irq(uint32_t state);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 51f057ca823bb..5feb5b62b80da 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -151,30 +151,8 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-mimxrt"
 #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 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);
-
 // 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();
-    __disable_irq();
-    return state;
-}
-
-#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
-#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
-
 #if defined(IOMUX_TABLE_ENET)
 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/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 36eb387798133..c4e5b052c9d00 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -36,6 +36,18 @@
 
 #define MICROPY_HAL_VERSION             "2.8.0"
 
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+
+// 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 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);
+
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT   (500)
 
 #define MP_HAL_PIN_FMT                  "%q"
@@ -82,6 +94,16 @@ extern ringbuf_t stdin_ringbuf;
 #define mp_hal_quiet_timing_enter() raise_irq_pri(1)
 #define mp_hal_quiet_timing_exit(irq_state) restore_irq_pri(irq_state)
 
+__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;
+}
+
 void mp_hal_set_interrupt_char(int c);
 
 static inline mp_uint_t mp_hal_ticks_ms(void) {
diff --git a/ports/renesas-ra/irq.h b/ports/renesas-ra/irq.h
index 076247953e2fd..0c46caea0c9a8 100644
--- a/ports/renesas-ra/irq.h
+++ b/ports/renesas-ra/irq.h
@@ -54,11 +54,26 @@ extern uint32_t irq_stats[IRQ_STATS_MAX];
 #define IRQ_EXIT(irq)
 #endif
 
+// 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.
+
 static inline uint32_t query_irq(void) {
     return __get_PRIMASK();
 }
 
-// enable_irq and disable_irq are defined inline in mpconfigport.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;
+}
 
 #if __CORTEX_M >= 0x03
 
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 99286fa530079..63537fa5abc32 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -250,27 +250,6 @@ typedef unsigned int mp_uint_t; // must be pointer size
 
 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_HW_ENABLE_USBDEV
 #define MICROPY_HW_USBDEV_TASK_HOOK extern void mp_usbd_task(void); mp_usbd_task();
 #define MICROPY_VM_HOOK_COUNT (10)
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index e29a7fec7b815..b8441e37676cd 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -29,6 +29,9 @@
 #include "pin.h"
 #include "py/ringbuf.h"
 
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+
 #define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV)
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state)
 
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index 94d49489c09b2..7ccbcb40cb673 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "drivers/dht/dht.h"
 #include "modrp2.h"
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 6942d26714e99..5ff384c923b47 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -244,12 +244,6 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_BOOTSEL_DELAY_US 8
 #endif
 
-// 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();
 #define MICROPY_PY_LWIP_REENTER lwip_lock_acquire();
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index b8133c783e28f..9feace2f43ae2 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -36,12 +36,19 @@
 #define SYSTICK_MAX (0xffffff)
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
+// Entering a critical section.
+#define MICROPY_BEGIN_ATOMIC_SECTION()     mp_thread_begin_atomic_section()
+#define MICROPY_END_ATOMIC_SECTION(state)  mp_thread_end_atomic_section(state)
+
 #define MICROPY_PY_PENDSV_ENTER   pendsv_suspend()
 #define MICROPY_PY_PENDSV_EXIT    pendsv_resume()
 
 extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
+uint32_t mp_thread_begin_atomic_section(void);
+void mp_thread_end_atomic_section(uint32_t);
+
 void mp_hal_set_interrupt_char(int c);
 void mp_hal_time_ns_set_from_rtc(void);
 
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index ed9e338da71d7..968de1f782e69 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/gc.h"
+#include "py/mphal.h"
 #include "py/mpthread.h"
 #include "pico/stdlib.h"
 #include "pico/multicore.h"
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 26ec41949e9d8..bc284cd976020 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "extmod/vfs.h"
 #include "modrp2.h"
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 72cbb7d20844a..21c29be24e3ae 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -177,18 +177,6 @@
 #endif  // !defined(MICROPY_HW_MCUFLASH) ....
 
 // 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 { \
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index ee33e74462868..48f047066d43e 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -35,6 +35,9 @@
 #include "hpl_time_measure.h"
 #include "sam.h"
 
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+
 #define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV)
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state)
 
@@ -46,6 +49,16 @@ uint64_t mp_hal_ticks_us_64(void);
 
 void mp_hal_set_interrupt_char(int c);
 
+__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 mp_hal_delay_us_fast  mp_hal_delay_us
 
 static inline uint64_t mp_hal_ticks_ms_64(void) {
diff --git a/ports/stm32/irq.h b/ports/stm32/irq.h
index 7f10d0d004604..e3a204ec96a32 100644
--- a/ports/stm32/irq.h
+++ b/ports/stm32/irq.h
@@ -52,11 +52,26 @@ extern uint32_t irq_stats[IRQ_STATS_MAX];
 #define IRQ_EXIT(irq)
 #endif
 
+// 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.
+
 static inline uint32_t query_irq(void) {
     return __get_PRIMASK();
 }
 
-// enable_irq and disable_irq are defined inline in mpconfigport.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;
+}
 
 #if __CORTEX_M >= 0x03
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index e11e7210304a7..21fab6ffd658f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -239,27 +239,6 @@ typedef unsigned int mp_uint_t; // must be pointer size
 
 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 { \
@@ -289,12 +268,6 @@ static inline mp_uint_t disable_irq(void) {
 // Configuration for shared/runtime/softtimer.c.
 #define MICROPY_SOFT_TIMER_TICKS_MS uwTick
 
-// 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);
-
 // Prevent the "LWIP task" from running.
 #define MICROPY_PY_LWIP_ENTER   MICROPY_PY_PENDSV_ENTER
 #define MICROPY_PY_LWIP_REENTER MICROPY_PY_PENDSV_REENTER
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 410aa5a8deeb9..4983970876f73 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -40,10 +40,21 @@ static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 
-// timing functions
+// Atomic section helpers.
 
 #include "irq.h"
 
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(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);
+
+// Timing functions.
+
 #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)
diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index b3e2aec2d8078..e260b502199c0 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_STM32_MPU_H
 #define MICROPY_INCLUDED_STM32_MPU_H
 
+#include "irq.h"
+
 #if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
 
 #define MPU_REGION_ETH      (MPU_REGION_NUMBER0)
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index dfb99d51b1161..e7ce534a71e04 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -221,12 +221,6 @@ static inline unsigned long mp_random_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 \
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index 724fc8af5f28f..ca951e5001012 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -30,6 +30,12 @@
 #define CHAR_CTRL_C (3)
 #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
+
 void mp_hal_set_interrupt_char(char c);
 
 #define mp_hal_stdio_poll unused // this is not implemented, nor needed
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 918f0fb15a00b..94f4cc33d65d1 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -139,6 +139,3 @@ 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) },
-
-#define MICROPY_BEGIN_ATOMIC_SECTION irq_lock
-#define MICROPY_END_ATOMIC_SECTION irq_unlock
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index 615859391167a..0d086ac299e99 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,6 +1,9 @@
 #include <zephyr/zephyr.h>
 #include "shared/runtime/interrupt_char.h"
 
+#define MICROPY_BEGIN_ATOMIC_SECTION irq_lock
+#define MICROPY_END_ATOMIC_SECTION irq_unlock
+
 void mp_hal_init(void);
 void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms);
 

From 20ffbe1a414338c67cb531291aff647d001e878f Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Thu, 30 Nov 2023 18:25:44 +0000
Subject: [PATCH 0618/3129] unix/mbedtls: Enable mbedtls cert time validation.

To match other ports.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 ports/unix/mbedtls/mbedtls_config.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h
index 629064abcf297..f76a9cbf72de1 100644
--- a/ports/unix/mbedtls/mbedtls_config.h
+++ b/ports/unix/mbedtls/mbedtls_config.h
@@ -29,6 +29,10 @@
 // Set mbedtls configuration
 #define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_CRYPTOLIB_CTR
 
+// Cert time validation
+#define MBEDTLS_HAVE_TIME
+#define MBEDTLS_HAVE_TIME_DATE
+
 // Enable mbedtls modules
 #define MBEDTLS_HAVEGE_C
 #define MBEDTLS_TIMING_C

From b5449b0f095a2232f38ca7842614dcfda83ffc26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Dec 2023 13:43:52 +1100
Subject: [PATCH 0619/3129] extmod/mbedtls: Enable certificate time/date
 validation by default.

All ports using this common configuration already enable time/date
validation, so this commit is a no-op change.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/mbedtls/mbedtls_config_common.h    | 2 ++
 ports/mimxrt/mbedtls/mbedtls_config.h     | 4 ----
 ports/renesas-ra/mbedtls/mbedtls_config.h | 4 ----
 ports/rp2/mbedtls/mbedtls_config.h        | 2 --
 ports/stm32/mbedtls/mbedtls_config.h      | 4 ----
 ports/unix/mbedtls/mbedtls_config.h       | 4 ----
 6 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index bfbc6f7ba298f..95458f18daa31 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -31,6 +31,8 @@
 // #define MBEDTLS_DEBUG_C
 
 // Set mbedtls configuration.
+#define MBEDTLS_HAVE_TIME
+#define MBEDTLS_HAVE_TIME_DATE
 #define MBEDTLS_DEPRECATED_REMOVED
 #define MBEDTLS_AES_ROM_TABLES
 #define MBEDTLS_CIPHER_MODE_CBC
diff --git a/ports/mimxrt/mbedtls/mbedtls_config.h b/ports/mimxrt/mbedtls/mbedtls_config.h
index 440498757085f..f264ed4ad2eb0 100644
--- a/ports/mimxrt/mbedtls/mbedtls_config.h
+++ b/ports/mimxrt/mbedtls/mbedtls_config.h
@@ -26,10 +26,6 @@
 #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 mimxrt_rtctime_seconds(time_t *timer);
diff --git a/ports/renesas-ra/mbedtls/mbedtls_config.h b/ports/renesas-ra/mbedtls/mbedtls_config.h
index 006f5660fdb57..f036f536c2ad3 100644
--- a/ports/renesas-ra/mbedtls/mbedtls_config.h
+++ b/ports/renesas-ra/mbedtls/mbedtls_config.h
@@ -26,10 +26,6 @@
 #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 ra_rtctime_seconds(time_t *timer);
diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
index 1b6d3dd43a653..81be6c111b8dd 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -32,8 +32,6 @@
 
 // Enable mbedtls modules
 #define MBEDTLS_GCM_C
-#define MBEDTLS_HAVE_TIME
-#define MBEDTLS_HAVE_TIME_DATE
 
 // Time hook
 #include <time.h>
diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index bdac073399849..336fee0a199c0 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -26,10 +26,6 @@
 #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);
diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h
index f76a9cbf72de1..629064abcf297 100644
--- a/ports/unix/mbedtls/mbedtls_config.h
+++ b/ports/unix/mbedtls/mbedtls_config.h
@@ -29,10 +29,6 @@
 // Set mbedtls configuration
 #define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_CRYPTOLIB_CTR
 
-// Cert time validation
-#define MBEDTLS_HAVE_TIME
-#define MBEDTLS_HAVE_TIME_DATE
-
 // Enable mbedtls modules
 #define MBEDTLS_HAVEGE_C
 #define MBEDTLS_TIMING_C

From 30b0ee34d3a7cf6f967387e783268c8a939e04c8 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Thu, 30 Nov 2023 18:42:07 +0000
Subject: [PATCH 0620/3129] esp32: Enable mbedtls cert time validation.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 ports/esp32/boards/sdkconfig.base |  3 +++
 ports/esp32/main.c                | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 2a7c9a1c5b8ce..bfc8c6610e225 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -59,6 +59,9 @@ CONFIG_LWIP_PPP_CHAP_SUPPORT=y
 # SSL
 # Use 4kiB output buffer instead of default 16kiB
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+CONFIG_MBEDTLS_HAVE_TIME_DATE=y
+CONFIG_MBEDTLS_PLATFORM_TIME_ALT=y
+CONFIG_MBEDTLS_HAVE_TIME=y
 
 # Disable ALPN support as it's not implemented in MicroPython
 CONFIG_MBEDTLS_SSL_ALPN=n
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 044b43655c66b..8e5675c94179a 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -29,6 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <sys/time.h>
+#include <time.h>
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -49,6 +51,9 @@
 #include "py/mphal.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/timeutils/timeutils.h"
+#include "mbedtls/platform_time.h"
+
 #include "uart.h"
 #include "usb.h"
 #include "usb_serial_jtag.h"
@@ -83,6 +88,15 @@ int vprintf_null(const char *format, va_list ap) {
     return 0;
 }
 
+time_t platform_mbedtls_time(time_t *timer) {
+    // mbedtls_time requires time in seconds from EPOCH 1970
+
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+
+    return tv.tv_sec + TIMEUTILS_SECONDS_1970_TO_2000;
+}
+
 void mp_task(void *pvParameter) {
     volatile uint32_t sp = (uint32_t)esp_cpu_get_sp();
     #if MICROPY_PY_THREAD
@@ -98,6 +112,9 @@ void mp_task(void *pvParameter) {
     #endif
     machine_init();
 
+    // Configure time function, for mbedtls certificate time validation.
+    mbedtls_platform_set_time(platform_mbedtls_time);
+
     esp_err_t err = esp_event_loop_create_default();
     if (err != ESP_OK) {
         ESP_LOGE("esp_init", "can't create event loop: 0x%x\n", err);

From d422b68d1099fb88c8bcd6a78bbd66924422112c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Dec 2023 22:17:18 +1100
Subject: [PATCH 0621/3129] nrf/mpconfigport: Enable
 MICROPY_PY_MACHINE_BOOTLOADER.

This should have been enabled in 48b5a7b06079f0d0aa4780016f015ff023875680
but was missed.

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

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 3ab1e0814f875..f3c08059a06eb 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -175,6 +175,7 @@
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/nrf/modules/machine/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
+#define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
 #define MICROPY_PY_MACHINE_SOFTI2C  (MICROPY_PY_MACHINE_I2C)
 

From 20af857f52f733548c6ab4d8615f2d1f8f207ac3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Dec 2023 22:18:14 +1100
Subject: [PATCH 0622/3129] nrf/boards/ARDUINO_NANO_33_BLE_SENSE: Don't enable
 MICROPY_MBFS.

This board has MICROPY_VFS enabled, which should take precedence over
MICROPY_MBFS (and did prior to 22d9116c8c53463805dcd30fbeb78fbfa84c0e98).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h | 2 --
 1 file changed, 2 deletions(-)

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 69d715f18b70c..9b26b358da1b1 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
@@ -7,8 +7,6 @@
 #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()

From f3889db265ea50fef35596a4bd49f15661590093 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Dec 2023 22:19:35 +1100
Subject: [PATCH 0623/3129] stm32/usbd_cdc_interface: Include header to get
 machine_bootloader decl.

This was broken by commit 48b5a7b06079f0d0aa4780016f015ff023875680.

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

diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index f25dcc380a6ee..20d8b3036dc1f 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -44,9 +44,9 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "shared/runtime/interrupt_char.h"
 #include "irq.h"
-#include "modmachine.h"
 
 #if MICROPY_HW_ENABLE_USB
 

From 58112fc49a23de08e40dab578e23188f65089763 Mon Sep 17 00:00:00 2001
From: MikeTeachman <mike.teachman@gmail.com>
Date: Sat, 28 Jan 2023 19:16:39 -0800
Subject: [PATCH 0624/3129] stm32/machine_i2s: Improve accuracy of SCK
 frequency.

Configures the I2S PLL to produce a frequency that the I2S clock generator
can use to create an optimal SCK frequency.  The I2S PLL configuration
table is automatically generated at build time.

Fixes issue #10280.

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 ports/stm32/Makefile               |   7 +
 ports/stm32/boards/plli2svalues.py | 213 +++++++++++++++++++++++++++++
 ports/stm32/machine_i2s.c          |  48 ++++++-
 3 files changed, 265 insertions(+), 3 deletions(-)
 create mode 100644 ports/stm32/boards/plli2svalues.py

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 0bae26f2f139d..a1449e7181ace 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -65,6 +65,7 @@ OPENOCD_CONFIG ?= boards/openocd_stm32f4.cfg
 include stm32.mk
 
 PLLVALUES = boards/pllvalues.py
+PLLI2SVALUES = boards/plli2svalues.py
 MAKE_PINS = boards/make-pins.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
 PREFIX_FILE = boards/stm32f4xx_prefix.c
@@ -82,6 +83,7 @@ GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
 GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
 
 GEN_PLLFREQTABLE_HDR = $(HEADER_BUILD)/pllfreqtable.h
+GEN_PLLI2STABLE_HDR = $(HEADER_BUILD)/plli2stable.h
 GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.h
 GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h
 CMSIS_MCU_HDR = $(STM32LIB_CMSIS_ABS)/Include/$(CMSIS_MCU_LOWER).h
@@ -681,6 +683,11 @@ $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PLLVALUES) -c -m $(CMSIS_MCU_LOWER) file:$(BOARD_DIR)/stm32$(MCU_SERIES)xx_hal_conf.h > $@
 
+$(TOP)/extmod/machine_i2s.c: $(GEN_PLLI2STABLE_HDR)
+$(GEN_PLLI2STABLE_HDR): $(PLLI2SVALUES) | $(HEADER_BUILD)
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PLLI2SVALUES) -c -m $(CMSIS_MCU_LOWER) hse:$(BOARD_DIR)/stm32$(MCU_SERIES)xx_hal_conf.h pllm:$(BOARD_DIR)/mpconfigboard.h > $@
+
 $(BUILD)/modstm.o: $(GEN_STMCONST_HDR)
 $(HEADER_BUILD)/modstm_const.h: $(CMSIS_MCU_HDR) make-stmconst.py | $(HEADER_BUILD)
 	$(ECHO) "GEN stmconst $@"
diff --git a/ports/stm32/boards/plli2svalues.py b/ports/stm32/boards/plli2svalues.py
new file mode 100644
index 0000000000000..8ff7f0ff8fcdf
--- /dev/null
+++ b/ports/stm32/boards/plli2svalues.py
@@ -0,0 +1,213 @@
+"""
+This program computes I2S PLL parameters for STM32
+processors supporting an I2S PLL in the clock tree.
+Those processors are listed below in the mcu_support_plli2s[] list.
+"""
+
+import re
+from collections import namedtuple
+
+
+class MCU:
+    def __init__(self, range_plli2sn, range_plli2sr):
+        self.range_plli2sn = range_plli2sn
+        self.range_plli2sr = range_plli2sr
+
+
+mcu_default = MCU(range_plli2sn=range(50, 432 + 1), range_plli2sr=range(2, 7 + 1))
+
+mcu_table = {"stm32f401xe": MCU(range_plli2sn=range(192, 432 + 1), range_plli2sr=range(2, 7 + 1))}
+
+# list of stm32 processors that support an I2S PLL in the clock tree
+mcu_support_plli2s = [
+    "stm32f405xx",
+    "stm32f401xe",
+    "stm32f407xx",
+    "stm32f411xe",
+    "stm32f412zx",
+    "stm32f413xx",
+    "stm32f427xx",
+    "stm32f429xx",
+    "stm32f439xx",
+    "stm32f446xx",
+    "stm32f722xx",
+    "stm32f733xx",
+    "stm32f746xx",
+    "stm32f756xx",
+    "stm32f767xx",
+    "stm32f769xx",
+]
+
+
+# The following function calculates the multiplier (plli2sn) and divider (plli2sr) parameters
+# for the I2S PLL that leads to the best possible accuracy for the I2S sampling clock.
+# This is done by creating a set of candidate parameters (plli2sn, plli2sr)
+# and then determining which candidate parameters lead to a sampling clock frequency (Fs)
+# that most closely matches the desired sampling clock frequency (I2S rate).
+#
+# A description of the clock tree helps to understand this function:
+# The clock tree on a STM32 device is complex.  A subset of the clock tree is used for I2S, as follows:
+# 1. HSE clock is divided by the PLLM divider and feeds the I2S PLL (called PLLI2S in the STM32 clock tree).
+# 2. The output frequency of the I2S PLL is controlled by two parameters, plli2sn and plli2sr.
+# 3. The clock output of the I2S PLL is called PLLI2SCLK
+# 4. PLLI2SCLK is gated into the I2S peripheral, where the name changes to I2SxCLK
+# 5. I2SxCLK is an input to the I2S clock generator.
+# 6. The output frequency of the I2S clock generator is controlled by
+#    two configuration parameters, I2SDIV and ODD.
+# 7. The output of the I2S clock generator is the audio sampling frequency (Fs),
+#    which is used to create the signal at the I2S WS output pin.
+#
+# Example references:
+#    RM0090 Reference manual STM32F405/415, STM32F407/417, STM32F427/437 and STM32F429/439
+#    - section 6.3.23 RCC PLLI2S configuration register (RCC_PLLI2SCFGR)
+#    - section 28.4.4 Clock generator
+#    RM0385 Reference manual STM32F75xxx and STM32F74xxx
+#    - section 5.3.23 RCC PLLI2S configuration register (RCC_PLLI2SCFGR)
+#    - section 32.7.5 Clock generator
+#
+# The calculations below mimic the fixed-point integer calculations in the STM32 I2S driver,
+# in the function HAL_I2S_Init().
+def compute_plli2s_table(hse, pllm):
+    plli2s = namedtuple("plli2s", "bits rate plli2sn plli2sr i2sdiv odd error")
+    plli2s_table = []
+    for bits in (16, 32):
+        for rate in (8_000, 11_025, 12_000, 16_000, 22_050, 24_000, 32_000, 44_100, 48_000):
+            plli2s_candidates = []
+            for plli2sn in mcu.range_plli2sn:
+                for plli2sr in mcu.range_plli2sr:
+                    I2SxCLK = hse // pllm * plli2sn // plli2sr
+                    if I2SxCLK < 192_000_000:
+                        # compute I2S clock generator parameters: i2sdiv, odd
+                        tmp = (((I2SxCLK // (bits * 2)) * 10) // rate) + 5
+                        tmp = tmp // 10
+                        odd = tmp & 1
+                        i2sdiv = (tmp - odd) // 2
+                        Fs = I2SxCLK / ((bits * 2) * ((2 * i2sdiv) + odd))
+                        error = (abs(Fs - rate) / rate) * 100
+                        plli2s_candidates.append(
+                            plli2s(
+                                bits=bits,
+                                rate=rate,
+                                plli2sn=plli2sn,
+                                plli2sr=plli2sr,
+                                i2sdiv=i2sdiv,
+                                odd=odd,
+                                error=error,
+                            )
+                        )
+            # sort based on error
+            plli2s_candidates_sorted = sorted(plli2s_candidates, key=lambda x: x.error)
+            # select the best candidate
+            plli2s_table.append(plli2s_candidates_sorted[0])
+    return plli2s_table
+
+
+def generate_c_table(plli2s_table, hse, pllm):
+    print("// MAKE generated file, created by plli2svalues.py: DO NOT EDIT")
+    print("// This table is used in machine_i2s.c")
+    print(f"// HSE_VALUE = {hse}")
+    print(f"// MICROPY_HW_CLK_PLLM = {pllm} \n")
+    print("#define PLLI2S_TABLE \\")
+    print("{ \\")
+
+    for plli2s in plli2s_table:
+        print(
+            f"    {{{plli2s.rate}, "
+            f"{plli2s.bits}, "
+            f"{plli2s.plli2sr}, "
+            f"{plli2s.plli2sn} }}, "
+            f"/* i2sdiv: {int(plli2s.i2sdiv)}, "
+            f"odd: {plli2s.odd}, "
+            f"rate error % (desired vs actual)%: {plli2s.error:.4f} */ \\"
+        )
+    print("}")
+
+
+def search_header(filename, re_include, re_define, lookup, val):
+    regex_include = re.compile(re_include)
+    regex_define = re.compile(re_define)
+    with open(filename) as f:
+        for line in f:
+            line = line.strip()
+            m = regex_include.match(line)
+            if m:
+                # Search included file
+                search_header(m.group(1), re_include, re_define, lookup, val)
+                continue
+            m = regex_define.match(line)
+            if m:
+                # found lookup value
+                if m.group(1) == lookup:
+                    val[0] = int(m.group(3))
+    return val
+
+
+def main():
+    global mcu
+
+    # parse input args
+    import sys
+
+    argv = sys.argv[1:]
+
+    c_table = False
+    mcu_series = "stm32f4"
+    hse = None
+    pllm = None
+
+    while True:
+        if argv[0] == "-c":
+            c_table = True
+            argv.pop(0)
+        elif argv[0] == "-m":
+            argv.pop(0)
+            mcu_series = argv.pop(0).lower()
+        else:
+            break
+
+    if mcu_series in mcu_support_plli2s:
+        if len(argv) != 2:
+            print("usage: pllvalues.py [-c] [-m <mcu_series>] <hse in MHz> <pllm in MHz>")
+            sys.exit(1)
+
+        if argv[0].startswith("hse:"):
+            # extract HSE_VALUE from header file
+            (hse,) = search_header(
+                argv[0][len("hse:") :],
+                r'#include "(boards/[A-Za-z0-9_./]+)"',
+                r"#define +(HSE_VALUE) +\((\(uint32_t\))?([0-9]+)\)",
+                "HSE_VALUE",
+                [None],
+            )
+            if hse is None:
+                raise ValueError("%s does not contain a definition of HSE_VALUE" % argv[0])
+            argv.pop(0)
+
+        if argv[0].startswith("pllm:"):
+            # extract MICROPY_HW_CLK_PLLM from header file
+            (pllm,) = search_header(
+                argv[0][len("pllm:") :],
+                r'#include "(boards/[A-Za-z0-9_./]+)"',
+                r"#define +(MICROPY_HW_CLK_PLLM) +\((\(uint32_t\))?([0-9]+)\)",
+                "MICROPY_HW_CLK_PLLM",
+                [None],
+            )
+            if pllm is None:
+                raise ValueError(
+                    "%s does not contain a definition of MICROPY_HW_CLK_PLLM" % argv[0]
+                )
+            argv.pop(0)
+
+        # Select MCU parameters
+        mcu = mcu_default
+        for m in mcu_table:
+            if mcu_series.startswith(m):
+                mcu = mcu_table[m]
+                break
+        plli2s_table = compute_plli2s_table(hse, pllm)
+        if c_table:
+            generate_c_table(plli2s_table, hse, pllm)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index b3e1cee34f324..dbee81bb395a6 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -33,6 +33,7 @@
 #include "py/mphal.h"
 #include "pin.h"
 #include "dma.h"
+#include "genhdr/plli2stable.h"
 
 // Notes on this port's specific implementation of I2S:
 // - the DMA callbacks (1/2 complete and complete) are used to implement the asynchronous background operations
@@ -61,6 +62,13 @@ typedef enum {
     BOTTOM_HALF
 } ping_pong_t;
 
+typedef struct _plli2s_config_t {
+    uint32_t rate;
+    uint8_t bits;
+    uint8_t plli2sr;
+    uint16_t plli2sn;
+} plli2s_config_t;
+
 typedef struct _machine_i2s_obj_t {
     mp_obj_base_t base;
     uint8_t i2s_id;
@@ -98,12 +106,26 @@ 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 const plli2s_config_t plli2s_config[] = PLLI2S_TABLE;
+
 void machine_i2s_init0() {
     for (uint8_t i = 0; i < MICROPY_HW_MAX_I2S; i++) {
         MP_STATE_PORT(machine_i2s_obj)[i] = NULL;
     }
 }
 
+STATIC bool lookup_plli2s_config(int8_t bits, int32_t rate, uint16_t *plli2sn, uint16_t *plli2sr) {
+    for (uint16_t i = 0; i < MP_ARRAY_SIZE(plli2s_config); i++) {
+        if ((plli2s_config[i].bits == bits) && (plli2s_config[i].rate == rate)) {
+            *plli2sn = plli2s_config[i].plli2sn;
+            *plli2sr = plli2s_config[i].plli2sr;
+            return true;
+        }
+    }
+
+    return false;
+}
+
 //  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
@@ -294,6 +316,29 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
         HAL_GPIO_Init(self->sd->gpio, &GPIO_InitStructure);
     }
 
+    // configure I2S PLL
+    RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_I2S;
+
+    // lookup optimal PLL multiplier (PLLI2SN) and divisor (PLLI2SR) for a given sample size and sampling frequency
+    uint16_t plli2sn;
+    uint16_t plli2sr;
+
+    if (lookup_plli2s_config(self->mode == I2S_MODE_MASTER_RX ? 32 : self->bits, self->rate, &plli2sn, &plli2sr)) {
+        // match found
+        PeriphClkInitStruct.PLLI2S.PLLI2SN = plli2sn;
+        PeriphClkInitStruct.PLLI2S.PLLI2SR = plli2sr;
+    } else {
+        // no match for sample size and rate
+        // configure PLL to use power-on default values when a non-standard sampling frequency is used
+        PeriphClkInitStruct.PLLI2S.PLLI2SN = 192;
+        PeriphClkInitStruct.PLLI2S.PLLI2SR = 2;
+    }
+
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
+        return false;
+    }
+
     if (HAL_I2S_Init(&self->hi2s) == HAL_OK) {
         // Reset and initialize Tx and Rx DMA channels
         if (self->mode == I2S_MODE_MASTER_RX) {
@@ -306,13 +351,10 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
             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) {

From 9f620d28193709a5002a6f439b7495c9c3451792 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 29 Nov 2023 14:26:12 +1100
Subject: [PATCH 0625/3129] github/workflows: Cache ESP-IDF checkout and
 installation.

Cache is keyed on the ESP-IDF version used in CI, so there shouldn't be any
cache invalidation issues when ESP-IDF version changes.

Restoring from cache takes approx 15s, compared to 2-3m to perform these
steps (ESP-IDF tools install, ESP-IDF clone, ESP-IDF submodule clone) the
first time.

Cache size is approx 1.6GB, the git clone is tweaked as much as possible to
keep the size down.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_esp32.yml | 22 ++++++++++++++++++++--
 tools/ci.sh                       | 11 ++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 9403aa656ba6b..117ae897aa2ed 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -22,7 +22,25 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
-    - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf50_setup
+
+    - id: idf_ver
+      name: Read the ESP-IDF version
+      run: source tools/ci.sh && echo "IDF_VER=$IDF_VER" | tee "$GITHUB_OUTPUT"
+
+    - name: Cached ESP-IDF install
+      id: cache_esp_idf
+      uses: actions/cache@v3
+      with:
+        path: |
+          ./esp-idf/
+          ~/.espressif/
+          !~/.espressif/dist/
+          ~/.cache/pip/
+        key: esp-idf-${{ steps.idf_ver.outputs.IDF_VER }}
+
+    - name: Install ESP-IDF packages
+      if: steps.cache_esp_idf.outputs.cache-hit != 'true'
+      run: source tools/ci.sh && ci_esp32_idf_setup
+
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 8dcbbf776513f..34260334d86d2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -118,10 +118,15 @@ function ci_cc3200_build {
 ########################################################################################
 # ports/esp32
 
-function ci_esp32_idf50_setup {
+# GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
+IDF_VER=v5.0.2
+
+function ci_esp32_idf_setup {
     pip3 install pyelftools
-    git clone https://github.com/espressif/esp-idf.git
-    git -C esp-idf checkout v5.0.2
+    git clone --depth 1 --branch $IDF_VER https://github.com/espressif/esp-idf.git
+    # doing a treeless clone isn't quite as good as --shallow-submodules, but it
+    # is smaller than full clones and works when the submodule commit isn't a head.
+    git -C esp-idf submodule update --init --recursive --filter=tree:0
     ./esp-idf/install.sh
 }
 

From b6df8f84526bc1d32b419c1e4f706a9ec699957f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 29 Nov 2023 15:39:10 +1100
Subject: [PATCH 0626/3129] github/workflows: Use build matrix for esp32 port.

Allows splitting the esp32 job into multiple parts without too much
boilerplate.  The matrix is parameterised using the name of the function to
call in tools/ci.sh, to minimise the dependency on GitHub Actions.

This can get esp32 build times down around 3m if IDF is cached already.

If the cache is cold, the cache preparation step on each job can double up
against each other.  However, restructuring the workflow to not do this
seems either complex or requires copy-pasting the entire cache step.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_esp32.yml | 12 +++++++++---
 tools/ci.sh                       | 19 +++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 117ae897aa2ed..9c8a8998a2405 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -18,7 +18,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_idf50:
+  build_idf:
+    strategy:
+      fail-fast: false
+      matrix:
+        ci_func:  # names are functions in ci.sh
+          - esp32_build_cmod_s2
+          - esp32_build_s3_c3
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
@@ -42,5 +48,5 @@ jobs:
       if: steps.cache_esp_idf.outputs.cache-hit != 'true'
       run: source tools/ci.sh && ci_esp32_idf_setup
 
-    - name: Build
-      run: source tools/ci.sh && ci_esp32_build
+    - name: Build ci_${{matrix.ci_func }}
+      run: source tools/ci.sh && ci_${{ matrix.ci_func }}
diff --git a/tools/ci.sh b/tools/ci.sh
index 34260334d86d2..23fa389094495 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -130,19 +130,30 @@ function ci_esp32_idf_setup {
     ./esp-idf/install.sh
 }
 
-function ci_esp32_build {
+function ci_esp32_build_common {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/esp32 submodules
+}
+
+function ci_esp32_build_cmod_s2 {
+    ci_esp32_build_common
+
     make ${MAKEOPTS} -C ports/esp32 \
         USER_C_MODULES=../../../examples/usercmodule/micropython.cmake \
         FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest_test.py
-    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C3
-    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2
-    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S3
 
     # Test building native .mpy with xtensawin architecture.
     ci_native_mpy_modules_build xtensawin
+
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2
+}
+
+function ci_esp32_build_s3_c3 {
+    ci_esp32_build_common
+
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S3
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C3
 }
 
 ########################################################################################

From 731a1f523374b392b4f7dae0dd6c8505c8a4ac58 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Dec 2023 11:17:44 +1100
Subject: [PATCH 0627/3129] github/workflows: Enable build matrix for stm32
 port.

This is for consistency with the previous commit that uses this approach
for esp32.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_stm32.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index 0b781a93c1892..84d30b27f6e66 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -18,20 +18,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_pyb:
+  build_stm32:
+    strategy:
+      fail-fast: false
+      matrix:
+        ci_func:  # names are functions in ci.sh
+          - stm32_pyb_build
+          - stm32_nucleo_build
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_stm32_setup
-    - name: Build
-      run: source tools/ci.sh && ci_stm32_pyb_build
+    - name: Build ci_${{matrix.ci_func }}
+      run: source tools/ci.sh && ci_${{ matrix.ci_func }}
 
-  build_nucleo:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install packages
-      run: source tools/ci.sh && ci_stm32_setup
-    - name: Build
-      run: source tools/ci.sh && ci_stm32_nucleo_build

From 527c4b0497249f8716a0130ad729b3a833e64ec2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 29 Nov 2023 16:43:28 +1100
Subject: [PATCH 0628/3129] github/workflows: Enable ccache for esp32 build.

CCaches are scoped per-job.

Uses https://github.com/hendrikmuhs/ccache-action to get desired behaviour
(updating the cache on each run).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_esp32.yml | 5 +++++
 tools/ci.sh                       | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 9c8a8998a2405..c1eedf18a9406 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -48,5 +48,10 @@ jobs:
       if: steps.cache_esp_idf.outputs.cache-hit != 'true'
       run: source tools/ci.sh && ci_esp32_idf_setup
 
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        key: esp32-${{ matrix.ci_func }}
+
     - name: Build ci_${{matrix.ci_func }}
       run: source tools/ci.sh && ci_${{ matrix.ci_func }}
diff --git a/tools/ci.sh b/tools/ci.sh
index 23fa389094495..60cd0be6c5cf5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -121,6 +121,8 @@ function ci_cc3200_build {
 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
 IDF_VER=v5.0.2
 
+export IDF_CCACHE_ENABLE=1
+
 function ci_esp32_idf_setup {
     pip3 install pyelftools
     git clone --depth 1 --branch $IDF_VER https://github.com/espressif/esp-idf.git

From 69089a532e7639fb25c429bfa7d89543277459b2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Dec 2023 10:32:27 +1100
Subject: [PATCH 0629/3129] esp32/boards: Enable further IRAM saving opts to
 fit ESP32-SPIRAM fw.

The amount of free IRAM in ESP32 SPIRAM builds is very small and went over
the limit due to commit 30b0ee34d3a7cf6f967387e783268c8a939e04c8.  This
commit enables further optimisations to reduce IRAM usage.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.spiram | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.spiram b/ports/esp32/boards/sdkconfig.spiram
index 4dfc63624bab5..f5503d554149c 100644
--- a/ports/esp32/boards/sdkconfig.spiram
+++ b/ports/esp32/boards/sdkconfig.spiram
@@ -12,4 +12,7 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192
 # SPIRAM increases the size of the firmware and overflows iram0_0_seg, due
 # to PSRAM bug workarounds.  Apply some options to reduce the firmware size.
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y

From d3595fed2b9c6cb183425963e3181c193c53b7a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Dec 2023 10:34:20 +1100
Subject: [PATCH 0630/3129] tools/ci.sh: Build ESP32_GENERIC-SPIRAM as part of
 esp32 CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 2 +-
 tools/ci.sh                       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index c1eedf18a9406..6872b9d12de78 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         ci_func:  # names are functions in ci.sh
-          - esp32_build_cmod_s2
+          - esp32_build_cmod_spiram_s2
           - esp32_build_s3_c3
     runs-on: ubuntu-20.04
     steps:
diff --git a/tools/ci.sh b/tools/ci.sh
index 60cd0be6c5cf5..b71862273d145 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -138,7 +138,7 @@ function ci_esp32_build_common {
     make ${MAKEOPTS} -C ports/esp32 submodules
 }
 
-function ci_esp32_build_cmod_s2 {
+function ci_esp32_build_cmod_spiram_s2 {
     ci_esp32_build_common
 
     make ${MAKEOPTS} -C ports/esp32 \
@@ -148,6 +148,7 @@ function ci_esp32_build_cmod_s2 {
     # Test building native .mpy with xtensawin architecture.
     ci_native_mpy_modules_build xtensawin
 
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM
     make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2
 }
 

From 78b3fe56897d029f2786256d83dd2fecacb34637 Mon Sep 17 00:00:00 2001
From: Thomas Wenrich <twenrich@gmail.com>
Date: Sat, 22 May 2021 13:38:20 +0200
Subject: [PATCH 0631/3129] esp32/machine_rtc: Preserve RTC user memory over
 most reset causes.

The user memory area - accessible by machine.RTC.memory() -- will now
survive most reboot causes.  A power-on reset (also caused by the EN pin on
some boards) will clean the memory.  When this happens, the magic number
not found in the user memory will cause initialization.

After other resets (triggered by watchdogs, machine.reset(), ...), the user
is responsible to check and validate the contents of the user area.

This new behaviour can be changed by enabling
MICROPY_HW_RTC_MEM_INIT_ALWAYS: in that case the RTC memory is always
cleared on boot.

Signed-off-by: Thomas Wenrich <twenrich@gmail.com>
---
 ports/esp32/machine_rtc.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index f7b3ae66f2ee8..cbbfb4b84c2de 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -60,14 +60,24 @@ typedef struct _machine_rtc_obj_t {
 #define MICROPY_HW_RTC_USER_MEM_MAX     2048
 #endif
 
+// A board can enable MICROPY_HW_RTC_MEM_INIT_ALWAYS to always clear out RTC memory on boot.
+// Defaults to RTC_NOINIT_ATTR so the user memory survives WDT resets and the like.
+#if MICROPY_HW_RTC_MEM_INIT_ALWAYS
+#define _USER_MEM_ATTR RTC_DATA_ATTR
+#else
+#define _USER_MEM_ATTR RTC_NOINIT_ATTR
+#endif
+
 // Optionally compile user memory functionality if the size of memory is greater than 0
 #if MICROPY_HW_RTC_USER_MEM_MAX > 0
 #define MEM_MAGIC           0x75507921
-RTC_DATA_ATTR uint32_t rtc_user_mem_magic;
-RTC_DATA_ATTR uint16_t rtc_user_mem_len;
-RTC_DATA_ATTR uint8_t rtc_user_mem_data[MICROPY_HW_RTC_USER_MEM_MAX];
+_USER_MEM_ATTR uint32_t rtc_user_mem_magic;
+_USER_MEM_ATTR uint16_t rtc_user_mem_len;
+_USER_MEM_ATTR uint8_t rtc_user_mem_data[MICROPY_HW_RTC_USER_MEM_MAX];
 #endif
 
+#undef _USER_MEM_ATTR
+
 // singleton RTC object
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
@@ -80,6 +90,13 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     // check arguments
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
+    #if MICROPY_HW_RTC_USER_MEM_MAX > 0
+    if (rtc_user_mem_magic != MEM_MAGIC) {
+        rtc_user_mem_magic = MEM_MAGIC;
+        rtc_user_mem_len = 0;
+    }
+    #endif
+
     // return constant object
     return (mp_obj_t)&machine_rtc_obj;
 }
@@ -130,13 +147,6 @@ 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);
 
-    #if MICROPY_HW_RTC_USER_MEM_MAX > 0
-    if (rtc_user_mem_magic != MEM_MAGIC) {
-        rtc_user_mem_magic = MEM_MAGIC;
-        rtc_user_mem_len = 0;
-    }
-    #endif
-
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);

From 1323a71823cbf54f02395252912df1377a61824e Mon Sep 17 00:00:00 2001
From: Scott Zhao <zhaomh1998@outlook.com>
Date: Tue, 5 Dec 2023 20:47:06 -0500
Subject: [PATCH 0632/3129] esp32/boards/UM_TINYPICO: Fix typo in baudrate
 instructions.

The installation instructions for ESP32 TinyPICO board contained a typo
that used a non-standard baud rate 912600 instead of 921600.  This made the
upload command fail on some Windows computers.

Signed-off-by: Scott Zhao <zhaomh1998@outlook.com>
---
 ports/esp32/boards/UM_TINYPICO/deploy.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/UM_TINYPICO/deploy.md b/ports/esp32/boards/UM_TINYPICO/deploy.md
index ed29478675f44..8c15d4d41359d 100644
--- a/ports/esp32/boards/UM_TINYPICO/deploy.md
+++ b/ports/esp32/boards/UM_TINYPICO/deploy.md
@@ -31,16 +31,16 @@ 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
+esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 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
+esptool.py --chip esp32 --port /dev/tty.SLAB_USBtoUART --baud 921600 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
+esptool --chip esp32 --port COM(X) --baud 921600 write_flash -z 0x1000 tinypico-micropython-firmware-version.bin
 ```

From 3f2c423686e735ae4c8529b1df018d9884f48ce2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Dec 2023 16:38:44 +1100
Subject: [PATCH 0633/3129] rp2: Switch to locally provided math library.

This commit fixes all known floating-point bugs with the pico-sdk.  There
are two things going on here:
- Use a custom pico float component so that the pico-sdk doesn't include
  its math functions, and then provide our own from lib/libm.
- Provide a wrapper for __aeabi_fadd to fix the infinity addition bug.

Prior to this commit, the following tests failed on the rp2 port: cmath_fun
float_parse math_domain math_domain_special math_fun_special.  With this
commit, all these tests pass.

Thanks to @projectgus for how to approach this fix.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 67 ++++++++++++++++++++++++++++++++++++++
 ports/rp2/libm_extra.c   | 69 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 ports/rp2/libm_extra.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index dcf13287244c2..c68c46cb69399 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -196,6 +196,73 @@ set(PICO_SDK_COMPONENTS
     tinyusb_device
 )
 
+# Use our custom pico_float_micropython float implementation.  This is needed for two reasons:
+# - to fix inf handling in pico-sdk's __wrap___aeabi_fadd();
+# - so we can use our own libm functions, to fix inaccuracies in the pico-sdk versions.
+pico_set_float_implementation(${MICROPY_TARGET} micropython)
+
+# Define our custom pico_float_micropython component.
+pico_add_library(pico_float_micropython)
+
+# pico_float_micropython: add pico-sdk float and our libm source files.
+target_sources(pico_float_micropython INTERFACE
+    ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_aeabi.S
+    ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_init_rom.c
+    ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_v1_rom_shim.S
+    ${MICROPY_DIR}/lib/libm/math.c
+    ${MICROPY_DIR}/lib/libm/acoshf.c
+    ${MICROPY_DIR}/lib/libm/asinfacosf.c
+    ${MICROPY_DIR}/lib/libm/asinhf.c
+    ${MICROPY_DIR}/lib/libm/atan2f.c
+    ${MICROPY_DIR}/lib/libm/atanf.c
+    ${MICROPY_DIR}/lib/libm/atanhf.c
+    ${MICROPY_DIR}/lib/libm/ef_rem_pio2.c
+    ${MICROPY_DIR}/lib/libm/ef_sqrt.c
+    ${MICROPY_DIR}/lib/libm/erf_lgamma.c
+    ${MICROPY_DIR}/lib/libm/fmodf.c
+    ${MICROPY_DIR}/lib/libm/kf_cos.c
+    ${MICROPY_DIR}/lib/libm/kf_rem_pio2.c
+    ${MICROPY_DIR}/lib/libm/kf_sin.c
+    ${MICROPY_DIR}/lib/libm/kf_tan.c
+    ${MICROPY_DIR}/lib/libm/log1pf.c
+    ${MICROPY_DIR}/lib/libm/nearbyintf.c
+    ${MICROPY_DIR}/lib/libm/roundf.c
+    ${MICROPY_DIR}/lib/libm/sf_cos.c
+    ${MICROPY_DIR}/lib/libm/sf_erf.c
+    ${MICROPY_DIR}/lib/libm/sf_frexp.c
+    ${MICROPY_DIR}/lib/libm/sf_ldexp.c
+    ${MICROPY_DIR}/lib/libm/sf_modf.c
+    ${MICROPY_DIR}/lib/libm/sf_sin.c
+    ${MICROPY_DIR}/lib/libm/sf_tan.c
+    ${MICROPY_DIR}/lib/libm/wf_lgamma.c
+    ${MICROPY_DIR}/lib/libm/wf_tgamma.c
+    ${MICROPY_PORT_DIR}/libm_extra.c
+)
+
+# pico_float_micropython: wrap low-level floating-point ops, to call the pico-sdk versions.
+pico_wrap_function(pico_float_micropython __aeabi_fdiv)
+pico_wrap_function(pico_float_micropython __aeabi_fmul)
+pico_wrap_function(pico_float_micropython __aeabi_frsub)
+pico_wrap_function(pico_float_micropython __aeabi_fsub)
+pico_wrap_function(pico_float_micropython __aeabi_cfcmpeq)
+pico_wrap_function(pico_float_micropython __aeabi_cfrcmple)
+pico_wrap_function(pico_float_micropython __aeabi_cfcmple)
+pico_wrap_function(pico_float_micropython __aeabi_fcmpeq)
+pico_wrap_function(pico_float_micropython __aeabi_fcmplt)
+pico_wrap_function(pico_float_micropython __aeabi_fcmple)
+pico_wrap_function(pico_float_micropython __aeabi_fcmpge)
+pico_wrap_function(pico_float_micropython __aeabi_fcmpgt)
+pico_wrap_function(pico_float_micropython __aeabi_fcmpun)
+pico_wrap_function(pico_float_micropython __aeabi_i2f)
+pico_wrap_function(pico_float_micropython __aeabi_l2f)
+pico_wrap_function(pico_float_micropython __aeabi_ui2f)
+pico_wrap_function(pico_float_micropython __aeabi_ul2f)
+pico_wrap_function(pico_float_micropython __aeabi_f2iz)
+pico_wrap_function(pico_float_micropython __aeabi_f2lz)
+pico_wrap_function(pico_float_micropython __aeabi_f2uiz)
+pico_wrap_function(pico_float_micropython __aeabi_f2ulz)
+pico_wrap_function(pico_float_micropython __aeabi_f2d)
+
 if (MICROPY_PY_LWIP)
     target_link_libraries(${MICROPY_TARGET} micropy_lib_lwip)
 
diff --git a/ports/rp2/libm_extra.c b/ports/rp2/libm_extra.c
new file mode 100644
index 0000000000000..4628fb0834a89
--- /dev/null
+++ b/ports/rp2/libm_extra.c
@@ -0,0 +1,69 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 <math.h>
+#include <stdint.h>
+
+#define INF_POS (0x7f800000)
+#define INF_NEG (0xff800000)
+
+union float_int_t {
+    float f;
+    uint32_t i;
+};
+
+float __wrap___aeabi_fadd(float x, float y);
+
+// The pico-sdk wraps __aeabi_fadd() with __wrap___aeabi_fadd() in order to use the ROM
+// floating-point functions.  But __wrap___aeabi_fadd() does not handle inf+(-inf) or
+// (-inf)+inf correctly.  To fix this we provide our own __aeabi_fadd() that fixes the
+// inf calculation, and do not use the "--wrap=" linker command.  The compiler then
+// picks our __aeabi_fadd() instead of its built-in one.  And the pico-sdk function
+// still exists for us to call.
+float __aeabi_fadd(float x, float y) {
+    // Handle addition of inf/-inf.  This is optimised to reduce C stack usage, and
+    // only have one comparison/jump in the common case of x != inf.
+    union float_int_t xu = {.f = x};
+    union float_int_t yu = {.f = y};
+    if ((xu.i << 1) == (INF_POS << 1)) {
+        if (xu.i == INF_POS) {
+            if (yu.i == INF_POS) {
+                return INFINITY;
+            } else if (yu.i == INF_NEG) {
+                return NAN;
+            }
+        } else {
+            if (yu.i == INF_POS) {
+                return NAN;
+            } else if (yu.i == INF_NEG) {
+                return -INFINITY;
+            }
+        }
+    }
+
+    // Use the pico-sdk function for all other calculations.
+    return __wrap___aeabi_fadd(x, y);
+}

From b796f1e3f12f3c0a0a75b4b1b7f01f234a3f4dda Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Dec 2023 14:05:14 +1100
Subject: [PATCH 0634/3129] tests/float/inf_nan_arith.py: Include -inf in
 argument combos.

This adds tests for, eg, -inf + inf which should be nan.

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

diff --git a/tests/float/inf_nan_arith.py b/tests/float/inf_nan_arith.py
index d1a6b18872029..33cadbf3993b0 100644
--- a/tests/float/inf_nan_arith.py
+++ b/tests/float/inf_nan_arith.py
@@ -3,7 +3,7 @@
 inf = float("inf")
 nan = float("nan")
 
-values = (-2, -1, 0, 1, 2, inf, nan)
+values = (-2, -1, 0, 1, 2, inf, -inf, nan)
 
 for x in values:
     for y in values:

From d30d5c99afba705e8286e9177768e0e38db59fff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Dec 2023 16:05:37 +1100
Subject: [PATCH 0635/3129] tests/run-tests.py: Skip Thumb2 tests if target
 doesn't support them.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/feature_check/inlineasm_thumb2.py     | 10 ++++++++++
 tests/feature_check/inlineasm_thumb2.py.exp |  1 +
 tests/run-tests.py                          | 15 +++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 tests/feature_check/inlineasm_thumb2.py
 create mode 100644 tests/feature_check/inlineasm_thumb2.py.exp

diff --git a/tests/feature_check/inlineasm_thumb2.py b/tests/feature_check/inlineasm_thumb2.py
new file mode 100644
index 0000000000000..bc4c128baf5dc
--- /dev/null
+++ b/tests/feature_check/inlineasm_thumb2.py
@@ -0,0 +1,10 @@
+# check if Thumb2/ARMV7M instructions are supported
+
+
+@micropython.asm_thumb
+def f():
+    it(eq)
+    nop()
+
+
+print("thumb2")
diff --git a/tests/feature_check/inlineasm_thumb2.py.exp b/tests/feature_check/inlineasm_thumb2.py.exp
new file mode 100644
index 0000000000000..05d125af9f65e
--- /dev/null
+++ b/tests/feature_check/inlineasm_thumb2.py.exp
@@ -0,0 +1 @@
+thumb2
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 2d511c20ca7f8..2dc387946ca7a 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -465,6 +465,21 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         if output != b"a=1\n":
             skip_fstring = True
 
+        # Check if @micropython.asm_thumb supports Thumb2 instructions, and skip such tests if it doesn't
+        output = run_feature_check(pyb, args, base_path, "inlineasm_thumb2.py")
+        if output != b"thumb2\n":
+            skip_tests.add("inlineasm/asmbcc.py")
+            skip_tests.add("inlineasm/asmbitops.py")
+            skip_tests.add("inlineasm/asmconst.py")
+            skip_tests.add("inlineasm/asmdiv.py")
+            skip_tests.add("inlineasm/asmfpaddsub.py")
+            skip_tests.add("inlineasm/asmfpcmp.py")
+            skip_tests.add("inlineasm/asmfpldrstr.py")
+            skip_tests.add("inlineasm/asmfpmuldiv.py")
+            skip_tests.add("inlineasm/asmfpsqrt.py")
+            skip_tests.add("inlineasm/asmit.py")
+            skip_tests.add("inlineasm/asmspecialregs.py")
+
         # 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"):

From 50f31cc902d284db9f6ddbd60101608cfdbdbe7b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 2 Nov 2023 09:10:38 +0100
Subject: [PATCH 0636/3129] extmod/modnetwork: Add deinit function to NIC
 protocol.

This is usually called on soft-reboot, a NIC can implement this to do any
necessary cleaning up (such as invalidating root pointers).

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/modnetwork.c | 9 +++++++++
 extmod/modnetwork.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index f5734af9b5afd..527d1729e66c7 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -65,6 +65,15 @@ void mod_network_init(void) {
 }
 
 void mod_network_deinit(void) {
+    #if !MICROPY_PY_LWIP
+    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];
+        const mod_network_nic_protocol_t *nic_protocol = MP_OBJ_TYPE_GET_SLOT(mp_obj_get_type(nic), protocol);
+        if (nic_protocol->deinit) {
+            nic_protocol->deinit();
+        }
+    }
+    #endif
 }
 
 void mod_network_register_nic(mp_obj_t nic) {
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index e3239c2a05fcc..0a7897faaa90f 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -80,6 +80,7 @@ struct _mod_network_socket_obj_t;
 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);
+    void (*deinit)(void);
 
     // API for socket operations; return -1 on error
     int (*socket)(struct _mod_network_socket_obj_t *socket, int *_errno);

From 0960d64d3b040b81524f0284d28854f3b929f381 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 2 Nov 2023 10:44:50 +0100
Subject: [PATCH 0637/3129] extmod/network_ninaw10: Switch to using soft-timer
 for polling.

This patch simplifies the connection and sockets polling code, by switching
to a soft-timer to schedule polling code, and by using one node for
scheduling.  This also fixes any issues that could result from using a heap
allocated machine_timer, and includes better handling of the sockets poll
list.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/network_ninaw10.c | 113 +++++++++++++++++++++++++--------------
 1 file changed, 74 insertions(+), 39 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 264eb1437e5e5..1deb117e70689 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -42,6 +42,7 @@
 #include "py/misc.h"
 #include "py/mperrno.h"
 #include "shared/netutils/netutils.h"
+#include "shared/runtime/softtimer.h"
 #include "extmod/modnetwork.h"
 #include "modmachine.h"
 
@@ -50,6 +51,7 @@
 typedef struct _nina_obj_t {
     mp_obj_base_t base;
     bool active;
+    bool poll_enable;
     uint32_t itf;
     mp_uint_t security;
     char ssid[NINA_MAX_SSID_LEN + 1];
@@ -71,6 +73,7 @@ typedef struct _nina_obj_t {
 #define SO_ERROR                (0x1007)
 #define SO_TYPE                 (0x1008)
 #define SO_NO_CHECK             (0x100a)
+#define NINAW10_POLL_INTERVAL   (100)
 
 #define is_nonblocking_error(errno) ((errno) == MP_EAGAIN || (errno) == MP_EWOULDBLOCK || (errno) == MP_EINPROGRESS)
 
@@ -78,23 +81,56 @@ typedef struct _nina_obj_t {
 
 static uint16_t bind_port = BIND_PORT_RANGE_MIN;
 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;
-static mp_sched_node_t mp_wifi_connpoll_node;
+static nina_obj_t network_nina_wl_sta = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, false, MOD_NETWORK_STA_IF};
+static nina_obj_t network_nina_wl_ap = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, false, MOD_NETWORK_AP_IF};
+static mp_sched_node_t mp_wifi_poll_node;
+static soft_timer_entry_t mp_wifi_poll_timer;
+STATIC void network_ninaw10_deinit(void);
+
+STATIC bool network_ninaw10_poll_list_is_empty(void) {
+    return MP_STATE_PORT(mp_wifi_poll_list) == NULL ||
+           MP_STATE_PORT(mp_wifi_poll_list)->len == 0;
+}
+
+STATIC void network_ninaw10_poll_list_insert(mp_obj_t socket) {
+    if (MP_STATE_PORT(mp_wifi_poll_list) == NULL) {
+        MP_STATE_PORT(mp_wifi_poll_list) = mp_obj_new_list(0, NULL);
+    }
+    mp_obj_list_append(MP_STATE_PORT(mp_wifi_poll_list), socket);
+}
+
+STATIC void network_ninaw10_poll_list_remove(mp_obj_t socket) {
+    if (MP_STATE_PORT(mp_wifi_poll_list) == NULL) {
+        return;
+    }
+    mp_obj_list_remove(MP_STATE_PORT(mp_wifi_poll_list), socket);
+    if (MP_STATE_PORT(mp_wifi_poll_list)->len == 0) {
+        MP_STATE_PORT(mp_wifi_poll_list) = NULL;
+    }
+}
 
 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];
+    for (mp_uint_t i = 0; MP_STATE_PORT(mp_wifi_poll_list) && i < MP_STATE_PORT(mp_wifi_poll_list)->len;) {
+        mod_network_socket_obj_t *socket = MP_STATE_PORT(mp_wifi_poll_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.
+            // Remove socket 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 & SOCKET_POLL_RD) {
+            network_ninaw10_poll_list_remove(socket);
+            // Check the same index on the next iteration.
+            continue;
+        }
+        if (flags & SOCKET_POLL_RD) {
             mp_call_function_1(socket->callback, MP_OBJ_FROM_PTR(socket));
         }
+        i++;
+        debug_printf("poll_sockets(%d) -> flags %d\n", socket->fileno, flags);
+    }
+
+    if (!network_ninaw10_poll_list_is_empty()) {
+        // Reschedule the sockets polling code.
+        soft_timer_reinsert(&mp_wifi_poll_timer, NINAW10_POLL_INTERVAL);
     }
 }
 
@@ -104,10 +140,8 @@ STATIC void network_ninaw10_poll_connect(mp_sched_node_t *node) {
     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) {
+        self->poll_enable = false;
+    } else 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();
@@ -124,21 +158,23 @@ STATIC void network_ninaw10_poll_connect(mp_sched_node_t *node) {
             }
         } else {
             // Will not attempt to reconnect if there's another error code set.
-            return;
+            self->poll_enable = false;
         }
     }
 
-    // Reschedule the connection polling code.
-    mp_sched_schedule_node(&mp_wifi_connpoll_node, network_ninaw10_poll_connect);
+    // Reinsert the timer to schedule the polling code.
+    soft_timer_reinsert(&mp_wifi_poll_timer, NINAW10_POLL_INTERVAL);
 }
 
-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);
+STATIC void network_ninaw10_timer_callback(soft_timer_entry_t *self) {
+    debug_printf("timer_callback() poll status STA: %d AP: %d SOCKETS: %d\n",
+        network_nina_wl_sta.poll_enable, network_nina_wl_ap.poll_enable, !network_ninaw10_poll_list_is_empty());
+    if (network_nina_wl_sta.poll_enable) {
+        mp_sched_schedule_node(&mp_wifi_poll_node, network_ninaw10_poll_connect);
+    } else if (!network_ninaw10_poll_list_is_empty()) {
+        mp_sched_schedule_node(&mp_wifi_poll_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);
@@ -157,6 +193,7 @@ 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]);
+        network_ninaw10_deinit();
         if (active) {
             int error = 0;
             if ((error = nina_init()) != 0) {
@@ -185,19 +222,9 @@ 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) = MP_OBJ_TYPE_GET_SLOT(&machine_timer_type, make_new)((mp_obj_t)&machine_timer_type, 0, 2, timer_args);
-            }
+            soft_timer_static_init(&mp_wifi_poll_timer, SOFT_TIMER_MODE_ONE_SHOT, 0, network_ninaw10_timer_callback);
         } 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;
@@ -278,7 +305,8 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
         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);
+        self->poll_enable = true;
+        soft_timer_reinsert(&mp_wifi_poll_timer, NINAW10_POLL_INTERVAL);
     } else {
         mp_uint_t channel = args[ARG_channel].u_int;
 
@@ -528,10 +556,8 @@ STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *
 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();
+        network_ninaw10_poll_list_remove(socket);
     }
     if (socket->fileno >= 0) {
         nina_socket_close(socket->fileno);
@@ -739,7 +765,8 @@ STATIC int network_ninaw10_socket_setsockopt(mod_network_socket_obj_t *socket, m
         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);
+            network_ninaw10_poll_list_insert(socket);
+            soft_timer_reinsert(&mp_wifi_poll_timer, NINAW10_POLL_INTERVAL);
         }
         mp_sched_unlock();
         return 0;
@@ -803,6 +830,14 @@ STATIC int network_ninaw10_socket_ioctl(mod_network_socket_obj_t *socket, mp_uin
     return ret;
 }
 
+STATIC void network_ninaw10_deinit(void) {
+    // On soft-reboot, gc_sweep_all is called and all open sockets are closed
+    // and collected. Make sure that the driver is not keeping any references
+    // to collected sockets in the poll list.
+    soft_timer_remove(&mp_wifi_poll_timer);
+    MP_STATE_PORT(mp_wifi_poll_list) = NULL;
+}
+
 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) },
@@ -826,6 +861,7 @@ STATIC MP_DEFINE_CONST_DICT(nina_locals_dict, nina_locals_dict_table);
 
 STATIC const mod_network_nic_protocol_t mod_network_nic_protocol_nina = {
     .gethostbyname = network_ninaw10_gethostbyname,
+    .deinit = network_ninaw10_deinit,
     .socket = network_ninaw10_socket_socket,
     .close = network_ninaw10_socket_close,
     .bind = network_ninaw10_socket_bind,
@@ -851,7 +887,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 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);
+MP_REGISTER_ROOT_POINTER(struct _mp_obj_list_t *mp_wifi_poll_list);
 
 #endif // #if MICROPY_PY_BLUETOOTH && MICROPY_PY_NETWORK_NINAW10

From 66be82da7ce63e9c907d7d2ed00341dae80ee83f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 7 Dec 2023 14:07:21 +1100
Subject: [PATCH 0638/3129] esp8266: Avoid including ep_mphal.h directly.

This header has no include guards and is apparently only supposed to be
included from py/mphal.h.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp8266/esp_init_data.c | 1 -
 ports/esp8266/esp_mphal.c     | 2 +-
 ports/esp8266/uart.c          | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/esp8266/esp_init_data.c b/ports/esp8266/esp_init_data.c
index eb4d99ebda1f7..c369ed58f515f 100644
--- a/ports/esp8266/esp_init_data.c
+++ b/ports/esp8266/esp_init_data.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include "ets_sys.h"
 #include "etshal.h"
-#include "esp_mphal.h"
 #include "user_interface.h"
 #include "extmod/misc.h"
 
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 06502e85c4876..afa934e00c9c2 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -28,9 +28,9 @@
 #include "ets_sys.h"
 #include "etshal.h"
 #include "uart.h"
-#include "esp_mphal.h"
 #include "user_interface.h"
 #include "ets_alt_task.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "extmod/misc.h"
diff --git a/ports/esp8266/uart.c b/ports/esp8266/uart.c
index f761ecfd70cf6..c0a33acb5732a 100644
--- a/ports/esp8266/uart.c
+++ b/ports/esp8266/uart.c
@@ -17,7 +17,7 @@
 #include "etshal.h"
 #include "c_types.h"
 #include "user_interface.h"
-#include "esp_mphal.h"
+#include "py/mphal.h"
 
 // seems that this is missing in the Espressif SDK
 #define FUNC_U0RXD 0

From f5be0128e4da1417136495c20888f8291cd22386 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 30 Nov 2023 16:06:32 +1100
Subject: [PATCH 0639/3129] py: Add port-agnostic inline functions for event
 handling.

These are intended to replace MICROPY_EVENT_POLL_HOOK and
MICROPY_EVENT_POLL_HOOK_FAST, which are insufficient for tickless ports.

This implementation is along the lines suggested here:
https://github.com/micropython/micropython/issues/12925#issuecomment-1803038430

Currently any usage of these functions expands to use the existing hook
macros, but this can be switched over port by port.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/mphal.h     | 13 +++++++++++++
 py/runtime.h   | 17 +++++++++++++++++
 py/scheduler.c | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/py/mphal.h b/py/mphal.h
index 19fceef71853d..81cf50918e35d 100644
--- a/py/mphal.h
+++ b/py/mphal.h
@@ -98,4 +98,17 @@ uint64_t mp_hal_time_ns(void);
 #include "extmod/virtpin.h"
 #endif
 
+// Event handling and wait-for-event functions.
+
+#ifndef MICROPY_INTERNAL_WFE
+// Fallback definition for ports that don't need to suspend the CPU.
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) (void)0
+#endif
+
+#ifndef MICROPY_INTERNAL_EVENT_HOOK
+// Fallback definition for ports that don't need any port-specific
+// non-blocking event processing.
+#define MICROPY_INTERNAL_EVENT_HOOK (void)0
+#endif
+
 #endif // MICROPY_INCLUDED_PY_MPHAL_H
diff --git a/py/runtime.h b/py/runtime.h
index 5fa072d7e99d2..a04d4584f804c 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -109,6 +109,23 @@ 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
 
+// Handles any pending MicroPython events without waiting for an interrupt or event.
+void mp_event_handle_nowait(void);
+
+// Handles any pending MicroPython events and then suspends execution until the
+// next interrupt or event.
+//
+// Note: on "tickless" ports this can suspend execution for a long time,
+// don't call unless you know an interrupt is coming to continue execution.
+// On "ticked" ports it may return early due to the tick interrupt.
+void mp_event_wait_indefinite(void);
+
+// Handle any pending MicroPython events and then suspends execution until the
+// next interrupt or event, or until timeout_ms milliseconds have elapsed.
+//
+// On "ticked" ports it may return early due to the tick interrupt.
+void mp_event_wait_ms(mp_uint_t timeout_ms);
+
 // extra printing method specifically for mp_obj_t's which are integral type
 int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, int base, int base_char, int flags, char fill, int width, int prec);
 
diff --git a/py/scheduler.c b/py/scheduler.c
index b9a43bfbdb6f4..3eae8b4fa366c 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -241,3 +241,39 @@ void mp_handle_pending(bool raise_exc) {
     }
     #endif
 }
+
+// Handles any pending MicroPython events without waiting for an interrupt or event.
+void mp_event_handle_nowait(void) {
+    #if defined(MICROPY_EVENT_POLL_HOOK_FAST) && !MICROPY_PREVIEW_VERSION_2
+    // For ports still using the old macros.
+    MICROPY_EVENT_POLL_HOOK_FAST
+    #else
+    // Process any port layer (non-blocking) events.
+    MICROPY_INTERNAL_EVENT_HOOK;
+    mp_handle_pending(true);
+    #endif
+}
+
+// Handles any pending MicroPython events and then suspends execution until the
+// next interrupt or event.
+void mp_event_wait_indefinite(void) {
+    #if defined(MICROPY_EVENT_POLL_HOOK) && !MICROPY_PREVIEW_VERSION_2
+    // For ports still using the old macros.
+    MICROPY_EVENT_POLL_HOOK
+    #else
+    mp_event_handle_nowait();
+    MICROPY_INTERNAL_WFE(-1);
+    #endif
+}
+
+// Handle any pending MicroPython events and then suspends execution until the
+// next interrupt or event, or until timeout_ms milliseconds have elapsed.
+void mp_event_wait_ms(mp_uint_t timeout_ms) {
+    #if defined(MICROPY_EVENT_POLL_HOOK) && !MICROPY_PREVIEW_VERSION_2
+    // For ports still using the old macros.
+    MICROPY_EVENT_POLL_HOOK
+    #else
+    mp_event_handle_nowait();
+    MICROPY_INTERNAL_WFE(timeout_ms);
+    #endif
+}

From df3948d3c23e3572c49d18ede03bf3ac97ee601c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 30 Nov 2023 14:32:41 +1100
Subject: [PATCH 0640/3129] extmod: Switch to use new event functions.

See previous commit for details of these functions.  As of this commit,
these still call the old hook macros on all ports.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/btstack/modbluetooth_btstack.c |  8 ++++----
 extmod/machine_i2c.c                  |  6 +-----
 extmod/modlwip.c                      |  6 +-----
 extmod/modselect.c                    | 16 +++++++++++-----
 extmod/modssl_mbedtls.c               |  4 +---
 extmod/network_cyw43.c                |  9 +++++++--
 extmod/nimble/modbluetooth_nimble.c   |  7 ++++---
 7 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 0c15e9343159d..211214768f7eb 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -552,7 +552,7 @@ STATIC void set_random_address(void) {
         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
+            mp_event_wait_indefinite();
         }
 
         #endif // MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
@@ -574,7 +574,7 @@ STATIC void set_random_address(void) {
             break;
         }
 
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_indefinite();
     }
     DEBUG_printf("set_random_address: Address loaded by controller\n");
 }
@@ -654,7 +654,7 @@ int mp_bluetooth_init(void) {
     // 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) {
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_indefinite();
     }
     btstack_run_loop_remove_timer(&btstack_init_deinit_timeout);
 
@@ -727,7 +727,7 @@ void mp_bluetooth_deinit(void) {
     // either timeout or clean shutdown.
     mp_bluetooth_btstack_port_deinit();
     while (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE) {
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_indefinite();
     }
     btstack_run_loop_remove_timer(&btstack_init_deinit_timeout);
 
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 6cc2aa5bbf0e9..1964284ec837d 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -331,11 +331,7 @@ STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
         // This scan loop may run for some time, so process any pending events/exceptions,
         // or allow the port to run any necessary background tasks.  But do it as fast as
         // possible, in particular we are not waiting on any events.
-        #if defined(MICROPY_EVENT_POLL_HOOK_FAST)
-        MICROPY_EVENT_POLL_HOOK_FAST;
-        #elif defined(MICROPY_EVENT_POLL_HOOK)
-        MICROPY_EVENT_POLL_HOOK
-        #endif
+        mp_event_handle_nowait();
     }
     return list;
 }
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 432b97e8fe3be..6f8703d5a71a9 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -318,11 +318,7 @@ typedef struct _lwip_socket_obj_t {
 } lwip_socket_obj_t;
 
 static inline void poll_sockets(void) {
-    #ifdef MICROPY_EVENT_POLL_HOOK
-    MICROPY_EVENT_POLL_HOOK;
-    #else
-    mp_hal_delay_ms(1);
-    #endif
+    mp_event_wait_ms(1);
 }
 
 STATIC struct tcp_pcb *volatile *lwip_socket_incoming_array(lwip_socket_obj_t *socket) {
diff --git a/extmod/modselect.c b/extmod/modselect.c
index d665a1082794a..07ef3d79c8403 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -306,6 +306,7 @@ STATIC mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
 
 STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size_t *rwx_num, mp_uint_t timeout) {
     mp_uint_t start_ticks = mp_hal_ticks_ms();
+    bool has_timeout = timeout != (mp_uint_t)-1;
 
     #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
 
@@ -350,12 +351,12 @@ STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size
         }
 
         // Return if an object is ready, or if the timeout expired.
-        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_ticks >= timeout)) {
+        if (n_ready > 0 || (has_timeout && mp_hal_ticks_ms() - start_ticks >= timeout)) {
             return n_ready;
         }
 
-        // This would be MICROPY_EVENT_POLL_HOOK but the call to poll() above already includes a delay.
-        mp_handle_pending(true);
+        // This would be mp_event_wait_ms() but the call to poll() above already includes a delay.
+        mp_event_handle_nowait();
     }
 
     #else
@@ -363,10 +364,15 @@ STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size
     for (;;) {
         // poll the objects
         mp_uint_t n_ready = poll_set_poll_once(poll_set, rwx_num);
-        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_ticks >= timeout)) {
+        uint32_t elapsed = mp_hal_ticks_ms() - start_ticks;
+        if (n_ready > 0 || (has_timeout && elapsed >= timeout)) {
             return n_ready;
         }
-        MICROPY_EVENT_POLL_HOOK
+        if (has_timeout) {
+            mp_event_wait_ms(timeout - elapsed);
+        } else {
+            mp_event_wait_indefinite();
+        }
     }
 
     #endif
diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 449952594c2db..1d7705c17fea4 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -391,9 +391,7 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
             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
+            mp_event_wait_ms(1);
         }
     }
 
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 834f09eae956b..f8490d6b9a9cd 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -222,8 +222,13 @@ STATIC mp_obj_t network_cyw43_scan(size_t n_args, const mp_obj_t *pos_args, mp_m
 
     // Wait for scan to finish, with a 10s timeout
     uint32_t start = mp_hal_ticks_ms();
-    while (cyw43_wifi_scan_active(self->cyw) && mp_hal_ticks_ms() - start < 10000) {
-        MICROPY_EVENT_POLL_HOOK
+    const uint32_t TIMEOUT = 10000;
+    while (cyw43_wifi_scan_active(self->cyw)) {
+        uint32_t elapsed = mp_hal_ticks_ms() - start;
+        if (elapsed >= TIMEOUT) {
+            break;
+        }
+        mp_event_wait_ms(TIMEOUT - elapsed);
     }
 
     return res;
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 3cdf4d1a7811f..2e1faa9b100ef 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -570,7 +570,7 @@ void mp_bluetooth_nimble_port_shutdown(void) {
     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
+        mp_event_wait_indefinite();
     }
 }
 
@@ -636,10 +636,11 @@ int mp_bluetooth_init(void) {
     // 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) {
+        uint32_t elapsed = mp_hal_ticks_ms() - timeout_start_ticks_ms;
+        if (elapsed > NIMBLE_STARTUP_TIMEOUT) {
             break;
         }
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(NIMBLE_STARTUP_TIMEOUT - elapsed);
     }
 
     if (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {

From 28529351aebe45c24e982eaecdba2383d05d2dd4 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 30 Nov 2023 14:34:07 +1100
Subject: [PATCH 0641/3129] rp2: Switch rp2 and drivers to use new event
 functions.

This commit changes all uses in the rp2 port, and drivers that are
optionally supported by that port.

The old MICROPY_EVENT_POLL_HOOK and MICROPY_EVENT_POLL_HOOK_FAST macros are
no longer used for rp2 builds and are removed (C user code will need to be
changed to suit).

Also take the opportunity to change some timeouts that used 64-bit
arithmetic to 32-bit, to hopefully claw back a little code size.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 drivers/cyw43/cywbt.c         |  4 ++--
 drivers/ninaw10/nina_bt_hci.c |  5 +++--
 ports/rp2/cyw43_configport.h  |  3 ++-
 ports/rp2/machine_uart.c      | 34 +++++++++++++++++++++-------------
 ports/rp2/mpconfigport.h      | 21 +++++++++++----------
 ports/rp2/mphalport.c         | 29 +++++++++++++----------------
 ports/rp2/rp2_flash.c         | 11 +++++------
 ports/rp2/rp2_pio.c           |  4 ++--
 8 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index d1b19382c599a..3f454485ab2bc 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -68,7 +68,7 @@ STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
     mp_bluetooth_hci_uart_write((void *)buf, len);
     for (int c, i = 0; i < 6; ++i) {
         while ((c = mp_bluetooth_hci_uart_readchar()) == -1) {
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_wait_indefinite();
         }
         buf[i] = c;
     }
@@ -88,7 +88,7 @@ STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
     int sz = buf[2] - 3;
     for (int c, i = 0; i < sz; ++i) {
         while ((c = mp_bluetooth_hci_uart_readchar()) == -1) {
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_wait_indefinite();
         }
         buf[i] = c;
     }
diff --git a/drivers/ninaw10/nina_bt_hci.c b/drivers/ninaw10/nina_bt_hci.c
index 754e99ed76b45..f0d1b9bc8986b 100644
--- a/drivers/ninaw10/nina_bt_hci.c
+++ b/drivers/ninaw10/nina_bt_hci.c
@@ -75,12 +75,13 @@ static int nina_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param
     // 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
+            mp_uint_t elapsed = mp_hal_ticks_ms() - start;
             // Timeout.
-            if ((mp_hal_ticks_ms() - start) > HCI_COMMAND_TIMEOUT) {
+            if (elapsed > HCI_COMMAND_TIMEOUT) {
                 error_printf("timeout waiting for HCI packet\n");
                 return -1;
             }
+            mp_event_wait_ms(HCI_COMMAND_TIMEOUT - elapsed);
         }
 
         buf[i] = mp_bluetooth_hci_uart_readchar();
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 96324ee5ec966..b69cfbc263a28 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -30,6 +30,7 @@
 #include "py/mpconfig.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "py/runtime.h"
 #include "extmod/modnetwork.h"
 #include "pendsv.h"
 
@@ -119,6 +120,6 @@ static inline void cyw43_delay_ms(uint32_t ms) {
     mp_hal_delay_ms(ms);
 }
 
-#define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK_FAST
+#define CYW43_EVENT_POLL_HOOK mp_event_handle_nowait()
 
 #endif // MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index dae57012a8d3d..e48924f09ae84 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -454,8 +454,8 @@ STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
 
 STATIC mp_uint_t mp_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 = time_us_64() + (uint64_t)self->timeout * 1000;
-    uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
+    mp_uint_t start = mp_hal_ticks_ms();
+    mp_uint_t timeout = self->timeout;
     uint8_t *dest = buf_in;
 
     for (size_t i = 0; i < size; i++) {
@@ -466,7 +466,8 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
                 uart_drain_rx_fifo(self);
                 break;
             }
-            if (time_us_64() > t) {  // timed out
+            mp_uint_t elapsed = mp_hal_ticks_ms() - start;
+            if (elapsed > timeout) {  // timed out
                 if (i <= 0) {
                     *errcode = MP_EAGAIN;
                     return MP_STREAM_ERROR;
@@ -474,18 +475,19 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
                     return i;
                 }
             }
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_wait_ms(timeout - elapsed);
         }
         *dest++ = ringbuf_get(&(self->read_buffer));
-        t = time_us_64() + timeout_char_us;
+        start = mp_hal_ticks_ms(); // Inter-character timeout
+        timeout = self->timeout_char;
     }
     return size;
 }
 
 STATIC mp_uint_t mp_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);
-    uint64_t t = time_us_64() + (uint64_t)self->timeout * 1000;
-    uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
+    mp_uint_t start = mp_hal_ticks_ms();
+    mp_uint_t timeout = self->timeout;
     const uint8_t *src = buf_in;
     size_t i = 0;
 
@@ -502,7 +504,8 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     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
+            mp_uint_t elapsed = mp_hal_ticks_ms() - start;
+            if (elapsed > timeout) {  // timed out
                 if (i <= 0) {
                     *errcode = MP_EAGAIN;
                     return MP_STREAM_ERROR;
@@ -510,11 +513,12 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
                     return i;
                 }
             }
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_wait_ms(timeout - elapsed);
         }
         ringbuf_put(&(self->write_buffer), *src++);
         ++i;
-        t = time_us_64() + timeout_char_us;
+        start = mp_hal_ticks_ms(); // Inter-character timeout
+        timeout = self->timeout_char;
         uart_fill_tx_fifo(self);
     }
 
@@ -539,12 +543,16 @@ STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
         // 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 {
+        while (1) {
             if (mp_machine_uart_txdone(self)) {
                 return 0;
             }
-            MICROPY_EVENT_POLL_HOOK
-        } while (time_us_64() < timeout);
+            uint64_t now = time_us_64();
+            if (now >= timeout) {
+                break;
+            }
+            mp_event_wait_ms((timeout - now) / 1000);
+        }
         *errcode = MP_ETIMEDOUT;
         ret = MP_STREAM_ERROR;
     } else {
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 5ff384c923b47..b349e0d67ba5e 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -249,18 +249,19 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_PY_LWIP_REENTER lwip_lock_acquire();
 #define MICROPY_PY_LWIP_EXIT    lwip_lock_release();
 
-#define MICROPY_EVENT_POLL_HOOK_FAST \
-    do { \
-        extern void mp_handle_pending(bool); \
-        mp_handle_pending(true); \
+// Port level Wait-for-Event macro
+//
+// Do not use this macro directly, include py/runtime.h and
+// call mp_event_wait_indefinite() or mp_event_wait_ms(timeout)
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) \
+    do {                                 \
+        if ((TIMEOUT_MS) < 0) { \
+            __wfe(); \
+        } else { \
+            best_effort_wfe_or_timeout(make_timeout_time_ms(TIMEOUT_MS)); \
+        } \
     } while (0)
 
-#define MICROPY_EVENT_POLL_HOOK \
-    do { \
-        MICROPY_EVENT_POLL_HOOK_FAST; \
-        __wfe(); \
-    } while (0);
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
 #define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 1fb833f2e5dc2..1c784fd737e8a 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -59,24 +59,17 @@ ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
 
 #endif
 
-#if MICROPY_HW_USB_CDC
-// Explicitly run the USB stack in case the scheduler is locked (eg we are in an
-// interrupt handler) and there is in/out data pending on the USB CDC interface.
-#define MICROPY_EVENT_POLL_HOOK_WITH_USB \
-    do { \
-        MICROPY_EVENT_POLL_HOOK; \
-        mp_usbd_task(); \
-    } while (0)
-
-#else
-#define MICROPY_EVENT_POLL_HOOK_WITH_USB MICROPY_EVENT_POLL_HOOK
-#endif
-
 #if MICROPY_HW_USB_CDC
 
 uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
 
 void poll_cdc_interfaces(void) {
+    if (!cdc_itf_pending) {
+        // Explicitly run the USB stack as the scheduler may be locked (eg we are in
+        // an interrupt handler) while there is data pending.
+        mp_usbd_task();
+    }
+
     // any CDC interfaces left to poll?
     if (cdc_itf_pending && ringbuf_free(&stdin_ringbuf)) {
         for (uint8_t itf = 0; itf < 8; ++itf) {
@@ -153,7 +146,7 @@ int mp_hal_stdin_rx_chr(void) {
             return dupterm_c;
         }
         #endif
-        MICROPY_EVENT_POLL_HOOK_WITH_USB;
+        mp_event_wait_indefinite();
     }
 }
 
@@ -173,7 +166,11 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             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_WITH_USB;
+                mp_event_wait_ms(1);
+
+                // Explicitly run the USB stack as the scheduler may be locked (eg we
+                // are in an interrupt handler), while there is data pending.
+                mp_usbd_task();
             }
             if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
                 break;
@@ -193,7 +190,7 @@ 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);
     do {
-        MICROPY_EVENT_POLL_HOOK_FAST;
+        mp_event_handle_nowait();
     } while (!best_effort_wfe_or_timeout(t));
 }
 
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index bc284cd976020..b1afe1cbd1e72 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -121,11 +121,10 @@ 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
+    // mp_event_handle_nowait() 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;
+    // system. mp_event_handle_nowait() will call the TinyUSB task if needed.
+    mp_event_handle_nowait();
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_flash_readblocks_obj, 3, 4, rp2_flash_readblocks);
@@ -140,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_FAST;
+        mp_event_handle_nowait();
         // TODO check return value
     } else {
         offset += mp_obj_get_int(args[3]);
@@ -149,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_FAST;
+    mp_event_handle_nowait();
     // TODO check return value
     return mp_const_none;
 }
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 2e304752573b7..3a0ab844eafd4 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -729,7 +729,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.
-            MICROPY_EVENT_POLL_HOOK_FAST;
+            mp_event_handle_nowait();
         }
         uint32_t value = pio_sm_get(self->pio, self->sm) >> shift;
         if (dest == NULL) {
@@ -787,7 +787,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.
-            MICROPY_EVENT_POLL_HOOK_FAST;
+            mp_event_handle_nowait();
         }
         pio_sm_put(self->pio, self->sm, value << shift);
     }

From 393938b3e61ee34b47773766a91a45d3beea6294 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 30 Nov 2023 16:45:11 +1100
Subject: [PATCH 0642/3129] rp2/main: Enable SEVONPEND CPU interrupt bit.

Previously this was not set, so potential for race conditions in interrupt
handlers this didn't issue SEV.  (Which is currently all of them, as far as
I can see.)

Eventually we might be able to augment the interrupt handlers that wake the
main thread to call SEV, and leave the others as-is to suspend the CPU
slightly faster, but this will solve the issue for now.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 43680a46cd68f..8b41fac4ba856 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -73,6 +73,9 @@ bi_decl(bi_program_feature_group_with_flags(BINARY_INFO_TAG_MICROPYTHON,
     BI_NAMED_GROUP_SEPARATE_COMMAS | BI_NAMED_GROUP_SORT_ALPHA));
 
 int main(int argc, char **argv) {
+    // This is a tickless port, interrupts should always trigger SEV.
+    SCB->SCR |= SCB_SCR_SEVONPEND_Msk;
+
     #if MICROPY_HW_ENABLE_UART_REPL
     bi_decl(bi_program_feature("UART REPL"))
     setup_default_uart();

From c393f5c12321a80bea40af7ef2e42a077df5d806 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 30 Nov 2023 17:18:15 +1100
Subject: [PATCH 0643/3129] windows: Implement MICROPY_INTERNAL_WFE() macro.

This should be the equivalent of the previous event poll hook macro.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/windows/mpconfigport.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 2e1521b9c7ef9..e615fe8502b0c 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -227,14 +227,11 @@ typedef long mp_off_t;
 #include "sleep.h"
 
 #if MICROPY_ENABLE_SCHEDULER
-// Use 1mSec sleep to make sure there is effectively a wait period:
+// Use minimum 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); \
-        msec_sleep(1.0); \
-    } while (0);
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) msec_sleep(MAX(1.0, (double)(TIMEOUT_MS)))
+#else
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) /* No-op */
 #endif
 
 #ifdef __GNUC__

From 73879734d9954477607199e92fe945537c3c3745 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 7 Dec 2023 10:05:39 +1100
Subject: [PATCH 0644/3129] esp8266: Update port to use new event functions.

This is necessary to avoid watchdog timeout in long i2c.scan(), as
previously machine_i2c.c would call MICROPY_EVENT_POLL_HOOK if
MICROPY_EVENT_POLL_HOOK_FAST was not available.

Compared to previous implementation, this implementation removes the
ets_event_poll() function and calls the SDK function ets_loop_iter() from
MICROPY_INTERNAL_EVENT_HOOK instead.  This allows using the port-agnostic
functions in more places.

There is a small behaviour change, which is that the event loop gets
iterated in a few more places (i.e. anywhere that mp_event_handle_nowait()
is called).  However, this looks like maybe only modselect.c - and is
probably good to process Wi-Fi events in that polling loop.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp8266/esp_mphal.c    |  7 +------
 ports/esp8266/esp_mphal.h    |  3 ---
 ports/esp8266/machine_uart.c |  2 +-
 ports/esp8266/modespnow.c    |  2 +-
 ports/esp8266/modmachine.c   |  4 ++--
 ports/esp8266/mpconfigport.h | 20 +++++++++++++++++---
 ports/esp8266/uart.c         |  3 ++-
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index afa934e00c9c2..956cb2e6490ac 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -53,7 +53,7 @@ void mp_hal_init(void) {
 void MP_FASTCODE(mp_hal_delay_us)(uint32_t us) {
     uint32_t start = system_get_time();
     while (system_get_time() - start < us) {
-        ets_event_poll();
+        mp_event_handle_nowait();
     }
 }
 
@@ -122,11 +122,6 @@ uint64_t mp_hal_time_ns(void) {
     return pyb_rtc_get_us_since_epoch() * 1000ULL;
 }
 
-void ets_event_poll(void) {
-    ets_loop_iter();
-    mp_handle_pending(true);
-}
-
 void __assert_func(const char *file, int line, const char *func, const char *expr) {
     printf("assert:%s:%d:%s: %s\n", file, line, func, expr);
     mp_raise_msg(&mp_type_AssertionError, MP_ERROR_TEXT("C-level assert"));
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index 73a36a4b65fce..6fea6554b06fc 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -72,9 +72,6 @@ void dupterm_task_init();
 uint32_t esp_disable_irq(void);
 void esp_enable_irq(uint32_t state);
 
-void ets_event_poll(void);
-#define ETS_POLL_WHILE(cond) { while (cond) ets_event_poll(); }
-
 // needed for machine.I2C
 #include "osapi.h"
 #define mp_hal_delay_us_fast(us) os_delay_us(us)
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index f38858b0c2312..eaaa8ac865991 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -300,7 +300,7 @@ STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
             if (mp_machine_uart_txdone(self)) {
                 return 0;
             }
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_wait_ms(1);
         } while (system_get_time() < timeout);
 
         *errcode = MP_ETIMEDOUT;
diff --git a/ports/esp8266/modespnow.c b/ports/esp8266/modespnow.c
index 9aa5fdf9d8b9f..170e488c10a04 100644
--- a/ports/esp8266/modespnow.c
+++ b/ports/esp8266/modespnow.c
@@ -285,7 +285,7 @@ static int ringbuf_get_bytes_wait(ringbuf_t *r, uint8_t *data, size_t len, mp_in
     int status = 0;
     while (((status = ringbuf_get_bytes(r, data, len)) == -1)
            && (timeout_ms < 0 || (mp_uint_t)(mp_hal_ticks_ms() - start) < (mp_uint_t)timeout_ms)) {
-        MICROPY_EVENT_POLL_HOOK;
+        mp_event_wait_ms(1);
     }
     return status;
 }
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index f41c84e14d58f..3cf5e3dd3bc54 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -91,7 +91,7 @@ STATIC mp_obj_t mp_machine_unique_id(void) {
 
 STATIC void mp_machine_idle(void) {
     asm ("waiti 0");
-    ets_event_poll(); // handle any events after possibly a long wait (eg feed WDT)
+    mp_event_handle_nowait(); // handle any events after possibly a long wait (eg feed WDT)
 }
 
 STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
@@ -106,7 +106,7 @@ STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     uint32_t wifi_mode = wifi_get_opmode();
     uint32_t start = system_get_time();
     while (system_get_time() - start <= max_us) {
-        ets_event_poll();
+        mp_event_handle_nowait();
         if (wifi_mode == NULL_MODE) {
             // Can only idle if the wifi is off
             asm ("waiti 0");
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 07586a0ea5a95..bbfab64fba8c9 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -7,6 +7,7 @@
 // Board-specific definitions
 #include "mpconfigboard.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 
 // Set the rom feature level.
@@ -116,13 +117,26 @@
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 #define MICROPY_ESP8266_APA102         (1)
 
-#define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
+// No blocking wait-for-event on ESP8266, only non-blocking pump of the "OS" event
+// loop
+//
+// TODO: When TIMEOUT_MS==-1, it may be possible to have MICROPY_INTERNAL_WFE() call the "waiti" instruction.
+// See mp_machine_idle() and mp_machine_lightsleep() in esp8266/modmachine.c
+//
+// Note: We have to scope the declaration of ets_loop_iter() here as there are multiple incompatible
+// definitions at compile time between the SDK and axTLS!
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS)
+#define MICROPY_INTERNAL_EVENT_HOOK \
+    do { \
+        extern bool ets_loop_iter(void); \
+        ets_loop_iter(); \
+    } while (0)
+
 #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; \
-        extern void ets_loop_iter(void); \
-        ets_loop_iter(); \
+        MICROPY_INTERNAL_EVENT_HOOK; \
 }
 #define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
 #define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
diff --git a/ports/esp8266/uart.c b/ports/esp8266/uart.c
index c0a33acb5732a..80ae5e6171bb6 100644
--- a/ports/esp8266/uart.c
+++ b/ports/esp8266/uart.c
@@ -18,6 +18,7 @@
 #include "c_types.h"
 #include "user_interface.h"
 #include "py/mphal.h"
+#include "py/runtime.h"
 
 // seems that this is missing in the Espressif SDK
 #define FUNC_U0RXD 0
@@ -218,7 +219,7 @@ bool ICACHE_FLASH_ATTR uart_rx_wait(uint32_t timeout_us) {
         if (system_get_time() - start >= timeout_us) {
             return false; // timeout
         }
-        ets_event_poll();
+        mp_event_handle_nowait();
     }
 }
 

From 2c828a88153dfdbd767fc0d8f2124cfbefdcbc81 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 7 Dec 2023 13:32:41 +1100
Subject: [PATCH 0645/3129] unix: Update port to use the new event functions.

Necessary to get coverage of the new event functions.

Deletes the case that called usleep(delay) for mp_hal_delay_ms(), it seems
like this wouldn't have ever happened anyhow (MICROPY_EVENT_POOL_HOOK is
always defined for the unix port).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/coverage.c     |  5 +++--
 ports/unix/mpconfigport.h | 12 ++++--------
 ports/unix/unix_mphal.c   |  9 +--------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 88dd48bfabeb8..543af365c25e9 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -578,9 +578,10 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_sched_unlock();
         mp_printf(&mp_plat_print, "unlocked\n");
 
-        // drain pending callbacks
+        // drain pending callbacks, and test mp_event_wait_indefinite(), mp_event_wait_ms()
+        mp_event_wait_indefinite(); // the unix port only waits 500us in this call
         while (mp_sched_num_pending()) {
-            mp_handle_pending(true);
+            mp_event_wait_ms(1);
         }
 
         // setting the keyboard interrupt and raising it during mp_handle_pending
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index e7ce534a71e04..c7e7347cbb2b4 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -222,14 +222,10 @@ static inline unsigned long mp_random_seed_init(void) {
 #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 { \
-        extern void mp_handle_pending(bool); \
-        mp_handle_pending(true); \
-        usleep(500); /* equivalent to mp_hal_delay_us(500) */ \
-    } while (0);
-#endif
+//
+// Note that we don't delay for the full TIMEOUT_MS, as execution
+// can't be woken from the delay.
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) mp_hal_delay_us(500)
 
 // Configure the implementation of machine.idle().
 #include <sched.h>
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index eafc915ca4b31..8d6539c88e382 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -237,17 +237,10 @@ uint64_t mp_hal_time_ns(void) {
 
 #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();
     while (mp_hal_ticks_ms() - start < ms) {
-        // MICROPY_EVENT_POLL_HOOK does usleep(500).
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(1);
     }
-    #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
 }
 #endif
 

From 241dbac9284433cbf8c9b665ab12e1c932e6ef04 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Dec 2023 15:39:28 +1100
Subject: [PATCH 0646/3129] extmod: Add lists of libm/libm_dbl source files for
 ports to use.

So that ports don't need to specify each of these files, they can simply
refer to the appropriate make/cmake variable.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake | 35 ++++++++++++++++++
 extmod/extmod.mk    | 90 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index b9a1d67034959..ac10faa86541c 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -62,6 +62,41 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/nimble/modbluetooth_nimble.c
 )
 
+# Single-precision libm math library.
+
+set(MICROPY_SOURCE_LIB_LIBM
+    ${MICROPY_DIR}/lib/libm/acoshf.c
+    ${MICROPY_DIR}/lib/libm/asinfacosf.c
+    ${MICROPY_DIR}/lib/libm/asinhf.c
+    ${MICROPY_DIR}/lib/libm/atan2f.c
+    ${MICROPY_DIR}/lib/libm/atanf.c
+    ${MICROPY_DIR}/lib/libm/atanhf.c
+    ${MICROPY_DIR}/lib/libm/ef_rem_pio2.c
+    ${MICROPY_DIR}/lib/libm/erf_lgamma.c
+    ${MICROPY_DIR}/lib/libm/fmodf.c
+    ${MICROPY_DIR}/lib/libm/kf_cos.c
+    ${MICROPY_DIR}/lib/libm/kf_rem_pio2.c
+    ${MICROPY_DIR}/lib/libm/kf_sin.c
+    ${MICROPY_DIR}/lib/libm/kf_tan.c
+    ${MICROPY_DIR}/lib/libm/log1pf.c
+    ${MICROPY_DIR}/lib/libm/math.c
+    ${MICROPY_DIR}/lib/libm/nearbyintf.c
+    ${MICROPY_DIR}/lib/libm/roundf.c
+    ${MICROPY_DIR}/lib/libm/sf_cos.c
+    ${MICROPY_DIR}/lib/libm/sf_erf.c
+    ${MICROPY_DIR}/lib/libm/sf_frexp.c
+    ${MICROPY_DIR}/lib/libm/sf_ldexp.c
+    ${MICROPY_DIR}/lib/libm/sf_modf.c
+    ${MICROPY_DIR}/lib/libm/sf_sin.c
+    ${MICROPY_DIR}/lib/libm/sf_tan.c
+    ${MICROPY_DIR}/lib/libm/wf_lgamma.c
+    ${MICROPY_DIR}/lib/libm/wf_tgamma.c
+)
+
+# Choose only one of these sqrt implementations, software or hardware.
+set(MICROPY_SOURCE_LIB_LIBM_SQRT_SW ${MICROPY_DIR}/lib/libm/ef_sqrt.c)
+set(MICROPY_SOURCE_LIB_LIBM_SQRT_HW ${MICROPY_DIR}/lib/libm/thumb_vfp_sqrtf.c)
+
 # Library for btree module and associated code
 
 if(MICROPY_PY_BTREE)
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 7aba7d93eb061..9b1e51718e41d 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -70,6 +70,96 @@ SRC_QSTR += $(SRC_EXTMOD_C)
 CFLAGS += $(CFLAGS_EXTMOD) $(CFLAGS_THIRDPARTY)
 LDFLAGS += $(LDFLAGS_EXTMOD) $(LDFLAGS_THIRDPARTY)
 
+################################################################################
+# libm/libm_dbl math library
+
+# Single-precision math library.
+SRC_LIB_LIBM_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 \
+	)
+
+# Choose only one of these sqrt implementations, software or hardware.
+SRC_LIB_LIBM_SQRT_SW_C += lib/libm/ef_sqrt.c
+SRC_LIB_LIBM_SQRT_HW_C += lib/libm/thumb_vfp_sqrtf.c
+
+# Double-precision math library.
+SRC_LIB_LIBM_DBL_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 \
+	)
+
+# Choose only one of these sqrt implementations, software or hardware.
+SRC_LIB_LIBM_DBL_SQRT_SW_C += lib/libm_dbl/sqrt.c
+SRC_LIB_LIBM_DBL_SQRT_HW_C += lib/libm_dbl/thumb_vfp_sqrt.c
+
+# Too many warnings in libm_dbl, disable for now.
+$(BUILD)/lib/libm_dbl/%.o: CFLAGS += -Wno-double-promotion -Wno-float-conversion
+
 ################################################################################
 # VFS FAT FS
 

From e1a7aa23fdbfbcf5eee0c37d4da223649129c040 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Dec 2023 15:42:41 +1100
Subject: [PATCH 0647/3129] ports: Switch build to use common lib/libm list of
 source files.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/Makefile    | 31 +------------
 ports/mimxrt/Makefile     | 27 +++---------
 ports/nrf/Makefile        | 62 ++------------------------
 ports/qemu-arm/Makefile   | 23 +---------
 ports/renesas-ra/Makefile | 91 +++------------------------------------
 ports/rp2/CMakeLists.txt  | 29 +------------
 ports/samd/Makefile       | 31 +------------
 ports/stm32/Makefile      | 91 +++------------------------------------
 8 files changed, 33 insertions(+), 352 deletions(-)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 4f5c2c36e4c5f..32eb39a203e70 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -127,35 +127,8 @@ SRC_C += \
 	modespnow.c
 endif
 
-LIB_SRC_C = $(addprefix lib/,\
-	libm/math.c \
-	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 \
-	)
+LIB_SRC_C += $(SRC_LIB_LIBM_C)
+LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 
 SHARED_SRC_C = $(addprefix shared/,\
 	libc/__errno.c \
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 542382b6fa87a..f514b773fd495 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -269,26 +269,19 @@ 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)
+    LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
     #
     ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
-        LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
+        LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_HW_C)
     else
-        LIBM_SRC_C += lib/libm_dbl/sqrt.c
+        LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_SW_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)
+    LIBM_SRC_C += $(SRC_LIB_LIBM_C)
     ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
-        LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+        LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
     else
-        LIBM_SRC_C += lib/libm/ef_sqrt.c
+        LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
     endif
 endif
 
@@ -439,15 +432,9 @@ endif
 # =============================================================================
 
 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)
+OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 45e44aed5aefe..7150aa6399b01 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -167,69 +167,15 @@ LIBS = \
 
 ifeq ($(MCU_VARIANT), nrf52)
 
-SRC_LIB_C += $(addprefix lib/,\
-        libm/math.c \
-        libm/fmodf.c \
-        libm/nearbyintf.c \
-        libm/ef_sqrt.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_sin.c \
-        libm/sf_cos.c \
-        libm/sf_tan.c \
-        libm/sf_frexp.c \
-        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_LIB_C += $(SRC_LIB_LIBM_C)
+SRC_LIB_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 
 endif
 
 ifeq ($(MCU_VARIANT), nrf91)
 
-SRC_LIB_C += $(addprefix lib/,\
-        libm/math.c \
-        libm/fmodf.c \
-        libm/nearbyintf.c \
-        libm/ef_sqrt.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_sin.c \
-        libm/sf_cos.c \
-        libm/sf_tan.c \
-        libm/sf_frexp.c \
-        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_LIB_C += $(SRC_LIB_LIBM_C)
+SRC_LIB_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 
 include drivers/secureboot/secureboot.mk
 
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 9b5cfc4af0f41..f521a0c5ad82d 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -88,27 +88,8 @@ SRC_TEST_C = \
 	test_main.c \
 	lib/tinytest/tinytest.c \
 
-LIB_SRC_C += $(addprefix lib/,\
-	libm/math.c \
-	libm/fmodf.c \
-	libm/nearbyintf.c \
-	libm/ef_sqrt.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_sin.c \
-	libm/sf_cos.c \
-	libm/sf_tan.c \
-	libm/sf_frexp.c \
-	libm/sf_modf.c \
-	libm/sf_ldexp.c \
-	libm/asinfacosf.c \
-	libm/atanf.c \
-	libm/atan2f.c \
-	libm/roundf.c \
-	)
+LIB_SRC_C += $(SRC_LIB_LIBM_C)
+LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 
 OBJ_COMMON =
 OBJ_COMMON += $(PY_O)
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 3512e4a94d16c..1e9cd2db5ba19 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -198,96 +198,19 @@ TINYUSB_SRC_C += $(addprefix lib/tinyusb/,\
 	)
 
 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 \
-	)
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
 ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
-LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_HW_C)
 else
-LIBM_SRC_C += lib/libm_dbl/sqrt.c
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_SW_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 \
-	)
+LIBM_SRC_C += $(SRC_LIB_LIBM_C)
 ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
-LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
 else
-LIBM_SRC_C += lib/libm/ef_sqrt.c
-endif
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 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
 
 DRIVERS_SRC_C += $(addprefix drivers/,\
@@ -470,7 +393,7 @@ endif
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-OBJ += $(LIBM_O)
+OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index c68c46cb69399..5da54dc1c9902 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -209,33 +209,8 @@ target_sources(pico_float_micropython INTERFACE
     ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_aeabi.S
     ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_init_rom.c
     ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_v1_rom_shim.S
-    ${MICROPY_DIR}/lib/libm/math.c
-    ${MICROPY_DIR}/lib/libm/acoshf.c
-    ${MICROPY_DIR}/lib/libm/asinfacosf.c
-    ${MICROPY_DIR}/lib/libm/asinhf.c
-    ${MICROPY_DIR}/lib/libm/atan2f.c
-    ${MICROPY_DIR}/lib/libm/atanf.c
-    ${MICROPY_DIR}/lib/libm/atanhf.c
-    ${MICROPY_DIR}/lib/libm/ef_rem_pio2.c
-    ${MICROPY_DIR}/lib/libm/ef_sqrt.c
-    ${MICROPY_DIR}/lib/libm/erf_lgamma.c
-    ${MICROPY_DIR}/lib/libm/fmodf.c
-    ${MICROPY_DIR}/lib/libm/kf_cos.c
-    ${MICROPY_DIR}/lib/libm/kf_rem_pio2.c
-    ${MICROPY_DIR}/lib/libm/kf_sin.c
-    ${MICROPY_DIR}/lib/libm/kf_tan.c
-    ${MICROPY_DIR}/lib/libm/log1pf.c
-    ${MICROPY_DIR}/lib/libm/nearbyintf.c
-    ${MICROPY_DIR}/lib/libm/roundf.c
-    ${MICROPY_DIR}/lib/libm/sf_cos.c
-    ${MICROPY_DIR}/lib/libm/sf_erf.c
-    ${MICROPY_DIR}/lib/libm/sf_frexp.c
-    ${MICROPY_DIR}/lib/libm/sf_ldexp.c
-    ${MICROPY_DIR}/lib/libm/sf_modf.c
-    ${MICROPY_DIR}/lib/libm/sf_sin.c
-    ${MICROPY_DIR}/lib/libm/sf_tan.c
-    ${MICROPY_DIR}/lib/libm/wf_lgamma.c
-    ${MICROPY_DIR}/lib/libm/wf_tgamma.c
+    ${MICROPY_SOURCE_LIB_LIBM}
+    ${MICROPY_SOURCE_LIB_LIBM_SQRT_SW}
     ${MICROPY_PORT_DIR}/libm_extra.c
 )
 
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index f6409d17e8f7c..4f4c22c57daa9 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -142,35 +142,8 @@ ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
 	hpl/nvmctrl/hpl_nvmctrl.c \
 	)
 
-LIBM_SRC_C += $(addprefix lib/libm/,\
-	acoshf.c \
-	asinfacosf.c \
-	asinhf.c \
-	atan2f.c \
-	atanf.c \
-	atanhf.c \
-	ef_rem_pio2.c \
-	ef_sqrt.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 \
-	)
+LIBM_SRC_C += $(SRC_LIB_LIBM_C)
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 
 TINYUSB_SRC_C += $(addprefix lib/tinyusb/src/,\
 	class/cdc/cdc_device.c \
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index a1449e7181ace..e44a542395182 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -189,96 +189,19 @@ SHARED_SRC_C += $(addprefix shared/,\
 	)
 
 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 \
-	)
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
 ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
-LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_HW_C)
 else
-LIBM_SRC_C += lib/libm_dbl/sqrt.c
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_SW_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 \
-	)
+LIBM_SRC_C += $(SRC_LIB_LIBM_C)
 ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
-LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
 else
-LIBM_SRC_C += lib/libm/ef_sqrt.c
-endif
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 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
 
 DRIVERS_SRC_C += $(addprefix drivers/,\
@@ -499,7 +422,7 @@ endif # MICROPY_PY_BLUETOOTH
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-OBJ += $(LIBM_O)
+OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))

From c393cd7e48e1bfffe25a9d0131ceb23b6bad9b05 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Sat, 25 Nov 2023 16:24:30 +0000
Subject: [PATCH 0648/3129] esp32/boards/sdkconfig.base: Disable unused mbedtls
 options.

Disable unused EC curves and default certificate bundle which is not
implemented in MicroPython.  This reduces the firmware size significantly.

This follows commit 68f166dae9ad6dfd94038d5f4394defbb44238af.

Signed-off-by: Carlos Gil Gonzalez <carlosgilglez@gmail.com>
---
 ports/esp32/boards/sdkconfig.base | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index bfc8c6610e225..05624f0d7409b 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -66,6 +66,16 @@ CONFIG_MBEDTLS_HAVE_TIME=y
 # Disable ALPN support as it's not implemented in MicroPython
 CONFIG_MBEDTLS_SSL_ALPN=n
 
+# Disable slow or unused EC curves
+CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=n
+CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=n
+CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=n
+CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=n
+
+# Disable certificate bundle as it's not implemented in MicroPython
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=n
+
 # Allow mbedTLS to allocate from PSRAM or internal memory
 #
 # (The ESP-IDF default is internal-only, partly for physical security to prevent

From 88778be73a522abea13a714a909c6e8e763f5a8c Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Sun, 12 Nov 2023 20:38:46 +0200
Subject: [PATCH 0649/3129] esp32/machine_i2c: Use APB_CLK_FREQ instead of
 I2C_APB_CLK_FREQ.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/machine_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 50d5681514ae7..eefdeaaf96583 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -50,7 +50,7 @@
 #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
+#define I2C_SCLK_FREQ APB_CLK_FREQ
 #else
 #error "unsupported I2C for ESP32 SoC variant"
 #endif

From 3106ee48853b11befceebb7db4866a45b0b685bb Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Sun, 12 Nov 2023 20:43:52 +0200
Subject: [PATCH 0650/3129] esp32/modnetwork: Add WiFi AUTH_WPA3_ENT_192
 authenticate mode.

Available in newer versions of the IDF.

Signed-off-by: IhorNehrutsa <IhorNehrutsa@gmail.com>
---
 ports/esp32/modnetwork_globals.h | 3 +++
 ports/esp32/network_common.c     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 7326d453be5aa..c6369ab9a79aa 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -29,6 +29,9 @@
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_WAPI_PSK), MP_ROM_INT(WIFI_AUTH_WAPI_PSK) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_OWE), MP_ROM_INT(WIFI_AUTH_OWE) },
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 1, 1)
+{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_ENT_192), MP_ROM_INT(WIFI_AUTH_WPA3_ENT_192) },
+#endif
 { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
 #endif
 
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index ca07f3c06ba18..1c5979175d0a1 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -168,4 +168,8 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj, 0, 1, esp_phy_mode);
 
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 1, 1)
+_Static_assert(WIFI_AUTH_MAX == 11, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+#else
 _Static_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+#endif

From 495be71d56337a7b162b4fe97d4407d97f87d9f0 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Sun, 12 Nov 2023 20:46:26 +0200
Subject: [PATCH 0651/3129] esp32/machine_dac: Support one-shot mode of driver.

And simplify board configuration of DAC by using SOC_DAC_SUPPORTED.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 .../boards/ARDUINO_NANO_ESP32/mpconfigboard.h |  2 --
 .../boards/ESP32_GENERIC_C3/mpconfigboard.h   |  1 -
 .../boards/ESP32_GENERIC_S3/mpconfigboard.h   |  2 --
 .../boards/LOLIN_C3_MINI/mpconfigboard.h      |  1 -
 .../esp32/boards/UM_FEATHERS3/mpconfigboard.h |  2 --
 ports/esp32/boards/UM_NANOS3/mpconfigboard.h  |  2 --
 ports/esp32/boards/UM_PROS3/mpconfigboard.h   |  2 --
 ports/esp32/boards/UM_TINYS3/mpconfigboard.h  |  2 --
 .../boards/UM_TINYWATCHS3/mpconfigboard.h     |  2 --
 ports/esp32/machine_dac.c                     | 31 ++++++++++++++++---
 ports/esp32/mpconfigport.h                    |  2 +-
 11 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
index ec85a7bb36929..873838352e198 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
@@ -4,8 +4,6 @@
 // Network config
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nano-esp32"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (12)
 #define MICROPY_HW_I2C0_SDA                 (11)
 
diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
index 42e77ecb1a6d8..0dbfae03a367c 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
@@ -4,7 +4,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32C3"
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_DAC              (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
 
 // Enable UART REPL for modules that have an external USB-UART and don't use native USB.
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
index 8d369c7db02d8..c714fe2c227f3 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.h
@@ -4,8 +4,6 @@
 #endif
 #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)
 
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
index 12fd285da1753..9b304b69f6fba 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-c3-mini"
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_DAC              (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
 
 #define MICROPY_HW_I2C0_SCL                 (10)
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
index 488a5884429a7..f4abfb21bc82a 100644
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "FeatherS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
diff --git a/ports/esp32/boards/UM_NANOS3/mpconfigboard.h b/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
index 1c2782bfb75b2..44197be2a8f59 100644
--- a/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3-FN8"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "NanoS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.h b/ports/esp32/boards/UM_PROS3/mpconfigboard.h
index ecff1e6570666..cc0ebbefa3067 100644
--- a/ports/esp32/boards/UM_PROS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "ProS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
index c0f81f0c447c8..74c7622cb4b0f 100644
--- a/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3-FN8"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "TinyS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
index ce8de58a01f2c..6cc1345413611 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3-PICO-1-N8R2"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "TinyWATCHS3"
 
-#define MICROPY_PY_MACHINE_DAC              (0)
-
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index 0e85dc9c9bfb2..34f51cc521d94 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -34,21 +34,30 @@
 #if MICROPY_PY_MACHINE_DAC
 
 #include "driver/gpio.h"
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+#include "driver/dac_oneshot.h"
+#else
 #include "driver/dac.h"
+#define DAC_CHAN_0 DAC_CHANNEL_1
+#define DAC_CHAN_1 DAC_CHANNEL_2
+#endif
 
 typedef struct _mdac_obj_t {
     mp_obj_base_t base;
     gpio_num_t gpio_id;
     dac_channel_t dac_id;
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+    dac_oneshot_handle_t dac_oneshot_handle;
+    #endif
 } mdac_obj_t;
 
-STATIC const mdac_obj_t mdac_obj[] = {
+STATIC 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},
+    {{&machine_dac_type}, GPIO_NUM_25, DAC_CHAN_0},
+    {{&machine_dac_type}, GPIO_NUM_26, DAC_CHAN_1},
     #else
-    {{&machine_dac_type}, GPIO_NUM_17, DAC_CHANNEL_1},
-    {{&machine_dac_type}, GPIO_NUM_18, DAC_CHANNEL_2},
+    {{&machine_dac_type}, GPIO_NUM_17, DAC_CHAN_0},
+    {{&machine_dac_type}, GPIO_NUM_18, DAC_CHAN_1},
     #endif
 };
 
@@ -68,6 +77,12 @@ STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for DAC"));
     }
 
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+    dac_oneshot_config_t dac_oneshot_config = {.chan_id = self->dac_id};
+    check_esp_err(dac_oneshot_new_channel(&dac_oneshot_config, (dac_oneshot_handle_t *)&self->dac_oneshot_handle));
+    check_esp_err(dac_oneshot_output_voltage(self->dac_oneshot_handle, 0));
+    return MP_OBJ_FROM_PTR(self);
+    #else
     esp_err_t err = dac_output_enable(self->dac_id);
     if (err == ESP_OK) {
         err = dac_output_voltage(self->dac_id, 0);
@@ -76,6 +91,7 @@ STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         return MP_OBJ_FROM_PTR(self);
     }
     mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
+    #endif
 }
 
 STATIC void mdac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -90,11 +106,16 @@ STATIC mp_obj_t mdac_write(mp_obj_t self_in, mp_obj_t value_in) {
         mp_raise_ValueError(MP_ERROR_TEXT("value out of range"));
     }
 
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+    check_esp_err(dac_oneshot_output_voltage(self->dac_oneshot_handle, value));
+    return mp_const_none;
+    #else
     esp_err_t err = dac_output_voltage(self->dac_id, value);
     if (err == ESP_OK) {
         return mp_const_none;
     }
     mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
+    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mdac_write_obj, mdac_write);
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index ff6f6ab8d0ae7..aeaff3e50334f 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -123,7 +123,7 @@
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #ifndef MICROPY_PY_MACHINE_DAC
-#define MICROPY_PY_MACHINE_DAC              (1)
+#define MICROPY_PY_MACHINE_DAC              (SOC_DAC_SUPPORTED)
 #endif
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (1)

From e423b3c0ba09d7f8b1b9081e2edb520455aaad33 Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Mon, 13 Nov 2023 12:06:42 +0200
Subject: [PATCH 0652/3129] docs/esp32/quickref: Add DAC example.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 docs/esp32/quickref.rst | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index e03a5ffbc9d24..08df25b0554d0 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -141,7 +141,7 @@ 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), 
+    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)
 
@@ -330,6 +330,19 @@ possible at the same frequency.
 
 See more examples in the :ref:`esp32_pwm` tutorial.
 
+DAC (digital to analog conversion)
+----------------------------------
+
+On the ESP32, DAC functionality is available on pins 25, 26.
+On the ESP32S2, DAC functionality is available on pins 17, 18.
+
+Use the DAC::
+
+    from machine import DAC, Pin
+
+    dac = DAC(Pin(25))  # create an DAC object acting on a pin
+    dac.write(128)      # set a raw analog value in the range 0-255, 50% now
+
 ADC (analog to digital conversion)
 ----------------------------------
 

From a427117d0390f22e8cbb6d295a5800363a6733d5 Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Mon, 13 Nov 2023 13:58:22 +0200
Subject: [PATCH 0653/3129] esp32/modmachine: Fix deprecated
 esp_pm_config_XXX_t.

Co-Authored-By: Trent Piepho <35062987+xyzzy42@users.noreply.github.com>

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/modmachine.c | 4 ++++
 1 file changed, 4 insertions(+)
 mode change 100644 => 100755 ports/esp32/modmachine.c

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
old mode 100644
new mode 100755
index a3437f10c154a..145ae9341cf2a
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -111,6 +111,9 @@ STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
         mp_raise_ValueError(MP_ERROR_TEXT("frequency must be 20MHz, 40MHz, 80Mhz, 160MHz or 240MHz"));
         #endif
     }
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+    esp_pm_config_t pm;
+    #else
     #if CONFIG_IDF_TARGET_ESP32
     esp_pm_config_esp32_t pm;
     #elif CONFIG_IDF_TARGET_ESP32C3
@@ -120,6 +123,7 @@ STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     #elif CONFIG_IDF_TARGET_ESP32S3
     esp_pm_config_esp32s3_t pm;
     #endif
+    #endif
     pm.max_freq_mhz = freq;
     pm.min_freq_mhz = freq;
     pm.light_sleep_enable = false;

From 3069fee3866190806fa8e258f07d8557e5842f5e Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Mon, 13 Nov 2023 14:07:59 +0200
Subject: [PATCH 0654/3129] esp32/machine_i2s: Fix deprecated fields and
 constants.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/machine_i2s.c  | 8 ++++----
 ports/esp32/mpconfigport.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 89d460e452ff3..8a9787c34e859 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -354,14 +354,14 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     self->io_mode = BLOCKING;
 
     i2s_config_t i2s_config;
-    i2s_config.communication_format = I2S_COMM_FORMAT_I2S;
+    i2s_config.communication_format = I2S_COMM_FORMAT_STAND_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.dma_desc_num = get_dma_buf_count(mode, bits, format, self->ibuf);
+    i2s_config.dma_frame_num = DMA_BUF_LEN_IN_I2S_FRAMES;
     i2s_config.use_apll = false;
     i2s_config.tx_desc_auto_clear = true;
     i2s_config.fixed_mclk = 0;
@@ -369,7 +369,7 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     i2s_config.bits_per_chan = 0;
 
     // I2S queue size equals the number of DMA buffers
-    check_esp_err(i2s_driver_install(self->i2s_id, &i2s_config, i2s_config.dma_buf_count, &self->i2s_event_queue));
+    check_esp_err(i2s_driver_install(self->i2s_id, &i2s_config, i2s_config.dma_desc_num, &self->i2s_event_queue));
 
     // apply low-level workaround for bug in some ESP-IDF versions that swap
     // the left and right channels
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index aeaff3e50334f..fbed7706b9e07 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -126,7 +126,7 @@
 #define MICROPY_PY_MACHINE_DAC              (SOC_DAC_SUPPORTED)
 #endif
 #ifndef MICROPY_PY_MACHINE_I2S
-#define MICROPY_PY_MACHINE_I2S              (1)
+#define MICROPY_PY_MACHINE_I2S              (SOC_I2S_SUPPORTED)
 #endif
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE  "ports/esp32/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_FINALISER    (1)

From b4b77c17b551e103e45bcfe55df819c636b8617c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Dec 2023 12:01:09 +1100
Subject: [PATCH 0655/3129] esp32/mpconfigport: Keep some funcs out of IRAM for
 ESP32-SPIRAM builds.

To make sure the build fits.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index fbed7706b9e07..91ee3188ca511 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -214,7 +214,11 @@ void *esp_native_code_commit(void *, size_t, void *);
 #endif
 
 // Functions that should go in IRAM
+// For ESP32 with SPIRAM workaround, firmware is larger and uses more static IRAM,
+// so in that configuration don't put too many functions in IRAM.
+#if !(CONFIG_IDF_TARGET_ESP32 && CONFIG_SPIRAM && CONFIG_SPIRAM_CACHE_WORKAROUND)
 #define MICROPY_WRAP_MP_BINARY_OP(f) IRAM_ATTR f
+#endif
 #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

From d0758d8a33dfbe1778d2285315d80badd6e92836 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Dec 2023 12:01:40 +1100
Subject: [PATCH 0656/3129] esp32/boards/ESP32_GENERIC: Disable network.LAN and
 VM-opt on D2WD.

To reduce firmware size, because IDF v5.0.4 has increased in size.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake | 3 +++
 ports/esp32/mpconfigport.h                           | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
index 74cb591c0711a..0e1945dd8c5a0 100644
--- a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
@@ -11,6 +11,9 @@ if(MICROPY_BOARD_VARIANT STREQUAL "D2WD")
 
     list(APPEND MICROPY_DEF_BOARD
         MICROPY_HW_MCU_NAME="ESP32-D2WD"
+        # Disable some options to reduce firmware size.
+        MICROPY_OPT_COMPUTED_GOTO=0
+        MICROPY_PY_NETWORK_LAN=0
     )
 endif()
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 91ee3188ca511..5f5cd795e139a 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -40,7 +40,9 @@
 #define MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND (1)
 
 // optimisations
+#ifndef MICROPY_OPT_COMPUTED_GOTO
 #define MICROPY_OPT_COMPUTED_GOTO           (1)
+#endif
 
 // Python internal features
 #define MICROPY_READER_VFS                  (1)

From 4365edb810aa0e54eb91d201eb5bf0436c86c4b3 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Sun, 12 Nov 2023 20:49:07 +0200
Subject: [PATCH 0657/3129] esp32: Change minimum supported IDF version to
 v5.0.4.

Also, IDF v5.1.2 is now supported, just not used by default.

IDF v5.0.2 still builds but we cannot guarantee continued support for this
version moving forward.

Signed-off-by: IhorNehrutsa <IhorNehrutsa@gmail.com>
---
 ports/esp32/README.md                      | 8 ++++----
 ports/esp32/main_esp32/idf_component.yml   | 2 +-
 ports/esp32/main_esp32c3/idf_component.yml | 2 +-
 ports/esp32/main_esp32s2/idf_component.yml | 2 +-
 ports/esp32/main_esp32s3/idf_component.yml | 2 +-
 tools/ci.sh                                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 169de4073bf71..a7531b6eaa447 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 only v5.0.2.
+Currently MicroPython supports v5.0.4, v5.1.2.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
@@ -46,10 +46,10 @@ The steps to take are summarised below.
 To check out a copy of the IDF use git clone:
 
 ```bash
-$ git clone -b v5.0.2 --recursive https://github.com/espressif/esp-idf.git
+$ git clone -b v5.0.4 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v5.0.2` with any other supported version.
+You can replace `v5.0.4` with 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.)
 
@@ -58,7 +58,7 @@ MicroPython and update the submodules using:
 
 ```bash
 $ cd esp-idf
-$ git checkout v5.0.2
+$ git checkout v5.0.4
 $ git submodule update --init --recursive
 ```
 
diff --git a/ports/esp32/main_esp32/idf_component.yml b/ports/esp32/main_esp32/idf_component.yml
index 8be21ed2fbe87..5dabbc00ba735 100644
--- a/ports/esp32/main_esp32/idf_component.yml
+++ b/ports/esp32/main_esp32/idf_component.yml
@@ -2,4 +2,4 @@
 dependencies:
   espressif/mdns: "~1.1.0"
   idf:
-    version: ">=5.0.2"
+    version: ">=5.0.4"
diff --git a/ports/esp32/main_esp32c3/idf_component.yml b/ports/esp32/main_esp32c3/idf_component.yml
index 8be21ed2fbe87..5dabbc00ba735 100644
--- a/ports/esp32/main_esp32c3/idf_component.yml
+++ b/ports/esp32/main_esp32c3/idf_component.yml
@@ -2,4 +2,4 @@
 dependencies:
   espressif/mdns: "~1.1.0"
   idf:
-    version: ">=5.0.2"
+    version: ">=5.0.4"
diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml
index 69e27bf8b54bc..05ab2f29a8d31 100644
--- a/ports/esp32/main_esp32s2/idf_component.yml
+++ b/ports/esp32/main_esp32s2/idf_component.yml
@@ -3,4 +3,4 @@ dependencies:
   espressif/mdns: "~1.1.0"
   espressif/esp_tinyusb: "~1.0.0"
   idf:
-    version: ">=5.0.2"
+    version: ">=5.0.4"
diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml
index 69e27bf8b54bc..05ab2f29a8d31 100644
--- a/ports/esp32/main_esp32s3/idf_component.yml
+++ b/ports/esp32/main_esp32s3/idf_component.yml
@@ -3,4 +3,4 @@ dependencies:
   espressif/mdns: "~1.1.0"
   espressif/esp_tinyusb: "~1.0.0"
   idf:
-    version: ">=5.0.2"
+    version: ">=5.0.4"
diff --git a/tools/ci.sh b/tools/ci.sh
index b71862273d145..d3ae4115823f2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -119,7 +119,7 @@ function ci_cc3200_build {
 # ports/esp32
 
 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
-IDF_VER=v5.0.2
+IDF_VER=v5.0.4
 
 export IDF_CCACHE_ENABLE=1
 

From f3f215e9bdf138fa6f94fb376ed72c25641aa298 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Tue, 27 Jun 2023 03:00:00 +0100
Subject: [PATCH 0658/3129] extmod/modssl_mbedtls: Add SSLContext certificate
 methods.

This commit adds:

1) Methods to SSLContext class that match CPython signature:

	- `SSLContext.load_cert_chain(certfile, keyfile)`
	- `SSLContext.load_verify_locations(cafile=, cadata=)`
	- `SSLContext.get_ciphers()` --> ["CIPHERSUITE"]
	- `SSLContext.set_ciphers(["CIPHERSUITE"])`

2) `sslsocket.cipher()` to get current ciphersuite and protocol
   version.

3) `ssl.MBEDTLS_VERSION` string constant.

4) Certificate verification errors info instead of
   `MBEDTLS_ERR_X509_CERT_VERIFY_FAILED`.

5) Tests in `net_inet` and `multi_net` to test these new methods.

`SSLContext.load_cert_chain` method allows loading key and cert from disk
passing a filepath in `certfile` or `keyfile` options.

`SSLContext.load_verify_locations`'s `cafile` option enables the same
functionality for ca files.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 extmod/modssl_mbedtls.c                       | 164 ++++++++++++++++++
 tests/README.md                               |  18 ++
 tests/extmod/ssl_sslcontext_ciphers.py        |  29 ++++
 tests/extmod/ssl_sslcontext_ciphers.py.exp    |   6 +
 tests/multi_net/expired_cert.der              | Bin 0 -> 1331 bytes
 tests/multi_net/rsa_cert.der                  | Bin 0 -> 1421 bytes
 tests/multi_net/rsa_key.der                   | Bin 0 -> 2347 bytes
 tests/multi_net/ssl_cert_rsa.py               | 130 ++------------
 .../sslcontext_check_hostname_error.py        |  59 +++++++
 .../sslcontext_check_hostname_error.py.exp    |   4 +
 tests/multi_net/sslcontext_getpeercert.py     |  55 ++++++
 tests/multi_net/sslcontext_getpeercert.py.exp |   5 +
 tests/multi_net/sslcontext_server_client.py   |  60 +++++++
 .../multi_net/sslcontext_server_client.py.exp |   4 +
 .../sslcontext_server_client_ciphers.py       |  58 +++++++
 .../sslcontext_server_client_ciphers.py.exp   |   4 +
 .../sslcontext_server_client_files.py         |  54 ++++++
 .../sslcontext_server_client_files.py.exp     |   4 +
 tests/multi_net/sslcontext_verify_error.py    |  58 +++++++
 .../multi_net/sslcontext_verify_error.py.exp  |   6 +
 .../multi_net/sslcontext_verify_time_error.py |  58 +++++++
 .../sslcontext_verify_time_error.py.exp       |   6 +
 tests/net_inet/mpycert.der                    | Bin 0 -> 1306 bytes
 tests/net_inet/test_sslcontext_client.py      |  52 ++++++
 tests/net_inet/test_sslcontext_client.py.exp  |   1 +
 25 files changed, 722 insertions(+), 113 deletions(-)
 create mode 100644 tests/extmod/ssl_sslcontext_ciphers.py
 create mode 100644 tests/extmod/ssl_sslcontext_ciphers.py.exp
 create mode 100644 tests/multi_net/expired_cert.der
 create mode 100644 tests/multi_net/rsa_cert.der
 create mode 100644 tests/multi_net/rsa_key.der
 create mode 100644 tests/multi_net/sslcontext_check_hostname_error.py
 create mode 100644 tests/multi_net/sslcontext_check_hostname_error.py.exp
 create mode 100644 tests/multi_net/sslcontext_getpeercert.py
 create mode 100644 tests/multi_net/sslcontext_getpeercert.py.exp
 create mode 100644 tests/multi_net/sslcontext_server_client.py
 create mode 100644 tests/multi_net/sslcontext_server_client.py.exp
 create mode 100644 tests/multi_net/sslcontext_server_client_ciphers.py
 create mode 100644 tests/multi_net/sslcontext_server_client_ciphers.py.exp
 create mode 100644 tests/multi_net/sslcontext_server_client_files.py
 create mode 100644 tests/multi_net/sslcontext_server_client_files.py.exp
 create mode 100644 tests/multi_net/sslcontext_verify_error.py
 create mode 100644 tests/multi_net/sslcontext_verify_error.py.exp
 create mode 100644 tests/multi_net/sslcontext_verify_time_error.py
 create mode 100644 tests/multi_net/sslcontext_verify_time_error.py.exp
 create mode 100644 tests/net_inet/mpycert.der
 create mode 100644 tests/net_inet/test_sslcontext_client.py
 create mode 100644 tests/net_inet/test_sslcontext_client.py.exp

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 1d7705c17fea4..3d420759dad8f 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -36,6 +36,8 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/objstr.h"
+#include "py/reader.h"
+#include "extmod/vfs.h"
 
 // mbedtls_time_t
 #include "mbedtls/platform.h"
@@ -46,6 +48,11 @@
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/error.h"
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000
+#include "mbedtls/build_info.h"
+#else
+#include "mbedtls/version.h"
+#endif
 
 #define MP_STREAM_POLL_RDWR (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)
 
@@ -59,6 +66,7 @@ typedef struct _mp_obj_ssl_context_t {
     mbedtls_x509_crt cert;
     mbedtls_pk_context pkey;
     int authmode;
+    int *ciphersuites;
 } mp_obj_ssl_context_t;
 
 // This corresponds to an SSLSocket object.
@@ -75,12 +83,32 @@ typedef struct _mp_obj_ssl_socket_t {
 STATIC const mp_obj_type_t ssl_context_type;
 STATIC const mp_obj_type_t ssl_socket_type;
 
+STATIC const MP_DEFINE_STR_OBJ(mbedtls_version_obj, MBEDTLS_VERSION_STRING_FULL);
+
 STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname);
 
 /******************************************************************************/
 // Helper functions.
 
+STATIC mp_obj_t read_file(mp_obj_t self_in) {
+    // file = open(args[0], "rb")
+    mp_obj_t f_args[2] = {
+        self_in,
+        MP_OBJ_NEW_QSTR(MP_QSTR_rb),
+    };
+    mp_obj_t file = mp_vfs_open(2, &f_args[0], (mp_map_t *)&mp_const_empty_map);
+
+    // data = file.read()
+    mp_obj_t dest[2];
+    mp_load_method(file, MP_QSTR_read, dest);
+    mp_obj_t data = mp_call_method_n_kw(0, 0, dest);
+
+    // file.close()
+    mp_stream_close(file);
+    return data;
+}
+
 #ifdef MBEDTLS_DEBUG_C
 STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
     (void)ctx;
@@ -162,6 +190,7 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     mbedtls_x509_crt_init(&self->cacert);
     mbedtls_x509_crt_init(&self->cert);
     mbedtls_pk_init(&self->pkey);
+    self->ciphersuites = NULL;
 
     #ifdef MBEDTLS_DEBUG_C
     // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
@@ -236,6 +265,54 @@ STATIC mp_obj_t ssl_context___del__(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_context___del___obj, ssl_context___del__);
 #endif
 
+// SSLContext.get_ciphers()
+STATIC mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
+    mp_obj_t list = mp_obj_new_list(0, NULL);
+    for (const int *cipher_list = mbedtls_ssl_list_ciphersuites(); *cipher_list; ++cipher_list) {
+        const char *cipher_name = mbedtls_ssl_get_ciphersuite_name(*cipher_list);
+        mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str(cipher_name, strlen(cipher_name))));
+        cipher_list++;
+        if (!*cipher_list) {
+            break;
+        }
+    }
+    return list;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_context_get_ciphers_obj, ssl_context_get_ciphers);
+
+// SSLContext.set_ciphers(ciphersuite)
+STATIC mp_obj_t ssl_context_set_ciphers(mp_obj_t self_in, mp_obj_t ciphersuite) {
+    mp_obj_ssl_context_t *ssl_context = MP_OBJ_TO_PTR(self_in);
+
+    // Check that ciphersuite is a list or tuple.
+    size_t len = 0;
+    mp_obj_t *ciphers;
+    mp_obj_get_array(ciphersuite, &len, &ciphers);
+    if (len == 0) {
+        mbedtls_raise_error(MBEDTLS_ERR_SSL_BAD_CONFIG);
+    }
+
+    // Parse list of ciphers.
+    ssl_context->ciphersuites = m_new(int, len + 1);
+    for (int i = 0, n = len; i < n; i++) {
+        if (ciphers[i] != mp_const_none) {
+            const char *ciphername = mp_obj_str_get_str(ciphers[i]);
+            const int id = mbedtls_ssl_get_ciphersuite_id(ciphername);
+            ssl_context->ciphersuites[i] = id;
+            if (id == 0) {
+                mbedtls_raise_error(MBEDTLS_ERR_SSL_BAD_CONFIG);
+            }
+        }
+    }
+    ssl_context->ciphersuites[len + 1] = 0;
+
+    // Configure ciphersuite.
+    mbedtls_ssl_conf_ciphersuites(&ssl_context->conf, (const int *)ssl_context->ciphersuites);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_set_ciphers_obj, ssl_context_set_ciphers);
+
 STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
     size_t key_len;
     const byte *key = (const byte *)mp_obj_str_get_data(key_obj, &key_len);
@@ -264,6 +341,30 @@ STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, m
     }
 }
 
+// SSLContext.load_cert_chain(certfile, keyfile)
+STATIC mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t certfile, mp_obj_t keyfile) {
+    mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_t pkey;
+    mp_obj_t cert;
+    if (certfile != mp_const_none) {
+        // check if key is a string/path
+        if (!(mp_obj_is_type(keyfile, &mp_type_bytes))) {
+            pkey = read_file(keyfile);
+        } else {
+            pkey = keyfile;
+        }
+        // check if cert is a string/path
+        if (!(mp_obj_is_type(certfile, &mp_type_bytes))) {
+            cert = read_file(certfile);
+        } else {
+            cert = certfile;
+        }
+        ssl_context_load_key(self, pkey, cert);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_load_cert_chain);
+
 STATIC void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_obj) {
     size_t cacert_len;
     const byte *cacert = (const byte *)mp_obj_str_get_data(cadata_obj, &cacert_len);
@@ -276,6 +377,30 @@ STATIC void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_
     mbedtls_ssl_conf_ca_chain(&self->conf, &self->cacert, NULL);
 }
 
+// SSLContext.load_verify_locations(cafile=None, *, cadata=None)
+STATIC mp_obj_t ssl_context_load_verify_locations(size_t n_args, const mp_obj_t *pos_args,
+    mp_map_t *kw_args) {
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_cafile, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_cadata, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    mp_obj_ssl_context_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);
+    // cafile
+    if (args[0].u_obj != mp_const_none) {
+        ssl_context_load_cadata(self, read_file(args[0].u_obj));
+    }
+    // cadata
+    if (args[1].u_obj != mp_const_none) {
+        ssl_context_load_cadata(self, args[1].u_obj);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_load_verify_locations_obj, 1, ssl_context_load_verify_locations);
+
 STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
     static const mp_arg_t allowed_args[] = {
@@ -300,6 +425,10 @@ STATIC const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
     #if MICROPY_PY_SSL_FINALISER
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&ssl_context___del___obj) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_get_ciphers), MP_ROM_PTR(&ssl_context_get_ciphers_obj)},
+    { MP_ROM_QSTR(MP_QSTR_set_ciphers), MP_ROM_PTR(&ssl_context_set_ciphers_obj)},
+    { MP_ROM_QSTR(MP_QSTR_load_cert_chain), MP_ROM_PTR(&ssl_context_load_cert_chain_obj)},
+    { MP_ROM_QSTR(MP_QSTR_load_verify_locations), MP_ROM_PTR(&ssl_context_load_verify_locations_obj)},
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_context_wrap_socket_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);
@@ -369,6 +498,8 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     o->last_error = 0;
 
     int ret;
+    uint32_t flags = 0;
+
     mbedtls_ssl_init(&o->ssl);
 
     ret = mbedtls_ssl_setup(&o->ssl, &ssl_context->conf);
@@ -382,6 +513,11 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
         if (ret != 0) {
             goto cleanup;
         }
+    } else if (ssl_context->authmode == MBEDTLS_SSL_VERIFY_REQUIRED && server_side == false) {
+
+        o->sock = MP_OBJ_NULL;
+        mbedtls_ssl_free(&o->ssl);
+        mp_raise_ValueError(MP_ERROR_TEXT("CERT_REQUIRED requires server_hostname"));
     }
 
     mbedtls_ssl_set_bio(&o->ssl, &o->sock, _mbedtls_ssl_send, _mbedtls_ssl_recv, NULL);
@@ -398,8 +534,23 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     return MP_OBJ_FROM_PTR(o);
 
 cleanup:
+    if (ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED) {
+        flags = mbedtls_ssl_get_verify_result(&o->ssl);
+    }
+
     o->sock = MP_OBJ_NULL;
     mbedtls_ssl_free(&o->ssl);
+
+    if (ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED) {
+        char xcbuf[256];
+        int ret_info = mbedtls_x509_crt_verify_info(xcbuf, sizeof(xcbuf), "\n", flags);
+        // The length of the string written (not including the terminated nul byte),
+        // or a negative err code.
+        if (ret_info > 0) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%s"), xcbuf);
+        }
+    }
+
     mbedtls_raise_error(ret);
 }
 
@@ -416,6 +567,17 @@ STATIC mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_ssl_getpeercert_obj, mod_ssl_getpeercert);
 
+STATIC mp_obj_t mod_ssl_cipher(mp_obj_t o_in) {
+    mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
+    const char *cipher_suite = mbedtls_ssl_get_ciphersuite(&o->ssl);
+    const char *tls_version = mbedtls_ssl_get_version(&o->ssl);
+    mp_obj_t tuple[2] = {mp_obj_new_str(cipher_suite, strlen(cipher_suite)),
+                         mp_obj_new_str(tls_version, strlen(tls_version))};
+
+    return mp_obj_new_tuple(2, tuple);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ssl_cipher_obj, mod_ssl_cipher);
+
 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;
@@ -565,6 +727,7 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     { 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) },
+    { MP_ROM_QSTR(MP_QSTR_cipher), MP_ROM_PTR(&mod_ssl_cipher_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
 
@@ -645,6 +808,7 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SSLContext), MP_ROM_PTR(&ssl_context_type) },
 
     // Constants.
+    { MP_ROM_QSTR(MP_QSTR_MBEDTLS_VERSION), MP_ROM_PTR(&mbedtls_version_obj)},
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(MBEDTLS_SSL_IS_CLIENT) },
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(MBEDTLS_SSL_IS_SERVER) },
     { MP_ROM_QSTR(MP_QSTR_CERT_NONE), MP_ROM_INT(MBEDTLS_SSL_VERIFY_NONE) },
diff --git a/tests/README.md b/tests/README.md
index c89930d0c088b..083269d6e822f 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -174,3 +174,21 @@ internal_bench/bytebuf:
     0.177s (+87.78%) internal_bench/bytebuf-3-bytarray_map.py
 1 tests performed (3 individual testcases)
 ```
+
+## Test key/certificates
+
+SSL/TLS tests in `multi_net` and `net_inet` use a 
+self-signed key/cert pair that 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 -nodes
+```
+In this case CN is: micropython.local
+
+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_cert.der -outform DER
+```
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py b/tests/extmod/ssl_sslcontext_ciphers.py
new file mode 100644
index 0000000000000..d87e96afdf337
--- /dev/null
+++ b/tests/extmod/ssl_sslcontext_ciphers.py
@@ -0,0 +1,29 @@
+# Basic test of ssl.SSLContext get_ciphers() and set_ciphers() methods.
+
+try:
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+
+ciphers = ctx.get_ciphers()
+
+for ci in ciphers:
+    print(ci)
+
+ctx.set_ciphers(ciphers[:1])
+
+# Test error cases.
+
+try:
+    ctx.set_ciphers(ciphers[0])
+except TypeError as e:
+    print(e)
+
+try:
+    ctx.set_ciphers(["BAR"])
+except OSError as e:
+    print(e)
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py.exp b/tests/extmod/ssl_sslcontext_ciphers.py.exp
new file mode 100644
index 0000000000000..4d243a7883b7c
--- /dev/null
+++ b/tests/extmod/ssl_sslcontext_ciphers.py.exp
@@ -0,0 +1,6 @@
+TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384
+TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256
+TLS-RSA-WITH-AES-256-CBC-SHA256
+TLS-RSA-WITH-AES-128-CBC-SHA256
+object 'str' isn't a tuple or list
+(-24192, 'MBEDTLS_ERR_SSL_BAD_CONFIG')
diff --git a/tests/multi_net/expired_cert.der b/tests/multi_net/expired_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..8e1db02aee5ef883dc1e1ae326db234fa3db6fd5
GIT binary patch
literal 1331
zcmXqLV%0ZjViso-vATIXIMi<?ze#2K)l-L4H+=cB@wNdk8>d#AN85K^Mn-N{27?eo
zZUas>=1>+kVJ62=Ltz6!5Ql?@D>y$lRX4aKu_V<{#6Son$i>6$o0(jcA5dA6k)LNM
zWgr0(W#$pg1&J1bMfGy>lM{0c<ivT6j17$p42_Ho4UH_Lpj;y;mqxZWF)1N?kCByu
zxrvFN!JvtWi>Zl;k>TDu^9sH_OX~O?y%!k2em3dS9&<0gjbBv5_N!%GXHjSrd&k?Y
ze_^WxyVr#oGX58hbYF-~JM*f!qh&*W*yYzx=6nbf2>ABn+|}=2KH73*Yn0EL=Dz#a
zv%{a)W-Q&*_hR9>O$j&Z7Bd*8&OCB=enQiai78tr+;5w@_Ns*O{B(nRM?OT$eKYki
zn$6|WWMI0<-2AhFb=WFZ*&BC09OBE7)f6r{*t#yY+GLJGkxUKa!p)OU=K92IpLlft
zRPE}{JpC2E?}9Jw&fO~zHl2TAqq69WcXKCgK0W!t*5pei``PbSCh&b>-YM(zLd3CK
z<NUf!+iy6?rF^^cc~bLzBbHD97(e~hm>;W9ar2%2v~Bm~uW0yAD*0uxVeR}s=lcJp
zrCUEbZ{YWEQ%%j9RbNh(eSF~}`RoOM2-jV^iD%trGQT{xZLhYB@u{V=PKSz}>pH+!
ze0^!)?$pb(udQcslxsZ1mwlz=`t${RuFQCpuCO;@o&N;xjq8`rsXD&cOx>p3<Wxk-
ztK{E($J<vIC^)+4E|i+2y*_^5&Udf;=X;)(Pn{hm!FEY(?!F5(&Y?XMdZs)~nfOmi
z>FlH(pKSzNOs((Ci0LTOPkqv$GLgT?!1Tan>x!8gn)w?ipF3vC(V}9_us_gA>%#o)
zjM_I(T`A09cG7-uQSjcHm%_hJoYsE$GJl23gbZiC5S6{$7nztD85ogM2rvTxQwSr&
zQZvEDr!R^ho9Y;^w`RxOpe5|-g(83EiOV#W-25+p^VfdaMCR|R9P>(_+*&5T&DnD5
zyWgDZxoRJ^c3Hay&Pg*a)@=G978!bL<%3N!j=y5|>uhH9k2w<@H!-zs!@R=zcCwe5
zH%2(HZ|~VxeKbO?!Tn{R8<$V>t@9R7(mUD2zd3)tzyI9ToYdy8UuL&vM4z`z`EfY6
zQD*W1t?*?NXI6!D@_y9*x4}X7#^ddUGB?a}HLjiXdONl5&Btf&`po4eJudFu;v*F0
zby)Yys+Di@k6k|NK8s^^jdg9ZK;fB_n_Ss4u5MVIvS!vCE#Xw&qpD}`Ec>w7Uizni
z=JKa{oyIo$mwT6)>^<?4b?xM~U2XbN6aMqcu}%(sdY)Hv+uoyoKVOw=zld;S@?HJg
z-B>zG@_uEc*pd3xQso=o#`qfE__0RIC{-lna(f2Pt_{`?qgsUDW}m!#D1YYP2}fT{
z`nl)i7he0zKb{oZD28lVm!GzK@8|O(=FuE_y1Et}hf`lR+?f(Ix$wr_+YLt>L<42H
zn!*q7d*|28D3mXp;vM1dd*17Rcj*fSv%Z^0-m9=>9<9)s65^e=RehV%KZAJNiiji5
zzZ|=(mm~@rG}d0tlKkC$N>-Y+)!|i3$$O`=`pxg&Ech?0)%njfZQ+3{C$|N1#`kK@
Yzij;UV)*=%%POz9aC?9Fe6pz>0Lynz{r~^~

literal 0
HcmV?d00001

diff --git a/tests/multi_net/rsa_cert.der b/tests/multi_net/rsa_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..24ed957eb2c5a21ec4e351abce0c802645462b02
GIT binary patch
literal 1421
zcmXqLV(m0&VlG_3%*4pVBqD9Qpj(t7?v+|BcleH7GaI!wm7F%<W#iOp^Jx3d%gD&h
z%3u&;$Zf#M#vIDRCd}j*YA9?V2;y+?a0Tb*rs@WlB$lKaiWmri1i5&)eKV7b@&hVM
zGV=2br3@rMqRc#kxggO3u&7>6esW@tft)z6k+Gqnp{0S5k)@G&6p(8H<eEddG_tjc
zNeS6|jI0dIO-%d@22D&{OifIT4ENrdSMcpwQpfM;y}<bOvq_isn0xVU{GuARUoGo8
zi$bH=JKk>n3tJ`Fy)Mj<@xN%K`$BBmnODsnEgSN~F28;<=R=r4z_%agu73aW(Uv1y
zqkPsh_uapq9sayFW9g>87YomAO1M$Cn87f0=8?Pe6PkWZOxZf&e%sWwS0#++ryJZm
z@*!I8o2iG<Y%Y%`1Jh0B=AR9$!&a%v-njGO5MPe0rf|u@)^(}XCUX>uWNH`}Zk~KH
z*C$^4#H0JCYFBsW>96p87kp`V?p}eg>HG^Dl|^5?n>%Uq>B$eaCSNMq&wjTuf$t0R
zPFbH9B97e}=hto8e#1d7<=d6dlbY`vv3&Z+`0204{8)vGoA30eZM!FbMZ<Se$uEly
zYv=zt*Z(gq-TKja1HXrxYHHT3`f{r5;|mwbXD|3exbE6bJnJ@-`Q^E7d$nbZPc5Bw
zI#ldj*8#rb>q`T7r(T|YZ9R*lT;n0W>?<YLr!UxZWyYg)g}n*u{3md4T)%Wq)$zq<
z>Ne#jry@#TCI9X_-oCm(!O=x`q0}Vp_3`_5zI)|A-}AJ5>g+HHwo77j_g$!Q4(*xH
zGv#5*#D7vsXD99WY$MoWYJF!$Oh=J^>XQbQiTp(drUx!tSIpGV%-=Zq+%Z#*78PrT
z{eeze7v^tg)V_J@N?``GllFs)g7?<E6#jMMwD!Z7`72x|WH|GMsO;sw$i&RZz_>Wr
zAkaV-m~v(LSj1RFYAv;zR=atc{jDugN}CdzrRn;&*FYX5t;`}}Al86g0Y6BAFeBrC
z7FGjhAcdUlfVm2o>=+r=IUEpu{OVrs>JxsC!`IBs^sBix=gGoNsU1wk7n8yTXD!#?
zw5q#BPGjc2#V;}$-9GtFvoddrnY_Ow#QjdzhS~9&?&-3pgf~8ykFj%Rlr1@XtmCba
z=w`-*!gWQa*Xt{<?{54seK*U3p7Rdu;ziP$k6ul*+hit^$U6PrJNLTlVz=x1_6e@L
zJg30)OH<_irM?~QGV<x7bA!$az7~{Uz|OJ!I)@DV-$_@!cCS1BUpnBNe!gi(_@%G0
zGSyMb?xyWLeCSz-Wu0!Y!J3uL{y+Yf%z2q{ob8|W#vOrN=JO6t<gGi$By`v}Y!SQt
z_D?Y#|1?`Oo_JiaJIrm;UpuSA%#ulL*{!O+e^+^b_b9Fimir^xSMNOIN7ct(=}VJx
zIW9Y=?2m1I(cp0Z^W~4Xk}_@|IQ1*#tIL5@3;tzOS6mR?+`8_<!oTxBUO%*{D`Xza
zL1Aqt`PLO-4r|s39-AW8I)CSu#CLc9uhe?Xyg8=GIJlskt@mlfU8ce~)pak+R#sFp
z_i6_1<29<7v|9goyV!>7tG4V^zIuHo>-Qhq7WOzjN&9z9zh&FgskN^jO!HmcVz%MI
zSw9X&wZvV&r*{1QTafWLhhuf6fRy+BN3v7T@;z8}{ce}tMGbZtzC#z1@8teUmY5f~
oKXy{&^Rnwn_9aopUmohkXixC8eR#|{+jyP`L#Ldb>0yCz0E4|}w*UYD

literal 0
HcmV?d00001

diff --git a/tests/multi_net/rsa_key.der b/tests/multi_net/rsa_key.der
new file mode 100644
index 0000000000000000000000000000000000000000..5a4666402a6a5e7b34bded6c3dd5b59bd49e4d18
GIT binary patch
literal 2347
zcmV+`3Dov5f(a)A0RRGm0s#Qt?l*W2yrg~)K}(=B>*kWuyf;b?vGgTYzb0ze1R#MH
z?hT7C(6tx`O3;`bPth_h=oXgD>Vt@cuy0n=>*Sp9RuEA3_|Db$^zl6iYbbY`mPfn#
z=EL)?Xr;1_=%LQCVAy`605N5m#ND4@g7}eSwUFP2m95nnGoNQL-o)@*9`-dzGMfrW
zf-p6*H#hSzJ65VC9oXFP!VYX5DHC+Tg|20LG@KxE9DD(xvy;hfOkXR=;@`@BtBGze
zs7>xu(z|WF5LTBDp@Ab6=<c18v&)m<wPVtBzX#oUU=H*HxgAXC6hVt9&#tn!*gzg+
z_SEx|gWoa)^8Nwx{V1PZAb8pCFP666AJiyKl63kwu&tl`&X4|PXFKB0FizpJe0;2`
z^vZVe=tLRj=nqs1-9C}cMwtWY&bGZP95c$Ln#)xd&WgYebJwL&yJgdx)~^IX9)ZFR
zYt(etm!Q1VnBr$3y<o0SkPES|rJQ=lqc$fzcQndabn0XKj>m_qa3DcMEuk8cE3aR^
zx$f#upGnIfWt&zQ2GSOtzR-L_Rg92~l;LEN{u(09lDP9c5rj26+?ZU5axZ1%fFzL*
zaxgW((>r*XC@F8Tlg`F92!td%0KZW}D$t*|0V~<c)NyD7LM!0W5#Frn6Z*)@E8*#H
zs6>!xLk?6Vy$jI-0|5X50)hemAuly*WO>Yjn+UE{#HUg}U8$%>-5@iXli1A>4Du~l
zlHXoC6C=vkG`qC<et7Q^bqm~jpp%||P3_L$mpGj#)I5+!i2m>xcOJ9fBrMfWnLdA=
zLW`TzyFD_fsqzzFi((uxMvc+xSA!S~Lg=AL&A78$$UX-e9Z^JpL&8>#2&5Zp^+Gf8
zK~ilyc`n{jCz_kcKX^Ey1T4W4CB+sDK9$2aAnO=mWw_rk%^-lf)3>Q2v-5W0Am=k2
z6VTpK(iI?ob{!n{Kv}M*ng7eizeWqWsbyB~b6g`0S^mJXC3B0(1#**2Cvx~^=nzEy
z9g5!|zZn5|`_2hgX&`q$U&#iV{E6^ZW7tff>kr;rSgX%9f?YyiG>tC8&!UR)d>XJw
zG&4{b(2y&1E2#|r+k6zTx~Ue>eq4Pf)Fv@YWo;ArAc*u<0B_X0ldgpEE-d&rb2V-x
zi$*wq^|%|Onu3H0&<tm#%Grt^#_`L5PK$#C)RhbB#EkgWHjQQ$p<b}Ux|Jktkj$<H
zJt8$ojt$d!G#VmsB$3-iU*Ps-Ho5>}qM<`D;Bem+{umwc^W=#uJv-acEC65b93Xh>
za(+uPAe=MR#Nt=8W{$4I)?N{y;3RtL>K;4ghtX216nlfw^9=sW7~Qs(2l`|nOuJE=
z7y#U}O)ca7NEE>Wf&l>l^l9pp`hF%31L6wnEy|keTNMj}eyFH2$_&`6V4-8s+ZNKQ
zH?u(MS9>R3G3sdjrk8HAtkTS!j}&eg4ovZVj0=g6xNd>B2b7I%tXGR9tssavXqIGl
zn|`1xeEVW<l6q=W0#@2jg!hIPmf|CVj9K+>^TZweHKEGPna@WH<4RK-^HK8obSl_-
zuQ=n_(MfS`kRycdCc1plL-3VIb4R_L-fH0W{7svwl+Y4OYbGHpVU?Ty6(vgZ(sO7N
zqgIp#l`I}2aU>wI3nG1#{S~vv#$)pVp0yc6LN#tDqf(pMjUeaXX5LUCn-7-NkN-qf
z)JP$G*!Al3JP$B&0)hbn0O^01L#>?8-%Gk0FWD1~9ynrMFAjCPD(?J1MKjt0+Hv)8
zya%0earf<Y`)G6mg#@TByt#$*TN&b3Vpi(9!m!1GHgcR+uup7_1g53=>e?tx)yHcs
zJ72hs$F8E4bpi35X##aSr6<?BcN<wz#Qhftd3H^p1dl||EQcbak$Of-Fk(TkFyhmd
zY53#K+f>l*#fqy^L&<zhr;+fkRz$7)3A!O<pfHO~_0Lm}EBtK3J9~qm?H$1aGPK1C
znwMsz5|CC)&&H^9=)$T~?XcFtpb*wldVL<513LOTBC3d^2*xUk$qp}=-AKqhy+_WR
z4HJtMc93xv!%81PVFH2y0DlA%{(JV;yY1AdtMg777qwx?Yj%4Zec5)mn#fAl-jN*H
zInZ2vUCTV12Hut39t2k^75uJ8+YFc|W~BGyf5j=W!C0+D2jdQwIO>^995F<A#wWxO
zO?w?-3wV|TUq=iI`8<32Q{3C_c?--{d*FyyerSdOw=)0pu0%L($%VrBQOqw$KhD_w
zOEicw5LqJospE<<=(&Teo$K1U8NZ(fu;Bex4?m#oMnS2k_&ub-6ckW(lA~6T4++g9
z#~|4|Z}?Hi4@(f`R9s&EI8hbYDfhLtai9{ZAVlU9YSH_8HlmvOC94nFK)s%7T5ZhG
zta0~JKiODgQz&5+VFH2y07>0%0G;1Sa~=hiTP2jG!?l`-SLS~o;)xH7RapJffj}dm
zvKq#hsImc&og;zodK~KqJ@kTyWqw|_Z48Or;?e-<%S@hNUJe2b>NmZyy|ta9Vai|u
zLlYR%;UqzlejQ6qYkIenQopm~J>HD=?G_V1KMhH#AxI%WSeds!e>v+KbqnA#hlhFJ
zeo~p;`A~0n*-h}gX>CWr2oZ+O-^7A7GxCYG$7d7jX{1<=rXPq{ifo)qKsR+`IG--&
z7ujV(>I`=PERJuZ>@Ena+&N(Ohp0>BbCWqHwtD5omPyn{p7QZ(P6!Ill+pcW8H%a3
zd;Na4A9uPAwP3MYfdYa70RXRrEzi;etr@_jX-6g57dLhDAgaY@dy6{=vx)(vB`)o_
zwQkqe{$H(61G6P3i@fuAoaz?;#1@SCR7e-Z92ErjG(#cO3wat=06*Mteh?OZE)0Iw
z?S{iYRCIxyg!5k#PWDcOCB%y%UZ4ga6j9$1@P#OT#sXhh(c~@<2e|f|Z}VTUXTy!6
zHuTgpQzJ&(0DOGIr3@vELQz}T9NAnv5TUn*rN+~{trGV5L?giXKd0;hBF320EEXLF
z0BeuCxZ5ls_?NlGyfLV=oqp91{1<L!GH+hYUv3yTJFJGV)S(q}v5m#s>2#JD{a5X5
R=4H2VfSVY8Uv66Pf#LLHc!2-_

literal 0
HcmV?d00001

diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
index 6454ad83aafeb..71c9a34797606 100644
--- a/tests/multi_net/ssl_cert_rsa.py
+++ b/tests/multi_net/ssl_cert_rsa.py
@@ -2,127 +2,29 @@
 # This test won't run under CPython because CPython doesn't have key/cert
 
 try:
-    import binascii, socket, ssl
+    import binascii, os, socket, ssl
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 PORT = 8000
 
+# These are test certificates. See tests/README.md for details.
+certfile = "multi_net/rsa_cert.der"
+keyfile = "multi_net/rsa_key.der"
 
-# 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 1825 -nodes
-#
-# 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_cert.der -outform DER
-#
-# Then convert to hex format, eg using binascii.hexlify(data).
+try:
+    os.stat(certfile)
+    os.stat(keyfile)
+except OSError:
+    print("SKIP")
+    raise SystemExit
 
-cert = binascii.unhexlify(
-    b"308205b53082039da00302010202090090195a9382cbcbef300d06092a864886f70d01010b050030"
-    b"71310b3009060355040613024155310c300a06035504080c03466f6f310c300a06035504070c0342"
-    b"617231143012060355040a0c0b4d6963726f507974686f6e31143012060355040b0c0b4d6963726f"
-    b"507974686f6e311a301806035504030c116d6963726f707974686f6e2e6c6f63616c301e170d3233"
-    b"303731353136323034395a170d3238303731333136323034395a3071310b30090603550406130241"
-    b"55310c300a06035504080c03466f6f310c300a06035504070c0342617231143012060355040a0c0b"
-    b"4d6963726f507974686f6e31143012060355040b0c0b4d6963726f507974686f6e311a3018060355"
-    b"04030c116d6963726f707974686f6e2e6c6f63616c30820222300d06092a864886f70d0101010500"
-    b"0382020f003082020a0282020100944fdb40b587af0cf7e9696c355d24a70936874e6a3bd2598166"
-    b"ce2495aaf9b4af01b54471f7cbf3626ae0720bf0bfd520507f79ec553c62898bfd2598385f56061b"
-    b"0e8f452625c82d3c83e2a0d070ab9be2db21faf88c58e4a61d62f8ff43960aa1ffdadaad41f7cb2e"
-    b"b337070a39f08ff9fe20c09b19926cbbc4a5154b796ff7e7ce11334e090d360c81072af08758f6cd"
-    b"7bad75bc7b95b6dcc801c85de81d72806ca3ce0782bfcbdffce707f9fb1572a7db0d74445dc32d5f"
-    b"bea12a3ab1d47edf668ebfa60ed8b51e654e76292e3894ee574ea851064956906aa8afe00e67664e"
-    b"110b5a6ff7db51f7944463cdd626ff2ec7886c229f4ca5985168f20f8f210972b5ff9181d4f3beb8"
-    b"914ec5b24a0953253b3d42ab55e98bd70cb25e7a24c603b27ec83e1ce31c90b728b47a5f606ff2a1"
-    b"0ff784a016894c28f7e71f51a78b0a7601bbbc8c1b132b04e567394a327a7aa4674e8e4c0bfaec4b"
-    b"eeccf0ed09d1660933d718a2f34ff91d79d875a73fbac07182a9531ca52bd360e2678f95ff9b4ba2"
-    b"1490d7456548364b2eb335c207d6e1e48ccd7d8cb43868a334c095bd9673be7403f3b69b545ee904"
-    b"a3f513d2b2a2dd46f06820cd394819551dd05d9b34a8a3238a521f6c1c3592f76d5ef29e181c60ee"
-    b"bcaf4c63098794c15d4f82e7425e75ff8f5430247ecc0e7f2983b715506012f187d54a7b6729bc61"
-    b"fa4d10a9f22b0203010001a350304e301d0603551d0e041604147a6d126931b58fa1c3dff3c9215f"
-    b"6202e61fa8da301f0603551d230418301680147a6d126931b58fa1c3dff3c9215f6202e61fa8da30"
-    b"0c0603551d13040530030101ff300d06092a864886f70d01010b0500038202010051b3a4834d2bf1"
-    b"95ac645bca61e95289eff38d80ab2ee732c6ebd1370781b66955a7583c78831f9fb7d8b236a1b5ff"
-    b"c9183b4e17225951e1fb2c39f7218af30ec3fd8e4f697e0d10ecd05eb14208535dc55bc1e25d8a43"
-    b"050670d4de3e4cb8c884e6cbb6b884320d496b354acf5258bcb0ddaefd065ee8fccbddf3a2bfa10d"
-    b"bfeb8ab6b2580b50f0678760599269b612f81ba1310bfcd39427fec49211769c514cdd0305081d8a"
-    b"11ebe705496d4dcc31ac9fab96a2d298ee4423789baffbfa0fa82ee1b5113f9cf597647a36640cad"
-    b"abf535205c322e16153d6ab04b0817f57d8a9a6ca2db2ab10986ae9eab343547e52c78a641868bb5"
-    b"e2981182fcc55d86cdc6aa8478b226318a3be72fb726dd0b90f30df810c4d6c6b5a0ecb3c6cc375b"
-    b"8d3d244a07d8517ad390929be7b75f679beb63d8c1028905af2383144a4ed560e45907d301846acc"
-    b"9dbec86bcdd7fbf8a805b59f359c8bd997f5eb7b8aea6f7a538f9663ec2c12e07d4b37650e92b783"
-    b"74356daee4a501eeb27fef79b472b2fcce4363a9ff4d80f96a3b47dc4c4ef380ef231d193a517071"
-    b"b31078fa9f9a80cfd943f7e99e4ed8548c9ea80fd845ecc2c89726be273fa8b36680d645998fd1e6"
-    b"2367638f4953e9af68531aedb2ee49dffaaed07a4a5b97551712058219ac6f8da71710949f761271"
-    b"5273a348dcce40c556bdab00a4ae3a7b23a5934ac88b7640df"
-)
+with open(certfile, "rb") as cf:
+    cert = cadata = cf.read()
 
-key = binascii.unhexlify(
-    b"308209280201000282020100944fdb40b587af0cf7e9696c355d24a70936874e6a3bd2598166ce24"
-    b"95aaf9b4af01b54471f7cbf3626ae0720bf0bfd520507f79ec553c62898bfd2598385f56061b0e8f"
-    b"452625c82d3c83e2a0d070ab9be2db21faf88c58e4a61d62f8ff43960aa1ffdadaad41f7cb2eb337"
-    b"070a39f08ff9fe20c09b19926cbbc4a5154b796ff7e7ce11334e090d360c81072af08758f6cd7bad"
-    b"75bc7b95b6dcc801c85de81d72806ca3ce0782bfcbdffce707f9fb1572a7db0d74445dc32d5fbea1"
-    b"2a3ab1d47edf668ebfa60ed8b51e654e76292e3894ee574ea851064956906aa8afe00e67664e110b"
-    b"5a6ff7db51f7944463cdd626ff2ec7886c229f4ca5985168f20f8f210972b5ff9181d4f3beb8914e"
-    b"c5b24a0953253b3d42ab55e98bd70cb25e7a24c603b27ec83e1ce31c90b728b47a5f606ff2a10ff7"
-    b"84a016894c28f7e71f51a78b0a7601bbbc8c1b132b04e567394a327a7aa4674e8e4c0bfaec4beecc"
-    b"f0ed09d1660933d718a2f34ff91d79d875a73fbac07182a9531ca52bd360e2678f95ff9b4ba21490"
-    b"d7456548364b2eb335c207d6e1e48ccd7d8cb43868a334c095bd9673be7403f3b69b545ee904a3f5"
-    b"13d2b2a2dd46f06820cd394819551dd05d9b34a8a3238a521f6c1c3592f76d5ef29e181c60eebcaf"
-    b"4c63098794c15d4f82e7425e75ff8f5430247ecc0e7f2983b715506012f187d54a7b6729bc61fa4d"
-    b"10a9f22b0203010001028202000b41080520013cc242299f0b4bfd5663aa6a4dd8206d8ba7a90f11"
-    b"036babfea8bc42e7eb5aae8ff656f87f3188406b7e13a6a815ab5e4867bdc236a25caba26857ac43"
-    b"ed9134b4d73cbf83ce759f7b7d3a25fbb4d76376dae3f6caf210ace60703a58951a51852922803d2"
-    b"2b91c82fdf563d85101d2d67c259a7e1e318fb922a71e85015b40beed9e6c90a1d6e1fb45586dcce"
-    b"ceb9c964a356ade82b6275e5c01e492a753f940852df788eab454aadc7d1dc74ddcf7dc493a3e4c9"
-    b"0557bbfe747e701b4b27b5c518a29dbcd8385525a1bb835e72a489096e15387e2f70b112c6bbd79e"
-    b"a97ae2562f7947cd2367635e25b5656a54aac7f1c892243dc135e5025a44d724884b244e8fe4abb4"
-    b"c67bbd2e652d5fc5942b55c24b7f642f65b9b6d37110a955c63eb4f26435be056effbd777f14db8d"
-    b"3d8073f7583b24656edb19911e1307101443a50717c32dbb80b6212e6f0ee43f629b1e718a958a5c"
-    b"fdcd99762f5bff821ac49b0e77c9d1426f8bb31142df030549330dde5cc92fa20d09744ceac6ae02"
-    b"fb354e9b930173e08488375f7c795b3b934c72b58a3353332d5129d56151b57a793d99868885ebd4"
-    b"aac11ca03e09f5b6bd9dda5322a0ab81e468839ea373ecd2b5ac4ffc99740581b35add07f83ff18e"
-    b"c2111555ead17783294b2330ad874bd966c1d60b44e5f379650910a8a05eb92cb7550191c13251f5"
-    b"0a11afa7510282010100c5a4aa380f6bdd4b4524deb44425aa7ef61039a46ad0d09e2ca2cd7fb757"
-    b"ff325f81eaf3a2e790afb3ffb0d71f3ffa52db1a24d3149839f03d1acfe33ef721fe310895986c5a"
-    b"fe88ceb82318ed540456b8aa7e07dc7b982345c4f040b1544bd2ee1e4cb0315bd8db3794ea93d705"
-    b"f41cc1c06badf72de36d2b4a4399846d6c851260e5044e9495be8225307edb97071bdea08c99ccfe"
-    b"54219f6a785db47864e03cf2851abcb62941d3efeea7cdf136d9e23845cf9ea0323b156c686c6d30"
-    b"1cbb5a8c7f1db23a998bf549874b2c13685b20d200d2d91be92c40480a0cca18c28f654dd644c60d"
-    b"e8e03824c0ff83e7cbfc44b2aa16ad537a09565ed4afbe63b8930282010100c01a5e6108420c3d2e"
-    b"ccd0b559e08680f47b3e7271ee4ea9bf4740cc5c418a53225778eddb716447b02d234909f8291581"
-    b"a45be0591952bacda55e774338962502c1d73f2d5383259aaa69f2603fde216ca9557d8b4e629888"
-    b"c697fec1aaf9f99ebd223c06399cc13cd21bd01e3660acc148ba841e5c89b3f8f04efac07f8072a5"
-    b"bacb4f5cfece528496bb35e906361efdb89a17fe4999f47508d5e48914ac651172ddc994993b4672"
-    b"7ec62810d6c204af4b5fd52ba4f8cb3c8720fbd469b219868e28294e60276bc2483e78d96a0edf29"
-    b"e237fe6f1660705d5cd3590c476e37c5d367b19bfb0a1c29ef296dfd3e9fabf5b37e1fb7357a3032"
-    b"c8a641b467d7090282010100bc6d55bf66ac6e69017dba38e0b38c4dc8a8055c845d9a5702b51ff8"
-    b"4042cbd1298f0201cf70b7d75b634d247aed92e9056c72692f3c46188d190fd35647648824154c11"
-    b"ea54025149cbf1e224f9b1bd4007836a594117f5a0e1b62fe72037bddc38d4e231dc9fedb79ae8dd"
-    b"93e5602b3e6905fff02536aaf0d7b78517e4fece0b8c872ac9040d93781e9e92832604a80462ca49"
-    b"234fe1c3c0695061fdd9be4aaeb08447ce5c590f2250a01629586bf3e421c424c1d576ae2fa99010"
-    b"b7346460165ed61de8bac782d0928e4313bd59037051e6691e85e692c2a22bbaafbe555742bca7a8"
-    b"1fae4933e332df317b7f3551c7e91211d6a33c38c4b85a4b46d769b3028201003884497a00a4f5d6"
-    b"d63af9b830fe06744ff926512345ba2ce49280f4debb858799d5e4450e4798fa2251d54cbabb20d3"
-    b"2bf5fff5cc20d01f173b6cc467a9713ae849c11adc29f2ae90874c6e3b74eed42494d90afb7e0f31"
-    b"d323a23a181e4636f345af99bb371df01805b49b11186c6ec6daafcd08e5aeb99d268e05e5b65d42"
-    b"dd914c194841cacfaa24726594edf7e43c3f204ea8c85c9bf806a66efb097302b514773dc41324c6"
-    b"400f1e1b5180ed49d58cb6600fdc143a2ecf8e9ba84d8451502de890e6771181f981a9a782475aa2"
-    b"bb3ecbbc76503e0530e28b676a5e6585d114b63021b4c4afae82a74cadb1cbe61a7e393ff975a942"
-    b"1edebb531f51618902820100214d9f1efa774b9d4e0a996442c2744560c84b133045b1af9241d60f"
-    b"c2f82043ac169dc9496ebb5f26b5cb8a6636c57d44e06843bf1f082be42fe5933a7ab7a6878dccf3"
-    b"58606a9fd6984ea525fe34f9e86f7bae33e707be0dec8fbef2deed253c822f6b812e7bd8c64bc302"
-    b"5c9a9e58811d30981a329f7b130148b0eb2ac62cec516942f7530963edab832bd0bacf344b183b9d"
-    b"ba9d54535dceff640f94d79599edf8dd0c32029950ede63f2f579b0d3c9a13c04df73fec03c4bcbe"
-    b"ff7ecf69ba082445673a263685475b91390963e2d42705ba89ff107e96bbb7a887daa016f282f1e6"
-    b"bdd7b9bb14579166f8c13be876cdef07e13c6ef08ff49d4207c7c7ff"
-)
+with open(keyfile, "rb") as kf:
+    key = kf.read()
 
 
 # Server
@@ -146,7 +48,9 @@ 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 = ssl.wrap_socket(
+        s, cert_reqs=ssl.CERT_REQUIRED, server_hostname="micropython.local", cadata=cadata
+    )
     s.write(b"client to server")
     print(s.read(16))
     s.close()
diff --git a/tests/multi_net/sslcontext_check_hostname_error.py b/tests/multi_net/sslcontext_check_hostname_error.py
new file mode 100644
index 0000000000000..94bd472767df3
--- /dev/null
+++ b/tests/multi_net/sslcontext_check_hostname_error.py
@@ -0,0 +1,59 @@
+# Test creating an SSL connection when server_hostname is required but not specified.
+
+try:
+    import os
+    import socket
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+# 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()
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    multitest.broadcast("ready")
+    try:
+        s2 = server_ctx.wrap_socket(s2, server_side=True)
+    except Exception as e:
+        print(e)
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket()
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    # The client will reject the SSL connection so wait until the server is ready
+    # so that it can see the rejection (otherwise it sees a closed socket).
+    multitest.wait("ready")
+    try:
+        s = client_ctx.wrap_socket(s)
+    except Exception as e:
+        print(e)
+    s.close()
diff --git a/tests/multi_net/sslcontext_check_hostname_error.py.exp b/tests/multi_net/sslcontext_check_hostname_error.py.exp
new file mode 100644
index 0000000000000..d29279f8600c6
--- /dev/null
+++ b/tests/multi_net/sslcontext_check_hostname_error.py.exp
@@ -0,0 +1,4 @@
+--- instance0 ---
+(-29312, 'MBEDTLS_ERR_SSL_CONN_EOF')
+--- instance1 ---
+CERT_REQUIRED requires server_hostname
diff --git a/tests/multi_net/sslcontext_getpeercert.py b/tests/multi_net/sslcontext_getpeercert.py
new file mode 100644
index 0000000000000..b95b13f0fc04e
--- /dev/null
+++ b/tests/multi_net/sslcontext_getpeercert.py
@@ -0,0 +1,55 @@
+# Test creating an SSL connection and getting the peer certificate.
+
+try:
+    import os
+    import socket
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+# 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()
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    s2 = server_ctx.wrap_socket(s2, server_side=True)
+    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])
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
+    print(s.getpeercert(True))
+    s.write(b"client to server")
+    print(s.read(16))
+    s.close()
diff --git a/tests/multi_net/sslcontext_getpeercert.py.exp b/tests/multi_net/sslcontext_getpeercert.py.exp
new file mode 100644
index 0000000000000..24ab0883e3eba
--- /dev/null
+++ b/tests/multi_net/sslcontext_getpeercert.py.exp
@@ -0,0 +1,5 @@
+--- instance0 ---
+b'client to server'
+--- instance1 ---
+None
+b'server to client'
diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py
new file mode 100644
index 0000000000000..4d2ac06c58d1e
--- /dev/null
+++ b/tests/multi_net/sslcontext_server_client.py
@@ -0,0 +1,60 @@
+# Test creating an SSL connection with certificates as bytes objects.
+
+try:
+    import os
+    import socket
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+certfile = "multi_net/rsa_cert.der"
+keyfile = "multi_net/rsa_key.der"
+
+try:
+    os.stat(certfile)
+    os.stat(keyfile)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+with open(certfile, "rb") as cf:
+    cert = cadata = cf.read()
+
+with open(keyfile, "rb") as kf:
+    key = kf.read()
+
+
+# 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()
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    s2 = server_ctx.wrap_socket(s2, server_side=True)
+    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])
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cadata=cadata)
+    s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
+    s.write(b"client to server")
+    print(s.read(16))
+    s.close()
diff --git a/tests/multi_net/sslcontext_server_client.py.exp b/tests/multi_net/sslcontext_server_client.py.exp
new file mode 100644
index 0000000000000..909c496d019e1
--- /dev/null
+++ b/tests/multi_net/sslcontext_server_client.py.exp
@@ -0,0 +1,4 @@
+--- instance0 ---
+b'client to server'
+--- instance1 ---
+b'server to client'
diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py
new file mode 100644
index 0000000000000..e2de4e6ad4f0f
--- /dev/null
+++ b/tests/multi_net/sslcontext_server_client_ciphers.py
@@ -0,0 +1,58 @@
+# Test creating an SSL connection with specified ciphers.
+
+try:
+    import os
+    import socket
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+# 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()
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    s2 = server_ctx.wrap_socket(s2, server_side=True)
+    assert isinstance(s2.cipher(), tuple)
+    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])
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    ciphers = client_ctx.get_ciphers()
+    assert "TLS-RSA-WITH-AES-256-CBC-SHA256" in ciphers
+    client_ctx.set_ciphers(["TLS-RSA-WITH-AES-256-CBC-SHA256"])
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
+    s.write(b"client to server")
+    print(s.read(16))
+    s.close()
diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py.exp b/tests/multi_net/sslcontext_server_client_ciphers.py.exp
new file mode 100644
index 0000000000000..909c496d019e1
--- /dev/null
+++ b/tests/multi_net/sslcontext_server_client_ciphers.py.exp
@@ -0,0 +1,4 @@
+--- instance0 ---
+b'client to server'
+--- instance1 ---
+b'server to client'
diff --git a/tests/multi_net/sslcontext_server_client_files.py b/tests/multi_net/sslcontext_server_client_files.py
new file mode 100644
index 0000000000000..2c8af21d23a30
--- /dev/null
+++ b/tests/multi_net/sslcontext_server_client_files.py
@@ -0,0 +1,54 @@
+# Test creating an SSL connection with certificates from a file.
+
+try:
+    import os
+    import socket
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+# 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()
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    s2 = server_ctx.wrap_socket(s2, server_side=True)
+    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])
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
+    s.write(b"client to server")
+    print(s.read(16))
+    s.close()
diff --git a/tests/multi_net/sslcontext_server_client_files.py.exp b/tests/multi_net/sslcontext_server_client_files.py.exp
new file mode 100644
index 0000000000000..909c496d019e1
--- /dev/null
+++ b/tests/multi_net/sslcontext_server_client_files.py.exp
@@ -0,0 +1,4 @@
+--- instance0 ---
+b'client to server'
+--- instance1 ---
+b'server to client'
diff --git a/tests/multi_net/sslcontext_verify_error.py b/tests/multi_net/sslcontext_verify_error.py
new file mode 100644
index 0000000000000..4feb4ce983b3d
--- /dev/null
+++ b/tests/multi_net/sslcontext_verify_error.py
@@ -0,0 +1,58 @@
+# Test creating an SSL connection with an invalid certificate.
+
+try:
+    import os
+    import socket
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+# 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()
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    try:
+        s2 = server_ctx.wrap_socket(s2, server_side=True)
+    except Exception as e:
+        print(e)
+    multitest.broadcast("finished")
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket()
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    try:
+        s = client_ctx.wrap_socket(s, server_hostname="foobar.local")
+    except Exception as e:
+        print(e)
+    # Don't close the socket until the server has seen our SSL rejection.
+    multitest.wait("finished")
+    s.close()
diff --git a/tests/multi_net/sslcontext_verify_error.py.exp b/tests/multi_net/sslcontext_verify_error.py.exp
new file mode 100644
index 0000000000000..900c7c2308932
--- /dev/null
+++ b/tests/multi_net/sslcontext_verify_error.py.exp
@@ -0,0 +1,6 @@
+--- instance0 ---
+(-30592, 'MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE')
+--- instance1 ---
+
+The certificate Common Name (CN) does not match with the expected CN
+
diff --git a/tests/multi_net/sslcontext_verify_time_error.py b/tests/multi_net/sslcontext_verify_time_error.py
new file mode 100644
index 0000000000000..36711acfc8f67
--- /dev/null
+++ b/tests/multi_net/sslcontext_verify_time_error.py
@@ -0,0 +1,58 @@
+# Test creating an SSL connection with an expired certificate.
+
+try:
+    import os
+    import socket
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/expired_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+# 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()
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    try:
+        s2 = server_ctx.wrap_socket(s2, server_side=True)
+    except Exception as e:
+        print(e)
+    multitest.broadcast("finished")
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket()
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    try:
+        s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
+    except Exception as e:
+        print(e)
+    # Don't close the socket until the server has seen our SSL rejection.
+    multitest.wait("finished")
+    s.close()
diff --git a/tests/multi_net/sslcontext_verify_time_error.py.exp b/tests/multi_net/sslcontext_verify_time_error.py.exp
new file mode 100644
index 0000000000000..25f754c97e545
--- /dev/null
+++ b/tests/multi_net/sslcontext_verify_time_error.py.exp
@@ -0,0 +1,6 @@
+--- instance0 ---
+(-30592, 'MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE')
+--- instance1 ---
+
+The certificate validity has expired
+
diff --git a/tests/net_inet/mpycert.der b/tests/net_inet/mpycert.der
new file mode 100644
index 0000000000000000000000000000000000000000..2d66ea723ea4f983874b3ffacdf612bd90e150d7
GIT binary patch
literal 1306
zcmXqLVihxJV*0m$nTe5!NswWpHiy@F9*O0_->&JYE{~5g;AP{~YV&CO&dbQi&B|cl
zZ^&)H$;KSY!Y0fV8f>U(pbp}22`hN!m82HsrIsiJrzV#cWtLPb1f>?ICKe@UD7Y8p
zmlha`8VG}wG7Ix~1_!w-1m)+KC`1?<$cghB85md^m>7UT6p(9bU}<P-Xa?d(85p5j
zC}to6v5?m%wM4yG!8I?rsIs60rifXXDahEMiBSpJ-HfaZ%uS5^3_x)%rY1&4hTTk}
z8fU&Om~xq4=uL0vq{Ba&KF(ZL<<zk}R&CW*?VU$`Hm>i>{#klr@pXRpDI%e!;XU(K
zEV7jR+GOLj(l76;^<ll+y$3eLe2%nu{`P$4hbV68eFvtfsJ8zyFWfBrTxQL~+3#;Z
zv33n|owo8|@HvwcLGQM%d)t36q2STdkk#9A`KB**Fv-@wyeI8-nn}&C?C$<>&6z(8
z#AA0A<^OIxy7p3Agsu4T=bXDgYJYFLbMRJS>=n1iXV$77?AVi#UYfS~qr~?`G0%ek
zTXk%6U;1BI;?)e!a{IZ#KhHBh{kp6`Tx5OnlK(R|Po8@xcsbiYk5<`*nd?+bcMG2h
zV*dIzaAEgtQ6^?a2FArrj2yraVKLwX2B<7QBjbM-7GNT1Gmr)GRarnG&7sZ4$jZvj
z%mimK8VG@;g+a<W4A_7a6C(pe3m=OZi-?HcX7TM2VW-yxa5_AbUq827<j^q#d5{)m
z76}8f29e4wk<Y5PJ$=Gh+`!RsLMr0h%h`DbMlkak8Clc}R1B10d;_L7v5b<E0xNy}
z3PZh2y_{5FeCy>GrR#$eo~%5Jf`OcY%mS$e637aZkrgU|Y*%2BHjp&nU}H;f<Y8oD
z1SSt|px;;+o9+X>0^%a4a^@zWr&>?>x!W!N-s;l2=W2SzrWwg=OMT_0*&3%7h3Gae
zcy;*g4~6~lXSNqGY|pd)7B}VI6NUN9-gj?ee!gg{n9am<Ti#kSJ+D#ia(|YZXYcmq
z=7)1rwBLoC6WY_G?!DvS4E;sx&lXPf;@Ey-hjKNGF2_%faJ%N4EXG{!iWQtq>W8&X
z%-(q}=2Oav1N$lu`1j?y@Wf5pt@piK;Nc5d7tPy|3U8BlD*g~sn=(0kfov+vK`y0r
z0=&-C7fQ(2J$TS&zBOv&UW5JZdD>e475$`H4}X=I{vmG7;iWsWKIrYSHs1Np``(#9
zPu90^x7i;EbvFB!@z6{>t8eDT|4SW~n`}RDA=%Q@vNZ40uCf!8nO?5+&JjPy!*p|R
z<L~*~Gp?|uZf>$I5B||t$-I`!kiAsP`9|pUq9dAo-;c!loml7AVsQOaYrMq5%H7Z7
z3cA@JwoN{~v;R(Fp{myU`)^ePf-<@%-FbR#>*HIs7us`L6b;ukef_<2^@&b#+lM|+
zE%?6e)!sX;QRMa2+qMeJ>mn~d`VsLndWXl^e=+`In*ZcNmDisT+|c`~X7U7a{l9A#
zak{(Ne|WiJ`+p7J45Mr5adMf9C-3+=w_Bh4Qjqhqe53GGU!%tR7QwBtb+KuhuXfyh
uGIi_Otzkk=XOH+DQ?+mj$bEB;AyneuOV5-mey66-*%E!Ac*W`+?uP)U>;Po|

literal 0
HcmV?d00001

diff --git a/tests/net_inet/test_sslcontext_client.py b/tests/net_inet/test_sslcontext_client.py
new file mode 100644
index 0000000000000..860b053d5b481
--- /dev/null
+++ b/tests/net_inet/test_sslcontext_client.py
@@ -0,0 +1,52 @@
+import os
+import socket
+import 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 = "mpycert.der"
+try:
+    os.stat(ca_cert_chain)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+def main(use_stream=True):
+    context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+
+    context.verify_mode = ssl.CERT_REQUIRED
+    assert context.verify_mode == ssl.CERT_REQUIRED
+
+    context.load_verify_locations(cafile=ca_cert_chain)
+
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    addr = socket.getaddrinfo("micropython.org", 443)[0][-1]
+
+    # CPython can wrap the socket even if not connected yet.
+    # ssl_sock = context.wrap_socket(s, server_hostname='micropython.org')
+    # ssl_sock.connect(addr)
+
+    # MicroPython needs to connect first, CPython can do this too.
+    s.connect(addr)
+    # server_hostname must match CN (Common Name) in the certificate
+    # presented by the server
+    ssl_sock = context.wrap_socket(s, server_hostname="micropython.org")
+    ssl_sock.write(b"GET / HTTP/1.0\r\n\r\n")
+    print(ssl_sock.read(17))
+    assert isinstance(ssl_sock.cipher(), tuple)
+    ssl_sock.close()
+
+
+main()
diff --git a/tests/net_inet/test_sslcontext_client.py.exp b/tests/net_inet/test_sslcontext_client.py.exp
new file mode 100644
index 0000000000000..fb69ecf1a66aa
--- /dev/null
+++ b/tests/net_inet/test_sslcontext_client.py.exp
@@ -0,0 +1 @@
+b'HTTP/1.1 200 OK\r\n'

From 58e75264c195438c14917485283b7b2f135067f1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Dec 2023 16:03:20 +1100
Subject: [PATCH 0659/3129] lib/mbedtls_errors: Update error list for latest
 esp32 mbedtls.

Running `./do-esp32.sh` now generates this esp32_mbedtls_errors.c file,
with IDF v5.0.4.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/mbedtls_errors/esp32_mbedtls_errors.c | 191 +++++++---------------
 1 file changed, 63 insertions(+), 128 deletions(-)

diff --git a/lib/mbedtls_errors/esp32_mbedtls_errors.c b/lib/mbedtls_errors/esp32_mbedtls_errors.c
index c56f8a19ffb15..5d89d15b4dae3 100644
--- a/lib/mbedtls_errors/esp32_mbedtls_errors.c
+++ b/lib/mbedtls_errors/esp32_mbedtls_errors.c
@@ -45,10 +45,6 @@
 #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
@@ -65,10 +61,6 @@
 #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
@@ -89,10 +81,6 @@
 #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
@@ -113,6 +101,14 @@
 #include "mbedtls/entropy.h"
 #endif
 
+#if defined(MBEDTLS_ERROR_C)
+#include "mbedtls/error.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#endif
+
 #if defined(MBEDTLS_GCM_C)
 #include "mbedtls/gcm.h"
 #endif
@@ -125,20 +121,12 @@
 #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"
+#if defined(MBEDTLS_LMS_C)
+#include "mbedtls/lms.h"
 #endif
 
-#if defined(MBEDTLS_MD4_C)
-#include "mbedtls/md4.h"
-#endif
-
-#if defined(MBEDTLS_MD5_C)
-#include "mbedtls/md5.h"
+#if defined(MBEDTLS_MD_C)
+#include "mbedtls/md.h"
 #endif
 
 #if defined(MBEDTLS_NET_C)
@@ -149,10 +137,6 @@
 #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
@@ -169,18 +153,14 @@
 #include "mbedtls/pkcs5.h"
 #endif
 
-#if defined(MBEDTLS_PLATFORM_C)
-#include "mbedtls/platform.h"
+#if defined(MBEDTLS_PKCS7_C)
+#include "mbedtls/pkcs7.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
@@ -209,10 +189,6 @@
 #include "mbedtls/x509.h"
 #endif
 
-#if defined(MBEDTLS_XTEA_C)
-#include "mbedtls/xtea.h"
-#endif
-
 
 // Error code table type
 struct ssl_errs {
@@ -231,7 +207,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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)
@@ -244,7 +219,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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 */
 
@@ -257,7 +231,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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 */
 
@@ -266,7 +239,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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)
@@ -296,7 +268,7 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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" },
+        { -(MBEDTLS_ERR_PK_BUFFER_TOO_SMALL), "PK_BUFFER_TOO_SMALL" },
 #endif /* MBEDTLS_PK_C */
 
 #if defined(MBEDTLS_PKCS12_C)
@@ -313,6 +285,21 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH), "PKCS5_PASSWORD_MISMATCH" },
 #endif /* MBEDTLS_PKCS5_C */
 
+#if defined(MBEDTLS_PKCS7_C)
+        { -(MBEDTLS_ERR_PKCS7_INVALID_FORMAT), "PKCS7_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PKCS7_FEATURE_UNAVAILABLE), "PKCS7_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_VERSION), "PKCS7_INVALID_VERSION" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_CONTENT_INFO), "PKCS7_INVALID_CONTENT_INFO" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_ALG), "PKCS7_INVALID_ALG" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_CERT), "PKCS7_INVALID_CERT" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_SIGNATURE), "PKCS7_INVALID_SIGNATURE" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_SIGNER_INFO), "PKCS7_INVALID_SIGNER_INFO" },
+        { -(MBEDTLS_ERR_PKCS7_BAD_INPUT_DATA), "PKCS7_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PKCS7_ALLOC_FAILED), "PKCS7_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_PKCS7_VERIFY_FAIL), "PKCS7_VERIFY_FAIL" },
+        { -(MBEDTLS_ERR_PKCS7_CERT_DATE_INVALID), "PKCS7_CERT_DATE_INVALID" },
+#endif /* MBEDTLS_PKCS7_C */
+
 #if defined(MBEDTLS_RSA_C)
         { -(MBEDTLS_ERR_RSA_BAD_INPUT_DATA), "RSA_BAD_INPUT_DATA" },
         { -(MBEDTLS_ERR_RSA_INVALID_PADDING), "RSA_INVALID_PADDING" },
@@ -323,45 +310,34 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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_CRYPTO_IN_PROGRESS), "SSL_CRYPTO_IN_PROGRESS" },
         { -(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_DECODE_ERROR), "SSL_DECODE_ERROR" },
         { -(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_UNSUPPORTED_EXTENSION), "SSL_UNSUPPORTED_EXTENSION" },
+        { -(MBEDTLS_ERR_SSL_NO_APPLICATION_PROTOCOL), "SSL_NO_APPLICATION_PROTOCOL" },
         { -(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_UNRECOGNIZED_NAME), "SSL_UNRECOGNIZED_NAME" },
         { -(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_BAD_CERTIFICATE), "SSL_BAD_CERTIFICATE" },
+        { -(MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET), "SSL_RECEIVED_NEW_SESSION_TICKET" },
+        { -(MBEDTLS_ERR_SSL_CANNOT_READ_EARLY_DATA), "SSL_CANNOT_READ_EARLY_DATA" },
+        { -(MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA), "SSL_CANNOT_WRITE_EARLY_DATA" },
         { -(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_BAD_PROTOCOL_VERSION), "SSL_BAD_PROTOCOL_VERSION" },
+        { -(MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE), "SSL_HANDSHAKE_FAILURE" },
         { -(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" },
@@ -370,18 +346,18 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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_ILLEGAL_PARAMETER), "SSL_ILLEGAL_PARAMETER" },
         { -(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" },
+        { -(MBEDTLS_ERR_SSL_UNEXPECTED_CID), "SSL_UNEXPECTED_CID" },
+        { -(MBEDTLS_ERR_SSL_VERSION_MISMATCH), "SSL_VERSION_MISMATCH" },
         { -(MBEDTLS_ERR_SSL_BAD_CONFIG), "SSL_BAD_CONFIG" },
 #endif /* MBEDTLS_SSL_TLS_C */
 
@@ -418,19 +394,11 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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)
@@ -459,28 +427,18 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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)
@@ -488,10 +446,6 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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" },
@@ -501,7 +455,6 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
 
 #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)
@@ -512,10 +465,20 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR), "ENTROPY_FILE_IO_ERROR" },
 #endif /* MBEDTLS_ENTROPY_C */
 
+#if defined(MBEDTLS_ERROR_C)
+    { -(MBEDTLS_ERR_ERROR_GENERIC_ERROR), "ERROR_GENERIC_ERROR" },
+    { -(MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED), "ERROR_CORRUPTION_DETECTED" },
+#endif /* MBEDTLS_ERROR_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_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" },
+    { -(MBEDTLS_ERR_GCM_BUFFER_TOO_SMALL), "GCM_BUFFER_TOO_SMALL" },
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_HKDF_C)
@@ -529,17 +492,13 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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_LMS_C)
+    { -(MBEDTLS_ERR_LMS_BAD_INPUT_DATA), "LMS_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_LMS_OUT_OF_PRIVATE_KEYS), "LMS_OUT_OF_PRIVATE_KEYS" },
+    { -(MBEDTLS_ERR_LMS_VERIFY_FAILED), "LMS_VERIFY_FAILED" },
+    { -(MBEDTLS_ERR_LMS_ALLOC_FAILED), "LMS_ALLOC_FAILED" },
+    { -(MBEDTLS_ERR_LMS_BUFFER_TOO_SMALL), "LMS_BUFFER_TOO_SMALL" },
+#endif /* MBEDTLS_LMS_C */
 
 #if defined(MBEDTLS_NET_C)
     { -(MBEDTLS_ERR_NET_SOCKET_FAILED), "NET_SOCKET_FAILED" },
@@ -562,50 +521,26 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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
 };
 
@@ -655,7 +590,7 @@ void mbedtls_strerror(int ret, char *buf, size_t buflen) {
     if (got_hl) {
         use_ret = ret & 0xFF80;
 
-        // special case
+        // special case, don't try to translate low level code
 #if defined(MBEDTLS_SSL_TLS_C)
         if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
             strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);

From c9eb6bc6016a7f13cc624b6a4160599ab6b166ff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Dec 2023 16:05:03 +1100
Subject: [PATCH 0660/3129] esp32: Re-enable custom mbedtls error string
 tables.

To match other ports that use mbedtls.

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

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 71b42a590da5e..a3637870f4fe3 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -42,7 +42,7 @@ list(APPEND 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/esp32_mbedtls_errors.c
+    ${MICROPY_DIR}/lib/mbedtls_errors/esp32_mbedtls_errors.c
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
 )

From ef996d15b9cbadee591a185f27fb16e90a5d4f5d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Dec 2023 17:15:24 +1100
Subject: [PATCH 0661/3129] extmod/modssl_mbedtls: Make SSLSocket.getpeercert()
 optional.

And only enable this method when the relevant feature is available in
mbedtls.  Otherwise, if mbedtls doesn't support getting the peer
certificate, this method always returns None and it's confusing why it does
that.  It's better to remove the method altogether, so the error trying to
use it is more obvious.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modssl_mbedtls.c                       | 4 ++++
 tests/multi_net/sslcontext_getpeercert.py     | 9 ++++++++-
 tests/multi_net/sslcontext_getpeercert.py.exp | 2 +-
 tests/net_hosted/ssl_getpeercert.py           | 7 +++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 3d420759dad8f..cdb4f2b0886f8 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -554,6 +554,7 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     mbedtls_raise_error(ret);
 }
 
+#if defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)
 STATIC mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
     if (!mp_obj_is_true(binary_form)) {
@@ -566,6 +567,7 @@ STATIC mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
     return mp_obj_new_bytes(peer_cert->raw.p, peer_cert->raw.len);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_ssl_getpeercert_obj, mod_ssl_getpeercert);
+#endif
 
 STATIC mp_obj_t mod_ssl_cipher(mp_obj_t o_in) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
@@ -726,7 +728,9 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     #if MICROPY_UNIX_COVERAGE
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
     #endif
+    #if defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)
     { MP_ROM_QSTR(MP_QSTR_getpeercert), MP_ROM_PTR(&mod_ssl_getpeercert_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_cipher), MP_ROM_PTR(&mod_ssl_cipher_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
diff --git a/tests/multi_net/sslcontext_getpeercert.py b/tests/multi_net/sslcontext_getpeercert.py
index b95b13f0fc04e..c75a37952ee4b 100644
--- a/tests/multi_net/sslcontext_getpeercert.py
+++ b/tests/multi_net/sslcontext_getpeercert.py
@@ -1,6 +1,7 @@
 # Test creating an SSL connection and getting the peer certificate.
 
 try:
+    import io
     import os
     import socket
     import ssl
@@ -42,6 +43,12 @@ def instance0():
 
 # Client
 def instance1():
+    s_test = ssl.wrap_socket(io.BytesIO(), server_side=True, do_handshake=False)
+    s_test.close()
+    if not hasattr(s_test, "getpeercert"):
+        print("SKIP")
+        raise SystemExit
+
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
@@ -49,7 +56,7 @@ def instance1():
     client_ctx.verify_mode = ssl.CERT_REQUIRED
     client_ctx.load_verify_locations(cafile=cafile)
     s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
-    print(s.getpeercert(True))
+    print(s.getpeercert(True).hex())
     s.write(b"client to server")
     print(s.read(16))
     s.close()
diff --git a/tests/multi_net/sslcontext_getpeercert.py.exp b/tests/multi_net/sslcontext_getpeercert.py.exp
index 24ab0883e3eba..7b0e9d40a64c7 100644
--- a/tests/multi_net/sslcontext_getpeercert.py.exp
+++ b/tests/multi_net/sslcontext_getpeercert.py.exp
@@ -1,5 +1,5 @@
 --- instance0 ---
 b'client to server'
 --- instance1 ---
-None
+3082058930820371a00302010202141b3da08b15005eea265d0b57b8ba99812ab274cb300d06092a864886f70d01010b05003054310b30090603550406130241553113301106035504080c0a536f6d652d537461746531143012060355040a0c0b4d6963726f507974686f6e311a301806035504030c116d6963726f707974686f6e2e6c6f63616c301e170d3233313131393032323932375a170d3238313131373032323932375a3054310b30090603550406130241553113301106035504080c0a536f6d652d537461746531143012060355040a0c0b4d6963726f507974686f6e311a301806035504030c116d6963726f707974686f6e2e6c6f63616c30820222300d06092a864886f70d01010105000382020f003082020a0282020100deee37780ebca47e0f414ba033ebe692d2bc374a0eb1f42556bf266ad704208116ee0d8b2fd0b518074ad0981c4fd1322de81696ccea838884b06f56d3ebe49cf0561050f6f8ced5f7f4f13d086b28779a9647bbfae6c3f3ad68a5b28ee8a1ceb260d87ea300316599c4dd9f6082f89164b590df8695add518339f6730dec4f05b1ef63548329b0a48823035b23737f3303b56aa251dd8dcf0c20e6c1d291374c185ae657b349c20721c7c01a1b393c96d4c5f2bc8e2dfca7dab896e2fa84dee53d2bb6dbd1056970fa1812315e8ee9d92b3cb93e0b563d274bf07dd79600ef403b91d4ce814418b28cfaeb2b7d8401e64f6d4f39283df3204f2fe01f2fd289f5d2078d9ee2f96b6de1fd4284d9274fa38b0ad9ffcce8ffe66673be2cf304ee1b27c7cacaaf4ca76f1e84419e6e80f540add3e91cd469903e9ceb6bd2b1c33caa59acb5516ce8ac00e73d7a551bb65d39bd6af04411e81c20e6bd474d797a0bcd498e26720bd60ae4f900bb1afa59c7ac7a336273c7734ca5874ea63fb8ec787ab702041442da11a922baf5fbeb9eeea4f9f49cb1f659b561806d2169dbed07c43558c908c94e16491fe1a22cd92b8f33c1184353bdc985c88722f65e48024910f723035c0d33b789928296fb193cec6350884243b00bf51422ad09fb7012bd9cad4716803422be0d111deace913fac8cb2be1e96fa8449068430e5424bd0bd10203010001a3533051301d0603551d0e041604147d392a82ab464936fd7d74226694556a2945fd8d301f0603551d230418301680147d392a82ab464936fd7d74226694556a2945fd8d300f0603551d130101ff040530030101ff300d06092a864886f70d01010b05000382020100ae40c015e3eade8dabc84ee357ac9d694e7cd69ce4a1b265880273d16257119aa72fb2aa8b841e2899bea3e8690146f24d963a37825c93bf745447dc6ab09b5f2947671dca13b1e71f5c3e43011d74cdc688ed1215b3016071ae7235d77f79d7bb81f097bb04a08ccf400717721b29e2ea913eb23614610597deee477ed716db7e8ebe11aed39c7035f48259dfa54d88871c1f67159d52ce11eb111fa00708a7d7081c07fd92d54abbaec7ff1b50ce2f6f358857d2f55d1c7b5aa6dd66b9c3c2e654397e2d5330aca9834ff8fd749ce968c706fe3bb1b8510a379ec1910d7ece0212c34d56a2073fb7f25c88fe298568e448d03ec30b348f7d9a8836390216a6da7a8efed50dfb8c21a8531efc158e7f4398f87af18d1bd2926d08d34364bf5d85e88040dff3d3f1da6268dbc0cafa64f544c065380fa695a8d015b385aed0a1fd9ff1d7c2b28a549e04c1132b421f85a85640acac11c69416859fb9b461eeddffa92ae303b35c7233537077068de558dd02715e25aee976a97879038d2952be0d327892ab2fc78716b0d7aab4b923d5d79905f7f8b6a18c42e466fec62f84b6e5957deae0964dab8436b0e0cd4e08012661bafb9588fbfd7068fd6c08ab79101a4bdfe21d95cd0ee0aad7dd8a3ed128071c0ec2d063dc6dfa63189e51bf5d9259e776d7623f745a73f4e12e5c2b90493de1c6436b339e1400891e3e35c31057
 b'server to client'
diff --git a/tests/net_hosted/ssl_getpeercert.py b/tests/net_hosted/ssl_getpeercert.py
index 0df895a654be1..e0a1350fa7379 100644
--- a/tests/net_hosted/ssl_getpeercert.py
+++ b/tests/net_hosted/ssl_getpeercert.py
@@ -1,8 +1,15 @@
 # test ssl.getpeercert() method
 
+import io
 import socket
 import ssl
 
+s_test = ssl.wrap_socket(io.BytesIO(), server_side=True, do_handshake=False)
+s_test.close()
+if not hasattr(s_test, "getpeercert"):
+    print("SKIP")
+    raise SystemExit
+
 
 def test(peer_addr):
     s = socket.socket()

From bba8a673d5ed6ad4404502c32dac003ad9d59bde Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Dec 2023 17:17:22 +1100
Subject: [PATCH 0662/3129] tests: Update SSL network tests to use SSLContext,
 and work on CPython.

Changes are:
- use ssl.SSLContext.wrap_socket instead of ssl.wrap_socket
- disable check_hostname and call load_default_certs() where appropriate,
  to get CPython to run the tests correctly
- pass socket.AF_INET to getaddrinfo and socket.socket(), to force IPv4
- change tests to use github.com instead of google.com, because certificate
  validation was failing with google.com

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_hosted/connect_nonblock_xfer.py |  9 +++----
 tests/net_inet/ssl_errors.py              | 28 ++++++++++++----------
 tests/net_inet/test_tls_nonblock.py       | 26 +++++++++++---------
 tests/net_inet/test_tls_sites.py          | 29 +++++++++++++++--------
 tests/net_inet/test_tls_sites.py.exp      |  5 ----
 tests/net_inet/tls_text_errors.py         |  8 +++++--
 6 files changed, 61 insertions(+), 44 deletions(-)
 delete mode 100644 tests/net_inet/test_tls_sites.py.exp

diff --git a/tests/net_hosted/connect_nonblock_xfer.py b/tests/net_hosted/connect_nonblock_xfer.py
index e669a5766c49b..dc4693cea6a8c 100644
--- a/tests/net_hosted/connect_nonblock_xfer.py
+++ b/tests/net_hosted/connect_nonblock_xfer.py
@@ -27,11 +27,12 @@ def do_connect(peer_addr, tls, handshake):
             print("  got", er.errno)
     # wrap with ssl/tls if desired
     if tls:
+        ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        if hasattr(ssl_context, "check_hostname"):
+            ssl_context.check_hostname = False
+
         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)
+            s = ssl_context.wrap_socket(s, do_handshake_on_connect=handshake)
             print("wrap: True")
         except Exception as e:
             dp(e)
diff --git a/tests/net_inet/ssl_errors.py b/tests/net_inet/ssl_errors.py
index 65f3637e9e2f1..bc4e5910bccd8 100644
--- a/tests/net_inet/ssl_errors.py
+++ b/tests/net_inet/ssl_errors.py
@@ -1,12 +1,12 @@
 # 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, errno, socket, ssl
+import sys, errno, select, socket, ssl
 
 
 def test(addr, hostname, block=True):
-    print("---", hostname or addr)
-    s = socket.socket()
+    print("---", hostname)
+    s = socket.socket(socket.AF_INET)
     s.setblocking(block)
     try:
         s.connect(addr)
@@ -16,11 +16,15 @@ def test(addr, hostname, block=True):
             raise
         print("EINPROGRESS")
 
+    if sys.implementation.name != "micropython":
+        # in CPython we have to wait, otherwise wrap_socket is not happy
+        select.select([], [s], [])
+
+    ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    ssl_context.verify_mode = ssl.CERT_REQUIRED
+
     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)
+        s = ssl_context.wrap_socket(s, do_handshake_on_connect=block, server_hostname=hostname)
         print("wrap: True")
     except OSError:
         print("wrap: error")
@@ -36,11 +40,11 @@ def test(addr, hostname, block=True):
 
 if __name__ == "__main__":
     # connect to plain HTTP port, oops!
-    addr = socket.getaddrinfo("micropython.org", 80)[0][-1]
-    test(addr, None)
+    addr = socket.getaddrinfo("micropython.org", 80, socket.AF_INET)[0][-1]
+    test(addr, "micropython.org")
     # connect to plain HTTP port, oops!
-    addr = socket.getaddrinfo("micropython.org", 80)[0][-1]
-    test(addr, None, False)
+    addr = socket.getaddrinfo("micropython.org", 80, socket.AF_INET)[0][-1]
+    test(addr, "micropython.org", False)
     # connect to server with self-signed cert, oops!
-    addr = socket.getaddrinfo("test.mosquitto.org", 8883)[0][-1]
+    addr = socket.getaddrinfo("test.mosquitto.org", 8883, socket.AF_INET)[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
index 6378280a71d30..60af858b1f146 100644
--- a/tests/net_inet/test_tls_nonblock.py
+++ b/tests/net_inet/test_tls_nonblock.py
@@ -2,12 +2,12 @@
 
 
 def test_one(site, opts):
-    ai = socket.getaddrinfo(site, 443)
+    ai = socket.getaddrinfo(site, 443, socket.AF_INET)
     addr = ai[0][-1]
-    print(addr)
+    print(site)
 
     # Connect the raw socket
-    s = socket.socket()
+    s = socket.socket(socket.AF_INET)
     s.setblocking(False)
     try:
         s.connect(addr)
@@ -16,17 +16,22 @@ def test_one(site, opts):
         if e.errno != errno.EINPROGRESS:
             raise
 
+    # Create SSLContext.
+    ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+
+    # CPython compatibility:
+    # - disable check_hostname
+    # - load default system certificate chain
+    # - must wait for socket to be writable before calling wrap_socket
     if sys.implementation.name != "micropython":
-        # in CPython we have to wait, otherwise wrap_socket is not happy
+        ssl_context.check_hostname = False
+        ssl_context.load_default_certs()
         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)
+            s = ssl_context.wrap_socket(s, do_handshake_on_connect=False)
         except OSError as e:
             if e.errno != errno.EINPROGRESS:
                 raise
@@ -87,8 +92,7 @@ def test_one(site, opts):
 
 
 SITES = [
-    "google.com",
-    {"host": "www.google.com"},
+    "www.github.com",
     "micropython.org",
     "pypi.org",
     {"host": "api.pushbullet.com", "sni": True},
@@ -105,7 +109,7 @@ def main():
             test_one(site, opts)
             print(site, "ok")
         except Exception as e:
-            print(site, "error")
+            print(site, "error", e)
     print("DONE")
 
 
diff --git a/tests/net_inet/test_tls_sites.py b/tests/net_inet/test_tls_sites.py
index 4f457b3abcba1..d60f4872b6c52 100644
--- a/tests/net_inet/test_tls_sites.py
+++ b/tests/net_inet/test_tls_sites.py
@@ -1,24 +1,34 @@
+import sys
+import select
 import socket
 import ssl
 
-# CPython only supports server_hostname with SSLContext
-if hasattr(ssl, "SSLContext"):
-    ssl = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-
 
 def test_one(site, opts):
-    ai = socket.getaddrinfo(site, 443)
+    ai = socket.getaddrinfo(site, 443, socket.AF_INET)
     addr = ai[0][-1]
 
-    s = socket.socket()
+    s = socket.socket(socket.AF_INET)
+
+    # Create SSLContext.
+    ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+
+    # CPython compatibility:
+    # - disable check_hostname
+    # - load default system certificate chain
+    # - must wait for socket to be writable before calling wrap_socket
+    if sys.implementation.name != "micropython":
+        ssl_context.check_hostname = False
+        ssl_context.load_default_certs()
+        select.select([], [s], [])
 
     try:
         s.connect(addr)
 
         if "sni" in opts:
-            s = ssl.wrap_socket(s, server_hostname=opts["host"])
+            s = ssl_context.wrap_socket(s, server_hostname=opts["host"])
         else:
-            s = ssl.wrap_socket(s)
+            s = ssl_context.wrap_socket(s)
 
         s.write(b"GET / HTTP/1.0\r\nHost: %s\r\n\r\n" % bytes(site, "latin"))
         resp = s.read(4096)
@@ -31,8 +41,7 @@ def test_one(site, opts):
 
 
 SITES = [
-    "google.com",
-    "www.google.com",
+    "www.github.com",
     "micropython.org",
     "pypi.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
deleted file mode 100644
index 09faa336a7151..0000000000000
--- a/tests/net_inet/test_tls_sites.py.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-google.com ok
-www.google.com ok
-micropython.org ok
-pypi.org ok
-api.pushbullet.com ok
diff --git a/tests/net_inet/tls_text_errors.py b/tests/net_inet/tls_text_errors.py
index 498593bba2203..034cc8d36e7aa 100644
--- a/tests/net_inet/tls_text_errors.py
+++ b/tests/net_inet/tls_text_errors.py
@@ -1,13 +1,17 @@
 # test that modtls produces a text error message
 
-import socket, ssl, sys
+import socket, ssl
 
 
 def test(addr):
     s = socket.socket()
     s.connect(addr)
     try:
-        s = ssl.wrap_socket(s)
+        ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        if hasattr(ssl_context, "check_hostname"):
+            # Disable hostname check on CPython.
+            ssl_context.check_hostname = False
+        s = ssl_context.wrap_socket(s)
         print("wrap: no exception")
     except OSError as e:
         # mbedtls produces "mbedtls -0x7200: SSL - An invalid SSL record was received"

From f33dfb966a1432281809e372b9d3803e7fd3cb2f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Dec 2023 12:03:36 +1100
Subject: [PATCH 0663/3129] extmod/modssl_mbedtls: Fix parsing of ciphers in
 set_ciphers method.

Fixes two issues:
- None should not be allowed in the list, otherwise the corresponding entry
  in ciphersuites[i] will have an undefined value.
- The terminating 0 needs to be put in ciphersuites[len].

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modssl_mbedtls.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index cdb4f2b0886f8..f407d94cbf52a 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -294,17 +294,15 @@ STATIC mp_obj_t ssl_context_set_ciphers(mp_obj_t self_in, mp_obj_t ciphersuite)
 
     // Parse list of ciphers.
     ssl_context->ciphersuites = m_new(int, len + 1);
-    for (int i = 0, n = len; i < n; i++) {
-        if (ciphers[i] != mp_const_none) {
-            const char *ciphername = mp_obj_str_get_str(ciphers[i]);
-            const int id = mbedtls_ssl_get_ciphersuite_id(ciphername);
-            ssl_context->ciphersuites[i] = id;
-            if (id == 0) {
-                mbedtls_raise_error(MBEDTLS_ERR_SSL_BAD_CONFIG);
-            }
+    for (size_t i = 0; i < len; ++i) {
+        const char *ciphername = mp_obj_str_get_str(ciphers[i]);
+        const int id = mbedtls_ssl_get_ciphersuite_id(ciphername);
+        if (id == 0) {
+            mbedtls_raise_error(MBEDTLS_ERR_SSL_BAD_CONFIG);
         }
+        ssl_context->ciphersuites[i] = id;
     }
-    ssl_context->ciphersuites[len + 1] = 0;
+    ssl_context->ciphersuites[len] = 0;
 
     // Configure ciphersuite.
     mbedtls_ssl_conf_ciphersuites(&ssl_context->conf, (const int *)ssl_context->ciphersuites);

From bfd6ad94ff950a4b7e3a2125db1539c5e4ca333a Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Thu, 30 Nov 2023 16:44:48 +0000
Subject: [PATCH 0664/3129] extmod/asyncio: Add ssl support with SSLContext.

This adds asyncio ssl support with SSLContext and the corresponding
tests in `tests/net_inet` and `tests/multi_net`.

Note that not doing the handshake on connect will delegate the handshake to
the following `mbedtls_ssl_read/write` calls.  However if the handshake
fails when a client certificate is required and not presented by the peer,
it needs to be notified of this handshake error (otherwise it will hang
until timeout if any).  Finally at MicroPython side raise the proper
mbedtls error code and message.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 .gitattributes                                |   1 +
 extmod/asyncio/stream.py                      |  29 +++++--
 extmod/modssl_mbedtls.c                       |  42 ++++++++++
 tests/multi_net/asyncio_tls_server_client.py  |  73 +++++++++++++++++
 .../asyncio_tls_server_client.py.exp          |   8 ++
 ...o_tls_server_client_cert_required_error.py |  76 +++++++++++++++++
 ...s_server_client_cert_required_error.py.exp |  10 +++
 .../asyncio_tls_server_client_readline.py     |  77 ++++++++++++++++++
 .../asyncio_tls_server_client_readline.py.exp |  10 +++
 .../asyncio_tls_server_client_verify_error.py |  77 ++++++++++++++++++
 ...ncio_tls_server_client_verify_error.py.exp |  12 +++
 .../asyncio_tls_open_connection_readline.py   |  59 ++++++++++++++
 tests/net_inet/isrg.der                       | Bin 0 -> 1391 bytes
 13 files changed, 469 insertions(+), 5 deletions(-)
 create mode 100644 tests/multi_net/asyncio_tls_server_client.py
 create mode 100644 tests/multi_net/asyncio_tls_server_client.py.exp
 create mode 100644 tests/multi_net/asyncio_tls_server_client_cert_required_error.py
 create mode 100644 tests/multi_net/asyncio_tls_server_client_cert_required_error.py.exp
 create mode 100644 tests/multi_net/asyncio_tls_server_client_readline.py
 create mode 100644 tests/multi_net/asyncio_tls_server_client_readline.py.exp
 create mode 100644 tests/multi_net/asyncio_tls_server_client_verify_error.py
 create mode 100644 tests/multi_net/asyncio_tls_server_client_verify_error.py.exp
 create mode 100644 tests/net_inet/asyncio_tls_open_connection_readline.py
 create mode 100644 tests/net_inet/isrg.der

diff --git a/.gitattributes b/.gitattributes
index fe0c4b47e0994..2d8496db50488 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,6 +13,7 @@
 *.jpg binary
 *.dxf binary
 *.mpy binary
+*.der binary
 
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
diff --git a/extmod/asyncio/stream.py b/extmod/asyncio/stream.py
index 5547bfbd51e77..bcc2a13a86fec 100644
--- a/extmod/asyncio/stream.py
+++ b/extmod/asyncio/stream.py
@@ -63,6 +63,8 @@ def readline(self):
         while True:
             yield core._io_queue.queue_read(self.s)
             l2 = self.s.readline()  # may do multiple reads but won't block
+            if l2 is None:
+                continue
             l += l2
             if not l2 or l[-1] == 10:  # \n (check l in case l2 is str)
                 return l
@@ -100,19 +102,29 @@ def drain(self):
 # Create a TCP stream connection to a remote host
 #
 # async
-def open_connection(host, port):
+def open_connection(host, port, ssl=None, server_hostname=None):
     from errno import EINPROGRESS
     import 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:
         s.connect(ai[-1])
     except OSError as er:
         if er.errno != EINPROGRESS:
             raise er
+    # wrap with SSL, if requested
+    if ssl:
+        if ssl is True:
+            import ssl as _ssl
+
+            ssl = _ssl.SSLContext(_ssl.PROTOCOL_TLS_CLIENT)
+        if not server_hostname:
+            server_hostname = host
+        s = ssl.wrap_socket(s, server_hostname=server_hostname, do_handshake_on_connect=False)
+        s.setblocking(False)
+    ss = Stream(s)
     yield core._io_queue.queue_write(s)
     return ss, ss
 
@@ -135,7 +147,7 @@ def close(self):
     async def wait_closed(self):
         await self.task
 
-    async def _serve(self, s, cb):
+    async def _serve(self, s, cb, ssl):
         self.state = False
         # Accept incoming connections
         while True:
@@ -156,6 +168,13 @@ async def _serve(self, s, cb):
             except:
                 # Ignore a failed accept
                 continue
+            if ssl:
+                try:
+                    s2 = ssl.wrap_socket(s2, server_side=True, do_handshake_on_connect=False)
+                except OSError as e:
+                    core.sys.print_exception(e)
+                    s2.close()
+                    continue
             s2.setblocking(False)
             s2s = Stream(s2, {"peername": addr})
             core.create_task(cb(s2s, s2s))
@@ -163,7 +182,7 @@ async def _serve(self, s, cb):
 
 # 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):
+async def start_server(cb, host, port, backlog=5, ssl=None):
     import socket
 
     # Create and bind server socket.
@@ -176,7 +195,7 @@ async def start_server(cb, host, port, backlog=5):
 
     # Create and return server object and task.
     srv = Server()
-    srv.task = core.create_task(srv._serve(s, cb))
+    srv.task = core.create_task(srv._serve(s, cb, ssl))
     try:
         # Ensure that the _serve task has been scheduled so that it gets to
         # handle cancellation.
diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index f407d94cbf52a..0190c96a9ab19 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -166,6 +166,46 @@ STATIC NORETURN void mbedtls_raise_error(int err) {
     #endif
 }
 
+STATIC void ssl_check_async_handshake_failure(mp_obj_ssl_socket_t *sslsock, int *errcode) {
+    if (
+        #if MBEDTLS_VERSION_NUMBER >= 0x03000000
+        (*errcode < 0) && (mbedtls_ssl_is_handshake_over(&sslsock->ssl) == 0) && (*errcode != MBEDTLS_ERR_SSL_CONN_EOF)
+        #else
+        (*errcode < 0) && (*errcode != MBEDTLS_ERR_SSL_CONN_EOF)
+        #endif
+        ) {
+        // Asynchronous handshake is done by mbdetls_ssl_read/write.  If the return code is
+        // MBEDTLS_ERR_XX (i.e < 0) and the handshake is not done due to a handshake failure,
+        // then notify peer with proper error code and raise local error with mbedtls_raise_error.
+
+        if (*errcode == MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE) {
+            // Check if TLSv1.3 and use proper alert for this case (to be implemented)
+            // uint8_t alert = MBEDTLS_SSL_ALERT_MSG_CERT_REQUIRED; tlsv1.3
+            // uint8_t alert = MBEDTLS_SSL_ALERT_MSG_HANDSHAKE_FAILURE; tlsv1.2
+            mbedtls_ssl_send_alert_message(&sslsock->ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
+                MBEDTLS_SSL_ALERT_MSG_HANDSHAKE_FAILURE);
+        }
+
+        if (*errcode == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED) {
+            // The certificate may have been rejected for several reasons.
+            char xcbuf[256];
+            uint32_t flags = mbedtls_ssl_get_verify_result(&sslsock->ssl);
+            int ret = mbedtls_x509_crt_verify_info(xcbuf, sizeof(xcbuf), "\n", flags);
+            // The length of the string written (not including the terminated nul byte),
+            // or a negative err code.
+            if (ret > 0) {
+                sslsock->sock = MP_OBJ_NULL;
+                mbedtls_ssl_free(&sslsock->ssl);
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%s"), xcbuf);
+            }
+        }
+
+        sslsock->sock = MP_OBJ_NULL;
+        mbedtls_ssl_free(&sslsock->ssl);
+        mbedtls_raise_error(*errcode);
+    }
+}
+
 /******************************************************************************/
 // SSLContext type.
 
@@ -614,6 +654,7 @@ STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
     } else {
         o->last_error = ret;
     }
+    ssl_check_async_handshake_failure(o, &ret);
     *errcode = ret;
     return MP_STREAM_ERROR;
 }
@@ -642,6 +683,7 @@ STATIC mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, in
     } else {
         o->last_error = ret;
     }
+    ssl_check_async_handshake_failure(o, &ret);
     *errcode = ret;
     return MP_STREAM_ERROR;
 }
diff --git a/tests/multi_net/asyncio_tls_server_client.py b/tests/multi_net/asyncio_tls_server_client.py
new file mode 100644
index 0000000000000..996cdb3e0def9
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client.py
@@ -0,0 +1,73 @@
+# Test asyncio TCP server and client with TLS, transferring some data.
+
+try:
+    import os
+    import asyncio
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+async def handle_connection(reader, writer):
+    data = await reader.read(100)
+    print("echo:", data)
+    writer.write(data)
+    await writer.drain()
+
+    print("close")
+    writer.close()
+    await writer.wait_closed()
+
+    print("done")
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT, ssl=server_ctx)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 10)
+
+
+async def tcp_client(message):
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    reader, writer = await asyncio.open_connection(
+        IP, PORT, ssl=client_ctx, server_hostname="micropython.local"
+    )
+    print("write:", message)
+    writer.write(message)
+    await writer.drain()
+    data = await reader.read(100)
+    print("read:", data)
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client(b"client data"))
diff --git a/tests/multi_net/asyncio_tls_server_client.py.exp b/tests/multi_net/asyncio_tls_server_client.py.exp
new file mode 100644
index 0000000000000..6dc6a9bbc7e52
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client.py.exp
@@ -0,0 +1,8 @@
+--- instance0 ---
+server running
+echo: b'client data'
+close
+done
+--- instance1 ---
+write: b'client data'
+read: b'client data'
diff --git a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
new file mode 100644
index 0000000000000..bd4d7b82ea75b
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
@@ -0,0 +1,76 @@
+# Test asyncio TCP server and client with TLS, giving a cert required error.
+
+try:
+    import os
+    import asyncio
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+async def handle_connection(reader, writer):
+    print("handle connection")
+    try:
+        data = await reader.read(100)
+    except Exception as e:
+        print(e)
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    server_ctx.verify_mode = ssl.CERT_REQUIRED
+    server_ctx.load_verify_locations(cafile=cert)
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT, ssl=server_ctx)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 10)
+        multitest.wait("finished")
+        print("server done")
+
+
+async def tcp_client(message):
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    reader, writer = await asyncio.open_connection(
+        IP, PORT, ssl=client_ctx, server_hostname="micropython.local"
+    )
+    try:
+        print("write:", message)
+        writer.write(message)
+        print("drain")
+        await writer.drain()
+    except Exception as e:
+        print(e)
+    print("client done")
+    multitest.broadcast("finished")
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client(b"client data"))
diff --git a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py.exp b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py.exp
new file mode 100644
index 0000000000000..0f905d0d23b2e
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py.exp
@@ -0,0 +1,10 @@
+--- instance0 ---
+server running
+handle connection
+(-29824, 'MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE')
+server done
+--- instance1 ---
+write: b'client data'
+drain
+(-30592, 'MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE')
+client done
diff --git a/tests/multi_net/asyncio_tls_server_client_readline.py b/tests/multi_net/asyncio_tls_server_client_readline.py
new file mode 100644
index 0000000000000..28add38f5d804
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client_readline.py
@@ -0,0 +1,77 @@
+# Test asyncio TCP server and client with TLS, using readline() to read data.
+
+try:
+    import os
+    import asyncio
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+async def handle_connection(reader, writer):
+    data = await reader.readline()
+    print("echo:", data)
+    data2 = await reader.readline()
+    print("echo:", data2)
+    writer.write(data + data2)
+    await writer.drain()
+
+    print("close")
+    writer.close()
+    await writer.wait_closed()
+
+    print("done")
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT, ssl=server_ctx)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 10)
+
+
+async def tcp_client(message):
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    reader, writer = await asyncio.open_connection(
+        IP, PORT, ssl=client_ctx, server_hostname="micropython.local"
+    )
+    print("write:", message)
+    writer.write(message)
+    await writer.drain()
+    data = await reader.readline()
+    print("read:", data)
+    data2 = await reader.readline()
+    print("read:", data2)
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client(b"client data\nclient data2\n"))
diff --git a/tests/multi_net/asyncio_tls_server_client_readline.py.exp b/tests/multi_net/asyncio_tls_server_client_readline.py.exp
new file mode 100644
index 0000000000000..4c93c5729aa76
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client_readline.py.exp
@@ -0,0 +1,10 @@
+--- instance0 ---
+server running
+echo: b'client data\n'
+echo: b'client data2\n'
+close
+done
+--- instance1 ---
+write: b'client data\nclient data2\n'
+read: b'client data\n'
+read: b'client data2\n'
diff --git a/tests/multi_net/asyncio_tls_server_client_verify_error.py b/tests/multi_net/asyncio_tls_server_client_verify_error.py
new file mode 100644
index 0000000000000..46a476addfbf6
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client_verify_error.py
@@ -0,0 +1,77 @@
+# Test asyncio TCP server and client with TLS, and an incorrect server_hostname.
+
+try:
+    import os
+    import asyncio
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "multi_net/rsa_cert.der"
+key = "multi_net/rsa_key.der"
+
+try:
+    os.stat(cafile)
+    os.stat(key)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+async def handle_connection(reader, writer):
+    print("handle connection")
+    try:
+        data = await reader.read(100)
+    except Exception as e:
+        print(e)
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+
+    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cert, key)
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT, ssl=server_ctx)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 10)
+    print("server done")
+    multitest.broadcast("finished")
+
+
+async def tcp_client(message):
+    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = ssl.CERT_REQUIRED
+    client_ctx.load_verify_locations(cafile=cafile)
+    reader, writer = await asyncio.open_connection(
+        IP,
+        PORT,
+        ssl=client_ctx,
+        server_hostname="foobar.local",  # incorrect server_hostname
+    )
+    try:
+        print("write:", message)
+        writer.write(message)
+        print("drain")
+        await writer.drain()
+    except Exception as e:
+        print(e)
+    multitest.wait("finished")
+    print("client done")
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client(b"client data"))
diff --git a/tests/multi_net/asyncio_tls_server_client_verify_error.py.exp b/tests/multi_net/asyncio_tls_server_client_verify_error.py.exp
new file mode 100644
index 0000000000000..36d0ab00f48d8
--- /dev/null
+++ b/tests/multi_net/asyncio_tls_server_client_verify_error.py.exp
@@ -0,0 +1,12 @@
+--- instance0 ---
+server running
+handle connection
+(-30592, 'MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE')
+server done
+--- instance1 ---
+write: b'client data'
+drain
+
+The certificate Common Name (CN) does not match with the expected CN
+
+client done
diff --git a/tests/net_inet/asyncio_tls_open_connection_readline.py b/tests/net_inet/asyncio_tls_open_connection_readline.py
new file mode 100644
index 0000000000000..70145d91a794b
--- /dev/null
+++ b/tests/net_inet/asyncio_tls_open_connection_readline.py
@@ -0,0 +1,59 @@
+import ssl
+import os
+import asyncio
+
+# 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).
+
+# Note that the instructions above is to obtain an intermediate
+# root CA cert that works for MicroPython. However CPython needs the ultimate root CA
+# cert from ISRG
+
+ca_cert_chain = "isrg.der"
+
+try:
+    os.stat(ca_cert_chain)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+with open(ca_cert_chain, "rb") as ca:
+    cadata = ca.read()
+
+client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+client_ctx.verify_mode = ssl.CERT_REQUIRED
+client_ctx.load_verify_locations(cadata=cadata)
+
+
+async def http_get(url, port, sslctx):
+    reader, writer = await asyncio.open_connection(url, port, ssl=sslctx)
+
+    print("write GET")
+    writer.write(b"GET / HTTP/1.0\r\n\r\n")
+    await writer.drain()
+
+    print("read response")
+    while True:
+        data = await reader.readline()
+        # avoid printing datetime which makes the test fail
+        if b"GMT" not in data:
+            print("read:", data)
+        if not data:
+            break
+
+    print("close")
+    writer.close()
+    await writer.wait_closed()
+    print("done")
+
+
+asyncio.run(http_get("micropython.org", 443, client_ctx))
diff --git a/tests/net_inet/isrg.der b/tests/net_inet/isrg.der
new file mode 100644
index 0000000000000000000000000000000000000000..9d2132e7f1e352fabac7eafb231488b5da91ffb2
GIT binary patch
literal 1391
zcmXqLV$C*aVh&!w%*4pVB*@StaDKxjhsTjF$q#lXH+3@@@Un4gwRyCC=VfH%W@Rw&
zH{>?pWMd9xVH0Kw4K~y?PzQ0igcUsVN>YpRQcDzqQ<F=JGD|8If>Mi96N{2F6x@sQ
zOA8D|4TM2TnT2^ggM-`^g7WiA6e0`_<ivRmO%2QpObiVTOpGm}#CeU8xzx9?iAf3B
zQ;e((%uP)E3<gb1Tue<&j0|gEs1$z@G5<V!o_4r~O#8k&+wWUU=*hEr7QUe3d+DJ?
z|GsABePi&~xP339Eyrc@wvEYuMTD~V%U^nBI9svqqOr{`kFR$t?{D7mU+AOaEboI|
zZH1X$X=yqAbv6b2*J>)UeSUJ_S;M+V-u>HW)=goaf7yL{%}fvF;1?F_{JHX*^)7mb
z_cWAjyQP1@qPLp4KvBB%lYz~z{&jb6C9i%h=6|S9(7WzD_ly5q%k{o&s`h%|Bc#ex
z(95j3;9;=J8{wPpB=-w!_Uf_kT$~tqZ%sS<lrPDJZ}cAJN6%<{*coF|nN#-OdO}j=
zv)fB%>8l;RAn=gy-c5l%vESRjulRoaDHHpQelw1#&mWmj<25Ut_nWV1qwMTG%s)L@
zZ#3Rz-J*5P@#PxEvZ-ABH|}5ED<p5KuOXguX~w}7oGImb?&iDBt%;1wm|I_Tt@9|G
zqo!S?-Ceb>DklY(M=kbokat@+bL(=ez`Qo=d9_8$g;*;h-`WLMh;lRc_g>Iv-DFqo
zCF5PpD)i^rs|NwXHO`YuHlHea-Y3t<alzn9bfMW6_FV@J3}QUCH(AeER-4eZXt8F~
znO%FES)>;=GdnK4#`;nE(6$dNYTB&bR(NQ2+$oz?wqHJLsjX!HYm3h*_fBZ@a%uek
ze*2NA(-ox)>ah<i|4BSA=veFb>}I#svAgPldH?sMd^L9VXJTe#U|j5E;9$T9Os}&1
zjEw(TSb({M&43@o7Y6ZJ4VZzHfh<UXk420{q;gB-v+8Y6pD-3TaCDrIium?&b{=vn
z17;myDq~~_m5*4tXVZ#+3p^WdNM$OhYjUhfERE^P`_c3?Q~&C>Fz=l^iUlGsD^9O_
z?o;@C)1`#9mMgeli7SS+ehlD?e0}ag<jY+rMc=p0?Qd!L_T=Tn33tS2CrP`0NSk`8
zCjZbY>-X~KPhVT7{&D4o6YKug*3J5*#Pa(8&H7gpwUsuC^Ywq~GKr43@rUtb$j%*V
zXSzC!JAHIpY?|)Bn-<QxOK11@BioPrSvT!7JfT!vJn7=0h9#Dk0>;WsJ~s2)HigcR
z-KW{sqcnToqipMNtEK|qJDkTmPjj*R=DdjQJNf?H>f^h&YWulf^SYpR=4sI>j;y6q
zAB!&hzU1vmo%p4{|F6+t(%W~vdiUeP>Iq_(+2h=TYs}f5dM+QCHs|Whty&MJN;P<_
z^RZ+<cgB55&{XYRJASXdWE@=kRMt25>cWl3o${YKsGG(t*4WP8`@Gk9!gJ;MzXRq}
z=D1zmBD#56Ufpb-X;wRebnUN2Km5&csO6u^ip8C`)?_`D(Av1dIWhXO{2lAwvQN4%
zdQ0z%8|T;t|E@mm82|syq6>)@52x)|6WeWmz4WT_ftiBq<~klMDs9=v<meQiuHrG}
z;%xPO?Dji%_&1gWKCIgQcCPZHeGjf`un5~2GS9nPmD7KWUE)~%J@-C)jd?6==a+_<
hl<$4hIs2u!^Zn@C@&Eed!WW%&m|K^mbnBjkIsk}=Sg-&9

literal 0
HcmV?d00001


From 05d3b223011a88a10c806be866db8e0d29f1e348 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Thu, 7 Sep 2023 23:37:20 +0100
Subject: [PATCH 0665/3129] docs/library: Document SSLContext cert methods and
 asyncio support.

Add `load_cert_chain`, `load_verify_locations`, `get_ciphers` and
`set_ciphers` SSLContext methods in ssl library, and update asyncio
`open_connection` and `start_server` methods with ssl support.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 docs/library/asyncio.rst |  8 ++++++--
 docs/library/ssl.rst     | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/docs/library/asyncio.rst b/docs/library/asyncio.rst
index 9a2c14e7e0152..b57f1ee04eaec 100644
--- a/docs/library/asyncio.rst
+++ b/docs/library/asyncio.rst
@@ -201,10 +201,12 @@ class Lock
 TCP stream connections
 ----------------------
 
-.. function:: open_connection(host, port)
+.. function:: open_connection(host, port, ssl=None)
 
     Open a TCP connection to the given *host* and *port*.  The *host* address will be
     resolved using `socket.getaddrinfo`, which is currently a blocking call.
+    If *ssl* is a `ssl.SSLContext` object, this context is used to create the transport;
+    if *ssl* is ``True``, a default context is used.
 
     Returns a pair of streams: a reader and a writer stream.
     Will raise a socket-specific ``OSError`` if the host could not be resolved or if
@@ -212,12 +214,14 @@ TCP stream connections
 
     This is a coroutine.
 
-.. function:: start_server(callback, host, port, backlog=5)
+.. function:: start_server(callback, host, port, backlog=5, ssl=None)
 
     Start a TCP server on the given *host* and *port*.  The *callback* will be
     called with incoming, accepted connections, and be passed 2 arguments: reader
     and writer streams for the connection.
 
+    If *ssl* is a `ssl.SSLContext` object, this context is used to create the transport.
+
     Returns a `Server` object.
 
     This is a coroutine.
diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index e3dfa9d993668..f9be27745379b 100644
--- a/docs/library/ssl.rst
+++ b/docs/library/ssl.rst
@@ -39,6 +39,33 @@ class SSLContext
     Create a new SSLContext instance.  The *protocol* argument must be one of the ``PROTOCOL_*``
     constants.
 
+.. method:: SSLContext.load_cert_chain(certfile, keyfile)
+
+   Load a private key and the corresponding certificate.  The *certfile* is a string
+   with the file path of the certificate.  The *keyfile* is a string with the file path
+   of the private key.
+
+   .. admonition:: Difference to CPython
+      :class: attention
+
+      MicroPython extension: *certfile* and *keyfile* can be bytes objects instead of
+      strings, in which case they are interpreted as the actual certificate/key data.
+
+.. method:: SSLContext.load_verify_locations(cafile=None, cadata=None)
+
+   Load the CA certificate chain that will validate the peer's certificate.
+   *cafile* is the file path of the CA certificates.  *cadata* is a bytes object
+   containing the CA certificates.  Only one of these arguments should be provided.
+
+.. method:: SSLContext.get_ciphers()
+
+   Get a list of enabled ciphers, returned as a list of strings.
+
+.. method:: SSLContext.set_ciphers(ciphers)
+
+   Set the available ciphers for sockets created with this context.  *ciphers* should be
+   a list of strings in the `IANA cipher suite format <https://wiki.mozilla.org/Security/Cipher_Suites>`_ .
+
 .. method:: SSLContext.wrap_socket(sock, *, server_side=False, do_handshake_on_connect=True, server_hostname=None)
 
    Takes a `stream` *sock* (usually socket.socket instance of ``SOCK_STREAM`` type),
@@ -77,6 +104,12 @@ class SSLContext
     Set or get the behaviour for verification of peer certificates.  Must be one of the
     ``CERT_*`` constants.
 
+.. note::
+
+   ``ssl.CERT_REQUIRED`` requires the device's date/time to be properly set, e.g. using
+   `mpremote rtc --set <mpremote_command_rtc>` or ``ntptime``, and ``server_hostname``
+   must be specified when on the client side.
+
 Exceptions
 ----------
 

From 85c02166cacb8c2a8bc82f9802814ca72cbf6017 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 4 Dec 2023 15:54:59 +0100
Subject: [PATCH 0666/3129] py/modsys: Implement optional sys.intern.

Signed-off-by: stijn <stijn@ignitron.net>
---
 py/modsys.c                      |  8 ++++++++
 py/mpconfig.h                    |  5 +++++
 tests/basics/sys1.py             | 15 +++++++++++++++
 tests/unix/extra_coverage.py.exp |  8 ++++----
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/py/modsys.c b/py/modsys.c
index 12fa1101b94fc..2af81046f483b 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -147,6 +147,10 @@ STATIC const MP_DEFINE_STR_OBJ(mp_sys_platform_obj, MICROPY_PY_SYS_PLATFORM);
 MP_DEFINE_STR_OBJ(mp_sys_executable_obj, "");
 #endif
 
+#if MICROPY_PY_SYS_INTERN
+MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_intern_obj, mp_obj_str_intern_checked);
+#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) {
@@ -293,6 +297,10 @@ STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     #endif
     #endif
 
+    #if MICROPY_PY_SYS_INTERN
+    { MP_ROM_QSTR(MP_QSTR_intern), MP_ROM_PTR(&mp_sys_intern_obj) },
+    #endif
+
     #if MICROPY_PY_SYS_EXIT
     { MP_ROM_QSTR(MP_QSTR_exit), MP_ROM_PTR(&mp_sys_exit_obj) },
     #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index d14b1aa044533..c025bca26075b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1434,6 +1434,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_EXECUTABLE (0)
 #endif
 
+// Whether to provide "sys.intern"
+#ifndef MICROPY_PY_SYS_INTERN
+#define MICROPY_PY_SYS_INTERN (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#endif
+
 // Whether to provide "sys.exit" function
 #ifndef MICROPY_PY_SYS_EXIT
 #define MICROPY_PY_SYS_EXIT (1)
diff --git a/tests/basics/sys1.py b/tests/basics/sys1.py
index 759b9a6eaec22..95d8905d135c7 100644
--- a/tests/basics/sys1.py
+++ b/tests/basics/sys1.py
@@ -23,3 +23,18 @@
 else:
     # Effectively skip subtests
     print(int)
+
+try:
+    print(sys.intern('micropython') == 'micropython')
+    has_intern = True
+except AttributeError:
+    has_intern = False
+    print(True)
+
+if has_intern:
+    try:
+        print(sys.intern(0))
+    except TypeError:
+        print(True)
+else:
+    print(True)
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index ec39500746d57..b7e4c0d76008e 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -66,10 +66,10 @@ micropython     machine         math
 
 argv            atexit          byteorder       exc_info
 executable      exit            getsizeof       implementation
-maxsize         modules         path            platform
-print_exception                 ps1             ps2
-stderr          stdin           stdout          tracebacklimit
-version         version_info
+intern          maxsize         modules         path
+platform        print_exception                 ps1
+ps2             stderr          stdin           stdout
+tracebacklimit  version         version_info
 ementation
 # attrtuple
 (start=1, stop=2, step=3)

From 0d93392f10dc15cbd7e05931d0ddd7a5cc62c4b2 Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Tue, 28 Nov 2023 14:26:59 -0800
Subject: [PATCH 0667/3129] py/mkrules.mk: List hash files as byproducts.

These are produced by the "cat" command to makeqstrdefs.py, to allow it to
not update unchanged files.  cmake doesn't know about them and so they are
not removed on a "clean".

This triggered a bug in makeqstrdefs.py where it would not recreate a
deleted output file (which is removed by clean) if a stale hash file with a
valid hash still existed.

Listing them as byproducts will cause them to be deleted on clean.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 py/mkrules.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 743302aea98e8..bfc56abfe80b7 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -99,6 +99,7 @@ add_custom_command(
 add_custom_command(
     OUTPUT ${MICROPY_QSTRDEFS_COLLECTED}
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat qstr _ ${MICROPY_GENHDR_DIR}/qstr ${MICROPY_QSTRDEFS_COLLECTED}
+    BYPRODUCTS "${MICROPY_QSTRDEFS_COLLECTED}.hash"
     DEPENDS ${MICROPY_QSTRDEFS_SPLIT}
     VERBATIM
     COMMAND_EXPAND_LISTS
@@ -136,6 +137,7 @@ add_custom_command(
 add_custom_command(
     OUTPUT ${MICROPY_MODULEDEFS_COLLECTED}
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat module _ ${MICROPY_GENHDR_DIR}/module ${MICROPY_MODULEDEFS_COLLECTED}
+    BYPRODUCTS "${MICROPY_MODULEDEFS_COLLECTED}.hash"
     DEPENDS ${MICROPY_MODULEDEFS_SPLIT}
     VERBATIM
     COMMAND_EXPAND_LISTS
@@ -161,6 +163,7 @@ add_custom_command(
 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}
+    BYPRODUCTS "${MICROPY_ROOT_POINTERS_COLLECTED}.hash"
     DEPENDS ${MICROPY_ROOT_POINTERS_SPLIT}
     VERBATIM
     COMMAND_EXPAND_LISTS

From f22e88611dda2f713ce9b8ae004915ae006105ba Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Tue, 28 Nov 2023 14:21:03 -0800
Subject: [PATCH 0668/3129] py/makeqstrdefs.py: Don't skip output for stale
 hash file.

In "cat" mode a "$output_file.hash" file is checked to see if the hash of
the new output is the same as the existing, and if so the output file isn't
updated.

However, it's possible that the output file has been deleted but the hash
file has not.  In this case the output file is not created.

Change the logic so that a hash file is considered stale if there is no
output file and still create the output.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 py/makeqstrdefs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 57200e069ce6a..bdc432d7dd81c 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -163,7 +163,7 @@ def cat_together():
         mode_full = "Module registrations"
     elif args.mode == _MODE_ROOT_POINTER:
         mode_full = "Root pointer registrations"
-    if old_hash != new_hash:
+    if old_hash != new_hash or not os.path.exists(args.output_file):
         print(mode_full, "updated")
         try:
             # rename below might fail if file exists

From d506b5337704c0f6e6d78ef9cfa2ceb83e2a0474 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 19:27:04 +0000
Subject: [PATCH 0669/3129] github/workflows: Bump actions/github-script from 6
 to 7.

Bumps [actions/github-script](https://github.com/actions/github-script)
from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/code_size_comment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_size_comment.yml b/.github/workflows/code_size_comment.yml
index 8baf76a47a7f6..a394f7a14b054 100644
--- a/.github/workflows/code_size_comment.yml
+++ b/.github/workflows/code_size_comment.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: download-artifact
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -56,7 +56,7 @@ jobs:
         run: unzip code-size-report.zip
       - name: Post comment to pull request
         if: steps.download-artifact.outputs.result == 'ok'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

From be6464121072e827eefa19d7ae12746612a8cb79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:50:28 +0000
Subject: [PATCH 0670/3129] github/workflows: Bump actions/setup-python from 4
 to 5.

Bumps [actions/setup-python](https://github.com/actions/setup-python) from
4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
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   | 4 ++--
 .github/workflows/commit_formatting.yml | 2 +-
 .github/workflows/docs.yml              | 2 +-
 .github/workflows/mpremote.yml          | 2 +-
 .github/workflows/ports_unix.yml        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 53055a8441d6c..5cd7984f7ac15 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
     - name: Install packages
       run: source tools/ci.sh && ci_c_code_formatting_setup
     - name: Run code formatting
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
     - name: Install packages
       run: source tools/ci.sh && ci_code_spell_setup
     - name: Run spell checker
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index a651f8a13a0f9..3fdcabc4ca73f 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -13,6 +13,6 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: '100'
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
     - 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 e0b6fdaba0387..d01a4b50c9810 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
     - name: Install Python packages
       run: pip install -r docs/requirements.txt
     - name: Build docs
diff --git a/.github/workflows/mpremote.yml b/.github/workflows/mpremote.yml
index 5b9465d7feb30..668567bd42504 100644
--- a/.github/workflows/mpremote.yml
+++ b/.github/workflows/mpremote.yml
@@ -16,7 +16,7 @@ jobs:
         # Setting this to zero means fetch all history and tags,
         # which hatch-vcs can use to discover the version tag.
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
     - name: Install build tools
       run: pip install build
     - name: Build mpremote wheel
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 25dd52f31d29e..2367eddbe6ea5 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -196,7 +196,7 @@ jobs:
     runs-on: macos-11.0
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.8'
     - name: Build

From de3e83aa4d9b671e6c5581ce19f98aa06f96e255 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Dec 2023 19:37:54 +0000
Subject: [PATCH 0671/3129] github/workflows: Bump actions/upload-artifact from
 3 to 4.

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact)
from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/code_size.yml | 2 +-
 .github/workflows/mpremote.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 56097a6d3e796..a65a00201a7d2 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -36,7 +36,7 @@ jobs:
       run: echo $PR_NUMBER > pr_number
     - name: Upload diff
       if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: code-size-report
         path: |
diff --git a/.github/workflows/mpremote.yml b/.github/workflows/mpremote.yml
index 668567bd42504..ee91b6360b9b4 100644
--- a/.github/workflows/mpremote.yml
+++ b/.github/workflows/mpremote.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Build mpremote wheel
       run: cd tools/mpremote && python -m build --wheel
     - name: Archive mpremote wheel
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mpremote
         path: |

From 06df3b29256e4e90abc61505a28852268cf64af7 Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck <patrick@silicognition.com>
Date: Wed, 17 Mar 2021 23:15:20 -0600
Subject: [PATCH 0672/3129] extmod/modonewire: Adopt Maxim recommended read
 timings.

The timing of the onewire module was way too fast when reading.  This
commit adopts read timings as recommended in Maxim application note 126:
6 us (pulse) / 9 us (sample) / 55 us (bit slot).  See also:
https://www.analog.com/en/technical-articles/1wire-communication-through-software.html

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

diff --git a/extmod/modonewire.c b/extmod/modonewire.c
index f440f75a82ac8..dbd519776e14a 100644
--- a/extmod/modonewire.c
+++ b/extmod/modonewire.c
@@ -38,9 +38,9 @@
 #define TIMING_RESET1 (480)
 #define TIMING_RESET2 (70)
 #define TIMING_RESET3 (410)
-#define TIMING_READ1 (5)
-#define TIMING_READ2 (5)
-#define TIMING_READ3 (40)
+#define TIMING_READ1  (6)
+#define TIMING_READ2  (9)
+#define TIMING_READ3  (55)
 #define TIMING_WRITE1 (10)
 #define TIMING_WRITE2 (50)
 #define TIMING_WRITE3 (10)

From 2e101a8e44b7f1bff75cc06a0597c572a8d8d152 Mon Sep 17 00:00:00 2001
From: Elias Wimmer <elias.wimmer@tuwien.ac.at>
Date: Sun, 10 Dec 2023 23:25:14 +0100
Subject: [PATCH 0673/3129] extmod/modonewire: Improve write timings for better
 reliability.

When using long cables for sensors on onewire e.g. ds18b20, the current
default timings are too optimistic, leading to bus failures and CRC errors.

Stable results are achieved with the timings given by
https://www.analog.com/en/technical-articles/1wire-communication-through-software.html
---
 extmod/modonewire.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/modonewire.c b/extmod/modonewire.c
index dbd519776e14a..8444181810c27 100644
--- a/extmod/modonewire.c
+++ b/extmod/modonewire.c
@@ -41,8 +41,8 @@
 #define TIMING_READ1  (6)
 #define TIMING_READ2  (9)
 #define TIMING_READ3  (55)
-#define TIMING_WRITE1 (10)
-#define TIMING_WRITE2 (50)
+#define TIMING_WRITE1 (6)
+#define TIMING_WRITE2 (54)
 #define TIMING_WRITE3 (10)
 
 STATIC int onewire_bus_reset(mp_hal_pin_obj_t pin) {

From 0e706a62b168b7c2818f99d8785fe4dd31af9169 Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Thu, 14 Dec 2023 22:51:45 -0800
Subject: [PATCH 0674/3129] py/makeqstrdefs.py: Stop generating temporary
 intermediate file.

In "cat" mode, output was written to a file named "out", then moved to the
location of the real output file.  There was no reason for this.

While makeqstrdefs.py does make an effort to not update the timestamp on an
existing output file that has not changed, the intermediate "out" file
isn't part of the that process.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 py/makeqstrdefs.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index bdc432d7dd81c..8e930ef50616f 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -138,15 +138,12 @@ def cat_together():
 
     hasher = hashlib.md5()
     all_lines = []
-    outf = open(args.output_dir + "/out", "wb")
     for fname in glob.glob(args.output_dir + "/*." + args.mode):
         with open(fname, "rb") as f:
             lines = f.readlines()
             all_lines += lines
     all_lines.sort()
     all_lines = b"\n".join(all_lines)
-    outf.write(all_lines)
-    outf.close()
     hasher.update(all_lines)
     new_hash = hasher.hexdigest()
     # print(new_hash)
@@ -165,12 +162,9 @@ def cat_together():
         mode_full = "Root pointer registrations"
     if old_hash != new_hash or not os.path.exists(args.output_file):
         print(mode_full, "updated")
-        try:
-            # rename below might fail if file exists
-            os.remove(args.output_file)
-        except:
-            pass
-        os.rename(args.output_dir + "/out", args.output_file)
+
+        with open(args.output_file, "wb") as outf:
+            outf.write(all_lines)
         with open(args.output_file + ".hash", "w") as f:
             f.write(new_hash)
     else:

From 395886caa3406a25790bd27e74ec63a96d8e5b4d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Dec 2023 17:06:56 +1100
Subject: [PATCH 0675/3129] extmod/modos: Factor os.dupterm_notify() function
 to common extmod code.

esp8266 doesn't need ets task because the notify is now scheduled (see
commits 7d57037906cf0274af08bd2eccbfffabe0ea66e3 and
c60caf19951c8326be9c3b6f3b016a4d21f69276 for relevant history).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modos.c            | 16 ++++++++++++++++
 ports/esp32/modos.c       | 18 +++---------------
 ports/esp8266/esp_mphal.c | 27 ---------------------------
 ports/esp8266/esp_mphal.h |  4 ----
 ports/esp8266/main.c      |  1 -
 ports/esp8266/modos.c     | 17 ++---------------
 ports/mimxrt/modos.c      | 18 +++---------------
 ports/samd/modos.c        | 18 +++---------------
 8 files changed, 27 insertions(+), 92 deletions(-)

diff --git a/extmod/modos.c b/extmod/modos.c
index da14fd81f8805..5a088b5202989 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
 
@@ -128,6 +129,21 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_os_uname_obj, mp_os_uname);
 
 #endif
 
+#if MICROPY_PY_OS_DUPTERM_NOTIFY
+STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
+    (void)obj_in;
+    for (;;) {
+        int c = mp_os_dupterm_rx_chr();
+        if (c < 0) {
+            break;
+        }
+        ringbuf_put(&stdin_ringbuf, c);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_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_os) },
 
diff --git a/ports/esp32/modos.c b/ports/esp32/modos.c
index 287f1d9900211..5b055eb979817 100644
--- a/ports/esp32/modos.c
+++ b/ports/esp32/modos.c
@@ -27,6 +27,9 @@
  * THE SOFTWARE.
  */
 
+// This file is never compiled standalone, it's included directly from
+// extmod/modos.c via MICROPY_PY_OS_INCLUDEFILE.
+
 #include "esp_system.h"
 
 #include "py/runtime.h"
@@ -48,18 +51,3 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
-
-#if MICROPY_PY_OS_DUPTERM_NOTIFY
-STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
-    (void)obj_in;
-    for (;;) {
-        int c = mp_os_dupterm_rx_chr();
-        if (c < 0) {
-            break;
-        }
-        ringbuf_put(&stdin_ringbuf, c);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
-#endif
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 956cb2e6490ac..394c9796c83c8 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -134,33 +134,6 @@ void MP_FASTCODE(mp_hal_signal_input)(void) {
     #endif
 }
 
-STATIC void dupterm_task_handler(os_event_t *evt) {
-    static byte lock;
-    if (lock) {
-        return;
-    }
-    lock = 1;
-    while (1) {
-        int c = mp_os_dupterm_rx_chr();
-        if (c < 0) {
-            break;
-        }
-        ringbuf_put(&stdin_ringbuf, c);
-    }
-    mp_hal_signal_input();
-    lock = 0;
-}
-
-STATIC os_event_t dupterm_evt_queue[4];
-
-void dupterm_task_init() {
-    system_os_task(dupterm_task_handler, DUPTERM_TASK_ID, dupterm_evt_queue, MP_ARRAY_SIZE(dupterm_evt_queue));
-}
-
-void mp_hal_signal_dupterm_input(void) {
-    system_os_post(DUPTERM_TASK_ID, 0, 0);
-}
-
 // this bit is unused in the Xtensa PS register
 #define ETS_LOOP_ITER_BIT (12)
 
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index 6fea6554b06fc..e677fa450d339 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -41,8 +41,6 @@ extern const struct _mp_print_t mp_debug_print;
 extern ringbuf_t stdin_ringbuf;
 // Call this after putting data to stdin_ringbuf
 void mp_hal_signal_input(void);
-// Call this when data is available in dupterm object
-void mp_hal_signal_dupterm_input(void);
 
 // This variable counts how many times the UART is attached to dupterm
 extern int uart_attached_to_dupterm;
@@ -65,9 +63,7 @@ void mp_hal_set_interrupt_char(int c);
 uint32_t mp_hal_get_cpu_freq(void);
 
 #define UART_TASK_ID 0
-#define DUPTERM_TASK_ID 1
 void uart_task_init();
-void dupterm_task_init();
 
 uint32_t esp_disable_irq(void);
 void esp_enable_irq(uint32_t state);
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index d0f52ed56639f..d774bbd35a7e3 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -63,7 +63,6 @@ STATIC void mp_reset(void) {
     #endif
     pin_init0();
     readline_init0();
-    dupterm_task_init();
 
     // Activate UART(0) on dupterm slot 1 for the REPL
     {
diff --git a/ports/esp8266/modos.c b/ports/esp8266/modos.c
index 0ddcba2a32a3e..32c6a066761ee 100644
--- a/ports/esp8266/modos.c
+++ b/ports/esp8266/modos.c
@@ -25,16 +25,10 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+// This file is never compiled standalone, it's included directly from
+// extmod/modos.c via MICROPY_PY_OS_INCLUDEFILE.
 
-#include "py/objtuple.h"
-#include "py/objstr.h"
-#include "extmod/misc.h"
 #include "extmod/modmachine.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-#include "genhdr/mpversion.h"
 #include "user_interface.h"
 
 STATIC const char *mp_os_uname_release(void) {
@@ -60,10 +54,3 @@ void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t s
         --uart_attached_to_dupterm;
     }
 }
-
-STATIC mp_obj_t mp_os_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(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
diff --git a/ports/mimxrt/modos.c b/ports/mimxrt/modos.c
index ecfc3712d78fa..2ee841815252c 100644
--- a/ports/mimxrt/modos.c
+++ b/ports/mimxrt/modos.c
@@ -28,6 +28,9 @@
  * THE SOFTWARE.
  */
 
+// This file is never compiled standalone, it's included directly from
+// extmod/modos.c via MICROPY_PY_OS_INCLUDEFILE.
+
 #include "py/runtime.h"
 #include "py/mphal.h"
 
@@ -108,18 +111,3 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
-
-#if MICROPY_PY_OS_DUPTERM_NOTIFY
-STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
-    (void)obj_in;
-    for (;;) {
-        int c = mp_os_dupterm_rx_chr();
-        if (c < 0) {
-            break;
-        }
-        ringbuf_put(&stdin_ringbuf, c);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
-#endif
diff --git a/ports/samd/modos.c b/ports/samd/modos.c
index f9df0cd9969b7..16b9eb084104e 100644
--- a/ports/samd/modos.c
+++ b/ports/samd/modos.c
@@ -29,6 +29,9 @@
  * THE SOFTWARE.
  */
 
+// This file is never compiled standalone, it's included directly from
+// extmod/modos.c via MICROPY_PY_OS_INCLUDEFILE.
+
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "modmachine.h"
@@ -96,18 +99,3 @@ bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) {
     return type == &machine_uart_type;
 }
 #endif
-
-#if MICROPY_PY_OS_DUPTERM_NOTIFY
-STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
-    (void)obj_in;
-    for (;;) {
-        int c = mp_os_dupterm_rx_chr();
-        if (c < 0) {
-            break;
-        }
-        ringbuf_put(&stdin_ringbuf, c);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
-#endif

From 1f2ec4583d9095b49c0f775db74b2ceb49f12946 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Dec 2023 17:08:04 +1100
Subject: [PATCH 0676/3129] extmod/os_dupterm: Prevent recursive execution of
 mp_os_dupterm_rx_chr.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/os_dupterm.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/extmod/os_dupterm.c b/extmod/os_dupterm.c
index cfd1c62616497..298983e9c985f 100644
--- a/extmod/os_dupterm.c
+++ b/extmod/os_dupterm.c
@@ -94,6 +94,22 @@ uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags) {
 }
 
 int mp_os_dupterm_rx_chr(void) {
+    #if MICROPY_PY_OS_DUPTERM_NOTIFY
+    // When os.dupterm_notify() is enabled it is usually called from a scheduled
+    // function, via mp_os_dupterm_notify().  That can lead to recursive calls of
+    // this function when this function is called from mp_hal_stdin_rx_chr():
+    // - mp_hal_stdin_rx_chr()
+    //  - mp_os_dupterm_rx_chr()
+    //   - <Python code>
+    //    - os.dupterm_notify() is scheduled via interrupt/event
+    //     - <Python code> runs scheduled code (eg WebREPL -> rp2.Flash().writeblocks())
+    //      - mp_os_dupterm_notify()
+    //       - mp_os_dupterm_rx_chr()
+    // Break that cycle by locking the scheduler during this function's duration.
+    mp_sched_lock();
+    #endif
+
+    int ret = -1; // no chars available
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
         if (MP_STATE_VM(dupterm_objs[idx]) == MP_OBJ_NULL) {
             continue;
@@ -106,7 +122,8 @@ int mp_os_dupterm_rx_chr(void) {
             const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx]));
             mp_uint_t out_sz = stream_p->read(MP_STATE_VM(dupterm_objs[idx]), buf, 1, &errcode);
             if (errcode == 0 && out_sz != 0) {
-                return buf[0];
+                ret = buf[0];
+                break;
             } else {
                 continue;
             }
@@ -132,20 +149,24 @@ int mp_os_dupterm_rx_chr(void) {
             } else {
                 // read 1 byte
                 nlr_pop();
-                if (buf[0] == mp_interrupt_char) {
+                ret = buf[0];
+                if (ret == mp_interrupt_char) {
                     // Signal keyboard interrupt to be raised as soon as the VM resumes
                     mp_sched_keyboard_interrupt();
-                    return -2;
+                    ret = -2;
                 }
-                return buf[0];
+                break;
             }
         } else {
             mp_os_deactivate(idx, "dupterm: Exception in read() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
         }
     }
 
-    // No chars available
-    return -1;
+    #if MICROPY_PY_OS_DUPTERM_NOTIFY
+    mp_sched_unlock();
+    #endif
+
+    return ret;
 }
 
 void mp_os_dupterm_tx_strn(const char *str, size_t len) {

From a78ec4ef7b1fed5faa7fad9cc8d4c0b46af6d3c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Dec 2023 19:21:27 +1100
Subject: [PATCH 0677/3129] rp2/mpconfigport: Enable
 MICROPY_PY_OS_DUPTERM_NOTIFY.

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

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index b349e0d67ba5e..1cc9b96160396 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -98,6 +98,7 @@
 #define MICROPY_PY_OS_INCLUDEFILE               "ports/rp2/modos.c"
 #ifndef MICROPY_PY_OS_DUPTERM
 #define MICROPY_PY_OS_DUPTERM                   (1)
+#define MICROPY_PY_OS_DUPTERM_NOTIFY            (1)
 #endif
 #define MICROPY_PY_OS_SYNC                      (1)
 #define MICROPY_PY_OS_UNAME                     (1)

From fbf079d7731c6402f7a852dd9fdc83a7106df910 Mon Sep 17 00:00:00 2001
From: Paul Grayson <paul@pololu.com>
Date: Tue, 4 Apr 2023 09:23:22 -0700
Subject: [PATCH 0678/3129] rp2: Add new NO_DEFAULT_PINS config options for
 i2c, spi, and uart.

Some boards have multiple options for these pins, and they don't want to
allow users to initialize a port without explicitly specifying pin numbers.

Signed-off-by: Paul Grayson <paul@pololu.com>
---
 ports/rp2/machine_i2c.c  | 19 +++++++++++++++++--
 ports/rp2/machine_spi.c  | 24 +++++++++++++++++++++---
 ports/rp2/machine_uart.c | 12 ++++++++++--
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 570f05aaaf0d9..9bea4be2caf57 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -34,6 +34,20 @@
 #define DEFAULT_I2C_FREQ (400000)
 #define DEFAULT_I2C_TIMEOUT (50000)
 
+#ifdef MICROPY_HW_I2C_NO_DEFAULT_PINS
+
+// With no default I2C, need to require the pin args.
+#define MICROPY_HW_I2C0_SCL (0)
+#define MICROPY_HW_I2C0_SDA (0)
+#define MICROPY_HW_I2C1_SCL (0)
+#define MICROPY_HW_I2C1_SDA (0)
+#define MICROPY_I2C_PINS_ARG_OPTS MP_ARG_REQUIRED
+
+#else
+
+// Most boards do not require pin args.
+#define MICROPY_I2C_PINS_ARG_OPTS 0
+
 #ifndef MICROPY_HW_I2C0_SCL
 #if PICO_DEFAULT_I2C == 0
 #define MICROPY_HW_I2C0_SCL (PICO_DEFAULT_I2C_SCL_PIN)
@@ -53,6 +67,7 @@
 #define MICROPY_HW_I2C1_SDA (6)
 #endif
 #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))
@@ -84,8 +99,8 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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} },
+        { MP_QSTR_scl, MICROPY_I2C_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_sda, MICROPY_I2C_PINS_ARG_OPTS | 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 = DEFAULT_I2C_TIMEOUT} },
     };
 
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index a3b82a0bc4634..fb8e9f56caec5 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -38,6 +38,22 @@
 #define DEFAULT_SPI_BITS        (8)
 #define DEFAULT_SPI_FIRSTBIT    (SPI_MSB_FIRST)
 
+#ifdef MICROPY_HW_SPI_NO_DEFAULT_PINS
+
+// With no default SPI, need to require the pin args.
+#define MICROPY_HW_SPI0_SCK     (0)
+#define MICROPY_HW_SPI0_MOSI    (0)
+#define MICROPY_HW_SPI0_MISO    (0)
+#define MICROPY_HW_SPI1_SCK     (0)
+#define MICROPY_HW_SPI1_MOSI    (0)
+#define MICROPY_HW_SPI1_MISO    (0)
+#define MICROPY_SPI_PINS_ARG_OPTS MP_ARG_REQUIRED
+
+#else
+
+// Most boards do not require pin args.
+#define MICROPY_SPI_PINS_ARG_OPTS 0
+
 #ifndef MICROPY_HW_SPI0_SCK
 #if PICO_DEFAULT_SPI == 0
 #define MICROPY_HW_SPI0_SCK     (PICO_DEFAULT_SPI_SCK_PIN)
@@ -62,6 +78,8 @@
 #endif
 #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,...}
@@ -116,9 +134,9 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         { 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} },
+        { MP_QSTR_sck,      MICROPY_SPI_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mosi,     MICROPY_SPI_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_miso,     MICROPY_SPI_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
     };
 
     // Parse the arguments.
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index e48924f09ae84..d751b7af07a2e 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -40,6 +40,14 @@
 #define DEFAULT_UART_BITS (8)
 #define DEFAULT_UART_STOP (1)
 
+#ifdef MICROPY_HW_UART_NO_DEFAULT_PINS
+// With no default I2C, need to require the pin args.
+#define MICROPY_UART_PINS_ARG_OPTS MP_ARG_REQUIRED
+#else
+// Most boards do not require pin args.
+#define MICROPY_UART_PINS_ARG_OPTS 0
+#endif
+
 // UART 0 default pins
 #if !defined(MICROPY_HW_UART0_TX)
 #define MICROPY_HW_UART0_TX (0)
@@ -225,8 +233,8 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         { 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_tx, MICROPY_UART_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_rx, MICROPY_UART_PINS_ARG_OPTS | 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} },

From c51081c604f0dd0747d592d3d4952aac890f2c68 Mon Sep 17 00:00:00 2001
From: Paul Grayson <paul@pololu.com>
Date: Wed, 11 Oct 2023 11:28:47 -0700
Subject: [PATCH 0679/3129] rp2/boards: Add support for Pololu 3pi+ and Zumo
 robots.

Signed-off-by: Paul Grayson <paul@pololu.com>
---
 .../boards/POLOLU_3PI_2040_ROBOT/board.json   | 22 +++++++++++++
 .../POLOLU_3PI_2040_ROBOT/mpconfigboard.cmake |  1 +
 .../POLOLU_3PI_2040_ROBOT/mpconfigboard.h     | 18 +++++++++++
 .../rp2/boards/POLOLU_3PI_2040_ROBOT/pins.csv | 31 +++++++++++++++++++
 .../boards/POLOLU_ZUMO_2040_ROBOT/board.json  | 23 ++++++++++++++
 .../mpconfigboard.cmake                       |  5 +++
 .../POLOLU_ZUMO_2040_ROBOT/mpconfigboard.h    | 18 +++++++++++
 .../boards/POLOLU_ZUMO_2040_ROBOT/pins.csv    | 31 +++++++++++++++++++
 .../pololu_zumo_2040_robot.h                  | 26 ++++++++++++++++
 9 files changed, 175 insertions(+)
 create mode 100644 ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json
 create mode 100644 ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.h
 create mode 100644 ports/rp2/boards/POLOLU_3PI_2040_ROBOT/pins.csv
 create mode 100644 ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json
 create mode 100644 ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.h
 create mode 100644 ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pins.csv
 create mode 100644 ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pololu_zumo_2040_robot.h

diff --git a/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json
new file mode 100644
index 0000000000000..5358db627e125
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB-C",
+        "IMU",
+        "RGB LED",
+        "Display",
+        "Dual-core",
+        "External Flash"
+    ],
+    "images": [
+        "pololu_3pi_2040_robot.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Pololu 3pi+ 2040 Robot",
+    "thumbnail": "",
+    "url": "https://www.pololu.com/3pi",
+    "vendor": "Pololu"
+}
diff --git a/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.cmake b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.cmake
new file mode 100644
index 0000000000000..79273343d5f3d
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Pololu 3pi+ 2040 Robot
diff --git a/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.h b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.h
new file mode 100644
index 0000000000000..917f828e58175
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/mpconfigboard.h
@@ -0,0 +1,18 @@
+#pragma once
+
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Pololu 3pi+ 2040 Robot"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)
+
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_VID (0x1FFB)
+#define MICROPY_HW_USB_PID (0x2043)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pololu Corporation"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"
+
+#define MICROPY_BANNER_MACHINE MICROPY_HW_BOARD_NAME
+
+#define MICROPY_HW_I2C_NO_DEFAULT_PINS (1)
+#define MICROPY_HW_SPI_NO_DEFAULT_PINS (1)
+#define MICROPY_HW_UART_NO_DEFAULT_PINS (1)
diff --git a/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/pins.csv b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/pins.csv
new file mode 100644
index 0000000000000..11dc5ec8e4047
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/pins.csv
@@ -0,0 +1,31 @@
+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
+GP23,GPIO23
+GP24,GPIO24
+GP25,GPIO25
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+GP29,GPIO29
+LED,GPIO25
diff --git a/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json
new file mode 100644
index 0000000000000..7ef383a9c408b
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB-C",
+        "JST-SH",
+        "IMU",
+        "RGB LED",
+        "Display",
+        "Dual-core",
+        "External Flash"
+    ],
+    "images": [
+        "pololu_zumo_2040_robot.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Pololu Zumo 2040 Robot",
+    "thumbnail": "",
+    "url": "https://www.pololu.com/zumo",
+    "vendor": "Pololu"
+}
diff --git a/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.cmake b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.cmake
new file mode 100644
index 0000000000000..4ed91732075e4
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+# cmake file for Pololu Zumo 2040 Robot
+
+# This board 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})
diff --git a/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.h b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.h
new file mode 100644
index 0000000000000..c91001462276d
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/mpconfigboard.h
@@ -0,0 +1,18 @@
+#pragma once
+
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Pololu Zumo 2040 Robot"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)
+
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_VID (0x1FFB)
+#define MICROPY_HW_USB_PID (0x2044)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pololu Corporation"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"
+
+#define MICROPY_BANNER_MACHINE MICROPY_HW_BOARD_NAME
+
+#define MICROPY_HW_I2C_NO_DEFAULT_PINS (1)
+#define MICROPY_HW_SPI_NO_DEFAULT_PINS (1)
+#define MICROPY_HW_UART_NO_DEFAULT_PINS (1)
diff --git a/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pins.csv b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pins.csv
new file mode 100644
index 0000000000000..11dc5ec8e4047
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pins.csv
@@ -0,0 +1,31 @@
+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
+GP23,GPIO23
+GP24,GPIO24
+GP25,GPIO25
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+GP29,GPIO29
+LED,GPIO25
diff --git a/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pololu_zumo_2040_robot.h b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pololu_zumo_2040_robot.h
new file mode 100644
index 0000000000000..252cea981b6da
--- /dev/null
+++ b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/pololu_zumo_2040_robot.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2023 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+
+#ifndef _POLOLU_ZUMO_2040_ROBOT_H
+#define _POLOLU_ZUMO_2040_ROBOT_H
+
+// For board detection
+#define POLOLU_ZUMO_2040_ROBOT
+
+#define PICO_DEFAULT_LED_PIN 25
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+#define PICO_FLASH_SPI_CLKDIV 2
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+
+// All boards have at least the B1 revision
+#define PICO_RP2040_B0_SUPPORTED 0
+
+#endif

From 3270d856fda58585d44dd05aefa7a95551fa76cc Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck <patrick@silicognition.com>
Date: Sun, 30 Jul 2023 20:37:03 -0600
Subject: [PATCH 0680/3129] rp2/boards: Add SIL_RP2040_SHIM board by
 Silicognition LLC.

Add new board Silicognition RP2040-Shim, RP2040 with 4 MB of flash
and W5500 drivers included and configured by default for use with
the Silicognition PoE-FeatherWing.

Co-authored-by: Matt Trentini <matt.trentini@gmail.com>

Signed-off-by: Patrick Van Oosterwijck <patrick@silicognition.com>
---
 ports/rp2/boards/SIL_RP2040_SHIM/board.json   | 21 +++++++++
 ports/rp2/boards/SIL_RP2040_SHIM/deploy.md    |  7 +++
 ports/rp2/boards/SIL_RP2040_SHIM/manifest.py  |  3 ++
 .../SIL_RP2040_SHIM/mpconfigboard.cmake       |  5 +++
 .../boards/SIL_RP2040_SHIM/mpconfigboard.h    | 43 +++++++++++++++++++
 ports/rp2/boards/SIL_RP2040_SHIM/pins.csv     | 23 ++++++++++
 6 files changed, 102 insertions(+)
 create mode 100644 ports/rp2/boards/SIL_RP2040_SHIM/board.json
 create mode 100644 ports/rp2/boards/SIL_RP2040_SHIM/deploy.md
 create mode 100644 ports/rp2/boards/SIL_RP2040_SHIM/manifest.py
 create mode 100644 ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SIL_RP2040_SHIM/pins.csv

diff --git a/ports/rp2/boards/SIL_RP2040_SHIM/board.json b/ports/rp2/boards/SIL_RP2040_SHIM/board.json
new file mode 100644
index 0000000000000..924957e1c31e9
--- /dev/null
+++ b/ports/rp2/boards/SIL_RP2040_SHIM/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Dual-core",
+        "RGB LED",
+        "External Flash",
+        "USB"
+    ],
+    "images": [
+        "rp2040-shim-product.jpg",
+        "RP2040-Shim-pinout.png"
+    ],
+    "mcu": "rp2040",
+    "product": "RP2040-Shim",
+    "thumbnail": "",
+    "url": "https://silicognition.com/Products/rp2040-shim/",
+    "vendor": "Silicognition LLC"
+}
diff --git a/ports/rp2/boards/SIL_RP2040_SHIM/deploy.md b/ports/rp2/boards/SIL_RP2040_SHIM/deploy.md
new file mode 100644
index 0000000000000..59dd27a75cf12
--- /dev/null
+++ b/ports/rp2/boards/SIL_RP2040_SHIM/deploy.md
@@ -0,0 +1,7 @@
+### Flashing via UF2 bootloader
+
+To get the board in bootloader mode ready for the firmware update, execute
+`machine.bootloader()` at the MicroPython REPL.  Alternatively, double press
+the reset button SW1.  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/SIL_RP2040_SHIM/manifest.py b/ports/rp2/boards/SIL_RP2040_SHIM/manifest.py
new file mode 100644
index 0000000000000..02d1874b52b9a
--- /dev/null
+++ b/ports/rp2/boards/SIL_RP2040_SHIM/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
diff --git a/ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.cmake b/ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.cmake
new file mode 100644
index 0000000000000..62e5385b00c6e
--- /dev/null
+++ b/ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+# cmake file for Silicognition RP2040-Shim
+set(PICO_BOARD none)
+set(MICROPY_PY_NETWORK_WIZNET5K W5500)
+set(MICROPY_PY_LWIP 1)
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.h b/ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.h
new file mode 100644
index 0000000000000..ae2b35e96a6fc
--- /dev/null
+++ b/ports/rp2/boards/SIL_RP2040_SHIM/mpconfigboard.h
@@ -0,0 +1,43 @@
+// Board config for Silicognition RP2040-Shim
+
+#define MICROPY_HW_BOARD_NAME               "Silicognition RP2040-Shim"
+#define PICO_BOOT_STAGE2_CHOOSE_GENERIC_03H 1
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES               (4 * 1024 * 1024)
+#endif
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (3 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID                  (0x1209)
+#define MICROPY_HW_USB_PID                  (0xF502)
+#undef  PICO_RP2040_B0_SUPPORTED
+#define PICO_RP2040_B0_SUPPORTED            0
+
+// Bus configuration
+#define MICROPY_HW_I2C0_SCL                 (17)
+#define MICROPY_HW_I2C0_SDA                 (16)
+
+#define MICROPY_HW_SPI0_SCK                 (18)
+#define MICROPY_HW_SPI0_MOSI                (19)
+#define MICROPY_HW_SPI0_MISO                (20)
+
+#define MICROPY_HW_SPI1_SCK                 (10)
+#define MICROPY_HW_SPI1_MOSI                (11)
+#define MICROPY_HW_SPI1_MISO                (12)
+
+// Enable networking
+#define MICROPY_PY_NETWORK                  (1)
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "RP2040-Shim"
+
+// Wiznet HW config
+#define MICROPY_HW_WIZNET_SPI_ID            (1)
+#define MICROPY_HW_WIZNET_SPI_BAUDRATE      (20 * 1000 * 1000)
+#define MICROPY_HW_WIZNET_SPI_SCK           (10)
+#define MICROPY_HW_WIZNET_SPI_MOSI          (11)
+#define MICROPY_HW_WIZNET_SPI_MISO          (12)
+#define MICROPY_HW_WIZNET_PIN_CS            (21)
+// Since the PoE-FeatherWing doesn't connect RST, map RST by
+// default to an unused pin
+#define MICROPY_HW_WIZNET_PIN_RST           (9)
+
+// NeoPixel GPIO23, power not toggleable
+// Red user LED GPIO22
diff --git a/ports/rp2/boards/SIL_RP2040_SHIM/pins.csv b/ports/rp2/boards/SIL_RP2040_SHIM/pins.csv
new file mode 100644
index 0000000000000..3f2d293757c7e
--- /dev/null
+++ b/ports/rp2/boards/SIL_RP2040_SHIM/pins.csv
@@ -0,0 +1,23 @@
+A0,GPIO29
+A1,GPIO28
+A2,GPIO27
+A3,GPIO26
+D24,GPIO24
+D25,GPIO25
+SCK,GPIO10
+MOSI,GPIO11
+MISO,GPIO12
+D0,GPIO1
+D1,GPIO0
+D4,GPIO6
+SDA,GPIO16
+SCL,GPIO17
+D5,GPIO18
+D6,GPIO19
+D9,GPIO20
+D10,GPIO21
+D11,GPIO15
+D12,GPIO14
+D13,GPIO22
+LED,GPIO22
+NEOPIXEL,GPIO23

From 97b13132b129963a48d8b7d2e44c932cc73f7db3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Dec 2023 13:32:36 +1100
Subject: [PATCH 0681/3129] py/gc: Improve calculation of new heap size in
 split-heap-auto mode.

There are two main changes here to improve the calculation of the size of
the next heap area when automatically expanding the heap:
- Compute the existing total size by counting the total number of GC
  blocks, and then using that to compute the corresponding number of bytes.
- Round the bytes value up to the nearest multiple of BYTES_PER_BLOCK.

This makes the calculation slightly simpler and more accurate, and makes
sure that, in the case of growing from one area to two areas, the number
of bytes allocated from the system for the second area is the same as the
first.  For example on esp32 with an initial area size of 65536 bytes, the
subsequent allocation is also 65536 bytes.  Previously it was a number that
was not even a multiple of 2.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 80e5f80360685..b6969dfd42429 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -282,14 +282,28 @@ STATIC bool gc_try_add_heap(size_t failed_alloc) {
     // - If the new heap won't fit in the available free space, add the largest
     //   new heap that will fit (this may lead to failed system heap allocations
     //   elsewhere, but some allocation will likely fail in this circumstance!)
-    size_t total_heap = 0;
+
+    // Compute total number of blocks in the current heap.
+    size_t total_blocks = 0;
     for (mp_state_mem_area_t *area = &MP_STATE_MEM(area);
          area != NULL;
          area = NEXT_AREA(area)) {
-        total_heap += area->gc_pool_end - area->gc_alloc_table_start;
-        total_heap += ALLOC_TABLE_GAP_BYTE + sizeof(mp_state_mem_area_t);
+        total_blocks += area->gc_alloc_table_byte_len * BLOCKS_PER_ATB;
     }
 
+    // Compute bytes needed to build a heap with total_blocks blocks.
+    size_t total_heap =
+        total_blocks / BLOCKS_PER_ATB
+        #if MICROPY_ENABLE_FINALISER
+        + total_blocks / BLOCKS_PER_FTB
+        #endif
+        + total_blocks * BYTES_PER_BLOCK
+        + ALLOC_TABLE_GAP_BYTE
+        + sizeof(mp_state_mem_area_t);
+
+    // Round up size to the nearest multiple of BYTES_PER_BLOCK.
+    total_heap = (total_heap + BYTES_PER_BLOCK - 1) & (~(BYTES_PER_BLOCK - 1));
+
     DEBUG_printf("total_heap " UINT_FMT " bytes\n", total_heap);
 
     size_t to_alloc = MIN(avail, MAX(total_heap, needed));

From f6d630877c3b31a5091dff2fd615ddb92189a46c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Dec 2023 13:38:16 +1100
Subject: [PATCH 0682/3129] esp32: Add MICROPY_GC_INITIAL_HEAP_SIZE option and
 tune it.

This gets back the old heap-size behaviour on ESP32, before auto-split-heap
was introduced: after the heap is grown one time the size is 111936 bytes,
with about 40k left for the IDF.  That's enough to start WiFi and do a
HTTPS request.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c         |  8 ++------
 ports/esp32/mpconfigport.h | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 8e5675c94179a..6f51b7236bce9 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -79,10 +79,6 @@
 #define MP_TASK_STACK_LIMIT_MARGIN (1024)
 #endif
 
-// Initial Python heap size. This starts small but adds new heap areas on
-// demand due to settings MICROPY_GC_SPLIT_HEAP & MICROPY_GC_SPLIT_HEAP_AUTO
-#define MP_TASK_HEAP_SIZE (64 * 1024)
-
 int vprintf_null(const char *format, va_list ap) {
     // do nothing: this is used as a log target during raw repl mode
     return 0;
@@ -120,13 +116,13 @@ void mp_task(void *pvParameter) {
         ESP_LOGE("esp_init", "can't create event loop: 0x%x\n", err);
     }
 
-    void *mp_task_heap = MP_PLAT_ALLOC_HEAP(MP_TASK_HEAP_SIZE);
+    void *mp_task_heap = MP_PLAT_ALLOC_HEAP(MICROPY_GC_INITIAL_HEAP_SIZE);
 
 soft_reset:
     // initialise the stack pointer for the main thread
     mp_stack_set_top((void *)sp);
     mp_stack_set_limit(MICROPY_TASK_STACK_SIZE - MP_TASK_STACK_LIMIT_MARGIN);
-    gc_init(mp_task_heap, mp_task_heap + MP_TASK_HEAP_SIZE);
+    gc_init(mp_task_heap, mp_task_heap + MICROPY_GC_INITIAL_HEAP_SIZE);
     mp_init();
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     readline_init0();
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5f5cd795e139a..8937455992a17 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -26,6 +26,20 @@
 // memory allocation policies
 #define MICROPY_ALLOC_PATH_MAX              (128)
 
+// Initial Python heap size.  This starts small but adds new heap areas on demand due to
+// the settings MICROPY_GC_SPLIT_HEAP and MICROPY_GC_SPLIT_HEAP_AUTO.  The value is
+// different for different MCUs and is chosen so they can grow the heap once (double it)
+// and still have enough internal RAM to start WiFi and make a HTTPS request.
+#ifndef MICROPY_GC_INITIAL_HEAP_SIZE
+#if CONFIG_IDF_TARGET_ESP32
+#define MICROPY_GC_INITIAL_HEAP_SIZE        (56 * 1024)
+#elif CONFIG_IDF_TARGET_ESP32S2 && !CONFIG_SPIRAM
+#define MICROPY_GC_INITIAL_HEAP_SIZE        (36 * 1024)
+#else
+#define MICROPY_GC_INITIAL_HEAP_SIZE        (64 * 1024)
+#endif
+#endif
+
 // emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
 #if !CONFIG_IDF_TARGET_ESP32C3

From f46269a1d16a5d0890bbc97d1141af7173050013 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Dec 2023 15:54:05 +1100
Subject: [PATCH 0683/3129] extmod/asyncio: Remove non-working Stream
 __aenter__/__aexit__ methods.

It looks like these never worked and there are no tests for this
functionality.  Furthermore, CPython doesn't support this.

Fixes #12995.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/asyncio/stream.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extmod/asyncio/stream.py b/extmod/asyncio/stream.py
index bcc2a13a86fec..cb0a804b5ed26 100644
--- a/extmod/asyncio/stream.py
+++ b/extmod/asyncio/stream.py
@@ -13,12 +13,6 @@ def __init__(self, s, e={}):
     def get_extra_info(self, v):
         return self.e[v]
 
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc, tb):
-        await self.close()
-
     def close(self):
         pass
 

From 7cf1118831e71670dc237b5256a54856f6fdf0c2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Sep 2023 19:07:45 +1000
Subject: [PATCH 0684/3129] stm32/usbdev: Optionally pass through vendor
 requests to Setup function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usbd_conf.h                   | 5 +++++
 ports/stm32/usbdev/core/src/usbd_ctlreq.c | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/ports/stm32/usbd_conf.h b/ports/stm32/usbd_conf.h
index 83805a6e4d801..e61e7ce7efe43 100644
--- a/ports/stm32/usbd_conf.h
+++ b/ports/stm32/usbd_conf.h
@@ -49,6 +49,11 @@
 #endif
 #define USBD_DEBUG_LEVEL                      0
 
+// Whether the core USBD driver passes through vendor device requests to the class implementation.
+#ifndef USBD_ENABLE_VENDOR_DEVICE_REQUESTS
+#define USBD_ENABLE_VENDOR_DEVICE_REQUESTS    (0)
+#endif
+
 // For MCUs with a device-only USB peripheral
 #define USBD_PMA_RESERVE                      (64)
 #define USBD_PMA_NUM_FIFO                     (16) // Maximum 8 endpoints, 2 FIFOs each
diff --git a/ports/stm32/usbdev/core/src/usbd_ctlreq.c b/ports/stm32/usbdev/core/src/usbd_ctlreq.c
index f25f252d640cd..97888918a84a0 100644
--- a/ports/stm32/usbdev/core/src/usbd_ctlreq.c
+++ b/ports/stm32/usbdev/core/src/usbd_ctlreq.c
@@ -120,6 +120,14 @@ USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
 {
   USBD_StatusTypeDef ret = USBD_OK;
 
+  #if USBD_ENABLE_VENDOR_DEVICE_REQUESTS
+  // Pass through vendor device requests directly to the implementation.
+  // It must call `USBD_CtlError(pdev, req);` if it does not respond to the request.
+  if ((req->bmRequest & 0xe0) == 0xc0) {
+    return pdev->pClass->Setup (pdev, req);
+  }
+  #endif
+
   switch (req->bRequest)
   {
   case USB_REQ_GET_DESCRIPTOR:

From 859f219690db5a1b91865e0a70c2b71d19be42a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Sep 2023 19:12:51 +1000
Subject: [PATCH 0685/3129] stm32/mboot: Guard use of tx_pending with
 USE_USB_POLLING option.

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

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index afd4a2f1ceb1b..40bcd23edceb2 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -966,7 +966,9 @@ static int dfu_handle_tx(int cmd, int arg, int len, uint8_t *buf, int max_len) {
 
 typedef struct _pyb_usbdd_obj_t {
     bool started;
+    #if USE_USB_POLLING
     bool tx_pending;
+    #endif
     USBD_HandleTypeDef hUSBDDevice;
 
     uint8_t bRequest;
@@ -1160,7 +1162,9 @@ static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *r
         // device-to-host request
         int len = dfu_handle_tx(self->bRequest, self->wValue, self->wLength, self->tx_buf, USB_XFER_SIZE);
         if (len >= 0) {
+            #if USE_USB_POLLING
             self->tx_pending = true;
+            #endif
             USBD_CtlSendData(&self->hUSBDDevice, self->tx_buf, len);
         }
     }
@@ -1168,9 +1172,10 @@ static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *r
 }
 
 static uint8_t pyb_usbdd_EP0_TxSent(USBD_HandleTypeDef *pdev) {
+    #if USE_USB_POLLING
     pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     self->tx_pending = false;
-    #if !USE_USB_POLLING
+    #else
     // Process now that we have sent a response
     dfu_process();
     #endif
@@ -1243,7 +1248,9 @@ static int pyb_usbdd_detect_port(void) {
 
 static void pyb_usbdd_init(pyb_usbdd_obj_t *self, int phy_id) {
     self->started = false;
+    #if USE_USB_POLLING
     self->tx_pending = false;
+    #endif
     USBD_HandleTypeDef *usbd = &self->hUSBDDevice;
     usbd->id = phy_id;
     usbd->dev_state = USBD_STATE_DEFAULT;

From 49d0c22b11732da3be622d7c550ecb4249bf17ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Sep 2023 19:14:22 +1000
Subject: [PATCH 0686/3129] stm32/mboot: Expand device descriptor to make it
 easier to understand.

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

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 40bcd23edceb2..ed5ed1e3ffb99 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1024,10 +1024,20 @@ __ALIGN_BEGIN static const uint8_t USBD_LangIDDesc[USB_LEN_LANGID_STR_DESC] __AL
 };
 
 static const uint8_t dev_descr[0x12] = {
-    0x12, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x40,
+    0x12, // bLength
+    0x01, // bDescriptorType: Device
+    0x00, 0x01, // USB version: 1.00
+    0x00, // bDeviceClass
+    0x00, // bDeviceSubClass
+    0x00, // bDeviceProtocol
+    0x40, // bMaxPacketSize
     LOBYTE(MBOOT_USB_VID), HIBYTE(MBOOT_USB_VID),
     LOBYTE(MBOOT_USB_PID), HIBYTE(MBOOT_USB_PID),
-    0x00, 0x22, 0x01, 0x02, 0x03, 0x01
+    0x00, 0x22, // bcdDevice: 22.00
+    0x01, // iManufacturer
+    0x02, // iProduct
+    0x03, // iSerialNumber
+    0x01, // bNumConfigurations: 1
 };
 
 // This may be modified by USBD_GetDescriptor

From e9bcd49b3ef7bcf69026c747411408061b3a46be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Sep 2023 19:15:05 +1000
Subject: [PATCH 0687/3129] stm32/mboot: Add support for Microsoft WCID.

This adds support to stm32's mboot for the Microsoft WCID USB 0xee string
and Compatible ID Feature Descriptor.  This allows the USB device to
automatically set the default USB driver, so that when the device is
plugged in Windows will assign the winusb driver to it.  This means that
USB DFU mode can be used without installing any drivers.

For example this page will work (allow the board to be updated over DFU)
with zero install: https://devanlai.github.io/webdfu/dfu-util/

Tested on Windows 10, Windows can read the 0xee string correctly, and
requests the second special descriptor, which then configures the USB
device to use the winusb driver.

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

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 7be5cca69d7ad..389f9f5d0f4ad 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -76,6 +76,7 @@ CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1
 CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT -DLFS2_READONLY
 CFLAGS += -DBUILDING_MBOOT=$(BUILDING_MBOOT)
 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
+CFLAGS += -DUSBD_ENABLE_VENDOR_DEVICE_REQUESTS=1
 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
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index ed5ed1e3ffb99..d034996afbf69 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1002,6 +1002,18 @@ typedef struct _pyb_usbdd_obj_t {
 #define MBOOT_USB_PID BOOTLOADER_DFU_USB_PID
 #endif
 
+// Special string descriptor value for Microsoft WCID support.
+// If the USB device responds to this string with the correct data (see msft100_str_desc)
+// then the Windows host will request further information about the configuration of
+// the device (see msft100_id).  This allows the device to set a Windows USB driver.
+// For more details about WCID see:
+// - https://github.com/pbatard/libwdi/wiki/WCID-Devices
+// - https://github.com/newaetech/naeusb/blob/main/wcid.md
+#define MSFT_WCID_STR_DESC_VALUE (0xee)
+
+// Vendor code, can be anything.
+#define MSFT100_VENDOR_CODE (0x42)
+
 #if !MICROPY_HW_USB_IS_MULTI_OTG
 STATIC const uint8_t usbd_fifo_size[USBD_PMA_NUM_FIFO] = {
     32, 32, // EP0(out), EP0(in)
@@ -1026,14 +1038,14 @@ __ALIGN_BEGIN static const uint8_t USBD_LangIDDesc[USB_LEN_LANGID_STR_DESC] __AL
 static const uint8_t dev_descr[0x12] = {
     0x12, // bLength
     0x01, // bDescriptorType: Device
-    0x00, 0x01, // USB version: 1.00
+    0x00, 0x02, // USB version: 2.00
     0x00, // bDeviceClass
     0x00, // bDeviceSubClass
     0x00, // bDeviceProtocol
     0x40, // bMaxPacketSize
     LOBYTE(MBOOT_USB_VID), HIBYTE(MBOOT_USB_VID),
     LOBYTE(MBOOT_USB_PID), HIBYTE(MBOOT_USB_PID),
-    0x00, 0x22, // bcdDevice: 22.00
+    0x00, 0x03, // bcdDevice: 3.00
     0x01, // iManufacturer
     0x02, // iProduct
     0x03, // iSerialNumber
@@ -1047,6 +1059,32 @@ static uint8_t cfg_descr[9 + 9 + 9] =
     "\x09\x21\x0b\xff\x00\x00\x08\x1a\x01" // \x00\x08 goes with USB_XFER_SIZE
 ;
 
+__ALIGN_BEGIN static const uint8_t msft100_str_desc[18] __ALIGN_END = {
+    0x12, 0x03,
+    'M', 0x00,
+    'S', 0x00,
+    'F', 0x00,
+    'T', 0x00,
+    '1', 0x00,
+    '0', 0x00,
+    '0', 0x00,
+    MSFT100_VENDOR_CODE,
+    0x00,
+};
+
+__ALIGN_BEGIN static const uint8_t msft100_id[40] __ALIGN_END = {
+    0x28, 0x00, 0x00, 0x00,
+    0x00, 0x01, // 1.00
+    0x04, 0x00,
+    0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00,
+    0x01,
+    'W', 'I', 'N', 'U', 'S', 'B', 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
 static uint8_t *pyb_usbdd_DeviceDescriptor(USBD_HandleTypeDef *pdev, uint16_t *length) {
     *length = USB_LEN_DEV_DESC;
     return (uint8_t *)dev_descr;
@@ -1131,6 +1169,10 @@ static uint8_t *pyb_usbdd_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, u
             return str_desc;
         #endif
 
+        case MSFT_WCID_STR_DESC_VALUE:
+            *length = sizeof(msft100_str_desc);
+            return (uint8_t *)msft100_str_desc; // the data should only be read from this buf
+
         default:
             return NULL;
     }
@@ -1159,8 +1201,24 @@ static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *r
     self->bRequest = req->bRequest;
     self->wValue = req->wValue;
     self->wLength = req->wLength;
-    if (req->bmRequest == 0x21) {
-        // host-to-device request
+
+    if ((req->bmRequest & 0xe0) == 0xc0) {
+        // device-to-host vendor request
+        if (req->wIndex == 0x04 && req->bRequest == MSFT100_VENDOR_CODE) {
+            // WCID: Compatible ID Feature Descriptor
+            #if USE_USB_POLLING
+            self->tx_pending = true;
+            #endif
+            int len = MIN(req->wLength, 40);
+            memcpy(self->tx_buf, msft100_id, len);
+            USBD_CtlSendData(&self->hUSBDDevice, self->tx_buf, len);
+            return USBD_OK;
+        } else {
+            USBD_CtlError(pdev, req);
+            return USBD_OK;
+        }
+    } else if (req->bmRequest == 0x21) {
+        // host-to-device class request
         if (req->wLength == 0) {
             // no data, process command straight away
             dfu_handle_rx(self->bRequest, self->wValue, 0, NULL);
@@ -1169,7 +1227,7 @@ static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *r
             USBD_CtlPrepareRx(pdev, self->rx_buf, req->wLength);
         }
     } else if (req->bmRequest == 0xa1) {
-        // device-to-host request
+        // device-to-host class request
         int len = dfu_handle_tx(self->bRequest, self->wValue, self->wLength, self->tx_buf, USB_XFER_SIZE);
         if (len >= 0) {
             #if USE_USB_POLLING

From 8b24aa36ba978eafc6114b6798b47b7bfecdca26 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 6 Nov 2023 16:36:15 +1100
Subject: [PATCH 0688/3129] extmod/modselect: Handle growing the pollfds
 allocation correctly.

The poll_obj_t instances have their pollfd field point into this
allocation.  So if re-allocating results in a move, we need to update the
existing poll_obj_t's.

Update the test to cover this case.

Fixes issue #12887.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modselect.c             | 38 ++++++++++++++++++++++++++++++++--
 tests/extmod/select_poll_fd.py | 13 +++++++++++-
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/extmod/modselect.c b/extmod/modselect.c
index 07ef3d79c8403..9b81ba509f5d5 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -41,6 +41,7 @@
 
 #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
 
+#include <string.h>
 #include <poll.h>
 
 #if !((MP_STREAM_POLL_RD) == (POLLIN) && \
@@ -142,14 +143,47 @@ STATIC void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents) {
     }
 }
 
+// How much (in pollfds) to grow the allocation for poll_set->pollfds by.
+#define POLL_SET_ALLOC_INCREMENT (4)
+
 STATIC struct pollfd *poll_set_add_fd(poll_set_t *poll_set, int fd) {
     struct pollfd *free_slot = NULL;
 
     if (poll_set->used == poll_set->max_used) {
         // No free slots below max_used, so expand max_used (and possibly allocate).
         if (poll_set->max_used >= poll_set->alloc) {
-            poll_set->pollfds = m_renew(struct pollfd, poll_set->pollfds, poll_set->alloc, poll_set->alloc + 4);
-            poll_set->alloc += 4;
+            size_t new_alloc = poll_set->alloc + POLL_SET_ALLOC_INCREMENT;
+            // Try to grow in-place.
+            struct pollfd *new_fds = m_renew_maybe(struct pollfd, poll_set->pollfds, poll_set->alloc, new_alloc, false);
+            if (!new_fds) {
+                // Failed to grow in-place. Do a new allocation and copy over the pollfd values.
+                new_fds = m_new(struct pollfd, new_alloc);
+                memcpy(new_fds, poll_set->pollfds, sizeof(struct pollfd) * poll_set->alloc);
+
+                // Update existing poll_obj_t to update their pollfd field to
+                // point to the same offset inside the new allocation.
+                for (mp_uint_t i = 0; i < poll_set->map.alloc; ++i) {
+                    if (!mp_map_slot_is_filled(&poll_set->map, i)) {
+                        continue;
+                    }
+
+                    poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set->map.table[i].value);
+                    if (!poll_obj) {
+                        // This is the one we're currently adding,
+                        // poll_set_add_obj doesn't assign elem->value until
+                        // afterwards.
+                        continue;
+                    }
+
+                    poll_obj->pollfd = new_fds + (poll_obj->pollfd - poll_set->pollfds);
+                }
+
+                // Delete the old allocation.
+                m_del(struct pollfd, poll_set->pollfds, poll_set->alloc);
+            }
+
+            poll_set->pollfds = new_fds;
+            poll_set->alloc = new_alloc;
         }
         free_slot = &poll_set->pollfds[poll_set->max_used++];
     } else {
diff --git a/tests/extmod/select_poll_fd.py b/tests/extmod/select_poll_fd.py
index fab9c0e0e9459..3677ab5712698 100644
--- a/tests/extmod/select_poll_fd.py
+++ b/tests/extmod/select_poll_fd.py
@@ -34,11 +34,22 @@
 # Poll for input, should return an empty list.
 print(poller.poll(0))
 
-# Test registering a very large number of file descriptors.
+# Test registering a very large number of file descriptors (will trigger
+# EINVAL due to more than OPEN_MAX fds).
 poller = select.poll()
 for fd in range(6000):
     poller.register(fd)
 try:
     poller.poll()
+    assert False
 except OSError as er:
     print(er.errno == errno.EINVAL)
+
+# Register stdout/stderr, plus many extra ones to trigger the fd vector
+# resizing. Then unregister the excess ones and verify poll still works.
+poller = select.poll()
+for fd in range(1, 1000):
+    poller.register(fd)
+for i in range(3, 1000):
+    poller.unregister(i)
+print(sorted(poller.poll()))

From 74fd7b3d32e19a0c15ec1202cf03c31aa353a9f7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 9 Nov 2023 17:36:09 +1100
Subject: [PATCH 0689/3129] tools/ci.sh: Set `ulimit -n` for unix CI.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/extmod/select_poll_fd.py | 3 ++-
 tools/ci.sh                    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/select_poll_fd.py b/tests/extmod/select_poll_fd.py
index 3677ab5712698..3f7b5aa7384e1 100644
--- a/tests/extmod/select_poll_fd.py
+++ b/tests/extmod/select_poll_fd.py
@@ -35,7 +35,8 @@
 print(poller.poll(0))
 
 # Test registering a very large number of file descriptors (will trigger
-# EINVAL due to more than OPEN_MAX fds).
+# EINVAL due to more than OPEN_MAX fds). Typically it's 1024 (and on GitHub CI
+# we force this via `ulimit -n 1024`).
 poller = select.poll()
 for fd in range(6000):
     poller.register(fd)
diff --git a/tools/ci.sh b/tools/ci.sh
index d3ae4115823f2..95b1f19ffc4a6 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -6,6 +6,9 @@ else
     MAKEOPTS="-j$(sysctl -n hw.ncpu)"
 fi
 
+# Ensure known OPEN_MAX (NO_FILES) limit.
+ulimit -n 1024
+
 ########################################################################################
 # general helper functions
 

From b31eef609497cd7e3c50841e1cf45f1610d39c73 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Tue, 19 Dec 2023 16:28:06 +0200
Subject: [PATCH 0690/3129] extmod/modhashlib: Support MD5 with mbedtls 3.x.

This change was missd in e7ae3ad92d7540cbe349cc05f5d62e0f63fce59b.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 extmod/modhashlib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modhashlib.c b/extmod/modhashlib.c
index 4cdc23fddc6c6..263144a5c9d32 100644
--- a/extmod/modhashlib.c
+++ b/extmod/modhashlib.c
@@ -297,7 +297,7 @@ STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
 
 #if MICROPY_SSL_MBEDTLS
 
-#if MBEDTLS_VERSION_NUMBER < 0x02070000
+#if MBEDTLS_VERSION_NUMBER < 0x02070000 || MBEDTLS_VERSION_NUMBER >= 0x03000000
 #define mbedtls_md5_starts_ret mbedtls_md5_starts
 #define mbedtls_md5_update_ret mbedtls_md5_update
 #define mbedtls_md5_finish_ret mbedtls_md5_finish

From 5552896ca8064a71446030bd9524cff7558a0f83 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Tue, 19 Dec 2023 16:28:06 +0200
Subject: [PATCH 0691/3129] esp32/mpconfigport: Enable MICROPY_PY_HASHLIB_MD5.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 8937455992a17..5dc4a9c758790 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -101,6 +101,7 @@
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif
+#define MICROPY_PY_HASHLIB_MD5              (1)
 #define MICROPY_PY_HASHLIB_SHA1             (1)
 #define MICROPY_PY_HASHLIB_SHA256           (1)
 #define MICROPY_PY_CRYPTOLIB                (1)

From 5d28bb4adb24094917038a506248ff7fb351ac44 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 19 Dec 2023 16:13:50 +1100
Subject: [PATCH 0692/3129] tools/manifestfile.py: Add support for external
 libraries.

This adds a `add_library(name, path)` method for use in manifest.py that
allows registering an external path (e.g. to another repo) by name.

This name can then be passed to `require("package", library="name")` to
reference packages in that repo/library rather than micropython-lib.

Within the external library, `require()` continues to work as normal
(referencing micropython-lib) by default, but they can also specify the
library name to require another package from that repo/library.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/manifestfile.py | 53 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index 295170c34cabe..aa85c4650f2a6 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -194,6 +194,8 @@ def __init__(self, mode, path_vars=None):
         self._visited = set()
         # Stack of metadata for each level.
         self._metadata = [ManifestPackageMetadata()]
+        # Registered external libraries.
+        self._libraries = {}
 
     def _resolve_path(self, path):
         # Convert path to an absolute path, applying variable substitutions.
@@ -208,6 +210,7 @@ def _manifest_globals(self, kwargs):
             "metadata": self.metadata,
             "include": self.include,
             "require": self.require,
+            "add_library": self.add_library,
             "package": self.package,
             "module": self.module,
             "options": IncludeOptions(**kwargs),
@@ -388,14 +391,25 @@ def include(self, manifest_path, is_require=False, **kwargs):
             if is_require:
                 self._metadata.pop()
 
-    def require(self, name, version=None, unix_ffi=False, pypi=None, **kwargs):
+    def _require_from_path(self, library_path, name, version, extra_kwargs):
+        for root, dirnames, filenames in os.walk(library_path):
+            if os.path.basename(root) == name and "manifest.py" in filenames:
+                self.include(root, is_require=True, **extra_kwargs)
+                return True
+        return False
+
+    def require(self, name, version=None, unix_ffi=False, pypi=None, library=None, **kwargs):
         """
-        Require a module by name from micropython-lib.
+        Require a package by name from micropython-lib.
 
         Optionally specify unix_ffi=True to use a module from the unix-ffi directory.
 
         Optionally specify pipy="package-name" to indicate that this should
         use the named package from PyPI when building for CPython.
+
+        Optionally specify library="name" to reference a package from a
+        library that has been previously registered with add_library(). Otherwise
+        micropython-lib will be used.
         """
         self._metadata[-1].check_initialised(self._mode)
 
@@ -406,27 +420,46 @@ def require(self, name, version=None, unix_ffi=False, pypi=None, **kwargs):
             self._pypi_dependencies.append(pypi)
             return
 
-        if self._path_vars["MPY_LIB_DIR"]:
+        if library is not None:
+            # Find package in external library.
+            if library not in self._libraries:
+                raise ValueError("Unknown library '{}' for require('{}').".format(library, name))
+            library_path = self._libraries[library]
+            # Search for {library_path}/**/{name}/manifest.py.
+            if not self._require_from_path(library_path, name, version, kwargs):
+                raise ValueError(
+                    "Package '{}' not found in external library '{}' ({}).".format(
+                        name, library, library_path
+                    )
+                )
+        elif self._path_vars["MPY_LIB_DIR"]:
+            # Find package in micropython-lib, in one of the three top-level directories.
             lib_dirs = ["micropython", "python-stdlib", "python-ecosys"]
             if unix_ffi:
-                # Search unix-ffi only if unix_ffi=True, and make unix-ffi modules
+                # Additionally 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:
                 # 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)
+                if self._require_from_path(
+                    os.path.join(self._path_vars["MPY_LIB_DIR"], lib_dir), name, version, kwargs
                 ):
-                    if os.path.basename(root) == name and "manifest.py" in filenames:
-                        self.include(root, is_require=True, **kwargs)
-                        return
+                    return
 
-            raise ValueError("Library not found in local micropython-lib: {}".format(name))
+            raise ValueError("Package '{}' 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 add_library(self, library, library_path):
+        """
+        Register the path to an external named library.
+
+        This allows require("name", library="library") to find packages in that library.
+        """
+        self._libraries[library] = self._resolve_path(library_path)
+
     def package(self, package_path, files=None, base_path=".", opt=None):
         """
         Define a package, optionally restricting to a set of files.

From 91ee8ac89405b7d063f334100b7ed0394d69fe02 Mon Sep 17 00:00:00 2001
From: Maarten van der Schrieck <maarten@thingsconnected.nl>
Date: Tue, 24 Oct 2023 23:10:45 +0200
Subject: [PATCH 0693/3129] extmod/os_dupterm: Let mp_os_dupterm_tx_strn()
 return num bytes written.

In case of multiple outputs, the minimum successful write length is
returned.  In line with this, in case any output has a write error, zero is
returned.

In case of no outputs, -1 is returned.

The return value can be used to assess whether writes were attempted, and
if so, whether they succeeded.

Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>
---
 extmod/misc.h       |  6 ++++--
 extmod/os_dupterm.c | 20 +++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/extmod/misc.h b/extmod/misc.h
index 80e5b59a08ee1..8ea51a981ed6d 100644
--- a/extmod/misc.h
+++ b/extmod/misc.h
@@ -39,10 +39,12 @@ bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream);
 void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached);
 uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags);
 int mp_os_dupterm_rx_chr(void);
-void mp_os_dupterm_tx_strn(const char *str, size_t len);
+int mp_os_dupterm_tx_strn(const char *str, size_t len);
 void mp_os_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc);
 #else
-#define mp_os_dupterm_tx_strn(s, l)
+static inline int mp_os_dupterm_tx_strn(const char *s, size_t l) {
+    return -1;
+}
 #endif
 
 #endif // MICROPY_INCLUDED_EXTMOD_MISC_H
diff --git a/extmod/os_dupterm.c b/extmod/os_dupterm.c
index 298983e9c985f..dcd9c54b998e1 100644
--- a/extmod/os_dupterm.c
+++ b/extmod/os_dupterm.c
@@ -169,29 +169,43 @@ int mp_os_dupterm_rx_chr(void) {
     return ret;
 }
 
-void mp_os_dupterm_tx_strn(const char *str, size_t len) {
+int mp_os_dupterm_tx_strn(const char *str, size_t len) {
+    // Returns the minimum successful write length, or -1 if no write is attempted.
+    int ret = len;
+    bool did_write = false;
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
         if (MP_STATE_VM(dupterm_objs[idx]) == MP_OBJ_NULL) {
             continue;
         }
+        did_write = true;
 
         #if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM
         if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
             int errcode = 0;
             const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx]));
-            stream_p->write(MP_STATE_VM(dupterm_objs[idx]), str, len, &errcode);
+            mp_uint_t written = stream_p->write(MP_STATE_VM(dupterm_objs[idx]), str, len, &errcode);
+            int write_res = MAX(0, written);
+            ret = MIN(write_res, ret);
             continue;
         }
         #endif
 
         nlr_buf_t nlr;
         if (nlr_push(&nlr) == 0) {
-            mp_stream_write(MP_STATE_VM(dupterm_objs[idx]), str, len, MP_STREAM_RW_WRITE);
+            mp_obj_t written = mp_stream_write(MP_STATE_VM(dupterm_objs[idx]), str, len, MP_STREAM_RW_WRITE);
+            if (written == mp_const_none) {
+                ret = 0;
+            } else if (mp_obj_is_small_int(written)) {
+                int written_int = MAX(0, MP_OBJ_SMALL_INT_VALUE(written));
+                ret = MIN(written_int, ret);
+            }
             nlr_pop();
         } else {
             mp_os_deactivate(idx, "dupterm: Exception in write() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
+            ret = 0;
         }
     }
+    return did_write ? ret : -1;
 }
 
 STATIC mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args) {

From 3bca93b2d00dec37b3770c3e4fac15f07e0b9f15 Mon Sep 17 00:00:00 2001
From: Maarten van der Schrieck <maarten@thingsconnected.nl>
Date: Sun, 18 Jun 2023 11:46:25 +0200
Subject: [PATCH 0694/3129] ports: Fix sys.stdout.buffer.write() return value.

MicroPython code may rely on the return value of sys.stdout.buffer.write()
to reflect the number of bytes actually written. While in most scenarios a
write() operation is successful, there are cases where it fails, leading to
data loss. This problem arises because, currently, write() merely returns
the number of bytes it was supposed to write, without indication of
failure.

One scenario where write() might fail, is where USB is used and the
receiving end doesn't read quickly enough to empty the receive buffer. In
that case, write() on the MicroPython side can timeout, resulting in the
loss of data without any indication, a behavior observed notably in
communication between a Pi Pico as a client and a Linux host using the ACM
driver.

A complex issue arises with mp_hal_stdout_tx_strn() when it involves
multiple outputs, such as USB, dupterm and hardware UART. The challenge is
in handling cases where writing to one output is successful, but another
fails, either fully or partially. This patch implements the following
solution:

mp_hal_stdout_tx_strn() attempts to write len bytes to all of the possible
destinations for that data, and returns the minimum successful write
length.

The implementation of this is complicated by several factors:
- multiple outputs may be enabled or disabled at compiled time
- multiple outputs may be enabled or disabled at runtime
- mp_os_dupterm_tx_strn() is one such output, optionally containing
  multiple additional outputs
- each of these outputs may or may not be able to report success
- each of these outputs may or may not be able to report partial writes

As a result, there's no single strategy that fits all ports, necessitating
unique logic for each instance of mp_hal_stdout_tx_strn().

Note that addressing sys.stdout.write() is more complex due to its data
modification process ("cooked" output), and it remains unchanged in this
patch. Developers who are concerned about accurate return values from
write operations should use sys.stdout.buffer.write().

This patch might disrupt some existing code, but it's also expected to
resolve issues, considering that the peculiar return value behavior of
sys.stdout.buffer.write() is not well-documented and likely not widely
known. Therefore, it's improbable that much existing code relies on the
previous behavior.

Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>
---
 ports/cc3200/hal/cc3200_hal.c          |  9 +++++++--
 ports/esp32/mphalport.c                | 14 ++++++++++++--
 ports/esp8266/esp_mphal.c              | 10 ++++++++--
 ports/mimxrt/mphalport.c               | 17 ++++++++++++++---
 ports/minimal/uart_core.c              |  9 +++++++--
 ports/nrf/drivers/bluetooth/ble_uart.c |  6 ++++--
 ports/nrf/drivers/usb/usb_cdc.c        |  4 ++--
 ports/nrf/mphalport.c                  |  4 +++-
 ports/pic16bit/pic16bit_mphal.c        |  4 +++-
 ports/powerpc/uart_lpc_serial.c        |  3 ++-
 ports/powerpc/uart_potato.c            |  3 ++-
 ports/renesas-ra/mphalport.c           | 18 +++++++++++++++---
 ports/rp2/mphalport.c                  | 18 +++++++++++++++---
 ports/samd/mphalport.c                 | 17 ++++++++++++++---
 ports/stm32/mphalport.c                | 12 ++++++++++--
 ports/unix/unix_mphal.c                |  9 +++++++--
 ports/webassembly/mphalport.c          |  3 ++-
 ports/webassembly/mphalport.h          |  2 +-
 ports/windows/windows_mphal.c          |  5 +++--
 ports/zephyr/uart_core.c               |  4 +++-
 py/mphal.h                             |  2 +-
 shared/runtime/sys_stdio_mphal.c       |  3 +--
 22 files changed, 136 insertions(+), 40 deletions(-)

diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index 56dd2b2b82646..8bfd2fda1c8ae 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -140,10 +140,15 @@ void mp_hal_delay_ms(mp_uint_t delay) {
     }
 }
 
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
-    mp_os_dupterm_tx_strn(str, len);
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
+    mp_uint_t ret = len;
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        ret = dupterm_res;
+    }
     // and also to telnet
     telnet_tx_strn(str, len);
+    return ret;
 }
 
 int mp_hal_stdin_rx_chr(void) {
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 8e14bda595f3b..fb322dff6dd54 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -125,24 +125,34 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     // Only release the GIL if many characters are being sent
+    mp_uint_t ret = len;
+    bool did_write = false;
     bool release_gil = len > 20;
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }
     #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
+    did_write = true;
     #elif CONFIG_USB_OTG_SUPPORTED
     usb_tx_strn(str, len);
+    did_write = true;
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
     uart_stdout_tx_strn(str, len);
+    did_write = true;
     #endif
     if (release_gil) {
         MP_THREAD_GIL_ENTER();
     }
-    mp_os_dupterm_tx_strn(str, len);
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
+    return did_write ? ret : 0;
 }
 
 uint32_t mp_hal_ticks_ms(void) {
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 394c9796c83c8..6f158058d9acc 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -94,8 +94,14 @@ void mp_hal_debug_str(const char *str) {
 }
 #endif
 
-void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
-    mp_os_dupterm_tx_strn(str, len);
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res < 0) {
+        // no outputs, nothing was written
+        return 0;
+    } else {
+        return dupterm_res;
+    }
 }
 
 void mp_hal_debug_tx_strn_cooked(void *env, const char *str, uint32_t len) {
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 2114baaae4fd8..be4b1d8b5c815 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -112,9 +112,12 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    mp_uint_t ret = len;
+    bool did_write = false;
     if (tud_cdc_connected()) {
-        for (size_t i = 0; i < len;) {
+        size_t i = 0;
+        while (i < len) {
             uint32_t n = len - i;
             if (n > CFG_TUD_CDC_EP_BUFSIZE) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
@@ -125,6 +128,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
                 MICROPY_EVENT_POLL_HOOK
             }
             if (ticks_us64() >= timeout) {
+                ret = i;
                 break;
             }
 
@@ -132,10 +136,17 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             tud_cdc_write_flush();
             i += n2;
         }
+        did_write = true;
+        ret = MIN(i, ret);
     }
     #if MICROPY_PY_OS_DUPTERM
-    mp_os_dupterm_tx_strn(str, len);
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
     #endif
+    return did_write ? ret : 0;
 }
 
 uint64_t mp_hal_time_ns(void) {
diff --git a/ports/minimal/uart_core.c b/ports/minimal/uart_core.c
index c7af24404bd52..a3dfe697e33a1 100644
--- a/ports/minimal/uart_core.c
+++ b/ports/minimal/uart_core.c
@@ -29,10 +29,14 @@ int mp_hal_stdin_rx_chr(void) {
 }
 
 // Send string of given length
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    mp_uint_t ret = len;
     #if MICROPY_MIN_USE_STDOUT
     int r = write(STDOUT_FILENO, str, len);
-    (void)r;
+    if (r >= 0) {
+        // in case of an error in the syscall, report no bytes written
+        ret = 0;
+    }
     #elif MICROPY_MIN_USE_STM32_MCU
     while (len--) {
         // wait for TXE
@@ -41,4 +45,5 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         USART1->DR = *str++;
     }
     #endif
+    return ret;
 }
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 320657370335b..4ea811572518f 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -110,10 +110,11 @@ int mp_hal_stdin_rx_chr(void) {
     return (int)byte;
 }
 
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     // Not connected: drop output
-    if (!ble_uart_enabled()) return;
+    if (!ble_uart_enabled()) return 0;
 
+    mp_uint_t ret = len;
     uint8_t *buf = (uint8_t *)str;
     size_t send_len;
 
@@ -134,6 +135,7 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
         len -= send_len;
         buf += send_len;
     }
+    return ret;
 }
 
 void ble_uart_tx_char(char c) {
diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index e33a42548271c..3ca2acbf3dba2 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -231,12 +231,12 @@ int mp_hal_stdin_rx_chr(void) {
     return 0;
 }
 
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     for (const char *top = str + len; str < top; str++) {
         ringbuf_put((ringbuf_t*)&tx_ringbuf, *str);
         usb_cdc_loop();
     }
+    return len;
 }
 
 void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index f6c934a8b5fbe..c964a26c2e371 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -196,10 +196,12 @@ int mp_hal_stdin_rx_chr(void) {
     return 0;
 }
 
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
         uart_tx_strn(MP_STATE_VM(dupterm_objs[0]), str, len);
+        return len;
     }
+    return 0;
 }
 
 void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
diff --git a/ports/pic16bit/pic16bit_mphal.c b/ports/pic16bit/pic16bit_mphal.c
index b2c80ba1be78c..f58abf78314fb 100644
--- a/ports/pic16bit/pic16bit_mphal.c
+++ b/ports/pic16bit/pic16bit_mphal.c
@@ -75,10 +75,12 @@ 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) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
+    mp_uint_t ret = len;
     for (; len > 0; --len) {
         uart_tx_char(*str++);
     }
+    return ret;
 }
 
 void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
diff --git a/ports/powerpc/uart_lpc_serial.c b/ports/powerpc/uart_lpc_serial.c
index 760615041cf94..405bf2d1e34d4 100644
--- a/ports/powerpc/uart_lpc_serial.c
+++ b/ports/powerpc/uart_lpc_serial.c
@@ -108,7 +108,7 @@ int mp_hal_stdin_rx_chr(void) {
 }
 
 
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t 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()) {
@@ -116,4 +116,5 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         }
         lpc_uart_reg_write(REG_RBR, str[i]);
     }
+    return len;
 }
diff --git a/ports/powerpc/uart_potato.c b/ports/powerpc/uart_potato.c
index 29f21934ddf44..089e4e2be1f10 100644
--- a/ports/powerpc/uart_potato.c
+++ b/ports/powerpc/uart_potato.c
@@ -118,7 +118,7 @@ int mp_hal_stdin_rx_chr(void) {
     return (char)(val & 0x000000ff);
 }
 
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     int i;
 
     for (i = 0; i < len; i++) {
@@ -129,4 +129,5 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         }
         potato_uart_reg_write(POTATO_CONSOLE_TX, val);
     }
+    return len;
 }
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index 91705129cfd4c..8a8bfd8dc7a77 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -154,16 +154,20 @@ int mp_hal_stdin_rx_chr(void) {
 }
 
 // Send string of given length
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    mp_uint_t ret = len;
+    bool did_write = false;
     #if MICROPY_HW_ENABLE_UART_REPL
     if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
         uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
+        did_write = true;
     }
     #endif
 
     #if MICROPY_HW_USB_CDC
     if (tud_cdc_connected()) {
-        for (size_t i = 0; i < len;) {
+        size_t i = 0;
+        while (i < len) {
             uint32_t n = len - i;
             if (n > CFG_TUD_CDC_EP_BUFSIZE) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
@@ -180,12 +184,20 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             tud_cdc_write_flush();
             i += n2;
         }
+        ret = MIN(i, ret);
+        did_write = true;
     }
     #endif
 
     #if MICROPY_PY_OS_DUPTERM
-    mp_os_dupterm_tx_strn(str, len);
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
     #endif
+
+    return did_write ? ret : 0;
 }
 
 void mp_hal_ticks_cpu_enable(void) {
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 1c784fd737e8a..c5ae221e984b4 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -151,14 +151,18 @@ int mp_hal_stdin_rx_chr(void) {
 }
 
 // Send string of given length
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    mp_uint_t ret = len;
+    bool did_write = false;
     #if MICROPY_HW_ENABLE_UART_REPL
     mp_uart_write_strn(str, len);
+    did_write = true;
     #endif
 
     #if MICROPY_HW_USB_CDC
     if (tud_cdc_connected()) {
-        for (size_t i = 0; i < len;) {
+        size_t i = 0;
+        while (i < len) {
             uint32_t n = len - i;
             if (n > CFG_TUD_CDC_EP_BUFSIZE) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
@@ -173,18 +177,26 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
                 mp_usbd_task();
             }
             if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+                ret = i;
                 break;
             }
             uint32_t n2 = tud_cdc_write(str + i, n);
             tud_cdc_write_flush();
             i += n2;
         }
+        ret = MIN(i, ret);
+        did_write = true;
     }
     #endif
 
     #if MICROPY_PY_OS_DUPTERM
-    mp_os_dupterm_tx_strn(str, len);
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
     #endif
+    return did_write ? ret : 0;
 }
 
 void mp_hal_delay_ms(mp_uint_t ms) {
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 3c803403f213a..de1650c9914b1 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -200,9 +200,12 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    mp_uint_t ret = len;
+    bool did_write = false;
     if (tud_cdc_connected()) {
-        for (size_t i = 0; i < len;) {
+        size_t i = 0;
+        while (i < len) {
             uint32_t n = len - i;
             if (n > CFG_TUD_CDC_EP_BUFSIZE) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
@@ -213,14 +216,22 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
                 MICROPY_EVENT_POLL_HOOK_WITH_USB;
             }
             if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+                ret = i;
                 break;
             }
             uint32_t n2 = tud_cdc_write(str + i, n);
             tud_cdc_write_flush();
             i += n2;
         }
+        ret = MIN(i, ret);
+        did_write = true;
     }
     #if MICROPY_PY_OS_DUPTERM
-    mp_os_dupterm_tx_strn(str, len);
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
     #endif
+    return did_write ? ret : 0;
 }
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index f8a5d66fc9152..dfd50cebd3dee 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -57,14 +57,22 @@ MP_WEAK int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-MP_WEAK void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+MP_WEAK mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
+    mp_uint_t ret = len;
+    bool did_write = false;
     if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
         uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
+        did_write = true;
     }
     #if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
     lcd_print_strn(str, len);
     #endif
-    mp_os_dupterm_tx_strn(str, len);
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
+    return did_write ? ret : 0;
 }
 
 #if __CORTEX_M >= 0x03
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 8d6539c88e382..24c0fa3cdae53 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -184,10 +184,15 @@ main_term:;
     return c;
 }
 
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     ssize_t ret;
     MP_HAL_RETRY_SYSCALL(ret, write(STDOUT_FILENO, str, len), {});
-    mp_os_dupterm_tx_strn(str, len);
+    mp_uint_t written = ret < 0 ? 0 : ret;
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        written = MIN((mp_uint_t)dupterm_res, written);
+    }
+    return written;
 }
 
 // cooked is same as uncooked because the terminal does some postprocessing
diff --git a/ports/webassembly/mphalport.c b/ports/webassembly/mphalport.c
index c938a63928824..f91a509013a3c 100644
--- a/ports/webassembly/mphalport.c
+++ b/ports/webassembly/mphalport.c
@@ -27,8 +27,9 @@
 #include "library.h"
 #include "mphalport.h"
 
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     mp_js_write(str, len);
+    return len;
 }
 
 void mp_hal_delay_ms(mp_uint_t ms) {
diff --git a/ports/webassembly/mphalport.h b/ports/webassembly/mphalport.h
index 89efee69747d2..1b3179698644b 100644
--- a/ports/webassembly/mphalport.h
+++ b/ports/webassembly/mphalport.h
@@ -28,7 +28,7 @@
 #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);
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len);
 
 void mp_hal_delay_ms(mp_uint_t ms);
 void mp_hal_delay_us(mp_uint_t us);
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index d1bbb931af380..f88491707f193 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -221,10 +221,11 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     MP_THREAD_GIL_EXIT();
-    write(STDOUT_FILENO, str, len);
+    int ret = write(STDOUT_FILENO, str, len);
     MP_THREAD_GIL_ENTER();
+    return ret < 0 ? 0 : ret; // return the number of bytes written, so in case of an error in the syscall, return 0
 }
 
 void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 1d37f220935c1..3f70cc0a172eb 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -44,7 +44,8 @@ int mp_hal_stdin_rx_chr(void) {
 }
 
 // Send string of given length
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    mp_uint_t ret = len;
     #ifdef CONFIG_CONSOLE_SUBSYS
     while (len--) {
         char c = *str++;
@@ -60,4 +61,5 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         uart_poll_out(uart_console_dev, *str++);
     }
     #endif
+    return ret;
 }
diff --git a/py/mphal.h b/py/mphal.h
index 81cf50918e35d..a4f222d0b1e11 100644
--- a/py/mphal.h
+++ b/py/mphal.h
@@ -56,7 +56,7 @@ void mp_hal_stdout_tx_str(const char *str);
 #endif
 
 #ifndef mp_hal_stdout_tx_strn
-void mp_hal_stdout_tx_strn(const char *str, size_t len);
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len);
 #endif
 
 #ifndef mp_hal_stdout_tx_strn_cooked
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index 84ce5828ef048..b7a35a5cbaa0b 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -142,8 +142,7 @@ STATIC mp_uint_t stdio_buffer_read(mp_obj_t self_in, void *buf, mp_uint_t size,
 }
 
 STATIC mp_uint_t stdio_buffer_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
-    mp_hal_stdout_tx_strn(buf, size);
-    return size;
+    return mp_hal_stdout_tx_strn(buf, size);
 }
 
 STATIC const mp_stream_p_t stdio_buffer_obj_stream_p = {

From ce42c9ee1659ff86337a7f528332b4eaed6df0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Thu, 21 Dec 2023 00:17:15 +0100
Subject: [PATCH 0695/3129] extmod/vfs_lfs: Fix lfs cache_size calculation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The calculation of the lfs2 cache_size was incorrect, the maximum allowed
size is block_size.

The cache size must be: "a multiple of the read and program sizes, and a
factor of the block size".

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 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 fe0731eced2a8..e78c154d1fe8d 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -99,7 +99,7 @@ STATIC void MP_VFS_LFSx(init_config)(MP_OBJ_VFS_LFSx * self, mp_obj_t bdev, size
     config->lookahead_buffer = m_new(uint8_t, config->lookahead / 8);
     #else
     config->block_cycles = 100;
-    config->cache_size = 4 * MAX(read_size, prog_size);
+    config->cache_size = MIN(config->block_size, (4 * MAX(read_size, prog_size)));
     config->lookahead_size = lookahead;
     config->read_buffer = m_new(uint8_t, config->cache_size);
     config->prog_buffer = m_new(uint8_t, config->cache_size);

From d69e69adb689de91f97bc184c9ebc1022d0e4fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Thu, 21 Dec 2023 00:23:50 +0100
Subject: [PATCH 0696/3129] py/mkrules.mk: Fix dependency file generation for
 compiler wrappers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When compiling with distcc, it does not understand the -MD flag on its own.
This fixes the interaction by explicitly adding the -MF option.

The error in distcc is described here under "Problems with gcc -MD":
https://www.distcc.org/faq.html

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 py/mkrules.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 7ecb2a5f66b38..30483feb5c47e 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -63,7 +63,7 @@ $(BUILD)/%.o: %.s
 
 define compile_c
 $(ECHO) "CC $<"
-$(Q)$(CC) $(CFLAGS) -c -MD -o $@ $< || (echo -e $(HELP_BUILD_ERROR); false)
+$(Q)$(CC) $(CFLAGS) -c -MD -MF $(@:.o=.d) -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.
@@ -75,7 +75,7 @@ endef
 
 define compile_cxx
 $(ECHO) "CXX $<"
-$(Q)$(CXX) $(CXXFLAGS) -c -MD -o $@ $< || (echo -e $(HELP_BUILD_ERROR); false)
+$(Q)$(CXX) $(CXXFLAGS) -c -MD -MF $(@:.o=.d) -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.

From e4d3ab33045274c8e31ca559afea20753dbb6b82 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Thu, 21 Dec 2023 17:42:19 +0100
Subject: [PATCH 0697/3129] nrf/main: Add /flash and /flash/lib to sys.path.

This allows to follow good practice and have libraries live in the lib
folder which means they will be found by the runtime without adding this
path manually at runtime.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/nrf/main.c         | 3 +++
 ports/nrf/qstrdefsport.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index bcd0bb9d7151c..0e5a26c487e43 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -191,6 +191,9 @@ int main(int argc, char **argv) {
 
     if (ret != 0) {
         printf("MPY: can't mount flash\n");
+    } else {
+        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));
     }
     #endif
 
diff --git a/ports/nrf/qstrdefsport.h b/ports/nrf/qstrdefsport.h
index f12cf40efadc0..273beb04e13af 100644
--- a/ports/nrf/qstrdefsport.h
+++ b/ports/nrf/qstrdefsport.h
@@ -29,6 +29,7 @@
 
 // Entries for sys.path
 Q(/flash)
+Q(/flash/lib)
 
 // For os.sep
 Q(/)

From cfc212b10810863b7dee4f9228ce824ceca837c6 Mon Sep 17 00:00:00 2001
From: Nicko van Someren <nicko@nicko.org>
Date: Sat, 30 Sep 2023 16:54:47 -0600
Subject: [PATCH 0698/3129] rp2/rp2_dma: Introduce a new rp2.DMA class for
 control over DMA xfers.

This commit implements fairly complete support for the DMA controller in
the rp2 series of microcontrollers.  It provides a class for accessing the
DMA channels through a high-level, Pythonic interface, and functions for
setting and manipulating the DMA channel configurations.

Creating an instance of the rp2.DMA class claims one of the processor's DMA
channels.  A sensible, per-channel default value for the ctrl register can
be fetched from the DMA.pack_ctrl() function, and the components of this
register can be set via keyword arguments to pack_ctrl().

The read, write, count and ctrl attributes of the DMA class provide
read/write access to the respective registers of the DMA controller.  The
config() method allows any or all of these values to be set simultaneously
and adds a trigger keyword argument to allow the setup to immediately be
triggered.  The read and write attributes (or keywords in config()) accept
either actual addresses or any object that supports the buffer interface.
The active() method provides read/write control of the channel's activity,
allowing the user to start and stop the channel and test if it is running.

Standard MicroPython interrupt handlers are supported through the irq()
method and the channel can be released either by deleting it and allowing
it to be garbage-collected or with the explicit close() method.

Direct, unfettered access to the DMA controllers registers is provided
through a proxy memoryview() object returned by the DMA.registers attribute
that maps directly onto the memory-mapped registers.  This is necessary for
more fine-grained control and is helpful for allowing chaining of DMA
channels.

As a simple example, using DMA to do a fast memory copy just needs:

    src = bytearray(32*1024)
    dest = bytearray(32*1024)
    dma = rp2.DMA()
    dma.config(read=src, write=dest, count=len(src) // 4,
        ctrl=dma.pack_ctrl(), trigger=True)

    # Wait for completion
    while dma.active():
        pass

This API aims to strike a balance between simplicity and comprehensiveness.

Signed-off-by: Nicko van Someren <nicko@nicko.org>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt |   2 +
 ports/rp2/main.c         |   2 +
 ports/rp2/modrp2.c       |   1 +
 ports/rp2/modrp2.h       |   4 +
 ports/rp2/rp2_dma.c      | 469 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 478 insertions(+)
 create mode 100644 ports/rp2/rp2_dma.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 5da54dc1c9902..559ae23f52e3c 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -132,6 +132,7 @@ set(MICROPY_SOURCE_PORT
     pendsv.c
     rp2_flash.c
     rp2_pio.c
+    rp2_dma.c
     uart.c
     usbd.c
     msc_disk.c
@@ -156,6 +157,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_PORT_DIR}/modos.c
     ${MICROPY_PORT_DIR}/rp2_flash.c
     ${MICROPY_PORT_DIR}/rp2_pio.c
+    ${MICROPY_PORT_DIR}/rp2_dma.c
     ${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c
 )
 
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 8b41fac4ba856..e63b8c03f07fc 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -159,6 +159,7 @@ int main(int argc, char **argv) {
         readline_init0();
         machine_pin_init();
         rp2_pio_init();
+        rp2_dma_init();
         machine_i2s_init0();
 
         #if MICROPY_PY_BLUETOOTH
@@ -207,6 +208,7 @@ int main(int argc, char **argv) {
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
+        rp2_dma_deinit();
         rp2_pio_deinit();
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_deinit();
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index 7ccbcb40cb673..bd00eaf40c89d 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -88,6 +88,7 @@ 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_DMA),                 MP_ROM_PTR(&rp2_dma_type) },
     { MP_ROM_QSTR(MP_QSTR_bootsel_button),      MP_ROM_PTR(&rp2_bootsel_button_obj) },
 
     #if MICROPY_PY_NETWORK_CYW43
diff --git a/ports/rp2/modrp2.h b/ports/rp2/modrp2.h
index 805c785f2d8cd..9360acb4fb4d3 100644
--- a/ports/rp2/modrp2.h
+++ b/ports/rp2/modrp2.h
@@ -31,8 +31,12 @@
 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;
+extern const mp_obj_type_t rp2_dma_type;
 
 void rp2_pio_init(void);
 void rp2_pio_deinit(void);
 
+void rp2_dma_init(void);
+void rp2_dma_deinit(void);
+
 #endif // MICROPY_INCLUDED_RP2_MODRP2_H
diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
new file mode 100644
index 0000000000000..acc18d08c58da
--- /dev/null
+++ b/ports/rp2/rp2_dma.c
@@ -0,0 +1,469 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Nicko van Someren
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/objarray.h"
+#include "shared/runtime/mpirq.h"
+#include "modrp2.h"
+
+#include "hardware/irq.h"
+#include "hardware/dma.h"
+
+#define CHANNEL_CLOSED 0xff
+
+typedef struct _rp2_dma_ctrl_obj_t {
+    mp_obj_base_t base;
+    uint32_t value;
+} rp2_dma_config_obj_t;
+
+typedef struct _rp2_dma_obj_t {
+    mp_obj_base_t base;
+    uint8_t channel;
+    uint8_t irq_flag : 1;
+    uint8_t irq_trigger : 1;
+} rp2_dma_obj_t;
+
+typedef struct _rp2_dma_ctrl_field_t {
+    qstr name;
+    uint8_t shift : 5;
+    uint8_t length : 3;
+    uint8_t read_only : 1;
+} rp2_dma_ctrl_field_t;
+
+STATIC rp2_dma_ctrl_field_t rp2_dma_ctrl_fields_table[] = {
+    { MP_QSTR_enable,        0, 1, 0 },
+    { MP_QSTR_high_pri,      1, 1, 0 },
+    { MP_QSTR_size,          2, 2, 0 },
+    { MP_QSTR_inc_read,      4, 1, 0 },
+    { MP_QSTR_inc_write,     5, 1, 0 },
+    { MP_QSTR_ring_size,     6, 4, 0 },
+    { MP_QSTR_ring_sel,     10, 1, 0 },
+    { MP_QSTR_chain_to,     11, 4, 0 },
+    { MP_QSTR_treq_sel,     15, 6, 0 },
+    { MP_QSTR_irq_quiet,    21, 1, 0 },
+    { MP_QSTR_bswap,        22, 1, 0 },
+    { MP_QSTR_sniff_en,     23, 1, 0 },
+    { MP_QSTR_busy,         24, 1, 1 },
+    // bits 25 through 28 are reserved
+    { MP_QSTR_write_err,    29, 1, 0 },
+    { MP_QSTR_read_err,     30, 1, 0 },
+    { MP_QSTR_ahb_err,      31, 1, 1 },
+};
+
+STATIC const uint32_t rp2_dma_ctrl_field_count = MP_ARRAY_SIZE(rp2_dma_ctrl_fields_table);
+
+#define REG_TYPE_COUNT       0  // Accept just integers
+#define REG_TYPE_CONF        1  // Accept integers or ctrl values
+#define REG_TYPE_ADDR_READ   2  // Accept integers, buffers or objects that can be read from
+#define REG_TYPE_ADDR_WRITE  3  // Accept integers, buffers or objects that can be written to
+
+STATIC uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) {
+    if (reg_type == REG_TYPE_ADDR_READ || reg_type == REG_TYPE_ADDR_WRITE) {
+        mp_buffer_info_t buf_info;
+        mp_uint_t flags = MP_BUFFER_READ;
+        if (mp_get_buffer(o, &buf_info, flags)) {
+            return (uint32_t)buf_info.buf;
+        }
+    }
+
+    return mp_obj_get_int_truncated(o);
+}
+
+STATIC void rp2_dma_irq_handler(void) {
+    // Main IRQ handler
+    uint32_t irq_bits = dma_hw->ints0;
+    dma_hw->ints0 = 0xffff;
+
+    for (int i = 0; i < NUM_DMA_CHANNELS; i++) {
+        if (irq_bits & (1u << i)) {
+            mp_irq_obj_t *handler = MP_STATE_PORT(rp2_dma_irq_obj[i]);
+            if (handler) {
+                rp2_dma_obj_t *self = (rp2_dma_obj_t *)handler->parent;
+                self->irq_flag = 1;
+                mp_irq_handler(handler);
+            } else {
+                // We got an interrupt with no handler. Disable the channel
+                dma_channel_set_irq0_enabled(i, false);
+            }
+        }
+    }
+}
+
+STATIC mp_uint_t rp2_dma_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    irq_set_enabled(DMA_IRQ_0, false);
+    self->irq_flag = 0;
+    dma_channel_set_irq0_enabled(self->channel, (new_trigger != 0));
+    irq_set_enabled(DMA_IRQ_0, true);
+    return 0;
+}
+
+STATIC mp_uint_t rp2_dma_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return self->irq_flag;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return (dma_hw->ints0 & (1u << self->channel)) != 0;
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t rp2_dma_irq_methods = {
+    .trigger = rp2_dma_irq_trigger,
+    .info = rp2_dma_irq_info,
+};
+
+STATIC mp_obj_t rp2_dma_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);
+
+    int dma_channel = dma_claim_unused_channel(false);
+    if (dma_channel < 0) {
+        mp_raise_OSError(MP_EBUSY);
+    }
+
+    rp2_dma_obj_t *self = m_new_obj_with_finaliser(rp2_dma_obj_t);
+    self->base.type = &rp2_dma_type;
+    self->channel = dma_channel;
+
+    // Return the DMA object.
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void rp2_dma_error_if_closed(rp2_dma_obj_t *self) {
+    if (self->channel == CHANNEL_CLOSED) {
+        mp_raise_ValueError(MP_ERROR_TEXT("channel closed"));
+    }
+}
+
+STATIC void rp2_dma_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (dest[0] == MP_OBJ_NULL) {
+        // Load attribute
+        dma_channel_hw_t *reg_block = dma_channel_hw_addr(self->channel);
+        if (attr_in == MP_QSTR_read) {
+            rp2_dma_error_if_closed(self);
+            dest[0] = mp_obj_new_int_from_uint((mp_uint_t)reg_block->read_addr);
+        } else if (attr_in == MP_QSTR_write) {
+            rp2_dma_error_if_closed(self);
+            dest[0] = mp_obj_new_int_from_uint((mp_uint_t)reg_block->write_addr);
+        } else if (attr_in == MP_QSTR_count) {
+            rp2_dma_error_if_closed(self);
+            dest[0] = mp_obj_new_int_from_uint((mp_uint_t)reg_block->transfer_count);
+        } else if (attr_in == MP_QSTR_ctrl) {
+            rp2_dma_error_if_closed(self);
+            dest[0] = mp_obj_new_int_from_uint((mp_uint_t)reg_block->al1_ctrl);
+        } else if (attr_in == MP_QSTR_channel) {
+            dest[0] = mp_obj_new_int_from_uint(self->channel);
+        } else if (attr_in == MP_QSTR_registers) {
+            mp_obj_array_t *reg_view = m_new_obj(mp_obj_array_t);
+            mp_obj_memoryview_init(reg_view, 'I' | MP_OBJ_ARRAY_TYPECODE_FLAG_RW, 0, 16, dma_channel_hw_addr(self->channel));
+            dest[0] = reg_view;
+        } else {
+            // Continue attribute search in locals dict.
+            dest[1] = MP_OBJ_SENTINEL;
+        }
+    } else {
+        // Set or delete attribute
+        if (dest[1] == MP_OBJ_NULL) {
+            // We don't support deleting attributes.
+            return;
+        }
+
+        rp2_dma_error_if_closed(self);
+
+        if (attr_in == MP_QSTR_read) {
+            uint32_t value = rp2_dma_register_value_from_obj(dest[1], REG_TYPE_ADDR_READ);
+            dma_channel_set_read_addr(self->channel, (volatile void *)value, false);
+            dest[0] = MP_OBJ_NULL; // indicate success
+        } else if (attr_in == MP_QSTR_write) {
+            uint32_t value = rp2_dma_register_value_from_obj(dest[1], REG_TYPE_ADDR_WRITE);
+            dma_channel_set_write_addr(self->channel, (volatile void *)value, false);
+            dest[0] = MP_OBJ_NULL; // indicate success
+        } else if (attr_in == MP_QSTR_count) {
+            uint32_t value = rp2_dma_register_value_from_obj(dest[1], REG_TYPE_COUNT);
+            dma_channel_set_trans_count(self->channel, value, false);
+            dest[0] = MP_OBJ_NULL; // indicate success
+        } else if (attr_in == MP_QSTR_ctrl) {
+            uint32_t value = rp2_dma_register_value_from_obj(dest[1], REG_TYPE_CONF);
+            dma_channel_set_config(self->channel, (dma_channel_config *)&value, false);
+            dest[0] = MP_OBJ_NULL; // indicate success
+        }
+    }
+}
+
+STATIC void rp2_dma_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "DMA(%u)", self->channel);
+}
+
+// DMA.config(*, read, write, count, ctrl, trigger)
+STATIC mp_obj_t rp2_dma_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(*pos_args);
+
+    rp2_dma_error_if_closed(self);
+
+    enum {
+        ARG_read,
+        ARG_write,
+        ARG_count,
+        ARG_ctrl,
+        ARG_trigger,
+    };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_read,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_write,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_count,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_ctrl,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_trigger,      MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    // Don't include self in arg parsing
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    // We only do anything if there was at least one argument
+    if (kw_args->used) {
+        bool trigger = args[ARG_trigger].u_bool;
+        mp_int_t value_count = trigger ? kw_args->used - 1 : kw_args->used;
+        if (trigger && (value_count == 0)) {
+            // Only a "true" trigger was passed; just start a transfer
+            dma_channel_start(self->channel);
+        } else {
+            if (args[ARG_read].u_obj != MP_OBJ_NULL) {
+                uint32_t value = rp2_dma_register_value_from_obj(args[ARG_read].u_obj, REG_TYPE_ADDR_READ);
+                value_count--;
+                dma_channel_set_read_addr(self->channel, (volatile void *)value, trigger && (value_count == 0));
+            }
+            if (args[ARG_write].u_obj != MP_OBJ_NULL) {
+                uint32_t value = rp2_dma_register_value_from_obj(args[ARG_write].u_obj, REG_TYPE_ADDR_WRITE);
+                value_count--;
+                dma_channel_set_write_addr(self->channel, (volatile void *)value, trigger && (value_count == 0));
+            }
+            if (args[ARG_count].u_obj != MP_OBJ_NULL) {
+                uint32_t value = rp2_dma_register_value_from_obj(args[ARG_count].u_obj, REG_TYPE_COUNT);
+                value_count--;
+                dma_channel_set_trans_count(self->channel, value, trigger && (value_count == 0));
+            }
+            if (args[ARG_ctrl].u_obj != MP_OBJ_NULL) {
+                uint32_t value = rp2_dma_register_value_from_obj(args[ARG_ctrl].u_obj, REG_TYPE_CONF);
+                value_count--;
+                dma_channel_set_config(self->channel, (dma_channel_config *)&value, trigger && (value_count == 0));
+            }
+        }
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_config_obj, 1, rp2_dma_config);
+
+// DMA.active([value])
+STATIC mp_obj_t rp2_dma_active(size_t n_args, const mp_obj_t *args) {
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    rp2_dma_error_if_closed(self);
+
+    if (n_args > 1) {
+        if (mp_obj_is_true(args[1])) {
+            dma_channel_start(self->channel);
+        } else {
+            dma_channel_abort(self->channel);
+        }
+    }
+
+    uint32_t busy = dma_channel_is_busy(self->channel);
+    return mp_obj_new_bool((mp_int_t)busy);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_dma_active_obj, 1, 2, rp2_dma_active);
+
+// Default is quiet, unpaced, read and write incrementing, word transfers, enabled
+#define DEFAULT_DMA_CONFIG (1 << 21) | (0x3f << 15) | (1 << 5) | (1 << 4) | (2 << 2) | (1 << 0)
+
+// DMA.pack_ctrl(...)
+STATIC mp_obj_t rp2_dma_pack_ctrl(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // Pack keyword settings into a control register value, using either the default for this
+    // DMA channel or the provided defaults
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_uint_t value = DEFAULT_DMA_CONFIG | ((self->channel & 0xf) << 11);
+
+    if (n_pos_args > 1) {
+        mp_raise_TypeError(MP_ERROR_TEXT("pack_ctrl only takes keyword arguments"));
+    }
+    mp_uint_t remaining = kw_args->used;
+
+    mp_map_elem_t *default_entry = mp_map_lookup(kw_args, MP_OBJ_NEW_QSTR(MP_QSTR_default), MP_MAP_LOOKUP);
+    if (default_entry) {
+        remaining--;
+        value = mp_obj_get_int_truncated(default_entry->value);
+    }
+
+    for (mp_uint_t i = 0; i < rp2_dma_ctrl_field_count; i++) {
+        mp_map_elem_t *field_entry = mp_map_lookup(
+            kw_args,
+            MP_OBJ_NEW_QSTR(rp2_dma_ctrl_fields_table[i].name),
+            MP_MAP_LOOKUP
+            );
+        if (field_entry) {
+            remaining--;
+            // Silently ignore read-only fields, to allow the passing of a modified unpack_ctrl() results
+            if (!rp2_dma_ctrl_fields_table[i].read_only) {
+                mp_uint_t field_value = mp_obj_get_int_truncated(field_entry->value);
+                mp_uint_t mask = ((1 << rp2_dma_ctrl_fields_table[i].length) - 1);
+                mp_uint_t masked_value = field_value & mask;
+                if (field_value != masked_value) {
+                    mp_raise_ValueError(MP_ERROR_TEXT("bad field value"));
+                }
+                value &= ~(mask << rp2_dma_ctrl_fields_table[i].shift);
+                value |= masked_value << rp2_dma_ctrl_fields_table[i].shift;
+            }
+        }
+    }
+
+    if (remaining) {
+        mp_raise_TypeError(NULL);
+    }
+
+    return mp_obj_new_int_from_uint(value);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_pack_ctrl_obj, 1, rp2_dma_pack_ctrl);
+
+// DMA.unpack_ctrl(value)
+STATIC mp_obj_t rp2_dma_unpack_ctrl(mp_obj_t value_obj) {
+    // Return a dict representing the unpacked fields of a control register value
+    mp_obj_t result_dict[rp2_dma_ctrl_field_count * 2];
+
+    mp_uint_t value = mp_obj_get_int_truncated(value_obj);
+
+    for (mp_uint_t i = 0; i < rp2_dma_ctrl_field_count; i++) {
+        result_dict[i * 2] = MP_OBJ_NEW_QSTR(rp2_dma_ctrl_fields_table[i].name);
+        mp_uint_t field_value =
+            (value >> rp2_dma_ctrl_fields_table[i].shift) & ((1 << rp2_dma_ctrl_fields_table[i].length) - 1);
+        result_dict[i * 2 + 1] = MP_OBJ_NEW_SMALL_INT(field_value);
+    }
+
+    return mp_obj_dict_make_new(&mp_type_dict, 0, rp2_dma_ctrl_field_count, result_dict);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_dma_unpack_ctrl_fun_obj, rp2_dma_unpack_ctrl);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(rp2_dma_unpack_ctrl_obj, MP_ROM_PTR(&rp2_dma_unpack_ctrl_fun_obj));
+
+STATIC mp_obj_t rp2_dma_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+
+    // Parse the arguments.
+    rp2_dma_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.
+    mp_irq_obj_t *irq = MP_STATE_PORT(rp2_dma_irq_obj[self->channel]);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = mp_irq_new(&rp2_dma_irq_methods, MP_OBJ_FROM_PTR(self));
+        MP_STATE_PORT(rp2_dma_irq_obj[self->channel]) = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Disable all IRQs while data is updated.
+        irq_set_enabled(DMA_IRQ_0, false);
+
+        // Update IRQ data.
+        irq->handler = args[ARG_handler].u_obj;
+        irq->ishard = args[ARG_hard].u_bool;
+        self->irq_flag = 0;
+
+        // Enable IRQ if a handler is given.
+        bool enable = (args[ARG_handler].u_obj != mp_const_none);
+        dma_channel_set_irq0_enabled(self->channel, enable);
+
+        irq_set_enabled(DMA_IRQ_0, true);
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_irq_obj, 1, rp2_dma_irq);
+
+// DMA.close()
+STATIC mp_obj_t rp2_dma_close(mp_obj_t self_in) {
+    rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t channel = self->channel;
+
+    if (channel != CHANNEL_CLOSED) {
+        // Clean up interrupt handler to ensure garbage collection
+        mp_irq_obj_t *irq = MP_STATE_PORT(rp2_dma_irq_obj[channel]);
+        MP_STATE_PORT(rp2_dma_irq_obj[channel]) = MP_OBJ_NULL;
+        if (irq) {
+            irq->parent = MP_OBJ_NULL;
+            irq->handler = MP_OBJ_NULL;
+            dma_channel_set_irq0_enabled(channel, false);
+        }
+        dma_channel_unclaim(channel);
+        self->channel = CHANNEL_CLOSED;
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_dma_close_obj, rp2_dma_close);
+
+STATIC const mp_rom_map_elem_t rp2_dma_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&rp2_dma_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&rp2_dma_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&rp2_dma_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&rp2_dma_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&rp2_dma_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pack_ctrl), MP_ROM_PTR(&rp2_dma_pack_ctrl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unpack_ctrl), MP_ROM_PTR(&rp2_dma_unpack_ctrl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(rp2_dma_locals_dict, rp2_dma_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    rp2_dma_type,
+    MP_QSTR_DMA,
+    MP_TYPE_FLAG_NONE,
+    make_new, rp2_dma_make_new,
+    print, rp2_dma_print,
+    attr, rp2_dma_attr,
+    locals_dict, &rp2_dma_locals_dict
+    );
+
+void rp2_dma_init(void) {
+    // Set up interrupts.
+    memset(MP_STATE_PORT(rp2_dma_irq_obj), 0, sizeof(MP_STATE_PORT(rp2_dma_irq_obj)));
+    irq_set_exclusive_handler(DMA_IRQ_0, rp2_dma_irq_handler);
+}
+
+void rp2_dma_deinit(void) {
+    // Disable and clear interrupts.
+    irq_set_mask_enabled(1u << DMA_IRQ_0, false);
+    irq_remove_handler(DMA_IRQ_0, rp2_dma_irq_handler);
+}
+
+MP_REGISTER_ROOT_POINTER(void *rp2_dma_irq_obj[NUM_DMA_CHANNELS]);

From 0b2676db5cc77ac1f19d3bfaaee713c22c5761a2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 22 Dec 2023 14:18:09 +1100
Subject: [PATCH 0699/3129] lib/micropython-lib: Update submodule to latest.

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 e025c843b60e9..7cdf70881519c 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit e025c843b60e93689f0f991d753010bb5bd6a722
+Subproject commit 7cdf70881519c73667efbc4a61a04d9c1a49babb

From d014c8282652d0e2643a9ba088445c542ad43450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 12 Sep 2023 14:38:30 +0200
Subject: [PATCH 0700/3129] extmod/nimble: Do not set GAP device name after
 sync.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead, configure the default once at compile-time. This means the GAP
name will no longer be set to default after re-initializing Bluetooth.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/nimble/modbluetooth_nimble.c | 7 -------
 extmod/nimble/syscfg/syscfg.h       | 6 +++++-
 ports/esp32/boards/sdkconfig.ble    | 2 ++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 2e1faa9b100ef..c053ac56cf2ba 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -53,10 +53,6 @@
 #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
-
 #define DEBUG_printf(...) // printf("nimble: " __VA_ARGS__)
 
 #define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
@@ -350,9 +346,6 @@ STATIC void sync_cb(void) {
         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;
 }
 
diff --git a/extmod/nimble/syscfg/syscfg.h b/extmod/nimble/syscfg/syscfg.h
index a051a8fefd069..f26f8db9ec37a 100644
--- a/extmod/nimble/syscfg/syscfg.h
+++ b/extmod/nimble/syscfg/syscfg.h
@@ -134,7 +134,11 @@ int nimble_sprintf(char *str, const char *fmt, ...);
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE_WRITE_PERM (-1)
 #define MYNEWT_VAL_BLE_SVC_GAP_CENTRAL_ADDRESS_RESOLUTION (-1)
-#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME ("pybd")
+#ifdef MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME
+#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME (MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME)
+#else
+#define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME ("MPY NIMBLE")
+#endif
 #define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH (31)
 #define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_WRITE_PERM (-1)
 #define MYNEWT_VAL_BLE_SVC_GAP_PPCP_MAX_CONN_INTERVAL (0)
diff --git a/ports/esp32/boards/sdkconfig.ble b/ports/esp32/boards/sdkconfig.ble
index 91ac3240ebee7..7fa08fe286d7f 100644
--- a/ports/esp32/boards/sdkconfig.ble
+++ b/ports/esp32/boards/sdkconfig.ble
@@ -3,6 +3,8 @@ CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_CONTROLLER_ENABLED=y
 
+CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="MPY ESP32"
+
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
 
 # Put NimBLE on core 1, and for synchronisation

From 9feb0689eeaca5ce88aedcc680f997a3b4d0221c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Dec 2023 15:35:31 +1100
Subject: [PATCH 0701/3129] all: Bump version to 1.22.0.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index c025bca26075b..66a083da457b5 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -32,7 +32,7 @@
 #define MICROPY_VERSION_MAJOR 1
 #define MICROPY_VERSION_MINOR 22
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 1
+#define MICROPY_VERSION_PRERELEASE 0
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 2037edb5a22cf9c7d2dd665a3ce8b1eb470cadd1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Jan 2024 18:11:41 +1100
Subject: [PATCH 0702/3129] all: Bump version to 1.23.0-preview.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 66a083da457b5..a1e9660bf46a6 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -30,9 +30,9 @@
 // as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
 // are unavailable.
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 22
+#define MICROPY_VERSION_MINOR 23
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 0
+#define MICROPY_VERSION_PRERELEASE 1
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 87d3f8b367dfe97d03863f62f565a3ddee1cb945 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 31 Dec 2023 08:32:09 +0100
Subject: [PATCH 0703/3129] mimxrt/mphalport: Remove redundant NVIC/IRQ
 defines.

These are already defined in `irq.h`.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mphalport.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index c4e5b052c9d00..4f1f4bfd123a9 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -41,9 +41,6 @@
 
 // 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 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);

From f34e27f178afe707062173b9394cd994ab8c82cc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 31 Dec 2023 09:42:39 +0100
Subject: [PATCH 0704/3129] mimxrt/mpbthciport: Add missing extmod/modmachine.h
 header.

Include extmod/modmachine.h for machine_uart_type declaration.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mpbthciport.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt/mpbthciport.c b/ports/mimxrt/mpbthciport.c
index 4325655e57407..2b0bcd2cf6c4d 100644
--- a/ports/mimxrt/mpbthciport.c
+++ b/ports/mimxrt/mpbthciport.c
@@ -29,6 +29,7 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/modmachine.h"
 #include "extmod/mpbthci.h"
 #include "shared/runtime/softtimer.h"
 #include "modmachine.h"

From 8498b0b13e9a14e1ee009623cedd14701ae398f1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 24 Nov 2023 08:23:26 +0100
Subject: [PATCH 0705/3129] docs/samd/pinout: Update pinout docs with fixed pin
 assignment.

Fixes a wrong assignment for Sparkfun SAMD51 Thing Plus, and updates the
sample script for printing the pin info table.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/pinout.rst | 50 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 272f7c58df087..5ff72b83586ac 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -870,7 +870,7 @@ Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
 
 The default devices at the board are:
 
-- UART 1 at pins PB23/PB22, labelled RXD/TXD
+- UART 2 at pins PA13/PA12, 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
@@ -884,36 +884,36 @@ The tables shown above were created with small a Python script running on the ta
   from machine import Pin
   import os
 
-  def print_entry(e, txt):
+  def print_item(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="")
+  def print_pininfo(pin_id, name, info):
+
+      print("%3d" % pin_id, end=" ")
+      print("%4s %12s" % (info[0], name), 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")
+          print_item(info[3], " Serial1")
+          print_item(info[4], " Serial2")
+          print_item(info[5], " PWM1" if (info[5] >> 4) < 3 else "   TC")
+          print_item(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_item(info[4], " Serial1")
+          print_item(info[5], " Serial2")
+          print_item(info[6], " TC")
+          print_item(info[7], " PWM1")
+          print_item(info[8], " PWM2")
       print()
 
   def tblkey(i):
-      name = i[1][0]
-      if name != "-":
+      name = i[1]
+      if name != "":
           if len(name) < 3:
               return " " + name
           else:
@@ -921,17 +921,25 @@ The tables shown above were created with small a Python script running on the ta
       else:
           return "zzzzzzz%03d" % i[0]
 
-  def table(num = 127):
+  def table(num=127, sort=True):
       pintbl = []
+      inv_bd = {v: k for k, v in Pin.board.__dict__.items()}
       for i in range(num):
           try:
-              pintbl.append((i, pininfo(i)))
+              p = Pin(i)
+              pi = pininfo(p)
+              if p in inv_bd.keys():
+                  name = inv_bd[p]
+              else:
+                  name = ""
+              pintbl.append((i, name, pininfo(i)))
           except:
               pass
               # print("not defined")
 
-      pintbl.sort(key=tblkey)
+      if sort:
+          pintbl.sort(key=tblkey)
       for item in pintbl:
-          print_pininfo(item[0], item[1])
+          print_pininfo(item[0], item[1], item[2])
 
   table()

From 36d9e98fc6b5fb0315ade399fbd8f357a44196a6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 30 Nov 2023 21:27:23 +0100
Subject: [PATCH 0706/3129] samd: Remove the MICROPY_PY_MACHINE_RTC config
 option.

RTC is enabled on all boards.  Therefore the conditional compile is not
needed.  Removing it simplifies the source code a little bit.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/fatfs_port.c   | 8 --------
 ports/samd/machine_rtc.c  | 4 ----
 ports/samd/modmachine.c   | 8 +-------
 ports/samd/mpconfigport.h | 1 -
 ports/samd/samd_soc.c     | 4 ----
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/ports/samd/fatfs_port.c b/ports/samd/fatfs_port.c
index a3e3f1b67b3a9..91912d97d8e01 100644
--- a/ports/samd/fatfs_port.c
+++ b/ports/samd/fatfs_port.c
@@ -33,13 +33,5 @@
 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
index e6237f3f3609a..1f0c9f4dca990 100644
--- a/ports/samd/machine_rtc.c
+++ b/ports/samd/machine_rtc.c
@@ -31,8 +31,6 @@
 #include "extmod/modmachine.h"
 #include "sam.h"
 
-#if MICROPY_PY_MACHINE_RTC
-
 typedef struct _machine_rtc_obj_t {
     mp_obj_base_t base;
     mp_obj_t callback;
@@ -177,5 +175,3 @@ MP_DEFINE_CONST_OBJ_TYPE(
     make_new, machine_rtc_make_new,
     locals_dict, &machine_rtc_locals_dict
     );
-
-#endif // MICROPY_PY_MACHINE_RTC
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 9aab705bf70a8..c39aec95ea156 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -48,16 +48,10 @@
 
 #define LIGHTSLEEP_CPU_FREQ 200000
 
-#if MICROPY_PY_MACHINE_RTC
-#define MICROPY_PY_MACHINE_RTC_ENTRY { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
-#else
-#define MICROPY_PY_MACHINE_RTC_ENTRY
-#endif
-
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) }, \
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
-    MICROPY_PY_MACHINE_RTC_ENTRY \
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) }, \
     \
     /* Class constants. */ \
     /* Use numerical constants instead of the symbolic names, */ \
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 21c29be24e3ae..466a4d7751c97 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -109,7 +109,6 @@
 #define MICROPY_PY_RANDOM                   (1)
 #define MICROPY_PY_DEFLATE                  (1)
 #define MICROPY_PY_ASYNCIO                  (1)
-#define MICROPY_PY_MACHINE_RTC              (1)
 #ifndef MICROPY_PY_MACHINE_ADC
 #define MICROPY_PY_MACHINE_ADC              (1)
 #endif
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index dcfff9dc22744..259640e93db0d 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -38,9 +38,7 @@
 #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
@@ -124,9 +122,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
 }
 
 #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART

From aea93a88f82105699f44431b76ff3107fd7b5a45 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 14 Jun 2023 16:56:58 +0200
Subject: [PATCH 0707/3129] samd/mcu/samd21: Reorganize and enable more
 firmware features.

This commit enables additional features for SAMD21 with external flash:
- Viper and native code support.  On a relatively slow devices, viper and
  native code can be helpful.
- Freeze the asyncio scripts and add the select module.
- Enable Framebuffer support.
- Enable UART flow control.
- Enable a few more features from the extra features set.

Drop onewire and asyncio support from SAMD21 firmware without external
flash, leaving a little bit more room for future extensions.  Asyncio was
anyhow incomplete.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/Makefile                  |  3 +-
 ports/samd/mcu/samd21/manifest.py    |  5 +++
 ports/samd/mcu/samd21/mpconfigmcu.h  | 52 +++++++++++++++++++++-------
 ports/samd/mcu/samd21/mpconfigmcu.mk |  4 +++
 ports/samd/mcu/samd51/mpconfigmcu.h  |  1 +
 ports/samd/mpconfigport.h            |  3 --
 6 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 ports/samd/mcu/samd21/manifest.py

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 4f4c22c57daa9..5a7cb9916a349 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -68,7 +68,8 @@ CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU) -fsingle
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
 CFLAGS += $(CFLAGS_EXTRA)
 
-CFLAGS += -DMICROPY_HW_CODESIZE=$(MICROPY_HW_CODESIZE)
+# Strip the letter 'K' from MICROPY_HW_CODESIZE for use by C code.
+CFLAGS += -DMICROPY_HW_CODESIZE=$(strip $(subst K,' ', $(MICROPY_HW_CODESIZE)))
 
 LDFLAGS += -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
 LDFLAGS += --defsym=_codesize=$(MICROPY_HW_CODESIZE)
diff --git a/ports/samd/mcu/samd21/manifest.py b/ports/samd/mcu/samd21/manifest.py
new file mode 100644
index 0000000000000..2a19a843f8a9b
--- /dev/null
+++ b/ports/samd/mcu/samd21/manifest.py
@@ -0,0 +1,5 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("$(MPY_DIR)/extmod/asyncio")
+require("onewire")
+require("ds18x20")
+require("dht")
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 1a3d9587291fe..35e59a6706cdd 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -1,25 +1,28 @@
 // Deinitions common to all SAMD21 boards
 #include "samd21.h"
 
-#define MICROPY_CONFIG_ROM_LEVEL        (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
+#define MICROPY_CONFIG_ROM_LEVEL        (MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES)
+#if MICROPY_HW_CODESIZE == 248
+#define SAMD21_EXTRA_FEATURES           1
+#else
+#define SAMD21_EXTRA_FEATURES           0
+#endif
 
 // MicroPython emitters
-#define MICROPY_EMIT_THUMB              (0)
-#define MICROPY_EMIT_INLINE_THUMB       (0)
+#define MICROPY_EMIT_THUMB              (SAMD21_EXTRA_FEATURES)
+#define MICROPY_EMIT_INLINE_THUMB       (SAMD21_EXTRA_FEATURES)
+#define MICROPY_EMIT_THUMB_ARMV7M       (0)
 #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)
-#endif
-
-#ifndef MICROPY_PY_TIME
-#define MICROPY_PY_TIME                 (1)
-#endif
-
 #ifndef MICROPY_PY_MATH
 #define MICROPY_PY_MATH                 (1)
+#define MP_NEED_LOG2                    (1)
+#endif
+
+#ifndef MICROPY_PY_BUILTINS_COMPLEX
+#define MICROPY_PY_BUILTINS_COMPLEX     (0)
 #endif
 
 #ifndef MICROPY_PY_CMATH
@@ -29,13 +32,36 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32(300))
 unsigned long trng_random_u32(int delay);
 
-#define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
-
 #ifndef MICROPY_HW_UART_TXBUF
 #define MICROPY_HW_UART_TXBUF           (1)
 #endif
+#ifndef MICROPY_HW_UART_RTSCTS
+#define MICROPY_HW_UART_RTSCTS          (SAMD21_EXTRA_FEATURES)
+#endif
 
+// selected extensions of the extra features set
 #define MICROPY_PY_OS_URANDOM           (1)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (SAMD21_EXTRA_FEATURES)
+#define MICROPY_COMP_RETURN_IF_EXPR     (SAMD21_EXTRA_FEATURES)
+#define MICROPY_OPT_MPZ_BITWISE         (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_BUILTINS_STR_CENTER  (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_BUILTINS_STR_PARTITION (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_BUILTINS_ROUND_INT   (SAMD21_EXTRA_FEATURES)
+#define MICROPY_CAN_OVERRIDE_BUILTINS   (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_SYS_STDIO_BUFFER     (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_FRAMEBUF             (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_ASYNCIO              (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_SELECT               (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_ERRNO                (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_DEFLATE              (SAMD21_EXTRA_FEATURES)
+#define MICROPY_PY_ONEWIRE              (SAMD21_EXTRA_FEATURES)
+
+#ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
+#define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1)
+#endif
+
+#define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
 
 #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 b3092837cbd15..89e63c3aaf2b4 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -6,6 +6,10 @@ MPY_CROSS_MCU_ARCH = armv6m
 
 MICROPY_HW_CODESIZE ?= 184K
 
+ifeq ($(MICROPY_HW_CODESIZE), 248K)
+FROZEN_MANIFEST ?= mcu/$(MCU_SERIES_LOWER)/manifest.py
+endif
+
 MICROPY_VFS_LFS1 ?= 1
 
 SRC_S += shared/runtime/gchelper_thumb1.s
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 7c95c341b9aef..b8206558b4676 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -27,6 +27,7 @@
 
 #define MICROPY_PY_OS_SYNC              (1)
 #define MICROPY_PY_OS_URANDOM           (1)
+#define MICROPY_PY_ONEWIRE              (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 466a4d7751c97..a7a6e26629272 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -107,8 +107,6 @@
 #define MICROPY_PY_UCTYPES                  (1)
 #define MICROPY_PY_HEAPQ                    (1)
 #define MICROPY_PY_RANDOM                   (1)
-#define MICROPY_PY_DEFLATE                  (1)
-#define MICROPY_PY_ASYNCIO                  (1)
 #ifndef MICROPY_PY_MACHINE_ADC
 #define MICROPY_PY_MACHINE_ADC              (1)
 #endif
@@ -150,7 +148,6 @@
 #define MICROPY_PY_MACHINE_WDT              (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/samd/machine_wdt.c"
 #define MICROPY_PY_MACHINE_WDT_TIMEOUT_MS   (1)
-#define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_PLATFORM                 (1)
 #define MICROPY_PLATFORM_VERSION            "ASF4"
 

From 3d0b6276f3a4500df0a3df5feb1266eb186054b3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 30 Dec 2023 09:04:18 +0100
Subject: [PATCH 0708/3129] samd/mcu: Fix wrong EIC table entries in
 pin-af-table.csv.

Fixes:
- SAMD21: PB16
- SAMD51: PB03, PB22 and PB00.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/mcu/samd21/pin-af-table.csv | 2 +-
 ports/samd/mcu/samd51/pin-af-table.csv | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/samd/mcu/samd21/pin-af-table.csv b/ports/samd/mcu/samd21/pin-af-table.csv
index 37bb592597edc..31ca2936f66c1 100644
--- a/ports/samd/mcu/samd21/pin-af-table.csv
+++ b/ports/samd/mcu/samd21/pin-af-table.csv
@@ -42,7 +42,7 @@ 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
+PB16,0,,50,,60,04
 PB17,1,,51,,61,05
 PA20,4,,52,32,70,04
 PA21,5,,53,33,71,07
diff --git a/ports/samd/mcu/samd51/pin-af-table.csv b/ports/samd/mcu/samd51/pin-af-table.csv
index 69f51a33ca170..c8f9a240dd38e 100644
--- a/ports/samd/mcu/samd51/pin-af-table.csv
+++ b/ports/samd/mcu/samd51/pin-af-table.csv
@@ -11,7 +11,7 @@
 # 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,,
+PB03,3,15,,,51,61,,
 PA00,0,,,,10,20,,
 PA01,1,,,,11,21,,
 PC00,0,,10,,,,,
@@ -87,7 +87,7 @@ 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,,
+PB22,6,,,12,52,70,,
 PB23,7,,,13,53,71,,
 PB24,8,,,00,21,,,
 PB25,9,,,01,20,,,
@@ -107,6 +107,6 @@ 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,,
+PB00,0,12,,,52,70,,
 PB01,1,13,,,53,71,,
 PB02,2,14,,,50,60,22,

From c3989e398f809dcde2b0ed1b956498a4d9738619 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Jan 2024 01:03:13 +1100
Subject: [PATCH 0709/3129] rp2/rp2_flash: Lockout second core only when doing
 flash erase/write.

Using the multicore lockout feature in the general atomic section makes it
much more difficult to get correct.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpthreadport.c |  4 ----
 ports/rp2/rp2_flash.c    | 31 ++++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 968de1f782e69..7bffabb3355eb 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -52,9 +52,6 @@ uint32_t mp_thread_begin_atomic_section(void) {
         // 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();
@@ -64,7 +61,6 @@ 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);
     }
 }
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index b1afe1cbd1e72..35c51641692f4 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -70,6 +70,22 @@ bi_decl(bi_block_device(
     BINARY_INFO_BLOCK_DEV_FLAG_WRITE |
     BINARY_INFO_BLOCK_DEV_FLAG_PT_UNKNOWN));
 
+// Flash erase and write must run with interrupts disabled and the other core suspended,
+// because the XIP bit gets disabled.
+static uint32_t begin_critical_flash_section(void) {
+    if (multicore_lockout_victim_is_initialized(1 - get_core_num())) {
+        multicore_lockout_start_blocking();
+    }
+    return save_and_disable_interrupts();
+}
+
+static void end_critical_flash_section(uint32_t state) {
+    restore_interrupts(state);
+    if (multicore_lockout_victim_is_initialized(1 - get_core_num())) {
+        multicore_lockout_end_blocking();
+    }
+}
+
 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) {
     // Parse arguments
     enum { ARG_start, ARG_len };
@@ -135,19 +151,17 @@ 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();
+        mp_uint_t atomic_state = begin_critical_flash_section();
         flash_range_erase(self->flash_base + offset, bufinfo.len);
-        MICROPY_END_ATOMIC_SECTION(atomic_state);
+        end_critical_flash_section(atomic_state);
         mp_event_handle_nowait();
         // 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();
+    mp_uint_t atomic_state = begin_critical_flash_section();
     flash_range_program(self->flash_base + offset, bufinfo.buf, bufinfo.len);
-    MICROPY_END_ATOMIC_SECTION(atomic_state);
+    end_critical_flash_section(atomic_state);
     mp_event_handle_nowait();
     // TODO check return value
     return mp_const_none;
@@ -170,10 +184,9 @@ 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();
+            mp_uint_t atomic_state = begin_critical_flash_section();
             flash_range_erase(self->flash_base + offset, BLOCK_SIZE_BYTES);
-            MICROPY_END_ATOMIC_SECTION(atomic_state);
+            end_critical_flash_section(atomic_state);
             // TODO check return value
             return MP_OBJ_NEW_SMALL_INT(0);
         }

From 8438c8790c0ad11545371a07f0b0ce4c65c62101 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Jan 2024 14:45:44 +1100
Subject: [PATCH 0710/3129] rp2/mutex_extra: Implement additional mutex
 functions.

These allow entering/exiting a mutex and also disabling/restoring
interrupts, in an atomic way.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE                  |  2 ++
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/mutex_extra.c  | 30 ++++++++++++++++++++++++++++++
 ports/rp2/mutex_extra.h  | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 ports/rp2/mutex_extra.c
 create mode 100644 ports/rp2/mutex_extra.h

diff --git a/LICENSE b/LICENSE
index 9bd457b42acea..b85f31808a483 100644
--- a/LICENSE
+++ b/LICENSE
@@ -69,6 +69,8 @@ used during the build process and is not part of the compiled source code.
             /FreeRTOS (GPL-2.0 with FreeRTOS exception)
         /esp32
             /ppp_set_auth.* (Apache-2.0)
+        /rp2
+            /mutex_extra.c (BSD-3-clause)
         /stm32
             /usbd*.c (MCD-ST Liberty SW License Agreement V2)
             /stm32_it.* (MIT + BSD-3-clause)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 559ae23f52e3c..281b0c3bc2846 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -129,6 +129,7 @@ set(MICROPY_SOURCE_PORT
     mphalport.c
     mpnetworkport.c
     mpthreadport.c
+    mutex_extra.c
     pendsv.c
     rp2_flash.c
     rp2_pio.c
diff --git a/ports/rp2/mutex_extra.c b/ports/rp2/mutex_extra.c
new file mode 100644
index 0000000000000..6df57e64ce50f
--- /dev/null
+++ b/ports/rp2/mutex_extra.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "mutex_extra.h"
+
+// These functions are taken from lib/pico-sdk/src/common/pico_sync/mutex.c and modified
+// so that they atomically obtain the mutex and disable interrupts.
+
+uint32_t __time_critical_func(mutex_enter_blocking_and_disable_interrupts)(mutex_t * mtx) {
+    lock_owner_id_t caller = lock_get_caller_owner_id();
+    do {
+        uint32_t save = spin_lock_blocking(mtx->core.spin_lock);
+        if (!lock_is_owner_id_valid(mtx->owner)) {
+            mtx->owner = caller;
+            spin_unlock_unsafe(mtx->core.spin_lock);
+            return save;
+        }
+        lock_internal_spin_unlock_with_wait(&mtx->core, save);
+    } while (true);
+}
+
+void __time_critical_func(mutex_exit_and_restore_interrupts)(mutex_t * mtx, uint32_t save) {
+    spin_lock_unsafe_blocking(mtx->core.spin_lock);
+    assert(lock_is_owner_id_valid(mtx->owner));
+    mtx->owner = LOCK_INVALID_OWNER_ID;
+    lock_internal_spin_unlock_with_notify(&mtx->core, save);
+}
diff --git a/ports/rp2/mutex_extra.h b/ports/rp2/mutex_extra.h
new file mode 100644
index 0000000000000..be7cb96dcc53d
--- /dev/null
+++ b/ports/rp2/mutex_extra.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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_RP2_MUTEX_EXTRA_H
+#define MICROPY_INCLUDED_RP2_MUTEX_EXTRA_H
+
+#include "pico/mutex.h"
+
+uint32_t mutex_enter_blocking_and_disable_interrupts(mutex_t *mtx);
+void mutex_exit_and_restore_interrupts(mutex_t *mtx, uint32_t save);
+
+#endif // MICROPY_INCLUDED_RP2_MUTEX_EXTRA_H

From dc2a4e3cbd1755228ae3de2d15ec8f95721b9ac9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Jan 2024 01:04:03 +1100
Subject: [PATCH 0711/3129] rp2/mpthreadport: Fix race with IRQ when entering
 atomic section.

Prior to this commit there is a potential deadlock in
mp_thread_begin_atomic_section(), when obtaining the atomic_mutex, in the
following situation:
- main thread calls mp_thread_begin_atomic_section() (for whatever reason,
  doesn't matter)
- the second core is running so the main thread grabs the mutex via the
  call mp_thread_mutex_lock(&atomic_mutex, 1), and this succeeds
- before the main thread has a chance to run save_and_disable_interrupts()
  a USB IRQ comes in and the main thread jumps off to process this IRQ
- that USB processing triggers a call to the dcd_event_handler() wrapper
  from commit bcbdee235719d459a4cd60d51021454fba54cd0f
- that then calls mp_sched_schedule_node()
- that then attempts to obtain the atomic section, calling
  mp_thread_begin_atomic_section()
- that call then blocks trying to obtain atomic_mutex
- core0 is now deadlocked on itself, because the main thread has the mutex
  but the IRQ handler (which preempted the main thread) is blocked waiting
  for the mutex, which will never be free

The solution in this commit is to use mutex enter/exit functions that also
atomically disable/restore interrupts.

Fixes issues #12980 and #13288.

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

diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 7bffabb3355eb..fd868329c38d5 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -30,6 +30,7 @@
 #include "py/mpthread.h"
 #include "pico/stdlib.h"
 #include "pico/multicore.h"
+#include "mutex_extra.h"
 
 #if MICROPY_PY_THREAD
 
@@ -45,23 +46,23 @@ STATIC uint32_t *core1_stack = NULL;
 STATIC size_t core1_stack_num_words = 0;
 
 // Thread mutex.
-STATIC mp_thread_mutex_t atomic_mutex;
+STATIC 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);
+        return mutex_enter_blocking_and_disable_interrupts(&atomic_mutex);
+    } else {
+        return save_and_disable_interrupts();
     }
-
-    return save_and_disable_interrupts();
 }
 
 void mp_thread_end_atomic_section(uint32_t state) {
-    restore_interrupts(state);
-
-    if (core1_entry) {
-        mp_thread_mutex_unlock(&atomic_mutex);
+    if (atomic_mutex.owner != LOCK_INVALID_OWNER_ID) {
+        mutex_exit_and_restore_interrupts(&atomic_mutex, state);
+    } else {
+        restore_interrupts(state);
     }
 }
 
@@ -69,7 +70,7 @@ void mp_thread_end_atomic_section(uint32_t state) {
 void mp_thread_init(void) {
     assert(get_core_num() == 0);
 
-    mp_thread_mutex_init(&atomic_mutex);
+    mutex_init(&atomic_mutex);
 
     // Allow MICROPY_BEGIN_ATOMIC_SECTION to be invoked from core1.
     multicore_lockout_victim_init();

From 231fc20ce0cf776d64d2a0f1ad0ada99cc178552 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 4 Jan 2024 14:52:07 +1100
Subject: [PATCH 0712/3129] tests/run-tests.py: Remove machine_mem.py test from
 skip list.

This test was removed long ago in eb0e3bab1ed5aa09e491641f427a5d637fe688bd.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 2dc387946ca7a..e5d7123036cbe 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -573,7 +573,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     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

From 2265d70add3ecfaf2ffbfb8393ab29a887d8d7fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 09:53:05 +1100
Subject: [PATCH 0713/3129] tests/thread: Adjust thread tests so most are able
 to run on rp2 port.

The aim of this commit is to make it so that the existing thread tests can
be used to test the _thread module on the rp2 port.  The rp2 port only
allows up to one thread to be created at a time, and does not have the GIL
enabled.

The following changes have been made:
- run-tests.py skips mutation tests on rp2, because there's no GIL.
- run-tests.py skips other tests on rp2 that require more than one thread.
- The tests stop trying to start a new thread after there is an OSError,
  which indicates that the system cannot create more threads.
- Some of these tests also now run the test function on the main thread,
  not just the spawned threads.
- In some tests the output printing is adjusted so it's the same regardless
  of how many threads were spawned.
- Some time.sleep(1) are replaced with time.sleep(0) to make the tests run
  a little faster (finish sooner when the work is done).

For the most part the tests are unchanged for existing platforms like esp32
and unix.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py              | 14 ++++++++++----
 tests/thread/stress_schedule.py | 13 +++++++++++--
 tests/thread/thread_gc1.py      | 25 +++++++++++++++++++------
 tests/thread/thread_ident1.py   |  6 +++++-
 tests/thread/thread_lock4.py    |  8 ++++++--
 tests/thread/thread_qstr1.py    | 18 ++++++++++++++----
 tests/thread/thread_shared1.py  | 16 +++++++++++++---
 tests/thread/thread_sleep1.py   | 19 +++++++++++++++----
 8 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index e5d7123036cbe..bbc98cad96011 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -562,13 +562,19 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("cmdline/repl_sys_ps1_ps2.py")
         skip_tests.add("extmod/ssl_poll.py")
 
-    # Some tests shouldn't be run on a PC
-    if args.target == "unix":
-        # unix build does not have the GIL so can't run thread mutation tests
+    # Skip thread mutation tests on targets that don't have the GIL.
+    if args.target in ("rp2", "unix"):
         for t in tests:
             if t.startswith("thread/mutate_"):
                 skip_tests.add(t)
 
+    # Skip thread tests that require many threads on targets that don't support multiple threads.
+    if args.target == "rp2":
+        skip_tests.add("thread/stress_heap.py")
+        skip_tests.add("thread/thread_lock2.py")
+        skip_tests.add("thread/thread_lock3.py")
+        skip_tests.add("thread/thread_shared2.py")
+
     # Some tests shouldn't be run on pyboard
     if args.target != "unix":
         skip_tests.add("basics/exception_chain.py")  # warning is not printed
@@ -987,7 +993,7 @@ def main():
             elif args.target in ("renesas-ra"):
                 test_dirs += ("float", "inlineasm", "renesas-ra")
             elif args.target == "rp2":
-                test_dirs += ("float", "stress", "inlineasm")
+                test_dirs += ("float", "stress", "inlineasm", "thread")
             elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":
diff --git a/tests/thread/stress_schedule.py b/tests/thread/stress_schedule.py
index 40191e6620986..a5d7dc824edea 100644
--- a/tests/thread/stress_schedule.py
+++ b/tests/thread/stress_schedule.py
@@ -19,6 +19,7 @@
 
 n = 0  # How many times the task successfully ran.
 t = None  # Start time of test, assigned here to preallocate entry in globals dict.
+thread_run = True  # If the thread should continue running.
 
 
 def task(x):
@@ -27,7 +28,7 @@ def task(x):
 
 
 def thread():
-    while True:
+    while thread_run:
         try:
             micropython.schedule(task, None)
         except RuntimeError:
@@ -36,13 +37,21 @@ def thread():
 
 
 for i in range(8):
-    _thread.start_new_thread(thread, ())
+    try:
+        _thread.start_new_thread(thread, ())
+    except OSError:
+        # System cannot create a new thead, so stop trying to create them.
+        break
 
 # Wait up to 10 seconds for 10000 tasks to be scheduled.
 t = time.ticks_ms()
 while n < _NUM_TASKS and time.ticks_diff(time.ticks_ms(), t) < _TIMEOUT_MS:
     pass
 
+# Stop all threads.
+thread_run = False
+time.sleep_ms(20)
+
 if n < _NUM_TASKS:
     # Not all the tasks were scheduled, likely the scheduler stopped working.
     print(n)
diff --git a/tests/thread/thread_gc1.py b/tests/thread/thread_gc1.py
index dd1e64d89444d..b36ea9d4c8421 100644
--- a/tests/thread/thread_gc1.py
+++ b/tests/thread/thread_gc1.py
@@ -16,21 +16,34 @@ def thread_entry(n):
             data[i] = data[i]
         gc.collect()
 
-    # print whether the data remains intact and indicate we are finished
+    # check whether the data remains intact and indicate we are finished
     with lock:
-        print(list(data) == list(range(256)))
-        global n_finished
+        global n_correct, n_finished
+        n_correct += list(data) == list(range(256))
         n_finished += 1
 
 
 lock = _thread.allocate_lock()
-n_thread = 4
+n_thread = 0
+n_thread_max = 4
+n_correct = 0
 n_finished = 0
 
 # spawn threads
-for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, (10,))
+for _ in range(n_thread_max):
+    try:
+        _thread.start_new_thread(thread_entry, (10,))
+        n_thread += 1
+    except OSError:
+        # System cannot create a new thead, so stop trying to create them.
+        break
+
+# also run the function on this main thread
+thread_entry(10)
+n_thread += 1
 
 # busy wait for threads to finish
 while n_finished < n_thread:
     pass
+
+print(n_correct == n_finished)
diff --git a/tests/thread/thread_ident1.py b/tests/thread/thread_ident1.py
index 8e106cd317f4e..2a3732eff53dc 100644
--- a/tests/thread/thread_ident1.py
+++ b/tests/thread/thread_ident1.py
@@ -5,7 +5,12 @@
 import _thread
 
 
+# Initialise variables (also preallocate their spot in the globals dict so the
+# globals dict is not resized while threads are running).
 tid = None
+tid_main = None
+new_tid = None
+finished = False
 
 
 def thread_entry():
@@ -19,7 +24,6 @@ def thread_entry():
 tid_main = _thread.get_ident()
 print("main", type(tid_main) == int, tid_main != 0)
 
-finished = False
 new_tid = _thread.start_new_thread(thread_entry, ())
 
 while not finished:
diff --git a/tests/thread/thread_lock4.py b/tests/thread/thread_lock4.py
index 97c3dc538007d..b424ee3d02f98 100644
--- a/tests/thread/thread_lock4.py
+++ b/tests/thread/thread_lock4.py
@@ -36,14 +36,18 @@ def thread_entry():
 
 # spawn threads to do the jobs
 for i in range(4):
-    _thread.start_new_thread(thread_entry, ())
+    try:
+        _thread.start_new_thread(thread_entry, ())
+    except OSError:
+        # System cannot create a new thead, so stop trying to create them.
+        break
 
 # wait for the jobs to complete
 while True:
     with jobs_lock:
         if len(output) == n_jobs:
             break
-    time.sleep(1)
+    time.sleep(0)
 
 # sort and print the results
 output.sort(key=lambda x: x[0])
diff --git a/tests/thread/thread_qstr1.py b/tests/thread/thread_qstr1.py
index f184d2a58e1d4..96f12c5d8c93f 100644
--- a/tests/thread/thread_qstr1.py
+++ b/tests/thread/thread_qstr1.py
@@ -24,16 +24,26 @@ def th(base, n):
 
 
 lock = _thread.allocate_lock()
-n_thread = 4
+n_thread = 0
+n_thread_max = 4
 n_finished = 0
 n_qstr_per_thread = 100  # make 1000 for a more stressful test (uses more heap)
 
 # spawn threads
-for i in range(n_thread):
-    _thread.start_new_thread(th, (i * n_qstr_per_thread, n_qstr_per_thread))
+for _ in range(n_thread_max):
+    try:
+        _thread.start_new_thread(th, (n_thread * n_qstr_per_thread, n_qstr_per_thread))
+        n_thread += 1
+    except OSError:
+        # System cannot create a new thead, so stop trying to create them.
+        break
+
+# also run the function on this main thread
+th(n_thread * n_qstr_per_thread, n_qstr_per_thread)
+n_thread += 1
 
 # wait for threads to finish
 while n_finished < n_thread:
-    time.sleep(1)
+    time.sleep(0)
 
 print("pass")
diff --git a/tests/thread/thread_shared1.py b/tests/thread/thread_shared1.py
index 582b01fc34356..251e26fae6ca3 100644
--- a/tests/thread/thread_shared1.py
+++ b/tests/thread/thread_shared1.py
@@ -18,15 +18,25 @@ def thread_entry(n, tup):
 
 
 lock = _thread.allocate_lock()
-n_thread = 2
+n_thread = 0
+n_thread_max = 2
 n_finished = 0
 
 # the shared data structure
 tup = (1, 2, 3, 4)
 
 # spawn threads
-for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, (100, tup))
+for _ in range(n_thread_max):
+    try:
+        _thread.start_new_thread(thread_entry, (100, tup))
+        n_thread += 1
+    except OSError:
+        # System cannot create a new thead, so stop trying to create them.
+        break
+
+# also run the function on this main thread
+thread_entry(100, tup)
+n_thread += 1
 
 # busy wait for threads to finish
 while n_finished < n_thread:
diff --git a/tests/thread/thread_sleep1.py b/tests/thread/thread_sleep1.py
index add9b02f1573b..36f775d1f6eff 100644
--- a/tests/thread/thread_sleep1.py
+++ b/tests/thread/thread_sleep1.py
@@ -12,7 +12,8 @@
 import _thread
 
 lock = _thread.allocate_lock()
-n_thread = 4
+n_thread = 0
+n_thread_max = 4
 n_finished = 0
 
 
@@ -24,10 +25,20 @@ def thread_entry(t):
         n_finished += 1
 
 
-for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, (10 * i,))
+# spawn threads
+for _ in range(n_thread_max):
+    try:
+        _thread.start_new_thread(thread_entry, (10 * n_thread,))
+        n_thread += 1
+    except OSError:
+        # System cannot create a new thead, so stop trying to create them.
+        break
+
+# also run the function on this main thread
+thread_entry(10 * n_thread)
+n_thread += 1
 
 # wait for threads to finish
 while n_finished < n_thread:
     sleep_ms(100)
-print("done", n_thread)
+print("done")

From a003ac2f73b8f54643e42138ad10249e2b861b63 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 10:35:34 +1100
Subject: [PATCH 0714/3129] tests/thread: Add a test for accuracy of sleep
 within a thread.

The existing thread_sleep1.py test only tests execution, not accuracy, of
time.sleep.  Also the existing test only tests sleep(0) on targets like rp2
that can only create a single thread.

The new test in this commit checks for timing accuracy on the main thread
and one other thread when they run at the same time.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/thread_sleep2.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 tests/thread/thread_sleep2.py

diff --git a/tests/thread/thread_sleep2.py b/tests/thread/thread_sleep2.py
new file mode 100644
index 0000000000000..2dec24cabec93
--- /dev/null
+++ b/tests/thread/thread_sleep2.py
@@ -0,0 +1,31 @@
+# Test accuracy of sleep within a thread.
+
+import time
+import _thread
+
+
+def sleep(t, valid_range):
+    t0 = time.time_ns()
+    time.sleep(t)
+    dt_ms = (time.time_ns() - t0) // 1_000_000
+    if dt_ms in valid_range:
+        print("dt in range", t)
+    else:
+        print("dt not in range:", dt_ms)
+
+
+def thread_entry():
+    lock.acquire()
+    print("thread start")
+    sleep(0.2, range(180, 400))
+    print("thread end")
+
+
+lock = _thread.allocate_lock()
+lock.acquire()
+_thread.start_new_thread(thread_entry, ())
+
+print("main start")
+lock.release()
+sleep(0.5, range(480, 800))
+print("main end")

From f0392b8d3d7e37a74f448c8fe4789f0f6bc76541 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Jan 2024 16:26:52 +1100
Subject: [PATCH 0715/3129] tests/run-multitests.py: Change to dir of test
 script when running it.

This matches the behaviour of run-tests.py, which sets cwd to the directory
containing the test script, which helps to isolate the filesystem.

It means that the SSL tests no longer need to know the name of their
containing directory to find the certificate files, and helps to run these
tests on bare-metal.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/asyncio_tls_server_client.py   |  4 ++--
 ...io_tls_server_client_cert_required_error.py |  4 ++--
 .../asyncio_tls_server_client_readline.py      |  4 ++--
 .../asyncio_tls_server_client_verify_error.py  |  4 ++--
 tests/multi_net/ssl_cert_rsa.py                |  4 ++--
 .../sslcontext_check_hostname_error.py         |  4 ++--
 tests/multi_net/sslcontext_getpeercert.py      |  4 ++--
 tests/multi_net/sslcontext_server_client.py    |  4 ++--
 .../sslcontext_server_client_ciphers.py        |  4 ++--
 .../sslcontext_server_client_files.py          |  4 ++--
 tests/multi_net/sslcontext_verify_error.py     |  4 ++--
 .../multi_net/sslcontext_verify_time_error.py  |  4 ++--
 tests/run-multitests.py                        | 18 ++++++++++++------
 13 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/tests/multi_net/asyncio_tls_server_client.py b/tests/multi_net/asyncio_tls_server_client.py
index 996cdb3e0def9..59e13ec45d1dd 100644
--- a/tests/multi_net/asyncio_tls_server_client.py
+++ b/tests/multi_net/asyncio_tls_server_client.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
index bd4d7b82ea75b..8607e4ff10a9d 100644
--- a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
+++ b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/asyncio_tls_server_client_readline.py b/tests/multi_net/asyncio_tls_server_client_readline.py
index 28add38f5d804..fd8685f5af878 100644
--- a/tests/multi_net/asyncio_tls_server_client_readline.py
+++ b/tests/multi_net/asyncio_tls_server_client_readline.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/asyncio_tls_server_client_verify_error.py b/tests/multi_net/asyncio_tls_server_client_verify_error.py
index 46a476addfbf6..c600dcc2c8b6f 100644
--- a/tests/multi_net/asyncio_tls_server_client_verify_error.py
+++ b/tests/multi_net/asyncio_tls_server_client_verify_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
index 71c9a34797606..d148c8ebcfea8 100644
--- a/tests/multi_net/ssl_cert_rsa.py
+++ b/tests/multi_net/ssl_cert_rsa.py
@@ -10,8 +10,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-certfile = "multi_net/rsa_cert.der"
-keyfile = "multi_net/rsa_key.der"
+certfile = "rsa_cert.der"
+keyfile = "rsa_key.der"
 
 try:
     os.stat(certfile)
diff --git a/tests/multi_net/sslcontext_check_hostname_error.py b/tests/multi_net/sslcontext_check_hostname_error.py
index 94bd472767df3..ac39211b092f0 100644
--- a/tests/multi_net/sslcontext_check_hostname_error.py
+++ b/tests/multi_net/sslcontext_check_hostname_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_getpeercert.py b/tests/multi_net/sslcontext_getpeercert.py
index c75a37952ee4b..8748c1f78e8fc 100644
--- a/tests/multi_net/sslcontext_getpeercert.py
+++ b/tests/multi_net/sslcontext_getpeercert.py
@@ -12,8 +12,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py
index 4d2ac06c58d1e..c263ae31bb4e8 100644
--- a/tests/multi_net/sslcontext_server_client.py
+++ b/tests/multi_net/sslcontext_server_client.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-certfile = "multi_net/rsa_cert.der"
-keyfile = "multi_net/rsa_key.der"
+certfile = "rsa_cert.der"
+keyfile = "rsa_key.der"
 
 try:
     os.stat(certfile)
diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py
index e2de4e6ad4f0f..be7c332b4c747 100644
--- a/tests/multi_net/sslcontext_server_client_ciphers.py
+++ b/tests/multi_net/sslcontext_server_client_ciphers.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_server_client_files.py b/tests/multi_net/sslcontext_server_client_files.py
index 2c8af21d23a30..e1ea1b3aa8b32 100644
--- a/tests/multi_net/sslcontext_server_client_files.py
+++ b/tests/multi_net/sslcontext_server_client_files.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_verify_error.py b/tests/multi_net/sslcontext_verify_error.py
index 4feb4ce983b3d..4a7a6cfcc14c2 100644
--- a/tests/multi_net/sslcontext_verify_error.py
+++ b/tests/multi_net/sslcontext_verify_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/rsa_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "rsa_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_verify_time_error.py b/tests/multi_net/sslcontext_verify_time_error.py
index 36711acfc8f67..e5dc496451649 100644
--- a/tests/multi_net/sslcontext_verify_time_error.py
+++ b/tests/multi_net/sslcontext_verify_time_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "multi_net/expired_cert.der"
-key = "multi_net/rsa_key.der"
+cert = cafile = "expired_cert.der"
+key = "rsa_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 5ae8b8ea48014..93a6d3844d235 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -27,13 +27,15 @@
 
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
-    MICROPYTHON = os.getenv(
-        "MICROPY_MICROPYTHON", test_dir + "/../ports/windows/build-standard/micropython.exe"
+    MICROPYTHON = os.path.abspath(
+        os.getenv(
+            "MICROPY_MICROPYTHON", test_dir + "/../ports/windows/build-standard/micropython.exe"
+        )
     )
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-    MICROPYTHON = os.getenv(
-        "MICROPY_MICROPYTHON", test_dir + "/../ports/unix/build-standard/micropython"
+    MICROPYTHON = os.path.abspath(
+        os.getenv("MICROPY_MICROPYTHON", test_dir + "/../ports/unix/build-standard/micropython")
     )
 
 # For diff'ing test output
@@ -155,6 +157,7 @@ def start_file(self, filename, prepend="", append=""):
 class PyInstanceSubProcess(PyInstance):
     def __init__(self, argv, env=None):
         self.argv = argv
+        self.cwd = None
         self.env = {n: v for n, v in (i.split("=") for i in env)} if env else None
         self.popen = None
         self.finished = True
@@ -163,8 +166,9 @@ def __str__(self):
         return self.argv[0].rsplit("/")[-1]
 
     def prepare_script_from_file(self, filename, prepend, append):
-        # Make tests run in an isolated environment (i.e. `import io` would
-        # otherwise get the `tests/io` directory).
+        # Make tests run in the directory of the test file, and in an isolated environment
+        # (i.e. `import io` would otherwise get the `tests/io` directory).
+        self.cwd = os.path.dirname(filename)
         remove_cwd_from_sys_path = b"import sys\nsys.path.remove('')\n\n"
         return remove_cwd_from_sys_path + super().prepare_script_from_file(
             filename, prepend, append
@@ -179,6 +183,7 @@ def run_script(self, script):
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
                 input=script,
+                cwd=self.cwd,
                 env=self.env,
             )
             output = p.stdout
@@ -192,6 +197,7 @@ def start_script(self, script):
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
+            cwd=self.cwd,
             env=self.env,
         )
         self.finished = False

From 0c81ffd31a70a320b5038f6f81a24a3b68120241 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Jan 2024 16:34:58 +1100
Subject: [PATCH 0716/3129] tests/multi_net: Generate smaller certs with
 2048-bit RSA.

Otherwise running the tests can take a long time when the server is a slow
target (RP2040 takes 23 seconds for a handshake when using 4096-bit RSA).

Also add instructions on how to generate elliptic curve key/certs.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/README.md              |  10 ++++++++--
 tests/multi_net/rsa_cert.der | Bin 1421 -> 867 bytes
 tests/multi_net/rsa_key.der  | Bin 2347 -> 1217 bytes
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 083269d6e822f..47fcacf409743 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -181,9 +181,9 @@ SSL/TLS tests in `multi_net` and `net_inet` use a
 self-signed key/cert pair that 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:
+To generate a new self-signed RSA key/cert pair with openssl do:
 ```
-$ openssl req -x509 -newkey rsa:4096 -keyout rsa_key.pem -out rsa_cert.pem -days 365 -nodes
+$ openssl req -x509 -newkey rsa:2048 -keyout rsa_key.pem -out rsa_cert.pem -days 365 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
 ```
 In this case CN is: micropython.local
 
@@ -192,3 +192,9 @@ 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_cert.der -outform DER
 ```
+
+To test elliptic curve key/cert pairs, create a key then a certificate using:
+```
+$ openssl ecparam -name prime256v1 -genkey -noout -out ec_key.der -outform DER
+$ openssl req -new -x509 -key ec_key.der -out ec_cert.der -outform DER -days 365 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
+```
diff --git a/tests/multi_net/rsa_cert.der b/tests/multi_net/rsa_cert.der
index 24ed957eb2c5a21ec4e351abce0c802645462b02..8fae71d4baa8cd3e2be3f3d2bedb62ebb33e371c 100644
GIT binary patch
literal 867
zcmXqLVvaXxVsc-=%*4pVBoe@|NlMGet2}@2#kEB;9S?HiSmzq>vT<s)d9;1!Wn|=L
zWiYTelroTDV-96u<`K-zOfJeVs4U6I&(q7vPfpA+6fqD2$#L;;`-0>Gz;cG%2Am*K
zHen{mPy;z}ULz9&Ljz+2Q)6R8lPDn96v#D#aw)f<iBSpJ(TuDN%uS5^3<gb%Tue=j
zj0`8Xa)q=kE0tqa*6!7L+OtKYbA?b)><#_zlU&U8&swe%nkG{sq}SoG|LsT9g{#{8
zW=@nSvD+?GvVu!}iovWW=VN9D{SnJ}$QcvTc<tqd>7FGA9(+|e-L7_V?T^DD(LvkZ
zd`a7|@8qUv>9n{>=eC^LYtNzXp%ir3t@PeGM~!Tm>W8~eR6Lcgnz@SU3Zs?LQa;v*
zpJwU@ug<QS8ZTp)!MV+T-lclo$Wu+nnx7rmQ=FaU_PqUdguBxlIo$(?>h>Ra+I@I~
zYHrnMo#u)6YPcNk7AJ+Y>+ZF^k;mM|@8VT8Rbc57j~#x7a~DicE9m0<Q}nSd(mm|%
zy$cs)+2u@Y7UXy`F*7nSE)F&bG>`?xiYy<C7>me{CboTN+dt>tj^5PtSm*4FMhg)o
z19_0NGK++PSOazi{2&FwjEw(TSPhtg6mqZw(+V)y85vx>R%pDOyRS>O?zZhcA2v3*
z&F9_x1M-*MZ+mj%b(*;9!{tIx%Z_qBd0$mG%X-4}!>mrFC#+^?o{CcS6a9IcrA1mW
z=+%xSokBZC<BE6pT&g;LMt94&*c<yec+D}W)|8mzw7u!RT<;q9>D(4)!VC9o+fi5j
zw?Xo$%(Mvw>^6Uw?0tK~``()!KbGz9Sfx5$s_MrzY3>K9e;*Xduzox*9{NRl;byCn
z5B1M%>vcn}^c-g`cx0ip$MMhojD{_YoGUql0~!*p1ubBnnD2Eoa}x9ai5U$~?)@-!
wth)C8UfZti-<K<Y{t-K8Rs5Yz*O;ui3#G$Cvo;lQo!`5ONg?4WvqgU#0Ar|Ap#T5?

literal 1421
zcmXqLV(m0&VlG_3%*4pVBqD9Qpj(t7?v+|BcleH7GaI!wm7F%<W#iOp^Jx3d%gD&h
z%3u&;$Zf#M#vIDRCd}j*YA9?V2;y+?a0Tb*rs@WlB$lKaiWmri1i5&)eKV7b@&hVM
zGV=2br3@rMqRc#kxggO3u&7>6esW@tft)z6k+Gqnp{0S5k)@G&6p(8H<eEddG_tjc
zNeS6|jI0dIO-%d@22D&{OifIT4ENrdSMcpwQpfM;y}<bOvq_isn0xVU{GuARUoGo8
zi$bH=JKk>n3tJ`Fy)Mj<@xN%K`$BBmnODsnEgSN~F28;<=R=r4z_%agu73aW(Uv1y
zqkPsh_uapq9sayFW9g>87YomAO1M$Cn87f0=8?Pe6PkWZOxZf&e%sWwS0#++ryJZm
z@*!I8o2iG<Y%Y%`1Jh0B=AR9$!&a%v-njGO5MPe0rf|u@)^(}XCUX>uWNH`}Zk~KH
z*C$^4#H0JCYFBsW>96p87kp`V?p}eg>HG^Dl|^5?n>%Uq>B$eaCSNMq&wjTuf$t0R
zPFbH9B97e}=hto8e#1d7<=d6dlbY`vv3&Z+`0204{8)vGoA30eZM!FbMZ<Se$uEly
zYv=zt*Z(gq-TKja1HXrxYHHT3`f{r5;|mwbXD|3exbE6bJnJ@-`Q^E7d$nbZPc5Bw
zI#ldj*8#rb>q`T7r(T|YZ9R*lT;n0W>?<YLr!UxZWyYg)g}n*u{3md4T)%Wq)$zq<
z>Ne#jry@#TCI9X_-oCm(!O=x`q0}Vp_3`_5zI)|A-}AJ5>g+HHwo77j_g$!Q4(*xH
zGv#5*#D7vsXD99WY$MoWYJF!$Oh=J^>XQbQiTp(drUx!tSIpGV%-=Zq+%Z#*78PrT
z{eeze7v^tg)V_J@N?``GllFs)g7?<E6#jMMwD!Z7`72x|WH|GMsO;sw$i&RZz_>Wr
zAkaV-m~v(LSj1RFYAv;zR=atc{jDugN}CdzrRn;&*FYX5t;`}}Al86g0Y6BAFeBrC
z7FGjhAcdUlfVm2o>=+r=IUEpu{OVrs>JxsC!`IBs^sBix=gGoNsU1wk7n8yTXD!#?
zw5q#BPGjc2#V;}$-9GtFvoddrnY_Ow#QjdzhS~9&?&-3pgf~8ykFj%Rlr1@XtmCba
z=w`-*!gWQa*Xt{<?{54seK*U3p7Rdu;ziP$k6ul*+hit^$U6PrJNLTlVz=x1_6e@L
zJg30)OH<_irM?~QGV<x7bA!$az7~{Uz|OJ!I)@DV-$_@!cCS1BUpnBNe!gi(_@%G0
zGSyMb?xyWLeCSz-Wu0!Y!J3uL{y+Yf%z2q{ob8|W#vOrN=JO6t<gGi$By`v}Y!SQt
z_D?Y#|1?`Oo_JiaJIrm;UpuSA%#ulL*{!O+e^+^b_b9Fimir^xSMNOIN7ct(=}VJx
zIW9Y=?2m1I(cp0Z^W~4Xk}_@|IQ1*#tIL5@3;tzOS6mR?+`8_<!oTxBUO%*{D`Xza
zL1Aqt`PLO-4r|s39-AW8I)CSu#CLc9uhe?Xyg8=GIJlskt@mlfU8ce~)pak+R#sFp
z_i6_1<29<7v|9goyV!>7tG4V^zIuHo>-Qhq7WOzjN&9z9zh&FgskN^jO!HmcVz%MI
zSw9X&wZvV&r*{1QTafWLhhuf6fRy+BN3v7T@;z8}{ce}tMGbZtzC#z1@8teUmY5f~
oKXy{&^Rnwn_9aopUmohkXixC8eR#|{+jyP`L#Ldb>0yCz0E4|}w*UYD

diff --git a/tests/multi_net/rsa_key.der b/tests/multi_net/rsa_key.der
index 5a4666402a6a5e7b34bded6c3dd5b59bd49e4d18..c2cfb76d207e7afb33394bbcaf5525d7382dc2b6 100644
GIT binary patch
literal 1217
zcmV;y1U~yPf&{$+0RS)!1_>&LNQU<f0RaI800e>rr!ay9qXGc{0)hbn0LZlpRD`B=
z9t9&SjV$Giv?z(F5>j2*FZYr}H!saOt`e3UbP_IzNWbmzHKD49j+v1dbUwEdbf^j^
zlrWm)&s>>O{1#~830zcx*6GlfNp!&A^&rcKCef|<!&F;Rw(Rs~u)fK%TN`FxlFqcu
zy*~&iNFq|hMs?oKK`3h+d*Qptc;y><nW_TR0Xj0J4h2~GHYdT=n|zgD96o3Xwm+WI
ze=S+cg2sd9z`S#7YDVXW>sUuZ>>e$^!hXNN<%`3xC2e~1EQ68Wd<sC_b7EA7ExkS1
zZUcr7L`r&<5T&F@xK1&hpqFNFiV6I3@rGGPR^8sv&>aUJHGH6KNdf}_009Dm0RSW}
zE{uuQ59_yeU6yxmaqG|;@P|zO$;j){93}3e3Ng(4?rA0!=}%+%+OL*V4Op>iEQDAA
z+<Vss?U$1yc=y0_i#QTG8OHoG=d1iaGv{;qi4x~DiAsPa;$S1j%A{KsyQD<mOB{_=
z=-Pr5sf)Yc7G<=0Lgiw<C1fp&5qTM}YbTXM!oEu1g}9(&obJBkh#52GE?W#WoyQxn
z6ZT1MegY#NL$U)!qRj+$fSqSEi*K4p3&L!n)6^7Ua7lt6KuyXEzRLop#Ti$@ZWusV
zDHrq_y!;Y~Vx-)1V{g@_D=C`R-1}UOg$NJHMwOJgw{fV&Qdl-5gC-8Xi}?b9fdK3t
z+^yDBF{93qA2uy0N&=ZEQ5YB}avf6E^P?)RZ<acTC^*mbVabb6fF74Jzx=2$mi1si
zGL$JBlJ6BXOg=o2OuMlWlxS$jCLsh_^xY{&7A0!ut03Y#Os@IRcX>uBBMa|DdLj^L
zh2>yytH@+-8JoegV^T#X1+$KCb{_(PfdJW>=*RfG!M;vGYUSVov*B)gB2e0lZJ`Ot
z{m-JTH`87cEMkJFkmPGH8{9`dhN8^bciA$-J=V6fn#a~2FJRRUe}rMH$}fUo9PtXs
zP@5c3YA(E?dApGqU>9Vw|Ii<8LgQ%}$MtF_7}?!8LBAO-^`8Z&-xqhL{)rW4K$il6
zfHW#`SlXmXKSpq(<fcDka)p7}z_<Np0l|KW-#?qcJ#l)_(G+Nkek+g(-#AKF4lCYh
zOPA9AimNtLRSera2>1GJX?`k09(o_0b?5Ih;PkL=P9OV3+=Kqp=SX|q8D{;-r)F9^
zopAt`tYM8J_NVcODA_lcw&Gq79%ojH!vcYT3@6|#6O{pctq5>^NartdKW4Xs2Et=`
zWPh0>88$zp8Wb<kjP>`b8s@|osShE~L|i?ZuYf|E6!)=&%1lFFNN1Ps06N8gqwCa?
z4uvEmmJn0!Dsg7Wc#(kwt%h`(-nNd;|5pZCibaOl+{eJYc^;i2_5ka!cIl`*W-6f{
z0)c@5#<6P*4-tn^u^N#BUGa_+Bhj_x8=HnWhab^MWBD<<iGjdTuI*Se^{-ILA>g_)
zfWDZ7Aax0^@U*8#QrcEUcV8%n1x<kn<e(220x|dX)NCfw?Vl3s`BF}%@2#zhNxHWn
f7G%7Ni6SARKjeJo|32fsp|%A0fItwWJ4>#c*n>Jm

literal 2347
zcmV+`3Dov5f(a)A0RRGm0s#Qt?l*W2yrg~)K}(=B>*kWuyf;b?vGgTYzb0ze1R#MH
z?hT7C(6tx`O3;`bPth_h=oXgD>Vt@cuy0n=>*Sp9RuEA3_|Db$^zl6iYbbY`mPfn#
z=EL)?Xr;1_=%LQCVAy`605N5m#ND4@g7}eSwUFP2m95nnGoNQL-o)@*9`-dzGMfrW
zf-p6*H#hSzJ65VC9oXFP!VYX5DHC+Tg|20LG@KxE9DD(xvy;hfOkXR=;@`@BtBGze
zs7>xu(z|WF5LTBDp@Ab6=<c18v&)m<wPVtBzX#oUU=H*HxgAXC6hVt9&#tn!*gzg+
z_SEx|gWoa)^8Nwx{V1PZAb8pCFP666AJiyKl63kwu&tl`&X4|PXFKB0FizpJe0;2`
z^vZVe=tLRj=nqs1-9C}cMwtWY&bGZP95c$Ln#)xd&WgYebJwL&yJgdx)~^IX9)ZFR
zYt(etm!Q1VnBr$3y<o0SkPES|rJQ=lqc$fzcQndabn0XKj>m_qa3DcMEuk8cE3aR^
zx$f#upGnIfWt&zQ2GSOtzR-L_Rg92~l;LEN{u(09lDP9c5rj26+?ZU5axZ1%fFzL*
zaxgW((>r*XC@F8Tlg`F92!td%0KZW}D$t*|0V~<c)NyD7LM!0W5#Frn6Z*)@E8*#H
zs6>!xLk?6Vy$jI-0|5X50)hemAuly*WO>Yjn+UE{#HUg}U8$%>-5@iXli1A>4Du~l
zlHXoC6C=vkG`qC<et7Q^bqm~jpp%||P3_L$mpGj#)I5+!i2m>xcOJ9fBrMfWnLdA=
zLW`TzyFD_fsqzzFi((uxMvc+xSA!S~Lg=AL&A78$$UX-e9Z^JpL&8>#2&5Zp^+Gf8
zK~ilyc`n{jCz_kcKX^Ey1T4W4CB+sDK9$2aAnO=mWw_rk%^-lf)3>Q2v-5W0Am=k2
z6VTpK(iI?ob{!n{Kv}M*ng7eizeWqWsbyB~b6g`0S^mJXC3B0(1#**2Cvx~^=nzEy
z9g5!|zZn5|`_2hgX&`q$U&#iV{E6^ZW7tff>kr;rSgX%9f?YyiG>tC8&!UR)d>XJw
zG&4{b(2y&1E2#|r+k6zTx~Ue>eq4Pf)Fv@YWo;ArAc*u<0B_X0ldgpEE-d&rb2V-x
zi$*wq^|%|Onu3H0&<tm#%Grt^#_`L5PK$#C)RhbB#EkgWHjQQ$p<b}Ux|Jktkj$<H
zJt8$ojt$d!G#VmsB$3-iU*Ps-Ho5>}qM<`D;Bem+{umwc^W=#uJv-acEC65b93Xh>
za(+uPAe=MR#Nt=8W{$4I)?N{y;3RtL>K;4ghtX216nlfw^9=sW7~Qs(2l`|nOuJE=
z7y#U}O)ca7NEE>Wf&l>l^l9pp`hF%31L6wnEy|keTNMj}eyFH2$_&`6V4-8s+ZNKQ
zH?u(MS9>R3G3sdjrk8HAtkTS!j}&eg4ovZVj0=g6xNd>B2b7I%tXGR9tssavXqIGl
zn|`1xeEVW<l6q=W0#@2jg!hIPmf|CVj9K+>^TZweHKEGPna@WH<4RK-^HK8obSl_-
zuQ=n_(MfS`kRycdCc1plL-3VIb4R_L-fH0W{7svwl+Y4OYbGHpVU?Ty6(vgZ(sO7N
zqgIp#l`I}2aU>wI3nG1#{S~vv#$)pVp0yc6LN#tDqf(pMjUeaXX5LUCn-7-NkN-qf
z)JP$G*!Al3JP$B&0)hbn0O^01L#>?8-%Gk0FWD1~9ynrMFAjCPD(?J1MKjt0+Hv)8
zya%0earf<Y`)G6mg#@TByt#$*TN&b3Vpi(9!m!1GHgcR+uup7_1g53=>e?tx)yHcs
zJ72hs$F8E4bpi35X##aSr6<?BcN<wz#Qhftd3H^p1dl||EQcbak$Of-Fk(TkFyhmd
zY53#K+f>l*#fqy^L&<zhr;+fkRz$7)3A!O<pfHO~_0Lm}EBtK3J9~qm?H$1aGPK1C
znwMsz5|CC)&&H^9=)$T~?XcFtpb*wldVL<513LOTBC3d^2*xUk$qp}=-AKqhy+_WR
z4HJtMc93xv!%81PVFH2y0DlA%{(JV;yY1AdtMg777qwx?Yj%4Zec5)mn#fAl-jN*H
zInZ2vUCTV12Hut39t2k^75uJ8+YFc|W~BGyf5j=W!C0+D2jdQwIO>^995F<A#wWxO
zO?w?-3wV|TUq=iI`8<32Q{3C_c?--{d*FyyerSdOw=)0pu0%L($%VrBQOqw$KhD_w
zOEicw5LqJospE<<=(&Teo$K1U8NZ(fu;Bex4?m#oMnS2k_&ub-6ckW(lA~6T4++g9
z#~|4|Z}?Hi4@(f`R9s&EI8hbYDfhLtai9{ZAVlU9YSH_8HlmvOC94nFK)s%7T5ZhG
zta0~JKiODgQz&5+VFH2y07>0%0G;1Sa~=hiTP2jG!?l`-SLS~o;)xH7RapJffj}dm
zvKq#hsImc&og;zodK~KqJ@kTyWqw|_Z48Or;?e-<%S@hNUJe2b>NmZyy|ta9Vai|u
zLlYR%;UqzlejQ6qYkIenQopm~J>HD=?G_V1KMhH#AxI%WSeds!e>v+KbqnA#hlhFJ
zeo~p;`A~0n*-h}gX>CWr2oZ+O-^7A7GxCYG$7d7jX{1<=rXPq{ifo)qKsR+`IG--&
z7ujV(>I`=PERJuZ>@Ena+&N(Ohp0>BbCWqHwtD5omPyn{p7QZ(P6!Ill+pcW8H%a3
zd;Na4A9uPAwP3MYfdYa70RXRrEzi;etr@_jX-6g57dLhDAgaY@dy6{=vx)(vB`)o_
zwQkqe{$H(61G6P3i@fuAoaz?;#1@SCR7e-Z92ErjG(#cO3wat=06*Mteh?OZE)0Iw
z?S{iYRCIxyg!5k#PWDcOCB%y%UZ4ga6j9$1@P#OT#sXhh(c~@<2e|f|Z}VTUXTy!6
zHuTgpQzJ&(0DOGIr3@vELQz}T9NAnv5TUn*rN+~{trGV5L?giXKd0;hBF320EEXLF
z0BeuCxZ5ls_?NlGyfLV=oqp91{1<L!GH+hYUv3yTJFJGV)S(q}v5m#s>2#JD{a5X5
R=4H2VfSVY8Uv66Pf#LLHc!2-_


From 2b56bab22673797b1a8753d018bf8759e11df3a3 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 18 Dec 2023 12:09:30 +0100
Subject: [PATCH 0717/3129] tests/run-tests.py: Add an option for running only
 the failed tests.

Implement the typical 're-run the failed tests' most test runners have, for
convenience.  Accessible via the new --run-failures argument, and
implemented using a json file containing a list of the failed tests.

Signed-off-by: stijn <stijn@ignitron.net>
---
 tests/run-tests.py | 46 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index bbc98cad96011..32333857f1cb7 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -6,6 +6,7 @@
 import platform
 import argparse
 import inspect
+import json
 import re
 from glob import glob
 import multiprocessing
@@ -47,6 +48,8 @@ def base_path(*p):
 # (not site packages which may clash with u-module names), and improve start up time.
 CPYTHON3_CMD = [CPYTHON3, "-BS"]
 
+# File with the test results.
+RESULTS_FILE = "_results.json"
 
 # For diff'ing test output
 DIFF = os.getenv("MICROPY_DIFF", "diff -u")
@@ -770,7 +773,7 @@ def run_one_test(test_file):
             with open(filename_mupy, "wb") as f:
                 f.write(output_mupy)
             print("FAIL ", test_file)
-            failed_tests.append(test_name)
+            failed_tests.append((test_name, test_file))
 
         test_count.increment()
 
@@ -784,6 +787,7 @@ def run_one_test(test_file):
         for test in tests:
             run_one_test(test)
 
+    # Leave RESULTS_FILE untouched here for future runs.
     if args.list_tests:
         return True
 
@@ -798,8 +802,26 @@ def run_one_test(test_file):
     if len(skipped_tests) > 0:
         print("{} tests skipped: {}".format(len(skipped_tests), " ".join(skipped_tests)))
     failed_tests = sorted(failed_tests.value)
+
+    # Serialize regex added by append_filter.
+    def to_json(obj):
+        if isinstance(obj, re.Pattern):
+            return obj.pattern
+        return obj
+
+    with open(os.path.join(result_dir, RESULTS_FILE), "w") as f:
+        json.dump(
+            {"args": vars(args), "failed_tests": [test[1] for test in failed_tests]},
+            f,
+            default=to_json,
+        )
+
     if len(failed_tests) > 0:
-        print("{} tests failed: {}".format(len(failed_tests), " ".join(failed_tests)))
+        print(
+            "{} tests failed: {}".format(
+                len(failed_tests), " ".join(test[0] for test in failed_tests)
+            )
+        )
         return False
 
     # all tests succeeded
@@ -915,6 +937,11 @@ def main():
         action="store_true",
         help="delete the .exp and .out files from failed tests and exit",
     )
+    cmd_parser.add_argument(
+        "--run-failures",
+        action="store_true",
+        help="re-run only the failed tests",
+    )
     args = cmd_parser.parse_args()
 
     if args.print_failures:
@@ -931,6 +958,7 @@ def main():
             os.path.join(args.result_dir, "*.out")
         ):
             os.remove(f)
+        rm_f(os.path.join(args.result_dir, RESULTS_FILE))
 
         sys.exit(0)
 
@@ -979,7 +1007,19 @@ def main():
     else:
         raise ValueError("target must be one of %s" % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
 
-    if len(args.files) == 0:
+    if args.run_failures and (any(args.files) or args.test_dirs is not None):
+        raise ValueError(
+            "--run-failures cannot be used together with files or --test-dirs arguments"
+        )
+
+    if args.run_failures:
+        results_file = os.path.join(args.result_dir, RESULTS_FILE)
+        if os.path.exists(results_file):
+            with open(results_file, "r") as f:
+                tests = json.load(f)["failed_tests"]
+        else:
+            tests = []
+    elif len(args.files) == 0:
         if args.test_dirs is None:
             test_dirs = (
                 "basics",

From 7a794d0d8ec61d37b871ee0efd14735fcfcd8b11 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 15:06:14 +1100
Subject: [PATCH 0718/3129] tools/gen-changelog.sh: Exclude "-preview" tags
 from generated log.

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

diff --git a/tools/gen-changelog.sh b/tools/gen-changelog.sh
index 6eca1b4b1104e..4111348fb9cf8 100755
--- a/tools/gen-changelog.sh
+++ b/tools/gen-changelog.sh
@@ -2,7 +2,7 @@
 
 echo "MicroPython change log"
 
-for t in $(git tag | grep -v v1.0-rc1 | sort -rV); do
+for t in $(git tag | grep -v -- '-rc1\|-preview' | sort -rV); do
     echo ''
     echo '========'
     echo ''

From ee226a8b4340111eee0b13e7b840948f4bb70465 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 15:07:18 +1100
Subject: [PATCH 0719/3129] all: Fix "reuse" and "overridden" spelling
 mistakes.

Codespell doesn't pick up "re-used" or "re-uses", and ignores the tests/
directory, so fix these manually.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/bluetooth.rst                | 2 +-
 docs/library/rp2.StateMachine.rst         | 2 +-
 docs/reference/constrained.rst            | 2 +-
 tests/basics/bytearray_byte_operations.py | 2 +-
 tests/extmod/vfs_fat_ilistdir_del.py      | 2 +-
 tests/extmod/vfs_lfs_ilistdir_del.py      | 2 +-
 tests/extmod/vfs_posix_ilistdir_del.py    | 2 +-
 tests/import/ext/micropython.py           | 2 +-
 tests/import/ext/sys.py                   | 2 +-
 tests/import/ext/usys.py                  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index 78cb4cc281486..fb3c23400e51d 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -312,7 +312,7 @@ Broadcaster Role (Advertiser)
     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
-    to the previous call to ``gap_advertise`` will be re-used. This allows a
+    to the previous call to ``gap_advertise`` will be reused. 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''``.
 
diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
index ee16ce3c513da..e8c167c09f573 100644
--- a/docs/library/rp2.StateMachine.rst
+++ b/docs/library/rp2.StateMachine.rst
@@ -32,7 +32,7 @@ Methods
 
     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.
+    reused 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.
diff --git a/docs/reference/constrained.rst b/docs/reference/constrained.rst
index 59c375159b2c6..d9a349aa6bb27 100644
--- a/docs/reference/constrained.rst
+++ b/docs/reference/constrained.rst
@@ -211,7 +211,7 @@ two loops:
         spi.readinto(buf)
         # process data in buf
 
-The first creates a buffer on each pass whereas the second re-uses a pre-allocated
+The first creates a buffer on each pass whereas the second reuses a pre-allocated
 buffer; this is both faster and more efficient in terms of memory fragmentation.
 
 **Bytes are smaller than ints**
diff --git a/tests/basics/bytearray_byte_operations.py b/tests/basics/bytearray_byte_operations.py
index 7ce53cac535a1..48b08ab26196f 100644
--- a/tests/basics/bytearray_byte_operations.py
+++ b/tests/basics/bytearray_byte_operations.py
@@ -1,4 +1,4 @@
-# test bytearray with its re-use of byte functions
+# test bytearray with its reuse of byte functions
 
 print(bytearray(b"hello world").find(b"ll"))
 print(bytearray(b"hello\x00world").rfind(b"l"))
diff --git a/tests/extmod/vfs_fat_ilistdir_del.py b/tests/extmod/vfs_fat_ilistdir_del.py
index 055836ad71bef..ed3ca3df670bc 100644
--- a/tests/extmod/vfs_fat_ilistdir_del.py
+++ b/tests/extmod/vfs_fat_ilistdir_del.py
@@ -57,7 +57,7 @@ def test(bdev, vfs_class):
             break
         vfs.mkdir(dname)
 
-        # Also create a fully drained iterator and ensure trying to re-use it
+        # Also create a fully drained iterator and ensure trying to reuse it
         # throws the correct exception.
         idir_emptied = vfs.ilistdir("/")
         l = list(idir_emptied)
diff --git a/tests/extmod/vfs_lfs_ilistdir_del.py b/tests/extmod/vfs_lfs_ilistdir_del.py
index ff66717147868..c183118fe0022 100644
--- a/tests/extmod/vfs_lfs_ilistdir_del.py
+++ b/tests/extmod/vfs_lfs_ilistdir_del.py
@@ -57,7 +57,7 @@ def test(bdev, vfs_class):
             break
         vfs.mkdir(dname)
 
-        # Also create a fully drained iterator and ensure trying to re-use it
+        # Also create a fully drained iterator and ensure trying to reuse it
         # throws the correct exception.
         idir_emptied = vfs.ilistdir("/")
         l = list(idir_emptied)
diff --git a/tests/extmod/vfs_posix_ilistdir_del.py b/tests/extmod/vfs_posix_ilistdir_del.py
index 8c8e6978b6540..11b45e619781e 100644
--- a/tests/extmod/vfs_posix_ilistdir_del.py
+++ b/tests/extmod/vfs_posix_ilistdir_del.py
@@ -37,7 +37,7 @@ def test(testdir):
             break
         vfs.mkdir(dname)
 
-        # Also create a fully drained iterator and ensure trying to re-use it
+        # Also create a fully drained iterator and ensure trying to reuse it
         # throws the correct exception.
         idir_emptied = vfs.ilistdir("/")
         l = list(idir_emptied)
diff --git a/tests/import/ext/micropython.py b/tests/import/ext/micropython.py
index 88c8b770e1780..251e1e0aa911e 100644
--- a/tests/import/ext/micropython.py
+++ b/tests/import/ext/micropython.py
@@ -1,2 +1,2 @@
-# micropython is always builtin and cannot be overriden by the filesystem.
+# micropython is always builtin and cannot be overridden by the filesystem.
 print("ERROR: micropython from filesystem")
diff --git a/tests/import/ext/sys.py b/tests/import/ext/sys.py
index 71ee633e1196b..a041c407f53bf 100644
--- a/tests/import/ext/sys.py
+++ b/tests/import/ext/sys.py
@@ -1,2 +1,2 @@
-# sys is always builtin and cannot be overriden by the filesystem.
+# sys is always builtin and cannot be overridden by the filesystem.
 print("ERROR: sys from filesystem")
diff --git a/tests/import/ext/usys.py b/tests/import/ext/usys.py
index d7629a4499d5b..302d1df338b95 100644
--- a/tests/import/ext/usys.py
+++ b/tests/import/ext/usys.py
@@ -1,3 +1,3 @@
-# usys (and any u-prefix) is always builtin and cannot be overriden by the
+# usys (and any u-prefix) is always builtin and cannot be overridden by the
 # filesystem.
 print("ERROR: usys from filesystem")

From d45176fc271d4d5e264bec2809faeb906787a6f9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 15:37:17 +1100
Subject: [PATCH 0720/3129] ports: Move MICROPY_PY_LWIP_ENTER/REENTER/EXIT
 defns to mphalport.h.

Following ad806df857b52e9814dbd857b14f09b63eb847fe where the
MICROPY_PY_PENDSV_ENTER/REENTER/EXIT macro definitions were moved to
mphalport.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/mpconfigport.h     | 5 -----
 ports/mimxrt/mphalport.h        | 5 +++++
 ports/renesas-ra/mpconfigport.h | 4 ----
 ports/renesas-ra/mphalport.h    | 4 ++++
 ports/rp2/mpconfigport.h        | 5 -----
 ports/rp2/mphalport.h           | 5 +++++
 ports/stm32/mpconfigport.h      | 5 -----
 ports/stm32/mphalport.h         | 5 +++++
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 5feb5b62b80da..c67b010c01acb 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -134,11 +134,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_HASHLIB_SHA1             (MICROPY_PY_SSL)
 // #define MICROPY_PY_CRYPTOLIB                (MICROPY_PY_SSL)
 
-// 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
-
 #ifndef MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
 #endif
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 4f1f4bfd123a9..7f5a228fada9f 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -45,6 +45,11 @@
 #define MICROPY_PY_PENDSV_REENTER atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state);
 
+// 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
+
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT   (500)
 
 #define MP_HAL_PIN_FMT                  "%q"
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 63537fa5abc32..ebd055f2ee9bb 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -292,10 +292,6 @@ typedef long mp_off_t;
 #define MICROPY_THREAD_YIELD()
 #endif
 
-#define MICROPY_PY_LWIP_ENTER
-#define MICROPY_PY_LWIP_REENTER
-#define MICROPY_PY_LWIP_EXIT
-
 #ifndef MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
 #endif
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index b8441e37676cd..c5d27f2e43e9d 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -35,6 +35,10 @@
 #define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV)
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state)
 
+#define MICROPY_PY_LWIP_ENTER
+#define MICROPY_PY_LWIP_REENTER
+#define MICROPY_PY_LWIP_EXIT
+
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 extern const unsigned char mp_hal_status_to_errno_table[4];
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 1cc9b96160396..8431357ffe83e 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -245,11 +245,6 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_BOOTSEL_DELAY_US 8
 #endif
 
-// 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();
-
 // Port level Wait-for-Event macro
 //
 // Do not use this macro directly, include py/runtime.h and
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 9feace2f43ae2..b2576c2275471 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -43,6 +43,11 @@
 #define MICROPY_PY_PENDSV_ENTER   pendsv_suspend()
 #define MICROPY_PY_PENDSV_EXIT    pendsv_resume()
 
+// 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();
+
 extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 21fab6ffd658f..300ad086bf473 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -268,11 +268,6 @@ typedef long mp_off_t;
 // Configuration for shared/runtime/softtimer.c.
 #define MICROPY_SOFT_TIMER_TICKS_MS uwTick
 
-// 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
-
 #ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-stm32"
 #endif
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 4983970876f73..e520bc54ae6c0 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -53,6 +53,11 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable
 #define MICROPY_PY_PENDSV_REENTER atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state);
 
+// 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
+
 // Timing functions.
 
 #if __CORTEX_M == 0

From 0640ff3b97f608a9f55ac380c6681cc48cc1e737 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 15:47:06 +1100
Subject: [PATCH 0721/3129] ports: Move MICROPY_INTERNAL_WFE definition to
 mphalport.h.

It belongs here because the default value is defined in py/mphal.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h      | 13 -------------
 ports/rp2/mphalport.h         | 13 +++++++++++++
 ports/unix/mpconfigport.h     |  6 ------
 ports/unix/mphalport.h        |  6 ++++++
 ports/windows/mpconfigport.h  |  9 ---------
 ports/windows/windows_mphal.h | 11 +++++++++++
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 8431357ffe83e..ce89763d5ea58 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -245,19 +245,6 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_BOOTSEL_DELAY_US 8
 #endif
 
-// Port level Wait-for-Event macro
-//
-// Do not use this macro directly, include py/runtime.h and
-// call mp_event_wait_indefinite() or mp_event_wait_ms(timeout)
-#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) \
-    do {                                 \
-        if ((TIMEOUT_MS) < 0) { \
-            __wfe(); \
-        } else { \
-            best_effort_wfe_or_timeout(make_timeout_time_ms(TIMEOUT_MS)); \
-        } \
-    } while (0)
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
 #define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index b2576c2275471..c8e2301a92ea9 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -48,6 +48,19 @@
 #define MICROPY_PY_LWIP_REENTER lwip_lock_acquire();
 #define MICROPY_PY_LWIP_EXIT    lwip_lock_release();
 
+// Port level Wait-for-Event macro
+//
+// Do not use this macro directly, include py/runtime.h and
+// call mp_event_wait_indefinite() or mp_event_wait_ms(timeout)
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) \
+    do {                                 \
+        if ((TIMEOUT_MS) < 0) { \
+            __wfe(); \
+        } else { \
+            best_effort_wfe_or_timeout(make_timeout_time_ms(TIMEOUT_MS)); \
+        } \
+    } while (0)
+
 extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index c7e7347cbb2b4..1086baea06c60 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -221,12 +221,6 @@ static inline unsigned long mp_random_seed_init(void) {
 #include <stdio.h>
 #endif
 
-// In lieu of a WFI(), slow down polling from being a tight loop.
-//
-// Note that we don't delay for the full TIMEOUT_MS, as execution
-// can't be woken from the delay.
-#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) mp_hal_delay_us(500)
-
 // Configure the implementation of machine.idle().
 #include <sched.h>
 #define MICROPY_UNIX_MACHINE_IDLE sched_yield();
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index ca951e5001012..02b60d8a873b9 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -36,6 +36,12 @@
 #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.
+//
+// Note that we don't delay for the full TIMEOUT_MS, as execution
+// can't be woken from the delay.
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) mp_hal_delay_us(500)
+
 void mp_hal_set_interrupt_char(char c);
 
 #define mp_hal_stdio_poll unused // this is not implemented, nor needed
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index e615fe8502b0c..dee5568c6225c 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -224,15 +224,6 @@ typedef long mp_off_t;
 
 #include "realpath.h"
 #include "init.h"
-#include "sleep.h"
-
-#if MICROPY_ENABLE_SCHEDULER
-// Use minimum 1mSec sleep to make sure there is effectively a wait period:
-// something like usleep(500) truncates and ends up calling Sleep(0).
-#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) msec_sleep(MAX(1.0, (double)(TIMEOUT_MS)))
-#else
-#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) /* No-op */
-#endif
 
 #ifdef __GNUC__
 #define MP_NOINLINE __attribute__((noinline))
diff --git a/ports/windows/windows_mphal.h b/ports/windows/windows_mphal.h
index 2b7aab44a0fd4..e70d00def77b5 100644
--- a/ports/windows/windows_mphal.h
+++ b/ports/windows/windows_mphal.h
@@ -27,6 +27,17 @@
 #include "sleep.h"
 #include "ports/unix/mphalport.h"
 
+// Don't use the unix version of this macro.
+#undef MICROPY_INTERNAL_WFE
+
+#if MICROPY_ENABLE_SCHEDULER
+// Use minimum 1mSec sleep to make sure there is effectively a wait period:
+// something like usleep(500) truncates and ends up calling Sleep(0).
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) msec_sleep(MAX(1.0, (double)(TIMEOUT_MS)))
+#else
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) /* No-op */
+#endif
+
 #define MICROPY_HAL_HAS_VT100 (0)
 
 void mp_hal_move_cursor_back(unsigned int pos);

From 42eab32a36f70840c7e670a61269fb795d43991b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 15:56:34 +1100
Subject: [PATCH 0722/3129] windows/windows_mphal: Fix mp_hal_delay_ms() so it
 runs events.

This changed behaviour in c393f5c12321a80bea40af7ef2e42a077df5d806 when the
MICROPY_EVENT_POLL_HOOK macro was removed.

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

diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index f88491707f193..dcee20784e79f 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -279,10 +279,10 @@ int usleep(__int64 usec) {
 #endif
 
 void mp_hal_delay_ms(mp_uint_t ms) {
-    #ifdef MICROPY_EVENT_POLL_HOOK
+    #if MICROPY_ENABLE_SCHEDULER
     mp_uint_t start = mp_hal_ticks_ms();
     while (mp_hal_ticks_ms() - start < ms) {
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(1);
     }
     #else
     msec_sleep((double)ms);

From 80fd575c8cc103133fed4c7386f0b7165abd2678 Mon Sep 17 00:00:00 2001
From: darc <darcagn@protonmail.com>
Date: Fri, 5 Jan 2024 00:47:57 -0600
Subject: [PATCH 0723/3129] embed: Fix alloca include for FreeBSD and NetBSD.

Signed-off-by: darc <darcagn@protonmail.com>
---
 ports/embed/port/mpconfigport_common.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/embed/port/mpconfigport_common.h b/ports/embed/port/mpconfigport_common.h
index 69216a7582681..8e19859ed2ed9 100644
--- a/ports/embed/port/mpconfigport_common.h
+++ b/ports/embed/port/mpconfigport_common.h
@@ -33,6 +33,10 @@ typedef uintptr_t mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
 // Need to provide a declaration/definition of alloca()
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <stdlib.h>
+#else
 #include <alloca.h>
+#endif
 
 #define MICROPY_MPHALPORT_H "port/mphalport.h"

From f8cabe82f71add182702f32e1b1444a44c83eb74 Mon Sep 17 00:00:00 2001
From: Nicko van Someren <nicko@nicko.org>
Date: Sat, 6 Jan 2024 16:33:12 -0700
Subject: [PATCH 0724/3129] rp2/rp2_dma: Fix fetching 'write' buffers for
 writing not reading.

Signed-off-by: Nicko van Someren <nicko@nicko.org>
---
 ports/rp2/rp2_dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
index acc18d08c58da..893498265aa41 100644
--- a/ports/rp2/rp2_dma.c
+++ b/ports/rp2/rp2_dma.c
@@ -86,7 +86,7 @@ STATIC const uint32_t rp2_dma_ctrl_field_count = MP_ARRAY_SIZE(rp2_dma_ctrl_fiel
 STATIC uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) {
     if (reg_type == REG_TYPE_ADDR_READ || reg_type == REG_TYPE_ADDR_WRITE) {
         mp_buffer_info_t buf_info;
-        mp_uint_t flags = MP_BUFFER_READ;
+        mp_uint_t flags = (reg_type == REG_TYPE_ADDR_READ) ? MP_BUFFER_READ : MP_BUFFER_WRITE;
         if (mp_get_buffer(o, &buf_info, flags)) {
             return (uint32_t)buf_info.buf;
         }

From 1da45e887af1b5e6e608a13e292aa343f5b9f976 Mon Sep 17 00:00:00 2001
From: Nicko van Someren <nicko@nicko.org>
Date: Sat, 6 Jan 2024 16:33:51 -0700
Subject: [PATCH 0725/3129] rp2: Provide direct memory access to PIO and SPI
 FIFOs via proxy arrays.

Signed-off-by: Nicko van Someren <nicko@nicko.org>
---
 ports/rp2/machine_spi.c | 13 +++++++++++++
 ports/rp2/rp2_pio.c     | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index fb8e9f56caec5..a4f4243b7a1fd 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -302,6 +302,18 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
     }
 }
 
+// Buffer protocol implementation for SPI.
+// The buffer represents the SPI data FIFO.
+STATIC mp_int_t machine_spi_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    machine_spi_obj_t *self = MP_OBJ_TO_PTR(o_in);
+
+    bufinfo->len = 4;
+    bufinfo->typecode = 'I';
+    bufinfo->buf = (void *)&spi_get_hw(self->spi_inst)->dr;
+
+    return 0;
+}
+
 STATIC const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
     .transfer = machine_spi_transfer,
@@ -314,6 +326,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     make_new, machine_spi_make_new,
     print, machine_spi_print,
     protocol, &machine_spi_p,
+    buffer, machine_spi_get_buffer,
     locals_dict, &mp_machine_spi_locals_dict
     );
 
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 3a0ab844eafd4..42e61684b3369 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -809,6 +809,23 @@ STATIC mp_obj_t rp2_state_machine_tx_fifo(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_state_machine_tx_fifo_obj, rp2_state_machine_tx_fifo);
 
+// Buffer protocol implementation for StateMachine.
+// The buffer represents one of the FIFO ports of the state machine. Note that a different
+// pointer is returned depending on if this is for reading or writing.
+STATIC mp_int_t rp2_state_machine_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(o_in);
+
+    bufinfo->len = 4;
+    bufinfo->typecode = 'I';
+
+    if (flags & MP_BUFFER_WRITE) {
+        bufinfo->buf = (void *)&self->pio->txf[self->sm];
+    } else {
+        bufinfo->buf = (void *)&self->pio->rxf[self->sm];
+    }
+    return 0;
+}
+
 // 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 };
@@ -884,6 +901,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     make_new, rp2_state_machine_make_new,
     print, rp2_state_machine_print,
+    buffer, rp2_state_machine_get_buffer,
     locals_dict, &rp2_state_machine_locals_dict
     );
 

From b7b99522e4fb6ccf46d996c5ee52e8aceb1f7439 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Nov 2023 17:19:34 +1100
Subject: [PATCH 0726/3129] stm32/mboot: Improve detection of invalid flash
 erase/write.

This commit replaces the linker symbol `_mboot_writable_flash_start` with
`_mboot_protected_flash_start` and `_mboot_protected_flash_end_exclusive`,
to provide better configuration of the protected flash area.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../stm32/boards/LEGO_HUB_NO6/mboot_memory.ld |  6 +--
 ports/stm32/mboot/main.c                      | 50 +++++++++----------
 ports/stm32/mboot/stm32_memory.ld             |  6 +--
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld b/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
index f48f2056cae61..3e457995b641f 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
@@ -8,6 +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);
+/* Location of protected flash area which must not be modified, because mboot lives there. */
+_mboot_protected_flash_start = ORIGIN(FLASH_BL);
+_mboot_protected_flash_end_exclusive = ORIGIN(FLASH_BL) + LENGTH(FLASH_BL);
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index d034996afbf69..0791182871f63 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -109,15 +109,13 @@
 // 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;
+// Symbols provided by the linker, the protected flash address range where mboot lives.
+extern uint8_t _mboot_protected_flash_start;
+extern uint8_t _mboot_protected_flash_end_exclusive;
 
 // 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;
 
@@ -410,10 +408,10 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 /******************************************************************************/
 // FLASH
 
-#if defined(STM32G0)
+#define FLASH_START (FLASH_BASE)
+
+#if defined(STM32G0) || defined(STM32H5)
 #define FLASH_END (FLASH_BASE + FLASH_SIZE - 1)
-#elif defined(STM32H5)
-#define FLASH_END (0x08000000 + 2 * 1024 * 1024)
 #elif defined(STM32WB)
 #define FLASH_END FLASH_END_ADDR
 #endif
@@ -446,30 +444,36 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*04Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #endif
 
+static bool flash_is_modifiable_addr_range(uint32_t addr, uint32_t len) {
+    return addr + len < (uint32_t)&_mboot_protected_flash_start
+           || addr >= (uint32_t)&_mboot_protected_flash_end_exclusive;
+}
+
 static int mboot_flash_mass_erase(void) {
     // Erase all flash pages after mboot.
-    uint32_t start_addr = (uint32_t)&_mboot_writable_flash_start;
+    uint32_t start_addr = (uint32_t)&_mboot_protected_flash_end_exclusive;
     uint32_t num_words = (FLASH_END + 1 - start_addr) / sizeof(uint32_t);
     int ret = flash_erase(start_addr, num_words);
     return ret;
 }
 
 static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
+    // Compute start and end address of the sector being erased.
     uint32_t sector_size = 0;
     uint32_t sector_start = 0;
-    int32_t sector = flash_get_sector_info(addr, &sector_start, &sector_size);
-    if (sector < first_writable_flash_sector) {
+    int ret = flash_get_sector_info(addr, &sector_start, &sector_size);
+    *next_addr = sector_start + sector_size;
+
+    if (ret < 0 || !flash_is_modifiable_addr_range(addr, *next_addr - addr)) {
         // 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
-                                          : MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
+        dfu_context.error = (ret < 0) ? MBOOT_ERROR_STR_INVALID_ADDRESS_IDX
+                                      : MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX;
         return -MBOOT_ERRNO_FLASH_ERASE_DISALLOWED;
     }
 
-    *next_addr = sector_start + sector_size;
-
     // Erase the flash page.
-    int ret = flash_erase(sector_start, sector_size / sizeof(uint32_t));
+    ret = flash_erase(sector_start, sector_size / sizeof(uint32_t));
     if (ret != 0) {
         return ret;
     }
@@ -485,12 +489,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) {
-    int32_t sector = flash_get_sector_info(addr, NULL, NULL);
-    if (sector < first_writable_flash_sector) {
+    bool valid = flash_is_valid_addr(addr);
+    if (!valid || !flash_is_modifiable_addr_range(addr, len)) {
         // 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;
+        dfu_context.error = (!valid) ? MBOOT_ERROR_STR_INVALID_ADDRESS_IDX
+                                     : MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX;
         return -MBOOT_ERRNO_FLASH_WRITE_DISALLOWED;
     }
 
@@ -1496,12 +1500,6 @@ 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/stm32_memory.ld b/ports/stm32/mboot/stm32_memory.ld
index ef1b83f30bf72..365693b3a304c 100644
--- a/ports/stm32/mboot/stm32_memory.ld
+++ b/ports/stm32/mboot/stm32_memory.ld
@@ -9,6 +9,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);
+/* Location of protected flash area which must not be modified, because mboot lives there. */
+_mboot_protected_flash_start = ORIGIN(FLASH_BL);
+_mboot_protected_flash_end_exclusive = ORIGIN(FLASH_BL) + LENGTH(FLASH_BL);

From 7002a19be2bbc598b6dcdef4db2dd37e7e7753c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Nov 2023 17:20:03 +1100
Subject: [PATCH 0727/3129] stm32/mboot: Improve mass erase to erase all
 non-protected pages.

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

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 0791182871f63..11755308716fb 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -449,14 +449,6 @@ static bool flash_is_modifiable_addr_range(uint32_t addr, uint32_t len) {
            || addr >= (uint32_t)&_mboot_protected_flash_end_exclusive;
 }
 
-static int mboot_flash_mass_erase(void) {
-    // Erase all flash pages after mboot.
-    uint32_t start_addr = (uint32_t)&_mboot_protected_flash_end_exclusive;
-    uint32_t num_words = (FLASH_END + 1 - start_addr) / sizeof(uint32_t);
-    int ret = flash_erase(start_addr, num_words);
-    return ret;
-}
-
 static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     // Compute start and end address of the sector being erased.
     uint32_t sector_size = 0;
@@ -488,6 +480,23 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     return 0;
 }
 
+static int mboot_flash_mass_erase(void) {
+    // Erase all flash pages except those disallowed because they overlap with mboot.
+    uint32_t addr = FLASH_START;
+    while (addr <= FLASH_END) {
+        int ret = mboot_flash_page_erase(addr, &addr);
+        if (ret != 0 && ret != -MBOOT_ERRNO_FLASH_ERASE_DISALLOWED) {
+            return ret;
+        }
+    }
+
+    // Reset any errors from disallowed page erases.
+    dfu_context.status = DFU_STATUS_OK;
+    dfu_context.error = 0;
+
+    return 0;
+}
+
 static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
     bool valid = flash_is_valid_addr(addr);
     if (!valid || !flash_is_modifiable_addr_range(addr, len)) {

From cd0f75069cf7488d5b26760c3c9a2f357df919f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Nov 2023 16:05:21 +1100
Subject: [PATCH 0728/3129] stm32/flash: Remove commented-out flash functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/flash.c     | 73 -----------------------------------------
 ports/stm32/flashbdev.c | 19 -----------
 2 files changed, 92 deletions(-)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index a8f50dbcbaf7a..04448a1186e82 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -355,35 +355,6 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     return mp_hal_status_to_neg_errno(status);
 }
 
-/*
-// erase the sector using an interrupt
-void flash_erase_it(uint32_t flash_dest, uint32_t num_word32) {
-    // check there is something to write
-    if (num_word32 == 0) {
-        return;
-    }
-
-    // unlock
-    HAL_FLASH_Unlock();
-
-    // Clear pending flags (if any)
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
-                           FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR|FLASH_FLAG_PGSERR);
-
-    // 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
-    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;
-    if (HAL_FLASHEx_Erase_IT(&EraseInitStruct) != HAL_OK) {
-        // error occurred during sector erase
-        HAL_FLASH_Lock(); // lock the flash
-        return;
-    }
-}
-*/
-
 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.
@@ -498,47 +469,3 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
 
     return mp_hal_status_to_neg_errno(status);
 }
-
-/*
- use erase, then write
-void flash_erase_and_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
-    // check there is something to write
-    if (num_word32 == 0) {
-        return;
-    }
-
-    // unlock
-    HAL_FLASH_Unlock();
-
-    // Clear pending flags (if any)
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
-                           FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR|FLASH_FLAG_PGSERR);
-
-    // 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
-    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;
-    uint32_t SectorError = 0;
-    if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK) {
-        // error occurred during sector erase
-        HAL_FLASH_Lock(); // lock the flash
-        return;
-    }
-
-    // program the flash word by word
-    for (int i = 0; i < num_word32; i++) {
-        if (HAL_FLASH_Program(TYPEPROGRAM_WORD, flash_dest, *src) != HAL_OK) {
-            // error occurred during flash write
-            HAL_FLASH_Lock(); // lock the flash
-            return;
-        }
-        flash_dest += 4;
-        src += 1;
-    }
-
-    // lock the flash
-    HAL_FLASH_Lock();
-}
-*/
diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index bcff94b15d4e9..19edde2108c79 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -159,25 +159,6 @@ static void flash_bdev_irq_handler(void) {
         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 / 4);

From cf115918e66bea460256661848d9198ca6ca994d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Nov 2023 17:06:41 +1100
Subject: [PATCH 0729/3129] stm32/flash: Simplify sector calculation for
 homogeneous flash layout.

Newer STM32 parts have homogeneous flash layout, and in this case the MCU
configuration and page/sector calculation can be simplified.  The affected
functions are `flash_is_valid_addr()` and `flash_get_sector_info()`, which
are now simpler for homogeneous flash.

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

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 04448a1186e82..d9f7af8a24f65 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -66,12 +66,15 @@ typedef struct {
 
 #if defined(STM32F0)
 
-static const flash_layout_t flash_layout[] = {
-    { FLASH_BASE, FLASH_PAGE_SIZE, (FLASH_BANK1_END + 1 - FLASH_BASE) / FLASH_PAGE_SIZE },
-};
+#define FLASH_LAYOUT_IS_HOMOGENEOUS (1)
+#define FLASH_LAYOUT_START_ADDR     (FLASH_BASE)
+#define FLASH_LAYOUT_SECTOR_SIZE    (FLASH_PAGE_SIZE)
+#define FLASH_LAYOUT_NUM_SECTORS    ((FLASH_BANK1_END + 1 - FLASH_BASE) / FLASH_PAGE_SIZE)
 
 #elif defined(STM32F4)
 
+#define FLASH_LAYOUT_IS_HOMOGENEOUS (0)
+
 static const flash_layout_t flash_layout[] = {
     { 0x08000000, 0x04000, 4 },
     { 0x08010000, 0x10000, 1 },
@@ -88,6 +91,8 @@ static const flash_layout_t flash_layout[] = {
 
 #elif defined(STM32F7)
 
+#define FLASH_LAYOUT_IS_HOMOGENEOUS (0)
+
 // FLASH_FLAG_PGSERR (Programming Sequence Error) was renamed to
 // FLASH_FLAG_ERSERR (Erasing Sequence Error) in STM32F7
 #define FLASH_FLAG_PGSERR FLASH_FLAG_ERSERR
@@ -113,27 +118,31 @@ static const flash_layout_t flash_layout[] = {
 
 #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 },
-};
+#define FLASH_LAYOUT_IS_HOMOGENEOUS (1)
+#define FLASH_LAYOUT_START_ADDR     (FLASH_BASE)
+#define FLASH_LAYOUT_SECTOR_SIZE    (FLASH_PAGE_SIZE)
+#define FLASH_LAYOUT_NUM_SECTORS    (512)
 
 #elif defined(STM32L1)
 
-static const flash_layout_t flash_layout[] = {
-    { (uint32_t)FLASH_BASE, 0x200, 1024 },
-};
+#define FLASH_LAYOUT_IS_HOMOGENEOUS (1)
+#define FLASH_LAYOUT_START_ADDR     (FLASH_BASE)
+#define FLASH_LAYOUT_SECTOR_SIZE    (0x200)
+#define FLASH_LAYOUT_NUM_SECTORS    (1024)
 
 #elif defined(STM32H5)
 
-static const flash_layout_t flash_layout[] = {
-    { 0x08000000, 8192, 256 },
-};
+#define FLASH_LAYOUT_IS_HOMOGENEOUS (1)
+#define FLASH_LAYOUT_START_ADDR     (FLASH_BASE_NS)
+#define FLASH_LAYOUT_SECTOR_SIZE    (0x2000)
+#define FLASH_LAYOUT_NUM_SECTORS    (256)
 
 #elif defined(STM32H7)
 
-static const flash_layout_t flash_layout[] = {
-    { 0x08000000, 0x20000, 16 },
-};
+#define FLASH_LAYOUT_IS_HOMOGENEOUS (1)
+#define FLASH_LAYOUT_START_ADDR     (FLASH_BASE)
+#define FLASH_LAYOUT_SECTOR_SIZE    (0x20000)
+#define FLASH_LAYOUT_NUM_SECTORS    (16)
 
 #else
 #error Unsupported processor
@@ -156,14 +165,14 @@ static uint32_t get_bank(uint32_t addr) {
     if (READ_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE) == 0) {
         #endif
         // no bank swap
-        if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
+        if (addr < (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) {
             return FLASH_BANK_1;
         } else {
             return FLASH_BANK_2;
         }
     } else {
         // bank swap
-        if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
+        if (addr < (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) {
             return FLASH_BANK_2;
         } else {
             return FLASH_BANK_1;
@@ -174,12 +183,12 @@ static uint32_t get_bank(uint32_t addr) {
 #if (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE))
 // get the page of a given flash address
 static uint32_t get_page(uint32_t addr) {
-    if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
+    if (addr < (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) {
         // bank 1
-        return (addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+        return (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
     } else {
         // bank 2
-        return (addr - (FLASH_BASE + FLASH_BANK_SIZE)) / FLASH_PAGE_SIZE;
+        return (addr - (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) / FLASH_LAYOUT_SECTOR_SIZE;
     }
 }
 #endif
@@ -187,18 +196,18 @@ static uint32_t get_page(uint32_t addr) {
 #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;
+    return (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
 }
 
 #elif defined(STM32G0) || defined(STM32G4)
 
 static uint32_t get_page(uint32_t addr) {
-    return (addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+    return (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
 }
 
 static uint32_t get_bank(uint32_t addr) {
     // no bank swap
-    if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
+    if (addr < (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) {
         return FLASH_BANK_1;
     } else {
         #if defined(FLASH_OPTR_DBANK)
@@ -212,13 +221,33 @@ static uint32_t get_bank(uint32_t addr) {
 #endif
 
 bool flash_is_valid_addr(uint32_t addr) {
+    #if FLASH_LAYOUT_IS_HOMOGENEOUS
+    uint32_t base = FLASH_LAYOUT_START_ADDR;
+    uint32_t end_of_flash = FLASH_LAYOUT_START_ADDR + FLASH_LAYOUT_NUM_SECTORS * FLASH_LAYOUT_SECTOR_SIZE;
+    #else
+    uint32_t base = flash_layout[0].base_address;
     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;
+    #endif
+    return base <= addr && addr < end_of_flash;
 }
 
 int32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size) {
+    #if FLASH_LAYOUT_IS_HOMOGENEOUS
+    if (addr >= FLASH_LAYOUT_START_ADDR) {
+        uint32_t sector_index = (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
+        if (sector_index < FLASH_LAYOUT_NUM_SECTORS) {
+            if (start_addr != NULL) {
+                *start_addr = FLASH_LAYOUT_START_ADDR + sector_index * FLASH_LAYOUT_SECTOR_SIZE;
+            }
+            if (size != NULL) {
+                *size = FLASH_LAYOUT_SECTOR_SIZE;
+            }
+            return sector_index;
+        }
+    }
+    #else
     if (addr >= flash_layout[0].base_address) {
         uint32_t sector_index = 0;
         for (int i = 0; i < MP_ARRAY_SIZE(flash_layout); ++i) {
@@ -239,6 +268,7 @@ int32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *siz
             }
         }
     }
+    #endif
     return -1;
 }
 

From b6ab9e420b0a874eb2f8f6b7597430ed9e526bf7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Nov 2023 19:12:09 +1100
Subject: [PATCH 0730/3129] stm32/flash: Change flash_erase to only erase a
 single sector at a time.

An erase sector sits in a given flash bank and some MCUs have two flash
banks.  If trying to erase a range of sectors and that range crosses from
one flash bank into the next, the original implementation of
`flash_erase()` would not handle this case and would do the wrong thing.

This commit changes `flash_erase()` to only erase a single sector, which
sidesteps the need to handle flash-bank-crossing.  Most callers of this
function only need to erase a single sector anyway.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/flash.c      | 21 ++++++++++-----------
 ports/stm32/flash.h      |  2 +-
 ports/stm32/flashbdev.c  |  2 +-
 ports/stm32/mboot/main.c |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index d9f7af8a24f65..fb1e6059c1fa0 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -272,11 +272,10 @@ int32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *siz
     return -1;
 }
 
-int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
-    // check there is something to write
-    if (num_word32 == 0) {
-        return 0;
-    }
+// Erase a single flash page which starts at the given address.
+// The address will be converted to a bank and sector number.
+int flash_erase(uint32_t flash_dest) {
+    const unsigned int num_sectors = 1;
 
     #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
     // Acquire lock on the flash peripheral.
@@ -306,23 +305,23 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR);
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.PageAddress = flash_dest;
-    EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
+    EraseInitStruct.NbPages = num_sectors;
     #elif defined(STM32G0) || 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;
+    EraseInitStruct.NbPages = num_sectors;
     #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;
-    EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
+    EraseInitStruct.NbPages = num_sectors;
     #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);
-    EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
+    EraseInitStruct.NbPages = num_sectors;
     #elif defined(STM32L4)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
     // The sector returned by flash_get_sector_info can not be used
@@ -330,7 +329,7 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     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;
+    EraseInitStruct.NbPages = num_sectors;
     #else
 
     #if defined(STM32H5)
@@ -354,7 +353,7 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     EraseInitStruct.Banks = get_bank(flash_dest);
     #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;
+    EraseInitStruct.NbSectors = num_sectors;
     #if defined(STM32H5)
     EraseInitStruct.Sector &= 0x7f; // second bank should start counting at 0
     #endif
diff --git a/ports/stm32/flash.h b/ports/stm32/flash.h
index ecda923db7826..e5ba35cf7d234 100644
--- a/ports/stm32/flash.h
+++ b/ports/stm32/flash.h
@@ -28,7 +28,7 @@
 
 bool flash_is_valid_addr(uint32_t addr);
 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_erase(uint32_t flash_dest);
 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/flashbdev.c b/ports/stm32/flashbdev.c
index 19edde2108c79..e96c54e791d3f 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -161,7 +161,7 @@ static void flash_bdev_irq_handler(void) {
 
     // 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 / 4);
+        flash_erase(flash_cache_sector_start);
         flash_flags |= FLASH_FLAG_ERASED;
         return;
     }
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 11755308716fb..2424b37da3a8b 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -465,7 +465,7 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     }
 
     // Erase the flash page.
-    ret = flash_erase(sector_start, sector_size / sizeof(uint32_t));
+    ret = flash_erase(sector_start);
     if (ret != 0) {
         return ret;
     }

From cd6e0e1022443e9d099768a2d5cccc8202c80080 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Nov 2023 17:52:27 +1100
Subject: [PATCH 0731/3129] stm32/flashbdev: Don't rely on flash sector id.

This commit removes the need for a separate `flash_cache_sector_id`
variable, instead using `flash_cache_sector_start` to indicate which sector
is curretly cached (and -1 indicates no sector).

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

diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index e96c54e791d3f..e9542d7a3451e 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -68,7 +68,6 @@ extern uint8_t _micropy_hw_internal_flash_storage_ram_cache_end[];
 #define FLASH_FLAG_FORCE_WRITE  (2)
 #define FLASH_FLAG_ERASED       (4)
 static __IO 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 uint32_t flash_tick_counter_last_write;
@@ -80,7 +79,7 @@ int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg) {
     switch (op) {
         case BDEV_IOCTL_INIT:
             flash_flags = 0;
-            flash_cache_sector_id = 0;
+            flash_cache_sector_start = (uint32_t)-1;
             flash_tick_counter_last_write = 0;
             return 0;
 
@@ -110,14 +109,13 @@ 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;
-    int32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
+    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) {
+    if (flash_cache_sector_start != flash_sector_start) {
         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;
     }
@@ -130,8 +128,8 @@ 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;
-    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) {
+    flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
+    if (flash_cache_sector_start == flash_sector_start) {
         // in cache, copy from there
         return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
     }

From 5cb93f63fb8555302ae5e4fdfe469ef4aefb0410 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Nov 2023 19:29:09 +1100
Subject: [PATCH 0732/3129] stm32/flash: Factor and simplify erase code.

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

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index fb1e6059c1fa0..22bdf57ec7e0b 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -29,7 +29,17 @@
 #include "py/mphal.h"
 #include "flash.h"
 
-#if defined(STM32G0)
+#if defined(STM32F0)
+
+#define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR)
+
+#elif defined(STM32F4)
+
+#define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_EOP | FLASH_FLAG_OPERR \
+    | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR)
+
+#elif 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 | \
@@ -41,6 +51,15 @@
 #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)
+
+#elif defined(STM32H7)
+
+#define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_ALL_ERRORS_BANK1 | FLASH_FLAG_ALL_ERRORS_BANK2)
+
+#elif defined(STM32L0) || defined(STM32L1)
+
+#define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR)
+
 #endif
 
 #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
@@ -93,10 +112,6 @@ static const flash_layout_t flash_layout[] = {
 
 #define FLASH_LAYOUT_IS_HOMOGENEOUS (0)
 
-// FLASH_FLAG_PGSERR (Programming Sequence Error) was renamed to
-// FLASH_FLAG_ERSERR (Erasing Sequence Error) in STM32F7
-#define FLASH_FLAG_PGSERR FLASH_FLAG_ERSERR
-
 #if defined(STM32F722xx) || defined(STM32F723xx) || defined(STM32F732xx) || defined(STM32F733xx)
 static const flash_layout_t flash_layout[] = {
     { 0x08000000, 0x04000, 4 },
@@ -298,66 +313,51 @@ int flash_erase(uint32_t flash_dest) {
     }
     #endif
 
-    // Clear pending flags (if any) and set up EraseInitStruct.
+    // Clear pending flags (if any).
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
 
+    // 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;
-    EraseInitStruct.PageAddress = flash_dest;
-    EraseInitStruct.NbPages = num_sectors;
-    #elif defined(STM32G0) || 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 = num_sectors;
-    #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;
-    EraseInitStruct.NbPages = num_sectors;
-    #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);
-    EraseInitStruct.NbPages = num_sectors;
-    #elif defined(STM32L4)
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-    // The sector returned by flash_get_sector_info can not be used
-    // as the flash has on each bank 0/1 pages 0..255
+
+    // ... the erase type and number of pages/sectors,
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) \
+    || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
-    EraseInitStruct.Banks = get_bank(flash_dest);
-    EraseInitStruct.Page = get_page(flash_dest);
     EraseInitStruct.NbPages = num_sectors;
-    #else
 
-    #if defined(STM32H5)
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-    #elif 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);
-    #endif
+    #elif defined(STM32F4) || defined(STM32F7) || defined(STM32H5) || defined(STM32H7)
 
     EraseInitStruct.TypeErase = TYPEERASE_SECTORS;
+    EraseInitStruct.NbSectors = num_sectors;
     #if defined(FLASH_CR_PSIZE)
     EraseInitStruct.VoltageRange = VOLTAGE_RANGE_3; // voltage range needs to be 2.7V to 3.6V
     #elif !defined(STM32H5)
     EraseInitStruct.VoltageRange = 0; // unused parameter on STM32H7A3/B3
     #endif
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7)
-    EraseInitStruct.Banks = get_bank(flash_dest);
+
+    #else
+    #error Unsupported processor
     #endif
+
+    // ... and the flash bank and page/sector.
+    #if defined(STM32F0) || defined(STM32L0) || defined(STM32L1)
+    EraseInitStruct.PageAddress = flash_dest;
+    #elif defined(STM32G0) || defined(STM32G4) || (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE))
+    EraseInitStruct.Page = get_page(flash_dest);
+    EraseInitStruct.Banks = get_bank(flash_dest);
+    #elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB) || defined(STM32WL)
+    EraseInitStruct.Page = get_page(flash_dest);
+    #elif defined(STM32F4) || defined(STM32F7)
+    EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
+    #elif defined(STM32H5) || defined(STM32H7)
+    EraseInitStruct.Banks = get_bank(flash_dest);
     EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
-    EraseInitStruct.NbSectors = num_sectors;
     #if defined(STM32H5)
     EraseInitStruct.Sector &= 0x7f; // second bank should start counting at 0
     #endif
-
+    #else
+    #error Unsupported processor
     #endif
 
     // Erase the sectors.

From 7ecff515d7fcb1087a621198f939cc99b1c914b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Nov 2023 10:29:28 +1100
Subject: [PATCH 0733/3129] stm32/flash: Fix sector and bank calculation for H5
 and H7 MCUs.

Flash sectors should start counting at 0 for each bank.  This commit makes
sure that is the case on all H5 and H7 MCUs, by using `get_page()` instead
of `flash_get_sector_info()`.

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

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 22bdf57ec7e0b..10c5f296a28c8 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -163,13 +163,18 @@ static const flash_layout_t flash_layout[] = {
 #error Unsupported processor
 #endif
 
-#if defined(STM32H723xx) || defined(STM32H750xx)
+#if defined(STM32H7) && !defined(DUAL_BANK)
 
 // get the bank of a given flash address
 static uint32_t get_bank(uint32_t addr) {
     return FLASH_BANK_1;
 }
 
+// get the page of a given flash address
+static uint32_t get_page(uint32_t addr) {
+    return (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
+}
+
 #elif (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32H5) || defined(STM32H7)
 
 // get the bank of a given flash address
@@ -195,7 +200,6 @@ static uint32_t get_bank(uint32_t addr) {
     }
 }
 
-#if (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE))
 // get the page of a given flash address
 static uint32_t get_page(uint32_t addr) {
     if (addr < (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) {
@@ -206,7 +210,6 @@ static uint32_t get_page(uint32_t addr) {
         return (addr - (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) / FLASH_LAYOUT_SECTOR_SIZE;
     }
 }
-#endif
 
 #elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB) || defined(STM32WL)
 
@@ -352,10 +355,7 @@ int flash_erase(uint32_t flash_dest) {
     EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
     #elif defined(STM32H5) || defined(STM32H7)
     EraseInitStruct.Banks = get_bank(flash_dest);
-    EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
-    #if defined(STM32H5)
-    EraseInitStruct.Sector &= 0x7f; // second bank should start counting at 0
-    #endif
+    EraseInitStruct.Sector = get_page(flash_dest);
     #else
     #error Unsupported processor
     #endif

From e456ee40e0df65ccda628ecce010c558bb44ca72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 16:41:07 +1100
Subject: [PATCH 0734/3129] samd/mpconfigport: Simplify and consolidate config
 options.

This is a no-op in terms of firmware functionality.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/mcu/samd21/mpconfigmcu.h | 40 ++++++++++++++++++----------
 ports/samd/mcu/samd51/mpconfigmcu.h | 15 -----------
 ports/samd/mpconfigport.h           | 41 ++++++-----------------------
 3 files changed, 34 insertions(+), 62 deletions(-)

diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 35e59a6706cdd..8e4071b649715 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -14,20 +14,32 @@
 #define MICROPY_EMIT_THUMB_ARMV7M       (0)
 #define MICROPY_MODULE_BUILTIN_INIT     (1)
 
-#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
-
-#ifndef MICROPY_PY_MATH
-#define MICROPY_PY_MATH                 (1)
-#define MP_NEED_LOG2                    (1)
-#endif
-
-#ifndef MICROPY_PY_BUILTINS_COMPLEX
-#define MICROPY_PY_BUILTINS_COMPLEX     (0)
-#endif
-
-#ifndef MICROPY_PY_CMATH
-#define MICROPY_PY_CMATH                (0)
-#endif
+// Selected extensions beyond the basic features set.
+#define MICROPY_ENABLE_FINALISER        (1)
+#define MICROPY_KBD_EXCEPTION           (1)
+#define MICROPY_HELPER_REPL             (1)
+#define MICROPY_REPL_AUTO_INDENT        (1)
+#define MICROPY_ENABLE_SOURCE_LINE      (1)
+#define MICROPY_STREAMS_NON_BLOCK       (1)
+#define MICROPY_PY_BUILTINS_HELP        (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
+#define MICROPY_ENABLE_SCHEDULER        (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX   (1)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW  (1)
+#define MICROPY_PY_BUILTINS_INPUT       (1)
+#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN   (1)
+#define MICROPY_PY_SYS_STDFILES         (1)
+#define MICROPY_PY_SYS_MAXSIZE          (1)
+#define MICROPY_PY_IO_IOBASE            (1)
+#define MICROPY_PY_OS                   (1)
+#define MICROPY_PY_JSON                 (1)
+#define MICROPY_PY_RE                   (1)
+#define MICROPY_PY_BINASCII             (1)
+#define MICROPY_PY_UCTYPES              (1)
+#define MICROPY_PY_HEAPQ                (1)
+#define MICROPY_PY_RANDOM               (1)
+#define MICROPY_PY_PLATFORM             (1)
 
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32(300))
 unsigned long trng_random_u32(int delay);
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index b8206558b4676..d567f28eb423a 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -10,21 +10,6 @@
 // Python internal features
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (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_OS_SYNC              (1)
 #define MICROPY_PY_OS_URANDOM           (1)
 #define MICROPY_PY_ONEWIRE              (1)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index a7a6e26629272..218e4bb96ab3d 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -40,25 +40,18 @@
 // MicroPython emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
 
-// Compiler configuration
-#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)
+#define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_FLOAT)
+#ifndef MICROPY_PY_BUILTINS_COMPLEX
+#define MICROPY_PY_BUILTINS_COMPLEX         (0)
+#endif
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       samd_help_text
-#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
 #define MICROPY_USE_INTERNAL_ERRNO          (1)
-#define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_STATIC_NODES      (1)
+
 #define MICROPY_HW_ENABLE_USBDEV            (1)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 
@@ -71,22 +64,9 @@
 #ifndef MICROPY_HW_USB_DESC_STR_MAX
 #define MICROPY_HW_USB_DESC_STR_MAX (32)
 #endif
-
 #endif
 
-// Control over Python builtins
-#define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
-#define MICROPY_PY_BUILTINS_INPUT           (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#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                       (1)
-#define MICROPY_PY_IO_IOBASE                (1)
 
 // Extended modules
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
@@ -97,16 +77,9 @@
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
-#define MICROPY_PY_OS                       (1)
 #define MICROPY_PY_OS_INCLUDEFILE           "ports/samd/modos.c"
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_VFS                         (1)
-#define MICROPY_PY_JSON                     (1)
-#define MICROPY_PY_RE                       (1)
-#define MICROPY_PY_BINASCII                 (1)
-#define MICROPY_PY_UCTYPES                  (1)
-#define MICROPY_PY_HEAPQ                    (1)
-#define MICROPY_PY_RANDOM                   (1)
 #ifndef MICROPY_PY_MACHINE_ADC
 #define MICROPY_PY_MACHINE_ADC              (1)
 #endif
@@ -148,7 +121,6 @@
 #define MICROPY_PY_MACHINE_WDT              (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/samd/machine_wdt.c"
 #define MICROPY_PY_MACHINE_WDT_TIMEOUT_MS   (1)
-#define MICROPY_PY_PLATFORM                 (1)
 #define MICROPY_PLATFORM_VERSION            "ASF4"
 
 #define MP_STATE_PORT MP_STATE_VM
@@ -188,5 +160,8 @@ 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>

From 2ed976f1406e33a266d25cb6505020c76746ecbc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jan 2024 16:54:33 +1100
Subject: [PATCH 0735/3129] samd/mcu/samd21: Enable MICROPY_STACK_CHECK on
 SAMD21.

Increases firmware size by +140 bytes and uses +4 extra bytes of RAM, but
allows the test suite to run without crashing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/mcu/samd21/mpconfigmcu.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 8e4071b649715..fdad3fee4a71b 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -16,6 +16,7 @@
 
 // Selected extensions beyond the basic features set.
 #define MICROPY_ENABLE_FINALISER        (1)
+#define MICROPY_STACK_CHECK             (1)
 #define MICROPY_KBD_EXCEPTION           (1)
 #define MICROPY_HELPER_REPL             (1)
 #define MICROPY_REPL_AUTO_INDENT        (1)

From ba4330ba102ac1d61e2e0e29ad2c2f361b9109c0 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 24 Aug 2023 13:11:42 +0200
Subject: [PATCH 0736/3129] tests/run-tests.py: Remove unneeded argument from
 run_feature_check().

In 405893af this was likely left as-is to minimize the diff,
but it just complicates things.

Signed-off-by: stijn <stijn@ignitron.net>
---
 tests/run-tests.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 32333857f1cb7..cae5708087fdc 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -360,7 +360,7 @@ def send_get(what):
     return output_mupy
 
 
-def run_feature_check(pyb, args, base_path, test_file):
+def run_feature_check(pyb, args, 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""
@@ -419,57 +419,57 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         # 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")
+        output = run_feature_check(pyb, args, "native_check.py")
         if output != b"native\n":
             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")
+        output = run_feature_check(pyb, args, "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")
+        output = run_feature_check(pyb, args, "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")
+        output = run_feature_check(pyb, args, "set_check.py")
         if output != b"{1}\n":
             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")
+        output = run_feature_check(pyb, args, "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")
+        output = run_feature_check(pyb, args, "async_check.py")
         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")
+        output = run_feature_check(pyb, args, "const.py")
         if output != b"1\n":
             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")
+        output = run_feature_check(pyb, args, "reverse_ops.py")
         if output == b"TypeError\n":
             skip_revops = True
 
         # Check if io module exists, and skip such tests if it doesn't
-        output = run_feature_check(pyb, args, base_path, "io_module.py")
+        output = run_feature_check(pyb, args, "io_module.py")
         if output != b"io\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")
+        output = run_feature_check(pyb, args, "fstring.py")
         if output != b"a=1\n":
             skip_fstring = True
 
         # Check if @micropython.asm_thumb supports Thumb2 instructions, and skip such tests if it doesn't
-        output = run_feature_check(pyb, args, base_path, "inlineasm_thumb2.py")
+        output = run_feature_check(pyb, args, "inlineasm_thumb2.py")
         if output != b"thumb2\n":
             skip_tests.add("inlineasm/asmbcc.py")
             skip_tests.add("inlineasm/asmbitops.py")
@@ -484,23 +484,23 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             skip_tests.add("inlineasm/asmspecialregs.py")
 
         # 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")
+        t = run_feature_check(pyb, args, "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")
+        t = run_feature_check(pyb, args, "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")
+        upy_byteorder = run_feature_check(pyb, args, "byteorder.py")
+        upy_float_precision = run_feature_check(pyb, args, "float.py")
         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"
+        has_complex = run_feature_check(pyb, args, "complex.py") == b"complex\n"
+        has_coverage = run_feature_check(pyb, args, "coverage.py") == b"coverage\n"
         cpy_byteorder = subprocess.check_output(
             CPYTHON3_CMD + [base_path("feature_check/byteorder.py")]
         )

From 88d21f186bc8ca9ef9728a36f5ca27731f2d86bc Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 24 Aug 2023 13:15:23 +0200
Subject: [PATCH 0737/3129] tests/run-tests.py: Make repl test detection more
 correct.

Avoid unrelated tests which happen to have "repl_" anywhere
in their path to be treated as repl tests.

Signed-off-by: stijn <stijn@ignitron.net>
---
 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 cae5708087fdc..8fe97be6cc8e8 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -205,7 +205,7 @@ def run_micropython(pyb, args, test_file, is_special=False):
 
             # run the test, possibly with redirected input
             try:
-                if "repl_" in test_file:
+                if os.path.basename(test_file).startswith("repl_"):
                     # Need to use a PTY to test command line editing
                     try:
                         import pty

From bd21820b4cc7d3c6c293b2fd104cb8214df686cd Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 24 Aug 2023 13:29:58 +0200
Subject: [PATCH 0738/3129] tests/run-tests.py: Fix path-based special test
 detection.

Compare the full absolute path instead of relying on the path form
passed by the user.

For instance, this will make

python3 run-tests.py -d basics
python3 run-tests.py -d ./basics
python3 run-tests.py -d ../tests/basics
python3 run-tests.py -d /full/path/to/basics

all behave the same by correctly treating the bytes_compare3 and
builtin_help tests as special, whereas previously only the first
invocation would do that and hence result in these tests to fail
when called with a different path form.

Signed-off-by: stijn <stijn@ignitron.net>
---
 tests/run-tests.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 8fe97be6cc8e8..4d4c2543b2f59 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -176,20 +176,25 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
     return had_crash, output_mupy
 
 
-def run_micropython(pyb, args, test_file, is_special=False):
-    special_tests = (
+special_tests = [
+    base_path(file)
+    for file in (
         "micropython/meminfo.py",
         "basics/bytes_compare3.py",
         "basics/builtin_help.py",
         "thread/thread_exc2.py",
         "esp32/partition_ota.py",
     )
+]
+
+
+def run_micropython(pyb, args, test_file, test_file_abspath, is_special=False):
     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
+            test_file_abspath.startswith((base_path("cmdline/"), base_path("feature_check/")))
+            or test_file_abspath in special_tests
         ):
             # special handling for tests of the unix cmdline program
             is_special = True
@@ -283,7 +288,7 @@ def send_get(what):
                 mpy_modname = os.path.splitext(os.path.basename(mpy_filename))[0]
                 cmdlist.extend(["-m", mpy_modname])
             else:
-                cmdlist.append(os.path.abspath(test_file))
+                cmdlist.append(test_file_abspath)
 
             # run the actual test
             try:
@@ -316,7 +321,7 @@ def send_get(what):
     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:
+    if is_special or test_file_abspath in special_tests:
         # convert parts of the output that are not stable across runs
         with open(test_file + ".exp", "rb") as f:
             lines_exp = []
@@ -364,7 +369,8 @@ def run_feature_check(pyb, args, 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)
+    test_file_path = base_path("feature_check", test_file)
+    return run_micropython(pyb, args, test_file_path, test_file_path, is_special=True)
 
 
 class ThreadSafeCounter:
@@ -673,6 +679,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
 
     def run_one_test(test_file):
         test_file = test_file.replace("\\", "/")
+        test_file_abspath = os.path.abspath(test_file).replace("\\", "/")
 
         if args.filters:
             # Default verdict is the opposit of the first action
@@ -733,7 +740,7 @@ def run_one_test(test_file):
             # run CPython to work out expected output
             try:
                 output_expected = subprocess.check_output(
-                    CPYTHON3_CMD + [os.path.abspath(test_file)],
+                    CPYTHON3_CMD + [test_file_abspath],
                     cwd=os.path.dirname(test_file),
                     stderr=subprocess.STDOUT,
                 )
@@ -750,7 +757,7 @@ def run_one_test(test_file):
             return
 
         # run MicroPython
-        output_mupy = run_micropython(pyb, args, test_file)
+        output_mupy = run_micropython(pyb, args, test_file, test_file_abspath)
 
         if output_mupy == b"SKIP\n":
             print("skip ", test_file)

From 07472d05db64a0990b4d47cb001d1a40ba78414f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 7 Jan 2024 17:53:53 +0100
Subject: [PATCH 0739/3129] rp2/machine_uart: Fix event wait in uart.flush()
 and uart.read().

Do not wait in the worst case up to the timeout.

Fixes issue #13377.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/rp2/machine_uart.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index d751b7af07a2e..bca07cebfcbf3 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -483,7 +483,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
                     return i;
                 }
             }
-            mp_event_wait_ms(timeout - elapsed);
+            mp_event_handle_nowait();
         }
         *dest++ = ringbuf_get(&(self->read_buffer));
         start = mp_hal_ticks_ms(); // Inter-character timeout
@@ -559,7 +559,7 @@ STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
             if (now >= timeout) {
                 break;
             }
-            mp_event_wait_ms((timeout - now) / 1000);
+            mp_event_handle_nowait();
         }
         *errcode = MP_ETIMEDOUT;
         ret = MP_STREAM_ERROR;

From c41b421d48a86ed1c1406123e7ee6d084e462afa Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 8 Jan 2024 09:25:33 +0100
Subject: [PATCH 0740/3129] tests/extmod/machine_uart_tx.py: Add a test for
 timing of UART.flush().

Currently only runs on rp2 but could be extended to run on other targets.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 tests/extmod/machine_uart_tx.py     | 34 +++++++++++++++++++++++++++++
 tests/extmod/machine_uart_tx.py.exp |  3 +++
 2 files changed, 37 insertions(+)
 create mode 100644 tests/extmod/machine_uart_tx.py
 create mode 100644 tests/extmod/machine_uart_tx.py.exp

diff --git a/tests/extmod/machine_uart_tx.py b/tests/extmod/machine_uart_tx.py
new file mode 100644
index 0000000000000..54c0af2b2314e
--- /dev/null
+++ b/tests/extmod/machine_uart_tx.py
@@ -0,0 +1,34 @@
+# Test machine.UART transmission.
+# Does not require any external connections.
+
+try:
+    from machine import UART
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import time, sys
+
+# Configure pins based on the target.
+if "rp2" in sys.platform:
+    uart_id = 0
+    tx_pin = "GPIO0"
+    rx_pin = "GPIO1"
+else:
+    print("SKIP")
+    raise SystemExit
+
+# Test that write+flush takes the expected amount of time to execute.
+for bits_per_s in (2400, 9600, 115200):
+    text = "Hello World"
+    uart = UART(uart_id, bits_per_s, bits=8, parity=None, stop=1, tx=tx_pin, rx=rx_pin)
+
+    start_us = time.ticks_us()
+    uart.write(text)
+    uart.flush()
+    duration_us = time.ticks_diff(time.ticks_us(), start_us)
+
+    # 1(startbit) + 8(bits) + 1(stopbit) + 0(parity)
+    bits_per_char = 10
+    expect_us = (len(text)) * bits_per_char * 1_000_000 // bits_per_s
+    print(bits_per_s, duration_us <= expect_us)
diff --git a/tests/extmod/machine_uart_tx.py.exp b/tests/extmod/machine_uart_tx.py.exp
new file mode 100644
index 0000000000000..0432ab94aee97
--- /dev/null
+++ b/tests/extmod/machine_uart_tx.py.exp
@@ -0,0 +1,3 @@
+2400 True
+9600 True
+115200 True

From f9df08d8ee29145b547d7bf37a7977aa465c437c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jan 2024 11:12:12 +1100
Subject: [PATCH 0741/3129] docs/develop/porting: Fix argument type of
 mp_lexer_new_from_file().

Follow up to 5015779a6f4a180233a78ec8b5fd1ea095057a91.

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

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 63919b97a6ccd..09e61d5d9bfe0 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -83,7 +83,7 @@ The basic MicroPython firmware is implemented in the main port file, e.g ``main.
    }
 
    // There is no filesystem so opening a file raises an exception.
-   mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+   mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
        mp_raise_OSError(MP_ENOENT);
    }
 

From a70367e293a2293918a3649dc8c6f875c39543cd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jan 2024 11:13:22 +1100
Subject: [PATCH 0742/3129] nrf/modules/os/microbitfs: Sweep the filesystem if
 any free chunk found.

If there are any free chunks found then it's better to sweep the filesystem
and use the available chunks, rather than error out with ENOSPC when there
is in fact a bit of space remaining.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/modules/os/microbitfs.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ports/nrf/modules/os/microbitfs.c b/ports/nrf/modules/os/microbitfs.c
index 5ffe837efea6e..bc007c161f340 100644
--- a/ports/nrf/modules/os/microbitfs.c
+++ b/ports/nrf/modules/os/microbitfs.c
@@ -80,10 +80,6 @@
 /** Must be such that sizeof(file_header) < DATA_PER_CHUNK */
 #define MAX_FILENAME_LENGTH 120
 
-//Minimum number of free chunks to justify sweeping.
-//If this is too low it may cause excessive wear
-#define MIN_CHUNKS_FOR_SWEEP (FLASH_PAGESIZE / CHUNK_SIZE)
-
 #define FILE_NOT_FOUND ((uint8_t)-1)
 
 /** Maximum number of chunks allowed in filesystem. 252 chunks is 31.5kB */
@@ -268,9 +264,9 @@ STATIC uint8_t microbit_find_file(const char *name, int name_len) {
 // Search the chunks:
 // 1  If an UNUSED chunk is found, then return that.
 // 2. If an entire page of FREED chunks is found, then erase the page and return the first chunk
-// 3. If the number of FREED chunks is >= MIN_CHUNKS_FOR_SWEEP, then
+// 3. If the number of FREED chunks is > 0, then
 // 3a. Sweep the filesystem and restart.
-// 3b. Fail and return FILE_NOT_FOUND
+// 3b. Otherwise, fail and return FILE_NOT_FOUND.
 //
 STATIC uint8_t find_chunk_and_erase(void) {
     // Start search at a random chunk to spread the wear more evenly.
@@ -311,7 +307,7 @@ STATIC uint8_t find_chunk_and_erase(void) {
         if (index == chunks_in_file_system+1) index = 1;
     } while (index != start_index);
     DEBUG(("FILE DEBUG: %lu free chunks\r\n", freed_chunks));
-    if (freed_chunks < MIN_CHUNKS_FOR_SWEEP) {
+    if (freed_chunks == 0) {
         return FILE_NOT_FOUND;
     }
     // No freed pages, so sweep file system.

From efa54c27b9eab3b61319e7f16d05db0ac3b6bc14 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jan 2024 11:36:27 +1100
Subject: [PATCH 0743/3129] rp2/mpconfigport: Allow MICROPY_PY_THREAD to be
 disabled by a board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h | 2 ++
 ports/rp2/mphalport.h    | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index ce89763d5ea58..8f073002e8632 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -89,9 +89,11 @@
 // Fine control over Python builtins, classes, modules, etc
 #define MICROPY_PY_BUILTINS_HELP_TEXT           rp2_help_text
 #define MICROPY_PY_SYS_PLATFORM                 "rp2"
+#ifndef MICROPY_PY_THREAD
 #define MICROPY_PY_THREAD                       (1)
 #define MICROPY_PY_THREAD_GIL                   (0)
 #define MICROPY_THREAD_YIELD()                  mp_handle_pending(true)
+#endif
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index c8e2301a92ea9..d2d74d783a628 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -37,8 +37,13 @@
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 // Entering a critical section.
+#if MICROPY_PY_THREAD
 #define MICROPY_BEGIN_ATOMIC_SECTION()     mp_thread_begin_atomic_section()
 #define MICROPY_END_ATOMIC_SECTION(state)  mp_thread_end_atomic_section(state)
+#else
+#define MICROPY_BEGIN_ATOMIC_SECTION()     save_and_disable_interrupts()
+#define MICROPY_END_ATOMIC_SECTION(state)  restore_interrupts(state)
+#endif
 
 #define MICROPY_PY_PENDSV_ENTER   pendsv_suspend()
 #define MICROPY_PY_PENDSV_EXIT    pendsv_resume()

From bdaea866b712c85d3bffaaae147c9b3470a4f896 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 12 Jan 2024 09:47:48 +1100
Subject: [PATCH 0744/3129] rp2/mpthreadport: Make result of thread.get_ident()
 a non-zero integer.

CPython says thread identifier is a "nonzero integer", so rp2 should use a
1-indexed core number rather than 0-indexed.  This fixes the
thread/thread_ident1 test failure on rp2 port.

Unfortunately this may be a breaking change for rp2 code which makes a
hard-coded comparison of thread identifier to 0 or 1.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mpthreadport.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index fd868329c38d5..977df80449b1e 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -115,9 +115,9 @@ STATIC void core1_entry_wrapper(void) {
 }
 
 mp_uint_t mp_thread_get_id(void) {
-    // On RP2, there are only two threads, one for each core, so the thread id
-    // is the core number.
-    return get_core_num();
+    // On RP2, there are only two threads, one for each core.
+    // _thread.get_ident() must be non-zero.
+    return get_core_num() + 1;
 }
 
 mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
@@ -149,7 +149,7 @@ mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size
     // Adjust stack_size to provide room to recover from hitting the limit.
     *stack_size -= 512;
 
-    return 1;
+    return 2; // mp_thread_get_id() result for core 1
 }
 
 void mp_thread_start(void) {

From 215a982c1469df214b2beda2db5ed8d562040738 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 14 Jan 2024 20:22:18 +0200
Subject: [PATCH 0745/3129] py/py.mk: Remove extra build dir created for
 frozen_content.

This was originally needed because the .c --> .o rule is:

    $(BUILD)/%.o: %.c

and because the generated frozen_content.c is inside build-FOO, it must
therefore generate build-FOO/build-FOO/frozen_content.o.

But 2eda5138701d6a7d36f8d8e3700d136b3c1161b7 added a new build rule for
pins.c that can also be used for frozen_content.c.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 py/py.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/py.mk b/py/py.mk
index ffb853c652db9..e81df52fb7f99 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -203,7 +203,7 @@ PY_O += $(PY_CORE_O)
 
 # object file for frozen code specified via a manifest
 ifneq ($(FROZEN_MANIFEST),)
-PY_O += $(BUILD)/$(BUILD)/frozen_content.o
+PY_O += $(BUILD)/frozen_content.o
 endif
 
 # Sources that may contain qstrings

From a75ca8a1c07d7da1d0f97189cbe3238f65dda2df Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 10 Jan 2024 14:11:00 +1100
Subject: [PATCH 0746/3129] esp32/modsocket: Use all supplied arguments to
 socket.getaddrinfo().

- Completes a longstanding TODO in the code, to not ignore
  the optional family, type, proto and flags arguments to
  socket.getaddrinfo().

- Note that passing family=socket.AF_INET6 will now cause queries
  to fail (OSError -202). Previously this argument was ignored so
  IPV4 results were returned instead.

- Optional 'type' argument is now always copied into the result. If not
  set, results have type SOCK_STREAM.

- Fixes inconsistency where previously querying mDNS local suffix (.local)
  hostnames returned results with socket type 0 (invalid), but all other
  queries returned results with socket type SOCK_STREAM (regardless of
  'type' argument).

- Optional proto argument is now returned in the result tuple, if supplied.

- Optional flags argument is now passed through to lwIP. lwIP has handling
  for AI_NUMERICHOST, AI_V4MAPPED, AI_PASSIVE (untested, constants for
  these are not currently exposed in the esp32 socket module).

- Also fixes a possible memory leak in an obscure code path
  (lwip_getaddrinfo apparently sometimes returns a result structure with
  address "0.0.0.0" instead of failing, and this structure would have been
  leaked.)

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/modsocket.c | 157 ++++++++++++++++++++++++----------------
 1 file changed, 95 insertions(+), 62 deletions(-)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index ca8c63030cd74..af949401569cd 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -156,64 +156,67 @@ static inline void check_for_exceptions(void) {
     mp_handle_pending(true);
 }
 
-// This function mimics lwip_getaddrinfo, with added support for mDNS queries
-static int _socket_getaddrinfo3(const char *nodename, const char *servname,
+#if MICROPY_HW_ENABLE_MDNS_QUERIES
+// This function mimics lwip_getaddrinfo, but makes an mDNS query
+STATIC int mdns_getaddrinfo(const char *host_str, const char *port_str,
     const struct addrinfo *hints, struct addrinfo **res) {
-
-    #if MICROPY_HW_ENABLE_MDNS_QUERIES
-    int nodename_len = strlen(nodename);
+    int host_len = strlen(host_str);
     const int local_len = sizeof(MDNS_LOCAL_SUFFIX) - 1;
-    if (nodename_len > local_len
-        && strcasecmp(nodename + nodename_len - local_len, MDNS_LOCAL_SUFFIX) == 0) {
-        // mDNS query
-        char nodename_no_local[nodename_len - local_len + 1];
-        memcpy(nodename_no_local, nodename, nodename_len - local_len);
-        nodename_no_local[nodename_len - local_len] = '\0';
-
-        esp_ip4_addr_t addr = {0};
-
-        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) {
-                *res = NULL;
-                return 0;
-            }
+    if (host_len <= local_len ||
+        strcasecmp(host_str + host_len - local_len, MDNS_LOCAL_SUFFIX) != 0) {
+        return 0;
+    }
+
+    // mDNS query
+    char host_no_local[host_len - local_len + 1];
+    memcpy(host_no_local, host_str, host_len - local_len);
+    host_no_local[host_len - local_len] = '\0';
+
+    esp_ip4_addr_t addr = {0};
+
+    esp_err_t err = mdns_query_a(host_no_local, MDNS_QUERY_TIMEOUT_MS, &addr);
+    if (err != ESP_OK) {
+        if (err == ESP_ERR_NOT_FOUND) {
             *res = NULL;
-            return err;
+            return 0;
         }
+        *res = NULL;
+        return err;
+    }
 
-        struct addrinfo *ai = memp_malloc(MEMP_NETDB);
-        if (ai == NULL) {
-            *res = NULL;
-            return EAI_MEMORY;
-        }
-        memset(ai, 0, sizeof(struct addrinfo) + sizeof(struct sockaddr_storage));
-
-        struct sockaddr_in *sa = (struct sockaddr_in *)((uint8_t *)ai + sizeof(struct addrinfo));
-        inet_addr_from_ip4addr(&sa->sin_addr, &addr);
-        sa->sin_family = AF_INET;
-        sa->sin_len = sizeof(struct sockaddr_in);
-        sa->sin_port = lwip_htons((u16_t)atoi(servname));
-        ai->ai_family = AF_INET;
-        ai->ai_canonname = ((char *)sa + sizeof(struct sockaddr_storage));
-        memcpy(ai->ai_canonname, nodename, nodename_len + 1);
-        ai->ai_addrlen = sizeof(struct sockaddr_storage);
-        ai->ai_addr = (struct sockaddr *)sa;
-
-        *res = ai;
-        return 0;
+    struct addrinfo *ai = memp_malloc(MEMP_NETDB);
+    if (ai == NULL) {
+        *res = NULL;
+        return EAI_MEMORY;
+    }
+    memset(ai, 0, sizeof(struct addrinfo) + sizeof(struct sockaddr_storage));
+
+    struct sockaddr_in *sa = (struct sockaddr_in *)((uint8_t *)ai + sizeof(struct addrinfo));
+    inet_addr_from_ip4addr(&sa->sin_addr, &addr);
+    sa->sin_family = AF_INET;
+    sa->sin_len = sizeof(struct sockaddr_in);
+    sa->sin_port = lwip_htons((u16_t)atoi(port_str));
+    ai->ai_family = AF_INET;
+    ai->ai_canonname = ((char *)sa + sizeof(struct sockaddr_storage));
+    memcpy(ai->ai_canonname, host_str, host_len + 1);
+    ai->ai_addrlen = sizeof(struct sockaddr_storage);
+    ai->ai_addr = (struct sockaddr *)sa;
+    ai->ai_socktype = SOCK_STREAM;
+    if (hints) {
+        ai->ai_socktype = hints->ai_socktype;
+        ai->ai_protocol = hints->ai_protocol;
     }
-    #endif
 
-    // Normal query
-    return lwip_getaddrinfo(nodename, servname, hints, res);
+    *res = ai;
+    return 0;
 }
+#endif // MICROPY_HW_ENABLE_MDNS_QUERIES
 
-static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t portx, struct addrinfo **resp) {
-    const struct addrinfo hints = {
-        .ai_family = AF_INET,
-        .ai_socktype = SOCK_STREAM,
-    };
+static void _getaddrinfo_inner(const mp_obj_t host, const mp_obj_t portx,
+    const struct addrinfo *hints, struct addrinfo **res) {
+    int retval = 0;
+
+    *res = NULL;
 
     mp_obj_t port = portx;
     if (mp_obj_is_integer(port)) {
@@ -231,27 +234,37 @@ static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t portx, struc
     }
 
     MP_THREAD_GIL_EXIT();
-    int res = _socket_getaddrinfo3(host_str, port_str, &hints, resp);
+
+    #if MICROPY_HW_ENABLE_MDNS_QUERIES
+    retval = mdns_getaddrinfo(host_str, port_str, hints, res);
+    #endif
+
+    if (retval == 0 && *res == NULL) {
+        // Normal query
+        retval = lwip_getaddrinfo(host_str, port_str, hints, res);
+    }
+
     MP_THREAD_GIL_ENTER();
 
     // Per docs: instead of raising gaierror getaddrinfo raises negative error number
-    if (res != 0) {
-        mp_raise_OSError(res > 0 ? -res : res);
+    if (retval != 0) {
+        mp_raise_OSError(retval > 0 ? -retval : retval);
     }
     // Somehow LwIP returns a resolution of 0.0.0.0 for failed lookups, traced it as far back
     // as netconn_gethostbyname_addrtype returning OK instead of error.
-    if (*resp == NULL ||
-        (strcmp(resp[0]->ai_canonname, "0.0.0.0") == 0 && strcmp(host_str, "0.0.0.0") != 0)) {
+    if (*res == NULL ||
+        (strcmp(res[0]->ai_canonname, "0.0.0.0") == 0 && strcmp(host_str, "0.0.0.0") != 0)) {
+        lwip_freeaddrinfo(*res);
         mp_raise_OSError(-2); // name or service not known
     }
 
-    return res;
+    assert(retval == 0 && *res != NULL);
 }
 
 STATIC void _socket_getaddrinfo(const mp_obj_t addrtuple, struct addrinfo **resp) {
     mp_obj_t *elem;
     mp_obj_get_array_fixed_n(addrtuple, 2, &elem);
-    _socket_getaddrinfo2(elem[0], elem[1], resp);
+    _getaddrinfo_inner(elem[0], elem[1], NULL, resp);
 }
 
 STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -897,10 +910,32 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
-    // TODO support additional args beyond the first two
-
+    struct addrinfo hints = { };
     struct addrinfo *res = NULL;
-    _socket_getaddrinfo2(args[0], args[1], &res);
+
+    // Optional args: family=0, type=0, proto=0, flags=0, where 0 is "least narrow"
+    if (n_args > 2) {
+        hints.ai_family = mp_obj_get_int(args[2]);
+    }
+    if (n_args > 3) {
+        hints.ai_socktype = mp_obj_get_int(args[3]);
+    }
+    if (hints.ai_socktype == 0) {
+        // This is slightly different to CPython with POSIX getaddrinfo. In
+        // CPython, calling socket.getaddrinfo() with socktype=0 returns any/all
+        // supported SocketKind values. Here, lwip_getaddrinfo() will echo
+        // whatever socktype was supplied to the caller. Rather than returning 0
+        // (invalid in a result), make it SOCK_STREAM.
+        hints.ai_socktype = SOCK_STREAM;
+    }
+    if (n_args > 4) {
+        hints.ai_protocol = mp_obj_get_int(args[4]);
+    }
+    if (n_args > 5) {
+        hints.ai_flags = mp_obj_get_int(args[5]);
+    }
+
+    _getaddrinfo_inner(args[0], args[1], &hints, &res);
     mp_obj_t ret_list = mp_obj_new_list(0, NULL);
 
     for (struct addrinfo *resi = res; resi; resi = resi->ai_next) {
@@ -927,9 +962,7 @@ STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
         mp_obj_list_append(ret_list, mp_obj_new_tuple(5, addrinfo_objs));
     }
 
-    if (res) {
-        lwip_freeaddrinfo(res);
-    }
+    lwip_freeaddrinfo(res);
     return ret_list;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_socket_getaddrinfo_obj, 2, 6, esp_socket_getaddrinfo);

From 1f04808151cf0b99eefe5dff036fac0ad76356c0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 12 Jan 2024 14:17:44 +0200
Subject: [PATCH 0747/3129] renesas-ra/ra: Fix SysTick clock source.

The SysTick_Config function must use the system/CPU clock to configure the
ticks.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/ra/ra_config.h | 1 +
 ports/renesas-ra/ra/ra_init.c   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/renesas-ra/ra/ra_config.h b/ports/renesas-ra/ra/ra_config.h
index a2df775c8902b..a9d4bb803d29c 100644
--- a/ports/renesas-ra/ra/ra_config.h
+++ b/ports/renesas-ra/ra/ra_config.h
@@ -26,6 +26,7 @@
 #define RA_RA_CONFIG_H_
 
 #include <stdint.h>
+#include "py/mpconfig.h"
 
 #if defined(RA4M1) | defined(RA4W1)
 #define SCI_CH_MAX      10
diff --git a/ports/renesas-ra/ra/ra_init.c b/ports/renesas-ra/ra/ra_init.c
index c9b78e0dd17fc..a784aec707ac8 100644
--- a/ports/renesas-ra/ra/ra_init.c
+++ b/ports/renesas-ra/ra/ra_init.c
@@ -30,7 +30,7 @@
 
 void ra_init(void) {
     ra_int_init();
-    SysTick_Config(PCLK / 1000);
+    SysTick_Config(MICROPY_HW_MCU_SYSCLK / 1000);
     internal_flash_init();
 }
 

From c6f6f345e6f9e92b4876c6b70ad200e6c814f4df Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 12 Jan 2024 14:17:44 +0200
Subject: [PATCH 0748/3129] renesas-ra/ra: Remove unnecessary min_delay()
 declaration.

This function is private to ra_adc.c.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/ra/ra_timer.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/renesas-ra/ra/ra_timer.h b/ports/renesas-ra/ra/ra_timer.h
index a04ecd709b074..85eabe3e12b1d 100644
--- a/ports/renesas-ra/ra/ra_timer.h
+++ b/ports/renesas-ra/ra/ra_timer.h
@@ -34,8 +34,6 @@ uint32_t HAL_GetTick(void);
 #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);

From 16c6bc47cf2b9247418bca8c0d1361167d08594e Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Thu, 11 Jan 2024 16:21:15 +0100
Subject: [PATCH 0749/3129] tools/mpremote: Reduce dependency on
 importlib_metadata.

No longer require importlib_metadata on new Python versions as it is
included in the standard distribution.

Signed-off-by: Jochen Sprickerhof <git@jochen.sprickerhof.de>
---
 tools/mpremote/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/requirements.txt b/tools/mpremote/requirements.txt
index e4ca98fcaa233..6209cde5c331d 100644
--- a/tools/mpremote/requirements.txt
+++ b/tools/mpremote/requirements.txt
@@ -1,2 +1,2 @@
 pyserial >= 3.3
-importlib_metadata >= 1.4
+importlib_metadata >= 1.4; python_version < "3.8"

From 490e8e01d577247798d10fbe63860b914b9ae135 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Fri, 19 Jan 2024 22:56:08 -0800
Subject: [PATCH 0750/3129] extmod/extmod.mk: Disable uninitialized warnings in
 kf_rem_pio2.c.

GCC 13.2 thinks that fq is uninitialized.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 extmod/extmod.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 9b1e51718e41d..59e530d3476b0 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -107,6 +107,9 @@ SRC_LIB_LIBM_C += $(addprefix lib/libm/,\
 SRC_LIB_LIBM_SQRT_SW_C += lib/libm/ef_sqrt.c
 SRC_LIB_LIBM_SQRT_HW_C += lib/libm/thumb_vfp_sqrtf.c
 
+# Disable warnings in libm.
+$(BUILD)/lib/libm/kf_rem_pio2.o: CFLAGS += -Wno-maybe-uninitialized
+
 # Double-precision math library.
 SRC_LIB_LIBM_DBL_C += $(addprefix lib/libm_dbl/,\
 	__cos.c \

From 4fd7e456f0b850566f6e99ad1785a15e2a117636 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 17 Jan 2024 12:05:57 +0200
Subject: [PATCH 0751/3129] renesas-ra/boards/ARDUINO_PORTENTA_C33: Fix the RTC
 clock source.

Switch the RTC clock source to Sub-clock (XCIN). This board has an
accurate LSE crystal, and it should be used for the RTC clock
source.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
index 52346dedc44ee..f28deb0cebcaf 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h
@@ -28,7 +28,7 @@
 // peripheral config
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
-#define MICROPY_HW_RTC_SOURCE       (1)
+#define MICROPY_HW_RTC_SOURCE       (0)
 #define MICROPY_HW_ENABLE_ADC       (1)
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_USBDEV    (1)

From f93ffc2875c57ce3b8a608ebf5ae9050aa62f069 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 19:06:41 +0000
Subject: [PATCH 0752/3129] github/workflows: Bump actions/cache from 3 to 4.

Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ports_esp32.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 6872b9d12de78..45808b659add7 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Cached ESP-IDF install
       id: cache_esp_idf
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ./esp-idf/

From 7bbcee3cf09a08199b3ffefb6c5e37208cba5f0a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jan 2024 16:32:31 +1100
Subject: [PATCH 0753/3129] tests: Move port-specific test directories into
 tests/ports/ directory.

To keep them all together, mirroring the top-level directory structure.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/{wipy => ports/cc3200}/adc.py                 |  0
 tests/{wipy => ports/cc3200}/adc.py.exp             |  0
 tests/{wipy => ports/cc3200}/i2c.py                 |  0
 tests/{wipy => ports/cc3200}/i2c.py.exp             |  0
 tests/{wipy => ports/cc3200}/modwipy.py             |  0
 tests/{wipy => ports/cc3200}/modwipy.py.exp         |  0
 tests/{wipy => ports/cc3200}/os.py                  |  0
 tests/{wipy => ports/cc3200}/os.py.exp              |  0
 tests/{wipy => ports/cc3200}/pin.py                 |  0
 tests/{wipy => ports/cc3200}/pin.py.exp             |  0
 tests/{wipy => ports/cc3200}/pin_irq.py             |  0
 tests/{wipy => ports/cc3200}/pin_irq.py.exp         |  0
 tests/{wipy => ports/cc3200}/reset/reset.py         |  0
 tests/{wipy => ports/cc3200}/reset/reset.py.exp     |  0
 tests/{wipy => ports/cc3200}/rtc.py                 |  0
 tests/{wipy => ports/cc3200}/rtc.py.exp             |  0
 tests/{wipy => ports/cc3200}/sd.py                  |  0
 tests/{wipy => ports/cc3200}/sd.py.exp              |  0
 tests/{wipy => ports/cc3200}/skipped/rtc_irq.py     |  0
 tests/{wipy => ports/cc3200}/skipped/rtc_irq.py.exp |  0
 tests/{wipy => ports/cc3200}/spi.py                 |  0
 tests/{wipy => ports/cc3200}/spi.py.exp             |  0
 tests/{wipy => ports/cc3200}/time.py                |  0
 tests/{wipy => ports/cc3200}/time.py.exp            |  0
 tests/{wipy => ports/cc3200}/timer.py               |  0
 tests/{wipy => ports/cc3200}/timer.py.exp           |  0
 tests/{wipy => ports/cc3200}/uart.py                |  0
 tests/{wipy => ports/cc3200}/uart.py.exp            |  0
 tests/{wipy => ports/cc3200}/uart_irq.py            |  0
 tests/{wipy => ports/cc3200}/uart_irq.py.exp        |  0
 tests/{wipy => ports/cc3200}/wdt.py                 |  0
 tests/{wipy => ports/cc3200}/wdt.py.exp             |  0
 tests/{wipy => ports/cc3200}/wlan/machine.py        |  0
 tests/{wipy => ports/cc3200}/wlan/machine.py.exp    |  0
 tests/{wipy => ports/cc3200}/wlan/server.py         |  0
 tests/{wipy => ports/cc3200}/wlan/server.py.exp     |  0
 tests/{wipy => ports/cc3200}/wlan/wlan.py           |  0
 tests/{wipy => ports/cc3200}/wlan/wlan.py.exp       |  0
 tests/{ => ports}/esp32/check_err_str.py            |  0
 tests/{ => ports}/esp32/check_err_str.py.exp        |  0
 tests/{ => ports}/esp32/esp32_idf_heap_info.py      |  0
 tests/{ => ports}/esp32/esp32_idf_heap_info.py.exp  |  0
 tests/{ => ports}/esp32/esp32_nvs.py                |  0
 tests/{ => ports}/esp32/esp32_nvs.py.exp            |  0
 tests/{ => ports}/esp32/partition_ota.py            |  0
 tests/{ => ports}/esp32/partition_ota.py.exp        |  0
 tests/{ => ports}/esp32/resolve_on_connect.py       |  0
 tests/{ => ports}/qemu-arm/asm_test.py              |  0
 tests/{ => ports}/qemu-arm/asm_test.py.exp          |  0
 tests/{ => ports}/qemu-arm/native_test.py           |  0
 tests/{ => ports}/qemu-arm/native_test.py.exp       |  0
 tests/{ => ports}/qemu-arm/viper_test.py            |  0
 tests/{ => ports}/qemu-arm/viper_test.py.exp        |  0
 tests/{ => ports}/renesas-ra/freq.py                |  0
 tests/{ => ports}/renesas-ra/freq.py.exp            |  0
 tests/{ => ports}/renesas-ra/i2c.py                 |  0
 tests/{ => ports}/renesas-ra/i2c.py.exp             |  0
 tests/{pyb => ports/renesas-ra}/modtime.py          |  0
 tests/{pyb => ports/renesas-ra}/modtime.py.exp      |  0
 tests/{ => ports}/renesas-ra/pin.py                 |  0
 tests/{ => ports}/renesas-ra/pin.py.exp             |  0
 tests/{ => ports}/renesas-ra/rtc_init.py            |  0
 tests/{ => ports}/renesas-ra/rtc_init.py.exp        |  0
 tests/{ => ports}/renesas-ra/spi.py                 |  0
 tests/{ => ports}/renesas-ra/spi.py.exp             |  0
 tests/{ => ports}/renesas-ra/uart1.py               |  0
 tests/{ => ports}/renesas-ra/uart1.py.exp           |  0
 tests/{pyb => ports/stm32}/accel.py                 |  0
 tests/{pyb => ports/stm32}/accel.py.exp             |  0
 tests/{pyb => ports/stm32}/adc.py                   |  0
 tests/{pyb => ports/stm32}/adc.py.exp               |  0
 tests/{pyb => ports/stm32}/adcall.py                |  0
 tests/{pyb => ports/stm32}/adcall.py.exp            |  0
 tests/{pyb => ports/stm32}/board_pybv1x.py          |  0
 tests/{pyb => ports/stm32}/board_pybv1x.py.exp      |  0
 tests/{pyb => ports/stm32}/can.py                   |  0
 tests/{pyb => ports/stm32}/can.py.exp               |  0
 tests/{pyb => ports/stm32}/can2.py                  |  0
 tests/{pyb => ports/stm32}/can2.py.exp              |  0
 tests/{pyb => ports/stm32}/dac.py                   |  0
 tests/{pyb => ports/stm32}/dac.py.exp               |  0
 tests/{pyb => ports/stm32}/extint.py                |  0
 tests/{pyb => ports/stm32}/extint.py.exp            |  0
 tests/{pyb => ports/stm32}/i2c.py                   |  0
 tests/{pyb => ports/stm32}/i2c.py.exp               |  0
 tests/{pyb => ports/stm32}/i2c_accel.py             |  0
 tests/{pyb => ports/stm32}/i2c_accel.py.exp         |  0
 tests/{pyb => ports/stm32}/i2c_error.py             |  0
 tests/{pyb => ports/stm32}/i2c_error.py.exp         |  0
 tests/{pyb => ports/stm32}/irq.py                   |  0
 tests/{pyb => ports/stm32}/irq.py.exp               |  0
 tests/{pyb => ports/stm32}/led.py                   |  0
 tests/{pyb => ports/stm32}/led.py.exp               |  0
 tests/{pyb => ports/stm32}/modstm.py                |  0
 tests/{pyb => ports/stm32}/modstm.py.exp            |  0
 tests/{renesas-ra => ports/stm32}/modtime.py        |  0
 tests/{renesas-ra => ports/stm32}/modtime.py.exp    |  0
 tests/{pyb => ports/stm32}/pin.py                   |  0
 tests/{pyb => ports/stm32}/pin.py.exp               |  0
 tests/{pyb => ports/stm32}/pyb1.py                  |  0
 tests/{pyb => ports/stm32}/pyb1.py.exp              |  0
 tests/{pyb => ports/stm32}/pyb_f405.py              |  0
 tests/{pyb => ports/stm32}/pyb_f405.py.exp          |  0
 tests/{pyb => ports/stm32}/pyb_f411.py              |  0
 tests/{pyb => ports/stm32}/pyb_f411.py.exp          |  0
 tests/{pyb => ports/stm32}/rtc.py                   |  0
 tests/{pyb => ports/stm32}/rtc.py.exp               |  0
 tests/{pyb => ports/stm32}/servo.py                 |  0
 tests/{pyb => ports/stm32}/servo.py.exp             |  0
 tests/{pyb => ports/stm32}/spi.py                   |  0
 tests/{pyb => ports/stm32}/spi.py.exp               |  0
 tests/{pyb => ports/stm32}/switch.py                |  0
 tests/{pyb => ports/stm32}/switch.py.exp            |  0
 tests/{pyb => ports/stm32}/timer.py                 |  0
 tests/{pyb => ports/stm32}/timer.py.exp             |  0
 tests/{pyb => ports/stm32}/timer_callback.py        |  0
 tests/{pyb => ports/stm32}/timer_callback.py.exp    |  0
 tests/{pyb => ports/stm32}/uart.py                  |  0
 tests/{pyb => ports/stm32}/uart.py.exp              |  0
 tests/{ => ports}/unix/extra_coverage.py            |  0
 tests/{ => ports}/unix/extra_coverage.py.exp        |  0
 tests/{ => ports}/unix/ffi_callback.py              |  0
 tests/{ => ports}/unix/ffi_callback.py.exp          |  0
 tests/{ => ports}/unix/ffi_float.py                 |  0
 tests/{ => ports}/unix/ffi_float.py.exp             |  0
 tests/{ => ports}/unix/ffi_float2.py                |  0
 tests/{ => ports}/unix/ffi_float2.py.exp            |  0
 tests/{ => ports}/unix/ffi_lib.c                    |  0
 tests/{ => ports}/unix/ffi_types.py                 |  0
 tests/{ => ports}/unix/ffi_types.py.exp             |  0
 tests/{ => ports}/unix/mod_os.py                    |  0
 tests/{ => ports}/unix/mod_os.py.exp                |  0
 tests/{ => ports}/unix/time_mktime_localtime.py     |  0
 tests/run-tests.py                                  | 12 ++++++------
 tools/ci.sh                                         |  2 +-
 135 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/{wipy => ports/cc3200}/adc.py (100%)
 rename tests/{wipy => ports/cc3200}/adc.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/i2c.py (100%)
 rename tests/{wipy => ports/cc3200}/i2c.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/modwipy.py (100%)
 rename tests/{wipy => ports/cc3200}/modwipy.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/os.py (100%)
 rename tests/{wipy => ports/cc3200}/os.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/pin.py (100%)
 rename tests/{wipy => ports/cc3200}/pin.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/pin_irq.py (100%)
 rename tests/{wipy => ports/cc3200}/pin_irq.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/reset/reset.py (100%)
 rename tests/{wipy => ports/cc3200}/reset/reset.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/rtc.py (100%)
 rename tests/{wipy => ports/cc3200}/rtc.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/sd.py (100%)
 rename tests/{wipy => ports/cc3200}/sd.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/skipped/rtc_irq.py (100%)
 rename tests/{wipy => ports/cc3200}/skipped/rtc_irq.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/spi.py (100%)
 rename tests/{wipy => ports/cc3200}/spi.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/time.py (100%)
 rename tests/{wipy => ports/cc3200}/time.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/timer.py (100%)
 rename tests/{wipy => ports/cc3200}/timer.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/uart.py (100%)
 rename tests/{wipy => ports/cc3200}/uart.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/uart_irq.py (100%)
 rename tests/{wipy => ports/cc3200}/uart_irq.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/wdt.py (100%)
 rename tests/{wipy => ports/cc3200}/wdt.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/wlan/machine.py (100%)
 rename tests/{wipy => ports/cc3200}/wlan/machine.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/wlan/server.py (100%)
 rename tests/{wipy => ports/cc3200}/wlan/server.py.exp (100%)
 rename tests/{wipy => ports/cc3200}/wlan/wlan.py (100%)
 rename tests/{wipy => ports/cc3200}/wlan/wlan.py.exp (100%)
 rename tests/{ => ports}/esp32/check_err_str.py (100%)
 rename tests/{ => ports}/esp32/check_err_str.py.exp (100%)
 rename tests/{ => ports}/esp32/esp32_idf_heap_info.py (100%)
 rename tests/{ => ports}/esp32/esp32_idf_heap_info.py.exp (100%)
 rename tests/{ => ports}/esp32/esp32_nvs.py (100%)
 rename tests/{ => ports}/esp32/esp32_nvs.py.exp (100%)
 rename tests/{ => ports}/esp32/partition_ota.py (100%)
 rename tests/{ => ports}/esp32/partition_ota.py.exp (100%)
 rename tests/{ => ports}/esp32/resolve_on_connect.py (100%)
 rename tests/{ => ports}/qemu-arm/asm_test.py (100%)
 rename tests/{ => ports}/qemu-arm/asm_test.py.exp (100%)
 rename tests/{ => ports}/qemu-arm/native_test.py (100%)
 rename tests/{ => ports}/qemu-arm/native_test.py.exp (100%)
 rename tests/{ => ports}/qemu-arm/viper_test.py (100%)
 rename tests/{ => ports}/qemu-arm/viper_test.py.exp (100%)
 rename tests/{ => ports}/renesas-ra/freq.py (100%)
 rename tests/{ => ports}/renesas-ra/freq.py.exp (100%)
 rename tests/{ => ports}/renesas-ra/i2c.py (100%)
 rename tests/{ => ports}/renesas-ra/i2c.py.exp (100%)
 rename tests/{pyb => ports/renesas-ra}/modtime.py (100%)
 rename tests/{pyb => ports/renesas-ra}/modtime.py.exp (100%)
 rename tests/{ => ports}/renesas-ra/pin.py (100%)
 rename tests/{ => ports}/renesas-ra/pin.py.exp (100%)
 rename tests/{ => ports}/renesas-ra/rtc_init.py (100%)
 rename tests/{ => ports}/renesas-ra/rtc_init.py.exp (100%)
 rename tests/{ => ports}/renesas-ra/spi.py (100%)
 rename tests/{ => ports}/renesas-ra/spi.py.exp (100%)
 rename tests/{ => ports}/renesas-ra/uart1.py (100%)
 rename tests/{ => ports}/renesas-ra/uart1.py.exp (100%)
 rename tests/{pyb => ports/stm32}/accel.py (100%)
 rename tests/{pyb => ports/stm32}/accel.py.exp (100%)
 rename tests/{pyb => ports/stm32}/adc.py (100%)
 rename tests/{pyb => ports/stm32}/adc.py.exp (100%)
 rename tests/{pyb => ports/stm32}/adcall.py (100%)
 rename tests/{pyb => ports/stm32}/adcall.py.exp (100%)
 rename tests/{pyb => ports/stm32}/board_pybv1x.py (100%)
 rename tests/{pyb => ports/stm32}/board_pybv1x.py.exp (100%)
 rename tests/{pyb => ports/stm32}/can.py (100%)
 rename tests/{pyb => ports/stm32}/can.py.exp (100%)
 rename tests/{pyb => ports/stm32}/can2.py (100%)
 rename tests/{pyb => ports/stm32}/can2.py.exp (100%)
 rename tests/{pyb => ports/stm32}/dac.py (100%)
 rename tests/{pyb => ports/stm32}/dac.py.exp (100%)
 rename tests/{pyb => ports/stm32}/extint.py (100%)
 rename tests/{pyb => ports/stm32}/extint.py.exp (100%)
 rename tests/{pyb => ports/stm32}/i2c.py (100%)
 rename tests/{pyb => ports/stm32}/i2c.py.exp (100%)
 rename tests/{pyb => ports/stm32}/i2c_accel.py (100%)
 rename tests/{pyb => ports/stm32}/i2c_accel.py.exp (100%)
 rename tests/{pyb => ports/stm32}/i2c_error.py (100%)
 rename tests/{pyb => ports/stm32}/i2c_error.py.exp (100%)
 rename tests/{pyb => ports/stm32}/irq.py (100%)
 rename tests/{pyb => ports/stm32}/irq.py.exp (100%)
 rename tests/{pyb => ports/stm32}/led.py (100%)
 rename tests/{pyb => ports/stm32}/led.py.exp (100%)
 rename tests/{pyb => ports/stm32}/modstm.py (100%)
 rename tests/{pyb => ports/stm32}/modstm.py.exp (100%)
 rename tests/{renesas-ra => ports/stm32}/modtime.py (100%)
 rename tests/{renesas-ra => ports/stm32}/modtime.py.exp (100%)
 rename tests/{pyb => ports/stm32}/pin.py (100%)
 rename tests/{pyb => ports/stm32}/pin.py.exp (100%)
 rename tests/{pyb => ports/stm32}/pyb1.py (100%)
 rename tests/{pyb => ports/stm32}/pyb1.py.exp (100%)
 rename tests/{pyb => ports/stm32}/pyb_f405.py (100%)
 rename tests/{pyb => ports/stm32}/pyb_f405.py.exp (100%)
 rename tests/{pyb => ports/stm32}/pyb_f411.py (100%)
 rename tests/{pyb => ports/stm32}/pyb_f411.py.exp (100%)
 rename tests/{pyb => ports/stm32}/rtc.py (100%)
 rename tests/{pyb => ports/stm32}/rtc.py.exp (100%)
 rename tests/{pyb => ports/stm32}/servo.py (100%)
 rename tests/{pyb => ports/stm32}/servo.py.exp (100%)
 rename tests/{pyb => ports/stm32}/spi.py (100%)
 rename tests/{pyb => ports/stm32}/spi.py.exp (100%)
 rename tests/{pyb => ports/stm32}/switch.py (100%)
 rename tests/{pyb => ports/stm32}/switch.py.exp (100%)
 rename tests/{pyb => ports/stm32}/timer.py (100%)
 rename tests/{pyb => ports/stm32}/timer.py.exp (100%)
 rename tests/{pyb => ports/stm32}/timer_callback.py (100%)
 rename tests/{pyb => ports/stm32}/timer_callback.py.exp (100%)
 rename tests/{pyb => ports/stm32}/uart.py (100%)
 rename tests/{pyb => ports/stm32}/uart.py.exp (100%)
 rename tests/{ => ports}/unix/extra_coverage.py (100%)
 rename tests/{ => ports}/unix/extra_coverage.py.exp (100%)
 rename tests/{ => ports}/unix/ffi_callback.py (100%)
 rename tests/{ => ports}/unix/ffi_callback.py.exp (100%)
 rename tests/{ => ports}/unix/ffi_float.py (100%)
 rename tests/{ => ports}/unix/ffi_float.py.exp (100%)
 rename tests/{ => ports}/unix/ffi_float2.py (100%)
 rename tests/{ => ports}/unix/ffi_float2.py.exp (100%)
 rename tests/{ => ports}/unix/ffi_lib.c (100%)
 rename tests/{ => ports}/unix/ffi_types.py (100%)
 rename tests/{ => ports}/unix/ffi_types.py.exp (100%)
 rename tests/{ => ports}/unix/mod_os.py (100%)
 rename tests/{ => ports}/unix/mod_os.py.exp (100%)
 rename tests/{ => ports}/unix/time_mktime_localtime.py (100%)

diff --git a/tests/wipy/adc.py b/tests/ports/cc3200/adc.py
similarity index 100%
rename from tests/wipy/adc.py
rename to tests/ports/cc3200/adc.py
diff --git a/tests/wipy/adc.py.exp b/tests/ports/cc3200/adc.py.exp
similarity index 100%
rename from tests/wipy/adc.py.exp
rename to tests/ports/cc3200/adc.py.exp
diff --git a/tests/wipy/i2c.py b/tests/ports/cc3200/i2c.py
similarity index 100%
rename from tests/wipy/i2c.py
rename to tests/ports/cc3200/i2c.py
diff --git a/tests/wipy/i2c.py.exp b/tests/ports/cc3200/i2c.py.exp
similarity index 100%
rename from tests/wipy/i2c.py.exp
rename to tests/ports/cc3200/i2c.py.exp
diff --git a/tests/wipy/modwipy.py b/tests/ports/cc3200/modwipy.py
similarity index 100%
rename from tests/wipy/modwipy.py
rename to tests/ports/cc3200/modwipy.py
diff --git a/tests/wipy/modwipy.py.exp b/tests/ports/cc3200/modwipy.py.exp
similarity index 100%
rename from tests/wipy/modwipy.py.exp
rename to tests/ports/cc3200/modwipy.py.exp
diff --git a/tests/wipy/os.py b/tests/ports/cc3200/os.py
similarity index 100%
rename from tests/wipy/os.py
rename to tests/ports/cc3200/os.py
diff --git a/tests/wipy/os.py.exp b/tests/ports/cc3200/os.py.exp
similarity index 100%
rename from tests/wipy/os.py.exp
rename to tests/ports/cc3200/os.py.exp
diff --git a/tests/wipy/pin.py b/tests/ports/cc3200/pin.py
similarity index 100%
rename from tests/wipy/pin.py
rename to tests/ports/cc3200/pin.py
diff --git a/tests/wipy/pin.py.exp b/tests/ports/cc3200/pin.py.exp
similarity index 100%
rename from tests/wipy/pin.py.exp
rename to tests/ports/cc3200/pin.py.exp
diff --git a/tests/wipy/pin_irq.py b/tests/ports/cc3200/pin_irq.py
similarity index 100%
rename from tests/wipy/pin_irq.py
rename to tests/ports/cc3200/pin_irq.py
diff --git a/tests/wipy/pin_irq.py.exp b/tests/ports/cc3200/pin_irq.py.exp
similarity index 100%
rename from tests/wipy/pin_irq.py.exp
rename to tests/ports/cc3200/pin_irq.py.exp
diff --git a/tests/wipy/reset/reset.py b/tests/ports/cc3200/reset/reset.py
similarity index 100%
rename from tests/wipy/reset/reset.py
rename to tests/ports/cc3200/reset/reset.py
diff --git a/tests/wipy/reset/reset.py.exp b/tests/ports/cc3200/reset/reset.py.exp
similarity index 100%
rename from tests/wipy/reset/reset.py.exp
rename to tests/ports/cc3200/reset/reset.py.exp
diff --git a/tests/wipy/rtc.py b/tests/ports/cc3200/rtc.py
similarity index 100%
rename from tests/wipy/rtc.py
rename to tests/ports/cc3200/rtc.py
diff --git a/tests/wipy/rtc.py.exp b/tests/ports/cc3200/rtc.py.exp
similarity index 100%
rename from tests/wipy/rtc.py.exp
rename to tests/ports/cc3200/rtc.py.exp
diff --git a/tests/wipy/sd.py b/tests/ports/cc3200/sd.py
similarity index 100%
rename from tests/wipy/sd.py
rename to tests/ports/cc3200/sd.py
diff --git a/tests/wipy/sd.py.exp b/tests/ports/cc3200/sd.py.exp
similarity index 100%
rename from tests/wipy/sd.py.exp
rename to tests/ports/cc3200/sd.py.exp
diff --git a/tests/wipy/skipped/rtc_irq.py b/tests/ports/cc3200/skipped/rtc_irq.py
similarity index 100%
rename from tests/wipy/skipped/rtc_irq.py
rename to tests/ports/cc3200/skipped/rtc_irq.py
diff --git a/tests/wipy/skipped/rtc_irq.py.exp b/tests/ports/cc3200/skipped/rtc_irq.py.exp
similarity index 100%
rename from tests/wipy/skipped/rtc_irq.py.exp
rename to tests/ports/cc3200/skipped/rtc_irq.py.exp
diff --git a/tests/wipy/spi.py b/tests/ports/cc3200/spi.py
similarity index 100%
rename from tests/wipy/spi.py
rename to tests/ports/cc3200/spi.py
diff --git a/tests/wipy/spi.py.exp b/tests/ports/cc3200/spi.py.exp
similarity index 100%
rename from tests/wipy/spi.py.exp
rename to tests/ports/cc3200/spi.py.exp
diff --git a/tests/wipy/time.py b/tests/ports/cc3200/time.py
similarity index 100%
rename from tests/wipy/time.py
rename to tests/ports/cc3200/time.py
diff --git a/tests/wipy/time.py.exp b/tests/ports/cc3200/time.py.exp
similarity index 100%
rename from tests/wipy/time.py.exp
rename to tests/ports/cc3200/time.py.exp
diff --git a/tests/wipy/timer.py b/tests/ports/cc3200/timer.py
similarity index 100%
rename from tests/wipy/timer.py
rename to tests/ports/cc3200/timer.py
diff --git a/tests/wipy/timer.py.exp b/tests/ports/cc3200/timer.py.exp
similarity index 100%
rename from tests/wipy/timer.py.exp
rename to tests/ports/cc3200/timer.py.exp
diff --git a/tests/wipy/uart.py b/tests/ports/cc3200/uart.py
similarity index 100%
rename from tests/wipy/uart.py
rename to tests/ports/cc3200/uart.py
diff --git a/tests/wipy/uart.py.exp b/tests/ports/cc3200/uart.py.exp
similarity index 100%
rename from tests/wipy/uart.py.exp
rename to tests/ports/cc3200/uart.py.exp
diff --git a/tests/wipy/uart_irq.py b/tests/ports/cc3200/uart_irq.py
similarity index 100%
rename from tests/wipy/uart_irq.py
rename to tests/ports/cc3200/uart_irq.py
diff --git a/tests/wipy/uart_irq.py.exp b/tests/ports/cc3200/uart_irq.py.exp
similarity index 100%
rename from tests/wipy/uart_irq.py.exp
rename to tests/ports/cc3200/uart_irq.py.exp
diff --git a/tests/wipy/wdt.py b/tests/ports/cc3200/wdt.py
similarity index 100%
rename from tests/wipy/wdt.py
rename to tests/ports/cc3200/wdt.py
diff --git a/tests/wipy/wdt.py.exp b/tests/ports/cc3200/wdt.py.exp
similarity index 100%
rename from tests/wipy/wdt.py.exp
rename to tests/ports/cc3200/wdt.py.exp
diff --git a/tests/wipy/wlan/machine.py b/tests/ports/cc3200/wlan/machine.py
similarity index 100%
rename from tests/wipy/wlan/machine.py
rename to tests/ports/cc3200/wlan/machine.py
diff --git a/tests/wipy/wlan/machine.py.exp b/tests/ports/cc3200/wlan/machine.py.exp
similarity index 100%
rename from tests/wipy/wlan/machine.py.exp
rename to tests/ports/cc3200/wlan/machine.py.exp
diff --git a/tests/wipy/wlan/server.py b/tests/ports/cc3200/wlan/server.py
similarity index 100%
rename from tests/wipy/wlan/server.py
rename to tests/ports/cc3200/wlan/server.py
diff --git a/tests/wipy/wlan/server.py.exp b/tests/ports/cc3200/wlan/server.py.exp
similarity index 100%
rename from tests/wipy/wlan/server.py.exp
rename to tests/ports/cc3200/wlan/server.py.exp
diff --git a/tests/wipy/wlan/wlan.py b/tests/ports/cc3200/wlan/wlan.py
similarity index 100%
rename from tests/wipy/wlan/wlan.py
rename to tests/ports/cc3200/wlan/wlan.py
diff --git a/tests/wipy/wlan/wlan.py.exp b/tests/ports/cc3200/wlan/wlan.py.exp
similarity index 100%
rename from tests/wipy/wlan/wlan.py.exp
rename to tests/ports/cc3200/wlan/wlan.py.exp
diff --git a/tests/esp32/check_err_str.py b/tests/ports/esp32/check_err_str.py
similarity index 100%
rename from tests/esp32/check_err_str.py
rename to tests/ports/esp32/check_err_str.py
diff --git a/tests/esp32/check_err_str.py.exp b/tests/ports/esp32/check_err_str.py.exp
similarity index 100%
rename from tests/esp32/check_err_str.py.exp
rename to tests/ports/esp32/check_err_str.py.exp
diff --git a/tests/esp32/esp32_idf_heap_info.py b/tests/ports/esp32/esp32_idf_heap_info.py
similarity index 100%
rename from tests/esp32/esp32_idf_heap_info.py
rename to tests/ports/esp32/esp32_idf_heap_info.py
diff --git a/tests/esp32/esp32_idf_heap_info.py.exp b/tests/ports/esp32/esp32_idf_heap_info.py.exp
similarity index 100%
rename from tests/esp32/esp32_idf_heap_info.py.exp
rename to tests/ports/esp32/esp32_idf_heap_info.py.exp
diff --git a/tests/esp32/esp32_nvs.py b/tests/ports/esp32/esp32_nvs.py
similarity index 100%
rename from tests/esp32/esp32_nvs.py
rename to tests/ports/esp32/esp32_nvs.py
diff --git a/tests/esp32/esp32_nvs.py.exp b/tests/ports/esp32/esp32_nvs.py.exp
similarity index 100%
rename from tests/esp32/esp32_nvs.py.exp
rename to tests/ports/esp32/esp32_nvs.py.exp
diff --git a/tests/esp32/partition_ota.py b/tests/ports/esp32/partition_ota.py
similarity index 100%
rename from tests/esp32/partition_ota.py
rename to tests/ports/esp32/partition_ota.py
diff --git a/tests/esp32/partition_ota.py.exp b/tests/ports/esp32/partition_ota.py.exp
similarity index 100%
rename from tests/esp32/partition_ota.py.exp
rename to tests/ports/esp32/partition_ota.py.exp
diff --git a/tests/esp32/resolve_on_connect.py b/tests/ports/esp32/resolve_on_connect.py
similarity index 100%
rename from tests/esp32/resolve_on_connect.py
rename to tests/ports/esp32/resolve_on_connect.py
diff --git a/tests/qemu-arm/asm_test.py b/tests/ports/qemu-arm/asm_test.py
similarity index 100%
rename from tests/qemu-arm/asm_test.py
rename to tests/ports/qemu-arm/asm_test.py
diff --git a/tests/qemu-arm/asm_test.py.exp b/tests/ports/qemu-arm/asm_test.py.exp
similarity index 100%
rename from tests/qemu-arm/asm_test.py.exp
rename to tests/ports/qemu-arm/asm_test.py.exp
diff --git a/tests/qemu-arm/native_test.py b/tests/ports/qemu-arm/native_test.py
similarity index 100%
rename from tests/qemu-arm/native_test.py
rename to tests/ports/qemu-arm/native_test.py
diff --git a/tests/qemu-arm/native_test.py.exp b/tests/ports/qemu-arm/native_test.py.exp
similarity index 100%
rename from tests/qemu-arm/native_test.py.exp
rename to tests/ports/qemu-arm/native_test.py.exp
diff --git a/tests/qemu-arm/viper_test.py b/tests/ports/qemu-arm/viper_test.py
similarity index 100%
rename from tests/qemu-arm/viper_test.py
rename to tests/ports/qemu-arm/viper_test.py
diff --git a/tests/qemu-arm/viper_test.py.exp b/tests/ports/qemu-arm/viper_test.py.exp
similarity index 100%
rename from tests/qemu-arm/viper_test.py.exp
rename to tests/ports/qemu-arm/viper_test.py.exp
diff --git a/tests/renesas-ra/freq.py b/tests/ports/renesas-ra/freq.py
similarity index 100%
rename from tests/renesas-ra/freq.py
rename to tests/ports/renesas-ra/freq.py
diff --git a/tests/renesas-ra/freq.py.exp b/tests/ports/renesas-ra/freq.py.exp
similarity index 100%
rename from tests/renesas-ra/freq.py.exp
rename to tests/ports/renesas-ra/freq.py.exp
diff --git a/tests/renesas-ra/i2c.py b/tests/ports/renesas-ra/i2c.py
similarity index 100%
rename from tests/renesas-ra/i2c.py
rename to tests/ports/renesas-ra/i2c.py
diff --git a/tests/renesas-ra/i2c.py.exp b/tests/ports/renesas-ra/i2c.py.exp
similarity index 100%
rename from tests/renesas-ra/i2c.py.exp
rename to tests/ports/renesas-ra/i2c.py.exp
diff --git a/tests/pyb/modtime.py b/tests/ports/renesas-ra/modtime.py
similarity index 100%
rename from tests/pyb/modtime.py
rename to tests/ports/renesas-ra/modtime.py
diff --git a/tests/pyb/modtime.py.exp b/tests/ports/renesas-ra/modtime.py.exp
similarity index 100%
rename from tests/pyb/modtime.py.exp
rename to tests/ports/renesas-ra/modtime.py.exp
diff --git a/tests/renesas-ra/pin.py b/tests/ports/renesas-ra/pin.py
similarity index 100%
rename from tests/renesas-ra/pin.py
rename to tests/ports/renesas-ra/pin.py
diff --git a/tests/renesas-ra/pin.py.exp b/tests/ports/renesas-ra/pin.py.exp
similarity index 100%
rename from tests/renesas-ra/pin.py.exp
rename to tests/ports/renesas-ra/pin.py.exp
diff --git a/tests/renesas-ra/rtc_init.py b/tests/ports/renesas-ra/rtc_init.py
similarity index 100%
rename from tests/renesas-ra/rtc_init.py
rename to tests/ports/renesas-ra/rtc_init.py
diff --git a/tests/renesas-ra/rtc_init.py.exp b/tests/ports/renesas-ra/rtc_init.py.exp
similarity index 100%
rename from tests/renesas-ra/rtc_init.py.exp
rename to tests/ports/renesas-ra/rtc_init.py.exp
diff --git a/tests/renesas-ra/spi.py b/tests/ports/renesas-ra/spi.py
similarity index 100%
rename from tests/renesas-ra/spi.py
rename to tests/ports/renesas-ra/spi.py
diff --git a/tests/renesas-ra/spi.py.exp b/tests/ports/renesas-ra/spi.py.exp
similarity index 100%
rename from tests/renesas-ra/spi.py.exp
rename to tests/ports/renesas-ra/spi.py.exp
diff --git a/tests/renesas-ra/uart1.py b/tests/ports/renesas-ra/uart1.py
similarity index 100%
rename from tests/renesas-ra/uart1.py
rename to tests/ports/renesas-ra/uart1.py
diff --git a/tests/renesas-ra/uart1.py.exp b/tests/ports/renesas-ra/uart1.py.exp
similarity index 100%
rename from tests/renesas-ra/uart1.py.exp
rename to tests/ports/renesas-ra/uart1.py.exp
diff --git a/tests/pyb/accel.py b/tests/ports/stm32/accel.py
similarity index 100%
rename from tests/pyb/accel.py
rename to tests/ports/stm32/accel.py
diff --git a/tests/pyb/accel.py.exp b/tests/ports/stm32/accel.py.exp
similarity index 100%
rename from tests/pyb/accel.py.exp
rename to tests/ports/stm32/accel.py.exp
diff --git a/tests/pyb/adc.py b/tests/ports/stm32/adc.py
similarity index 100%
rename from tests/pyb/adc.py
rename to tests/ports/stm32/adc.py
diff --git a/tests/pyb/adc.py.exp b/tests/ports/stm32/adc.py.exp
similarity index 100%
rename from tests/pyb/adc.py.exp
rename to tests/ports/stm32/adc.py.exp
diff --git a/tests/pyb/adcall.py b/tests/ports/stm32/adcall.py
similarity index 100%
rename from tests/pyb/adcall.py
rename to tests/ports/stm32/adcall.py
diff --git a/tests/pyb/adcall.py.exp b/tests/ports/stm32/adcall.py.exp
similarity index 100%
rename from tests/pyb/adcall.py.exp
rename to tests/ports/stm32/adcall.py.exp
diff --git a/tests/pyb/board_pybv1x.py b/tests/ports/stm32/board_pybv1x.py
similarity index 100%
rename from tests/pyb/board_pybv1x.py
rename to tests/ports/stm32/board_pybv1x.py
diff --git a/tests/pyb/board_pybv1x.py.exp b/tests/ports/stm32/board_pybv1x.py.exp
similarity index 100%
rename from tests/pyb/board_pybv1x.py.exp
rename to tests/ports/stm32/board_pybv1x.py.exp
diff --git a/tests/pyb/can.py b/tests/ports/stm32/can.py
similarity index 100%
rename from tests/pyb/can.py
rename to tests/ports/stm32/can.py
diff --git a/tests/pyb/can.py.exp b/tests/ports/stm32/can.py.exp
similarity index 100%
rename from tests/pyb/can.py.exp
rename to tests/ports/stm32/can.py.exp
diff --git a/tests/pyb/can2.py b/tests/ports/stm32/can2.py
similarity index 100%
rename from tests/pyb/can2.py
rename to tests/ports/stm32/can2.py
diff --git a/tests/pyb/can2.py.exp b/tests/ports/stm32/can2.py.exp
similarity index 100%
rename from tests/pyb/can2.py.exp
rename to tests/ports/stm32/can2.py.exp
diff --git a/tests/pyb/dac.py b/tests/ports/stm32/dac.py
similarity index 100%
rename from tests/pyb/dac.py
rename to tests/ports/stm32/dac.py
diff --git a/tests/pyb/dac.py.exp b/tests/ports/stm32/dac.py.exp
similarity index 100%
rename from tests/pyb/dac.py.exp
rename to tests/ports/stm32/dac.py.exp
diff --git a/tests/pyb/extint.py b/tests/ports/stm32/extint.py
similarity index 100%
rename from tests/pyb/extint.py
rename to tests/ports/stm32/extint.py
diff --git a/tests/pyb/extint.py.exp b/tests/ports/stm32/extint.py.exp
similarity index 100%
rename from tests/pyb/extint.py.exp
rename to tests/ports/stm32/extint.py.exp
diff --git a/tests/pyb/i2c.py b/tests/ports/stm32/i2c.py
similarity index 100%
rename from tests/pyb/i2c.py
rename to tests/ports/stm32/i2c.py
diff --git a/tests/pyb/i2c.py.exp b/tests/ports/stm32/i2c.py.exp
similarity index 100%
rename from tests/pyb/i2c.py.exp
rename to tests/ports/stm32/i2c.py.exp
diff --git a/tests/pyb/i2c_accel.py b/tests/ports/stm32/i2c_accel.py
similarity index 100%
rename from tests/pyb/i2c_accel.py
rename to tests/ports/stm32/i2c_accel.py
diff --git a/tests/pyb/i2c_accel.py.exp b/tests/ports/stm32/i2c_accel.py.exp
similarity index 100%
rename from tests/pyb/i2c_accel.py.exp
rename to tests/ports/stm32/i2c_accel.py.exp
diff --git a/tests/pyb/i2c_error.py b/tests/ports/stm32/i2c_error.py
similarity index 100%
rename from tests/pyb/i2c_error.py
rename to tests/ports/stm32/i2c_error.py
diff --git a/tests/pyb/i2c_error.py.exp b/tests/ports/stm32/i2c_error.py.exp
similarity index 100%
rename from tests/pyb/i2c_error.py.exp
rename to tests/ports/stm32/i2c_error.py.exp
diff --git a/tests/pyb/irq.py b/tests/ports/stm32/irq.py
similarity index 100%
rename from tests/pyb/irq.py
rename to tests/ports/stm32/irq.py
diff --git a/tests/pyb/irq.py.exp b/tests/ports/stm32/irq.py.exp
similarity index 100%
rename from tests/pyb/irq.py.exp
rename to tests/ports/stm32/irq.py.exp
diff --git a/tests/pyb/led.py b/tests/ports/stm32/led.py
similarity index 100%
rename from tests/pyb/led.py
rename to tests/ports/stm32/led.py
diff --git a/tests/pyb/led.py.exp b/tests/ports/stm32/led.py.exp
similarity index 100%
rename from tests/pyb/led.py.exp
rename to tests/ports/stm32/led.py.exp
diff --git a/tests/pyb/modstm.py b/tests/ports/stm32/modstm.py
similarity index 100%
rename from tests/pyb/modstm.py
rename to tests/ports/stm32/modstm.py
diff --git a/tests/pyb/modstm.py.exp b/tests/ports/stm32/modstm.py.exp
similarity index 100%
rename from tests/pyb/modstm.py.exp
rename to tests/ports/stm32/modstm.py.exp
diff --git a/tests/renesas-ra/modtime.py b/tests/ports/stm32/modtime.py
similarity index 100%
rename from tests/renesas-ra/modtime.py
rename to tests/ports/stm32/modtime.py
diff --git a/tests/renesas-ra/modtime.py.exp b/tests/ports/stm32/modtime.py.exp
similarity index 100%
rename from tests/renesas-ra/modtime.py.exp
rename to tests/ports/stm32/modtime.py.exp
diff --git a/tests/pyb/pin.py b/tests/ports/stm32/pin.py
similarity index 100%
rename from tests/pyb/pin.py
rename to tests/ports/stm32/pin.py
diff --git a/tests/pyb/pin.py.exp b/tests/ports/stm32/pin.py.exp
similarity index 100%
rename from tests/pyb/pin.py.exp
rename to tests/ports/stm32/pin.py.exp
diff --git a/tests/pyb/pyb1.py b/tests/ports/stm32/pyb1.py
similarity index 100%
rename from tests/pyb/pyb1.py
rename to tests/ports/stm32/pyb1.py
diff --git a/tests/pyb/pyb1.py.exp b/tests/ports/stm32/pyb1.py.exp
similarity index 100%
rename from tests/pyb/pyb1.py.exp
rename to tests/ports/stm32/pyb1.py.exp
diff --git a/tests/pyb/pyb_f405.py b/tests/ports/stm32/pyb_f405.py
similarity index 100%
rename from tests/pyb/pyb_f405.py
rename to tests/ports/stm32/pyb_f405.py
diff --git a/tests/pyb/pyb_f405.py.exp b/tests/ports/stm32/pyb_f405.py.exp
similarity index 100%
rename from tests/pyb/pyb_f405.py.exp
rename to tests/ports/stm32/pyb_f405.py.exp
diff --git a/tests/pyb/pyb_f411.py b/tests/ports/stm32/pyb_f411.py
similarity index 100%
rename from tests/pyb/pyb_f411.py
rename to tests/ports/stm32/pyb_f411.py
diff --git a/tests/pyb/pyb_f411.py.exp b/tests/ports/stm32/pyb_f411.py.exp
similarity index 100%
rename from tests/pyb/pyb_f411.py.exp
rename to tests/ports/stm32/pyb_f411.py.exp
diff --git a/tests/pyb/rtc.py b/tests/ports/stm32/rtc.py
similarity index 100%
rename from tests/pyb/rtc.py
rename to tests/ports/stm32/rtc.py
diff --git a/tests/pyb/rtc.py.exp b/tests/ports/stm32/rtc.py.exp
similarity index 100%
rename from tests/pyb/rtc.py.exp
rename to tests/ports/stm32/rtc.py.exp
diff --git a/tests/pyb/servo.py b/tests/ports/stm32/servo.py
similarity index 100%
rename from tests/pyb/servo.py
rename to tests/ports/stm32/servo.py
diff --git a/tests/pyb/servo.py.exp b/tests/ports/stm32/servo.py.exp
similarity index 100%
rename from tests/pyb/servo.py.exp
rename to tests/ports/stm32/servo.py.exp
diff --git a/tests/pyb/spi.py b/tests/ports/stm32/spi.py
similarity index 100%
rename from tests/pyb/spi.py
rename to tests/ports/stm32/spi.py
diff --git a/tests/pyb/spi.py.exp b/tests/ports/stm32/spi.py.exp
similarity index 100%
rename from tests/pyb/spi.py.exp
rename to tests/ports/stm32/spi.py.exp
diff --git a/tests/pyb/switch.py b/tests/ports/stm32/switch.py
similarity index 100%
rename from tests/pyb/switch.py
rename to tests/ports/stm32/switch.py
diff --git a/tests/pyb/switch.py.exp b/tests/ports/stm32/switch.py.exp
similarity index 100%
rename from tests/pyb/switch.py.exp
rename to tests/ports/stm32/switch.py.exp
diff --git a/tests/pyb/timer.py b/tests/ports/stm32/timer.py
similarity index 100%
rename from tests/pyb/timer.py
rename to tests/ports/stm32/timer.py
diff --git a/tests/pyb/timer.py.exp b/tests/ports/stm32/timer.py.exp
similarity index 100%
rename from tests/pyb/timer.py.exp
rename to tests/ports/stm32/timer.py.exp
diff --git a/tests/pyb/timer_callback.py b/tests/ports/stm32/timer_callback.py
similarity index 100%
rename from tests/pyb/timer_callback.py
rename to tests/ports/stm32/timer_callback.py
diff --git a/tests/pyb/timer_callback.py.exp b/tests/ports/stm32/timer_callback.py.exp
similarity index 100%
rename from tests/pyb/timer_callback.py.exp
rename to tests/ports/stm32/timer_callback.py.exp
diff --git a/tests/pyb/uart.py b/tests/ports/stm32/uart.py
similarity index 100%
rename from tests/pyb/uart.py
rename to tests/ports/stm32/uart.py
diff --git a/tests/pyb/uart.py.exp b/tests/ports/stm32/uart.py.exp
similarity index 100%
rename from tests/pyb/uart.py.exp
rename to tests/ports/stm32/uart.py.exp
diff --git a/tests/unix/extra_coverage.py b/tests/ports/unix/extra_coverage.py
similarity index 100%
rename from tests/unix/extra_coverage.py
rename to tests/ports/unix/extra_coverage.py
diff --git a/tests/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
similarity index 100%
rename from tests/unix/extra_coverage.py.exp
rename to tests/ports/unix/extra_coverage.py.exp
diff --git a/tests/unix/ffi_callback.py b/tests/ports/unix/ffi_callback.py
similarity index 100%
rename from tests/unix/ffi_callback.py
rename to tests/ports/unix/ffi_callback.py
diff --git a/tests/unix/ffi_callback.py.exp b/tests/ports/unix/ffi_callback.py.exp
similarity index 100%
rename from tests/unix/ffi_callback.py.exp
rename to tests/ports/unix/ffi_callback.py.exp
diff --git a/tests/unix/ffi_float.py b/tests/ports/unix/ffi_float.py
similarity index 100%
rename from tests/unix/ffi_float.py
rename to tests/ports/unix/ffi_float.py
diff --git a/tests/unix/ffi_float.py.exp b/tests/ports/unix/ffi_float.py.exp
similarity index 100%
rename from tests/unix/ffi_float.py.exp
rename to tests/ports/unix/ffi_float.py.exp
diff --git a/tests/unix/ffi_float2.py b/tests/ports/unix/ffi_float2.py
similarity index 100%
rename from tests/unix/ffi_float2.py
rename to tests/ports/unix/ffi_float2.py
diff --git a/tests/unix/ffi_float2.py.exp b/tests/ports/unix/ffi_float2.py.exp
similarity index 100%
rename from tests/unix/ffi_float2.py.exp
rename to tests/ports/unix/ffi_float2.py.exp
diff --git a/tests/unix/ffi_lib.c b/tests/ports/unix/ffi_lib.c
similarity index 100%
rename from tests/unix/ffi_lib.c
rename to tests/ports/unix/ffi_lib.c
diff --git a/tests/unix/ffi_types.py b/tests/ports/unix/ffi_types.py
similarity index 100%
rename from tests/unix/ffi_types.py
rename to tests/ports/unix/ffi_types.py
diff --git a/tests/unix/ffi_types.py.exp b/tests/ports/unix/ffi_types.py.exp
similarity index 100%
rename from tests/unix/ffi_types.py.exp
rename to tests/ports/unix/ffi_types.py.exp
diff --git a/tests/unix/mod_os.py b/tests/ports/unix/mod_os.py
similarity index 100%
rename from tests/unix/mod_os.py
rename to tests/ports/unix/mod_os.py
diff --git a/tests/unix/mod_os.py.exp b/tests/ports/unix/mod_os.py.exp
similarity index 100%
rename from tests/unix/mod_os.py.exp
rename to tests/ports/unix/mod_os.py.exp
diff --git a/tests/unix/time_mktime_localtime.py b/tests/ports/unix/time_mktime_localtime.py
similarity index 100%
rename from tests/unix/time_mktime_localtime.py
rename to tests/ports/unix/time_mktime_localtime.py
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 4d4c2543b2f59..39f2d73a2078a 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -183,7 +183,7 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
         "basics/bytes_compare3.py",
         "basics/builtin_help.py",
         "thread/thread_exc2.py",
-        "esp32/partition_ota.py",
+        "ports/esp32/partition_ota.py",
     )
 ]
 
@@ -1036,16 +1036,16 @@ def main():
             )
             if args.target == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "pyb", "inlineasm")
+                test_dirs += ("float", "stress", "inlineasm", "ports/stm32")
             elif args.target in ("renesas-ra"):
-                test_dirs += ("float", "inlineasm", "renesas-ra")
+                test_dirs += ("float", "inlineasm", "ports/renesas-ra")
             elif args.target == "rp2":
                 test_dirs += ("float", "stress", "inlineasm", "thread")
             elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":
                 # run WiPy tests
-                test_dirs += ("wipy",)
+                test_dirs += ("ports/cc3200",)
             elif args.target == "unix":
                 # run PC tests
                 test_dirs += (
@@ -1054,8 +1054,8 @@ def main():
                     "io",
                     "stress",
                     "unicode",
-                    "unix",
                     "cmdline",
+                    "ports/unix",
                 )
             elif args.target == "qemu-arm":
                 if not args.write_exp:
@@ -1065,7 +1065,7 @@ def main():
                 test_dirs += (
                     "float",
                     "inlineasm",
-                    "qemu-arm",
+                    "ports/qemu-arm",
                 )
         else:
             # run tests from these directories
diff --git a/tools/ci.sh b/tools/ci.sh
index 95b1f19ffc4a6..e18027ae5addb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -415,7 +415,7 @@ function ci_unix_build_helper {
 }
 
 function ci_unix_build_ffi_lib_helper {
-    $1 $2 -shared -o tests/unix/ffi_lib.so tests/unix/ffi_lib.c
+    $1 $2 -shared -o tests/ports/unix/ffi_lib.so tests/ports/unix/ffi_lib.c
 }
 
 function ci_unix_run_tests_helper {

From 50b809c8e8bb909b2d69e91f5d2eab2e16d3636e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jan 2024 16:36:22 +1100
Subject: [PATCH 0754/3129] tests/ports/rp2: Add rp2-specific tests with a test
 for rp2.DMA.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_dma.py     | 90 ++++++++++++++++++++++++++++++++++
 tests/ports/rp2/rp2_dma.py.exp | 16 ++++++
 tests/run-tests.py             |  2 +-
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 tests/ports/rp2/rp2_dma.py
 create mode 100644 tests/ports/rp2/rp2_dma.py.exp

diff --git a/tests/ports/rp2/rp2_dma.py b/tests/ports/rp2/rp2_dma.py
new file mode 100644
index 0000000000000..cd97f0357b788
--- /dev/null
+++ b/tests/ports/rp2/rp2_dma.py
@@ -0,0 +1,90 @@
+# Test rp2.DMA functionality.
+
+import time
+import machine
+import rp2
+
+src = bytes(i & 0xFF for i in range(16 * 1024))
+
+print("# test basic usage")
+
+dma = rp2.DMA()
+print(dma)
+print(rp2.DMA.unpack_ctrl(dma.pack_ctrl()))
+dma.read = 0
+dma.write = 0
+dma.count = 0
+dma.ctrl = dma.pack_ctrl()
+print(dma.read, dma.write, dma.count, dma.ctrl & 0x01FFFFFF, dma.channel, dma.registers)
+dma.close()
+
+# Test closing when already closed.
+dma.close()
+
+# Test using when closed.
+try:
+    dma.active()
+    assert False
+except ValueError:
+    print("ValueError")
+
+# Test simple memory copy.
+print("# test memory copy")
+dest = bytearray(1024)
+dma = rp2.DMA()
+dma.config(read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=False)
+print(not any(dest))
+dma.active(True)
+while dma.active():
+    pass
+print(dest[:8], dest[-8:])
+dma.close()
+
+
+# Test time taken for a large memory copy.
+def run_and_time_dma(dma):
+    ticks_us = time.ticks_us
+    irq_state = machine.disable_irq()
+    t0 = ticks_us()
+    dma.active(True)
+    while dma.active():
+        pass
+    t1 = ticks_us()
+    machine.enable_irq(irq_state)
+    return time.ticks_diff(t1, t0)
+
+
+print("# test timing")
+dest = bytearray(16 * 1024)
+dma = rp2.DMA()
+dma.read = src
+dma.write = dest
+dma.count = len(dest) // 4
+dma.ctrl = dma.pack_ctrl()
+dt = run_and_time_dma(dma)
+print(60 <= dt <= 90)
+print(dest[:8], dest[-8:])
+dma.close()
+
+# Test using .config(trigger=True).
+print("# test immediate trigger")
+dest = bytearray(1024)
+dma = rp2.DMA()
+dma.config(read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=True)
+while dma.active():
+    pass
+print(dest[:8], dest[-8:])
+dma.close()
+
+# Test the DMA.irq() method.
+print("# test irq")
+dest = bytearray(1024)
+dma = rp2.DMA()
+dma.irq(lambda _: print("irq fired"))
+dma.config(
+    read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(irq_quiet=0), trigger=True
+)
+while dma.active():
+    pass
+print(dest[:8], dest[-8:])
+dma.close()
diff --git a/tests/ports/rp2/rp2_dma.py.exp b/tests/ports/rp2/rp2_dma.py.exp
new file mode 100644
index 0000000000000..956aee4e34c1f
--- /dev/null
+++ b/tests/ports/rp2/rp2_dma.py.exp
@@ -0,0 +1,16 @@
+# test basic usage
+DMA(0)
+{'inc_read': 1, 'high_pri': 0, 'write_err': 0, 'ring_sel': 0, 'enable': 1, 'treq_sel': 63, 'sniff_en': 0, 'irq_quiet': 1, 'read_err': 0, 'chain_to': 0, 'busy': 0, 'inc_write': 1, 'ring_size': 0, 'bswap': 0, 'size': 2, 'ahb_err': 0}
+0 0 0 4161593 0 <memoryview>
+ValueError
+# test memory copy
+True
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
+# test timing
+True
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
+# test immediate trigger
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
+# test irq
+irq fired
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 39f2d73a2078a..ecd49a7d75fea 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1040,7 +1040,7 @@ def main():
             elif args.target in ("renesas-ra"):
                 test_dirs += ("float", "inlineasm", "ports/renesas-ra")
             elif args.target == "rp2":
-                test_dirs += ("float", "stress", "inlineasm", "thread")
+                test_dirs += ("float", "stress", "inlineasm", "thread", "ports/rp2")
             elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":

From 51fbec2780b9c095c7eabdabab043c30dbb99d1d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jan 2024 16:36:47 +1100
Subject: [PATCH 0755/3129] tests/extmod/machine_i2s_rate.py: Test multiple I2S
 instances.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_i2s_rate.py | 66 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
index d2cd1ae105f8f..bf4b7235a9cdf 100644
--- a/tests/extmod/machine_i2s_rate.py
+++ b/tests/extmod/machine_i2s_rate.py
@@ -9,28 +9,28 @@
 import time, sys
 
 # Configure pins based on the board.
+# A board must have at least one instance to test, both TX and RX mode.
 if "pyboard" in sys.platform:
-    i2s_id = 2
-    sck_pin = Pin("Y6")
-    ws_pin = Pin("Y5")
-    sd_tx_pin = sd_rx_pin = Pin("Y8")
+    i2s_instances = ((2, Pin("Y6"), Pin("Y5"), Pin("Y8"), Pin("Y8")),)
 elif "rp2" in sys.platform:
-    i2s_id = 1
-    sck_pin = Pin(0)
-    ws_pin = Pin(1)
-    sd_tx_pin = sd_rx_pin = Pin(2)
+    i2s_instances = (
+        (0, Pin(0), Pin(1), Pin(2), Pin(2)),
+        (1, Pin(0), Pin(1), Pin(2), 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)
+    i2s_instances = (
+        (1, Pin("D26"), Pin("D27"), Pin("D7"), Pin("D8")),
+        (2, Pin("D4"), Pin("D3"), Pin("D2"), None),
+    )
 
 TEST_BYTES = b"01234567"
 RATE = 11025  # frames/sec
 
 
-def test(mode, sd_pin, bits_per_sample, frame_format):
+def test(i2s_id, sck_pin, ws_pin, sd_pin, mode, bits_per_sample, frame_format):
+    if sd_pin is None:
+        return
+
     i2s = I2S(
         i2s_id,
         sck=sck_pin,
@@ -48,16 +48,16 @@ def test(mode, sd_pin, bits_per_sample, frame_format):
     else:
         channels = 2
     bits_per_frame = bits_per_sample * channels
-    buf_len_250ms = bits_per_frame // 8 * RATE // 4
+    buf_len_200ms = bits_per_frame // 8 * RATE // 5
 
     # Create test data and preload I2S buffers.
     if mode == I2S.TX:
         mode_str = "TX"
-        data = TEST_BYTES * (buf_len_250ms // len(TEST_BYTES))
+        data = TEST_BYTES * (buf_len_200ms // len(TEST_BYTES))
         i2s.write(data)
     else:
         mode_str = "RX"
-        data = bytearray(len(TEST_BYTES) * (buf_len_250ms // len(TEST_BYTES)))
+        data = bytearray(len(TEST_BYTES) * (buf_len_200ms // len(TEST_BYTES)))
         i2s.readinto(data)
 
     # Time how long it takes to read/write 2 lots of data.
@@ -72,15 +72,27 @@ def test(mode, sd_pin, bits_per_sample, frame_format):
 
     i2s.deinit()
 
-    # Print out test result, time should be in range of 500ms.
-    print(mode_str, bits_per_sample, channels, abs(dt - 500) <= 4)
+    # Time should be in range of 400ms.
+    time_in_range = abs(dt - 400) <= 4
+
+    # Print out test result if requested, or if time not in range.
+    if print_results or not time_in_range:
+        print(mode_str, bits_per_sample, channels, time_in_range)
+
+
+print_results = True
 
+for i2s_id, sck_pin, ws_pin, sd_tx_pin, sd_rx_pin in i2s_instances:
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 16, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 16, I2S.STEREO)
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 32, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 32, I2S.STEREO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, I2S.RX, 16, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, I2S.RX, 16, I2S.STEREO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, I2S.RX, 32, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, 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)
+    # For any remaining tests, don't print the results if they pass.
+    # This is to have the same output on all boards regardless of
+    # how many I2S instances they test.
+    print_results = False

From 2ecbad4e91192c88f831d8690dbad31ddba72135 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Jan 2024 10:07:51 +1100
Subject: [PATCH 0756/3129] extmod/asyncio: Support gather of tasks that finish
 early.

Adds support to asyncio.gather() for the case that one or more (or all)
sub-tasks finish and/or raise an exception before the gather starts.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/asyncio/core.py                        |  5 ++
 extmod/asyncio/funcs.py                       | 49 +++++++++-----
 tests/extmod/asyncio_gather_finished_early.py | 65 +++++++++++++++++++
 3 files changed, 102 insertions(+), 17 deletions(-)
 create mode 100644 tests/extmod/asyncio_gather_finished_early.py

diff --git a/extmod/asyncio/core.py b/extmod/asyncio/core.py
index 214cc52f45f53..e5af3038f77bb 100644
--- a/extmod/asyncio/core.py
+++ b/extmod/asyncio/core.py
@@ -219,6 +219,11 @@ def run_until_complete(main_task=None):
             elif t.state is None:
                 # Task is already finished and nothing await'ed on the task,
                 # so call the exception handler.
+
+                # Save exception raised by the coro for later use.
+                t.data = exc
+
+                # Create exception context and call the exception handler.
                 _exc_context["exception"] = exc
                 _exc_context["future"] = t
                 Loop.call_exception_handler(_exc_context)
diff --git a/extmod/asyncio/funcs.py b/extmod/asyncio/funcs.py
index 599091dfbdc2b..3ef8a76b1d151 100644
--- a/extmod/asyncio/funcs.py
+++ b/extmod/asyncio/funcs.py
@@ -63,9 +63,6 @@ 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
@@ -86,26 +83,39 @@ def done(t, er):
         # Gather waiting is done, schedule the main gather task.
         core._task_queue.push(gather_task)
 
+    # Prepare the sub-tasks for the gather.
+    # The `state` variable counts the number of tasks to wait for, and can be negative
+    # if the gather should not run at all (because a task already had an exception).
     ts = [core._promote_to_task(aw) for aw in aws]
+    state = 0
     for i in range(len(ts)):
-        if ts[i].state is not True:
-            # Task is not running, gather not currently supported for this case.
+        if ts[i].state is True:
+            # Task is running, register the callback to call when the task is done.
+            ts[i].state = done
+            state += 1
+        elif not ts[i].state:
+            # Task finished already.
+            if not isinstance(ts[i].data, StopIteration):
+                # Task finished by raising an exception.
+                if not return_exceptions:
+                    # Do not run this gather at all.
+                    state = -len(ts)
+        else:
+            # Task being waited on, 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
+    # Wait for a sub-task to need attention (if there are any to wait for).
+    if state > 0:
+        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)):
@@ -118,8 +128,13 @@ def done(t, er):
             # 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
+            # Sub-task had an exception.
+            if return_exceptions:
+                # Get the sub-task exception to return in the list of return values.
+                ts[i] = ts[i].data
+            elif isinstance(state, int):
+                # Raise the sub-task exception, if there is not already an exception to raise.
+                state = 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.
diff --git a/tests/extmod/asyncio_gather_finished_early.py b/tests/extmod/asyncio_gather_finished_early.py
new file mode 100644
index 0000000000000..030e79e3571b5
--- /dev/null
+++ b/tests/extmod/asyncio_gather_finished_early.py
@@ -0,0 +1,65 @@
+# Test asyncio.gather() when a task is already finished before the gather starts.
+
+try:
+    import asyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+# CPython and MicroPython differ in when they signal (and print) that a task raised an
+# uncaught exception.  So define an empty custom_handler() to suppress this output.
+def custom_handler(loop, context):
+    pass
+
+
+async def task_that_finishes_early(id, event, fail):
+    print("task_that_finishes_early", id)
+    event.set()
+    if fail:
+        raise ValueError("intentional exception", id)
+
+
+async def task_that_runs():
+    for i in range(5):
+        print("task_that_runs", i)
+        await asyncio.sleep(0)
+
+
+async def main(start_task_that_runs, task_fail, return_exceptions):
+    print("== start", start_task_that_runs, task_fail, return_exceptions)
+
+    # Set exception handler to suppress exception output.
+    loop = asyncio.get_event_loop()
+    loop.set_exception_handler(custom_handler)
+
+    # Create tasks.
+    event_a = asyncio.Event()
+    event_b = asyncio.Event()
+    tasks = []
+    if start_task_that_runs:
+        tasks.append(asyncio.create_task(task_that_runs()))
+    tasks.append(asyncio.create_task(task_that_finishes_early("a", event_a, task_fail)))
+    tasks.append(asyncio.create_task(task_that_finishes_early("b", event_b, task_fail)))
+
+    # Make sure task_that_finishes_early() are both done, before calling gather().
+    await event_a.wait()
+    await event_b.wait()
+
+    # Gather the tasks.
+    try:
+        result = "complete", await asyncio.gather(*tasks, return_exceptions=return_exceptions)
+    except Exception as er:
+        result = "exception", er, start_task_that_runs and tasks[0].done()
+
+    # Wait for the final task to finish (if it was started).
+    if start_task_that_runs:
+        await tasks[0]
+
+    # Print results.
+    print(result)
+
+
+# Run the test in the 8 different combinations of its arguments.
+for i in range(8):
+    asyncio.run(main(bool(i & 4), bool(i & 2), bool(i & 1)))

From e2fa0c639528c84709fef237fc5d80ff970a4cd1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 18 Jan 2024 16:16:20 +0200
Subject: [PATCH 0757/3129] lib/cmsis: Update to CMSIS 5.9.0.

This update brings support for Cortex-M55 and Cortex-M85, zero and copy
tables and more.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 lib/cmsis/inc/cachel1_armv7.h      |  411 +++
 lib/cmsis/inc/cmsis_armcc.h        |  831 ++---
 lib/cmsis/inc/cmsis_armclang.h     | 1683 +++++-----
 lib/cmsis/inc/cmsis_armclang_ltm.h | 1646 +++++-----
 lib/cmsis/inc/cmsis_compiler.h     |   12 +
 lib/cmsis/inc/cmsis_gcc.h          | 2026 ++++++------
 lib/cmsis/inc/cmsis_iccarm.h       |   86 +-
 lib/cmsis/inc/cmsis_version.h      |    8 +-
 lib/cmsis/inc/core_armv81mml.h     | 2257 ++++++++++---
 lib/cmsis/inc/core_armv8mbl.h      |  426 ++-
 lib/cmsis/inc/core_armv8mml.h      |  567 +++-
 lib/cmsis/inc/core_cm0.h           |   15 +-
 lib/cmsis/inc/core_cm0plus.h       |   23 +-
 lib/cmsis/inc/core_cm1.h           |    3 +
 lib/cmsis/inc/core_cm23.h          |  426 ++-
 lib/cmsis/inc/core_cm3.h           |   39 +-
 lib/cmsis/inc/core_cm33.h          |  562 +++-
 lib/cmsis/inc/core_cm35p.h         |  562 +++-
 lib/cmsis/inc/core_cm4.h           |   34 +-
 lib/cmsis/inc/core_cm55.h          | 4817 ++++++++++++++++++++++++++++
 lib/cmsis/inc/core_cm7.h           |  395 +--
 lib/cmsis/inc/core_cm85.h          | 4672 +++++++++++++++++++++++++++
 lib/cmsis/inc/core_sc000.h         |   16 +-
 lib/cmsis/inc/core_sc300.h         |   68 +-
 lib/cmsis/inc/core_starmc1.h       | 3592 +++++++++++++++++++++
 lib/cmsis/inc/mpu_armv7.h          |   17 +-
 lib/cmsis/inc/mpu_armv8.h          |   36 +-
 lib/cmsis/inc/pac_armv81.h         |  206 ++
 lib/cmsis/inc/pmu_armv8.h          |  337 ++
 29 files changed, 21432 insertions(+), 4341 deletions(-)
 create mode 100644 lib/cmsis/inc/cachel1_armv7.h
 create mode 100644 lib/cmsis/inc/core_cm55.h
 create mode 100644 lib/cmsis/inc/core_cm85.h
 create mode 100644 lib/cmsis/inc/core_starmc1.h
 create mode 100644 lib/cmsis/inc/pac_armv81.h
 create mode 100644 lib/cmsis/inc/pmu_armv8.h

diff --git a/lib/cmsis/inc/cachel1_armv7.h b/lib/cmsis/inc/cachel1_armv7.h
new file mode 100644
index 0000000000000..abebc95f94602
--- /dev/null
+++ b/lib/cmsis/inc/cachel1_armv7.h
@@ -0,0 +1,411 @@
+/******************************************************************************
+ * @file     cachel1_armv7.h
+ * @brief    CMSIS Level 1 Cache API for Armv7-M and later
+ * @version  V1.0.1
+ * @date     19. April 2021
+ ******************************************************************************/
+/*
+ * Copyright (c) 2020-2021 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
+ *
+ * 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.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include         /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header    /* treat file as system include file */
+#endif
+
+#ifndef ARM_CACHEL1_ARMV7_H
+#define ARM_CACHEL1_ARMV7_H
+
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_CacheFunctions Cache Functions
+  \brief    Functions that configure Instruction and Data cache.
+  @{
+ */
+
+/* Cache Size ID Register Macros */
+#define CCSIDR_WAYS(x)         (((x) & SCB_CCSIDR_ASSOCIATIVITY_Msk) >> SCB_CCSIDR_ASSOCIATIVITY_Pos)
+#define CCSIDR_SETS(x)         (((x) & SCB_CCSIDR_NUMSETS_Msk      ) >> SCB_CCSIDR_NUMSETS_Pos      )
+
+#ifndef __SCB_DCACHE_LINE_SIZE
+#define __SCB_DCACHE_LINE_SIZE  32U /*!< Cortex-M7 cache line size is fixed to 32 bytes (8 words). See also register SCB_CCSIDR */
+#endif
+
+#ifndef __SCB_ICACHE_LINE_SIZE
+#define __SCB_ICACHE_LINE_SIZE  32U /*!< Cortex-M7 cache line size is fixed to 32 bytes (8 words). See also register SCB_CCSIDR */
+#endif
+
+/**
+  \brief   Enable I-Cache
+  \details Turns on I-Cache
+  */
+__STATIC_FORCEINLINE void SCB_EnableICache (void)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    if (SCB->CCR & SCB_CCR_IC_Msk) return;  /* return if ICache is already enabled */
+
+    __DSB();
+    __ISB();
+    SCB->ICIALLU = 0UL;                     /* invalidate I-Cache */
+    __DSB();
+    __ISB();
+    SCB->CCR |=  (uint32_t)SCB_CCR_IC_Msk;  /* enable I-Cache */
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Disable I-Cache
+  \details Turns off I-Cache
+  */
+__STATIC_FORCEINLINE void SCB_DisableICache (void)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    __DSB();
+    __ISB();
+    SCB->CCR &= ~(uint32_t)SCB_CCR_IC_Msk;  /* disable I-Cache */
+    SCB->ICIALLU = 0UL;                     /* invalidate I-Cache */
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Invalidate I-Cache
+  \details Invalidates I-Cache
+  */
+__STATIC_FORCEINLINE void SCB_InvalidateICache (void)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    __DSB();
+    __ISB();
+    SCB->ICIALLU = 0UL;
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   I-Cache Invalidate by address
+  \details Invalidates I-Cache for the given address.
+           I-Cache is invalidated starting from a 32 byte aligned address in 32 byte granularity.
+           I-Cache memory blocks which are part of given address + given size are invalidated.
+  \param[in]   addr    address
+  \param[in]   isize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_InvalidateICache_by_Addr (volatile void *addr, int32_t isize)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    if ( isize > 0 ) {
+       int32_t op_size = isize + (((uint32_t)addr) & (__SCB_ICACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_ICACHE_LINE_SIZE - 1U) */;
+
+      __DSB();
+
+      do {
+        SCB->ICIMVAU = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr += __SCB_ICACHE_LINE_SIZE;
+        op_size -= __SCB_ICACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+
+/**
+  \brief   Enable D-Cache
+  \details Turns on D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_EnableDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    if (SCB->CCR & SCB_CCR_DC_Msk) return;  /* return if DCache is already enabled */
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCISW = (((sets << SCB_DCISW_SET_Pos) & SCB_DCISW_SET_Msk) |
+                      ((ways << SCB_DCISW_WAY_Pos) & SCB_DCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+    __DSB();
+
+    SCB->CCR |=  (uint32_t)SCB_CCR_DC_Msk;  /* enable D-Cache */
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Disable D-Cache
+  \details Turns off D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_DisableDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    SCB->CCR &= ~(uint32_t)SCB_CCR_DC_Msk;  /* disable D-Cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* clean & invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCCISW = (((sets << SCB_DCCISW_SET_Pos) & SCB_DCCISW_SET_Msk) |
+                       ((ways << SCB_DCCISW_WAY_Pos) & SCB_DCCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Invalidate D-Cache
+  \details Invalidates D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_InvalidateDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCISW = (((sets << SCB_DCISW_SET_Pos) & SCB_DCISW_SET_Msk) |
+                      ((ways << SCB_DCISW_WAY_Pos) & SCB_DCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Clean D-Cache
+  \details Cleans D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_CleanDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* clean D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCCSW = (((sets << SCB_DCCSW_SET_Pos) & SCB_DCCSW_SET_Msk) |
+                      ((ways << SCB_DCCSW_WAY_Pos) & SCB_DCCSW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Clean & Invalidate D-Cache
+  \details Cleans and Invalidates D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_CleanInvalidateDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* clean & invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCCISW = (((sets << SCB_DCCISW_SET_Pos) & SCB_DCCISW_SET_Msk) |
+                       ((ways << SCB_DCCISW_WAY_Pos) & SCB_DCCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   D-Cache Invalidate by address
+  \details Invalidates D-Cache for the given address.
+           D-Cache is invalidated starting from a 32 byte aligned address in 32 byte granularity.
+           D-Cache memory blocks which are part of given address + given size are invalidated.
+  \param[in]   addr    address
+  \param[in]   dsize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_InvalidateDCache_by_Addr (volatile void *addr, int32_t dsize)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    if ( dsize > 0 ) {
+       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
+
+      __DSB();
+
+      do {
+        SCB->DCIMVAC = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr += __SCB_DCACHE_LINE_SIZE;
+        op_size -= __SCB_DCACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+
+/**
+  \brief   D-Cache Clean by address
+  \details Cleans D-Cache for the given address
+           D-Cache is cleaned starting from a 32 byte aligned address in 32 byte granularity.
+           D-Cache memory blocks which are part of given address + given size are cleaned.
+  \param[in]   addr    address
+  \param[in]   dsize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_CleanDCache_by_Addr (volatile void *addr, int32_t dsize)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    if ( dsize > 0 ) {
+       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
+
+      __DSB();
+
+      do {
+        SCB->DCCMVAC = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr += __SCB_DCACHE_LINE_SIZE;
+        op_size -= __SCB_DCACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+
+/**
+  \brief   D-Cache Clean and Invalidate by address
+  \details Cleans and invalidates D_Cache for the given address
+           D-Cache is cleaned and invalidated starting from a 32 byte aligned address in 32 byte granularity.
+           D-Cache memory blocks which are part of given address + given size are cleaned and invalidated.
+  \param[in]   addr    address (aligned to 32-byte boundary)
+  \param[in]   dsize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_CleanInvalidateDCache_by_Addr (volatile void *addr, int32_t dsize)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    if ( dsize > 0 ) {
+       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
+
+      __DSB();
+
+      do {
+        SCB->DCCIMVAC = op_addr;            /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr +=          __SCB_DCACHE_LINE_SIZE;
+        op_size -=          __SCB_DCACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+/*@} end of CMSIS_Core_CacheFunctions */
+
+#endif /* ARM_CACHEL1_ARMV7_H */
diff --git a/lib/cmsis/inc/cmsis_armcc.h b/lib/cmsis/inc/cmsis_armcc.h
index 174d744033029..a955d4713911e 100644
--- a/lib/cmsis/inc/cmsis_armcc.h
+++ b/lib/cmsis/inc/cmsis_armcc.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     cmsis_armcc.h
  * @brief    CMSIS compiler ARMCC (Arm Compiler 5) header file
- * @version  V5.0.5
- * @date     14. December 2018
+ * @version  V5.3.2
+ * @date     27. May 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -46,6 +46,7 @@
 
   /* __ARM_ARCH_8M_BASE__  not applicable */
   /* __ARM_ARCH_8M_MAIN__  not applicable */
+  /* __ARM_ARCH_8_1M_MAIN__  not applicable */
 
 /* CMSIS compiler control DSP macros */
 #if ((defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     )
@@ -62,9 +63,9 @@
 #ifndef   __STATIC_INLINE
   #define __STATIC_INLINE                        static __inline
 #endif
-#ifndef   __STATIC_FORCEINLINE                 
+#ifndef   __STATIC_FORCEINLINE
   #define __STATIC_FORCEINLINE                   static __forceinline
-#endif           
+#endif
 #ifndef   __NO_RETURN
   #define __NO_RETURN                            __declspec(noreturn)
 #endif
@@ -104,279 +105,31 @@
 #ifndef   __RESTRICT
   #define __RESTRICT                             __restrict
 #endif
+#ifndef   __COMPILER_BARRIER
+  #define __COMPILER_BARRIER()                   __memory_changed()
+#endif
 
-/* ###########################  Core Function Access  ########################### */
-/** \ingroup  CMSIS_Core_FunctionInterface
-    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
-  @{
- */
-
-/**
-  \brief   Enable IRQ Interrupts
-  \details Enables IRQ interrupts by clearing the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-/* intrinsic void __enable_irq();     */
-
-
-/**
-  \brief   Disable IRQ Interrupts
-  \details Disables IRQ interrupts by setting the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-/* intrinsic void __disable_irq();    */
-
-/**
-  \brief   Get Control Register
-  \details Returns the content of the Control Register.
-  \return               Control Register value
- */
-__STATIC_INLINE uint32_t __get_CONTROL(void)
-{
-  register uint32_t __regControl         __ASM("control");
-  return(__regControl);
-}
-
-
-/**
-  \brief   Set Control Register
-  \details Writes the given value to the Control Register.
-  \param [in]    control  Control Register value to set
- */
-__STATIC_INLINE void __set_CONTROL(uint32_t control)
-{
-  register uint32_t __regControl         __ASM("control");
-  __regControl = control;
-}
-
-
-/**
-  \brief   Get IPSR Register
-  \details Returns the content of the IPSR Register.
-  \return               IPSR Register value
- */
-__STATIC_INLINE uint32_t __get_IPSR(void)
-{
-  register uint32_t __regIPSR          __ASM("ipsr");
-  return(__regIPSR);
-}
-
-
-/**
-  \brief   Get APSR Register
-  \details Returns the content of the APSR Register.
-  \return               APSR Register value
- */
-__STATIC_INLINE uint32_t __get_APSR(void)
-{
-  register uint32_t __regAPSR          __ASM("apsr");
-  return(__regAPSR);
-}
-
-
-/**
-  \brief   Get xPSR Register
-  \details Returns the content of the xPSR Register.
-  \return               xPSR Register value
- */
-__STATIC_INLINE uint32_t __get_xPSR(void)
-{
-  register uint32_t __regXPSR          __ASM("xpsr");
-  return(__regXPSR);
-}
-
-
-/**
-  \brief   Get Process Stack Pointer
-  \details Returns the current value of the Process Stack Pointer (PSP).
-  \return               PSP Register value
- */
-__STATIC_INLINE uint32_t __get_PSP(void)
-{
-  register uint32_t __regProcessStackPointer  __ASM("psp");
-  return(__regProcessStackPointer);
-}
-
-
-/**
-  \brief   Set Process Stack Pointer
-  \details Assigns the given value to the Process Stack Pointer (PSP).
-  \param [in]    topOfProcStack  Process Stack Pointer value to set
- */
-__STATIC_INLINE void __set_PSP(uint32_t topOfProcStack)
-{
-  register uint32_t __regProcessStackPointer  __ASM("psp");
-  __regProcessStackPointer = topOfProcStack;
-}
-
-
-/**
-  \brief   Get Main Stack Pointer
-  \details Returns the current value of the Main Stack Pointer (MSP).
-  \return               MSP Register value
- */
-__STATIC_INLINE uint32_t __get_MSP(void)
-{
-  register uint32_t __regMainStackPointer     __ASM("msp");
-  return(__regMainStackPointer);
-}
-
-
-/**
-  \brief   Set Main Stack Pointer
-  \details Assigns the given value to the Main Stack Pointer (MSP).
-  \param [in]    topOfMainStack  Main Stack Pointer value to set
- */
-__STATIC_INLINE void __set_MSP(uint32_t topOfMainStack)
-{
-  register uint32_t __regMainStackPointer     __ASM("msp");
-  __regMainStackPointer = topOfMainStack;
-}
-
-
-/**
-  \brief   Get Priority Mask
-  \details Returns the current state of the priority mask bit from the Priority Mask Register.
-  \return               Priority Mask value
- */
-__STATIC_INLINE uint32_t __get_PRIMASK(void)
-{
-  register uint32_t __regPriMask         __ASM("primask");
-  return(__regPriMask);
-}
-
-
-/**
-  \brief   Set Priority Mask
-  \details Assigns the given value to the Priority Mask Register.
-  \param [in]    priMask  Priority Mask
- */
-__STATIC_INLINE void __set_PRIMASK(uint32_t priMask)
-{
-  register uint32_t __regPriMask         __ASM("primask");
-  __regPriMask = (priMask);
-}
-
-
-#if ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
-     (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     )
-
-/**
-  \brief   Enable FIQ
-  \details Enables FIQ interrupts by clearing the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-#define __enable_fault_irq                __enable_fiq
-
-
-/**
-  \brief   Disable FIQ
-  \details Disables FIQ interrupts by setting the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-#define __disable_fault_irq               __disable_fiq
-
-
-/**
-  \brief   Get Base Priority
-  \details Returns the current value of the Base Priority register.
-  \return               Base Priority register value
- */
-__STATIC_INLINE uint32_t  __get_BASEPRI(void)
-{
-  register uint32_t __regBasePri         __ASM("basepri");
-  return(__regBasePri);
-}
-
-
-/**
-  \brief   Set Base Priority
-  \details Assigns the given value to the Base Priority register.
-  \param [in]    basePri  Base Priority value to set
- */
-__STATIC_INLINE void __set_BASEPRI(uint32_t basePri)
-{
-  register uint32_t __regBasePri         __ASM("basepri");
-  __regBasePri = (basePri & 0xFFU);
-}
-
-
-/**
-  \brief   Set Base Priority with condition
-  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
-           or the new value increases the BASEPRI priority level.
-  \param [in]    basePri  Base Priority value to set
- */
-__STATIC_INLINE void __set_BASEPRI_MAX(uint32_t basePri)
-{
-  register uint32_t __regBasePriMax      __ASM("basepri_max");
-  __regBasePriMax = (basePri & 0xFFU);
-}
-
-
-/**
-  \brief   Get Fault Mask
-  \details Returns the current value of the Fault Mask register.
-  \return               Fault Mask register value
- */
-__STATIC_INLINE uint32_t __get_FAULTMASK(void)
-{
-  register uint32_t __regFaultMask       __ASM("faultmask");
-  return(__regFaultMask);
-}
-
-
-/**
-  \brief   Set Fault Mask
-  \details Assigns the given value to the Fault Mask register.
-  \param [in]    faultMask  Fault Mask value to set
- */
-__STATIC_INLINE void __set_FAULTMASK(uint32_t faultMask)
-{
-  register uint32_t __regFaultMask       __ASM("faultmask");
-  __regFaultMask = (faultMask & (uint32_t)1U);
-}
-
-#endif /* ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
-           (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     ) */
-
+/* #########################  Startup and Lowlevel Init  ######################## */
 
-/**
-  \brief   Get FPSCR
-  \details Returns the current value of the Floating Point Status/Control register.
-  \return               Floating Point Status/Control register value
- */
-__STATIC_INLINE uint32_t __get_FPSCR(void)
-{
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-  register uint32_t __regfpscr         __ASM("fpscr");
-  return(__regfpscr);
-#else
-   return(0U);
+#ifndef __PROGRAM_START
+#define __PROGRAM_START           __main
 #endif
-}
-
 
-/**
-  \brief   Set FPSCR
-  \details Assigns the given value to the Floating Point Status/Control register.
-  \param [in]    fpscr  Floating Point Status/Control value to set
- */
-__STATIC_INLINE void __set_FPSCR(uint32_t fpscr)
-{
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-  register uint32_t __regfpscr         __ASM("fpscr");
-  __regfpscr = (fpscr);
-#else
-  (void)fpscr;
+#ifndef __INITIAL_SP
+#define __INITIAL_SP              Image$$ARM_LIB_STACK$$ZI$$Limit
 #endif
-}
 
+#ifndef __STACK_LIMIT
+#define __STACK_LIMIT             Image$$ARM_LIB_STACK$$ZI$$Base
+#endif
 
-/*@} end of CMSIS_Core_RegAccFunctions */
+#ifndef __VECTOR_TABLE
+#define __VECTOR_TABLE            __Vectors
+#endif
 
+#ifndef __VECTOR_TABLE_ATTRIBUTE
+#define __VECTOR_TABLE_ATTRIBUTE  __attribute__((used, section("RESET")))
+#endif
 
 /* ##########################  Core Instruction Access  ######################### */
 /** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
@@ -419,35 +172,23 @@ __STATIC_INLINE void __set_FPSCR(uint32_t fpscr)
            so that all instructions following the ISB are fetched from cache or memory,
            after the instruction has been completed.
  */
-#define __ISB() do {\
-                   __schedule_barrier();\
-                   __isb(0xF);\
-                   __schedule_barrier();\
-                } while (0U)
+#define __ISB()                           __isb(0xF)
 
 /**
   \brief   Data Synchronization Barrier
   \details Acts as a special kind of Data Memory Barrier.
            It completes when all explicit memory accesses before this instruction complete.
  */
-#define __DSB() do {\
-                   __schedule_barrier();\
-                   __dsb(0xF);\
-                   __schedule_barrier();\
-                } while (0U)
+#define __DSB()                           __dsb(0xF)
 
 /**
   \brief   Data Memory Barrier
   \details Ensures the apparent order of the explicit memory operations before
            and after the instruction, without ensuring their completion.
  */
-#define __DMB() do {\
-                   __schedule_barrier();\
-                   __dmb(0xF);\
-                   __schedule_barrier();\
-                } while (0U)
+#define __DMB()                           __dmb(0xF)
+
 
-                  
 /**
   \brief   Reverse byte order (32 bit)
   \details Reverses the byte order in unsigned integer value. For example, 0x12345678 becomes 0x78563412.
@@ -602,187 +343,461 @@ __attribute__((always_inline)) __STATIC_INLINE uint32_t __RBIT(uint32_t value)
 
 
 /**
-  \brief   STR Exclusive (16 bit)
-  \details Executes a exclusive STR instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   STR Exclusive (16 bit)
+  \details Executes a exclusive STR instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
+ */
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION < 5060020)
+  #define __STREXH(value, ptr)                                                 __strex(value, ptr)
+#else
+  #define __STREXH(value, ptr)   _Pragma("push") _Pragma("diag_suppress 3731") __strex(value, ptr)        _Pragma("pop")
+#endif
+
+
+/**
+  \brief   STR Exclusive (32 bit)
+  \details Executes a exclusive STR instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
+ */
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION < 5060020)
+  #define __STREXW(value, ptr)                                                 __strex(value, ptr)
+#else
+  #define __STREXW(value, ptr)   _Pragma("push") _Pragma("diag_suppress 3731") __strex(value, ptr)        _Pragma("pop")
+#endif
+
+
+/**
+  \brief   Remove the exclusive lock
+  \details Removes the exclusive lock which is created by LDREX.
+ */
+#define __CLREX                           __clrex
+
+
+/**
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (1..32)
+  \return             Saturated value
+ */
+#define __SSAT                            __ssat
+
+
+/**
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (0..31)
+  \return             Saturated value
+ */
+#define __USAT                            __usat
+
+
+/**
+  \brief   Rotate Right with Extend (32 bit)
+  \details Moves each bit of a bitstring right by one bit.
+           The carry input is shifted in at the left end of the bitstring.
+  \param [in]    value  Value to rotate
+  \return               Rotated value
+ */
+#ifndef __NO_EMBEDDED_ASM
+__attribute__((section(".rrx_text"))) __STATIC_INLINE __ASM uint32_t __RRX(uint32_t value)
+{
+  rrx r0, r0
+  bx lr
+}
+#endif
+
+
+/**
+  \brief   LDRT Unprivileged (8 bit)
+  \details Executes a Unprivileged LDRT instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
+ */
+#define __LDRBT(ptr)                      ((uint8_t )  __ldrt(ptr))
+
+
+/**
+  \brief   LDRT Unprivileged (16 bit)
+  \details Executes a Unprivileged LDRT instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
+ */
+#define __LDRHT(ptr)                      ((uint16_t)  __ldrt(ptr))
+
+
+/**
+  \brief   LDRT Unprivileged (32 bit)
+  \details Executes a Unprivileged LDRT instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
+ */
+#define __LDRT(ptr)                       ((uint32_t ) __ldrt(ptr))
+
+
+/**
+  \brief   STRT Unprivileged (8 bit)
+  \details Executes a Unprivileged STRT instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+ */
+#define __STRBT(value, ptr)               __strt(value, ptr)
+
+
+/**
+  \brief   STRT Unprivileged (16 bit)
+  \details Executes a Unprivileged STRT instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+ */
+#define __STRHT(value, ptr)               __strt(value, ptr)
+
+
+/**
+  \brief   STRT Unprivileged (32 bit)
+  \details Executes a Unprivileged STRT instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+ */
+#define __STRT(value, ptr)                __strt(value, ptr)
+
+#else  /* ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
+           (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     ) */
+
+/**
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (1..32)
+  \return             Saturated value
+ */
+__attribute__((always_inline)) __STATIC_INLINE int32_t __SSAT(int32_t val, uint32_t sat)
+{
+  if ((sat >= 1U) && (sat <= 32U))
+  {
+    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
+    const int32_t min = -1 - max ;
+    if (val > max)
+    {
+      return max;
+    }
+    else if (val < min)
+    {
+      return min;
+    }
+  }
+  return val;
+}
+
+/**
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (0..31)
+  \return             Saturated value
+ */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __USAT(int32_t val, uint32_t sat)
+{
+  if (sat <= 31U)
+  {
+    const uint32_t max = ((1U << sat) - 1U);
+    if (val > (int32_t)max)
+    {
+      return max;
+    }
+    else if (val < 0)
+    {
+      return 0U;
+    }
+  }
+  return (uint32_t)val;
+}
+
+#endif /* ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
+           (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     ) */
+
+/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
+
+
+/* ###########################  Core Function Access  ########################### */
+/** \ingroup  CMSIS_Core_FunctionInterface
+    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
+  @{
+ */
+
+/**
+  \brief   Enable IRQ Interrupts
+  \details Enables IRQ interrupts by clearing special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
+ */
+/* intrinsic void __enable_irq();     */
+
+
+/**
+  \brief   Disable IRQ Interrupts
+  \details Disables IRQ interrupts by setting special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
+ */
+/* intrinsic void __disable_irq();    */
+
+/**
+  \brief   Get Control Register
+  \details Returns the content of the Control Register.
+  \return               Control Register value
+ */
+__STATIC_INLINE uint32_t __get_CONTROL(void)
+{
+  register uint32_t __regControl         __ASM("control");
+  return(__regControl);
+}
+
+
+/**
+  \brief   Set Control Register
+  \details Writes the given value to the Control Register.
+  \param [in]    control  Control Register value to set
+ */
+__STATIC_INLINE void __set_CONTROL(uint32_t control)
+{
+  register uint32_t __regControl         __ASM("control");
+  __regControl = control;
+  __ISB();
+}
+
+
+/**
+  \brief   Get IPSR Register
+  \details Returns the content of the IPSR Register.
+  \return               IPSR Register value
+ */
+__STATIC_INLINE uint32_t __get_IPSR(void)
+{
+  register uint32_t __regIPSR          __ASM("ipsr");
+  return(__regIPSR);
+}
+
+
+/**
+  \brief   Get APSR Register
+  \details Returns the content of the APSR Register.
+  \return               APSR Register value
+ */
+__STATIC_INLINE uint32_t __get_APSR(void)
+{
+  register uint32_t __regAPSR          __ASM("apsr");
+  return(__regAPSR);
+}
+
+
+/**
+  \brief   Get xPSR Register
+  \details Returns the content of the xPSR Register.
+  \return               xPSR Register value
+ */
+__STATIC_INLINE uint32_t __get_xPSR(void)
+{
+  register uint32_t __regXPSR          __ASM("xpsr");
+  return(__regXPSR);
+}
+
+
+/**
+  \brief   Get Process Stack Pointer
+  \details Returns the current value of the Process Stack Pointer (PSP).
+  \return               PSP Register value
  */
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION < 5060020)
-  #define __STREXH(value, ptr)                                                 __strex(value, ptr)
-#else
-  #define __STREXH(value, ptr)   _Pragma("push") _Pragma("diag_suppress 3731") __strex(value, ptr)        _Pragma("pop")
-#endif
+__STATIC_INLINE uint32_t __get_PSP(void)
+{
+  register uint32_t __regProcessStackPointer  __ASM("psp");
+  return(__regProcessStackPointer);
+}
 
 
 /**
-  \brief   STR Exclusive (32 bit)
-  \details Executes a exclusive STR instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set Process Stack Pointer
+  \details Assigns the given value to the Process Stack Pointer (PSP).
+  \param [in]    topOfProcStack  Process Stack Pointer value to set
  */
-#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION < 5060020)
-  #define __STREXW(value, ptr)                                                 __strex(value, ptr)
-#else
-  #define __STREXW(value, ptr)   _Pragma("push") _Pragma("diag_suppress 3731") __strex(value, ptr)        _Pragma("pop")
-#endif
+__STATIC_INLINE void __set_PSP(uint32_t topOfProcStack)
+{
+  register uint32_t __regProcessStackPointer  __ASM("psp");
+  __regProcessStackPointer = topOfProcStack;
+}
 
 
 /**
-  \brief   Remove the exclusive lock
-  \details Removes the exclusive lock which is created by LDREX.
+  \brief   Get Main Stack Pointer
+  \details Returns the current value of the Main Stack Pointer (MSP).
+  \return               MSP Register value
  */
-#define __CLREX                           __clrex
+__STATIC_INLINE uint32_t __get_MSP(void)
+{
+  register uint32_t __regMainStackPointer     __ASM("msp");
+  return(__regMainStackPointer);
+}
 
 
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Set Main Stack Pointer
+  \details Assigns the given value to the Main Stack Pointer (MSP).
+  \param [in]    topOfMainStack  Main Stack Pointer value to set
  */
-#define __SSAT                            __ssat
+__STATIC_INLINE void __set_MSP(uint32_t topOfMainStack)
+{
+  register uint32_t __regMainStackPointer     __ASM("msp");
+  __regMainStackPointer = topOfMainStack;
+}
 
 
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (0..31)
-  \return             Saturated value
+  \brief   Get Priority Mask
+  \details Returns the current state of the priority mask bit from the Priority Mask Register.
+  \return               Priority Mask value
  */
-#define __USAT                            __usat
+__STATIC_INLINE uint32_t __get_PRIMASK(void)
+{
+  register uint32_t __regPriMask         __ASM("primask");
+  return(__regPriMask);
+}
 
 
 /**
-  \brief   Rotate Right with Extend (32 bit)
-  \details Moves each bit of a bitstring right by one bit.
-           The carry input is shifted in at the left end of the bitstring.
-  \param [in]    value  Value to rotate
-  \return               Rotated value
+  \brief   Set Priority Mask
+  \details Assigns the given value to the Priority Mask Register.
+  \param [in]    priMask  Priority Mask
  */
-#ifndef __NO_EMBEDDED_ASM
-__attribute__((section(".rrx_text"))) __STATIC_INLINE __ASM uint32_t __RRX(uint32_t value)
+__STATIC_INLINE void __set_PRIMASK(uint32_t priMask)
 {
-  rrx r0, r0
-  bx lr
+  register uint32_t __regPriMask         __ASM("primask");
+  __regPriMask = (priMask);
 }
-#endif
 
 
+#if ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
+     (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     )
+
 /**
-  \brief   LDRT Unprivileged (8 bit)
-  \details Executes a Unprivileged LDRT instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Enable FIQ
+  \details Enables FIQ interrupts by clearing special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
  */
-#define __LDRBT(ptr)                      ((uint8_t )  __ldrt(ptr))
+#define __enable_fault_irq                __enable_fiq
 
 
 /**
-  \brief   LDRT Unprivileged (16 bit)
-  \details Executes a Unprivileged LDRT instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Disable FIQ
+  \details Disables FIQ interrupts by setting special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
  */
-#define __LDRHT(ptr)                      ((uint16_t)  __ldrt(ptr))
+#define __disable_fault_irq               __disable_fiq
 
 
 /**
-  \brief   LDRT Unprivileged (32 bit)
-  \details Executes a Unprivileged LDRT instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Get Base Priority
+  \details Returns the current value of the Base Priority register.
+  \return               Base Priority register value
  */
-#define __LDRT(ptr)                       ((uint32_t ) __ldrt(ptr))
+__STATIC_INLINE uint32_t  __get_BASEPRI(void)
+{
+  register uint32_t __regBasePri         __ASM("basepri");
+  return(__regBasePri);
+}
 
 
 /**
-  \brief   STRT Unprivileged (8 bit)
-  \details Executes a Unprivileged STRT instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Base Priority
+  \details Assigns the given value to the Base Priority register.
+  \param [in]    basePri  Base Priority value to set
  */
-#define __STRBT(value, ptr)               __strt(value, ptr)
+__STATIC_INLINE void __set_BASEPRI(uint32_t basePri)
+{
+  register uint32_t __regBasePri         __ASM("basepri");
+  __regBasePri = (basePri & 0xFFU);
+}
 
 
 /**
-  \brief   STRT Unprivileged (16 bit)
-  \details Executes a Unprivileged STRT instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Base Priority with condition
+  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
+           or the new value increases the BASEPRI priority level.
+  \param [in]    basePri  Base Priority value to set
  */
-#define __STRHT(value, ptr)               __strt(value, ptr)
+__STATIC_INLINE void __set_BASEPRI_MAX(uint32_t basePri)
+{
+  register uint32_t __regBasePriMax      __ASM("basepri_max");
+  __regBasePriMax = (basePri & 0xFFU);
+}
 
 
 /**
-  \brief   STRT Unprivileged (32 bit)
-  \details Executes a Unprivileged STRT instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Fault Mask
+  \details Returns the current value of the Fault Mask register.
+  \return               Fault Mask register value
  */
-#define __STRT(value, ptr)                __strt(value, ptr)
+__STATIC_INLINE uint32_t __get_FAULTMASK(void)
+{
+  register uint32_t __regFaultMask       __ASM("faultmask");
+  return(__regFaultMask);
+}
 
-#else  /* ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
+
+/**
+  \brief   Set Fault Mask
+  \details Assigns the given value to the Fault Mask register.
+  \param [in]    faultMask  Fault Mask value to set
+ */
+__STATIC_INLINE void __set_FAULTMASK(uint32_t faultMask)
+{
+  register uint32_t __regFaultMask       __ASM("faultmask");
+  __regFaultMask = (faultMask & (uint32_t)1U);
+}
+
+#endif /* ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
            (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     ) */
 
+
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Get FPSCR
+  \details Returns the current value of the Floating Point Status/Control register.
+  \return               Floating Point Status/Control register value
  */
-__attribute__((always_inline)) __STATIC_INLINE int32_t __SSAT(int32_t val, uint32_t sat)
+__STATIC_INLINE uint32_t __get_FPSCR(void)
 {
-  if ((sat >= 1U) && (sat <= 32U))
-  {
-    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
-    const int32_t min = -1 - max ;
-    if (val > max)
-    {
-      return max;
-    }
-    else if (val < min)
-    {
-      return min;
-    }
-  }
-  return val;
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+  register uint32_t __regfpscr         __ASM("fpscr");
+  return(__regfpscr);
+#else
+   return(0U);
+#endif
 }
 
+
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (0..31)
-  \return             Saturated value
+  \brief   Set FPSCR
+  \details Assigns the given value to the Floating Point Status/Control register.
+  \param [in]    fpscr  Floating Point Status/Control value to set
  */
-__attribute__((always_inline)) __STATIC_INLINE uint32_t __USAT(int32_t val, uint32_t sat)
+__STATIC_INLINE void __set_FPSCR(uint32_t fpscr)
 {
-  if (sat <= 31U)
-  {
-    const uint32_t max = ((1U << sat) - 1U);
-    if (val > (int32_t)max)
-    {
-      return max;
-    }
-    else if (val < 0)
-    {
-      return 0U;
-    }
-  }
-  return (uint32_t)val;
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+  register uint32_t __regfpscr         __ASM("fpscr");
+  __regfpscr = (fpscr);
+#else
+  (void)fpscr;
+#endif
 }
 
-#endif /* ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__  == 1)) || \
-           (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     ) */
 
-/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
+/*@} end of CMSIS_Core_RegAccFunctions */
 
 
 /* ###################  Compiler specific Intrinsics  ########################### */
@@ -862,6 +877,10 @@ __attribute__((always_inline)) __STATIC_INLINE uint32_t __USAT(int32_t val, uint
 #define __SMMLA(ARG1,ARG2,ARG3)          ( (int32_t)((((int64_t)(ARG1) * (ARG2)) + \
                                                       ((int64_t)(ARG3) << 32U)     ) >> 32U))
 
+#define __SXTB16_RORn(ARG1, ARG2)        __SXTB16(__ROR(ARG1, ARG2))
+
+#define __SXTAB16_RORn(ARG1, ARG2, ARG3) __SXTAB16(ARG1, __ROR(ARG2, ARG3))
+
 #endif /* ((defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1))     ) */
 /*@} end of group CMSIS_SIMD_intrinsics */
 
diff --git a/lib/cmsis/inc/cmsis_armclang.h b/lib/cmsis/inc/cmsis_armclang.h
index 6a8867d57417e..691141774773f 100644
--- a/lib/cmsis/inc/cmsis_armclang.h
+++ b/lib/cmsis/inc/cmsis_armclang.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     cmsis_armclang.h
  * @brief    CMSIS compiler armclang (Arm Compiler 6) header file
- * @version  V5.1.0
- * @date     14. March 2019
+ * @version  V5.4.3
+ * @date     27. May 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -29,10 +29,6 @@
 
 #pragma clang system_header   /* treat file as system include file */
 
-#ifndef __ARM_COMPAT_H
-#include <arm_compat.h>    /* Compatibility header for Arm Compiler 5 intrinsics */
-#endif
-
 /* CMSIS compiler specific defines */
 #ifndef   __ASM
   #define __ASM                                  __asm
@@ -110,1225 +106,1308 @@
 #ifndef   __RESTRICT
   #define __RESTRICT                             __restrict
 #endif
+#ifndef   __COMPILER_BARRIER
+  #define __COMPILER_BARRIER()                   __ASM volatile("":::"memory")
+#endif
 
+/* #########################  Startup and Lowlevel Init  ######################## */
 
-/* ###########################  Core Function Access  ########################### */
-/** \ingroup  CMSIS_Core_FunctionInterface
-    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
-  @{
- */
+#ifndef __PROGRAM_START
+#define __PROGRAM_START           __main
+#endif
 
-/**
-  \brief   Enable IRQ Interrupts
-  \details Enables IRQ interrupts by clearing the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-/* intrinsic void __enable_irq();  see arm_compat.h */
+#ifndef __INITIAL_SP
+#define __INITIAL_SP              Image$$ARM_LIB_STACK$$ZI$$Limit
+#endif
 
+#ifndef __STACK_LIMIT
+#define __STACK_LIMIT             Image$$ARM_LIB_STACK$$ZI$$Base
+#endif
 
-/**
-  \brief   Disable IRQ Interrupts
-  \details Disables IRQ interrupts by setting the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-/* intrinsic void __disable_irq();  see arm_compat.h */
+#ifndef __VECTOR_TABLE
+#define __VECTOR_TABLE            __Vectors
+#endif
 
+#ifndef __VECTOR_TABLE_ATTRIBUTE
+#define __VECTOR_TABLE_ATTRIBUTE  __attribute__((used, section("RESET")))
+#endif
 
-/**
-  \brief   Get Control Register
-  \details Returns the content of the Control Register.
-  \return               Control Register value
- */
-__STATIC_FORCEINLINE uint32_t __get_CONTROL(void)
-{
-  uint32_t result;
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+#ifndef __STACK_SEAL
+#define __STACK_SEAL              Image$$STACKSEAL$$ZI$$Base
+#endif
 
-  __ASM volatile ("MRS %0, control" : "=r" (result) );
-  return(result);
-}
+#ifndef __TZ_STACK_SEAL_SIZE
+#define __TZ_STACK_SEAL_SIZE      8U
+#endif
 
+#ifndef __TZ_STACK_SEAL_VALUE
+#define __TZ_STACK_SEAL_VALUE     0xFEF5EDA5FEF5EDA5ULL
+#endif
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
-/**
-  \brief   Get Control Register (non-secure)
-  \details Returns the content of the non-secure Control Register when in secure mode.
-  \return               non-secure Control Register value
- */
-__STATIC_FORCEINLINE uint32_t __TZ_get_CONTROL_NS(void)
-{
-  uint32_t result;
 
-  __ASM volatile ("MRS %0, control_ns" : "=r" (result) );
-  return(result);
+__STATIC_FORCEINLINE void __TZ_set_STACKSEAL_S (uint32_t* stackTop) {
+  *((uint64_t *)stackTop) = __TZ_STACK_SEAL_VALUE;
 }
 #endif
 
 
-/**
-  \brief   Set Control Register
-  \details Writes the given value to the Control Register.
-  \param [in]    control  Control Register value to set
- */
-__STATIC_FORCEINLINE void __set_CONTROL(uint32_t control)
-{
-  __ASM volatile ("MSR control, %0" : : "r" (control) : "memory");
-}
+/* ##########################  Core Instruction Access  ######################### */
+/** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
+  Access to dedicated instructions
+  @{
+*/
 
+/* Define macros for porting to both thumb1 and thumb2.
+ * For thumb1, use low register (r0-r7), specified by constraint "l"
+ * Otherwise, use general registers, specified by constraint "r" */
+#if defined (__thumb__) && !defined (__thumb2__)
+#define __CMSIS_GCC_OUT_REG(r) "=l" (r)
+#define __CMSIS_GCC_RW_REG(r) "+l" (r)
+#define __CMSIS_GCC_USE_REG(r) "l" (r)
+#else
+#define __CMSIS_GCC_OUT_REG(r) "=r" (r)
+#define __CMSIS_GCC_RW_REG(r) "+r" (r)
+#define __CMSIS_GCC_USE_REG(r) "r" (r)
+#endif
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Control Register (non-secure)
-  \details Writes the given value to the non-secure Control Register when in secure state.
-  \param [in]    control  Control Register value to set
+  \brief   No Operation
+  \details No Operation does nothing. This instruction can be used for code alignment purposes.
  */
-__STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
-{
-  __ASM volatile ("MSR control_ns, %0" : : "r" (control) : "memory");
-}
-#endif
-
+#define __NOP          __builtin_arm_nop
 
 /**
-  \brief   Get IPSR Register
-  \details Returns the content of the IPSR Register.
-  \return               IPSR Register value
+  \brief   Wait For Interrupt
+  \details Wait For Interrupt is a hint instruction that suspends execution until one of a number of events occurs.
  */
-__STATIC_FORCEINLINE uint32_t __get_IPSR(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, ipsr" : "=r" (result) );
-  return(result);
-}
+#define __WFI          __builtin_arm_wfi
 
 
 /**
-  \brief   Get APSR Register
-  \details Returns the content of the APSR Register.
-  \return               APSR Register value
+  \brief   Wait For Event
+  \details Wait For Event is a hint instruction that permits the processor to enter
+           a low-power state until one of a number of events occurs.
  */
-__STATIC_FORCEINLINE uint32_t __get_APSR(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, apsr" : "=r" (result) );
-  return(result);
-}
+#define __WFE          __builtin_arm_wfe
 
 
 /**
-  \brief   Get xPSR Register
-  \details Returns the content of the xPSR Register.
-  \return               xPSR Register value
+  \brief   Send Event
+  \details Send Event is a hint instruction. It causes an event to be signaled to the CPU.
  */
-__STATIC_FORCEINLINE uint32_t __get_xPSR(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, xpsr" : "=r" (result) );
-  return(result);
-}
+#define __SEV          __builtin_arm_sev
 
 
 /**
-  \brief   Get Process Stack Pointer
-  \details Returns the current value of the Process Stack Pointer (PSP).
-  \return               PSP Register value
+  \brief   Instruction Synchronization Barrier
+  \details Instruction Synchronization Barrier flushes the pipeline in the processor,
+           so that all instructions following the ISB are fetched from cache or memory,
+           after the instruction has been completed.
  */
-__STATIC_FORCEINLINE uint32_t __get_PSP(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, psp"  : "=r" (result) );
-  return(result);
-}
-
+#define __ISB()        __builtin_arm_isb(0xF)
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Process Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Process Stack Pointer (PSP) when in secure state.
-  \return               PSP Register value
+  \brief   Data Synchronization Barrier
+  \details Acts as a special kind of Data Memory Barrier.
+           It completes when all explicit memory accesses before this instruction complete.
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PSP_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, psp_ns"  : "=r" (result) );
-  return(result);
-}
-#endif
+#define __DSB()        __builtin_arm_dsb(0xF)
 
 
 /**
-  \brief   Set Process Stack Pointer
-  \details Assigns the given value to the Process Stack Pointer (PSP).
-  \param [in]    topOfProcStack  Process Stack Pointer value to set
+  \brief   Data Memory Barrier
+  \details Ensures the apparent order of the explicit memory operations before
+           and after the instruction, without ensuring their completion.
  */
-__STATIC_FORCEINLINE void __set_PSP(uint32_t topOfProcStack)
-{
-  __ASM volatile ("MSR psp, %0" : : "r" (topOfProcStack) : );
-}
+#define __DMB()        __builtin_arm_dmb(0xF)
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Process Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Process Stack Pointer (PSP) when in secure state.
-  \param [in]    topOfProcStack  Process Stack Pointer value to set
+  \brief   Reverse byte order (32 bit)
+  \details Reverses the byte order in unsigned integer value. For example, 0x12345678 becomes 0x78563412.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE void __TZ_set_PSP_NS(uint32_t topOfProcStack)
-{
-  __ASM volatile ("MSR psp_ns, %0" : : "r" (topOfProcStack) : );
-}
-#endif
+#define __REV(value)   __builtin_bswap32(value)
 
 
 /**
-  \brief   Get Main Stack Pointer
-  \details Returns the current value of the Main Stack Pointer (MSP).
-  \return               MSP Register value
+  \brief   Reverse byte order (16 bit)
+  \details Reverses the byte order within each halfword of a word. For example, 0x12345678 becomes 0x34127856.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __get_MSP(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, msp" : "=r" (result) );
-  return(result);
-}
+#define __REV16(value) __ROR(__REV(value), 16)
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Main Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Main Stack Pointer (MSP) when in secure state.
-  \return               MSP Register value
+  \brief   Reverse byte order (16 bit)
+  \details Reverses the byte order in a 16-bit value and returns the signed 16-bit result. For example, 0x0080 becomes 0x8000.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_MSP_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, msp_ns" : "=r" (result) );
-  return(result);
-}
-#endif
+#define __REVSH(value) (int16_t)__builtin_bswap16(value)
 
 
 /**
-  \brief   Set Main Stack Pointer
-  \details Assigns the given value to the Main Stack Pointer (MSP).
-  \param [in]    topOfMainStack  Main Stack Pointer value to set
+  \brief   Rotate Right in unsigned value (32 bit)
+  \details Rotate Right (immediate) provides the value of the contents of a register rotated by a variable number of bits.
+  \param [in]    op1  Value to rotate
+  \param [in]    op2  Number of Bits to rotate
+  \return               Rotated value
  */
-__STATIC_FORCEINLINE void __set_MSP(uint32_t topOfMainStack)
+__STATIC_FORCEINLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
 {
-  __ASM volatile ("MSR msp, %0" : : "r" (topOfMainStack) : );
+  op2 %= 32U;
+  if (op2 == 0U)
+  {
+    return op1;
+  }
+  return (op1 >> op2) | (op1 << (32U - op2));
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Main Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Main Stack Pointer (MSP) when in secure state.
-  \param [in]    topOfMainStack  Main Stack Pointer value to set
+  \brief   Breakpoint
+  \details Causes the processor to enter Debug state.
+           Debug tools can use this to investigate system state when the instruction at a particular address is reached.
+  \param [in]    value  is ignored by the processor.
+                 If required, a debugger can use it to store additional information about the breakpoint.
  */
-__STATIC_FORCEINLINE void __TZ_set_MSP_NS(uint32_t topOfMainStack)
-{
-  __ASM volatile ("MSR msp_ns, %0" : : "r" (topOfMainStack) : );
-}
-#endif
+#define __BKPT(value)     __ASM volatile ("bkpt "#value)
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Stack Pointer (SP) when in secure state.
-  \return               SP Register value
+  \brief   Reverse bit order of value
+  \details Reverses the bit order of the given value.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_SP_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, sp_ns" : "=r" (result) );
-  return(result);
-}
-
+#define __RBIT            __builtin_arm_rbit
 
 /**
-  \brief   Set Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Stack Pointer (SP) when in secure state.
-  \param [in]    topOfStack  Stack Pointer value to set
+  \brief   Count leading zeros
+  \details Counts the number of leading zeros of a data value.
+  \param [in]  value  Value to count the leading zeros
+  \return             number of leading zeros in value
  */
-__STATIC_FORCEINLINE void __TZ_set_SP_NS(uint32_t topOfStack)
+__STATIC_FORCEINLINE uint8_t __CLZ(uint32_t value)
 {
-  __ASM volatile ("MSR sp_ns, %0" : : "r" (topOfStack) : );
+  /* Even though __builtin_clz produces a CLZ instruction on ARM, formally
+     __builtin_clz(0) is undefined behaviour, so handle this case specially.
+     This guarantees ARM-compatible results if happening to compile on a non-ARM
+     target, and ensures the compiler doesn't decide to activate any
+     optimisations using the logic "value was passed to __builtin_clz, so it
+     is non-zero".
+     ARM Compiler 6.10 and possibly earlier will optimise this test away, leaving a
+     single CLZ instruction.
+   */
+  if (value == 0U)
+  {
+    return 32U;
+  }
+  return __builtin_clz(value);
 }
-#endif
 
 
+#if ((defined (__ARM_ARCH_7M__       ) && (__ARM_ARCH_7M__        == 1)) || \
+     (defined (__ARM_ARCH_7EM__      ) && (__ARM_ARCH_7EM__       == 1)) || \
+     (defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+     (defined (__ARM_ARCH_8M_BASE__  ) && (__ARM_ARCH_8M_BASE__   == 1)) || \
+     (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     )
+
 /**
-  \brief   Get Priority Mask
-  \details Returns the current state of the priority mask bit from the Priority Mask Register.
-  \return               Priority Mask value
+  \brief   LDR Exclusive (8 bit)
+  \details Executes a exclusive LDR instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_PRIMASK(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, primask" : "=r" (result) );
-  return(result);
-}
+#define __LDREXB        (uint8_t)__builtin_arm_ldrex
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Priority Mask (non-secure)
-  \details Returns the current state of the non-secure priority mask bit from the Priority Mask Register when in secure state.
-  \return               Priority Mask value
+  \brief   LDR Exclusive (16 bit)
+  \details Executes a exclusive LDR instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PRIMASK_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, primask_ns" : "=r" (result) );
-  return(result);
-}
-#endif
+#define __LDREXH        (uint16_t)__builtin_arm_ldrex
 
 
 /**
-  \brief   Set Priority Mask
-  \details Assigns the given value to the Priority Mask Register.
-  \param [in]    priMask  Priority Mask
+  \brief   LDR Exclusive (32 bit)
+  \details Executes a exclusive LDR instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __set_PRIMASK(uint32_t priMask)
-{
-  __ASM volatile ("MSR primask, %0" : : "r" (priMask) : "memory");
-}
+#define __LDREXW        (uint32_t)__builtin_arm_ldrex
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Priority Mask (non-secure)
-  \details Assigns the given value to the non-secure Priority Mask Register when in secure state.
-  \param [in]    priMask  Priority Mask
+  \brief   STR Exclusive (8 bit)
+  \details Executes a exclusive STR instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE void __TZ_set_PRIMASK_NS(uint32_t priMask)
-{
-  __ASM volatile ("MSR primask_ns, %0" : : "r" (priMask) : "memory");
-}
-#endif
+#define __STREXB        (uint32_t)__builtin_arm_strex
 
 
-#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
 /**
-  \brief   Enable FIQ
-  \details Enables FIQ interrupts by clearing the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
+  \brief   STR Exclusive (16 bit)
+  \details Executes a exclusive STR instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-#define __enable_fault_irq                __enable_fiq   /* see arm_compat.h */
+#define __STREXH        (uint32_t)__builtin_arm_strex
 
 
 /**
-  \brief   Disable FIQ
-  \details Disables FIQ interrupts by setting the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
+  \brief   STR Exclusive (32 bit)
+  \details Executes a exclusive STR instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-#define __disable_fault_irq               __disable_fiq   /* see arm_compat.h */
+#define __STREXW        (uint32_t)__builtin_arm_strex
 
 
 /**
-  \brief   Get Base Priority
-  \details Returns the current value of the Base Priority register.
-  \return               Base Priority register value
+  \brief   Remove the exclusive lock
+  \details Removes the exclusive lock which is created by LDREX.
  */
-__STATIC_FORCEINLINE uint32_t __get_BASEPRI(void)
-{
-  uint32_t result;
+#define __CLREX             __builtin_arm_clrex
 
-  __ASM volatile ("MRS %0, basepri" : "=r" (result) );
-  return(result);
-}
+#endif /* ((defined (__ARM_ARCH_7M__       ) && (__ARM_ARCH_7M__        == 1)) || \
+           (defined (__ARM_ARCH_7EM__      ) && (__ARM_ARCH_7EM__       == 1)) || \
+           (defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__  ) && (__ARM_ARCH_8M_BASE__   == 1)) || \
+           (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     ) */
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
+#if ((defined (__ARM_ARCH_7M__       ) && (__ARM_ARCH_7M__        == 1)) || \
+     (defined (__ARM_ARCH_7EM__      ) && (__ARM_ARCH_7EM__       == 1)) || \
+     (defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+     (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     )
+
 /**
-  \brief   Get Base Priority (non-secure)
-  \details Returns the current value of the non-secure Base Priority register when in secure state.
-  \return               Base Priority register value
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (1..32)
+  \return             Saturated value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_BASEPRI_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, basepri_ns" : "=r" (result) );
-  return(result);
-}
-#endif
+#define __SSAT             __builtin_arm_ssat
 
 
 /**
-  \brief   Set Base Priority
-  \details Assigns the given value to the Base Priority register.
-  \param [in]    basePri  Base Priority value to set
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (0..31)
+  \return             Saturated value
  */
-__STATIC_FORCEINLINE void __set_BASEPRI(uint32_t basePri)
-{
-  __ASM volatile ("MSR basepri, %0" : : "r" (basePri) : "memory");
-}
+#define __USAT             __builtin_arm_usat
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Base Priority (non-secure)
-  \details Assigns the given value to the non-secure Base Priority register when in secure state.
-  \param [in]    basePri  Base Priority value to set
+  \brief   Rotate Right with Extend (32 bit)
+  \details Moves each bit of a bitstring right by one bit.
+           The carry input is shifted in at the left end of the bitstring.
+  \param [in]    value  Value to rotate
+  \return               Rotated value
  */
-__STATIC_FORCEINLINE void __TZ_set_BASEPRI_NS(uint32_t basePri)
+__STATIC_FORCEINLINE uint32_t __RRX(uint32_t value)
 {
-  __ASM volatile ("MSR basepri_ns, %0" : : "r" (basePri) : "memory");
+  uint32_t result;
+
+  __ASM volatile ("rrx %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
+  return(result);
 }
-#endif
 
 
 /**
-  \brief   Set Base Priority with condition
-  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
-           or the new value increases the BASEPRI priority level.
-  \param [in]    basePri  Base Priority value to set
+  \brief   LDRT Unprivileged (8 bit)
+  \details Executes a Unprivileged LDRT instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __set_BASEPRI_MAX(uint32_t basePri)
+__STATIC_FORCEINLINE uint8_t __LDRBT(volatile uint8_t *ptr)
 {
-  __ASM volatile ("MSR basepri_max, %0" : : "r" (basePri) : "memory");
+  uint32_t result;
+
+  __ASM volatile ("ldrbt %0, %1" : "=r" (result) : "Q" (*ptr) );
+  return ((uint8_t) result);    /* Add explicit type cast here */
 }
 
 
 /**
-  \brief   Get Fault Mask
-  \details Returns the current value of the Fault Mask register.
-  \return               Fault Mask register value
+  \brief   LDRT Unprivileged (16 bit)
+  \details Executes a Unprivileged LDRT instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_FAULTMASK(void)
+__STATIC_FORCEINLINE uint16_t __LDRHT(volatile uint16_t *ptr)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, faultmask" : "=r" (result) );
-  return(result);
+  __ASM volatile ("ldrht %0, %1" : "=r" (result) : "Q" (*ptr) );
+  return ((uint16_t) result);    /* Add explicit type cast here */
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Fault Mask (non-secure)
-  \details Returns the current value of the non-secure Fault Mask register when in secure state.
-  \return               Fault Mask register value
+  \brief   LDRT Unprivileged (32 bit)
+  \details Executes a Unprivileged LDRT instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_FAULTMASK_NS(void)
+__STATIC_FORCEINLINE uint32_t __LDRT(volatile uint32_t *ptr)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, faultmask_ns" : "=r" (result) );
+  __ASM volatile ("ldrt %0, %1" : "=r" (result) : "Q" (*ptr) );
   return(result);
 }
-#endif
 
 
 /**
-  \brief   Set Fault Mask
-  \details Assigns the given value to the Fault Mask register.
-  \param [in]    faultMask  Fault Mask value to set
+  \brief   STRT Unprivileged (8 bit)
+  \details Executes a Unprivileged STRT instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __set_FAULTMASK(uint32_t faultMask)
+__STATIC_FORCEINLINE void __STRBT(uint8_t value, volatile uint8_t *ptr)
 {
-  __ASM volatile ("MSR faultmask, %0" : : "r" (faultMask) : "memory");
+  __ASM volatile ("strbt %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Fault Mask (non-secure)
-  \details Assigns the given value to the non-secure Fault Mask register when in secure state.
-  \param [in]    faultMask  Fault Mask value to set
+  \brief   STRT Unprivileged (16 bit)
+  \details Executes a Unprivileged STRT instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask)
+__STATIC_FORCEINLINE void __STRHT(uint16_t value, volatile uint16_t *ptr)
 {
-  __ASM volatile ("MSR faultmask_ns, %0" : : "r" (faultMask) : "memory");
+  __ASM volatile ("strht %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
 }
-#endif
-
-#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
-
 
-#if ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-     (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
 
 /**
-  \brief   Get Process Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always in non-secure
-  mode.
-  
-  \details Returns the current value of the Process Stack Pointer Limit (PSPLIM).
-  \return               PSPLIM Register value
+  \brief   STRT Unprivileged (32 bit)
+  \details Executes a Unprivileged STRT instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE uint32_t __get_PSPLIM(void)
+__STATIC_FORCEINLINE void __STRT(uint32_t value, volatile uint32_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-    // without main extensions, the non-secure PSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, psplim"  : "=r" (result) );
-  return result;
-#endif
+  __ASM volatile ("strt %1, %0" : "=Q" (*ptr) : "r" (value) );
 }
 
-#if (defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3))
-/**
-  \brief   Get Process Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always in non-secure
-  mode.
+#else /* ((defined (__ARM_ARCH_7M__       ) && (__ARM_ARCH_7M__        == 1)) || \
+          (defined (__ARM_ARCH_7EM__      ) && (__ARM_ARCH_7EM__       == 1)) || \
+          (defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+          (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     ) */
 
-  \details Returns the current value of the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
-  \return               PSPLIM Register value
+/**
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (1..32)
+  \return             Saturated value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PSPLIM_NS(void)
+__STATIC_FORCEINLINE int32_t __SSAT(int32_t val, uint32_t sat)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, psplim_ns"  : "=r" (result) );
-  return result;
-#endif
+  if ((sat >= 1U) && (sat <= 32U))
+  {
+    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
+    const int32_t min = -1 - max ;
+    if (val > max)
+    {
+      return max;
+    }
+    else if (val < min)
+    {
+      return min;
+    }
+  }
+  return val;
 }
-#endif
-
 
 /**
-  \brief   Set Process Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored in non-secure
-  mode.
-  
-  \details Assigns the given value to the Process Stack Pointer Limit (PSPLIM).
-  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (0..31)
+  \return             Saturated value
  */
-__STATIC_FORCEINLINE void __set_PSPLIM(uint32_t ProcStackPtrLimit)
+__STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  (void)ProcStackPtrLimit;
-#else
-  __ASM volatile ("MSR psplim, %0" : : "r" (ProcStackPtrLimit));
-#endif
+  if (sat <= 31U)
+  {
+    const uint32_t max = ((1U << sat) - 1U);
+    if (val > (int32_t)max)
+    {
+      return max;
+    }
+    else if (val < 0)
+    {
+      return 0U;
+    }
+  }
+  return (uint32_t)val;
 }
 
+#endif /* ((defined (__ARM_ARCH_7M__       ) && (__ARM_ARCH_7M__        == 1)) || \
+           (defined (__ARM_ARCH_7EM__      ) && (__ARM_ARCH_7EM__       == 1)) || \
+           (defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+           (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     ) */
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
-/**
-  \brief   Set Process Stack Pointer (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored in non-secure
-  mode.
 
-  \details Assigns the given value to the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
-  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
+#if ((defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+     (defined (__ARM_ARCH_8M_BASE__  ) && (__ARM_ARCH_8M_BASE__   == 1)) || \
+     (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     )
+
+/**
+  \brief   Load-Acquire (8 bit)
+  \details Executes a LDAB instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __TZ_set_PSPLIM_NS(uint32_t ProcStackPtrLimit)
+__STATIC_FORCEINLINE uint8_t __LDAB(volatile uint8_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  (void)ProcStackPtrLimit;
-#else
-  __ASM volatile ("MSR psplim_ns, %0\n" : : "r" (ProcStackPtrLimit));
-#endif
+  uint32_t result;
+
+  __ASM volatile ("ldab %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+  return ((uint8_t) result);
 }
-#endif
 
 
 /**
-  \brief   Get Main Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always.
-
-  \details Returns the current value of the Main Stack Pointer Limit (MSPLIM).
-  \return               MSPLIM Register value
+  \brief   Load-Acquire (16 bit)
+  \details Executes a LDAH instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_MSPLIM(void)
+__STATIC_FORCEINLINE uint16_t __LDAH(volatile uint16_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  return 0U;
-#else
   uint32_t result;
-  __ASM volatile ("MRS %0, msplim" : "=r" (result) );
-  return result;
-#endif
+
+  __ASM volatile ("ldah %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+  return ((uint16_t) result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Get Main Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always.
-
-  \details Returns the current value of the non-secure Main Stack Pointer Limit(MSPLIM) when in secure state.
-  \return               MSPLIM Register value
+  \brief   Load-Acquire (32 bit)
+  \details Executes a LDA instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_MSPLIM_NS(void)
+__STATIC_FORCEINLINE uint32_t __LDA(volatile uint32_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  return 0U;
-#else
   uint32_t result;
-  __ASM volatile ("MRS %0, msplim_ns" : "=r" (result) );
-  return result;
-#endif
+
+  __ASM volatile ("lda %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+  return(result);
 }
-#endif
 
 
 /**
-  \brief   Set Main Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored.
-
-  \details Assigns the given value to the Main Stack Pointer Limit (MSPLIM).
-  \param [in]    MainStackPtrLimit  Main Stack Pointer Limit value to set
+  \brief   Store-Release (8 bit)
+  \details Executes a STLB instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __set_MSPLIM(uint32_t MainStackPtrLimit)
+__STATIC_FORCEINLINE void __STLB(uint8_t value, volatile uint8_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  (void)MainStackPtrLimit;
-#else
-  __ASM volatile ("MSR msplim, %0" : : "r" (MainStackPtrLimit));
-#endif
+  __ASM volatile ("stlb %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Set Main Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored.
-
-  \details Assigns the given value to the non-secure Main Stack Pointer Limit (MSPLIM) when in secure state.
-  \param [in]    MainStackPtrLimit  Main Stack Pointer value to set
+  \brief   Store-Release (16 bit)
+  \details Executes a STLH instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
+__STATIC_FORCEINLINE void __STLH(uint16_t value, volatile uint16_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  (void)MainStackPtrLimit;
-#else
-  __ASM volatile ("MSR msplim_ns, %0" : : "r" (MainStackPtrLimit));
-#endif
+  __ASM volatile ("stlh %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
 }
-#endif
 
-#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
 /**
-  \brief   Get FPSCR
-  \details Returns the current value of the Floating Point Status/Control register.
-  \return               Floating Point Status/Control register value
+  \brief   Store-Release (32 bit)
+  \details Executes a STL instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-#define __get_FPSCR      (uint32_t)__builtin_arm_get_fpscr
-#else
-#define __get_FPSCR()      ((uint32_t)0U)
-#endif
+__STATIC_FORCEINLINE void __STL(uint32_t value, volatile uint32_t *ptr)
+{
+  __ASM volatile ("stl %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
+}
+
 
 /**
-  \brief   Set FPSCR
-  \details Assigns the given value to the Floating Point Status/Control register.
-  \param [in]    fpscr  Floating Point Status/Control value to set
+  \brief   Load-Acquire Exclusive (8 bit)
+  \details Executes a LDAB exclusive instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-#define __set_FPSCR      __builtin_arm_set_fpscr
-#else
-#define __set_FPSCR(x)      ((void)(x))
-#endif
+#define     __LDAEXB                 (uint8_t)__builtin_arm_ldaex
 
 
-/*@} end of CMSIS_Core_RegAccFunctions */
+/**
+  \brief   Load-Acquire Exclusive (16 bit)
+  \details Executes a LDAH exclusive instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
+ */
+#define     __LDAEXH                 (uint16_t)__builtin_arm_ldaex
 
 
-/* ##########################  Core Instruction Access  ######################### */
-/** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
-  Access to dedicated instructions
-  @{
-*/
+/**
+  \brief   Load-Acquire Exclusive (32 bit)
+  \details Executes a LDA exclusive instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
+ */
+#define     __LDAEX                  (uint32_t)__builtin_arm_ldaex
 
-/* Define macros for porting to both thumb1 and thumb2.
- * For thumb1, use low register (r0-r7), specified by constraint "l"
- * Otherwise, use general registers, specified by constraint "r" */
-#if defined (__thumb__) && !defined (__thumb2__)
-#define __CMSIS_GCC_OUT_REG(r) "=l" (r)
-#define __CMSIS_GCC_RW_REG(r) "+l" (r)
-#define __CMSIS_GCC_USE_REG(r) "l" (r)
-#else
-#define __CMSIS_GCC_OUT_REG(r) "=r" (r)
-#define __CMSIS_GCC_RW_REG(r) "+r" (r)
-#define __CMSIS_GCC_USE_REG(r) "r" (r)
-#endif
 
 /**
-  \brief   No Operation
-  \details No Operation does nothing. This instruction can be used for code alignment purposes.
+  \brief   Store-Release Exclusive (8 bit)
+  \details Executes a STLB exclusive instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-#define __NOP          __builtin_arm_nop
+#define     __STLEXB                 (uint32_t)__builtin_arm_stlex
+
 
 /**
-  \brief   Wait For Interrupt
-  \details Wait For Interrupt is a hint instruction that suspends execution until one of a number of events occurs.
+  \brief   Store-Release Exclusive (16 bit)
+  \details Executes a STLH exclusive instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-#define __WFI          __builtin_arm_wfi
+#define     __STLEXH                 (uint32_t)__builtin_arm_stlex
 
 
 /**
-  \brief   Wait For Event
-  \details Wait For Event is a hint instruction that permits the processor to enter
-           a low-power state until one of a number of events occurs.
+  \brief   Store-Release Exclusive (32 bit)
+  \details Executes a STL exclusive instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-#define __WFE          __builtin_arm_wfe
+#define     __STLEX                  (uint32_t)__builtin_arm_stlex
+
+#endif /* ((defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__  ) && (__ARM_ARCH_8M_BASE__   == 1)) || \
+           (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     ) */
+
+/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
 
 
+/* ###########################  Core Function Access  ########################### */
+/** \ingroup  CMSIS_Core_FunctionInterface
+    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
+  @{
+ */
+
 /**
-  \brief   Send Event
-  \details Send Event is a hint instruction. It causes an event to be signaled to the CPU.
+  \brief   Enable IRQ Interrupts
+  \details Enables IRQ interrupts by clearing special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
  */
-#define __SEV          __builtin_arm_sev
+#ifndef __ARM_COMPAT_H
+__STATIC_FORCEINLINE void __enable_irq(void)
+{
+  __ASM volatile ("cpsie i" : : : "memory");
+}
+#endif
 
 
 /**
-  \brief   Instruction Synchronization Barrier
-  \details Instruction Synchronization Barrier flushes the pipeline in the processor,
-           so that all instructions following the ISB are fetched from cache or memory,
-           after the instruction has been completed.
+  \brief   Disable IRQ Interrupts
+  \details Disables IRQ interrupts by setting special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
  */
-#define __ISB()        __builtin_arm_isb(0xF)
+#ifndef __ARM_COMPAT_H
+__STATIC_FORCEINLINE void __disable_irq(void)
+{
+  __ASM volatile ("cpsid i" : : : "memory");
+}
+#endif
+
 
 /**
-  \brief   Data Synchronization Barrier
-  \details Acts as a special kind of Data Memory Barrier.
-           It completes when all explicit memory accesses before this instruction complete.
+  \brief   Get Control Register
+  \details Returns the content of the Control Register.
+  \return               Control Register value
  */
-#define __DSB()        __builtin_arm_dsb(0xF)
+__STATIC_FORCEINLINE uint32_t __get_CONTROL(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, control" : "=r" (result) );
+  return(result);
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Data Memory Barrier
-  \details Ensures the apparent order of the explicit memory operations before
-           and after the instruction, without ensuring their completion.
+  \brief   Get Control Register (non-secure)
+  \details Returns the content of the non-secure Control Register when in secure mode.
+  \return               non-secure Control Register value
  */
-#define __DMB()        __builtin_arm_dmb(0xF)
+__STATIC_FORCEINLINE uint32_t __TZ_get_CONTROL_NS(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, control_ns" : "=r" (result) );
+  return(result);
+}
+#endif
 
 
 /**
-  \brief   Reverse byte order (32 bit)
-  \details Reverses the byte order in unsigned integer value. For example, 0x12345678 becomes 0x78563412.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Set Control Register
+  \details Writes the given value to the Control Register.
+  \param [in]    control  Control Register value to set
  */
-#define __REV(value)   __builtin_bswap32(value)
+__STATIC_FORCEINLINE void __set_CONTROL(uint32_t control)
+{
+  __ASM volatile ("MSR control, %0" : : "r" (control) : "memory");
+  __ISB();
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Reverse byte order (16 bit)
-  \details Reverses the byte order within each halfword of a word. For example, 0x12345678 becomes 0x34127856.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Set Control Register (non-secure)
+  \details Writes the given value to the non-secure Control Register when in secure state.
+  \param [in]    control  Control Register value to set
  */
-#define __REV16(value) __ROR(__REV(value), 16)
+__STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
+{
+  __ASM volatile ("MSR control_ns, %0" : : "r" (control) : "memory");
+  __ISB();
+}
+#endif
 
 
 /**
-  \brief   Reverse byte order (16 bit)
-  \details Reverses the byte order in a 16-bit value and returns the signed 16-bit result. For example, 0x0080 becomes 0x8000.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get IPSR Register
+  \details Returns the content of the IPSR Register.
+  \return               IPSR Register value
  */
-#define __REVSH(value) (int16_t)__builtin_bswap16(value)
+__STATIC_FORCEINLINE uint32_t __get_IPSR(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, ipsr" : "=r" (result) );
+  return(result);
+}
 
 
 /**
-  \brief   Rotate Right in unsigned value (32 bit)
-  \details Rotate Right (immediate) provides the value of the contents of a register rotated by a variable number of bits.
-  \param [in]    op1  Value to rotate
-  \param [in]    op2  Number of Bits to rotate
-  \return               Rotated value
+  \brief   Get APSR Register
+  \details Returns the content of the APSR Register.
+  \return               APSR Register value
  */
-__STATIC_FORCEINLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
+__STATIC_FORCEINLINE uint32_t __get_APSR(void)
 {
-  op2 %= 32U;
-  if (op2 == 0U)
-  {
-    return op1;
-  }
-  return (op1 >> op2) | (op1 << (32U - op2));
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, apsr" : "=r" (result) );
+  return(result);
 }
 
 
 /**
-  \brief   Breakpoint
-  \details Causes the processor to enter Debug state.
-           Debug tools can use this to investigate system state when the instruction at a particular address is reached.
-  \param [in]    value  is ignored by the processor.
-                 If required, a debugger can use it to store additional information about the breakpoint.
+  \brief   Get xPSR Register
+  \details Returns the content of the xPSR Register.
+  \return               xPSR Register value
  */
-#define __BKPT(value)     __ASM volatile ("bkpt "#value)
+__STATIC_FORCEINLINE uint32_t __get_xPSR(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, xpsr" : "=r" (result) );
+  return(result);
+}
 
 
 /**
-  \brief   Reverse bit order of value
-  \details Reverses the bit order of the given value.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get Process Stack Pointer
+  \details Returns the current value of the Process Stack Pointer (PSP).
+  \return               PSP Register value
  */
-#define __RBIT            __builtin_arm_rbit
+__STATIC_FORCEINLINE uint32_t __get_PSP(void)
+{
+  uint32_t result;
 
+  __ASM volatile ("MRS %0, psp"  : "=r" (result) );
+  return(result);
+}
+
+
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Count leading zeros
-  \details Counts the number of leading zeros of a data value.
-  \param [in]  value  Value to count the leading zeros
-  \return             number of leading zeros in value
+  \brief   Get Process Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Process Stack Pointer (PSP) when in secure state.
+  \return               PSP Register value
  */
-__STATIC_FORCEINLINE uint8_t __CLZ(uint32_t value)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PSP_NS(void)
 {
-  /* Even though __builtin_clz produces a CLZ instruction on ARM, formally
-     __builtin_clz(0) is undefined behaviour, so handle this case specially.
-     This guarantees ARM-compatible results if happening to compile on a non-ARM
-     target, and ensures the compiler doesn't decide to activate any
-     optimisations using the logic "value was passed to __builtin_clz, so it
-     is non-zero".
-     ARM Compiler 6.10 and possibly earlier will optimise this test away, leaving a
-     single CLZ instruction.
-   */
-  if (value == 0U)
-  {
-    return 32U;
-  }
-  return __builtin_clz(value);
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, psp_ns"  : "=r" (result) );
+  return(result);
 }
+#endif
 
 
-#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-     (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
 /**
-  \brief   LDR Exclusive (8 bit)
-  \details Executes a exclusive LDR instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Set Process Stack Pointer
+  \details Assigns the given value to the Process Stack Pointer (PSP).
+  \param [in]    topOfProcStack  Process Stack Pointer value to set
  */
-#define __LDREXB        (uint8_t)__builtin_arm_ldrex
+__STATIC_FORCEINLINE void __set_PSP(uint32_t topOfProcStack)
+{
+  __ASM volatile ("MSR psp, %0" : : "r" (topOfProcStack) : );
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDR Exclusive (16 bit)
-  \details Executes a exclusive LDR instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Set Process Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Process Stack Pointer (PSP) when in secure state.
+  \param [in]    topOfProcStack  Process Stack Pointer value to set
  */
-#define __LDREXH        (uint16_t)__builtin_arm_ldrex
+__STATIC_FORCEINLINE void __TZ_set_PSP_NS(uint32_t topOfProcStack)
+{
+  __ASM volatile ("MSR psp_ns, %0" : : "r" (topOfProcStack) : );
+}
+#endif
 
 
 /**
-  \brief   LDR Exclusive (32 bit)
-  \details Executes a exclusive LDR instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Get Main Stack Pointer
+  \details Returns the current value of the Main Stack Pointer (MSP).
+  \return               MSP Register value
  */
-#define __LDREXW        (uint32_t)__builtin_arm_ldrex
+__STATIC_FORCEINLINE uint32_t __get_MSP(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, msp" : "=r" (result) );
+  return(result);
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STR Exclusive (8 bit)
-  \details Executes a exclusive STR instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get Main Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Main Stack Pointer (MSP) when in secure state.
+  \return               MSP Register value
  */
-#define __STREXB        (uint32_t)__builtin_arm_strex
+__STATIC_FORCEINLINE uint32_t __TZ_get_MSP_NS(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, msp_ns" : "=r" (result) );
+  return(result);
+}
+#endif
 
 
 /**
-  \brief   STR Exclusive (16 bit)
-  \details Executes a exclusive STR instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set Main Stack Pointer
+  \details Assigns the given value to the Main Stack Pointer (MSP).
+  \param [in]    topOfMainStack  Main Stack Pointer value to set
  */
-#define __STREXH        (uint32_t)__builtin_arm_strex
+__STATIC_FORCEINLINE void __set_MSP(uint32_t topOfMainStack)
+{
+  __ASM volatile ("MSR msp, %0" : : "r" (topOfMainStack) : );
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STR Exclusive (32 bit)
-  \details Executes a exclusive STR instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set Main Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Main Stack Pointer (MSP) when in secure state.
+  \param [in]    topOfMainStack  Main Stack Pointer value to set
  */
-#define __STREXW        (uint32_t)__builtin_arm_strex
+__STATIC_FORCEINLINE void __TZ_set_MSP_NS(uint32_t topOfMainStack)
+{
+  __ASM volatile ("MSR msp_ns, %0" : : "r" (topOfMainStack) : );
+}
+#endif
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Remove the exclusive lock
-  \details Removes the exclusive lock which is created by LDREX.
+  \brief   Get Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Stack Pointer (SP) when in secure state.
+  \return               SP Register value
  */
-#define __CLREX             __builtin_arm_clrex
-
-#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
+__STATIC_FORCEINLINE uint32_t __TZ_get_SP_NS(void)
+{
+  uint32_t result;
 
+  __ASM volatile ("MRS %0, sp_ns" : "=r" (result) );
+  return(result);
+}
 
-#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
 
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Set Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Stack Pointer (SP) when in secure state.
+  \param [in]    topOfStack  Stack Pointer value to set
  */
-#define __SSAT             __builtin_arm_ssat
+__STATIC_FORCEINLINE void __TZ_set_SP_NS(uint32_t topOfStack)
+{
+  __ASM volatile ("MSR sp_ns, %0" : : "r" (topOfStack) : );
+}
+#endif
 
 
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (0..31)
-  \return             Saturated value
+  \brief   Get Priority Mask
+  \details Returns the current state of the priority mask bit from the Priority Mask Register.
+  \return               Priority Mask value
  */
-#define __USAT             __builtin_arm_usat
+__STATIC_FORCEINLINE uint32_t __get_PRIMASK(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, primask" : "=r" (result) );
+  return(result);
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Rotate Right with Extend (32 bit)
-  \details Moves each bit of a bitstring right by one bit.
-           The carry input is shifted in at the left end of the bitstring.
-  \param [in]    value  Value to rotate
-  \return               Rotated value
+  \brief   Get Priority Mask (non-secure)
+  \details Returns the current state of the non-secure priority mask bit from the Priority Mask Register when in secure state.
+  \return               Priority Mask value
  */
-__STATIC_FORCEINLINE uint32_t __RRX(uint32_t value)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PRIMASK_NS(void)
 {
   uint32_t result;
 
-  __ASM volatile ("rrx %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
+  __ASM volatile ("MRS %0, primask_ns" : "=r" (result) );
   return(result);
 }
+#endif
 
 
 /**
-  \brief   LDRT Unprivileged (8 bit)
-  \details Executes a Unprivileged LDRT instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Set Priority Mask
+  \details Assigns the given value to the Priority Mask Register.
+  \param [in]    priMask  Priority Mask
  */
-__STATIC_FORCEINLINE uint8_t __LDRBT(volatile uint8_t *ptr)
+__STATIC_FORCEINLINE void __set_PRIMASK(uint32_t priMask)
 {
-  uint32_t result;
+  __ASM volatile ("MSR primask, %0" : : "r" (priMask) : "memory");
+}
 
-  __ASM volatile ("ldrbt %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint8_t) result);    /* Add explicit type cast here */
+
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
+/**
+  \brief   Set Priority Mask (non-secure)
+  \details Assigns the given value to the non-secure Priority Mask Register when in secure state.
+  \param [in]    priMask  Priority Mask
+ */
+__STATIC_FORCEINLINE void __TZ_set_PRIMASK_NS(uint32_t priMask)
+{
+  __ASM volatile ("MSR primask_ns, %0" : : "r" (priMask) : "memory");
 }
+#endif
 
 
+#if ((defined (__ARM_ARCH_7M__       ) && (__ARM_ARCH_7M__        == 1)) || \
+     (defined (__ARM_ARCH_7EM__      ) && (__ARM_ARCH_7EM__       == 1)) || \
+     (defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+     (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     )
 /**
-  \brief   LDRT Unprivileged (16 bit)
-  \details Executes a Unprivileged LDRT instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Enable FIQ
+  \details Enables FIQ interrupts by clearing special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
  */
-__STATIC_FORCEINLINE uint16_t __LDRHT(volatile uint16_t *ptr)
+__STATIC_FORCEINLINE void __enable_fault_irq(void)
 {
-  uint32_t result;
+  __ASM volatile ("cpsie f" : : : "memory");
+}
 
-  __ASM volatile ("ldrht %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint16_t) result);    /* Add explicit type cast here */
+
+/**
+  \brief   Disable FIQ
+  \details Disables FIQ interrupts by setting special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
+ */
+__STATIC_FORCEINLINE void __disable_fault_irq(void)
+{
+  __ASM volatile ("cpsid f" : : : "memory");
 }
 
 
 /**
-  \brief   LDRT Unprivileged (32 bit)
-  \details Executes a Unprivileged LDRT instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Get Base Priority
+  \details Returns the current value of the Base Priority register.
+  \return               Base Priority register value
  */
-__STATIC_FORCEINLINE uint32_t __LDRT(volatile uint32_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_BASEPRI(void)
 {
   uint32_t result;
 
-  __ASM volatile ("ldrt %0, %1" : "=r" (result) : "Q" (*ptr) );
+  __ASM volatile ("MRS %0, basepri" : "=r" (result) );
   return(result);
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STRT Unprivileged (8 bit)
-  \details Executes a Unprivileged STRT instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Base Priority (non-secure)
+  \details Returns the current value of the non-secure Base Priority register when in secure state.
+  \return               Base Priority register value
  */
-__STATIC_FORCEINLINE void __STRBT(uint8_t value, volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_BASEPRI_NS(void)
 {
-  __ASM volatile ("strbt %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, basepri_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
 
 /**
-  \brief   STRT Unprivileged (16 bit)
-  \details Executes a Unprivileged STRT instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Base Priority
+  \details Assigns the given value to the Base Priority register.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE void __STRHT(uint16_t value, volatile uint16_t *ptr)
+__STATIC_FORCEINLINE void __set_BASEPRI(uint32_t basePri)
 {
-  __ASM volatile ("strht %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+  __ASM volatile ("MSR basepri, %0" : : "r" (basePri) : "memory");
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STRT Unprivileged (32 bit)
-  \details Executes a Unprivileged STRT instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Base Priority (non-secure)
+  \details Assigns the given value to the non-secure Base Priority register when in secure state.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE void __STRT(uint32_t value, volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __TZ_set_BASEPRI_NS(uint32_t basePri)
 {
-  __ASM volatile ("strt %1, %0" : "=Q" (*ptr) : "r" (value) );
+  __ASM volatile ("MSR basepri_ns, %0" : : "r" (basePri) : "memory");
 }
+#endif
 
-#else  /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
 
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Set Base Priority with condition
+  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
+           or the new value increases the BASEPRI priority level.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE int32_t __SSAT(int32_t val, uint32_t sat)
+__STATIC_FORCEINLINE void __set_BASEPRI_MAX(uint32_t basePri)
 {
-  if ((sat >= 1U) && (sat <= 32U))
-  {
-    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
-    const int32_t min = -1 - max ;
-    if (val > max)
-    {
-      return max;
-    }
-    else if (val < min)
-    {
-      return min;
-    }
-  }
-  return val;
+  __ASM volatile ("MSR basepri_max, %0" : : "r" (basePri) : "memory");
 }
 
+
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (0..31)
-  \return             Saturated value
- */
-__STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
-{
-  if (sat <= 31U)
-  {
-    const uint32_t max = ((1U << sat) - 1U);
-    if (val > (int32_t)max)
-    {
-      return max;
-    }
-    else if (val < 0)
-    {
-      return 0U;
-    }
-  }
-  return (uint32_t)val;
-}
+  \brief   Get Fault Mask
+  \details Returns the current value of the Fault Mask register.
+  \return               Fault Mask register value
+ */
+__STATIC_FORCEINLINE uint32_t __get_FAULTMASK(void)
+{
+  uint32_t result;
 
-#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
+  __ASM volatile ("MRS %0, faultmask" : "=r" (result) );
+  return(result);
+}
 
 
-#if ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-     (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Load-Acquire (8 bit)
-  \details Executes a LDAB instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Get Fault Mask (non-secure)
+  \details Returns the current value of the non-secure Fault Mask register when in secure state.
+  \return               Fault Mask register value
  */
-__STATIC_FORCEINLINE uint8_t __LDAB(volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_FAULTMASK_NS(void)
 {
   uint32_t result;
 
-  __ASM volatile ("ldab %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint8_t) result);
+  __ASM volatile ("MRS %0, faultmask_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
 
 /**
-  \brief   Load-Acquire (16 bit)
-  \details Executes a LDAH instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Set Fault Mask
+  \details Assigns the given value to the Fault Mask register.
+  \param [in]    faultMask  Fault Mask value to set
  */
-__STATIC_FORCEINLINE uint16_t __LDAH(volatile uint16_t *ptr)
+__STATIC_FORCEINLINE void __set_FAULTMASK(uint32_t faultMask)
 {
-  uint32_t result;
+  __ASM volatile ("MSR faultmask, %0" : : "r" (faultMask) : "memory");
+}
 
-  __ASM volatile ("ldah %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint16_t) result);
+
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
+/**
+  \brief   Set Fault Mask (non-secure)
+  \details Assigns the given value to the non-secure Fault Mask register when in secure state.
+  \param [in]    faultMask  Fault Mask value to set
+ */
+__STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask)
+{
+  __ASM volatile ("MSR faultmask_ns, %0" : : "r" (faultMask) : "memory");
 }
+#endif
+
+#endif /* ((defined (__ARM_ARCH_7M__       ) && (__ARM_ARCH_7M__        == 1)) || \
+           (defined (__ARM_ARCH_7EM__      ) && (__ARM_ARCH_7EM__       == 1)) || \
+           (defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+           (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     ) */
 
 
+#if ((defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+     (defined (__ARM_ARCH_8M_BASE__  ) && (__ARM_ARCH_8M_BASE__   == 1)) || \
+     (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     )
+
 /**
-  \brief   Load-Acquire (32 bit)
-  \details Executes a LDA instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Get Process Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always in non-secure
+  mode.
+
+  \details Returns the current value of the Process Stack Pointer Limit (PSPLIM).
+  \return               PSPLIM Register value
  */
-__STATIC_FORCEINLINE uint32_t __LDA(volatile uint32_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_PSPLIM(void)
 {
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+    // without main extensions, the non-secure PSPLIM is RAZ/WI
+  return 0U;
+#else
   uint32_t result;
-
-  __ASM volatile ("lda %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return(result);
+  __ASM volatile ("MRS %0, psplim"  : "=r" (result) );
+  return result;
+#endif
 }
 
-
+#if (defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Store-Release (8 bit)
-  \details Executes a STLB instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Process Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always in non-secure
+  mode.
+
+  \details Returns the current value of the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
+  \return               PSPLIM Register value
  */
-__STATIC_FORCEINLINE void __STLB(uint8_t value, volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PSPLIM_NS(void)
 {
-  __ASM volatile ("stlb %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) )
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, psplim_ns"  : "=r" (result) );
+  return result;
+#endif
 }
+#endif
 
 
 /**
-  \brief   Store-Release (16 bit)
-  \details Executes a STLH instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Process Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored in non-secure
+  mode.
+
+  \details Assigns the given value to the Process Stack Pointer Limit (PSPLIM).
+  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
  */
-__STATIC_FORCEINLINE void __STLH(uint16_t value, volatile uint16_t *ptr)
+__STATIC_FORCEINLINE void __set_PSPLIM(uint32_t ProcStackPtrLimit)
 {
-  __ASM volatile ("stlh %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  (void)ProcStackPtrLimit;
+#else
+  __ASM volatile ("MSR psplim, %0" : : "r" (ProcStackPtrLimit));
+#endif
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Store-Release (32 bit)
-  \details Executes a STL instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Process Stack Pointer (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored in non-secure
+  mode.
+
+  \details Assigns the given value to the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
+  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
  */
-__STATIC_FORCEINLINE void __STL(uint32_t value, volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __TZ_set_PSPLIM_NS(uint32_t ProcStackPtrLimit)
 {
-  __ASM volatile ("stl %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) )
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  (void)ProcStackPtrLimit;
+#else
+  __ASM volatile ("MSR psplim_ns, %0\n" : : "r" (ProcStackPtrLimit));
+#endif
 }
+#endif
 
 
 /**
-  \brief   Load-Acquire Exclusive (8 bit)
-  \details Executes a LDAB exclusive instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Get Main Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always.
+
+  \details Returns the current value of the Main Stack Pointer Limit (MSPLIM).
+  \return               MSPLIM Register value
  */
-#define     __LDAEXB                 (uint8_t)__builtin_arm_ldaex
+__STATIC_FORCEINLINE uint32_t __get_MSPLIM(void)
+{
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, msplim" : "=r" (result) );
+  return result;
+#endif
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Load-Acquire Exclusive (16 bit)
-  \details Executes a LDAH exclusive instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Get Main Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always.
+
+  \details Returns the current value of the non-secure Main Stack Pointer Limit(MSPLIM) when in secure state.
+  \return               MSPLIM Register value
  */
-#define     __LDAEXH                 (uint16_t)__builtin_arm_ldaex
+__STATIC_FORCEINLINE uint32_t __TZ_get_MSPLIM_NS(void)
+{
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) )
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, msplim_ns" : "=r" (result) );
+  return result;
+#endif
+}
+#endif
 
 
 /**
-  \brief   Load-Acquire Exclusive (32 bit)
-  \details Executes a LDA exclusive instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Set Main Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored.
+
+  \details Assigns the given value to the Main Stack Pointer Limit (MSPLIM).
+  \param [in]    MainStackPtrLimit  Main Stack Pointer Limit value to set
  */
-#define     __LDAEX                  (uint32_t)__builtin_arm_ldaex
+__STATIC_FORCEINLINE void __set_MSPLIM(uint32_t MainStackPtrLimit)
+{
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  (void)MainStackPtrLimit;
+#else
+  __ASM volatile ("MSR msplim, %0" : : "r" (MainStackPtrLimit));
+#endif
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Store-Release Exclusive (8 bit)
-  \details Executes a STLB exclusive instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set Main Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored.
+
+  \details Assigns the given value to the non-secure Main Stack Pointer Limit (MSPLIM) when in secure state.
+  \param [in]    MainStackPtrLimit  Main Stack Pointer value to set
  */
-#define     __STLEXB                 (uint32_t)__builtin_arm_stlex
+__STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
+{
+#if (!((defined (__ARM_ARCH_8M_MAIN__   ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+       (defined (__ARM_ARCH_8_1M_MAIN__ ) && (__ARM_ARCH_8_1M_MAIN__ == 1))   ) )
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  (void)MainStackPtrLimit;
+#else
+  __ASM volatile ("MSR msplim_ns, %0" : : "r" (MainStackPtrLimit));
+#endif
+}
+#endif
 
+#endif /* ((defined (__ARM_ARCH_8M_MAIN__  ) && (__ARM_ARCH_8M_MAIN__   == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__  ) && (__ARM_ARCH_8M_BASE__   == 1)) || \
+           (defined (__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1))     ) */
 
 /**
-  \brief   Store-Release Exclusive (16 bit)
-  \details Executes a STLH exclusive instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get FPSCR
+  \details Returns the current value of the Floating Point Status/Control register.
+  \return               Floating Point Status/Control register value
  */
-#define     __STLEXH                 (uint32_t)__builtin_arm_stlex
-
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+#define __get_FPSCR      (uint32_t)__builtin_arm_get_fpscr
+#else
+#define __get_FPSCR()      ((uint32_t)0U)
+#endif
 
 /**
-  \brief   Store-Release Exclusive (32 bit)
-  \details Executes a STL exclusive instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set FPSCR
+  \details Assigns the given value to the Floating Point Status/Control register.
+  \param [in]    fpscr  Floating Point Status/Control value to set
  */
-#define     __STLEX                  (uint32_t)__builtin_arm_stlex
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+#define __set_FPSCR      __builtin_arm_set_fpscr
+#else
+#define __set_FPSCR(x)      ((void)(x))
+#endif
 
-#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
-/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
+/*@} end of CMSIS_Core_RegAccFunctions */
 
 
 /* ###################  Compiler specific Intrinsics  ########################### */
@@ -1405,6 +1484,10 @@ __STATIC_FORCEINLINE void __STL(uint32_t value, volatile uint32_t *ptr)
 #define __PKHTB(ARG1,ARG2,ARG3)          ( ((((uint32_t)(ARG1))          ) & 0xFFFF0000UL) |  \
                                            ((((uint32_t)(ARG2)) >> (ARG3)) & 0x0000FFFFUL)  )
 
+#define __SXTB16_RORn(ARG1, ARG2)        __SXTB16(__ROR(ARG1, ARG2))
+
+#define __SXTAB16_RORn(ARG1, ARG2, ARG3) __SXTAB16(ARG1, __ROR(ARG2, ARG3))
+
 __STATIC_FORCEINLINE int32_t __SMMLA (int32_t op1, int32_t op2, int32_t op3)
 {
   int32_t result;
diff --git a/lib/cmsis/inc/cmsis_armclang_ltm.h b/lib/cmsis/inc/cmsis_armclang_ltm.h
index e4002a3fc4c93..1e255d5907f66 100644
--- a/lib/cmsis/inc/cmsis_armclang_ltm.h
+++ b/lib/cmsis/inc/cmsis_armclang_ltm.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     cmsis_armclang_ltm.h
  * @brief    CMSIS compiler armclang (Arm Compiler 6) header file
- * @version  V1.0.1
- * @date     19. March 2019
+ * @version  V1.5.3
+ * @date     27. May 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2018-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -29,10 +29,6 @@
 
 #pragma clang system_header   /* treat file as system include file */
 
-#ifndef __ARM_COMPAT_H
-#include <arm_compat.h>    /* Compatibility header for Arm Compiler 5 intrinsics */
-#endif
-
 /* CMSIS compiler specific defines */
 #ifndef   __ASM
   #define __ASM                                  __asm
@@ -110,1071 +106,1073 @@
 #ifndef   __RESTRICT
   #define __RESTRICT                             __restrict
 #endif
+#ifndef   __COMPILER_BARRIER
+  #define __COMPILER_BARRIER()                   __ASM volatile("":::"memory")
+#endif
 
+/* #########################  Startup and Lowlevel Init  ######################## */
 
-/* ###########################  Core Function Access  ########################### */
-/** \ingroup  CMSIS_Core_FunctionInterface
-    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
-  @{
- */
+#ifndef __PROGRAM_START
+#define __PROGRAM_START           __main
+#endif
 
-/**
-  \brief   Enable IRQ Interrupts
-  \details Enables IRQ interrupts by clearing the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-/* intrinsic void __enable_irq();  see arm_compat.h */
+#ifndef __INITIAL_SP
+#define __INITIAL_SP              Image$$ARM_LIB_STACK$$ZI$$Limit
+#endif
 
+#ifndef __STACK_LIMIT
+#define __STACK_LIMIT             Image$$ARM_LIB_STACK$$ZI$$Base
+#endif
 
-/**
-  \brief   Disable IRQ Interrupts
-  \details Disables IRQ interrupts by setting the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-/* intrinsic void __disable_irq();  see arm_compat.h */
+#ifndef __VECTOR_TABLE
+#define __VECTOR_TABLE            __Vectors
+#endif
 
+#ifndef __VECTOR_TABLE_ATTRIBUTE
+#define __VECTOR_TABLE_ATTRIBUTE  __attribute__((used, section("RESET")))
+#endif
 
-/**
-  \brief   Get Control Register
-  \details Returns the content of the Control Register.
-  \return               Control Register value
- */
-__STATIC_FORCEINLINE uint32_t __get_CONTROL(void)
-{
-  uint32_t result;
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+#ifndef __STACK_SEAL
+#define __STACK_SEAL              Image$$STACKSEAL$$ZI$$Base
+#endif
 
-  __ASM volatile ("MRS %0, control" : "=r" (result) );
-  return(result);
-}
+#ifndef __TZ_STACK_SEAL_SIZE
+#define __TZ_STACK_SEAL_SIZE      8U
+#endif
 
+#ifndef __TZ_STACK_SEAL_VALUE
+#define __TZ_STACK_SEAL_VALUE     0xFEF5EDA5FEF5EDA5ULL
+#endif
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
-/**
-  \brief   Get Control Register (non-secure)
-  \details Returns the content of the non-secure Control Register when in secure mode.
-  \return               non-secure Control Register value
- */
-__STATIC_FORCEINLINE uint32_t __TZ_get_CONTROL_NS(void)
-{
-  uint32_t result;
 
-  __ASM volatile ("MRS %0, control_ns" : "=r" (result) );
-  return(result);
+__STATIC_FORCEINLINE void __TZ_set_STACKSEAL_S (uint32_t* stackTop) {
+  *((uint64_t *)stackTop) = __TZ_STACK_SEAL_VALUE;
 }
 #endif
 
 
-/**
-  \brief   Set Control Register
-  \details Writes the given value to the Control Register.
-  \param [in]    control  Control Register value to set
- */
-__STATIC_FORCEINLINE void __set_CONTROL(uint32_t control)
-{
-  __ASM volatile ("MSR control, %0" : : "r" (control) : "memory");
-}
+/* ##########################  Core Instruction Access  ######################### */
+/** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
+  Access to dedicated instructions
+  @{
+*/
 
+/* Define macros for porting to both thumb1 and thumb2.
+ * For thumb1, use low register (r0-r7), specified by constraint "l"
+ * Otherwise, use general registers, specified by constraint "r" */
+#if defined (__thumb__) && !defined (__thumb2__)
+#define __CMSIS_GCC_OUT_REG(r) "=l" (r)
+#define __CMSIS_GCC_USE_REG(r) "l" (r)
+#else
+#define __CMSIS_GCC_OUT_REG(r) "=r" (r)
+#define __CMSIS_GCC_USE_REG(r) "r" (r)
+#endif
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Control Register (non-secure)
-  \details Writes the given value to the non-secure Control Register when in secure state.
-  \param [in]    control  Control Register value to set
+  \brief   No Operation
+  \details No Operation does nothing. This instruction can be used for code alignment purposes.
  */
-__STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
-{
-  __ASM volatile ("MSR control_ns, %0" : : "r" (control) : "memory");
-}
-#endif
-
+#define __NOP          __builtin_arm_nop
 
 /**
-  \brief   Get IPSR Register
-  \details Returns the content of the IPSR Register.
-  \return               IPSR Register value
+  \brief   Wait For Interrupt
+  \details Wait For Interrupt is a hint instruction that suspends execution until one of a number of events occurs.
  */
-__STATIC_FORCEINLINE uint32_t __get_IPSR(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, ipsr" : "=r" (result) );
-  return(result);
-}
+#define __WFI          __builtin_arm_wfi
 
 
 /**
-  \brief   Get APSR Register
-  \details Returns the content of the APSR Register.
-  \return               APSR Register value
+  \brief   Wait For Event
+  \details Wait For Event is a hint instruction that permits the processor to enter
+           a low-power state until one of a number of events occurs.
  */
-__STATIC_FORCEINLINE uint32_t __get_APSR(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, apsr" : "=r" (result) );
-  return(result);
-}
+#define __WFE          __builtin_arm_wfe
 
 
 /**
-  \brief   Get xPSR Register
-  \details Returns the content of the xPSR Register.
-  \return               xPSR Register value
+  \brief   Send Event
+  \details Send Event is a hint instruction. It causes an event to be signaled to the CPU.
  */
-__STATIC_FORCEINLINE uint32_t __get_xPSR(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, xpsr" : "=r" (result) );
-  return(result);
-}
+#define __SEV          __builtin_arm_sev
 
 
 /**
-  \brief   Get Process Stack Pointer
-  \details Returns the current value of the Process Stack Pointer (PSP).
-  \return               PSP Register value
+  \brief   Instruction Synchronization Barrier
+  \details Instruction Synchronization Barrier flushes the pipeline in the processor,
+           so that all instructions following the ISB are fetched from cache or memory,
+           after the instruction has been completed.
  */
-__STATIC_FORCEINLINE uint32_t __get_PSP(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, psp"  : "=r" (result) );
-  return(result);
-}
-
+#define __ISB()        __builtin_arm_isb(0xF)
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Process Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Process Stack Pointer (PSP) when in secure state.
-  \return               PSP Register value
+  \brief   Data Synchronization Barrier
+  \details Acts as a special kind of Data Memory Barrier.
+           It completes when all explicit memory accesses before this instruction complete.
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PSP_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, psp_ns"  : "=r" (result) );
-  return(result);
-}
-#endif
+#define __DSB()        __builtin_arm_dsb(0xF)
 
 
 /**
-  \brief   Set Process Stack Pointer
-  \details Assigns the given value to the Process Stack Pointer (PSP).
-  \param [in]    topOfProcStack  Process Stack Pointer value to set
+  \brief   Data Memory Barrier
+  \details Ensures the apparent order of the explicit memory operations before
+           and after the instruction, without ensuring their completion.
  */
-__STATIC_FORCEINLINE void __set_PSP(uint32_t topOfProcStack)
-{
-  __ASM volatile ("MSR psp, %0" : : "r" (topOfProcStack) : );
-}
+#define __DMB()        __builtin_arm_dmb(0xF)
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Process Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Process Stack Pointer (PSP) when in secure state.
-  \param [in]    topOfProcStack  Process Stack Pointer value to set
+  \brief   Reverse byte order (32 bit)
+  \details Reverses the byte order in unsigned integer value. For example, 0x12345678 becomes 0x78563412.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE void __TZ_set_PSP_NS(uint32_t topOfProcStack)
-{
-  __ASM volatile ("MSR psp_ns, %0" : : "r" (topOfProcStack) : );
-}
-#endif
+#define __REV(value)   __builtin_bswap32(value)
 
 
 /**
-  \brief   Get Main Stack Pointer
-  \details Returns the current value of the Main Stack Pointer (MSP).
-  \return               MSP Register value
+  \brief   Reverse byte order (16 bit)
+  \details Reverses the byte order within each halfword of a word. For example, 0x12345678 becomes 0x34127856.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __get_MSP(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, msp" : "=r" (result) );
-  return(result);
-}
+#define __REV16(value) __ROR(__REV(value), 16)
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Main Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Main Stack Pointer (MSP) when in secure state.
-  \return               MSP Register value
+  \brief   Reverse byte order (16 bit)
+  \details Reverses the byte order in a 16-bit value and returns the signed 16-bit result. For example, 0x0080 becomes 0x8000.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_MSP_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, msp_ns" : "=r" (result) );
-  return(result);
-}
-#endif
+#define __REVSH(value) (int16_t)__builtin_bswap16(value)
 
 
 /**
-  \brief   Set Main Stack Pointer
-  \details Assigns the given value to the Main Stack Pointer (MSP).
-  \param [in]    topOfMainStack  Main Stack Pointer value to set
+  \brief   Rotate Right in unsigned value (32 bit)
+  \details Rotate Right (immediate) provides the value of the contents of a register rotated by a variable number of bits.
+  \param [in]    op1  Value to rotate
+  \param [in]    op2  Number of Bits to rotate
+  \return               Rotated value
  */
-__STATIC_FORCEINLINE void __set_MSP(uint32_t topOfMainStack)
+__STATIC_FORCEINLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
 {
-  __ASM volatile ("MSR msp, %0" : : "r" (topOfMainStack) : );
+  op2 %= 32U;
+  if (op2 == 0U)
+  {
+    return op1;
+  }
+  return (op1 >> op2) | (op1 << (32U - op2));
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Main Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Main Stack Pointer (MSP) when in secure state.
-  \param [in]    topOfMainStack  Main Stack Pointer value to set
+  \brief   Breakpoint
+  \details Causes the processor to enter Debug state.
+           Debug tools can use this to investigate system state when the instruction at a particular address is reached.
+  \param [in]    value  is ignored by the processor.
+                 If required, a debugger can use it to store additional information about the breakpoint.
  */
-__STATIC_FORCEINLINE void __TZ_set_MSP_NS(uint32_t topOfMainStack)
-{
-  __ASM volatile ("MSR msp_ns, %0" : : "r" (topOfMainStack) : );
-}
-#endif
+#define __BKPT(value)     __ASM volatile ("bkpt "#value)
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Stack Pointer (SP) when in secure state.
-  \return               SP Register value
+  \brief   Reverse bit order of value
+  \details Reverses the bit order of the given value.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_SP_NS(void)
-{
-  uint32_t result;
+#define __RBIT            __builtin_arm_rbit
 
-  __ASM volatile ("MRS %0, sp_ns" : "=r" (result) );
-  return(result);
+/**
+  \brief   Count leading zeros
+  \details Counts the number of leading zeros of a data value.
+  \param [in]  value  Value to count the leading zeros
+  \return             number of leading zeros in value
+ */
+__STATIC_FORCEINLINE uint8_t __CLZ(uint32_t value)
+{
+  /* Even though __builtin_clz produces a CLZ instruction on ARM, formally
+     __builtin_clz(0) is undefined behaviour, so handle this case specially.
+     This guarantees ARM-compatible results if happening to compile on a non-ARM
+     target, and ensures the compiler doesn't decide to activate any
+     optimisations using the logic "value was passed to __builtin_clz, so it
+     is non-zero".
+     ARM Compiler 6.10 and possibly earlier will optimise this test away, leaving a
+     single CLZ instruction.
+   */
+  if (value == 0U)
+  {
+    return 32U;
+  }
+  return __builtin_clz(value);
 }
 
 
+#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
+     (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
 /**
-  \brief   Set Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Stack Pointer (SP) when in secure state.
-  \param [in]    topOfStack  Stack Pointer value to set
+  \brief   LDR Exclusive (8 bit)
+  \details Executes a exclusive LDR instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __TZ_set_SP_NS(uint32_t topOfStack)
-{
-  __ASM volatile ("MSR sp_ns, %0" : : "r" (topOfStack) : );
-}
-#endif
+#define __LDREXB        (uint8_t)__builtin_arm_ldrex
 
 
 /**
-  \brief   Get Priority Mask
-  \details Returns the current state of the priority mask bit from the Priority Mask Register.
-  \return               Priority Mask value
+  \brief   LDR Exclusive (16 bit)
+  \details Executes a exclusive LDR instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_PRIMASK(void)
-{
-  uint32_t result;
+#define __LDREXH        (uint16_t)__builtin_arm_ldrex
 
-  __ASM volatile ("MRS %0, primask" : "=r" (result) );
-  return(result);
-}
+
+/**
+  \brief   LDR Exclusive (32 bit)
+  \details Executes a exclusive LDR instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
+ */
+#define __LDREXW        (uint32_t)__builtin_arm_ldrex
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Priority Mask (non-secure)
-  \details Returns the current state of the non-secure priority mask bit from the Priority Mask Register when in secure state.
-  \return               Priority Mask value
+  \brief   STR Exclusive (8 bit)
+  \details Executes a exclusive STR instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PRIMASK_NS(void)
-{
-  uint32_t result;
+#define __STREXB        (uint32_t)__builtin_arm_strex
 
-  __ASM volatile ("MRS %0, primask_ns" : "=r" (result) );
-  return(result);
-}
-#endif
+
+/**
+  \brief   STR Exclusive (16 bit)
+  \details Executes a exclusive STR instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
+ */
+#define __STREXH        (uint32_t)__builtin_arm_strex
 
 
 /**
-  \brief   Set Priority Mask
-  \details Assigns the given value to the Priority Mask Register.
-  \param [in]    priMask  Priority Mask
+  \brief   STR Exclusive (32 bit)
+  \details Executes a exclusive STR instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE void __set_PRIMASK(uint32_t priMask)
-{
-  __ASM volatile ("MSR primask, %0" : : "r" (priMask) : "memory");
-}
+#define __STREXW        (uint32_t)__builtin_arm_strex
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Priority Mask (non-secure)
-  \details Assigns the given value to the non-secure Priority Mask Register when in secure state.
-  \param [in]    priMask  Priority Mask
+  \brief   Remove the exclusive lock
+  \details Removes the exclusive lock which is created by LDREX.
  */
-__STATIC_FORCEINLINE void __TZ_set_PRIMASK_NS(uint32_t priMask)
-{
-  __ASM volatile ("MSR primask_ns, %0" : : "r" (priMask) : "memory");
-}
-#endif
+#define __CLREX             __builtin_arm_clrex
+
+#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
 
 #if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
      (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
      (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
+
 /**
-  \brief   Enable FIQ
-  \details Enables FIQ interrupts by clearing the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (1..32)
+  \return             Saturated value
  */
-#define __enable_fault_irq                __enable_fiq   /* see arm_compat.h */
+#define __SSAT             __builtin_arm_ssat
 
 
 /**
-  \brief   Disable FIQ
-  \details Disables FIQ interrupts by setting the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (0..31)
+  \return             Saturated value
  */
-#define __disable_fault_irq               __disable_fiq   /* see arm_compat.h */
+#define __USAT             __builtin_arm_usat
 
 
 /**
-  \brief   Get Base Priority
-  \details Returns the current value of the Base Priority register.
-  \return               Base Priority register value
+  \brief   Rotate Right with Extend (32 bit)
+  \details Moves each bit of a bitstring right by one bit.
+           The carry input is shifted in at the left end of the bitstring.
+  \param [in]    value  Value to rotate
+  \return               Rotated value
  */
-__STATIC_FORCEINLINE uint32_t __get_BASEPRI(void)
+__STATIC_FORCEINLINE uint32_t __RRX(uint32_t value)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, basepri" : "=r" (result) );
+  __ASM volatile ("rrx %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
   return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Base Priority (non-secure)
-  \details Returns the current value of the non-secure Base Priority register when in secure state.
-  \return               Base Priority register value
+  \brief   LDRT Unprivileged (8 bit)
+  \details Executes a Unprivileged LDRT instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_BASEPRI_NS(void)
+__STATIC_FORCEINLINE uint8_t __LDRBT(volatile uint8_t *ptr)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, basepri_ns" : "=r" (result) );
-  return(result);
-}
-#endif
-
-
-/**
-  \brief   Set Base Priority
-  \details Assigns the given value to the Base Priority register.
-  \param [in]    basePri  Base Priority value to set
- */
-__STATIC_FORCEINLINE void __set_BASEPRI(uint32_t basePri)
-{
-  __ASM volatile ("MSR basepri, %0" : : "r" (basePri) : "memory");
+  __ASM volatile ("ldrbt %0, %1" : "=r" (result) : "Q" (*ptr) );
+  return ((uint8_t) result);    /* Add explicit type cast here */
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Base Priority (non-secure)
-  \details Assigns the given value to the non-secure Base Priority register when in secure state.
-  \param [in]    basePri  Base Priority value to set
+  \brief   LDRT Unprivileged (16 bit)
+  \details Executes a Unprivileged LDRT instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __TZ_set_BASEPRI_NS(uint32_t basePri)
+__STATIC_FORCEINLINE uint16_t __LDRHT(volatile uint16_t *ptr)
 {
-  __ASM volatile ("MSR basepri_ns, %0" : : "r" (basePri) : "memory");
-}
-#endif
-
+  uint32_t result;
 
-/**
-  \brief   Set Base Priority with condition
-  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
-           or the new value increases the BASEPRI priority level.
-  \param [in]    basePri  Base Priority value to set
- */
-__STATIC_FORCEINLINE void __set_BASEPRI_MAX(uint32_t basePri)
-{
-  __ASM volatile ("MSR basepri_max, %0" : : "r" (basePri) : "memory");
+  __ASM volatile ("ldrht %0, %1" : "=r" (result) : "Q" (*ptr) );
+  return ((uint16_t) result);    /* Add explicit type cast here */
 }
 
 
 /**
-  \brief   Get Fault Mask
-  \details Returns the current value of the Fault Mask register.
-  \return               Fault Mask register value
+  \brief   LDRT Unprivileged (32 bit)
+  \details Executes a Unprivileged LDRT instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_FAULTMASK(void)
+__STATIC_FORCEINLINE uint32_t __LDRT(volatile uint32_t *ptr)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, faultmask" : "=r" (result) );
+  __ASM volatile ("ldrt %0, %1" : "=r" (result) : "Q" (*ptr) );
   return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Fault Mask (non-secure)
-  \details Returns the current value of the non-secure Fault Mask register when in secure state.
-  \return               Fault Mask register value
+  \brief   STRT Unprivileged (8 bit)
+  \details Executes a Unprivileged STRT instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_FAULTMASK_NS(void)
+__STATIC_FORCEINLINE void __STRBT(uint8_t value, volatile uint8_t *ptr)
 {
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, faultmask_ns" : "=r" (result) );
-  return(result);
+  __ASM volatile ("strbt %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
 }
-#endif
 
 
 /**
-  \brief   Set Fault Mask
-  \details Assigns the given value to the Fault Mask register.
-  \param [in]    faultMask  Fault Mask value to set
+  \brief   STRT Unprivileged (16 bit)
+  \details Executes a Unprivileged STRT instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __set_FAULTMASK(uint32_t faultMask)
+__STATIC_FORCEINLINE void __STRHT(uint16_t value, volatile uint16_t *ptr)
 {
-  __ASM volatile ("MSR faultmask, %0" : : "r" (faultMask) : "memory");
+  __ASM volatile ("strht %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Fault Mask (non-secure)
-  \details Assigns the given value to the non-secure Fault Mask register when in secure state.
-  \param [in]    faultMask  Fault Mask value to set
+  \brief   STRT Unprivileged (32 bit)
+  \details Executes a Unprivileged STRT instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask)
+__STATIC_FORCEINLINE void __STRT(uint32_t value, volatile uint32_t *ptr)
 {
-  __ASM volatile ("MSR faultmask_ns, %0" : : "r" (faultMask) : "memory");
+  __ASM volatile ("strt %1, %0" : "=Q" (*ptr) : "r" (value) );
 }
-#endif
 
-#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+#else  /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
+
+/**
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (1..32)
+  \return             Saturated value
+ */
+__STATIC_FORCEINLINE int32_t __SSAT(int32_t val, uint32_t sat)
+{
+  if ((sat >= 1U) && (sat <= 32U))
+  {
+    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
+    const int32_t min = -1 - max ;
+    if (val > max)
+    {
+      return max;
+    }
+    else if (val < min)
+    {
+      return min;
+    }
+  }
+  return val;
+}
+
+/**
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (0..31)
+  \return             Saturated value
+ */
+__STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
+{
+  if (sat <= 31U)
+  {
+    const uint32_t max = ((1U << sat) - 1U);
+    if (val > (int32_t)max)
+    {
+      return max;
+    }
+    else if (val < 0)
+    {
+      return 0U;
+    }
+  }
+  return (uint32_t)val;
+}
+
+#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
            (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
            (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
 
 
 #if ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
      (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
-
 /**
-  \brief   Get Process Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always in non-secure
-  mode.
-  
-  \details Returns the current value of the Process Stack Pointer Limit (PSPLIM).
-  \return               PSPLIM Register value
+  \brief   Load-Acquire (8 bit)
+  \details Executes a LDAB instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_PSPLIM(void)
+__STATIC_FORCEINLINE uint8_t __LDAB(volatile uint8_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-    // without main extensions, the non-secure PSPLIM is RAZ/WI
-  return 0U;
-#else
   uint32_t result;
-  __ASM volatile ("MRS %0, psplim"  : "=r" (result) );
-  return result;
-#endif
+
+  __ASM volatile ("ldab %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+  return ((uint8_t) result);
 }
 
-#if (defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3))
-/**
-  \brief   Get Process Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always in non-secure
-  mode.
 
-  \details Returns the current value of the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
-  \return               PSPLIM Register value
+/**
+  \brief   Load-Acquire (16 bit)
+  \details Executes a LDAH instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PSPLIM_NS(void)
+__STATIC_FORCEINLINE uint16_t __LDAH(volatile uint16_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  return 0U;
-#else
   uint32_t result;
-  __ASM volatile ("MRS %0, psplim_ns"  : "=r" (result) );
-  return result;
-#endif
+
+  __ASM volatile ("ldah %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+  return ((uint16_t) result);
 }
-#endif
 
 
 /**
-  \brief   Set Process Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored in non-secure
-  mode.
-  
-  \details Assigns the given value to the Process Stack Pointer Limit (PSPLIM).
-  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
+  \brief   Load-Acquire (32 bit)
+  \details Executes a LDA instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __set_PSPLIM(uint32_t ProcStackPtrLimit)
+__STATIC_FORCEINLINE uint32_t __LDA(volatile uint32_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  (void)ProcStackPtrLimit;
-#else
-  __ASM volatile ("MSR psplim, %0" : : "r" (ProcStackPtrLimit));
-#endif
+  uint32_t result;
+
+  __ASM volatile ("lda %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+  return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Set Process Stack Pointer (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored in non-secure
-  mode.
-
-  \details Assigns the given value to the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
-  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
+  \brief   Store-Release (8 bit)
+  \details Executes a STLB instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __TZ_set_PSPLIM_NS(uint32_t ProcStackPtrLimit)
+__STATIC_FORCEINLINE void __STLB(uint8_t value, volatile uint8_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  (void)ProcStackPtrLimit;
-#else
-  __ASM volatile ("MSR psplim_ns, %0\n" : : "r" (ProcStackPtrLimit));
-#endif
+  __ASM volatile ("stlb %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
 }
-#endif
 
 
 /**
-  \brief   Get Main Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always.
-
-  \details Returns the current value of the Main Stack Pointer Limit (MSPLIM).
-  \return               MSPLIM Register value
+  \brief   Store-Release (16 bit)
+  \details Executes a STLH instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE uint32_t __get_MSPLIM(void)
+__STATIC_FORCEINLINE void __STLH(uint16_t value, volatile uint16_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, msplim" : "=r" (result) );
-  return result;
-#endif
+  __ASM volatile ("stlh %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Get Main Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always.
-
-  \details Returns the current value of the non-secure Main Stack Pointer Limit(MSPLIM) when in secure state.
-  \return               MSPLIM Register value
+  \brief   Store-Release (32 bit)
+  \details Executes a STL instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_MSPLIM_NS(void)
+__STATIC_FORCEINLINE void __STL(uint32_t value, volatile uint32_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, msplim_ns" : "=r" (result) );
-  return result;
-#endif
+  __ASM volatile ("stl %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
 }
-#endif
 
 
 /**
-  \brief   Set Main Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored.
+  \brief   Load-Acquire Exclusive (8 bit)
+  \details Executes a LDAB exclusive instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
+ */
+#define     __LDAEXB                 (uint8_t)__builtin_arm_ldaex
 
-  \details Assigns the given value to the Main Stack Pointer Limit (MSPLIM).
-  \param [in]    MainStackPtrLimit  Main Stack Pointer Limit value to set
+
+/**
+  \brief   Load-Acquire Exclusive (16 bit)
+  \details Executes a LDAH exclusive instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __set_MSPLIM(uint32_t MainStackPtrLimit)
-{
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  (void)MainStackPtrLimit;
-#else
-  __ASM volatile ("MSR msplim, %0" : : "r" (MainStackPtrLimit));
-#endif
-}
+#define     __LDAEXH                 (uint16_t)__builtin_arm_ldaex
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Set Main Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored.
+  \brief   Load-Acquire Exclusive (32 bit)
+  \details Executes a LDA exclusive instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
+ */
+#define     __LDAEX                  (uint32_t)__builtin_arm_ldaex
 
-  \details Assigns the given value to the non-secure Main Stack Pointer Limit (MSPLIM) when in secure state.
-  \param [in]    MainStackPtrLimit  Main Stack Pointer value to set
+
+/**
+  \brief   Store-Release Exclusive (8 bit)
+  \details Executes a STLB exclusive instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
+#define     __STLEXB                 (uint32_t)__builtin_arm_stlex
+
+
+/**
+  \brief   Store-Release Exclusive (16 bit)
+  \details Executes a STLH exclusive instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
+ */
+#define     __STLEXH                 (uint32_t)__builtin_arm_stlex
+
+
+/**
+  \brief   Store-Release Exclusive (32 bit)
+  \details Executes a STL exclusive instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
+ */
+#define     __STLEX                  (uint32_t)__builtin_arm_stlex
+
+#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
+
+/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
+
+
+/* ###########################  Core Function Access  ########################### */
+/** \ingroup  CMSIS_Core_FunctionInterface
+    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
+  @{
+ */
+
+/**
+  \brief   Enable IRQ Interrupts
+  \details Enables IRQ interrupts by clearing special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
+ */
+#ifndef __ARM_COMPAT_H
+__STATIC_FORCEINLINE void __enable_irq(void)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  (void)MainStackPtrLimit;
-#else
-  __ASM volatile ("MSR msplim_ns, %0" : : "r" (MainStackPtrLimit));
-#endif
+  __ASM volatile ("cpsie i" : : : "memory");
 }
 #endif
 
-#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
 /**
-  \brief   Get FPSCR
-  \details Returns the current value of the Floating Point Status/Control register.
-  \return               Floating Point Status/Control register value
+  \brief   Disable IRQ Interrupts
+  \details Disables IRQ interrupts by setting special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
  */
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-#define __get_FPSCR      (uint32_t)__builtin_arm_get_fpscr
-#else
-#define __get_FPSCR()      ((uint32_t)0U)
+#ifndef __ARM_COMPAT_H
+__STATIC_FORCEINLINE void __disable_irq(void)
+{
+  __ASM volatile ("cpsid i" : : : "memory");
+}
 #endif
 
+
 /**
-  \brief   Set FPSCR
-  \details Assigns the given value to the Floating Point Status/Control register.
-  \param [in]    fpscr  Floating Point Status/Control value to set
+  \brief   Get Control Register
+  \details Returns the content of the Control Register.
+  \return               Control Register value
  */
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-#define __set_FPSCR      __builtin_arm_set_fpscr
-#else
-#define __set_FPSCR(x)      ((void)(x))
-#endif
-
+__STATIC_FORCEINLINE uint32_t __get_CONTROL(void)
+{
+  uint32_t result;
 
-/*@} end of CMSIS_Core_RegAccFunctions */
+  __ASM volatile ("MRS %0, control" : "=r" (result) );
+  return(result);
+}
 
 
-/* ##########################  Core Instruction Access  ######################### */
-/** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
-  Access to dedicated instructions
-  @{
-*/
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
+/**
+  \brief   Get Control Register (non-secure)
+  \details Returns the content of the non-secure Control Register when in secure mode.
+  \return               non-secure Control Register value
+ */
+__STATIC_FORCEINLINE uint32_t __TZ_get_CONTROL_NS(void)
+{
+  uint32_t result;
 
-/* Define macros for porting to both thumb1 and thumb2.
- * For thumb1, use low register (r0-r7), specified by constraint "l"
- * Otherwise, use general registers, specified by constraint "r" */
-#if defined (__thumb__) && !defined (__thumb2__)
-#define __CMSIS_GCC_OUT_REG(r) "=l" (r)
-#define __CMSIS_GCC_USE_REG(r) "l" (r)
-#else
-#define __CMSIS_GCC_OUT_REG(r) "=r" (r)
-#define __CMSIS_GCC_USE_REG(r) "r" (r)
+  __ASM volatile ("MRS %0, control_ns" : "=r" (result) );
+  return(result);
+}
 #endif
 
-/**
-  \brief   No Operation
-  \details No Operation does nothing. This instruction can be used for code alignment purposes.
- */
-#define __NOP          __builtin_arm_nop
 
 /**
-  \brief   Wait For Interrupt
-  \details Wait For Interrupt is a hint instruction that suspends execution until one of a number of events occurs.
+  \brief   Set Control Register
+  \details Writes the given value to the Control Register.
+  \param [in]    control  Control Register value to set
  */
-#define __WFI          __builtin_arm_wfi
+__STATIC_FORCEINLINE void __set_CONTROL(uint32_t control)
+{
+  __ASM volatile ("MSR control, %0" : : "r" (control) : "memory");
+  __ISB();
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Wait For Event
-  \details Wait For Event is a hint instruction that permits the processor to enter
-           a low-power state until one of a number of events occurs.
+  \brief   Set Control Register (non-secure)
+  \details Writes the given value to the non-secure Control Register when in secure state.
+  \param [in]    control  Control Register value to set
  */
-#define __WFE          __builtin_arm_wfe
+__STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
+{
+  __ASM volatile ("MSR control_ns, %0" : : "r" (control) : "memory");
+  __ISB();
+}
+#endif
 
 
 /**
-  \brief   Send Event
-  \details Send Event is a hint instruction. It causes an event to be signaled to the CPU.
+  \brief   Get IPSR Register
+  \details Returns the content of the IPSR Register.
+  \return               IPSR Register value
  */
-#define __SEV          __builtin_arm_sev
+__STATIC_FORCEINLINE uint32_t __get_IPSR(void)
+{
+  uint32_t result;
 
+  __ASM volatile ("MRS %0, ipsr" : "=r" (result) );
+  return(result);
+}
 
-/**
-  \brief   Instruction Synchronization Barrier
-  \details Instruction Synchronization Barrier flushes the pipeline in the processor,
-           so that all instructions following the ISB are fetched from cache or memory,
-           after the instruction has been completed.
- */
-#define __ISB()        __builtin_arm_isb(0xF)
 
 /**
-  \brief   Data Synchronization Barrier
-  \details Acts as a special kind of Data Memory Barrier.
-           It completes when all explicit memory accesses before this instruction complete.
+  \brief   Get APSR Register
+  \details Returns the content of the APSR Register.
+  \return               APSR Register value
  */
-#define __DSB()        __builtin_arm_dsb(0xF)
+__STATIC_FORCEINLINE uint32_t __get_APSR(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, apsr" : "=r" (result) );
+  return(result);
+}
 
 
 /**
-  \brief   Data Memory Barrier
-  \details Ensures the apparent order of the explicit memory operations before
-           and after the instruction, without ensuring their completion.
+  \brief   Get xPSR Register
+  \details Returns the content of the xPSR Register.
+  \return               xPSR Register value
  */
-#define __DMB()        __builtin_arm_dmb(0xF)
+__STATIC_FORCEINLINE uint32_t __get_xPSR(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, xpsr" : "=r" (result) );
+  return(result);
+}
 
 
 /**
-  \brief   Reverse byte order (32 bit)
-  \details Reverses the byte order in unsigned integer value. For example, 0x12345678 becomes 0x78563412.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get Process Stack Pointer
+  \details Returns the current value of the Process Stack Pointer (PSP).
+  \return               PSP Register value
  */
-#define __REV(value)   __builtin_bswap32(value)
+__STATIC_FORCEINLINE uint32_t __get_PSP(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, psp"  : "=r" (result) );
+  return(result);
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Reverse byte order (16 bit)
-  \details Reverses the byte order within each halfword of a word. For example, 0x12345678 becomes 0x34127856.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get Process Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Process Stack Pointer (PSP) when in secure state.
+  \return               PSP Register value
  */
-#define __REV16(value) __ROR(__REV(value), 16)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PSP_NS(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, psp_ns"  : "=r" (result) );
+  return(result);
+}
+#endif
 
 
 /**
-  \brief   Reverse byte order (16 bit)
-  \details Reverses the byte order in a 16-bit value and returns the signed 16-bit result. For example, 0x0080 becomes 0x8000.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Set Process Stack Pointer
+  \details Assigns the given value to the Process Stack Pointer (PSP).
+  \param [in]    topOfProcStack  Process Stack Pointer value to set
  */
-#define __REVSH(value) (int16_t)__builtin_bswap16(value)
+__STATIC_FORCEINLINE void __set_PSP(uint32_t topOfProcStack)
+{
+  __ASM volatile ("MSR psp, %0" : : "r" (topOfProcStack) : );
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Rotate Right in unsigned value (32 bit)
-  \details Rotate Right (immediate) provides the value of the contents of a register rotated by a variable number of bits.
-  \param [in]    op1  Value to rotate
-  \param [in]    op2  Number of Bits to rotate
-  \return               Rotated value
+  \brief   Set Process Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Process Stack Pointer (PSP) when in secure state.
+  \param [in]    topOfProcStack  Process Stack Pointer value to set
  */
-__STATIC_FORCEINLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
+__STATIC_FORCEINLINE void __TZ_set_PSP_NS(uint32_t topOfProcStack)
 {
-  op2 %= 32U;
-  if (op2 == 0U)
-  {
-    return op1;
-  }
-  return (op1 >> op2) | (op1 << (32U - op2));
+  __ASM volatile ("MSR psp_ns, %0" : : "r" (topOfProcStack) : );
 }
+#endif
 
 
 /**
-  \brief   Breakpoint
-  \details Causes the processor to enter Debug state.
-           Debug tools can use this to investigate system state when the instruction at a particular address is reached.
-  \param [in]    value  is ignored by the processor.
-                 If required, a debugger can use it to store additional information about the breakpoint.
+  \brief   Get Main Stack Pointer
+  \details Returns the current value of the Main Stack Pointer (MSP).
+  \return               MSP Register value
  */
-#define __BKPT(value)     __ASM volatile ("bkpt "#value)
+__STATIC_FORCEINLINE uint32_t __get_MSP(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, msp" : "=r" (result) );
+  return(result);
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Reverse bit order of value
-  \details Reverses the bit order of the given value.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get Main Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Main Stack Pointer (MSP) when in secure state.
+  \return               MSP Register value
  */
-#define __RBIT            __builtin_arm_rbit
+__STATIC_FORCEINLINE uint32_t __TZ_get_MSP_NS(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, msp_ns" : "=r" (result) );
+  return(result);
+}
+#endif
+
 
 /**
-  \brief   Count leading zeros
-  \details Counts the number of leading zeros of a data value.
-  \param [in]  value  Value to count the leading zeros
-  \return             number of leading zeros in value
+  \brief   Set Main Stack Pointer
+  \details Assigns the given value to the Main Stack Pointer (MSP).
+  \param [in]    topOfMainStack  Main Stack Pointer value to set
  */
-__STATIC_FORCEINLINE uint8_t __CLZ(uint32_t value)
+__STATIC_FORCEINLINE void __set_MSP(uint32_t topOfMainStack)
 {
-  /* Even though __builtin_clz produces a CLZ instruction on ARM, formally
-     __builtin_clz(0) is undefined behaviour, so handle this case specially.
-     This guarantees ARM-compatible results if happening to compile on a non-ARM
-     target, and ensures the compiler doesn't decide to activate any
-     optimisations using the logic "value was passed to __builtin_clz, so it
-     is non-zero".
-     ARM Compiler 6.10 and possibly earlier will optimise this test away, leaving a
-     single CLZ instruction.
-   */
-  if (value == 0U)
-  {
-    return 32U;
-  }
-  return __builtin_clz(value);
+  __ASM volatile ("MSR msp, %0" : : "r" (topOfMainStack) : );
 }
 
 
-#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-     (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDR Exclusive (8 bit)
-  \details Executes a exclusive LDR instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Set Main Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Main Stack Pointer (MSP) when in secure state.
+  \param [in]    topOfMainStack  Main Stack Pointer value to set
  */
-#define __LDREXB        (uint8_t)__builtin_arm_ldrex
+__STATIC_FORCEINLINE void __TZ_set_MSP_NS(uint32_t topOfMainStack)
+{
+  __ASM volatile ("MSR msp_ns, %0" : : "r" (topOfMainStack) : );
+}
+#endif
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDR Exclusive (16 bit)
-  \details Executes a exclusive LDR instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Get Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Stack Pointer (SP) when in secure state.
+  \return               SP Register value
  */
-#define __LDREXH        (uint16_t)__builtin_arm_ldrex
+__STATIC_FORCEINLINE uint32_t __TZ_get_SP_NS(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, sp_ns" : "=r" (result) );
+  return(result);
+}
 
 
 /**
-  \brief   LDR Exclusive (32 bit)
-  \details Executes a exclusive LDR instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Set Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Stack Pointer (SP) when in secure state.
+  \param [in]    topOfStack  Stack Pointer value to set
  */
-#define __LDREXW        (uint32_t)__builtin_arm_ldrex
+__STATIC_FORCEINLINE void __TZ_set_SP_NS(uint32_t topOfStack)
+{
+  __ASM volatile ("MSR sp_ns, %0" : : "r" (topOfStack) : );
+}
+#endif
 
 
 /**
-  \brief   STR Exclusive (8 bit)
-  \details Executes a exclusive STR instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get Priority Mask
+  \details Returns the current state of the priority mask bit from the Priority Mask Register.
+  \return               Priority Mask value
  */
-#define __STREXB        (uint32_t)__builtin_arm_strex
+__STATIC_FORCEINLINE uint32_t __get_PRIMASK(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, primask" : "=r" (result) );
+  return(result);
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STR Exclusive (16 bit)
-  \details Executes a exclusive STR instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get Priority Mask (non-secure)
+  \details Returns the current state of the non-secure priority mask bit from the Priority Mask Register when in secure state.
+  \return               Priority Mask value
  */
-#define __STREXH        (uint32_t)__builtin_arm_strex
+__STATIC_FORCEINLINE uint32_t __TZ_get_PRIMASK_NS(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, primask_ns" : "=r" (result) );
+  return(result);
+}
+#endif
 
 
 /**
-  \brief   STR Exclusive (32 bit)
-  \details Executes a exclusive STR instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set Priority Mask
+  \details Assigns the given value to the Priority Mask Register.
+  \param [in]    priMask  Priority Mask
  */
-#define __STREXW        (uint32_t)__builtin_arm_strex
+__STATIC_FORCEINLINE void __set_PRIMASK(uint32_t priMask)
+{
+  __ASM volatile ("MSR primask, %0" : : "r" (priMask) : "memory");
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Remove the exclusive lock
-  \details Removes the exclusive lock which is created by LDREX.
+  \brief   Set Priority Mask (non-secure)
+  \details Assigns the given value to the non-secure Priority Mask Register when in secure state.
+  \param [in]    priMask  Priority Mask
  */
-#define __CLREX             __builtin_arm_clrex
-
-#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
+__STATIC_FORCEINLINE void __TZ_set_PRIMASK_NS(uint32_t priMask)
+{
+  __ASM volatile ("MSR primask_ns, %0" : : "r" (priMask) : "memory");
+}
+#endif
 
 
 #if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
      (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
      (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
-
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Enable FIQ
+  \details Enables FIQ interrupts by clearing special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
  */
-#define __SSAT             __builtin_arm_ssat
+__STATIC_FORCEINLINE void __enable_fault_irq(void)
+{
+  __ASM volatile ("cpsie f" : : : "memory");
+}
 
 
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (0..31)
-  \return             Saturated value
+  \brief   Disable FIQ
+  \details Disables FIQ interrupts by setting special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
  */
-#define __USAT             __builtin_arm_usat
+__STATIC_FORCEINLINE void __disable_fault_irq(void)
+{
+  __ASM volatile ("cpsid f" : : : "memory");
+}
 
 
 /**
-  \brief   Rotate Right with Extend (32 bit)
-  \details Moves each bit of a bitstring right by one bit.
-           The carry input is shifted in at the left end of the bitstring.
-  \param [in]    value  Value to rotate
-  \return               Rotated value
+  \brief   Get Base Priority
+  \details Returns the current value of the Base Priority register.
+  \return               Base Priority register value
  */
-__STATIC_FORCEINLINE uint32_t __RRX(uint32_t value)
+__STATIC_FORCEINLINE uint32_t __get_BASEPRI(void)
 {
   uint32_t result;
 
-  __ASM volatile ("rrx %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
+  __ASM volatile ("MRS %0, basepri" : "=r" (result) );
   return(result);
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDRT Unprivileged (8 bit)
-  \details Executes a Unprivileged LDRT instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Get Base Priority (non-secure)
+  \details Returns the current value of the non-secure Base Priority register when in secure state.
+  \return               Base Priority register value
  */
-__STATIC_FORCEINLINE uint8_t __LDRBT(volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_BASEPRI_NS(void)
 {
   uint32_t result;
 
-  __ASM volatile ("ldrbt %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint8_t) result);    /* Add explicit type cast here */
+  __ASM volatile ("MRS %0, basepri_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
 
 /**
-  \brief   LDRT Unprivileged (16 bit)
-  \details Executes a Unprivileged LDRT instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Set Base Priority
+  \details Assigns the given value to the Base Priority register.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE uint16_t __LDRHT(volatile uint16_t *ptr)
+__STATIC_FORCEINLINE void __set_BASEPRI(uint32_t basePri)
 {
-  uint32_t result;
-
-  __ASM volatile ("ldrht %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint16_t) result);    /* Add explicit type cast here */
+  __ASM volatile ("MSR basepri, %0" : : "r" (basePri) : "memory");
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDRT Unprivileged (32 bit)
-  \details Executes a Unprivileged LDRT instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Set Base Priority (non-secure)
+  \details Assigns the given value to the non-secure Base Priority register when in secure state.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE uint32_t __LDRT(volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __TZ_set_BASEPRI_NS(uint32_t basePri)
 {
-  uint32_t result;
-
-  __ASM volatile ("ldrt %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return(result);
+  __ASM volatile ("MSR basepri_ns, %0" : : "r" (basePri) : "memory");
 }
+#endif
 
 
 /**
-  \brief   STRT Unprivileged (8 bit)
-  \details Executes a Unprivileged STRT instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Base Priority with condition
+  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
+           or the new value increases the BASEPRI priority level.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE void __STRBT(uint8_t value, volatile uint8_t *ptr)
+__STATIC_FORCEINLINE void __set_BASEPRI_MAX(uint32_t basePri)
 {
-  __ASM volatile ("strbt %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+  __ASM volatile ("MSR basepri_max, %0" : : "r" (basePri) : "memory");
 }
 
 
 /**
-  \brief   STRT Unprivileged (16 bit)
-  \details Executes a Unprivileged STRT instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Fault Mask
+  \details Returns the current value of the Fault Mask register.
+  \return               Fault Mask register value
  */
-__STATIC_FORCEINLINE void __STRHT(uint16_t value, volatile uint16_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_FAULTMASK(void)
 {
-  __ASM volatile ("strht %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, faultmask" : "=r" (result) );
+  return(result);
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STRT Unprivileged (32 bit)
-  \details Executes a Unprivileged STRT instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Fault Mask (non-secure)
+  \details Returns the current value of the non-secure Fault Mask register when in secure state.
+  \return               Fault Mask register value
  */
-__STATIC_FORCEINLINE void __STRT(uint32_t value, volatile uint32_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_FAULTMASK_NS(void)
 {
-  __ASM volatile ("strt %1, %0" : "=Q" (*ptr) : "r" (value) );
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, faultmask_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
-#else  /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
 
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Set Fault Mask
+  \details Assigns the given value to the Fault Mask register.
+  \param [in]    faultMask  Fault Mask value to set
  */
-__STATIC_FORCEINLINE int32_t __SSAT(int32_t val, uint32_t sat)
+__STATIC_FORCEINLINE void __set_FAULTMASK(uint32_t faultMask)
 {
-  if ((sat >= 1U) && (sat <= 32U))
-  {
-    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
-    const int32_t min = -1 - max ;
-    if (val > max)
-    {
-      return max;
-    }
-    else if (val < min)
-    {
-      return min;
-    }
-  }
-  return val;
+  __ASM volatile ("MSR faultmask, %0" : : "r" (faultMask) : "memory");
 }
 
+
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (0..31)
-  \return             Saturated value
+  \brief   Set Fault Mask (non-secure)
+  \details Assigns the given value to the non-secure Fault Mask register when in secure state.
+  \param [in]    faultMask  Fault Mask value to set
  */
-__STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
+__STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask)
 {
-  if (sat <= 31U)
-  {
-    const uint32_t max = ((1U << sat) - 1U);
-    if (val > (int32_t)max)
-    {
-      return max;
-    }
-    else if (val < 0)
-    {
-      return 0U;
-    }
-  }
-  return (uint32_t)val;
+  __ASM volatile ("MSR faultmask_ns, %0" : : "r" (faultMask) : "memory");
 }
+#endif
 
 #endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
            (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
@@ -1183,150 +1181,210 @@ __STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
 
 #if ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
      (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
+
 /**
-  \brief   Load-Acquire (8 bit)
-  \details Executes a LDAB instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Get Process Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always in non-secure
+  mode.
+
+  \details Returns the current value of the Process Stack Pointer Limit (PSPLIM).
+  \return               PSPLIM Register value
  */
-__STATIC_FORCEINLINE uint8_t __LDAB(volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_PSPLIM(void)
 {
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+    // without main extensions, the non-secure PSPLIM is RAZ/WI
+  return 0U;
+#else
   uint32_t result;
-
-  __ASM volatile ("ldab %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint8_t) result);
+  __ASM volatile ("MRS %0, psplim"  : "=r" (result) );
+  return result;
+#endif
 }
 
-
+#if (defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Load-Acquire (16 bit)
-  \details Executes a LDAH instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Get Process Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always in non-secure
+  mode.
+
+  \details Returns the current value of the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
+  \return               PSPLIM Register value
  */
-__STATIC_FORCEINLINE uint16_t __LDAH(volatile uint16_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PSPLIM_NS(void)
 {
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  return 0U;
+#else
   uint32_t result;
-
-  __ASM volatile ("ldah %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return ((uint16_t) result);
+  __ASM volatile ("MRS %0, psplim_ns"  : "=r" (result) );
+  return result;
+#endif
 }
+#endif
 
 
 /**
-  \brief   Load-Acquire (32 bit)
-  \details Executes a LDA instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Set Process Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored in non-secure
+  mode.
+
+  \details Assigns the given value to the Process Stack Pointer Limit (PSPLIM).
+  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
  */
-__STATIC_FORCEINLINE uint32_t __LDA(volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __set_PSPLIM(uint32_t ProcStackPtrLimit)
 {
-  uint32_t result;
-
-  __ASM volatile ("lda %0, %1" : "=r" (result) : "Q" (*ptr) );
-  return(result);
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  (void)ProcStackPtrLimit;
+#else
+  __ASM volatile ("MSR psplim, %0" : : "r" (ProcStackPtrLimit));
+#endif
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Store-Release (8 bit)
-  \details Executes a STLB instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Process Stack Pointer (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored in non-secure
+  mode.
+
+  \details Assigns the given value to the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
+  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
  */
-__STATIC_FORCEINLINE void __STLB(uint8_t value, volatile uint8_t *ptr)
+__STATIC_FORCEINLINE void __TZ_set_PSPLIM_NS(uint32_t ProcStackPtrLimit)
 {
-  __ASM volatile ("stlb %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  (void)ProcStackPtrLimit;
+#else
+  __ASM volatile ("MSR psplim_ns, %0\n" : : "r" (ProcStackPtrLimit));
+#endif
 }
+#endif
 
 
 /**
-  \brief   Store-Release (16 bit)
-  \details Executes a STLH instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Main Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always.
+
+  \details Returns the current value of the Main Stack Pointer Limit (MSPLIM).
+  \return               MSPLIM Register value
  */
-__STATIC_FORCEINLINE void __STLH(uint16_t value, volatile uint16_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_MSPLIM(void)
 {
-  __ASM volatile ("stlh %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, msplim" : "=r" (result) );
+  return result;
+#endif
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Store-Release (32 bit)
-  \details Executes a STL instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Main Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always.
+
+  \details Returns the current value of the non-secure Main Stack Pointer Limit(MSPLIM) when in secure state.
+  \return               MSPLIM Register value
  */
-__STATIC_FORCEINLINE void __STL(uint32_t value, volatile uint32_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_MSPLIM_NS(void)
 {
-  __ASM volatile ("stl %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, msplim_ns" : "=r" (result) );
+  return result;
+#endif
 }
+#endif
 
 
 /**
-  \brief   Load-Acquire Exclusive (8 bit)
-  \details Executes a LDAB exclusive instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
- */
-#define     __LDAEXB                 (uint8_t)__builtin_arm_ldaex
-
+  \brief   Set Main Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored.
 
-/**
-  \brief   Load-Acquire Exclusive (16 bit)
-  \details Executes a LDAH exclusive instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \details Assigns the given value to the Main Stack Pointer Limit (MSPLIM).
+  \param [in]    MainStackPtrLimit  Main Stack Pointer Limit value to set
  */
-#define     __LDAEXH                 (uint16_t)__builtin_arm_ldaex
+__STATIC_FORCEINLINE void __set_MSPLIM(uint32_t MainStackPtrLimit)
+{
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  (void)MainStackPtrLimit;
+#else
+  __ASM volatile ("MSR msplim, %0" : : "r" (MainStackPtrLimit));
+#endif
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Load-Acquire Exclusive (32 bit)
-  \details Executes a LDA exclusive instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
- */
-#define     __LDAEX                  (uint32_t)__builtin_arm_ldaex
-
+  \brief   Set Main Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored.
 
-/**
-  \brief   Store-Release Exclusive (8 bit)
-  \details Executes a STLB exclusive instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \details Assigns the given value to the non-secure Main Stack Pointer Limit (MSPLIM) when in secure state.
+  \param [in]    MainStackPtrLimit  Main Stack Pointer value to set
  */
-#define     __STLEXB                 (uint32_t)__builtin_arm_stlex
+__STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
+{
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  (void)MainStackPtrLimit;
+#else
+  __ASM volatile ("MSR msplim_ns, %0" : : "r" (MainStackPtrLimit));
+#endif
+}
+#endif
 
+#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
 /**
-  \brief   Store-Release Exclusive (16 bit)
-  \details Executes a STLH exclusive instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get FPSCR
+  \details Returns the current value of the Floating Point Status/Control register.
+  \return               Floating Point Status/Control register value
  */
-#define     __STLEXH                 (uint32_t)__builtin_arm_stlex
-
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+#define __get_FPSCR      (uint32_t)__builtin_arm_get_fpscr
+#else
+#define __get_FPSCR()      ((uint32_t)0U)
+#endif
 
 /**
-  \brief   Store-Release Exclusive (32 bit)
-  \details Executes a STL exclusive instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set FPSCR
+  \details Assigns the given value to the Floating Point Status/Control register.
+  \param [in]    fpscr  Floating Point Status/Control value to set
  */
-#define     __STLEX                  (uint32_t)__builtin_arm_stlex
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+#define __set_FPSCR      __builtin_arm_set_fpscr
+#else
+#define __set_FPSCR(x)      ((void)(x))
+#endif
 
-#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
-/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
+/*@} end of CMSIS_Core_RegAccFunctions */
 
 
 /* ###################  Compiler specific Intrinsics  ########################### */
@@ -1851,6 +1909,10 @@ __STATIC_FORCEINLINE  int32_t __QSUB( int32_t op1,  int32_t op2)
 #define __PKHTB(ARG1,ARG2,ARG3)          ( ((((uint32_t)(ARG1))          ) & 0xFFFF0000UL) |  \
                                            ((((uint32_t)(ARG2)) >> (ARG3)) & 0x0000FFFFUL)  )
 
+#define __SXTB16_RORn(ARG1, ARG2)        __SXTB16(__ROR(ARG1, ARG2))
+
+#define __SXTAB16_RORn(ARG1, ARG2, ARG3) __SXTAB16(ARG1, __ROR(ARG2, ARG3))
+
 __STATIC_FORCEINLINE int32_t __SMMLA (int32_t op1, int32_t op2, int32_t op3)
 {
   int32_t result;
diff --git a/lib/cmsis/inc/cmsis_compiler.h b/lib/cmsis/inc/cmsis_compiler.h
index fdb1a971c6a8c..adbf296f15a47 100644
--- a/lib/cmsis/inc/cmsis_compiler.h
+++ b/lib/cmsis/inc/cmsis_compiler.h
@@ -123,6 +123,10 @@
   #ifndef   __RESTRICT
     #define __RESTRICT                             __restrict
   #endif
+  #ifndef   __COMPILER_BARRIER
+    #warning No compiler specific solution for __COMPILER_BARRIER. __COMPILER_BARRIER is ignored.
+    #define __COMPILER_BARRIER()                   (void)0
+  #endif
 
 
 /*
@@ -192,6 +196,10 @@
     #warning No compiler specific solution for __RESTRICT. __RESTRICT is ignored.
     #define __RESTRICT
   #endif
+  #ifndef   __COMPILER_BARRIER
+    #warning No compiler specific solution for __COMPILER_BARRIER. __COMPILER_BARRIER is ignored.
+    #define __COMPILER_BARRIER()                   (void)0
+  #endif
 
 
 /*
@@ -260,6 +268,10 @@
     #warning No compiler specific solution for __RESTRICT. __RESTRICT is ignored.
     #define __RESTRICT
   #endif
+  #ifndef   __COMPILER_BARRIER
+    #warning No compiler specific solution for __COMPILER_BARRIER. __COMPILER_BARRIER is ignored.
+    #define __COMPILER_BARRIER()                   (void)0
+  #endif
 
 
 #else
diff --git a/lib/cmsis/inc/cmsis_gcc.h b/lib/cmsis/inc/cmsis_gcc.h
index d86b0a2d5a6d3..67bda4ef3c38d 100644
--- a/lib/cmsis/inc/cmsis_gcc.h
+++ b/lib/cmsis/inc/cmsis_gcc.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     cmsis_gcc.h
  * @brief    CMSIS compiler GCC header file
- * @version  V5.1.0
- * @date     20. December 2018
+ * @version  V5.4.1
+ * @date     27. May 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -46,9 +46,9 @@
 #ifndef   __STATIC_INLINE
   #define __STATIC_INLINE                        static inline
 #endif
-#ifndef   __STATIC_FORCEINLINE                 
+#ifndef   __STATIC_FORCEINLINE
   #define __STATIC_FORCEINLINE                   __attribute__((always_inline)) static inline
-#endif                                           
+#endif
 #ifndef   __NO_RETURN
   #define __NO_RETURN                            __attribute__((__noreturn__))
 #endif
@@ -113,464 +113,638 @@
 #ifndef   __RESTRICT
   #define __RESTRICT                             __restrict
 #endif
+#ifndef   __COMPILER_BARRIER
+  #define __COMPILER_BARRIER()                   __ASM volatile("":::"memory")
+#endif
 
+/* #########################  Startup and Lowlevel Init  ######################## */
 
-/* ###########################  Core Function Access  ########################### */
-/** \ingroup  CMSIS_Core_FunctionInterface
-    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
-  @{
- */
+#ifndef __PROGRAM_START
 
 /**
-  \brief   Enable IRQ Interrupts
-  \details Enables IRQ interrupts by clearing the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
+  \brief   Initializes data and bss sections
+  \details This default implementations initialized all data and additional bss
+           sections relying on .copy.table and .zero.table specified properly
+           in the used linker script.
+
  */
-__STATIC_FORCEINLINE void __enable_irq(void)
+__STATIC_FORCEINLINE __NO_RETURN void __cmsis_start(void)
 {
-  __ASM volatile ("cpsie i" : : : "memory");
-}
+  extern void _start(void) __NO_RETURN;
 
+  typedef struct {
+    uint32_t const* src;
+    uint32_t* dest;
+    uint32_t  wlen;
+  } __copy_table_t;
 
-/**
-  \brief   Disable IRQ Interrupts
-  \details Disables IRQ interrupts by setting the I-bit in the CPSR.
-           Can only be executed in Privileged modes.
- */
-__STATIC_FORCEINLINE void __disable_irq(void)
-{
-  __ASM volatile ("cpsid i" : : : "memory");
-}
+  typedef struct {
+    uint32_t* dest;
+    uint32_t  wlen;
+  } __zero_table_t;
 
+  extern const __copy_table_t __copy_table_start__;
+  extern const __copy_table_t __copy_table_end__;
+  extern const __zero_table_t __zero_table_start__;
+  extern const __zero_table_t __zero_table_end__;
 
-/**
-  \brief   Get Control Register
-  \details Returns the content of the Control Register.
-  \return               Control Register value
- */
-__STATIC_FORCEINLINE uint32_t __get_CONTROL(void)
-{
-  uint32_t result;
+  for (__copy_table_t const* pTable = &__copy_table_start__; pTable < &__copy_table_end__; ++pTable) {
+    for(uint32_t i=0u; i<pTable->wlen; ++i) {
+      pTable->dest[i] = pTable->src[i];
+    }
+  }
 
-  __ASM volatile ("MRS %0, control" : "=r" (result) );
-  return(result);
+  for (__zero_table_t const* pTable = &__zero_table_start__; pTable < &__zero_table_end__; ++pTable) {
+    for(uint32_t i=0u; i<pTable->wlen; ++i) {
+      pTable->dest[i] = 0u;
+    }
+  }
+
+  _start();
 }
 
+#define __PROGRAM_START           __cmsis_start
+#endif
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
-/**
-  \brief   Get Control Register (non-secure)
-  \details Returns the content of the non-secure Control Register when in secure mode.
-  \return               non-secure Control Register value
- */
-__STATIC_FORCEINLINE uint32_t __TZ_get_CONTROL_NS(void)
-{
-  uint32_t result;
+#ifndef __INITIAL_SP
+#define __INITIAL_SP              __StackTop
+#endif
 
-  __ASM volatile ("MRS %0, control_ns" : "=r" (result) );
-  return(result);
-}
+#ifndef __STACK_LIMIT
+#define __STACK_LIMIT             __StackLimit
 #endif
 
+#ifndef __VECTOR_TABLE
+#define __VECTOR_TABLE            __Vectors
+#endif
 
-/**
-  \brief   Set Control Register
-  \details Writes the given value to the Control Register.
-  \param [in]    control  Control Register value to set
- */
-__STATIC_FORCEINLINE void __set_CONTROL(uint32_t control)
-{
-  __ASM volatile ("MSR control, %0" : : "r" (control) : "memory");
-}
+#ifndef __VECTOR_TABLE_ATTRIBUTE
+#define __VECTOR_TABLE_ATTRIBUTE  __attribute__((used, section(".vectors")))
+#endif
 
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+#ifndef __STACK_SEAL
+#define __STACK_SEAL              __StackSeal
+#endif
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
-/**
-  \brief   Set Control Register (non-secure)
-  \details Writes the given value to the non-secure Control Register when in secure state.
-  \param [in]    control  Control Register value to set
- */
-__STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
-{
-  __ASM volatile ("MSR control_ns, %0" : : "r" (control) : "memory");
-}
+#ifndef __TZ_STACK_SEAL_SIZE
+#define __TZ_STACK_SEAL_SIZE      8U
 #endif
 
+#ifndef __TZ_STACK_SEAL_VALUE
+#define __TZ_STACK_SEAL_VALUE     0xFEF5EDA5FEF5EDA5ULL
+#endif
 
-/**
-  \brief   Get IPSR Register
-  \details Returns the content of the IPSR Register.
-  \return               IPSR Register value
- */
-__STATIC_FORCEINLINE uint32_t __get_IPSR(void)
-{
-  uint32_t result;
 
-  __ASM volatile ("MRS %0, ipsr" : "=r" (result) );
-  return(result);
+__STATIC_FORCEINLINE void __TZ_set_STACKSEAL_S (uint32_t* stackTop) {
+  *((uint64_t *)stackTop) = __TZ_STACK_SEAL_VALUE;
 }
+#endif
+
+
+/* ##########################  Core Instruction Access  ######################### */
+/** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
+  Access to dedicated instructions
+  @{
+*/
 
+/* Define macros for porting to both thumb1 and thumb2.
+ * For thumb1, use low register (r0-r7), specified by constraint "l"
+ * Otherwise, use general registers, specified by constraint "r" */
+#if defined (__thumb__) && !defined (__thumb2__)
+#define __CMSIS_GCC_OUT_REG(r) "=l" (r)
+#define __CMSIS_GCC_RW_REG(r) "+l" (r)
+#define __CMSIS_GCC_USE_REG(r) "l" (r)
+#else
+#define __CMSIS_GCC_OUT_REG(r) "=r" (r)
+#define __CMSIS_GCC_RW_REG(r) "+r" (r)
+#define __CMSIS_GCC_USE_REG(r) "r" (r)
+#endif
 
 /**
-  \brief   Get APSR Register
-  \details Returns the content of the APSR Register.
-  \return               APSR Register value
+  \brief   No Operation
+  \details No Operation does nothing. This instruction can be used for code alignment purposes.
  */
-__STATIC_FORCEINLINE uint32_t __get_APSR(void)
-{
-  uint32_t result;
+#define __NOP()                             __ASM volatile ("nop")
 
-  __ASM volatile ("MRS %0, apsr" : "=r" (result) );
-  return(result);
-}
+/**
+  \brief   Wait For Interrupt
+  \details Wait For Interrupt is a hint instruction that suspends execution until one of a number of events occurs.
+ */
+#define __WFI()                             __ASM volatile ("wfi":::"memory")
 
 
 /**
-  \brief   Get xPSR Register
-  \details Returns the content of the xPSR Register.
-  \return               xPSR Register value
+  \brief   Wait For Event
+  \details Wait For Event is a hint instruction that permits the processor to enter
+           a low-power state until one of a number of events occurs.
  */
-__STATIC_FORCEINLINE uint32_t __get_xPSR(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, xpsr" : "=r" (result) );
-  return(result);
-}
+#define __WFE()                             __ASM volatile ("wfe":::"memory")
 
 
 /**
-  \brief   Get Process Stack Pointer
-  \details Returns the current value of the Process Stack Pointer (PSP).
-  \return               PSP Register value
+  \brief   Send Event
+  \details Send Event is a hint instruction. It causes an event to be signaled to the CPU.
  */
-__STATIC_FORCEINLINE uint32_t __get_PSP(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, psp"  : "=r" (result) );
-  return(result);
-}
+#define __SEV()                             __ASM volatile ("sev")
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Process Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Process Stack Pointer (PSP) when in secure state.
-  \return               PSP Register value
+  \brief   Instruction Synchronization Barrier
+  \details Instruction Synchronization Barrier flushes the pipeline in the processor,
+           so that all instructions following the ISB are fetched from cache or memory,
+           after the instruction has been completed.
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PSP_NS(void)
+__STATIC_FORCEINLINE void __ISB(void)
 {
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, psp_ns"  : "=r" (result) );
-  return(result);
+  __ASM volatile ("isb 0xF":::"memory");
 }
-#endif
 
 
 /**
-  \brief   Set Process Stack Pointer
-  \details Assigns the given value to the Process Stack Pointer (PSP).
-  \param [in]    topOfProcStack  Process Stack Pointer value to set
+  \brief   Data Synchronization Barrier
+  \details Acts as a special kind of Data Memory Barrier.
+           It completes when all explicit memory accesses before this instruction complete.
  */
-__STATIC_FORCEINLINE void __set_PSP(uint32_t topOfProcStack)
+__STATIC_FORCEINLINE void __DSB(void)
 {
-  __ASM volatile ("MSR psp, %0" : : "r" (topOfProcStack) : );
+  __ASM volatile ("dsb 0xF":::"memory");
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Process Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Process Stack Pointer (PSP) when in secure state.
-  \param [in]    topOfProcStack  Process Stack Pointer value to set
+  \brief   Data Memory Barrier
+  \details Ensures the apparent order of the explicit memory operations before
+           and after the instruction, without ensuring their completion.
  */
-__STATIC_FORCEINLINE void __TZ_set_PSP_NS(uint32_t topOfProcStack)
+__STATIC_FORCEINLINE void __DMB(void)
 {
-  __ASM volatile ("MSR psp_ns, %0" : : "r" (topOfProcStack) : );
+  __ASM volatile ("dmb 0xF":::"memory");
 }
-#endif
 
 
 /**
-  \brief   Get Main Stack Pointer
-  \details Returns the current value of the Main Stack Pointer (MSP).
-  \return               MSP Register value
+  \brief   Reverse byte order (32 bit)
+  \details Reverses the byte order in unsigned integer value. For example, 0x12345678 becomes 0x78563412.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __get_MSP(void)
+__STATIC_FORCEINLINE uint32_t __REV(uint32_t value)
 {
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+  return __builtin_bswap32(value);
+#else
   uint32_t result;
 
-  __ASM volatile ("MRS %0, msp" : "=r" (result) );
-  return(result);
+  __ASM ("rev %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
+  return result;
+#endif
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Main Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Main Stack Pointer (MSP) when in secure state.
-  \return               MSP Register value
+  \brief   Reverse byte order (16 bit)
+  \details Reverses the byte order within each halfword of a word. For example, 0x12345678 becomes 0x34127856.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_MSP_NS(void)
+__STATIC_FORCEINLINE uint32_t __REV16(uint32_t value)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, msp_ns" : "=r" (result) );
-  return(result);
+  __ASM ("rev16 %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
+  return result;
 }
-#endif
 
 
 /**
-  \brief   Set Main Stack Pointer
-  \details Assigns the given value to the Main Stack Pointer (MSP).
-  \param [in]    topOfMainStack  Main Stack Pointer value to set
+  \brief   Reverse byte order (16 bit)
+  \details Reverses the byte order in a 16-bit value and returns the signed 16-bit result. For example, 0x0080 becomes 0x8000.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE void __set_MSP(uint32_t topOfMainStack)
+__STATIC_FORCEINLINE int16_t __REVSH(int16_t value)
 {
-  __ASM volatile ("MSR msp, %0" : : "r" (topOfMainStack) : );
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+  return (int16_t)__builtin_bswap16(value);
+#else
+  int16_t result;
+
+  __ASM ("revsh %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
+  return result;
+#endif
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Main Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Main Stack Pointer (MSP) when in secure state.
-  \param [in]    topOfMainStack  Main Stack Pointer value to set
+  \brief   Rotate Right in unsigned value (32 bit)
+  \details Rotate Right (immediate) provides the value of the contents of a register rotated by a variable number of bits.
+  \param [in]    op1  Value to rotate
+  \param [in]    op2  Number of Bits to rotate
+  \return               Rotated value
  */
-__STATIC_FORCEINLINE void __TZ_set_MSP_NS(uint32_t topOfMainStack)
+__STATIC_FORCEINLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
 {
-  __ASM volatile ("MSR msp_ns, %0" : : "r" (topOfMainStack) : );
+  op2 %= 32U;
+  if (op2 == 0U)
+  {
+    return op1;
+  }
+  return (op1 >> op2) | (op1 << (32U - op2));
 }
-#endif
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Stack Pointer (non-secure)
-  \details Returns the current value of the non-secure Stack Pointer (SP) when in secure state.
-  \return               SP Register value
- */
-__STATIC_FORCEINLINE uint32_t __TZ_get_SP_NS(void)
-{
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, sp_ns" : "=r" (result) );
-  return(result);
-}
-
-
-/**
-  \brief   Set Stack Pointer (non-secure)
-  \details Assigns the given value to the non-secure Stack Pointer (SP) when in secure state.
-  \param [in]    topOfStack  Stack Pointer value to set
+  \brief   Breakpoint
+  \details Causes the processor to enter Debug state.
+           Debug tools can use this to investigate system state when the instruction at a particular address is reached.
+  \param [in]    value  is ignored by the processor.
+                 If required, a debugger can use it to store additional information about the breakpoint.
  */
-__STATIC_FORCEINLINE void __TZ_set_SP_NS(uint32_t topOfStack)
-{
-  __ASM volatile ("MSR sp_ns, %0" : : "r" (topOfStack) : );
-}
-#endif
+#define __BKPT(value)                       __ASM volatile ("bkpt "#value)
 
 
 /**
-  \brief   Get Priority Mask
-  \details Returns the current state of the priority mask bit from the Priority Mask Register.
-  \return               Priority Mask value
+  \brief   Reverse bit order of value
+  \details Reverses the bit order of the given value.
+  \param [in]    value  Value to reverse
+  \return               Reversed value
  */
-__STATIC_FORCEINLINE uint32_t __get_PRIMASK(void)
+__STATIC_FORCEINLINE uint32_t __RBIT(uint32_t value)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, primask" : "=r" (result) :: "memory");
-  return(result);
+#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
+   __ASM ("rbit %0, %1" : "=r" (result) : "r" (value) );
+#else
+  uint32_t s = (4U /*sizeof(v)*/ * 8U) - 1U; /* extra shift needed at end */
+
+  result = value;                      /* r will be reversed bits of v; first get LSB of v */
+  for (value >>= 1U; value != 0U; value >>= 1U)
+  {
+    result <<= 1U;
+    result |= value & 1U;
+    s--;
+  }
+  result <<= s;                        /* shift when v's highest bits are zero */
+#endif
+  return result;
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Priority Mask (non-secure)
-  \details Returns the current state of the non-secure priority mask bit from the Priority Mask Register when in secure state.
-  \return               Priority Mask value
+  \brief   Count leading zeros
+  \details Counts the number of leading zeros of a data value.
+  \param [in]  value  Value to count the leading zeros
+  \return             number of leading zeros in value
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PRIMASK_NS(void)
+__STATIC_FORCEINLINE uint8_t __CLZ(uint32_t value)
 {
-  uint32_t result;
-
-  __ASM volatile ("MRS %0, primask_ns" : "=r" (result) :: "memory");
-  return(result);
+  /* Even though __builtin_clz produces a CLZ instruction on ARM, formally
+     __builtin_clz(0) is undefined behaviour, so handle this case specially.
+     This guarantees ARM-compatible results if happening to compile on a non-ARM
+     target, and ensures the compiler doesn't decide to activate any
+     optimisations using the logic "value was passed to __builtin_clz, so it
+     is non-zero".
+     ARM GCC 7.3 and possibly earlier will optimise this test away, leaving a
+     single CLZ instruction.
+   */
+  if (value == 0U)
+  {
+    return 32U;
+  }
+  return __builtin_clz(value);
 }
-#endif
 
 
+#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
+     (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
 /**
-  \brief   Set Priority Mask
-  \details Assigns the given value to the Priority Mask Register.
-  \param [in]    priMask  Priority Mask
+  \brief   LDR Exclusive (8 bit)
+  \details Executes a exclusive LDR instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __set_PRIMASK(uint32_t priMask)
+__STATIC_FORCEINLINE uint8_t __LDREXB(volatile uint8_t *addr)
 {
-  __ASM volatile ("MSR primask, %0" : : "r" (priMask) : "memory");
+    uint32_t result;
+
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+   __ASM volatile ("ldrexb %0, %1" : "=r" (result) : "Q" (*addr) );
+#else
+    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
+       accepted by assembler. So has to use following less efficient pattern.
+    */
+   __ASM volatile ("ldrexb %0, [%1]" : "=r" (result) : "r" (addr) : "memory" );
+#endif
+   return ((uint8_t) result);    /* Add explicit type cast here */
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Priority Mask (non-secure)
-  \details Assigns the given value to the non-secure Priority Mask Register when in secure state.
-  \param [in]    priMask  Priority Mask
+  \brief   LDR Exclusive (16 bit)
+  \details Executes a exclusive LDR instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __TZ_set_PRIMASK_NS(uint32_t priMask)
+__STATIC_FORCEINLINE uint16_t __LDREXH(volatile uint16_t *addr)
 {
-  __ASM volatile ("MSR primask_ns, %0" : : "r" (priMask) : "memory");
-}
+    uint32_t result;
+
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+   __ASM volatile ("ldrexh %0, %1" : "=r" (result) : "Q" (*addr) );
+#else
+    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
+       accepted by assembler. So has to use following less efficient pattern.
+    */
+   __ASM volatile ("ldrexh %0, [%1]" : "=r" (result) : "r" (addr) : "memory" );
 #endif
+   return ((uint16_t) result);    /* Add explicit type cast here */
+}
 
 
-#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
 /**
-  \brief   Enable FIQ
-  \details Enables FIQ interrupts by clearing the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
+  \brief   LDR Exclusive (32 bit)
+  \details Executes a exclusive LDR instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __enable_fault_irq(void)
+__STATIC_FORCEINLINE uint32_t __LDREXW(volatile uint32_t *addr)
 {
-  __ASM volatile ("cpsie f" : : : "memory");
+    uint32_t result;
+
+   __ASM volatile ("ldrex %0, %1" : "=r" (result) : "Q" (*addr) );
+   return(result);
 }
 
 
 /**
-  \brief   Disable FIQ
-  \details Disables FIQ interrupts by setting the F-bit in the CPSR.
-           Can only be executed in Privileged modes.
+  \brief   STR Exclusive (8 bit)
+  \details Executes a exclusive STR instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE void __disable_fault_irq(void)
+__STATIC_FORCEINLINE uint32_t __STREXB(uint8_t value, volatile uint8_t *addr)
 {
-  __ASM volatile ("cpsid f" : : : "memory");
+   uint32_t result;
+
+   __ASM volatile ("strexb %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" ((uint32_t)value) );
+   return(result);
 }
 
 
 /**
-  \brief   Get Base Priority
-  \details Returns the current value of the Base Priority register.
-  \return               Base Priority register value
+  \brief   STR Exclusive (16 bit)
+  \details Executes a exclusive STR instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE uint32_t __get_BASEPRI(void)
+__STATIC_FORCEINLINE uint32_t __STREXH(uint16_t value, volatile uint16_t *addr)
 {
-  uint32_t result;
+   uint32_t result;
 
-  __ASM volatile ("MRS %0, basepri" : "=r" (result) );
-  return(result);
+   __ASM volatile ("strexh %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" ((uint32_t)value) );
+   return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Base Priority (non-secure)
-  \details Returns the current value of the non-secure Base Priority register when in secure state.
-  \return               Base Priority register value
+  \brief   STR Exclusive (32 bit)
+  \details Executes a exclusive STR instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_BASEPRI_NS(void)
+__STATIC_FORCEINLINE uint32_t __STREXW(uint32_t value, volatile uint32_t *addr)
 {
-  uint32_t result;
+   uint32_t result;
 
-  __ASM volatile ("MRS %0, basepri_ns" : "=r" (result) );
-  return(result);
+   __ASM volatile ("strex %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" (value) );
+   return(result);
 }
-#endif
 
 
 /**
-  \brief   Set Base Priority
-  \details Assigns the given value to the Base Priority register.
-  \param [in]    basePri  Base Priority value to set
+  \brief   Remove the exclusive lock
+  \details Removes the exclusive lock which is created by LDREX.
  */
-__STATIC_FORCEINLINE void __set_BASEPRI(uint32_t basePri)
+__STATIC_FORCEINLINE void __CLREX(void)
 {
-  __ASM volatile ("MSR basepri, %0" : : "r" (basePri) : "memory");
+  __ASM volatile ("clrex" ::: "memory");
 }
 
+#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
+
+#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
 /**
-  \brief   Set Base Priority (non-secure)
-  \details Assigns the given value to the non-secure Base Priority register when in secure state.
-  \param [in]    basePri  Base Priority value to set
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  ARG1  Value to be saturated
+  \param [in]  ARG2  Bit position to saturate to (1..32)
+  \return             Saturated value
  */
-__STATIC_FORCEINLINE void __TZ_set_BASEPRI_NS(uint32_t basePri)
-{
-  __ASM volatile ("MSR basepri_ns, %0" : : "r" (basePri) : "memory");
-}
-#endif
+#define __SSAT(ARG1, ARG2) \
+__extension__ \
+({                          \
+  int32_t __RES, __ARG1 = (ARG1); \
+  __ASM volatile ("ssat %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) : "cc" ); \
+  __RES; \
+ })
 
 
 /**
-  \brief   Set Base Priority with condition
-  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
-           or the new value increases the BASEPRI priority level.
-  \param [in]    basePri  Base Priority value to set
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  ARG1  Value to be saturated
+  \param [in]  ARG2  Bit position to saturate to (0..31)
+  \return             Saturated value
  */
-__STATIC_FORCEINLINE void __set_BASEPRI_MAX(uint32_t basePri)
-{
-  __ASM volatile ("MSR basepri_max, %0" : : "r" (basePri) : "memory");
-}
+#define __USAT(ARG1, ARG2) \
+__extension__ \
+({                          \
+  uint32_t __RES, __ARG1 = (ARG1); \
+  __ASM volatile ("usat %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) : "cc" ); \
+  __RES; \
+ })
 
 
 /**
-  \brief   Get Fault Mask
-  \details Returns the current value of the Fault Mask register.
-  \return               Fault Mask register value
+  \brief   Rotate Right with Extend (32 bit)
+  \details Moves each bit of a bitstring right by one bit.
+           The carry input is shifted in at the left end of the bitstring.
+  \param [in]    value  Value to rotate
+  \return               Rotated value
  */
-__STATIC_FORCEINLINE uint32_t __get_FAULTMASK(void)
+__STATIC_FORCEINLINE uint32_t __RRX(uint32_t value)
 {
   uint32_t result;
 
-  __ASM volatile ("MRS %0, faultmask" : "=r" (result) );
+  __ASM volatile ("rrx %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
   return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Get Fault Mask (non-secure)
-  \details Returns the current value of the non-secure Fault Mask register when in secure state.
-  \return               Fault Mask register value
+  \brief   LDRT Unprivileged (8 bit)
+  \details Executes a Unprivileged LDRT instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_FAULTMASK_NS(void)
+__STATIC_FORCEINLINE uint8_t __LDRBT(volatile uint8_t *ptr)
 {
-  uint32_t result;
+    uint32_t result;
 
-  __ASM volatile ("MRS %0, faultmask_ns" : "=r" (result) );
-  return(result);
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+   __ASM volatile ("ldrbt %0, %1" : "=r" (result) : "Q" (*ptr) );
+#else
+    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
+       accepted by assembler. So has to use following less efficient pattern.
+    */
+   __ASM volatile ("ldrbt %0, [%1]" : "=r" (result) : "r" (ptr) : "memory" );
+#endif
+   return ((uint8_t) result);    /* Add explicit type cast here */
 }
+
+
+/**
+  \brief   LDRT Unprivileged (16 bit)
+  \details Executes a Unprivileged LDRT instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
+ */
+__STATIC_FORCEINLINE uint16_t __LDRHT(volatile uint16_t *ptr)
+{
+    uint32_t result;
+
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+   __ASM volatile ("ldrht %0, %1" : "=r" (result) : "Q" (*ptr) );
+#else
+    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
+       accepted by assembler. So has to use following less efficient pattern.
+    */
+   __ASM volatile ("ldrht %0, [%1]" : "=r" (result) : "r" (ptr) : "memory" );
 #endif
+   return ((uint16_t) result);    /* Add explicit type cast here */
+}
 
 
 /**
-  \brief   Set Fault Mask
-  \details Assigns the given value to the Fault Mask register.
-  \param [in]    faultMask  Fault Mask value to set
+  \brief   LDRT Unprivileged (32 bit)
+  \details Executes a Unprivileged LDRT instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __set_FAULTMASK(uint32_t faultMask)
+__STATIC_FORCEINLINE uint32_t __LDRT(volatile uint32_t *ptr)
 {
-  __ASM volatile ("MSR faultmask, %0" : : "r" (faultMask) : "memory");
+    uint32_t result;
+
+   __ASM volatile ("ldrt %0, %1" : "=r" (result) : "Q" (*ptr) );
+   return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Set Fault Mask (non-secure)
-  \details Assigns the given value to the non-secure Fault Mask register when in secure state.
-  \param [in]    faultMask  Fault Mask value to set
+  \brief   STRT Unprivileged (8 bit)
+  \details Executes a Unprivileged STRT instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask)
+__STATIC_FORCEINLINE void __STRBT(uint8_t value, volatile uint8_t *ptr)
 {
-  __ASM volatile ("MSR faultmask_ns, %0" : : "r" (faultMask) : "memory");
+   __ASM volatile ("strbt %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+}
+
+
+/**
+  \brief   STRT Unprivileged (16 bit)
+  \details Executes a Unprivileged STRT instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+ */
+__STATIC_FORCEINLINE void __STRHT(uint16_t value, volatile uint16_t *ptr)
+{
+   __ASM volatile ("strht %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+}
+
+
+/**
+  \brief   STRT Unprivileged (32 bit)
+  \details Executes a Unprivileged STRT instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+ */
+__STATIC_FORCEINLINE void __STRT(uint32_t value, volatile uint32_t *ptr)
+{
+   __ASM volatile ("strt %1, %0" : "=Q" (*ptr) : "r" (value) );
+}
+
+#else  /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
+           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
+           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
+
+/**
+  \brief   Signed Saturate
+  \details Saturates a signed value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (1..32)
+  \return             Saturated value
+ */
+__STATIC_FORCEINLINE int32_t __SSAT(int32_t val, uint32_t sat)
+{
+  if ((sat >= 1U) && (sat <= 32U))
+  {
+    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
+    const int32_t min = -1 - max ;
+    if (val > max)
+    {
+      return max;
+    }
+    else if (val < min)
+    {
+      return min;
+    }
+  }
+  return val;
+}
+
+/**
+  \brief   Unsigned Saturate
+  \details Saturates an unsigned value.
+  \param [in]  value  Value to be saturated
+  \param [in]    sat  Bit position to saturate to (0..31)
+  \return             Saturated value
+ */
+__STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
+{
+  if (sat <= 31U)
+  {
+    const uint32_t max = ((1U << sat) - 1U);
+    if (val > (int32_t)max)
+    {
+      return max;
+    }
+    else if (val < 0)
+    {
+      return 0U;
+    }
+  }
+  return (uint32_t)val;
 }
-#endif
 
 #endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
            (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
@@ -579,780 +753,646 @@ __STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask)
 
 #if ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
      (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
+/**
+  \brief   Load-Acquire (8 bit)
+  \details Executes a LDAB instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
+ */
+__STATIC_FORCEINLINE uint8_t __LDAB(volatile uint8_t *ptr)
+{
+    uint32_t result;
+
+   __ASM volatile ("ldab %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+   return ((uint8_t) result);
+}
+
 
 /**
-  \brief   Get Process Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always in non-secure
-  mode.
-  
-  \details Returns the current value of the Process Stack Pointer Limit (PSPLIM).
-  \return               PSPLIM Register value
+  \brief   Load-Acquire (16 bit)
+  \details Executes a LDAH instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_PSPLIM(void)
+__STATIC_FORCEINLINE uint16_t __LDAH(volatile uint16_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-    // without main extensions, the non-secure PSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, psplim"  : "=r" (result) );
-  return result;
-#endif
+    uint32_t result;
+
+   __ASM volatile ("ldah %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+   return ((uint16_t) result);
 }
 
-#if (defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3))
+
 /**
-  \brief   Get Process Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always.
+  \brief   Load-Acquire (32 bit)
+  \details Executes a LDA instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
+ */
+__STATIC_FORCEINLINE uint32_t __LDA(volatile uint32_t *ptr)
+{
+    uint32_t result;
 
-  \details Returns the current value of the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
-  \return               PSPLIM Register value
+   __ASM volatile ("lda %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+   return(result);
+}
+
+
+/**
+  \brief   Store-Release (8 bit)
+  \details Executes a STLB instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_PSPLIM_NS(void)
+__STATIC_FORCEINLINE void __STLB(uint8_t value, volatile uint8_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, psplim_ns"  : "=r" (result) );
-  return result;
-#endif
+   __ASM volatile ("stlb %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
 }
-#endif
 
 
 /**
-  \brief   Set Process Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored in non-secure
-  mode.
-  
-  \details Assigns the given value to the Process Stack Pointer Limit (PSPLIM).
-  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
+  \brief   Store-Release (16 bit)
+  \details Executes a STLH instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
  */
-__STATIC_FORCEINLINE void __set_PSPLIM(uint32_t ProcStackPtrLimit)
+__STATIC_FORCEINLINE void __STLH(uint16_t value, volatile uint16_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  (void)ProcStackPtrLimit;
-#else
-  __ASM volatile ("MSR psplim, %0" : : "r" (ProcStackPtrLimit));
-#endif
+   __ASM volatile ("stlh %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Set Process Stack Pointer (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored.
+  \brief   Store-Release (32 bit)
+  \details Executes a STL instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+ */
+__STATIC_FORCEINLINE void __STL(uint32_t value, volatile uint32_t *ptr)
+{
+   __ASM volatile ("stl %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
+}
 
-  \details Assigns the given value to the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
-  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
+
+/**
+  \brief   Load-Acquire Exclusive (8 bit)
+  \details Executes a LDAB exclusive instruction for 8 bit value.
+  \param [in]    ptr  Pointer to data
+  \return             value of type uint8_t at (*ptr)
  */
-__STATIC_FORCEINLINE void __TZ_set_PSPLIM_NS(uint32_t ProcStackPtrLimit)
+__STATIC_FORCEINLINE uint8_t __LDAEXB(volatile uint8_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure PSPLIM is RAZ/WI
-  (void)ProcStackPtrLimit;
-#else
-  __ASM volatile ("MSR psplim_ns, %0\n" : : "r" (ProcStackPtrLimit));
-#endif
+    uint32_t result;
+
+   __ASM volatile ("ldaexb %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+   return ((uint8_t) result);
 }
-#endif
 
 
 /**
-  \brief   Get Main Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always in non-secure
-  mode.
+  \brief   Load-Acquire Exclusive (16 bit)
+  \details Executes a LDAH exclusive instruction for 16 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint16_t at (*ptr)
+ */
+__STATIC_FORCEINLINE uint16_t __LDAEXH(volatile uint16_t *ptr)
+{
+    uint32_t result;
+
+   __ASM volatile ("ldaexh %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+   return ((uint16_t) result);
+}
 
-  \details Returns the current value of the Main Stack Pointer Limit (MSPLIM).
-  \return               MSPLIM Register value
+
+/**
+  \brief   Load-Acquire Exclusive (32 bit)
+  \details Executes a LDA exclusive instruction for 32 bit values.
+  \param [in]    ptr  Pointer to data
+  \return        value of type uint32_t at (*ptr)
  */
-__STATIC_FORCEINLINE uint32_t __get_MSPLIM(void)
+__STATIC_FORCEINLINE uint32_t __LDAEX(volatile uint32_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, msplim" : "=r" (result) );
-  return result;
-#endif
+    uint32_t result;
+
+   __ASM volatile ("ldaex %0, %1" : "=r" (result) : "Q" (*ptr) : "memory" );
+   return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Get Main Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence zero is returned always.
-
-  \details Returns the current value of the non-secure Main Stack Pointer Limit(MSPLIM) when in secure state.
-  \return               MSPLIM Register value
+  \brief   Store-Release Exclusive (8 bit)
+  \details Executes a STLB exclusive instruction for 8 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE uint32_t __TZ_get_MSPLIM_NS(void)
+__STATIC_FORCEINLINE uint32_t __STLEXB(uint8_t value, volatile uint8_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  return 0U;
-#else
-  uint32_t result;
-  __ASM volatile ("MRS %0, msplim_ns" : "=r" (result) );
-  return result;
-#endif
+   uint32_t result;
+
+   __ASM volatile ("stlexb %0, %2, %1" : "=&r" (result), "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
+   return(result);
 }
-#endif
 
 
 /**
-  \brief   Set Main Stack Pointer Limit
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored in non-secure
-  mode.
-
-  \details Assigns the given value to the Main Stack Pointer Limit (MSPLIM).
-  \param [in]    MainStackPtrLimit  Main Stack Pointer Limit value to set
+  \brief   Store-Release Exclusive (16 bit)
+  \details Executes a STLH exclusive instruction for 16 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE void __set_MSPLIM(uint32_t MainStackPtrLimit)
+__STATIC_FORCEINLINE uint32_t __STLEXH(uint16_t value, volatile uint16_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
-    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  (void)MainStackPtrLimit;
-#else
-  __ASM volatile ("MSR msplim, %0" : : "r" (MainStackPtrLimit));
-#endif
+   uint32_t result;
+
+   __ASM volatile ("stlexh %0, %2, %1" : "=&r" (result), "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
+   return(result);
 }
 
 
-#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Set Main Stack Pointer Limit (non-secure)
-  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
-  Stack Pointer Limit register hence the write is silently ignored.
-
-  \details Assigns the given value to the non-secure Main Stack Pointer Limit (MSPLIM) when in secure state.
-  \param [in]    MainStackPtrLimit  Main Stack Pointer value to set
+  \brief   Store-Release Exclusive (32 bit)
+  \details Executes a STL exclusive instruction for 32 bit values.
+  \param [in]  value  Value to store
+  \param [in]    ptr  Pointer to location
+  \return          0  Function succeeded
+  \return          1  Function failed
  */
-__STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
+__STATIC_FORCEINLINE uint32_t __STLEX(uint32_t value, volatile uint32_t *ptr)
 {
-#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
-  // without main extensions, the non-secure MSPLIM is RAZ/WI
-  (void)MainStackPtrLimit;
-#else
-  __ASM volatile ("MSR msplim_ns, %0" : : "r" (MainStackPtrLimit));
-#endif
+   uint32_t result;
+
+   __ASM volatile ("stlex %0, %2, %1" : "=&r" (result), "=Q" (*ptr) : "r" ((uint32_t)value) : "memory" );
+   return(result);
 }
-#endif
 
 #endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
            (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
+/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
+
+
+/* ###########################  Core Function Access  ########################### */
+/** \ingroup  CMSIS_Core_FunctionInterface
+    \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions
+  @{
+ */
 
 /**
-  \brief   Get FPSCR
-  \details Returns the current value of the Floating Point Status/Control register.
-  \return               Floating Point Status/Control register value
+  \brief   Enable IRQ Interrupts
+  \details Enables IRQ interrupts by clearing special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
  */
-__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
+__STATIC_FORCEINLINE void __enable_irq(void)
 {
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-#if __has_builtin(__builtin_arm_get_fpscr) 
-// Re-enable using built-in when GCC has been fixed
-// || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
-  /* see https://gcc.gnu.org/ml/gcc-patches/2017-04/msg00443.html */
-  return __builtin_arm_get_fpscr();
-#else
-  uint32_t result;
-
-  __ASM volatile ("VMRS %0, fpscr" : "=r" (result) );
-  return(result);
-#endif
-#else
-  return(0U);
-#endif
+  __ASM volatile ("cpsie i" : : : "memory");
 }
 
 
 /**
-  \brief   Set FPSCR
-  \details Assigns the given value to the Floating Point Status/Control register.
-  \param [in]    fpscr  Floating Point Status/Control value to set
+  \brief   Disable IRQ Interrupts
+  \details Disables IRQ interrupts by setting special-purpose register PRIMASK.
+           Can only be executed in Privileged modes.
  */
-__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
+__STATIC_FORCEINLINE void __disable_irq(void)
 {
-#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
-#if __has_builtin(__builtin_arm_set_fpscr)
-// Re-enable using built-in when GCC has been fixed
-// || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
-  /* see https://gcc.gnu.org/ml/gcc-patches/2017-04/msg00443.html */
-  __builtin_arm_set_fpscr(fpscr);
-#else
-  __ASM volatile ("VMSR fpscr, %0" : : "r" (fpscr) : "vfpcc", "memory");
-#endif
-#else
-  (void)fpscr;
-#endif
+  __ASM volatile ("cpsid i" : : : "memory");
 }
 
 
-/*@} end of CMSIS_Core_RegAccFunctions */
-
+/**
+  \brief   Get Control Register
+  \details Returns the content of the Control Register.
+  \return               Control Register value
+ */
+__STATIC_FORCEINLINE uint32_t __get_CONTROL(void)
+{
+  uint32_t result;
 
-/* ##########################  Core Instruction Access  ######################### */
-/** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
-  Access to dedicated instructions
-  @{
-*/
+  __ASM volatile ("MRS %0, control" : "=r" (result) );
+  return(result);
+}
 
-/* Define macros for porting to both thumb1 and thumb2.
- * For thumb1, use low register (r0-r7), specified by constraint "l"
- * Otherwise, use general registers, specified by constraint "r" */
-#if defined (__thumb__) && !defined (__thumb2__)
-#define __CMSIS_GCC_OUT_REG(r) "=l" (r)
-#define __CMSIS_GCC_RW_REG(r) "+l" (r)
-#define __CMSIS_GCC_USE_REG(r) "l" (r)
-#else
-#define __CMSIS_GCC_OUT_REG(r) "=r" (r)
-#define __CMSIS_GCC_RW_REG(r) "+r" (r)
-#define __CMSIS_GCC_USE_REG(r) "r" (r)
-#endif
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   No Operation
-  \details No Operation does nothing. This instruction can be used for code alignment purposes.
+  \brief   Get Control Register (non-secure)
+  \details Returns the content of the non-secure Control Register when in secure mode.
+  \return               non-secure Control Register value
  */
-#define __NOP()                             __ASM volatile ("nop")
+__STATIC_FORCEINLINE uint32_t __TZ_get_CONTROL_NS(void)
+{
+  uint32_t result;
 
-/**
-  \brief   Wait For Interrupt
-  \details Wait For Interrupt is a hint instruction that suspends execution until one of a number of events occurs.
- */
-#define __WFI()                             __ASM volatile ("wfi")
+  __ASM volatile ("MRS %0, control_ns" : "=r" (result) );
+  return(result);
+}
+#endif
 
 
 /**
-  \brief   Wait For Event
-  \details Wait For Event is a hint instruction that permits the processor to enter
-           a low-power state until one of a number of events occurs.
+  \brief   Set Control Register
+  \details Writes the given value to the Control Register.
+  \param [in]    control  Control Register value to set
  */
-#define __WFE()                             __ASM volatile ("wfe")
+__STATIC_FORCEINLINE void __set_CONTROL(uint32_t control)
+{
+  __ASM volatile ("MSR control, %0" : : "r" (control) : "memory");
+  __ISB();
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Send Event
-  \details Send Event is a hint instruction. It causes an event to be signaled to the CPU.
+  \brief   Set Control Register (non-secure)
+  \details Writes the given value to the non-secure Control Register when in secure state.
+  \param [in]    control  Control Register value to set
  */
-#define __SEV()                             __ASM volatile ("sev")
+__STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
+{
+  __ASM volatile ("MSR control_ns, %0" : : "r" (control) : "memory");
+  __ISB();
+}
+#endif
 
 
 /**
-  \brief   Instruction Synchronization Barrier
-  \details Instruction Synchronization Barrier flushes the pipeline in the processor,
-           so that all instructions following the ISB are fetched from cache or memory,
-           after the instruction has been completed.
+  \brief   Get IPSR Register
+  \details Returns the content of the IPSR Register.
+  \return               IPSR Register value
  */
-__STATIC_FORCEINLINE void __ISB(void)
+__STATIC_FORCEINLINE uint32_t __get_IPSR(void)
 {
-  __ASM volatile ("isb 0xF":::"memory");
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, ipsr" : "=r" (result) );
+  return(result);
 }
 
 
 /**
-  \brief   Data Synchronization Barrier
-  \details Acts as a special kind of Data Memory Barrier.
-           It completes when all explicit memory accesses before this instruction complete.
+  \brief   Get APSR Register
+  \details Returns the content of the APSR Register.
+  \return               APSR Register value
  */
-__STATIC_FORCEINLINE void __DSB(void)
+__STATIC_FORCEINLINE uint32_t __get_APSR(void)
 {
-  __ASM volatile ("dsb 0xF":::"memory");
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, apsr" : "=r" (result) );
+  return(result);
 }
 
 
 /**
-  \brief   Data Memory Barrier
-  \details Ensures the apparent order of the explicit memory operations before
-           and after the instruction, without ensuring their completion.
+  \brief   Get xPSR Register
+  \details Returns the content of the xPSR Register.
+  \return               xPSR Register value
  */
-__STATIC_FORCEINLINE void __DMB(void)
+__STATIC_FORCEINLINE uint32_t __get_xPSR(void)
 {
-  __ASM volatile ("dmb 0xF":::"memory");
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, xpsr" : "=r" (result) );
+  return(result);
 }
 
 
 /**
-  \brief   Reverse byte order (32 bit)
-  \details Reverses the byte order in unsigned integer value. For example, 0x12345678 becomes 0x78563412.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get Process Stack Pointer
+  \details Returns the current value of the Process Stack Pointer (PSP).
+  \return               PSP Register value
  */
-__STATIC_FORCEINLINE uint32_t __REV(uint32_t value)
+__STATIC_FORCEINLINE uint32_t __get_PSP(void)
 {
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-  return __builtin_bswap32(value);
-#else
   uint32_t result;
 
-  __ASM volatile ("rev %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
-  return result;
-#endif
+  __ASM volatile ("MRS %0, psp"  : "=r" (result) );
+  return(result);
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Reverse byte order (16 bit)
-  \details Reverses the byte order within each halfword of a word. For example, 0x12345678 becomes 0x34127856.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get Process Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Process Stack Pointer (PSP) when in secure state.
+  \return               PSP Register value
  */
-__STATIC_FORCEINLINE uint32_t __REV16(uint32_t value)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PSP_NS(void)
 {
   uint32_t result;
 
-  __ASM volatile ("rev16 %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
-  return result;
+  __ASM volatile ("MRS %0, psp_ns"  : "=r" (result) );
+  return(result);
 }
+#endif
 
 
 /**
-  \brief   Reverse byte order (16 bit)
-  \details Reverses the byte order in a 16-bit value and returns the signed 16-bit result. For example, 0x0080 becomes 0x8000.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Set Process Stack Pointer
+  \details Assigns the given value to the Process Stack Pointer (PSP).
+  \param [in]    topOfProcStack  Process Stack Pointer value to set
  */
-__STATIC_FORCEINLINE int16_t __REVSH(int16_t value)
+__STATIC_FORCEINLINE void __set_PSP(uint32_t topOfProcStack)
 {
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-  return (int16_t)__builtin_bswap16(value);
-#else
-  int16_t result;
-
-  __ASM volatile ("revsh %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
-  return result;
-#endif
+  __ASM volatile ("MSR psp, %0" : : "r" (topOfProcStack) : );
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Rotate Right in unsigned value (32 bit)
-  \details Rotate Right (immediate) provides the value of the contents of a register rotated by a variable number of bits.
-  \param [in]    op1  Value to rotate
-  \param [in]    op2  Number of Bits to rotate
-  \return               Rotated value
+  \brief   Set Process Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Process Stack Pointer (PSP) when in secure state.
+  \param [in]    topOfProcStack  Process Stack Pointer value to set
  */
-__STATIC_FORCEINLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
+__STATIC_FORCEINLINE void __TZ_set_PSP_NS(uint32_t topOfProcStack)
 {
-  op2 %= 32U;
-  if (op2 == 0U)
-  {
-    return op1;
-  }
-  return (op1 >> op2) | (op1 << (32U - op2));
+  __ASM volatile ("MSR psp_ns, %0" : : "r" (topOfProcStack) : );
 }
+#endif
 
 
 /**
-  \brief   Breakpoint
-  \details Causes the processor to enter Debug state.
-           Debug tools can use this to investigate system state when the instruction at a particular address is reached.
-  \param [in]    value  is ignored by the processor.
-                 If required, a debugger can use it to store additional information about the breakpoint.
+  \brief   Get Main Stack Pointer
+  \details Returns the current value of the Main Stack Pointer (MSP).
+  \return               MSP Register value
  */
-#define __BKPT(value)                       __ASM volatile ("bkpt "#value)
+__STATIC_FORCEINLINE uint32_t __get_MSP(void)
+{
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, msp" : "=r" (result) );
+  return(result);
+}
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Reverse bit order of value
-  \details Reverses the bit order of the given value.
-  \param [in]    value  Value to reverse
-  \return               Reversed value
+  \brief   Get Main Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Main Stack Pointer (MSP) when in secure state.
+  \return               MSP Register value
  */
-__STATIC_FORCEINLINE uint32_t __RBIT(uint32_t value)
+__STATIC_FORCEINLINE uint32_t __TZ_get_MSP_NS(void)
 {
   uint32_t result;
 
-#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
-   __ASM volatile ("rbit %0, %1" : "=r" (result) : "r" (value) );
-#else
-  uint32_t s = (4U /*sizeof(v)*/ * 8U) - 1U; /* extra shift needed at end */
-
-  result = value;                      /* r will be reversed bits of v; first get LSB of v */
-  for (value >>= 1U; value != 0U; value >>= 1U)
-  {
-    result <<= 1U;
-    result |= value & 1U;
-    s--;
-  }
-  result <<= s;                        /* shift when v's highest bits are zero */
-#endif
-  return result;
+  __ASM volatile ("MRS %0, msp_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
 
 /**
-  \brief   Count leading zeros
-  \details Counts the number of leading zeros of a data value.
-  \param [in]  value  Value to count the leading zeros
-  \return             number of leading zeros in value
+  \brief   Set Main Stack Pointer
+  \details Assigns the given value to the Main Stack Pointer (MSP).
+  \param [in]    topOfMainStack  Main Stack Pointer value to set
  */
-__STATIC_FORCEINLINE uint8_t __CLZ(uint32_t value)
+__STATIC_FORCEINLINE void __set_MSP(uint32_t topOfMainStack)
 {
-  /* Even though __builtin_clz produces a CLZ instruction on ARM, formally
-     __builtin_clz(0) is undefined behaviour, so handle this case specially.
-     This guarantees ARM-compatible results if happening to compile on a non-ARM
-     target, and ensures the compiler doesn't decide to activate any
-     optimisations using the logic "value was passed to __builtin_clz, so it
-     is non-zero".
-     ARM GCC 7.3 and possibly earlier will optimise this test away, leaving a
-     single CLZ instruction.
-   */
-  if (value == 0U)
-  {
-    return 32U;
-  }
-  return __builtin_clz(value);
+  __ASM volatile ("MSR msp, %0" : : "r" (topOfMainStack) : );
 }
 
 
-#if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-     (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-     (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-     (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDR Exclusive (8 bit)
-  \details Executes a exclusive LDR instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Set Main Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Main Stack Pointer (MSP) when in secure state.
+  \param [in]    topOfMainStack  Main Stack Pointer value to set
  */
-__STATIC_FORCEINLINE uint8_t __LDREXB(volatile uint8_t *addr)
+__STATIC_FORCEINLINE void __TZ_set_MSP_NS(uint32_t topOfMainStack)
 {
-    uint32_t result;
-
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-   __ASM volatile ("ldrexb %0, %1" : "=r" (result) : "Q" (*addr) );
-#else
-    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
-       accepted by assembler. So has to use following less efficient pattern.
-    */
-   __ASM volatile ("ldrexb %0, [%1]" : "=r" (result) : "r" (addr) : "memory" );
-#endif
-   return ((uint8_t) result);    /* Add explicit type cast here */
+  __ASM volatile ("MSR msp_ns, %0" : : "r" (topOfMainStack) : );
 }
+#endif
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDR Exclusive (16 bit)
-  \details Executes a exclusive LDR instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Get Stack Pointer (non-secure)
+  \details Returns the current value of the non-secure Stack Pointer (SP) when in secure state.
+  \return               SP Register value
  */
-__STATIC_FORCEINLINE uint16_t __LDREXH(volatile uint16_t *addr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_SP_NS(void)
 {
-    uint32_t result;
+  uint32_t result;
 
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-   __ASM volatile ("ldrexh %0, %1" : "=r" (result) : "Q" (*addr) );
-#else
-    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
-       accepted by assembler. So has to use following less efficient pattern.
-    */
-   __ASM volatile ("ldrexh %0, [%1]" : "=r" (result) : "r" (addr) : "memory" );
-#endif
-   return ((uint16_t) result);    /* Add explicit type cast here */
+  __ASM volatile ("MRS %0, sp_ns" : "=r" (result) );
+  return(result);
 }
 
 
 /**
-  \brief   LDR Exclusive (32 bit)
-  \details Executes a exclusive LDR instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Set Stack Pointer (non-secure)
+  \details Assigns the given value to the non-secure Stack Pointer (SP) when in secure state.
+  \param [in]    topOfStack  Stack Pointer value to set
  */
-__STATIC_FORCEINLINE uint32_t __LDREXW(volatile uint32_t *addr)
+__STATIC_FORCEINLINE void __TZ_set_SP_NS(uint32_t topOfStack)
 {
-    uint32_t result;
-
-   __ASM volatile ("ldrex %0, %1" : "=r" (result) : "Q" (*addr) );
-   return(result);
+  __ASM volatile ("MSR sp_ns, %0" : : "r" (topOfStack) : );
 }
+#endif
 
 
 /**
-  \brief   STR Exclusive (8 bit)
-  \details Executes a exclusive STR instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get Priority Mask
+  \details Returns the current state of the priority mask bit from the Priority Mask Register.
+  \return               Priority Mask value
  */
-__STATIC_FORCEINLINE uint32_t __STREXB(uint8_t value, volatile uint8_t *addr)
+__STATIC_FORCEINLINE uint32_t __get_PRIMASK(void)
 {
-   uint32_t result;
+  uint32_t result;
 
-   __ASM volatile ("strexb %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" ((uint32_t)value) );
-   return(result);
+  __ASM volatile ("MRS %0, primask" : "=r" (result) );
+  return(result);
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STR Exclusive (16 bit)
-  \details Executes a exclusive STR instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get Priority Mask (non-secure)
+  \details Returns the current state of the non-secure priority mask bit from the Priority Mask Register when in secure state.
+  \return               Priority Mask value
  */
-__STATIC_FORCEINLINE uint32_t __STREXH(uint16_t value, volatile uint16_t *addr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PRIMASK_NS(void)
 {
-   uint32_t result;
+  uint32_t result;
 
-   __ASM volatile ("strexh %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" ((uint32_t)value) );
-   return(result);
+  __ASM volatile ("MRS %0, primask_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
 
 /**
-  \brief   STR Exclusive (32 bit)
-  \details Executes a exclusive STR instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set Priority Mask
+  \details Assigns the given value to the Priority Mask Register.
+  \param [in]    priMask  Priority Mask
  */
-__STATIC_FORCEINLINE uint32_t __STREXW(uint32_t value, volatile uint32_t *addr)
-{
-   uint32_t result;
-
-   __ASM volatile ("strex %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" (value) );
-   return(result);
+__STATIC_FORCEINLINE void __set_PRIMASK(uint32_t priMask)
+{
+  __ASM volatile ("MSR primask, %0" : : "r" (priMask) : "memory");
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Remove the exclusive lock
-  \details Removes the exclusive lock which is created by LDREX.
+  \brief   Set Priority Mask (non-secure)
+  \details Assigns the given value to the non-secure Priority Mask Register when in secure state.
+  \param [in]    priMask  Priority Mask
  */
-__STATIC_FORCEINLINE void __CLREX(void)
+__STATIC_FORCEINLINE void __TZ_set_PRIMASK_NS(uint32_t priMask)
 {
-  __ASM volatile ("clrex" ::: "memory");
+  __ASM volatile ("MSR primask_ns, %0" : : "r" (priMask) : "memory");
 }
-
-#endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
+#endif
 
 
 #if ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
      (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
      (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    )
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  ARG1  Value to be saturated
-  \param [in]  ARG2  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Enable FIQ
+  \details Enables FIQ interrupts by clearing special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
  */
-#define __SSAT(ARG1,ARG2) \
-__extension__ \
-({                          \
-  int32_t __RES, __ARG1 = (ARG1); \
-  __ASM ("ssat %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) ); \
-  __RES; \
- })
+__STATIC_FORCEINLINE void __enable_fault_irq(void)
+{
+  __ASM volatile ("cpsie f" : : : "memory");
+}
 
 
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  ARG1  Value to be saturated
-  \param [in]  ARG2  Bit position to saturate to (0..31)
-  \return             Saturated value
+  \brief   Disable FIQ
+  \details Disables FIQ interrupts by setting special-purpose register FAULTMASK.
+           Can only be executed in Privileged modes.
  */
-#define __USAT(ARG1,ARG2) \
- __extension__ \
-({                          \
-  uint32_t __RES, __ARG1 = (ARG1); \
-  __ASM ("usat %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) ); \
-  __RES; \
- })
+__STATIC_FORCEINLINE void __disable_fault_irq(void)
+{
+  __ASM volatile ("cpsid f" : : : "memory");
+}
 
 
 /**
-  \brief   Rotate Right with Extend (32 bit)
-  \details Moves each bit of a bitstring right by one bit.
-           The carry input is shifted in at the left end of the bitstring.
-  \param [in]    value  Value to rotate
-  \return               Rotated value
+  \brief   Get Base Priority
+  \details Returns the current value of the Base Priority register.
+  \return               Base Priority register value
  */
-__STATIC_FORCEINLINE uint32_t __RRX(uint32_t value)
+__STATIC_FORCEINLINE uint32_t __get_BASEPRI(void)
 {
   uint32_t result;
 
-  __ASM volatile ("rrx %0, %1" : __CMSIS_GCC_OUT_REG (result) : __CMSIS_GCC_USE_REG (value) );
+  __ASM volatile ("MRS %0, basepri" : "=r" (result) );
   return(result);
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDRT Unprivileged (8 bit)
-  \details Executes a Unprivileged LDRT instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Get Base Priority (non-secure)
+  \details Returns the current value of the non-secure Base Priority register when in secure state.
+  \return               Base Priority register value
  */
-__STATIC_FORCEINLINE uint8_t __LDRBT(volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_BASEPRI_NS(void)
 {
-    uint32_t result;
+  uint32_t result;
 
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-   __ASM volatile ("ldrbt %0, %1" : "=r" (result) : "Q" (*ptr) );
-#else
-    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
-       accepted by assembler. So has to use following less efficient pattern.
-    */
-   __ASM volatile ("ldrbt %0, [%1]" : "=r" (result) : "r" (ptr) : "memory" );
-#endif
-   return ((uint8_t) result);    /* Add explicit type cast here */
+  __ASM volatile ("MRS %0, basepri_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
 
 /**
-  \brief   LDRT Unprivileged (16 bit)
-  \details Executes a Unprivileged LDRT instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Set Base Priority
+  \details Assigns the given value to the Base Priority register.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE uint16_t __LDRHT(volatile uint16_t *ptr)
+__STATIC_FORCEINLINE void __set_BASEPRI(uint32_t basePri)
 {
-    uint32_t result;
-
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-   __ASM volatile ("ldrht %0, %1" : "=r" (result) : "Q" (*ptr) );
-#else
-    /* Prior to GCC 4.8, "Q" will be expanded to [rx, #0] which is not
-       accepted by assembler. So has to use following less efficient pattern.
-    */
-   __ASM volatile ("ldrht %0, [%1]" : "=r" (result) : "r" (ptr) : "memory" );
-#endif
-   return ((uint16_t) result);    /* Add explicit type cast here */
+  __ASM volatile ("MSR basepri, %0" : : "r" (basePri) : "memory");
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   LDRT Unprivileged (32 bit)
-  \details Executes a Unprivileged LDRT instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Set Base Priority (non-secure)
+  \details Assigns the given value to the non-secure Base Priority register when in secure state.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE uint32_t __LDRT(volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __TZ_set_BASEPRI_NS(uint32_t basePri)
 {
-    uint32_t result;
-
-   __ASM volatile ("ldrt %0, %1" : "=r" (result) : "Q" (*ptr) );
-   return(result);
+  __ASM volatile ("MSR basepri_ns, %0" : : "r" (basePri) : "memory");
 }
+#endif
 
 
 /**
-  \brief   STRT Unprivileged (8 bit)
-  \details Executes a Unprivileged STRT instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Base Priority with condition
+  \details Assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
+           or the new value increases the BASEPRI priority level.
+  \param [in]    basePri  Base Priority value to set
  */
-__STATIC_FORCEINLINE void __STRBT(uint8_t value, volatile uint8_t *ptr)
+__STATIC_FORCEINLINE void __set_BASEPRI_MAX(uint32_t basePri)
 {
-   __ASM volatile ("strbt %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+  __ASM volatile ("MSR basepri_max, %0" : : "r" (basePri) : "memory");
 }
 
 
 /**
-  \brief   STRT Unprivileged (16 bit)
-  \details Executes a Unprivileged STRT instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Fault Mask
+  \details Returns the current value of the Fault Mask register.
+  \return               Fault Mask register value
  */
-__STATIC_FORCEINLINE void __STRHT(uint16_t value, volatile uint16_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_FAULTMASK(void)
 {
-   __ASM volatile ("strht %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, faultmask" : "=r" (result) );
+  return(result);
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   STRT Unprivileged (32 bit)
-  \details Executes a Unprivileged STRT instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Fault Mask (non-secure)
+  \details Returns the current value of the non-secure Fault Mask register when in secure state.
+  \return               Fault Mask register value
  */
-__STATIC_FORCEINLINE void __STRT(uint32_t value, volatile uint32_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_FAULTMASK_NS(void)
 {
-   __ASM volatile ("strt %1, %0" : "=Q" (*ptr) : "r" (value) );
+  uint32_t result;
+
+  __ASM volatile ("MRS %0, faultmask_ns" : "=r" (result) );
+  return(result);
 }
+#endif
 
-#else  /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
-           (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
-           (defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1))    ) */
 
 /**
-  \brief   Signed Saturate
-  \details Saturates a signed value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (1..32)
-  \return             Saturated value
+  \brief   Set Fault Mask
+  \details Assigns the given value to the Fault Mask register.
+  \param [in]    faultMask  Fault Mask value to set
  */
-__STATIC_FORCEINLINE int32_t __SSAT(int32_t val, uint32_t sat)
+__STATIC_FORCEINLINE void __set_FAULTMASK(uint32_t faultMask)
 {
-  if ((sat >= 1U) && (sat <= 32U))
-  {
-    const int32_t max = (int32_t)((1U << (sat - 1U)) - 1U);
-    const int32_t min = -1 - max ;
-    if (val > max)
-    {
-      return max;
-    }
-    else if (val < min)
-    {
-      return min;
-    }
-  }
-  return val;
+  __ASM volatile ("MSR faultmask, %0" : : "r" (faultMask) : "memory");
 }
 
+
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Unsigned Saturate
-  \details Saturates an unsigned value.
-  \param [in]  value  Value to be saturated
-  \param [in]    sat  Bit position to saturate to (0..31)
-  \return             Saturated value
+  \brief   Set Fault Mask (non-secure)
+  \details Assigns the given value to the non-secure Fault Mask register when in secure state.
+  \param [in]    faultMask  Fault Mask value to set
  */
-__STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
+__STATIC_FORCEINLINE void __TZ_set_FAULTMASK_NS(uint32_t faultMask)
 {
-  if (sat <= 31U)
-  {
-    const uint32_t max = ((1U << sat) - 1U);
-    if (val > (int32_t)max)
-    {
-      return max;
-    }
-    else if (val < 0)
-    {
-      return 0U;
-    }
-  }
-  return (uint32_t)val;
+  __ASM volatile ("MSR faultmask_ns, %0" : : "r" (faultMask) : "memory");
 }
+#endif
 
 #endif /* ((defined (__ARM_ARCH_7M__      ) && (__ARM_ARCH_7M__      == 1)) || \
            (defined (__ARM_ARCH_7EM__     ) && (__ARM_ARCH_7EM__     == 1)) || \
@@ -1361,186 +1401,235 @@ __STATIC_FORCEINLINE uint32_t __USAT(int32_t val, uint32_t sat)
 
 #if ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
      (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    )
-/**
-  \brief   Load-Acquire (8 bit)
-  \details Executes a LDAB instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
- */
-__STATIC_FORCEINLINE uint8_t __LDAB(volatile uint8_t *ptr)
-{
-    uint32_t result;
-
-   __ASM volatile ("ldab %0, %1" : "=r" (result) : "Q" (*ptr) );
-   return ((uint8_t) result);
-}
-
 
 /**
-  \brief   Load-Acquire (16 bit)
-  \details Executes a LDAH instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
- */
-__STATIC_FORCEINLINE uint16_t __LDAH(volatile uint16_t *ptr)
-{
-    uint32_t result;
-
-   __ASM volatile ("ldah %0, %1" : "=r" (result) : "Q" (*ptr) );
-   return ((uint16_t) result);
-}
-
+  \brief   Get Process Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always in non-secure
+  mode.
 
-/**
-  \brief   Load-Acquire (32 bit)
-  \details Executes a LDA instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \details Returns the current value of the Process Stack Pointer Limit (PSPLIM).
+  \return               PSPLIM Register value
  */
-__STATIC_FORCEINLINE uint32_t __LDA(volatile uint32_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_PSPLIM(void)
 {
-    uint32_t result;
-
-   __ASM volatile ("lda %0, %1" : "=r" (result) : "Q" (*ptr) );
-   return(result);
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+    // without main extensions, the non-secure PSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, psplim"  : "=r" (result) );
+  return result;
+#endif
 }
 
-
+#if (defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3))
 /**
-  \brief   Store-Release (8 bit)
-  \details Executes a STLB instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Get Process Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always.
+
+  \details Returns the current value of the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
+  \return               PSPLIM Register value
  */
-__STATIC_FORCEINLINE void __STLB(uint8_t value, volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_PSPLIM_NS(void)
 {
-   __ASM volatile ("stlb %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, psplim_ns"  : "=r" (result) );
+  return result;
+#endif
 }
+#endif
 
 
 /**
-  \brief   Store-Release (16 bit)
-  \details Executes a STLH instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Process Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored in non-secure
+  mode.
+
+  \details Assigns the given value to the Process Stack Pointer Limit (PSPLIM).
+  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
  */
-__STATIC_FORCEINLINE void __STLH(uint16_t value, volatile uint16_t *ptr)
+__STATIC_FORCEINLINE void __set_PSPLIM(uint32_t ProcStackPtrLimit)
 {
-   __ASM volatile ("stlh %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  (void)ProcStackPtrLimit;
+#else
+  __ASM volatile ("MSR psplim, %0" : : "r" (ProcStackPtrLimit));
+#endif
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Store-Release (32 bit)
-  \details Executes a STL instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
+  \brief   Set Process Stack Pointer (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored.
+
+  \details Assigns the given value to the non-secure Process Stack Pointer Limit (PSPLIM) when in secure state.
+  \param [in]    ProcStackPtrLimit  Process Stack Pointer Limit value to set
  */
-__STATIC_FORCEINLINE void __STL(uint32_t value, volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __TZ_set_PSPLIM_NS(uint32_t ProcStackPtrLimit)
 {
-   __ASM volatile ("stl %1, %0" : "=Q" (*ptr) : "r" ((uint32_t)value) );
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure PSPLIM is RAZ/WI
+  (void)ProcStackPtrLimit;
+#else
+  __ASM volatile ("MSR psplim_ns, %0\n" : : "r" (ProcStackPtrLimit));
+#endif
 }
+#endif
 
 
 /**
-  \brief   Load-Acquire Exclusive (8 bit)
-  \details Executes a LDAB exclusive instruction for 8 bit value.
-  \param [in]    ptr  Pointer to data
-  \return             value of type uint8_t at (*ptr)
+  \brief   Get Main Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always in non-secure
+  mode.
+
+  \details Returns the current value of the Main Stack Pointer Limit (MSPLIM).
+  \return               MSPLIM Register value
  */
-__STATIC_FORCEINLINE uint8_t __LDAEXB(volatile uint8_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_MSPLIM(void)
 {
-    uint32_t result;
-
-   __ASM volatile ("ldaexb %0, %1" : "=r" (result) : "Q" (*ptr) );
-   return ((uint8_t) result);
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, msplim" : "=r" (result) );
+  return result;
+#endif
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Load-Acquire Exclusive (16 bit)
-  \details Executes a LDAH exclusive instruction for 16 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint16_t at (*ptr)
+  \brief   Get Main Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence zero is returned always.
+
+  \details Returns the current value of the non-secure Main Stack Pointer Limit(MSPLIM) when in secure state.
+  \return               MSPLIM Register value
  */
-__STATIC_FORCEINLINE uint16_t __LDAEXH(volatile uint16_t *ptr)
+__STATIC_FORCEINLINE uint32_t __TZ_get_MSPLIM_NS(void)
 {
-    uint32_t result;
-
-   __ASM volatile ("ldaexh %0, %1" : "=r" (result) : "Q" (*ptr) );
-   return ((uint16_t) result);
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  return 0U;
+#else
+  uint32_t result;
+  __ASM volatile ("MRS %0, msplim_ns" : "=r" (result) );
+  return result;
+#endif
 }
+#endif
 
 
 /**
-  \brief   Load-Acquire Exclusive (32 bit)
-  \details Executes a LDA exclusive instruction for 32 bit values.
-  \param [in]    ptr  Pointer to data
-  \return        value of type uint32_t at (*ptr)
+  \brief   Set Main Stack Pointer Limit
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored in non-secure
+  mode.
+
+  \details Assigns the given value to the Main Stack Pointer Limit (MSPLIM).
+  \param [in]    MainStackPtrLimit  Main Stack Pointer Limit value to set
  */
-__STATIC_FORCEINLINE uint32_t __LDAEX(volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __set_MSPLIM(uint32_t MainStackPtrLimit)
 {
-    uint32_t result;
-
-   __ASM volatile ("ldaex %0, %1" : "=r" (result) : "Q" (*ptr) );
-   return(result);
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) && \
+    (!defined (__ARM_FEATURE_CMSE) || (__ARM_FEATURE_CMSE < 3)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  (void)MainStackPtrLimit;
+#else
+  __ASM volatile ("MSR msplim, %0" : : "r" (MainStackPtrLimit));
+#endif
 }
 
 
+#if (defined (__ARM_FEATURE_CMSE  ) && (__ARM_FEATURE_CMSE   == 3))
 /**
-  \brief   Store-Release Exclusive (8 bit)
-  \details Executes a STLB exclusive instruction for 8 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set Main Stack Pointer Limit (non-secure)
+  Devices without ARMv8-M Main Extensions (i.e. Cortex-M23) lack the non-secure
+  Stack Pointer Limit register hence the write is silently ignored.
+
+  \details Assigns the given value to the non-secure Main Stack Pointer Limit (MSPLIM) when in secure state.
+  \param [in]    MainStackPtrLimit  Main Stack Pointer value to set
  */
-__STATIC_FORCEINLINE uint32_t __STLEXB(uint8_t value, volatile uint8_t *ptr)
+__STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
 {
-   uint32_t result;
-
-   __ASM volatile ("stlexb %0, %2, %1" : "=&r" (result), "=Q" (*ptr) : "r" ((uint32_t)value) );
-   return(result);
+#if (!(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)))
+  // without main extensions, the non-secure MSPLIM is RAZ/WI
+  (void)MainStackPtrLimit;
+#else
+  __ASM volatile ("MSR msplim_ns, %0" : : "r" (MainStackPtrLimit));
+#endif
 }
+#endif
+
+#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
+           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
 
 /**
-  \brief   Store-Release Exclusive (16 bit)
-  \details Executes a STLH exclusive instruction for 16 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Get FPSCR
+  \details Returns the current value of the Floating Point Status/Control register.
+  \return               Floating Point Status/Control register value
  */
-__STATIC_FORCEINLINE uint32_t __STLEXH(uint16_t value, volatile uint16_t *ptr)
+__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
 {
-   uint32_t result;
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+#if __has_builtin(__builtin_arm_get_fpscr)
+// Re-enable using built-in when GCC has been fixed
+// || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
+  /* see https://gcc.gnu.org/ml/gcc-patches/2017-04/msg00443.html */
+  return __builtin_arm_get_fpscr();
+#else
+  uint32_t result;
 
-   __ASM volatile ("stlexh %0, %2, %1" : "=&r" (result), "=Q" (*ptr) : "r" ((uint32_t)value) );
-   return(result);
+  __ASM volatile ("VMRS %0, fpscr" : "=r" (result) );
+  return(result);
+#endif
+#else
+  return(0U);
+#endif
 }
 
 
 /**
-  \brief   Store-Release Exclusive (32 bit)
-  \details Executes a STL exclusive instruction for 32 bit values.
-  \param [in]  value  Value to store
-  \param [in]    ptr  Pointer to location
-  \return          0  Function succeeded
-  \return          1  Function failed
+  \brief   Set FPSCR
+  \details Assigns the given value to the Floating Point Status/Control register.
+  \param [in]    fpscr  Floating Point Status/Control value to set
  */
-__STATIC_FORCEINLINE uint32_t __STLEX(uint32_t value, volatile uint32_t *ptr)
+__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
 {
-   uint32_t result;
-
-   __ASM volatile ("stlex %0, %2, %1" : "=&r" (result), "=Q" (*ptr) : "r" ((uint32_t)value) );
-   return(result);
+#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
+     (defined (__FPU_USED   ) && (__FPU_USED    == 1U))     )
+#if __has_builtin(__builtin_arm_set_fpscr)
+// Re-enable using built-in when GCC has been fixed
+// || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
+  /* see https://gcc.gnu.org/ml/gcc-patches/2017-04/msg00443.html */
+  __builtin_arm_set_fpscr(fpscr);
+#else
+  __ASM volatile ("VMSR fpscr, %0" : : "r" (fpscr) : "vfpcc", "memory");
+#endif
+#else
+  (void)fpscr;
+#endif
 }
 
-#endif /* ((defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) || \
-           (defined (__ARM_ARCH_8M_BASE__ ) && (__ARM_ARCH_8M_BASE__ == 1))    ) */
 
-/*@}*/ /* end of group CMSIS_Core_InstructionInterface */
+/*@} end of CMSIS_Core_RegAccFunctions */
 
 
 /* ###################  Compiler specific Intrinsics  ########################### */
@@ -1563,7 +1652,7 @@ __STATIC_FORCEINLINE uint32_t __QADD8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("qadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("qadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1571,7 +1660,7 @@ __STATIC_FORCEINLINE uint32_t __SHADD8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("shadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("shadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1587,7 +1676,7 @@ __STATIC_FORCEINLINE uint32_t __UQADD8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uqadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uqadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1595,7 +1684,7 @@ __STATIC_FORCEINLINE uint32_t __UHADD8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uhadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uhadd8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1612,7 +1701,7 @@ __STATIC_FORCEINLINE uint32_t __QSUB8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("qsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("qsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1620,7 +1709,7 @@ __STATIC_FORCEINLINE uint32_t __SHSUB8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("shsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("shsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1636,7 +1725,7 @@ __STATIC_FORCEINLINE uint32_t __UQSUB8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uqsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uqsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1644,7 +1733,7 @@ __STATIC_FORCEINLINE uint32_t __UHSUB8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uhsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uhsub8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1661,7 +1750,7 @@ __STATIC_FORCEINLINE uint32_t __QADD16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("qadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("qadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1669,7 +1758,7 @@ __STATIC_FORCEINLINE uint32_t __SHADD16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("shadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("shadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1685,7 +1774,7 @@ __STATIC_FORCEINLINE uint32_t __UQADD16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uqadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uqadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1693,7 +1782,7 @@ __STATIC_FORCEINLINE uint32_t __UHADD16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uhadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uhadd16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1709,7 +1798,7 @@ __STATIC_FORCEINLINE uint32_t __QSUB16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("qsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("qsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1717,7 +1806,7 @@ __STATIC_FORCEINLINE uint32_t __SHSUB16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("shsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("shsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1733,7 +1822,7 @@ __STATIC_FORCEINLINE uint32_t __UQSUB16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uqsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uqsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1741,7 +1830,7 @@ __STATIC_FORCEINLINE uint32_t __UHSUB16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uhsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uhsub16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1757,7 +1846,7 @@ __STATIC_FORCEINLINE uint32_t __QASX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("qasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("qasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1765,7 +1854,7 @@ __STATIC_FORCEINLINE uint32_t __SHASX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("shasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("shasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1781,7 +1870,7 @@ __STATIC_FORCEINLINE uint32_t __UQASX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uqasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uqasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1789,7 +1878,7 @@ __STATIC_FORCEINLINE uint32_t __UHASX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uhasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uhasx %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1805,7 +1894,7 @@ __STATIC_FORCEINLINE uint32_t __QSAX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("qsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("qsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1813,7 +1902,7 @@ __STATIC_FORCEINLINE uint32_t __SHSAX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("shsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("shsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1829,7 +1918,7 @@ __STATIC_FORCEINLINE uint32_t __UQSAX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uqsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uqsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1837,7 +1926,7 @@ __STATIC_FORCEINLINE uint32_t __UHSAX(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uhsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uhsax %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1845,7 +1934,7 @@ __STATIC_FORCEINLINE uint32_t __USAD8(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("usad8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("usad8 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1853,21 +1942,23 @@ __STATIC_FORCEINLINE uint32_t __USADA8(uint32_t op1, uint32_t op2, uint32_t op3)
 {
   uint32_t result;
 
-  __ASM volatile ("usada8 %0, %1, %2, %3" : "=r" (result) : "r" (op1), "r" (op2), "r" (op3) );
+  __ASM ("usada8 %0, %1, %2, %3" : "=r" (result) : "r" (op1), "r" (op2), "r" (op3) );
   return(result);
 }
 
-#define __SSAT16(ARG1,ARG2) \
+#define __SSAT16(ARG1, ARG2) \
+__extension__ \
 ({                          \
   int32_t __RES, __ARG1 = (ARG1); \
-  __ASM ("ssat16 %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) ); \
+  __ASM volatile ("ssat16 %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) : "cc" ); \
   __RES; \
  })
 
-#define __USAT16(ARG1,ARG2) \
+#define __USAT16(ARG1, ARG2) \
+__extension__ \
 ({                          \
   uint32_t __RES, __ARG1 = (ARG1); \
-  __ASM ("usat16 %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) ); \
+  __ASM volatile ("usat16 %0, %1, %2" : "=r" (__RES) :  "I" (ARG2), "r" (__ARG1) : "cc" ); \
   __RES; \
  })
 
@@ -1875,7 +1966,7 @@ __STATIC_FORCEINLINE uint32_t __UXTB16(uint32_t op1)
 {
   uint32_t result;
 
-  __ASM volatile ("uxtb16 %0, %1" : "=r" (result) : "r" (op1));
+  __ASM ("uxtb16 %0, %1" : "=r" (result) : "r" (op1));
   return(result);
 }
 
@@ -1883,7 +1974,7 @@ __STATIC_FORCEINLINE uint32_t __UXTAB16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("uxtab16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("uxtab16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
@@ -1891,18 +1982,41 @@ __STATIC_FORCEINLINE uint32_t __SXTB16(uint32_t op1)
 {
   uint32_t result;
 
-  __ASM volatile ("sxtb16 %0, %1" : "=r" (result) : "r" (op1));
+  __ASM ("sxtb16 %0, %1" : "=r" (result) : "r" (op1));
   return(result);
 }
 
+__STATIC_FORCEINLINE uint32_t __SXTB16_RORn(uint32_t op1, uint32_t rotate)
+{
+  uint32_t result;
+  if (__builtin_constant_p(rotate) && ((rotate == 8U) || (rotate == 16U) || (rotate == 24U))) {
+    __ASM volatile ("sxtb16 %0, %1, ROR %2" : "=r" (result) : "r" (op1), "i" (rotate) );
+  } else {
+    result = __SXTB16(__ROR(op1, rotate)) ;
+  }
+  return result;
+}
+
 __STATIC_FORCEINLINE uint32_t __SXTAB16(uint32_t op1, uint32_t op2)
 {
   uint32_t result;
 
-  __ASM volatile ("sxtab16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
+  __ASM ("sxtab16 %0, %1, %2" : "=r" (result) : "r" (op1), "r" (op2) );
   return(result);
 }
 
+__STATIC_FORCEINLINE uint32_t __SXTAB16_RORn(uint32_t op1, uint32_t op2, uint32_t rotate)
+{
+  uint32_t result;
+  if (__builtin_constant_p(rotate) && ((rotate == 8U) || (rotate == 16U) || (rotate == 24U))) {
+    __ASM volatile ("sxtab16 %0, %1, %2, ROR %3" : "=r" (result) : "r" (op1) , "r" (op2) , "i" (rotate));
+  } else {
+    result = __SXTAB16(op1, __ROR(op2, rotate));
+  }
+  return result;
+}
+
+
 __STATIC_FORCEINLINE uint32_t __SMUAD  (uint32_t op1, uint32_t op2)
 {
   uint32_t result;
@@ -2059,8 +2173,9 @@ __STATIC_FORCEINLINE  int32_t __QSUB( int32_t op1,  int32_t op2)
   return(result);
 }
 
-#if 0
+
 #define __PKHBT(ARG1,ARG2,ARG3) \
+__extension__ \
 ({                          \
   uint32_t __RES, __ARG1 = (ARG1), __ARG2 = (ARG2); \
   __ASM ("pkhbt %0, %1, %2, lsl %3" : "=r" (__RES) :  "r" (__ARG1), "r" (__ARG2), "I" (ARG3)  ); \
@@ -2068,6 +2183,7 @@ __STATIC_FORCEINLINE  int32_t __QSUB( int32_t op1,  int32_t op2)
  })
 
 #define __PKHTB(ARG1,ARG2,ARG3) \
+__extension__ \
 ({                          \
   uint32_t __RES, __ARG1 = (ARG1), __ARG2 = (ARG2); \
   if (ARG3 == 0) \
@@ -2076,19 +2192,13 @@ __STATIC_FORCEINLINE  int32_t __QSUB( int32_t op1,  int32_t op2)
     __ASM ("pkhtb %0, %1, %2, asr %3" : "=r" (__RES) :  "r" (__ARG1), "r" (__ARG2), "I" (ARG3)  ); \
   __RES; \
  })
-#endif
-
-#define __PKHBT(ARG1,ARG2,ARG3)          ( ((((uint32_t)(ARG1))          ) & 0x0000FFFFUL) |  \
-                                           ((((uint32_t)(ARG2)) << (ARG3)) & 0xFFFF0000UL)  )
 
-#define __PKHTB(ARG1,ARG2,ARG3)          ( ((((uint32_t)(ARG1))          ) & 0xFFFF0000UL) |  \
-                                           ((((uint32_t)(ARG2)) >> (ARG3)) & 0x0000FFFFUL)  )
 
 __STATIC_FORCEINLINE int32_t __SMMLA (int32_t op1, int32_t op2, int32_t op3)
 {
  int32_t result;
 
- __ASM volatile ("smmla %0, %1, %2, %3" : "=r" (result): "r"  (op1), "r" (op2), "r" (op3) );
+ __ASM ("smmla %0, %1, %2, %3" : "=r" (result): "r"  (op1), "r" (op2), "r" (op3) );
  return(result);
 }
 
diff --git a/lib/cmsis/inc/cmsis_iccarm.h b/lib/cmsis/inc/cmsis_iccarm.h
index 20b50ce380d6c..65b824b009caa 100644
--- a/lib/cmsis/inc/cmsis_iccarm.h
+++ b/lib/cmsis/inc/cmsis_iccarm.h
@@ -1,13 +1,16 @@
 /**************************************************************************//**
  * @file     cmsis_iccarm.h
  * @brief    CMSIS compiler ICCARM (IAR Compiler for Arm) header file
- * @version  V5.0.8
- * @date     04. September 2018
+ * @version  V5.3.0
+ * @date     14. April 2021
  ******************************************************************************/
 
 //------------------------------------------------------------------------------
 //
-// Copyright (c) 2017-2018 IAR Systems
+// Copyright (c) 2017-2021 IAR Systems
+// Copyright (c) 2017-2021 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.
@@ -110,6 +113,10 @@
   #define __ASM __asm
 #endif
 
+#ifndef   __COMPILER_BARRIER
+  #define __COMPILER_BARRIER() __ASM volatile("":::"memory")
+#endif
+
 #ifndef __INLINE
   #define __INLINE inline
 #endif
@@ -231,6 +238,7 @@ __packed struct  __iar_u32 { uint32_t v; };
   #endif
 #endif
 
+#undef __WEAK                           /* undo the definition from DLib_Defaults.h */
 #ifndef   __WEAK
   #if __ICCARM_V8
     #define __WEAK __attribute__((weak))
@@ -239,6 +247,43 @@ __packed struct  __iar_u32 { uint32_t v; };
   #endif
 #endif
 
+#ifndef __PROGRAM_START
+#define __PROGRAM_START           __iar_program_start
+#endif
+
+#ifndef __INITIAL_SP
+#define __INITIAL_SP              CSTACK$$Limit
+#endif
+
+#ifndef __STACK_LIMIT
+#define __STACK_LIMIT             CSTACK$$Base
+#endif
+
+#ifndef __VECTOR_TABLE
+#define __VECTOR_TABLE            __vector_table
+#endif
+
+#ifndef __VECTOR_TABLE_ATTRIBUTE
+#define __VECTOR_TABLE_ATTRIBUTE  @".intvec"
+#endif
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+#ifndef __STACK_SEAL
+#define __STACK_SEAL              STACKSEAL$$Base
+#endif
+
+#ifndef __TZ_STACK_SEAL_SIZE
+#define __TZ_STACK_SEAL_SIZE      8U
+#endif
+
+#ifndef __TZ_STACK_SEAL_VALUE
+#define __TZ_STACK_SEAL_VALUE     0xFEF5EDA5FEF5EDA5ULL
+#endif
+
+__STATIC_FORCEINLINE void __TZ_set_STACKSEAL_S (uint32_t* stackTop) {
+  *((uint64_t *)stackTop) = __TZ_STACK_SEAL_VALUE;
+}
+#endif
 
 #ifndef __ICCARM_INTRINSICS_VERSION__
   #define __ICCARM_INTRINSICS_VERSION__  0
@@ -310,7 +355,13 @@ __packed struct  __iar_u32 { uint32_t v; };
 
   #define __set_BASEPRI(VALUE)        (__arm_wsr("BASEPRI", (VALUE)))
   #define __set_BASEPRI_MAX(VALUE)    (__arm_wsr("BASEPRI_MAX", (VALUE)))
-  #define __set_CONTROL(VALUE)        (__arm_wsr("CONTROL", (VALUE)))
+
+__STATIC_FORCEINLINE void __set_CONTROL(uint32_t control)
+{
+  __arm_wsr("CONTROL", control);
+  __iar_builtin_ISB();
+}
+
   #define __set_FAULTMASK(VALUE)      (__arm_wsr("FAULTMASK", (VALUE)))
   #define __set_MSP(VALUE)            (__arm_wsr("MSP", (VALUE)))
 
@@ -332,7 +383,13 @@ __packed struct  __iar_u32 { uint32_t v; };
   #endif
 
   #define __TZ_get_CONTROL_NS()       (__arm_rsr("CONTROL_NS"))
-  #define __TZ_set_CONTROL_NS(VALUE)  (__arm_wsr("CONTROL_NS", (VALUE)))
+
+__STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
+{
+  __arm_wsr("CONTROL_NS", control);
+  __iar_builtin_ISB();
+}
+
   #define __TZ_get_PSP_NS()           (__arm_rsr("PSP_NS"))
   #define __TZ_set_PSP_NS(VALUE)      (__arm_wsr("PSP_NS", (VALUE)))
   #define __TZ_get_MSP_NS()           (__arm_rsr("MSP_NS"))
@@ -572,7 +629,7 @@ __packed struct  __iar_u32 { uint32_t v; };
     __IAR_FT uint32_t __RRX(uint32_t value)
     {
       uint32_t result;
-      __ASM("RRX      %0, %1" : "=r"(result) : "r" (value) : "cc");
+      __ASM volatile("RRX      %0, %1" : "=r"(result) : "r" (value));
       return(result);
     }
 
@@ -654,6 +711,7 @@ __packed struct  __iar_u32 { uint32_t v; };
     __IAR_FT void   __TZ_set_CONTROL_NS(uint32_t value)
     {
       __asm volatile("MSR      CONTROL_NS,%0" :: "r" (value));
+      __iar_builtin_ISB();
     }
 
     __IAR_FT uint32_t   __TZ_get_PSP_NS(void)
@@ -811,37 +869,37 @@ __packed struct  __iar_u32 { uint32_t v; };
   __IAR_FT uint8_t __LDRBT(volatile uint8_t *addr)
   {
     uint32_t res;
-    __ASM("LDRBT %0, [%1]" : "=r" (res) : "r" (addr) : "memory");
+    __ASM volatile ("LDRBT %0, [%1]" : "=r" (res) : "r" (addr) : "memory");
     return ((uint8_t)res);
   }
 
   __IAR_FT uint16_t __LDRHT(volatile uint16_t *addr)
   {
     uint32_t res;
-    __ASM("LDRHT %0, [%1]" : "=r" (res) : "r" (addr) : "memory");
+    __ASM volatile ("LDRHT %0, [%1]" : "=r" (res) : "r" (addr) : "memory");
     return ((uint16_t)res);
   }
 
   __IAR_FT uint32_t __LDRT(volatile uint32_t *addr)
   {
     uint32_t res;
-    __ASM("LDRT %0, [%1]" : "=r" (res) : "r" (addr) : "memory");
+    __ASM volatile ("LDRT %0, [%1]" : "=r" (res) : "r" (addr) : "memory");
     return res;
   }
 
   __IAR_FT void __STRBT(uint8_t value, volatile uint8_t *addr)
   {
-    __ASM("STRBT %1, [%0]" : : "r" (addr), "r" ((uint32_t)value) : "memory");
+    __ASM volatile ("STRBT %1, [%0]" : : "r" (addr), "r" ((uint32_t)value) : "memory");
   }
 
   __IAR_FT void __STRHT(uint16_t value, volatile uint16_t *addr)
   {
-    __ASM("STRHT %1, [%0]" : : "r" (addr), "r" ((uint32_t)value) : "memory");
+    __ASM volatile ("STRHT %1, [%0]" : : "r" (addr), "r" ((uint32_t)value) : "memory");
   }
 
   __IAR_FT void __STRT(uint32_t value, volatile uint32_t *addr)
   {
-    __ASM("STRT %1, [%0]" : : "r" (addr), "r" (value) : "memory");
+    __ASM volatile ("STRT %1, [%0]" : : "r" (addr), "r" (value) : "memory");
   }
 
 #endif /* (__CORTEX_M >= 0x03) */
@@ -937,4 +995,8 @@ __packed struct  __iar_u32 { uint32_t v; };
 #pragma diag_default=Pe940
 #pragma diag_default=Pe177
 
+#define __SXTB16_RORn(ARG1, ARG2) __SXTB16(__ROR(ARG1, ARG2))
+
+#define __SXTAB16_RORn(ARG1, ARG2, ARG3) __SXTAB16(ARG1, __ROR(ARG2, ARG3))
+
 #endif /* __CMSIS_ICCARM_H__ */
diff --git a/lib/cmsis/inc/cmsis_version.h b/lib/cmsis/inc/cmsis_version.h
index 660f612aa31fe..8b4765f186efe 100644
--- a/lib/cmsis/inc/cmsis_version.h
+++ b/lib/cmsis/inc/cmsis_version.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     cmsis_version.h
  * @brief    CMSIS Core(M) Version definitions
- * @version  V5.0.2
- * @date     19. April 2017
+ * @version  V5.0.5
+ * @date     02. February 2022
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2017 ARM Limited. All rights reserved.
+ * Copyright (c) 2009-2022 ARM Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -33,7 +33,7 @@
 
 /*  CMSIS Version definitions */
 #define __CM_CMSIS_VERSION_MAIN  ( 5U)                                      /*!< [31:16] CMSIS Core(M) main version */
-#define __CM_CMSIS_VERSION_SUB   ( 1U)                                      /*!< [15:0]  CMSIS Core(M) sub version */
+#define __CM_CMSIS_VERSION_SUB   ( 6U)                                      /*!< [15:0]  CMSIS Core(M) sub version */
 #define __CM_CMSIS_VERSION       ((__CM_CMSIS_VERSION_MAIN << 16U) | \
                                    __CM_CMSIS_VERSION_SUB           )       /*!< CMSIS Core(M) version number */
 #endif
diff --git a/lib/cmsis/inc/core_armv81mml.h b/lib/cmsis/inc/core_armv81mml.h
index db6d9f23638b6..94128a1a7095c 100644
--- a/lib/cmsis/inc/core_armv81mml.h
+++ b/lib/cmsis/inc/core_armv81mml.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_armv81mml.h
  * @brief    CMSIS Armv8.1-M Mainline Core Peripheral Access Layer Header File
- * @version  V1.0.0
- * @date     15. March 2019
+ * @version  V1.4.2
+ * @date     13. October 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2018-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,11 @@
  */
 
 #if   defined ( __ICCARM__ )
-  #pragma system_include         /* treat file as system include file for MISRA check */
+  #pragma system_include                        /* treat file as system include file for MISRA check */
 #elif defined (__clang__)
-  #pragma clang system_header   /* treat file as system include file */
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
 #endif
 
 #ifndef __CORE_ARMV81MML_H_GENERIC
@@ -61,48 +63,23 @@
  */
 
 #include "cmsis_version.h"
- 
-#define __ARM_ARCH_8M_MAIN__    1  // patching for now
+
 /*  CMSIS ARMV81MML definitions */
 #define __ARMv81MML_CMSIS_VERSION_MAIN  (__CM_CMSIS_VERSION_MAIN)                   /*!< \deprecated [31:16] CMSIS HAL main version */
 #define __ARMv81MML_CMSIS_VERSION_SUB   (__CM_CMSIS_VERSION_SUB)                    /*!< \deprecated [15:0]  CMSIS HAL sub version */
 #define __ARMv81MML_CMSIS_VERSION       ((__ARMv81MML_CMSIS_VERSION_MAIN << 16U) | \
                                          __ARMv81MML_CMSIS_VERSION_SUB           )  /*!< \deprecated CMSIS HAL version number */
 
-#define __CORTEX_M                     (81U)                                       /*!< Cortex-M Core */
+#define __CORTEX_M                      (81U)                                       /*!< Cortex-M Core */
 
-/** __FPU_USED indicates whether an FPU is used or not.
-    For this, __FPU_PRESENT has to be checked prior to making use of FPU specific registers and functions.
-*/
 #if defined ( __CC_ARM )
-  #if defined __TARGET_FPU_VFP
-    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
-      #define __FPU_USED       1U
-    #else
-      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
-      #define __FPU_USED       0U
-    #endif
-  #else
-    #define __FPU_USED         0U
-  #endif
-
-  #if defined(__ARM_FEATURE_DSP)
-    #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
-      #define __DSP_USED       1U
-    #else
-      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
-      #define __DSP_USED         0U    
-    #endif
-  #else
-    #define __DSP_USED         0U
-  #endif
-  
+  #error Legacy Arm Compiler does not support Armv8.1-M target architecture.
 #elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
   #if defined __ARM_FP
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
       #define __FPU_USED       1U
     #else
-      #warning "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
       #define __FPU_USED       0U
     #endif
   #else
@@ -114,7 +91,7 @@
       #define __DSP_USED       1U
     #else
       #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
-      #define __DSP_USED         0U    
+      #define __DSP_USED         0U
     #endif
   #else
     #define __DSP_USED         0U
@@ -131,18 +108,18 @@
   #else
     #define __FPU_USED         0U
   #endif
-  
+
   #if defined(__ARM_FEATURE_DSP)
     #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
       #define __DSP_USED       1U
     #else
       #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
-      #define __DSP_USED         0U    
+      #define __DSP_USED         0U
     #endif
   #else
     #define __DSP_USED         0U
   #endif
-  
+
 #elif defined ( __ICCARM__ )
   #if defined __ARMVFP__
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
@@ -160,12 +137,12 @@
       #define __DSP_USED       1U
     #else
       #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
-      #define __DSP_USED         0U    
+      #define __DSP_USED         0U
     #endif
   #else
     #define __DSP_USED         0U
   #endif
-  
+
 #elif defined ( __TI_ARM__ )
   #if defined __TI_VFP_SUPPORT__
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
@@ -234,11 +211,42 @@
     #warning "__FPU_PRESENT not defined in device header file; using default!"
   #endif
 
+  #if __FPU_PRESENT != 0U
+    #ifndef __FPU_DP
+      #define __FPU_DP             0U
+      #warning "__FPU_DP not defined in device header file; using default!"
+    #endif
+  #endif
+
   #ifndef __MPU_PRESENT
     #define __MPU_PRESENT             0U
     #warning "__MPU_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __ICACHE_PRESENT
+    #define __ICACHE_PRESENT          0U
+    #warning "__ICACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DCACHE_PRESENT
+    #define __DCACHE_PRESENT          0U
+    #warning "__DCACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __PMU_PRESENT
+    #define __PMU_PRESENT             0U
+    #warning "__PMU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #if __PMU_PRESENT != 0U
+    #ifndef __PMU_NUM_EVENTCNT
+      #define __PMU_NUM_EVENTCNT      2U
+      #warning "__PMU_NUM_EVENTCNT not defined in device header file; using default!"
+    #elif (__PMU_NUM_EVENTCNT > 31 || __PMU_NUM_EVENTCNT < 2)
+    #error "__PMU_NUM_EVENTCNT is out of range in device header file!" */
+    #endif
+  #endif
+
   #ifndef __SAUREGION_PRESENT
     #define __SAUREGION_PRESENT       0U
     #warning "__SAUREGION_PRESENT not defined in device header file; using default!"
@@ -249,6 +257,11 @@
     #warning "__DSP_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -513,7 +526,7 @@ typedef struct
   __IOM uint32_t AFSR;                   /*!< Offset: 0x03C (R/W)  Auxiliary Fault Status Register */
   __IM  uint32_t ID_PFR[2U];             /*!< Offset: 0x040 (R/ )  Processor Feature Register */
   __IM  uint32_t ID_DFR;                 /*!< Offset: 0x048 (R/ )  Debug Feature Register */
-  __IM  uint32_t ID_ADR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
+  __IM  uint32_t ID_AFR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
   __IM  uint32_t ID_MMFR[4U];            /*!< Offset: 0x050 (R/ )  Memory Model Feature Register */
   __IM  uint32_t ID_ISAR[6U];            /*!< Offset: 0x060 (R/ )  Instruction Set Attributes Register */
   __IM  uint32_t CLIDR;                  /*!< Offset: 0x078 (R/ )  Cache Level ID register */
@@ -522,9 +535,13 @@ typedef struct
   __IOM uint32_t CSSELR;                 /*!< Offset: 0x084 (R/W)  Cache Size Selection Register */
   __IOM uint32_t CPACR;                  /*!< Offset: 0x088 (R/W)  Coprocessor Access Control Register */
   __IOM uint32_t NSACR;                  /*!< Offset: 0x08C (R/W)  Non-Secure Access Control Register */
-        uint32_t RESERVED3[92U];
+        uint32_t RESERVED7[21U];
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x0E4 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x0E8 (R/W)  Secure Fault Address Register */
+        uint32_t RESERVED3[69U];
   __OM  uint32_t STIR;                   /*!< Offset: 0x200 ( /W)  Software Triggered Interrupt Register */
-        uint32_t RESERVED4[15U];
+  __IOM uint32_t RFSR;                   /*!< Offset: 0x204 (R/W)  RAS Fault Status Register */
+        uint32_t RESERVED4[14U];
   __IM  uint32_t MVFR0;                  /*!< Offset: 0x240 (R/ )  Media and VFP Feature Register 0 */
   __IM  uint32_t MVFR1;                  /*!< Offset: 0x244 (R/ )  Media and VFP Feature Register 1 */
   __IM  uint32_t MVFR2;                  /*!< Offset: 0x248 (R/ )  Media and VFP Feature Register 2 */
@@ -539,14 +556,7 @@ typedef struct
   __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
   __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
   __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
-        uint32_t RESERVED7[6U];
-  __IOM uint32_t ITCMCR;                 /*!< Offset: 0x290 (R/W)  Instruction Tightly-Coupled Memory Control Register */
-  __IOM uint32_t DTCMCR;                 /*!< Offset: 0x294 (R/W)  Data Tightly-Coupled Memory Control Registers */
-  __IOM uint32_t AHBPCR;                 /*!< Offset: 0x298 (R/W)  AHBP Control Register */
-  __IOM uint32_t CACR;                   /*!< Offset: 0x29C (R/W)  L1 Cache Control Register */
-  __IOM uint32_t AHBSCR;                 /*!< Offset: 0x2A0 (R/W)  AHB Slave Control Register */
-        uint32_t RESERVED8[1U];
-  __IOM uint32_t ABFSR;                  /*!< Offset: 0x2A8 (R/W)  Auxiliary Bus Fault Status Register */
+  __OM  uint32_t BPIALL;                 /*!< Offset: 0x278 ( /W)  Branch Predictor Invalidate All */
 } SCB_Type;
 
 /* SCB CPUID Register Definitions */
@@ -628,6 +638,12 @@ typedef struct
 #define SCB_AIRCR_PRIGROUP_Pos              8U                                            /*!< SCB AIRCR: PRIGROUP Position */
 #define SCB_AIRCR_PRIGROUP_Msk             (7UL << SCB_AIRCR_PRIGROUP_Pos)                /*!< SCB AIRCR: PRIGROUP Mask */
 
+#define SCB_AIRCR_IESB_Pos                  5U                                            /*!< SCB AIRCR: Implicit ESB Enable Position */
+#define SCB_AIRCR_IESB_Msk                 (1UL << SCB_AIRCR_IESB_Pos)                    /*!< SCB AIRCR: Implicit ESB Enable Mask */
+
+#define SCB_AIRCR_DIT_Pos                   4U                                            /*!< SCB AIRCR: Data Independent Timing Position */
+#define SCB_AIRCR_DIT_Msk                  (1UL << SCB_AIRCR_DIT_Pos)                     /*!< SCB AIRCR: Data Independent Timing Mask */
+
 #define SCB_AIRCR_SYSRESETREQS_Pos          3U                                            /*!< SCB AIRCR: SYSRESETREQS Position */
 #define SCB_AIRCR_SYSRESETREQS_Msk         (1UL << SCB_AIRCR_SYSRESETREQS_Pos)            /*!< SCB AIRCR: SYSRESETREQS Mask */
 
@@ -651,6 +667,12 @@ typedef struct
 #define SCB_SCR_SLEEPONEXIT_Msk            (1UL << SCB_SCR_SLEEPONEXIT_Pos)               /*!< SCB SCR: SLEEPONEXIT Mask */
 
 /* SCB Configuration Control Register Definitions */
+#define SCB_CCR_TRD_Pos                    20U                                            /*!< SCB CCR: TRD Position */
+#define SCB_CCR_TRD_Msk                    (1UL << SCB_CCR_TRD_Pos)                       /*!< SCB CCR: TRD Mask */
+
+#define SCB_CCR_LOB_Pos                    19U                                            /*!< SCB CCR: LOB Position */
+#define SCB_CCR_LOB_Msk                    (1UL << SCB_CCR_LOB_Pos)                       /*!< SCB CCR: LOB Mask */
+
 #define SCB_CCR_BP_Pos                     18U                                            /*!< SCB CCR: BP Position */
 #define SCB_CCR_BP_Msk                     (1UL << SCB_CCR_BP_Pos)                        /*!< SCB CCR: BP Mask */
 
@@ -747,22 +769,22 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MLSPERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 5U)               /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
 #define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -820,6 +842,9 @@ typedef struct
 #define SCB_HFSR_VECTTBL_Msk               (1UL << SCB_HFSR_VECTTBL_Pos)                  /*!< SCB HFSR: VECTTBL Mask */
 
 /* SCB Debug Fault Status Register Definitions */
+#define SCB_DFSR_PMU_Pos                    5U                                            /*!< SCB DFSR: PMU Position */
+#define SCB_DFSR_PMU_Msk                   (1UL << SCB_DFSR_PMU_Pos)                      /*!< SCB DFSR: PMU Mask */
+
 #define SCB_DFSR_EXTERNAL_Pos               4U                                            /*!< SCB DFSR: EXTERNAL Position */
 #define SCB_DFSR_EXTERNAL_Msk              (1UL << SCB_DFSR_EXTERNAL_Pos)                 /*!< SCB DFSR: EXTERNAL Mask */
 
@@ -842,8 +867,36 @@ typedef struct
 #define SCB_NSACR_CP10_Pos                 10U                                            /*!< SCB NSACR: CP10 Position */
 #define SCB_NSACR_CP10_Msk                 (1UL << SCB_NSACR_CP10_Pos)                    /*!< SCB NSACR: CP10 Mask */
 
-#define SCB_NSACR_CPn_Pos                   0U                                            /*!< SCB NSACR: CPn Position */
-#define SCB_NSACR_CPn_Msk                  (1UL /*<< SCB_NSACR_CPn_Pos*/)                 /*!< SCB NSACR: CPn Mask */
+#define SCB_NSACR_CP7_Pos                   7U                                            /*!< SCB NSACR: CP7 Position */
+#define SCB_NSACR_CP7_Msk                  (1UL << SCB_NSACR_CP7_Pos)                     /*!< SCB NSACR: CP7 Mask */
+
+#define SCB_NSACR_CP6_Pos                   6U                                            /*!< SCB NSACR: CP6 Position */
+#define SCB_NSACR_CP6_Msk                  (1UL << SCB_NSACR_CP6_Pos)                     /*!< SCB NSACR: CP6 Mask */
+
+#define SCB_NSACR_CP5_Pos                   5U                                            /*!< SCB NSACR: CP5 Position */
+#define SCB_NSACR_CP5_Msk                  (1UL << SCB_NSACR_CP5_Pos)                     /*!< SCB NSACR: CP5 Mask */
+
+#define SCB_NSACR_CP4_Pos                   4U                                            /*!< SCB NSACR: CP4 Position */
+#define SCB_NSACR_CP4_Msk                  (1UL << SCB_NSACR_CP4_Pos)                     /*!< SCB NSACR: CP4 Mask */
+
+#define SCB_NSACR_CP3_Pos                   3U                                            /*!< SCB NSACR: CP3 Position */
+#define SCB_NSACR_CP3_Msk                  (1UL << SCB_NSACR_CP3_Pos)                     /*!< SCB NSACR: CP3 Mask */
+
+#define SCB_NSACR_CP2_Pos                   2U                                            /*!< SCB NSACR: CP2 Position */
+#define SCB_NSACR_CP2_Msk                  (1UL << SCB_NSACR_CP2_Pos)                     /*!< SCB NSACR: CP2 Mask */
+
+#define SCB_NSACR_CP1_Pos                   1U                                            /*!< SCB NSACR: CP1 Position */
+#define SCB_NSACR_CP1_Msk                  (1UL << SCB_NSACR_CP1_Pos)                     /*!< SCB NSACR: CP1 Mask */
+
+#define SCB_NSACR_CP0_Pos                   0U                                            /*!< SCB NSACR: CP0 Position */
+#define SCB_NSACR_CP0_Msk                  (1UL /*<< SCB_NSACR_CP0_Pos*/)                 /*!< SCB NSACR: CP0 Mask */
+
+/* SCB Debug Feature Register 0 Definitions */
+#define SCB_ID_DFR_UDE_Pos                 28U                                            /*!< SCB ID_DFR: UDE Position */
+#define SCB_ID_DFR_UDE_Msk                 (0xFUL << SCB_ID_DFR_UDE_Pos)                  /*!< SCB ID_DFR: UDE Mask */
+
+#define SCB_ID_DFR_MProfDbg_Pos            20U                                            /*!< SCB ID_DFR: MProfDbg Position */
+#define SCB_ID_DFR_MProfDbg_Msk            (0xFUL << SCB_ID_DFR_MProfDbg_Pos)             /*!< SCB ID_DFR: MProfDbg Mask */
 
 /* SCB Cache Level ID Register Definitions */
 #define SCB_CLIDR_LOUU_Pos                 27U                                            /*!< SCB CLIDR: LoUU Position */
@@ -901,6 +954,16 @@ typedef struct
 #define SCB_STIR_INTID_Pos                  0U                                            /*!< SCB STIR: INTID Position */
 #define SCB_STIR_INTID_Msk                 (0x1FFUL /*<< SCB_STIR_INTID_Pos*/)            /*!< SCB STIR: INTID Mask */
 
+/* SCB RAS Fault Status Register Definitions */
+#define SCB_RFSR_V_Pos                     31U                                            /*!< SCB RFSR: V Position */
+#define SCB_RFSR_V_Msk                     (1UL << SCB_RFSR_V_Pos)                        /*!< SCB RFSR: V Mask */
+
+#define SCB_RFSR_IS_Pos                    16U                                            /*!< SCB RFSR: IS Position */
+#define SCB_RFSR_IS_Msk                    (0x7FFFUL << SCB_RFSR_IS_Pos)                  /*!< SCB RFSR: IS Mask */
+
+#define SCB_RFSR_UET_Pos                    0U                                            /*!< SCB RFSR: UET Position */
+#define SCB_RFSR_UET_Msk                   (3UL /*<< SCB_RFSR_UET_Pos*/)                  /*!< SCB RFSR: UET Mask */
+
 /* SCB D-Cache Invalidate by Set-way Register Definitions */
 #define SCB_DCISW_WAY_Pos                  30U                                            /*!< SCB DCISW: Way Position */
 #define SCB_DCISW_WAY_Msk                  (3UL << SCB_DCISW_WAY_Pos)                     /*!< SCB DCISW: Way Mask */
@@ -922,78 +985,6 @@ typedef struct
 #define SCB_DCCISW_SET_Pos                  5U                                            /*!< SCB DCCISW: Set Position */
 #define SCB_DCCISW_SET_Msk                 (0x1FFUL << SCB_DCCISW_SET_Pos)                /*!< SCB DCCISW: Set Mask */
 
-/* Instruction Tightly-Coupled Memory Control Register Definitions */
-#define SCB_ITCMCR_SZ_Pos                   3U                                            /*!< SCB ITCMCR: SZ Position */
-#define SCB_ITCMCR_SZ_Msk                  (0xFUL << SCB_ITCMCR_SZ_Pos)                   /*!< SCB ITCMCR: SZ Mask */
-
-#define SCB_ITCMCR_RETEN_Pos                2U                                            /*!< SCB ITCMCR: RETEN Position */
-#define SCB_ITCMCR_RETEN_Msk               (1UL << SCB_ITCMCR_RETEN_Pos)                  /*!< SCB ITCMCR: RETEN Mask */
-
-#define SCB_ITCMCR_RMW_Pos                  1U                                            /*!< SCB ITCMCR: RMW Position */
-#define SCB_ITCMCR_RMW_Msk                 (1UL << SCB_ITCMCR_RMW_Pos)                    /*!< SCB ITCMCR: RMW Mask */
-
-#define SCB_ITCMCR_EN_Pos                   0U                                            /*!< SCB ITCMCR: EN Position */
-#define SCB_ITCMCR_EN_Msk                  (1UL /*<< SCB_ITCMCR_EN_Pos*/)                 /*!< SCB ITCMCR: EN Mask */
-
-/* Data Tightly-Coupled Memory Control Register Definitions */
-#define SCB_DTCMCR_SZ_Pos                   3U                                            /*!< SCB DTCMCR: SZ Position */
-#define SCB_DTCMCR_SZ_Msk                  (0xFUL << SCB_DTCMCR_SZ_Pos)                   /*!< SCB DTCMCR: SZ Mask */
-
-#define SCB_DTCMCR_RETEN_Pos                2U                                            /*!< SCB DTCMCR: RETEN Position */
-#define SCB_DTCMCR_RETEN_Msk               (1UL << SCB_DTCMCR_RETEN_Pos)                   /*!< SCB DTCMCR: RETEN Mask */
-
-#define SCB_DTCMCR_RMW_Pos                  1U                                            /*!< SCB DTCMCR: RMW Position */
-#define SCB_DTCMCR_RMW_Msk                 (1UL << SCB_DTCMCR_RMW_Pos)                    /*!< SCB DTCMCR: RMW Mask */
-
-#define SCB_DTCMCR_EN_Pos                   0U                                            /*!< SCB DTCMCR: EN Position */
-#define SCB_DTCMCR_EN_Msk                  (1UL /*<< SCB_DTCMCR_EN_Pos*/)                 /*!< SCB DTCMCR: EN Mask */
-
-/* AHBP Control Register Definitions */
-#define SCB_AHBPCR_SZ_Pos                   1U                                            /*!< SCB AHBPCR: SZ Position */
-#define SCB_AHBPCR_SZ_Msk                  (7UL << SCB_AHBPCR_SZ_Pos)                     /*!< SCB AHBPCR: SZ Mask */
-
-#define SCB_AHBPCR_EN_Pos                   0U                                            /*!< SCB AHBPCR: EN Position */
-#define SCB_AHBPCR_EN_Msk                  (1UL /*<< SCB_AHBPCR_EN_Pos*/)                 /*!< SCB AHBPCR: EN Mask */
-
-/* L1 Cache Control Register Definitions */
-#define SCB_CACR_FORCEWT_Pos                2U                                            /*!< SCB CACR: FORCEWT Position */
-#define SCB_CACR_FORCEWT_Msk               (1UL << SCB_CACR_FORCEWT_Pos)                  /*!< SCB CACR: FORCEWT Mask */
-
-#define SCB_CACR_ECCEN_Pos                  1U                                            /*!< SCB CACR: ECCEN Position */
-#define SCB_CACR_ECCEN_Msk                 (1UL << SCB_CACR_ECCEN_Pos)                    /*!< SCB CACR: ECCEN Mask */
-
-#define SCB_CACR_SIWT_Pos                   0U                                            /*!< SCB CACR: SIWT Position */
-#define SCB_CACR_SIWT_Msk                  (1UL /*<< SCB_CACR_SIWT_Pos*/)                 /*!< SCB CACR: SIWT Mask */
-
-/* AHBS Control Register Definitions */
-#define SCB_AHBSCR_INITCOUNT_Pos           11U                                            /*!< SCB AHBSCR: INITCOUNT Position */
-#define SCB_AHBSCR_INITCOUNT_Msk           (0x1FUL << SCB_AHBPCR_INITCOUNT_Pos)           /*!< SCB AHBSCR: INITCOUNT Mask */
-
-#define SCB_AHBSCR_TPRI_Pos                 2U                                            /*!< SCB AHBSCR: TPRI Position */
-#define SCB_AHBSCR_TPRI_Msk                (0x1FFUL << SCB_AHBPCR_TPRI_Pos)               /*!< SCB AHBSCR: TPRI Mask */
-
-#define SCB_AHBSCR_CTL_Pos                  0U                                            /*!< SCB AHBSCR: CTL Position*/
-#define SCB_AHBSCR_CTL_Msk                 (3UL /*<< SCB_AHBPCR_CTL_Pos*/)                /*!< SCB AHBSCR: CTL Mask */
-
-/* Auxiliary Bus Fault Status Register Definitions */
-#define SCB_ABFSR_AXIMTYPE_Pos              8U                                            /*!< SCB ABFSR: AXIMTYPE Position*/
-#define SCB_ABFSR_AXIMTYPE_Msk             (3UL << SCB_ABFSR_AXIMTYPE_Pos)                /*!< SCB ABFSR: AXIMTYPE Mask */
-
-#define SCB_ABFSR_EPPB_Pos                  4U                                            /*!< SCB ABFSR: EPPB Position*/
-#define SCB_ABFSR_EPPB_Msk                 (1UL << SCB_ABFSR_EPPB_Pos)                    /*!< SCB ABFSR: EPPB Mask */
-
-#define SCB_ABFSR_AXIM_Pos                  3U                                            /*!< SCB ABFSR: AXIM Position*/
-#define SCB_ABFSR_AXIM_Msk                 (1UL << SCB_ABFSR_AXIM_Pos)                    /*!< SCB ABFSR: AXIM Mask */
-
-#define SCB_ABFSR_AHBP_Pos                  2U                                            /*!< SCB ABFSR: AHBP Position*/
-#define SCB_ABFSR_AHBP_Msk                 (1UL << SCB_ABFSR_AHBP_Pos)                    /*!< SCB ABFSR: AHBP Mask */
-
-#define SCB_ABFSR_DTCM_Pos                  1U                                            /*!< SCB ABFSR: DTCM Position*/
-#define SCB_ABFSR_DTCM_Msk                 (1UL << SCB_ABFSR_DTCM_Pos)                    /*!< SCB ABFSR: DTCM Mask */
-
-#define SCB_ABFSR_ITCM_Pos                  0U                                            /*!< SCB ABFSR: ITCM Position*/
-#define SCB_ABFSR_ITCM_Msk                 (1UL /*<< SCB_ABFSR_ITCM_Pos*/)                /*!< SCB ABFSR: ITCM Mask */
-
 /*@} end of group CMSIS_SCB */
 
 
@@ -1098,16 +1089,14 @@ typedef struct
   __IOM uint32_t TPR;                    /*!< Offset: 0xE40 (R/W)  ITM Trace Privilege Register */
         uint32_t RESERVED2[15U];
   __IOM uint32_t TCR;                    /*!< Offset: 0xE80 (R/W)  ITM Trace Control Register */
-        uint32_t RESERVED3[29U];
-  __OM  uint32_t IWR;                    /*!< Offset: 0xEF8 ( /W)  ITM Integration Write Register */
-  __IM  uint32_t IRR;                    /*!< Offset: 0xEFC (R/ )  ITM Integration Read Register */
-  __IOM uint32_t IMCR;                   /*!< Offset: 0xF00 (R/W)  ITM Integration Mode Control Register */
+        uint32_t RESERVED3[32U];
         uint32_t RESERVED4[43U];
   __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  ITM Lock Access Register */
   __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  ITM Lock Status Register */
         uint32_t RESERVED5[1U];
   __IM  uint32_t DEVARCH;                /*!< Offset: 0xFBC (R/ )  ITM Device Architecture Register */
-        uint32_t RESERVED6[4U];
+        uint32_t RESERVED6[3U];
+  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  ITM Device Type Register */
   __IM  uint32_t PID4;                   /*!< Offset: 0xFD0 (R/ )  ITM Peripheral Identification Register #4 */
   __IM  uint32_t PID5;                   /*!< Offset: 0xFD4 (R/ )  ITM Peripheral Identification Register #5 */
   __IM  uint32_t PID6;                   /*!< Offset: 0xFD8 (R/ )  ITM Peripheral Identification Register #6 */
@@ -1164,18 +1153,6 @@ typedef struct
 #define ITM_TCR_ITMENA_Pos                  0U                                            /*!< ITM TCR: ITM Enable bit Position */
 #define ITM_TCR_ITMENA_Msk                 (1UL /*<< ITM_TCR_ITMENA_Pos*/)                /*!< ITM TCR: ITM Enable bit Mask */
 
-/* ITM Integration Write Register Definitions */
-#define ITM_IWR_ATVALIDM_Pos                0U                                            /*!< ITM IWR: ATVALIDM Position */
-#define ITM_IWR_ATVALIDM_Msk               (1UL /*<< ITM_IWR_ATVALIDM_Pos*/)              /*!< ITM IWR: ATVALIDM Mask */
-
-/* ITM Integration Read Register Definitions */
-#define ITM_IRR_ATREADYM_Pos                0U                                            /*!< ITM IRR: ATREADYM Position */
-#define ITM_IRR_ATREADYM_Msk               (1UL /*<< ITM_IRR_ATREADYM_Pos*/)              /*!< ITM IRR: ATREADYM Mask */
-
-/* ITM Integration Mode Control Register Definitions */
-#define ITM_IMCR_INTEGRATION_Pos            0U                                            /*!< ITM IMCR: INTEGRATION Position */
-#define ITM_IMCR_INTEGRATION_Msk           (1UL /*<< ITM_IMCR_INTEGRATION_Pos*/)          /*!< ITM IMCR: INTEGRATION Mask */
-
 /* ITM Lock Status Register Definitions */
 #define ITM_LSR_ByteAcc_Pos                 2U                                            /*!< ITM LSR: ByteAcc Position */
 #define ITM_LSR_ByteAcc_Msk                (1UL << ITM_LSR_ByteAcc_Pos)                   /*!< ITM LSR: ByteAcc Mask */
@@ -1396,26 +1373,18 @@ typedef struct
         uint32_t RESERVED2[131U];
   __IM  uint32_t FFSR;                   /*!< Offset: 0x300 (R/ )  Formatter and Flush Status Register */
   __IOM uint32_t FFCR;                   /*!< Offset: 0x304 (R/W)  Formatter and Flush Control Register */
-  __IM  uint32_t FSCR;                   /*!< Offset: 0x308 (R/ )  Formatter Synchronization Counter Register */
-        uint32_t RESERVED3[759U];
-  __IM  uint32_t TRIGGER;                /*!< Offset: 0xEE8 (R/ )  TRIGGER */
-  __IM  uint32_t FIFO0;                  /*!< Offset: 0xEEC (R/ )  Integration ETM Data */
-  __IM  uint32_t ITATBCTR2;              /*!< Offset: 0xEF0 (R/ )  ITATBCTR2 */
-        uint32_t RESERVED4[1U];
-  __IM  uint32_t ITATBCTR0;              /*!< Offset: 0xEF8 (R/ )  ITATBCTR0 */
-  __IM  uint32_t FIFO1;                  /*!< Offset: 0xEFC (R/ )  Integration ITM Data */
-  __IOM uint32_t ITCTRL;                 /*!< Offset: 0xF00 (R/W)  Integration Mode Control */
-        uint32_t RESERVED5[39U];
-  __IOM uint32_t CLAIMSET;               /*!< Offset: 0xFA0 (R/W)  Claim tag set */
-  __IOM uint32_t CLAIMCLR;               /*!< Offset: 0xFA4 (R/W)  Claim tag clear */
-        uint32_t RESERVED7[8U];
-  __IM  uint32_t DEVID;                  /*!< Offset: 0xFC8 (R/ )  TPIU_DEVID */
-  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  TPIU_DEVTYPE */
+  __IOM uint32_t PSCR;                   /*!< Offset: 0x308 (R/W)  Periodic Synchronization Control Register */
+        uint32_t RESERVED3[809U];
+  __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  Software Lock Access Register */
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  Software Lock Status Register */
+        uint32_t RESERVED4[4U];
+  __IM  uint32_t TYPE;                   /*!< Offset: 0xFC8 (R/ )  Device Identifier Register */
+  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  Device Type Register */
 } TPI_Type;
 
 /* TPI Asynchronous Clock Prescaler Register Definitions */
-#define TPI_ACPR_PRESCALER_Pos              0U                                         /*!< TPI ACPR: PRESCALER Position */
-#define TPI_ACPR_PRESCALER_Msk             (0x1FFFUL /*<< TPI_ACPR_PRESCALER_Pos*/)    /*!< TPI ACPR: PRESCALER Mask */
+#define TPI_ACPR_SWOSCALER_Pos              0U                                         /*!< TPI ACPR: SWOSCALER Position */
+#define TPI_ACPR_SWOSCALER_Msk             (0xFFFFUL /*<< TPI_ACPR_SWOSCALER_Pos*/)    /*!< TPI ACPR: SWOSCALER Mask */
 
 /* TPI Selected Pin Protocol Register Definitions */
 #define TPI_SPPR_TXMODE_Pos                 0U                                         /*!< TPI SPPR: TXMODE Position */
@@ -1438,68 +1407,25 @@ typedef struct
 #define TPI_FFCR_TrigIn_Pos                 8U                                         /*!< TPI FFCR: TrigIn Position */
 #define TPI_FFCR_TrigIn_Msk                (0x1UL << TPI_FFCR_TrigIn_Pos)              /*!< TPI FFCR: TrigIn Mask */
 
-#define TPI_FFCR_EnFCont_Pos                1U                                         /*!< TPI FFCR: EnFCont Position */
-#define TPI_FFCR_EnFCont_Msk               (0x1UL << TPI_FFCR_EnFCont_Pos)             /*!< TPI FFCR: EnFCont Mask */
-
-/* TPI TRIGGER Register Definitions */
-#define TPI_TRIGGER_TRIGGER_Pos             0U                                         /*!< TPI TRIGGER: TRIGGER Position */
-#define TPI_TRIGGER_TRIGGER_Msk            (0x1UL /*<< TPI_TRIGGER_TRIGGER_Pos*/)      /*!< TPI TRIGGER: TRIGGER Mask */
-
-/* TPI Integration ETM Data Register Definitions (FIFO0) */
-#define TPI_FIFO0_ITM_ATVALID_Pos          29U                                         /*!< TPI FIFO0: ITM_ATVALID Position */
-#define TPI_FIFO0_ITM_ATVALID_Msk          (0x3UL << TPI_FIFO0_ITM_ATVALID_Pos)        /*!< TPI FIFO0: ITM_ATVALID Mask */
-
-#define TPI_FIFO0_ITM_bytecount_Pos        27U                                         /*!< TPI FIFO0: ITM_bytecount Position */
-#define TPI_FIFO0_ITM_bytecount_Msk        (0x3UL << TPI_FIFO0_ITM_bytecount_Pos)      /*!< TPI FIFO0: ITM_bytecount Mask */
-
-#define TPI_FIFO0_ETM_ATVALID_Pos          26U                                         /*!< TPI FIFO0: ETM_ATVALID Position */
-#define TPI_FIFO0_ETM_ATVALID_Msk          (0x3UL << TPI_FIFO0_ETM_ATVALID_Pos)        /*!< TPI FIFO0: ETM_ATVALID Mask */
-
-#define TPI_FIFO0_ETM_bytecount_Pos        24U                                         /*!< TPI FIFO0: ETM_bytecount Position */
-#define TPI_FIFO0_ETM_bytecount_Msk        (0x3UL << TPI_FIFO0_ETM_bytecount_Pos)      /*!< TPI FIFO0: ETM_bytecount Mask */
-
-#define TPI_FIFO0_ETM2_Pos                 16U                                         /*!< TPI FIFO0: ETM2 Position */
-#define TPI_FIFO0_ETM2_Msk                 (0xFFUL << TPI_FIFO0_ETM2_Pos)              /*!< TPI FIFO0: ETM2 Mask */
-
-#define TPI_FIFO0_ETM1_Pos                  8U                                         /*!< TPI FIFO0: ETM1 Position */
-#define TPI_FIFO0_ETM1_Msk                 (0xFFUL << TPI_FIFO0_ETM1_Pos)              /*!< TPI FIFO0: ETM1 Mask */
-
-#define TPI_FIFO0_ETM0_Pos                  0U                                         /*!< TPI FIFO0: ETM0 Position */
-#define TPI_FIFO0_ETM0_Msk                 (0xFFUL /*<< TPI_FIFO0_ETM0_Pos*/)          /*!< TPI FIFO0: ETM0 Mask */
-
-/* TPI ITATBCTR2 Register Definitions */
-#define TPI_ITATBCTR2_ATREADY_Pos           0U                                         /*!< TPI ITATBCTR2: ATREADY Position */
-#define TPI_ITATBCTR2_ATREADY_Msk          (0x1UL /*<< TPI_ITATBCTR2_ATREADY_Pos*/)    /*!< TPI ITATBCTR2: ATREADY Mask */
-
-/* TPI Integration ITM Data Register Definitions (FIFO1) */
-#define TPI_FIFO1_ITM_ATVALID_Pos          29U                                         /*!< TPI FIFO1: ITM_ATVALID Position */
-#define TPI_FIFO1_ITM_ATVALID_Msk          (0x3UL << TPI_FIFO1_ITM_ATVALID_Pos)        /*!< TPI FIFO1: ITM_ATVALID Mask */
-
-#define TPI_FIFO1_ITM_bytecount_Pos        27U                                         /*!< TPI FIFO1: ITM_bytecount Position */
-#define TPI_FIFO1_ITM_bytecount_Msk        (0x3UL << TPI_FIFO1_ITM_bytecount_Pos)      /*!< TPI FIFO1: ITM_bytecount Mask */
-
-#define TPI_FIFO1_ETM_ATVALID_Pos          26U                                         /*!< TPI FIFO1: ETM_ATVALID Position */
-#define TPI_FIFO1_ETM_ATVALID_Msk          (0x3UL << TPI_FIFO1_ETM_ATVALID_Pos)        /*!< TPI FIFO1: ETM_ATVALID Mask */
+#define TPI_FFCR_FOnMan_Pos                 6U                                         /*!< TPI FFCR: FOnMan Position */
+#define TPI_FFCR_FOnMan_Msk                (0x1UL << TPI_FFCR_FOnMan_Pos)              /*!< TPI FFCR: FOnMan Mask */
 
-#define TPI_FIFO1_ETM_bytecount_Pos        24U                                         /*!< TPI FIFO1: ETM_bytecount Position */
-#define TPI_FIFO1_ETM_bytecount_Msk        (0x3UL << TPI_FIFO1_ETM_bytecount_Pos)      /*!< TPI FIFO1: ETM_bytecount Mask */
+#define TPI_FFCR_EnFmt_Pos                  0U                                         /*!< TPI FFCR: EnFmt Position */
+#define TPI_FFCR_EnFmt_Msk                 (0x3UL << /*TPI_FFCR_EnFmt_Pos*/)           /*!< TPI FFCR: EnFmt Mask */
 
-#define TPI_FIFO1_ITM2_Pos                 16U                                         /*!< TPI FIFO1: ITM2 Position */
-#define TPI_FIFO1_ITM2_Msk                 (0xFFUL << TPI_FIFO1_ITM2_Pos)              /*!< TPI FIFO1: ITM2 Mask */
+/* TPI Periodic Synchronization Control Register Definitions */
+#define TPI_PSCR_PSCount_Pos                0U                                         /*!< TPI PSCR: PSCount Position */
+#define TPI_PSCR_PSCount_Msk               (0x1FUL /*<< TPI_PSCR_PSCount_Pos*/)        /*!< TPI PSCR: TPSCount Mask */
 
-#define TPI_FIFO1_ITM1_Pos                  8U                                         /*!< TPI FIFO1: ITM1 Position */
-#define TPI_FIFO1_ITM1_Msk                 (0xFFUL << TPI_FIFO1_ITM1_Pos)              /*!< TPI FIFO1: ITM1 Mask */
+/* TPI Software Lock Status Register Definitions */
+#define TPI_LSR_nTT_Pos                     1U                                         /*!< TPI LSR: Not thirty-two bit. Position */
+#define TPI_LSR_nTT_Msk                    (0x1UL << TPI_LSR_nTT_Pos)                  /*!< TPI LSR: Not thirty-two bit. Mask */
 
-#define TPI_FIFO1_ITM0_Pos                  0U                                         /*!< TPI FIFO1: ITM0 Position */
-#define TPI_FIFO1_ITM0_Msk                 (0xFFUL /*<< TPI_FIFO1_ITM0_Pos*/)          /*!< TPI FIFO1: ITM0 Mask */
+#define TPI_LSR_SLK_Pos                     1U                                         /*!< TPI LSR: Software Lock status Position */
+#define TPI_LSR_SLK_Msk                    (0x1UL << TPI_LSR_SLK_Pos)                  /*!< TPI LSR: Software Lock status Mask */
 
-/* TPI ITATBCTR0 Register Definitions */
-#define TPI_ITATBCTR0_ATREADY_Pos           0U                                         /*!< TPI ITATBCTR0: ATREADY Position */
-#define TPI_ITATBCTR0_ATREADY_Msk          (0x1UL /*<< TPI_ITATBCTR0_ATREADY_Pos*/)    /*!< TPI ITATBCTR0: ATREADY Mask */
-
-/* TPI Integration Mode Control Register Definitions */
-#define TPI_ITCTRL_Mode_Pos                 0U                                         /*!< TPI ITCTRL: Mode Position */
-#define TPI_ITCTRL_Mode_Msk                (0x1UL /*<< TPI_ITCTRL_Mode_Pos*/)          /*!< TPI ITCTRL: Mode Mask */
+#define TPI_LSR_SLI_Pos                     0U                                         /*!< TPI LSR: Software Lock implemented Position */
+#define TPI_LSR_SLI_Msk                    (0x1UL /*<< TPI_LSR_SLI_Pos*/)              /*!< TPI LSR: Software Lock implemented Mask */
 
 /* TPI DEVID Register Definitions */
 #define TPI_DEVID_NRZVALID_Pos             11U                                         /*!< TPI DEVID: NRZVALID Position */
@@ -1511,237 +1437,1047 @@ typedef struct
 #define TPI_DEVID_PTINVALID_Pos             9U                                         /*!< TPI DEVID: PTINVALID Position */
 #define TPI_DEVID_PTINVALID_Msk            (0x1UL << TPI_DEVID_PTINVALID_Pos)          /*!< TPI DEVID: PTINVALID Mask */
 
-#define TPI_DEVID_MinBufSz_Pos              6U                                         /*!< TPI DEVID: MinBufSz Position */
-#define TPI_DEVID_MinBufSz_Msk             (0x7UL << TPI_DEVID_MinBufSz_Pos)           /*!< TPI DEVID: MinBufSz Mask */
-
-#define TPI_DEVID_AsynClkIn_Pos             5U                                         /*!< TPI DEVID: AsynClkIn Position */
-#define TPI_DEVID_AsynClkIn_Msk            (0x1UL << TPI_DEVID_AsynClkIn_Pos)          /*!< TPI DEVID: AsynClkIn Mask */
-
-#define TPI_DEVID_NrTraceInput_Pos          0U                                         /*!< TPI DEVID: NrTraceInput Position */
-#define TPI_DEVID_NrTraceInput_Msk         (0x1FUL /*<< TPI_DEVID_NrTraceInput_Pos*/)  /*!< TPI DEVID: NrTraceInput Mask */
+#define TPI_DEVID_FIFOSZ_Pos                6U                                         /*!< TPI DEVID: FIFO depth Position */
+#define TPI_DEVID_FIFOSZ_Msk               (0x7UL << TPI_DEVID_FIFOSZ_Pos)             /*!< TPI DEVID: FIFO depth Mask */
 
 /* TPI DEVTYPE Register Definitions */
-#define TPI_DEVTYPE_MajorType_Pos           4U                                         /*!< TPI DEVTYPE: MajorType Position */
-#define TPI_DEVTYPE_MajorType_Msk          (0xFUL << TPI_DEVTYPE_MajorType_Pos)        /*!< TPI DEVTYPE: MajorType Mask */
-
-#define TPI_DEVTYPE_SubType_Pos             0U                                         /*!< TPI DEVTYPE: SubType Position */
+#define TPI_DEVTYPE_SubType_Pos             4U                                         /*!< TPI DEVTYPE: SubType Position */
 #define TPI_DEVTYPE_SubType_Msk            (0xFUL /*<< TPI_DEVTYPE_SubType_Pos*/)      /*!< TPI DEVTYPE: SubType Mask */
 
-/*@}*/ /* end of group CMSIS_TPI */
+#define TPI_DEVTYPE_MajorType_Pos           0U                                         /*!< TPI DEVTYPE: MajorType Position */
+#define TPI_DEVTYPE_MajorType_Msk          (0xFUL << TPI_DEVTYPE_MajorType_Pos)        /*!< TPI DEVTYPE: MajorType Mask */
 
+/*@}*/ /* end of group CMSIS_TPI */
 
-#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+#if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
 /**
   \ingroup  CMSIS_core_register
-  \defgroup CMSIS_MPU     Memory Protection Unit (MPU)
-  \brief    Type definitions for the Memory Protection Unit (MPU)
+  \defgroup CMSIS_PMU     Performance Monitoring Unit (PMU)
+  \brief    Type definitions for the Performance Monitoring Unit (PMU)
   @{
  */
 
 /**
-  \brief  Structure type to access the Memory Protection Unit (MPU).
+  \brief  Structure type to access the Performance Monitoring Unit (PMU).
  */
 typedef struct
 {
-  __IM  uint32_t TYPE;                   /*!< Offset: 0x000 (R/ )  MPU Type Register */
-  __IOM uint32_t CTRL;                   /*!< Offset: 0x004 (R/W)  MPU Control Register */
-  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  MPU Region Number Register */
-  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  MPU Region Base Address Register */
-  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  MPU Region Limit Address Register */
-  __IOM uint32_t RBAR_A1;                /*!< Offset: 0x014 (R/W)  MPU Region Base Address Register Alias 1 */
-  __IOM uint32_t RLAR_A1;                /*!< Offset: 0x018 (R/W)  MPU Region Limit Address Register Alias 1 */
-  __IOM uint32_t RBAR_A2;                /*!< Offset: 0x01C (R/W)  MPU Region Base Address Register Alias 2 */
-  __IOM uint32_t RLAR_A2;                /*!< Offset: 0x020 (R/W)  MPU Region Limit Address Register Alias 2 */
-  __IOM uint32_t RBAR_A3;                /*!< Offset: 0x024 (R/W)  MPU Region Base Address Register Alias 3 */
-  __IOM uint32_t RLAR_A3;                /*!< Offset: 0x028 (R/W)  MPU Region Limit Address Register Alias 3 */
-        uint32_t RESERVED0[1];
-  union {
-  __IOM uint32_t MAIR[2];
-  struct {
-  __IOM uint32_t MAIR0;                  /*!< Offset: 0x030 (R/W)  MPU Memory Attribute Indirection Register 0 */
-  __IOM uint32_t MAIR1;                  /*!< Offset: 0x034 (R/W)  MPU Memory Attribute Indirection Register 1 */
-  };
-  };
-} MPU_Type;
+  __IOM uint32_t EVCNTR[__PMU_NUM_EVENTCNT];        /*!< Offset: 0x0 (R/W)    PMU Event Counter Registers */
+#if __PMU_NUM_EVENTCNT<31
+        uint32_t RESERVED0[31U-__PMU_NUM_EVENTCNT];
+#endif
+  __IOM uint32_t CCNTR;                             /*!< Offset: 0x7C (R/W)   PMU Cycle Counter Register */
+        uint32_t RESERVED1[224];
+  __IOM uint32_t EVTYPER[__PMU_NUM_EVENTCNT];       /*!< Offset: 0x400 (R/W)  PMU Event Type and Filter Registers */
+#if __PMU_NUM_EVENTCNT<31
+        uint32_t RESERVED2[31U-__PMU_NUM_EVENTCNT];
+#endif
+  __IOM uint32_t CCFILTR;                           /*!< Offset: 0x47C (R/W)  PMU Cycle Counter Filter Register */
+        uint32_t RESERVED3[480];
+  __IOM uint32_t CNTENSET;                          /*!< Offset: 0xC00 (R/W)  PMU Count Enable Set Register */
+        uint32_t RESERVED4[7];
+  __IOM uint32_t CNTENCLR;                          /*!< Offset: 0xC20 (R/W)  PMU Count Enable Clear Register */
+        uint32_t RESERVED5[7];
+  __IOM uint32_t INTENSET;                          /*!< Offset: 0xC40 (R/W)  PMU Interrupt Enable Set Register */
+        uint32_t RESERVED6[7];
+  __IOM uint32_t INTENCLR;                          /*!< Offset: 0xC60 (R/W)  PMU Interrupt Enable Clear Register */
+        uint32_t RESERVED7[7];
+  __IOM uint32_t OVSCLR;                            /*!< Offset: 0xC80 (R/W)  PMU Overflow Flag Status Clear Register */
+        uint32_t RESERVED8[7];
+  __IOM uint32_t SWINC;                             /*!< Offset: 0xCA0 (R/W)  PMU Software Increment Register */
+        uint32_t RESERVED9[7];
+  __IOM uint32_t OVSSET;                            /*!< Offset: 0xCC0 (R/W)  PMU Overflow Flag Status Set Register */
+        uint32_t RESERVED10[79];
+  __IOM uint32_t TYPE;                              /*!< Offset: 0xE00 (R/W)  PMU Type Register */
+  __IOM uint32_t CTRL;                              /*!< Offset: 0xE04 (R/W)  PMU Control Register */
+        uint32_t RESERVED11[108];
+  __IOM uint32_t AUTHSTATUS;                        /*!< Offset: 0xFB8 (R/W)  PMU Authentication Status Register */
+  __IOM uint32_t DEVARCH;                           /*!< Offset: 0xFBC (R/W)  PMU Device Architecture Register */
+        uint32_t RESERVED12[3];
+  __IOM uint32_t DEVTYPE;                           /*!< Offset: 0xFCC (R/W)  PMU Device Type Register */
+  __IOM uint32_t PIDR4;                             /*!< Offset: 0xFD0 (R/W)  PMU Peripheral Identification Register 4 */
+        uint32_t RESERVED13[3];
+  __IOM uint32_t PIDR0;                             /*!< Offset: 0xFE0 (R/W)  PMU Peripheral Identification Register 0 */
+  __IOM uint32_t PIDR1;                             /*!< Offset: 0xFE4 (R/W)  PMU Peripheral Identification Register 1 */
+  __IOM uint32_t PIDR2;                             /*!< Offset: 0xFE8 (R/W)  PMU Peripheral Identification Register 2 */
+  __IOM uint32_t PIDR3;                             /*!< Offset: 0xFEC (R/W)  PMU Peripheral Identification Register 3 */
+  __IOM uint32_t CIDR0;                             /*!< Offset: 0xFF0 (R/W)  PMU Component Identification Register 0 */
+  __IOM uint32_t CIDR1;                             /*!< Offset: 0xFF4 (R/W)  PMU Component Identification Register 1 */
+  __IOM uint32_t CIDR2;                             /*!< Offset: 0xFF8 (R/W)  PMU Component Identification Register 2 */
+  __IOM uint32_t CIDR3;                             /*!< Offset: 0xFFC (R/W)  PMU Component Identification Register 3 */
+} PMU_Type;
 
-#define MPU_TYPE_RALIASES                  4U
+/** \brief PMU Event Counter Registers (0-30) Definitions  */
 
-/* MPU Type Register Definitions */
-#define MPU_TYPE_IREGION_Pos               16U                                            /*!< MPU TYPE: IREGION Position */
-#define MPU_TYPE_IREGION_Msk               (0xFFUL << MPU_TYPE_IREGION_Pos)               /*!< MPU TYPE: IREGION Mask */
+#define PMU_EVCNTR_CNT_Pos                    0U                                           /*!< PMU EVCNTR: Counter Position */
+#define PMU_EVCNTR_CNT_Msk                   (0xFFFFUL /*<< PMU_EVCNTRx_CNT_Pos*/)         /*!< PMU EVCNTR: Counter Mask */
 
-#define MPU_TYPE_DREGION_Pos                8U                                            /*!< MPU TYPE: DREGION Position */
-#define MPU_TYPE_DREGION_Msk               (0xFFUL << MPU_TYPE_DREGION_Pos)               /*!< MPU TYPE: DREGION Mask */
+/** \brief PMU Event Type and Filter Registers (0-30) Definitions  */
 
-#define MPU_TYPE_SEPARATE_Pos               0U                                            /*!< MPU TYPE: SEPARATE Position */
-#define MPU_TYPE_SEPARATE_Msk              (1UL /*<< MPU_TYPE_SEPARATE_Pos*/)             /*!< MPU TYPE: SEPARATE Mask */
+#define PMU_EVTYPER_EVENTTOCNT_Pos            0U                                           /*!< PMU EVTYPER: Event to Count Position */
+#define PMU_EVTYPER_EVENTTOCNT_Msk           (0xFFFFUL /*<< EVTYPERx_EVENTTOCNT_Pos*/)     /*!< PMU EVTYPER: Event to Count Mask */
 
-/* MPU Control Register Definitions */
-#define MPU_CTRL_PRIVDEFENA_Pos             2U                                            /*!< MPU CTRL: PRIVDEFENA Position */
-#define MPU_CTRL_PRIVDEFENA_Msk            (1UL << MPU_CTRL_PRIVDEFENA_Pos)               /*!< MPU CTRL: PRIVDEFENA Mask */
+/** \brief PMU Count Enable Set Register Definitions */
 
-#define MPU_CTRL_HFNMIENA_Pos               1U                                            /*!< MPU CTRL: HFNMIENA Position */
-#define MPU_CTRL_HFNMIENA_Msk              (1UL << MPU_CTRL_HFNMIENA_Pos)                 /*!< MPU CTRL: HFNMIENA Mask */
+#define PMU_CNTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU CNTENSET: Event Counter 0 Enable Set Position */
+#define PMU_CNTENSET_CNT0_ENABLE_Msk         (1UL /*<< PMU_CNTENSET_CNT0_ENABLE_Pos*/)     /*!< PMU CNTENSET: Event Counter 0 Enable Set Mask */
 
-#define MPU_CTRL_ENABLE_Pos                 0U                                            /*!< MPU CTRL: ENABLE Position */
-#define MPU_CTRL_ENABLE_Msk                (1UL /*<< MPU_CTRL_ENABLE_Pos*/)               /*!< MPU CTRL: ENABLE Mask */
+#define PMU_CNTENSET_CNT1_ENABLE_Pos          1U                                           /*!< PMU CNTENSET: Event Counter 1 Enable Set Position */
+#define PMU_CNTENSET_CNT1_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT1_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 1 Enable Set Mask */
 
-/* MPU Region Number Register Definitions */
-#define MPU_RNR_REGION_Pos                  0U                                            /*!< MPU RNR: REGION Position */
-#define MPU_RNR_REGION_Msk                 (0xFFUL /*<< MPU_RNR_REGION_Pos*/)             /*!< MPU RNR: REGION Mask */
+#define PMU_CNTENSET_CNT2_ENABLE_Pos          2U                                           /*!< PMU CNTENSET: Event Counter 2 Enable Set Position */
+#define PMU_CNTENSET_CNT2_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT2_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 2 Enable Set Mask */
 
-/* MPU Region Base Address Register Definitions */
-#define MPU_RBAR_ADDR_Pos                   5U                                            /*!< MPU RBAR: ADDR Position */
-#define MPU_RBAR_ADDR_Msk                  (0x7FFFFFFUL << MPU_RBAR_ADDR_Pos)             /*!< MPU RBAR: ADDR Mask */
+#define PMU_CNTENSET_CNT3_ENABLE_Pos          3U                                           /*!< PMU CNTENSET: Event Counter 3 Enable Set Position */
+#define PMU_CNTENSET_CNT3_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT3_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 3 Enable Set Mask */
 
-#define MPU_RBAR_SH_Pos                     3U                                            /*!< MPU RBAR: SH Position */
-#define MPU_RBAR_SH_Msk                    (0x3UL << MPU_RBAR_SH_Pos)                     /*!< MPU RBAR: SH Mask */
+#define PMU_CNTENSET_CNT4_ENABLE_Pos          4U                                           /*!< PMU CNTENSET: Event Counter 4 Enable Set Position */
+#define PMU_CNTENSET_CNT4_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT4_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 4 Enable Set Mask */
 
-#define MPU_RBAR_AP_Pos                     1U                                            /*!< MPU RBAR: AP Position */
-#define MPU_RBAR_AP_Msk                    (0x3UL << MPU_RBAR_AP_Pos)                     /*!< MPU RBAR: AP Mask */
+#define PMU_CNTENSET_CNT5_ENABLE_Pos          5U                                           /*!< PMU CNTENSET: Event Counter 5 Enable Set Position */
+#define PMU_CNTENSET_CNT5_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT5_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 5 Enable Set Mask */
 
-#define MPU_RBAR_XN_Pos                     0U                                            /*!< MPU RBAR: XN Position */
-#define MPU_RBAR_XN_Msk                    (01UL /*<< MPU_RBAR_XN_Pos*/)                  /*!< MPU RBAR: XN Mask */
+#define PMU_CNTENSET_CNT6_ENABLE_Pos          6U                                           /*!< PMU CNTENSET: Event Counter 6 Enable Set Position */
+#define PMU_CNTENSET_CNT6_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT6_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 6 Enable Set Mask */
 
-/* MPU Region Limit Address Register Definitions */
-#define MPU_RLAR_LIMIT_Pos                  5U                                            /*!< MPU RLAR: LIMIT Position */
-#define MPU_RLAR_LIMIT_Msk                 (0x7FFFFFFUL << MPU_RLAR_LIMIT_Pos)            /*!< MPU RLAR: LIMIT Mask */
+#define PMU_CNTENSET_CNT7_ENABLE_Pos          7U                                           /*!< PMU CNTENSET: Event Counter 7 Enable Set Position */
+#define PMU_CNTENSET_CNT7_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT7_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 7 Enable Set Mask */
 
-#define MPU_RLAR_PXN_Pos                    4U                                            /*!< MPU RLAR: PXN Position */
-#define MPU_RLAR_PXN_Msk                   (0x1UL << MPU_RLAR_PXN_Pos)                    /*!< MPU RLAR: PXN Mask */
+#define PMU_CNTENSET_CNT8_ENABLE_Pos          8U                                           /*!< PMU CNTENSET: Event Counter 8 Enable Set Position */
+#define PMU_CNTENSET_CNT8_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT8_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 8 Enable Set Mask */
 
-#define MPU_RLAR_AttrIndx_Pos               1U                                            /*!< MPU RLAR: AttrIndx Position */
-#define MPU_RLAR_AttrIndx_Msk              (0x7UL << MPU_RLAR_AttrIndx_Pos)               /*!< MPU RLAR: AttrIndx Mask */
+#define PMU_CNTENSET_CNT9_ENABLE_Pos          9U                                           /*!< PMU CNTENSET: Event Counter 9 Enable Set Position */
+#define PMU_CNTENSET_CNT9_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT9_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 9 Enable Set Mask */
 
-#define MPU_RLAR_EN_Pos                     0U                                            /*!< MPU RLAR: Region enable bit Position */
-#define MPU_RLAR_EN_Msk                    (1UL /*<< MPU_RLAR_EN_Pos*/)                   /*!< MPU RLAR: Region enable bit Disable Mask */
+#define PMU_CNTENSET_CNT10_ENABLE_Pos         10U                                          /*!< PMU CNTENSET: Event Counter 10 Enable Set Position */
+#define PMU_CNTENSET_CNT10_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT10_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 10 Enable Set Mask */
 
-/* MPU Memory Attribute Indirection Register 0 Definitions */
-#define MPU_MAIR0_Attr3_Pos                24U                                            /*!< MPU MAIR0: Attr3 Position */
-#define MPU_MAIR0_Attr3_Msk                (0xFFUL << MPU_MAIR0_Attr3_Pos)                /*!< MPU MAIR0: Attr3 Mask */
+#define PMU_CNTENSET_CNT11_ENABLE_Pos         11U                                          /*!< PMU CNTENSET: Event Counter 11 Enable Set Position */
+#define PMU_CNTENSET_CNT11_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT11_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 11 Enable Set Mask */
 
-#define MPU_MAIR0_Attr2_Pos                16U                                            /*!< MPU MAIR0: Attr2 Position */
-#define MPU_MAIR0_Attr2_Msk                (0xFFUL << MPU_MAIR0_Attr2_Pos)                /*!< MPU MAIR0: Attr2 Mask */
+#define PMU_CNTENSET_CNT12_ENABLE_Pos         12U                                          /*!< PMU CNTENSET: Event Counter 12 Enable Set Position */
+#define PMU_CNTENSET_CNT12_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT12_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 12 Enable Set Mask */
 
-#define MPU_MAIR0_Attr1_Pos                 8U                                            /*!< MPU MAIR0: Attr1 Position */
-#define MPU_MAIR0_Attr1_Msk                (0xFFUL << MPU_MAIR0_Attr1_Pos)                /*!< MPU MAIR0: Attr1 Mask */
+#define PMU_CNTENSET_CNT13_ENABLE_Pos         13U                                          /*!< PMU CNTENSET: Event Counter 13 Enable Set Position */
+#define PMU_CNTENSET_CNT13_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT13_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 13 Enable Set Mask */
 
-#define MPU_MAIR0_Attr0_Pos                 0U                                            /*!< MPU MAIR0: Attr0 Position */
-#define MPU_MAIR0_Attr0_Msk                (0xFFUL /*<< MPU_MAIR0_Attr0_Pos*/)            /*!< MPU MAIR0: Attr0 Mask */
+#define PMU_CNTENSET_CNT14_ENABLE_Pos         14U                                          /*!< PMU CNTENSET: Event Counter 14 Enable Set Position */
+#define PMU_CNTENSET_CNT14_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT14_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 14 Enable Set Mask */
 
-/* MPU Memory Attribute Indirection Register 1 Definitions */
-#define MPU_MAIR1_Attr7_Pos                24U                                            /*!< MPU MAIR1: Attr7 Position */
-#define MPU_MAIR1_Attr7_Msk                (0xFFUL << MPU_MAIR1_Attr7_Pos)                /*!< MPU MAIR1: Attr7 Mask */
+#define PMU_CNTENSET_CNT15_ENABLE_Pos         15U                                          /*!< PMU CNTENSET: Event Counter 15 Enable Set Position */
+#define PMU_CNTENSET_CNT15_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT15_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 15 Enable Set Mask */
 
-#define MPU_MAIR1_Attr6_Pos                16U                                            /*!< MPU MAIR1: Attr6 Position */
-#define MPU_MAIR1_Attr6_Msk                (0xFFUL << MPU_MAIR1_Attr6_Pos)                /*!< MPU MAIR1: Attr6 Mask */
+#define PMU_CNTENSET_CNT16_ENABLE_Pos         16U                                          /*!< PMU CNTENSET: Event Counter 16 Enable Set Position */
+#define PMU_CNTENSET_CNT16_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT16_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 16 Enable Set Mask */
 
-#define MPU_MAIR1_Attr5_Pos                 8U                                            /*!< MPU MAIR1: Attr5 Position */
-#define MPU_MAIR1_Attr5_Msk                (0xFFUL << MPU_MAIR1_Attr5_Pos)                /*!< MPU MAIR1: Attr5 Mask */
+#define PMU_CNTENSET_CNT17_ENABLE_Pos         17U                                          /*!< PMU CNTENSET: Event Counter 17 Enable Set Position */
+#define PMU_CNTENSET_CNT17_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT17_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 17 Enable Set Mask */
 
-#define MPU_MAIR1_Attr4_Pos                 0U                                            /*!< MPU MAIR1: Attr4 Position */
-#define MPU_MAIR1_Attr4_Msk                (0xFFUL /*<< MPU_MAIR1_Attr4_Pos*/)            /*!< MPU MAIR1: Attr4 Mask */
+#define PMU_CNTENSET_CNT18_ENABLE_Pos         18U                                          /*!< PMU CNTENSET: Event Counter 18 Enable Set Position */
+#define PMU_CNTENSET_CNT18_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT18_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 18 Enable Set Mask */
 
-/*@} end of group CMSIS_MPU */
-#endif
+#define PMU_CNTENSET_CNT19_ENABLE_Pos         19U                                          /*!< PMU CNTENSET: Event Counter 19 Enable Set Position */
+#define PMU_CNTENSET_CNT19_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT19_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 19 Enable Set Mask */
 
+#define PMU_CNTENSET_CNT20_ENABLE_Pos         20U                                          /*!< PMU CNTENSET: Event Counter 20 Enable Set Position */
+#define PMU_CNTENSET_CNT20_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT20_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 20 Enable Set Mask */
 
-#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
-/**
-  \ingroup  CMSIS_core_register
-  \defgroup CMSIS_SAU     Security Attribution Unit (SAU)
-  \brief    Type definitions for the Security Attribution Unit (SAU)
-  @{
- */
+#define PMU_CNTENSET_CNT21_ENABLE_Pos         21U                                          /*!< PMU CNTENSET: Event Counter 21 Enable Set Position */
+#define PMU_CNTENSET_CNT21_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT21_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 21 Enable Set Mask */
 
-/**
-  \brief  Structure type to access the Security Attribution Unit (SAU).
- */
-typedef struct
-{
-  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SAU Control Register */
-  __IM  uint32_t TYPE;                   /*!< Offset: 0x004 (R/ )  SAU Type Register */
-#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
-  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  SAU Region Number Register */
-  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  SAU Region Base Address Register */
-  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  SAU Region Limit Address Register */
-#else
-        uint32_t RESERVED0[3];
-#endif
-  __IOM uint32_t SFSR;                   /*!< Offset: 0x014 (R/W)  Secure Fault Status Register */
-  __IOM uint32_t SFAR;                   /*!< Offset: 0x018 (R/W)  Secure Fault Address Register */
-} SAU_Type;
+#define PMU_CNTENSET_CNT22_ENABLE_Pos         22U                                          /*!< PMU CNTENSET: Event Counter 22 Enable Set Position */
+#define PMU_CNTENSET_CNT22_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT22_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 22 Enable Set Mask */
 
-/* SAU Control Register Definitions */
-#define SAU_CTRL_ALLNS_Pos                  1U                                            /*!< SAU CTRL: ALLNS Position */
-#define SAU_CTRL_ALLNS_Msk                 (1UL << SAU_CTRL_ALLNS_Pos)                    /*!< SAU CTRL: ALLNS Mask */
+#define PMU_CNTENSET_CNT23_ENABLE_Pos         23U                                          /*!< PMU CNTENSET: Event Counter 23 Enable Set Position */
+#define PMU_CNTENSET_CNT23_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT23_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 23 Enable Set Mask */
 
-#define SAU_CTRL_ENABLE_Pos                 0U                                            /*!< SAU CTRL: ENABLE Position */
-#define SAU_CTRL_ENABLE_Msk                (1UL /*<< SAU_CTRL_ENABLE_Pos*/)               /*!< SAU CTRL: ENABLE Mask */
+#define PMU_CNTENSET_CNT24_ENABLE_Pos         24U                                          /*!< PMU CNTENSET: Event Counter 24 Enable Set Position */
+#define PMU_CNTENSET_CNT24_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT24_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 24 Enable Set Mask */
 
-/* SAU Type Register Definitions */
-#define SAU_TYPE_SREGION_Pos                0U                                            /*!< SAU TYPE: SREGION Position */
-#define SAU_TYPE_SREGION_Msk               (0xFFUL /*<< SAU_TYPE_SREGION_Pos*/)           /*!< SAU TYPE: SREGION Mask */
+#define PMU_CNTENSET_CNT25_ENABLE_Pos         25U                                          /*!< PMU CNTENSET: Event Counter 25 Enable Set Position */
+#define PMU_CNTENSET_CNT25_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT25_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 25 Enable Set Mask */
 
-#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
-/* SAU Region Number Register Definitions */
-#define SAU_RNR_REGION_Pos                  0U                                            /*!< SAU RNR: REGION Position */
-#define SAU_RNR_REGION_Msk                 (0xFFUL /*<< SAU_RNR_REGION_Pos*/)             /*!< SAU RNR: REGION Mask */
+#define PMU_CNTENSET_CNT26_ENABLE_Pos         26U                                          /*!< PMU CNTENSET: Event Counter 26 Enable Set Position */
+#define PMU_CNTENSET_CNT26_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT26_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 26 Enable Set Mask */
 
-/* SAU Region Base Address Register Definitions */
-#define SAU_RBAR_BADDR_Pos                  5U                                            /*!< SAU RBAR: BADDR Position */
-#define SAU_RBAR_BADDR_Msk                 (0x7FFFFFFUL << SAU_RBAR_BADDR_Pos)            /*!< SAU RBAR: BADDR Mask */
+#define PMU_CNTENSET_CNT27_ENABLE_Pos         27U                                          /*!< PMU CNTENSET: Event Counter 27 Enable Set Position */
+#define PMU_CNTENSET_CNT27_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT27_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 27 Enable Set Mask */
 
-/* SAU Region Limit Address Register Definitions */
-#define SAU_RLAR_LADDR_Pos                  5U                                            /*!< SAU RLAR: LADDR Position */
-#define SAU_RLAR_LADDR_Msk                 (0x7FFFFFFUL << SAU_RLAR_LADDR_Pos)            /*!< SAU RLAR: LADDR Mask */
+#define PMU_CNTENSET_CNT28_ENABLE_Pos         28U                                          /*!< PMU CNTENSET: Event Counter 28 Enable Set Position */
+#define PMU_CNTENSET_CNT28_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT28_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 28 Enable Set Mask */
 
-#define SAU_RLAR_NSC_Pos                    1U                                            /*!< SAU RLAR: NSC Position */
-#define SAU_RLAR_NSC_Msk                   (1UL << SAU_RLAR_NSC_Pos)                      /*!< SAU RLAR: NSC Mask */
+#define PMU_CNTENSET_CNT29_ENABLE_Pos         29U                                          /*!< PMU CNTENSET: Event Counter 29 Enable Set Position */
+#define PMU_CNTENSET_CNT29_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT29_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 29 Enable Set Mask */
 
-#define SAU_RLAR_ENABLE_Pos                 0U                                            /*!< SAU RLAR: ENABLE Position */
-#define SAU_RLAR_ENABLE_Msk                (1UL /*<< SAU_RLAR_ENABLE_Pos*/)               /*!< SAU RLAR: ENABLE Mask */
+#define PMU_CNTENSET_CNT30_ENABLE_Pos         30U                                          /*!< PMU CNTENSET: Event Counter 30 Enable Set Position */
+#define PMU_CNTENSET_CNT30_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT30_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 30 Enable Set Mask */
 
-#endif /* defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U) */
+#define PMU_CNTENSET_CCNTR_ENABLE_Pos         31U                                          /*!< PMU CNTENSET: Cycle Counter Enable Set Position */
+#define PMU_CNTENSET_CCNTR_ENABLE_Msk        (1UL << PMU_CNTENSET_CCNTR_ENABLE_Pos)        /*!< PMU CNTENSET: Cycle Counter Enable Set Mask */
 
-/* Secure Fault Status Register Definitions */
-#define SAU_SFSR_LSERR_Pos                  7U                                            /*!< SAU SFSR: LSERR Position */
-#define SAU_SFSR_LSERR_Msk                 (1UL << SAU_SFSR_LSERR_Pos)                    /*!< SAU SFSR: LSERR Mask */
+/** \brief PMU Count Enable Clear Register Definitions */
 
-#define SAU_SFSR_SFARVALID_Pos              6U                                            /*!< SAU SFSR: SFARVALID Position */
-#define SAU_SFSR_SFARVALID_Msk             (1UL << SAU_SFSR_SFARVALID_Pos)                /*!< SAU SFSR: SFARVALID Mask */
+#define PMU_CNTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU CNTENCLR: Event Counter 0 Enable Clear Position */
+#define PMU_CNTENCLR_CNT0_ENABLE_Msk         (1UL /*<< PMU_CNTENCLR_CNT0_ENABLE_Pos*/)     /*!< PMU CNTENCLR: Event Counter 0 Enable Clear Mask */
 
-#define SAU_SFSR_LSPERR_Pos                 5U                                            /*!< SAU SFSR: LSPERR Position */
-#define SAU_SFSR_LSPERR_Msk                (1UL << SAU_SFSR_LSPERR_Pos)                   /*!< SAU SFSR: LSPERR Mask */
+#define PMU_CNTENCLR_CNT1_ENABLE_Pos          1U                                           /*!< PMU CNTENCLR: Event Counter 1 Enable Clear Position */
+#define PMU_CNTENCLR_CNT1_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT1_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 1 Enable Clear */
 
-#define SAU_SFSR_INVTRAN_Pos                4U                                            /*!< SAU SFSR: INVTRAN Position */
-#define SAU_SFSR_INVTRAN_Msk               (1UL << SAU_SFSR_INVTRAN_Pos)                  /*!< SAU SFSR: INVTRAN Mask */
+#define PMU_CNTENCLR_CNT2_ENABLE_Pos          2U                                           /*!< PMU CNTENCLR: Event Counter 2 Enable Clear Position */
+#define PMU_CNTENCLR_CNT2_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT2_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 2 Enable Clear Mask */
 
-#define SAU_SFSR_AUVIOL_Pos                 3U                                            /*!< SAU SFSR: AUVIOL Position */
-#define SAU_SFSR_AUVIOL_Msk                (1UL << SAU_SFSR_AUVIOL_Pos)                   /*!< SAU SFSR: AUVIOL Mask */
+#define PMU_CNTENCLR_CNT3_ENABLE_Pos          3U                                           /*!< PMU CNTENCLR: Event Counter 3 Enable Clear Position */
+#define PMU_CNTENCLR_CNT3_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT3_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 3 Enable Clear Mask */
 
-#define SAU_SFSR_INVER_Pos                  2U                                            /*!< SAU SFSR: INVER Position */
-#define SAU_SFSR_INVER_Msk                 (1UL << SAU_SFSR_INVER_Pos)                    /*!< SAU SFSR: INVER Mask */
+#define PMU_CNTENCLR_CNT4_ENABLE_Pos          4U                                           /*!< PMU CNTENCLR: Event Counter 4 Enable Clear Position */
+#define PMU_CNTENCLR_CNT4_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT4_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 4 Enable Clear Mask */
 
-#define SAU_SFSR_INVIS_Pos                  1U                                            /*!< SAU SFSR: INVIS Position */
-#define SAU_SFSR_INVIS_Msk                 (1UL << SAU_SFSR_INVIS_Pos)                    /*!< SAU SFSR: INVIS Mask */
+#define PMU_CNTENCLR_CNT5_ENABLE_Pos          5U                                           /*!< PMU CNTENCLR: Event Counter 5 Enable Clear Position */
+#define PMU_CNTENCLR_CNT5_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT5_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 5 Enable Clear Mask */
 
-#define SAU_SFSR_INVEP_Pos                  0U                                            /*!< SAU SFSR: INVEP Position */
-#define SAU_SFSR_INVEP_Msk                 (1UL /*<< SAU_SFSR_INVEP_Pos*/)                /*!< SAU SFSR: INVEP Mask */
+#define PMU_CNTENCLR_CNT6_ENABLE_Pos          6U                                           /*!< PMU CNTENCLR: Event Counter 6 Enable Clear Position */
+#define PMU_CNTENCLR_CNT6_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT6_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 6 Enable Clear Mask */
 
-/*@} end of group CMSIS_SAU */
-#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+#define PMU_CNTENCLR_CNT7_ENABLE_Pos          7U                                           /*!< PMU CNTENCLR: Event Counter 7 Enable Clear Position */
+#define PMU_CNTENCLR_CNT7_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT7_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 7 Enable Clear Mask */
 
+#define PMU_CNTENCLR_CNT8_ENABLE_Pos          8U                                           /*!< PMU CNTENCLR: Event Counter 8 Enable Clear Position */
+#define PMU_CNTENCLR_CNT8_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT8_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 8 Enable Clear Mask */
 
-/**
-  \ingroup  CMSIS_core_register
-  \defgroup CMSIS_FPU     Floating Point Unit (FPU)
-  \brief    Type definitions for the Floating Point Unit (FPU)
-  @{
- */
+#define PMU_CNTENCLR_CNT9_ENABLE_Pos          9U                                           /*!< PMU CNTENCLR: Event Counter 9 Enable Clear Position */
+#define PMU_CNTENCLR_CNT9_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT9_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 9 Enable Clear Mask */
 
-/**
-  \brief  Structure type to access the Floating Point Unit (FPU).
+#define PMU_CNTENCLR_CNT10_ENABLE_Pos         10U                                          /*!< PMU CNTENCLR: Event Counter 10 Enable Clear Position */
+#define PMU_CNTENCLR_CNT10_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT10_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 10 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT11_ENABLE_Pos         11U                                          /*!< PMU CNTENCLR: Event Counter 11 Enable Clear Position */
+#define PMU_CNTENCLR_CNT11_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT11_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 11 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT12_ENABLE_Pos         12U                                          /*!< PMU CNTENCLR: Event Counter 12 Enable Clear Position */
+#define PMU_CNTENCLR_CNT12_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT12_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 12 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT13_ENABLE_Pos         13U                                          /*!< PMU CNTENCLR: Event Counter 13 Enable Clear Position */
+#define PMU_CNTENCLR_CNT13_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT13_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 13 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT14_ENABLE_Pos         14U                                          /*!< PMU CNTENCLR: Event Counter 14 Enable Clear Position */
+#define PMU_CNTENCLR_CNT14_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT14_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 14 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT15_ENABLE_Pos         15U                                          /*!< PMU CNTENCLR: Event Counter 15 Enable Clear Position */
+#define PMU_CNTENCLR_CNT15_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT15_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 15 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT16_ENABLE_Pos         16U                                          /*!< PMU CNTENCLR: Event Counter 16 Enable Clear Position */
+#define PMU_CNTENCLR_CNT16_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT16_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 16 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT17_ENABLE_Pos         17U                                          /*!< PMU CNTENCLR: Event Counter 17 Enable Clear Position */
+#define PMU_CNTENCLR_CNT17_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT17_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 17 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT18_ENABLE_Pos         18U                                          /*!< PMU CNTENCLR: Event Counter 18 Enable Clear Position */
+#define PMU_CNTENCLR_CNT18_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT18_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 18 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT19_ENABLE_Pos         19U                                          /*!< PMU CNTENCLR: Event Counter 19 Enable Clear Position */
+#define PMU_CNTENCLR_CNT19_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT19_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 19 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT20_ENABLE_Pos         20U                                          /*!< PMU CNTENCLR: Event Counter 20 Enable Clear Position */
+#define PMU_CNTENCLR_CNT20_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT20_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 20 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT21_ENABLE_Pos         21U                                          /*!< PMU CNTENCLR: Event Counter 21 Enable Clear Position */
+#define PMU_CNTENCLR_CNT21_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT21_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 21 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT22_ENABLE_Pos         22U                                          /*!< PMU CNTENCLR: Event Counter 22 Enable Clear Position */
+#define PMU_CNTENCLR_CNT22_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT22_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 22 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT23_ENABLE_Pos         23U                                          /*!< PMU CNTENCLR: Event Counter 23 Enable Clear Position */
+#define PMU_CNTENCLR_CNT23_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT23_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 23 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT24_ENABLE_Pos         24U                                          /*!< PMU CNTENCLR: Event Counter 24 Enable Clear Position */
+#define PMU_CNTENCLR_CNT24_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT24_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 24 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT25_ENABLE_Pos         25U                                          /*!< PMU CNTENCLR: Event Counter 25 Enable Clear Position */
+#define PMU_CNTENCLR_CNT25_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT25_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 25 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT26_ENABLE_Pos         26U                                          /*!< PMU CNTENCLR: Event Counter 26 Enable Clear Position */
+#define PMU_CNTENCLR_CNT26_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT26_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 26 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT27_ENABLE_Pos         27U                                          /*!< PMU CNTENCLR: Event Counter 27 Enable Clear Position */
+#define PMU_CNTENCLR_CNT27_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT27_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 27 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT28_ENABLE_Pos         28U                                          /*!< PMU CNTENCLR: Event Counter 28 Enable Clear Position */
+#define PMU_CNTENCLR_CNT28_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT28_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 28 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT29_ENABLE_Pos         29U                                          /*!< PMU CNTENCLR: Event Counter 29 Enable Clear Position */
+#define PMU_CNTENCLR_CNT29_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT29_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 29 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT30_ENABLE_Pos         30U                                          /*!< PMU CNTENCLR: Event Counter 30 Enable Clear Position */
+#define PMU_CNTENCLR_CNT30_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT30_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 30 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CCNTR_ENABLE_Pos         31U                                          /*!< PMU CNTENCLR: Cycle Counter Enable Clear Position */
+#define PMU_CNTENCLR_CCNTR_ENABLE_Msk        (1UL << PMU_CNTENCLR_CCNTR_ENABLE_Pos)        /*!< PMU CNTENCLR: Cycle Counter Enable Clear Mask */
+
+/** \brief PMU Interrupt Enable Set Register Definitions */
+
+#define PMU_INTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU INTENSET: Event Counter 0 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT0_ENABLE_Msk         (1UL /*<< PMU_INTENSET_CNT0_ENABLE_Pos*/)     /*!< PMU INTENSET: Event Counter 0 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT1_ENABLE_Pos          1U                                           /*!< PMU INTENSET: Event Counter 1 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT1_ENABLE_Msk         (1UL << PMU_INTENSET_CNT1_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 1 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT2_ENABLE_Pos          2U                                           /*!< PMU INTENSET: Event Counter 2 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT2_ENABLE_Msk         (1UL << PMU_INTENSET_CNT2_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 2 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT3_ENABLE_Pos          3U                                           /*!< PMU INTENSET: Event Counter 3 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT3_ENABLE_Msk         (1UL << PMU_INTENSET_CNT3_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 3 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT4_ENABLE_Pos          4U                                           /*!< PMU INTENSET: Event Counter 4 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT4_ENABLE_Msk         (1UL << PMU_INTENSET_CNT4_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 4 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT5_ENABLE_Pos          5U                                           /*!< PMU INTENSET: Event Counter 5 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT5_ENABLE_Msk         (1UL << PMU_INTENSET_CNT5_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 5 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT6_ENABLE_Pos          6U                                           /*!< PMU INTENSET: Event Counter 6 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT6_ENABLE_Msk         (1UL << PMU_INTENSET_CNT6_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 6 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT7_ENABLE_Pos          7U                                           /*!< PMU INTENSET: Event Counter 7 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT7_ENABLE_Msk         (1UL << PMU_INTENSET_CNT7_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 7 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT8_ENABLE_Pos          8U                                           /*!< PMU INTENSET: Event Counter 8 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT8_ENABLE_Msk         (1UL << PMU_INTENSET_CNT8_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 8 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT9_ENABLE_Pos          9U                                           /*!< PMU INTENSET: Event Counter 9 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT9_ENABLE_Msk         (1UL << PMU_INTENSET_CNT9_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 9 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT10_ENABLE_Pos         10U                                          /*!< PMU INTENSET: Event Counter 10 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT10_ENABLE_Msk        (1UL << PMU_INTENSET_CNT10_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 10 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT11_ENABLE_Pos         11U                                          /*!< PMU INTENSET: Event Counter 11 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT11_ENABLE_Msk        (1UL << PMU_INTENSET_CNT11_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 11 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT12_ENABLE_Pos         12U                                          /*!< PMU INTENSET: Event Counter 12 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT12_ENABLE_Msk        (1UL << PMU_INTENSET_CNT12_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 12 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT13_ENABLE_Pos         13U                                          /*!< PMU INTENSET: Event Counter 13 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT13_ENABLE_Msk        (1UL << PMU_INTENSET_CNT13_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 13 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT14_ENABLE_Pos         14U                                          /*!< PMU INTENSET: Event Counter 14 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT14_ENABLE_Msk        (1UL << PMU_INTENSET_CNT14_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 14 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT15_ENABLE_Pos         15U                                          /*!< PMU INTENSET: Event Counter 15 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT15_ENABLE_Msk        (1UL << PMU_INTENSET_CNT15_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 15 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT16_ENABLE_Pos         16U                                          /*!< PMU INTENSET: Event Counter 16 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT16_ENABLE_Msk        (1UL << PMU_INTENSET_CNT16_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 16 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT17_ENABLE_Pos         17U                                          /*!< PMU INTENSET: Event Counter 17 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT17_ENABLE_Msk        (1UL << PMU_INTENSET_CNT17_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 17 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT18_ENABLE_Pos         18U                                          /*!< PMU INTENSET: Event Counter 18 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT18_ENABLE_Msk        (1UL << PMU_INTENSET_CNT18_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 18 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT19_ENABLE_Pos         19U                                          /*!< PMU INTENSET: Event Counter 19 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT19_ENABLE_Msk        (1UL << PMU_INTENSET_CNT19_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 19 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT20_ENABLE_Pos         20U                                          /*!< PMU INTENSET: Event Counter 20 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT20_ENABLE_Msk        (1UL << PMU_INTENSET_CNT20_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 20 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT21_ENABLE_Pos         21U                                          /*!< PMU INTENSET: Event Counter 21 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT21_ENABLE_Msk        (1UL << PMU_INTENSET_CNT21_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 21 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT22_ENABLE_Pos         22U                                          /*!< PMU INTENSET: Event Counter 22 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT22_ENABLE_Msk        (1UL << PMU_INTENSET_CNT22_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 22 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT23_ENABLE_Pos         23U                                          /*!< PMU INTENSET: Event Counter 23 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT23_ENABLE_Msk        (1UL << PMU_INTENSET_CNT23_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 23 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT24_ENABLE_Pos         24U                                          /*!< PMU INTENSET: Event Counter 24 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT24_ENABLE_Msk        (1UL << PMU_INTENSET_CNT24_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 24 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT25_ENABLE_Pos         25U                                          /*!< PMU INTENSET: Event Counter 25 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT25_ENABLE_Msk        (1UL << PMU_INTENSET_CNT25_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 25 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT26_ENABLE_Pos         26U                                          /*!< PMU INTENSET: Event Counter 26 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT26_ENABLE_Msk        (1UL << PMU_INTENSET_CNT26_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 26 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT27_ENABLE_Pos         27U                                          /*!< PMU INTENSET: Event Counter 27 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT27_ENABLE_Msk        (1UL << PMU_INTENSET_CNT27_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 27 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT28_ENABLE_Pos         28U                                          /*!< PMU INTENSET: Event Counter 28 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT28_ENABLE_Msk        (1UL << PMU_INTENSET_CNT28_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 28 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT29_ENABLE_Pos         29U                                          /*!< PMU INTENSET: Event Counter 29 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT29_ENABLE_Msk        (1UL << PMU_INTENSET_CNT29_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 29 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT30_ENABLE_Pos         30U                                          /*!< PMU INTENSET: Event Counter 30 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT30_ENABLE_Msk        (1UL << PMU_INTENSET_CNT30_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 30 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CYCCNT_ENABLE_Pos        31U                                          /*!< PMU INTENSET: Cycle Counter Interrupt Enable Set Position */
+#define PMU_INTENSET_CCYCNT_ENABLE_Msk       (1UL << PMU_INTENSET_CYCCNT_ENABLE_Pos)       /*!< PMU INTENSET: Cycle Counter Interrupt Enable Set Mask */
+
+/** \brief PMU Interrupt Enable Clear Register Definitions */
+
+#define PMU_INTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU INTENCLR: Event Counter 0 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT0_ENABLE_Msk         (1UL /*<< PMU_INTENCLR_CNT0_ENABLE_Pos*/)     /*!< PMU INTENCLR: Event Counter 0 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT1_ENABLE_Pos          1U                                           /*!< PMU INTENCLR: Event Counter 1 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT1_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT1_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 1 Interrupt Enable Clear */
+
+#define PMU_INTENCLR_CNT2_ENABLE_Pos          2U                                           /*!< PMU INTENCLR: Event Counter 2 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT2_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT2_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 2 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT3_ENABLE_Pos          3U                                           /*!< PMU INTENCLR: Event Counter 3 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT3_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT3_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 3 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT4_ENABLE_Pos          4U                                           /*!< PMU INTENCLR: Event Counter 4 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT4_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT4_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 4 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT5_ENABLE_Pos          5U                                           /*!< PMU INTENCLR: Event Counter 5 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT5_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT5_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 5 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT6_ENABLE_Pos          6U                                           /*!< PMU INTENCLR: Event Counter 6 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT6_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT6_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 6 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT7_ENABLE_Pos          7U                                           /*!< PMU INTENCLR: Event Counter 7 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT7_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT7_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 7 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT8_ENABLE_Pos          8U                                           /*!< PMU INTENCLR: Event Counter 8 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT8_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT8_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 8 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT9_ENABLE_Pos          9U                                           /*!< PMU INTENCLR: Event Counter 9 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT9_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT9_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 9 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT10_ENABLE_Pos         10U                                          /*!< PMU INTENCLR: Event Counter 10 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT10_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT10_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 10 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT11_ENABLE_Pos         11U                                          /*!< PMU INTENCLR: Event Counter 11 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT11_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT11_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 11 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT12_ENABLE_Pos         12U                                          /*!< PMU INTENCLR: Event Counter 12 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT12_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT12_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 12 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT13_ENABLE_Pos         13U                                          /*!< PMU INTENCLR: Event Counter 13 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT13_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT13_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 13 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT14_ENABLE_Pos         14U                                          /*!< PMU INTENCLR: Event Counter 14 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT14_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT14_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 14 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT15_ENABLE_Pos         15U                                          /*!< PMU INTENCLR: Event Counter 15 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT15_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT15_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 15 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT16_ENABLE_Pos         16U                                          /*!< PMU INTENCLR: Event Counter 16 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT16_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT16_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 16 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT17_ENABLE_Pos         17U                                          /*!< PMU INTENCLR: Event Counter 17 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT17_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT17_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 17 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT18_ENABLE_Pos         18U                                          /*!< PMU INTENCLR: Event Counter 18 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT18_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT18_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 18 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT19_ENABLE_Pos         19U                                          /*!< PMU INTENCLR: Event Counter 19 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT19_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT19_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 19 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT20_ENABLE_Pos         20U                                          /*!< PMU INTENCLR: Event Counter 20 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT20_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT20_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 20 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT21_ENABLE_Pos         21U                                          /*!< PMU INTENCLR: Event Counter 21 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT21_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT21_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 21 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT22_ENABLE_Pos         22U                                          /*!< PMU INTENCLR: Event Counter 22 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT22_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT22_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 22 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT23_ENABLE_Pos         23U                                          /*!< PMU INTENCLR: Event Counter 23 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT23_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT23_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 23 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT24_ENABLE_Pos         24U                                          /*!< PMU INTENCLR: Event Counter 24 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT24_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT24_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 24 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT25_ENABLE_Pos         25U                                          /*!< PMU INTENCLR: Event Counter 25 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT25_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT25_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 25 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT26_ENABLE_Pos         26U                                          /*!< PMU INTENCLR: Event Counter 26 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT26_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT26_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 26 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT27_ENABLE_Pos         27U                                          /*!< PMU INTENCLR: Event Counter 27 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT27_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT27_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 27 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT28_ENABLE_Pos         28U                                          /*!< PMU INTENCLR: Event Counter 28 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT28_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT28_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 28 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT29_ENABLE_Pos         29U                                          /*!< PMU INTENCLR: Event Counter 29 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT29_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT29_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 29 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT30_ENABLE_Pos         30U                                          /*!< PMU INTENCLR: Event Counter 30 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT30_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT30_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 30 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CYCCNT_ENABLE_Pos        31U                                          /*!< PMU INTENCLR: Cycle Counter Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CYCCNT_ENABLE_Msk       (1UL << PMU_INTENCLR_CYCCNT_ENABLE_Pos)       /*!< PMU INTENCLR: Cycle Counter Interrupt Enable Clear Mask */
+
+/** \brief PMU Overflow Flag Status Set Register Definitions */
+
+#define PMU_OVSSET_CNT0_STATUS_Pos            0U                                           /*!< PMU OVSSET: Event Counter 0 Overflow Set Position */
+#define PMU_OVSSET_CNT0_STATUS_Msk           (1UL /*<< PMU_OVSSET_CNT0_STATUS_Pos*/)       /*!< PMU OVSSET: Event Counter 0 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT1_STATUS_Pos            1U                                           /*!< PMU OVSSET: Event Counter 1 Overflow Set Position */
+#define PMU_OVSSET_CNT1_STATUS_Msk           (1UL << PMU_OVSSET_CNT1_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 1 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT2_STATUS_Pos            2U                                           /*!< PMU OVSSET: Event Counter 2 Overflow Set Position */
+#define PMU_OVSSET_CNT2_STATUS_Msk           (1UL << PMU_OVSSET_CNT2_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 2 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT3_STATUS_Pos            3U                                           /*!< PMU OVSSET: Event Counter 3 Overflow Set Position */
+#define PMU_OVSSET_CNT3_STATUS_Msk           (1UL << PMU_OVSSET_CNT3_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 3 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT4_STATUS_Pos            4U                                           /*!< PMU OVSSET: Event Counter 4 Overflow Set Position */
+#define PMU_OVSSET_CNT4_STATUS_Msk           (1UL << PMU_OVSSET_CNT4_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 4 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT5_STATUS_Pos            5U                                           /*!< PMU OVSSET: Event Counter 5 Overflow Set Position */
+#define PMU_OVSSET_CNT5_STATUS_Msk           (1UL << PMU_OVSSET_CNT5_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 5 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT6_STATUS_Pos            6U                                           /*!< PMU OVSSET: Event Counter 6 Overflow Set Position */
+#define PMU_OVSSET_CNT6_STATUS_Msk           (1UL << PMU_OVSSET_CNT6_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 6 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT7_STATUS_Pos            7U                                           /*!< PMU OVSSET: Event Counter 7 Overflow Set Position */
+#define PMU_OVSSET_CNT7_STATUS_Msk           (1UL << PMU_OVSSET_CNT7_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 7 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT8_STATUS_Pos            8U                                           /*!< PMU OVSSET: Event Counter 8 Overflow Set Position */
+#define PMU_OVSSET_CNT8_STATUS_Msk           (1UL << PMU_OVSSET_CNT8_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 8 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT9_STATUS_Pos            9U                                           /*!< PMU OVSSET: Event Counter 9 Overflow Set Position */
+#define PMU_OVSSET_CNT9_STATUS_Msk           (1UL << PMU_OVSSET_CNT9_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 9 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT10_STATUS_Pos           10U                                          /*!< PMU OVSSET: Event Counter 10 Overflow Set Position */
+#define PMU_OVSSET_CNT10_STATUS_Msk          (1UL << PMU_OVSSET_CNT10_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 10 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT11_STATUS_Pos           11U                                          /*!< PMU OVSSET: Event Counter 11 Overflow Set Position */
+#define PMU_OVSSET_CNT11_STATUS_Msk          (1UL << PMU_OVSSET_CNT11_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 11 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT12_STATUS_Pos           12U                                          /*!< PMU OVSSET: Event Counter 12 Overflow Set Position */
+#define PMU_OVSSET_CNT12_STATUS_Msk          (1UL << PMU_OVSSET_CNT12_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 12 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT13_STATUS_Pos           13U                                          /*!< PMU OVSSET: Event Counter 13 Overflow Set Position */
+#define PMU_OVSSET_CNT13_STATUS_Msk          (1UL << PMU_OVSSET_CNT13_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 13 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT14_STATUS_Pos           14U                                          /*!< PMU OVSSET: Event Counter 14 Overflow Set Position */
+#define PMU_OVSSET_CNT14_STATUS_Msk          (1UL << PMU_OVSSET_CNT14_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 14 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT15_STATUS_Pos           15U                                          /*!< PMU OVSSET: Event Counter 15 Overflow Set Position */
+#define PMU_OVSSET_CNT15_STATUS_Msk          (1UL << PMU_OVSSET_CNT15_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 15 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT16_STATUS_Pos           16U                                          /*!< PMU OVSSET: Event Counter 16 Overflow Set Position */
+#define PMU_OVSSET_CNT16_STATUS_Msk          (1UL << PMU_OVSSET_CNT16_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 16 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT17_STATUS_Pos           17U                                          /*!< PMU OVSSET: Event Counter 17 Overflow Set Position */
+#define PMU_OVSSET_CNT17_STATUS_Msk          (1UL << PMU_OVSSET_CNT17_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 17 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT18_STATUS_Pos           18U                                          /*!< PMU OVSSET: Event Counter 18 Overflow Set Position */
+#define PMU_OVSSET_CNT18_STATUS_Msk          (1UL << PMU_OVSSET_CNT18_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 18 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT19_STATUS_Pos           19U                                          /*!< PMU OVSSET: Event Counter 19 Overflow Set Position */
+#define PMU_OVSSET_CNT19_STATUS_Msk          (1UL << PMU_OVSSET_CNT19_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 19 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT20_STATUS_Pos           20U                                          /*!< PMU OVSSET: Event Counter 20 Overflow Set Position */
+#define PMU_OVSSET_CNT20_STATUS_Msk          (1UL << PMU_OVSSET_CNT20_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 20 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT21_STATUS_Pos           21U                                          /*!< PMU OVSSET: Event Counter 21 Overflow Set Position */
+#define PMU_OVSSET_CNT21_STATUS_Msk          (1UL << PMU_OVSSET_CNT21_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 21 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT22_STATUS_Pos           22U                                          /*!< PMU OVSSET: Event Counter 22 Overflow Set Position */
+#define PMU_OVSSET_CNT22_STATUS_Msk          (1UL << PMU_OVSSET_CNT22_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 22 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT23_STATUS_Pos           23U                                          /*!< PMU OVSSET: Event Counter 23 Overflow Set Position */
+#define PMU_OVSSET_CNT23_STATUS_Msk          (1UL << PMU_OVSSET_CNT23_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 23 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT24_STATUS_Pos           24U                                          /*!< PMU OVSSET: Event Counter 24 Overflow Set Position */
+#define PMU_OVSSET_CNT24_STATUS_Msk          (1UL << PMU_OVSSET_CNT24_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 24 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT25_STATUS_Pos           25U                                          /*!< PMU OVSSET: Event Counter 25 Overflow Set Position */
+#define PMU_OVSSET_CNT25_STATUS_Msk          (1UL << PMU_OVSSET_CNT25_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 25 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT26_STATUS_Pos           26U                                          /*!< PMU OVSSET: Event Counter 26 Overflow Set Position */
+#define PMU_OVSSET_CNT26_STATUS_Msk          (1UL << PMU_OVSSET_CNT26_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 26 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT27_STATUS_Pos           27U                                          /*!< PMU OVSSET: Event Counter 27 Overflow Set Position */
+#define PMU_OVSSET_CNT27_STATUS_Msk          (1UL << PMU_OVSSET_CNT27_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 27 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT28_STATUS_Pos           28U                                          /*!< PMU OVSSET: Event Counter 28 Overflow Set Position */
+#define PMU_OVSSET_CNT28_STATUS_Msk          (1UL << PMU_OVSSET_CNT28_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 28 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT29_STATUS_Pos           29U                                          /*!< PMU OVSSET: Event Counter 29 Overflow Set Position */
+#define PMU_OVSSET_CNT29_STATUS_Msk          (1UL << PMU_OVSSET_CNT29_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 29 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT30_STATUS_Pos           30U                                          /*!< PMU OVSSET: Event Counter 30 Overflow Set Position */
+#define PMU_OVSSET_CNT30_STATUS_Msk          (1UL << PMU_OVSSET_CNT30_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 30 Overflow Set Mask */
+
+#define PMU_OVSSET_CYCCNT_STATUS_Pos          31U                                          /*!< PMU OVSSET: Cycle Counter Overflow Set Position */
+#define PMU_OVSSET_CYCCNT_STATUS_Msk         (1UL << PMU_OVSSET_CYCCNT_STATUS_Pos)         /*!< PMU OVSSET: Cycle Counter Overflow Set Mask */
+
+/** \brief PMU Overflow Flag Status Clear Register Definitions */
+
+#define PMU_OVSCLR_CNT0_STATUS_Pos            0U                                           /*!< PMU OVSCLR: Event Counter 0 Overflow Clear Position */
+#define PMU_OVSCLR_CNT0_STATUS_Msk           (1UL /*<< PMU_OVSCLR_CNT0_STATUS_Pos*/)       /*!< PMU OVSCLR: Event Counter 0 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT1_STATUS_Pos            1U                                           /*!< PMU OVSCLR: Event Counter 1 Overflow Clear Position */
+#define PMU_OVSCLR_CNT1_STATUS_Msk           (1UL << PMU_OVSCLR_CNT1_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 1 Overflow Clear */
+
+#define PMU_OVSCLR_CNT2_STATUS_Pos            2U                                           /*!< PMU OVSCLR: Event Counter 2 Overflow Clear Position */
+#define PMU_OVSCLR_CNT2_STATUS_Msk           (1UL << PMU_OVSCLR_CNT2_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 2 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT3_STATUS_Pos            3U                                           /*!< PMU OVSCLR: Event Counter 3 Overflow Clear Position */
+#define PMU_OVSCLR_CNT3_STATUS_Msk           (1UL << PMU_OVSCLR_CNT3_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 3 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT4_STATUS_Pos            4U                                           /*!< PMU OVSCLR: Event Counter 4 Overflow Clear Position */
+#define PMU_OVSCLR_CNT4_STATUS_Msk           (1UL << PMU_OVSCLR_CNT4_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 4 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT5_STATUS_Pos            5U                                           /*!< PMU OVSCLR: Event Counter 5 Overflow Clear Position */
+#define PMU_OVSCLR_CNT5_STATUS_Msk           (1UL << PMU_OVSCLR_CNT5_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 5 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT6_STATUS_Pos            6U                                           /*!< PMU OVSCLR: Event Counter 6 Overflow Clear Position */
+#define PMU_OVSCLR_CNT6_STATUS_Msk           (1UL << PMU_OVSCLR_CNT6_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 6 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT7_STATUS_Pos            7U                                           /*!< PMU OVSCLR: Event Counter 7 Overflow Clear Position */
+#define PMU_OVSCLR_CNT7_STATUS_Msk           (1UL << PMU_OVSCLR_CNT7_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 7 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT8_STATUS_Pos            8U                                           /*!< PMU OVSCLR: Event Counter 8 Overflow Clear Position */
+#define PMU_OVSCLR_CNT8_STATUS_Msk           (1UL << PMU_OVSCLR_CNT8_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 8 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT9_STATUS_Pos            9U                                           /*!< PMU OVSCLR: Event Counter 9 Overflow Clear Position */
+#define PMU_OVSCLR_CNT9_STATUS_Msk           (1UL << PMU_OVSCLR_CNT9_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 9 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT10_STATUS_Pos           10U                                          /*!< PMU OVSCLR: Event Counter 10 Overflow Clear Position */
+#define PMU_OVSCLR_CNT10_STATUS_Msk          (1UL << PMU_OVSCLR_CNT10_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 10 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT11_STATUS_Pos           11U                                          /*!< PMU OVSCLR: Event Counter 11 Overflow Clear Position */
+#define PMU_OVSCLR_CNT11_STATUS_Msk          (1UL << PMU_OVSCLR_CNT11_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 11 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT12_STATUS_Pos           12U                                          /*!< PMU OVSCLR: Event Counter 12 Overflow Clear Position */
+#define PMU_OVSCLR_CNT12_STATUS_Msk          (1UL << PMU_OVSCLR_CNT12_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 12 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT13_STATUS_Pos           13U                                          /*!< PMU OVSCLR: Event Counter 13 Overflow Clear Position */
+#define PMU_OVSCLR_CNT13_STATUS_Msk          (1UL << PMU_OVSCLR_CNT13_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 13 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT14_STATUS_Pos           14U                                          /*!< PMU OVSCLR: Event Counter 14 Overflow Clear Position */
+#define PMU_OVSCLR_CNT14_STATUS_Msk          (1UL << PMU_OVSCLR_CNT14_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 14 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT15_STATUS_Pos           15U                                          /*!< PMU OVSCLR: Event Counter 15 Overflow Clear Position */
+#define PMU_OVSCLR_CNT15_STATUS_Msk          (1UL << PMU_OVSCLR_CNT15_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 15 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT16_STATUS_Pos           16U                                          /*!< PMU OVSCLR: Event Counter 16 Overflow Clear Position */
+#define PMU_OVSCLR_CNT16_STATUS_Msk          (1UL << PMU_OVSCLR_CNT16_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 16 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT17_STATUS_Pos           17U                                          /*!< PMU OVSCLR: Event Counter 17 Overflow Clear Position */
+#define PMU_OVSCLR_CNT17_STATUS_Msk          (1UL << PMU_OVSCLR_CNT17_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 17 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT18_STATUS_Pos           18U                                          /*!< PMU OVSCLR: Event Counter 18 Overflow Clear Position */
+#define PMU_OVSCLR_CNT18_STATUS_Msk          (1UL << PMU_OVSCLR_CNT18_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 18 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT19_STATUS_Pos           19U                                          /*!< PMU OVSCLR: Event Counter 19 Overflow Clear Position */
+#define PMU_OVSCLR_CNT19_STATUS_Msk          (1UL << PMU_OVSCLR_CNT19_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 19 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT20_STATUS_Pos           20U                                          /*!< PMU OVSCLR: Event Counter 20 Overflow Clear Position */
+#define PMU_OVSCLR_CNT20_STATUS_Msk          (1UL << PMU_OVSCLR_CNT20_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 20 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT21_STATUS_Pos           21U                                          /*!< PMU OVSCLR: Event Counter 21 Overflow Clear Position */
+#define PMU_OVSCLR_CNT21_STATUS_Msk          (1UL << PMU_OVSCLR_CNT21_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 21 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT22_STATUS_Pos           22U                                          /*!< PMU OVSCLR: Event Counter 22 Overflow Clear Position */
+#define PMU_OVSCLR_CNT22_STATUS_Msk          (1UL << PMU_OVSCLR_CNT22_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 22 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT23_STATUS_Pos           23U                                          /*!< PMU OVSCLR: Event Counter 23 Overflow Clear Position */
+#define PMU_OVSCLR_CNT23_STATUS_Msk          (1UL << PMU_OVSCLR_CNT23_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 23 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT24_STATUS_Pos           24U                                          /*!< PMU OVSCLR: Event Counter 24 Overflow Clear Position */
+#define PMU_OVSCLR_CNT24_STATUS_Msk          (1UL << PMU_OVSCLR_CNT24_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 24 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT25_STATUS_Pos           25U                                          /*!< PMU OVSCLR: Event Counter 25 Overflow Clear Position */
+#define PMU_OVSCLR_CNT25_STATUS_Msk          (1UL << PMU_OVSCLR_CNT25_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 25 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT26_STATUS_Pos           26U                                          /*!< PMU OVSCLR: Event Counter 26 Overflow Clear Position */
+#define PMU_OVSCLR_CNT26_STATUS_Msk          (1UL << PMU_OVSCLR_CNT26_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 26 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT27_STATUS_Pos           27U                                          /*!< PMU OVSCLR: Event Counter 27 Overflow Clear Position */
+#define PMU_OVSCLR_CNT27_STATUS_Msk          (1UL << PMU_OVSCLR_CNT27_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 27 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT28_STATUS_Pos           28U                                          /*!< PMU OVSCLR: Event Counter 28 Overflow Clear Position */
+#define PMU_OVSCLR_CNT28_STATUS_Msk          (1UL << PMU_OVSCLR_CNT28_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 28 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT29_STATUS_Pos           29U                                          /*!< PMU OVSCLR: Event Counter 29 Overflow Clear Position */
+#define PMU_OVSCLR_CNT29_STATUS_Msk          (1UL << PMU_OVSCLR_CNT29_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 29 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT30_STATUS_Pos           30U                                          /*!< PMU OVSCLR: Event Counter 30 Overflow Clear Position */
+#define PMU_OVSCLR_CNT30_STATUS_Msk          (1UL << PMU_OVSCLR_CNT30_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 30 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CYCCNT_STATUS_Pos          31U                                          /*!< PMU OVSCLR: Cycle Counter Overflow Clear Position */
+#define PMU_OVSCLR_CYCCNT_STATUS_Msk         (1UL << PMU_OVSCLR_CYCCNT_STATUS_Pos)         /*!< PMU OVSCLR: Cycle Counter Overflow Clear Mask */
+
+/** \brief PMU Software Increment Counter */
+
+#define PMU_SWINC_CNT0_Pos                    0U                                           /*!< PMU SWINC: Event Counter 0 Software Increment Position */
+#define PMU_SWINC_CNT0_Msk                   (1UL /*<< PMU_SWINC_CNT0_Pos */)              /*!< PMU SWINC: Event Counter 0 Software Increment Mask */
+
+#define PMU_SWINC_CNT1_Pos                    1U                                           /*!< PMU SWINC: Event Counter 1 Software Increment Position */
+#define PMU_SWINC_CNT1_Msk                   (1UL << PMU_SWINC_CNT1_Pos)                   /*!< PMU SWINC: Event Counter 1 Software Increment Mask */
+
+#define PMU_SWINC_CNT2_Pos                    2U                                           /*!< PMU SWINC: Event Counter 2 Software Increment Position */
+#define PMU_SWINC_CNT2_Msk                   (1UL << PMU_SWINC_CNT2_Pos)                   /*!< PMU SWINC: Event Counter 2 Software Increment Mask */
+
+#define PMU_SWINC_CNT3_Pos                    3U                                           /*!< PMU SWINC: Event Counter 3 Software Increment Position */
+#define PMU_SWINC_CNT3_Msk                   (1UL << PMU_SWINC_CNT3_Pos)                   /*!< PMU SWINC: Event Counter 3 Software Increment Mask */
+
+#define PMU_SWINC_CNT4_Pos                    4U                                           /*!< PMU SWINC: Event Counter 4 Software Increment Position */
+#define PMU_SWINC_CNT4_Msk                   (1UL << PMU_SWINC_CNT4_Pos)                   /*!< PMU SWINC: Event Counter 4 Software Increment Mask */
+
+#define PMU_SWINC_CNT5_Pos                    5U                                           /*!< PMU SWINC: Event Counter 5 Software Increment Position */
+#define PMU_SWINC_CNT5_Msk                   (1UL << PMU_SWINC_CNT5_Pos)                   /*!< PMU SWINC: Event Counter 5 Software Increment Mask */
+
+#define PMU_SWINC_CNT6_Pos                    6U                                           /*!< PMU SWINC: Event Counter 6 Software Increment Position */
+#define PMU_SWINC_CNT6_Msk                   (1UL << PMU_SWINC_CNT6_Pos)                   /*!< PMU SWINC: Event Counter 6 Software Increment Mask */
+
+#define PMU_SWINC_CNT7_Pos                    7U                                           /*!< PMU SWINC: Event Counter 7 Software Increment Position */
+#define PMU_SWINC_CNT7_Msk                   (1UL << PMU_SWINC_CNT7_Pos)                   /*!< PMU SWINC: Event Counter 7 Software Increment Mask */
+
+#define PMU_SWINC_CNT8_Pos                    8U                                           /*!< PMU SWINC: Event Counter 8 Software Increment Position */
+#define PMU_SWINC_CNT8_Msk                   (1UL << PMU_SWINC_CNT8_Pos)                   /*!< PMU SWINC: Event Counter 8 Software Increment Mask */
+
+#define PMU_SWINC_CNT9_Pos                    9U                                           /*!< PMU SWINC: Event Counter 9 Software Increment Position */
+#define PMU_SWINC_CNT9_Msk                   (1UL << PMU_SWINC_CNT9_Pos)                   /*!< PMU SWINC: Event Counter 9 Software Increment Mask */
+
+#define PMU_SWINC_CNT10_Pos                   10U                                          /*!< PMU SWINC: Event Counter 10 Software Increment Position */
+#define PMU_SWINC_CNT10_Msk                  (1UL << PMU_SWINC_CNT10_Pos)                  /*!< PMU SWINC: Event Counter 10 Software Increment Mask */
+
+#define PMU_SWINC_CNT11_Pos                   11U                                          /*!< PMU SWINC: Event Counter 11 Software Increment Position */
+#define PMU_SWINC_CNT11_Msk                  (1UL << PMU_SWINC_CNT11_Pos)                  /*!< PMU SWINC: Event Counter 11 Software Increment Mask */
+
+#define PMU_SWINC_CNT12_Pos                   12U                                          /*!< PMU SWINC: Event Counter 12 Software Increment Position */
+#define PMU_SWINC_CNT12_Msk                  (1UL << PMU_SWINC_CNT12_Pos)                  /*!< PMU SWINC: Event Counter 12 Software Increment Mask */
+
+#define PMU_SWINC_CNT13_Pos                   13U                                          /*!< PMU SWINC: Event Counter 13 Software Increment Position */
+#define PMU_SWINC_CNT13_Msk                  (1UL << PMU_SWINC_CNT13_Pos)                  /*!< PMU SWINC: Event Counter 13 Software Increment Mask */
+
+#define PMU_SWINC_CNT14_Pos                   14U                                          /*!< PMU SWINC: Event Counter 14 Software Increment Position */
+#define PMU_SWINC_CNT14_Msk                  (1UL << PMU_SWINC_CNT14_Pos)                  /*!< PMU SWINC: Event Counter 14 Software Increment Mask */
+
+#define PMU_SWINC_CNT15_Pos                   15U                                          /*!< PMU SWINC: Event Counter 15 Software Increment Position */
+#define PMU_SWINC_CNT15_Msk                  (1UL << PMU_SWINC_CNT15_Pos)                  /*!< PMU SWINC: Event Counter 15 Software Increment Mask */
+
+#define PMU_SWINC_CNT16_Pos                   16U                                          /*!< PMU SWINC: Event Counter 16 Software Increment Position */
+#define PMU_SWINC_CNT16_Msk                  (1UL << PMU_SWINC_CNT16_Pos)                  /*!< PMU SWINC: Event Counter 16 Software Increment Mask */
+
+#define PMU_SWINC_CNT17_Pos                   17U                                          /*!< PMU SWINC: Event Counter 17 Software Increment Position */
+#define PMU_SWINC_CNT17_Msk                  (1UL << PMU_SWINC_CNT17_Pos)                  /*!< PMU SWINC: Event Counter 17 Software Increment Mask */
+
+#define PMU_SWINC_CNT18_Pos                   18U                                          /*!< PMU SWINC: Event Counter 18 Software Increment Position */
+#define PMU_SWINC_CNT18_Msk                  (1UL << PMU_SWINC_CNT18_Pos)                  /*!< PMU SWINC: Event Counter 18 Software Increment Mask */
+
+#define PMU_SWINC_CNT19_Pos                   19U                                          /*!< PMU SWINC: Event Counter 19 Software Increment Position */
+#define PMU_SWINC_CNT19_Msk                  (1UL << PMU_SWINC_CNT19_Pos)                  /*!< PMU SWINC: Event Counter 19 Software Increment Mask */
+
+#define PMU_SWINC_CNT20_Pos                   20U                                          /*!< PMU SWINC: Event Counter 20 Software Increment Position */
+#define PMU_SWINC_CNT20_Msk                  (1UL << PMU_SWINC_CNT20_Pos)                  /*!< PMU SWINC: Event Counter 20 Software Increment Mask */
+
+#define PMU_SWINC_CNT21_Pos                   21U                                          /*!< PMU SWINC: Event Counter 21 Software Increment Position */
+#define PMU_SWINC_CNT21_Msk                  (1UL << PMU_SWINC_CNT21_Pos)                  /*!< PMU SWINC: Event Counter 21 Software Increment Mask */
+
+#define PMU_SWINC_CNT22_Pos                   22U                                          /*!< PMU SWINC: Event Counter 22 Software Increment Position */
+#define PMU_SWINC_CNT22_Msk                  (1UL << PMU_SWINC_CNT22_Pos)                  /*!< PMU SWINC: Event Counter 22 Software Increment Mask */
+
+#define PMU_SWINC_CNT23_Pos                   23U                                          /*!< PMU SWINC: Event Counter 23 Software Increment Position */
+#define PMU_SWINC_CNT23_Msk                  (1UL << PMU_SWINC_CNT23_Pos)                  /*!< PMU SWINC: Event Counter 23 Software Increment Mask */
+
+#define PMU_SWINC_CNT24_Pos                   24U                                          /*!< PMU SWINC: Event Counter 24 Software Increment Position */
+#define PMU_SWINC_CNT24_Msk                  (1UL << PMU_SWINC_CNT24_Pos)                  /*!< PMU SWINC: Event Counter 24 Software Increment Mask */
+
+#define PMU_SWINC_CNT25_Pos                   25U                                          /*!< PMU SWINC: Event Counter 25 Software Increment Position */
+#define PMU_SWINC_CNT25_Msk                  (1UL << PMU_SWINC_CNT25_Pos)                  /*!< PMU SWINC: Event Counter 25 Software Increment Mask */
+
+#define PMU_SWINC_CNT26_Pos                   26U                                          /*!< PMU SWINC: Event Counter 26 Software Increment Position */
+#define PMU_SWINC_CNT26_Msk                  (1UL << PMU_SWINC_CNT26_Pos)                  /*!< PMU SWINC: Event Counter 26 Software Increment Mask */
+
+#define PMU_SWINC_CNT27_Pos                   27U                                          /*!< PMU SWINC: Event Counter 27 Software Increment Position */
+#define PMU_SWINC_CNT27_Msk                  (1UL << PMU_SWINC_CNT27_Pos)                  /*!< PMU SWINC: Event Counter 27 Software Increment Mask */
+
+#define PMU_SWINC_CNT28_Pos                   28U                                          /*!< PMU SWINC: Event Counter 28 Software Increment Position */
+#define PMU_SWINC_CNT28_Msk                  (1UL << PMU_SWINC_CNT28_Pos)                  /*!< PMU SWINC: Event Counter 28 Software Increment Mask */
+
+#define PMU_SWINC_CNT29_Pos                   29U                                          /*!< PMU SWINC: Event Counter 29 Software Increment Position */
+#define PMU_SWINC_CNT29_Msk                  (1UL << PMU_SWINC_CNT29_Pos)                  /*!< PMU SWINC: Event Counter 29 Software Increment Mask */
+
+#define PMU_SWINC_CNT30_Pos                   30U                                          /*!< PMU SWINC: Event Counter 30 Software Increment Position */
+#define PMU_SWINC_CNT30_Msk                  (1UL << PMU_SWINC_CNT30_Pos)                  /*!< PMU SWINC: Event Counter 30 Software Increment Mask */
+
+/** \brief PMU Control Register Definitions */
+
+#define PMU_CTRL_ENABLE_Pos                   0U                                           /*!< PMU CTRL: ENABLE Position */
+#define PMU_CTRL_ENABLE_Msk                  (1UL /*<< PMU_CTRL_ENABLE_Pos*/)              /*!< PMU CTRL: ENABLE Mask */
+
+#define PMU_CTRL_EVENTCNT_RESET_Pos           1U                                           /*!< PMU CTRL: Event Counter Reset Position */
+#define PMU_CTRL_EVENTCNT_RESET_Msk          (1UL << PMU_CTRL_EVENTCNT_RESET_Pos)          /*!< PMU CTRL: Event Counter Reset Mask */
+
+#define PMU_CTRL_CYCCNT_RESET_Pos             2U                                           /*!< PMU CTRL: Cycle Counter Reset Position */
+#define PMU_CTRL_CYCCNT_RESET_Msk            (1UL << PMU_CTRL_CYCCNT_RESET_Pos)            /*!< PMU CTRL: Cycle Counter Reset Mask */
+
+#define PMU_CTRL_CYCCNT_DISABLE_Pos           5U                                           /*!< PMU CTRL: Disable Cycle Counter Position */
+#define PMU_CTRL_CYCCNT_DISABLE_Msk          (1UL << PMU_CTRL_CYCCNT_DISABLE_Pos)          /*!< PMU CTRL: Disable Cycle Counter Mask */
+
+#define PMU_CTRL_FRZ_ON_OV_Pos                9U                                           /*!< PMU CTRL: Freeze-on-overflow Position */
+#define PMU_CTRL_FRZ_ON_OV_Msk               (1UL << PMU_CTRL_FRZ_ON_OVERFLOW_Pos)         /*!< PMU CTRL: Freeze-on-overflow Mask */
+
+#define PMU_CTRL_TRACE_ON_OV_Pos              11U                                          /*!< PMU CTRL: Trace-on-overflow Position */
+#define PMU_CTRL_TRACE_ON_OV_Msk             (1UL << PMU_CTRL_TRACE_ON_OVERFLOW_Pos)       /*!< PMU CTRL: Trace-on-overflow Mask */
+
+/** \brief PMU Type Register Definitions */
+
+#define PMU_TYPE_NUM_CNTS_Pos                 0U                                           /*!< PMU TYPE: Number of Counters Position */
+#define PMU_TYPE_NUM_CNTS_Msk                (0xFFUL /*<< PMU_TYPE_NUM_CNTS_Pos*/)         /*!< PMU TYPE: Number of Counters Mask */
+
+#define PMU_TYPE_SIZE_CNTS_Pos                8U                                           /*!< PMU TYPE: Size of Counters Position */
+#define PMU_TYPE_SIZE_CNTS_Msk               (0x3FUL << PMU_TYPE_SIZE_CNTS_Pos)            /*!< PMU TYPE: Size of Counters Mask */
+
+#define PMU_TYPE_CYCCNT_PRESENT_Pos           14U                                          /*!< PMU TYPE: Cycle Counter Present Position */
+#define PMU_TYPE_CYCCNT_PRESENT_Msk          (1UL << PMU_TYPE_CYCCNT_PRESENT_Pos)          /*!< PMU TYPE: Cycle Counter Present Mask */
+
+#define PMU_TYPE_FRZ_OV_SUPPORT_Pos           21U                                          /*!< PMU TYPE: Freeze-on-overflow Support Position */
+#define PMU_TYPE_FRZ_OV_SUPPORT_Msk          (1UL << PMU_TYPE_FRZ_OV_SUPPORT_Pos)          /*!< PMU TYPE: Freeze-on-overflow Support Mask */
+
+#define PMU_TYPE_TRACE_ON_OV_SUPPORT_Pos      23U                                          /*!< PMU TYPE: Trace-on-overflow Support Position */
+#define PMU_TYPE_TRACE_ON_OV_SUPPORT_Msk     (1UL << PMU_TYPE_FRZ_OV_SUPPORT_Pos)          /*!< PMU TYPE: Trace-on-overflow Support Mask */
+
+/** \brief PMU Authentication Status Register Definitions */
+
+#define PMU_AUTHSTATUS_NSID_Pos               0U                                           /*!< PMU AUTHSTATUS: Non-secure Invasive Debug Position */
+#define PMU_AUTHSTATUS_NSID_Msk              (0x3UL /*<< PMU_AUTHSTATUS_NSID_Pos*/)        /*!< PMU AUTHSTATUS: Non-secure Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSNID_Pos              2U                                           /*!< PMU AUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_NSNID_Msk             (0x3UL << PMU_AUTHSTATUS_NSNID_Pos)           /*!< PMU AUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SID_Pos                4U                                           /*!< PMU AUTHSTATUS: Secure Invasive Debug Position */
+#define PMU_AUTHSTATUS_SID_Msk               (0x3UL << PMU_AUTHSTATUS_SID_Pos)             /*!< PMU AUTHSTATUS: Secure Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SNID_Pos               6U                                           /*!< PMU AUTHSTATUS: Secure Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_SNID_Msk              (0x3UL << PMU_AUTHSTATUS_SNID_Pos)            /*!< PMU AUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSUID_Pos              16U                                          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Invasive Debug Position */
+#define PMU_AUTHSTATUS_NSUID_Msk             (0x3UL << PMU_AUTHSTATUS_NSUID_Pos)           /*!< PMU AUTHSTATUS: Non-secure Unprivileged Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSUNID_Pos             18U                                          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_NSUNID_Msk            (0x3UL << PMU_AUTHSTATUS_NSUNID_Pos)          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SUID_Pos               20U                                          /*!< PMU AUTHSTATUS: Secure Unprivileged Invasive Debug Position */
+#define PMU_AUTHSTATUS_SUID_Msk              (0x3UL << PMU_AUTHSTATUS_SUID_Pos)            /*!< PMU AUTHSTATUS: Secure Unprivileged Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SUNID_Pos              22U                                          /*!< PMU AUTHSTATUS: Secure Unprivileged Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_SUNID_Msk             (0x3UL << PMU_AUTHSTATUS_SUNID_Pos)           /*!< PMU AUTHSTATUS: Secure Unprivileged Non-invasive Debug Mask */
+
+/*@} end of group CMSIS_PMU */
+#endif
+
+#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_MPU     Memory Protection Unit (MPU)
+  \brief    Type definitions for the Memory Protection Unit (MPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Memory Protection Unit (MPU).
+ */
+typedef struct
+{
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x000 (R/ )  MPU Type Register */
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x004 (R/W)  MPU Control Register */
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  MPU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  MPU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  MPU Region Limit Address Register */
+  __IOM uint32_t RBAR_A1;                /*!< Offset: 0x014 (R/W)  MPU Region Base Address Register Alias 1 */
+  __IOM uint32_t RLAR_A1;                /*!< Offset: 0x018 (R/W)  MPU Region Limit Address Register Alias 1 */
+  __IOM uint32_t RBAR_A2;                /*!< Offset: 0x01C (R/W)  MPU Region Base Address Register Alias 2 */
+  __IOM uint32_t RLAR_A2;                /*!< Offset: 0x020 (R/W)  MPU Region Limit Address Register Alias 2 */
+  __IOM uint32_t RBAR_A3;                /*!< Offset: 0x024 (R/W)  MPU Region Base Address Register Alias 3 */
+  __IOM uint32_t RLAR_A3;                /*!< Offset: 0x028 (R/W)  MPU Region Limit Address Register Alias 3 */
+        uint32_t RESERVED0[1];
+  union {
+  __IOM uint32_t MAIR[2];
+  struct {
+  __IOM uint32_t MAIR0;                  /*!< Offset: 0x030 (R/W)  MPU Memory Attribute Indirection Register 0 */
+  __IOM uint32_t MAIR1;                  /*!< Offset: 0x034 (R/W)  MPU Memory Attribute Indirection Register 1 */
+  };
+  };
+} MPU_Type;
+
+#define MPU_TYPE_RALIASES                  4U
+
+/* MPU Type Register Definitions */
+#define MPU_TYPE_IREGION_Pos               16U                                            /*!< MPU TYPE: IREGION Position */
+#define MPU_TYPE_IREGION_Msk               (0xFFUL << MPU_TYPE_IREGION_Pos)               /*!< MPU TYPE: IREGION Mask */
+
+#define MPU_TYPE_DREGION_Pos                8U                                            /*!< MPU TYPE: DREGION Position */
+#define MPU_TYPE_DREGION_Msk               (0xFFUL << MPU_TYPE_DREGION_Pos)               /*!< MPU TYPE: DREGION Mask */
+
+#define MPU_TYPE_SEPARATE_Pos               0U                                            /*!< MPU TYPE: SEPARATE Position */
+#define MPU_TYPE_SEPARATE_Msk              (1UL /*<< MPU_TYPE_SEPARATE_Pos*/)             /*!< MPU TYPE: SEPARATE Mask */
+
+/* MPU Control Register Definitions */
+#define MPU_CTRL_PRIVDEFENA_Pos             2U                                            /*!< MPU CTRL: PRIVDEFENA Position */
+#define MPU_CTRL_PRIVDEFENA_Msk            (1UL << MPU_CTRL_PRIVDEFENA_Pos)               /*!< MPU CTRL: PRIVDEFENA Mask */
+
+#define MPU_CTRL_HFNMIENA_Pos               1U                                            /*!< MPU CTRL: HFNMIENA Position */
+#define MPU_CTRL_HFNMIENA_Msk              (1UL << MPU_CTRL_HFNMIENA_Pos)                 /*!< MPU CTRL: HFNMIENA Mask */
+
+#define MPU_CTRL_ENABLE_Pos                 0U                                            /*!< MPU CTRL: ENABLE Position */
+#define MPU_CTRL_ENABLE_Msk                (1UL /*<< MPU_CTRL_ENABLE_Pos*/)               /*!< MPU CTRL: ENABLE Mask */
+
+/* MPU Region Number Register Definitions */
+#define MPU_RNR_REGION_Pos                  0U                                            /*!< MPU RNR: REGION Position */
+#define MPU_RNR_REGION_Msk                 (0xFFUL /*<< MPU_RNR_REGION_Pos*/)             /*!< MPU RNR: REGION Mask */
+
+/* MPU Region Base Address Register Definitions */
+#define MPU_RBAR_BASE_Pos                   5U                                            /*!< MPU RBAR: BASE Position */
+#define MPU_RBAR_BASE_Msk                  (0x7FFFFFFUL << MPU_RBAR_BASE_Pos)             /*!< MPU RBAR: BASE Mask */
+
+#define MPU_RBAR_SH_Pos                     3U                                            /*!< MPU RBAR: SH Position */
+#define MPU_RBAR_SH_Msk                    (0x3UL << MPU_RBAR_SH_Pos)                     /*!< MPU RBAR: SH Mask */
+
+#define MPU_RBAR_AP_Pos                     1U                                            /*!< MPU RBAR: AP Position */
+#define MPU_RBAR_AP_Msk                    (0x3UL << MPU_RBAR_AP_Pos)                     /*!< MPU RBAR: AP Mask */
+
+#define MPU_RBAR_XN_Pos                     0U                                            /*!< MPU RBAR: XN Position */
+#define MPU_RBAR_XN_Msk                    (01UL /*<< MPU_RBAR_XN_Pos*/)                  /*!< MPU RBAR: XN Mask */
+
+/* MPU Region Limit Address Register Definitions */
+#define MPU_RLAR_LIMIT_Pos                  5U                                            /*!< MPU RLAR: LIMIT Position */
+#define MPU_RLAR_LIMIT_Msk                 (0x7FFFFFFUL << MPU_RLAR_LIMIT_Pos)            /*!< MPU RLAR: LIMIT Mask */
+
+#define MPU_RLAR_PXN_Pos                    4U                                            /*!< MPU RLAR: PXN Position */
+#define MPU_RLAR_PXN_Msk                   (1UL << MPU_RLAR_PXN_Pos)                      /*!< MPU RLAR: PXN Mask */
+
+#define MPU_RLAR_AttrIndx_Pos               1U                                            /*!< MPU RLAR: AttrIndx Position */
+#define MPU_RLAR_AttrIndx_Msk              (7UL << MPU_RLAR_AttrIndx_Pos)                 /*!< MPU RLAR: AttrIndx Mask */
+
+#define MPU_RLAR_EN_Pos                     0U                                            /*!< MPU RLAR: Region enable bit Position */
+#define MPU_RLAR_EN_Msk                    (1UL /*<< MPU_RLAR_EN_Pos*/)                   /*!< MPU RLAR: Region enable bit Disable Mask */
+
+/* MPU Memory Attribute Indirection Register 0 Definitions */
+#define MPU_MAIR0_Attr3_Pos                24U                                            /*!< MPU MAIR0: Attr3 Position */
+#define MPU_MAIR0_Attr3_Msk                (0xFFUL << MPU_MAIR0_Attr3_Pos)                /*!< MPU MAIR0: Attr3 Mask */
+
+#define MPU_MAIR0_Attr2_Pos                16U                                            /*!< MPU MAIR0: Attr2 Position */
+#define MPU_MAIR0_Attr2_Msk                (0xFFUL << MPU_MAIR0_Attr2_Pos)                /*!< MPU MAIR0: Attr2 Mask */
+
+#define MPU_MAIR0_Attr1_Pos                 8U                                            /*!< MPU MAIR0: Attr1 Position */
+#define MPU_MAIR0_Attr1_Msk                (0xFFUL << MPU_MAIR0_Attr1_Pos)                /*!< MPU MAIR0: Attr1 Mask */
+
+#define MPU_MAIR0_Attr0_Pos                 0U                                            /*!< MPU MAIR0: Attr0 Position */
+#define MPU_MAIR0_Attr0_Msk                (0xFFUL /*<< MPU_MAIR0_Attr0_Pos*/)            /*!< MPU MAIR0: Attr0 Mask */
+
+/* MPU Memory Attribute Indirection Register 1 Definitions */
+#define MPU_MAIR1_Attr7_Pos                24U                                            /*!< MPU MAIR1: Attr7 Position */
+#define MPU_MAIR1_Attr7_Msk                (0xFFUL << MPU_MAIR1_Attr7_Pos)                /*!< MPU MAIR1: Attr7 Mask */
+
+#define MPU_MAIR1_Attr6_Pos                16U                                            /*!< MPU MAIR1: Attr6 Position */
+#define MPU_MAIR1_Attr6_Msk                (0xFFUL << MPU_MAIR1_Attr6_Pos)                /*!< MPU MAIR1: Attr6 Mask */
+
+#define MPU_MAIR1_Attr5_Pos                 8U                                            /*!< MPU MAIR1: Attr5 Position */
+#define MPU_MAIR1_Attr5_Msk                (0xFFUL << MPU_MAIR1_Attr5_Pos)                /*!< MPU MAIR1: Attr5 Mask */
+
+#define MPU_MAIR1_Attr4_Pos                 0U                                            /*!< MPU MAIR1: Attr4 Position */
+#define MPU_MAIR1_Attr4_Msk                (0xFFUL /*<< MPU_MAIR1_Attr4_Pos*/)            /*!< MPU MAIR1: Attr4 Mask */
+
+/*@} end of group CMSIS_MPU */
+#endif
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SAU     Security Attribution Unit (SAU)
+  \brief    Type definitions for the Security Attribution Unit (SAU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Security Attribution Unit (SAU).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SAU Control Register */
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x004 (R/ )  SAU Type Register */
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  SAU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  SAU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  SAU Region Limit Address Register */
+#else
+        uint32_t RESERVED0[3];
+#endif
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x014 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x018 (R/W)  Secure Fault Address Register */
+} SAU_Type;
+
+/* SAU Control Register Definitions */
+#define SAU_CTRL_ALLNS_Pos                  1U                                            /*!< SAU CTRL: ALLNS Position */
+#define SAU_CTRL_ALLNS_Msk                 (1UL << SAU_CTRL_ALLNS_Pos)                    /*!< SAU CTRL: ALLNS Mask */
+
+#define SAU_CTRL_ENABLE_Pos                 0U                                            /*!< SAU CTRL: ENABLE Position */
+#define SAU_CTRL_ENABLE_Msk                (1UL /*<< SAU_CTRL_ENABLE_Pos*/)               /*!< SAU CTRL: ENABLE Mask */
+
+/* SAU Type Register Definitions */
+#define SAU_TYPE_SREGION_Pos                0U                                            /*!< SAU TYPE: SREGION Position */
+#define SAU_TYPE_SREGION_Msk               (0xFFUL /*<< SAU_TYPE_SREGION_Pos*/)           /*!< SAU TYPE: SREGION Mask */
+
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+/* SAU Region Number Register Definitions */
+#define SAU_RNR_REGION_Pos                  0U                                            /*!< SAU RNR: REGION Position */
+#define SAU_RNR_REGION_Msk                 (0xFFUL /*<< SAU_RNR_REGION_Pos*/)             /*!< SAU RNR: REGION Mask */
+
+/* SAU Region Base Address Register Definitions */
+#define SAU_RBAR_BADDR_Pos                  5U                                            /*!< SAU RBAR: BADDR Position */
+#define SAU_RBAR_BADDR_Msk                 (0x7FFFFFFUL << SAU_RBAR_BADDR_Pos)            /*!< SAU RBAR: BADDR Mask */
+
+/* SAU Region Limit Address Register Definitions */
+#define SAU_RLAR_LADDR_Pos                  5U                                            /*!< SAU RLAR: LADDR Position */
+#define SAU_RLAR_LADDR_Msk                 (0x7FFFFFFUL << SAU_RLAR_LADDR_Pos)            /*!< SAU RLAR: LADDR Mask */
+
+#define SAU_RLAR_NSC_Pos                    1U                                            /*!< SAU RLAR: NSC Position */
+#define SAU_RLAR_NSC_Msk                   (1UL << SAU_RLAR_NSC_Pos)                      /*!< SAU RLAR: NSC Mask */
+
+#define SAU_RLAR_ENABLE_Pos                 0U                                            /*!< SAU RLAR: ENABLE Position */
+#define SAU_RLAR_ENABLE_Msk                (1UL /*<< SAU_RLAR_ENABLE_Pos*/)               /*!< SAU RLAR: ENABLE Mask */
+
+#endif /* defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U) */
+
+/* Secure Fault Status Register Definitions */
+#define SAU_SFSR_LSERR_Pos                  7U                                            /*!< SAU SFSR: LSERR Position */
+#define SAU_SFSR_LSERR_Msk                 (1UL << SAU_SFSR_LSERR_Pos)                    /*!< SAU SFSR: LSERR Mask */
+
+#define SAU_SFSR_SFARVALID_Pos              6U                                            /*!< SAU SFSR: SFARVALID Position */
+#define SAU_SFSR_SFARVALID_Msk             (1UL << SAU_SFSR_SFARVALID_Pos)                /*!< SAU SFSR: SFARVALID Mask */
+
+#define SAU_SFSR_LSPERR_Pos                 5U                                            /*!< SAU SFSR: LSPERR Position */
+#define SAU_SFSR_LSPERR_Msk                (1UL << SAU_SFSR_LSPERR_Pos)                   /*!< SAU SFSR: LSPERR Mask */
+
+#define SAU_SFSR_INVTRAN_Pos                4U                                            /*!< SAU SFSR: INVTRAN Position */
+#define SAU_SFSR_INVTRAN_Msk               (1UL << SAU_SFSR_INVTRAN_Pos)                  /*!< SAU SFSR: INVTRAN Mask */
+
+#define SAU_SFSR_AUVIOL_Pos                 3U                                            /*!< SAU SFSR: AUVIOL Position */
+#define SAU_SFSR_AUVIOL_Msk                (1UL << SAU_SFSR_AUVIOL_Pos)                   /*!< SAU SFSR: AUVIOL Mask */
+
+#define SAU_SFSR_INVER_Pos                  2U                                            /*!< SAU SFSR: INVER Position */
+#define SAU_SFSR_INVER_Msk                 (1UL << SAU_SFSR_INVER_Pos)                    /*!< SAU SFSR: INVER Mask */
+
+#define SAU_SFSR_INVIS_Pos                  1U                                            /*!< SAU SFSR: INVIS Position */
+#define SAU_SFSR_INVIS_Msk                 (1UL << SAU_SFSR_INVIS_Pos)                    /*!< SAU SFSR: INVIS Mask */
+
+#define SAU_SFSR_INVEP_Pos                  0U                                            /*!< SAU SFSR: INVEP Position */
+#define SAU_SFSR_INVEP_Msk                 (1UL /*<< SAU_SFSR_INVEP_Pos*/)                /*!< SAU SFSR: INVEP Mask */
+
+/*@} end of group CMSIS_SAU */
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_FPU     Floating Point Unit (FPU)
+  \brief    Type definitions for the Floating Point Unit (FPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Floating Point Unit (FPU).
  */
 typedef struct
 {
@@ -1749,8 +2485,9 @@ typedef struct
   __IOM uint32_t FPCCR;                  /*!< Offset: 0x004 (R/W)  Floating-Point Context Control Register */
   __IOM uint32_t FPCAR;                  /*!< Offset: 0x008 (R/W)  Floating-Point Context Address Register */
   __IOM uint32_t FPDSCR;                 /*!< Offset: 0x00C (R/W)  Floating-Point Default Status Control Register */
-  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and FP Feature Register 0 */
-  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and FP Feature Register 1 */
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x018 (R/ )  Media and VFP Feature Register 2 */
 } FPU_Type;
 
 /* Floating-Point Context Control Register Definitions */
@@ -1822,47 +2559,57 @@ typedef struct
 #define FPU_FPDSCR_RMode_Pos               22U                                            /*!< FPDSCR: RMode bit Position */
 #define FPU_FPDSCR_RMode_Msk               (3UL << FPU_FPDSCR_RMode_Pos)                  /*!< FPDSCR: RMode bit Mask */
 
-/* Media and FP Feature Register 0 Definitions */
-#define FPU_MVFR0_FP_rounding_modes_Pos    28U                                            /*!< MVFR0: FP rounding modes bits Position */
-#define FPU_MVFR0_FP_rounding_modes_Msk    (0xFUL << FPU_MVFR0_FP_rounding_modes_Pos)     /*!< MVFR0: FP rounding modes bits Mask */
+#define FPU_FPDSCR_FZ16_Pos                19U                                            /*!< FPDSCR: FZ16 bit Position */
+#define FPU_FPDSCR_FZ16_Msk                (1UL << FPU_FPDSCR_FZ16_Pos)                   /*!< FPDSCR: FZ16 bit Mask */
 
-#define FPU_MVFR0_Short_vectors_Pos        24U                                            /*!< MVFR0: Short vectors bits Position */
-#define FPU_MVFR0_Short_vectors_Msk        (0xFUL << FPU_MVFR0_Short_vectors_Pos)         /*!< MVFR0: Short vectors bits Mask */
+#define FPU_FPDSCR_LTPSIZE_Pos             16U                                            /*!< FPDSCR: LTPSIZE bit Position */
+#define FPU_FPDSCR_LTPSIZE_Msk             (7UL << FPU_FPDSCR_LTPSIZE_Pos)                /*!< FPDSCR: LTPSIZE bit Mask */
 
-#define FPU_MVFR0_Square_root_Pos          20U                                            /*!< MVFR0: Square root bits Position */
-#define FPU_MVFR0_Square_root_Msk          (0xFUL << FPU_MVFR0_Square_root_Pos)           /*!< MVFR0: Square root bits Mask */
+/* Media and VFP Feature Register 0 Definitions */
+#define FPU_MVFR0_FPRound_Pos              28U                                            /*!< MVFR0: FPRound bits Position */
+#define FPU_MVFR0_FPRound_Msk              (0xFUL << FPU_MVFR0_FPRound_Pos)               /*!< MVFR0: FPRound bits Mask */
 
-#define FPU_MVFR0_Divide_Pos               16U                                            /*!< MVFR0: Divide bits Position */
-#define FPU_MVFR0_Divide_Msk               (0xFUL << FPU_MVFR0_Divide_Pos)                /*!< MVFR0: Divide bits Mask */
+#define FPU_MVFR0_FPSqrt_Pos               20U                                            /*!< MVFR0: FPSqrt bits Position */
+#define FPU_MVFR0_FPSqrt_Msk               (0xFUL << FPU_MVFR0_FPSqrt_Pos)                 /*!< MVFR0: FPSqrt bits Mask */
 
-#define FPU_MVFR0_FP_excep_trapping_Pos    12U                                            /*!< MVFR0: FP exception trapping bits Position */
-#define FPU_MVFR0_FP_excep_trapping_Msk    (0xFUL << FPU_MVFR0_FP_excep_trapping_Pos)     /*!< MVFR0: FP exception trapping bits Mask */
+#define FPU_MVFR0_FPDivide_Pos             16U                                            /*!< MVFR0: FPDivide bits Position */
+#define FPU_MVFR0_FPDivide_Msk             (0xFUL << FPU_MVFR0_FPDivide_Pos)              /*!< MVFR0: Divide bits Mask */
 
-#define FPU_MVFR0_Double_precision_Pos      8U                                            /*!< MVFR0: Double-precision bits Position */
-#define FPU_MVFR0_Double_precision_Msk     (0xFUL << FPU_MVFR0_Double_precision_Pos)      /*!< MVFR0: Double-precision bits Mask */
+#define FPU_MVFR0_FPDP_Pos                  8U                                            /*!< MVFR0: FPDP bits Position */
+#define FPU_MVFR0_FPDP_Msk                 (0xFUL << FPU_MVFR0_FPDP_Pos)                  /*!< MVFR0: FPDP bits Mask */
 
-#define FPU_MVFR0_Single_precision_Pos      4U                                            /*!< MVFR0: Single-precision bits Position */
-#define FPU_MVFR0_Single_precision_Msk     (0xFUL << FPU_MVFR0_Single_precision_Pos)      /*!< MVFR0: Single-precision bits Mask */
+#define FPU_MVFR0_FPSP_Pos                  4U                                            /*!< MVFR0: FPSP bits Position */
+#define FPU_MVFR0_FPSP_Msk                 (0xFUL << FPU_MVFR0_FPSP_Pos)                  /*!< MVFR0: FPSP bits Mask */
 
-#define FPU_MVFR0_A_SIMD_registers_Pos      0U                                            /*!< MVFR0: A_SIMD registers bits Position */
-#define FPU_MVFR0_A_SIMD_registers_Msk     (0xFUL /*<< FPU_MVFR0_A_SIMD_registers_Pos*/)  /*!< MVFR0: A_SIMD registers bits Mask */
+#define FPU_MVFR0_SIMDReg_Pos               0U                                            /*!< MVFR0: SIMDReg bits Position */
+#define FPU_MVFR0_SIMDReg_Msk              (0xFUL /*<< FPU_MVFR0_SIMDReg_Pos*/)           /*!< MVFR0: SIMDReg bits Mask */
 
-/* Media and FP Feature Register 1 Definitions */
-#define FPU_MVFR1_FP_fused_MAC_Pos         28U                                            /*!< MVFR1: FP fused MAC bits Position */
-#define FPU_MVFR1_FP_fused_MAC_Msk         (0xFUL << FPU_MVFR1_FP_fused_MAC_Pos)          /*!< MVFR1: FP fused MAC bits Mask */
+/* Media and VFP Feature Register 1 Definitions */
+#define FPU_MVFR1_FMAC_Pos                 28U                                            /*!< MVFR1: FMAC bits Position */
+#define FPU_MVFR1_FMAC_Msk                 (0xFUL << FPU_MVFR1_FMAC_Pos)                  /*!< MVFR1: FMAC bits Mask */
 
-#define FPU_MVFR1_FP_HPFP_Pos              24U                                            /*!< MVFR1: FP HPFP bits Position */
-#define FPU_MVFR1_FP_HPFP_Msk              (0xFUL << FPU_MVFR1_FP_HPFP_Pos)               /*!< MVFR1: FP HPFP bits Mask */
+#define FPU_MVFR1_FPHP_Pos                 24U                                            /*!< MVFR1: FPHP bits Position */
+#define FPU_MVFR1_FPHP_Msk                 (0xFUL << FPU_MVFR1_FPHP_Pos)                  /*!< MVFR1: FPHP bits Mask */
 
-#define FPU_MVFR1_D_NaN_mode_Pos            4U                                            /*!< MVFR1: D_NaN mode bits Position */
-#define FPU_MVFR1_D_NaN_mode_Msk           (0xFUL << FPU_MVFR1_D_NaN_mode_Pos)            /*!< MVFR1: D_NaN mode bits Mask */
+#define FPU_MVFR1_FP16_Pos                 20U                                            /*!< MVFR1: FP16 bits Position */
+#define FPU_MVFR1_FP16_Msk                 (0xFUL << FPU_MVFR1_FP16_Pos)                  /*!< MVFR1: FP16 bits Mask */
 
-#define FPU_MVFR1_FtZ_mode_Pos              0U                                            /*!< MVFR1: FtZ mode bits Position */
-#define FPU_MVFR1_FtZ_mode_Msk             (0xFUL /*<< FPU_MVFR1_FtZ_mode_Pos*/)          /*!< MVFR1: FtZ mode bits Mask */
+#define FPU_MVFR1_MVE_Pos                   8U                                            /*!< MVFR1: MVE bits Position */
+#define FPU_MVFR1_MVE_Msk                  (0xFUL << FPU_MVFR1_MVE_Pos)                   /*!< MVFR1: MVE bits Mask */
 
-/*@} end of group CMSIS_FPU */
+#define FPU_MVFR1_FPDNaN_Pos                4U                                            /*!< MVFR1: FPDNaN bits Position */
+#define FPU_MVFR1_FPDNaN_Msk               (0xFUL << FPU_MVFR1_FPDNaN_Pos)                /*!< MVFR1: FPDNaN bits Mask */
 
+#define FPU_MVFR1_FPFtZ_Pos                 0U                                            /*!< MVFR1: FPFtZ bits Position */
+#define FPU_MVFR1_FPFtZ_Msk                (0xFUL /*<< FPU_MVFR1_FPFtZ_Pos*/)             /*!< MVFR1: FPFtZ bits Mask */
 
+/* Media and VFP Feature Register 2 Definitions */
+#define FPU_MVFR2_FPMisc_Pos                4U                                            /*!< MVFR2: FPMisc bits Position */
+#define FPU_MVFR2_FPMisc_Msk               (0xFUL << FPU_MVFR2_FPMisc_Pos)                /*!< MVFR2: FPMisc bits Mask */
+
+/*@} end of group CMSIS_FPU */
+
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
 /**
   \ingroup  CMSIS_core_register
   \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
@@ -1871,7 +2618,7 @@ typedef struct
  */
 
 /**
-  \brief  Structure type to access the Core Debug Register (CoreDebug).
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
  */
 typedef struct
 {
@@ -1879,124 +2626,437 @@ typedef struct
   __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
   __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
   __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
-        uint32_t RESERVED4[1U];
+  __OM  uint32_t DSCEMCR;                /*!< Offset: 0x010 ( /W)  Debug Set Clear Exception and Monitor Control Register */
   __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
   __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
 } CoreDebug_Type;
 
 /* Debug Halting Control and Status Register Definitions */
-#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< CoreDebug DHCSR: DBGKEY Position */
-#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< CoreDebug DHCSR: DBGKEY Mask */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
 
-#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< CoreDebug DHCSR: S_RESTART_ST Position */
-#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< CoreDebug DHCSR: S_RESTART_ST Mask */
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
 
-#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< CoreDebug DHCSR: S_RESET_ST Position */
-#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< CoreDebug DHCSR: S_RESET_ST Mask */
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
 
-#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< CoreDebug DHCSR: S_RETIRE_ST Position */
-#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< CoreDebug DHCSR: S_RETIRE_ST Mask */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
 
-#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< CoreDebug DHCSR: S_LOCKUP Position */
-#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< CoreDebug DHCSR: S_LOCKUP Mask */
+#define CoreDebug_DHCSR_S_FPD_Pos          23U                                            /*!< \deprecated CoreDebug DHCSR: S_FPD Position */
+#define CoreDebug_DHCSR_S_FPD_Msk          (1UL << CoreDebug_DHCSR_S_FPD_Pos)             /*!< \deprecated CoreDebug DHCSR: S_FPD Mask */
 
-#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< CoreDebug DHCSR: S_SLEEP Position */
-#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< CoreDebug DHCSR: S_SLEEP Mask */
+#define CoreDebug_DHCSR_S_SUIDE_Pos        22U                                            /*!< \deprecated CoreDebug DHCSR: S_SUIDE Position */
+#define CoreDebug_DHCSR_S_SUIDE_Msk        (1UL << CoreDebug_DHCSR_S_SUIDE_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SUIDE Mask */
 
-#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< CoreDebug DHCSR: S_HALT Position */
-#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< CoreDebug DHCSR: S_HALT Mask */
+#define CoreDebug_DHCSR_S_NSUIDE_Pos       21U                                            /*!< \deprecated CoreDebug DHCSR: S_NSUIDE Position */
+#define CoreDebug_DHCSR_S_NSUIDE_Msk       (1UL << CoreDebug_DHCSR_S_NSUIDE_Pos)          /*!< \deprecated CoreDebug DHCSR: S_NSUIDE Mask */
 
-#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< CoreDebug DHCSR: S_REGRDY Position */
-#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< CoreDebug DHCSR: S_REGRDY Mask */
+#define CoreDebug_DHCSR_S_SDE_Pos          20U                                            /*!< \deprecated CoreDebug DHCSR: S_SDE Position */
+#define CoreDebug_DHCSR_S_SDE_Msk          (1UL << CoreDebug_DHCSR_S_SDE_Pos)             /*!< \deprecated CoreDebug DHCSR: S_SDE Mask */
 
-#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< CoreDebug DHCSR: C_SNAPSTALL Position */
-#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< CoreDebug DHCSR: C_SNAPSTALL Mask */
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
 
-#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< CoreDebug DHCSR: C_MASKINTS Position */
-#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< CoreDebug DHCSR: C_MASKINTS Mask */
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
 
-#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< CoreDebug DHCSR: C_STEP Position */
-#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< CoreDebug DHCSR: C_STEP Mask */
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
 
-#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< CoreDebug DHCSR: C_HALT Position */
-#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< CoreDebug DHCSR: C_HALT Mask */
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
 
-#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< CoreDebug DHCSR: C_DEBUGEN Position */
-#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< CoreDebug DHCSR: C_DEBUGEN Mask */
+#define CoreDebug_DHCSR_C_PMOV_Pos          6U                                            /*!< \deprecated CoreDebug DHCSR: C_PMOV Position */
+#define CoreDebug_DHCSR_C_PMOV_Msk         (1UL << CoreDebug_DHCSR_C_PMOV_Pos)            /*!< \deprecated CoreDebug DHCSR: C_PMOV Mask */
+
+#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Position */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Mask */
+
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
+
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
+
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
+
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
 
 /* Debug Core Register Selector Register Definitions */
-#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< CoreDebug DCRSR: REGWnR Position */
-#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< CoreDebug DCRSR: REGWnR Mask */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
 
-#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< CoreDebug DCRSR: REGSEL Position */
-#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< CoreDebug DCRSR: REGSEL Mask */
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
 
 /* Debug Exception and Monitor Control Register Definitions */
-#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< CoreDebug DEMCR: TRCENA Position */
-#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< CoreDebug DEMCR: TRCENA Mask */
+#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: TRCENA Position */
+#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< \deprecated CoreDebug DEMCR: TRCENA Mask */
+
+#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< \deprecated CoreDebug DEMCR: MON_REQ Position */
+#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< \deprecated CoreDebug DEMCR: MON_REQ Mask */
+
+#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< \deprecated CoreDebug DEMCR: MON_STEP Position */
+#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_STEP Mask */
+
+#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< \deprecated CoreDebug DEMCR: MON_PEND Position */
+#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_PEND Mask */
 
-#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< CoreDebug DEMCR: MON_REQ Position */
-#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< CoreDebug DEMCR: MON_REQ Mask */
+#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< \deprecated CoreDebug DEMCR: MON_EN Position */
+#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< \deprecated CoreDebug DEMCR: MON_EN Mask */
 
-#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< CoreDebug DEMCR: MON_STEP Position */
-#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< CoreDebug DEMCR: MON_STEP Mask */
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
 
-#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< CoreDebug DEMCR: MON_PEND Position */
-#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< CoreDebug DEMCR: MON_PEND Mask */
+#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< \deprecated CoreDebug DEMCR: VC_INTERR Position */
+#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_INTERR Mask */
 
-#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< CoreDebug DEMCR: MON_EN Position */
-#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< CoreDebug DEMCR: MON_EN Mask */
+#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Position */
+#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Mask */
 
-#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< CoreDebug DEMCR: VC_HARDERR Position */
-#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< CoreDebug DEMCR: VC_HARDERR Mask */
+#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< \deprecated CoreDebug DEMCR: VC_STATERR Position */
+#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_STATERR Mask */
 
-#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< CoreDebug DEMCR: VC_INTERR Position */
-#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< CoreDebug DEMCR: VC_INTERR Mask */
+#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Position */
+#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Mask */
 
-#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< CoreDebug DEMCR: VC_BUSERR Position */
-#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< CoreDebug DEMCR: VC_BUSERR Mask */
+#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Position */
+#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Mask */
 
-#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< CoreDebug DEMCR: VC_STATERR Position */
-#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< CoreDebug DEMCR: VC_STATERR Mask */
+#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< \deprecated CoreDebug DEMCR: VC_MMERR Position */
+#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< \deprecated CoreDebug DEMCR: VC_MMERR Mask */
 
-#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< CoreDebug DEMCR: VC_CHKERR Position */
-#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< CoreDebug DEMCR: VC_CHKERR Mask */
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
 
-#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< CoreDebug DEMCR: VC_NOCPERR Position */
-#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< CoreDebug DEMCR: VC_NOCPERR Mask */
+/* Debug Set Clear Exception and Monitor Control Register Definitions */
+#define CoreDebug_DSCEMCR_CLR_MON_REQ_Pos  19U                                            /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_REQ, Position */
+#define CoreDebug_DSCEMCR_CLR_MON_REQ_Msk  (1UL << CoreDebug_DSCEMCR_CLR_MON_REQ_Pos)     /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_REQ, Mask */
 
-#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< CoreDebug DEMCR: VC_MMERR Position */
-#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< CoreDebug DEMCR: VC_MMERR Mask */
+#define CoreDebug_DSCEMCR_CLR_MON_PEND_Pos 17U                                            /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_PEND, Position */
+#define CoreDebug_DSCEMCR_CLR_MON_PEND_Msk (1UL << CoreDebug_DSCEMCR_CLR_MON_PEND_Pos)    /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_PEND, Mask */
 
-#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< CoreDebug DEMCR: VC_CORERESET Position */
-#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< CoreDebug DEMCR: VC_CORERESET Mask */
+#define CoreDebug_DSCEMCR_SET_MON_REQ_Pos   3U                                            /*!< \deprecated CoreDebug DSCEMCR: SET_MON_REQ, Position */
+#define CoreDebug_DSCEMCR_SET_MON_REQ_Msk  (1UL << CoreDebug_DSCEMCR_SET_MON_REQ_Pos)     /*!< \deprecated CoreDebug DSCEMCR: SET_MON_REQ, Mask */
+
+#define CoreDebug_DSCEMCR_SET_MON_PEND_Pos  1U                                            /*!< \deprecated CoreDebug DSCEMCR: SET_MON_PEND, Position */
+#define CoreDebug_DSCEMCR_SET_MON_PEND_Msk (1UL << CoreDebug_DSCEMCR_SET_MON_PEND_Pos)    /*!< \deprecated CoreDebug DSCEMCR: SET_MON_PEND, Mask */
 
 /* Debug Authentication Control Register Definitions */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+#define CoreDebug_DAUTHCTRL_UIDEN_Pos      10U                                            /*!< \deprecated CoreDebug DAUTHCTRL: UIDEN, Position */
+#define CoreDebug_DAUTHCTRL_UIDEN_Msk      (1UL << CoreDebug_DAUTHCTRL_UIDEN_Pos)         /*!< \deprecated CoreDebug DAUTHCTRL: UIDEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_UIDAPEN_Pos     9U                                            /*!< \deprecated CoreDebug DAUTHCTRL: UIDAPEN, Position */
+#define CoreDebug_DAUTHCTRL_UIDAPEN_Msk    (1UL << CoreDebug_DAUTHCTRL_UIDAPEN_Pos)       /*!< \deprecated CoreDebug DAUTHCTRL: UIDAPEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_FSDMA_Pos       8U                                            /*!< \deprecated CoreDebug DAUTHCTRL: FSDMA, Position */
+#define CoreDebug_DAUTHCTRL_FSDMA_Msk      (1UL << CoreDebug_DAUTHCTRL_FSDMA_Pos)         /*!< \deprecated CoreDebug DAUTHCTRL: FSDMA, Mask */
+
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
 
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
 
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< CoreDebug DAUTHCTRL: INTSPIDEN Position */
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
 
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< CoreDebug DAUTHCTRL: SPIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
 
 /* Debug Security Control and Status Register Definitions */
-#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< CoreDebug DSCSR: CDS Position */
-#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< CoreDebug DSCSR: CDS Mask */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
 
-#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< CoreDebug DSCSR: SBRSEL Position */
-#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< CoreDebug DSCSR: SBRSEL Mask */
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
 
-#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< CoreDebug DSCSR: SBRSELEN Position */
-#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< CoreDebug DSCSR: SBRSELEN Mask */
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
 
 /*@} end of group CMSIS_CoreDebug */
 
 
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+  __OM  uint32_t DSCEMCR;                /*!< Offset: 0x010 ( /W)  Debug Set Clear Exception and Monitor Control Register */
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_FPD_Pos                23U                                            /*!< DCB DHCSR: Floating-point registers Debuggable Position */
+#define DCB_DHCSR_S_FPD_Msk                (0x1UL << DCB_DHCSR_S_FPD_Pos)                 /*!< DCB DHCSR: Floating-point registers Debuggable Mask */
+
+#define DCB_DHCSR_S_SUIDE_Pos              22U                                            /*!< DCB DHCSR: Secure unprivileged halting debug enabled Position */
+#define DCB_DHCSR_S_SUIDE_Msk              (0x1UL << DCB_DHCSR_S_SUIDE_Pos)               /*!< DCB DHCSR: Secure unprivileged halting debug enabled Mask */
+
+#define DCB_DHCSR_S_NSUIDE_Pos             21U                                            /*!< DCB DHCSR: Non-secure unprivileged halting debug enabled Position */
+#define DCB_DHCSR_S_NSUIDE_Msk             (0x1UL << DCB_DHCSR_S_NSUIDE_Pos)              /*!< DCB DHCSR: Non-secure unprivileged halting debug enabled Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_PMOV_Pos                6U                                            /*!< DCB DHCSR: Halt on PMU overflow control Position */
+#define DCB_DHCSR_C_PMOV_Msk               (0x1UL << DCB_DHCSR_C_PMOV_Pos)                /*!< DCB DHCSR: Halt on PMU overflow control Mask */
+
+#define DCB_DHCSR_C_SNAPSTALL_Pos           5U                                            /*!< DCB DHCSR: Snap stall control Position */
+#define DCB_DHCSR_C_SNAPSTALL_Msk          (0x1UL << DCB_DHCSR_C_SNAPSTALL_Pos)           /*!< DCB DHCSR: Snap stall control Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_MONPRKEY_Pos             23U                                            /*!< DCB DEMCR: Monitor pend req key Position */
+#define DCB_DEMCR_MONPRKEY_Msk             (0x1UL << DCB_DEMCR_MONPRKEY_Pos)              /*!< DCB DEMCR: Monitor pend req key Mask */
+
+#define DCB_DEMCR_UMON_EN_Pos              21U                                            /*!< DCB DEMCR: Unprivileged monitor enable Position */
+#define DCB_DEMCR_UMON_EN_Msk              (0x1UL << DCB_DEMCR_UMON_EN_Pos)               /*!< DCB DEMCR: Unprivileged monitor enable Mask */
+
+#define DCB_DEMCR_SDME_Pos                 20U                                            /*!< DCB DEMCR: Secure DebugMonitor enable Position */
+#define DCB_DEMCR_SDME_Msk                 (0x1UL << DCB_DEMCR_SDME_Pos)                  /*!< DCB DEMCR: Secure DebugMonitor enable Mask */
+
+#define DCB_DEMCR_MON_REQ_Pos              19U                                            /*!< DCB DEMCR: Monitor request Position */
+#define DCB_DEMCR_MON_REQ_Msk              (0x1UL << DCB_DEMCR_MON_REQ_Pos)               /*!< DCB DEMCR: Monitor request Mask */
+
+#define DCB_DEMCR_MON_STEP_Pos             18U                                            /*!< DCB DEMCR: Monitor step Position */
+#define DCB_DEMCR_MON_STEP_Msk             (0x1UL << DCB_DEMCR_MON_STEP_Pos)              /*!< DCB DEMCR: Monitor step Mask */
+
+#define DCB_DEMCR_MON_PEND_Pos             17U                                            /*!< DCB DEMCR: Monitor pend Position */
+#define DCB_DEMCR_MON_PEND_Msk             (0x1UL << DCB_DEMCR_MON_PEND_Pos)              /*!< DCB DEMCR: Monitor pend Mask */
+
+#define DCB_DEMCR_MON_EN_Pos               16U                                            /*!< DCB DEMCR: Monitor enable Position */
+#define DCB_DEMCR_MON_EN_Msk               (0x1UL << DCB_DEMCR_MON_EN_Pos)                /*!< DCB DEMCR: Monitor enable Mask */
+
+#define DCB_DEMCR_VC_SFERR_Pos             11U                                            /*!< DCB DEMCR: Vector Catch SecureFault Position */
+#define DCB_DEMCR_VC_SFERR_Msk             (0x1UL << DCB_DEMCR_VC_SFERR_Pos)              /*!< DCB DEMCR: Vector Catch SecureFault Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_INTERR_Pos             9U                                            /*!< DCB DEMCR: Vector Catch interrupt errors Position */
+#define DCB_DEMCR_VC_INTERR_Msk            (0x1UL << DCB_DEMCR_VC_INTERR_Pos)             /*!< DCB DEMCR: Vector Catch interrupt errors Mask */
+
+#define DCB_DEMCR_VC_BUSERR_Pos             8U                                            /*!< DCB DEMCR: Vector Catch BusFault errors Position */
+#define DCB_DEMCR_VC_BUSERR_Msk            (0x1UL << DCB_DEMCR_VC_BUSERR_Pos)             /*!< DCB DEMCR: Vector Catch BusFault errors Mask */
+
+#define DCB_DEMCR_VC_STATERR_Pos            7U                                            /*!< DCB DEMCR: Vector Catch state errors Position */
+#define DCB_DEMCR_VC_STATERR_Msk           (0x1UL << DCB_DEMCR_VC_STATERR_Pos)            /*!< DCB DEMCR: Vector Catch state errors Mask */
+
+#define DCB_DEMCR_VC_CHKERR_Pos             6U                                            /*!< DCB DEMCR: Vector Catch check errors Position */
+#define DCB_DEMCR_VC_CHKERR_Msk            (0x1UL << DCB_DEMCR_VC_CHKERR_Pos)             /*!< DCB DEMCR: Vector Catch check errors Mask */
+
+#define DCB_DEMCR_VC_NOCPERR_Pos            5U                                            /*!< DCB DEMCR: Vector Catch NOCP errors Position */
+#define DCB_DEMCR_VC_NOCPERR_Msk           (0x1UL << DCB_DEMCR_VC_NOCPERR_Pos)            /*!< DCB DEMCR: Vector Catch NOCP errors Mask */
+
+#define DCB_DEMCR_VC_MMERR_Pos              4U                                            /*!< DCB DEMCR: Vector Catch MemManage errors Position */
+#define DCB_DEMCR_VC_MMERR_Msk             (0x1UL << DCB_DEMCR_VC_MMERR_Pos)              /*!< DCB DEMCR: Vector Catch MemManage errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DSCEMCR, Debug Set Clear Exception and Monitor Control Register Definitions */
+#define DCB_DSCEMCR_CLR_MON_REQ_Pos        19U                                            /*!< DCB DSCEMCR: Clear monitor request Position */
+#define DCB_DSCEMCR_CLR_MON_REQ_Msk        (0x1UL << DCB_DSCEMCR_CLR_MON_REQ_Pos)         /*!< DCB DSCEMCR: Clear monitor request Mask */
+
+#define DCB_DSCEMCR_CLR_MON_PEND_Pos       17U                                            /*!< DCB DSCEMCR: Clear monitor pend Position */
+#define DCB_DSCEMCR_CLR_MON_PEND_Msk       (0x1UL << DCB_DSCEMCR_CLR_MON_PEND_Pos)        /*!< DCB DSCEMCR: Clear monitor pend Mask */
+
+#define DCB_DSCEMCR_SET_MON_REQ_Pos         3U                                            /*!< DCB DSCEMCR: Set monitor request Position */
+#define DCB_DSCEMCR_SET_MON_REQ_Msk        (0x1UL << DCB_DSCEMCR_SET_MON_REQ_Pos)         /*!< DCB DSCEMCR: Set monitor request Mask */
+
+#define DCB_DSCEMCR_SET_MON_PEND_Pos        1U                                            /*!< DCB DSCEMCR: Set monitor pend Position */
+#define DCB_DSCEMCR_SET_MON_PEND_Msk       (0x1UL << DCB_DSCEMCR_SET_MON_PEND_Pos)        /*!< DCB DSCEMCR: Set monitor pend Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_UIDEN_Pos            10U                                            /*!< DCB DAUTHCTRL: Unprivileged Invasive Debug Enable Position */
+#define DCB_DAUTHCTRL_UIDEN_Msk            (0x1UL << DCB_DAUTHCTRL_UIDEN_Pos)             /*!< DCB DAUTHCTRL: Unprivileged Invasive Debug Enable Mask */
+
+#define DCB_DAUTHCTRL_UIDAPEN_Pos           9U                                            /*!< DCB DAUTHCTRL: Unprivileged Invasive DAP Access Enable Position */
+#define DCB_DAUTHCTRL_UIDAPEN_Msk          (0x1UL << DCB_DAUTHCTRL_UIDAPEN_Pos)           /*!< DCB DAUTHCTRL: Unprivileged Invasive DAP Access Enable Mask */
+
+#define DCB_DAUTHCTRL_FSDMA_Pos             8U                                            /*!< DCB DAUTHCTRL: Force Secure DebugMonitor Allowed Position */
+#define DCB_DAUTHCTRL_FSDMA_Msk            (0x1UL << DCB_DAUTHCTRL_FSDMA_Pos)             /*!< DCB DAUTHCTRL: Force Secure DebugMonitor Allowed Mask */
+
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SUNID_Pos          22U                                            /*!< DIB DAUTHSTATUS: Secure Unprivileged Non-invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_SUNID_Msk          (0x3UL << DIB_DAUTHSTATUS_SUNID_Pos )          /*!< DIB DAUTHSTATUS: Secure Unprivileged Non-invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_SUID_Pos           20U                                            /*!< DIB DAUTHSTATUS: Secure Unprivileged Invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_SUID_Msk           (0x3UL << DIB_DAUTHSTATUS_SUID_Pos )           /*!< DIB DAUTHSTATUS: Secure Unprivileged Invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_NSUNID_Pos         18U                                            /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Allo Position */
+#define DIB_DAUTHSTATUS_NSUNID_Msk         (0x3UL << DIB_DAUTHSTATUS_NSUNID_Pos )         /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Allo Mask */
+
+#define DIB_DAUTHSTATUS_NSUID_Pos          16U                                            /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_NSUID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSUID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
 /**
   \ingroup    CMSIS_core_register
   \defgroup   CMSIS_core_bitfield     Core register bit field macros
@@ -2035,7 +3095,9 @@ typedef struct
   #define ITM_BASE            (0xE0000000UL)                             /*!< ITM Base Address */
   #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
   #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
-  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< Core Debug Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
   #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
   #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
   #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
@@ -2047,13 +3109,20 @@ typedef struct
   #define ITM                 ((ITM_Type       *)     ITM_BASE         ) /*!< ITM configuration struct */
   #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
   #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
-  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< Core Debug configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
     #define MPU               ((MPU_Type       *)     MPU_BASE         ) /*!< Memory Protection Unit */
   #endif
 
+  #if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+    #define PMU_BASE          (0xE0003000UL)                             /*!< PMU Base Address */
+    #define PMU               ((PMU_Type       *)     PMU_BASE         ) /*!< PMU configuration struct */
+  #endif
+
   #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
     #define SAU_BASE          (SCS_BASE +  0x0DD0UL)                     /*!< Security Attribution Unit */
     #define SAU               ((SAU_Type       *)     SAU_BASE         ) /*!< Security Attribution Unit */
@@ -2064,7 +3133,9 @@ typedef struct
 
 #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
   #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
-  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< Core Debug Base Address           (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
   #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
   #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
   #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
@@ -2073,7 +3144,9 @@ typedef struct
   #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
   #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
   #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
-  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< Core Debug configuration struct   (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
@@ -2087,6 +3160,15 @@ typedef struct
 /*@} */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_register_aliases     Backwards Compatibility Aliases
+  \brief      Register alias definitions for backwards compatibility.
+  @{
+ */
+#define ID_ADR  (ID_AFR)    /*!< SCB Auxiliary Feature Register */
+/*@} */
+
 
 /*******************************************************************************
  *                Hardware Abstraction Layer
@@ -2143,6 +3225,27 @@ typedef struct
 #define NVIC_USER_IRQ_OFFSET          16
 
 
+/* Special LR values for Secure/Non-Secure call handling and exception handling                                               */
+
+/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */
+#define FNC_RETURN                 (0xFEFFFFFFUL)     /* bit [0] ignored when processing a branch                             */
+
+/* The following EXC_RETURN mask values are used to evaluate the LR on exception entry */
+#define EXC_RETURN_PREFIX          (0xFF000000UL)     /* bits [31:24] set to indicate an EXC_RETURN value                     */
+#define EXC_RETURN_S               (0x00000040UL)     /* bit [6] stack used to push registers: 0=Non-secure 1=Secure          */
+#define EXC_RETURN_DCRS            (0x00000020UL)     /* bit [5] stacking rules for called registers: 0=skipped 1=saved       */
+#define EXC_RETURN_FTYPE           (0x00000010UL)     /* bit [4] allocate stack for floating-point context: 0=done 1=skipped  */
+#define EXC_RETURN_MODE            (0x00000008UL)     /* bit [3] processor mode for return: 0=Handler mode 1=Thread mode      */
+#define EXC_RETURN_SPSEL           (0x00000004UL)     /* bit [2] stack pointer used to restore context: 0=MSP 1=PSP           */
+#define EXC_RETURN_ES              (0x00000001UL)     /* bit [0] security state exception was taken to: 0=Non-secure 1=Secure */
+
+/* Integrity Signature (from ARMv8-M Architecture Reference Manual) for exception context stacking                            */
+#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)  /* Value for processors with floating-point extension:                  */
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125AUL)     /* bit [0] SFTC must match LR bit[4] EXC_RETURN_FTYPE                   */
+#else
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125BUL)     /* Value for processors without floating-point extension                */
+#endif
+
 
 /**
   \brief   Set Priority Grouping
@@ -2162,7 +3265,7 @@ __STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)  );              /* Insert write key and priority group */
   SCB->AIRCR =  reg_value;
 }
 
@@ -2188,7 +3291,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -2480,6 +3585,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
   uint32_t *vectors = (uint32_t *)SCB->VTOR;
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
 }
 
 
@@ -2536,7 +3642,7 @@ __STATIC_INLINE void TZ_NVIC_SetPriorityGrouping_NS(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk));             /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)                      );              /* Insert write key and priority group */
   SCB_NS->AIRCR =  reg_value;
 }
 
@@ -2729,6 +3835,14 @@ __STATIC_INLINE uint32_t TZ_NVIC_GetPriority_NS(IRQn_Type IRQn)
 
 #endif
 
+/* ##########################  PMU functions and events  #################################### */
+
+#if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+
+#include "pmu_armv8.h"
+
+#endif
+
 /* ##########################  FPU functions  #################################### */
 /**
   \ingroup  CMSIS_Core_FunctionInterface
@@ -2750,11 +3864,11 @@ __STATIC_INLINE uint32_t SCB_GetFPUType(void)
   uint32_t mvfr0;
 
   mvfr0 = FPU->MVFR0;
-  if      ((mvfr0 & (FPU_MVFR0_Single_precision_Msk | FPU_MVFR0_Double_precision_Msk)) == 0x220U)
+  if      ((mvfr0 & (FPU_MVFR0_FPSP_Msk | FPU_MVFR0_FPDP_Msk)) == 0x220U)
   {
     return 2U;           /* Double + Single precision FPU */
   }
-  else if ((mvfr0 & (FPU_MVFR0_Single_precision_Msk | FPU_MVFR0_Double_precision_Msk)) == 0x020U)
+  else if ((mvfr0 & (FPU_MVFR0_FPSP_Msk | FPU_MVFR0_FPDP_Msk)) == 0x020U)
   {
     return 1U;           /* Single precision FPU */
   }
@@ -2767,6 +3881,49 @@ __STATIC_INLINE uint32_t SCB_GetFPUType(void)
 
 /*@} end of CMSIS_Core_FpuFunctions */
 
+/* ##########################  MVE functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_MveFunctions MVE Functions
+  \brief    Function that provides MVE type.
+  @{
+ */
+
+/**
+  \brief   get MVE type
+  \details returns the MVE type
+  \returns
+   - \b  0: No Vector Extension (MVE)
+   - \b  1: Integer Vector Extension (MVE-I)
+   - \b  2: Floating-point Vector Extension (MVE-F)
+ */
+__STATIC_INLINE uint32_t SCB_GetMVEType(void)
+{
+  const uint32_t mvfr1 = FPU->MVFR1;
+  if      ((mvfr1 & FPU_MVFR1_MVE_Msk) == (0x2U << FPU_MVFR1_MVE_Pos))
+  {
+    return 2U;
+  }
+  else if ((mvfr1 & FPU_MVFR1_MVE_Msk) == (0x1U << FPU_MVFR1_MVE_Pos))
+  {
+    return 1U;
+  }
+  else
+  {
+    return 0U;
+  }
+}
+
+
+/*@} end of CMSIS_Core_MveFunctions */
+
+
+/* ##########################  Cache functions  #################################### */
+
+#if ((defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)) || \
+     (defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)))
+#include "cachel1_armv7.h"
+#endif
 
 
 /* ##########################   SAU functions  #################################### */
@@ -2806,6 +3963,110 @@ __STATIC_INLINE void TZ_SAU_Disable(void)
 
 
 
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
 /* ##################################    SysTick function  ############################################ */
 /**
   \ingroup  CMSIS_Core_FunctionInterface
diff --git a/lib/cmsis/inc/core_armv8mbl.h b/lib/cmsis/inc/core_armv8mbl.h
index 57d9f663fd3ed..932d3d188bfa0 100644
--- a/lib/cmsis/inc/core_armv8mbl.h
+++ b/lib/cmsis/inc/core_armv8mbl.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_armv8mbl.h
  * @brief    CMSIS Armv8-M Baseline Core Peripheral Access Layer Header File
- * @version  V5.0.8
- * @date     12. November 2018
+ * @version  V5.1.0
+ * @date     27. March 2020
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,11 @@
  */
 
 #if   defined ( __ICCARM__ )
-  #pragma system_include         /* treat file as system include file for MISRA check */
+  #pragma system_include                        /* treat file as system include file for MISRA check */
 #elif defined (__clang__)
-  #pragma clang system_header   /* treat file as system include file */
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
 #endif
 
 #ifndef __CORE_ARMV8MBL_H_GENERIC
@@ -68,7 +70,7 @@
 #define __ARMv8MBL_CMSIS_VERSION       ((__ARMv8MBL_CMSIS_VERSION_MAIN << 16U) | \
                                          __ARMv8MBL_CMSIS_VERSION_SUB           )  /*!< \deprecated CMSIS HAL version number */
 
-#define __CORTEX_M                     ( 2U)                                            /*!< Cortex-M Core */
+#define __CORTEX_M                     (2U)                                        /*!< Cortex-M Core */
 
 /** __FPU_USED indicates whether an FPU is used or not.
     This core does not support an FPU at all
@@ -975,6 +977,7 @@ typedef struct
 #endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
 
 
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
 /**
   \ingroup  CMSIS_core_register
   \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
@@ -983,7 +986,7 @@ typedef struct
  */
 
 /**
-  \brief  Structure type to access the Core Debug Register (CoreDebug).
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
  */
 typedef struct
 {
@@ -991,91 +994,276 @@ typedef struct
   __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
   __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
   __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
-        uint32_t RESERVED4[1U];
+        uint32_t RESERVED0[1U];
   __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
   __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
 } CoreDebug_Type;
 
 /* Debug Halting Control and Status Register Definitions */
-#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< CoreDebug DHCSR: DBGKEY Position */
-#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< CoreDebug DHCSR: DBGKEY Mask */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
 
-#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< CoreDebug DHCSR: S_RESTART_ST Position */
-#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< CoreDebug DHCSR: S_RESTART_ST Mask */
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
 
-#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< CoreDebug DHCSR: S_RESET_ST Position */
-#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< CoreDebug DHCSR: S_RESET_ST Mask */
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
 
-#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< CoreDebug DHCSR: S_RETIRE_ST Position */
-#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< CoreDebug DHCSR: S_RETIRE_ST Mask */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
 
-#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< CoreDebug DHCSR: S_LOCKUP Position */
-#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< CoreDebug DHCSR: S_LOCKUP Mask */
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
 
-#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< CoreDebug DHCSR: S_SLEEP Position */
-#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< CoreDebug DHCSR: S_SLEEP Mask */
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
 
-#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< CoreDebug DHCSR: S_HALT Position */
-#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< CoreDebug DHCSR: S_HALT Mask */
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
 
-#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< CoreDebug DHCSR: S_REGRDY Position */
-#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< CoreDebug DHCSR: S_REGRDY Mask */
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
 
-#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< CoreDebug DHCSR: C_MASKINTS Position */
-#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< CoreDebug DHCSR: C_MASKINTS Mask */
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
 
-#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< CoreDebug DHCSR: C_STEP Position */
-#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< CoreDebug DHCSR: C_STEP Mask */
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
 
-#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< CoreDebug DHCSR: C_HALT Position */
-#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< CoreDebug DHCSR: C_HALT Mask */
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
 
-#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< CoreDebug DHCSR: C_DEBUGEN Position */
-#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< CoreDebug DHCSR: C_DEBUGEN Mask */
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
 
 /* Debug Core Register Selector Register Definitions */
-#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< CoreDebug DCRSR: REGWnR Position */
-#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< CoreDebug DCRSR: REGWnR Mask */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
 
-#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< CoreDebug DCRSR: REGSEL Position */
-#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< CoreDebug DCRSR: REGSEL Mask */
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
 
-/* Debug Exception and Monitor Control Register */
-#define CoreDebug_DEMCR_DWTENA_Pos         24U                                            /*!< CoreDebug DEMCR: DWTENA Position */
-#define CoreDebug_DEMCR_DWTENA_Msk         (1UL << CoreDebug_DEMCR_DWTENA_Pos)            /*!< CoreDebug DEMCR: DWTENA Mask */
+/* Debug Exception and Monitor Control Register Definitions */
+#define CoreDebug_DEMCR_DWTENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: DWTENA Position */
+#define CoreDebug_DEMCR_DWTENA_Msk         (1UL << CoreDebug_DEMCR_DWTENA_Pos)            /*!< \deprecated CoreDebug DEMCR: DWTENA Mask */
 
-#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< CoreDebug DEMCR: VC_HARDERR Position */
-#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< CoreDebug DEMCR: VC_HARDERR Mask */
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
 
-#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< CoreDebug DEMCR: VC_CORERESET Position */
-#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< CoreDebug DEMCR: VC_CORERESET Mask */
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
 
 /* Debug Authentication Control Register Definitions */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
 
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
 
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< CoreDebug DAUTHCTRL: INTSPIDEN Position */
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
 
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< CoreDebug DAUTHCTRL: SPIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
 
 /* Debug Security Control and Status Register Definitions */
-#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< CoreDebug DSCSR: CDS Position */
-#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< CoreDebug DSCSR: CDS Mask */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
 
-#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< CoreDebug DSCSR: SBRSEL Position */
-#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< CoreDebug DSCSR: SBRSEL Mask */
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
 
-#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< CoreDebug DSCSR: SBRSELEN Position */
-#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< CoreDebug DSCSR: SBRSELEN Mask */
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
 
 /*@} end of group CMSIS_CoreDebug */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
 /**
   \ingroup    CMSIS_core_register
   \defgroup   CMSIS_core_bitfield     Core register bit field macros
@@ -1113,7 +1301,9 @@ typedef struct
   #define SCS_BASE            (0xE000E000UL)                             /*!< System Control Space Base Address */
   #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
   #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
-  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< Core Debug Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
   #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
   #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
   #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
@@ -1124,7 +1314,9 @@ typedef struct
   #define NVIC                ((NVIC_Type      *)     NVIC_BASE        ) /*!< NVIC configuration struct */
   #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
   #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
-  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< Core Debug configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
@@ -1138,7 +1330,9 @@ typedef struct
 
 #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
   #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
-  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< Core Debug Base Address           (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
   #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
   #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
   #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
@@ -1146,7 +1340,9 @@ typedef struct
   #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
   #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
   #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
-  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< Core Debug configuration struct   (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
@@ -1163,6 +1359,7 @@ typedef struct
   Core Function Interface contains:
   - Core NVIC Functions
   - Core SysTick Functions
+  - Core Debug Functions
   - Core Register Access Functions
  ******************************************************************************/
 /**
@@ -1253,7 +1450,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -1552,6 +1751,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
   uint32_t *vectors = (uint32_t *)0x0U;
 #endif
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
 }
 
 
@@ -1835,6 +2035,110 @@ __STATIC_INLINE void TZ_SAU_Disable(void)
 
 
 
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+ 
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+ 
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
 /* ##################################    SysTick function  ############################################ */
 /**
   \ingroup  CMSIS_Core_FunctionInterface
diff --git a/lib/cmsis/inc/core_armv8mml.h b/lib/cmsis/inc/core_armv8mml.h
index 30aab58722fc8..c119fbf242467 100644
--- a/lib/cmsis/inc/core_armv8mml.h
+++ b/lib/cmsis/inc/core_armv8mml.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_armv8mml.h
  * @brief    CMSIS Armv8-M Mainline Core Peripheral Access Layer Header File
- * @version  V5.1.0
- * @date     12. September 2018
+ * @version  V5.2.3
+ * @date     13. October 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,11 @@
  */
 
 #if   defined ( __ICCARM__ )
-  #pragma system_include         /* treat file as system include file for MISRA check */
+  #pragma system_include                        /* treat file as system include file for MISRA check */
 #elif defined (__clang__)
-  #pragma clang system_header   /* treat file as system include file */
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
 #endif
 
 #ifndef __CORE_ARMV8MML_H_GENERIC
@@ -68,7 +70,7 @@
 #define __ARMv8MML_CMSIS_VERSION       ((__ARMv8MML_CMSIS_VERSION_MAIN << 16U) | \
                                          __ARMv8MML_CMSIS_VERSION_SUB           )  /*!< \deprecated CMSIS HAL version number */
 
-#define __CORTEX_M                     (81U)                                       /*!< Cortex-M Core */
+#define __CORTEX_M                     (80U)                                       /*!< Cortex-M Core */
 
 /** __FPU_USED indicates whether an FPU is used or not.
     For this, __FPU_PRESENT has to be checked prior to making use of FPU specific registers and functions.
@@ -248,6 +250,11 @@
     #warning "__DSP_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -512,7 +519,7 @@ typedef struct
   __IOM uint32_t AFSR;                   /*!< Offset: 0x03C (R/W)  Auxiliary Fault Status Register */
   __IM  uint32_t ID_PFR[2U];             /*!< Offset: 0x040 (R/ )  Processor Feature Register */
   __IM  uint32_t ID_DFR;                 /*!< Offset: 0x048 (R/ )  Debug Feature Register */
-  __IM  uint32_t ID_ADR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
+  __IM  uint32_t ID_AFR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
   __IM  uint32_t ID_MMFR[4U];            /*!< Offset: 0x050 (R/ )  Memory Model Feature Register */
   __IM  uint32_t ID_ISAR[6U];            /*!< Offset: 0x060 (R/ )  Instruction Set Attributes Register */
   __IM  uint32_t CLIDR;                  /*!< Offset: 0x078 (R/ )  Cache Level ID register */
@@ -521,7 +528,10 @@ typedef struct
   __IOM uint32_t CSSELR;                 /*!< Offset: 0x084 (R/W)  Cache Size Selection Register */
   __IOM uint32_t CPACR;                  /*!< Offset: 0x088 (R/W)  Coprocessor Access Control Register */
   __IOM uint32_t NSACR;                  /*!< Offset: 0x08C (R/W)  Non-Secure Access Control Register */
-        uint32_t RESERVED3[92U];
+        uint32_t RESERVED7[21U];
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x0E4 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x0E8 (R/W)  Secure Fault Address Register */
+        uint32_t RESERVED3[69U];
   __OM  uint32_t STIR;                   /*!< Offset: 0x200 ( /W)  Software Triggered Interrupt Register */
         uint32_t RESERVED4[15U];
   __IM  uint32_t MVFR0;                  /*!< Offset: 0x240 (R/ )  Media and VFP Feature Register 0 */
@@ -538,6 +548,7 @@ typedef struct
   __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
   __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
   __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
+  __OM  uint32_t BPIALL;                 /*!< Offset: 0x278 ( /W)  Branch Predictor Invalidate All */
 } SCB_Type;
 
 /* SCB CPUID Register Definitions */
@@ -738,22 +749,22 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MLSPERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 5U)               /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
 #define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -1593,8 +1604,9 @@ typedef struct
   __IOM uint32_t FPCCR;                  /*!< Offset: 0x004 (R/W)  Floating-Point Context Control Register */
   __IOM uint32_t FPCAR;                  /*!< Offset: 0x008 (R/W)  Floating-Point Context Address Register */
   __IOM uint32_t FPDSCR;                 /*!< Offset: 0x00C (R/W)  Floating-Point Default Status Control Register */
-  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and FP Feature Register 0 */
-  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and FP Feature Register 1 */
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x018 (R/ )  Media and VFP Feature Register 2 */
 } FPU_Type;
 
 /* Floating-Point Context Control Register Definitions */
@@ -1666,7 +1678,7 @@ typedef struct
 #define FPU_FPDSCR_RMode_Pos               22U                                            /*!< FPDSCR: RMode bit Position */
 #define FPU_FPDSCR_RMode_Msk               (3UL << FPU_FPDSCR_RMode_Pos)                  /*!< FPDSCR: RMode bit Mask */
 
-/* Media and FP Feature Register 0 Definitions */
+/* Media and VFP Feature Register 0 Definitions */
 #define FPU_MVFR0_FP_rounding_modes_Pos    28U                                            /*!< MVFR0: FP rounding modes bits Position */
 #define FPU_MVFR0_FP_rounding_modes_Msk    (0xFUL << FPU_MVFR0_FP_rounding_modes_Pos)     /*!< MVFR0: FP rounding modes bits Mask */
 
@@ -1691,7 +1703,7 @@ typedef struct
 #define FPU_MVFR0_A_SIMD_registers_Pos      0U                                            /*!< MVFR0: A_SIMD registers bits Position */
 #define FPU_MVFR0_A_SIMD_registers_Msk     (0xFUL /*<< FPU_MVFR0_A_SIMD_registers_Pos*/)  /*!< MVFR0: A_SIMD registers bits Mask */
 
-/* Media and FP Feature Register 1 Definitions */
+/* Media and VFP Feature Register 1 Definitions */
 #define FPU_MVFR1_FP_fused_MAC_Pos         28U                                            /*!< MVFR1: FP fused MAC bits Position */
 #define FPU_MVFR1_FP_fused_MAC_Msk         (0xFUL << FPU_MVFR1_FP_fused_MAC_Pos)          /*!< MVFR1: FP fused MAC bits Mask */
 
@@ -1704,9 +1716,13 @@ typedef struct
 #define FPU_MVFR1_FtZ_mode_Pos              0U                                            /*!< MVFR1: FtZ mode bits Position */
 #define FPU_MVFR1_FtZ_mode_Msk             (0xFUL /*<< FPU_MVFR1_FtZ_mode_Pos*/)          /*!< MVFR1: FtZ mode bits Mask */
 
-/*@} end of group CMSIS_FPU */
+/* Media and VFP Feature Register 2 Definitions */
+#define FPU_MVFR2_FPMisc_Pos                4U                                            /*!< MVFR2: FPMisc bits Position */
+#define FPU_MVFR2_FPMisc_Msk               (0xFUL << FPU_MVFR2_FPMisc_Pos)                /*!< MVFR2: FPMisc bits Mask */
 
+/*@} end of group CMSIS_FPU */
 
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
 /**
   \ingroup  CMSIS_core_register
   \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
@@ -1715,7 +1731,7 @@ typedef struct
  */
 
 /**
-  \brief  Structure type to access the Core Debug Register (CoreDebug).
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
  */
 typedef struct
 {
@@ -1723,124 +1739,354 @@ typedef struct
   __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
   __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
   __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
-        uint32_t RESERVED4[1U];
+        uint32_t RESERVED0[1U];
   __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
   __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
 } CoreDebug_Type;
 
 /* Debug Halting Control and Status Register Definitions */
-#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< CoreDebug DHCSR: DBGKEY Position */
-#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< CoreDebug DHCSR: DBGKEY Mask */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
 
-#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< CoreDebug DHCSR: S_RESTART_ST Position */
-#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< CoreDebug DHCSR: S_RESTART_ST Mask */
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
 
-#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< CoreDebug DHCSR: S_RESET_ST Position */
-#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< CoreDebug DHCSR: S_RESET_ST Mask */
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
 
-#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< CoreDebug DHCSR: S_RETIRE_ST Position */
-#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< CoreDebug DHCSR: S_RETIRE_ST Mask */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
 
-#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< CoreDebug DHCSR: S_LOCKUP Position */
-#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< CoreDebug DHCSR: S_LOCKUP Mask */
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
 
-#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< CoreDebug DHCSR: S_SLEEP Position */
-#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< CoreDebug DHCSR: S_SLEEP Mask */
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
 
-#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< CoreDebug DHCSR: S_HALT Position */
-#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< CoreDebug DHCSR: S_HALT Mask */
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
 
-#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< CoreDebug DHCSR: S_REGRDY Position */
-#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< CoreDebug DHCSR: S_REGRDY Mask */
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
 
-#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< CoreDebug DHCSR: C_SNAPSTALL Position */
-#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< CoreDebug DHCSR: C_SNAPSTALL Mask */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Position */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Mask */
 
-#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< CoreDebug DHCSR: C_MASKINTS Position */
-#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< CoreDebug DHCSR: C_MASKINTS Mask */
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
 
-#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< CoreDebug DHCSR: C_STEP Position */
-#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< CoreDebug DHCSR: C_STEP Mask */
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
 
-#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< CoreDebug DHCSR: C_HALT Position */
-#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< CoreDebug DHCSR: C_HALT Mask */
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
 
-#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< CoreDebug DHCSR: C_DEBUGEN Position */
-#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< CoreDebug DHCSR: C_DEBUGEN Mask */
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
 
 /* Debug Core Register Selector Register Definitions */
-#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< CoreDebug DCRSR: REGWnR Position */
-#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< CoreDebug DCRSR: REGWnR Mask */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
 
-#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< CoreDebug DCRSR: REGSEL Position */
-#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< CoreDebug DCRSR: REGSEL Mask */
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
 
 /* Debug Exception and Monitor Control Register Definitions */
-#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< CoreDebug DEMCR: TRCENA Position */
-#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< CoreDebug DEMCR: TRCENA Mask */
+#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: TRCENA Position */
+#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< \deprecated CoreDebug DEMCR: TRCENA Mask */
 
-#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< CoreDebug DEMCR: MON_REQ Position */
-#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< CoreDebug DEMCR: MON_REQ Mask */
+#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< \deprecated CoreDebug DEMCR: MON_REQ Position */
+#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< \deprecated CoreDebug DEMCR: MON_REQ Mask */
 
-#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< CoreDebug DEMCR: MON_STEP Position */
-#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< CoreDebug DEMCR: MON_STEP Mask */
+#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< \deprecated CoreDebug DEMCR: MON_STEP Position */
+#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_STEP Mask */
 
-#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< CoreDebug DEMCR: MON_PEND Position */
-#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< CoreDebug DEMCR: MON_PEND Mask */
+#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< \deprecated CoreDebug DEMCR: MON_PEND Position */
+#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_PEND Mask */
 
-#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< CoreDebug DEMCR: MON_EN Position */
-#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< CoreDebug DEMCR: MON_EN Mask */
+#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< \deprecated CoreDebug DEMCR: MON_EN Position */
+#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< \deprecated CoreDebug DEMCR: MON_EN Mask */
 
-#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< CoreDebug DEMCR: VC_HARDERR Position */
-#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< CoreDebug DEMCR: VC_HARDERR Mask */
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
 
-#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< CoreDebug DEMCR: VC_INTERR Position */
-#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< CoreDebug DEMCR: VC_INTERR Mask */
+#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< \deprecated CoreDebug DEMCR: VC_INTERR Position */
+#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_INTERR Mask */
 
-#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< CoreDebug DEMCR: VC_BUSERR Position */
-#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< CoreDebug DEMCR: VC_BUSERR Mask */
+#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Position */
+#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Mask */
 
-#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< CoreDebug DEMCR: VC_STATERR Position */
-#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< CoreDebug DEMCR: VC_STATERR Mask */
+#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< \deprecated CoreDebug DEMCR: VC_STATERR Position */
+#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_STATERR Mask */
 
-#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< CoreDebug DEMCR: VC_CHKERR Position */
-#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< CoreDebug DEMCR: VC_CHKERR Mask */
+#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Position */
+#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Mask */
 
-#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< CoreDebug DEMCR: VC_NOCPERR Position */
-#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< CoreDebug DEMCR: VC_NOCPERR Mask */
+#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Position */
+#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Mask */
 
-#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< CoreDebug DEMCR: VC_MMERR Position */
-#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< CoreDebug DEMCR: VC_MMERR Mask */
+#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< \deprecated CoreDebug DEMCR: VC_MMERR Position */
+#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< \deprecated CoreDebug DEMCR: VC_MMERR Mask */
 
-#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< CoreDebug DEMCR: VC_CORERESET Position */
-#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< CoreDebug DEMCR: VC_CORERESET Mask */
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
 
 /* Debug Authentication Control Register Definitions */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
 
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
 
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< CoreDebug DAUTHCTRL: INTSPIDEN Position */
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
 
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< CoreDebug DAUTHCTRL: SPIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
 
 /* Debug Security Control and Status Register Definitions */
-#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< CoreDebug DSCSR: CDS Position */
-#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< CoreDebug DSCSR: CDS Mask */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
 
-#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< CoreDebug DSCSR: SBRSEL Position */
-#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< CoreDebug DSCSR: SBRSEL Mask */
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
 
-#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< CoreDebug DSCSR: SBRSELEN Position */
-#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< CoreDebug DSCSR: SBRSELEN Mask */
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
 
 /*@} end of group CMSIS_CoreDebug */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_SNAPSTALL_Pos           5U                                            /*!< DCB DHCSR: Snap stall control Position */
+#define DCB_DHCSR_C_SNAPSTALL_Msk          (0x1UL << DCB_DHCSR_C_SNAPSTALL_Pos)           /*!< DCB DHCSR: Snap stall control Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_MONPRKEY_Pos             23U                                            /*!< DCB DEMCR: Monitor pend req key Position */
+#define DCB_DEMCR_MONPRKEY_Msk             (0x1UL << DCB_DEMCR_MONPRKEY_Pos)              /*!< DCB DEMCR: Monitor pend req key Mask */
+
+#define DCB_DEMCR_UMON_EN_Pos              21U                                            /*!< DCB DEMCR: Unprivileged monitor enable Position */
+#define DCB_DEMCR_UMON_EN_Msk              (0x1UL << DCB_DEMCR_UMON_EN_Pos)               /*!< DCB DEMCR: Unprivileged monitor enable Mask */
+
+#define DCB_DEMCR_SDME_Pos                 20U                                            /*!< DCB DEMCR: Secure DebugMonitor enable Position */
+#define DCB_DEMCR_SDME_Msk                 (0x1UL << DCB_DEMCR_SDME_Pos)                  /*!< DCB DEMCR: Secure DebugMonitor enable Mask */
+
+#define DCB_DEMCR_MON_REQ_Pos              19U                                            /*!< DCB DEMCR: Monitor request Position */
+#define DCB_DEMCR_MON_REQ_Msk              (0x1UL << DCB_DEMCR_MON_REQ_Pos)               /*!< DCB DEMCR: Monitor request Mask */
+
+#define DCB_DEMCR_MON_STEP_Pos             18U                                            /*!< DCB DEMCR: Monitor step Position */
+#define DCB_DEMCR_MON_STEP_Msk             (0x1UL << DCB_DEMCR_MON_STEP_Pos)              /*!< DCB DEMCR: Monitor step Mask */
+
+#define DCB_DEMCR_MON_PEND_Pos             17U                                            /*!< DCB DEMCR: Monitor pend Position */
+#define DCB_DEMCR_MON_PEND_Msk             (0x1UL << DCB_DEMCR_MON_PEND_Pos)              /*!< DCB DEMCR: Monitor pend Mask */
+
+#define DCB_DEMCR_MON_EN_Pos               16U                                            /*!< DCB DEMCR: Monitor enable Position */
+#define DCB_DEMCR_MON_EN_Msk               (0x1UL << DCB_DEMCR_MON_EN_Pos)                /*!< DCB DEMCR: Monitor enable Mask */
+
+#define DCB_DEMCR_VC_SFERR_Pos             11U                                            /*!< DCB DEMCR: Vector Catch SecureFault Position */
+#define DCB_DEMCR_VC_SFERR_Msk             (0x1UL << DCB_DEMCR_VC_SFERR_Pos)              /*!< DCB DEMCR: Vector Catch SecureFault Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_INTERR_Pos             9U                                            /*!< DCB DEMCR: Vector Catch interrupt errors Position */
+#define DCB_DEMCR_VC_INTERR_Msk            (0x1UL << DCB_DEMCR_VC_INTERR_Pos)             /*!< DCB DEMCR: Vector Catch interrupt errors Mask */
+
+#define DCB_DEMCR_VC_BUSERR_Pos             8U                                            /*!< DCB DEMCR: Vector Catch BusFault errors Position */
+#define DCB_DEMCR_VC_BUSERR_Msk            (0x1UL << DCB_DEMCR_VC_BUSERR_Pos)             /*!< DCB DEMCR: Vector Catch BusFault errors Mask */
+
+#define DCB_DEMCR_VC_STATERR_Pos            7U                                            /*!< DCB DEMCR: Vector Catch state errors Position */
+#define DCB_DEMCR_VC_STATERR_Msk           (0x1UL << DCB_DEMCR_VC_STATERR_Pos)            /*!< DCB DEMCR: Vector Catch state errors Mask */
+
+#define DCB_DEMCR_VC_CHKERR_Pos             6U                                            /*!< DCB DEMCR: Vector Catch check errors Position */
+#define DCB_DEMCR_VC_CHKERR_Msk            (0x1UL << DCB_DEMCR_VC_CHKERR_Pos)             /*!< DCB DEMCR: Vector Catch check errors Mask */
+
+#define DCB_DEMCR_VC_NOCPERR_Pos            5U                                            /*!< DCB DEMCR: Vector Catch NOCP errors Position */
+#define DCB_DEMCR_VC_NOCPERR_Msk           (0x1UL << DCB_DEMCR_VC_NOCPERR_Pos)            /*!< DCB DEMCR: Vector Catch NOCP errors Mask */
+
+#define DCB_DEMCR_VC_MMERR_Pos              4U                                            /*!< DCB DEMCR: Vector Catch MemManage errors Position */
+#define DCB_DEMCR_VC_MMERR_Msk             (0x1UL << DCB_DEMCR_VC_MMERR_Pos)              /*!< DCB DEMCR: Vector Catch MemManage errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
 /**
   \ingroup    CMSIS_core_register
   \defgroup   CMSIS_core_bitfield     Core register bit field macros
@@ -1879,7 +2125,9 @@ typedef struct
   #define ITM_BASE            (0xE0000000UL)                             /*!< ITM Base Address */
   #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
   #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
-  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< Core Debug Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
   #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
   #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
   #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
@@ -1891,7 +2139,9 @@ typedef struct
   #define ITM                 ((ITM_Type       *)     ITM_BASE         ) /*!< ITM configuration struct */
   #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
   #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
-  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< Core Debug configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
@@ -1908,7 +2158,9 @@ typedef struct
 
 #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
   #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
-  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< Core Debug Base Address           (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
   #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
   #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
   #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
@@ -1917,7 +2169,9 @@ typedef struct
   #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
   #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
   #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
-  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< Core Debug configuration struct   (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
@@ -1931,6 +2185,15 @@ typedef struct
 /*@} */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_register_aliases     Backwards Compatibility Aliases
+  \brief      Register alias definitions for backwards compatibility.
+  @{
+ */
+#define ID_ADR  (ID_AFR)    /*!< SCB Auxiliary Feature Register */
+/*@} */
+
 
 /*******************************************************************************
  *                Hardware Abstraction Layer
@@ -2053,7 +2316,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -2345,6 +2610,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
   uint32_t *vectors = (uint32_t *)SCB->VTOR;
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
 }
 
 
@@ -2633,6 +2899,13 @@ __STATIC_INLINE uint32_t SCB_GetFPUType(void)
 /*@} end of CMSIS_Core_FpuFunctions */
 
 
+/* ##########################  Cache functions  #################################### */
+
+#if ((defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)) || \
+     (defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)))
+#include "cachel1_armv7.h"
+#endif
+
 
 /* ##########################   SAU functions  #################################### */
 /**
@@ -2671,6 +2944,110 @@ __STATIC_INLINE void TZ_SAU_Disable(void)
 
 
 
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
 /* ##################################    SysTick function  ############################################ */
 /**
   \ingroup  CMSIS_Core_FunctionInterface
diff --git a/lib/cmsis/inc/core_cm0.h b/lib/cmsis/inc/core_cm0.h
index fcf27578ccf59..6441ff34190a9 100644
--- a/lib/cmsis/inc/core_cm0.h
+++ b/lib/cmsis/inc/core_cm0.h
@@ -1,8 +1,8 @@
 /**************************************************************************//**
  * @file     core_cm0.h
  * @brief    CMSIS Cortex-M0 Core Peripheral Access Layer Header File
- * @version  V5.0.6
- * @date     13. March 2019
+ * @version  V5.0.8
+ * @date     21. August 2019
  ******************************************************************************/
 /*
  * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
@@ -624,7 +624,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[0U] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -829,8 +831,9 @@ __STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGr
  */
 __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
-  uint32_t vectors = 0x0U;
-  (* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4)) = vector;
+  uint32_t *vectors = (uint32_t *)(NVIC_USER_IRQ_OFFSET << 2);      /* point to 1st user interrupt */
+  *(vectors + (int32_t)IRQn) = vector;                              /* use pointer arithmetic to access vector */
+  /* ARM Application Note 321 states that the M0 does not require the architectural barrier */
 }
 
 
@@ -844,8 +847,8 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
  */
 __STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
 {
-  uint32_t vectors = 0x0U;
-  return (uint32_t)(* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4));
+  uint32_t *vectors = (uint32_t *)(NVIC_USER_IRQ_OFFSET << 2);      /* point to 1st user interrupt */
+  return *(vectors + (int32_t)IRQn);                                /* use pointer arithmetic to access vector */
 }
 
 
diff --git a/lib/cmsis/inc/core_cm0plus.h b/lib/cmsis/inc/core_cm0plus.h
index 65ea443095f08..4e7179a6146cd 100644
--- a/lib/cmsis/inc/core_cm0plus.h
+++ b/lib/cmsis/inc/core_cm0plus.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_cm0plus.h
  * @brief    CMSIS Cortex-M0+ Core Peripheral Access Layer Header File
- * @version  V5.0.7
- * @date     13. March 2019
+ * @version  V5.0.9
+ * @date     21. August 2019
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -742,7 +742,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[0U] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -948,11 +950,13 @@ __STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGr
 __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
 #if defined (__VTOR_PRESENT) && (__VTOR_PRESENT == 1U)
-  uint32_t vectors = SCB->VTOR;
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
 #else
-  uint32_t vectors = 0x0U;
+  uint32_t *vectors = (uint32_t *)(NVIC_USER_IRQ_OFFSET << 2);      /* point to 1st user interrupt */
+  *(vectors + (int32_t)IRQn) = vector;                              /* use pointer arithmetic to access vector */
 #endif
-  (* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4)) = vector;
+  /* ARM Application Note 321 states that the M0+ does not require the architectural barrier */
 }
 
 
@@ -967,11 +971,12 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 __STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
 {
 #if defined (__VTOR_PRESENT) && (__VTOR_PRESENT == 1U)
-  uint32_t vectors = SCB->VTOR;
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  return vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET];
 #else
-  uint32_t vectors = 0x0U;
+  uint32_t *vectors = (uint32_t *)(NVIC_USER_IRQ_OFFSET << 2);      /* point to 1st user interrupt */
+  return *(vectors + (int32_t)IRQn);                                /* use pointer arithmetic to access vector */
 #endif
-  return (uint32_t)(* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4));
 }
 
 
diff --git a/lib/cmsis/inc/core_cm1.h b/lib/cmsis/inc/core_cm1.h
index 72c515cb092e0..76b4569743a65 100644
--- a/lib/cmsis/inc/core_cm1.h
+++ b/lib/cmsis/inc/core_cm1.h
@@ -651,7 +651,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[0U] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -858,6 +860,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
   uint32_t *vectors = (uint32_t *)0x0U;
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  /* ARM Application Note 321 states that the M1 does not require the architectural barrier */
 }
 
 
diff --git a/lib/cmsis/inc/core_cm23.h b/lib/cmsis/inc/core_cm23.h
index 26fe163a0e82c..55fff99509653 100644
--- a/lib/cmsis/inc/core_cm23.h
+++ b/lib/cmsis/inc/core_cm23.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_cm23.h
  * @brief    CMSIS Cortex-M23 Core Peripheral Access Layer Header File
- * @version  V5.0.8
- * @date     12. November 2018
+ * @version  V5.1.0
+ * @date     11. February 2020
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,11 @@
  */
 
 #if   defined ( __ICCARM__ )
-  #pragma system_include         /* treat file as system include file for MISRA check */
+  #pragma system_include                        /* treat file as system include file for MISRA check */
 #elif defined (__clang__)
-  #pragma clang system_header   /* treat file as system include file */
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
 #endif
 
 #ifndef __CORE_CM23_H_GENERIC
@@ -1050,6 +1052,7 @@ typedef struct
 #endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
 
 
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
 /**
   \ingroup  CMSIS_core_register
   \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
@@ -1058,7 +1061,7 @@ typedef struct
  */
 
 /**
-  \brief  Structure type to access the Core Debug Register (CoreDebug).
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
  */
 typedef struct
 {
@@ -1066,91 +1069,276 @@ typedef struct
   __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
   __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
   __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
-        uint32_t RESERVED4[1U];
+        uint32_t RESERVED0[1U];
   __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
   __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
 } CoreDebug_Type;
 
 /* Debug Halting Control and Status Register Definitions */
-#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< CoreDebug DHCSR: DBGKEY Position */
-#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< CoreDebug DHCSR: DBGKEY Mask */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
 
-#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< CoreDebug DHCSR: S_RESTART_ST Position */
-#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< CoreDebug DHCSR: S_RESTART_ST Mask */
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
 
-#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< CoreDebug DHCSR: S_RESET_ST Position */
-#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< CoreDebug DHCSR: S_RESET_ST Mask */
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
 
-#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< CoreDebug DHCSR: S_RETIRE_ST Position */
-#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< CoreDebug DHCSR: S_RETIRE_ST Mask */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
 
-#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< CoreDebug DHCSR: S_LOCKUP Position */
-#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< CoreDebug DHCSR: S_LOCKUP Mask */
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
 
-#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< CoreDebug DHCSR: S_SLEEP Position */
-#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< CoreDebug DHCSR: S_SLEEP Mask */
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
 
-#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< CoreDebug DHCSR: S_HALT Position */
-#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< CoreDebug DHCSR: S_HALT Mask */
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
 
-#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< CoreDebug DHCSR: S_REGRDY Position */
-#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< CoreDebug DHCSR: S_REGRDY Mask */
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
 
-#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< CoreDebug DHCSR: C_MASKINTS Position */
-#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< CoreDebug DHCSR: C_MASKINTS Mask */
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
 
-#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< CoreDebug DHCSR: C_STEP Position */
-#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< CoreDebug DHCSR: C_STEP Mask */
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
 
-#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< CoreDebug DHCSR: C_HALT Position */
-#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< CoreDebug DHCSR: C_HALT Mask */
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
 
-#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< CoreDebug DHCSR: C_DEBUGEN Position */
-#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< CoreDebug DHCSR: C_DEBUGEN Mask */
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
 
 /* Debug Core Register Selector Register Definitions */
-#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< CoreDebug DCRSR: REGWnR Position */
-#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< CoreDebug DCRSR: REGWnR Mask */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
 
-#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< CoreDebug DCRSR: REGSEL Position */
-#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< CoreDebug DCRSR: REGSEL Mask */
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
 
 /* Debug Exception and Monitor Control Register */
-#define CoreDebug_DEMCR_DWTENA_Pos         24U                                            /*!< CoreDebug DEMCR: DWTENA Position */
-#define CoreDebug_DEMCR_DWTENA_Msk         (1UL << CoreDebug_DEMCR_DWTENA_Pos)            /*!< CoreDebug DEMCR: DWTENA Mask */
+#define CoreDebug_DEMCR_DWTENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: DWTENA Position */
+#define CoreDebug_DEMCR_DWTENA_Msk         (1UL << CoreDebug_DEMCR_DWTENA_Pos)            /*!< \deprecated CoreDebug DEMCR: DWTENA Mask */
 
-#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< CoreDebug DEMCR: VC_HARDERR Position */
-#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< CoreDebug DEMCR: VC_HARDERR Mask */
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
 
-#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< CoreDebug DEMCR: VC_CORERESET Position */
-#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< CoreDebug DEMCR: VC_CORERESET Mask */
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
 
 /* Debug Authentication Control Register Definitions */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
 
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
 
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< CoreDebug DAUTHCTRL: INTSPIDEN Position */
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
 
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< CoreDebug DAUTHCTRL: SPIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
 
 /* Debug Security Control and Status Register Definitions */
-#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< CoreDebug DSCSR: CDS Position */
-#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< CoreDebug DSCSR: CDS Mask */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
 
-#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< CoreDebug DSCSR: SBRSEL Position */
-#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< CoreDebug DSCSR: SBRSEL Mask */
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
 
-#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< CoreDebug DSCSR: SBRSELEN Position */
-#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< CoreDebug DSCSR: SBRSELEN Mask */
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
 
 /*@} end of group CMSIS_CoreDebug */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
 /**
   \ingroup    CMSIS_core_register
   \defgroup   CMSIS_core_bitfield     Core register bit field macros
@@ -1188,7 +1376,9 @@ typedef struct
   #define SCS_BASE            (0xE000E000UL)                             /*!< System Control Space Base Address */
   #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
   #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
-  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< Core Debug Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
   #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
   #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
   #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
@@ -1199,7 +1389,9 @@ typedef struct
   #define NVIC                ((NVIC_Type      *)     NVIC_BASE        ) /*!< NVIC configuration struct */
   #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
   #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
-  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< Core Debug configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
@@ -1213,7 +1405,9 @@ typedef struct
 
 #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
   #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
-  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< Core Debug Base Address           (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
   #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
   #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
   #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
@@ -1221,7 +1415,9 @@ typedef struct
   #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
   #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
   #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
-  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< Core Debug configuration struct   (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
@@ -1238,6 +1434,7 @@ typedef struct
   Core Function Interface contains:
   - Core NVIC Functions
   - Core SysTick Functions
+  - Core Debug Functions
   - Core Register Access Functions
  ******************************************************************************/
 /**
@@ -1304,11 +1501,11 @@ typedef struct
 /* Integrity Signature (from ARMv8-M Architecture Reference Manual) for exception context stacking                            */
 #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)  /* Value for processors with floating-point extension:                  */
 #define EXC_INTEGRITY_SIGNATURE     (0xFEFA125AUL)     /* bit [0] SFTC must match LR bit[4] EXC_RETURN_FTYPE                   */
-#else 
+#else
 #define EXC_INTEGRITY_SIGNATURE     (0xFEFA125BUL)     /* Value for processors without floating-point extension                */
 #endif
 
-	
+
 /* Interrupt Priorities are WORD accessible only under Armv6-M                  */
 /* The following MACROS handle generation of the register offset and byte masks */
 #define _BIT_SHIFT(IRQn)         (  ((((uint32_t)(int32_t)(IRQn))         )      &  0x03UL) * 8UL)
@@ -1328,7 +1525,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -1627,6 +1826,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
   uint32_t *vectors = (uint32_t *)0x0U;
 #endif
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
 }
 
 
@@ -1910,6 +2110,110 @@ __STATIC_INLINE void TZ_SAU_Disable(void)
 
 
 
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+ 
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+ 
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
 /* ##################################    SysTick function  ############################################ */
 /**
   \ingroup  CMSIS_Core_FunctionInterface
diff --git a/lib/cmsis/inc/core_cm3.h b/lib/cmsis/inc/core_cm3.h
index ea5405088c3ef..74fb87e5c561f 100644
--- a/lib/cmsis/inc/core_cm3.h
+++ b/lib/cmsis/inc/core_cm3.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_cm3.h
  * @brief    CMSIS Cortex-M3 Core Peripheral Access Layer Header File
- * @version  V5.1.0
- * @date     13. March 2019
+ * @version  V5.1.2
+ * @date     04. June 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -62,7 +62,7 @@
 
 #include "cmsis_version.h"
 
-/*  CMSIS CM3 definitions */
+/* CMSIS CM3 definitions */
 #define __CM3_CMSIS_VERSION_MAIN  (__CM_CMSIS_VERSION_MAIN)              /*!< \deprecated [31:16] CMSIS HAL main version */
 #define __CM3_CMSIS_VERSION_SUB   (__CM_CMSIS_VERSION_SUB)               /*!< \deprecated [15:0]  CMSIS HAL sub version */
 #define __CM3_CMSIS_VERSION       ((__CM3_CMSIS_VERSION_MAIN << 16U) | \
@@ -142,6 +142,11 @@
     #warning "__MPU_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -560,19 +565,19 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -1443,7 +1448,7 @@ typedef struct
 
 #ifdef CMSIS_VECTAB_VIRTUAL
   #ifndef CMSIS_VECTAB_VIRTUAL_HEADER_FILE
-   #define CMSIS_VECTAB_VIRTUAL_HEADER_FILE "cmsis_vectab_virtual.h"
+    #define CMSIS_VECTAB_VIRTUAL_HEADER_FILE "cmsis_vectab_virtual.h"
   #endif
   #include CMSIS_VECTAB_VIRTUAL_HEADER_FILE
 #else
@@ -1478,7 +1483,7 @@ __STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos) );               /* Insert write key and priority group */
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)  );              /* Insert write key and priority group */
   SCB->AIRCR =  reg_value;
 }
 
@@ -1504,7 +1509,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -1727,8 +1734,9 @@ __STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGr
  */
 __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
-  uint32_t vectors = (uint32_t )SCB->VTOR;
-  (* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4)) = vector;
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  /* ARM Application Note 321 states that the M3 does not require the architectural barrier */
 }
 
 
@@ -1742,8 +1750,8 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
  */
 __STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
 {
-  uint32_t vectors = (uint32_t )SCB->VTOR;
-  return (uint32_t)(* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4));
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  return vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET];
 }
 
 
@@ -1768,6 +1776,7 @@ __NO_RETURN __STATIC_INLINE void __NVIC_SystemReset(void)
 
 /*@} end of CMSIS_Core_NVICFunctions */
 
+
 /* ##########################  MPU functions  #################################### */
 
 #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
diff --git a/lib/cmsis/inc/core_cm33.h b/lib/cmsis/inc/core_cm33.h
index d5d97a96f2d6b..18a2e6fb0343a 100644
--- a/lib/cmsis/inc/core_cm33.h
+++ b/lib/cmsis/inc/core_cm33.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_cm33.h
  * @brief    CMSIS Cortex-M33 Core Peripheral Access Layer Header File
- * @version  V5.1.0
- * @date     12. November 2018
+ * @version  V5.2.3
+ * @date     13. October 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,11 @@
  */
 
 #if   defined ( __ICCARM__ )
-  #pragma system_include         /* treat file as system include file for MISRA check */
+  #pragma system_include                        /* treat file as system include file for MISRA check */
 #elif defined (__clang__)
-  #pragma clang system_header   /* treat file as system include file */
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
 #endif
 
 #ifndef __CORE_CM33_H_GENERIC
@@ -248,6 +250,11 @@
     #warning "__DSP_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -512,7 +519,7 @@ typedef struct
   __IOM uint32_t AFSR;                   /*!< Offset: 0x03C (R/W)  Auxiliary Fault Status Register */
   __IM  uint32_t ID_PFR[2U];             /*!< Offset: 0x040 (R/ )  Processor Feature Register */
   __IM  uint32_t ID_DFR;                 /*!< Offset: 0x048 (R/ )  Debug Feature Register */
-  __IM  uint32_t ID_ADR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
+  __IM  uint32_t ID_AFR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
   __IM  uint32_t ID_MMFR[4U];            /*!< Offset: 0x050 (R/ )  Memory Model Feature Register */
   __IM  uint32_t ID_ISAR[6U];            /*!< Offset: 0x060 (R/ )  Instruction Set Attributes Register */
   __IM  uint32_t CLIDR;                  /*!< Offset: 0x078 (R/ )  Cache Level ID register */
@@ -521,7 +528,10 @@ typedef struct
   __IOM uint32_t CSSELR;                 /*!< Offset: 0x084 (R/W)  Cache Size Selection Register */
   __IOM uint32_t CPACR;                  /*!< Offset: 0x088 (R/W)  Coprocessor Access Control Register */
   __IOM uint32_t NSACR;                  /*!< Offset: 0x08C (R/W)  Non-Secure Access Control Register */
-        uint32_t RESERVED3[92U];
+        uint32_t RESERVED7[21U];
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x0E4 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x0E8 (R/W)  Secure Fault Address Register */
+        uint32_t RESERVED3[69U];
   __OM  uint32_t STIR;                   /*!< Offset: 0x200 ( /W)  Software Triggered Interrupt Register */
         uint32_t RESERVED4[15U];
   __IM  uint32_t MVFR0;                  /*!< Offset: 0x240 (R/ )  Media and VFP Feature Register 0 */
@@ -538,6 +548,7 @@ typedef struct
   __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
   __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
   __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
+  __OM  uint32_t BPIALL;                 /*!< Offset: 0x278 ( /W)  Branch Predictor Invalidate All */
 } SCB_Type;
 
 /* SCB CPUID Register Definitions */
@@ -738,22 +749,22 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MLSPERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 5U)               /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
 #define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -1668,8 +1679,9 @@ typedef struct
   __IOM uint32_t FPCCR;                  /*!< Offset: 0x004 (R/W)  Floating-Point Context Control Register */
   __IOM uint32_t FPCAR;                  /*!< Offset: 0x008 (R/W)  Floating-Point Context Address Register */
   __IOM uint32_t FPDSCR;                 /*!< Offset: 0x00C (R/W)  Floating-Point Default Status Control Register */
-  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and FP Feature Register 0 */
-  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and FP Feature Register 1 */
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x018 (R/ )  Media and VFP Feature Register 2 */
 } FPU_Type;
 
 /* Floating-Point Context Control Register Definitions */
@@ -1741,7 +1753,7 @@ typedef struct
 #define FPU_FPDSCR_RMode_Pos               22U                                            /*!< FPDSCR: RMode bit Position */
 #define FPU_FPDSCR_RMode_Msk               (3UL << FPU_FPDSCR_RMode_Pos)                  /*!< FPDSCR: RMode bit Mask */
 
-/* Media and FP Feature Register 0 Definitions */
+/* Media and VFP Feature Register 0 Definitions */
 #define FPU_MVFR0_FP_rounding_modes_Pos    28U                                            /*!< MVFR0: FP rounding modes bits Position */
 #define FPU_MVFR0_FP_rounding_modes_Msk    (0xFUL << FPU_MVFR0_FP_rounding_modes_Pos)     /*!< MVFR0: FP rounding modes bits Mask */
 
@@ -1766,7 +1778,7 @@ typedef struct
 #define FPU_MVFR0_A_SIMD_registers_Pos      0U                                            /*!< MVFR0: A_SIMD registers bits Position */
 #define FPU_MVFR0_A_SIMD_registers_Msk     (0xFUL /*<< FPU_MVFR0_A_SIMD_registers_Pos*/)  /*!< MVFR0: A_SIMD registers bits Mask */
 
-/* Media and FP Feature Register 1 Definitions */
+/* Media and VFP Feature Register 1 Definitions */
 #define FPU_MVFR1_FP_fused_MAC_Pos         28U                                            /*!< MVFR1: FP fused MAC bits Position */
 #define FPU_MVFR1_FP_fused_MAC_Msk         (0xFUL << FPU_MVFR1_FP_fused_MAC_Pos)          /*!< MVFR1: FP fused MAC bits Mask */
 
@@ -1779,9 +1791,13 @@ typedef struct
 #define FPU_MVFR1_FtZ_mode_Pos              0U                                            /*!< MVFR1: FtZ mode bits Position */
 #define FPU_MVFR1_FtZ_mode_Msk             (0xFUL /*<< FPU_MVFR1_FtZ_mode_Pos*/)          /*!< MVFR1: FtZ mode bits Mask */
 
-/*@} end of group CMSIS_FPU */
+/* Media and VFP Feature Register 2 Definitions */
+#define FPU_MVFR2_FPMisc_Pos                4U                                            /*!< MVFR2: FPMisc bits Position */
+#define FPU_MVFR2_FPMisc_Msk               (0xFUL << FPU_MVFR2_FPMisc_Pos)                /*!< MVFR2: FPMisc bits Mask */
 
+/*@} end of group CMSIS_FPU */
 
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
 /**
   \ingroup  CMSIS_core_register
   \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
@@ -1790,7 +1806,7 @@ typedef struct
  */
 
 /**
-  \brief  Structure type to access the Core Debug Register (CoreDebug).
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
  */
 typedef struct
 {
@@ -1798,124 +1814,354 @@ typedef struct
   __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
   __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
   __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
-        uint32_t RESERVED4[1U];
+        uint32_t RESERVED0[1U];
   __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
   __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
 } CoreDebug_Type;
 
 /* Debug Halting Control and Status Register Definitions */
-#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< CoreDebug DHCSR: DBGKEY Position */
-#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< CoreDebug DHCSR: DBGKEY Mask */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
 
-#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< CoreDebug DHCSR: S_RESTART_ST Position */
-#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< CoreDebug DHCSR: S_RESTART_ST Mask */
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
 
-#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< CoreDebug DHCSR: S_RESET_ST Position */
-#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< CoreDebug DHCSR: S_RESET_ST Mask */
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
 
-#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< CoreDebug DHCSR: S_RETIRE_ST Position */
-#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< CoreDebug DHCSR: S_RETIRE_ST Mask */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
 
-#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< CoreDebug DHCSR: S_LOCKUP Position */
-#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< CoreDebug DHCSR: S_LOCKUP Mask */
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
 
-#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< CoreDebug DHCSR: S_SLEEP Position */
-#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< CoreDebug DHCSR: S_SLEEP Mask */
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
 
-#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< CoreDebug DHCSR: S_HALT Position */
-#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< CoreDebug DHCSR: S_HALT Mask */
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
 
-#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< CoreDebug DHCSR: S_REGRDY Position */
-#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< CoreDebug DHCSR: S_REGRDY Mask */
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
 
-#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< CoreDebug DHCSR: C_SNAPSTALL Position */
-#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< CoreDebug DHCSR: C_SNAPSTALL Mask */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Position */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Mask */
 
-#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< CoreDebug DHCSR: C_MASKINTS Position */
-#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< CoreDebug DHCSR: C_MASKINTS Mask */
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
 
-#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< CoreDebug DHCSR: C_STEP Position */
-#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< CoreDebug DHCSR: C_STEP Mask */
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
 
-#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< CoreDebug DHCSR: C_HALT Position */
-#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< CoreDebug DHCSR: C_HALT Mask */
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
 
-#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< CoreDebug DHCSR: C_DEBUGEN Position */
-#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< CoreDebug DHCSR: C_DEBUGEN Mask */
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
 
 /* Debug Core Register Selector Register Definitions */
-#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< CoreDebug DCRSR: REGWnR Position */
-#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< CoreDebug DCRSR: REGWnR Mask */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
 
-#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< CoreDebug DCRSR: REGSEL Position */
-#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< CoreDebug DCRSR: REGSEL Mask */
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
 
 /* Debug Exception and Monitor Control Register Definitions */
-#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< CoreDebug DEMCR: TRCENA Position */
-#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< CoreDebug DEMCR: TRCENA Mask */
+#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: TRCENA Position */
+#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< \deprecated CoreDebug DEMCR: TRCENA Mask */
 
-#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< CoreDebug DEMCR: MON_REQ Position */
-#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< CoreDebug DEMCR: MON_REQ Mask */
+#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< \deprecated CoreDebug DEMCR: MON_REQ Position */
+#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< \deprecated CoreDebug DEMCR: MON_REQ Mask */
 
-#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< CoreDebug DEMCR: MON_STEP Position */
-#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< CoreDebug DEMCR: MON_STEP Mask */
+#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< \deprecated CoreDebug DEMCR: MON_STEP Position */
+#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_STEP Mask */
 
-#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< CoreDebug DEMCR: MON_PEND Position */
-#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< CoreDebug DEMCR: MON_PEND Mask */
+#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< \deprecated CoreDebug DEMCR: MON_PEND Position */
+#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_PEND Mask */
 
-#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< CoreDebug DEMCR: MON_EN Position */
-#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< CoreDebug DEMCR: MON_EN Mask */
+#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< \deprecated CoreDebug DEMCR: MON_EN Position */
+#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< \deprecated CoreDebug DEMCR: MON_EN Mask */
 
-#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< CoreDebug DEMCR: VC_HARDERR Position */
-#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< CoreDebug DEMCR: VC_HARDERR Mask */
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
 
-#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< CoreDebug DEMCR: VC_INTERR Position */
-#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< CoreDebug DEMCR: VC_INTERR Mask */
+#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< \deprecated CoreDebug DEMCR: VC_INTERR Position */
+#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_INTERR Mask */
 
-#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< CoreDebug DEMCR: VC_BUSERR Position */
-#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< CoreDebug DEMCR: VC_BUSERR Mask */
+#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Position */
+#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Mask */
 
-#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< CoreDebug DEMCR: VC_STATERR Position */
-#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< CoreDebug DEMCR: VC_STATERR Mask */
+#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< \deprecated CoreDebug DEMCR: VC_STATERR Position */
+#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_STATERR Mask */
 
-#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< CoreDebug DEMCR: VC_CHKERR Position */
-#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< CoreDebug DEMCR: VC_CHKERR Mask */
+#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Position */
+#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Mask */
 
-#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< CoreDebug DEMCR: VC_NOCPERR Position */
-#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< CoreDebug DEMCR: VC_NOCPERR Mask */
+#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Position */
+#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Mask */
 
-#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< CoreDebug DEMCR: VC_MMERR Position */
-#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< CoreDebug DEMCR: VC_MMERR Mask */
+#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< \deprecated CoreDebug DEMCR: VC_MMERR Position */
+#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< \deprecated CoreDebug DEMCR: VC_MMERR Mask */
 
-#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< CoreDebug DEMCR: VC_CORERESET Position */
-#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< CoreDebug DEMCR: VC_CORERESET Mask */
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
 
 /* Debug Authentication Control Register Definitions */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
 
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
 
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< CoreDebug DAUTHCTRL: INTSPIDEN Position */
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
 
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< CoreDebug DAUTHCTRL: SPIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
 
 /* Debug Security Control and Status Register Definitions */
-#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< CoreDebug DSCSR: CDS Position */
-#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< CoreDebug DSCSR: CDS Mask */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
 
-#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< CoreDebug DSCSR: SBRSEL Position */
-#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< CoreDebug DSCSR: SBRSEL Mask */
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
 
-#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< CoreDebug DSCSR: SBRSELEN Position */
-#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< CoreDebug DSCSR: SBRSELEN Mask */
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
 
 /*@} end of group CMSIS_CoreDebug */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_SNAPSTALL_Pos           5U                                            /*!< DCB DHCSR: Snap stall control Position */
+#define DCB_DHCSR_C_SNAPSTALL_Msk          (0x1UL << DCB_DHCSR_C_SNAPSTALL_Pos)           /*!< DCB DHCSR: Snap stall control Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_MONPRKEY_Pos             23U                                            /*!< DCB DEMCR: Monitor pend req key Position */
+#define DCB_DEMCR_MONPRKEY_Msk             (0x1UL << DCB_DEMCR_MONPRKEY_Pos)              /*!< DCB DEMCR: Monitor pend req key Mask */
+
+#define DCB_DEMCR_UMON_EN_Pos              21U                                            /*!< DCB DEMCR: Unprivileged monitor enable Position */
+#define DCB_DEMCR_UMON_EN_Msk              (0x1UL << DCB_DEMCR_UMON_EN_Pos)               /*!< DCB DEMCR: Unprivileged monitor enable Mask */
+
+#define DCB_DEMCR_SDME_Pos                 20U                                            /*!< DCB DEMCR: Secure DebugMonitor enable Position */
+#define DCB_DEMCR_SDME_Msk                 (0x1UL << DCB_DEMCR_SDME_Pos)                  /*!< DCB DEMCR: Secure DebugMonitor enable Mask */
+
+#define DCB_DEMCR_MON_REQ_Pos              19U                                            /*!< DCB DEMCR: Monitor request Position */
+#define DCB_DEMCR_MON_REQ_Msk              (0x1UL << DCB_DEMCR_MON_REQ_Pos)               /*!< DCB DEMCR: Monitor request Mask */
+
+#define DCB_DEMCR_MON_STEP_Pos             18U                                            /*!< DCB DEMCR: Monitor step Position */
+#define DCB_DEMCR_MON_STEP_Msk             (0x1UL << DCB_DEMCR_MON_STEP_Pos)              /*!< DCB DEMCR: Monitor step Mask */
+
+#define DCB_DEMCR_MON_PEND_Pos             17U                                            /*!< DCB DEMCR: Monitor pend Position */
+#define DCB_DEMCR_MON_PEND_Msk             (0x1UL << DCB_DEMCR_MON_PEND_Pos)              /*!< DCB DEMCR: Monitor pend Mask */
+
+#define DCB_DEMCR_MON_EN_Pos               16U                                            /*!< DCB DEMCR: Monitor enable Position */
+#define DCB_DEMCR_MON_EN_Msk               (0x1UL << DCB_DEMCR_MON_EN_Pos)                /*!< DCB DEMCR: Monitor enable Mask */
+
+#define DCB_DEMCR_VC_SFERR_Pos             11U                                            /*!< DCB DEMCR: Vector Catch SecureFault Position */
+#define DCB_DEMCR_VC_SFERR_Msk             (0x1UL << DCB_DEMCR_VC_SFERR_Pos)              /*!< DCB DEMCR: Vector Catch SecureFault Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_INTERR_Pos             9U                                            /*!< DCB DEMCR: Vector Catch interrupt errors Position */
+#define DCB_DEMCR_VC_INTERR_Msk            (0x1UL << DCB_DEMCR_VC_INTERR_Pos)             /*!< DCB DEMCR: Vector Catch interrupt errors Mask */
+
+#define DCB_DEMCR_VC_BUSERR_Pos             8U                                            /*!< DCB DEMCR: Vector Catch BusFault errors Position */
+#define DCB_DEMCR_VC_BUSERR_Msk            (0x1UL << DCB_DEMCR_VC_BUSERR_Pos)             /*!< DCB DEMCR: Vector Catch BusFault errors Mask */
+
+#define DCB_DEMCR_VC_STATERR_Pos            7U                                            /*!< DCB DEMCR: Vector Catch state errors Position */
+#define DCB_DEMCR_VC_STATERR_Msk           (0x1UL << DCB_DEMCR_VC_STATERR_Pos)            /*!< DCB DEMCR: Vector Catch state errors Mask */
+
+#define DCB_DEMCR_VC_CHKERR_Pos             6U                                            /*!< DCB DEMCR: Vector Catch check errors Position */
+#define DCB_DEMCR_VC_CHKERR_Msk            (0x1UL << DCB_DEMCR_VC_CHKERR_Pos)             /*!< DCB DEMCR: Vector Catch check errors Mask */
+
+#define DCB_DEMCR_VC_NOCPERR_Pos            5U                                            /*!< DCB DEMCR: Vector Catch NOCP errors Position */
+#define DCB_DEMCR_VC_NOCPERR_Msk           (0x1UL << DCB_DEMCR_VC_NOCPERR_Pos)            /*!< DCB DEMCR: Vector Catch NOCP errors Mask */
+
+#define DCB_DEMCR_VC_MMERR_Pos              4U                                            /*!< DCB DEMCR: Vector Catch MemManage errors Position */
+#define DCB_DEMCR_VC_MMERR_Msk             (0x1UL << DCB_DEMCR_VC_MMERR_Pos)              /*!< DCB DEMCR: Vector Catch MemManage errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
 /**
   \ingroup    CMSIS_core_register
   \defgroup   CMSIS_core_bitfield     Core register bit field macros
@@ -1954,7 +2200,9 @@ typedef struct
   #define ITM_BASE            (0xE0000000UL)                             /*!< ITM Base Address */
   #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
   #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
-  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< Core Debug Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
   #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
   #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
   #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
@@ -1966,7 +2214,9 @@ typedef struct
   #define ITM                 ((ITM_Type       *)     ITM_BASE         ) /*!< ITM configuration struct */
   #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
   #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
-  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< Core Debug configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
@@ -1983,7 +2233,9 @@ typedef struct
 
 #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
   #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
-  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< Core Debug Base Address           (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
   #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
   #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
   #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
@@ -1992,7 +2244,9 @@ typedef struct
   #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
   #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
   #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
-  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< Core Debug configuration struct   (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
@@ -2006,6 +2260,15 @@ typedef struct
 /*@} */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_register_aliases     Backwards Compatibility Aliases
+  \brief      Register alias definitions for backwards compatibility.
+  @{
+ */
+#define ID_ADR  (ID_AFR)    /*!< SCB Auxiliary Feature Register */
+/*@} */
+
 
 /*******************************************************************************
  *                Hardware Abstraction Layer
@@ -2064,7 +2327,7 @@ typedef struct
 
 /* Special LR values for Secure/Non-Secure call handling and exception handling                                               */
 
-/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */ 
+/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */
 #define FNC_RETURN                 (0xFEFFFFFFUL)     /* bit [0] ignored when processing a branch                             */
 
 /* The following EXC_RETURN mask values are used to evaluate the LR on exception entry */
@@ -2079,7 +2342,7 @@ typedef struct
 /* Integrity Signature (from ARMv8-M Architecture Reference Manual) for exception context stacking                            */
 #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)  /* Value for processors with floating-point extension:                  */
 #define EXC_INTEGRITY_SIGNATURE     (0xFEFA125AUL)     /* bit [0] SFTC must match LR bit[4] EXC_RETURN_FTYPE                   */
-#else 
+#else
 #define EXC_INTEGRITY_SIGNATURE     (0xFEFA125BUL)     /* Value for processors without floating-point extension                */
 #endif
 
@@ -2128,7 +2391,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -2420,6 +2685,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
   uint32_t *vectors = (uint32_t *)SCB->VTOR;
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
 }
 
 
@@ -2746,6 +3012,110 @@ __STATIC_INLINE void TZ_SAU_Disable(void)
 
 
 
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
 /* ##################################    SysTick function  ############################################ */
 /**
   \ingroup  CMSIS_Core_FunctionInterface
diff --git a/lib/cmsis/inc/core_cm35p.h b/lib/cmsis/inc/core_cm35p.h
index c00e54ca7a984..3843d9542c5ab 100644
--- a/lib/cmsis/inc/core_cm35p.h
+++ b/lib/cmsis/inc/core_cm35p.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_cm35p.h
  * @brief    CMSIS Cortex-M35P Core Peripheral Access Layer Header File
- * @version  V1.0.0
- * @date     12. November 2018
+ * @version  V1.1.3
+ * @date     13. October 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,11 @@
  */
 
 #if   defined ( __ICCARM__ )
-  #pragma system_include         /* treat file as system include file for MISRA check */
+  #pragma system_include                        /* treat file as system include file for MISRA check */
 #elif defined (__clang__)
-  #pragma clang system_header   /* treat file as system include file */
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
 #endif
 
 #ifndef __CORE_CM35P_H_GENERIC
@@ -248,6 +250,11 @@
     #warning "__DSP_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -512,7 +519,7 @@ typedef struct
   __IOM uint32_t AFSR;                   /*!< Offset: 0x03C (R/W)  Auxiliary Fault Status Register */
   __IM  uint32_t ID_PFR[2U];             /*!< Offset: 0x040 (R/ )  Processor Feature Register */
   __IM  uint32_t ID_DFR;                 /*!< Offset: 0x048 (R/ )  Debug Feature Register */
-  __IM  uint32_t ID_ADR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
+  __IM  uint32_t ID_AFR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
   __IM  uint32_t ID_MMFR[4U];            /*!< Offset: 0x050 (R/ )  Memory Model Feature Register */
   __IM  uint32_t ID_ISAR[6U];            /*!< Offset: 0x060 (R/ )  Instruction Set Attributes Register */
   __IM  uint32_t CLIDR;                  /*!< Offset: 0x078 (R/ )  Cache Level ID register */
@@ -521,7 +528,10 @@ typedef struct
   __IOM uint32_t CSSELR;                 /*!< Offset: 0x084 (R/W)  Cache Size Selection Register */
   __IOM uint32_t CPACR;                  /*!< Offset: 0x088 (R/W)  Coprocessor Access Control Register */
   __IOM uint32_t NSACR;                  /*!< Offset: 0x08C (R/W)  Non-Secure Access Control Register */
-        uint32_t RESERVED3[92U];
+        uint32_t RESERVED7[21U];
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x0E4 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x0E8 (R/W)  Secure Fault Address Register */
+        uint32_t RESERVED3[69U];
   __OM  uint32_t STIR;                   /*!< Offset: 0x200 ( /W)  Software Triggered Interrupt Register */
         uint32_t RESERVED4[15U];
   __IM  uint32_t MVFR0;                  /*!< Offset: 0x240 (R/ )  Media and VFP Feature Register 0 */
@@ -538,6 +548,7 @@ typedef struct
   __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
   __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
   __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
+  __OM  uint32_t BPIALL;                 /*!< Offset: 0x278 ( /W)  Branch Predictor Invalidate All */
 } SCB_Type;
 
 /* SCB CPUID Register Definitions */
@@ -738,22 +749,22 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MLSPERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 5U)               /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
 #define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -1668,8 +1679,9 @@ typedef struct
   __IOM uint32_t FPCCR;                  /*!< Offset: 0x004 (R/W)  Floating-Point Context Control Register */
   __IOM uint32_t FPCAR;                  /*!< Offset: 0x008 (R/W)  Floating-Point Context Address Register */
   __IOM uint32_t FPDSCR;                 /*!< Offset: 0x00C (R/W)  Floating-Point Default Status Control Register */
-  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and FP Feature Register 0 */
-  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and FP Feature Register 1 */
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x018 (R/ )  Media and VFP Feature Register 2 */
 } FPU_Type;
 
 /* Floating-Point Context Control Register Definitions */
@@ -1741,7 +1753,7 @@ typedef struct
 #define FPU_FPDSCR_RMode_Pos               22U                                            /*!< FPDSCR: RMode bit Position */
 #define FPU_FPDSCR_RMode_Msk               (3UL << FPU_FPDSCR_RMode_Pos)                  /*!< FPDSCR: RMode bit Mask */
 
-/* Media and FP Feature Register 0 Definitions */
+/* Media and VFP Feature Register 0 Definitions */
 #define FPU_MVFR0_FP_rounding_modes_Pos    28U                                            /*!< MVFR0: FP rounding modes bits Position */
 #define FPU_MVFR0_FP_rounding_modes_Msk    (0xFUL << FPU_MVFR0_FP_rounding_modes_Pos)     /*!< MVFR0: FP rounding modes bits Mask */
 
@@ -1766,7 +1778,7 @@ typedef struct
 #define FPU_MVFR0_A_SIMD_registers_Pos      0U                                            /*!< MVFR0: A_SIMD registers bits Position */
 #define FPU_MVFR0_A_SIMD_registers_Msk     (0xFUL /*<< FPU_MVFR0_A_SIMD_registers_Pos*/)  /*!< MVFR0: A_SIMD registers bits Mask */
 
-/* Media and FP Feature Register 1 Definitions */
+/* Media and VFP Feature Register 1 Definitions */
 #define FPU_MVFR1_FP_fused_MAC_Pos         28U                                            /*!< MVFR1: FP fused MAC bits Position */
 #define FPU_MVFR1_FP_fused_MAC_Msk         (0xFUL << FPU_MVFR1_FP_fused_MAC_Pos)          /*!< MVFR1: FP fused MAC bits Mask */
 
@@ -1779,9 +1791,13 @@ typedef struct
 #define FPU_MVFR1_FtZ_mode_Pos              0U                                            /*!< MVFR1: FtZ mode bits Position */
 #define FPU_MVFR1_FtZ_mode_Msk             (0xFUL /*<< FPU_MVFR1_FtZ_mode_Pos*/)          /*!< MVFR1: FtZ mode bits Mask */
 
-/*@} end of group CMSIS_FPU */
+/* Media and VFP Feature Register 2 Definitions */
+#define FPU_MVFR2_FPMisc_Pos                4U                                            /*!< MVFR2: FPMisc bits Position */
+#define FPU_MVFR2_FPMisc_Msk               (0xFUL << FPU_MVFR2_FPMisc_Pos)                /*!< MVFR2: FPMisc bits Mask */
 
+/*@} end of group CMSIS_FPU */
 
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
 /**
   \ingroup  CMSIS_core_register
   \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
@@ -1790,7 +1806,7 @@ typedef struct
  */
 
 /**
-  \brief  Structure type to access the Core Debug Register (CoreDebug).
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
  */
 typedef struct
 {
@@ -1798,124 +1814,354 @@ typedef struct
   __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
   __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
   __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
-        uint32_t RESERVED4[1U];
+        uint32_t RESERVED0[1U];
   __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
   __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
 } CoreDebug_Type;
 
 /* Debug Halting Control and Status Register Definitions */
-#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< CoreDebug DHCSR: DBGKEY Position */
-#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< CoreDebug DHCSR: DBGKEY Mask */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
 
-#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< CoreDebug DHCSR: S_RESTART_ST Position */
-#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< CoreDebug DHCSR: S_RESTART_ST Mask */
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
 
-#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< CoreDebug DHCSR: S_RESET_ST Position */
-#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< CoreDebug DHCSR: S_RESET_ST Mask */
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
 
-#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< CoreDebug DHCSR: S_RETIRE_ST Position */
-#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< CoreDebug DHCSR: S_RETIRE_ST Mask */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
 
-#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< CoreDebug DHCSR: S_LOCKUP Position */
-#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< CoreDebug DHCSR: S_LOCKUP Mask */
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
 
-#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< CoreDebug DHCSR: S_SLEEP Position */
-#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< CoreDebug DHCSR: S_SLEEP Mask */
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
 
-#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< CoreDebug DHCSR: S_HALT Position */
-#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< CoreDebug DHCSR: S_HALT Mask */
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
 
-#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< CoreDebug DHCSR: S_REGRDY Position */
-#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< CoreDebug DHCSR: S_REGRDY Mask */
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
 
-#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< CoreDebug DHCSR: C_SNAPSTALL Position */
-#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< CoreDebug DHCSR: C_SNAPSTALL Mask */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Position */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Mask */
 
-#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< CoreDebug DHCSR: C_MASKINTS Position */
-#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< CoreDebug DHCSR: C_MASKINTS Mask */
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
 
-#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< CoreDebug DHCSR: C_STEP Position */
-#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< CoreDebug DHCSR: C_STEP Mask */
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
 
-#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< CoreDebug DHCSR: C_HALT Position */
-#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< CoreDebug DHCSR: C_HALT Mask */
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
 
-#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< CoreDebug DHCSR: C_DEBUGEN Position */
-#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< CoreDebug DHCSR: C_DEBUGEN Mask */
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
 
 /* Debug Core Register Selector Register Definitions */
-#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< CoreDebug DCRSR: REGWnR Position */
-#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< CoreDebug DCRSR: REGWnR Mask */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
 
-#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< CoreDebug DCRSR: REGSEL Position */
-#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< CoreDebug DCRSR: REGSEL Mask */
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
 
 /* Debug Exception and Monitor Control Register Definitions */
-#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< CoreDebug DEMCR: TRCENA Position */
-#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< CoreDebug DEMCR: TRCENA Mask */
+#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: TRCENA Position */
+#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< \deprecated CoreDebug DEMCR: TRCENA Mask */
 
-#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< CoreDebug DEMCR: MON_REQ Position */
-#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< CoreDebug DEMCR: MON_REQ Mask */
+#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< \deprecated CoreDebug DEMCR: MON_REQ Position */
+#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< \deprecated CoreDebug DEMCR: MON_REQ Mask */
 
-#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< CoreDebug DEMCR: MON_STEP Position */
-#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< CoreDebug DEMCR: MON_STEP Mask */
+#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< \deprecated CoreDebug DEMCR: MON_STEP Position */
+#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_STEP Mask */
 
-#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< CoreDebug DEMCR: MON_PEND Position */
-#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< CoreDebug DEMCR: MON_PEND Mask */
+#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< \deprecated CoreDebug DEMCR: MON_PEND Position */
+#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_PEND Mask */
 
-#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< CoreDebug DEMCR: MON_EN Position */
-#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< CoreDebug DEMCR: MON_EN Mask */
+#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< \deprecated CoreDebug DEMCR: MON_EN Position */
+#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< \deprecated CoreDebug DEMCR: MON_EN Mask */
 
-#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< CoreDebug DEMCR: VC_HARDERR Position */
-#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< CoreDebug DEMCR: VC_HARDERR Mask */
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
 
-#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< CoreDebug DEMCR: VC_INTERR Position */
-#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< CoreDebug DEMCR: VC_INTERR Mask */
+#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< \deprecated CoreDebug DEMCR: VC_INTERR Position */
+#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_INTERR Mask */
 
-#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< CoreDebug DEMCR: VC_BUSERR Position */
-#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< CoreDebug DEMCR: VC_BUSERR Mask */
+#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Position */
+#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Mask */
 
-#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< CoreDebug DEMCR: VC_STATERR Position */
-#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< CoreDebug DEMCR: VC_STATERR Mask */
+#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< \deprecated CoreDebug DEMCR: VC_STATERR Position */
+#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_STATERR Mask */
 
-#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< CoreDebug DEMCR: VC_CHKERR Position */
-#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< CoreDebug DEMCR: VC_CHKERR Mask */
+#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Position */
+#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Mask */
 
-#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< CoreDebug DEMCR: VC_NOCPERR Position */
-#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< CoreDebug DEMCR: VC_NOCPERR Mask */
+#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Position */
+#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Mask */
 
-#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< CoreDebug DEMCR: VC_MMERR Position */
-#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< CoreDebug DEMCR: VC_MMERR Mask */
+#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< \deprecated CoreDebug DEMCR: VC_MMERR Position */
+#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< \deprecated CoreDebug DEMCR: VC_MMERR Mask */
 
-#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< CoreDebug DEMCR: VC_CORERESET Position */
-#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< CoreDebug DEMCR: VC_CORERESET Mask */
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
 
 /* Debug Authentication Control Register Definitions */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
-#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
 
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
 
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< CoreDebug DAUTHCTRL: INTSPIDEN Position */
-#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
 
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< CoreDebug DAUTHCTRL: SPIDENSEL Position */
-#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
 
 /* Debug Security Control and Status Register Definitions */
-#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< CoreDebug DSCSR: CDS Position */
-#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< CoreDebug DSCSR: CDS Mask */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
 
-#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< CoreDebug DSCSR: SBRSEL Position */
-#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< CoreDebug DSCSR: SBRSEL Mask */
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
 
-#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< CoreDebug DSCSR: SBRSELEN Position */
-#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< CoreDebug DSCSR: SBRSELEN Mask */
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
 
 /*@} end of group CMSIS_CoreDebug */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_SNAPSTALL_Pos           5U                                            /*!< DCB DHCSR: Snap stall control Position */
+#define DCB_DHCSR_C_SNAPSTALL_Msk          (0x1UL << DCB_DHCSR_C_SNAPSTALL_Pos)           /*!< DCB DHCSR: Snap stall control Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_MONPRKEY_Pos             23U                                            /*!< DCB DEMCR: Monitor pend req key Position */
+#define DCB_DEMCR_MONPRKEY_Msk             (0x1UL << DCB_DEMCR_MONPRKEY_Pos)              /*!< DCB DEMCR: Monitor pend req key Mask */
+
+#define DCB_DEMCR_UMON_EN_Pos              21U                                            /*!< DCB DEMCR: Unprivileged monitor enable Position */
+#define DCB_DEMCR_UMON_EN_Msk              (0x1UL << DCB_DEMCR_UMON_EN_Pos)               /*!< DCB DEMCR: Unprivileged monitor enable Mask */
+
+#define DCB_DEMCR_SDME_Pos                 20U                                            /*!< DCB DEMCR: Secure DebugMonitor enable Position */
+#define DCB_DEMCR_SDME_Msk                 (0x1UL << DCB_DEMCR_SDME_Pos)                  /*!< DCB DEMCR: Secure DebugMonitor enable Mask */
+
+#define DCB_DEMCR_MON_REQ_Pos              19U                                            /*!< DCB DEMCR: Monitor request Position */
+#define DCB_DEMCR_MON_REQ_Msk              (0x1UL << DCB_DEMCR_MON_REQ_Pos)               /*!< DCB DEMCR: Monitor request Mask */
+
+#define DCB_DEMCR_MON_STEP_Pos             18U                                            /*!< DCB DEMCR: Monitor step Position */
+#define DCB_DEMCR_MON_STEP_Msk             (0x1UL << DCB_DEMCR_MON_STEP_Pos)              /*!< DCB DEMCR: Monitor step Mask */
+
+#define DCB_DEMCR_MON_PEND_Pos             17U                                            /*!< DCB DEMCR: Monitor pend Position */
+#define DCB_DEMCR_MON_PEND_Msk             (0x1UL << DCB_DEMCR_MON_PEND_Pos)              /*!< DCB DEMCR: Monitor pend Mask */
+
+#define DCB_DEMCR_MON_EN_Pos               16U                                            /*!< DCB DEMCR: Monitor enable Position */
+#define DCB_DEMCR_MON_EN_Msk               (0x1UL << DCB_DEMCR_MON_EN_Pos)                /*!< DCB DEMCR: Monitor enable Mask */
+
+#define DCB_DEMCR_VC_SFERR_Pos             11U                                            /*!< DCB DEMCR: Vector Catch SecureFault Position */
+#define DCB_DEMCR_VC_SFERR_Msk             (0x1UL << DCB_DEMCR_VC_SFERR_Pos)              /*!< DCB DEMCR: Vector Catch SecureFault Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_INTERR_Pos             9U                                            /*!< DCB DEMCR: Vector Catch interrupt errors Position */
+#define DCB_DEMCR_VC_INTERR_Msk            (0x1UL << DCB_DEMCR_VC_INTERR_Pos)             /*!< DCB DEMCR: Vector Catch interrupt errors Mask */
+
+#define DCB_DEMCR_VC_BUSERR_Pos             8U                                            /*!< DCB DEMCR: Vector Catch BusFault errors Position */
+#define DCB_DEMCR_VC_BUSERR_Msk            (0x1UL << DCB_DEMCR_VC_BUSERR_Pos)             /*!< DCB DEMCR: Vector Catch BusFault errors Mask */
+
+#define DCB_DEMCR_VC_STATERR_Pos            7U                                            /*!< DCB DEMCR: Vector Catch state errors Position */
+#define DCB_DEMCR_VC_STATERR_Msk           (0x1UL << DCB_DEMCR_VC_STATERR_Pos)            /*!< DCB DEMCR: Vector Catch state errors Mask */
+
+#define DCB_DEMCR_VC_CHKERR_Pos             6U                                            /*!< DCB DEMCR: Vector Catch check errors Position */
+#define DCB_DEMCR_VC_CHKERR_Msk            (0x1UL << DCB_DEMCR_VC_CHKERR_Pos)             /*!< DCB DEMCR: Vector Catch check errors Mask */
+
+#define DCB_DEMCR_VC_NOCPERR_Pos            5U                                            /*!< DCB DEMCR: Vector Catch NOCP errors Position */
+#define DCB_DEMCR_VC_NOCPERR_Msk           (0x1UL << DCB_DEMCR_VC_NOCPERR_Pos)            /*!< DCB DEMCR: Vector Catch NOCP errors Mask */
+
+#define DCB_DEMCR_VC_MMERR_Pos              4U                                            /*!< DCB DEMCR: Vector Catch MemManage errors Position */
+#define DCB_DEMCR_VC_MMERR_Msk             (0x1UL << DCB_DEMCR_VC_MMERR_Pos)              /*!< DCB DEMCR: Vector Catch MemManage errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
 /**
   \ingroup    CMSIS_core_register
   \defgroup   CMSIS_core_bitfield     Core register bit field macros
@@ -1954,7 +2200,9 @@ typedef struct
   #define ITM_BASE            (0xE0000000UL)                             /*!< ITM Base Address */
   #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
   #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
-  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< Core Debug Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
   #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
   #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
   #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
@@ -1966,7 +2214,9 @@ typedef struct
   #define ITM                 ((ITM_Type       *)     ITM_BASE         ) /*!< ITM configuration struct */
   #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
   #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
-  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< Core Debug configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
@@ -1983,7 +2233,9 @@ typedef struct
 
 #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
   #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
-  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< Core Debug Base Address           (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
   #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
   #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
   #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
@@ -1992,7 +2244,9 @@ typedef struct
   #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
   #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
   #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
-  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< Core Debug configuration struct   (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
 
   #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
     #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
@@ -2006,6 +2260,15 @@ typedef struct
 /*@} */
 
 
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_register_aliases     Backwards Compatibility Aliases
+  \brief      Register alias definitions for backwards compatibility.
+  @{
+ */
+#define ID_ADR  (ID_AFR)    /*!< SCB Auxiliary Feature Register */
+/*@} */
+
 
 /*******************************************************************************
  *                Hardware Abstraction Layer
@@ -2064,7 +2327,7 @@ typedef struct
 
 /* Special LR values for Secure/Non-Secure call handling and exception handling                                               */
 
-/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */ 
+/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */
 #define FNC_RETURN                 (0xFEFFFFFFUL)     /* bit [0] ignored when processing a branch                             */
 
 /* The following EXC_RETURN mask values are used to evaluate the LR on exception entry */
@@ -2079,7 +2342,7 @@ typedef struct
 /* Integrity Signature (from ARMv8-M Architecture Reference Manual) for exception context stacking                            */
 #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)  /* Value for processors with floating-point extension:                  */
 #define EXC_INTEGRITY_SIGNATURE     (0xFEFA125AUL)     /* bit [0] SFTC must match LR bit[4] EXC_RETURN_FTYPE                   */
-#else 
+#else
 #define EXC_INTEGRITY_SIGNATURE     (0xFEFA125BUL)     /* Value for processors without floating-point extension                */
 #endif
 
@@ -2128,7 +2391,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -2420,6 +2685,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
   uint32_t *vectors = (uint32_t *)SCB->VTOR;
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
 }
 
 
@@ -2746,6 +3012,110 @@ __STATIC_INLINE void TZ_SAU_Disable(void)
 
 
 
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
 /* ##################################    SysTick function  ############################################ */
 /**
   \ingroup  CMSIS_Core_FunctionInterface
diff --git a/lib/cmsis/inc/core_cm4.h b/lib/cmsis/inc/core_cm4.h
index f205b333f321c..e21cd14925603 100644
--- a/lib/cmsis/inc/core_cm4.h
+++ b/lib/cmsis/inc/core_cm4.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_cm4.h
  * @brief    CMSIS Cortex-M4 Core Peripheral Access Layer Header File
- * @version  V5.1.0
- * @date     13. March 2019
+ * @version  V5.1.2
+ * @date     04. June 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -194,6 +194,11 @@
     #warning "__MPU_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -618,22 +623,22 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MLSPERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 5U)               /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
 #define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -1680,7 +1685,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -1903,8 +1910,9 @@ __STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGr
  */
 __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
-  uint32_t vectors = (uint32_t )SCB->VTOR;
-  (* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4)) = vector;
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  /* ARM Application Note 321 states that the M4 does not require the architectural barrier */
 }
 
 
@@ -1918,8 +1926,8 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
  */
 __STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
 {
-  uint32_t vectors = (uint32_t )SCB->VTOR;
-  return (uint32_t)(* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4));
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  return vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET];
 }
 
 
diff --git a/lib/cmsis/inc/core_cm55.h b/lib/cmsis/inc/core_cm55.h
new file mode 100644
index 0000000000000..faa30ce36a98b
--- /dev/null
+++ b/lib/cmsis/inc/core_cm55.h
@@ -0,0 +1,4817 @@
+/**************************************************************************//**
+ * @file     core_cm55.h
+ * @brief    CMSIS Cortex-M55 Core Peripheral Access Layer Header File
+ * @version  V1.2.4
+ * @date     21. April 2022
+ ******************************************************************************/
+/*
+ * Copyright (c) 2018-2022 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
+ *
+ * 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.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include                        /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
+#endif
+
+#ifndef __CORE_CM55_H_GENERIC
+#define __CORE_CM55_H_GENERIC
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/**
+  \page CMSIS_MISRA_Exceptions  MISRA-C:2004 Compliance Exceptions
+  CMSIS violates the following MISRA-C:2004 rules:
+
+   \li Required Rule 8.5, object/function definition in header file.<br>
+     Function definitions in header files are used to allow 'inlining'.
+
+   \li Required Rule 18.4, declaration of union type or object of union type: '{...}'.<br>
+     Unions are used for effective representation of core registers.
+
+   \li Advisory Rule 19.7, Function-like macro defined.<br>
+     Function-like macros are used to allow more efficient code.
+ */
+
+
+/*******************************************************************************
+ *                 CMSIS definitions
+ ******************************************************************************/
+/**
+  \ingroup Cortex_M55
+  @{
+ */
+
+#include "cmsis_version.h"
+
+/*  CMSIS CM55 definitions */
+#define __CM55_CMSIS_VERSION_MAIN  (__CM_CMSIS_VERSION_MAIN)                  /*!< \deprecated [31:16] CMSIS HAL main version */
+#define __CM55_CMSIS_VERSION_SUB   (__CM_CMSIS_VERSION_SUB)                   /*!< \deprecated [15:0]  CMSIS HAL sub version */
+#define __CM55_CMSIS_VERSION       ((__CM55_CMSIS_VERSION_MAIN << 16U) | \
+                                     __CM55_CMSIS_VERSION_SUB           )     /*!< \deprecated CMSIS HAL version number */
+
+#define __CORTEX_M                      (55U)                                 /*!< Cortex-M Core */
+
+#if defined ( __CC_ARM )
+  #error Legacy Arm Compiler does not support Armv8.1-M target architecture.
+#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #if defined __ARM_FP
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined(__ARM_FEATURE_DSP)
+    #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED       0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __GNUC__ )
+  #if defined (__VFP_FP__) && !defined(__SOFTFP__)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined(__ARM_FEATURE_DSP)
+    #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __ICCARM__ )
+  #if defined __ARMVFP__
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined(__ARM_FEATURE_DSP)
+    #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __TI_ARM__ )
+  #if defined __TI_VFP_SUPPORT__
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#elif defined ( __TASKING__ )
+  #if defined __FPU_VFP__
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#elif defined ( __CSMC__ )
+  #if ( __CSMC__ & 0x400U)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#endif
+
+#include "cmsis_compiler.h"               /* CMSIS compiler specific defines */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CORE_CM55_H_GENERIC */
+
+#ifndef __CMSIS_GENERIC
+
+#ifndef __CORE_CM55_H_DEPENDANT
+#define __CORE_CM55_H_DEPENDANT
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* check device defines and use defaults */
+#if defined __CHECK_DEVICE_DEFINES
+  #ifndef __CM55_REV
+    #define __CM55_REV               0x0000U
+    #warning "__CM55_REV not defined in device header file; using default!"
+  #endif
+
+  #ifndef __FPU_PRESENT
+    #define __FPU_PRESENT             0U
+    #warning "__FPU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #if __FPU_PRESENT != 0U
+    #ifndef __FPU_DP
+      #define __FPU_DP             0U
+      #warning "__FPU_DP not defined in device header file; using default!"
+    #endif
+  #endif
+
+  #ifndef __MPU_PRESENT
+    #define __MPU_PRESENT             0U
+    #warning "__MPU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __ICACHE_PRESENT
+    #define __ICACHE_PRESENT          0U
+    #warning "__ICACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DCACHE_PRESENT
+    #define __DCACHE_PRESENT          0U
+    #warning "__DCACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __PMU_PRESENT
+    #define __PMU_PRESENT             0U
+    #warning "__PMU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #if __PMU_PRESENT != 0U
+    #ifndef __PMU_NUM_EVENTCNT
+      #define __PMU_NUM_EVENTCNT      8U
+      #warning "__PMU_NUM_EVENTCNT not defined in device header file; using default!"
+    #elif (__PMU_NUM_EVENTCNT > 8 || __PMU_NUM_EVENTCNT < 2)
+    #error "__PMU_NUM_EVENTCNT is out of range in device header file!" */
+    #endif
+  #endif
+
+  #ifndef __SAUREGION_PRESENT
+    #define __SAUREGION_PRESENT       0U
+    #warning "__SAUREGION_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DSP_PRESENT
+    #define __DSP_PRESENT             0U
+    #warning "__DSP_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __NVIC_PRIO_BITS
+    #define __NVIC_PRIO_BITS          3U
+    #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
+  #endif
+
+  #ifndef __Vendor_SysTickConfig
+    #define __Vendor_SysTickConfig    0U
+    #warning "__Vendor_SysTickConfig not defined in device header file; using default!"
+  #endif
+#endif
+
+/* IO definitions (access restrictions to peripheral registers) */
+/**
+    \defgroup CMSIS_glob_defs CMSIS Global Defines
+
+    <strong>IO Type Qualifiers</strong> are used
+    \li to specify the access to peripheral variables.
+    \li for automatic generation of peripheral register debug information.
+*/
+#ifdef __cplusplus
+  #define   __I     volatile             /*!< Defines 'read only' permissions */
+#else
+  #define   __I     volatile const       /*!< Defines 'read only' permissions */
+#endif
+#define     __O     volatile             /*!< Defines 'write only' permissions */
+#define     __IO    volatile             /*!< Defines 'read / write' permissions */
+
+/* following defines should be used for structure members */
+#define     __IM     volatile const      /*! Defines 'read only' structure member permissions */
+#define     __OM     volatile            /*! Defines 'write only' structure member permissions */
+#define     __IOM    volatile            /*! Defines 'read / write' structure member permissions */
+
+/*@} end of group Cortex_M55 */
+
+
+
+/*******************************************************************************
+ *                 Register Abstraction
+  Core Register contain:
+  - Core Register
+  - Core NVIC Register
+  - Core EWIC Register
+  - Core SCB Register
+  - Core SysTick Register
+  - Core Debug Register
+  - Core PMU Register
+  - Core MPU Register
+  - Core SAU Register
+  - Core FPU Register
+ ******************************************************************************/
+/**
+  \defgroup CMSIS_core_register Defines and Type Definitions
+  \brief Type definitions and defines for Cortex-M processor based devices.
+*/
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_CORE  Status and Control Registers
+  \brief      Core Register type definitions.
+  @{
+ */
+
+/**
+  \brief  Union type to access the Application Program Status Register (APSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t _reserved0:16;              /*!< bit:  0..15  Reserved */
+    uint32_t GE:4;                       /*!< bit: 16..19  Greater than or Equal flags */
+    uint32_t _reserved1:7;               /*!< bit: 20..26  Reserved */
+    uint32_t Q:1;                        /*!< bit:     27  Saturation condition flag */
+    uint32_t V:1;                        /*!< bit:     28  Overflow condition code flag */
+    uint32_t C:1;                        /*!< bit:     29  Carry condition code flag */
+    uint32_t Z:1;                        /*!< bit:     30  Zero condition code flag */
+    uint32_t N:1;                        /*!< bit:     31  Negative condition code flag */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} APSR_Type;
+
+/* APSR Register Definitions */
+#define APSR_N_Pos                         31U                                            /*!< APSR: N Position */
+#define APSR_N_Msk                         (1UL << APSR_N_Pos)                            /*!< APSR: N Mask */
+
+#define APSR_Z_Pos                         30U                                            /*!< APSR: Z Position */
+#define APSR_Z_Msk                         (1UL << APSR_Z_Pos)                            /*!< APSR: Z Mask */
+
+#define APSR_C_Pos                         29U                                            /*!< APSR: C Position */
+#define APSR_C_Msk                         (1UL << APSR_C_Pos)                            /*!< APSR: C Mask */
+
+#define APSR_V_Pos                         28U                                            /*!< APSR: V Position */
+#define APSR_V_Msk                         (1UL << APSR_V_Pos)                            /*!< APSR: V Mask */
+
+#define APSR_Q_Pos                         27U                                            /*!< APSR: Q Position */
+#define APSR_Q_Msk                         (1UL << APSR_Q_Pos)                            /*!< APSR: Q Mask */
+
+#define APSR_GE_Pos                        16U                                            /*!< APSR: GE Position */
+#define APSR_GE_Msk                        (0xFUL << APSR_GE_Pos)                         /*!< APSR: GE Mask */
+
+
+/**
+  \brief  Union type to access the Interrupt Program Status Register (IPSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t ISR:9;                      /*!< bit:  0.. 8  Exception number */
+    uint32_t _reserved0:23;              /*!< bit:  9..31  Reserved */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} IPSR_Type;
+
+/* IPSR Register Definitions */
+#define IPSR_ISR_Pos                        0U                                            /*!< IPSR: ISR Position */
+#define IPSR_ISR_Msk                       (0x1FFUL /*<< IPSR_ISR_Pos*/)                  /*!< IPSR: ISR Mask */
+
+
+/**
+  \brief  Union type to access the Special-Purpose Program Status Registers (xPSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t ISR:9;                      /*!< bit:  0.. 8  Exception number */
+    uint32_t _reserved0:7;               /*!< bit:  9..15  Reserved */
+    uint32_t GE:4;                       /*!< bit: 16..19  Greater than or Equal flags */
+    uint32_t _reserved1:4;               /*!< bit: 20..23  Reserved */
+    uint32_t T:1;                        /*!< bit:     24  Thumb bit        (read 0) */
+    uint32_t IT:2;                       /*!< bit: 25..26  saved IT state   (read 0) */
+    uint32_t Q:1;                        /*!< bit:     27  Saturation condition flag */
+    uint32_t V:1;                        /*!< bit:     28  Overflow condition code flag */
+    uint32_t C:1;                        /*!< bit:     29  Carry condition code flag */
+    uint32_t Z:1;                        /*!< bit:     30  Zero condition code flag */
+    uint32_t N:1;                        /*!< bit:     31  Negative condition code flag */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} xPSR_Type;
+
+/* xPSR Register Definitions */
+#define xPSR_N_Pos                         31U                                            /*!< xPSR: N Position */
+#define xPSR_N_Msk                         (1UL << xPSR_N_Pos)                            /*!< xPSR: N Mask */
+
+#define xPSR_Z_Pos                         30U                                            /*!< xPSR: Z Position */
+#define xPSR_Z_Msk                         (1UL << xPSR_Z_Pos)                            /*!< xPSR: Z Mask */
+
+#define xPSR_C_Pos                         29U                                            /*!< xPSR: C Position */
+#define xPSR_C_Msk                         (1UL << xPSR_C_Pos)                            /*!< xPSR: C Mask */
+
+#define xPSR_V_Pos                         28U                                            /*!< xPSR: V Position */
+#define xPSR_V_Msk                         (1UL << xPSR_V_Pos)                            /*!< xPSR: V Mask */
+
+#define xPSR_Q_Pos                         27U                                            /*!< xPSR: Q Position */
+#define xPSR_Q_Msk                         (1UL << xPSR_Q_Pos)                            /*!< xPSR: Q Mask */
+
+#define xPSR_IT_Pos                        25U                                            /*!< xPSR: IT Position */
+#define xPSR_IT_Msk                        (3UL << xPSR_IT_Pos)                           /*!< xPSR: IT Mask */
+
+#define xPSR_T_Pos                         24U                                            /*!< xPSR: T Position */
+#define xPSR_T_Msk                         (1UL << xPSR_T_Pos)                            /*!< xPSR: T Mask */
+
+#define xPSR_GE_Pos                        16U                                            /*!< xPSR: GE Position */
+#define xPSR_GE_Msk                        (0xFUL << xPSR_GE_Pos)                         /*!< xPSR: GE Mask */
+
+#define xPSR_ISR_Pos                        0U                                            /*!< xPSR: ISR Position */
+#define xPSR_ISR_Msk                       (0x1FFUL /*<< xPSR_ISR_Pos*/)                  /*!< xPSR: ISR Mask */
+
+
+/**
+  \brief  Union type to access the Control Registers (CONTROL).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t nPRIV:1;                    /*!< bit:      0  Execution privilege in Thread mode */
+    uint32_t SPSEL:1;                    /*!< bit:      1  Stack-pointer select */
+    uint32_t FPCA:1;                     /*!< bit:      2  Floating-point context active */
+    uint32_t SFPA:1;                     /*!< bit:      3  Secure floating-point active */
+    uint32_t _reserved1:28;              /*!< bit:  4..31  Reserved */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} CONTROL_Type;
+
+/* CONTROL Register Definitions */
+#define CONTROL_SFPA_Pos                    3U                                            /*!< CONTROL: SFPA Position */
+#define CONTROL_SFPA_Msk                   (1UL << CONTROL_SFPA_Pos)                      /*!< CONTROL: SFPA Mask */
+
+#define CONTROL_FPCA_Pos                    2U                                            /*!< CONTROL: FPCA Position */
+#define CONTROL_FPCA_Msk                   (1UL << CONTROL_FPCA_Pos)                      /*!< CONTROL: FPCA Mask */
+
+#define CONTROL_SPSEL_Pos                   1U                                            /*!< CONTROL: SPSEL Position */
+#define CONTROL_SPSEL_Msk                  (1UL << CONTROL_SPSEL_Pos)                     /*!< CONTROL: SPSEL Mask */
+
+#define CONTROL_nPRIV_Pos                   0U                                            /*!< CONTROL: nPRIV Position */
+#define CONTROL_nPRIV_Msk                  (1UL /*<< CONTROL_nPRIV_Pos*/)                 /*!< CONTROL: nPRIV Mask */
+
+/*@} end of group CMSIS_CORE */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_NVIC  Nested Vectored Interrupt Controller (NVIC)
+  \brief      Type definitions for the NVIC Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Nested Vectored Interrupt Controller (NVIC).
+ */
+typedef struct
+{
+  __IOM uint32_t ISER[16U];              /*!< Offset: 0x000 (R/W)  Interrupt Set Enable Register */
+        uint32_t RESERVED0[16U];
+  __IOM uint32_t ICER[16U];              /*!< Offset: 0x080 (R/W)  Interrupt Clear Enable Register */
+        uint32_t RSERVED1[16U];
+  __IOM uint32_t ISPR[16U];              /*!< Offset: 0x100 (R/W)  Interrupt Set Pending Register */
+        uint32_t RESERVED2[16U];
+  __IOM uint32_t ICPR[16U];              /*!< Offset: 0x180 (R/W)  Interrupt Clear Pending Register */
+        uint32_t RESERVED3[16U];
+  __IOM uint32_t IABR[16U];              /*!< Offset: 0x200 (R/W)  Interrupt Active bit Register */
+        uint32_t RESERVED4[16U];
+  __IOM uint32_t ITNS[16U];              /*!< Offset: 0x280 (R/W)  Interrupt Non-Secure State Register */
+        uint32_t RESERVED5[16U];
+  __IOM uint8_t  IPR[496U];              /*!< Offset: 0x300 (R/W)  Interrupt Priority Register (8Bit wide) */
+        uint32_t RESERVED6[580U];
+  __OM  uint32_t STIR;                   /*!< Offset: 0xE00 ( /W)  Software Trigger Interrupt Register */
+}  NVIC_Type;
+
+/* Software Triggered Interrupt Register Definitions */
+#define NVIC_STIR_INTID_Pos                 0U                                         /*!< STIR: INTLINESNUM Position */
+#define NVIC_STIR_INTID_Msk                (0x1FFUL /*<< NVIC_STIR_INTID_Pos*/)        /*!< STIR: INTLINESNUM Mask */
+
+/*@} end of group CMSIS_NVIC */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SCB     System Control Block (SCB)
+  \brief    Type definitions for the System Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the System Control Block (SCB).
+ */
+typedef struct
+{
+  __IM  uint32_t CPUID;                  /*!< Offset: 0x000 (R/ )  CPUID Base Register */
+  __IOM uint32_t ICSR;                   /*!< Offset: 0x004 (R/W)  Interrupt Control and State Register */
+  __IOM uint32_t VTOR;                   /*!< Offset: 0x008 (R/W)  Vector Table Offset Register */
+  __IOM uint32_t AIRCR;                  /*!< Offset: 0x00C (R/W)  Application Interrupt and Reset Control Register */
+  __IOM uint32_t SCR;                    /*!< Offset: 0x010 (R/W)  System Control Register */
+  __IOM uint32_t CCR;                    /*!< Offset: 0x014 (R/W)  Configuration Control Register */
+  __IOM uint8_t  SHPR[12U];              /*!< Offset: 0x018 (R/W)  System Handlers Priority Registers (4-7, 8-11, 12-15) */
+  __IOM uint32_t SHCSR;                  /*!< Offset: 0x024 (R/W)  System Handler Control and State Register */
+  __IOM uint32_t CFSR;                   /*!< Offset: 0x028 (R/W)  Configurable Fault Status Register */
+  __IOM uint32_t HFSR;                   /*!< Offset: 0x02C (R/W)  HardFault Status Register */
+  __IOM uint32_t DFSR;                   /*!< Offset: 0x030 (R/W)  Debug Fault Status Register */
+  __IOM uint32_t MMFAR;                  /*!< Offset: 0x034 (R/W)  MemManage Fault Address Register */
+  __IOM uint32_t BFAR;                   /*!< Offset: 0x038 (R/W)  BusFault Address Register */
+  __IOM uint32_t AFSR;                   /*!< Offset: 0x03C (R/W)  Auxiliary Fault Status Register */
+  __IM  uint32_t ID_PFR[2U];             /*!< Offset: 0x040 (R/ )  Processor Feature Register */
+  __IM  uint32_t ID_DFR;                 /*!< Offset: 0x048 (R/ )  Debug Feature Register */
+  __IM  uint32_t ID_AFR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
+  __IM  uint32_t ID_MMFR[4U];            /*!< Offset: 0x050 (R/ )  Memory Model Feature Register */
+  __IM  uint32_t ID_ISAR[6U];            /*!< Offset: 0x060 (R/ )  Instruction Set Attributes Register */
+  __IM  uint32_t CLIDR;                  /*!< Offset: 0x078 (R/ )  Cache Level ID register */
+  __IM  uint32_t CTR;                    /*!< Offset: 0x07C (R/ )  Cache Type register */
+  __IM  uint32_t CCSIDR;                 /*!< Offset: 0x080 (R/ )  Cache Size ID Register */
+  __IOM uint32_t CSSELR;                 /*!< Offset: 0x084 (R/W)  Cache Size Selection Register */
+  __IOM uint32_t CPACR;                  /*!< Offset: 0x088 (R/W)  Coprocessor Access Control Register */
+  __IOM uint32_t NSACR;                  /*!< Offset: 0x08C (R/W)  Non-Secure Access Control Register */
+        uint32_t RESERVED7[21U];
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x0E4 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x0E8 (R/W)  Secure Fault Address Register */
+        uint32_t RESERVED3[69U];
+  __OM  uint32_t STIR;                   /*!< Offset: 0x200 ( /W)  Software Triggered Interrupt Register */
+  __IOM uint32_t RFSR;                   /*!< Offset: 0x204 (R/W)  RAS Fault Status Register */
+        uint32_t RESERVED4[14U];
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x240 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x244 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x248 (R/ )  Media and VFP Feature Register 2 */
+        uint32_t RESERVED5[1U];
+  __OM  uint32_t ICIALLU;                /*!< Offset: 0x250 ( /W)  I-Cache Invalidate All to PoU */
+        uint32_t RESERVED6[1U];
+  __OM  uint32_t ICIMVAU;                /*!< Offset: 0x258 ( /W)  I-Cache Invalidate by MVA to PoU */
+  __OM  uint32_t DCIMVAC;                /*!< Offset: 0x25C ( /W)  D-Cache Invalidate by MVA to PoC */
+  __OM  uint32_t DCISW;                  /*!< Offset: 0x260 ( /W)  D-Cache Invalidate by Set-way */
+  __OM  uint32_t DCCMVAU;                /*!< Offset: 0x264 ( /W)  D-Cache Clean by MVA to PoU */
+  __OM  uint32_t DCCMVAC;                /*!< Offset: 0x268 ( /W)  D-Cache Clean by MVA to PoC */
+  __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
+  __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
+  __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
+  __OM  uint32_t BPIALL;                 /*!< Offset: 0x278 ( /W)  Branch Predictor Invalidate All */
+} SCB_Type;
+
+/* SCB CPUID Register Definitions */
+#define SCB_CPUID_IMPLEMENTER_Pos          24U                                            /*!< SCB CPUID: IMPLEMENTER Position */
+#define SCB_CPUID_IMPLEMENTER_Msk          (0xFFUL << SCB_CPUID_IMPLEMENTER_Pos)          /*!< SCB CPUID: IMPLEMENTER Mask */
+
+#define SCB_CPUID_VARIANT_Pos              20U                                            /*!< SCB CPUID: VARIANT Position */
+#define SCB_CPUID_VARIANT_Msk              (0xFUL << SCB_CPUID_VARIANT_Pos)               /*!< SCB CPUID: VARIANT Mask */
+
+#define SCB_CPUID_ARCHITECTURE_Pos         16U                                            /*!< SCB CPUID: ARCHITECTURE Position */
+#define SCB_CPUID_ARCHITECTURE_Msk         (0xFUL << SCB_CPUID_ARCHITECTURE_Pos)          /*!< SCB CPUID: ARCHITECTURE Mask */
+
+#define SCB_CPUID_PARTNO_Pos                4U                                            /*!< SCB CPUID: PARTNO Position */
+#define SCB_CPUID_PARTNO_Msk               (0xFFFUL << SCB_CPUID_PARTNO_Pos)              /*!< SCB CPUID: PARTNO Mask */
+
+#define SCB_CPUID_REVISION_Pos              0U                                            /*!< SCB CPUID: REVISION Position */
+#define SCB_CPUID_REVISION_Msk             (0xFUL /*<< SCB_CPUID_REVISION_Pos*/)          /*!< SCB CPUID: REVISION Mask */
+
+/* SCB Interrupt Control State Register Definitions */
+#define SCB_ICSR_PENDNMISET_Pos            31U                                            /*!< SCB ICSR: PENDNMISET Position */
+#define SCB_ICSR_PENDNMISET_Msk            (1UL << SCB_ICSR_PENDNMISET_Pos)               /*!< SCB ICSR: PENDNMISET Mask */
+
+#define SCB_ICSR_NMIPENDSET_Pos            SCB_ICSR_PENDNMISET_Pos                        /*!< SCB ICSR: NMIPENDSET Position, backward compatibility */
+#define SCB_ICSR_NMIPENDSET_Msk            SCB_ICSR_PENDNMISET_Msk                        /*!< SCB ICSR: NMIPENDSET Mask, backward compatibility */
+
+#define SCB_ICSR_PENDNMICLR_Pos            30U                                            /*!< SCB ICSR: PENDNMICLR Position */
+#define SCB_ICSR_PENDNMICLR_Msk            (1UL << SCB_ICSR_PENDNMICLR_Pos)               /*!< SCB ICSR: PENDNMICLR Mask */
+
+#define SCB_ICSR_PENDSVSET_Pos             28U                                            /*!< SCB ICSR: PENDSVSET Position */
+#define SCB_ICSR_PENDSVSET_Msk             (1UL << SCB_ICSR_PENDSVSET_Pos)                /*!< SCB ICSR: PENDSVSET Mask */
+
+#define SCB_ICSR_PENDSVCLR_Pos             27U                                            /*!< SCB ICSR: PENDSVCLR Position */
+#define SCB_ICSR_PENDSVCLR_Msk             (1UL << SCB_ICSR_PENDSVCLR_Pos)                /*!< SCB ICSR: PENDSVCLR Mask */
+
+#define SCB_ICSR_PENDSTSET_Pos             26U                                            /*!< SCB ICSR: PENDSTSET Position */
+#define SCB_ICSR_PENDSTSET_Msk             (1UL << SCB_ICSR_PENDSTSET_Pos)                /*!< SCB ICSR: PENDSTSET Mask */
+
+#define SCB_ICSR_PENDSTCLR_Pos             25U                                            /*!< SCB ICSR: PENDSTCLR Position */
+#define SCB_ICSR_PENDSTCLR_Msk             (1UL << SCB_ICSR_PENDSTCLR_Pos)                /*!< SCB ICSR: PENDSTCLR Mask */
+
+#define SCB_ICSR_STTNS_Pos                 24U                                            /*!< SCB ICSR: STTNS Position (Security Extension) */
+#define SCB_ICSR_STTNS_Msk                 (1UL << SCB_ICSR_STTNS_Pos)                    /*!< SCB ICSR: STTNS Mask (Security Extension) */
+
+#define SCB_ICSR_ISRPREEMPT_Pos            23U                                            /*!< SCB ICSR: ISRPREEMPT Position */
+#define SCB_ICSR_ISRPREEMPT_Msk            (1UL << SCB_ICSR_ISRPREEMPT_Pos)               /*!< SCB ICSR: ISRPREEMPT Mask */
+
+#define SCB_ICSR_ISRPENDING_Pos            22U                                            /*!< SCB ICSR: ISRPENDING Position */
+#define SCB_ICSR_ISRPENDING_Msk            (1UL << SCB_ICSR_ISRPENDING_Pos)               /*!< SCB ICSR: ISRPENDING Mask */
+
+#define SCB_ICSR_VECTPENDING_Pos           12U                                            /*!< SCB ICSR: VECTPENDING Position */
+#define SCB_ICSR_VECTPENDING_Msk           (0x1FFUL << SCB_ICSR_VECTPENDING_Pos)          /*!< SCB ICSR: VECTPENDING Mask */
+
+#define SCB_ICSR_RETTOBASE_Pos             11U                                            /*!< SCB ICSR: RETTOBASE Position */
+#define SCB_ICSR_RETTOBASE_Msk             (1UL << SCB_ICSR_RETTOBASE_Pos)                /*!< SCB ICSR: RETTOBASE Mask */
+
+#define SCB_ICSR_VECTACTIVE_Pos             0U                                            /*!< SCB ICSR: VECTACTIVE Position */
+#define SCB_ICSR_VECTACTIVE_Msk            (0x1FFUL /*<< SCB_ICSR_VECTACTIVE_Pos*/)       /*!< SCB ICSR: VECTACTIVE Mask */
+
+/* SCB Vector Table Offset Register Definitions */
+#define SCB_VTOR_TBLOFF_Pos                 7U                                            /*!< SCB VTOR: TBLOFF Position */
+#define SCB_VTOR_TBLOFF_Msk                (0x1FFFFFFUL << SCB_VTOR_TBLOFF_Pos)           /*!< SCB VTOR: TBLOFF Mask */
+
+/* SCB Application Interrupt and Reset Control Register Definitions */
+#define SCB_AIRCR_VECTKEY_Pos              16U                                            /*!< SCB AIRCR: VECTKEY Position */
+#define SCB_AIRCR_VECTKEY_Msk              (0xFFFFUL << SCB_AIRCR_VECTKEY_Pos)            /*!< SCB AIRCR: VECTKEY Mask */
+
+#define SCB_AIRCR_VECTKEYSTAT_Pos          16U                                            /*!< SCB AIRCR: VECTKEYSTAT Position */
+#define SCB_AIRCR_VECTKEYSTAT_Msk          (0xFFFFUL << SCB_AIRCR_VECTKEYSTAT_Pos)        /*!< SCB AIRCR: VECTKEYSTAT Mask */
+
+#define SCB_AIRCR_ENDIANESS_Pos            15U                                            /*!< SCB AIRCR: ENDIANESS Position */
+#define SCB_AIRCR_ENDIANESS_Msk            (1UL << SCB_AIRCR_ENDIANESS_Pos)               /*!< SCB AIRCR: ENDIANESS Mask */
+
+#define SCB_AIRCR_PRIS_Pos                 14U                                            /*!< SCB AIRCR: PRIS Position */
+#define SCB_AIRCR_PRIS_Msk                 (1UL << SCB_AIRCR_PRIS_Pos)                    /*!< SCB AIRCR: PRIS Mask */
+
+#define SCB_AIRCR_BFHFNMINS_Pos            13U                                            /*!< SCB AIRCR: BFHFNMINS Position */
+#define SCB_AIRCR_BFHFNMINS_Msk            (1UL << SCB_AIRCR_BFHFNMINS_Pos)               /*!< SCB AIRCR: BFHFNMINS Mask */
+
+#define SCB_AIRCR_PRIGROUP_Pos              8U                                            /*!< SCB AIRCR: PRIGROUP Position */
+#define SCB_AIRCR_PRIGROUP_Msk             (7UL << SCB_AIRCR_PRIGROUP_Pos)                /*!< SCB AIRCR: PRIGROUP Mask */
+
+#define SCB_AIRCR_IESB_Pos                  5U                                            /*!< SCB AIRCR: Implicit ESB Enable Position */
+#define SCB_AIRCR_IESB_Msk                 (1UL << SCB_AIRCR_IESB_Pos)                    /*!< SCB AIRCR: Implicit ESB Enable Mask */
+
+#define SCB_AIRCR_DIT_Pos                   4U                                            /*!< SCB AIRCR: Data Independent Timing Position */
+#define SCB_AIRCR_DIT_Msk                  (1UL << SCB_AIRCR_DIT_Pos)                     /*!< SCB AIRCR: Data Independent Timing Mask */
+
+#define SCB_AIRCR_SYSRESETREQS_Pos          3U                                            /*!< SCB AIRCR: SYSRESETREQS Position */
+#define SCB_AIRCR_SYSRESETREQS_Msk         (1UL << SCB_AIRCR_SYSRESETREQS_Pos)            /*!< SCB AIRCR: SYSRESETREQS Mask */
+
+#define SCB_AIRCR_SYSRESETREQ_Pos           2U                                            /*!< SCB AIRCR: SYSRESETREQ Position */
+#define SCB_AIRCR_SYSRESETREQ_Msk          (1UL << SCB_AIRCR_SYSRESETREQ_Pos)             /*!< SCB AIRCR: SYSRESETREQ Mask */
+
+#define SCB_AIRCR_VECTCLRACTIVE_Pos         1U                                            /*!< SCB AIRCR: VECTCLRACTIVE Position */
+#define SCB_AIRCR_VECTCLRACTIVE_Msk        (1UL << SCB_AIRCR_VECTCLRACTIVE_Pos)           /*!< SCB AIRCR: VECTCLRACTIVE Mask */
+
+/* SCB System Control Register Definitions */
+#define SCB_SCR_SEVONPEND_Pos               4U                                            /*!< SCB SCR: SEVONPEND Position */
+#define SCB_SCR_SEVONPEND_Msk              (1UL << SCB_SCR_SEVONPEND_Pos)                 /*!< SCB SCR: SEVONPEND Mask */
+
+#define SCB_SCR_SLEEPDEEPS_Pos              3U                                            /*!< SCB SCR: SLEEPDEEPS Position */
+#define SCB_SCR_SLEEPDEEPS_Msk             (1UL << SCB_SCR_SLEEPDEEPS_Pos)                /*!< SCB SCR: SLEEPDEEPS Mask */
+
+#define SCB_SCR_SLEEPDEEP_Pos               2U                                            /*!< SCB SCR: SLEEPDEEP Position */
+#define SCB_SCR_SLEEPDEEP_Msk              (1UL << SCB_SCR_SLEEPDEEP_Pos)                 /*!< SCB SCR: SLEEPDEEP Mask */
+
+#define SCB_SCR_SLEEPONEXIT_Pos             1U                                            /*!< SCB SCR: SLEEPONEXIT Position */
+#define SCB_SCR_SLEEPONEXIT_Msk            (1UL << SCB_SCR_SLEEPONEXIT_Pos)               /*!< SCB SCR: SLEEPONEXIT Mask */
+
+/* SCB Configuration Control Register Definitions */
+#define SCB_CCR_TRD_Pos                    20U                                            /*!< SCB CCR: TRD Position */
+#define SCB_CCR_TRD_Msk                    (1UL << SCB_CCR_TRD_Pos)                       /*!< SCB CCR: TRD Mask */
+
+#define SCB_CCR_LOB_Pos                    19U                                            /*!< SCB CCR: LOB Position */
+#define SCB_CCR_LOB_Msk                    (1UL << SCB_CCR_LOB_Pos)                       /*!< SCB CCR: LOB Mask */
+
+#define SCB_CCR_BP_Pos                     18U                                            /*!< SCB CCR: BP Position */
+#define SCB_CCR_BP_Msk                     (1UL << SCB_CCR_BP_Pos)                        /*!< SCB CCR: BP Mask */
+
+#define SCB_CCR_IC_Pos                     17U                                            /*!< SCB CCR: IC Position */
+#define SCB_CCR_IC_Msk                     (1UL << SCB_CCR_IC_Pos)                        /*!< SCB CCR: IC Mask */
+
+#define SCB_CCR_DC_Pos                     16U                                            /*!< SCB CCR: DC Position */
+#define SCB_CCR_DC_Msk                     (1UL << SCB_CCR_DC_Pos)                        /*!< SCB CCR: DC Mask */
+
+#define SCB_CCR_STKOFHFNMIGN_Pos           10U                                            /*!< SCB CCR: STKOFHFNMIGN Position */
+#define SCB_CCR_STKOFHFNMIGN_Msk           (1UL << SCB_CCR_STKOFHFNMIGN_Pos)              /*!< SCB CCR: STKOFHFNMIGN Mask */
+
+#define SCB_CCR_BFHFNMIGN_Pos               8U                                            /*!< SCB CCR: BFHFNMIGN Position */
+#define SCB_CCR_BFHFNMIGN_Msk              (1UL << SCB_CCR_BFHFNMIGN_Pos)                 /*!< SCB CCR: BFHFNMIGN Mask */
+
+#define SCB_CCR_DIV_0_TRP_Pos               4U                                            /*!< SCB CCR: DIV_0_TRP Position */
+#define SCB_CCR_DIV_0_TRP_Msk              (1UL << SCB_CCR_DIV_0_TRP_Pos)                 /*!< SCB CCR: DIV_0_TRP Mask */
+
+#define SCB_CCR_UNALIGN_TRP_Pos             3U                                            /*!< SCB CCR: UNALIGN_TRP Position */
+#define SCB_CCR_UNALIGN_TRP_Msk            (1UL << SCB_CCR_UNALIGN_TRP_Pos)               /*!< SCB CCR: UNALIGN_TRP Mask */
+
+#define SCB_CCR_USERSETMPEND_Pos            1U                                            /*!< SCB CCR: USERSETMPEND Position */
+#define SCB_CCR_USERSETMPEND_Msk           (1UL << SCB_CCR_USERSETMPEND_Pos)              /*!< SCB CCR: USERSETMPEND Mask */
+
+/* SCB System Handler Control and State Register Definitions */
+#define SCB_SHCSR_HARDFAULTPENDED_Pos      21U                                            /*!< SCB SHCSR: HARDFAULTPENDED Position */
+#define SCB_SHCSR_HARDFAULTPENDED_Msk      (1UL << SCB_SHCSR_HARDFAULTPENDED_Pos)         /*!< SCB SHCSR: HARDFAULTPENDED Mask */
+
+#define SCB_SHCSR_SECUREFAULTPENDED_Pos    20U                                            /*!< SCB SHCSR: SECUREFAULTPENDED Position */
+#define SCB_SHCSR_SECUREFAULTPENDED_Msk    (1UL << SCB_SHCSR_SECUREFAULTPENDED_Pos)       /*!< SCB SHCSR: SECUREFAULTPENDED Mask */
+
+#define SCB_SHCSR_SECUREFAULTENA_Pos       19U                                            /*!< SCB SHCSR: SECUREFAULTENA Position */
+#define SCB_SHCSR_SECUREFAULTENA_Msk       (1UL << SCB_SHCSR_SECUREFAULTENA_Pos)          /*!< SCB SHCSR: SECUREFAULTENA Mask */
+
+#define SCB_SHCSR_USGFAULTENA_Pos          18U                                            /*!< SCB SHCSR: USGFAULTENA Position */
+#define SCB_SHCSR_USGFAULTENA_Msk          (1UL << SCB_SHCSR_USGFAULTENA_Pos)             /*!< SCB SHCSR: USGFAULTENA Mask */
+
+#define SCB_SHCSR_BUSFAULTENA_Pos          17U                                            /*!< SCB SHCSR: BUSFAULTENA Position */
+#define SCB_SHCSR_BUSFAULTENA_Msk          (1UL << SCB_SHCSR_BUSFAULTENA_Pos)             /*!< SCB SHCSR: BUSFAULTENA Mask */
+
+#define SCB_SHCSR_MEMFAULTENA_Pos          16U                                            /*!< SCB SHCSR: MEMFAULTENA Position */
+#define SCB_SHCSR_MEMFAULTENA_Msk          (1UL << SCB_SHCSR_MEMFAULTENA_Pos)             /*!< SCB SHCSR: MEMFAULTENA Mask */
+
+#define SCB_SHCSR_SVCALLPENDED_Pos         15U                                            /*!< SCB SHCSR: SVCALLPENDED Position */
+#define SCB_SHCSR_SVCALLPENDED_Msk         (1UL << SCB_SHCSR_SVCALLPENDED_Pos)            /*!< SCB SHCSR: SVCALLPENDED Mask */
+
+#define SCB_SHCSR_BUSFAULTPENDED_Pos       14U                                            /*!< SCB SHCSR: BUSFAULTPENDED Position */
+#define SCB_SHCSR_BUSFAULTPENDED_Msk       (1UL << SCB_SHCSR_BUSFAULTPENDED_Pos)          /*!< SCB SHCSR: BUSFAULTPENDED Mask */
+
+#define SCB_SHCSR_MEMFAULTPENDED_Pos       13U                                            /*!< SCB SHCSR: MEMFAULTPENDED Position */
+#define SCB_SHCSR_MEMFAULTPENDED_Msk       (1UL << SCB_SHCSR_MEMFAULTPENDED_Pos)          /*!< SCB SHCSR: MEMFAULTPENDED Mask */
+
+#define SCB_SHCSR_USGFAULTPENDED_Pos       12U                                            /*!< SCB SHCSR: USGFAULTPENDED Position */
+#define SCB_SHCSR_USGFAULTPENDED_Msk       (1UL << SCB_SHCSR_USGFAULTPENDED_Pos)          /*!< SCB SHCSR: USGFAULTPENDED Mask */
+
+#define SCB_SHCSR_SYSTICKACT_Pos           11U                                            /*!< SCB SHCSR: SYSTICKACT Position */
+#define SCB_SHCSR_SYSTICKACT_Msk           (1UL << SCB_SHCSR_SYSTICKACT_Pos)              /*!< SCB SHCSR: SYSTICKACT Mask */
+
+#define SCB_SHCSR_PENDSVACT_Pos            10U                                            /*!< SCB SHCSR: PENDSVACT Position */
+#define SCB_SHCSR_PENDSVACT_Msk            (1UL << SCB_SHCSR_PENDSVACT_Pos)               /*!< SCB SHCSR: PENDSVACT Mask */
+
+#define SCB_SHCSR_MONITORACT_Pos            8U                                            /*!< SCB SHCSR: MONITORACT Position */
+#define SCB_SHCSR_MONITORACT_Msk           (1UL << SCB_SHCSR_MONITORACT_Pos)              /*!< SCB SHCSR: MONITORACT Mask */
+
+#define SCB_SHCSR_SVCALLACT_Pos             7U                                            /*!< SCB SHCSR: SVCALLACT Position */
+#define SCB_SHCSR_SVCALLACT_Msk            (1UL << SCB_SHCSR_SVCALLACT_Pos)               /*!< SCB SHCSR: SVCALLACT Mask */
+
+#define SCB_SHCSR_NMIACT_Pos                5U                                            /*!< SCB SHCSR: NMIACT Position */
+#define SCB_SHCSR_NMIACT_Msk               (1UL << SCB_SHCSR_NMIACT_Pos)                  /*!< SCB SHCSR: NMIACT Mask */
+
+#define SCB_SHCSR_SECUREFAULTACT_Pos        4U                                            /*!< SCB SHCSR: SECUREFAULTACT Position */
+#define SCB_SHCSR_SECUREFAULTACT_Msk       (1UL << SCB_SHCSR_SECUREFAULTACT_Pos)          /*!< SCB SHCSR: SECUREFAULTACT Mask */
+
+#define SCB_SHCSR_USGFAULTACT_Pos           3U                                            /*!< SCB SHCSR: USGFAULTACT Position */
+#define SCB_SHCSR_USGFAULTACT_Msk          (1UL << SCB_SHCSR_USGFAULTACT_Pos)             /*!< SCB SHCSR: USGFAULTACT Mask */
+
+#define SCB_SHCSR_HARDFAULTACT_Pos          2U                                            /*!< SCB SHCSR: HARDFAULTACT Position */
+#define SCB_SHCSR_HARDFAULTACT_Msk         (1UL << SCB_SHCSR_HARDFAULTACT_Pos)            /*!< SCB SHCSR: HARDFAULTACT Mask */
+
+#define SCB_SHCSR_BUSFAULTACT_Pos           1U                                            /*!< SCB SHCSR: BUSFAULTACT Position */
+#define SCB_SHCSR_BUSFAULTACT_Msk          (1UL << SCB_SHCSR_BUSFAULTACT_Pos)             /*!< SCB SHCSR: BUSFAULTACT Mask */
+
+#define SCB_SHCSR_MEMFAULTACT_Pos           0U                                            /*!< SCB SHCSR: MEMFAULTACT Position */
+#define SCB_SHCSR_MEMFAULTACT_Msk          (1UL /*<< SCB_SHCSR_MEMFAULTACT_Pos*/)         /*!< SCB SHCSR: MEMFAULTACT Mask */
+
+/* SCB Configurable Fault Status Register Definitions */
+#define SCB_CFSR_USGFAULTSR_Pos            16U                                            /*!< SCB CFSR: Usage Fault Status Register Position */
+#define SCB_CFSR_USGFAULTSR_Msk            (0xFFFFUL << SCB_CFSR_USGFAULTSR_Pos)          /*!< SCB CFSR: Usage Fault Status Register Mask */
+
+#define SCB_CFSR_BUSFAULTSR_Pos             8U                                            /*!< SCB CFSR: Bus Fault Status Register Position */
+#define SCB_CFSR_BUSFAULTSR_Msk            (0xFFUL << SCB_CFSR_BUSFAULTSR_Pos)            /*!< SCB CFSR: Bus Fault Status Register Mask */
+
+#define SCB_CFSR_MEMFAULTSR_Pos             0U                                            /*!< SCB CFSR: Memory Manage Fault Status Register Position */
+#define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
+
+/* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
+
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
+
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
+
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
+
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
+
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
+
+/* BusFault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_BFARVALID_Pos            (SCB_CFSR_BUSFAULTSR_Pos + 7U)                  /*!< SCB CFSR (BFSR): BFARVALID Position */
+#define SCB_CFSR_BFARVALID_Msk            (1UL << SCB_CFSR_BFARVALID_Pos)                 /*!< SCB CFSR (BFSR): BFARVALID Mask */
+
+#define SCB_CFSR_LSPERR_Pos               (SCB_CFSR_BUSFAULTSR_Pos + 5U)                  /*!< SCB CFSR (BFSR): LSPERR Position */
+#define SCB_CFSR_LSPERR_Msk               (1UL << SCB_CFSR_LSPERR_Pos)                    /*!< SCB CFSR (BFSR): LSPERR Mask */
+
+#define SCB_CFSR_STKERR_Pos               (SCB_CFSR_BUSFAULTSR_Pos + 4U)                  /*!< SCB CFSR (BFSR): STKERR Position */
+#define SCB_CFSR_STKERR_Msk               (1UL << SCB_CFSR_STKERR_Pos)                    /*!< SCB CFSR (BFSR): STKERR Mask */
+
+#define SCB_CFSR_UNSTKERR_Pos             (SCB_CFSR_BUSFAULTSR_Pos + 3U)                  /*!< SCB CFSR (BFSR): UNSTKERR Position */
+#define SCB_CFSR_UNSTKERR_Msk             (1UL << SCB_CFSR_UNSTKERR_Pos)                  /*!< SCB CFSR (BFSR): UNSTKERR Mask */
+
+#define SCB_CFSR_IMPRECISERR_Pos          (SCB_CFSR_BUSFAULTSR_Pos + 2U)                  /*!< SCB CFSR (BFSR): IMPRECISERR Position */
+#define SCB_CFSR_IMPRECISERR_Msk          (1UL << SCB_CFSR_IMPRECISERR_Pos)               /*!< SCB CFSR (BFSR): IMPRECISERR Mask */
+
+#define SCB_CFSR_PRECISERR_Pos            (SCB_CFSR_BUSFAULTSR_Pos + 1U)                  /*!< SCB CFSR (BFSR): PRECISERR Position */
+#define SCB_CFSR_PRECISERR_Msk            (1UL << SCB_CFSR_PRECISERR_Pos)                 /*!< SCB CFSR (BFSR): PRECISERR Mask */
+
+#define SCB_CFSR_IBUSERR_Pos              (SCB_CFSR_BUSFAULTSR_Pos + 0U)                  /*!< SCB CFSR (BFSR): IBUSERR Position */
+#define SCB_CFSR_IBUSERR_Msk              (1UL << SCB_CFSR_IBUSERR_Pos)                   /*!< SCB CFSR (BFSR): IBUSERR Mask */
+
+/* UsageFault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_DIVBYZERO_Pos            (SCB_CFSR_USGFAULTSR_Pos + 9U)                  /*!< SCB CFSR (UFSR): DIVBYZERO Position */
+#define SCB_CFSR_DIVBYZERO_Msk            (1UL << SCB_CFSR_DIVBYZERO_Pos)                 /*!< SCB CFSR (UFSR): DIVBYZERO Mask */
+
+#define SCB_CFSR_UNALIGNED_Pos            (SCB_CFSR_USGFAULTSR_Pos + 8U)                  /*!< SCB CFSR (UFSR): UNALIGNED Position */
+#define SCB_CFSR_UNALIGNED_Msk            (1UL << SCB_CFSR_UNALIGNED_Pos)                 /*!< SCB CFSR (UFSR): UNALIGNED Mask */
+
+#define SCB_CFSR_STKOF_Pos                (SCB_CFSR_USGFAULTSR_Pos + 4U)                  /*!< SCB CFSR (UFSR): STKOF Position */
+#define SCB_CFSR_STKOF_Msk                (1UL << SCB_CFSR_STKOF_Pos)                     /*!< SCB CFSR (UFSR): STKOF Mask */
+
+#define SCB_CFSR_NOCP_Pos                 (SCB_CFSR_USGFAULTSR_Pos + 3U)                  /*!< SCB CFSR (UFSR): NOCP Position */
+#define SCB_CFSR_NOCP_Msk                 (1UL << SCB_CFSR_NOCP_Pos)                      /*!< SCB CFSR (UFSR): NOCP Mask */
+
+#define SCB_CFSR_INVPC_Pos                (SCB_CFSR_USGFAULTSR_Pos + 2U)                  /*!< SCB CFSR (UFSR): INVPC Position */
+#define SCB_CFSR_INVPC_Msk                (1UL << SCB_CFSR_INVPC_Pos)                     /*!< SCB CFSR (UFSR): INVPC Mask */
+
+#define SCB_CFSR_INVSTATE_Pos             (SCB_CFSR_USGFAULTSR_Pos + 1U)                  /*!< SCB CFSR (UFSR): INVSTATE Position */
+#define SCB_CFSR_INVSTATE_Msk             (1UL << SCB_CFSR_INVSTATE_Pos)                  /*!< SCB CFSR (UFSR): INVSTATE Mask */
+
+#define SCB_CFSR_UNDEFINSTR_Pos           (SCB_CFSR_USGFAULTSR_Pos + 0U)                  /*!< SCB CFSR (UFSR): UNDEFINSTR Position */
+#define SCB_CFSR_UNDEFINSTR_Msk           (1UL << SCB_CFSR_UNDEFINSTR_Pos)                /*!< SCB CFSR (UFSR): UNDEFINSTR Mask */
+
+/* SCB Hard Fault Status Register Definitions */
+#define SCB_HFSR_DEBUGEVT_Pos              31U                                            /*!< SCB HFSR: DEBUGEVT Position */
+#define SCB_HFSR_DEBUGEVT_Msk              (1UL << SCB_HFSR_DEBUGEVT_Pos)                 /*!< SCB HFSR: DEBUGEVT Mask */
+
+#define SCB_HFSR_FORCED_Pos                30U                                            /*!< SCB HFSR: FORCED Position */
+#define SCB_HFSR_FORCED_Msk                (1UL << SCB_HFSR_FORCED_Pos)                   /*!< SCB HFSR: FORCED Mask */
+
+#define SCB_HFSR_VECTTBL_Pos                1U                                            /*!< SCB HFSR: VECTTBL Position */
+#define SCB_HFSR_VECTTBL_Msk               (1UL << SCB_HFSR_VECTTBL_Pos)                  /*!< SCB HFSR: VECTTBL Mask */
+
+/* SCB Debug Fault Status Register Definitions */
+#define SCB_DFSR_PMU_Pos                    5U                                            /*!< SCB DFSR: PMU Position */
+#define SCB_DFSR_PMU_Msk                   (1UL << SCB_DFSR_PMU_Pos)                      /*!< SCB DFSR: PMU Mask */
+
+#define SCB_DFSR_EXTERNAL_Pos               4U                                            /*!< SCB DFSR: EXTERNAL Position */
+#define SCB_DFSR_EXTERNAL_Msk              (1UL << SCB_DFSR_EXTERNAL_Pos)                 /*!< SCB DFSR: EXTERNAL Mask */
+
+#define SCB_DFSR_VCATCH_Pos                 3U                                            /*!< SCB DFSR: VCATCH Position */
+#define SCB_DFSR_VCATCH_Msk                (1UL << SCB_DFSR_VCATCH_Pos)                   /*!< SCB DFSR: VCATCH Mask */
+
+#define SCB_DFSR_DWTTRAP_Pos                2U                                            /*!< SCB DFSR: DWTTRAP Position */
+#define SCB_DFSR_DWTTRAP_Msk               (1UL << SCB_DFSR_DWTTRAP_Pos)                  /*!< SCB DFSR: DWTTRAP Mask */
+
+#define SCB_DFSR_BKPT_Pos                   1U                                            /*!< SCB DFSR: BKPT Position */
+#define SCB_DFSR_BKPT_Msk                  (1UL << SCB_DFSR_BKPT_Pos)                     /*!< SCB DFSR: BKPT Mask */
+
+#define SCB_DFSR_HALTED_Pos                 0U                                            /*!< SCB DFSR: HALTED Position */
+#define SCB_DFSR_HALTED_Msk                (1UL /*<< SCB_DFSR_HALTED_Pos*/)               /*!< SCB DFSR: HALTED Mask */
+
+/* SCB Non-Secure Access Control Register Definitions */
+#define SCB_NSACR_CP11_Pos                 11U                                            /*!< SCB NSACR: CP11 Position */
+#define SCB_NSACR_CP11_Msk                 (1UL << SCB_NSACR_CP11_Pos)                    /*!< SCB NSACR: CP11 Mask */
+
+#define SCB_NSACR_CP10_Pos                 10U                                            /*!< SCB NSACR: CP10 Position */
+#define SCB_NSACR_CP10_Msk                 (1UL << SCB_NSACR_CP10_Pos)                    /*!< SCB NSACR: CP10 Mask */
+
+#define SCB_NSACR_CP7_Pos                   7U                                            /*!< SCB NSACR: CP7 Position */
+#define SCB_NSACR_CP7_Msk                  (1UL << SCB_NSACR_CP7_Pos)                     /*!< SCB NSACR: CP7 Mask */
+
+#define SCB_NSACR_CP6_Pos                   6U                                            /*!< SCB NSACR: CP6 Position */
+#define SCB_NSACR_CP6_Msk                  (1UL << SCB_NSACR_CP6_Pos)                     /*!< SCB NSACR: CP6 Mask */
+
+#define SCB_NSACR_CP5_Pos                   5U                                            /*!< SCB NSACR: CP5 Position */
+#define SCB_NSACR_CP5_Msk                  (1UL << SCB_NSACR_CP5_Pos)                     /*!< SCB NSACR: CP5 Mask */
+
+#define SCB_NSACR_CP4_Pos                   4U                                            /*!< SCB NSACR: CP4 Position */
+#define SCB_NSACR_CP4_Msk                  (1UL << SCB_NSACR_CP4_Pos)                     /*!< SCB NSACR: CP4 Mask */
+
+#define SCB_NSACR_CP3_Pos                   3U                                            /*!< SCB NSACR: CP3 Position */
+#define SCB_NSACR_CP3_Msk                  (1UL << SCB_NSACR_CP3_Pos)                     /*!< SCB NSACR: CP3 Mask */
+
+#define SCB_NSACR_CP2_Pos                   2U                                            /*!< SCB NSACR: CP2 Position */
+#define SCB_NSACR_CP2_Msk                  (1UL << SCB_NSACR_CP2_Pos)                     /*!< SCB NSACR: CP2 Mask */
+
+#define SCB_NSACR_CP1_Pos                   1U                                            /*!< SCB NSACR: CP1 Position */
+#define SCB_NSACR_CP1_Msk                  (1UL << SCB_NSACR_CP1_Pos)                     /*!< SCB NSACR: CP1 Mask */
+
+#define SCB_NSACR_CP0_Pos                   0U                                            /*!< SCB NSACR: CP0 Position */
+#define SCB_NSACR_CP0_Msk                  (1UL /*<< SCB_NSACR_CP0_Pos*/)                 /*!< SCB NSACR: CP0 Mask */
+
+/* SCB Debug Feature Register 0 Definitions */
+#define SCB_ID_DFR_UDE_Pos                 28U                                            /*!< SCB ID_DFR: UDE Position */
+#define SCB_ID_DFR_UDE_Msk                 (0xFUL << SCB_ID_DFR_UDE_Pos)                  /*!< SCB ID_DFR: UDE Mask */
+
+#define SCB_ID_DFR_MProfDbg_Pos            20U                                            /*!< SCB ID_DFR: MProfDbg Position */
+#define SCB_ID_DFR_MProfDbg_Msk            (0xFUL << SCB_ID_DFR_MProfDbg_Pos)             /*!< SCB ID_DFR: MProfDbg Mask */
+
+/* SCB Cache Level ID Register Definitions */
+#define SCB_CLIDR_LOUU_Pos                 27U                                            /*!< SCB CLIDR: LoUU Position */
+#define SCB_CLIDR_LOUU_Msk                 (7UL << SCB_CLIDR_LOUU_Pos)                    /*!< SCB CLIDR: LoUU Mask */
+
+#define SCB_CLIDR_LOC_Pos                  24U                                            /*!< SCB CLIDR: LoC Position */
+#define SCB_CLIDR_LOC_Msk                  (7UL << SCB_CLIDR_LOC_Pos)                     /*!< SCB CLIDR: LoC Mask */
+
+/* SCB Cache Type Register Definitions */
+#define SCB_CTR_FORMAT_Pos                 29U                                            /*!< SCB CTR: Format Position */
+#define SCB_CTR_FORMAT_Msk                 (7UL << SCB_CTR_FORMAT_Pos)                    /*!< SCB CTR: Format Mask */
+
+#define SCB_CTR_CWG_Pos                    24U                                            /*!< SCB CTR: CWG Position */
+#define SCB_CTR_CWG_Msk                    (0xFUL << SCB_CTR_CWG_Pos)                     /*!< SCB CTR: CWG Mask */
+
+#define SCB_CTR_ERG_Pos                    20U                                            /*!< SCB CTR: ERG Position */
+#define SCB_CTR_ERG_Msk                    (0xFUL << SCB_CTR_ERG_Pos)                     /*!< SCB CTR: ERG Mask */
+
+#define SCB_CTR_DMINLINE_Pos               16U                                            /*!< SCB CTR: DminLine Position */
+#define SCB_CTR_DMINLINE_Msk               (0xFUL << SCB_CTR_DMINLINE_Pos)                /*!< SCB CTR: DminLine Mask */
+
+#define SCB_CTR_IMINLINE_Pos                0U                                            /*!< SCB CTR: ImInLine Position */
+#define SCB_CTR_IMINLINE_Msk               (0xFUL /*<< SCB_CTR_IMINLINE_Pos*/)            /*!< SCB CTR: ImInLine Mask */
+
+/* SCB Cache Size ID Register Definitions */
+#define SCB_CCSIDR_WT_Pos                  31U                                            /*!< SCB CCSIDR: WT Position */
+#define SCB_CCSIDR_WT_Msk                  (1UL << SCB_CCSIDR_WT_Pos)                     /*!< SCB CCSIDR: WT Mask */
+
+#define SCB_CCSIDR_WB_Pos                  30U                                            /*!< SCB CCSIDR: WB Position */
+#define SCB_CCSIDR_WB_Msk                  (1UL << SCB_CCSIDR_WB_Pos)                     /*!< SCB CCSIDR: WB Mask */
+
+#define SCB_CCSIDR_RA_Pos                  29U                                            /*!< SCB CCSIDR: RA Position */
+#define SCB_CCSIDR_RA_Msk                  (1UL << SCB_CCSIDR_RA_Pos)                     /*!< SCB CCSIDR: RA Mask */
+
+#define SCB_CCSIDR_WA_Pos                  28U                                            /*!< SCB CCSIDR: WA Position */
+#define SCB_CCSIDR_WA_Msk                  (1UL << SCB_CCSIDR_WA_Pos)                     /*!< SCB CCSIDR: WA Mask */
+
+#define SCB_CCSIDR_NUMSETS_Pos             13U                                            /*!< SCB CCSIDR: NumSets Position */
+#define SCB_CCSIDR_NUMSETS_Msk             (0x7FFFUL << SCB_CCSIDR_NUMSETS_Pos)           /*!< SCB CCSIDR: NumSets Mask */
+
+#define SCB_CCSIDR_ASSOCIATIVITY_Pos        3U                                            /*!< SCB CCSIDR: Associativity Position */
+#define SCB_CCSIDR_ASSOCIATIVITY_Msk       (0x3FFUL << SCB_CCSIDR_ASSOCIATIVITY_Pos)      /*!< SCB CCSIDR: Associativity Mask */
+
+#define SCB_CCSIDR_LINESIZE_Pos             0U                                            /*!< SCB CCSIDR: LineSize Position */
+#define SCB_CCSIDR_LINESIZE_Msk            (7UL /*<< SCB_CCSIDR_LINESIZE_Pos*/)           /*!< SCB CCSIDR: LineSize Mask */
+
+/* SCB Cache Size Selection Register Definitions */
+#define SCB_CSSELR_LEVEL_Pos                1U                                            /*!< SCB CSSELR: Level Position */
+#define SCB_CSSELR_LEVEL_Msk               (7UL << SCB_CSSELR_LEVEL_Pos)                  /*!< SCB CSSELR: Level Mask */
+
+#define SCB_CSSELR_IND_Pos                  0U                                            /*!< SCB CSSELR: InD Position */
+#define SCB_CSSELR_IND_Msk                 (1UL /*<< SCB_CSSELR_IND_Pos*/)                /*!< SCB CSSELR: InD Mask */
+
+/* SCB Software Triggered Interrupt Register Definitions */
+#define SCB_STIR_INTID_Pos                  0U                                            /*!< SCB STIR: INTID Position */
+#define SCB_STIR_INTID_Msk                 (0x1FFUL /*<< SCB_STIR_INTID_Pos*/)            /*!< SCB STIR: INTID Mask */
+
+/* SCB RAS Fault Status Register Definitions */
+#define SCB_RFSR_V_Pos                     31U                                            /*!< SCB RFSR: V Position */
+#define SCB_RFSR_V_Msk                     (1UL << SCB_RFSR_V_Pos)                        /*!< SCB RFSR: V Mask */
+
+#define SCB_RFSR_IS_Pos                    16U                                            /*!< SCB RFSR: IS Position */
+#define SCB_RFSR_IS_Msk                    (0x7FFFUL << SCB_RFSR_IS_Pos)                  /*!< SCB RFSR: IS Mask */
+
+#define SCB_RFSR_UET_Pos                    0U                                            /*!< SCB RFSR: UET Position */
+#define SCB_RFSR_UET_Msk                   (3UL /*<< SCB_RFSR_UET_Pos*/)                  /*!< SCB RFSR: UET Mask */
+
+/* SCB D-Cache Invalidate by Set-way Register Definitions */
+#define SCB_DCISW_WAY_Pos                  30U                                            /*!< SCB DCISW: Way Position */
+#define SCB_DCISW_WAY_Msk                  (3UL << SCB_DCISW_WAY_Pos)                     /*!< SCB DCISW: Way Mask */
+
+#define SCB_DCISW_SET_Pos                   5U                                            /*!< SCB DCISW: Set Position */
+#define SCB_DCISW_SET_Msk                  (0x1FFUL << SCB_DCISW_SET_Pos)                 /*!< SCB DCISW: Set Mask */
+
+/* SCB D-Cache Clean by Set-way Register Definitions */
+#define SCB_DCCSW_WAY_Pos                  30U                                            /*!< SCB DCCSW: Way Position */
+#define SCB_DCCSW_WAY_Msk                  (3UL << SCB_DCCSW_WAY_Pos)                     /*!< SCB DCCSW: Way Mask */
+
+#define SCB_DCCSW_SET_Pos                   5U                                            /*!< SCB DCCSW: Set Position */
+#define SCB_DCCSW_SET_Msk                  (0x1FFUL << SCB_DCCSW_SET_Pos)                 /*!< SCB DCCSW: Set Mask */
+
+/* SCB D-Cache Clean and Invalidate by Set-way Register Definitions */
+#define SCB_DCCISW_WAY_Pos                 30U                                            /*!< SCB DCCISW: Way Position */
+#define SCB_DCCISW_WAY_Msk                 (3UL << SCB_DCCISW_WAY_Pos)                    /*!< SCB DCCISW: Way Mask */
+
+#define SCB_DCCISW_SET_Pos                  5U                                            /*!< SCB DCCISW: Set Position */
+#define SCB_DCCISW_SET_Msk                 (0x1FFUL << SCB_DCCISW_SET_Pos)                /*!< SCB DCCISW: Set Mask */
+
+/*@} end of group CMSIS_SCB */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_ICB Implementation Control Block register (ICB)
+  \brief    Type definitions for the Implementation Control Block Register
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Implementation Control Block (ICB).
+ */
+typedef struct
+{
+        uint32_t RESERVED0[1U];
+  __IM  uint32_t ICTR;                   /*!< Offset: 0x004 (R/ )  Interrupt Controller Type Register */
+  __IOM uint32_t ACTLR;                  /*!< Offset: 0x008 (R/W)  Auxiliary Control Register */
+  __IOM uint32_t CPPWR;                  /*!< Offset: 0x00C (R/W)  Coprocessor Power Control  Register */
+} ICB_Type;
+
+/* Auxiliary Control Register Definitions */
+#define ICB_ACTLR_DISCRITAXIRUW_Pos     27U                                               /*!< ACTLR: DISCRITAXIRUW Position */
+#define ICB_ACTLR_DISCRITAXIRUW_Msk     (1UL << ICB_ACTLR_DISCRITAXIRUW_Pos)              /*!< ACTLR: DISCRITAXIRUW Mask */
+
+#define ICB_ACTLR_DISDI_Pos             16U                                               /*!< ACTLR: DISDI Position */
+#define ICB_ACTLR_DISDI_Msk             (3UL << ICB_ACTLR_DISDI_Pos)                      /*!< ACTLR: DISDI Mask */
+
+#define ICB_ACTLR_DISCRITAXIRUR_Pos     15U                                               /*!< ACTLR: DISCRITAXIRUR Position */
+#define ICB_ACTLR_DISCRITAXIRUR_Msk     (1UL << ICB_ACTLR_DISCRITAXIRUR_Pos)              /*!< ACTLR: DISCRITAXIRUR Mask */
+
+#define ICB_ACTLR_EVENTBUSEN_Pos        14U                                               /*!< ACTLR: EVENTBUSEN Position */
+#define ICB_ACTLR_EVENTBUSEN_Msk        (1UL << ICB_ACTLR_EVENTBUSEN_Pos)                 /*!< ACTLR: EVENTBUSEN Mask */
+
+#define ICB_ACTLR_EVENTBUSEN_S_Pos      13U                                               /*!< ACTLR: EVENTBUSEN_S Position */
+#define ICB_ACTLR_EVENTBUSEN_S_Msk      (1UL << ICB_ACTLR_EVENTBUSEN_S_Pos)               /*!< ACTLR: EVENTBUSEN_S Mask */
+
+#define ICB_ACTLR_DISITMATBFLUSH_Pos    12U                                               /*!< ACTLR: DISITMATBFLUSH Position */
+#define ICB_ACTLR_DISITMATBFLUSH_Msk    (1UL << ICB_ACTLR_DISITMATBFLUSH_Pos)             /*!< ACTLR: DISITMATBFLUSH Mask */
+
+#define ICB_ACTLR_DISNWAMODE_Pos        11U                                               /*!< ACTLR: DISNWAMODE Position */
+#define ICB_ACTLR_DISNWAMODE_Msk        (1UL << ICB_ACTLR_DISNWAMODE_Pos)                 /*!< ACTLR: DISNWAMODE Mask */
+
+#define ICB_ACTLR_FPEXCODIS_Pos         10U                                               /*!< ACTLR: FPEXCODIS Position */
+#define ICB_ACTLR_FPEXCODIS_Msk         (1UL << ICB_ACTLR_FPEXCODIS_Pos)                  /*!< ACTLR: FPEXCODIS Mask */
+
+#define ICB_ACTLR_DISOLAP_Pos            7U                                               /*!< ACTLR: DISOLAP Position */
+#define ICB_ACTLR_DISOLAP_Msk           (1UL << ICB_ACTLR_DISOLAP_Pos)                    /*!< ACTLR: DISOLAP Mask */
+
+#define ICB_ACTLR_DISOLAPS_Pos           6U                                               /*!< ACTLR: DISOLAPS Position */
+#define ICB_ACTLR_DISOLAPS_Msk          (1UL << ICB_ACTLR_DISOLAPS_Pos)                   /*!< ACTLR: DISOLAPS Mask */
+
+#define ICB_ACTLR_DISLOBR_Pos            5U                                               /*!< ACTLR: DISLOBR Position */
+#define ICB_ACTLR_DISLOBR_Msk           (1UL << ICB_ACTLR_DISLOBR_Pos)                    /*!< ACTLR: DISLOBR Mask */
+
+#define ICB_ACTLR_DISLO_Pos              4U                                               /*!< ACTLR: DISLO Position */
+#define ICB_ACTLR_DISLO_Msk             (1UL << ICB_ACTLR_DISLO_Pos)                      /*!< ACTLR: DISLO Mask */
+
+#define ICB_ACTLR_DISLOLEP_Pos           3U                                               /*!< ACTLR: DISLOLEP Position */
+#define ICB_ACTLR_DISLOLEP_Msk          (1UL << ICB_ACTLR_DISLOLEP_Pos)                   /*!< ACTLR: DISLOLEP Mask */
+
+#define ICB_ACTLR_DISFOLD_Pos            2U                                               /*!< ACTLR: DISFOLD Position */
+#define ICB_ACTLR_DISFOLD_Msk           (1UL << ICB_ACTLR_DISFOLD_Pos)                    /*!< ACTLR: DISFOLD Mask */
+
+/* Interrupt Controller Type Register Definitions */
+#define ICB_ICTR_INTLINESNUM_Pos         0U                                               /*!< ICTR: INTLINESNUM Position */
+#define ICB_ICTR_INTLINESNUM_Msk        (0xFUL /*<< ICB_ICTR_INTLINESNUM_Pos*/)           /*!< ICTR: INTLINESNUM Mask */
+
+/*@} end of group CMSIS_ICB */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SysTick     System Tick Timer (SysTick)
+  \brief    Type definitions for the System Timer Registers.
+  @{
+ */
+
+/**
+  \brief  Structure type to access the System Timer (SysTick).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SysTick Control and Status Register */
+  __IOM uint32_t LOAD;                   /*!< Offset: 0x004 (R/W)  SysTick Reload Value Register */
+  __IOM uint32_t VAL;                    /*!< Offset: 0x008 (R/W)  SysTick Current Value Register */
+  __IM  uint32_t CALIB;                  /*!< Offset: 0x00C (R/ )  SysTick Calibration Register */
+} SysTick_Type;
+
+/* SysTick Control / Status Register Definitions */
+#define SysTick_CTRL_COUNTFLAG_Pos         16U                                            /*!< SysTick CTRL: COUNTFLAG Position */
+#define SysTick_CTRL_COUNTFLAG_Msk         (1UL << SysTick_CTRL_COUNTFLAG_Pos)            /*!< SysTick CTRL: COUNTFLAG Mask */
+
+#define SysTick_CTRL_CLKSOURCE_Pos          2U                                            /*!< SysTick CTRL: CLKSOURCE Position */
+#define SysTick_CTRL_CLKSOURCE_Msk         (1UL << SysTick_CTRL_CLKSOURCE_Pos)            /*!< SysTick CTRL: CLKSOURCE Mask */
+
+#define SysTick_CTRL_TICKINT_Pos            1U                                            /*!< SysTick CTRL: TICKINT Position */
+#define SysTick_CTRL_TICKINT_Msk           (1UL << SysTick_CTRL_TICKINT_Pos)              /*!< SysTick CTRL: TICKINT Mask */
+
+#define SysTick_CTRL_ENABLE_Pos             0U                                            /*!< SysTick CTRL: ENABLE Position */
+#define SysTick_CTRL_ENABLE_Msk            (1UL /*<< SysTick_CTRL_ENABLE_Pos*/)           /*!< SysTick CTRL: ENABLE Mask */
+
+/* SysTick Reload Register Definitions */
+#define SysTick_LOAD_RELOAD_Pos             0U                                            /*!< SysTick LOAD: RELOAD Position */
+#define SysTick_LOAD_RELOAD_Msk            (0xFFFFFFUL /*<< SysTick_LOAD_RELOAD_Pos*/)    /*!< SysTick LOAD: RELOAD Mask */
+
+/* SysTick Current Register Definitions */
+#define SysTick_VAL_CURRENT_Pos             0U                                            /*!< SysTick VAL: CURRENT Position */
+#define SysTick_VAL_CURRENT_Msk            (0xFFFFFFUL /*<< SysTick_VAL_CURRENT_Pos*/)    /*!< SysTick VAL: CURRENT Mask */
+
+/* SysTick Calibration Register Definitions */
+#define SysTick_CALIB_NOREF_Pos            31U                                            /*!< SysTick CALIB: NOREF Position */
+#define SysTick_CALIB_NOREF_Msk            (1UL << SysTick_CALIB_NOREF_Pos)               /*!< SysTick CALIB: NOREF Mask */
+
+#define SysTick_CALIB_SKEW_Pos             30U                                            /*!< SysTick CALIB: SKEW Position */
+#define SysTick_CALIB_SKEW_Msk             (1UL << SysTick_CALIB_SKEW_Pos)                /*!< SysTick CALIB: SKEW Mask */
+
+#define SysTick_CALIB_TENMS_Pos             0U                                            /*!< SysTick CALIB: TENMS Position */
+#define SysTick_CALIB_TENMS_Msk            (0xFFFFFFUL /*<< SysTick_CALIB_TENMS_Pos*/)    /*!< SysTick CALIB: TENMS Mask */
+
+/*@} end of group CMSIS_SysTick */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_ITM     Instrumentation Trace Macrocell (ITM)
+  \brief    Type definitions for the Instrumentation Trace Macrocell (ITM)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Instrumentation Trace Macrocell Register (ITM).
+ */
+typedef struct
+{
+  __OM  union
+  {
+    __OM  uint8_t    u8;                 /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 8-bit */
+    __OM  uint16_t   u16;                /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 16-bit */
+    __OM  uint32_t   u32;                /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 32-bit */
+  }  PORT [32U];                         /*!< Offset: 0x000 ( /W)  ITM Stimulus Port Registers */
+        uint32_t RESERVED0[864U];
+  __IOM uint32_t TER;                    /*!< Offset: 0xE00 (R/W)  ITM Trace Enable Register */
+        uint32_t RESERVED1[15U];
+  __IOM uint32_t TPR;                    /*!< Offset: 0xE40 (R/W)  ITM Trace Privilege Register */
+        uint32_t RESERVED2[15U];
+  __IOM uint32_t TCR;                    /*!< Offset: 0xE80 (R/W)  ITM Trace Control Register */
+        uint32_t RESERVED3[32U];
+        uint32_t RESERVED4[43U];
+  __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  ITM Lock Access Register */
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  ITM Lock Status Register */
+        uint32_t RESERVED5[1U];
+  __IM  uint32_t DEVARCH;                /*!< Offset: 0xFBC (R/ )  ITM Device Architecture Register */
+        uint32_t RESERVED6[3U];
+  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  ITM Device Type Register */
+  __IM  uint32_t PID4;                   /*!< Offset: 0xFD0 (R/ )  ITM Peripheral Identification Register #4 */
+  __IM  uint32_t PID5;                   /*!< Offset: 0xFD4 (R/ )  ITM Peripheral Identification Register #5 */
+  __IM  uint32_t PID6;                   /*!< Offset: 0xFD8 (R/ )  ITM Peripheral Identification Register #6 */
+  __IM  uint32_t PID7;                   /*!< Offset: 0xFDC (R/ )  ITM Peripheral Identification Register #7 */
+  __IM  uint32_t PID0;                   /*!< Offset: 0xFE0 (R/ )  ITM Peripheral Identification Register #0 */
+  __IM  uint32_t PID1;                   /*!< Offset: 0xFE4 (R/ )  ITM Peripheral Identification Register #1 */
+  __IM  uint32_t PID2;                   /*!< Offset: 0xFE8 (R/ )  ITM Peripheral Identification Register #2 */
+  __IM  uint32_t PID3;                   /*!< Offset: 0xFEC (R/ )  ITM Peripheral Identification Register #3 */
+  __IM  uint32_t CID0;                   /*!< Offset: 0xFF0 (R/ )  ITM Component  Identification Register #0 */
+  __IM  uint32_t CID1;                   /*!< Offset: 0xFF4 (R/ )  ITM Component  Identification Register #1 */
+  __IM  uint32_t CID2;                   /*!< Offset: 0xFF8 (R/ )  ITM Component  Identification Register #2 */
+  __IM  uint32_t CID3;                   /*!< Offset: 0xFFC (R/ )  ITM Component  Identification Register #3 */
+} ITM_Type;
+
+/* ITM Stimulus Port Register Definitions */
+#define ITM_STIM_DISABLED_Pos               1U                                            /*!< ITM STIM: DISABLED Position */
+#define ITM_STIM_DISABLED_Msk              (0x1UL << ITM_STIM_DISABLED_Pos)               /*!< ITM STIM: DISABLED Mask */
+
+#define ITM_STIM_FIFOREADY_Pos              0U                                            /*!< ITM STIM: FIFOREADY Position */
+#define ITM_STIM_FIFOREADY_Msk             (0x1UL /*<< ITM_STIM_FIFOREADY_Pos*/)          /*!< ITM STIM: FIFOREADY Mask */
+
+/* ITM Trace Privilege Register Definitions */
+#define ITM_TPR_PRIVMASK_Pos                0U                                            /*!< ITM TPR: PRIVMASK Position */
+#define ITM_TPR_PRIVMASK_Msk               (0xFUL /*<< ITM_TPR_PRIVMASK_Pos*/)            /*!< ITM TPR: PRIVMASK Mask */
+
+/* ITM Trace Control Register Definitions */
+#define ITM_TCR_BUSY_Pos                   23U                                            /*!< ITM TCR: BUSY Position */
+#define ITM_TCR_BUSY_Msk                   (1UL << ITM_TCR_BUSY_Pos)                      /*!< ITM TCR: BUSY Mask */
+
+#define ITM_TCR_TRACEBUSID_Pos             16U                                            /*!< ITM TCR: ATBID Position */
+#define ITM_TCR_TRACEBUSID_Msk             (0x7FUL << ITM_TCR_TRACEBUSID_Pos)             /*!< ITM TCR: ATBID Mask */
+
+#define ITM_TCR_GTSFREQ_Pos                10U                                            /*!< ITM TCR: Global timestamp frequency Position */
+#define ITM_TCR_GTSFREQ_Msk                (3UL << ITM_TCR_GTSFREQ_Pos)                   /*!< ITM TCR: Global timestamp frequency Mask */
+
+#define ITM_TCR_TSPRESCALE_Pos              8U                                            /*!< ITM TCR: TSPRESCALE Position */
+#define ITM_TCR_TSPRESCALE_Msk             (3UL << ITM_TCR_TSPRESCALE_Pos)                /*!< ITM TCR: TSPRESCALE Mask */
+
+#define ITM_TCR_STALLENA_Pos                5U                                            /*!< ITM TCR: STALLENA Position */
+#define ITM_TCR_STALLENA_Msk               (1UL << ITM_TCR_STALLENA_Pos)                  /*!< ITM TCR: STALLENA Mask */
+
+#define ITM_TCR_SWOENA_Pos                  4U                                            /*!< ITM TCR: SWOENA Position */
+#define ITM_TCR_SWOENA_Msk                 (1UL << ITM_TCR_SWOENA_Pos)                    /*!< ITM TCR: SWOENA Mask */
+
+#define ITM_TCR_DWTENA_Pos                  3U                                            /*!< ITM TCR: DWTENA Position */
+#define ITM_TCR_DWTENA_Msk                 (1UL << ITM_TCR_DWTENA_Pos)                    /*!< ITM TCR: DWTENA Mask */
+
+#define ITM_TCR_SYNCENA_Pos                 2U                                            /*!< ITM TCR: SYNCENA Position */
+#define ITM_TCR_SYNCENA_Msk                (1UL << ITM_TCR_SYNCENA_Pos)                   /*!< ITM TCR: SYNCENA Mask */
+
+#define ITM_TCR_TSENA_Pos                   1U                                            /*!< ITM TCR: TSENA Position */
+#define ITM_TCR_TSENA_Msk                  (1UL << ITM_TCR_TSENA_Pos)                     /*!< ITM TCR: TSENA Mask */
+
+#define ITM_TCR_ITMENA_Pos                  0U                                            /*!< ITM TCR: ITM Enable bit Position */
+#define ITM_TCR_ITMENA_Msk                 (1UL /*<< ITM_TCR_ITMENA_Pos*/)                /*!< ITM TCR: ITM Enable bit Mask */
+
+/* ITM Lock Status Register Definitions */
+#define ITM_LSR_ByteAcc_Pos                 2U                                            /*!< ITM LSR: ByteAcc Position */
+#define ITM_LSR_ByteAcc_Msk                (1UL << ITM_LSR_ByteAcc_Pos)                   /*!< ITM LSR: ByteAcc Mask */
+
+#define ITM_LSR_Access_Pos                  1U                                            /*!< ITM LSR: Access Position */
+#define ITM_LSR_Access_Msk                 (1UL << ITM_LSR_Access_Pos)                    /*!< ITM LSR: Access Mask */
+
+#define ITM_LSR_Present_Pos                 0U                                            /*!< ITM LSR: Present Position */
+#define ITM_LSR_Present_Msk                (1UL /*<< ITM_LSR_Present_Pos*/)               /*!< ITM LSR: Present Mask */
+
+/*@}*/ /* end of group CMSIS_ITM */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DWT     Data Watchpoint and Trace (DWT)
+  \brief    Type definitions for the Data Watchpoint and Trace (DWT)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Data Watchpoint and Trace Register (DWT).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  Control Register */
+  __IOM uint32_t CYCCNT;                 /*!< Offset: 0x004 (R/W)  Cycle Count Register */
+  __IOM uint32_t CPICNT;                 /*!< Offset: 0x008 (R/W)  CPI Count Register */
+  __IOM uint32_t EXCCNT;                 /*!< Offset: 0x00C (R/W)  Exception Overhead Count Register */
+  __IOM uint32_t SLEEPCNT;               /*!< Offset: 0x010 (R/W)  Sleep Count Register */
+  __IOM uint32_t LSUCNT;                 /*!< Offset: 0x014 (R/W)  LSU Count Register */
+  __IOM uint32_t FOLDCNT;                /*!< Offset: 0x018 (R/W)  Folded-instruction Count Register */
+  __IM  uint32_t PCSR;                   /*!< Offset: 0x01C (R/ )  Program Counter Sample Register */
+  __IOM uint32_t COMP0;                  /*!< Offset: 0x020 (R/W)  Comparator Register 0 */
+        uint32_t RESERVED1[1U];
+  __IOM uint32_t FUNCTION0;              /*!< Offset: 0x028 (R/W)  Function Register 0 */
+        uint32_t RESERVED2[1U];
+  __IOM uint32_t COMP1;                  /*!< Offset: 0x030 (R/W)  Comparator Register 1 */
+        uint32_t RESERVED3[1U];
+  __IOM uint32_t FUNCTION1;              /*!< Offset: 0x038 (R/W)  Function Register 1 */
+        uint32_t RESERVED4[1U];
+  __IOM uint32_t COMP2;                  /*!< Offset: 0x040 (R/W)  Comparator Register 2 */
+        uint32_t RESERVED5[1U];
+  __IOM uint32_t FUNCTION2;              /*!< Offset: 0x048 (R/W)  Function Register 2 */
+        uint32_t RESERVED6[1U];
+  __IOM uint32_t COMP3;                  /*!< Offset: 0x050 (R/W)  Comparator Register 3 */
+        uint32_t RESERVED7[1U];
+  __IOM uint32_t FUNCTION3;              /*!< Offset: 0x058 (R/W)  Function Register 3 */
+        uint32_t RESERVED8[1U];
+  __IOM uint32_t COMP4;                  /*!< Offset: 0x060 (R/W)  Comparator Register 4 */
+        uint32_t RESERVED9[1U];
+  __IOM uint32_t FUNCTION4;              /*!< Offset: 0x068 (R/W)  Function Register 4 */
+        uint32_t RESERVED10[1U];
+  __IOM uint32_t COMP5;                  /*!< Offset: 0x070 (R/W)  Comparator Register 5 */
+        uint32_t RESERVED11[1U];
+  __IOM uint32_t FUNCTION5;              /*!< Offset: 0x078 (R/W)  Function Register 5 */
+        uint32_t RESERVED12[1U];
+  __IOM uint32_t COMP6;                  /*!< Offset: 0x080 (R/W)  Comparator Register 6 */
+        uint32_t RESERVED13[1U];
+  __IOM uint32_t FUNCTION6;              /*!< Offset: 0x088 (R/W)  Function Register 6 */
+        uint32_t RESERVED14[1U];
+  __IOM uint32_t COMP7;                  /*!< Offset: 0x090 (R/W)  Comparator Register 7 */
+        uint32_t RESERVED15[1U];
+  __IOM uint32_t FUNCTION7;              /*!< Offset: 0x098 (R/W)  Function Register 7 */
+        uint32_t RESERVED16[1U];
+  __IOM uint32_t COMP8;                  /*!< Offset: 0x0A0 (R/W)  Comparator Register 8 */
+        uint32_t RESERVED17[1U];
+  __IOM uint32_t FUNCTION8;              /*!< Offset: 0x0A8 (R/W)  Function Register 8 */
+        uint32_t RESERVED18[1U];
+  __IOM uint32_t COMP9;                  /*!< Offset: 0x0B0 (R/W)  Comparator Register 9 */
+        uint32_t RESERVED19[1U];
+  __IOM uint32_t FUNCTION9;              /*!< Offset: 0x0B8 (R/W)  Function Register 9 */
+        uint32_t RESERVED20[1U];
+  __IOM uint32_t COMP10;                 /*!< Offset: 0x0C0 (R/W)  Comparator Register 10 */
+        uint32_t RESERVED21[1U];
+  __IOM uint32_t FUNCTION10;             /*!< Offset: 0x0C8 (R/W)  Function Register 10 */
+        uint32_t RESERVED22[1U];
+  __IOM uint32_t COMP11;                 /*!< Offset: 0x0D0 (R/W)  Comparator Register 11 */
+        uint32_t RESERVED23[1U];
+  __IOM uint32_t FUNCTION11;             /*!< Offset: 0x0D8 (R/W)  Function Register 11 */
+        uint32_t RESERVED24[1U];
+  __IOM uint32_t COMP12;                 /*!< Offset: 0x0E0 (R/W)  Comparator Register 12 */
+        uint32_t RESERVED25[1U];
+  __IOM uint32_t FUNCTION12;             /*!< Offset: 0x0E8 (R/W)  Function Register 12 */
+        uint32_t RESERVED26[1U];
+  __IOM uint32_t COMP13;                 /*!< Offset: 0x0F0 (R/W)  Comparator Register 13 */
+        uint32_t RESERVED27[1U];
+  __IOM uint32_t FUNCTION13;             /*!< Offset: 0x0F8 (R/W)  Function Register 13 */
+        uint32_t RESERVED28[1U];
+  __IOM uint32_t COMP14;                 /*!< Offset: 0x100 (R/W)  Comparator Register 14 */
+        uint32_t RESERVED29[1U];
+  __IOM uint32_t FUNCTION14;             /*!< Offset: 0x108 (R/W)  Function Register 14 */
+        uint32_t RESERVED30[1U];
+  __IOM uint32_t COMP15;                 /*!< Offset: 0x110 (R/W)  Comparator Register 15 */
+        uint32_t RESERVED31[1U];
+  __IOM uint32_t FUNCTION15;             /*!< Offset: 0x118 (R/W)  Function Register 15 */
+        uint32_t RESERVED32[934U];
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R  )  Lock Status Register */
+        uint32_t RESERVED33[1U];
+  __IM  uint32_t DEVARCH;                /*!< Offset: 0xFBC (R/ )  Device Architecture Register */
+} DWT_Type;
+
+/* DWT Control Register Definitions */
+#define DWT_CTRL_NUMCOMP_Pos               28U                                         /*!< DWT CTRL: NUMCOMP Position */
+#define DWT_CTRL_NUMCOMP_Msk               (0xFUL << DWT_CTRL_NUMCOMP_Pos)             /*!< DWT CTRL: NUMCOMP Mask */
+
+#define DWT_CTRL_NOTRCPKT_Pos              27U                                         /*!< DWT CTRL: NOTRCPKT Position */
+#define DWT_CTRL_NOTRCPKT_Msk              (0x1UL << DWT_CTRL_NOTRCPKT_Pos)            /*!< DWT CTRL: NOTRCPKT Mask */
+
+#define DWT_CTRL_NOEXTTRIG_Pos             26U                                         /*!< DWT CTRL: NOEXTTRIG Position */
+#define DWT_CTRL_NOEXTTRIG_Msk             (0x1UL << DWT_CTRL_NOEXTTRIG_Pos)           /*!< DWT CTRL: NOEXTTRIG Mask */
+
+#define DWT_CTRL_NOCYCCNT_Pos              25U                                         /*!< DWT CTRL: NOCYCCNT Position */
+#define DWT_CTRL_NOCYCCNT_Msk              (0x1UL << DWT_CTRL_NOCYCCNT_Pos)            /*!< DWT CTRL: NOCYCCNT Mask */
+
+#define DWT_CTRL_NOPRFCNT_Pos              24U                                         /*!< DWT CTRL: NOPRFCNT Position */
+#define DWT_CTRL_NOPRFCNT_Msk              (0x1UL << DWT_CTRL_NOPRFCNT_Pos)            /*!< DWT CTRL: NOPRFCNT Mask */
+
+#define DWT_CTRL_CYCDISS_Pos               23U                                         /*!< DWT CTRL: CYCDISS Position */
+#define DWT_CTRL_CYCDISS_Msk               (0x1UL << DWT_CTRL_CYCDISS_Pos)             /*!< DWT CTRL: CYCDISS Mask */
+
+#define DWT_CTRL_CYCEVTENA_Pos             22U                                         /*!< DWT CTRL: CYCEVTENA Position */
+#define DWT_CTRL_CYCEVTENA_Msk             (0x1UL << DWT_CTRL_CYCEVTENA_Pos)           /*!< DWT CTRL: CYCEVTENA Mask */
+
+#define DWT_CTRL_FOLDEVTENA_Pos            21U                                         /*!< DWT CTRL: FOLDEVTENA Position */
+#define DWT_CTRL_FOLDEVTENA_Msk            (0x1UL << DWT_CTRL_FOLDEVTENA_Pos)          /*!< DWT CTRL: FOLDEVTENA Mask */
+
+#define DWT_CTRL_LSUEVTENA_Pos             20U                                         /*!< DWT CTRL: LSUEVTENA Position */
+#define DWT_CTRL_LSUEVTENA_Msk             (0x1UL << DWT_CTRL_LSUEVTENA_Pos)           /*!< DWT CTRL: LSUEVTENA Mask */
+
+#define DWT_CTRL_SLEEPEVTENA_Pos           19U                                         /*!< DWT CTRL: SLEEPEVTENA Position */
+#define DWT_CTRL_SLEEPEVTENA_Msk           (0x1UL << DWT_CTRL_SLEEPEVTENA_Pos)         /*!< DWT CTRL: SLEEPEVTENA Mask */
+
+#define DWT_CTRL_EXCEVTENA_Pos             18U                                         /*!< DWT CTRL: EXCEVTENA Position */
+#define DWT_CTRL_EXCEVTENA_Msk             (0x1UL << DWT_CTRL_EXCEVTENA_Pos)           /*!< DWT CTRL: EXCEVTENA Mask */
+
+#define DWT_CTRL_CPIEVTENA_Pos             17U                                         /*!< DWT CTRL: CPIEVTENA Position */
+#define DWT_CTRL_CPIEVTENA_Msk             (0x1UL << DWT_CTRL_CPIEVTENA_Pos)           /*!< DWT CTRL: CPIEVTENA Mask */
+
+#define DWT_CTRL_EXCTRCENA_Pos             16U                                         /*!< DWT CTRL: EXCTRCENA Position */
+#define DWT_CTRL_EXCTRCENA_Msk             (0x1UL << DWT_CTRL_EXCTRCENA_Pos)           /*!< DWT CTRL: EXCTRCENA Mask */
+
+#define DWT_CTRL_PCSAMPLENA_Pos            12U                                         /*!< DWT CTRL: PCSAMPLENA Position */
+#define DWT_CTRL_PCSAMPLENA_Msk            (0x1UL << DWT_CTRL_PCSAMPLENA_Pos)          /*!< DWT CTRL: PCSAMPLENA Mask */
+
+#define DWT_CTRL_SYNCTAP_Pos               10U                                         /*!< DWT CTRL: SYNCTAP Position */
+#define DWT_CTRL_SYNCTAP_Msk               (0x3UL << DWT_CTRL_SYNCTAP_Pos)             /*!< DWT CTRL: SYNCTAP Mask */
+
+#define DWT_CTRL_CYCTAP_Pos                 9U                                         /*!< DWT CTRL: CYCTAP Position */
+#define DWT_CTRL_CYCTAP_Msk                (0x1UL << DWT_CTRL_CYCTAP_Pos)              /*!< DWT CTRL: CYCTAP Mask */
+
+#define DWT_CTRL_POSTINIT_Pos               5U                                         /*!< DWT CTRL: POSTINIT Position */
+#define DWT_CTRL_POSTINIT_Msk              (0xFUL << DWT_CTRL_POSTINIT_Pos)            /*!< DWT CTRL: POSTINIT Mask */
+
+#define DWT_CTRL_POSTPRESET_Pos             1U                                         /*!< DWT CTRL: POSTPRESET Position */
+#define DWT_CTRL_POSTPRESET_Msk            (0xFUL << DWT_CTRL_POSTPRESET_Pos)          /*!< DWT CTRL: POSTPRESET Mask */
+
+#define DWT_CTRL_CYCCNTENA_Pos              0U                                         /*!< DWT CTRL: CYCCNTENA Position */
+#define DWT_CTRL_CYCCNTENA_Msk             (0x1UL /*<< DWT_CTRL_CYCCNTENA_Pos*/)       /*!< DWT CTRL: CYCCNTENA Mask */
+
+/* DWT CPI Count Register Definitions */
+#define DWT_CPICNT_CPICNT_Pos               0U                                         /*!< DWT CPICNT: CPICNT Position */
+#define DWT_CPICNT_CPICNT_Msk              (0xFFUL /*<< DWT_CPICNT_CPICNT_Pos*/)       /*!< DWT CPICNT: CPICNT Mask */
+
+/* DWT Exception Overhead Count Register Definitions */
+#define DWT_EXCCNT_EXCCNT_Pos               0U                                         /*!< DWT EXCCNT: EXCCNT Position */
+#define DWT_EXCCNT_EXCCNT_Msk              (0xFFUL /*<< DWT_EXCCNT_EXCCNT_Pos*/)       /*!< DWT EXCCNT: EXCCNT Mask */
+
+/* DWT Sleep Count Register Definitions */
+#define DWT_SLEEPCNT_SLEEPCNT_Pos           0U                                         /*!< DWT SLEEPCNT: SLEEPCNT Position */
+#define DWT_SLEEPCNT_SLEEPCNT_Msk          (0xFFUL /*<< DWT_SLEEPCNT_SLEEPCNT_Pos*/)   /*!< DWT SLEEPCNT: SLEEPCNT Mask */
+
+/* DWT LSU Count Register Definitions */
+#define DWT_LSUCNT_LSUCNT_Pos               0U                                         /*!< DWT LSUCNT: LSUCNT Position */
+#define DWT_LSUCNT_LSUCNT_Msk              (0xFFUL /*<< DWT_LSUCNT_LSUCNT_Pos*/)       /*!< DWT LSUCNT: LSUCNT Mask */
+
+/* DWT Folded-instruction Count Register Definitions */
+#define DWT_FOLDCNT_FOLDCNT_Pos             0U                                         /*!< DWT FOLDCNT: FOLDCNT Position */
+#define DWT_FOLDCNT_FOLDCNT_Msk            (0xFFUL /*<< DWT_FOLDCNT_FOLDCNT_Pos*/)     /*!< DWT FOLDCNT: FOLDCNT Mask */
+
+/* DWT Comparator Function Register Definitions */
+#define DWT_FUNCTION_ID_Pos                27U                                         /*!< DWT FUNCTION: ID Position */
+#define DWT_FUNCTION_ID_Msk                (0x1FUL << DWT_FUNCTION_ID_Pos)             /*!< DWT FUNCTION: ID Mask */
+
+#define DWT_FUNCTION_MATCHED_Pos           24U                                         /*!< DWT FUNCTION: MATCHED Position */
+#define DWT_FUNCTION_MATCHED_Msk           (0x1UL << DWT_FUNCTION_MATCHED_Pos)         /*!< DWT FUNCTION: MATCHED Mask */
+
+#define DWT_FUNCTION_DATAVSIZE_Pos         10U                                         /*!< DWT FUNCTION: DATAVSIZE Position */
+#define DWT_FUNCTION_DATAVSIZE_Msk         (0x3UL << DWT_FUNCTION_DATAVSIZE_Pos)       /*!< DWT FUNCTION: DATAVSIZE Mask */
+
+#define DWT_FUNCTION_ACTION_Pos             4U                                         /*!< DWT FUNCTION: ACTION Position */
+#define DWT_FUNCTION_ACTION_Msk            (0x1UL << DWT_FUNCTION_ACTION_Pos)          /*!< DWT FUNCTION: ACTION Mask */
+
+#define DWT_FUNCTION_MATCH_Pos              0U                                         /*!< DWT FUNCTION: MATCH Position */
+#define DWT_FUNCTION_MATCH_Msk             (0xFUL /*<< DWT_FUNCTION_MATCH_Pos*/)       /*!< DWT FUNCTION: MATCH Mask */
+
+/*@}*/ /* end of group CMSIS_DWT */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup MemSysCtl_Type     Memory System Control Registers (IMPLEMENTATION DEFINED)
+  \brief    Type definitions for the Memory System Control Registers (MEMSYSCTL)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Memory System Control Registers (MEMSYSCTL).
+ */
+typedef struct
+{
+  __IOM uint32_t MSCR;                   /*!< Offset: 0x000 (R/W)  Memory System Control Register */
+  __IOM uint32_t PFCR;                   /*!< Offset: 0x004 (R/W)  Prefetcher Control Register */
+        uint32_t RESERVED1[2U];
+  __IOM uint32_t ITCMCR;                 /*!< Offset: 0x010 (R/W)  ITCM Control Register */
+  __IOM uint32_t DTCMCR;                 /*!< Offset: 0x014 (R/W)  DTCM Control Register */
+  __IOM uint32_t PAHBCR;                 /*!< Offset: 0x018 (R/W)  P-AHB Control Register */
+        uint32_t RESERVED2[313U];
+  __IOM uint32_t ITGU_CTRL;              /*!< Offset: 0x500 (R/W)  ITGU Control Register */
+  __IOM uint32_t ITGU_CFG;               /*!< Offset: 0x504 (R/W)  ITGU Configuration Register */
+        uint32_t RESERVED3[2U];
+  __IOM uint32_t ITGU_LUT[16U];          /*!< Offset: 0x510 (R/W)  ITGU Look Up Table Register */
+        uint32_t RESERVED4[44U];
+  __IOM uint32_t DTGU_CTRL;              /*!< Offset: 0x600 (R/W)  DTGU Control Registers */
+  __IOM uint32_t DTGU_CFG;               /*!< Offset: 0x604 (R/W)  DTGU Configuration Register */
+        uint32_t RESERVED5[2U];
+  __IOM uint32_t DTGU_LUT[16U];          /*!< Offset: 0x610 (R/W)  DTGU Look Up Table Register */
+} MemSysCtl_Type;
+
+/* MEMSYSCTL Memory System Control Register (MSCR) Register Definitions */
+#define MEMSYSCTL_MSCR_CPWRDN_Pos          17U                                         /*!< MEMSYSCTL MSCR: CPWRDN Position */
+#define MEMSYSCTL_MSCR_CPWRDN_Msk          (0x1UL << MEMSYSCTL_MSCR_CPWRDN_Pos)        /*!< MEMSYSCTL MSCR: CPWRDN Mask */
+
+#define MEMSYSCTL_MSCR_DCCLEAN_Pos         16U                                         /*!< MEMSYSCTL MSCR: DCCLEAN Position */
+#define MEMSYSCTL_MSCR_DCCLEAN_Msk         (0x1UL << MEMSYSCTL_MSCR_DCCLEAN_Pos)       /*!< MEMSYSCTL MSCR: DCCLEAN Mask */
+
+#define MEMSYSCTL_MSCR_ICACTIVE_Pos        13U                                         /*!< MEMSYSCTL MSCR: ICACTIVE Position */
+#define MEMSYSCTL_MSCR_ICACTIVE_Msk        (0x1UL << MEMSYSCTL_MSCR_ICACTIVE_Pos)      /*!< MEMSYSCTL MSCR: ICACTIVE Mask */
+
+#define MEMSYSCTL_MSCR_DCACTIVE_Pos        12U                                         /*!< MEMSYSCTL MSCR: DCACTIVE Position */
+#define MEMSYSCTL_MSCR_DCACTIVE_Msk        (0x1UL << MEMSYSCTL_MSCR_DCACTIVE_Pos)      /*!< MEMSYSCTL MSCR: DCACTIVE Mask */
+
+#define MEMSYSCTL_MSCR_TECCCHKDIS_Pos       4U                                         /*!< MEMSYSCTL MSCR: TECCCHKDIS Position */
+#define MEMSYSCTL_MSCR_TECCCHKDIS_Msk      (0x1UL << MEMSYSCTL_MSCR_TECCCHKDIS_Pos)    /*!< MEMSYSCTL MSCR: TECCCHKDIS Mask */
+
+#define MEMSYSCTL_MSCR_EVECCFAULT_Pos       3U                                         /*!< MEMSYSCTL MSCR: EVECCFAULT Position */
+#define MEMSYSCTL_MSCR_EVECCFAULT_Msk      (0x1UL << MEMSYSCTL_MSCR_EVECCFAULT_Pos)    /*!< MEMSYSCTL MSCR: EVECCFAULT Mask */
+
+#define MEMSYSCTL_MSCR_FORCEWT_Pos          2U                                         /*!< MEMSYSCTL MSCR: FORCEWT Position */
+#define MEMSYSCTL_MSCR_FORCEWT_Msk         (0x1UL << MEMSYSCTL_MSCR_FORCEWT_Pos)       /*!< MEMSYSCTL MSCR: FORCEWT Mask */
+
+#define MEMSYSCTL_MSCR_ECCEN_Pos            1U                                         /*!< MEMSYSCTL MSCR: ECCEN Position */
+#define MEMSYSCTL_MSCR_ECCEN_Msk           (0x1UL << MEMSYSCTL_MSCR_ECCEN_Pos)         /*!< MEMSYSCTL MSCR: ECCEN Mask */
+
+/* MEMSYSCTL Prefetcher Control Register (PFCR) Register Definitions */
+#define MEMSYSCTL_PFCR_MAX_OS_Pos           7U                                         /*!< MEMSYSCTL PFCR: MAX_OS Position */
+#define MEMSYSCTL_PFCR_MAX_OS_Msk          (0x7UL << MEMSYSCTL_PFCR_MAX_OS_Pos)        /*!< MEMSYSCTL PFCR: MAX_OS Mask */
+
+#define MEMSYSCTL_PFCR_MAX_LA_Pos           4U                                         /*!< MEMSYSCTL PFCR: MAX_LA Position */
+#define MEMSYSCTL_PFCR_MAX_LA_Msk          (0x7UL << MEMSYSCTL_PFCR_MAX_LA_Pos)        /*!< MEMSYSCTL PFCR: MAX_LA Mask */
+
+#define MEMSYSCTL_PFCR_MIN_LA_Pos           1U                                         /*!< MEMSYSCTL PFCR: MIN_LA Position */
+#define MEMSYSCTL_PFCR_MIN_LA_Msk          (0x7UL << MEMSYSCTL_PFCR_MIN_LA_Pos)        /*!< MEMSYSCTL PFCR: MIN_LA Mask */
+
+#define MEMSYSCTL_PFCR_ENABLE_Pos           0U                                         /*!< MEMSYSCTL PFCR: ENABLE Position */
+#define MEMSYSCTL_PFCR_ENABLE_Msk          (0x1UL /*<< MEMSYSCTL_PFCR_ENABLE_Pos*/)    /*!< MEMSYSCTL PFCR: ENABLE Mask */
+
+/* MEMSYSCTL ITCM Control Register (ITCMCR) Register Definitions */
+#define MEMSYSCTL_ITCMCR_SZ_Pos             3U                                         /*!< MEMSYSCTL ITCMCR: SZ Position */
+#define MEMSYSCTL_ITCMCR_SZ_Msk            (0xFUL << MEMSYSCTL_ITCMCR_SZ_Pos)          /*!< MEMSYSCTL ITCMCR: SZ Mask */
+
+#define MEMSYSCTL_ITCMCR_EN_Pos             0U                                         /*!< MEMSYSCTL ITCMCR: EN Position */
+#define MEMSYSCTL_ITCMCR_EN_Msk            (0x1UL /*<< MEMSYSCTL_ITCMCR_EN_Pos*/)      /*!< MEMSYSCTL ITCMCR: EN Mask */
+
+/* MEMSYSCTL DTCM Control Register (DTCMCR) Register Definitions */
+#define MEMSYSCTL_DTCMCR_SZ_Pos             3U                                         /*!< MEMSYSCTL DTCMCR: SZ Position */
+#define MEMSYSCTL_DTCMCR_SZ_Msk            (0xFUL << MEMSYSCTL_DTCMCR_SZ_Pos)          /*!< MEMSYSCTL DTCMCR: SZ Mask */
+
+#define MEMSYSCTL_DTCMCR_EN_Pos             0U                                         /*!< MEMSYSCTL DTCMCR: EN Position */
+#define MEMSYSCTL_DTCMCR_EN_Msk            (0x1UL /*<< MEMSYSCTL_DTCMCR_EN_Pos*/)      /*!< MEMSYSCTL DTCMCR: EN Mask */
+
+/* MEMSYSCTL P-AHB Control Register (PAHBCR) Register Definitions */
+#define MEMSYSCTL_PAHBCR_SZ_Pos             1U                                         /*!< MEMSYSCTL PAHBCR: SZ Position */
+#define MEMSYSCTL_PAHBCR_SZ_Msk            (0x7UL << MEMSYSCTL_PAHBCR_SZ_Pos)          /*!< MEMSYSCTL PAHBCR: SZ Mask */
+
+#define MEMSYSCTL_PAHBCR_EN_Pos             0U                                         /*!< MEMSYSCTL PAHBCR: EN Position */
+#define MEMSYSCTL_PAHBCR_EN_Msk            (0x1UL /*<< MEMSYSCTL_PAHBCR_EN_Pos*/)      /*!< MEMSYSCTL PAHBCR: EN Mask */
+
+/* MEMSYSCTL ITGU Control Register (ITGU_CTRL) Register Definitions */
+#define MEMSYSCTL_ITGU_CTRL_DEREN_Pos       1U                                         /*!< MEMSYSCTL ITGU_CTRL: DEREN Position */
+#define MEMSYSCTL_ITGU_CTRL_DEREN_Msk      (0x1UL << MEMSYSCTL_ITGU_CTRL_DEREN_Pos)    /*!< MEMSYSCTL ITGU_CTRL: DEREN Mask */
+
+#define MEMSYSCTL_ITGU_CTRL_DBFEN_Pos       0U                                         /*!< MEMSYSCTL ITGU_CTRL: DBFEN Position */
+#define MEMSYSCTL_ITGU_CTRL_DBFEN_Msk      (0x1UL /*<< MEMSYSCTL_ITGU_CTRL_DBFEN_Pos*/) /*!< MEMSYSCTL ITGU_CTRL: DBFEN Mask */
+
+/* MEMSYSCTL ITGU Configuration Register (ITGU_CFG) Register Definitions */
+#define MEMSYSCTL_ITGU_CFG_PRESENT_Pos     31U                                         /*!< MEMSYSCTL ITGU_CFG: PRESENT Position */
+#define MEMSYSCTL_ITGU_CFG_PRESENT_Msk     (0x1UL << MEMSYSCTL_ITGU_CFG_PRESENT_Pos)   /*!< MEMSYSCTL ITGU_CFG: PRESENT Mask */
+
+#define MEMSYSCTL_ITGU_CFG_NUMBLKS_Pos      8U                                         /*!< MEMSYSCTL ITGU_CFG: NUMBLKS Position */
+#define MEMSYSCTL_ITGU_CFG_NUMBLKS_Msk     (0xFUL << MEMSYSCTL_ITGU_CFG_NUMBLKS_Pos)   /*!< MEMSYSCTL ITGU_CFG: NUMBLKS Mask */
+
+#define MEMSYSCTL_ITGU_CFG_BLKSZ_Pos        0U                                         /*!< MEMSYSCTL ITGU_CFG: BLKSZ Position */
+#define MEMSYSCTL_ITGU_CFG_BLKSZ_Msk       (0xFUL /*<< MEMSYSCTL_ITGU_CFG_BLKSZ_Pos*/) /*!< MEMSYSCTL ITGU_CFG: BLKSZ Mask */
+
+/* MEMSYSCTL DTGU Control Registers (DTGU_CTRL) Register Definitions */
+#define MEMSYSCTL_DTGU_CTRL_DEREN_Pos       1U                                         /*!< MEMSYSCTL DTGU_CTRL: DEREN Position */
+#define MEMSYSCTL_DTGU_CTRL_DEREN_Msk      (0x1UL << MEMSYSCTL_DTGU_CTRL_DEREN_Pos)    /*!< MEMSYSCTL DTGU_CTRL: DEREN Mask */
+
+#define MEMSYSCTL_DTGU_CTRL_DBFEN_Pos       0U                                         /*!< MEMSYSCTL DTGU_CTRL: DBFEN Position */
+#define MEMSYSCTL_DTGU_CTRL_DBFEN_Msk      (0x1UL /*<< MEMSYSCTL_DTGU_CTRL_DBFEN_Pos*/) /*!< MEMSYSCTL DTGU_CTRL: DBFEN Mask */
+
+/* MEMSYSCTL DTGU Configuration Register (DTGU_CFG) Register Definitions */
+#define MEMSYSCTL_DTGU_CFG_PRESENT_Pos     31U                                         /*!< MEMSYSCTL DTGU_CFG: PRESENT Position */
+#define MEMSYSCTL_DTGU_CFG_PRESENT_Msk     (0x1UL << MEMSYSCTL_DTGU_CFG_PRESENT_Pos)   /*!< MEMSYSCTL DTGU_CFG: PRESENT Mask */
+
+#define MEMSYSCTL_DTGU_CFG_NUMBLKS_Pos      8U                                         /*!< MEMSYSCTL DTGU_CFG: NUMBLKS Position */
+#define MEMSYSCTL_DTGU_CFG_NUMBLKS_Msk     (0xFUL << MEMSYSCTL_DTGU_CFG_NUMBLKS_Pos)   /*!< MEMSYSCTL DTGU_CFG: NUMBLKS Mask */
+
+#define MEMSYSCTL_DTGU_CFG_BLKSZ_Pos        0U                                         /*!< MEMSYSCTL DTGU_CFG: BLKSZ Position */
+#define MEMSYSCTL_DTGU_CFG_BLKSZ_Msk       (0xFUL /*<< MEMSYSCTL_DTGU_CFG_BLKSZ_Pos*/) /*!< MEMSYSCTL DTGU_CFG: BLKSZ Mask */
+
+
+/*@}*/ /* end of group MemSysCtl_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup PwrModCtl_Type     Power Mode Control Registers
+  \brief    Type definitions for the Power Mode Control Registers (PWRMODCTL)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Power Mode Control Registers (PWRMODCTL).
+ */
+typedef struct
+{
+  __IOM uint32_t CPDLPSTATE;             /*!< Offset: 0x000 (R/W)  Core Power Domain Low Power State Register */
+  __IOM uint32_t DPDLPSTATE;             /*!< Offset: 0x004 (R/W)  Debug Power Domain Low Power State Register */
+} PwrModCtl_Type;
+
+/* PWRMODCTL Core Power Domain Low Power State (CPDLPSTATE) Register Definitions */
+#define PWRMODCTL_CPDLPSTATE_RLPSTATE_Pos   8U                                              /*!< PWRMODCTL CPDLPSTATE: RLPSTATE Position */
+#define PWRMODCTL_CPDLPSTATE_RLPSTATE_Msk  (0x3UL << PWRMODCTL_CPDLPSTATE_RLPSTATE_Pos)     /*!< PWRMODCTL CPDLPSTATE: RLPSTATE Mask */
+
+#define PWRMODCTL_CPDLPSTATE_ELPSTATE_Pos   4U                                              /*!< PWRMODCTL CPDLPSTATE: ELPSTATE Position */
+#define PWRMODCTL_CPDLPSTATE_ELPSTATE_Msk  (0x3UL << PWRMODCTL_CPDLPSTATE_ELPSTATE_Pos)     /*!< PWRMODCTL CPDLPSTATE: ELPSTATE Mask */
+
+#define PWRMODCTL_CPDLPSTATE_CLPSTATE_Pos   0U                                              /*!< PWRMODCTL CPDLPSTATE: CLPSTATE Position */
+#define PWRMODCTL_CPDLPSTATE_CLPSTATE_Msk  (0x3UL /*<< PWRMODCTL_CPDLPSTATE_CLPSTATE_Pos*/) /*!< PWRMODCTL CPDLPSTATE: CLPSTATE Mask */
+
+/* PWRMODCTL Debug Power Domain Low Power State (DPDLPSTATE) Register Definitions */
+#define PWRMODCTL_DPDLPSTATE_DLPSTATE_Pos   0U                                              /*!< PWRMODCTL DPDLPSTATE: DLPSTATE Position */
+#define PWRMODCTL_DPDLPSTATE_DLPSTATE_Msk  (0x3UL /*<< PWRMODCTL_DPDLPSTATE_DLPSTATE_Pos*/) /*!< PWRMODCTL DPDLPSTATE: DLPSTATE Mask */
+
+/*@}*/ /* end of group PwrModCtl_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup EWIC_Type     External Wakeup Interrupt Controller Registers
+  \brief    Type definitions for the External Wakeup Interrupt Controller Registers (EWIC)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the External Wakeup Interrupt Controller Registers (EWIC).
+ */
+typedef struct
+{
+  __OM  uint32_t EVENTSPR;               /*!< Offset: 0x000 ( /W)  Event Set Pending Register */
+        uint32_t RESERVED0[31U];
+  __IM  uint32_t EVENTMASKA;             /*!< Offset: 0x080 (R/W)  Event Mask A Register */
+  __IM  uint32_t EVENTMASK[15];          /*!< Offset: 0x084 (R/W)  Event Mask Register */
+} EWIC_Type;
+
+/* EWIC External Wakeup Interrupt Controller (EVENTSPR) Register Definitions */
+#define EWIC_EVENTSPR_EDBGREQ_Pos   2U                                                 /*!< EWIC EVENTSPR: EDBGREQ Position */
+#define EWIC_EVENTSPR_EDBGREQ_Msk  (0x1UL << EWIC_EVENTSPR_EDBGREQ_Pos)                /*!< EWIC EVENTSPR: EDBGREQ Mask */
+
+#define EWIC_EVENTSPR_NMI_Pos   1U                                                     /*!< EWIC EVENTSPR: NMI Position */
+#define EWIC_EVENTSPR_NMI_Msk  (0x1UL << EWIC_EVENTSPR_NMI_Pos)                        /*!< EWIC EVENTSPR: NMI Mask */
+
+#define EWIC_EVENTSPR_EVENT_Pos   0U                                                   /*!< EWIC EVENTSPR: EVENT Position */
+#define EWIC_EVENTSPR_EVENT_Msk  (0x1UL /*<< EWIC_EVENTSPR_EVENT_Pos*/)                /*!< EWIC EVENTSPR: EVENT Mask */
+
+/* EWIC External Wakeup Interrupt Controller (EVENTMASKA) Register Definitions */
+#define EWIC_EVENTMASKA_EDBGREQ_Pos   2U                                               /*!< EWIC EVENTMASKA: EDBGREQ Position */
+#define EWIC_EVENTMASKA_EDBGREQ_Msk  (0x1UL << EWIC_EVENTMASKA_EDBGREQ_Pos)            /*!< EWIC EVENTMASKA: EDBGREQ Mask */
+
+#define EWIC_EVENTMASKA_NMI_Pos   1U                                                   /*!< EWIC EVENTMASKA: NMI Position */
+#define EWIC_EVENTMASKA_NMI_Msk  (0x1UL << EWIC_EVENTMASKA_NMI_Pos)                    /*!< EWIC EVENTMASKA: NMI Mask */
+
+#define EWIC_EVENTMASKA_EVENT_Pos   0U                                                 /*!< EWIC EVENTMASKA: EVENT Position */
+#define EWIC_EVENTMASKA_EVENT_Msk  (0x1UL /*<< EWIC_EVENTMASKA_EVENT_Pos*/)            /*!< EWIC EVENTMASKA: EVENT Mask */
+
+/* EWIC External Wakeup Interrupt Controller (EVENTMASK) Register Definitions */
+#define EWIC_EVENTMASK_IRQ_Pos   0U                                                    /*!< EWIC EVENTMASKA: IRQ Position */
+#define EWIC_EVENTMASK_IRQ_Msk  (0xFFFFFFFFUL /*<< EWIC_EVENTMASKA_IRQ_Pos*/)          /*!< EWIC EVENTMASKA: IRQ Mask */
+
+/*@}*/ /* end of group EWIC_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup ErrBnk_Type     Error Banking Registers (IMPLEMENTATION DEFINED)
+  \brief    Type definitions for the Error Banking Registers (ERRBNK)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Error Banking Registers (ERRBNK).
+ */
+typedef struct
+{
+  __IOM uint32_t IEBR0;                  /*!< Offset: 0x000 (R/W)  Instruction Cache Error Bank Register 0 */
+  __IOM uint32_t IEBR1;                  /*!< Offset: 0x004 (R/W)  Instruction Cache Error Bank Register 1 */
+        uint32_t RESERVED0[2U];
+  __IOM uint32_t DEBR0;                  /*!< Offset: 0x010 (R/W)  Data Cache Error Bank Register 0 */
+  __IOM uint32_t DEBR1;                  /*!< Offset: 0x014 (R/W)  Data Cache Error Bank Register 1 */
+        uint32_t RESERVED1[2U];
+  __IOM uint32_t TEBR0;                  /*!< Offset: 0x020 (R/W)  TCM Error Bank Register 0 */
+        uint32_t RESERVED2[1U];
+  __IOM uint32_t TEBR1;                  /*!< Offset: 0x028 (R/W)  TCM Error Bank Register 1 */
+} ErrBnk_Type;
+
+/* ERRBNK Instruction Cache Error Bank Register 0 (IEBR0) Register Definitions */
+#define ERRBNK_IEBR0_SWDEF_Pos             30U                                         /*!< ERRBNK IEBR0: SWDEF Position */
+#define ERRBNK_IEBR0_SWDEF_Msk             (0x3UL << ERRBNK_IEBR0_SWDEF_Pos)           /*!< ERRBNK IEBR0: SWDEF Mask */
+
+#define ERRBNK_IEBR0_BANK_Pos              16U                                         /*!< ERRBNK IEBR0: BANK Position */
+#define ERRBNK_IEBR0_BANK_Msk              (0x1UL << ERRBNK_IEBR0_BANK_Pos)            /*!< ERRBNK IEBR0: BANK Mask */
+
+#define ERRBNK_IEBR0_LOCATION_Pos           2U                                         /*!< ERRBNK IEBR0: LOCATION Position */
+#define ERRBNK_IEBR0_LOCATION_Msk          (0x3FFFUL << ERRBNK_IEBR0_LOCATION_Pos)     /*!< ERRBNK IEBR0: LOCATION Mask */
+
+#define ERRBNK_IEBR0_LOCKED_Pos             1U                                         /*!< ERRBNK IEBR0: LOCKED Position */
+#define ERRBNK_IEBR0_LOCKED_Msk            (0x1UL << ERRBNK_IEBR0_LOCKED_Pos)          /*!< ERRBNK IEBR0: LOCKED Mask */
+
+#define ERRBNK_IEBR0_VALID_Pos              0U                                         /*!< ERRBNK IEBR0: VALID Position */
+#define ERRBNK_IEBR0_VALID_Msk             (0x1UL << /*ERRBNK_IEBR0_VALID_Pos*/)       /*!< ERRBNK IEBR0: VALID Mask */
+
+/* ERRBNK Instruction Cache Error Bank Register 1 (IEBR1) Register Definitions */
+#define ERRBNK_IEBR1_SWDEF_Pos             30U                                         /*!< ERRBNK IEBR1: SWDEF Position */
+#define ERRBNK_IEBR1_SWDEF_Msk             (0x3UL << ERRBNK_IEBR1_SWDEF_Pos)           /*!< ERRBNK IEBR1: SWDEF Mask */
+
+#define ERRBNK_IEBR1_BANK_Pos              16U                                         /*!< ERRBNK IEBR1: BANK Position */
+#define ERRBNK_IEBR1_BANK_Msk              (0x1UL << ERRBNK_IEBR1_BANK_Pos)            /*!< ERRBNK IEBR1: BANK Mask */
+
+#define ERRBNK_IEBR1_LOCATION_Pos           2U                                         /*!< ERRBNK IEBR1: LOCATION Position */
+#define ERRBNK_IEBR1_LOCATION_Msk          (0x3FFFUL << ERRBNK_IEBR1_LOCATION_Pos)     /*!< ERRBNK IEBR1: LOCATION Mask */
+
+#define ERRBNK_IEBR1_LOCKED_Pos             1U                                         /*!< ERRBNK IEBR1: LOCKED Position */
+#define ERRBNK_IEBR1_LOCKED_Msk            (0x1UL << ERRBNK_IEBR1_LOCKED_Pos)          /*!< ERRBNK IEBR1: LOCKED Mask */
+
+#define ERRBNK_IEBR1_VALID_Pos              0U                                         /*!< ERRBNK IEBR1: VALID Position */
+#define ERRBNK_IEBR1_VALID_Msk             (0x1UL << /*ERRBNK_IEBR1_VALID_Pos*/)       /*!< ERRBNK IEBR1: VALID Mask */
+
+/* ERRBNK Data Cache Error Bank Register 0 (DEBR0) Register Definitions */
+#define ERRBNK_DEBR0_SWDEF_Pos             30U                                         /*!< ERRBNK DEBR0: SWDEF Position */
+#define ERRBNK_DEBR0_SWDEF_Msk             (0x3UL << ERRBNK_DEBR0_SWDEF_Pos)           /*!< ERRBNK DEBR0: SWDEF Mask */
+
+#define ERRBNK_DEBR0_TYPE_Pos              17U                                         /*!< ERRBNK DEBR0: TYPE Position */
+#define ERRBNK_DEBR0_TYPE_Msk              (0x1UL << ERRBNK_DEBR0_TYPE_Pos)            /*!< ERRBNK DEBR0: TYPE Mask */
+
+#define ERRBNK_DEBR0_BANK_Pos              16U                                         /*!< ERRBNK DEBR0: BANK Position */
+#define ERRBNK_DEBR0_BANK_Msk              (0x1UL << ERRBNK_DEBR0_BANK_Pos)            /*!< ERRBNK DEBR0: BANK Mask */
+
+#define ERRBNK_DEBR0_LOCATION_Pos           2U                                         /*!< ERRBNK DEBR0: LOCATION Position */
+#define ERRBNK_DEBR0_LOCATION_Msk          (0x3FFFUL << ERRBNK_DEBR0_LOCATION_Pos)     /*!< ERRBNK DEBR0: LOCATION Mask */
+
+#define ERRBNK_DEBR0_LOCKED_Pos             1U                                         /*!< ERRBNK DEBR0: LOCKED Position */
+#define ERRBNK_DEBR0_LOCKED_Msk            (0x1UL << ERRBNK_DEBR0_LOCKED_Pos)          /*!< ERRBNK DEBR0: LOCKED Mask */
+
+#define ERRBNK_DEBR0_VALID_Pos              0U                                         /*!< ERRBNK DEBR0: VALID Position */
+#define ERRBNK_DEBR0_VALID_Msk             (0x1UL << /*ERRBNK_DEBR0_VALID_Pos*/)       /*!< ERRBNK DEBR0: VALID Mask */
+
+/* ERRBNK Data Cache Error Bank Register 1 (DEBR1) Register Definitions */
+#define ERRBNK_DEBR1_SWDEF_Pos             30U                                         /*!< ERRBNK DEBR1: SWDEF Position */
+#define ERRBNK_DEBR1_SWDEF_Msk             (0x3UL << ERRBNK_DEBR1_SWDEF_Pos)           /*!< ERRBNK DEBR1: SWDEF Mask */
+
+#define ERRBNK_DEBR1_TYPE_Pos              17U                                         /*!< ERRBNK DEBR1: TYPE Position */
+#define ERRBNK_DEBR1_TYPE_Msk              (0x1UL << ERRBNK_DEBR1_TYPE_Pos)            /*!< ERRBNK DEBR1: TYPE Mask */
+
+#define ERRBNK_DEBR1_BANK_Pos              16U                                         /*!< ERRBNK DEBR1: BANK Position */
+#define ERRBNK_DEBR1_BANK_Msk              (0x1UL << ERRBNK_DEBR1_BANK_Pos)            /*!< ERRBNK DEBR1: BANK Mask */
+
+#define ERRBNK_DEBR1_LOCATION_Pos           2U                                         /*!< ERRBNK DEBR1: LOCATION Position */
+#define ERRBNK_DEBR1_LOCATION_Msk          (0x3FFFUL << ERRBNK_DEBR1_LOCATION_Pos)     /*!< ERRBNK DEBR1: LOCATION Mask */
+
+#define ERRBNK_DEBR1_LOCKED_Pos             1U                                         /*!< ERRBNK DEBR1: LOCKED Position */
+#define ERRBNK_DEBR1_LOCKED_Msk            (0x1UL << ERRBNK_DEBR1_LOCKED_Pos)          /*!< ERRBNK DEBR1: LOCKED Mask */
+
+#define ERRBNK_DEBR1_VALID_Pos              0U                                         /*!< ERRBNK DEBR1: VALID Position */
+#define ERRBNK_DEBR1_VALID_Msk             (0x1UL << /*ERRBNK_DEBR1_VALID_Pos*/)       /*!< ERRBNK DEBR1: VALID Mask */
+
+/* ERRBNK TCM Error Bank Register 0 (TEBR0) Register Definitions */
+#define ERRBNK_TEBR0_SWDEF_Pos             30U                                         /*!< ERRBNK TEBR0: SWDEF Position */
+#define ERRBNK_TEBR0_SWDEF_Msk             (0x3UL << ERRBNK_TEBR0_SWDEF_Pos)           /*!< ERRBNK TEBR0: SWDEF Mask */
+
+#define ERRBNK_TEBR0_POISON_Pos            28U                                         /*!< ERRBNK TEBR0: POISON Position */
+#define ERRBNK_TEBR0_POISON_Msk            (0x1UL << ERRBNK_TEBR0_POISON_Pos)          /*!< ERRBNK TEBR0: POISON Mask */
+
+#define ERRBNK_TEBR0_TYPE_Pos              27U                                         /*!< ERRBNK TEBR0: TYPE Position */
+#define ERRBNK_TEBR0_TYPE_Msk              (0x1UL << ERRBNK_TEBR0_TYPE_Pos)            /*!< ERRBNK TEBR0: TYPE Mask */
+
+#define ERRBNK_TEBR0_BANK_Pos              24U                                         /*!< ERRBNK TEBR0: BANK Position */
+#define ERRBNK_TEBR0_BANK_Msk              (0x3UL << ERRBNK_TEBR0_BANK_Pos)            /*!< ERRBNK TEBR0: BANK Mask */
+
+#define ERRBNK_TEBR0_LOCATION_Pos           2U                                         /*!< ERRBNK TEBR0: LOCATION Position */
+#define ERRBNK_TEBR0_LOCATION_Msk          (0x3FFFFFUL << ERRBNK_TEBR0_LOCATION_Pos)   /*!< ERRBNK TEBR0: LOCATION Mask */
+
+#define ERRBNK_TEBR0_LOCKED_Pos             1U                                         /*!< ERRBNK TEBR0: LOCKED Position */
+#define ERRBNK_TEBR0_LOCKED_Msk            (0x1UL << ERRBNK_TEBR0_LOCKED_Pos)          /*!< ERRBNK TEBR0: LOCKED Mask */
+
+#define ERRBNK_TEBR0_VALID_Pos              0U                                         /*!< ERRBNK TEBR0: VALID Position */
+#define ERRBNK_TEBR0_VALID_Msk             (0x1UL << /*ERRBNK_TEBR0_VALID_Pos*/)       /*!< ERRBNK TEBR0: VALID Mask */
+
+/* ERRBNK TCM Error Bank Register 1 (TEBR1) Register Definitions */
+#define ERRBNK_TEBR1_SWDEF_Pos             30U                                         /*!< ERRBNK TEBR1: SWDEF Position */
+#define ERRBNK_TEBR1_SWDEF_Msk             (0x3UL << ERRBNK_TEBR1_SWDEF_Pos)           /*!< ERRBNK TEBR1: SWDEF Mask */
+
+#define ERRBNK_TEBR1_POISON_Pos            28U                                         /*!< ERRBNK TEBR1: POISON Position */
+#define ERRBNK_TEBR1_POISON_Msk            (0x1UL << ERRBNK_TEBR1_POISON_Pos)          /*!< ERRBNK TEBR1: POISON Mask */
+
+#define ERRBNK_TEBR1_TYPE_Pos              27U                                         /*!< ERRBNK TEBR1: TYPE Position */
+#define ERRBNK_TEBR1_TYPE_Msk              (0x1UL << ERRBNK_TEBR1_TYPE_Pos)            /*!< ERRBNK TEBR1: TYPE Mask */
+
+#define ERRBNK_TEBR1_BANK_Pos              24U                                         /*!< ERRBNK TEBR1: BANK Position */
+#define ERRBNK_TEBR1_BANK_Msk              (0x3UL << ERRBNK_TEBR1_BANK_Pos)            /*!< ERRBNK TEBR1: BANK Mask */
+
+#define ERRBNK_TEBR1_LOCATION_Pos           2U                                         /*!< ERRBNK TEBR1: LOCATION Position */
+#define ERRBNK_TEBR1_LOCATION_Msk          (0x3FFFFFUL << ERRBNK_TEBR1_LOCATION_Pos)   /*!< ERRBNK TEBR1: LOCATION Mask */
+
+#define ERRBNK_TEBR1_LOCKED_Pos             1U                                         /*!< ERRBNK TEBR1: LOCKED Position */
+#define ERRBNK_TEBR1_LOCKED_Msk            (0x1UL << ERRBNK_TEBR1_LOCKED_Pos)          /*!< ERRBNK TEBR1: LOCKED Mask */
+
+#define ERRBNK_TEBR1_VALID_Pos              0U                                         /*!< ERRBNK TEBR1: VALID Position */
+#define ERRBNK_TEBR1_VALID_Msk             (0x1UL << /*ERRBNK_TEBR1_VALID_Pos*/)       /*!< ERRBNK TEBR1: VALID Mask */
+
+/*@}*/ /* end of group ErrBnk_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup PrcCfgInf_Type     Processor Configuration Information Registers (IMPLEMENTATION DEFINED)
+  \brief    Type definitions for the Processor Configuration Information Registerss (PRCCFGINF)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Processor Configuration Information Registerss (PRCCFGINF).
+ */
+typedef struct
+{
+  __OM  uint32_t CFGINFOSEL;             /*!< Offset: 0x000 ( /W)  Processor Configuration Information Selection Register */
+  __IM  uint32_t CFGINFORD;              /*!< Offset: 0x004 (R/ )  Processor Configuration Information Read Data Register */
+} PrcCfgInf_Type;
+
+/* PRCCFGINF Processor Configuration Information Selection Register (CFGINFOSEL) Definitions */
+
+/* PRCCFGINF Processor Configuration Information Read Data Register (CFGINFORD) Definitions */
+
+/*@}*/ /* end of group PrcCfgInf_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup STL_Type     Software Test Library Observation Registers
+  \brief    Type definitions for the Software Test Library Observation Registerss (STL)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Software Test Library Observation Registerss (STL).
+ */
+typedef struct
+{
+  __IM  uint32_t STLNVICPENDOR;          /*!< Offset: 0x000 (R/ )  NVIC Pending Priority Tree Register */
+  __IM  uint32_t STLNVICACTVOR;          /*!< Offset: 0x004 (R/ )  NVIC Active Priority Tree Register */
+        uint32_t RESERVED0[2U];
+  __OM  uint32_t STLIDMPUSR;             /*!< Offset: 0x010 ( /W)  MPU Sanple Register */
+  __IM  uint32_t STLIMPUOR;              /*!< Offset: 0x014 (R/ )  MPU Region Hit Register */
+  __IM  uint32_t STLD0MPUOR;             /*!< Offset: 0x018 (R/ )  MPU Memory Attributes Register 0 */
+  __IM  uint32_t STLD1MPUOR;             /*!< Offset: 0x01C (R/ )  MPU Memory Attributes Register 1 */
+
+} STL_Type;
+
+/* STL Software Test Library Observation Register (STLNVICPENDOR) Definitions */
+#define STL_STLNVICPENDOR_VALID_Pos        18U                                         /*!< STL STLNVICPENDOR: VALID Position */
+#define STL_STLNVICPENDOR_VALID_Msk        (0x1UL << STL_STLNVICPENDOR_VALID_Pos)      /*!< STL STLNVICPENDOR: VALID Mask */
+
+#define STL_STLNVICPENDOR_TARGET_Pos       17U                                         /*!< STL STLNVICPENDOR: TARGET Position */
+#define STL_STLNVICPENDOR_TARGET_Msk       (0x1UL << STL_STLNVICPENDOR_TARGET_Pos)     /*!< STL STLNVICPENDOR: TARGET Mask */
+
+#define STL_STLNVICPENDOR_PRIORITY_Pos      9U                                         /*!< STL STLNVICPENDOR: PRIORITY Position */
+#define STL_STLNVICPENDOR_PRIORITY_Msk     (0xFFUL << STL_STLNVICPENDOR_PRIORITY_Pos)  /*!< STL STLNVICPENDOR: PRIORITY Mask */
+
+#define STL_STLNVICPENDOR_INTNUM_Pos        0U                                         /*!< STL STLNVICPENDOR: INTNUM Position */
+#define STL_STLNVICPENDOR_INTNUM_Msk       (0x1FFUL /*<< STL_STLNVICPENDOR_INTNUM_Pos*/) /*!< STL STLNVICPENDOR: INTNUM Mask */
+
+/* STL Software Test Library Observation Register (STLNVICACTVOR) Definitions */
+#define STL_STLNVICACTVOR_VALID_Pos        18U                                         /*!< STL STLNVICACTVOR: VALID Position */
+#define STL_STLNVICACTVOR_VALID_Msk        (0x1UL << STL_STLNVICACTVOR_VALID_Pos)      /*!< STL STLNVICACTVOR: VALID Mask */
+
+#define STL_STLNVICACTVOR_TARGET_Pos       17U                                         /*!< STL STLNVICACTVOR: TARGET Position */
+#define STL_STLNVICACTVOR_TARGET_Msk       (0x1UL << STL_STLNVICACTVOR_TARGET_Pos)     /*!< STL STLNVICACTVOR: TARGET Mask */
+
+#define STL_STLNVICACTVOR_PRIORITY_Pos      9U                                         /*!< STL STLNVICACTVOR: PRIORITY Position */
+#define STL_STLNVICACTVOR_PRIORITY_Msk     (0xFFUL << STL_STLNVICACTVOR_PRIORITY_Pos)  /*!< STL STLNVICACTVOR: PRIORITY Mask */
+
+#define STL_STLNVICACTVOR_INTNUM_Pos        0U                                         /*!< STL STLNVICACTVOR: INTNUM Position */
+#define STL_STLNVICACTVOR_INTNUM_Msk       (0x1FFUL /*<< STL_STLNVICACTVOR_INTNUM_Pos*/) /*!< STL STLNVICACTVOR: INTNUM Mask */
+
+/* STL Software Test Library Observation Register (STLIDMPUSR) Definitions */
+#define STL_STLIDMPUSR_ADDR_Pos             5U                                         /*!< STL STLIDMPUSR: ADDR Position */
+#define STL_STLIDMPUSR_ADDR_Msk            (0x7FFFFFFUL << STL_STLIDMPUSR_ADDR_Pos)    /*!< STL STLIDMPUSR: ADDR Mask */
+
+#define STL_STLIDMPUSR_INSTR_Pos            2U                                         /*!< STL STLIDMPUSR: INSTR Position */
+#define STL_STLIDMPUSR_INSTR_Msk           (0x1UL << STL_STLIDMPUSR_INSTR_Pos)         /*!< STL STLIDMPUSR: INSTR Mask */
+
+#define STL_STLIDMPUSR_DATA_Pos             1U                                         /*!< STL STLIDMPUSR: DATA Position */
+#define STL_STLIDMPUSR_DATA_Msk            (0x1UL << STL_STLIDMPUSR_DATA_Pos)          /*!< STL STLIDMPUSR: DATA Mask */
+
+/* STL Software Test Library Observation Register (STLIMPUOR) Definitions */
+#define STL_STLIMPUOR_HITREGION_Pos         9U                                         /*!< STL STLIMPUOR: HITREGION Position */
+#define STL_STLIMPUOR_HITREGION_Msk        (0xFFUL << STL_STLIMPUOR_HITREGION_Pos)     /*!< STL STLIMPUOR: HITREGION Mask */
+
+#define STL_STLIMPUOR_ATTR_Pos              0U                                         /*!< STL STLIMPUOR: ATTR Position */
+#define STL_STLIMPUOR_ATTR_Msk             (0x1FFUL /*<< STL_STLIMPUOR_ATTR_Pos*/)     /*!< STL STLIMPUOR: ATTR Mask */
+
+/* STL Software Test Library Observation Register (STLD0MPUOR) Definitions */
+#define STL_STLD0MPUOR_HITREGION_Pos        9U                                         /*!< STL STLD0MPUOR: HITREGION Position */
+#define STL_STLD0MPUOR_HITREGION_Msk       (0xFFUL << STL_STLD0MPUOR_HITREGION_Pos)    /*!< STL STLD0MPUOR: HITREGION Mask */
+
+#define STL_STLD0MPUOR_ATTR_Pos             0U                                         /*!< STL STLD0MPUOR: ATTR Position */
+#define STL_STLD0MPUOR_ATTR_Msk            (0x1FFUL /*<< STL_STLD0MPUOR_ATTR_Pos*/)    /*!< STL STLD0MPUOR: ATTR Mask */
+
+/* STL Software Test Library Observation Register (STLD1MPUOR) Definitions */
+#define STL_STLD1MPUOR_HITREGION_Pos        9U                                         /*!< STL STLD1MPUOR: HITREGION Position */
+#define STL_STLD1MPUOR_HITREGION_Msk       (0xFFUL << STL_STLD1MPUOR_HITREGION_Pos)    /*!< STL STLD1MPUOR: HITREGION Mask */
+
+#define STL_STLD1MPUOR_ATTR_Pos             0U                                         /*!< STL STLD1MPUOR: ATTR Position */
+#define STL_STLD1MPUOR_ATTR_Msk            (0x1FFUL /*<< STL_STLD1MPUOR_ATTR_Pos*/)    /*!< STL STLD1MPUOR: ATTR Mask */
+
+/*@}*/ /* end of group STL_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_TPI     Trace Port Interface (TPI)
+  \brief    Type definitions for the Trace Port Interface (TPI)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Trace Port Interface Register (TPI).
+ */
+typedef struct
+{
+  __IM  uint32_t SSPSR;                  /*!< Offset: 0x000 (R/ )  Supported Parallel Port Sizes Register */
+  __IOM uint32_t CSPSR;                  /*!< Offset: 0x004 (R/W)  Current Parallel Port Sizes Register */
+        uint32_t RESERVED0[2U];
+  __IOM uint32_t ACPR;                   /*!< Offset: 0x010 (R/W)  Asynchronous Clock Prescaler Register */
+        uint32_t RESERVED1[55U];
+  __IOM uint32_t SPPR;                   /*!< Offset: 0x0F0 (R/W)  Selected Pin Protocol Register */
+        uint32_t RESERVED2[131U];
+  __IM  uint32_t FFSR;                   /*!< Offset: 0x300 (R/ )  Formatter and Flush Status Register */
+  __IOM uint32_t FFCR;                   /*!< Offset: 0x304 (R/W)  Formatter and Flush Control Register */
+  __IOM uint32_t PSCR;                   /*!< Offset: 0x308 (R/W)  Periodic Synchronization Control Register */
+        uint32_t RESERVED3[809U];
+  __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  Software Lock Access Register */
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  Software Lock Status Register */
+        uint32_t RESERVED4[4U];
+  __IM  uint32_t TYPE;                   /*!< Offset: 0xFC8 (R/ )  Device Identifier Register */
+  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  Device Type Register */
+} TPI_Type;
+
+/* TPI Asynchronous Clock Prescaler Register Definitions */
+#define TPI_ACPR_SWOSCALER_Pos              0U                                         /*!< TPI ACPR: SWOSCALER Position */
+#define TPI_ACPR_SWOSCALER_Msk             (0xFFFFUL /*<< TPI_ACPR_SWOSCALER_Pos*/)    /*!< TPI ACPR: SWOSCALER Mask */
+
+/* TPI Selected Pin Protocol Register Definitions */
+#define TPI_SPPR_TXMODE_Pos                 0U                                         /*!< TPI SPPR: TXMODE Position */
+#define TPI_SPPR_TXMODE_Msk                (0x3UL /*<< TPI_SPPR_TXMODE_Pos*/)          /*!< TPI SPPR: TXMODE Mask */
+
+/* TPI Formatter and Flush Status Register Definitions */
+#define TPI_FFSR_FtNonStop_Pos              3U                                         /*!< TPI FFSR: FtNonStop Position */
+#define TPI_FFSR_FtNonStop_Msk             (0x1UL << TPI_FFSR_FtNonStop_Pos)           /*!< TPI FFSR: FtNonStop Mask */
+
+#define TPI_FFSR_TCPresent_Pos              2U                                         /*!< TPI FFSR: TCPresent Position */
+#define TPI_FFSR_TCPresent_Msk             (0x1UL << TPI_FFSR_TCPresent_Pos)           /*!< TPI FFSR: TCPresent Mask */
+
+#define TPI_FFSR_FtStopped_Pos              1U                                         /*!< TPI FFSR: FtStopped Position */
+#define TPI_FFSR_FtStopped_Msk             (0x1UL << TPI_FFSR_FtStopped_Pos)           /*!< TPI FFSR: FtStopped Mask */
+
+#define TPI_FFSR_FlInProg_Pos               0U                                         /*!< TPI FFSR: FlInProg Position */
+#define TPI_FFSR_FlInProg_Msk              (0x1UL /*<< TPI_FFSR_FlInProg_Pos*/)        /*!< TPI FFSR: FlInProg Mask */
+
+/* TPI Formatter and Flush Control Register Definitions */
+#define TPI_FFCR_TrigIn_Pos                 8U                                         /*!< TPI FFCR: TrigIn Position */
+#define TPI_FFCR_TrigIn_Msk                (0x1UL << TPI_FFCR_TrigIn_Pos)              /*!< TPI FFCR: TrigIn Mask */
+
+#define TPI_FFCR_FOnMan_Pos                 6U                                         /*!< TPI FFCR: FOnMan Position */
+#define TPI_FFCR_FOnMan_Msk                (0x1UL << TPI_FFCR_FOnMan_Pos)              /*!< TPI FFCR: FOnMan Mask */
+
+#define TPI_FFCR_EnFmt_Pos                  0U                                         /*!< TPI FFCR: EnFmt Position */
+#define TPI_FFCR_EnFmt_Msk                 (0x3UL << /*TPI_FFCR_EnFmt_Pos*/)           /*!< TPI FFCR: EnFmt Mask */
+
+/* TPI Periodic Synchronization Control Register Definitions */
+#define TPI_PSCR_PSCount_Pos                0U                                         /*!< TPI PSCR: PSCount Position */
+#define TPI_PSCR_PSCount_Msk               (0x1FUL /*<< TPI_PSCR_PSCount_Pos*/)        /*!< TPI PSCR: TPSCount Mask */
+
+/* TPI Software Lock Status Register Definitions */
+#define TPI_LSR_nTT_Pos                     1U                                         /*!< TPI LSR: Not thirty-two bit. Position */
+#define TPI_LSR_nTT_Msk                    (0x1UL << TPI_LSR_nTT_Pos)                  /*!< TPI LSR: Not thirty-two bit. Mask */
+
+#define TPI_LSR_SLK_Pos                     1U                                         /*!< TPI LSR: Software Lock status Position */
+#define TPI_LSR_SLK_Msk                    (0x1UL << TPI_LSR_SLK_Pos)                  /*!< TPI LSR: Software Lock status Mask */
+
+#define TPI_LSR_SLI_Pos                     0U                                         /*!< TPI LSR: Software Lock implemented Position */
+#define TPI_LSR_SLI_Msk                    (0x1UL /*<< TPI_LSR_SLI_Pos*/)              /*!< TPI LSR: Software Lock implemented Mask */
+
+/* TPI DEVID Register Definitions */
+#define TPI_DEVID_NRZVALID_Pos             11U                                         /*!< TPI DEVID: NRZVALID Position */
+#define TPI_DEVID_NRZVALID_Msk             (0x1UL << TPI_DEVID_NRZVALID_Pos)           /*!< TPI DEVID: NRZVALID Mask */
+
+#define TPI_DEVID_MANCVALID_Pos            10U                                         /*!< TPI DEVID: MANCVALID Position */
+#define TPI_DEVID_MANCVALID_Msk            (0x1UL << TPI_DEVID_MANCVALID_Pos)          /*!< TPI DEVID: MANCVALID Mask */
+
+#define TPI_DEVID_PTINVALID_Pos             9U                                         /*!< TPI DEVID: PTINVALID Position */
+#define TPI_DEVID_PTINVALID_Msk            (0x1UL << TPI_DEVID_PTINVALID_Pos)          /*!< TPI DEVID: PTINVALID Mask */
+
+#define TPI_DEVID_FIFOSZ_Pos                6U                                         /*!< TPI DEVID: FIFO depth Position */
+#define TPI_DEVID_FIFOSZ_Msk               (0x7UL << TPI_DEVID_FIFOSZ_Pos)             /*!< TPI DEVID: FIFO depth Mask */
+
+/* TPI DEVTYPE Register Definitions */
+#define TPI_DEVTYPE_SubType_Pos             4U                                         /*!< TPI DEVTYPE: SubType Position */
+#define TPI_DEVTYPE_SubType_Msk            (0xFUL /*<< TPI_DEVTYPE_SubType_Pos*/)      /*!< TPI DEVTYPE: SubType Mask */
+
+#define TPI_DEVTYPE_MajorType_Pos           0U                                         /*!< TPI DEVTYPE: MajorType Position */
+#define TPI_DEVTYPE_MajorType_Msk          (0xFUL << TPI_DEVTYPE_MajorType_Pos)        /*!< TPI DEVTYPE: MajorType Mask */
+
+/*@}*/ /* end of group CMSIS_TPI */
+
+#if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_PMU     Performance Monitoring Unit (PMU)
+  \brief    Type definitions for the Performance Monitoring Unit (PMU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Performance Monitoring Unit (PMU).
+ */
+typedef struct
+{
+  __IOM uint32_t EVCNTR[__PMU_NUM_EVENTCNT];        /*!< Offset: 0x0 (R/W)    PMU Event Counter Registers */
+#if __PMU_NUM_EVENTCNT<31
+        uint32_t RESERVED0[31U-__PMU_NUM_EVENTCNT];
+#endif
+  __IOM uint32_t CCNTR;                             /*!< Offset: 0x7C (R/W)   PMU Cycle Counter Register */
+        uint32_t RESERVED1[224];
+  __IOM uint32_t EVTYPER[__PMU_NUM_EVENTCNT];       /*!< Offset: 0x400 (R/W)  PMU Event Type and Filter Registers */
+#if __PMU_NUM_EVENTCNT<31
+        uint32_t RESERVED2[31U-__PMU_NUM_EVENTCNT];
+#endif
+  __IOM uint32_t CCFILTR;                           /*!< Offset: 0x47C (R/W)  PMU Cycle Counter Filter Register */
+        uint32_t RESERVED3[480];
+  __IOM uint32_t CNTENSET;                          /*!< Offset: 0xC00 (R/W)  PMU Count Enable Set Register */
+        uint32_t RESERVED4[7];
+  __IOM uint32_t CNTENCLR;                          /*!< Offset: 0xC20 (R/W)  PMU Count Enable Clear Register */
+        uint32_t RESERVED5[7];
+  __IOM uint32_t INTENSET;                          /*!< Offset: 0xC40 (R/W)  PMU Interrupt Enable Set Register */
+        uint32_t RESERVED6[7];
+  __IOM uint32_t INTENCLR;                          /*!< Offset: 0xC60 (R/W)  PMU Interrupt Enable Clear Register */
+        uint32_t RESERVED7[7];
+  __IOM uint32_t OVSCLR;                            /*!< Offset: 0xC80 (R/W)  PMU Overflow Flag Status Clear Register */
+        uint32_t RESERVED8[7];
+  __IOM uint32_t SWINC;                             /*!< Offset: 0xCA0 (R/W)  PMU Software Increment Register */
+        uint32_t RESERVED9[7];
+  __IOM uint32_t OVSSET;                            /*!< Offset: 0xCC0 (R/W)  PMU Overflow Flag Status Set Register */
+        uint32_t RESERVED10[79];
+  __IOM uint32_t TYPE;                              /*!< Offset: 0xE00 (R/W)  PMU Type Register */
+  __IOM uint32_t CTRL;                              /*!< Offset: 0xE04 (R/W)  PMU Control Register */
+        uint32_t RESERVED11[108];
+  __IOM uint32_t AUTHSTATUS;                        /*!< Offset: 0xFB8 (R/W)  PMU Authentication Status Register */
+  __IOM uint32_t DEVARCH;                           /*!< Offset: 0xFBC (R/W)  PMU Device Architecture Register */
+        uint32_t RESERVED12[3];
+  __IOM uint32_t DEVTYPE;                           /*!< Offset: 0xFCC (R/W)  PMU Device Type Register */
+  __IOM uint32_t PIDR4;                             /*!< Offset: 0xFD0 (R/W)  PMU Peripheral Identification Register 4 */
+        uint32_t RESERVED13[3];
+  __IOM uint32_t PIDR0;                             /*!< Offset: 0xFE0 (R/W)  PMU Peripheral Identification Register 0 */
+  __IOM uint32_t PIDR1;                             /*!< Offset: 0xFE4 (R/W)  PMU Peripheral Identification Register 1 */
+  __IOM uint32_t PIDR2;                             /*!< Offset: 0xFE8 (R/W)  PMU Peripheral Identification Register 2 */
+  __IOM uint32_t PIDR3;                             /*!< Offset: 0xFEC (R/W)  PMU Peripheral Identification Register 3 */
+  __IOM uint32_t CIDR0;                             /*!< Offset: 0xFF0 (R/W)  PMU Component Identification Register 0 */
+  __IOM uint32_t CIDR1;                             /*!< Offset: 0xFF4 (R/W)  PMU Component Identification Register 1 */
+  __IOM uint32_t CIDR2;                             /*!< Offset: 0xFF8 (R/W)  PMU Component Identification Register 2 */
+  __IOM uint32_t CIDR3;                             /*!< Offset: 0xFFC (R/W)  PMU Component Identification Register 3 */
+} PMU_Type;
+
+/** \brief PMU Event Counter Registers (0-30) Definitions  */
+
+#define PMU_EVCNTR_CNT_Pos                    0U                                           /*!< PMU EVCNTR: Counter Position */
+#define PMU_EVCNTR_CNT_Msk                   (0xFFFFUL /*<< PMU_EVCNTRx_CNT_Pos*/)         /*!< PMU EVCNTR: Counter Mask */
+
+/** \brief PMU Event Type and Filter Registers (0-30) Definitions  */
+
+#define PMU_EVTYPER_EVENTTOCNT_Pos            0U                                           /*!< PMU EVTYPER: Event to Count Position */
+#define PMU_EVTYPER_EVENTTOCNT_Msk           (0xFFFFUL /*<< EVTYPERx_EVENTTOCNT_Pos*/)     /*!< PMU EVTYPER: Event to Count Mask */
+
+/** \brief PMU Count Enable Set Register Definitions */
+
+#define PMU_CNTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU CNTENSET: Event Counter 0 Enable Set Position */
+#define PMU_CNTENSET_CNT0_ENABLE_Msk         (1UL /*<< PMU_CNTENSET_CNT0_ENABLE_Pos*/)     /*!< PMU CNTENSET: Event Counter 0 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT1_ENABLE_Pos          1U                                           /*!< PMU CNTENSET: Event Counter 1 Enable Set Position */
+#define PMU_CNTENSET_CNT1_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT1_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 1 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT2_ENABLE_Pos          2U                                           /*!< PMU CNTENSET: Event Counter 2 Enable Set Position */
+#define PMU_CNTENSET_CNT2_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT2_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 2 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT3_ENABLE_Pos          3U                                           /*!< PMU CNTENSET: Event Counter 3 Enable Set Position */
+#define PMU_CNTENSET_CNT3_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT3_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 3 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT4_ENABLE_Pos          4U                                           /*!< PMU CNTENSET: Event Counter 4 Enable Set Position */
+#define PMU_CNTENSET_CNT4_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT4_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 4 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT5_ENABLE_Pos          5U                                           /*!< PMU CNTENSET: Event Counter 5 Enable Set Position */
+#define PMU_CNTENSET_CNT5_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT5_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 5 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT6_ENABLE_Pos          6U                                           /*!< PMU CNTENSET: Event Counter 6 Enable Set Position */
+#define PMU_CNTENSET_CNT6_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT6_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 6 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT7_ENABLE_Pos          7U                                           /*!< PMU CNTENSET: Event Counter 7 Enable Set Position */
+#define PMU_CNTENSET_CNT7_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT7_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 7 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT8_ENABLE_Pos          8U                                           /*!< PMU CNTENSET: Event Counter 8 Enable Set Position */
+#define PMU_CNTENSET_CNT8_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT8_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 8 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT9_ENABLE_Pos          9U                                           /*!< PMU CNTENSET: Event Counter 9 Enable Set Position */
+#define PMU_CNTENSET_CNT9_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT9_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 9 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT10_ENABLE_Pos         10U                                          /*!< PMU CNTENSET: Event Counter 10 Enable Set Position */
+#define PMU_CNTENSET_CNT10_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT10_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 10 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT11_ENABLE_Pos         11U                                          /*!< PMU CNTENSET: Event Counter 11 Enable Set Position */
+#define PMU_CNTENSET_CNT11_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT11_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 11 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT12_ENABLE_Pos         12U                                          /*!< PMU CNTENSET: Event Counter 12 Enable Set Position */
+#define PMU_CNTENSET_CNT12_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT12_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 12 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT13_ENABLE_Pos         13U                                          /*!< PMU CNTENSET: Event Counter 13 Enable Set Position */
+#define PMU_CNTENSET_CNT13_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT13_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 13 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT14_ENABLE_Pos         14U                                          /*!< PMU CNTENSET: Event Counter 14 Enable Set Position */
+#define PMU_CNTENSET_CNT14_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT14_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 14 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT15_ENABLE_Pos         15U                                          /*!< PMU CNTENSET: Event Counter 15 Enable Set Position */
+#define PMU_CNTENSET_CNT15_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT15_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 15 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT16_ENABLE_Pos         16U                                          /*!< PMU CNTENSET: Event Counter 16 Enable Set Position */
+#define PMU_CNTENSET_CNT16_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT16_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 16 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT17_ENABLE_Pos         17U                                          /*!< PMU CNTENSET: Event Counter 17 Enable Set Position */
+#define PMU_CNTENSET_CNT17_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT17_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 17 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT18_ENABLE_Pos         18U                                          /*!< PMU CNTENSET: Event Counter 18 Enable Set Position */
+#define PMU_CNTENSET_CNT18_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT18_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 18 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT19_ENABLE_Pos         19U                                          /*!< PMU CNTENSET: Event Counter 19 Enable Set Position */
+#define PMU_CNTENSET_CNT19_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT19_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 19 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT20_ENABLE_Pos         20U                                          /*!< PMU CNTENSET: Event Counter 20 Enable Set Position */
+#define PMU_CNTENSET_CNT20_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT20_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 20 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT21_ENABLE_Pos         21U                                          /*!< PMU CNTENSET: Event Counter 21 Enable Set Position */
+#define PMU_CNTENSET_CNT21_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT21_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 21 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT22_ENABLE_Pos         22U                                          /*!< PMU CNTENSET: Event Counter 22 Enable Set Position */
+#define PMU_CNTENSET_CNT22_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT22_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 22 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT23_ENABLE_Pos         23U                                          /*!< PMU CNTENSET: Event Counter 23 Enable Set Position */
+#define PMU_CNTENSET_CNT23_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT23_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 23 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT24_ENABLE_Pos         24U                                          /*!< PMU CNTENSET: Event Counter 24 Enable Set Position */
+#define PMU_CNTENSET_CNT24_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT24_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 24 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT25_ENABLE_Pos         25U                                          /*!< PMU CNTENSET: Event Counter 25 Enable Set Position */
+#define PMU_CNTENSET_CNT25_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT25_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 25 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT26_ENABLE_Pos         26U                                          /*!< PMU CNTENSET: Event Counter 26 Enable Set Position */
+#define PMU_CNTENSET_CNT26_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT26_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 26 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT27_ENABLE_Pos         27U                                          /*!< PMU CNTENSET: Event Counter 27 Enable Set Position */
+#define PMU_CNTENSET_CNT27_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT27_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 27 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT28_ENABLE_Pos         28U                                          /*!< PMU CNTENSET: Event Counter 28 Enable Set Position */
+#define PMU_CNTENSET_CNT28_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT28_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 28 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT29_ENABLE_Pos         29U                                          /*!< PMU CNTENSET: Event Counter 29 Enable Set Position */
+#define PMU_CNTENSET_CNT29_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT29_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 29 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT30_ENABLE_Pos         30U                                          /*!< PMU CNTENSET: Event Counter 30 Enable Set Position */
+#define PMU_CNTENSET_CNT30_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT30_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 30 Enable Set Mask */
+
+#define PMU_CNTENSET_CCNTR_ENABLE_Pos         31U                                          /*!< PMU CNTENSET: Cycle Counter Enable Set Position */
+#define PMU_CNTENSET_CCNTR_ENABLE_Msk        (1UL << PMU_CNTENSET_CCNTR_ENABLE_Pos)        /*!< PMU CNTENSET: Cycle Counter Enable Set Mask */
+
+/** \brief PMU Count Enable Clear Register Definitions */
+
+#define PMU_CNTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU CNTENCLR: Event Counter 0 Enable Clear Position */
+#define PMU_CNTENCLR_CNT0_ENABLE_Msk         (1UL /*<< PMU_CNTENCLR_CNT0_ENABLE_Pos*/)     /*!< PMU CNTENCLR: Event Counter 0 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT1_ENABLE_Pos          1U                                           /*!< PMU CNTENCLR: Event Counter 1 Enable Clear Position */
+#define PMU_CNTENCLR_CNT1_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT1_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 1 Enable Clear */
+
+#define PMU_CNTENCLR_CNT2_ENABLE_Pos          2U                                           /*!< PMU CNTENCLR: Event Counter 2 Enable Clear Position */
+#define PMU_CNTENCLR_CNT2_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT2_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 2 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT3_ENABLE_Pos          3U                                           /*!< PMU CNTENCLR: Event Counter 3 Enable Clear Position */
+#define PMU_CNTENCLR_CNT3_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT3_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 3 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT4_ENABLE_Pos          4U                                           /*!< PMU CNTENCLR: Event Counter 4 Enable Clear Position */
+#define PMU_CNTENCLR_CNT4_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT4_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 4 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT5_ENABLE_Pos          5U                                           /*!< PMU CNTENCLR: Event Counter 5 Enable Clear Position */
+#define PMU_CNTENCLR_CNT5_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT5_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 5 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT6_ENABLE_Pos          6U                                           /*!< PMU CNTENCLR: Event Counter 6 Enable Clear Position */
+#define PMU_CNTENCLR_CNT6_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT6_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 6 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT7_ENABLE_Pos          7U                                           /*!< PMU CNTENCLR: Event Counter 7 Enable Clear Position */
+#define PMU_CNTENCLR_CNT7_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT7_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 7 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT8_ENABLE_Pos          8U                                           /*!< PMU CNTENCLR: Event Counter 8 Enable Clear Position */
+#define PMU_CNTENCLR_CNT8_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT8_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 8 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT9_ENABLE_Pos          9U                                           /*!< PMU CNTENCLR: Event Counter 9 Enable Clear Position */
+#define PMU_CNTENCLR_CNT9_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT9_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 9 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT10_ENABLE_Pos         10U                                          /*!< PMU CNTENCLR: Event Counter 10 Enable Clear Position */
+#define PMU_CNTENCLR_CNT10_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT10_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 10 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT11_ENABLE_Pos         11U                                          /*!< PMU CNTENCLR: Event Counter 11 Enable Clear Position */
+#define PMU_CNTENCLR_CNT11_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT11_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 11 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT12_ENABLE_Pos         12U                                          /*!< PMU CNTENCLR: Event Counter 12 Enable Clear Position */
+#define PMU_CNTENCLR_CNT12_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT12_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 12 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT13_ENABLE_Pos         13U                                          /*!< PMU CNTENCLR: Event Counter 13 Enable Clear Position */
+#define PMU_CNTENCLR_CNT13_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT13_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 13 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT14_ENABLE_Pos         14U                                          /*!< PMU CNTENCLR: Event Counter 14 Enable Clear Position */
+#define PMU_CNTENCLR_CNT14_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT14_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 14 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT15_ENABLE_Pos         15U                                          /*!< PMU CNTENCLR: Event Counter 15 Enable Clear Position */
+#define PMU_CNTENCLR_CNT15_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT15_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 15 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT16_ENABLE_Pos         16U                                          /*!< PMU CNTENCLR: Event Counter 16 Enable Clear Position */
+#define PMU_CNTENCLR_CNT16_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT16_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 16 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT17_ENABLE_Pos         17U                                          /*!< PMU CNTENCLR: Event Counter 17 Enable Clear Position */
+#define PMU_CNTENCLR_CNT17_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT17_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 17 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT18_ENABLE_Pos         18U                                          /*!< PMU CNTENCLR: Event Counter 18 Enable Clear Position */
+#define PMU_CNTENCLR_CNT18_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT18_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 18 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT19_ENABLE_Pos         19U                                          /*!< PMU CNTENCLR: Event Counter 19 Enable Clear Position */
+#define PMU_CNTENCLR_CNT19_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT19_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 19 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT20_ENABLE_Pos         20U                                          /*!< PMU CNTENCLR: Event Counter 20 Enable Clear Position */
+#define PMU_CNTENCLR_CNT20_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT20_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 20 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT21_ENABLE_Pos         21U                                          /*!< PMU CNTENCLR: Event Counter 21 Enable Clear Position */
+#define PMU_CNTENCLR_CNT21_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT21_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 21 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT22_ENABLE_Pos         22U                                          /*!< PMU CNTENCLR: Event Counter 22 Enable Clear Position */
+#define PMU_CNTENCLR_CNT22_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT22_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 22 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT23_ENABLE_Pos         23U                                          /*!< PMU CNTENCLR: Event Counter 23 Enable Clear Position */
+#define PMU_CNTENCLR_CNT23_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT23_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 23 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT24_ENABLE_Pos         24U                                          /*!< PMU CNTENCLR: Event Counter 24 Enable Clear Position */
+#define PMU_CNTENCLR_CNT24_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT24_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 24 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT25_ENABLE_Pos         25U                                          /*!< PMU CNTENCLR: Event Counter 25 Enable Clear Position */
+#define PMU_CNTENCLR_CNT25_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT25_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 25 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT26_ENABLE_Pos         26U                                          /*!< PMU CNTENCLR: Event Counter 26 Enable Clear Position */
+#define PMU_CNTENCLR_CNT26_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT26_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 26 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT27_ENABLE_Pos         27U                                          /*!< PMU CNTENCLR: Event Counter 27 Enable Clear Position */
+#define PMU_CNTENCLR_CNT27_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT27_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 27 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT28_ENABLE_Pos         28U                                          /*!< PMU CNTENCLR: Event Counter 28 Enable Clear Position */
+#define PMU_CNTENCLR_CNT28_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT28_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 28 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT29_ENABLE_Pos         29U                                          /*!< PMU CNTENCLR: Event Counter 29 Enable Clear Position */
+#define PMU_CNTENCLR_CNT29_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT29_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 29 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT30_ENABLE_Pos         30U                                          /*!< PMU CNTENCLR: Event Counter 30 Enable Clear Position */
+#define PMU_CNTENCLR_CNT30_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT30_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 30 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CCNTR_ENABLE_Pos         31U                                          /*!< PMU CNTENCLR: Cycle Counter Enable Clear Position */
+#define PMU_CNTENCLR_CCNTR_ENABLE_Msk        (1UL << PMU_CNTENCLR_CCNTR_ENABLE_Pos)        /*!< PMU CNTENCLR: Cycle Counter Enable Clear Mask */
+
+/** \brief PMU Interrupt Enable Set Register Definitions */
+
+#define PMU_INTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU INTENSET: Event Counter 0 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT0_ENABLE_Msk         (1UL /*<< PMU_INTENSET_CNT0_ENABLE_Pos*/)     /*!< PMU INTENSET: Event Counter 0 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT1_ENABLE_Pos          1U                                           /*!< PMU INTENSET: Event Counter 1 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT1_ENABLE_Msk         (1UL << PMU_INTENSET_CNT1_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 1 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT2_ENABLE_Pos          2U                                           /*!< PMU INTENSET: Event Counter 2 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT2_ENABLE_Msk         (1UL << PMU_INTENSET_CNT2_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 2 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT3_ENABLE_Pos          3U                                           /*!< PMU INTENSET: Event Counter 3 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT3_ENABLE_Msk         (1UL << PMU_INTENSET_CNT3_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 3 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT4_ENABLE_Pos          4U                                           /*!< PMU INTENSET: Event Counter 4 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT4_ENABLE_Msk         (1UL << PMU_INTENSET_CNT4_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 4 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT5_ENABLE_Pos          5U                                           /*!< PMU INTENSET: Event Counter 5 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT5_ENABLE_Msk         (1UL << PMU_INTENSET_CNT5_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 5 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT6_ENABLE_Pos          6U                                           /*!< PMU INTENSET: Event Counter 6 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT6_ENABLE_Msk         (1UL << PMU_INTENSET_CNT6_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 6 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT7_ENABLE_Pos          7U                                           /*!< PMU INTENSET: Event Counter 7 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT7_ENABLE_Msk         (1UL << PMU_INTENSET_CNT7_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 7 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT8_ENABLE_Pos          8U                                           /*!< PMU INTENSET: Event Counter 8 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT8_ENABLE_Msk         (1UL << PMU_INTENSET_CNT8_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 8 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT9_ENABLE_Pos          9U                                           /*!< PMU INTENSET: Event Counter 9 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT9_ENABLE_Msk         (1UL << PMU_INTENSET_CNT9_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 9 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT10_ENABLE_Pos         10U                                          /*!< PMU INTENSET: Event Counter 10 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT10_ENABLE_Msk        (1UL << PMU_INTENSET_CNT10_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 10 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT11_ENABLE_Pos         11U                                          /*!< PMU INTENSET: Event Counter 11 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT11_ENABLE_Msk        (1UL << PMU_INTENSET_CNT11_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 11 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT12_ENABLE_Pos         12U                                          /*!< PMU INTENSET: Event Counter 12 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT12_ENABLE_Msk        (1UL << PMU_INTENSET_CNT12_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 12 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT13_ENABLE_Pos         13U                                          /*!< PMU INTENSET: Event Counter 13 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT13_ENABLE_Msk        (1UL << PMU_INTENSET_CNT13_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 13 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT14_ENABLE_Pos         14U                                          /*!< PMU INTENSET: Event Counter 14 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT14_ENABLE_Msk        (1UL << PMU_INTENSET_CNT14_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 14 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT15_ENABLE_Pos         15U                                          /*!< PMU INTENSET: Event Counter 15 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT15_ENABLE_Msk        (1UL << PMU_INTENSET_CNT15_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 15 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT16_ENABLE_Pos         16U                                          /*!< PMU INTENSET: Event Counter 16 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT16_ENABLE_Msk        (1UL << PMU_INTENSET_CNT16_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 16 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT17_ENABLE_Pos         17U                                          /*!< PMU INTENSET: Event Counter 17 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT17_ENABLE_Msk        (1UL << PMU_INTENSET_CNT17_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 17 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT18_ENABLE_Pos         18U                                          /*!< PMU INTENSET: Event Counter 18 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT18_ENABLE_Msk        (1UL << PMU_INTENSET_CNT18_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 18 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT19_ENABLE_Pos         19U                                          /*!< PMU INTENSET: Event Counter 19 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT19_ENABLE_Msk        (1UL << PMU_INTENSET_CNT19_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 19 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT20_ENABLE_Pos         20U                                          /*!< PMU INTENSET: Event Counter 20 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT20_ENABLE_Msk        (1UL << PMU_INTENSET_CNT20_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 20 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT21_ENABLE_Pos         21U                                          /*!< PMU INTENSET: Event Counter 21 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT21_ENABLE_Msk        (1UL << PMU_INTENSET_CNT21_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 21 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT22_ENABLE_Pos         22U                                          /*!< PMU INTENSET: Event Counter 22 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT22_ENABLE_Msk        (1UL << PMU_INTENSET_CNT22_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 22 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT23_ENABLE_Pos         23U                                          /*!< PMU INTENSET: Event Counter 23 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT23_ENABLE_Msk        (1UL << PMU_INTENSET_CNT23_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 23 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT24_ENABLE_Pos         24U                                          /*!< PMU INTENSET: Event Counter 24 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT24_ENABLE_Msk        (1UL << PMU_INTENSET_CNT24_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 24 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT25_ENABLE_Pos         25U                                          /*!< PMU INTENSET: Event Counter 25 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT25_ENABLE_Msk        (1UL << PMU_INTENSET_CNT25_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 25 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT26_ENABLE_Pos         26U                                          /*!< PMU INTENSET: Event Counter 26 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT26_ENABLE_Msk        (1UL << PMU_INTENSET_CNT26_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 26 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT27_ENABLE_Pos         27U                                          /*!< PMU INTENSET: Event Counter 27 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT27_ENABLE_Msk        (1UL << PMU_INTENSET_CNT27_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 27 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT28_ENABLE_Pos         28U                                          /*!< PMU INTENSET: Event Counter 28 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT28_ENABLE_Msk        (1UL << PMU_INTENSET_CNT28_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 28 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT29_ENABLE_Pos         29U                                          /*!< PMU INTENSET: Event Counter 29 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT29_ENABLE_Msk        (1UL << PMU_INTENSET_CNT29_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 29 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT30_ENABLE_Pos         30U                                          /*!< PMU INTENSET: Event Counter 30 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT30_ENABLE_Msk        (1UL << PMU_INTENSET_CNT30_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 30 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CYCCNT_ENABLE_Pos        31U                                          /*!< PMU INTENSET: Cycle Counter Interrupt Enable Set Position */
+#define PMU_INTENSET_CCYCNT_ENABLE_Msk       (1UL << PMU_INTENSET_CYCCNT_ENABLE_Pos)       /*!< PMU INTENSET: Cycle Counter Interrupt Enable Set Mask */
+
+/** \brief PMU Interrupt Enable Clear Register Definitions */
+
+#define PMU_INTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU INTENCLR: Event Counter 0 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT0_ENABLE_Msk         (1UL /*<< PMU_INTENCLR_CNT0_ENABLE_Pos*/)     /*!< PMU INTENCLR: Event Counter 0 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT1_ENABLE_Pos          1U                                           /*!< PMU INTENCLR: Event Counter 1 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT1_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT1_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 1 Interrupt Enable Clear */
+
+#define PMU_INTENCLR_CNT2_ENABLE_Pos          2U                                           /*!< PMU INTENCLR: Event Counter 2 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT2_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT2_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 2 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT3_ENABLE_Pos          3U                                           /*!< PMU INTENCLR: Event Counter 3 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT3_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT3_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 3 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT4_ENABLE_Pos          4U                                           /*!< PMU INTENCLR: Event Counter 4 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT4_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT4_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 4 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT5_ENABLE_Pos          5U                                           /*!< PMU INTENCLR: Event Counter 5 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT5_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT5_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 5 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT6_ENABLE_Pos          6U                                           /*!< PMU INTENCLR: Event Counter 6 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT6_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT6_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 6 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT7_ENABLE_Pos          7U                                           /*!< PMU INTENCLR: Event Counter 7 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT7_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT7_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 7 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT8_ENABLE_Pos          8U                                           /*!< PMU INTENCLR: Event Counter 8 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT8_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT8_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 8 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT9_ENABLE_Pos          9U                                           /*!< PMU INTENCLR: Event Counter 9 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT9_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT9_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 9 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT10_ENABLE_Pos         10U                                          /*!< PMU INTENCLR: Event Counter 10 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT10_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT10_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 10 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT11_ENABLE_Pos         11U                                          /*!< PMU INTENCLR: Event Counter 11 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT11_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT11_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 11 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT12_ENABLE_Pos         12U                                          /*!< PMU INTENCLR: Event Counter 12 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT12_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT12_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 12 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT13_ENABLE_Pos         13U                                          /*!< PMU INTENCLR: Event Counter 13 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT13_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT13_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 13 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT14_ENABLE_Pos         14U                                          /*!< PMU INTENCLR: Event Counter 14 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT14_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT14_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 14 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT15_ENABLE_Pos         15U                                          /*!< PMU INTENCLR: Event Counter 15 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT15_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT15_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 15 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT16_ENABLE_Pos         16U                                          /*!< PMU INTENCLR: Event Counter 16 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT16_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT16_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 16 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT17_ENABLE_Pos         17U                                          /*!< PMU INTENCLR: Event Counter 17 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT17_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT17_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 17 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT18_ENABLE_Pos         18U                                          /*!< PMU INTENCLR: Event Counter 18 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT18_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT18_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 18 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT19_ENABLE_Pos         19U                                          /*!< PMU INTENCLR: Event Counter 19 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT19_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT19_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 19 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT20_ENABLE_Pos         20U                                          /*!< PMU INTENCLR: Event Counter 20 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT20_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT20_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 20 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT21_ENABLE_Pos         21U                                          /*!< PMU INTENCLR: Event Counter 21 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT21_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT21_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 21 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT22_ENABLE_Pos         22U                                          /*!< PMU INTENCLR: Event Counter 22 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT22_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT22_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 22 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT23_ENABLE_Pos         23U                                          /*!< PMU INTENCLR: Event Counter 23 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT23_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT23_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 23 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT24_ENABLE_Pos         24U                                          /*!< PMU INTENCLR: Event Counter 24 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT24_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT24_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 24 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT25_ENABLE_Pos         25U                                          /*!< PMU INTENCLR: Event Counter 25 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT25_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT25_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 25 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT26_ENABLE_Pos         26U                                          /*!< PMU INTENCLR: Event Counter 26 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT26_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT26_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 26 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT27_ENABLE_Pos         27U                                          /*!< PMU INTENCLR: Event Counter 27 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT27_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT27_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 27 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT28_ENABLE_Pos         28U                                          /*!< PMU INTENCLR: Event Counter 28 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT28_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT28_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 28 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT29_ENABLE_Pos         29U                                          /*!< PMU INTENCLR: Event Counter 29 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT29_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT29_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 29 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT30_ENABLE_Pos         30U                                          /*!< PMU INTENCLR: Event Counter 30 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT30_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT30_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 30 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CYCCNT_ENABLE_Pos        31U                                          /*!< PMU INTENCLR: Cycle Counter Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CYCCNT_ENABLE_Msk       (1UL << PMU_INTENCLR_CYCCNT_ENABLE_Pos)       /*!< PMU INTENCLR: Cycle Counter Interrupt Enable Clear Mask */
+
+/** \brief PMU Overflow Flag Status Set Register Definitions */
+
+#define PMU_OVSSET_CNT0_STATUS_Pos            0U                                           /*!< PMU OVSSET: Event Counter 0 Overflow Set Position */
+#define PMU_OVSSET_CNT0_STATUS_Msk           (1UL /*<< PMU_OVSSET_CNT0_STATUS_Pos*/)       /*!< PMU OVSSET: Event Counter 0 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT1_STATUS_Pos            1U                                           /*!< PMU OVSSET: Event Counter 1 Overflow Set Position */
+#define PMU_OVSSET_CNT1_STATUS_Msk           (1UL << PMU_OVSSET_CNT1_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 1 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT2_STATUS_Pos            2U                                           /*!< PMU OVSSET: Event Counter 2 Overflow Set Position */
+#define PMU_OVSSET_CNT2_STATUS_Msk           (1UL << PMU_OVSSET_CNT2_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 2 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT3_STATUS_Pos            3U                                           /*!< PMU OVSSET: Event Counter 3 Overflow Set Position */
+#define PMU_OVSSET_CNT3_STATUS_Msk           (1UL << PMU_OVSSET_CNT3_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 3 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT4_STATUS_Pos            4U                                           /*!< PMU OVSSET: Event Counter 4 Overflow Set Position */
+#define PMU_OVSSET_CNT4_STATUS_Msk           (1UL << PMU_OVSSET_CNT4_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 4 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT5_STATUS_Pos            5U                                           /*!< PMU OVSSET: Event Counter 5 Overflow Set Position */
+#define PMU_OVSSET_CNT5_STATUS_Msk           (1UL << PMU_OVSSET_CNT5_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 5 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT6_STATUS_Pos            6U                                           /*!< PMU OVSSET: Event Counter 6 Overflow Set Position */
+#define PMU_OVSSET_CNT6_STATUS_Msk           (1UL << PMU_OVSSET_CNT6_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 6 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT7_STATUS_Pos            7U                                           /*!< PMU OVSSET: Event Counter 7 Overflow Set Position */
+#define PMU_OVSSET_CNT7_STATUS_Msk           (1UL << PMU_OVSSET_CNT7_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 7 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT8_STATUS_Pos            8U                                           /*!< PMU OVSSET: Event Counter 8 Overflow Set Position */
+#define PMU_OVSSET_CNT8_STATUS_Msk           (1UL << PMU_OVSSET_CNT8_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 8 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT9_STATUS_Pos            9U                                           /*!< PMU OVSSET: Event Counter 9 Overflow Set Position */
+#define PMU_OVSSET_CNT9_STATUS_Msk           (1UL << PMU_OVSSET_CNT9_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 9 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT10_STATUS_Pos           10U                                          /*!< PMU OVSSET: Event Counter 10 Overflow Set Position */
+#define PMU_OVSSET_CNT10_STATUS_Msk          (1UL << PMU_OVSSET_CNT10_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 10 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT11_STATUS_Pos           11U                                          /*!< PMU OVSSET: Event Counter 11 Overflow Set Position */
+#define PMU_OVSSET_CNT11_STATUS_Msk          (1UL << PMU_OVSSET_CNT11_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 11 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT12_STATUS_Pos           12U                                          /*!< PMU OVSSET: Event Counter 12 Overflow Set Position */
+#define PMU_OVSSET_CNT12_STATUS_Msk          (1UL << PMU_OVSSET_CNT12_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 12 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT13_STATUS_Pos           13U                                          /*!< PMU OVSSET: Event Counter 13 Overflow Set Position */
+#define PMU_OVSSET_CNT13_STATUS_Msk          (1UL << PMU_OVSSET_CNT13_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 13 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT14_STATUS_Pos           14U                                          /*!< PMU OVSSET: Event Counter 14 Overflow Set Position */
+#define PMU_OVSSET_CNT14_STATUS_Msk          (1UL << PMU_OVSSET_CNT14_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 14 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT15_STATUS_Pos           15U                                          /*!< PMU OVSSET: Event Counter 15 Overflow Set Position */
+#define PMU_OVSSET_CNT15_STATUS_Msk          (1UL << PMU_OVSSET_CNT15_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 15 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT16_STATUS_Pos           16U                                          /*!< PMU OVSSET: Event Counter 16 Overflow Set Position */
+#define PMU_OVSSET_CNT16_STATUS_Msk          (1UL << PMU_OVSSET_CNT16_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 16 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT17_STATUS_Pos           17U                                          /*!< PMU OVSSET: Event Counter 17 Overflow Set Position */
+#define PMU_OVSSET_CNT17_STATUS_Msk          (1UL << PMU_OVSSET_CNT17_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 17 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT18_STATUS_Pos           18U                                          /*!< PMU OVSSET: Event Counter 18 Overflow Set Position */
+#define PMU_OVSSET_CNT18_STATUS_Msk          (1UL << PMU_OVSSET_CNT18_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 18 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT19_STATUS_Pos           19U                                          /*!< PMU OVSSET: Event Counter 19 Overflow Set Position */
+#define PMU_OVSSET_CNT19_STATUS_Msk          (1UL << PMU_OVSSET_CNT19_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 19 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT20_STATUS_Pos           20U                                          /*!< PMU OVSSET: Event Counter 20 Overflow Set Position */
+#define PMU_OVSSET_CNT20_STATUS_Msk          (1UL << PMU_OVSSET_CNT20_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 20 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT21_STATUS_Pos           21U                                          /*!< PMU OVSSET: Event Counter 21 Overflow Set Position */
+#define PMU_OVSSET_CNT21_STATUS_Msk          (1UL << PMU_OVSSET_CNT21_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 21 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT22_STATUS_Pos           22U                                          /*!< PMU OVSSET: Event Counter 22 Overflow Set Position */
+#define PMU_OVSSET_CNT22_STATUS_Msk          (1UL << PMU_OVSSET_CNT22_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 22 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT23_STATUS_Pos           23U                                          /*!< PMU OVSSET: Event Counter 23 Overflow Set Position */
+#define PMU_OVSSET_CNT23_STATUS_Msk          (1UL << PMU_OVSSET_CNT23_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 23 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT24_STATUS_Pos           24U                                          /*!< PMU OVSSET: Event Counter 24 Overflow Set Position */
+#define PMU_OVSSET_CNT24_STATUS_Msk          (1UL << PMU_OVSSET_CNT24_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 24 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT25_STATUS_Pos           25U                                          /*!< PMU OVSSET: Event Counter 25 Overflow Set Position */
+#define PMU_OVSSET_CNT25_STATUS_Msk          (1UL << PMU_OVSSET_CNT25_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 25 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT26_STATUS_Pos           26U                                          /*!< PMU OVSSET: Event Counter 26 Overflow Set Position */
+#define PMU_OVSSET_CNT26_STATUS_Msk          (1UL << PMU_OVSSET_CNT26_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 26 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT27_STATUS_Pos           27U                                          /*!< PMU OVSSET: Event Counter 27 Overflow Set Position */
+#define PMU_OVSSET_CNT27_STATUS_Msk          (1UL << PMU_OVSSET_CNT27_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 27 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT28_STATUS_Pos           28U                                          /*!< PMU OVSSET: Event Counter 28 Overflow Set Position */
+#define PMU_OVSSET_CNT28_STATUS_Msk          (1UL << PMU_OVSSET_CNT28_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 28 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT29_STATUS_Pos           29U                                          /*!< PMU OVSSET: Event Counter 29 Overflow Set Position */
+#define PMU_OVSSET_CNT29_STATUS_Msk          (1UL << PMU_OVSSET_CNT29_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 29 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT30_STATUS_Pos           30U                                          /*!< PMU OVSSET: Event Counter 30 Overflow Set Position */
+#define PMU_OVSSET_CNT30_STATUS_Msk          (1UL << PMU_OVSSET_CNT30_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 30 Overflow Set Mask */
+
+#define PMU_OVSSET_CYCCNT_STATUS_Pos          31U                                          /*!< PMU OVSSET: Cycle Counter Overflow Set Position */
+#define PMU_OVSSET_CYCCNT_STATUS_Msk         (1UL << PMU_OVSSET_CYCCNT_STATUS_Pos)         /*!< PMU OVSSET: Cycle Counter Overflow Set Mask */
+
+/** \brief PMU Overflow Flag Status Clear Register Definitions */
+
+#define PMU_OVSCLR_CNT0_STATUS_Pos            0U                                           /*!< PMU OVSCLR: Event Counter 0 Overflow Clear Position */
+#define PMU_OVSCLR_CNT0_STATUS_Msk           (1UL /*<< PMU_OVSCLR_CNT0_STATUS_Pos*/)       /*!< PMU OVSCLR: Event Counter 0 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT1_STATUS_Pos            1U                                           /*!< PMU OVSCLR: Event Counter 1 Overflow Clear Position */
+#define PMU_OVSCLR_CNT1_STATUS_Msk           (1UL << PMU_OVSCLR_CNT1_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 1 Overflow Clear */
+
+#define PMU_OVSCLR_CNT2_STATUS_Pos            2U                                           /*!< PMU OVSCLR: Event Counter 2 Overflow Clear Position */
+#define PMU_OVSCLR_CNT2_STATUS_Msk           (1UL << PMU_OVSCLR_CNT2_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 2 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT3_STATUS_Pos            3U                                           /*!< PMU OVSCLR: Event Counter 3 Overflow Clear Position */
+#define PMU_OVSCLR_CNT3_STATUS_Msk           (1UL << PMU_OVSCLR_CNT3_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 3 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT4_STATUS_Pos            4U                                           /*!< PMU OVSCLR: Event Counter 4 Overflow Clear Position */
+#define PMU_OVSCLR_CNT4_STATUS_Msk           (1UL << PMU_OVSCLR_CNT4_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 4 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT5_STATUS_Pos            5U                                           /*!< PMU OVSCLR: Event Counter 5 Overflow Clear Position */
+#define PMU_OVSCLR_CNT5_STATUS_Msk           (1UL << PMU_OVSCLR_CNT5_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 5 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT6_STATUS_Pos            6U                                           /*!< PMU OVSCLR: Event Counter 6 Overflow Clear Position */
+#define PMU_OVSCLR_CNT6_STATUS_Msk           (1UL << PMU_OVSCLR_CNT6_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 6 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT7_STATUS_Pos            7U                                           /*!< PMU OVSCLR: Event Counter 7 Overflow Clear Position */
+#define PMU_OVSCLR_CNT7_STATUS_Msk           (1UL << PMU_OVSCLR_CNT7_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 7 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT8_STATUS_Pos            8U                                           /*!< PMU OVSCLR: Event Counter 8 Overflow Clear Position */
+#define PMU_OVSCLR_CNT8_STATUS_Msk           (1UL << PMU_OVSCLR_CNT8_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 8 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT9_STATUS_Pos            9U                                           /*!< PMU OVSCLR: Event Counter 9 Overflow Clear Position */
+#define PMU_OVSCLR_CNT9_STATUS_Msk           (1UL << PMU_OVSCLR_CNT9_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 9 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT10_STATUS_Pos           10U                                          /*!< PMU OVSCLR: Event Counter 10 Overflow Clear Position */
+#define PMU_OVSCLR_CNT10_STATUS_Msk          (1UL << PMU_OVSCLR_CNT10_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 10 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT11_STATUS_Pos           11U                                          /*!< PMU OVSCLR: Event Counter 11 Overflow Clear Position */
+#define PMU_OVSCLR_CNT11_STATUS_Msk          (1UL << PMU_OVSCLR_CNT11_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 11 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT12_STATUS_Pos           12U                                          /*!< PMU OVSCLR: Event Counter 12 Overflow Clear Position */
+#define PMU_OVSCLR_CNT12_STATUS_Msk          (1UL << PMU_OVSCLR_CNT12_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 12 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT13_STATUS_Pos           13U                                          /*!< PMU OVSCLR: Event Counter 13 Overflow Clear Position */
+#define PMU_OVSCLR_CNT13_STATUS_Msk          (1UL << PMU_OVSCLR_CNT13_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 13 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT14_STATUS_Pos           14U                                          /*!< PMU OVSCLR: Event Counter 14 Overflow Clear Position */
+#define PMU_OVSCLR_CNT14_STATUS_Msk          (1UL << PMU_OVSCLR_CNT14_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 14 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT15_STATUS_Pos           15U                                          /*!< PMU OVSCLR: Event Counter 15 Overflow Clear Position */
+#define PMU_OVSCLR_CNT15_STATUS_Msk          (1UL << PMU_OVSCLR_CNT15_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 15 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT16_STATUS_Pos           16U                                          /*!< PMU OVSCLR: Event Counter 16 Overflow Clear Position */
+#define PMU_OVSCLR_CNT16_STATUS_Msk          (1UL << PMU_OVSCLR_CNT16_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 16 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT17_STATUS_Pos           17U                                          /*!< PMU OVSCLR: Event Counter 17 Overflow Clear Position */
+#define PMU_OVSCLR_CNT17_STATUS_Msk          (1UL << PMU_OVSCLR_CNT17_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 17 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT18_STATUS_Pos           18U                                          /*!< PMU OVSCLR: Event Counter 18 Overflow Clear Position */
+#define PMU_OVSCLR_CNT18_STATUS_Msk          (1UL << PMU_OVSCLR_CNT18_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 18 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT19_STATUS_Pos           19U                                          /*!< PMU OVSCLR: Event Counter 19 Overflow Clear Position */
+#define PMU_OVSCLR_CNT19_STATUS_Msk          (1UL << PMU_OVSCLR_CNT19_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 19 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT20_STATUS_Pos           20U                                          /*!< PMU OVSCLR: Event Counter 20 Overflow Clear Position */
+#define PMU_OVSCLR_CNT20_STATUS_Msk          (1UL << PMU_OVSCLR_CNT20_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 20 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT21_STATUS_Pos           21U                                          /*!< PMU OVSCLR: Event Counter 21 Overflow Clear Position */
+#define PMU_OVSCLR_CNT21_STATUS_Msk          (1UL << PMU_OVSCLR_CNT21_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 21 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT22_STATUS_Pos           22U                                          /*!< PMU OVSCLR: Event Counter 22 Overflow Clear Position */
+#define PMU_OVSCLR_CNT22_STATUS_Msk          (1UL << PMU_OVSCLR_CNT22_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 22 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT23_STATUS_Pos           23U                                          /*!< PMU OVSCLR: Event Counter 23 Overflow Clear Position */
+#define PMU_OVSCLR_CNT23_STATUS_Msk          (1UL << PMU_OVSCLR_CNT23_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 23 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT24_STATUS_Pos           24U                                          /*!< PMU OVSCLR: Event Counter 24 Overflow Clear Position */
+#define PMU_OVSCLR_CNT24_STATUS_Msk          (1UL << PMU_OVSCLR_CNT24_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 24 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT25_STATUS_Pos           25U                                          /*!< PMU OVSCLR: Event Counter 25 Overflow Clear Position */
+#define PMU_OVSCLR_CNT25_STATUS_Msk          (1UL << PMU_OVSCLR_CNT25_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 25 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT26_STATUS_Pos           26U                                          /*!< PMU OVSCLR: Event Counter 26 Overflow Clear Position */
+#define PMU_OVSCLR_CNT26_STATUS_Msk          (1UL << PMU_OVSCLR_CNT26_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 26 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT27_STATUS_Pos           27U                                          /*!< PMU OVSCLR: Event Counter 27 Overflow Clear Position */
+#define PMU_OVSCLR_CNT27_STATUS_Msk          (1UL << PMU_OVSCLR_CNT27_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 27 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT28_STATUS_Pos           28U                                          /*!< PMU OVSCLR: Event Counter 28 Overflow Clear Position */
+#define PMU_OVSCLR_CNT28_STATUS_Msk          (1UL << PMU_OVSCLR_CNT28_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 28 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT29_STATUS_Pos           29U                                          /*!< PMU OVSCLR: Event Counter 29 Overflow Clear Position */
+#define PMU_OVSCLR_CNT29_STATUS_Msk          (1UL << PMU_OVSCLR_CNT29_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 29 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT30_STATUS_Pos           30U                                          /*!< PMU OVSCLR: Event Counter 30 Overflow Clear Position */
+#define PMU_OVSCLR_CNT30_STATUS_Msk          (1UL << PMU_OVSCLR_CNT30_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 30 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CYCCNT_STATUS_Pos          31U                                          /*!< PMU OVSCLR: Cycle Counter Overflow Clear Position */
+#define PMU_OVSCLR_CYCCNT_STATUS_Msk         (1UL << PMU_OVSCLR_CYCCNT_STATUS_Pos)         /*!< PMU OVSCLR: Cycle Counter Overflow Clear Mask */
+
+/** \brief PMU Software Increment Counter */
+
+#define PMU_SWINC_CNT0_Pos                    0U                                           /*!< PMU SWINC: Event Counter 0 Software Increment Position */
+#define PMU_SWINC_CNT0_Msk                   (1UL /*<< PMU_SWINC_CNT0_Pos */)              /*!< PMU SWINC: Event Counter 0 Software Increment Mask */
+
+#define PMU_SWINC_CNT1_Pos                    1U                                           /*!< PMU SWINC: Event Counter 1 Software Increment Position */
+#define PMU_SWINC_CNT1_Msk                   (1UL << PMU_SWINC_CNT1_Pos)                   /*!< PMU SWINC: Event Counter 1 Software Increment Mask */
+
+#define PMU_SWINC_CNT2_Pos                    2U                                           /*!< PMU SWINC: Event Counter 2 Software Increment Position */
+#define PMU_SWINC_CNT2_Msk                   (1UL << PMU_SWINC_CNT2_Pos)                   /*!< PMU SWINC: Event Counter 2 Software Increment Mask */
+
+#define PMU_SWINC_CNT3_Pos                    3U                                           /*!< PMU SWINC: Event Counter 3 Software Increment Position */
+#define PMU_SWINC_CNT3_Msk                   (1UL << PMU_SWINC_CNT3_Pos)                   /*!< PMU SWINC: Event Counter 3 Software Increment Mask */
+
+#define PMU_SWINC_CNT4_Pos                    4U                                           /*!< PMU SWINC: Event Counter 4 Software Increment Position */
+#define PMU_SWINC_CNT4_Msk                   (1UL << PMU_SWINC_CNT4_Pos)                   /*!< PMU SWINC: Event Counter 4 Software Increment Mask */
+
+#define PMU_SWINC_CNT5_Pos                    5U                                           /*!< PMU SWINC: Event Counter 5 Software Increment Position */
+#define PMU_SWINC_CNT5_Msk                   (1UL << PMU_SWINC_CNT5_Pos)                   /*!< PMU SWINC: Event Counter 5 Software Increment Mask */
+
+#define PMU_SWINC_CNT6_Pos                    6U                                           /*!< PMU SWINC: Event Counter 6 Software Increment Position */
+#define PMU_SWINC_CNT6_Msk                   (1UL << PMU_SWINC_CNT6_Pos)                   /*!< PMU SWINC: Event Counter 6 Software Increment Mask */
+
+#define PMU_SWINC_CNT7_Pos                    7U                                           /*!< PMU SWINC: Event Counter 7 Software Increment Position */
+#define PMU_SWINC_CNT7_Msk                   (1UL << PMU_SWINC_CNT7_Pos)                   /*!< PMU SWINC: Event Counter 7 Software Increment Mask */
+
+#define PMU_SWINC_CNT8_Pos                    8U                                           /*!< PMU SWINC: Event Counter 8 Software Increment Position */
+#define PMU_SWINC_CNT8_Msk                   (1UL << PMU_SWINC_CNT8_Pos)                   /*!< PMU SWINC: Event Counter 8 Software Increment Mask */
+
+#define PMU_SWINC_CNT9_Pos                    9U                                           /*!< PMU SWINC: Event Counter 9 Software Increment Position */
+#define PMU_SWINC_CNT9_Msk                   (1UL << PMU_SWINC_CNT9_Pos)                   /*!< PMU SWINC: Event Counter 9 Software Increment Mask */
+
+#define PMU_SWINC_CNT10_Pos                   10U                                          /*!< PMU SWINC: Event Counter 10 Software Increment Position */
+#define PMU_SWINC_CNT10_Msk                  (1UL << PMU_SWINC_CNT10_Pos)                  /*!< PMU SWINC: Event Counter 10 Software Increment Mask */
+
+#define PMU_SWINC_CNT11_Pos                   11U                                          /*!< PMU SWINC: Event Counter 11 Software Increment Position */
+#define PMU_SWINC_CNT11_Msk                  (1UL << PMU_SWINC_CNT11_Pos)                  /*!< PMU SWINC: Event Counter 11 Software Increment Mask */
+
+#define PMU_SWINC_CNT12_Pos                   12U                                          /*!< PMU SWINC: Event Counter 12 Software Increment Position */
+#define PMU_SWINC_CNT12_Msk                  (1UL << PMU_SWINC_CNT12_Pos)                  /*!< PMU SWINC: Event Counter 12 Software Increment Mask */
+
+#define PMU_SWINC_CNT13_Pos                   13U                                          /*!< PMU SWINC: Event Counter 13 Software Increment Position */
+#define PMU_SWINC_CNT13_Msk                  (1UL << PMU_SWINC_CNT13_Pos)                  /*!< PMU SWINC: Event Counter 13 Software Increment Mask */
+
+#define PMU_SWINC_CNT14_Pos                   14U                                          /*!< PMU SWINC: Event Counter 14 Software Increment Position */
+#define PMU_SWINC_CNT14_Msk                  (1UL << PMU_SWINC_CNT14_Pos)                  /*!< PMU SWINC: Event Counter 14 Software Increment Mask */
+
+#define PMU_SWINC_CNT15_Pos                   15U                                          /*!< PMU SWINC: Event Counter 15 Software Increment Position */
+#define PMU_SWINC_CNT15_Msk                  (1UL << PMU_SWINC_CNT15_Pos)                  /*!< PMU SWINC: Event Counter 15 Software Increment Mask */
+
+#define PMU_SWINC_CNT16_Pos                   16U                                          /*!< PMU SWINC: Event Counter 16 Software Increment Position */
+#define PMU_SWINC_CNT16_Msk                  (1UL << PMU_SWINC_CNT16_Pos)                  /*!< PMU SWINC: Event Counter 16 Software Increment Mask */
+
+#define PMU_SWINC_CNT17_Pos                   17U                                          /*!< PMU SWINC: Event Counter 17 Software Increment Position */
+#define PMU_SWINC_CNT17_Msk                  (1UL << PMU_SWINC_CNT17_Pos)                  /*!< PMU SWINC: Event Counter 17 Software Increment Mask */
+
+#define PMU_SWINC_CNT18_Pos                   18U                                          /*!< PMU SWINC: Event Counter 18 Software Increment Position */
+#define PMU_SWINC_CNT18_Msk                  (1UL << PMU_SWINC_CNT18_Pos)                  /*!< PMU SWINC: Event Counter 18 Software Increment Mask */
+
+#define PMU_SWINC_CNT19_Pos                   19U                                          /*!< PMU SWINC: Event Counter 19 Software Increment Position */
+#define PMU_SWINC_CNT19_Msk                  (1UL << PMU_SWINC_CNT19_Pos)                  /*!< PMU SWINC: Event Counter 19 Software Increment Mask */
+
+#define PMU_SWINC_CNT20_Pos                   20U                                          /*!< PMU SWINC: Event Counter 20 Software Increment Position */
+#define PMU_SWINC_CNT20_Msk                  (1UL << PMU_SWINC_CNT20_Pos)                  /*!< PMU SWINC: Event Counter 20 Software Increment Mask */
+
+#define PMU_SWINC_CNT21_Pos                   21U                                          /*!< PMU SWINC: Event Counter 21 Software Increment Position */
+#define PMU_SWINC_CNT21_Msk                  (1UL << PMU_SWINC_CNT21_Pos)                  /*!< PMU SWINC: Event Counter 21 Software Increment Mask */
+
+#define PMU_SWINC_CNT22_Pos                   22U                                          /*!< PMU SWINC: Event Counter 22 Software Increment Position */
+#define PMU_SWINC_CNT22_Msk                  (1UL << PMU_SWINC_CNT22_Pos)                  /*!< PMU SWINC: Event Counter 22 Software Increment Mask */
+
+#define PMU_SWINC_CNT23_Pos                   23U                                          /*!< PMU SWINC: Event Counter 23 Software Increment Position */
+#define PMU_SWINC_CNT23_Msk                  (1UL << PMU_SWINC_CNT23_Pos)                  /*!< PMU SWINC: Event Counter 23 Software Increment Mask */
+
+#define PMU_SWINC_CNT24_Pos                   24U                                          /*!< PMU SWINC: Event Counter 24 Software Increment Position */
+#define PMU_SWINC_CNT24_Msk                  (1UL << PMU_SWINC_CNT24_Pos)                  /*!< PMU SWINC: Event Counter 24 Software Increment Mask */
+
+#define PMU_SWINC_CNT25_Pos                   25U                                          /*!< PMU SWINC: Event Counter 25 Software Increment Position */
+#define PMU_SWINC_CNT25_Msk                  (1UL << PMU_SWINC_CNT25_Pos)                  /*!< PMU SWINC: Event Counter 25 Software Increment Mask */
+
+#define PMU_SWINC_CNT26_Pos                   26U                                          /*!< PMU SWINC: Event Counter 26 Software Increment Position */
+#define PMU_SWINC_CNT26_Msk                  (1UL << PMU_SWINC_CNT26_Pos)                  /*!< PMU SWINC: Event Counter 26 Software Increment Mask */
+
+#define PMU_SWINC_CNT27_Pos                   27U                                          /*!< PMU SWINC: Event Counter 27 Software Increment Position */
+#define PMU_SWINC_CNT27_Msk                  (1UL << PMU_SWINC_CNT27_Pos)                  /*!< PMU SWINC: Event Counter 27 Software Increment Mask */
+
+#define PMU_SWINC_CNT28_Pos                   28U                                          /*!< PMU SWINC: Event Counter 28 Software Increment Position */
+#define PMU_SWINC_CNT28_Msk                  (1UL << PMU_SWINC_CNT28_Pos)                  /*!< PMU SWINC: Event Counter 28 Software Increment Mask */
+
+#define PMU_SWINC_CNT29_Pos                   29U                                          /*!< PMU SWINC: Event Counter 29 Software Increment Position */
+#define PMU_SWINC_CNT29_Msk                  (1UL << PMU_SWINC_CNT29_Pos)                  /*!< PMU SWINC: Event Counter 29 Software Increment Mask */
+
+#define PMU_SWINC_CNT30_Pos                   30U                                          /*!< PMU SWINC: Event Counter 30 Software Increment Position */
+#define PMU_SWINC_CNT30_Msk                  (1UL << PMU_SWINC_CNT30_Pos)                  /*!< PMU SWINC: Event Counter 30 Software Increment Mask */
+
+/** \brief PMU Control Register Definitions */
+
+#define PMU_CTRL_ENABLE_Pos                   0U                                           /*!< PMU CTRL: ENABLE Position */
+#define PMU_CTRL_ENABLE_Msk                  (1UL /*<< PMU_CTRL_ENABLE_Pos*/)              /*!< PMU CTRL: ENABLE Mask */
+
+#define PMU_CTRL_EVENTCNT_RESET_Pos           1U                                           /*!< PMU CTRL: Event Counter Reset Position */
+#define PMU_CTRL_EVENTCNT_RESET_Msk          (1UL << PMU_CTRL_EVENTCNT_RESET_Pos)          /*!< PMU CTRL: Event Counter Reset Mask */
+
+#define PMU_CTRL_CYCCNT_RESET_Pos             2U                                           /*!< PMU CTRL: Cycle Counter Reset Position */
+#define PMU_CTRL_CYCCNT_RESET_Msk            (1UL << PMU_CTRL_CYCCNT_RESET_Pos)            /*!< PMU CTRL: Cycle Counter Reset Mask */
+
+#define PMU_CTRL_CYCCNT_DISABLE_Pos           5U                                           /*!< PMU CTRL: Disable Cycle Counter Position */
+#define PMU_CTRL_CYCCNT_DISABLE_Msk          (1UL << PMU_CTRL_CYCCNT_DISABLE_Pos)          /*!< PMU CTRL: Disable Cycle Counter Mask */
+
+#define PMU_CTRL_FRZ_ON_OV_Pos                9U                                           /*!< PMU CTRL: Freeze-on-overflow Position */
+#define PMU_CTRL_FRZ_ON_OV_Msk               (1UL << PMU_CTRL_FRZ_ON_OVERFLOW_Pos)         /*!< PMU CTRL: Freeze-on-overflow Mask */
+
+#define PMU_CTRL_TRACE_ON_OV_Pos              11U                                          /*!< PMU CTRL: Trace-on-overflow Position */
+#define PMU_CTRL_TRACE_ON_OV_Msk             (1UL << PMU_CTRL_TRACE_ON_OVERFLOW_Pos)       /*!< PMU CTRL: Trace-on-overflow Mask */
+
+/** \brief PMU Type Register Definitions */
+
+#define PMU_TYPE_NUM_CNTS_Pos                 0U                                           /*!< PMU TYPE: Number of Counters Position */
+#define PMU_TYPE_NUM_CNTS_Msk                (0xFFUL /*<< PMU_TYPE_NUM_CNTS_Pos*/)         /*!< PMU TYPE: Number of Counters Mask */
+
+#define PMU_TYPE_SIZE_CNTS_Pos                8U                                           /*!< PMU TYPE: Size of Counters Position */
+#define PMU_TYPE_SIZE_CNTS_Msk               (0x3FUL << PMU_TYPE_SIZE_CNTS_Pos)            /*!< PMU TYPE: Size of Counters Mask */
+
+#define PMU_TYPE_CYCCNT_PRESENT_Pos           14U                                          /*!< PMU TYPE: Cycle Counter Present Position */
+#define PMU_TYPE_CYCCNT_PRESENT_Msk          (1UL << PMU_TYPE_CYCCNT_PRESENT_Pos)          /*!< PMU TYPE: Cycle Counter Present Mask */
+
+#define PMU_TYPE_FRZ_OV_SUPPORT_Pos           21U                                          /*!< PMU TYPE: Freeze-on-overflow Support Position */
+#define PMU_TYPE_FRZ_OV_SUPPORT_Msk          (1UL << PMU_TYPE_FRZ_OV_SUPPORT_Pos)          /*!< PMU TYPE: Freeze-on-overflow Support Mask */
+
+#define PMU_TYPE_TRACE_ON_OV_SUPPORT_Pos      23U                                          /*!< PMU TYPE: Trace-on-overflow Support Position */
+#define PMU_TYPE_TRACE_ON_OV_SUPPORT_Msk     (1UL << PMU_TYPE_FRZ_OV_SUPPORT_Pos)          /*!< PMU TYPE: Trace-on-overflow Support Mask */
+
+/** \brief PMU Authentication Status Register Definitions */
+
+#define PMU_AUTHSTATUS_NSID_Pos               0U                                           /*!< PMU AUTHSTATUS: Non-secure Invasive Debug Position */
+#define PMU_AUTHSTATUS_NSID_Msk              (0x3UL /*<< PMU_AUTHSTATUS_NSID_Pos*/)        /*!< PMU AUTHSTATUS: Non-secure Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSNID_Pos              2U                                           /*!< PMU AUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_NSNID_Msk             (0x3UL << PMU_AUTHSTATUS_NSNID_Pos)           /*!< PMU AUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SID_Pos                4U                                           /*!< PMU AUTHSTATUS: Secure Invasive Debug Position */
+#define PMU_AUTHSTATUS_SID_Msk               (0x3UL << PMU_AUTHSTATUS_SID_Pos)             /*!< PMU AUTHSTATUS: Secure Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SNID_Pos               6U                                           /*!< PMU AUTHSTATUS: Secure Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_SNID_Msk              (0x3UL << PMU_AUTHSTATUS_SNID_Pos)            /*!< PMU AUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSUID_Pos              16U                                          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Invasive Debug Position */
+#define PMU_AUTHSTATUS_NSUID_Msk             (0x3UL << PMU_AUTHSTATUS_NSUID_Pos)           /*!< PMU AUTHSTATUS: Non-secure Unprivileged Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSUNID_Pos             18U                                          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_NSUNID_Msk            (0x3UL << PMU_AUTHSTATUS_NSUNID_Pos)          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SUID_Pos               20U                                          /*!< PMU AUTHSTATUS: Secure Unprivileged Invasive Debug Position */
+#define PMU_AUTHSTATUS_SUID_Msk              (0x3UL << PMU_AUTHSTATUS_SUID_Pos)            /*!< PMU AUTHSTATUS: Secure Unprivileged Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SUNID_Pos              22U                                          /*!< PMU AUTHSTATUS: Secure Unprivileged Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_SUNID_Msk             (0x3UL << PMU_AUTHSTATUS_SUNID_Pos)           /*!< PMU AUTHSTATUS: Secure Unprivileged Non-invasive Debug Mask */
+
+
+/*@} end of group CMSIS_PMU */
+#endif
+
+#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_MPU     Memory Protection Unit (MPU)
+  \brief    Type definitions for the Memory Protection Unit (MPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Memory Protection Unit (MPU).
+ */
+typedef struct
+{
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x000 (R/ )  MPU Type Register */
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x004 (R/W)  MPU Control Register */
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  MPU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  MPU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  MPU Region Limit Address Register */
+  __IOM uint32_t RBAR_A1;                /*!< Offset: 0x014 (R/W)  MPU Region Base Address Register Alias 1 */
+  __IOM uint32_t RLAR_A1;                /*!< Offset: 0x018 (R/W)  MPU Region Limit Address Register Alias 1 */
+  __IOM uint32_t RBAR_A2;                /*!< Offset: 0x01C (R/W)  MPU Region Base Address Register Alias 2 */
+  __IOM uint32_t RLAR_A2;                /*!< Offset: 0x020 (R/W)  MPU Region Limit Address Register Alias 2 */
+  __IOM uint32_t RBAR_A3;                /*!< Offset: 0x024 (R/W)  MPU Region Base Address Register Alias 3 */
+  __IOM uint32_t RLAR_A3;                /*!< Offset: 0x028 (R/W)  MPU Region Limit Address Register Alias 3 */
+        uint32_t RESERVED0[1];
+  union {
+  __IOM uint32_t MAIR[2];
+  struct {
+  __IOM uint32_t MAIR0;                  /*!< Offset: 0x030 (R/W)  MPU Memory Attribute Indirection Register 0 */
+  __IOM uint32_t MAIR1;                  /*!< Offset: 0x034 (R/W)  MPU Memory Attribute Indirection Register 1 */
+  };
+  };
+} MPU_Type;
+
+#define MPU_TYPE_RALIASES                  4U
+
+/* MPU Type Register Definitions */
+#define MPU_TYPE_IREGION_Pos               16U                                            /*!< MPU TYPE: IREGION Position */
+#define MPU_TYPE_IREGION_Msk               (0xFFUL << MPU_TYPE_IREGION_Pos)               /*!< MPU TYPE: IREGION Mask */
+
+#define MPU_TYPE_DREGION_Pos                8U                                            /*!< MPU TYPE: DREGION Position */
+#define MPU_TYPE_DREGION_Msk               (0xFFUL << MPU_TYPE_DREGION_Pos)               /*!< MPU TYPE: DREGION Mask */
+
+#define MPU_TYPE_SEPARATE_Pos               0U                                            /*!< MPU TYPE: SEPARATE Position */
+#define MPU_TYPE_SEPARATE_Msk              (1UL /*<< MPU_TYPE_SEPARATE_Pos*/)             /*!< MPU TYPE: SEPARATE Mask */
+
+/* MPU Control Register Definitions */
+#define MPU_CTRL_PRIVDEFENA_Pos             2U                                            /*!< MPU CTRL: PRIVDEFENA Position */
+#define MPU_CTRL_PRIVDEFENA_Msk            (1UL << MPU_CTRL_PRIVDEFENA_Pos)               /*!< MPU CTRL: PRIVDEFENA Mask */
+
+#define MPU_CTRL_HFNMIENA_Pos               1U                                            /*!< MPU CTRL: HFNMIENA Position */
+#define MPU_CTRL_HFNMIENA_Msk              (1UL << MPU_CTRL_HFNMIENA_Pos)                 /*!< MPU CTRL: HFNMIENA Mask */
+
+#define MPU_CTRL_ENABLE_Pos                 0U                                            /*!< MPU CTRL: ENABLE Position */
+#define MPU_CTRL_ENABLE_Msk                (1UL /*<< MPU_CTRL_ENABLE_Pos*/)               /*!< MPU CTRL: ENABLE Mask */
+
+/* MPU Region Number Register Definitions */
+#define MPU_RNR_REGION_Pos                  0U                                            /*!< MPU RNR: REGION Position */
+#define MPU_RNR_REGION_Msk                 (0xFFUL /*<< MPU_RNR_REGION_Pos*/)             /*!< MPU RNR: REGION Mask */
+
+/* MPU Region Base Address Register Definitions */
+#define MPU_RBAR_BASE_Pos                   5U                                            /*!< MPU RBAR: BASE Position */
+#define MPU_RBAR_BASE_Msk                  (0x7FFFFFFUL << MPU_RBAR_BASE_Pos)             /*!< MPU RBAR: BASE Mask */
+
+#define MPU_RBAR_SH_Pos                     3U                                            /*!< MPU RBAR: SH Position */
+#define MPU_RBAR_SH_Msk                    (0x3UL << MPU_RBAR_SH_Pos)                     /*!< MPU RBAR: SH Mask */
+
+#define MPU_RBAR_AP_Pos                     1U                                            /*!< MPU RBAR: AP Position */
+#define MPU_RBAR_AP_Msk                    (0x3UL << MPU_RBAR_AP_Pos)                     /*!< MPU RBAR: AP Mask */
+
+#define MPU_RBAR_XN_Pos                     0U                                            /*!< MPU RBAR: XN Position */
+#define MPU_RBAR_XN_Msk                    (01UL /*<< MPU_RBAR_XN_Pos*/)                  /*!< MPU RBAR: XN Mask */
+
+/* MPU Region Limit Address Register Definitions */
+#define MPU_RLAR_LIMIT_Pos                  5U                                            /*!< MPU RLAR: LIMIT Position */
+#define MPU_RLAR_LIMIT_Msk                 (0x7FFFFFFUL << MPU_RLAR_LIMIT_Pos)            /*!< MPU RLAR: LIMIT Mask */
+
+#define MPU_RLAR_PXN_Pos                    4U                                            /*!< MPU RLAR: PXN Position */
+#define MPU_RLAR_PXN_Msk                   (1UL << MPU_RLAR_PXN_Pos)                      /*!< MPU RLAR: PXN Mask */
+
+#define MPU_RLAR_AttrIndx_Pos               1U                                            /*!< MPU RLAR: AttrIndx Position */
+#define MPU_RLAR_AttrIndx_Msk              (7UL << MPU_RLAR_AttrIndx_Pos)                 /*!< MPU RLAR: AttrIndx Mask */
+
+#define MPU_RLAR_EN_Pos                     0U                                            /*!< MPU RLAR: Region enable bit Position */
+#define MPU_RLAR_EN_Msk                    (1UL /*<< MPU_RLAR_EN_Pos*/)                   /*!< MPU RLAR: Region enable bit Disable Mask */
+
+/* MPU Memory Attribute Indirection Register 0 Definitions */
+#define MPU_MAIR0_Attr3_Pos                24U                                            /*!< MPU MAIR0: Attr3 Position */
+#define MPU_MAIR0_Attr3_Msk                (0xFFUL << MPU_MAIR0_Attr3_Pos)                /*!< MPU MAIR0: Attr3 Mask */
+
+#define MPU_MAIR0_Attr2_Pos                16U                                            /*!< MPU MAIR0: Attr2 Position */
+#define MPU_MAIR0_Attr2_Msk                (0xFFUL << MPU_MAIR0_Attr2_Pos)                /*!< MPU MAIR0: Attr2 Mask */
+
+#define MPU_MAIR0_Attr1_Pos                 8U                                            /*!< MPU MAIR0: Attr1 Position */
+#define MPU_MAIR0_Attr1_Msk                (0xFFUL << MPU_MAIR0_Attr1_Pos)                /*!< MPU MAIR0: Attr1 Mask */
+
+#define MPU_MAIR0_Attr0_Pos                 0U                                            /*!< MPU MAIR0: Attr0 Position */
+#define MPU_MAIR0_Attr0_Msk                (0xFFUL /*<< MPU_MAIR0_Attr0_Pos*/)            /*!< MPU MAIR0: Attr0 Mask */
+
+/* MPU Memory Attribute Indirection Register 1 Definitions */
+#define MPU_MAIR1_Attr7_Pos                24U                                            /*!< MPU MAIR1: Attr7 Position */
+#define MPU_MAIR1_Attr7_Msk                (0xFFUL << MPU_MAIR1_Attr7_Pos)                /*!< MPU MAIR1: Attr7 Mask */
+
+#define MPU_MAIR1_Attr6_Pos                16U                                            /*!< MPU MAIR1: Attr6 Position */
+#define MPU_MAIR1_Attr6_Msk                (0xFFUL << MPU_MAIR1_Attr6_Pos)                /*!< MPU MAIR1: Attr6 Mask */
+
+#define MPU_MAIR1_Attr5_Pos                 8U                                            /*!< MPU MAIR1: Attr5 Position */
+#define MPU_MAIR1_Attr5_Msk                (0xFFUL << MPU_MAIR1_Attr5_Pos)                /*!< MPU MAIR1: Attr5 Mask */
+
+#define MPU_MAIR1_Attr4_Pos                 0U                                            /*!< MPU MAIR1: Attr4 Position */
+#define MPU_MAIR1_Attr4_Msk                (0xFFUL /*<< MPU_MAIR1_Attr4_Pos*/)            /*!< MPU MAIR1: Attr4 Mask */
+
+/*@} end of group CMSIS_MPU */
+#endif
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SAU     Security Attribution Unit (SAU)
+  \brief    Type definitions for the Security Attribution Unit (SAU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Security Attribution Unit (SAU).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SAU Control Register */
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x004 (R/ )  SAU Type Register */
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  SAU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  SAU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  SAU Region Limit Address Register */
+#else
+        uint32_t RESERVED0[3];
+#endif
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x014 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x018 (R/W)  Secure Fault Address Register */
+} SAU_Type;
+
+/* SAU Control Register Definitions */
+#define SAU_CTRL_ALLNS_Pos                  1U                                            /*!< SAU CTRL: ALLNS Position */
+#define SAU_CTRL_ALLNS_Msk                 (1UL << SAU_CTRL_ALLNS_Pos)                    /*!< SAU CTRL: ALLNS Mask */
+
+#define SAU_CTRL_ENABLE_Pos                 0U                                            /*!< SAU CTRL: ENABLE Position */
+#define SAU_CTRL_ENABLE_Msk                (1UL /*<< SAU_CTRL_ENABLE_Pos*/)               /*!< SAU CTRL: ENABLE Mask */
+
+/* SAU Type Register Definitions */
+#define SAU_TYPE_SREGION_Pos                0U                                            /*!< SAU TYPE: SREGION Position */
+#define SAU_TYPE_SREGION_Msk               (0xFFUL /*<< SAU_TYPE_SREGION_Pos*/)           /*!< SAU TYPE: SREGION Mask */
+
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+/* SAU Region Number Register Definitions */
+#define SAU_RNR_REGION_Pos                  0U                                            /*!< SAU RNR: REGION Position */
+#define SAU_RNR_REGION_Msk                 (0xFFUL /*<< SAU_RNR_REGION_Pos*/)             /*!< SAU RNR: REGION Mask */
+
+/* SAU Region Base Address Register Definitions */
+#define SAU_RBAR_BADDR_Pos                  5U                                            /*!< SAU RBAR: BADDR Position */
+#define SAU_RBAR_BADDR_Msk                 (0x7FFFFFFUL << SAU_RBAR_BADDR_Pos)            /*!< SAU RBAR: BADDR Mask */
+
+/* SAU Region Limit Address Register Definitions */
+#define SAU_RLAR_LADDR_Pos                  5U                                            /*!< SAU RLAR: LADDR Position */
+#define SAU_RLAR_LADDR_Msk                 (0x7FFFFFFUL << SAU_RLAR_LADDR_Pos)            /*!< SAU RLAR: LADDR Mask */
+
+#define SAU_RLAR_NSC_Pos                    1U                                            /*!< SAU RLAR: NSC Position */
+#define SAU_RLAR_NSC_Msk                   (1UL << SAU_RLAR_NSC_Pos)                      /*!< SAU RLAR: NSC Mask */
+
+#define SAU_RLAR_ENABLE_Pos                 0U                                            /*!< SAU RLAR: ENABLE Position */
+#define SAU_RLAR_ENABLE_Msk                (1UL /*<< SAU_RLAR_ENABLE_Pos*/)               /*!< SAU RLAR: ENABLE Mask */
+
+#endif /* defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U) */
+
+/* Secure Fault Status Register Definitions */
+#define SAU_SFSR_LSERR_Pos                  7U                                            /*!< SAU SFSR: LSERR Position */
+#define SAU_SFSR_LSERR_Msk                 (1UL << SAU_SFSR_LSERR_Pos)                    /*!< SAU SFSR: LSERR Mask */
+
+#define SAU_SFSR_SFARVALID_Pos              6U                                            /*!< SAU SFSR: SFARVALID Position */
+#define SAU_SFSR_SFARVALID_Msk             (1UL << SAU_SFSR_SFARVALID_Pos)                /*!< SAU SFSR: SFARVALID Mask */
+
+#define SAU_SFSR_LSPERR_Pos                 5U                                            /*!< SAU SFSR: LSPERR Position */
+#define SAU_SFSR_LSPERR_Msk                (1UL << SAU_SFSR_LSPERR_Pos)                   /*!< SAU SFSR: LSPERR Mask */
+
+#define SAU_SFSR_INVTRAN_Pos                4U                                            /*!< SAU SFSR: INVTRAN Position */
+#define SAU_SFSR_INVTRAN_Msk               (1UL << SAU_SFSR_INVTRAN_Pos)                  /*!< SAU SFSR: INVTRAN Mask */
+
+#define SAU_SFSR_AUVIOL_Pos                 3U                                            /*!< SAU SFSR: AUVIOL Position */
+#define SAU_SFSR_AUVIOL_Msk                (1UL << SAU_SFSR_AUVIOL_Pos)                   /*!< SAU SFSR: AUVIOL Mask */
+
+#define SAU_SFSR_INVER_Pos                  2U                                            /*!< SAU SFSR: INVER Position */
+#define SAU_SFSR_INVER_Msk                 (1UL << SAU_SFSR_INVER_Pos)                    /*!< SAU SFSR: INVER Mask */
+
+#define SAU_SFSR_INVIS_Pos                  1U                                            /*!< SAU SFSR: INVIS Position */
+#define SAU_SFSR_INVIS_Msk                 (1UL << SAU_SFSR_INVIS_Pos)                    /*!< SAU SFSR: INVIS Mask */
+
+#define SAU_SFSR_INVEP_Pos                  0U                                            /*!< SAU SFSR: INVEP Position */
+#define SAU_SFSR_INVEP_Msk                 (1UL /*<< SAU_SFSR_INVEP_Pos*/)                /*!< SAU SFSR: INVEP Mask */
+
+/*@} end of group CMSIS_SAU */
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_FPU     Floating Point Unit (FPU)
+  \brief    Type definitions for the Floating Point Unit (FPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Floating Point Unit (FPU).
+ */
+typedef struct
+{
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t FPCCR;                  /*!< Offset: 0x004 (R/W)  Floating-Point Context Control Register */
+  __IOM uint32_t FPCAR;                  /*!< Offset: 0x008 (R/W)  Floating-Point Context Address Register */
+  __IOM uint32_t FPDSCR;                 /*!< Offset: 0x00C (R/W)  Floating-Point Default Status Control Register */
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x018 (R/ )  Media and VFP Feature Register 2 */
+} FPU_Type;
+
+/* Floating-Point Context Control Register Definitions */
+#define FPU_FPCCR_ASPEN_Pos                31U                                            /*!< FPCCR: ASPEN bit Position */
+#define FPU_FPCCR_ASPEN_Msk                (1UL << FPU_FPCCR_ASPEN_Pos)                   /*!< FPCCR: ASPEN bit Mask */
+
+#define FPU_FPCCR_LSPEN_Pos                30U                                            /*!< FPCCR: LSPEN Position */
+#define FPU_FPCCR_LSPEN_Msk                (1UL << FPU_FPCCR_LSPEN_Pos)                   /*!< FPCCR: LSPEN bit Mask */
+
+#define FPU_FPCCR_LSPENS_Pos               29U                                            /*!< FPCCR: LSPENS Position */
+#define FPU_FPCCR_LSPENS_Msk               (1UL << FPU_FPCCR_LSPENS_Pos)                  /*!< FPCCR: LSPENS bit Mask */
+
+#define FPU_FPCCR_CLRONRET_Pos             28U                                            /*!< FPCCR: CLRONRET Position */
+#define FPU_FPCCR_CLRONRET_Msk             (1UL << FPU_FPCCR_CLRONRET_Pos)                /*!< FPCCR: CLRONRET bit Mask */
+
+#define FPU_FPCCR_CLRONRETS_Pos            27U                                            /*!< FPCCR: CLRONRETS Position */
+#define FPU_FPCCR_CLRONRETS_Msk            (1UL << FPU_FPCCR_CLRONRETS_Pos)               /*!< FPCCR: CLRONRETS bit Mask */
+
+#define FPU_FPCCR_TS_Pos                   26U                                            /*!< FPCCR: TS Position */
+#define FPU_FPCCR_TS_Msk                   (1UL << FPU_FPCCR_TS_Pos)                      /*!< FPCCR: TS bit Mask */
+
+#define FPU_FPCCR_UFRDY_Pos                10U                                            /*!< FPCCR: UFRDY Position */
+#define FPU_FPCCR_UFRDY_Msk                (1UL << FPU_FPCCR_UFRDY_Pos)                   /*!< FPCCR: UFRDY bit Mask */
+
+#define FPU_FPCCR_SPLIMVIOL_Pos             9U                                            /*!< FPCCR: SPLIMVIOL Position */
+#define FPU_FPCCR_SPLIMVIOL_Msk            (1UL << FPU_FPCCR_SPLIMVIOL_Pos)               /*!< FPCCR: SPLIMVIOL bit Mask */
+
+#define FPU_FPCCR_MONRDY_Pos                8U                                            /*!< FPCCR: MONRDY Position */
+#define FPU_FPCCR_MONRDY_Msk               (1UL << FPU_FPCCR_MONRDY_Pos)                  /*!< FPCCR: MONRDY bit Mask */
+
+#define FPU_FPCCR_SFRDY_Pos                 7U                                            /*!< FPCCR: SFRDY Position */
+#define FPU_FPCCR_SFRDY_Msk                (1UL << FPU_FPCCR_SFRDY_Pos)                   /*!< FPCCR: SFRDY bit Mask */
+
+#define FPU_FPCCR_BFRDY_Pos                 6U                                            /*!< FPCCR: BFRDY Position */
+#define FPU_FPCCR_BFRDY_Msk                (1UL << FPU_FPCCR_BFRDY_Pos)                   /*!< FPCCR: BFRDY bit Mask */
+
+#define FPU_FPCCR_MMRDY_Pos                 5U                                            /*!< FPCCR: MMRDY Position */
+#define FPU_FPCCR_MMRDY_Msk                (1UL << FPU_FPCCR_MMRDY_Pos)                   /*!< FPCCR: MMRDY bit Mask */
+
+#define FPU_FPCCR_HFRDY_Pos                 4U                                            /*!< FPCCR: HFRDY Position */
+#define FPU_FPCCR_HFRDY_Msk                (1UL << FPU_FPCCR_HFRDY_Pos)                   /*!< FPCCR: HFRDY bit Mask */
+
+#define FPU_FPCCR_THREAD_Pos                3U                                            /*!< FPCCR: processor mode bit Position */
+#define FPU_FPCCR_THREAD_Msk               (1UL << FPU_FPCCR_THREAD_Pos)                  /*!< FPCCR: processor mode active bit Mask */
+
+#define FPU_FPCCR_S_Pos                     2U                                            /*!< FPCCR: Security status of the FP context bit Position */
+#define FPU_FPCCR_S_Msk                    (1UL << FPU_FPCCR_S_Pos)                       /*!< FPCCR: Security status of the FP context bit Mask */
+
+#define FPU_FPCCR_USER_Pos                  1U                                            /*!< FPCCR: privilege level bit Position */
+#define FPU_FPCCR_USER_Msk                 (1UL << FPU_FPCCR_USER_Pos)                    /*!< FPCCR: privilege level bit Mask */
+
+#define FPU_FPCCR_LSPACT_Pos                0U                                            /*!< FPCCR: Lazy state preservation active bit Position */
+#define FPU_FPCCR_LSPACT_Msk               (1UL /*<< FPU_FPCCR_LSPACT_Pos*/)              /*!< FPCCR: Lazy state preservation active bit Mask */
+
+/* Floating-Point Context Address Register Definitions */
+#define FPU_FPCAR_ADDRESS_Pos               3U                                            /*!< FPCAR: ADDRESS bit Position */
+#define FPU_FPCAR_ADDRESS_Msk              (0x1FFFFFFFUL << FPU_FPCAR_ADDRESS_Pos)        /*!< FPCAR: ADDRESS bit Mask */
+
+/* Floating-Point Default Status Control Register Definitions */
+#define FPU_FPDSCR_AHP_Pos                 26U                                            /*!< FPDSCR: AHP bit Position */
+#define FPU_FPDSCR_AHP_Msk                 (1UL << FPU_FPDSCR_AHP_Pos)                    /*!< FPDSCR: AHP bit Mask */
+
+#define FPU_FPDSCR_DN_Pos                  25U                                            /*!< FPDSCR: DN bit Position */
+#define FPU_FPDSCR_DN_Msk                  (1UL << FPU_FPDSCR_DN_Pos)                     /*!< FPDSCR: DN bit Mask */
+
+#define FPU_FPDSCR_FZ_Pos                  24U                                            /*!< FPDSCR: FZ bit Position */
+#define FPU_FPDSCR_FZ_Msk                  (1UL << FPU_FPDSCR_FZ_Pos)                     /*!< FPDSCR: FZ bit Mask */
+
+#define FPU_FPDSCR_RMode_Pos               22U                                            /*!< FPDSCR: RMode bit Position */
+#define FPU_FPDSCR_RMode_Msk               (3UL << FPU_FPDSCR_RMode_Pos)                  /*!< FPDSCR: RMode bit Mask */
+
+#define FPU_FPDSCR_FZ16_Pos                19U                                            /*!< FPDSCR: FZ16 bit Position */
+#define FPU_FPDSCR_FZ16_Msk                (1UL << FPU_FPDSCR_FZ16_Pos)                   /*!< FPDSCR: FZ16 bit Mask */
+
+#define FPU_FPDSCR_LTPSIZE_Pos             16U                                            /*!< FPDSCR: LTPSIZE bit Position */
+#define FPU_FPDSCR_LTPSIZE_Msk             (7UL << FPU_FPDSCR_LTPSIZE_Pos)                /*!< FPDSCR: LTPSIZE bit Mask */
+
+/* Media and VFP Feature Register 0 Definitions */
+#define FPU_MVFR0_FPRound_Pos              28U                                            /*!< MVFR0: FPRound bits Position */
+#define FPU_MVFR0_FPRound_Msk              (0xFUL << FPU_MVFR0_FPRound_Pos)               /*!< MVFR0: FPRound bits Mask */
+
+#define FPU_MVFR0_FPSqrt_Pos               20U                                            /*!< MVFR0: FPSqrt bits Position */
+#define FPU_MVFR0_FPSqrt_Msk               (0xFUL << FPU_MVFR0_FPSqrt_Pos)                 /*!< MVFR0: FPSqrt bits Mask */
+
+#define FPU_MVFR0_FPDivide_Pos             16U                                            /*!< MVFR0: FPDivide bits Position */
+#define FPU_MVFR0_FPDivide_Msk             (0xFUL << FPU_MVFR0_FPDivide_Pos)              /*!< MVFR0: Divide bits Mask */
+
+#define FPU_MVFR0_FPDP_Pos                  8U                                            /*!< MVFR0: FPDP bits Position */
+#define FPU_MVFR0_FPDP_Msk                 (0xFUL << FPU_MVFR0_FPDP_Pos)                  /*!< MVFR0: FPDP bits Mask */
+
+#define FPU_MVFR0_FPSP_Pos                  4U                                            /*!< MVFR0: FPSP bits Position */
+#define FPU_MVFR0_FPSP_Msk                 (0xFUL << FPU_MVFR0_FPSP_Pos)                  /*!< MVFR0: FPSP bits Mask */
+
+#define FPU_MVFR0_SIMDReg_Pos               0U                                            /*!< MVFR0: SIMDReg bits Position */
+#define FPU_MVFR0_SIMDReg_Msk              (0xFUL /*<< FPU_MVFR0_SIMDReg_Pos*/)           /*!< MVFR0: SIMDReg bits Mask */
+
+/* Media and VFP Feature Register 1 Definitions */
+#define FPU_MVFR1_FMAC_Pos                 28U                                            /*!< MVFR1: FMAC bits Position */
+#define FPU_MVFR1_FMAC_Msk                 (0xFUL << FPU_MVFR1_FMAC_Pos)                  /*!< MVFR1: FMAC bits Mask */
+
+#define FPU_MVFR1_FPHP_Pos                 24U                                            /*!< MVFR1: FPHP bits Position */
+#define FPU_MVFR1_FPHP_Msk                 (0xFUL << FPU_MVFR1_FPHP_Pos)                  /*!< MVFR1: FPHP bits Mask */
+
+#define FPU_MVFR1_FP16_Pos                 20U                                            /*!< MVFR1: FP16 bits Position */
+#define FPU_MVFR1_FP16_Msk                 (0xFUL << FPU_MVFR1_FP16_Pos)                  /*!< MVFR1: FP16 bits Mask */
+
+#define FPU_MVFR1_MVE_Pos                   8U                                            /*!< MVFR1: MVE bits Position */
+#define FPU_MVFR1_MVE_Msk                  (0xFUL << FPU_MVFR1_MVE_Pos)                   /*!< MVFR1: MVE bits Mask */
+
+#define FPU_MVFR1_FPDNaN_Pos                4U                                            /*!< MVFR1: FPDNaN bits Position */
+#define FPU_MVFR1_FPDNaN_Msk               (0xFUL << FPU_MVFR1_FPDNaN_Pos)                /*!< MVFR1: FPDNaN bits Mask */
+
+#define FPU_MVFR1_FPFtZ_Pos                 0U                                            /*!< MVFR1: FPFtZ bits Position */
+#define FPU_MVFR1_FPFtZ_Msk                (0xFUL /*<< FPU_MVFR1_FPFtZ_Pos*/)             /*!< MVFR1: FPFtZ bits Mask */
+
+/* Media and VFP Feature Register 2 Definitions */
+#define FPU_MVFR2_FPMisc_Pos                4U                                            /*!< MVFR2: FPMisc bits Position */
+#define FPU_MVFR2_FPMisc_Msk               (0xFUL << FPU_MVFR2_FPMisc_Pos)                /*!< MVFR2: FPMisc bits Mask */
+
+/*@} end of group CMSIS_FPU */
+
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
+  \brief    Type definitions for the Core Debug Registers
+  @{
+ */
+
+/**
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+  __OM  uint32_t DSCEMCR;                /*!< Offset: 0x010 ( /W)  Debug Set Clear Exception and Monitor Control Register */
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} CoreDebug_Type;
+
+/* Debug Halting Control and Status Register Definitions */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
+
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
+
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
+
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
+
+#define CoreDebug_DHCSR_S_FPD_Pos          23U                                            /*!< \deprecated CoreDebug DHCSR: S_FPD Position */
+#define CoreDebug_DHCSR_S_FPD_Msk          (1UL << CoreDebug_DHCSR_S_FPD_Pos)             /*!< \deprecated CoreDebug DHCSR: S_FPD Mask */
+
+#define CoreDebug_DHCSR_S_SUIDE_Pos        22U                                            /*!< \deprecated CoreDebug DHCSR: S_SUIDE Position */
+#define CoreDebug_DHCSR_S_SUIDE_Msk        (1UL << CoreDebug_DHCSR_S_SUIDE_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SUIDE Mask */
+
+#define CoreDebug_DHCSR_S_NSUIDE_Pos       21U                                            /*!< \deprecated CoreDebug DHCSR: S_NSUIDE Position */
+#define CoreDebug_DHCSR_S_NSUIDE_Msk       (1UL << CoreDebug_DHCSR_S_NSUIDE_Pos)          /*!< \deprecated CoreDebug DHCSR: S_NSUIDE Mask */
+
+#define CoreDebug_DHCSR_S_SDE_Pos          20U                                            /*!< \deprecated CoreDebug DHCSR: S_SDE Position */
+#define CoreDebug_DHCSR_S_SDE_Msk          (1UL << CoreDebug_DHCSR_S_SDE_Pos)             /*!< \deprecated CoreDebug DHCSR: S_SDE Mask */
+
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
+
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
+
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
+
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
+
+#define CoreDebug_DHCSR_C_PMOV_Pos          6U                                            /*!< \deprecated CoreDebug DHCSR: C_PMOV Position */
+#define CoreDebug_DHCSR_C_PMOV_Msk         (1UL << CoreDebug_DHCSR_C_PMOV_Pos)            /*!< \deprecated CoreDebug DHCSR: C_PMOV Mask */
+
+#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Position */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Mask */
+
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
+
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
+
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
+
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
+
+/* Debug Core Register Selector Register Definitions */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
+
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
+
+/* Debug Exception and Monitor Control Register Definitions */
+#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: TRCENA Position */
+#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< \deprecated CoreDebug DEMCR: TRCENA Mask */
+
+#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< \deprecated CoreDebug DEMCR: MON_REQ Position */
+#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< \deprecated CoreDebug DEMCR: MON_REQ Mask */
+
+#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< \deprecated CoreDebug DEMCR: MON_STEP Position */
+#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_STEP Mask */
+
+#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< \deprecated CoreDebug DEMCR: MON_PEND Position */
+#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_PEND Mask */
+
+#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< \deprecated CoreDebug DEMCR: MON_EN Position */
+#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< \deprecated CoreDebug DEMCR: MON_EN Mask */
+
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
+
+#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< \deprecated CoreDebug DEMCR: VC_INTERR Position */
+#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_INTERR Mask */
+
+#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Position */
+#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Mask */
+
+#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< \deprecated CoreDebug DEMCR: VC_STATERR Position */
+#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_STATERR Mask */
+
+#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Position */
+#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Mask */
+
+#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Position */
+#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Mask */
+
+#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< \deprecated CoreDebug DEMCR: VC_MMERR Position */
+#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< \deprecated CoreDebug DEMCR: VC_MMERR Mask */
+
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
+
+/* Debug Set Clear Exception and Monitor Control Register Definitions */
+#define CoreDebug_DSCEMCR_CLR_MON_REQ_Pos  19U                                            /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_REQ, Position */
+#define CoreDebug_DSCEMCR_CLR_MON_REQ_Msk  (1UL << CoreDebug_DSCEMCR_CLR_MON_REQ_Pos)     /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_REQ, Mask */
+
+#define CoreDebug_DSCEMCR_CLR_MON_PEND_Pos 17U                                            /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_PEND, Position */
+#define CoreDebug_DSCEMCR_CLR_MON_PEND_Msk (1UL << CoreDebug_DSCEMCR_CLR_MON_PEND_Pos)    /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_PEND, Mask */
+
+#define CoreDebug_DSCEMCR_SET_MON_REQ_Pos   3U                                            /*!< \deprecated CoreDebug DSCEMCR: SET_MON_REQ, Position */
+#define CoreDebug_DSCEMCR_SET_MON_REQ_Msk  (1UL << CoreDebug_DSCEMCR_SET_MON_REQ_Pos)     /*!< \deprecated CoreDebug DSCEMCR: SET_MON_REQ, Mask */
+
+#define CoreDebug_DSCEMCR_SET_MON_PEND_Pos  1U                                            /*!< \deprecated CoreDebug DSCEMCR: SET_MON_PEND, Position */
+#define CoreDebug_DSCEMCR_SET_MON_PEND_Msk (1UL << CoreDebug_DSCEMCR_SET_MON_PEND_Pos)    /*!< \deprecated CoreDebug DSCEMCR: SET_MON_PEND, Mask */
+
+/* Debug Authentication Control Register Definitions */
+#define CoreDebug_DAUTHCTRL_UIDEN_Pos      10U                                            /*!< \deprecated CoreDebug DAUTHCTRL: UIDEN, Position */
+#define CoreDebug_DAUTHCTRL_UIDEN_Msk      (1UL << CoreDebug_DAUTHCTRL_UIDEN_Pos)         /*!< \deprecated CoreDebug DAUTHCTRL: UIDEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_UIDAPEN_Pos     9U                                            /*!< \deprecated CoreDebug DAUTHCTRL: UIDAPEN, Position */
+#define CoreDebug_DAUTHCTRL_UIDAPEN_Msk    (1UL << CoreDebug_DAUTHCTRL_UIDAPEN_Pos)       /*!< \deprecated CoreDebug DAUTHCTRL: UIDAPEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_FSDMA_Pos       8U                                            /*!< \deprecated CoreDebug DAUTHCTRL: FSDMA, Position */
+#define CoreDebug_DAUTHCTRL_FSDMA_Msk      (1UL << CoreDebug_DAUTHCTRL_FSDMA_Pos)         /*!< \deprecated CoreDebug DAUTHCTRL: FSDMA, Mask */
+
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+
+/* Debug Security Control and Status Register Definitions */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
+
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
+
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
+
+/*@} end of group CMSIS_CoreDebug */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+  __OM  uint32_t DSCEMCR;                /*!< Offset: 0x010 ( /W)  Debug Set Clear Exception and Monitor Control Register */
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_FPD_Pos                23U                                            /*!< DCB DHCSR: Floating-point registers Debuggable Position */
+#define DCB_DHCSR_S_FPD_Msk                (0x1UL << DCB_DHCSR_S_FPD_Pos)                 /*!< DCB DHCSR: Floating-point registers Debuggable Mask */
+
+#define DCB_DHCSR_S_SUIDE_Pos              22U                                            /*!< DCB DHCSR: Secure unprivileged halting debug enabled Position */
+#define DCB_DHCSR_S_SUIDE_Msk              (0x1UL << DCB_DHCSR_S_SUIDE_Pos)               /*!< DCB DHCSR: Secure unprivileged halting debug enabled Mask */
+
+#define DCB_DHCSR_S_NSUIDE_Pos             21U                                            /*!< DCB DHCSR: Non-secure unprivileged halting debug enabled Position */
+#define DCB_DHCSR_S_NSUIDE_Msk             (0x1UL << DCB_DHCSR_S_NSUIDE_Pos)              /*!< DCB DHCSR: Non-secure unprivileged halting debug enabled Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_PMOV_Pos                6U                                            /*!< DCB DHCSR: Halt on PMU overflow control Position */
+#define DCB_DHCSR_C_PMOV_Msk               (0x1UL << DCB_DHCSR_C_PMOV_Pos)                /*!< DCB DHCSR: Halt on PMU overflow control Mask */
+
+#define DCB_DHCSR_C_SNAPSTALL_Pos           5U                                            /*!< DCB DHCSR: Snap stall control Position */
+#define DCB_DHCSR_C_SNAPSTALL_Msk          (0x1UL << DCB_DHCSR_C_SNAPSTALL_Pos)           /*!< DCB DHCSR: Snap stall control Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_MONPRKEY_Pos             23U                                            /*!< DCB DEMCR: Monitor pend req key Position */
+#define DCB_DEMCR_MONPRKEY_Msk             (0x1UL << DCB_DEMCR_MONPRKEY_Pos)              /*!< DCB DEMCR: Monitor pend req key Mask */
+
+#define DCB_DEMCR_UMON_EN_Pos              21U                                            /*!< DCB DEMCR: Unprivileged monitor enable Position */
+#define DCB_DEMCR_UMON_EN_Msk              (0x1UL << DCB_DEMCR_UMON_EN_Pos)               /*!< DCB DEMCR: Unprivileged monitor enable Mask */
+
+#define DCB_DEMCR_SDME_Pos                 20U                                            /*!< DCB DEMCR: Secure DebugMonitor enable Position */
+#define DCB_DEMCR_SDME_Msk                 (0x1UL << DCB_DEMCR_SDME_Pos)                  /*!< DCB DEMCR: Secure DebugMonitor enable Mask */
+
+#define DCB_DEMCR_MON_REQ_Pos              19U                                            /*!< DCB DEMCR: Monitor request Position */
+#define DCB_DEMCR_MON_REQ_Msk              (0x1UL << DCB_DEMCR_MON_REQ_Pos)               /*!< DCB DEMCR: Monitor request Mask */
+
+#define DCB_DEMCR_MON_STEP_Pos             18U                                            /*!< DCB DEMCR: Monitor step Position */
+#define DCB_DEMCR_MON_STEP_Msk             (0x1UL << DCB_DEMCR_MON_STEP_Pos)              /*!< DCB DEMCR: Monitor step Mask */
+
+#define DCB_DEMCR_MON_PEND_Pos             17U                                            /*!< DCB DEMCR: Monitor pend Position */
+#define DCB_DEMCR_MON_PEND_Msk             (0x1UL << DCB_DEMCR_MON_PEND_Pos)              /*!< DCB DEMCR: Monitor pend Mask */
+
+#define DCB_DEMCR_MON_EN_Pos               16U                                            /*!< DCB DEMCR: Monitor enable Position */
+#define DCB_DEMCR_MON_EN_Msk               (0x1UL << DCB_DEMCR_MON_EN_Pos)                /*!< DCB DEMCR: Monitor enable Mask */
+
+#define DCB_DEMCR_VC_SFERR_Pos             11U                                            /*!< DCB DEMCR: Vector Catch SecureFault Position */
+#define DCB_DEMCR_VC_SFERR_Msk             (0x1UL << DCB_DEMCR_VC_SFERR_Pos)              /*!< DCB DEMCR: Vector Catch SecureFault Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_INTERR_Pos             9U                                            /*!< DCB DEMCR: Vector Catch interrupt errors Position */
+#define DCB_DEMCR_VC_INTERR_Msk            (0x1UL << DCB_DEMCR_VC_INTERR_Pos)             /*!< DCB DEMCR: Vector Catch interrupt errors Mask */
+
+#define DCB_DEMCR_VC_BUSERR_Pos             8U                                            /*!< DCB DEMCR: Vector Catch BusFault errors Position */
+#define DCB_DEMCR_VC_BUSERR_Msk            (0x1UL << DCB_DEMCR_VC_BUSERR_Pos)             /*!< DCB DEMCR: Vector Catch BusFault errors Mask */
+
+#define DCB_DEMCR_VC_STATERR_Pos            7U                                            /*!< DCB DEMCR: Vector Catch state errors Position */
+#define DCB_DEMCR_VC_STATERR_Msk           (0x1UL << DCB_DEMCR_VC_STATERR_Pos)            /*!< DCB DEMCR: Vector Catch state errors Mask */
+
+#define DCB_DEMCR_VC_CHKERR_Pos             6U                                            /*!< DCB DEMCR: Vector Catch check errors Position */
+#define DCB_DEMCR_VC_CHKERR_Msk            (0x1UL << DCB_DEMCR_VC_CHKERR_Pos)             /*!< DCB DEMCR: Vector Catch check errors Mask */
+
+#define DCB_DEMCR_VC_NOCPERR_Pos            5U                                            /*!< DCB DEMCR: Vector Catch NOCP errors Position */
+#define DCB_DEMCR_VC_NOCPERR_Msk           (0x1UL << DCB_DEMCR_VC_NOCPERR_Pos)            /*!< DCB DEMCR: Vector Catch NOCP errors Mask */
+
+#define DCB_DEMCR_VC_MMERR_Pos              4U                                            /*!< DCB DEMCR: Vector Catch MemManage errors Position */
+#define DCB_DEMCR_VC_MMERR_Msk             (0x1UL << DCB_DEMCR_VC_MMERR_Pos)              /*!< DCB DEMCR: Vector Catch MemManage errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DSCEMCR, Debug Set Clear Exception and Monitor Control Register Definitions */
+#define DCB_DSCEMCR_CLR_MON_REQ_Pos        19U                                            /*!< DCB DSCEMCR: Clear monitor request Position */
+#define DCB_DSCEMCR_CLR_MON_REQ_Msk        (0x1UL << DCB_DSCEMCR_CLR_MON_REQ_Pos)         /*!< DCB DSCEMCR: Clear monitor request Mask */
+
+#define DCB_DSCEMCR_CLR_MON_PEND_Pos       17U                                            /*!< DCB DSCEMCR: Clear monitor pend Position */
+#define DCB_DSCEMCR_CLR_MON_PEND_Msk       (0x1UL << DCB_DSCEMCR_CLR_MON_PEND_Pos)        /*!< DCB DSCEMCR: Clear monitor pend Mask */
+
+#define DCB_DSCEMCR_SET_MON_REQ_Pos         3U                                            /*!< DCB DSCEMCR: Set monitor request Position */
+#define DCB_DSCEMCR_SET_MON_REQ_Msk        (0x1UL << DCB_DSCEMCR_SET_MON_REQ_Pos)         /*!< DCB DSCEMCR: Set monitor request Mask */
+
+#define DCB_DSCEMCR_SET_MON_PEND_Pos        1U                                            /*!< DCB DSCEMCR: Set monitor pend Position */
+#define DCB_DSCEMCR_SET_MON_PEND_Msk       (0x1UL << DCB_DSCEMCR_SET_MON_PEND_Pos)        /*!< DCB DSCEMCR: Set monitor pend Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_UIDEN_Pos            10U                                            /*!< DCB DAUTHCTRL: Unprivileged Invasive Debug Enable Position */
+#define DCB_DAUTHCTRL_UIDEN_Msk            (0x1UL << DCB_DAUTHCTRL_UIDEN_Pos)             /*!< DCB DAUTHCTRL: Unprivileged Invasive Debug Enable Mask */
+
+#define DCB_DAUTHCTRL_UIDAPEN_Pos           9U                                            /*!< DCB DAUTHCTRL: Unprivileged Invasive DAP Access Enable Position */
+#define DCB_DAUTHCTRL_UIDAPEN_Msk          (0x1UL << DCB_DAUTHCTRL_UIDAPEN_Pos)           /*!< DCB DAUTHCTRL: Unprivileged Invasive DAP Access Enable Mask */
+
+#define DCB_DAUTHCTRL_FSDMA_Pos             8U                                            /*!< DCB DAUTHCTRL: Force Secure DebugMonitor Allowed Position */
+#define DCB_DAUTHCTRL_FSDMA_Msk            (0x1UL << DCB_DAUTHCTRL_FSDMA_Pos)             /*!< DCB DAUTHCTRL: Force Secure DebugMonitor Allowed Mask */
+
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SUNID_Pos          22U                                            /*!< DIB DAUTHSTATUS: Secure Unprivileged Non-invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_SUNID_Msk          (0x3UL << DIB_DAUTHSTATUS_SUNID_Pos )          /*!< DIB DAUTHSTATUS: Secure Unprivileged Non-invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_SUID_Pos           20U                                            /*!< DIB DAUTHSTATUS: Secure Unprivileged Invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_SUID_Msk           (0x3UL << DIB_DAUTHSTATUS_SUID_Pos )           /*!< DIB DAUTHSTATUS: Secure Unprivileged Invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_NSUNID_Pos         18U                                            /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Allo Position */
+#define DIB_DAUTHSTATUS_NSUNID_Msk         (0x3UL << DIB_DAUTHSTATUS_NSUNID_Pos )         /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Allo Mask */
+
+#define DIB_DAUTHSTATUS_NSUID_Pos          16U                                            /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_NSUID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSUID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_core_bitfield     Core register bit field macros
+  \brief      Macros for use with bit field definitions (xxx_Pos, xxx_Msk).
+  @{
+ */
+
+/**
+  \brief   Mask and shift a bit field value for use in a register bit range.
+  \param[in] field  Name of the register bit field.
+  \param[in] value  Value of the bit field. This parameter is interpreted as an uint32_t type.
+  \return           Masked and shifted value.
+*/
+#define _VAL2FLD(field, value)    (((uint32_t)(value) << field ## _Pos) & field ## _Msk)
+
+/**
+  \brief     Mask and shift a register value to extract a bit filed value.
+  \param[in] field  Name of the register bit field.
+  \param[in] value  Value of register. This parameter is interpreted as an uint32_t type.
+  \return           Masked and shifted bit field value.
+*/
+#define _FLD2VAL(field, value)    (((uint32_t)(value) & field ## _Msk) >> field ## _Pos)
+
+/*@} end of group CMSIS_core_bitfield */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_core_base     Core Definitions
+  \brief      Definitions for base addresses, unions, and structures.
+  @{
+ */
+
+/* Memory mapping of Core Hardware */
+  #define SCS_BASE            (0xE000E000UL)                             /*!< System Control Space Base Address */
+  #define ITM_BASE            (0xE0000000UL)                             /*!< ITM Base Address */
+  #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
+  #define MEMSYSCTL_BASE      (0xE001E000UL)                             /*!< Memory System Control Base Address */
+  #define ERRBNK_BASE         (0xE001E100UL)                             /*!< Error Banking Base Address */
+  #define PWRMODCTL_BASE      (0xE001E300UL)                             /*!< Power Mode Control Base Address */
+  #define EWIC_BASE           (0xE001E400UL)                             /*!< External Wakeup Interrupt Controller Base Address */
+  #define PRCCFGINF_BASE      (0xE001E700UL)                             /*!< Processor Configuration Information Base Address */
+  #define STL_BASE            (0xE001E800UL)                             /*!< Software Test Library Base Address */
+  #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
+  #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
+  #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
+  #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
+
+  #define ICB                 ((ICB_Type       *)     SCS_BASE         ) /*!< System control Register not in SCB */
+  #define SCB                 ((SCB_Type       *)     SCB_BASE         ) /*!< SCB configuration struct */
+  #define SysTick             ((SysTick_Type   *)     SysTick_BASE     ) /*!< SysTick configuration struct */
+  #define NVIC                ((NVIC_Type      *)     NVIC_BASE        ) /*!< NVIC configuration struct */
+  #define ITM                 ((ITM_Type       *)     ITM_BASE         ) /*!< ITM configuration struct */
+  #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
+  #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
+  #define MEMSYSCTL           ((MemSysCtl_Type *)     MEMSYSCTL_BASE   ) /*!< Memory System Control configuration struct */
+  #define ERRBNK              ((ErrBnk_Type    *)     ERRBNK_BASE      ) /*!< Error Banking configuration struct */
+  #define PWRMODCTL           ((PwrModCtl_Type *)     PWRMODCTL_BASE   ) /*!< Power Mode Control configuration struct */
+  #define EWIC                ((EWIC_Type      *)     EWIC_BASE        ) /*!< EWIC configuration struct */
+  #define PRCCFGINF           ((PrcCfgInf_Type *)     PRCCFGINF_BASE   ) /*!< Processor Configuration Information configuration struct */
+  #define STL                 ((STL_Type       *)     STL_BASE         ) /*!< Software Test Library configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
+
+  #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+    #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
+    #define MPU               ((MPU_Type       *)     MPU_BASE         ) /*!< Memory Protection Unit */
+  #endif
+
+  #if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+    #define PMU_BASE          (0xE0003000UL)                             /*!< PMU Base Address */
+    #define PMU               ((PMU_Type       *)     PMU_BASE         ) /*!< PMU configuration struct */
+  #endif
+
+  #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+    #define SAU_BASE          (SCS_BASE +  0x0DD0UL)                     /*!< Security Attribution Unit */
+    #define SAU               ((SAU_Type       *)     SAU_BASE         ) /*!< Security Attribution Unit */
+  #endif
+
+  #define FPU_BASE            (SCS_BASE +  0x0F30UL)                     /*!< Floating Point Unit */
+  #define FPU                 ((FPU_Type       *)     FPU_BASE         ) /*!< Floating Point Unit */
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+  #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
+  #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
+  #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
+  #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
+
+  #define ICB_NS              ((ICB_Type       *)     SCS_BASE_NS      ) /*!< System control Register not in SCB(non-secure address space) */
+  #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
+  #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
+  #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
+
+  #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+    #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
+    #define MPU_NS            ((MPU_Type       *)     MPU_BASE_NS      ) /*!< Memory Protection Unit            (non-secure address space) */
+  #endif
+
+  #define FPU_BASE_NS         (SCS_BASE_NS +  0x0F30UL)                  /*!< Floating Point Unit               (non-secure address space) */
+  #define FPU_NS              ((FPU_Type       *)     FPU_BASE_NS      ) /*!< Floating Point Unit               (non-secure address space) */
+
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+/*@} */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_register_aliases     Backwards Compatibility Aliases
+  \brief      Register alias definitions for backwards compatibility.
+  @{
+ */
+#define ID_ADR  (ID_AFR)    /*!< SCB Auxiliary Feature Register */
+
+/* 'SCnSCB' is deprecated and replaced by 'ICB' */
+typedef ICB_Type SCnSCB_Type;
+
+/* Auxiliary Control Register Definitions */
+#define SCnSCB_ACTLR_DISCRITAXIRUW_Pos   (ICB_ACTLR_DISCRITAXIRUW_Pos)
+#define SCnSCB_ACTLR_DISCRITAXIRUW_Msk   (ICB_ACTLR_DISCRITAXIRUW_Msk)
+
+#define SCnSCB_ACTLR_DISDI_Pos           (ICB_ACTLR_DISDI_Pos)
+#define SCnSCB_ACTLR_DISDI_Msk           (ICB_ACTLR_DISDI_Msk)
+
+#define SCnSCB_ACTLR_DISCRITAXIRUR_Pos   (ICB_ACTLR_DISCRITAXIRUR_Pos)
+#define SCnSCB_ACTLR_DISCRITAXIRUR_Msk   (ICB_ACTLR_DISCRITAXIRUR_Msk)
+
+#define SCnSCB_ACTLR_EVENTBUSEN_Pos      (ICB_ACTLR_EVENTBUSEN_Pos)
+#define SCnSCB_ACTLR_EVENTBUSEN_Msk      (ICB_ACTLR_EVENTBUSEN_Msk)
+
+#define SCnSCB_ACTLR_EVENTBUSEN_S_Pos    (ICB_ACTLR_EVENTBUSEN_S_Pos)
+#define SCnSCB_ACTLR_EVENTBUSEN_S_Msk    (ICB_ACTLR_EVENTBUSEN_S_Msk)
+
+#define SCnSCB_ACTLR_DISITMATBFLUSH_Pos  (ICB_ACTLR_DISITMATBFLUSH_Pos)
+#define SCnSCB_ACTLR_DISITMATBFLUSH_Msk  (ICB_ACTLR_DISITMATBFLUSH_Msk)
+
+#define SCnSCB_ACTLR_DISNWAMODE_Pos      (ICB_ACTLR_DISNWAMODE_Pos)
+#define SCnSCB_ACTLR_DISNWAMODE_Msk      (ICB_ACTLR_DISNWAMODE_Msk)
+
+#define SCnSCB_ACTLR_FPEXCODIS_Pos       (ICB_ACTLR_FPEXCODIS_Pos)
+#define SCnSCB_ACTLR_FPEXCODIS_Msk       (ICB_ACTLR_FPEXCODIS_Msk)
+
+#define SCnSCB_ACTLR_DISOLAP_Pos         (ICB_ACTLR_DISOLAP_Pos)
+#define SCnSCB_ACTLR_DISOLAP_Msk         (ICB_ACTLR_DISOLAP_Msk)
+
+#define SCnSCB_ACTLR_DISOLAPS_Pos        (ICB_ACTLR_DISOLAPS_Pos)
+#define SCnSCB_ACTLR_DISOLAPS_Msk        (ICB_ACTLR_DISOLAPS_Msk)
+
+#define SCnSCB_ACTLR_DISLOBR_Pos         (ICB_ACTLR_DISLOBR_Pos)
+#define SCnSCB_ACTLR_DISLOBR_Msk         (ICB_ACTLR_DISLOBR_Msk)
+
+#define SCnSCB_ACTLR_DISLO_Pos           (ICB_ACTLR_DISLO_Pos)
+#define SCnSCB_ACTLR_DISLO_Msk           (ICB_ACTLR_DISLO_Msk)
+
+#define SCnSCB_ACTLR_DISLOLEP_Pos        (ICB_ACTLR_DISLOLEP_Pos)
+#define SCnSCB_ACTLR_DISLOLEP_Msk        (ICB_ACTLR_DISLOLEP_Msk)
+
+#define SCnSCB_ACTLR_DISFOLD_Pos         (ICB_ACTLR_DISFOLD_Pos)
+#define SCnSCB_ACTLR_DISFOLD_Msk         (ICB_ACTLR_DISFOLD_Msk)
+
+/* Interrupt Controller Type Register Definitions */
+#define SCnSCB_ICTR_INTLINESNUM_Pos      (ICB_ICTR_INTLINESNUM_Pos)
+#define SCnSCB_ICTR_INTLINESNUM_Msk      (ICB_ICTR_INTLINESNUM_Msk)
+
+#define SCnSCB                           (ICB)
+#define SCnSCB_NS                        (ICB_NS)
+
+/*@} */
+
+
+/*******************************************************************************
+ *                Hardware Abstraction Layer
+  Core Function Interface contains:
+  - Core NVIC Functions
+  - Core SysTick Functions
+  - Core Debug Functions
+  - Core Register Access Functions
+ ******************************************************************************/
+/**
+  \defgroup CMSIS_Core_FunctionInterface Functions and Instructions Reference
+*/
+
+
+
+/* ##########################   NVIC functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_NVICFunctions NVIC Functions
+  \brief    Functions that manage interrupts and exceptions via the NVIC.
+  @{
+ */
+
+#ifdef CMSIS_NVIC_VIRTUAL
+  #ifndef CMSIS_NVIC_VIRTUAL_HEADER_FILE
+    #define CMSIS_NVIC_VIRTUAL_HEADER_FILE "cmsis_nvic_virtual.h"
+  #endif
+  #include CMSIS_NVIC_VIRTUAL_HEADER_FILE
+#else
+  #define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
+  #define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
+  #define NVIC_EnableIRQ              __NVIC_EnableIRQ
+  #define NVIC_GetEnableIRQ           __NVIC_GetEnableIRQ
+  #define NVIC_DisableIRQ             __NVIC_DisableIRQ
+  #define NVIC_GetPendingIRQ          __NVIC_GetPendingIRQ
+  #define NVIC_SetPendingIRQ          __NVIC_SetPendingIRQ
+  #define NVIC_ClearPendingIRQ        __NVIC_ClearPendingIRQ
+  #define NVIC_GetActive              __NVIC_GetActive
+  #define NVIC_SetPriority            __NVIC_SetPriority
+  #define NVIC_GetPriority            __NVIC_GetPriority
+  #define NVIC_SystemReset            __NVIC_SystemReset
+#endif /* CMSIS_NVIC_VIRTUAL */
+
+#ifdef CMSIS_VECTAB_VIRTUAL
+  #ifndef CMSIS_VECTAB_VIRTUAL_HEADER_FILE
+    #define CMSIS_VECTAB_VIRTUAL_HEADER_FILE "cmsis_vectab_virtual.h"
+  #endif
+  #include CMSIS_VECTAB_VIRTUAL_HEADER_FILE
+#else
+  #define NVIC_SetVector              __NVIC_SetVector
+  #define NVIC_GetVector              __NVIC_GetVector
+#endif  /* (CMSIS_VECTAB_VIRTUAL) */
+
+#define NVIC_USER_IRQ_OFFSET          16
+
+
+/* Special LR values for Secure/Non-Secure call handling and exception handling                                               */
+
+/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */
+#define FNC_RETURN                 (0xFEFFFFFFUL)     /* bit [0] ignored when processing a branch                             */
+
+/* The following EXC_RETURN mask values are used to evaluate the LR on exception entry */
+#define EXC_RETURN_PREFIX          (0xFF000000UL)     /* bits [31:24] set to indicate an EXC_RETURN value                     */
+#define EXC_RETURN_S               (0x00000040UL)     /* bit [6] stack used to push registers: 0=Non-secure 1=Secure          */
+#define EXC_RETURN_DCRS            (0x00000020UL)     /* bit [5] stacking rules for called registers: 0=skipped 1=saved       */
+#define EXC_RETURN_FTYPE           (0x00000010UL)     /* bit [4] allocate stack for floating-point context: 0=done 1=skipped  */
+#define EXC_RETURN_MODE            (0x00000008UL)     /* bit [3] processor mode for return: 0=Handler mode 1=Thread mode      */
+#define EXC_RETURN_SPSEL           (0x00000004UL)     /* bit [2] stack pointer used to restore context: 0=MSP 1=PSP           */
+#define EXC_RETURN_ES              (0x00000001UL)     /* bit [0] security state exception was taken to: 0=Non-secure 1=Secure */
+
+/* Integrity Signature (from ARMv8-M Architecture Reference Manual) for exception context stacking                            */
+#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)  /* Value for processors with floating-point extension:                  */
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125AUL)     /* bit [0] SFTC must match LR bit[4] EXC_RETURN_FTYPE                   */
+#else
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125BUL)     /* Value for processors without floating-point extension                */
+#endif
+
+
+/**
+  \brief   Set Priority Grouping
+  \details Sets the priority grouping field using the required unlock sequence.
+           The parameter PriorityGroup is assigned to the field SCB->AIRCR [10:8] PRIGROUP field.
+           Only values from 0..7 are used.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]      PriorityGroup  Priority grouping field.
+ */
+__STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
+{
+  uint32_t reg_value;
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);             /* only values 0..7 are used          */
+
+  reg_value  =  SCB->AIRCR;                                                   /* read old register configuration    */
+  reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
+  reg_value  =  (reg_value                                   |
+                ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)  );              /* Insert write key and priority group */
+  SCB->AIRCR =  reg_value;
+}
+
+
+/**
+  \brief   Get Priority Grouping
+  \details Reads the priority grouping field from the NVIC Interrupt Controller.
+  \return                Priority grouping field (SCB->AIRCR [10:8] PRIGROUP field).
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPriorityGrouping(void)
+{
+  return ((uint32_t)((SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) >> SCB_AIRCR_PRIGROUP_Pos));
+}
+
+
+/**
+  \brief   Enable Interrupt
+  \details Enables a device specific interrupt in the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    __COMPILER_BARRIER();
+    NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Enable status
+  \details Returns a device specific interrupt enable status from the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt is not enabled.
+  \return             1  Interrupt is enabled.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetEnableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Disable Interrupt
+  \details Disables a device specific interrupt in the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_DisableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __DSB();
+    __ISB();
+  }
+}
+
+
+/**
+  \brief   Get Pending Interrupt
+  \details Reads the NVIC pending register and returns the pending bit for the specified device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not pending.
+  \return             1  Interrupt status is pending.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ISPR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Pending Interrupt
+  \details Sets the pending bit of a device specific interrupt in the NVIC pending register.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_SetPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ISPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Clear Pending Interrupt
+  \details Clears the pending bit of a device specific interrupt in the NVIC pending register.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_ClearPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ICPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Active Interrupt
+  \details Reads the active register in the NVIC and returns the active bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not active.
+  \return             1  Interrupt status is active.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetActive(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->IABR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Interrupt Target State
+  \details Reads the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+  \return             1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_GetTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Interrupt Target State
+  \details Sets the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+                      1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_SetTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] |=  ((uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL)));
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Clear Interrupt Target State
+  \details Clears the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+                      1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_ClearTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] &= ~((uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL)));
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+
+/**
+  \brief   Set Interrupt Priority
+  \details Sets the priority of a device specific interrupt or a processor exception.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]      IRQn  Interrupt number.
+  \param [in]  priority  Priority to set.
+  \note    The priority cannot be set for every processor exception.
+ */
+__STATIC_INLINE void __NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->IPR[((uint32_t)IRQn)]               = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+  else
+  {
+    SCB->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Priority
+  \details Reads the priority of a device specific interrupt or a processor exception.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn  Interrupt number.
+  \return             Interrupt Priority.
+                      Value is aligned automatically to the implemented priority bits of the microcontroller.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPriority(IRQn_Type IRQn)
+{
+
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return(((uint32_t)NVIC->IPR[((uint32_t)IRQn)]               >> (8U - __NVIC_PRIO_BITS)));
+  }
+  else
+  {
+    return(((uint32_t)SCB->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] >> (8U - __NVIC_PRIO_BITS)));
+  }
+}
+
+
+/**
+  \brief   Encode Priority
+  \details Encodes the priority for an interrupt with the given priority group,
+           preemptive priority value, and subpriority value.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]     PriorityGroup  Used priority group.
+  \param [in]   PreemptPriority  Preemptive priority value (starting from 0).
+  \param [in]       SubPriority  Subpriority value (starting from 0).
+  \return                        Encoded priority. Value can be used in the function \ref NVIC_SetPriority().
+ */
+__STATIC_INLINE uint32_t NVIC_EncodePriority (uint32_t PriorityGroup, uint32_t PreemptPriority, uint32_t SubPriority)
+{
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);   /* only values 0..7 are used          */
+  uint32_t PreemptPriorityBits;
+  uint32_t SubPriorityBits;
+
+  PreemptPriorityBits = ((7UL - PriorityGroupTmp) > (uint32_t)(__NVIC_PRIO_BITS)) ? (uint32_t)(__NVIC_PRIO_BITS) : (uint32_t)(7UL - PriorityGroupTmp);
+  SubPriorityBits     = ((PriorityGroupTmp + (uint32_t)(__NVIC_PRIO_BITS)) < (uint32_t)7UL) ? (uint32_t)0UL : (uint32_t)((PriorityGroupTmp - 7UL) + (uint32_t)(__NVIC_PRIO_BITS));
+
+  return (
+           ((PreemptPriority & (uint32_t)((1UL << (PreemptPriorityBits)) - 1UL)) << SubPriorityBits) |
+           ((SubPriority     & (uint32_t)((1UL << (SubPriorityBits    )) - 1UL)))
+         );
+}
+
+
+/**
+  \brief   Decode Priority
+  \details Decodes an interrupt priority value with a given priority group to
+           preemptive priority value and subpriority value.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS) the smallest possible priority group is set.
+  \param [in]         Priority   Priority value, which can be retrieved with the function \ref NVIC_GetPriority().
+  \param [in]     PriorityGroup  Used priority group.
+  \param [out] pPreemptPriority  Preemptive priority value (starting from 0).
+  \param [out]     pSubPriority  Subpriority value (starting from 0).
+ */
+__STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGroup, uint32_t* const pPreemptPriority, uint32_t* const pSubPriority)
+{
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);   /* only values 0..7 are used          */
+  uint32_t PreemptPriorityBits;
+  uint32_t SubPriorityBits;
+
+  PreemptPriorityBits = ((7UL - PriorityGroupTmp) > (uint32_t)(__NVIC_PRIO_BITS)) ? (uint32_t)(__NVIC_PRIO_BITS) : (uint32_t)(7UL - PriorityGroupTmp);
+  SubPriorityBits     = ((PriorityGroupTmp + (uint32_t)(__NVIC_PRIO_BITS)) < (uint32_t)7UL) ? (uint32_t)0UL : (uint32_t)((PriorityGroupTmp - 7UL) + (uint32_t)(__NVIC_PRIO_BITS));
+
+  *pPreemptPriority = (Priority >> SubPriorityBits) & (uint32_t)((1UL << (PreemptPriorityBits)) - 1UL);
+  *pSubPriority     = (Priority                   ) & (uint32_t)((1UL << (SubPriorityBits    )) - 1UL);
+}
+
+
+/**
+  \brief   Set Interrupt Vector
+  \details Sets an interrupt vector in SRAM based interrupt vector table.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+           VTOR must been relocated to SRAM before.
+  \param [in]   IRQn      Interrupt number
+  \param [in]   vector    Address of interrupt handler function
+ */
+__STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
+{
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
+}
+
+
+/**
+  \brief   Get Interrupt Vector
+  \details Reads an interrupt vector from interrupt vector table.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn      Interrupt number.
+  \return                 Address of interrupt handler function
+ */
+__STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
+{
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  return vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET];
+}
+
+
+/**
+  \brief   System Reset
+  \details Initiates a system reset request to reset the MCU.
+ */
+__NO_RETURN __STATIC_INLINE void __NVIC_SystemReset(void)
+{
+  __DSB();                                                          /* Ensure all outstanding memory accesses included
+                                                                       buffered write are completed before reset */
+  SCB->AIRCR  = (uint32_t)((0x5FAUL << SCB_AIRCR_VECTKEY_Pos)    |
+                           (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) |
+                            SCB_AIRCR_SYSRESETREQ_Msk    );         /* Keep priority group unchanged */
+  __DSB();                                                          /* Ensure completion of memory access */
+
+  for(;;)                                                           /* wait until reset */
+  {
+    __NOP();
+  }
+}
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Priority Grouping (non-secure)
+  \details Sets the non-secure priority grouping field when in secure state using the required unlock sequence.
+           The parameter PriorityGroup is assigned to the field SCB->AIRCR [10:8] PRIGROUP field.
+           Only values from 0..7 are used.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]      PriorityGroup  Priority grouping field.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPriorityGrouping_NS(uint32_t PriorityGroup)
+{
+  uint32_t reg_value;
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);             /* only values 0..7 are used          */
+
+  reg_value  =  SCB_NS->AIRCR;                                                   /* read old register configuration    */
+  reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk));             /* clear bits to change               */
+  reg_value  =  (reg_value                                   |
+                ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)                      );              /* Insert write key and priority group */
+  SCB_NS->AIRCR =  reg_value;
+}
+
+
+/**
+  \brief   Get Priority Grouping (non-secure)
+  \details Reads the priority grouping field from the non-secure NVIC when in secure state.
+  \return                Priority grouping field (SCB->AIRCR [10:8] PRIGROUP field).
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPriorityGrouping_NS(void)
+{
+  return ((uint32_t)((SCB_NS->AIRCR & SCB_AIRCR_PRIGROUP_Msk) >> SCB_AIRCR_PRIGROUP_Pos));
+}
+
+
+/**
+  \brief   Enable Interrupt (non-secure)
+  \details Enables a device specific interrupt in the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_EnableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Enable status (non-secure)
+  \details Returns a device specific interrupt enable status from the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt is not enabled.
+  \return             1  Interrupt is enabled.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetEnableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->ISER[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Disable Interrupt (non-secure)
+  \details Disables a device specific interrupt in the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_DisableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Pending Interrupt (non-secure)
+  \details Reads the NVIC pending register in the non-secure NVIC when in secure state and returns the pending bit for the specified device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not pending.
+  \return             1  Interrupt status is pending.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->ISPR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Pending Interrupt (non-secure)
+  \details Sets the pending bit of a device specific interrupt in the non-secure NVIC pending register when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ISPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Clear Pending Interrupt (non-secure)
+  \details Clears the pending bit of a device specific interrupt in the non-secure NVIC pending register when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_ClearPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ICPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Active Interrupt (non-secure)
+  \details Reads the active register in non-secure NVIC when in secure state and returns the active bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not active.
+  \return             1  Interrupt status is active.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetActive_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->IABR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Interrupt Priority (non-secure)
+  \details Sets the priority of a non-secure device specific interrupt or a non-secure processor exception when in secure state.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]      IRQn  Interrupt number.
+  \param [in]  priority  Priority to set.
+  \note    The priority cannot be set for every non-secure processor exception.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPriority_NS(IRQn_Type IRQn, uint32_t priority)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->IPR[((uint32_t)IRQn)]               = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+  else
+  {
+    SCB_NS->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Priority (non-secure)
+  \details Reads the priority of a non-secure device specific interrupt or a non-secure processor exception when in secure state.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn  Interrupt number.
+  \return             Interrupt Priority. Value is aligned automatically to the implemented priority bits of the microcontroller.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPriority_NS(IRQn_Type IRQn)
+{
+
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return(((uint32_t)NVIC_NS->IPR[((uint32_t)IRQn)]               >> (8U - __NVIC_PRIO_BITS)));
+  }
+  else
+  {
+    return(((uint32_t)SCB_NS->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] >> (8U - __NVIC_PRIO_BITS)));
+  }
+}
+#endif /*  defined (__ARM_FEATURE_CMSE) &&(__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_NVICFunctions */
+
+/* ##########################  MPU functions  #################################### */
+
+#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+
+#include "mpu_armv8.h"
+
+#endif
+
+/* ##########################  PMU functions and events  #################################### */
+
+#if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+
+#include "pmu_armv8.h"
+
+/**
+  \brief   Cortex-M55 PMU events
+  \note    Architectural PMU events can be found in pmu_armv8.h
+*/
+
+#define ARMCM55_PMU_ECC_ERR                          0xC000             /*!< Any ECC error */
+#define ARMCM55_PMU_ECC_ERR_FATAL                    0xC001             /*!< Any fatal ECC error */
+#define ARMCM55_PMU_ECC_ERR_DCACHE                   0xC010             /*!< Any ECC error in the data cache */
+#define ARMCM55_PMU_ECC_ERR_ICACHE                   0xC011             /*!< Any ECC error in the instruction cache */
+#define ARMCM55_PMU_ECC_ERR_FATAL_DCACHE             0xC012             /*!< Any fatal ECC error in the data cache */
+#define ARMCM55_PMU_ECC_ERR_FATAL_ICACHE             0xC013             /*!< Any fatal ECC error in the instruction cache*/
+#define ARMCM55_PMU_ECC_ERR_DTCM                     0xC020             /*!< Any ECC error in the DTCM */
+#define ARMCM55_PMU_ECC_ERR_ITCM                     0xC021             /*!< Any ECC error in the ITCM */
+#define ARMCM55_PMU_ECC_ERR_FATAL_DTCM               0xC022             /*!< Any fatal ECC error in the DTCM */
+#define ARMCM55_PMU_ECC_ERR_FATAL_ITCM               0xC023             /*!< Any fatal ECC error in the ITCM */
+#define ARMCM55_PMU_PF_LINEFILL                      0xC100             /*!< A prefetcher starts a line-fill */
+#define ARMCM55_PMU_PF_CANCEL                        0xC101             /*!< A prefetcher stops prefetching */
+#define ARMCM55_PMU_PF_DROP_LINEFILL                 0xC102             /*!< A linefill triggered by a prefetcher has been dropped because of lack of buffering */
+#define ARMCM55_PMU_NWAMODE_ENTER                    0xC200             /*!< No write-allocate mode entry */
+#define ARMCM55_PMU_NWAMODE                          0xC201             /*!< Write-allocate store is not allocated into the data cache due to no-write-allocate mode */
+#define ARMCM55_PMU_SAHB_ACCESS                      0xC300             /*!< Read or write access on the S-AHB interface to the TCM */
+#define ARMCM55_PMU_PAHB_ACCESS                      0xC301             /*!< Read or write access to the P-AHB write interface */
+#define ARMCM55_PMU_AXI_WRITE_ACCESS                 0xC302             /*!< Any beat access to M-AXI write interface */
+#define ARMCM55_PMU_AXI_READ_ACCESS                  0xC303             /*!< Any beat access to M-AXI read interface */
+#define ARMCM55_PMU_DOSTIMEOUT_DOUBLE                0xC400             /*!< Denial of Service timeout has fired twice and caused buffers to drain to allow forward progress */
+#define ARMCM55_PMU_DOSTIMEOUT_TRIPLE                0xC401             /*!< Denial of Service timeout has fired three times and blocked the LSU to force forward progress */
+
+#endif
+
+/* ##########################  FPU functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_FpuFunctions FPU Functions
+  \brief    Function that provides FPU type.
+  @{
+ */
+
+/**
+  \brief   get FPU type
+  \details returns the FPU type
+  \returns
+   - \b  0: No FPU
+   - \b  1: Single precision FPU
+   - \b  2: Double + Single precision FPU
+ */
+__STATIC_INLINE uint32_t SCB_GetFPUType(void)
+{
+  uint32_t mvfr0;
+
+  mvfr0 = FPU->MVFR0;
+  if      ((mvfr0 & (FPU_MVFR0_FPSP_Msk | FPU_MVFR0_FPDP_Msk)) == 0x220U)
+  {
+    return 2U;           /* Double + Single precision FPU */
+  }
+  else if ((mvfr0 & (FPU_MVFR0_FPSP_Msk | FPU_MVFR0_FPDP_Msk)) == 0x020U)
+  {
+    return 1U;           /* Single precision FPU */
+  }
+  else
+  {
+    return 0U;           /* No FPU */
+  }
+}
+
+
+/*@} end of CMSIS_Core_FpuFunctions */
+
+/* ##########################  MVE functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_MveFunctions MVE Functions
+  \brief    Function that provides MVE type.
+  @{
+ */
+
+/**
+  \brief   get MVE type
+  \details returns the MVE type
+  \returns
+   - \b  0: No Vector Extension (MVE)
+   - \b  1: Integer Vector Extension (MVE-I)
+   - \b  2: Floating-point Vector Extension (MVE-F)
+ */
+__STATIC_INLINE uint32_t SCB_GetMVEType(void)
+{
+  const uint32_t mvfr1 = FPU->MVFR1;
+  if      ((mvfr1 & FPU_MVFR1_MVE_Msk) == (0x2U << FPU_MVFR1_MVE_Pos))
+  {
+    return 2U;
+  }
+  else if ((mvfr1 & FPU_MVFR1_MVE_Msk) == (0x1U << FPU_MVFR1_MVE_Pos))
+  {
+    return 1U;
+  }
+  else
+  {
+    return 0U;
+  }
+}
+
+
+/*@} end of CMSIS_Core_MveFunctions */
+
+
+/* ##########################  Cache functions  #################################### */
+
+#if ((defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)) || \
+     (defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)))
+#include "cachel1_armv7.h"
+#endif
+
+
+/* ##########################   SAU functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_SAUFunctions SAU Functions
+  \brief    Functions that configure the SAU.
+  @{
+ */
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+
+/**
+  \brief   Enable SAU
+  \details Enables the Security Attribution Unit (SAU).
+ */
+__STATIC_INLINE void TZ_SAU_Enable(void)
+{
+    SAU->CTRL |=  (SAU_CTRL_ENABLE_Msk);
+}
+
+
+
+/**
+  \brief   Disable SAU
+  \details Disables the Security Attribution Unit (SAU).
+ */
+__STATIC_INLINE void TZ_SAU_Disable(void)
+{
+    SAU->CTRL &= ~(SAU_CTRL_ENABLE_Msk);
+}
+
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_SAUFunctions */
+
+
+
+
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    SysTick function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_SysTickFunctions SysTick Functions
+  \brief    Functions that configure the System.
+  @{
+ */
+
+#if defined (__Vendor_SysTickConfig) && (__Vendor_SysTickConfig == 0U)
+
+/**
+  \brief   System Tick Configuration
+  \details Initializes the System Timer and its interrupt, and starts the System Tick Timer.
+           Counter is in free running mode to generate periodic interrupts.
+  \param [in]  ticks  Number of ticks between two interrupts.
+  \return          0  Function succeeded.
+  \return          1  Function failed.
+  \note    When the variable <b>__Vendor_SysTickConfig</b> is set to 1, then the
+           function <b>SysTick_Config</b> is not included. In this case, the file <b><i>device</i>.h</b>
+           must contain a vendor-specific implementation of this function.
+ */
+__STATIC_INLINE uint32_t SysTick_Config(uint32_t ticks)
+{
+  if ((ticks - 1UL) > SysTick_LOAD_RELOAD_Msk)
+  {
+    return (1UL);                                                   /* Reload value impossible */
+  }
+
+  SysTick->LOAD  = (uint32_t)(ticks - 1UL);                         /* set reload register */
+  NVIC_SetPriority (SysTick_IRQn, (1UL << __NVIC_PRIO_BITS) - 1UL); /* set Priority for Systick Interrupt */
+  SysTick->VAL   = 0UL;                                             /* Load the SysTick Counter Value */
+  SysTick->CTRL  = SysTick_CTRL_CLKSOURCE_Msk |
+                   SysTick_CTRL_TICKINT_Msk   |
+                   SysTick_CTRL_ENABLE_Msk;                         /* Enable SysTick IRQ and SysTick Timer */
+  return (0UL);                                                     /* Function successful */
+}
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   System Tick Configuration (non-secure)
+  \details Initializes the non-secure System Timer and its interrupt when in secure state, and starts the System Tick Timer.
+           Counter is in free running mode to generate periodic interrupts.
+  \param [in]  ticks  Number of ticks between two interrupts.
+  \return          0  Function succeeded.
+  \return          1  Function failed.
+  \note    When the variable <b>__Vendor_SysTickConfig</b> is set to 1, then the
+           function <b>TZ_SysTick_Config_NS</b> is not included. In this case, the file <b><i>device</i>.h</b>
+           must contain a vendor-specific implementation of this function.
+
+ */
+__STATIC_INLINE uint32_t TZ_SysTick_Config_NS(uint32_t ticks)
+{
+  if ((ticks - 1UL) > SysTick_LOAD_RELOAD_Msk)
+  {
+    return (1UL);                                                         /* Reload value impossible */
+  }
+
+  SysTick_NS->LOAD  = (uint32_t)(ticks - 1UL);                            /* set reload register */
+  TZ_NVIC_SetPriority_NS (SysTick_IRQn, (1UL << __NVIC_PRIO_BITS) - 1UL); /* set Priority for Systick Interrupt */
+  SysTick_NS->VAL   = 0UL;                                                /* Load the SysTick Counter Value */
+  SysTick_NS->CTRL  = SysTick_CTRL_CLKSOURCE_Msk |
+                      SysTick_CTRL_TICKINT_Msk   |
+                      SysTick_CTRL_ENABLE_Msk;                            /* Enable SysTick IRQ and SysTick Timer */
+  return (0UL);                                                           /* Function successful */
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+#endif
+
+/*@} end of CMSIS_Core_SysTickFunctions */
+
+
+
+/* ##################################### Debug In/Output function ########################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_core_DebugFunctions ITM Functions
+  \brief    Functions that access the ITM debug interface.
+  @{
+ */
+
+extern volatile int32_t ITM_RxBuffer;                              /*!< External variable to receive characters. */
+#define                 ITM_RXBUFFER_EMPTY  ((int32_t)0x5AA55AA5U) /*!< Value identifying \ref ITM_RxBuffer is ready for next character. */
+
+
+/**
+  \brief   ITM Send Character
+  \details Transmits a character via the ITM channel 0, and
+           \li Just returns when no debugger is connected that has booked the output.
+           \li Is blocking when a debugger is connected, but the previous character sent has not been transmitted.
+  \param [in]     ch  Character to transmit.
+  \returns            Character to transmit.
+ */
+__STATIC_INLINE uint32_t ITM_SendChar (uint32_t ch)
+{
+  if (((ITM->TCR & ITM_TCR_ITMENA_Msk) != 0UL) &&      /* ITM enabled */
+      ((ITM->TER & 1UL               ) != 0UL)   )     /* ITM Port #0 enabled */
+  {
+    while (ITM->PORT[0U].u32 == 0UL)
+    {
+      __NOP();
+    }
+    ITM->PORT[0U].u8 = (uint8_t)ch;
+  }
+  return (ch);
+}
+
+
+/**
+  \brief   ITM Receive Character
+  \details Inputs a character via the external variable \ref ITM_RxBuffer.
+  \return             Received character.
+  \return         -1  No character pending.
+ */
+__STATIC_INLINE int32_t ITM_ReceiveChar (void)
+{
+  int32_t ch = -1;                           /* no character available */
+
+  if (ITM_RxBuffer != ITM_RXBUFFER_EMPTY)
+  {
+    ch = ITM_RxBuffer;
+    ITM_RxBuffer = ITM_RXBUFFER_EMPTY;       /* ready for next character */
+  }
+
+  return (ch);
+}
+
+
+/**
+  \brief   ITM Check Character
+  \details Checks whether a character is pending for reading in the variable \ref ITM_RxBuffer.
+  \return          0  No character available.
+  \return          1  Character available.
+ */
+__STATIC_INLINE int32_t ITM_CheckChar (void)
+{
+
+  if (ITM_RxBuffer == ITM_RXBUFFER_EMPTY)
+  {
+    return (0);                              /* no character available */
+  }
+  else
+  {
+    return (1);                              /*    character available */
+  }
+}
+
+/*@} end of CMSIS_core_DebugFunctions */
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CORE_CM55_H_DEPENDANT */
+
+#endif /* __CMSIS_GENERIC */
diff --git a/lib/cmsis/inc/core_cm7.h b/lib/cmsis/inc/core_cm7.h
index 41f9afb64daff..010506e9fa430 100644
--- a/lib/cmsis/inc/core_cm7.h
+++ b/lib/cmsis/inc/core_cm7.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_cm7.h
  * @brief    CMSIS Cortex-M7 Core Peripheral Access Layer Header File
- * @version  V5.1.0
- * @date     13. March 2019
+ * @version  V5.1.6
+ * @date     04. June 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -209,6 +209,11 @@
     #warning "__DTCM_PRESENT        not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -496,7 +501,8 @@ typedef struct
   __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
   __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
   __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
-        uint32_t RESERVED7[6U];
+  __OM  uint32_t BPIALL;                 /*!< Offset: 0x278 ( /W)  Branch Predictor Invalidate All */
+        uint32_t RESERVED7[5U];
   __IOM uint32_t ITCMCR;                 /*!< Offset: 0x290 (R/W)  Instruction Tightly-Coupled Memory Control Register */
   __IOM uint32_t DTCMCR;                 /*!< Offset: 0x294 (R/W)  Data Tightly-Coupled Memory Control Registers */
   __IOM uint32_t AHBPCR;                 /*!< Offset: 0x298 (R/W)  AHBP Control Register */
@@ -671,22 +677,22 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MLSPERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 5U)               /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
 #define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -870,21 +876,24 @@ typedef struct
 #define SCB_CACR_FORCEWT_Pos                2U                                            /*!< SCB CACR: FORCEWT Position */
 #define SCB_CACR_FORCEWT_Msk               (1UL << SCB_CACR_FORCEWT_Pos)                  /*!< SCB CACR: FORCEWT Mask */
 
-#define SCB_CACR_ECCEN_Pos                  1U                                            /*!< SCB CACR: ECCEN Position */
-#define SCB_CACR_ECCEN_Msk                 (1UL << SCB_CACR_ECCEN_Pos)                    /*!< SCB CACR: ECCEN Mask */
+#define SCB_CACR_ECCEN_Pos                  1U                                            /*!< \deprecated SCB CACR: ECCEN Position */
+#define SCB_CACR_ECCEN_Msk                 (1UL << SCB_CACR_ECCEN_Pos)                    /*!< \deprecated SCB CACR: ECCEN Mask */
+
+#define SCB_CACR_ECCDIS_Pos                 1U                                            /*!< SCB CACR: ECCDIS Position */
+#define SCB_CACR_ECCDIS_Msk                (1UL << SCB_CACR_ECCDIS_Pos)                   /*!< SCB CACR: ECCDIS Mask */
 
 #define SCB_CACR_SIWT_Pos                   0U                                            /*!< SCB CACR: SIWT Position */
 #define SCB_CACR_SIWT_Msk                  (1UL /*<< SCB_CACR_SIWT_Pos*/)                 /*!< SCB CACR: SIWT Mask */
 
 /* AHBS Control Register Definitions */
 #define SCB_AHBSCR_INITCOUNT_Pos           11U                                            /*!< SCB AHBSCR: INITCOUNT Position */
-#define SCB_AHBSCR_INITCOUNT_Msk           (0x1FUL << SCB_AHBPCR_INITCOUNT_Pos)           /*!< SCB AHBSCR: INITCOUNT Mask */
+#define SCB_AHBSCR_INITCOUNT_Msk           (0x1FUL << SCB_AHBSCR_INITCOUNT_Pos)           /*!< SCB AHBSCR: INITCOUNT Mask */
 
 #define SCB_AHBSCR_TPRI_Pos                 2U                                            /*!< SCB AHBSCR: TPRI Position */
-#define SCB_AHBSCR_TPRI_Msk                (0x1FFUL << SCB_AHBPCR_TPRI_Pos)               /*!< SCB AHBSCR: TPRI Mask */
+#define SCB_AHBSCR_TPRI_Msk                (0x1FFUL << SCB_AHBSCR_TPRI_Pos)               /*!< SCB AHBSCR: TPRI Mask */
 
 #define SCB_AHBSCR_CTL_Pos                  0U                                            /*!< SCB AHBSCR: CTL Position*/
-#define SCB_AHBSCR_CTL_Msk                 (3UL /*<< SCB_AHBPCR_CTL_Pos*/)                /*!< SCB AHBSCR: CTL Mask */
+#define SCB_AHBSCR_CTL_Msk                 (3UL /*<< SCB_AHBSCR_CTL_Pos*/)                /*!< SCB AHBSCR: CTL Mask */
 
 /* Auxiliary Bus Fault Status Register Definitions */
 #define SCB_ABFSR_AXIMTYPE_Pos              8U                                            /*!< SCB ABFSR: AXIMTYPE Position*/
@@ -1903,7 +1912,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -2126,8 +2137,9 @@ __STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGr
  */
 __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
-  uint32_t vectors = (uint32_t )SCB->VTOR;
-  (* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4)) = vector;
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
 }
 
 
@@ -2141,8 +2153,8 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
  */
 __STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
 {
-  uint32_t vectors = (uint32_t )SCB->VTOR;
-  return (uint32_t)(* (int *) (vectors + ((int32_t)IRQn + NVIC_USER_IRQ_OFFSET) * 4));
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  return vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET];
 }
 
 
@@ -2215,349 +2227,12 @@ __STATIC_INLINE uint32_t SCB_GetFPUType(void)
 /*@} end of CMSIS_Core_FpuFunctions */
 
 
-
 /* ##########################  Cache functions  #################################### */
-/**
-  \ingroup  CMSIS_Core_FunctionInterface
-  \defgroup CMSIS_Core_CacheFunctions Cache Functions
-  \brief    Functions that configure Instruction and Data cache.
-  @{
- */
-
-/* Cache Size ID Register Macros */
-#define CCSIDR_WAYS(x)         (((x) & SCB_CCSIDR_ASSOCIATIVITY_Msk) >> SCB_CCSIDR_ASSOCIATIVITY_Pos)
-#define CCSIDR_SETS(x)         (((x) & SCB_CCSIDR_NUMSETS_Msk      ) >> SCB_CCSIDR_NUMSETS_Pos      )
-
-#define __SCB_DCACHE_LINE_SIZE  32U /*!< Cortex-M7 cache line size is fixed to 32 bytes (8 words). See also register SCB_CCSIDR */
-
-/**
-  \brief   Enable I-Cache
-  \details Turns on I-Cache
-  */
-__STATIC_FORCEINLINE void SCB_EnableICache (void)
-{
-  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
-    if (SCB->CCR & SCB_CCR_IC_Msk) return;  /* return if ICache is already enabled */
-
-    __DSB();
-    __ISB();
-    SCB->ICIALLU = 0UL;                     /* invalidate I-Cache */
-    __DSB();
-    __ISB();
-    SCB->CCR |=  (uint32_t)SCB_CCR_IC_Msk;  /* enable I-Cache */
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   Disable I-Cache
-  \details Turns off I-Cache
-  */
-__STATIC_FORCEINLINE void SCB_DisableICache (void)
-{
-  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
-    __DSB();
-    __ISB();
-    SCB->CCR &= ~(uint32_t)SCB_CCR_IC_Msk;  /* disable I-Cache */
-    SCB->ICIALLU = 0UL;                     /* invalidate I-Cache */
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   Invalidate I-Cache
-  \details Invalidates I-Cache
-  */
-__STATIC_FORCEINLINE void SCB_InvalidateICache (void)
-{
-  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
-    __DSB();
-    __ISB();
-    SCB->ICIALLU = 0UL;
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   Enable D-Cache
-  \details Turns on D-Cache
-  */
-__STATIC_FORCEINLINE void SCB_EnableDCache (void)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    uint32_t ccsidr;
-    uint32_t sets;
-    uint32_t ways;
-
-    if (SCB->CCR & SCB_CCR_DC_Msk) return;  /* return if DCache is already enabled */
-
-    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
-    __DSB();
-
-    ccsidr = SCB->CCSIDR;
-
-                                            /* invalidate D-Cache */
-    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
-    do {
-      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
-      do {
-        SCB->DCISW = (((sets << SCB_DCISW_SET_Pos) & SCB_DCISW_SET_Msk) |
-                      ((ways << SCB_DCISW_WAY_Pos) & SCB_DCISW_WAY_Msk)  );
-        #if defined ( __CC_ARM )
-          __schedule_barrier();
-        #endif
-      } while (ways-- != 0U);
-    } while(sets-- != 0U);
-    __DSB();
-
-    SCB->CCR |=  (uint32_t)SCB_CCR_DC_Msk;  /* enable D-Cache */
-
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   Disable D-Cache
-  \details Turns off D-Cache
-  */
-__STATIC_FORCEINLINE void SCB_DisableDCache (void)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    uint32_t ccsidr;
-    uint32_t sets;
-    uint32_t ways;
-
-    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
-    __DSB();
-
-    SCB->CCR &= ~(uint32_t)SCB_CCR_DC_Msk;  /* disable D-Cache */
-    __DSB();
-
-    ccsidr = SCB->CCSIDR;
-
-                                            /* clean & invalidate D-Cache */
-    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
-    do {
-      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
-      do {
-        SCB->DCCISW = (((sets << SCB_DCCISW_SET_Pos) & SCB_DCCISW_SET_Msk) |
-                       ((ways << SCB_DCCISW_WAY_Pos) & SCB_DCCISW_WAY_Msk)  );
-        #if defined ( __CC_ARM )
-          __schedule_barrier();
-        #endif
-      } while (ways-- != 0U);
-    } while(sets-- != 0U);
-
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   Invalidate D-Cache
-  \details Invalidates D-Cache
-  */
-__STATIC_FORCEINLINE void SCB_InvalidateDCache (void)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    uint32_t ccsidr;
-    uint32_t sets;
-    uint32_t ways;
-
-    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
-    __DSB();
-
-    ccsidr = SCB->CCSIDR;
-
-                                            /* invalidate D-Cache */
-    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
-    do {
-      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
-      do {
-        SCB->DCISW = (((sets << SCB_DCISW_SET_Pos) & SCB_DCISW_SET_Msk) |
-                      ((ways << SCB_DCISW_WAY_Pos) & SCB_DCISW_WAY_Msk)  );
-        #if defined ( __CC_ARM )
-          __schedule_barrier();
-        #endif
-      } while (ways-- != 0U);
-    } while(sets-- != 0U);
-
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   Clean D-Cache
-  \details Cleans D-Cache
-  */
-__STATIC_FORCEINLINE void SCB_CleanDCache (void)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    uint32_t ccsidr;
-    uint32_t sets;
-    uint32_t ways;
-
-    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
-    __DSB();
-
-    ccsidr = SCB->CCSIDR;
-
-                                            /* clean D-Cache */
-    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
-    do {
-      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
-      do {
-        SCB->DCCSW = (((sets << SCB_DCCSW_SET_Pos) & SCB_DCCSW_SET_Msk) |
-                      ((ways << SCB_DCCSW_WAY_Pos) & SCB_DCCSW_WAY_Msk)  );
-        #if defined ( __CC_ARM )
-          __schedule_barrier();
-        #endif
-      } while (ways-- != 0U);
-    } while(sets-- != 0U);
-
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   Clean & Invalidate D-Cache
-  \details Cleans and Invalidates D-Cache
-  */
-__STATIC_FORCEINLINE void SCB_CleanInvalidateDCache (void)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    uint32_t ccsidr;
-    uint32_t sets;
-    uint32_t ways;
-
-    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
-    __DSB();
-
-    ccsidr = SCB->CCSIDR;
-
-                                            /* clean & invalidate D-Cache */
-    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
-    do {
-      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
-      do {
-        SCB->DCCISW = (((sets << SCB_DCCISW_SET_Pos) & SCB_DCCISW_SET_Msk) |
-                       ((ways << SCB_DCCISW_WAY_Pos) & SCB_DCCISW_WAY_Msk)  );
-        #if defined ( __CC_ARM )
-          __schedule_barrier();
-        #endif
-      } while (ways-- != 0U);
-    } while(sets-- != 0U);
-
-    __DSB();
-    __ISB();
-  #endif
-}
-
-
-/**
-  \brief   D-Cache Invalidate by address
-  \details Invalidates D-Cache for the given address.
-           D-Cache is invalidated starting from a 32 byte aligned address in 32 byte granularity.
-           D-Cache memory blocks which are part of given address + given size are invalidated.
-  \param[in]   addr    address
-  \param[in]   dsize   size of memory block (in number of bytes)
-*/
-__STATIC_FORCEINLINE void SCB_InvalidateDCache_by_Addr (void *addr, int32_t dsize)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    if ( dsize > 0 ) { 
-       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
-      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
-    
-      __DSB();
-
-      do {
-        SCB->DCIMVAC = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
-        op_addr += __SCB_DCACHE_LINE_SIZE;
-        op_size -= __SCB_DCACHE_LINE_SIZE;
-      } while ( op_size > 0 );
-
-      __DSB();
-      __ISB();
-    }
-  #endif
-}
-
-
-/**
-  \brief   D-Cache Clean by address
-  \details Cleans D-Cache for the given address
-           D-Cache is cleaned starting from a 32 byte aligned address in 32 byte granularity.
-           D-Cache memory blocks which are part of given address + given size are cleaned.
-  \param[in]   addr    address
-  \param[in]   dsize   size of memory block (in number of bytes)
-*/
-__STATIC_FORCEINLINE void SCB_CleanDCache_by_Addr (uint32_t *addr, int32_t dsize)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    if ( dsize > 0 ) { 
-       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
-      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
-    
-      __DSB();
-
-      do {
-        SCB->DCCMVAC = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
-        op_addr += __SCB_DCACHE_LINE_SIZE;
-        op_size -= __SCB_DCACHE_LINE_SIZE;
-      } while ( op_size > 0 );
-
-      __DSB();
-      __ISB();
-    }
-  #endif
-}
-
-
-/**
-  \brief   D-Cache Clean and Invalidate by address
-  \details Cleans and invalidates D_Cache for the given address
-           D-Cache is cleaned and invalidated starting from a 32 byte aligned address in 32 byte granularity.
-           D-Cache memory blocks which are part of given address + given size are cleaned and invalidated.
-  \param[in]   addr    address (aligned to 32-byte boundary)
-  \param[in]   dsize   size of memory block (in number of bytes)
-*/
-__STATIC_FORCEINLINE void SCB_CleanInvalidateDCache_by_Addr (uint32_t *addr, int32_t dsize)
-{
-  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
-    if ( dsize > 0 ) { 
-       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
-      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
-    
-      __DSB();
-
-      do {
-        SCB->DCCIMVAC = op_addr;            /* register accepts only 32byte aligned values, only bits 31..5 are valid */
-        op_addr +=          __SCB_DCACHE_LINE_SIZE;
-        op_size -=          __SCB_DCACHE_LINE_SIZE;
-      } while ( op_size > 0 );
-
-      __DSB();
-      __ISB();
-    }
-  #endif
-}
-
-/*@} end of CMSIS_Core_CacheFunctions */
 
+#if ((defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)) || \
+     (defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)))
+#include "cachel1_armv7.h"
+#endif
 
 
 /* ##################################    SysTick function  ############################################ */
diff --git a/lib/cmsis/inc/core_cm85.h b/lib/cmsis/inc/core_cm85.h
new file mode 100644
index 0000000000000..60463111897f8
--- /dev/null
+++ b/lib/cmsis/inc/core_cm85.h
@@ -0,0 +1,4672 @@
+/**************************************************************************//**
+ * @file     core_cm85.h
+ * @brief    CMSIS Cortex-M85 Core Peripheral Access Layer Header File
+ * @version  V1.0.4
+ * @date     21. April 2022
+ ******************************************************************************/
+/*
+ * Copyright (c) 2022 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
+ *
+ * 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.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include                        /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
+#endif
+
+#ifndef __CORE_CM85_H_GENERIC
+#define __CORE_CM85_H_GENERIC
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/**
+  \page CMSIS_MISRA_Exceptions  MISRA-C:2004 Compliance Exceptions
+  CMSIS violates the following MISRA-C:2004 rules:
+
+   \li Required Rule 8.5, object/function definition in header file.<br>
+     Function definitions in header files are used to allow 'inlining'.
+
+   \li Required Rule 18.4, declaration of union type or object of union type: '{...}'.<br>
+     Unions are used for effective representation of core registers.
+
+   \li Advisory Rule 19.7, Function-like macro defined.<br>
+     Function-like macros are used to allow more efficient code.
+ */
+
+
+/*******************************************************************************
+ *                 CMSIS definitions
+ ******************************************************************************/
+/**
+  \ingroup Cortex_M85
+  @{
+ */
+
+#include "cmsis_version.h"
+
+/*  CMSIS CM85 definitions */
+
+#define __CORTEX_M                      (85U)                                 /*!< Cortex-M Core */
+
+#if defined ( __CC_ARM )
+  #error Legacy Arm Compiler does not support Armv8.1-M target architecture.
+#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #if defined __ARM_FP
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined(__ARM_FEATURE_DSP)
+    #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED       0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __GNUC__ )
+  #if defined (__VFP_FP__) && !defined(__SOFTFP__)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined(__ARM_FEATURE_DSP)
+    #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __ICCARM__ )
+  #if defined __ARMVFP__
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined(__ARM_FEATURE_DSP)
+    #if defined(__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __TI_ARM__ )
+  #if defined __TI_VFP_SUPPORT__
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#elif defined ( __TASKING__ )
+  #if defined __FPU_VFP__
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#elif defined ( __CSMC__ )
+  #if ( __CSMC__ & 0x400U)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#endif
+
+#include "cmsis_compiler.h"               /* CMSIS compiler specific defines */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CORE_CM85_H_GENERIC */
+
+#ifndef __CMSIS_GENERIC
+
+#ifndef __CORE_CM85_H_DEPENDANT
+#define __CORE_CM85_H_DEPENDANT
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* check device defines and use defaults */
+#if defined __CHECK_DEVICE_DEFINES
+  #ifndef __CM85_REV
+    #define __CM85_REV               0x0001U
+    #warning "__CM85_REV not defined in device header file; using default!"
+  #endif
+
+  #ifndef __FPU_PRESENT
+    #define __FPU_PRESENT             0U
+    #warning "__FPU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #if __FPU_PRESENT != 0U
+    #ifndef __FPU_DP
+      #define __FPU_DP             0U
+      #warning "__FPU_DP not defined in device header file; using default!"
+    #endif
+  #endif
+
+  #ifndef __MPU_PRESENT
+    #define __MPU_PRESENT             0U
+    #warning "__MPU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __ICACHE_PRESENT
+    #define __ICACHE_PRESENT          0U
+    #warning "__ICACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DCACHE_PRESENT
+    #define __DCACHE_PRESENT          0U
+    #warning "__DCACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __PMU_PRESENT
+    #define __PMU_PRESENT             0U
+    #warning "__PMU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #if __PMU_PRESENT != 0U
+    #ifndef __PMU_NUM_EVENTCNT
+      #define __PMU_NUM_EVENTCNT      8U
+      #warning "__PMU_NUM_EVENTCNT not defined in device header file; using default!"
+    #elif (__PMU_NUM_EVENTCNT > 8 || __PMU_NUM_EVENTCNT < 2)
+    #error "__PMU_NUM_EVENTCNT is out of range in device header file!" */
+    #endif
+  #endif
+
+  #ifndef __SAUREGION_PRESENT
+    #define __SAUREGION_PRESENT       0U
+    #warning "__SAUREGION_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DSP_PRESENT
+    #define __DSP_PRESENT             0U
+    #warning "__DSP_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __NVIC_PRIO_BITS
+    #define __NVIC_PRIO_BITS          3U
+    #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
+  #endif
+
+  #ifndef __Vendor_SysTickConfig
+    #define __Vendor_SysTickConfig    0U
+    #warning "__Vendor_SysTickConfig not defined in device header file; using default!"
+  #endif
+#endif
+
+/* IO definitions (access restrictions to peripheral registers) */
+/**
+    \defgroup CMSIS_glob_defs CMSIS Global Defines
+
+    <strong>IO Type Qualifiers</strong> are used
+    \li to specify the access to peripheral variables.
+    \li for automatic generation of peripheral register debug information.
+*/
+#ifdef __cplusplus
+  #define   __I     volatile             /*!< Defines 'read only' permissions */
+#else
+  #define   __I     volatile const       /*!< Defines 'read only' permissions */
+#endif
+#define     __O     volatile             /*!< Defines 'write only' permissions */
+#define     __IO    volatile             /*!< Defines 'read / write' permissions */
+
+/* following defines should be used for structure members */
+#define     __IM     volatile const      /*! Defines 'read only' structure member permissions */
+#define     __OM     volatile            /*! Defines 'write only' structure member permissions */
+#define     __IOM    volatile            /*! Defines 'read / write' structure member permissions */
+
+/*@} end of group Cortex_M85 */
+
+
+
+/*******************************************************************************
+ *                 Register Abstraction
+  Core Register contain:
+  - Core Register
+  - Core NVIC Register
+  - Core EWIC Register
+  - Core SCB Register
+  - Core SysTick Register
+  - Core Debug Register
+  - Core PMU Register
+  - Core MPU Register
+  - Core SAU Register
+  - Core FPU Register
+ ******************************************************************************/
+/**
+  \defgroup CMSIS_core_register Defines and Type Definitions
+  \brief Type definitions and defines for Cortex-M processor based devices.
+*/
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_CORE  Status and Control Registers
+  \brief      Core Register type definitions.
+  @{
+ */
+
+/**
+  \brief  Union type to access the Application Program Status Register (APSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t _reserved0:16;              /*!< bit:  0..15  Reserved */
+    uint32_t GE:4;                       /*!< bit: 16..19  Greater than or Equal flags */
+    uint32_t _reserved1:7;               /*!< bit: 20..26  Reserved */
+    uint32_t Q:1;                        /*!< bit:     27  Saturation condition flag */
+    uint32_t V:1;                        /*!< bit:     28  Overflow condition code flag */
+    uint32_t C:1;                        /*!< bit:     29  Carry condition code flag */
+    uint32_t Z:1;                        /*!< bit:     30  Zero condition code flag */
+    uint32_t N:1;                        /*!< bit:     31  Negative condition code flag */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} APSR_Type;
+
+/* APSR Register Definitions */
+#define APSR_N_Pos                         31U                                            /*!< APSR: N Position */
+#define APSR_N_Msk                         (1UL << APSR_N_Pos)                            /*!< APSR: N Mask */
+
+#define APSR_Z_Pos                         30U                                            /*!< APSR: Z Position */
+#define APSR_Z_Msk                         (1UL << APSR_Z_Pos)                            /*!< APSR: Z Mask */
+
+#define APSR_C_Pos                         29U                                            /*!< APSR: C Position */
+#define APSR_C_Msk                         (1UL << APSR_C_Pos)                            /*!< APSR: C Mask */
+
+#define APSR_V_Pos                         28U                                            /*!< APSR: V Position */
+#define APSR_V_Msk                         (1UL << APSR_V_Pos)                            /*!< APSR: V Mask */
+
+#define APSR_Q_Pos                         27U                                            /*!< APSR: Q Position */
+#define APSR_Q_Msk                         (1UL << APSR_Q_Pos)                            /*!< APSR: Q Mask */
+
+#define APSR_GE_Pos                        16U                                            /*!< APSR: GE Position */
+#define APSR_GE_Msk                        (0xFUL << APSR_GE_Pos)                         /*!< APSR: GE Mask */
+
+
+/**
+  \brief  Union type to access the Interrupt Program Status Register (IPSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t ISR:9;                      /*!< bit:  0.. 8  Exception number */
+    uint32_t _reserved0:23;              /*!< bit:  9..31  Reserved */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} IPSR_Type;
+
+/* IPSR Register Definitions */
+#define IPSR_ISR_Pos                        0U                                            /*!< IPSR: ISR Position */
+#define IPSR_ISR_Msk                       (0x1FFUL /*<< IPSR_ISR_Pos*/)                  /*!< IPSR: ISR Mask */
+
+
+/**
+  \brief  Union type to access the Special-Purpose Program Status Registers (xPSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t ISR:9;                      /*!< bit:  0.. 8  Exception number */
+    uint32_t _reserved0:7;               /*!< bit:  9..15  Reserved */
+    uint32_t GE:4;                       /*!< bit: 16..19  Greater than or Equal flags */
+    uint32_t _reserved1:1;               /*!< bit:     20  Reserved */
+    uint32_t B:1;                        /*!< bit:     21  BTI active       (read 0) */
+    uint32_t _reserved2:2;               /*!< bit: 22..23  Reserved */
+    uint32_t T:1;                        /*!< bit:     24  Thumb bit        (read 0) */
+    uint32_t IT:2;                       /*!< bit: 25..26  saved IT state   (read 0) */
+    uint32_t Q:1;                        /*!< bit:     27  Saturation condition flag */
+    uint32_t V:1;                        /*!< bit:     28  Overflow condition code flag */
+    uint32_t C:1;                        /*!< bit:     29  Carry condition code flag */
+    uint32_t Z:1;                        /*!< bit:     30  Zero condition code flag */
+    uint32_t N:1;                        /*!< bit:     31  Negative condition code flag */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} xPSR_Type;
+
+/* xPSR Register Definitions */
+#define xPSR_N_Pos                         31U                                            /*!< xPSR: N Position */
+#define xPSR_N_Msk                         (1UL << xPSR_N_Pos)                            /*!< xPSR: N Mask */
+
+#define xPSR_Z_Pos                         30U                                            /*!< xPSR: Z Position */
+#define xPSR_Z_Msk                         (1UL << xPSR_Z_Pos)                            /*!< xPSR: Z Mask */
+
+#define xPSR_C_Pos                         29U                                            /*!< xPSR: C Position */
+#define xPSR_C_Msk                         (1UL << xPSR_C_Pos)                            /*!< xPSR: C Mask */
+
+#define xPSR_V_Pos                         28U                                            /*!< xPSR: V Position */
+#define xPSR_V_Msk                         (1UL << xPSR_V_Pos)                            /*!< xPSR: V Mask */
+
+#define xPSR_Q_Pos                         27U                                            /*!< xPSR: Q Position */
+#define xPSR_Q_Msk                         (1UL << xPSR_Q_Pos)                            /*!< xPSR: Q Mask */
+
+#define xPSR_IT_Pos                        25U                                            /*!< xPSR: IT Position */
+#define xPSR_IT_Msk                        (3UL << xPSR_IT_Pos)                           /*!< xPSR: IT Mask */
+
+#define xPSR_T_Pos                         24U                                            /*!< xPSR: T Position */
+#define xPSR_T_Msk                         (1UL << xPSR_T_Pos)                            /*!< xPSR: T Mask */
+
+#define xPSR_B_Pos                         21U                                            /*!< xPSR: B Position */
+#define xPSR_B_Msk                         (1UL << xPSR_B_Pos)                            /*!< xPSR: B Mask */
+
+#define xPSR_GE_Pos                        16U                                            /*!< xPSR: GE Position */
+#define xPSR_GE_Msk                        (0xFUL << xPSR_GE_Pos)                         /*!< xPSR: GE Mask */
+
+#define xPSR_ISR_Pos                        0U                                            /*!< xPSR: ISR Position */
+#define xPSR_ISR_Msk                       (0x1FFUL /*<< xPSR_ISR_Pos*/)                  /*!< xPSR: ISR Mask */
+
+
+/**
+  \brief  Union type to access the Control Registers (CONTROL).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t nPRIV:1;                    /*!< bit:      0  Execution privilege in Thread mode */
+    uint32_t SPSEL:1;                    /*!< bit:      1  Stack-pointer select */
+    uint32_t FPCA:1;                     /*!< bit:      2  Floating-point context active */
+    uint32_t SFPA:1;                     /*!< bit:      3  Secure floating-point active */
+    uint32_t BTI_EN:1;                   /*!< bit:      4  Privileged branch target identification enable */
+    uint32_t UBTI_EN:1;                  /*!< bit:      5  Unprivileged branch target identification enable */
+    uint32_t PAC_EN:1;                   /*!< bit:      6  Privileged pointer authentication enable */
+    uint32_t UPAC_EN:1;                  /*!< bit:      7  Unprivileged pointer authentication enable */
+    uint32_t _reserved1:24;              /*!< bit:  8..31  Reserved */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} CONTROL_Type;
+
+/* CONTROL Register Definitions */
+#define CONTROL_UPAC_EN_Pos                 7U                                            /*!< CONTROL: UPAC_EN Position */
+#define CONTROL_UPAC_EN_Msk                (1UL << CONTROL_UPAC_EN_Pos)                   /*!< CONTROL: UPAC_EN Mask */
+
+#define CONTROL_PAC_EN_Pos                  6U                                            /*!< CONTROL: PAC_EN Position */
+#define CONTROL_PAC_EN_Msk                 (1UL << CONTROL_PAC_EN_Pos)                    /*!< CONTROL: PAC_EN Mask */
+
+#define CONTROL_UBTI_EN_Pos                 5U                                            /*!< CONTROL: UBTI_EN Position */
+#define CONTROL_UBTI_EN_Msk                (1UL << CONTROL_UBTI_EN_Pos)                   /*!< CONTROL: UBTI_EN Mask */
+
+#define CONTROL_BTI_EN_Pos                  4U                                            /*!< CONTROL: BTI_EN Position */
+#define CONTROL_BTI_EN_Msk                 (1UL << CONTROL_BTI_EN_Pos)                    /*!< CONTROL: BTI_EN Mask */
+
+#define CONTROL_SFPA_Pos                    3U                                            /*!< CONTROL: SFPA Position */
+#define CONTROL_SFPA_Msk                   (1UL << CONTROL_SFPA_Pos)                      /*!< CONTROL: SFPA Mask */
+
+#define CONTROL_FPCA_Pos                    2U                                            /*!< CONTROL: FPCA Position */
+#define CONTROL_FPCA_Msk                   (1UL << CONTROL_FPCA_Pos)                      /*!< CONTROL: FPCA Mask */
+
+#define CONTROL_SPSEL_Pos                   1U                                            /*!< CONTROL: SPSEL Position */
+#define CONTROL_SPSEL_Msk                  (1UL << CONTROL_SPSEL_Pos)                     /*!< CONTROL: SPSEL Mask */
+
+#define CONTROL_nPRIV_Pos                   0U                                            /*!< CONTROL: nPRIV Position */
+#define CONTROL_nPRIV_Msk                  (1UL /*<< CONTROL_nPRIV_Pos*/)                 /*!< CONTROL: nPRIV Mask */
+
+/*@} end of group CMSIS_CORE */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_NVIC  Nested Vectored Interrupt Controller (NVIC)
+  \brief      Type definitions for the NVIC Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Nested Vectored Interrupt Controller (NVIC).
+ */
+typedef struct
+{
+  __IOM uint32_t ISER[16U];              /*!< Offset: 0x000 (R/W)  Interrupt Set Enable Register */
+        uint32_t RESERVED0[16U];
+  __IOM uint32_t ICER[16U];              /*!< Offset: 0x080 (R/W)  Interrupt Clear Enable Register */
+        uint32_t RSERVED1[16U];
+  __IOM uint32_t ISPR[16U];              /*!< Offset: 0x100 (R/W)  Interrupt Set Pending Register */
+        uint32_t RESERVED2[16U];
+  __IOM uint32_t ICPR[16U];              /*!< Offset: 0x180 (R/W)  Interrupt Clear Pending Register */
+        uint32_t RESERVED3[16U];
+  __IOM uint32_t IABR[16U];              /*!< Offset: 0x200 (R/W)  Interrupt Active bit Register */
+        uint32_t RESERVED4[16U];
+  __IOM uint32_t ITNS[16U];              /*!< Offset: 0x280 (R/W)  Interrupt Non-Secure State Register */
+        uint32_t RESERVED5[16U];
+  __IOM uint8_t  IPR[496U];              /*!< Offset: 0x300 (R/W)  Interrupt Priority Register (8Bit wide) */
+        uint32_t RESERVED6[580U];
+  __OM  uint32_t STIR;                   /*!< Offset: 0xE00 ( /W)  Software Trigger Interrupt Register */
+}  NVIC_Type;
+
+/* Software Triggered Interrupt Register Definitions */
+#define NVIC_STIR_INTID_Pos                 0U                                         /*!< STIR: INTLINESNUM Position */
+#define NVIC_STIR_INTID_Msk                (0x1FFUL /*<< NVIC_STIR_INTID_Pos*/)        /*!< STIR: INTLINESNUM Mask */
+
+/*@} end of group CMSIS_NVIC */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SCB     System Control Block (SCB)
+  \brief    Type definitions for the System Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the System Control Block (SCB).
+ */
+typedef struct
+{
+  __IM  uint32_t CPUID;                  /*!< Offset: 0x000 (R/ )  CPUID Base Register */
+  __IOM uint32_t ICSR;                   /*!< Offset: 0x004 (R/W)  Interrupt Control and State Register */
+  __IOM uint32_t VTOR;                   /*!< Offset: 0x008 (R/W)  Vector Table Offset Register */
+  __IOM uint32_t AIRCR;                  /*!< Offset: 0x00C (R/W)  Application Interrupt and Reset Control Register */
+  __IOM uint32_t SCR;                    /*!< Offset: 0x010 (R/W)  System Control Register */
+  __IOM uint32_t CCR;                    /*!< Offset: 0x014 (R/W)  Configuration Control Register */
+  __IOM uint8_t  SHPR[12U];              /*!< Offset: 0x018 (R/W)  System Handlers Priority Registers (4-7, 8-11, 12-15) */
+  __IOM uint32_t SHCSR;                  /*!< Offset: 0x024 (R/W)  System Handler Control and State Register */
+  __IOM uint32_t CFSR;                   /*!< Offset: 0x028 (R/W)  Configurable Fault Status Register */
+  __IOM uint32_t HFSR;                   /*!< Offset: 0x02C (R/W)  HardFault Status Register */
+  __IOM uint32_t DFSR;                   /*!< Offset: 0x030 (R/W)  Debug Fault Status Register */
+  __IOM uint32_t MMFAR;                  /*!< Offset: 0x034 (R/W)  MemManage Fault Address Register */
+  __IOM uint32_t BFAR;                   /*!< Offset: 0x038 (R/W)  BusFault Address Register */
+  __IOM uint32_t AFSR;                   /*!< Offset: 0x03C (R/W)  Auxiliary Fault Status Register */
+  __IM  uint32_t ID_PFR[2U];             /*!< Offset: 0x040 (R/ )  Processor Feature Register */
+  __IM  uint32_t ID_DFR;                 /*!< Offset: 0x048 (R/ )  Debug Feature Register */
+  __IM  uint32_t ID_AFR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
+  __IM  uint32_t ID_MMFR[4U];            /*!< Offset: 0x050 (R/ )  Memory Model Feature Register */
+  __IM  uint32_t ID_ISAR[6U];            /*!< Offset: 0x060 (R/ )  Instruction Set Attributes Register */
+  __IM  uint32_t CLIDR;                  /*!< Offset: 0x078 (R/ )  Cache Level ID register */
+  __IM  uint32_t CTR;                    /*!< Offset: 0x07C (R/ )  Cache Type register */
+  __IM  uint32_t CCSIDR;                 /*!< Offset: 0x080 (R/ )  Cache Size ID Register */
+  __IOM uint32_t CSSELR;                 /*!< Offset: 0x084 (R/W)  Cache Size Selection Register */
+  __IOM uint32_t CPACR;                  /*!< Offset: 0x088 (R/W)  Coprocessor Access Control Register */
+  __IOM uint32_t NSACR;                  /*!< Offset: 0x08C (R/W)  Non-Secure Access Control Register */
+        uint32_t RESERVED7[21U];
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x0E4 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x0E8 (R/W)  Secure Fault Address Register */
+        uint32_t RESERVED3[69U];
+  __OM  uint32_t STIR;                   /*!< Offset: 0x200 ( /W)  Software Triggered Interrupt Register */
+  __IOM uint32_t RFSR;                   /*!< Offset: 0x204 (R/W)  RAS Fault Status Register */
+        uint32_t RESERVED4[14U];
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x240 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x244 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x248 (R/ )  Media and VFP Feature Register 2 */
+        uint32_t RESERVED5[1U];
+  __OM  uint32_t ICIALLU;                /*!< Offset: 0x250 ( /W)  I-Cache Invalidate All to PoU */
+        uint32_t RESERVED6[1U];
+  __OM  uint32_t ICIMVAU;                /*!< Offset: 0x258 ( /W)  I-Cache Invalidate by MVA to PoU */
+  __OM  uint32_t DCIMVAC;                /*!< Offset: 0x25C ( /W)  D-Cache Invalidate by MVA to PoC */
+  __OM  uint32_t DCISW;                  /*!< Offset: 0x260 ( /W)  D-Cache Invalidate by Set-way */
+  __OM  uint32_t DCCMVAU;                /*!< Offset: 0x264 ( /W)  D-Cache Clean by MVA to PoU */
+  __OM  uint32_t DCCMVAC;                /*!< Offset: 0x268 ( /W)  D-Cache Clean by MVA to PoC */
+  __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
+  __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
+  __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
+  __OM  uint32_t BPIALL;                 /*!< Offset: 0x278 ( /W)  Branch Predictor Invalidate All */
+} SCB_Type;
+
+/* SCB CPUID Register Definitions */
+#define SCB_CPUID_IMPLEMENTER_Pos          24U                                            /*!< SCB CPUID: IMPLEMENTER Position */
+#define SCB_CPUID_IMPLEMENTER_Msk          (0xFFUL << SCB_CPUID_IMPLEMENTER_Pos)          /*!< SCB CPUID: IMPLEMENTER Mask */
+
+#define SCB_CPUID_VARIANT_Pos              20U                                            /*!< SCB CPUID: VARIANT Position */
+#define SCB_CPUID_VARIANT_Msk              (0xFUL << SCB_CPUID_VARIANT_Pos)               /*!< SCB CPUID: VARIANT Mask */
+
+#define SCB_CPUID_ARCHITECTURE_Pos         16U                                            /*!< SCB CPUID: ARCHITECTURE Position */
+#define SCB_CPUID_ARCHITECTURE_Msk         (0xFUL << SCB_CPUID_ARCHITECTURE_Pos)          /*!< SCB CPUID: ARCHITECTURE Mask */
+
+#define SCB_CPUID_PARTNO_Pos                4U                                            /*!< SCB CPUID: PARTNO Position */
+#define SCB_CPUID_PARTNO_Msk               (0xFFFUL << SCB_CPUID_PARTNO_Pos)              /*!< SCB CPUID: PARTNO Mask */
+
+#define SCB_CPUID_REVISION_Pos              0U                                            /*!< SCB CPUID: REVISION Position */
+#define SCB_CPUID_REVISION_Msk             (0xFUL /*<< SCB_CPUID_REVISION_Pos*/)          /*!< SCB CPUID: REVISION Mask */
+
+/* SCB Interrupt Control State Register Definitions */
+#define SCB_ICSR_PENDNMISET_Pos            31U                                            /*!< SCB ICSR: PENDNMISET Position */
+#define SCB_ICSR_PENDNMISET_Msk            (1UL << SCB_ICSR_PENDNMISET_Pos)               /*!< SCB ICSR: PENDNMISET Mask */
+
+#define SCB_ICSR_NMIPENDSET_Pos            SCB_ICSR_PENDNMISET_Pos                        /*!< SCB ICSR: NMIPENDSET Position, backward compatibility */
+#define SCB_ICSR_NMIPENDSET_Msk            SCB_ICSR_PENDNMISET_Msk                        /*!< SCB ICSR: NMIPENDSET Mask, backward compatibility */
+
+#define SCB_ICSR_PENDNMICLR_Pos            30U                                            /*!< SCB ICSR: PENDNMICLR Position */
+#define SCB_ICSR_PENDNMICLR_Msk            (1UL << SCB_ICSR_PENDNMICLR_Pos)               /*!< SCB ICSR: PENDNMICLR Mask */
+
+#define SCB_ICSR_PENDSVSET_Pos             28U                                            /*!< SCB ICSR: PENDSVSET Position */
+#define SCB_ICSR_PENDSVSET_Msk             (1UL << SCB_ICSR_PENDSVSET_Pos)                /*!< SCB ICSR: PENDSVSET Mask */
+
+#define SCB_ICSR_PENDSVCLR_Pos             27U                                            /*!< SCB ICSR: PENDSVCLR Position */
+#define SCB_ICSR_PENDSVCLR_Msk             (1UL << SCB_ICSR_PENDSVCLR_Pos)                /*!< SCB ICSR: PENDSVCLR Mask */
+
+#define SCB_ICSR_PENDSTSET_Pos             26U                                            /*!< SCB ICSR: PENDSTSET Position */
+#define SCB_ICSR_PENDSTSET_Msk             (1UL << SCB_ICSR_PENDSTSET_Pos)                /*!< SCB ICSR: PENDSTSET Mask */
+
+#define SCB_ICSR_PENDSTCLR_Pos             25U                                            /*!< SCB ICSR: PENDSTCLR Position */
+#define SCB_ICSR_PENDSTCLR_Msk             (1UL << SCB_ICSR_PENDSTCLR_Pos)                /*!< SCB ICSR: PENDSTCLR Mask */
+
+#define SCB_ICSR_STTNS_Pos                 24U                                            /*!< SCB ICSR: STTNS Position (Security Extension) */
+#define SCB_ICSR_STTNS_Msk                 (1UL << SCB_ICSR_STTNS_Pos)                    /*!< SCB ICSR: STTNS Mask (Security Extension) */
+
+#define SCB_ICSR_ISRPREEMPT_Pos            23U                                            /*!< SCB ICSR: ISRPREEMPT Position */
+#define SCB_ICSR_ISRPREEMPT_Msk            (1UL << SCB_ICSR_ISRPREEMPT_Pos)               /*!< SCB ICSR: ISRPREEMPT Mask */
+
+#define SCB_ICSR_ISRPENDING_Pos            22U                                            /*!< SCB ICSR: ISRPENDING Position */
+#define SCB_ICSR_ISRPENDING_Msk            (1UL << SCB_ICSR_ISRPENDING_Pos)               /*!< SCB ICSR: ISRPENDING Mask */
+
+#define SCB_ICSR_VECTPENDING_Pos           12U                                            /*!< SCB ICSR: VECTPENDING Position */
+#define SCB_ICSR_VECTPENDING_Msk           (0x1FFUL << SCB_ICSR_VECTPENDING_Pos)          /*!< SCB ICSR: VECTPENDING Mask */
+
+#define SCB_ICSR_RETTOBASE_Pos             11U                                            /*!< SCB ICSR: RETTOBASE Position */
+#define SCB_ICSR_RETTOBASE_Msk             (1UL << SCB_ICSR_RETTOBASE_Pos)                /*!< SCB ICSR: RETTOBASE Mask */
+
+#define SCB_ICSR_VECTACTIVE_Pos             0U                                            /*!< SCB ICSR: VECTACTIVE Position */
+#define SCB_ICSR_VECTACTIVE_Msk            (0x1FFUL /*<< SCB_ICSR_VECTACTIVE_Pos*/)       /*!< SCB ICSR: VECTACTIVE Mask */
+
+/* SCB Vector Table Offset Register Definitions */
+#define SCB_VTOR_TBLOFF_Pos                 7U                                            /*!< SCB VTOR: TBLOFF Position */
+#define SCB_VTOR_TBLOFF_Msk                (0x1FFFFFFUL << SCB_VTOR_TBLOFF_Pos)           /*!< SCB VTOR: TBLOFF Mask */
+
+/* SCB Application Interrupt and Reset Control Register Definitions */
+#define SCB_AIRCR_VECTKEY_Pos              16U                                            /*!< SCB AIRCR: VECTKEY Position */
+#define SCB_AIRCR_VECTKEY_Msk              (0xFFFFUL << SCB_AIRCR_VECTKEY_Pos)            /*!< SCB AIRCR: VECTKEY Mask */
+
+#define SCB_AIRCR_VECTKEYSTAT_Pos          16U                                            /*!< SCB AIRCR: VECTKEYSTAT Position */
+#define SCB_AIRCR_VECTKEYSTAT_Msk          (0xFFFFUL << SCB_AIRCR_VECTKEYSTAT_Pos)        /*!< SCB AIRCR: VECTKEYSTAT Mask */
+
+#define SCB_AIRCR_ENDIANESS_Pos            15U                                            /*!< SCB AIRCR: ENDIANESS Position */
+#define SCB_AIRCR_ENDIANESS_Msk            (1UL << SCB_AIRCR_ENDIANESS_Pos)               /*!< SCB AIRCR: ENDIANESS Mask */
+
+#define SCB_AIRCR_PRIS_Pos                 14U                                            /*!< SCB AIRCR: PRIS Position */
+#define SCB_AIRCR_PRIS_Msk                 (1UL << SCB_AIRCR_PRIS_Pos)                    /*!< SCB AIRCR: PRIS Mask */
+
+#define SCB_AIRCR_BFHFNMINS_Pos            13U                                            /*!< SCB AIRCR: BFHFNMINS Position */
+#define SCB_AIRCR_BFHFNMINS_Msk            (1UL << SCB_AIRCR_BFHFNMINS_Pos)               /*!< SCB AIRCR: BFHFNMINS Mask */
+
+#define SCB_AIRCR_PRIGROUP_Pos              8U                                            /*!< SCB AIRCR: PRIGROUP Position */
+#define SCB_AIRCR_PRIGROUP_Msk             (7UL << SCB_AIRCR_PRIGROUP_Pos)                /*!< SCB AIRCR: PRIGROUP Mask */
+
+#define SCB_AIRCR_IESB_Pos                  5U                                            /*!< SCB AIRCR: Implicit ESB Enable Position */
+#define SCB_AIRCR_IESB_Msk                 (1UL << SCB_AIRCR_IESB_Pos)                    /*!< SCB AIRCR: Implicit ESB Enable Mask */
+
+#define SCB_AIRCR_DIT_Pos                   4U                                            /*!< SCB AIRCR: Data Independent Timing Position */
+#define SCB_AIRCR_DIT_Msk                  (1UL << SCB_AIRCR_DIT_Pos)                     /*!< SCB AIRCR: Data Independent Timing Mask */
+
+#define SCB_AIRCR_SYSRESETREQS_Pos          3U                                            /*!< SCB AIRCR: SYSRESETREQS Position */
+#define SCB_AIRCR_SYSRESETREQS_Msk         (1UL << SCB_AIRCR_SYSRESETREQS_Pos)            /*!< SCB AIRCR: SYSRESETREQS Mask */
+
+#define SCB_AIRCR_SYSRESETREQ_Pos           2U                                            /*!< SCB AIRCR: SYSRESETREQ Position */
+#define SCB_AIRCR_SYSRESETREQ_Msk          (1UL << SCB_AIRCR_SYSRESETREQ_Pos)             /*!< SCB AIRCR: SYSRESETREQ Mask */
+
+#define SCB_AIRCR_VECTCLRACTIVE_Pos         1U                                            /*!< SCB AIRCR: VECTCLRACTIVE Position */
+#define SCB_AIRCR_VECTCLRACTIVE_Msk        (1UL << SCB_AIRCR_VECTCLRACTIVE_Pos)           /*!< SCB AIRCR: VECTCLRACTIVE Mask */
+
+/* SCB System Control Register Definitions */
+#define SCB_SCR_SEVONPEND_Pos               4U                                            /*!< SCB SCR: SEVONPEND Position */
+#define SCB_SCR_SEVONPEND_Msk              (1UL << SCB_SCR_SEVONPEND_Pos)                 /*!< SCB SCR: SEVONPEND Mask */
+
+#define SCB_SCR_SLEEPDEEPS_Pos              3U                                            /*!< SCB SCR: SLEEPDEEPS Position */
+#define SCB_SCR_SLEEPDEEPS_Msk             (1UL << SCB_SCR_SLEEPDEEPS_Pos)                /*!< SCB SCR: SLEEPDEEPS Mask */
+
+#define SCB_SCR_SLEEPDEEP_Pos               2U                                            /*!< SCB SCR: SLEEPDEEP Position */
+#define SCB_SCR_SLEEPDEEP_Msk              (1UL << SCB_SCR_SLEEPDEEP_Pos)                 /*!< SCB SCR: SLEEPDEEP Mask */
+
+#define SCB_SCR_SLEEPONEXIT_Pos             1U                                            /*!< SCB SCR: SLEEPONEXIT Position */
+#define SCB_SCR_SLEEPONEXIT_Msk            (1UL << SCB_SCR_SLEEPONEXIT_Pos)               /*!< SCB SCR: SLEEPONEXIT Mask */
+
+/* SCB Configuration Control Register Definitions */
+#define SCB_CCR_TRD_Pos                    20U                                            /*!< SCB CCR: TRD Position */
+#define SCB_CCR_TRD_Msk                    (1UL << SCB_CCR_TRD_Pos)                       /*!< SCB CCR: TRD Mask */
+
+#define SCB_CCR_LOB_Pos                    19U                                            /*!< SCB CCR: LOB Position */
+#define SCB_CCR_LOB_Msk                    (1UL << SCB_CCR_LOB_Pos)                       /*!< SCB CCR: LOB Mask */
+
+#define SCB_CCR_BP_Pos                     18U                                            /*!< SCB CCR: BP Position */
+#define SCB_CCR_BP_Msk                     (1UL << SCB_CCR_BP_Pos)                        /*!< SCB CCR: BP Mask */
+
+#define SCB_CCR_IC_Pos                     17U                                            /*!< SCB CCR: IC Position */
+#define SCB_CCR_IC_Msk                     (1UL << SCB_CCR_IC_Pos)                        /*!< SCB CCR: IC Mask */
+
+#define SCB_CCR_DC_Pos                     16U                                            /*!< SCB CCR: DC Position */
+#define SCB_CCR_DC_Msk                     (1UL << SCB_CCR_DC_Pos)                        /*!< SCB CCR: DC Mask */
+
+#define SCB_CCR_STKOFHFNMIGN_Pos           10U                                            /*!< SCB CCR: STKOFHFNMIGN Position */
+#define SCB_CCR_STKOFHFNMIGN_Msk           (1UL << SCB_CCR_STKOFHFNMIGN_Pos)              /*!< SCB CCR: STKOFHFNMIGN Mask */
+
+#define SCB_CCR_BFHFNMIGN_Pos               8U                                            /*!< SCB CCR: BFHFNMIGN Position */
+#define SCB_CCR_BFHFNMIGN_Msk              (1UL << SCB_CCR_BFHFNMIGN_Pos)                 /*!< SCB CCR: BFHFNMIGN Mask */
+
+#define SCB_CCR_DIV_0_TRP_Pos               4U                                            /*!< SCB CCR: DIV_0_TRP Position */
+#define SCB_CCR_DIV_0_TRP_Msk              (1UL << SCB_CCR_DIV_0_TRP_Pos)                 /*!< SCB CCR: DIV_0_TRP Mask */
+
+#define SCB_CCR_UNALIGN_TRP_Pos             3U                                            /*!< SCB CCR: UNALIGN_TRP Position */
+#define SCB_CCR_UNALIGN_TRP_Msk            (1UL << SCB_CCR_UNALIGN_TRP_Pos)               /*!< SCB CCR: UNALIGN_TRP Mask */
+
+#define SCB_CCR_USERSETMPEND_Pos            1U                                            /*!< SCB CCR: USERSETMPEND Position */
+#define SCB_CCR_USERSETMPEND_Msk           (1UL << SCB_CCR_USERSETMPEND_Pos)              /*!< SCB CCR: USERSETMPEND Mask */
+
+/* SCB System Handler Control and State Register Definitions */
+#define SCB_SHCSR_HARDFAULTPENDED_Pos      21U                                            /*!< SCB SHCSR: HARDFAULTPENDED Position */
+#define SCB_SHCSR_HARDFAULTPENDED_Msk      (1UL << SCB_SHCSR_HARDFAULTPENDED_Pos)         /*!< SCB SHCSR: HARDFAULTPENDED Mask */
+
+#define SCB_SHCSR_SECUREFAULTPENDED_Pos    20U                                            /*!< SCB SHCSR: SECUREFAULTPENDED Position */
+#define SCB_SHCSR_SECUREFAULTPENDED_Msk    (1UL << SCB_SHCSR_SECUREFAULTPENDED_Pos)       /*!< SCB SHCSR: SECUREFAULTPENDED Mask */
+
+#define SCB_SHCSR_SECUREFAULTENA_Pos       19U                                            /*!< SCB SHCSR: SECUREFAULTENA Position */
+#define SCB_SHCSR_SECUREFAULTENA_Msk       (1UL << SCB_SHCSR_SECUREFAULTENA_Pos)          /*!< SCB SHCSR: SECUREFAULTENA Mask */
+
+#define SCB_SHCSR_USGFAULTENA_Pos          18U                                            /*!< SCB SHCSR: USGFAULTENA Position */
+#define SCB_SHCSR_USGFAULTENA_Msk          (1UL << SCB_SHCSR_USGFAULTENA_Pos)             /*!< SCB SHCSR: USGFAULTENA Mask */
+
+#define SCB_SHCSR_BUSFAULTENA_Pos          17U                                            /*!< SCB SHCSR: BUSFAULTENA Position */
+#define SCB_SHCSR_BUSFAULTENA_Msk          (1UL << SCB_SHCSR_BUSFAULTENA_Pos)             /*!< SCB SHCSR: BUSFAULTENA Mask */
+
+#define SCB_SHCSR_MEMFAULTENA_Pos          16U                                            /*!< SCB SHCSR: MEMFAULTENA Position */
+#define SCB_SHCSR_MEMFAULTENA_Msk          (1UL << SCB_SHCSR_MEMFAULTENA_Pos)             /*!< SCB SHCSR: MEMFAULTENA Mask */
+
+#define SCB_SHCSR_SVCALLPENDED_Pos         15U                                            /*!< SCB SHCSR: SVCALLPENDED Position */
+#define SCB_SHCSR_SVCALLPENDED_Msk         (1UL << SCB_SHCSR_SVCALLPENDED_Pos)            /*!< SCB SHCSR: SVCALLPENDED Mask */
+
+#define SCB_SHCSR_BUSFAULTPENDED_Pos       14U                                            /*!< SCB SHCSR: BUSFAULTPENDED Position */
+#define SCB_SHCSR_BUSFAULTPENDED_Msk       (1UL << SCB_SHCSR_BUSFAULTPENDED_Pos)          /*!< SCB SHCSR: BUSFAULTPENDED Mask */
+
+#define SCB_SHCSR_MEMFAULTPENDED_Pos       13U                                            /*!< SCB SHCSR: MEMFAULTPENDED Position */
+#define SCB_SHCSR_MEMFAULTPENDED_Msk       (1UL << SCB_SHCSR_MEMFAULTPENDED_Pos)          /*!< SCB SHCSR: MEMFAULTPENDED Mask */
+
+#define SCB_SHCSR_USGFAULTPENDED_Pos       12U                                            /*!< SCB SHCSR: USGFAULTPENDED Position */
+#define SCB_SHCSR_USGFAULTPENDED_Msk       (1UL << SCB_SHCSR_USGFAULTPENDED_Pos)          /*!< SCB SHCSR: USGFAULTPENDED Mask */
+
+#define SCB_SHCSR_SYSTICKACT_Pos           11U                                            /*!< SCB SHCSR: SYSTICKACT Position */
+#define SCB_SHCSR_SYSTICKACT_Msk           (1UL << SCB_SHCSR_SYSTICKACT_Pos)              /*!< SCB SHCSR: SYSTICKACT Mask */
+
+#define SCB_SHCSR_PENDSVACT_Pos            10U                                            /*!< SCB SHCSR: PENDSVACT Position */
+#define SCB_SHCSR_PENDSVACT_Msk            (1UL << SCB_SHCSR_PENDSVACT_Pos)               /*!< SCB SHCSR: PENDSVACT Mask */
+
+#define SCB_SHCSR_MONITORACT_Pos            8U                                            /*!< SCB SHCSR: MONITORACT Position */
+#define SCB_SHCSR_MONITORACT_Msk           (1UL << SCB_SHCSR_MONITORACT_Pos)              /*!< SCB SHCSR: MONITORACT Mask */
+
+#define SCB_SHCSR_SVCALLACT_Pos             7U                                            /*!< SCB SHCSR: SVCALLACT Position */
+#define SCB_SHCSR_SVCALLACT_Msk            (1UL << SCB_SHCSR_SVCALLACT_Pos)               /*!< SCB SHCSR: SVCALLACT Mask */
+
+#define SCB_SHCSR_NMIACT_Pos                5U                                            /*!< SCB SHCSR: NMIACT Position */
+#define SCB_SHCSR_NMIACT_Msk               (1UL << SCB_SHCSR_NMIACT_Pos)                  /*!< SCB SHCSR: NMIACT Mask */
+
+#define SCB_SHCSR_SECUREFAULTACT_Pos        4U                                            /*!< SCB SHCSR: SECUREFAULTACT Position */
+#define SCB_SHCSR_SECUREFAULTACT_Msk       (1UL << SCB_SHCSR_SECUREFAULTACT_Pos)          /*!< SCB SHCSR: SECUREFAULTACT Mask */
+
+#define SCB_SHCSR_USGFAULTACT_Pos           3U                                            /*!< SCB SHCSR: USGFAULTACT Position */
+#define SCB_SHCSR_USGFAULTACT_Msk          (1UL << SCB_SHCSR_USGFAULTACT_Pos)             /*!< SCB SHCSR: USGFAULTACT Mask */
+
+#define SCB_SHCSR_HARDFAULTACT_Pos          2U                                            /*!< SCB SHCSR: HARDFAULTACT Position */
+#define SCB_SHCSR_HARDFAULTACT_Msk         (1UL << SCB_SHCSR_HARDFAULTACT_Pos)            /*!< SCB SHCSR: HARDFAULTACT Mask */
+
+#define SCB_SHCSR_BUSFAULTACT_Pos           1U                                            /*!< SCB SHCSR: BUSFAULTACT Position */
+#define SCB_SHCSR_BUSFAULTACT_Msk          (1UL << SCB_SHCSR_BUSFAULTACT_Pos)             /*!< SCB SHCSR: BUSFAULTACT Mask */
+
+#define SCB_SHCSR_MEMFAULTACT_Pos           0U                                            /*!< SCB SHCSR: MEMFAULTACT Position */
+#define SCB_SHCSR_MEMFAULTACT_Msk          (1UL /*<< SCB_SHCSR_MEMFAULTACT_Pos*/)         /*!< SCB SHCSR: MEMFAULTACT Mask */
+
+/* SCB Configurable Fault Status Register Definitions */
+#define SCB_CFSR_USGFAULTSR_Pos            16U                                            /*!< SCB CFSR: Usage Fault Status Register Position */
+#define SCB_CFSR_USGFAULTSR_Msk            (0xFFFFUL << SCB_CFSR_USGFAULTSR_Pos)          /*!< SCB CFSR: Usage Fault Status Register Mask */
+
+#define SCB_CFSR_BUSFAULTSR_Pos             8U                                            /*!< SCB CFSR: Bus Fault Status Register Position */
+#define SCB_CFSR_BUSFAULTSR_Msk            (0xFFUL << SCB_CFSR_BUSFAULTSR_Pos)            /*!< SCB CFSR: Bus Fault Status Register Mask */
+
+#define SCB_CFSR_MEMFAULTSR_Pos             0U                                            /*!< SCB CFSR: Memory Manage Fault Status Register Position */
+#define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
+
+/* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
+
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
+
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
+
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
+
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
+
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
+
+/* BusFault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_BFARVALID_Pos            (SCB_CFSR_BUSFAULTSR_Pos + 7U)                  /*!< SCB CFSR (BFSR): BFARVALID Position */
+#define SCB_CFSR_BFARVALID_Msk            (1UL << SCB_CFSR_BFARVALID_Pos)                 /*!< SCB CFSR (BFSR): BFARVALID Mask */
+
+#define SCB_CFSR_LSPERR_Pos               (SCB_CFSR_BUSFAULTSR_Pos + 5U)                  /*!< SCB CFSR (BFSR): LSPERR Position */
+#define SCB_CFSR_LSPERR_Msk               (1UL << SCB_CFSR_LSPERR_Pos)                    /*!< SCB CFSR (BFSR): LSPERR Mask */
+
+#define SCB_CFSR_STKERR_Pos               (SCB_CFSR_BUSFAULTSR_Pos + 4U)                  /*!< SCB CFSR (BFSR): STKERR Position */
+#define SCB_CFSR_STKERR_Msk               (1UL << SCB_CFSR_STKERR_Pos)                    /*!< SCB CFSR (BFSR): STKERR Mask */
+
+#define SCB_CFSR_UNSTKERR_Pos             (SCB_CFSR_BUSFAULTSR_Pos + 3U)                  /*!< SCB CFSR (BFSR): UNSTKERR Position */
+#define SCB_CFSR_UNSTKERR_Msk             (1UL << SCB_CFSR_UNSTKERR_Pos)                  /*!< SCB CFSR (BFSR): UNSTKERR Mask */
+
+#define SCB_CFSR_IMPRECISERR_Pos          (SCB_CFSR_BUSFAULTSR_Pos + 2U)                  /*!< SCB CFSR (BFSR): IMPRECISERR Position */
+#define SCB_CFSR_IMPRECISERR_Msk          (1UL << SCB_CFSR_IMPRECISERR_Pos)               /*!< SCB CFSR (BFSR): IMPRECISERR Mask */
+
+#define SCB_CFSR_PRECISERR_Pos            (SCB_CFSR_BUSFAULTSR_Pos + 1U)                  /*!< SCB CFSR (BFSR): PRECISERR Position */
+#define SCB_CFSR_PRECISERR_Msk            (1UL << SCB_CFSR_PRECISERR_Pos)                 /*!< SCB CFSR (BFSR): PRECISERR Mask */
+
+#define SCB_CFSR_IBUSERR_Pos              (SCB_CFSR_BUSFAULTSR_Pos + 0U)                  /*!< SCB CFSR (BFSR): IBUSERR Position */
+#define SCB_CFSR_IBUSERR_Msk              (1UL << SCB_CFSR_IBUSERR_Pos)                   /*!< SCB CFSR (BFSR): IBUSERR Mask */
+
+/* UsageFault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_DIVBYZERO_Pos            (SCB_CFSR_USGFAULTSR_Pos + 9U)                  /*!< SCB CFSR (UFSR): DIVBYZERO Position */
+#define SCB_CFSR_DIVBYZERO_Msk            (1UL << SCB_CFSR_DIVBYZERO_Pos)                 /*!< SCB CFSR (UFSR): DIVBYZERO Mask */
+
+#define SCB_CFSR_UNALIGNED_Pos            (SCB_CFSR_USGFAULTSR_Pos + 8U)                  /*!< SCB CFSR (UFSR): UNALIGNED Position */
+#define SCB_CFSR_UNALIGNED_Msk            (1UL << SCB_CFSR_UNALIGNED_Pos)                 /*!< SCB CFSR (UFSR): UNALIGNED Mask */
+
+#define SCB_CFSR_STKOF_Pos                (SCB_CFSR_USGFAULTSR_Pos + 4U)                  /*!< SCB CFSR (UFSR): STKOF Position */
+#define SCB_CFSR_STKOF_Msk                (1UL << SCB_CFSR_STKOF_Pos)                     /*!< SCB CFSR (UFSR): STKOF Mask */
+
+#define SCB_CFSR_NOCP_Pos                 (SCB_CFSR_USGFAULTSR_Pos + 3U)                  /*!< SCB CFSR (UFSR): NOCP Position */
+#define SCB_CFSR_NOCP_Msk                 (1UL << SCB_CFSR_NOCP_Pos)                      /*!< SCB CFSR (UFSR): NOCP Mask */
+
+#define SCB_CFSR_INVPC_Pos                (SCB_CFSR_USGFAULTSR_Pos + 2U)                  /*!< SCB CFSR (UFSR): INVPC Position */
+#define SCB_CFSR_INVPC_Msk                (1UL << SCB_CFSR_INVPC_Pos)                     /*!< SCB CFSR (UFSR): INVPC Mask */
+
+#define SCB_CFSR_INVSTATE_Pos             (SCB_CFSR_USGFAULTSR_Pos + 1U)                  /*!< SCB CFSR (UFSR): INVSTATE Position */
+#define SCB_CFSR_INVSTATE_Msk             (1UL << SCB_CFSR_INVSTATE_Pos)                  /*!< SCB CFSR (UFSR): INVSTATE Mask */
+
+#define SCB_CFSR_UNDEFINSTR_Pos           (SCB_CFSR_USGFAULTSR_Pos + 0U)                  /*!< SCB CFSR (UFSR): UNDEFINSTR Position */
+#define SCB_CFSR_UNDEFINSTR_Msk           (1UL << SCB_CFSR_UNDEFINSTR_Pos)                /*!< SCB CFSR (UFSR): UNDEFINSTR Mask */
+
+/* SCB Hard Fault Status Register Definitions */
+#define SCB_HFSR_DEBUGEVT_Pos              31U                                            /*!< SCB HFSR: DEBUGEVT Position */
+#define SCB_HFSR_DEBUGEVT_Msk              (1UL << SCB_HFSR_DEBUGEVT_Pos)                 /*!< SCB HFSR: DEBUGEVT Mask */
+
+#define SCB_HFSR_FORCED_Pos                30U                                            /*!< SCB HFSR: FORCED Position */
+#define SCB_HFSR_FORCED_Msk                (1UL << SCB_HFSR_FORCED_Pos)                   /*!< SCB HFSR: FORCED Mask */
+
+#define SCB_HFSR_VECTTBL_Pos                1U                                            /*!< SCB HFSR: VECTTBL Position */
+#define SCB_HFSR_VECTTBL_Msk               (1UL << SCB_HFSR_VECTTBL_Pos)                  /*!< SCB HFSR: VECTTBL Mask */
+
+/* SCB Debug Fault Status Register Definitions */
+#define SCB_DFSR_PMU_Pos                    5U                                            /*!< SCB DFSR: PMU Position */
+#define SCB_DFSR_PMU_Msk                   (1UL << SCB_DFSR_PMU_Pos)                      /*!< SCB DFSR: PMU Mask */
+
+#define SCB_DFSR_EXTERNAL_Pos               4U                                            /*!< SCB DFSR: EXTERNAL Position */
+#define SCB_DFSR_EXTERNAL_Msk              (1UL << SCB_DFSR_EXTERNAL_Pos)                 /*!< SCB DFSR: EXTERNAL Mask */
+
+#define SCB_DFSR_VCATCH_Pos                 3U                                            /*!< SCB DFSR: VCATCH Position */
+#define SCB_DFSR_VCATCH_Msk                (1UL << SCB_DFSR_VCATCH_Pos)                   /*!< SCB DFSR: VCATCH Mask */
+
+#define SCB_DFSR_DWTTRAP_Pos                2U                                            /*!< SCB DFSR: DWTTRAP Position */
+#define SCB_DFSR_DWTTRAP_Msk               (1UL << SCB_DFSR_DWTTRAP_Pos)                  /*!< SCB DFSR: DWTTRAP Mask */
+
+#define SCB_DFSR_BKPT_Pos                   1U                                            /*!< SCB DFSR: BKPT Position */
+#define SCB_DFSR_BKPT_Msk                  (1UL << SCB_DFSR_BKPT_Pos)                     /*!< SCB DFSR: BKPT Mask */
+
+#define SCB_DFSR_HALTED_Pos                 0U                                            /*!< SCB DFSR: HALTED Position */
+#define SCB_DFSR_HALTED_Msk                (1UL /*<< SCB_DFSR_HALTED_Pos*/)               /*!< SCB DFSR: HALTED Mask */
+
+/* SCB Non-Secure Access Control Register Definitions */
+#define SCB_NSACR_CP11_Pos                 11U                                            /*!< SCB NSACR: CP11 Position */
+#define SCB_NSACR_CP11_Msk                 (1UL << SCB_NSACR_CP11_Pos)                    /*!< SCB NSACR: CP11 Mask */
+
+#define SCB_NSACR_CP10_Pos                 10U                                            /*!< SCB NSACR: CP10 Position */
+#define SCB_NSACR_CP10_Msk                 (1UL << SCB_NSACR_CP10_Pos)                    /*!< SCB NSACR: CP10 Mask */
+
+#define SCB_NSACR_CP7_Pos                   7U                                            /*!< SCB NSACR: CP7 Position */
+#define SCB_NSACR_CP7_Msk                  (1UL << SCB_NSACR_CP7_Pos)                     /*!< SCB NSACR: CP7 Mask */
+
+#define SCB_NSACR_CP6_Pos                   6U                                            /*!< SCB NSACR: CP6 Position */
+#define SCB_NSACR_CP6_Msk                  (1UL << SCB_NSACR_CP6_Pos)                     /*!< SCB NSACR: CP6 Mask */
+
+#define SCB_NSACR_CP5_Pos                   5U                                            /*!< SCB NSACR: CP5 Position */
+#define SCB_NSACR_CP5_Msk                  (1UL << SCB_NSACR_CP5_Pos)                     /*!< SCB NSACR: CP5 Mask */
+
+#define SCB_NSACR_CP4_Pos                   4U                                            /*!< SCB NSACR: CP4 Position */
+#define SCB_NSACR_CP4_Msk                  (1UL << SCB_NSACR_CP4_Pos)                     /*!< SCB NSACR: CP4 Mask */
+
+#define SCB_NSACR_CP3_Pos                   3U                                            /*!< SCB NSACR: CP3 Position */
+#define SCB_NSACR_CP3_Msk                  (1UL << SCB_NSACR_CP3_Pos)                     /*!< SCB NSACR: CP3 Mask */
+
+#define SCB_NSACR_CP2_Pos                   2U                                            /*!< SCB NSACR: CP2 Position */
+#define SCB_NSACR_CP2_Msk                  (1UL << SCB_NSACR_CP2_Pos)                     /*!< SCB NSACR: CP2 Mask */
+
+#define SCB_NSACR_CP1_Pos                   1U                                            /*!< SCB NSACR: CP1 Position */
+#define SCB_NSACR_CP1_Msk                  (1UL << SCB_NSACR_CP1_Pos)                     /*!< SCB NSACR: CP1 Mask */
+
+#define SCB_NSACR_CP0_Pos                   0U                                            /*!< SCB NSACR: CP0 Position */
+#define SCB_NSACR_CP0_Msk                  (1UL /*<< SCB_NSACR_CP0_Pos*/)                 /*!< SCB NSACR: CP0 Mask */
+
+/* SCB Debug Feature Register 0 Definitions */
+#define SCB_ID_DFR_UDE_Pos                 28U                                            /*!< SCB ID_DFR: UDE Position */
+#define SCB_ID_DFR_UDE_Msk                 (0xFUL << SCB_ID_DFR_UDE_Pos)                  /*!< SCB ID_DFR: UDE Mask */
+
+#define SCB_ID_DFR_MProfDbg_Pos            20U                                            /*!< SCB ID_DFR: MProfDbg Position */
+#define SCB_ID_DFR_MProfDbg_Msk            (0xFUL << SCB_ID_DFR_MProfDbg_Pos)             /*!< SCB ID_DFR: MProfDbg Mask */
+
+/* SCB Cache Level ID Register Definitions */
+#define SCB_CLIDR_LOUU_Pos                 27U                                            /*!< SCB CLIDR: LoUU Position */
+#define SCB_CLIDR_LOUU_Msk                 (7UL << SCB_CLIDR_LOUU_Pos)                    /*!< SCB CLIDR: LoUU Mask */
+
+#define SCB_CLIDR_LOC_Pos                  24U                                            /*!< SCB CLIDR: LoC Position */
+#define SCB_CLIDR_LOC_Msk                  (7UL << SCB_CLIDR_LOC_Pos)                     /*!< SCB CLIDR: LoC Mask */
+
+/* SCB Cache Type Register Definitions */
+#define SCB_CTR_FORMAT_Pos                 29U                                            /*!< SCB CTR: Format Position */
+#define SCB_CTR_FORMAT_Msk                 (7UL << SCB_CTR_FORMAT_Pos)                    /*!< SCB CTR: Format Mask */
+
+#define SCB_CTR_CWG_Pos                    24U                                            /*!< SCB CTR: CWG Position */
+#define SCB_CTR_CWG_Msk                    (0xFUL << SCB_CTR_CWG_Pos)                     /*!< SCB CTR: CWG Mask */
+
+#define SCB_CTR_ERG_Pos                    20U                                            /*!< SCB CTR: ERG Position */
+#define SCB_CTR_ERG_Msk                    (0xFUL << SCB_CTR_ERG_Pos)                     /*!< SCB CTR: ERG Mask */
+
+#define SCB_CTR_DMINLINE_Pos               16U                                            /*!< SCB CTR: DminLine Position */
+#define SCB_CTR_DMINLINE_Msk               (0xFUL << SCB_CTR_DMINLINE_Pos)                /*!< SCB CTR: DminLine Mask */
+
+#define SCB_CTR_IMINLINE_Pos                0U                                            /*!< SCB CTR: ImInLine Position */
+#define SCB_CTR_IMINLINE_Msk               (0xFUL /*<< SCB_CTR_IMINLINE_Pos*/)            /*!< SCB CTR: ImInLine Mask */
+
+/* SCB Cache Size ID Register Definitions */
+#define SCB_CCSIDR_WT_Pos                  31U                                            /*!< SCB CCSIDR: WT Position */
+#define SCB_CCSIDR_WT_Msk                  (1UL << SCB_CCSIDR_WT_Pos)                     /*!< SCB CCSIDR: WT Mask */
+
+#define SCB_CCSIDR_WB_Pos                  30U                                            /*!< SCB CCSIDR: WB Position */
+#define SCB_CCSIDR_WB_Msk                  (1UL << SCB_CCSIDR_WB_Pos)                     /*!< SCB CCSIDR: WB Mask */
+
+#define SCB_CCSIDR_RA_Pos                  29U                                            /*!< SCB CCSIDR: RA Position */
+#define SCB_CCSIDR_RA_Msk                  (1UL << SCB_CCSIDR_RA_Pos)                     /*!< SCB CCSIDR: RA Mask */
+
+#define SCB_CCSIDR_WA_Pos                  28U                                            /*!< SCB CCSIDR: WA Position */
+#define SCB_CCSIDR_WA_Msk                  (1UL << SCB_CCSIDR_WA_Pos)                     /*!< SCB CCSIDR: WA Mask */
+
+#define SCB_CCSIDR_NUMSETS_Pos             13U                                            /*!< SCB CCSIDR: NumSets Position */
+#define SCB_CCSIDR_NUMSETS_Msk             (0x7FFFUL << SCB_CCSIDR_NUMSETS_Pos)           /*!< SCB CCSIDR: NumSets Mask */
+
+#define SCB_CCSIDR_ASSOCIATIVITY_Pos        3U                                            /*!< SCB CCSIDR: Associativity Position */
+#define SCB_CCSIDR_ASSOCIATIVITY_Msk       (0x3FFUL << SCB_CCSIDR_ASSOCIATIVITY_Pos)      /*!< SCB CCSIDR: Associativity Mask */
+
+#define SCB_CCSIDR_LINESIZE_Pos             0U                                            /*!< SCB CCSIDR: LineSize Position */
+#define SCB_CCSIDR_LINESIZE_Msk            (7UL /*<< SCB_CCSIDR_LINESIZE_Pos*/)           /*!< SCB CCSIDR: LineSize Mask */
+
+/* SCB Cache Size Selection Register Definitions */
+#define SCB_CSSELR_LEVEL_Pos                1U                                            /*!< SCB CSSELR: Level Position */
+#define SCB_CSSELR_LEVEL_Msk               (7UL << SCB_CSSELR_LEVEL_Pos)                  /*!< SCB CSSELR: Level Mask */
+
+#define SCB_CSSELR_IND_Pos                  0U                                            /*!< SCB CSSELR: InD Position */
+#define SCB_CSSELR_IND_Msk                 (1UL /*<< SCB_CSSELR_IND_Pos*/)                /*!< SCB CSSELR: InD Mask */
+
+/* SCB Software Triggered Interrupt Register Definitions */
+#define SCB_STIR_INTID_Pos                  0U                                            /*!< SCB STIR: INTID Position */
+#define SCB_STIR_INTID_Msk                 (0x1FFUL /*<< SCB_STIR_INTID_Pos*/)            /*!< SCB STIR: INTID Mask */
+
+/* SCB RAS Fault Status Register Definitions */
+#define SCB_RFSR_V_Pos                     31U                                            /*!< SCB RFSR: V Position */
+#define SCB_RFSR_V_Msk                     (1UL << SCB_RFSR_V_Pos)                        /*!< SCB RFSR: V Mask */
+
+#define SCB_RFSR_IS_Pos                    16U                                            /*!< SCB RFSR: IS Position */
+#define SCB_RFSR_IS_Msk                    (0x7FFFUL << SCB_RFSR_IS_Pos)                  /*!< SCB RFSR: IS Mask */
+
+#define SCB_RFSR_UET_Pos                    0U                                            /*!< SCB RFSR: UET Position */
+#define SCB_RFSR_UET_Msk                   (3UL /*<< SCB_RFSR_UET_Pos*/)                  /*!< SCB RFSR: UET Mask */
+
+/* SCB D-Cache Invalidate by Set-way Register Definitions */
+#define SCB_DCISW_WAY_Pos                  30U                                            /*!< SCB DCISW: Way Position */
+#define SCB_DCISW_WAY_Msk                  (3UL << SCB_DCISW_WAY_Pos)                     /*!< SCB DCISW: Way Mask */
+
+#define SCB_DCISW_SET_Pos                   5U                                            /*!< SCB DCISW: Set Position */
+#define SCB_DCISW_SET_Msk                  (0x1FFUL << SCB_DCISW_SET_Pos)                 /*!< SCB DCISW: Set Mask */
+
+/* SCB D-Cache Clean by Set-way Register Definitions */
+#define SCB_DCCSW_WAY_Pos                  30U                                            /*!< SCB DCCSW: Way Position */
+#define SCB_DCCSW_WAY_Msk                  (3UL << SCB_DCCSW_WAY_Pos)                     /*!< SCB DCCSW: Way Mask */
+
+#define SCB_DCCSW_SET_Pos                   5U                                            /*!< SCB DCCSW: Set Position */
+#define SCB_DCCSW_SET_Msk                  (0x1FFUL << SCB_DCCSW_SET_Pos)                 /*!< SCB DCCSW: Set Mask */
+
+/* SCB D-Cache Clean and Invalidate by Set-way Register Definitions */
+#define SCB_DCCISW_WAY_Pos                 30U                                            /*!< SCB DCCISW: Way Position */
+#define SCB_DCCISW_WAY_Msk                 (3UL << SCB_DCCISW_WAY_Pos)                    /*!< SCB DCCISW: Way Mask */
+
+#define SCB_DCCISW_SET_Pos                  5U                                            /*!< SCB DCCISW: Set Position */
+#define SCB_DCCISW_SET_Msk                 (0x1FFUL << SCB_DCCISW_SET_Pos)                /*!< SCB DCCISW: Set Mask */
+
+/*@} end of group CMSIS_SCB */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_ICB Implementation Control Block register (ICB)
+  \brief    Type definitions for the Implementation Control Block Register
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Implementation Control Block (ICB).
+ */
+typedef struct
+{
+        uint32_t RESERVED0[1U];
+  __IM  uint32_t ICTR;                   /*!< Offset: 0x004 (R/ )  Interrupt Controller Type Register */
+  __IOM uint32_t ACTLR;                  /*!< Offset: 0x008 (R/W)  Auxiliary Control Register */
+  __IOM uint32_t CPPWR;                  /*!< Offset: 0x00C (R/W)  Coprocessor Power Control  Register */
+} ICB_Type;
+
+/* Auxiliary Control Register Definitions */
+#define ICB_ACTLR_DISCRITAXIRUW_Pos     27U                                               /*!< ACTLR: DISCRITAXIRUW Position */
+#define ICB_ACTLR_DISCRITAXIRUW_Msk     (1UL << ICB_ACTLR_DISCRITAXIRUW_Pos)              /*!< ACTLR: DISCRITAXIRUW Mask */
+
+#define ICB_ACTLR_DISCRITAXIRUR_Pos     15U                                               /*!< ACTLR: DISCRITAXIRUR Position */
+#define ICB_ACTLR_DISCRITAXIRUR_Msk     (1UL << ICB_ACTLR_DISCRITAXIRUR_Pos)              /*!< ACTLR: DISCRITAXIRUR Mask */
+
+#define ICB_ACTLR_EVENTBUSEN_Pos        14U                                               /*!< ACTLR: EVENTBUSEN Position */
+#define ICB_ACTLR_EVENTBUSEN_Msk        (1UL << ICB_ACTLR_EVENTBUSEN_Pos)                 /*!< ACTLR: EVENTBUSEN Mask */
+
+#define ICB_ACTLR_EVENTBUSEN_S_Pos      13U                                               /*!< ACTLR: EVENTBUSEN_S Position */
+#define ICB_ACTLR_EVENTBUSEN_S_Msk      (1UL << ICB_ACTLR_EVENTBUSEN_S_Pos)               /*!< ACTLR: EVENTBUSEN_S Mask */
+
+#define ICB_ACTLR_DISITMATBFLUSH_Pos    12U                                               /*!< ACTLR: DISITMATBFLUSH Position */
+#define ICB_ACTLR_DISITMATBFLUSH_Msk    (1UL << ICB_ACTLR_DISITMATBFLUSH_Pos)             /*!< ACTLR: DISITMATBFLUSH Mask */
+
+#define ICB_ACTLR_DISNWAMODE_Pos        11U                                               /*!< ACTLR: DISNWAMODE Position */
+#define ICB_ACTLR_DISNWAMODE_Msk        (1UL << ICB_ACTLR_DISNWAMODE_Pos)                 /*!< ACTLR: DISNWAMODE Mask */
+
+#define ICB_ACTLR_FPEXCODIS_Pos         10U                                               /*!< ACTLR: FPEXCODIS Position */
+#define ICB_ACTLR_FPEXCODIS_Msk         (1UL << ICB_ACTLR_FPEXCODIS_Pos)                  /*!< ACTLR: FPEXCODIS Mask */
+
+/* Interrupt Controller Type Register Definitions */
+#define ICB_ICTR_INTLINESNUM_Pos         0U                                               /*!< ICTR: INTLINESNUM Position */
+#define ICB_ICTR_INTLINESNUM_Msk        (0xFUL /*<< ICB_ICTR_INTLINESNUM_Pos*/)           /*!< ICTR: INTLINESNUM Mask */
+
+/*@} end of group CMSIS_ICB */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SysTick     System Tick Timer (SysTick)
+  \brief    Type definitions for the System Timer Registers.
+  @{
+ */
+
+/**
+  \brief  Structure type to access the System Timer (SysTick).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SysTick Control and Status Register */
+  __IOM uint32_t LOAD;                   /*!< Offset: 0x004 (R/W)  SysTick Reload Value Register */
+  __IOM uint32_t VAL;                    /*!< Offset: 0x008 (R/W)  SysTick Current Value Register */
+  __IM  uint32_t CALIB;                  /*!< Offset: 0x00C (R/ )  SysTick Calibration Register */
+} SysTick_Type;
+
+/* SysTick Control / Status Register Definitions */
+#define SysTick_CTRL_COUNTFLAG_Pos         16U                                            /*!< SysTick CTRL: COUNTFLAG Position */
+#define SysTick_CTRL_COUNTFLAG_Msk         (1UL << SysTick_CTRL_COUNTFLAG_Pos)            /*!< SysTick CTRL: COUNTFLAG Mask */
+
+#define SysTick_CTRL_CLKSOURCE_Pos          2U                                            /*!< SysTick CTRL: CLKSOURCE Position */
+#define SysTick_CTRL_CLKSOURCE_Msk         (1UL << SysTick_CTRL_CLKSOURCE_Pos)            /*!< SysTick CTRL: CLKSOURCE Mask */
+
+#define SysTick_CTRL_TICKINT_Pos            1U                                            /*!< SysTick CTRL: TICKINT Position */
+#define SysTick_CTRL_TICKINT_Msk           (1UL << SysTick_CTRL_TICKINT_Pos)              /*!< SysTick CTRL: TICKINT Mask */
+
+#define SysTick_CTRL_ENABLE_Pos             0U                                            /*!< SysTick CTRL: ENABLE Position */
+#define SysTick_CTRL_ENABLE_Msk            (1UL /*<< SysTick_CTRL_ENABLE_Pos*/)           /*!< SysTick CTRL: ENABLE Mask */
+
+/* SysTick Reload Register Definitions */
+#define SysTick_LOAD_RELOAD_Pos             0U                                            /*!< SysTick LOAD: RELOAD Position */
+#define SysTick_LOAD_RELOAD_Msk            (0xFFFFFFUL /*<< SysTick_LOAD_RELOAD_Pos*/)    /*!< SysTick LOAD: RELOAD Mask */
+
+/* SysTick Current Register Definitions */
+#define SysTick_VAL_CURRENT_Pos             0U                                            /*!< SysTick VAL: CURRENT Position */
+#define SysTick_VAL_CURRENT_Msk            (0xFFFFFFUL /*<< SysTick_VAL_CURRENT_Pos*/)    /*!< SysTick VAL: CURRENT Mask */
+
+/* SysTick Calibration Register Definitions */
+#define SysTick_CALIB_NOREF_Pos            31U                                            /*!< SysTick CALIB: NOREF Position */
+#define SysTick_CALIB_NOREF_Msk            (1UL << SysTick_CALIB_NOREF_Pos)               /*!< SysTick CALIB: NOREF Mask */
+
+#define SysTick_CALIB_SKEW_Pos             30U                                            /*!< SysTick CALIB: SKEW Position */
+#define SysTick_CALIB_SKEW_Msk             (1UL << SysTick_CALIB_SKEW_Pos)                /*!< SysTick CALIB: SKEW Mask */
+
+#define SysTick_CALIB_TENMS_Pos             0U                                            /*!< SysTick CALIB: TENMS Position */
+#define SysTick_CALIB_TENMS_Msk            (0xFFFFFFUL /*<< SysTick_CALIB_TENMS_Pos*/)    /*!< SysTick CALIB: TENMS Mask */
+
+/*@} end of group CMSIS_SysTick */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_ITM     Instrumentation Trace Macrocell (ITM)
+  \brief    Type definitions for the Instrumentation Trace Macrocell (ITM)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Instrumentation Trace Macrocell Register (ITM).
+ */
+typedef struct
+{
+  __OM  union
+  {
+    __OM  uint8_t    u8;                 /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 8-bit */
+    __OM  uint16_t   u16;                /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 16-bit */
+    __OM  uint32_t   u32;                /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 32-bit */
+  }  PORT [32U];                         /*!< Offset: 0x000 ( /W)  ITM Stimulus Port Registers */
+        uint32_t RESERVED0[864U];
+  __IOM uint32_t TER;                    /*!< Offset: 0xE00 (R/W)  ITM Trace Enable Register */
+        uint32_t RESERVED1[15U];
+  __IOM uint32_t TPR;                    /*!< Offset: 0xE40 (R/W)  ITM Trace Privilege Register */
+        uint32_t RESERVED2[15U];
+  __IOM uint32_t TCR;                    /*!< Offset: 0xE80 (R/W)  ITM Trace Control Register */
+        uint32_t RESERVED3[32U];
+        uint32_t RESERVED4[43U];
+  __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  ITM Lock Access Register */
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  ITM Lock Status Register */
+        uint32_t RESERVED5[1U];
+  __IM  uint32_t DEVARCH;                /*!< Offset: 0xFBC (R/ )  ITM Device Architecture Register */
+        uint32_t RESERVED6[3U];
+  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  ITM Device Type Register */
+  __IM  uint32_t PID4;                   /*!< Offset: 0xFD0 (R/ )  ITM Peripheral Identification Register #4 */
+  __IM  uint32_t PID5;                   /*!< Offset: 0xFD4 (R/ )  ITM Peripheral Identification Register #5 */
+  __IM  uint32_t PID6;                   /*!< Offset: 0xFD8 (R/ )  ITM Peripheral Identification Register #6 */
+  __IM  uint32_t PID7;                   /*!< Offset: 0xFDC (R/ )  ITM Peripheral Identification Register #7 */
+  __IM  uint32_t PID0;                   /*!< Offset: 0xFE0 (R/ )  ITM Peripheral Identification Register #0 */
+  __IM  uint32_t PID1;                   /*!< Offset: 0xFE4 (R/ )  ITM Peripheral Identification Register #1 */
+  __IM  uint32_t PID2;                   /*!< Offset: 0xFE8 (R/ )  ITM Peripheral Identification Register #2 */
+  __IM  uint32_t PID3;                   /*!< Offset: 0xFEC (R/ )  ITM Peripheral Identification Register #3 */
+  __IM  uint32_t CID0;                   /*!< Offset: 0xFF0 (R/ )  ITM Component  Identification Register #0 */
+  __IM  uint32_t CID1;                   /*!< Offset: 0xFF4 (R/ )  ITM Component  Identification Register #1 */
+  __IM  uint32_t CID2;                   /*!< Offset: 0xFF8 (R/ )  ITM Component  Identification Register #2 */
+  __IM  uint32_t CID3;                   /*!< Offset: 0xFFC (R/ )  ITM Component  Identification Register #3 */
+} ITM_Type;
+
+/* ITM Stimulus Port Register Definitions */
+#define ITM_STIM_DISABLED_Pos               1U                                            /*!< ITM STIM: DISABLED Position */
+#define ITM_STIM_DISABLED_Msk              (0x1UL << ITM_STIM_DISABLED_Pos)               /*!< ITM STIM: DISABLED Mask */
+
+#define ITM_STIM_FIFOREADY_Pos              0U                                            /*!< ITM STIM: FIFOREADY Position */
+#define ITM_STIM_FIFOREADY_Msk             (0x1UL /*<< ITM_STIM_FIFOREADY_Pos*/)          /*!< ITM STIM: FIFOREADY Mask */
+
+/* ITM Trace Privilege Register Definitions */
+#define ITM_TPR_PRIVMASK_Pos                0U                                            /*!< ITM TPR: PRIVMASK Position */
+#define ITM_TPR_PRIVMASK_Msk               (0xFUL /*<< ITM_TPR_PRIVMASK_Pos*/)            /*!< ITM TPR: PRIVMASK Mask */
+
+/* ITM Trace Control Register Definitions */
+#define ITM_TCR_BUSY_Pos                   23U                                            /*!< ITM TCR: BUSY Position */
+#define ITM_TCR_BUSY_Msk                   (1UL << ITM_TCR_BUSY_Pos)                      /*!< ITM TCR: BUSY Mask */
+
+#define ITM_TCR_TRACEBUSID_Pos             16U                                            /*!< ITM TCR: ATBID Position */
+#define ITM_TCR_TRACEBUSID_Msk             (0x7FUL << ITM_TCR_TRACEBUSID_Pos)             /*!< ITM TCR: ATBID Mask */
+
+#define ITM_TCR_GTSFREQ_Pos                10U                                            /*!< ITM TCR: Global timestamp frequency Position */
+#define ITM_TCR_GTSFREQ_Msk                (3UL << ITM_TCR_GTSFREQ_Pos)                   /*!< ITM TCR: Global timestamp frequency Mask */
+
+#define ITM_TCR_TSPRESCALE_Pos              8U                                            /*!< ITM TCR: TSPRESCALE Position */
+#define ITM_TCR_TSPRESCALE_Msk             (3UL << ITM_TCR_TSPRESCALE_Pos)                /*!< ITM TCR: TSPRESCALE Mask */
+
+#define ITM_TCR_STALLENA_Pos                5U                                            /*!< ITM TCR: STALLENA Position */
+#define ITM_TCR_STALLENA_Msk               (1UL << ITM_TCR_STALLENA_Pos)                  /*!< ITM TCR: STALLENA Mask */
+
+#define ITM_TCR_SWOENA_Pos                  4U                                            /*!< ITM TCR: SWOENA Position */
+#define ITM_TCR_SWOENA_Msk                 (1UL << ITM_TCR_SWOENA_Pos)                    /*!< ITM TCR: SWOENA Mask */
+
+#define ITM_TCR_DWTENA_Pos                  3U                                            /*!< ITM TCR: DWTENA Position */
+#define ITM_TCR_DWTENA_Msk                 (1UL << ITM_TCR_DWTENA_Pos)                    /*!< ITM TCR: DWTENA Mask */
+
+#define ITM_TCR_SYNCENA_Pos                 2U                                            /*!< ITM TCR: SYNCENA Position */
+#define ITM_TCR_SYNCENA_Msk                (1UL << ITM_TCR_SYNCENA_Pos)                   /*!< ITM TCR: SYNCENA Mask */
+
+#define ITM_TCR_TSENA_Pos                   1U                                            /*!< ITM TCR: TSENA Position */
+#define ITM_TCR_TSENA_Msk                  (1UL << ITM_TCR_TSENA_Pos)                     /*!< ITM TCR: TSENA Mask */
+
+#define ITM_TCR_ITMENA_Pos                  0U                                            /*!< ITM TCR: ITM Enable bit Position */
+#define ITM_TCR_ITMENA_Msk                 (1UL /*<< ITM_TCR_ITMENA_Pos*/)                /*!< ITM TCR: ITM Enable bit Mask */
+
+/* ITM Lock Status Register Definitions */
+#define ITM_LSR_ByteAcc_Pos                 2U                                            /*!< ITM LSR: ByteAcc Position */
+#define ITM_LSR_ByteAcc_Msk                (1UL << ITM_LSR_ByteAcc_Pos)                   /*!< ITM LSR: ByteAcc Mask */
+
+#define ITM_LSR_Access_Pos                  1U                                            /*!< ITM LSR: Access Position */
+#define ITM_LSR_Access_Msk                 (1UL << ITM_LSR_Access_Pos)                    /*!< ITM LSR: Access Mask */
+
+#define ITM_LSR_Present_Pos                 0U                                            /*!< ITM LSR: Present Position */
+#define ITM_LSR_Present_Msk                (1UL /*<< ITM_LSR_Present_Pos*/)               /*!< ITM LSR: Present Mask */
+
+/*@}*/ /* end of group CMSIS_ITM */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DWT     Data Watchpoint and Trace (DWT)
+  \brief    Type definitions for the Data Watchpoint and Trace (DWT)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Data Watchpoint and Trace Register (DWT).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  Control Register */
+  __IOM uint32_t CYCCNT;                 /*!< Offset: 0x004 (R/W)  Cycle Count Register */
+  __IOM uint32_t CPICNT;                 /*!< Offset: 0x008 (R/W)  CPI Count Register */
+  __IOM uint32_t EXCCNT;                 /*!< Offset: 0x00C (R/W)  Exception Overhead Count Register */
+  __IOM uint32_t SLEEPCNT;               /*!< Offset: 0x010 (R/W)  Sleep Count Register */
+  __IOM uint32_t LSUCNT;                 /*!< Offset: 0x014 (R/W)  LSU Count Register */
+  __IOM uint32_t FOLDCNT;                /*!< Offset: 0x018 (R/W)  Folded-instruction Count Register */
+  __IM  uint32_t PCSR;                   /*!< Offset: 0x01C (R/ )  Program Counter Sample Register */
+  __IOM uint32_t COMP0;                  /*!< Offset: 0x020 (R/W)  Comparator Register 0 */
+        uint32_t RESERVED1[1U];
+  __IOM uint32_t FUNCTION0;              /*!< Offset: 0x028 (R/W)  Function Register 0 */
+        uint32_t RESERVED2[1U];
+  __IOM uint32_t COMP1;                  /*!< Offset: 0x030 (R/W)  Comparator Register 1 */
+        uint32_t RESERVED3[1U];
+  __IOM uint32_t FUNCTION1;              /*!< Offset: 0x038 (R/W)  Function Register 1 */
+        uint32_t RESERVED4[1U];
+  __IOM uint32_t COMP2;                  /*!< Offset: 0x040 (R/W)  Comparator Register 2 */
+        uint32_t RESERVED5[1U];
+  __IOM uint32_t FUNCTION2;              /*!< Offset: 0x048 (R/W)  Function Register 2 */
+        uint32_t RESERVED6[1U];
+  __IOM uint32_t COMP3;                  /*!< Offset: 0x050 (R/W)  Comparator Register 3 */
+        uint32_t RESERVED7[1U];
+  __IOM uint32_t FUNCTION3;              /*!< Offset: 0x058 (R/W)  Function Register 3 */
+        uint32_t RESERVED8[1U];
+  __IOM uint32_t COMP4;                  /*!< Offset: 0x060 (R/W)  Comparator Register 4 */
+        uint32_t RESERVED9[1U];
+  __IOM uint32_t FUNCTION4;              /*!< Offset: 0x068 (R/W)  Function Register 4 */
+        uint32_t RESERVED10[1U];
+  __IOM uint32_t COMP5;                  /*!< Offset: 0x070 (R/W)  Comparator Register 5 */
+        uint32_t RESERVED11[1U];
+  __IOM uint32_t FUNCTION5;              /*!< Offset: 0x078 (R/W)  Function Register 5 */
+        uint32_t RESERVED12[1U];
+  __IOM uint32_t COMP6;                  /*!< Offset: 0x080 (R/W)  Comparator Register 6 */
+        uint32_t RESERVED13[1U];
+  __IOM uint32_t FUNCTION6;              /*!< Offset: 0x088 (R/W)  Function Register 6 */
+        uint32_t RESERVED14[1U];
+  __IOM uint32_t COMP7;                  /*!< Offset: 0x090 (R/W)  Comparator Register 7 */
+        uint32_t RESERVED15[1U];
+  __IOM uint32_t FUNCTION7;              /*!< Offset: 0x098 (R/W)  Function Register 7 */
+        uint32_t RESERVED16[1U];
+  __IOM uint32_t COMP8;                  /*!< Offset: 0x0A0 (R/W)  Comparator Register 8 */
+        uint32_t RESERVED17[1U];
+  __IOM uint32_t FUNCTION8;              /*!< Offset: 0x0A8 (R/W)  Function Register 8 */
+        uint32_t RESERVED18[1U];
+  __IOM uint32_t COMP9;                  /*!< Offset: 0x0B0 (R/W)  Comparator Register 9 */
+        uint32_t RESERVED19[1U];
+  __IOM uint32_t FUNCTION9;              /*!< Offset: 0x0B8 (R/W)  Function Register 9 */
+        uint32_t RESERVED20[1U];
+  __IOM uint32_t COMP10;                 /*!< Offset: 0x0C0 (R/W)  Comparator Register 10 */
+        uint32_t RESERVED21[1U];
+  __IOM uint32_t FUNCTION10;             /*!< Offset: 0x0C8 (R/W)  Function Register 10 */
+        uint32_t RESERVED22[1U];
+  __IOM uint32_t COMP11;                 /*!< Offset: 0x0D0 (R/W)  Comparator Register 11 */
+        uint32_t RESERVED23[1U];
+  __IOM uint32_t FUNCTION11;             /*!< Offset: 0x0D8 (R/W)  Function Register 11 */
+        uint32_t RESERVED24[1U];
+  __IOM uint32_t COMP12;                 /*!< Offset: 0x0E0 (R/W)  Comparator Register 12 */
+        uint32_t RESERVED25[1U];
+  __IOM uint32_t FUNCTION12;             /*!< Offset: 0x0E8 (R/W)  Function Register 12 */
+        uint32_t RESERVED26[1U];
+  __IOM uint32_t COMP13;                 /*!< Offset: 0x0F0 (R/W)  Comparator Register 13 */
+        uint32_t RESERVED27[1U];
+  __IOM uint32_t FUNCTION13;             /*!< Offset: 0x0F8 (R/W)  Function Register 13 */
+        uint32_t RESERVED28[1U];
+  __IOM uint32_t COMP14;                 /*!< Offset: 0x100 (R/W)  Comparator Register 14 */
+        uint32_t RESERVED29[1U];
+  __IOM uint32_t FUNCTION14;             /*!< Offset: 0x108 (R/W)  Function Register 14 */
+        uint32_t RESERVED30[1U];
+  __IOM uint32_t COMP15;                 /*!< Offset: 0x110 (R/W)  Comparator Register 15 */
+        uint32_t RESERVED31[1U];
+  __IOM uint32_t FUNCTION15;             /*!< Offset: 0x118 (R/W)  Function Register 15 */
+        uint32_t RESERVED32[934U];
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R  )  Lock Status Register */
+        uint32_t RESERVED33[1U];
+  __IM  uint32_t DEVARCH;                /*!< Offset: 0xFBC (R/ )  Device Architecture Register */
+} DWT_Type;
+
+/* DWT Control Register Definitions */
+#define DWT_CTRL_NUMCOMP_Pos               28U                                         /*!< DWT CTRL: NUMCOMP Position */
+#define DWT_CTRL_NUMCOMP_Msk               (0xFUL << DWT_CTRL_NUMCOMP_Pos)             /*!< DWT CTRL: NUMCOMP Mask */
+
+#define DWT_CTRL_NOTRCPKT_Pos              27U                                         /*!< DWT CTRL: NOTRCPKT Position */
+#define DWT_CTRL_NOTRCPKT_Msk              (0x1UL << DWT_CTRL_NOTRCPKT_Pos)            /*!< DWT CTRL: NOTRCPKT Mask */
+
+#define DWT_CTRL_NOEXTTRIG_Pos             26U                                         /*!< DWT CTRL: NOEXTTRIG Position */
+#define DWT_CTRL_NOEXTTRIG_Msk             (0x1UL << DWT_CTRL_NOEXTTRIG_Pos)           /*!< DWT CTRL: NOEXTTRIG Mask */
+
+#define DWT_CTRL_NOCYCCNT_Pos              25U                                         /*!< DWT CTRL: NOCYCCNT Position */
+#define DWT_CTRL_NOCYCCNT_Msk              (0x1UL << DWT_CTRL_NOCYCCNT_Pos)            /*!< DWT CTRL: NOCYCCNT Mask */
+
+#define DWT_CTRL_NOPRFCNT_Pos              24U                                         /*!< DWT CTRL: NOPRFCNT Position */
+#define DWT_CTRL_NOPRFCNT_Msk              (0x1UL << DWT_CTRL_NOPRFCNT_Pos)            /*!< DWT CTRL: NOPRFCNT Mask */
+
+#define DWT_CTRL_CYCDISS_Pos               23U                                         /*!< DWT CTRL: CYCDISS Position */
+#define DWT_CTRL_CYCDISS_Msk               (0x1UL << DWT_CTRL_CYCDISS_Pos)             /*!< DWT CTRL: CYCDISS Mask */
+
+#define DWT_CTRL_CYCEVTENA_Pos             22U                                         /*!< DWT CTRL: CYCEVTENA Position */
+#define DWT_CTRL_CYCEVTENA_Msk             (0x1UL << DWT_CTRL_CYCEVTENA_Pos)           /*!< DWT CTRL: CYCEVTENA Mask */
+
+#define DWT_CTRL_FOLDEVTENA_Pos            21U                                         /*!< DWT CTRL: FOLDEVTENA Position */
+#define DWT_CTRL_FOLDEVTENA_Msk            (0x1UL << DWT_CTRL_FOLDEVTENA_Pos)          /*!< DWT CTRL: FOLDEVTENA Mask */
+
+#define DWT_CTRL_LSUEVTENA_Pos             20U                                         /*!< DWT CTRL: LSUEVTENA Position */
+#define DWT_CTRL_LSUEVTENA_Msk             (0x1UL << DWT_CTRL_LSUEVTENA_Pos)           /*!< DWT CTRL: LSUEVTENA Mask */
+
+#define DWT_CTRL_SLEEPEVTENA_Pos           19U                                         /*!< DWT CTRL: SLEEPEVTENA Position */
+#define DWT_CTRL_SLEEPEVTENA_Msk           (0x1UL << DWT_CTRL_SLEEPEVTENA_Pos)         /*!< DWT CTRL: SLEEPEVTENA Mask */
+
+#define DWT_CTRL_EXCEVTENA_Pos             18U                                         /*!< DWT CTRL: EXCEVTENA Position */
+#define DWT_CTRL_EXCEVTENA_Msk             (0x1UL << DWT_CTRL_EXCEVTENA_Pos)           /*!< DWT CTRL: EXCEVTENA Mask */
+
+#define DWT_CTRL_CPIEVTENA_Pos             17U                                         /*!< DWT CTRL: CPIEVTENA Position */
+#define DWT_CTRL_CPIEVTENA_Msk             (0x1UL << DWT_CTRL_CPIEVTENA_Pos)           /*!< DWT CTRL: CPIEVTENA Mask */
+
+#define DWT_CTRL_EXCTRCENA_Pos             16U                                         /*!< DWT CTRL: EXCTRCENA Position */
+#define DWT_CTRL_EXCTRCENA_Msk             (0x1UL << DWT_CTRL_EXCTRCENA_Pos)           /*!< DWT CTRL: EXCTRCENA Mask */
+
+#define DWT_CTRL_PCSAMPLENA_Pos            12U                                         /*!< DWT CTRL: PCSAMPLENA Position */
+#define DWT_CTRL_PCSAMPLENA_Msk            (0x1UL << DWT_CTRL_PCSAMPLENA_Pos)          /*!< DWT CTRL: PCSAMPLENA Mask */
+
+#define DWT_CTRL_SYNCTAP_Pos               10U                                         /*!< DWT CTRL: SYNCTAP Position */
+#define DWT_CTRL_SYNCTAP_Msk               (0x3UL << DWT_CTRL_SYNCTAP_Pos)             /*!< DWT CTRL: SYNCTAP Mask */
+
+#define DWT_CTRL_CYCTAP_Pos                 9U                                         /*!< DWT CTRL: CYCTAP Position */
+#define DWT_CTRL_CYCTAP_Msk                (0x1UL << DWT_CTRL_CYCTAP_Pos)              /*!< DWT CTRL: CYCTAP Mask */
+
+#define DWT_CTRL_POSTINIT_Pos               5U                                         /*!< DWT CTRL: POSTINIT Position */
+#define DWT_CTRL_POSTINIT_Msk              (0xFUL << DWT_CTRL_POSTINIT_Pos)            /*!< DWT CTRL: POSTINIT Mask */
+
+#define DWT_CTRL_POSTPRESET_Pos             1U                                         /*!< DWT CTRL: POSTPRESET Position */
+#define DWT_CTRL_POSTPRESET_Msk            (0xFUL << DWT_CTRL_POSTPRESET_Pos)          /*!< DWT CTRL: POSTPRESET Mask */
+
+#define DWT_CTRL_CYCCNTENA_Pos              0U                                         /*!< DWT CTRL: CYCCNTENA Position */
+#define DWT_CTRL_CYCCNTENA_Msk             (0x1UL /*<< DWT_CTRL_CYCCNTENA_Pos*/)       /*!< DWT CTRL: CYCCNTENA Mask */
+
+/* DWT CPI Count Register Definitions */
+#define DWT_CPICNT_CPICNT_Pos               0U                                         /*!< DWT CPICNT: CPICNT Position */
+#define DWT_CPICNT_CPICNT_Msk              (0xFFUL /*<< DWT_CPICNT_CPICNT_Pos*/)       /*!< DWT CPICNT: CPICNT Mask */
+
+/* DWT Exception Overhead Count Register Definitions */
+#define DWT_EXCCNT_EXCCNT_Pos               0U                                         /*!< DWT EXCCNT: EXCCNT Position */
+#define DWT_EXCCNT_EXCCNT_Msk              (0xFFUL /*<< DWT_EXCCNT_EXCCNT_Pos*/)       /*!< DWT EXCCNT: EXCCNT Mask */
+
+/* DWT Sleep Count Register Definitions */
+#define DWT_SLEEPCNT_SLEEPCNT_Pos           0U                                         /*!< DWT SLEEPCNT: SLEEPCNT Position */
+#define DWT_SLEEPCNT_SLEEPCNT_Msk          (0xFFUL /*<< DWT_SLEEPCNT_SLEEPCNT_Pos*/)   /*!< DWT SLEEPCNT: SLEEPCNT Mask */
+
+/* DWT LSU Count Register Definitions */
+#define DWT_LSUCNT_LSUCNT_Pos               0U                                         /*!< DWT LSUCNT: LSUCNT Position */
+#define DWT_LSUCNT_LSUCNT_Msk              (0xFFUL /*<< DWT_LSUCNT_LSUCNT_Pos*/)       /*!< DWT LSUCNT: LSUCNT Mask */
+
+/* DWT Folded-instruction Count Register Definitions */
+#define DWT_FOLDCNT_FOLDCNT_Pos             0U                                         /*!< DWT FOLDCNT: FOLDCNT Position */
+#define DWT_FOLDCNT_FOLDCNT_Msk            (0xFFUL /*<< DWT_FOLDCNT_FOLDCNT_Pos*/)     /*!< DWT FOLDCNT: FOLDCNT Mask */
+
+/* DWT Comparator Function Register Definitions */
+#define DWT_FUNCTION_ID_Pos                27U                                         /*!< DWT FUNCTION: ID Position */
+#define DWT_FUNCTION_ID_Msk                (0x1FUL << DWT_FUNCTION_ID_Pos)             /*!< DWT FUNCTION: ID Mask */
+
+#define DWT_FUNCTION_MATCHED_Pos           24U                                         /*!< DWT FUNCTION: MATCHED Position */
+#define DWT_FUNCTION_MATCHED_Msk           (0x1UL << DWT_FUNCTION_MATCHED_Pos)         /*!< DWT FUNCTION: MATCHED Mask */
+
+#define DWT_FUNCTION_DATAVSIZE_Pos         10U                                         /*!< DWT FUNCTION: DATAVSIZE Position */
+#define DWT_FUNCTION_DATAVSIZE_Msk         (0x3UL << DWT_FUNCTION_DATAVSIZE_Pos)       /*!< DWT FUNCTION: DATAVSIZE Mask */
+
+#define DWT_FUNCTION_ACTION_Pos             4U                                         /*!< DWT FUNCTION: ACTION Position */
+#define DWT_FUNCTION_ACTION_Msk            (0x1UL << DWT_FUNCTION_ACTION_Pos)          /*!< DWT FUNCTION: ACTION Mask */
+
+#define DWT_FUNCTION_MATCH_Pos              0U                                         /*!< DWT FUNCTION: MATCH Position */
+#define DWT_FUNCTION_MATCH_Msk             (0xFUL /*<< DWT_FUNCTION_MATCH_Pos*/)       /*!< DWT FUNCTION: MATCH Mask */
+
+/*@}*/ /* end of group CMSIS_DWT */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup MemSysCtl_Type     Memory System Control Registers (IMPLEMENTATION DEFINED)
+  \brief    Type definitions for the Memory System Control Registers (MEMSYSCTL)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Memory System Control Registers (MEMSYSCTL).
+ */
+typedef struct
+{
+  __IOM uint32_t MSCR;                   /*!< Offset: 0x000 (R/W)  Memory System Control Register */
+  __IOM uint32_t PFCR;                   /*!< Offset: 0x004 (R/W)  Prefetcher Control Register */
+        uint32_t RESERVED1[2U];
+  __IOM uint32_t ITCMCR;                 /*!< Offset: 0x010 (R/W)  ITCM Control Register */
+  __IOM uint32_t DTCMCR;                 /*!< Offset: 0x014 (R/W)  DTCM Control Register */
+  __IOM uint32_t PAHBCR;                 /*!< Offset: 0x018 (R/W)  P-AHB Control Register */
+        uint32_t RESERVED2[313U];
+  __IOM uint32_t ITGU_CTRL;              /*!< Offset: 0x500 (R/W)  ITGU Control Register */
+  __IOM uint32_t ITGU_CFG;               /*!< Offset: 0x504 (R/W)  ITGU Configuration Register */
+        uint32_t RESERVED3[2U];
+  __IOM uint32_t ITGU_LUT[16U];          /*!< Offset: 0x510 (R/W)  ITGU Look Up Table Register */
+        uint32_t RESERVED4[44U];
+  __IOM uint32_t DTGU_CTRL;              /*!< Offset: 0x600 (R/W)  DTGU Control Registers */
+  __IOM uint32_t DTGU_CFG;               /*!< Offset: 0x604 (R/W)  DTGU Configuration Register */
+        uint32_t RESERVED5[2U];
+  __IOM uint32_t DTGU_LUT[16U];          /*!< Offset: 0x610 (R/W)  DTGU Look Up Table Register */
+} MemSysCtl_Type;
+
+/* MEMSYSCTL Memory System Control Register (MSCR) Register Definitions */
+#define MEMSYSCTL_MSCR_CPWRDN_Pos          17U                                         /*!< MEMSYSCTL MSCR: CPWRDN Position */
+#define MEMSYSCTL_MSCR_CPWRDN_Msk          (0x1UL << MEMSYSCTL_MSCR_CPWRDN_Pos)        /*!< MEMSYSCTL MSCR: CPWRDN Mask */
+
+#define MEMSYSCTL_MSCR_DCCLEAN_Pos         16U                                         /*!< MEMSYSCTL MSCR: DCCLEAN Position */
+#define MEMSYSCTL_MSCR_DCCLEAN_Msk         (0x1UL << MEMSYSCTL_MSCR_DCCLEAN_Pos)       /*!< MEMSYSCTL MSCR: DCCLEAN Mask */
+
+#define MEMSYSCTL_MSCR_ICACTIVE_Pos        13U                                         /*!< MEMSYSCTL MSCR: ICACTIVE Position */
+#define MEMSYSCTL_MSCR_ICACTIVE_Msk        (0x1UL << MEMSYSCTL_MSCR_ICACTIVE_Pos)      /*!< MEMSYSCTL MSCR: ICACTIVE Mask */
+
+#define MEMSYSCTL_MSCR_DCACTIVE_Pos        12U                                         /*!< MEMSYSCTL MSCR: DCACTIVE Position */
+#define MEMSYSCTL_MSCR_DCACTIVE_Msk        (0x1UL << MEMSYSCTL_MSCR_DCACTIVE_Pos)      /*!< MEMSYSCTL MSCR: DCACTIVE Mask */
+
+#define MEMSYSCTL_MSCR_EVECCFAULT_Pos       3U                                         /*!< MEMSYSCTL MSCR: EVECCFAULT Position */
+#define MEMSYSCTL_MSCR_EVECCFAULT_Msk      (0x1UL << MEMSYSCTL_MSCR_EVECCFAULT_Pos)    /*!< MEMSYSCTL MSCR: EVECCFAULT Mask */
+
+#define MEMSYSCTL_MSCR_FORCEWT_Pos          2U                                         /*!< MEMSYSCTL MSCR: FORCEWT Position */
+#define MEMSYSCTL_MSCR_FORCEWT_Msk         (0x1UL << MEMSYSCTL_MSCR_FORCEWT_Pos)       /*!< MEMSYSCTL MSCR: FORCEWT Mask */
+
+#define MEMSYSCTL_MSCR_ECCEN_Pos            1U                                         /*!< MEMSYSCTL MSCR: ECCEN Position */
+#define MEMSYSCTL_MSCR_ECCEN_Msk           (0x1UL << MEMSYSCTL_MSCR_ECCEN_Pos)         /*!< MEMSYSCTL MSCR: ECCEN Mask */
+
+/* MEMSYSCTL Prefetcher Control Register (PFCR) Register Definitions */
+#define MEMSYSCTL_PFCR_DIS_NLP_Pos          7U                                         /*!< MEMSYSCTL PFCR: DIS_NLP Position */
+#define MEMSYSCTL_PFCR_DIS_NLP_Msk         (0x1UL << MEMSYSCTL_PFCR_DIS_NLP_Pos)       /*!< MEMSYSCTL PFCR: DIS_NLP Mask */
+
+#define MEMSYSCTL_PFCR_ENABLE_Pos           0U                                         /*!< MEMSYSCTL PFCR: ENABLE Position */
+#define MEMSYSCTL_PFCR_ENABLE_Msk          (0x1UL /*<< MEMSYSCTL_PFCR_ENABLE_Pos*/)    /*!< MEMSYSCTL PFCR: ENABLE Mask */
+
+/* MEMSYSCTL ITCM Control Register (ITCMCR) Register Definitions */
+#define MEMSYSCTL_ITCMCR_SZ_Pos             3U                                         /*!< MEMSYSCTL ITCMCR: SZ Position */
+#define MEMSYSCTL_ITCMCR_SZ_Msk            (0xFUL << MEMSYSCTL_ITCMCR_SZ_Pos)          /*!< MEMSYSCTL ITCMCR: SZ Mask */
+
+#define MEMSYSCTL_ITCMCR_EN_Pos             0U                                         /*!< MEMSYSCTL ITCMCR: EN Position */
+#define MEMSYSCTL_ITCMCR_EN_Msk            (0x1UL /*<< MEMSYSCTL_ITCMCR_EN_Pos*/)      /*!< MEMSYSCTL ITCMCR: EN Mask */
+
+/* MEMSYSCTL DTCM Control Register (DTCMCR) Register Definitions */
+#define MEMSYSCTL_DTCMCR_SZ_Pos             3U                                         /*!< MEMSYSCTL DTCMCR: SZ Position */
+#define MEMSYSCTL_DTCMCR_SZ_Msk            (0xFUL << MEMSYSCTL_DTCMCR_SZ_Pos)          /*!< MEMSYSCTL DTCMCR: SZ Mask */
+
+#define MEMSYSCTL_DTCMCR_EN_Pos             0U                                         /*!< MEMSYSCTL DTCMCR: EN Position */
+#define MEMSYSCTL_DTCMCR_EN_Msk            (0x1UL /*<< MEMSYSCTL_DTCMCR_EN_Pos*/)      /*!< MEMSYSCTL DTCMCR: EN Mask */
+
+/* MEMSYSCTL P-AHB Control Register (PAHBCR) Register Definitions */
+#define MEMSYSCTL_PAHBCR_SZ_Pos             1U                                         /*!< MEMSYSCTL PAHBCR: SZ Position */
+#define MEMSYSCTL_PAHBCR_SZ_Msk            (0x7UL << MEMSYSCTL_PAHBCR_SZ_Pos)          /*!< MEMSYSCTL PAHBCR: SZ Mask */
+
+#define MEMSYSCTL_PAHBCR_EN_Pos             0U                                         /*!< MEMSYSCTL PAHBCR: EN Position */
+#define MEMSYSCTL_PAHBCR_EN_Msk            (0x1UL /*<< MEMSYSCTL_PAHBCR_EN_Pos*/)      /*!< MEMSYSCTL PAHBCR: EN Mask */
+
+/* MEMSYSCTL ITGU Control Register (ITGU_CTRL) Register Definitions */
+#define MEMSYSCTL_ITGU_CTRL_DEREN_Pos       1U                                         /*!< MEMSYSCTL ITGU_CTRL: DEREN Position */
+#define MEMSYSCTL_ITGU_CTRL_DEREN_Msk      (0x1UL << MEMSYSCTL_ITGU_CTRL_DEREN_Pos)    /*!< MEMSYSCTL ITGU_CTRL: DEREN Mask */
+
+#define MEMSYSCTL_ITGU_CTRL_DBFEN_Pos       0U                                         /*!< MEMSYSCTL ITGU_CTRL: DBFEN Position */
+#define MEMSYSCTL_ITGU_CTRL_DBFEN_Msk      (0x1UL /*<< MEMSYSCTL_ITGU_CTRL_DBFEN_Pos*/) /*!< MEMSYSCTL ITGU_CTRL: DBFEN Mask */
+
+/* MEMSYSCTL ITGU Configuration Register (ITGU_CFG) Register Definitions */
+#define MEMSYSCTL_ITGU_CFG_PRESENT_Pos     31U                                         /*!< MEMSYSCTL ITGU_CFG: PRESENT Position */
+#define MEMSYSCTL_ITGU_CFG_PRESENT_Msk     (0x1UL << MEMSYSCTL_ITGU_CFG_PRESENT_Pos)   /*!< MEMSYSCTL ITGU_CFG: PRESENT Mask */
+
+#define MEMSYSCTL_ITGU_CFG_NUMBLKS_Pos      8U                                         /*!< MEMSYSCTL ITGU_CFG: NUMBLKS Position */
+#define MEMSYSCTL_ITGU_CFG_NUMBLKS_Msk     (0xFUL << MEMSYSCTL_ITGU_CFG_NUMBLKS_Pos)   /*!< MEMSYSCTL ITGU_CFG: NUMBLKS Mask */
+
+#define MEMSYSCTL_ITGU_CFG_BLKSZ_Pos        0U                                         /*!< MEMSYSCTL ITGU_CFG: BLKSZ Position */
+#define MEMSYSCTL_ITGU_CFG_BLKSZ_Msk       (0xFUL /*<< MEMSYSCTL_ITGU_CFG_BLKSZ_Pos*/) /*!< MEMSYSCTL ITGU_CFG: BLKSZ Mask */
+
+/* MEMSYSCTL DTGU Control Registers (DTGU_CTRL) Register Definitions */
+#define MEMSYSCTL_DTGU_CTRL_DEREN_Pos       1U                                         /*!< MEMSYSCTL DTGU_CTRL: DEREN Position */
+#define MEMSYSCTL_DTGU_CTRL_DEREN_Msk      (0x1UL << MEMSYSCTL_DTGU_CTRL_DEREN_Pos)    /*!< MEMSYSCTL DTGU_CTRL: DEREN Mask */
+
+#define MEMSYSCTL_DTGU_CTRL_DBFEN_Pos       0U                                         /*!< MEMSYSCTL DTGU_CTRL: DBFEN Position */
+#define MEMSYSCTL_DTGU_CTRL_DBFEN_Msk      (0x1UL /*<< MEMSYSCTL_DTGU_CTRL_DBFEN_Pos*/) /*!< MEMSYSCTL DTGU_CTRL: DBFEN Mask */
+
+/* MEMSYSCTL DTGU Configuration Register (DTGU_CFG) Register Definitions */
+#define MEMSYSCTL_DTGU_CFG_PRESENT_Pos     31U                                         /*!< MEMSYSCTL DTGU_CFG: PRESENT Position */
+#define MEMSYSCTL_DTGU_CFG_PRESENT_Msk     (0x1UL << MEMSYSCTL_DTGU_CFG_PRESENT_Pos)   /*!< MEMSYSCTL DTGU_CFG: PRESENT Mask */
+
+#define MEMSYSCTL_DTGU_CFG_NUMBLKS_Pos      8U                                         /*!< MEMSYSCTL DTGU_CFG: NUMBLKS Position */
+#define MEMSYSCTL_DTGU_CFG_NUMBLKS_Msk     (0xFUL << MEMSYSCTL_DTGU_CFG_NUMBLKS_Pos)   /*!< MEMSYSCTL DTGU_CFG: NUMBLKS Mask */
+
+#define MEMSYSCTL_DTGU_CFG_BLKSZ_Pos        0U                                         /*!< MEMSYSCTL DTGU_CFG: BLKSZ Position */
+#define MEMSYSCTL_DTGU_CFG_BLKSZ_Msk       (0xFUL /*<< MEMSYSCTL_DTGU_CFG_BLKSZ_Pos*/) /*!< MEMSYSCTL DTGU_CFG: BLKSZ Mask */
+
+
+/*@}*/ /* end of group MemSysCtl_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup PwrModCtl_Type     Power Mode Control Registers
+  \brief    Type definitions for the Power Mode Control Registers (PWRMODCTL)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Power Mode Control Registers (PWRMODCTL).
+ */
+typedef struct
+{
+  __IOM uint32_t CPDLPSTATE;             /*!< Offset: 0x000 (R/W)  Core Power Domain Low Power State Register */
+  __IOM uint32_t DPDLPSTATE;             /*!< Offset: 0x004 (R/W)  Debug Power Domain Low Power State Register */
+} PwrModCtl_Type;
+
+/* PWRMODCTL Core Power Domain Low Power State (CPDLPSTATE) Register Definitions */
+#define PWRMODCTL_CPDLPSTATE_RLPSTATE_Pos   8U                                              /*!< PWRMODCTL CPDLPSTATE: RLPSTATE Position */
+#define PWRMODCTL_CPDLPSTATE_RLPSTATE_Msk  (0x3UL << PWRMODCTL_CPDLPSTATE_RLPSTATE_Pos)     /*!< PWRMODCTL CPDLPSTATE: RLPSTATE Mask */
+
+#define PWRMODCTL_CPDLPSTATE_ELPSTATE_Pos   4U                                              /*!< PWRMODCTL CPDLPSTATE: ELPSTATE Position */
+#define PWRMODCTL_CPDLPSTATE_ELPSTATE_Msk  (0x3UL << PWRMODCTL_CPDLPSTATE_ELPSTATE_Pos)     /*!< PWRMODCTL CPDLPSTATE: ELPSTATE Mask */
+
+#define PWRMODCTL_CPDLPSTATE_CLPSTATE_Pos   0U                                              /*!< PWRMODCTL CPDLPSTATE: CLPSTATE Position */
+#define PWRMODCTL_CPDLPSTATE_CLPSTATE_Msk  (0x3UL /*<< PWRMODCTL_CPDLPSTATE_CLPSTATE_Pos*/) /*!< PWRMODCTL CPDLPSTATE: CLPSTATE Mask */
+
+/* PWRMODCTL Debug Power Domain Low Power State (DPDLPSTATE) Register Definitions */
+#define PWRMODCTL_DPDLPSTATE_DLPSTATE_Pos   0U                                              /*!< PWRMODCTL DPDLPSTATE: DLPSTATE Position */
+#define PWRMODCTL_DPDLPSTATE_DLPSTATE_Msk  (0x3UL /*<< PWRMODCTL_DPDLPSTATE_DLPSTATE_Pos*/) /*!< PWRMODCTL DPDLPSTATE: DLPSTATE Mask */
+
+/*@}*/ /* end of group PwrModCtl_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup EWIC_Type     External Wakeup Interrupt Controller Registers
+  \brief    Type definitions for the External Wakeup Interrupt Controller Registers (EWIC)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the External Wakeup Interrupt Controller Registers (EWIC).
+ */
+typedef struct
+{
+  __OM  uint32_t EVENTSPR;               /*!< Offset: 0x000 ( /W)  Event Set Pending Register */
+        uint32_t RESERVED0[31U];
+  __IM  uint32_t EVENTMASKA;             /*!< Offset: 0x080 (R/W)  Event Mask A Register */
+  __IM  uint32_t EVENTMASK[15];          /*!< Offset: 0x084 (R/W)  Event Mask Register */
+} EWIC_Type;
+
+/* EWIC External Wakeup Interrupt Controller (EVENTSPR) Register Definitions */
+#define EWIC_EVENTSPR_EDBGREQ_Pos   2U                                                 /*!< EWIC EVENTSPR: EDBGREQ Position */
+#define EWIC_EVENTSPR_EDBGREQ_Msk  (0x1UL << EWIC_EVENTSPR_EDBGREQ_Pos)                /*!< EWIC EVENTSPR: EDBGREQ Mask */
+
+#define EWIC_EVENTSPR_NMI_Pos   1U                                                     /*!< EWIC EVENTSPR: NMI Position */
+#define EWIC_EVENTSPR_NMI_Msk  (0x1UL << EWIC_EVENTSPR_NMI_Pos)                        /*!< EWIC EVENTSPR: NMI Mask */
+
+#define EWIC_EVENTSPR_EVENT_Pos   0U                                                   /*!< EWIC EVENTSPR: EVENT Position */
+#define EWIC_EVENTSPR_EVENT_Msk  (0x1UL /*<< EWIC_EVENTSPR_EVENT_Pos*/)                /*!< EWIC EVENTSPR: EVENT Mask */
+
+/* EWIC External Wakeup Interrupt Controller (EVENTMASKA) Register Definitions */
+#define EWIC_EVENTMASKA_EDBGREQ_Pos   2U                                               /*!< EWIC EVENTMASKA: EDBGREQ Position */
+#define EWIC_EVENTMASKA_EDBGREQ_Msk  (0x1UL << EWIC_EVENTMASKA_EDBGREQ_Pos)            /*!< EWIC EVENTMASKA: EDBGREQ Mask */
+
+#define EWIC_EVENTMASKA_NMI_Pos   1U                                                   /*!< EWIC EVENTMASKA: NMI Position */
+#define EWIC_EVENTMASKA_NMI_Msk  (0x1UL << EWIC_EVENTMASKA_NMI_Pos)                    /*!< EWIC EVENTMASKA: NMI Mask */
+
+#define EWIC_EVENTMASKA_EVENT_Pos   0U                                                 /*!< EWIC EVENTMASKA: EVENT Position */
+#define EWIC_EVENTMASKA_EVENT_Msk  (0x1UL /*<< EWIC_EVENTMASKA_EVENT_Pos*/)            /*!< EWIC EVENTMASKA: EVENT Mask */
+
+/* EWIC External Wakeup Interrupt Controller (EVENTMASK) Register Definitions */
+#define EWIC_EVENTMASK_IRQ_Pos   0U                                                    /*!< EWIC EVENTMASKA: IRQ Position */
+#define EWIC_EVENTMASK_IRQ_Msk  (0xFFFFFFFFUL /*<< EWIC_EVENTMASKA_IRQ_Pos*/)          /*!< EWIC EVENTMASKA: IRQ Mask */
+
+/*@}*/ /* end of group EWIC_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup ErrBnk_Type     Error Banking Registers (IMPLEMENTATION DEFINED)
+  \brief    Type definitions for the Error Banking Registers (ERRBNK)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Error Banking Registers (ERRBNK).
+ */
+typedef struct
+{
+  __IOM uint32_t IEBR0;                  /*!< Offset: 0x000 (R/W)  Instruction Cache Error Bank Register 0 */
+  __IOM uint32_t IEBR1;                  /*!< Offset: 0x004 (R/W)  Instruction Cache Error Bank Register 1 */
+        uint32_t RESERVED0[2U];
+  __IOM uint32_t DEBR0;                  /*!< Offset: 0x010 (R/W)  Data Cache Error Bank Register 0 */
+  __IOM uint32_t DEBR1;                  /*!< Offset: 0x014 (R/W)  Data Cache Error Bank Register 1 */
+        uint32_t RESERVED1[2U];
+  __IOM uint32_t TEBR0;                  /*!< Offset: 0x020 (R/W)  TCM Error Bank Register 0 */
+        uint32_t RESERVED2[1U];
+  __IOM uint32_t TEBR1;                  /*!< Offset: 0x028 (R/W)  TCM Error Bank Register 1 */
+} ErrBnk_Type;
+
+/* ERRBNK Instruction Cache Error Bank Register 0 (IEBR0) Register Definitions */
+#define ERRBNK_IEBR0_SWDEF_Pos             30U                                         /*!< ERRBNK IEBR0: SWDEF Position */
+#define ERRBNK_IEBR0_SWDEF_Msk             (0x3UL << ERRBNK_IEBR0_SWDEF_Pos)           /*!< ERRBNK IEBR0: SWDEF Mask */
+
+#define ERRBNK_IEBR0_BANK_Pos              16U                                         /*!< ERRBNK IEBR0: BANK Position */
+#define ERRBNK_IEBR0_BANK_Msk              (0x1UL << ERRBNK_IEBR0_BANK_Pos)            /*!< ERRBNK IEBR0: BANK Mask */
+
+#define ERRBNK_IEBR0_LOCATION_Pos           2U                                         /*!< ERRBNK IEBR0: LOCATION Position */
+#define ERRBNK_IEBR0_LOCATION_Msk          (0x3FFFUL << ERRBNK_IEBR0_LOCATION_Pos)     /*!< ERRBNK IEBR0: LOCATION Mask */
+
+#define ERRBNK_IEBR0_LOCKED_Pos             1U                                         /*!< ERRBNK IEBR0: LOCKED Position */
+#define ERRBNK_IEBR0_LOCKED_Msk            (0x1UL << ERRBNK_IEBR0_LOCKED_Pos)          /*!< ERRBNK IEBR0: LOCKED Mask */
+
+#define ERRBNK_IEBR0_VALID_Pos              0U                                         /*!< ERRBNK IEBR0: VALID Position */
+#define ERRBNK_IEBR0_VALID_Msk             (0x1UL << /*ERRBNK_IEBR0_VALID_Pos*/)       /*!< ERRBNK IEBR0: VALID Mask */
+
+/* ERRBNK Instruction Cache Error Bank Register 1 (IEBR1) Register Definitions */
+#define ERRBNK_IEBR1_SWDEF_Pos             30U                                         /*!< ERRBNK IEBR1: SWDEF Position */
+#define ERRBNK_IEBR1_SWDEF_Msk             (0x3UL << ERRBNK_IEBR1_SWDEF_Pos)           /*!< ERRBNK IEBR1: SWDEF Mask */
+
+#define ERRBNK_IEBR1_BANK_Pos              16U                                         /*!< ERRBNK IEBR1: BANK Position */
+#define ERRBNK_IEBR1_BANK_Msk              (0x1UL << ERRBNK_IEBR1_BANK_Pos)            /*!< ERRBNK IEBR1: BANK Mask */
+
+#define ERRBNK_IEBR1_LOCATION_Pos           2U                                         /*!< ERRBNK IEBR1: LOCATION Position */
+#define ERRBNK_IEBR1_LOCATION_Msk          (0x3FFFUL << ERRBNK_IEBR1_LOCATION_Pos)     /*!< ERRBNK IEBR1: LOCATION Mask */
+
+#define ERRBNK_IEBR1_LOCKED_Pos             1U                                         /*!< ERRBNK IEBR1: LOCKED Position */
+#define ERRBNK_IEBR1_LOCKED_Msk            (0x1UL << ERRBNK_IEBR1_LOCKED_Pos)          /*!< ERRBNK IEBR1: LOCKED Mask */
+
+#define ERRBNK_IEBR1_VALID_Pos              0U                                         /*!< ERRBNK IEBR1: VALID Position */
+#define ERRBNK_IEBR1_VALID_Msk             (0x1UL << /*ERRBNK_IEBR1_VALID_Pos*/)       /*!< ERRBNK IEBR1: VALID Mask */
+
+/* ERRBNK Data Cache Error Bank Register 0 (DEBR0) Register Definitions */
+#define ERRBNK_DEBR0_SWDEF_Pos             30U                                         /*!< ERRBNK DEBR0: SWDEF Position */
+#define ERRBNK_DEBR0_SWDEF_Msk             (0x3UL << ERRBNK_DEBR0_SWDEF_Pos)           /*!< ERRBNK DEBR0: SWDEF Mask */
+
+#define ERRBNK_DEBR0_TYPE_Pos              17U                                         /*!< ERRBNK DEBR0: TYPE Position */
+#define ERRBNK_DEBR0_TYPE_Msk              (0x1UL << ERRBNK_DEBR0_TYPE_Pos)            /*!< ERRBNK DEBR0: TYPE Mask */
+
+#define ERRBNK_DEBR0_BANK_Pos              16U                                         /*!< ERRBNK DEBR0: BANK Position */
+#define ERRBNK_DEBR0_BANK_Msk              (0x1UL << ERRBNK_DEBR0_BANK_Pos)            /*!< ERRBNK DEBR0: BANK Mask */
+
+#define ERRBNK_DEBR0_LOCATION_Pos           2U                                         /*!< ERRBNK DEBR0: LOCATION Position */
+#define ERRBNK_DEBR0_LOCATION_Msk          (0x3FFFUL << ERRBNK_DEBR0_LOCATION_Pos)     /*!< ERRBNK DEBR0: LOCATION Mask */
+
+#define ERRBNK_DEBR0_LOCKED_Pos             1U                                         /*!< ERRBNK DEBR0: LOCKED Position */
+#define ERRBNK_DEBR0_LOCKED_Msk            (0x1UL << ERRBNK_DEBR0_LOCKED_Pos)          /*!< ERRBNK DEBR0: LOCKED Mask */
+
+#define ERRBNK_DEBR0_VALID_Pos              0U                                         /*!< ERRBNK DEBR0: VALID Position */
+#define ERRBNK_DEBR0_VALID_Msk             (0x1UL << /*ERRBNK_DEBR0_VALID_Pos*/)       /*!< ERRBNK DEBR0: VALID Mask */
+
+/* ERRBNK Data Cache Error Bank Register 1 (DEBR1) Register Definitions */
+#define ERRBNK_DEBR1_SWDEF_Pos             30U                                         /*!< ERRBNK DEBR1: SWDEF Position */
+#define ERRBNK_DEBR1_SWDEF_Msk             (0x3UL << ERRBNK_DEBR1_SWDEF_Pos)           /*!< ERRBNK DEBR1: SWDEF Mask */
+
+#define ERRBNK_DEBR1_TYPE_Pos              17U                                         /*!< ERRBNK DEBR1: TYPE Position */
+#define ERRBNK_DEBR1_TYPE_Msk              (0x1UL << ERRBNK_DEBR1_TYPE_Pos)            /*!< ERRBNK DEBR1: TYPE Mask */
+
+#define ERRBNK_DEBR1_BANK_Pos              16U                                         /*!< ERRBNK DEBR1: BANK Position */
+#define ERRBNK_DEBR1_BANK_Msk              (0x1UL << ERRBNK_DEBR1_BANK_Pos)            /*!< ERRBNK DEBR1: BANK Mask */
+
+#define ERRBNK_DEBR1_LOCATION_Pos           2U                                         /*!< ERRBNK DEBR1: LOCATION Position */
+#define ERRBNK_DEBR1_LOCATION_Msk          (0x3FFFUL << ERRBNK_DEBR1_LOCATION_Pos)     /*!< ERRBNK DEBR1: LOCATION Mask */
+
+#define ERRBNK_DEBR1_LOCKED_Pos             1U                                         /*!< ERRBNK DEBR1: LOCKED Position */
+#define ERRBNK_DEBR1_LOCKED_Msk            (0x1UL << ERRBNK_DEBR1_LOCKED_Pos)          /*!< ERRBNK DEBR1: LOCKED Mask */
+
+#define ERRBNK_DEBR1_VALID_Pos              0U                                         /*!< ERRBNK DEBR1: VALID Position */
+#define ERRBNK_DEBR1_VALID_Msk             (0x1UL << /*ERRBNK_DEBR1_VALID_Pos*/)       /*!< ERRBNK DEBR1: VALID Mask */
+
+/* ERRBNK TCM Error Bank Register 0 (TEBR0) Register Definitions */
+#define ERRBNK_TEBR0_SWDEF_Pos             30U                                         /*!< ERRBNK TEBR0: SWDEF Position */
+#define ERRBNK_TEBR0_SWDEF_Msk             (0x3UL << ERRBNK_TEBR0_SWDEF_Pos)           /*!< ERRBNK TEBR0: SWDEF Mask */
+
+#define ERRBNK_TEBR0_POISON_Pos            28U                                         /*!< ERRBNK TEBR0: POISON Position */
+#define ERRBNK_TEBR0_POISON_Msk            (0x1UL << ERRBNK_TEBR0_POISON_Pos)          /*!< ERRBNK TEBR0: POISON Mask */
+
+#define ERRBNK_TEBR0_TYPE_Pos              27U                                         /*!< ERRBNK TEBR0: TYPE Position */
+#define ERRBNK_TEBR0_TYPE_Msk              (0x1UL << ERRBNK_TEBR0_TYPE_Pos)            /*!< ERRBNK TEBR0: TYPE Mask */
+
+#define ERRBNK_TEBR0_BANK_Pos              24U                                         /*!< ERRBNK TEBR0: BANK Position */
+#define ERRBNK_TEBR0_BANK_Msk              (0x3UL << ERRBNK_TEBR0_BANK_Pos)            /*!< ERRBNK TEBR0: BANK Mask */
+
+#define ERRBNK_TEBR0_LOCATION_Pos           2U                                         /*!< ERRBNK TEBR0: LOCATION Position */
+#define ERRBNK_TEBR0_LOCATION_Msk          (0x3FFFFFUL << ERRBNK_TEBR0_LOCATION_Pos)   /*!< ERRBNK TEBR0: LOCATION Mask */
+
+#define ERRBNK_TEBR0_LOCKED_Pos             1U                                         /*!< ERRBNK TEBR0: LOCKED Position */
+#define ERRBNK_TEBR0_LOCKED_Msk            (0x1UL << ERRBNK_TEBR0_LOCKED_Pos)          /*!< ERRBNK TEBR0: LOCKED Mask */
+
+#define ERRBNK_TEBR0_VALID_Pos              0U                                         /*!< ERRBNK TEBR0: VALID Position */
+#define ERRBNK_TEBR0_VALID_Msk             (0x1UL << /*ERRBNK_TEBR0_VALID_Pos*/)       /*!< ERRBNK TEBR0: VALID Mask */
+
+/* ERRBNK TCM Error Bank Register 1 (TEBR1) Register Definitions */
+#define ERRBNK_TEBR1_SWDEF_Pos             30U                                         /*!< ERRBNK TEBR1: SWDEF Position */
+#define ERRBNK_TEBR1_SWDEF_Msk             (0x3UL << ERRBNK_TEBR1_SWDEF_Pos)           /*!< ERRBNK TEBR1: SWDEF Mask */
+
+#define ERRBNK_TEBR1_POISON_Pos            28U                                         /*!< ERRBNK TEBR1: POISON Position */
+#define ERRBNK_TEBR1_POISON_Msk            (0x1UL << ERRBNK_TEBR1_POISON_Pos)          /*!< ERRBNK TEBR1: POISON Mask */
+
+#define ERRBNK_TEBR1_TYPE_Pos              27U                                         /*!< ERRBNK TEBR1: TYPE Position */
+#define ERRBNK_TEBR1_TYPE_Msk              (0x1UL << ERRBNK_TEBR1_TYPE_Pos)            /*!< ERRBNK TEBR1: TYPE Mask */
+
+#define ERRBNK_TEBR1_BANK_Pos              24U                                         /*!< ERRBNK TEBR1: BANK Position */
+#define ERRBNK_TEBR1_BANK_Msk              (0x3UL << ERRBNK_TEBR1_BANK_Pos)            /*!< ERRBNK TEBR1: BANK Mask */
+
+#define ERRBNK_TEBR1_LOCATION_Pos           2U                                         /*!< ERRBNK TEBR1: LOCATION Position */
+#define ERRBNK_TEBR1_LOCATION_Msk          (0x3FFFFFUL << ERRBNK_TEBR1_LOCATION_Pos)   /*!< ERRBNK TEBR1: LOCATION Mask */
+
+#define ERRBNK_TEBR1_LOCKED_Pos             1U                                         /*!< ERRBNK TEBR1: LOCKED Position */
+#define ERRBNK_TEBR1_LOCKED_Msk            (0x1UL << ERRBNK_TEBR1_LOCKED_Pos)          /*!< ERRBNK TEBR1: LOCKED Mask */
+
+#define ERRBNK_TEBR1_VALID_Pos              0U                                         /*!< ERRBNK TEBR1: VALID Position */
+#define ERRBNK_TEBR1_VALID_Msk             (0x1UL << /*ERRBNK_TEBR1_VALID_Pos*/)       /*!< ERRBNK TEBR1: VALID Mask */
+
+/*@}*/ /* end of group ErrBnk_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup PrcCfgInf_Type     Processor Configuration Information Registers (IMPLEMENTATION DEFINED)
+  \brief    Type definitions for the Processor Configuration Information Registerss (PRCCFGINF)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Processor Configuration Information Registerss (PRCCFGINF).
+ */
+typedef struct
+{
+  __OM  uint32_t CFGINFOSEL;             /*!< Offset: 0x000 ( /W)  Processor Configuration Information Selection Register */
+  __IM  uint32_t CFGINFORD;              /*!< Offset: 0x004 (R/ )  Processor Configuration Information Read Data Register */
+} PrcCfgInf_Type;
+
+/* PRCCFGINF Processor Configuration Information Selection Register (CFGINFOSEL) Definitions */
+
+/* PRCCFGINF Processor Configuration Information Read Data Register (CFGINFORD) Definitions */
+
+/*@}*/ /* end of group PrcCfgInf_Type */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_TPI     Trace Port Interface (TPI)
+  \brief    Type definitions for the Trace Port Interface (TPI)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Trace Port Interface Register (TPI).
+ */
+typedef struct
+{
+  __IM  uint32_t SSPSR;                  /*!< Offset: 0x000 (R/ )  Supported Parallel Port Sizes Register */
+  __IOM uint32_t CSPSR;                  /*!< Offset: 0x004 (R/W)  Current Parallel Port Sizes Register */
+        uint32_t RESERVED0[2U];
+  __IOM uint32_t ACPR;                   /*!< Offset: 0x010 (R/W)  Asynchronous Clock Prescaler Register */
+        uint32_t RESERVED1[55U];
+  __IOM uint32_t SPPR;                   /*!< Offset: 0x0F0 (R/W)  Selected Pin Protocol Register */
+        uint32_t RESERVED2[131U];
+  __IM  uint32_t FFSR;                   /*!< Offset: 0x300 (R/ )  Formatter and Flush Status Register */
+  __IOM uint32_t FFCR;                   /*!< Offset: 0x304 (R/W)  Formatter and Flush Control Register */
+  __IOM uint32_t PSCR;                   /*!< Offset: 0x308 (R/W)  Periodic Synchronization Control Register */
+        uint32_t RESERVED3[809U];
+  __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  Software Lock Access Register */
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  Software Lock Status Register */
+        uint32_t RESERVED4[4U];
+  __IM  uint32_t TYPE;                   /*!< Offset: 0xFC8 (R/ )  Device Identifier Register */
+  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  Device Type Register */
+} TPI_Type;
+
+/* TPI Asynchronous Clock Prescaler Register Definitions */
+#define TPI_ACPR_SWOSCALER_Pos              0U                                         /*!< TPI ACPR: SWOSCALER Position */
+#define TPI_ACPR_SWOSCALER_Msk             (0xFFFFUL /*<< TPI_ACPR_SWOSCALER_Pos*/)    /*!< TPI ACPR: SWOSCALER Mask */
+
+/* TPI Selected Pin Protocol Register Definitions */
+#define TPI_SPPR_TXMODE_Pos                 0U                                         /*!< TPI SPPR: TXMODE Position */
+#define TPI_SPPR_TXMODE_Msk                (0x3UL /*<< TPI_SPPR_TXMODE_Pos*/)          /*!< TPI SPPR: TXMODE Mask */
+
+/* TPI Formatter and Flush Status Register Definitions */
+#define TPI_FFSR_FtNonStop_Pos              3U                                         /*!< TPI FFSR: FtNonStop Position */
+#define TPI_FFSR_FtNonStop_Msk             (0x1UL << TPI_FFSR_FtNonStop_Pos)           /*!< TPI FFSR: FtNonStop Mask */
+
+#define TPI_FFSR_TCPresent_Pos              2U                                         /*!< TPI FFSR: TCPresent Position */
+#define TPI_FFSR_TCPresent_Msk             (0x1UL << TPI_FFSR_TCPresent_Pos)           /*!< TPI FFSR: TCPresent Mask */
+
+#define TPI_FFSR_FtStopped_Pos              1U                                         /*!< TPI FFSR: FtStopped Position */
+#define TPI_FFSR_FtStopped_Msk             (0x1UL << TPI_FFSR_FtStopped_Pos)           /*!< TPI FFSR: FtStopped Mask */
+
+#define TPI_FFSR_FlInProg_Pos               0U                                         /*!< TPI FFSR: FlInProg Position */
+#define TPI_FFSR_FlInProg_Msk              (0x1UL /*<< TPI_FFSR_FlInProg_Pos*/)        /*!< TPI FFSR: FlInProg Mask */
+
+/* TPI Formatter and Flush Control Register Definitions */
+#define TPI_FFCR_TrigIn_Pos                 8U                                         /*!< TPI FFCR: TrigIn Position */
+#define TPI_FFCR_TrigIn_Msk                (0x1UL << TPI_FFCR_TrigIn_Pos)              /*!< TPI FFCR: TrigIn Mask */
+
+#define TPI_FFCR_FOnMan_Pos                 6U                                         /*!< TPI FFCR: FOnMan Position */
+#define TPI_FFCR_FOnMan_Msk                (0x1UL << TPI_FFCR_FOnMan_Pos)              /*!< TPI FFCR: FOnMan Mask */
+
+#define TPI_FFCR_EnFmt_Pos                  0U                                         /*!< TPI FFCR: EnFmt Position */
+#define TPI_FFCR_EnFmt_Msk                 (0x3UL << /*TPI_FFCR_EnFmt_Pos*/)           /*!< TPI FFCR: EnFmt Mask */
+
+/* TPI Periodic Synchronization Control Register Definitions */
+#define TPI_PSCR_PSCount_Pos                0U                                         /*!< TPI PSCR: PSCount Position */
+#define TPI_PSCR_PSCount_Msk               (0x1FUL /*<< TPI_PSCR_PSCount_Pos*/)        /*!< TPI PSCR: TPSCount Mask */
+
+/* TPI Software Lock Status Register Definitions */
+#define TPI_LSR_nTT_Pos                     1U                                         /*!< TPI LSR: Not thirty-two bit. Position */
+#define TPI_LSR_nTT_Msk                    (0x1UL << TPI_LSR_nTT_Pos)                  /*!< TPI LSR: Not thirty-two bit. Mask */
+
+#define TPI_LSR_SLK_Pos                     1U                                         /*!< TPI LSR: Software Lock status Position */
+#define TPI_LSR_SLK_Msk                    (0x1UL << TPI_LSR_SLK_Pos)                  /*!< TPI LSR: Software Lock status Mask */
+
+#define TPI_LSR_SLI_Pos                     0U                                         /*!< TPI LSR: Software Lock implemented Position */
+#define TPI_LSR_SLI_Msk                    (0x1UL /*<< TPI_LSR_SLI_Pos*/)              /*!< TPI LSR: Software Lock implemented Mask */
+
+/* TPI DEVID Register Definitions */
+#define TPI_DEVID_NRZVALID_Pos             11U                                         /*!< TPI DEVID: NRZVALID Position */
+#define TPI_DEVID_NRZVALID_Msk             (0x1UL << TPI_DEVID_NRZVALID_Pos)           /*!< TPI DEVID: NRZVALID Mask */
+
+#define TPI_DEVID_MANCVALID_Pos            10U                                         /*!< TPI DEVID: MANCVALID Position */
+#define TPI_DEVID_MANCVALID_Msk            (0x1UL << TPI_DEVID_MANCVALID_Pos)          /*!< TPI DEVID: MANCVALID Mask */
+
+#define TPI_DEVID_PTINVALID_Pos             9U                                         /*!< TPI DEVID: PTINVALID Position */
+#define TPI_DEVID_PTINVALID_Msk            (0x1UL << TPI_DEVID_PTINVALID_Pos)          /*!< TPI DEVID: PTINVALID Mask */
+
+#define TPI_DEVID_FIFOSZ_Pos                6U                                         /*!< TPI DEVID: FIFO depth Position */
+#define TPI_DEVID_FIFOSZ_Msk               (0x7UL << TPI_DEVID_FIFOSZ_Pos)             /*!< TPI DEVID: FIFO depth Mask */
+
+/* TPI DEVTYPE Register Definitions */
+#define TPI_DEVTYPE_SubType_Pos             4U                                         /*!< TPI DEVTYPE: SubType Position */
+#define TPI_DEVTYPE_SubType_Msk            (0xFUL /*<< TPI_DEVTYPE_SubType_Pos*/)      /*!< TPI DEVTYPE: SubType Mask */
+
+#define TPI_DEVTYPE_MajorType_Pos           0U                                         /*!< TPI DEVTYPE: MajorType Position */
+#define TPI_DEVTYPE_MajorType_Msk          (0xFUL << TPI_DEVTYPE_MajorType_Pos)        /*!< TPI DEVTYPE: MajorType Mask */
+
+/*@}*/ /* end of group CMSIS_TPI */
+
+#if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_PMU     Performance Monitoring Unit (PMU)
+  \brief    Type definitions for the Performance Monitoring Unit (PMU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Performance Monitoring Unit (PMU).
+ */
+typedef struct
+{
+  __IOM uint32_t EVCNTR[__PMU_NUM_EVENTCNT];        /*!< Offset: 0x0 (R/W)    PMU Event Counter Registers */
+#if __PMU_NUM_EVENTCNT<31
+        uint32_t RESERVED0[31U-__PMU_NUM_EVENTCNT];
+#endif
+  __IOM uint32_t CCNTR;                             /*!< Offset: 0x7C (R/W)   PMU Cycle Counter Register */
+        uint32_t RESERVED1[224];
+  __IOM uint32_t EVTYPER[__PMU_NUM_EVENTCNT];       /*!< Offset: 0x400 (R/W)  PMU Event Type and Filter Registers */
+#if __PMU_NUM_EVENTCNT<31
+        uint32_t RESERVED2[31U-__PMU_NUM_EVENTCNT];
+#endif
+  __IOM uint32_t CCFILTR;                           /*!< Offset: 0x47C (R/W)  PMU Cycle Counter Filter Register */
+        uint32_t RESERVED3[480];
+  __IOM uint32_t CNTENSET;                          /*!< Offset: 0xC00 (R/W)  PMU Count Enable Set Register */
+        uint32_t RESERVED4[7];
+  __IOM uint32_t CNTENCLR;                          /*!< Offset: 0xC20 (R/W)  PMU Count Enable Clear Register */
+        uint32_t RESERVED5[7];
+  __IOM uint32_t INTENSET;                          /*!< Offset: 0xC40 (R/W)  PMU Interrupt Enable Set Register */
+        uint32_t RESERVED6[7];
+  __IOM uint32_t INTENCLR;                          /*!< Offset: 0xC60 (R/W)  PMU Interrupt Enable Clear Register */
+        uint32_t RESERVED7[7];
+  __IOM uint32_t OVSCLR;                            /*!< Offset: 0xC80 (R/W)  PMU Overflow Flag Status Clear Register */
+        uint32_t RESERVED8[7];
+  __IOM uint32_t SWINC;                             /*!< Offset: 0xCA0 (R/W)  PMU Software Increment Register */
+        uint32_t RESERVED9[7];
+  __IOM uint32_t OVSSET;                            /*!< Offset: 0xCC0 (R/W)  PMU Overflow Flag Status Set Register */
+        uint32_t RESERVED10[79];
+  __IOM uint32_t TYPE;                              /*!< Offset: 0xE00 (R/W)  PMU Type Register */
+  __IOM uint32_t CTRL;                              /*!< Offset: 0xE04 (R/W)  PMU Control Register */
+        uint32_t RESERVED11[108];
+  __IOM uint32_t AUTHSTATUS;                        /*!< Offset: 0xFB8 (R/W)  PMU Authentication Status Register */
+  __IOM uint32_t DEVARCH;                           /*!< Offset: 0xFBC (R/W)  PMU Device Architecture Register */
+        uint32_t RESERVED12[3];
+  __IOM uint32_t DEVTYPE;                           /*!< Offset: 0xFCC (R/W)  PMU Device Type Register */
+  __IOM uint32_t PIDR4;                             /*!< Offset: 0xFD0 (R/W)  PMU Peripheral Identification Register 4 */
+        uint32_t RESERVED13[3];
+  __IOM uint32_t PIDR0;                             /*!< Offset: 0xFE0 (R/W)  PMU Peripheral Identification Register 0 */
+  __IOM uint32_t PIDR1;                             /*!< Offset: 0xFE4 (R/W)  PMU Peripheral Identification Register 1 */
+  __IOM uint32_t PIDR2;                             /*!< Offset: 0xFE8 (R/W)  PMU Peripheral Identification Register 2 */
+  __IOM uint32_t PIDR3;                             /*!< Offset: 0xFEC (R/W)  PMU Peripheral Identification Register 3 */
+  __IOM uint32_t CIDR0;                             /*!< Offset: 0xFF0 (R/W)  PMU Component Identification Register 0 */
+  __IOM uint32_t CIDR1;                             /*!< Offset: 0xFF4 (R/W)  PMU Component Identification Register 1 */
+  __IOM uint32_t CIDR2;                             /*!< Offset: 0xFF8 (R/W)  PMU Component Identification Register 2 */
+  __IOM uint32_t CIDR3;                             /*!< Offset: 0xFFC (R/W)  PMU Component Identification Register 3 */
+} PMU_Type;
+
+/** \brief PMU Event Counter Registers (0-30) Definitions  */
+
+#define PMU_EVCNTR_CNT_Pos                    0U                                           /*!< PMU EVCNTR: Counter Position */
+#define PMU_EVCNTR_CNT_Msk                   (0xFFFFUL /*<< PMU_EVCNTRx_CNT_Pos*/)         /*!< PMU EVCNTR: Counter Mask */
+
+/** \brief PMU Event Type and Filter Registers (0-30) Definitions  */
+
+#define PMU_EVTYPER_EVENTTOCNT_Pos            0U                                           /*!< PMU EVTYPER: Event to Count Position */
+#define PMU_EVTYPER_EVENTTOCNT_Msk           (0xFFFFUL /*<< EVTYPERx_EVENTTOCNT_Pos*/)     /*!< PMU EVTYPER: Event to Count Mask */
+
+/** \brief PMU Count Enable Set Register Definitions */
+
+#define PMU_CNTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU CNTENSET: Event Counter 0 Enable Set Position */
+#define PMU_CNTENSET_CNT0_ENABLE_Msk         (1UL /*<< PMU_CNTENSET_CNT0_ENABLE_Pos*/)     /*!< PMU CNTENSET: Event Counter 0 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT1_ENABLE_Pos          1U                                           /*!< PMU CNTENSET: Event Counter 1 Enable Set Position */
+#define PMU_CNTENSET_CNT1_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT1_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 1 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT2_ENABLE_Pos          2U                                           /*!< PMU CNTENSET: Event Counter 2 Enable Set Position */
+#define PMU_CNTENSET_CNT2_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT2_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 2 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT3_ENABLE_Pos          3U                                           /*!< PMU CNTENSET: Event Counter 3 Enable Set Position */
+#define PMU_CNTENSET_CNT3_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT3_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 3 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT4_ENABLE_Pos          4U                                           /*!< PMU CNTENSET: Event Counter 4 Enable Set Position */
+#define PMU_CNTENSET_CNT4_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT4_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 4 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT5_ENABLE_Pos          5U                                           /*!< PMU CNTENSET: Event Counter 5 Enable Set Position */
+#define PMU_CNTENSET_CNT5_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT5_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 5 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT6_ENABLE_Pos          6U                                           /*!< PMU CNTENSET: Event Counter 6 Enable Set Position */
+#define PMU_CNTENSET_CNT6_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT6_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 6 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT7_ENABLE_Pos          7U                                           /*!< PMU CNTENSET: Event Counter 7 Enable Set Position */
+#define PMU_CNTENSET_CNT7_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT7_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 7 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT8_ENABLE_Pos          8U                                           /*!< PMU CNTENSET: Event Counter 8 Enable Set Position */
+#define PMU_CNTENSET_CNT8_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT8_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 8 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT9_ENABLE_Pos          9U                                           /*!< PMU CNTENSET: Event Counter 9 Enable Set Position */
+#define PMU_CNTENSET_CNT9_ENABLE_Msk         (1UL << PMU_CNTENSET_CNT9_ENABLE_Pos)         /*!< PMU CNTENSET: Event Counter 9 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT10_ENABLE_Pos         10U                                          /*!< PMU CNTENSET: Event Counter 10 Enable Set Position */
+#define PMU_CNTENSET_CNT10_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT10_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 10 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT11_ENABLE_Pos         11U                                          /*!< PMU CNTENSET: Event Counter 11 Enable Set Position */
+#define PMU_CNTENSET_CNT11_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT11_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 11 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT12_ENABLE_Pos         12U                                          /*!< PMU CNTENSET: Event Counter 12 Enable Set Position */
+#define PMU_CNTENSET_CNT12_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT12_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 12 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT13_ENABLE_Pos         13U                                          /*!< PMU CNTENSET: Event Counter 13 Enable Set Position */
+#define PMU_CNTENSET_CNT13_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT13_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 13 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT14_ENABLE_Pos         14U                                          /*!< PMU CNTENSET: Event Counter 14 Enable Set Position */
+#define PMU_CNTENSET_CNT14_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT14_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 14 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT15_ENABLE_Pos         15U                                          /*!< PMU CNTENSET: Event Counter 15 Enable Set Position */
+#define PMU_CNTENSET_CNT15_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT15_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 15 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT16_ENABLE_Pos         16U                                          /*!< PMU CNTENSET: Event Counter 16 Enable Set Position */
+#define PMU_CNTENSET_CNT16_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT16_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 16 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT17_ENABLE_Pos         17U                                          /*!< PMU CNTENSET: Event Counter 17 Enable Set Position */
+#define PMU_CNTENSET_CNT17_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT17_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 17 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT18_ENABLE_Pos         18U                                          /*!< PMU CNTENSET: Event Counter 18 Enable Set Position */
+#define PMU_CNTENSET_CNT18_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT18_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 18 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT19_ENABLE_Pos         19U                                          /*!< PMU CNTENSET: Event Counter 19 Enable Set Position */
+#define PMU_CNTENSET_CNT19_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT19_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 19 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT20_ENABLE_Pos         20U                                          /*!< PMU CNTENSET: Event Counter 20 Enable Set Position */
+#define PMU_CNTENSET_CNT20_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT20_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 20 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT21_ENABLE_Pos         21U                                          /*!< PMU CNTENSET: Event Counter 21 Enable Set Position */
+#define PMU_CNTENSET_CNT21_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT21_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 21 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT22_ENABLE_Pos         22U                                          /*!< PMU CNTENSET: Event Counter 22 Enable Set Position */
+#define PMU_CNTENSET_CNT22_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT22_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 22 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT23_ENABLE_Pos         23U                                          /*!< PMU CNTENSET: Event Counter 23 Enable Set Position */
+#define PMU_CNTENSET_CNT23_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT23_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 23 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT24_ENABLE_Pos         24U                                          /*!< PMU CNTENSET: Event Counter 24 Enable Set Position */
+#define PMU_CNTENSET_CNT24_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT24_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 24 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT25_ENABLE_Pos         25U                                          /*!< PMU CNTENSET: Event Counter 25 Enable Set Position */
+#define PMU_CNTENSET_CNT25_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT25_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 25 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT26_ENABLE_Pos         26U                                          /*!< PMU CNTENSET: Event Counter 26 Enable Set Position */
+#define PMU_CNTENSET_CNT26_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT26_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 26 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT27_ENABLE_Pos         27U                                          /*!< PMU CNTENSET: Event Counter 27 Enable Set Position */
+#define PMU_CNTENSET_CNT27_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT27_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 27 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT28_ENABLE_Pos         28U                                          /*!< PMU CNTENSET: Event Counter 28 Enable Set Position */
+#define PMU_CNTENSET_CNT28_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT28_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 28 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT29_ENABLE_Pos         29U                                          /*!< PMU CNTENSET: Event Counter 29 Enable Set Position */
+#define PMU_CNTENSET_CNT29_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT29_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 29 Enable Set Mask */
+
+#define PMU_CNTENSET_CNT30_ENABLE_Pos         30U                                          /*!< PMU CNTENSET: Event Counter 30 Enable Set Position */
+#define PMU_CNTENSET_CNT30_ENABLE_Msk        (1UL << PMU_CNTENSET_CNT30_ENABLE_Pos)        /*!< PMU CNTENSET: Event Counter 30 Enable Set Mask */
+
+#define PMU_CNTENSET_CCNTR_ENABLE_Pos         31U                                          /*!< PMU CNTENSET: Cycle Counter Enable Set Position */
+#define PMU_CNTENSET_CCNTR_ENABLE_Msk        (1UL << PMU_CNTENSET_CCNTR_ENABLE_Pos)        /*!< PMU CNTENSET: Cycle Counter Enable Set Mask */
+
+/** \brief PMU Count Enable Clear Register Definitions */
+
+#define PMU_CNTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU CNTENCLR: Event Counter 0 Enable Clear Position */
+#define PMU_CNTENCLR_CNT0_ENABLE_Msk         (1UL /*<< PMU_CNTENCLR_CNT0_ENABLE_Pos*/)     /*!< PMU CNTENCLR: Event Counter 0 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT1_ENABLE_Pos          1U                                           /*!< PMU CNTENCLR: Event Counter 1 Enable Clear Position */
+#define PMU_CNTENCLR_CNT1_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT1_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 1 Enable Clear */
+
+#define PMU_CNTENCLR_CNT2_ENABLE_Pos          2U                                           /*!< PMU CNTENCLR: Event Counter 2 Enable Clear Position */
+#define PMU_CNTENCLR_CNT2_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT2_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 2 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT3_ENABLE_Pos          3U                                           /*!< PMU CNTENCLR: Event Counter 3 Enable Clear Position */
+#define PMU_CNTENCLR_CNT3_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT3_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 3 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT4_ENABLE_Pos          4U                                           /*!< PMU CNTENCLR: Event Counter 4 Enable Clear Position */
+#define PMU_CNTENCLR_CNT4_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT4_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 4 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT5_ENABLE_Pos          5U                                           /*!< PMU CNTENCLR: Event Counter 5 Enable Clear Position */
+#define PMU_CNTENCLR_CNT5_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT5_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 5 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT6_ENABLE_Pos          6U                                           /*!< PMU CNTENCLR: Event Counter 6 Enable Clear Position */
+#define PMU_CNTENCLR_CNT6_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT6_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 6 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT7_ENABLE_Pos          7U                                           /*!< PMU CNTENCLR: Event Counter 7 Enable Clear Position */
+#define PMU_CNTENCLR_CNT7_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT7_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 7 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT8_ENABLE_Pos          8U                                           /*!< PMU CNTENCLR: Event Counter 8 Enable Clear Position */
+#define PMU_CNTENCLR_CNT8_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT8_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 8 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT9_ENABLE_Pos          9U                                           /*!< PMU CNTENCLR: Event Counter 9 Enable Clear Position */
+#define PMU_CNTENCLR_CNT9_ENABLE_Msk         (1UL << PMU_CNTENCLR_CNT9_ENABLE_Pos)         /*!< PMU CNTENCLR: Event Counter 9 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT10_ENABLE_Pos         10U                                          /*!< PMU CNTENCLR: Event Counter 10 Enable Clear Position */
+#define PMU_CNTENCLR_CNT10_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT10_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 10 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT11_ENABLE_Pos         11U                                          /*!< PMU CNTENCLR: Event Counter 11 Enable Clear Position */
+#define PMU_CNTENCLR_CNT11_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT11_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 11 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT12_ENABLE_Pos         12U                                          /*!< PMU CNTENCLR: Event Counter 12 Enable Clear Position */
+#define PMU_CNTENCLR_CNT12_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT12_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 12 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT13_ENABLE_Pos         13U                                          /*!< PMU CNTENCLR: Event Counter 13 Enable Clear Position */
+#define PMU_CNTENCLR_CNT13_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT13_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 13 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT14_ENABLE_Pos         14U                                          /*!< PMU CNTENCLR: Event Counter 14 Enable Clear Position */
+#define PMU_CNTENCLR_CNT14_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT14_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 14 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT15_ENABLE_Pos         15U                                          /*!< PMU CNTENCLR: Event Counter 15 Enable Clear Position */
+#define PMU_CNTENCLR_CNT15_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT15_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 15 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT16_ENABLE_Pos         16U                                          /*!< PMU CNTENCLR: Event Counter 16 Enable Clear Position */
+#define PMU_CNTENCLR_CNT16_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT16_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 16 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT17_ENABLE_Pos         17U                                          /*!< PMU CNTENCLR: Event Counter 17 Enable Clear Position */
+#define PMU_CNTENCLR_CNT17_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT17_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 17 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT18_ENABLE_Pos         18U                                          /*!< PMU CNTENCLR: Event Counter 18 Enable Clear Position */
+#define PMU_CNTENCLR_CNT18_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT18_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 18 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT19_ENABLE_Pos         19U                                          /*!< PMU CNTENCLR: Event Counter 19 Enable Clear Position */
+#define PMU_CNTENCLR_CNT19_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT19_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 19 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT20_ENABLE_Pos         20U                                          /*!< PMU CNTENCLR: Event Counter 20 Enable Clear Position */
+#define PMU_CNTENCLR_CNT20_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT20_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 20 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT21_ENABLE_Pos         21U                                          /*!< PMU CNTENCLR: Event Counter 21 Enable Clear Position */
+#define PMU_CNTENCLR_CNT21_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT21_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 21 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT22_ENABLE_Pos         22U                                          /*!< PMU CNTENCLR: Event Counter 22 Enable Clear Position */
+#define PMU_CNTENCLR_CNT22_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT22_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 22 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT23_ENABLE_Pos         23U                                          /*!< PMU CNTENCLR: Event Counter 23 Enable Clear Position */
+#define PMU_CNTENCLR_CNT23_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT23_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 23 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT24_ENABLE_Pos         24U                                          /*!< PMU CNTENCLR: Event Counter 24 Enable Clear Position */
+#define PMU_CNTENCLR_CNT24_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT24_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 24 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT25_ENABLE_Pos         25U                                          /*!< PMU CNTENCLR: Event Counter 25 Enable Clear Position */
+#define PMU_CNTENCLR_CNT25_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT25_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 25 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT26_ENABLE_Pos         26U                                          /*!< PMU CNTENCLR: Event Counter 26 Enable Clear Position */
+#define PMU_CNTENCLR_CNT26_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT26_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 26 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT27_ENABLE_Pos         27U                                          /*!< PMU CNTENCLR: Event Counter 27 Enable Clear Position */
+#define PMU_CNTENCLR_CNT27_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT27_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 27 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT28_ENABLE_Pos         28U                                          /*!< PMU CNTENCLR: Event Counter 28 Enable Clear Position */
+#define PMU_CNTENCLR_CNT28_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT28_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 28 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT29_ENABLE_Pos         29U                                          /*!< PMU CNTENCLR: Event Counter 29 Enable Clear Position */
+#define PMU_CNTENCLR_CNT29_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT29_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 29 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CNT30_ENABLE_Pos         30U                                          /*!< PMU CNTENCLR: Event Counter 30 Enable Clear Position */
+#define PMU_CNTENCLR_CNT30_ENABLE_Msk        (1UL << PMU_CNTENCLR_CNT30_ENABLE_Pos)        /*!< PMU CNTENCLR: Event Counter 30 Enable Clear Mask */
+
+#define PMU_CNTENCLR_CCNTR_ENABLE_Pos         31U                                          /*!< PMU CNTENCLR: Cycle Counter Enable Clear Position */
+#define PMU_CNTENCLR_CCNTR_ENABLE_Msk        (1UL << PMU_CNTENCLR_CCNTR_ENABLE_Pos)        /*!< PMU CNTENCLR: Cycle Counter Enable Clear Mask */
+
+/** \brief PMU Interrupt Enable Set Register Definitions */
+
+#define PMU_INTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU INTENSET: Event Counter 0 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT0_ENABLE_Msk         (1UL /*<< PMU_INTENSET_CNT0_ENABLE_Pos*/)     /*!< PMU INTENSET: Event Counter 0 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT1_ENABLE_Pos          1U                                           /*!< PMU INTENSET: Event Counter 1 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT1_ENABLE_Msk         (1UL << PMU_INTENSET_CNT1_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 1 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT2_ENABLE_Pos          2U                                           /*!< PMU INTENSET: Event Counter 2 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT2_ENABLE_Msk         (1UL << PMU_INTENSET_CNT2_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 2 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT3_ENABLE_Pos          3U                                           /*!< PMU INTENSET: Event Counter 3 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT3_ENABLE_Msk         (1UL << PMU_INTENSET_CNT3_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 3 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT4_ENABLE_Pos          4U                                           /*!< PMU INTENSET: Event Counter 4 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT4_ENABLE_Msk         (1UL << PMU_INTENSET_CNT4_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 4 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT5_ENABLE_Pos          5U                                           /*!< PMU INTENSET: Event Counter 5 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT5_ENABLE_Msk         (1UL << PMU_INTENSET_CNT5_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 5 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT6_ENABLE_Pos          6U                                           /*!< PMU INTENSET: Event Counter 6 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT6_ENABLE_Msk         (1UL << PMU_INTENSET_CNT6_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 6 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT7_ENABLE_Pos          7U                                           /*!< PMU INTENSET: Event Counter 7 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT7_ENABLE_Msk         (1UL << PMU_INTENSET_CNT7_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 7 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT8_ENABLE_Pos          8U                                           /*!< PMU INTENSET: Event Counter 8 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT8_ENABLE_Msk         (1UL << PMU_INTENSET_CNT8_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 8 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT9_ENABLE_Pos          9U                                           /*!< PMU INTENSET: Event Counter 9 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT9_ENABLE_Msk         (1UL << PMU_INTENSET_CNT9_ENABLE_Pos)         /*!< PMU INTENSET: Event Counter 9 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT10_ENABLE_Pos         10U                                          /*!< PMU INTENSET: Event Counter 10 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT10_ENABLE_Msk        (1UL << PMU_INTENSET_CNT10_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 10 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT11_ENABLE_Pos         11U                                          /*!< PMU INTENSET: Event Counter 11 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT11_ENABLE_Msk        (1UL << PMU_INTENSET_CNT11_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 11 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT12_ENABLE_Pos         12U                                          /*!< PMU INTENSET: Event Counter 12 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT12_ENABLE_Msk        (1UL << PMU_INTENSET_CNT12_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 12 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT13_ENABLE_Pos         13U                                          /*!< PMU INTENSET: Event Counter 13 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT13_ENABLE_Msk        (1UL << PMU_INTENSET_CNT13_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 13 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT14_ENABLE_Pos         14U                                          /*!< PMU INTENSET: Event Counter 14 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT14_ENABLE_Msk        (1UL << PMU_INTENSET_CNT14_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 14 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT15_ENABLE_Pos         15U                                          /*!< PMU INTENSET: Event Counter 15 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT15_ENABLE_Msk        (1UL << PMU_INTENSET_CNT15_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 15 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT16_ENABLE_Pos         16U                                          /*!< PMU INTENSET: Event Counter 16 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT16_ENABLE_Msk        (1UL << PMU_INTENSET_CNT16_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 16 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT17_ENABLE_Pos         17U                                          /*!< PMU INTENSET: Event Counter 17 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT17_ENABLE_Msk        (1UL << PMU_INTENSET_CNT17_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 17 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT18_ENABLE_Pos         18U                                          /*!< PMU INTENSET: Event Counter 18 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT18_ENABLE_Msk        (1UL << PMU_INTENSET_CNT18_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 18 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT19_ENABLE_Pos         19U                                          /*!< PMU INTENSET: Event Counter 19 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT19_ENABLE_Msk        (1UL << PMU_INTENSET_CNT19_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 19 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT20_ENABLE_Pos         20U                                          /*!< PMU INTENSET: Event Counter 20 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT20_ENABLE_Msk        (1UL << PMU_INTENSET_CNT20_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 20 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT21_ENABLE_Pos         21U                                          /*!< PMU INTENSET: Event Counter 21 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT21_ENABLE_Msk        (1UL << PMU_INTENSET_CNT21_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 21 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT22_ENABLE_Pos         22U                                          /*!< PMU INTENSET: Event Counter 22 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT22_ENABLE_Msk        (1UL << PMU_INTENSET_CNT22_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 22 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT23_ENABLE_Pos         23U                                          /*!< PMU INTENSET: Event Counter 23 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT23_ENABLE_Msk        (1UL << PMU_INTENSET_CNT23_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 23 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT24_ENABLE_Pos         24U                                          /*!< PMU INTENSET: Event Counter 24 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT24_ENABLE_Msk        (1UL << PMU_INTENSET_CNT24_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 24 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT25_ENABLE_Pos         25U                                          /*!< PMU INTENSET: Event Counter 25 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT25_ENABLE_Msk        (1UL << PMU_INTENSET_CNT25_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 25 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT26_ENABLE_Pos         26U                                          /*!< PMU INTENSET: Event Counter 26 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT26_ENABLE_Msk        (1UL << PMU_INTENSET_CNT26_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 26 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT27_ENABLE_Pos         27U                                          /*!< PMU INTENSET: Event Counter 27 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT27_ENABLE_Msk        (1UL << PMU_INTENSET_CNT27_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 27 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT28_ENABLE_Pos         28U                                          /*!< PMU INTENSET: Event Counter 28 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT28_ENABLE_Msk        (1UL << PMU_INTENSET_CNT28_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 28 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT29_ENABLE_Pos         29U                                          /*!< PMU INTENSET: Event Counter 29 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT29_ENABLE_Msk        (1UL << PMU_INTENSET_CNT29_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 29 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CNT30_ENABLE_Pos         30U                                          /*!< PMU INTENSET: Event Counter 30 Interrupt Enable Set Position */
+#define PMU_INTENSET_CNT30_ENABLE_Msk        (1UL << PMU_INTENSET_CNT30_ENABLE_Pos)        /*!< PMU INTENSET: Event Counter 30 Interrupt Enable Set Mask */
+
+#define PMU_INTENSET_CYCCNT_ENABLE_Pos        31U                                          /*!< PMU INTENSET: Cycle Counter Interrupt Enable Set Position */
+#define PMU_INTENSET_CCYCNT_ENABLE_Msk       (1UL << PMU_INTENSET_CYCCNT_ENABLE_Pos)       /*!< PMU INTENSET: Cycle Counter Interrupt Enable Set Mask */
+
+/** \brief PMU Interrupt Enable Clear Register Definitions */
+
+#define PMU_INTENSET_CNT0_ENABLE_Pos          0U                                           /*!< PMU INTENCLR: Event Counter 0 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT0_ENABLE_Msk         (1UL /*<< PMU_INTENCLR_CNT0_ENABLE_Pos*/)     /*!< PMU INTENCLR: Event Counter 0 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT1_ENABLE_Pos          1U                                           /*!< PMU INTENCLR: Event Counter 1 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT1_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT1_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 1 Interrupt Enable Clear */
+
+#define PMU_INTENCLR_CNT2_ENABLE_Pos          2U                                           /*!< PMU INTENCLR: Event Counter 2 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT2_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT2_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 2 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT3_ENABLE_Pos          3U                                           /*!< PMU INTENCLR: Event Counter 3 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT3_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT3_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 3 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT4_ENABLE_Pos          4U                                           /*!< PMU INTENCLR: Event Counter 4 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT4_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT4_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 4 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT5_ENABLE_Pos          5U                                           /*!< PMU INTENCLR: Event Counter 5 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT5_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT5_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 5 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT6_ENABLE_Pos          6U                                           /*!< PMU INTENCLR: Event Counter 6 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT6_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT6_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 6 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT7_ENABLE_Pos          7U                                           /*!< PMU INTENCLR: Event Counter 7 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT7_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT7_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 7 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT8_ENABLE_Pos          8U                                           /*!< PMU INTENCLR: Event Counter 8 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT8_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT8_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 8 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT9_ENABLE_Pos          9U                                           /*!< PMU INTENCLR: Event Counter 9 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT9_ENABLE_Msk         (1UL << PMU_INTENCLR_CNT9_ENABLE_Pos)         /*!< PMU INTENCLR: Event Counter 9 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT10_ENABLE_Pos         10U                                          /*!< PMU INTENCLR: Event Counter 10 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT10_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT10_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 10 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT11_ENABLE_Pos         11U                                          /*!< PMU INTENCLR: Event Counter 11 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT11_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT11_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 11 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT12_ENABLE_Pos         12U                                          /*!< PMU INTENCLR: Event Counter 12 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT12_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT12_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 12 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT13_ENABLE_Pos         13U                                          /*!< PMU INTENCLR: Event Counter 13 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT13_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT13_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 13 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT14_ENABLE_Pos         14U                                          /*!< PMU INTENCLR: Event Counter 14 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT14_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT14_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 14 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT15_ENABLE_Pos         15U                                          /*!< PMU INTENCLR: Event Counter 15 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT15_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT15_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 15 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT16_ENABLE_Pos         16U                                          /*!< PMU INTENCLR: Event Counter 16 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT16_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT16_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 16 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT17_ENABLE_Pos         17U                                          /*!< PMU INTENCLR: Event Counter 17 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT17_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT17_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 17 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT18_ENABLE_Pos         18U                                          /*!< PMU INTENCLR: Event Counter 18 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT18_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT18_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 18 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT19_ENABLE_Pos         19U                                          /*!< PMU INTENCLR: Event Counter 19 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT19_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT19_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 19 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT20_ENABLE_Pos         20U                                          /*!< PMU INTENCLR: Event Counter 20 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT20_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT20_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 20 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT21_ENABLE_Pos         21U                                          /*!< PMU INTENCLR: Event Counter 21 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT21_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT21_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 21 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT22_ENABLE_Pos         22U                                          /*!< PMU INTENCLR: Event Counter 22 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT22_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT22_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 22 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT23_ENABLE_Pos         23U                                          /*!< PMU INTENCLR: Event Counter 23 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT23_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT23_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 23 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT24_ENABLE_Pos         24U                                          /*!< PMU INTENCLR: Event Counter 24 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT24_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT24_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 24 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT25_ENABLE_Pos         25U                                          /*!< PMU INTENCLR: Event Counter 25 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT25_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT25_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 25 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT26_ENABLE_Pos         26U                                          /*!< PMU INTENCLR: Event Counter 26 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT26_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT26_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 26 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT27_ENABLE_Pos         27U                                          /*!< PMU INTENCLR: Event Counter 27 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT27_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT27_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 27 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT28_ENABLE_Pos         28U                                          /*!< PMU INTENCLR: Event Counter 28 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT28_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT28_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 28 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT29_ENABLE_Pos         29U                                          /*!< PMU INTENCLR: Event Counter 29 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT29_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT29_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 29 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CNT30_ENABLE_Pos         30U                                          /*!< PMU INTENCLR: Event Counter 30 Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CNT30_ENABLE_Msk        (1UL << PMU_INTENCLR_CNT30_ENABLE_Pos)        /*!< PMU INTENCLR: Event Counter 30 Interrupt Enable Clear Mask */
+
+#define PMU_INTENCLR_CYCCNT_ENABLE_Pos        31U                                          /*!< PMU INTENCLR: Cycle Counter Interrupt Enable Clear Position */
+#define PMU_INTENCLR_CYCCNT_ENABLE_Msk       (1UL << PMU_INTENCLR_CYCCNT_ENABLE_Pos)       /*!< PMU INTENCLR: Cycle Counter Interrupt Enable Clear Mask */
+
+/** \brief PMU Overflow Flag Status Set Register Definitions */
+
+#define PMU_OVSSET_CNT0_STATUS_Pos            0U                                           /*!< PMU OVSSET: Event Counter 0 Overflow Set Position */
+#define PMU_OVSSET_CNT0_STATUS_Msk           (1UL /*<< PMU_OVSSET_CNT0_STATUS_Pos*/)       /*!< PMU OVSSET: Event Counter 0 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT1_STATUS_Pos            1U                                           /*!< PMU OVSSET: Event Counter 1 Overflow Set Position */
+#define PMU_OVSSET_CNT1_STATUS_Msk           (1UL << PMU_OVSSET_CNT1_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 1 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT2_STATUS_Pos            2U                                           /*!< PMU OVSSET: Event Counter 2 Overflow Set Position */
+#define PMU_OVSSET_CNT2_STATUS_Msk           (1UL << PMU_OVSSET_CNT2_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 2 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT3_STATUS_Pos            3U                                           /*!< PMU OVSSET: Event Counter 3 Overflow Set Position */
+#define PMU_OVSSET_CNT3_STATUS_Msk           (1UL << PMU_OVSSET_CNT3_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 3 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT4_STATUS_Pos            4U                                           /*!< PMU OVSSET: Event Counter 4 Overflow Set Position */
+#define PMU_OVSSET_CNT4_STATUS_Msk           (1UL << PMU_OVSSET_CNT4_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 4 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT5_STATUS_Pos            5U                                           /*!< PMU OVSSET: Event Counter 5 Overflow Set Position */
+#define PMU_OVSSET_CNT5_STATUS_Msk           (1UL << PMU_OVSSET_CNT5_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 5 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT6_STATUS_Pos            6U                                           /*!< PMU OVSSET: Event Counter 6 Overflow Set Position */
+#define PMU_OVSSET_CNT6_STATUS_Msk           (1UL << PMU_OVSSET_CNT6_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 6 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT7_STATUS_Pos            7U                                           /*!< PMU OVSSET: Event Counter 7 Overflow Set Position */
+#define PMU_OVSSET_CNT7_STATUS_Msk           (1UL << PMU_OVSSET_CNT7_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 7 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT8_STATUS_Pos            8U                                           /*!< PMU OVSSET: Event Counter 8 Overflow Set Position */
+#define PMU_OVSSET_CNT8_STATUS_Msk           (1UL << PMU_OVSSET_CNT8_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 8 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT9_STATUS_Pos            9U                                           /*!< PMU OVSSET: Event Counter 9 Overflow Set Position */
+#define PMU_OVSSET_CNT9_STATUS_Msk           (1UL << PMU_OVSSET_CNT9_STATUS_Pos)           /*!< PMU OVSSET: Event Counter 9 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT10_STATUS_Pos           10U                                          /*!< PMU OVSSET: Event Counter 10 Overflow Set Position */
+#define PMU_OVSSET_CNT10_STATUS_Msk          (1UL << PMU_OVSSET_CNT10_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 10 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT11_STATUS_Pos           11U                                          /*!< PMU OVSSET: Event Counter 11 Overflow Set Position */
+#define PMU_OVSSET_CNT11_STATUS_Msk          (1UL << PMU_OVSSET_CNT11_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 11 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT12_STATUS_Pos           12U                                          /*!< PMU OVSSET: Event Counter 12 Overflow Set Position */
+#define PMU_OVSSET_CNT12_STATUS_Msk          (1UL << PMU_OVSSET_CNT12_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 12 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT13_STATUS_Pos           13U                                          /*!< PMU OVSSET: Event Counter 13 Overflow Set Position */
+#define PMU_OVSSET_CNT13_STATUS_Msk          (1UL << PMU_OVSSET_CNT13_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 13 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT14_STATUS_Pos           14U                                          /*!< PMU OVSSET: Event Counter 14 Overflow Set Position */
+#define PMU_OVSSET_CNT14_STATUS_Msk          (1UL << PMU_OVSSET_CNT14_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 14 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT15_STATUS_Pos           15U                                          /*!< PMU OVSSET: Event Counter 15 Overflow Set Position */
+#define PMU_OVSSET_CNT15_STATUS_Msk          (1UL << PMU_OVSSET_CNT15_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 15 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT16_STATUS_Pos           16U                                          /*!< PMU OVSSET: Event Counter 16 Overflow Set Position */
+#define PMU_OVSSET_CNT16_STATUS_Msk          (1UL << PMU_OVSSET_CNT16_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 16 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT17_STATUS_Pos           17U                                          /*!< PMU OVSSET: Event Counter 17 Overflow Set Position */
+#define PMU_OVSSET_CNT17_STATUS_Msk          (1UL << PMU_OVSSET_CNT17_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 17 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT18_STATUS_Pos           18U                                          /*!< PMU OVSSET: Event Counter 18 Overflow Set Position */
+#define PMU_OVSSET_CNT18_STATUS_Msk          (1UL << PMU_OVSSET_CNT18_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 18 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT19_STATUS_Pos           19U                                          /*!< PMU OVSSET: Event Counter 19 Overflow Set Position */
+#define PMU_OVSSET_CNT19_STATUS_Msk          (1UL << PMU_OVSSET_CNT19_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 19 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT20_STATUS_Pos           20U                                          /*!< PMU OVSSET: Event Counter 20 Overflow Set Position */
+#define PMU_OVSSET_CNT20_STATUS_Msk          (1UL << PMU_OVSSET_CNT20_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 20 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT21_STATUS_Pos           21U                                          /*!< PMU OVSSET: Event Counter 21 Overflow Set Position */
+#define PMU_OVSSET_CNT21_STATUS_Msk          (1UL << PMU_OVSSET_CNT21_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 21 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT22_STATUS_Pos           22U                                          /*!< PMU OVSSET: Event Counter 22 Overflow Set Position */
+#define PMU_OVSSET_CNT22_STATUS_Msk          (1UL << PMU_OVSSET_CNT22_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 22 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT23_STATUS_Pos           23U                                          /*!< PMU OVSSET: Event Counter 23 Overflow Set Position */
+#define PMU_OVSSET_CNT23_STATUS_Msk          (1UL << PMU_OVSSET_CNT23_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 23 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT24_STATUS_Pos           24U                                          /*!< PMU OVSSET: Event Counter 24 Overflow Set Position */
+#define PMU_OVSSET_CNT24_STATUS_Msk          (1UL << PMU_OVSSET_CNT24_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 24 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT25_STATUS_Pos           25U                                          /*!< PMU OVSSET: Event Counter 25 Overflow Set Position */
+#define PMU_OVSSET_CNT25_STATUS_Msk          (1UL << PMU_OVSSET_CNT25_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 25 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT26_STATUS_Pos           26U                                          /*!< PMU OVSSET: Event Counter 26 Overflow Set Position */
+#define PMU_OVSSET_CNT26_STATUS_Msk          (1UL << PMU_OVSSET_CNT26_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 26 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT27_STATUS_Pos           27U                                          /*!< PMU OVSSET: Event Counter 27 Overflow Set Position */
+#define PMU_OVSSET_CNT27_STATUS_Msk          (1UL << PMU_OVSSET_CNT27_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 27 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT28_STATUS_Pos           28U                                          /*!< PMU OVSSET: Event Counter 28 Overflow Set Position */
+#define PMU_OVSSET_CNT28_STATUS_Msk          (1UL << PMU_OVSSET_CNT28_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 28 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT29_STATUS_Pos           29U                                          /*!< PMU OVSSET: Event Counter 29 Overflow Set Position */
+#define PMU_OVSSET_CNT29_STATUS_Msk          (1UL << PMU_OVSSET_CNT29_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 29 Overflow Set Mask */
+
+#define PMU_OVSSET_CNT30_STATUS_Pos           30U                                          /*!< PMU OVSSET: Event Counter 30 Overflow Set Position */
+#define PMU_OVSSET_CNT30_STATUS_Msk          (1UL << PMU_OVSSET_CNT30_STATUS_Pos)          /*!< PMU OVSSET: Event Counter 30 Overflow Set Mask */
+
+#define PMU_OVSSET_CYCCNT_STATUS_Pos          31U                                          /*!< PMU OVSSET: Cycle Counter Overflow Set Position */
+#define PMU_OVSSET_CYCCNT_STATUS_Msk         (1UL << PMU_OVSSET_CYCCNT_STATUS_Pos)         /*!< PMU OVSSET: Cycle Counter Overflow Set Mask */
+
+/** \brief PMU Overflow Flag Status Clear Register Definitions */
+
+#define PMU_OVSCLR_CNT0_STATUS_Pos            0U                                           /*!< PMU OVSCLR: Event Counter 0 Overflow Clear Position */
+#define PMU_OVSCLR_CNT0_STATUS_Msk           (1UL /*<< PMU_OVSCLR_CNT0_STATUS_Pos*/)       /*!< PMU OVSCLR: Event Counter 0 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT1_STATUS_Pos            1U                                           /*!< PMU OVSCLR: Event Counter 1 Overflow Clear Position */
+#define PMU_OVSCLR_CNT1_STATUS_Msk           (1UL << PMU_OVSCLR_CNT1_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 1 Overflow Clear */
+
+#define PMU_OVSCLR_CNT2_STATUS_Pos            2U                                           /*!< PMU OVSCLR: Event Counter 2 Overflow Clear Position */
+#define PMU_OVSCLR_CNT2_STATUS_Msk           (1UL << PMU_OVSCLR_CNT2_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 2 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT3_STATUS_Pos            3U                                           /*!< PMU OVSCLR: Event Counter 3 Overflow Clear Position */
+#define PMU_OVSCLR_CNT3_STATUS_Msk           (1UL << PMU_OVSCLR_CNT3_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 3 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT4_STATUS_Pos            4U                                           /*!< PMU OVSCLR: Event Counter 4 Overflow Clear Position */
+#define PMU_OVSCLR_CNT4_STATUS_Msk           (1UL << PMU_OVSCLR_CNT4_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 4 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT5_STATUS_Pos            5U                                           /*!< PMU OVSCLR: Event Counter 5 Overflow Clear Position */
+#define PMU_OVSCLR_CNT5_STATUS_Msk           (1UL << PMU_OVSCLR_CNT5_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 5 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT6_STATUS_Pos            6U                                           /*!< PMU OVSCLR: Event Counter 6 Overflow Clear Position */
+#define PMU_OVSCLR_CNT6_STATUS_Msk           (1UL << PMU_OVSCLR_CNT6_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 6 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT7_STATUS_Pos            7U                                           /*!< PMU OVSCLR: Event Counter 7 Overflow Clear Position */
+#define PMU_OVSCLR_CNT7_STATUS_Msk           (1UL << PMU_OVSCLR_CNT7_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 7 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT8_STATUS_Pos            8U                                           /*!< PMU OVSCLR: Event Counter 8 Overflow Clear Position */
+#define PMU_OVSCLR_CNT8_STATUS_Msk           (1UL << PMU_OVSCLR_CNT8_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 8 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT9_STATUS_Pos            9U                                           /*!< PMU OVSCLR: Event Counter 9 Overflow Clear Position */
+#define PMU_OVSCLR_CNT9_STATUS_Msk           (1UL << PMU_OVSCLR_CNT9_STATUS_Pos)           /*!< PMU OVSCLR: Event Counter 9 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT10_STATUS_Pos           10U                                          /*!< PMU OVSCLR: Event Counter 10 Overflow Clear Position */
+#define PMU_OVSCLR_CNT10_STATUS_Msk          (1UL << PMU_OVSCLR_CNT10_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 10 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT11_STATUS_Pos           11U                                          /*!< PMU OVSCLR: Event Counter 11 Overflow Clear Position */
+#define PMU_OVSCLR_CNT11_STATUS_Msk          (1UL << PMU_OVSCLR_CNT11_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 11 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT12_STATUS_Pos           12U                                          /*!< PMU OVSCLR: Event Counter 12 Overflow Clear Position */
+#define PMU_OVSCLR_CNT12_STATUS_Msk          (1UL << PMU_OVSCLR_CNT12_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 12 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT13_STATUS_Pos           13U                                          /*!< PMU OVSCLR: Event Counter 13 Overflow Clear Position */
+#define PMU_OVSCLR_CNT13_STATUS_Msk          (1UL << PMU_OVSCLR_CNT13_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 13 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT14_STATUS_Pos           14U                                          /*!< PMU OVSCLR: Event Counter 14 Overflow Clear Position */
+#define PMU_OVSCLR_CNT14_STATUS_Msk          (1UL << PMU_OVSCLR_CNT14_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 14 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT15_STATUS_Pos           15U                                          /*!< PMU OVSCLR: Event Counter 15 Overflow Clear Position */
+#define PMU_OVSCLR_CNT15_STATUS_Msk          (1UL << PMU_OVSCLR_CNT15_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 15 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT16_STATUS_Pos           16U                                          /*!< PMU OVSCLR: Event Counter 16 Overflow Clear Position */
+#define PMU_OVSCLR_CNT16_STATUS_Msk          (1UL << PMU_OVSCLR_CNT16_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 16 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT17_STATUS_Pos           17U                                          /*!< PMU OVSCLR: Event Counter 17 Overflow Clear Position */
+#define PMU_OVSCLR_CNT17_STATUS_Msk          (1UL << PMU_OVSCLR_CNT17_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 17 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT18_STATUS_Pos           18U                                          /*!< PMU OVSCLR: Event Counter 18 Overflow Clear Position */
+#define PMU_OVSCLR_CNT18_STATUS_Msk          (1UL << PMU_OVSCLR_CNT18_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 18 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT19_STATUS_Pos           19U                                          /*!< PMU OVSCLR: Event Counter 19 Overflow Clear Position */
+#define PMU_OVSCLR_CNT19_STATUS_Msk          (1UL << PMU_OVSCLR_CNT19_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 19 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT20_STATUS_Pos           20U                                          /*!< PMU OVSCLR: Event Counter 20 Overflow Clear Position */
+#define PMU_OVSCLR_CNT20_STATUS_Msk          (1UL << PMU_OVSCLR_CNT20_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 20 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT21_STATUS_Pos           21U                                          /*!< PMU OVSCLR: Event Counter 21 Overflow Clear Position */
+#define PMU_OVSCLR_CNT21_STATUS_Msk          (1UL << PMU_OVSCLR_CNT21_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 21 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT22_STATUS_Pos           22U                                          /*!< PMU OVSCLR: Event Counter 22 Overflow Clear Position */
+#define PMU_OVSCLR_CNT22_STATUS_Msk          (1UL << PMU_OVSCLR_CNT22_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 22 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT23_STATUS_Pos           23U                                          /*!< PMU OVSCLR: Event Counter 23 Overflow Clear Position */
+#define PMU_OVSCLR_CNT23_STATUS_Msk          (1UL << PMU_OVSCLR_CNT23_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 23 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT24_STATUS_Pos           24U                                          /*!< PMU OVSCLR: Event Counter 24 Overflow Clear Position */
+#define PMU_OVSCLR_CNT24_STATUS_Msk          (1UL << PMU_OVSCLR_CNT24_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 24 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT25_STATUS_Pos           25U                                          /*!< PMU OVSCLR: Event Counter 25 Overflow Clear Position */
+#define PMU_OVSCLR_CNT25_STATUS_Msk          (1UL << PMU_OVSCLR_CNT25_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 25 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT26_STATUS_Pos           26U                                          /*!< PMU OVSCLR: Event Counter 26 Overflow Clear Position */
+#define PMU_OVSCLR_CNT26_STATUS_Msk          (1UL << PMU_OVSCLR_CNT26_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 26 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT27_STATUS_Pos           27U                                          /*!< PMU OVSCLR: Event Counter 27 Overflow Clear Position */
+#define PMU_OVSCLR_CNT27_STATUS_Msk          (1UL << PMU_OVSCLR_CNT27_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 27 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT28_STATUS_Pos           28U                                          /*!< PMU OVSCLR: Event Counter 28 Overflow Clear Position */
+#define PMU_OVSCLR_CNT28_STATUS_Msk          (1UL << PMU_OVSCLR_CNT28_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 28 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT29_STATUS_Pos           29U                                          /*!< PMU OVSCLR: Event Counter 29 Overflow Clear Position */
+#define PMU_OVSCLR_CNT29_STATUS_Msk          (1UL << PMU_OVSCLR_CNT29_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 29 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CNT30_STATUS_Pos           30U                                          /*!< PMU OVSCLR: Event Counter 30 Overflow Clear Position */
+#define PMU_OVSCLR_CNT30_STATUS_Msk          (1UL << PMU_OVSCLR_CNT30_STATUS_Pos)          /*!< PMU OVSCLR: Event Counter 30 Overflow Clear Mask */
+
+#define PMU_OVSCLR_CYCCNT_STATUS_Pos          31U                                          /*!< PMU OVSCLR: Cycle Counter Overflow Clear Position */
+#define PMU_OVSCLR_CYCCNT_STATUS_Msk         (1UL << PMU_OVSCLR_CYCCNT_STATUS_Pos)         /*!< PMU OVSCLR: Cycle Counter Overflow Clear Mask */
+
+/** \brief PMU Software Increment Counter */
+
+#define PMU_SWINC_CNT0_Pos                    0U                                           /*!< PMU SWINC: Event Counter 0 Software Increment Position */
+#define PMU_SWINC_CNT0_Msk                   (1UL /*<< PMU_SWINC_CNT0_Pos */)              /*!< PMU SWINC: Event Counter 0 Software Increment Mask */
+
+#define PMU_SWINC_CNT1_Pos                    1U                                           /*!< PMU SWINC: Event Counter 1 Software Increment Position */
+#define PMU_SWINC_CNT1_Msk                   (1UL << PMU_SWINC_CNT1_Pos)                   /*!< PMU SWINC: Event Counter 1 Software Increment Mask */
+
+#define PMU_SWINC_CNT2_Pos                    2U                                           /*!< PMU SWINC: Event Counter 2 Software Increment Position */
+#define PMU_SWINC_CNT2_Msk                   (1UL << PMU_SWINC_CNT2_Pos)                   /*!< PMU SWINC: Event Counter 2 Software Increment Mask */
+
+#define PMU_SWINC_CNT3_Pos                    3U                                           /*!< PMU SWINC: Event Counter 3 Software Increment Position */
+#define PMU_SWINC_CNT3_Msk                   (1UL << PMU_SWINC_CNT3_Pos)                   /*!< PMU SWINC: Event Counter 3 Software Increment Mask */
+
+#define PMU_SWINC_CNT4_Pos                    4U                                           /*!< PMU SWINC: Event Counter 4 Software Increment Position */
+#define PMU_SWINC_CNT4_Msk                   (1UL << PMU_SWINC_CNT4_Pos)                   /*!< PMU SWINC: Event Counter 4 Software Increment Mask */
+
+#define PMU_SWINC_CNT5_Pos                    5U                                           /*!< PMU SWINC: Event Counter 5 Software Increment Position */
+#define PMU_SWINC_CNT5_Msk                   (1UL << PMU_SWINC_CNT5_Pos)                   /*!< PMU SWINC: Event Counter 5 Software Increment Mask */
+
+#define PMU_SWINC_CNT6_Pos                    6U                                           /*!< PMU SWINC: Event Counter 6 Software Increment Position */
+#define PMU_SWINC_CNT6_Msk                   (1UL << PMU_SWINC_CNT6_Pos)                   /*!< PMU SWINC: Event Counter 6 Software Increment Mask */
+
+#define PMU_SWINC_CNT7_Pos                    7U                                           /*!< PMU SWINC: Event Counter 7 Software Increment Position */
+#define PMU_SWINC_CNT7_Msk                   (1UL << PMU_SWINC_CNT7_Pos)                   /*!< PMU SWINC: Event Counter 7 Software Increment Mask */
+
+#define PMU_SWINC_CNT8_Pos                    8U                                           /*!< PMU SWINC: Event Counter 8 Software Increment Position */
+#define PMU_SWINC_CNT8_Msk                   (1UL << PMU_SWINC_CNT8_Pos)                   /*!< PMU SWINC: Event Counter 8 Software Increment Mask */
+
+#define PMU_SWINC_CNT9_Pos                    9U                                           /*!< PMU SWINC: Event Counter 9 Software Increment Position */
+#define PMU_SWINC_CNT9_Msk                   (1UL << PMU_SWINC_CNT9_Pos)                   /*!< PMU SWINC: Event Counter 9 Software Increment Mask */
+
+#define PMU_SWINC_CNT10_Pos                   10U                                          /*!< PMU SWINC: Event Counter 10 Software Increment Position */
+#define PMU_SWINC_CNT10_Msk                  (1UL << PMU_SWINC_CNT10_Pos)                  /*!< PMU SWINC: Event Counter 10 Software Increment Mask */
+
+#define PMU_SWINC_CNT11_Pos                   11U                                          /*!< PMU SWINC: Event Counter 11 Software Increment Position */
+#define PMU_SWINC_CNT11_Msk                  (1UL << PMU_SWINC_CNT11_Pos)                  /*!< PMU SWINC: Event Counter 11 Software Increment Mask */
+
+#define PMU_SWINC_CNT12_Pos                   12U                                          /*!< PMU SWINC: Event Counter 12 Software Increment Position */
+#define PMU_SWINC_CNT12_Msk                  (1UL << PMU_SWINC_CNT12_Pos)                  /*!< PMU SWINC: Event Counter 12 Software Increment Mask */
+
+#define PMU_SWINC_CNT13_Pos                   13U                                          /*!< PMU SWINC: Event Counter 13 Software Increment Position */
+#define PMU_SWINC_CNT13_Msk                  (1UL << PMU_SWINC_CNT13_Pos)                  /*!< PMU SWINC: Event Counter 13 Software Increment Mask */
+
+#define PMU_SWINC_CNT14_Pos                   14U                                          /*!< PMU SWINC: Event Counter 14 Software Increment Position */
+#define PMU_SWINC_CNT14_Msk                  (1UL << PMU_SWINC_CNT14_Pos)                  /*!< PMU SWINC: Event Counter 14 Software Increment Mask */
+
+#define PMU_SWINC_CNT15_Pos                   15U                                          /*!< PMU SWINC: Event Counter 15 Software Increment Position */
+#define PMU_SWINC_CNT15_Msk                  (1UL << PMU_SWINC_CNT15_Pos)                  /*!< PMU SWINC: Event Counter 15 Software Increment Mask */
+
+#define PMU_SWINC_CNT16_Pos                   16U                                          /*!< PMU SWINC: Event Counter 16 Software Increment Position */
+#define PMU_SWINC_CNT16_Msk                  (1UL << PMU_SWINC_CNT16_Pos)                  /*!< PMU SWINC: Event Counter 16 Software Increment Mask */
+
+#define PMU_SWINC_CNT17_Pos                   17U                                          /*!< PMU SWINC: Event Counter 17 Software Increment Position */
+#define PMU_SWINC_CNT17_Msk                  (1UL << PMU_SWINC_CNT17_Pos)                  /*!< PMU SWINC: Event Counter 17 Software Increment Mask */
+
+#define PMU_SWINC_CNT18_Pos                   18U                                          /*!< PMU SWINC: Event Counter 18 Software Increment Position */
+#define PMU_SWINC_CNT18_Msk                  (1UL << PMU_SWINC_CNT18_Pos)                  /*!< PMU SWINC: Event Counter 18 Software Increment Mask */
+
+#define PMU_SWINC_CNT19_Pos                   19U                                          /*!< PMU SWINC: Event Counter 19 Software Increment Position */
+#define PMU_SWINC_CNT19_Msk                  (1UL << PMU_SWINC_CNT19_Pos)                  /*!< PMU SWINC: Event Counter 19 Software Increment Mask */
+
+#define PMU_SWINC_CNT20_Pos                   20U                                          /*!< PMU SWINC: Event Counter 20 Software Increment Position */
+#define PMU_SWINC_CNT20_Msk                  (1UL << PMU_SWINC_CNT20_Pos)                  /*!< PMU SWINC: Event Counter 20 Software Increment Mask */
+
+#define PMU_SWINC_CNT21_Pos                   21U                                          /*!< PMU SWINC: Event Counter 21 Software Increment Position */
+#define PMU_SWINC_CNT21_Msk                  (1UL << PMU_SWINC_CNT21_Pos)                  /*!< PMU SWINC: Event Counter 21 Software Increment Mask */
+
+#define PMU_SWINC_CNT22_Pos                   22U                                          /*!< PMU SWINC: Event Counter 22 Software Increment Position */
+#define PMU_SWINC_CNT22_Msk                  (1UL << PMU_SWINC_CNT22_Pos)                  /*!< PMU SWINC: Event Counter 22 Software Increment Mask */
+
+#define PMU_SWINC_CNT23_Pos                   23U                                          /*!< PMU SWINC: Event Counter 23 Software Increment Position */
+#define PMU_SWINC_CNT23_Msk                  (1UL << PMU_SWINC_CNT23_Pos)                  /*!< PMU SWINC: Event Counter 23 Software Increment Mask */
+
+#define PMU_SWINC_CNT24_Pos                   24U                                          /*!< PMU SWINC: Event Counter 24 Software Increment Position */
+#define PMU_SWINC_CNT24_Msk                  (1UL << PMU_SWINC_CNT24_Pos)                  /*!< PMU SWINC: Event Counter 24 Software Increment Mask */
+
+#define PMU_SWINC_CNT25_Pos                   25U                                          /*!< PMU SWINC: Event Counter 25 Software Increment Position */
+#define PMU_SWINC_CNT25_Msk                  (1UL << PMU_SWINC_CNT25_Pos)                  /*!< PMU SWINC: Event Counter 25 Software Increment Mask */
+
+#define PMU_SWINC_CNT26_Pos                   26U                                          /*!< PMU SWINC: Event Counter 26 Software Increment Position */
+#define PMU_SWINC_CNT26_Msk                  (1UL << PMU_SWINC_CNT26_Pos)                  /*!< PMU SWINC: Event Counter 26 Software Increment Mask */
+
+#define PMU_SWINC_CNT27_Pos                   27U                                          /*!< PMU SWINC: Event Counter 27 Software Increment Position */
+#define PMU_SWINC_CNT27_Msk                  (1UL << PMU_SWINC_CNT27_Pos)                  /*!< PMU SWINC: Event Counter 27 Software Increment Mask */
+
+#define PMU_SWINC_CNT28_Pos                   28U                                          /*!< PMU SWINC: Event Counter 28 Software Increment Position */
+#define PMU_SWINC_CNT28_Msk                  (1UL << PMU_SWINC_CNT28_Pos)                  /*!< PMU SWINC: Event Counter 28 Software Increment Mask */
+
+#define PMU_SWINC_CNT29_Pos                   29U                                          /*!< PMU SWINC: Event Counter 29 Software Increment Position */
+#define PMU_SWINC_CNT29_Msk                  (1UL << PMU_SWINC_CNT29_Pos)                  /*!< PMU SWINC: Event Counter 29 Software Increment Mask */
+
+#define PMU_SWINC_CNT30_Pos                   30U                                          /*!< PMU SWINC: Event Counter 30 Software Increment Position */
+#define PMU_SWINC_CNT30_Msk                  (1UL << PMU_SWINC_CNT30_Pos)                  /*!< PMU SWINC: Event Counter 30 Software Increment Mask */
+
+/** \brief PMU Control Register Definitions */
+
+#define PMU_CTRL_ENABLE_Pos                   0U                                           /*!< PMU CTRL: ENABLE Position */
+#define PMU_CTRL_ENABLE_Msk                  (1UL /*<< PMU_CTRL_ENABLE_Pos*/)              /*!< PMU CTRL: ENABLE Mask */
+
+#define PMU_CTRL_EVENTCNT_RESET_Pos           1U                                           /*!< PMU CTRL: Event Counter Reset Position */
+#define PMU_CTRL_EVENTCNT_RESET_Msk          (1UL << PMU_CTRL_EVENTCNT_RESET_Pos)          /*!< PMU CTRL: Event Counter Reset Mask */
+
+#define PMU_CTRL_CYCCNT_RESET_Pos             2U                                           /*!< PMU CTRL: Cycle Counter Reset Position */
+#define PMU_CTRL_CYCCNT_RESET_Msk            (1UL << PMU_CTRL_CYCCNT_RESET_Pos)            /*!< PMU CTRL: Cycle Counter Reset Mask */
+
+#define PMU_CTRL_CYCCNT_DISABLE_Pos           5U                                           /*!< PMU CTRL: Disable Cycle Counter Position */
+#define PMU_CTRL_CYCCNT_DISABLE_Msk          (1UL << PMU_CTRL_CYCCNT_DISABLE_Pos)          /*!< PMU CTRL: Disable Cycle Counter Mask */
+
+#define PMU_CTRL_FRZ_ON_OV_Pos                9U                                           /*!< PMU CTRL: Freeze-on-overflow Position */
+#define PMU_CTRL_FRZ_ON_OV_Msk               (1UL << PMU_CTRL_FRZ_ON_OVERFLOW_Pos)         /*!< PMU CTRL: Freeze-on-overflow Mask */
+
+#define PMU_CTRL_TRACE_ON_OV_Pos              11U                                          /*!< PMU CTRL: Trace-on-overflow Position */
+#define PMU_CTRL_TRACE_ON_OV_Msk             (1UL << PMU_CTRL_TRACE_ON_OVERFLOW_Pos)       /*!< PMU CTRL: Trace-on-overflow Mask */
+
+/** \brief PMU Type Register Definitions */
+
+#define PMU_TYPE_NUM_CNTS_Pos                 0U                                           /*!< PMU TYPE: Number of Counters Position */
+#define PMU_TYPE_NUM_CNTS_Msk                (0xFFUL /*<< PMU_TYPE_NUM_CNTS_Pos*/)         /*!< PMU TYPE: Number of Counters Mask */
+
+#define PMU_TYPE_SIZE_CNTS_Pos                8U                                           /*!< PMU TYPE: Size of Counters Position */
+#define PMU_TYPE_SIZE_CNTS_Msk               (0x3FUL << PMU_TYPE_SIZE_CNTS_Pos)            /*!< PMU TYPE: Size of Counters Mask */
+
+#define PMU_TYPE_CYCCNT_PRESENT_Pos           14U                                          /*!< PMU TYPE: Cycle Counter Present Position */
+#define PMU_TYPE_CYCCNT_PRESENT_Msk          (1UL << PMU_TYPE_CYCCNT_PRESENT_Pos)          /*!< PMU TYPE: Cycle Counter Present Mask */
+
+#define PMU_TYPE_FRZ_OV_SUPPORT_Pos           21U                                          /*!< PMU TYPE: Freeze-on-overflow Support Position */
+#define PMU_TYPE_FRZ_OV_SUPPORT_Msk          (1UL << PMU_TYPE_FRZ_OV_SUPPORT_Pos)          /*!< PMU TYPE: Freeze-on-overflow Support Mask */
+
+#define PMU_TYPE_TRACE_ON_OV_SUPPORT_Pos      23U                                          /*!< PMU TYPE: Trace-on-overflow Support Position */
+#define PMU_TYPE_TRACE_ON_OV_SUPPORT_Msk     (1UL << PMU_TYPE_FRZ_OV_SUPPORT_Pos)          /*!< PMU TYPE: Trace-on-overflow Support Mask */
+
+/** \brief PMU Authentication Status Register Definitions */
+
+#define PMU_AUTHSTATUS_NSID_Pos               0U                                           /*!< PMU AUTHSTATUS: Non-secure Invasive Debug Position */
+#define PMU_AUTHSTATUS_NSID_Msk              (0x3UL /*<< PMU_AUTHSTATUS_NSID_Pos*/)        /*!< PMU AUTHSTATUS: Non-secure Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSNID_Pos              2U                                           /*!< PMU AUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_NSNID_Msk             (0x3UL << PMU_AUTHSTATUS_NSNID_Pos)           /*!< PMU AUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SID_Pos                4U                                           /*!< PMU AUTHSTATUS: Secure Invasive Debug Position */
+#define PMU_AUTHSTATUS_SID_Msk               (0x3UL << PMU_AUTHSTATUS_SID_Pos)             /*!< PMU AUTHSTATUS: Secure Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SNID_Pos               6U                                           /*!< PMU AUTHSTATUS: Secure Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_SNID_Msk              (0x3UL << PMU_AUTHSTATUS_SNID_Pos)            /*!< PMU AUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSUID_Pos              16U                                          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Invasive Debug Position */
+#define PMU_AUTHSTATUS_NSUID_Msk             (0x3UL << PMU_AUTHSTATUS_NSUID_Pos)           /*!< PMU AUTHSTATUS: Non-secure Unprivileged Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_NSUNID_Pos             18U                                          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_NSUNID_Msk            (0x3UL << PMU_AUTHSTATUS_NSUNID_Pos)          /*!< PMU AUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SUID_Pos               20U                                          /*!< PMU AUTHSTATUS: Secure Unprivileged Invasive Debug Position */
+#define PMU_AUTHSTATUS_SUID_Msk              (0x3UL << PMU_AUTHSTATUS_SUID_Pos)            /*!< PMU AUTHSTATUS: Secure Unprivileged Invasive Debug Mask */
+
+#define PMU_AUTHSTATUS_SUNID_Pos              22U                                          /*!< PMU AUTHSTATUS: Secure Unprivileged Non-invasive Debug Position */
+#define PMU_AUTHSTATUS_SUNID_Msk             (0x3UL << PMU_AUTHSTATUS_SUNID_Pos)           /*!< PMU AUTHSTATUS: Secure Unprivileged Non-invasive Debug Mask */
+
+
+/*@} end of group CMSIS_PMU */
+#endif
+
+#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_MPU     Memory Protection Unit (MPU)
+  \brief    Type definitions for the Memory Protection Unit (MPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Memory Protection Unit (MPU).
+ */
+typedef struct
+{
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x000 (R/ )  MPU Type Register */
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x004 (R/W)  MPU Control Register */
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  MPU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  MPU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  MPU Region Limit Address Register */
+  __IOM uint32_t RBAR_A1;                /*!< Offset: 0x014 (R/W)  MPU Region Base Address Register Alias 1 */
+  __IOM uint32_t RLAR_A1;                /*!< Offset: 0x018 (R/W)  MPU Region Limit Address Register Alias 1 */
+  __IOM uint32_t RBAR_A2;                /*!< Offset: 0x01C (R/W)  MPU Region Base Address Register Alias 2 */
+  __IOM uint32_t RLAR_A2;                /*!< Offset: 0x020 (R/W)  MPU Region Limit Address Register Alias 2 */
+  __IOM uint32_t RBAR_A3;                /*!< Offset: 0x024 (R/W)  MPU Region Base Address Register Alias 3 */
+  __IOM uint32_t RLAR_A3;                /*!< Offset: 0x028 (R/W)  MPU Region Limit Address Register Alias 3 */
+        uint32_t RESERVED0[1];
+  union {
+  __IOM uint32_t MAIR[2];
+  struct {
+  __IOM uint32_t MAIR0;                  /*!< Offset: 0x030 (R/W)  MPU Memory Attribute Indirection Register 0 */
+  __IOM uint32_t MAIR1;                  /*!< Offset: 0x034 (R/W)  MPU Memory Attribute Indirection Register 1 */
+  };
+  };
+} MPU_Type;
+
+#define MPU_TYPE_RALIASES                  4U
+
+/* MPU Type Register Definitions */
+#define MPU_TYPE_IREGION_Pos               16U                                            /*!< MPU TYPE: IREGION Position */
+#define MPU_TYPE_IREGION_Msk               (0xFFUL << MPU_TYPE_IREGION_Pos)               /*!< MPU TYPE: IREGION Mask */
+
+#define MPU_TYPE_DREGION_Pos                8U                                            /*!< MPU TYPE: DREGION Position */
+#define MPU_TYPE_DREGION_Msk               (0xFFUL << MPU_TYPE_DREGION_Pos)               /*!< MPU TYPE: DREGION Mask */
+
+#define MPU_TYPE_SEPARATE_Pos               0U                                            /*!< MPU TYPE: SEPARATE Position */
+#define MPU_TYPE_SEPARATE_Msk              (1UL /*<< MPU_TYPE_SEPARATE_Pos*/)             /*!< MPU TYPE: SEPARATE Mask */
+
+/* MPU Control Register Definitions */
+#define MPU_CTRL_PRIVDEFENA_Pos             2U                                            /*!< MPU CTRL: PRIVDEFENA Position */
+#define MPU_CTRL_PRIVDEFENA_Msk            (1UL << MPU_CTRL_PRIVDEFENA_Pos)               /*!< MPU CTRL: PRIVDEFENA Mask */
+
+#define MPU_CTRL_HFNMIENA_Pos               1U                                            /*!< MPU CTRL: HFNMIENA Position */
+#define MPU_CTRL_HFNMIENA_Msk              (1UL << MPU_CTRL_HFNMIENA_Pos)                 /*!< MPU CTRL: HFNMIENA Mask */
+
+#define MPU_CTRL_ENABLE_Pos                 0U                                            /*!< MPU CTRL: ENABLE Position */
+#define MPU_CTRL_ENABLE_Msk                (1UL /*<< MPU_CTRL_ENABLE_Pos*/)               /*!< MPU CTRL: ENABLE Mask */
+
+/* MPU Region Number Register Definitions */
+#define MPU_RNR_REGION_Pos                  0U                                            /*!< MPU RNR: REGION Position */
+#define MPU_RNR_REGION_Msk                 (0xFFUL /*<< MPU_RNR_REGION_Pos*/)             /*!< MPU RNR: REGION Mask */
+
+/* MPU Region Base Address Register Definitions */
+#define MPU_RBAR_BASE_Pos                   5U                                            /*!< MPU RBAR: BASE Position */
+#define MPU_RBAR_BASE_Msk                  (0x7FFFFFFUL << MPU_RBAR_BASE_Pos)             /*!< MPU RBAR: BASE Mask */
+
+#define MPU_RBAR_SH_Pos                     3U                                            /*!< MPU RBAR: SH Position */
+#define MPU_RBAR_SH_Msk                    (0x3UL << MPU_RBAR_SH_Pos)                     /*!< MPU RBAR: SH Mask */
+
+#define MPU_RBAR_AP_Pos                     1U                                            /*!< MPU RBAR: AP Position */
+#define MPU_RBAR_AP_Msk                    (0x3UL << MPU_RBAR_AP_Pos)                     /*!< MPU RBAR: AP Mask */
+
+#define MPU_RBAR_XN_Pos                     0U                                            /*!< MPU RBAR: XN Position */
+#define MPU_RBAR_XN_Msk                    (01UL /*<< MPU_RBAR_XN_Pos*/)                  /*!< MPU RBAR: XN Mask */
+
+/* MPU Region Limit Address Register Definitions */
+#define MPU_RLAR_LIMIT_Pos                  5U                                            /*!< MPU RLAR: LIMIT Position */
+#define MPU_RLAR_LIMIT_Msk                 (0x7FFFFFFUL << MPU_RLAR_LIMIT_Pos)            /*!< MPU RLAR: LIMIT Mask */
+
+#define MPU_RLAR_PXN_Pos                    4U                                            /*!< MPU RLAR: PXN Position */
+#define MPU_RLAR_PXN_Msk                   (1UL << MPU_RLAR_PXN_Pos)                      /*!< MPU RLAR: PXN Mask */
+
+#define MPU_RLAR_AttrIndx_Pos               1U                                            /*!< MPU RLAR: AttrIndx Position */
+#define MPU_RLAR_AttrIndx_Msk              (7UL << MPU_RLAR_AttrIndx_Pos)                 /*!< MPU RLAR: AttrIndx Mask */
+
+#define MPU_RLAR_EN_Pos                     0U                                            /*!< MPU RLAR: Region enable bit Position */
+#define MPU_RLAR_EN_Msk                    (1UL /*<< MPU_RLAR_EN_Pos*/)                   /*!< MPU RLAR: Region enable bit Disable Mask */
+
+/* MPU Memory Attribute Indirection Register 0 Definitions */
+#define MPU_MAIR0_Attr3_Pos                24U                                            /*!< MPU MAIR0: Attr3 Position */
+#define MPU_MAIR0_Attr3_Msk                (0xFFUL << MPU_MAIR0_Attr3_Pos)                /*!< MPU MAIR0: Attr3 Mask */
+
+#define MPU_MAIR0_Attr2_Pos                16U                                            /*!< MPU MAIR0: Attr2 Position */
+#define MPU_MAIR0_Attr2_Msk                (0xFFUL << MPU_MAIR0_Attr2_Pos)                /*!< MPU MAIR0: Attr2 Mask */
+
+#define MPU_MAIR0_Attr1_Pos                 8U                                            /*!< MPU MAIR0: Attr1 Position */
+#define MPU_MAIR0_Attr1_Msk                (0xFFUL << MPU_MAIR0_Attr1_Pos)                /*!< MPU MAIR0: Attr1 Mask */
+
+#define MPU_MAIR0_Attr0_Pos                 0U                                            /*!< MPU MAIR0: Attr0 Position */
+#define MPU_MAIR0_Attr0_Msk                (0xFFUL /*<< MPU_MAIR0_Attr0_Pos*/)            /*!< MPU MAIR0: Attr0 Mask */
+
+/* MPU Memory Attribute Indirection Register 1 Definitions */
+#define MPU_MAIR1_Attr7_Pos                24U                                            /*!< MPU MAIR1: Attr7 Position */
+#define MPU_MAIR1_Attr7_Msk                (0xFFUL << MPU_MAIR1_Attr7_Pos)                /*!< MPU MAIR1: Attr7 Mask */
+
+#define MPU_MAIR1_Attr6_Pos                16U                                            /*!< MPU MAIR1: Attr6 Position */
+#define MPU_MAIR1_Attr6_Msk                (0xFFUL << MPU_MAIR1_Attr6_Pos)                /*!< MPU MAIR1: Attr6 Mask */
+
+#define MPU_MAIR1_Attr5_Pos                 8U                                            /*!< MPU MAIR1: Attr5 Position */
+#define MPU_MAIR1_Attr5_Msk                (0xFFUL << MPU_MAIR1_Attr5_Pos)                /*!< MPU MAIR1: Attr5 Mask */
+
+#define MPU_MAIR1_Attr4_Pos                 0U                                            /*!< MPU MAIR1: Attr4 Position */
+#define MPU_MAIR1_Attr4_Msk                (0xFFUL /*<< MPU_MAIR1_Attr4_Pos*/)            /*!< MPU MAIR1: Attr4 Mask */
+
+/*@} end of group CMSIS_MPU */
+#endif
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SAU     Security Attribution Unit (SAU)
+  \brief    Type definitions for the Security Attribution Unit (SAU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Security Attribution Unit (SAU).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SAU Control Register */
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x004 (R/ )  SAU Type Register */
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  SAU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  SAU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  SAU Region Limit Address Register */
+#else
+        uint32_t RESERVED0[3];
+#endif
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x014 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x018 (R/W)  Secure Fault Address Register */
+} SAU_Type;
+
+/* SAU Control Register Definitions */
+#define SAU_CTRL_ALLNS_Pos                  1U                                            /*!< SAU CTRL: ALLNS Position */
+#define SAU_CTRL_ALLNS_Msk                 (1UL << SAU_CTRL_ALLNS_Pos)                    /*!< SAU CTRL: ALLNS Mask */
+
+#define SAU_CTRL_ENABLE_Pos                 0U                                            /*!< SAU CTRL: ENABLE Position */
+#define SAU_CTRL_ENABLE_Msk                (1UL /*<< SAU_CTRL_ENABLE_Pos*/)               /*!< SAU CTRL: ENABLE Mask */
+
+/* SAU Type Register Definitions */
+#define SAU_TYPE_SREGION_Pos                0U                                            /*!< SAU TYPE: SREGION Position */
+#define SAU_TYPE_SREGION_Msk               (0xFFUL /*<< SAU_TYPE_SREGION_Pos*/)           /*!< SAU TYPE: SREGION Mask */
+
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+/* SAU Region Number Register Definitions */
+#define SAU_RNR_REGION_Pos                  0U                                            /*!< SAU RNR: REGION Position */
+#define SAU_RNR_REGION_Msk                 (0xFFUL /*<< SAU_RNR_REGION_Pos*/)             /*!< SAU RNR: REGION Mask */
+
+/* SAU Region Base Address Register Definitions */
+#define SAU_RBAR_BADDR_Pos                  5U                                            /*!< SAU RBAR: BADDR Position */
+#define SAU_RBAR_BADDR_Msk                 (0x7FFFFFFUL << SAU_RBAR_BADDR_Pos)            /*!< SAU RBAR: BADDR Mask */
+
+/* SAU Region Limit Address Register Definitions */
+#define SAU_RLAR_LADDR_Pos                  5U                                            /*!< SAU RLAR: LADDR Position */
+#define SAU_RLAR_LADDR_Msk                 (0x7FFFFFFUL << SAU_RLAR_LADDR_Pos)            /*!< SAU RLAR: LADDR Mask */
+
+#define SAU_RLAR_NSC_Pos                    1U                                            /*!< SAU RLAR: NSC Position */
+#define SAU_RLAR_NSC_Msk                   (1UL << SAU_RLAR_NSC_Pos)                      /*!< SAU RLAR: NSC Mask */
+
+#define SAU_RLAR_ENABLE_Pos                 0U                                            /*!< SAU RLAR: ENABLE Position */
+#define SAU_RLAR_ENABLE_Msk                (1UL /*<< SAU_RLAR_ENABLE_Pos*/)               /*!< SAU RLAR: ENABLE Mask */
+
+#endif /* defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U) */
+
+/* Secure Fault Status Register Definitions */
+#define SAU_SFSR_LSERR_Pos                  7U                                            /*!< SAU SFSR: LSERR Position */
+#define SAU_SFSR_LSERR_Msk                 (1UL << SAU_SFSR_LSERR_Pos)                    /*!< SAU SFSR: LSERR Mask */
+
+#define SAU_SFSR_SFARVALID_Pos              6U                                            /*!< SAU SFSR: SFARVALID Position */
+#define SAU_SFSR_SFARVALID_Msk             (1UL << SAU_SFSR_SFARVALID_Pos)                /*!< SAU SFSR: SFARVALID Mask */
+
+#define SAU_SFSR_LSPERR_Pos                 5U                                            /*!< SAU SFSR: LSPERR Position */
+#define SAU_SFSR_LSPERR_Msk                (1UL << SAU_SFSR_LSPERR_Pos)                   /*!< SAU SFSR: LSPERR Mask */
+
+#define SAU_SFSR_INVTRAN_Pos                4U                                            /*!< SAU SFSR: INVTRAN Position */
+#define SAU_SFSR_INVTRAN_Msk               (1UL << SAU_SFSR_INVTRAN_Pos)                  /*!< SAU SFSR: INVTRAN Mask */
+
+#define SAU_SFSR_AUVIOL_Pos                 3U                                            /*!< SAU SFSR: AUVIOL Position */
+#define SAU_SFSR_AUVIOL_Msk                (1UL << SAU_SFSR_AUVIOL_Pos)                   /*!< SAU SFSR: AUVIOL Mask */
+
+#define SAU_SFSR_INVER_Pos                  2U                                            /*!< SAU SFSR: INVER Position */
+#define SAU_SFSR_INVER_Msk                 (1UL << SAU_SFSR_INVER_Pos)                    /*!< SAU SFSR: INVER Mask */
+
+#define SAU_SFSR_INVIS_Pos                  1U                                            /*!< SAU SFSR: INVIS Position */
+#define SAU_SFSR_INVIS_Msk                 (1UL << SAU_SFSR_INVIS_Pos)                    /*!< SAU SFSR: INVIS Mask */
+
+#define SAU_SFSR_INVEP_Pos                  0U                                            /*!< SAU SFSR: INVEP Position */
+#define SAU_SFSR_INVEP_Msk                 (1UL /*<< SAU_SFSR_INVEP_Pos*/)                /*!< SAU SFSR: INVEP Mask */
+
+/*@} end of group CMSIS_SAU */
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_FPU     Floating Point Unit (FPU)
+  \brief    Type definitions for the Floating Point Unit (FPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Floating Point Unit (FPU).
+ */
+typedef struct
+{
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t FPCCR;                  /*!< Offset: 0x004 (R/W)  Floating-Point Context Control Register */
+  __IOM uint32_t FPCAR;                  /*!< Offset: 0x008 (R/W)  Floating-Point Context Address Register */
+  __IOM uint32_t FPDSCR;                 /*!< Offset: 0x00C (R/W)  Floating-Point Default Status Control Register */
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x018 (R/ )  Media and VFP Feature Register 2 */
+} FPU_Type;
+
+/* Floating-Point Context Control Register Definitions */
+#define FPU_FPCCR_ASPEN_Pos                31U                                            /*!< FPCCR: ASPEN bit Position */
+#define FPU_FPCCR_ASPEN_Msk                (1UL << FPU_FPCCR_ASPEN_Pos)                   /*!< FPCCR: ASPEN bit Mask */
+
+#define FPU_FPCCR_LSPEN_Pos                30U                                            /*!< FPCCR: LSPEN Position */
+#define FPU_FPCCR_LSPEN_Msk                (1UL << FPU_FPCCR_LSPEN_Pos)                   /*!< FPCCR: LSPEN bit Mask */
+
+#define FPU_FPCCR_LSPENS_Pos               29U                                            /*!< FPCCR: LSPENS Position */
+#define FPU_FPCCR_LSPENS_Msk               (1UL << FPU_FPCCR_LSPENS_Pos)                  /*!< FPCCR: LSPENS bit Mask */
+
+#define FPU_FPCCR_CLRONRET_Pos             28U                                            /*!< FPCCR: CLRONRET Position */
+#define FPU_FPCCR_CLRONRET_Msk             (1UL << FPU_FPCCR_CLRONRET_Pos)                /*!< FPCCR: CLRONRET bit Mask */
+
+#define FPU_FPCCR_CLRONRETS_Pos            27U                                            /*!< FPCCR: CLRONRETS Position */
+#define FPU_FPCCR_CLRONRETS_Msk            (1UL << FPU_FPCCR_CLRONRETS_Pos)               /*!< FPCCR: CLRONRETS bit Mask */
+
+#define FPU_FPCCR_TS_Pos                   26U                                            /*!< FPCCR: TS Position */
+#define FPU_FPCCR_TS_Msk                   (1UL << FPU_FPCCR_TS_Pos)                      /*!< FPCCR: TS bit Mask */
+
+#define FPU_FPCCR_UFRDY_Pos                10U                                            /*!< FPCCR: UFRDY Position */
+#define FPU_FPCCR_UFRDY_Msk                (1UL << FPU_FPCCR_UFRDY_Pos)                   /*!< FPCCR: UFRDY bit Mask */
+
+#define FPU_FPCCR_SPLIMVIOL_Pos             9U                                            /*!< FPCCR: SPLIMVIOL Position */
+#define FPU_FPCCR_SPLIMVIOL_Msk            (1UL << FPU_FPCCR_SPLIMVIOL_Pos)               /*!< FPCCR: SPLIMVIOL bit Mask */
+
+#define FPU_FPCCR_MONRDY_Pos                8U                                            /*!< FPCCR: MONRDY Position */
+#define FPU_FPCCR_MONRDY_Msk               (1UL << FPU_FPCCR_MONRDY_Pos)                  /*!< FPCCR: MONRDY bit Mask */
+
+#define FPU_FPCCR_SFRDY_Pos                 7U                                            /*!< FPCCR: SFRDY Position */
+#define FPU_FPCCR_SFRDY_Msk                (1UL << FPU_FPCCR_SFRDY_Pos)                   /*!< FPCCR: SFRDY bit Mask */
+
+#define FPU_FPCCR_BFRDY_Pos                 6U                                            /*!< FPCCR: BFRDY Position */
+#define FPU_FPCCR_BFRDY_Msk                (1UL << FPU_FPCCR_BFRDY_Pos)                   /*!< FPCCR: BFRDY bit Mask */
+
+#define FPU_FPCCR_MMRDY_Pos                 5U                                            /*!< FPCCR: MMRDY Position */
+#define FPU_FPCCR_MMRDY_Msk                (1UL << FPU_FPCCR_MMRDY_Pos)                   /*!< FPCCR: MMRDY bit Mask */
+
+#define FPU_FPCCR_HFRDY_Pos                 4U                                            /*!< FPCCR: HFRDY Position */
+#define FPU_FPCCR_HFRDY_Msk                (1UL << FPU_FPCCR_HFRDY_Pos)                   /*!< FPCCR: HFRDY bit Mask */
+
+#define FPU_FPCCR_THREAD_Pos                3U                                            /*!< FPCCR: processor mode bit Position */
+#define FPU_FPCCR_THREAD_Msk               (1UL << FPU_FPCCR_THREAD_Pos)                  /*!< FPCCR: processor mode active bit Mask */
+
+#define FPU_FPCCR_S_Pos                     2U                                            /*!< FPCCR: Security status of the FP context bit Position */
+#define FPU_FPCCR_S_Msk                    (1UL << FPU_FPCCR_S_Pos)                       /*!< FPCCR: Security status of the FP context bit Mask */
+
+#define FPU_FPCCR_USER_Pos                  1U                                            /*!< FPCCR: privilege level bit Position */
+#define FPU_FPCCR_USER_Msk                 (1UL << FPU_FPCCR_USER_Pos)                    /*!< FPCCR: privilege level bit Mask */
+
+#define FPU_FPCCR_LSPACT_Pos                0U                                            /*!< FPCCR: Lazy state preservation active bit Position */
+#define FPU_FPCCR_LSPACT_Msk               (1UL /*<< FPU_FPCCR_LSPACT_Pos*/)              /*!< FPCCR: Lazy state preservation active bit Mask */
+
+/* Floating-Point Context Address Register Definitions */
+#define FPU_FPCAR_ADDRESS_Pos               3U                                            /*!< FPCAR: ADDRESS bit Position */
+#define FPU_FPCAR_ADDRESS_Msk              (0x1FFFFFFFUL << FPU_FPCAR_ADDRESS_Pos)        /*!< FPCAR: ADDRESS bit Mask */
+
+/* Floating-Point Default Status Control Register Definitions */
+#define FPU_FPDSCR_AHP_Pos                 26U                                            /*!< FPDSCR: AHP bit Position */
+#define FPU_FPDSCR_AHP_Msk                 (1UL << FPU_FPDSCR_AHP_Pos)                    /*!< FPDSCR: AHP bit Mask */
+
+#define FPU_FPDSCR_DN_Pos                  25U                                            /*!< FPDSCR: DN bit Position */
+#define FPU_FPDSCR_DN_Msk                  (1UL << FPU_FPDSCR_DN_Pos)                     /*!< FPDSCR: DN bit Mask */
+
+#define FPU_FPDSCR_FZ_Pos                  24U                                            /*!< FPDSCR: FZ bit Position */
+#define FPU_FPDSCR_FZ_Msk                  (1UL << FPU_FPDSCR_FZ_Pos)                     /*!< FPDSCR: FZ bit Mask */
+
+#define FPU_FPDSCR_RMode_Pos               22U                                            /*!< FPDSCR: RMode bit Position */
+#define FPU_FPDSCR_RMode_Msk               (3UL << FPU_FPDSCR_RMode_Pos)                  /*!< FPDSCR: RMode bit Mask */
+
+#define FPU_FPDSCR_FZ16_Pos                19U                                            /*!< FPDSCR: FZ16 bit Position */
+#define FPU_FPDSCR_FZ16_Msk                (1UL << FPU_FPDSCR_FZ16_Pos)                   /*!< FPDSCR: FZ16 bit Mask */
+
+#define FPU_FPDSCR_LTPSIZE_Pos             16U                                            /*!< FPDSCR: LTPSIZE bit Position */
+#define FPU_FPDSCR_LTPSIZE_Msk             (7UL << FPU_FPDSCR_LTPSIZE_Pos)                /*!< FPDSCR: LTPSIZE bit Mask */
+
+/* Media and VFP Feature Register 0 Definitions */
+#define FPU_MVFR0_FPRound_Pos              28U                                            /*!< MVFR0: FPRound bits Position */
+#define FPU_MVFR0_FPRound_Msk              (0xFUL << FPU_MVFR0_FPRound_Pos)               /*!< MVFR0: FPRound bits Mask */
+
+#define FPU_MVFR0_FPSqrt_Pos               20U                                            /*!< MVFR0: FPSqrt bits Position */
+#define FPU_MVFR0_FPSqrt_Msk               (0xFUL << FPU_MVFR0_FPSqrt_Pos)                 /*!< MVFR0: FPSqrt bits Mask */
+
+#define FPU_MVFR0_FPDivide_Pos             16U                                            /*!< MVFR0: FPDivide bits Position */
+#define FPU_MVFR0_FPDivide_Msk             (0xFUL << FPU_MVFR0_FPDivide_Pos)              /*!< MVFR0: Divide bits Mask */
+
+#define FPU_MVFR0_FPDP_Pos                  8U                                            /*!< MVFR0: FPDP bits Position */
+#define FPU_MVFR0_FPDP_Msk                 (0xFUL << FPU_MVFR0_FPDP_Pos)                  /*!< MVFR0: FPDP bits Mask */
+
+#define FPU_MVFR0_FPSP_Pos                  4U                                            /*!< MVFR0: FPSP bits Position */
+#define FPU_MVFR0_FPSP_Msk                 (0xFUL << FPU_MVFR0_FPSP_Pos)                  /*!< MVFR0: FPSP bits Mask */
+
+#define FPU_MVFR0_SIMDReg_Pos               0U                                            /*!< MVFR0: SIMDReg bits Position */
+#define FPU_MVFR0_SIMDReg_Msk              (0xFUL /*<< FPU_MVFR0_SIMDReg_Pos*/)           /*!< MVFR0: SIMDReg bits Mask */
+
+/* Media and VFP Feature Register 1 Definitions */
+#define FPU_MVFR1_FMAC_Pos                 28U                                            /*!< MVFR1: FMAC bits Position */
+#define FPU_MVFR1_FMAC_Msk                 (0xFUL << FPU_MVFR1_FMAC_Pos)                  /*!< MVFR1: FMAC bits Mask */
+
+#define FPU_MVFR1_FPHP_Pos                 24U                                            /*!< MVFR1: FPHP bits Position */
+#define FPU_MVFR1_FPHP_Msk                 (0xFUL << FPU_MVFR1_FPHP_Pos)                  /*!< MVFR1: FPHP bits Mask */
+
+#define FPU_MVFR1_FP16_Pos                 20U                                            /*!< MVFR1: FP16 bits Position */
+#define FPU_MVFR1_FP16_Msk                 (0xFUL << FPU_MVFR1_FP16_Pos)                  /*!< MVFR1: FP16 bits Mask */
+
+#define FPU_MVFR1_MVE_Pos                   8U                                            /*!< MVFR1: MVE bits Position */
+#define FPU_MVFR1_MVE_Msk                  (0xFUL << FPU_MVFR1_MVE_Pos)                   /*!< MVFR1: MVE bits Mask */
+
+#define FPU_MVFR1_FPDNaN_Pos                4U                                            /*!< MVFR1: FPDNaN bits Position */
+#define FPU_MVFR1_FPDNaN_Msk               (0xFUL << FPU_MVFR1_FPDNaN_Pos)                /*!< MVFR1: FPDNaN bits Mask */
+
+#define FPU_MVFR1_FPFtZ_Pos                 0U                                            /*!< MVFR1: FPFtZ bits Position */
+#define FPU_MVFR1_FPFtZ_Msk                (0xFUL /*<< FPU_MVFR1_FPFtZ_Pos*/)             /*!< MVFR1: FPFtZ bits Mask */
+
+/* Media and VFP Feature Register 2 Definitions */
+#define FPU_MVFR2_FPMisc_Pos                4U                                            /*!< MVFR2: FPMisc bits Position */
+#define FPU_MVFR2_FPMisc_Msk               (0xFUL << FPU_MVFR2_FPMisc_Pos)                /*!< MVFR2: FPMisc bits Mask */
+
+/*@} end of group CMSIS_FPU */
+
+/* CoreDebug is deprecated. replaced by DCB (Debug Control Block) */
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_CoreDebug       Core Debug Registers (CoreDebug)
+  \brief    Type definitions for the Core Debug Registers
+  @{
+ */
+
+/**
+  \brief  \deprecated Structure type to access the Core Debug Register (CoreDebug).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+  __OM  uint32_t DSCEMCR;                /*!< Offset: 0x010 ( /W)  Debug Set Clear Exception and Monitor Control Register */
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} CoreDebug_Type;
+
+/* Debug Halting Control and Status Register Definitions */
+#define CoreDebug_DHCSR_DBGKEY_Pos         16U                                            /*!< \deprecated CoreDebug DHCSR: DBGKEY Position */
+#define CoreDebug_DHCSR_DBGKEY_Msk         (0xFFFFUL << CoreDebug_DHCSR_DBGKEY_Pos)       /*!< \deprecated CoreDebug DHCSR: DBGKEY Mask */
+
+#define CoreDebug_DHCSR_S_RESTART_ST_Pos   26U                                            /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Position */
+#define CoreDebug_DHCSR_S_RESTART_ST_Msk   (1UL << CoreDebug_DHCSR_S_RESTART_ST_Pos)      /*!< \deprecated CoreDebug DHCSR: S_RESTART_ST Mask */
+
+#define CoreDebug_DHCSR_S_RESET_ST_Pos     25U                                            /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Position */
+#define CoreDebug_DHCSR_S_RESET_ST_Msk     (1UL << CoreDebug_DHCSR_S_RESET_ST_Pos)        /*!< \deprecated CoreDebug DHCSR: S_RESET_ST Mask */
+
+#define CoreDebug_DHCSR_S_RETIRE_ST_Pos    24U                                            /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Position */
+#define CoreDebug_DHCSR_S_RETIRE_ST_Msk    (1UL << CoreDebug_DHCSR_S_RETIRE_ST_Pos)       /*!< \deprecated CoreDebug DHCSR: S_RETIRE_ST Mask */
+
+#define CoreDebug_DHCSR_S_FPD_Pos          23U                                            /*!< \deprecated CoreDebug DHCSR: S_FPD Position */
+#define CoreDebug_DHCSR_S_FPD_Msk          (1UL << CoreDebug_DHCSR_S_FPD_Pos)             /*!< \deprecated CoreDebug DHCSR: S_FPD Mask */
+
+#define CoreDebug_DHCSR_S_SUIDE_Pos        22U                                            /*!< \deprecated CoreDebug DHCSR: S_SUIDE Position */
+#define CoreDebug_DHCSR_S_SUIDE_Msk        (1UL << CoreDebug_DHCSR_S_SUIDE_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SUIDE Mask */
+
+#define CoreDebug_DHCSR_S_NSUIDE_Pos       21U                                            /*!< \deprecated CoreDebug DHCSR: S_NSUIDE Position */
+#define CoreDebug_DHCSR_S_NSUIDE_Msk       (1UL << CoreDebug_DHCSR_S_NSUIDE_Pos)          /*!< \deprecated CoreDebug DHCSR: S_NSUIDE Mask */
+
+#define CoreDebug_DHCSR_S_SDE_Pos          20U                                            /*!< \deprecated CoreDebug DHCSR: S_SDE Position */
+#define CoreDebug_DHCSR_S_SDE_Msk          (1UL << CoreDebug_DHCSR_S_SDE_Pos)             /*!< \deprecated CoreDebug DHCSR: S_SDE Mask */
+
+#define CoreDebug_DHCSR_S_LOCKUP_Pos       19U                                            /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Position */
+#define CoreDebug_DHCSR_S_LOCKUP_Msk       (1UL << CoreDebug_DHCSR_S_LOCKUP_Pos)          /*!< \deprecated CoreDebug DHCSR: S_LOCKUP Mask */
+
+#define CoreDebug_DHCSR_S_SLEEP_Pos        18U                                            /*!< \deprecated CoreDebug DHCSR: S_SLEEP Position */
+#define CoreDebug_DHCSR_S_SLEEP_Msk        (1UL << CoreDebug_DHCSR_S_SLEEP_Pos)           /*!< \deprecated CoreDebug DHCSR: S_SLEEP Mask */
+
+#define CoreDebug_DHCSR_S_HALT_Pos         17U                                            /*!< \deprecated CoreDebug DHCSR: S_HALT Position */
+#define CoreDebug_DHCSR_S_HALT_Msk         (1UL << CoreDebug_DHCSR_S_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: S_HALT Mask */
+
+#define CoreDebug_DHCSR_S_REGRDY_Pos       16U                                            /*!< \deprecated CoreDebug DHCSR: S_REGRDY Position */
+#define CoreDebug_DHCSR_S_REGRDY_Msk       (1UL << CoreDebug_DHCSR_S_REGRDY_Pos)          /*!< \deprecated CoreDebug DHCSR: S_REGRDY Mask */
+
+#define CoreDebug_DHCSR_C_PMOV_Pos          6U                                            /*!< \deprecated CoreDebug DHCSR: C_PMOV Position */
+#define CoreDebug_DHCSR_C_PMOV_Msk         (1UL << CoreDebug_DHCSR_C_PMOV_Pos)            /*!< \deprecated CoreDebug DHCSR: C_PMOV Mask */
+
+#define CoreDebug_DHCSR_C_SNAPSTALL_Pos     5U                                            /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Position */
+#define CoreDebug_DHCSR_C_SNAPSTALL_Msk    (1UL << CoreDebug_DHCSR_C_SNAPSTALL_Pos)       /*!< \deprecated CoreDebug DHCSR: C_SNAPSTALL Mask */
+
+#define CoreDebug_DHCSR_C_MASKINTS_Pos      3U                                            /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Position */
+#define CoreDebug_DHCSR_C_MASKINTS_Msk     (1UL << CoreDebug_DHCSR_C_MASKINTS_Pos)        /*!< \deprecated CoreDebug DHCSR: C_MASKINTS Mask */
+
+#define CoreDebug_DHCSR_C_STEP_Pos          2U                                            /*!< \deprecated CoreDebug DHCSR: C_STEP Position */
+#define CoreDebug_DHCSR_C_STEP_Msk         (1UL << CoreDebug_DHCSR_C_STEP_Pos)            /*!< \deprecated CoreDebug DHCSR: C_STEP Mask */
+
+#define CoreDebug_DHCSR_C_HALT_Pos          1U                                            /*!< \deprecated CoreDebug DHCSR: C_HALT Position */
+#define CoreDebug_DHCSR_C_HALT_Msk         (1UL << CoreDebug_DHCSR_C_HALT_Pos)            /*!< \deprecated CoreDebug DHCSR: C_HALT Mask */
+
+#define CoreDebug_DHCSR_C_DEBUGEN_Pos       0U                                            /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Position */
+#define CoreDebug_DHCSR_C_DEBUGEN_Msk      (1UL /*<< CoreDebug_DHCSR_C_DEBUGEN_Pos*/)     /*!< \deprecated CoreDebug DHCSR: C_DEBUGEN Mask */
+
+/* Debug Core Register Selector Register Definitions */
+#define CoreDebug_DCRSR_REGWnR_Pos         16U                                            /*!< \deprecated CoreDebug DCRSR: REGWnR Position */
+#define CoreDebug_DCRSR_REGWnR_Msk         (1UL << CoreDebug_DCRSR_REGWnR_Pos)            /*!< \deprecated CoreDebug DCRSR: REGWnR Mask */
+
+#define CoreDebug_DCRSR_REGSEL_Pos          0U                                            /*!< \deprecated CoreDebug DCRSR: REGSEL Position */
+#define CoreDebug_DCRSR_REGSEL_Msk         (0x1FUL /*<< CoreDebug_DCRSR_REGSEL_Pos*/)     /*!< \deprecated CoreDebug DCRSR: REGSEL Mask */
+
+/* Debug Exception and Monitor Control Register Definitions */
+#define CoreDebug_DEMCR_TRCENA_Pos         24U                                            /*!< \deprecated CoreDebug DEMCR: TRCENA Position */
+#define CoreDebug_DEMCR_TRCENA_Msk         (1UL << CoreDebug_DEMCR_TRCENA_Pos)            /*!< \deprecated CoreDebug DEMCR: TRCENA Mask */
+
+#define CoreDebug_DEMCR_MON_REQ_Pos        19U                                            /*!< \deprecated CoreDebug DEMCR: MON_REQ Position */
+#define CoreDebug_DEMCR_MON_REQ_Msk        (1UL << CoreDebug_DEMCR_MON_REQ_Pos)           /*!< \deprecated CoreDebug DEMCR: MON_REQ Mask */
+
+#define CoreDebug_DEMCR_MON_STEP_Pos       18U                                            /*!< \deprecated CoreDebug DEMCR: MON_STEP Position */
+#define CoreDebug_DEMCR_MON_STEP_Msk       (1UL << CoreDebug_DEMCR_MON_STEP_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_STEP Mask */
+
+#define CoreDebug_DEMCR_MON_PEND_Pos       17U                                            /*!< \deprecated CoreDebug DEMCR: MON_PEND Position */
+#define CoreDebug_DEMCR_MON_PEND_Msk       (1UL << CoreDebug_DEMCR_MON_PEND_Pos)          /*!< \deprecated CoreDebug DEMCR: MON_PEND Mask */
+
+#define CoreDebug_DEMCR_MON_EN_Pos         16U                                            /*!< \deprecated CoreDebug DEMCR: MON_EN Position */
+#define CoreDebug_DEMCR_MON_EN_Msk         (1UL << CoreDebug_DEMCR_MON_EN_Pos)            /*!< \deprecated CoreDebug DEMCR: MON_EN Mask */
+
+#define CoreDebug_DEMCR_VC_HARDERR_Pos     10U                                            /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Position */
+#define CoreDebug_DEMCR_VC_HARDERR_Msk     (1UL << CoreDebug_DEMCR_VC_HARDERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_HARDERR Mask */
+
+#define CoreDebug_DEMCR_VC_INTERR_Pos       9U                                            /*!< \deprecated CoreDebug DEMCR: VC_INTERR Position */
+#define CoreDebug_DEMCR_VC_INTERR_Msk      (1UL << CoreDebug_DEMCR_VC_INTERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_INTERR Mask */
+
+#define CoreDebug_DEMCR_VC_BUSERR_Pos       8U                                            /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Position */
+#define CoreDebug_DEMCR_VC_BUSERR_Msk      (1UL << CoreDebug_DEMCR_VC_BUSERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_BUSERR Mask */
+
+#define CoreDebug_DEMCR_VC_STATERR_Pos      7U                                            /*!< \deprecated CoreDebug DEMCR: VC_STATERR Position */
+#define CoreDebug_DEMCR_VC_STATERR_Msk     (1UL << CoreDebug_DEMCR_VC_STATERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_STATERR Mask */
+
+#define CoreDebug_DEMCR_VC_CHKERR_Pos       6U                                            /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Position */
+#define CoreDebug_DEMCR_VC_CHKERR_Msk      (1UL << CoreDebug_DEMCR_VC_CHKERR_Pos)         /*!< \deprecated CoreDebug DEMCR: VC_CHKERR Mask */
+
+#define CoreDebug_DEMCR_VC_NOCPERR_Pos      5U                                            /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Position */
+#define CoreDebug_DEMCR_VC_NOCPERR_Msk     (1UL << CoreDebug_DEMCR_VC_NOCPERR_Pos)        /*!< \deprecated CoreDebug DEMCR: VC_NOCPERR Mask */
+
+#define CoreDebug_DEMCR_VC_MMERR_Pos        4U                                            /*!< \deprecated CoreDebug DEMCR: VC_MMERR Position */
+#define CoreDebug_DEMCR_VC_MMERR_Msk       (1UL << CoreDebug_DEMCR_VC_MMERR_Pos)          /*!< \deprecated CoreDebug DEMCR: VC_MMERR Mask */
+
+#define CoreDebug_DEMCR_VC_CORERESET_Pos    0U                                            /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Position */
+#define CoreDebug_DEMCR_VC_CORERESET_Msk   (1UL /*<< CoreDebug_DEMCR_VC_CORERESET_Pos*/)  /*!< \deprecated CoreDebug DEMCR: VC_CORERESET Mask */
+
+/* Debug Set Clear Exception and Monitor Control Register Definitions */
+#define CoreDebug_DSCEMCR_CLR_MON_REQ_Pos  19U                                            /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_REQ, Position */
+#define CoreDebug_DSCEMCR_CLR_MON_REQ_Msk  (1UL << CoreDebug_DSCEMCR_CLR_MON_REQ_Pos)     /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_REQ, Mask */
+
+#define CoreDebug_DSCEMCR_CLR_MON_PEND_Pos 17U                                            /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_PEND, Position */
+#define CoreDebug_DSCEMCR_CLR_MON_PEND_Msk (1UL << CoreDebug_DSCEMCR_CLR_MON_PEND_Pos)    /*!< \deprecated CoreDebug DSCEMCR: CLR_MON_PEND, Mask */
+
+#define CoreDebug_DSCEMCR_SET_MON_REQ_Pos   3U                                            /*!< \deprecated CoreDebug DSCEMCR: SET_MON_REQ, Position */
+#define CoreDebug_DSCEMCR_SET_MON_REQ_Msk  (1UL << CoreDebug_DSCEMCR_SET_MON_REQ_Pos)     /*!< \deprecated CoreDebug DSCEMCR: SET_MON_REQ, Mask */
+
+#define CoreDebug_DSCEMCR_SET_MON_PEND_Pos  1U                                            /*!< \deprecated CoreDebug DSCEMCR: SET_MON_PEND, Position */
+#define CoreDebug_DSCEMCR_SET_MON_PEND_Msk (1UL << CoreDebug_DSCEMCR_SET_MON_PEND_Pos)    /*!< \deprecated CoreDebug DSCEMCR: SET_MON_PEND, Mask */
+
+/* Debug Authentication Control Register Definitions */
+#define CoreDebug_DAUTHCTRL_UIDEN_Pos      10U                                            /*!< \deprecated CoreDebug DAUTHCTRL: UIDEN, Position */
+#define CoreDebug_DAUTHCTRL_UIDEN_Msk      (1UL << CoreDebug_DAUTHCTRL_UIDEN_Pos)         /*!< \deprecated CoreDebug DAUTHCTRL: UIDEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_UIDAPEN_Pos     9U                                            /*!< \deprecated CoreDebug DAUTHCTRL: UIDAPEN, Position */
+#define CoreDebug_DAUTHCTRL_UIDAPEN_Msk    (1UL << CoreDebug_DAUTHCTRL_UIDAPEN_Pos)       /*!< \deprecated CoreDebug DAUTHCTRL: UIDAPEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_FSDMA_Pos       8U                                            /*!< \deprecated CoreDebug DAUTHCTRL: FSDMA, Position */
+#define CoreDebug_DAUTHCTRL_FSDMA_Msk      (1UL << CoreDebug_DAUTHCTRL_FSDMA_Pos)         /*!< \deprecated CoreDebug DAUTHCTRL: FSDMA, Mask */
+
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos  3U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Position */
+#define CoreDebug_DAUTHCTRL_INTSPNIDEN_Msk (1UL << CoreDebug_DAUTHCTRL_INTSPNIDEN_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: INTSPNIDEN, Mask */
+
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos  2U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPNIDENSEL_Msk (1UL << CoreDebug_DAUTHCTRL_SPNIDENSEL_Pos)    /*!< \deprecated CoreDebug DAUTHCTRL: SPNIDENSEL Mask */
+
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Pos   1U                                            /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Position */
+#define CoreDebug_DAUTHCTRL_INTSPIDEN_Msk  (1UL << CoreDebug_DAUTHCTRL_INTSPIDEN_Pos)     /*!< \deprecated CoreDebug DAUTHCTRL: INTSPIDEN Mask */
+
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Pos   0U                                            /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Position */
+#define CoreDebug_DAUTHCTRL_SPIDENSEL_Msk  (1UL /*<< CoreDebug_DAUTHCTRL_SPIDENSEL_Pos*/) /*!< \deprecated CoreDebug DAUTHCTRL: SPIDENSEL Mask */
+
+/* Debug Security Control and Status Register Definitions */
+#define CoreDebug_DSCSR_CDS_Pos            16U                                            /*!< \deprecated CoreDebug DSCSR: CDS Position */
+#define CoreDebug_DSCSR_CDS_Msk            (1UL << CoreDebug_DSCSR_CDS_Pos)               /*!< \deprecated CoreDebug DSCSR: CDS Mask */
+
+#define CoreDebug_DSCSR_SBRSEL_Pos          1U                                            /*!< \deprecated CoreDebug DSCSR: SBRSEL Position */
+#define CoreDebug_DSCSR_SBRSEL_Msk         (1UL << CoreDebug_DSCSR_SBRSEL_Pos)            /*!< \deprecated CoreDebug DSCSR: SBRSEL Mask */
+
+#define CoreDebug_DSCSR_SBRSELEN_Pos        0U                                            /*!< \deprecated CoreDebug DSCSR: SBRSELEN Position */
+#define CoreDebug_DSCSR_SBRSELEN_Msk       (1UL /*<< CoreDebug_DSCSR_SBRSELEN_Pos*/)      /*!< \deprecated CoreDebug DSCSR: SBRSELEN Mask */
+
+/*@} end of group CMSIS_CoreDebug */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+  __OM  uint32_t DSCEMCR;                /*!< Offset: 0x010 ( /W)  Debug Set Clear Exception and Monitor Control Register */
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_FPD_Pos                23U                                            /*!< DCB DHCSR: Floating-point registers Debuggable Position */
+#define DCB_DHCSR_S_FPD_Msk                (0x1UL << DCB_DHCSR_S_FPD_Pos)                 /*!< DCB DHCSR: Floating-point registers Debuggable Mask */
+
+#define DCB_DHCSR_S_SUIDE_Pos              22U                                            /*!< DCB DHCSR: Secure unprivileged halting debug enabled Position */
+#define DCB_DHCSR_S_SUIDE_Msk              (0x1UL << DCB_DHCSR_S_SUIDE_Pos)               /*!< DCB DHCSR: Secure unprivileged halting debug enabled Mask */
+
+#define DCB_DHCSR_S_NSUIDE_Pos             21U                                            /*!< DCB DHCSR: Non-secure unprivileged halting debug enabled Position */
+#define DCB_DHCSR_S_NSUIDE_Msk             (0x1UL << DCB_DHCSR_S_NSUIDE_Pos)              /*!< DCB DHCSR: Non-secure unprivileged halting debug enabled Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_PMOV_Pos                6U                                            /*!< DCB DHCSR: Halt on PMU overflow control Position */
+#define DCB_DHCSR_C_PMOV_Msk               (0x1UL << DCB_DHCSR_C_PMOV_Pos)                /*!< DCB DHCSR: Halt on PMU overflow control Mask */
+
+#define DCB_DHCSR_C_SNAPSTALL_Pos           5U                                            /*!< DCB DHCSR: Snap stall control Position */
+#define DCB_DHCSR_C_SNAPSTALL_Msk          (0x1UL << DCB_DHCSR_C_SNAPSTALL_Pos)           /*!< DCB DHCSR: Snap stall control Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_MONPRKEY_Pos             23U                                            /*!< DCB DEMCR: Monitor pend req key Position */
+#define DCB_DEMCR_MONPRKEY_Msk             (0x1UL << DCB_DEMCR_MONPRKEY_Pos)              /*!< DCB DEMCR: Monitor pend req key Mask */
+
+#define DCB_DEMCR_UMON_EN_Pos              21U                                            /*!< DCB DEMCR: Unprivileged monitor enable Position */
+#define DCB_DEMCR_UMON_EN_Msk              (0x1UL << DCB_DEMCR_UMON_EN_Pos)               /*!< DCB DEMCR: Unprivileged monitor enable Mask */
+
+#define DCB_DEMCR_SDME_Pos                 20U                                            /*!< DCB DEMCR: Secure DebugMonitor enable Position */
+#define DCB_DEMCR_SDME_Msk                 (0x1UL << DCB_DEMCR_SDME_Pos)                  /*!< DCB DEMCR: Secure DebugMonitor enable Mask */
+
+#define DCB_DEMCR_MON_REQ_Pos              19U                                            /*!< DCB DEMCR: Monitor request Position */
+#define DCB_DEMCR_MON_REQ_Msk              (0x1UL << DCB_DEMCR_MON_REQ_Pos)               /*!< DCB DEMCR: Monitor request Mask */
+
+#define DCB_DEMCR_MON_STEP_Pos             18U                                            /*!< DCB DEMCR: Monitor step Position */
+#define DCB_DEMCR_MON_STEP_Msk             (0x1UL << DCB_DEMCR_MON_STEP_Pos)              /*!< DCB DEMCR: Monitor step Mask */
+
+#define DCB_DEMCR_MON_PEND_Pos             17U                                            /*!< DCB DEMCR: Monitor pend Position */
+#define DCB_DEMCR_MON_PEND_Msk             (0x1UL << DCB_DEMCR_MON_PEND_Pos)              /*!< DCB DEMCR: Monitor pend Mask */
+
+#define DCB_DEMCR_MON_EN_Pos               16U                                            /*!< DCB DEMCR: Monitor enable Position */
+#define DCB_DEMCR_MON_EN_Msk               (0x1UL << DCB_DEMCR_MON_EN_Pos)                /*!< DCB DEMCR: Monitor enable Mask */
+
+#define DCB_DEMCR_VC_SFERR_Pos             11U                                            /*!< DCB DEMCR: Vector Catch SecureFault Position */
+#define DCB_DEMCR_VC_SFERR_Msk             (0x1UL << DCB_DEMCR_VC_SFERR_Pos)              /*!< DCB DEMCR: Vector Catch SecureFault Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_INTERR_Pos             9U                                            /*!< DCB DEMCR: Vector Catch interrupt errors Position */
+#define DCB_DEMCR_VC_INTERR_Msk            (0x1UL << DCB_DEMCR_VC_INTERR_Pos)             /*!< DCB DEMCR: Vector Catch interrupt errors Mask */
+
+#define DCB_DEMCR_VC_BUSERR_Pos             8U                                            /*!< DCB DEMCR: Vector Catch BusFault errors Position */
+#define DCB_DEMCR_VC_BUSERR_Msk            (0x1UL << DCB_DEMCR_VC_BUSERR_Pos)             /*!< DCB DEMCR: Vector Catch BusFault errors Mask */
+
+#define DCB_DEMCR_VC_STATERR_Pos            7U                                            /*!< DCB DEMCR: Vector Catch state errors Position */
+#define DCB_DEMCR_VC_STATERR_Msk           (0x1UL << DCB_DEMCR_VC_STATERR_Pos)            /*!< DCB DEMCR: Vector Catch state errors Mask */
+
+#define DCB_DEMCR_VC_CHKERR_Pos             6U                                            /*!< DCB DEMCR: Vector Catch check errors Position */
+#define DCB_DEMCR_VC_CHKERR_Msk            (0x1UL << DCB_DEMCR_VC_CHKERR_Pos)             /*!< DCB DEMCR: Vector Catch check errors Mask */
+
+#define DCB_DEMCR_VC_NOCPERR_Pos            5U                                            /*!< DCB DEMCR: Vector Catch NOCP errors Position */
+#define DCB_DEMCR_VC_NOCPERR_Msk           (0x1UL << DCB_DEMCR_VC_NOCPERR_Pos)            /*!< DCB DEMCR: Vector Catch NOCP errors Mask */
+
+#define DCB_DEMCR_VC_MMERR_Pos              4U                                            /*!< DCB DEMCR: Vector Catch MemManage errors Position */
+#define DCB_DEMCR_VC_MMERR_Msk             (0x1UL << DCB_DEMCR_VC_MMERR_Pos)              /*!< DCB DEMCR: Vector Catch MemManage errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DSCEMCR, Debug Set Clear Exception and Monitor Control Register Definitions */
+#define DCB_DSCEMCR_CLR_MON_REQ_Pos        19U                                            /*!< DCB DSCEMCR: Clear monitor request Position */
+#define DCB_DSCEMCR_CLR_MON_REQ_Msk        (0x1UL << DCB_DSCEMCR_CLR_MON_REQ_Pos)         /*!< DCB DSCEMCR: Clear monitor request Mask */
+
+#define DCB_DSCEMCR_CLR_MON_PEND_Pos       17U                                            /*!< DCB DSCEMCR: Clear monitor pend Position */
+#define DCB_DSCEMCR_CLR_MON_PEND_Msk       (0x1UL << DCB_DSCEMCR_CLR_MON_PEND_Pos)        /*!< DCB DSCEMCR: Clear monitor pend Mask */
+
+#define DCB_DSCEMCR_SET_MON_REQ_Pos         3U                                            /*!< DCB DSCEMCR: Set monitor request Position */
+#define DCB_DSCEMCR_SET_MON_REQ_Msk        (0x1UL << DCB_DSCEMCR_SET_MON_REQ_Pos)         /*!< DCB DSCEMCR: Set monitor request Mask */
+
+#define DCB_DSCEMCR_SET_MON_PEND_Pos        1U                                            /*!< DCB DSCEMCR: Set monitor pend Position */
+#define DCB_DSCEMCR_SET_MON_PEND_Msk       (0x1UL << DCB_DSCEMCR_SET_MON_PEND_Pos)        /*!< DCB DSCEMCR: Set monitor pend Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_UIDEN_Pos            10U                                            /*!< DCB DAUTHCTRL: Unprivileged Invasive Debug Enable Position */
+#define DCB_DAUTHCTRL_UIDEN_Msk            (0x1UL << DCB_DAUTHCTRL_UIDEN_Pos)             /*!< DCB DAUTHCTRL: Unprivileged Invasive Debug Enable Mask */
+
+#define DCB_DAUTHCTRL_UIDAPEN_Pos           9U                                            /*!< DCB DAUTHCTRL: Unprivileged Invasive DAP Access Enable Position */
+#define DCB_DAUTHCTRL_UIDAPEN_Msk          (0x1UL << DCB_DAUTHCTRL_UIDAPEN_Pos)           /*!< DCB DAUTHCTRL: Unprivileged Invasive DAP Access Enable Mask */
+
+#define DCB_DAUTHCTRL_FSDMA_Pos             8U                                            /*!< DCB DAUTHCTRL: Force Secure DebugMonitor Allowed Position */
+#define DCB_DAUTHCTRL_FSDMA_Msk            (0x1UL << DCB_DAUTHCTRL_FSDMA_Pos)             /*!< DCB DAUTHCTRL: Force Secure DebugMonitor Allowed Mask */
+
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SUNID_Pos          22U                                            /*!< DIB DAUTHSTATUS: Secure Unprivileged Non-invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_SUNID_Msk          (0x3UL << DIB_DAUTHSTATUS_SUNID_Pos )          /*!< DIB DAUTHSTATUS: Secure Unprivileged Non-invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_SUID_Pos           20U                                            /*!< DIB DAUTHSTATUS: Secure Unprivileged Invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_SUID_Msk           (0x3UL << DIB_DAUTHSTATUS_SUID_Pos )           /*!< DIB DAUTHSTATUS: Secure Unprivileged Invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_NSUNID_Pos         18U                                            /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Allo Position */
+#define DIB_DAUTHSTATUS_NSUNID_Msk         (0x3UL << DIB_DAUTHSTATUS_NSUNID_Pos )         /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Non-invasive Debug Allo Mask */
+
+#define DIB_DAUTHSTATUS_NSUID_Pos          16U                                            /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Invasive Debug Allowed Position */
+#define DIB_DAUTHSTATUS_NSUID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSUID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Unprivileged Invasive Debug Allowed Mask */
+
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_core_bitfield     Core register bit field macros
+  \brief      Macros for use with bit field definitions (xxx_Pos, xxx_Msk).
+  @{
+ */
+
+/**
+  \brief   Mask and shift a bit field value for use in a register bit range.
+  \param[in] field  Name of the register bit field.
+  \param[in] value  Value of the bit field. This parameter is interpreted as an uint32_t type.
+  \return           Masked and shifted value.
+*/
+#define _VAL2FLD(field, value)    (((uint32_t)(value) << field ## _Pos) & field ## _Msk)
+
+/**
+  \brief     Mask and shift a register value to extract a bit filed value.
+  \param[in] field  Name of the register bit field.
+  \param[in] value  Value of register. This parameter is interpreted as an uint32_t type.
+  \return           Masked and shifted bit field value.
+*/
+#define _FLD2VAL(field, value)    (((uint32_t)(value) & field ## _Msk) >> field ## _Pos)
+
+/*@} end of group CMSIS_core_bitfield */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_core_base     Core Definitions
+  \brief      Definitions for base addresses, unions, and structures.
+  @{
+ */
+
+/* Memory mapping of Core Hardware */
+  #define SCS_BASE            (0xE000E000UL)                             /*!< System Control Space Base Address */
+  #define ITM_BASE            (0xE0000000UL)                             /*!< ITM Base Address */
+  #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
+  #define MEMSYSCTL_BASE      (0xE001E000UL)                             /*!< Memory System Control Base Address */
+  #define ERRBNK_BASE         (0xE001E100UL)                             /*!< Error Banking Base Address */
+  #define PWRMODCTL_BASE      (0xE001E300UL)                             /*!< Power Mode Control Base Address */
+  #define EWIC_BASE           (0xE001E400UL)                             /*!< External Wakeup Interrupt Controller Base Address */
+  #define PRCCFGINF_BASE      (0xE001E700UL)                             /*!< Processor Configuration Information Base Address */
+  #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
+  #define CoreDebug_BASE      (0xE000EDF0UL)                             /*!< \deprecated Core Debug Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
+  #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
+  #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
+  #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
+
+  #define ICB                 ((ICB_Type       *)     SCS_BASE         ) /*!< System control Register not in SCB */
+  #define SCB                 ((SCB_Type       *)     SCB_BASE         ) /*!< SCB configuration struct */
+  #define SysTick             ((SysTick_Type   *)     SysTick_BASE     ) /*!< SysTick configuration struct */
+  #define NVIC                ((NVIC_Type      *)     NVIC_BASE        ) /*!< NVIC configuration struct */
+  #define ITM                 ((ITM_Type       *)     ITM_BASE         ) /*!< ITM configuration struct */
+  #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
+  #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
+  #define MEMSYSCTL           ((MemSysCtl_Type *)     MEMSYSCTL_BASE   ) /*!< Memory System Control configuration struct */
+  #define ERRBNK              ((ErrBnk_Type    *)     ERRBNK_BASE      ) /*!< Error Banking configuration struct */
+  #define PWRMODCTL           ((PwrModCtl_Type *)     PWRMODCTL_BASE   ) /*!< Power Mode Control configuration struct */
+  #define EWIC                ((EWIC_Type      *)     EWIC_BASE        ) /*!< EWIC configuration struct */
+  #define PRCCFGINF           ((PrcCfgInf_Type *)     PRCCFGINF_BASE   ) /*!< Processor Configuration Information configuration struct */
+  #define CoreDebug           ((CoreDebug_Type *)     CoreDebug_BASE   ) /*!< \deprecated Core Debug configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
+
+  #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+    #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
+    #define MPU               ((MPU_Type       *)     MPU_BASE         ) /*!< Memory Protection Unit */
+  #endif
+
+  #if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+    #define PMU_BASE          (0xE0003000UL)                             /*!< PMU Base Address */
+    #define PMU               ((PMU_Type       *)     PMU_BASE         ) /*!< PMU configuration struct */
+  #endif
+
+  #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+    #define SAU_BASE          (SCS_BASE +  0x0DD0UL)                     /*!< Security Attribution Unit */
+    #define SAU               ((SAU_Type       *)     SAU_BASE         ) /*!< Security Attribution Unit */
+  #endif
+
+  #define FPU_BASE            (SCS_BASE +  0x0F30UL)                     /*!< Floating Point Unit */
+  #define FPU                 ((FPU_Type       *)     FPU_BASE         ) /*!< Floating Point Unit */
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+  #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
+  #define CoreDebug_BASE_NS   (0xE002EDF0UL)                             /*!< \deprecated Core Debug Base Address           (non-secure address space) */
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
+  #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
+  #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
+  #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
+
+  #define ICB_NS              ((ICB_Type       *)     SCS_BASE_NS      ) /*!< System control Register not in SCB(non-secure address space) */
+  #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
+  #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
+  #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
+  #define CoreDebug_NS        ((CoreDebug_Type *)     CoreDebug_BASE_NS) /*!< \deprecated Core Debug configuration struct   (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
+
+  #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+    #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
+    #define MPU_NS            ((MPU_Type       *)     MPU_BASE_NS      ) /*!< Memory Protection Unit            (non-secure address space) */
+  #endif
+
+  #define FPU_BASE_NS         (SCS_BASE_NS +  0x0F30UL)                  /*!< Floating Point Unit               (non-secure address space) */
+  #define FPU_NS              ((FPU_Type       *)     FPU_BASE_NS      ) /*!< Floating Point Unit               (non-secure address space) */
+
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+/*@} */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_register_aliases     Backwards Compatibility Aliases
+  \brief      Register alias definitions for backwards compatibility.
+  @{
+ */
+
+/*@} */
+
+
+/*******************************************************************************
+ *                Hardware Abstraction Layer
+  Core Function Interface contains:
+  - Core NVIC Functions
+  - Core SysTick Functions
+  - Core Debug Functions
+  - Core Register Access Functions
+ ******************************************************************************/
+/**
+  \defgroup CMSIS_Core_FunctionInterface Functions and Instructions Reference
+*/
+
+
+
+/* ##########################   NVIC functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_NVICFunctions NVIC Functions
+  \brief    Functions that manage interrupts and exceptions via the NVIC.
+  @{
+ */
+
+#ifdef CMSIS_NVIC_VIRTUAL
+  #ifndef CMSIS_NVIC_VIRTUAL_HEADER_FILE
+    #define CMSIS_NVIC_VIRTUAL_HEADER_FILE "cmsis_nvic_virtual.h"
+  #endif
+  #include CMSIS_NVIC_VIRTUAL_HEADER_FILE
+#else
+  #define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
+  #define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
+  #define NVIC_EnableIRQ              __NVIC_EnableIRQ
+  #define NVIC_GetEnableIRQ           __NVIC_GetEnableIRQ
+  #define NVIC_DisableIRQ             __NVIC_DisableIRQ
+  #define NVIC_GetPendingIRQ          __NVIC_GetPendingIRQ
+  #define NVIC_SetPendingIRQ          __NVIC_SetPendingIRQ
+  #define NVIC_ClearPendingIRQ        __NVIC_ClearPendingIRQ
+  #define NVIC_GetActive              __NVIC_GetActive
+  #define NVIC_SetPriority            __NVIC_SetPriority
+  #define NVIC_GetPriority            __NVIC_GetPriority
+  #define NVIC_SystemReset            __NVIC_SystemReset
+#endif /* CMSIS_NVIC_VIRTUAL */
+
+#ifdef CMSIS_VECTAB_VIRTUAL
+  #ifndef CMSIS_VECTAB_VIRTUAL_HEADER_FILE
+    #define CMSIS_VECTAB_VIRTUAL_HEADER_FILE "cmsis_vectab_virtual.h"
+  #endif
+  #include CMSIS_VECTAB_VIRTUAL_HEADER_FILE
+#else
+  #define NVIC_SetVector              __NVIC_SetVector
+  #define NVIC_GetVector              __NVIC_GetVector
+#endif  /* (CMSIS_VECTAB_VIRTUAL) */
+
+#define NVIC_USER_IRQ_OFFSET          16
+
+
+/* Special LR values for Secure/Non-Secure call handling and exception handling                                               */
+
+/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */
+#define FNC_RETURN                 (0xFEFFFFFFUL)     /* bit [0] ignored when processing a branch                             */
+
+/* The following EXC_RETURN mask values are used to evaluate the LR on exception entry */
+#define EXC_RETURN_PREFIX          (0xFF000000UL)     /* bits [31:24] set to indicate an EXC_RETURN value                     */
+#define EXC_RETURN_S               (0x00000040UL)     /* bit [6] stack used to push registers: 0=Non-secure 1=Secure          */
+#define EXC_RETURN_DCRS            (0x00000020UL)     /* bit [5] stacking rules for called registers: 0=skipped 1=saved       */
+#define EXC_RETURN_FTYPE           (0x00000010UL)     /* bit [4] allocate stack for floating-point context: 0=done 1=skipped  */
+#define EXC_RETURN_MODE            (0x00000008UL)     /* bit [3] processor mode for return: 0=Handler mode 1=Thread mode      */
+#define EXC_RETURN_SPSEL           (0x00000004UL)     /* bit [2] stack pointer used to restore context: 0=MSP 1=PSP           */
+#define EXC_RETURN_ES              (0x00000001UL)     /* bit [0] security state exception was taken to: 0=Non-secure 1=Secure */
+
+/* Integrity Signature (from ARMv8-M Architecture Reference Manual) for exception context stacking                            */
+#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)  /* Value for processors with floating-point extension:                  */
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125AUL)     /* bit [0] SFTC must match LR bit[4] EXC_RETURN_FTYPE                   */
+#else
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125BUL)     /* Value for processors without floating-point extension                */
+#endif
+
+
+/**
+  \brief   Set Priority Grouping
+  \details Sets the priority grouping field using the required unlock sequence.
+           The parameter PriorityGroup is assigned to the field SCB->AIRCR [10:8] PRIGROUP field.
+           Only values from 0..7 are used.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]      PriorityGroup  Priority grouping field.
+ */
+__STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
+{
+  uint32_t reg_value;
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);             /* only values 0..7 are used          */
+
+  reg_value  =  SCB->AIRCR;                                                   /* read old register configuration    */
+  reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
+  reg_value  =  (reg_value                                   |
+                ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)  );              /* Insert write key and priority group */
+  SCB->AIRCR =  reg_value;
+}
+
+
+/**
+  \brief   Get Priority Grouping
+  \details Reads the priority grouping field from the NVIC Interrupt Controller.
+  \return                Priority grouping field (SCB->AIRCR [10:8] PRIGROUP field).
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPriorityGrouping(void)
+{
+  return ((uint32_t)((SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) >> SCB_AIRCR_PRIGROUP_Pos));
+}
+
+
+/**
+  \brief   Enable Interrupt
+  \details Enables a device specific interrupt in the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    __COMPILER_BARRIER();
+    NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Enable status
+  \details Returns a device specific interrupt enable status from the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt is not enabled.
+  \return             1  Interrupt is enabled.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetEnableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Disable Interrupt
+  \details Disables a device specific interrupt in the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_DisableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __DSB();
+    __ISB();
+  }
+}
+
+
+/**
+  \brief   Get Pending Interrupt
+  \details Reads the NVIC pending register and returns the pending bit for the specified device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not pending.
+  \return             1  Interrupt status is pending.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ISPR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Pending Interrupt
+  \details Sets the pending bit of a device specific interrupt in the NVIC pending register.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_SetPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ISPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Clear Pending Interrupt
+  \details Clears the pending bit of a device specific interrupt in the NVIC pending register.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_ClearPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ICPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Active Interrupt
+  \details Reads the active register in the NVIC and returns the active bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not active.
+  \return             1  Interrupt status is active.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetActive(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->IABR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Interrupt Target State
+  \details Reads the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+  \return             1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_GetTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Interrupt Target State
+  \details Sets the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+                      1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_SetTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] |=  ((uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL)));
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Clear Interrupt Target State
+  \details Clears the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+                      1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_ClearTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] &= ~((uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL)));
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+
+/**
+  \brief   Set Interrupt Priority
+  \details Sets the priority of a device specific interrupt or a processor exception.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]      IRQn  Interrupt number.
+  \param [in]  priority  Priority to set.
+  \note    The priority cannot be set for every processor exception.
+ */
+__STATIC_INLINE void __NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->IPR[((uint32_t)IRQn)]               = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+  else
+  {
+    SCB->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Priority
+  \details Reads the priority of a device specific interrupt or a processor exception.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn  Interrupt number.
+  \return             Interrupt Priority.
+                      Value is aligned automatically to the implemented priority bits of the microcontroller.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPriority(IRQn_Type IRQn)
+{
+
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return(((uint32_t)NVIC->IPR[((uint32_t)IRQn)]               >> (8U - __NVIC_PRIO_BITS)));
+  }
+  else
+  {
+    return(((uint32_t)SCB->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] >> (8U - __NVIC_PRIO_BITS)));
+  }
+}
+
+
+/**
+  \brief   Encode Priority
+  \details Encodes the priority for an interrupt with the given priority group,
+           preemptive priority value, and subpriority value.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]     PriorityGroup  Used priority group.
+  \param [in]   PreemptPriority  Preemptive priority value (starting from 0).
+  \param [in]       SubPriority  Subpriority value (starting from 0).
+  \return                        Encoded priority. Value can be used in the function \ref NVIC_SetPriority().
+ */
+__STATIC_INLINE uint32_t NVIC_EncodePriority (uint32_t PriorityGroup, uint32_t PreemptPriority, uint32_t SubPriority)
+{
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);   /* only values 0..7 are used          */
+  uint32_t PreemptPriorityBits;
+  uint32_t SubPriorityBits;
+
+  PreemptPriorityBits = ((7UL - PriorityGroupTmp) > (uint32_t)(__NVIC_PRIO_BITS)) ? (uint32_t)(__NVIC_PRIO_BITS) : (uint32_t)(7UL - PriorityGroupTmp);
+  SubPriorityBits     = ((PriorityGroupTmp + (uint32_t)(__NVIC_PRIO_BITS)) < (uint32_t)7UL) ? (uint32_t)0UL : (uint32_t)((PriorityGroupTmp - 7UL) + (uint32_t)(__NVIC_PRIO_BITS));
+
+  return (
+           ((PreemptPriority & (uint32_t)((1UL << (PreemptPriorityBits)) - 1UL)) << SubPriorityBits) |
+           ((SubPriority     & (uint32_t)((1UL << (SubPriorityBits    )) - 1UL)))
+         );
+}
+
+
+/**
+  \brief   Decode Priority
+  \details Decodes an interrupt priority value with a given priority group to
+           preemptive priority value and subpriority value.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS) the smallest possible priority group is set.
+  \param [in]         Priority   Priority value, which can be retrieved with the function \ref NVIC_GetPriority().
+  \param [in]     PriorityGroup  Used priority group.
+  \param [out] pPreemptPriority  Preemptive priority value (starting from 0).
+  \param [out]     pSubPriority  Subpriority value (starting from 0).
+ */
+__STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGroup, uint32_t* const pPreemptPriority, uint32_t* const pSubPriority)
+{
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);   /* only values 0..7 are used          */
+  uint32_t PreemptPriorityBits;
+  uint32_t SubPriorityBits;
+
+  PreemptPriorityBits = ((7UL - PriorityGroupTmp) > (uint32_t)(__NVIC_PRIO_BITS)) ? (uint32_t)(__NVIC_PRIO_BITS) : (uint32_t)(7UL - PriorityGroupTmp);
+  SubPriorityBits     = ((PriorityGroupTmp + (uint32_t)(__NVIC_PRIO_BITS)) < (uint32_t)7UL) ? (uint32_t)0UL : (uint32_t)((PriorityGroupTmp - 7UL) + (uint32_t)(__NVIC_PRIO_BITS));
+
+  *pPreemptPriority = (Priority >> SubPriorityBits) & (uint32_t)((1UL << (PreemptPriorityBits)) - 1UL);
+  *pSubPriority     = (Priority                   ) & (uint32_t)((1UL << (SubPriorityBits    )) - 1UL);
+}
+
+
+/**
+  \brief   Set Interrupt Vector
+  \details Sets an interrupt vector in SRAM based interrupt vector table.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+           VTOR must been relocated to SRAM before.
+  \param [in]   IRQn      Interrupt number
+  \param [in]   vector    Address of interrupt handler function
+ */
+__STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
+{
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
+}
+
+
+/**
+  \brief   Get Interrupt Vector
+  \details Reads an interrupt vector from interrupt vector table.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn      Interrupt number.
+  \return                 Address of interrupt handler function
+ */
+__STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
+{
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  return vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET];
+}
+
+
+/**
+  \brief   System Reset
+  \details Initiates a system reset request to reset the MCU.
+ */
+__NO_RETURN __STATIC_INLINE void __NVIC_SystemReset(void)
+{
+  __DSB();                                                          /* Ensure all outstanding memory accesses included
+                                                                       buffered write are completed before reset */
+  SCB->AIRCR  = (uint32_t)((0x5FAUL << SCB_AIRCR_VECTKEY_Pos)    |
+                           (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) |
+                            SCB_AIRCR_SYSRESETREQ_Msk    );         /* Keep priority group unchanged */
+  __DSB();                                                          /* Ensure completion of memory access */
+
+  for(;;)                                                           /* wait until reset */
+  {
+    __NOP();
+  }
+}
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Priority Grouping (non-secure)
+  \details Sets the non-secure priority grouping field when in secure state using the required unlock sequence.
+           The parameter PriorityGroup is assigned to the field SCB->AIRCR [10:8] PRIGROUP field.
+           Only values from 0..7 are used.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]      PriorityGroup  Priority grouping field.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPriorityGrouping_NS(uint32_t PriorityGroup)
+{
+  uint32_t reg_value;
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);             /* only values 0..7 are used          */
+
+  reg_value  =  SCB_NS->AIRCR;                                                   /* read old register configuration    */
+  reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk));             /* clear bits to change               */
+  reg_value  =  (reg_value                                   |
+                ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)                      );              /* Insert write key and priority group */
+  SCB_NS->AIRCR =  reg_value;
+}
+
+
+/**
+  \brief   Get Priority Grouping (non-secure)
+  \details Reads the priority grouping field from the non-secure NVIC when in secure state.
+  \return                Priority grouping field (SCB->AIRCR [10:8] PRIGROUP field).
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPriorityGrouping_NS(void)
+{
+  return ((uint32_t)((SCB_NS->AIRCR & SCB_AIRCR_PRIGROUP_Msk) >> SCB_AIRCR_PRIGROUP_Pos));
+}
+
+
+/**
+  \brief   Enable Interrupt (non-secure)
+  \details Enables a device specific interrupt in the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_EnableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Enable status (non-secure)
+  \details Returns a device specific interrupt enable status from the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt is not enabled.
+  \return             1  Interrupt is enabled.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetEnableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->ISER[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Disable Interrupt (non-secure)
+  \details Disables a device specific interrupt in the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_DisableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Pending Interrupt (non-secure)
+  \details Reads the NVIC pending register in the non-secure NVIC when in secure state and returns the pending bit for the specified device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not pending.
+  \return             1  Interrupt status is pending.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->ISPR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Pending Interrupt (non-secure)
+  \details Sets the pending bit of a device specific interrupt in the non-secure NVIC pending register when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ISPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Clear Pending Interrupt (non-secure)
+  \details Clears the pending bit of a device specific interrupt in the non-secure NVIC pending register when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_ClearPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ICPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Active Interrupt (non-secure)
+  \details Reads the active register in non-secure NVIC when in secure state and returns the active bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not active.
+  \return             1  Interrupt status is active.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetActive_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->IABR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Interrupt Priority (non-secure)
+  \details Sets the priority of a non-secure device specific interrupt or a non-secure processor exception when in secure state.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]      IRQn  Interrupt number.
+  \param [in]  priority  Priority to set.
+  \note    The priority cannot be set for every non-secure processor exception.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPriority_NS(IRQn_Type IRQn, uint32_t priority)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->IPR[((uint32_t)IRQn)]               = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+  else
+  {
+    SCB_NS->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Priority (non-secure)
+  \details Reads the priority of a non-secure device specific interrupt or a non-secure processor exception when in secure state.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn  Interrupt number.
+  \return             Interrupt Priority. Value is aligned automatically to the implemented priority bits of the microcontroller.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPriority_NS(IRQn_Type IRQn)
+{
+
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return(((uint32_t)NVIC_NS->IPR[((uint32_t)IRQn)]               >> (8U - __NVIC_PRIO_BITS)));
+  }
+  else
+  {
+    return(((uint32_t)SCB_NS->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] >> (8U - __NVIC_PRIO_BITS)));
+  }
+}
+#endif /*  defined (__ARM_FEATURE_CMSE) &&(__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_NVICFunctions */
+
+/* ##########################  MPU functions  #################################### */
+
+#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+
+#include "mpu_armv8.h"
+
+#endif
+
+/* ##########################  PMU functions and events  #################################### */
+
+#if defined (__PMU_PRESENT) && (__PMU_PRESENT == 1U)
+
+#include "pmu_armv8.h"
+
+/**
+  \brief   Cortex-M85 PMU events
+  \note    Architectural PMU events can be found in pmu_armv8.h
+*/
+
+#define ARMCM85_PMU_ECC_ERR                          0xC000             /*!< One or more Error Correcting Code (ECC) errors detected */
+#define ARMCM85_PMU_ECC_ERR_MBIT                     0xC001             /*!< One or more multi-bit ECC errors detected */
+#define ARMCM85_PMU_ECC_ERR_DCACHE                   0xC010             /*!< One or more ECC errors in the data cache */
+#define ARMCM85_PMU_ECC_ERR_ICACHE                   0xC011             /*!< One or more ECC errors in the instruction cache */
+#define ARMCM85_PMU_ECC_ERR_MBIT_DCACHE              0xC012             /*!< One or more multi-bit ECC errors in the data cache */
+#define ARMCM85_PMU_ECC_ERR_MBIT_ICACHE              0xC013             /*!< One or more multi-bit ECC errors in the instruction cache */
+#define ARMCM85_PMU_ECC_ERR_DTCM                     0xC020             /*!< One or more ECC errors in the Data Tightly Coupled Memory (DTCM) */
+#define ARMCM85_PMU_ECC_ERR_ITCM                     0xC021             /*!< One or more ECC errors in the Instruction Tightly Coupled Memory (ITCM) */
+#define ARMCM85_PMU_ECC_ERR_MBIT_DTCM                0xC022             /*!< One or more multi-bit ECC errors in the DTCM */
+#define ARMCM85_PMU_ECC_ERR_MBIT_ITCM                0xC023             /*!< One or more multi-bit ECC errors in the ITCM */
+#define ARMCM85_PMU_PF_LINEFILL                      0xC100             /*!< The prefetcher starts a line-fill */
+#define ARMCM85_PMU_PF_CANCEL                        0xC101             /*!< The prefetcher stops prefetching */
+#define ARMCM85_PMU_PF_DROP_LINEFILL                 0xC102             /*!< A linefill triggered by a prefetcher has been dropped because of lack of buffering */
+#define ARMCM85_PMU_NWAMODE_ENTER                    0xC200             /*!< No write-allocate mode entry */
+#define ARMCM85_PMU_NWAMODE                          0xC201             /*!< Write-allocate store is not allocated into the data cache due to no-write-allocate mode */
+#define ARMCM85_PMU_SAHB_ACCESS                      0xC300             /*!< Read or write access on the S-AHB interface to the TCM */
+#define ARMCM85_PMU_PAHB_ACCESS                      0xC301             /*!< Read or write access on the P-AHB write interface */
+#define ARMCM85_PMU_AXI_WRITE_ACCESS                 0xC302             /*!< Any beat access to M-AXI write interface */
+#define ARMCM85_PMU_AXI_READ_ACCESS                  0xC303             /*!< Any beat access to M-AXI read interface */
+#define ARMCM85_PMU_DOSTIMEOUT_DOUBLE                0xC400             /*!< Denial of Service timeout has fired twice and caused buffers to drain to allow forward progress */
+#define ARMCM85_PMU_DOSTIMEOUT_TRIPLE                0xC401             /*!< Denial of Service timeout has fired three times and blocked the LSU to force forward progress */
+
+#endif
+
+/* ##########################  FPU functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_FpuFunctions FPU Functions
+  \brief    Function that provides FPU type.
+  @{
+ */
+
+/**
+  \brief   get FPU type
+  \details returns the FPU type
+  \returns
+   - \b  0: No FPU
+   - \b  1: Single precision FPU
+   - \b  2: Double + Single precision FPU
+ */
+__STATIC_INLINE uint32_t SCB_GetFPUType(void)
+{
+  uint32_t mvfr0;
+
+  mvfr0 = FPU->MVFR0;
+  if      ((mvfr0 & (FPU_MVFR0_FPSP_Msk | FPU_MVFR0_FPDP_Msk)) == 0x220U)
+  {
+    return 2U;           /* Double + Single precision FPU */
+  }
+  else if ((mvfr0 & (FPU_MVFR0_FPSP_Msk | FPU_MVFR0_FPDP_Msk)) == 0x020U)
+  {
+    return 1U;           /* Single precision FPU */
+  }
+  else
+  {
+    return 0U;           /* No FPU */
+  }
+}
+
+
+/*@} end of CMSIS_Core_FpuFunctions */
+
+/* ##########################  MVE functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_MveFunctions MVE Functions
+  \brief    Function that provides MVE type.
+  @{
+ */
+
+/**
+  \brief   get MVE type
+  \details returns the MVE type
+  \returns
+   - \b  0: No Vector Extension (MVE)
+   - \b  1: Integer Vector Extension (MVE-I)
+   - \b  2: Floating-point Vector Extension (MVE-F)
+ */
+__STATIC_INLINE uint32_t SCB_GetMVEType(void)
+{
+  const uint32_t mvfr1 = FPU->MVFR1;
+  if      ((mvfr1 & FPU_MVFR1_MVE_Msk) == (0x2U << FPU_MVFR1_MVE_Pos))
+  {
+    return 2U;
+  }
+  else if ((mvfr1 & FPU_MVFR1_MVE_Msk) == (0x1U << FPU_MVFR1_MVE_Pos))
+  {
+    return 1U;
+  }
+  else
+  {
+    return 0U;
+  }
+}
+
+
+/*@} end of CMSIS_Core_MveFunctions */
+
+
+/* ##########################  Cache functions  #################################### */
+
+#if ((defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)) || \
+     (defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)))
+#include "cachel1_armv7.h"
+#endif
+
+
+/* ##########################   SAU functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_SAUFunctions SAU Functions
+  \brief    Functions that configure the SAU.
+  @{
+ */
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+
+/**
+  \brief   Enable SAU
+  \details Enables the Security Attribution Unit (SAU).
+ */
+__STATIC_INLINE void TZ_SAU_Enable(void)
+{
+    SAU->CTRL |=  (SAU_CTRL_ENABLE_Msk);
+}
+
+
+
+/**
+  \brief   Disable SAU
+  \details Disables the Security Attribution Unit (SAU).
+ */
+__STATIC_INLINE void TZ_SAU_Disable(void)
+{
+    SAU->CTRL &= ~(SAU_CTRL_ENABLE_Msk);
+}
+
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_SAUFunctions */
+
+
+
+/* ###################  PAC Key functions  ########################### */
+
+#if (defined (__ARM_FEATURE_PAUTH) && (__ARM_FEATURE_PAUTH == 1))
+#include "pac_armv81.h"
+#endif
+
+
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    SysTick function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_SysTickFunctions SysTick Functions
+  \brief    Functions that configure the System.
+  @{
+ */
+
+#if defined (__Vendor_SysTickConfig) && (__Vendor_SysTickConfig == 0U)
+
+/**
+  \brief   System Tick Configuration
+  \details Initializes the System Timer and its interrupt, and starts the System Tick Timer.
+           Counter is in free running mode to generate periodic interrupts.
+  \param [in]  ticks  Number of ticks between two interrupts.
+  \return          0  Function succeeded.
+  \return          1  Function failed.
+  \note    When the variable <b>__Vendor_SysTickConfig</b> is set to 1, then the
+           function <b>SysTick_Config</b> is not included. In this case, the file <b><i>device</i>.h</b>
+           must contain a vendor-specific implementation of this function.
+ */
+__STATIC_INLINE uint32_t SysTick_Config(uint32_t ticks)
+{
+  if ((ticks - 1UL) > SysTick_LOAD_RELOAD_Msk)
+  {
+    return (1UL);                                                   /* Reload value impossible */
+  }
+
+  SysTick->LOAD  = (uint32_t)(ticks - 1UL);                         /* set reload register */
+  NVIC_SetPriority (SysTick_IRQn, (1UL << __NVIC_PRIO_BITS) - 1UL); /* set Priority for Systick Interrupt */
+  SysTick->VAL   = 0UL;                                             /* Load the SysTick Counter Value */
+  SysTick->CTRL  = SysTick_CTRL_CLKSOURCE_Msk |
+                   SysTick_CTRL_TICKINT_Msk   |
+                   SysTick_CTRL_ENABLE_Msk;                         /* Enable SysTick IRQ and SysTick Timer */
+  return (0UL);                                                     /* Function successful */
+}
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   System Tick Configuration (non-secure)
+  \details Initializes the non-secure System Timer and its interrupt when in secure state, and starts the System Tick Timer.
+           Counter is in free running mode to generate periodic interrupts.
+  \param [in]  ticks  Number of ticks between two interrupts.
+  \return          0  Function succeeded.
+  \return          1  Function failed.
+  \note    When the variable <b>__Vendor_SysTickConfig</b> is set to 1, then the
+           function <b>TZ_SysTick_Config_NS</b> is not included. In this case, the file <b><i>device</i>.h</b>
+           must contain a vendor-specific implementation of this function.
+
+ */
+__STATIC_INLINE uint32_t TZ_SysTick_Config_NS(uint32_t ticks)
+{
+  if ((ticks - 1UL) > SysTick_LOAD_RELOAD_Msk)
+  {
+    return (1UL);                                                         /* Reload value impossible */
+  }
+
+  SysTick_NS->LOAD  = (uint32_t)(ticks - 1UL);                            /* set reload register */
+  TZ_NVIC_SetPriority_NS (SysTick_IRQn, (1UL << __NVIC_PRIO_BITS) - 1UL); /* set Priority for Systick Interrupt */
+  SysTick_NS->VAL   = 0UL;                                                /* Load the SysTick Counter Value */
+  SysTick_NS->CTRL  = SysTick_CTRL_CLKSOURCE_Msk |
+                      SysTick_CTRL_TICKINT_Msk   |
+                      SysTick_CTRL_ENABLE_Msk;                            /* Enable SysTick IRQ and SysTick Timer */
+  return (0UL);                                                           /* Function successful */
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+#endif
+
+/*@} end of CMSIS_Core_SysTickFunctions */
+
+
+
+/* ##################################### Debug In/Output function ########################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_core_DebugFunctions ITM Functions
+  \brief    Functions that access the ITM debug interface.
+  @{
+ */
+
+extern volatile int32_t ITM_RxBuffer;                              /*!< External variable to receive characters. */
+#define                 ITM_RXBUFFER_EMPTY  ((int32_t)0x5AA55AA5U) /*!< Value identifying \ref ITM_RxBuffer is ready for next character. */
+
+
+/**
+  \brief   ITM Send Character
+  \details Transmits a character via the ITM channel 0, and
+           \li Just returns when no debugger is connected that has booked the output.
+           \li Is blocking when a debugger is connected, but the previous character sent has not been transmitted.
+  \param [in]     ch  Character to transmit.
+  \returns            Character to transmit.
+ */
+__STATIC_INLINE uint32_t ITM_SendChar (uint32_t ch)
+{
+  if (((ITM->TCR & ITM_TCR_ITMENA_Msk) != 0UL) &&      /* ITM enabled */
+      ((ITM->TER & 1UL               ) != 0UL)   )     /* ITM Port #0 enabled */
+  {
+    while (ITM->PORT[0U].u32 == 0UL)
+    {
+      __NOP();
+    }
+    ITM->PORT[0U].u8 = (uint8_t)ch;
+  }
+  return (ch);
+}
+
+
+/**
+  \brief   ITM Receive Character
+  \details Inputs a character via the external variable \ref ITM_RxBuffer.
+  \return             Received character.
+  \return         -1  No character pending.
+ */
+__STATIC_INLINE int32_t ITM_ReceiveChar (void)
+{
+  int32_t ch = -1;                           /* no character available */
+
+  if (ITM_RxBuffer != ITM_RXBUFFER_EMPTY)
+  {
+    ch = ITM_RxBuffer;
+    ITM_RxBuffer = ITM_RXBUFFER_EMPTY;       /* ready for next character */
+  }
+
+  return (ch);
+}
+
+
+/**
+  \brief   ITM Check Character
+  \details Checks whether a character is pending for reading in the variable \ref ITM_RxBuffer.
+  \return          0  No character available.
+  \return          1  Character available.
+ */
+__STATIC_INLINE int32_t ITM_CheckChar (void)
+{
+
+  if (ITM_RxBuffer == ITM_RXBUFFER_EMPTY)
+  {
+    return (0);                              /* no character available */
+  }
+  else
+  {
+    return (1);                              /*    character available */
+  }
+}
+
+/*@} end of CMSIS_core_DebugFunctions */
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CORE_CM85_H_DEPENDANT */
+
+#endif /* __CMSIS_GENERIC */
diff --git a/lib/cmsis/inc/core_sc000.h b/lib/cmsis/inc/core_sc000.h
index 389535a7cf2c1..dbc755fff39b9 100644
--- a/lib/cmsis/inc/core_sc000.h
+++ b/lib/cmsis/inc/core_sc000.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_sc000.h
  * @brief    CMSIS SC000 Core Peripheral Access Layer Header File
- * @version  V5.0.6
- * @date     12. November 2018
+ * @version  V5.0.7
+ * @date     27. March 2020
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -62,7 +62,7 @@
 
 #include "cmsis_version.h"
 
-/*  CMSIS SC000 definitions */
+/* CMSIS SC000 definitions */
 #define __SC000_CMSIS_VERSION_MAIN  (__CM_CMSIS_VERSION_MAIN)                /*!< \deprecated [31:16] CMSIS HAL main version */
 #define __SC000_CMSIS_VERSION_SUB   (__CM_CMSIS_VERSION_SUB)                 /*!< \deprecated [15:0]  CMSIS HAL sub version */
 #define __SC000_CMSIS_VERSION       ((__SC000_CMSIS_VERSION_MAIN << 16U) | \
@@ -142,6 +142,11 @@
     #warning "__MPU_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             0U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+  
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          2U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -750,7 +755,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[0U] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -904,6 +911,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
   uint32_t *vectors = (uint32_t *)SCB->VTOR;
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  /* ARM Application Note 321 states that the M0 and M0+ do not require the architectural barrier - assume SC000 is the same */
 }
 
 
diff --git a/lib/cmsis/inc/core_sc300.h b/lib/cmsis/inc/core_sc300.h
index 5478ea74a5cfb..d66621031e09b 100644
--- a/lib/cmsis/inc/core_sc300.h
+++ b/lib/cmsis/inc/core_sc300.h
@@ -1,11 +1,11 @@
 /**************************************************************************//**
  * @file     core_sc300.h
  * @brief    CMSIS SC300 Core Peripheral Access Layer Header File
- * @version  V5.0.7
- * @date     12. November 2018
+ * @version  V5.0.10
+ * @date     04. June 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -62,7 +62,7 @@
 
 #include "cmsis_version.h"
 
-/*  CMSIS SC300 definitions */
+/* CMSIS SC300 definitions */
 #define __SC300_CMSIS_VERSION_MAIN  (__CM_CMSIS_VERSION_MAIN)                /*!< \deprecated [31:16] CMSIS HAL main version */
 #define __SC300_CMSIS_VERSION_SUB   (__CM_CMSIS_VERSION_SUB)                 /*!< \deprecated [15:0]  CMSIS HAL sub version */
 #define __SC300_CMSIS_VERSION       ((__SC300_CMSIS_VERSION_MAIN << 16U) | \
@@ -142,6 +142,11 @@
     #warning "__MPU_PRESENT not defined in device header file; using default!"
   #endif
 
+  #ifndef __VTOR_PRESENT
+    #define __VTOR_PRESENT             1U
+    #warning "__VTOR_PRESENT not defined in device header file; using default!"
+  #endif
+
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
@@ -342,7 +347,7 @@ typedef struct
   __IOM uint32_t ISER[8U];               /*!< Offset: 0x000 (R/W)  Interrupt Set Enable Register */
         uint32_t RESERVED0[24U];
   __IOM uint32_t ICER[8U];               /*!< Offset: 0x080 (R/W)  Interrupt Clear Enable Register */
-        uint32_t RSERVED1[24U];
+        uint32_t RESERVED1[24U];
   __IOM uint32_t ISPR[8U];               /*!< Offset: 0x100 (R/W)  Interrupt Set Pending Register */
         uint32_t RESERVED2[24U];
   __IOM uint32_t ICPR[8U];               /*!< Offset: 0x180 (R/W)  Interrupt Clear Pending Register */
@@ -557,19 +562,19 @@ typedef struct
 #define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
 
 /* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
-#define SCB_CFSR_MMARVALID_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 7U)               /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
 #define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
 
-#define SCB_CFSR_MSTKERR_Pos               (SCB_SHCSR_MEMFAULTACT_Pos + 4U)               /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
 #define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
 
-#define SCB_CFSR_MUNSTKERR_Pos             (SCB_SHCSR_MEMFAULTACT_Pos + 3U)               /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
 #define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
 
-#define SCB_CFSR_DACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 1U)               /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
 #define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
 
-#define SCB_CFSR_IACCVIOL_Pos              (SCB_SHCSR_MEMFAULTACT_Pos + 0U)               /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
 #define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
 
 /* BusFault Status Register (part of SCB Configurable Fault Status Register) */
@@ -653,13 +658,23 @@ typedef struct
 {
         uint32_t RESERVED0[1U];
   __IM  uint32_t ICTR;                   /*!< Offset: 0x004 (R/ )  Interrupt Controller Type Register */
-        uint32_t RESERVED1[1U];
+  __IOM uint32_t ACTLR;                  /*!< Offset: 0x008 (R/W)  Auxiliary Control Register */
 } SCnSCB_Type;
 
 /* Interrupt Controller Type Register Definitions */
 #define SCnSCB_ICTR_INTLINESNUM_Pos         0U                                         /*!< ICTR: INTLINESNUM Position */
 #define SCnSCB_ICTR_INTLINESNUM_Msk        (0xFUL /*<< SCnSCB_ICTR_INTLINESNUM_Pos*/)  /*!< ICTR: INTLINESNUM Mask */
 
+/* Auxiliary Control Register Definitions */
+#define SCnSCB_ACTLR_DISFOLD_Pos            2U                                         /*!< ACTLR: DISFOLD Position */
+#define SCnSCB_ACTLR_DISFOLD_Msk           (1UL << SCnSCB_ACTLR_DISFOLD_Pos)           /*!< ACTLR: DISFOLD Mask */
+
+#define SCnSCB_ACTLR_DISDEFWBUF_Pos         1U                                         /*!< ACTLR: DISDEFWBUF Position */
+#define SCnSCB_ACTLR_DISDEFWBUF_Msk        (1UL << SCnSCB_ACTLR_DISDEFWBUF_Pos)        /*!< ACTLR: DISDEFWBUF Mask */
+
+#define SCnSCB_ACTLR_DISMCYCINT_Pos         0U                                         /*!< ACTLR: DISMCYCINT Position */
+#define SCnSCB_ACTLR_DISMCYCINT_Msk        (1UL /*<< SCnSCB_ACTLR_DISMCYCINT_Pos*/)    /*!< ACTLR: DISMCYCINT Mask */
+
 /*@} end of group CMSIS_SCnotSCB */
 
 
@@ -739,10 +754,7 @@ typedef struct
   __IOM uint32_t TPR;                    /*!< Offset: 0xE40 (R/W)  ITM Trace Privilege Register */
         uint32_t RESERVED2[15U];
   __IOM uint32_t TCR;                    /*!< Offset: 0xE80 (R/W)  ITM Trace Control Register */
-        uint32_t RESERVED3[29U];
-  __OM  uint32_t IWR;                    /*!< Offset: 0xEF8 ( /W)  ITM Integration Write Register */
-  __IM  uint32_t IRR;                    /*!< Offset: 0xEFC (R/ )  ITM Integration Read Register */
-  __IOM uint32_t IMCR;                   /*!< Offset: 0xF00 (R/W)  ITM Integration Mode Control Register */
+        uint32_t RESERVED3[32U];
         uint32_t RESERVED4[43U];
   __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  ITM Lock Access Register */
   __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  ITM Lock Status Register */
@@ -793,18 +805,6 @@ typedef struct
 #define ITM_TCR_ITMENA_Pos                  0U                                            /*!< ITM TCR: ITM Enable bit Position */
 #define ITM_TCR_ITMENA_Msk                 (1UL /*<< ITM_TCR_ITMENA_Pos*/)                /*!< ITM TCR: ITM Enable bit Mask */
 
-/* ITM Integration Write Register Definitions */
-#define ITM_IWR_ATVALIDM_Pos                0U                                            /*!< ITM IWR: ATVALIDM Position */
-#define ITM_IWR_ATVALIDM_Msk               (1UL /*<< ITM_IWR_ATVALIDM_Pos*/)              /*!< ITM IWR: ATVALIDM Mask */
-
-/* ITM Integration Read Register Definitions */
-#define ITM_IRR_ATREADYM_Pos                0U                                            /*!< ITM IRR: ATREADYM Position */
-#define ITM_IRR_ATREADYM_Msk               (1UL /*<< ITM_IRR_ATREADYM_Pos*/)              /*!< ITM IRR: ATREADYM Mask */
-
-/* ITM Integration Mode Control Register Definitions */
-#define ITM_IMCR_INTEGRATION_Pos            0U                                            /*!< ITM IMCR: INTEGRATION Position */
-#define ITM_IMCR_INTEGRATION_Msk           (1UL /*<< ITM_IMCR_INTEGRATION_Pos*/)          /*!< ITM IMCR: INTEGRATION Mask */
-
 /* ITM Lock Status Register Definitions */
 #define ITM_LSR_ByteAcc_Pos                 2U                                            /*!< ITM LSR: ByteAcc Position */
 #define ITM_LSR_ByteAcc_Msk                (1UL << ITM_LSR_ByteAcc_Pos)                   /*!< ITM LSR: ByteAcc Mask */
@@ -1037,13 +1037,13 @@ typedef struct
 
 /* TPI Integration ETM Data Register Definitions (FIFO0) */
 #define TPI_FIFO0_ITM_ATVALID_Pos          29U                                         /*!< TPI FIFO0: ITM_ATVALID Position */
-#define TPI_FIFO0_ITM_ATVALID_Msk          (0x3UL << TPI_FIFO0_ITM_ATVALID_Pos)        /*!< TPI FIFO0: ITM_ATVALID Mask */
+#define TPI_FIFO0_ITM_ATVALID_Msk          (0x1UL << TPI_FIFO0_ITM_ATVALID_Pos)        /*!< TPI FIFO0: ITM_ATVALID Mask */
 
 #define TPI_FIFO0_ITM_bytecount_Pos        27U                                         /*!< TPI FIFO0: ITM_bytecount Position */
 #define TPI_FIFO0_ITM_bytecount_Msk        (0x3UL << TPI_FIFO0_ITM_bytecount_Pos)      /*!< TPI FIFO0: ITM_bytecount Mask */
 
 #define TPI_FIFO0_ETM_ATVALID_Pos          26U                                         /*!< TPI FIFO0: ETM_ATVALID Position */
-#define TPI_FIFO0_ETM_ATVALID_Msk          (0x3UL << TPI_FIFO0_ETM_ATVALID_Pos)        /*!< TPI FIFO0: ETM_ATVALID Mask */
+#define TPI_FIFO0_ETM_ATVALID_Msk          (0x1UL << TPI_FIFO0_ETM_ATVALID_Pos)        /*!< TPI FIFO0: ETM_ATVALID Mask */
 
 #define TPI_FIFO0_ETM_bytecount_Pos        24U                                         /*!< TPI FIFO0: ETM_bytecount Position */
 #define TPI_FIFO0_ETM_bytecount_Msk        (0x3UL << TPI_FIFO0_ETM_bytecount_Pos)      /*!< TPI FIFO0: ETM_bytecount Mask */
@@ -1066,13 +1066,13 @@ typedef struct
 
 /* TPI Integration ITM Data Register Definitions (FIFO1) */
 #define TPI_FIFO1_ITM_ATVALID_Pos          29U                                         /*!< TPI FIFO1: ITM_ATVALID Position */
-#define TPI_FIFO1_ITM_ATVALID_Msk          (0x3UL << TPI_FIFO1_ITM_ATVALID_Pos)        /*!< TPI FIFO1: ITM_ATVALID Mask */
+#define TPI_FIFO1_ITM_ATVALID_Msk          (0x1UL << TPI_FIFO1_ITM_ATVALID_Pos)        /*!< TPI FIFO1: ITM_ATVALID Mask */
 
 #define TPI_FIFO1_ITM_bytecount_Pos        27U                                         /*!< TPI FIFO1: ITM_bytecount Position */
 #define TPI_FIFO1_ITM_bytecount_Msk        (0x3UL << TPI_FIFO1_ITM_bytecount_Pos)      /*!< TPI FIFO1: ITM_bytecount Mask */
 
 #define TPI_FIFO1_ETM_ATVALID_Pos          26U                                         /*!< TPI FIFO1: ETM_ATVALID Position */
-#define TPI_FIFO1_ETM_ATVALID_Msk          (0x3UL << TPI_FIFO1_ETM_ATVALID_Pos)        /*!< TPI FIFO1: ETM_ATVALID Mask */
+#define TPI_FIFO1_ETM_ATVALID_Msk          (0x1UL << TPI_FIFO1_ETM_ATVALID_Pos)        /*!< TPI FIFO1: ETM_ATVALID Mask */
 
 #define TPI_FIFO1_ETM_bytecount_Pos        24U                                         /*!< TPI FIFO1: ETM_bytecount Position */
 #define TPI_FIFO1_ETM_bytecount_Msk        (0x3UL << TPI_FIFO1_ETM_bytecount_Pos)      /*!< TPI FIFO1: ETM_bytecount Mask */
@@ -1448,7 +1448,6 @@ typedef struct
 #define EXC_RETURN_THREAD_PSP      (0xFFFFFFFDUL)     /* return to Thread mode, uses PSP after return                                */
 
 
-
 /**
   \brief   Set Priority Grouping
   \details Sets the priority grouping field using the required unlock sequence.
@@ -1467,7 +1466,7 @@ __STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
   reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
   reg_value  =  (reg_value                                   |
                 ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8U)                      );              /* Insert write key and priorty group */
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)  );              /* Insert write key and priority group */
   SCB->AIRCR =  reg_value;
 }
 
@@ -1493,7 +1492,9 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
 {
   if ((int32_t)(IRQn) >= 0)
   {
+    __COMPILER_BARRIER();
     NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
   }
 }
 
@@ -1718,6 +1719,7 @@ __STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
   uint32_t *vectors = (uint32_t *)SCB->VTOR;
   vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  /* ARM Application Note 321 states that the M3 does not require the architectural barrier */
 }
 
 
diff --git a/lib/cmsis/inc/core_starmc1.h b/lib/cmsis/inc/core_starmc1.h
new file mode 100644
index 0000000000000..d86c8d3857ff3
--- /dev/null
+++ b/lib/cmsis/inc/core_starmc1.h
@@ -0,0 +1,3592 @@
+/**************************************************************************//**
+ * @file     core_starmc1.h
+ * @brief    CMSIS ArmChina STAR-MC1 Core Peripheral Access Layer Header File
+ * @version  V1.0.2
+ * @date     07. April 2022
+ ******************************************************************************/
+/*
+ * Copyright (c) 2009-2018 Arm Limited. 
+ * Copyright (c) 2018-2022 Arm China. 
+ * 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
+ *
+ * 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.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include         /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header                   /* treat file as system include file */
+#elif defined ( __GNUC__ )
+  #pragma GCC diagnostic ignored "-Wpedantic"   /* disable pedantic warning due to unnamed structs/unions */
+#endif
+
+#ifndef __CORE_STAR_H_GENERIC
+#define __CORE_STAR_H_GENERIC
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/**
+  \page CMSIS_MISRA_Exceptions  MISRA-C:2004 Compliance Exceptions
+  CMSIS violates the following MISRA-C:2004 rules:
+
+   \li Required Rule 8.5, object/function definition in header file.<br>
+     Function definitions in header files are used to allow 'inlining'.
+
+   \li Required Rule 18.4, declaration of union type or object of union type: '{...}'.<br>
+     Unions are used for effective representation of core registers.
+
+   \li Advisory Rule 19.7, Function-like macro defined.<br>
+     Function-like macros are used to allow more efficient code.
+ */
+
+
+/*******************************************************************************
+ *                 CMSIS definitions
+ ******************************************************************************/
+/**
+  \ingroup STAR-MC1
+  @{
+ */
+
+#include "cmsis_version.h"
+
+/* Macro Define for STAR-MC1 */
+#define __STAR_MC                 (1U)                                       /*!< STAR-MC Core */
+
+/** __FPU_USED indicates whether an FPU is used or not.
+    For this, __FPU_PRESENT has to be checked prior to making use of FPU specific registers and functions.
+*/
+#if defined ( __CC_ARM )
+  #if defined (__TARGET_FPU_VFP)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1U)
+    #if defined (__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #if defined (__ARM_FP)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #warning "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1U)
+    #if defined (__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __GNUC__ )
+  #if defined (__VFP_FP__) && !defined(__SOFTFP__)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1U)
+    #if defined (__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __ICCARM__ )
+  #if defined (__ARMVFP__)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+  #if defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1U)
+    #if defined (__DSP_PRESENT) && (__DSP_PRESENT == 1U)
+      #define __DSP_USED       1U
+    #else
+      #error "Compiler generates DSP (SIMD) instructions for a devices without DSP extensions (check __DSP_PRESENT)"
+      #define __DSP_USED         0U
+    #endif
+  #else
+    #define __DSP_USED         0U
+  #endif
+
+#elif defined ( __TI_ARM__ )
+  #if defined (__TI_VFP_SUPPORT__)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#elif defined ( __TASKING__ )
+  #if defined (__FPU_VFP__)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#elif defined ( __CSMC__ )
+  #if ( __CSMC__ & 0x400U)
+    #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
+      #define __FPU_USED       1U
+    #else
+      #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
+      #define __FPU_USED       0U
+    #endif
+  #else
+    #define __FPU_USED         0U
+  #endif
+
+#endif
+
+#include "cmsis_compiler.h"               /* CMSIS compiler specific defines */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CORE_STAR_H_GENERIC */
+
+#ifndef __CMSIS_GENERIC
+
+#ifndef __CORE_STAR_H_DEPENDANT
+#define __CORE_STAR_H_DEPENDANT
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* check device defines and use defaults */
+#if defined __CHECK_DEVICE_DEFINES
+  #ifndef __STAR_REV
+    #define __STAR_REV                0x0000U
+    #warning "__STAR_REV not defined in device header file; using default!"
+  #endif
+
+  #ifndef __FPU_PRESENT
+    #define __FPU_PRESENT             0U
+    #warning "__FPU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __MPU_PRESENT
+    #define __MPU_PRESENT             0U
+    #warning "__MPU_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __SAUREGION_PRESENT
+    #define __SAUREGION_PRESENT       0U
+    #warning "__SAUREGION_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DSP_PRESENT
+    #define __DSP_PRESENT             0U
+    #warning "__DSP_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __ICACHE_PRESENT
+    #define __ICACHE_PRESENT          0U
+    #warning "__ICACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DCACHE_PRESENT
+    #define __DCACHE_PRESENT          0U
+    #warning "__DCACHE_PRESENT not defined in device header file; using default!"
+  #endif
+
+  #ifndef __DTCM_PRESENT
+    #define __DTCM_PRESENT            0U
+    #warning "__DTCM_PRESENT        not defined in device header file; using default!"
+  #endif
+
+  #ifndef __NVIC_PRIO_BITS
+    #define __NVIC_PRIO_BITS          3U
+    #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"
+  #endif
+
+  #ifndef __Vendor_SysTickConfig
+    #define __Vendor_SysTickConfig    0U
+    #warning "__Vendor_SysTickConfig not defined in device header file; using default!"
+  #endif
+#endif
+
+/* IO definitions (access restrictions to peripheral registers) */
+/**
+    \defgroup CMSIS_glob_defs CMSIS Global Defines
+
+    <strong>IO Type Qualifiers</strong> are used
+    \li to specify the access to peripheral variables.
+    \li for automatic generation of peripheral register debug information.
+*/
+#ifdef __cplusplus
+  #define   __I     volatile             /*!< Defines 'read only' permissions */
+#else
+  #define   __I     volatile const       /*!< Defines 'read only' permissions */
+#endif
+#define     __O     volatile             /*!< Defines 'write only' permissions */
+#define     __IO    volatile             /*!< Defines 'read / write' permissions */
+
+/* following defines should be used for structure members */
+#define     __IM     volatile const      /*! Defines 'read only' structure member permissions */
+#define     __OM     volatile            /*! Defines 'write only' structure member permissions */
+#define     __IOM    volatile            /*! Defines 'read / write' structure member permissions */
+
+/*@} end of group STAR-MC1 */
+
+
+
+/*******************************************************************************
+ *                 Register Abstraction
+  Core Register contain:
+  - Core Register
+  - Core NVIC Register
+  - Core SCB Register
+  - Core SysTick Register
+  - Core Debug Register
+  - Core MPU Register
+  - Core SAU Register
+  - Core FPU Register
+ ******************************************************************************/
+/**
+  \defgroup CMSIS_core_register Defines and Type Definitions
+  \brief Type definitions and defines for STAR-MC1 processor based devices.
+*/
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_CORE  Status and Control Registers
+  \brief      Core Register type definitions.
+  @{
+ */
+
+/**
+  \brief  Union type to access the Application Program Status Register (APSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t _reserved0:16;              /*!< bit:  0..15  Reserved */
+    uint32_t GE:4;                       /*!< bit: 16..19  Greater than or Equal flags */
+    uint32_t _reserved1:7;               /*!< bit: 20..26  Reserved */
+    uint32_t Q:1;                        /*!< bit:     27  Saturation condition flag */
+    uint32_t V:1;                        /*!< bit:     28  Overflow condition code flag */
+    uint32_t C:1;                        /*!< bit:     29  Carry condition code flag */
+    uint32_t Z:1;                        /*!< bit:     30  Zero condition code flag */
+    uint32_t N:1;                        /*!< bit:     31  Negative condition code flag */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} APSR_Type;
+
+/* APSR Register Definitions */
+#define APSR_N_Pos                         31U                                            /*!< APSR: N Position */
+#define APSR_N_Msk                         (1UL << APSR_N_Pos)                            /*!< APSR: N Mask */
+
+#define APSR_Z_Pos                         30U                                            /*!< APSR: Z Position */
+#define APSR_Z_Msk                         (1UL << APSR_Z_Pos)                            /*!< APSR: Z Mask */
+
+#define APSR_C_Pos                         29U                                            /*!< APSR: C Position */
+#define APSR_C_Msk                         (1UL << APSR_C_Pos)                            /*!< APSR: C Mask */
+
+#define APSR_V_Pos                         28U                                            /*!< APSR: V Position */
+#define APSR_V_Msk                         (1UL << APSR_V_Pos)                            /*!< APSR: V Mask */
+
+#define APSR_Q_Pos                         27U                                            /*!< APSR: Q Position */
+#define APSR_Q_Msk                         (1UL << APSR_Q_Pos)                            /*!< APSR: Q Mask */
+
+#define APSR_GE_Pos                        16U                                            /*!< APSR: GE Position */
+#define APSR_GE_Msk                        (0xFUL << APSR_GE_Pos)                         /*!< APSR: GE Mask */
+
+
+/**
+  \brief  Union type to access the Interrupt Program Status Register (IPSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t ISR:9;                      /*!< bit:  0.. 8  Exception number */
+    uint32_t _reserved0:23;              /*!< bit:  9..31  Reserved */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} IPSR_Type;
+
+/* IPSR Register Definitions */
+#define IPSR_ISR_Pos                        0U                                            /*!< IPSR: ISR Position */
+#define IPSR_ISR_Msk                       (0x1FFUL /*<< IPSR_ISR_Pos*/)                  /*!< IPSR: ISR Mask */
+
+
+/**
+  \brief  Union type to access the Special-Purpose Program Status Registers (xPSR).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t ISR:9;                      /*!< bit:  0.. 8  Exception number */
+    uint32_t _reserved0:7;               /*!< bit:  9..15  Reserved */
+    uint32_t GE:4;                       /*!< bit: 16..19  Greater than or Equal flags */
+    uint32_t _reserved1:4;               /*!< bit: 20..23  Reserved */
+    uint32_t T:1;                        /*!< bit:     24  Thumb bit        (read 0) */
+    uint32_t IT:2;                       /*!< bit: 25..26  saved IT state   (read 0) */
+    uint32_t Q:1;                        /*!< bit:     27  Saturation condition flag */
+    uint32_t V:1;                        /*!< bit:     28  Overflow condition code flag */
+    uint32_t C:1;                        /*!< bit:     29  Carry condition code flag */
+    uint32_t Z:1;                        /*!< bit:     30  Zero condition code flag */
+    uint32_t N:1;                        /*!< bit:     31  Negative condition code flag */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} xPSR_Type;
+
+/* xPSR Register Definitions */
+#define xPSR_N_Pos                         31U                                            /*!< xPSR: N Position */
+#define xPSR_N_Msk                         (1UL << xPSR_N_Pos)                            /*!< xPSR: N Mask */
+
+#define xPSR_Z_Pos                         30U                                            /*!< xPSR: Z Position */
+#define xPSR_Z_Msk                         (1UL << xPSR_Z_Pos)                            /*!< xPSR: Z Mask */
+
+#define xPSR_C_Pos                         29U                                            /*!< xPSR: C Position */
+#define xPSR_C_Msk                         (1UL << xPSR_C_Pos)                            /*!< xPSR: C Mask */
+
+#define xPSR_V_Pos                         28U                                            /*!< xPSR: V Position */
+#define xPSR_V_Msk                         (1UL << xPSR_V_Pos)                            /*!< xPSR: V Mask */
+
+#define xPSR_Q_Pos                         27U                                            /*!< xPSR: Q Position */
+#define xPSR_Q_Msk                         (1UL << xPSR_Q_Pos)                            /*!< xPSR: Q Mask */
+
+#define xPSR_IT_Pos                        25U                                            /*!< xPSR: IT Position */
+#define xPSR_IT_Msk                        (3UL << xPSR_IT_Pos)                           /*!< xPSR: IT Mask */
+
+#define xPSR_T_Pos                         24U                                            /*!< xPSR: T Position */
+#define xPSR_T_Msk                         (1UL << xPSR_T_Pos)                            /*!< xPSR: T Mask */
+
+#define xPSR_GE_Pos                        16U                                            /*!< xPSR: GE Position */
+#define xPSR_GE_Msk                        (0xFUL << xPSR_GE_Pos)                         /*!< xPSR: GE Mask */
+
+#define xPSR_ISR_Pos                        0U                                            /*!< xPSR: ISR Position */
+#define xPSR_ISR_Msk                       (0x1FFUL /*<< xPSR_ISR_Pos*/)                  /*!< xPSR: ISR Mask */
+
+
+/**
+  \brief  Union type to access the Control Registers (CONTROL).
+ */
+typedef union
+{
+  struct
+  {
+    uint32_t nPRIV:1;                    /*!< bit:      0  Execution privilege in Thread mode */
+    uint32_t SPSEL:1;                    /*!< bit:      1  Stack-pointer select */
+    uint32_t FPCA:1;                     /*!< bit:      2  Floating-point context active */
+    uint32_t SFPA:1;                     /*!< bit:      3  Secure floating-point active */
+    uint32_t _reserved1:28;              /*!< bit:  4..31  Reserved */
+  } b;                                   /*!< Structure used for bit  access */
+  uint32_t w;                            /*!< Type      used for word access */
+} CONTROL_Type;
+
+/* CONTROL Register Definitions */
+#define CONTROL_SFPA_Pos                    3U                                            /*!< CONTROL: SFPA Position */
+#define CONTROL_SFPA_Msk                   (1UL << CONTROL_SFPA_Pos)                      /*!< CONTROL: SFPA Mask */
+
+#define CONTROL_FPCA_Pos                    2U                                            /*!< CONTROL: FPCA Position */
+#define CONTROL_FPCA_Msk                   (1UL << CONTROL_FPCA_Pos)                      /*!< CONTROL: FPCA Mask */
+
+#define CONTROL_SPSEL_Pos                   1U                                            /*!< CONTROL: SPSEL Position */
+#define CONTROL_SPSEL_Msk                  (1UL << CONTROL_SPSEL_Pos)                     /*!< CONTROL: SPSEL Mask */
+
+#define CONTROL_nPRIV_Pos                   0U                                            /*!< CONTROL: nPRIV Position */
+#define CONTROL_nPRIV_Msk                  (1UL /*<< CONTROL_nPRIV_Pos*/)                 /*!< CONTROL: nPRIV Mask */
+
+/*@} end of group CMSIS_CORE */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_NVIC  Nested Vectored Interrupt Controller (NVIC)
+  \brief      Type definitions for the NVIC Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Nested Vectored Interrupt Controller (NVIC).
+ */
+typedef struct
+{
+  __IOM uint32_t ISER[16U];              /*!< Offset: 0x000 (R/W)  Interrupt Set Enable Register */
+        uint32_t RESERVED0[16U];
+  __IOM uint32_t ICER[16U];              /*!< Offset: 0x080 (R/W)  Interrupt Clear Enable Register */
+        uint32_t RSERVED1[16U];
+  __IOM uint32_t ISPR[16U];              /*!< Offset: 0x100 (R/W)  Interrupt Set Pending Register */
+        uint32_t RESERVED2[16U];
+  __IOM uint32_t ICPR[16U];              /*!< Offset: 0x180 (R/W)  Interrupt Clear Pending Register */
+        uint32_t RESERVED3[16U];
+  __IOM uint32_t IABR[16U];              /*!< Offset: 0x200 (R/W)  Interrupt Active bit Register */
+        uint32_t RESERVED4[16U];
+  __IOM uint32_t ITNS[16U];              /*!< Offset: 0x280 (R/W)  Interrupt Non-Secure State Register */
+        uint32_t RESERVED5[16U];
+  __IOM uint8_t  IPR[496U];              /*!< Offset: 0x300 (R/W)  Interrupt Priority Register (8Bit wide) */
+        uint32_t RESERVED6[580U];
+  __OM  uint32_t STIR;                   /*!< Offset: 0xE00 ( /W)  Software Trigger Interrupt Register */
+}  NVIC_Type;
+
+/* Software Triggered Interrupt Register Definitions */
+#define NVIC_STIR_INTID_Pos                 0U                                         /*!< STIR: INTLINESNUM Position */
+#define NVIC_STIR_INTID_Msk                (0x1FFUL /*<< NVIC_STIR_INTID_Pos*/)        /*!< STIR: INTLINESNUM Mask */
+
+/*@} end of group CMSIS_NVIC */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SCB     System Control Block (SCB)
+  \brief    Type definitions for the System Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the System Control Block (SCB).
+ */
+typedef struct
+{
+  __IM  uint32_t CPUID;                  /*!< Offset: 0x000 (R/ )  CPUID Base Register */
+  __IOM uint32_t ICSR;                   /*!< Offset: 0x004 (R/W)  Interrupt Control and State Register */
+  __IOM uint32_t VTOR;                   /*!< Offset: 0x008 (R/W)  Vector Table Offset Register */
+  __IOM uint32_t AIRCR;                  /*!< Offset: 0x00C (R/W)  Application Interrupt and Reset Control Register */
+  __IOM uint32_t SCR;                    /*!< Offset: 0x010 (R/W)  System Control Register */
+  __IOM uint32_t CCR;                    /*!< Offset: 0x014 (R/W)  Configuration Control Register */
+  __IOM uint8_t  SHPR[12U];              /*!< Offset: 0x018 (R/W)  System Handlers Priority Registers (4-7, 8-11, 12-15) */
+  __IOM uint32_t SHCSR;                  /*!< Offset: 0x024 (R/W)  System Handler Control and State Register */
+  __IOM uint32_t CFSR;                   /*!< Offset: 0x028 (R/W)  Configurable Fault Status Register */
+  __IOM uint32_t HFSR;                   /*!< Offset: 0x02C (R/W)  HardFault Status Register */
+  __IOM uint32_t DFSR;                   /*!< Offset: 0x030 (R/W)  Debug Fault Status Register */
+  __IOM uint32_t MMFAR;                  /*!< Offset: 0x034 (R/W)  MemManage Fault Address Register */
+  __IOM uint32_t BFAR;                   /*!< Offset: 0x038 (R/W)  BusFault Address Register */
+  __IOM uint32_t AFSR;                   /*!< Offset: 0x03C (R/W)  Auxiliary Fault Status Register */
+  __IM  uint32_t ID_PFR[2U];             /*!< Offset: 0x040 (R/ )  Processor Feature Register */
+  __IM  uint32_t ID_DFR;                 /*!< Offset: 0x048 (R/ )  Debug Feature Register */
+  __IM  uint32_t ID_AFR;                 /*!< Offset: 0x04C (R/ )  Auxiliary Feature Register */
+  __IM  uint32_t ID_MMFR[4U];            /*!< Offset: 0x050 (R/ )  Memory Model Feature Register */
+  __IM  uint32_t ID_ISAR[5U];            /*!< Offset: 0x060 (R/ )  Instruction Set Attributes Register */
+        uint32_t RESERVED0[1U];
+  __IM  uint32_t CLIDR;                  /*!< Offset: 0x078 (R/ )  Cache Level ID register */
+  __IM  uint32_t CTR;                    /*!< Offset: 0x07C (R/ )  Cache Type register */
+  __IM  uint32_t CCSIDR;                 /*!< Offset: 0x080 (R/ )  Cache Size ID Register */
+  __IOM uint32_t CSSELR;                 /*!< Offset: 0x084 (R/W)  Cache Size Selection Register */
+  __IOM uint32_t CPACR;                  /*!< Offset: 0x088 (R/W)  Coprocessor Access Control Register */
+  __IOM uint32_t NSACR;                  /*!< Offset: 0x08C (R/W)  Non-Secure Access Control Register */
+        uint32_t RESERVED_ADD1[21U];      
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x0E4 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x0E8 (R/W)  Secure Fault Address Register */
+        uint32_t RESERVED3[69U];
+  __OM  uint32_t STIR;                   /*!< Offset: F00-D00=0x200 ( /W)  Software Triggered Interrupt Register */
+        uint32_t RESERVED4[15U];
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x240 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x244 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x248 (R/ )  Media and VFP Feature Register 2 */
+        uint32_t RESERVED5[1U];
+  __OM  uint32_t ICIALLU;                /*!< Offset: 0x250 ( /W)  I-Cache Invalidate All to PoU */
+        uint32_t RESERVED6[1U];
+  __OM  uint32_t ICIMVAU;                /*!< Offset: 0x258 ( /W)  I-Cache Invalidate by MVA to PoU */
+  __OM  uint32_t DCIMVAC;                /*!< Offset: 0x25C ( /W)  D-Cache Invalidate by MVA to PoC */
+  __OM  uint32_t DCISW;                  /*!< Offset: 0x260 ( /W)  D-Cache Invalidate by Set-way */
+  __OM  uint32_t DCCMVAU;                /*!< Offset: 0x264 ( /W)  D-Cache Clean by MVA to PoU */
+  __OM  uint32_t DCCMVAC;                /*!< Offset: 0x268 ( /W)  D-Cache Clean by MVA to PoC */
+  __OM  uint32_t DCCSW;                  /*!< Offset: 0x26C ( /W)  D-Cache Clean by Set-way */
+  __OM  uint32_t DCCIMVAC;               /*!< Offset: 0x270 ( /W)  D-Cache Clean and Invalidate by MVA to PoC */
+  __OM  uint32_t DCCISW;                 /*!< Offset: 0x274 ( /W)  D-Cache Clean and Invalidate by Set-way */
+} SCB_Type;
+
+typedef struct
+{
+  __IOM uint32_t CACR;				       /*!< Offset: 0x0 (R/W)  L1 Cache Control Register */
+  __IOM uint32_t ITCMCR;				   /*!< Offset: 0x10 (R/W)  Instruction Tightly-Coupled Memory Control Register */
+  __IOM uint32_t DTCMCR;				   /*!< Offset: 0x14 (R/W)  Data Tightly-Coupled Memory Control Registers */ 
+}EMSS_Type;
+
+/* SCB CPUID Register Definitions */
+#define SCB_CPUID_IMPLEMENTER_Pos          24U                                            /*!< SCB CPUID: IMPLEMENTER Position */
+#define SCB_CPUID_IMPLEMENTER_Msk          (0xFFUL << SCB_CPUID_IMPLEMENTER_Pos)          /*!< SCB CPUID: IMPLEMENTER Mask */
+
+#define SCB_CPUID_VARIANT_Pos              20U                                            /*!< SCB CPUID: VARIANT Position */
+#define SCB_CPUID_VARIANT_Msk              (0xFUL << SCB_CPUID_VARIANT_Pos)               /*!< SCB CPUID: VARIANT Mask */
+
+#define SCB_CPUID_ARCHITECTURE_Pos         16U                                            /*!< SCB CPUID: ARCHITECTURE Position */
+#define SCB_CPUID_ARCHITECTURE_Msk         (0xFUL << SCB_CPUID_ARCHITECTURE_Pos)          /*!< SCB CPUID: ARCHITECTURE Mask */
+
+#define SCB_CPUID_PARTNO_Pos                4U                                            /*!< SCB CPUID: PARTNO Position */
+#define SCB_CPUID_PARTNO_Msk               (0xFFFUL << SCB_CPUID_PARTNO_Pos)              /*!< SCB CPUID: PARTNO Mask */
+
+#define SCB_CPUID_REVISION_Pos              0U                                            /*!< SCB CPUID: REVISION Position */
+#define SCB_CPUID_REVISION_Msk             (0xFUL /*<< SCB_CPUID_REVISION_Pos*/)          /*!< SCB CPUID: REVISION Mask */
+
+/* SCB Interrupt Control State Register Definitions */
+#define SCB_ICSR_PENDNMISET_Pos            31U                                            /*!< SCB ICSR: PENDNMISET Position */
+#define SCB_ICSR_PENDNMISET_Msk            (1UL << SCB_ICSR_PENDNMISET_Pos)               /*!< SCB ICSR: PENDNMISET Mask */
+
+#define SCB_ICSR_NMIPENDSET_Pos            SCB_ICSR_PENDNMISET_Pos                        /*!< SCB ICSR: NMIPENDSET Position, backward compatibility */
+#define SCB_ICSR_NMIPENDSET_Msk            SCB_ICSR_PENDNMISET_Msk                        /*!< SCB ICSR: NMIPENDSET Mask, backward compatibility */
+
+#define SCB_ICSR_PENDNMICLR_Pos            30U                                            /*!< SCB ICSR: PENDNMICLR Position */
+#define SCB_ICSR_PENDNMICLR_Msk            (1UL << SCB_ICSR_PENDNMICLR_Pos)               /*!< SCB ICSR: PENDNMICLR Mask */
+
+#define SCB_ICSR_PENDSVSET_Pos             28U                                            /*!< SCB ICSR: PENDSVSET Position */
+#define SCB_ICSR_PENDSVSET_Msk             (1UL << SCB_ICSR_PENDSVSET_Pos)                /*!< SCB ICSR: PENDSVSET Mask */
+
+#define SCB_ICSR_PENDSVCLR_Pos             27U                                            /*!< SCB ICSR: PENDSVCLR Position */
+#define SCB_ICSR_PENDSVCLR_Msk             (1UL << SCB_ICSR_PENDSVCLR_Pos)                /*!< SCB ICSR: PENDSVCLR Mask */
+
+#define SCB_ICSR_PENDSTSET_Pos             26U                                            /*!< SCB ICSR: PENDSTSET Position */
+#define SCB_ICSR_PENDSTSET_Msk             (1UL << SCB_ICSR_PENDSTSET_Pos)                /*!< SCB ICSR: PENDSTSET Mask */
+
+#define SCB_ICSR_PENDSTCLR_Pos             25U                                            /*!< SCB ICSR: PENDSTCLR Position */
+#define SCB_ICSR_PENDSTCLR_Msk             (1UL << SCB_ICSR_PENDSTCLR_Pos)                /*!< SCB ICSR: PENDSTCLR Mask */
+
+#define SCB_ICSR_STTNS_Pos                 24U                                            /*!< SCB ICSR: STTNS Position (Security Extension) */
+#define SCB_ICSR_STTNS_Msk                 (1UL << SCB_ICSR_STTNS_Pos)                    /*!< SCB ICSR: STTNS Mask (Security Extension) */
+
+#define SCB_ICSR_ISRPREEMPT_Pos            23U                                            /*!< SCB ICSR: ISRPREEMPT Position */
+#define SCB_ICSR_ISRPREEMPT_Msk            (1UL << SCB_ICSR_ISRPREEMPT_Pos)               /*!< SCB ICSR: ISRPREEMPT Mask */
+
+#define SCB_ICSR_ISRPENDING_Pos            22U                                            /*!< SCB ICSR: ISRPENDING Position */
+#define SCB_ICSR_ISRPENDING_Msk            (1UL << SCB_ICSR_ISRPENDING_Pos)               /*!< SCB ICSR: ISRPENDING Mask */
+
+#define SCB_ICSR_VECTPENDING_Pos           12U                                            /*!< SCB ICSR: VECTPENDING Position */
+#define SCB_ICSR_VECTPENDING_Msk           (0x1FFUL << SCB_ICSR_VECTPENDING_Pos)          /*!< SCB ICSR: VECTPENDING Mask */
+
+#define SCB_ICSR_RETTOBASE_Pos             11U                                            /*!< SCB ICSR: RETTOBASE Position */
+#define SCB_ICSR_RETTOBASE_Msk             (1UL << SCB_ICSR_RETTOBASE_Pos)                /*!< SCB ICSR: RETTOBASE Mask */
+
+#define SCB_ICSR_VECTACTIVE_Pos             0U                                            /*!< SCB ICSR: VECTACTIVE Position */
+#define SCB_ICSR_VECTACTIVE_Msk            (0x1FFUL /*<< SCB_ICSR_VECTACTIVE_Pos*/)       /*!< SCB ICSR: VECTACTIVE Mask */
+
+/* SCB Vector Table Offset Register Definitions */
+#define SCB_VTOR_TBLOFF_Pos                 7U                                            /*!< SCB VTOR: TBLOFF Position */
+#define SCB_VTOR_TBLOFF_Msk                (0x1FFFFFFUL << SCB_VTOR_TBLOFF_Pos)           /*!< SCB VTOR: TBLOFF Mask */
+
+/* SCB Application Interrupt and Reset Control Register Definitions */
+#define SCB_AIRCR_VECTKEY_Pos              16U                                            /*!< SCB AIRCR: VECTKEY Position */
+#define SCB_AIRCR_VECTKEY_Msk              (0xFFFFUL << SCB_AIRCR_VECTKEY_Pos)            /*!< SCB AIRCR: VECTKEY Mask */
+
+#define SCB_AIRCR_VECTKEYSTAT_Pos          16U                                            /*!< SCB AIRCR: VECTKEYSTAT Position */
+#define SCB_AIRCR_VECTKEYSTAT_Msk          (0xFFFFUL << SCB_AIRCR_VECTKEYSTAT_Pos)        /*!< SCB AIRCR: VECTKEYSTAT Mask */
+
+#define SCB_AIRCR_ENDIANESS_Pos            15U                                            /*!< SCB AIRCR: ENDIANESS Position */
+#define SCB_AIRCR_ENDIANESS_Msk            (1UL << SCB_AIRCR_ENDIANESS_Pos)               /*!< SCB AIRCR: ENDIANESS Mask */
+
+#define SCB_AIRCR_PRIS_Pos                 14U                                            /*!< SCB AIRCR: PRIS Position */
+#define SCB_AIRCR_PRIS_Msk                 (1UL << SCB_AIRCR_PRIS_Pos)                    /*!< SCB AIRCR: PRIS Mask */
+
+#define SCB_AIRCR_BFHFNMINS_Pos            13U                                            /*!< SCB AIRCR: BFHFNMINS Position */
+#define SCB_AIRCR_BFHFNMINS_Msk            (1UL << SCB_AIRCR_BFHFNMINS_Pos)               /*!< SCB AIRCR: BFHFNMINS Mask */
+
+#define SCB_AIRCR_PRIGROUP_Pos              8U                                            /*!< SCB AIRCR: PRIGROUP Position */
+#define SCB_AIRCR_PRIGROUP_Msk             (7UL << SCB_AIRCR_PRIGROUP_Pos)                /*!< SCB AIRCR: PRIGROUP Mask */
+
+#define SCB_AIRCR_SYSRESETREQS_Pos          3U                                            /*!< SCB AIRCR: SYSRESETREQS Position */
+#define SCB_AIRCR_SYSRESETREQS_Msk         (1UL << SCB_AIRCR_SYSRESETREQS_Pos)            /*!< SCB AIRCR: SYSRESETREQS Mask */
+
+#define SCB_AIRCR_SYSRESETREQ_Pos           2U                                            /*!< SCB AIRCR: SYSRESETREQ Position */
+#define SCB_AIRCR_SYSRESETREQ_Msk          (1UL << SCB_AIRCR_SYSRESETREQ_Pos)             /*!< SCB AIRCR: SYSRESETREQ Mask */
+
+#define SCB_AIRCR_VECTCLRACTIVE_Pos         1U                                            /*!< SCB AIRCR: VECTCLRACTIVE Position */
+#define SCB_AIRCR_VECTCLRACTIVE_Msk        (1UL << SCB_AIRCR_VECTCLRACTIVE_Pos)           /*!< SCB AIRCR: VECTCLRACTIVE Mask */
+
+/* SCB System Control Register Definitions */
+#define SCB_SCR_SEVONPEND_Pos               4U                                            /*!< SCB SCR: SEVONPEND Position */
+#define SCB_SCR_SEVONPEND_Msk              (1UL << SCB_SCR_SEVONPEND_Pos)                 /*!< SCB SCR: SEVONPEND Mask */
+
+#define SCB_SCR_SLEEPDEEPS_Pos              3U                                            /*!< SCB SCR: SLEEPDEEPS Position */
+#define SCB_SCR_SLEEPDEEPS_Msk             (1UL << SCB_SCR_SLEEPDEEPS_Pos)                /*!< SCB SCR: SLEEPDEEPS Mask */
+
+#define SCB_SCR_SLEEPDEEP_Pos               2U                                            /*!< SCB SCR: SLEEPDEEP Position */
+#define SCB_SCR_SLEEPDEEP_Msk              (1UL << SCB_SCR_SLEEPDEEP_Pos)                 /*!< SCB SCR: SLEEPDEEP Mask */
+
+#define SCB_SCR_SLEEPONEXIT_Pos             1U                                            /*!< SCB SCR: SLEEPONEXIT Position */
+#define SCB_SCR_SLEEPONEXIT_Msk            (1UL << SCB_SCR_SLEEPONEXIT_Pos)               /*!< SCB SCR: SLEEPONEXIT Mask */
+
+/* SCB Configuration Control Register Definitions */
+#define SCB_CCR_BP_Pos                     18U                                            /*!< SCB CCR: BP Position */
+#define SCB_CCR_BP_Msk                     (1UL << SCB_CCR_BP_Pos)                        /*!< SCB CCR: BP Mask */
+
+#define SCB_CCR_IC_Pos                     17U                                            /*!< SCB CCR: IC Position */
+#define SCB_CCR_IC_Msk                     (1UL << SCB_CCR_IC_Pos)                        /*!< SCB CCR: IC Mask */
+
+#define SCB_CCR_DC_Pos                     16U                                            /*!< SCB CCR: DC Position */
+#define SCB_CCR_DC_Msk                     (1UL << SCB_CCR_DC_Pos)                        /*!< SCB CCR: DC Mask */
+
+#define SCB_CCR_STKOFHFNMIGN_Pos           10U                                            /*!< SCB CCR: STKOFHFNMIGN Position */
+#define SCB_CCR_STKOFHFNMIGN_Msk           (1UL << SCB_CCR_STKOFHFNMIGN_Pos)              /*!< SCB CCR: STKOFHFNMIGN Mask */
+
+#define SCB_CCR_BFHFNMIGN_Pos               8U                                            /*!< SCB CCR: BFHFNMIGN Position */
+#define SCB_CCR_BFHFNMIGN_Msk              (1UL << SCB_CCR_BFHFNMIGN_Pos)                 /*!< SCB CCR: BFHFNMIGN Mask */
+
+#define SCB_CCR_DIV_0_TRP_Pos               4U                                            /*!< SCB CCR: DIV_0_TRP Position */
+#define SCB_CCR_DIV_0_TRP_Msk              (1UL << SCB_CCR_DIV_0_TRP_Pos)                 /*!< SCB CCR: DIV_0_TRP Mask */
+
+#define SCB_CCR_UNALIGN_TRP_Pos             3U                                            /*!< SCB CCR: UNALIGN_TRP Position */
+#define SCB_CCR_UNALIGN_TRP_Msk            (1UL << SCB_CCR_UNALIGN_TRP_Pos)               /*!< SCB CCR: UNALIGN_TRP Mask */
+
+#define SCB_CCR_USERSETMPEND_Pos            1U                                            /*!< SCB CCR: USERSETMPEND Position */
+#define SCB_CCR_USERSETMPEND_Msk           (1UL << SCB_CCR_USERSETMPEND_Pos)              /*!< SCB CCR: USERSETMPEND Mask */
+
+/* SCB System Handler Control and State Register Definitions */
+#define SCB_SHCSR_HARDFAULTPENDED_Pos      21U                                            /*!< SCB SHCSR: HARDFAULTPENDED Position */
+#define SCB_SHCSR_HARDFAULTPENDED_Msk      (1UL << SCB_SHCSR_HARDFAULTPENDED_Pos)         /*!< SCB SHCSR: HARDFAULTPENDED Mask */
+
+#define SCB_SHCSR_SECUREFAULTPENDED_Pos    20U                                            /*!< SCB SHCSR: SECUREFAULTPENDED Position */
+#define SCB_SHCSR_SECUREFAULTPENDED_Msk    (1UL << SCB_SHCSR_SECUREFAULTPENDED_Pos)       /*!< SCB SHCSR: SECUREFAULTPENDED Mask */
+
+#define SCB_SHCSR_SECUREFAULTENA_Pos       19U                                            /*!< SCB SHCSR: SECUREFAULTENA Position */
+#define SCB_SHCSR_SECUREFAULTENA_Msk       (1UL << SCB_SHCSR_SECUREFAULTENA_Pos)          /*!< SCB SHCSR: SECUREFAULTENA Mask */
+
+#define SCB_SHCSR_USGFAULTENA_Pos          18U                                            /*!< SCB SHCSR: USGFAULTENA Position */
+#define SCB_SHCSR_USGFAULTENA_Msk          (1UL << SCB_SHCSR_USGFAULTENA_Pos)             /*!< SCB SHCSR: USGFAULTENA Mask */
+
+#define SCB_SHCSR_BUSFAULTENA_Pos          17U                                            /*!< SCB SHCSR: BUSFAULTENA Position */
+#define SCB_SHCSR_BUSFAULTENA_Msk          (1UL << SCB_SHCSR_BUSFAULTENA_Pos)             /*!< SCB SHCSR: BUSFAULTENA Mask */
+
+#define SCB_SHCSR_MEMFAULTENA_Pos          16U                                            /*!< SCB SHCSR: MEMFAULTENA Position */
+#define SCB_SHCSR_MEMFAULTENA_Msk          (1UL << SCB_SHCSR_MEMFAULTENA_Pos)             /*!< SCB SHCSR: MEMFAULTENA Mask */
+
+#define SCB_SHCSR_SVCALLPENDED_Pos         15U                                            /*!< SCB SHCSR: SVCALLPENDED Position */
+#define SCB_SHCSR_SVCALLPENDED_Msk         (1UL << SCB_SHCSR_SVCALLPENDED_Pos)            /*!< SCB SHCSR: SVCALLPENDED Mask */
+
+#define SCB_SHCSR_BUSFAULTPENDED_Pos       14U                                            /*!< SCB SHCSR: BUSFAULTPENDED Position */
+#define SCB_SHCSR_BUSFAULTPENDED_Msk       (1UL << SCB_SHCSR_BUSFAULTPENDED_Pos)          /*!< SCB SHCSR: BUSFAULTPENDED Mask */
+
+#define SCB_SHCSR_MEMFAULTPENDED_Pos       13U                                            /*!< SCB SHCSR: MEMFAULTPENDED Position */
+#define SCB_SHCSR_MEMFAULTPENDED_Msk       (1UL << SCB_SHCSR_MEMFAULTPENDED_Pos)          /*!< SCB SHCSR: MEMFAULTPENDED Mask */
+
+#define SCB_SHCSR_USGFAULTPENDED_Pos       12U                                            /*!< SCB SHCSR: USGFAULTPENDED Position */
+#define SCB_SHCSR_USGFAULTPENDED_Msk       (1UL << SCB_SHCSR_USGFAULTPENDED_Pos)          /*!< SCB SHCSR: USGFAULTPENDED Mask */
+
+#define SCB_SHCSR_SYSTICKACT_Pos           11U                                            /*!< SCB SHCSR: SYSTICKACT Position */
+#define SCB_SHCSR_SYSTICKACT_Msk           (1UL << SCB_SHCSR_SYSTICKACT_Pos)              /*!< SCB SHCSR: SYSTICKACT Mask */
+
+#define SCB_SHCSR_PENDSVACT_Pos            10U                                            /*!< SCB SHCSR: PENDSVACT Position */
+#define SCB_SHCSR_PENDSVACT_Msk            (1UL << SCB_SHCSR_PENDSVACT_Pos)               /*!< SCB SHCSR: PENDSVACT Mask */
+
+#define SCB_SHCSR_MONITORACT_Pos            8U                                            /*!< SCB SHCSR: MONITORACT Position */
+#define SCB_SHCSR_MONITORACT_Msk           (1UL << SCB_SHCSR_MONITORACT_Pos)              /*!< SCB SHCSR: MONITORACT Mask */
+
+#define SCB_SHCSR_SVCALLACT_Pos             7U                                            /*!< SCB SHCSR: SVCALLACT Position */
+#define SCB_SHCSR_SVCALLACT_Msk            (1UL << SCB_SHCSR_SVCALLACT_Pos)               /*!< SCB SHCSR: SVCALLACT Mask */
+
+#define SCB_SHCSR_NMIACT_Pos                5U                                            /*!< SCB SHCSR: NMIACT Position */
+#define SCB_SHCSR_NMIACT_Msk               (1UL << SCB_SHCSR_NMIACT_Pos)                  /*!< SCB SHCSR: NMIACT Mask */
+
+#define SCB_SHCSR_SECUREFAULTACT_Pos        4U                                            /*!< SCB SHCSR: SECUREFAULTACT Position */
+#define SCB_SHCSR_SECUREFAULTACT_Msk       (1UL << SCB_SHCSR_SECUREFAULTACT_Pos)          /*!< SCB SHCSR: SECUREFAULTACT Mask */
+
+#define SCB_SHCSR_USGFAULTACT_Pos           3U                                            /*!< SCB SHCSR: USGFAULTACT Position */
+#define SCB_SHCSR_USGFAULTACT_Msk          (1UL << SCB_SHCSR_USGFAULTACT_Pos)             /*!< SCB SHCSR: USGFAULTACT Mask */
+
+#define SCB_SHCSR_HARDFAULTACT_Pos          2U                                            /*!< SCB SHCSR: HARDFAULTACT Position */
+#define SCB_SHCSR_HARDFAULTACT_Msk         (1UL << SCB_SHCSR_HARDFAULTACT_Pos)            /*!< SCB SHCSR: HARDFAULTACT Mask */
+
+#define SCB_SHCSR_BUSFAULTACT_Pos           1U                                            /*!< SCB SHCSR: BUSFAULTACT Position */
+#define SCB_SHCSR_BUSFAULTACT_Msk          (1UL << SCB_SHCSR_BUSFAULTACT_Pos)             /*!< SCB SHCSR: BUSFAULTACT Mask */
+
+#define SCB_SHCSR_MEMFAULTACT_Pos           0U                                            /*!< SCB SHCSR: MEMFAULTACT Position */
+#define SCB_SHCSR_MEMFAULTACT_Msk          (1UL /*<< SCB_SHCSR_MEMFAULTACT_Pos*/)         /*!< SCB SHCSR: MEMFAULTACT Mask */
+
+/* SCB Configurable Fault Status Register Definitions */
+#define SCB_CFSR_USGFAULTSR_Pos            16U                                            /*!< SCB CFSR: Usage Fault Status Register Position */
+#define SCB_CFSR_USGFAULTSR_Msk            (0xFFFFUL << SCB_CFSR_USGFAULTSR_Pos)          /*!< SCB CFSR: Usage Fault Status Register Mask */
+
+#define SCB_CFSR_BUSFAULTSR_Pos             8U                                            /*!< SCB CFSR: Bus Fault Status Register Position */
+#define SCB_CFSR_BUSFAULTSR_Msk            (0xFFUL << SCB_CFSR_BUSFAULTSR_Pos)            /*!< SCB CFSR: Bus Fault Status Register Mask */
+
+#define SCB_CFSR_MEMFAULTSR_Pos             0U                                            /*!< SCB CFSR: Memory Manage Fault Status Register Position */
+#define SCB_CFSR_MEMFAULTSR_Msk            (0xFFUL /*<< SCB_CFSR_MEMFAULTSR_Pos*/)        /*!< SCB CFSR: Memory Manage Fault Status Register Mask */
+
+/* MemManage Fault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_MMARVALID_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 7U)                 /*!< SCB CFSR (MMFSR): MMARVALID Position */
+#define SCB_CFSR_MMARVALID_Msk             (1UL << SCB_CFSR_MMARVALID_Pos)                /*!< SCB CFSR (MMFSR): MMARVALID Mask */
+
+#define SCB_CFSR_MLSPERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 5U)                 /*!< SCB CFSR (MMFSR): MLSPERR Position */
+#define SCB_CFSR_MLSPERR_Msk               (1UL << SCB_CFSR_MLSPERR_Pos)                  /*!< SCB CFSR (MMFSR): MLSPERR Mask */
+
+#define SCB_CFSR_MSTKERR_Pos               (SCB_CFSR_MEMFAULTSR_Pos + 4U)                 /*!< SCB CFSR (MMFSR): MSTKERR Position */
+#define SCB_CFSR_MSTKERR_Msk               (1UL << SCB_CFSR_MSTKERR_Pos)                  /*!< SCB CFSR (MMFSR): MSTKERR Mask */
+
+#define SCB_CFSR_MUNSTKERR_Pos             (SCB_CFSR_MEMFAULTSR_Pos + 3U)                 /*!< SCB CFSR (MMFSR): MUNSTKERR Position */
+#define SCB_CFSR_MUNSTKERR_Msk             (1UL << SCB_CFSR_MUNSTKERR_Pos)                /*!< SCB CFSR (MMFSR): MUNSTKERR Mask */
+
+#define SCB_CFSR_DACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 1U)                 /*!< SCB CFSR (MMFSR): DACCVIOL Position */
+#define SCB_CFSR_DACCVIOL_Msk              (1UL << SCB_CFSR_DACCVIOL_Pos)                 /*!< SCB CFSR (MMFSR): DACCVIOL Mask */
+
+#define SCB_CFSR_IACCVIOL_Pos              (SCB_CFSR_MEMFAULTSR_Pos + 0U)                 /*!< SCB CFSR (MMFSR): IACCVIOL Position */
+#define SCB_CFSR_IACCVIOL_Msk              (1UL /*<< SCB_CFSR_IACCVIOL_Pos*/)             /*!< SCB CFSR (MMFSR): IACCVIOL Mask */
+
+/* BusFault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_BFARVALID_Pos            (SCB_CFSR_BUSFAULTSR_Pos + 7U)                  /*!< SCB CFSR (BFSR): BFARVALID Position */
+#define SCB_CFSR_BFARVALID_Msk            (1UL << SCB_CFSR_BFARVALID_Pos)                 /*!< SCB CFSR (BFSR): BFARVALID Mask */
+
+#define SCB_CFSR_LSPERR_Pos               (SCB_CFSR_BUSFAULTSR_Pos + 5U)                  /*!< SCB CFSR (BFSR): LSPERR Position */
+#define SCB_CFSR_LSPERR_Msk               (1UL << SCB_CFSR_LSPERR_Pos)                    /*!< SCB CFSR (BFSR): LSPERR Mask */
+
+#define SCB_CFSR_STKERR_Pos               (SCB_CFSR_BUSFAULTSR_Pos + 4U)                  /*!< SCB CFSR (BFSR): STKERR Position */
+#define SCB_CFSR_STKERR_Msk               (1UL << SCB_CFSR_STKERR_Pos)                    /*!< SCB CFSR (BFSR): STKERR Mask */
+
+#define SCB_CFSR_UNSTKERR_Pos             (SCB_CFSR_BUSFAULTSR_Pos + 3U)                  /*!< SCB CFSR (BFSR): UNSTKERR Position */
+#define SCB_CFSR_UNSTKERR_Msk             (1UL << SCB_CFSR_UNSTKERR_Pos)                  /*!< SCB CFSR (BFSR): UNSTKERR Mask */
+
+#define SCB_CFSR_IMPRECISERR_Pos          (SCB_CFSR_BUSFAULTSR_Pos + 2U)                  /*!< SCB CFSR (BFSR): IMPRECISERR Position */
+#define SCB_CFSR_IMPRECISERR_Msk          (1UL << SCB_CFSR_IMPRECISERR_Pos)               /*!< SCB CFSR (BFSR): IMPRECISERR Mask */
+
+#define SCB_CFSR_PRECISERR_Pos            (SCB_CFSR_BUSFAULTSR_Pos + 1U)                  /*!< SCB CFSR (BFSR): PRECISERR Position */
+#define SCB_CFSR_PRECISERR_Msk            (1UL << SCB_CFSR_PRECISERR_Pos)                 /*!< SCB CFSR (BFSR): PRECISERR Mask */
+
+#define SCB_CFSR_IBUSERR_Pos              (SCB_CFSR_BUSFAULTSR_Pos + 0U)                  /*!< SCB CFSR (BFSR): IBUSERR Position */
+#define SCB_CFSR_IBUSERR_Msk              (1UL << SCB_CFSR_IBUSERR_Pos)                   /*!< SCB CFSR (BFSR): IBUSERR Mask */
+
+/* UsageFault Status Register (part of SCB Configurable Fault Status Register) */
+#define SCB_CFSR_DIVBYZERO_Pos            (SCB_CFSR_USGFAULTSR_Pos + 9U)                  /*!< SCB CFSR (UFSR): DIVBYZERO Position */
+#define SCB_CFSR_DIVBYZERO_Msk            (1UL << SCB_CFSR_DIVBYZERO_Pos)                 /*!< SCB CFSR (UFSR): DIVBYZERO Mask */
+
+#define SCB_CFSR_UNALIGNED_Pos            (SCB_CFSR_USGFAULTSR_Pos + 8U)                  /*!< SCB CFSR (UFSR): UNALIGNED Position */
+#define SCB_CFSR_UNALIGNED_Msk            (1UL << SCB_CFSR_UNALIGNED_Pos)                 /*!< SCB CFSR (UFSR): UNALIGNED Mask */
+
+#define SCB_CFSR_STKOF_Pos                (SCB_CFSR_USGFAULTSR_Pos + 4U)                  /*!< SCB CFSR (UFSR): STKOF Position */
+#define SCB_CFSR_STKOF_Msk                (1UL << SCB_CFSR_STKOF_Pos)                     /*!< SCB CFSR (UFSR): STKOF Mask */
+
+#define SCB_CFSR_NOCP_Pos                 (SCB_CFSR_USGFAULTSR_Pos + 3U)                  /*!< SCB CFSR (UFSR): NOCP Position */
+#define SCB_CFSR_NOCP_Msk                 (1UL << SCB_CFSR_NOCP_Pos)                      /*!< SCB CFSR (UFSR): NOCP Mask */
+
+#define SCB_CFSR_INVPC_Pos                (SCB_CFSR_USGFAULTSR_Pos + 2U)                  /*!< SCB CFSR (UFSR): INVPC Position */
+#define SCB_CFSR_INVPC_Msk                (1UL << SCB_CFSR_INVPC_Pos)                     /*!< SCB CFSR (UFSR): INVPC Mask */
+
+#define SCB_CFSR_INVSTATE_Pos             (SCB_CFSR_USGFAULTSR_Pos + 1U)                  /*!< SCB CFSR (UFSR): INVSTATE Position */
+#define SCB_CFSR_INVSTATE_Msk             (1UL << SCB_CFSR_INVSTATE_Pos)                  /*!< SCB CFSR (UFSR): INVSTATE Mask */
+
+#define SCB_CFSR_UNDEFINSTR_Pos           (SCB_CFSR_USGFAULTSR_Pos + 0U)                  /*!< SCB CFSR (UFSR): UNDEFINSTR Position */
+#define SCB_CFSR_UNDEFINSTR_Msk           (1UL << SCB_CFSR_UNDEFINSTR_Pos)                /*!< SCB CFSR (UFSR): UNDEFINSTR Mask */
+
+/* SCB Hard Fault Status Register Definitions */
+#define SCB_HFSR_DEBUGEVT_Pos              31U                                            /*!< SCB HFSR: DEBUGEVT Position */
+#define SCB_HFSR_DEBUGEVT_Msk              (1UL << SCB_HFSR_DEBUGEVT_Pos)                 /*!< SCB HFSR: DEBUGEVT Mask */
+
+#define SCB_HFSR_FORCED_Pos                30U                                            /*!< SCB HFSR: FORCED Position */
+#define SCB_HFSR_FORCED_Msk                (1UL << SCB_HFSR_FORCED_Pos)                   /*!< SCB HFSR: FORCED Mask */
+
+#define SCB_HFSR_VECTTBL_Pos                1U                                            /*!< SCB HFSR: VECTTBL Position */
+#define SCB_HFSR_VECTTBL_Msk               (1UL << SCB_HFSR_VECTTBL_Pos)                  /*!< SCB HFSR: VECTTBL Mask */
+
+/* SCB Debug Fault Status Register Definitions */
+#define SCB_DFSR_EXTERNAL_Pos               4U                                            /*!< SCB DFSR: EXTERNAL Position */
+#define SCB_DFSR_EXTERNAL_Msk              (1UL << SCB_DFSR_EXTERNAL_Pos)                 /*!< SCB DFSR: EXTERNAL Mask */
+
+#define SCB_DFSR_VCATCH_Pos                 3U                                            /*!< SCB DFSR: VCATCH Position */
+#define SCB_DFSR_VCATCH_Msk                (1UL << SCB_DFSR_VCATCH_Pos)                   /*!< SCB DFSR: VCATCH Mask */
+
+#define SCB_DFSR_DWTTRAP_Pos                2U                                            /*!< SCB DFSR: DWTTRAP Position */
+#define SCB_DFSR_DWTTRAP_Msk               (1UL << SCB_DFSR_DWTTRAP_Pos)                  /*!< SCB DFSR: DWTTRAP Mask */
+
+#define SCB_DFSR_BKPT_Pos                   1U                                            /*!< SCB DFSR: BKPT Position */
+#define SCB_DFSR_BKPT_Msk                  (1UL << SCB_DFSR_BKPT_Pos)                     /*!< SCB DFSR: BKPT Mask */
+
+#define SCB_DFSR_HALTED_Pos                 0U                                            /*!< SCB DFSR: HALTED Position */
+#define SCB_DFSR_HALTED_Msk                (1UL /*<< SCB_DFSR_HALTED_Pos*/)               /*!< SCB DFSR: HALTED Mask */
+
+/* SCB Non-Secure Access Control Register Definitions */
+#define SCB_NSACR_CP11_Pos                 11U                                            /*!< SCB NSACR: CP11 Position */
+#define SCB_NSACR_CP11_Msk                 (1UL << SCB_NSACR_CP11_Pos)                    /*!< SCB NSACR: CP11 Mask */
+
+#define SCB_NSACR_CP10_Pos                 10U                                            /*!< SCB NSACR: CP10 Position */
+#define SCB_NSACR_CP10_Msk                 (1UL << SCB_NSACR_CP10_Pos)                    /*!< SCB NSACR: CP10 Mask */
+
+#define SCB_NSACR_CPn_Pos                   0U                                            /*!< SCB NSACR: CPn Position */
+#define SCB_NSACR_CPn_Msk                  (1UL /*<< SCB_NSACR_CPn_Pos*/)                 /*!< SCB NSACR: CPn Mask */
+
+/* SCB Cache Level ID Register Definitions */
+#define SCB_CLIDR_LOUU_Pos                 27U                                            /*!< SCB CLIDR: LoUU Position */
+#define SCB_CLIDR_LOUU_Msk                 (7UL << SCB_CLIDR_LOUU_Pos)                    /*!< SCB CLIDR: LoUU Mask */
+
+#define SCB_CLIDR_LOC_Pos                  24U                                            /*!< SCB CLIDR: LoC Position */
+#define SCB_CLIDR_LOC_Msk                  (7UL << SCB_CLIDR_LOC_Pos)                     /*!< SCB CLIDR: LoC Mask */
+
+#define SCB_CLIDR_IC_Pos                   0U                                             /*!< SCB CLIDR: IC Position */
+#define SCB_CLIDR_IC_Msk                   (1UL << SCB_CLIDR_IC_Pos)                      /*!< SCB CLIDR: IC Mask */
+
+#define SCB_CLIDR_DC_Pos                   1U                                             /*!< SCB CLIDR: DC Position */
+#define SCB_CLIDR_DC_Msk                   (1UL << SCB_CLIDR_DC_Pos)                      /*!< SCB CLIDR: DC Mask */
+
+
+
+/* SCB Cache Type Register Definitions */
+#define SCB_CTR_FORMAT_Pos                 29U                                            /*!< SCB CTR: Format Position */
+#define SCB_CTR_FORMAT_Msk                 (7UL << SCB_CTR_FORMAT_Pos)                    /*!< SCB CTR: Format Mask */
+
+#define SCB_CTR_CWG_Pos                    24U                                            /*!< SCB CTR: CWG Position */
+#define SCB_CTR_CWG_Msk                    (0xFUL << SCB_CTR_CWG_Pos)                     /*!< SCB CTR: CWG Mask */
+
+#define SCB_CTR_ERG_Pos                    20U                                            /*!< SCB CTR: ERG Position */
+#define SCB_CTR_ERG_Msk                    (0xFUL << SCB_CTR_ERG_Pos)                     /*!< SCB CTR: ERG Mask */
+
+#define SCB_CTR_DMINLINE_Pos               16U                                            /*!< SCB CTR: DminLine Position */
+#define SCB_CTR_DMINLINE_Msk               (0xFUL << SCB_CTR_DMINLINE_Pos)                /*!< SCB CTR: DminLine Mask */
+
+#define SCB_CTR_IMINLINE_Pos                0U                                            /*!< SCB CTR: ImInLine Position */
+#define SCB_CTR_IMINLINE_Msk               (0xFUL /*<< SCB_CTR_IMINLINE_Pos*/)            /*!< SCB CTR: ImInLine Mask */
+
+/* SCB Cache Size ID Register Definitions */
+#define SCB_CCSIDR_WT_Pos                  31U                                            /*!< SCB CCSIDR: WT Position */
+#define SCB_CCSIDR_WT_Msk                  (1UL << SCB_CCSIDR_WT_Pos)                     /*!< SCB CCSIDR: WT Mask */
+
+#define SCB_CCSIDR_WB_Pos                  30U                                            /*!< SCB CCSIDR: WB Position */
+#define SCB_CCSIDR_WB_Msk                  (1UL << SCB_CCSIDR_WB_Pos)                     /*!< SCB CCSIDR: WB Mask */
+
+#define SCB_CCSIDR_RA_Pos                  29U                                            /*!< SCB CCSIDR: RA Position */
+#define SCB_CCSIDR_RA_Msk                  (1UL << SCB_CCSIDR_RA_Pos)                     /*!< SCB CCSIDR: RA Mask */
+
+#define SCB_CCSIDR_WA_Pos                  28U                                            /*!< SCB CCSIDR: WA Position */
+#define SCB_CCSIDR_WA_Msk                  (1UL << SCB_CCSIDR_WA_Pos)                     /*!< SCB CCSIDR: WA Mask */
+
+#define SCB_CCSIDR_NUMSETS_Pos             13U                                            /*!< SCB CCSIDR: NumSets Position */
+#define SCB_CCSIDR_NUMSETS_Msk             (0x7FFFUL << SCB_CCSIDR_NUMSETS_Pos)           /*!< SCB CCSIDR: NumSets Mask */
+
+#define SCB_CCSIDR_ASSOCIATIVITY_Pos        3U                                            /*!< SCB CCSIDR: Associativity Position */
+#define SCB_CCSIDR_ASSOCIATIVITY_Msk       (0x3FFUL << SCB_CCSIDR_ASSOCIATIVITY_Pos)      /*!< SCB CCSIDR: Associativity Mask */
+
+#define SCB_CCSIDR_LINESIZE_Pos             0U                                            /*!< SCB CCSIDR: LineSize Position */
+#define SCB_CCSIDR_LINESIZE_Msk            (7UL /*<< SCB_CCSIDR_LINESIZE_Pos*/)           /*!< SCB CCSIDR: LineSize Mask */
+
+/* SCB Cache Size Selection Register Definitions */
+#define SCB_CSSELR_LEVEL_Pos                1U                                            /*!< SCB CSSELR: Level Position */
+#define SCB_CSSELR_LEVEL_Msk               (7UL << SCB_CSSELR_LEVEL_Pos)                  /*!< SCB CSSELR: Level Mask */
+
+#define SCB_CSSELR_IND_Pos                  0U                                            /*!< SCB CSSELR: InD Position */
+#define SCB_CSSELR_IND_Msk                 (1UL /*<< SCB_CSSELR_IND_Pos*/)                /*!< SCB CSSELR: InD Mask */
+
+/* SCB Software Triggered Interrupt Register Definitions */
+#define SCB_STIR_INTID_Pos                  0U                                            /*!< SCB STIR: INTID Position */
+#define SCB_STIR_INTID_Msk                 (0x1FFUL /*<< SCB_STIR_INTID_Pos*/)            /*!< SCB STIR: INTID Mask */
+
+/* SCB D-Cache line Invalidate by Set-way Register Definitions */
+#define SCB_DCISW_LEVEL_Pos                1U                                             /*!< SCB DCISW: Level Position */
+#define SCB_DCISW_LEVEL_Msk                (7UL << SCB_DCISW_LEVEL_Pos)                   /*!< SCB DCISW: Level Mask */
+
+#define SCB_DCISW_WAY_Pos                  30U                                            /*!< SCB DCISW: Way Position */
+#define SCB_DCISW_WAY_Msk                  (3UL << SCB_DCISW_WAY_Pos)                     /*!< SCB DCISW: Way Mask */
+
+#define SCB_DCISW_SET_Pos                   5U                                            /*!< SCB DCISW: Set Position */
+#define SCB_DCISW_SET_Msk                  (0xFFUL << SCB_DCISW_SET_Pos)                 /*!< SCB DCISW: Set Mask */
+
+/* SCB D-Cache Clean line by Set-way Register Definitions */
+#define SCB_DCCSW_LEVEL_Pos                1U                                             /*!< SCB DCCSW: Level Position */
+#define SCB_DCCSW_LEVEL_Msk                (7UL << SCB_DCCSW_LEVEL_Pos)                   /*!< SCB DCCSW: Level Mask */
+
+#define SCB_DCCSW_WAY_Pos                  30U                                            /*!< SCB DCCSW: Way Position */
+#define SCB_DCCSW_WAY_Msk                  (3UL << SCB_DCCSW_WAY_Pos)                     /*!< SCB DCCSW: Way Mask */
+
+#define SCB_DCCSW_SET_Pos                   5U                                            /*!< SCB DCCSW: Set Position */
+#define SCB_DCCSW_SET_Msk                  (0xFFUL << SCB_DCCSW_SET_Pos)                 /*!< SCB DCCSW: Set Mask */
+
+/* SCB D-Cache Clean and Invalidate by Set-way Register Definitions */
+#define SCB_DCCISW_LEVEL_Pos               1U                                             /*!< SCB DCCISW: Level Position */
+#define SCB_DCCISW_LEVEL_Msk               (7UL << SCB_DCCISW_LEVEL_Pos)                  /*!< SCB DCCISW: Level Mask */
+
+#define SCB_DCCISW_WAY_Pos                 30U                                            /*!< SCB DCCISW: Way Position */
+#define SCB_DCCISW_WAY_Msk                 (3UL << SCB_DCCISW_WAY_Pos)                    /*!< SCB DCCISW: Way Mask */
+
+#define SCB_DCCISW_SET_Pos                  5U                                            /*!< SCB DCCISW: Set Position */
+#define SCB_DCCISW_SET_Msk                 (0xFFUL << SCB_DCCISW_SET_Pos)                /*!< SCB DCCISW: Set Mask */
+
+/* ArmChina: Implementation Defined */
+/* Instruction Tightly-Coupled Memory Control Register Definitions */
+#define SCB_ITCMCR_SZ_Pos                   3U                                            /*!< SCB ITCMCR: SZ Position */
+#define SCB_ITCMCR_SZ_Msk                  (0xFUL << SCB_ITCMCR_SZ_Pos)                   /*!< SCB ITCMCR: SZ Mask */
+
+#define SCB_ITCMCR_EN_Pos                   0U                                            /*!< SCB ITCMCR: EN Position */
+#define SCB_ITCMCR_EN_Msk                  (1UL /*<< SCB_ITCMCR_EN_Pos*/)                 /*!< SCB ITCMCR: EN Mask */
+
+/* Data Tightly-Coupled Memory Control Register Definitions */
+#define SCB_DTCMCR_SZ_Pos                   3U                                            /*!< SCB DTCMCR: SZ Position */
+#define SCB_DTCMCR_SZ_Msk                  (0xFUL << SCB_DTCMCR_SZ_Pos)                   /*!< SCB DTCMCR: SZ Mask */
+
+#define SCB_DTCMCR_EN_Pos                   0U                                            /*!< SCB DTCMCR: EN Position */
+#define SCB_DTCMCR_EN_Msk                  (1UL /*<< SCB_DTCMCR_EN_Pos*/)                 /*!< SCB DTCMCR: EN Mask */
+
+/* L1 Cache Control Register Definitions */
+#define SCB_CACR_DCCLEAN_Pos                16U                                            /*!< SCB CACR: DCCLEAN Position */
+#define SCB_CACR_DCCLEAN_Msk               (1UL << SCB_CACR_FORCEWT_Pos)                  /*!< SCB CACR: DCCLEAN Mask */
+
+#define SCB_CACR_ICACTIVE_Pos                13U                                            /*!< SCB CACR: ICACTIVE Position */
+#define SCB_CACR_ICACTIVE_Msk               (1UL << SCB_CACR_FORCEWT_Pos)                  /*!< SCB CACR: ICACTIVE Mask */
+
+#define SCB_CACR_DCACTIVE_Pos                12U                                            /*!< SCB CACR: DCACTIVE Position */
+#define SCB_CACR_DCACTIVE_Msk               (1UL << SCB_CACR_FORCEWT_Pos)                  /*!< SCB CACR: DCACTIVE Mask */
+
+#define SCB_CACR_FORCEWT_Pos                2U                                            /*!< SCB CACR: FORCEWT Position */
+#define SCB_CACR_FORCEWT_Msk               (1UL << SCB_CACR_FORCEWT_Pos)                  /*!< SCB CACR: FORCEWT Mask */
+
+/*@} end of group CMSIS_SCB */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SCnSCB System Controls not in SCB (SCnSCB)
+  \brief    Type definitions for the System Control and ID Register not in the SCB
+  @{
+ */
+
+/**
+  \brief  Structure type to access the System Control and ID Register not in the SCB.
+ */
+typedef struct
+{
+        uint32_t RESERVED0[1U];
+  __IM  uint32_t ICTR;                   /*!< Offset: 0x004 (R/ )  Interrupt Controller Type Register */
+  __IOM uint32_t ACTLR;                  /*!< Offset: 0x008 (R/W)  Auxiliary Control Register */
+  __IOM uint32_t CPPWR;                  /*!< Offset: 0x00C (R/W)  Coprocessor Power Control  Register */
+} SCnSCB_Type;
+
+/* Interrupt Controller Type Register Definitions */
+#define SCnSCB_ICTR_INTLINESNUM_Pos         0U                                         /*!< ICTR: INTLINESNUM Position */
+#define SCnSCB_ICTR_INTLINESNUM_Msk        (0xFUL /*<< SCnSCB_ICTR_INTLINESNUM_Pos*/)  /*!< ICTR: INTLINESNUM Mask */
+
+/*@} end of group CMSIS_SCnotSCB */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SysTick     System Tick Timer (SysTick)
+  \brief    Type definitions for the System Timer Registers.
+  @{
+ */
+
+/**
+  \brief  Structure type to access the System Timer (SysTick).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SysTick Control and Status Register */
+  __IOM uint32_t LOAD;                   /*!< Offset: 0x004 (R/W)  SysTick Reload Value Register */
+  __IOM uint32_t VAL;                    /*!< Offset: 0x008 (R/W)  SysTick Current Value Register */
+  __IM  uint32_t CALIB;                  /*!< Offset: 0x00C (R/ )  SysTick Calibration Register */
+} SysTick_Type;
+
+/* SysTick Control / Status Register Definitions */
+#define SysTick_CTRL_COUNTFLAG_Pos         16U                                            /*!< SysTick CTRL: COUNTFLAG Position */
+#define SysTick_CTRL_COUNTFLAG_Msk         (1UL << SysTick_CTRL_COUNTFLAG_Pos)            /*!< SysTick CTRL: COUNTFLAG Mask */
+
+#define SysTick_CTRL_CLKSOURCE_Pos          2U                                            /*!< SysTick CTRL: CLKSOURCE Position */
+#define SysTick_CTRL_CLKSOURCE_Msk         (1UL << SysTick_CTRL_CLKSOURCE_Pos)            /*!< SysTick CTRL: CLKSOURCE Mask */
+
+#define SysTick_CTRL_TICKINT_Pos            1U                                            /*!< SysTick CTRL: TICKINT Position */
+#define SysTick_CTRL_TICKINT_Msk           (1UL << SysTick_CTRL_TICKINT_Pos)              /*!< SysTick CTRL: TICKINT Mask */
+
+#define SysTick_CTRL_ENABLE_Pos             0U                                            /*!< SysTick CTRL: ENABLE Position */
+#define SysTick_CTRL_ENABLE_Msk            (1UL /*<< SysTick_CTRL_ENABLE_Pos*/)           /*!< SysTick CTRL: ENABLE Mask */
+
+/* SysTick Reload Register Definitions */
+#define SysTick_LOAD_RELOAD_Pos             0U                                            /*!< SysTick LOAD: RELOAD Position */
+#define SysTick_LOAD_RELOAD_Msk            (0xFFFFFFUL /*<< SysTick_LOAD_RELOAD_Pos*/)    /*!< SysTick LOAD: RELOAD Mask */
+
+/* SysTick Current Register Definitions */
+#define SysTick_VAL_CURRENT_Pos             0U                                            /*!< SysTick VAL: CURRENT Position */
+#define SysTick_VAL_CURRENT_Msk            (0xFFFFFFUL /*<< SysTick_VAL_CURRENT_Pos*/)    /*!< SysTick VAL: CURRENT Mask */
+
+/* SysTick Calibration Register Definitions */
+#define SysTick_CALIB_NOREF_Pos            31U                                            /*!< SysTick CALIB: NOREF Position */
+#define SysTick_CALIB_NOREF_Msk            (1UL << SysTick_CALIB_NOREF_Pos)               /*!< SysTick CALIB: NOREF Mask */
+
+#define SysTick_CALIB_SKEW_Pos             30U                                            /*!< SysTick CALIB: SKEW Position */
+#define SysTick_CALIB_SKEW_Msk             (1UL << SysTick_CALIB_SKEW_Pos)                /*!< SysTick CALIB: SKEW Mask */
+
+#define SysTick_CALIB_TENMS_Pos             0U                                            /*!< SysTick CALIB: TENMS Position */
+#define SysTick_CALIB_TENMS_Msk            (0xFFFFFFUL /*<< SysTick_CALIB_TENMS_Pos*/)    /*!< SysTick CALIB: TENMS Mask */
+
+/*@} end of group CMSIS_SysTick */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_ITM     Instrumentation Trace Macrocell (ITM)
+  \brief    Type definitions for the Instrumentation Trace Macrocell (ITM)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Instrumentation Trace Macrocell Register (ITM).
+ */
+typedef struct
+{
+  __OM  union
+  {
+    __OM  uint8_t    u8;                 /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 8-bit */
+    __OM  uint16_t   u16;                /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 16-bit */
+    __OM  uint32_t   u32;                /*!< Offset: 0x000 ( /W)  ITM Stimulus Port 32-bit */
+  }  PORT [32U];                         /*!< Offset: 0x000 ( /W)  ITM Stimulus Port Registers */
+        uint32_t RESERVED0[864U];
+  __IOM uint32_t TER;                    /*!< Offset: 0xE00 (R/W)  ITM Trace Enable Register */
+        uint32_t RESERVED1[15U];
+  __IOM uint32_t TPR;                    /*!< Offset: 0xE40 (R/W)  ITM Trace Privilege Register */
+        uint32_t RESERVED2[15U];
+  __IOM uint32_t TCR;                    /*!< Offset: 0xE80 (R/W)  ITM Trace Control Register */
+        uint32_t RESERVED3[32U];
+        uint32_t RESERVED4[43U];
+  __OM  uint32_t LAR;                    /*!< Offset: 0xFB0 ( /W)  ITM Lock Access Register */
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R/ )  ITM Lock Status Register */
+        uint32_t RESERVED5[1U];
+  __IM  uint32_t DEVARCH;                /*!< Offset: 0xFBC (R/ )  ITM Device Architecture Register */
+        uint32_t RESERVED6[4U];
+  __IM  uint32_t PID4;                   /*!< Offset: 0xFD0 (R/ )  ITM Peripheral Identification Register #4 */
+  __IM  uint32_t PID5;                   /*!< Offset: 0xFD4 (R/ )  ITM Peripheral Identification Register #5 */
+  __IM  uint32_t PID6;                   /*!< Offset: 0xFD8 (R/ )  ITM Peripheral Identification Register #6 */
+  __IM  uint32_t PID7;                   /*!< Offset: 0xFDC (R/ )  ITM Peripheral Identification Register #7 */
+  __IM  uint32_t PID0;                   /*!< Offset: 0xFE0 (R/ )  ITM Peripheral Identification Register #0 */
+  __IM  uint32_t PID1;                   /*!< Offset: 0xFE4 (R/ )  ITM Peripheral Identification Register #1 */
+  __IM  uint32_t PID2;                   /*!< Offset: 0xFE8 (R/ )  ITM Peripheral Identification Register #2 */
+  __IM  uint32_t PID3;                   /*!< Offset: 0xFEC (R/ )  ITM Peripheral Identification Register #3 */
+  __IM  uint32_t CID0;                   /*!< Offset: 0xFF0 (R/ )  ITM Component  Identification Register #0 */
+  __IM  uint32_t CID1;                   /*!< Offset: 0xFF4 (R/ )  ITM Component  Identification Register #1 */
+  __IM  uint32_t CID2;                   /*!< Offset: 0xFF8 (R/ )  ITM Component  Identification Register #2 */
+  __IM  uint32_t CID3;                   /*!< Offset: 0xFFC (R/ )  ITM Component  Identification Register #3 */
+} ITM_Type;
+
+/* ITM Stimulus Port Register Definitions */
+#define ITM_STIM_DISABLED_Pos               1U                                            /*!< ITM STIM: DISABLED Position */
+#define ITM_STIM_DISABLED_Msk              (0x1UL << ITM_STIM_DISABLED_Pos)               /*!< ITM STIM: DISABLED Mask */
+
+#define ITM_STIM_FIFOREADY_Pos              0U                                            /*!< ITM STIM: FIFOREADY Position */
+#define ITM_STIM_FIFOREADY_Msk             (0x1UL /*<< ITM_STIM_FIFOREADY_Pos*/)          /*!< ITM STIM: FIFOREADY Mask */
+
+/* ITM Trace Privilege Register Definitions */
+#define ITM_TPR_PRIVMASK_Pos                0U                                            /*!< ITM TPR: PRIVMASK Position */
+#define ITM_TPR_PRIVMASK_Msk               (0xFFFFFFFFUL /*<< ITM_TPR_PRIVMASK_Pos*/)     /*!< ITM TPR: PRIVMASK Mask */
+
+/* ITM Trace Control Register Definitions */
+#define ITM_TCR_BUSY_Pos                   23U                                            /*!< ITM TCR: BUSY Position */
+#define ITM_TCR_BUSY_Msk                   (1UL << ITM_TCR_BUSY_Pos)                      /*!< ITM TCR: BUSY Mask */
+
+#define ITM_TCR_TRACEBUSID_Pos             16U                                            /*!< ITM TCR: ATBID Position */
+#define ITM_TCR_TRACEBUSID_Msk             (0x7FUL << ITM_TCR_TRACEBUSID_Pos)             /*!< ITM TCR: ATBID Mask */
+
+#define ITM_TCR_GTSFREQ_Pos                10U                                            /*!< ITM TCR: Global timestamp frequency Position */
+#define ITM_TCR_GTSFREQ_Msk                (3UL << ITM_TCR_GTSFREQ_Pos)                   /*!< ITM TCR: Global timestamp frequency Mask */
+
+#define ITM_TCR_TSPRESCALE_Pos              8U                                            /*!< ITM TCR: TSPRESCALE Position */
+#define ITM_TCR_TSPRESCALE_Msk             (3UL << ITM_TCR_TSPRESCALE_Pos)                /*!< ITM TCR: TSPRESCALE Mask */
+
+#define ITM_TCR_STALLENA_Pos                5U                                            /*!< ITM TCR: STALLENA Position */
+#define ITM_TCR_STALLENA_Msk               (1UL << ITM_TCR_STALLENA_Pos)                  /*!< ITM TCR: STALLENA Mask */
+
+#define ITM_TCR_SWOENA_Pos                  4U                                            /*!< ITM TCR: SWOENA Position */
+#define ITM_TCR_SWOENA_Msk                 (1UL << ITM_TCR_SWOENA_Pos)                    /*!< ITM TCR: SWOENA Mask */
+
+#define ITM_TCR_DWTENA_Pos                  3U                                            /*!< ITM TCR: DWTENA Position */
+#define ITM_TCR_DWTENA_Msk                 (1UL << ITM_TCR_DWTENA_Pos)                    /*!< ITM TCR: DWTENA Mask */
+
+#define ITM_TCR_SYNCENA_Pos                 2U                                            /*!< ITM TCR: SYNCENA Position */
+#define ITM_TCR_SYNCENA_Msk                (1UL << ITM_TCR_SYNCENA_Pos)                   /*!< ITM TCR: SYNCENA Mask */
+
+#define ITM_TCR_TSENA_Pos                   1U                                            /*!< ITM TCR: TSENA Position */
+#define ITM_TCR_TSENA_Msk                  (1UL << ITM_TCR_TSENA_Pos)                     /*!< ITM TCR: TSENA Mask */
+
+#define ITM_TCR_ITMENA_Pos                  0U                                            /*!< ITM TCR: ITM Enable bit Position */
+#define ITM_TCR_ITMENA_Msk                 (1UL /*<< ITM_TCR_ITMENA_Pos*/)                /*!< ITM TCR: ITM Enable bit Mask */
+
+/* ITM Lock Status Register Definitions */
+#define ITM_LSR_ByteAcc_Pos                 2U                                            /*!< ITM LSR: ByteAcc Position */
+#define ITM_LSR_ByteAcc_Msk                (1UL << ITM_LSR_ByteAcc_Pos)                   /*!< ITM LSR: ByteAcc Mask */
+
+#define ITM_LSR_Access_Pos                  1U                                            /*!< ITM LSR: Access Position */
+#define ITM_LSR_Access_Msk                 (1UL << ITM_LSR_Access_Pos)                    /*!< ITM LSR: Access Mask */
+
+#define ITM_LSR_Present_Pos                 0U                                            /*!< ITM LSR: Present Position */
+#define ITM_LSR_Present_Msk                (1UL /*<< ITM_LSR_Present_Pos*/)               /*!< ITM LSR: Present Mask */
+
+/*@}*/ /* end of group CMSIS_ITM */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DWT     Data Watchpoint and Trace (DWT)
+  \brief    Type definitions for the Data Watchpoint and Trace (DWT)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Data Watchpoint and Trace Register (DWT).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  Control Register */
+  __IOM uint32_t CYCCNT;                 /*!< Offset: 0x004 (R/W)  Cycle Count Register */
+  __IOM uint32_t CPICNT;                 /*!< Offset: 0x008 (R/W)  CPI Count Register */
+  __IOM uint32_t EXCCNT;                 /*!< Offset: 0x00C (R/W)  Exception Overhead Count Register */
+  __IOM uint32_t SLEEPCNT;               /*!< Offset: 0x010 (R/W)  Sleep Count Register */
+  __IOM uint32_t LSUCNT;                 /*!< Offset: 0x014 (R/W)  LSU Count Register */
+  __IOM uint32_t FOLDCNT;                /*!< Offset: 0x018 (R/W)  Folded-instruction Count Register */
+  __IM  uint32_t PCSR;                   /*!< Offset: 0x01C (R/ )  Program Counter Sample Register */
+  __IOM uint32_t COMP0;                  /*!< Offset: 0x020 (R/W)  Comparator Register 0 */
+        uint32_t RESERVED1[1U];
+  __IOM uint32_t FUNCTION0;              /*!< Offset: 0x028 (R/W)  Function Register 0 */
+        uint32_t RESERVED2[1U];
+  __IOM uint32_t COMP1;                  /*!< Offset: 0x030 (R/W)  Comparator Register 1 */
+        uint32_t RESERVED3[1U];
+  __IOM uint32_t FUNCTION1;              /*!< Offset: 0x038 (R/W)  Function Register 1 */
+        uint32_t RESERVED4[1U];
+  __IOM uint32_t COMP2;                  /*!< Offset: 0x040 (R/W)  Comparator Register 2 */
+        uint32_t RESERVED5[1U];
+  __IOM uint32_t FUNCTION2;              /*!< Offset: 0x048 (R/W)  Function Register 2 */
+        uint32_t RESERVED6[1U];
+  __IOM uint32_t COMP3;                  /*!< Offset: 0x050 (R/W)  Comparator Register 3 */
+        uint32_t RESERVED7[1U];
+  __IOM uint32_t FUNCTION3;              /*!< Offset: 0x058 (R/W)  Function Register 3 */
+        uint32_t RESERVED8[1U];
+  __IOM uint32_t COMP4;                  /*!< Offset: 0x060 (R/W)  Comparator Register 4 */
+        uint32_t RESERVED9[1U];
+  __IOM uint32_t FUNCTION4;              /*!< Offset: 0x068 (R/W)  Function Register 4 */
+        uint32_t RESERVED10[1U];
+  __IOM uint32_t COMP5;                  /*!< Offset: 0x070 (R/W)  Comparator Register 5 */
+        uint32_t RESERVED11[1U];
+  __IOM uint32_t FUNCTION5;              /*!< Offset: 0x078 (R/W)  Function Register 5 */
+        uint32_t RESERVED12[1U];
+  __IOM uint32_t COMP6;                  /*!< Offset: 0x080 (R/W)  Comparator Register 6 */
+        uint32_t RESERVED13[1U];
+  __IOM uint32_t FUNCTION6;              /*!< Offset: 0x088 (R/W)  Function Register 6 */
+        uint32_t RESERVED14[1U];
+  __IOM uint32_t COMP7;                  /*!< Offset: 0x090 (R/W)  Comparator Register 7 */
+        uint32_t RESERVED15[1U];
+  __IOM uint32_t FUNCTION7;              /*!< Offset: 0x098 (R/W)  Function Register 7 */
+        uint32_t RESERVED16[1U];
+  __IOM uint32_t COMP8;                  /*!< Offset: 0x0A0 (R/W)  Comparator Register 8 */
+        uint32_t RESERVED17[1U];
+  __IOM uint32_t FUNCTION8;              /*!< Offset: 0x0A8 (R/W)  Function Register 8 */
+        uint32_t RESERVED18[1U];
+  __IOM uint32_t COMP9;                  /*!< Offset: 0x0B0 (R/W)  Comparator Register 9 */
+        uint32_t RESERVED19[1U];
+  __IOM uint32_t FUNCTION9;              /*!< Offset: 0x0B8 (R/W)  Function Register 9 */
+        uint32_t RESERVED20[1U];
+  __IOM uint32_t COMP10;                 /*!< Offset: 0x0C0 (R/W)  Comparator Register 10 */
+        uint32_t RESERVED21[1U];
+  __IOM uint32_t FUNCTION10;             /*!< Offset: 0x0C8 (R/W)  Function Register 10 */
+        uint32_t RESERVED22[1U];
+  __IOM uint32_t COMP11;                 /*!< Offset: 0x0D0 (R/W)  Comparator Register 11 */
+        uint32_t RESERVED23[1U];
+  __IOM uint32_t FUNCTION11;             /*!< Offset: 0x0D8 (R/W)  Function Register 11 */
+        uint32_t RESERVED24[1U];
+  __IOM uint32_t COMP12;                 /*!< Offset: 0x0E0 (R/W)  Comparator Register 12 */
+        uint32_t RESERVED25[1U];
+  __IOM uint32_t FUNCTION12;             /*!< Offset: 0x0E8 (R/W)  Function Register 12 */
+        uint32_t RESERVED26[1U];
+  __IOM uint32_t COMP13;                 /*!< Offset: 0x0F0 (R/W)  Comparator Register 13 */
+        uint32_t RESERVED27[1U];
+  __IOM uint32_t FUNCTION13;             /*!< Offset: 0x0F8 (R/W)  Function Register 13 */
+        uint32_t RESERVED28[1U];
+  __IOM uint32_t COMP14;                 /*!< Offset: 0x100 (R/W)  Comparator Register 14 */
+        uint32_t RESERVED29[1U];
+  __IOM uint32_t FUNCTION14;             /*!< Offset: 0x108 (R/W)  Function Register 14 */
+        uint32_t RESERVED30[1U];
+  __IOM uint32_t COMP15;                 /*!< Offset: 0x110 (R/W)  Comparator Register 15 */
+        uint32_t RESERVED31[1U];
+  __IOM uint32_t FUNCTION15;             /*!< Offset: 0x118 (R/W)  Function Register 15 */
+        uint32_t RESERVED32[934U];
+  __IM  uint32_t LSR;                    /*!< Offset: 0xFB4 (R  )  Lock Status Register */
+        uint32_t RESERVED33[1U];
+  __IM  uint32_t DEVARCH;                /*!< Offset: 0xFBC (R/ )  Device Architecture Register */
+} DWT_Type;
+
+/* DWT Control Register Definitions */
+#define DWT_CTRL_NUMCOMP_Pos               28U                                         /*!< DWT CTRL: NUMCOMP Position */
+#define DWT_CTRL_NUMCOMP_Msk               (0xFUL << DWT_CTRL_NUMCOMP_Pos)             /*!< DWT CTRL: NUMCOMP Mask */
+
+#define DWT_CTRL_NOTRCPKT_Pos              27U                                         /*!< DWT CTRL: NOTRCPKT Position */
+#define DWT_CTRL_NOTRCPKT_Msk              (0x1UL << DWT_CTRL_NOTRCPKT_Pos)            /*!< DWT CTRL: NOTRCPKT Mask */
+
+#define DWT_CTRL_NOEXTTRIG_Pos             26U                                         /*!< DWT CTRL: NOEXTTRIG Position */
+#define DWT_CTRL_NOEXTTRIG_Msk             (0x1UL << DWT_CTRL_NOEXTTRIG_Pos)           /*!< DWT CTRL: NOEXTTRIG Mask */
+
+#define DWT_CTRL_NOCYCCNT_Pos              25U                                         /*!< DWT CTRL: NOCYCCNT Position */
+#define DWT_CTRL_NOCYCCNT_Msk              (0x1UL << DWT_CTRL_NOCYCCNT_Pos)            /*!< DWT CTRL: NOCYCCNT Mask */
+
+#define DWT_CTRL_NOPRFCNT_Pos              24U                                         /*!< DWT CTRL: NOPRFCNT Position */
+#define DWT_CTRL_NOPRFCNT_Msk              (0x1UL << DWT_CTRL_NOPRFCNT_Pos)            /*!< DWT CTRL: NOPRFCNT Mask */
+
+#define DWT_CTRL_CYCDISS_Pos               23U                                         /*!< DWT CTRL: CYCDISS Position */
+#define DWT_CTRL_CYCDISS_Msk               (0x1UL << DWT_CTRL_CYCDISS_Pos)             /*!< DWT CTRL: CYCDISS Mask */
+
+#define DWT_CTRL_CYCEVTENA_Pos             22U                                         /*!< DWT CTRL: CYCEVTENA Position */
+#define DWT_CTRL_CYCEVTENA_Msk             (0x1UL << DWT_CTRL_CYCEVTENA_Pos)           /*!< DWT CTRL: CYCEVTENA Mask */
+
+#define DWT_CTRL_FOLDEVTENA_Pos            21U                                         /*!< DWT CTRL: FOLDEVTENA Position */
+#define DWT_CTRL_FOLDEVTENA_Msk            (0x1UL << DWT_CTRL_FOLDEVTENA_Pos)          /*!< DWT CTRL: FOLDEVTENA Mask */
+
+#define DWT_CTRL_LSUEVTENA_Pos             20U                                         /*!< DWT CTRL: LSUEVTENA Position */
+#define DWT_CTRL_LSUEVTENA_Msk             (0x1UL << DWT_CTRL_LSUEVTENA_Pos)           /*!< DWT CTRL: LSUEVTENA Mask */
+
+#define DWT_CTRL_SLEEPEVTENA_Pos           19U                                         /*!< DWT CTRL: SLEEPEVTENA Position */
+#define DWT_CTRL_SLEEPEVTENA_Msk           (0x1UL << DWT_CTRL_SLEEPEVTENA_Pos)         /*!< DWT CTRL: SLEEPEVTENA Mask */
+
+#define DWT_CTRL_EXCEVTENA_Pos             18U                                         /*!< DWT CTRL: EXCEVTENA Position */
+#define DWT_CTRL_EXCEVTENA_Msk             (0x1UL << DWT_CTRL_EXCEVTENA_Pos)           /*!< DWT CTRL: EXCEVTENA Mask */
+
+#define DWT_CTRL_CPIEVTENA_Pos             17U                                         /*!< DWT CTRL: CPIEVTENA Position */
+#define DWT_CTRL_CPIEVTENA_Msk             (0x1UL << DWT_CTRL_CPIEVTENA_Pos)           /*!< DWT CTRL: CPIEVTENA Mask */
+
+#define DWT_CTRL_EXCTRCENA_Pos             16U                                         /*!< DWT CTRL: EXCTRCENA Position */
+#define DWT_CTRL_EXCTRCENA_Msk             (0x1UL << DWT_CTRL_EXCTRCENA_Pos)           /*!< DWT CTRL: EXCTRCENA Mask */
+
+#define DWT_CTRL_PCSAMPLENA_Pos            12U                                         /*!< DWT CTRL: PCSAMPLENA Position */
+#define DWT_CTRL_PCSAMPLENA_Msk            (0x1UL << DWT_CTRL_PCSAMPLENA_Pos)          /*!< DWT CTRL: PCSAMPLENA Mask */
+
+#define DWT_CTRL_SYNCTAP_Pos               10U                                         /*!< DWT CTRL: SYNCTAP Position */
+#define DWT_CTRL_SYNCTAP_Msk               (0x3UL << DWT_CTRL_SYNCTAP_Pos)             /*!< DWT CTRL: SYNCTAP Mask */
+
+#define DWT_CTRL_CYCTAP_Pos                 9U                                         /*!< DWT CTRL: CYCTAP Position */
+#define DWT_CTRL_CYCTAP_Msk                (0x1UL << DWT_CTRL_CYCTAP_Pos)              /*!< DWT CTRL: CYCTAP Mask */
+
+#define DWT_CTRL_POSTINIT_Pos               5U                                         /*!< DWT CTRL: POSTINIT Position */
+#define DWT_CTRL_POSTINIT_Msk              (0xFUL << DWT_CTRL_POSTINIT_Pos)            /*!< DWT CTRL: POSTINIT Mask */
+
+#define DWT_CTRL_POSTPRESET_Pos             1U                                         /*!< DWT CTRL: POSTPRESET Position */
+#define DWT_CTRL_POSTPRESET_Msk            (0xFUL << DWT_CTRL_POSTPRESET_Pos)          /*!< DWT CTRL: POSTPRESET Mask */
+
+#define DWT_CTRL_CYCCNTENA_Pos              0U                                         /*!< DWT CTRL: CYCCNTENA Position */
+#define DWT_CTRL_CYCCNTENA_Msk             (0x1UL /*<< DWT_CTRL_CYCCNTENA_Pos*/)       /*!< DWT CTRL: CYCCNTENA Mask */
+
+/* DWT CPI Count Register Definitions */
+#define DWT_CPICNT_CPICNT_Pos               0U                                         /*!< DWT CPICNT: CPICNT Position */
+#define DWT_CPICNT_CPICNT_Msk              (0xFFUL /*<< DWT_CPICNT_CPICNT_Pos*/)       /*!< DWT CPICNT: CPICNT Mask */
+
+/* DWT Exception Overhead Count Register Definitions */
+#define DWT_EXCCNT_EXCCNT_Pos               0U                                         /*!< DWT EXCCNT: EXCCNT Position */
+#define DWT_EXCCNT_EXCCNT_Msk              (0xFFUL /*<< DWT_EXCCNT_EXCCNT_Pos*/)       /*!< DWT EXCCNT: EXCCNT Mask */
+
+/* DWT Sleep Count Register Definitions */
+#define DWT_SLEEPCNT_SLEEPCNT_Pos           0U                                         /*!< DWT SLEEPCNT: SLEEPCNT Position */
+#define DWT_SLEEPCNT_SLEEPCNT_Msk          (0xFFUL /*<< DWT_SLEEPCNT_SLEEPCNT_Pos*/)   /*!< DWT SLEEPCNT: SLEEPCNT Mask */
+
+/* DWT LSU Count Register Definitions */
+#define DWT_LSUCNT_LSUCNT_Pos               0U                                         /*!< DWT LSUCNT: LSUCNT Position */
+#define DWT_LSUCNT_LSUCNT_Msk              (0xFFUL /*<< DWT_LSUCNT_LSUCNT_Pos*/)       /*!< DWT LSUCNT: LSUCNT Mask */
+
+/* DWT Folded-instruction Count Register Definitions */
+#define DWT_FOLDCNT_FOLDCNT_Pos             0U                                         /*!< DWT FOLDCNT: FOLDCNT Position */
+#define DWT_FOLDCNT_FOLDCNT_Msk            (0xFFUL /*<< DWT_FOLDCNT_FOLDCNT_Pos*/)     /*!< DWT FOLDCNT: FOLDCNT Mask */
+
+/* DWT Comparator Function Register Definitions */
+#define DWT_FUNCTION_ID_Pos                27U                                         /*!< DWT FUNCTION: ID Position */
+#define DWT_FUNCTION_ID_Msk                (0x1FUL << DWT_FUNCTION_ID_Pos)             /*!< DWT FUNCTION: ID Mask */
+
+#define DWT_FUNCTION_MATCHED_Pos           24U                                         /*!< DWT FUNCTION: MATCHED Position */
+#define DWT_FUNCTION_MATCHED_Msk           (0x1UL << DWT_FUNCTION_MATCHED_Pos)         /*!< DWT FUNCTION: MATCHED Mask */
+
+#define DWT_FUNCTION_DATAVSIZE_Pos         10U                                         /*!< DWT FUNCTION: DATAVSIZE Position */
+#define DWT_FUNCTION_DATAVSIZE_Msk         (0x3UL << DWT_FUNCTION_DATAVSIZE_Pos)       /*!< DWT FUNCTION: DATAVSIZE Mask */
+
+#define DWT_FUNCTION_ACTION_Pos             4U                                         /*!< DWT FUNCTION: ACTION Position */
+#define DWT_FUNCTION_ACTION_Msk            (0x1UL << DWT_FUNCTION_ACTION_Pos)          /*!< DWT FUNCTION: ACTION Mask */
+
+#define DWT_FUNCTION_MATCH_Pos              0U                                         /*!< DWT FUNCTION: MATCH Position */
+#define DWT_FUNCTION_MATCH_Msk             (0xFUL /*<< DWT_FUNCTION_MATCH_Pos*/)       /*!< DWT FUNCTION: MATCH Mask */
+
+/*@}*/ /* end of group CMSIS_DWT */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_TPI     Trace Port Interface (TPI)
+  \brief    Type definitions for the Trace Port Interface (TPI)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Trace Port Interface Register (TPI).
+ */
+typedef struct
+{
+  __IM  uint32_t SSPSR;                  /*!< Offset: 0x000 (R/ )  Supported Parallel Port Size Register */
+  __IOM uint32_t CSPSR;                  /*!< Offset: 0x004 (R/W)  Current Parallel Port Size Register */
+        uint32_t RESERVED0[2U];
+  __IOM uint32_t ACPR;                   /*!< Offset: 0x010 (R/W)  Asynchronous Clock Prescaler Register */
+        uint32_t RESERVED1[55U];
+  __IOM uint32_t SPPR;                   /*!< Offset: 0x0F0 (R/W)  Selected Pin Protocol Register */
+        uint32_t RESERVED2[131U];
+  __IM  uint32_t FFSR;                   /*!< Offset: 0x300 (R/ )  Formatter and Flush Status Register */
+  __IOM uint32_t FFCR;                   /*!< Offset: 0x304 (R/W)  Formatter and Flush Control Register */
+  __IOM uint32_t PSCR;                   /*!< Offset: 0x308 (R/W)  Periodic Synchronization Control Register */
+        uint32_t RESERVED3[759U];
+  __IM  uint32_t TRIGGER;                /*!< Offset: 0xEE8 (R/ )  TRIGGER Register */
+  __IM  uint32_t ITFTTD0;                /*!< Offset: 0xEEC (R/ )  Integration Test FIFO Test Data 0 Register */
+  __IOM uint32_t ITATBCTR2;              /*!< Offset: 0xEF0 (R/W)  Integration Test ATB Control Register 2 */
+        uint32_t RESERVED4[1U];
+  __IM  uint32_t ITATBCTR0;              /*!< Offset: 0xEF8 (R/ )  Integration Test ATB Control Register 0 */
+  __IM  uint32_t ITFTTD1;                /*!< Offset: 0xEFC (R/ )  Integration Test FIFO Test Data 1 Register */
+  __IOM uint32_t ITCTRL;                 /*!< Offset: 0xF00 (R/W)  Integration Mode Control */
+        uint32_t RESERVED5[39U];
+  __IOM uint32_t CLAIMSET;               /*!< Offset: 0xFA0 (R/W)  Claim tag set */
+  __IOM uint32_t CLAIMCLR;               /*!< Offset: 0xFA4 (R/W)  Claim tag clear */
+        uint32_t RESERVED7[8U];
+  __IM  uint32_t DEVID;                  /*!< Offset: 0xFC8 (R/ )  Device Configuration Register */
+  __IM  uint32_t DEVTYPE;                /*!< Offset: 0xFCC (R/ )  Device Type Identifier Register */
+} TPI_Type;
+
+/* TPI Asynchronous Clock Prescaler Register Definitions */
+#define TPI_ACPR_PRESCALER_Pos              0U                                         /*!< TPI ACPR: PRESCALER Position */
+#define TPI_ACPR_PRESCALER_Msk             (0x1FFFUL /*<< TPI_ACPR_PRESCALER_Pos*/)    /*!< TPI ACPR: PRESCALER Mask */
+
+/* TPI Selected Pin Protocol Register Definitions */
+#define TPI_SPPR_TXMODE_Pos                 0U                                         /*!< TPI SPPR: TXMODE Position */
+#define TPI_SPPR_TXMODE_Msk                (0x3UL /*<< TPI_SPPR_TXMODE_Pos*/)          /*!< TPI SPPR: TXMODE Mask */
+
+/* TPI Formatter and Flush Status Register Definitions */
+#define TPI_FFSR_FtNonStop_Pos              3U                                         /*!< TPI FFSR: FtNonStop Position */
+#define TPI_FFSR_FtNonStop_Msk             (0x1UL << TPI_FFSR_FtNonStop_Pos)           /*!< TPI FFSR: FtNonStop Mask */
+
+#define TPI_FFSR_TCPresent_Pos              2U                                         /*!< TPI FFSR: TCPresent Position */
+#define TPI_FFSR_TCPresent_Msk             (0x1UL << TPI_FFSR_TCPresent_Pos)           /*!< TPI FFSR: TCPresent Mask */
+
+#define TPI_FFSR_FtStopped_Pos              1U                                         /*!< TPI FFSR: FtStopped Position */
+#define TPI_FFSR_FtStopped_Msk             (0x1UL << TPI_FFSR_FtStopped_Pos)           /*!< TPI FFSR: FtStopped Mask */
+
+#define TPI_FFSR_FlInProg_Pos               0U                                         /*!< TPI FFSR: FlInProg Position */
+#define TPI_FFSR_FlInProg_Msk              (0x1UL /*<< TPI_FFSR_FlInProg_Pos*/)        /*!< TPI FFSR: FlInProg Mask */
+
+/* TPI Formatter and Flush Control Register Definitions */
+#define TPI_FFCR_TrigIn_Pos                 8U                                         /*!< TPI FFCR: TrigIn Position */
+#define TPI_FFCR_TrigIn_Msk                (0x1UL << TPI_FFCR_TrigIn_Pos)              /*!< TPI FFCR: TrigIn Mask */
+
+#define TPI_FFCR_FOnMan_Pos                 6U                                         /*!< TPI FFCR: FOnMan Position */
+#define TPI_FFCR_FOnMan_Msk                (0x1UL << TPI_FFCR_FOnMan_Pos)              /*!< TPI FFCR: FOnMan Mask */
+
+#define TPI_FFCR_EnFCont_Pos                1U                                         /*!< TPI FFCR: EnFCont Position */
+#define TPI_FFCR_EnFCont_Msk               (0x1UL << TPI_FFCR_EnFCont_Pos)             /*!< TPI FFCR: EnFCont Mask */
+
+/* TPI TRIGGER Register Definitions */
+#define TPI_TRIGGER_TRIGGER_Pos             0U                                         /*!< TPI TRIGGER: TRIGGER Position */
+#define TPI_TRIGGER_TRIGGER_Msk            (0x1UL /*<< TPI_TRIGGER_TRIGGER_Pos*/)      /*!< TPI TRIGGER: TRIGGER Mask */
+
+/* TPI Integration Test FIFO Test Data 0 Register Definitions */
+#define TPI_ITFTTD0_ATB_IF2_ATVALID_Pos    29U                                         /*!< TPI ITFTTD0: ATB Interface 2 ATVALIDPosition */
+#define TPI_ITFTTD0_ATB_IF2_ATVALID_Msk    (0x3UL << TPI_ITFTTD0_ATB_IF2_ATVALID_Pos)  /*!< TPI ITFTTD0: ATB Interface 2 ATVALID Mask */
+
+#define TPI_ITFTTD0_ATB_IF2_bytecount_Pos  27U                                         /*!< TPI ITFTTD0: ATB Interface 2 byte count Position */
+#define TPI_ITFTTD0_ATB_IF2_bytecount_Msk  (0x3UL << TPI_ITFTTD0_ATB_IF2_bytecount_Pos) /*!< TPI ITFTTD0: ATB Interface 2 byte count Mask */
+
+#define TPI_ITFTTD0_ATB_IF1_ATVALID_Pos    26U                                         /*!< TPI ITFTTD0: ATB Interface 1 ATVALID Position */
+#define TPI_ITFTTD0_ATB_IF1_ATVALID_Msk    (0x3UL << TPI_ITFTTD0_ATB_IF1_ATVALID_Pos)  /*!< TPI ITFTTD0: ATB Interface 1 ATVALID Mask */
+
+#define TPI_ITFTTD0_ATB_IF1_bytecount_Pos  24U                                         /*!< TPI ITFTTD0: ATB Interface 1 byte count Position */
+#define TPI_ITFTTD0_ATB_IF1_bytecount_Msk  (0x3UL << TPI_ITFTTD0_ATB_IF1_bytecount_Pos) /*!< TPI ITFTTD0: ATB Interface 1 byte countt Mask */
+
+#define TPI_ITFTTD0_ATB_IF1_data2_Pos      16U                                         /*!< TPI ITFTTD0: ATB Interface 1 data2 Position */
+#define TPI_ITFTTD0_ATB_IF1_data2_Msk      (0xFFUL << TPI_ITFTTD0_ATB_IF1_data1_Pos)   /*!< TPI ITFTTD0: ATB Interface 1 data2 Mask */
+
+#define TPI_ITFTTD0_ATB_IF1_data1_Pos       8U                                         /*!< TPI ITFTTD0: ATB Interface 1 data1 Position */
+#define TPI_ITFTTD0_ATB_IF1_data1_Msk      (0xFFUL << TPI_ITFTTD0_ATB_IF1_data1_Pos)   /*!< TPI ITFTTD0: ATB Interface 1 data1 Mask */
+
+#define TPI_ITFTTD0_ATB_IF1_data0_Pos       0U                                          /*!< TPI ITFTTD0: ATB Interface 1 data0 Position */
+#define TPI_ITFTTD0_ATB_IF1_data0_Msk      (0xFFUL /*<< TPI_ITFTTD0_ATB_IF1_data0_Pos*/) /*!< TPI ITFTTD0: ATB Interface 1 data0 Mask */
+
+/* TPI Integration Test ATB Control Register 2 Register Definitions */
+#define TPI_ITATBCTR2_AFVALID2S_Pos         1U                                         /*!< TPI ITATBCTR2: AFVALID2S Position */
+#define TPI_ITATBCTR2_AFVALID2S_Msk        (0x1UL << TPI_ITATBCTR2_AFVALID2S_Pos)      /*!< TPI ITATBCTR2: AFVALID2SS Mask */
+
+#define TPI_ITATBCTR2_AFVALID1S_Pos         1U                                         /*!< TPI ITATBCTR2: AFVALID1S Position */
+#define TPI_ITATBCTR2_AFVALID1S_Msk        (0x1UL << TPI_ITATBCTR2_AFVALID1S_Pos)      /*!< TPI ITATBCTR2: AFVALID1SS Mask */
+
+#define TPI_ITATBCTR2_ATREADY2S_Pos         0U                                         /*!< TPI ITATBCTR2: ATREADY2S Position */
+#define TPI_ITATBCTR2_ATREADY2S_Msk        (0x1UL /*<< TPI_ITATBCTR2_ATREADY2S_Pos*/)  /*!< TPI ITATBCTR2: ATREADY2S Mask */
+
+#define TPI_ITATBCTR2_ATREADY1S_Pos         0U                                         /*!< TPI ITATBCTR2: ATREADY1S Position */
+#define TPI_ITATBCTR2_ATREADY1S_Msk        (0x1UL /*<< TPI_ITATBCTR2_ATREADY1S_Pos*/)  /*!< TPI ITATBCTR2: ATREADY1S Mask */
+
+/* TPI Integration Test FIFO Test Data 1 Register Definitions */
+#define TPI_ITFTTD1_ATB_IF2_ATVALID_Pos    29U                                         /*!< TPI ITFTTD1: ATB Interface 2 ATVALID Position */
+#define TPI_ITFTTD1_ATB_IF2_ATVALID_Msk    (0x3UL << TPI_ITFTTD1_ATB_IF2_ATVALID_Pos)  /*!< TPI ITFTTD1: ATB Interface 2 ATVALID Mask */
+
+#define TPI_ITFTTD1_ATB_IF2_bytecount_Pos  27U                                         /*!< TPI ITFTTD1: ATB Interface 2 byte count Position */
+#define TPI_ITFTTD1_ATB_IF2_bytecount_Msk  (0x3UL << TPI_ITFTTD1_ATB_IF2_bytecount_Pos) /*!< TPI ITFTTD1: ATB Interface 2 byte count Mask */
+
+#define TPI_ITFTTD1_ATB_IF1_ATVALID_Pos    26U                                         /*!< TPI ITFTTD1: ATB Interface 1 ATVALID Position */
+#define TPI_ITFTTD1_ATB_IF1_ATVALID_Msk    (0x3UL << TPI_ITFTTD1_ATB_IF1_ATVALID_Pos)  /*!< TPI ITFTTD1: ATB Interface 1 ATVALID Mask */
+
+#define TPI_ITFTTD1_ATB_IF1_bytecount_Pos  24U                                         /*!< TPI ITFTTD1: ATB Interface 1 byte count Position */
+#define TPI_ITFTTD1_ATB_IF1_bytecount_Msk  (0x3UL << TPI_ITFTTD1_ATB_IF1_bytecount_Pos) /*!< TPI ITFTTD1: ATB Interface 1 byte countt Mask */
+
+#define TPI_ITFTTD1_ATB_IF2_data2_Pos      16U                                         /*!< TPI ITFTTD1: ATB Interface 2 data2 Position */
+#define TPI_ITFTTD1_ATB_IF2_data2_Msk      (0xFFUL << TPI_ITFTTD1_ATB_IF2_data1_Pos)   /*!< TPI ITFTTD1: ATB Interface 2 data2 Mask */
+
+#define TPI_ITFTTD1_ATB_IF2_data1_Pos       8U                                         /*!< TPI ITFTTD1: ATB Interface 2 data1 Position */
+#define TPI_ITFTTD1_ATB_IF2_data1_Msk      (0xFFUL << TPI_ITFTTD1_ATB_IF2_data1_Pos)   /*!< TPI ITFTTD1: ATB Interface 2 data1 Mask */
+
+#define TPI_ITFTTD1_ATB_IF2_data0_Pos       0U                                          /*!< TPI ITFTTD1: ATB Interface 2 data0 Position */
+#define TPI_ITFTTD1_ATB_IF2_data0_Msk      (0xFFUL /*<< TPI_ITFTTD1_ATB_IF2_data0_Pos*/) /*!< TPI ITFTTD1: ATB Interface 2 data0 Mask */
+
+/* TPI Integration Test ATB Control Register 0 Definitions */
+#define TPI_ITATBCTR0_AFVALID2S_Pos         1U                                         /*!< TPI ITATBCTR0: AFVALID2S Position */
+#define TPI_ITATBCTR0_AFVALID2S_Msk        (0x1UL << TPI_ITATBCTR0_AFVALID2S_Pos)      /*!< TPI ITATBCTR0: AFVALID2SS Mask */
+
+#define TPI_ITATBCTR0_AFVALID1S_Pos         1U                                         /*!< TPI ITATBCTR0: AFVALID1S Position */
+#define TPI_ITATBCTR0_AFVALID1S_Msk        (0x1UL << TPI_ITATBCTR0_AFVALID1S_Pos)      /*!< TPI ITATBCTR0: AFVALID1SS Mask */
+
+#define TPI_ITATBCTR0_ATREADY2S_Pos         0U                                         /*!< TPI ITATBCTR0: ATREADY2S Position */
+#define TPI_ITATBCTR0_ATREADY2S_Msk        (0x1UL /*<< TPI_ITATBCTR0_ATREADY2S_Pos*/)  /*!< TPI ITATBCTR0: ATREADY2S Mask */
+
+#define TPI_ITATBCTR0_ATREADY1S_Pos         0U                                         /*!< TPI ITATBCTR0: ATREADY1S Position */
+#define TPI_ITATBCTR0_ATREADY1S_Msk        (0x1UL /*<< TPI_ITATBCTR0_ATREADY1S_Pos*/)  /*!< TPI ITATBCTR0: ATREADY1S Mask */
+
+/* TPI Integration Mode Control Register Definitions */
+#define TPI_ITCTRL_Mode_Pos                 0U                                         /*!< TPI ITCTRL: Mode Position */
+#define TPI_ITCTRL_Mode_Msk                (0x3UL /*<< TPI_ITCTRL_Mode_Pos*/)          /*!< TPI ITCTRL: Mode Mask */
+
+/* TPI DEVID Register Definitions */
+#define TPI_DEVID_NRZVALID_Pos             11U                                         /*!< TPI DEVID: NRZVALID Position */
+#define TPI_DEVID_NRZVALID_Msk             (0x1UL << TPI_DEVID_NRZVALID_Pos)           /*!< TPI DEVID: NRZVALID Mask */
+
+#define TPI_DEVID_MANCVALID_Pos            10U                                         /*!< TPI DEVID: MANCVALID Position */
+#define TPI_DEVID_MANCVALID_Msk            (0x1UL << TPI_DEVID_MANCVALID_Pos)          /*!< TPI DEVID: MANCVALID Mask */
+
+#define TPI_DEVID_PTINVALID_Pos             9U                                         /*!< TPI DEVID: PTINVALID Position */
+#define TPI_DEVID_PTINVALID_Msk            (0x1UL << TPI_DEVID_PTINVALID_Pos)          /*!< TPI DEVID: PTINVALID Mask */
+
+#define TPI_DEVID_FIFOSZ_Pos                6U                                         /*!< TPI DEVID: FIFOSZ Position */
+#define TPI_DEVID_FIFOSZ_Msk               (0x7UL << TPI_DEVID_FIFOSZ_Pos)             /*!< TPI DEVID: FIFOSZ Mask */
+
+#define TPI_DEVID_NrTraceInput_Pos          0U                                         /*!< TPI DEVID: NrTraceInput Position */
+#define TPI_DEVID_NrTraceInput_Msk         (0x3FUL /*<< TPI_DEVID_NrTraceInput_Pos*/)  /*!< TPI DEVID: NrTraceInput Mask */
+
+/* TPI DEVTYPE Register Definitions */
+#define TPI_DEVTYPE_SubType_Pos             4U                                         /*!< TPI DEVTYPE: SubType Position */
+#define TPI_DEVTYPE_SubType_Msk            (0xFUL /*<< TPI_DEVTYPE_SubType_Pos*/)      /*!< TPI DEVTYPE: SubType Mask */
+
+#define TPI_DEVTYPE_MajorType_Pos           0U                                         /*!< TPI DEVTYPE: MajorType Position */
+#define TPI_DEVTYPE_MajorType_Msk          (0xFUL << TPI_DEVTYPE_MajorType_Pos)        /*!< TPI DEVTYPE: MajorType Mask */
+
+/*@}*/ /* end of group CMSIS_TPI */
+
+
+#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_MPU     Memory Protection Unit (MPU)
+  \brief    Type definitions for the Memory Protection Unit (MPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Memory Protection Unit (MPU).
+ */
+typedef struct
+{
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x000 (R/ )  MPU Type Register */
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x004 (R/W)  MPU Control Register */
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  MPU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  MPU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  MPU Region Limit Address Register */
+  __IOM uint32_t RBAR_A1;                /*!< Offset: 0x014 (R/W)  MPU Region Base Address Register Alias 1 */
+  __IOM uint32_t RLAR_A1;                /*!< Offset: 0x018 (R/W)  MPU Region Limit Address Register Alias 1 */
+  __IOM uint32_t RBAR_A2;                /*!< Offset: 0x01C (R/W)  MPU Region Base Address Register Alias 2 */
+  __IOM uint32_t RLAR_A2;                /*!< Offset: 0x020 (R/W)  MPU Region Limit Address Register Alias 2 */
+  __IOM uint32_t RBAR_A3;                /*!< Offset: 0x024 (R/W)  MPU Region Base Address Register Alias 3 */
+  __IOM uint32_t RLAR_A3;                /*!< Offset: 0x028 (R/W)  MPU Region Limit Address Register Alias 3 */
+        uint32_t RESERVED0[1];
+  union {
+  __IOM uint32_t MAIR[2];
+  struct {
+  __IOM uint32_t MAIR0;                  /*!< Offset: 0x030 (R/W)  MPU Memory Attribute Indirection Register 0 */
+  __IOM uint32_t MAIR1;                  /*!< Offset: 0x034 (R/W)  MPU Memory Attribute Indirection Register 1 */
+  };
+  };
+} MPU_Type;
+
+#define MPU_TYPE_RALIASES                  4U
+
+/* MPU Type Register Definitions */
+#define MPU_TYPE_IREGION_Pos               16U                                            /*!< MPU TYPE: IREGION Position */
+#define MPU_TYPE_IREGION_Msk               (0xFFUL << MPU_TYPE_IREGION_Pos)               /*!< MPU TYPE: IREGION Mask */
+
+#define MPU_TYPE_DREGION_Pos                8U                                            /*!< MPU TYPE: DREGION Position */
+#define MPU_TYPE_DREGION_Msk               (0xFFUL << MPU_TYPE_DREGION_Pos)               /*!< MPU TYPE: DREGION Mask */
+
+#define MPU_TYPE_SEPARATE_Pos               0U                                            /*!< MPU TYPE: SEPARATE Position */
+#define MPU_TYPE_SEPARATE_Msk              (1UL /*<< MPU_TYPE_SEPARATE_Pos*/)             /*!< MPU TYPE: SEPARATE Mask */
+
+/* MPU Control Register Definitions */
+#define MPU_CTRL_PRIVDEFENA_Pos             2U                                            /*!< MPU CTRL: PRIVDEFENA Position */
+#define MPU_CTRL_PRIVDEFENA_Msk            (1UL << MPU_CTRL_PRIVDEFENA_Pos)               /*!< MPU CTRL: PRIVDEFENA Mask */
+
+#define MPU_CTRL_HFNMIENA_Pos               1U                                            /*!< MPU CTRL: HFNMIENA Position */
+#define MPU_CTRL_HFNMIENA_Msk              (1UL << MPU_CTRL_HFNMIENA_Pos)                 /*!< MPU CTRL: HFNMIENA Mask */
+
+#define MPU_CTRL_ENABLE_Pos                 0U                                            /*!< MPU CTRL: ENABLE Position */
+#define MPU_CTRL_ENABLE_Msk                (1UL /*<< MPU_CTRL_ENABLE_Pos*/)               /*!< MPU CTRL: ENABLE Mask */
+
+/* MPU Region Number Register Definitions */
+#define MPU_RNR_REGION_Pos                  0U                                            /*!< MPU RNR: REGION Position */
+#define MPU_RNR_REGION_Msk                 (0xFFUL /*<< MPU_RNR_REGION_Pos*/)             /*!< MPU RNR: REGION Mask */
+
+/* MPU Region Base Address Register Definitions */
+#define MPU_RBAR_BASE_Pos                   5U                                            /*!< MPU RBAR: BASE Position */
+#define MPU_RBAR_BASE_Msk                  (0x7FFFFFFUL << MPU_RBAR_BASE_Pos)             /*!< MPU RBAR: BASE Mask */
+
+#define MPU_RBAR_SH_Pos                     3U                                            /*!< MPU RBAR: SH Position */
+#define MPU_RBAR_SH_Msk                    (0x3UL << MPU_RBAR_SH_Pos)                     /*!< MPU RBAR: SH Mask */
+
+#define MPU_RBAR_AP_Pos                     1U                                            /*!< MPU RBAR: AP Position */
+#define MPU_RBAR_AP_Msk                    (0x3UL << MPU_RBAR_AP_Pos)                     /*!< MPU RBAR: AP Mask */
+
+#define MPU_RBAR_XN_Pos                     0U                                            /*!< MPU RBAR: XN Position */
+#define MPU_RBAR_XN_Msk                    (01UL /*<< MPU_RBAR_XN_Pos*/)                  /*!< MPU RBAR: XN Mask */
+
+/* MPU Region Limit Address Register Definitions */
+#define MPU_RLAR_LIMIT_Pos                  5U                                            /*!< MPU RLAR: LIMIT Position */
+#define MPU_RLAR_LIMIT_Msk                 (0x7FFFFFFUL << MPU_RLAR_LIMIT_Pos)            /*!< MPU RLAR: LIMIT Mask */
+
+#define MPU_RLAR_AttrIndx_Pos               1U                                            /*!< MPU RLAR: AttrIndx Position */
+#define MPU_RLAR_AttrIndx_Msk              (0x7UL << MPU_RLAR_AttrIndx_Pos)               /*!< MPU RLAR: AttrIndx Mask */
+
+#define MPU_RLAR_EN_Pos                     0U                                            /*!< MPU RLAR: Region enable bit Position */
+#define MPU_RLAR_EN_Msk                    (1UL /*<< MPU_RLAR_EN_Pos*/)                   /*!< MPU RLAR: Region enable bit Disable Mask */
+
+/* MPU Memory Attribute Indirection Register 0 Definitions */
+#define MPU_MAIR0_Attr3_Pos                24U                                            /*!< MPU MAIR0: Attr3 Position */
+#define MPU_MAIR0_Attr3_Msk                (0xFFUL << MPU_MAIR0_Attr3_Pos)                /*!< MPU MAIR0: Attr3 Mask */
+
+#define MPU_MAIR0_Attr2_Pos                16U                                            /*!< MPU MAIR0: Attr2 Position */
+#define MPU_MAIR0_Attr2_Msk                (0xFFUL << MPU_MAIR0_Attr2_Pos)                /*!< MPU MAIR0: Attr2 Mask */
+
+#define MPU_MAIR0_Attr1_Pos                 8U                                            /*!< MPU MAIR0: Attr1 Position */
+#define MPU_MAIR0_Attr1_Msk                (0xFFUL << MPU_MAIR0_Attr1_Pos)                /*!< MPU MAIR0: Attr1 Mask */
+
+#define MPU_MAIR0_Attr0_Pos                 0U                                            /*!< MPU MAIR0: Attr0 Position */
+#define MPU_MAIR0_Attr0_Msk                (0xFFUL /*<< MPU_MAIR0_Attr0_Pos*/)            /*!< MPU MAIR0: Attr0 Mask */
+
+/* MPU Memory Attribute Indirection Register 1 Definitions */
+#define MPU_MAIR1_Attr7_Pos                24U                                            /*!< MPU MAIR1: Attr7 Position */
+#define MPU_MAIR1_Attr7_Msk                (0xFFUL << MPU_MAIR1_Attr7_Pos)                /*!< MPU MAIR1: Attr7 Mask */
+
+#define MPU_MAIR1_Attr6_Pos                16U                                            /*!< MPU MAIR1: Attr6 Position */
+#define MPU_MAIR1_Attr6_Msk                (0xFFUL << MPU_MAIR1_Attr6_Pos)                /*!< MPU MAIR1: Attr6 Mask */
+
+#define MPU_MAIR1_Attr5_Pos                 8U                                            /*!< MPU MAIR1: Attr5 Position */
+#define MPU_MAIR1_Attr5_Msk                (0xFFUL << MPU_MAIR1_Attr5_Pos)                /*!< MPU MAIR1: Attr5 Mask */
+
+#define MPU_MAIR1_Attr4_Pos                 0U                                            /*!< MPU MAIR1: Attr4 Position */
+#define MPU_MAIR1_Attr4_Msk                (0xFFUL /*<< MPU_MAIR1_Attr4_Pos*/)            /*!< MPU MAIR1: Attr4 Mask */
+
+/*@} end of group CMSIS_MPU */
+#endif
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_SAU     Security Attribution Unit (SAU)
+  \brief    Type definitions for the Security Attribution Unit (SAU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Security Attribution Unit (SAU).
+ */
+typedef struct
+{
+  __IOM uint32_t CTRL;                   /*!< Offset: 0x000 (R/W)  SAU Control Register */
+  __IM  uint32_t TYPE;                   /*!< Offset: 0x004 (R/ )  SAU Type Register */
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+  __IOM uint32_t RNR;                    /*!< Offset: 0x008 (R/W)  SAU Region Number Register */
+  __IOM uint32_t RBAR;                   /*!< Offset: 0x00C (R/W)  SAU Region Base Address Register */
+  __IOM uint32_t RLAR;                   /*!< Offset: 0x010 (R/W)  SAU Region Limit Address Register */
+#else
+        uint32_t RESERVED0[3];
+#endif
+  __IOM uint32_t SFSR;                   /*!< Offset: 0x014 (R/W)  Secure Fault Status Register */
+  __IOM uint32_t SFAR;                   /*!< Offset: 0x018 (R/W)  Secure Fault Address Register */
+} SAU_Type;
+
+/* SAU Control Register Definitions */
+#define SAU_CTRL_ALLNS_Pos                  1U                                            /*!< SAU CTRL: ALLNS Position */
+#define SAU_CTRL_ALLNS_Msk                 (1UL << SAU_CTRL_ALLNS_Pos)                    /*!< SAU CTRL: ALLNS Mask */
+
+#define SAU_CTRL_ENABLE_Pos                 0U                                            /*!< SAU CTRL: ENABLE Position */
+#define SAU_CTRL_ENABLE_Msk                (1UL /*<< SAU_CTRL_ENABLE_Pos*/)               /*!< SAU CTRL: ENABLE Mask */
+
+/* SAU Type Register Definitions */
+#define SAU_TYPE_SREGION_Pos                0U                                            /*!< SAU TYPE: SREGION Position */
+#define SAU_TYPE_SREGION_Msk               (0xFFUL /*<< SAU_TYPE_SREGION_Pos*/)           /*!< SAU TYPE: SREGION Mask */
+
+#if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
+/* SAU Region Number Register Definitions */
+#define SAU_RNR_REGION_Pos                  0U                                            /*!< SAU RNR: REGION Position */
+#define SAU_RNR_REGION_Msk                 (0xFFUL /*<< SAU_RNR_REGION_Pos*/)             /*!< SAU RNR: REGION Mask */
+
+/* SAU Region Base Address Register Definitions */
+#define SAU_RBAR_BADDR_Pos                  5U                                            /*!< SAU RBAR: BADDR Position */
+#define SAU_RBAR_BADDR_Msk                 (0x7FFFFFFUL << SAU_RBAR_BADDR_Pos)            /*!< SAU RBAR: BADDR Mask */
+
+/* SAU Region Limit Address Register Definitions */
+#define SAU_RLAR_LADDR_Pos                  5U                                            /*!< SAU RLAR: LADDR Position */
+#define SAU_RLAR_LADDR_Msk                 (0x7FFFFFFUL << SAU_RLAR_LADDR_Pos)            /*!< SAU RLAR: LADDR Mask */
+
+#define SAU_RLAR_NSC_Pos                    1U                                            /*!< SAU RLAR: NSC Position */
+#define SAU_RLAR_NSC_Msk                   (1UL << SAU_RLAR_NSC_Pos)                      /*!< SAU RLAR: NSC Mask */
+
+#define SAU_RLAR_ENABLE_Pos                 0U                                            /*!< SAU RLAR: ENABLE Position */
+#define SAU_RLAR_ENABLE_Msk                (1UL /*<< SAU_RLAR_ENABLE_Pos*/)               /*!< SAU RLAR: ENABLE Mask */
+
+#endif /* defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U) */
+
+/* Secure Fault Status Register Definitions */
+#define SAU_SFSR_LSERR_Pos                  7U                                            /*!< SAU SFSR: LSERR Position */
+#define SAU_SFSR_LSERR_Msk                 (1UL << SAU_SFSR_LSERR_Pos)                    /*!< SAU SFSR: LSERR Mask */
+
+#define SAU_SFSR_SFARVALID_Pos              6U                                            /*!< SAU SFSR: SFARVALID Position */
+#define SAU_SFSR_SFARVALID_Msk             (1UL << SAU_SFSR_SFARVALID_Pos)                /*!< SAU SFSR: SFARVALID Mask */
+
+#define SAU_SFSR_LSPERR_Pos                 5U                                            /*!< SAU SFSR: LSPERR Position */
+#define SAU_SFSR_LSPERR_Msk                (1UL << SAU_SFSR_LSPERR_Pos)                   /*!< SAU SFSR: LSPERR Mask */
+
+#define SAU_SFSR_INVTRAN_Pos                4U                                            /*!< SAU SFSR: INVTRAN Position */
+#define SAU_SFSR_INVTRAN_Msk               (1UL << SAU_SFSR_INVTRAN_Pos)                  /*!< SAU SFSR: INVTRAN Mask */
+
+#define SAU_SFSR_AUVIOL_Pos                 3U                                            /*!< SAU SFSR: AUVIOL Position */
+#define SAU_SFSR_AUVIOL_Msk                (1UL << SAU_SFSR_AUVIOL_Pos)                   /*!< SAU SFSR: AUVIOL Mask */
+
+#define SAU_SFSR_INVER_Pos                  2U                                            /*!< SAU SFSR: INVER Position */
+#define SAU_SFSR_INVER_Msk                 (1UL << SAU_SFSR_INVER_Pos)                    /*!< SAU SFSR: INVER Mask */
+
+#define SAU_SFSR_INVIS_Pos                  1U                                            /*!< SAU SFSR: INVIS Position */
+#define SAU_SFSR_INVIS_Msk                 (1UL << SAU_SFSR_INVIS_Pos)                    /*!< SAU SFSR: INVIS Mask */
+
+#define SAU_SFSR_INVEP_Pos                  0U                                            /*!< SAU SFSR: INVEP Position */
+#define SAU_SFSR_INVEP_Msk                 (1UL /*<< SAU_SFSR_INVEP_Pos*/)                /*!< SAU SFSR: INVEP Mask */
+
+/*@} end of group CMSIS_SAU */
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_FPU     Floating Point Unit (FPU)
+  \brief    Type definitions for the Floating Point Unit (FPU)
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Floating Point Unit (FPU).
+ */
+typedef struct
+{
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t FPCCR;                  /*!< Offset: 0x004 (R/W)  Floating-Point Context Control Register */
+  __IOM uint32_t FPCAR;                  /*!< Offset: 0x008 (R/W)  Floating-Point Context Address Register */
+  __IOM uint32_t FPDSCR;                 /*!< Offset: 0x00C (R/W)  Floating-Point Default Status Control Register */
+  __IM  uint32_t MVFR0;                  /*!< Offset: 0x010 (R/ )  Media and VFP Feature Register 0 */
+  __IM  uint32_t MVFR1;                  /*!< Offset: 0x014 (R/ )  Media and VFP Feature Register 1 */
+  __IM  uint32_t MVFR2;                  /*!< Offset: 0x018 (R/ )  Media and VFP Feature Register 2 */
+} FPU_Type;
+
+/* Floating-Point Context Control Register Definitions */
+#define FPU_FPCCR_ASPEN_Pos                31U                                            /*!< FPCCR: ASPEN bit Position */
+#define FPU_FPCCR_ASPEN_Msk                (1UL << FPU_FPCCR_ASPEN_Pos)                   /*!< FPCCR: ASPEN bit Mask */
+
+#define FPU_FPCCR_LSPEN_Pos                30U                                            /*!< FPCCR: LSPEN Position */
+#define FPU_FPCCR_LSPEN_Msk                (1UL << FPU_FPCCR_LSPEN_Pos)                   /*!< FPCCR: LSPEN bit Mask */
+
+#define FPU_FPCCR_LSPENS_Pos               29U                                            /*!< FPCCR: LSPENS Position */
+#define FPU_FPCCR_LSPENS_Msk               (1UL << FPU_FPCCR_LSPENS_Pos)                  /*!< FPCCR: LSPENS bit Mask */
+
+#define FPU_FPCCR_CLRONRET_Pos             28U                                            /*!< FPCCR: CLRONRET Position */
+#define FPU_FPCCR_CLRONRET_Msk             (1UL << FPU_FPCCR_CLRONRET_Pos)                /*!< FPCCR: CLRONRET bit Mask */
+
+#define FPU_FPCCR_CLRONRETS_Pos            27U                                            /*!< FPCCR: CLRONRETS Position */
+#define FPU_FPCCR_CLRONRETS_Msk            (1UL << FPU_FPCCR_CLRONRETS_Pos)               /*!< FPCCR: CLRONRETS bit Mask */
+
+#define FPU_FPCCR_TS_Pos                   26U                                            /*!< FPCCR: TS Position */
+#define FPU_FPCCR_TS_Msk                   (1UL << FPU_FPCCR_TS_Pos)                      /*!< FPCCR: TS bit Mask */
+
+#define FPU_FPCCR_UFRDY_Pos                10U                                            /*!< FPCCR: UFRDY Position */
+#define FPU_FPCCR_UFRDY_Msk                (1UL << FPU_FPCCR_UFRDY_Pos)                   /*!< FPCCR: UFRDY bit Mask */
+
+#define FPU_FPCCR_SPLIMVIOL_Pos             9U                                            /*!< FPCCR: SPLIMVIOL Position */
+#define FPU_FPCCR_SPLIMVIOL_Msk            (1UL << FPU_FPCCR_SPLIMVIOL_Pos)               /*!< FPCCR: SPLIMVIOL bit Mask */
+
+#define FPU_FPCCR_MONRDY_Pos                8U                                            /*!< FPCCR: MONRDY Position */
+#define FPU_FPCCR_MONRDY_Msk               (1UL << FPU_FPCCR_MONRDY_Pos)                  /*!< FPCCR: MONRDY bit Mask */
+
+#define FPU_FPCCR_SFRDY_Pos                 7U                                            /*!< FPCCR: SFRDY Position */
+#define FPU_FPCCR_SFRDY_Msk                (1UL << FPU_FPCCR_SFRDY_Pos)                   /*!< FPCCR: SFRDY bit Mask */
+
+#define FPU_FPCCR_BFRDY_Pos                 6U                                            /*!< FPCCR: BFRDY Position */
+#define FPU_FPCCR_BFRDY_Msk                (1UL << FPU_FPCCR_BFRDY_Pos)                   /*!< FPCCR: BFRDY bit Mask */
+
+#define FPU_FPCCR_MMRDY_Pos                 5U                                            /*!< FPCCR: MMRDY Position */
+#define FPU_FPCCR_MMRDY_Msk                (1UL << FPU_FPCCR_MMRDY_Pos)                   /*!< FPCCR: MMRDY bit Mask */
+
+#define FPU_FPCCR_HFRDY_Pos                 4U                                            /*!< FPCCR: HFRDY Position */
+#define FPU_FPCCR_HFRDY_Msk                (1UL << FPU_FPCCR_HFRDY_Pos)                   /*!< FPCCR: HFRDY bit Mask */
+
+#define FPU_FPCCR_THREAD_Pos                3U                                            /*!< FPCCR: processor mode bit Position */
+#define FPU_FPCCR_THREAD_Msk               (1UL << FPU_FPCCR_THREAD_Pos)                  /*!< FPCCR: processor mode active bit Mask */
+
+#define FPU_FPCCR_S_Pos                     2U                                            /*!< FPCCR: Security status of the FP context bit Position */
+#define FPU_FPCCR_S_Msk                    (1UL << FPU_FPCCR_S_Pos)                       /*!< FPCCR: Security status of the FP context bit Mask */
+
+#define FPU_FPCCR_USER_Pos                  1U                                            /*!< FPCCR: privilege level bit Position */
+#define FPU_FPCCR_USER_Msk                 (1UL << FPU_FPCCR_USER_Pos)                    /*!< FPCCR: privilege level bit Mask */
+
+#define FPU_FPCCR_LSPACT_Pos                0U                                            /*!< FPCCR: Lazy state preservation active bit Position */
+#define FPU_FPCCR_LSPACT_Msk               (1UL /*<< FPU_FPCCR_LSPACT_Pos*/)              /*!< FPCCR: Lazy state preservation active bit Mask */
+
+/* Floating-Point Context Address Register Definitions */
+#define FPU_FPCAR_ADDRESS_Pos               3U                                            /*!< FPCAR: ADDRESS bit Position */
+#define FPU_FPCAR_ADDRESS_Msk              (0x1FFFFFFFUL << FPU_FPCAR_ADDRESS_Pos)        /*!< FPCAR: ADDRESS bit Mask */
+
+/* Floating-Point Default Status Control Register Definitions */
+#define FPU_FPDSCR_AHP_Pos                 26U                                            /*!< FPDSCR: AHP bit Position */
+#define FPU_FPDSCR_AHP_Msk                 (1UL << FPU_FPDSCR_AHP_Pos)                    /*!< FPDSCR: AHP bit Mask */
+
+#define FPU_FPDSCR_DN_Pos                  25U                                            /*!< FPDSCR: DN bit Position */
+#define FPU_FPDSCR_DN_Msk                  (1UL << FPU_FPDSCR_DN_Pos)                     /*!< FPDSCR: DN bit Mask */
+
+#define FPU_FPDSCR_FZ_Pos                  24U                                            /*!< FPDSCR: FZ bit Position */
+#define FPU_FPDSCR_FZ_Msk                  (1UL << FPU_FPDSCR_FZ_Pos)                     /*!< FPDSCR: FZ bit Mask */
+
+#define FPU_FPDSCR_RMode_Pos               22U                                            /*!< FPDSCR: RMode bit Position */
+#define FPU_FPDSCR_RMode_Msk               (3UL << FPU_FPDSCR_RMode_Pos)                  /*!< FPDSCR: RMode bit Mask */
+
+/* Media and VFP Feature Register 0 Definitions */
+#define FPU_MVFR0_FP_rounding_modes_Pos    28U                                            /*!< MVFR0: FP rounding modes bits Position */
+#define FPU_MVFR0_FP_rounding_modes_Msk    (0xFUL << FPU_MVFR0_FP_rounding_modes_Pos)     /*!< MVFR0: FP rounding modes bits Mask */
+
+#define FPU_MVFR0_Short_vectors_Pos        24U                                            /*!< MVFR0: Short vectors bits Position */
+#define FPU_MVFR0_Short_vectors_Msk        (0xFUL << FPU_MVFR0_Short_vectors_Pos)         /*!< MVFR0: Short vectors bits Mask */
+
+#define FPU_MVFR0_Square_root_Pos          20U                                            /*!< MVFR0: Square root bits Position */
+#define FPU_MVFR0_Square_root_Msk          (0xFUL << FPU_MVFR0_Square_root_Pos)           /*!< MVFR0: Square root bits Mask */
+
+#define FPU_MVFR0_Divide_Pos               16U                                            /*!< MVFR0: Divide bits Position */
+#define FPU_MVFR0_Divide_Msk               (0xFUL << FPU_MVFR0_Divide_Pos)                /*!< MVFR0: Divide bits Mask */
+
+#define FPU_MVFR0_FP_excep_trapping_Pos    12U                                            /*!< MVFR0: FP exception trapping bits Position */
+#define FPU_MVFR0_FP_excep_trapping_Msk    (0xFUL << FPU_MVFR0_FP_excep_trapping_Pos)     /*!< MVFR0: FP exception trapping bits Mask */
+
+#define FPU_MVFR0_Double_precision_Pos      8U                                            /*!< MVFR0: Double-precision bits Position */
+#define FPU_MVFR0_Double_precision_Msk     (0xFUL << FPU_MVFR0_Double_precision_Pos)      /*!< MVFR0: Double-precision bits Mask */
+
+#define FPU_MVFR0_Single_precision_Pos      4U                                            /*!< MVFR0: Single-precision bits Position */
+#define FPU_MVFR0_Single_precision_Msk     (0xFUL << FPU_MVFR0_Single_precision_Pos)      /*!< MVFR0: Single-precision bits Mask */
+
+#define FPU_MVFR0_A_SIMD_registers_Pos      0U                                            /*!< MVFR0: A_SIMD registers bits Position */
+#define FPU_MVFR0_A_SIMD_registers_Msk     (0xFUL /*<< FPU_MVFR0_A_SIMD_registers_Pos*/)  /*!< MVFR0: A_SIMD registers bits Mask */
+
+/* Media and VFP Feature Register 1 Definitions */
+#define FPU_MVFR1_FP_fused_MAC_Pos         28U                                            /*!< MVFR1: FP fused MAC bits Position */
+#define FPU_MVFR1_FP_fused_MAC_Msk         (0xFUL << FPU_MVFR1_FP_fused_MAC_Pos)          /*!< MVFR1: FP fused MAC bits Mask */
+
+#define FPU_MVFR1_FP_HPFP_Pos              24U                                            /*!< MVFR1: FP HPFP bits Position */
+#define FPU_MVFR1_FP_HPFP_Msk              (0xFUL << FPU_MVFR1_FP_HPFP_Pos)               /*!< MVFR1: FP HPFP bits Mask */
+
+#define FPU_MVFR1_D_NaN_mode_Pos            4U                                            /*!< MVFR1: D_NaN mode bits Position */
+#define FPU_MVFR1_D_NaN_mode_Msk           (0xFUL << FPU_MVFR1_D_NaN_mode_Pos)            /*!< MVFR1: D_NaN mode bits Mask */
+
+#define FPU_MVFR1_FtZ_mode_Pos              0U                                            /*!< MVFR1: FtZ mode bits Position */
+#define FPU_MVFR1_FtZ_mode_Msk             (0xFUL /*<< FPU_MVFR1_FtZ_mode_Pos*/)          /*!< MVFR1: FtZ mode bits Mask */
+
+/* Media and VFP Feature Register 2 Definitions */
+#define FPU_MVFR2_FPMisc_Pos                4U                                            /*!< MVFR2: FPMisc bits Position */
+#define FPU_MVFR2_FPMisc_Msk               (0xFUL << FPU_MVFR2_FPMisc_Pos)                /*!< MVFR2: FPMisc bits Mask */
+
+/*@} end of group CMSIS_FPU */
+
+
+
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup CMSIS_DCB       Debug Control Block
+  \brief    Type definitions for the Debug Control Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Control Block Registers (DCB).
+ */
+typedef struct
+{
+  __IOM uint32_t DHCSR;                  /*!< Offset: 0x000 (R/W)  Debug Halting Control and Status Register */
+  __OM  uint32_t DCRSR;                  /*!< Offset: 0x004 ( /W)  Debug Core Register Selector Register */
+  __IOM uint32_t DCRDR;                  /*!< Offset: 0x008 (R/W)  Debug Core Register Data Register */
+  __IOM uint32_t DEMCR;                  /*!< Offset: 0x00C (R/W)  Debug Exception and Monitor Control Register */
+        uint32_t RESERVED0[1U];
+  __IOM uint32_t DAUTHCTRL;              /*!< Offset: 0x014 (R/W)  Debug Authentication Control Register */
+  __IOM uint32_t DSCSR;                  /*!< Offset: 0x018 (R/W)  Debug Security Control and Status Register */
+} DCB_Type;
+
+/* DHCSR, Debug Halting Control and Status Register Definitions */
+#define DCB_DHCSR_DBGKEY_Pos               16U                                            /*!< DCB DHCSR: Debug key Position */
+#define DCB_DHCSR_DBGKEY_Msk               (0xFFFFUL << DCB_DHCSR_DBGKEY_Pos)             /*!< DCB DHCSR: Debug key Mask */
+
+#define DCB_DHCSR_S_RESTART_ST_Pos         26U                                            /*!< DCB DHCSR: Restart sticky status Position */
+#define DCB_DHCSR_S_RESTART_ST_Msk         (0x1UL << DCB_DHCSR_S_RESTART_ST_Pos)          /*!< DCB DHCSR: Restart sticky status Mask */
+
+#define DCB_DHCSR_S_RESET_ST_Pos           25U                                            /*!< DCB DHCSR: Reset sticky status Position */
+#define DCB_DHCSR_S_RESET_ST_Msk           (0x1UL << DCB_DHCSR_S_RESET_ST_Pos)            /*!< DCB DHCSR: Reset sticky status Mask */
+
+#define DCB_DHCSR_S_RETIRE_ST_Pos          24U                                            /*!< DCB DHCSR: Retire sticky status Position */
+#define DCB_DHCSR_S_RETIRE_ST_Msk          (0x1UL << DCB_DHCSR_S_RETIRE_ST_Pos)           /*!< DCB DHCSR: Retire sticky status Mask */
+
+#define DCB_DHCSR_S_SDE_Pos                20U                                            /*!< DCB DHCSR: Secure debug enabled Position */
+#define DCB_DHCSR_S_SDE_Msk                (0x1UL << DCB_DHCSR_S_SDE_Pos)                 /*!< DCB DHCSR: Secure debug enabled Mask */
+
+#define DCB_DHCSR_S_LOCKUP_Pos             19U                                            /*!< DCB DHCSR: Lockup status Position */
+#define DCB_DHCSR_S_LOCKUP_Msk             (0x1UL << DCB_DHCSR_S_LOCKUP_Pos)              /*!< DCB DHCSR: Lockup status Mask */
+
+#define DCB_DHCSR_S_SLEEP_Pos              18U                                            /*!< DCB DHCSR: Sleeping status Position */
+#define DCB_DHCSR_S_SLEEP_Msk              (0x1UL << DCB_DHCSR_S_SLEEP_Pos)               /*!< DCB DHCSR: Sleeping status Mask */
+
+#define DCB_DHCSR_S_HALT_Pos               17U                                            /*!< DCB DHCSR: Halted status Position */
+#define DCB_DHCSR_S_HALT_Msk               (0x1UL << DCB_DHCSR_S_HALT_Pos)                /*!< DCB DHCSR: Halted status Mask */
+
+#define DCB_DHCSR_S_REGRDY_Pos             16U                                            /*!< DCB DHCSR: Register ready status Position */
+#define DCB_DHCSR_S_REGRDY_Msk             (0x1UL << DCB_DHCSR_S_REGRDY_Pos)              /*!< DCB DHCSR: Register ready status Mask */
+
+#define DCB_DHCSR_C_SNAPSTALL_Pos           5U                                            /*!< DCB DHCSR: Snap stall control Position */
+#define DCB_DHCSR_C_SNAPSTALL_Msk          (0x1UL << DCB_DHCSR_C_SNAPSTALL_Pos)           /*!< DCB DHCSR: Snap stall control Mask */
+
+#define DCB_DHCSR_C_MASKINTS_Pos            3U                                            /*!< DCB DHCSR: Mask interrupts control Position */
+#define DCB_DHCSR_C_MASKINTS_Msk           (0x1UL << DCB_DHCSR_C_MASKINTS_Pos)            /*!< DCB DHCSR: Mask interrupts control Mask */
+
+#define DCB_DHCSR_C_STEP_Pos                2U                                            /*!< DCB DHCSR: Step control Position */
+#define DCB_DHCSR_C_STEP_Msk               (0x1UL << DCB_DHCSR_C_STEP_Pos)                /*!< DCB DHCSR: Step control Mask */
+
+#define DCB_DHCSR_C_HALT_Pos                1U                                            /*!< DCB DHCSR: Halt control Position */
+#define DCB_DHCSR_C_HALT_Msk               (0x1UL << DCB_DHCSR_C_HALT_Pos)                /*!< DCB DHCSR: Halt control Mask */
+
+#define DCB_DHCSR_C_DEBUGEN_Pos             0U                                            /*!< DCB DHCSR: Debug enable control Position */
+#define DCB_DHCSR_C_DEBUGEN_Msk            (0x1UL /*<< DCB_DHCSR_C_DEBUGEN_Pos*/)         /*!< DCB DHCSR: Debug enable control Mask */
+
+/* DCRSR, Debug Core Register Select Register Definitions */
+#define DCB_DCRSR_REGWnR_Pos               16U                                            /*!< DCB DCRSR: Register write/not-read Position */
+#define DCB_DCRSR_REGWnR_Msk               (0x1UL << DCB_DCRSR_REGWnR_Pos)                /*!< DCB DCRSR: Register write/not-read Mask */
+
+#define DCB_DCRSR_REGSEL_Pos                0U                                            /*!< DCB DCRSR: Register selector Position */
+#define DCB_DCRSR_REGSEL_Msk               (0x7FUL /*<< DCB_DCRSR_REGSEL_Pos*/)           /*!< DCB DCRSR: Register selector Mask */
+
+/* DCRDR, Debug Core Register Data Register Definitions */
+#define DCB_DCRDR_DBGTMP_Pos                0U                                            /*!< DCB DCRDR: Data temporary buffer Position */
+#define DCB_DCRDR_DBGTMP_Msk               (0xFFFFFFFFUL /*<< DCB_DCRDR_DBGTMP_Pos*/)     /*!< DCB DCRDR: Data temporary buffer Mask */
+
+/* DEMCR, Debug Exception and Monitor Control Register Definitions */
+#define DCB_DEMCR_TRCENA_Pos               24U                                            /*!< DCB DEMCR: Trace enable Position */
+#define DCB_DEMCR_TRCENA_Msk               (0x1UL << DCB_DEMCR_TRCENA_Pos)                /*!< DCB DEMCR: Trace enable Mask */
+
+#define DCB_DEMCR_MONPRKEY_Pos             23U                                            /*!< DCB DEMCR: Monitor pend req key Position */
+#define DCB_DEMCR_MONPRKEY_Msk             (0x1UL << DCB_DEMCR_MONPRKEY_Pos)              /*!< DCB DEMCR: Monitor pend req key Mask */
+
+#define DCB_DEMCR_UMON_EN_Pos              21U                                            /*!< DCB DEMCR: Unprivileged monitor enable Position */
+#define DCB_DEMCR_UMON_EN_Msk              (0x1UL << DCB_DEMCR_UMON_EN_Pos)               /*!< DCB DEMCR: Unprivileged monitor enable Mask */
+
+#define DCB_DEMCR_SDME_Pos                 20U                                            /*!< DCB DEMCR: Secure DebugMonitor enable Position */
+#define DCB_DEMCR_SDME_Msk                 (0x1UL << DCB_DEMCR_SDME_Pos)                  /*!< DCB DEMCR: Secure DebugMonitor enable Mask */
+
+#define DCB_DEMCR_MON_REQ_Pos              19U                                            /*!< DCB DEMCR: Monitor request Position */
+#define DCB_DEMCR_MON_REQ_Msk              (0x1UL << DCB_DEMCR_MON_REQ_Pos)               /*!< DCB DEMCR: Monitor request Mask */
+
+#define DCB_DEMCR_MON_STEP_Pos             18U                                            /*!< DCB DEMCR: Monitor step Position */
+#define DCB_DEMCR_MON_STEP_Msk             (0x1UL << DCB_DEMCR_MON_STEP_Pos)              /*!< DCB DEMCR: Monitor step Mask */
+
+#define DCB_DEMCR_MON_PEND_Pos             17U                                            /*!< DCB DEMCR: Monitor pend Position */
+#define DCB_DEMCR_MON_PEND_Msk             (0x1UL << DCB_DEMCR_MON_PEND_Pos)              /*!< DCB DEMCR: Monitor pend Mask */
+
+#define DCB_DEMCR_MON_EN_Pos               16U                                            /*!< DCB DEMCR: Monitor enable Position */
+#define DCB_DEMCR_MON_EN_Msk               (0x1UL << DCB_DEMCR_MON_EN_Pos)                /*!< DCB DEMCR: Monitor enable Mask */
+
+#define DCB_DEMCR_VC_SFERR_Pos             11U                                            /*!< DCB DEMCR: Vector Catch SecureFault Position */
+#define DCB_DEMCR_VC_SFERR_Msk             (0x1UL << DCB_DEMCR_VC_SFERR_Pos)              /*!< DCB DEMCR: Vector Catch SecureFault Mask */
+
+#define DCB_DEMCR_VC_HARDERR_Pos           10U                                            /*!< DCB DEMCR: Vector Catch HardFault errors Position */
+#define DCB_DEMCR_VC_HARDERR_Msk           (0x1UL << DCB_DEMCR_VC_HARDERR_Pos)            /*!< DCB DEMCR: Vector Catch HardFault errors Mask */
+
+#define DCB_DEMCR_VC_INTERR_Pos             9U                                            /*!< DCB DEMCR: Vector Catch interrupt errors Position */
+#define DCB_DEMCR_VC_INTERR_Msk            (0x1UL << DCB_DEMCR_VC_INTERR_Pos)             /*!< DCB DEMCR: Vector Catch interrupt errors Mask */
+
+#define DCB_DEMCR_VC_BUSERR_Pos             8U                                            /*!< DCB DEMCR: Vector Catch BusFault errors Position */
+#define DCB_DEMCR_VC_BUSERR_Msk            (0x1UL << DCB_DEMCR_VC_BUSERR_Pos)             /*!< DCB DEMCR: Vector Catch BusFault errors Mask */
+
+#define DCB_DEMCR_VC_STATERR_Pos            7U                                            /*!< DCB DEMCR: Vector Catch state errors Position */
+#define DCB_DEMCR_VC_STATERR_Msk           (0x1UL << DCB_DEMCR_VC_STATERR_Pos)            /*!< DCB DEMCR: Vector Catch state errors Mask */
+
+#define DCB_DEMCR_VC_CHKERR_Pos             6U                                            /*!< DCB DEMCR: Vector Catch check errors Position */
+#define DCB_DEMCR_VC_CHKERR_Msk            (0x1UL << DCB_DEMCR_VC_CHKERR_Pos)             /*!< DCB DEMCR: Vector Catch check errors Mask */
+
+#define DCB_DEMCR_VC_NOCPERR_Pos            5U                                            /*!< DCB DEMCR: Vector Catch NOCP errors Position */
+#define DCB_DEMCR_VC_NOCPERR_Msk           (0x1UL << DCB_DEMCR_VC_NOCPERR_Pos)            /*!< DCB DEMCR: Vector Catch NOCP errors Mask */
+
+#define DCB_DEMCR_VC_MMERR_Pos              4U                                            /*!< DCB DEMCR: Vector Catch MemManage errors Position */
+#define DCB_DEMCR_VC_MMERR_Msk             (0x1UL << DCB_DEMCR_VC_MMERR_Pos)              /*!< DCB DEMCR: Vector Catch MemManage errors Mask */
+
+#define DCB_DEMCR_VC_CORERESET_Pos          0U                                            /*!< DCB DEMCR: Vector Catch Core reset Position */
+#define DCB_DEMCR_VC_CORERESET_Msk         (0x1UL /*<< DCB_DEMCR_VC_CORERESET_Pos*/)      /*!< DCB DEMCR: Vector Catch Core reset Mask */
+
+/* DAUTHCTRL, Debug Authentication Control Register Definitions */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Pos        3U                                            /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPNIDEN_Msk       (0x1UL << DCB_DAUTHCTRL_INTSPNIDEN_Pos)        /*!< DCB DAUTHCTRL: Internal Secure non-invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPNIDENSEL_Pos        2U                                            /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPNIDENSEL_Msk       (0x1UL << DCB_DAUTHCTRL_SPNIDENSEL_Pos)        /*!< DCB DAUTHCTRL: Secure non-invasive debug enable select Mask */
+
+#define DCB_DAUTHCTRL_INTSPIDEN_Pos         1U                                            /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Position */
+#define DCB_DAUTHCTRL_INTSPIDEN_Msk        (0x1UL << DCB_DAUTHCTRL_INTSPIDEN_Pos)         /*!< DCB DAUTHCTRL: Internal Secure invasive debug enable Mask */
+
+#define DCB_DAUTHCTRL_SPIDENSEL_Pos         0U                                            /*!< DCB DAUTHCTRL: Secure invasive debug enable select Position */
+#define DCB_DAUTHCTRL_SPIDENSEL_Msk        (0x1UL /*<< DCB_DAUTHCTRL_SPIDENSEL_Pos*/)     /*!< DCB DAUTHCTRL: Secure invasive debug enable select Mask */
+
+/* DSCSR, Debug Security Control and Status Register Definitions */
+#define DCB_DSCSR_CDSKEY_Pos               17U                                            /*!< DCB DSCSR: CDS write-enable key Position */
+#define DCB_DSCSR_CDSKEY_Msk               (0x1UL << DCB_DSCSR_CDSKEY_Pos)                /*!< DCB DSCSR: CDS write-enable key Mask */
+
+#define DCB_DSCSR_CDS_Pos                  16U                                            /*!< DCB DSCSR: Current domain Secure Position */
+#define DCB_DSCSR_CDS_Msk                  (0x1UL << DCB_DSCSR_CDS_Pos)                   /*!< DCB DSCSR: Current domain Secure Mask */
+
+#define DCB_DSCSR_SBRSEL_Pos                1U                                            /*!< DCB DSCSR: Secure banked register select Position */
+#define DCB_DSCSR_SBRSEL_Msk               (0x1UL << DCB_DSCSR_SBRSEL_Pos)                /*!< DCB DSCSR: Secure banked register select Mask */
+
+#define DCB_DSCSR_SBRSELEN_Pos              0U                                            /*!< DCB DSCSR: Secure banked register select enable Position */
+#define DCB_DSCSR_SBRSELEN_Msk             (0x1UL /*<< DCB_DSCSR_SBRSELEN_Pos*/)          /*!< DCB DSCSR: Secure banked register select enable Mask */
+
+/*@} end of group CMSIS_DCB */
+
+
+
+/**
+  \ingroup  CMSIS_core_register
+  \defgroup CMSIS_DIB       Debug Identification Block
+  \brief    Type definitions for the Debug Identification Block Registers
+  @{
+ */
+
+/**
+  \brief  Structure type to access the Debug Identification Block Registers (DIB).
+ */
+typedef struct
+{
+  __OM  uint32_t DLAR;                   /*!< Offset: 0x000 ( /W)  SCS Software Lock Access Register */
+  __IM  uint32_t DLSR;                   /*!< Offset: 0x004 (R/ )  SCS Software Lock Status Register */
+  __IM  uint32_t DAUTHSTATUS;            /*!< Offset: 0x008 (R/ )  Debug Authentication Status Register */
+  __IM  uint32_t DDEVARCH;               /*!< Offset: 0x00C (R/ )  SCS Device Architecture Register */
+  __IM  uint32_t DDEVTYPE;               /*!< Offset: 0x010 (R/ )  SCS Device Type Register */
+} DIB_Type;
+
+/* DLAR, SCS Software Lock Access Register Definitions */
+#define DIB_DLAR_KEY_Pos                    0U                                            /*!< DIB DLAR: KEY Position */
+#define DIB_DLAR_KEY_Msk                   (0xFFFFFFFFUL /*<< DIB_DLAR_KEY_Pos */)        /*!< DIB DLAR: KEY Mask */
+
+/* DLSR, SCS Software Lock Status Register Definitions */
+#define DIB_DLSR_nTT_Pos                    2U                                            /*!< DIB DLSR: Not thirty-two bit Position */
+#define DIB_DLSR_nTT_Msk                   (0x1UL << DIB_DLSR_nTT_Pos )                   /*!< DIB DLSR: Not thirty-two bit Mask */
+
+#define DIB_DLSR_SLK_Pos                    1U                                            /*!< DIB DLSR: Software Lock status Position */
+#define DIB_DLSR_SLK_Msk                   (0x1UL << DIB_DLSR_SLK_Pos )                   /*!< DIB DLSR: Software Lock status Mask */
+
+#define DIB_DLSR_SLI_Pos                    0U                                            /*!< DIB DLSR: Software Lock implemented Position */
+#define DIB_DLSR_SLI_Msk                   (0x1UL /*<< DIB_DLSR_SLI_Pos*/)                /*!< DIB DLSR: Software Lock implemented Mask */
+
+/* DAUTHSTATUS, Debug Authentication Status Register Definitions */
+#define DIB_DAUTHSTATUS_SNID_Pos            6U                                            /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_SNID_Msk           (0x3UL << DIB_DAUTHSTATUS_SNID_Pos )           /*!< DIB DAUTHSTATUS: Secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_SID_Pos             4U                                            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_SID_Msk            (0x3UL << DIB_DAUTHSTATUS_SID_Pos )            /*!< DIB DAUTHSTATUS: Secure Invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSNID_Pos           2U                                            /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSNID_Msk          (0x3UL << DIB_DAUTHSTATUS_NSNID_Pos )          /*!< DIB DAUTHSTATUS: Non-secure Non-invasive Debug Mask */
+
+#define DIB_DAUTHSTATUS_NSID_Pos            0U                                            /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Position */
+#define DIB_DAUTHSTATUS_NSID_Msk           (0x3UL /*<< DIB_DAUTHSTATUS_NSID_Pos*/)        /*!< DIB DAUTHSTATUS: Non-secure Invasive Debug Mask */
+
+/* DDEVARCH, SCS Device Architecture Register Definitions */
+#define DIB_DDEVARCH_ARCHITECT_Pos         21U                                            /*!< DIB DDEVARCH: Architect Position */
+#define DIB_DDEVARCH_ARCHITECT_Msk         (0x7FFUL << DIB_DDEVARCH_ARCHITECT_Pos )       /*!< DIB DDEVARCH: Architect Mask */
+
+#define DIB_DDEVARCH_PRESENT_Pos           20U                                            /*!< DIB DDEVARCH: DEVARCH Present Position */
+#define DIB_DDEVARCH_PRESENT_Msk           (0x1FUL << DIB_DDEVARCH_PRESENT_Pos )          /*!< DIB DDEVARCH: DEVARCH Present Mask */
+
+#define DIB_DDEVARCH_REVISION_Pos          16U                                            /*!< DIB DDEVARCH: Revision Position */
+#define DIB_DDEVARCH_REVISION_Msk          (0xFUL << DIB_DDEVARCH_REVISION_Pos )          /*!< DIB DDEVARCH: Revision Mask */
+
+#define DIB_DDEVARCH_ARCHVER_Pos           12U                                            /*!< DIB DDEVARCH: Architecture Version Position */
+#define DIB_DDEVARCH_ARCHVER_Msk           (0xFUL << DIB_DDEVARCH_ARCHVER_Pos )           /*!< DIB DDEVARCH: Architecture Version Mask */
+
+#define DIB_DDEVARCH_ARCHPART_Pos           0U                                            /*!< DIB DDEVARCH: Architecture Part Position */
+#define DIB_DDEVARCH_ARCHPART_Msk          (0xFFFUL /*<< DIB_DDEVARCH_ARCHPART_Pos*/)     /*!< DIB DDEVARCH: Architecture Part Mask */
+
+/* DDEVTYPE, SCS Device Type Register Definitions */
+#define DIB_DDEVTYPE_SUB_Pos                4U                                            /*!< DIB DDEVTYPE: Sub-type Position */
+#define DIB_DDEVTYPE_SUB_Msk               (0xFUL << DIB_DDEVTYPE_SUB_Pos )               /*!< DIB DDEVTYPE: Sub-type Mask */
+
+#define DIB_DDEVTYPE_MAJOR_Pos              0U                                            /*!< DIB DDEVTYPE: Major type Position */
+#define DIB_DDEVTYPE_MAJOR_Msk             (0xFUL /*<< DIB_DDEVTYPE_MAJOR_Pos*/)          /*!< DIB DDEVTYPE: Major type Mask */
+
+
+/*@} end of group CMSIS_DIB */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_core_bitfield     Core register bit field macros
+  \brief      Macros for use with bit field definitions (xxx_Pos, xxx_Msk).
+  @{
+ */
+
+/**
+  \brief   Mask and shift a bit field value for use in a register bit range.
+  \param[in] field  Name of the register bit field.
+  \param[in] value  Value of the bit field. This parameter is interpreted as an uint32_t type.
+  \return           Masked and shifted value.
+*/
+#define _VAL2FLD(field, value)    (((uint32_t)(value) << field ## _Pos) & field ## _Msk)
+
+/**
+  \brief     Mask and shift a register value to extract a bit filed value.
+  \param[in] field  Name of the register bit field.
+  \param[in] value  Value of register. This parameter is interpreted as an uint32_t type.
+  \return           Masked and shifted bit field value.
+*/
+#define _FLD2VAL(field, value)    (((uint32_t)(value) & field ## _Msk) >> field ## _Pos)
+
+/*@} end of group CMSIS_core_bitfield */
+
+
+/**
+  \ingroup    CMSIS_core_register
+  \defgroup   CMSIS_core_base     Core Definitions
+  \brief      Definitions for base addresses, unions, and structures.
+  @{
+ */
+
+/* Memory mapping of Core Hardware */
+  #define SCS_BASE            (0xE000E000UL)                             /*!< System Control Space Base Address */
+  #define ITM_BASE            (0xE0000000UL)                             /*!< ITM Base Address */
+  #define DWT_BASE            (0xE0001000UL)                             /*!< DWT Base Address */
+  #define TPI_BASE            (0xE0040000UL)                             /*!< TPI Base Address */
+  #define DCB_BASE            (0xE000EDF0UL)                             /*!< DCB Base Address */
+  #define DIB_BASE            (0xE000EFB0UL)                             /*!< DIB Base Address */
+  #define EMSS_BASE           (0xE001E000UL)                             /*!<Enhanced Memory SubSystem Base Address */
+  
+  #define SysTick_BASE        (SCS_BASE +  0x0010UL)                     /*!< SysTick Base Address */
+  #define NVIC_BASE           (SCS_BASE +  0x0100UL)                     /*!< NVIC Base Address */
+  #define SCB_BASE            (SCS_BASE +  0x0D00UL)                     /*!< System Control Block Base Address */
+
+  #define SCnSCB              ((SCnSCB_Type    *)     SCS_BASE         ) /*!< System control Register not in SCB */
+  #define SCB                 ((SCB_Type       *)     SCB_BASE         ) /*!< SCB configuration struct */
+  #define SysTick             ((SysTick_Type   *)     SysTick_BASE     ) /*!< SysTick configuration struct */
+  #define NVIC                ((NVIC_Type      *)     NVIC_BASE        ) /*!< NVIC configuration struct */
+  #define ITM                 ((ITM_Type       *)     ITM_BASE         ) /*!< ITM configuration struct */
+  #define DWT                 ((DWT_Type       *)     DWT_BASE         ) /*!< DWT configuration struct */
+  #define TPI                 ((TPI_Type       *)     TPI_BASE         ) /*!< TPI configuration struct */
+  #define DCB                 ((DCB_Type       *)     DCB_BASE         ) /*!< DCB configuration struct */
+  #define DIB                 ((DIB_Type       *)     DIB_BASE         ) /*!< DIB configuration struct */
+  #define EMSS                ((EMSS_Type      *)     EMSS_BASE        ) /*!<Ehanced MSS Registers struct */
+
+  #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+    #define MPU_BASE          (SCS_BASE +  0x0D90UL)                     /*!< Memory Protection Unit */
+    #define MPU               ((MPU_Type       *)     MPU_BASE         ) /*!< Memory Protection Unit */
+  #endif
+
+  #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+    #define SAU_BASE          (SCS_BASE +  0x0DD0UL)                     /*!< Security Attribution Unit */
+    #define SAU               ((SAU_Type       *)     SAU_BASE         ) /*!< Security Attribution Unit */
+  #endif
+
+  #define FPU_BASE            (SCS_BASE +  0x0F30UL)                     /*!< Floating Point Unit */
+  #define FPU                 ((FPU_Type       *)     FPU_BASE         ) /*!< Floating Point Unit */
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+  #define SCS_BASE_NS         (0xE002E000UL)                             /*!< System Control Space Base Address (non-secure address space) */
+
+  #define DCB_BASE_NS         (0xE002EDF0UL)                             /*!< DCB Base Address                  (non-secure address space) */
+  #define DIB_BASE_NS         (0xE002EFB0UL)                             /*!< DIB Base Address                  (non-secure address space) */
+  #define SysTick_BASE_NS     (SCS_BASE_NS +  0x0010UL)                  /*!< SysTick Base Address              (non-secure address space) */
+  #define NVIC_BASE_NS        (SCS_BASE_NS +  0x0100UL)                  /*!< NVIC Base Address                 (non-secure address space) */
+  #define SCB_BASE_NS         (SCS_BASE_NS +  0x0D00UL)                  /*!< System Control Block Base Address (non-secure address space) */
+
+  #define SCnSCB_NS           ((SCnSCB_Type    *)     SCS_BASE_NS      ) /*!< System control Register not in SCB(non-secure address space) */
+  #define SCB_NS              ((SCB_Type       *)     SCB_BASE_NS      ) /*!< SCB configuration struct          (non-secure address space) */
+  #define SysTick_NS          ((SysTick_Type   *)     SysTick_BASE_NS  ) /*!< SysTick configuration struct      (non-secure address space) */
+  #define NVIC_NS             ((NVIC_Type      *)     NVIC_BASE_NS     ) /*!< NVIC configuration struct         (non-secure address space) */
+  #define DCB_NS              ((DCB_Type       *)     DCB_BASE_NS      ) /*!< DCB configuration struct          (non-secure address space) */
+  #define DIB_NS              ((DIB_Type       *)     DIB_BASE_NS      ) /*!< DIB configuration struct          (non-secure address space) */
+
+  #if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+    #define MPU_BASE_NS       (SCS_BASE_NS +  0x0D90UL)                  /*!< Memory Protection Unit            (non-secure address space) */
+    #define MPU_NS            ((MPU_Type       *)     MPU_BASE_NS      ) /*!< Memory Protection Unit            (non-secure address space) */
+  #endif
+
+  #define FPU_BASE_NS         (SCS_BASE_NS +  0x0F30UL)                  /*!< Floating Point Unit               (non-secure address space) */
+  #define FPU_NS              ((FPU_Type       *)     FPU_BASE_NS      ) /*!< Floating Point Unit               (non-secure address space) */
+
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+/*@} */
+
+
+
+/*******************************************************************************
+ *                Hardware Abstraction Layer
+  Core Function Interface contains:
+  - Core NVIC Functions
+  - Core SysTick Functions
+  - Core Debug Functions
+  - Core Register Access Functions
+ ******************************************************************************/
+/**
+  \defgroup CMSIS_Core_FunctionInterface Functions and Instructions Reference
+*/
+
+
+
+/* ##########################   NVIC functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_NVICFunctions NVIC Functions
+  \brief    Functions that manage interrupts and exceptions via the NVIC.
+  @{
+ */
+
+#ifdef CMSIS_NVIC_VIRTUAL
+  #ifndef CMSIS_NVIC_VIRTUAL_HEADER_FILE
+    #define CMSIS_NVIC_VIRTUAL_HEADER_FILE "cmsis_nvic_virtual.h"
+  #endif
+  #include CMSIS_NVIC_VIRTUAL_HEADER_FILE
+#else
+  #define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
+  #define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
+  #define NVIC_EnableIRQ              __NVIC_EnableIRQ
+  #define NVIC_GetEnableIRQ           __NVIC_GetEnableIRQ
+  #define NVIC_DisableIRQ             __NVIC_DisableIRQ
+  #define NVIC_GetPendingIRQ          __NVIC_GetPendingIRQ
+  #define NVIC_SetPendingIRQ          __NVIC_SetPendingIRQ
+  #define NVIC_ClearPendingIRQ        __NVIC_ClearPendingIRQ
+  #define NVIC_GetActive              __NVIC_GetActive
+  #define NVIC_SetPriority            __NVIC_SetPriority
+  #define NVIC_GetPriority            __NVIC_GetPriority
+  #define NVIC_SystemReset            __NVIC_SystemReset
+  #define SW_SystemReset              __SW_SystemReset
+#endif /* CMSIS_NVIC_VIRTUAL */
+
+#ifdef CMSIS_VECTAB_VIRTUAL
+  #ifndef CMSIS_VECTAB_VIRTUAL_HEADER_FILE
+    #define CMSIS_VECTAB_VIRTUAL_HEADER_FILE "cmsis_vectab_virtual.h"
+  #endif
+  #include CMSIS_VECTAB_VIRTUAL_HEADER_FILE
+#else
+  #define NVIC_SetVector              __NVIC_SetVector
+  #define NVIC_GetVector              __NVIC_GetVector
+#endif  /* (CMSIS_VECTAB_VIRTUAL) */
+
+#define NVIC_USER_IRQ_OFFSET          16
+
+
+/* Special LR values for Secure/Non-Secure call handling and exception handling                                               */
+
+/* Function Return Payload (from ARMv8-M Architecture Reference Manual) LR value on entry from Secure BLXNS                   */ 
+#define FNC_RETURN                 (0xFEFFFFFFUL)     /* bit [0] ignored when processing a branch                             */
+
+/* The following EXC_RETURN mask values are used to evaluate the LR on exception entry */
+#define EXC_RETURN_PREFIX          (0xFF000000UL)     /* bits [31:24] set to indicate an EXC_RETURN value                     */
+#define EXC_RETURN_S               (0x00000040UL)     /* bit [6] stack used to push registers: 0=Non-secure 1=Secure          */
+#define EXC_RETURN_DCRS            (0x00000020UL)     /* bit [5] stacking rules for called registers: 0=skipped 1=saved       */
+#define EXC_RETURN_FTYPE           (0x00000010UL)     /* bit [4] allocate stack for floating-point context: 0=done 1=skipped  */
+#define EXC_RETURN_MODE            (0x00000008UL)     /* bit [3] processor mode for return: 0=Handler mode 1=Thread mode      */
+#define EXC_RETURN_SPSEL           (0x00000004UL)     /* bit [2] stack pointer used to restore context: 0=MSP 1=PSP           */
+#define EXC_RETURN_ES              (0x00000001UL)     /* bit [0] security state exception was taken to: 0=Non-secure 1=Secure */
+
+/* Integrity Signature (from ARMv8-M Architecture Reference Manual) for exception context stacking                            */
+#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)  /* Value for processors with floating-point extension:                  */
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125AUL)     /* bit [0] SFTC must match LR bit[4] EXC_RETURN_FTYPE                   */
+#else 
+#define EXC_INTEGRITY_SIGNATURE     (0xFEFA125BUL)     /* Value for processors without floating-point extension                */
+#endif
+
+
+/**
+  \brief   Set Priority Grouping
+  \details Sets the priority grouping field using the required unlock sequence.
+           The parameter PriorityGroup is assigned to the field SCB->AIRCR [10:8] PRIGROUP field.
+           Only values from 0..7 are used.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]      PriorityGroup  Priority grouping field.
+ */
+__STATIC_INLINE void __NVIC_SetPriorityGrouping(uint32_t PriorityGroup)
+{
+  uint32_t reg_value;
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);             /* only values 0..7 are used          */
+
+  reg_value  =  SCB->AIRCR;                                                   /* read old register configuration    */
+  reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
+  reg_value  =  (reg_value                                   |
+                ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)  );              /* Insert write key and priority group */
+  SCB->AIRCR =  reg_value;
+}
+
+
+/**
+  \brief   Get Priority Grouping
+  \details Reads the priority grouping field from the NVIC Interrupt Controller.
+  \return                Priority grouping field (SCB->AIRCR [10:8] PRIGROUP field).
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPriorityGrouping(void)
+{
+  return ((uint32_t)((SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) >> SCB_AIRCR_PRIGROUP_Pos));
+}
+
+
+/**
+  \brief   Enable Interrupt
+  \details Enables a device specific interrupt in the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    __COMPILER_BARRIER();
+    NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __COMPILER_BARRIER();
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Enable status
+  \details Returns a device specific interrupt enable status from the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt is not enabled.
+  \return             1  Interrupt is enabled.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetEnableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Disable Interrupt
+  \details Disables a device specific interrupt in the NVIC interrupt controller.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_DisableIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+    __DSB();
+    __ISB();
+  }
+}
+
+
+/**
+  \brief   Get Pending Interrupt
+  \details Reads the NVIC pending register and returns the pending bit for the specified device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not pending.
+  \return             1  Interrupt status is pending.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ISPR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Pending Interrupt
+  \details Sets the pending bit of a device specific interrupt in the NVIC pending register.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_SetPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ISPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Clear Pending Interrupt
+  \details Clears the pending bit of a device specific interrupt in the NVIC pending register.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void __NVIC_ClearPendingIRQ(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ICPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Active Interrupt
+  \details Reads the active register in the NVIC and returns the active bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not active.
+  \return             1  Interrupt status is active.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetActive(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->IABR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Interrupt Target State
+  \details Reads the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+  \return             1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_GetTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Interrupt Target State
+  \details Sets the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+                      1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_SetTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] |=  ((uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL)));
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Clear Interrupt Target State
+  \details Clears the interrupt target field in the NVIC and returns the interrupt target bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  if interrupt is assigned to Secure
+                      1  if interrupt is assigned to Non Secure
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t NVIC_ClearTargetState(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] &= ~((uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL)));
+    return((uint32_t)(((NVIC->ITNS[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+
+/**
+  \brief   Set Interrupt Priority
+  \details Sets the priority of a device specific interrupt or a processor exception.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]      IRQn  Interrupt number.
+  \param [in]  priority  Priority to set.
+  \note    The priority cannot be set for every processor exception.
+ */
+__STATIC_INLINE void __NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC->IPR[((uint32_t)IRQn)]               = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+  else
+  {
+    SCB->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Priority
+  \details Reads the priority of a device specific interrupt or a processor exception.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn  Interrupt number.
+  \return             Interrupt Priority.
+                      Value is aligned automatically to the implemented priority bits of the microcontroller.
+ */
+__STATIC_INLINE uint32_t __NVIC_GetPriority(IRQn_Type IRQn)
+{
+
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return(((uint32_t)NVIC->IPR[((uint32_t)IRQn)]               >> (8U - __NVIC_PRIO_BITS)));
+  }
+  else
+  {
+    return(((uint32_t)SCB->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] >> (8U - __NVIC_PRIO_BITS)));
+  }
+}
+
+
+/**
+  \brief   Encode Priority
+  \details Encodes the priority for an interrupt with the given priority group,
+           preemptive priority value, and subpriority value.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]     PriorityGroup  Used priority group.
+  \param [in]   PreemptPriority  Preemptive priority value (starting from 0).
+  \param [in]       SubPriority  Subpriority value (starting from 0).
+  \return                        Encoded priority. Value can be used in the function \ref NVIC_SetPriority().
+ */
+__STATIC_INLINE uint32_t NVIC_EncodePriority (uint32_t PriorityGroup, uint32_t PreemptPriority, uint32_t SubPriority)
+{
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);   /* only values 0..7 are used          */
+  uint32_t PreemptPriorityBits;
+  uint32_t SubPriorityBits;
+
+  PreemptPriorityBits = ((7UL - PriorityGroupTmp) > (uint32_t)(__NVIC_PRIO_BITS)) ? (uint32_t)(__NVIC_PRIO_BITS) : (uint32_t)(7UL - PriorityGroupTmp);
+  SubPriorityBits     = ((PriorityGroupTmp + (uint32_t)(__NVIC_PRIO_BITS)) < (uint32_t)7UL) ? (uint32_t)0UL : (uint32_t)((PriorityGroupTmp - 7UL) + (uint32_t)(__NVIC_PRIO_BITS));
+
+  return (
+           ((PreemptPriority & (uint32_t)((1UL << (PreemptPriorityBits)) - 1UL)) << SubPriorityBits) |
+           ((SubPriority     & (uint32_t)((1UL << (SubPriorityBits    )) - 1UL)))
+         );
+}
+
+
+/**
+  \brief   Decode Priority
+  \details Decodes an interrupt priority value with a given priority group to
+           preemptive priority value and subpriority value.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS) the smallest possible priority group is set.
+  \param [in]         Priority   Priority value, which can be retrieved with the function \ref NVIC_GetPriority().
+  \param [in]     PriorityGroup  Used priority group.
+  \param [out] pPreemptPriority  Preemptive priority value (starting from 0).
+  \param [out]     pSubPriority  Subpriority value (starting from 0).
+ */
+__STATIC_INLINE void NVIC_DecodePriority (uint32_t Priority, uint32_t PriorityGroup, uint32_t* const pPreemptPriority, uint32_t* const pSubPriority)
+{
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);   /* only values 0..7 are used          */
+  uint32_t PreemptPriorityBits;
+  uint32_t SubPriorityBits;
+
+  PreemptPriorityBits = ((7UL - PriorityGroupTmp) > (uint32_t)(__NVIC_PRIO_BITS)) ? (uint32_t)(__NVIC_PRIO_BITS) : (uint32_t)(7UL - PriorityGroupTmp);
+  SubPriorityBits     = ((PriorityGroupTmp + (uint32_t)(__NVIC_PRIO_BITS)) < (uint32_t)7UL) ? (uint32_t)0UL : (uint32_t)((PriorityGroupTmp - 7UL) + (uint32_t)(__NVIC_PRIO_BITS));
+
+  *pPreemptPriority = (Priority >> SubPriorityBits) & (uint32_t)((1UL << (PreemptPriorityBits)) - 1UL);
+  *pSubPriority     = (Priority                   ) & (uint32_t)((1UL << (SubPriorityBits    )) - 1UL);
+}
+
+
+/**
+  \brief   Set Interrupt Vector
+  \details Sets an interrupt vector in SRAM based interrupt vector table.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+           VTOR must been relocated to SRAM before.
+  \param [in]   IRQn      Interrupt number
+  \param [in]   vector    Address of interrupt handler function
+ */
+__STATIC_INLINE void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
+{
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET] = vector;
+  __DSB();
+}
+
+
+/**
+  \brief   Get Interrupt Vector
+  \details Reads an interrupt vector from interrupt vector table.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn      Interrupt number.
+  \return                 Address of interrupt handler function
+ */
+__STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn)
+{
+  uint32_t *vectors = (uint32_t *)SCB->VTOR;
+  return vectors[(int32_t)IRQn + NVIC_USER_IRQ_OFFSET];
+}
+
+
+/**
+  \brief   System Reset
+  \details Initiates a system reset request to reset the MCU.
+ */
+__NO_RETURN __STATIC_INLINE void __NVIC_SystemReset(void)
+{
+  __DSB();                                                          /* Ensure all outstanding memory accesses including
+                                                                       buffered write are completed before reset */
+  SCB->AIRCR  = (uint32_t)((0x5FAUL << SCB_AIRCR_VECTKEY_Pos)    |
+                           (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) |
+                            SCB_AIRCR_SYSRESETREQ_Msk    );         /* Keep priority group unchanged */
+  __DSB();                                                          /* Ensure completion of memory access */
+
+  for(;;)                                                           /* wait until reset */
+  {
+    __NOP();
+  }
+}
+
+/**
+  \brief   Software Reset
+  \details Initiates a system reset request to reset the CPU.
+ */
+__NO_RETURN __STATIC_INLINE void __SW_SystemReset(void)
+{
+  __DSB();                                                          /* Ensure all outstanding memory accesses including
+                                                                       buffered write are completed before reset */
+  SCB->AIRCR  = (uint32_t)((0x5FAUL << SCB_AIRCR_VECTKEY_Pos)    |
+                           (SCB->AIRCR & SCB_AIRCR_BFHFNMINS_Msk) | /* Keep BFHFNMINS unchanged. Use this Reset function in case your case need to keep it */
+                           (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) | /* Keep priority group unchanged */
+                            SCB_AIRCR_SYSRESETREQ_Msk    );         
+  __DSB();                                                          /* Ensure completion of memory access */
+
+  for(;;)                                                           /* wait until reset */
+  {
+    __NOP();
+  }
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Priority Grouping (non-secure)
+  \details Sets the non-secure priority grouping field when in secure state using the required unlock sequence.
+           The parameter PriorityGroup is assigned to the field SCB->AIRCR [10:8] PRIGROUP field.
+           Only values from 0..7 are used.
+           In case of a conflict between priority grouping and available
+           priority bits (__NVIC_PRIO_BITS), the smallest possible priority group is set.
+  \param [in]      PriorityGroup  Priority grouping field.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPriorityGrouping_NS(uint32_t PriorityGroup)
+{
+  uint32_t reg_value;
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07UL);             /* only values 0..7 are used          */
+
+  reg_value  =  SCB_NS->AIRCR;                                                /* read old register configuration    */
+  reg_value &= ~((uint32_t)(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk)); /* clear bits to change               */
+  reg_value  =  (reg_value                                   |
+                ((uint32_t)0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |
+                (PriorityGroupTmp << SCB_AIRCR_PRIGROUP_Pos)  );              /* Insert write key and priority group */
+  SCB_NS->AIRCR =  reg_value;
+}
+
+
+/**
+  \brief   Get Priority Grouping (non-secure)
+  \details Reads the priority grouping field from the non-secure NVIC when in secure state.
+  \return                Priority grouping field (SCB->AIRCR [10:8] PRIGROUP field).
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPriorityGrouping_NS(void)
+{
+  return ((uint32_t)((SCB_NS->AIRCR & SCB_AIRCR_PRIGROUP_Msk) >> SCB_AIRCR_PRIGROUP_Pos));
+}
+
+
+/**
+  \brief   Enable Interrupt (non-secure)
+  \details Enables a device specific interrupt in the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_EnableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Enable status (non-secure)
+  \details Returns a device specific interrupt enable status from the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt is not enabled.
+  \return             1  Interrupt is enabled.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetEnableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->ISER[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Disable Interrupt (non-secure)
+  \details Disables a device specific interrupt in the non-secure NVIC interrupt controller when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_DisableIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Pending Interrupt (non-secure)
+  \details Reads the NVIC pending register in the non-secure NVIC when in secure state and returns the pending bit for the specified device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not pending.
+  \return             1  Interrupt status is pending.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->ISPR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Pending Interrupt (non-secure)
+  \details Sets the pending bit of a device specific interrupt in the non-secure NVIC pending register when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ISPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Clear Pending Interrupt (non-secure)
+  \details Clears the pending bit of a device specific interrupt in the non-secure NVIC pending register when in secure state.
+  \param [in]      IRQn  Device specific interrupt number.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE void TZ_NVIC_ClearPendingIRQ_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->ICPR[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
+  }
+}
+
+
+/**
+  \brief   Get Active Interrupt (non-secure)
+  \details Reads the active register in non-secure NVIC when in secure state and returns the active bit for the device specific interrupt.
+  \param [in]      IRQn  Device specific interrupt number.
+  \return             0  Interrupt status is not active.
+  \return             1  Interrupt status is active.
+  \note    IRQn must not be negative.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetActive_NS(IRQn_Type IRQn)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return((uint32_t)(((NVIC_NS->IABR[(((uint32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
+  }
+  else
+  {
+    return(0U);
+  }
+}
+
+
+/**
+  \brief   Set Interrupt Priority (non-secure)
+  \details Sets the priority of a non-secure device specific interrupt or a non-secure processor exception when in secure state.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]      IRQn  Interrupt number.
+  \param [in]  priority  Priority to set.
+  \note    The priority cannot be set for every non-secure processor exception.
+ */
+__STATIC_INLINE void TZ_NVIC_SetPriority_NS(IRQn_Type IRQn, uint32_t priority)
+{
+  if ((int32_t)(IRQn) >= 0)
+  {
+    NVIC_NS->IPR[((uint32_t)IRQn)]               = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+  else
+  {
+    SCB_NS->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
+  }
+}
+
+
+/**
+  \brief   Get Interrupt Priority (non-secure)
+  \details Reads the priority of a non-secure device specific interrupt or a non-secure processor exception when in secure state.
+           The interrupt number can be positive to specify a device specific interrupt,
+           or negative to specify a processor exception.
+  \param [in]   IRQn  Interrupt number.
+  \return             Interrupt Priority. Value is aligned automatically to the implemented priority bits of the microcontroller.
+ */
+__STATIC_INLINE uint32_t TZ_NVIC_GetPriority_NS(IRQn_Type IRQn)
+{
+
+  if ((int32_t)(IRQn) >= 0)
+  {
+    return(((uint32_t)NVIC_NS->IPR[((uint32_t)IRQn)]               >> (8U - __NVIC_PRIO_BITS)));
+  }
+  else
+  {
+    return(((uint32_t)SCB_NS->SHPR[(((uint32_t)IRQn) & 0xFUL)-4UL] >> (8U - __NVIC_PRIO_BITS)));
+  }
+}
+#endif /*  defined (__ARM_FEATURE_CMSE) &&(__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_NVICFunctions */
+
+/* ##########################  MPU functions  #################################### */
+
+#if defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+
+#include "mpu_armv8.h"
+
+#endif
+
+/* ##########################  FPU functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_FpuFunctions FPU Functions
+  \brief    Function that provides FPU type.
+  @{
+ */
+
+/**
+  \brief   get FPU type
+  \details returns the FPU type
+  \returns
+   - \b  0: No FPU
+   - \b  1: Single precision FPU
+   - \b  2: Double + Single precision FPU
+ */
+__STATIC_INLINE uint32_t SCB_GetFPUType(void)
+{
+  uint32_t mvfr0;
+
+  mvfr0 = FPU->MVFR0;
+  if      ((mvfr0 & (FPU_MVFR0_Single_precision_Msk | FPU_MVFR0_Double_precision_Msk)) == 0x220U)
+  {
+    return 2U;           /* Double + Single precision FPU */
+  }
+  else if ((mvfr0 & (FPU_MVFR0_Single_precision_Msk | FPU_MVFR0_Double_precision_Msk)) == 0x020U)
+  {
+    return 1U;           /* Single precision FPU */
+  }
+  else
+  {
+    return 0U;           /* No FPU */
+  }
+}
+
+
+/*@} end of CMSIS_Core_FpuFunctions */
+
+
+
+/* ##########################   SAU functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_SAUFunctions SAU Functions
+  \brief    Functions that configure the SAU.
+  @{
+ */
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+
+/**
+  \brief   Enable SAU
+  \details Enables the Security Attribution Unit (SAU).
+ */
+__STATIC_INLINE void TZ_SAU_Enable(void)
+{
+    SAU->CTRL |=  (SAU_CTRL_ENABLE_Msk);
+}
+
+
+
+/**
+  \brief   Disable SAU
+  \details Disables the Security Attribution Unit (SAU).
+ */
+__STATIC_INLINE void TZ_SAU_Disable(void)
+{
+    SAU->CTRL &= ~(SAU_CTRL_ENABLE_Msk);
+}
+
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_SAUFunctions */
+
+
+
+/* ##################################    Debug Control function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DCBFunctions Debug Control Functions
+  \brief    Functions that access the Debug Control Block.
+  @{
+ */
+
+
+/**
+  \brief   Set Debug Authentication Control Register
+  \details writes to Debug Authentication Control register.
+  \param [in]  value  value to be writen.
+ */
+__STATIC_INLINE void DCB_SetAuthCtrl(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register
+  \details Reads Debug Authentication Control register.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t DCB_GetAuthCtrl(void)
+{
+    return (DCB->DAUTHCTRL);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Set Debug Authentication Control Register (non-secure)
+  \details writes to non-secure Debug Authentication Control register when in secure state.
+  \param [in]  value  value to be writen
+ */
+__STATIC_INLINE void TZ_DCB_SetAuthCtrl_NS(uint32_t value)
+{
+    __DSB();
+    __ISB();
+    DCB_NS->DAUTHCTRL = value;
+    __DSB();
+    __ISB();
+}
+
+
+/**
+  \brief   Get Debug Authentication Control Register (non-secure)
+  \details Reads non-secure Debug Authentication Control register when in secure state.
+  \return             Debug Authentication Control Register.
+ */
+__STATIC_INLINE uint32_t TZ_DCB_GetAuthCtrl_NS(void)
+{
+    return (DCB_NS->DAUTHCTRL);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+
+
+/* ##################################    Debug Identification function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_DIBFunctions Debug Identification Functions
+  \brief    Functions that access the Debug Identification Block.
+  @{
+ */
+
+
+/**
+  \brief   Get Debug Authentication Status Register
+  \details Reads Debug Authentication Status register.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t DIB_GetAuthStatus(void)
+{
+    return (DIB->DAUTHSTATUS);
+}
+
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   Get Debug Authentication Status Register (non-secure)
+  \details Reads non-secure Debug Authentication Status register when in secure state.
+  \return             Debug Authentication Status Register.
+ */
+__STATIC_INLINE uint32_t TZ_DIB_GetAuthStatus_NS(void)
+{
+    return (DIB_NS->DAUTHSTATUS);
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+/*@} end of CMSIS_Core_DCBFunctions */
+
+
+#if ((defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)) || \
+     (defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)))
+
+/* ##########################  Cache functions  #################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_CacheFunctions Cache Functions
+  \brief    Functions that configure Instruction and Data cache.
+  @{
+ */
+
+/* Cache Size ID Register Macros */
+#define CCSIDR_WAYS(x)         (((x) & SCB_CCSIDR_ASSOCIATIVITY_Msk) >> SCB_CCSIDR_ASSOCIATIVITY_Pos)
+#define CCSIDR_SETS(x)         (((x) & SCB_CCSIDR_NUMSETS_Msk      ) >> SCB_CCSIDR_NUMSETS_Pos      )
+
+#define __SCB_DCACHE_LINE_SIZE  32U /*!< STAR-MC1 cache line size is fixed to 32 bytes (8 words). See also register SCB_CCSIDR */
+#define __SCB_ICACHE_LINE_SIZE  32U /*!< STAR-MC1 cache line size is fixed to 32 bytes (8 words). See also register SCB_CCSIDR */
+
+/**
+  \brief   Enable I-Cache
+  \details Turns on I-Cache
+  */
+__STATIC_FORCEINLINE void SCB_EnableICache (void)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    if (SCB->CCR & SCB_CCR_IC_Msk) return;  /* return if ICache is already enabled */
+
+    __DSB();
+    __ISB();
+    SCB->ICIALLU = 0UL;                     /* invalidate I-Cache */
+    __DSB();
+    __ISB();
+    SCB->CCR |=  (uint32_t)SCB_CCR_IC_Msk;  /* enable I-Cache */
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Disable I-Cache
+  \details Turns off I-Cache
+  */
+__STATIC_FORCEINLINE void SCB_DisableICache (void)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    __DSB();
+    __ISB();
+    SCB->CCR &= ~(uint32_t)SCB_CCR_IC_Msk;  /* disable I-Cache */
+    SCB->ICIALLU = 0UL;                     /* invalidate I-Cache */
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Invalidate I-Cache
+  \details Invalidates I-Cache
+  */
+__STATIC_FORCEINLINE void SCB_InvalidateICache (void)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    __DSB();
+    __ISB();
+    SCB->ICIALLU = 0UL;
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   I-Cache Invalidate by address
+  \details Invalidates I-Cache for the given address.
+           I-Cache is invalidated starting from a 32 byte aligned address in 32 byte granularity.
+           I-Cache memory blocks which are part of given address + given size are invalidated.
+  \param[in]   addr    address
+  \param[in]   isize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_InvalidateICache_by_Addr (void *addr, int32_t isize)
+{
+  #if defined (__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
+    if ( isize > 0 ) {
+       int32_t op_size = isize + (((uint32_t)addr) & (__SCB_ICACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_ICACHE_LINE_SIZE - 1U) */;
+
+      __DSB();
+
+      do {
+        SCB->ICIMVAU = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr += __SCB_ICACHE_LINE_SIZE;
+        op_size -= __SCB_ICACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+
+/**
+  \brief   Enable D-Cache
+  \details Turns on D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_EnableDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    if (SCB->CCR & SCB_CCR_DC_Msk) return;  /* return if DCache is already enabled */
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCISW = (((sets << SCB_DCISW_SET_Pos) & SCB_DCISW_SET_Msk) |
+                      ((ways << SCB_DCISW_WAY_Pos) & SCB_DCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+    __DSB();
+
+    SCB->CCR |=  (uint32_t)SCB_CCR_DC_Msk;  /* enable D-Cache */
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Disable D-Cache
+  \details Turns off D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_DisableDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    SCB->CCR &= ~(uint32_t)SCB_CCR_DC_Msk;  /* disable D-Cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* clean & invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCCISW = (((sets << SCB_DCCISW_SET_Pos) & SCB_DCCISW_SET_Msk) |
+                       ((ways << SCB_DCCISW_WAY_Pos) & SCB_DCCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Invalidate D-Cache
+  \details Invalidates D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_InvalidateDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCISW = (((sets << SCB_DCISW_SET_Pos) & SCB_DCISW_SET_Msk) |
+                      ((ways << SCB_DCISW_WAY_Pos) & SCB_DCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Clean D-Cache
+  \details Cleans D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_CleanDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* clean D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCCSW = (((sets << SCB_DCCSW_SET_Pos) & SCB_DCCSW_SET_Msk) |
+                      ((ways << SCB_DCCSW_WAY_Pos) & SCB_DCCSW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   Clean & Invalidate D-Cache
+  \details Cleans and Invalidates D-Cache
+  */
+__STATIC_FORCEINLINE void SCB_CleanInvalidateDCache (void)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    uint32_t ccsidr;
+    uint32_t sets;
+    uint32_t ways;
+
+    SCB->CSSELR = 0U;                       /* select Level 1 data cache */
+    __DSB();
+
+    ccsidr = SCB->CCSIDR;
+
+                                            /* clean & invalidate D-Cache */
+    sets = (uint32_t)(CCSIDR_SETS(ccsidr));
+    do {
+      ways = (uint32_t)(CCSIDR_WAYS(ccsidr));
+      do {
+        SCB->DCCISW = (((sets << SCB_DCCISW_SET_Pos) & SCB_DCCISW_SET_Msk) |
+                       ((ways << SCB_DCCISW_WAY_Pos) & SCB_DCCISW_WAY_Msk)  );
+        #if defined ( __CC_ARM )
+          __schedule_barrier();
+        #endif
+      } while (ways-- != 0U);
+    } while(sets-- != 0U);
+
+    __DSB();
+    __ISB();
+  #endif
+}
+
+
+/**
+  \brief   D-Cache Invalidate by address
+  \details Invalidates D-Cache for the given address.
+           D-Cache is invalidated starting from a 32 byte aligned address in 32 byte granularity.
+           D-Cache memory blocks which are part of given address + given size are invalidated.
+  \param[in]   addr    address
+  \param[in]   dsize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_InvalidateDCache_by_Addr (void *addr, int32_t dsize)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    if ( dsize > 0 ) { 
+       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
+    
+      __DSB();
+
+      do {
+        SCB->DCIMVAC = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr += __SCB_DCACHE_LINE_SIZE;
+        op_size -= __SCB_DCACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+
+/**
+  \brief   D-Cache Clean by address
+  \details Cleans D-Cache for the given address
+           D-Cache is cleaned starting from a 32 byte aligned address in 32 byte granularity.
+           D-Cache memory blocks which are part of given address + given size are cleaned.
+  \param[in]   addr    address
+  \param[in]   dsize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_CleanDCache_by_Addr (uint32_t *addr, int32_t dsize)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    if ( dsize > 0 ) { 
+       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
+    
+      __DSB();
+
+      do {
+        SCB->DCCMVAC = op_addr;             /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr += __SCB_DCACHE_LINE_SIZE;
+        op_size -= __SCB_DCACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+
+/**
+  \brief   D-Cache Clean and Invalidate by address
+  \details Cleans and invalidates D_Cache for the given address
+           D-Cache is cleaned and invalidated starting from a 32 byte aligned address in 32 byte granularity.
+           D-Cache memory blocks which are part of given address + given size are cleaned and invalidated.
+  \param[in]   addr    address (aligned to 32-byte boundary)
+  \param[in]   dsize   size of memory block (in number of bytes)
+*/
+__STATIC_FORCEINLINE void SCB_CleanInvalidateDCache_by_Addr (uint32_t *addr, int32_t dsize)
+{
+  #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    if ( dsize > 0 ) { 
+       int32_t op_size = dsize + (((uint32_t)addr) & (__SCB_DCACHE_LINE_SIZE - 1U));
+      uint32_t op_addr = (uint32_t)addr /* & ~(__SCB_DCACHE_LINE_SIZE - 1U) */;
+    
+      __DSB();
+
+      do {
+        SCB->DCCIMVAC = op_addr;            /* register accepts only 32byte aligned values, only bits 31..5 are valid */
+        op_addr +=          __SCB_DCACHE_LINE_SIZE;
+        op_size -=          __SCB_DCACHE_LINE_SIZE;
+      } while ( op_size > 0 );
+
+      __DSB();
+      __ISB();
+    }
+  #endif
+}
+
+/*@} end of CMSIS_Core_CacheFunctions */
+#endif
+
+
+/* ##################################    SysTick function  ############################################ */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_SysTickFunctions SysTick Functions
+  \brief    Functions that configure the System.
+  @{
+ */
+
+#if defined (__Vendor_SysTickConfig) && (__Vendor_SysTickConfig == 0U)
+
+/**
+  \brief   System Tick Configuration
+  \details Initializes the System Timer and its interrupt, and starts the System Tick Timer.
+           Counter is in free running mode to generate periodic interrupts.
+  \param [in]  ticks  Number of ticks between two interrupts.
+  \return          0  Function succeeded.
+  \return          1  Function failed.
+  \note    When the variable <b>__Vendor_SysTickConfig</b> is set to 1, then the
+           function <b>SysTick_Config</b> is not included. In this case, the file <b><i>device</i>.h</b>
+           must contain a vendor-specific implementation of this function.
+ */
+__STATIC_INLINE uint32_t SysTick_Config(uint32_t ticks)
+{
+  if ((ticks - 1UL) > SysTick_LOAD_RELOAD_Msk)
+  {
+    return (1UL);                                                   /* Reload value impossible */
+  }
+
+  SysTick->LOAD  = (uint32_t)(ticks - 1UL);                         /* set reload register */
+  NVIC_SetPriority (SysTick_IRQn, (1UL << __NVIC_PRIO_BITS) - 1UL); /* set Priority for Systick Interrupt */
+  SysTick->VAL   = 0UL;                                             /* Load the SysTick Counter Value */
+  SysTick->CTRL  = SysTick_CTRL_CLKSOURCE_Msk |
+                   SysTick_CTRL_TICKINT_Msk   |
+                   SysTick_CTRL_ENABLE_Msk;                         /* Enable SysTick IRQ and SysTick Timer */
+  return (0UL);                                                     /* Function successful */
+}
+
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+/**
+  \brief   System Tick Configuration (non-secure)
+  \details Initializes the non-secure System Timer and its interrupt when in secure state, and starts the System Tick Timer.
+           Counter is in free running mode to generate periodic interrupts.
+  \param [in]  ticks  Number of ticks between two interrupts.
+  \return          0  Function succeeded.
+  \return          1  Function failed.
+  \note    When the variable <b>__Vendor_SysTickConfig</b> is set to 1, then the
+           function <b>TZ_SysTick_Config_NS</b> is not included. In this case, the file <b><i>device</i>.h</b>
+           must contain a vendor-specific implementation of this function.
+
+ */
+__STATIC_INLINE uint32_t TZ_SysTick_Config_NS(uint32_t ticks)
+{
+  if ((ticks - 1UL) > SysTick_LOAD_RELOAD_Msk)
+  {
+    return (1UL);                                                         /* Reload value impossible */
+  }
+
+  SysTick_NS->LOAD  = (uint32_t)(ticks - 1UL);                            /* set reload register */
+  TZ_NVIC_SetPriority_NS (SysTick_IRQn, (1UL << __NVIC_PRIO_BITS) - 1UL); /* set Priority for Systick Interrupt */
+  SysTick_NS->VAL   = 0UL;                                                /* Load the SysTick Counter Value */
+  SysTick_NS->CTRL  = SysTick_CTRL_CLKSOURCE_Msk |
+                      SysTick_CTRL_TICKINT_Msk   |
+                      SysTick_CTRL_ENABLE_Msk;                            /* Enable SysTick IRQ and SysTick Timer */
+  return (0UL);                                                           /* Function successful */
+}
+#endif /* defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
+
+#endif
+
+/*@} end of CMSIS_Core_SysTickFunctions */
+
+
+
+/* ##################################### Debug In/Output function ########################################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_core_DebugFunctions ITM Functions
+  \brief    Functions that access the ITM debug interface.
+  @{
+ */
+
+extern volatile int32_t ITM_RxBuffer;                              /*!< External variable to receive characters. */
+#define                 ITM_RXBUFFER_EMPTY  ((int32_t)0x5AA55AA5U) /*!< Value identifying \ref ITM_RxBuffer is ready for next character. */
+
+
+/**
+  \brief   ITM Send Character
+  \details Transmits a character via the ITM channel 0, and
+           \li Just returns when no debugger is connected that has booked the output.
+           \li Is blocking when a debugger is connected, but the previous character sent has not been transmitted.
+  \param [in]     ch  Character to transmit.
+  \returns            Character to transmit.
+ */
+__STATIC_INLINE uint32_t ITM_SendChar (uint32_t ch)
+{
+  if (((ITM->TCR & ITM_TCR_ITMENA_Msk) != 0UL) &&      /* ITM enabled */
+      ((ITM->TER & 1UL               ) != 0UL)   )     /* ITM Port #0 enabled */
+  {
+    while (ITM->PORT[0U].u32 == 0UL)
+    {
+      __NOP();
+    }
+    ITM->PORT[0U].u8 = (uint8_t)ch;
+  }
+  return (ch);
+}
+
+
+/**
+  \brief   ITM Receive Character
+  \details Inputs a character via the external variable \ref ITM_RxBuffer.
+  \return             Received character.
+  \return         -1  No character pending.
+ */
+__STATIC_INLINE int32_t ITM_ReceiveChar (void)
+{
+  int32_t ch = -1;                           /* no character available */
+
+  if (ITM_RxBuffer != ITM_RXBUFFER_EMPTY)
+  {
+    ch = ITM_RxBuffer;
+    ITM_RxBuffer = ITM_RXBUFFER_EMPTY;       /* ready for next character */
+  }
+
+  return (ch);
+}
+
+
+/**
+  \brief   ITM Check Character
+  \details Checks whether a character is pending for reading in the variable \ref ITM_RxBuffer.
+  \return          0  No character available.
+  \return          1  Character available.
+ */
+__STATIC_INLINE int32_t ITM_CheckChar (void)
+{
+
+  if (ITM_RxBuffer == ITM_RXBUFFER_EMPTY)
+  {
+    return (0);                              /* no character available */
+  }
+  else
+  {
+    return (1);                              /*    character available */
+  }
+}
+
+/*@} end of CMSIS_core_DebugFunctions */
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CORE_STAR_H_DEPENDANT */
+
+#endif /* __CMSIS_GENERIC */
diff --git a/lib/cmsis/inc/mpu_armv7.h b/lib/cmsis/inc/mpu_armv7.h
index 66ef59b4a0bff..d9eedf81a64c3 100644
--- a/lib/cmsis/inc/mpu_armv7.h
+++ b/lib/cmsis/inc/mpu_armv7.h
@@ -1,11 +1,11 @@
 /******************************************************************************
  * @file     mpu_armv7.h
  * @brief    CMSIS MPU API for Armv7-M MPU
- * @version  V5.1.0
- * @date     08. March 2019
+ * @version  V5.1.2
+ * @date     25. May 2020
  ******************************************************************************/
 /*
- * Copyright (c) 2017-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2020 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -154,7 +154,7 @@
 * \param InnerCp Configures the inner cache policy.
 * \param IsShareable Configures the memory as shareable or non-shareable.
 */ 
-#define ARM_MPU_ACCESS_NORMAL(OuterCp, InnerCp, IsShareable) ARM_MPU_ACCESS_((4U | (OuterCp)), IsShareable, ((InnerCp) & 2U), ((InnerCp) & 1U))
+#define ARM_MPU_ACCESS_NORMAL(OuterCp, InnerCp, IsShareable) ARM_MPU_ACCESS_((4U | (OuterCp)), IsShareable, ((InnerCp) >> 1U), ((InnerCp) & 1U))
 
 /**
 * MPU Memory Access Attribute non-cacheable policy.
@@ -190,6 +190,7 @@ typedef struct {
 */
 __STATIC_INLINE void ARM_MPU_Enable(uint32_t MPU_Control)
 {
+  __DMB();
   MPU->CTRL = MPU_Control | MPU_CTRL_ENABLE_Msk;
 #ifdef SCB_SHCSR_MEMFAULTENA_Msk
   SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
@@ -207,6 +208,8 @@ __STATIC_INLINE void ARM_MPU_Disable(void)
   SCB->SHCSR &= ~SCB_SHCSR_MEMFAULTENA_Msk;
 #endif
   MPU->CTRL  &= ~MPU_CTRL_ENABLE_Msk;
+  __DSB();
+  __ISB();
 }
 
 /** Clear and disable the given MPU region.
@@ -220,7 +223,7 @@ __STATIC_INLINE void ARM_MPU_ClrRegion(uint32_t rnr)
 
 /** Configure an MPU region.
 * \param rbar Value for RBAR register.
-* \param rsar Value for RSAR register.
+* \param rasr Value for RASR register.
 */   
 __STATIC_INLINE void ARM_MPU_SetRegion(uint32_t rbar, uint32_t rasr)
 {
@@ -231,7 +234,7 @@ __STATIC_INLINE void ARM_MPU_SetRegion(uint32_t rbar, uint32_t rasr)
 /** Configure the given MPU region.
 * \param rnr Region number to be configured.
 * \param rbar Value for RBAR register.
-* \param rsar Value for RSAR register.
+* \param rasr Value for RASR register.
 */   
 __STATIC_INLINE void ARM_MPU_SetRegionEx(uint32_t rnr, uint32_t rbar, uint32_t rasr)
 {
@@ -240,7 +243,7 @@ __STATIC_INLINE void ARM_MPU_SetRegionEx(uint32_t rnr, uint32_t rbar, uint32_t r
   MPU->RASR = rasr;
 }
 
-/** Memcopy with strictly ordered memory access, e.g. for register targets.
+/** Memcpy with strictly ordered memory access, e.g. used by code in ARM_MPU_Load().
 * \param dst Destination data is copied to.
 * \param src Source data is copied from.
 * \param len Amount of data words to be copied.
diff --git a/lib/cmsis/inc/mpu_armv8.h b/lib/cmsis/inc/mpu_armv8.h
index 0041d4dc6ff53..3de16efc86a6f 100644
--- a/lib/cmsis/inc/mpu_armv8.h
+++ b/lib/cmsis/inc/mpu_armv8.h
@@ -1,11 +1,11 @@
 /******************************************************************************
  * @file     mpu_armv8.h
  * @brief    CMSIS MPU API for Armv8-M and Armv8.1-M MPU
- * @version  V5.1.0
- * @date     08. March 2019
+ * @version  V5.1.3
+ * @date     03. February 2021
  ******************************************************************************/
 /*
- * Copyright (c) 2017-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2021 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -44,7 +44,7 @@
 * \param WA Write Allocation: Set to 1 to use cache allocation on write miss.
 */
 #define ARM_MPU_ATTR_MEMORY_(NT, WB, RA, WA) \
-  (((NT & 1U) << 3U) | ((WB & 1U) << 2U) | ((RA & 1U) << 1U) | (WA & 1U))
+  ((((NT) & 1U) << 3U) | (((WB) & 1U) << 2U) | (((RA) & 1U) << 1U) | ((WA) & 1U))
 
 /** \brief Device memory type non Gathering, non Re-ordering, non Early Write Acknowledgement */
 #define ARM_MPU_ATTR_DEVICE_nGnRnE (0U)
@@ -62,7 +62,7 @@
 * \param O Outer memory attributes
 * \param I O == ARM_MPU_ATTR_DEVICE: Device memory attributes, else: Inner memory attributes
 */
-#define ARM_MPU_ATTR(O, I) (((O & 0xFU) << 4U) | (((O & 0xFU) != 0U) ? (I & 0xFU) : ((I & 0x3U) << 2U)))
+#define ARM_MPU_ATTR(O, I) ((((O) & 0xFU) << 4U) | ((((O) & 0xFU) != 0U) ? ((I) & 0xFU) : (((I) & 0x3U) << 2U)))
 
 /** \brief Normal memory non-shareable  */
 #define ARM_MPU_SH_NON   (0U)
@@ -77,7 +77,7 @@
 * \param RO Read-Only: Set to 1 for read-only memory.
 * \param NP Non-Privileged: Set to 1 for non-privileged memory.
 */
-#define ARM_MPU_AP_(RO, NP) (((RO & 1U) << 1U) | (NP & 1U))
+#define ARM_MPU_AP_(RO, NP) ((((RO) & 1U) << 1U) | ((NP) & 1U))
 
 /** \brief Region Base Address Register value
 * \param BASE The base address bits [31:5] of a memory region. The value is zero extended. Effective address gets 32 byte aligned.
@@ -87,18 +87,18 @@
 * \oaram XN eXecute Never: Set to 1 for a non-executable memory region.
 */
 #define ARM_MPU_RBAR(BASE, SH, RO, NP, XN) \
-  ((BASE & MPU_RBAR_BASE_Msk) | \
-  ((SH << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk) | \
+  (((BASE) & MPU_RBAR_BASE_Msk) | \
+  (((SH) << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk) | \
   ((ARM_MPU_AP_(RO, NP) << MPU_RBAR_AP_Pos) & MPU_RBAR_AP_Msk) | \
-  ((XN << MPU_RBAR_XN_Pos) & MPU_RBAR_XN_Msk))
+  (((XN) << MPU_RBAR_XN_Pos) & MPU_RBAR_XN_Msk))
 
 /** \brief Region Limit Address Register value
 * \param LIMIT The limit address bits [31:5] for this memory region. The value is one extended.
 * \param IDX The attribute index to be associated with this memory region.
 */
 #define ARM_MPU_RLAR(LIMIT, IDX) \
-  ((LIMIT & MPU_RLAR_LIMIT_Msk) | \
-  ((IDX << MPU_RLAR_AttrIndx_Pos) & MPU_RLAR_AttrIndx_Msk) | \
+  (((LIMIT) & MPU_RLAR_LIMIT_Msk) | \
+  (((IDX) << MPU_RLAR_AttrIndx_Pos) & MPU_RLAR_AttrIndx_Msk) | \
   (MPU_RLAR_EN_Msk))
 
 #if defined(MPU_RLAR_PXN_Pos)
@@ -109,9 +109,9 @@
 * \param IDX The attribute index to be associated with this memory region.
 */
 #define ARM_MPU_RLAR_PXN(LIMIT, PXN, IDX) \
-  ((LIMIT & MPU_RLAR_LIMIT_Msk) | \
-  ((PXN << MPU_RLAR_PXN_Pos) & MPU_RLAR_PXN_Msk) | \
-  ((IDX << MPU_RLAR_AttrIndx_Pos) & MPU_RLAR_AttrIndx_Msk) | \
+  (((LIMIT) & MPU_RLAR_LIMIT_Msk) | \
+  (((PXN) << MPU_RLAR_PXN_Pos) & MPU_RLAR_PXN_Msk) | \
+  (((IDX) << MPU_RLAR_AttrIndx_Pos) & MPU_RLAR_AttrIndx_Msk) | \
   (MPU_RLAR_EN_Msk))
   
 #endif
@@ -129,6 +129,7 @@ typedef struct {
 */
 __STATIC_INLINE void ARM_MPU_Enable(uint32_t MPU_Control)
 {
+  __DMB();
   MPU->CTRL = MPU_Control | MPU_CTRL_ENABLE_Msk;
 #ifdef SCB_SHCSR_MEMFAULTENA_Msk
   SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
@@ -146,6 +147,8 @@ __STATIC_INLINE void ARM_MPU_Disable(void)
   SCB->SHCSR &= ~SCB_SHCSR_MEMFAULTENA_Msk;
 #endif
   MPU->CTRL  &= ~MPU_CTRL_ENABLE_Msk;
+  __DSB();
+  __ISB();
 }
 
 #ifdef MPU_NS
@@ -154,6 +157,7 @@ __STATIC_INLINE void ARM_MPU_Disable(void)
 */
 __STATIC_INLINE void ARM_MPU_Enable_NS(uint32_t MPU_Control)
 {
+  __DMB();
   MPU_NS->CTRL = MPU_Control | MPU_CTRL_ENABLE_Msk;
 #ifdef SCB_SHCSR_MEMFAULTENA_Msk
   SCB_NS->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
@@ -171,6 +175,8 @@ __STATIC_INLINE void ARM_MPU_Disable_NS(void)
   SCB_NS->SHCSR &= ~SCB_SHCSR_MEMFAULTENA_Msk;
 #endif
   MPU_NS->CTRL  &= ~MPU_CTRL_ENABLE_Msk;
+  __DSB();
+  __ISB();
 }
 #endif
 
@@ -275,7 +281,7 @@ __STATIC_INLINE void ARM_MPU_SetRegion_NS(uint32_t rnr, uint32_t rbar, uint32_t
 }
 #endif
 
-/** Memcopy with strictly ordered memory access, e.g. for register targets.
+/** Memcpy with strictly ordered memory access, e.g. used by code in ARM_MPU_LoadEx()
 * \param dst Destination data is copied to.
 * \param src Source data is copied from.
 * \param len Amount of data words to be copied.
diff --git a/lib/cmsis/inc/pac_armv81.h b/lib/cmsis/inc/pac_armv81.h
new file mode 100644
index 0000000000000..854b60a204cc9
--- /dev/null
+++ b/lib/cmsis/inc/pac_armv81.h
@@ -0,0 +1,206 @@
+/******************************************************************************
+ * @file     pac_armv81.h
+ * @brief    CMSIS PAC key functions for Armv8.1-M PAC extension
+ * @version  V1.0.0
+ * @date     23. March 2022
+ ******************************************************************************/
+/*
+ * Copyright (c) 2022 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
+ *
+ * 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.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include         /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header    /* treat file as system include file */
+#endif
+
+#ifndef PAC_ARMV81_H
+#define PAC_ARMV81_H
+
+
+/* ###################  PAC Key functions  ########################### */
+/**
+  \ingroup  CMSIS_Core_FunctionInterface
+  \defgroup CMSIS_Core_PacKeyFunctions PAC Key functions
+  \brief    Functions that access the PAC keys.
+  @{
+ */
+
+#if (defined (__ARM_FEATURE_PAUTH) && (__ARM_FEATURE_PAUTH == 1))
+
+/**
+  \brief   read the PAC key used for privileged mode
+  \details Reads the PAC key stored in the PAC_KEY_P registers.
+  \param [out]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __get_PAC_KEY_P (uint32_t* pPacKey) {
+  __ASM volatile (
+  "mrs   r1, pac_key_p_0\n"
+  "str   r1,[%0,#0]\n"
+  "mrs   r1, pac_key_p_1\n"
+  "str   r1,[%0,#4]\n"
+  "mrs   r1, pac_key_p_2\n"
+  "str   r1,[%0,#8]\n"
+  "mrs   r1, pac_key_p_3\n"
+  "str   r1,[%0,#12]\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+/**
+  \brief   write the PAC key used for privileged mode
+  \details writes the given PAC key to the PAC_KEY_P registers.
+  \param [in]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __set_PAC_KEY_P (uint32_t* pPacKey) {
+  __ASM volatile (
+  "ldr   r1,[%0,#0]\n"
+  "msr   pac_key_p_0, r1\n"
+  "ldr   r1,[%0,#4]\n"
+  "msr   pac_key_p_1, r1\n"
+  "ldr   r1,[%0,#8]\n"
+  "msr   pac_key_p_2, r1\n"
+  "ldr   r1,[%0,#12]\n"
+  "msr   pac_key_p_3, r1\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+/**
+  \brief   read the PAC key used for unprivileged mode
+  \details Reads the PAC key stored in the PAC_KEY_U registers.
+  \param [out]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __get_PAC_KEY_U (uint32_t* pPacKey) {
+  __ASM volatile (
+  "mrs   r1, pac_key_u_0\n"
+  "str   r1,[%0,#0]\n"
+  "mrs   r1, pac_key_u_1\n"
+  "str   r1,[%0,#4]\n"
+  "mrs   r1, pac_key_u_2\n"
+  "str   r1,[%0,#8]\n"
+  "mrs   r1, pac_key_u_3\n"
+  "str   r1,[%0,#12]\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+/**
+  \brief   write the PAC key used for unprivileged mode
+  \details writes the given PAC key to the PAC_KEY_U registers.
+  \param [in]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __set_PAC_KEY_U (uint32_t* pPacKey) {
+  __ASM volatile (
+  "ldr   r1,[%0,#0]\n"
+  "msr   pac_key_u_0, r1\n"
+  "ldr   r1,[%0,#4]\n"
+  "msr   pac_key_u_1, r1\n"
+  "ldr   r1,[%0,#8]\n"
+  "msr   pac_key_u_2, r1\n"
+  "ldr   r1,[%0,#12]\n"
+  "msr   pac_key_u_3, r1\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+#if (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3))
+
+/**
+  \brief   read the PAC key used for privileged mode (non-secure)
+  \details Reads the PAC key stored in the non-secure PAC_KEY_P registers when in secure mode.
+  \param [out]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __TZ_get_PAC_KEY_P_NS (uint32_t* pPacKey) {
+  __ASM volatile (
+  "mrs   r1, pac_key_p_0_ns\n"
+  "str   r1,[%0,#0]\n"
+  "mrs   r1, pac_key_p_1_ns\n"
+  "str   r1,[%0,#4]\n"
+  "mrs   r1, pac_key_p_2_ns\n"
+  "str   r1,[%0,#8]\n"
+  "mrs   r1, pac_key_p_3_ns\n"
+  "str   r1,[%0,#12]\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+/**
+  \brief   write the PAC key used for privileged mode (non-secure)
+  \details writes the given PAC key to the non-secure PAC_KEY_P registers when in secure mode.
+  \param [in]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __TZ_set_PAC_KEY_P_NS (uint32_t* pPacKey) {
+  __ASM volatile (
+  "ldr   r1,[%0,#0]\n"
+  "msr   pac_key_p_0_ns, r1\n"
+  "ldr   r1,[%0,#4]\n"
+  "msr   pac_key_p_1_ns, r1\n"
+  "ldr   r1,[%0,#8]\n"
+  "msr   pac_key_p_2_ns, r1\n"
+  "ldr   r1,[%0,#12]\n"
+  "msr   pac_key_p_3_ns, r1\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+/**
+  \brief   read the PAC key used for unprivileged mode (non-secure)
+  \details Reads the PAC key stored in the non-secure PAC_KEY_U registers when in secure mode.
+  \param [out]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __TZ_get_PAC_KEY_U_NS (uint32_t* pPacKey) {
+  __ASM volatile (
+  "mrs   r1, pac_key_u_0_ns\n"
+  "str   r1,[%0,#0]\n"
+  "mrs   r1, pac_key_u_1_ns\n"
+  "str   r1,[%0,#4]\n"
+  "mrs   r1, pac_key_u_2_ns\n"
+  "str   r1,[%0,#8]\n"
+  "mrs   r1, pac_key_u_3_ns\n"
+  "str   r1,[%0,#12]\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+/**
+  \brief   write the PAC key used for unprivileged mode (non-secure)
+  \details writes the given PAC key to the non-secure PAC_KEY_U registers when in secure mode.
+  \param [in]    pPacKey  128bit PAC key
+ */
+__STATIC_FORCEINLINE void __TZ_set_PAC_KEY_U_NS (uint32_t* pPacKey) {
+  __ASM volatile (
+  "ldr   r1,[%0,#0]\n"
+  "msr   pac_key_u_0_ns, r1\n"
+  "ldr   r1,[%0,#4]\n"
+  "msr   pac_key_u_1_ns, r1\n"
+  "ldr   r1,[%0,#8]\n"
+  "msr   pac_key_u_2_ns, r1\n"
+  "ldr   r1,[%0,#12]\n"
+  "msr   pac_key_u_3_ns, r1\n"
+  : : "r" (pPacKey) : "memory", "r1"
+  );
+}
+
+#endif /* (defined (__ARM_FEATURE_CMSE ) && (__ARM_FEATURE_CMSE == 3)) */
+
+#endif /* (defined (__ARM_FEATURE_PAUTH) && (__ARM_FEATURE_PAUTH == 1)) */
+
+/*@} end of CMSIS_Core_PacKeyFunctions */
+
+
+#endif /* PAC_ARMV81_H */
diff --git a/lib/cmsis/inc/pmu_armv8.h b/lib/cmsis/inc/pmu_armv8.h
new file mode 100644
index 0000000000000..f8f3d8935b824
--- /dev/null
+++ b/lib/cmsis/inc/pmu_armv8.h
@@ -0,0 +1,337 @@
+/******************************************************************************
+ * @file     pmu_armv8.h
+ * @brief    CMSIS PMU API for Armv8.1-M PMU
+ * @version  V1.0.1
+ * @date     15. April 2020
+ ******************************************************************************/
+/*
+ * Copyright (c) 2020 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
+ *
+ * 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.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include         /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header    /* treat file as system include file */
+#endif
+
+#ifndef ARM_PMU_ARMV8_H
+#define ARM_PMU_ARMV8_H
+
+/**
+ * \brief PMU Events
+ * \note  See the Armv8.1-M Architecture Reference Manual for full details on these PMU events.
+ * */
+
+#define ARM_PMU_SW_INCR                              0x0000             /*!< Software update to the PMU_SWINC register, architecturally executed and condition code check pass */
+#define ARM_PMU_L1I_CACHE_REFILL                     0x0001             /*!< L1 I-Cache refill */
+#define ARM_PMU_L1D_CACHE_REFILL                     0x0003             /*!< L1 D-Cache refill */
+#define ARM_PMU_L1D_CACHE                            0x0004             /*!< L1 D-Cache access */
+#define ARM_PMU_LD_RETIRED                           0x0006             /*!< Memory-reading instruction architecturally executed and condition code check pass */
+#define ARM_PMU_ST_RETIRED                           0x0007             /*!< Memory-writing instruction architecturally executed and condition code check pass */
+#define ARM_PMU_INST_RETIRED                         0x0008             /*!< Instruction architecturally executed */
+#define ARM_PMU_EXC_TAKEN                            0x0009             /*!< Exception entry */
+#define ARM_PMU_EXC_RETURN                           0x000A             /*!< Exception return instruction architecturally executed and the condition code check pass */
+#define ARM_PMU_PC_WRITE_RETIRED                     0x000C             /*!< Software change to the Program Counter (PC). Instruction is architecturally executed and condition code check pass */
+#define ARM_PMU_BR_IMMED_RETIRED                     0x000D             /*!< Immediate branch architecturally executed */
+#define ARM_PMU_BR_RETURN_RETIRED                    0x000E             /*!< Function return instruction architecturally executed and the condition code check pass */
+#define ARM_PMU_UNALIGNED_LDST_RETIRED               0x000F             /*!< Unaligned memory memory-reading or memory-writing instruction architecturally executed and condition code check pass */
+#define ARM_PMU_BR_MIS_PRED                          0x0010             /*!< Mispredicted or not predicted branch speculatively executed */
+#define ARM_PMU_CPU_CYCLES                           0x0011             /*!< Cycle */
+#define ARM_PMU_BR_PRED                              0x0012             /*!< Predictable branch speculatively executed */
+#define ARM_PMU_MEM_ACCESS                           0x0013             /*!< Data memory access */
+#define ARM_PMU_L1I_CACHE                            0x0014             /*!< Level 1 instruction cache access */
+#define ARM_PMU_L1D_CACHE_WB                         0x0015             /*!< Level 1 data cache write-back */
+#define ARM_PMU_L2D_CACHE                            0x0016             /*!< Level 2 data cache access */
+#define ARM_PMU_L2D_CACHE_REFILL                     0x0017             /*!< Level 2 data cache refill */
+#define ARM_PMU_L2D_CACHE_WB                         0x0018             /*!< Level 2 data cache write-back */
+#define ARM_PMU_BUS_ACCESS                           0x0019             /*!< Bus access */
+#define ARM_PMU_MEMORY_ERROR                         0x001A             /*!< Local memory error */
+#define ARM_PMU_INST_SPEC                            0x001B             /*!< Instruction speculatively executed */
+#define ARM_PMU_BUS_CYCLES                           0x001D             /*!< Bus cycles */
+#define ARM_PMU_CHAIN                                0x001E             /*!< For an odd numbered counter, increment when an overflow occurs on the preceding even-numbered counter on the same PE */
+#define ARM_PMU_L1D_CACHE_ALLOCATE                   0x001F             /*!< Level 1 data cache allocation without refill */
+#define ARM_PMU_L2D_CACHE_ALLOCATE                   0x0020             /*!< Level 2 data cache allocation without refill */
+#define ARM_PMU_BR_RETIRED                           0x0021             /*!< Branch instruction architecturally executed */
+#define ARM_PMU_BR_MIS_PRED_RETIRED                  0x0022             /*!< Mispredicted branch instruction architecturally executed */
+#define ARM_PMU_STALL_FRONTEND                       0x0023             /*!< No operation issued because of the frontend */
+#define ARM_PMU_STALL_BACKEND                        0x0024             /*!< No operation issued because of the backend */
+#define ARM_PMU_L2I_CACHE                            0x0027             /*!< Level 2 instruction cache access */
+#define ARM_PMU_L2I_CACHE_REFILL                     0x0028             /*!< Level 2 instruction cache refill */
+#define ARM_PMU_L3D_CACHE_ALLOCATE                   0x0029             /*!< Level 3 data cache allocation without refill */
+#define ARM_PMU_L3D_CACHE_REFILL                     0x002A             /*!< Level 3 data cache refill */
+#define ARM_PMU_L3D_CACHE                            0x002B             /*!< Level 3 data cache access */
+#define ARM_PMU_L3D_CACHE_WB                         0x002C             /*!< Level 3 data cache write-back */
+#define ARM_PMU_LL_CACHE_RD                          0x0036             /*!< Last level data cache read */
+#define ARM_PMU_LL_CACHE_MISS_RD                     0x0037             /*!< Last level data cache read miss */
+#define ARM_PMU_L1D_CACHE_MISS_RD                    0x0039             /*!< Level 1 data cache read miss */
+#define ARM_PMU_OP_COMPLETE                          0x003A             /*!< Operation retired */
+#define ARM_PMU_OP_SPEC                              0x003B             /*!< Operation speculatively executed */
+#define ARM_PMU_STALL                                0x003C             /*!< Stall cycle for instruction or operation not sent for execution */
+#define ARM_PMU_STALL_OP_BACKEND                     0x003D             /*!< Stall cycle for instruction or operation not sent for execution due to pipeline backend */
+#define ARM_PMU_STALL_OP_FRONTEND                    0x003E             /*!< Stall cycle for instruction or operation not sent for execution due to pipeline frontend */
+#define ARM_PMU_STALL_OP                             0x003F             /*!< Instruction or operation slots not occupied each cycle */
+#define ARM_PMU_L1D_CACHE_RD                         0x0040             /*!< Level 1 data cache read */
+#define ARM_PMU_LE_RETIRED                           0x0100             /*!< Loop end instruction executed */
+#define ARM_PMU_LE_SPEC                              0x0101             /*!< Loop end instruction speculatively executed */
+#define ARM_PMU_BF_RETIRED                           0x0104             /*!< Branch future instruction architecturally executed and condition code check pass */
+#define ARM_PMU_BF_SPEC                              0x0105             /*!< Branch future instruction speculatively executed and condition code check pass */
+#define ARM_PMU_LE_CANCEL                            0x0108             /*!< Loop end instruction not taken */
+#define ARM_PMU_BF_CANCEL                            0x0109             /*!< Branch future instruction not taken */
+#define ARM_PMU_SE_CALL_S                            0x0114             /*!< Call to secure function, resulting in Security state change */
+#define ARM_PMU_SE_CALL_NS                           0x0115             /*!< Call to non-secure function, resulting in Security state change */
+#define ARM_PMU_DWT_CMPMATCH0                        0x0118             /*!< DWT comparator 0 match */
+#define ARM_PMU_DWT_CMPMATCH1                        0x0119             /*!< DWT comparator 1 match */
+#define ARM_PMU_DWT_CMPMATCH2                        0x011A             /*!< DWT comparator 2 match */
+#define ARM_PMU_DWT_CMPMATCH3                        0x011B             /*!< DWT comparator 3 match */
+#define ARM_PMU_MVE_INST_RETIRED                     0x0200             /*!< MVE instruction architecturally executed */
+#define ARM_PMU_MVE_INST_SPEC                        0x0201             /*!< MVE instruction speculatively executed */
+#define ARM_PMU_MVE_FP_RETIRED                       0x0204             /*!< MVE floating-point instruction architecturally executed */
+#define ARM_PMU_MVE_FP_SPEC                          0x0205             /*!< MVE floating-point instruction speculatively executed */
+#define ARM_PMU_MVE_FP_HP_RETIRED                    0x0208             /*!< MVE half-precision floating-point instruction architecturally executed */
+#define ARM_PMU_MVE_FP_HP_SPEC                       0x0209             /*!< MVE half-precision floating-point instruction speculatively executed */
+#define ARM_PMU_MVE_FP_SP_RETIRED                    0x020C             /*!< MVE single-precision floating-point instruction architecturally executed */
+#define ARM_PMU_MVE_FP_SP_SPEC                       0x020D             /*!< MVE single-precision floating-point instruction speculatively executed */
+#define ARM_PMU_MVE_FP_MAC_RETIRED                   0x0214             /*!< MVE floating-point multiply or multiply-accumulate instruction architecturally executed */
+#define ARM_PMU_MVE_FP_MAC_SPEC                      0x0215             /*!< MVE floating-point multiply or multiply-accumulate instruction speculatively executed */
+#define ARM_PMU_MVE_INT_RETIRED                      0x0224             /*!< MVE integer instruction architecturally executed */
+#define ARM_PMU_MVE_INT_SPEC                         0x0225             /*!< MVE integer instruction speculatively executed */
+#define ARM_PMU_MVE_INT_MAC_RETIRED                  0x0228             /*!< MVE multiply or multiply-accumulate instruction architecturally executed */
+#define ARM_PMU_MVE_INT_MAC_SPEC                     0x0229             /*!< MVE multiply or multiply-accumulate instruction speculatively executed */
+#define ARM_PMU_MVE_LDST_RETIRED                     0x0238             /*!< MVE load or store instruction architecturally executed */
+#define ARM_PMU_MVE_LDST_SPEC                        0x0239             /*!< MVE load or store instruction speculatively executed */
+#define ARM_PMU_MVE_LD_RETIRED                       0x023C             /*!< MVE load instruction architecturally executed */
+#define ARM_PMU_MVE_LD_SPEC                          0x023D             /*!< MVE load instruction speculatively executed */
+#define ARM_PMU_MVE_ST_RETIRED                       0x0240             /*!< MVE store instruction architecturally executed */
+#define ARM_PMU_MVE_ST_SPEC                          0x0241             /*!< MVE store instruction speculatively executed */
+#define ARM_PMU_MVE_LDST_CONTIG_RETIRED              0x0244             /*!< MVE contiguous load or store instruction architecturally executed */
+#define ARM_PMU_MVE_LDST_CONTIG_SPEC                 0x0245             /*!< MVE contiguous load or store instruction speculatively executed */
+#define ARM_PMU_MVE_LD_CONTIG_RETIRED                0x0248             /*!< MVE contiguous load instruction architecturally executed */
+#define ARM_PMU_MVE_LD_CONTIG_SPEC                   0x0249             /*!< MVE contiguous load instruction speculatively executed */
+#define ARM_PMU_MVE_ST_CONTIG_RETIRED                0x024C             /*!< MVE contiguous store instruction architecturally executed */
+#define ARM_PMU_MVE_ST_CONTIG_SPEC                   0x024D             /*!< MVE contiguous store instruction speculatively executed */
+#define ARM_PMU_MVE_LDST_NONCONTIG_RETIRED           0x0250             /*!< MVE non-contiguous load or store instruction architecturally executed */
+#define ARM_PMU_MVE_LDST_NONCONTIG_SPEC              0x0251             /*!< MVE non-contiguous load or store instruction speculatively executed */
+#define ARM_PMU_MVE_LD_NONCONTIG_RETIRED             0x0254             /*!< MVE non-contiguous load instruction architecturally executed */
+#define ARM_PMU_MVE_LD_NONCONTIG_SPEC                0x0255             /*!< MVE non-contiguous load instruction speculatively executed */
+#define ARM_PMU_MVE_ST_NONCONTIG_RETIRED             0x0258             /*!< MVE non-contiguous store instruction architecturally executed */
+#define ARM_PMU_MVE_ST_NONCONTIG_SPEC                0x0259             /*!< MVE non-contiguous store instruction speculatively executed */
+#define ARM_PMU_MVE_LDST_MULTI_RETIRED               0x025C             /*!< MVE memory instruction targeting multiple registers architecturally executed */
+#define ARM_PMU_MVE_LDST_MULTI_SPEC                  0x025D             /*!< MVE memory instruction targeting multiple registers speculatively executed */
+#define ARM_PMU_MVE_LD_MULTI_RETIRED                 0x0260             /*!< MVE memory load instruction targeting multiple registers architecturally executed */
+#define ARM_PMU_MVE_LD_MULTI_SPEC                    0x0261             /*!< MVE memory load instruction targeting multiple registers speculatively executed */
+#define ARM_PMU_MVE_ST_MULTI_RETIRED                 0x0261             /*!< MVE memory store instruction targeting multiple registers architecturally executed */
+#define ARM_PMU_MVE_ST_MULTI_SPEC                    0x0265             /*!< MVE memory store instruction targeting multiple registers speculatively executed */
+#define ARM_PMU_MVE_LDST_UNALIGNED_RETIRED           0x028C             /*!< MVE unaligned memory load or store instruction architecturally executed */
+#define ARM_PMU_MVE_LDST_UNALIGNED_SPEC              0x028D             /*!< MVE unaligned memory load or store instruction speculatively executed */
+#define ARM_PMU_MVE_LD_UNALIGNED_RETIRED             0x0290             /*!< MVE unaligned load instruction architecturally executed */
+#define ARM_PMU_MVE_LD_UNALIGNED_SPEC                0x0291             /*!< MVE unaligned load instruction speculatively executed */
+#define ARM_PMU_MVE_ST_UNALIGNED_RETIRED             0x0294             /*!< MVE unaligned store instruction architecturally executed */
+#define ARM_PMU_MVE_ST_UNALIGNED_SPEC                0x0295             /*!< MVE unaligned store instruction speculatively executed */
+#define ARM_PMU_MVE_LDST_UNALIGNED_NONCONTIG_RETIRED 0x0298             /*!< MVE unaligned noncontiguous load or store instruction architecturally executed */
+#define ARM_PMU_MVE_LDST_UNALIGNED_NONCONTIG_SPEC    0x0299             /*!< MVE unaligned noncontiguous load or store instruction speculatively executed */
+#define ARM_PMU_MVE_VREDUCE_RETIRED                  0x02A0             /*!< MVE vector reduction instruction architecturally executed */
+#define ARM_PMU_MVE_VREDUCE_SPEC                     0x02A1             /*!< MVE vector reduction instruction speculatively executed */
+#define ARM_PMU_MVE_VREDUCE_FP_RETIRED               0x02A4             /*!< MVE floating-point vector reduction instruction architecturally executed */
+#define ARM_PMU_MVE_VREDUCE_FP_SPEC                  0x02A5             /*!< MVE floating-point vector reduction instruction speculatively executed */
+#define ARM_PMU_MVE_VREDUCE_INT_RETIRED              0x02A8             /*!< MVE integer vector reduction instruction architecturally executed */
+#define ARM_PMU_MVE_VREDUCE_INT_SPEC                 0x02A9             /*!< MVE integer vector reduction instruction speculatively executed */
+#define ARM_PMU_MVE_PRED                             0x02B8             /*!< Cycles where one or more predicated beats architecturally executed */
+#define ARM_PMU_MVE_STALL                            0x02CC             /*!< Stall cycles caused by an MVE instruction */
+#define ARM_PMU_MVE_STALL_RESOURCE                   0x02CD             /*!< Stall cycles caused by an MVE instruction because of resource conflicts */
+#define ARM_PMU_MVE_STALL_RESOURCE_MEM               0x02CE             /*!< Stall cycles caused by an MVE instruction because of memory resource conflicts */
+#define ARM_PMU_MVE_STALL_RESOURCE_FP                0x02CF             /*!< Stall cycles caused by an MVE instruction because of floating-point resource conflicts */
+#define ARM_PMU_MVE_STALL_RESOURCE_INT               0x02D0             /*!< Stall cycles caused by an MVE instruction because of integer resource conflicts */
+#define ARM_PMU_MVE_STALL_BREAK                      0x02D3             /*!< Stall cycles caused by an MVE chain break */
+#define ARM_PMU_MVE_STALL_DEPENDENCY                 0x02D4             /*!< Stall cycles caused by MVE register dependency */
+#define ARM_PMU_ITCM_ACCESS                          0x4007             /*!< Instruction TCM access */
+#define ARM_PMU_DTCM_ACCESS                          0x4008             /*!< Data TCM access */
+#define ARM_PMU_TRCEXTOUT0                           0x4010             /*!< ETM external output 0 */
+#define ARM_PMU_TRCEXTOUT1                           0x4011             /*!< ETM external output 1 */
+#define ARM_PMU_TRCEXTOUT2                           0x4012             /*!< ETM external output 2 */
+#define ARM_PMU_TRCEXTOUT3                           0x4013             /*!< ETM external output 3 */
+#define ARM_PMU_CTI_TRIGOUT4                         0x4018             /*!< Cross-trigger Interface output trigger 4 */
+#define ARM_PMU_CTI_TRIGOUT5                         0x4019             /*!< Cross-trigger Interface output trigger 5 */
+#define ARM_PMU_CTI_TRIGOUT6                         0x401A             /*!< Cross-trigger Interface output trigger 6 */
+#define ARM_PMU_CTI_TRIGOUT7                         0x401B             /*!< Cross-trigger Interface output trigger 7 */
+
+/** \brief PMU Functions */
+
+__STATIC_INLINE void ARM_PMU_Enable(void);
+__STATIC_INLINE void ARM_PMU_Disable(void);
+
+__STATIC_INLINE void ARM_PMU_Set_EVTYPER(uint32_t num, uint32_t type);
+
+__STATIC_INLINE void ARM_PMU_CYCCNT_Reset(void);
+__STATIC_INLINE void ARM_PMU_EVCNTR_ALL_Reset(void);
+
+__STATIC_INLINE void ARM_PMU_CNTR_Enable(uint32_t mask);
+__STATIC_INLINE void ARM_PMU_CNTR_Disable(uint32_t mask);
+
+__STATIC_INLINE uint32_t ARM_PMU_Get_CCNTR(void);
+__STATIC_INLINE uint32_t ARM_PMU_Get_EVCNTR(uint32_t num);
+
+__STATIC_INLINE uint32_t ARM_PMU_Get_CNTR_OVS(void);
+__STATIC_INLINE void ARM_PMU_Set_CNTR_OVS(uint32_t mask);
+
+__STATIC_INLINE void ARM_PMU_Set_CNTR_IRQ_Enable(uint32_t mask);
+__STATIC_INLINE void ARM_PMU_Set_CNTR_IRQ_Disable(uint32_t mask);
+
+__STATIC_INLINE void ARM_PMU_CNTR_Increment(uint32_t mask);
+
+/** 
+  \brief   Enable the PMU
+*/
+__STATIC_INLINE void ARM_PMU_Enable(void) 
+{
+  PMU->CTRL |= PMU_CTRL_ENABLE_Msk;
+}
+
+/** 
+  \brief   Disable the PMU
+*/
+__STATIC_INLINE void ARM_PMU_Disable(void) 
+{
+  PMU->CTRL &= ~PMU_CTRL_ENABLE_Msk;
+}
+
+/** 
+  \brief   Set event to count for PMU eventer counter
+  \param [in]    num     Event counter (0-30) to configure
+  \param [in]    type    Event to count
+*/
+__STATIC_INLINE void ARM_PMU_Set_EVTYPER(uint32_t num, uint32_t type)
+{
+  PMU->EVTYPER[num] = type;
+}
+
+/** 
+  \brief  Reset cycle counter
+*/
+__STATIC_INLINE void ARM_PMU_CYCCNT_Reset(void)
+{
+  PMU->CTRL |= PMU_CTRL_CYCCNT_RESET_Msk;
+}
+
+/** 
+  \brief  Reset all event counters
+*/
+__STATIC_INLINE void ARM_PMU_EVCNTR_ALL_Reset(void)
+{
+  PMU->CTRL |= PMU_CTRL_EVENTCNT_RESET_Msk;
+}
+
+/** 
+  \brief  Enable counters 
+  \param [in]     mask    Counters to enable
+  \note   Enables one or more of the following:
+          - event counters (0-30)
+          - cycle counter
+*/
+__STATIC_INLINE void ARM_PMU_CNTR_Enable(uint32_t mask)
+{
+  PMU->CNTENSET = mask;
+}
+
+/** 
+  \brief  Disable counters
+  \param [in]     mask    Counters to enable
+  \note   Disables one or more of the following:
+          - event counters (0-30)
+          - cycle counter
+*/
+__STATIC_INLINE void ARM_PMU_CNTR_Disable(uint32_t mask)
+{
+  PMU->CNTENCLR = mask;
+}
+
+/** 
+  \brief  Read cycle counter
+  \return                 Cycle count
+*/
+__STATIC_INLINE uint32_t ARM_PMU_Get_CCNTR(void)
+{
+  return PMU->CCNTR;
+}
+
+/** 
+  \brief   Read event counter
+  \param [in]     num     Event counter (0-30) to read
+  \return                 Event count
+*/
+__STATIC_INLINE uint32_t ARM_PMU_Get_EVCNTR(uint32_t num)
+{
+  return PMU_EVCNTR_CNT_Msk & PMU->EVCNTR[num];
+}
+
+/** 
+  \brief   Read counter overflow status
+  \return  Counter overflow status bits for the following:
+          - event counters (0-30)
+          - cycle counter
+*/
+__STATIC_INLINE uint32_t ARM_PMU_Get_CNTR_OVS(void)
+{
+  return PMU->OVSSET;	
+}
+
+/** 
+  \brief   Clear counter overflow status
+  \param [in]     mask    Counter overflow status bits to clear
+  \note    Clears overflow status bits for one or more of the following:
+           - event counters (0-30)
+           - cycle counter
+*/
+__STATIC_INLINE void ARM_PMU_Set_CNTR_OVS(uint32_t mask)
+{
+  PMU->OVSCLR = mask;
+}
+
+/** 
+  \brief   Enable counter overflow interrupt request 
+  \param [in]     mask    Counter overflow interrupt request bits to set
+  \note    Sets overflow interrupt request bits for one or more of the following:
+           - event counters (0-30)
+           - cycle counter
+*/
+__STATIC_INLINE void ARM_PMU_Set_CNTR_IRQ_Enable(uint32_t mask)
+{
+  PMU->INTENSET = mask;
+}
+
+/** 
+  \brief   Disable counter overflow interrupt request 
+  \param [in]     mask    Counter overflow interrupt request bits to clear
+  \note    Clears overflow interrupt request bits for one or more of the following:
+           - event counters (0-30)
+           - cycle counter
+*/
+__STATIC_INLINE void ARM_PMU_Set_CNTR_IRQ_Disable(uint32_t mask)
+{
+  PMU->INTENCLR = mask;
+}
+
+/** 
+  \brief   Software increment event counter 
+  \param [in]     mask    Counters to increment
+  \note    Software increment bits for one or more event counters (0-30)
+*/
+__STATIC_INLINE void ARM_PMU_CNTR_Increment(uint32_t mask)
+{
+  PMU->SWINC = mask;
+}
+
+#endif

From beb44597841805a85d31326b375669b6a1251c02 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 19 Jan 2024 10:49:58 +0200
Subject: [PATCH 0758/3129] mimxrt/boards: Fix __VECTOR_TABLE link issue with
 CMSIS 5.9.0.

In CMSIS 5.9.0, the compiler headers define `__VECTOR_TABLE`, which will be
substituted with its corresponding value (e.g., `__Vectors` for gcc).
However, the linker script in this port can't include compiler headers when
it's processed, so `__VECTOR_TABLE` is used as the literal variable name,
which results in an undefined linker error.

To fix this, the two possible values of `__VECTOR_TABLE` are both defined
in the linker script.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/boards/common.ld | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index c2aa369f66b3a..6c78fea319f96 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -83,13 +83,14 @@ SECTIONS
   /* The startup code goes first into internal RAM */
   .interrupts :
   {
-    __VECTOR_TABLE = .;
+    __Vectors = .;
+    __vector_table = .;
     . = ALIGN(4);
     KEEP(*(.isr_vector))     /* Startup code */
     . = ALIGN(4);
   } > m_interrupts
 
-  __VECTOR_RAM = __VECTOR_TABLE;
+  __VECTOR_RAM = __Vectors;
   __RAM_VECTOR_TABLE_SIZE_BYTES = 0x0;
 
   /* The program code and other data goes into internal RAM */

From e111793d8d6a0b921f47c7396b70a0aca1edaea5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 19 Jan 2024 11:12:13 +0200
Subject: [PATCH 0759/3129] nrf: Fix _start() build issue with CMSIS 5.9.0.

The `_start` function prototype is now declared as no-return, so `main()`
can't return.

To fix this, `main()` is replaced with `_start`.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/nrf/drivers/secureboot/secureboot_main.c | 7 +------
 ports/nrf/main.c                               | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/ports/nrf/drivers/secureboot/secureboot_main.c b/ports/nrf/drivers/secureboot/secureboot_main.c
index 748e080a24fe2..8362852cd7983 100644
--- a/ports/nrf/drivers/secureboot/secureboot_main.c
+++ b/ports/nrf/drivers/secureboot/secureboot_main.c
@@ -176,7 +176,7 @@ static void jump_to_non_secure(void)
     }
 }
 
-int main(void) {
+void _start(void) {
     configure_flash();
     configure_ram();
     configure_peripherals();
@@ -186,9 +186,4 @@ int main(void) {
     while (1) {
 	;
     }
-
-    return 0;
 }
-
-void _start(void) {main();}
-
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 0e5a26c487e43..9809ba0e23fc0 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -107,7 +107,7 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
 extern uint32_t _heap_start;
 extern uint32_t _heap_end;
 
-int main(int argc, char **argv) {
+void NORETURN _start(void) {
     // 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();
@@ -299,8 +299,6 @@ int main(int argc, char **argv) {
     #endif
 
     goto soft_reset;
-
-    return 0;
 }
 
 #if !MICROPY_VFS
@@ -369,7 +367,3 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
     printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
     __fatal_error("Assertion failed");
 }
-
-void _start(void) {
-    main(0, NULL);
-}

From c3ca3612d1ef5e490045c3d4038b1362993c0f26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jan 2024 11:11:25 +1100
Subject: [PATCH 0760/3129] tests/extmod/asyncio_wait_task.py: Add test for
 raise and delayed wait.

This case was fixed in 2ecbad4e91192c88f831d8690dbad31ddba72135, which
stored the exception in the task object.

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

diff --git a/tests/extmod/asyncio_wait_task.py b/tests/extmod/asyncio_wait_task.py
index bce426d971046..7d79104f8cf8f 100644
--- a/tests/extmod/asyncio_wait_task.py
+++ b/tests/extmod/asyncio_wait_task.py
@@ -68,5 +68,16 @@ async def main():
     except ValueError:
         print("ValueError")
 
+    # Wait on a task that raises, but the waiting is done some time later.
+    # Need to suppress the "Task exception wasn't retrieved" message.
+    asyncio.get_event_loop().set_exception_handler(lambda loop, context: None)
+    t = asyncio.create_task(task_raise())
+    for _ in range(5):
+        await asyncio.sleep(0)
+    try:
+        await t
+    except ValueError:
+        print("ValueError")
+
 
 asyncio.run(main())
diff --git a/tests/extmod/asyncio_wait_task.py.exp b/tests/extmod/asyncio_wait_task.py.exp
index 04be37f48406d..514a434223315 100644
--- a/tests/extmod/asyncio_wait_task.py.exp
+++ b/tests/extmod/asyncio_wait_task.py.exp
@@ -8,3 +8,5 @@ world
 took 200 200
 task_raise
 ValueError
+task_raise
+ValueError

From 057701a7708ca6ca96aaf3784c0ef72d22424df8 Mon Sep 17 00:00:00 2001
From: Maarten van der Schrieck <maarten@thingsconnected.nl>
Date: Thu, 22 Jun 2023 15:52:10 +0200
Subject: [PATCH 0761/3129] rp2/machine_uart: Fix potential race condition in
 interrupt handling.

The irq service routine cleared the RT interrupt bit on TX interrupt.  This
opens the possibility that an RT interrupt is missed.

Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>
---
 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 bca07cebfcbf3..72e68a6fb6b61 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -194,7 +194,7 @@ STATIC inline void uart_service_interrupt(machine_uart_obj_t *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);
+        uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & ~(UART_UARTICR_RXIC_BITS | UART_UARTICR_RTIC_BITS);
         uart_fill_tx_fifo(self);
     }
 }

From ce2058685b9ca2278849b3117c2461f6b6fc727f Mon Sep 17 00:00:00 2001
From: Iksas <iksas@mailbox.org>
Date: Fri, 12 May 2023 19:08:26 +0200
Subject: [PATCH 0762/3129] ports: Fix handling of paths containing spaces in
 Makefiles.

Make can't handle paths with spaces, see https://savannah.gnu.org/bugs/?712

The following workarounds exist:

- When using make's built-in functions:
    - Use relative paths wherever possible to avoid spaces in the first
      place.
    - All spaces in paths can be escaped with backslashes; quotes don't
      work.
    - Some users use the shell to temporarily rename directories, or to
      create symlinks without spaces.

- When using make to pass commands to the system's shell, enclose paths in
  quotes.  While make will still interpret quoted strings with spaces as
  multiple words, the system's shell will correctly parse the resulting
  command.

This commit contains the following fixes:

- In ports/stm32/mboot/Makefile: Use relative paths to avoid spaces when
  using built-in functions.

- In all other files: Use quotes to enclose paths when make is used to call
  shell functions.

All changes have been tested with a directory containing spaces.

Signed-off-by: Iksas <iksas@mailbox.org>
---
 ports/esp32/Makefile       | 2 +-
 ports/mimxrt/Makefile      | 2 +-
 ports/rp2/Makefile         | 2 +-
 ports/stm32/mboot/Makefile | 2 +-
 py/mkrules.mk              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index ce574ce799ad7..3df2af4716fd9 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -42,7 +42,7 @@ ifdef USER_C_MODULES
 	CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
 endif
 
-IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -D MICROPY_BOARD_DIR=$(abspath $(BOARD_DIR)) $(CMAKE_ARGS)
+IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -D MICROPY_BOARD_DIR="$(abspath $(BOARD_DIR))" $(CMAKE_ARGS)
 
 ifdef FROZEN_MANIFEST
        IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index f514b773fd495..dd1f5aa7c6ca5 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -491,7 +491,7 @@ $(GEN_FLEXRAM_CONFIG_SRC):
 $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) \
-	    --prefix $(PREFIX_FILE) --iomux $(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h) \
+	    --prefix $(PREFIX_FILE) --iomux "$(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h)" \
 	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR)
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 11d2115a2fd21..b6e8852169217 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -30,7 +30,7 @@ endif
 
 $(VERBOSE)MAKESILENT = -s
 
-CMAKE_ARGS = -DMICROPY_BOARD=$(BOARD) -DMICROPY_BOARD_DIR=$(abspath $(BOARD_DIR))
+CMAKE_ARGS = -DMICROPY_BOARD=$(BOARD) -DMICROPY_BOARD_DIR="$(abspath $(BOARD_DIR))"
 
 ifdef USER_C_MODULES
 CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 389f9f5d0f4ad..9908194237efd 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -6,7 +6,7 @@ BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
 # If not given on the command line, then default to PYBV10.
 BOARD ?= PYBV10
-BOARD_DIR ?= $(abspath ../boards/$(BOARD))
+BOARD_DIR ?= ../boards/$(BOARD)
 endif
 
 # If the build directory is not given, make it reflect the board name.
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 30483feb5c47e..5050935873aff 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -176,7 +176,7 @@ $(HEADER_BUILD):
 ifneq ($(MICROPY_MPYCROSS_DEPENDENCY),)
 # to automatically build mpy-cross, if needed
 $(MICROPY_MPYCROSS_DEPENDENCY):
-	$(MAKE) -C $(abspath $(dir $@)..)
+	$(MAKE) -C "$(abspath $(dir $@)..)"
 endif
 
 ifneq ($(FROZEN_DIR),)

From 8eb658f654de345c935886b47e2e31b1dafeb862 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jan 2024 17:18:27 +1100
Subject: [PATCH 0763/3129] github/workflows: Run mimxrt and rp2 CI with space
 in repository path.

To test building with make and cmake when there is a space in the path.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_mimxrt.yml | 5 +++++
 .github/workflows/ports_rp2.yml    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
index 614d7458079e8..9e782bf63b31c 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -20,8 +20,13 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: 'micropython repo'  # test build with space in path
     steps:
     - uses: actions/checkout@v4
+      with:
+        path: 'micropython repo'
     - name: Install packages
       run: source tools/ci.sh && ci_mimxrt_setup
     - name: Build
diff --git a/.github/workflows/ports_rp2.yml b/.github/workflows/ports_rp2.yml
index 5741b75d2aa79..748f38e143893 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -20,8 +20,13 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: 'micropython repo'  # test build with space in path
     steps:
     - uses: actions/checkout@v4
+      with:
+        path: 'micropython repo'
     - name: Install packages
       run: source tools/ci.sh && ci_rp2_setup
     - name: Build

From 6bb446b7ff62af6d3b6b10f2da0f6d107f97e00e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jan 2024 11:11:25 +1100
Subject: [PATCH 0764/3129] tests/extmod: Remove asyncio .exp files that match
 CPython output.

These were added back in commit c4935f30490d0446e16a51dbf7a6397b771cf804
because the tests required CPython 3.8, which was quite new at the time.
But CPython 3.8 was released over 4 years ago (October 2019) and the CI
test runners, and developers, have this (or a more recent) CPython version.

Removing the .exp files also helps keep MicroPython semantics the same as
CPython.

The asyncio_fair.py test it adjusted slightly to have more deterministic
timing and output.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/asyncio_await_return.py.exp      |  2 --
 tests/extmod/asyncio_basic2.py.exp            |  4 ---
 tests/extmod/asyncio_cancel_fair.py.exp       | 24 --------------
 tests/extmod/asyncio_cancel_fair2.py.exp      |  8 -----
 tests/extmod/asyncio_cancel_task.py.exp       | 31 -----------------
 .../asyncio_cancel_wait_on_finished.py.exp    |  7 ----
 tests/extmod/asyncio_current_task.py.exp      |  1 -
 tests/extmod/asyncio_event.py.exp             | 33 -------------------
 tests/extmod/asyncio_event_fair.py.exp        | 16 ---------
 tests/extmod/asyncio_exception.py.exp         |  7 ----
 tests/extmod/asyncio_fair.py                  |  2 +-
 tests/extmod/asyncio_fair.py.exp              | 13 --------
 tests/extmod/asyncio_lock.py                  |  4 +++
 tests/extmod/asyncio_lock_cancel.py.exp       | 11 -------
 tests/extmod/asyncio_loop_stop.py.exp         |  7 ----
 tests/extmod/asyncio_new_event_loop.py.exp    |  6 ----
 .../asyncio_set_exception_handler.py.exp      |  9 -----
 tests/extmod/asyncio_task_done.py.exp         | 24 --------------
 18 files changed, 5 insertions(+), 204 deletions(-)
 delete mode 100644 tests/extmod/asyncio_await_return.py.exp
 delete mode 100644 tests/extmod/asyncio_basic2.py.exp
 delete mode 100644 tests/extmod/asyncio_cancel_fair.py.exp
 delete mode 100644 tests/extmod/asyncio_cancel_fair2.py.exp
 delete mode 100644 tests/extmod/asyncio_cancel_task.py.exp
 delete mode 100644 tests/extmod/asyncio_cancel_wait_on_finished.py.exp
 delete mode 100644 tests/extmod/asyncio_current_task.py.exp
 delete mode 100644 tests/extmod/asyncio_event.py.exp
 delete mode 100644 tests/extmod/asyncio_event_fair.py.exp
 delete mode 100644 tests/extmod/asyncio_exception.py.exp
 delete mode 100644 tests/extmod/asyncio_fair.py.exp
 delete mode 100644 tests/extmod/asyncio_lock_cancel.py.exp
 delete mode 100644 tests/extmod/asyncio_loop_stop.py.exp
 delete mode 100644 tests/extmod/asyncio_new_event_loop.py.exp
 delete mode 100644 tests/extmod/asyncio_set_exception_handler.py.exp
 delete mode 100644 tests/extmod/asyncio_task_done.py.exp

diff --git a/tests/extmod/asyncio_await_return.py.exp b/tests/extmod/asyncio_await_return.py.exp
deleted file mode 100644
index daaac9e303029..0000000000000
--- a/tests/extmod/asyncio_await_return.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-42
-42
diff --git a/tests/extmod/asyncio_basic2.py.exp b/tests/extmod/asyncio_basic2.py.exp
deleted file mode 100644
index 3ca3521728d44..0000000000000
--- a/tests/extmod/asyncio_basic2.py.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-main start
-forever start
-main done
-42
diff --git a/tests/extmod/asyncio_cancel_fair.py.exp b/tests/extmod/asyncio_cancel_fair.py.exp
deleted file mode 100644
index 8f5da08e4ced4..0000000000000
--- a/tests/extmod/asyncio_cancel_fair.py.exp
+++ /dev/null
@@ -1,24 +0,0 @@
-start 0
-start 1
-start 2
-done 0
-0 cancels 1
-start 0
-cancelled 1
-1 cancels 0
-start 1
-done 2
-start 2
-cancelled 0
-0 cancels 1
-start 0
-cancelled 1
-1 cancels 0
-start 1
-done 2
-start 2
-cancelled 0
-0 cancels 1
-cancelled 1
-1 cancels 0
-done 2
diff --git a/tests/extmod/asyncio_cancel_fair2.py.exp b/tests/extmod/asyncio_cancel_fair2.py.exp
deleted file mode 100644
index e9dd649b453f9..0000000000000
--- a/tests/extmod/asyncio_cancel_fair2.py.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-sleep a
-sleep b 0
-sleep b 1
-sleep b 2
-cancelled a
-done b 0
-done b 1
-done b 2
diff --git a/tests/extmod/asyncio_cancel_task.py.exp b/tests/extmod/asyncio_cancel_task.py.exp
deleted file mode 100644
index 031b94023fd03..0000000000000
--- a/tests/extmod/asyncio_cancel_task.py.exp
+++ /dev/null
@@ -1,31 +0,0 @@
-True
-task start
-True
-main sleep
-task cancel
-task start
-True
-True
-True
-True
-main sleep
-task cancel
-main wait
-main got CancelledError
-task start
-task done
-False
-----
-task 2
-task start
-main cancel
-main sleep
-task cancel
-task 2 cancel
-----
-task 2
-task start
-main cancel
-main sleep
-task cancel
-task 2 done
diff --git a/tests/extmod/asyncio_cancel_wait_on_finished.py.exp b/tests/extmod/asyncio_cancel_wait_on_finished.py.exp
deleted file mode 100644
index 60e871bfe56f0..0000000000000
--- a/tests/extmod/asyncio_cancel_wait_on_finished.py.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-main sleep
-sleep_task sleep
-wait_task wait
-main sleep
-sleep_task wake
-main wait
-CancelledError()
diff --git a/tests/extmod/asyncio_current_task.py.exp b/tests/extmod/asyncio_current_task.py.exp
deleted file mode 100644
index 0ca95142bb715..0000000000000
--- a/tests/extmod/asyncio_current_task.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-True
diff --git a/tests/extmod/asyncio_event.py.exp b/tests/extmod/asyncio_event.py.exp
deleted file mode 100644
index 3188f291e584d..0000000000000
--- a/tests/extmod/asyncio_event.py.exp
+++ /dev/null
@@ -1,33 +0,0 @@
-False
-True
-False
-----
-yield
-start 1
-start 2
-set event
-yield
-True
-end 1
-True
-end 2
-----
-yield
-start 3
-True
-end 3
-----
-clear event
-start 4
-set event
-True
-end 4
-----
-start 5
-----
-start 6
-----
-set event
-----
-TimeoutError
-set event
diff --git a/tests/extmod/asyncio_event_fair.py.exp b/tests/extmod/asyncio_event_fair.py.exp
deleted file mode 100644
index fe2e3d6e47a63..0000000000000
--- a/tests/extmod/asyncio_event_fair.py.exp
+++ /dev/null
@@ -1,16 +0,0 @@
-sleep 0
-wait 2
-sleep 1
-wait 3
-sleep 0
-sleep 1
-wait 2
-sleep 0
-sleep 1
-wait 3
-sleep 0
-sleep 1
-wait 2
-wait 3
-wait 2
-wait 3
diff --git a/tests/extmod/asyncio_exception.py.exp b/tests/extmod/asyncio_exception.py.exp
deleted file mode 100644
index b2ee860170ece..0000000000000
--- a/tests/extmod/asyncio_exception.py.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-main start
-ValueError 1
-main start
-task start
-ValueError 2
-main start
-ValueError 3
diff --git a/tests/extmod/asyncio_fair.py b/tests/extmod/asyncio_fair.py
index 43076fef1d707..3e3ac04735898 100644
--- a/tests/extmod/asyncio_fair.py
+++ b/tests/extmod/asyncio_fair.py
@@ -20,7 +20,7 @@ async def main():
     t2 = asyncio.create_task(task(2, 0.1))
     t3 = asyncio.create_task(task(3, 0.18))
     t4 = asyncio.create_task(task(4, -100))
-    await asyncio.sleep(0.5)
+    await asyncio.sleep(0.45)  # t2 prints 5 times, t3 prints 3 times
     t1.cancel()
     t2.cancel()
     t3.cancel()
diff --git a/tests/extmod/asyncio_fair.py.exp b/tests/extmod/asyncio_fair.py.exp
deleted file mode 100644
index b4b6481db019f..0000000000000
--- a/tests/extmod/asyncio_fair.py.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-task start 1
-task start 2
-task work 2
-task start 3
-task work 3
-task start 4
-task work 2
-task work 3
-task work 2
-task work 2
-task work 3
-task work 2
-finish
diff --git a/tests/extmod/asyncio_lock.py b/tests/extmod/asyncio_lock.py
index f565adb03fc39..10d3285be0f86 100644
--- a/tests/extmod/asyncio_lock.py
+++ b/tests/extmod/asyncio_lock.py
@@ -1,4 +1,8 @@
 # Test Lock class
+#
+# This test has a corresponding .exp file because it tests a very specific ordering of
+# events when cancelling a task waiting on a lock, and that ordering should not change
+# (even though it does match CPython's output).
 
 try:
     import asyncio
diff --git a/tests/extmod/asyncio_lock_cancel.py.exp b/tests/extmod/asyncio_lock_cancel.py.exp
deleted file mode 100644
index 49ae253887436..0000000000000
--- a/tests/extmod/asyncio_lock_cancel.py.exp
+++ /dev/null
@@ -1,11 +0,0 @@
-task 0 start
-task 1 start
-task 2 start
-task 3 start
-task 1 cancel
-task 2 cancel
-task 0 lock_flag False
-task 0 done
-task 3 lock_flag False
-task 3 done
-False
diff --git a/tests/extmod/asyncio_loop_stop.py.exp b/tests/extmod/asyncio_loop_stop.py.exp
deleted file mode 100644
index bada5f0d8412c..0000000000000
--- a/tests/extmod/asyncio_loop_stop.py.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-run 0
-start
-sleep
-run 1
-run 2
-task
-end
diff --git a/tests/extmod/asyncio_new_event_loop.py.exp b/tests/extmod/asyncio_new_event_loop.py.exp
deleted file mode 100644
index 9e104fda39c94..0000000000000
--- a/tests/extmod/asyncio_new_event_loop.py.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-start
-task 0
-stop
-start
-task 0
-stop
diff --git a/tests/extmod/asyncio_set_exception_handler.py.exp b/tests/extmod/asyncio_set_exception_handler.py.exp
deleted file mode 100644
index fb4711469dc5b..0000000000000
--- a/tests/extmod/asyncio_set_exception_handler.py.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-None
-True
-sleep
-custom_handler ValueError(0, 1)
-sleep
-custom_handler ValueError(1, 2)
-custom_handler ValueError(2, 3)
-ValueError(3, 4)
-done
diff --git a/tests/extmod/asyncio_task_done.py.exp b/tests/extmod/asyncio_task_done.py.exp
deleted file mode 100644
index ddda04c5ec43b..0000000000000
--- a/tests/extmod/asyncio_task_done.py.exp
+++ /dev/null
@@ -1,24 +0,0 @@
-==========
-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 982ffdee7e5a5054d81fdef713da31615a3cf80d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Jan 2024 11:30:14 +1100
Subject: [PATCH 0765/3129] stm32/mboot/Makefile: Revert change to BOARD_DIR
 that removed abspath.

This reverts the change from ce2058685b9ca2278849b3117c2461f6b6fc727f.

Without abspath, the build artefacts (object files) for boards with source
files are placed outside the build directory, because the BOARD_DIR
variable starts with "..".  For the list of source files added to SRC_C,
none of them can start with "..".  The usual fix for that would be to make
the files relative to the top of the MicroPython repo (because of the vpath
rule), eg ports/stm32/boards/$(BOARD).  But then the $(wildcard ...)
pattern won't find files in this directory.

So abspath is necessary, although it will prevent building when there is a
space in the path.  A better solution for spaces needs to be found.

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 9908194237efd..389f9f5d0f4ad 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -6,7 +6,7 @@ BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
 # If not given on the command line, then default to PYBV10.
 BOARD ?= PYBV10
-BOARD_DIR ?= ../boards/$(BOARD)
+BOARD_DIR ?= $(abspath ../boards/$(BOARD))
 endif
 
 # If the build directory is not given, make it reflect the board name.

From a166d805f437e9f4bb81be1dd9d880bd8fb4b0ed Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Thu, 3 Aug 2023 22:20:51 +0200
Subject: [PATCH 0766/3129] top: Add pre-commit hook for codespell.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 .pre-commit-config.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3004bc5677214..0576a158b4f1a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,3 +16,10 @@ repos:
     hooks:
       - id: ruff
       - id: ruff-format
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+      - id: codespell
+        name: Spellcheck for changed files (codespell)
+        additional_dependencies:
+          - tomli

From c8772b7baa972f17c08f82af584ac2b13f4c1737 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Thu, 3 Aug 2023 22:22:02 +0200
Subject: [PATCH 0767/3129] CODECONVENTIONS: Update docs for codespell and
 pre-commit hook.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 CODECONVENTIONS.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index d6b0a5926bf4b..d6af0418e42ef 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -104,6 +104,22 @@ This command may work, please raise a new Issue if it doesn't:
 curl -L https://github.com/Homebrew/homebrew-core/raw/2b07d8192623365078a8b855a164ebcdf81494a6/Formula/uncrustify.rb > uncrustify.rb && brew install uncrustify.rb && rm uncrustify.rb
 ```
 
+Code spell checking
+===================
+
+Code spell checking is done using [codespell](https://github.com/codespell-project/codespell#codespell)
+and runs in a GitHub action in CI.  Codespell is configured via `pyproject.toml`
+to avoid false positives.  It is recommended run codespell before submitting a
+PR.  To simplify this, codespell is configured as a pre-commit hook and will be
+installed if you run `pre-commit install` (see below).
+
+If you want to install and run codespell manually, you can do so by running:
+
+```
+$ pip install codespell tomli
+$ codespell
+```
+
 Automatic Pre-Commit Hooks
 ==========================
 

From 307ecc5707e78c62b0b9fb1c0ba8dcb9c4cc5559 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 17 Jan 2024 11:55:20 +1100
Subject: [PATCH 0768/3129] docs: Add note about position-only arguments in
 CPython vs MicroPython.

Required modifying the gen-cpydiff.py code to allow a "preamble" section to
be inserted at the top of any of the generated files.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/differences/modules_preamble.txt | 33 +++++++++++++++++++++++++++
 tools/gen-cpydiff.py                  | 11 ++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 docs/differences/modules_preamble.txt

diff --git a/docs/differences/modules_preamble.txt b/docs/differences/modules_preamble.txt
new file mode 100644
index 0000000000000..1958f0084d2db
--- /dev/null
+++ b/docs/differences/modules_preamble.txt
@@ -0,0 +1,33 @@
+.. Preamble section inserted into generated output
+
+Positional-only Parameters
+--------------------------
+
+To save code size, many functions that accept keyword arguments in CPython only accept positional arguments in MicroPython.
+
+MicroPython marks positional-only parameters in the same way as CPython, by inserting a ``/`` to mark the end of the positional parameters. Any function whose signature ends in ``/`` takes *only* positional arguments. For more details, see `PEP 570 <https://peps.python.org/pep-0570/>`_.
+
+Example
+~~~~~~~
+
+For example, in CPython 3.4 this is the signature of the constructor ``socket.socket``::
+
+    socket.socket(family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None)
+
+However, the signature documented in :func:`MicroPython<socket.socket>` is::
+
+    socket(af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP, /)
+
+The ``/`` at the end of the parameters indicates that they are all positional-only in MicroPython. The following code works in CPython but not in most MicroPython ports::
+
+    import socket
+    s = socket.socket(type=socket.SOCK_DGRAM)
+
+MicroPython will raise an exception::
+
+    TypeError: function doesn't take keyword arguments
+
+The following code will work in both CPython and MicroPython::
+
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 29545bad0b479..578b6c136f568 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -47,7 +47,8 @@
 
 TESTPATH = "../tests/cpydiff"
 DOCPATH = "../docs/genrst"
-INDEXTEMPLATE = "../docs/differences/index_template.txt"
+SRCDIR = "../docs/differences"
+INDEXTEMPLATE = os.path.join(SRCDIR, "index_template.txt")
 INDEX = "index.rst"
 
 HEADER = ".. This document was generated by tools/gen-cpydiff.py\n\n"
@@ -219,6 +220,14 @@ def gen_rst(results):
                     rst.write(section[i] + "\n")
                     rst.write(RSTCHARS[0] * len(section[i]))
                     rst.write(time.strftime("\nGenerated %a %d %b %Y %X UTC\n\n", time.gmtime()))
+                    # If a file docs/differences/<filename>_preamble.txt exists
+                    # then its output is inserted after the top-level heading,
+                    # but before any of the generated sections.
+                    preamble_path = os.path.join(SRCDIR, filename + "_preamble.txt")
+                    if os.path.exists(preamble_path):
+                        with open(preamble_path, "r") as f:
+                            rst.write(f.read())
+                        rst.write("\n")
                     toctree.append(filename)
                 else:
                     rst.write(section[i] + "\n")

From 7ea503929a494a2622d933d3497b393ae14a1550 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 3 Feb 2023 16:42:03 +1100
Subject: [PATCH 0769/3129] py/qstr: Add support for
 MICROPY_QSTR_BYTES_IN_HASH=0.

This disables using qstr hashes altogether, which saves RAM and flash
(two bytes per interned string on a typical build) as well as code size.
On PYBV11 this is worth over 3k flash.

qstr comparison will now be done just by length then data. This affects
qstr_find_strn although this has a negligible performance impact as, for a
given comparison, the length and first character will ~usually be
different anyway.

String hashing (e.g. builtin `hash()` and map.c) now need to compute the
hash dynamically, and for the map case this does come at a performance
cost.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/makeqstrdata.py |  3 ++-
 py/qstr.c          | 52 ++++++++++++++++++++++++++++++++++++++++------
 py/qstr.h          |  7 ++++++-
 tools/mpy-tool.py  | 27 +++++++++++-------------
 4 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 2350fe04d29a6..3e5e7930a5b88 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -295,7 +295,8 @@ def compute_hash(qstr, bytes_hash):
     for b in qstr:
         hash = (hash * 33) ^ b
     # Make sure that valid hash is never zero, zero means "hash not computed"
-    return (hash & ((1 << (8 * bytes_hash)) - 1)) or 1
+    # if bytes_hash is zero, assume a 16-bit mask (to match qstr.c)
+    return (hash & ((1 << (8 * (bytes_hash or 2))) - 1)) or 1
 
 
 def qstr_escape(qst):
diff --git a/py/qstr.c b/py/qstr.c
index dc89013f86f86..204becd2136e0 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -42,7 +42,11 @@
 // A qstr is an index into the qstr pool.
 // The data for a qstr is \0 terminated (so they can be printed using printf)
 
+#if MICROPY_QSTR_BYTES_IN_HASH
 #define Q_HASH_MASK ((1 << (8 * MICROPY_QSTR_BYTES_IN_HASH)) - 1)
+#else
+#define Q_HASH_MASK (0xffff)
+#endif
 
 #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
 #define QSTR_ENTER() mp_thread_mutex_lock(&MP_STATE_VM(qstr_mutex), 1)
@@ -77,6 +81,7 @@ size_t qstr_compute_hash(const byte *data, size_t len) {
 // future .mpy version we could re-order them and make it sorted). It also
 // contains additional qstrs that must have IDs <256, see operator_qstr_list
 // in makeqstrdata.py.
+#if MICROPY_QSTR_BYTES_IN_HASH
 const qstr_hash_t mp_qstr_const_hashes_static[] = {
     #ifndef NO_QSTR
 #define QDEF0(id, hash, len, str) hash,
@@ -86,6 +91,7 @@ const qstr_hash_t mp_qstr_const_hashes_static[] = {
 #undef QDEF1
     #endif
 };
+#endif
 
 const qstr_len_t mp_qstr_const_lengths_static[] = {
     #ifndef NO_QSTR
@@ -103,7 +109,9 @@ const qstr_pool_t mp_qstr_const_pool_static = {
     false,              // is_sorted
     MICROPY_ALLOC_QSTR_ENTRIES_INIT,
     MP_QSTRnumber_of_static,   // corresponds to number of strings in array just below
+    #if MICROPY_QSTR_BYTES_IN_HASH
     (qstr_hash_t *)mp_qstr_const_hashes_static,
+    #endif
     (qstr_len_t *)mp_qstr_const_lengths_static,
     {
         #ifndef NO_QSTR
@@ -118,6 +126,7 @@ const qstr_pool_t mp_qstr_const_pool_static = {
 
 // The next pool is the remainder of the qstrs defined in the firmware. This
 // is sorted.
+#if MICROPY_QSTR_BYTES_IN_HASH
 const qstr_hash_t mp_qstr_const_hashes[] = {
     #ifndef NO_QSTR
 #define QDEF0(id, hash, len, str)
@@ -127,6 +136,7 @@ const qstr_hash_t mp_qstr_const_hashes[] = {
 #undef QDEF1
     #endif
 };
+#endif
 
 const qstr_len_t mp_qstr_const_lengths[] = {
     #ifndef NO_QSTR
@@ -144,7 +154,9 @@ const qstr_pool_t mp_qstr_const_pool = {
     true,               // is_sorted
     MICROPY_ALLOC_QSTR_ENTRIES_INIT,
     MP_QSTRnumber_of - MP_QSTRnumber_of_static,   // corresponds to number of strings in array just below
+    #if MICROPY_QSTR_BYTES_IN_HASH
     (qstr_hash_t *)mp_qstr_const_hashes,
+    #endif
     (qstr_len_t *)mp_qstr_const_lengths,
     {
         #ifndef NO_QSTR
@@ -188,8 +200,13 @@ STATIC const qstr_pool_t *find_qstr(qstr *q) {
 }
 
 // qstr_mutex must be taken while in this function
-STATIC qstr qstr_add(mp_uint_t hash, mp_uint_t len, const char *q_ptr) {
+STATIC qstr qstr_add(mp_uint_t len, const char *q_ptr) {
+    #if MICROPY_QSTR_BYTES_IN_HASH
+    mp_uint_t hash = qstr_compute_hash((const byte *)q_ptr, len);
     DEBUG_printf("QSTR: add hash=%d len=%d data=%.*s\n", hash, len, len, q_ptr);
+    #else
+    DEBUG_printf("QSTR: add len=%d data=%.*s\n", len, len, q_ptr);
+    #endif
 
     // 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) {
@@ -199,7 +216,11 @@ STATIC qstr qstr_add(mp_uint_t hash, mp_uint_t len, const char *q_ptr) {
         new_alloc = MAX(MICROPY_ALLOC_QSTR_ENTRIES_INIT, new_alloc);
         #endif
         mp_uint_t pool_size = sizeof(qstr_pool_t)
-            + (sizeof(const char *) + sizeof(qstr_hash_t) + sizeof(qstr_len_t)) * new_alloc;
+            + (sizeof(const char *)
+                #if MICROPY_QSTR_BYTES_IN_HASH
+                + sizeof(qstr_hash_t)
+                #endif
+                + 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
@@ -211,8 +232,12 @@ STATIC qstr qstr_add(mp_uint_t hash, mp_uint_t len, const char *q_ptr) {
             QSTR_EXIT();
             m_malloc_fail(new_alloc);
         }
+        #if MICROPY_QSTR_BYTES_IN_HASH
         pool->hashes = (qstr_hash_t *)(pool->qstrs + new_alloc);
         pool->lengths = (qstr_len_t *)(pool->hashes + new_alloc);
+        #else
+        pool->lengths = (qstr_len_t *)(pool->qstrs + new_alloc);
+        #endif
         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;
@@ -223,7 +248,9 @@ STATIC qstr qstr_add(mp_uint_t hash, mp_uint_t len, const char *q_ptr) {
 
     // add the new qstr
     mp_uint_t at = MP_STATE_VM(last_pool)->len;
+    #if MICROPY_QSTR_BYTES_IN_HASH
     MP_STATE_VM(last_pool)->hashes[at] = hash;
+    #endif
     MP_STATE_VM(last_pool)->lengths[at] = len;
     MP_STATE_VM(last_pool)->qstrs[at] = q_ptr;
     MP_STATE_VM(last_pool)->len++;
@@ -238,8 +265,10 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
         return MP_QSTR_;
     }
 
+    #if MICROPY_QSTR_BYTES_IN_HASH
     // work out hash of str
     size_t str_hash = qstr_compute_hash((const byte *)str, str_len);
+    #endif
 
     // search pools for the data
     for (const qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL; pool = pool->prev) {
@@ -261,7 +290,11 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
 
         // sequential search for the remaining strings
         for (mp_uint_t at = low; at < high + 1; at++) {
-            if (pool->hashes[at] == str_hash && pool->lengths[at] == str_len
+            if (
+                #if MICROPY_QSTR_BYTES_IN_HASH
+                pool->hashes[at] == str_hash &&
+                #endif
+                pool->lengths[at] == str_len
                 && memcmp(pool->qstrs[at], str, str_len) == 0) {
                 return pool->total_prev_len + at;
             }
@@ -329,10 +362,9 @@ qstr qstr_from_strn(const char *str, size_t len) {
         MP_STATE_VM(qstr_last_used) += n_bytes;
 
         // store the interned strings' data
-        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);
+        q = qstr_add(len, q_ptr);
     }
     QSTR_EXIT();
     return q;
@@ -340,7 +372,11 @@ qstr qstr_from_strn(const char *str, size_t len) {
 
 mp_uint_t qstr_hash(qstr q) {
     const qstr_pool_t *pool = find_qstr(&q);
+    #if MICROPY_QSTR_BYTES_IN_HASH
     return pool->hashes[q];
+    #else
+    return qstr_compute_hash((byte *)pool->qstrs[q], pool->lengths[q]);
+    #endif
 }
 
 size_t qstr_len(qstr q) {
@@ -375,7 +411,11 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si
         *n_total_bytes += gc_nbytes(pool); // this counts actual bytes used in heap
         #else
         *n_total_bytes += sizeof(qstr_pool_t)
-            + (sizeof(const char *) + sizeof(qstr_hash_t) + sizeof(qstr_len_t)) * pool->alloc;
+            + (sizeof(const char *)
+                #if MICROPY_QSTR_BYTES_IN_HASH
+                + sizeof(qstr_hash_t)
+                #endif
+                + sizeof(qstr_len_t)) * pool->alloc;
         #endif
     }
     *n_total_bytes += *n_str_data_bytes;
diff --git a/py/qstr.h b/py/qstr.h
index 0c4fc4632cd53..58ce285fd2c8a 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -60,7 +60,9 @@ enum {
 typedef size_t qstr;
 typedef uint16_t qstr_short_t;
 
-#if MICROPY_QSTR_BYTES_IN_HASH == 1
+#if MICROPY_QSTR_BYTES_IN_HASH == 0
+// No qstr_hash_t type needed.
+#elif 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;
@@ -82,7 +84,9 @@ typedef struct _qstr_pool_t {
     size_t is_sorted : 1;
     size_t alloc;
     size_t len;
+    #if MICROPY_QSTR_BYTES_IN_HASH
     qstr_hash_t *hashes;
+    #endif
     qstr_len_t *lengths;
     const char *qstrs[];
 } qstr_pool_t;
@@ -92,6 +96,7 @@ typedef struct _qstr_pool_t {
 void qstr_init(void);
 
 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);
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 8d86c10173c82..519462ec80157 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1473,21 +1473,20 @@ def freeze_mpy(firmware_qstr_idents, compiled_modules):
     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}
-    for _, _, _, qbytes in new:
-        qhash = qstrutil.compute_hash(qbytes, config.MICROPY_QSTR_BYTES_IN_HASH)
-        print("    %d," % qhash)
-    print("};")
+    if config.MICROPY_QSTR_BYTES_IN_HASH:
+        print()
+        print("const qstr_hash_t mp_qstr_frozen_const_hashes[] = {")
+        for _, _, _, qbytes in new:
+            qhash = qstrutil.compute_hash(qbytes, config.MICROPY_QSTR_BYTES_IN_HASH)
+            print("    %d," % qhash)
+            qstr_content += config.MICROPY_QSTR_BYTES_IN_HASH
+        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)
+        qstr_content += config.MICROPY_QSTR_BYTES_IN_LEN
+        qstr_content += len(qbytes) + 1  # include NUL
     print("};")
     print()
     print("extern const qstr_pool_t mp_qstr_const_pool;")
@@ -1497,14 +1496,12 @@ def freeze_mpy(firmware_qstr_idents, compiled_modules):
     print("    true, // is_sorted")
     print("    %u, // allocated entries" % qstr_pool_alloc)
     print("    %u, // used entries" % len(new))
-    print("    (qstr_hash_t *)mp_qstr_frozen_const_hashes,")
+    if config.MICROPY_QSTR_BYTES_IN_HASH:
+        print("    (qstr_hash_t *)mp_qstr_frozen_const_hashes,")
     print("    (qstr_len_t *)mp_qstr_frozen_const_lengths,")
     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("};")
 

From 8486e28b1704ab2029d24476d78118bdfd56de1b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 31 Oct 2023 10:33:15 +1100
Subject: [PATCH 0770/3129] stm32: Disable qstr hashing on small boards.

Sets MICROPY_QSTR_BYTES_IN_HASH==0 on stm32x0 boards.

This saves e.g. 2kiB on NUCLEO_F091.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h | 2 ++
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h  | 2 ++
 ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index c2a0ba4f44cd3..df781a756717b 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -7,6 +7,8 @@
 
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
 
+#define MICROPY_QSTR_BYTES_IN_HASH  (0)
+
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_EMIT_THUMB          (0)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index e28bb51f609db..6a9ac02714fb7 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -1,6 +1,8 @@
 #define MICROPY_HW_BOARD_NAME       "NUCLEO-F091RC"
 #define MICROPY_HW_MCU_NAME         "STM32F091RCT6"
 
+#define MICROPY_QSTR_BYTES_IN_HASH  (0)
+
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index 7ec295e44d74b..83fd99fc5f971 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -5,6 +5,8 @@
 #define MICROPY_HW_BOARD_NAME       "NUCLEO-L073RZ"
 #define MICROPY_HW_MCU_NAME         "STM32L073RZT6"
 
+#define MICROPY_QSTR_BYTES_IN_HASH  (0)
+
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)

From d4190815a3f0a3fd31c056db46cac3970395c586 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 31 Oct 2023 10:47:45 +1100
Subject: [PATCH 0771/3129] py/mpconfig: Disable qstr hashing at minimum
 feature level.

This will apply to bare-arm and minimal, as well as the minimal unix
variant.

Change the default to MICROPY_QSTR_BYTES_IN_HASH=1 for the CORE,BASIC
levels, 2 for >=EXTRA.

Removes explicit setting of MICROPY_QSTR_BYTES_IN_HASH==1 in ports that
don't set the feature level (because 1 is implied by the default level,
CORE). Applies to cc3200, pic16bt, powerpc.

Removes explicit setting for nRF (which sets feature level). Also for samd,
which sets CORE for d21 and FULL for d51. This means that d21 is unchanged
with MICROPY_QSTR_BYTES_IN_HASH==1, but d51 now moves from 1 to 2 (roughly
adds 1kiB).

The only remaining port which explicitly set bytes-in-hash is rp2 because
it's high-flash (hence CORE level) but lowish-SRAM, so it's worthwhile
saving the RAM for runtime qstrs.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/mpconfigport.h                   | 1 -
 ports/nrf/mpconfigport.h                      | 1 -
 ports/pic16bit/mpconfigport.h                 | 1 -
 ports/powerpc/mpconfigport.h                  | 1 -
 ports/samd/mpconfigport.h                     | 1 -
 ports/unix/variants/minimal/mpconfigvariant.h | 3 ---
 py/mpconfig.h                                 | 6 ++++--
 7 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index fe579c08747b9..d472d29f70242 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -59,7 +59,6 @@
 #else
 #define MICROPY_CPYTHON_COMPAT                      (0)
 #endif
-#define MICROPY_QSTR_BYTES_IN_HASH                  (1)
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN                    (2)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index f3c08059a06eb..30625382e43c2 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -281,7 +281,6 @@
 #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
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index f1bfa4cd6f16d..a2d607fb29325 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -29,7 +29,6 @@
 // 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)
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 06200a9969017..b74f374e7f9f5 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -35,7 +35,6 @@
 
 // #define MICROPY_DEBUG_VERBOSE    (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_EMIT_X64            (0)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 218e4bb96ab3d..160442a4006b8 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -35,7 +35,6 @@
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
 #define MICROPY_GC_ALLOC_THRESHOLD          (0)
 #define MICROPY_ALLOC_PATH_MAX              (256)
-#define MICROPY_QSTR_BYTES_IN_HASH          (1)
 
 // MicroPython emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 0dbfbb3d1cd43..97ed786b8f409 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -64,6 +64,3 @@
 // Enable just the sys and os built-in modules.
 #define MICROPY_PY_SYS (1)
 #define MICROPY_PY_OS (1)
-
-// The minimum sets this to 1 to save flash.
-#define MICROPY_QSTR_BYTES_IN_HASH (2)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a1e9660bf46a6..9a1f04568e0fa 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -290,10 +290,12 @@
 
 // Number of bytes used to store qstr hash
 #ifndef MICROPY_QSTR_BYTES_IN_HASH
-#if MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES
+#if MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES
 #define MICROPY_QSTR_BYTES_IN_HASH (2)
-#else
+#elif MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES
 #define MICROPY_QSTR_BYTES_IN_HASH (1)
+#else
+#define MICROPY_QSTR_BYTES_IN_HASH (0)
 #endif
 #endif
 

From bf6214505fb477890416f4c5ec5912611fc361d6 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Mon, 22 Jan 2024 14:01:02 -0800
Subject: [PATCH 0772/3129] mimxrt/modmachine: Fix deepsleep wakeup pin ifdef.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 ports/mimxrt/modmachine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index b87747b409c9f..e01703af8cd4b 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -139,10 +139,10 @@ NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
         }
     }
 
-    #ifdef MIMXRT117x_SERIES
+    #if defined(MIMXRT117x_SERIES)
     machine_pin_config(pin_WAKEUP_DIG, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
     GPC_CM_EnableIrqWakeup(GPC_CPU_MODE_CTRL_0, GPIO13_Combined_0_31_IRQn, true);
-    #elif defined IOMUXC_SNVS_WAKEUP_GPIO5_IO00
+    #elif defined(pin_WAKEUP)
     machine_pin_config(pin_WAKEUP, PIN_MODE_IT_RISING, PIN_PULL_DISABLED, PIN_DRIVE_OFF, 0, PIN_AF_MODE_ALT5);
     GPC_EnableIRQ(GPC, GPIO5_Combined_0_15_IRQn);
     #endif

From 8d9d74b6dff56a6f9b846a776c618977d3c7aa8f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 25 Jan 2024 12:02:30 +0200
Subject: [PATCH 0773/3129] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Increase
 flash storage space.

Fixes issue #13512.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 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 b969341a7fe1e..7783c0a17c64d 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -2,7 +2,7 @@
 
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME           "Arduino Nano RP2040 Connect"
-#define MICROPY_HW_FLASH_STORAGE_BYTES  (8 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_BYTES  (14 * 1024 * 1024)
 
 // Network config
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nano-rp2040-connect"

From 4a2e510a877fc5b9256b2717acba8ac772e04a6e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 25 Jan 2024 14:30:51 +0200
Subject: [PATCH 0774/3129] ports: Add LED pin aliases for all Arduino boards.

The standard Arduino pinout uses LEDR/G/B and LED_BUILTIN (if available).
This patch adds aliases to match the standard pinout, while retaining
LED_RED/GREEN/BLUE for compatibility with existing scripts and examples.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv        | 3 +++
 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv | 3 +++
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv | 4 ++++
 ports/stm32/boards/ARDUINO_GIGA/pins.csv              | 3 +++
 ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv      | 3 +++
 ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv       | 3 +++
 6 files changed, 19 insertions(+)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv b/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
index b891608d5d89c..5934ae7bf2a0c 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
@@ -12,6 +12,9 @@ D10,GPIO21
 D11,GPIO38
 D12,GPIO47
 D13,GPIO48
+LEDR,GPIO46
+LEDG,GPIO0
+LEDB,GPIO45
 LED_RED,GPIO46
 LED_GREEN,GPIO0
 LED_BLUE,GPIO45
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
index 1e6379a07b8ba..77b5c3de52820 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
@@ -147,6 +147,9 @@ D5,P210
 LED1,P107
 LED2,P400
 LED3,P800
+LEDR,P107
+LEDG,P400
+LEDB,P800
 LED_RED,P107
 LED_GREEN,P400
 LED_BLUE,P800
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
index 0b1566cacf7f6..5f8aeaf447f77 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
@@ -13,12 +13,16 @@ D11,GPIO7
 D12,GPIO4
 D13,GPIO6
 LED,GPIO6
+LED_BUILTIN,GPIO6
 A0,GPIO26
 A1,GPIO27
 A2,GPIO28
 A3,GPIO29
 SDA,GPIO12
 SCL,GPIO13
+LEDR,EXT_GPIO0
+LEDG,EXT_GPIO1
+LEDB,EXT_GPIO2
 LED_RED,EXT_GPIO0
 LED_GREEN,EXT_GPIO1
 LED_BLUE,EXT_GPIO2
diff --git a/ports/stm32/boards/ARDUINO_GIGA/pins.csv b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
index 56e63232908ce..9de1a316d1cd4 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/pins.csv
+++ b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
@@ -179,6 +179,9 @@ UART6_RX,PC7
 #BOOT0,BOOT0
 DAC1,PA4
 DAC2,PA5
+LEDR,PI12
+LEDG,PJ13
+LEDB,PE3
 LED_RED,PI12
 LED_GREEN,PJ13
 LED_BLUE,PE3
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
index 2838510ee3126..72f57adf74234 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
@@ -180,6 +180,9 @@ USB_DP,PA12
 OSCEN,PH1
 DAC1,-PA4
 DAC2,-PA5
+LEDR,PE3
+LEDG,PC13
+LEDB,-PF4
 LED_RED,PE3
 LED_GREEN,PC13
 LED_BLUE,-PF4
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
index 4ac406fe3a743..3b93dcba73f91 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -203,6 +203,9 @@ UART8_RX,PJ9
 OSCEN,PH1
 DAC1,PA4
 DAC2,-PA5
+LEDR,PK5
+LEDG,PK6
+LEDB,PK7
 LED_RED,PK5
 LED_GREEN,PK6
 LED_BLUE,PK7

From 7211bafb336b0a22746481489c3252085e78b42a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Jan 2024 12:19:06 +1100
Subject: [PATCH 0775/3129] esp8266/boards/ESP8266_GENERIC: Disable
 MICROPY_DEBUG_PRINTERS.

This is not enabled on any other MCU port, and is essentially unused on
esp8266 because mp_verbose_flag is always 0.  Disabling saves ~7k of flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
index 3a9c40e79503c..1f679961e8786 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
@@ -7,7 +7,6 @@
 #define MICROPY_EMIT_XTENSA             (1)
 #define MICROPY_EMIT_INLINE_XTENSA      (1)
 
-#define MICROPY_DEBUG_PRINTERS          (1)
 #define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
 
 #define MICROPY_READER_VFS              (MICROPY_VFS)
@@ -24,7 +23,6 @@
 #define MICROPY_EMIT_XTENSA             (1)
 #define MICROPY_EMIT_INLINE_XTENSA      (1)
 
-#define MICROPY_DEBUG_PRINTERS          (1)
 #define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_NORMAL)
 
 #define MICROPY_READER_VFS              (MICROPY_VFS)

From 40687451bbad09386aa64d03d4aab18da8e01706 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Jan 2024 13:04:20 +1100
Subject: [PATCH 0776/3129] tests/extmod/framebuf_polygon.py: Replace
 sys.stdout.write with print.

So the test doesn't depend on the `sys` module.

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

diff --git a/tests/extmod/framebuf_polygon.py b/tests/extmod/framebuf_polygon.py
index 03130b3bf0fab..da05be2c4db52 100644
--- a/tests/extmod/framebuf_polygon.py
+++ b/tests/extmod/framebuf_polygon.py
@@ -1,5 +1,3 @@
-import sys
-
 try:
     import framebuf
     from array import array
@@ -18,8 +16,8 @@ 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")
+            print(" {:02x}".format(val) if val else " ··", end="")
+        print()
 
 
 buf = bytearray(70 * 70)

From 46e833b071174ca18fbeae993a725d8c57da88a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Jan 2024 12:46:03 +1100
Subject: [PATCH 0777/3129] qemu-arm/mpconfigport: Use
 MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES.

This simplifes the port configuration.  It enables quite a few new
features, including the `math` and `cmath` modules, adding about 20k to the
firmware size.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/mpconfigport.h | 41 +++++++++++------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 3efa1412df1ae..ccee777752bdf 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -2,7 +2,7 @@
 
 // options to control how MicroPython is built
 
-#define MICROPY_ALLOC_PATH_MAX      (512)
+#define MICROPY_CONFIG_ROM_LEVEL    (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
 #if defined(__ARM_ARCH_ISA_ARM)
 #define MICROPY_EMIT_ARM            (1)
@@ -15,42 +15,24 @@
 
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
-#define MICROPY_DEBUG_PRINTERS      (0)
 #define MICROPY_ENABLE_GC           (1)
-#define MICROPY_STACK_CHECK         (1)
+#define MICROPY_KBD_EXCEPTION       (0)
 #define MICROPY_HELPER_REPL         (0)
-#define MICROPY_HELPER_LEXER_UNIX   (0)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_WARNINGS            (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_BYTES_HEX (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_POW3    (1)
-#define MICROPY_PY_IO               (1)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_MAXSIZE      (1)
+#define MICROPY_PY_BUILTINS_INPUT   (0)
+#define MICROPY_PY_BUILTINS_HELP    (0)
+#define MICROPY_PY_IO_IOBASE        (0)
 #define MICROPY_PY_SYS_PLATFORM     "qemu-arm"
-#define MICROPY_PY_ERRNO            (1)
-#define MICROPY_PY_BINASCII         (1)
-#define MICROPY_PY_RANDOM           (1)
-#define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_DEFLATE          (1)
-#define MICROPY_PY_JSON             (1)
-#define MICROPY_PY_OS               (1)
-#define MICROPY_PY_RE               (1)
-#define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_HASHLIB          (1)
+#define MICROPY_PY_SYS_STDFILES     (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER (0)
+#define MICROPY_PY_SELECT           (0)
+#define MICROPY_PY_TIME             (0)
+#define MICROPY_PY_ASYNCIO          (0)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/qemu-arm/modmachine.c"
 #define MICROPY_PY_MACHINE_PIN_BASE (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_USE_INTERNAL_PRINTF (1)
 #define MICROPY_VFS                 (1)
 
 // type definitions for the specific machine
@@ -67,6 +49,9 @@ typedef long mp_off_t;
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
+// We need an implementation of the log2 function which is not a macro.
+#define MP_NEED_LOG2 (1)
+
 #ifdef TEST
 #include "shared/upytesthelper/upytesthelper.h"
 #undef MP_PLAT_PRINT_STRN

From d5b96813dcdd40e19a59e220d73a4fba5ab85fbe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Jan 2024 15:11:46 +1100
Subject: [PATCH 0778/3129] extmod/modssl_mbedtls: Fix cipher iteration in
 SSLContext.get_ciphers.

Prior to this commit it would skip every second cipher returned from
mbedtls.

The corresponding test is also updated and now passes on esp32, rp2, stm32
and unix.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modssl_mbedtls.c                    | 4 ----
 tests/extmod/ssl_sslcontext_ciphers.py     | 4 +++-
 tests/extmod/ssl_sslcontext_ciphers.py.exp | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
index 0190c96a9ab19..b6275d8d88fb7 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
@@ -311,10 +311,6 @@ STATIC mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
     for (const int *cipher_list = mbedtls_ssl_list_ciphersuites(); *cipher_list; ++cipher_list) {
         const char *cipher_name = mbedtls_ssl_get_ciphersuite_name(*cipher_list);
         mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str(cipher_name, strlen(cipher_name))));
-        cipher_list++;
-        if (!*cipher_list) {
-            break;
-        }
     }
     return list;
 }
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py b/tests/extmod/ssl_sslcontext_ciphers.py
index d87e96afdf337..20c00b917623c 100644
--- a/tests/extmod/ssl_sslcontext_ciphers.py
+++ b/tests/extmod/ssl_sslcontext_ciphers.py
@@ -12,7 +12,9 @@
 ciphers = ctx.get_ciphers()
 
 for ci in ciphers:
-    print(ci)
+    # Only print those ciphers know to exist on all ports.
+    if ("TLS-ECDHE-ECDSA-WITH-AES" in ci or "TLS-RSA-WITH-AES" in ci) and "CBC" in ci:
+        print(ci)
 
 ctx.set_ciphers(ciphers[:1])
 
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py.exp b/tests/extmod/ssl_sslcontext_ciphers.py.exp
index 4d243a7883b7c..0d21a3bd253e7 100644
--- a/tests/extmod/ssl_sslcontext_ciphers.py.exp
+++ b/tests/extmod/ssl_sslcontext_ciphers.py.exp
@@ -1,6 +1,10 @@
 TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384
+TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA
 TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256
+TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA
 TLS-RSA-WITH-AES-256-CBC-SHA256
+TLS-RSA-WITH-AES-256-CBC-SHA
 TLS-RSA-WITH-AES-128-CBC-SHA256
+TLS-RSA-WITH-AES-128-CBC-SHA
 object 'str' isn't a tuple or list
 (-24192, 'MBEDTLS_ERR_SSL_BAD_CONFIG')

From 3f217e413d257b472aaf2f74b6b6d4ed9cb83f35 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Sat, 30 Jul 2022 17:01:56 +0100
Subject: [PATCH 0779/3129] lib/mbedtls: Update to mbedtls v3.5.1.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 lib/mbedtls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mbedtls b/lib/mbedtls
index 981743de6fcdb..edb8fec988208 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit 981743de6fcdbe672e482b6fd724d31d0a0d2476
+Subproject commit edb8fec9882084344a314368ac7fd957a187519c

From 92136cbe674a7f7adfb4b9a8e4622692c7ced9a1 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Sat, 30 Jul 2022 17:01:56 +0100
Subject: [PATCH 0780/3129] lib/mbedtls_errors: Update error list for latest
 mbedtls.

Running `./do-mp.sh` now generates this `mp_mbedtls_errors.c` file.  The
`esp32_mbedtls_errors.c` file is already up-to-date.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 lib/mbedtls_errors/mp_mbedtls_errors.c | 187 ++++++++-----------------
 1 file changed, 60 insertions(+), 127 deletions(-)

diff --git a/lib/mbedtls_errors/mp_mbedtls_errors.c b/lib/mbedtls_errors/mp_mbedtls_errors.c
index fabbb15e4eb6f..0b16ba74246e6 100644
--- a/lib/mbedtls_errors/mp_mbedtls_errors.c
+++ b/lib/mbedtls_errors/mp_mbedtls_errors.c
@@ -45,10 +45,6 @@
 #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
@@ -65,10 +61,6 @@
 #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
@@ -89,10 +81,6 @@
 #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
@@ -117,6 +105,10 @@
 #include "mbedtls/error.h"
 #endif
 
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#endif
+
 #if defined(MBEDTLS_GCM_C)
 #include "mbedtls/gcm.h"
 #endif
@@ -129,20 +121,12 @@
 #include "mbedtls/hmac_drbg.h"
 #endif
 
-#if defined(MBEDTLS_MD_C)
-#include "mbedtls/md.h"
+#if defined(MBEDTLS_LMS_C)
+#include "mbedtls/lms.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"
+#if defined(MBEDTLS_MD_C)
+#include "mbedtls/md.h"
 #endif
 
 #if defined(MBEDTLS_NET_C)
@@ -153,10 +137,6 @@
 #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
@@ -173,18 +153,14 @@
 #include "mbedtls/pkcs5.h"
 #endif
 
-#if defined(MBEDTLS_PLATFORM_C)
-#include "mbedtls/platform.h"
+#if defined(MBEDTLS_PKCS7_C)
+#include "mbedtls/pkcs7.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
@@ -197,6 +173,10 @@
 #include "mbedtls/sha256.h"
 #endif
 
+#if defined(MBEDTLS_SHA3_C)
+#include "mbedtls/sha3.h"
+#endif
+
 #if defined(MBEDTLS_SHA512_C)
 #include "mbedtls/sha512.h"
 #endif
@@ -213,10 +193,6 @@
 #include "mbedtls/x509.h"
 #endif
 
-#if defined(MBEDTLS_XTEA_C)
-#include "mbedtls/xtea.h"
-#endif
-
 
 // Error code table type
 struct ssl_errs {
@@ -235,7 +211,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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)
@@ -248,7 +223,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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 */
 
@@ -261,7 +235,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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 */
 
@@ -270,7 +243,6 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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)
@@ -300,7 +272,7 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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" },
+        { -(MBEDTLS_ERR_PK_BUFFER_TOO_SMALL), "PK_BUFFER_TOO_SMALL" },
 #endif /* MBEDTLS_PK_C */
 
 #if defined(MBEDTLS_PKCS12_C)
@@ -317,6 +289,21 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH), "PKCS5_PASSWORD_MISMATCH" },
 #endif /* MBEDTLS_PKCS5_C */
 
+#if defined(MBEDTLS_PKCS7_C)
+        { -(MBEDTLS_ERR_PKCS7_INVALID_FORMAT), "PKCS7_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PKCS7_FEATURE_UNAVAILABLE), "PKCS7_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_VERSION), "PKCS7_INVALID_VERSION" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_CONTENT_INFO), "PKCS7_INVALID_CONTENT_INFO" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_ALG), "PKCS7_INVALID_ALG" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_CERT), "PKCS7_INVALID_CERT" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_SIGNATURE), "PKCS7_INVALID_SIGNATURE" },
+        { -(MBEDTLS_ERR_PKCS7_INVALID_SIGNER_INFO), "PKCS7_INVALID_SIGNER_INFO" },
+        { -(MBEDTLS_ERR_PKCS7_BAD_INPUT_DATA), "PKCS7_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PKCS7_ALLOC_FAILED), "PKCS7_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_PKCS7_VERIFY_FAIL), "PKCS7_VERIFY_FAIL" },
+        { -(MBEDTLS_ERR_PKCS7_CERT_DATE_INVALID), "PKCS7_CERT_DATE_INVALID" },
+#endif /* MBEDTLS_PKCS7_C */
+
 #if defined(MBEDTLS_RSA_C)
         { -(MBEDTLS_ERR_RSA_BAD_INPUT_DATA), "RSA_BAD_INPUT_DATA" },
         { -(MBEDTLS_ERR_RSA_INVALID_PADDING), "RSA_INVALID_PADDING" },
@@ -327,45 +314,35 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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_CRYPTO_IN_PROGRESS), "SSL_CRYPTO_IN_PROGRESS" },
         { -(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_DECODE_ERROR), "SSL_DECODE_ERROR" },
         { -(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_UNSUPPORTED_EXTENSION), "SSL_UNSUPPORTED_EXTENSION" },
+        { -(MBEDTLS_ERR_SSL_NO_APPLICATION_PROTOCOL), "SSL_NO_APPLICATION_PROTOCOL" },
         { -(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_UNRECOGNIZED_NAME), "SSL_UNRECOGNIZED_NAME" },
         { -(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_BAD_CERTIFICATE), "SSL_BAD_CERTIFICATE" },
+        { -(MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET), "SSL_RECEIVED_NEW_SESSION_TICKET" },
+        { -(MBEDTLS_ERR_SSL_CANNOT_READ_EARLY_DATA), "SSL_CANNOT_READ_EARLY_DATA" },
+        { -(MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA), "SSL_CANNOT_WRITE_EARLY_DATA" },
+        { -(MBEDTLS_ERR_SSL_CACHE_ENTRY_NOT_FOUND), "SSL_CACHE_ENTRY_NOT_FOUND" },
         { -(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_BAD_PROTOCOL_VERSION), "SSL_BAD_PROTOCOL_VERSION" },
+        { -(MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE), "SSL_HANDSHAKE_FAILURE" },
         { -(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" },
@@ -374,20 +351,18 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
         { -(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_ILLEGAL_PARAMETER), "SSL_ILLEGAL_PARAMETER" },
         { -(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_UNEXPECTED_CID), "SSL_UNEXPECTED_CID" },
         { -(MBEDTLS_ERR_SSL_VERSION_MISMATCH), "SSL_VERSION_MISMATCH" },
-        { -(MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS), "SSL_CRYPTO_IN_PROGRESS" },
         { -(MBEDTLS_ERR_SSL_BAD_CONFIG), "SSL_BAD_CONFIG" },
 #endif /* MBEDTLS_SSL_TLS_C */
 
@@ -424,19 +399,11 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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)
@@ -465,28 +432,18 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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)
@@ -494,10 +451,6 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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" },
@@ -507,7 +460,6 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
 
 #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)
@@ -523,10 +475,15 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED), "ERROR_CORRUPTION_DETECTED" },
 #endif /* MBEDTLS_ERROR_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_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" },
+    { -(MBEDTLS_ERR_GCM_BUFFER_TOO_SMALL), "GCM_BUFFER_TOO_SMALL" },
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_HKDF_C)
@@ -540,17 +497,13 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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_LMS_C)
+    { -(MBEDTLS_ERR_LMS_BAD_INPUT_DATA), "LMS_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_LMS_OUT_OF_PRIVATE_KEYS), "LMS_OUT_OF_PRIVATE_KEYS" },
+    { -(MBEDTLS_ERR_LMS_VERIFY_FAILED), "LMS_VERIFY_FAILED" },
+    { -(MBEDTLS_ERR_LMS_ALLOC_FAILED), "LMS_ALLOC_FAILED" },
+    { -(MBEDTLS_ERR_LMS_BUFFER_TOO_SMALL), "LMS_BUFFER_TOO_SMALL" },
+#endif /* MBEDTLS_LMS_C */
 
 #if defined(MBEDTLS_NET_C)
     { -(MBEDTLS_ERR_NET_SOCKET_FAILED), "NET_SOCKET_FAILED" },
@@ -573,50 +526,30 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
     { -(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_SHA3_C)
+    { -(MBEDTLS_ERR_SHA3_BAD_INPUT_DATA), "SHA3_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_SHA3_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
 };
 

From f3d1495fd3da2c737a043cfc65d5a4f5c6155ad5 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Sat, 30 Jul 2022 17:01:56 +0100
Subject: [PATCH 0781/3129] all: Update bindings, ports and tests for mbedtls
 v3.5.1.

Changes include:

- Some mbedtls source files renamed or deprecated.

- Our `mbedtls_config.h` files are renamed to `mbedtls_config_port.h`, so
  they don't clash with mbedtls's new default configuration file named
  `mbedtls_config.h`.

- MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE is deprecated.

- MBEDTLS_HAVE_TIME now requires an `mbedtls_ms_time` function to be
  defined but it's only used for TLSv1.3 (currently not enabled in
  MicroPython so there is a lazy implementation, i.e. seconds * 1000).

- `tests/multi_net/ssl_data.py` is removed (due to deprecation of
  MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE), there are the existing
  `ssl_cert_rsa.py` and `sslcontext_server_client.py` tests which do very
  similar, simple SSL data transfer.

- Tests now use an EC key by default (they are smaller and faster), and the
  RSA key has been regenerated due to the old PKCS encoding used by openssl
  rsa command, see
  https://stackoverflow.com/questions/40822328/openssl-rsa-key-pem-and-der-conversion-does-not-match
  (and `tests/README.md` has been updated accordingly).

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 extmod/extmod.cmake                           |  25 +++----
 extmod/extmod.mk                              |  27 +++----
 extmod/mbedtls/mbedtls_config_common.h        |  11 ++-
 ...mbedtls_config.h => mbedtls_config_port.h} |   1 +
 ports/mimxrt/mbedtls/mbedtls_port.c           |  10 ++-
 .../mbedtls_config_board.h                    |   2 +-
 ...mbedtls_config.h => mbedtls_config_port.h} |   1 +
 ports/renesas-ra/mbedtls/mbedtls_port.c       |  10 ++-
 ...mbedtls_config.h => mbedtls_config_port.h} |   1 +
 ports/rp2/mbedtls/mbedtls_port.c              |   9 ++-
 .../ARDUINO_GIGA/mbedtls_config_board.h       |   2 +-
 .../mbedtls_config_board.h                    |   2 +-
 .../mbedtls_config_board.h                    |   2 +-
 ...mbedtls_config.h => mbedtls_config_port.h} |   1 +
 ports/stm32/mbedtls/mbedtls_port.c            |  10 ++-
 ...mbedtls_config.h => mbedtls_config_port.h} |   1 -
 tests/README.md                               |   2 +-
 tests/multi_net/asyncio_tls_server_client.py  |   4 +-
 ...o_tls_server_client_cert_required_error.py |   4 +-
 .../asyncio_tls_server_client_readline.py     |   4 +-
 .../asyncio_tls_server_client_verify_error.py |   4 +-
 tests/multi_net/ec_cert.der                   | Bin 0 -> 471 bytes
 tests/multi_net/ec_key.der                    | Bin 0 -> 121 bytes
 tests/multi_net/expired_cert.der              | Bin 1331 -> 471 bytes
 tests/multi_net/rsa_cert.der                  | Bin 867 -> 867 bytes
 tests/multi_net/rsa_key.der                   | Bin 1217 -> 1193 bytes
 tests/multi_net/ssl_cert_ec.py                |  56 +++++++++++++++
 .../{ssl_data.py.exp => ssl_cert_ec.py.exp}   |   0
 tests/multi_net/ssl_data.py                   |  67 ------------------
 .../sslcontext_check_hostname_error.py        |   4 +-
 tests/multi_net/sslcontext_getpeercert.py     |   4 +-
 tests/multi_net/sslcontext_getpeercert.py.exp |   2 +-
 tests/multi_net/sslcontext_server_client.py   |   4 +-
 .../sslcontext_server_client_ciphers.py       |   8 +--
 .../sslcontext_server_client_files.py         |   4 +-
 tests/multi_net/sslcontext_verify_error.py    |   4 +-
 .../multi_net/sslcontext_verify_time_error.py |   2 +-
 37 files changed, 156 insertions(+), 132 deletions(-)
 rename ports/mimxrt/mbedtls/{mbedtls_config.h => mbedtls_config_port.h} (96%)
 rename ports/renesas-ra/mbedtls/{mbedtls_config.h => mbedtls_config_port.h} (96%)
 rename ports/rp2/mbedtls/{mbedtls_config.h => mbedtls_config_port.h} (97%)
 rename ports/stm32/mbedtls/{mbedtls_config.h => mbedtls_config_port.h} (96%)
 rename ports/unix/mbedtls/{mbedtls_config.h => mbedtls_config_port.h} (98%)
 create mode 100644 tests/multi_net/ec_cert.der
 create mode 100644 tests/multi_net/ec_key.der
 create mode 100644 tests/multi_net/ssl_cert_ec.py
 rename tests/multi_net/{ssl_data.py.exp => ssl_cert_ec.py.exp} (100%)
 delete mode 100644 tests/multi_net/ssl_data.py

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index ac10faa86541c..a55cd76f88bc9 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -174,20 +174,24 @@ if(MICROPY_SSL_MBEDTLS)
         ${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
         ${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_core.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/bignum_mod.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/bignum_mod_raw.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/nist_kw.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/aria.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/cmac.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/mps_reader.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/mps_trace.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/ctr_drbg.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/debug.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/des.c
@@ -200,17 +204,13 @@ if(MICROPY_SSL_MBEDTLS)
         ${MICROPY_LIB_MBEDTLS_DIR}/library/entropy.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/entropy_poll.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/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
@@ -221,15 +221,17 @@ if(MICROPY_SSL_MBEDTLS)
         ${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/rsa_alt_helpers.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_tls12_client.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_tls12_server.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_client.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_cookie.c
-        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_srv.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_debug_helpers_generated.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_msg.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_ticket.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_tls.c
@@ -242,11 +244,10 @@ if(MICROPY_SSL_MBEDTLS)
         ${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
     )
 
     if(NOT MBEDTLS_CONFIG_FILE)
-        set(MBEDTLS_CONFIG_FILE "${MICROPY_PORT_DIR}/mbedtls/mbedtls_config.h")
+        set(MBEDTLS_CONFIG_FILE "${MICROPY_PORT_DIR}/mbedtls/mbedtls_config_port.h")
     endif()
 
     target_compile_definitions(micropy_lib_mbedtls INTERFACE
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 59e530d3476b0..fdaa3d930588c 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -231,7 +231,7 @@ SRC_THIRDPARTY_C += $(addprefix $(AXTLS_DIR)/,\
 	)
 else ifeq ($(MICROPY_SSL_MBEDTLS),1)
 MBEDTLS_DIR = lib/mbedtls
-MBEDTLS_CONFIG_FILE ?= \"mbedtls/mbedtls_config.h\"
+MBEDTLS_CONFIG_FILE ?= \"mbedtls/mbedtls_config_port.h\"
 GIT_SUBMODULES += $(MBEDTLS_DIR)
 CFLAGS_EXTMOD += -DMBEDTLS_CONFIG_FILE=$(MBEDTLS_CONFIG_FILE)
 CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
@@ -239,20 +239,25 @@ SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c
 SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
 	aes.c \
 	aesni.c \
-	arc4.c \
 	asn1parse.c \
 	asn1write.c \
 	base64.c \
+	bignum_core.c \
+	bignum_mod.c \
+	bignum_mod_raw.c \
 	bignum.c \
-	blowfish.c \
 	camellia.c \
 	ccm.c \
-	certs.c \
 	chacha20.c \
 	chachapoly.c \
 	cipher.c \
 	cipher_wrap.c \
+	nist_kw.c \
+	aria.c \
 	cmac.c \
+	constant_time.c \
+	mps_reader.c \
+	mps_trace.c \
 	ctr_drbg.c \
 	debug.c \
 	des.c \
@@ -265,17 +270,13 @@ SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
 	entropy.c \
 	entropy_poll.c \
 	gcm.c \
-	havege.c \
 	hmac_drbg.c \
-	md2.c \
-	md4.c \
 	md5.c \
 	md.c \
 	oid.c \
 	padlock.c \
 	pem.c \
 	pk.c \
-	pkcs11.c \
 	pkcs12.c \
 	pkcs5.c \
 	pkparse.c \
@@ -286,20 +287,21 @@ SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
 	poly1305.c \
 	ripemd160.c \
 	rsa.c \
-	rsa_internal.c \
+	rsa_alt_helpers.c \
 	sha1.c \
 	sha256.c \
 	sha512.c \
 	ssl_cache.c \
 	ssl_ciphersuites.c \
-	ssl_cli.c \
+	ssl_client.c \
 	ssl_cookie.c \
-	ssl_srv.c \
+	ssl_debug_helpers_generated.c \
 	ssl_msg.c \
 	ssl_ticket.c \
 	ssl_tls.c \
+	ssl_tls12_client.c \
+	ssl_tls12_server.c \
 	timing.c \
-	constant_time.c \
 	x509.c \
 	x509_create.c \
 	x509_crl.c \
@@ -307,7 +309,6 @@ SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
 	x509_csr.c \
 	x509write_crt.c \
 	x509write_csr.c \
-	xtea.c \
 	)
 endif
 endif
diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 95458f18daa31..db1562f279732 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -45,9 +45,9 @@
 #define MBEDTLS_ECP_DP_SECP224K1_ENABLED
 #define MBEDTLS_ECP_DP_SECP256K1_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_CAN_ECDH
+#define MBEDTLS_PK_CAN_ECDSA_SIGN
 #define MBEDTLS_PKCS1_V15
 #define MBEDTLS_SHA256_SMALLER
 #define MBEDTLS_SSL_PROTO_TLS1
@@ -81,12 +81,13 @@
 #define MBEDTLS_PLATFORM_C
 #define MBEDTLS_RSA_C
 #define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA224_C
 #define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA384_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
 
@@ -97,6 +98,7 @@
 #define MBEDTLS_PLATFORM_MEMORY
 #define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
 #define MBEDTLS_ENTROPY_HARDWARE_ALT
+#define MBEDTLS_NO_PLATFORM_ENTROPY
 
 // Bare-metal memory allocation hooks.
 #include <stdlib.h>
@@ -109,7 +111,4 @@ void m_tracked_free(void *ptr);
 
 #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_port.h
similarity index 96%
rename from ports/mimxrt/mbedtls/mbedtls_config.h
rename to ports/mimxrt/mbedtls/mbedtls_config_port.h
index f264ed4ad2eb0..414f30527852a 100644
--- a/ports/mimxrt/mbedtls/mbedtls_config.h
+++ b/ports/mimxrt/mbedtls/mbedtls_config_port.h
@@ -30,6 +30,7 @@
 #include <time.h>
 extern time_t mimxrt_rtctime_seconds(time_t *timer);
 #define MBEDTLS_PLATFORM_TIME_MACRO mimxrt_rtctime_seconds
+#define MBEDTLS_PLATFORM_MS_TIME_ALT mbedtls_ms_time
 
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
diff --git a/ports/mimxrt/mbedtls/mbedtls_port.c b/ports/mimxrt/mbedtls/mbedtls_port.c
index 044de317f5260..230e264bf9806 100644
--- a/ports/mimxrt/mbedtls/mbedtls_port.c
+++ b/ports/mimxrt/mbedtls/mbedtls_port.c
@@ -28,10 +28,11 @@
 
 #ifdef MICROPY_SSL_MBEDTLS
 
-#include "mbedtls_config.h"
+#include "mbedtls_config_port.h"
 #if defined(MBEDTLS_HAVE_TIME) || defined(MBEDTLS_HAVE_TIME_DATE)
 #include "fsl_snvs_lp.h"
 #include "shared/timeutils/timeutils.h"
+#include "mbedtls/platform_time.h"
 #endif
 
 void trng_random_data(unsigned char *output, size_t len);
@@ -52,6 +53,13 @@ time_t mimxrt_rtctime_seconds(time_t *timer) {
     SNVS_LP_SRTC_GetDatetime(SNVS, &date);
     return timeutils_seconds_since_epoch(date.year, date.month, date.day, date.hour, date.minute, date.second);
 }
+
+mbedtls_ms_time_t mbedtls_ms_time(void) {
+    time_t *tv = NULL;
+    mbedtls_ms_time_t current_ms;
+    current_ms = mimxrt_rtctime_seconds(tv) * 1000;
+    return current_ms;
+}
 #endif
 
 #if defined(MBEDTLS_HAVE_TIME_DATE)
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mbedtls_config_board.h b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mbedtls_config_board.h
index 63c1b284fb6be..ef264a46b4052 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mbedtls_config_board.h
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mbedtls_config_board.h
@@ -3,6 +3,6 @@
 
 #define MBEDTLS_ECP_NIST_OPTIM
 
-#include "ports/renesas-ra/mbedtls/mbedtls_config.h"
+#include "ports/renesas-ra/mbedtls/mbedtls_config_port.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H */
diff --git a/ports/renesas-ra/mbedtls/mbedtls_config.h b/ports/renesas-ra/mbedtls/mbedtls_config_port.h
similarity index 96%
rename from ports/renesas-ra/mbedtls/mbedtls_config.h
rename to ports/renesas-ra/mbedtls/mbedtls_config_port.h
index f036f536c2ad3..5660566ffff4e 100644
--- a/ports/renesas-ra/mbedtls/mbedtls_config.h
+++ b/ports/renesas-ra/mbedtls/mbedtls_config_port.h
@@ -30,6 +30,7 @@
 #include <time.h>
 extern time_t ra_rtctime_seconds(time_t *timer);
 #define MBEDTLS_PLATFORM_TIME_MACRO ra_rtctime_seconds
+#define MBEDTLS_PLATFORM_MS_TIME_ALT mbedtls_ms_time
 
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
diff --git a/ports/renesas-ra/mbedtls/mbedtls_port.c b/ports/renesas-ra/mbedtls/mbedtls_port.c
index 10c89bbcf0f5a..feeefa9c04561 100644
--- a/ports/renesas-ra/mbedtls/mbedtls_port.c
+++ b/ports/renesas-ra/mbedtls/mbedtls_port.c
@@ -25,11 +25,12 @@
  */
 
 #include "rng.h"
-#include "mbedtls_config.h"
+#include "mbedtls_config_port.h"
 
 #if defined(MBEDTLS_HAVE_TIME) || defined(MBEDTLS_HAVE_TIME_DATE)
 #include "rtc.h"
 #include "shared/timeutils/timeutils.h"
+#include "mbedtls/platform_time.h"
 #endif
 
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
@@ -57,6 +58,13 @@ time_t ra_rtctime_seconds(time_t *timer) {
     rtc_get_date(&date);
     return timeutils_seconds_since_epoch(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds);
 }
+
+mbedtls_ms_time_t mbedtls_ms_time(void) {
+    time_t *tv = NULL;
+    mbedtls_ms_time_t current_ms;
+    current_ms = ra_rtctime_seconds(tv) * 1000;
+    return current_ms;
+}
 #endif
 
 #if defined(MBEDTLS_HAVE_TIME_DATE)
diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config_port.h
similarity index 97%
rename from ports/rp2/mbedtls/mbedtls_config.h
rename to ports/rp2/mbedtls/mbedtls_config_port.h
index 81be6c111b8dd..4e4c6e263fa59 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config_port.h
@@ -37,6 +37,7 @@
 #include <time.h>
 time_t rp2_rtctime_seconds(time_t *timer);
 #define MBEDTLS_PLATFORM_TIME_MACRO rp2_rtctime_seconds
+#define MBEDTLS_PLATFORM_MS_TIME_ALT mbedtls_ms_time
 
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
diff --git a/ports/rp2/mbedtls/mbedtls_port.c b/ports/rp2/mbedtls/mbedtls_port.c
index 9067eca90ee55..9b1e0d20e1700 100644
--- a/ports/rp2/mbedtls/mbedtls_port.c
+++ b/ports/rp2/mbedtls/mbedtls_port.c
@@ -27,10 +27,11 @@
 
 #ifdef MICROPY_SSL_MBEDTLS
 
-#include "mbedtls_config.h"
+#include "mbedtls_config_port.h"
 
 #include "hardware/rtc.h"
 #include "shared/timeutils/timeutils.h"
+#include "mbedtls/platform_time.h"
 
 extern uint8_t rosc_random_u8(size_t cycles);
 
@@ -48,4 +49,10 @@ time_t rp2_rtctime_seconds(time_t *timer) {
     return timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
 }
 
+mbedtls_ms_time_t mbedtls_ms_time(void) {
+    time_t *tv = NULL;
+    mbedtls_ms_time_t current_ms;
+    current_ms = rp2_rtctime_seconds(tv) * 1000;
+    return current_ms;
+}
 #endif
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mbedtls_config_board.h b/ports/stm32/boards/ARDUINO_GIGA/mbedtls_config_board.h
index 0e1703f1bf962..07aef794692ec 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mbedtls_config_board.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mbedtls_config_board.h
@@ -3,6 +3,6 @@
 
 #define MBEDTLS_ECP_NIST_OPTIM
 
-#include "ports/stm32/mbedtls/mbedtls_config.h"
+#include "ports/stm32/mbedtls/mbedtls_config_port.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H */
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mbedtls_config_board.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mbedtls_config_board.h
index 0e1703f1bf962..07aef794692ec 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mbedtls_config_board.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mbedtls_config_board.h
@@ -3,6 +3,6 @@
 
 #define MBEDTLS_ECP_NIST_OPTIM
 
-#include "ports/stm32/mbedtls/mbedtls_config.h"
+#include "ports/stm32/mbedtls/mbedtls_config_port.h"
 
 #endif /* MICROPY_INCLUDED_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
index 0e1703f1bf962..07aef794692ec 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mbedtls_config_board.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mbedtls_config_board.h
@@ -3,6 +3,6 @@
 
 #define MBEDTLS_ECP_NIST_OPTIM
 
-#include "ports/stm32/mbedtls/mbedtls_config.h"
+#include "ports/stm32/mbedtls/mbedtls_config_port.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H */
diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config_port.h
similarity index 96%
rename from ports/stm32/mbedtls/mbedtls_config.h
rename to ports/stm32/mbedtls/mbedtls_config_port.h
index 336fee0a199c0..5f8bb1cfd1b7a 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config_port.h
@@ -30,6 +30,7 @@
 #include <time.h>
 extern time_t stm32_rtctime_seconds(time_t *timer);
 #define MBEDTLS_PLATFORM_TIME_MACRO stm32_rtctime_seconds
+#define MBEDTLS_PLATFORM_MS_TIME_ALT mbedtls_ms_time
 
 // 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 cdfcd172a819d..a51144871ae7e 100644
--- a/ports/stm32/mbedtls/mbedtls_port.c
+++ b/ports/stm32/mbedtls/mbedtls_port.c
@@ -25,11 +25,12 @@
  */
 
 #include "rng.h"
-#include "mbedtls_config.h"
+#include "mbedtls_config_port.h"
 
 #if defined(MBEDTLS_HAVE_TIME) || defined(MBEDTLS_HAVE_TIME_DATE)
 #include "rtc.h"
 #include "shared/timeutils/timeutils.h"
+#include "mbedtls/platform_time.h"
 #endif
 
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
@@ -57,6 +58,13 @@ time_t stm32_rtctime_seconds(time_t *timer) {
     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);
 }
+
+mbedtls_ms_time_t mbedtls_ms_time(void) {
+    time_t *tv = NULL;
+    mbedtls_ms_time_t current_ms;
+    current_ms = stm32_rtctime_seconds(tv) * 1000;
+    return current_ms;
+}
 #endif
 
 #if defined(MBEDTLS_HAVE_TIME_DATE)
diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config_port.h
similarity index 98%
rename from ports/unix/mbedtls/mbedtls_config.h
rename to ports/unix/mbedtls/mbedtls_config_port.h
index 629064abcf297..c619de9b8b1b9 100644
--- a/ports/unix/mbedtls/mbedtls_config.h
+++ b/ports/unix/mbedtls/mbedtls_config_port.h
@@ -30,7 +30,6 @@
 #define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_CRYPTOLIB_CTR
 
 // Enable mbedtls modules
-#define MBEDTLS_HAVEGE_C
 #define MBEDTLS_TIMING_C
 
 // Include common mbedtls configuration.
diff --git a/tests/README.md b/tests/README.md
index 47fcacf409743..3bc626bf9e416 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -189,7 +189,7 @@ In this case CN is: micropython.local
 
 Convert them to DER format:
 ```
-$ openssl rsa -in rsa_key.pem -out rsa_key.der -outform DER
+$ openssl pkey -in rsa_key.pem -out rsa_key.der -outform DER
 $ openssl x509 -in rsa_cert.pem -out rsa_cert.der -outform DER
 ```
 
diff --git a/tests/multi_net/asyncio_tls_server_client.py b/tests/multi_net/asyncio_tls_server_client.py
index 59e13ec45d1dd..98f15c6625f0e 100644
--- a/tests/multi_net/asyncio_tls_server_client.py
+++ b/tests/multi_net/asyncio_tls_server_client.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
index 8607e4ff10a9d..178ad39274032 100644
--- a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
+++ b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/asyncio_tls_server_client_readline.py b/tests/multi_net/asyncio_tls_server_client_readline.py
index fd8685f5af878..da5f1afee2ad6 100644
--- a/tests/multi_net/asyncio_tls_server_client_readline.py
+++ b/tests/multi_net/asyncio_tls_server_client_readline.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/asyncio_tls_server_client_verify_error.py b/tests/multi_net/asyncio_tls_server_client_verify_error.py
index c600dcc2c8b6f..362f0fc8ecf72 100644
--- a/tests/multi_net/asyncio_tls_server_client_verify_error.py
+++ b/tests/multi_net/asyncio_tls_server_client_verify_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/ec_cert.der b/tests/multi_net/ec_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..a503a39dfe49443dfdecfd79af0eab9f7cc2337d
GIT binary patch
literal 471
zcmXqLV!Uk7#8|n2nTe5!NyJ%n`Pu%=fBV!N4E<`RU*l3$UMp(A#m1r4=5fxJg_+5~
z-cZUwf{i(pg_%b%H#4~?zo4=tBR@|sCqFqc$56yT2qeeF!|e-_3joU*avN}hMA?Ly
z977G{#CeTO3=9oT3`|UoO^u^~TvH&|7|NyGf=B~lHg>RknHZrCXJ%w)c4A=h-2U}f
zM$M+EDJh4i2Q+%l)OU$#<33-&G_`Mwahch%^({PCPMo)%_Q}E{;l?_<$G?PQcd^Q~
zu|CtjQJ66&>x<3eV1qydS)f;B`B=nQL>xD-6PKO%*uYV?)p?iegHKmCO_er~2T3cl
zNEnDUU{}BoQXtI8_@9N<fEh?3hc2@RgMllPLPUMyVRy@GzqU4LrTd-<aj|-NqIPi!
zdyn74v&~=DicMisWH^5$_Pm-$$FW^HX3x7XRd1^ZyWT#FRrmU;y7NV%-*-*|00+RB
AkpKVy

literal 0
HcmV?d00001

diff --git a/tests/multi_net/ec_key.der b/tests/multi_net/ec_key.der
new file mode 100644
index 0000000000000000000000000000000000000000..7d50fe3bcda1afbbc7d941be66a673c5fbb541b2
GIT binary patch
literal 121
zcmV-<0EYiCcLD(c1R$DG+%@_9vL<@B;!Ue6N^g&V-V~d-iN0|&7;OcczVo081_&yK
zNX|V20SBQ(13~}<Nw@X-Xne9-lw`w~P=QIAFGO613(s%@m5#JCb~eVZgbdWk&pVd#
bI7ndFu0G@X6J5Fm9)<<xE7);poNDwuB2_g{

literal 0
HcmV?d00001

diff --git a/tests/multi_net/expired_cert.der b/tests/multi_net/expired_cert.der
index 8e1db02aee5ef883dc1e1ae326db234fa3db6fd5..3801fca17761174736f4171f341468531bcd8e7c 100644
GIT binary patch
literal 471
zcmXqLV!Uk7#8|n2nTe5!Nu*BpNZtQQLNlUu>ef_u8yt6&GhJf9#m1r4=5fxJg_+5~
z-cZUwf{i(pg_%b%H#4~?zo4=tBR@|sCqFqc$56yT2qeeF!|e-_3joU*avN}hMA?Ly
z977G{#CeTO3=9p83`|W;jm@K=Tw^Ggatk62gxT1^?qy<xI-Hr2o!N<j#dG`DUl}!<
zqNb!Ao*vNXIaA*yrj7f20n^mJEyiVL$JV#-Tsd*xdfF!okAxfR>>mFTj@`v7*T(ux
z`$l2LoUAW4i-QdU4P=2{k>z6%V-a!OyiQzp;$s6x*;eOWt`9z4-85C&KprHm%pzeR
z)_`3BKS+TvBjbM-Rs&`rg&exf9t;MqOo|LICr=KWmT9*jwDd8b&GN&}KaSm=T>2t4
y?r0-xoayo}tC$oR|2~Q8KYq|<|5Xp)IegZtfBv0#ckD{-B&OFcSJ{uPPzL}=8=4vb

delta 1258
zcmcc4yqPP|povxApov+WNyO^r?ch+qmHZ}^=~qu3PTlb3%f{OVylk9WZ60mkc^MhG
zSs4sM47m+B*_cCF*o2uJLk)!u1VJ1Q9<Jd0+*IA*lEjkKiR;8C8cDkt$cghB85<fI
z7#bNF8X8$fLAgdyF7Zay8#FN~Av=VTm4Ug5iJt)|&c)Qk#K>^(op}Y{o+Wksj@}E5
zUq734X^*)V-^MShVf)pxuCpjKioN6Q*1xb-g5B%F3>p86M!GM=rk#1!+|jZjKkV}B
zCv!f82?TumaqjB(FCT3=vNg(QO>^J<>)GMYYcrN^>U&YY@Z6?^8+D5r3{z(wxjR3h
z>Bq#BtrPCIO<j9c!gzkV!M!6NqUFAsdKk^-@@O(J-DGb5*}yt%m8$HGJ0A}5<;ZFZ
zmmF+ems)KyN1;fjhH>HM$tQDt;<Zmax__#6b!VRb3g36Zmv-mw6$qQozpznR^u@cm
zlQy58{9tSHrIP*ZcPr}?_`Wdjl=XQb;@GWme%+?+Hyq?rzFqk|srkMU%cp;gpZ;ph
zk5#C+`A&b@wtMndG<+wO{Ib}vcK)Ap{r}R^tsk8?@O!ware@8mFQ>{rzHpIz_JTiz
z>#p6zvu-n)U!L2xS6jyT)Y4g}L&eT@9pEdzzBF)m>gCzj*0VUuH6G&2zEV<uefoku
zS7tm)SJ<1d&VK^;#`R0*R2^SzrfySiaw?+aRr2q?<L#>p6dYZ27fMaiULU`2=et+_
z^F2??r_K(OV7nwXci)8?=g^)BJyRa0O#COMbav8?&o+WBrq*|6#B>ztr#@*=naE#c
zV0z%Pb;V2#&HRm%&mA-6Xi>3d*dOSmb)kO#c1G=+r>+!cFgs~KxF~pU%}e25Cr)cW
ze3`$(WkQBCUx><H?u$&!j0}v(sRWo@fvJR%VX2wm;?oz!k4<%q*ITn=ZqO3;^g@w8
z^TcHuOK$#`zxivwY$Ee_RgQV3Pi`%f-{x#N_1$ky^<1@&TDz=W1Lvd}7uRbxeGrQb
zy|wbeCK<<HG5d8kGy2Dz367hX+O}a{;e0#U%gh@i9N4$_?5jQ+q1NF3GSH37r}@@-
zizn%wY~tUXKi}Vf?rKhI^Vcu4TQj21Tc-RtoZBcf`G8jVvWYXRLOOXrYX95dAbaES
z_ClE(X1N;IPI|qaTKDGTvv+;w@{%4G>-TQ)5sLCUtovov$~XDPE}wOu#WB0ax;9y$
z@XX0gu51}sH!MzBGi#2Pa4PRn)w6e&eOPQS{Zl}5`BS}4V;lX;y~|AYo_NW+c5>UU
zHvOmx|9RzDCx<>g&#Sp@?@_;>ugbMwM7S~euKw+AEFC3zzcNznNd0Q5@(pied<}2>
zSfgcBpDGe^xjlnt*9Pl{Q7yu6vrk?=lt1(DgrhGe{oHf%3$Oj<A5V&H6hpSG%TL?A
z_w#uX^Joq|U0sWg!>KPD?o0`qTzKQ|?S`WbqJgqpP2q?4z4L2k6v`J)@s9BKJ@56u
zyYz*ES>Meg?^W0`k5=eR3GvR`s=iI>pFzBBMZ^*3Uye@Q)k_iu4H|2&W=a0;J|!#7
z+UoGCrR2R+S^egBZx;NQ)$06bnzr!3m6O{7IpcdZ=U+B{dNF+d$z_#ST)4eId_LLK
F4gijKKdb-%

diff --git a/tests/multi_net/rsa_cert.der b/tests/multi_net/rsa_cert.der
index 8fae71d4baa8cd3e2be3f3d2bedb62ebb33e371c..d0ea34bf4d63e2b84bbf19da64d0a98f4af8a9f5 100644
GIT binary patch
delta 665
zcmV;K0%rZ=2IB@JFoFYLFoFU{paTK{0s<5wuk(~YwW*=sF0&t&g6?5ev6!}zBUl$P
zH83<YF)}k+7Y#BsFflPSFf=nUGBc5qV}H&yNqOli$Uf9P6=kE4m){ZFFVoovnR48V
zJb9ye+%dx&A*wfkEw`h5Y1p*VbHHJ2n|IB@@7(Nc+(Pnr8U5M#iJ9k#&5Ye#M}4mp
zN>~n(-~B>m8NtJ@P)w=k;z7H~BZDBCUpB+9;^>h6MH8}Ga~8vldteb$NpznL0Dn{%
zCE!HpWMd+HmqgEzI>d^wrK$Gt8E=lU1?~MLOMAX;eyY8>*9M~gtF4&OyIORggw2og
zTl5C5%vA;jf7?)gKYoC()^HO_P(@37TSaQ3@_Nw!v1W}hJqbGm4LYeBKEo{H*;m@(
zK5Rr9p44n~`<|q72dsN@Hp_dFs7sqw0s{d60i#neQ7|0_163Uk1QrAo7;&25ymyP}
zpp3dN8Zw9saXEX?Fdqg3RUIP)7%&!q6c}-u;JkN>=%9?cFB&q43~@Po(33s_C4ZzS
z8WNT@%AM*xlN9r<dnWC2K2EWXp*FeyUr!eMLR_SLSv>E^88fp0JFN6)na<5h)xI<)
zOpw}m%r^H)vrFQjDJEr4(C8w}kYfkx&Rj20xS1-0Y^O+@R+C)1-CH7F0-z~bCTRLb
z1?zpyZ=W}6aHuIspl;*x`Z4a^$bVjL@OYAu#662If--{;=3H{A8VH+Kxkck-52Z+>
zp*xqR5Iqb4MO;P}Qw)lEDIZz(8tvTQhdg2PI7?kE;7PC-)Pt9*M5#p0-Gie?P3t6B
zSaptjPPz#Nkn?7rYT`&E2#cPo+L8$q5qs=iyZoi4of<8HuT()FX7*IJ^#YrQIJz(-

delta 665
zcmV;K0%rZ=2IB@JFoFYLFoFU{paTK{0s<6J0J0h?GD>%Ez0s|59Ejj-UIm?zBUl$O
zGcYwXGchz;7Y#BsFflMPFf}tXF*K2qV}HoC3RHxqbshyHD~&AWjI=0;s1j0L*e~~z
zL^m(ZIj$0x9CQ*ch)BQf@in2UhmM(%7<4|j5_G5vCzLRn<j-80Qv4QZ;R#$+f!68J
zmq~QM;PoKOhbGaj_`_6NQnu{$X0X1=vRfNwUXsqV%)LJdCrBbv!$x)9&Os<^9DjS^
zyU2Lu8+w_l0@MLIGNld$Sot<5!PT35m0uh_XbHAIp3;9US;~UOgXX}zb8Biw=ZEW9
zM?&l#Ex^Klzrf{-!>}c7dh;xUk=}d?K;3g<REI6SJ=ksoh7UwadX*5Rq)50<F`b~7
zW^jrL{BrSzSw~jg-q6q;2Oc$ipi68?0s{d60i#neQ7|0_163Uk1QrAo_<{z$&4=@C
z+gq}N<1EdXfjAT*Fdqg3RUIP)7%&!q6!?M$zRid8ZQEP2g5xaBn1MJHB9lG>C4WRp
zs3_^3zKR`w+dbY)1_mCp&qhyBZ>Had<k;(G7bW4R66JQq3FPm3ewsUwm%{}@b;vrK
zY06q9P8Ipv1cVzAQtG&3EO9;oGkEUaM0$w%TZ<e-KQl}~N}MozDHxnWw}RgujjTtP
z3pmVIalE#;etZ3Z8RZ<7kZ=b){ePsr?bu7+?6~-*zlf?Oml}Hb)*B1pW&PlC90l>u
z7gh8tp|d)4@PFn#e=SthjK>9V;y5C_LHyrnfV2S#sR>h1fMC{ApaYR_O2uiC1OJg|
zfaKozGeLUR@7{*GxA&(b^Y~qys$bl))&e^VaT``uYO-(&&%Lq&AYkPKI0BDexBV;%

diff --git a/tests/multi_net/rsa_key.der b/tests/multi_net/rsa_key.der
index c2cfb76d207e7afb33394bbcaf5525d7382dc2b6..c9c535ae639557e4e0023490a8f491a8ebf8985d 100644
GIT binary patch
literal 1193
zcmV;a1XlYnf&`@k0RRGm0RaHcHA#8tD#$+6Jr!l6keA;P+b`4E2bpr*i#&OwdE7C>
z8zHJUfGxM9d}-LU(sRIJY@2t@!SCGcY}`Wfcp3fK_=%b4iOr1NTt|Jc6iQeQlHdJ8
zWf{T4u24*==i))T$s>axnqM}<uj1&C{zVhAT5}e|jC)`aQ%Q864FFUaCE!HpWMd+H
zmqgEzI>d^wrK$Gt8E=lU1?~MLOMAX;eyY8>*9M~gtF4&OyIORggw2ogTl5C5%vA;j
zf7?)gKYoC()^HO_P(@37TSaQ3@_Nw!v1W}hJqbGm4LYeBKEo{H*;m@(K5Rr9p44n~
z`<|q72dsN@Hp_dFsGC&+0|5X50)hbmJHn%_st#2IC|n<eS~tL3%zyevY5`KtKkha&
zhE@Heib$oS|NE@OD5My~&HAImAUNuQc;@(x%@XTwmw1T>(U88#6q^z+{lg8A_8DqM
zM9TUR8ky8G9CW)L%&Nd1j=qNlEP$|)U3%`uxu%BvV^-xowxm+&4}4UxaGS#U7Uimh
z3Qj$y>E+E`?pGOWI19{1fg*x~LZsS-li6Vjd!SOf$?%fxLE*Ur4}R;11W>?`_D&Wm
zR1{Gf)N1K#^D#3p^RU`kI*3;Xt)j&8;P8I(Td0h#3R;SeIhat1+Q=%?RQnRwDTn%C
z&W>s?JM{}k2Z!{{b=YJKF!R7o0)c@5>hgq)q8a96ry81^*EVOYrOU6BaXowMHDP@n
zUdk|WHe<T9&Hqn&3Nz>LHi+ENYyvaob_#M4-My~dV5W!@VZf)t5i#E;s;uq5tSZJI
zjPERM%2Q*UQwB;t!VjUk_LQ-sM1Qi#cJb6qThdD#7+()3p_k@;6g-;tb&5M@0)c@5
z;ID+9HImxTl$yoIaK;Vb&<?Or!~L;}+WD<}R!bG79W$-`>W-<oTC^nj6h9@L`jF$K
z0S+_JqWXUNZ$?+QDr&hoY~E^nYXW{?yl+BkJe6^IbR3aw;LZpb!&&zGVs9a|iG?e6
z;Y{GY>^p_&mUT--XY)t2;BBI}dc-;70)c@5(+c;WulSwl1M#%dkINDRmWD}qh~w7H
zC=DYj-@COL?B-UF6u)w>$UJH3iOv+WuVJSqMhgl49CgQiv){ux&BPV05N`nKCB))q
z8w%|n=p^fY&yZ?Zz=u@l+`rf2E}qbqJn)P%;0;JiGV98PQ#J@u>?oUL-D$Tq4bB#y
z0)c@5ti=jD1%n9^Ie5{)Ol@A;k>S~%AvXZPe<dPI2F>xb=Rt?|ME<gGzS(Nr#J<tf
zWw7V^f_+0qnJf8Q<rug2HhrEn6b$O%Kqkn#<?6q!B`n<b!CU@M`Cl|freKv+G#a#4
zII!3KFTID$Ld|+<WwM9RwBQplc&U{~boEko0)c@5xj2ZU_Pm*)ca-Rw-~#LDGH<H|
z8hQ{Xh<&p`d9I7LjS0oDd*{L<sB$R&SD;6^MF=B`p$7OYVQifubcm;Q^|39LlP!Zz
zpY+Tto;IOEA<(#X%5HB*pzfTrwfG?N4&ufcQuOEI!fA&_UO)v0G%<@!NK==yOmv^i
HjY4VnT+>^e

literal 1217
zcmV;y1U~yPf&{$+0RS)!1_>&LNQU<f0RaI800e>rr!ay9qXGc{0)hbn0LZlpRD`B=
z9t9&SjV$Giv?z(F5>j2*FZYr}H!saOt`e3UbP_IzNWbmzHKD49j+v1dbUwEdbf^j^
zlrWm)&s>>O{1#~830zcx*6GlfNp!&A^&rcKCef|<!&F;Rw(Rs~u)fK%TN`FxlFqcu
zy*~&iNFq|hMs?oKK`3h+d*Qptc;y><nW_TR0Xj0J4h2~GHYdT=n|zgD96o3Xwm+WI
ze=S+cg2sd9z`S#7YDVXW>sUuZ>>e$^!hXNN<%`3xC2e~1EQ68Wd<sC_b7EA7ExkS1
zZUcr7L`r&<5T&F@xK1&hpqFNFiV6I3@rGGPR^8sv&>aUJHGH6KNdf}_009Dm0RSW}
zE{uuQ59_yeU6yxmaqG|;@P|zO$;j){93}3e3Ng(4?rA0!=}%+%+OL*V4Op>iEQDAA
z+<Vss?U$1yc=y0_i#QTG8OHoG=d1iaGv{;qi4x~DiAsPa;$S1j%A{KsyQD<mOB{_=
z=-Pr5sf)Yc7G<=0Lgiw<C1fp&5qTM}YbTXM!oEu1g}9(&obJBkh#52GE?W#WoyQxn
z6ZT1MegY#NL$U)!qRj+$fSqSEi*K4p3&L!n)6^7Ua7lt6KuyXEzRLop#Ti$@ZWusV
zDHrq_y!;Y~Vx-)1V{g@_D=C`R-1}UOg$NJHMwOJgw{fV&Qdl-5gC-8Xi}?b9fdK3t
z+^yDBF{93qA2uy0N&=ZEQ5YB}avf6E^P?)RZ<acTC^*mbVabb6fF74Jzx=2$mi1si
zGL$JBlJ6BXOg=o2OuMlWlxS$jCLsh_^xY{&7A0!ut03Y#Os@IRcX>uBBMa|DdLj^L
zh2>yytH@+-8JoegV^T#X1+$KCb{_(PfdJW>=*RfG!M;vGYUSVov*B)gB2e0lZJ`Ot
z{m-JTH`87cEMkJFkmPGH8{9`dhN8^bciA$-J=V6fn#a~2FJRRUe}rMH$}fUo9PtXs
zP@5c3YA(E?dApGqU>9Vw|Ii<8LgQ%}$MtF_7}?!8LBAO-^`8Z&-xqhL{)rW4K$il6
zfHW#`SlXmXKSpq(<fcDka)p7}z_<Np0l|KW-#?qcJ#l)_(G+Nkek+g(-#AKF4lCYh
zOPA9AimNtLRSera2>1GJX?`k09(o_0b?5Ih;PkL=P9OV3+=Kqp=SX|q8D{;-r)F9^
zopAt`tYM8J_NVcODA_lcw&Gq79%ojH!vcYT3@6|#6O{pctq5>^NartdKW4Xs2Et=`
zWPh0>88$zp8Wb<kjP>`b8s@|osShE~L|i?ZuYf|E6!)=&%1lFFNN1Ps06N8gqwCa?
z4uvEmmJn0!Dsg7Wc#(kwt%h`(-nNd;|5pZCibaOl+{eJYc^;i2_5ka!cIl`*W-6f{
z0)c@5#<6P*4-tn^u^N#BUGa_+Bhj_x8=HnWhab^MWBD<<iGjdTuI*Se^{-ILA>g_)
zfWDZ7Aax0^@U*8#QrcEUcV8%n1x<kn<e(220x|dX)NCfw?Vl3s`BF}%@2#zhNxHWn
f7G%7Ni6SARKjeJo|32fsp|%A0fItwWJ4>#c*n>Jm

diff --git a/tests/multi_net/ssl_cert_ec.py b/tests/multi_net/ssl_cert_ec.py
new file mode 100644
index 0000000000000..2c5734e052661
--- /dev/null
+++ b/tests/multi_net/ssl_cert_ec.py
@@ -0,0 +1,56 @@
+# 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 binascii, os, socket, ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+certfile = "ec_cert.der"
+keyfile = "ec_key.der"
+
+try:
+    os.stat(certfile)
+    os.stat(keyfile)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+with open(certfile, "rb") as cf:
+    cert = cadata = cf.read()
+
+with open(keyfile, "rb") as kf:
+    key = kf.read()
+
+
+# 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, server_hostname="micropython.local", cadata=cadata
+    )
+    s.write(b"client to server")
+    print(s.read(16))
+    s.close()
diff --git a/tests/multi_net/ssl_data.py.exp b/tests/multi_net/ssl_cert_ec.py.exp
similarity index 100%
rename from tests/multi_net/ssl_data.py.exp
rename to tests/multi_net/ssl_cert_ec.py.exp
diff --git a/tests/multi_net/ssl_data.py b/tests/multi_net/ssl_data.py
deleted file mode 100644
index a21c8c6589377..0000000000000
--- a/tests/multi_net/ssl_data.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Simple test creating an SSL connection and transferring some data
-# This test won't run under CPython because it requires key/cert
-
-try:
-    import binascii, socket, 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.
-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():
-    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)
-    s.write(b"client to server")
-    print(s.read(16))
-    s.close()
diff --git a/tests/multi_net/sslcontext_check_hostname_error.py b/tests/multi_net/sslcontext_check_hostname_error.py
index ac39211b092f0..d85363f00bd63 100644
--- a/tests/multi_net/sslcontext_check_hostname_error.py
+++ b/tests/multi_net/sslcontext_check_hostname_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_getpeercert.py b/tests/multi_net/sslcontext_getpeercert.py
index 8748c1f78e8fc..e9d96be248c70 100644
--- a/tests/multi_net/sslcontext_getpeercert.py
+++ b/tests/multi_net/sslcontext_getpeercert.py
@@ -12,8 +12,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_getpeercert.py.exp b/tests/multi_net/sslcontext_getpeercert.py.exp
index 7b0e9d40a64c7..e7a0ab0b4622c 100644
--- a/tests/multi_net/sslcontext_getpeercert.py.exp
+++ b/tests/multi_net/sslcontext_getpeercert.py.exp
@@ -1,5 +1,5 @@
 --- instance0 ---
 b'client to server'
 --- instance1 ---
-3082058930820371a00302010202141b3da08b15005eea265d0b57b8ba99812ab274cb300d06092a864886f70d01010b05003054310b30090603550406130241553113301106035504080c0a536f6d652d537461746531143012060355040a0c0b4d6963726f507974686f6e311a301806035504030c116d6963726f707974686f6e2e6c6f63616c301e170d3233313131393032323932375a170d3238313131373032323932375a3054310b30090603550406130241553113301106035504080c0a536f6d652d537461746531143012060355040a0c0b4d6963726f507974686f6e311a301806035504030c116d6963726f707974686f6e2e6c6f63616c30820222300d06092a864886f70d01010105000382020f003082020a0282020100deee37780ebca47e0f414ba033ebe692d2bc374a0eb1f42556bf266ad704208116ee0d8b2fd0b518074ad0981c4fd1322de81696ccea838884b06f56d3ebe49cf0561050f6f8ced5f7f4f13d086b28779a9647bbfae6c3f3ad68a5b28ee8a1ceb260d87ea300316599c4dd9f6082f89164b590df8695add518339f6730dec4f05b1ef63548329b0a48823035b23737f3303b56aa251dd8dcf0c20e6c1d291374c185ae657b349c20721c7c01a1b393c96d4c5f2bc8e2dfca7dab896e2fa84dee53d2bb6dbd1056970fa1812315e8ee9d92b3cb93e0b563d274bf07dd79600ef403b91d4ce814418b28cfaeb2b7d8401e64f6d4f39283df3204f2fe01f2fd289f5d2078d9ee2f96b6de1fd4284d9274fa38b0ad9ffcce8ffe66673be2cf304ee1b27c7cacaaf4ca76f1e84419e6e80f540add3e91cd469903e9ceb6bd2b1c33caa59acb5516ce8ac00e73d7a551bb65d39bd6af04411e81c20e6bd474d797a0bcd498e26720bd60ae4f900bb1afa59c7ac7a336273c7734ca5874ea63fb8ec787ab702041442da11a922baf5fbeb9eeea4f9f49cb1f659b561806d2169dbed07c43558c908c94e16491fe1a22cd92b8f33c1184353bdc985c88722f65e48024910f723035c0d33b789928296fb193cec6350884243b00bf51422ad09fb7012bd9cad4716803422be0d111deace913fac8cb2be1e96fa8449068430e5424bd0bd10203010001a3533051301d0603551d0e041604147d392a82ab464936fd7d74226694556a2945fd8d301f0603551d230418301680147d392a82ab464936fd7d74226694556a2945fd8d300f0603551d130101ff040530030101ff300d06092a864886f70d01010b05000382020100ae40c015e3eade8dabc84ee357ac9d694e7cd69ce4a1b265880273d16257119aa72fb2aa8b841e2899bea3e8690146f24d963a37825c93bf745447dc6ab09b5f2947671dca13b1e71f5c3e43011d74cdc688ed1215b3016071ae7235d77f79d7bb81f097bb04a08ccf400717721b29e2ea913eb23614610597deee477ed716db7e8ebe11aed39c7035f48259dfa54d88871c1f67159d52ce11eb111fa00708a7d7081c07fd92d54abbaec7ff1b50ce2f6f358857d2f55d1c7b5aa6dd66b9c3c2e654397e2d5330aca9834ff8fd749ce968c706fe3bb1b8510a379ec1910d7ece0212c34d56a2073fb7f25c88fe298568e448d03ec30b348f7d9a8836390216a6da7a8efed50dfb8c21a8531efc158e7f4398f87af18d1bd2926d08d34364bf5d85e88040dff3d3f1da6268dbc0cafa64f544c065380fa695a8d015b385aed0a1fd9ff1d7c2b28a549e04c1132b421f85a85640acac11c69416859fb9b461eeddffa92ae303b35c7233537077068de558dd02715e25aee976a97879038d2952be0d327892ab2fc78716b0d7aab4b923d5d79905f7f8b6a18c42e466fec62f84b6e5957deae0964dab8436b0e0cd4e08012661bafb9588fbfd7068fd6c08ab79101a4bdfe21d95cd0ee0aad7dd8a3ed128071c0ec2d063dc6dfa63189e51bf5d9259e776d7623f745a73f4e12e5c2b90493de1c6436b339e1400891e3e35c31057
+308201d330820179a00302010202144315a7cd8f69febe2640314e7c97d60a2523ad15300a06082a8648ce3d040302303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b3009060355040613024155301e170d3234303131343034353335335a170d3235303131333034353335335a303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b30090603550406130241553059301306072a8648ce3d020106082a8648ce3d0301070342000449b7f5fa687cb25a9464c397508149992f445c860bcf7002958eb4337636c6af840cd4c8cf3b96f2384860d8ae3ee3fa135dba051e8605e62bd871689c6af43ca3533051301d0603551d0e0416041441b3ae171d91e330411d8543ba45e0f2d5b2951b301f0603551d2304183016801441b3ae171d91e330411d8543ba45e0f2d5b2951b300f0603551d130101ff040530030101ff300a06082a8648ce3d04030203480030450220587f61c34739d6fab5802a674dcc54443ae9c87da374078c4ee1cd83f4ad1694022100cfc45dcf264888c6ba2c36e78bd27bb67856d7879a052dd7aa7ecf7215f7b992
 b'server to client'
diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py
index c263ae31bb4e8..473c9c376e38a 100644
--- a/tests/multi_net/sslcontext_server_client.py
+++ b/tests/multi_net/sslcontext_server_client.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-certfile = "rsa_cert.der"
-keyfile = "rsa_key.der"
+certfile = "ec_cert.der"
+keyfile = "ec_key.der"
 
 try:
     os.stat(certfile)
diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py
index be7c332b4c747..d65d860fb2745 100644
--- a/tests/multi_net/sslcontext_server_client_ciphers.py
+++ b/tests/multi_net/sslcontext_server_client_ciphers.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
@@ -48,8 +48,8 @@ def instance1():
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
     client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
     ciphers = client_ctx.get_ciphers()
-    assert "TLS-RSA-WITH-AES-256-CBC-SHA256" in ciphers
-    client_ctx.set_ciphers(["TLS-RSA-WITH-AES-256-CBC-SHA256"])
+    assert "TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256" in ciphers
+    client_ctx.set_ciphers(["TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256"])
     client_ctx.verify_mode = ssl.CERT_REQUIRED
     client_ctx.load_verify_locations(cafile=cafile)
     s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
diff --git a/tests/multi_net/sslcontext_server_client_files.py b/tests/multi_net/sslcontext_server_client_files.py
index e1ea1b3aa8b32..64a4215c75b44 100644
--- a/tests/multi_net/sslcontext_server_client_files.py
+++ b/tests/multi_net/sslcontext_server_client_files.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_verify_error.py b/tests/multi_net/sslcontext_verify_error.py
index 4a7a6cfcc14c2..5dc461e7708a8 100644
--- a/tests/multi_net/sslcontext_verify_error.py
+++ b/tests/multi_net/sslcontext_verify_error.py
@@ -11,8 +11,8 @@
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.
-cert = cafile = "rsa_cert.der"
-key = "rsa_key.der"
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)
diff --git a/tests/multi_net/sslcontext_verify_time_error.py b/tests/multi_net/sslcontext_verify_time_error.py
index e5dc496451649..fbefdecf9f430 100644
--- a/tests/multi_net/sslcontext_verify_time_error.py
+++ b/tests/multi_net/sslcontext_verify_time_error.py
@@ -12,7 +12,7 @@
 
 # These are test certificates. See tests/README.md for details.
 cert = cafile = "expired_cert.der"
-key = "rsa_key.der"
+key = "ec_key.der"
 
 try:
     os.stat(cafile)

From d19371cb23b58151f27695a445f33505af6bdb1e Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Thu, 25 Jan 2024 18:11:31 +0100
Subject: [PATCH 0782/3129] py/builtinimport: Simplify calls to stat_path().

stat_path is only called with stringified vstr_t objects.

Thus, pulling the stringification into the function replaces three
function calls with one, saving a few bytes.

Signed-off-by: Matthias Urlichs <matthias@urlichs.de>
---
 py/builtinimport.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/py/builtinimport.c b/py/builtinimport.c
index 009885498ca75..3cc117befaad6 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -57,16 +57,17 @@
 // 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(const char *path) {
+STATIC mp_import_stat_t stat_path(vstr_t *path) {
+    const char *str = vstr_null_terminated_str(path);
     #if MICROPY_MODULE_FROZEN
     // 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) {
+    if (strncmp(str, MP_FROZEN_PATH_PREFIX, frozen_path_prefix_len) == 0) {
         // Just stat (which is the return value), don't get the data.
-        return mp_find_frozen_module(path + frozen_path_prefix_len, NULL, NULL);
+        return mp_find_frozen_module(str + frozen_path_prefix_len, NULL, NULL);
     }
     #endif
-    return mp_import_stat(path);
+    return mp_import_stat(str);
 }
 
 // Stat a given filesystem path to a .py file. If the file does not exist,
@@ -75,7 +76,7 @@ STATIC mp_import_stat_t stat_path(const char *path) {
 // files. This uses stat_path above, rather than mp_import_stat directly, so
 // that the .frozen path prefix is handled.
 STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
-    mp_import_stat_t stat = stat_path(vstr_null_terminated_str(path));
+    mp_import_stat_t stat = stat_path(path);
     if (stat == MP_IMPORT_STAT_FILE) {
         return stat;
     }
@@ -85,7 +86,7 @@ STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
     // Note: There's no point doing this if it's a frozen path, but adding the check
     // would be extra code, and no harm letting mp_find_frozen_module fail instead.
     vstr_ins_byte(path, path->len - 2, 'm');
-    stat = stat_path(vstr_null_terminated_str(path));
+    stat = stat_path(path);
     if (stat == MP_IMPORT_STAT_FILE) {
         return stat;
     }
@@ -99,7 +100,7 @@ STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
 // result is a file, the path argument will be updated to include the file
 // extension.
 STATIC mp_import_stat_t stat_module(vstr_t *path) {
-    mp_import_stat_t stat = stat_path(vstr_null_terminated_str(path));
+    mp_import_stat_t stat = stat_path(path);
     DEBUG_printf("stat %s: %d\n", vstr_str(path), stat);
     if (stat == MP_IMPORT_STAT_DIR) {
         return stat;

From 807c25d05a81feed1dd0cbc5fde5e0d1ef45c967 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Jan 2024 12:28:30 +1100
Subject: [PATCH 0783/3129] rp2: Change machine.I2S and rp2.DMA to use shared
 DMA IRQ handlers.

These separate drivers must share the DMA resource with each other.

Fixes issue #13380.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/machine_i2s.c  |  6 ++----
 ports/rp2/rp2_dma.c      | 14 +++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 281b0c3bc2846..3a46fdaa7f47b 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -474,6 +474,7 @@ target_compile_definitions(${MICROPY_TARGET} PRIVATE
     PICO_FLOAT_PROPAGATE_NANS=1
     PICO_STACK_SIZE=0x2000
     PICO_CORE1_STACK_SIZE=0
+    PICO_MAX_SHARED_IRQ_HANDLERS=8 # we need more than the default
     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}"
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 68a0f296a01fe..ae8026a4af662 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -232,20 +232,18 @@ STATIC void feed_dma(machine_i2s_obj_t *self, uint8_t *dma_buffer_p) {
 
 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_add_shared_handler(DMA_IRQ_0, dma_irq0_handler, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
         irq_set_enabled(DMA_IRQ_0, true);
     } else {
-        irq_set_exclusive_handler(DMA_IRQ_1, dma_irq1_handler);
+        irq_add_shared_handler(DMA_IRQ_1, dma_irq1_handler, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
         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);
     }
 }
diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
index 893498265aa41..425fb417fa5ec 100644
--- a/ports/rp2/rp2_dma.c
+++ b/ports/rp2/rp2_dma.c
@@ -98,18 +98,16 @@ STATIC uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) {
 STATIC void rp2_dma_irq_handler(void) {
     // Main IRQ handler
     uint32_t irq_bits = dma_hw->ints0;
-    dma_hw->ints0 = 0xffff;
 
     for (int i = 0; i < NUM_DMA_CHANNELS; i++) {
         if (irq_bits & (1u << i)) {
             mp_irq_obj_t *handler = MP_STATE_PORT(rp2_dma_irq_obj[i]);
             if (handler) {
+                // An rp2.DMA IRQ handler is registered for this channel, so handle it.
+                dma_channel_acknowledge_irq0(i);
                 rp2_dma_obj_t *self = (rp2_dma_obj_t *)handler->parent;
                 self->irq_flag = 1;
                 mp_irq_handler(handler);
-            } else {
-                // We got an interrupt with no handler. Disable the channel
-                dma_channel_set_irq0_enabled(i, false);
             }
         }
     }
@@ -389,6 +387,9 @@ STATIC mp_obj_t rp2_dma_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     if (irq == NULL) {
         irq = mp_irq_new(&rp2_dma_irq_methods, MP_OBJ_FROM_PTR(self));
         MP_STATE_PORT(rp2_dma_irq_obj[self->channel]) = irq;
+
+        // Clear any existing IRQs on this DMA channel, they are not for us.
+        dma_channel_acknowledge_irq0(self->channel);
     }
 
     if (n_args > 1 || kw_args->used != 0) {
@@ -457,12 +458,11 @@ MP_DEFINE_CONST_OBJ_TYPE(
 void rp2_dma_init(void) {
     // Set up interrupts.
     memset(MP_STATE_PORT(rp2_dma_irq_obj), 0, sizeof(MP_STATE_PORT(rp2_dma_irq_obj)));
-    irq_set_exclusive_handler(DMA_IRQ_0, rp2_dma_irq_handler);
+    irq_add_shared_handler(DMA_IRQ_0, rp2_dma_irq_handler, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
 }
 
 void rp2_dma_deinit(void) {
-    // Disable and clear interrupts.
-    irq_set_mask_enabled(1u << DMA_IRQ_0, false);
+    // Remove our interrupt handler.
     irq_remove_handler(DMA_IRQ_0, rp2_dma_irq_handler);
 }
 

From 2d7fb9a715d8c9f1f7ba73a62cfd587fa6ffc24a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Jan 2024 12:44:25 +1100
Subject: [PATCH 0784/3129] tests/ports/rp2/rp2_dma.py: Tweak test to be more
 reliable.

The timing of the DMA transfer can vary a bit, so tweak the allowed values.
Also test the return value of `rp2.DMA.irq.flags()` to make sure the IRQ is
correctly signalled.

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

diff --git a/tests/ports/rp2/rp2_dma.py b/tests/ports/rp2/rp2_dma.py
index cd97f0357b788..2459213f4c014 100644
--- a/tests/ports/rp2/rp2_dma.py
+++ b/tests/ports/rp2/rp2_dma.py
@@ -62,7 +62,7 @@ def run_and_time_dma(dma):
 dma.count = len(dest) // 4
 dma.ctrl = dma.pack_ctrl()
 dt = run_and_time_dma(dma)
-print(60 <= dt <= 90)
+print(70 <= dt <= 110)
 print(dest[:8], dest[-8:])
 dma.close()
 
@@ -80,7 +80,7 @@ def run_and_time_dma(dma):
 print("# test irq")
 dest = bytearray(1024)
 dma = rp2.DMA()
-dma.irq(lambda _: print("irq fired"))
+dma.irq(lambda dma: print("irq fired", dma.irq().flags()))
 dma.config(
     read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(irq_quiet=0), trigger=True
 )
diff --git a/tests/ports/rp2/rp2_dma.py.exp b/tests/ports/rp2/rp2_dma.py.exp
index 956aee4e34c1f..79f17626ace2a 100644
--- a/tests/ports/rp2/rp2_dma.py.exp
+++ b/tests/ports/rp2/rp2_dma.py.exp
@@ -12,5 +12,5 @@ bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\
 # test immediate trigger
 bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
 # test irq
-irq fired
+irq fired 1
 bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')

From 28b18c43fefe6236f899eba79f9a1b2bad134d0f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 31 Jan 2024 12:56:29 +1100
Subject: [PATCH 0785/3129] py/compile: Fix potential Py-stack overflow in
 try-finally with return.

If a return is executed within the try block of a try-finally then the
return value is stored on the top of the Python stack during the execution
of the finally block.  In this case the Python stack is one larger than it
normally would be in the finally block.

Prior to this commit, the compiler was not taking this case into account
and could have a Python stack overflow if the Python stack used by the
finally block was more than that used elsewhere in the function.  In such
a scenario the last argument of the function would be clobbered by the
top-most temporary value used in the deepest Python expression/statement.

This commit fixes that case by making sure enough Python stack is allocated
to the function.

Fixes issue #13562.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c                       | 11 +++++++++++
 tests/basics/try_finally_return.py | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/py/compile.c b/py/compile.c
index 4f91ca49b903a..a9b34ce5d91bd 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1650,9 +1650,11 @@ STATIC void compile_try_except(compiler_t *comp, mp_parse_node_t pn_body, int n_
         if (qstr_exception_local != 0) {
             EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
             EMIT_ARG(label_assign, l3);
+            EMIT_ARG(adjust_stack_size, 1); // stack adjust for possible return value
             EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
             compile_store_id(comp, qstr_exception_local);
             compile_delete_id(comp, qstr_exception_local);
+            EMIT_ARG(adjust_stack_size, -1);
             compile_decrease_except_level(comp);
         }
 
@@ -1682,9 +1684,18 @@ STATIC void compile_try_finally(compiler_t *comp, mp_parse_node_t pn_body, int n
     } else {
         compile_try_except(comp, pn_body, n_except, pn_except, pn_else);
     }
+
+    // If the code reaches this point then the try part of the try-finally exited normally.
+    // This is indicated to the runtime by None sitting on the stack.
     EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
+
+    // Compile the finally block.
+    // The stack needs to be adjusted by 1 to account for the possibility that the finally is
+    // being executed as part of a return, and the return value is on the top of the stack.
     EMIT_ARG(label_assign, l_finally_block);
+    EMIT_ARG(adjust_stack_size, 1);
     compile_node(comp, pn_finally);
+    EMIT_ARG(adjust_stack_size, -1);
 
     compile_decrease_except_level(comp);
 }
diff --git a/tests/basics/try_finally_return.py b/tests/basics/try_finally_return.py
index 31a507e8d0753..21e01ea21bf22 100644
--- a/tests/basics/try_finally_return.py
+++ b/tests/basics/try_finally_return.py
@@ -70,3 +70,13 @@ def f():
     finally:
         print('finally 1')
 print(f())
+
+# the finally block uses a lot of Python stack and then a local is accessed
+# (tests that the use of the stack doesn't clobber the local)
+def f(x):
+    try:
+        return x
+    finally:
+        print(2, 3, 4, 5, 6)
+        print(x)
+print(f(1))

From 81049edf7c67413527ba58a96a3ecfb963addbf9 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Mon, 29 Jan 2024 23:52:11 +0900
Subject: [PATCH 0786/3129] renesas-ra/ra/ra_i2c: Fix 1 byte and 2 bytes read
 issue.

Tested on Portenta C33 with AT24256B (addrsize=16) and SSD1306.

Fixes issue #13280.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/ra/ra_i2c.c | 36 +++++++++++++++++++++++++++++++++++-
 ports/renesas-ra/ra/ra_i2c.h |  9 +++++----
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/ports/renesas-ra/ra/ra_i2c.c b/ports/renesas-ra/ra/ra_i2c.c
index 783c0c921543b..701f4d6aa8386 100644
--- a/ports/renesas-ra/ra/ra_i2c.c
+++ b/ports/renesas-ra/ra/ra_i2c.c
@@ -426,7 +426,7 @@ void ra_i2c_init(R_IIC0_Type *i2c_inst, uint32_t scl, uint32_t sda, uint32_t bau
     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->ICMR3_b.ACKWP = 0x00; // I2C not 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);
@@ -480,6 +480,7 @@ 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) {
     unit->m_bytes_transferred = 0;
     unit->m_bytes_transfer = size;
+    unit->m_bytes_total = size;
     unit->m_fread = fread;
     unit->buf = buf;
     unit->next = (void *)next;
@@ -531,6 +532,37 @@ static void ra_i2c_iceri_isr(R_IIC0_Type *i2c_inst) {
 static void ra_i2c_icrxi_isr(R_IIC0_Type *i2c_inst) {
     xaction_unit_t *unit = current_xaction_unit;
     xaction_t *action = current_xaction;
+    // 1 byte or 2 bytes
+    if (unit->m_bytes_total <= 2) {
+        if (action->m_status == RA_I2C_STATUS_AddrWriteCompleted) {
+            action->m_status = RA_I2C_STATUS_FirstReceiveCompleted;
+            i2c_inst->ICMR3_b.WAIT = 1;
+            // need dummy read processes for 1 byte and 2 bytes receive
+            if (unit->m_bytes_total == 2) {
+                (void)i2c_inst->ICDRR; // dummy read for 2 bytes receive
+            } else {  // m_bytes_total == 1
+                i2c_inst->ICMR3_b.ACKWP = 0x01; // enable write ACKBT (transfer acknowledge bit)
+                i2c_inst->ICMR3_b.ACKBT = 1;
+                i2c_inst->ICMR3_b.ACKWP = 0x00; // disable write ACKBT (transfer acknowledge bit)
+                (void)i2c_inst->ICDRR; // dummy read for 1 byte receive
+            }
+            return;
+        }
+        if (unit->m_bytes_transfer == 2) {      // last two data
+            i2c_inst->ICMR3_b.ACKWP = 0x01; // enable write ACKBT (transfer acknowledge bit)
+            i2c_inst->ICMR3_b.ACKBT = 1;
+            i2c_inst->ICMR3_b.ACKWP = 0x00; // disable write ACKBT (transfer acknowledge bit)
+            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);
+        }
+        return;
+    }
+    // 3 bytes or more
     if (action->m_status == RA_I2C_STATUS_AddrWriteCompleted) {
         (void)i2c_inst->ICDRR; // dummy read
         action->m_status = RA_I2C_STATUS_FirstReceiveCompleted;
@@ -542,7 +574,9 @@ static void ra_i2c_icrxi_isr(R_IIC0_Type *i2c_inst) {
         }
         ra_i2c_xunit_read_byte(i2c_inst, unit);
     } else if (unit->m_bytes_transfer == 2) {
+        i2c_inst->ICMR3_b.ACKWP = 0x01; // enable write ACKBT (transfer acknowledge bit)
         i2c_inst->ICMR3_b.ACKBT = 1;
+        i2c_inst->ICMR3_b.ACKWP = 0x00; // disable write ACKBT (transfer acknowledge bit)
         ra_i2c_xunit_read_byte(i2c_inst, unit);
     } else {
         // last data
diff --git a/ports/renesas-ra/ra/ra_i2c.h b/ports/renesas-ra/ra/ra_i2c.h
index e2432675a001e..fc172a3e956aa 100644
--- a/ports/renesas-ra/ra/ra_i2c.h
+++ b/ports/renesas-ra/ra/ra_i2c.h
@@ -47,9 +47,9 @@ typedef enum
     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,
+    RA_I2C_STATUS_FirstReceiveCompleted = 6,
+    RA_I2C_STATUS_LastReceiveCompleted = 7,
+    RA_I2C_STATUS_Stopped = 8,
 } xaction_status_t;
 
 typedef enum
@@ -64,6 +64,7 @@ typedef enum
 typedef struct {
     volatile uint32_t m_bytes_transferred;
     volatile uint32_t m_bytes_transfer;
+    uint32_t m_bytes_total;
     bool m_fread;
     uint8_t *buf;
     void *next;
@@ -75,7 +76,7 @@ typedef struct {
     uint32_t m_current;
     uint32_t m_address;
     volatile xaction_status_t m_status;
-    xaction_error_t m_error;
+    volatile xaction_error_t m_error;
     bool m_stop;
 } xaction_t;
 

From 3e48d24576f8a44a20e65a5782204944de2467b3 Mon Sep 17 00:00:00 2001
From: Joey232 <Joey@jsconsulting.com>
Date: Sat, 20 Jan 2024 17:32:37 -0500
Subject: [PATCH 0787/3129] esp32/boards/UM_FEATHERS3: Use read_uv() for
 accurate battery voltage.

Use read_uv() to get the battery voltage because it uses the on-chip
calibraton values.

Signed-off-by: Joey232 <Joey@jsconsulting.com>
---
 ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
index b6f486f3d811b..57b15f9c01c29 100644
--- a/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
+++ b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
@@ -65,10 +65,11 @@ def get_battery_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
-    adc.atten(ADC.ATTN_2_5DB)  # Needs 2.5DB attenuation for max voltage of 1.116V w/batt of 4.2V
-    measuredvbat = adc.read()
-    measuredvbat /= 3657  # Divide by 3657 as we are using 2.5dB attenuation, which is max input of 1.25V = 4095 counts
-    measuredvbat *= 4.2  # Multiply by 4.2V, our max charge voltage for a 1S LiPo
+    # Max voltage on ADC input will be 4.2V divided by R2 (442K) & R5 (160K), 4.2 / (160+442) * 160 = 1.1163V
+    adc.atten(ADC.ATTN_2_5DB)  # Needs 2.5DB attenuation to read a max voltage of 1.1163V
+    # Use read_uv() to get ADC reading as this will use the on-chip calibration data
+    measuredvbat = adc.read_uv() / 1000000  # Read micovolts and convert to volts
+    measuredvbat *= 3.7624  # Multiply by ratio of battery voltage to ADC pin voltage: 4.2/1.1163
     return round(measuredvbat, 2)
 
 

From 457f2ccf804dd0e9a770984ed11f2568c2fcd958 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 31 Jan 2024 11:18:05 +1100
Subject: [PATCH 0788/3129] examples/embedding: Add -fno-common to the sample
 compiler flags.

This makes no difference when files are linked directly into a target
application, but on macOS additional steps are needed to index common
symbols in static libraries. See https://stackoverflow.com/a/26581710

By not creating any common symbols, this problem is bypassed.

This will also trigger linker errors if there are cases where the same
symbol is defined in the host application.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 examples/embedding/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/embedding/Makefile b/examples/embedding/Makefile
index 13bfdf12395d8..c3ca14836f1d3 100644
--- a/examples/embedding/Makefile
+++ b/examples/embedding/Makefile
@@ -12,7 +12,7 @@ PROG = embed
 CFLAGS += -I.
 CFLAGS += -I$(EMBED_DIR)
 CFLAGS += -I$(EMBED_DIR)/port
-CFLAGS += -Wall -Og
+CFLAGS += -Wall -Og -fno-common
 
 SRC += main.c
 SRC += $(wildcard $(EMBED_DIR)/*/*.c) $(wildcard $(EMBED_DIR)/*/*/*.c)

From 0285cb2bf4a317490364b9249f25ca0eaa6af3ef Mon Sep 17 00:00:00 2001
From: Jim Lipsey <jim.lipsey@ricres.org>
Date: Thu, 12 Oct 2023 17:14:52 -0500
Subject: [PATCH 0789/3129] stm32/boards/ARDUINO_PORTENTA_H7: Add pin
 configuration for SPI1.

Currently, only the processor's SPI2 bus is enabled (though the related
pins are labeled SPI1 in the Portenta H7 documentation).  This commit
enables the processor's SPI1 bus, which is accessible via the board's
high-density connectors.

Signed-off-by: Jim Lipsey <github@lipsey.org>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index e2e6956a47d68..ace63e016b189 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -170,7 +170,12 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
-// SPI
+// SPI buses
+#define MICROPY_HW_SPI1_NSS         (pin_C13)
+#define MICROPY_HW_SPI1_SCK         (pin_B3)
+#define MICROPY_HW_SPI1_MISO        (pin_B4)
+#define MICROPY_HW_SPI1_MOSI        (pin_D7)
+
 #define MICROPY_HW_SPI2_NSS         (pin_I0)
 #define MICROPY_HW_SPI2_SCK         (pin_I1)
 #define MICROPY_HW_SPI2_MISO        (pin_C2)

From ac8e7f7b67ea13e7e9f816d3cfd4ddae4782db8d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 5 Feb 2024 13:05:29 +1100
Subject: [PATCH 0790/3129] docs/library/ssl: Change wrap_socket args
 keyfile/certfile to key/cert.

So they match the code in extmod/modssl_*.c.

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

diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index f9be27745379b..dff90b8da58b9 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, cadata=None, server_hostname=None, do_handshake=True)
+.. function:: ssl.wrap_socket(sock, server_side=False, key=None, cert=None, cert_reqs=CERT_NONE, cadata=None, server_hostname=None, do_handshake=True)
 
     Wrap the given *sock* and return a new wrapped-socket object.  The implementation
     of this function is to first create an `SSLContext` and then call the `SSLContext.wrap_socket`

From 23342eff906a99fc0a006916d350c86426fd9204 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sun, 18 Dec 2022 18:26:32 -0600
Subject: [PATCH 0791/3129] windows/Makefile: Fix float exact int formatting on
 32-bit mingw.

When compiler optimizations are enabled on the mingw version of gcc, we are
getting failing tests because of rounding issues, for example:

    print(float("1e24"))

would print

    9.999999999999999e+23

instead of

    1e+24

It turns out special compiler options are needed to get GCC to use the SSE
instruction set instead of the 387 coprocessor (which uses 80-bit precision
internall).

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/windows/Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 94bd3f99f9415..bb635167da349 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -86,6 +86,15 @@ ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMPZ_DIG_SIZE=16
 endif
 
+ifeq ($(shell $(CC) -dumpmachine),i686-w64-mingw32)
+# GCC disables the SSE instruction set by default on i366 targets and we have
+# to specify all three of these options to enable it.
+# https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html (see -mfpmath=unit section)
+# Enabling the SSE instruction set is necessary to get correct rounding of floating points.
+# https://lemire.me/blog/2020/06/26/gcc-not-nearest
+CFLAGS += -msse -mfpmath=sse -march=pentium4
+endif
+
 CXXFLAGS += $(filter-out -std=gnu99,$(CFLAGS))
 
 include $(TOP)/py/mkrules.mk

From ed15b3c6c67f4626dde1ac4281978b3bef1c72ce Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 17 Dec 2022 15:09:37 -0600
Subject: [PATCH 0792/3129] github/workflows: Move Windows CI from AppVeyor to
 GitHub Actions.

By moving to GitHub actions, all MicroPython CI builds are now on GitHub
actions.  This allows faster parallel builds and saves time by not building
when no relevant files changed.

This reveals a few failing tests, so those are temporarily disabled until
they can be fixed.

Signed-off-by: David Lechner <david@pybricks.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_windows.yml | 127 +++++++++++++++++++++++++++-
 ports/windows/.appveyor.yml         |  90 --------------------
 tests/run-tests.py                  |   8 ++
 3 files changed, 134 insertions(+), 91 deletions(-)
 delete mode 100644 ports/windows/.appveyor.yml

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 4b1f4ea791e20..6858a146c42d1 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -18,7 +18,132 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  build-vs:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [x86, x64]
+        configuration: [Debug, Release]
+        variant: [dev, standard]
+        visualstudio: ['2017', '2019', '2022']
+        include:
+        - visualstudio: '2017'
+          runner: windows-latest
+          vs_version: '[15, 16)'
+        - visualstudio: '2019'
+          runner: windows-2019
+          vs_version: '[16, 17)'
+        - visualstudio: '2022'
+          runner: windows-2022
+          vs_version: '[17, 18)'
+        # trim down the number of jobs in the matrix
+        exclude:
+        - variant: standard
+          configuration: Debug
+        - visualstudio: '2019'
+          configuration: Debug
+    runs-on: ${{ matrix.runner }}
+    steps:
+    - name: Install Visual Studio 2017
+      if: matrix.visualstudio == '2017'
+      run: |
+        choco install visualstudio2017buildtools
+        choco install visualstudio2017-workload-vctools
+        choco install windows-sdk-8.1
+    - uses: microsoft/setup-msbuild@v1
+      with:
+        vs-version: ${{ matrix.vs_version }}
+    - uses: actions/setup-python@v4
+      if: matrix.runner == 'windows-2019'
+      with:
+        python-version: '3.9' 
+    - uses: actions/checkout@v3
+    - name: Build mpy-cross.exe
+      run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
+    - name: Build micropython.exe
+      run: msbuild ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} 
+    - name: Get micropython.exe path
+      id: get_path
+      run: |
+        $exePath="$(msbuild ports\windows\micropython.vcxproj -nologo -v:m -t:ShowTargetPath -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }})"
+        echo ("micropython=" + $exePath.Trim()) >> $env:GITHUB_OUTPUT
+    - name: Run tests
+      id: test
+      env:
+        MICROPY_MICROPYTHON: ${{ steps.get_path.outputs.micropython }}
+      working-directory: tests
+      run: python run-tests.py
+    - name: Print failures
+      if: failure() && steps.test.conclusion == 'failure'
+      working-directory: tests
+      run: python run-tests.py --print-failures
+    - name: Run mpy tests
+      id: test_mpy
+      env:
+        MICROPY_MICROPYTHON: ${{ steps.get_path.outputs.micropython }}
+      working-directory: tests
+      run: python run-tests.py --via-mpy -d basics float micropython
+    - name: Print mpy failures
+      if: failure() && steps.test_mpy.conclusion == 'failure'
+      working-directory: tests
+      run: python run-tests.py --print-failures
+
+  build-mingw:
+    strategy:
+      fail-fast: false
+      matrix:
+        variant: [dev, standard]
+        sys: [mingw32, mingw64]
+        include:
+          - sys: mingw32
+            env: i686
+          - sys: mingw64
+            env: x86_64
+    runs-on: windows-2022
+    env:
+      CHERE_INVOKING: enabled_from_arguments
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - name: Get Python path
+      id: python_path
+      shell: python
+      run: |
+        import os
+        import sys
+        output = f"python={os.fspath(sys.executable)}"
+        print(output)
+        with open(os.environ["GITHUB_OUTPUT"], "w") as f:
+            f.write(output)
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.sys }}
+        update: true
+        install: >-
+          make 
+          mingw-w64-${{ matrix.env }}-gcc
+          pkg-config
+          python3
+          git
+          diffutils
+    - uses: actions/checkout@v3
+    - name: Build mpy-cross.exe
+      run: make -C mpy-cross -j2
+    - name: Update submodules
+      run: make -C ports/windows VARIANT=${{ matrix.variant }} submodules
+    - name: Build micropython.exe
+      run: make -C ports/windows -j2 VARIANT=${{ matrix.variant }}
+    - name: Run tests
+      id: test
+      # msys python breaks tests so we need to use "real" windows python
+      run: MICROPY_CPYTHON3=$(cygpath "${{ steps.python_path.outputs.python }}") make -C ports/windows test_full VARIANT=${{ matrix.variant }}
+    - name: Print failures
+      if: failure() && steps.test.conclusion == 'failure'
+      working-directory: tests
+      run: python run-tests.py --print-failures
+
+  cross-build-on-linux:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
deleted file mode 100644
index c1a114a0f8978..0000000000000
--- a/ports/windows/.appveyor.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-image: Visual Studio 2017
-clone_depth: 1
-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
-- ps: Update-AppveyorBuild -Version $env:appveyor_repo_commit.substring(0,8)
-
-configuration:
-- Debug
-- Release
-
-platform:
-- x86
-- x64
-
-matrix:
-  # One debug build is enough.
-  exclude:
-    - configuration: Debug
-      PyVariant: dev
-
-before_build:
-- ps: |
-    @"
-    <?xml version="1.0" encoding="utf-8"?>
-    <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-      <Target Name="Build">
-        <MsBuild Projects="mpy-cross\mpy-cross.vcxproj;ports\windows\micropython.vcxproj"/>
-      </Target>
-    </Project>
-    "@ | Set-Content build.proj
-
-build:
-  project: build.proj
-  parallel: true
-  verbosity: normal
-
-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) {
-      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
-      throw "Test failure"
-    }
-    & $env:MICROPY_CPYTHON3 run-tests.py --via-mpy -d basics float micropython
-    if ($LASTEXITCODE -ne 0) {
-      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
-      throw "Test failure"
-    }
-
-# After the build/test phase for the MSVC build completes,
-# build and test with mingw-w64, release versions only.
-after_test:
-- ps: |
-    if ($env:configuration -eq 'Debug') {
-      return
-    }
-    $env:MSYSTEM = if ($platform -eq 'x86') {'MINGW32'} else {'MINGW64'}
-    $env:CHERE_INVOKING = 'enabled_from_arguments'
-    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 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/build/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) {
-      cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
-      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
-      throw "Test failure"
-    }
diff --git a/tests/run-tests.py b/tests/run-tests.py
index ecd49a7d75fea..c912f9d5424df 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -532,6 +532,14 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if os.getenv("GITHUB_ACTIONS") == "true":
         skip_tests.add("thread/stress_schedule.py")  # has reliability issues
 
+        if os.getenv("RUNNER_OS") == "Windows":
+            # fails with stack overflow on Debug builds
+            skip_tests.add("misc/sys_settrace_features.py")
+
+            if os.getenv("MSYSTEM") is not None:
+                # fails due to wrong path separator
+                skip_tests.add("import/import_file.py")
+
     if upy_float_precision == 0:
         skip_tests.add("extmod/uctypes_le_float.py")
         skip_tests.add("extmod/uctypes_native_float.py")

From 5a68e82d1729db0a372b5fa20030a2a7b1a6e788 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Feb 2024 11:28:52 +1100
Subject: [PATCH 0793/3129] github/workflows: Bump setup-msbuild, setup-python,
 checkout versions.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_windows.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 6858a146c42d1..cb125cc6d21a5 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -50,14 +50,14 @@ jobs:
         choco install visualstudio2017buildtools
         choco install visualstudio2017-workload-vctools
         choco install windows-sdk-8.1
-    - uses: microsoft/setup-msbuild@v1
+    - uses: microsoft/setup-msbuild@v2
       with:
         vs-version: ${{ matrix.vs_version }}
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       if: matrix.runner == 'windows-2019'
       with:
         python-version: '3.9' 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build mpy-cross.exe
       run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
     - name: Build micropython.exe
@@ -127,7 +127,7 @@ jobs:
           python3
           git
           diffutils
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build mpy-cross.exe
       run: make -C mpy-cross -j2
     - name: Update submodules

From ff736830773371c4f616a1b5aa423a7ba4a57191 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Feb 2024 12:50:34 +1100
Subject: [PATCH 0794/3129] github/workflows: Initialise micropython-lib
 submodule for windows CI.

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

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index cb125cc6d21a5..a2759880a2f65 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -60,6 +60,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build mpy-cross.exe
       run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
+    - name: Update submodules
+      run: git submodule update --init lib/micropython-lib
     - name: Build micropython.exe
       run: msbuild ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} 
     - name: Get micropython.exe path

From c68462d9967aec0c36345b54ebd22b559aa55ca0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Feb 2024 12:20:13 +1100
Subject: [PATCH 0795/3129] lib/micropython-lib: Update submodule to latest.

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 7cdf70881519c..ddb1a279578bf 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 7cdf70881519c73667efbc4a61a04d9c1a49babb
+Subproject commit ddb1a279578bfff8c1b18aff3baa668620684f64

From f8f1f29ac0b5ef837e7c277b2777080c1d82e080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 1 Feb 2024 12:07:06 +0000
Subject: [PATCH 0796/3129] extmod/modssl_axtls: Add
 SSLContext.load_cert_chain().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To match the mbedtls implementation.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/modssl_axtls.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/extmod/modssl_axtls.c b/extmod/modssl_axtls.c
index 6cb999c13b69f..0368cb93051cc 100644
--- a/extmod/modssl_axtls.c
+++ b/extmod/modssl_axtls.c
@@ -161,6 +161,14 @@ STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, m
     self->cert = cert_obj;
 }
 
+// SSLContext.load_cert_chain(certfile, keyfile)
+STATIC mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t cert, mp_obj_t pkey) {
+    mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
+    ssl_context_load_key(self, pkey, cert);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_load_cert_chain);
+
 STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
     static const mp_arg_t allowed_args[] = {
@@ -182,6 +190,7 @@ STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args,
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
 
 STATIC const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_load_cert_chain), MP_ROM_PTR(&ssl_context_load_cert_chain_obj)},
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_context_wrap_socket_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);

From b802f0f8abf3c198d4d373d934f4ab13ec1552f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 1 Feb 2024 12:07:06 +0000
Subject: [PATCH 0797/3129] extmod/modtls: Move the native ssl module to tls.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current `ssl` module has quite a few differences to the CPython
implementation.  This change moves the MicroPython variant to a new `tls`
module and provides a wrapper module for `ssl` (in micropython-lib).

Users who only rely on implemented comparible behavior can continue to use
`ssl`, while users that rely on non-compatible behavior should switch to
`tls`.  Then we can make the facade in `ssl` more strictly adhere to
CPython.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/extmod.cmake                           |   4 +-
 extmod/extmod.mk                              |   4 +-
 extmod/{modssl_axtls.c => modtls_axtls.c}     |  52 +------
 extmod/{modssl_mbedtls.c => modtls_mbedtls.c} | 132 ++----------------
 ports/unix/variants/coverage/manifest.py      |   1 +
 ports/unix/variants/manifest.py               |   1 +
 ports/windows/variants/manifest.py            |   1 +
 .../variants/standard/mpconfigvariant.props   |   3 +
 ...t_ciphers.py => tls_sslcontext_ciphers.py} |   6 +-
 ...s.py.exp => tls_sslcontext_ciphers.py.exp} |   0
 ...ython.py => tls_sslcontext_micropython.py} |   8 +-
 ....exp => tls_sslcontext_micropython.py.exp} |   0
 .../sslcontext_server_client_ciphers.py       |  16 ++-
 tests/ports/unix/extra_coverage.py.exp        |   4 +-
 14 files changed, 49 insertions(+), 183 deletions(-)
 rename extmod/{modssl_axtls.c => modtls_axtls.c} (87%)
 rename extmod/{modssl_mbedtls.c => modtls_mbedtls.c} (85%)
 rename tests/extmod/{ssl_sslcontext_ciphers.py => tls_sslcontext_ciphers.py} (79%)
 rename tests/extmod/{ssl_sslcontext_ciphers.py.exp => tls_sslcontext_ciphers.py.exp} (100%)
 rename tests/extmod/{ssl_sslcontext_micropython.py => tls_sslcontext_micropython.py} (82%)
 rename tests/extmod/{ssl_sslcontext_micropython.py.exp => tls_sslcontext_micropython.py.exp} (100%)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index a55cd76f88bc9..d73ff258ffd9f 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -39,8 +39,8 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modre.c
     ${MICROPY_EXTMOD_DIR}/modselect.c
     ${MICROPY_EXTMOD_DIR}/modsocket.c
-    ${MICROPY_EXTMOD_DIR}/modssl_axtls.c
-    ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
+    ${MICROPY_EXTMOD_DIR}/modtls_axtls.c
+    ${MICROPY_EXTMOD_DIR}/modtls_mbedtls.c
     ${MICROPY_EXTMOD_DIR}/modtime.c
     ${MICROPY_EXTMOD_DIR}/modwebsocket.c
     ${MICROPY_EXTMOD_DIR}/modwebrepl.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index fdaa3d930588c..b3246bc0d9546 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -36,8 +36,8 @@ SRC_EXTMOD_C += \
 	extmod/modre.c \
 	extmod/modselect.c \
 	extmod/modsocket.c \
-	extmod/modssl_axtls.c \
-	extmod/modssl_mbedtls.c \
+	extmod/modtls_axtls.c \
+	extmod/modtls_mbedtls.c \
 	extmod/modtime.c \
 	extmod/moductypes.c \
 	extmod/modwebrepl.c \
diff --git a/extmod/modssl_axtls.c b/extmod/modtls_axtls.c
similarity index 87%
rename from extmod/modssl_axtls.c
rename to extmod/modtls_axtls.c
index 0368cb93051cc..1ac40208db003 100644
--- a/extmod/modssl_axtls.c
+++ b/extmod/modtls_axtls.c
@@ -422,48 +422,8 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // ssl module.
 
-STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum {
-        ARG_key,
-        ARG_cert,
-        ARG_server_side,
-        ARG_server_hostname,
-        ARG_do_handshake,
-    };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { 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_do_handshake, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
-    };
-
-    // Parse arguments.
-    mp_obj_t sock = 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);
-
-    // Create SSLContext.
-    mp_int_t protocol = args[ARG_server_side].u_bool ? PROTOCOL_TLS_SERVER : PROTOCOL_TLS_CLIENT;
-    mp_obj_t ssl_context_args[1] = { MP_OBJ_NEW_SMALL_INT(protocol) };
-    mp_obj_ssl_context_t *ssl_context = MP_OBJ_TO_PTR(ssl_context_make_new(&ssl_context_type, 1, 0, ssl_context_args));
-
-    // Load key and cert if given.
-    if (args[ARG_key].u_obj != mp_const_none) {
-        ssl_context_load_key(ssl_context, args[ARG_key].u_obj, args[ARG_cert].u_obj);
-    }
-
-    // Create and return the new SSLSocket object.
-    return ssl_socket_make_new(ssl_context, sock, args[ARG_server_side].u_bool,
-        args[ARG_do_handshake].u_bool, args[ARG_server_hostname].u_obj);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socket);
-
-STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ssl) },
-
-    // Functions.
-    { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
+STATIC const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_tls) },
 
     // Classes.
     { MP_ROM_QSTR(MP_QSTR_SSLContext), MP_ROM_PTR(&ssl_context_type) },
@@ -472,13 +432,13 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(PROTOCOL_TLS_CLIENT) },
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(PROTOCOL_TLS_SERVER) },
 };
-STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_tls_globals, mp_module_tls_globals_table);
 
-const mp_obj_module_t mp_module_ssl = {
+const mp_obj_module_t mp_module_tls = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_tls_globals,
 };
 
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_ssl, mp_module_ssl);
+MP_REGISTER_MODULE(MP_QSTR_tls, mp_module_tls);
 
 #endif // MICROPY_PY_SSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modssl_mbedtls.c b/extmod/modtls_mbedtls.c
similarity index 85%
rename from extmod/modssl_mbedtls.c
rename to extmod/modtls_mbedtls.c
index b6275d8d88fb7..a0f2cd1699486 100644
--- a/extmod/modssl_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -91,24 +91,6 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
 /******************************************************************************/
 // Helper functions.
 
-STATIC mp_obj_t read_file(mp_obj_t self_in) {
-    // file = open(args[0], "rb")
-    mp_obj_t f_args[2] = {
-        self_in,
-        MP_OBJ_NEW_QSTR(MP_QSTR_rb),
-    };
-    mp_obj_t file = mp_vfs_open(2, &f_args[0], (mp_map_t *)&mp_const_empty_map);
-
-    // data = file.read()
-    mp_obj_t dest[2];
-    mp_load_method(file, MP_QSTR_read, dest);
-    mp_obj_t data = mp_call_method_n_kw(0, 0, dest);
-
-    // file.close()
-    mp_stream_close(file);
-    return data;
-}
-
 #ifdef MBEDTLS_DEBUG_C
 STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
     (void)ctx;
@@ -256,9 +238,7 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     }
 
     if (endpoint == MBEDTLS_SSL_IS_CLIENT) {
-        // The CPython default is MBEDTLS_SSL_VERIFY_REQUIRED, but to maintain
-        // backwards compatibility we use MBEDTLS_SSL_VERIFY_NONE for now.
-        self->authmode = MBEDTLS_SSL_VERIFY_NONE;
+        self->authmode = MBEDTLS_SSL_VERIFY_REQUIRED;
     } else {
         self->authmode = MBEDTLS_SSL_VERIFY_NONE;
     }
@@ -376,25 +356,9 @@ STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, m
 }
 
 // SSLContext.load_cert_chain(certfile, keyfile)
-STATIC mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t certfile, mp_obj_t keyfile) {
+STATIC mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t cert, mp_obj_t pkey) {
     mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_t pkey;
-    mp_obj_t cert;
-    if (certfile != mp_const_none) {
-        // check if key is a string/path
-        if (!(mp_obj_is_type(keyfile, &mp_type_bytes))) {
-            pkey = read_file(keyfile);
-        } else {
-            pkey = keyfile;
-        }
-        // check if cert is a string/path
-        if (!(mp_obj_is_type(certfile, &mp_type_bytes))) {
-            cert = read_file(certfile);
-        } else {
-            cert = certfile;
-        }
-        ssl_context_load_key(self, pkey, cert);
-    }
+    ssl_context_load_key(self, pkey, cert);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_load_cert_chain);
@@ -411,29 +375,14 @@ STATIC void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_
     mbedtls_ssl_conf_ca_chain(&self->conf, &self->cacert, NULL);
 }
 
-// SSLContext.load_verify_locations(cafile=None, *, cadata=None)
-STATIC mp_obj_t ssl_context_load_verify_locations(size_t n_args, const mp_obj_t *pos_args,
-    mp_map_t *kw_args) {
+// SSLContext.load_verify_locations(cadata)
+STATIC mp_obj_t ssl_context_load_verify_locations(mp_obj_t self_in, mp_obj_t cadata) {
 
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_cafile, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_cadata, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-    };
-
-    mp_obj_ssl_context_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);
-    // cafile
-    if (args[0].u_obj != mp_const_none) {
-        ssl_context_load_cadata(self, read_file(args[0].u_obj));
-    }
-    // cadata
-    if (args[1].u_obj != mp_const_none) {
-        ssl_context_load_cadata(self, args[1].u_obj);
-    }
+    mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
+    ssl_context_load_cadata(self, cadata);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_load_verify_locations_obj, 1, ssl_context_load_verify_locations);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_load_verify_locations_obj, ssl_context_load_verify_locations);
 
 STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
@@ -788,61 +737,8 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // ssl module.
 
-STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum {
-        ARG_key,
-        ARG_cert,
-        ARG_server_side,
-        ARG_server_hostname,
-        ARG_cert_reqs,
-        ARG_cadata,
-        ARG_do_handshake,
-    };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { 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} },
-    };
-
-    // Parse arguments.
-    mp_obj_t sock = 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);
-
-    // Create SSLContext.
-    mp_int_t protocol = args[ARG_server_side].u_bool ? MBEDTLS_SSL_IS_SERVER : MBEDTLS_SSL_IS_CLIENT;
-    mp_obj_t ssl_context_args[1] = { MP_OBJ_NEW_SMALL_INT(protocol) };
-    mp_obj_ssl_context_t *ssl_context = MP_OBJ_TO_PTR(ssl_context_make_new(&ssl_context_type, 1, 0, ssl_context_args));
-
-    // Load key and cert if given.
-    if (args[ARG_key].u_obj != mp_const_none) {
-        ssl_context_load_key(ssl_context, args[ARG_key].u_obj, args[ARG_cert].u_obj);
-    }
-
-    // Set the verify_mode.
-    mp_obj_t dest[2] = { MP_OBJ_SENTINEL, MP_OBJ_NEW_SMALL_INT(args[ARG_cert_reqs].u_int) };
-    ssl_context_attr(MP_OBJ_FROM_PTR(ssl_context), MP_QSTR_verify_mode, dest);
-
-    // Load cadata if given.
-    if (args[ARG_cadata].u_obj != mp_const_none) {
-        ssl_context_load_cadata(ssl_context, args[ARG_cadata].u_obj);
-    }
-
-    // Create and return the new SSLSocket object.
-    return ssl_socket_make_new(ssl_context, sock, args[ARG_server_side].u_bool,
-        args[ARG_do_handshake].u_bool, args[ARG_server_hostname].u_obj);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socket);
-
-STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ssl) },
-
-    // Functions.
-    { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
+STATIC const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_tls) },
 
     // Classes.
     { MP_ROM_QSTR(MP_QSTR_SSLContext), MP_ROM_PTR(&ssl_context_type) },
@@ -855,13 +751,13 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { 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);
+STATIC MP_DEFINE_CONST_DICT(mp_module_tls_globals, mp_module_tls_globals_table);
 
-const mp_obj_module_t mp_module_ssl = {
+const mp_obj_module_t mp_module_tls = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_tls_globals,
 };
 
-MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_ssl, mp_module_ssl);
+MP_REGISTER_MODULE(MP_QSTR_tls, mp_module_tls);
 
 #endif // MICROPY_PY_SSL && MICROPY_SSL_MBEDTLS
diff --git a/ports/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py
index 7c3d9a6b64d69..556d445d752ea 100644
--- a/ports/unix/variants/coverage/manifest.py
+++ b/ports/unix/variants/coverage/manifest.py
@@ -1,3 +1,4 @@
 freeze_as_str("frzstr")
 freeze_as_mpy("frzmpy")
 freeze_mpy("$(MPY_DIR)/tests/frozen")
+require("ssl")
diff --git a/ports/unix/variants/manifest.py b/ports/unix/variants/manifest.py
index f8e8f250ac653..88cc1ad8e50ef 100644
--- a/ports/unix/variants/manifest.py
+++ b/ports/unix/variants/manifest.py
@@ -1 +1,2 @@
 require("mip-cmdline")
+require("ssl")
diff --git a/ports/windows/variants/manifest.py b/ports/windows/variants/manifest.py
index e69de29bb2d1d..dab999e40ebda 100644
--- a/ports/windows/variants/manifest.py
+++ b/ports/windows/variants/manifest.py
@@ -0,0 +1 @@
+require("ssl")
diff --git a/ports/windows/variants/standard/mpconfigvariant.props b/ports/windows/variants/standard/mpconfigvariant.props
index 9296da44bc263..ea8bf0bc827bb 100644
--- a/ports/windows/variants/standard/mpconfigvariant.props
+++ b/ports/windows/variants/standard/mpconfigvariant.props
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <FrozenManifest>$(PyWinDir)\variants\manifest.py</FrozenManifest>
+  </PropertyGroup>
 </Project>
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py b/tests/extmod/tls_sslcontext_ciphers.py
similarity index 79%
rename from tests/extmod/ssl_sslcontext_ciphers.py
rename to tests/extmod/tls_sslcontext_ciphers.py
index 20c00b917623c..43f94fb19a559 100644
--- a/tests/extmod/ssl_sslcontext_ciphers.py
+++ b/tests/extmod/tls_sslcontext_ciphers.py
@@ -1,13 +1,13 @@
-# Basic test of ssl.SSLContext get_ciphers() and set_ciphers() methods.
+# Basic test of tls.SSLContext get_ciphers() and set_ciphers() methods.
 
 try:
-    import ssl
+    import tls
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 
-ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
 
 ciphers = ctx.get_ciphers()
 
diff --git a/tests/extmod/ssl_sslcontext_ciphers.py.exp b/tests/extmod/tls_sslcontext_ciphers.py.exp
similarity index 100%
rename from tests/extmod/ssl_sslcontext_ciphers.py.exp
rename to tests/extmod/tls_sslcontext_ciphers.py.exp
diff --git a/tests/extmod/ssl_sslcontext_micropython.py b/tests/extmod/tls_sslcontext_micropython.py
similarity index 82%
rename from tests/extmod/ssl_sslcontext_micropython.py
rename to tests/extmod/tls_sslcontext_micropython.py
index 136fb8a054ed7..e188f89b8d337 100644
--- a/tests/extmod/ssl_sslcontext_micropython.py
+++ b/tests/extmod/tls_sslcontext_micropython.py
@@ -1,20 +1,20 @@
-# Test MicroPython-specific behaviour of ssl.SSLContext.
+# Test MicroPython-specific behaviour of tls.SSLContext.
 
 try:
-    import ssl
+    import tls
 except ImportError:
     print("SKIP")
     raise SystemExit
 
 # Test constructing without any arguments (in CPython it's a DeprecationWarning).
 try:
-    ssl.SSLContext()
+    tls.SSLContext()
 except TypeError:
     print("TypeError")
 
 # Test attributes that don't exist (in CPython new attributes can be added).
 # This test is needed for coverage because SSLContext implements a custom attr handler.
-ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
 try:
     ctx.does_not_exist
 except AttributeError:
diff --git a/tests/extmod/ssl_sslcontext_micropython.py.exp b/tests/extmod/tls_sslcontext_micropython.py.exp
similarity index 100%
rename from tests/extmod/ssl_sslcontext_micropython.py.exp
rename to tests/extmod/tls_sslcontext_micropython.py.exp
diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py
index d65d860fb2745..c168b444a992b 100644
--- a/tests/multi_net/sslcontext_server_client_ciphers.py
+++ b/tests/multi_net/sslcontext_server_client_ciphers.py
@@ -3,7 +3,7 @@
 try:
     import os
     import socket
-    import ssl
+    import tls
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -13,6 +13,10 @@
 # These are test certificates. See tests/README.md for details.
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
+with open(cafile, "rb") as f:
+    cadata = f.read()
+with open(key, "rb") as f:
+    keydata = f.read()
 
 try:
     os.stat(cafile)
@@ -31,8 +35,8 @@ def instance0():
     s.listen(1)
     multitest.next()
     s2, _ = s.accept()
-    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-    server_ctx.load_cert_chain(cert, key)
+    server_ctx = tls.SSLContext(tls.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cadata, keydata)
     s2 = server_ctx.wrap_socket(s2, server_side=True)
     assert isinstance(s2.cipher(), tuple)
     print(s2.read(16))
@@ -46,12 +50,12 @@ def instance1():
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
-    client_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    client_ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
     ciphers = client_ctx.get_ciphers()
     assert "TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256" in ciphers
     client_ctx.set_ciphers(["TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256"])
-    client_ctx.verify_mode = ssl.CERT_REQUIRED
-    client_ctx.load_verify_locations(cafile=cafile)
+    client_ctx.verify_mode = tls.CERT_REQUIRED
+    client_ctx.load_verify_locations(cadata)
     s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
     s.write(b"client to server")
     print(s.read(16))
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index b7e4c0d76008e..75c7c32df1284 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -57,8 +57,8 @@ deflate         errno           example_package
 ffi             framebuf        gc              hashlib
 heapq           io              json            machine
 math            os              platform        random
-re              select          socket          ssl
-struct          sys             termios         time
+re              select          socket          struct
+sys             termios         time            tls
 uctypes         websocket
 me
 

From aaba1d8a6c8ee6edae0025df56055e309dd05234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 1 Feb 2024 09:22:56 +0000
Subject: [PATCH 0798/3129] extmod/modtls_mbedtls: Implement cert verification
 callback for mbedtls.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a useful alternative to .getpeercert() when the certificate is not
stored to reduce RAM usage.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/modtls_mbedtls.c                       | 18 +++++
 tests/multi_net/sslcontext_verify_callback.py | 68 +++++++++++++++++++
 .../sslcontext_verify_callback.py.exp         |  5 ++
 tests/net_hosted/ssl_verify_callback.py       | 37 ++++++++++
 tests/net_hosted/ssl_verify_callback.py.exp   |  5 ++
 5 files changed, 133 insertions(+)
 create mode 100644 tests/multi_net/sslcontext_verify_callback.py
 create mode 100644 tests/multi_net/sslcontext_verify_callback.py.exp
 create mode 100644 tests/net_hosted/ssl_verify_callback.py
 create mode 100644 tests/net_hosted/ssl_verify_callback.py.exp

diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index a0f2cd1699486..6cb4f002051b4 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -67,6 +67,7 @@ typedef struct _mp_obj_ssl_context_t {
     mbedtls_pk_context pkey;
     int authmode;
     int *ciphersuites;
+    mp_obj_t handler;
 } mp_obj_ssl_context_t;
 
 // This corresponds to an SSLSocket object.
@@ -188,6 +189,16 @@ STATIC void ssl_check_async_handshake_failure(mp_obj_ssl_socket_t *sslsock, int
     }
 }
 
+STATIC int ssl_sock_cert_verify(void *ptr, mbedtls_x509_crt *crt, int depth, uint32_t *flags) {
+    mp_obj_ssl_context_t *o = ptr;
+    if (o->handler == mp_const_none) {
+        return 0;
+    }
+    mp_obj_array_t cert;
+    mp_obj_memoryview_init(&cert, 'B', 0, crt->raw.len, crt->raw.p);
+    return mp_obj_get_int(mp_call_function_2(o->handler, MP_OBJ_FROM_PTR(&cert), MP_OBJ_NEW_SMALL_INT(depth)));
+}
+
 /******************************************************************************/
 // SSLContext type.
 
@@ -213,6 +224,7 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     mbedtls_x509_crt_init(&self->cert);
     mbedtls_pk_init(&self->pkey);
     self->ciphersuites = NULL;
+    self->handler = mp_const_none;
 
     #ifdef MBEDTLS_DEBUG_C
     // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
@@ -243,6 +255,7 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
         self->authmode = MBEDTLS_SSL_VERIFY_NONE;
     }
     mbedtls_ssl_conf_authmode(&self->conf, self->authmode);
+    mbedtls_ssl_conf_verify(&self->conf, &ssl_sock_cert_verify, self);
     mbedtls_ssl_conf_rng(&self->conf, mbedtls_ctr_drbg_random, &self->ctr_drbg);
     #ifdef MBEDTLS_DEBUG_C
     mbedtls_ssl_conf_dbg(&self->conf, mbedtls_debug, NULL);
@@ -257,6 +270,8 @@ STATIC void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // Load attribute.
         if (attr == MP_QSTR_verify_mode) {
             dest[0] = MP_OBJ_NEW_SMALL_INT(self->authmode);
+        } else if (attr == MP_QSTR_verify_callback) {
+            dest[0] = self->handler;
         } else {
             // Continue lookup in locals_dict.
             dest[1] = MP_OBJ_SENTINEL;
@@ -267,6 +282,9 @@ STATIC void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             self->authmode = mp_obj_get_int(dest[1]);
             dest[0] = MP_OBJ_NULL;
             mbedtls_ssl_conf_authmode(&self->conf, self->authmode);
+        } else if (attr == MP_QSTR_verify_callback) {
+            dest[0] = MP_OBJ_NULL;
+            self->handler = dest[1];
         }
     }
 }
diff --git a/tests/multi_net/sslcontext_verify_callback.py b/tests/multi_net/sslcontext_verify_callback.py
new file mode 100644
index 0000000000000..74b97382453bd
--- /dev/null
+++ b/tests/multi_net/sslcontext_verify_callback.py
@@ -0,0 +1,68 @@
+# Test creating an SSL connection and getting the peer certificate.
+
+try:
+    import io
+    import os
+    import socket
+    import tls
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+cert = cafile = "ec_cert.der"
+key = "ec_key.der"
+
+try:
+    with open(cafile, "rb") as f:
+        cadata = f.read()
+    with open(key, "rb") as f:
+        key = f.read()
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+def verify_callback(cert, depth):
+    print(cert.hex())
+    return 0
+
+
+# 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()
+    server_ctx = tls.SSLContext(tls.PROTOCOL_TLS_SERVER)
+    server_ctx.load_cert_chain(cadata, key)
+    s2 = server_ctx.wrap_socket(s2, server_side=True)
+    print(s2.read(16))
+    s2.write(b"server to client")
+    s2.close()
+    s.close()
+
+
+# Client
+def instance1():
+    s_test = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+    if not hasattr(s_test, "verify_callback"):
+        print("SKIP")
+        raise SystemExit
+
+    multitest.next()
+    s = socket.socket()
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    client_ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+    client_ctx.verify_mode = tls.CERT_REQUIRED
+    client_ctx.verify_callback = verify_callback
+    client_ctx.load_verify_locations(cadata)
+    s = client_ctx.wrap_socket(s, server_hostname="micropython.local")
+    s.write(b"client to server")
+    print(s.read(16))
+    s.close()
diff --git a/tests/multi_net/sslcontext_verify_callback.py.exp b/tests/multi_net/sslcontext_verify_callback.py.exp
new file mode 100644
index 0000000000000..e7a0ab0b4622c
--- /dev/null
+++ b/tests/multi_net/sslcontext_verify_callback.py.exp
@@ -0,0 +1,5 @@
+--- instance0 ---
+b'client to server'
+--- instance1 ---
+308201d330820179a00302010202144315a7cd8f69febe2640314e7c97d60a2523ad15300a06082a8648ce3d040302303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b3009060355040613024155301e170d3234303131343034353335335a170d3235303131333034353335335a303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b30090603550406130241553059301306072a8648ce3d020106082a8648ce3d0301070342000449b7f5fa687cb25a9464c397508149992f445c860bcf7002958eb4337636c6af840cd4c8cf3b96f2384860d8ae3ee3fa135dba051e8605e62bd871689c6af43ca3533051301d0603551d0e0416041441b3ae171d91e330411d8543ba45e0f2d5b2951b301f0603551d2304183016801441b3ae171d91e330411d8543ba45e0f2d5b2951b300f0603551d130101ff040530030101ff300a06082a8648ce3d04030203480030450220587f61c34739d6fab5802a674dcc54443ae9c87da374078c4ee1cd83f4ad1694022100cfc45dcf264888c6ba2c36e78bd27bb67856d7879a052dd7aa7ecf7215f7b992
+b'server to client'
diff --git a/tests/net_hosted/ssl_verify_callback.py b/tests/net_hosted/ssl_verify_callback.py
new file mode 100644
index 0000000000000..0dba4e4fddcf6
--- /dev/null
+++ b/tests/net_hosted/ssl_verify_callback.py
@@ -0,0 +1,37 @@
+# test ssl verify_callback
+
+import io
+import socket
+import tls
+
+
+def verify_callback(cert, depth):
+    print("verify_callback:", type(cert), len(cert) > 100, depth)
+    return 0
+
+
+def verify_callback_fail(cert, depth):
+    print("verify_callback_fail:", type(cert), len(cert) > 100, depth)
+    return 1
+
+
+def test(peer_addr):
+    context = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+    context.verify_mode = tls.CERT_OPTIONAL
+    context.verify_callback = verify_callback
+    s = socket.socket()
+    s.connect(peer_addr)
+    s = context.wrap_socket(s)
+    s.close()
+
+    context.verify_callback = verify_callback_fail
+    s = socket.socket()
+    s.connect(peer_addr)
+    try:
+        s = context.wrap_socket(s)
+    except OSError as e:
+        print(e.args[1])
+
+
+if __name__ == "__main__":
+    test(socket.getaddrinfo("micropython.org", 443)[0][-1])
diff --git a/tests/net_hosted/ssl_verify_callback.py.exp b/tests/net_hosted/ssl_verify_callback.py.exp
new file mode 100644
index 0000000000000..e27dcbb9d5f70
--- /dev/null
+++ b/tests/net_hosted/ssl_verify_callback.py.exp
@@ -0,0 +1,5 @@
+verify_callback: <class 'bytes'> True 2
+verify_callback: <class 'bytes'> True 1
+verify_callback: <class 'bytes'> True 0
+verify_callback_fail: <class 'bytes'> True 2
+MBEDTLS_ERR_ERROR_GENERIC_ERROR

From e7020463f1114317988ffef21663df5cc8c62ba9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 13 Oct 2023 14:53:02 +1100
Subject: [PATCH 0799/3129] extmod/modvfs: Add new "vfs" module with
 mount/umount and Vfs classes.

They have been moved from the "os" module.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake                    |  1 +
 extmod/extmod.mk                       |  1 +
 extmod/modos.c                         |  4 ++
 extmod/modvfs.c                        | 67 ++++++++++++++++++++++++++
 ports/cc3200/mpconfigport.h            |  1 +
 py/mpconfig.h                          |  5 ++
 tests/ports/unix/extra_coverage.py.exp |  2 +-
 7 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 extmod/modvfs.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index d73ff258ffd9f..53c774013236a 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -42,6 +42,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modtls_axtls.c
     ${MICROPY_EXTMOD_DIR}/modtls_mbedtls.c
     ${MICROPY_EXTMOD_DIR}/modtime.c
+    ${MICROPY_EXTMOD_DIR}/modvfs.c
     ${MICROPY_EXTMOD_DIR}/modwebsocket.c
     ${MICROPY_EXTMOD_DIR}/modwebrepl.c
     ${MICROPY_EXTMOD_DIR}/network_cyw43.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index b3246bc0d9546..f0428bcd05650 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -40,6 +40,7 @@ SRC_EXTMOD_C += \
 	extmod/modtls_mbedtls.c \
 	extmod/modtime.c \
 	extmod/moductypes.c \
+	extmod/modvfs.c \
 	extmod/modwebrepl.c \
 	extmod/modwebsocket.c \
 	extmod/network_cyw43.c \
diff --git a/extmod/modos.c b/extmod/modos.c
index 5a088b5202989..24a36cb8ce961 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -195,6 +195,10 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 
     #if MICROPY_VFS
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
+    #endif
+
+    // The following MicroPython extensions are deprecated.  Use the `vfs` module instead.
+    #if !MICROPY_PREVIEW_VERSION_2 && 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
diff --git a/extmod/modvfs.c b/extmod/modvfs.c
new file mode 100644
index 0000000000000..02dc67d0730a4
--- /dev/null
+++ b/extmod/modvfs.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "py/runtime.h"
+
+#if MICROPY_PY_VFS
+
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "extmod/vfs_lfs.h"
+#include "extmod/vfs_posix.h"
+
+#if !MICROPY_VFS
+#error "MICROPY_PY_VFS requires MICROPY_VFS"
+#endif
+
+STATIC const mp_rom_map_elem_t vfs_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_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
+    #if MICROPY_VFS_POSIX
+    { MP_ROM_QSTR(MP_QSTR_VfsPosix), MP_ROM_PTR(&mp_type_vfs_posix) },
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(vfs_module_globals, vfs_module_globals_table);
+
+const mp_obj_module_t mp_module_vfs = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&vfs_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_vfs, mp_module_vfs);
+
+#endif // MICROPY_PY_VFS
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index d472d29f70242..9cbc1afc0b092 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -124,6 +124,7 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS                (1)
 #define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
+#define MICROPY_PY_VFS                              (1)
 #define MICROPY_PY_MACHINE                          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE              "ports/cc3200/mods/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS         (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 9a1f04568e0fa..837115ab59f99 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1744,6 +1744,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_SSL_FINALISER (MICROPY_ENABLE_FINALISER)
 #endif
 
+// Whether to provide the "vfs" module
+#ifndef MICROPY_PY_VFS
+#define MICROPY_PY_VFS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES && MICROPY_VFS)
+#endif
+
 #ifndef MICROPY_PY_WEBSOCKET
 #define MICROPY_PY_WEBSOCKET (0)
 #endif
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 75c7c32df1284..3db1c5a63e54e 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -59,7 +59,7 @@ heapq           io              json            machine
 math            os              platform        random
 re              select          socket          struct
 sys             termios         time            tls
-uctypes         websocket
+uctypes         vfs             websocket
 me
 
 micropython     machine         math

From 45f99cb4459248116396773a72cc122edbe14a00 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 20 Nov 2023 19:12:02 +1100
Subject: [PATCH 0800/3129] docs/library: Move vfs functions and classes from
 os to vfs module docs.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/esp32.rst             |   2 +-
 docs/library/index.rst             |   1 +
 docs/library/machine.SDCard.rst    |   2 +-
 docs/library/os.rst                | 184 ++-----------------------
 docs/library/pyb.Flash.rst         |   2 +-
 docs/library/pyb.rst               |   2 +-
 docs/library/rp2.Flash.rst         |   2 +-
 docs/library/vfs.rst               | 208 +++++++++++++++++++++++++++++
 docs/library/zephyr.DiskAccess.rst |   2 +-
 docs/library/zephyr.FlashArea.rst  |   2 +-
 docs/reference/filesystem.rst      |  12 +-
 docs/zephyr/tutorial/storage.rst   |   6 +-
 12 files changed, 236 insertions(+), 189 deletions(-)
 create mode 100644 docs/library/vfs.rst

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 422329bf1e801..dc35e7905e162 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -114,7 +114,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:`os.AbstractBlockDev`.
+    :class:`vfs.AbstractBlockDev`.
 
 .. method:: Partition.set_boot()
 
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 4a7f78ecf3184..eb29b7680542e 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -104,6 +104,7 @@ the following libraries.
    neopixel.rst
    network.rst
    uctypes.rst
+   vfs.rst
 
 The following libraries provide drivers for hardware components.
 
diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index cde0bd1d145d9..4faa7a5557723 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -27,7 +27,7 @@ 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:`os.AbstractBlockDev`.
+    The class implements the block protocol defined by :class:`vfs.AbstractBlockDev`.
     This allows the mounting of an SD card to be as simple as::
 
       os.mount(machine.SDCard(), "/sd")
diff --git a/docs/library/os.rst b/docs/library/os.rst
index 27a7d2d44a05b..710875e34c39b 100644
--- a/docs/library/os.rst
+++ b/docs/library/os.rst
@@ -136,192 +136,30 @@ Terminal redirection and duplication
 Filesystem mounting
 -------------------
 
-Some ports provide a Virtual Filesystem (VFS) and the ability to mount multiple
-"real" filesystems within this VFS.  Filesystem objects can be mounted at either
-the root of the VFS, or at a subdirectory that lives in the root.  This allows
-dynamic and flexible configuration of the filesystem that is seen by Python
-programs.  Ports that have this functionality provide the :func:`mount` and
-:func:`umount` functions, and possibly various filesystem implementations
-represented by VFS classes.
+The following functions and classes have been moved to the :mod:`vfs` module.
+They are provided in this module only for backwards compatibility and will be
+removed in version 2 of MicroPython.
 
 .. 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()``
-    method, or a block device.  If it's a block device then the filesystem type
-    is automatically detected (an exception is raised if no filesystem was
-    recognised).  *mount_point* may be ``'/'`` to mount *fsobj* at the root,
-    or ``'/<name>'`` to mount it at a subdirectory under the root.
-
-    If *readonly* is ``True`` then the filesystem is mounted read-only.
-
-    During the mount process the method ``mount()`` is called on the filesystem
-    object.
-
-    Will raise ``OSError(EPERM)`` if *mount_point* is already mounted.
+    See `vfs.mount`.
 
 .. function:: umount(mount_point)
 
-    Unmount a filesystem. *mount_point* can be a string naming the mount location,
-    or a previously-mounted filesystem object.  During the unmount process the
-    method ``umount()`` is called on the filesystem object.
-
-    Will raise ``OSError(EINVAL)`` if *mount_point* is not found.
+    See `vfs.umount`.
 
 .. class:: VfsFat(block_dev)
 
-    Create a filesystem object that uses the FAT filesystem format.  Storage of
-    the FAT filesystem is provided by *block_dev*.
-    Objects created by this constructor can be mounted using :func:`mount`.
-
-    .. staticmethod:: mkfs(block_dev)
-
-        Build a FAT filesystem on *block_dev*.
+    See `vfs.VfsFat`.
 
 .. 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
-    support the :ref:`extended interface <block-device-interface>`.
-    Objects created by this constructor can be mounted using :func:`mount`.
-
-    See :ref:`filesystem` for more information.
-
-    .. 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`_.
+    See `vfs.VfsLfs1`.
 
 .. 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`.
+    See `vfs.VfsLfs2`.
+
+.. class:: VfsPosix(root=None)
 
-    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 `os.stat` on files without timestamps will return 0 for the timestamp.
-
-    See :ref:`filesystem` for more information.
-
-    .. staticmethod:: mkfs(block_dev, readsize=32, progsize=32, lookahead=32)
-
-        Build a Lfs2 filesystem on *block_dev*.
-
-    .. note:: There are reports of littlefs v2 failing in certain situations,
-              for details see `littlefs issue 295`_.
-
-.. _littlefs v1 filesystem format: https://github.com/ARMmbed/littlefs/tree/v1
-.. _littlefs v2 filesystem format: 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
-
-Block devices
--------------
-
-A block device is an object which implements the block protocol. This enables a
-device to support MicroPython filesystems. The physical hardware is represented
-by a user defined class. The :class:`AbstractBlockDev` class is a template for
-the design of such a class: MicroPython does not actually provide that class,
-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 ``os``
-methods.
-
-See :ref:`filesystem` for example implementations of block devices using the
-two variants of the block protocol described below.
-
-.. _block-device-interface:
-
-Simple and extended interface
-.............................
-
-There are two compatible signatures for the ``readblocks`` and ``writeblocks``
-methods (see below), in order to support a variety of use cases.  A given block
-device may implement one form or the other, or both at the same time. The second
-form (with the offset parameter) is referred to as the "extended interface".
-
-Some filesystems (such as littlefs) that require more control over write
-operations, for example writing to sub-block regions without erasing, may require
-that the block device supports the extended interface.
-
-.. class:: AbstractBlockDev(...)
-
-    Construct a block device object.  The parameters to the constructor are
-    dependent on the specific block device.
-
-    .. method:: readblocks(block_num, buf)
-                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
-        the device into *buf* (an array of bytes).
-        The number of blocks to read is given by the length of *buf*,
-        which will be a multiple of the block size.
-
-        The second form allows reading at arbitrary locations within a block,
-        and arbitrary lengths.
-        Starting at block index *block_num*, and byte offset within that block
-        of *offset*, read bytes from the device into *buf* (an array of bytes).
-        The number of bytes to read is given by the length of *buf*.
-
-    .. method:: writeblocks(block_num, buf)
-                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.
-        Starting at the block given by the index *block_num*, write blocks from
-        *buf* (an array of bytes) to the device.
-        The number of blocks to write is given by the length of *buf*,
-        which will be a multiple of the block size.
-
-        The second form allows writing at arbitrary locations within a block,
-        and arbitrary lengths.  Only the bytes being written should be changed,
-        and the caller of this method must ensure that the relevant blocks are
-        erased via a prior ``ioctl`` call.
-        Starting at block index *block_num*, and byte offset within that block
-        of *offset*, write bytes from *buf* (an array of bytes) to the device.
-        The number of bytes to write is given by the length of *buf*.
-
-        Note that implementations must never implicitly erase blocks if the offset
-        argument is specified, even if it is zero.
-
-    .. method:: ioctl(op, arg)
-
-        Control the block device and query its parameters.  The operation to
-        perform is given by *op* which is one of the following integers:
-
-          - 1 -- initialise the device (*arg* is unused)
-          - 2 -- shutdown the device (*arg* is unused)
-          - 3 -- sync the device (*arg* is unused)
-          - 4 -- get a count of the number of blocks, should return an integer
-            (*arg* is unused)
-          - 5 -- get the number of bytes in a block, should return an integer,
-            or ``None`` in which case the default value of 512 is used
-            (*arg* is unused)
-          - 6 -- erase a block, *arg* is the block number to erase
-
-       As a minimum ``ioctl(4, ...)`` must be intercepted; for littlefs
-       ``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
-       detailed above. Other operations should return 0 on success and non-zero
-       for failure, with the value returned being an ``OSError`` errno code.
+    See `vfs.VfsPosix`.
diff --git a/docs/library/pyb.Flash.rst b/docs/library/pyb.Flash.rst
index 984e13f4583a4..562bcf1e2466e 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:`os.AbstractBlockDev`.
+    :class:`vfs.AbstractBlockDev`.
 
 Hardware Note
 -------------
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index c8ef2c531542f..869e2f8f3bd9b 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -217,7 +217,7 @@ Miscellaneous functions
 
    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:`os.AbstractBlockDev` for the
+   following is also deprecated. See :class:`vfs.AbstractBlockDev` for the
    correct way to create a block device.)
 
     - ``readblocks(self, blocknum, buf)``
diff --git a/docs/library/rp2.Flash.rst b/docs/library/rp2.Flash.rst
index 1e94cf519c844..70cb127a192da 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:`os.AbstractBlockDev`.
+    :class:`vfs.AbstractBlockDev`.
 
diff --git a/docs/library/vfs.rst b/docs/library/vfs.rst
new file mode 100644
index 0000000000000..fcd06eb4353b1
--- /dev/null
+++ b/docs/library/vfs.rst
@@ -0,0 +1,208 @@
+:mod:`vfs` -- virtual filesystem control
+========================================
+
+.. module:: vfs
+   :synopsis: virtual filesystem control
+
+The ``vfs`` module contains functions for creating filesystem objects and
+mounting/unmounting them in the Virtual Filesystem.
+
+Filesystem mounting
+-------------------
+
+Some ports provide a Virtual Filesystem (VFS) and the ability to mount multiple
+"real" filesystems within this VFS.  Filesystem objects can be mounted at either
+the root of the VFS, or at a subdirectory that lives in the root.  This allows
+dynamic and flexible configuration of the filesystem that is seen by Python
+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)
+
+    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()``
+    method, or a block device.  If it's a block device then the filesystem type
+    is automatically detected (an exception is raised if no filesystem was
+    recognised).  *mount_point* may be ``'/'`` to mount *fsobj* at the root,
+    or ``'/<name>'`` to mount it at a subdirectory under the root.
+
+    If *readonly* is ``True`` then the filesystem is mounted read-only.
+
+    During the mount process the method ``mount()`` is called on the filesystem
+    object.
+
+    Will raise ``OSError(EPERM)`` if *mount_point* is already mounted.
+
+.. function:: umount(mount_point)
+
+    Unmount a filesystem. *mount_point* can be a string naming the mount location,
+    or a previously-mounted filesystem object.  During the unmount process the
+    method ``umount()`` is called on the filesystem object.
+
+    Will raise ``OSError(EINVAL)`` if *mount_point* is not found.
+
+.. class:: VfsFat(block_dev)
+
+    Create a filesystem object that uses the FAT filesystem format.  Storage of
+    the FAT filesystem is provided by *block_dev*.
+    Objects created by this constructor can be mounted using :func:`mount`.
+
+    .. staticmethod:: mkfs(block_dev)
+
+        Build a FAT filesystem on *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
+    support the :ref:`extended interface <block-device-interface>`.
+    Objects created by this constructor can be mounted using :func:`mount`.
+
+    See :ref:`filesystem` for more information.
+
+    .. 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, 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 `os.stat` on files without timestamps will return 0 for the timestamp.
+
+    See :ref:`filesystem` for more information.
+
+    .. staticmethod:: mkfs(block_dev, readsize=32, progsize=32, lookahead=32)
+
+        Build a Lfs2 filesystem on *block_dev*.
+
+    .. note:: There are reports of littlefs v2 failing in certain situations,
+              for details see `littlefs issue 295`_.
+
+.. class:: VfsPosix(root=None)
+
+    Create a filesystem object that accesses the host POSIX filesystem.
+    If *root* is specified then it should be a path in the host filesystem to use
+    as the root of the ``VfsPosix`` object.  Otherwise the current directory of
+    the host filesystem is used.
+
+.. _littlefs v1 filesystem format: https://github.com/ARMmbed/littlefs/tree/v1
+.. _littlefs v2 filesystem format: 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
+
+Block devices
+-------------
+
+A block device is an object which implements the block protocol. This enables a
+device to support MicroPython filesystems. The physical hardware is represented
+by a user defined class. The :class:`AbstractBlockDev` class is a template for
+the design of such a class: MicroPython does not actually provide that class,
+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 ``os``
+methods.
+
+See :ref:`filesystem` for example implementations of block devices using the
+two variants of the block protocol described below.
+
+.. _block-device-interface:
+
+Simple and extended interface
+.............................
+
+There are two compatible signatures for the ``readblocks`` and ``writeblocks``
+methods (see below), in order to support a variety of use cases.  A given block
+device may implement one form or the other, or both at the same time. The second
+form (with the offset parameter) is referred to as the "extended interface".
+
+Some filesystems (such as littlefs) that require more control over write
+operations, for example writing to sub-block regions without erasing, may require
+that the block device supports the extended interface.
+
+.. class:: AbstractBlockDev(...)
+
+    Construct a block device object.  The parameters to the constructor are
+    dependent on the specific block device.
+
+    .. method:: readblocks(block_num, buf)
+                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
+        the device into *buf* (an array of bytes).
+        The number of blocks to read is given by the length of *buf*,
+        which will be a multiple of the block size.
+
+        The second form allows reading at arbitrary locations within a block,
+        and arbitrary lengths.
+        Starting at block index *block_num*, and byte offset within that block
+        of *offset*, read bytes from the device into *buf* (an array of bytes).
+        The number of bytes to read is given by the length of *buf*.
+
+    .. method:: writeblocks(block_num, buf)
+                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.
+        Starting at the block given by the index *block_num*, write blocks from
+        *buf* (an array of bytes) to the device.
+        The number of blocks to write is given by the length of *buf*,
+        which will be a multiple of the block size.
+
+        The second form allows writing at arbitrary locations within a block,
+        and arbitrary lengths.  Only the bytes being written should be changed,
+        and the caller of this method must ensure that the relevant blocks are
+        erased via a prior ``ioctl`` call.
+        Starting at block index *block_num*, and byte offset within that block
+        of *offset*, write bytes from *buf* (an array of bytes) to the device.
+        The number of bytes to write is given by the length of *buf*.
+
+        Note that implementations must never implicitly erase blocks if the offset
+        argument is specified, even if it is zero.
+
+    .. method:: ioctl(op, arg)
+
+        Control the block device and query its parameters.  The operation to
+        perform is given by *op* which is one of the following integers:
+
+          - 1 -- initialise the device (*arg* is unused)
+          - 2 -- shutdown the device (*arg* is unused)
+          - 3 -- sync the device (*arg* is unused)
+          - 4 -- get a count of the number of blocks, should return an integer
+            (*arg* is unused)
+          - 5 -- get the number of bytes in a block, should return an integer,
+            or ``None`` in which case the default value of 512 is used
+            (*arg* is unused)
+          - 6 -- erase a block, *arg* is the block number to erase
+
+       As a minimum ``ioctl(4, ...)`` must be intercepted; for littlefs
+       ``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
+       detailed above. Other operations should return 0 on success and non-zero
+       for failure, with the value returned being an ``OSError`` errno code.
diff --git a/docs/library/zephyr.DiskAccess.rst b/docs/library/zephyr.DiskAccess.rst
index 3e5fa9a3575a0..e5eac8ca4988b 100644
--- a/docs/library/zephyr.DiskAccess.rst
+++ b/docs/library/zephyr.DiskAccess.rst
@@ -34,5 +34,5 @@ Methods
 
     These methods implement the simple and extended
     :ref:`block protocol <block-device-interface>` defined by
-    :class:`os.AbstractBlockDev`.
+    :class:`vfs.AbstractBlockDev`.
 
diff --git a/docs/library/zephyr.FlashArea.rst b/docs/library/zephyr.FlashArea.rst
index 9cd4dd59d6852..749b90a3b43c5 100644
--- a/docs/library/zephyr.FlashArea.rst
+++ b/docs/library/zephyr.FlashArea.rst
@@ -37,4 +37,4 @@ Methods
 
     These methods implement the simple and extended
     :ref:`block protocol <block-device-interface>` defined by
-    :class:`os.AbstractBlockDev`.
+    :class:`vfs.AbstractBlockDev`.
diff --git a/docs/reference/filesystem.rst b/docs/reference/filesystem.rst
index ca9e56344ed4c..d8092c58dd7ce 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:`os.AbstractBlockDev` protocol.
+:class:`vfs.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:`os.AbstractBlockDev.readblocks` and
-:meth:`os.AbstractBlockDev.writeblocks` methods) is::
+:meth:`vfs.AbstractBlockDev.readblocks` and
+:meth:`vfs.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
-<os.VfsLfs2>`::
+<vfs.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 <os.VfsFat>`,
-:class:`littlefs v1 <os.VfsLfs1>` and :class:`littlefs v2 <os.VfsLfs2>`.
+MicroPython ports can provide implementations of :class:`FAT <vfs.VfsFat>`,
+:class:`littlefs v1 <vfs.VfsLfs1>` and :class:`littlefs v2 <vfs.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/zephyr/tutorial/storage.rst b/docs/zephyr/tutorial/storage.rst
index 12bd0d0d351b4..e8dcbbd39a4aa 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 `os Filesystem Mounting <https://docs.micropython.org/en/latest/library/os.html?highlight=os#filesystem-mounting>`_.
+See `vfs Filesystem Mounting <https://docs.micropython.org/en/latest/library/vfs.html?highlight=vfs#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 `os.AbstractBlockDev` protocol.
+implements the `vfs.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 `os.AbstractBlockDev` protocol.
+implements the `vfs.AbstractBlockDev` protocol.
 
 Example usage with the internal flash on the reel_board or the rv32m1_vega_ri5cy board::
 

From 5804aa020452c9fe115c53ce9514b442945832bb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Nov 2023 13:47:08 +1100
Subject: [PATCH 0801/3129] docs/reference/micropython2_migration.rst: Add info
 about os and vfs.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/micropython2_migration.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/reference/micropython2_migration.rst b/docs/reference/micropython2_migration.rst
index 954488b8cdf4b..3a114711406fd 100644
--- a/docs/reference/micropython2_migration.rst
+++ b/docs/reference/micropython2_migration.rst
@@ -71,4 +71,11 @@ which is useful for development and testing.
 Changes
 ~~~~~~~
 
-*None yet*
+Introduction of a new module :mod:`vfs`.  The following functions and
+classes have moved out of :mod:`os` to :mod:`vfs`:
+- `os.mount`
+- `os.umount`
+- `os.VfsFat`
+- `os.VfsLfs1`
+- `os.VfsLfs2`
+- `os.VfsPosix`

From b87bbaeb43ddbd603b6ac3266ccc15815198b5a7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 20 Nov 2023 23:04:55 +1100
Subject: [PATCH 0802/3129] tests: Use vfs module instead of os.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_basic.py                  |  32 +++--
 tests/extmod/vfs_blockdev.py               |  12 +-
 tests/extmod/vfs_fat_fileio1.py            |  25 ++--
 tests/extmod/vfs_fat_fileio2.py            |  49 ++++----
 tests/extmod/vfs_fat_finaliser.py          |  14 +--
 tests/extmod/vfs_fat_ilistdir_del.py       |  26 ++--
 tests/extmod/vfs_fat_more.py               |  24 ++--
 tests/extmod/vfs_fat_mtime.py              |  18 +--
 tests/extmod/vfs_fat_oldproto.py           |  27 ++---
 tests/extmod/vfs_fat_ramdisk.py            |  55 ++++-----
 tests/extmod/vfs_fat_ramdisklarge.py       |  22 ++--
 tests/extmod/vfs_lfs.py                    | 134 ++++++++++-----------
 tests/extmod/vfs_lfs_corrupt.py            |  36 +++---
 tests/extmod/vfs_lfs_error.py              |  38 +++---
 tests/extmod/vfs_lfs_file.py               |  40 +++---
 tests/extmod/vfs_lfs_ilistdir_del.py       |  26 ++--
 tests/extmod/vfs_lfs_mount.py              |  28 ++---
 tests/extmod/vfs_lfs_mtime.py              |  46 +++----
 tests/extmod/vfs_lfs_superblock.py         |  12 +-
 tests/extmod/vfs_posix.py                  |  41 +++----
 tests/extmod/vfs_posix_enoent.py           |   7 +-
 tests/extmod/vfs_posix_ilistdir_del.py     |  32 ++---
 tests/extmod/vfs_posix_ilistdir_filter.py  |  14 +--
 tests/extmod/vfs_posix_paths.py            |  52 ++++----
 tests/extmod/vfs_userfs.py                 |   9 +-
 tests/micropython/builtin_execfile.py      |  15 +--
 tests/micropython/import_mpy_invalid.py    |   7 +-
 tests/micropython/import_mpy_native.py     |   7 +-
 tests/micropython/import_mpy_native_gc.py  |   7 +-
 tests/perf_bench/core_import_mpy_multi.py  |   6 +-
 tests/perf_bench/core_import_mpy_single.py |   6 +-
 tests/ports/cc3200/os.py                   |  12 +-
 tests/run-natmodtests.py                   |   4 +-
 tests/run-tests.py                         |   4 +-
 34 files changed, 419 insertions(+), 468 deletions(-)

diff --git a/tests/extmod/vfs_basic.py b/tests/extmod/vfs_basic.py
index 028846406a145..2c0ce8f5295ad 100644
--- a/tests/extmod/vfs_basic.py
+++ b/tests/extmod/vfs_basic.py
@@ -1,10 +1,8 @@
 # test VFS functionality without any particular filesystem type
 
 try:
-    import os
-
-    os.mount
-except (ImportError, AttributeError):
+    import os, vfs
+except ImportError:
     print("SKIP")
     raise SystemExit
 
@@ -59,11 +57,11 @@ def open(self, file, mode):
 
 # first we umount any existing mount points the target may have
 try:
-    os.umount("/")
+    vfs.umount("/")
 except OSError:
     pass
 for path in os.listdir("/"):
-    os.umount("/" + path)
+    vfs.umount("/" + path)
 
 # stat root dir
 print(os.stat("/"))
@@ -83,7 +81,7 @@ def open(self, file, mode):
             print(func, arg, "OSError")
 
 # basic mounting and listdir
-os.mount(Filesystem(1), "/test_mnt")
+vfs.mount(Filesystem(1), "/test_mnt")
 print(os.listdir())
 
 # ilistdir
@@ -103,13 +101,13 @@ def open(self, file, mode):
 print(os.listdir("/test_mnt"))
 
 # mounting another filesystem
-os.mount(Filesystem(2), "/test_mnt2", readonly=True)
+vfs.mount(Filesystem(2), "/test_mnt2", readonly=True)
 print(os.listdir())
 print(os.listdir("/test_mnt2"))
 
 # mounting over an existing mount point
 try:
-    os.mount(Filesystem(3), "/test_mnt2")
+    vfs.mount(Filesystem(3), "/test_mnt2")
 except OSError:
     print("OSError")
 
@@ -139,23 +137,23 @@ def open(self, file, mode):
 open("test_file", "wb")
 
 # umount
-os.umount("/test_mnt")
-os.umount("/test_mnt2")
+vfs.umount("/test_mnt")
+vfs.umount("/test_mnt2")
 
 # umount a non-existent mount point
 try:
-    os.umount("/test_mnt")
+    vfs.umount("/test_mnt")
 except OSError:
     print("OSError")
 
 # root dir
-os.mount(Filesystem(3), "/")
+vfs.mount(Filesystem(3), "/")
 print(os.stat("/"))
 print(os.statvfs("/"))
 print(os.listdir())
 open("test")
 
-os.mount(Filesystem(4), "/mnt")
+vfs.mount(Filesystem(4), "/mnt")
 print(os.listdir())
 print(os.listdir("/mnt"))
 os.chdir("/mnt")
@@ -166,9 +164,9 @@ def open(self, file, mode):
 print(os.listdir())
 os.chdir("/")
 
-os.umount("/")
+vfs.umount("/")
 print(os.listdir("/"))
-os.umount("/mnt")
+vfs.umount("/mnt")
 
 # chdir to a non-existent mount point (current directory should remain unchanged)
 try:
@@ -178,7 +176,7 @@ def open(self, file, mode):
 print(os.getcwd())
 
 # chdir to a non-existent subdirectory in a mounted filesystem
-os.mount(Filesystem(5, 1), "/mnt")
+vfs.mount(Filesystem(5, 1), "/mnt")
 try:
     os.chdir("/mnt/subdir")
 except OSError:
diff --git a/tests/extmod/vfs_blockdev.py b/tests/extmod/vfs_blockdev.py
index f4c84ea9213c2..a1f0749962745 100644
--- a/tests/extmod/vfs_blockdev.py
+++ b/tests/extmod/vfs_blockdev.py
@@ -1,10 +1,10 @@
 # Test for behaviour of combined standard and extended block device
 
 try:
-    import os
+    import vfs
 
-    os.VfsFat
-    os.VfsLfs2
+    vfs.VfsFat
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -65,12 +65,10 @@ def test(bdev, vfs_class):
 
 
 try:
-    import os
-
     bdev = RAMBlockDevice(50)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-test(bdev, os.VfsFat)
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsFat)
+test(bdev, vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index f4db5ac8ddea8..5221d405323fa 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -1,13 +1,8 @@
 try:
-    import errno
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import errno, os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -38,13 +33,13 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    os.VfsFat.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = os.VfsFat(bdev)
-os.mount(vfs, "/ramdisk")
+fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/ramdisk")
 os.chdir("/ramdisk")
 
 # file IO
@@ -99,12 +94,12 @@ def ioctl(self, op, arg):
 #    print(f.read())
 
 # dirs
-vfs.mkdir("foo_dir")
+fs.mkdir("foo_dir")
 
 try:
-    vfs.rmdir("foo_file.txt")
+    fs.rmdir("foo_file.txt")
 except OSError as e:
     print(e.errno == 20)  # errno.ENOTDIR
 
-vfs.remove("foo_file.txt")
-print(list(vfs.ilistdir()))
+fs.remove("foo_file.txt")
+print(list(fs.ilistdir()))
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index 353b997e5c827..bbd6298c496f7 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -1,13 +1,8 @@
 try:
-    import errno
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import errno, os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -38,32 +33,32 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    os.VfsFat.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = os.VfsFat(bdev)
-os.mount(vfs, "/ramdisk")
+fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/ramdisk")
 os.chdir("/ramdisk")
 
 try:
-    vfs.mkdir("foo_dir")
+    fs.mkdir("foo_dir")
 except OSError as e:
     print(e.errno == errno.EEXIST)
 
 try:
-    vfs.remove("foo_dir")
+    fs.remove("foo_dir")
 except OSError as e:
     print(e.errno == errno.EISDIR)
 
 try:
-    vfs.remove("no_file.txt")
+    fs.remove("no_file.txt")
 except OSError as e:
     print(e.errno == errno.ENOENT)
 
 try:
-    vfs.rename("foo_dir", "/null/file")
+    fs.rename("foo_dir", "/null/file")
 except OSError as e:
     print(e.errno == errno.ENOENT)
 
@@ -79,34 +74,34 @@ def ioctl(self, op, arg):
 
 # directory not empty
 try:
-    vfs.rmdir("foo_dir")
+    fs.rmdir("foo_dir")
 except OSError as e:
     print(e.errno == errno.EACCES)
 
 # trim full path
-vfs.rename("foo_dir/file-in-dir.txt", "foo_dir/file.txt")
-print(list(vfs.ilistdir("foo_dir")))
+fs.rename("foo_dir/file-in-dir.txt", "foo_dir/file.txt")
+print(list(fs.ilistdir("foo_dir")))
 
-vfs.rename("foo_dir/file.txt", "moved-to-root.txt")
-print(list(vfs.ilistdir()))
+fs.rename("foo_dir/file.txt", "moved-to-root.txt")
+print(list(fs.ilistdir()))
 
 # check that renaming to existing file will overwrite it
 with open("temp", "w") as f:
     f.write("new text")
-vfs.rename("temp", "moved-to-root.txt")
-print(list(vfs.ilistdir()))
+fs.rename("temp", "moved-to-root.txt")
+print(list(fs.ilistdir()))
 with open("moved-to-root.txt") as f:
     print(f.read())
 
 # valid removes
-vfs.remove("foo_dir/sub_file.txt")
-vfs.rmdir("foo_dir")
-print(list(vfs.ilistdir()))
+fs.remove("foo_dir/sub_file.txt")
+fs.rmdir("foo_dir")
+print(list(fs.ilistdir()))
 
 # disk full
 try:
-    bsize = vfs.statvfs("/ramdisk")[0]
-    free = vfs.statvfs("/ramdisk")[2] + 1
+    bsize = fs.statvfs("/ramdisk")[0]
+    free = fs.statvfs("/ramdisk")[2] + 1
     f = open("large_file.txt", "wb")
     f.write(bytearray(bsize * free))
 except OSError as e:
diff --git a/tests/extmod/vfs_fat_finaliser.py b/tests/extmod/vfs_fat_finaliser.py
index a2cce7846c22b..7be3cda1a353a 100644
--- a/tests/extmod/vfs_fat_finaliser.py
+++ b/tests/extmod/vfs_fat_finaliser.py
@@ -1,9 +1,9 @@
 # Test VfsFat class and its finaliser
 
 try:
-    import errno, os
+    import errno, os, vfs
 
-    os.VfsFat
+    vfs.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -39,8 +39,8 @@ def ioctl(self, op, arg):
     raise SystemExit
 
 # Format block device and create VFS object
-os.VfsFat.mkfs(bdev)
-vfs = os.VfsFat(bdev)
+vfs.VfsFat.mkfs(bdev)
+fs = vfs.VfsFat(bdev)
 
 # Here we test that opening a file with the heap locked fails correctly.  This
 # is a special case because file objects use a finaliser and allocating with a
@@ -52,7 +52,7 @@ def ioctl(self, op, arg):
 try:
     import errno, os
 
-    vfs.open("x", "r")
+    fs.open("x", "r")
 except MemoryError:
     print("MemoryError")
 micropython.heap_unlock()
@@ -77,10 +77,10 @@ def ioctl(self, op, arg):
 # Only read back N-1 files because the last one may not be finalised due to
 # references to it being left on the C stack.
 for n in names:
-    f = vfs.open(n, "w")
+    f = fs.open(n, "w")
     f.write(n)
     f = None  # release f without closing
 gc.collect()  # should finalise at least the first N-1 files by closing them
 for n in names[:-1]:
-    with vfs.open(n, "r") as f:
+    with fs.open(n, "r") as f:
         print(f.read())
diff --git a/tests/extmod/vfs_fat_ilistdir_del.py b/tests/extmod/vfs_fat_ilistdir_del.py
index ed3ca3df670bc..a6e24ec92f3b5 100644
--- a/tests/extmod/vfs_fat_ilistdir_del.py
+++ b/tests/extmod/vfs_fat_ilistdir_del.py
@@ -2,9 +2,9 @@
 import gc
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsFat
+    vfs.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -37,29 +37,29 @@ def ioctl(self, op, arg):
 
 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")
+    fs = vfs_class(bdev)
+    fs.mkdir("/test_d1")
+    fs.mkdir("/test_d2")
+    fs.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("/")
+        idir = fs.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)
+        for dname, *_ in fs.ilistdir("/"):
+            fs.rmdir(dname)
             break
-        vfs.mkdir(dname)
+        fs.mkdir(dname)
 
         # Also create a fully drained iterator and ensure trying to reuse it
         # throws the correct exception.
-        idir_emptied = vfs.ilistdir("/")
+        idir_emptied = fs.ilistdir("/")
         l = list(idir_emptied)
         print(len(l))
         try:
@@ -68,7 +68,7 @@ def test(bdev, vfs_class):
             pass
 
         gc.collect()
-        vfs.open("/test", "w").close()
+        fs.open("/test", "w").close()
 
 
 try:
@@ -77,4 +77,4 @@ def test(bdev, vfs_class):
     print("SKIP")
     raise SystemExit
 
-test(bdev, os.VfsFat)
+test(bdev, vfs.VfsFat)
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index 7074221a326d4..1d755f9c55c0b 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -1,12 +1,8 @@
 try:
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -44,14 +40,14 @@ def ioctl(self, op, arg):
 
 # first we umount any existing mount points the target may have
 try:
-    os.umount("/")
+    vfs.umount("/")
 except OSError:
     pass
 for path in os.listdir("/"):
-    os.umount("/" + path)
+    vfs.umount("/" + path)
 
-os.VfsFat.mkfs(bdev)
-os.mount(bdev, "/")
+vfs.VfsFat.mkfs(bdev)
+vfs.mount(bdev, "/")
 
 print(os.getcwd())
 
@@ -94,8 +90,8 @@ def ioctl(self, op, arg):
 os.chdir("/")
 print(os.stat("test5.txt")[:-3])
 
-os.VfsFat.mkfs(bdev2)
-os.mount(bdev2, "/sys")
+vfs.VfsFat.mkfs(bdev2)
+vfs.mount(bdev2, "/sys")
 print(os.listdir())
 print(os.listdir("sys"))
 print(os.listdir("/sys"))
@@ -104,7 +100,7 @@ def ioctl(self, op, arg):
 os.remove("test5.txt")
 print(os.listdir())
 
-os.umount("/")
+vfs.umount("/")
 print(os.getcwd())
 print(os.listdir())
 print(os.listdir("sys"))
diff --git a/tests/extmod/vfs_fat_mtime.py b/tests/extmod/vfs_fat_mtime.py
index 1ceb611364a18..0c7e10a54869d 100644
--- a/tests/extmod/vfs_fat_mtime.py
+++ b/tests/extmod/vfs_fat_mtime.py
@@ -1,11 +1,11 @@
 # Test for VfsFat using a RAM device, mtime feature
 
 try:
-    import time, os
+    import time, os, vfs
 
     time.time
     time.sleep
-    os.VfsFat
+    vfs.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -41,21 +41,21 @@ def test(bdev, vfs_class):
     vfs_class.mkfs(bdev)
 
     # construction
-    vfs = vfs_class(bdev)
+    fs = vfs_class(bdev)
 
     # Create an empty file, should have a timestamp.
     current_time = int(time.time())
-    vfs.open("test1", "wt").close()
+    fs.open("test1", "wt").close()
 
     # Wait 2 seconds so mtime will increase (FAT has 2 second resolution).
     time.sleep(2)
 
     # Create another empty file, should have a timestamp.
-    vfs.open("test2", "wt").close()
+    fs.open("test2", "wt").close()
 
     # Stat the files and check mtime is non-zero.
-    stat1 = vfs.stat("test1")
-    stat2 = vfs.stat("test2")
+    stat1 = fs.stat("test1")
+    stat2 = fs.stat("test2")
     print(stat1[8] != 0, stat2[8] != 0)
 
     # Check that test1 has mtime which matches time.time() at point of creation.
@@ -67,8 +67,8 @@ def test(bdev, vfs_class):
     print(stat1[8] < stat2[8])
 
     # Unmount.
-    vfs.umount()
+    fs.umount()
 
 
 bdev = RAMBlockDevice(50)
-test(bdev, os.VfsFat)
+test(bdev, vfs.VfsFat)
diff --git a/tests/extmod/vfs_fat_oldproto.py b/tests/extmod/vfs_fat_oldproto.py
index f5336ba916fa9..2b5e4d00828c0 100644
--- a/tests/extmod/vfs_fat_oldproto.py
+++ b/tests/extmod/vfs_fat_oldproto.py
@@ -1,13 +1,8 @@
 try:
-    import errno
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import errno, os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -41,18 +36,18 @@ def count(self):
     print("SKIP")
     raise SystemExit
 
-os.VfsFat.mkfs(bdev)
-vfs = os.VfsFat(bdev)
-os.mount(vfs, "/ramdisk")
+vfs.VfsFat.mkfs(bdev)
+fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/ramdisk")
 
 # file io
-with vfs.open("file.txt", "w") as f:
+with fs.open("file.txt", "w") as f:
     f.write("hello!")
 
-print(list(vfs.ilistdir()))
+print(list(fs.ilistdir()))
 
-with vfs.open("file.txt", "r") as f:
+with fs.open("file.txt", "r") as f:
     print(f.read())
 
-vfs.remove("file.txt")
-print(list(vfs.ilistdir()))
+fs.remove("file.txt")
+print(list(fs.ilistdir()))
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 1693359d49d56..05c45e96b06df 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -1,13 +1,8 @@
 try:
-    import errno
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import errno, os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -38,7 +33,7 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    os.VfsFat.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
@@ -46,50 +41,50 @@ def ioctl(self, op, arg):
 print(b"FOO_FILETXT" not in bdev.data)
 print(b"hello!" not in bdev.data)
 
-vfs = os.VfsFat(bdev)
-os.mount(vfs, "/ramdisk")
+fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/ramdisk")
 
-print("statvfs:", vfs.statvfs("/ramdisk"))
-print("getcwd:", vfs.getcwd())
+print("statvfs:", fs.statvfs("/ramdisk"))
+print("getcwd:", fs.getcwd())
 
 try:
-    vfs.stat("no_file.txt")
+    fs.stat("no_file.txt")
 except OSError as e:
     print(e.errno == errno.ENOENT)
 
-with vfs.open("foo_file.txt", "w") as f:
+with fs.open("foo_file.txt", "w") as f:
     f.write("hello!")
-print(list(vfs.ilistdir()))
+print(list(fs.ilistdir()))
 
-print("stat root:", vfs.stat("/")[:-3])  # timestamps differ across runs
-print("stat file:", vfs.stat("foo_file.txt")[:-3])  # timestamps differ across runs
+print("stat root:", fs.stat("/")[:-3])  # timestamps differ across runs
+print("stat file:", fs.stat("foo_file.txt")[:-3])  # timestamps differ across runs
 
 print(b"FOO_FILETXT" in bdev.data)
 print(b"hello!" in bdev.data)
 
-vfs.mkdir("foo_dir")
-vfs.chdir("foo_dir")
-print("getcwd:", vfs.getcwd())
-print(list(vfs.ilistdir()))
+fs.mkdir("foo_dir")
+fs.chdir("foo_dir")
+print("getcwd:", fs.getcwd())
+print(list(fs.ilistdir()))
 
-with vfs.open("sub_file.txt", "w") as f:
+with fs.open("sub_file.txt", "w") as f:
     f.write("subdir file")
 
 try:
-    vfs.chdir("sub_file.txt")
+    fs.chdir("sub_file.txt")
 except OSError as e:
     print(e.errno == errno.ENOENT)
 
-vfs.chdir("..")
-print("getcwd:", vfs.getcwd())
+fs.chdir("..")
+print("getcwd:", fs.getcwd())
 
-os.umount(vfs)
+vfs.umount(fs)
 
-vfs = os.VfsFat(bdev)
-print(list(vfs.ilistdir(b"")))
+fs = vfs.VfsFat(bdev)
+print(list(fs.ilistdir(b"")))
 
 # list a non-existent directory
 try:
-    vfs.ilistdir(b"no_exist")
+    fs.ilistdir(b"no_exist")
 except OSError as e:
     print("ENOENT:", e.errno == errno.ENOENT)
diff --git a/tests/extmod/vfs_fat_ramdisklarge.py b/tests/extmod/vfs_fat_ramdisklarge.py
index 40cba9ee430a1..38ad772b44397 100644
--- a/tests/extmod/vfs_fat_ramdisklarge.py
+++ b/tests/extmod/vfs_fat_ramdisklarge.py
@@ -1,14 +1,10 @@
 # test making a FAT filesystem on a very large block device
 
 try:
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -46,24 +42,24 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMBDevSparse(4 * 1024 * 1024 * 1024 // RAMBDevSparse.SEC_SIZE)
-    os.VfsFat.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = os.VfsFat(bdev)
-os.mount(vfs, "/ramdisk")
+fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/ramdisk")
 
-print("statvfs:", vfs.statvfs("/ramdisk"))
+print("statvfs:", fs.statvfs("/ramdisk"))
 
 f = open("/ramdisk/test.txt", "w")
 f.write("test file")
 f.close()
 
-print("statvfs:", vfs.statvfs("/ramdisk"))
+print("statvfs:", fs.statvfs("/ramdisk"))
 
 f = open("/ramdisk/test.txt")
 print(f.read())
 f.close()
 
-os.umount(vfs)
+vfs.umount(fs)
diff --git a/tests/extmod/vfs_lfs.py b/tests/extmod/vfs_lfs.py
index 83377653b2cfb..3ad57fd9c38f1 100644
--- a/tests/extmod/vfs_lfs.py
+++ b/tests/extmod/vfs_lfs.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsLfs1
-    os.VfsLfs2
+    vfs.VfsLfs1
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -47,44 +47,44 @@ def test(bdev, vfs_class):
     vfs_class.mkfs(bdev)
 
     # construction
-    vfs = vfs_class(bdev)
+    fs = vfs_class(bdev)
 
     # statvfs
-    print(vfs.statvfs("/"))
+    print(fs.statvfs("/"))
 
     # open, write close
-    f = vfs.open("test", "w")
+    f = fs.open("test", "w")
     f.write("littlefs")
     f.close()
 
     # statvfs after creating a file
-    print(vfs.statvfs("/"))
+    print(fs.statvfs("/"))
 
     # ilistdir
-    print(list(vfs.ilistdir()))
-    print(list(vfs.ilistdir("/")))
-    print(list(vfs.ilistdir(b"/")))
+    print(list(fs.ilistdir()))
+    print(list(fs.ilistdir("/")))
+    print(list(fs.ilistdir(b"/")))
 
     # mkdir, rmdir
-    vfs.mkdir("testdir")
-    print(list(vfs.ilistdir()))
-    print(sorted(list(vfs.ilistdir("testdir"))))
-    vfs.rmdir("testdir")
-    print(list(vfs.ilistdir()))
-    vfs.mkdir("testdir")
+    fs.mkdir("testdir")
+    print(list(fs.ilistdir()))
+    print(sorted(list(fs.ilistdir("testdir"))))
+    fs.rmdir("testdir")
+    print(list(fs.ilistdir()))
+    fs.mkdir("testdir")
 
     # stat a file
-    print_stat(vfs.stat("test"))
+    print_stat(fs.stat("test"))
 
     # stat a dir (size seems to vary on LFS2 so don't print that)
-    print_stat(vfs.stat("testdir"), False)
+    print_stat(fs.stat("testdir"), False)
 
     # read
-    with vfs.open("test", "r") as f:
+    with fs.open("test", "r") as f:
         print(f.read())
 
     # create large file
-    with vfs.open("testbig", "w") as f:
+    with fs.open("testbig", "w") as f:
         data = "large012" * 32 * 16
         print("data length:", len(data))
         for i in range(4):
@@ -92,63 +92,63 @@ def test(bdev, vfs_class):
             f.write(data)
 
     # stat after creating large file
-    print(vfs.statvfs("/"))
+    print(fs.statvfs("/"))
 
     # rename
-    vfs.rename("testbig", "testbig2")
-    print(sorted(list(vfs.ilistdir())))
-    vfs.chdir("testdir")
-    vfs.rename("/testbig2", "testbig2")
-    print(sorted(list(vfs.ilistdir())))
-    vfs.rename("testbig2", "/testbig2")
-    vfs.chdir("/")
-    print(sorted(list(vfs.ilistdir())))
+    fs.rename("testbig", "testbig2")
+    print(sorted(list(fs.ilistdir())))
+    fs.chdir("testdir")
+    fs.rename("/testbig2", "testbig2")
+    print(sorted(list(fs.ilistdir())))
+    fs.rename("testbig2", "/testbig2")
+    fs.chdir("/")
+    print(sorted(list(fs.ilistdir())))
 
     # remove
-    vfs.remove("testbig2")
-    print(sorted(list(vfs.ilistdir())))
+    fs.remove("testbig2")
+    print(sorted(list(fs.ilistdir())))
 
     # getcwd, chdir
-    vfs.mkdir("/testdir2")
-    vfs.mkdir("/testdir/subdir")
-    print(vfs.getcwd())
-    vfs.chdir("/testdir")
-    print(vfs.getcwd())
+    fs.mkdir("/testdir2")
+    fs.mkdir("/testdir/subdir")
+    print(fs.getcwd())
+    fs.chdir("/testdir")
+    print(fs.getcwd())
 
     # create file in directory to make sure paths are relative
-    vfs.open("test2", "w").close()
-    print_stat(vfs.stat("test2"))
-    print_stat(vfs.stat("/testdir/test2"))
-    vfs.remove("test2")
+    fs.open("test2", "w").close()
+    print_stat(fs.stat("test2"))
+    print_stat(fs.stat("/testdir/test2"))
+    fs.remove("test2")
 
     # chdir back to root and remove testdir
-    vfs.chdir("/")
-    print(vfs.getcwd())
-    vfs.chdir("testdir")
-    print(vfs.getcwd())
-    vfs.chdir("..")
-    print(vfs.getcwd())
-    vfs.chdir("testdir/subdir")
-    print(vfs.getcwd())
-    vfs.chdir("../..")
-    print(vfs.getcwd())
-    vfs.chdir("/./testdir2")
-    print(vfs.getcwd())
-    vfs.chdir("../testdir")
-    print(vfs.getcwd())
-    vfs.chdir("../..")
-    print(vfs.getcwd())
-    vfs.chdir(".//testdir")
-    print(vfs.getcwd())
-    vfs.chdir("subdir/./")
-    print(vfs.getcwd())
-    vfs.chdir("/")
-    print(vfs.getcwd())
-    vfs.rmdir("testdir/subdir")
-    vfs.rmdir("testdir")
-    vfs.rmdir("testdir2")
+    fs.chdir("/")
+    print(fs.getcwd())
+    fs.chdir("testdir")
+    print(fs.getcwd())
+    fs.chdir("..")
+    print(fs.getcwd())
+    fs.chdir("testdir/subdir")
+    print(fs.getcwd())
+    fs.chdir("../..")
+    print(fs.getcwd())
+    fs.chdir("/./testdir2")
+    print(fs.getcwd())
+    fs.chdir("../testdir")
+    print(fs.getcwd())
+    fs.chdir("../..")
+    print(fs.getcwd())
+    fs.chdir(".//testdir")
+    print(fs.getcwd())
+    fs.chdir("subdir/./")
+    print(fs.getcwd())
+    fs.chdir("/")
+    print(fs.getcwd())
+    fs.rmdir("testdir/subdir")
+    fs.rmdir("testdir")
+    fs.rmdir("testdir2")
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, os.VfsLfs1)
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsLfs1)
+test(bdev, vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_corrupt.py b/tests/extmod/vfs_lfs_corrupt.py
index c49dcad92b441..0365c0c23f3c8 100644
--- a/tests/extmod/vfs_lfs_corrupt.py
+++ b/tests/extmod/vfs_lfs_corrupt.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, testing error handling from corrupt block device
 
 try:
-    import os
+    import vfs
 
-    os.VfsLfs1
-    os.VfsLfs2
+    vfs.VfsLfs1
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -47,28 +47,28 @@ def corrupt(bdev, block):
 def create_vfs(bdev, vfs_class):
     bdev.ret = 0
     vfs_class.mkfs(bdev)
-    vfs = vfs_class(bdev)
-    with vfs.open("f", "w") as f:
+    fs = vfs_class(bdev)
+    with fs.open("f", "w") as f:
         for i in range(100):
             f.write("test")
-    return vfs
+    return fs
 
 
 def test(bdev, vfs_class):
     print("test", vfs_class)
 
     # statvfs
-    vfs = create_vfs(bdev, vfs_class)
+    fs = create_vfs(bdev, vfs_class)
     corrupt(bdev, 0)
     corrupt(bdev, 1)
     try:
-        print(vfs.statvfs(""))
+        print(fs.statvfs(""))
     except OSError:
         print("statvfs OSError")
 
     # error during read
-    vfs = create_vfs(bdev, vfs_class)
-    f = vfs.open("f", "r")
+    fs = create_vfs(bdev, vfs_class)
+    f = fs.open("f", "r")
     bdev.ret = -5  # EIO
     try:
         f.read(10)
@@ -76,8 +76,8 @@ def test(bdev, vfs_class):
         print("read OSError")
 
     # error during write
-    vfs = create_vfs(bdev, vfs_class)
-    f = vfs.open("f", "a")
+    fs = create_vfs(bdev, vfs_class)
+    f = fs.open("f", "a")
     bdev.ret = -5  # EIO
     try:
         f.write("test")
@@ -85,8 +85,8 @@ def test(bdev, vfs_class):
         print("write OSError")
 
     # error during close
-    vfs = create_vfs(bdev, vfs_class)
-    f = vfs.open("f", "w")
+    fs = create_vfs(bdev, vfs_class)
+    f = fs.open("f", "w")
     f.write("test")
     bdev.ret = -5  # EIO
     try:
@@ -95,8 +95,8 @@ def test(bdev, vfs_class):
         print("close OSError")
 
     # error during flush
-    vfs = create_vfs(bdev, vfs_class)
-    f = vfs.open("f", "w")
+    fs = create_vfs(bdev, vfs_class)
+    f = fs.open("f", "w")
     f.write("test")
     bdev.ret = -5  # EIO
     try:
@@ -108,5 +108,5 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, os.VfsLfs1)
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsLfs1)
+test(bdev, vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_error.py b/tests/extmod/vfs_lfs_error.py
index 32b76b2821258..2ac7629bfa8fc 100644
--- a/tests/extmod/vfs_lfs_error.py
+++ b/tests/extmod/vfs_lfs_error.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, testing error handling
 
 try:
-    import os
+    import vfs
 
-    os.VfsLfs1
-    os.VfsLfs2
+    vfs.VfsLfs1
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -52,63 +52,63 @@ def test(bdev, vfs_class):
 
     # set up for following tests
     vfs_class.mkfs(bdev)
-    vfs = vfs_class(bdev)
-    with vfs.open("testfile", "w") as f:
+    fs = vfs_class(bdev)
+    with fs.open("testfile", "w") as f:
         f.write("test")
-    vfs.mkdir("testdir")
+    fs.mkdir("testdir")
 
     # ilistdir
     try:
-        vfs.ilistdir("noexist")
+        fs.ilistdir("noexist")
     except OSError:
         print("ilistdir OSError")
 
     # remove
     try:
-        vfs.remove("noexist")
+        fs.remove("noexist")
     except OSError:
         print("remove OSError")
 
     # rmdir
     try:
-        vfs.rmdir("noexist")
+        fs.rmdir("noexist")
     except OSError:
         print("rmdir OSError")
 
     # rename
     try:
-        vfs.rename("noexist", "somethingelse")
+        fs.rename("noexist", "somethingelse")
     except OSError:
         print("rename OSError")
 
     # mkdir
     try:
-        vfs.mkdir("testdir")
+        fs.mkdir("testdir")
     except OSError:
         print("mkdir OSError")
 
     # chdir to nonexistent
     try:
-        vfs.chdir("noexist")
+        fs.chdir("noexist")
     except OSError:
         print("chdir OSError")
-    print(vfs.getcwd())  # check still at root
+    print(fs.getcwd())  # check still at root
 
     # chdir to file
     try:
-        vfs.chdir("testfile")
+        fs.chdir("testfile")
     except OSError:
         print("chdir OSError")
-    print(vfs.getcwd())  # check still at root
+    print(fs.getcwd())  # check still at root
 
     # stat
     try:
-        vfs.stat("noexist")
+        fs.stat("noexist")
     except OSError:
         print("stat OSError")
 
     # error during seek
-    with vfs.open("testfile", "r") as f:
+    with fs.open("testfile", "r") as f:
         f.seek(1 << 30)  # SEEK_SET
         try:
             f.seek(1 << 30, 1)  # SEEK_CUR
@@ -117,5 +117,5 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, os.VfsLfs1)
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsLfs1)
+test(bdev, vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_file.py b/tests/extmod/vfs_lfs_file.py
index b4a3e6b22367a..0e1797714d346 100644
--- a/tests/extmod/vfs_lfs_file.py
+++ b/tests/extmod/vfs_lfs_file.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, file IO
 
 try:
-    import os
+    import vfs
 
-    os.VfsLfs1
-    os.VfsLfs2
+    vfs.VfsLfs1
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -42,10 +42,10 @@ def test(bdev, vfs_class):
     vfs_class.mkfs(bdev)
 
     # construction
-    vfs = vfs_class(bdev)
+    fs = vfs_class(bdev)
 
     # create text, print, write, close
-    f = vfs.open("test.txt", "wt")
+    f = fs.open("test.txt", "wt")
     print(f)
     f.write("littlefs")
     f.close()
@@ -54,48 +54,48 @@ def test(bdev, vfs_class):
     f.close()
 
     # create binary, print, write, flush, close
-    f = vfs.open("test.bin", "wb")
+    f = fs.open("test.bin", "wb")
     print(f)
     f.write("littlefs")
     f.flush()
     f.close()
 
     # create for append
-    f = vfs.open("test.bin", "ab")
+    f = fs.open("test.bin", "ab")
     f.write("more")
     f.close()
 
     # create exclusive
-    f = vfs.open("test2.bin", "xb")
+    f = fs.open("test2.bin", "xb")
     f.close()
 
     # create exclusive with error
     try:
-        vfs.open("test2.bin", "x")
+        fs.open("test2.bin", "x")
     except OSError:
         print("open OSError")
 
     # read default
-    with vfs.open("test.txt", "") as f:
+    with fs.open("test.txt", "") as f:
         print(f.read())
 
     # read text
-    with vfs.open("test.txt", "rt") as f:
+    with fs.open("test.txt", "rt") as f:
         print(f.read())
 
     # read binary
-    with vfs.open("test.bin", "rb") as f:
+    with fs.open("test.bin", "rb") as f:
         print(f.read())
 
     # create read and write
-    with vfs.open("test.bin", "r+b") as f:
+    with fs.open("test.bin", "r+b") as f:
         print(f.read(8))
         f.write("MORE")
-    with vfs.open("test.bin", "rb") as f:
+    with fs.open("test.bin", "rb") as f:
         print(f.read())
 
     # seek and tell
-    f = vfs.open("test.txt", "r")
+    f = fs.open("test.txt", "r")
     print(f.tell())
     f.seek(3, 0)
     print(f.tell())
@@ -103,13 +103,13 @@ def test(bdev, vfs_class):
 
     # open nonexistent
     try:
-        vfs.open("noexist", "r")
+        fs.open("noexist", "r")
     except OSError:
         print("open OSError")
 
     # open multiple files at the same time
-    f1 = vfs.open("test.txt", "")
-    f2 = vfs.open("test.bin", "b")
+    f1 = fs.open("test.txt", "")
+    f2 = fs.open("test.bin", "b")
     print(f1.read())
     print(f2.read())
     f1.close()
@@ -117,5 +117,5 @@ def test(bdev, vfs_class):
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, os.VfsLfs1)
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsLfs1)
+test(bdev, vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_ilistdir_del.py b/tests/extmod/vfs_lfs_ilistdir_del.py
index c183118fe0022..7b59bc412d983 100644
--- a/tests/extmod/vfs_lfs_ilistdir_del.py
+++ b/tests/extmod/vfs_lfs_ilistdir_del.py
@@ -2,9 +2,9 @@
 import gc
 
 try:
-    import os
+    import vfs
 
-    os.VfsLfs2
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -37,29 +37,29 @@ def ioctl(self, op, arg):
 
 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")
+    fs = vfs_class(bdev)
+    fs.mkdir("/test_d1")
+    fs.mkdir("/test_d2")
+    fs.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("/")
+        idir = fs.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)
+        for dname, *_ in fs.ilistdir("/"):
+            fs.rmdir(dname)
             break
-        vfs.mkdir(dname)
+        fs.mkdir(dname)
 
         # Also create a fully drained iterator and ensure trying to reuse it
         # throws the correct exception.
-        idir_emptied = vfs.ilistdir("/")
+        idir_emptied = fs.ilistdir("/")
         l = list(idir_emptied)
         print(len(l))
         try:
@@ -68,8 +68,8 @@ def test(bdev, vfs_class):
             pass
 
         gc.collect()
-        vfs.open("/test", "w").close()
+        fs.open("/test", "w").close()
 
 
 bdev = RAMBlockDevice(30)
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_mount.py b/tests/extmod/vfs_lfs_mount.py
index 4ebd9ac6233f8..4887ddcec0085 100644
--- a/tests/extmod/vfs_lfs_mount.py
+++ b/tests/extmod/vfs_lfs_mount.py
@@ -1,10 +1,10 @@
 # Test for VfsLittle using a RAM device, with mount/umount
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsLfs1
-    os.VfsLfs2
+    vfs.VfsLfs1
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -42,7 +42,7 @@ def test(vfs_class):
 
     # mount bdev unformatted
     try:
-        os.mount(bdev, "/lfs")
+        vfs.mount(bdev, "/lfs")
     except Exception as er:
         print(repr(er))
 
@@ -50,10 +50,10 @@ def test(vfs_class):
     vfs_class.mkfs(bdev)
 
     # construction
-    vfs = vfs_class(bdev)
+    fs = vfs_class(bdev)
 
     # mount
-    os.mount(vfs, "/lfs")
+    vfs.mount(fs, "/lfs")
 
     # import
     with open("/lfs/lfsmod.py", "w") as f:
@@ -73,11 +73,11 @@ def test(vfs_class):
     import lfsmod2
 
     # umount
-    os.umount("/lfs")
+    vfs.umount("/lfs")
 
     # mount read-only
-    vfs = vfs_class(bdev)
-    os.mount(vfs, "/lfs", readonly=True)
+    fs = vfs_class(bdev)
+    vfs.mount(fs, "/lfs", readonly=True)
 
     # test reading works
     with open("/lfs/subdir/lfsmod2.py") as f:
@@ -90,13 +90,13 @@ def test(vfs_class):
         print(repr(er))
 
     # umount
-    os.umount("/lfs")
+    vfs.umount("/lfs")
 
     # mount bdev again
-    os.mount(bdev, "/lfs")
+    vfs.mount(bdev, "/lfs")
 
     # umount
-    os.umount("/lfs")
+    vfs.umount("/lfs")
 
     # clear imported modules
     sys.modules.clear()
@@ -110,5 +110,5 @@ def test(vfs_class):
 sys.path.append("")
 
 # run tests
-test(os.VfsLfs1)
-test(os.VfsLfs2)
+test(vfs.VfsLfs1)
+test(vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_mtime.py b/tests/extmod/vfs_lfs_mtime.py
index ade02fa144987..3d163dc2687f0 100644
--- a/tests/extmod/vfs_lfs_mtime.py
+++ b/tests/extmod/vfs_lfs_mtime.py
@@ -1,11 +1,11 @@
 # Test for VfsLfs using a RAM device, mtime feature
 
 try:
-    import time, os
+    import time, vfs
 
     time.time
     time.sleep
-    os.VfsLfs2
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -44,21 +44,21 @@ def test(bdev, vfs_class):
 
     # construction
     print("mtime=True")
-    vfs = vfs_class(bdev, mtime=True)
+    fs = vfs_class(bdev, mtime=True)
 
     # Create an empty file, should have a timestamp.
     current_time = int(time.time())
-    vfs.open("test1", "wt").close()
+    fs.open("test1", "wt").close()
 
     # Wait 1 second so mtime will increase by at least 1.
     time.sleep(1)
 
     # Create another empty file, should have a timestamp.
-    vfs.open("test2", "wt").close()
+    fs.open("test2", "wt").close()
 
     # Stat the files and check mtime is non-zero.
-    stat1 = vfs.stat("test1")
-    stat2 = vfs.stat("test2")
+    stat1 = fs.stat("test1")
+    stat2 = fs.stat("test2")
     print(stat1[8] != 0, stat2[8] != 0)
 
     # Check that test1 has mtime which matches time.time() at point of creation.
@@ -71,34 +71,34 @@ def test(bdev, vfs_class):
     time.sleep(1)
 
     # Open test1 for reading and ensure mtime did not change.
-    vfs.open("test1", "rt").close()
-    print(vfs.stat("test1") == stat1)
+    fs.open("test1", "rt").close()
+    print(fs.stat("test1") == stat1)
 
     # Open test1 for writing and ensure mtime increased from the previous value.
-    vfs.open("test1", "wt").close()
+    fs.open("test1", "wt").close()
     stat1_old = stat1
-    stat1 = vfs.stat("test1")
+    stat1 = fs.stat("test1")
     print(stat1_old[8] < stat1[8])
 
     # Unmount.
-    vfs.umount()
+    fs.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")
+    fs = vfs_class(bdev, mtime=False)
+    print(fs.stat("test1") == stat1)
+    print(fs.stat("test2") == stat2)
+    f = fs.open("test1", "wt")
     f.close()
-    print(vfs.stat("test1") == stat1)
-    vfs.umount()
+    print(fs.stat("test1") == stat1)
+    fs.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()
+    fs = vfs_class(bdev, mtime=True)
+    print(fs.stat("test1") == stat1)
+    print(fs.stat("test2") == stat2)
+    fs.umount()
 
 
 try:
@@ -107,4 +107,4 @@ def test(bdev, vfs_class):
     print("SKIP")
     raise SystemExit
 
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_superblock.py b/tests/extmod/vfs_lfs_superblock.py
index b8a8ec60b967a..74b6004e991c0 100644
--- a/tests/extmod/vfs_lfs_superblock.py
+++ b/tests/extmod/vfs_lfs_superblock.py
@@ -1,9 +1,9 @@
 # Test for VfsLfs using a RAM device, when the first superblock does not exist
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsLfs2
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -36,12 +36,12 @@ def ioctl(self, op, arg):
 bdev = RAMBlockDevice(64, lfs2_data)
 
 # Create the VFS explicitly, no auto-detection is needed for this.
-vfs = os.VfsLfs2(bdev)
-print(list(vfs.ilistdir()))
+fs = vfs.VfsLfs2(bdev)
+print(list(fs.ilistdir()))
 
 # Mount the block device directly; this relies on auto-detection.
-os.mount(bdev, "/userfs")
+vfs.mount(bdev, "/userfs")
 print(os.listdir("/userfs"))
 
 # Clean up.
-os.umount("/userfs")
+vfs.umount("/userfs")
diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index bc4c7c2014b6c..d060c0b9c84f3 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -1,10 +1,9 @@
 # Test for VfsPosix
 
 try:
-    import gc
-    import os
+    import gc, os, vfs
 
-    os.VfsPosix
+    vfs.VfsPosix
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -13,8 +12,6 @@
 # Skip the test if it does exist.
 temp_dir = "micropy_test_dir"
 try:
-    import os
-
     os.stat(temp_dir)
     print("SKIP")
     raise SystemExit
@@ -87,35 +84,35 @@ def write_files_without_closing():
 print(os.listdir(temp_dir))
 
 # construct new VfsPosix with path argument
-vfs = os.VfsPosix(temp_dir)
-# when VfsPosix is used the intended way via os.mount(), it can only be called
+fs = vfs.VfsPosix(temp_dir)
+# when VfsPosix is used the intended way via vfs.mount(), it can only be called
 # with relative paths when the CWD is inside or at its root, so simulate that
 os.chdir(temp_dir)
-print(list(i[0] for i in vfs.ilistdir(".")))
+print(list(i[0] for i in fs.ilistdir(".")))
 
 # stat, statvfs (statvfs may not exist)
-print(type(vfs.stat(".")))
-if hasattr(vfs, "statvfs"):
-    assert type(vfs.statvfs(".")) is tuple
+print(type(fs.stat(".")))
+if hasattr(fs, "statvfs"):
+    assert type(fs.statvfs(".")) is tuple
 
 # check types of ilistdir with str/bytes arguments
-print(type(list(vfs.ilistdir("."))[0][0]))
-print(type(list(vfs.ilistdir(b"."))[0][0]))
+print(type(list(fs.ilistdir("."))[0][0]))
+print(type(list(fs.ilistdir(b"."))[0][0]))
 
 # chdir should not affect absolute paths (regression test)
-vfs.mkdir("/subdir")
-vfs.mkdir("/subdir/micropy_test_dir")
-with vfs.open("/subdir/micropy_test_dir/test2", "w") as f:
+fs.mkdir("/subdir")
+fs.mkdir("/subdir/micropy_test_dir")
+with fs.open("/subdir/micropy_test_dir/test2", "w") as f:
     f.write("wrong")
-vfs.chdir("/subdir")
-with vfs.open("/test2", "r") as f:
+fs.chdir("/subdir")
+with fs.open("/test2", "r") as f:
     print(f.read())
 os.chdir(curdir)
-vfs.remove("/subdir/micropy_test_dir/test2")
-vfs.rmdir("/subdir/micropy_test_dir")
-vfs.rmdir("/subdir")
+fs.remove("/subdir/micropy_test_dir/test2")
+fs.rmdir("/subdir/micropy_test_dir")
+fs.rmdir("/subdir")
 
-# done with vfs, restore CWD
+# done with fs, restore CWD
 os.chdir(curdir)
 
 # remove
diff --git a/tests/extmod/vfs_posix_enoent.py b/tests/extmod/vfs_posix_enoent.py
index e6010d79d58f0..7b00388da539a 100644
--- a/tests/extmod/vfs_posix_enoent.py
+++ b/tests/extmod/vfs_posix_enoent.py
@@ -1,10 +1,9 @@
 # Test for VfsPosix error conditions
 
 try:
-    import os
-    import sys
+    import os, sys, vfs
 
-    os.VfsPosix
+    vfs.VfsPosix
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -36,7 +35,7 @@
     print("getcwd():", repr(e))
 
 try:
-    print("VfsPosix():", os.VfsPosix("something"))
+    print("VfsPosix():", vfs.VfsPosix("something"))
 except OSError as e:
     # expecting ENOENT = 2
     print("VfsPosix():", repr(e))
diff --git a/tests/extmod/vfs_posix_ilistdir_del.py b/tests/extmod/vfs_posix_ilistdir_del.py
index 11b45e619781e..78d7c854c543c 100644
--- a/tests/extmod/vfs_posix_ilistdir_del.py
+++ b/tests/extmod/vfs_posix_ilistdir_del.py
@@ -2,9 +2,9 @@
 import gc
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsPosix
+    vfs.VfsPosix
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -12,34 +12,34 @@
 
 def test(testdir):
     curdir = os.getcwd()
-    vfs = os.VfsPosix(testdir)
-    # When VfsPosix is used the intended way via os.mount(), it can only be called
+    fs = vfs.VfsPosix(testdir)
+    # When VfsPosix is used the intended way via vfs.mount(), it can only be called
     # with relative paths when the CWD is inside or at its root, so simulate that.
     # (Although perhaps calling with a relative path was an oversight in this case
-    # and the respective line below was meant to read `vfs.rmdir("/" + dname)`.)
+    # and the respective line below was meant to read `fs.rmdir("/" + dname)`.)
     os.chdir(testdir)
-    vfs.mkdir("/test_d1")
-    vfs.mkdir("/test_d2")
-    vfs.mkdir("/test_d3")
+    fs.mkdir("/test_d1")
+    fs.mkdir("/test_d2")
+    fs.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("/")
+        idir = fs.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)
+        for dname, *_ in fs.ilistdir("/"):
+            fs.rmdir(dname)
             break
-        vfs.mkdir(dname)
+        fs.mkdir(dname)
 
         # Also create a fully drained iterator and ensure trying to reuse it
         # throws the correct exception.
-        idir_emptied = vfs.ilistdir("/")
+        idir_emptied = fs.ilistdir("/")
         l = list(idir_emptied)
         print(len(l))
         try:
@@ -51,10 +51,10 @@ def test(testdir):
 
         # 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")
+        fs.open("/test", "w").close()
+        fs.remove("/test")
 
-    # Done with vfs, restore CWD.
+    # Done with fs, restore CWD.
     os.chdir(curdir)
 
 
diff --git a/tests/extmod/vfs_posix_ilistdir_filter.py b/tests/extmod/vfs_posix_ilistdir_filter.py
index 54012746057a8..6df9542045935 100644
--- a/tests/extmod/vfs_posix_ilistdir_filter.py
+++ b/tests/extmod/vfs_posix_ilistdir_filter.py
@@ -1,9 +1,9 @@
 # Test ilistdir filter of . and .. for VfsPosix.
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsPosix
+    vfs.VfsPosix
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -11,24 +11,24 @@
 
 def test(testdir):
     curdir = os.getcwd()
-    vfs = os.VfsPosix(testdir)
-    # When VfsPosix is used the intended way via os.mount(), it can only be called
+    fs = vfs.VfsPosix(testdir)
+    # When VfsPosix is used the intended way via vfs.mount(), it can only be called
     # with relative paths when the CWD is inside or at its root, so simulate that.
     os.chdir(testdir)
 
     dirs = [".a", "..a", "...a", "a.b", "a..b"]
 
     for dir in dirs:
-        vfs.mkdir(dir)
+        fs.mkdir(dir)
 
     dirs = []
-    for entry in vfs.ilistdir("/"):
+    for entry in fs.ilistdir("/"):
         dirs.append(entry[0])
     dirs.sort()
 
     print(dirs)
 
-    # Done with vfs, restore CWD.
+    # Done with fs, restore CWD.
     os.chdir(curdir)
 
 
diff --git a/tests/extmod/vfs_posix_paths.py b/tests/extmod/vfs_posix_paths.py
index 5806a34521a23..b4fedc6716f01 100644
--- a/tests/extmod/vfs_posix_paths.py
+++ b/tests/extmod/vfs_posix_paths.py
@@ -1,9 +1,9 @@
 # Test for VfsPosix with relative paths
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsPosix
+    vfs.VfsPosix
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -12,8 +12,6 @@
 # Skip the test if it does exist.
 temp_dir = "vfs_posix_paths_test_dir"
 try:
-    import os
-
     os.stat(temp_dir)
     print("SKIP")
     raise SystemExit
@@ -25,26 +23,26 @@
 
 # construct new VfsPosix with absolute path argument
 temp_dir_abs = os.getcwd() + os.sep + temp_dir
-vfs = os.VfsPosix(temp_dir_abs)
-# when VfsPosix is used the intended way via os.mount(), it can only be called
+fs = vfs.VfsPosix(temp_dir_abs)
+# when VfsPosix is used the intended way via vfs.mount(), it can only be called
 # with relative paths when the CWD is inside or at its root, so simulate that
 os.chdir(temp_dir_abs)
-vfs.mkdir("subdir")
-vfs.mkdir("subdir/one")
-print('listdir("/"):', sorted(i[0] for i in vfs.ilistdir("/")))
-print('listdir("."):', sorted(i[0] for i in vfs.ilistdir(".")))
-print('getcwd() in {"", "/"}:', vfs.getcwd() in {"", "/"})
-print('chdir("subdir"):', vfs.chdir("subdir"))
-print("getcwd():", vfs.getcwd())
-print('mkdir("two"):', vfs.mkdir("two"))
-f = vfs.open("file.py", "w")
+fs.mkdir("subdir")
+fs.mkdir("subdir/one")
+print('listdir("/"):', sorted(i[0] for i in fs.ilistdir("/")))
+print('listdir("."):', sorted(i[0] for i in fs.ilistdir(".")))
+print('getcwd() in {"", "/"}:', fs.getcwd() in {"", "/"})
+print('chdir("subdir"):', fs.chdir("subdir"))
+print("getcwd():", fs.getcwd())
+print('mkdir("two"):', fs.mkdir("two"))
+f = fs.open("file.py", "w")
 f.write("print('hello')")
 f.close()
-print('listdir("/"):', sorted(i[0] for i in vfs.ilistdir("/")))
-print('listdir("/subdir"):', sorted(i[0] for i in vfs.ilistdir("/subdir")))
-print('listdir("."):', sorted(i[0] for i in vfs.ilistdir(".")))
+print('listdir("/"):', sorted(i[0] for i in fs.ilistdir("/")))
+print('listdir("/subdir"):', sorted(i[0] for i in fs.ilistdir("/subdir")))
+print('listdir("."):', sorted(i[0] for i in fs.ilistdir(".")))
 try:
-    f = vfs.open("/subdir/file.py", "r")
+    f = fs.open("/subdir/file.py", "r")
     print(f.read())
     f.close()
 except Exception as e:
@@ -59,17 +57,17 @@
 except Exception as e:
     print(e)
 del sys.path[0]
-vfs.remove("file.py")
-vfs.rmdir("two")
-vfs.rmdir("/subdir/one")
-vfs.chdir("/")
-vfs.rmdir("/subdir")
+fs.remove("file.py")
+fs.rmdir("two")
+fs.rmdir("/subdir/one")
+fs.chdir("/")
+fs.rmdir("/subdir")
 
-# done with vfs, restore CWD
+# done with fs, restore CWD
 os.chdir(curdir)
 
 # some integration tests with a mounted VFS
-os.mount(os.VfsPosix(temp_dir_abs), "/mnt")
+vfs.mount(vfs.VfsPosix(temp_dir_abs), "/mnt")
 os.mkdir("/mnt/dir")
 print('chdir("/mnt/dir"):', os.chdir("/mnt/dir"))
 print("getcwd():", os.getcwd())
@@ -82,7 +80,7 @@
 print('chdir(".."):', os.chdir(".."))
 print("getcwd():", os.getcwd())
 os.rmdir("/mnt/dir")
-os.umount("/mnt")
+vfs.umount("/mnt")
 
 # restore CWD
 os.chdir(curdir)
diff --git a/tests/extmod/vfs_userfs.py b/tests/extmod/vfs_userfs.py
index 5c487315eb5eb..a7b87ec0b0d0c 100644
--- a/tests/extmod/vfs_userfs.py
+++ b/tests/extmod/vfs_userfs.py
@@ -4,12 +4,9 @@
 import sys
 
 try:
-    import io
+    import io, vfs
 
     io.IOBase
-    import os
-
-    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -79,7 +76,7 @@ def open(self, path, mode):
     "/usermod5.py": b"print('in usermod5')",
     "/usermod6.py": b"print('in usermod6')",
 }
-os.mount(UserFS(user_files), "/userfs")
+vfs.mount(UserFS(user_files), "/userfs")
 
 # open and read a file
 f = open("/userfs/data.txt")
@@ -110,5 +107,5 @@ def open(self, path, mode):
 import usermod6
 
 # unmount and undo path addition
-os.umount("/userfs")
+vfs.umount("/userfs")
 sys.path.pop()
diff --git a/tests/micropython/builtin_execfile.py b/tests/micropython/builtin_execfile.py
index 9b6d6a0aa00bc..a905521c662d3 100644
--- a/tests/micropython/builtin_execfile.py
+++ b/tests/micropython/builtin_execfile.py
@@ -1,11 +1,10 @@
 # Test builtin execfile function using VFS.
 
 try:
-    import io, os
+    import io, os, vfs
 
     execfile
     io.IOBase
-    os.mount
 except (ImportError, NameError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -44,25 +43,21 @@ def open(self, file, mode):
 
 # First umount any existing mount points the target may have.
 try:
-    import io, os
-
-    os.umount("/")
+    vfs.umount("/")
 except OSError:
     pass
 for path in os.listdir("/"):
-    os.umount("/" + path)
+    vfs.umount("/" + path)
 
 # Create and mount the VFS object.
 files = {
     "/test.py": "print(123)",
 }
 fs = Filesystem(files)
-os.mount(fs, "/test_mnt")
+vfs.mount(fs, "/test_mnt")
 
 # Test execfile with a file that doesn't exist.
 try:
-    import io, os
-
     execfile("/test_mnt/noexist.py")
 except OSError:
     print("OSError")
@@ -77,4 +72,4 @@ def open(self, file, mode):
     print("TypeError")
 
 # Unmount the VFS object.
-os.umount(fs)
+vfs.umount(fs)
diff --git a/tests/micropython/import_mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
index 36db102e9d6f3..c7f0a2c1a1c61 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -1,10 +1,9 @@
 # test importing of invalid .mpy files
 
 try:
-    import sys, io, os
+    import sys, io, vfs
 
     io.IOBase
-    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -52,7 +51,7 @@ def open(self, path, mode):
 }
 
 # create and mount a user filesystem
-os.mount(UserFS(user_files), "/userfs")
+vfs.mount(UserFS(user_files), "/userfs")
 sys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
@@ -64,5 +63,5 @@ def open(self, path, mode):
         print(mod, "ValueError", er)
 
 # unmount and undo path addition
-os.umount("/userfs")
+vfs.umount("/userfs")
 sys.path.pop()
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index da20746b225de..8f5de25a0b2c1 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -1,11 +1,10 @@
 # test importing of .mpy files with native code
 
 try:
-    import sys, io, os
+    import sys, io, vfs
 
     sys.implementation._mpy
     io.IOBase
-    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -110,7 +109,7 @@ def open(self, path, mode):
 # fmt: on
 
 # create and mount a user filesystem
-os.mount(UserFS(user_files), "/userfs")
+vfs.mount(UserFS(user_files), "/userfs")
 sys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
@@ -123,5 +122,5 @@ def open(self, path, mode):
         print(mod, "ValueError", er)
 
 # unmount and undo path addition
-os.umount("/userfs")
+vfs.umount("/userfs")
 sys.path.pop()
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index e0da8d2c37e4c..6b8d7ddd632e2 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -1,11 +1,10 @@
 # Test that native code loaded from a .mpy file is retained after a GC.
 
 try:
-    import gc, sys, io, os
+    import gc, sys, io, vfs
 
     sys.implementation._mpy
     io.IOBase
-    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -72,7 +71,7 @@ def open(self, path, mode):
 user_files = {"/features0.mpy": features0_file_contents[sys_implementation_mpy]}
 
 # Create and mount a user filesystem.
-os.mount(UserFS(user_files), "/userfs")
+vfs.mount(UserFS(user_files), "/userfs")
 sys.path.append("/userfs")
 
 # Import the native function.
@@ -93,5 +92,5 @@ def open(self, path, mode):
 print(factorial(10))
 
 # Unmount and undo path addition.
-os.umount("/userfs")
+vfs.umount("/userfs")
 sys.path.pop()
diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index 364c325042843..33437f9da801e 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -1,8 +1,8 @@
 # Test performance of importing an .mpy file many times.
 
-import sys, io, os
+import sys, io, vfs
 
-if not (hasattr(io, "IOBase") and hasattr(os, "mount")):
+if not hasattr(io, "IOBase"):
     print("SKIP")
     raise SystemExit
 
@@ -57,7 +57,7 @@ def open(self, path, mode):
 
 
 def mount():
-    os.mount(FS(), "/__remote")
+    vfs.mount(FS(), "/__remote")
     sys.path.insert(0, "/__remote")
 
 
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index 5757c3eaf1fdf..18454b8fd5eb2 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -2,9 +2,9 @@
 # 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 io, os, sys
+import sys, io, vfs
 
-if not (hasattr(io, "IOBase") and hasattr(os, "mount")):
+if not hasattr(io, "IOBase"):
     print("SKIP")
     raise SystemExit
 
@@ -112,7 +112,7 @@ def open(self, path, mode):
 
 
 def mount():
-    os.mount(FS(), "/__remote")
+    vfs.mount(FS(), "/__remote")
     sys.path.insert(0, "/__remote")
 
 
diff --git a/tests/ports/cc3200/os.py b/tests/ports/cc3200/os.py
index 1f4debcade55c..c126dcffc4e3d 100644
--- a/tests/ports/cc3200/os.py
+++ b/tests/ports/cc3200/os.py
@@ -3,7 +3,7 @@
 """
 
 from machine import SD
-import os
+import os, vfs
 
 mch = os.uname().machine
 if "LaunchPad" in mch:
@@ -15,7 +15,7 @@
 
 sd = SD(pins=sd_pins)
 
-os.mount(sd, "/sd")
+vfs.mount(sd, "/sd")
 os.mkfs("/sd")
 os.chdir("/flash")
 print(os.listdir())
@@ -88,7 +88,7 @@
 os.unmount("/sd")
 print(os.listdir("/"))
 os.mkfs(sd)
-os.mount(sd, "/sd")
+vfs.mount(sd, "/sd")
 print(os.listdir("/"))
 os.chdir("/flash")
 
@@ -104,12 +104,12 @@
 print(os.listdir("/sd"))
 
 try:
-    os.mount(sd, "/sd")
+    vfs.mount(sd, "/sd")
 except:
     print("Exception")
 
 try:
-    os.mount(sd, "/sd2")
+    vfs.mount(sd, "/sd2")
 except:
     print("Exception")
 
@@ -159,6 +159,6 @@
 except:
     print("Exception")
 
-os.mount(sd, "/sd")
+vfs.mount(sd, "/sd")
 print(os.listdir("/"))
 os.unmount("/sd")
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 5764021472144..e61cf09933f0c 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, os, io
+import sys, io, vfs
 class __File(io.IOBase):
   def __init__(self):
     self.off = 0
@@ -52,7 +52,7 @@ def stat(self, path):
       raise OSError(-2) # ENOENT
   def open(self, path, mode):
     return __File()
-os.mount(__FS(), '/__remote')
+vfs.mount(__FS(), '/__remote')
 sys.path.insert(0, '/__remote')
 sys.modules['{}'] = __import__('__injected')
 """
diff --git a/tests/run-tests.py b/tests/run-tests.py
index c912f9d5424df..ba66eced41aff 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -59,7 +59,7 @@ def base_path(*p):
 
 # Code to allow a target MicroPython to import an .mpy from RAM
 injected_import_hook_code = """\
-import sys, os, io
+import sys, os, io, vfs
 class __File(io.IOBase):
   def __init__(self):
     self.off = 0
@@ -83,7 +83,7 @@ def stat(self, path):
       raise OSError(-2) # ENOENT
   def open(self, path, mode):
     return __File()
-os.mount(__FS(), '/__vfstest')
+vfs.mount(__FS(), '/__vfstest')
 os.chdir('/__vfstest')
 __import__('__injected_test')
 """

From 7d28789544e4e35d8c931b41765dd64a53c506f1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Nov 2023 16:24:10 +1100
Subject: [PATCH 0803/3129] ports: Use vfs module instead of os.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modules/_boot.py                  |  6 +++---
 ports/esp32/modules/inisetup.py               | 14 +++++++-------
 ports/esp8266/boards/ESP8266_GENERIC/board.md |  2 +-
 ports/esp8266/modules/_boot.py                |  4 ++--
 ports/esp8266/modules/inisetup.py             | 10 +++++-----
 ports/mimxrt/boards/TEENSY40/format.py        |  8 ++++----
 ports/mimxrt/modules/_boot.py                 | 13 +++++++------
 ports/nrf/examples/mountsd.py                 |  4 ++--
 ports/nrf/examples/seeed_tft.py               |  4 ++--
 ports/nrf/modules/scripts/_mkfs.py            | 14 +++++++-------
 ports/rp2/modules/_boot.py                    | 12 ++++++------
 ports/rp2/modules/_boot_fat.py                | 13 ++++++-------
 ports/samd/modules/_boot.py                   | 12 ++++++------
 13 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/ports/esp32/modules/_boot.py b/ports/esp32/modules/_boot.py
index 651fc7b10cdd8..96af581f38a5c 100644
--- a/ports/esp32/modules/_boot.py
+++ b/ports/esp32/modules/_boot.py
@@ -1,13 +1,13 @@
 import gc
-import os
+import vfs
 from flashbdev import bdev
 
 try:
     if bdev:
-        os.mount(bdev, "/")
+        vfs.mount(bdev, "/")
 except OSError:
     import inisetup
 
-    vfs = inisetup.setup()
+    inisetup.setup()
 
 gc.collect()
diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py
index 2003864e9f3e8..4e9b462fb3c3a 100644
--- a/ports/esp32/modules/inisetup.py
+++ b/ports/esp32/modules/inisetup.py
@@ -1,4 +1,4 @@
-import os
+import vfs
 from flashbdev import bdev
 
 
@@ -38,12 +38,12 @@ def setup():
     check_bootsec()
     print("Performing initial setup")
     if bdev.info()[4] == "vfs":
-        os.VfsLfs2.mkfs(bdev)
-        vfs = os.VfsLfs2(bdev)
+        vfs.VfsLfs2.mkfs(bdev)
+        fs = vfs.VfsLfs2(bdev)
     elif bdev.info()[4] == "ffat":
-        os.VfsFat.mkfs(bdev)
-        vfs = os.VfsFat(bdev)
-    os.mount(vfs, "/")
+        vfs.VfsFat.mkfs(bdev)
+        fs = vfs.VfsFat(bdev)
+    vfs.mount(fs, "/")
     with open("boot.py", "w") as f:
         f.write(
             """\
@@ -54,4 +54,4 @@ def setup():
 #webrepl.start()
 """
         )
-    return vfs
+    return fs
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/board.md b/ports/esp8266/boards/ESP8266_GENERIC/board.md
index 96fbab617a8f6..e8d63fcead0c4 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/board.md
+++ b/ports/esp8266/boards/ESP8266_GENERIC/board.md
@@ -13,7 +13,7 @@ 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
-`os.VfsLfs2.mkfs(bdev)`.
+`vfs.VfsLfs2.mkfs(bdev)`.
 
 ### OTA builds
 Over-The-Air (OTA) builds of the ESP8266 firmware are also provided.
diff --git a/ports/esp8266/modules/_boot.py b/ports/esp8266/modules/_boot.py
index 06b372990a52d..00a0d6550f945 100644
--- a/ports/esp8266/modules/_boot.py
+++ b/ports/esp8266/modules/_boot.py
@@ -1,12 +1,12 @@
 import gc
 
 gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
-import os
+import vfs
 from flashbdev import bdev
 
 if bdev:
     try:
-        os.mount(bdev, "/")
+        vfs.mount(bdev, "/")
     except:
         import inisetup
 
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index 3f3edcf6d0af0..20bb28e80b064 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -1,4 +1,4 @@
-import os
+import vfs
 import network
 from flashbdev import bdev
 
@@ -36,7 +36,7 @@ def fs_corrupted():
             """\
 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 os.VfsLfs2.mkfs(bdev), or completely erase the flash and
+format it with vfs.VfsLfs2.mkfs(bdev), or completely erase the flash and
 reprogram MicroPython.
 """
             % (bdev.start_sec, bdev.blocks)
@@ -48,9 +48,9 @@ def setup():
     check_bootsec()
     print("Performing initial setup")
     wifi()
-    os.VfsLfs2.mkfs(bdev)
-    vfs = os.VfsLfs2(bdev)
-    os.mount(vfs, "/")
+    vfs.VfsLfs2.mkfs(bdev)
+    fs = vfs.VfsLfs2(bdev)
+    vfs.mount(fs, "/")
     with open("boot.py", "w") as f:
         f.write(
             """\
diff --git a/ports/mimxrt/boards/TEENSY40/format.py b/ports/mimxrt/boards/TEENSY40/format.py
index 75e5aa95caef0..1204ac240ccd3 100644
--- a/ports/mimxrt/boards/TEENSY40/format.py
+++ b/ports/mimxrt/boards/TEENSY40/format.py
@@ -1,11 +1,11 @@
 # format.py
 # Re-create the file system
 
-import os
+import vfs
 import mimxrt
 
 bdev = mimxrt.Flash()
 
-os.VfsLfs2.mkfs(bdev, progsize=256)
-vfs = os.VfsLfs2(bdev, progsize=256)
-os.mount(vfs, "/")
+vfs.VfsLfs2.mkfs(bdev, progsize=256)
+fs = vfs.VfsLfs2(bdev, progsize=256)
+vfs.mount(fs, "/")
diff --git a/ports/mimxrt/modules/_boot.py b/ports/mimxrt/modules/_boot.py
index 56f12a4ce1590..fa3b780434a43 100644
--- a/ports/mimxrt/modules/_boot.py
+++ b/ports/mimxrt/modules/_boot.py
@@ -3,17 +3,18 @@
 # Note: the flash requires the programming size to be aligned to 256 bytes.
 
 import os
+import vfs
 import sys
 import mimxrt
 from machine import Pin
 
 bdev = mimxrt.Flash()
 try:
-    vfs = os.VfsLfs2(bdev, progsize=256)
+    fs = vfs.VfsLfs2(bdev, progsize=256)
 except:
-    os.VfsLfs2.mkfs(bdev, progsize=256)
-    vfs = os.VfsLfs2(bdev, progsize=256)
-os.mount(vfs, "/flash")
+    vfs.VfsLfs2.mkfs(bdev, progsize=256)
+    fs = vfs.VfsLfs2(bdev, progsize=256)
+vfs.mount(fs, "/flash")
 os.chdir("/flash")
 sys.path.append("/flash")
 sys.path.append("/flash/lib")
@@ -27,8 +28,8 @@
 
         sdcard = SDCard(1)
 
-        fat = os.VfsFat(sdcard)
-        os.mount(fat, "/sdcard")
+        fat = vfs.VfsFat(sdcard)
+        vfs.mount(fat, "/sdcard")
         os.chdir("/sdcard")
         sys.path.append("/sdcard")
     except:
diff --git a/ports/nrf/examples/mountsd.py b/ports/nrf/examples/mountsd.py
index 315205c6959b0..37522596150ab 100644
--- a/ports/nrf/examples/mountsd.py
+++ b/ports/nrf/examples/mountsd.py
@@ -20,7 +20,7 @@
   ---------------------------------
 """
 
-import os
+import os, vfs
 from machine import SPI, Pin
 from sdcard import SDCard
 
@@ -28,7 +28,7 @@
 def mnt():
     cs = Pin("P22", mode=Pin.OUT)
     sd = SDCard(SPI(0), cs)
-    os.mount(sd, "/")
+    vfs.mount(sd, "/")
 
 
 def list():
diff --git a/ports/nrf/examples/seeed_tft.py b/ports/nrf/examples/seeed_tft.py
index fc0617f20b2d7..f53b560226363 100644
--- a/ports/nrf/examples/seeed_tft.py
+++ b/ports/nrf/examples/seeed_tft.py
@@ -44,7 +44,7 @@
     tf = mount_tf()
     os.listdir()
 """
-import os
+import vfs
 import time
 import framebuf
 
@@ -54,7 +54,7 @@
 
 def mount_tf(self, mount_point="/"):
     sd = SDCard(SPI(0), Pin("P15", mode=Pin.OUT))
-    os.mount(sd, mount_point)
+    vfs.mount(sd, mount_point)
 
 
 class ILI9341:
diff --git a/ports/nrf/modules/scripts/_mkfs.py b/ports/nrf/modules/scripts/_mkfs.py
index 02e8dabce285f..601f9558eb7b5 100644
--- a/ports/nrf/modules/scripts/_mkfs.py
+++ b/ports/nrf/modules/scripts/_mkfs.py
@@ -1,19 +1,19 @@
-import os, nrf
+import vfs, nrf
 
 try:
-    from os import VfsLfs1
+    from vfs import VfsLfs1
 
-    os.VfsLfs1.mkfs(nrf.Flash())
+    vfs.VfsLfs1.mkfs(nrf.Flash())
 except ImportError:
     try:
-        from os import VfsLfs2
+        from vfs import VfsLfs2
 
-        os.VfsLfs2.mkfs(nrf.Flash())
+        vfs.VfsLfs2.mkfs(nrf.Flash())
     except ImportError:
         try:
-            from os import VfsFat
+            from vfs import VfsFat
 
-            os.VfsFat.mkfs(nrf.Flash())
+            vfs.VfsFat.mkfs(nrf.Flash())
         except ImportError:
             pass
         except OSError as e:
diff --git a/ports/rp2/modules/_boot.py b/ports/rp2/modules/_boot.py
index 099e5aba05907..71cb28d6823bb 100644
--- a/ports/rp2/modules/_boot.py
+++ b/ports/rp2/modules/_boot.py
@@ -1,4 +1,4 @@
-import os
+import vfs
 import machine, rp2
 
 
@@ -6,10 +6,10 @@
 # Note: the flash requires the programming size to be aligned to 256 bytes.
 bdev = rp2.Flash()
 try:
-    vfs = os.VfsLfs2(bdev, progsize=256)
+    fs = vfs.VfsLfs2(bdev, progsize=256)
 except:
-    os.VfsLfs2.mkfs(bdev, progsize=256)
-    vfs = os.VfsLfs2(bdev, progsize=256)
-os.mount(vfs, "/")
+    vfs.VfsLfs2.mkfs(bdev, progsize=256)
+    fs = vfs.VfsLfs2(bdev, progsize=256)
+vfs.mount(fs, "/")
 
-del os, bdev, vfs
+del vfs, bdev, fs
diff --git a/ports/rp2/modules/_boot_fat.py b/ports/rp2/modules/_boot_fat.py
index 02a2df9babee5..5220584455dca 100644
--- a/ports/rp2/modules/_boot_fat.py
+++ b/ports/rp2/modules/_boot_fat.py
@@ -1,15 +1,14 @@
-import os
+import vfs
 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, "/")
+    fs = vfs.VfsFat(bdev)
 except:
-    os.VfsFat.mkfs(bdev)
-    vfs = os.VfsFat(bdev)
-os.mount(vfs, "/")
+    vfs.VfsFat.mkfs(bdev)
+    fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/")
 
-del os, bdev, vfs
+del vfs, bdev, fs
diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py
index 93522e2ea32b4..f4053e2cddf00 100644
--- a/ports/samd/modules/_boot.py
+++ b/ports/samd/modules/_boot.py
@@ -1,21 +1,21 @@
 import gc
-import os
+import vfs
 import samd
 import sys
 
 bdev = samd.Flash()
 
 # Try to mount the filesystem, and format the flash if it doesn't exist.
-fs_type = os.VfsLfs2 if hasattr(os, "VfsLfs2") else os.VfsLfs1
+fs_type = vfs.VfsLfs2 if hasattr(vfs, "VfsLfs2") else vfs.VfsLfs1
 
 try:
-    vfs = fs_type(bdev, progsize=256)
+    fs = fs_type(bdev, progsize=256)
 except:
     fs_type.mkfs(bdev, progsize=256)
-    vfs = fs_type(bdev, progsize=256)
-os.mount(vfs, "/")
+    fs = fs_type(bdev, progsize=256)
+vfs.mount(fs, "/")
 sys.path.append("/lib")
 
-del vfs, fs_type, bdev, os, samd, sys
+del fs, fs_type, bdev, vfs, samd, sys
 gc.collect()
 del gc

From 4c56b39051b4a992d8691aa504cd2e76b958bf26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Feb 2024 13:51:18 +1100
Subject: [PATCH 0804/3129] docs: Use vfs module instead of os.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst          |  6 +--
 docs/library/machine.SD.rst      |  4 +-
 docs/library/machine.SDCard.rst  |  2 +-
 docs/library/pyb.rst             |  2 +-
 docs/mimxrt/quickref.rst         | 14 +++----
 docs/pyboard/general.rst         |  2 +-
 docs/reference/filesystem.rst    | 64 ++++++++++++++++----------------
 docs/renesas-ra/quickref.rst     |  6 +--
 docs/wipy/general.rst            |  2 +-
 docs/wipy/quickref.rst           |  4 +-
 docs/zephyr/quickref.rst         | 12 +++---
 docs/zephyr/tutorial/storage.rst | 12 +++---
 12 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 08df25b0554d0..9c77dc402ebef 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -650,15 +650,15 @@ SD card
 
 See :ref:`machine.SDCard <machine.SDCard>`. ::
 
-    import machine, os
+    import machine, os, vfs
 
     # Slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
     sd = machine.SDCard(slot=2)
-    os.mount(sd, '/sd')  # mount
+    vfs.mount(sd, '/sd') # mount
 
     os.listdir('/sd')    # list directory contents
 
-    os.umount('/sd')     # eject
+    vfs.umount('/sd')    # eject
 
 RMT
 ---
diff --git a/docs/library/machine.SD.rst b/docs/library/machine.SD.rst
index c736dc4d2836e..b10b407a2f65e 100644
--- a/docs/library/machine.SD.rst
+++ b/docs/library/machine.SD.rst
@@ -20,11 +20,11 @@ more info regarding the pins which can be remapped to be used with a SD card.
 Example usage::
 
     from machine import SD
-    import os
+    import vfs
     # clk cmd and dat0 pins must be passed along with
     # their respective alternate functions
     sd = machine.SD(pins=('GP10', 'GP11', 'GP15'))
-    os.mount(sd, '/sd')
+    vfs.mount(sd, '/sd')
     # do normal file operations
 
 Constructors
diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index 4faa7a5557723..e4bb25dfc0377 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -30,7 +30,7 @@ vary from platform to platform.
     The class implements the block protocol defined by :class:`vfs.AbstractBlockDev`.
     This allows the mounting of an SD card to be as simple as::
 
-      os.mount(machine.SDCard(), "/sd")
+      vfs.mount(machine.SDCard(), "/sd")
 
     The constructor takes the following parameters:
 
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index 869e2f8f3bd9b..f169a77f3a6ca 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -213,7 +213,7 @@ Miscellaneous functions
 .. function:: mount(device, mountpoint, *, readonly=False, mkfs=False)
 
    .. note:: This function is deprecated. Mounting and unmounting devices should
-      be performed by :meth:`os.mount` and :meth:`os.umount` instead.
+      be performed by :meth:`vfs.mount` and :meth:`vfs.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
diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index 578364c55a4ce..519313438321c 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -443,27 +443,27 @@ SD card
 
 See :ref:`machine.SDCard <machine.SDCard>`::
 
-    import machine, os
+    import machine, os, vfs
 
     sd = machine.SDCard()
-    fs = os.VfsFat(sd)
-    os.mount(fs, "/sd")  # mount
+    fs = vfs.VfsFat(sd)
+    vfs.mount(fs, "/sd") # mount
     os.listdir('/sd')    # list directory contents
-    os.umount('/sd')     # eject
+    vfs.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
+    import vfs, 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")
+    fs = vfs.VfsFat(sd)
+    vfs.mount(fs, "/sdcard")
 
 OneWire driver
 --------------
diff --git a/docs/pyboard/general.rst b/docs/pyboard/general.rst
index 0fc7332dedf4f..d1bf3829bec18 100644
--- a/docs/pyboard/general.rst
+++ b/docs/pyboard/general.rst
@@ -21,7 +21,7 @@ If needed, you can prevent the use of the SD card by creating an empty file
 called ``/flash/SKIPSD``.  If this file exists when the pyboard boots
 up then the SD card will be skipped and the pyboard will always boot from the
 internal filesystem (in this case the SD card won't be mounted but you can still
-mount and use it later in your program using ``os.mount``).
+mount and use it later in your program using ``vfs.mount``).
 
 (Note that on older versions of the board, ``/flash`` is called ``0:/`` and ``/sd``
 is called ``1:/``).
diff --git a/docs/reference/filesystem.rst b/docs/reference/filesystem.rst
index d8092c58dd7ce..48a465856027d 100644
--- a/docs/reference/filesystem.rst
+++ b/docs/reference/filesystem.rst
@@ -108,11 +108,11 @@ RAM using a ``bytearray``::
 
 It can be used as follows::
 
-    import os
+    import vfs
 
     bdev = RAMBlockDev(512, 50)
-    os.VfsFat.mkfs(bdev)
-    os.mount(bdev, '/ramdisk')
+    vfs.VfsFat.mkfs(bdev)
+    vfs.mount(bdev, '/ramdisk')
 
 An example of a block device that supports both the simple and extended
 interface (i.e. both signatures and behaviours of the
@@ -150,11 +150,11 @@ interface (i.e. both signatures and behaviours of the
 As it supports the extended interface, it can be used with :class:`littlefs
 <vfs.VfsLfs2>`::
 
-    import os
+    import vfs
 
     bdev = RAMBlockDev(512, 50)
-    os.VfsLfs2.mkfs(bdev)
-    os.mount(bdev, '/ramdisk')
+    vfs.VfsLfs2.mkfs(bdev)
+    vfs.mount(bdev, '/ramdisk')
 
 Once mounted, the filesystem (regardless of its type) can be used as it
 normally would be used from Python code, for example::
@@ -197,16 +197,16 @@ recommended to use littlefs instead.
 To format the entire flash using FAT::
 
     # ESP8266 and ESP32
-    import os
-    os.umount('/')
-    os.VfsFat.mkfs(bdev)
-    os.mount(bdev, '/')
+    import vfs
+    vfs.umount('/')
+    vfs.VfsFat.mkfs(bdev)
+    vfs.mount(bdev, '/')
 
     # STM32
-    import os, pyb
-    os.umount('/flash')
-    os.VfsFat.mkfs(pyb.Flash(start=0))
-    os.mount(pyb.Flash(start=0), '/flash')
+    import os, vfs, pyb
+    vfs.umount('/flash')
+    vfs.VfsFat.mkfs(pyb.Flash(start=0))
+    vfs.mount(pyb.Flash(start=0), '/flash')
     os.chdir('/flash')
 
 Littlefs
@@ -222,16 +222,16 @@ resistant to filesystem corruption.
 To format the entire flash using littlefs v2::
 
     # ESP8266 and ESP32
-    import os
-    os.umount('/')
-    os.VfsLfs2.mkfs(bdev)
-    os.mount(bdev, '/')
+    import vfs
+    vfs.umount('/')
+    vfs.VfsLfs2.mkfs(bdev)
+    vfs.mount(bdev, '/')
 
     # STM32
-    import os, pyb
-    os.umount('/flash')
-    os.VfsLfs2.mkfs(pyb.Flash(start=0))
-    os.mount(pyb.Flash(start=0), '/flash')
+    import os, vfs, pyb
+    vfs.umount('/flash')
+    vfs.VfsLfs2.mkfs(pyb.Flash(start=0))
+    vfs.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
@@ -264,14 +264,14 @@ block devices spanning a subset of the flash device.
 For example, to configure the first 256kiB as FAT (and available over USB MSC),
 and the remainder as littlefs::
 
-    import os, pyb
-    os.umount('/flash')
+    import os, vfs, pyb
+    vfs.umount('/flash')
     p1 = pyb.Flash(start=0, len=256*1024)
     p2 = pyb.Flash(start=256*1024)
-    os.VfsFat.mkfs(p1)
-    os.VfsLfs2.mkfs(p2)
-    os.mount(p1, '/flash')
-    os.mount(p2, '/data')
+    vfs.VfsFat.mkfs(p1)
+    vfs.VfsLfs2.mkfs(p2)
+    vfs.mount(p1, '/flash')
+    vfs.mount(p2, '/data')
     os.chdir('/flash')
 
 This might be useful to make your Python files, configuration and other
@@ -282,9 +282,9 @@ failure, etc.
 The partition at offset ``0`` will be mounted automatically (and the filesystem
 type automatically detected), but you can add::
 
-    import os, pyb
+    import vfs, pyb
     p2 = pyb.Flash(start=256*1024)
-    os.mount(p2, '/data')
+    vfs.mount(p2, '/data')
 
 to ``boot.py`` to mount the data partition.
 
@@ -297,7 +297,7 @@ define an arbitrary partition layout.
 At boot, the partition named "vfs" will be mounted at ``/`` by default, but any
 additional partitions can be mounted in your ``boot.py`` using::
 
-    import esp32, os
+    import esp32, vfs
     p = esp32.Partition.find(esp32.Partition.TYPE_DATA, label='foo')
-    os.mount(p, '/foo')
+    vfs.mount(p, '/foo')
 
diff --git a/docs/renesas-ra/quickref.rst b/docs/renesas-ra/quickref.rst
index 47b49575bd5be..ea9a38db15fcb 100644
--- a/docs/renesas-ra/quickref.rst
+++ b/docs/renesas-ra/quickref.rst
@@ -387,15 +387,15 @@ 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
+    import os, vfs, sdcard
 
     spi = SPI(0, baudrate=500000)
     cs = Pin.cpu.P103
     sd = sdcard.SDCard(spi, cs)
-    os.mount(sd, '/sd')
+    vfs.mount(sd, '/sd')
     os.listdir('/')
     os.chdir('/sd')
-    os.umount('/sd')
+    vfs.umount('/sd')
 
 OneWire driver
 --------------
diff --git a/docs/wipy/general.rst b/docs/wipy/general.rst
index a1c8df8ef46ae..bb7e592153f27 100644
--- a/docs/wipy/general.rst
+++ b/docs/wipy/general.rst
@@ -373,7 +373,7 @@ functions are defined in ``os`` module:
    Mounts a block device (like an ``SD`` object) in the specified mount
    point. Example::
 
-      os.mount(sd, '/sd')
+      vfs.mount(sd, '/sd')
 
 .. function:: unmount(path)
 
diff --git a/docs/wipy/quickref.rst b/docs/wipy/quickref.rst
index 4c3b969bd1cda..d6abb8d1c7552 100644
--- a/docs/wipy/quickref.rst
+++ b/docs/wipy/quickref.rst
@@ -171,13 +171,13 @@ SD card
 See :ref:`machine.SD <machine.SD>`. ::
 
     from machine import SD
-    import os
+    import vfs
 
     # clock pin, cmd pin, data0 pin
     sd = SD(pins=('GP10', 'GP11', 'GP15'))
     # or use default ones for the expansion board
     sd = SD()
-    os.mount(sd, '/sd')
+    vfs.mount(sd, '/sd')
 
 WLAN (WiFi)
 -----------
diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 57262ffb5c632..d8b1f8768d028 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -109,12 +109,12 @@ Disk Access
 
 Use the :ref:`zephyr.DiskAccess <zephyr.DiskAccess>` class to support filesystem::
 
-    import os
+    import vfs
     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
+    vfs.VfsFat.mkfs(block_dev)          # create FAT filesystem object using the disk storage block
+    vfs.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
@@ -126,12 +126,12 @@ Flash Area
 
 Use the :ref:`zephyr.FlashArea <zephyr.FlashArea>` class to support filesystem::
 
-    import os
+    import vfs
     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
+    vfs.VfsLfs2.mkfs(block_dev)         # create filesystem in lfs2 format using the flash block device
+    vfs.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
diff --git a/docs/zephyr/tutorial/storage.rst b/docs/zephyr/tutorial/storage.rst
index e8dcbbd39a4aa..7fd449226fbff 100644
--- a/docs/zephyr/tutorial/storage.rst
+++ b/docs/zephyr/tutorial/storage.rst
@@ -21,11 +21,11 @@ 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
+    import vfs
     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
+    vfs.VfsFat.mkfs(bdev)                   # create FAT filesystem object using the disk storage block
+    vfs.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
@@ -43,11 +43,11 @@ implements the `vfs.AbstractBlockDev` protocol.
 
 Example usage with the internal flash on the reel_board or the rv32m1_vega_ri5cy board::
 
-    import os
+    import vfs
     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
+    vfs.VfsLfs2.mkfs(bdev)                      # create Little filesystem object using the flash area block
+    vfs.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

From 1c7afa923b416f51d1c43417e32fd958da2f0c67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Feb 2024 13:34:54 +1100
Subject: [PATCH 0805/3129] drivers/dht: Only build DHT driver if
 MICROPY_PY_MACHINE_PULSE enabled.

Because this driver calls `machine_time_pulse_us()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/dht/dht.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/dht/dht.c b/drivers/dht/dht.c
index 73afdee581758..7e9b897825791 100644
--- a/drivers/dht/dht.c
+++ b/drivers/dht/dht.c
@@ -29,6 +29,9 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+
+#if MICROPY_PY_MACHINE_PULSE
+
 #include "extmod/modmachine.h"
 #include "drivers/dht/dht.h"
 
@@ -92,3 +95,5 @@ STATIC mp_obj_t dht_readinto(mp_obj_t pin_in, mp_obj_t buf_in) {
     mp_raise_OSError(MP_ETIMEDOUT);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(dht_readinto_obj, dht_readinto);
+
+#endif // MICROPY_PY_MACHINE_PULSE

From 2158da213e49f40e74780ca9d5a07ce146d39281 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jan 2024 20:06:54 +1100
Subject: [PATCH 0806/3129] stm32/modos: Allow disabling
 MICROPY_PY_MACHINE_UART.

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

diff --git a/ports/stm32/modos.c b/ports/stm32/modos.c
index bd0101cab9c73..6f3577f44a2ed 100644
--- a/ports/stm32/modos.c
+++ b/ports/stm32/modos.c
@@ -48,7 +48,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
 bool mp_os_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
+    return false
+           #if MICROPY_PY_MACHINE_UART
+           || type == &machine_uart_type
+           #endif
            #if MICROPY_HW_ENABLE_USB
            || type == &pyb_usb_vcp_type
            #endif
@@ -56,18 +59,22 @@ bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) {
 }
 
 void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
+    #if MICROPY_PY_MACHINE_UART
     if (mp_obj_get_type(stream_detached) == &machine_uart_type) {
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
+    #endif
     #if MICROPY_HW_ENABLE_USB
     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 MICROPY_PY_MACHINE_UART
     if (mp_obj_get_type(stream_attached) == &machine_uart_type) {
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
     }
+    #endif
     #if MICROPY_HW_ENABLE_USB
     if (mp_obj_get_type(stream_attached) == &pyb_usb_vcp_type) {
         usb_vcp_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);

From 4e6436d4cffc7198f6d79431bb76eaf71d3e2ec1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Feb 2024 13:13:03 +1100
Subject: [PATCH 0807/3129] stm32/spi: Allow disabling MICROPY_PY_MACHINE_SPI.

This requires that MICROPY_PY_PYB is also disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_spi.c | 4 ++++
 ports/stm32/pyb_spi.c     | 4 ++++
 ports/stm32/spi.c         | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index b916252da35ef..0a5a67ef2ed9b 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -28,6 +28,8 @@
 #include "extmod/modmachine.h"
 #include "spi.h"
 
+#if MICROPY_PY_MACHINE_SPI
+
 /******************************************************************************/
 // Implementation of hard SPI for machine module
 
@@ -150,3 +152,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     protocol, &machine_hard_spi_p,
     locals_dict, &mp_machine_spi_locals_dict
     );
+
+#endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index f36c048747f9d..f92642dddcd88 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -29,6 +29,8 @@
 #include "bufhelper.h"
 #include "spi.h"
 
+#if MICROPY_PY_PYB
+
 /******************************************************************************/
 // MicroPython bindings for legacy pyb API
 
@@ -362,3 +364,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     protocol, &pyb_spi_p,
     locals_dict, &pyb_spi_locals_dict
     );
+
+#endif // MICROPY_PY_PYB
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index ee2301c803b8a..df71efd3fe11a 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -735,6 +735,8 @@ void spi_print(const mp_print_t *print, const spi_t *spi_obj, bool legacy) {
     mp_print_str(print, ")");
 }
 
+#if MICROPY_PY_MACHINE_SPI
+
 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);
@@ -761,6 +763,8 @@ mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
     }
 }
 
+#endif
+
 /******************************************************************************/
 // Implementation of low-level SPI C protocol
 

From 657faee7e5c44552ba39dea00d4c0d12ef09ca30 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Feb 2024 13:34:12 +1100
Subject: [PATCH 0808/3129] stm32/main: Allow disabling MICROPY_PY_MACHINE.

Disabling this requires also disabling: MICROPY_PY_PYB and MICROPY_PY_STM.

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

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 06ba74f759677..3279770ea03ce 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -424,7 +424,9 @@ void stm32_main(uint32_t reset_mode) {
     #if MICROPY_HW_HAS_SWITCH
     switch_init0();
     #endif
+    #if MICROPY_PY_MACHINE
     machine_init();
+    #endif
     #if MICROPY_HW_ENABLE_RTC
     rtc_init_start(false);
     #endif
@@ -670,7 +672,9 @@ void stm32_main(uint32_t reset_mode) {
     #if MICROPY_HW_ENABLE_DAC
     dac_deinit_all();
     #endif
+    #if MICROPY_PY_MACHINE
     machine_deinit();
+    #endif
 
     #if MICROPY_PY_THREAD
     pyb_thread_deinit();

From b038d070116ccfb1ec785cd6207006783841bccc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Feb 2024 14:55:07 +1100
Subject: [PATCH 0809/3129] stm32/Makefile: Ignore uninitialised variable
 warning in H5 HAL SD code.

This warning appears when using an MCU like H562 that only has one SDMMC.

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

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index e44a542395182..2947e4119beac 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -338,6 +338,10 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_sdmmc.c \
 	ll_fmc.c \
 	)
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),h5))
+# HAL H5-1.0.0 has a bug with uninitialised variable in HAL_SD_ConfigWideBusOperation.
+$(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_hal_sd.o: CFLAGS += -Wno-error=maybe-uninitialized
+endif
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7))

From 84e90639fa47a6830b53138d546dd8694549be36 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 31 Jan 2024 10:55:17 +1100
Subject: [PATCH 0810/3129] github/workflows: Move codespell to a GitHub
 workflow, version it.

Similar to ruff.yaml, it's simpler to run the codespell command directly
from a workflow file.  And developers can run codespell directly from the
command line without the need for options, or just use pre-commit.

This commit also applies a specific version to codespell, same as
pre-commit (introduced in a166d805f43).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/code_formatting.yml | 10 ----------
 .github/workflows/codespell.yml       | 12 ++++++++++++
 tools/ci.sh                           | 11 -----------
 3 files changed, 12 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/codespell.yml

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 5cd7984f7ac15..9f30f048cfdbe 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -18,13 +18,3 @@ jobs:
       run: source tools/ci.sh && ci_c_code_formatting_run
     - name: Check code formatting
       run: git diff --exit-code
-
-  code-spelling:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-    - name: Install packages
-      run: source tools/ci.sh && ci_code_spell_setup
-    - name: Run spell checker
-      run: source tools/ci.sh && ci_code_spell_run
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
new file mode 100644
index 0000000000000..47b12051e726f
--- /dev/null
+++ b/.github/workflows/codespell.yml
@@ -0,0 +1,12 @@
+name: Check spelling with codespell
+
+on: [push, pull_request]
+
+jobs:
+  codespell:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - run: pip install --user codespell==2.2.6 tomli
+    - run: codespell
+
diff --git a/tools/ci.sh b/tools/ci.sh
index e18027ae5addb..3cbc51cfad625 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -30,17 +30,6 @@ function ci_c_code_formatting_run {
     tools/codeformat.py -v -c
 }
 
-########################################################################################
-# code spelling
-
-function ci_code_spell_setup {
-    pip3 install codespell tomli
-}
-
-function ci_code_spell_run {
-    codespell
-}
-
 ########################################################################################
 # commit formatting
 

From 6f0aa275f85dbdc3e36f6bfd94d678f70203939d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 31 Jan 2024 11:09:52 +1100
Subject: [PATCH 0811/3129] github/workflows: Add comments where tool versions
 need to be in sync.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/codespell.yml | 1 +
 .github/workflows/ruff.yml      | 1 +
 .pre-commit-config.yaml         | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 47b12051e726f..2d8b4627aac2d 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -7,6 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    # codespell version should be kept in sync with .pre-commit-config.yml
     - run: pip install --user codespell==2.2.6 tomli
     - run: codespell
 
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 1159a1882d60e..77a8bd1e9fb9b 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -6,6 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    # ruff version should be kept in sync with .pre-commit-config.yaml
     - run: pip install --user ruff==0.1.3
     - run: ruff check --output-format=github .
     - run: ruff format --diff .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0576a158b4f1a..a1c811339adcc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,11 +12,13 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
+    # Version should be kept in sync with .github/workflows/ruff.yml
     rev: v0.1.3
     hooks:
       - id: ruff
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
+    # Version should be kept in sync with .github/workflows/codespell.yml
     rev: v2.2.6
     hooks:
       - id: codespell

From 781366e476af599a5b9038970bc19137ab40e766 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 31 Jan 2024 15:07:15 +1100
Subject: [PATCH 0812/3129] github/workflows: Standardise formatting of
 ruff.yml.

All the other workflow YAML files use vertical whitespace around top-level
items.

Also remove spurious comment, the features in the linked doc aren't
actually used in this workflow (any more?).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ruff.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 77a8bd1e9fb9b..29e9ddbf8b61a 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -1,6 +1,7 @@
-# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
 name: Python code lint and formatting with ruff
+
 on: [push, pull_request]
+
 jobs:
   ruff:
     runs-on: ubuntu-latest

From 2bdaa1bedede63ee2380aa5de67802cb5d2cfcd1 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Thu, 11 Jan 2024 22:43:41 +0100
Subject: [PATCH 0813/3129] docs/library/sys.rst: Document
 implementation.version.releaselevel.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 docs/library/sys.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index c8eb4b5c502b9..7b34a0e31c6bf 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -69,7 +69,7 @@ Constants
    MicroPython, it has following attributes:
 
    * *name* - string "micropython"
-   * *version* - tuple (major, minor, micro), e.g. (1, 7, 0)
+   * *version* - tuple (major, minor, micro, releaselevel), e.g. (1, 22, 0, '')
    * *_machine* - string describing the underlying machine
    * *_mpy* - supported mpy file-format version (optional attribute)
 
@@ -77,6 +77,9 @@ Constants
    Python implementations (note that it still may not exist in the very
    minimal ports).
 
+   Starting with version 1.22.0-preview, the fourth node *releaselevel* in
+   *implementation.version* is either an empty string or ``"preview"``.
+
    .. admonition:: Difference to CPython
       :class: attention
 

From 35dd959133fb233d75e9b3cddbf98b2ed01c6594 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Feb 2024 17:03:43 +1100
Subject: [PATCH 0814/3129] tools/manifestfile.py: Change library search to use
 a list of paths.

This commit changes how library packages are searched for when a manifest
file is loaded: there is now simply a list of library paths that is
searched in order for the given package.  This list defaults to the
main directories in micropython-lib, but can be added to -- either appended
or prepended -- by using `add_library()`.

In particular the way unix-ffi library packages are searched has changed,
because the `unix_ffi` argument to `require()` is now removed.  Instead, if
a build wants to include packages from micropython-lib/unix-ffi, then it
must explicitly add this to the list of paths to search using:

    add_library("unix-ffi", "$(MPY_LIB_DIR)/unix-ffi")

Work done in collaboration with Jim Mussared.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/manifest.rst | 17 ++++++++--
 tools/manifestfile.py       | 65 +++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/docs/reference/manifest.rst b/docs/reference/manifest.rst
index 9bcafd5839cab..1a80b1259e39f 100644
--- a/docs/reference/manifest.rst
+++ b/docs/reference/manifest.rst
@@ -95,6 +95,17 @@ Note: The ``opt`` keyword argument can be set on the various functions, this con
 the optimisation level used by the cross-compiler.
 See :func:`micropython.opt_level`.
 
+.. function:: add_library(library, library_path, prepend=False)
+
+    Register the path to an external named *library*.
+
+    The path *library_path* will be automatically searched when using `require`.
+    By default the added library is added to the end of the list of libraries to
+    search.  Pass ``True`` to *prepend* to add it to the start of the list.
+
+    Additionally, the added library can be explicitly requested by using
+    ``require("name", library="library")``.
+
 .. function:: package(package_path, files=None, base_path=".", opt=None)
 
     This is equivalent to copying the "package_path" directory to the device
@@ -138,11 +149,13 @@ See :func:`micropython.opt_level`.
 
     You can use the variables above, such as ``$(PORT_DIR)`` in ``base_path``.
 
-.. function:: require(name, unix_ffi=False)
+.. function:: require(name, library=None)
 
     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.
+    Optionally specify *library* (a string) to reference a package from a
+    library that has been previously registered with `add_library`. Otherwise
+    the list of library paths will be used.
 
 .. function:: include(manifest_path)
 
diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index aa85c4650f2a6..47403d4e3bc18 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -62,6 +62,9 @@
 # URL to file. (TODO)
 FILE_TYPE_HTTP = 2
 
+# Default list of libraries in micropython-lib to search for library packages.
+BASE_LIBRARY_NAMES = ("micropython", "python-stdlib", "python-ecosys")
+
 
 class ManifestFileError(Exception):
     pass
@@ -196,6 +199,12 @@ def __init__(self, mode, path_vars=None):
         self._metadata = [ManifestPackageMetadata()]
         # Registered external libraries.
         self._libraries = {}
+        # List of directories to search for packages.
+        self._library_dirs = []
+        # Add default micropython-lib libraries if $(MPY_LIB_DIR) has been specified.
+        if self._path_vars["MPY_LIB_DIR"]:
+            for lib in BASE_LIBRARY_NAMES:
+                self.add_library(lib, os.path.join("$(MPY_LIB_DIR)", lib))
 
     def _resolve_path(self, path):
         # Convert path to an absolute path, applying variable substitutions.
@@ -398,18 +407,16 @@ def _require_from_path(self, library_path, name, version, extra_kwargs):
                 return True
         return False
 
-    def require(self, name, version=None, unix_ffi=False, pypi=None, library=None, **kwargs):
+    def require(self, name, version=None, pypi=None, library=None, **kwargs):
         """
         Require a package by name from micropython-lib.
 
-        Optionally specify unix_ffi=True to use a module from the unix-ffi directory.
-
         Optionally specify pipy="package-name" to indicate that this should
         use the named package from PyPI when building for CPython.
 
         Optionally specify library="name" to reference a package from a
         library that has been previously registered with add_library(). Otherwise
-        micropython-lib will be used.
+        the list of library paths will be used.
         """
         self._metadata[-1].check_initialised(self._mode)
 
@@ -426,39 +433,35 @@ def require(self, name, version=None, unix_ffi=False, pypi=None, library=None, *
                 raise ValueError("Unknown library '{}' for require('{}').".format(library, name))
             library_path = self._libraries[library]
             # Search for {library_path}/**/{name}/manifest.py.
-            if not self._require_from_path(library_path, name, version, kwargs):
-                raise ValueError(
-                    "Package '{}' not found in external library '{}' ({}).".format(
-                        name, library, library_path
-                    )
+            if self._require_from_path(library_path, name, version, kwargs):
+                return
+            raise ValueError(
+                "Package '{}' not found in external library '{}' ({}).".format(
+                    name, library, library_path
                 )
-        elif self._path_vars["MPY_LIB_DIR"]:
-            # Find package in micropython-lib, in one of the three top-level directories.
-            lib_dirs = ["micropython", "python-stdlib", "python-ecosys"]
-            if unix_ffi:
-                # Additionally 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:
-                # Search for {lib_dir}/**/{name}/manifest.py.
-                if self._require_from_path(
-                    os.path.join(self._path_vars["MPY_LIB_DIR"], lib_dir), name, version, kwargs
-                ):
-                    return
-
-            raise ValueError("Package '{}' 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 add_library(self, library, library_path):
+        for lib_dir in self._library_dirs:
+            # Search for {lib_dir}/**/{name}/manifest.py.
+            if self._require_from_path(lib_dir, name, version, kwargs):
+                return
+
+        raise ValueError("Package '{}' not found in any known library.".format(name))
+
+    def add_library(self, library, library_path, prepend=False):
         """
         Register the path to an external named library.
 
-        This allows require("name", library="library") to find packages in that library.
+        The path will be automatically searched when using require().  By default the
+        added library is added to the end of the list of libraries to search.  Pass
+        `prepend=True` to add it to the start of the list.
+
+        Additionally, the added library can be explicitly requested by using
+        `require("name", library="library")`.
         """
-        self._libraries[library] = self._resolve_path(library_path)
+        library_path = self._resolve_path(library_path)
+        self._libraries[library] = library_path
+        self._library_dirs.insert(0 if prepend else len(self._library_dirs), library_path)
 
     def package(self, package_path, files=None, base_path=".", opt=None):
         """

From 8cbae12d0d84ebce76b305d2f5535f327d5d44be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Feb 2024 17:08:32 +1100
Subject: [PATCH 0815/3129] unix/variants: Prefer unix-ffi packages when
 loading the manifest.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/coverage/manifest.py | 1 +
 ports/unix/variants/manifest.py          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py
index 556d445d752ea..37f2531a842f8 100644
--- a/ports/unix/variants/coverage/manifest.py
+++ b/ports/unix/variants/coverage/manifest.py
@@ -1,3 +1,4 @@
+add_library("unix-ffi", "$(MPY_LIB_DIR)/unix-ffi")
 freeze_as_str("frzstr")
 freeze_as_mpy("frzmpy")
 freeze_mpy("$(MPY_DIR)/tests/frozen")
diff --git a/ports/unix/variants/manifest.py b/ports/unix/variants/manifest.py
index 88cc1ad8e50ef..649b1e4c464fb 100644
--- a/ports/unix/variants/manifest.py
+++ b/ports/unix/variants/manifest.py
@@ -1,2 +1,3 @@
+add_library("unix-ffi", "$(MPY_LIB_DIR)/unix-ffi")
 require("mip-cmdline")
 require("ssl")

From b4f59984f7668db457280c1f4007618fd1d235f6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Feb 2024 16:52:01 +1100
Subject: [PATCH 0816/3129] extmod/btstack: Reset pending_value_handle before
 calling write-done cb.

The pending_value_handle needs to be freed and reset before calling
mp_bluetooth_gattc_on_read_write_status(), which will call the Python IRQ
handler, which may in turn call back into BTstack to perform an action like
a write.  In that case the pending_value_handle will need to be available
for the write/read/etc to proceed.

Fixes issue #13611.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/modbluetooth_btstack.c      |   3 +-
 tests/multi_bluetooth/ble_irq_calls.py     | 200 +++++++++++++++++++++
 tests/multi_bluetooth/ble_irq_calls.py.exp |  31 ++++
 3 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 tests/multi_bluetooth/ble_irq_calls.py
 create mode 100644 tests/multi_bluetooth/ble_irq_calls.py.exp

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 211214768f7eb..08d64ab0123ce 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -490,11 +490,12 @@ STATIC void btstack_packet_handler_write_with_response(uint8_t packet_type, uint
         if (!conn) {
             return;
         }
-        mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE, conn_handle, conn->pending_value_handle, status);
+        uint16_t value_handle = conn->pending_value_handle;
         conn->pending_value_handle = 0xffff;
         m_del(uint8_t, conn->pending_write_value, conn->pending_write_value_len);
         conn->pending_write_value = NULL;
         conn->pending_write_value_len = 0;
+        mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE, conn_handle, value_handle, status);
     }
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
diff --git a/tests/multi_bluetooth/ble_irq_calls.py b/tests/multi_bluetooth/ble_irq_calls.py
new file mode 100644
index 0000000000000..131ea909295db
--- /dev/null
+++ b/tests/multi_bluetooth/ble_irq_calls.py
@@ -0,0 +1,200 @@
+# Test calling BLE methods from within the BLE.irq event handler.
+
+from micropython import const
+import struct
+import time
+import bluetooth
+
+_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)
+_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_MTU_EXCHANGED = const(21)
+_IRQ_GET_SECRET = const(29)
+_IRQ_SET_SECRET = const(30)
+
+EVENT_NAMES = {
+    1: "_IRQ_CENTRAL_CONNECT",
+    2: "_IRQ_CENTRAL_DISCONNECT",
+    3: "_IRQ_GATTS_WRITE",
+    4: "_IRQ_GATTS_READ_REQUEST",
+    7: "_IRQ_PERIPHERAL_CONNECT",
+    8: "_IRQ_PERIPHERAL_DISCONNECT",
+    9: "_IRQ_GATTC_SERVICE_RESULT",
+    10: "_IRQ_GATTC_SERVICE_DONE",
+    11: "_IRQ_GATTC_CHARACTERISTIC_RESULT",
+    12: "_IRQ_GATTC_CHARACTERISTIC_DONE",
+    13: "_IRQ_GATTC_DESCRIPTOR_RESULT",
+    14: "_IRQ_GATTC_DESCRIPTOR_DONE",
+    15: "_IRQ_GATTC_READ_RESULT",
+    16: "_IRQ_GATTC_READ_DONE",
+    17: "_IRQ_GATTC_WRITE_DONE",
+    18: "_IRQ_GATTC_NOTIFY",
+    21: "_IRQ_MTU_EXCHANGED",
+}
+
+_ADV_TYPE_FLAGS = const(0x01)
+_ADV_TYPE_NAME = const(0x09)
+_ADV_TYPE_UUID128_COMPLETE = const(0x7)
+
+_NOTIFY_ENABLE = const(1)
+
+ACCESSORY_UUID = bluetooth.UUID("a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a")
+STATE_UUID = bluetooth.UUID("a5a5a5a5-eeee-9999-1111-5a5a5a5a5a5a")
+CCC_UUID = bluetooth.UUID(0x2902)
+
+STATE_CHARACTERISTIC = (
+    STATE_UUID,
+    bluetooth.FLAG_READ | bluetooth.FLAG_NOTIFY,
+)
+
+ACCESSORY_SERVICE = (ACCESSORY_UUID, (STATE_CHARACTERISTIC,))
+
+
+class Central:
+    def __init__(self):
+        self.done = False
+        self._conn_handle = None
+        self._service = None
+        self._characteristic = None
+        self._cccd_handle = None
+        ble.active(1)
+        ble.irq(self._ble_event_handler)
+        ble.gap_connect(*BDADDR)
+
+    def _ble_event_handler(self, event, data):
+        print(EVENT_NAMES[event])
+
+        if event == _IRQ_PERIPHERAL_CONNECT:
+            conn_handle, _, _ = data
+            self._conn_handle = conn_handle
+            ble.gattc_discover_services(self._conn_handle, ACCESSORY_UUID)
+
+        elif event == _IRQ_PERIPHERAL_DISCONNECT:
+            conn_handle, _, addr = data
+            assert self._conn_handle == conn_handle
+            self._conn_handle = None
+            print("connection closed")
+
+        elif event == _IRQ_GATTC_SERVICE_RESULT:
+            _, first_handle, last_handle, uuid = data
+            print("service found:", last_handle - first_handle, uuid)
+            if uuid == ACCESSORY_UUID:
+                assert self._service is None
+                self._service = (first_handle, last_handle)
+
+        elif event == _IRQ_GATTC_SERVICE_DONE:
+            print("service handle range:", self._service[1] - self._service[0])
+            start_handle, end_handle = self._service
+            ble.gattc_discover_characteristics(self._conn_handle, start_handle, end_handle)
+
+        elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+            _, end_handle, value_handle, properties, uuid = data
+            assert uuid == STATE_UUID
+            print("characteristic found:", uuid)
+            self._characteristic = (end_handle, value_handle, properties)
+
+        elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+            start_handle, end_handle = self._service
+            ble.gattc_discover_descriptors(self._conn_handle, start_handle, end_handle)
+
+        elif event == _IRQ_GATTC_DESCRIPTOR_RESULT:
+            _, dsc_handle, uuid = data
+            if uuid == CCC_UUID:
+                print("CCCD found:", uuid)
+                assert self._cccd_handle is None
+                self._cccd_handle = dsc_handle
+
+        elif event == _IRQ_GATTC_DESCRIPTOR_DONE:
+            # Discovery complete, proceed to MTU exchange.
+            ble.gattc_exchange_mtu(self._conn_handle)
+
+        elif event == _IRQ_MTU_EXCHANGED:
+            # MTU exchanged, proceed to enable CCCD.
+            print("CCCD write")
+            ble.gattc_write(
+                self._conn_handle, self._cccd_handle, struct.pack("<h", _NOTIFY_ENABLE), 1
+            )
+
+        elif event == _IRQ_GATTC_WRITE_DONE:
+            conn_handle, _, result = data
+            print("CCCD write result:", result)
+            _, state_handle, _ = self._characteristic
+            print("issue gattc_read")
+            ble.gattc_read(self._conn_handle, state_handle)
+
+        elif event == _IRQ_GATTC_READ_RESULT:
+            _, _, char_data = data
+            print("gattc_read result:", bytes(char_data))
+
+        elif event == _IRQ_GATTC_READ_DONE:
+            self.done = True
+            ble.gap_disconnect(self._conn_handle)
+
+
+class Peripheral:
+    def __init__(self):
+        self.done = False
+        ble.active(1)
+        ble.irq(self._ble_event_handler)
+        ble.gatts_register_services((ACCESSORY_SERVICE,))
+        add_payload = self.advertising_payload("acc", (ACCESSORY_UUID,))
+        ble.gap_advertise(500000, add_payload)
+
+    def advertising_payload(self, name, services):
+        payload = bytearray()
+
+        def _append(adv_type, value):
+            nonlocal payload
+            payload.extend(struct.pack("BB", len(value) + 1, adv_type) + value)
+
+        _append(_ADV_TYPE_FLAGS, struct.pack("B", 0x02 + 0x04))
+        _append(_ADV_TYPE_NAME, name)
+
+        for uuid in services:
+            b = bytes(uuid)
+            assert len(b) == 16
+            _append(_ADV_TYPE_UUID128_COMPLETE, b)
+
+        return payload
+
+    def _ble_event_handler(self, event, data):
+        if event not in (_IRQ_GET_SECRET, _IRQ_SET_SECRET):
+            print(EVENT_NAMES[event])
+        if event == _IRQ_CENTRAL_DISCONNECT:
+            self.done = True
+
+
+# Acting in peripheral role.
+def instance0():
+    print("peripheral start")
+    peripheral = Peripheral()
+    multitest.globals(BDADDR=ble.config("mac"))
+    multitest.next()
+    while not peripheral.done:
+        time.sleep_ms(100)
+    multitest.broadcast("finished")
+    ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    print("central start")
+    multitest.next()
+    central = Central()
+    while not central.done:
+        time.sleep_ms(100)
+    multitest.wait("finished")
+    ble.active(0)
+
+
+ble = bluetooth.BLE()
diff --git a/tests/multi_bluetooth/ble_irq_calls.py.exp b/tests/multi_bluetooth/ble_irq_calls.py.exp
new file mode 100644
index 0000000000000..85d2f585adbb4
--- /dev/null
+++ b/tests/multi_bluetooth/ble_irq_calls.py.exp
@@ -0,0 +1,31 @@
+--- instance0 ---
+peripheral start
+_IRQ_CENTRAL_CONNECT
+_IRQ_MTU_EXCHANGED
+_IRQ_GATTS_READ_REQUEST
+_IRQ_CENTRAL_DISCONNECT
+--- instance1 ---
+central start
+_IRQ_PERIPHERAL_CONNECT
+_IRQ_GATTC_SERVICE_RESULT
+service found: 3 UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+_IRQ_GATTC_SERVICE_DONE
+service handle range: 3
+_IRQ_GATTC_CHARACTERISTIC_RESULT
+characteristic found: UUID('a5a5a5a5-eeee-9999-1111-5a5a5a5a5a5a')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+_IRQ_GATTC_DESCRIPTOR_RESULT
+_IRQ_GATTC_DESCRIPTOR_RESULT
+_IRQ_GATTC_DESCRIPTOR_RESULT
+CCCD found: UUID(0x2902)
+_IRQ_GATTC_DESCRIPTOR_DONE
+_IRQ_MTU_EXCHANGED
+CCCD write
+_IRQ_GATTC_WRITE_DONE
+CCCD write result: 0
+issue gattc_read
+_IRQ_GATTC_READ_RESULT
+gattc_read result: b''
+_IRQ_GATTC_READ_DONE
+_IRQ_PERIPHERAL_DISCONNECT
+connection closed

From abe43fe6873bf78c98634eac74de646f70ec0d32 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 11 Feb 2024 15:08:08 +1100
Subject: [PATCH 0817/3129] extmod/btstack: Reset pending_value_handle before
 calling read-done cb.

Similar to the previous commit but for MP_BLUETOOTH_IRQ_GATTC_READ_DONE:
the pending_value_handle needs to be reset before calling
mp_bluetooth_gattc_on_read_write_status(), which will call the Python IRQ
handler, which may in turn call back into BTstack to perform an action like
a write.  In that case the pending_value_handle will need to be available
for the write/read/etc to proceed.

Fixes issue #13634.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/modbluetooth_btstack.c      |  3 ++-
 tests/multi_bluetooth/ble_irq_calls.py     | 18 ++++++++++++------
 tests/multi_bluetooth/ble_irq_calls.py.exp |  4 ++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 08d64ab0123ce..b3d349c2dc947 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -462,8 +462,9 @@ STATIC void btstack_packet_handler_read(uint8_t packet_type, uint16_t channel, u
         if (!conn) {
             return;
         }
-        mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_READ_DONE, conn_handle, conn->pending_value_handle, status);
+        uint16_t value_handle = conn->pending_value_handle;
         conn->pending_value_handle = 0xffff;
+        mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_READ_DONE, conn_handle, value_handle, status);
     } else if (event_type == GATT_EVENT_CHARACTERISTIC_VALUE_QUERY_RESULT) {
         DEBUG_printf("  --> gatt characteristic value query result\n");
         uint16_t conn_handle = gatt_event_characteristic_value_query_result_get_handle(packet);
diff --git a/tests/multi_bluetooth/ble_irq_calls.py b/tests/multi_bluetooth/ble_irq_calls.py
index 131ea909295db..c8c673daab31d 100644
--- a/tests/multi_bluetooth/ble_irq_calls.py
+++ b/tests/multi_bluetooth/ble_irq_calls.py
@@ -65,8 +65,9 @@ def __init__(self):
         self.done = False
         self._conn_handle = None
         self._service = None
-        self._characteristic = None
+        self._characteristic_handle = None
         self._cccd_handle = None
+        self._reads_remaining = None
         ble.active(1)
         ble.irq(self._ble_event_handler)
         ble.gap_connect(*BDADDR)
@@ -101,7 +102,8 @@ def _ble_event_handler(self, event, data):
             _, end_handle, value_handle, properties, uuid = data
             assert uuid == STATE_UUID
             print("characteristic found:", uuid)
-            self._characteristic = (end_handle, value_handle, properties)
+            assert self._characteristic_handle is None
+            self._characteristic_handle = value_handle
 
         elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
             start_handle, end_handle = self._service
@@ -128,17 +130,21 @@ def _ble_event_handler(self, event, data):
         elif event == _IRQ_GATTC_WRITE_DONE:
             conn_handle, _, result = data
             print("CCCD write result:", result)
-            _, state_handle, _ = self._characteristic
             print("issue gattc_read")
-            ble.gattc_read(self._conn_handle, state_handle)
+            self._reads_remaining = 2
+            ble.gattc_read(self._conn_handle, self._characteristic_handle)
 
         elif event == _IRQ_GATTC_READ_RESULT:
             _, _, char_data = data
             print("gattc_read result:", bytes(char_data))
 
         elif event == _IRQ_GATTC_READ_DONE:
-            self.done = True
-            ble.gap_disconnect(self._conn_handle)
+            self._reads_remaining -= 1
+            if self._reads_remaining > 0:
+                ble.gattc_read(self._conn_handle, self._characteristic_handle)
+            else:
+                self.done = True
+                ble.gap_disconnect(self._conn_handle)
 
 
 class Peripheral:
diff --git a/tests/multi_bluetooth/ble_irq_calls.py.exp b/tests/multi_bluetooth/ble_irq_calls.py.exp
index 85d2f585adbb4..d655c507d34f1 100644
--- a/tests/multi_bluetooth/ble_irq_calls.py.exp
+++ b/tests/multi_bluetooth/ble_irq_calls.py.exp
@@ -3,6 +3,7 @@ peripheral start
 _IRQ_CENTRAL_CONNECT
 _IRQ_MTU_EXCHANGED
 _IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_READ_REQUEST
 _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 central start
@@ -27,5 +28,8 @@ issue gattc_read
 _IRQ_GATTC_READ_RESULT
 gattc_read result: b''
 _IRQ_GATTC_READ_DONE
+_IRQ_GATTC_READ_RESULT
+gattc_read result: b''
+_IRQ_GATTC_READ_DONE
 _IRQ_PERIPHERAL_DISCONNECT
 connection closed

From 0432f73206a0d0ff5cef5dc6146f18439079f6f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Feb 2024 11:56:24 +1100
Subject: [PATCH 0818/3129] tools/mpy-tool.py: Fix static qstrs when freezing
 without qstr header.

It's rare to freeze .mpy files without specifying a qstr header from a
firmware build, but it can be useful for testing, eg
`mpy-tool.py -f test.mpy`.  Fix this case so static qstrs are properly
excluded from the frozen qstr list.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 519462ec80157..a656cccd69d0f 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1795,7 +1795,7 @@ def main():
     else:
         config.MICROPY_QSTR_BYTES_IN_LEN = 1
         config.MICROPY_QSTR_BYTES_IN_HASH = 1
-        firmware_qstr_idents = set(qstrutil.static_qstr_list)
+        firmware_qstr_idents = set(qstrutil.static_qstr_list_ident)
 
     # Create initial list of global qstrs.
     global_qstrs = GlobalQStrList()

From be8d660fc24c3390aedd156b796a3a88ae737ae9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 13 Feb 2024 08:33:45 +0100
Subject: [PATCH 0819/3129] mimxrt: Fix header include guard names.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/cyw43_configport.h | 6 +++---
 ports/mimxrt/pendsv.h           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/mimxrt/cyw43_configport.h b/ports/mimxrt/cyw43_configport.h
index f1cfc86cb067b..619db24b1b579 100644
--- a/ports/mimxrt/cyw43_configport.h
+++ b/ports/mimxrt/cyw43_configport.h
@@ -24,8 +24,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STM32_CYW43_CONFIGPORT_H
-#define MICROPY_INCLUDED_STM32_CYW43_CONFIGPORT_H
+#ifndef MICROPY_INCLUDED_MIMXRT_CYW43_CONFIGPORT_H
+#define MICROPY_INCLUDED_MIMXRT_CYW43_CONFIGPORT_H
 
 // The board-level config will be included here, so it can set some CYW43 values.
 #include "py/mpconfig.h"
@@ -152,4 +152,4 @@ static inline int cyw43_sdio_transfer_cmd53(bool write, uint32_t block_size, uin
 
 #define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK
 
-#endif // MICROPY_INCLUDED_STM32_CYW43_CONFIGPORT_H
+#endif // MICROPY_INCLUDED_MIMXRT_CYW43_CONFIGPORT_H
diff --git a/ports/mimxrt/pendsv.h b/ports/mimxrt/pendsv.h
index f3369b07fefdc..d68c5aa2d5d58 100644
--- a/ports/mimxrt/pendsv.h
+++ b/ports/mimxrt/pendsv.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_PENDSV_H
-#define MICROPY_INCLUDED_STM32_PENDSV_H
+#ifndef MICROPY_INCLUDED_MIMXRT_PENDSV_H
+#define MICROPY_INCLUDED_MIMXRT_PENDSV_H
 
 enum {
     PENDSV_DISPATCH_SOFT_TIMER,  // For later & for having at least one entry
@@ -45,4 +45,4 @@ 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
+#endif // MICROPY_INCLUDED_MIMXRT_PENDSV_H

From d2a3cd7ac4283045b3692ae8d83afe833fbe65e6 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Fri, 9 Feb 2024 14:03:00 +0900
Subject: [PATCH 0820/3129] embed: Improve stack top estimation.

Obtaining the stack-top via a few function calls may yield a pointer which
is too deep within the stack.  So require the user to obtain it from a
higher level (or via some other means).

Fixes issue #11781.

Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
---
 examples/embedding/main.c            | 9 ++++++++-
 ports/embed/port/embed_util.c        | 4 ++--
 ports/embed/port/micropython_embed.h | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/examples/embedding/main.c b/examples/embedding/main.c
index ee673fc93a687..7530580369ad4 100644
--- a/examples/embedding/main.c
+++ b/examples/embedding/main.c
@@ -31,7 +31,14 @@ static char heap[8 * 1024];
 
 int main() {
     // Initialise MicroPython.
-    mp_embed_init(&heap[0], sizeof(heap));
+    //
+    // Note: &stack_top below should be good enough for many cases.
+    // However, depending on environment, there might be more appropriate
+    // ways to get the stack top value.
+    // eg. pthread_get_stackaddr_np, pthread_getattr_np,
+    // __builtin_frame_address/__builtin_stack_address, etc.
+    int stack_top;
+    mp_embed_init(&heap[0], sizeof(heap), &stack_top);
 
     // Run the example scripts (they will be compiled first).
     mp_embed_exec_str(example_1);
diff --git a/ports/embed/port/embed_util.c b/ports/embed/port/embed_util.c
index 14f50897705e8..c5bc8c973bb02 100644
--- a/ports/embed/port/embed_util.c
+++ b/ports/embed/port/embed_util.c
@@ -34,8 +34,8 @@
 #include "port/micropython_embed.h"
 
 // Initialise the runtime.
-void mp_embed_init(void *gc_heap, size_t gc_heap_size) {
-    mp_stack_ctrl_init();
+void mp_embed_init(void *gc_heap, size_t gc_heap_size, void *stack_top) {
+    mp_stack_set_top(stack_top);
     gc_init(gc_heap, (uint8_t *)gc_heap + gc_heap_size);
     mp_init();
 }
diff --git a/ports/embed/port/micropython_embed.h b/ports/embed/port/micropython_embed.h
index bf55d9b2b4454..09341c93e4e98 100644
--- a/ports/embed/port/micropython_embed.h
+++ b/ports/embed/port/micropython_embed.h
@@ -29,7 +29,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-void mp_embed_init(void *gc_heap, size_t gc_heap_size);
+void mp_embed_init(void *gc_heap, size_t gc_heap_size, void *stack_top);
 void mp_embed_deinit(void);
 
 // Only available if MICROPY_ENABLE_COMPILER is enabled.

From 587b6f2e346eb0ab4c330f27fb144d9025ac9426 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Tue, 30 Jan 2024 09:37:10 +0100
Subject: [PATCH 0821/3129] extmod/modrandom: Add integer type casts where
 appropriate.

To prevent compiler warnings when `mp_int_t` is 64-bits.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 extmod/modrandom.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extmod/modrandom.c b/extmod/modrandom.c
index e65f31488bfeb..d66f1c9c46dce 100644
--- a/extmod/modrandom.c
+++ b/extmod/modrandom.c
@@ -86,7 +86,7 @@ STATIC uint32_t yasmarang_randbelow(uint32_t n) {
 #endif
 
 STATIC mp_obj_t mod_random_getrandbits(mp_obj_t num_in) {
-    int n = mp_obj_get_int(num_in);
+    mp_int_t n = mp_obj_get_int(num_in);
     if (n > 32 || n < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("bits must be 32 or less"));
     }
@@ -111,7 +111,7 @@ STATIC mp_obj_t mod_random_seed(size_t n_args, const mp_obj_t *args) {
     } else {
         seed = mp_obj_get_int_truncated(args[0]);
     }
-    yasmarang_pad = seed;
+    yasmarang_pad = (uint32_t)seed;
     yasmarang_n = 69;
     yasmarang_d = 233;
     yasmarang_dat = 0;
@@ -126,7 +126,7 @@ STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         // range(stop)
         if (start > 0) {
-            return mp_obj_new_int(yasmarang_randbelow(start));
+            return mp_obj_new_int(yasmarang_randbelow((uint32_t)start));
         } else {
             goto error;
         }
@@ -135,7 +135,7 @@ STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
         if (n_args == 2) {
             // range(start, stop)
             if (start < stop) {
-                return mp_obj_new_int(start + yasmarang_randbelow(stop - start));
+                return mp_obj_new_int(start + yasmarang_randbelow((uint32_t)(stop - start)));
             } else {
                 goto error;
             }
@@ -151,7 +151,7 @@ STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
                 goto error;
             }
             if (n > 0) {
-                return mp_obj_new_int(start + step * yasmarang_randbelow(n));
+                return mp_obj_new_int(start + step * yasmarang_randbelow((uint32_t)n));
             } else {
                 goto error;
             }
@@ -167,7 +167,7 @@ STATIC mp_obj_t mod_random_randint(mp_obj_t a_in, mp_obj_t b_in) {
     mp_int_t a = mp_obj_get_int(a_in);
     mp_int_t b = mp_obj_get_int(b_in);
     if (a <= b) {
-        return mp_obj_new_int(a + yasmarang_randbelow(b - a + 1));
+        return mp_obj_new_int(a + yasmarang_randbelow((uint32_t)(b - a + 1)));
     } else {
         mp_raise_ValueError(NULL);
     }
@@ -177,7 +177,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_randint_obj, mod_random_randint);
 STATIC mp_obj_t mod_random_choice(mp_obj_t seq) {
     mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
     if (len > 0) {
-        return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow(len)), MP_OBJ_SENTINEL);
+        return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow((uint32_t)len)), MP_OBJ_SENTINEL);
     } else {
         mp_raise_type(&mp_type_IndexError);
     }

From 5d83bbca60ea3f4071b9245daf8a41296072f918 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Tue, 30 Jan 2024 09:46:17 +0100
Subject: [PATCH 0822/3129] shared/timeutils: Remove useless void-return.

The C99 standard states:

    6.8.6.4 The return statement Constraints

    A return statement with an expression shall not appear in a function
    whose return type is void.  A return statement without an expression
    shall only appear in a function whose return type is void.

And when `-pedantic` is enabled the compiler gives an error.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 shared/timeutils/timeutils.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/timeutils/timeutils.h b/shared/timeutils/timeutils.h
index 9f4b500caa7b6..69cbd95df53a6 100644
--- a/shared/timeutils/timeutils.h
+++ b/shared/timeutils/timeutils.h
@@ -60,7 +60,7 @@ mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
 
 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);
+    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) {

From 00ba6aaae4c815fc9685defc37a5df1424180c0e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 18 Jan 2024 08:52:16 +1100
Subject: [PATCH 0823/3129] ports: On cold boot, enable USB after boot.py
 completes.

For mimxrt, nrf, renesas-ra, rp2 and samd ports, this commit implements
similar behaviour to the stm32 port, where USB is only brought up after
boot.py completes execution.

Currently this doesn't add any useful functionality (and may break
workflows that depend on USB-CDC being live in boot.py), however it's a
precondition for more usable workflows with USB devices defined in
Python (allows setting up USB interfaces in boot.py before the device
enumerates for the first time).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/mimxrt/main.c             |  6 ++++--
 ports/nrf/drivers/usb/usb_cdc.c |  4 ++--
 ports/nrf/main.c                |  6 ++++--
 ports/renesas-ra/main.c         | 18 ++++++++++--------
 ports/rp2/main.c                | 12 +++++++-----
 ports/samd/main.c               |  4 ++++
 ports/samd/samd_soc.c           |  2 --
 shared/tinyusb/mp_usbd.h        |  7 +++++++
 8 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 376d72f197f30..761c491742bcf 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -34,8 +34,8 @@
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/runtime/softtimer.h"
+#include "shared/tinyusb/mp_usbd.h"
 #include "ticks.h"
-#include "tusb.h"
 #include "led.h"
 #include "pendsv.h"
 #include "modmachine.h"
@@ -63,7 +63,6 @@ void board_init(void);
 int main(void) {
     board_init();
     ticks_init();
-    tusb_init();
     pendsv_init();
 
     #if MICROPY_PY_LWIP
@@ -115,6 +114,9 @@ int main(void) {
 
         // Execute user scripts.
         int ret = pyexec_file_if_exists("boot.py");
+
+        mp_usbd_init();
+
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
         }
diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index 3ca2acbf3dba2..aef7354972722 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -29,7 +29,6 @@
 
 #if MICROPY_HW_USB_CDC
 
-#include "tusb.h"
 #include "nrfx.h"
 #include "nrfx_power.h"
 #include "nrfx_uart.h"
@@ -37,6 +36,7 @@
 #include "py/stream.h"
 #include "py/runtime.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared/tinyusb/mp_usbd.h"
 
 #ifdef BLUETOOTH_SD
 #include "nrf_sdm.h"
@@ -186,7 +186,7 @@ int usb_cdc_init(void)
     tx_ringbuf.iget = 0;
     tx_ringbuf.iput = 0;
 
-    tusb_init();
+    mp_usbd_init();
 
     return 0;
 }
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 9809ba0e23fc0..dd9f232b80c55 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -261,13 +261,15 @@ void NORETURN _start(void) {
 
     led_state(1, 0);
 
+    #if MICROPY_VFS || MICROPY_MBFS || MICROPY_MODULE_FROZEN
+    ret = pyexec_file_if_exists("boot.py");
+    #endif
+
     #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.
-    ret = pyexec_file_if_exists("boot.py");
     if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
         pyexec_file_if_exists("main.py");
     }
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index 761420423e2cf..5925606f9c770 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -36,6 +36,7 @@
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/runtime/softtimer.h"
+#include "shared/tinyusb/mp_usbd.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/littlefs/lfs1.h"
 #include "lib/littlefs/lfs1_util.h"
@@ -63,7 +64,6 @@
 #include "usrsw.h"
 #include "rtc.h"
 #include "storage.h"
-#include "tusb.h"
 #if MICROPY_PY_LWIP
 #include "lwip/init.h"
 #include "lwip/apps/mdns.h"
@@ -270,10 +270,6 @@ int main(void) {
     state.reset_mode = 1;
     state.log_soft_reset = false;
 
-    #if MICROPY_HW_ENABLE_USBDEV
-    tusb_init();
-    #endif
-
     #if MICROPY_PY_BLUETOOTH
     mp_bluetooth_hci_init();
     #endif
@@ -366,14 +362,20 @@ int main(void) {
     #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;
-    }
+    int boot_res = MICROPY_BOARD_RUN_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.
 
+    #if MICROPY_HW_ENABLE_USBDEV
+    mp_usbd_init();
+    #endif
+
+    if (boot_res == BOARDCTRL_GOTO_SOFT_RESET_EXIT) {
+        goto soft_reset_exit;
+    }
+
     // At this point everything is fully configured and initialised.
 
     // Run main.py (or whatever else a board configures at this stage).
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index e63b8c03f07fc..70a67066fc9d7 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -38,7 +38,7 @@
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/runtime/softtimer.h"
-#include "tusb.h"
+#include "shared/tinyusb/mp_usbd.h"
 #include "uart.h"
 #include "modmachine.h"
 #include "modrp2.h"
@@ -86,12 +86,9 @@ int main(int argc, char **argv) {
     #endif
     #endif
 
-    #if MICROPY_HW_ENABLE_USBDEV
-    #if MICROPY_HW_USB_CDC
+    #if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
     bi_decl(bi_program_feature("USB REPL"))
     #endif
-    tusb_init();
-    #endif
 
     #if MICROPY_PY_THREAD
     bi_decl(bi_program_feature("thread support"))
@@ -181,6 +178,11 @@ int main(int argc, char **argv) {
 
         // Execute user scripts.
         int ret = pyexec_file_if_exists("boot.py");
+
+        #if MICROPY_HW_ENABLE_USBDEV
+        mp_usbd_init();
+        #endif
+
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
         }
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 74eb5e328526b..f051e961ffa24 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -33,6 +33,7 @@
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/runtime/softtimer.h"
+#include "shared/tinyusb/mp_usbd.h"
 
 extern uint8_t _sstack, _estack, _sheap, _eheap;
 extern void adc_deinit_all(void);
@@ -56,6 +57,9 @@ void samd_main(void) {
 
         // Execute user scripts.
         int ret = pyexec_file_if_exists("boot.py");
+
+        mp_usbd_init();
+
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
         }
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 259640e93db0d..5e6c5c4fc2407 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -62,8 +62,6 @@ static void usb_init(void) {
     PORT->Group[0].PMUX[12].reg = alt << 4 | alt;
     PORT->Group[0].PINCFG[24].reg = PORT_PINCFG_PMUXEN;
     PORT->Group[0].PINCFG[25].reg = PORT_PINCFG_PMUXEN;
-
-    tusb_init();
 }
 
 // Initialize the µs counter on TC 0/1 or TC4/5
diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 83a8f8617c08d..89f8bf0ee953b 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -28,6 +28,13 @@
 #define MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_H
 
 #include "py/obj.h"
+#include "tusb.h"
+
+static inline void mp_usbd_init(void) {
+    // Currently this is a thin wrapper around tusb_init(), however
+    // runtime USB support will require this to be extended.
+    tusb_init();
+}
 
 // Call this to explicitly run the TinyUSB device task.
 void mp_usbd_task(void);

From 34097b776e00e81bcf2fdd3a2b13472a6085dee9 Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Sat, 10 Feb 2024 14:59:26 -0800
Subject: [PATCH 0824/3129] esp32/network_ppp: Make PPP support optional.

PPP is not that commonly used, let it be turned off in the board config to
save space.  It is still on by default.

On an basic ESP32-S3 build, turning off PPP with LWIP still on saves ~35 kB
of codend 4 kB of data.

   text    data     bss     dec     hex filename
1321257  304296 2941433 4566986  45afca before-ppp-off.elf
1285101  299920 2810305 4395326  43113e after-ppp-off.elf
-------------------------------
-36156    -4376     -56

Note that the BSS segment size includes all NOBITS sections in ELF file.
Some of these are aligned to 64kB chunk sized dummy blocks, I think for
alignment to MMU boundaries, and these went down by 1 block each, so 128
kiB of BSS is not really part of the binary size reduction.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 ports/esp32/modnetwork_globals.h | 2 ++
 ports/esp32/network_ppp.c        | 4 ++++
 ports/esp32/ppp_set_auth.c       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index c6369ab9a79aa..56e5341915bfc 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -7,7 +7,9 @@
 #if MICROPY_PY_NETWORK_LAN
 { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&esp_network_get_lan_obj) },
 #endif
+#if defined(CONFIG_ESP_NETIF_TCPIP_LWIP) && defined(CONFIG_LWIP_PPP_SUPPORT)
 { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&esp_network_ppp_make_new_obj) },
+#endif
 { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_network_phy_mode_obj) },
 
 #if MICROPY_PY_NETWORK_WLAN
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 0d8046c97df82..08443752cc26c 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -43,6 +43,8 @@
 #include "lwip/dns.h"
 #include "netif/ppp/pppapi.h"
 
+#if defined(CONFIG_ESP_NETIF_TCPIP_LWIP) && defined(CONFIG_LWIP_PPP_SUPPORT)
+
 #define PPP_CLOSE_TIMEOUT_MS (4000)
 
 typedef struct _ppp_if_obj_t {
@@ -341,3 +343,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     locals_dict, &ppp_if_locals_dict
     );
+
+#endif
diff --git a/ports/esp32/ppp_set_auth.c b/ports/esp32/ppp_set_auth.c
index 88ab668d48d3a..dc2a3dcd78660 100644
--- a/ports/esp32/ppp_set_auth.c
+++ b/ports/esp32/ppp_set_auth.c
@@ -9,7 +9,7 @@
 
 #include "ppp_set_auth.h"
 
-#ifdef CONFIG_ESP_NETIF_TCPIP_LWIP
+#if defined(CONFIG_ESP_NETIF_TCPIP_LWIP) && defined(CONFIG_LWIP_PPP_SUPPORT)
 
 #include "netif/ppp/pppapi.h"
 

From c27d304bed737ef0315ca695323f7adc42e61ba9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Feb 2024 12:39:27 +1100
Subject: [PATCH 0825/3129] esp32/mpnimbleport: Release the GIL while doing
 NimBLE port deinit.

In case callbacks must run (eg a disconnect event happens during the
deinit) and the GIL must be obtained to run the callback.

Fixes part of issue #12349.

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

diff --git a/ports/esp32/mpnimbleport.c b/ports/esp32/mpnimbleport.c
index 8235275be6fd6..5b57edf3c1c19 100644
--- a/ports/esp32/mpnimbleport.c
+++ b/ports/esp32/mpnimbleport.c
@@ -63,6 +63,11 @@ void mp_bluetooth_nimble_port_start(void) {
 void mp_bluetooth_nimble_port_shutdown(void) {
     DEBUG_printf("mp_bluetooth_nimble_port_shutdown\n");
 
+    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK
+    // Release the GIL so any callbacks can run during the shutdown calls below.
+    MP_THREAD_GIL_EXIT();
+    #endif
+
     // 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();
@@ -70,6 +75,10 @@ void mp_bluetooth_nimble_port_shutdown(void) {
     // Shuts down the event queue.
     nimble_port_deinit();
 
+    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK
+    MP_THREAD_GIL_ENTER();
+    #endif
+
     // Mark stack as shutdown.
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
 }

From e3be70b5e8a4b6f80426f967c467f9f765f92c26 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Tue, 13 Feb 2024 14:53:58 +0900
Subject: [PATCH 0826/3129] minimal: Allow compiling on macOS.

Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
---
 ports/minimal/Makefile       | 5 +++++
 ports/minimal/mpconfigport.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 050c4ddf526a5..824e54205bb0b 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -26,9 +26,14 @@ 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
+UNAME_S := $(shell uname -s)
 LD = $(CC)
 CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
+ifeq ($(UNAME_S),Linux)
 LDFLAGS += -Wl,-Map=$@.map,--cref -Wl,--gc-sections
+else ifeq ($(UNAME_S),Darwin)
+LDFLAGS += -Wl,-map,$@.map -Wl,-dead_strip
+endif
 endif
 
 CSUPEROPT = -Os # save some code space
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index 56bef165facda..87287cbc6f359 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -33,7 +33,7 @@ typedef long mp_off_t;
 #define MICROPY_HW_BOARD_NAME "minimal"
 #define MICROPY_HW_MCU_NAME "unknown-cpu"
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__APPLE__)
 #define MICROPY_MIN_USE_STDOUT (1)
 #define MICROPY_HEAP_SIZE      (25600) // heap size 25 kilobytes
 #endif

From 06cb6b1e9fe8e4f965f14843be5a4ffe676c7f90 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Thu, 15 Feb 2024 12:15:02 +0900
Subject: [PATCH 0827/3129] minimal: Use printf instead of echo -e.

macOS's echo doesn't have -e option.  printf is in POSIX and more widely
available these days.

Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
---
 ports/minimal/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 824e54205bb0b..9bdc06fc97501 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -106,6 +106,6 @@ run:
 	  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"
+	$(Q)/usr/bin/printf "print('hello world!', list(x+1 for x in range(10)), end='eol\\\\n')\\r\\n\\004" | $(BUILD)/firmware.elf | tail -n2 | grep "^hello world! \\[1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\]eol"
 
 include $(TOP)/py/mkrules.mk

From f9704ce36e2396001b34d86a01b75af607901f94 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Tue, 13 Feb 2024 18:46:17 +0900
Subject: [PATCH 0828/3129] unix/input: Flush the prompt after writing it to
 stdout.

Depending on your setup, stdout might be buffered/line-buffered.

Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
---
 ports/unix/input.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/unix/input.c b/ports/unix/input.c
index c5bf7197388cc..31926a5a8e1af 100644
--- a/ports/unix/input.c
+++ b/ports/unix/input.c
@@ -43,6 +43,7 @@ char *prompt(char *p) {
     // simple read string
     static char buf[256];
     fputs(p, stdout);
+    fflush(stdout);
     char *s = fgets(buf, sizeof(buf), stdin);
     if (!s) {
         return NULL;

From 809d113dbc37a032e87accc95c140f189733e0c4 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Tue, 13 Feb 2024 16:31:40 +0900
Subject: [PATCH 0829/3129] unix: Don't include system headers when features
 are disabled.

Because the target system may not have these headers at all.

Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
---
 ports/unix/modsocket.c         | 6 ++++--
 ports/unix/modtermios.c        | 4 ++--
 ports/unix/mpbtstackport_h4.c  | 6 ++++--
 ports/unix/mpbtstackport_usb.c | 6 ++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index 737550b428de3..5c935d2299bae 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -25,6 +25,10 @@
  * THE SOFTWARE.
  */
 
+#include "py/mpconfig.h"
+
+#if MICROPY_PY_SOCKET
+
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -49,8 +53,6 @@
 #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.
diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c
index 4f9751e274378..8a79bc3a5943d 100644
--- a/ports/unix/modtermios.c
+++ b/ports/unix/modtermios.c
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#if MICROPY_PY_TERMIOS
+
 #include <sys/types.h>
 #include <termios.h>
 #include <unistd.h>
@@ -33,8 +35,6 @@
 #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);
diff --git a/ports/unix/mpbtstackport_h4.c b/ports/unix/mpbtstackport_h4.c
index dacfff9a498af..a2038c16a90a8 100644
--- a/ports/unix/mpbtstackport_h4.c
+++ b/ports/unix/mpbtstackport_h4.c
@@ -24,14 +24,16 @@
  * THE SOFTWARE.
  */
 
+#include "py/mpconfig.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_H4
+
 #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/src/hci_transport_h4.h"
 #include "lib/btstack/chipset/zephyr/btstack_chipset_zephyr.h"
 
diff --git a/ports/unix/mpbtstackport_usb.c b/ports/unix/mpbtstackport_usb.c
index b8c7b758d93e6..1793e2bacd21e 100644
--- a/ports/unix/mpbtstackport_usb.c
+++ b/ports/unix/mpbtstackport_usb.c
@@ -24,6 +24,10 @@
  * THE SOFTWARE.
  */
 
+#include "py/mpconfig.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_USB
+
 #include <pthread.h>
 #include <unistd.h>
 
@@ -31,8 +35,6 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
-#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"

From cd66aa05cf2d11401876a342fad2425e766bd921 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 15 Feb 2024 23:03:29 +1100
Subject: [PATCH 0830/3129] esp32: Increase NimBLE task stack size and overflow
 detection headroom.

The Python BLE IRQ handler will most likely run on the NimBLE task, so its
C stack must be large enough to accommodate reasonably complicated Python
code (eg a few call depths).  So increase this stack size.

Also increase the headroom from 1024 to 2048 bytes.  This is needed because
(1) the esp32 architecture uses a fair amount of stack in general; and (2)
by the time execution gets to setting the Python stack top via
`mp_stack_set_top()` in this interlock code, about 600 bytes of stack are
already used, which reduces the amount available for Python.

Fixes issue #12349.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.c            | 2 +-
 ports/esp32/boards/sdkconfig.ble | 4 ++++
 ports/esp32/mpconfigport.h       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index cef5151cc9ddc..32a15bf511acb 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1274,7 +1274,7 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     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);
+        mp_stack_set_limit(MICROPY_PY_BLUETOOTH_SYNC_EVENT_STACK_SIZE);
         ts.gc_lock_depth = 0;
         ts.nlr_jump_callback_top = NULL;
         ts.mp_pending_exception = MP_OBJ_NULL;
diff --git a/ports/esp32/boards/sdkconfig.ble b/ports/esp32/boards/sdkconfig.ble
index 7fa08fe286d7f..af2d4b133ec7b 100644
--- a/ports/esp32/boards/sdkconfig.ble
+++ b/ports/esp32/boards/sdkconfig.ble
@@ -14,3 +14,7 @@ CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
 CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=n
 CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y
 CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
+
+# Increase NimBLE task stack size from the default, because Python code
+# (BLE IRQ handlers) will most likely run on this task.
+CONFIG_BT_NIMBLE_TASK_STACK_SIZE=6144
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5dc4a9c758790..acf065384b7da 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -95,7 +95,7 @@
 #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_SYNC_EVENT_STACK_SIZE (CONFIG_BT_NIMBLE_TASK_STACK_SIZE - 2048)
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
 #define MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING (1)
 #define MICROPY_BLUETOOTH_NIMBLE            (1)

From 866fc3447c7a685c6c04d6a03ee94083b8d0dd72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 10:16:18 +1100
Subject: [PATCH 0831/3129] tests/multi_bluetooth/ble_irq_calls.py: Enhance
 test to test recursion.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/ble_irq_calls.py     | 18 ++++++++++++++++++
 tests/multi_bluetooth/ble_irq_calls.py.exp |  1 +
 2 files changed, 19 insertions(+)

diff --git a/tests/multi_bluetooth/ble_irq_calls.py b/tests/multi_bluetooth/ble_irq_calls.py
index c8c673daab31d..2717bd5f3da5a 100644
--- a/tests/multi_bluetooth/ble_irq_calls.py
+++ b/tests/multi_bluetooth/ble_irq_calls.py
@@ -60,6 +60,22 @@
 ACCESSORY_SERVICE = (ACCESSORY_UUID, (STATE_CHARACTERISTIC,))
 
 
+def recursive_function():
+    recursive_function()
+
+
+def test_deep_calls(n):
+    if n > 0:
+        # Test that a few nested calls will succeed.
+        test_deep_calls(n - 1)
+    else:
+        # Test that a Python stack overflow is detected.
+        try:
+            recursive_function()
+        except RuntimeError:
+            print("test_deep_calls finished")
+
+
 class Central:
     def __init__(self):
         self.done = False
@@ -79,6 +95,8 @@ def _ble_event_handler(self, event, data):
             conn_handle, _, _ = data
             self._conn_handle = conn_handle
             ble.gattc_discover_services(self._conn_handle, ACCESSORY_UUID)
+            # Test deep Python calls from within this BLE IRQ handler.
+            test_deep_calls(5)
 
         elif event == _IRQ_PERIPHERAL_DISCONNECT:
             conn_handle, _, addr = data
diff --git a/tests/multi_bluetooth/ble_irq_calls.py.exp b/tests/multi_bluetooth/ble_irq_calls.py.exp
index d655c507d34f1..993e6f79e8a87 100644
--- a/tests/multi_bluetooth/ble_irq_calls.py.exp
+++ b/tests/multi_bluetooth/ble_irq_calls.py.exp
@@ -8,6 +8,7 @@ _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 central start
 _IRQ_PERIPHERAL_CONNECT
+test_deep_calls finished
 _IRQ_GATTC_SERVICE_RESULT
 service found: 3 UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
 _IRQ_GATTC_SERVICE_DONE

From 628abf8f25a7705a2810fffe2ca6ae652c532896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 25 Aug 2022 17:25:08 +0000
Subject: [PATCH 0832/3129] extmod/modlwip: Support IPv6.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With these changes IPv6 works on the rp2 port (and possibly others that use
the lwIP socket implementation).

Things that have been tested and work:
- Neighbour solicitation for v6 link local address.
- Ping of v6 link-local address.
- Receiving a SLAAC address via router advertisement.
- Ping a v6 address allocated via SLAAC.
- Perform an outgoing connection to a routed v6-address (via default
  gateway).
- Create a listening IPv6 wildcard socked bound to ::, and trying to access
  it via link-local, SLAAC, and IPv4 (to ensure the dual-stack binding
  works).

Things that could be improved:
- socket.socket().getaddrinfo only returns the v4 address.  It could also
  return v6 addresses (getaddrinfo is actively programmed to only return a
  single address, and this is the v4-address by default, with fallback to
  the v6 address if both are enabled).

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/modlwip.c             | 70 ++++++++++++++++++++++++------------
 extmod/network_cyw43.c       |  9 ++---
 shared/netutils/dhcpserver.c | 14 ++++----
 3 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 6f8703d5a71a9..8ccc388913f42 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -353,6 +353,26 @@ STATIC void lwip_socket_free_incoming(lwip_socket_obj_t *socket) {
     }
 }
 
+mp_obj_t lwip_format_inet_addr(const ip_addr_t *ip, mp_uint_t port) {
+    char *ipstr = ipaddr_ntoa(ip);
+    mp_obj_t tuple[2] = {
+        tuple[0] = mp_obj_new_str(ipstr, strlen(ipstr)),
+        tuple[1] = mp_obj_new_int(port),
+    };
+    return mp_obj_new_tuple(2, tuple);
+}
+
+mp_uint_t lwip_parse_inet_addr(mp_obj_t addr_in, ip_addr_t *out_ip) {
+    mp_obj_t *addr_items;
+    mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
+    size_t addr_len;
+    const char *addr_str = mp_obj_str_get_data(addr_items[0], &addr_len);
+    if (!ipaddr_aton(addr_str, out_ip)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
+    }
+    return mp_obj_get_int(addr_items[1]);
+}
+
 /*******************************************************************************/
 // Callback functions for the lwIP raw API.
 
@@ -538,7 +558,7 @@ STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err
 // these to do the work.
 
 // Helper function for send/sendto to handle raw/UDP packets.
-STATIC mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
+STATIC mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, mp_uint_t len, ip_addr_t *ip, mp_uint_t port, int *_errno) {
     if (len > 0xffff) {
         // Any packet that big is probably going to fail the pbuf_alloc anyway, but may as well try
         len = 0xffff;
@@ -567,15 +587,13 @@ STATIC mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, m
             err = udp_send(socket->pcb.udp, p);
         }
     } else {
-        ip_addr_t dest;
-        IP4_ADDR(&dest, ip[0], ip[1], ip[2], ip[3]);
         #if MICROPY_PY_LWIP_SOCK_RAW
         if (socket->type == MOD_NETWORK_SOCK_RAW) {
-            err = raw_sendto(socket->pcb.raw, p, &dest);
+            err = raw_sendto(socket->pcb.raw, p, ip);
         } else
         #endif
         {
-            err = udp_sendto(socket->pcb.udp, p, &dest, port);
+            err = udp_sendto(socket->pcb.udp, p, ip, port);
         }
     }
 
@@ -885,11 +903,8 @@ STATIC mp_obj_t lwip_socket_make_new(const mp_obj_type_t *type, size_t n_args, s
 STATIC mp_obj_t lwip_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
 
-    uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
-    mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_BIG);
-
     ip_addr_t bind_addr;
-    IP4_ADDR(&bind_addr, ip[0], ip[1], ip[2], ip[3]);
+    mp_uint_t port = lwip_parse_inet_addr(addr_in, &bind_addr);
 
     err_t err = ERR_ARG;
     switch (socket->type) {
@@ -926,6 +941,12 @@ STATIC mp_obj_t lwip_socket_listen(size_t n_args, const mp_obj_t *args) {
     if (socket->type != MOD_NETWORK_SOCK_STREAM) {
         mp_raise_OSError(MP_EOPNOTSUPP);
     }
+    #if LWIP_IPV6
+    if (ip_addr_cmp(&socket->pcb.tcp->local_ip, IP6_ADDR_ANY)) {
+        IP_SET_TYPE_VAL(socket->pcb.tcp->local_ip,  IPADDR_TYPE_ANY);
+        IP_SET_TYPE_VAL(socket->pcb.tcp->remote_ip, IPADDR_TYPE_ANY);
+    }
+    #endif
 
     struct tcp_pcb *new_pcb;
     #if LWIP_VERSION_MACRO < 0x02000100
@@ -1043,12 +1064,10 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
     MICROPY_PY_LWIP_EXIT
 
     // make the return value
-    uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
-    memcpy(ip, &(socket2->pcb.tcp->remote_ip), sizeof(ip));
     mp_uint_t port = (mp_uint_t)socket2->pcb.tcp->remote_port;
     mp_obj_tuple_t *client = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
     client->items[0] = MP_OBJ_FROM_PTR(socket2);
-    client->items[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
+    client->items[1] = lwip_format_inet_addr(&socket2->pcb.tcp->remote_ip, port);
 
     return MP_OBJ_FROM_PTR(client);
 }
@@ -1062,11 +1081,8 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     }
 
     // get address
-    uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
-    mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_BIG);
-
     ip_addr_t dest;
-    IP4_ADDR(&dest, ip[0], ip[1], ip[2], ip[3]);
+    mp_uint_t port = lwip_parse_inet_addr(addr_in, &dest);
 
     err_t err = ERR_ARG;
     switch (socket->type) {
@@ -1219,8 +1235,8 @@ STATIC mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
 
-    uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
-    mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_BIG);
+    ip_addr_t ip;
+    mp_uint_t port = lwip_parse_inet_addr(addr_in, &ip);
 
     mp_uint_t ret = 0;
     switch (socket->type) {
@@ -1232,7 +1248,7 @@ STATIC mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t
         #if MICROPY_PY_LWIP_SOCK_RAW
         case MOD_NETWORK_SOCK_RAW:
         #endif
-            ret = lwip_raw_udp_send(socket, bufinfo.buf, bufinfo.len, ip, port, &_errno);
+            ret = lwip_raw_udp_send(socket, bufinfo.buf, bufinfo.len, &ip, port, &_errno);
             break;
     }
     if (ret == -1) {
@@ -1357,6 +1373,12 @@ STATIC mp_obj_t lwip_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_setblocking_obj, lwip_socket_setblocking);
 
+#if LWIP_VERSION_MAJOR < 2
+#define MP_IGMP_IP_ADDR_TYPE ip_addr_t
+#else
+#define MP_IGMP_IP_ADDR_TYPE ip4_addr_t
+#endif
+
 STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // always 4
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(args[0]);
@@ -1397,9 +1419,9 @@ 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;
             if (opt == IP_ADD_MEMBERSHIP) {
-                err = igmp_joingroup((ip_addr_t *)bufinfo.buf + 1, bufinfo.buf);
+                err = igmp_joingroup((MP_IGMP_IP_ADDR_TYPE *)bufinfo.buf + 1, bufinfo.buf);
             } else {
-                err = igmp_leavegroup((ip_addr_t *)bufinfo.buf + 1, bufinfo.buf);
+                err = igmp_leavegroup((MP_IGMP_IP_ADDR_TYPE *)bufinfo.buf + 1, bufinfo.buf);
             }
             if (err != ERR_OK) {
                 mp_raise_OSError(error_lookup_table[-err]);
@@ -1412,6 +1434,9 @@ STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
+
+#undef MP_IGMP_IP_ADDR_TYPE
+
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_setsockopt_obj, 4, 4, lwip_socket_setsockopt);
 
 STATIC mp_obj_t lwip_socket_makefile(size_t n_args, const mp_obj_t *args) {
@@ -1742,12 +1767,13 @@ STATIC mp_obj_t lwip_getaddrinfo(size_t n_args, const mp_obj_t *args) {
         mp_raise_OSError(state.status);
     }
 
+    ip_addr_t ipcopy = state.ipaddr;
     mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(5, NULL));
     tuple->items[0] = MP_OBJ_NEW_SMALL_INT(MOD_NETWORK_AF_INET);
     tuple->items[1] = MP_OBJ_NEW_SMALL_INT(MOD_NETWORK_SOCK_STREAM);
     tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
     tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
-    tuple->items[4] = netutils_format_inet_addr((uint8_t *)&state.ipaddr, port, NETUTILS_BIG);
+    tuple->items[4] = lwip_format_inet_addr(&ipcopy, port);
     return mp_obj_new_list(1, (mp_obj_t *)&tuple);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_getaddrinfo_obj, 2, 6, lwip_getaddrinfo);
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index f8490d6b9a9cd..2f188dbad4cee 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -78,13 +78,14 @@ STATIC void network_cyw43_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
     } else {
         status_str = "fail";
     }
+    ip4_addr_t *addr = ip_2_ip4(&netif->ip_addr);
     mp_printf(print, "<CYW43 %s %s %u.%u.%u.%u>",
         self->itf == CYW43_ITF_STA ? "STA" : "AP",
         status_str,
-        netif->ip_addr.addr & 0xff,
-        netif->ip_addr.addr >> 8 & 0xff,
-        netif->ip_addr.addr >> 16 & 0xff,
-        netif->ip_addr.addr >> 24
+        addr->addr & 0xff,
+        addr->addr >> 8 & 0xff,
+        addr->addr >> 16 & 0xff,
+        addr->addr >> 24
         );
 }
 
diff --git a/shared/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
index dca95507d3f01..9a4d461a93f55 100644
--- a/shared/netutils/dhcpserver.c
+++ b/shared/netutils/dhcpserver.c
@@ -113,7 +113,7 @@ static void dhcp_socket_free(struct udp_pcb **udp) {
 
 static int dhcp_socket_bind(struct udp_pcb **udp, uint32_t ip, uint16_t port) {
     ip_addr_t addr;
-    IP4_ADDR(&addr, ip >> 24 & 0xff, ip >> 16 & 0xff, ip >> 8 & 0xff, ip & 0xff);
+    IP_ADDR4(&addr, ip >> 24 & 0xff, ip >> 16 & 0xff, ip >> 8 & 0xff, ip & 0xff);
     // TODO convert lwIP errors to errno
     return udp_bind(*udp, &addr, port);
 }
@@ -131,7 +131,7 @@ static int dhcp_socket_sendto(struct udp_pcb **udp, struct netif *netif, const v
     memcpy(p->payload, buf, len);
 
     ip_addr_t dest;
-    IP4_ADDR(&dest, ip >> 24 & 0xff, ip >> 16 & 0xff, ip >> 8 & 0xff, ip & 0xff);
+    IP_ADDR4(&dest, ip >> 24 & 0xff, ip >> 16 & 0xff, ip >> 8 & 0xff, ip & 0xff);
     err_t err;
     if (netif != NULL) {
         err = udp_sendto_if(*udp, p, &dest, port, netif);
@@ -205,7 +205,7 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
     }
 
     dhcp_msg.op = DHCPOFFER;
-    memcpy(&dhcp_msg.yiaddr, &d->ip.addr, 4);
+    memcpy(&dhcp_msg.yiaddr, &ip_2_ip4(&d->ip)->addr, 4);
 
     uint8_t *opt = (uint8_t *)&dhcp_msg.options;
     opt += 4; // assume magic cookie: 99, 130, 83, 99
@@ -248,7 +248,7 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
                 // Should be NACK
                 goto ignore_request;
             }
-            if (memcmp(o + 2, &d->ip.addr, 3) != 0) {
+            if (memcmp(o + 2, &ip_2_ip4(&d->ip)->addr, 3) != 0) {
                 // Should be NACK
                 goto ignore_request;
             }
@@ -280,9 +280,9 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
             goto ignore_request;
     }
 
-    opt_write_n(&opt, DHCP_OPT_SERVER_ID, 4, &d->ip.addr);
-    opt_write_n(&opt, DHCP_OPT_SUBNET_MASK, 4, &d->nm.addr);
-    opt_write_n(&opt, DHCP_OPT_ROUTER, 4, &d->ip.addr); // aka gateway; can have multiple addresses
+    opt_write_n(&opt, DHCP_OPT_SERVER_ID, 4, &ip_2_ip4(&d->ip)->addr);
+    opt_write_n(&opt, DHCP_OPT_SUBNET_MASK, 4, &ip_2_ip4(&d->nm)->addr);
+    opt_write_n(&opt, DHCP_OPT_ROUTER, 4, &ip_2_ip4(&d->ip)->addr); // aka gateway; can have multiple addresses
     opt_write_u32(&opt, DHCP_OPT_DNS, DEFAULT_DNS); // can have multiple addresses
     opt_write_u32(&opt, DHCP_OPT_IP_LEASE_TIME, DEFAULT_LEASE_TIME_S);
     *opt++ = DHCP_OPT_END;

From 223e0d9a5b116246bda1621201e77945ac5746fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 25 Aug 2022 18:02:43 +0000
Subject: [PATCH 0833/3129] extmod/network_wiznet5k: Adjust IP types for IPv6.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/network_wiznet5k.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index d49ee8614e710..d4841e0176dcb 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -305,11 +305,11 @@ STATIC err_t wiznet5k_netif_init(struct netif *netif) {
 
 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);
+    IP_ADDR4(&ipconfig[0], 0, 0, 0, 0);
+    IP_ADDR4(&ipconfig[1], 0, 0, 0, 0);
+    IP_ADDR4(&ipconfig[2], 0, 0, 0, 0);
+    IP_ADDR4(&ipconfig[3], 0, 0, 0, 0);
+    netif_add(&self->netif, ip_2_ip4(&ipconfig[0]), ip_2_ip4(&ipconfig[1]), ip_2_ip4(&ipconfig[2]), self, wiznet5k_netif_init, ethernet_input);
     self->netif.name[0] = 'e';
     self->netif.name[1] = '0';
     netif_set_default(&self->netif);
@@ -802,7 +802,7 @@ STATIC mp_obj_t wiznet5k_isconnected(mp_obj_t self_in) {
         wizphy_getphylink() == PHY_LINK_ON
         && IS_ACTIVE(self)
         #if WIZNET5K_WITH_LWIP_STACK
-        && self->netif.ip_addr.addr != 0
+        && ip_2_ip4(&self->netif.ip_addr)->addr != 0
         #endif
         );
 }

From 39bf055d23be4b0f761af115773c3db1074fc2dd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Feb 2024 13:25:58 +1100
Subject: [PATCH 0834/3129] py/emitglue: Reorder and resize members of
 mp_raw_code_t.

The mp_raw_code_t struct has been reordered and some members resized.  The
`n_pos_args` member is renamed to `asm_n_pos_args`, and `type_sig` renamed
to `asm_type_sig` to indicate that these are used only for the inline-asm
emitters.  These two members are also grouped together in the struct.

The justifications for resizing the members are:
- `fun_data_len` can be 32-bits without issue
- `n_children` is already limited to 16-bits by
  `mp_emit_common_t::ct_cur_child`
- `scope_flags` is already limited to 16-bits by `scope_t::scope_flags`
- `prelude_offset` is already limited to 16-bits by the argument to
  `mp_emit_glue_assign_native()`
- it's reasonable to limit the maximim number of inline-asm arguments to 12
  (24 bits for `asm_type_sig` divided by 2)

This change helps to reduce frozen code size (and in some cases RAM usage)
in the following cases:
- 64-bit targets
- builds with MICROPY_PY_SYS_SETTRACE enabled
- builds with MICROPY_EMIT_MACHINE_CODE enabled but MICROPY_EMIT_INLINE_ASM
  disabled

With this change, unix 64-bit builds are -4080 bytes in size.  Bare-metal
ports like rp2 are unchanged (because mp_raw_code_t is still 32 bytes on
those 32-bit targets).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitglue.c       | 17 ++++++++++-------
 py/emitglue.h       | 38 +++++++++++++++++++++-----------------
 py/persistentcode.c |  6 ++++--
 tools/mpy-tool.py   | 20 ++++++++++----------
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/py/emitglue.c b/py/emitglue.c
index 6ec6d6b885d4d..0ec126fe94608 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -66,9 +66,9 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #endif
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
-    size_t n_children,
+    uint16_t n_children,
     #endif
-    mp_uint_t scope_flags) {
+    uint16_t scope_flags) {
 
     rc->kind = MP_CODE_BYTECODE;
     rc->scope_flags = scope_flags;
@@ -99,10 +99,11 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *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,
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
-    size_t n_children,
+    uint16_t n_children,
     uint16_t prelude_offset,
     #endif
-    mp_uint_t scope_flags, mp_uint_t n_pos_args, mp_uint_t type_sig) {
+    uint16_t scope_flags, uint32_t asm_n_pos_args, uint32_t asm_type_sig
+    ) {
 
     assert(kind == MP_CODE_NATIVE_PY || kind == MP_CODE_NATIVE_VIPER || kind == MP_CODE_NATIVE_ASM);
 
@@ -145,9 +146,11 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     rc->prelude_offset = prelude_offset;
     #endif
 
+    #if MICROPY_EMIT_INLINE_ASM
     // These two entries are only needed for MP_CODE_NATIVE_ASM.
-    rc->n_pos_args = n_pos_args;
-    rc->type_sig = type_sig;
+    rc->asm_n_pos_args = asm_n_pos_args;
+    rc->asm_type_sig = asm_type_sig;
+    #endif
 
     #if 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);
@@ -195,7 +198,7 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module
         #endif
         #if MICROPY_EMIT_INLINE_ASM
         case MP_CODE_NATIVE_ASM:
-            fun = mp_obj_new_fun_asm(rc->n_pos_args, rc->fun_data, rc->type_sig);
+            fun = mp_obj_new_fun_asm(rc->asm_n_pos_args, rc->fun_data, rc->asm_type_sig);
             break;
         #endif
         default:
diff --git a/py/emitglue.h b/py/emitglue.h
index 4ddf74011fa70..c9c6c8ba1de93 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -49,34 +49,38 @@ typedef enum {
     MP_CODE_NATIVE_ASM,
 } mp_raw_code_kind_t;
 
+// This mp_raw_code_t struct holds static information about a non-instantiated function.
+// A function object is created from this information, and that object can then be executed.
+//
+// This struct appears in the following places:
 // 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;
+    uint32_t kind : 3; // of type mp_raw_code_kind_t
+    uint32_t scope_flags : 7;
     const void *fun_data;
+    struct _mp_raw_code_t **children;
     #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
-    size_t fun_data_len; // so mp_raw_code_save and mp_bytecode_print work
+    uint32_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 n_children;
+    uint16_t n_children;
+    #if MICROPY_EMIT_MACHINE_CODE
+    uint16_t prelude_offset;
+    #endif
     #if MICROPY_PY_SYS_SETTRACE
-    mp_bytecode_prelude_t prelude;
     // line_of_definition is a Python source line where the raw_code was
     // created e.g. MP_BC_MAKE_FUNCTION. This is different from lineno info
     // stored in prelude, which provides line number for first statement of
     // a function. Required to properly implement "call" trace event.
-    mp_uint_t line_of_definition;
-    #endif
-    #if MICROPY_EMIT_MACHINE_CODE
-    uint16_t prelude_offset;
+    uint32_t line_of_definition;
+    mp_bytecode_prelude_t prelude;
     #endif
     #endif
-    #if MICROPY_EMIT_MACHINE_CODE
-    mp_uint_t type_sig; // for viper, compressed as 2-bit types; ret is MSB, then arg0, arg1, etc
+    #if MICROPY_EMIT_INLINE_ASM
+    uint32_t asm_n_pos_args : 8;
+    uint32_t asm_type_sig : 24; // compressed as 2-bit types; ret is MSB, then arg0, arg1, etc
     #endif
 } mp_raw_code_t;
 
@@ -88,17 +92,17 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #endif
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
-    size_t n_children,
+    uint16_t n_children,
     #endif
-    mp_uint_t scope_flags);
+    uint16_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,
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
-    size_t n_children,
+    uint16_t n_children,
     uint16_t prelude_offset,
     #endif
-    mp_uint_t scope_flags, mp_uint_t n_pos_args, mp_uint_t type_sig);
+    uint16_t scope_flags, uint32_t asm_n_pos_args, uint32_t asm_type_sig);
 
 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);
diff --git a/py/persistentcode.c b/py/persistentcode.c
index df1003babfa1d..83806febb3650 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -578,10 +578,12 @@ STATIC void save_raw_code(mp_print_t *print, const mp_raw_code_t *rc) {
     } 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 MICROPY_EMIT_INLINE_ASM
         if (rc->kind == MP_CODE_NATIVE_ASM) {
-            mp_print_uint(print, rc->n_pos_args);
-            mp_print_uint(print, rc->type_sig);
+            mp_print_uint(print, rc->asm_n_pos_args);
+            mp_print_uint(print, rc->asm_type_sig);
         }
+        #endif
     }
     #endif
 
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index a656cccd69d0f..57411c3fbcdbc 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -909,21 +909,24 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
         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.scope_flags)
-        print("    .n_pos_args = %u," % self.n_pos_args)
         print("    .fun_data = fun_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)
         elif prelude_ptr:
             print("    .children = (void *)%s," % prelude_ptr)
         else:
             print("    .children = NULL,")
+        print("    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS")
+        print("    .fun_data_len = %u," % len(self.fun_data))
+        print("    #endif")
         print("    #if MICROPY_PERSISTENT_CODE_SAVE")
         print("    .n_children = %u," % len(self.children))
+        print("    #if MICROPY_EMIT_MACHINE_CODE")
+        print("    .prelude_offset = %u," % self.prelude_offset)
+        print("    #endif")
         if self.code_kind == MP_CODE_BYTECODE:
             print("    #if MICROPY_PY_SYS_SETTRACE")
+            print("    .line_of_definition = %u," % 0)  # TODO
             print("    .prelude = {")
             print("        .n_state = %u," % self.prelude_signature[0])
             print("        .n_exc_stack = %u," % self.prelude_signature[1])
@@ -944,14 +947,11 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
                 "        .opcodes = fun_data_%s + %u," % (self.escaped_name, self.offset_opcodes)
             )
             print("    },")
-            print("    .line_of_definition = %u," % 0)  # TODO
             print("    #endif")
-        print("    #if MICROPY_EMIT_MACHINE_CODE")
-        print("    .prelude_offset = %u," % self.prelude_offset)
-        print("    #endif")
         print("    #endif")
-        print("    #if MICROPY_EMIT_MACHINE_CODE")
-        print("    .type_sig = %u," % type_sig)
+        print("    #if MICROPY_EMIT_INLINE_ASM")
+        print("    .asm_n_pos_args = %u," % self.n_pos_args)
+        print("    .asm_type_sig = %u," % type_sig)
         print("    #endif")
         print("};")
 

From 416465d81e911b088836f4e7c37fac2bc0f67917 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Feb 2024 13:25:58 +1100
Subject: [PATCH 0835/3129] py/emitglue: Provide a truncated mp_raw_code_t for
 non-asm code.

The `asm_n_pos_args` and `asm_type_sig` members of `mp_raw_code_t` are only
used for raw codes of type MP_CODE_NATIVE_ASM, which are rare, for example
in frozen code.  So using a truncated `mp_raw_code_t` in these cases helps
to reduce frozen code size on targets that have MICROPY_EMIT_INLINE_ASM
enabled.

With this, change in firmware size of RPI_PICO builds is -648.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h   |  4 ++--
 py/emitglue.h     | 23 +++++++++++++++++++++++
 tools/mpy-tool.py | 17 ++++++++++-------
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index de9c93c65924b..435b85622a981 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -207,7 +207,7 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 
 #define MP_DYNRUNTIME_INIT_ENTRY \
     mp_obj_t old_globals = mp_fun_table.swap_globals(self->context->module.globals); \
-    mp_raw_code_t rc; \
+    mp_raw_code_truncated_t rc; \
     rc.kind = MP_CODE_NATIVE_VIPER; \
     rc.scope_flags = 0; \
     (void)rc;
@@ -217,7 +217,7 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
     return mp_const_none;
 
 #define MP_DYNRUNTIME_MAKE_FUNCTION(f) \
-    (mp_make_function_from_raw_code((rc.fun_data = (f), &rc), self->context, NULL))
+    (mp_make_function_from_raw_code((rc.fun_data = (f), (const mp_raw_code_t *)&rc), self->context, NULL))
 
 #define mp_import_name(name, fromlist, level) \
     (mp_fun_table.import_name((name), (fromlist), (level)))
diff --git a/py/emitglue.h b/py/emitglue.h
index c9c6c8ba1de93..b79283541bf04 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -84,6 +84,29 @@ typedef struct _mp_raw_code_t {
     #endif
 } mp_raw_code_t;
 
+// Version of mp_raw_code_t but without the asm_n_pos_args/asm_type_sig entries, which are
+// only needed when the kind is MP_CODE_NATIVE_ASM.  So this struct can be used when the
+// kind is MP_CODE_BYTECODE, MP_CODE_NATIVE_PY or MP_CODE_NATIVE_VIPER, to reduce its size.
+typedef struct _mp_raw_code_truncated_t {
+    uint32_t kind : 3;
+    uint32_t scope_flags : 7;
+    const void *fun_data;
+    struct _mp_raw_code_t **children;
+    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
+    uint32_t fun_data_len;
+    #endif
+    #if MICROPY_PERSISTENT_CODE_SAVE
+    uint16_t n_children;
+    #if MICROPY_EMIT_MACHINE_CODE
+    uint16_t prelude_offset;
+    #endif
+    #if MICROPY_PY_SYS_SETTRACE
+    uint32_t line_of_definition;
+    mp_bytecode_prelude_t prelude;
+    #endif
+    #endif
+} mp_raw_code_truncated_t;
+
 mp_raw_code_t *mp_emit_glue_new_raw_code(void);
 
 void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 57411c3fbcdbc..9b824099ea18c 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -683,7 +683,7 @@ def freeze(self, compiled_module_index):
         else:
             print("        .obj_table = NULL,")
         print("    },")
-        print("    .rc = &raw_code_%s," % self.raw_code.escaped_name)
+        print("    .rc = (const mp_raw_code_t *)&raw_code_%s," % self.raw_code.escaped_name)
         print("};")
 
     def freeze_constant_obj(self, obj_name, obj):
@@ -898,7 +898,7 @@ def freeze_children(self, prelude_ptr=None):
                 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("    (const mp_raw_code_t *)&raw_code_%s," % rc.escaped_name)
             if prelude_ptr:
                 print("    (void *)%s," % prelude_ptr)
             print("};")
@@ -906,7 +906,11 @@ def freeze_children(self, prelude_ptr=None):
 
     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)
+        if self.code_kind == MP_CODE_NATIVE_ASM:
+            raw_code_type = "mp_raw_code_t"
+        else:
+            raw_code_type = "mp_raw_code_truncated_t"
+        print("static const %s raw_code_%s = {" % (raw_code_type, self.escaped_name))
         print("    .kind = %s," % RawCode.code_kind_str[self.code_kind])
         print("    .scope_flags = 0x%02x," % self.scope_flags)
         print("    .fun_data = fun_data_%s," % self.escaped_name)
@@ -949,10 +953,9 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
             print("    },")
             print("    #endif")
         print("    #endif")
-        print("    #if MICROPY_EMIT_INLINE_ASM")
-        print("    .asm_n_pos_args = %u," % self.n_pos_args)
-        print("    .asm_type_sig = %u," % type_sig)
-        print("    #endif")
+        if self.code_kind == MP_CODE_NATIVE_ASM:
+            print("    .asm_n_pos_args = %u," % self.n_pos_args)
+            print("    .asm_type_sig = %u," % type_sig)
         print("};")
 
         global raw_code_count, raw_code_content

From 5e3006f1172d0eabbbefeb3268dfb942ec7cf9cd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Feb 2024 17:38:25 +1100
Subject: [PATCH 0836/3129] py/emitglue: Simplify mp_raw_code_t's kind and
 scope_flags members.

To simplify their access and reduce code size.

The `scope_flags` member is only ever used to determine if a function is a
generator or not, so make it reflect that fact as a bool type.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h     | 2 +-
 py/emitglue.c       | 8 ++++----
 py/emitglue.h       | 8 ++++----
 py/persistentcode.c | 4 +++-
 py/runtime0.h       | 7 +++++--
 tools/mpy-tool.py   | 3 ++-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 435b85622a981..3e660f19fda02 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -209,7 +209,7 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
     mp_obj_t old_globals = mp_fun_table.swap_globals(self->context->module.globals); \
     mp_raw_code_truncated_t rc; \
     rc.kind = MP_CODE_NATIVE_VIPER; \
-    rc.scope_flags = 0; \
+    rc.is_generator = 0; \
     (void)rc;
 
 #define MP_DYNRUNTIME_INIT_EXIT \
diff --git a/py/emitglue.c b/py/emitglue.c
index 0ec126fe94608..c0003c5cd5563 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -71,7 +71,7 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     uint16_t scope_flags) {
 
     rc->kind = MP_CODE_BYTECODE;
-    rc->scope_flags = scope_flags;
+    rc->is_generator = (scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0;
     rc->fun_data = code;
     #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
     rc->fun_data_len = len;
@@ -133,7 +133,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     #endif
 
     rc->kind = kind;
-    rc->scope_flags = scope_flags;
+    rc->is_generator = (scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0;
     rc->fun_data = fun_data;
 
     #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
@@ -191,7 +191,7 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module
         case MP_CODE_NATIVE_VIPER:
             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) {
+            if (rc->is_generator) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_native_gen_wrap;
             }
             break;
@@ -206,7 +206,7 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module
             assert(rc->kind == MP_CODE_BYTECODE);
             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) {
+            if (rc->is_generator) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_gen_wrap;
             }
 
diff --git a/py/emitglue.h b/py/emitglue.h
index b79283541bf04..125ab2ccd5322 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -57,8 +57,8 @@ typedef enum {
 // 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 {
-    uint32_t kind : 3; // of type mp_raw_code_kind_t
-    uint32_t scope_flags : 7;
+    uint8_t kind; // of type mp_raw_code_kind_t; only 3 bits used
+    bool is_generator;
     const void *fun_data;
     struct _mp_raw_code_t **children;
     #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
@@ -88,8 +88,8 @@ typedef struct _mp_raw_code_t {
 // only needed when the kind is MP_CODE_NATIVE_ASM.  So this struct can be used when the
 // kind is MP_CODE_BYTECODE, MP_CODE_NATIVE_PY or MP_CODE_NATIVE_VIPER, to reduce its size.
 typedef struct _mp_raw_code_truncated_t {
-    uint32_t kind : 3;
-    uint32_t scope_flags : 7;
+    uint8_t kind;
+    bool is_generator;
     const void *fun_data;
     struct _mp_raw_code_t **children;
     #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 83806febb3650..7b002e7fcfc2f 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -577,7 +577,9 @@ STATIC void save_raw_code(mp_print_t *print, const mp_raw_code_t *rc) {
         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);
+        // Viper/asm functions don't support generator, variable args, or default keyword args
+        // so (scope_flags & MP_SCOPE_FLAG_ALL_SIG) for these functions is always 0.
+        mp_print_uint(print, 0);
         #if MICROPY_EMIT_INLINE_ASM
         if (rc->kind == MP_CODE_NATIVE_ASM) {
             mp_print_uint(print, rc->asm_n_pos_args);
diff --git a/py/runtime0.h b/py/runtime0.h
index 69af38ddcb88e..9c6f0e079fb5a 100644
--- a/py/runtime0.h
+++ b/py/runtime0.h
@@ -26,8 +26,11 @@
 #ifndef MICROPY_INCLUDED_PY_RUNTIME0_H
 #define MICROPY_INCLUDED_PY_RUNTIME0_H
 
-// The first four must fit in 8 bits, see emitbc.c
-// The remaining must fit in 16 bits, see scope.h
+// These constants are used by:
+// - mp_raw_code_t::is_generator (only MP_SCOPE_FLAG_GENERATOR)
+// - scope_t::scope_flags (16 bits)
+// - MP_BC_PRELUDE_SIG_ENCODE macro, masked by MP_SCOPE_FLAG_ALL_SIG (4 bits)
+// - tools/mpy_ld.py, when generating mpy files (maximum 7 bits)
 #define MP_SCOPE_FLAG_ALL_SIG      (0x0f)
 #define MP_SCOPE_FLAG_GENERATOR    (0x01)
 #define MP_SCOPE_FLAG_VARKEYWORDS  (0x02)
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 9b824099ea18c..744800c6704ca 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -126,6 +126,7 @@ class Config:
 MP_PERSISTENT_OBJ_COMPLEX = 9
 MP_PERSISTENT_OBJ_TUPLE = 10
 
+MP_SCOPE_FLAG_GENERATOR = 0x01
 MP_SCOPE_FLAG_VIPERRELOC = 0x10
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
 MP_SCOPE_FLAG_VIPERBSS = 0x40
@@ -912,7 +913,7 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
             raw_code_type = "mp_raw_code_truncated_t"
         print("static const %s raw_code_%s = {" % (raw_code_type, self.escaped_name))
         print("    .kind = %s," % RawCode.code_kind_str[self.code_kind])
-        print("    .scope_flags = 0x%02x," % self.scope_flags)
+        print("    .is_generator = %d," % bool(self.scope_flags & MP_SCOPE_FLAG_GENERATOR))
         print("    .fun_data = fun_data_%s," % self.escaped_name)
         if len(self.children):
             print("    .children = (void *)&children_%s," % self.escaped_name)

From e2ff00e81113d7a3f32f860652017644b5d68bf1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Feb 2024 17:41:48 +1100
Subject: [PATCH 0837/3129] py/emitglue: Introduce mp_proto_fun_t as a more
 general mp_raw_code_t.

Allows bytecode itself to be used instead of an mp_raw_code_t in the simple
and common cases of a bytecode function without any children.

This can be used to further reduce frozen code size, and has the potential
to optimise other areas like importing.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/compiler.rst     |  2 +-
 ports/embed/port/embed_util.c |  2 +-
 py/bc.h                       |  6 +++---
 py/builtinimport.c            |  8 ++++----
 py/compile.c                  |  2 +-
 py/dynruntime.h               |  8 +++++---
 py/emitglue.c                 | 17 ++++++++++-------
 py/emitglue.h                 | 27 ++++++++++++++++++++++-----
 py/emitnative.c               |  4 ++--
 py/emitnx86.c                 |  2 +-
 py/nativeglue.c               |  2 +-
 py/nativeglue.h               |  4 ++--
 py/vm.c                       |  8 ++++----
 shared/runtime/pyexec.c       |  2 +-
 tools/mpy-tool.py             |  8 +++++---
 15 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/docs/develop/compiler.rst b/docs/develop/compiler.rst
index cac92585ff4ee..00cc90f8163a1 100644
--- a/docs/develop/compiler.rst
+++ b/docs/develop/compiler.rst
@@ -157,7 +157,7 @@ The most relevant method you should know about is this:
        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);
+       return mp_make_function_from_proto_fun(cm.rc, cm.context, NULL);
    }
 
 The compiler compiles the code in four passes: scope, stack size, code size and emit.
diff --git a/ports/embed/port/embed_util.c b/ports/embed/port/embed_util.c
index c5bc8c973bb02..70a07dc4297f2 100644
--- a/ports/embed/port/embed_util.c
+++ b/ports/embed/port/embed_util.c
@@ -69,7 +69,7 @@ void mp_embed_exec_mpy(const uint8_t *mpy, size_t len) {
         mp_compiled_module_t cm;
         cm.context = ctx;
         mp_raw_code_load_mem(mpy, len, &cm);
-        mp_obj_t f = mp_make_function_from_raw_code(cm.rc, ctx, MP_OBJ_NULL);
+        mp_obj_t f = mp_make_function_from_proto_fun(cm.rc, ctx, MP_OBJ_NULL);
         mp_call_function_0(f);
         nlr_pop();
     } else {
diff --git a/py/bc.h b/py/bc.h
index 0e23255f764f4..a1ab7918f2e02 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -44,11 +44,11 @@
 //  prelude size    : var uint
 //      contains two values interleaved bit-wise as: xIIIIIIC repeated
 //          x = extension           another byte follows
-//          I = n_info              number of bytes in source info section
+//          I = n_info              number of bytes in source info section (always > 0)
 //          C = n_cells             number of bytes/cells in closure section
 //
 //  source info section:
-//      simple_name : var qstr
+//      simple_name : var qstr      always exists
 //      argname0    : var qstr
 //      ...         : var qstr
 //      argnameN    : var qstr      N = num_pos_args + num_kwonly_args - 1
@@ -226,7 +226,7 @@ typedef struct _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;
+    const void *proto_fun;
 } mp_frozen_module_t;
 
 // State for an executing function.
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 3cc117befaad6..002a5cb853529 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -165,7 +165,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(const mp_module_context_t *context, const mp_raw_code_t *rc, qstr source_name) {
+STATIC void do_execute_proto_fun(const mp_module_context_t *context, mp_proto_fun_t proto_fun, qstr source_name) {
     #if MICROPY_PY___FILE__
     mp_store_attr(MP_OBJ_FROM_PTR(&context->module), MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
     #else
@@ -188,7 +188,7 @@ STATIC void do_execute_raw_code(const mp_module_context_t *context, const mp_raw
     nlr_push_jump_callback(&ctx.callback, mp_globals_locals_set_from_nlr_jump_callback);
 
     // make and execute the function
-    mp_obj_t module_fun = mp_make_function_from_raw_code(rc, context, NULL);
+    mp_obj_t module_fun = mp_make_function_from_proto_fun(proto_fun, context, NULL);
     mp_call_function_0(module_fun);
 
     // deregister exception handler and restore context
@@ -230,7 +230,7 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
             #else
             qstr frozen_file_qstr = MP_QSTRnull;
             #endif
-            do_execute_raw_code(module_obj, frozen->rc, frozen_file_qstr);
+            do_execute_proto_fun(module_obj, frozen->proto_fun, frozen_file_qstr);
             return;
         }
         #endif
@@ -247,7 +247,7 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
         mp_compiled_module_t cm;
         cm.context = module_obj;
         mp_raw_code_load_file(file_qstr, &cm);
-        do_execute_raw_code(cm.context, cm.rc, file_qstr);
+        do_execute_proto_fun(cm.context, cm.rc, file_qstr);
         return;
     }
     #endif
diff --git a/py/compile.c b/py/compile.c
index a9b34ce5d91bd..ad8cffc9d5d7c 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3667,7 +3667,7 @@ mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl)
     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);
+    return mp_make_function_from_proto_fun(cm.rc, cm.context, NULL);
 }
 
 #endif // MICROPY_ENABLE_COMPILER
diff --git a/py/dynruntime.h b/py/dynruntime.h
index 3e660f19fda02..7765fca40d598 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -196,8 +196,8 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 #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, context, def_args) \
-    (mp_fun_table.make_function_from_raw_code((rc), (context), (def_args)))
+#define mp_make_function_from_proto_fun(rc, context, def_args) \
+    (mp_fun_table.make_function_from_proto_fun((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))
@@ -208,6 +208,8 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 #define MP_DYNRUNTIME_INIT_ENTRY \
     mp_obj_t old_globals = mp_fun_table.swap_globals(self->context->module.globals); \
     mp_raw_code_truncated_t rc; \
+    rc.proto_fun_indicator[0] = MP_PROTO_FUN_INDICATOR_RAW_CODE_0; \
+    rc.proto_fun_indicator[1] = MP_PROTO_FUN_INDICATOR_RAW_CODE_1; \
     rc.kind = MP_CODE_NATIVE_VIPER; \
     rc.is_generator = 0; \
     (void)rc;
@@ -217,7 +219,7 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
     return mp_const_none;
 
 #define MP_DYNRUNTIME_MAKE_FUNCTION(f) \
-    (mp_make_function_from_raw_code((rc.fun_data = (f), (const mp_raw_code_t *)&rc), self->context, NULL))
+    (mp_make_function_from_proto_fun((rc.fun_data = (f), (const mp_raw_code_t *)&rc), self->context, NULL))
 
 #define mp_import_name(name, fromlist, level) \
     (mp_fun_table.import_name((name), (fromlist), (level)))
diff --git a/py/emitglue.c b/py/emitglue.c
index c0003c5cd5563..1c7e013294b1f 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -173,9 +173,9 @@ 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, 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);
+mp_obj_t mp_make_function_from_proto_fun(mp_proto_fun_t proto_fun, const mp_module_context_t *context, const mp_obj_t *def_args) {
+    DEBUG_OP_printf("make_function_from_proto_fun %p\n", proto_fun);
+    assert(proto_fun != NULL);
 
     // def_args must be MP_OBJ_NULL or a tuple
     assert(def_args == NULL || def_args[0] == MP_OBJ_NULL || mp_obj_is_type(def_args[0], &mp_type_tuple));
@@ -183,6 +183,9 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module
     // def_kw_args must be MP_OBJ_NULL or a dict
     assert(def_args == NULL || def_args[1] == MP_OBJ_NULL || mp_obj_is_type(def_args[1], &mp_type_dict));
 
+    // the proto-function is a mp_raw_code_t
+    const mp_raw_code_t *rc = proto_fun;
+
     // make the function, depending on the raw code kind
     mp_obj_t fun;
     switch (rc->kind) {
@@ -221,16 +224,16 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module
     return fun;
 }
 
-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);
+mp_obj_t mp_make_closure_from_proto_fun(mp_proto_fun_t proto_fun, const mp_module_context_t *context, mp_uint_t n_closed_over, const mp_obj_t *args) {
+    DEBUG_OP_printf("make_closure_from_proto_fun %p " UINT_FMT " %p\n", proto_fun, 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, context, args);
+        ffun = mp_make_function_from_proto_fun(proto_fun, context, args);
     } else {
         // default positional and keyword args not given
-        ffun = mp_make_function_from_raw_code(rc, context, NULL);
+        ffun = mp_make_function_from_proto_fun(proto_fun, 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 125ab2ccd5322..b1c10a1ee4f07 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -31,6 +31,11 @@
 
 // These variables and functions glue the code emitters to the runtime.
 
+// Used with mp_raw_code_t::proto_fun_indicator to detect if a mp_proto_fun_t is a
+// mp_raw_code_t struct or a direct pointer to bytecode.
+#define MP_PROTO_FUN_INDICATOR_RAW_CODE_0 (0)
+#define MP_PROTO_FUN_INDICATOR_RAW_CODE_1 (0)
+
 // These must fit in 8 bits; see scope.h
 enum {
     MP_EMIT_OPT_NONE,
@@ -49,14 +54,25 @@ typedef enum {
     MP_CODE_NATIVE_ASM,
 } mp_raw_code_kind_t;
 
-// This mp_raw_code_t struct holds static information about a non-instantiated function.
+// An mp_proto_fun_t points to static information about a non-instantiated function.
 // A function object is created from this information, and that object can then be executed.
-//
-// This struct appears in the following places:
+// It points either to bytecode, or an mp_raw_code_t struct.
+typedef const void *mp_proto_fun_t;
+
+// Bytecode is distinguished from an mp_raw_code_t struct by the first two bytes: bytecode
+// is guaranteed to have either its first or second byte non-zero.  So if both bytes are
+// zero then the mp_proto_fun_t pointer must be an mp_raw_code_t.
+static inline bool mp_proto_fun_is_bytecode(mp_proto_fun_t proto_fun) {
+    const uint8_t *header = proto_fun;
+    return (header[0] | (header[1] << 8)) != (MP_PROTO_FUN_INDICATOR_RAW_CODE_0 | (MP_PROTO_FUN_INDICATOR_RAW_CODE_1 << 8));
+}
+
+// The mp_raw_code_t struct appears in the following places:
 // 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 {
+    uint8_t proto_fun_indicator[2];
     uint8_t kind; // of type mp_raw_code_kind_t; only 3 bits used
     bool is_generator;
     const void *fun_data;
@@ -88,6 +104,7 @@ typedef struct _mp_raw_code_t {
 // only needed when the kind is MP_CODE_NATIVE_ASM.  So this struct can be used when the
 // kind is MP_CODE_BYTECODE, MP_CODE_NATIVE_PY or MP_CODE_NATIVE_VIPER, to reduce its size.
 typedef struct _mp_raw_code_truncated_t {
+    uint8_t proto_fun_indicator[2];
     uint8_t kind;
     bool is_generator;
     const void *fun_data;
@@ -127,7 +144,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     #endif
     uint16_t scope_flags, uint32_t asm_n_pos_args, uint32_t asm_type_sig);
 
-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);
+mp_obj_t mp_make_function_from_proto_fun(mp_proto_fun_t proto_fun, const mp_module_context_t *context, const mp_obj_t *def_args);
+mp_obj_t mp_make_closure_from_proto_fun(mp_proto_fun_t proto_fun, 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 e6357b3f9f4a8..5f347799e1d9f 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -2657,7 +2657,7 @@ STATIC void emit_native_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_
         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);
+    ASM_CALL_IND(emit->as, MP_F_MAKE_FUNCTION_FROM_PROTO_FUN);
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
@@ -2675,7 +2675,7 @@ STATIC void emit_native_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_c
         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);
+    ASM_CALL_IND(emit->as, MP_F_MAKE_FUNCTION_FROM_PROTO_FUN);
 
     // make closure
     #if REG_ARG_1 != REG_RET
diff --git a/py/emitnx86.c b/py/emitnx86.c
index a9050c65d4036..cb2b7f19eac73 100644
--- a/py/emitnx86.c
+++ b/py/emitnx86.c
@@ -37,7 +37,7 @@ STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
     [MP_F_STORE_SET] = 2,
     [MP_F_LIST_APPEND] = 2,
     [MP_F_STORE_MAP] = 3,
-    [MP_F_MAKE_FUNCTION_FROM_RAW_CODE] = 3,
+    [MP_F_MAKE_FUNCTION_FROM_PROTO_FUN] = 3,
     [MP_F_NATIVE_CALL_FUNCTION_N_KW] = 3,
     [MP_F_CALL_METHOD_N_KW] = 3,
     [MP_F_CALL_METHOD_N_KW_VAR] = 3,
diff --git a/py/nativeglue.c b/py/nativeglue.c
index 217c6b3df3b71..074b1206ee5f5 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -281,7 +281,7 @@ const mp_fun_table_t mp_fun_table = {
     mp_obj_set_store,
     mp_obj_list_append,
     mp_obj_dict_store,
-    mp_make_function_from_raw_code,
+    mp_make_function_from_proto_fun,
     mp_native_call_function_n_kw,
     mp_call_method_n_kw,
     mp_call_method_n_kw_var,
diff --git a/py/nativeglue.h b/py/nativeglue.h
index cf73ffbfc398e..113f5fde6528f 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -58,7 +58,7 @@ typedef enum {
     MP_F_STORE_SET,
     MP_F_LIST_APPEND,
     MP_F_STORE_MAP,
-    MP_F_MAKE_FUNCTION_FROM_RAW_CODE,
+    MP_F_MAKE_FUNCTION_FROM_PROTO_FUN,
     MP_F_NATIVE_CALL_FUNCTION_N_KW,
     MP_F_CALL_METHOD_N_KW,
     MP_F_CALL_METHOD_N_KW_VAR,
@@ -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, const mp_module_context_t *cm, const mp_obj_t *def_args);
+    mp_obj_t (*make_function_from_proto_fun)(mp_proto_fun_t proto_fun, 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);
diff --git a/py/vm.c b/py/vm.c
index a7902d9276732..f87e52c929845 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -893,7 +893,7 @@ unwind_jump:;
 
                 ENTRY(MP_BC_MAKE_FUNCTION): {
                     DECODE_PTR;
-                    PUSH(mp_make_function_from_raw_code(ptr, code_state->fun_bc->context, NULL));
+                    PUSH(mp_make_function_from_proto_fun(ptr, code_state->fun_bc->context, NULL));
                     DISPATCH();
                 }
 
@@ -901,7 +901,7 @@ unwind_jump:;
                     DECODE_PTR;
                     // Stack layout: def_tuple def_dict <- TOS
                     sp -= 1;
-                    SET_TOP(mp_make_function_from_raw_code(ptr, code_state->fun_bc->context, sp));
+                    SET_TOP(mp_make_function_from_proto_fun(ptr, code_state->fun_bc->context, sp));
                     DISPATCH();
                 }
 
@@ -910,7 +910,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, code_state->fun_bc->context, n_closed_over, sp));
+                    SET_TOP(mp_make_closure_from_proto_fun(ptr, code_state->fun_bc->context, n_closed_over, sp));
                     DISPATCH();
                 }
 
@@ -919,7 +919,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, code_state->fun_bc->context, 0x100 | n_closed_over, sp));
+                    SET_TOP(mp_make_closure_from_proto_fun(ptr, code_state->fun_bc->context, 0x100 | n_closed_over, sp));
                     DISPATCH();
                 }
 
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 9f6d9a100206e..cc2aa535042c8 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -88,7 +88,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             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);
+            module_fun = mp_make_function_from_proto_fun(frozen->proto_fun, ctx, NULL);
         } else
         #endif
         {
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 744800c6704ca..33e59c807a37e 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -684,7 +684,7 @@ def freeze(self, compiled_module_index):
         else:
             print("        .obj_table = NULL,")
         print("    },")
-        print("    .rc = (const mp_raw_code_t *)&raw_code_%s," % self.raw_code.escaped_name)
+        print("    .proto_fun = &proto_fun_%s," % self.raw_code.escaped_name)
         print("};")
 
     def freeze_constant_obj(self, obj_name, obj):
@@ -899,7 +899,7 @@ def freeze_children(self, prelude_ptr=None):
                 print()
             print("static const mp_raw_code_t *const children_%s[] = {" % self.escaped_name)
             for rc in self.children:
-                print("    (const mp_raw_code_t *)&raw_code_%s," % rc.escaped_name)
+                print("    (const mp_raw_code_t *)&proto_fun_%s," % rc.escaped_name)
             if prelude_ptr:
                 print("    (void *)%s," % prelude_ptr)
             print("};")
@@ -911,7 +911,9 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
             raw_code_type = "mp_raw_code_t"
         else:
             raw_code_type = "mp_raw_code_truncated_t"
-        print("static const %s raw_code_%s = {" % (raw_code_type, self.escaped_name))
+        print("static const %s proto_fun_%s = {" % (raw_code_type, self.escaped_name))
+        print("    .proto_fun_indicator[0] = MP_PROTO_FUN_INDICATOR_RAW_CODE_0,")
+        print("    .proto_fun_indicator[1] = MP_PROTO_FUN_INDICATOR_RAW_CODE_1,")
         print("    .kind = %s," % RawCode.code_kind_str[self.code_kind])
         print("    .is_generator = %d," % bool(self.scope_flags & MP_SCOPE_FLAG_GENERATOR))
         print("    .fun_data = fun_data_%s," % self.escaped_name)

From a3a73b64a3be5b5cc2b50444c819d81f8347d52f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Feb 2024 17:41:48 +1100
Subject: [PATCH 0838/3129] tools/mpy-tool.py: Skip generating frozen
 mp_raw_code_t when possible.

This reduces frozen code size by using the bytecode directly as the
`mp_proto_fun_t`.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitglue.c     | 12 ++++++++++++
 tools/mpy-tool.py | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/py/emitglue.c b/py/emitglue.c
index 1c7e013294b1f..9d671b710ed3b 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -183,6 +183,18 @@ mp_obj_t mp_make_function_from_proto_fun(mp_proto_fun_t proto_fun, const mp_modu
     // def_kw_args must be MP_OBJ_NULL or a dict
     assert(def_args == NULL || def_args[1] == MP_OBJ_NULL || mp_obj_is_type(def_args[1], &mp_type_dict));
 
+    #if MICROPY_MODULE_FROZEN_MPY
+    if (mp_proto_fun_is_bytecode(proto_fun)) {
+        const uint8_t *bc = proto_fun;
+        mp_obj_t fun = mp_obj_new_fun_bc(def_args, bc, context, NULL);
+        MP_BC_PRELUDE_SIG_DECODE(bc);
+        if (scope_flags & MP_SCOPE_FLAG_GENERATOR) {
+            ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_gen_wrap;
+        }
+        return fun;
+    }
+    #endif
+
     // the proto-function is a mp_raw_code_t
     const mp_raw_code_t *rc = proto_fun;
 
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 33e59c807a37e..38567b37e58e8 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -911,6 +911,13 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
             raw_code_type = "mp_raw_code_t"
         else:
             raw_code_type = "mp_raw_code_truncated_t"
+
+        empty_children = len(self.children) == 0 and prelude_ptr is None
+        generate_minimal = self.code_kind == MP_CODE_BYTECODE and empty_children
+
+        if generate_minimal:
+            print("#if MICROPY_PERSISTENT_CODE_SAVE")
+
         print("static const %s proto_fun_%s = {" % (raw_code_type, self.escaped_name))
         print("    .proto_fun_indicator[0] = MP_PROTO_FUN_INDICATOR_RAW_CODE_0,")
         print("    .proto_fun_indicator[1] = MP_PROTO_FUN_INDICATOR_RAW_CODE_1,")
@@ -961,6 +968,11 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
             print("    .asm_type_sig = %u," % type_sig)
         print("};")
 
+        if generate_minimal:
+            print("#else")
+            print("#define proto_fun_%s fun_data_%s[0]" % (self.escaped_name, self.escaped_name))
+            print("#endif")
+
         global raw_code_count, raw_code_content
         raw_code_count += 1
         raw_code_content += 4 * 4

From 5a3dd8c79185be07b7bf68d51ccc8f98ced59182 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Feb 2024 23:07:48 +1100
Subject: [PATCH 0839/3129] tests/ports/unix: Add coverage test for frozen
 functions and generators.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/coverage/frzmpy/frzmpy4.py | 16 ++++++++++++++++
 tests/ports/unix/extra_coverage.py             |  3 +++
 tests/ports/unix/extra_coverage.py.exp         |  2 ++
 3 files changed, 21 insertions(+)
 create mode 100644 ports/unix/variants/coverage/frzmpy/frzmpy4.py

diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy4.py b/ports/unix/variants/coverage/frzmpy/frzmpy4.py
new file mode 100644
index 0000000000000..669b37535b0f7
--- /dev/null
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy4.py
@@ -0,0 +1,16 @@
+# Test importing frozen functions.
+
+# A simple bytecode function with no children.
+def f():
+    return 1
+
+
+print(__name__, f())
+
+
+# A simple bytecode generator with no children.
+def g():
+    yield 2
+
+
+print(__name__, next(g()))
diff --git a/tests/ports/unix/extra_coverage.py b/tests/ports/unix/extra_coverage.py
index 0ea8f7886bfff..ec68a55508132 100644
--- a/tests/ports/unix/extra_coverage.py
+++ b/tests/ports/unix/extra_coverage.py
@@ -87,6 +87,9 @@
 # test importing various objects
 import frzmpy3
 
+# test importing other things
+import frzmpy4
+
 # test for MP_QSTR_NULL regression
 from frzqstr import returns_NULL
 
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 3db1c5a63e54e..adffc2d5824a4 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -201,6 +201,8 @@ ZeroDivisionError
 X
 '\x1b'
 b'\x00\xff'
+frzmpy4 1
+frzmpy4 2
 NULL
 uPy
 a long string that is not interned

From def6ad474264a677d22f62c741ef422321a4a41a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Feb 2024 10:46:11 +1100
Subject: [PATCH 0840/3129] py/emitglue: Include fun_data_len in mp_raw_code_t
 only when saving.

Reduces the size of mp_raw_code_t in the case when MICROPY_DEBUG_PRINTERS
is enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.h             |  2 +-
 py/compile.c        |  2 +-
 py/emitbc.c         | 11 ++++++++---
 py/emitglue.c       | 12 ++++--------
 py/emitglue.h       | 12 +++---------
 py/persistentcode.c |  4 +---
 py/scope.h          |  3 +++
 py/showbc.c         | 10 +++++-----
 tools/mpy-tool.py   |  4 +---
 9 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/py/bc.h b/py/bc.h
index a1ab7918f2e02..718ba4a684617 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -281,7 +281,7 @@ mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state,
 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_print(const mp_print_t *print, const struct _mp_raw_code_t *rc, size_t fun_data_len, 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)
diff --git a/py/compile.c b/py/compile.c
index ad8cffc9d5d7c..8246a9241cad9 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3625,7 +3625,7 @@ void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool
             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, s->raw_code_data_len, &cm->context->constants);
                 }
             }
         }
diff --git a/py/emitbc.c b/py/emitbc.c
index a07657408fabe..ca5f07085b84d 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -393,13 +393,18 @@ bool mp_emit_bc_end_pass(emit_t *emit) {
             mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("bytecode overflow"));
         }
 
+        #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
+        size_t bytecode_len = emit->code_info_size + emit->bytecode_size;
+        #if MICROPY_DEBUG_PRINTERS
+        emit->scope->raw_code_data_len = bytecode_len;
+        #endif
+        #endif
+
         // 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,
-            #endif
             emit->emit_common->children,
             #if MICROPY_PERSISTENT_CODE_SAVE
+            bytecode_len,
             emit->emit_common->ct_cur_child,
             #endif
             emit->scope->scope_flags);
diff --git a/py/emitglue.c b/py/emitglue.c
index 9d671b710ed3b..7dc3080870182 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -61,11 +61,9 @@ mp_raw_code_t *mp_emit_glue_new_raw_code(void) {
 }
 
 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
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
+    size_t len,
     uint16_t n_children,
     #endif
     uint16_t scope_flags) {
@@ -73,12 +71,10 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     rc->kind = MP_CODE_BYTECODE;
     rc->is_generator = (scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0;
     rc->fun_data = code;
-    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
-    rc->fun_data_len = len;
-    #endif
     rc->children = children;
 
     #if MICROPY_PERSISTENT_CODE_SAVE
+    rc->fun_data_len = len;
     rc->n_children = n_children;
     #endif
 
@@ -88,7 +84,7 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #endif
 
     #if DEBUG_PRINT
-    #if !(MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS)
+    #if !MICROPY_PERSISTENT_CODE_SAVE
     const size_t len = 0;
     #endif
     DEBUG_printf("assign byte code: code=%p len=" UINT_FMT " flags=%x\n", code, len, (uint)scope_flags);
@@ -136,7 +132,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     rc->is_generator = (scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0;
     rc->fun_data = fun_data;
 
-    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
+    #if MICROPY_PERSISTENT_CODE_SAVE
     rc->fun_data_len = fun_len;
     #endif
     rc->children = children;
diff --git a/py/emitglue.h b/py/emitglue.h
index b1c10a1ee4f07..b7368d697ddf7 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -77,10 +77,8 @@ typedef struct _mp_raw_code_t {
     bool is_generator;
     const void *fun_data;
     struct _mp_raw_code_t **children;
-    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
-    uint32_t fun_data_len; // so mp_raw_code_save and mp_bytecode_print work
-    #endif
     #if MICROPY_PERSISTENT_CODE_SAVE
+    uint32_t fun_data_len; // for mp_raw_code_save
     uint16_t n_children;
     #if MICROPY_EMIT_MACHINE_CODE
     uint16_t prelude_offset;
@@ -109,10 +107,8 @@ typedef struct _mp_raw_code_truncated_t {
     bool is_generator;
     const void *fun_data;
     struct _mp_raw_code_t **children;
-    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
-    uint32_t fun_data_len;
-    #endif
     #if MICROPY_PERSISTENT_CODE_SAVE
+    uint32_t fun_data_len;
     uint16_t n_children;
     #if MICROPY_EMIT_MACHINE_CODE
     uint16_t prelude_offset;
@@ -127,11 +123,9 @@ typedef struct _mp_raw_code_truncated_t {
 mp_raw_code_t *mp_emit_glue_new_raw_code(void);
 
 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
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
+    size_t len,
     uint16_t n_children,
     #endif
     uint16_t scope_flags);
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 7b002e7fcfc2f..1fe9a9a23fde8 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -324,11 +324,9 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
         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
             children,
             #if MICROPY_PERSISTENT_CODE_SAVE
+            fun_data_len,
             n_children,
             #endif
             scope_flags);
diff --git a/py/scope.h b/py/scope.h
index e7d2a304f79f3..927c4a7b93e2b 100644
--- a/py/scope.h
+++ b/py/scope.h
@@ -76,6 +76,9 @@ typedef struct _scope_t {
     struct _scope_t *next;
     mp_parse_node_t pn;
     mp_raw_code_t *raw_code;
+    #if MICROPY_DEBUG_PRINTERS
+    size_t raw_code_data_len; // for mp_bytecode_print
+    #endif
     uint16_t simple_name; // a qstr
     uint16_t scope_flags;  // see runtime0.h
     uint16_t emit_options; // see emitglue.h
diff --git a/py/showbc.c b/py/showbc.c
index f9c334b93bbbb..6913d18c1ca82 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -83,7 +83,7 @@
     DECODE_UINT; \
     unum = (mp_uint_t)obj_table[unum]
 
-void mp_bytecode_print(const mp_print_t *print, const mp_raw_code_t *rc, const mp_module_constants_t *cm) {
+void mp_bytecode_print(const mp_print_t *print, const mp_raw_code_t *rc, size_t fun_data_len, const mp_module_constants_t *cm) {
     const byte *ip_start = rc->fun_data;
     const byte *ip = rc->fun_data;
 
@@ -100,13 +100,13 @@ void mp_bytecode_print(const mp_print_t *print, const mp_raw_code_t *rc, const m
     qstr source_file = cm->source_file;
     #endif
     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);
+        qstr_str(source_file), qstr_str(block_name), rc, ip_start, (unsigned)fun_data_len);
 
     // raw bytecode dump
     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)(rc->fun_data_len - prelude_size));
-    for (size_t i = 0; i < rc->fun_data_len; i++) {
+        (unsigned)prelude_size, (unsigned)(fun_data_len - prelude_size));
+    for (size_t i = 0; i < fun_data_len; i++) {
         if (i > 0 && i % 16 == 0) {
             mp_printf(print, "\n");
         }
@@ -158,7 +158,7 @@ void mp_bytecode_print(const mp_print_t *print, const mp_raw_code_t *rc, const m
             mp_printf(print, "  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
         }
     }
-    mp_bytecode_print2(print, ip, rc->fun_data_len - prelude_size, rc->children, cm);
+    mp_bytecode_print2(print, ip, fun_data_len - prelude_size, rc->children, cm);
 }
 
 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) {
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 38567b37e58e8..35c06a30282e0 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -930,10 +930,8 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
             print("    .children = (void *)%s," % prelude_ptr)
         else:
             print("    .children = NULL,")
-        print("    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS")
-        print("    .fun_data_len = %u," % len(self.fun_data))
-        print("    #endif")
         print("    #if MICROPY_PERSISTENT_CODE_SAVE")
+        print("    .fun_data_len = %u," % len(self.fun_data))
         print("    .n_children = %u," % len(self.children))
         print("    #if MICROPY_EMIT_MACHINE_CODE")
         print("    .prelude_offset = %u," % self.prelude_offset)

From 1ef2944b984545cd9c25a3a16c4fd80c97754eeb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 17:18:18 +1100
Subject: [PATCH 0841/3129] tools/manifestfile.py: Add --unix-ffi option.

Follow up to 35dd959133fb233d75e9b3cddbf98b2ed01c6594, allows explicitly
adding the unix-ffi library path from the command line.

This option is needed when building unix-ffi manifests in micropython-lib
CI.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/manifestfile.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index 47403d4e3bc18..c1fc836585fb9 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -603,6 +603,9 @@ def main():
         default=os.path.join(os.path.dirname(__file__), "../lib/micropython-lib"),
         help="path to micropython-lib repo",
     )
+    cmd_parser.add_argument(
+        "--unix-ffi", action="store_true", help="prepend unix-ffi to the library path"
+    )
     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(
@@ -632,6 +635,8 @@ def main():
         exit(1)
 
     m = ManifestFile(mode, path_vars)
+    if args.unix_ffi:
+        m.add_library("unix-ffi", os.path.join("$(MPY_LIB_DIR)", "unix-ffi"), prepend=True)
     for manifest_file in args.files:
         try:
             m.execute(manifest_file)

From 9242e3d16d34dd15f1cd868681be45432b443c5a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Feb 2024 13:08:23 +1100
Subject: [PATCH 0842/3129] py/makeversionhdr.py: Reinstate MICROPY_GIT_HASH in
 mpversion.h.

MICROPY_GIT_HASH was removed in 69e34b6b6bdf45bc1111777c46839a8b5fcb30bd
but it is useful for, and used by, third-party code to tell which hash of
MicroPython is used.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/makeversionhdr.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 2030bb02c4cdc..cb7325e416cb4 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -25,7 +25,6 @@ def get_version_info_from_git(repo_path):
     # Python 2.6 doesn't have check_output, so check for that
     try:
         subprocess.check_output
-        subprocess.check_call
     except AttributeError:
         return None
 
@@ -44,9 +43,25 @@ def get_version_info_from_git(repo_path):
             return git_tag[0]
         else:
             return git_tag[0] + "-" + git_tag[1].replace("-", ".")
-    except subprocess.CalledProcessError:
+    except (subprocess.CalledProcessError, OSError):
         return None
-    except OSError:
+
+
+def get_hash_from_git(repo_path):
+    # Python 2.6 doesn't have check_output, so check for that.
+    try:
+        subprocess.check_output
+    except AttributeError:
+        return None
+
+    try:
+        return subprocess.check_output(
+            ["git", "rev-parse", "--short", "HEAD"],
+            cwd=repo_path,
+            stderr=subprocess.STDOUT,
+            universal_newlines=True,
+        ).strip()
+    except (subprocess.CalledProcessError, OSError):
         return None
 
 
@@ -86,10 +101,13 @@ def get_version_info_from_mpconfig(repo_path):
 
 def make_version_header(repo_path, filename):
     git_tag = None
+    git_hash = None
     if "MICROPY_GIT_TAG" in os.environ:
         git_tag = os.environ["MICROPY_GIT_TAG"]
+        git_hash = os.environ.get("MICROPY_GIT_HASH")
     if git_tag is None:
         git_tag = get_version_info_from_git(repo_path)
+        git_hash = get_hash_from_git(repo_path)
     if git_tag is None:
         git_tag = get_version_info_from_mpconfig(repo_path)
 
@@ -104,12 +122,15 @@ def make_version_header(repo_path, filename):
         ).date()
 
     # Generate the file with the git and version info
+    # Note: MICROPY_GIT_HASH may be used by third-party code.
     file_data = """\
 // This file was generated by py/makeversionhdr.py
 #define MICROPY_GIT_TAG "%s"
+#define MICROPY_GIT_HASH "%s"
 #define MICROPY_BUILD_DATE "%s"
 """ % (
         git_tag,
+        git_hash or "<no hash>",
         build_date.strftime("%Y-%m-%d"),
     )
 

From 24234937747e6d7fd920d21358fb26b826398e1a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 11:41:28 +1100
Subject: [PATCH 0843/3129] py/obj: Change sizeof to offsetof in
 mp_obj_malloc_var macro.

Following b6a977848407a4ced45d118cf926bd915cc89dfb, to properly calculate
the size of the variable-length allocation.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modcryptolib.c                             |  6 +++---
 extmod/modhashlib.c                               | 12 ++++++------
 extmod/modre.c                                    |  2 +-
 ports/nrf/boards/MICROBIT/modules/microbitimage.c |  2 +-
 ports/unix/modffi.c                               |  4 ++--
 py/modio.c                                        |  2 +-
 py/obj.h                                          |  2 +-
 py/objattrtuple.c                                 |  2 +-
 py/objclosure.c                                   |  2 +-
 py/objfun.c                                       |  2 +-
 py/objgenerator.c                                 |  4 ++--
 py/objmap.c                                       |  2 +-
 py/objnamedtuple.c                                |  2 +-
 py/objtuple.c                                     |  2 +-
 py/objtype.c                                      |  2 +-
 py/objzip.c                                       |  2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/extmod/modcryptolib.c b/extmod/modcryptolib.c
index b33d8533fc5e6..66511b0f75ee4 100644
--- a/extmod/modcryptolib.c
+++ b/extmod/modcryptolib.c
@@ -87,6 +87,7 @@ typedef struct _mp_obj_aes_t {
 #define AES_KEYTYPE_ENC  1
 #define AES_KEYTYPE_DEC  2
     uint8_t key_type : 2;
+    struct ctr_params ctr_params[]; // optional
 } mp_obj_aes_t;
 
 static inline bool is_ctr_mode(int block_mode) {
@@ -98,8 +99,7 @@ static inline bool is_ctr_mode(int block_mode) {
 }
 
 static inline struct ctr_params *ctr_params_from_aes(mp_obj_aes_t *o) {
-    // ctr_params follows aes object struct
-    return (struct ctr_params *)&o[1];
+    return &o->ctr_params[0];
 }
 
 #if MICROPY_SSL_AXTLS
@@ -228,7 +228,7 @@ STATIC mp_obj_t cryptolib_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 = mp_obj_malloc_var(mp_obj_aes_t, struct ctr_params, !!is_ctr_mode(block_mode), type);
+    mp_obj_aes_t *o = mp_obj_malloc_var(mp_obj_aes_t, ctr_params, struct ctr_params, !!is_ctr_mode(block_mode), type);
 
     o->block_mode = block_mode;
     o->key_type = AES_KEYTYPE_NONE;
diff --git a/extmod/modhashlib.c b/extmod/modhashlib.c
index 263144a5c9d32..dbebd78667646 100644
--- a/extmod/modhashlib.c
+++ b/extmod/modhashlib.c
@@ -83,7 +83,7 @@ STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
 STATIC mp_obj_t hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(mbedtls_sha256_context), type);
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, state, 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);
@@ -118,7 +118,7 @@ STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
 
 STATIC mp_obj_t hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(CRYAL_SHA256_CTX), type);
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(CRYAL_SHA256_CTX), type);
     o->final = false;
     sha256_init((CRYAL_SHA256_CTX *)o->state);
     if (n_args == 1) {
@@ -172,7 +172,7 @@ STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg);
 #if MICROPY_SSL_AXTLS
 STATIC mp_obj_t hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(SHA1_CTX), type);
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(SHA1_CTX), type);
     o->final = false;
     SHA1_Init((SHA1_CTX *)o->state);
     if (n_args == 1) {
@@ -211,7 +211,7 @@ STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
 
 STATIC mp_obj_t hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(mbedtls_sha1_context), type);
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, state, 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);
@@ -266,7 +266,7 @@ STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg);
 #if MICROPY_SSL_AXTLS
 STATIC mp_obj_t hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(MD5_CTX), type);
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(MD5_CTX), type);
     o->final = false;
     MD5_Init((MD5_CTX *)o->state);
     if (n_args == 1) {
@@ -305,7 +305,7 @@ STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
 
 STATIC mp_obj_t hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(mbedtls_md5_context), type);
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, state, 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/modre.c b/extmod/modre.c
index c24c07d0951b5..9d5d7178728ed 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -428,7 +428,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, (mp_obj_type_t *)&re_type);
+    mp_obj_re_t *o = mp_obj_malloc_var(mp_obj_re_t, re.insts, char, size, (mp_obj_type_t *)&re_type);
     #if MICROPY_PY_RE_DEBUG
     int flags = 0;
     if (n_args > 1) {
diff --git a/ports/nrf/boards/MICROBIT/modules/microbitimage.c b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
index 08ef4babcf464..b3505c20a394d 100644
--- a/ports/nrf/boards/MICROBIT/modules/microbitimage.c
+++ b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
@@ -113,7 +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 = mp_obj_malloc_var(greyscale_t, uint8_t, (w*h+1)>>1, &microbit_image_type);
+    greyscale_t *result = mp_obj_malloc_var(greyscale_t, byte_data, uint8_t, (w*h+1)>>1, &microbit_image_type);
     result->five = 0;
     result->width = w;
     result->height = h;
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index bc585f8647bc6..897fa07ace1f3 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -227,7 +227,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 = mp_obj_malloc_var(mp_obj_ffifunc_t, ffi_type *, nparams, &ffifunc_type);
+    mp_obj_ffifunc_t *o = mp_obj_malloc_var(mp_obj_ffifunc_t, params, ffi_type *, nparams, &ffifunc_type);
 
     o->func = func;
     o->rettype = *rettype;
@@ -334,7 +334,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 = mp_obj_malloc_var(mp_obj_fficallback_t, ffi_type *, nparams, &fficallback_type);
+    mp_obj_fficallback_t *o = mp_obj_malloc_var(mp_obj_fficallback_t, params, ffi_type *, nparams, &fficallback_type);
 
     o->clo = ffi_closure_alloc(sizeof(ffi_closure), &o->func);
 
diff --git a/py/modio.c b/py/modio.c
index 39317c52d545f..37eff3c41c4a0 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -119,7 +119,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 = mp_obj_malloc_var(mp_obj_bufwriter_t, byte, alloc, type);
+    mp_obj_bufwriter_t *o = mp_obj_malloc_var(mp_obj_bufwriter_t, buf, byte, alloc, type);
     o->stream = args[0];
     o->alloc = alloc;
     o->len = 0;
diff --git a/py/obj.h b/py/obj.h
index c7b7db0c38346..5d49873ff91c9 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -913,7 +913,7 @@ extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj;
 // 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))
+#define mp_obj_malloc_var(struct_type, var_field, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_helper(offsetof(struct_type, var_field) + 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
diff --git a/py/objattrtuple.c b/py/objattrtuple.c
index fbe04bedb877a..1ec9499893236 100644
--- a/py/objattrtuple.c
+++ b/py/objattrtuple.c
@@ -71,7 +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 = mp_obj_malloc_var(mp_obj_tuple_t, mp_obj_t, n + 1, &mp_type_attrtuple);
+    mp_obj_tuple_t *o = mp_obj_malloc_var(mp_obj_tuple_t, items, 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/objclosure.c b/py/objclosure.c
index 6059d18100e03..88109cc919642 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -105,7 +105,7 @@ MP_DEFINE_CONST_OBJ_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 = mp_obj_malloc_var(mp_obj_closure_t, mp_obj_t, n_closed_over, &mp_type_closure);
+    mp_obj_closure_t *o = mp_obj_malloc_var(mp_obj_closure_t, closed, 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/objfun.c b/py/objfun.c
index e2136968b621f..930d0ccdf4f51 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -384,7 +384,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 = mp_obj_malloc_var(mp_obj_fun_bc_t, mp_obj_t, n_extra_args, &mp_type_fun_bc);
+    mp_obj_fun_bc_t *o = mp_obj_malloc_var(mp_obj_fun_bc_t, extra_args, mp_obj_t, n_extra_args, &mp_type_fun_bc);
     o->bytecode = code;
     o->context = context;
     o->child_table = child_table;
diff --git a/py/objgenerator.c b/py/objgenerator.c
index ecd1f583ea012..7786b1fc81b08 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -59,7 +59,7 @@ 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 = mp_obj_malloc_var(mp_obj_gen_instance_t, byte,
+    mp_obj_gen_instance_t *o = mp_obj_malloc_var(mp_obj_gen_instance_t, code_state.state, byte,
         n_state * sizeof(mp_obj_t) + n_exc_stack * sizeof(mp_exc_stack_t),
         &mp_type_gen_instance);
 
@@ -114,7 +114,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_native_t *o = mp_obj_malloc_var(mp_obj_gen_instance_native_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, code_state.state, 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/objmap.c b/py/objmap.c
index e7e594cd2c54b..98ff19bb7bb6f 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -38,7 +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 = mp_obj_malloc_var(mp_obj_map_t, mp_obj_t, n_args - 1, type);
+    mp_obj_map_t *o = mp_obj_malloc_var(mp_obj_map_t, iters, 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/objnamedtuple.c b/py/objnamedtuple.c
index e586f089458d8..0adf83fe96bcd 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -110,7 +110,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
 
     // 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);
+    mp_obj_tuple_t *tuple = mp_obj_malloc_var(mp_obj_tuple_t, items, mp_obj_t, num_fields, type_in);
     tuple->len = num_fields;
 
     // Copy the positional args into the first slots of the namedtuple
diff --git a/py/objtuple.c b/py/objtuple.c
index 969c488ee2318..cb1d7cd388a91 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -244,7 +244,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 = mp_obj_malloc_var(mp_obj_tuple_t, mp_obj_t, n, &mp_type_tuple);
+    mp_obj_tuple_t *o = mp_obj_malloc_var(mp_obj_tuple_t, items, 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 d21c2a4b5b509..694db3008f6f2 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -99,7 +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 = mp_obj_malloc_var(mp_obj_instance_t, mp_obj_t, num_native_bases, class);
+    mp_obj_instance_t *o = mp_obj_malloc_var(mp_obj_instance_t, subobj, 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 3c3138180a28f..7b4ae7548e8a5 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -39,7 +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 = mp_obj_malloc_var(mp_obj_zip_t, mp_obj_t, n_args, type);
+    mp_obj_zip_t *o = mp_obj_malloc_var(mp_obj_zip_t, iters, 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);

From 4133c0304011ff7be23f47516aac20ed54505e7a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 10:58:36 +1100
Subject: [PATCH 0844/3129] py/obj: Introduce mp_obj_malloc_with_finaliser to
 allocate and set type.

Following 709e8328d9812a2e02da6fba65a03f9a873d60a2.

Using this helps to reduce code size.  And it ensure that the type is
always set as soon as the object is allocated, which is important for the
GC to function correctly.

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

diff --git a/py/obj.c b/py/obj.c
index 5e01198b6fb4c..e43451dadd512 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -44,6 +44,15 @@ MP_NOINLINE void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *ty
     return base;
 }
 
+#if MICROPY_ENABLE_FINALISER
+// Allocates an object and also sets type, for mp_obj_malloc{,_var}_with_finaliser macros.
+MP_NOINLINE void *mp_obj_malloc_with_finaliser_helper(size_t num_bytes, const mp_obj_type_t *type) {
+    mp_obj_base_t *base = (mp_obj_base_t *)m_malloc_with_finaliser(num_bytes);
+    base->type = type;
+    return base;
+}
+#endif
+
 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 5d49873ff91c9..bd0df3fd682cf 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -916,6 +916,16 @@ extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj;
 #define mp_obj_malloc_var(struct_type, var_field, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_helper(offsetof(struct_type, var_field) + sizeof(var_type) * (var_num), obj_type))
 void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 
+// Object allocation macros for allocating objects that have a finaliser.
+#if MICROPY_ENABLE_FINALISER
+#define mp_obj_malloc_with_finaliser(struct_type, obj_type) ((struct_type *)mp_obj_malloc_with_finaliser_helper(sizeof(struct_type), obj_type))
+#define mp_obj_malloc_var_with_finaliser(struct_type, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_with_finaliser_helper(sizeof(struct_type) + sizeof(var_type) * (var_num), obj_type))
+void *mp_obj_malloc_with_finaliser_helper(size_t num_bytes, const mp_obj_type_t *type);
+#else
+#define mp_obj_malloc_with_finaliser(struct_type, obj_type) mp_obj_malloc(struct_type, obj_type)
+#define mp_obj_malloc_var_with_finaliser(struct_type, var_type, var_num, obj_type) mp_obj_malloc_var(struct_type, var_type, var_num, obj_type)
+#endif
+
 // 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 cae690d047900b842beaa7798b5362b5646130af Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 11:02:58 +1100
Subject: [PATCH 0845/3129] all: Use mp_obj_malloc_with_finaliser everywhere
 it's applicable.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modlwip.c              |  6 ++----
 extmod/modsocket.c            |  6 ++----
 extmod/modtls_axtls.c         | 10 ++++------
 extmod/modtls_mbedtls.c       | 10 ++++------
 extmod/vfs_fat.c              |  3 +--
 extmod/vfs_fat_file.c         |  3 +--
 extmod/vfs_lfsx.c             |  3 +--
 extmod/vfs_lfsx_file.c        |  5 ++---
 extmod/vfs_posix.c            |  3 +--
 extmod/vfs_posix_file.c       |  3 +--
 ports/cc3200/mods/modsocket.c |  5 ++---
 ports/esp32/esp32_rmt.c       |  3 +--
 ports/esp32/machine_i2s.c     |  3 +--
 ports/esp32/machine_sdcard.c  |  3 +--
 ports/esp32/modsocket.c       |  6 ++----
 ports/esp32/network_ppp.c     |  4 +---
 ports/rp2/machine_timer.c     |  3 +--
 ports/rp2/rp2_dma.c           |  3 +--
 ports/zephyr/modsocket.c      |  3 +--
 19 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 8ccc388913f42..a6630c693cad5 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -831,8 +831,7 @@ STATIC void lwip_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 STATIC mp_obj_t lwip_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);
 
-    lwip_socket_obj_t *socket = m_new_obj_with_finaliser(lwip_socket_obj_t);
-    socket->base.type = &lwip_socket_type;
+    lwip_socket_obj_t *socket = mp_obj_malloc_with_finaliser(lwip_socket_obj_t, &lwip_socket_type);
     socket->timeout = -1;
     socket->recv_offset = 0;
     socket->domain = MOD_NETWORK_AF_INET;
@@ -994,8 +993,7 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
 
     // Create new socket object, do it here because we must not raise an out-of-memory
     // exception when the LWIP concurrency lock is held
-    lwip_socket_obj_t *socket2 = m_new_obj_with_finaliser(lwip_socket_obj_t);
-    socket2->base.type = &lwip_socket_type;
+    lwip_socket_obj_t *socket2 = mp_obj_malloc_with_finaliser(lwip_socket_obj_t, &lwip_socket_type);
 
     MICROPY_PY_LWIP_ENTER
 
diff --git a/extmod/modsocket.c b/extmod/modsocket.c
index 72a32e3cba4eb..4a857fb62e6ff 100644
--- a/extmod/modsocket.c
+++ b/extmod/modsocket.c
@@ -54,8 +54,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     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);
-    s->base.type = &socket_type;
+    mod_network_socket_obj_t *s = mp_obj_malloc_with_finaliser(mod_network_socket_obj_t, &socket_type);
     s->nic = MP_OBJ_NULL;
     s->nic_protocol = NULL;
     s->domain = MOD_NETWORK_AF_INET;
@@ -163,8 +162,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
 
     // create new socket object
     // starts with empty NIC so that finaliser doesn't run close() method if accept() fails
-    mod_network_socket_obj_t *socket2 = m_new_obj_with_finaliser(mod_network_socket_obj_t);
-    socket2->base.type = &socket_type;
+    mod_network_socket_obj_t *socket2 = mp_obj_malloc_with_finaliser(mod_network_socket_obj_t, &socket_type);
     socket2->nic = MP_OBJ_NULL;
     socket2->nic_protocol = NULL;
 
diff --git a/extmod/modtls_axtls.c b/extmod/modtls_axtls.c
index 1ac40208db003..4f6b06f66d6e2 100644
--- a/extmod/modtls_axtls.c
+++ b/extmod/modtls_axtls.c
@@ -145,11 +145,10 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
 
     // Create SSLContext object.
     #if MICROPY_PY_SSL_FINALISER
-    mp_obj_ssl_context_t *self = m_new_obj_with_finaliser(mp_obj_ssl_context_t);
+    mp_obj_ssl_context_t *self = mp_obj_malloc_with_finaliser(mp_obj_ssl_context_t, type_in);
     #else
-    mp_obj_ssl_context_t *self = m_new_obj(mp_obj_ssl_context_t);
+    mp_obj_ssl_context_t *self = mp_obj_malloc(mp_obj_ssl_context_t, type_in);
     #endif
-    self->base.type = type_in;
     self->key = mp_const_none;
     self->cert = mp_const_none;
 
@@ -210,11 +209,10 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
 
     #if MICROPY_PY_SSL_FINALISER
-    mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t);
+    mp_obj_ssl_socket_t *o = mp_obj_malloc_with_finaliser(mp_obj_ssl_socket_t, &ssl_socket_type);
     #else
-    mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t);
+    mp_obj_ssl_socket_t *o = mp_obj_malloc(mp_obj_ssl_socket_t, &ssl_socket_type);
     #endif
-    o->base.type = &ssl_socket_type;
     o->buf = NULL;
     o->bytes_left = 0;
     o->sock = MP_OBJ_NULL;
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 6cb4f002051b4..4d0ccd2c0e794 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -210,11 +210,10 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
 
     // Create SSLContext object.
     #if MICROPY_PY_SSL_FINALISER
-    mp_obj_ssl_context_t *self = m_new_obj_with_finaliser(mp_obj_ssl_context_t);
+    mp_obj_ssl_context_t *self = mp_obj_malloc_with_finaliser(mp_obj_ssl_context_t, type_in);
     #else
-    mp_obj_ssl_context_t *self = m_new_obj(mp_obj_ssl_context_t);
+    mp_obj_ssl_context_t *self = mp_obj_malloc(mp_obj_ssl_context_t, type_in);
     #endif
-    self->base.type = type_in;
 
     // Initialise mbedTLS state.
     mbedtls_ssl_config_init(&self->conf);
@@ -488,11 +487,10 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     mp_get_stream_raise(sock, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
 
     #if MICROPY_PY_SSL_FINALISER
-    mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t);
+    mp_obj_ssl_socket_t *o = mp_obj_malloc_with_finaliser(mp_obj_ssl_socket_t, &ssl_socket_type);
     #else
-    mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t);
+    mp_obj_ssl_socket_t *o = mp_obj_malloc(mp_obj_ssl_socket_t, &ssl_socket_type);
     #endif
-    o->base.type = &ssl_socket_type;
     o->ssl_context = ssl_context;
     o->sock = sock;
     o->poll_mask = 0;
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index efb6bf7e9815d..67c95d9a1712b 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -188,8 +188,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_with_finaliser(mp_vfs_fat_ilistdir_it_t);
-    iter->base.type = &mp_type_polymorph_iter_with_finaliser;
+    mp_vfs_fat_ilistdir_it_t *iter = mp_obj_malloc_with_finaliser(mp_vfs_fat_ilistdir_it_t, &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;
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index f82fe4aaae7e2..e2f6937694256 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -228,8 +228,7 @@ STATIC mp_obj_t fat_vfs_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_i
         }
     }
 
-    pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
-    o->base.type = type;
+    pyb_file_obj_t *o = mp_obj_malloc_with_finaliser(pyb_file_obj_t, type);
 
     const char *fname = mp_obj_str_get_str(path_in);
     FRESULT res = f_open(&self->fatfs, &o->fp, fname, mode);
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index e78c154d1fe8d..ddcbdf3ac4d75 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -224,8 +224,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_with_finaliser(MP_VFS_LFSx(ilistdir_it_t));
-    iter->base.type = &mp_type_polymorph_iter_with_finaliser;
+    MP_VFS_LFSx(ilistdir_it_t) * iter = mp_obj_malloc_with_finaliser(MP_VFS_LFSx(ilistdir_it_t), &mp_type_polymorph_iter_with_finaliser);
 
     iter->iternext = MP_VFS_LFSx(ilistdir_it_iternext);
     iter->finaliser = MP_VFS_LFSx(ilistdir_it_del);
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index b9f332339733e..04058506441b5 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -90,11 +90,10 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
     }
 
     #if LFS_BUILD_VERSION == 1
-    MP_OBJ_VFS_LFSx_FILE *o = m_new_obj_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, file_buffer, uint8_t, self->lfs.cfg->prog_size);
+    MP_OBJ_VFS_LFSx_FILE *o = mp_obj_malloc_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, uint8_t, self->lfs.cfg->prog_size, type);
     #else
-    MP_OBJ_VFS_LFSx_FILE *o = m_new_obj_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, file_buffer, uint8_t, self->lfs.cfg->cache_size);
+    MP_OBJ_VFS_LFSx_FILE *o = mp_obj_malloc_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, uint8_t, self->lfs.cfg->cache_size, type);
     #endif
-    o->base.type = type;
     o->vfs = self;
     #if !MICROPY_GC_CONSERVATIVE_CLEAR
     memset(&o->file, 0, sizeof(o->file));
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index e29b47cccda83..2e0f712e25ede 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -278,8 +278,7 @@ STATIC mp_obj_t vfs_posix_ilistdir_it_del(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_with_finaliser(vfs_posix_ilistdir_it_t);
-    iter->base.type = &mp_type_polymorph_iter_with_finaliser;
+    vfs_posix_ilistdir_it_t *iter = mp_obj_malloc_with_finaliser(vfs_posix_ilistdir_it_t, &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;
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 2f70789543911..46a866a78aff1 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -63,7 +63,6 @@ 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_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;
@@ -92,7 +91,7 @@ mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_
         }
     }
 
-    o->base.type = type;
+    mp_obj_vfs_posix_file_t *o = mp_obj_malloc_with_finaliser(mp_obj_vfs_posix_file_t, type);
 
     mp_obj_t fid = file_in;
 
diff --git a/ports/cc3200/mods/modsocket.c b/ports/cc3200/mods/modsocket.c
index a107fa7120736..0f56c15e821fe 100644
--- a/ports/cc3200/mods/modsocket.c
+++ b/ports/cc3200/mods/modsocket.c
@@ -436,8 +436,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     mp_arg_check_num(n_args, n_kw, 0, 4, false);
 
     // create socket object
-    mod_network_socket_obj_t *s = m_new_obj_with_finaliser(mod_network_socket_obj_t);
-    s->base.type = (mp_obj_t)&socket_type;
+    mod_network_socket_obj_t *s = mp_obj_malloc_with_finaliser(mod_network_socket_obj_t, &socket_type);
     s->sock_base.u_param.domain = SL_AF_INET;
     s->sock_base.u_param.type = SL_SOCK_STREAM;
     s->sock_base.u_param.proto = SL_IPPROTO_TCP;
@@ -508,7 +507,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     mod_network_socket_obj_t *self = self_in;
 
     // create new socket object
-    mod_network_socket_obj_t *socket2 = m_new_obj_with_finaliser(mod_network_socket_obj_t);
+    mod_network_socket_obj_t *socket2 = mp_obj_malloc_with_finaliser(mod_network_socket_obj_t, self->base.type);
     // the new socket inherits all properties from its parent
     memcpy (socket2, self, sizeof(mod_network_socket_obj_t));
 
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 77a31ebc0f66e..494ae48f46cfe 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -131,8 +131,7 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
         mp_raise_ValueError(MP_ERROR_TEXT("clock_div must be between 1 and 255"));
     }
 
-    esp32_rmt_obj_t *self = m_new_obj_with_finaliser(esp32_rmt_obj_t);
-    self->base.type = &esp32_rmt_type;
+    esp32_rmt_obj_t *self = mp_obj_malloc_with_finaliser(esp32_rmt_obj_t, &esp32_rmt_type);
     self->channel_id = channel_id;
     self->pin = pin_id;
     self->clock_div = clock_div;
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 8a9787c34e859..3b7bcfeffc673 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -405,8 +405,7 @@ STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
 
     machine_i2s_obj_t *self;
     if (MP_STATE_PORT(machine_i2s_obj)[i2s_id] == NULL) {
-        self = m_new_obj_with_finaliser(machine_i2s_obj_t);
-        self->base.type = &machine_i2s_type;
+        self = mp_obj_malloc_with_finaliser(machine_i2s_obj_t, &machine_i2s_type);
         MP_STATE_PORT(machine_i2s_obj)[i2s_id] = self;
         self->i2s_id = i2s_id;
     } else {
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index bc4aaf30c6f2b..8cc6452ddc503 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -224,8 +224,7 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
 
     DEBUG_printf("  Setting up host configuration");
 
-    sdcard_card_obj_t *self = m_new_obj_with_finaliser(sdcard_card_obj_t);
-    self->base.type = &machine_sdcard_type;
+    sdcard_card_obj_t *self = mp_obj_malloc_with_finaliser(sdcard_card_obj_t, &machine_sdcard_type);
     self->flags = 0;
     // Note that these defaults are macros that expand to structure
     // constants so we can't directly assign them to fields.
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index af949401569cd..9280ab203d25b 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -270,8 +270,7 @@ STATIC void _socket_getaddrinfo(const mp_obj_t addrtuple, struct addrinfo **resp
 STATIC mp_obj_t socket_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, 0, 3, false);
 
-    socket_obj_t *sock = m_new_obj_with_finaliser(socket_obj_t);
-    sock->base.type = type_in;
+    socket_obj_t *sock = mp_obj_malloc_with_finaliser(socket_obj_t, type_in);
     sock->domain = AF_INET;
     sock->type = SOCK_STREAM;
     sock->proto = 0;
@@ -364,8 +363,7 @@ STATIC mp_obj_t socket_accept(const mp_obj_t arg0) {
     }
 
     // create new socket object
-    socket_obj_t *sock = m_new_obj_with_finaliser(socket_obj_t);
-    sock->base.type = self->base.type;
+    socket_obj_t *sock = mp_obj_malloc_with_finaliser(socket_obj_t, self->base.type);
     sock->fd = new_fd;
     sock->domain = self->domain;
     sock->type = self->type;
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 08443752cc26c..cf644a6bd7319 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -87,9 +87,7 @@ static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
 STATIC mp_obj_t ppp_make_new(mp_obj_t stream) {
     mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
 
-    ppp_if_obj_t *self = m_new_obj_with_finaliser(ppp_if_obj_t);
-
-    self->base.type = &ppp_if_type;
+    ppp_if_obj_t *self = mp_obj_malloc_with_finaliser(ppp_if_obj_t, &ppp_if_type);
     self->stream = stream;
     self->active = false;
     self->connected = false;
diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index f0df541e6bde8..f154507141a1f 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -105,8 +105,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;
+    machine_timer_obj_t *self = mp_obj_malloc_with_finaliser(machine_timer_obj_t, &machine_timer_type);
     self->pool = alarm_pool_get_default();
     self->alarm_id = ALARM_ID_INVALID;
 
diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
index 425fb417fa5ec..27624ea8bfe12 100644
--- a/ports/rp2/rp2_dma.c
+++ b/ports/rp2/rp2_dma.c
@@ -145,8 +145,7 @@ STATIC mp_obj_t rp2_dma_make_new(const mp_obj_type_t *type, size_t n_args, size_
         mp_raise_OSError(MP_EBUSY);
     }
 
-    rp2_dma_obj_t *self = m_new_obj_with_finaliser(rp2_dma_obj_t);
-    self->base.type = &rp2_dma_type;
+    rp2_dma_obj_t *self = mp_obj_malloc_with_finaliser(rp2_dma_obj_t, &rp2_dma_type);
     self->channel = dma_channel;
 
     // Return the DMA object.
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index eacdb049da495..3d91fa976930d 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -107,8 +107,7 @@ STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
 }
 
 socket_obj_t *socket_new(void) {
-    socket_obj_t *socket = m_new_obj_with_finaliser(socket_obj_t);
-    socket->base.type = (mp_obj_t)&socket_type;
+    socket_obj_t *socket = mp_obj_malloc_with_finaliser(socket_obj_t, &socket_type);
     socket->state = STATE_NEW;
     return socket;
 }

From 971617196644775905fd821c39c6a7771b63dbaf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 11:04:08 +1100
Subject: [PATCH 0846/3129] py/misc: Remove m_new_obj[_var]_with_finaliser
 macros.

They are no longer used.  The new `mp_obj_malloc_with_finaliser()` macros
should be used instead, which force the setting of the `base.type` field.
And there's always `m_malloc_with_finaliser()` if needed.

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

diff --git a/py/misc.h b/py/misc.h
index e19a535720fb1..eea3e8b0fe7f5 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -79,13 +79,6 @@ typedef unsigned int uint;
 #define m_new_obj_var(obj_type, var_field, var_type, var_num) ((obj_type *)m_malloc(offsetof(obj_type, var_field) + sizeof(var_type) * (var_num)))
 #define m_new_obj_var0(obj_type, var_field, var_type, var_num) ((obj_type *)m_malloc0(offsetof(obj_type, var_field) + sizeof(var_type) * (var_num)))
 #define m_new_obj_var_maybe(obj_type, var_field, var_type, var_num) ((obj_type *)m_malloc_maybe(offsetof(obj_type, var_field) + sizeof(var_type) * (var_num)))
-#if MICROPY_ENABLE_FINALISER
-#define m_new_obj_with_finaliser(type) ((type *)(m_malloc_with_finaliser(sizeof(type))))
-#define m_new_obj_var_with_finaliser(type, var_field, var_type, var_num) ((type *)m_malloc_with_finaliser(offsetof(type, var_field) + sizeof(var_type) * (var_num)))
-#else
-#define m_new_obj_with_finaliser(type) m_new_obj(type)
-#define m_new_obj_var_with_finaliser(type, var_field, var_type, var_num) m_new_obj_var(type, var_field, var_type, var_num)
-#endif
 #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
 #define m_renew(type, ptr, old_num, new_num) ((type *)(m_realloc((ptr), sizeof(type) * (old_num), sizeof(type) * (new_num))))
 #define m_renew_maybe(type, ptr, old_num, new_num, allow_move) ((type *)(m_realloc_maybe((ptr), sizeof(type) * (old_num), sizeof(type) * (new_num), (allow_move))))

From 648a7578da21cc7ddb4046fc59891144e797b983 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 17:09:41 +1100
Subject: [PATCH 0847/3129] py/objfun: Make
 mp_obj_new_fun_native/mp_obj_new_fun_asm static-inline.

To reduce code size, since they are only used once by py/emitglue.c.

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

diff --git a/py/obj.h b/py/obj.h
index bd0df3fd682cf..f686fa44ca214 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -833,6 +833,8 @@ extern const mp_obj_type_t mp_type_fun_builtin_2;
 extern const mp_obj_type_t mp_type_fun_builtin_3;
 extern const mp_obj_type_t mp_type_fun_builtin_var;
 extern const mp_obj_type_t mp_type_fun_bc;
+extern const mp_obj_type_t mp_type_fun_native;
+extern const mp_obj_type_t mp_type_fun_asm;
 extern const mp_obj_type_t mp_type_module;
 extern const mp_obj_type_t mp_type_staticmethod;
 extern const mp_obj_type_t mp_type_classmethod;
diff --git a/py/objfun.c b/py/objfun.c
index 930d0ccdf4f51..ba0ba37068f20 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -137,10 +137,6 @@ STATIC qstr mp_obj_code_get_name(const mp_obj_fun_bc_t *fun, const byte *code_in
     return name;
 }
 
-#if MICROPY_EMIT_NATIVE
-STATIC const mp_obj_type_t mp_type_fun_native;
-#endif
-
 qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
     const mp_obj_fun_bc_t *fun = MP_OBJ_TO_PTR(fun_in);
     #if MICROPY_EMIT_NATIVE
@@ -420,7 +416,7 @@ STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, co
 #define FUN_BC_TYPE_ATTR
 #endif
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_native,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
@@ -429,12 +425,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     call, fun_native_call
     );
 
-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);
-}
-
 #endif // MICROPY_EMIT_NATIVE
 
 /******************************************************************************/
@@ -442,13 +432,6 @@ mp_obj_t mp_obj_new_fun_native(const mp_obj_t *def_args, const void *fun_data, c
 
 #if MICROPY_EMIT_INLINE_ASM
 
-typedef struct _mp_obj_fun_asm_t {
-    mp_obj_base_t base;
-    size_t n_args;
-    const void *fun_data; // GC must be able to trace this pointer
-    mp_uint_t type_sig;
-} mp_obj_fun_asm_t;
-
 typedef mp_uint_t (*inline_asm_fun_0_t)(void);
 typedef mp_uint_t (*inline_asm_fun_1_t)(mp_uint_t);
 typedef mp_uint_t (*inline_asm_fun_2_t)(mp_uint_t, mp_uint_t);
@@ -529,19 +512,11 @@ 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 MP_DEFINE_CONST_OBJ_TYPE(
+MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_asm,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
     call, fun_asm_call
     );
 
-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);
-    o->n_args = n_args;
-    o->fun_data = fun_data;
-    o->type_sig = type_sig;
-    return MP_OBJ_FROM_PTR(o);
-}
-
 #endif // MICROPY_EMIT_INLINE_ASM
diff --git a/py/objfun.h b/py/objfun.h
index 9de15b8841553..b6350d7b67eb5 100644
--- a/py/objfun.h
+++ b/py/objfun.h
@@ -43,9 +43,32 @@ typedef struct _mp_obj_fun_bc_t {
     mp_obj_t extra_args[];
 } mp_obj_fun_bc_t;
 
+typedef struct _mp_obj_fun_asm_t {
+    mp_obj_base_t base;
+    size_t n_args;
+    const void *fun_data; // GC must be able to trace this pointer
+    mp_uint_t type_sig;
+} mp_obj_fun_asm_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);
 
+#if MICROPY_EMIT_NATIVE
+static inline 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);
+}
+#endif
+
+#if MICROPY_EMIT_INLINE_ASM
+static inline 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);
+    o->n_args = n_args;
+    o->fun_data = fun_data;
+    o->type_sig = type_sig;
+    return MP_OBJ_FROM_PTR(o);
+}
+#endif
+
 #endif // MICROPY_INCLUDED_PY_OBJFUN_H

From 9400229766624e80db6a6f95af287a5542dc1b43 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 16:52:38 +1100
Subject: [PATCH 0848/3129] py/objfun: Split viper fun type out to separate
 mp_type_fun_viper type.

Viper functions are quite different to native functions and benefit from
being a separate type.  For example, viper functions don't have a bytecode-
style prelude, and don't support generators or default arguments.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitglue.c |  4 +++-
 py/obj.h      |  1 +
 py/objfun.c   | 21 +++++++++++++++++++++
 py/objfun.h   | 10 ++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/py/emitglue.c b/py/emitglue.c
index 7dc3080870182..415aa3a3d38de 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -199,13 +199,15 @@ mp_obj_t mp_make_function_from_proto_fun(mp_proto_fun_t proto_fun, const mp_modu
     switch (rc->kind) {
         #if MICROPY_EMIT_NATIVE
         case MP_CODE_NATIVE_PY:
-        case MP_CODE_NATIVE_VIPER:
             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->is_generator) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_native_gen_wrap;
             }
             break;
+        case MP_CODE_NATIVE_VIPER:
+            fun = mp_obj_new_fun_viper(rc->fun_data, context, rc->children);
+            break;
         #endif
         #if MICROPY_EMIT_INLINE_ASM
         case MP_CODE_NATIVE_ASM:
diff --git a/py/obj.h b/py/obj.h
index f686fa44ca214..9f2bb46e41d74 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -834,6 +834,7 @@ extern const mp_obj_type_t mp_type_fun_builtin_3;
 extern const mp_obj_type_t mp_type_fun_builtin_var;
 extern const mp_obj_type_t mp_type_fun_bc;
 extern const mp_obj_type_t mp_type_fun_native;
+extern const mp_obj_type_t mp_type_fun_viper;
 extern const mp_obj_type_t mp_type_fun_asm;
 extern const mp_obj_type_t mp_type_module;
 extern const mp_obj_type_t mp_type_staticmethod;
diff --git a/py/objfun.c b/py/objfun.c
index ba0ba37068f20..1bdbb39166b8d 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -427,6 +427,27 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 #endif // MICROPY_EMIT_NATIVE
 
+/******************************************************************************/
+/* viper functions                                                           */
+
+#if MICROPY_EMIT_NATIVE
+
+STATIC mp_obj_t fun_viper_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 = 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);
+}
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_viper,
+    MP_QSTR_function,
+    MP_TYPE_FLAG_BINDS_SELF,
+    call, fun_viper_call
+    );
+
+#endif // MICROPY_EMIT_NATIVE
+
 /******************************************************************************/
 /* inline assembler functions                                                 */
 
diff --git a/py/objfun.h b/py/objfun.h
index b6350d7b67eb5..ddb148dd19089 100644
--- a/py/objfun.h
+++ b/py/objfun.h
@@ -54,11 +54,21 @@ mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_
 void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 
 #if MICROPY_EMIT_NATIVE
+
 static inline 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);
 }
+
+static inline mp_obj_t mp_obj_new_fun_viper(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_malloc(mp_obj_fun_bc_t, &mp_type_fun_viper);
+    o->bytecode = fun_data;
+    o->context = mc;
+    o->child_table = child_table;
+    return MP_OBJ_FROM_PTR(o);
+}
+
 #endif
 
 #if MICROPY_EMIT_INLINE_ASM

From 6d403eb6972b7f6137838d89dba1ae3f76846c8b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 16:53:47 +1100
Subject: [PATCH 0849/3129] py/emitnative: Simplify layout and loading of
 native function prelude.

Now native functions and native generators have similar behaviour: the
first machine-word of their code is an index to get to the prelude.  This
simplifies the handling of these types of functions, and also reduces the
size of the emitted native machine code by no longer requiring special code
at the start of the function to load a pointer to the prelude.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.c           |  2 +-
 py/emitnative.c   | 15 ++++-----------
 py/objfun.c       |  2 +-
 py/objfun.h       | 28 ++++++++++++++++++++++++++++
 py/objgenerator.c | 17 ++++-------------
 5 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/py/bc.c b/py/bc.c
index e1795ce410653..dc70fddf2bca7 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -336,9 +336,9 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
 // 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->ip = mp_obj_fun_native_get_prelude_ptr(code_state->fun_bc);
     code_state->sp = &code_state->state[0] - 1;
     mp_setup_code_state_helper((mp_code_state_t *)code_state, n_args, n_kw, args);
 }
diff --git a/py/emitnative.c b/py/emitnative.c
index 5f347799e1d9f..6b5c9452ae6aa 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -253,7 +253,6 @@ 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;
@@ -519,8 +518,11 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         // work out size of state (locals plus stack)
         emit->n_state = scope->num_locals + scope->stack_size;
 
+        // Store in the first machine-word an index used to the function's prelude.
+        // This is used at runtime by mp_obj_fun_native_get_prelude_ptr().
+        mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->prelude_ptr_index);
+
         if (emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR) {
-            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, emit->code_state_start);
 
@@ -576,15 +578,6 @@ 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.  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).
-            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_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_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);
 
diff --git a/py/objfun.c b/py/objfun.c
index 1bdbb39166b8d..31f4a1f83b148 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -401,7 +401,7 @@ mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_
 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 = MP_OBJ_TO_PTR(self_in);
-    mp_call_fun_t fun = MICROPY_MAKE_POINTER_CALLABLE((void *)self->bytecode);
+    mp_call_fun_t fun = mp_obj_fun_native_get_function_start(self);
     return fun(self_in, n_args, n_kw, args);
 }
 
diff --git a/py/objfun.h b/py/objfun.h
index ddb148dd19089..af7c334858836 100644
--- a/py/objfun.h
+++ b/py/objfun.h
@@ -69,6 +69,34 @@ static inline mp_obj_t mp_obj_new_fun_viper(const void *fun_data, const mp_modul
     return MP_OBJ_FROM_PTR(o);
 }
 
+static inline const uint8_t *mp_obj_fun_native_get_prelude_ptr(const mp_obj_fun_bc_t *fun_native) {
+    // Obtain a pointer to the start of the function prelude, based on prelude_ptr_index.
+    uintptr_t prelude_ptr_index = ((uintptr_t *)fun_native->bytecode)[0];
+    const uint8_t *prelude_ptr;
+    if (prelude_ptr_index == 0) {
+        prelude_ptr = (const uint8_t *)fun_native->child_table;
+    } else {
+        prelude_ptr = (const uint8_t *)fun_native->child_table[prelude_ptr_index];
+    }
+    return prelude_ptr;
+}
+
+static inline void *mp_obj_fun_native_get_function_start(const mp_obj_fun_bc_t *fun_native) {
+    // Obtain a pointer to the start of the function executable machine code.
+    return MICROPY_MAKE_POINTER_CALLABLE((void *)(fun_native->bytecode + sizeof(uintptr_t)));
+}
+
+static inline void *mp_obj_fun_native_get_generator_start(const mp_obj_fun_bc_t *fun_native) {
+    // Obtain a pointer to the start of the generator executable machine code.
+    uintptr_t start_offset = ((uintptr_t *)fun_native->bytecode)[1];
+    return MICROPY_MAKE_POINTER_CALLABLE((void *)(fun_native->bytecode + start_offset));
+}
+
+static inline void *mp_obj_fun_native_get_generator_resume(const mp_obj_fun_bc_t *fun_native) {
+    // Obtain a pointer to the resume location of the generator executable machine code.
+    return MICROPY_MAKE_POINTER_CALLABLE((void *)&((uintptr_t *)fun_native->bytecode)[2]);
+}
+
 #endif
 
 #if MICROPY_EMIT_INLINE_ASM
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 7786b1fc81b08..e4acd5e49b9cc 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -101,13 +101,7 @@ 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_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];
-    }
+    const uint8_t *prelude_ptr = mp_obj_fun_native_get_prelude_ptr(self_fun);
 
     // Extract n_state from the prelude.
     const uint8_t *ip = prelude_ptr;
@@ -119,17 +113,14 @@ 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 = prelude_ptr;
     o->code_state.n_state = n_state;
-    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;
 
     // Prepare the generator instance for execution
-    uintptr_t start_offset = ((uintptr_t *)self_fun->bytecode)[1];
-    o->code_state.ip = MICROPY_MAKE_POINTER_CALLABLE((void *)(self_fun->bytecode + start_offset));
+    o->code_state.ip = mp_obj_fun_native_get_generator_start(self_fun);
 
     return MP_OBJ_FROM_PTR(o);
 }
@@ -208,9 +199,9 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
 
     #if MICROPY_EMIT_NATIVE
     if (self->code_state.exc_sp_idx == MP_CODE_STATE_EXC_SP_IDX_SENTINEL) {
-        // A native generator, with entry point 2 words into the "bytecode" pointer
+        // A native generator.
         typedef uintptr_t (*mp_fun_native_gen_t)(void *, mp_obj_t);
-        mp_fun_native_gen_t fun = MICROPY_MAKE_POINTER_CALLABLE((const void *)(self->code_state.fun_bc->bytecode + 2 * sizeof(uintptr_t)));
+        mp_fun_native_gen_t fun = mp_obj_fun_native_get_generator_resume(self->code_state.fun_bc);
         ret_kind = fun((void *)&self->code_state, throw_value);
     } else
     #endif

From 0c7ccb8807581f3654f70ee9ea86d3ca017f7ea2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Feb 2024 16:55:39 +1100
Subject: [PATCH 0850/3129] py/objfun: Support __name__ on native functions and
 generators.

This is now easy to support, since the first machine-word of a native
function tells how to find the prelude, from which the function name can be
extracted in the same way as for bytecode.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objfun.c        | 6 +++---
 tests/run-tests.py | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/py/objfun.c b/py/objfun.c
index 31f4a1f83b148..992c8c784129a 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -139,14 +139,14 @@ STATIC qstr mp_obj_code_get_name(const mp_obj_fun_bc_t *fun, const byte *code_in
 
 qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
     const mp_obj_fun_bc_t *fun = MP_OBJ_TO_PTR(fun_in);
+    const byte *bc = fun->bytecode;
+
     #if MICROPY_EMIT_NATIVE
     if (fun->base.type == &mp_type_fun_native || fun->base.type == &mp_type_native_gen_wrap) {
-        // TODO native functions don't have name stored
-        return MP_QSTR_;
+        bc = mp_obj_fun_native_get_prelude_ptr(fun);
     }
     #endif
 
-    const byte *bc = fun->bytecode;
     MP_BC_PRELUDE_SIG_DECODE(bc);
     return mp_obj_code_get_name(fun, bc);
 }
diff --git a/tests/run-tests.py b/tests/run-tests.py
index ba66eced41aff..70279d379df60 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -643,9 +643,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     # 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.add("basics/gen_yield_from_close.py")  # require raise_varargs
         skip_tests.update(
             {"basics/async_%s.py" % t for t in "with with2 with_break with_return".split()}
         )  # require async_with
@@ -656,7 +654,6 @@ 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 717e3dca1b3ae736a683f8455a23c21192d6de69 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Feb 2024 11:29:46 +1100
Subject: [PATCH 0851/3129] py/objfun: Inline mp_obj_code_get_name() into
 mp_obj_fun_get_name().

The former is static and does not need to be a separate function.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objfun.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/py/objfun.c b/py/objfun.c
index 992c8c784129a..2e86aaa14d594 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -128,15 +128,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 /* byte code functions                                                        */
 
-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);
-    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;
-}
-
 qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
     const mp_obj_fun_bc_t *fun = MP_OBJ_TO_PTR(fun_in);
     const byte *bc = fun->bytecode;
@@ -148,7 +139,14 @@ qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
     #endif
 
     MP_BC_PRELUDE_SIG_DECODE(bc);
-    return mp_obj_code_get_name(fun, bc);
+    MP_BC_PRELUDE_SIZE_DECODE(bc);
+
+    mp_uint_t name = mp_decode_uint_value(bc);
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    name = fun->context->constants.qstr_table[name];
+    #endif
+
+    return name;
 }
 
 #if MICROPY_CPYTHON_COMPAT

From 916ceecaef18ab427bc35158a2281988df2c494c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Feb 2024 11:31:34 +1100
Subject: [PATCH 0852/3129] py/emitglue: Remove n_pos_args from DEBUG_printf.

This argument was renamed in 39bf055d23be4b0f761af115773c3db1074fc2dd.

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

diff --git a/py/emitglue.c b/py/emitglue.c
index 415aa3a3d38de..258322724b4a0 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -149,7 +149,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     #endif
 
     #if 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);
+    DEBUG_printf("assign native: kind=%d fun=%p len=" UINT_FMT " flags=%x\n", kind, fun_data, fun_len, (uint)scope_flags);
     for (mp_uint_t i = 0; i < fun_len; i++) {
         if (i > 0 && i % 16 == 0) {
             DEBUG_printf("\n");

From 3db29103a4be941293e796da0019178fcd986d36 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Feb 2024 11:41:04 +1100
Subject: [PATCH 0853/3129] py/builtinevex: Fix setting globals for native
 functions in compile().

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

diff --git a/py/builtinevex.c b/py/builtinevex.c
index 73fca5d39bf52..7737e67f2cd22 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -57,9 +57,13 @@ STATIC mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj
     // set exception handler to restore context if an exception is raised
     nlr_push_jump_callback(&ctx.callback, mp_globals_locals_set_from_nlr_jump_callback);
 
-    // a bit of a hack: fun_bc will re-set globals, so need to make sure it's
-    // the correct one
-    if (mp_obj_is_type(self->module_fun, &mp_type_fun_bc)) {
+    // The call to mp_parse_compile_execute() in mp_builtin_compile() below passes
+    // NULL for the globals, so repopulate that entry now with the correct globals.
+    if (mp_obj_is_type(self->module_fun, &mp_type_fun_bc)
+        #if MICROPY_EMIT_NATIVE
+        || mp_obj_is_type(self->module_fun, &mp_type_fun_native)
+        #endif
+        ) {
         mp_obj_fun_bc_t *fun_bc = MP_OBJ_TO_PTR(self->module_fun);
         ((mp_module_context_t *)fun_bc->context)->module.globals = globals;
     }
diff --git a/tests/basics/builtin_compile.py b/tests/basics/builtin_compile.py
index 41dc746ad163c..361d7ec53a729 100644
--- a/tests/basics/builtin_compile.py
+++ b/tests/basics/builtin_compile.py
@@ -29,6 +29,9 @@ def test():
     exec(compile("print(10 + 2)", "file", "single"))
     print(eval(compile("10 + 3", "file", "eval")))
 
+    # test accessing a function's globals from within a compile
+    exec(compile("def func():pass\nprint('x', func.__globals__['x'])", "file", "exec"))
+
     # bad mode
     try:
         compile('1', 'file', '')

From 802a88c3b1599777d53cadb0e4439348fe298a8e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Feb 2024 16:51:02 +1100
Subject: [PATCH 0854/3129] stm32/mboot: Generate FLASH_LAYOUT_STR at runtime
 on H5 MCUs.

The size of the flash varies among MCU variants.  Instead of requiring a
build-time variable to configure this, compute it at runtime using the
special device information word accessible through the FLASH_SIZE macro.

This feature is currently only implemented for H5 MCUs, but can be extended
to others.

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

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 2424b37da3a8b..39492b4e5474e 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -435,7 +435,7 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 #elif defined(STM32G0)
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*02Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #elif defined(STM32H5)
-#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*08Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#define FLASH_LAYOUT_TEMPLATE "@Internal Flash  /0x08000000/???*08Kg" 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)
@@ -444,6 +444,25 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*04Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #endif
 
+#if !defined(FLASH_LAYOUT_STR)
+
+#define FLASH_LAYOUT_STR_ALLOC (sizeof(FLASH_LAYOUT_TEMPLATE))
+
+// Build the flash layout string from a template with total flash size inserted.
+static size_t build_flash_layout_str(char *buf) {
+    size_t len = FLASH_LAYOUT_STR_ALLOC - 1;
+    memcpy(buf, FLASH_LAYOUT_TEMPLATE, len + 1);
+    unsigned int num_sectors = FLASH_SIZE / FLASH_SECTOR_SIZE;
+    buf += 31; // location of "???" in FLASH_LAYOUT_TEMPLATE
+    for (unsigned int i = 0; i < 3; ++i) {
+        *buf-- = '0' + num_sectors % 10;
+        num_sectors /= 10;
+    }
+    return len;
+}
+
+#endif
+
 static bool flash_is_modifiable_addr_range(uint32_t addr, uint32_t len) {
     return addr + len < (uint32_t)&_mboot_protected_flash_start
            || addr >= (uint32_t)&_mboot_protected_flash_end_exclusive;
@@ -756,8 +775,12 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
     } else if (buf[0] == I2C_CMD_RESET && len == 0) {
         dfu_context.leave_dfu = true;
     } else if (buf[0] == I2C_CMD_GETLAYOUT && len == 0) {
+        #if defined(FLASH_LAYOUT_STR)
         len = strlen(FLASH_LAYOUT_STR);
         memcpy(buf, FLASH_LAYOUT_STR, len);
+        #else
+        len = build_flash_layout_str(buf);
+        #endif
     } else if (buf[0] == I2C_CMD_MASSERASE && len == 0) {
         len = do_mass_erase();
     } else if (buf[0] == I2C_CMD_PAGEERASE && len == 4) {
@@ -1161,7 +1184,15 @@ static uint8_t *pyb_usbdd_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, u
         }
 
         case USBD_IDX_CONFIG_STR:
+            #if defined(FLASH_LAYOUT_STR)
             USBD_GetString((uint8_t *)FLASH_LAYOUT_STR, str_desc, length);
+            #else
+            {
+                char buf[FLASH_LAYOUT_STR_ALLOC];
+                build_flash_layout_str(buf);
+                USBD_GetString((uint8_t *)buf, str_desc, length);
+            }
+            #endif
             return str_desc;
 
         case MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX:

From d9944983cbc2994a36c47b15595a76a01bed7ecf Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 30 Jan 2024 15:58:22 +0200
Subject: [PATCH 0855/3129] esp32/machine_i2c: Fix build warnings when I2C is
 disabled.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/machine_i2c.c | 4 ++++
 1 file changed, 4 insertions(+)
 mode change 100644 => 100755 ports/esp32/machine_i2c.c

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
old mode 100644
new mode 100755
index eefdeaaf96583..f4cfa58166e06
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -32,6 +32,8 @@
 #include "driver/i2c.h"
 #include "hal/i2c_ll.h"
 
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
+
 #ifndef MICROPY_HW_I2C0_SCL
 #define MICROPY_HW_I2C0_SCL (GPIO_NUM_18)
 #define MICROPY_HW_I2C0_SDA (GPIO_NUM_19)
@@ -210,3 +212,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     protocol, &machine_hw_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
     );
+
+#endif

From 31e131bd712ac118074052689e3976aed3564586 Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Sat, 10 Feb 2024 12:07:46 -0800
Subject: [PATCH 0856/3129] esp32/machine_hw_spi: Combine argument parsing for
 constructor and init.

This combines the argument parsing and checking for the machine.SPI.init()
and machine.SPI() interfaces.

The only real difference was unspecified arguments in init() mean to keep
the same value, while in new they get default values.

Behavior has changed for passing the "id" argument to init().  On other
ports this isn't allowed.  But on esp32 it would change the SPI controller
of the static SPI instance to the new id.  This results in multiple static
spi objects for the same controller and they would fight over which one has
inconsistent mpy vs esp-idf state.  This has been changed to not allow "id"
with init(), like other ports.

In a few causes, a loop is used over arguments that are handled the same
way instead of cut & pasting the same stanza of code for each argument.

The init_internal function had a lot of arguments, which is not efficient
to pass.  Pass the args mp_arg_val_t array instead as a single argument.
This reduced both the number of C lines and the compiled code size.

Summary of code size change:  Two argument lists of 72 bytes are replaced
by a single shared 72 byte list.  New shared argument parsing code is small
enough to be inlined, but is still efficient enough to shrink the overall
code size by 349 bytes of the three argument handlering functions.

add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-349 (-349)
Function                                     old     new   delta
machine_hw_spi_make_new                      255     203     -52
machine_hw_spi_init                          122      67     -55
machine_hw_spi_init_internal                 698     456    -242
Total: Before=1227667, After=1227318, chg -0.03%
add/remove: 2/0 grow/shrink: 0/2 up/down: 92/-144 (-52)
Data                                         old     new   delta
spi_allowed_args                               -      72     +72
defaults$0                                     -      20     +20
allowed_args$1                               240     168     -72
allowed_args$0                              1080    1008     -72
Total: Before=165430, After=165378, chg -0.03%
add/remove: 0/0 grow/shrink: 0/0 up/down: 0/0 (0)

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 ports/esp32/machine_hw_spi.c | 216 +++++++++++++----------------------
 1 file changed, 80 insertions(+), 136 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 399cb902e8cc6..06e9ec3c8291c 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -80,9 +80,15 @@
 #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;
+    union {
+        int8_t array[3];
+        struct {
+            // Must be in enum's ARG_sck, ARG_mosi, ARG_miso, etc. order
+            int8_t sck;
+            int8_t mosi;
+            int8_t miso;
+        } pins;
+    };
 } machine_hw_spi_default_pins_t;
 
 typedef struct _machine_hw_spi_obj_t {
@@ -106,12 +112,26 @@ 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[MICROPY_HW_SPI_MAX] = {
-    { .sck = MICROPY_HW_SPI1_SCK, .mosi = MICROPY_HW_SPI1_MOSI, .miso = MICROPY_HW_SPI1_MISO },
+    { .pins = { .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 },
+    { .pins = { .sck = MICROPY_HW_SPI2_SCK, .mosi = MICROPY_HW_SPI2_MOSI, .miso = MICROPY_HW_SPI2_MISO }},
     #endif
 };
 
+// Common arguments for init() and make new
+enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso };
+static const mp_arg_t spi_allowed_args[] = {
+    { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
+    { 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} },
+};
+
 // Static objects mapping to SPI2 (and SPI3 if available) hardware peripherals.
 STATIC machine_hw_spi_obj_t machine_hw_spi_obj[MICROPY_HW_SPI_MAX];
 
@@ -147,17 +167,7 @@ STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
     }
 }
 
-STATIC void machine_hw_spi_init_internal(
-    machine_hw_spi_obj_t *self,
-    int8_t host,
-    int32_t baudrate,
-    int8_t polarity,
-    int8_t phase,
-    int8_t bits,
-    int8_t firstbit,
-    int8_t sck,
-    int8_t mosi,
-    int8_t miso) {
+STATIC void machine_hw_spi_init_internal(machine_hw_spi_obj_t *self, mp_arg_val_t args[]) {
 
     // if we're not initialized, then we're
     // implicitly 'changed', since this is the init routine
@@ -167,52 +177,47 @@ STATIC void machine_hw_spi_init_internal(
 
     machine_hw_spi_obj_t old_self = *self;
 
-    if (host != -1 && host != self->host) {
-        self->host = host;
-        changed = true;
-    }
-
-    if (baudrate != -1) {
+    if (args[ARG_baudrate].u_int != -1) {
         // calculate the actual clock frequency that the SPI peripheral can produce
-        baudrate = spi_get_actual_clock(APB_CLK_FREQ, baudrate, 0);
+        uint32_t baudrate = spi_get_actual_clock(APB_CLK_FREQ, args[ARG_baudrate].u_int, 0);
         if (baudrate != self->baudrate) {
             self->baudrate = baudrate;
             changed = true;
         }
     }
 
-    if (polarity != -1 && polarity != self->polarity) {
-        self->polarity = polarity;
+    if (args[ARG_polarity].u_int != -1 && args[ARG_polarity].u_int != self->polarity) {
+        self->polarity = args[ARG_polarity].u_int;
         changed = true;
     }
 
-    if (phase != -1 && phase != self->phase) {
-        self->phase = phase;
+    if (args[ARG_phase].u_int != -1 && args[ARG_phase].u_int != self->phase) {
+        self->phase = args[ARG_phase].u_int;
         changed = true;
     }
 
-    if (bits != -1 && bits != self->bits) {
-        self->bits = bits;
+    if (args[ARG_bits].u_int != -1 && args[ARG_bits].u_int != self->bits) {
+        self->bits = args[ARG_bits].u_int;
         changed = true;
     }
 
-    if (firstbit != -1 && firstbit != self->firstbit) {
-        self->firstbit = firstbit;
+    if (args[ARG_firstbit].u_int != -1 && args[ARG_firstbit].u_int != self->firstbit) {
+        self->firstbit = args[ARG_firstbit].u_int;
         changed = true;
     }
 
-    if (sck != -2 && sck != self->sck) {
-        self->sck = sck;
+    if (args[ARG_sck].u_int != -2 && args[ARG_sck].u_int != self->sck) {
+        self->sck = args[ARG_sck].u_int;
         changed = true;
     }
 
-    if (mosi != -2 && mosi != self->mosi) {
-        self->mosi = mosi;
+    if (args[ARG_mosi].u_int != -2 && args[ARG_mosi].u_int != self->mosi) {
+        self->mosi = args[ARG_mosi].u_int;
         changed = true;
     }
 
-    if (miso != -2 && miso != self->miso) {
-        self->miso = miso;
+    if (args[ARG_miso].u_int != -2 && args[ARG_miso].u_int != self->miso) {
+        self->miso = args[ARG_miso].u_int;
         changed = true;
     }
 
@@ -392,123 +397,62 @@ STATIC void machine_hw_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_p
         self->sck, self->mosi, self->miso);
 }
 
-STATIC void machine_hw_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    machine_hw_spi_obj_t *self = (machine_hw_spi_obj_t *)self_in;
-
-    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_INT, {.u_int = -1} },
-        { 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(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args),
-        allowed_args, args);
-    int8_t sck, mosi, miso;
-
-    if (args[ARG_sck].u_obj == MP_OBJ_NULL) {
-        sck = -2;
-    } else if (args[ARG_sck].u_obj == mp_const_none) {
-        sck = -1;
-    } else {
-        sck = machine_pin_get_id(args[ARG_sck].u_obj);
+// Take an arg list made from spi_allowed_args, and put in default or "keep same" values
+// into all the u_int fields.
+// The behavior is slightly different for a new call vs an init method on an existing object.
+// Unspecified arguments for new will use defaults, for init they keep the existing value.
+STATIC void machine_hw_spi_argcheck(mp_arg_val_t args[], const machine_hw_spi_default_pins_t *default_pins) {
+// A non-NULL default_pins argument will trigger the "use default" behavior.
+    // Replace pin args with default/current values for new vs init call, respectively
+    for (int i = ARG_sck; i <= ARG_miso; i++) {
+        if (args[i].u_obj == MP_OBJ_NULL) {
+            args[i].u_int = default_pins ? default_pins->array[i - ARG_sck] : -2;
+        } else if (args[i].u_obj == mp_const_none) {
+            args[i].u_int = -1;
+        } else {
+            args[i].u_int = machine_pin_get_id(args[i].u_obj);
+        }
     }
+}
 
-    if (args[ARG_miso].u_obj == MP_OBJ_NULL) {
-        miso = -2;
-    } else if (args[ARG_miso].u_obj == mp_const_none) {
-        miso = -1;
-    } else {
-        miso = machine_pin_get_id(args[ARG_miso].u_obj);
-    }
+STATIC void machine_hw_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_hw_spi_obj_t *self = (machine_hw_spi_obj_t *)self_in;
 
-    if (args[ARG_mosi].u_obj == MP_OBJ_NULL) {
-        mosi = -2;
-    } else if (args[ARG_mosi].u_obj == mp_const_none) {
-        mosi = -1;
-    } else {
-        mosi = machine_pin_get_id(args[ARG_mosi].u_obj);
-    }
+    mp_arg_val_t args[MP_ARRAY_SIZE(spi_allowed_args)];
+    // offset arg lists by 1 to skip first arg, id, which is not valid for init()
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(spi_allowed_args) - 1,
+        spi_allowed_args + 1, args + 1);
 
-    machine_hw_spi_init_internal(self, args[ARG_id].u_int, args[ARG_baudrate].u_int,
-        args[ARG_polarity].u_int, args[ARG_phase].u_int, args[ARG_bits].u_int,
-        args[ARG_firstbit].u_int, sck, mosi, miso);
+    machine_hw_spi_argcheck(args, NULL);
+    machine_hw_spi_init_internal(self, args);
 }
 
 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} },
-        { 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} },
-        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
-        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = MICROPY_PY_MACHINE_SPI_MSB} },
-        { 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);
+    mp_arg_val_t args[MP_ARRAY_SIZE(spi_allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(spi_allowed_args), spi_allowed_args, args);
 
-    machine_hw_spi_obj_t *self;
-    const machine_hw_spi_default_pins_t *default_pins;
-    mp_int_t spi_id = args[ARG_id].u_int;
+    const mp_int_t spi_id = args[ARG_id].u_int;
     if (1 <= spi_id && spi_id <= MICROPY_HW_SPI_MAX) {
-        self = &machine_hw_spi_obj[spi_id - 1];
-        default_pins = &machine_hw_spi_default_pins[spi_id - 1];
+        machine_hw_spi_argcheck(args, &machine_hw_spi_default_pins[spi_id - 1]);
     } else {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
     }
-
-    self->base.type = &machine_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);
+    // Replace -1 non-pin args with default values
+    static const mp_int_t defaults[] = { 500000, 0, 0, 8, MICROPY_PY_MACHINE_SPI_MSB };
+    for (int i = ARG_baudrate; i <= ARG_firstbit; i++) {
+        if (args[i].u_int == -1) {
+            args[i].u_int = defaults[i - ARG_baudrate];
+        }
     }
 
-    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);
-    }
+    machine_hw_spi_obj_t *self = &machine_hw_spi_obj[spi_id - 1];
+    self->host = spi_id;
 
-    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);
-    }
+    self->base.type = &machine_spi_type;
 
-    machine_hw_spi_init_internal(
-        self,
-        args[ARG_id].u_int,
-        args[ARG_baudrate].u_int,
-        args[ARG_polarity].u_int,
-        args[ARG_phase].u_int,
-        args[ARG_bits].u_int,
-        args[ARG_firstbit].u_int,
-        sck,
-        mosi,
-        miso);
+    machine_hw_spi_init_internal(self, args);
 
     return MP_OBJ_FROM_PTR(self);
 }

From 2962e24167a7416d4caf8d25f463e67b46c3a40a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 16 Feb 2024 13:02:28 +1100
Subject: [PATCH 0857/3129] extmod/vfs_posix_file: Ensure file object has safe
 default fd.

With this commit, if file open fails, the object will have fd = -1 (closed)
and the finaliser will not attempt to close anything.

Fixes issue #13672.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/vfs_posix_file.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 46a866a78aff1..eb9146d47b034 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -92,6 +92,7 @@ mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_
     }
 
     mp_obj_vfs_posix_file_t *o = mp_obj_malloc_with_finaliser(mp_obj_vfs_posix_file_t, type);
+    o->fd = -1; // In case open() fails below, initialise this as a "closed" file object.
 
     mp_obj_t fid = file_in;
 

From 3deeabe6e87d893196227b41ca997d78783ab14c Mon Sep 17 00:00:00 2001
From: Trent Warlaven <trwbox@gmail.com>
Date: Sun, 6 Aug 2023 12:03:47 -0500
Subject: [PATCH 0858/3129] tests/cpydiff: Add new CPy diff test for class name
 mangling.

Adds new tests/documentation for missing name mangling for private class
members.

Signed-off-by: Trent Warlaven <trwbox@gmail.com>
---
 tests/cpydiff/core_class_name_mangling.py | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tests/cpydiff/core_class_name_mangling.py

diff --git a/tests/cpydiff/core_class_name_mangling.py b/tests/cpydiff/core_class_name_mangling.py
new file mode 100644
index 0000000000000..39153209debe8
--- /dev/null
+++ b/tests/cpydiff/core_class_name_mangling.py
@@ -0,0 +1,26 @@
+"""
+categories: Core,Classes
+description: Private Class Members name mangling is not implemented
+cause: The MicroPython compiler does not implement name mangling for private class members.
+workaround: Avoid using or having a collision with global names, by adding a unique prefix to the private class member name manually.
+"""
+
+
+def __print_string(string):
+    print(string)
+
+
+class Foo:
+    def __init__(self, string):
+        self.string = string
+
+    def do_print(self):
+        __print_string(self.string)
+
+
+example_string = "Example String to print."
+
+class_item = Foo(example_string)
+print(class_item.string)
+
+class_item.do_print()

From 27670729a5ef341a75d90e34b6979e6b0671e0f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Feb 2024 11:36:53 +1100
Subject: [PATCH 0859/3129] py/compile: Remove TODO about name mangling.

This TODO is now covered by the tests/cpydiff/core_class_name_mangling.py
test.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 8246a9241cad9..fe7ad6e13c307 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -41,8 +41,6 @@
 
 #if MICROPY_ENABLE_COMPILER
 
-// TODO need to mangle __attr names
-
 #define INVALID_LABEL (0xffff)
 
 typedef enum {

From 31e718a6acd03f0cc3db5bc56e465bee933c1edb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Feb 2024 11:49:06 +1100
Subject: [PATCH 0860/3129] stm32/mpbthciport: Allow building with
 MICROPY_PY_MACHINE_UART disabled.

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

diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index e764c69844891..06ff8a7faa658 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -170,7 +170,12 @@ 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.
+    #if MICROPY_PY_MACHINE_UART
     mp_bluetooth_hci_uart_obj.base.type = &machine_uart_type;
+    #else
+    // With machine.UART disabled this object is not user-accessible so doesn't need a type.
+    mp_bluetooth_hci_uart_obj.base.type = NULL;
+    #endif
     mp_bluetooth_hci_uart_obj.uart_id = port;
     mp_bluetooth_hci_uart_obj.is_static = true;
     // We don't want to block indefinitely, but expect flow control is doing its job.

From 01f4e85f1b360d40f8db99aa0db158fa5c2d796e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Feb 2024 12:00:41 +1100
Subject: [PATCH 0861/3129] extmod/modmachine: Remove MICROPY_PY_MACHINE guard
 from header.

So this header file can expose declarations for contents of the `machine`
module even if that module is disabled.  Other parts of the system -- or
third-party code -- may need these declarations, for example when a single
component like MICROPY_PY_MACHINE_UART is enabled with MICROPY_PY_MACHINE
disabled.

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

diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index d186ce661510c..e6b08b3fc9650 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -30,9 +30,9 @@
 #include "py/mphal.h"
 #include "py/obj.h"
 
-#if MICROPY_PY_MACHINE
-
+#if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
 #include "drivers/bus/spi.h"
+#endif
 
 // Whether to enable the ADC.init() method.
 // Requires a port to implement mp_machine_adc_init_helper().
@@ -264,6 +264,4 @@ MP_DECLARE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj);
 MP_DECLARE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj);
 #endif
 
-#endif // MICROPY_PY_MACHINE
-
 #endif // MICROPY_INCLUDED_EXTMOD_MODMACHINE_H

From 9e5b6972c767448fb67fa8f13e20b5d3ec2a8673 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Feb 2024 10:49:03 +1100
Subject: [PATCH 0862/3129] py/emitglue: Make mp_emit_glue_assign_native's
 fun_data arg a const ptr.

It will only ever be read from, and in some cases (eg on esp8266) can
actually be in ROM.

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

diff --git a/py/emitglue.c b/py/emitglue.c
index 258322724b4a0..6b6d5ccba2195 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,
 }
 
 #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,
+void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, const void *fun_data, mp_uint_t fun_len,
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
     uint16_t n_children,
@@ -115,7 +115,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     #endif
     #elif MICROPY_EMIT_ARM
     #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
-    __builtin___clear_cache(fun_data, (uint8_t *)fun_data + fun_len);
+    __builtin___clear_cache((void *)fun_data, (uint8_t *)fun_data + fun_len);
     #elif defined(__arm__)
     // Flush I-cache and D-cache.
     asm volatile (
@@ -154,7 +154,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
         if (i > 0 && i % 16 == 0) {
             DEBUG_printf("\n");
         }
-        DEBUG_printf(" %02x", ((byte *)fun_data)[i]);
+        DEBUG_printf(" %02x", ((const byte *)fun_data)[i]);
     }
     DEBUG_printf("\n");
 
diff --git a/py/emitglue.h b/py/emitglue.h
index b7368d697ddf7..0960ee22daec1 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -130,7 +130,7 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #endif
     uint16_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,
+void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, const void *fun_data, mp_uint_t fun_len,
     mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
     uint16_t n_children,

From 4f7d0df9bc45ac94f300b84df52b4605bf4609d0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 23 Jan 2024 11:53:34 +1100
Subject: [PATCH 0863/3129] github/ISSUE_TEMPLATE: Convert issue templates to
 forms.

Allows giving more specific advice, provides more links to other places to
ask questions, check details, etc.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/ISSUE_TEMPLATE/bug_report.md       |  25 -----
 .github/ISSUE_TEMPLATE/bug_report.yml      | 107 +++++++++++++++++++++
 .github/ISSUE_TEMPLATE/documentation.md    |  16 ---
 .github/ISSUE_TEMPLATE/documentation.yml   |  44 +++++++++
 .github/ISSUE_TEMPLATE/feature_request.md  |  24 -----
 .github/ISSUE_TEMPLATE/feature_request.yml |  65 +++++++++++++
 .github/ISSUE_TEMPLATE/security.md         |  16 ---
 .github/ISSUE_TEMPLATE/security.yml        |  59 ++++++++++++
 8 files changed, 275 insertions(+), 81 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/documentation.md
 create mode 100644 .github/ISSUE_TEMPLATE/documentation.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/security.md
 create mode 100644 .github/ISSUE_TEMPLATE/security.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 7bad9562964af..0000000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Bug report
-about: Report an issue
-title: ''
-labels: bug
-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 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.
-
-* 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)
-
-* Remove all placeholder text above before submitting.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000000..c44a140faf0ff
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,107 @@
+name: Bug report
+description: Report a bug or unexpected behaviour
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please provide as much detail as you can, it really helps us find and fix bugs faster.
+
+        #### Not a bug report?
+
+        * If you have a question \"How Do I ...?\", please post it on [GitHub Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead of here.
+        * For missing or incorrect documentation, or feature requests, then please [choose a different issue type](https://github.com/micropython/micropython/issues/new/choose).
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Checks
+      description: |
+        Before submitting your bug report, please go over these check points:
+      options:
+      - label: |
+           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
+        required: true
+      - label: |
+          I've searched for [existing issues](https://github.com/micropython/micropython/issues) matching this bug, and didn't find any.
+        required: true
+  - type: input
+    id: port-board-hw
+    attributes:
+      label: Port, board and/or hardware
+      description: |
+        Which MicroPython port(s) and board(s) are you using?
+      placeholder: |
+        esp32 port, ESP32-Fantastic board.
+    validations:
+       required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: MicroPython version
+      description: |
+        To find the version:
+
+        1. Open a serial REPL.
+        2. Type Ctrl-B to see the startup message.
+        3. Copy-paste that output here.
+
+        If the issue is about building MicroPython, please provide output of `git describe --dirty` and as much information as possible about the build environment.
+
+        If the version or configuration is modified from the official MicroPython releases or the master branch, please tell us the details of this as well.
+      placeholder: |
+        MicroPython v6.28.3 on 2029-01-23; PyBoard 9 with STM32F9
+    validations:
+      required: true
+  - type: textarea
+    id: steps-reproduce
+    attributes:
+      label: Reproduction
+      description: |
+        What steps will reproduce the problem? Please include all details that could be relevant about the environment, configuration, etc.
+
+        If there is Python code to reproduce this issue then please either:
+        a. Type it into a code block below ([code block guide](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks)), or
+        b. Post longer code to a [GitHub gist](https://gist.github.com/), or
+        c. Create a sample project on GitHub.
+
+        For build issues, please provide the exact build commands that you ran.
+      placeholder: |
+        1. Copy paste the code provided below into a new file
+        2. Use `mpremote run` to execute it on the board.
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behaviour
+      description: |
+         What did you expect MicroPython to do? If comparing output with CPython or a different MicroPython port/version then please provide that output here.
+      placeholder: |
+        Expected to print "Hello World".
+
+        Here is the correct output, seen with previous MicroPython version v3.14.159:
+
+        > [...]
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Observed behaviour
+      description: |
+        What actually happened? Where possible please paste exact output, or the complete build log, etc. Very long output can be linked in a [GitHub gist](https://gist.github.com/).
+      placeholder: |
+        This unexpected exception appears:
+
+        > [...]
+    validations:
+      required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Information
+      description: |
+        Is there anything else that might help to resolve this issue?
+      value: No, I've provided everything above.
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to help improve MicroPython.
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index e36fa62ac29a4..0000000000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Documentation issue
-about: Report areas of the documentation or examples that need improvement
-title: 'docs: '
-labels: documentation
-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 use the Discussions tab instead.
-
-* 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/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
new file mode 100644
index 0000000000000..5be0241701747
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -0,0 +1,44 @@
+name: Documentation issue
+description: Report areas of the documentation or examples that need improvement
+title: "docs: "
+labels: ["documentation"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This form is for reporting issues with the documentation or examples provided with MicroPython.
+
+        If you have a general question \"How Do I ...?\", please post it on [GitHub Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead of here.
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Checks
+      description: |
+        Before submitting your bug report, please go over these check points:
+      options:
+      - label: |
+           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
+        required: true
+      - label: |
+          I've searched for [existing issues](https://github.com/micropython/micropython/issues) and didn't find any that matched.
+        required: true
+  - type: input
+    id: page
+    attributes:
+      label: Documentation URL
+      description: |
+        Does this issue relate to a particular page in the [online documentation](https://docs.micropython.org/en/latest/)? If yes, please paste the URL of the page:
+      placeholder: |
+        https://docs.micropython.org/en/latest/
+  - type: textarea
+    id: version
+    attributes:
+      label: Description
+      description: |
+        Please describe what was missing from the documentation and/or what was incorrect/incomplete.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to help improve MicroPython.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 81b55d98e0da8..0000000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Request a feature or improvement
-title: ''
-labels: enhancement
-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 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).
-
-* 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?
-
-* Remove all placeholder text above before submitting.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000000..845fbed810ef9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,65 @@
+name: Feature request
+description: Request a feature or improvement
+labels: ['enhancement']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This form is for requesting features or improvements in MicroPython.
+
+        #### Get feedback first
+
+        Before submitting a new feature idea here, suggest starting a discussion on [Discord](https://discord.gg/RB8HZSAExQ) or [GitHub Discussions](https://github.com/orgs/micropython/discussions/) to get early feedback from the community and maintainers.
+
+        #### Not a MicroPython core feature?
+
+        * If you have a question \"How Do I ...?\", please post it on GitHub Discussions or Discord instead of here.
+        * Could this feature be implemented as a pure Python library? If so, please open the request on the [micropython-lib repository](https://github.com/micropython/micropython-lib/issues) instead.
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Checks
+      description: |
+        Before submitting your feature request, please go over these check points:
+      options:
+      - label: |
+           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
+        required: true
+      - label: |
+          I've searched for [existing issues](https://github.com/micropython/micropython/issues) regarding this feature, and didn't find any.
+        required: true
+  - type: textarea
+    id: feature
+    attributes:
+      label: Description
+      description: |
+        Describe the feature you'd like to see added to MicroPython. What does this feature enable and why is it useful?
+
+        * For core Python features, where possible please include a link to the relevant PEP or CPython documentation.
+        * 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 to, 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.
+
+        If there is an existing discussion somewhere about this feature, please add a link to it as well.
+    validations:
+      required: true
+  - type: textarea
+    id: size
+    attributes:
+      label: Code Size
+      description: |
+         MicroPython aims to strike a balance between functionality and code size. Can this feature be optionally enabled?
+
+         If you believe the usefulness of this feature would outweigh the additional code size, please explain. (It's OK to say you're unsure here, we're happy to discuss this with you.)
+  - type: checkboxes
+    id: implementation
+    attributes:
+      label: Implementation
+      options:
+      - label: I intend to implement this feature and would submit a Pull Request if desirable.
+      - label: I hope the MicroPython maintainers or community will implement this feature.
+      - label: I would like to [Sponsor](https://github.com/sponsors/micropython#sponsors) development of this feature.
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to suggest improvements for MicroPython.
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
deleted file mode 100644
index cfe4a4befdb14..0000000000000
--- a/.github/ISSUE_TEMPLATE/security.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Security report
-about: Report a security issue or vulnerability in MicroPython
-title: ''
-labels: security
-assignees: ''
-
----
-
-* 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.
diff --git a/.github/ISSUE_TEMPLATE/security.yml b/.github/ISSUE_TEMPLATE/security.yml
new file mode 100644
index 0000000000000..7d66a72f64120
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/security.yml
@@ -0,0 +1,59 @@
+name: Security report
+description: Report a security issue or vulnerability in MicroPython
+labels: ["security"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This form is for reporting security issues in MicroPython that are not readily exploitable.
+
+        1. For issues that are readily exploitable or have high impact, please email contact@micropython.org instead.
+        1. If this is a question about security, please ask it in [Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead.
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Checks
+      description: |
+        Before submitting your bug report, please go over these check points:
+      options:
+      - label: |
+           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
+        required: true
+      - label: I wish to report a specific security issue that is **not readily exploitable and does not have high impact** for MicroPython developers or users.
+        required: true
+      - label: |
+          I've searched for [existing issues](https://github.com/micropython/micropython/issues) and didn't find any that matched.
+        required: true
+  - type: input
+    id: port-board-hw
+    attributes:
+      label: Port, board and/or hardware
+      description: |
+        Which MicroPython port(s) and board(s) are you using?
+      placeholder: |
+        esp32 port, ESP32-Duper board.
+  - type: textarea
+    id: version
+    attributes:
+      label: MicroPython version
+      description: |
+        To find the version:
+
+        1. Open a serial REPL.
+        2. Type Ctrl-B to see the startup message.
+        3. Copy-paste that output here.
+
+        If the version or configuration is modified from the official MicroPython releases or the master branch, please tell us the details of this as well.
+      placeholder: |
+        MicroPython v6.28.3 on 2029-01-23; PyBoard 9 with STM32F9
+  - type: textarea
+    id: report
+    attributes:
+      label: Issue Report
+      description: |
+        Please provide a clear and concise description of the security issue.
+
+        * What does this issue allow an attacker to do?
+        * How does the attacker exploit this issue?
+    validations:
+      required: true

From b5edaf68cd2f8bad2dbb3293038a11a9c2108a82 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 13 Feb 2024 08:52:26 +0100
Subject: [PATCH 0864/3129] stm32/sdram: Support remapping FMC memory banks.

The patch enables SDRAM banks 1 and 2 to be accessible at 0xC0000000 and
0xD0000000 respectively (default mapping) or remapped to addresses
0x60000000 and 0x70000000.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/sdram.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index b0a3ef2157139..1e1a08e4c63bd 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -34,12 +34,20 @@
 #if defined(MICROPY_HW_FMC_SDCKE0) && defined(MICROPY_HW_FMC_SDNE0)
 #define FMC_SDRAM_BANK FMC_SDRAM_BANK1
 #define FMC_SDRAM_CMD_TARGET_BANK FMC_SDRAM_CMD_TARGET_BANK1
+#if MICROPY_HW_FMC_SWAP_BANKS
+#define SDRAM_START_ADDRESS 0x60000000
+#else
 #define SDRAM_START_ADDRESS 0xC0000000
+#endif
 #elif defined(MICROPY_HW_FMC_SDCKE1) && defined(MICROPY_HW_FMC_SDNE1)
 #define FMC_SDRAM_BANK FMC_SDRAM_BANK2
 #define FMC_SDRAM_CMD_TARGET_BANK FMC_SDRAM_CMD_TARGET_BANK2
+#if MICROPY_HW_FMC_SWAP_BANKS
+#define SDRAM_START_ADDRESS 0x70000000
+#else
 #define SDRAM_START_ADDRESS 0xD0000000
 #endif
+#endif
 
 // Provides the MPU_REGION_SIZE_X value when passed the size of region in bytes
 // "m" must be a power of 2 between 32 and 4G (2**5 and 2**32) and this formula
@@ -59,6 +67,10 @@ bool sdram_init(void) {
 
     __HAL_RCC_FMC_CLK_ENABLE();
 
+    #if MICROPY_HW_FMC_SWAP_BANKS
+    HAL_SetFMCMemorySwappingConfig(FMC_SWAPBMAP_SDRAM_SRAM);
+    #endif
+
     #if defined(MICROPY_HW_FMC_SDCKE0)
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_SDCKE0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_SDCKE0);
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_SDNE0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_SDNE0);

From 8547a782750c12a163e0cd022fefc2aaaa4b1bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Wed, 28 Jun 2023 21:46:37 +0000
Subject: [PATCH 0865/3129] extmod/modwebsocket: Fix websocket to send correct
 close frame.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the websocket closes currently, it does not send a proper
"close"-frame, but rather encodes the 0x8800-sequence inside a binary
packet, which is wrong.  The close packet is a different kind of websocket
frame, according to https://www.rfc-editor.org/rfc/rfc6455.

This change resolves an error in Firefox when the websocket closes.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/modwebsocket.c               | 10 ++++++++--
 tests/extmod/websocket_basic.py.exp |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index d2cb72039621b..3645b771a5319 100644
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@@ -56,6 +56,7 @@ typedef struct _mp_obj_websocket_t {
 } mp_obj_websocket_t;
 
 STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode);
+STATIC mp_uint_t websocket_write_raw(mp_obj_t self_in, const byte *header, int hdr_sz, const void *buf, mp_uint_t size, int *errcode);
 
 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);
@@ -193,9 +194,9 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
                     if (last_state == CONTROL) {
                         byte frame_type = self->last_flags & FRAME_OPCODE_MASK;
                         if (frame_type == FRAME_CLOSE) {
-                            static const char close_resp[2] = {0x88, 0};
+                            static const byte close_resp[2] = {0x88, 0};
                             int err;
-                            websocket_write(self_in, close_resp, sizeof(close_resp), &err);
+                            websocket_write_raw(self_in, close_resp, sizeof(close_resp), close_resp, 0, &err);
                             return 0;
                         }
 
@@ -230,6 +231,11 @@ STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t si
         hdr_sz = 4;
     }
 
+    return websocket_write_raw(self_in, header, hdr_sz, buf, size, errcode);
+}
+STATIC mp_uint_t websocket_write_raw(mp_obj_t self_in, const byte *header, int hdr_sz, const void *buf, mp_uint_t size, int *errcode) {
+    mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in);
+
     mp_obj_t dest[3];
     if (self->opts & BLOCKING_WRITE) {
         mp_load_method(self->sock, MP_QSTR_setblocking, dest);
diff --git a/tests/extmod/websocket_basic.py.exp b/tests/extmod/websocket_basic.py.exp
index 2d7657b535407..152aae836d6a0 100644
--- a/tests/extmod/websocket_basic.py.exp
+++ b/tests/extmod/websocket_basic.py.exp
@@ -5,7 +5,7 @@ b'pingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpi
 b'\x81~\x00\x80pongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpong'
 b'\x00\x00\x00\x00'
 b''
-b'\x81\x02\x88\x00'
+b'\x88\x00'
 b'ping'
 b'pong'
 0

From d2bcb8597e88fccd496b6b0e358347f4bf6a15da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 22 Feb 2024 01:09:05 +0000
Subject: [PATCH 0866/3129] extmod/modlwip: Add back support for empty IP
 addresses.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to commit 628abf8f25a7705a2810fffe2ca6ae652c532896 which added IPv6
support, binding a socket with

    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
    s.bind(("", PORT))

was possible.  But, the empty string is not regarded as a valid IP address
by lwip.  This commit adds a special case for the empty IP string,
restoring the previous CPython-compatible behaviour.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/modlwip.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index a6630c693cad5..f1242b046186f 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -367,8 +367,16 @@ mp_uint_t lwip_parse_inet_addr(mp_obj_t addr_in, ip_addr_t *out_ip) {
     mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
     size_t addr_len;
     const char *addr_str = mp_obj_str_get_data(addr_items[0], &addr_len);
-    if (!ipaddr_aton(addr_str, out_ip)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
+    if (*addr_str == 0) {
+        #if LWIP_IPV6
+        *out_ip = *IP6_ADDR_ANY;
+        #else
+        *out_ip = *IP_ADDR_ANY;
+        #endif
+    } else {
+        if (!ipaddr_aton(addr_str, out_ip)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
+        }
     }
     return mp_obj_get_int(addr_items[1]);
 }

From 8fdcc25eb07731a64077b7576c5d477cf81e2dd5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 22 Feb 2024 20:50:03 +0100
Subject: [PATCH 0867/3129] py/mpconfig: Change the default enable level for
 the vfs module.

For boards with MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES and up.
This gets samd21 boards working (which need the vfs module in _boot.py),
B_L072Z_LRWAN1, and nrf boards with smaller MCUs that use CORE or BASIC
feature levels.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 py/mpconfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 837115ab59f99..e7b72c642274f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1746,7 +1746,7 @@ typedef double mp_float_t;
 
 // Whether to provide the "vfs" module
 #ifndef MICROPY_PY_VFS
-#define MICROPY_PY_VFS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES && MICROPY_VFS)
+#define MICROPY_PY_VFS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES && MICROPY_VFS)
 #endif
 
 #ifndef MICROPY_PY_WEBSOCKET

From 8692d2602a7775fea22d75ebf5b50971dc2b968f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Feb 2024 10:52:12 +1100
Subject: [PATCH 0868/3129] extmod/asyncio: Make current_task raise exception
 when there is no task.

Matches CPython behaviour.

Fixes issue #11530.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/asyncio/core.py               |  5 +++++
 tests/extmod/asyncio_current_task.py | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/extmod/asyncio/core.py b/extmod/asyncio/core.py
index e5af3038f77bb..8aad234514b0c 100644
--- a/extmod/asyncio/core.py
+++ b/extmod/asyncio/core.py
@@ -164,6 +164,7 @@ def run_until_complete(main_task=None):
                 dt = max(0, ticks_diff(t.ph_key, ticks()))
             elif not _io_queue.map:
                 # No tasks can be woken so finished running
+                cur_task = None
                 return
             # print('(poll {})'.format(dt), len(_io_queue.map))
             _io_queue.wait_io_event(dt)
@@ -188,6 +189,7 @@ def run_until_complete(main_task=None):
             assert t.data is None
             # This task is done, check if it's the main task and then loop should stop
             if t is main_task:
+                cur_task = None
                 if isinstance(er, StopIteration):
                     return er.value
                 raise er
@@ -242,6 +244,7 @@ async def _stopper():
     pass
 
 
+cur_task = None
 _stop_task = None
 
 
@@ -291,6 +294,8 @@ def get_event_loop(runq_len=0, waitq_len=0):
 
 
 def current_task():
+    if cur_task is None:
+        raise RuntimeError("no running event loop")
     return cur_task
 
 
diff --git a/tests/extmod/asyncio_current_task.py b/tests/extmod/asyncio_current_task.py
index 18058230f2d90..a25e543d0c5b1 100644
--- a/tests/extmod/asyncio_current_task.py
+++ b/tests/extmod/asyncio_current_task.py
@@ -19,4 +19,15 @@ async def main():
     print(t is result[0])
 
 
+try:
+    print(asyncio.current_task())
+except RuntimeError:
+    print("RuntimeError")
+
+
 asyncio.run(main())
+
+try:
+    print(asyncio.current_task())
+except RuntimeError:
+    print("RuntimeError")

From 9a4be7d7b36b55fba5584d0ffb751e6b431324cc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 11:15:37 +1100
Subject: [PATCH 0869/3129] py/emitbc: Remove call to adjust Python stack by 0
 entries.

This call used to be needed when there was an `emit_bc_pre()` function that
needed to be called at the start of each emitted bytecode.  But in
8e7745eb315cdaf7dec033891f88e091ab4e016e that function was removed and now
the call to `mp_emit_bc_adjust_stack_size()` does nothing when adjusting by
0 entries, so it can be removed.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitbc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/py/emitbc.c b/py/emitbc.c
index ca5f07085b84d..85fc5f218b0af 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -448,7 +448,6 @@ void mp_emit_bc_label_assign(emit_t *emit, mp_uint_t l) {
     // 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;
     }

From b91b2a7fe912944b74ff7e7b3e38611ea0fe78ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 13:33:51 +1100
Subject: [PATCH 0870/3129] py/mpstate: Don't declare mp_thread_get_state().

It's instead declared by the include of `py/mpthread.h`.

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

diff --git a/py/mpstate.h b/py/mpstate.h
index 0e0388e410ac9..af55e764f6cdc 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -310,7 +310,6 @@ extern mp_state_ctx_t mp_state_ctx;
 #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)
 #define mp_thread_is_main_thread() (mp_thread_get_state() == &mp_state_ctx.thread)
 #else

From a30c29398a6f38ae7ba3964841892e3e9b60aa0c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 13:35:36 +1100
Subject: [PATCH 0871/3129] ports: Don't include mpthread.h in mpthreadport.h.

Because `mpthreadport.h` is included by `mpthread.h`.

Also remove unnecessary include of `mpthreadport.h` in esp32's `main.c`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c              | 1 -
 ports/renesas-ra/mpthreadport.h | 1 -
 ports/rp2/mpthreadport.h        | 1 -
 ports/stm32/mpthreadport.h      | 1 -
 4 files changed, 4 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 6f51b7236bce9..6fb15d3cc8906 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -59,7 +59,6 @@
 #include "usb_serial_jtag.h"
 #include "modmachine.h"
 #include "modnetwork.h"
-#include "mpthreadport.h"
 
 #if MICROPY_BLUETOOTH_NIMBLE
 #include "extmod/modbluetooth.h"
diff --git a/ports/renesas-ra/mpthreadport.h b/ports/renesas-ra/mpthreadport.h
index e2b39979fb4c8..a68c00e1f838b 100644
--- a/ports/renesas-ra/mpthreadport.h
+++ b/ports/renesas-ra/mpthreadport.h
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpthread.h"
 #include "pybthread.h"
 
 typedef pyb_mutex_t mp_thread_mutex_t;
diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
index 868f8d14118dd..7982de96a8deb 100644
--- a/ports/rp2/mpthreadport.h
+++ b/ports/rp2/mpthreadport.h
@@ -26,7 +26,6 @@
 #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;
diff --git a/ports/stm32/mpthreadport.h b/ports/stm32/mpthreadport.h
index e2b39979fb4c8..a68c00e1f838b 100644
--- a/ports/stm32/mpthreadport.h
+++ b/ports/stm32/mpthreadport.h
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpthread.h"
 #include "pybthread.h"
 
 typedef pyb_mutex_t mp_thread_mutex_t;

From 56f9dcb580a6ee6c10f6db59a72e3b216e4e4dfc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 14:16:05 +1100
Subject: [PATCH 0872/3129] tests/multi_bluetooth: Move ble_deepsleep to
 stress_deepsleep_reconnect.

This test cannot run on boards that have a native USB REPL, so rename it to
indicate that its "special".  This makes it easier to run a subset of
tests, for example:

    ./run-multitests.py multi_bluetooth/ble*.py
    ./run-multitests.py multi_bluetooth/perf*.py
    ./run-multitests.py multi_bluetooth/stress*.py

Signed-off-by: Damien George <damien@micropython.org>
---
 .../{ble_deepsleep.py => stress_deepsleep_reconnect.py}           | 0
 .../{ble_deepsleep.py.exp => stress_deepsleep_reconnect.py.exp}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/multi_bluetooth/{ble_deepsleep.py => stress_deepsleep_reconnect.py} (100%)
 rename tests/multi_bluetooth/{ble_deepsleep.py.exp => stress_deepsleep_reconnect.py.exp} (100%)

diff --git a/tests/multi_bluetooth/ble_deepsleep.py b/tests/multi_bluetooth/stress_deepsleep_reconnect.py
similarity index 100%
rename from tests/multi_bluetooth/ble_deepsleep.py
rename to tests/multi_bluetooth/stress_deepsleep_reconnect.py
diff --git a/tests/multi_bluetooth/ble_deepsleep.py.exp b/tests/multi_bluetooth/stress_deepsleep_reconnect.py.exp
similarity index 100%
rename from tests/multi_bluetooth/ble_deepsleep.py.exp
rename to tests/multi_bluetooth/stress_deepsleep_reconnect.py.exp

From 3460b48a6d3af423e8592add99432172523639ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Fri, 8 Dec 2023 18:57:07 +0100
Subject: [PATCH 0873/3129] extmod/nimble: Override configuration options set
 in nimble_port_init.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This moves the runtime initialisation of `ble_hs_cfg` to happen after
`nimble_port_init()`. That is consistent with the order used in NimBLE
examples. On the ESP32 port this is needed because the ESP-IDF sets up
the default RAM secret store callbacks in its implementation of
`nimble_port_init()` (specifically, it calls `esp_nimble_init()` which
in turn calls `ble_store_ram_init()`). We want to override those with
our own callbacks to implement the `IRQ_[GS]ET_SECRET` events in Python.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/nimble/modbluetooth_nimble.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index c053ac56cf2ba..b4610564cd33c 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -592,17 +592,6 @@ int mp_bluetooth_init(void) {
 
     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;
-    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);
 
@@ -622,6 +611,17 @@ int mp_bluetooth_init(void) {
     DEBUG_printf("mp_bluetooth_init: nimble_port_init\n");
     nimble_port_init();
 
+    ble_hs_cfg.reset_cb = reset_cb;
+    ble_hs_cfg.sync_cb = sync_cb;
+    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
+
     // Make sure that the HCI UART and event handling task is running.
     mp_bluetooth_nimble_port_start();
 

From d1e15b928107e2459b65c7a2484517e9e2a830cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 12 Dec 2023 15:56:13 +0100
Subject: [PATCH 0874/3129] extmod/nimble: Enable key distribution to support
 bonding.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This sets the BLE key distribution parameters at runtime. This isn't
needed in most ports since we already set the default values in
`extmod/nimble/syscfg/syscfg.h`; however in the ESP32 port that
headerfile is not used, and the default values in the ESP-IDF don't
enable key distribution nor can we change those defaults via
`sdkconfig`. Thus we're setting these values explicitly at runtime.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 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 b4610564cd33c..5bab43a0ccea0 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -617,6 +617,8 @@ int mp_bluetooth_init(void) {
     ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
 
     #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+    ble_hs_cfg.sm_our_key_dist = BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID | BLE_SM_PAIR_KEY_DIST_SIGN;
+    ble_hs_cfg.sm_their_key_dist = BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID | BLE_SM_PAIR_KEY_DIST_SIGN;
     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;

From 678707c8b07323c5b914778708a2858387c3b60c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Fri, 22 Dec 2023 16:30:04 +0100
Subject: [PATCH 0875/3129] docs/library/bluetooth: Add note that ESP32
 supports pairing/bonding.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pairing and bonding was fixed for the ESP32 in the two previous commits.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 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 fb3c23400e51d..f8b154dd11448 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -722,7 +722,7 @@ Pairing and bonding
     and ``_IRQ_SET_SECRET`` events.
 
     **Note:** This is currently only supported when using the NimBLE stack on
-    STM32 and Unix (not ESP32).
+    ESP32, STM32 and Unix.
 
 .. method:: BLE.gap_pair(conn_handle, /)
 

From bc424ddc4165ffd8203b4e781f7c686598601e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 28 Feb 2024 12:41:41 +0100
Subject: [PATCH 0876/3129] py/modthread: Move thread state initialisation to
 shared function.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/modbluetooth.c | 10 +---------
 py/modthread.c        | 15 +--------------
 py/runtime.h          | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 32a15bf511acb..91e4e622132d5 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -34,7 +34,6 @@
 #include "py/objarray.h"
 #include "py/qstr.h"
 #include "py/runtime.h"
-#include "py/stackctrl.h"
 #include "extmod/modbluetooth.h"
 #include <string.h>
 
@@ -1272,14 +1271,7 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
 
     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);
-        ts.gc_lock_depth = 0;
-        ts.nlr_jump_callback_top = NULL;
-        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_init_state(&ts, MICROPY_PY_BLUETOOTH_SYNC_EVENT_STACK_SIZE, NULL, NULL);
         MP_THREAD_GIL_ENTER();
     }
 
diff --git a/py/modthread.c b/py/modthread.c
index 3a8a1e03ce12b..9fc20570be1f0 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -160,10 +160,7 @@ STATIC void *thread_entry(void *args_in) {
     thread_entry_args_t *args = (thread_entry_args_t *)args_in;
 
     mp_state_thread_t ts;
-    mp_thread_set_state(&ts);
-
-    mp_stack_set_top(&ts + 1); // need to include ts in root-pointer scan
-    mp_stack_set_limit(args->stack_size);
+    mp_thread_init_state(&ts, args->stack_size, args->dict_locals, args->dict_globals);
 
     #if MICROPY_ENABLE_PYSTACK
     // TODO threading and pystack is not fully supported, for now just make a small stack
@@ -171,16 +168,6 @@ 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;
-
-    ts.nlr_jump_callback_top = NULL;
-    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);
-
     MP_THREAD_GIL_ENTER();
 
     // signal that we are set up and running
diff --git a/py/runtime.h b/py/runtime.h
index a04d4584f804c..5465c06d8aee9 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -28,6 +28,7 @@
 
 #include "py/mpstate.h"
 #include "py/pystack.h"
+#include "py/stackctrl.h"
 
 // For use with mp_call_function_1_from_nlr_jump_callback.
 #define MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, f, a) \
@@ -154,6 +155,32 @@ static inline void mp_globals_set(mp_obj_dict_t *d) {
 void mp_globals_locals_set_from_nlr_jump_callback(void *ctx_in);
 void mp_call_function_1_from_nlr_jump_callback(void *ctx_in);
 
+#if MICROPY_PY_THREAD
+static inline void mp_thread_init_state(mp_state_thread_t *ts, size_t stack_size, mp_obj_dict_t *locals, mp_obj_dict_t *globals) {
+    mp_thread_set_state(ts);
+
+    mp_stack_set_top(ts + 1); // need to include ts in root-pointer scan
+    mp_stack_set_limit(stack_size);
+
+    // GC starts off unlocked
+    ts->gc_lock_depth = 0;
+
+    // There are no pending jump callbacks or exceptions yet
+    ts->nlr_jump_callback_top = NULL;
+    ts->mp_pending_exception = MP_OBJ_NULL;
+
+    // If locals/globals are not given, inherit from main thread
+    if (locals == NULL) {
+        locals = mp_state_ctx.thread.dict_locals;
+    }
+    if (globals == NULL) {
+        globals = mp_state_ctx.thread.dict_globals;
+    }
+    mp_locals_set(locals);
+    mp_globals_set(globals);
+}
+#endif
+
 mp_obj_t mp_load_name(qstr qst);
 mp_obj_t mp_load_global(qstr qst);
 mp_obj_t mp_load_build_class(void);

From 7d5f697c38629ceee5aa169f5b776de40c37a244 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Mar 2024 10:27:07 +1100
Subject: [PATCH 0877/3129] py/emitglue: Add explicit cast of proto_fun to
 uint8_t pointer.

Otherwise C++ compilers may complain when this header is included in an
extern "C" block.

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

diff --git a/py/emitglue.h b/py/emitglue.h
index 0960ee22daec1..126462671b003 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -63,7 +63,7 @@ typedef const void *mp_proto_fun_t;
 // is guaranteed to have either its first or second byte non-zero.  So if both bytes are
 // zero then the mp_proto_fun_t pointer must be an mp_raw_code_t.
 static inline bool mp_proto_fun_is_bytecode(mp_proto_fun_t proto_fun) {
-    const uint8_t *header = proto_fun;
+    const uint8_t *header = (const uint8_t *)proto_fun;
     return (header[0] | (header[1] << 8)) != (MP_PROTO_FUN_INDICATOR_RAW_CODE_0 | (MP_PROTO_FUN_INDICATOR_RAW_CODE_1 << 8));
 }
 

From 90e517862d055b8ec95a0c7067052c0ba6cd0df1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Mar 2024 11:33:00 +1100
Subject: [PATCH 0878/3129] webassembly/Makefile: Remove --memory-init-file
 from linker options.

It's no longer supported by Emscripten (at least at 3.1.55).  And it's not
needed when the output is WASM, which it is by default.

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

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index 450ef87680775..c5ee80fe0046f 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -38,7 +38,6 @@ 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']"
 JSFLAGS += -s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap', 'FS']"
-JSFLAGS += -s --memory-init-file 0
 JSFLAGS += --js-library library.js
 
 all: $(BUILD)/micropython.js

From ab6d59d7bd2cee972afd917e41347f269693fed9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Mar 2024 14:07:00 +1100
Subject: [PATCH 0879/3129] lib/cyw43-driver: Update driver to latest version
 v1.0.3.

Includes various bug fixes.

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 2ab0db6e1fe92..9f6405f0b3260 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 2ab0db6e1fe9265fa9802a95f7f4d60b7f0d655a
+Subproject commit 9f6405f0b3260968306d782e1c5ac275a46dc65d

From b3f2f18f927fa2fad10daf63d8c391331f5edf58 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Mar 2024 14:12:15 +1100
Subject: [PATCH 0880/3129] renesas-ra: Fix spelling mistakes found by
 codespell.

And enable codespell for this port in `pyproject.toml`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/Makefile                        |  2 +-
 ports/renesas-ra/README.md                       |  2 +-
 ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h |  2 +-
 ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h        |  2 +-
 ports/renesas-ra/machine_dac.c                   |  2 +-
 ports/renesas-ra/machine_pwm.c                   |  2 +-
 ports/renesas-ra/pendsv.c                        |  2 +-
 ports/renesas-ra/ra/ra_i2c.c                     |  2 +-
 ports/renesas-ra/ra/ra_icu.c                     |  2 +-
 ports/renesas-ra/ra/ra_sci.c                     | 10 +++++-----
 ports/renesas-ra/systick.c                       |  2 +-
 ports/renesas-ra/timer.c                         |  4 ++--
 pyproject.toml                                   |  1 -
 13 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 1e9cd2db5ba19..f8b46fe453902 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -484,7 +484,7 @@ FILE2H = $(TOP)/tools/file2h.py
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(GEN_PINS_SRC)
 
-# 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
diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
index 77b952178d61f..4b3a7696faeb3 100644
--- a/ports/renesas-ra/README.md
+++ b/ports/renesas-ra/README.md
@@ -63,7 +63,7 @@ passed as the argument to `BOARD=`; for example `RA4M1_CLICKER`, `EK_RA4M1`,
 The above command should produce binary images `firmware.hex` in the
 build-EK_RA6M2/` subdirectory (or the equivalent directory for the board specified).
 
-## Supported/Unsupprted funtions
+## Supported/Unsupported functions
 Please refer to the `renesas-ra` quick reference.
 
 ## Known issues
diff --git a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
index e7cce5e24a7fa..db4d2d9d63d0f 100644
--- a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
@@ -40,7 +40,7 @@
 // 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_SCL      (pin_P400) // Conflict with 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)
diff --git a/ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h
index bbc6dc5522c60..578025041e202 100644
--- a/ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h
+++ b/ports/renesas-ra/fsp_cfg/r_sci_uart_cfg.h
@@ -11,7 +11,7 @@ extern "C" {
 #define SCI_UART_CFG_RS485_SUPPORT (0)
 
 /*
- * Disable r_sci_uart.c's interrupt handlers by defining followings
+ * Disable r_sci_uart.c's interrupt handlers by defining following
  * because the renesas-ra has own interrupt handlers for SCI and
  * symbol conflict happens.
  */
diff --git a/ports/renesas-ra/machine_dac.c b/ports/renesas-ra/machine_dac.c
index 6fd23c23889db..0d9c779497588 100644
--- a/ports/renesas-ra/machine_dac.c
+++ b/ports/renesas-ra/machine_dac.c
@@ -54,7 +54,7 @@ STATIC machine_dac_obj_t machine_dac_obj[] = {
 
 STATIC void machine_dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);     // const char *qstr_str(qstr q);
-    mp_printf(print, "DAC(DA%d [#%d], runing=%u, out=%u mV)", self->ch, self->dac->pin, self->active, self->mv);
+    mp_printf(print, "DAC(DA%d [#%d], active=%u, out=%u mV)", self->ch, self->dac->pin, self->active, self->mv);
 }
 
 STATIC mp_obj_t machine_dac_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/renesas-ra/machine_pwm.c b/ports/renesas-ra/machine_pwm.c
index 936f698e3398c..69dc5bad59932 100644
--- a/ports/renesas-ra/machine_pwm.c
+++ b/ports/renesas-ra/machine_pwm.c
@@ -136,7 +136,7 @@ STATIC machine_pwm_obj_t machine_pwm_obj[] = {
 
 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(GTIOC %d%c[#%d], runing=%u, freq=%u, duty=%u)", self->ch, self->id, self->pwm->pin, self->active, self->freq, self->duty);
+    mp_printf(print, "PWM(GTIOC %d%c[#%d], active=%u, freq=%u, duty=%u)", self->ch, self->id, self->pwm->pin, self->active, self->freq, self->duty);
 }
 
 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) {
diff --git a/ports/renesas-ra/pendsv.c b/ports/renesas-ra/pendsv.c
index d4c4496f1b33c..9c908addb58cb 100644
--- a/ports/renesas-ra/pendsv.c
+++ b/ports/renesas-ra/pendsv.c
@@ -164,7 +164,7 @@ __attribute__((naked)) void PendSV_Handler(void) {
         "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
+        "msr primask, r5\n"             // re-enable interrupts
         "vpop {s16-s31}\n"
         "pop {r4-r11, lr}\n"
         "bx lr\n"                       // return from interrupt; will return to new thread
diff --git a/ports/renesas-ra/ra/ra_i2c.c b/ports/renesas-ra/ra/ra_i2c.c
index 701f4d6aa8386..ba2fa72653358 100644
--- a/ports/renesas-ra/ra/ra_i2c.c
+++ b/ports/renesas-ra/ra/ra_i2c.c
@@ -625,7 +625,7 @@ static void ra_i2c_ictei_isr(R_IIC0_Type *i2c_inst) {
             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
+            action->m_status = RA_I2C_STATUS_Stopped; // set Stopped status instead STOP condition
         }
     } else {
         ra_i2c_xaction_start(i2c_inst, action, true);
diff --git a/ports/renesas-ra/ra/ra_icu.c b/ports/renesas-ra/ra/ra_icu.c
index caac8bfe221e2..633c3c3de03e6 100644
--- a/ports/renesas-ra/ra/ra_icu.c
+++ b/ports/renesas-ra/ra/ra_icu.c
@@ -520,7 +520,7 @@ static const ra_icu_pin_t ra_irq_pins[] = {
     #endif
 
     #else
-    #error "CMSIS MCU Series is not speficied."
+    #error "CMSIS MCU Series is not specified."
     #endif
 };
 #define ICU_PINS_SIZE (sizeof(ra_irq_pins) / sizeof(ra_icu_pin_t))
diff --git a/ports/renesas-ra/ra/ra_sci.c b/ports/renesas-ra/ra/ra_sci.c
index 81f3ff9675b5e..9fb44090d3723 100644
--- a/ports/renesas-ra/ra/ra_sci.c
+++ b/ports/renesas-ra/ra/ra_sci.c
@@ -1210,7 +1210,7 @@ void ra_sci_tx_ch(uint32_t ch, int c) {
         if ((scr & 0xa0) != 0) {
             sci_regs[idx]->SCR &= ~0xa0;
         }
-        sci_regs[idx]->SCR |= 0xa0; /* TIE and TE enable */
+        sci_regs[idx]->SCR |= 0xa0; /* TIE- and TE-interrupt enable */
     }
     ra_enable_irq(state);
 }
@@ -1412,28 +1412,28 @@ void ra_sci_deinit(uint32_t ch) {
     }
 }
 
-/* rx interrupt */
+/* 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 */
+/* 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 */
+/* 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 */
+/* te-interrupt */
 void sci_uart_tei_isr(void) {
     IRQn_Type irq = R_FSP_CurrentIrqGet();
     uint32_t ch = irq_to_ch[(uint32_t)irq];
diff --git a/ports/renesas-ra/systick.c b/ports/renesas-ra/systick.c
index 95ca8083011ad..6fa02a2b6ec0a 100644
--- a/ports/renesas-ra/systick.c
+++ b/ports/renesas-ra/systick.c
@@ -49,7 +49,7 @@ void SysTick_Handler(void) {
     uint32_t uw_tick = uwTick + 1;
     uwTick = uw_tick;
 
-    // Read the systick control regster. This has the side effect of clearing
+    // Read the systick control register. This has the side effect of clearing
     // the COUNTFLAG bit, which makes the logic in mp_hal_ticks_us
     // work properly.
     SysTick->CTRL;
diff --git a/ports/renesas-ra/timer.c b/ports/renesas-ra/timer.c
index 04bd752b98cc7..1b32bc1eee29e 100644
--- a/ports/renesas-ra/timer.c
+++ b/ports/renesas-ra/timer.c
@@ -99,7 +99,7 @@ STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 ///
 /// Keyword arguments:
 ///
-///   - `freq` - specifies the periodic frequency of the timer. You migh also
+///   - `freq` - specifies the periodic frequency of the timer. You might also
 ///              view this as the frequency with which the timer goes through
 ///              one complete cycle.
 //////
@@ -215,7 +215,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
 /// 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.
+/// Otherwise, 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
diff --git a/pyproject.toml b/pyproject.toml
index 6c813f5a1ff40..0b3a40d9c95f7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,6 @@ skip = """
 ./ports/cc3200/simplelink,\
 ./ports/cc3200/telnet,\
 ./ports/nrf/drivers/bluetooth/s1*,\
-./ports/renesas-ra,\
 ./ports/stm32/usbhost,\
 ./tests,\
 ACKNOWLEDGEMENTS,\

From decf8e6a8bb940d5829ca3296790631fcece7b21 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 27 Feb 2024 15:32:29 +1100
Subject: [PATCH 0881/3129] all: Remove the "STATIC" macro and just use
 "static" instead.

The STATIC macro was introduced a very long time ago in commit
d5df6cd44a433d6253a61cb0f987835fbc06b2de.  The original reason for this was
to have the option to define it to nothing so that all static functions
become global functions and therefore visible to certain debug tools, so
one could do function size comparison and other things.

This STATIC feature is rarely (if ever) used.  And with the use of LTO and
heavy inline optimisation, analysing the size of individual functions when
they are not static is not a good representation of the size of code when
fully optimised.

So the macro does not have much use and it's simpler to just remove it.
Then you know exactly what it's doing.  For example, newcomers don't have
to learn what the STATIC macro is and why it exists.  Reading the code is
also less "loud" with a lowercase static.

One other minor point in favour of removing it, is that it stops bugs with
`STATIC inline`, which should always be `static inline`.

Methodology for this commit was:

1) git ls-files | egrep '\.[ch]$' | \
   xargs sed -Ei "s/(^| )STATIC($| )/\1static\2/"

2) Do some manual cleanup in the diff by searching for the word STATIC in
   comments and changing those back.

3) "git-grep STATIC docs/", manually fixed those cases.

4) "rg -t python STATIC", manually fixed codegen lines that used STATIC.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/develop/compiler.rst                     |   4 +-
 docs/develop/library.rst                      |   6 +-
 docs/develop/natmod.rst                       |   6 +-
 docs/develop/porting.rst                      |   8 +-
 drivers/bus/softqspi.c                        |  18 +-
 drivers/cyw43/cywbt.c                         |  16 +-
 drivers/dht/dht.c                             |   2 +-
 drivers/esp-hosted/esp_hosted_hal.c           |   4 +-
 drivers/memory/spiflash.c                     |  28 +-
 examples/natmod/btree/btree_c.c               |   6 +-
 examples/natmod/deflate/deflate.c             |   4 +-
 examples/natmod/features0/features0.c         |   6 +-
 examples/natmod/features1/features1.c         |  18 +-
 examples/natmod/features2/main.c              |  14 +-
 examples/natmod/features3/features3.c         |  12 +-
 examples/natmod/features4/features4.c         |  10 +-
 examples/natmod/framebuf/framebuf.c           |   2 +-
 examples/natmod/re/re.c                       |   4 +-
 examples/usercmodule/cexample/examplemodule.c |  18 +-
 .../usercmodule/cppexample/examplemodule.c    |   6 +-
 .../subpackage/modexamplepackage.c            |  28 +-
 extmod/btstack/btstack_hci_uart.c             |  40 +--
 extmod/btstack/modbluetooth_btstack.c         |  64 ++---
 extmod/machine_adc.c                          |  56 ++--
 extmod/machine_adc_block.c                    |  26 +-
 extmod/machine_bitstream.c                    |   2 +-
 extmod/machine_i2c.c                          |  76 +++---
 extmod/machine_i2s.c                          |  78 +++---
 extmod/machine_mem.c                          |   6 +-
 extmod/machine_pinbase.c                      |   6 +-
 extmod/machine_pulse.c                        |   2 +-
 extmod/machine_pwm.c                          |  52 ++--
 extmod/machine_signal.c                       |  24 +-
 extmod/machine_spi.c                          |  32 +--
 extmod/machine_timer.c                        |  18 +-
 extmod/machine_uart.c                         |  62 ++---
 extmod/machine_wdt.c                          |  20 +-
 extmod/modasyncio.c                           |  62 ++---
 extmod/modbinascii.c                          |  24 +-
 extmod/modbluetooth.c                         | 160 ++++++------
 extmod/modbluetooth.h                         |   4 +-
 extmod/modbtree.c                             |  68 ++---
 extmod/modcryptolib.c                         |  42 +--
 extmod/moddeflate.c                           |  28 +-
 extmod/modframebuf.c                          | 122 ++++-----
 extmod/modhashlib.c                           |  76 +++---
 extmod/modheapq.c                             |  22 +-
 extmod/modjson.c                              |  32 +--
 extmod/modlwip.c                              | 144 +++++------
 extmod/modmachine.c                           |  48 ++--
 extmod/modnetwork.c                           |  12 +-
 extmod/modonewire.c                           |  34 +--
 extmod/modos.c                                |  28 +-
 extmod/modplatform.c                          |  26 +-
 extmod/modrandom.c                            |  50 ++--
 extmod/modre.c                                |  48 ++--
 extmod/modselect.c                            |  48 ++--
 extmod/modsocket.c                            |  76 +++---
 extmod/modtime.c                              |  30 +--
 extmod/modtls_axtls.c                         |  54 ++--
 extmod/modtls_mbedtls.c                       |  90 +++----
 extmod/moductypes.c                           |  44 ++--
 extmod/modvfs.c                               |   4 +-
 extmod/modwebrepl.c                           |  48 ++--
 extmod/modwebsocket.c                         |  26 +-
 extmod/network_cyw43.c                        |  56 ++--
 extmod/network_esp_hosted.c                   |  40 +--
 extmod/network_ninaw10.c                      |  98 +++----
 extmod/network_wiznet5k.c                     | 116 ++++-----
 extmod/nimble/hal/hal_uart.c                  |   2 +-
 extmod/nimble/modbluetooth_nimble.c           | 128 +++++-----
 extmod/nimble/nimble/nimble_npl_os.c          |   8 +-
 extmod/os_dupterm.c                           |   2 +-
 extmod/vfs.c                                  |   8 +-
 extmod/vfs_fat.c                              |  70 ++---
 extmod/vfs_fat_diskio.c                       |   2 +-
 extmod/vfs_fat_file.c                         |  18 +-
 extmod/vfs_lfs.c                              |   2 +-
 extmod/vfs_lfsx.c                             |  80 +++---
 extmod/vfs_lfsx_file.c                        |  18 +-
 extmod/vfs_posix.c                            |  68 ++---
 extmod/vfs_posix_file.c                       |  24 +-
 extmod/vfs_reader.c                           |   4 +-
 mpy-cross/main.c                              |  18 +-
 ports/cc3200/boards/make-pins.py              |   2 +-
 ports/cc3200/ftp/ftp.c                        |  14 +-
 ports/cc3200/misc/mpirq.c                     |  22 +-
 ports/cc3200/mods/machine_wdt.c               |   6 +-
 ports/cc3200/mods/modhashlib.c                |  26 +-
 ports/cc3200/mods/modmachine.c                |  26 +-
 ports/cc3200/mods/modnetwork.c                |  36 +--
 ports/cc3200/mods/modos.c                     |   4 +-
 ports/cc3200/mods/modsocket.c                 | 104 ++++----
 ports/cc3200/mods/modssl.c                    |  14 +-
 ports/cc3200/mods/modtime.c                   |   4 +-
 ports/cc3200/mods/modwipy.c                   |   8 +-
 ports/cc3200/mods/modwlan.c                   | 170 ++++++-------
 ports/cc3200/mods/pybadc.c                    |  62 ++---
 ports/cc3200/mods/pybflash.c                  |  20 +-
 ports/cc3200/mods/pybi2c.c                    |  80 +++---
 ports/cc3200/mods/pybpin.c                    | 134 +++++-----
 ports/cc3200/mods/pybrtc.c                    |  84 +++---
 ports/cc3200/mods/pybsd.c                     |  40 +--
 ports/cc3200/mods/pybsleep.c                  |  42 +--
 ports/cc3200/mods/pybspi.c                    |  46 ++--
 ports/cc3200/mods/pybtimer.c                  | 116 ++++-----
 ports/cc3200/mods/pybuart.c                   |  90 +++----
 ports/cc3200/mptask.c                         |  16 +-
 ports/cc3200/mpthreadport.c                   |  10 +-
 ports/cc3200/util/random.c                    |   6 +-
 ports/esp32/esp32_nvs.c                       |  34 +--
 ports/esp32/esp32_partition.c                 |  46 ++--
 ports/esp32/esp32_rmt.c                       |  42 +--
 ports/esp32/esp32_ulp.c                       |  20 +-
 ports/esp32/machine_adc.c                     |  24 +-
 ports/esp32/machine_adc_block.c               |   8 +-
 ports/esp32/machine_bitstream.c               |  10 +-
 ports/esp32/machine_dac.c                     |  12 +-
 ports/esp32/machine_hw_spi.c                  |  22 +-
 ports/esp32/machine_i2c.c                     |   8 +-
 ports/esp32/machine_i2s.c                     |  28 +-
 ports/esp32/machine_pin.c                     |  48 ++--
 ports/esp32/machine_pwm.c                     |  70 ++---
 ports/esp32/machine_rtc.c                     |  22 +-
 ports/esp32/machine_sdcard.c                  |  30 +--
 ports/esp32/machine_timer.c                   |  32 +--
 ports/esp32/machine_touchpad.c                |  12 +-
 ports/esp32/machine_uart.c                    |  22 +-
 ports/esp32/machine_wdt.c                     |   6 +-
 ports/esp32/modesp.c                          |  36 +--
 ports/esp32/modesp32.c                        |  32 +--
 ports/esp32/modespnow.c                       |  86 +++----
 ports/esp32/modmachine.c                      |  24 +-
 ports/esp32/modos.c                           |   4 +-
 ports/esp32/modsocket.c                       | 100 ++++----
 ports/esp32/modtime.c                         |   4 +-
 ports/esp32/mphalport.c                       |   2 +-
 ports/esp32/mpnimbleport.c                    |   2 +-
 ports/esp32/mpthreadport.c                    |  10 +-
 ports/esp32/network_common.c                  |   6 +-
 ports/esp32/network_lan.c                     |  26 +-
 ports/esp32/network_ppp.c                     |  28 +-
 ports/esp32/network_wlan.c                    |  38 +--
 ports/esp32/uart.c                            |   4 +-
 ports/esp8266/esp_mphal.c                     |   2 +-
 ports/esp8266/esppwm.c                        |  32 +--
 ports/esp8266/lexerstr32.c                    |   4 +-
 ports/esp8266/machine_adc.c                   |  14 +-
 ports/esp8266/machine_pin.c                   |  56 ++--
 ports/esp8266/machine_pwm.c                   |  30 +--
 ports/esp8266/machine_rtc.c                   |  30 +--
 ports/esp8266/machine_spi.c                   |   8 +-
 ports/esp8266/machine_uart.c                  |  20 +-
 ports/esp8266/machine_wdt.c                   |   6 +-
 ports/esp8266/main.c                          |   4 +-
 ports/esp8266/modesp.c                        |  82 +++---
 ports/esp8266/modespnow.c                     |  52 ++--
 ports/esp8266/modmachine.c                    |  40 +--
 ports/esp8266/modos.c                         |   6 +-
 ports/esp8266/modtime.c                       |   4 +-
 ports/esp8266/network_wlan.c                  |  48 ++--
 ports/mimxrt/dma_manager.c                    |   2 +-
 ports/mimxrt/eth.c                            |  24 +-
 ports/mimxrt/machine_adc.c                    |  10 +-
 ports/mimxrt/machine_i2c.c                    |  10 +-
 ports/mimxrt/machine_i2s.c                    |  64 ++---
 ports/mimxrt/machine_led.c                    |  20 +-
 ports/mimxrt/machine_pin.c                    |  64 ++---
 ports/mimxrt/machine_pwm.c                    |  34 +--
 ports/mimxrt/machine_rtc.c                    |  52 ++--
 ports/mimxrt/machine_sdcard.c                 |  38 +--
 ports/mimxrt/machine_spi.c                    |  12 +-
 ports/mimxrt/machine_uart.c                   |  30 +--
 ports/mimxrt/machine_wdt.c                    |   8 +-
 ports/mimxrt/mimxrt_flash.c                   |  20 +-
 ports/mimxrt/modmachine.c                     |  16 +-
 ports/mimxrt/modmimxrt.c                      |   4 +-
 ports/mimxrt/modos.c                          |  12 +-
 ports/mimxrt/modtime.c                        |   4 +-
 ports/mimxrt/mpbthciport.c                    |  10 +-
 ports/mimxrt/mphalport.c                      |   2 +-
 ports/mimxrt/mpnetworkport.c                  |   2 +-
 ports/mimxrt/network_lan.c                    |  30 +--
 .../boards/MICROBIT/modules/microbitdisplay.c |  12 +-
 .../boards/MICROBIT/modules/microbitimage.c   |  30 +--
 .../nrf/boards/MICROBIT/modules/modmicrobit.c |  14 +-
 ports/nrf/boards/make-pins.py                 |   2 +-
 ports/nrf/drivers/bluetooth/ble_uart.c        |   4 +-
 ports/nrf/drivers/flash.c                     |   8 +-
 ports/nrf/modules/ble/modble.c                |  12 +-
 ports/nrf/modules/board/led.c                 |  12 +-
 ports/nrf/modules/board/modboard.c            |   4 +-
 ports/nrf/modules/machine/adc.c               |  14 +-
 ports/nrf/modules/machine/i2c.c               |   8 +-
 ports/nrf/modules/machine/modmachine.c        |  26 +-
 ports/nrf/modules/machine/pin.c               | 112 ++++----
 ports/nrf/modules/machine/pwm.c               |  36 +--
 ports/nrf/modules/machine/rtcounter.c         |  46 ++--
 ports/nrf/modules/machine/soft_pwm.c          |  28 +-
 ports/nrf/modules/machine/spi.c               |  24 +-
 ports/nrf/modules/machine/temp.c              |  12 +-
 ports/nrf/modules/machine/timer.c             |  32 +--
 ports/nrf/modules/machine/uart.c              |  30 +--
 ports/nrf/modules/music/modmusic.c            |  26 +-
 ports/nrf/modules/nrf/flashbdev.c             |  14 +-
 ports/nrf/modules/nrf/modnrf.c                |  12 +-
 ports/nrf/modules/os/microbitfs.c             |  92 +++----
 ports/nrf/modules/os/modos.c                  |   4 +-
 ports/nrf/modules/ubluepy/modubluepy.c        |   4 +-
 .../modules/ubluepy/ubluepy_characteristic.c  |  24 +-
 ports/nrf/modules/ubluepy/ubluepy_constants.c |   8 +-
 ports/nrf/modules/ubluepy/ubluepy_delegate.c  |  16 +-
 .../nrf/modules/ubluepy/ubluepy_descriptor.c  |   8 +-
 .../nrf/modules/ubluepy/ubluepy_peripheral.c  |  50 ++--
 .../nrf/modules/ubluepy/ubluepy_scan_entry.c  |  22 +-
 ports/nrf/modules/ubluepy/ubluepy_scanner.c   |  14 +-
 ports/nrf/modules/ubluepy/ubluepy_service.c   |  24 +-
 ports/nrf/modules/ubluepy/ubluepy_uuid.c      |  12 +-
 ports/nrf/mphalport.c                         |   2 +-
 ports/nrf/pin_named_pins.c                    |   2 +-
 ports/pic16bit/modpyb.c                       |  16 +-
 ports/pic16bit/modpybled.c                    |  14 +-
 ports/pic16bit/modpybswitch.c                 |  10 +-
 ports/qemu-arm/modmachine.c                   |   2 +-
 ports/renesas-ra/boardctrl.c                  |   4 +-
 ports/renesas-ra/extint.c                     |  36 +--
 ports/renesas-ra/flashbdev.c                  |   2 +-
 ports/renesas-ra/irq.c                        |   6 +-
 ports/renesas-ra/led.c                        |  14 +-
 ports/renesas-ra/machine_adc.c                |   8 +-
 ports/renesas-ra/machine_dac.c                |  30 +--
 ports/renesas-ra/machine_i2c.c                |  20 +-
 ports/renesas-ra/machine_pin.c                |  32 +--
 ports/renesas-ra/machine_pwm.c                |  26 +-
 ports/renesas-ra/machine_rtc.c                |  16 +-
 ports/renesas-ra/machine_sdcard.c             |  36 +--
 ports/renesas-ra/machine_spi.c                |  14 +-
 ports/renesas-ra/machine_uart.c               |  28 +-
 ports/renesas-ra/main.c                       |  10 +-
 ports/renesas-ra/modmachine.c                 |  20 +-
 ports/renesas-ra/modos.c                      |   4 +-
 ports/renesas-ra/modtime.c                    |   4 +-
 ports/renesas-ra/mpbthciport.c                |  10 +-
 ports/renesas-ra/mphalport.c                  |   2 +-
 ports/renesas-ra/mpthreadport.c               |   2 +-
 ports/renesas-ra/pybthread.c                  |   2 +-
 ports/renesas-ra/ra_it.c                      |   6 +-
 ports/renesas-ra/storage.c                    |  20 +-
 ports/renesas-ra/timer.c                      |  64 ++---
 ports/renesas-ra/uart.c                       |   4 +-
 ports/renesas-ra/usrsw.c                      |  16 +-
 ports/rp2/machine_adc.c                       |   8 +-
 ports/rp2/machine_i2c.c                       |   8 +-
 ports/rp2/machine_i2s.c                       |  66 ++---
 ports/rp2/machine_pin.c                       |  50 ++--
 ports/rp2/machine_pwm.c                       |  32 +--
 ports/rp2/machine_rtc.c                       |  12 +-
 ports/rp2/machine_spi.c                       |  12 +-
 ports/rp2/machine_timer.c                     |  20 +-
 ports/rp2/machine_uart.c                      |  44 ++--
 ports/rp2/machine_wdt.c                       |   6 +-
 ports/rp2/modmachine.c                        |  16 +-
 ports/rp2/modos.c                             |   4 +-
 ports/rp2/modrp2.c                            |   8 +-
 ports/rp2/modtime.c                           |   4 +-
 ports/rp2/mpbthciport.c                       |   4 +-
 ports/rp2/mphalport.c                         |   4 +-
 ports/rp2/mpthreadport.c                      |  12 +-
 ports/rp2/rp2_dma.c                           |  52 ++--
 ports/rp2/rp2_flash.c                         |  20 +-
 ports/rp2/rp2_pio.c                           | 126 ++++-----
 ports/samd/machine_adc.c                      |   8 +-
 ports/samd/machine_dac.c                      |  12 +-
 ports/samd/machine_i2c.c                      |   8 +-
 ports/samd/machine_pin.c                      |  44 ++--
 ports/samd/machine_pwm.c                      |  36 +--
 ports/samd/machine_rtc.c                      |  22 +-
 ports/samd/machine_spi.c                      |  12 +-
 ports/samd/machine_uart.c                     |  26 +-
 ports/samd/machine_wdt.c                      |  10 +-
 ports/samd/modmachine.c                       |  16 +-
 ports/samd/modos.c                            |   6 +-
 ports/samd/modsamd.c                          |   8 +-
 ports/samd/modtime.c                          |   4 +-
 ports/samd/mphalport.c                        |   2 +-
 ports/samd/pin_af.c                           |   2 +-
 ports/samd/samd_flash.c                       |  30 +--
 ports/samd/samd_qspiflash.c                   |  24 +-
 ports/samd/samd_spiflash.c                    |  24 +-
 ports/stm32/accel.c                           |  36 +--
 ports/stm32/adc.c                             |  68 ++---
 ports/stm32/boardctrl.c                       |   4 +-
 .../stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c |   4 +-
 ports/stm32/boards/ARDUINO_GIGA/bdev.c        |   2 +-
 .../stm32/boards/ARDUINO_NICLA_VISION/bdev.c  |   2 +-
 ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c |   2 +-
 ports/stm32/boards/LEGO_HUB_NO6/bdev.c        |   6 +-
 ports/stm32/boards/LEGO_HUB_NO6/cc2564.c      |   2 +-
 ports/stm32/boards/MIKROE_QUAIL/bdev.c        |   4 +-
 ports/stm32/boards/PYBD_SF2/bdev.c            |   4 +-
 .../boards/SPARKFUN_MICROMOD_STM32/bdev.c     |   4 +-
 ports/stm32/boards/STM32F769DISC/board_init.c |   2 +-
 ports/stm32/boards/STM32L476DISC/bdev.c       |   4 +-
 ports/stm32/boards/VCC_GND_F407VE/bdev.c      |   4 +-
 ports/stm32/boards/VCC_GND_F407ZG/bdev.c      |   4 +-
 ports/stm32/can.c                             |   4 +-
 ports/stm32/dac.c                             |  50 ++--
 ports/stm32/eth.c                             |  30 +--
 ports/stm32/extint.c                          |  40 +--
 ports/stm32/fdcan.c                           |   2 +-
 ports/stm32/i2c.c                             |  16 +-
 ports/stm32/irq.c                             |   6 +-
 ports/stm32/lcd.c                             |  48 ++--
 ports/stm32/led.c                             |  26 +-
 ports/stm32/machine_adc.c                     |  20 +-
 ports/stm32/machine_i2c.c                     |  12 +-
 ports/stm32/machine_i2s.c                     |  28 +-
 ports/stm32/machine_spi.c                     |  12 +-
 ports/stm32/machine_uart.c                    |  26 +-
 ports/stm32/machine_wdt.c                     |   6 +-
 ports/stm32/main.c                            |  12 +-
 ports/stm32/make-stmconst.py                  |   6 +-
 ports/stm32/mboot/main.c                      |   2 +-
 ports/stm32/modmachine.c                      |  20 +-
 ports/stm32/modos.c                           |   4 +-
 ports/stm32/modpyb.c                          |  28 +-
 ports/stm32/modstm.c                          |   4 +-
 ports/stm32/modtime.c                         |   4 +-
 ports/stm32/mpbthciport.c                     |  12 +-
 ports/stm32/mpbtstackport.c                   |   2 +-
 ports/stm32/mpnetworkport.c                   |   2 +-
 ports/stm32/mpthreadport.c                    |   2 +-
 ports/stm32/network_lan.c                     |  28 +-
 ports/stm32/octospi.c                         |  10 +-
 ports/stm32/pin.c                             | 108 ++++----
 ports/stm32/powerctrl.c                       |  14 +-
 ports/stm32/pyb_can.c                         |  64 ++---
 ports/stm32/pyb_i2c.c                         |  56 ++--
 ports/stm32/pyb_spi.c                         |  36 +--
 ports/stm32/pybthread.c                       |   2 +-
 ports/stm32/qspi.c                            |  10 +-
 ports/stm32/rfcore.c                          |  62 ++---
 ports/stm32/rng.c                             |   4 +-
 ports/stm32/rtc.c                             |  34 +--
 ports/stm32/sdcard.c                          |  52 ++--
 ports/stm32/servo.c                           |  32 +--
 ports/stm32/spi.c                             |  20 +-
 ports/stm32/stm32_it.c                        |   8 +-
 ports/stm32/storage.c                         |  20 +-
 ports/stm32/subghz.c                          |   8 +-
 ports/stm32/timer.c                           |  96 +++----
 ports/stm32/uart.c                            |   8 +-
 ports/stm32/usb.c                             | 106 ++++----
 ports/stm32/usbd_cdc_interface.c              |   2 +-
 ports/stm32/usbd_desc.c                       |   4 +-
 ports/stm32/usbd_msc_interface.c              |  34 +--
 ports/stm32/usrsw.c                           |  16 +-
 ports/unix/coverage.c                         |  42 +--
 ports/unix/coveragecpp.cpp                    |   2 +-
 ports/unix/main.c                             |  30 +--
 ports/unix/modffi.c                           |  90 +++----
 ports/unix/modjni.c                           |  76 +++---
 ports/unix/modmachine.c                       |   2 +-
 ports/unix/modos.c                            |  24 +-
 ports/unix/modsocket.c                        |  90 +++----
 ports/unix/modtermios.c                       |  16 +-
 ports/unix/modtime.c                          |  20 +-
 ports/unix/mpbthciport.c                      |  16 +-
 ports/unix/mpbtstackport_h4.c                 |   2 +-
 ports/unix/mpbtstackport_usb.c                |   6 +-
 ports/unix/mpthreadport.c                     |  14 +-
 ports/unix/unix_mphal.c                       |   2 +-
 ports/webassembly/main.c                      |   2 +-
 ports/windows/fmode.c                         |   2 +-
 ports/windows/windows_mphal.c                 |  14 +-
 ports/zephyr/machine_i2c.c                    |   6 +-
 ports/zephyr/machine_pin.c                    |  42 +--
 ports/zephyr/machine_spi.c                    |   8 +-
 ports/zephyr/machine_uart.c                   |  26 +-
 ports/zephyr/main.c                           |   2 +-
 ports/zephyr/modbluetooth_zephyr.c            |  18 +-
 ports/zephyr/modmachine.c                     |   6 +-
 ports/zephyr/modsocket.c                      |  70 ++---
 ports/zephyr/modtime.c                        |   2 +-
 ports/zephyr/modzephyr.c                      |  20 +-
 ports/zephyr/modzsensor.c                     |  24 +-
 ports/zephyr/zephyr_storage.c                 |  40 +--
 py/asmarm.c                                   |  30 +--
 py/asmthumb.c                                 |   6 +-
 py/asmx64.c                                   |  26 +-
 py/asmx86.c                                   |  32 +--
 py/asmxtensa.c                                |   2 +-
 py/bc.c                                       |   6 +-
 py/builtinevex.c                              |  14 +-
 py/builtinhelp.c                              |  12 +-
 py/builtinimport.c                            |  20 +-
 py/compile.c                                  | 214 ++++++++--------
 py/emitbc.c                                   |  30 +--
 py/emitinlinethumb.c                          |  42 +--
 py/emitinlinextensa.c                         |  26 +-
 py/emitnative.c                               | 240 +++++++++---------
 py/emitnx86.c                                 |   2 +-
 py/gc.c                                       |  14 +-
 py/lexer.c                                    |  58 ++---
 py/malloc.c                                   |   4 +-
 py/map.c                                      |   8 +-
 py/modarray.c                                 |   4 +-
 py/modbuiltins.c                              |  68 ++---
 py/modcmath.c                                 |  40 +--
 py/modcollections.c                           |   4 +-
 py/moderrno.c                                 |   8 +-
 py/modgc.c                                    |  18 +-
 py/modio.c                                    |  38 +--
 py/modmath.c                                  |  64 ++---
 py/modmicropython.c                           |  56 ++--
 py/modstruct.c                                |  20 +-
 py/modsys.c                                   |  38 +--
 py/modthread.c                                |  54 ++--
 py/mpconfig.h                                 |   6 -
 py/mpprint.c                                  |   4 +-
 py/mpz.c                                      |  38 +--
 py/nativeglue.c                               |  20 +-
 py/objarray.c                                 |  42 +--
 py/objattrtuple.c                             |   6 +-
 py/objbool.c                                  |   8 +-
 py/objboundmeth.c                             |  10 +-
 py/objcell.c                                  |   4 +-
 py/objclosure.c                               |   6 +-
 py/objcomplex.c                               |  10 +-
 py/objdeque.c                                 |  20 +-
 py/objdict.c                                  |  90 +++----
 py/objenumerate.c                             |   6 +-
 py/objexcept.c                                |   6 +-
 py/objfilter.c                                |   4 +-
 py/objfloat.c                                 |  10 +-
 py/objfun.c                                   |  24 +-
 py/objgenerator.c                             |  30 +--
 py/objgetitemiter.c                           |   4 +-
 py/objint.c                                   |  20 +-
 py/objint_mpz.c                               |   4 +-
 py/objlist.c                                  |  70 ++---
 py/objmap.c                                   |   4 +-
 py/objmodule.c                                |  14 +-
 py/objnamedtuple.c                            |  12 +-
 py/objnone.c                                  |   2 +-
 py/objobject.c                                |  24 +-
 py/objpolyiter.c                              |  10 +-
 py/objproperty.c                              |  18 +-
 py/objrange.c                                 |  22 +-
 py/objreversed.c                              |   4 +-
 py/objset.c                                   | 104 ++++----
 py/objsingleton.c                             |   2 +-
 py/objslice.c                                 |  14 +-
 py/objstr.c                                   | 120 ++++-----
 py/objstringio.c                              |  28 +-
 py/objstrunicode.c                            |  14 +-
 py/objtuple.c                                 |  18 +-
 py/objtype.c                                  |  56 ++--
 py/objzip.c                                   |   4 +-
 py/opmethods.c                                |   8 +-
 py/parse.c                                    |  58 ++---
 py/parsenum.c                                 |   2 +-
 py/persistentcode.c                           |  28 +-
 py/profile.c                                  |  18 +-
 py/qstr.c                                     |   8 +-
 py/reader.c                                   |   8 +-
 py/repl.c                                     |   8 +-
 py/runtime.c                                  |  10 +-
 py/scope.c                                    |   4 +-
 py/stream.c                                   |  30 +--
 py/unicode.c                                  |   2 +-
 py/vstr.c                                     |   4 +-
 shared/libc/printf.c                          |   2 +-
 shared/readline/readline.c                    |  12 +-
 shared/runtime/gchelper_generic.c             |  10 +-
 shared/runtime/mpirq.c                        |  14 +-
 shared/runtime/pyexec.c                       |  20 +-
 shared/runtime/softtimer.c                    |   4 +-
 shared/runtime/sys_stdio_mphal.c              |  26 +-
 shared/timeutils/timeutils.c                  |   4 +-
 shared/tinyusb/mp_cdc_common.c                |   2 +-
 tools/boardgen.py                             |   4 +-
 482 files changed, 6288 insertions(+), 6294 deletions(-)

diff --git a/docs/develop/compiler.rst b/docs/develop/compiler.rst
index 00cc90f8163a1..0c25ad3a01ef1 100644
--- a/docs/develop/compiler.rst
+++ b/docs/develop/compiler.rst
@@ -98,7 +98,7 @@ 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[] = {
+   static const char *const tok_kw[] = {
        ...
        "or",
        "pass",
@@ -301,7 +301,7 @@ code statement:
 
 .. code-block:: c
 
-   STATIC void emit_native_unary_op(emit_t *emit, mp_unary_op_t op) {
+   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) {
diff --git a/docs/develop/library.rst b/docs/develop/library.rst
index c2a86ea1699bc..830211d81c862 100644
--- a/docs/develop/library.rst
+++ b/docs/develop/library.rst
@@ -48,16 +48,16 @@ hypothetical new module ``subsystem`` in the file ``modsubsystem.c``:
    #if MICROPY_PY_SUBSYSTEM
 
    // info()
-   STATIC mp_obj_t py_subsystem_info(void) {
+   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[] = {
+   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);
+   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 },
diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index 6d15f867bcfe8..502ea1c4c6873 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -128,7 +128,7 @@ The file ``factorial.c`` contains:
     #include "py/dynruntime.h"
 
     // Helper function to compute factorial
-    STATIC mp_int_t factorial_helper(mp_int_t x) {
+    static mp_int_t factorial_helper(mp_int_t x) {
         if (x == 0) {
             return 1;
         }
@@ -136,7 +136,7 @@ The file ``factorial.c`` contains:
     }
 
     // This is the function which will be called from Python, as factorial(x)
-    STATIC mp_obj_t factorial(mp_obj_t x_obj) {
+    static mp_obj_t factorial(mp_obj_t x_obj) {
         // Extract the integer from the MicroPython input object
         mp_int_t x = mp_obj_get_int(x_obj);
         // Calculate the factorial
@@ -145,7 +145,7 @@ The file ``factorial.c`` contains:
         return mp_obj_new_int(result);
     }
     // Define a Python reference to the function above
-    STATIC MP_DEFINE_CONST_FUN_OBJ_1(factorial_obj, factorial);
+    static MP_DEFINE_CONST_FUN_OBJ_1(factorial_obj, factorial);
 
     // 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) {
diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 09e61d5d9bfe0..99725e1000bef 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -262,17 +262,17 @@ To add a custom module like ``myport``, first add the module definition in a fil
 
    #include "py/runtime.h"
 
-   STATIC mp_obj_t myport_info(void) {
+   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 MP_DEFINE_CONST_FUN_OBJ_0(myport_info_obj, myport_info);
 
-   STATIC const mp_rom_map_elem_t myport_module_globals_table[] = {
+   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);
+   static MP_DEFINE_CONST_DICT(myport_module_globals, myport_module_globals_table);
 
    const mp_obj_module_t myport_module = {
        .base = { &mp_type_module },
diff --git a/drivers/bus/softqspi.c b/drivers/bus/softqspi.c
index dc205da3a7c40..65a504a739d25 100644
--- a/drivers/bus/softqspi.c
+++ b/drivers/bus/softqspi.c
@@ -49,14 +49,14 @@
 
 #endif
 
-STATIC void nibble_write(mp_soft_qspi_obj_t *self, uint8_t v) {
+static void nibble_write(mp_soft_qspi_obj_t *self, uint8_t v) {
     mp_hal_pin_write(self->io0, v & 1);
     mp_hal_pin_write(self->io1, (v >> 1) & 1);
     mp_hal_pin_write(self->io2, (v >> 2) & 1);
     mp_hal_pin_write(self->io3, (v >> 3) & 1);
 }
 
-STATIC int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd) {
+static int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
 
     switch (cmd) {
@@ -80,7 +80,7 @@ STATIC int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd) {
     return 0; // success
 }
 
-STATIC void mp_soft_qspi_transfer(mp_soft_qspi_obj_t *self, size_t len, const uint8_t *src, uint8_t *dest) {
+static void mp_soft_qspi_transfer(mp_soft_qspi_obj_t *self, size_t len, const uint8_t *src, uint8_t *dest) {
     // Will run as fast as possible, limited only by CPU speed and GPIO time
     mp_hal_pin_input(self->io1);
     mp_hal_pin_output(self->io0);
@@ -119,7 +119,7 @@ STATIC void mp_soft_qspi_transfer(mp_soft_qspi_obj_t *self, size_t len, const ui
     }
 }
 
-STATIC void mp_soft_qspi_qread(mp_soft_qspi_obj_t *self, size_t len, uint8_t *buf) {
+static void mp_soft_qspi_qread(mp_soft_qspi_obj_t *self, size_t len, uint8_t *buf) {
     // Make all IO lines input
     mp_hal_pin_input(self->io2);
     mp_hal_pin_input(self->io3);
@@ -137,7 +137,7 @@ STATIC void mp_soft_qspi_qread(mp_soft_qspi_obj_t *self, size_t len, uint8_t *bu
     }
 }
 
-STATIC void mp_soft_qspi_qwrite(mp_soft_qspi_obj_t *self, size_t len, const uint8_t *buf) {
+static void mp_soft_qspi_qwrite(mp_soft_qspi_obj_t *self, size_t len, const uint8_t *buf) {
     // Make all IO lines output
     mp_hal_pin_output(self->io2);
     mp_hal_pin_output(self->io3);
@@ -158,7 +158,7 @@ STATIC void mp_soft_qspi_qwrite(mp_soft_qspi_obj_t *self, size_t len, const uint
     //mp_hal_pin_input(self->io1);
 }
 
-STATIC int 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);
@@ -167,7 +167,7 @@ STATIC int mp_soft_qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, u
     return 0;
 }
 
-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) {
+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);
@@ -178,7 +178,7 @@ STATIC int mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t
     return 0;
 }
 
-STATIC int mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
+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);
@@ -188,7 +188,7 @@ STATIC int mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_
     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) {
+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);
diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index 3f454485ab2bc..0ee69a07ecd2c 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -51,7 +51,7 @@ extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 // Provided by the port.
 extern machine_uart_obj_t mp_bluetooth_hci_uart_obj;
 
-STATIC void cywbt_wait_cts_low(void) {
+static void cywbt_wait_cts_low(void) {
     mp_hal_pin_config(CYW43_PIN_BT_CTS, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
     for (int i = 0; i < 200; ++i) {
         if (mp_hal_pin_read(CYW43_PIN_BT_CTS) == 0) {
@@ -64,7 +64,7 @@ STATIC void cywbt_wait_cts_low(void) {
 }
 #endif
 
-STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
+static int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
     mp_bluetooth_hci_uart_write((void *)buf, len);
     for (int c, i = 0; i < 6; ++i) {
         while ((c = mp_bluetooth_hci_uart_readchar()) == -1) {
@@ -96,7 +96,7 @@ STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
     return 0;
 }
 
-STATIC int cywbt_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param_buf) {
+static int cywbt_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] = 0x01;
     buf[1] = ocf;
@@ -108,19 +108,19 @@ STATIC int cywbt_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *para
     return cywbt_hci_cmd_raw(4 + param_len, buf);
 }
 
-STATIC void put_le16(uint8_t *buf, uint16_t val) {
+static void put_le16(uint8_t *buf, uint16_t val) {
     buf[0] = val;
     buf[1] = val >> 8;
 }
 
-STATIC void put_le32(uint8_t *buf, uint32_t val) {
+static void put_le32(uint8_t *buf, uint32_t val) {
     buf[0] = val;
     buf[1] = val >> 8;
     buf[2] = val >> 16;
     buf[3] = val >> 24;
 }
 
-STATIC int cywbt_set_baudrate(uint32_t baudrate) {
+static int cywbt_set_baudrate(uint32_t baudrate) {
     uint8_t buf[6];
     put_le16(buf, 0);
     put_le32(buf + 2, baudrate);
@@ -128,7 +128,7 @@ STATIC int cywbt_set_baudrate(uint32_t baudrate) {
 }
 
 // download firmware
-STATIC int cywbt_download_firmware(const uint8_t *firmware) {
+static int cywbt_download_firmware(const uint8_t *firmware) {
     cywbt_hci_cmd(0x3f, 0x2e, 0, NULL);
 
     bool last_packet = false;
@@ -255,7 +255,7 @@ int mp_bluetooth_hci_controller_deinit(void) {
 }
 
 #ifdef CYW43_PIN_BT_DEV_WAKE
-STATIC uint32_t bt_sleep_ticks;
+static uint32_t bt_sleep_ticks;
 #endif
 
 int mp_bluetooth_hci_controller_sleep_maybe(void) {
diff --git a/drivers/dht/dht.c b/drivers/dht/dht.c
index 7e9b897825791..e6b71542dabc9 100644
--- a/drivers/dht/dht.c
+++ b/drivers/dht/dht.c
@@ -40,7 +40,7 @@
 #define mp_hal_pin_od_high_dht mp_hal_pin_od_high
 #endif
 
-STATIC mp_obj_t dht_readinto(mp_obj_t pin_in, mp_obj_t buf_in) {
+static mp_obj_t dht_readinto(mp_obj_t pin_in, mp_obj_t buf_in) {
     mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(pin_in);
     mp_hal_pin_open_drain(pin);
 
diff --git a/drivers/esp-hosted/esp_hosted_hal.c b/drivers/esp-hosted/esp_hosted_hal.c
index bac8a89bd0941..c98eb5031aa4b 100644
--- a/drivers/esp-hosted/esp_hosted_hal.c
+++ b/drivers/esp-hosted/esp_hosted_hal.c
@@ -44,14 +44,14 @@
 
 extern void mod_network_poll_events(void);
 
-STATIC mp_obj_t esp_hosted_pin_irq_callback(mp_obj_t self_in) {
+static mp_obj_t esp_hosted_pin_irq_callback(mp_obj_t self_in) {
     #ifdef MICROPY_HW_WIFI_LED
     led_toggle(MICROPY_HW_WIFI_LED);
     #endif
     mod_network_poll_events();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_hosted_pin_irq_callback_obj, esp_hosted_pin_irq_callback);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_hosted_pin_irq_callback_obj, esp_hosted_pin_irq_callback);
 
 MP_WEAK int esp_hosted_hal_init(uint32_t mode) {
     // Perform a hard reset and set pins to their defaults.
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index 52739b1d8bdf7..e66153636b1fd 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -56,21 +56,21 @@
 #define PAGE_SIZE (256) // maximum bytes we can write in one SPI transfer
 #define SECTOR_SIZE MP_SPIFLASH_ERASE_BLOCK_SIZE
 
-STATIC void mp_spiflash_acquire_bus(mp_spiflash_t *self) {
+static void mp_spiflash_acquire_bus(mp_spiflash_t *self) {
     const mp_spiflash_config_t *c = self->config;
     if (c->bus_kind == MP_SPIFLASH_BUS_QSPI) {
         c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data, MP_QSPI_IOCTL_BUS_ACQUIRE);
     }
 }
 
-STATIC void mp_spiflash_release_bus(mp_spiflash_t *self) {
+static void mp_spiflash_release_bus(mp_spiflash_t *self) {
     const mp_spiflash_config_t *c = self->config;
     if (c->bus_kind == MP_SPIFLASH_BUS_QSPI) {
         c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data, MP_QSPI_IOCTL_BUS_RELEASE);
     }
 }
 
-STATIC int 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) {
@@ -84,7 +84,7 @@ STATIC int mp_spiflash_write_cmd_data(mp_spiflash_t *self, uint8_t cmd, size_t l
     return ret;
 }
 
-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) {
+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) {
@@ -109,7 +109,7 @@ STATIC int mp_spiflash_transfer_cmd_addr_data(mp_spiflash_t *self, uint8_t cmd,
     return ret;
 }
 
-STATIC int mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len, uint32_t *dest) {
+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) {
         mp_hal_pin_write(c->bus.u_spi.cs, 0);
@@ -122,7 +122,7 @@ STATIC int mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len, ui
     }
 }
 
-STATIC int 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) {
@@ -133,11 +133,11 @@ STATIC int mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len,
     return mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, NULL, dest);
 }
 
-STATIC int mp_spiflash_write_cmd(mp_spiflash_t *self, uint8_t cmd) {
+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) {
+static int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, uint32_t timeout) {
     do {
         uint32_t sr;
         int ret = mp_spiflash_read_cmd(self, CMD_RDSR, 1, &sr);
@@ -152,11 +152,11 @@ STATIC int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, u
     return -MP_ETIMEDOUT;
 }
 
-STATIC int mp_spiflash_wait_wel1(mp_spiflash_t *self) {
+static int mp_spiflash_wait_wel1(mp_spiflash_t *self) {
     return mp_spiflash_wait_sr(self, 2, 2, WAIT_SR_TIMEOUT);
 }
 
-STATIC int mp_spiflash_wait_wip0(mp_spiflash_t *self) {
+static int mp_spiflash_wait_wip0(mp_spiflash_t *self) {
     return mp_spiflash_wait_sr(self, 1, 0, WAIT_SR_TIMEOUT);
 }
 
@@ -219,7 +219,7 @@ void mp_spiflash_deepsleep(mp_spiflash_t *self, int value) {
     }
 }
 
-STATIC int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr) {
+static int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr) {
     int ret = 0;
     // enable writes
     ret = mp_spiflash_write_cmd(self, CMD_WREN);
@@ -244,7 +244,7 @@ STATIC int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr)
     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) {
+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
     ret = mp_spiflash_write_cmd(self, CMD_WREN);
@@ -361,7 +361,7 @@ int mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint
     return ret;
 }
 
-STATIC int 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 0;
@@ -396,7 +396,7 @@ int mp_spiflash_cache_flush(mp_spiflash_t *self) {
     return ret;
 }
 
-STATIC int mp_spiflash_cached_write_part(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src) {
+static int mp_spiflash_cached_write_part(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src) {
     // Align to 4096 sector
     uint32_t offset = addr & 0xfff;
     uint32_t sec = addr >> 12;
diff --git a/examples/natmod/btree/btree_c.c b/examples/natmod/btree/btree_c.c
index c897f2e9a3859..3c60e41b2d663 100644
--- a/examples/natmod/btree/btree_c.c
+++ b/examples/natmod/btree/btree_c.c
@@ -100,9 +100,9 @@ mp_getiter_iternext_custom_t btree_getiter_iternext;
 #include "extmod/modbtree.c"
 
 mp_map_elem_t btree_locals_dict_table[8];
-STATIC MP_DEFINE_CONST_DICT(btree_locals_dict, btree_locals_dict_table);
+static MP_DEFINE_CONST_DICT(btree_locals_dict, btree_locals_dict_table);
 
-STATIC mp_obj_t btree_open(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t btree_open(size_t n_args, const mp_obj_t *args) {
     // Make sure we got a stream object
     mp_get_stream_raise(args[0], MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
 
@@ -118,7 +118,7 @@ STATIC mp_obj_t btree_open(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_FROM_PTR(btree_new(db, args[0]));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_open_obj, 5, 5, btree_open);
+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
diff --git a/examples/natmod/deflate/deflate.c b/examples/natmod/deflate/deflate.c
index fa475bd067240..9de7e101a7689 100644
--- a/examples/natmod/deflate/deflate.c
+++ b/examples/natmod/deflate/deflate.c
@@ -29,7 +29,7 @@ mp_obj_t mp_stream_close(mp_obj_t stream) {
 MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_close_obj, mp_stream_close);
 
 // Re-implemented from py/stream.c, not yet available in dynruntime.h.
-STATIC mp_obj_t mp_stream___exit__(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_stream___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     return mp_stream_close(args[0]);
 }
@@ -42,7 +42,7 @@ mp_obj_t mp_identity(mp_obj_t self) {
 MP_DEFINE_CONST_FUN_OBJ_1(mp_identity_obj, mp_identity);
 
 mp_map_elem_t deflateio_locals_dict_table[7];
-STATIC MP_DEFINE_CONST_DICT(deflateio_locals_dict, deflateio_locals_dict_table);
+static MP_DEFINE_CONST_DICT(deflateio_locals_dict, deflateio_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) {
     MP_DYNRUNTIME_INIT_ENTRY
diff --git a/examples/natmod/features0/features0.c b/examples/natmod/features0/features0.c
index 1b1867a3bc935..c3d31afb79cb8 100644
--- a/examples/natmod/features0/features0.c
+++ b/examples/natmod/features0/features0.c
@@ -8,7 +8,7 @@
 #include "py/dynruntime.h"
 
 // Helper function to compute factorial
-STATIC mp_int_t factorial_helper(mp_int_t x) {
+static mp_int_t factorial_helper(mp_int_t x) {
     if (x == 0) {
         return 1;
     }
@@ -16,7 +16,7 @@ STATIC mp_int_t factorial_helper(mp_int_t x) {
 }
 
 // This is the function which will be called from Python, as factorial(x)
-STATIC mp_obj_t factorial(mp_obj_t x_obj) {
+static mp_obj_t factorial(mp_obj_t x_obj) {
     // Extract the integer from the MicroPython input object
     mp_int_t x = mp_obj_get_int(x_obj);
     // Calculate the factorial
@@ -25,7 +25,7 @@ STATIC mp_obj_t factorial(mp_obj_t x_obj) {
     return mp_obj_new_int(result);
 }
 // Define a Python reference to the function above
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(factorial_obj, factorial);
+static MP_DEFINE_CONST_FUN_OBJ_1(factorial_obj, factorial);
 
 // 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) {
diff --git a/examples/natmod/features1/features1.c b/examples/natmod/features1/features1.c
index d2494b2138865..92b96dbb18351 100644
--- a/examples/natmod/features1/features1.c
+++ b/examples/natmod/features1/features1.c
@@ -25,15 +25,15 @@ uint16_t *const table_ptr16a[] = { &data16[0], &data16[1], &data16[2], &data16[3
 const uint16_t *const table_ptr16b[] = { &table16[0], &table16[1] };
 
 // A simple function that adds its 2 arguments (must be integers)
-STATIC mp_obj_t add(mp_obj_t x_in, mp_obj_t y_in) {
+static mp_obj_t add(mp_obj_t x_in, mp_obj_t y_in) {
     mp_int_t x = mp_obj_get_int(x_in);
     mp_int_t y = mp_obj_get_int(y_in);
     return mp_obj_new_int(x + y);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(add_obj, add);
+static MP_DEFINE_CONST_FUN_OBJ_2(add_obj, add);
 
 // A local helper function (not exposed to Python)
-STATIC mp_int_t fibonacci_helper(mp_int_t x) {
+static mp_int_t fibonacci_helper(mp_int_t x) {
     if (x < MP_ARRAY_SIZE(table8)) {
         return table8[x];
     } else {
@@ -42,17 +42,17 @@ STATIC mp_int_t fibonacci_helper(mp_int_t x) {
 }
 
 // A function which computes Fibonacci numbers
-STATIC mp_obj_t fibonacci(mp_obj_t x_in) {
+static mp_obj_t fibonacci(mp_obj_t x_in) {
     mp_int_t x = mp_obj_get_int(x_in);
     if (x < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("can't compute negative Fibonacci number"));
     }
     return mp_obj_new_int(fibonacci_helper(x));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fibonacci_obj, fibonacci);
+static MP_DEFINE_CONST_FUN_OBJ_1(fibonacci_obj, fibonacci);
 
 // A function that accesses the BSS data
-STATIC mp_obj_t access(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t access(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // Create a list holding all items from data16
         mp_obj_list_t *lst = MP_OBJ_TO_PTR(mp_obj_new_list(MP_ARRAY_SIZE(data16), NULL));
@@ -71,17 +71,17 @@ STATIC mp_obj_t access(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(access_obj, 0, 2, access);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(access_obj, 0, 2, access);
 
 // A function that allocates memory and creates a bytearray
-STATIC mp_obj_t make_array(void) {
+static mp_obj_t make_array(void) {
     uint16_t *ptr = m_new(uint16_t, MP_ARRAY_SIZE(table_ptr16b));
     for (int i = 0; i < MP_ARRAY_SIZE(table_ptr16b); ++i) {
         ptr[i] = *table_ptr16b[i];
     }
     return mp_obj_new_bytearray_by_ref(sizeof(uint16_t) * MP_ARRAY_SIZE(table_ptr16b), ptr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(make_array_obj, make_array);
+static MP_DEFINE_CONST_FUN_OBJ_0(make_array_obj, make_array);
 
 // 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) {
diff --git a/examples/natmod/features2/main.c b/examples/natmod/features2/main.c
index 1a39700dc4b71..22961aa494f5f 100644
--- a/examples/natmod/features2/main.c
+++ b/examples/natmod/features2/main.c
@@ -22,29 +22,29 @@
 
 // A function that uses the default float type configured for the current target
 // This default can be overridden by specifying MICROPY_FLOAT_IMPL at the make level
-STATIC mp_obj_t add(mp_obj_t x, mp_obj_t y) {
+static mp_obj_t add(mp_obj_t x, mp_obj_t y) {
     return mp_obj_new_float(mp_obj_get_float(x) + mp_obj_get_float(y));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(add_obj, add);
+static MP_DEFINE_CONST_FUN_OBJ_2(add_obj, add);
 
 // A function that explicitly uses single precision floats
-STATIC mp_obj_t add_f(mp_obj_t x, mp_obj_t y) {
+static mp_obj_t add_f(mp_obj_t x, mp_obj_t y) {
     return mp_obj_new_float_from_f(mp_obj_get_float_to_f(x) + mp_obj_get_float_to_f(y));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(add_f_obj, add_f);
+static MP_DEFINE_CONST_FUN_OBJ_2(add_f_obj, add_f);
 
 #if USE_DOUBLE
 // A function that explicitly uses double precision floats
-STATIC mp_obj_t add_d(mp_obj_t x, mp_obj_t y) {
+static mp_obj_t add_d(mp_obj_t x, mp_obj_t y) {
     return mp_obj_new_float_from_d(mp_obj_get_float_to_d(x) + mp_obj_get_float_to_d(y));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(add_d_obj, add_d);
+static MP_DEFINE_CONST_FUN_OBJ_2(add_d_obj, add_d);
 #endif
 
 // A function that computes the product of floats in an array.
 // This function uses the most general C argument interface, which is more difficult
 // to use but has access to the globals dict of the module via self->globals.
-STATIC mp_obj_t productf(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
+static mp_obj_t productf(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
     // Check number of arguments is valid
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
diff --git a/examples/natmod/features3/features3.c b/examples/natmod/features3/features3.c
index 20efd67cdcefd..1d3bc51e609d1 100644
--- a/examples/natmod/features3/features3.c
+++ b/examples/natmod/features3/features3.c
@@ -8,7 +8,7 @@
 #include "py/dynruntime.h"
 
 // A function that returns a tuple of object types.
-STATIC mp_obj_t get_types(void) {
+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),
@@ -21,10 +21,10 @@ STATIC mp_obj_t get_types(void) {
         MP_OBJ_FROM_PTR(&mp_type_dict),
     }));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_types_obj, get_types);
+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) {
+static mp_obj_t get_const_objects(void) {
     return mp_obj_new_tuple(5, ((mp_obj_t []) {
         mp_const_none,
         mp_const_false,
@@ -33,17 +33,17 @@ STATIC mp_obj_t get_const_objects(void) {
         mp_const_empty_tuple,
     }));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_const_objects_obj, get_const_objects);
+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) {
+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);
+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) {
diff --git a/examples/natmod/features4/features4.c b/examples/natmod/features4/features4.c
index 336f4ecf64080..a52e9e45662aa 100644
--- a/examples/natmod/features4/features4.c
+++ b/examples/natmod/features4/features4.c
@@ -24,7 +24,7 @@ typedef struct {
 
 // Essentially Factorial.__new__ (but also kind of __init__).
 // Takes a single argument (the number to find the factorial of)
-STATIC mp_obj_t factorial_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
+static mp_obj_t factorial_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, 1, 1, false);
 
     mp_obj_factorial_t *o = mp_obj_malloc(mp_obj_factorial_t, type);
@@ -33,7 +33,7 @@ STATIC mp_obj_t factorial_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_int_t factorial_helper(mp_int_t x) {
+static mp_int_t factorial_helper(mp_int_t x) {
     if (x == 0) {
         return 1;
     }
@@ -41,16 +41,16 @@ STATIC mp_int_t factorial_helper(mp_int_t x) {
 }
 
 // Implements Factorial.calculate()
-STATIC mp_obj_t factorial_calculate(mp_obj_t self_in) {
+static mp_obj_t factorial_calculate(mp_obj_t self_in) {
     mp_obj_factorial_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(factorial_helper(self->n));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(factorial_calculate_obj, factorial_calculate);
+static MP_DEFINE_CONST_FUN_OBJ_1(factorial_calculate_obj, factorial_calculate);
 
 // Locals dict for the Factorial type (will have a single method, calculate,
 // added in mpy_init).
 mp_map_elem_t factorial_locals_dict_table[1];
-STATIC MP_DEFINE_CONST_DICT(factorial_locals_dict, factorial_locals_dict_table);
+static MP_DEFINE_CONST_DICT(factorial_locals_dict, factorial_locals_dict_table);
 
 // 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) {
diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index badc7ab46d7fa..e8f99b3b20cdd 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -13,7 +13,7 @@ mp_obj_full_type_t mp_type_framebuf;
 #include "extmod/modframebuf.c"
 
 mp_map_elem_t framebuf_locals_dict_table[11];
-STATIC MP_DEFINE_CONST_DICT(framebuf_locals_dict, framebuf_locals_dict_table);
+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) {
     MP_DYNRUNTIME_INIT_ENTRY
diff --git a/examples/natmod/re/re.c b/examples/natmod/re/re.c
index df89ea83530ec..7ae72a578f4e3 100644
--- a/examples/natmod/re/re.c
+++ b/examples/natmod/re/re.c
@@ -38,10 +38,10 @@ mp_obj_full_type_t re_type;
 #include "extmod/modre.c"
 
 mp_map_elem_t match_locals_dict_table[5];
-STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
+static MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
 
 mp_map_elem_t re_locals_dict_table[3];
-STATIC MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table);
+static MP_DEFINE_CONST_DICT(re_locals_dict, re_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) {
     MP_DYNRUNTIME_INIT_ENTRY
diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
index 9416613ba9520..2988fbd565f08 100644
--- a/examples/usercmodule/cexample/examplemodule.c
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -5,7 +5,7 @@
 #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) {
+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);
@@ -14,7 +14,7 @@ STATIC mp_obj_t example_add_ints(mp_obj_t a_obj, mp_obj_t b_obj) {
     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);
+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 {
@@ -28,7 +28,7 @@ typedef struct _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) {
+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);
@@ -37,11 +37,11 @@ STATIC mp_obj_t example_Timer_time(mp_obj_t self_in) {
     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);
+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) {
+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 = mp_obj_malloc(example_Timer_obj_t, type);
 
@@ -54,10 +54,10 @@ STATIC mp_obj_t example_Timer_make_new(const mp_obj_type_t *type, size_t n_args,
 
 // 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[] = {
+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);
+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(
@@ -73,12 +73,12 @@ MP_DEFINE_CONST_OBJ_TYPE(
 // 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(example_module_globals, example_module_globals_table);
 
 // Define module object.
 const mp_obj_module_t example_user_cmodule = {
diff --git a/examples/usercmodule/cppexample/examplemodule.c b/examples/usercmodule/cppexample/examplemodule.c
index 96a1a74438845..5d4637b89782d 100644
--- a/examples/usercmodule/cppexample/examplemodule.c
+++ b/examples/usercmodule/cppexample/examplemodule.c
@@ -2,18 +2,18 @@
 
 // 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);
+static MP_DEFINE_CONST_FUN_OBJ_2(cppfunc_obj, cppfunc);
 
 // Define all attributes 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(cppexample_module_globals, cppexample_module_globals_table);
 
 // Define module object.
 const mp_obj_module_t cppexample_user_cmodule = {
diff --git a/examples/usercmodule/subpackage/modexamplepackage.c b/examples/usercmodule/subpackage/modexamplepackage.c
index 70e1e4005b30d..d68d0528398c4 100644
--- a/examples/usercmodule/subpackage/modexamplepackage.c
+++ b/examples/usercmodule/subpackage/modexamplepackage.c
@@ -2,18 +2,18 @@
 #include "py/runtime.h"
 
 // Define example_package.foo.bar.f()
-STATIC mp_obj_t example_package_foo_bar_f(void) {
+static mp_obj_t example_package_foo_bar_f(void) {
     mp_printf(&mp_plat_print, "example_package.foo.bar.f\n");
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(example_package_foo_bar_f_obj, example_package_foo_bar_f);
+static MP_DEFINE_CONST_FUN_OBJ_0(example_package_foo_bar_f_obj, example_package_foo_bar_f);
 
 // Define all attributes of the second-level sub-package (example_package.foo.bar).
-STATIC const mp_rom_map_elem_t example_package_foo_bar_globals_table[] = {
+static const mp_rom_map_elem_t example_package_foo_bar_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_example_package_dot_foo_dot_bar) },
     { MP_ROM_QSTR(MP_QSTR_f), MP_ROM_PTR(&example_package_foo_bar_f_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(example_package_foo_bar_globals, example_package_foo_bar_globals_table);
+static MP_DEFINE_CONST_DICT(example_package_foo_bar_globals, example_package_foo_bar_globals_table);
 
 // Define example_package.foo.bar module object.
 const mp_obj_module_t example_package_foo_bar_user_cmodule = {
@@ -22,19 +22,19 @@ const mp_obj_module_t example_package_foo_bar_user_cmodule = {
 };
 
 // Define example_package.foo.f()
-STATIC mp_obj_t example_package_foo_f(void) {
+static mp_obj_t example_package_foo_f(void) {
     mp_printf(&mp_plat_print, "example_package.foo.f\n");
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(example_package_foo_f_obj, example_package_foo_f);
+static MP_DEFINE_CONST_FUN_OBJ_0(example_package_foo_f_obj, example_package_foo_f);
 
 // Define all attributes of the first-level sub-package (example_package.foo).
-STATIC const mp_rom_map_elem_t example_package_foo_globals_table[] = {
+static const mp_rom_map_elem_t example_package_foo_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_example_package_dot_foo) },
     { MP_ROM_QSTR(MP_QSTR_bar), MP_ROM_PTR(&example_package_foo_bar_user_cmodule) },
     { MP_ROM_QSTR(MP_QSTR_f), MP_ROM_PTR(&example_package_foo_f_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(example_package_foo_globals, example_package_foo_globals_table);
+static MP_DEFINE_CONST_DICT(example_package_foo_globals, example_package_foo_globals_table);
 
 // Define example_package.foo module object.
 const mp_obj_module_t example_package_foo_user_cmodule = {
@@ -43,13 +43,13 @@ const mp_obj_module_t example_package_foo_user_cmodule = {
 };
 
 // Define example_package.f()
-STATIC mp_obj_t example_package_f(void) {
+static mp_obj_t example_package_f(void) {
     mp_printf(&mp_plat_print, "example_package.f\n");
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(example_package_f_obj, example_package_f);
+static MP_DEFINE_CONST_FUN_OBJ_0(example_package_f_obj, example_package_f);
 
-STATIC mp_obj_t example_package___init__(void) {
+static mp_obj_t example_package___init__(void) {
     if (!MP_STATE_VM(example_package_initialised)) {
         // __init__ for builtins is called each time the module is imported,
         //   so ensure that initialisation only happens once.
@@ -58,20 +58,20 @@ STATIC mp_obj_t example_package___init__(void) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(example_package___init___obj, example_package___init__);
+static MP_DEFINE_CONST_FUN_OBJ_0(example_package___init___obj, example_package___init__);
 
 // The "initialised" state is stored on mp_state so that it is cleared on soft
 // reset.
 MP_REGISTER_ROOT_POINTER(int example_package_initialised);
 
 // Define all attributes of the top-level package (example_package).
-STATIC const mp_rom_map_elem_t example_package_globals_table[] = {
+static const mp_rom_map_elem_t example_package_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_example_package) },
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&example_package___init___obj) },
     { MP_ROM_QSTR(MP_QSTR_foo), MP_ROM_PTR(&example_package_foo_user_cmodule) },
     { MP_ROM_QSTR(MP_QSTR_f), MP_ROM_PTR(&example_package_f_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(example_package_globals, example_package_globals_table);
+static MP_DEFINE_CONST_DICT(example_package_globals, example_package_globals_table);
 
 // Define module object.
 const mp_obj_module_t example_package_user_cmodule = {
diff --git a/extmod/btstack/btstack_hci_uart.c b/extmod/btstack/btstack_hci_uart.c
index 19cdfc4b9dae7..fb90f550cb126 100644
--- a/extmod/btstack/btstack_hci_uart.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -48,17 +48,17 @@
 // 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;
-STATIC void (*send_handler)(void);
+static bool send_done;
+static void (*send_handler)(void);
 
 // btstack issues a read of len bytes, and gives us a buffer to asynchronously fill up.
-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 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) {
+static int btstack_uart_init(const btstack_uart_config_t *uart_config) {
     (void)uart_config;
 
     send_done = false;
@@ -81,45 +81,45 @@ STATIC int btstack_uart_init(const btstack_uart_config_t *uart_config) {
     return 0;
 }
 
-STATIC int btstack_uart_open(void) {
+static int btstack_uart_open(void) {
     return init_success ? 0 : 1;
 }
 
-STATIC int btstack_uart_close(void) {
+static int btstack_uart_close(void) {
     mp_bluetooth_hci_controller_deinit();
     mp_bluetooth_hci_uart_deinit();
     return 0;
 }
 
-STATIC void btstack_uart_set_block_received(void (*block_handler)(void)) {
+static void btstack_uart_set_block_received(void (*block_handler)(void)) {
     recv_handler = block_handler;
 }
 
-STATIC void btstack_uart_set_block_sent(void (*block_handler)(void)) {
+static void btstack_uart_set_block_sent(void (*block_handler)(void)) {
     send_handler = block_handler;
 }
 
-STATIC int btstack_uart_set_baudrate(uint32_t baudrate) {
+static int btstack_uart_set_baudrate(uint32_t baudrate) {
     mp_bluetooth_hci_uart_set_baudrate(baudrate);
     return 0;
 }
 
-STATIC int btstack_uart_set_parity(int parity) {
+static int btstack_uart_set_parity(int parity) {
     (void)parity;
     return 0;
 }
 
-STATIC int btstack_uart_set_flowcontrol(int flowcontrol) {
+static int btstack_uart_set_flowcontrol(int flowcontrol) {
     (void)flowcontrol;
     return 0;
 }
 
-STATIC void btstack_uart_receive_block(uint8_t *buf, uint16_t len) {
+static void btstack_uart_receive_block(uint8_t *buf, uint16_t len) {
     recv_buf = buf;
     recv_len = len;
 }
 
-STATIC void btstack_uart_send_block(const 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) {
@@ -136,16 +136,16 @@ STATIC void btstack_uart_send_block(const uint8_t *buf, uint16_t len) {
     mp_bluetooth_hci_poll_now();
 }
 
-STATIC int btstack_uart_get_supported_sleep_modes(void) {
+static int btstack_uart_get_supported_sleep_modes(void) {
     return 0;
 }
 
-STATIC void btstack_uart_set_sleep(btstack_uart_sleep_mode_t sleep_mode) {
+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)) {
+static void btstack_uart_set_wakeup_handler(void (*wakeup_handler)(void)) {
     (void)wakeup_handler;
     // printf("btstack_uart_set_wakeup_handler\n");
 }
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index b3d349c2dc947..b29970842ceb9 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -43,24 +43,24 @@
 
 // How long to wait for a controller to init/deinit.
 // Some controllers can take up to 5-6 seconds in normal operation.
-STATIC const uint32_t BTSTACK_INIT_DEINIT_TIMEOUT_MS = 15000;
+static const uint32_t BTSTACK_INIT_DEINIT_TIMEOUT_MS = 15000;
 
 // We need to know the attribute handle for the GAP device name (see GAP_DEVICE_NAME_UUID)
 // so it can be put into the gatts_db before registering the services, and accessed
 // efficiently when requesting an attribute in att_read_callback.  Because this is the
 // first characteristic of the first service, it always has a handle value of 3.
-STATIC const uint16_t BTSTACK_GAP_DEVICE_NAME_HANDLE = 3;
+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;
+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) {
+static int btstack_error_to_errno(int err) {
     DEBUG_printf("  --> btstack error: %d\n", err);
     if (err == ERROR_CODE_SUCCESS) {
         return 0;
@@ -78,7 +78,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) {
+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) {
@@ -107,7 +107,7 @@ typedef struct _mp_btstack_active_connection_t {
     size_t pending_write_value_len;
 } mp_btstack_active_connection_t;
 
-STATIC mp_btstack_active_connection_t *create_active_connection(uint16_t conn_handle) {
+static mp_btstack_active_connection_t *create_active_connection(uint16_t conn_handle) {
     DEBUG_printf("create_active_connection: conn_handle=%d\n", conn_handle);
     mp_btstack_active_connection_t *conn = m_new(mp_btstack_active_connection_t, 1);
     conn->conn_handle = conn_handle;
@@ -120,7 +120,7 @@ STATIC mp_btstack_active_connection_t *create_active_connection(uint16_t conn_ha
     return conn;
 }
 
-STATIC mp_btstack_active_connection_t *find_active_connection(uint16_t conn_handle) {
+static mp_btstack_active_connection_t *find_active_connection(uint16_t conn_handle) {
     DEBUG_printf("find_active_connection: conn_handle=%d\n", conn_handle);
     btstack_linked_list_iterator_t it;
     btstack_linked_list_iterator_init(&it, &MP_STATE_PORT(bluetooth_btstack_root_pointers)->active_connections);
@@ -135,7 +135,7 @@ STATIC mp_btstack_active_connection_t *find_active_connection(uint16_t conn_hand
     return conn;
 }
 
-STATIC void remove_active_connection(uint16_t conn_handle) {
+static void remove_active_connection(uint16_t conn_handle) {
     DEBUG_printf("remove_active_connection: conn_handle=%d\n", conn_handle);
     mp_btstack_active_connection_t *conn = find_active_connection(conn_handle);
     if (conn) {
@@ -149,7 +149,7 @@ STATIC void remove_active_connection(uint16_t conn_handle) {
 
 // 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) {
+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_printf("btstack_packet_handler_att_server(packet_type=%u, packet=%p)\n", packet_type, packet);
@@ -187,13 +187,13 @@ STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t chan
 
 #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;
+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 };
+static const uint8_t read_static_address_command_complete_prefix[] = { 0x0e, 0x1b, 0x01, 0x09, 0xfc };
 #endif
 
-STATIC void btstack_packet_handler_generic(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+static void btstack_packet_handler_generic(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
     (void)size;
     DEBUG_printf("btstack_packet_handler_generic(packet_type=%u, packet=%p)\n", packet_type, packet);
@@ -372,13 +372,13 @@ STATIC void btstack_packet_handler_generic(uint8_t packet_type, uint16_t channel
     }
 }
 
-STATIC btstack_packet_callback_registration_t hci_event_callback_registration = {
+static btstack_packet_callback_registration_t hci_event_callback_registration = {
     .callback = &btstack_packet_handler_generic
 };
 
 #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) {
+static void btstack_packet_handler_discover_services(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
     (void)size;
     if (packet_type != HCI_EVENT_PACKET) {
@@ -401,7 +401,7 @@ STATIC void btstack_packet_handler_discover_services(uint8_t packet_type, uint16
 }
 
 // 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) {
+static void btstack_packet_handler_discover_characteristics(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
     (void)size;
     if (packet_type != HCI_EVENT_PACKET) {
@@ -424,7 +424,7 @@ STATIC void btstack_packet_handler_discover_characteristics(uint8_t packet_type,
 }
 
 // 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) {
+static void btstack_packet_handler_discover_descriptors(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
     (void)size;
     if (packet_type != HCI_EVENT_PACKET) {
@@ -447,7 +447,7 @@ STATIC void btstack_packet_handler_discover_descriptors(uint8_t packet_type, uin
 }
 
 // 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) {
+static void btstack_packet_handler_read(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
     (void)size;
     if (packet_type != HCI_EVENT_PACKET) {
@@ -476,7 +476,7 @@ STATIC void btstack_packet_handler_read(uint8_t packet_type, uint16_t channel, u
 }
 
 // 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) {
+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;
     if (packet_type != HCI_EVENT_PACKET) {
@@ -501,9 +501,9 @@ STATIC void btstack_packet_handler_write_with_response(uint8_t packet_type, uint
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
-STATIC btstack_timer_source_t btstack_init_deinit_timeout;
+static btstack_timer_source_t btstack_init_deinit_timeout;
 
-STATIC void btstack_init_deinit_timeout_handler(btstack_timer_source_t *ds) {
+static void btstack_init_deinit_timeout_handler(btstack_timer_source_t *ds) {
     (void)ds;
 
     // Stop waiting for initialisation.
@@ -513,13 +513,13 @@ STATIC void btstack_init_deinit_timeout_handler(btstack_timer_source_t *ds) {
 }
 
 #if !MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
-STATIC void btstack_static_address_ready(void *arg) {
+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) {
+static bool set_public_address(void) {
     bd_addr_t local_addr;
     gap_local_bd_addr(local_addr);
     bd_addr_t null_addr = {0};
@@ -532,7 +532,7 @@ STATIC bool set_public_address(void) {
     return true;
 }
 
-STATIC void set_random_address(void) {
+static void set_random_address(void) {
     #if MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
     if (controller_static_addr_available) {
         DEBUG_printf("set_random_address: Using static address supplied by controller.\n");
@@ -581,7 +581,7 @@ STATIC void set_random_address(void) {
     DEBUG_printf("set_random_address: Address loaded by controller\n");
 }
 
-STATIC void deinit_stack(void) {
+static void deinit_stack(void) {
     mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
 
     // Deinitialise BTstack components.
@@ -901,7 +901,7 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
     return 0;
 }
 
-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) {
+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;
@@ -926,7 +926,7 @@ STATIC uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t a
     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) {
+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("att_write_callback (handle: %u, mode: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, transaction_mode, offset, buffer, buffer_size);
@@ -953,12 +953,12 @@ STATIC int att_write_callback(hci_con_handle_t connection_handle, uint16_t att_h
     return 0;
 }
 
-STATIC inline uint16_t get_uuid16(const mp_obj_bluetooth_uuid_t *uuid) {
+static inline uint16_t get_uuid16(const mp_obj_bluetooth_uuid_t *uuid) {
     return (uuid->data[1] << 8) | uuid->data[0];
 }
 
 // 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) {
+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) {
@@ -1130,7 +1130,7 @@ typedef struct {
 
 // Called in response to a gatts_notify/indicate being unable to complete, which then calls
 // att_server_request_to_send_notification.
-STATIC void btstack_notify_indicate_ready_handler(void *context) {
+static void btstack_notify_indicate_ready_handler(void *context) {
     MICROPY_PY_BLUETOOTH_ENTER
     notify_indicate_pending_op_t *pending_op = (notify_indicate_pending_op_t *)context;
     DEBUG_printf("btstack_notify_indicate_ready_handler gatts_op=%d conn_handle=%d value_handle=%d len=%lu\n", pending_op->gatts_op, pending_op->conn_handle, pending_op->value_handle, pending_op->value_len);
@@ -1270,9 +1270,9 @@ int mp_bluetooth_gap_passkey(uint16_t conn_handle, uint8_t action, mp_int_t pass
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-STATIC btstack_timer_source_t scan_duration_timeout;
+static btstack_timer_source_t scan_duration_timeout;
 
-STATIC void scan_duration_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();
 }
diff --git a/extmod/machine_adc.c b/extmod/machine_adc.c
index 9849163de875b..11f1123dc794f 100644
--- a/extmod/machine_adc.c
+++ b/extmod/machine_adc.c
@@ -32,33 +32,33 @@
 
 // The port must provide implementations of these low-level ADC functions.
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
-STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self);
+static void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+static mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self);
 
 #if MICROPY_PY_MACHINE_ADC_INIT
-STATIC void mp_machine_adc_init_helper(machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+static void mp_machine_adc_init_helper(machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_DEINIT
-STATIC void mp_machine_adc_deinit(machine_adc_obj_t *self);
+static void mp_machine_adc_deinit(machine_adc_obj_t *self);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_BLOCK
-STATIC mp_obj_t mp_machine_adc_block(machine_adc_obj_t *self);
+static mp_obj_t mp_machine_adc_block(machine_adc_obj_t *self);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_READ_UV
-STATIC mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self);
+static mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH
-STATIC void mp_machine_adc_atten_set(machine_adc_obj_t *self, mp_int_t atten);
-STATIC void mp_machine_adc_width_set(machine_adc_obj_t *self, mp_int_t width);
+static void mp_machine_adc_atten_set(machine_adc_obj_t *self, mp_int_t atten);
+static void mp_machine_adc_width_set(machine_adc_obj_t *self, mp_int_t width);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_READ
-STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self);
+static mp_int_t mp_machine_adc_read(machine_adc_obj_t *self);
 #endif
 
 // The port provides implementations of the above in this file.
@@ -66,81 +66,81 @@ STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self);
 
 #if MICROPY_PY_MACHINE_ADC_INIT
 // ADC.init(...)
-STATIC mp_obj_t machine_adc_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_adc_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_machine_adc_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_init_obj, 1, machine_adc_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_init_obj, 1, machine_adc_init);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_DEINIT
 // ADC.deinit()
-STATIC mp_obj_t machine_adc_deinit(mp_obj_t self_in) {
+static mp_obj_t machine_adc_deinit(mp_obj_t self_in) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_machine_adc_deinit(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_deinit_obj, machine_adc_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_deinit_obj, machine_adc_deinit);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_BLOCK
 // ADC.block()
-STATIC mp_obj_t machine_adc_block(mp_obj_t self_in) {
+static mp_obj_t machine_adc_block(mp_obj_t self_in) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_machine_adc_block(self);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_block_obj, machine_adc_block);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_block_obj, machine_adc_block);
 #endif
 
 // ADC.read_u16()
-STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
+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(mp_machine_adc_read_u16(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
 
 #if MICROPY_PY_MACHINE_ADC_READ_UV
 // ADC.read_uv()
-STATIC mp_obj_t machine_adc_read_uv(mp_obj_t self_in) {
+static mp_obj_t machine_adc_read_uv(mp_obj_t self_in) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(mp_machine_adc_read_uv(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_uv_obj, machine_adc_read_uv);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_uv_obj, machine_adc_read_uv);
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH
 
 // ADC.atten(value) -- this is a legacy method.
-STATIC mp_obj_t machine_adc_atten(mp_obj_t self_in, mp_obj_t atten_in) {
+static mp_obj_t machine_adc_atten(mp_obj_t self_in, mp_obj_t atten_in) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t atten = mp_obj_get_int(atten_in);
     mp_machine_adc_atten_set(self, atten);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_adc_atten_obj, machine_adc_atten);
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_adc_atten_obj, machine_adc_atten);
 
 // ADC.width(value) -- this is a legacy method.
-STATIC mp_obj_t machine_adc_width(mp_obj_t self_in, mp_obj_t width_in) {
+static mp_obj_t machine_adc_width(mp_obj_t self_in, mp_obj_t width_in) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t width = mp_obj_get_int(width_in);
     mp_machine_adc_width_set(self, width);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_adc_width_obj, machine_adc_width);
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_adc_width_obj, machine_adc_width);
 
 #endif
 
 #if MICROPY_PY_MACHINE_ADC_READ
 // ADC.read() -- this is a legacy method.
-STATIC mp_obj_t machine_adc_read(mp_obj_t self_in) {
+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(mp_machine_adc_read(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_obj, machine_adc_read);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_obj, machine_adc_read);
 #endif
 
-STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
     #if MICROPY_PY_MACHINE_ADC_INIT
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_adc_init_obj) },
     #endif
@@ -169,7 +169,7 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
     // It can be defined to nothing if there are no constants.
     MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS
 };
-STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
diff --git a/extmod/machine_adc_block.c b/extmod/machine_adc_block.c
index f80e2dae4cc75..b1e35a1eb6766 100644
--- a/extmod/machine_adc_block.c
+++ b/extmod/machine_adc_block.c
@@ -33,20 +33,20 @@
 #include "extmod/modmachine.h"
 
 // The port must provide implementations of these low-level ADCBlock functions.
-STATIC void mp_machine_adc_block_print(const mp_print_t *print, machine_adc_block_obj_t *self);
-STATIC machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit);
-STATIC void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_t bits);
-STATIC machine_adc_obj_t *mp_machine_adc_block_connect(machine_adc_block_obj_t *self, mp_int_t channel_id, mp_hal_pin_obj_t pin, mp_map_t *kw_args);
+static void mp_machine_adc_block_print(const mp_print_t *print, machine_adc_block_obj_t *self);
+static machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit);
+static void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_t bits);
+static machine_adc_obj_t *mp_machine_adc_block_connect(machine_adc_block_obj_t *self, mp_int_t channel_id, mp_hal_pin_obj_t pin, mp_map_t *kw_args);
 
 // The port provides implementations of the above in this file.
 #include MICROPY_PY_MACHINE_ADC_BLOCK_INCLUDEFILE
 
-STATIC void machine_adc_block_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void machine_adc_block_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_adc_block_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_machine_adc_block_print(print, self);
 }
 
-STATIC void machine_adc_block_init_helper(machine_adc_block_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static void machine_adc_block_init_helper(machine_adc_block_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {
         ARG_bits,
     };
@@ -62,7 +62,7 @@ STATIC void machine_adc_block_init_helper(machine_adc_block_obj_t *self, size_t
     mp_machine_adc_block_bits_set(self, bits);
 }
 
-STATIC mp_obj_t machine_adc_block_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+static mp_obj_t machine_adc_block_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);
     mp_int_t unit = mp_obj_get_int(args[0]);
     machine_adc_block_obj_t *self = mp_machine_adc_block_get(unit);
@@ -77,14 +77,14 @@ STATIC mp_obj_t machine_adc_block_make_new(const mp_obj_type_t *type, size_t n_p
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t machine_adc_block_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_adc_block_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     machine_adc_block_obj_t *self = pos_args[0];
     machine_adc_block_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_block_init_obj, 1, machine_adc_block_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_block_init_obj, 1, machine_adc_block_init);
 
-STATIC mp_obj_t machine_adc_block_connect(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_adc_block_connect(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     machine_adc_block_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_int_t channel_id = -1;
     mp_hal_pin_obj_t pin = -1;
@@ -108,13 +108,13 @@ STATIC mp_obj_t machine_adc_block_connect(size_t n_pos_args, const mp_obj_t *pos
 
     return MP_OBJ_FROM_PTR(adc);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_block_connect_obj, 2, machine_adc_block_connect);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_adc_block_connect_obj, 2, machine_adc_block_connect);
 
-STATIC const mp_rom_map_elem_t machine_adc_block_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_adc_block_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_adc_block_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&machine_adc_block_connect_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(machine_adc_block_locals_dict, machine_adc_block_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_adc_block_locals_dict, machine_adc_block_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_block_type,
diff --git a/extmod/machine_bitstream.c b/extmod/machine_bitstream.c
index af093a4b5483d..134961427407a 100644
--- a/extmod/machine_bitstream.c
+++ b/extmod/machine_bitstream.c
@@ -36,7 +36,7 @@
 #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) {
+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]);
 
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 1964284ec837d..bddf77529996d 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -39,17 +39,17 @@
 
 typedef mp_machine_soft_i2c_obj_t machine_i2c_obj_t;
 
-STATIC void mp_hal_i2c_delay(machine_i2c_obj_t *self) {
+static void mp_hal_i2c_delay(machine_i2c_obj_t *self) {
     // We need to use an accurate delay to get acceptable I2C
     // speeds (eg 1us should be not much more than 1us).
     mp_hal_delay_us_fast(self->us_delay);
 }
 
-STATIC void mp_hal_i2c_scl_low(machine_i2c_obj_t *self) {
+static void mp_hal_i2c_scl_low(machine_i2c_obj_t *self) {
     mp_hal_pin_od_low(self->scl);
 }
 
-STATIC int mp_hal_i2c_scl_release(machine_i2c_obj_t *self) {
+static int mp_hal_i2c_scl_release(machine_i2c_obj_t *self) {
     uint32_t count = self->us_timeout;
 
     mp_hal_pin_od_high(self->scl);
@@ -64,19 +64,19 @@ STATIC int mp_hal_i2c_scl_release(machine_i2c_obj_t *self) {
     return 0; // success
 }
 
-STATIC void mp_hal_i2c_sda_low(machine_i2c_obj_t *self) {
+static void mp_hal_i2c_sda_low(machine_i2c_obj_t *self) {
     mp_hal_pin_od_low(self->sda);
 }
 
-STATIC void mp_hal_i2c_sda_release(machine_i2c_obj_t *self) {
+static void mp_hal_i2c_sda_release(machine_i2c_obj_t *self) {
     mp_hal_pin_od_high(self->sda);
 }
 
-STATIC int mp_hal_i2c_sda_read(machine_i2c_obj_t *self) {
+static int mp_hal_i2c_sda_read(machine_i2c_obj_t *self) {
     return mp_hal_pin_read(self->sda);
 }
 
-STATIC int mp_hal_i2c_start(machine_i2c_obj_t *self) {
+static int mp_hal_i2c_start(machine_i2c_obj_t *self) {
     mp_hal_i2c_sda_release(self);
     mp_hal_i2c_delay(self);
     int ret = mp_hal_i2c_scl_release(self);
@@ -88,7 +88,7 @@ STATIC int mp_hal_i2c_start(machine_i2c_obj_t *self) {
     return 0; // success
 }
 
-STATIC int mp_hal_i2c_stop(machine_i2c_obj_t *self) {
+static int mp_hal_i2c_stop(machine_i2c_obj_t *self) {
     mp_hal_i2c_delay(self);
     mp_hal_i2c_sda_low(self);
     mp_hal_i2c_delay(self);
@@ -98,7 +98,7 @@ STATIC int mp_hal_i2c_stop(machine_i2c_obj_t *self) {
     return ret;
 }
 
-STATIC void mp_hal_i2c_init(machine_i2c_obj_t *self, uint32_t freq) {
+static void mp_hal_i2c_init(machine_i2c_obj_t *self, uint32_t freq) {
     self->us_delay = 500000 / freq;
     if (self->us_delay == 0) {
         self->us_delay = 1;
@@ -112,7 +112,7 @@ STATIC void mp_hal_i2c_init(machine_i2c_obj_t *self, uint32_t freq) {
 //    0 - byte written and ack received
 //    1 - byte written and nack received
 //   <0 - error, with errno being the negative of the return value
-STATIC int mp_hal_i2c_write_byte(machine_i2c_obj_t *self, uint8_t val) {
+static int mp_hal_i2c_write_byte(machine_i2c_obj_t *self, uint8_t val) {
     mp_hal_i2c_delay(self);
     mp_hal_i2c_scl_low(self);
 
@@ -148,7 +148,7 @@ STATIC int mp_hal_i2c_write_byte(machine_i2c_obj_t *self, uint8_t val) {
 // return value:
 //    0 - success
 //   <0 - error, with errno being the negative of the return value
-STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t *self, uint8_t *val, int nack) {
+static int mp_hal_i2c_read_byte(machine_i2c_obj_t *self, uint8_t *val, int nack) {
     mp_hal_i2c_delay(self);
     mp_hal_i2c_scl_low(self);
     mp_hal_i2c_delay(self);
@@ -291,14 +291,14 @@ int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n
     return ret;
 }
 
-STATIC int mp_machine_i2c_readfrom(mp_obj_base_t *self, uint16_t addr, uint8_t *dest, size_t len, bool stop) {
+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 *)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) {
+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 *)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;
@@ -308,7 +308,7 @@ STATIC int mp_machine_i2c_writeto(mp_obj_base_t *self, uint16_t addr, const uint
 /******************************************************************************/
 // MicroPython bindings for generic machine.I2C
 
-STATIC mp_obj_t machine_i2c_init(size_t n_args, const mp_obj_t *args, mp_map_t *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 *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->init == NULL) {
@@ -319,7 +319,7 @@ STATIC mp_obj_t machine_i2c_init(size_t n_args, const mp_obj_t *args, mp_map_t *
 }
 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) {
+static mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
     mp_obj_base_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t list = mp_obj_new_list(0, NULL);
     // 7-bit addresses 0b0000xxx and 0b1111xxx are reserved
@@ -337,7 +337,7 @@ STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
 }
 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) {
+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 *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->start == NULL) {
@@ -351,7 +351,7 @@ STATIC mp_obj_t machine_i2c_start(mp_obj_t self_in) {
 }
 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) {
+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 *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->stop == NULL) {
@@ -365,7 +365,7 @@ STATIC mp_obj_t machine_i2c_stop(mp_obj_t self_in) {
 }
 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) {
+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 *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->read == NULL) {
@@ -389,7 +389,7 @@ STATIC mp_obj_t machine_i2c_readinto(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readinto_obj, 2, 3, machine_i2c_readinto);
 
-STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
+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 *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->write == NULL) {
@@ -411,7 +411,7 @@ STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(machine_i2c_write_obj, machine_i2c_write);
 
-STATIC mp_obj_t machine_i2c_readfrom(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_i2c_readfrom(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_int_t addr = mp_obj_get_int(args[1]);
     vstr_t vstr;
@@ -425,7 +425,7 @@ STATIC mp_obj_t machine_i2c_readfrom(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readfrom_obj, 3, 4, machine_i2c_readfrom);
 
-STATIC mp_obj_t machine_i2c_readfrom_into(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_i2c_readfrom_into(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_int_t addr = mp_obj_get_int(args[1]);
     mp_buffer_info_t bufinfo;
@@ -439,7 +439,7 @@ STATIC mp_obj_t machine_i2c_readfrom_into(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readfrom_into_obj, 3, 4, machine_i2c_readfrom_into);
 
-STATIC mp_obj_t machine_i2c_writeto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_i2c_writeto(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_int_t addr = mp_obj_get_int(args[1]);
     mp_buffer_info_t bufinfo;
@@ -452,9 +452,9 @@ STATIC mp_obj_t machine_i2c_writeto(size_t n_args, const mp_obj_t *args) {
     // return number of acks received
     return MP_OBJ_NEW_SMALL_INT(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_writeto_obj, 3, 4, machine_i2c_writeto);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_writeto_obj, 3, 4, machine_i2c_writeto);
 
-STATIC mp_obj_t machine_i2c_writevto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_i2c_writevto(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_int_t addr = mp_obj_get_int(args[1]);
 
@@ -498,9 +498,9 @@ STATIC mp_obj_t machine_i2c_writevto(size_t n_args, const mp_obj_t *args) {
     // Return number of acks received
     return MP_OBJ_NEW_SMALL_INT(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_writevto_obj, 3, 4, machine_i2c_writevto);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_writevto_obj, 3, 4, machine_i2c_writevto);
 
-STATIC size_t fill_memaddr_buf(uint8_t *memaddr_buf, uint32_t memaddr, uint8_t addrsize) {
+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"));
@@ -511,7 +511,7 @@ STATIC size_t fill_memaddr_buf(uint8_t *memaddr_buf, uint32_t memaddr, uint8_t a
     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) {
+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
@@ -543,7 +543,7 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
     return mp_machine_i2c_readfrom(self, addr, buf, len, true);
 }
 
-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) {
+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) {
     mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
 
     // Create buffer with memory address
@@ -561,14 +561,14 @@ STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t
     return i2c_p->transfer(self, addr, 2, bufs, MP_MACHINE_I2C_FLAG_STOP);
 }
 
-STATIC const mp_arg_t machine_i2c_mem_allowed_args[] = {
+static const mp_arg_t machine_i2c_mem_allowed_args[] = {
     { MP_QSTR_addr,    MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
     { MP_QSTR_memaddr, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
     { MP_QSTR_arg,     MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
 };
 
-STATIC mp_obj_t machine_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_addr, ARG_memaddr, ARG_n, ARG_addrsize };
     mp_arg_val_t args[MP_ARRAY_SIZE(machine_i2c_mem_allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
@@ -590,7 +590,7 @@ STATIC mp_obj_t machine_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_readfrom_mem_obj, 1, machine_i2c_readfrom_mem);
 
 
-STATIC mp_obj_t machine_i2c_readfrom_mem_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_i2c_readfrom_mem_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_addr, ARG_memaddr, ARG_buf, ARG_addrsize };
     mp_arg_val_t args[MP_ARRAY_SIZE(machine_i2c_mem_allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
@@ -610,7 +610,7 @@ STATIC mp_obj_t machine_i2c_readfrom_mem_into(size_t n_args, const mp_obj_t *pos
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_readfrom_mem_into_obj, 1, machine_i2c_readfrom_mem_into);
 
-STATIC mp_obj_t machine_i2c_writeto_mem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_i2c_writeto_mem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_addr, ARG_memaddr, ARG_buf, ARG_addrsize };
     mp_arg_val_t args[MP_ARRAY_SIZE(machine_i2c_mem_allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
@@ -629,9 +629,9 @@ STATIC mp_obj_t machine_i2c_writeto_mem(size_t n_args, const mp_obj_t *pos_args,
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_writeto_mem_obj, 1, machine_i2c_writeto_mem);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_writeto_mem_obj, 1, machine_i2c_writeto_mem);
 
-STATIC const mp_rom_map_elem_t machine_i2c_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_i2c_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_i2c_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&machine_i2c_scan_obj) },
 
@@ -661,13 +661,13 @@ MP_DEFINE_CONST_DICT(mp_machine_i2c_locals_dict, machine_i2c_locals_dict_table);
 
 #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) {
+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) {
+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} },
@@ -686,7 +686,7 @@ STATIC void mp_machine_soft_i2c_init(mp_obj_base_t *self_in, size_t n_args, cons
     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) {
+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 = mp_obj_malloc(machine_i2c_obj_t, &mp_machine_soft_i2c_type);
     mp_map_t kw_args;
@@ -722,7 +722,7 @@ int mp_machine_soft_i2c_write(mp_obj_base_t *self_in, const uint8_t *src, size_t
     return num_acks;
 }
 
-STATIC const mp_machine_i2c_p_t mp_machine_soft_i2c_p = {
+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,
diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index cc97f011a6d42..7e069c5d76cbf 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -108,21 +108,21 @@ typedef struct _non_blocking_descriptor_t {
     bool copy_in_progress;
 } non_blocking_descriptor_t;
 
-STATIC void ringbuf_init(ring_buf_t *rbuf, uint8_t *buffer, size_t size);
-STATIC bool ringbuf_push(ring_buf_t *rbuf, uint8_t data);
-STATIC bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data);
-STATIC size_t ringbuf_available_data(ring_buf_t *rbuf);
-STATIC size_t ringbuf_available_space(ring_buf_t *rbuf);
-STATIC void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self);
-STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self);
+static void ringbuf_init(ring_buf_t *rbuf, uint8_t *buffer, size_t size);
+static bool ringbuf_push(ring_buf_t *rbuf, uint8_t data);
+static bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data);
+static size_t ringbuf_available_data(ring_buf_t *rbuf);
+static size_t ringbuf_available_space(ring_buf_t *rbuf);
+static void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self);
+static void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self);
 
 #endif // MICROPY_PY_MACHINE_I2S_RING_BUF
 
 // The port must provide implementations of these low-level I2S functions.
-STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args);
-STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id);
-STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self);
-STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self);
+static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args);
+static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id);
+static void mp_machine_i2s_deinit(machine_i2s_obj_t *self);
+static void mp_machine_i2s_irq_update(machine_i2s_obj_t *self);
 
 // The port provides implementations of the above in this file.
 #include MICROPY_PY_MACHINE_I2S_INCLUDEFILE
@@ -135,14 +135,14 @@ STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self);
 // - 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) {
+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) {
+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) {
@@ -155,7 +155,7 @@ STATIC bool ringbuf_push(ring_buf_t *rbuf, uint8_t data) {
     return false;
 }
 
-STATIC bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data) {
+static bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data) {
     if (rbuf->head == rbuf->tail) {
         // empty
         return false;
@@ -166,23 +166,23 @@ STATIC bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data) {
     return true;
 }
 
-STATIC bool ringbuf_is_empty(ring_buf_t *rbuf) {
+static bool ringbuf_is_empty(ring_buf_t *rbuf) {
     return rbuf->head == rbuf->tail;
 }
 
-STATIC bool ringbuf_is_full(ring_buf_t *rbuf) {
+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) {
+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) {
+static size_t ringbuf_available_space(ring_buf_t *rbuf) {
     return rbuf->size - ringbuf_available_data(rbuf) - 1;
 }
 
-STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+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
@@ -247,7 +247,7 @@ STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info
 }
 
 // function is used in IRQ context
-STATIC void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+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
@@ -288,7 +288,7 @@ STATIC void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+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
@@ -319,7 +319,7 @@ STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t
 }
 
 // function is used in IRQ context
-STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+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;
@@ -341,7 +341,7 @@ STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self) {
 
 #endif // MICROPY_PY_MACHINE_I2S_RING_BUF
 
-MP_NOINLINE 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) {
+MP_NOINLINE 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) {
     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} },
@@ -362,7 +362,7 @@ MP_NOINLINE STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t
     mp_machine_i2s_init_helper(self, args);
 }
 
-STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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"
@@ -387,7 +387,7 @@ STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         );
 }
 
-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) {
+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);
     mp_int_t i2s_id = mp_obj_get_int(args[0]);
 
@@ -401,24 +401,24 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 }
 
 // I2S.init(...)
-STATIC mp_obj_t machine_i2s_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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]);
     mp_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_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_init_obj, 1, machine_i2s_init);
 
 // I2S.deinit()
-STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
+static mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
     machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_machine_i2s_deinit(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
 
 // I2S.irq(handler)
-STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
+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"));
@@ -436,11 +436,11 @@ STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
+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) {
+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} },
@@ -497,10 +497,10 @@ STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_ma
 
     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 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[] = {
+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) },
@@ -522,7 +522,7 @@ STATIC const mp_rom_map_elem_t machine_i2s_locals_dict_table[] = {
 };
 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) {
+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 != MICROPY_PY_MACHINE_I2S_CONSTANT_RX) {
@@ -570,7 +570,7 @@ STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint
     }
 }
 
-STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+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 != MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
@@ -612,7 +612,7 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
     }
 }
 
-STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_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;
     uintptr_t flags = arg;
@@ -678,7 +678,7 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return ret;
 }
 
-STATIC const mp_stream_p_t i2s_stream_p = {
+static const mp_stream_p_t i2s_stream_p = {
     .read = machine_i2s_stream_read,
     .write = machine_i2s_stream_write,
     .ioctl = machine_i2s_ioctl,
diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index 217c7ca0882b3..c8f0889b9a728 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -39,7 +39,7 @@
 // implementations, if the default implementation isn't used.
 
 #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) {
+static uintptr_t machine_mem_get_addr(mp_obj_t addr_o, uint align) {
     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);
@@ -54,13 +54,13 @@ STATIC uintptr_t machine_mem_get_addr(mp_obj_t addr_o, uint align) {
 #endif
 #endif
 
-STATIC void machine_mem_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void machine_mem_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     machine_mem_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<%u-bit memory>", 8 * self->elem_size);
 }
 
-STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     // TODO support slice index to read/write multiple values at once
     machine_mem_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (value == MP_OBJ_NULL) {
diff --git a/extmod/machine_pinbase.c b/extmod/machine_pinbase.c
index 981dadf0f5e73..6b3b362317560 100644
--- a/extmod/machine_pinbase.c
+++ b/extmod/machine_pinbase.c
@@ -40,11 +40,11 @@ typedef struct _mp_pinbase_t {
     mp_obj_base_t base;
 } mp_pinbase_t;
 
-STATIC const mp_pinbase_t pinbase_singleton = {
+static const mp_pinbase_t pinbase_singleton = {
     .base = { &machine_pinbase_type },
 };
 
-STATIC mp_obj_t pinbase_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 pinbase_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)type;
     (void)n_args;
     (void)n_kw;
@@ -72,7 +72,7 @@ mp_uint_t pinbase_ioctl(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *err
     return -1;
 }
 
-STATIC const mp_pin_p_t pinbase_pin_p = {
+static const mp_pin_p_t pinbase_pin_p = {
     .ioctl = pinbase_ioctl,
 };
 
diff --git a/extmod/machine_pulse.c b/extmod/machine_pulse.c
index 157566d9842fb..85dba86d9b5ad 100644
--- a/extmod/machine_pulse.c
+++ b/extmod/machine_pulse.c
@@ -46,7 +46,7 @@ MP_WEAK mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, m
     return mp_hal_ticks_us() - start;
 }
 
-STATIC mp_obj_t machine_time_pulse_us_(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_time_pulse_us_(size_t n_args, const mp_obj_t *args) {
     mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(args[0]);
     int level = 0;
     if (mp_obj_is_true(args[1])) {
diff --git a/extmod/machine_pwm.c b/extmod/machine_pwm.c
index 13b96eb5d4ec7..0c1834886c4df 100644
--- a/extmod/machine_pwm.c
+++ b/extmod/machine_pwm.c
@@ -31,40 +31,40 @@
 #include "extmod/modmachine.h"
 
 // The port must provide implementations of these low-level PWM functions.
-STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
-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);
-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);
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self);
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq);
+static void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+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);
+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);
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self);
+static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self);
+static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq);
 #if MICROPY_PY_MACHINE_PWM_DUTY
-STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty);
+static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self);
+static void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty);
 #endif
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16);
-STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns);
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self);
+static void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16);
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self);
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns);
 
 // The port provides implementations of the above in this file.
 #include MICROPY_PY_MACHINE_PWM_INCLUDEFILE
 
-STATIC mp_obj_t machine_pwm_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_pwm_init_obj, 1, machine_pwm_init);
 
 // PWM.deinit()
-STATIC mp_obj_t machine_pwm_deinit(mp_obj_t self_in) {
+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);
+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) {
+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.
@@ -76,11 +76,11 @@ STATIC mp_obj_t machine_pwm_freq(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_freq_obj, 1, 2, machine_pwm_freq);
+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) {
+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.
@@ -92,11 +92,11 @@ STATIC mp_obj_t machine_pwm_duty(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_obj, 1, 2, machine_pwm_duty);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_obj, 1, 2, machine_pwm_duty);
 #endif
 
 // PWM.duty_u16([value])
-STATIC mp_obj_t machine_pwm_duty_u16(size_t n_args, const mp_obj_t *args) {
+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.
@@ -108,10 +108,10 @@ STATIC mp_obj_t machine_pwm_duty_u16(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_u16_obj, 1, 2, machine_pwm_duty_u16);
+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) {
+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.
@@ -123,9 +123,9 @@ STATIC mp_obj_t machine_pwm_duty_ns(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_ns_obj, 1, 2, machine_pwm_duty_ns);
+static 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[] = {
+static const mp_rom_map_elem_t machine_pwm_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pwm_init_obj) },
     { 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) },
@@ -135,7 +135,7 @@ STATIC const mp_rom_map_elem_t machine_pwm_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(machine_pwm_locals_dict, machine_pwm_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_pwm_type,
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index 63fd0fe479a2b..6295a496b3654 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -41,7 +41,7 @@ typedef struct _machine_signal_t {
     bool invert;
 } machine_signal_t;
 
-STATIC mp_obj_t signal_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 signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_t pin;
     bool invert = false;
 
@@ -113,7 +113,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_uint_t signal_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t signal_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     (void)errcode;
     machine_signal_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -130,7 +130,7 @@ STATIC mp_uint_t signal_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg
 }
 
 // fast method for getting/setting signal value
-STATIC mp_obj_t signal_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t signal_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);
     if (n_args == 0) {
         // get pin
@@ -142,32 +142,32 @@ STATIC mp_obj_t signal_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     }
 }
 
-STATIC mp_obj_t signal_value(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t signal_value(size_t n_args, const mp_obj_t *args) {
     return signal_call(args[0], n_args - 1, 0, args + 1);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(signal_value_obj, 1, 2, signal_value);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(signal_value_obj, 1, 2, signal_value);
 
-STATIC mp_obj_t signal_on(mp_obj_t self_in) {
+static mp_obj_t signal_on(mp_obj_t self_in) {
     mp_virtual_pin_write(self_in, 1);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(signal_on_obj, signal_on);
+static MP_DEFINE_CONST_FUN_OBJ_1(signal_on_obj, signal_on);
 
-STATIC mp_obj_t signal_off(mp_obj_t self_in) {
+static mp_obj_t signal_off(mp_obj_t self_in) {
     mp_virtual_pin_write(self_in, 0);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(signal_off_obj, signal_off);
+static MP_DEFINE_CONST_FUN_OBJ_1(signal_off_obj, signal_off);
 
-STATIC const mp_rom_map_elem_t signal_locals_dict_table[] = {
+static const mp_rom_map_elem_t signal_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&signal_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&signal_on_obj) },
     { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&signal_off_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(signal_locals_dict, signal_locals_dict_table);
+static MP_DEFINE_CONST_DICT(signal_locals_dict, signal_locals_dict_table);
 
-STATIC const mp_pin_p_t signal_pin_p = {
+static const mp_pin_p_t signal_pin_p = {
     .ioctl = signal_ioctl,
 };
 
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index e35e8b7fcc1ea..a1d18c905247a 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -42,15 +42,15 @@
 /******************************************************************************/
 // MicroPython bindings for generic machine.SPI
 
-STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *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 *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     spi_p->init(s, n_args - 1, args + 1, kw_args);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_spi_init_obj, 1, machine_spi_init);
+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) {
+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 *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     if (spi_p->deinit != NULL) {
@@ -58,15 +58,15 @@ STATIC mp_obj_t machine_spi_deinit(mp_obj_t self) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_spi_deinit_obj, machine_spi_deinit);
+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) {
+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 *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     spi_p->transfer(s, len, src, dest);
 }
 
-STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *args) {
     vstr_t vstr;
     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);
@@ -75,7 +75,7 @@ STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj, 2, 3, mp_machine_spi_read);
 
-STATIC mp_obj_t mp_machine_spi_readinto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_machine_spi_readinto(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
     memset(bufinfo.buf, n_args == 3 ? mp_obj_get_int(args[2]) : 0, bufinfo.len);
@@ -84,7 +84,7 @@ STATIC mp_obj_t mp_machine_spi_readinto(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj, 2, 3, mp_machine_spi_readinto);
 
-STATIC mp_obj_t mp_machine_spi_write(mp_obj_t self, mp_obj_t wr_buf) {
+static mp_obj_t mp_machine_spi_write(mp_obj_t self, mp_obj_t wr_buf) {
     mp_buffer_info_t src;
     mp_get_buffer_raise(wr_buf, &src, MP_BUFFER_READ);
     mp_machine_spi_transfer(self, src.len, (const uint8_t *)src.buf, NULL);
@@ -92,7 +92,7 @@ STATIC mp_obj_t mp_machine_spi_write(mp_obj_t self, mp_obj_t wr_buf) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj, mp_machine_spi_write);
 
-STATIC mp_obj_t mp_machine_spi_write_readinto(mp_obj_t self, mp_obj_t wr_buf, mp_obj_t rd_buf) {
+static mp_obj_t mp_machine_spi_write_readinto(mp_obj_t self, mp_obj_t wr_buf, mp_obj_t rd_buf) {
     mp_buffer_info_t src;
     mp_get_buffer_raise(wr_buf, &src, MP_BUFFER_READ);
     mp_buffer_info_t dest;
@@ -105,7 +105,7 @@ STATIC mp_obj_t mp_machine_spi_write_readinto(mp_obj_t self, mp_obj_t wr_buf, mp
 }
 MP_DEFINE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj, mp_machine_spi_write_readinto);
 
-STATIC const mp_rom_map_elem_t machine_spi_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_spi_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_spi_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_spi_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_machine_spi_read_obj) },
@@ -125,7 +125,7 @@ MP_DEFINE_CONST_DICT(mp_machine_spi_locals_dict, machine_spi_locals_dict_table);
 
 #if MICROPY_PY_MACHINE_SOFTSPI
 
-STATIC uint32_t baudrate_from_delay_half(uint32_t delay_half) {
+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) {
         return MICROPY_HW_SOFTSPI_MAX_BAUDRATE;
@@ -136,7 +136,7 @@ STATIC uint32_t baudrate_from_delay_half(uint32_t delay_half) {
     }
 }
 
-STATIC uint32_t baudrate_to_delay_half(uint32_t baudrate) {
+static uint32_t baudrate_to_delay_half(uint32_t baudrate) {
     #ifdef MICROPY_HW_SOFTSPI_MIN_DELAY
     if (baudrate >= MICROPY_HW_SOFTSPI_MAX_BAUDRATE) {
         return MICROPY_HW_SOFTSPI_MIN_DELAY;
@@ -152,7 +152,7 @@ STATIC uint32_t baudrate_to_delay_half(uint32_t baudrate) {
     }
 }
 
-STATIC void mp_machine_soft_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_machine_soft_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_machine_soft_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "SoftSPI(baudrate=%u, polarity=%u, phase=%u,"
         " sck=" MP_HAL_PIN_FMT ", mosi=" MP_HAL_PIN_FMT ", miso=" MP_HAL_PIN_FMT ")",
@@ -160,7 +160,7 @@ STATIC void mp_machine_soft_spi_print(const mp_print_t *print, mp_obj_t self_in,
         mp_hal_pin_name(self->spi.sck), mp_hal_pin_name(self->spi.mosi), mp_hal_pin_name(self->spi.miso));
 }
 
-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) {
+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) {
     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_INT, {.u_int = 500000} },
@@ -203,7 +203,7 @@ STATIC mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_soft_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static void mp_machine_soft_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_machine_soft_spi_obj_t *self = (mp_machine_soft_spi_obj_t *)self_in;
 
     enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_sck, ARG_mosi, ARG_miso };
@@ -241,7 +241,7 @@ STATIC void mp_machine_soft_spi_init(mp_obj_base_t *self_in, size_t n_args, cons
     mp_soft_spi_ioctl(&self->spi, MP_SPI_IOCTL_INIT);
 }
 
-STATIC void mp_machine_soft_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+static void mp_machine_soft_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     mp_machine_soft_spi_obj_t *self = (mp_machine_soft_spi_obj_t *)self_in;
     mp_soft_spi_transfer(&self->spi, len, src, dest);
 }
diff --git a/extmod/machine_timer.c b/extmod/machine_timer.c
index 68702cb74f605..665be82ce1211 100644
--- a/extmod/machine_timer.c
+++ b/extmod/machine_timer.c
@@ -35,13 +35,13 @@ 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) {
+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) {
+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} },
@@ -88,7 +88,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     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) {
+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;
@@ -116,28 +116,28 @@ 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_init(size_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) {
     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_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) {
+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 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
diff --git a/extmod/machine_uart.c b/extmod/machine_uart.c
index dd556bbbbfafa..b62f5a49c465f 100644
--- a/extmod/machine_uart.c
+++ b/extmod/machine_uart.c
@@ -34,108 +34,108 @@
 
 // The port must provide implementations of these low-level UART functions.
 
-STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
-STATIC void mp_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 mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self);
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self);
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self);
+static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+static void mp_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 mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+static void mp_machine_uart_deinit(machine_uart_obj_t *self);
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self);
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self);
 
 #if MICROPY_PY_MACHINE_UART_SENDBREAK
-STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self);
+static void mp_machine_uart_sendbreak(machine_uart_obj_t *self);
 #endif
 
 #if MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR
-STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self);
-STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data);
+static mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self);
+static void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data);
 #endif
 
 #if MICROPY_PY_MACHINE_UART_IRQ
-STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args);
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args);
 #endif
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode);
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode);
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode);
+static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode);
+static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode);
+static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode);
 
 // The port provides implementations of the above in this file.
 #include MICROPY_PY_MACHINE_UART_INCLUDEFILE
 
 // UART.init(...)
-STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     mp_machine_uart_init_helper(MP_OBJ_TO_PTR(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);
 
 // UART.deinit()
-STATIC mp_obj_t machine_uart_deinit(mp_obj_t 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);
     mp_machine_uart_deinit(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
 
 // UART.any()
-STATIC mp_obj_t machine_uart_any(mp_obj_t 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(mp_machine_uart_any(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
 
 // UART.txdone()
-STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+static mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(mp_machine_uart_txdone(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
 
 #if MICROPY_PY_MACHINE_UART_SENDBREAK
 
 // UART.sendbreak()
-STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t 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);
     mp_machine_uart_sendbreak(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
 #endif
 
 #if MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR
 
 // UART.readchar()
-STATIC mp_obj_t machine_uart_readchar(mp_obj_t 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);
     return MP_OBJ_NEW_SMALL_INT(mp_machine_uart_readchar(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_readchar_obj, machine_uart_readchar);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_readchar_obj, machine_uart_readchar);
 
 // UART.writechar(char)
-STATIC mp_obj_t machine_uart_writechar(mp_obj_t self_in, mp_obj_t char_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);
     mp_machine_uart_writechar(self, mp_obj_get_int(char_in));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_uart_writechar_obj, machine_uart_writechar);
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_uart_writechar_obj, machine_uart_writechar);
 
 #endif
 
 #if MICROPY_PY_MACHINE_UART_IRQ
 
 // UART.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) {
+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);
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     bool any_args = n_args > 1 || kw_args->used != 0;
     return MP_OBJ_FROM_PTR(mp_machine_uart_irq(self, any_args, args));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_irq_obj, 1, machine_uart_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_irq_obj, 1, machine_uart_irq);
 
 #endif
 
-STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
+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) },
 
@@ -165,9 +165,9 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     // It can be defined to nothing if there are no constants.
     MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
 };
-STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
 
-STATIC const mp_stream_p_t uart_stream_p = {
+static const mp_stream_p_t uart_stream_p = {
     .read = mp_machine_uart_read,
     .write = mp_machine_uart_write,
     .ioctl = mp_machine_uart_ioctl,
diff --git a/extmod/machine_wdt.c b/extmod/machine_wdt.c
index a49484ed80095..fcef1bda25040 100644
--- a/extmod/machine_wdt.c
+++ b/extmod/machine_wdt.c
@@ -31,16 +31,16 @@
 #include "extmod/modmachine.h"
 
 // The port must provide implementations of these low-level WDT functions.
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms);
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self);
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms);
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self);
 #if MICROPY_PY_MACHINE_WDT_TIMEOUT_MS
-STATIC void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self_in, mp_int_t timeout_ms);
+static void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self_in, mp_int_t timeout_ms);
 #endif
 
 // The port provides implementations of the above in this file.
 #include MICROPY_PY_MACHINE_WDT_INCLUDEFILE
 
-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) {
+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} },
@@ -58,31 +58,31 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type, size_t n_args, s
 }
 
 // WDT.feed()
-STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
+static mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
     machine_wdt_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_machine_wdt_feed(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
 
 #if MICROPY_PY_MACHINE_WDT_TIMEOUT_MS
 // WDT.timeout_ms(timeout)
-STATIC mp_obj_t machine_wdt_timeout_ms(mp_obj_t self_in, mp_obj_t timeout_in) {
+static mp_obj_t machine_wdt_timeout_ms(mp_obj_t self_in, mp_obj_t timeout_in) {
     machine_wdt_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t timeout_ms = mp_obj_get_int(timeout_in);
     mp_machine_wdt_timeout_ms_set(self, timeout_ms);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_wdt_timeout_ms_obj, machine_wdt_timeout_ms);
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_wdt_timeout_ms_obj, machine_wdt_timeout_ms);
 #endif
 
-STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
+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) },
     #if MICROPY_PY_MACHINE_WDT_TIMEOUT_MS
     { MP_ROM_QSTR(MP_QSTR_timeout_ms), MP_ROM_PTR(&machine_wdt_timeout_ms_obj) },
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_wdt_type,
diff --git a/extmod/modasyncio.c b/extmod/modasyncio.c
index a6a54eba8765a..61dd707223ff1 100644
--- a/extmod/modasyncio.c
+++ b/extmod/modasyncio.c
@@ -55,19 +55,19 @@ typedef struct _mp_obj_task_queue_t {
     mp_obj_task_t *heap;
 } mp_obj_task_queue_t;
 
-STATIC const mp_obj_type_t task_queue_type;
-STATIC const mp_obj_type_t task_type;
+static const mp_obj_type_t task_queue_type;
+static const mp_obj_type_t task_type;
 
-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);
+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);
 
 /******************************************************************************/
 // Ticks for task ordering in pairing heap
 
-STATIC mp_obj_t ticks(void) {
+static mp_obj_t ticks(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 
-STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
+static mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
     mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);
     mp_uint_t t1 = MP_OBJ_SMALL_INT_VALUE(t1_in);
     mp_int_t diff = ((t1 - t0 + MICROPY_PY_TIME_TICKS_PERIOD / 2) & (MICROPY_PY_TIME_TICKS_PERIOD - 1))
@@ -75,7 +75,7 @@ STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
     return diff;
 }
 
-STATIC int task_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
+static int task_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
     mp_obj_task_t *t1 = (mp_obj_task_t *)n1;
     mp_obj_task_t *t2 = (mp_obj_task_t *)n2;
     return MP_OBJ_SMALL_INT_VALUE(ticks_diff(t1->ph_key, t2->ph_key)) < 0;
@@ -84,7 +84,7 @@ STATIC int task_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
 /******************************************************************************/
 // TaskQueue class
 
-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) {
+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 = mp_obj_malloc(mp_obj_task_queue_t, type);
@@ -92,7 +92,7 @@ STATIC mp_obj_t task_queue_make_new(const mp_obj_type_t *type, size_t n_args, si
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t task_queue_peek(mp_obj_t self_in) {
+static mp_obj_t task_queue_peek(mp_obj_t self_in) {
     mp_obj_task_queue_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->heap == NULL) {
         return mp_const_none;
@@ -100,9 +100,9 @@ STATIC mp_obj_t task_queue_peek(mp_obj_t self_in) {
         return MP_OBJ_FROM_PTR(self->heap);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_queue_peek_obj, task_queue_peek);
+static MP_DEFINE_CONST_FUN_OBJ_1(task_queue_peek_obj, task_queue_peek);
 
-STATIC mp_obj_t task_queue_push(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;
@@ -115,9 +115,9 @@ STATIC mp_obj_t task_queue_push(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_obj, 2, 3, task_queue_push);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(task_queue_push_obj, 2, 3, task_queue_push);
 
-STATIC mp_obj_t task_queue_pop(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) {
@@ -126,25 +126,25 @@ STATIC mp_obj_t task_queue_pop(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_obj, task_queue_pop);
+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) {
+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);
     mp_obj_task_t *task = MP_OBJ_TO_PTR(task_in);
     self->heap = (mp_obj_task_t *)mp_pairheap_delete(task_lt, &self->heap->pairheap, &task->pairheap);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(task_queue_remove_obj, task_queue_remove);
+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[] = {
+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), 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);
+static MP_DEFINE_CONST_DICT(task_queue_locals_dict, task_queue_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     task_queue_type,
     MP_QSTR_TaskQueue,
     MP_TYPE_FLAG_NONE,
@@ -156,9 +156,9 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 // Task class
 
 // This is the core asyncio context with cur_task, _task_queue and CancelledError.
-STATIC mp_obj_t asyncio_context = MP_OBJ_NULL;
+static mp_obj_t asyncio_context = MP_OBJ_NULL;
 
-STATIC mp_obj_t task_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 task_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_obj_task_t *self = m_new_obj(mp_obj_task_t);
     self->pairheap.base.type = type;
@@ -173,13 +173,13 @@ 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) {
+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_DEFINE_CONST_FUN_OBJ_1(task_done_obj, task_done);
 
-STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
+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 (TASK_IS_DONE(self)) {
@@ -222,9 +222,9 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
 
     return mp_const_true;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_cancel_obj, task_cancel);
+static MP_DEFINE_CONST_FUN_OBJ_1(task_cancel_obj, task_cancel);
 
-STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+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) {
         // Load
@@ -255,7 +255,7 @@ 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) {
+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 (TASK_IS_DONE(self)) {
@@ -271,7 +271,7 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     return self_in;
 }
 
-STATIC mp_obj_t task_iternext(mp_obj_t 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 (TASK_IS_DONE(self)) {
         // Task finished, raise return value to caller so it can continue.
@@ -287,12 +287,12 @@ 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 = {
+static const mp_getiter_iternext_custom_t task_getiter_iternext = {
     .getiter = task_getiter,
     .iternext = task_iternext,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     task_type,
     MP_QSTR_Task,
     MP_TYPE_FLAG_ITER_IS_CUSTOM,
@@ -304,12 +304,12 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // C-level asyncio module
 
-STATIC const mp_rom_map_elem_t mp_module_asyncio_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_asyncio_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__asyncio) },
     { MP_ROM_QSTR(MP_QSTR_TaskQueue), MP_ROM_PTR(&task_queue_type) },
     { MP_ROM_QSTR(MP_QSTR_Task), MP_ROM_PTR(&task_type) },
 };
-STATIC MP_DEFINE_CONST_DICT(mp_module_asyncio_globals, mp_module_asyncio_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_asyncio_globals, mp_module_asyncio_globals_table);
 
 const mp_obj_module_t mp_module_asyncio = {
     .base = { &mp_type_module },
diff --git a/extmod/modbinascii.c b/extmod/modbinascii.c
index ed39960180ae3..786226ebc07ae 100644
--- a/extmod/modbinascii.c
+++ b/extmod/modbinascii.c
@@ -35,15 +35,15 @@
 #if MICROPY_PY_BINASCII
 
 #if MICROPY_PY_BUILTINS_BYTES_HEX
-STATIC mp_obj_t bytes_hex_as_bytes(size_t n_args, const mp_obj_t *args) {
+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(bytes_hex_as_bytes_obj, 1, 2, bytes_hex_as_bytes);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_hex_as_bytes_obj, 1, 2, bytes_hex_as_bytes);
 
-STATIC mp_obj_t bytes_fromhex_bytes(mp_obj_t data) {
+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(bytes_fromhex_obj, bytes_fromhex_bytes);
+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
@@ -65,7 +65,7 @@ static int mod_binascii_sextet(byte ch) {
     }
 }
 
-STATIC mp_obj_t mod_binascii_a2b_base64(mp_obj_t data) {
+static mp_obj_t mod_binascii_a2b_base64(mp_obj_t data) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
     byte *in = bufinfo.buf;
@@ -106,9 +106,9 @@ STATIC mp_obj_t mod_binascii_a2b_base64(mp_obj_t data) {
 
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_a2b_base64_obj, mod_binascii_a2b_base64);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_a2b_base64_obj, mod_binascii_a2b_base64);
 
-STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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} },
@@ -168,22 +168,22 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
     }
     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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
 
 #if MICROPY_PY_BINASCII_CRC32 && MICROPY_PY_DEFLATE
 #include "lib/uzlib/uzlib.h"
 
-STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
     uint32_t crc = (n_args > 1) ? mp_obj_get_int_truncated(args[1]) : 0;
     crc = uzlib_crc32(bufinfo.buf, bufinfo.len, crc ^ 0xffffffff);
     return mp_obj_new_int_from_uint(crc ^ 0xffffffff);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj, 1, 2, mod_binascii_crc32);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj, 1, 2, mod_binascii_crc32);
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_binascii) },
     #if MICROPY_PY_BUILTINS_BYTES_HEX
     { MP_ROM_QSTR(MP_QSTR_hexlify), MP_ROM_PTR(&bytes_hex_as_bytes_obj) },
@@ -196,7 +196,7 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globals_table);
 
 const mp_obj_module_t mp_module_binascii = {
     .base = { &mp_type_module },
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 91e4e622132d5..7049c35dfdf56 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -81,10 +81,10 @@ typedef struct {
     #endif
 } mp_obj_bluetooth_ble_t;
 
-STATIC const mp_obj_type_t mp_type_bluetooth_ble;
+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) {
+static mp_obj_t bluetooth_handle_errno(int err) {
     if (err != 0) {
         mp_raise_OSError(err);
     }
@@ -95,7 +95,7 @@ STATIC mp_obj_t bluetooth_handle_errno(int err) {
 // UUID object
 // ----------------------------------------------------------------------------
 
-STATIC mp_obj_t bluetooth_uuid_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 bluetooth_uuid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     (void)type;
 
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
@@ -151,7 +151,7 @@ STATIC mp_obj_t bluetooth_uuid_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t bluetooth_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t bluetooth_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_bluetooth_uuid_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_HASH: {
@@ -163,7 +163,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) {
+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, &mp_type_bluetooth_uuid)) {
         return MP_OBJ_NULL;
     }
@@ -187,7 +187,7 @@ STATIC mp_obj_t bluetooth_uuid_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_
     }
 }
 
-STATIC void bluetooth_uuid_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void bluetooth_uuid_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
 
     mp_obj_bluetooth_uuid_t *self = MP_OBJ_TO_PTR(self_in);
@@ -204,7 +204,7 @@ STATIC void bluetooth_uuid_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     mp_printf(print, ")");
 }
 
-STATIC mp_int_t bluetooth_uuid_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+static mp_int_t bluetooth_uuid_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     mp_obj_bluetooth_uuid_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (flags != MP_BUFFER_READ) {
@@ -220,7 +220,7 @@ STATIC mp_int_t bluetooth_uuid_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bu
 #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) {
+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);
     for (int i = 0; i < uuid->type; ++i) {
@@ -230,7 +230,7 @@ STATIC void ringbuf_put_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid)
 #endif
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-STATIC void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) {
+static void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) {
     assert(ringbuf_avail(ringbuf) >= 1);
     uuid->type = ringbuf_get(ringbuf);
     assert(ringbuf_avail(ringbuf) >= uuid->type);
@@ -257,7 +257,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 // Bluetooth object: General
 // ----------------------------------------------------------------------------
 
-STATIC mp_obj_t bluetooth_ble_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 bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     (void)type;
     (void)n_args;
     (void)n_kw;
@@ -287,7 +287,7 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_STATE_VM(bluetooth);
 }
 
-STATIC mp_obj_t bluetooth_ble_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t bluetooth_ble_active(size_t n_args, const mp_obj_t *args) {
     if (n_args == 2) {
         // Boolean enable/disable argument supplied, set current state.
         if (mp_obj_is_true(args[1])) {
@@ -300,9 +300,9 @@ STATIC mp_obj_t bluetooth_ble_active(size_t n_args, const mp_obj_t *args) {
     // Return current state.
     return mp_obj_new_bool(mp_bluetooth_is_active());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_active_obj, 1, 2, bluetooth_ble_active);
+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) {
+static mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     if (kwargs->used == 0) {
         // Get config value
         if (n_args != 2) {
@@ -426,9 +426,9 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_config_obj, 1, bluetooth_ble_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_config_obj, 1, bluetooth_ble_config);
 
-STATIC mp_obj_t bluetooth_ble_irq(mp_obj_t self_in, mp_obj_t handler_in) {
+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"));
@@ -442,13 +442,13 @@ STATIC mp_obj_t bluetooth_ble_irq(mp_obj_t self_in, mp_obj_t handler_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_irq_obj, bluetooth_ble_irq);
+static MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_irq_obj, bluetooth_ble_irq);
 
 // ----------------------------------------------------------------------------
 // Bluetooth object: GAP
 // ----------------------------------------------------------------------------
 
-STATIC mp_obj_t bluetooth_ble_gap_advertise(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t bluetooth_ble_gap_advertise(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_interval_us, ARG_adv_data, ARG_resp_data, ARG_connectable };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_interval_us, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(500000)} },
@@ -479,9 +479,9 @@ STATIC mp_obj_t bluetooth_ble_gap_advertise(size_t n_args, const mp_obj_t *pos_a
 
     return bluetooth_handle_errno(mp_bluetooth_gap_advertise_start(connectable, interval_us, adv_bufinfo.buf, adv_bufinfo.len, resp_bufinfo.buf, resp_bufinfo.len));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_gap_advertise_obj, 1, bluetooth_ble_gap_advertise);
+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) {
+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, &mp_type_bluetooth_uuid)) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid service UUID"));
     }
@@ -577,7 +577,7 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
     return mp_bluetooth_gatts_register_service(service_uuid, characteristic_uuids, characteristic_flags, descriptor_uuids, descriptor_flags, num_descriptors, *handles, len);
 }
 
-STATIC mp_obj_t bluetooth_ble_gatts_register_services(mp_obj_t self_in, mp_obj_t services_in) {
+static mp_obj_t bluetooth_ble_gatts_register_services(mp_obj_t self_in, mp_obj_t services_in) {
     (void)self_in;
     mp_obj_t len_in = mp_obj_len(services_in);
     size_t len = mp_obj_get_int(len_in);
@@ -632,10 +632,10 @@ STATIC mp_obj_t bluetooth_ble_gatts_register_services(mp_obj_t self_in, mp_obj_t
 
     return MP_OBJ_FROM_PTR(result);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gatts_register_services_obj, bluetooth_ble_gatts_register_services);
+static MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gatts_register_services_obj, bluetooth_ble_gatts_register_services);
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-STATIC mp_obj_t bluetooth_ble_gap_connect(size_t n_args, const mp_obj_t *args) {
+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();
@@ -665,9 +665,9 @@ 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, 2, 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) {
+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.
     mp_int_t duration_ms = 0;
     mp_int_t interval_us = 1280000;
@@ -691,10 +691,10 @@ STATIC mp_obj_t bluetooth_ble_gap_scan(size_t n_args, const mp_obj_t *args) {
     }
     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, 5, 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) {
+static mp_obj_t bluetooth_ble_gap_disconnect(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);
     int err = mp_bluetooth_gap_disconnect(conn_handle);
@@ -706,39 +706,39 @@ STATIC mp_obj_t bluetooth_ble_gap_disconnect(mp_obj_t self_in, mp_obj_t conn_han
         return bluetooth_handle_errno(err);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gap_disconnect_obj, bluetooth_ble_gap_disconnect);
+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) {
+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);
+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) {
+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);
+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
 
 // ----------------------------------------------------------------------------
 // Bluetooth object: GATTS (Peripheral/Advertiser role)
 // ----------------------------------------------------------------------------
 
-STATIC mp_obj_t bluetooth_ble_gatts_read(mp_obj_t self_in, mp_obj_t value_handle_in) {
+static mp_obj_t bluetooth_ble_gatts_read(mp_obj_t self_in, mp_obj_t value_handle_in) {
     (void)self_in;
     size_t len = 0;
     const uint8_t *buf;
     mp_bluetooth_gatts_read(mp_obj_get_int(value_handle_in), &buf, &len);
     return mp_obj_new_bytes(buf, len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gatts_read_obj, bluetooth_ble_gatts_read);
+static MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gatts_read_obj, bluetooth_ble_gatts_read);
 
-STATIC mp_obj_t bluetooth_ble_gatts_write(size_t n_args, const mp_obj_t *args) {
+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(args[2], &bufinfo, MP_BUFFER_READ);
     bool send_update = false;
@@ -748,9 +748,9 @@ STATIC mp_obj_t bluetooth_ble_gatts_write(size_t n_args, const mp_obj_t *args) {
     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_VAR_BETWEEN(bluetooth_ble_gatts_write_obj, 3, 4, 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_indicate(size_t n_args, const mp_obj_t *args, int gatts_op) {
+static mp_obj_t bluetooth_ble_gatts_notify_indicate(size_t n_args, const mp_obj_t *args, int gatts_op) {
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
     mp_int_t value_handle = mp_obj_get_int(args[2]);
 
@@ -765,23 +765,23 @@ STATIC mp_obj_t bluetooth_ble_gatts_notify_indicate(size_t n_args, const mp_obj_
     return bluetooth_handle_errno(mp_bluetooth_gatts_notify_indicate(conn_handle, value_handle, gatts_op, value, value_len));
 }
 
-STATIC mp_obj_t bluetooth_ble_gatts_notify(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t bluetooth_ble_gatts_notify(size_t n_args, const mp_obj_t *args) {
     return bluetooth_ble_gatts_notify_indicate(n_args, args, MP_BLUETOOTH_GATTS_OP_NOTIFY);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_notify_obj, 3, 4, bluetooth_ble_gatts_notify);
+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(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t bluetooth_ble_gatts_indicate(size_t n_args, const mp_obj_t *args) {
     return bluetooth_ble_gatts_notify_indicate(n_args, args, MP_BLUETOOTH_GATTS_OP_INDICATE);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_indicate_obj, 3, 4, bluetooth_ble_gatts_indicate);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_indicate_obj, 3, 4, bluetooth_ble_gatts_indicate);
 
-STATIC mp_obj_t bluetooth_ble_gatts_set_buffer(size_t n_args, const mp_obj_t *args) {
+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]);
     bool append = n_args >= 4 && mp_obj_is_true(args[3]);
     return bluetooth_handle_errno(mp_bluetooth_gatts_set_buffer(value_handle, len, append));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_set_buffer_obj, 3, 4, bluetooth_ble_gatts_set_buffer);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_set_buffer_obj, 3, 4, bluetooth_ble_gatts_set_buffer);
 
 // ----------------------------------------------------------------------------
 // Bluetooth object: GATTC (Central/Scanner role)
@@ -789,7 +789,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_set_buffer_obj, 3
 
 #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) {
+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 && args[2] != mp_const_none) {
@@ -800,9 +800,9 @@ STATIC mp_obj_t bluetooth_ble_gattc_discover_services(size_t n_args, const mp_ob
     }
     return bluetooth_handle_errno(mp_bluetooth_gattc_discover_primary_services(conn_handle, uuid));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_discover_services_obj, 2, 3, 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) {
+static mp_obj_t bluetooth_ble_gattc_discover_characteristics(size_t n_args, const mp_obj_t *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]);
@@ -815,26 +815,26 @@ STATIC mp_obj_t bluetooth_ble_gattc_discover_characteristics(size_t n_args, cons
     }
     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, 5, 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) {
+static mp_obj_t bluetooth_ble_gattc_discover_descriptors(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_descriptors(conn_handle, start_handle, end_handle));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_discover_descriptors_obj, 4, 4, bluetooth_ble_gattc_discover_descriptors);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_discover_descriptors_obj, 4, 4, bluetooth_ble_gattc_discover_descriptors);
 
-STATIC mp_obj_t bluetooth_ble_gattc_read(mp_obj_t self_in, mp_obj_t conn_handle_in, mp_obj_t value_handle_in) {
+static mp_obj_t bluetooth_ble_gattc_read(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);
     return bluetooth_handle_errno(mp_bluetooth_gattc_read(conn_handle, value_handle));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_gattc_read_obj, bluetooth_ble_gattc_read);
+static MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_gattc_read_obj, bluetooth_ble_gattc_read);
 
-STATIC mp_obj_t bluetooth_ble_gattc_write(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t bluetooth_ble_gattc_write(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]);
     mp_obj_t data = args[3];
@@ -846,44 +846,44 @@ STATIC mp_obj_t bluetooth_ble_gattc_write(size_t n_args, const mp_obj_t *args) {
     }
     return bluetooth_handle_errno(mp_bluetooth_gattc_write(conn_handle, value_handle, bufinfo.buf, bufinfo.len, mode));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_write_obj, 4, 5, bluetooth_ble_gattc_write);
+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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gattc_exchange_mtu_obj, bluetooth_ble_gattc_exchange_mtu);
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #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) {
+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 = 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);
+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) {
+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 = 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);
+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) {
+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_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) {
+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;
@@ -893,9 +893,9 @@ STATIC mp_obj_t bluetooth_ble_l2cap_send(size_t n_args, const mp_obj_t *args) {
     // 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_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) {
+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};
@@ -905,13 +905,13 @@ STATIC mp_obj_t bluetooth_ble_l2cap_recvinto(size_t n_args, const mp_obj_t *args
     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);
+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
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
 
-STATIC mp_obj_t bluetooth_ble_hci_cmd(size_t n_args, const mp_obj_t *args) {
+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};
@@ -922,7 +922,7 @@ STATIC mp_obj_t bluetooth_ble_hci_cmd(size_t n_args, const mp_obj_t *args) {
     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);
+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
 
@@ -930,7 +930,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_hci_cmd_obj, 5, 5, blue
 // Bluetooth object: Definition
 // ----------------------------------------------------------------------------
 
-STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
+static const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     // General
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&bluetooth_ble_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&bluetooth_ble_config_obj) },
@@ -973,9 +973,9 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(bluetooth_ble_locals_dict, bluetooth_ble_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bluetooth_ble,
     MP_QSTR_BLE,
     MP_TYPE_FLAG_NONE,
@@ -983,7 +983,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &bluetooth_ble_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bluetooth) },
     { 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) },
@@ -996,7 +996,7 @@ STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_FLAG_WRITE_NO_RESPONSE), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_NO_RESPONSE) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_bluetooth_globals, mp_module_bluetooth_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_bluetooth_globals, mp_module_bluetooth_globals_table);
 
 const mp_obj_module_t mp_module_bluetooth = {
     .base = { &mp_type_module },
@@ -1012,7 +1012,7 @@ MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_bluetooth, mp_module_bluetooth);
 // Helpers
 
 #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) {
+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;
 
@@ -1053,7 +1053,7 @@ STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size
     data_tuple->len = j;
 }
 
-STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
+static mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
     (void)none_in;
     // This is always executing in schedule context.
 
@@ -1129,7 +1129,7 @@ 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);
+static MP_DEFINE_CONST_FUN_OBJ_1(bluetooth_ble_invoke_irq_obj, bluetooth_ble_invoke_irq);
 #endif // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
 // ----------------------------------------------------------------------------
@@ -1138,7 +1138,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_run(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,
@@ -1220,7 +1220,7 @@ 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,
+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,
@@ -1258,7 +1258,7 @@ STATIC mp_obj_t invoke_irq_handler_run_protected(uint16_t event,
 #error not supported
 #endif
 
-STATIC mp_obj_t invoke_irq_handler(uint16_t event,
+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,
@@ -1292,7 +1292,7 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
 // 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,
+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,
@@ -1455,7 +1455,7 @@ void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle
 // 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, uint8_t event) {
+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;
     }
@@ -1489,7 +1489,7 @@ STATIC bool enqueue_irq(mp_obj_bluetooth_ble_t *o, size_t len, uint8_t event) {
 }
 
 // Must hold the atomic section before calling this (MICROPY_PY_BLUETOOTH_ENTER).
-STATIC void schedule_ringbuf(mp_uint_t atomic_state) {
+static void schedule_ringbuf(mp_uint_t atomic_state) {
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     if (!o->irq_scheduled) {
         o->irq_scheduled = true;
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 630a2705231e2..6a087c8e256cc 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -498,11 +498,11 @@ typedef struct {
 
 typedef mp_map_t *mp_gatts_db_t;
 
-STATIC inline void mp_bluetooth_gatts_db_create(mp_gatts_db_t *db) {
+static inline void mp_bluetooth_gatts_db_create(mp_gatts_db_t *db) {
     *db = m_new(mp_map_t, 1);
 }
 
-STATIC inline void mp_bluetooth_gatts_db_reset(mp_gatts_db_t db) {
+static inline void mp_bluetooth_gatts_db_reset(mp_gatts_db_t db) {
     mp_map_init(db, 0);
 }
 
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 9b2d184a1ee79..f8c38e0ad4306 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -77,7 +77,7 @@ typedef struct _mp_obj_btree_t {
 } mp_obj_btree_t;
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_obj_type_t btree_type;
+static const mp_obj_type_t btree_type;
 #endif
 
 #define CHECK_ERROR(res) \
@@ -89,7 +89,7 @@ void __dbpanic(DB *db) {
     mp_printf(&mp_plat_print, "__dbpanic(%p)\n", db);
 }
 
-STATIC mp_obj_btree_t *btree_new(DB *db, mp_obj_t stream) {
+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, (mp_obj_type_t *)&btree_type);
     o->stream = stream;
     o->db = db;
@@ -99,32 +99,32 @@ 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) {
+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) {
+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);
     mp_printf(print, "<btree %p>", self->db);
 }
 
-STATIC mp_obj_t btree_flush(mp_obj_t self_in) {
+static mp_obj_t btree_flush(mp_obj_t self_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(__bt_sync(self->db, 0));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(btree_flush_obj, btree_flush);
+static MP_DEFINE_CONST_FUN_OBJ_1(btree_flush_obj, btree_flush);
 
-STATIC mp_obj_t btree_close(mp_obj_t self_in) {
+static mp_obj_t btree_close(mp_obj_t self_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(__bt_close(self->db));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(btree_close_obj, btree_close);
+static MP_DEFINE_CONST_FUN_OBJ_1(btree_close_obj, btree_close);
 
-STATIC mp_obj_t btree_put(size_t n_args, const mp_obj_t *args) {
+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;
@@ -132,9 +132,9 @@ STATIC mp_obj_t btree_put(size_t n_args, const mp_obj_t *args) {
     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);
+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) {
+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;
     buf_to_dbt(args[1], &key);
@@ -149,9 +149,9 @@ STATIC mp_obj_t btree_get(size_t n_args, const mp_obj_t *args) {
     CHECK_ERROR(res);
     return mp_obj_new_bytes(val.data, val.size);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_get_obj, 2, 3, btree_get);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_get_obj, 2, 3, btree_get);
 
-STATIC mp_obj_t btree_seq(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t btree_seq(size_t n_args, const mp_obj_t *args) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
     int flags = MP_OBJ_SMALL_INT_VALUE(args[1]);
     DBT key, val;
@@ -171,9 +171,9 @@ STATIC mp_obj_t btree_seq(size_t n_args, const mp_obj_t *args) {
     pair->items[1] = mp_obj_new_bytes(val.data, val.size);
     return pair_o;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_seq_obj, 2, 4, btree_seq);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_seq_obj, 2, 4, btree_seq);
 
-STATIC mp_obj_t btree_init_iter(size_t n_args, const mp_obj_t *args, byte type) {
+static mp_obj_t btree_init_iter(size_t n_args, const mp_obj_t *args, byte type) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
     self->next_flags = type;
     self->start_key = mp_const_none;
@@ -190,22 +190,22 @@ STATIC mp_obj_t btree_init_iter(size_t n_args, const mp_obj_t *args, byte type)
     return args[0];
 }
 
-STATIC mp_obj_t btree_keys(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t btree_keys(size_t n_args, const mp_obj_t *args) {
     return btree_init_iter(n_args, args, FLAG_ITER_KEYS);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_keys_obj, 1, 4, btree_keys);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_keys_obj, 1, 4, btree_keys);
 
-STATIC mp_obj_t btree_values(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t btree_values(size_t n_args, const mp_obj_t *args) {
     return btree_init_iter(n_args, args, FLAG_ITER_VALUES);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_values_obj, 1, 4, btree_values);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_values_obj, 1, 4, btree_values);
 
-STATIC mp_obj_t btree_items(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t btree_items(size_t n_args, const mp_obj_t *args) {
     return btree_init_iter(n_args, args, FLAG_ITER_ITEMS);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_items_obj, 1, 4, btree_items);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_items_obj, 1, 4, btree_items);
 
-STATIC mp_obj_t btree_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t btree_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     (void)iter_buf;
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->next_flags != 0) {
@@ -223,7 +223,7 @@ STATIC mp_obj_t btree_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     return self_in;
 }
 
-STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
+static mp_obj_t btree_iternext(mp_obj_t self_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
     DBT key, val;
     int res;
@@ -279,7 +279,7 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
     if (value == MP_OBJ_NULL) {
         // delete
@@ -312,7 +312,7 @@ STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     }
 }
 
-STATIC mp_obj_t btree_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t btree_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(lhs_in);
     switch (op) {
         case MP_BINARY_OP_CONTAINS: {
@@ -329,7 +329,7 @@ STATIC mp_obj_t btree_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
 }
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t btree_locals_dict_table[] = {
+static const mp_rom_map_elem_t btree_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&btree_close_obj) },
     { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&btree_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&btree_get_obj) },
@@ -340,14 +340,14 @@ STATIC const mp_rom_map_elem_t btree_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_items), MP_ROM_PTR(&btree_items_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(btree_locals_dict, 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 = {
+static const mp_getiter_iternext_custom_t btree_getiter_iternext = {
     .getiter = btree_getiter,
     .iternext = btree_iternext,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     btree_type,
     MP_QSTR_btree,
     MP_TYPE_FLAG_ITER_IS_CUSTOM,
@@ -360,7 +360,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
-STATIC const FILEVTABLE btree_stream_fvtable = {
+static const FILEVTABLE btree_stream_fvtable = {
     mp_stream_posix_read,
     mp_stream_posix_write,
     mp_stream_posix_lseek,
@@ -368,7 +368,7 @@ STATIC const FILEVTABLE btree_stream_fvtable = {
 };
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC mp_obj_t mod_btree_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t mod_btree_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_flags, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_cachesize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -399,16 +399,16 @@ STATIC mp_obj_t mod_btree_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t
     }
     return MP_OBJ_FROM_PTR(btree_new(db, pos_args[0]));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_btree_open_obj, 1, mod_btree_open);
+static MP_DEFINE_CONST_FUN_OBJ_KW(mod_btree_open_obj, 1, mod_btree_open);
 
-STATIC const mp_rom_map_elem_t mp_module_btree_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_btree_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_btree) },
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mod_btree_open_obj) },
     { MP_ROM_QSTR(MP_QSTR_INCL), MP_ROM_INT(FLAG_END_KEY_INCL) },
     { MP_ROM_QSTR(MP_QSTR_DESC), MP_ROM_INT(FLAG_DESC) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_btree_globals, mp_module_btree_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_btree_globals, mp_module_btree_globals_table);
 
 const mp_obj_module_t mp_module_btree = {
     .base = { &mp_type_module },
diff --git a/extmod/modcryptolib.c b/extmod/modcryptolib.c
index 66511b0f75ee4..bf72f4f4686c7 100644
--- a/extmod/modcryptolib.c
+++ b/extmod/modcryptolib.c
@@ -103,18 +103,18 @@ static inline struct ctr_params *ctr_params_from_aes(mp_obj_aes_t *o) {
 }
 
 #if MICROPY_SSL_AXTLS
-STATIC void aes_initial_set_key_impl(AES_CTX_IMPL *ctx, const uint8_t *key, size_t keysize, const uint8_t iv[16]) {
+static void aes_initial_set_key_impl(AES_CTX_IMPL *ctx, const uint8_t *key, size_t keysize, const uint8_t iv[16]) {
     assert(16 == keysize || 32 == keysize);
     AES_set_key(ctx, key, iv, (16 == keysize) ? AES_MODE_128 : AES_MODE_256);
 }
 
-STATIC void aes_final_set_key_impl(AES_CTX_IMPL *ctx, bool encrypt) {
+static void aes_final_set_key_impl(AES_CTX_IMPL *ctx, bool encrypt) {
     if (!encrypt) {
         AES_convert_key(ctx);
     }
 }
 
-STATIC void aes_process_ecb_impl(AES_CTX_IMPL *ctx, const uint8_t in[16], uint8_t out[16], bool encrypt) {
+static void aes_process_ecb_impl(AES_CTX_IMPL *ctx, const uint8_t in[16], uint8_t out[16], bool encrypt) {
     memcpy(out, in, 16);
     // We assume that out (vstr.buf or given output buffer) is uint32_t aligned
     uint32_t *p = (uint32_t *)out;
@@ -132,7 +132,7 @@ STATIC void aes_process_ecb_impl(AES_CTX_IMPL *ctx, const uint8_t in[16], uint8_
     }
 }
 
-STATIC void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, bool encrypt) {
+static void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, bool encrypt) {
     if (encrypt) {
         AES_cbc_encrypt(ctx, in, out, in_len);
     } else {
@@ -142,7 +142,7 @@ STATIC void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *
 
 #if MICROPY_PY_CRYPTOLIB_CTR
 // axTLS doesn't have CTR support out of the box. This implements the counter part using the ECB primitive.
-STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) {
+static void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) {
     size_t n = ctr_params->offset;
     uint8_t *const counter = ctx->iv;
 
@@ -169,7 +169,7 @@ STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *
 #endif
 
 #if MICROPY_SSL_MBEDTLS
-STATIC void aes_initial_set_key_impl(AES_CTX_IMPL *ctx, const uint8_t *key, size_t keysize, const uint8_t iv[16]) {
+static void aes_initial_set_key_impl(AES_CTX_IMPL *ctx, const uint8_t *key, size_t keysize, const uint8_t iv[16]) {
     ctx->u.init_data.keysize = keysize;
     memcpy(ctx->u.init_data.key, key, keysize);
 
@@ -178,7 +178,7 @@ STATIC void aes_initial_set_key_impl(AES_CTX_IMPL *ctx, const uint8_t *key, size
     }
 }
 
-STATIC void aes_final_set_key_impl(AES_CTX_IMPL *ctx, bool encrypt) {
+static void aes_final_set_key_impl(AES_CTX_IMPL *ctx, bool encrypt) {
     // first, copy key aside
     uint8_t key[32];
     uint8_t keysize = ctx->u.init_data.keysize;
@@ -195,23 +195,23 @@ STATIC void aes_final_set_key_impl(AES_CTX_IMPL *ctx, bool encrypt) {
     }
 }
 
-STATIC void aes_process_ecb_impl(AES_CTX_IMPL *ctx, const uint8_t in[16], uint8_t out[16], bool encrypt) {
+static void aes_process_ecb_impl(AES_CTX_IMPL *ctx, const uint8_t in[16], uint8_t out[16], bool encrypt) {
     mbedtls_aes_crypt_ecb(&ctx->u.mbedtls_ctx, encrypt ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT, in, out);
 }
 
-STATIC void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, bool encrypt) {
+static void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, bool encrypt) {
     mbedtls_aes_crypt_cbc(&ctx->u.mbedtls_ctx, encrypt ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT, in_len, ctx->iv, in, out);
 }
 
 #if MICROPY_PY_CRYPTOLIB_CTR
-STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) {
+static void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) {
     mbedtls_aes_crypt_ctr(&ctx->u.mbedtls_ctx, in_len, &ctr_params->offset, ctx->iv, ctr_params->encrypted_counter, in, out);
 }
 #endif
 
 #endif
 
-STATIC mp_obj_t cryptolib_aes_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 cryptolib_aes_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);
 
     const mp_int_t block_mode = mp_obj_get_int(args[1]);
@@ -260,7 +260,7 @@ STATIC mp_obj_t cryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
+static mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
     mp_obj_aes_t *self = MP_OBJ_TO_PTR(args[0]);
 
     mp_obj_t in_buf = args[1];
@@ -332,23 +332,23 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
 
-STATIC mp_obj_t cryptolib_aes_encrypt(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t cryptolib_aes_encrypt(size_t n_args, const mp_obj_t *args) {
     return aes_process(n_args, args, true);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_encrypt_obj, 2, 3, cryptolib_aes_encrypt);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_encrypt_obj, 2, 3, cryptolib_aes_encrypt);
 
-STATIC mp_obj_t cryptolib_aes_decrypt(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t cryptolib_aes_decrypt(size_t n_args, const mp_obj_t *args) {
     return aes_process(n_args, args, false);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_decrypt_obj, 2, 3, cryptolib_aes_decrypt);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_decrypt_obj, 2, 3, cryptolib_aes_decrypt);
 
-STATIC const mp_rom_map_elem_t cryptolib_aes_locals_dict_table[] = {
+static const mp_rom_map_elem_t cryptolib_aes_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_encrypt), MP_ROM_PTR(&cryptolib_aes_encrypt_obj) },
     { MP_ROM_QSTR(MP_QSTR_decrypt), MP_ROM_PTR(&cryptolib_aes_decrypt_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(cryptolib_aes_locals_dict, cryptolib_aes_locals_dict_table);
+static MP_DEFINE_CONST_DICT(cryptolib_aes_locals_dict, cryptolib_aes_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     cryptolib_aes_type,
     MP_QSTR_aes,
     MP_TYPE_FLAG_NONE,
@@ -356,7 +356,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &cryptolib_aes_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
     { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&cryptolib_aes_type) },
     #if MICROPY_PY_CRYPTOLIB_CONSTS
@@ -368,7 +368,7 @@ STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_cryptolib_globals, mp_module_cryptolib_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_cryptolib_globals, mp_module_cryptolib_globals_table);
 
 const mp_obj_module_t mp_module_cryptolib = {
     .base = { &mp_type_module },
diff --git a/extmod/moddeflate.c b/extmod/moddeflate.c
index 560ee3f0abce9..c0c3bb26a8b12 100644
--- a/extmod/moddeflate.c
+++ b/extmod/moddeflate.c
@@ -85,7 +85,7 @@ typedef struct {
     #endif
 } mp_obj_deflateio_t;
 
-STATIC int deflateio_read_stream(void *data) {
+static int deflateio_read_stream(void *data) {
     mp_obj_deflateio_t *self = data;
     const mp_stream_p_t *stream = mp_get_stream(self->stream);
     int err;
@@ -100,7 +100,7 @@ STATIC int deflateio_read_stream(void *data) {
     return c;
 }
 
-STATIC bool deflateio_init_read(mp_obj_deflateio_t *self) {
+static bool deflateio_init_read(mp_obj_deflateio_t *self) {
     if (self->read) {
         return true;
     }
@@ -151,7 +151,7 @@ STATIC bool deflateio_init_read(mp_obj_deflateio_t *self) {
 }
 
 #if MICROPY_PY_DEFLATE_COMPRESS
-STATIC void deflateio_out_byte(void *data, uint8_t b) {
+static void deflateio_out_byte(void *data, uint8_t b) {
     mp_obj_deflateio_t *self = data;
     const mp_stream_p_t *stream = mp_get_stream(self->stream);
     int err;
@@ -161,7 +161,7 @@ STATIC void deflateio_out_byte(void *data, uint8_t b) {
     }
 }
 
-STATIC bool deflateio_init_write(mp_obj_deflateio_t *self) {
+static bool deflateio_init_write(mp_obj_deflateio_t *self) {
     if (self->write) {
         return true;
     }
@@ -214,7 +214,7 @@ STATIC bool deflateio_init_write(mp_obj_deflateio_t *self) {
 }
 #endif
 
-STATIC mp_obj_t deflateio_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
+static mp_obj_t deflateio_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
     // args: stream, format=NONE, wbits=0, close=False
     mp_arg_check_num(n_args, n_kw, 1, 4, false);
 
@@ -241,7 +241,7 @@ STATIC mp_obj_t deflateio_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_uint_t deflateio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t deflateio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_deflateio_t *self = MP_OBJ_TO_PTR(o_in);
 
     if (self->stream == MP_OBJ_NULL || !deflateio_init_read(self)) {
@@ -268,7 +268,7 @@ STATIC mp_uint_t deflateio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *e
 }
 
 #if MICROPY_PY_DEFLATE_COMPRESS
-STATIC mp_uint_t deflateio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t deflateio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_deflateio_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->stream == MP_OBJ_NULL || !deflateio_init_write(self)) {
@@ -302,7 +302,7 @@ static inline void put_be32(char *buf, uint32_t value) {
 }
 #endif
 
-STATIC mp_uint_t deflateio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t deflateio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     if (request == MP_STREAM_CLOSE) {
         mp_obj_deflateio_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -351,7 +351,7 @@ STATIC mp_uint_t deflateio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t
     }
 }
 
-STATIC const mp_stream_p_t deflateio_stream_p = {
+static const mp_stream_p_t deflateio_stream_p = {
     .read = deflateio_read,
     #if MICROPY_PY_DEFLATE_COMPRESS
     .write = deflateio_write,
@@ -360,7 +360,7 @@ STATIC const mp_stream_p_t deflateio_stream_p = {
 };
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t deflateio_locals_dict_table[] = {
+static const mp_rom_map_elem_t deflateio_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) },
@@ -371,9 +371,9 @@ STATIC const mp_rom_map_elem_t deflateio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(deflateio_locals_dict, deflateio_locals_dict_table);
+static MP_DEFINE_CONST_DICT(deflateio_locals_dict, deflateio_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     deflateio_type,
     MP_QSTR_DeflateIO,
     MP_TYPE_FLAG_NONE,
@@ -382,7 +382,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &deflateio_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_deflate_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_deflate_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_deflate) },
     { MP_ROM_QSTR(MP_QSTR_DeflateIO), MP_ROM_PTR(&deflateio_type) },
     { MP_ROM_QSTR(MP_QSTR_AUTO), MP_ROM_INT(DEFLATEIO_FORMAT_AUTO) },
@@ -390,7 +390,7 @@ STATIC const mp_rom_map_elem_t mp_module_deflate_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ZLIB), MP_ROM_INT(DEFLATEIO_FORMAT_ZLIB) },
     { MP_ROM_QSTR(MP_QSTR_GZIP), MP_ROM_INT(DEFLATEIO_FORMAT_GZIP) },
 };
-STATIC MP_DEFINE_CONST_DICT(mp_module_deflate_globals, mp_module_deflate_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_deflate_globals, mp_module_deflate_globals_table);
 
 const mp_obj_module_t mp_module_deflate = {
     .base = { &mp_type_module },
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 92313bd4bbe83..693e837f786a0 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -43,7 +43,7 @@ typedef struct _mp_obj_framebuf_t {
 } mp_obj_framebuf_t;
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_obj_type_t mp_type_framebuf;
+static const mp_obj_type_t mp_type_framebuf;
 #endif
 
 typedef void (*setpixel_t)(const mp_obj_framebuf_t *, unsigned int, unsigned int, uint32_t);
@@ -67,19 +67,19 @@ typedef struct _mp_framebuf_p_t {
 
 // Functions for MHLSB and MHMSB
 
-STATIC void mono_horiz_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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;
     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, unsigned int x, unsigned 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;
     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, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
+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--) {
@@ -95,17 +95,17 @@ STATIC void mono_horiz_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, un
 
 // Functions for MVLSB format
 
-STATIC void mvlsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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, unsigned int x, unsigned 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, unsigned int x, unsigned int y, unsigned int w, unsigned 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;
@@ -119,15 +119,15 @@ STATIC void mvlsb_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigne
 
 // Functions for RGB565 format
 
-STATIC void rgb565_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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, unsigned int x, unsigned 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, unsigned int x, unsigned int y, unsigned int w, unsigned 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 (unsigned int ww = w; ww; --ww) {
@@ -139,7 +139,7 @@ STATIC void rgb565_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsign
 
 // Functions for GS2_HMSB format
 
-STATIC void gs2_hmsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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;
@@ -147,13 +147,13 @@ STATIC void gs2_hmsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsig
     *pixel = color | (*pixel & (~mask));
 }
 
-STATIC uint32_t gs2_hmsb_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
+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);
@@ -163,7 +163,7 @@ STATIC void gs2_hmsb_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsi
 
 // Functions for GS4_HMSB format
 
-STATIC void gs4_hmsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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) {
@@ -173,7 +173,7 @@ STATIC void gs4_hmsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsig
     }
 }
 
-STATIC uint32_t gs4_hmsb_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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;
     }
@@ -181,7 +181,7 @@ STATIC uint32_t gs4_hmsb_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, u
     return ((uint8_t *)fb->buf)[(x + y * fb->stride) >> 1] >> 4;
 }
 
-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) {
+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;
@@ -214,16 +214,16 @@ STATIC void gs4_hmsb_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsi
 
 // Functions for GS8 format
 
-STATIC void gs8_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned 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, unsigned int x, unsigned 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, unsigned int x, unsigned int y, unsigned int w, unsigned 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);
@@ -231,7 +231,7 @@ STATIC void gs8_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigned
     }
 }
 
-STATIC mp_framebuf_p_t formats[] = {
+static mp_framebuf_p_t formats[] = {
     [FRAMEBUF_MVLSB] = {mvlsb_setpixel, mvlsb_getpixel, mvlsb_fill_rect},
     [FRAMEBUF_RGB565] = {rgb565_setpixel, rgb565_getpixel, rgb565_fill_rect},
     [FRAMEBUF_GS2_HMSB] = {gs2_hmsb_setpixel, gs2_hmsb_getpixel, gs2_hmsb_fill_rect},
@@ -241,21 +241,21 @@ 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 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) {
+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) {
+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);
 }
 
-STATIC void fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
+static void fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
     if (h < 1 || w < 1 || x + w <= 0 || y + h <= 0 || y >= fb->height || x >= fb->width) {
         // No operation needed.
         return;
@@ -270,7 +270,7 @@ 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_in) {
+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_int_t width = mp_obj_get_int(args_in[1]);
@@ -329,35 +329,35 @@ 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) {
+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) {
+static mp_int_t framebuf_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_get_buffer(self->buf_obj, bufinfo, flags) ? 0 : 1;
 }
 
-STATIC mp_obj_t framebuf_fill(mp_obj_t self_in, mp_obj_t col_in) {
+static mp_obj_t framebuf_fill(mp_obj_t self_in, mp_obj_t col_in) {
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t col = mp_obj_get_int(col_in);
     formats[self->format].fill_rect(self, 0, 0, self->width, self->height, col);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(framebuf_fill_obj, framebuf_fill);
+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_in) {
+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_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_in) {
+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]);
@@ -372,9 +372,9 @@ STATIC mp_obj_t framebuf_pixel(size_t n_args, const mp_obj_t *args_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_pixel_obj, 3, 4, framebuf_pixel);
+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_in) {
+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_in[0]);
@@ -385,9 +385,9 @@ STATIC mp_obj_t framebuf_hline(size_t n_args, const mp_obj_t *args_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_hline_obj, 5, 5, framebuf_hline);
+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_in) {
+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_in[0]);
@@ -398,9 +398,9 @@ STATIC mp_obj_t framebuf_vline(size_t n_args, const mp_obj_t *args_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_vline_obj, 5, 5, framebuf_vline);
+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_in) {
+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);
@@ -414,9 +414,9 @@ STATIC mp_obj_t framebuf_rect(size_t n_args, const mp_obj_t *args_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_rect_obj, 6, 7, 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) {
+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) {
@@ -476,7 +476,7 @@ STATIC void line(const mp_obj_framebuf_t *fb, mp_int_t x1, mp_int_t y1, mp_int_t
     }
 }
 
-STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args_in) {
+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]);
@@ -487,7 +487,7 @@ STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_line_obj, 6, 6, framebuf_line);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_line_obj, 6, 6, framebuf_line);
 
 // Q2 Q1
 // Q3 Q4
@@ -498,7 +498,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_line_obj, 6, 6, framebuf_lin
 #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) {
+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);
@@ -520,7 +520,7 @@ STATIC void draw_ellipse_points(const mp_obj_framebuf_t *fb, mp_int_t cx, mp_int
     }
 }
 
-STATIC mp_obj_t framebuf_ellipse(size_t n_args, const mp_obj_t *args_in) {
+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
@@ -575,17 +575,17 @@ STATIC mp_obj_t framebuf_ellipse(size_t n_args, const mp_obj_t *args_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_ellipse_obj, 6, 8, framebuf_ellipse);
+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) {
+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) {
+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]);
@@ -695,10 +695,10 @@ STATIC mp_obj_t framebuf_poly(size_t n_args, const mp_obj_t *args_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_poly_obj, 5, 6, framebuf_poly);
+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) {
+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) {
@@ -751,9 +751,9 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_blit_obj, 4, 6, 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) {
+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);
     mp_int_t xstep = mp_obj_get_int(xstep_in);
     mp_int_t ystep = mp_obj_get_int(ystep_in);
@@ -795,9 +795,9 @@ STATIC mp_obj_t framebuf_scroll(mp_obj_t self_in, mp_obj_t xstep_in, mp_obj_t ys
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(framebuf_scroll_obj, framebuf_scroll);
+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_in) {
+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_in[0]);
     const char *str = mp_obj_str_get_str(args_in[1]);
@@ -833,10 +833,10 @@ STATIC mp_obj_t framebuf_text(size_t n_args, const mp_obj_t *args_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_text_obj, 4, 5, framebuf_text);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_text_obj, 4, 5, framebuf_text);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t framebuf_locals_dict_table[] = {
+static const mp_rom_map_elem_t framebuf_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&framebuf_fill_obj) },
     { MP_ROM_QSTR(MP_QSTR_fill_rect), MP_ROM_PTR(&framebuf_fill_rect_obj) },
     { MP_ROM_QSTR(MP_QSTR_pixel), MP_ROM_PTR(&framebuf_pixel_obj) },
@@ -852,9 +852,9 @@ STATIC const mp_rom_map_elem_t framebuf_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_scroll), MP_ROM_PTR(&framebuf_scroll_obj) },
     { MP_ROM_QSTR(MP_QSTR_text), MP_ROM_PTR(&framebuf_text_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(framebuf_locals_dict, framebuf_locals_dict_table);
+static MP_DEFINE_CONST_DICT(framebuf_locals_dict, framebuf_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_framebuf,
     MP_QSTR_FrameBuffer,
     MP_TYPE_FLAG_NONE,
@@ -867,13 +867,13 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 #if !MICROPY_ENABLE_DYNRUNTIME
 // This factory function is provided for backwards compatibility with the old
 // FrameBuffer1 class which did not support a format argument.
-STATIC mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args_in) {
+static mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args_in) {
     mp_obj_t args[] = {args_in[0], args_in[1], args_in[2], MP_OBJ_NEW_SMALL_INT(FRAMEBUF_MVLSB), n_args >= 4 ? args_in[3] : args_in[1] };
     return framebuf_make_new(&mp_type_framebuf, 5, 0, args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(legacy_framebuffer1_obj, 3, 4, legacy_framebuffer1);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(legacy_framebuffer1_obj, 3, 4, legacy_framebuffer1);
 
-STATIC const mp_rom_map_elem_t framebuf_module_globals_table[] = {
+static const mp_rom_map_elem_t framebuf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_framebuf) },
     { MP_ROM_QSTR(MP_QSTR_FrameBuffer), MP_ROM_PTR(&mp_type_framebuf) },
     { MP_ROM_QSTR(MP_QSTR_FrameBuffer1), MP_ROM_PTR(&legacy_framebuffer1_obj) },
@@ -887,7 +887,7 @@ STATIC const mp_rom_map_elem_t framebuf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MONO_HMSB), MP_ROM_INT(FRAMEBUF_MHMSB) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(framebuf_module_globals, framebuf_module_globals_table);
+static MP_DEFINE_CONST_DICT(framebuf_module_globals, framebuf_module_globals_table);
 
 const mp_obj_module_t mp_module_framebuf = {
     .base = { &mp_type_module },
diff --git a/extmod/modhashlib.c b/extmod/modhashlib.c
index dbebd78667646..4754e44463019 100644
--- a/extmod/modhashlib.c
+++ b/extmod/modhashlib.c
@@ -71,7 +71,7 @@ static void hashlib_ensure_not_final(mp_obj_hash_t *self) {
 }
 
 #if MICROPY_PY_HASHLIB_SHA256
-STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
+static mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_MBEDTLS
 
@@ -81,7 +81,7 @@ STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 #define mbedtls_sha256_finish_ret mbedtls_sha256_finish
 #endif
 
-STATIC mp_obj_t hashlib_sha256_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 hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(mbedtls_sha256_context), type);
     o->final = false;
@@ -93,7 +93,7 @@ STATIC mp_obj_t hashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
@@ -102,7 +102,7 @@ STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
+static mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     self->final = true;
@@ -116,7 +116,7 @@ STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
 
 #include "lib/crypto-algorithms/sha256.c"
 
-STATIC mp_obj_t hashlib_sha256_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 hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(CRYAL_SHA256_CTX), type);
     o->final = false;
@@ -127,7 +127,7 @@ STATIC mp_obj_t hashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
@@ -136,7 +136,7 @@ STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
+static mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     self->final = true;
@@ -147,17 +147,17 @@ STATIC mp_obj_t hashlib_sha256_digest(mp_obj_t self_in) {
 }
 #endif
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_sha256_update_obj, hashlib_sha256_update);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_sha256_digest_obj, hashlib_sha256_digest);
+static MP_DEFINE_CONST_FUN_OBJ_2(hashlib_sha256_update_obj, hashlib_sha256_update);
+static MP_DEFINE_CONST_FUN_OBJ_1(hashlib_sha256_digest_obj, hashlib_sha256_digest);
 
-STATIC const mp_rom_map_elem_t hashlib_sha256_locals_dict_table[] = {
+static const mp_rom_map_elem_t hashlib_sha256_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_sha256_update_obj) },
     { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_sha256_digest_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(hashlib_sha256_locals_dict, hashlib_sha256_locals_dict_table);
+static MP_DEFINE_CONST_DICT(hashlib_sha256_locals_dict, hashlib_sha256_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     hashlib_sha256_type,
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
@@ -167,10 +167,10 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 #endif
 
 #if MICROPY_PY_HASHLIB_SHA1
-STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg);
+static mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_AXTLS
-STATIC mp_obj_t hashlib_sha1_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 hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(SHA1_CTX), type);
     o->final = false;
@@ -181,7 +181,7 @@ STATIC mp_obj_t hashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
@@ -190,7 +190,7 @@ STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
+static mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     self->final = true;
@@ -209,7 +209,7 @@ STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
 #define mbedtls_sha1_finish_ret mbedtls_sha1_finish
 #endif
 
-STATIC mp_obj_t hashlib_sha1_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 hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(mbedtls_sha1_context), type);
     o->final = false;
@@ -221,7 +221,7 @@ STATIC mp_obj_t hashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
@@ -230,7 +230,7 @@ STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
+static mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     self->final = true;
@@ -242,16 +242,16 @@ STATIC mp_obj_t hashlib_sha1_digest(mp_obj_t self_in) {
 }
 #endif
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_sha1_update_obj, hashlib_sha1_update);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_sha1_digest_obj, hashlib_sha1_digest);
+static MP_DEFINE_CONST_FUN_OBJ_2(hashlib_sha1_update_obj, hashlib_sha1_update);
+static MP_DEFINE_CONST_FUN_OBJ_1(hashlib_sha1_digest_obj, hashlib_sha1_digest);
 
-STATIC const mp_rom_map_elem_t hashlib_sha1_locals_dict_table[] = {
+static const mp_rom_map_elem_t hashlib_sha1_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_sha1_update_obj) },
     { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_sha1_digest_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(hashlib_sha1_locals_dict, hashlib_sha1_locals_dict_table);
+static MP_DEFINE_CONST_DICT(hashlib_sha1_locals_dict, hashlib_sha1_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     hashlib_sha1_type,
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
@@ -261,10 +261,10 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 #endif
 
 #if MICROPY_PY_HASHLIB_MD5
-STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg);
+static mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg);
 
 #if MICROPY_SSL_AXTLS
-STATIC mp_obj_t hashlib_md5_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 hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(MD5_CTX), type);
     o->final = false;
@@ -275,7 +275,7 @@ STATIC mp_obj_t hashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args, s
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
@@ -284,7 +284,7 @@ STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
+static mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     self->final = true;
@@ -303,7 +303,7 @@ STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
 #define mbedtls_md5_finish_ret mbedtls_md5_finish
 #endif
 
-STATIC mp_obj_t hashlib_md5_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 hashlib_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 = mp_obj_malloc_var(mp_obj_hash_t, state, char, sizeof(mbedtls_md5_context), type);
     o->final = false;
@@ -315,7 +315,7 @@ STATIC mp_obj_t hashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args, s
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
@@ -324,7 +324,7 @@ STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
+static mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
     hashlib_ensure_not_final(self);
     self->final = true;
@@ -336,16 +336,16 @@ STATIC mp_obj_t hashlib_md5_digest(mp_obj_t self_in) {
 }
 #endif // MICROPY_SSL_MBEDTLS
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_md5_update_obj, hashlib_md5_update);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_md5_digest_obj, hashlib_md5_digest);
+static MP_DEFINE_CONST_FUN_OBJ_2(hashlib_md5_update_obj, hashlib_md5_update);
+static MP_DEFINE_CONST_FUN_OBJ_1(hashlib_md5_digest_obj, hashlib_md5_digest);
 
-STATIC const mp_rom_map_elem_t hashlib_md5_locals_dict_table[] = {
+static const mp_rom_map_elem_t hashlib_md5_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_md5_update_obj) },
     { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_md5_digest_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(hashlib_md5_locals_dict, hashlib_md5_locals_dict_table);
+static MP_DEFINE_CONST_DICT(hashlib_md5_locals_dict, hashlib_md5_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     hashlib_md5_type,
     MP_QSTR_md5,
     MP_TYPE_FLAG_NONE,
@@ -354,7 +354,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif // MICROPY_PY_HASHLIB_MD5
 
-STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) },
     #if MICROPY_PY_HASHLIB_SHA256
     { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&hashlib_sha256_type) },
@@ -367,7 +367,7 @@ STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
 
 const mp_obj_module_t mp_module_hashlib = {
     .base = { &mp_type_module },
diff --git a/extmod/modheapq.c b/extmod/modheapq.c
index db1e35bac2830..bb8c7d2bf175e 100644
--- a/extmod/modheapq.c
+++ b/extmod/modheapq.c
@@ -31,14 +31,14 @@
 
 // the algorithm here is modelled on CPython's heapq.py
 
-STATIC mp_obj_list_t *heapq_get_heap(mp_obj_t heap_in) {
+static mp_obj_list_t *heapq_get_heap(mp_obj_t heap_in) {
     if (!mp_obj_is_type(heap_in, &mp_type_list)) {
         mp_raise_TypeError(MP_ERROR_TEXT("heap must be a list"));
     }
     return MP_OBJ_TO_PTR(heap_in);
 }
 
-STATIC void heapq_heap_siftdown(mp_obj_list_t *heap, mp_uint_t start_pos, mp_uint_t pos) {
+static void heapq_heap_siftdown(mp_obj_list_t *heap, mp_uint_t start_pos, mp_uint_t pos) {
     mp_obj_t item = heap->items[pos];
     while (pos > start_pos) {
         mp_uint_t parent_pos = (pos - 1) >> 1;
@@ -53,7 +53,7 @@ STATIC void heapq_heap_siftdown(mp_obj_list_t *heap, mp_uint_t start_pos, mp_uin
     heap->items[pos] = item;
 }
 
-STATIC void heapq_heap_siftup(mp_obj_list_t *heap, mp_uint_t pos) {
+static void heapq_heap_siftup(mp_obj_list_t *heap, mp_uint_t pos) {
     mp_uint_t start_pos = pos;
     mp_uint_t end_pos = heap->len;
     mp_obj_t item = heap->items[pos];
@@ -70,15 +70,15 @@ STATIC void heapq_heap_siftup(mp_obj_list_t *heap, mp_uint_t pos) {
     heapq_heap_siftdown(heap, start_pos, pos);
 }
 
-STATIC mp_obj_t mod_heapq_heappush(mp_obj_t heap_in, mp_obj_t item) {
+static mp_obj_t mod_heapq_heappush(mp_obj_t heap_in, mp_obj_t item) {
     mp_obj_list_t *heap = heapq_get_heap(heap_in);
     mp_obj_list_append(heap_in, item);
     heapq_heap_siftdown(heap, 0, heap->len - 1);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_heapq_heappush_obj, mod_heapq_heappush);
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_heapq_heappush_obj, mod_heapq_heappush);
 
-STATIC mp_obj_t mod_heapq_heappop(mp_obj_t heap_in) {
+static mp_obj_t mod_heapq_heappop(mp_obj_t heap_in) {
     mp_obj_list_t *heap = heapq_get_heap(heap_in);
     if (heap->len == 0) {
         mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty heap"));
@@ -92,26 +92,26 @@ STATIC mp_obj_t mod_heapq_heappop(mp_obj_t heap_in) {
     }
     return item;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_heapq_heappop_obj, mod_heapq_heappop);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_heapq_heappop_obj, mod_heapq_heappop);
 
-STATIC mp_obj_t mod_heapq_heapify(mp_obj_t heap_in) {
+static mp_obj_t mod_heapq_heapify(mp_obj_t heap_in) {
     mp_obj_list_t *heap = heapq_get_heap(heap_in);
     for (mp_uint_t i = heap->len / 2; i > 0;) {
         heapq_heap_siftup(heap, --i);
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_heapq_heapify_obj, mod_heapq_heapify);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_heapq_heapify_obj, mod_heapq_heapify);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_heapq_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_heapq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_heapq) },
     { MP_ROM_QSTR(MP_QSTR_heappush), MP_ROM_PTR(&mod_heapq_heappush_obj) },
     { MP_ROM_QSTR(MP_QSTR_heappop), MP_ROM_PTR(&mod_heapq_heappop_obj) },
     { MP_ROM_QSTR(MP_QSTR_heapify), MP_ROM_PTR(&mod_heapq_heapify_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_heapq_globals, mp_module_heapq_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_heapq_globals, mp_module_heapq_globals_table);
 
 const mp_obj_module_t mp_module_heapq = {
     .base = { &mp_type_module },
diff --git a/extmod/modjson.c b/extmod/modjson.c
index 1772b7299886e..e655a02bc00ef 100644
--- a/extmod/modjson.c
+++ b/extmod/modjson.c
@@ -41,7 +41,7 @@ enum {
     DUMP_MODE_TO_STREAM = 2,
 };
 
-STATIC mp_obj_t mod_json_dump_helper(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, unsigned int mode) {
+static mp_obj_t mod_json_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} },
@@ -78,34 +78,34 @@ STATIC mp_obj_t mod_json_dump_helper(size_t n_args, const mp_obj_t *pos_args, mp
     }
 }
 
-STATIC mp_obj_t mod_json_dump(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t mod_json_dump(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     return mod_json_dump_helper(n_args, pos_args, kw_args, DUMP_MODE_TO_STREAM);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_json_dump_obj, 2, mod_json_dump);
+static MP_DEFINE_CONST_FUN_OBJ_KW(mod_json_dump_obj, 2, mod_json_dump);
 
-STATIC mp_obj_t mod_json_dumps(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t mod_json_dumps(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     return mod_json_dump_helper(n_args, pos_args, kw_args, DUMP_MODE_TO_STRING);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_json_dumps_obj, 1, mod_json_dumps);
+static MP_DEFINE_CONST_FUN_OBJ_KW(mod_json_dumps_obj, 1, mod_json_dumps);
 
 #else
 
-STATIC mp_obj_t mod_json_dump(mp_obj_t obj, mp_obj_t stream) {
+static mp_obj_t mod_json_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};
     mp_obj_print_helper(&print, obj, PRINT_JSON);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_json_dump_obj, mod_json_dump);
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_json_dump_obj, mod_json_dump);
 
-STATIC mp_obj_t mod_json_dumps(mp_obj_t obj) {
+static mp_obj_t mod_json_dumps(mp_obj_t obj) {
     vstr_t vstr;
     mp_print_t print;
     vstr_init_print(&vstr, 8, &print);
     mp_obj_print_helper(&print, obj, PRINT_JSON);
     return mp_obj_new_str_from_utf8_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_dumps_obj, mod_json_dumps);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_json_dumps_obj, mod_json_dumps);
 
 #endif
 
@@ -134,7 +134,7 @@ typedef struct _json_stream_t {
 #define S_CUR(s) ((s).cur)
 #define S_NEXT(s) (json_stream_next(&(s)))
 
-STATIC byte json_stream_next(json_stream_t *s) {
+static byte json_stream_next(json_stream_t *s) {
     mp_uint_t ret = s->read(s->stream_obj, &s->cur, 1, &s->errcode);
     if (s->errcode != 0) {
         mp_raise_OSError(s->errcode);
@@ -145,7 +145,7 @@ STATIC byte json_stream_next(json_stream_t *s) {
     return s->cur;
 }
 
-STATIC mp_obj_t mod_json_load(mp_obj_t stream_obj) {
+static mp_obj_t mod_json_load(mp_obj_t stream_obj) {
     const mp_stream_p_t *stream_p = mp_get_stream_raise(stream_obj, MP_STREAM_OP_READ);
     json_stream_t s = {stream_obj, stream_p->read, 0, 0};
     vstr_t vstr;
@@ -355,18 +355,18 @@ STATIC mp_obj_t mod_json_load(mp_obj_t stream_obj) {
 fail:
     mp_raise_ValueError(MP_ERROR_TEXT("syntax error in JSON"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_load_obj, mod_json_load);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_json_load_obj, mod_json_load);
 
-STATIC mp_obj_t mod_json_loads(mp_obj_t obj) {
+static mp_obj_t mod_json_loads(mp_obj_t obj) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);
     vstr_t vstr = {bufinfo.len, bufinfo.len, (char *)bufinfo.buf, true};
     mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL};
     return mod_json_load(MP_OBJ_FROM_PTR(&sio));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_loads_obj, mod_json_loads);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_json_loads_obj, mod_json_loads);
 
-STATIC const mp_rom_map_elem_t mp_module_json_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_json_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_json) },
     { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_json_dump_obj) },
     { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_json_dumps_obj) },
@@ -374,7 +374,7 @@ STATIC const mp_rom_map_elem_t mp_module_json_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_loads), MP_ROM_PTR(&mod_json_loads_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_json_globals, mp_module_json_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_json_globals, mp_module_json_globals_table);
 
 const mp_obj_module_t mp_module_json = {
     .base = { &mp_type_module },
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index f1242b046186f..607143bb7e4c6 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -99,17 +99,17 @@ typedef struct _lwip_slip_obj_t {
 } lwip_slip_obj_t;
 
 // Slip object is unique for now. Possibly can fix this later. FIXME
-STATIC lwip_slip_obj_t lwip_slip_obj;
+static lwip_slip_obj_t lwip_slip_obj;
 
 // Declare these early.
 void mod_lwip_register_poll(void (*poll)(void *arg), void *poll_arg);
 void mod_lwip_deregister_poll(void (*poll)(void *arg), void *poll_arg);
 
-STATIC void slip_lwip_poll(void *netif) {
+static void slip_lwip_poll(void *netif) {
     slipif_poll((struct netif *)netif);
 }
 
-STATIC const mp_obj_type_t lwip_slip_type;
+static const mp_obj_type_t lwip_slip_type;
 
 // lwIP SLIP callback functions
 sio_fd_t sio_open(u8_t dvnum) {
@@ -138,7 +138,7 @@ u32_t sio_tryread(sio_fd_t fd, u8_t *data, u32_t len) {
 }
 
 // constructor lwip.slip(device=integer, iplocal=string, ipremote=string)
-STATIC mp_obj_t lwip_slip_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t lwip_slip_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
 
     lwip_slip_obj.base.type = &lwip_slip_type;
@@ -164,20 +164,20 @@ STATIC mp_obj_t lwip_slip_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw,
     return (mp_obj_t)&lwip_slip_obj;
 }
 
-STATIC mp_obj_t lwip_slip_status(mp_obj_t self_in) {
+static mp_obj_t lwip_slip_status(mp_obj_t self_in) {
     // Null function for now.
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(lwip_slip_status_obj, lwip_slip_status);
+static MP_DEFINE_CONST_FUN_OBJ_1(lwip_slip_status_obj, lwip_slip_status);
 
-STATIC const mp_rom_map_elem_t lwip_slip_locals_dict_table[] = {
+static const mp_rom_map_elem_t lwip_slip_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&lwip_slip_status_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(lwip_slip_locals_dict, lwip_slip_locals_dict_table);
+static MP_DEFINE_CONST_DICT(lwip_slip_locals_dict, lwip_slip_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     lwip_slip_type,
     MP_QSTR_slip,
     MP_TYPE_FLAG_NONE,
@@ -321,7 +321,7 @@ static inline void poll_sockets(void) {
     mp_event_wait_ms(1);
 }
 
-STATIC struct tcp_pcb *volatile *lwip_socket_incoming_array(lwip_socket_obj_t *socket) {
+static struct tcp_pcb *volatile *lwip_socket_incoming_array(lwip_socket_obj_t *socket) {
     if (socket->incoming.connection.alloc == 0) {
         return &socket->incoming.connection.tcp.item;
     } else {
@@ -329,7 +329,7 @@ STATIC struct tcp_pcb *volatile *lwip_socket_incoming_array(lwip_socket_obj_t *s
     }
 }
 
-STATIC void lwip_socket_free_incoming(lwip_socket_obj_t *socket) {
+static void lwip_socket_free_incoming(lwip_socket_obj_t *socket) {
     bool socket_is_listener =
         socket->type == MOD_NETWORK_SOCK_STREAM
         && socket->pcb.tcp->state == LISTEN;
@@ -394,9 +394,9 @@ static inline void exec_user_callback(lwip_socket_obj_t *socket) {
 #if MICROPY_PY_LWIP_SOCK_RAW
 // Callback for incoming raw packets.
 #if LWIP_VERSION_MAJOR < 2
-STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *addr)
+static u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *addr)
 #else
-STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr)
+static u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr)
 #endif
 {
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
@@ -414,9 +414,9 @@ STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, c
 // Callback for incoming UDP packets. We simply stash the packet and the source address,
 // in case we need it for recvfrom.
 #if LWIP_VERSION_MAJOR < 2
-STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
+static void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
 #else
-STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
+static void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
 #endif
 {
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
@@ -432,7 +432,7 @@ STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p,
 }
 
 // Callback for general tcp errors.
-STATIC void _lwip_tcp_error(void *arg, err_t err) {
+static void _lwip_tcp_error(void *arg, err_t err) {
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
 
     // Free any incoming buffers or connections that are stored
@@ -444,7 +444,7 @@ STATIC void _lwip_tcp_error(void *arg, err_t err) {
 }
 
 // Callback for tcp connection requests. Error code err is unused. (See tcp.h)
-STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
+static err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
 
     socket->state = STATE_CONNECTED;
@@ -453,7 +453,7 @@ STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
 
 // Handle errors (eg connection aborted) on TCP PCBs that have been put on the
 // accept queue but are not yet actually accepted.
-STATIC void _lwip_tcp_err_unaccepted(void *arg, err_t err) {
+static void _lwip_tcp_err_unaccepted(void *arg, err_t err) {
     struct tcp_pcb *pcb = (struct tcp_pcb *)arg;
 
     // The ->connected entry is repurposed to store the parent socket; this is safe
@@ -493,12 +493,12 @@ STATIC void _lwip_tcp_err_unaccepted(void *arg, err_t err) {
 // so set this handler which requests lwIP to keep pbuf's and deliver
 // them later. We cannot cache pbufs in child socket on Python side,
 // until it is created in accept().
-STATIC err_t _lwip_tcp_recv_unaccepted(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) {
+static err_t _lwip_tcp_recv_unaccepted(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) {
     return ERR_BUF;
 }
 
 // Callback for incoming tcp connections.
-STATIC err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) {
+static err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) {
     // err can be ERR_MEM to notify us that there was no memory for an incoming connection
     if (err != ERR_OK) {
         return ERR_OK;
@@ -535,7 +535,7 @@ STATIC err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) {
 }
 
 // Callback for inbound tcp packets.
-STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err_t err) {
+static err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err_t err) {
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
 
     if (p == NULL) {
@@ -566,7 +566,7 @@ STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err
 // these to do the work.
 
 // Helper function for send/sendto to handle raw/UDP packets.
-STATIC mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, mp_uint_t len, ip_addr_t *ip, mp_uint_t port, int *_errno) {
+static mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, mp_uint_t len, ip_addr_t *ip, mp_uint_t port, int *_errno) {
     if (len > 0xffff) {
         // Any packet that big is probably going to fail the pbuf_alloc anyway, but may as well try
         len = 0xffff;
@@ -621,7 +621,7 @@ STATIC mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, m
 }
 
 // Helper function for recv/recvfrom to handle raw/UDP packets
-STATIC mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
+static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
 
     if (socket->incoming.pbuf == NULL) {
         if (socket->timeout == 0) {
@@ -678,7 +678,7 @@ STATIC mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_u
 
 
 // Helper function for send/sendto to handle TCP packets
-STATIC mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
+static mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
     // Check for any pending errors
     STREAM_ERROR_CHECK(socket);
 
@@ -753,7 +753,7 @@ STATIC mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
 }
 
 // Helper function for recv/recvfrom to handle TCP packets
-STATIC mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
+static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
     // Check for any pending errors
     STREAM_ERROR_CHECK(socket);
 
@@ -827,16 +827,16 @@ STATIC mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
 /*******************************************************************************/
 // The socket functions provided by lwip.socket.
 
-STATIC const mp_obj_type_t lwip_socket_type;
+static const mp_obj_type_t lwip_socket_type;
 
-STATIC void lwip_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void lwip_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     lwip_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<socket state=%d timeout=%d incoming=%p off=%d>", self->state, self->timeout,
         self->incoming.pbuf, self->recv_offset);
 }
 
 // FIXME: Only supports two arguments at present
-STATIC mp_obj_t lwip_socket_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 lwip_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);
 
     lwip_socket_obj_t *socket = mp_obj_malloc_with_finaliser(lwip_socket_obj_t, &lwip_socket_type);
@@ -907,7 +907,7 @@ STATIC mp_obj_t lwip_socket_make_new(const mp_obj_type_t *type, size_t n_args, s
     return MP_OBJ_FROM_PTR(socket);
 }
 
-STATIC mp_obj_t lwip_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t lwip_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
 
     ip_addr_t bind_addr;
@@ -931,9 +931,9 @@ STATIC mp_obj_t lwip_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_bind_obj, lwip_socket_bind);
+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) {
+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 = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
@@ -990,9 +990,9 @@ STATIC mp_obj_t lwip_socket_listen(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_listen_obj, 1, 2, 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) {
+static mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
 
     if (socket->type != MOD_NETWORK_SOCK_STREAM) {
@@ -1077,9 +1077,9 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
 
     return MP_OBJ_FROM_PTR(client);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(lwip_socket_accept_obj, lwip_socket_accept);
+static MP_DEFINE_CONST_FUN_OBJ_1(lwip_socket_accept_obj, lwip_socket_accept);
 
-STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
 
     if (socket->pcb.tcp == NULL) {
@@ -1156,9 +1156,9 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_connect_obj, lwip_socket_connect);
+static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_connect_obj, lwip_socket_connect);
 
-STATIC void lwip_socket_check_connected(lwip_socket_obj_t *socket) {
+static void lwip_socket_check_connected(lwip_socket_obj_t *socket) {
     if (socket->pcb.tcp == NULL) {
         // not connected
         int _errno = error_lookup_table[-socket->state];
@@ -1167,7 +1167,7 @@ STATIC void lwip_socket_check_connected(lwip_socket_obj_t *socket) {
     }
 }
 
-STATIC mp_obj_t lwip_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
+static mp_obj_t lwip_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     int _errno;
 
@@ -1195,9 +1195,9 @@ STATIC mp_obj_t lwip_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
 
     return mp_obj_new_int_from_uint(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_send_obj, lwip_socket_send);
+static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_send_obj, lwip_socket_send);
 
-STATIC mp_obj_t lwip_socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t lwip_socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     int _errno;
 
@@ -1230,9 +1230,9 @@ STATIC mp_obj_t lwip_socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     vstr.len = ret;
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recv_obj, lwip_socket_recv);
+static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recv_obj, lwip_socket_recv);
 
-STATIC mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
+static mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     int _errno;
 
@@ -1263,9 +1263,9 @@ STATIC mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t
 
     return mp_obj_new_int_from_uint(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(lwip_socket_sendto_obj, lwip_socket_sendto);
+static MP_DEFINE_CONST_FUN_OBJ_3(lwip_socket_sendto_obj, lwip_socket_sendto);
 
-STATIC mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     int _errno;
 
@@ -1306,9 +1306,9 @@ STATIC mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recvfrom_obj, lwip_socket_recvfrom);
+static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recvfrom_obj, lwip_socket_recvfrom);
 
-STATIC mp_obj_t lwip_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
+static mp_obj_t lwip_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     lwip_socket_check_connected(socket);
 
@@ -1348,9 +1348,9 @@ STATIC mp_obj_t lwip_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_sendall_obj, lwip_socket_sendall);
+static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_sendall_obj, lwip_socket_sendall);
 
-STATIC mp_obj_t lwip_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
+static mp_obj_t lwip_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     mp_uint_t timeout;
     if (timeout_in == mp_const_none) {
@@ -1365,9 +1365,9 @@ STATIC mp_obj_t lwip_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     socket->timeout = timeout;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_settimeout_obj, lwip_socket_settimeout);
+static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_settimeout_obj, lwip_socket_settimeout);
 
-STATIC mp_obj_t lwip_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
+static mp_obj_t lwip_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     bool val = mp_obj_is_true(flag_in);
     if (val) {
@@ -1377,7 +1377,7 @@ STATIC mp_obj_t lwip_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_setblocking_obj, lwip_socket_setblocking);
+static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_setblocking_obj, lwip_socket_setblocking);
 
 #if LWIP_VERSION_MAJOR < 2
 #define MP_IGMP_IP_ADDR_TYPE ip_addr_t
@@ -1385,7 +1385,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_setblocking_obj, lwip_socket_setblo
 #define MP_IGMP_IP_ADDR_TYPE ip4_addr_t
 #endif
 
-STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // always 4
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(args[0]);
 
@@ -1443,15 +1443,15 @@ STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
 
 #undef MP_IGMP_IP_ADDR_TYPE
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_setsockopt_obj, 4, 4, lwip_socket_setsockopt);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_setsockopt_obj, 4, 4, lwip_socket_setsockopt);
 
-STATIC mp_obj_t lwip_socket_makefile(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t lwip_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(lwip_socket_makefile_obj, 1, 3, lwip_socket_makefile);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_makefile_obj, 1, 3, lwip_socket_makefile);
 
-STATIC mp_uint_t lwip_socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t lwip_socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
 
     switch (socket->type) {
@@ -1467,7 +1467,7 @@ STATIC mp_uint_t lwip_socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, i
     return MP_STREAM_ERROR;
 }
 
-STATIC mp_uint_t lwip_socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t lwip_socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
 
     switch (socket->type) {
@@ -1483,14 +1483,14 @@ STATIC mp_uint_t lwip_socket_write(mp_obj_t self_in, const void *buf, mp_uint_t
     return MP_STREAM_ERROR;
 }
 
-STATIC err_t _lwip_tcp_close_poll(void *arg, struct tcp_pcb *pcb) {
+static err_t _lwip_tcp_close_poll(void *arg, struct tcp_pcb *pcb) {
     // Connection has not been cleanly closed so just abort it to free up memory
     tcp_poll(pcb, NULL, 0);
     tcp_abort(pcb);
     return ERR_OK;
 }
 
-STATIC mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
 
@@ -1604,7 +1604,7 @@ STATIC mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return ret;
 }
 
-STATIC const mp_rom_map_elem_t lwip_socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t lwip_socket_locals_dict_table[] = {
     { 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(&lwip_socket_bind_obj) },
@@ -1626,15 +1626,15 @@ STATIC const mp_rom_map_elem_t lwip_socket_locals_dict_table[] = {
     { 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(lwip_socket_locals_dict, lwip_socket_locals_dict_table);
+static MP_DEFINE_CONST_DICT(lwip_socket_locals_dict, lwip_socket_locals_dict_table);
 
-STATIC const mp_stream_p_t lwip_socket_stream_p = {
+static const mp_stream_p_t lwip_socket_stream_p = {
     .read = lwip_socket_read,
     .write = lwip_socket_write,
     .ioctl = lwip_socket_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     lwip_socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
@@ -1665,7 +1665,7 @@ typedef struct nic_poll {
     void *poll_arg;
 } nic_poll_t;
 
-STATIC nic_poll_t lwip_poll_list;
+static nic_poll_t lwip_poll_list;
 
 void mod_lwip_register_poll(void (*poll)(void *arg), void *poll_arg) {
     lwip_poll_list.poll = poll;
@@ -1679,14 +1679,14 @@ void mod_lwip_deregister_poll(void (*poll)(void *arg), void *poll_arg) {
 /******************************************************************************/
 // The lwip global functions.
 
-STATIC mp_obj_t mod_lwip_reset() {
+static mp_obj_t mod_lwip_reset() {
     lwip_init();
     lwip_poll_list.poll = NULL;
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mod_lwip_reset_obj, mod_lwip_reset);
 
-STATIC mp_obj_t mod_lwip_callback() {
+static mp_obj_t mod_lwip_callback() {
     if (lwip_poll_list.poll != NULL) {
         lwip_poll_list.poll(lwip_poll_list.poll_arg);
     }
@@ -1702,9 +1702,9 @@ typedef struct _getaddrinfo_state_t {
 
 // Callback for incoming DNS requests.
 #if LWIP_VERSION_MAJOR < 2
-STATIC void lwip_getaddrinfo_cb(const char *name, ip_addr_t *ipaddr, void *arg)
+static void lwip_getaddrinfo_cb(const char *name, ip_addr_t *ipaddr, void *arg)
 #else
-STATIC void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void *arg)
+static void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void *arg)
 #endif
 {
     getaddrinfo_state_t *state = arg;
@@ -1718,7 +1718,7 @@ STATIC void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void
 }
 
 // lwip.getaddrinfo
-STATIC mp_obj_t lwip_getaddrinfo(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t lwip_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     mp_obj_t host_in = args[0], port_in = args[1];
     const char *host = mp_obj_str_get_str(host_in);
     mp_int_t port = mp_obj_get_int(port_in);
@@ -1786,13 +1786,13 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_getaddrinfo_obj, 2, 6, lwip_getaddrinfo
 
 // Debug functions
 
-STATIC mp_obj_t lwip_print_pcbs() {
+static mp_obj_t lwip_print_pcbs() {
     tcp_debug_print_pcbs();
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(lwip_print_pcbs_obj, lwip_print_pcbs);
 
-STATIC const mp_rom_map_elem_t mp_module_lwip_globals_table[] = {
+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) },
     { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&mod_lwip_callback_obj) },
@@ -1822,7 +1822,7 @@ STATIC const mp_rom_map_elem_t mp_module_lwip_globals_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(mp_module_lwip_globals, mp_module_lwip_globals_table);
 
 const mp_obj_module_t mp_module_lwip = {
     .base = { &mp_type_module },
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index a64b8ba79d43a..90e2a38a73cfc 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -37,20 +37,20 @@
 
 // The port must provide implementations of these low-level machine functions.
 
-STATIC void mp_machine_idle(void);
+static void mp_machine_idle(void);
 
 #if MICROPY_PY_MACHINE_BOOTLOADER
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args);
 #endif
 
 #if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
-STATIC mp_obj_t mp_machine_unique_id(void);
-NORETURN STATIC void mp_machine_reset(void);
-STATIC mp_int_t mp_machine_reset_cause(void);
-STATIC mp_obj_t mp_machine_get_freq(void);
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args);
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args);
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
+static mp_obj_t mp_machine_unique_id(void);
+NORETURN static void mp_machine_reset(void);
+static mp_int_t mp_machine_reset_cause(void);
+static mp_obj_t mp_machine_get_freq(void);
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args);
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args);
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
 #endif
 
 // The port can provide additional machine-module implementation in this file.
@@ -58,11 +58,11 @@ NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
 #include MICROPY_PY_MACHINE_INCLUDEFILE
 #endif
 
-STATIC mp_obj_t machine_soft_reset(void) {
+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_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 
 #if MICROPY_PY_MACHINE_BOOTLOADER
 NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
@@ -71,30 +71,30 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
 #endif
 
-STATIC mp_obj_t machine_idle(void) {
+static mp_obj_t machine_idle(void) {
     mp_machine_idle();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+static MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 
 #if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
 
-STATIC mp_obj_t machine_unique_id(void) {
+static mp_obj_t machine_unique_id(void) {
     return mp_machine_unique_id();
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
-NORETURN STATIC mp_obj_t machine_reset(void) {
+NORETURN static mp_obj_t machine_reset(void) {
     mp_machine_reset();
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-STATIC mp_obj_t machine_reset_cause(void) {
+static mp_obj_t machine_reset_cause(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_machine_reset_cause());
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
-STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return mp_machine_get_freq();
     } else {
@@ -104,13 +104,13 @@ 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, 1, machine_freq);
 
-STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_lightsleep(n_args, args);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lightsleep);
 
-NORETURN STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_deepsleep(n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsleep);
@@ -119,22 +119,22 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsle
 
 #if MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ
 
-STATIC mp_obj_t machine_disable_irq(void) {
+static mp_obj_t machine_disable_irq(void) {
     uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
     return mp_obj_new_int(state);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
+static 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) {
+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;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
 
 #endif
 
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
+static const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
 
     // Memory access objects.
@@ -230,7 +230,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     MICROPY_PY_MACHINE_EXTRA_GLOBALS
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
+static MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
 const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 527d1729e66c7..c8d2b9e3ff40a 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -99,16 +99,16 @@ mp_obj_t mod_network_find_nic(const uint8_t *ip) {
     mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("no available NIC"));
 }
 
-STATIC mp_obj_t network_route(void) {
+static mp_obj_t network_route(void) {
     return MP_OBJ_FROM_PTR(&MP_STATE_PORT(mod_network_nic_list));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_route_obj, network_route);
+static MP_DEFINE_CONST_FUN_OBJ_0(network_route_obj, network_route);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t mod_network_nic_list);
 
 #endif // MICROPY_PORT_NETWORK_INTERFACES
 
-STATIC mp_obj_t network_country(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_country(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return mp_obj_new_str(mod_network_country_code, 2);
     } else {
@@ -139,9 +139,9 @@ mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_hostname_obj, 0, 1, mod_network_hostname);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_hostname_obj, 0, 1, mod_network_hostname);
 
-STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
+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_country), MP_ROM_PTR(&mod_network_country_obj) },
     { MP_ROM_QSTR(MP_QSTR_hostname), MP_ROM_PTR(&mod_network_hostname_obj) },
@@ -162,7 +162,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
 
 const mp_obj_module_t mp_module_network = {
     .base = { &mp_type_module },
diff --git a/extmod/modonewire.c b/extmod/modonewire.c
index 8444181810c27..6bef83d03e0fa 100644
--- a/extmod/modonewire.c
+++ b/extmod/modonewire.c
@@ -45,7 +45,7 @@
 #define TIMING_WRITE2 (54)
 #define TIMING_WRITE3 (10)
 
-STATIC int onewire_bus_reset(mp_hal_pin_obj_t pin) {
+static int onewire_bus_reset(mp_hal_pin_obj_t pin) {
     mp_hal_pin_od_low(pin);
     mp_hal_delay_us(TIMING_RESET1);
     uint32_t i = mp_hal_quiet_timing_enter();
@@ -57,7 +57,7 @@ STATIC int onewire_bus_reset(mp_hal_pin_obj_t pin) {
     return status;
 }
 
-STATIC int onewire_bus_readbit(mp_hal_pin_obj_t pin) {
+static int onewire_bus_readbit(mp_hal_pin_obj_t pin) {
     mp_hal_pin_od_high(pin);
     uint32_t i = mp_hal_quiet_timing_enter();
     mp_hal_pin_od_low(pin);
@@ -70,7 +70,7 @@ STATIC int onewire_bus_readbit(mp_hal_pin_obj_t pin) {
     return value;
 }
 
-STATIC void onewire_bus_writebit(mp_hal_pin_obj_t pin, int value) {
+static void onewire_bus_writebit(mp_hal_pin_obj_t pin, int value) {
     uint32_t i = mp_hal_quiet_timing_enter();
     mp_hal_pin_od_low(pin);
     mp_hal_delay_us_fast(TIMING_WRITE1);
@@ -86,17 +86,17 @@ STATIC void onewire_bus_writebit(mp_hal_pin_obj_t pin, int value) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC mp_obj_t onewire_reset(mp_obj_t pin_in) {
+static mp_obj_t onewire_reset(mp_obj_t pin_in) {
     return mp_obj_new_bool(onewire_bus_reset(mp_hal_get_pin_obj(pin_in)));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_reset_obj, onewire_reset);
+static MP_DEFINE_CONST_FUN_OBJ_1(onewire_reset_obj, onewire_reset);
 
-STATIC mp_obj_t onewire_readbit(mp_obj_t pin_in) {
+static mp_obj_t onewire_readbit(mp_obj_t pin_in) {
     return MP_OBJ_NEW_SMALL_INT(onewire_bus_readbit(mp_hal_get_pin_obj(pin_in)));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbit_obj, onewire_readbit);
+static MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbit_obj, onewire_readbit);
 
-STATIC mp_obj_t onewire_readbyte(mp_obj_t pin_in) {
+static mp_obj_t onewire_readbyte(mp_obj_t pin_in) {
     mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(pin_in);
     uint8_t value = 0;
     for (int i = 0; i < 8; ++i) {
@@ -104,15 +104,15 @@ STATIC mp_obj_t onewire_readbyte(mp_obj_t pin_in) {
     }
     return MP_OBJ_NEW_SMALL_INT(value);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbyte_obj, onewire_readbyte);
+static MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbyte_obj, onewire_readbyte);
 
-STATIC mp_obj_t onewire_writebit(mp_obj_t pin_in, mp_obj_t value_in) {
+static mp_obj_t onewire_writebit(mp_obj_t pin_in, mp_obj_t value_in) {
     onewire_bus_writebit(mp_hal_get_pin_obj(pin_in), mp_obj_get_int(value_in));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(onewire_writebit_obj, onewire_writebit);
+static MP_DEFINE_CONST_FUN_OBJ_2(onewire_writebit_obj, onewire_writebit);
 
-STATIC mp_obj_t onewire_writebyte(mp_obj_t pin_in, mp_obj_t value_in) {
+static mp_obj_t onewire_writebyte(mp_obj_t pin_in, mp_obj_t value_in) {
     mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(pin_in);
     int value = mp_obj_get_int(value_in);
     for (int i = 0; i < 8; ++i) {
@@ -121,9 +121,9 @@ STATIC mp_obj_t onewire_writebyte(mp_obj_t pin_in, mp_obj_t value_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(onewire_writebyte_obj, onewire_writebyte);
+static MP_DEFINE_CONST_FUN_OBJ_2(onewire_writebyte_obj, onewire_writebyte);
 
-STATIC mp_obj_t onewire_crc8(mp_obj_t data) {
+static mp_obj_t onewire_crc8(mp_obj_t data) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
     uint8_t crc = 0;
@@ -143,9 +143,9 @@ STATIC mp_obj_t onewire_crc8(mp_obj_t data) {
     }
     return MP_OBJ_NEW_SMALL_INT(crc);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_crc8_obj, onewire_crc8);
+static MP_DEFINE_CONST_FUN_OBJ_1(onewire_crc8_obj, onewire_crc8);
 
-STATIC const mp_rom_map_elem_t onewire_module_globals_table[] = {
+static const mp_rom_map_elem_t onewire_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_onewire) },
 
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&onewire_reset_obj) },
@@ -156,7 +156,7 @@ STATIC const mp_rom_map_elem_t onewire_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_crc8), MP_ROM_PTR(&onewire_crc8_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(onewire_module_globals, onewire_module_globals_table);
+static MP_DEFINE_CONST_DICT(onewire_module_globals, onewire_module_globals_table);
 
 const mp_obj_module_t mp_module_onewire = {
     .base = { &mp_type_module },
diff --git a/extmod/modos.c b/extmod/modos.c
index 24a36cb8ce961..eda359b97b1b0 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -73,7 +73,7 @@
 #if MICROPY_PY_OS_SYNC
 // sync()
 // Sync all filesystems.
-STATIC mp_obj_t mp_os_sync(void) {
+static mp_obj_t mp_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
@@ -93,20 +93,20 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_os_sync_obj, mp_os_sync);
 #define CONST_RELEASE const
 #endif
 
-STATIC const qstr mp_os_uname_info_fields[] = {
+static const qstr mp_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(mp_os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC CONST_RELEASE MP_DEFINE_STR_OBJ(mp_os_uname_info_release_obj, MICROPY_VERSION_STRING);
-STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN);
-STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+static const MP_DEFINE_STR_OBJ(mp_os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+static const MP_DEFINE_STR_OBJ(mp_os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+static CONST_RELEASE MP_DEFINE_STR_OBJ(mp_os_uname_info_release_obj, MICROPY_VERSION_STRING);
+static const MP_DEFINE_STR_OBJ(mp_os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN);
+static const MP_DEFINE_STR_OBJ(mp_os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
 
-STATIC MP_DEFINE_ATTRTUPLE(
+static MP_DEFINE_ATTRTUPLE(
     mp_os_uname_info_obj,
     mp_os_uname_info_fields,
     5,
@@ -117,7 +117,7 @@ STATIC MP_DEFINE_ATTRTUPLE(
     MP_ROM_PTR(&mp_os_uname_info_machine_obj)
     );
 
-STATIC mp_obj_t mp_os_uname(void) {
+static mp_obj_t mp_os_uname(void) {
     #if MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC
     const char *release = mp_os_uname_release();
     mp_os_uname_info_release_obj.len = strlen(release);
@@ -125,12 +125,12 @@ STATIC mp_obj_t mp_os_uname(void) {
     #endif
     return MP_OBJ_FROM_PTR(&mp_os_uname_info_obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_os_uname_obj, mp_os_uname);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_os_uname_obj, mp_os_uname);
 
 #endif
 
 #if MICROPY_PY_OS_DUPTERM_NOTIFY
-STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
+static mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
         int c = mp_os_dupterm_rx_chr();
@@ -141,10 +141,10 @@ STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_dupterm_notify_obj, mp_os_dupterm_notify);
 #endif
 
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
+static const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
     #if MICROPY_PY_OS_GETENV_PUTENV_UNSETENV
@@ -223,7 +223,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_mbfs_remove_obj) },
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
+static MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
 
 const mp_obj_module_t mp_module_os = {
     .base = { &mp_type_module },
diff --git a/extmod/modplatform.c b/extmod/modplatform.c
index 73846f946d0ed..c6d4d31b97ec1 100644
--- a/extmod/modplatform.c
+++ b/extmod/modplatform.c
@@ -36,39 +36,39 @@
 
 // platform - Access to underlying platform's identifying data
 
-STATIC const MP_DEFINE_STR_OBJ(info_platform_obj, MICROPY_PLATFORM_SYSTEM "-" \
+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 = {
+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)}
 };
 
-STATIC mp_obj_t platform_platform(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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_DEFINE_CONST_FUN_OBJ_KW(platform_platform_obj, 0, platform_platform);
 
-STATIC mp_obj_t platform_python_compiler(void) {
+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_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) {
+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 MP_DEFINE_CONST_FUN_OBJ_KW(platform_libc_ver_obj, 0, platform_libc_ver);
 
-STATIC const mp_rom_map_elem_t modplatform_globals_table[] = {
+static const mp_rom_map_elem_t modplatform_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_platform) },
     { 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);
+static MP_DEFINE_CONST_DICT(modplatform_globals, modplatform_globals_table);
 
 const mp_obj_module_t mp_module_platform = {
     .base = { &mp_type_module },
diff --git a/extmod/modrandom.c b/extmod/modrandom.c
index d66f1c9c46dce..79a1b18baac2d 100644
--- a/extmod/modrandom.c
+++ b/extmod/modrandom.c
@@ -46,16 +46,16 @@
 #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;
+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;
+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) {
+static uint32_t yasmarang(void) {
     yasmarang_pad += yasmarang_dat + yasmarang_d * yasmarang_n;
     yasmarang_pad = (yasmarang_pad << 3) + (yasmarang_pad >> 29);
     yasmarang_n = yasmarang_pad | 2;
@@ -71,7 +71,7 @@ STATIC uint32_t yasmarang(void) {
 
 // returns an unsigned integer below the given argument
 // n must not be zero
-STATIC uint32_t yasmarang_randbelow(uint32_t n) {
+static uint32_t yasmarang_randbelow(uint32_t n) {
     uint32_t mask = 1;
     while ((n & mask) < n) {
         mask = (mask << 1) | 1;
@@ -85,7 +85,7 @@ STATIC uint32_t yasmarang_randbelow(uint32_t n) {
 
 #endif
 
-STATIC mp_obj_t mod_random_getrandbits(mp_obj_t num_in) {
+static mp_obj_t mod_random_getrandbits(mp_obj_t num_in) {
     mp_int_t n = mp_obj_get_int(num_in);
     if (n > 32 || n < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("bits must be 32 or less"));
@@ -98,9 +98,9 @@ STATIC mp_obj_t mod_random_getrandbits(mp_obj_t num_in) {
     mask >>= (32 - n);
     return mp_obj_new_int_from_uint(yasmarang() & mask);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_getrandbits_obj, mod_random_getrandbits);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_random_getrandbits_obj, mod_random_getrandbits);
 
-STATIC mp_obj_t mod_random_seed(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_random_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_RANDOM_SEED_INIT_FUNC
@@ -117,11 +117,11 @@ STATIC mp_obj_t mod_random_seed(size_t n_args, const mp_obj_t *args) {
     yasmarang_dat = 0;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_seed_obj, 0, 1, mod_random_seed);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_seed_obj, 0, 1, mod_random_seed);
 
 #if MICROPY_PY_RANDOM_EXTRA_FUNCS
 
-STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
     mp_int_t start = mp_obj_get_int(args[0]);
     if (n_args == 1) {
         // range(stop)
@@ -161,9 +161,9 @@ STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
 error:
     mp_raise_ValueError(NULL);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_randrange_obj, 1, 3, mod_random_randrange);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_randrange_obj, 1, 3, mod_random_randrange);
 
-STATIC mp_obj_t mod_random_randint(mp_obj_t a_in, mp_obj_t b_in) {
+static mp_obj_t mod_random_randint(mp_obj_t a_in, mp_obj_t b_in) {
     mp_int_t a = mp_obj_get_int(a_in);
     mp_int_t b = mp_obj_get_int(b_in);
     if (a <= b) {
@@ -172,9 +172,9 @@ STATIC mp_obj_t mod_random_randint(mp_obj_t a_in, mp_obj_t b_in) {
         mp_raise_ValueError(NULL);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_randint_obj, mod_random_randint);
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_random_randint_obj, mod_random_randint);
 
-STATIC mp_obj_t mod_random_choice(mp_obj_t seq) {
+static mp_obj_t mod_random_choice(mp_obj_t seq) {
     mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
     if (len > 0) {
         return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow((uint32_t)len)), MP_OBJ_SENTINEL);
@@ -182,12 +182,12 @@ STATIC mp_obj_t mod_random_choice(mp_obj_t seq) {
         mp_raise_type(&mp_type_IndexError);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_choice_obj, mod_random_choice);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_random_choice_obj, mod_random_choice);
 
 #if MICROPY_PY_BUILTINS_FLOAT
 
 // returns a number in the range [0..1) using Yasmarang to fill in the fraction bits
-STATIC mp_float_t yasmarang_float(void) {
+static mp_float_t yasmarang_float(void) {
     mp_float_union_t u;
     u.p.sgn = 0;
     u.p.exp = (1 << (MP_FLOAT_EXP_BITS - 1)) - 1;
@@ -199,24 +199,24 @@ STATIC mp_float_t yasmarang_float(void) {
     return u.f - 1;
 }
 
-STATIC mp_obj_t mod_random_random(void) {
+static mp_obj_t mod_random_random(void) {
     return mp_obj_new_float(yasmarang_float());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_random_random_obj, mod_random_random);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_random_random_obj, mod_random_random);
 
-STATIC mp_obj_t mod_random_uniform(mp_obj_t a_in, mp_obj_t b_in) {
+static mp_obj_t mod_random_uniform(mp_obj_t a_in, mp_obj_t b_in) {
     mp_float_t a = mp_obj_get_float(a_in);
     mp_float_t b = mp_obj_get_float(b_in);
     return mp_obj_new_float(a + (b - a) * yasmarang_float());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_uniform_obj, mod_random_uniform);
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_random_uniform_obj, mod_random_uniform);
 
 #endif
 
 #endif // MICROPY_PY_RANDOM_EXTRA_FUNCS
 
 #if SEED_ON_IMPORT
-STATIC mp_obj_t mod_random___init__(void) {
+static mp_obj_t mod_random___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;
@@ -226,11 +226,11 @@ STATIC mp_obj_t mod_random___init__(void) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_random___init___obj, mod_random___init__);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_random___init___obj, mod_random___init__);
 #endif
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_random_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random) },
     #if SEED_ON_IMPORT
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_random___init___obj) },
@@ -248,7 +248,7 @@ STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_random_globals, mp_module_random_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_random_globals, mp_module_random_globals_table);
 
 const mp_obj_module_t mp_module_random = {
     .base = { &mp_type_module },
diff --git a/extmod/modre.c b/extmod/modre.c
index 9d5d7178728ed..2a3fdfd3505f3 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -57,18 +57,18 @@ 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);
+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;
+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) {
+static void match_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<match num=%d>", self->num_matches);
 }
 
-STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
+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) {
@@ -87,7 +87,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(match_group_obj, match_group);
 
 #if MICROPY_PY_RE_MATCH_GROUPS
 
-STATIC mp_obj_t match_groups(mp_obj_t self_in) {
+static mp_obj_t match_groups(mp_obj_t self_in) {
     mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->num_matches <= 1) {
         return mp_const_empty_tuple;
@@ -104,7 +104,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(match_groups_obj, match_groups);
 
 #if MICROPY_PY_RE_MATCH_SPAN_START_END
 
-STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span[2]) {
+static void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span[2]) {
     mp_obj_match_t *self = MP_OBJ_TO_PTR(args[0]);
 
     mp_int_t no = 0;
@@ -141,21 +141,21 @@ STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span
     span[1] = mp_obj_new_int(e);
 }
 
-STATIC mp_obj_t match_span(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t match_span(size_t n_args, const mp_obj_t *args) {
     mp_obj_t span[2];
     match_span_helper(n_args, args, span);
     return mp_obj_new_tuple(2, span);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(match_span_obj, 1, 2, match_span);
 
-STATIC mp_obj_t match_start(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t match_start(size_t n_args, const mp_obj_t *args) {
     mp_obj_t span[2];
     match_span_helper(n_args, args, span);
     return span[0];
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(match_start_obj, 1, 2, match_start);
 
-STATIC mp_obj_t match_end(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t match_end(size_t n_args, const mp_obj_t *args) {
     mp_obj_t span[2];
     match_span_helper(n_args, args, span);
     return span[1];
@@ -165,7 +165,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(match_end_obj, 1, 2, match_end);
 #endif
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t match_locals_dict_table[] = {
+static const mp_rom_map_elem_t match_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_group), MP_ROM_PTR(&match_group_obj) },
     #if MICROPY_PY_RE_MATCH_GROUPS
     { MP_ROM_QSTR(MP_QSTR_groups), MP_ROM_PTR(&match_groups_obj) },
@@ -177,9 +177,9 @@ STATIC const mp_rom_map_elem_t match_locals_dict_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
+static MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     match_type,
     MP_QSTR_match,
     MP_TYPE_FLAG_NONE,
@@ -188,13 +188,13 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
-STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_re_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<re %p>", self);
 }
 
-STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
+static mp_obj_t re_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], (mp_obj_type_t *)&re_type)) {
@@ -222,17 +222,17 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     return MP_OBJ_FROM_PTR(match);
 }
 
-STATIC mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {
     return re_exec(true, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_match_obj, 2, 4, re_match);
 
-STATIC mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {
     return re_exec(false, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);
 
-STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
     mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);
     Subject subj;
     size_t len;
@@ -279,7 +279,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_split_obj, 2, 3, re_split);
 
 #if MICROPY_PY_RE_SUB
 
-STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
+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], (mp_obj_type_t *)&re_type)) {
         self = MP_OBJ_TO_PTR(args[0]);
@@ -401,7 +401,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_sub_obj, 3, 5, re_sub_helper);
 #endif
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t re_locals_dict_table[] = {
+static const mp_rom_map_elem_t re_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) },
     { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&re_search_obj) },
     { MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&re_split_obj) },
@@ -410,9 +410,9 @@ STATIC const mp_rom_map_elem_t re_locals_dict_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table);
+static MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     re_type,
     MP_QSTR_re,
     MP_TYPE_FLAG_NONE,
@@ -421,7 +421,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
-STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     const char *re_str = mp_obj_str_get_str(args[0]);
     int size = re1_5_sizecode(re_str);
@@ -450,7 +450,7 @@ 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);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_re_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_re) },
     { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_obj) },
     { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) },
@@ -463,7 +463,7 @@ STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_re_globals, mp_module_re_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_re_globals, mp_module_re_globals_table);
 
 const mp_obj_module_t mp_module_re = {
     .base = { &mp_type_module },
diff --git a/extmod/modselect.c b/extmod/modselect.c
index 9b81ba509f5d5..d06157e585ae1 100644
--- a/extmod/modselect.c
+++ b/extmod/modselect.c
@@ -96,7 +96,7 @@ typedef struct _poll_set_t {
     #endif
 } poll_set_t;
 
-STATIC void poll_set_init(poll_set_t *poll_set, size_t n) {
+static void poll_set_init(poll_set_t *poll_set, size_t n) {
     mp_map_init(&poll_set->map, n);
     #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
     poll_set->alloc = 0;
@@ -107,19 +107,19 @@ STATIC void poll_set_init(poll_set_t *poll_set, size_t n) {
 }
 
 #if MICROPY_PY_SELECT_SELECT
-STATIC void poll_set_deinit(poll_set_t *poll_set) {
+static void poll_set_deinit(poll_set_t *poll_set) {
     mp_map_deinit(&poll_set->map);
 }
 #endif
 
 #if MICROPY_PY_SELECT_POSIX_OPTIMISATIONS
 
-STATIC mp_uint_t poll_obj_get_events(poll_obj_t *poll_obj) {
+static mp_uint_t poll_obj_get_events(poll_obj_t *poll_obj) {
     assert(poll_obj->pollfd == NULL);
     return poll_obj->nonfd_events;
 }
 
-STATIC void poll_obj_set_events(poll_obj_t *poll_obj, mp_uint_t events) {
+static void poll_obj_set_events(poll_obj_t *poll_obj, mp_uint_t events) {
     if (poll_obj->pollfd != NULL) {
         poll_obj->pollfd->events = events;
     } else {
@@ -127,7 +127,7 @@ STATIC void poll_obj_set_events(poll_obj_t *poll_obj, mp_uint_t events) {
     }
 }
 
-STATIC mp_uint_t poll_obj_get_revents(poll_obj_t *poll_obj) {
+static mp_uint_t poll_obj_get_revents(poll_obj_t *poll_obj) {
     if (poll_obj->pollfd != NULL) {
         return poll_obj->pollfd->revents;
     } else {
@@ -135,7 +135,7 @@ STATIC mp_uint_t poll_obj_get_revents(poll_obj_t *poll_obj) {
     }
 }
 
-STATIC void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents) {
+static void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents) {
     if (poll_obj->pollfd != NULL) {
         poll_obj->pollfd->revents = revents;
     } else {
@@ -146,7 +146,7 @@ STATIC void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents) {
 // How much (in pollfds) to grow the allocation for poll_set->pollfds by.
 #define POLL_SET_ALLOC_INCREMENT (4)
 
-STATIC struct pollfd *poll_set_add_fd(poll_set_t *poll_set, int fd) {
+static struct pollfd *poll_set_add_fd(poll_set_t *poll_set, int fd) {
     struct pollfd *free_slot = NULL;
 
     if (poll_set->used == poll_set->max_used) {
@@ -228,7 +228,7 @@ static inline void poll_obj_set_revents(poll_obj_t *poll_obj, mp_uint_t revents)
 
 #endif
 
-STATIC void poll_set_add_obj(poll_set_t *poll_set, const mp_obj_t *obj, mp_uint_t obj_len, mp_uint_t events, bool or_events) {
+static void poll_set_add_obj(poll_set_t *poll_set, const mp_obj_t *obj, mp_uint_t obj_len, mp_uint_t events, bool or_events) {
     for (mp_uint_t i = 0; i < obj_len; i++) {
         mp_map_elem_t *elem = mp_map_lookup(&poll_set->map, mp_obj_id(obj[i]), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
         if (elem->value == MP_OBJ_NULL) {
@@ -290,7 +290,7 @@ STATIC void poll_set_add_obj(poll_set_t *poll_set, const mp_obj_t *obj, mp_uint_
 }
 
 // For each object in the poll set, poll it once.
-STATIC mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
+static mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
     mp_uint_t n_ready = 0;
     for (mp_uint_t i = 0; i < poll_set->map.alloc; ++i) {
         if (!mp_map_slot_is_filled(&poll_set->map, i)) {
@@ -338,7 +338,7 @@ STATIC mp_uint_t poll_set_poll_once(poll_set_t *poll_set, size_t *rwx_num) {
     return n_ready;
 }
 
-STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size_t *rwx_num, mp_uint_t timeout) {
+static mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size_t *rwx_num, mp_uint_t timeout) {
     mp_uint_t start_ticks = mp_hal_ticks_ms();
     bool has_timeout = timeout != (mp_uint_t)-1;
 
@@ -414,7 +414,7 @@ STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size
 
 #if MICROPY_PY_SELECT_SELECT
 // select(rlist, wlist, xlist[, timeout])
-STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
+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];
     mp_obj_t *r_array, *w_array, *x_array;
@@ -486,7 +486,7 @@ typedef struct _mp_obj_poll_t {
 } mp_obj_poll_t;
 
 // register(obj[, eventmask])
-STATIC mp_obj_t poll_register(size_t n_args, const mp_obj_t *args) {
+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 events;
     if (n_args == 3) {
@@ -500,7 +500,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);
 
 // unregister(obj)
-STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
+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_elem_t *elem = mp_map_lookup(&self->poll_set.map, mp_obj_id(obj_in), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
 
@@ -523,7 +523,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);
 
 // modify(obj, eventmask)
-STATIC mp_obj_t poll_modify(mp_obj_t self_in, mp_obj_t obj_in, mp_obj_t eventmask_in) {
+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_set.map, mp_obj_id(obj_in), MP_MAP_LOOKUP);
     if (elem == NULL) {
@@ -534,7 +534,7 @@ STATIC mp_obj_t poll_modify(mp_obj_t self_in, mp_obj_t obj_in, mp_obj_t eventmas
 }
 MP_DEFINE_CONST_FUN_OBJ_3(poll_modify_obj, poll_modify);
 
-STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
+static mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
 
     // work out timeout (its given already in ms)
@@ -557,7 +557,7 @@ STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
     return poll_set_poll_until_ready_or_timeout(&self->poll_set, NULL, timeout);
 }
 
-STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_uint_t n_ready = poll_poll_internal(n_args, args);
 
@@ -578,7 +578,7 @@ STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 2, poll_poll);
 
-STATIC mp_obj_t poll_ipoll(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t poll_ipoll(size_t n_args, const mp_obj_t *args) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (self->ret_tuple == MP_OBJ_NULL) {
@@ -593,7 +593,7 @@ STATIC mp_obj_t poll_ipoll(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_ipoll_obj, 1, 3, poll_ipoll);
 
-STATIC mp_obj_t poll_iternext(mp_obj_t self_in) {
+static mp_obj_t poll_iternext(mp_obj_t self_in) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->iter_cnt == 0) {
@@ -625,16 +625,16 @@ STATIC mp_obj_t poll_iternext(mp_obj_t self_in) {
     return MP_OBJ_STOP_ITERATION;
 }
 
-STATIC const mp_rom_map_elem_t poll_locals_dict_table[] = {
+static const mp_rom_map_elem_t poll_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_register), MP_ROM_PTR(&poll_register_obj) },
     { MP_ROM_QSTR(MP_QSTR_unregister), MP_ROM_PTR(&poll_unregister_obj) },
     { MP_ROM_QSTR(MP_QSTR_modify), MP_ROM_PTR(&poll_modify_obj) },
     { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&poll_poll_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipoll), MP_ROM_PTR(&poll_ipoll_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
+static MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_poll,
     MP_QSTR_poll,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
@@ -643,7 +643,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 // poll()
-STATIC mp_obj_t select_poll(void) {
+static mp_obj_t select_poll(void) {
     mp_obj_poll_t *poll = mp_obj_malloc(mp_obj_poll_t, &mp_type_poll);
     poll_set_init(&poll->poll_set, 0);
     poll->iter_cnt = 0;
@@ -652,7 +652,7 @@ STATIC mp_obj_t select_poll(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_select_poll_obj, select_poll);
 
-STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_select_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_select) },
     #if MICROPY_PY_SELECT_SELECT
     { MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_select_select_obj) },
@@ -664,7 +664,7 @@ STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_POLLHUP), MP_ROM_INT(MP_STREAM_POLL_HUP) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
 
 const mp_obj_module_t mp_module_select = {
     .base = { &mp_type_module },
diff --git a/extmod/modsocket.c b/extmod/modsocket.c
index 4a857fb62e6ff..eedc17b2ffcb6 100644
--- a/extmod/modsocket.c
+++ b/extmod/modsocket.c
@@ -41,16 +41,16 @@
 /******************************************************************************/
 // socket class
 
-STATIC const mp_obj_type_t socket_type;
+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) {
+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(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) {
+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, 3, false);
 
     // create socket object (not bound to any NIC yet)
@@ -81,7 +81,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(s);
 }
 
-STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) {
+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);
@@ -103,7 +103,7 @@ STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) {
 }
 
 // method socket.bind(address)
-STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // get address
@@ -121,10 +121,10 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
 // method socket.listen([backlog])
-STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+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) {
@@ -149,10 +149,10 @@ 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_VAR_BETWEEN(socket_listen_obj, 1, 2, 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) {
+static mp_obj_t socket_accept(mp_obj_t self_in) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->nic == MP_OBJ_NULL) {
@@ -198,10 +198,10 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
 
     return MP_OBJ_FROM_PTR(client);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
+static MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 
 // method socket.connect(address)
-STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // get address
@@ -222,10 +222,10 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
 
 // method socket.send(bytes)
-STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
+static mp_obj_t socket_send(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
@@ -240,9 +240,9 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     }
     return mp_obj_new_int_from_uint(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
+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) {
+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
@@ -274,10 +274,10 @@ STATIC mp_obj_t socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
     }
     return mp_obj_new_int_from_uint(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, socket_sendall);
+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) {
+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);
     if (self->nic == MP_OBJ_NULL) {
         // not connected
@@ -297,10 +297,10 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     vstr.len = ret;
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
 // method socket.sendto(bytes, address)
-STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
+static mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // get the data
@@ -323,10 +323,10 @@ 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(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
+static MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
 
 // method socket.recvfrom(bufsize)
-STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->nic == MP_OBJ_NULL) {
         // not connected
@@ -351,10 +351,10 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     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);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
 
 // method socket.setsockopt(level, optname, value)
-STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+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) {
@@ -393,19 +393,19 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
+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) {
+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);
+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
 // otherwise, timeout is in seconds
-STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
+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);
     mp_uint_t timeout;
     if (timeout_in == mp_const_none) {
@@ -433,19 +433,19 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
 
 // method socket.setblocking(flag)
-STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
+static mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
     if (mp_obj_is_true(blocking)) {
         return socket_settimeout(self_in, mp_const_none);
     } else {
         return socket_settimeout(self_in, MP_OBJ_NEW_SMALL_INT(0));
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
 
-STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { 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) },
@@ -468,7 +468,7 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { 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 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);
@@ -520,14 +520,14 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
     return self->nic_protocol->ioctl(self, request, arg, errcode);
 }
 
-STATIC const mp_stream_p_t socket_stream_p = {
+static const mp_stream_p_t socket_stream_p = {
     .read = socket_read,
     .write = socket_write,
     .ioctl = socket_ioctl,
     .is_text = false,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
@@ -541,7 +541,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 // socket module
 
 // function socket.getaddrinfo(host, port)
-STATIC mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     size_t hlen;
     const char *host = mp_obj_str_get_data(args[0], &hlen);
     mp_int_t port = mp_obj_get_int(args[1]);
@@ -611,9 +611,9 @@ STATIC mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     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_VAR_BETWEEN(mod_socket_getaddrinfo_obj, 2, 6, mod_socket_getaddrinfo);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_socket_getaddrinfo_obj, 2, 6, mod_socket_getaddrinfo);
 
-STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
@@ -645,7 +645,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     */
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
 const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
diff --git a/extmod/modtime.c b/extmod/modtime.c
index 805c2621c0b67..deb4bb4c9ace7 100644
--- a/extmod/modtime.c
+++ b/extmod/modtime.c
@@ -52,7 +52,7 @@
 // - 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) {
+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.
         return mp_time_localtime_get();
@@ -80,7 +80,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_time_localtime_obj, 0, 1, time_localtime)
 // This is the inverse function of localtime. Its 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 (eg 1st Jan 1970, or 1st Jan 2000).
-STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+static mp_obj_t time_mktime(mp_obj_t tuple) {
     size_t len;
     mp_obj_t *elem;
     mp_obj_get_array(tuple, &len, &elem);
@@ -102,21 +102,21 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_time_mktime_obj, time_mktime);
 
 // time()
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t time_time(void) {
+static mp_obj_t time_time(void) {
     return mp_time_time_get();
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_obj, time_time);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_obj, time_time);
 
 // time_ns()
 // Returns the number of nanoseconds since the Epoch, as an integer.
-STATIC mp_obj_t time_time_ns(void) {
+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_time_time_ns_obj, time_time_ns);
 
 #endif // MICROPY_PY_TIME_TIME_TIME_NS
 
-STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
+static mp_obj_t time_sleep(mp_obj_t seconds_o) {
     #ifdef MICROPY_PY_TIME_CUSTOM_SLEEP
     mp_time_sleep(seconds_o);
     #else
@@ -130,7 +130,7 @@ STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_obj, time_sleep);
 
-STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) {
+static mp_obj_t time_sleep_ms(mp_obj_t arg) {
     mp_int_t ms = mp_obj_get_int(arg);
     if (ms >= 0) {
         mp_hal_delay_ms(ms);
@@ -139,7 +139,7 @@ STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_ms_obj, time_sleep_ms);
 
-STATIC mp_obj_t time_sleep_us(mp_obj_t arg) {
+static mp_obj_t time_sleep_us(mp_obj_t arg) {
     mp_int_t us = mp_obj_get_int(arg);
     if (us > 0) {
         mp_hal_delay_us(us);
@@ -148,22 +148,22 @@ STATIC mp_obj_t time_sleep_us(mp_obj_t arg) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_us_obj, time_sleep_us);
 
-STATIC mp_obj_t time_ticks_ms(void) {
+static mp_obj_t time_ticks_ms(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_ms_obj, time_ticks_ms);
 
-STATIC mp_obj_t time_ticks_us(void) {
+static mp_obj_t time_ticks_us(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_us() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_us_obj, time_ticks_us);
 
-STATIC mp_obj_t time_ticks_cpu(void) {
+static mp_obj_t time_ticks_cpu(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_cpu() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_cpu_obj, time_ticks_cpu);
 
-STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
+static mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
     // we assume that the arguments come from ticks_xx so are small ints
     mp_uint_t start = MP_OBJ_SMALL_INT_VALUE(start_in);
     mp_uint_t end = MP_OBJ_SMALL_INT_VALUE(end_in);
@@ -175,7 +175,7 @@ STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_diff_obj, time_ticks_diff);
 
-STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
+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);
@@ -196,7 +196,7 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_add_obj, time_ticks_add);
 
-STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) },
 
     #if MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME
@@ -224,7 +224,7 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     MICROPY_PY_TIME_EXTRA_GLOBALS
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
 
 const mp_obj_module_t mp_module_time = {
     .base = { &mp_type_module },
diff --git a/extmod/modtls_axtls.c b/extmod/modtls_axtls.c
index 4f6b06f66d6e2..08a355cddb605 100644
--- a/extmod/modtls_axtls.c
+++ b/extmod/modtls_axtls.c
@@ -65,23 +65,23 @@ struct ssl_args {
     mp_arg_val_t do_handshake;
 };
 
-STATIC const mp_obj_type_t ssl_context_type;
-STATIC const mp_obj_type_t ssl_socket_type;
+static const mp_obj_type_t ssl_context_type;
+static const mp_obj_type_t ssl_socket_type;
 
-STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname);
 
 /******************************************************************************/
 // Helper functions.
 
 // Table of error strings corresponding to SSL_xxx error codes.
-STATIC const char *const ssl_error_tab1[] = {
+static const char *const ssl_error_tab1[] = {
     "NOT_OK",
     "DEAD",
     "CLOSE_NOTIFY",
     "EAGAIN",
 };
-STATIC const char *const ssl_error_tab2[] = {
+static const char *const ssl_error_tab2[] = {
     "CONN_LOST",
     "RECORD_OVERFLOW",
     "SOCK_SETUP_FAILURE",
@@ -103,7 +103,7 @@ STATIC const char *const ssl_error_tab2[] = {
     "NOT_SUPPORTED",
 };
 
-STATIC NORETURN void ssl_raise_error(int err) {
+static NORETURN void ssl_raise_error(int err) {
     MP_STATIC_ASSERT(SSL_NOT_OK - 3 == SSL_EAGAIN);
     MP_STATIC_ASSERT(SSL_ERROR_CONN_LOST - 18 == SSL_ERROR_NOT_SUPPORTED);
 
@@ -138,7 +138,7 @@ STATIC NORETURN void ssl_raise_error(int err) {
 /******************************************************************************/
 // SSLContext type.
 
-STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t ssl_context_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, 1, false);
 
     // The "protocol" argument is ignored in this implementation.
@@ -155,20 +155,20 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
+static void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
     self->key = key_obj;
     self->cert = cert_obj;
 }
 
 // SSLContext.load_cert_chain(certfile, keyfile)
-STATIC mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t cert, mp_obj_t pkey) {
+static mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t cert, mp_obj_t pkey) {
     mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
     ssl_context_load_key(self, pkey, cert);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_load_cert_chain);
+static MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_load_cert_chain);
 
-STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
@@ -186,15 +186,15 @@ STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args,
     return ssl_socket_make_new(self, sock, args[ARG_server_side].u_bool,
         args[ARG_do_handshake_on_connect].u_bool, args[ARG_server_hostname].u_obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
+static MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
 
-STATIC const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
+static const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_load_cert_chain), MP_ROM_PTR(&ssl_context_load_cert_chain_obj)},
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_context_wrap_socket_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ssl_context_type,
     MP_QSTR_SSLContext,
     MP_TYPE_FLAG_NONE,
@@ -205,7 +205,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // SSLSocket type.
 
-STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
 
     #if MICROPY_PY_SSL_FINALISER
@@ -276,7 +276,7 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     return o;
 }
 
-STATIC mp_uint_t ssl_socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t ssl_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);
 
     if (o->ssl_sock == NULL) {
@@ -325,7 +325,7 @@ STATIC mp_uint_t ssl_socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *
     return size;
 }
 
-STATIC mp_uint_t ssl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t ssl_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);
 
     if (o->ssl_sock == NULL) {
@@ -357,7 +357,7 @@ STATIC mp_uint_t ssl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size
     return r;
 }
 
-STATIC mp_uint_t ssl_socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t ssl_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);
     if (request == MP_STREAM_CLOSE) {
         if (self->ssl_sock == NULL) {
@@ -378,7 +378,7 @@ STATIC mp_uint_t ssl_socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t ar
     return mp_get_stream(self->sock)->ioctl(self->sock, request, arg, errcode);
 }
 
-STATIC mp_obj_t ssl_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
+static mp_obj_t ssl_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(self_in);
     mp_obj_t sock = o->sock;
     mp_obj_t dest[3];
@@ -388,9 +388,9 @@ STATIC mp_obj_t ssl_socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     o->blocking = mp_obj_is_true(flag_in);
     return res;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_socket_setblocking_obj, ssl_socket_setblocking);
+static MP_DEFINE_CONST_FUN_OBJ_2(ssl_socket_setblocking_obj, ssl_socket_setblocking);
 
-STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t ssl_socket_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) },
@@ -401,15 +401,15 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
 
-STATIC const mp_stream_p_t ssl_socket_stream_p = {
+static const mp_stream_p_t ssl_socket_stream_p = {
     .read = ssl_socket_read,
     .write = ssl_socket_write,
     .ioctl = ssl_socket_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ssl_socket_type,
     MP_QSTR_SSLSocket,
     MP_TYPE_FLAG_NONE,
@@ -420,7 +420,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // ssl module.
 
-STATIC const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_tls) },
 
     // Classes.
@@ -430,7 +430,7 @@ STATIC const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(PROTOCOL_TLS_CLIENT) },
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(PROTOCOL_TLS_SERVER) },
 };
-STATIC MP_DEFINE_CONST_DICT(mp_module_tls_globals, mp_module_tls_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_tls_globals, mp_module_tls_globals_table);
 
 const mp_obj_module_t mp_module_tls = {
     .base = { &mp_type_module },
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 4d0ccd2c0e794..6db6ac1958dd2 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -81,26 +81,26 @@ typedef struct _mp_obj_ssl_socket_t {
     int last_error; // The last error code, if any
 } mp_obj_ssl_socket_t;
 
-STATIC const mp_obj_type_t ssl_context_type;
-STATIC const mp_obj_type_t ssl_socket_type;
+static const mp_obj_type_t ssl_context_type;
+static const mp_obj_type_t ssl_socket_type;
 
-STATIC const MP_DEFINE_STR_OBJ(mbedtls_version_obj, MBEDTLS_VERSION_STRING_FULL);
+static const MP_DEFINE_STR_OBJ(mbedtls_version_obj, MBEDTLS_VERSION_STRING_FULL);
 
-STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname);
 
 /******************************************************************************/
 // Helper functions.
 
 #ifdef MBEDTLS_DEBUG_C
-STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
+static void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
     (void)ctx;
     (void)level;
     mp_printf(&mp_plat_print, "DBG:%s:%04d: %s\n", file, line, str);
 }
 #endif
 
-STATIC NORETURN void mbedtls_raise_error(int err) {
+static NORETURN void mbedtls_raise_error(int err) {
     // Handle special cases.
     if (err == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
         mp_raise_OSError(MP_ENOMEM);
@@ -149,7 +149,7 @@ STATIC NORETURN void mbedtls_raise_error(int err) {
     #endif
 }
 
-STATIC void ssl_check_async_handshake_failure(mp_obj_ssl_socket_t *sslsock, int *errcode) {
+static void ssl_check_async_handshake_failure(mp_obj_ssl_socket_t *sslsock, int *errcode) {
     if (
         #if MBEDTLS_VERSION_NUMBER >= 0x03000000
         (*errcode < 0) && (mbedtls_ssl_is_handshake_over(&sslsock->ssl) == 0) && (*errcode != MBEDTLS_ERR_SSL_CONN_EOF)
@@ -189,7 +189,7 @@ STATIC void ssl_check_async_handshake_failure(mp_obj_ssl_socket_t *sslsock, int
     }
 }
 
-STATIC int ssl_sock_cert_verify(void *ptr, mbedtls_x509_crt *crt, int depth, uint32_t *flags) {
+static int ssl_sock_cert_verify(void *ptr, mbedtls_x509_crt *crt, int depth, uint32_t *flags) {
     mp_obj_ssl_context_t *o = ptr;
     if (o->handler == mp_const_none) {
         return 0;
@@ -202,7 +202,7 @@ STATIC int ssl_sock_cert_verify(void *ptr, mbedtls_x509_crt *crt, int depth, uin
 /******************************************************************************/
 // SSLContext type.
 
-STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t ssl_context_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, 1, false);
 
     // This is the "protocol" argument.
@@ -263,7 +263,7 @@ STATIC mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
         // Load attribute.
@@ -289,7 +289,7 @@ STATIC void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 
 #if MICROPY_PY_SSL_FINALISER
-STATIC mp_obj_t ssl_context___del__(mp_obj_t self_in) {
+static mp_obj_t ssl_context___del__(mp_obj_t self_in) {
     mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
     mbedtls_pk_free(&self->pkey);
     mbedtls_x509_crt_free(&self->cert);
@@ -299,11 +299,11 @@ STATIC mp_obj_t ssl_context___del__(mp_obj_t self_in) {
     mbedtls_ssl_config_free(&self->conf);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_context___del___obj, ssl_context___del__);
+static MP_DEFINE_CONST_FUN_OBJ_1(ssl_context___del___obj, ssl_context___del__);
 #endif
 
 // SSLContext.get_ciphers()
-STATIC mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
+static mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
     mp_obj_t list = mp_obj_new_list(0, NULL);
     for (const int *cipher_list = mbedtls_ssl_list_ciphersuites(); *cipher_list; ++cipher_list) {
         const char *cipher_name = mbedtls_ssl_get_ciphersuite_name(*cipher_list);
@@ -311,10 +311,10 @@ STATIC mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
     }
     return list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_context_get_ciphers_obj, ssl_context_get_ciphers);
+static MP_DEFINE_CONST_FUN_OBJ_1(ssl_context_get_ciphers_obj, ssl_context_get_ciphers);
 
 // SSLContext.set_ciphers(ciphersuite)
-STATIC mp_obj_t ssl_context_set_ciphers(mp_obj_t self_in, mp_obj_t ciphersuite) {
+static mp_obj_t ssl_context_set_ciphers(mp_obj_t self_in, mp_obj_t ciphersuite) {
     mp_obj_ssl_context_t *ssl_context = MP_OBJ_TO_PTR(self_in);
 
     // Check that ciphersuite is a list or tuple.
@@ -342,9 +342,9 @@ STATIC mp_obj_t ssl_context_set_ciphers(mp_obj_t self_in, mp_obj_t ciphersuite)
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_set_ciphers_obj, ssl_context_set_ciphers);
+static MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_set_ciphers_obj, ssl_context_set_ciphers);
 
-STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
+static void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
     size_t key_len;
     const byte *key = (const byte *)mp_obj_str_get_data(key_obj, &key_len);
     // len should include terminating null
@@ -373,14 +373,14 @@ STATIC void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, m
 }
 
 // SSLContext.load_cert_chain(certfile, keyfile)
-STATIC mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t cert, mp_obj_t pkey) {
+static mp_obj_t ssl_context_load_cert_chain(mp_obj_t self_in, mp_obj_t cert, mp_obj_t pkey) {
     mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
     ssl_context_load_key(self, pkey, cert);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_load_cert_chain);
+static MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_load_cert_chain);
 
-STATIC void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_obj) {
+static void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_obj) {
     size_t cacert_len;
     const byte *cacert = (const byte *)mp_obj_str_get_data(cadata_obj, &cacert_len);
     // len should include terminating null
@@ -393,15 +393,15 @@ STATIC void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_
 }
 
 // SSLContext.load_verify_locations(cadata)
-STATIC mp_obj_t ssl_context_load_verify_locations(mp_obj_t self_in, mp_obj_t cadata) {
+static mp_obj_t ssl_context_load_verify_locations(mp_obj_t self_in, mp_obj_t cadata) {
 
     mp_obj_ssl_context_t *self = MP_OBJ_TO_PTR(self_in);
     ssl_context_load_cadata(self, cadata);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_load_verify_locations_obj, ssl_context_load_verify_locations);
+static MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_load_verify_locations_obj, ssl_context_load_verify_locations);
 
-STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
@@ -419,9 +419,9 @@ STATIC mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args,
     return ssl_socket_make_new(self, sock, args[ARG_server_side].u_bool,
         args[ARG_do_handshake_on_connect].u_bool, args[ARG_server_hostname].u_obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
+static MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
 
-STATIC const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
+static const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
     #if MICROPY_PY_SSL_FINALISER
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&ssl_context___del___obj) },
     #endif
@@ -431,9 +431,9 @@ STATIC const mp_rom_map_elem_t ssl_context_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_load_verify_locations), MP_ROM_PTR(&ssl_context_load_verify_locations_obj)},
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_context_wrap_socket_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ssl_context_locals_dict, ssl_context_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ssl_context_type,
     MP_QSTR_SSLContext,
     MP_TYPE_FLAG_NONE,
@@ -445,7 +445,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // SSLSocket type.
 
-STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
+static int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
     mp_obj_t sock = *(mp_obj_t *)ctx;
 
     const mp_stream_p_t *sock_stream = mp_get_stream(sock);
@@ -463,7 +463,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) {
+static int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
     mp_obj_t sock = *(mp_obj_t *)ctx;
 
     const mp_stream_p_t *sock_stream = mp_get_stream(sock);
@@ -480,7 +480,7 @@ STATIC int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
     }
 }
 
-STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
+static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
 
     // Verify the socket object has the full stream protocol
@@ -554,7 +554,7 @@ STATIC mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
 }
 
 #if defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)
-STATIC mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
+static mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
     if (!mp_obj_is_true(binary_form)) {
         mp_raise_NotImplementedError(NULL);
@@ -565,10 +565,10 @@ STATIC mp_obj_t mod_ssl_getpeercert(mp_obj_t o_in, mp_obj_t binary_form) {
     }
     return mp_obj_new_bytes(peer_cert->raw.p, peer_cert->raw.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_ssl_getpeercert_obj, mod_ssl_getpeercert);
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_ssl_getpeercert_obj, mod_ssl_getpeercert);
 #endif
 
-STATIC mp_obj_t mod_ssl_cipher(mp_obj_t o_in) {
+static mp_obj_t mod_ssl_cipher(mp_obj_t o_in) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
     const char *cipher_suite = mbedtls_ssl_get_ciphersuite(&o->ssl);
     const char *tls_version = mbedtls_ssl_get_version(&o->ssl);
@@ -577,9 +577,9 @@ STATIC mp_obj_t mod_ssl_cipher(mp_obj_t o_in) {
 
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ssl_cipher_obj, mod_ssl_cipher);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_ssl_cipher_obj, mod_ssl_cipher);
 
-STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+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;
 
@@ -620,7 +620,7 @@ STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
     return MP_STREAM_ERROR;
 }
 
-STATIC mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
+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;
 
@@ -649,7 +649,7 @@ STATIC mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, in
     return MP_STREAM_ERROR;
 }
 
-STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
+static mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(self_in);
     mp_obj_t sock = o->sock;
     mp_obj_t dest[3];
@@ -657,9 +657,9 @@ STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     dest[2] = flag_in;
     return mp_call_method_n_kw(1, 0, dest);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
+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) {
+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;
@@ -716,7 +716,7 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
     return ret;
 }
 
-STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t ssl_socket_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) },
@@ -734,15 +734,15 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_cipher), MP_ROM_PTR(&mod_ssl_cipher_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ssl_socket_locals_dict, ssl_socket_locals_dict_table);
 
-STATIC const mp_stream_p_t ssl_socket_stream_p = {
+static const mp_stream_p_t ssl_socket_stream_p = {
     .read = socket_read,
     .write = socket_write,
     .ioctl = socket_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ssl_socket_type,
     MP_QSTR_SSLSocket,
     MP_TYPE_FLAG_NONE,
@@ -753,7 +753,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // ssl module.
 
-STATIC const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_tls) },
 
     // Classes.
@@ -767,7 +767,7 @@ STATIC const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
     { 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_tls_globals, mp_module_tls_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_tls_globals, mp_module_tls_globals_table);
 
 const mp_obj_module_t mp_module_tls = {
     .base = { &mp_type_module },
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index f56567107df7e..fa743eb637374 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -80,7 +80,7 @@ enum {
 #define IS_SCALAR_ARRAY_OF_BYTES(tuple_desc) (GET_TYPE(MP_OBJ_SMALL_INT_VALUE((tuple_desc)->items[1]), VAL_TYPE_BITS) == UINT8)
 
 // "struct" in uctypes context means "structural", i.e. aggregate, type.
-STATIC const mp_obj_type_t uctypes_struct_type;
+static const mp_obj_type_t uctypes_struct_type;
 
 typedef struct _mp_obj_uctypes_struct_t {
     mp_obj_base_t base;
@@ -89,11 +89,11 @@ typedef struct _mp_obj_uctypes_struct_t {
     uint32_t flags;
 } mp_obj_uctypes_struct_t;
 
-STATIC NORETURN void syntax_error(void) {
+static NORETURN void syntax_error(void) {
     mp_raise_TypeError(MP_ERROR_TEXT("syntax error in uctypes descriptor"));
 }
 
-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) {
+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 = mp_obj_malloc(mp_obj_uctypes_struct_t, type);
     o->addr = (void *)(uintptr_t)mp_obj_get_int_truncated(args[0]);
@@ -105,7 +105,7 @@ STATIC mp_obj_t uctypes_struct_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC void uctypes_struct_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void uctypes_struct_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
     const char *typen = "unk";
@@ -130,7 +130,7 @@ STATIC void uctypes_struct_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 }
 
 // Get size of any type descriptor
-STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_t *max_field_size);
+static mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_t *max_field_size);
 
 // Get size of scalar type descriptor
 static inline mp_uint_t uctypes_struct_scalar_size(int val_type) {
@@ -142,7 +142,7 @@ static inline mp_uint_t uctypes_struct_scalar_size(int val_type) {
 }
 
 // Get size of aggregate type descriptor
-STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_uint_t *max_field_size) {
+static mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_uint_t *max_field_size) {
     mp_uint_t total_size = 0;
 
     mp_int_t offset_ = MP_OBJ_SMALL_INT_VALUE(t->items[0]);
@@ -181,7 +181,7 @@ STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
     return total_size;
 }
 
-STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_t *max_field_size) {
+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_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);
@@ -237,7 +237,7 @@ STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_
     return total_size;
 }
 
-STATIC mp_obj_t uctypes_struct_sizeof(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t uctypes_struct_sizeof(size_t n_args, const mp_obj_t *args) {
     mp_obj_t obj_in = args[0];
     mp_uint_t max_field_size = 0;
     if (mp_obj_is_type(obj_in, &mp_type_bytearray)) {
@@ -262,7 +262,7 @@ STATIC mp_obj_t uctypes_struct_sizeof(size_t n_args, const mp_obj_t *args) {
     mp_uint_t size = uctypes_struct_size(obj_in, layout_type, &max_field_size);
     return MP_OBJ_NEW_SMALL_INT(size);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uctypes_struct_sizeof_obj, 1, 2, uctypes_struct_sizeof);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uctypes_struct_sizeof_obj, 1, 2, uctypes_struct_sizeof);
 
 static inline mp_obj_t get_unaligned(uint val_type, byte *p, int big_endian) {
     char struct_type = big_endian ? '>' : '<';
@@ -304,7 +304,7 @@ static inline void set_aligned_basic(uint val_type, void *p, mp_uint_t v) {
     assert(0);
 }
 
-STATIC mp_obj_t get_aligned(uint val_type, void *p, mp_int_t index) {
+static mp_obj_t get_aligned(uint val_type, void *p, mp_int_t index) {
     switch (val_type) {
         case UINT8:
             return MP_OBJ_NEW_SMALL_INT(((uint8_t *)p)[index]);
@@ -334,7 +334,7 @@ STATIC mp_obj_t get_aligned(uint val_type, void *p, mp_int_t index) {
     }
 }
 
-STATIC void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) {
+static void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) {
     #if MICROPY_PY_BUILTINS_FLOAT
     if (val_type == FLOAT32 || val_type == FLOAT64) {
         if (val_type == FLOAT32) {
@@ -379,7 +379,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) {
+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_dict_or_ordereddict(self->desc)) {
@@ -489,7 +489,7 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
     return MP_OBJ_NULL;
 }
 
-STATIC void uctypes_struct_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void uctypes_struct_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
         // load attribute
         mp_obj_t val = uctypes_struct_attr_op(self_in, attr, MP_OBJ_NULL);
@@ -502,7 +502,7 @@ STATIC void uctypes_struct_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
+static mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (value == MP_OBJ_NULL) {
@@ -579,7 +579,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_ob
     }
 }
 
-STATIC mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_INT_MAYBE:
@@ -599,7 +599,7 @@ STATIC mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+static mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     (void)flags;
     mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t max_field_size = 0;
@@ -613,7 +613,7 @@ STATIC mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
 
 // 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) {
+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);
     return mp_obj_new_int((mp_int_t)(uintptr_t)bufinfo.buf);
@@ -622,19 +622,19 @@ MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_addressof_obj, uctypes_struct_addressof
 
 // 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) {
+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);
 
 // 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) {
+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));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(uctypes_struct_bytes_at_obj, uctypes_struct_bytes_at);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     uctypes_struct_type,
     MP_QSTR_struct,
     MP_TYPE_FLAG_NONE,
@@ -646,7 +646,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     buffer, uctypes_get_buffer
     );
 
-STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uctypes) },
     { MP_ROM_QSTR(MP_QSTR_struct), MP_ROM_PTR(&uctypes_struct_type) },
     { MP_ROM_QSTR(MP_QSTR_sizeof), MP_ROM_PTR(&uctypes_struct_sizeof_obj) },
@@ -711,7 +711,7 @@ 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);
+static MP_DEFINE_CONST_DICT(mp_module_uctypes_globals, mp_module_uctypes_globals_table);
 
 const mp_obj_module_t mp_module_uctypes = {
     .base = { &mp_type_module },
diff --git a/extmod/modvfs.c b/extmod/modvfs.c
index 02dc67d0730a4..32dc0e5d08b0d 100644
--- a/extmod/modvfs.c
+++ b/extmod/modvfs.c
@@ -37,7 +37,7 @@
 #error "MICROPY_PY_VFS requires MICROPY_VFS"
 #endif
 
-STATIC const mp_rom_map_elem_t vfs_module_globals_table[] = {
+static const mp_rom_map_elem_t vfs_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_vfs) },
 
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
@@ -55,7 +55,7 @@ STATIC const mp_rom_map_elem_t vfs_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_VfsPosix), MP_ROM_PTR(&mp_type_vfs_posix) },
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(vfs_module_globals, vfs_module_globals_table);
+static MP_DEFINE_CONST_DICT(vfs_module_globals, vfs_module_globals_table);
 
 const mp_obj_module_t mp_module_vfs = {
     .base = { &mp_type_module },
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index 64276b5a8f3bd..9d09f65a37c1b 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -67,13 +67,13 @@ typedef struct _mp_obj_webrepl_t {
     mp_obj_t cur_file;
 } mp_obj_webrepl_t;
 
-STATIC const char passwd_prompt[] = "Password: ";
-STATIC const char connected_prompt[] = "\r\nWebREPL connected\r\n>>> ";
-STATIC const char denied_prompt[] = "\r\nAccess denied\r\n";
+static const char passwd_prompt[] = "Password: ";
+static const char connected_prompt[] = "\r\nWebREPL connected\r\n>>> ";
+static const char denied_prompt[] = "\r\nAccess denied\r\n";
 
-STATIC char webrepl_passwd[10];
+static char webrepl_passwd[10];
 
-STATIC void write_webrepl(mp_obj_t websock, const void *buf, size_t len) {
+static void write_webrepl(mp_obj_t websock, const void *buf, size_t len) {
     const mp_stream_p_t *sock_stream = mp_get_stream(websock);
     int err;
     int old_opts = sock_stream->ioctl(websock, MP_STREAM_SET_DATA_OPTS, FRAME_BIN, &err);
@@ -82,18 +82,18 @@ STATIC void write_webrepl(mp_obj_t websock, const void *buf, size_t len) {
 }
 
 #define SSTR(s) s, sizeof(s) - 1
-STATIC void write_webrepl_str(mp_obj_t websock, const char *str, int sz) {
+static void write_webrepl_str(mp_obj_t websock, const char *str, int sz) {
     int err;
     const mp_stream_p_t *sock_stream = mp_get_stream(websock);
     sock_stream->write(websock, str, sz, &err);
 }
 
-STATIC void write_webrepl_resp(mp_obj_t websock, uint16_t code) {
+static void write_webrepl_resp(mp_obj_t websock, uint16_t code) {
     char buf[4] = {'W', 'B', code & 0xff, code >> 8};
     write_webrepl(websock, buf, sizeof(buf));
 }
 
-STATIC mp_obj_t webrepl_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 webrepl_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);
     DEBUG_printf("sizeof(struct webrepl_file) = %lu\n", sizeof(struct webrepl_file));
@@ -106,7 +106,7 @@ STATIC mp_obj_t webrepl_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC void check_file_op_finished(mp_obj_webrepl_t *self) {
+static void check_file_op_finished(mp_obj_webrepl_t *self) {
     if (self->data_to_recv == 0) {
         mp_stream_close(self->cur_file);
         self->hdr_to_recv = sizeof(struct webrepl_file);
@@ -115,7 +115,7 @@ STATIC void check_file_op_finished(mp_obj_webrepl_t *self) {
     }
 }
 
-STATIC int write_file_chunk(mp_obj_webrepl_t *self) {
+static int write_file_chunk(mp_obj_webrepl_t *self) {
     const mp_stream_p_t *file_stream = mp_get_stream(self->cur_file);
     byte readbuf[2 + 256];
     int err;
@@ -130,7 +130,7 @@ STATIC int write_file_chunk(mp_obj_webrepl_t *self) {
     return out_sz;
 }
 
-STATIC void handle_op(mp_obj_webrepl_t *self) {
+static void handle_op(mp_obj_webrepl_t *self) {
 
     // Handle operations not requiring opened file
 
@@ -173,9 +173,9 @@ STATIC void handle_op(mp_obj_webrepl_t *self) {
     }
 }
 
-STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode);
+static mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode);
 
-STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     mp_uint_t out_sz;
     do {
         out_sz = _webrepl_read(self_in, buf, size, errcode);
@@ -183,7 +183,7 @@ STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *
     return out_sz;
 }
 
-STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     // We know that os.dupterm always calls with size = 1
     assert(size == 1);
     mp_obj_webrepl_t *self = MP_OBJ_TO_PTR(self_in);
@@ -292,7 +292,7 @@ STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
     return -2;
 }
 
-STATIC mp_uint_t webrepl_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t webrepl_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_webrepl_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->state == STATE_PASSWD) {
         // Don't forward output until passwd is entered
@@ -302,7 +302,7 @@ STATIC mp_uint_t webrepl_write(mp_obj_t self_in, const void *buf, mp_uint_t size
     return stream_p->write(self->sock, buf, size, errcode);
 }
 
-STATIC mp_uint_t webrepl_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t webrepl_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_obj_webrepl_t *self = MP_OBJ_TO_PTR(o_in);
     (void)arg;
     switch (request) {
@@ -317,7 +317,7 @@ STATIC mp_uint_t webrepl_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg,
     }
 }
 
-STATIC mp_obj_t webrepl_set_password(mp_obj_t passwd_in) {
+static mp_obj_t webrepl_set_password(mp_obj_t passwd_in) {
     size_t len;
     const char *passwd = mp_obj_str_get_data(passwd_in, &len);
     if (len > sizeof(webrepl_passwd) - 1) {
@@ -326,23 +326,23 @@ STATIC mp_obj_t webrepl_set_password(mp_obj_t passwd_in) {
     strcpy(webrepl_passwd, passwd);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(webrepl_set_password_obj, webrepl_set_password);
+static MP_DEFINE_CONST_FUN_OBJ_1(webrepl_set_password_obj, webrepl_set_password);
 
-STATIC const mp_rom_map_elem_t webrepl_locals_dict_table[] = {
+static const mp_rom_map_elem_t webrepl_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_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(webrepl_locals_dict, webrepl_locals_dict_table);
+static MP_DEFINE_CONST_DICT(webrepl_locals_dict, webrepl_locals_dict_table);
 
-STATIC const mp_stream_p_t webrepl_stream_p = {
+static const mp_stream_p_t webrepl_stream_p = {
     .read = webrepl_read,
     .write = webrepl_write,
     .ioctl = webrepl_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     webrepl_type,
     MP_QSTR__webrepl,
     MP_TYPE_FLAG_NONE,
@@ -351,13 +351,13 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &webrepl_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t webrepl_module_globals_table[] = {
+static const mp_rom_map_elem_t webrepl_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__webrepl) },
     { MP_ROM_QSTR(MP_QSTR__webrepl), MP_ROM_PTR(&webrepl_type) },
     { MP_ROM_QSTR(MP_QSTR_password), MP_ROM_PTR(&webrepl_set_password_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(webrepl_module_globals, webrepl_module_globals_table);
+static MP_DEFINE_CONST_DICT(webrepl_module_globals, webrepl_module_globals_table);
 
 const mp_obj_module_t mp_module_webrepl = {
     .base = { &mp_type_module },
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index 3645b771a5319..d31d00160b23b 100644
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@@ -55,10 +55,10 @@ typedef struct _mp_obj_websocket_t {
     byte last_flags;
 } mp_obj_websocket_t;
 
-STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode);
-STATIC mp_uint_t websocket_write_raw(mp_obj_t self_in, const byte *header, int hdr_sz, const void *buf, mp_uint_t size, int *errcode);
+static mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode);
+static mp_uint_t websocket_write_raw(mp_obj_t self_in, const byte *header, int hdr_sz, const void *buf, mp_uint_t size, int *errcode);
 
-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) {
+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 = mp_obj_malloc(mp_obj_websocket_t, type);
@@ -74,7 +74,7 @@ STATIC mp_obj_t websocket_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in);
     const mp_stream_p_t *stream_p = mp_get_stream(self->sock);
     while (1) {
@@ -216,7 +216,7 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
     }
 }
 
-STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in);
     assert(size < 0x10000);
     byte header[4] = {0x80 | (self->opts & FRAME_OPCODE_MASK)};
@@ -233,7 +233,7 @@ STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t si
 
     return websocket_write_raw(self_in, header, hdr_sz, buf, size, errcode);
 }
-STATIC mp_uint_t websocket_write_raw(mp_obj_t self_in, const byte *header, int hdr_sz, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t websocket_write_raw(mp_obj_t self_in, const byte *header, int hdr_sz, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_obj_t dest[3];
@@ -259,7 +259,7 @@ STATIC mp_uint_t websocket_write_raw(mp_obj_t self_in, const byte *header, int h
     return out_sz;
 }
 
-STATIC mp_uint_t websocket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t websocket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in);
     switch (request) {
         case MP_STREAM_CLOSE:
@@ -280,7 +280,7 @@ STATIC mp_uint_t websocket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t
     }
 }
 
-STATIC const mp_rom_map_elem_t websocket_locals_dict_table[] = {
+static const mp_rom_map_elem_t websocket_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) },
@@ -288,15 +288,15 @@ STATIC const mp_rom_map_elem_t websocket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(websocket_locals_dict, websocket_locals_dict_table);
+static MP_DEFINE_CONST_DICT(websocket_locals_dict, websocket_locals_dict_table);
 
-STATIC const mp_stream_p_t websocket_stream_p = {
+static const mp_stream_p_t websocket_stream_p = {
     .read = websocket_read,
     .write = websocket_write,
     .ioctl = websocket_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     websocket_type,
     MP_QSTR_websocket,
     MP_TYPE_FLAG_NONE,
@@ -305,12 +305,12 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &websocket_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t websocket_module_globals_table[] = {
+static const mp_rom_map_elem_t websocket_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_websocket) },
     { MP_ROM_QSTR(MP_QSTR_websocket), MP_ROM_PTR(&websocket_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(websocket_module_globals, websocket_module_globals_table);
+static MP_DEFINE_CONST_DICT(websocket_module_globals, websocket_module_globals_table);
 
 const mp_obj_module_t mp_module_websocket = {
     .base = { &mp_type_module },
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 2f188dbad4cee..89e68e248836e 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -57,10 +57,10 @@ typedef struct _network_cyw43_obj_t {
     int itf;
 } network_cyw43_obj_t;
 
-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 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) {
+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);
     struct netif *netif = &self->cyw->netif[self->itf];
     int status = cyw43_tcpip_link_status(self->cyw, self->itf);
@@ -89,7 +89,7 @@ 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) {
+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]) == MOD_NETWORK_STA_IF) {
         return MP_OBJ_FROM_PTR(&network_cyw43_wl_sta);
@@ -98,7 +98,7 @@ STATIC mp_obj_t network_cyw43_make_new(const mp_obj_type_t *type, size_t n_args,
     }
 }
 
-STATIC mp_obj_t network_cyw43_send_ethernet(mp_obj_t self_in, mp_obj_t buf_in) {
+static mp_obj_t network_cyw43_send_ethernet(mp_obj_t self_in, mp_obj_t buf_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_buffer_info_t buf;
     mp_get_buffer_raise(buf_in, &buf, MP_BUFFER_READ);
@@ -108,28 +108,28 @@ STATIC mp_obj_t network_cyw43_send_ethernet(mp_obj_t self_in, mp_obj_t buf_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(network_cyw43_send_ethernet_obj, network_cyw43_send_ethernet);
+static MP_DEFINE_CONST_FUN_OBJ_2(network_cyw43_send_ethernet_obj, network_cyw43_send_ethernet);
 
-STATIC mp_obj_t network_cyw43_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t buf_in) {
+static mp_obj_t network_cyw43_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t buf_in) {
     network_cyw43_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);
     cyw43_ioctl(self->cyw, mp_obj_get_int(cmd_in), buf.len, buf.buf, self->itf);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(network_cyw43_ioctl_obj, network_cyw43_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(network_cyw43_ioctl_obj, network_cyw43_ioctl);
 
 /*******************************************************************************/
 // network API
 
-STATIC mp_obj_t network_cyw43_deinit(mp_obj_t self_in) {
+static mp_obj_t network_cyw43_deinit(mp_obj_t self_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
     cyw43_deinit(self->cyw);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_deinit_obj, network_cyw43_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_deinit_obj, network_cyw43_deinit);
 
-STATIC mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
         return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf));
@@ -139,9 +139,9 @@ STATIC mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_cyw43_active_obj, 1, 2, network_cyw43_active);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_cyw43_active_obj, 1, 2, network_cyw43_active);
 
-STATIC int network_cyw43_scan_cb(void *env, const cyw43_ev_scan_result_t *res) {
+static int network_cyw43_scan_cb(void *env, const cyw43_ev_scan_result_t *res) {
     mp_obj_t list = MP_OBJ_FROM_PTR(env);
 
     // Search for existing BSSID to remove duplicates
@@ -178,7 +178,7 @@ STATIC int network_cyw43_scan_cb(void *env, const cyw43_ev_scan_result_t *res) {
     return 0; // continue scan
 }
 
-STATIC mp_obj_t network_cyw43_scan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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_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} },
@@ -234,9 +234,9 @@ STATIC mp_obj_t network_cyw43_scan(size_t n_args, const mp_obj_t *pos_args, mp_m
 
     return res;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_cyw43_scan_obj, 1, network_cyw43_scan);
+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) {
+static mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ssid, ARG_key, ARG_auth, ARG_security, ARG_bssid, ARG_channel };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -300,28 +300,28 @@ STATIC mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, m
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_cyw43_connect_obj, 1, network_cyw43_connect);
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_cyw43_connect_obj, 1, network_cyw43_connect);
 
-STATIC mp_obj_t network_cyw43_disconnect(mp_obj_t self_in) {
+static mp_obj_t network_cyw43_disconnect(mp_obj_t self_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
     cyw43_wifi_leave(self->cyw, self->itf);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_disconnect_obj, network_cyw43_disconnect);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_disconnect_obj, network_cyw43_disconnect);
 
-STATIC mp_obj_t network_cyw43_isconnected(mp_obj_t self_in) {
+static mp_obj_t network_cyw43_isconnected(mp_obj_t self_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf) == 3);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_isconnected_obj, network_cyw43_isconnected);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_isconnected_obj, network_cyw43_isconnected);
 
-STATIC mp_obj_t network_cyw43_ifconfig(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_cyw43_ifconfig(size_t n_args, const mp_obj_t *args) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     return mod_network_nic_ifconfig(&self->cyw->netif[self->itf], n_args - 1, args + 1);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_cyw43_ifconfig_obj, 1, 2, network_cyw43_ifconfig);
 
-STATIC mp_obj_t network_cyw43_status(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_cyw43_status(size_t n_args, const mp_obj_t *args) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     (void)self;
 
@@ -361,7 +361,7 @@ STATIC mp_obj_t network_cyw43_status(size_t n_args, const mp_obj_t *args) {
 
     mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_cyw43_status_obj, 1, 2, network_cyw43_status);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_cyw43_status_obj, 1, 2, network_cyw43_status);
 
 static inline uint32_t nw_get_le32(const uint8_t *buf) {
     return buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24;
@@ -374,7 +374,7 @@ static inline void nw_put_le32(uint8_t *buf, uint32_t x) {
     buf[3] = x >> 24;
 }
 
-STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (kwargs->used == 0) {
@@ -516,12 +516,12 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_cyw43_config_obj, 1, network_cyw43_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_cyw43_config_obj, 1, network_cyw43_config);
 
 /*******************************************************************************/
 // class bindings
 
-STATIC const mp_rom_map_elem_t network_cyw43_locals_dict_table[] = {
+static const mp_rom_map_elem_t network_cyw43_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_send_ethernet), MP_ROM_PTR(&network_cyw43_send_ethernet_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&network_cyw43_ioctl_obj) },
 
@@ -540,7 +540,7 @@ STATIC const mp_rom_map_elem_t network_cyw43_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(PM_PERFORMANCE) },
     { MP_ROM_QSTR(MP_QSTR_PM_POWERSAVE), MP_ROM_INT(PM_POWERSAVE) },
 };
-STATIC MP_DEFINE_CONST_DICT(network_cyw43_locals_dict, network_cyw43_locals_dict_table);
+static MP_DEFINE_CONST_DICT(network_cyw43_locals_dict, network_cyw43_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_network_cyw43_type,
diff --git a/extmod/network_esp_hosted.c b/extmod/network_esp_hosted.c
index 1a3be3f39a1a1..14e8be8b6a4e4 100644
--- a/extmod/network_esp_hosted.c
+++ b/extmod/network_esp_hosted.c
@@ -56,7 +56,7 @@ typedef struct _esp_hosted_obj_t {
 static esp_hosted_obj_t esp_hosted_sta_if = {{(mp_obj_type_t *)&mod_network_esp_hosted_type}, ESP_HOSTED_STA_IF};
 static esp_hosted_obj_t esp_hosted_ap_if = {{(mp_obj_type_t *)&mod_network_esp_hosted_type}, ESP_HOSTED_AP_IF};
 
-STATIC mp_obj_t network_esp_hosted_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 network_esp_hosted_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_t esp_hosted_obj;
     // TODO fix
@@ -70,7 +70,7 @@ STATIC mp_obj_t network_esp_hosted_make_new(const mp_obj_type_t *type, size_t n_
     return esp_hosted_obj;
 }
 
-STATIC mp_obj_t network_esp_hosted_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_esp_hosted_active(size_t n_args, const mp_obj_t *args) {
     esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (n_args == 2) {
@@ -95,9 +95,9 @@ STATIC mp_obj_t network_esp_hosted_active(size_t n_args, const mp_obj_t *args) {
     }
     return mp_obj_new_bool(esp_hosted_wifi_link_status(self->itf));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_active_obj, 1, 2, network_esp_hosted_active);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_active_obj, 1, 2, network_esp_hosted_active);
 
-STATIC int esp_hosted_scan_callback(esp_hosted_scan_result_t *scan_result, void *arg) {
+static int esp_hosted_scan_callback(esp_hosted_scan_result_t *scan_result, void *arg) {
     mp_obj_t scan_list = (mp_obj_t)arg;
     mp_obj_t ap[6] = {
         mp_obj_new_bytes((uint8_t *)scan_result->ssid, strlen(scan_result->ssid)),
@@ -111,15 +111,15 @@ STATIC int esp_hosted_scan_callback(esp_hosted_scan_result_t *scan_result, void
     return 0;
 }
 
-STATIC mp_obj_t network_esp_hosted_scan(mp_obj_t self_in) {
+static mp_obj_t network_esp_hosted_scan(mp_obj_t self_in) {
     mp_obj_t scan_list;
     scan_list = mp_obj_new_list(0, NULL);
     esp_hosted_wifi_scan(esp_hosted_scan_callback, scan_list, 10000);
     return scan_list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_scan_obj, network_esp_hosted_scan);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_scan_obj, network_esp_hosted_scan);
 
-STATIC mp_obj_t network_esp_hosted_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t network_esp_hosted_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ssid, ARG_key, ARG_security, ARG_bssid, ARG_channel };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_ssid,     MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -182,29 +182,29 @@ STATIC mp_obj_t network_esp_hosted_connect(mp_uint_t n_args, const mp_obj_t *pos
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_esp_hosted_connect_obj, 1, network_esp_hosted_connect);
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_esp_hosted_connect_obj, 1, network_esp_hosted_connect);
 
-STATIC mp_obj_t network_esp_hosted_disconnect(mp_obj_t self_in) {
+static mp_obj_t network_esp_hosted_disconnect(mp_obj_t self_in) {
     esp_hosted_obj_t *self = self_in;
     esp_hosted_wifi_disconnect(self->itf);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_disconnect_obj, network_esp_hosted_disconnect);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_disconnect_obj, network_esp_hosted_disconnect);
 
-STATIC mp_obj_t network_esp_hosted_isconnected(mp_obj_t self_in) {
+static mp_obj_t network_esp_hosted_isconnected(mp_obj_t self_in) {
     esp_hosted_obj_t *self = self_in;
     return mp_obj_new_bool(esp_hosted_wifi_is_connected(self->itf));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_isconnected_obj, network_esp_hosted_isconnected);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_esp_hosted_isconnected_obj, network_esp_hosted_isconnected);
 
-STATIC mp_obj_t network_esp_hosted_ifconfig(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_esp_hosted_ifconfig(size_t n_args, const mp_obj_t *args) {
     esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     void *netif = esp_hosted_wifi_get_netif(self->itf);
     return mod_network_nic_ifconfig(netif, n_args - 1, args + 1);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_ifconfig_obj, 1, 2, network_esp_hosted_ifconfig);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_ifconfig_obj, 1, 2, network_esp_hosted_ifconfig);
 
-STATIC mp_obj_t network_esp_hosted_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static mp_obj_t network_esp_hosted_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (kwargs->used == 0) {
@@ -253,9 +253,9 @@ STATIC mp_obj_t network_esp_hosted_config(size_t n_args, const mp_obj_t *args, m
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_esp_hosted_config_obj, 1, network_esp_hosted_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_esp_hosted_config_obj, 1, network_esp_hosted_config);
 
-STATIC mp_obj_t network_esp_hosted_status(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_esp_hosted_status(size_t n_args, const mp_obj_t *args) {
     esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (n_args == 1) {
@@ -290,9 +290,9 @@ STATIC mp_obj_t network_esp_hosted_status(size_t n_args, const mp_obj_t *args) {
 
     mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_status_obj, 1, 2, network_esp_hosted_status);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_status_obj, 1, 2, network_esp_hosted_status);
 
-STATIC const mp_rom_map_elem_t network_esp_hosted_locals_dict_table[] = {
+static const mp_rom_map_elem_t network_esp_hosted_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active),              MP_ROM_PTR(&network_esp_hosted_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_scan),                MP_ROM_PTR(&network_esp_hosted_scan_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect),             MP_ROM_PTR(&network_esp_hosted_connect_obj) },
@@ -305,7 +305,7 @@ STATIC const mp_rom_map_elem_t network_esp_hosted_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WEP),                 MP_ROM_INT(ESP_HOSTED_SEC_WEP) },
     { MP_ROM_QSTR(MP_QSTR_WPA_PSK),             MP_ROM_INT(ESP_HOSTED_SEC_WPA_WPA2_PSK) },
 };
-STATIC MP_DEFINE_CONST_DICT(network_esp_hosted_locals_dict, network_esp_hosted_locals_dict_table);
+static MP_DEFINE_CONST_DICT(network_esp_hosted_locals_dict, network_esp_hosted_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mod_network_esp_hosted_type,
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 1deb117e70689..e68a7a66e27d2 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -85,21 +85,21 @@ static nina_obj_t network_nina_wl_sta = {{(mp_obj_type_t *)&mod_network_nic_type
 static nina_obj_t network_nina_wl_ap = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, false, MOD_NETWORK_AP_IF};
 static mp_sched_node_t mp_wifi_poll_node;
 static soft_timer_entry_t mp_wifi_poll_timer;
-STATIC void network_ninaw10_deinit(void);
+static void network_ninaw10_deinit(void);
 
-STATIC bool network_ninaw10_poll_list_is_empty(void) {
+static bool network_ninaw10_poll_list_is_empty(void) {
     return MP_STATE_PORT(mp_wifi_poll_list) == NULL ||
            MP_STATE_PORT(mp_wifi_poll_list)->len == 0;
 }
 
-STATIC void network_ninaw10_poll_list_insert(mp_obj_t socket) {
+static void network_ninaw10_poll_list_insert(mp_obj_t socket) {
     if (MP_STATE_PORT(mp_wifi_poll_list) == NULL) {
         MP_STATE_PORT(mp_wifi_poll_list) = mp_obj_new_list(0, NULL);
     }
     mp_obj_list_append(MP_STATE_PORT(mp_wifi_poll_list), socket);
 }
 
-STATIC void network_ninaw10_poll_list_remove(mp_obj_t socket) {
+static void network_ninaw10_poll_list_remove(mp_obj_t socket) {
     if (MP_STATE_PORT(mp_wifi_poll_list) == NULL) {
         return;
     }
@@ -109,7 +109,7 @@ STATIC void network_ninaw10_poll_list_remove(mp_obj_t socket) {
     }
 }
 
-STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) {
+static void network_ninaw10_poll_sockets(mp_sched_node_t *node) {
     (void)node;
     for (mp_uint_t i = 0; MP_STATE_PORT(mp_wifi_poll_list) && i < MP_STATE_PORT(mp_wifi_poll_list)->len;) {
         mod_network_socket_obj_t *socket = MP_STATE_PORT(mp_wifi_poll_list)->items[i];
@@ -134,7 +134,7 @@ STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) {
     }
 }
 
-STATIC void network_ninaw10_poll_connect(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();
@@ -166,7 +166,7 @@ STATIC void network_ninaw10_poll_connect(mp_sched_node_t *node) {
     soft_timer_reinsert(&mp_wifi_poll_timer, NINAW10_POLL_INTERVAL);
 }
 
-STATIC void network_ninaw10_timer_callback(soft_timer_entry_t *self) {
+static void network_ninaw10_timer_callback(soft_timer_entry_t *self) {
     debug_printf("timer_callback() poll status STA: %d AP: %d SOCKETS: %d\n",
         network_nina_wl_sta.poll_enable, network_nina_wl_ap.poll_enable, !network_ninaw10_poll_list_is_empty());
     if (network_nina_wl_sta.poll_enable) {
@@ -176,7 +176,7 @@ STATIC void network_ninaw10_timer_callback(soft_timer_entry_t *self) {
     }
 }
 
-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) {
+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);
     mp_obj_t nina_obj;
     if (n_args == 0 || mp_obj_get_int(args[0]) == MOD_NETWORK_STA_IF) {
@@ -189,7 +189,7 @@ STATIC mp_obj_t network_ninaw10_make_new(const mp_obj_type_t *type, size_t n_arg
     return nina_obj;
 }
 
-STATIC mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
+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]);
@@ -231,9 +231,9 @@ STATIC mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
     }
     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 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) {
+static int nina_scan_callback(nina_scan_result_t *scan_result, void *arg) {
     mp_obj_t scan_list = (mp_obj_t)arg;
     mp_obj_t ap[6] = {
         mp_obj_new_bytes((uint8_t *)scan_result->ssid, strlen(scan_result->ssid)),
@@ -247,15 +247,15 @@ STATIC int nina_scan_callback(nina_scan_result_t *scan_result, void *arg) {
     return 0;
 }
 
-STATIC mp_obj_t network_ninaw10_scan(mp_obj_t self_in) {
+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_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 mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_ssid, ARG_key, ARG_security, ARG_channel };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_ssid,     MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -322,20 +322,20 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_ninaw10_connect_obj, 1, network_ninaw10_connect);
+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) {
+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_DEFINE_CONST_FUN_OBJ_1(network_ninaw10_disconnect_obj, network_ninaw10_disconnect);
 
-STATIC mp_obj_t network_ninaw10_isconnected(mp_obj_t self_in) {
+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_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) {
+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
@@ -359,9 +359,9 @@ STATIC mp_obj_t network_ninaw10_ifconfig(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_ifconfig_obj, 1, 2, network_ninaw10_ifconfig);
+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) {
+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;
 
@@ -410,9 +410,9 @@ STATIC mp_obj_t network_ninaw10_config(size_t n_args, const mp_obj_t *args, mp_m
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_ninaw10_config_obj, 1, network_ninaw10_config);
+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) {
+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;
 
@@ -444,9 +444,9 @@ STATIC mp_obj_t network_ninaw10_status(size_t n_args, const mp_obj_t *args) {
 
     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 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) {
+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;
@@ -458,14 +458,14 @@ STATIC mp_obj_t network_ninaw10_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(network_ninaw10_ioctl_obj, network_ninaw10_ioctl);
+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) {
+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_poll(mod_network_socket_obj_t *socket, uint32_t rwf, int *_errno) {
+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, %d)\n", socket->fileno, socket->timeout, rwf);
     if (socket->timeout == 0) {
@@ -488,7 +488,7 @@ STATIC int network_ninaw10_socket_poll(mod_network_socket_obj_t *socket, uint32_
     return 0;
 }
 
-STATIC int network_ninaw10_socket_setblocking(mod_network_socket_obj_t *socket, bool blocking, int *_errno) {
+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) {
@@ -499,7 +499,7 @@ STATIC int network_ninaw10_socket_setblocking(mod_network_socket_obj_t *socket,
     return 0;
 }
 
-STATIC int network_ninaw10_socket_listening(mod_network_socket_obj_t *socket, int *_errno) {
+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) {
@@ -510,7 +510,7 @@ STATIC int network_ninaw10_socket_listening(mod_network_socket_obj_t *socket, in
     return listening;
 }
 
-STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
+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);
 
     uint8_t socket_type;
@@ -553,7 +553,7 @@ STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *
     return network_ninaw10_socket_setblocking(socket, false, _errno);
 }
 
-STATIC void network_ninaw10_socket_close(mod_network_socket_obj_t *socket) {
+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) {
         socket->callback = MP_OBJ_NULL;
@@ -565,7 +565,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) {
+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);
 
     int ret = nina_socket_bind(socket->fileno, ip, port);
@@ -581,7 +581,7 @@ STATIC int network_ninaw10_socket_bind(mod_network_socket_obj_t *socket, byte *i
     return 0;
 }
 
-STATIC int network_ninaw10_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
+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) {
@@ -593,7 +593,7 @@ STATIC int network_ninaw10_socket_listen(mod_network_socket_obj_t *socket, mp_in
     return 0;
 }
 
-STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
+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);
 
@@ -622,7 +622,7 @@ STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
     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) {
+static int network_ninaw10_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
     debug_printf("socket_connect(%d)\n", socket->fileno);
 
     int ret = nina_socket_connect(socket->fileno, ip, port);
@@ -645,7 +645,7 @@ STATIC int network_ninaw10_socket_connect(mod_network_socket_obj_t *socket, byte
     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) {
+static mp_uint_t network_ninaw10_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
     debug_printf("socket_send(%d, %d)\n", socket->fileno, len);
 
     if (network_ninaw10_socket_poll(socket, SOCKET_POLL_WR, _errno) != 0) {
@@ -665,7 +665,7 @@ STATIC mp_uint_t network_ninaw10_socket_send(mod_network_socket_obj_t *socket, c
     return ret;
 }
 
-STATIC mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
+static mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
     debug_printf("socket_recv(%d)\n", socket->fileno);
     // check if socket in listening state.
     if (network_ninaw10_socket_listening(socket, _errno) == 1) {
@@ -694,7 +694,7 @@ STATIC mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, b
     return ret;
 }
 
-STATIC mp_uint_t network_ninaw10_socket_auto_bind(mod_network_socket_obj_t *socket, int *_errno) {
+static mp_uint_t network_ninaw10_socket_auto_bind(mod_network_socket_obj_t *socket, int *_errno) {
     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) {
@@ -708,7 +708,7 @@ STATIC mp_uint_t network_ninaw10_socket_auto_bind(mod_network_socket_obj_t *sock
     return 0;
 }
 
-STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
+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.
@@ -732,7 +732,7 @@ STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
     return ret;
 }
 
-STATIC mp_uint_t network_ninaw10_socket_recvfrom(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) {
     debug_printf("socket_recvfrom(%d)\n", socket->fileno);
     // Auto-bind the socket first if the socket is unbound.
@@ -758,7 +758,7 @@ STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socke
     return ret;
 }
 
-STATIC int network_ninaw10_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t
+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) {
@@ -781,7 +781,7 @@ STATIC int network_ninaw10_socket_setsockopt(mod_network_socket_obj_t *socket, m
     return 0;
 }
 
-STATIC int network_ninaw10_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
+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) {
@@ -806,7 +806,7 @@ STATIC int network_ninaw10_socket_settimeout(mod_network_socket_obj_t *socket, m
     return 0;
 }
 
-STATIC int network_ninaw10_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
+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;
     debug_printf("socket_ioctl(%d, %d)\n", socket->fileno, request);
     if (request == MP_STREAM_POLL) {
@@ -830,7 +830,7 @@ STATIC int network_ninaw10_socket_ioctl(mod_network_socket_obj_t *socket, mp_uin
     return ret;
 }
 
-STATIC void network_ninaw10_deinit(void) {
+static void network_ninaw10_deinit(void) {
     // On soft-reboot, gc_sweep_all is called and all open sockets are closed
     // and collected. Make sure that the driver is not keeping any references
     // to collected sockets in the poll list.
@@ -838,7 +838,7 @@ STATIC void network_ninaw10_deinit(void) {
     MP_STATE_PORT(mp_wifi_poll_list) = NULL;
 }
 
-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) },
@@ -857,9 +857,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 const mod_network_nic_protocol_t mod_network_nic_protocol_nina = {
+static const mod_network_nic_protocol_t mod_network_nic_protocol_nina = {
     .gethostbyname = network_ninaw10_gethostbyname,
     .deinit = network_ninaw10_deinit,
     .socket = network_ninaw10_socket_socket,
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index d4841e0176dcb..d1aadc3e15584 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -120,21 +120,21 @@ typedef struct _wiznet5k_obj_t {
 #endif
 
 // Global object holding the Wiznet5k state
-STATIC wiznet5k_obj_t wiznet5k_obj;
+static wiznet5k_obj_t wiznet5k_obj;
 
-STATIC void wiz_cris_enter(void) {
+static void wiz_cris_enter(void) {
     wiznet5k_obj.cris_state = MICROPY_BEGIN_ATOMIC_SECTION();
 }
 
-STATIC void wiz_cris_exit(void) {
+static void wiz_cris_exit(void) {
     MICROPY_END_ATOMIC_SECTION(wiznet5k_obj.cris_state);
 }
 
-STATIC void wiz_cs_select(void) {
+static void wiz_cs_select(void) {
     mp_hal_pin_low(wiznet5k_obj.cs);
 }
 
-STATIC void wiz_cs_deselect(void) {
+static void wiz_cs_deselect(void) {
     mp_hal_pin_high(wiznet5k_obj.cs);
 }
 
@@ -147,25 +147,25 @@ void mpy_wiznet_yield(void) {
     #endif
 }
 
-STATIC void wiz_spi_read(uint8_t *buf, uint16_t len) {
+static void wiz_spi_read(uint8_t *buf, uint16_t len) {
     wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, len, buf, buf);
 }
 
-STATIC void wiz_spi_write(const uint8_t *buf, uint16_t len) {
+static void wiz_spi_write(const uint8_t *buf, uint16_t len) {
     wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, len, buf, NULL);
 }
 
-STATIC uint8_t wiz_spi_readbyte() {
+static uint8_t wiz_spi_readbyte() {
     uint8_t buf = 0;
     wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, 1, &buf, &buf);
     return buf;
 }
 
-STATIC void wiz_spi_writebyte(const uint8_t buf) {
+static void wiz_spi_writebyte(const uint8_t buf) {
     wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, 1, &buf, NULL);
 }
 
-STATIC void wiznet5k_get_mac_address(wiznet5k_obj_t *self, uint8_t mac[6]) {
+static void wiznet5k_get_mac_address(wiznet5k_obj_t *self, uint8_t mac[6]) {
     (void)self;
     getSHAR(mac);
 }
@@ -173,9 +173,9 @@ STATIC void wiznet5k_get_mac_address(wiznet5k_obj_t *self, uint8_t mac[6]) {
 #if WIZNET5K_WITH_LWIP_STACK
 
 void wiznet5k_try_poll(void);
-STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self);
+static void wiznet5k_lwip_init(wiznet5k_obj_t *self);
 
-STATIC mp_obj_t mpy_wiznet_read_int(mp_obj_t none_in) {
+static mp_obj_t mpy_wiznet_read_int(mp_obj_t none_in) {
     (void)none_in;
     // Handle incoming data, unless the SPI bus is busy
     if (mp_hal_pin_read(wiznet5k_obj.cs)) {
@@ -183,9 +183,9 @@ STATIC mp_obj_t mpy_wiznet_read_int(mp_obj_t none_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mpy_wiznet_read_int_obj, mpy_wiznet_read_int);
+static MP_DEFINE_CONST_FUN_OBJ_1(mpy_wiznet_read_int_obj, mpy_wiznet_read_int);
 
-STATIC void wiznet5k_config_interrupt(bool enabled) {
+static void wiznet5k_config_interrupt(bool enabled) {
     if (!wiznet5k_obj.use_interrupt) {
         return;
     }
@@ -207,7 +207,7 @@ void wiznet5k_deinit(void) {
     }
 }
 
-STATIC void wiznet5k_init(void) {
+static void wiznet5k_init(void) {
     // Configure wiznet for raw ethernet frame usage.
 
     // Configure 16k buffers for fast MACRAW
@@ -241,7 +241,7 @@ STATIC void wiznet5k_init(void) {
     mod_network_register_nic(&wiznet5k_obj);
 }
 
-STATIC void wiznet5k_send_ethernet(wiznet5k_obj_t *self, size_t len, const uint8_t *buf) {
+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) {
@@ -252,7 +252,7 @@ STATIC void wiznet5k_send_ethernet(wiznet5k_obj_t *self, size_t len, const uint8
 }
 
 // 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) {
+static uint16_t wiznet5k_recv_ethernet(wiznet5k_obj_t *self) {
     uint16_t len = getSn_RX_RSR(0);
     if (len == 0) {
         return 0;
@@ -274,7 +274,7 @@ STATIC uint16_t wiznet5k_recv_ethernet(wiznet5k_obj_t *self) {
 /*******************************************************************************/
 // Wiznet5k lwIP interface
 
-STATIC err_t wiznet5k_netif_output(struct netif *netif, struct pbuf *p) {
+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) {
@@ -284,7 +284,7 @@ STATIC err_t wiznet5k_netif_output(struct netif *netif, struct pbuf *p) {
     return ERR_OK;
 }
 
-STATIC err_t wiznet5k_netif_init(struct netif *netif) {
+static err_t wiznet5k_netif_init(struct netif *netif) {
     netif->linkoutput = wiznet5k_netif_output;
     netif->output = etharp_output;
     netif->mtu = 1500;
@@ -303,7 +303,7 @@ STATIC err_t wiznet5k_netif_init(struct netif *netif) {
     return ERR_OK;
 }
 
-STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self) {
+static void wiznet5k_lwip_init(wiznet5k_obj_t *self) {
     ip_addr_t ipconfig[4];
     IP_ADDR4(&ipconfig[0], 0, 0, 0, 0);
     IP_ADDR4(&ipconfig[1], 0, 0, 0, 0);
@@ -350,7 +350,7 @@ void wiznet5k_poll(void) {
 
 #if WIZNET5K_PROVIDED_STACK
 
-STATIC void wiz_dhcp_assign(void) {
+static void wiz_dhcp_assign(void) {
     getIPfromDHCP(wiznet5k_obj.netinfo.ip);
     getGWfromDHCP(wiznet5k_obj.netinfo.gw);
     getSNfromDHCP(wiznet5k_obj.netinfo.sn);
@@ -358,16 +358,16 @@ STATIC void wiz_dhcp_assign(void) {
     ctlnetwork(CN_SET_NETINFO, (void *)&wiznet5k_obj.netinfo);
 }
 
-STATIC void wiz_dhcp_update(void) {
+static void wiz_dhcp_update(void) {
     ;
 }
 
 
-STATIC void wiz_dhcp_conflict(void) {
+static void wiz_dhcp_conflict(void) {
     ;
 }
 
-STATIC void wiznet5k_init(void) {
+static void wiznet5k_init(void) {
     // Configure wiznet provided TCP / socket interface
 
     reg_dhcp_cbfunc(wiz_dhcp_assign, wiz_dhcp_update, wiz_dhcp_conflict);
@@ -394,7 +394,7 @@ STATIC void wiznet5k_init(void) {
     wiznet5k_obj.active = true;
 }
 
-STATIC int wiznet5k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
+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);
@@ -412,7 +412,7 @@ 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) {
+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;
@@ -456,7 +456,7 @@ STATIC int wiznet5k_socket_socket(mod_network_socket_obj_t *socket, int *_errno)
     return 0;
 }
 
-STATIC void wiznet5k_socket_close(mod_network_socket_obj_t *socket) {
+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);
@@ -464,7 +464,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) {
+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) {
@@ -480,7 +480,7 @@ STATIC int wiznet5k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_u
     return 0;
 }
 
-STATIC int wiznet5k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
+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);
@@ -490,7 +490,7 @@ STATIC int wiznet5k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t bac
     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) {
+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) {
@@ -525,7 +525,7 @@ STATIC int wiznet5k_socket_accept(mod_network_socket_obj_t *socket, mod_network_
     }
 }
 
-STATIC int wiznet5k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
+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;
@@ -546,7 +546,7 @@ STATIC int wiznet5k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, m
     return 0;
 }
 
-STATIC mp_uint_t wiznet5k_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
+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();
@@ -560,7 +560,7 @@ STATIC mp_uint_t wiznet5k_socket_send(mod_network_socket_obj_t *socket, const by
     return ret;
 }
 
-STATIC mp_uint_t wiznet5k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
+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();
@@ -574,7 +574,7 @@ STATIC mp_uint_t wiznet5k_socket_recv(mod_network_socket_obj_t *socket, byte *bu
     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) {
+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) {
@@ -594,7 +594,7 @@ STATIC mp_uint_t wiznet5k_socket_sendto(mod_network_socket_obj_t *socket, const
     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) {
+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);
@@ -608,13 +608,13 @@ STATIC mp_uint_t wiznet5k_socket_recvfrom(mod_network_socket_obj_t *socket, byte
     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) {
+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) {
+static int wiznet5k_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
     // TODO
     *_errno = MP_EINVAL;
     return -1;
@@ -628,7 +628,7 @@ 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) {
+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) {
@@ -644,7 +644,7 @@ STATIC int wiznet5k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t req
     }
 }
 
-STATIC void wiznet5k_dhcp_init(wiznet5k_obj_t *self) {
+static void wiznet5k_dhcp_init(wiznet5k_obj_t *self) {
     uint8_t test_buf[2048];
     uint8_t ret = 0;
     uint8_t dhcp_retry = 0;
@@ -682,7 +682,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) {
+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) {
     mp_obj_base_t *spi;
     mp_hal_pin_obj_t cs;
     mp_hal_pin_obj_t rst;
@@ -763,7 +763,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
 
 // regs()
 // Dump WIZNET5K registers.
-STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
+static mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
     (void)self_in;
     printf("Wiz CREG:");
     for (int i = 0; i < 0x50; ++i) {
@@ -794,9 +794,9 @@ STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
     printf("\n");
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_regs_obj, wiznet5k_regs);
+static MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_regs_obj, wiznet5k_regs);
 
-STATIC mp_obj_t wiznet5k_isconnected(mp_obj_t self_in) {
+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
@@ -806,9 +806,9 @@ STATIC mp_obj_t wiznet5k_isconnected(mp_obj_t self_in) {
         #endif
         );
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_isconnected_obj, wiznet5k_isconnected);
+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) {
+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));
@@ -860,12 +860,12 @@ STATIC mp_obj_t wiznet5k_active(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_active_obj, 1, 2, wiznet5k_active);
+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) {
+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);
@@ -904,29 +904,29 @@ STATIC mp_obj_t wiznet5k_ifconfig(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_ifconfig_obj, 1, 2, wiznet5k_ifconfig);
+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) {
+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_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) {
+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 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) {
+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;
 
@@ -944,9 +944,9 @@ STATIC mp_obj_t wiznet5k_status(size_t n_args, const mp_obj_t *args) {
     }
     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_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) {
+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) {
@@ -1001,9 +1001,9 @@ STATIC mp_obj_t wiznet5k_config(size_t n_args, const mp_obj_t *args, mp_map_t *k
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wiznet5k_config_obj, 1, wiznet5k_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(wiznet5k_config_obj, 1, wiznet5k_config);
 
-STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
+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) },
@@ -1014,7 +1014,7 @@ STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(wiznet5k_locals_dict, wiznet5k_locals_dict_table);
 
 #if WIZNET5K_WITH_LWIP_STACK
 #define NIC_TYPE_WIZNET_PROTOCOL
diff --git a/extmod/nimble/hal/hal_uart.c b/extmod/nimble/hal/hal_uart.c
index f4a9319c8b5fa..b57117878400c 100644
--- a/extmod/nimble/hal/hal_uart.c
+++ b/extmod/nimble/hal/hal_uart.c
@@ -93,7 +93,7 @@ int hal_uart_close(uint32_t port) {
     return 0; // success
 }
 
-STATIC void mp_bluetooth_hci_uart_char_cb(uint8_t chr) {
+static void mp_bluetooth_hci_uart_char_cb(uint8_t chr) {
     #if HCI_TRACE
     printf(COL_BLUE "> [% 8d] %02x" COL_OFF "\n", (int)mp_hal_ticks_ms(), chr);
     #endif
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 5bab43a0ccea0..92bc6764edc63 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -57,12 +57,12 @@
 
 #define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
 
-STATIC uint8_t nimble_address_mode = BLE_OWN_ADDR_RANDOM;
+static uint8_t nimble_address_mode = BLE_OWN_ADDR_RANDOM;
 
 #define NIMBLE_STARTUP_TIMEOUT 2000
 
 // Any BLE_HS_xxx code not in this table will default to MP_EIO.
-STATIC int8_t ble_hs_err_to_errno_table[] = {
+static int8_t ble_hs_err_to_errno_table[] = {
     [BLE_HS_EAGAIN] = MP_EAGAIN,
     [BLE_HS_EALREADY] = MP_EALREADY,
     [BLE_HS_EINVAL] = MP_EINVAL,
@@ -76,70 +76,70 @@ STATIC int8_t ble_hs_err_to_errno_table[] = {
     [BLE_HS_EBADDATA] = MP_EINVAL,
 };
 
-STATIC int ble_hs_err_to_errno(int err);
+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);
+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);
+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 void reset_cb(int reason);
 
-STATIC bool has_public_address(void);
-STATIC void set_random_address(bool nrpa);
+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);
+static int load_irk(void);
 #endif
 
-STATIC void sync_cb(void);
+static void sync_cb(void);
 
 #if !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
-STATIC void ble_hs_shutdown_stop_cb(int status, void *arg);
+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);
+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);
+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);
+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);
+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);
+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);
+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);
+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);
+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_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);
+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) {
+static int ble_hs_err_to_errno(int err) {
     DEBUG_printf("ble_hs_err_to_errno: %d\n", err);
     if (!err) {
         return 0;
@@ -154,7 +154,7 @@ 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, ble_uuid_any_t *storage) {
+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 = storage ? &storage->u16 : m_new(ble_uuid16_t, 1);
         result->u.type = BLE_UUID_TYPE_16;
@@ -176,7 +176,7 @@ 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) {
+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];
     }
@@ -184,7 +184,7 @@ 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 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) {
@@ -210,7 +210,7 @@ STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(const ble_uuid_any_t *uuid) {
     return result;
 }
 
-STATIC ble_addr_t create_nimble_addr(uint8_t addr_type, const uint8_t *addr) {
+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;
     // Incoming addr is from modbluetooth (BE), so copy and convert to LE for Nimble.
@@ -222,15 +222,15 @@ STATIC ble_addr_t create_nimble_addr(uint8_t addr_type, const uint8_t *addr) {
 
 volatile int mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
 
-STATIC void reset_cb(int reason) {
+static void reset_cb(int reason) {
     (void)reason;
 }
 
-STATIC bool has_public_address(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) {
+static void set_random_address(bool nrpa) {
     int rc;
     (void)rc;
     ble_addr_t addr;
@@ -274,7 +274,7 @@ STATIC void set_random_address(bool nrpa) {
 // Must be distinct to BLE_STORE_OBJ_TYPE_ in ble_store.h.
 #define SECRET_TYPE_OUR_IRK 10
 
-STATIC int load_irk(void) {
+static int load_irk(void) {
     // NimBLE unconditionally loads a fixed IRK on startup.
     // See https://github.com/apache/mynewt-nimble/issues/887
 
@@ -318,7 +318,7 @@ STATIC int load_irk(void) {
 }
 #endif
 
-STATIC void sync_cb(void) {
+static void sync_cb(void) {
     int rc;
     (void)rc;
 
@@ -349,7 +349,7 @@ STATIC void sync_cb(void) {
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE;
 }
 
-STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
+static void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
     if (!mp_bluetooth_is_active()) {
         return;
     }
@@ -390,7 +390,7 @@ STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
     }
 }
 
-STATIC int commmon_gap_event_cb(struct ble_gap_event *event, void *arg) {
+static int commmon_gap_event_cb(struct ble_gap_event *event, void *arg) {
     struct ble_gap_conn_desc desc;
 
     switch (event->type) {
@@ -436,7 +436,7 @@ STATIC int commmon_gap_event_cb(struct ble_gap_event *event, void *arg) {
     }
 }
 
-STATIC int central_gap_event_cb(struct ble_gap_event *event, void *arg) {
+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;
@@ -546,13 +546,13 @@ void mp_bluetooth_nimble_port_start(void) {
 }
 
 // Called when the host stop procedure has completed.
-STATIC void ble_hs_shutdown_stop_cb(int status, void *arg) {
+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;
+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");
@@ -1127,7 +1127,7 @@ int mp_bluetooth_gap_passkey(uint16_t conn_handle, uint8_t action, mp_int_t pass
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
-STATIC int gap_scan_cb(struct ble_gap_event *event, void *arg) {
+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()) {
         return 0;
@@ -1185,7 +1185,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) {
+static int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
     DEBUG_printf("peripheral_gap_event_cb: event=%d\n", event->type);
     if (!mp_bluetooth_is_active()) {
         return 0;
@@ -1255,7 +1255,7 @@ int mp_bluetooth_gap_peripheral_connect_cancel(void) {
     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) {
+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;
@@ -1273,7 +1273,7 @@ STATIC int ble_gattc_service_cb(uint16_t conn_handle, const struct ble_gatt_erro
 
 #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) {
+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
@@ -1320,7 +1320,7 @@ 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) {
+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;
     }
@@ -1329,7 +1329,7 @@ STATIC bool match_char_uuid(const mp_obj_bluetooth_uuid_t *filter_uuid, const bl
     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) {
+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;
@@ -1401,7 +1401,7 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
     return ble_hs_err_to_errno(err);
 }
 
-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) {
+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;
@@ -1423,7 +1423,7 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
     return ble_hs_err_to_errno(err);
 }
 
-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_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_gattc_attr_read_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
     if (!mp_bluetooth_is_active()) {
@@ -1445,7 +1445,7 @@ int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
     return ble_hs_err_to_errno(err);
 }
 
-STATIC int ble_gattc_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_gattc_attr_write_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
     if (!mp_bluetooth_is_active()) {
@@ -1481,7 +1481,7 @@ 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);
+static void unstall_l2cap_channel(void);
 #endif
 
 void mp_bluetooth_nimble_sent_hci_packet(void) {
@@ -1518,12 +1518,12 @@ 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();
+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() {
+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) {
@@ -1531,7 +1531,7 @@ STATIC void destroy_l2cap_channel() {
     }
 }
 
-STATIC void unstall_l2cap_channel(void) {
+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 un-stall the L2CAP channel if it was marked as "mem_stalled" by
     // mp_bluetooth_l2cap_send. (This happens if the pool is half-empty).
@@ -1544,7 +1544,7 @@ STATIC void unstall_l2cap_channel(void) {
     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) {
+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;
@@ -1665,7 +1665,7 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
     return 0;
 }
 
-STATIC mp_bluetooth_nimble_l2cap_channel_t *get_l2cap_channel_for_conn_cid(uint16_t conn_handle, uint16_t cid) {
+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;
@@ -1684,7 +1684,7 @@ STATIC mp_bluetooth_nimble_l2cap_channel_t *get_l2cap_channel_for_conn_cid(uint1
     return chan;
 }
 
-STATIC int create_l2cap_channel(uint16_t mtu, mp_bluetooth_nimble_l2cap_channel_t **out) {
+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.
@@ -1897,7 +1897,7 @@ 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_secret_store_read(int obj_type, const union ble_store_key *key, union ble_store_value *value) {
+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;
@@ -1962,7 +1962,7 @@ STATIC int ble_secret_store_read(int obj_type, const union ble_store_key *key, u
     return 0;
 }
 
-STATIC int ble_secret_store_write(int obj_type, const union ble_store_value *val) {
+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:
@@ -1996,7 +1996,7 @@ 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) {
+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:
diff --git a/extmod/nimble/nimble/nimble_npl_os.c b/extmod/nimble/nimble/nimble_npl_os.c
index b68957fabf385..0dc80482c42cc 100644
--- a/extmod/nimble/nimble/nimble_npl_os.c
+++ b/extmod/nimble/nimble/nimble_npl_os.c
@@ -67,7 +67,7 @@ typedef struct _mp_bluetooth_nimble_malloc_t {
 } mp_bluetooth_nimble_malloc_t;
 
 // TODO: This is duplicated from mbedtls. Perhaps make this a generic feature?
-STATIC void *m_malloc_bluetooth(size_t size) {
+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;
@@ -79,11 +79,11 @@ STATIC void *m_malloc_bluetooth(size_t size) {
     return alloc->data;
 }
 
-STATIC mp_bluetooth_nimble_malloc_t* get_nimble_malloc(void *ptr) {
+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) {
+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;
@@ -102,7 +102,7 @@ STATIC void m_free_bluetooth(void *ptr) {
 
 // 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) {
+static bool is_valid_nimble_malloc(void *ptr) {
     DEBUG_MALLOC_printf("NIMBLE is_valid_nimble_malloc(%p)\n", ptr);
     mp_bluetooth_nimble_malloc_t *alloc = MP_STATE_PORT(bluetooth_nimble_memory);
     while (alloc) {
diff --git a/extmod/os_dupterm.c b/extmod/os_dupterm.c
index dcd9c54b998e1..156766a43c508 100644
--- a/extmod/os_dupterm.c
+++ b/extmod/os_dupterm.c
@@ -208,7 +208,7 @@ int mp_os_dupterm_tx_strn(const char *str, size_t len) {
     return did_write ? ret : -1;
 }
 
-STATIC mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args) {
     mp_int_t idx = 0;
     if (n_args == 2) {
         idx = mp_obj_get_int(args[1]);
diff --git a/extmod/vfs.c b/extmod/vfs.c
index af63ceb37eb19..ae09b8afe8d08 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -93,7 +93,7 @@ mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out) {
 }
 
 // Version of mp_vfs_lookup_path that takes and returns uPy string objects.
-STATIC mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) {
+static mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) {
     const char *path = mp_obj_str_get_str(path_in);
     const char *p_out;
     mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out);
@@ -106,7 +106,7 @@ STATIC mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) {
     return vfs;
 }
 
-STATIC mp_obj_t mp_vfs_proxy_call(mp_vfs_mount_t *vfs, qstr meth_name, size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_vfs_proxy_call(mp_vfs_mount_t *vfs, qstr meth_name, size_t n_args, const mp_obj_t *args) {
     assert(n_args <= PROXY_MAX_ARGS);
     if (vfs == MP_VFS_NONE) {
         // mount point not found
@@ -159,7 +159,7 @@ mp_import_stat_t mp_vfs_import_stat(const char *path) {
     }
 }
 
-STATIC mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
+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) {
@@ -376,7 +376,7 @@ typedef struct _mp_vfs_ilistdir_it_t {
     bool is_iter;
 } mp_vfs_ilistdir_it_t;
 
-STATIC mp_obj_t mp_vfs_ilistdir_it_iternext(mp_obj_t self_in) {
+static mp_obj_t mp_vfs_ilistdir_it_iternext(mp_obj_t self_in) {
     mp_vfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->is_iter) {
         // continue delegating to root dir
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 67c95d9a1712b..38c16633630e5 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -51,7 +51,7 @@
 
 #define mp_obj_fat_vfs_t fs_user_mount_t
 
-STATIC mp_import_stat_t fat_vfs_import_stat(void *vfs_in, const char *path) {
+static mp_import_stat_t fat_vfs_import_stat(void *vfs_in, const char *path) {
     fs_user_mount_t *vfs = vfs_in;
     FILINFO fno;
     assert(vfs != NULL);
@@ -66,7 +66,7 @@ STATIC mp_import_stat_t fat_vfs_import_stat(void *vfs_in, const char *path) {
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
-STATIC mp_obj_t fat_vfs_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 fat_vfs_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);
 
     // create new object
@@ -91,16 +91,16 @@ STATIC mp_obj_t fat_vfs_make_new(const mp_obj_type_t *type, size_t n_args, size_
 }
 
 #if _FS_REENTRANT
-STATIC mp_obj_t fat_vfs_del(mp_obj_t self_in) {
+static mp_obj_t fat_vfs_del(mp_obj_t self_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(self_in);
     // f_umount only needs to be called to release the sync object
     f_umount(&self->fatfs);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_del_obj, fat_vfs_del);
+static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_del_obj, fat_vfs_del);
 #endif
 
-STATIC mp_obj_t fat_vfs_mkfs(mp_obj_t bdev_in) {
+static mp_obj_t fat_vfs_mkfs(mp_obj_t bdev_in) {
     // create new object
     fs_user_mount_t *vfs = MP_OBJ_TO_PTR(fat_vfs_make_new(&mp_fat_vfs_type, 1, 0, &bdev_in));
 
@@ -116,8 +116,8 @@ STATIC mp_obj_t fat_vfs_mkfs(mp_obj_t bdev_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_mkfs_fun_obj, fat_vfs_mkfs);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(fat_vfs_mkfs_obj, MP_ROM_PTR(&fat_vfs_mkfs_fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_mkfs_fun_obj, fat_vfs_mkfs);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(fat_vfs_mkfs_obj, MP_ROM_PTR(&fat_vfs_mkfs_fun_obj));
 
 typedef struct _mp_vfs_fat_ilistdir_it_t {
     mp_obj_base_t base;
@@ -127,7 +127,7 @@ typedef struct _mp_vfs_fat_ilistdir_it_t {
     FF_DIR dir;
 } mp_vfs_fat_ilistdir_it_t;
 
-STATIC mp_obj_t mp_vfs_fat_ilistdir_it_iternext(mp_obj_t self_in) {
+static mp_obj_t mp_vfs_fat_ilistdir_it_iternext(mp_obj_t self_in) {
     mp_vfs_fat_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
 
     for (;;) {
@@ -167,14 +167,14 @@ 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) {
+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) {
+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;
     const char *path;
@@ -199,9 +199,9 @@ STATIC mp_obj_t fat_vfs_ilistdir_func(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_FROM_PTR(iter);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fat_vfs_ilistdir_obj, 1, 2, fat_vfs_ilistdir_func);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fat_vfs_ilistdir_obj, 1, 2, fat_vfs_ilistdir_func);
 
-STATIC mp_obj_t fat_vfs_remove_internal(mp_obj_t vfs_in, mp_obj_t path_in, mp_int_t attr) {
+static mp_obj_t fat_vfs_remove_internal(mp_obj_t vfs_in, mp_obj_t path_in, mp_int_t attr) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *path = mp_obj_str_get_str(path_in);
 
@@ -225,17 +225,17 @@ STATIC mp_obj_t fat_vfs_remove_internal(mp_obj_t vfs_in, mp_obj_t path_in, mp_in
     }
 }
 
-STATIC mp_obj_t fat_vfs_remove(mp_obj_t vfs_in, mp_obj_t path_in) {
+static mp_obj_t fat_vfs_remove(mp_obj_t vfs_in, mp_obj_t path_in) {
     return fat_vfs_remove_internal(vfs_in, path_in, 0); // 0 == file attribute
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_remove_obj, fat_vfs_remove);
+static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_remove_obj, fat_vfs_remove);
 
-STATIC mp_obj_t fat_vfs_rmdir(mp_obj_t vfs_in, mp_obj_t path_in) {
+static mp_obj_t fat_vfs_rmdir(mp_obj_t vfs_in, mp_obj_t path_in) {
     return fat_vfs_remove_internal(vfs_in, path_in, AM_DIR);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_rmdir_obj, fat_vfs_rmdir);
+static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_rmdir_obj, fat_vfs_rmdir);
 
-STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_out) {
+static mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_out) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *old_path = mp_obj_str_get_str(path_in);
     const char *new_path = mp_obj_str_get_str(path_out);
@@ -253,9 +253,9 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_
     }
 
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_rename_obj, fat_vfs_rename);
+static MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_rename_obj, fat_vfs_rename);
 
-STATIC mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {
+static mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *path = mp_obj_str_get_str(path_o);
     FRESULT res = f_mkdir(&self->fatfs, path);
@@ -265,10 +265,10 @@ STATIC mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {
         mp_raise_OSError(fresult_to_errno_table[res]);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_mkdir_obj, fat_vfs_mkdir);
+static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_mkdir_obj, fat_vfs_mkdir);
 
 // Change current directory.
-STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
+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;
     path = mp_obj_str_get_str(path_in);
@@ -281,10 +281,10 @@ STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_chdir_obj, fat_vfs_chdir);
+static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_chdir_obj, fat_vfs_chdir);
 
 // Get the current directory.
-STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
+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];
     FRESULT res = f_getcwd(&self->fatfs, buf, sizeof(buf));
@@ -293,10 +293,10 @@ STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
     }
     return mp_obj_new_str(buf, strlen(buf));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getcwd_obj, fat_vfs_getcwd);
+static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getcwd_obj, fat_vfs_getcwd);
 
 // 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) {
+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);
 
@@ -342,10 +342,10 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
 
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_stat_obj, fat_vfs_stat);
+static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_stat_obj, fat_vfs_stat);
 
 // Get the status of a VFS.
-STATIC mp_obj_t fat_vfs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) {
+static mp_obj_t fat_vfs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     (void)path_in;
 
@@ -371,9 +371,9 @@ STATIC mp_obj_t fat_vfs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) {
 
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_statvfs_obj, fat_vfs_statvfs);
+static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_statvfs_obj, fat_vfs_statvfs);
 
-STATIC mp_obj_t vfs_fat_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
+static mp_obj_t vfs_fat_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
     fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
 
     // Read-only device indicated by writeblocks[0] == MP_OBJ_NULL.
@@ -397,16 +397,16 @@ STATIC mp_obj_t vfs_fat_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(vfs_fat_mount_obj, vfs_fat_mount);
+static MP_DEFINE_CONST_FUN_OBJ_3(vfs_fat_mount_obj, vfs_fat_mount);
 
-STATIC mp_obj_t vfs_fat_umount(mp_obj_t self_in) {
+static mp_obj_t vfs_fat_umount(mp_obj_t self_in) {
     (void)self_in;
     // keep the FAT filesystem mounted internally so the VFS methods can still be used
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_umount_obj, vfs_fat_umount);
+static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_umount_obj, vfs_fat_umount);
 
-STATIC const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
+static const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
     #if _FS_REENTRANT
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&fat_vfs_del_obj) },
     #endif
@@ -424,9 +424,9 @@ STATIC const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&vfs_fat_mount_obj) },
     { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&fat_vfs_umount_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(fat_vfs_locals_dict, fat_vfs_locals_dict_table);
+static MP_DEFINE_CONST_DICT(fat_vfs_locals_dict, fat_vfs_locals_dict_table);
 
-STATIC const mp_vfs_proto_t fat_vfs_proto = {
+static const mp_vfs_proto_t fat_vfs_proto = {
     .import_stat = fat_vfs_import_stat,
 };
 
diff --git a/extmod/vfs_fat_diskio.c b/extmod/vfs_fat_diskio.c
index 1bcd471f2162e..6f500104d1e86 100644
--- a/extmod/vfs_fat_diskio.c
+++ b/extmod/vfs_fat_diskio.c
@@ -44,7 +44,7 @@
 #include "extmod/vfs_fat.h"
 
 typedef void *bdev_t;
-STATIC fs_user_mount_t *disk_get_device(void *bdev) {
+static fs_user_mount_t *disk_get_device(void *bdev) {
     return (fs_user_mount_t *)bdev;
 }
 
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index e2f6937694256..887249b663c78 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -64,12 +64,12 @@ typedef struct _pyb_file_obj_t {
     FIL fp;
 } pyb_file_obj_t;
 
-STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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) {
+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);
     UINT sz_out;
     FRESULT res = f_read(&self->fp, buf, size, &sz_out);
@@ -80,7 +80,7 @@ STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
     return sz_out;
 }
 
-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 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);
     UINT sz_out;
     FRESULT res = f_write(&self->fp, buf, size, &sz_out);
@@ -96,7 +96,7 @@ STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t siz
     return sz_out;
 }
 
-STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+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) {
@@ -146,7 +146,7 @@ STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg,
 
 // TODO gc hook to close the file if not already closed
 
-STATIC const mp_rom_map_elem_t vfs_fat_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) },
@@ -161,9 +161,9 @@ STATIC const mp_rom_map_elem_t vfs_fat_rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(vfs_fat_rawfile_locals_dict, vfs_fat_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 vfs_fat_fileio_stream_p = {
+static const mp_stream_p_t vfs_fat_fileio_stream_p = {
     .read = file_obj_read,
     .write = file_obj_write,
     .ioctl = file_obj_ioctl,
@@ -178,7 +178,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &vfs_fat_rawfile_locals_dict
     );
 
-STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
+static const mp_stream_p_t vfs_fat_textio_stream_p = {
     .read = file_obj_read,
     .write = file_obj_write,
     .ioctl = file_obj_ioctl,
@@ -195,7 +195,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 // 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) {
+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);
 
     const mp_obj_type_t *type = &mp_type_vfs_fat_textio;
diff --git a/extmod/vfs_lfs.c b/extmod/vfs_lfs.c
index 4fb86b89b76c3..19063d6306604 100644
--- a/extmod/vfs_lfs.c
+++ b/extmod/vfs_lfs.c
@@ -127,7 +127,7 @@ typedef struct _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]) {
+static void lfs_get_mtime(uint8_t buf[8]) {
     // 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).
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index ddcbdf3ac4d75..19da4417e6d00 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -43,7 +43,7 @@
 #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) {
+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;
     if (must_return_int || ret != mp_const_none) {
@@ -52,23 +52,23 @@ STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, i
     return ret_i;
 }
 
-STATIC int MP_VFS_LFSx(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 MP_VFS_LFSx(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) {
     return mp_vfs_blockdev_read_ext(c->context, block, off, size, buffer);
 }
 
-STATIC int MP_VFS_LFSx(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 MP_VFS_LFSx(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 mp_vfs_blockdev_write_ext(c->context, block, off, size, buffer);
 }
 
-STATIC int MP_VFS_LFSx(dev_erase)(const struct LFSx_API (config) * c, LFSx_API(block_t) block) {
+static int MP_VFS_LFSx(dev_erase)(const struct LFSx_API (config) * c, LFSx_API(block_t) block) {
     return MP_VFS_LFSx(dev_ioctl)(c, MP_BLOCKDEV_IOCTL_BLOCK_ERASE, block, true);
 }
 
-STATIC int MP_VFS_LFSx(dev_sync)(const struct LFSx_API (config) * c) {
+static int MP_VFS_LFSx(dev_sync)(const struct LFSx_API (config) * c) {
     return MP_VFS_LFSx(dev_ioctl)(c, MP_BLOCKDEV_IOCTL_SYNC, 0, false);
 }
 
-STATIC void MP_VFS_LFSx(init_config)(MP_OBJ_VFS_LFSx * self, mp_obj_t bdev, size_t read_size, size_t prog_size, size_t lookahead) {
+static void MP_VFS_LFSx(init_config)(MP_OBJ_VFS_LFSx * self, mp_obj_t bdev, size_t read_size, size_t prog_size, size_t lookahead) {
     self->blockdev.flags = MP_BLOCKDEV_FLAG_FREE_OBJ;
     mp_vfs_blockdev_init(&self->blockdev, bdev);
 
@@ -120,7 +120,7 @@ const char *MP_VFS_LFSx(make_path)(MP_OBJ_VFS_LFSx * self, mp_obj_t path_in) {
     return path;
 }
 
-STATIC mp_obj_t MP_VFS_LFSx(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_VFS_LFSx(make_new)(const mp_obj_type_t * type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_val_t args[MP_ARRAY_SIZE(lfs_make_allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(lfs_make_allowed_args), lfs_make_allowed_args, args);
 
@@ -140,7 +140,7 @@ STATIC mp_obj_t MP_VFS_LFSx(make_new)(const mp_obj_type_t * type, size_t n_args,
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t MP_VFS_LFSx(mkfs)(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t MP_VFS_LFSx(mkfs)(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_val_t args[MP_ARRAY_SIZE(lfs_make_allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(lfs_make_allowed_args), lfs_make_allowed_args, args);
 
@@ -153,11 +153,11 @@ STATIC mp_obj_t MP_VFS_LFSx(mkfs)(size_t n_args, const mp_obj_t *pos_args, mp_ma
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(MP_VFS_LFSx(mkfs_fun_obj), 0, MP_VFS_LFSx(mkfs));
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(MP_VFS_LFSx(mkfs_obj), MP_ROM_PTR(&MP_VFS_LFSx(mkfs_fun_obj)));
+static MP_DEFINE_CONST_FUN_OBJ_KW(MP_VFS_LFSx(mkfs_fun_obj), 0, MP_VFS_LFSx(mkfs));
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(MP_VFS_LFSx(mkfs_obj), MP_ROM_PTR(&MP_VFS_LFSx(mkfs_fun_obj)));
 
 // Implementation of mp_vfs_lfs_file_open is provided in vfs_lfsx_file.c
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(MP_VFS_LFSx(open_obj), MP_VFS_LFSx(file_open));
+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;
@@ -168,7 +168,7 @@ typedef struct MP_VFS_LFSx (_ilistdir_it_t) {
     LFSx_API(dir_t) dir;
 } MP_VFS_LFSx(ilistdir_it_t);
 
-STATIC mp_obj_t MP_VFS_LFSx(ilistdir_it_iternext)(mp_obj_t self_in) {
+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) {
@@ -203,7 +203,7 @@ 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) {
+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);
@@ -211,7 +211,7 @@ STATIC mp_obj_t MP_VFS_LFSx(ilistdir_it_del)(mp_obj_t self_in) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t MP_VFS_LFSx(ilistdir_func)(size_t n_args, const mp_obj_t *args) {
+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;
     const char *path;
@@ -236,9 +236,9 @@ STATIC mp_obj_t MP_VFS_LFSx(ilistdir_func)(size_t n_args, const mp_obj_t *args)
     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));
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(MP_VFS_LFSx(ilistdir_obj), 1, 2, MP_VFS_LFSx(ilistdir_func));
 
-STATIC mp_obj_t MP_VFS_LFSx(remove)(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t MP_VFS_LFSx(remove)(mp_obj_t self_in, mp_obj_t path_in) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     const char *path = MP_VFS_LFSx(make_path)(self, path_in);
     int ret = LFSx_API(remove)(&self->lfs, path);
@@ -247,9 +247,9 @@ STATIC mp_obj_t MP_VFS_LFSx(remove)(mp_obj_t self_in, mp_obj_t path_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(remove_obj), MP_VFS_LFSx(remove));
+static MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(remove_obj), MP_VFS_LFSx(remove));
 
-STATIC mp_obj_t MP_VFS_LFSx(rmdir)(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t MP_VFS_LFSx(rmdir)(mp_obj_t self_in, mp_obj_t path_in) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     const char *path = MP_VFS_LFSx(make_path)(self, path_in);
     int ret = LFSx_API(remove)(&self->lfs, path);
@@ -258,9 +258,9 @@ STATIC mp_obj_t MP_VFS_LFSx(rmdir)(mp_obj_t self_in, mp_obj_t path_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(rmdir_obj), MP_VFS_LFSx(rmdir));
+static MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(rmdir_obj), MP_VFS_LFSx(rmdir));
 
-STATIC mp_obj_t MP_VFS_LFSx(rename)(mp_obj_t self_in, mp_obj_t path_old_in, mp_obj_t path_new_in) {
+static mp_obj_t MP_VFS_LFSx(rename)(mp_obj_t self_in, mp_obj_t path_old_in, mp_obj_t path_new_in) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     const char *path_old = MP_VFS_LFSx(make_path)(self, path_old_in);
     const char *path = mp_obj_str_get_str(path_new_in);
@@ -277,9 +277,9 @@ STATIC mp_obj_t MP_VFS_LFSx(rename)(mp_obj_t self_in, mp_obj_t path_old_in, mp_o
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(MP_VFS_LFSx(rename_obj), MP_VFS_LFSx(rename));
+static MP_DEFINE_CONST_FUN_OBJ_3(MP_VFS_LFSx(rename_obj), MP_VFS_LFSx(rename));
 
-STATIC mp_obj_t MP_VFS_LFSx(mkdir)(mp_obj_t self_in, mp_obj_t path_o) {
+static mp_obj_t MP_VFS_LFSx(mkdir)(mp_obj_t self_in, mp_obj_t path_o) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     const char *path = MP_VFS_LFSx(make_path)(self, path_o);
     int ret = LFSx_API(mkdir)(&self->lfs, path);
@@ -288,9 +288,9 @@ STATIC mp_obj_t MP_VFS_LFSx(mkdir)(mp_obj_t self_in, mp_obj_t path_o) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(mkdir_obj), MP_VFS_LFSx(mkdir));
+static MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(mkdir_obj), MP_VFS_LFSx(mkdir));
 
-STATIC mp_obj_t MP_VFS_LFSx(chdir)(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t MP_VFS_LFSx(chdir)(mp_obj_t self_in, mp_obj_t path_in) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
 
     // Check path exists
@@ -356,9 +356,9 @@ STATIC mp_obj_t MP_VFS_LFSx(chdir)(mp_obj_t self_in, mp_obj_t path_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(chdir_obj), MP_VFS_LFSx(chdir));
+static MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(chdir_obj), MP_VFS_LFSx(chdir));
 
-STATIC mp_obj_t MP_VFS_LFSx(getcwd)(mp_obj_t self_in) {
+static mp_obj_t MP_VFS_LFSx(getcwd)(mp_obj_t self_in) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     if (vstr_len(&self->cur_dir) == 1) {
         return MP_OBJ_NEW_QSTR(MP_QSTR__slash_);
@@ -367,9 +367,9 @@ STATIC mp_obj_t MP_VFS_LFSx(getcwd)(mp_obj_t self_in) {
         return mp_obj_new_str(self->cur_dir.buf, self->cur_dir.len - 1);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(MP_VFS_LFSx(getcwd_obj), MP_VFS_LFSx(getcwd));
+static MP_DEFINE_CONST_FUN_OBJ_1(MP_VFS_LFSx(getcwd_obj), MP_VFS_LFSx(getcwd));
 
-STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     const char *path = MP_VFS_LFSx(make_path)(self, path_in);
     struct LFSx_API (info) info;
@@ -406,16 +406,16 @@ STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
 
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(stat_obj), MP_VFS_LFSx(stat));
+static MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(stat_obj), MP_VFS_LFSx(stat));
 
-STATIC int LFSx_API(traverse_cb)(void *data, LFSx_API(block_t) bl) {
+static int LFSx_API(traverse_cb)(void *data, LFSx_API(block_t) bl) {
     (void)bl;
     uint32_t *n = (uint32_t *)data;
     *n += 1;
     return LFSx_MACRO(_ERR_OK);
 }
 
-STATIC mp_obj_t MP_VFS_LFSx(statvfs)(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t MP_VFS_LFSx(statvfs)(mp_obj_t self_in, mp_obj_t path_in) {
     (void)path_in;
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     uint32_t n_used_blocks = 0;
@@ -442,9 +442,9 @@ STATIC mp_obj_t MP_VFS_LFSx(statvfs)(mp_obj_t self_in, mp_obj_t path_in) {
 
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(statvfs_obj), MP_VFS_LFSx(statvfs));
+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) {
+static mp_obj_t MP_VFS_LFSx(mount)(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     (void)mkfs;
 
@@ -457,17 +457,17 @@ STATIC mp_obj_t MP_VFS_LFSx(mount)(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(MP_VFS_LFSx(mount_obj), MP_VFS_LFSx(mount));
+static MP_DEFINE_CONST_FUN_OBJ_3(MP_VFS_LFSx(mount_obj), MP_VFS_LFSx(mount));
 
-STATIC mp_obj_t MP_VFS_LFSx(umount)(mp_obj_t self_in) {
+static mp_obj_t MP_VFS_LFSx(umount)(mp_obj_t self_in) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     // LFS unmount never fails
     LFSx_API(unmount)(&self->lfs);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(MP_VFS_LFSx(umount_obj), MP_VFS_LFSx(umount));
+static MP_DEFINE_CONST_FUN_OBJ_1(MP_VFS_LFSx(umount_obj), MP_VFS_LFSx(umount));
 
-STATIC const mp_rom_map_elem_t MP_VFS_LFSx(locals_dict_table)[] = {
+static const mp_rom_map_elem_t MP_VFS_LFSx(locals_dict_table)[] = {
     { MP_ROM_QSTR(MP_QSTR_mkfs), MP_ROM_PTR(&MP_VFS_LFSx(mkfs_obj)) },
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&MP_VFS_LFSx(open_obj)) },
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&MP_VFS_LFSx(ilistdir_obj)) },
@@ -482,9 +482,9 @@ STATIC const mp_rom_map_elem_t MP_VFS_LFSx(locals_dict_table)[] = {
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&MP_VFS_LFSx(mount_obj)) },
     { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&MP_VFS_LFSx(umount_obj)) },
 };
-STATIC MP_DEFINE_CONST_DICT(MP_VFS_LFSx(locals_dict), MP_VFS_LFSx(locals_dict_table));
+static MP_DEFINE_CONST_DICT(MP_VFS_LFSx(locals_dict), MP_VFS_LFSx(locals_dict_table));
 
-STATIC mp_import_stat_t MP_VFS_LFSx(import_stat)(void *self_in, const char *path) {
+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 };
@@ -500,7 +500,7 @@ STATIC mp_import_stat_t MP_VFS_LFSx(import_stat)(void *self_in, const char *path
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
-STATIC const mp_vfs_proto_t MP_VFS_LFSx(proto) = {
+static const mp_vfs_proto_t MP_VFS_LFSx(proto) = {
     .import_stat = MP_VFS_LFSx(import_stat),
 };
 
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index 04058506441b5..ab5cce50088b9 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -35,13 +35,13 @@
 #include "py/mperrno.h"
 #include "extmod/vfs.h"
 
-STATIC void MP_VFS_LFSx(check_open)(MP_OBJ_VFS_LFSx_FILE * self) {
+static void MP_VFS_LFSx(check_open)(MP_OBJ_VFS_LFSx_FILE * self) {
     if (self->vfs == NULL) {
         mp_raise_ValueError(NULL);
     }
 }
 
-STATIC void MP_VFS_LFSx(file_print)(const mp_print_t * print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void MP_VFS_LFSx(file_print)(const mp_print_t * print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)self_in;
     (void)kind;
     mp_printf(print, "<io.%s>", mp_obj_get_type_str(self_in));
@@ -122,7 +122,7 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_uint_t MP_VFS_LFSx(file_read)(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t MP_VFS_LFSx(file_read)(mp_obj_t self_in, 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);
     LFSx_API(ssize_t) sz = LFSx_API(file_read)(&self->vfs->lfs, &self->file, buf, size);
@@ -133,7 +133,7 @@ STATIC mp_uint_t MP_VFS_LFSx(file_read)(mp_obj_t self_in, void *buf, mp_uint_t s
     return sz;
 }
 
-STATIC mp_uint_t MP_VFS_LFSx(file_write)(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+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
@@ -149,7 +149,7 @@ STATIC mp_uint_t MP_VFS_LFSx(file_write)(mp_obj_t self_in, const void *buf, mp_u
     return sz;
 }
 
-STATIC mp_uint_t MP_VFS_LFSx(file_ioctl)(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t MP_VFS_LFSx(file_ioctl)(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     MP_OBJ_VFS_LFSx_FILE *self = MP_OBJ_TO_PTR(self_in);
 
     if (request != MP_STREAM_CLOSE) {
@@ -194,7 +194,7 @@ STATIC mp_uint_t MP_VFS_LFSx(file_ioctl)(mp_obj_t self_in, mp_uint_t request, ui
     }
 }
 
-STATIC const mp_rom_map_elem_t MP_VFS_LFSx(file_locals_dict_table)[] = {
+static const mp_rom_map_elem_t MP_VFS_LFSx(file_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) },
@@ -208,9 +208,9 @@ STATIC const mp_rom_map_elem_t MP_VFS_LFSx(file_locals_dict_table)[] = {
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(MP_VFS_LFSx(file_locals_dict), 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));
 
-STATIC const mp_stream_p_t MP_VFS_LFSx(fileio_stream_p) = {
+static const mp_stream_p_t MP_VFS_LFSx(fileio_stream_p) = {
     .read = MP_VFS_LFSx(file_read),
     .write = MP_VFS_LFSx(file_write),
     .ioctl = MP_VFS_LFSx(file_ioctl),
@@ -225,7 +225,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
 
-STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
+static const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
     .read = MP_VFS_LFSx(file_read),
     .write = MP_VFS_LFSx(file_write),
     .ioctl = MP_VFS_LFSx(file_ioctl),
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 2e0f712e25ede..ed4c06e36731e 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -57,7 +57,7 @@ typedef struct _mp_obj_vfs_posix_t {
     bool readonly;
 } mp_obj_vfs_posix_t;
 
-STATIC const char *vfs_posix_get_path_str(mp_obj_vfs_posix_t *self, mp_obj_t path) {
+static const char *vfs_posix_get_path_str(mp_obj_vfs_posix_t *self, mp_obj_t path) {
     const char *path_str = mp_obj_str_get_str(path);
     if (self->root_len == 0 || path_str[0] != '/') {
         return path_str;
@@ -68,7 +68,7 @@ STATIC const char *vfs_posix_get_path_str(mp_obj_vfs_posix_t *self, mp_obj_t pat
     }
 }
 
-STATIC mp_obj_t vfs_posix_get_path_obj(mp_obj_vfs_posix_t *self, mp_obj_t path) {
+static mp_obj_t vfs_posix_get_path_obj(mp_obj_vfs_posix_t *self, mp_obj_t path) {
     const char *path_str = mp_obj_str_get_str(path);
     if (self->root_len == 0 || path_str[0] != '/') {
         return path;
@@ -79,7 +79,7 @@ STATIC mp_obj_t vfs_posix_get_path_obj(mp_obj_vfs_posix_t *self, mp_obj_t path)
     }
 }
 
-STATIC mp_obj_t vfs_posix_fun1_helper(mp_obj_t self_in, mp_obj_t path_in, int (*f)(const char *)) {
+static mp_obj_t vfs_posix_fun1_helper(mp_obj_t self_in, mp_obj_t path_in, int (*f)(const char *)) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     int ret = f(vfs_posix_get_path_str(self, path_in));
     if (ret != 0) {
@@ -88,7 +88,7 @@ STATIC mp_obj_t vfs_posix_fun1_helper(mp_obj_t self_in, mp_obj_t path_in, int (*
     return mp_const_none;
 }
 
-STATIC mp_import_stat_t mp_vfs_posix_import_stat(void *self_in, const char *path) {
+static mp_import_stat_t mp_vfs_posix_import_stat(void *self_in, const char *path) {
     mp_obj_vfs_posix_t *self = self_in;
     if (self->root_len != 0) {
         self->root.len = self->root_len;
@@ -106,7 +106,7 @@ STATIC mp_import_stat_t mp_vfs_posix_import_stat(void *self_in, const char *path
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
-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) {
+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 = mp_obj_malloc(mp_obj_vfs_posix_t, type);
@@ -142,7 +142,7 @@ STATIC mp_obj_t vfs_posix_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(vfs);
 }
 
-STATIC mp_obj_t vfs_posix_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
+static mp_obj_t vfs_posix_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     if (mp_obj_is_true(readonly)) {
         self->readonly = true;
@@ -152,15 +152,15 @@ STATIC mp_obj_t vfs_posix_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mk
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_mount_obj, vfs_posix_mount);
+static MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_mount_obj, vfs_posix_mount);
 
-STATIC mp_obj_t vfs_posix_umount(mp_obj_t self_in) {
+static mp_obj_t vfs_posix_umount(mp_obj_t self_in) {
     (void)self_in;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_umount_obj, vfs_posix_umount);
+static MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_umount_obj, vfs_posix_umount);
 
-STATIC mp_obj_t vfs_posix_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
+static mp_obj_t vfs_posix_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     const char *mode = mp_obj_str_get_str(mode_in);
     if (self->readonly
@@ -172,14 +172,14 @@ STATIC mp_obj_t vfs_posix_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode
     }
     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);
+static MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_open_obj, vfs_posix_open);
 
-STATIC mp_obj_t vfs_posix_chdir(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t vfs_posix_chdir(mp_obj_t self_in, mp_obj_t path_in) {
     return vfs_posix_fun1_helper(self_in, path_in, chdir);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_chdir_obj, vfs_posix_chdir);
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_chdir_obj, vfs_posix_chdir);
 
-STATIC mp_obj_t vfs_posix_getcwd(mp_obj_t self_in) {
+static mp_obj_t vfs_posix_getcwd(mp_obj_t self_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     char buf[MICROPY_ALLOC_PATH_MAX + 1];
     const char *ret = getcwd(buf, sizeof(buf));
@@ -196,7 +196,7 @@ STATIC mp_obj_t vfs_posix_getcwd(mp_obj_t self_in) {
     }
     return mp_obj_new_str(ret, strlen(ret));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_getcwd_obj, vfs_posix_getcwd);
+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;
@@ -206,7 +206,7 @@ typedef struct _vfs_posix_ilistdir_it_t {
     DIR *dir;
 } vfs_posix_ilistdir_it_t;
 
-STATIC mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {
+static mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {
     vfs_posix_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->dir == NULL) {
@@ -266,7 +266,7 @@ 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) {
+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();
@@ -276,7 +276,7 @@ STATIC mp_obj_t vfs_posix_ilistdir_it_del(mp_obj_t self_in) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t vfs_posix_ilistdir(mp_obj_t self_in, mp_obj_t path_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 = mp_obj_malloc_with_finaliser(vfs_posix_ilistdir_it_t, &mp_type_polymorph_iter_with_finaliser);
     iter->iternext = vfs_posix_ilistdir_it_iternext;
@@ -294,7 +294,7 @@ STATIC mp_obj_t vfs_posix_ilistdir(mp_obj_t self_in, mp_obj_t path_in) {
     }
     return MP_OBJ_FROM_PTR(iter);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_ilistdir_obj, vfs_posix_ilistdir);
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_ilistdir_obj, vfs_posix_ilistdir);
 
 typedef struct _mp_obj_listdir_t {
     mp_obj_base_t base;
@@ -302,7 +302,7 @@ typedef struct _mp_obj_listdir_t {
     DIR *dir;
 } mp_obj_listdir_t;
 
-STATIC mp_obj_t vfs_posix_mkdir(mp_obj_t self_in, mp_obj_t path_in) {
+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();
@@ -317,14 +317,14 @@ STATIC mp_obj_t vfs_posix_mkdir(mp_obj_t self_in, mp_obj_t path_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_mkdir_obj, vfs_posix_mkdir);
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_mkdir_obj, vfs_posix_mkdir);
 
-STATIC mp_obj_t vfs_posix_remove(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t vfs_posix_remove(mp_obj_t self_in, mp_obj_t path_in) {
     return vfs_posix_fun1_helper(self_in, path_in, unlink);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_remove_obj, vfs_posix_remove);
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_remove_obj, vfs_posix_remove);
 
-STATIC mp_obj_t vfs_posix_rename(mp_obj_t self_in, mp_obj_t old_path_in, mp_obj_t new_path_in) {
+static mp_obj_t vfs_posix_rename(mp_obj_t self_in, mp_obj_t old_path_in, mp_obj_t new_path_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     const char *old_path = vfs_posix_get_path_str(self, old_path_in);
     const char *new_path = vfs_posix_get_path_str(self, new_path_in);
@@ -336,14 +336,14 @@ STATIC mp_obj_t vfs_posix_rename(mp_obj_t self_in, mp_obj_t old_path_in, mp_obj_
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_rename_obj, vfs_posix_rename);
+static MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_rename_obj, vfs_posix_rename);
 
-STATIC mp_obj_t vfs_posix_rmdir(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t vfs_posix_rmdir(mp_obj_t self_in, mp_obj_t path_in) {
     return vfs_posix_fun1_helper(self_in, path_in, rmdir);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_rmdir_obj, vfs_posix_rmdir);
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_rmdir_obj, vfs_posix_rmdir);
 
-STATIC mp_obj_t vfs_posix_stat(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t vfs_posix_stat(mp_obj_t self_in, mp_obj_t path_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     struct stat sb;
     const char *path = vfs_posix_get_path_str(self, path_in);
@@ -362,7 +362,7 @@ STATIC mp_obj_t vfs_posix_stat(mp_obj_t self_in, mp_obj_t path_in) {
     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);
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_stat_obj, vfs_posix_stat);
 
 #if MICROPY_PY_OS_STATVFS
 
@@ -386,7 +386,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_stat_obj, vfs_posix_stat);
 #define F_FLAG sb.f_flag
 #endif
 
-STATIC mp_obj_t vfs_posix_statvfs(mp_obj_t self_in, mp_obj_t path_in) {
+static mp_obj_t vfs_posix_statvfs(mp_obj_t self_in, mp_obj_t path_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     STRUCT_STATVFS sb;
     const char *path = vfs_posix_get_path_str(self, path_in);
@@ -405,11 +405,11 @@ STATIC mp_obj_t vfs_posix_statvfs(mp_obj_t self_in, mp_obj_t path_in) {
     t->items[9] = MP_OBJ_NEW_SMALL_INT(F_NAMEMAX);
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_statvfs_obj, vfs_posix_statvfs);
+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[] = {
+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) },
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&vfs_posix_open_obj) },
@@ -426,9 +426,9 @@ STATIC const mp_rom_map_elem_t vfs_posix_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(vfs_posix_locals_dict, vfs_posix_locals_dict_table);
 
-STATIC const mp_vfs_proto_t vfs_posix_proto = {
+static const mp_vfs_proto_t vfs_posix_proto = {
     .import_stat = mp_vfs_posix_import_stat,
 };
 
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index eb9146d47b034..bc06bc74db1cb 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -47,7 +47,7 @@ typedef struct _mp_obj_vfs_posix_file_t {
 } mp_obj_vfs_posix_file_t;
 
 #if MICROPY_CPYTHON_COMPAT
-STATIC void check_fd_is_open(const mp_obj_vfs_posix_file_t *o) {
+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"));
     }
@@ -56,7 +56,7 @@ STATIC void check_fd_is_open(const mp_obj_vfs_posix_file_t *o) {
 #define check_fd_is_open(o)
 #endif
 
-STATIC void vfs_posix_file_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void vfs_posix_file_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_vfs_posix_file_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<io.%s %d>", mp_obj_get_type_str(self_in), self->fd);
@@ -108,14 +108,14 @@ 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_fileno(mp_obj_t self_in) {
+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);
     return MP_OBJ_NEW_SMALL_INT(self->fd);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_file_fileno_obj, vfs_posix_file_fileno);
+static MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_file_fileno_obj, vfs_posix_file_fileno);
 
-STATIC mp_uint_t vfs_posix_file_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t vfs_posix_file_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_vfs_posix_file_t *o = MP_OBJ_TO_PTR(o_in);
     check_fd_is_open(o);
     ssize_t r;
@@ -126,7 +126,7 @@ STATIC mp_uint_t vfs_posix_file_read(mp_obj_t o_in, void *buf, mp_uint_t size, i
     return (mp_uint_t)r;
 }
 
-STATIC mp_uint_t vfs_posix_file_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t vfs_posix_file_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_vfs_posix_file_t *o = MP_OBJ_TO_PTR(o_in);
     check_fd_is_open(o);
     #if MICROPY_PY_OS_DUPTERM
@@ -143,7 +143,7 @@ STATIC mp_uint_t vfs_posix_file_write(mp_obj_t o_in, const void *buf, mp_uint_t
     return (mp_uint_t)r;
 }
 
-STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+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);
 
     if (request != MP_STREAM_CLOSE) {
@@ -237,7 +237,7 @@ STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_
     }
 }
 
-STATIC const mp_rom_map_elem_t vfs_posix_rawfile_locals_dict_table[] = {
+static const mp_rom_map_elem_t vfs_posix_rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_fileno), MP_ROM_PTR(&vfs_posix_file_fileno_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) },
@@ -253,9 +253,9 @@ STATIC const mp_rom_map_elem_t vfs_posix_rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(vfs_posix_rawfile_locals_dict, vfs_posix_rawfile_locals_dict_table);
+static MP_DEFINE_CONST_DICT(vfs_posix_rawfile_locals_dict, vfs_posix_rawfile_locals_dict_table);
 
-STATIC const mp_stream_p_t vfs_posix_fileio_stream_p = {
+static const mp_stream_p_t vfs_posix_fileio_stream_p = {
     .read = vfs_posix_file_read,
     .write = vfs_posix_file_write,
     .ioctl = vfs_posix_file_ioctl,
@@ -270,7 +270,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
-STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
+static const mp_stream_p_t vfs_posix_textio_stream_p = {
     .read = vfs_posix_file_read,
     .write = vfs_posix_file_write,
     .ioctl = vfs_posix_file_ioctl,
@@ -288,7 +288,7 @@ mp_obj_vfs_posix_file_t mp_sys_stdin_obj;
 mp_obj_vfs_posix_file_t mp_sys_stdout_obj;
 mp_obj_vfs_posix_file_t mp_sys_stderr_obj;
 
-STATIC void vfs_posix_textio_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void vfs_posix_textio_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // These objects are read-only.
         return;
diff --git a/extmod/vfs_reader.c b/extmod/vfs_reader.c
index 13fc31bee5080..80d0fa6344aa1 100644
--- a/extmod/vfs_reader.c
+++ b/extmod/vfs_reader.c
@@ -49,7 +49,7 @@ typedef struct _mp_reader_vfs_t {
     byte buf[];
 } mp_reader_vfs_t;
 
-STATIC mp_uint_t mp_reader_vfs_readbyte(void *data) {
+static mp_uint_t mp_reader_vfs_readbyte(void *data) {
     mp_reader_vfs_t *reader = (mp_reader_vfs_t *)data;
     if (reader->bufpos >= reader->buflen) {
         if (reader->buflen < reader->bufsize) {
@@ -70,7 +70,7 @@ STATIC mp_uint_t mp_reader_vfs_readbyte(void *data) {
     return reader->buf[reader->bufpos++];
 }
 
-STATIC void mp_reader_vfs_close(void *data) {
+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);
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index f05aef5dd8f44..0ac2e891d6dea 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -41,30 +41,30 @@
 #endif
 
 // Command line options, with their defaults
-STATIC uint emit_opt = MP_EMIT_OPT_NONE;
+static uint emit_opt = MP_EMIT_OPT_NONE;
 mp_uint_t mp_verbose_flag = 0;
 
 // Heap size of GC heap (if enabled)
 // Make it larger on a 64 bit machine, because pointers are larger.
 long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
 
-STATIC void stdout_print_strn(void *env, const char *str, size_t len) {
+static void stdout_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t dummy = write(STDOUT_FILENO, str, len);
     (void)dummy;
 }
 
-STATIC const mp_print_t mp_stdout_print = {NULL, stdout_print_strn};
+static const mp_print_t mp_stdout_print = {NULL, stdout_print_strn};
 
-STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
+static void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t dummy = write(STDERR_FILENO, str, len);
     (void)dummy;
 }
 
-STATIC const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
+static const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
 
-STATIC int compile_and_save(const char *file, const char *output_file, const char *source_file) {
+static int compile_and_save(const char *file, const char *output_file, const char *source_file) {
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_lexer_t *lex;
@@ -117,7 +117,7 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
     }
 }
 
-STATIC int usage(char **argv) {
+static int usage(char **argv) {
     printf(
         "usage: %s [<opts>] [-X <implopt>] [--] <input filename>\n"
         "Options:\n"
@@ -155,7 +155,7 @@ STATIC int usage(char **argv) {
 }
 
 // Process options which set interpreter init options
-STATIC void pre_process_options(int argc, char **argv) {
+static void pre_process_options(int argc, char **argv) {
     for (int a = 1; a < argc; a++) {
         if (argv[a][0] == '-') {
             if (strcmp(argv[a], "-X") == 0) {
@@ -201,7 +201,7 @@ STATIC void pre_process_options(int argc, char **argv) {
     }
 }
 
-STATIC char *backslash_to_forwardslash(char *path) {
+static char *backslash_to_forwardslash(char *path) {
     for (char *p = path; p != NULL && *p != '\0'; ++p) {
         if (*p == '\\') {
             *p = '/';
diff --git a/ports/cc3200/boards/make-pins.py b/ports/cc3200/boards/make-pins.py
index f1bdf15a301a0..e30c02ce94a59 100644
--- a/ports/cc3200/boards/make-pins.py
+++ b/ports/cc3200/boards/make-pins.py
@@ -162,7 +162,7 @@ def parse_board_file(self, filename, cpu_pin_col):
     def print_named(self, label, pins, out_source):
         print("", file=out_source)
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            "static const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
             file=out_source,
         )
         for pin in pins:
diff --git a/ports/cc3200/ftp/ftp.c b/ports/cc3200/ftp/ftp.c
index fc071fc9513d4..3f1099518fe57 100644
--- a/ports/cc3200/ftp/ftp.c
+++ b/ports/cc3200/ftp/ftp.c
@@ -201,7 +201,7 @@ static FIFO_t ftp_socketfifo;
 // all calls in an nlr handler.  The wrapper functions below assume that there
 // are only FATFS filesystems mounted.
 
-STATIC FATFS *lookup_path(const TCHAR **path) {
+static FATFS *lookup_path(const TCHAR **path) {
     mp_vfs_mount_t *fs = mp_vfs_lookup_path(*path, path);
     if (fs == MP_VFS_NONE || fs == MP_VFS_ROOT) {
         return NULL;
@@ -210,7 +210,7 @@ STATIC FATFS *lookup_path(const TCHAR **path) {
     return &((fs_user_mount_t*)MP_OBJ_TO_PTR(fs->obj))->fatfs;
 }
 
-STATIC FRESULT f_open_helper(FIL *fp, const TCHAR *path, BYTE mode) {
+static FRESULT f_open_helper(FIL *fp, const TCHAR *path, BYTE mode) {
     FATFS *fs = lookup_path(&path);
     if (fs == NULL) {
         return FR_NO_PATH;
@@ -218,7 +218,7 @@ STATIC FRESULT f_open_helper(FIL *fp, const TCHAR *path, BYTE mode) {
     return f_open(fs, fp, path, mode);
 }
 
-STATIC FRESULT f_opendir_helper(FF_DIR *dp, const TCHAR *path) {
+static FRESULT f_opendir_helper(FF_DIR *dp, const TCHAR *path) {
     FATFS *fs = lookup_path(&path);
     if (fs == NULL) {
         return FR_NO_PATH;
@@ -226,7 +226,7 @@ STATIC FRESULT f_opendir_helper(FF_DIR *dp, const TCHAR *path) {
     return f_opendir(fs, dp, path);
 }
 
-STATIC FRESULT f_stat_helper(const TCHAR *path, FILINFO *fno) {
+static FRESULT f_stat_helper(const TCHAR *path, FILINFO *fno) {
     FATFS *fs = lookup_path(&path);
     if (fs == NULL) {
         return FR_NO_PATH;
@@ -234,7 +234,7 @@ STATIC FRESULT f_stat_helper(const TCHAR *path, FILINFO *fno) {
     return f_stat(fs, path, fno);
 }
 
-STATIC FRESULT f_mkdir_helper(const TCHAR *path) {
+static FRESULT f_mkdir_helper(const TCHAR *path) {
     FATFS *fs = lookup_path(&path);
     if (fs == NULL) {
         return FR_NO_PATH;
@@ -242,7 +242,7 @@ STATIC FRESULT f_mkdir_helper(const TCHAR *path) {
     return f_mkdir(fs, path);
 }
 
-STATIC FRESULT f_unlink_helper(const TCHAR *path) {
+static FRESULT f_unlink_helper(const TCHAR *path) {
     FATFS *fs = lookup_path(&path);
     if (fs == NULL) {
         return FR_NO_PATH;
@@ -250,7 +250,7 @@ STATIC FRESULT f_unlink_helper(const TCHAR *path) {
     return f_unlink(fs, path);
 }
 
-STATIC FRESULT f_rename_helper(const TCHAR *path_old, const TCHAR *path_new) {
+static FRESULT f_rename_helper(const TCHAR *path_old, const TCHAR *path_new) {
     FATFS *fs_old = lookup_path(&path_old);
     if (fs_old == NULL) {
         return FR_NO_PATH;
diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
index eb813fa4c6f2a..e371366b110b3 100644
--- a/ports/cc3200/misc/mpirq.c
+++ b/ports/cc3200/misc/mpirq.c
@@ -50,7 +50,7 @@ const mp_arg_t mp_irq_init_args[] = {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC uint8_t mp_irq_priorities[] = { INT_PRIORITY_LVL_7, INT_PRIORITY_LVL_6, INT_PRIORITY_LVL_5, INT_PRIORITY_LVL_4,
+static uint8_t mp_irq_priorities[] = { INT_PRIORITY_LVL_7, INT_PRIORITY_LVL_6, INT_PRIORITY_LVL_5, INT_PRIORITY_LVL_4,
                                        INT_PRIORITY_LVL_3, INT_PRIORITY_LVL_2, INT_PRIORITY_LVL_1 };
 
 /******************************************************************************
@@ -143,7 +143,7 @@ void mp_irq_handler (mp_obj_t self_in) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC mp_obj_t mp_irq_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t mp_irq_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_irq_obj_t *self = pos_args[0];
     // this is a bit of a hack, but it let us reuse the callback_create method from our parent
     ((mp_obj_t *)pos_args)[0] = self->parent;
@@ -152,35 +152,35 @@ STATIC mp_obj_t mp_irq_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_irq_init_obj, 1, mp_irq_init);
 
-STATIC mp_obj_t mp_irq_enable (mp_obj_t self_in) {
+static mp_obj_t mp_irq_enable (mp_obj_t self_in) {
     mp_irq_obj_t *self = self_in;
     self->methods->enable(self->parent);
     self->isenabled = true;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_enable_obj, mp_irq_enable);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_enable_obj, mp_irq_enable);
 
-STATIC mp_obj_t mp_irq_disable (mp_obj_t self_in) {
+static mp_obj_t mp_irq_disable (mp_obj_t self_in) {
     mp_irq_obj_t *self = self_in;
     self->methods->disable(self->parent);
     self->isenabled = false;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_disable_obj, mp_irq_disable);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_disable_obj, mp_irq_disable);
 
-STATIC mp_obj_t mp_irq_flags (mp_obj_t self_in) {
+static mp_obj_t mp_irq_flags (mp_obj_t self_in) {
     mp_irq_obj_t *self = self_in;
     return mp_obj_new_int(self->methods->flags(self->parent));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_flags_obj, mp_irq_flags);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_flags_obj, mp_irq_flags);
 
-STATIC mp_obj_t mp_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t mp_irq_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, 0, false);
     mp_irq_handler (self_in);
     return mp_const_none;
 }
 
-STATIC const mp_rom_map_elem_t mp_irq_locals_dict_table[] = {
+static const mp_rom_map_elem_t mp_irq_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&mp_irq_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable),              MP_ROM_PTR(&mp_irq_enable_obj) },
@@ -188,7 +188,7 @@ STATIC const mp_rom_map_elem_t mp_irq_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_flags),               MP_ROM_PTR(&mp_irq_flags_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_irq_locals_dict, mp_irq_locals_dict_table);
+static MP_DEFINE_CONST_DICT(mp_irq_locals_dict, mp_irq_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_irq_type,
diff --git a/ports/cc3200/mods/machine_wdt.c b/ports/cc3200/mods/machine_wdt.c
index b20ef7eb93cd5..58ecc1b5334c4 100644
--- a/ports/cc3200/mods/machine_wdt.c
+++ b/ports/cc3200/mods/machine_wdt.c
@@ -59,7 +59,7 @@ typedef struct _machine_wdt_obj_t {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC machine_wdt_obj_t machine_wdt_obj = {.servers = false, .servers_sleeping = false, .simplelink = false, .running = false};
+static machine_wdt_obj_t machine_wdt_obj = {.servers = false, .servers_sleeping = false, .simplelink = false, .running = false};
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
@@ -84,7 +84,7 @@ void pybwdt_sl_alive (void) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     if (id != 0) {
         mp_raise_OSError(MP_ENODEV);
     }
@@ -119,7 +119,7 @@ STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t
     return &machine_wdt_obj;
 }
 
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     if ((self->servers || self->servers_sleeping) && self->simplelink && self->running) {
         self->servers = false;
         self->simplelink = false;
diff --git a/ports/cc3200/mods/modhashlib.c b/ports/cc3200/mods/modhashlib.c
index de56e114af796..528ceeb2ee969 100644
--- a/ports/cc3200/mods/modhashlib.c
+++ b/ports/cc3200/mods/modhashlib.c
@@ -61,13 +61,13 @@ typedef struct _mp_obj_hash_t {
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest);
-STATIC mp_obj_t hash_read (mp_obj_t self_in);
+static void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest);
+static mp_obj_t hash_read (mp_obj_t self_in);
 
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest) {
+static void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest) {
     mp_obj_hash_t *self = self_in;
     mp_buffer_info_t bufinfo;
 
@@ -95,7 +95,7 @@ STATIC void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest) {
     }
 }
 
-STATIC mp_obj_t hash_read (mp_obj_t self_in) {
+static mp_obj_t hash_read (mp_obj_t self_in) {
     mp_obj_hash_t *self = self_in;
 
     if (!self->fixedlen) {
@@ -119,7 +119,7 @@ STATIC mp_obj_t hash_read (mp_obj_t self_in) {
 
 /// \classmethod \constructor([data[, block_size]])
 /// initial data must be given if block_size wants to be passed
-STATIC mp_obj_t hash_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t hash_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 2, false);
     mp_obj_hash_t *self = m_new0(mp_obj_hash_t, 1);
     self->base.type = type_in;
@@ -151,24 +151,24 @@ STATIC mp_obj_t hash_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, cons
     return self;
 }
 
-STATIC mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = self_in;
     hash_update_internal(self, arg, false);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(hash_update_obj, hash_update);
 
-STATIC mp_obj_t hash_digest(mp_obj_t self_in) {
+static mp_obj_t hash_digest(mp_obj_t self_in) {
     return hash_read(self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(hash_digest_obj, hash_digest);
 
-STATIC const mp_rom_map_elem_t hash_locals_dict_table[] = {
+static const mp_rom_map_elem_t hash_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_update),    MP_ROM_PTR(&hash_update_obj) },
     { MP_ROM_QSTR(MP_QSTR_digest),    MP_ROM_PTR(&hash_digest_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(hash_locals_dict, hash_locals_dict_table);
+static MP_DEFINE_CONST_DICT(hash_locals_dict, hash_locals_dict_table);
 
 //STATIC const mp_obj_type_t md5_type = {
 //    { &mp_type_type },
@@ -177,7 +177,7 @@ STATIC MP_DEFINE_CONST_DICT(hash_locals_dict, hash_locals_dict_table);
 //    .locals_dict = (mp_obj_t)&hash_locals_dict,
 //};
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     sha1_type,
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &hash_locals_dict
     );
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     sha256_type,
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
@@ -193,14 +193,14 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &hash_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),    MP_ROM_QSTR(MP_QSTR_hashlib) },
     //{ MP_ROM_QSTR(MP_QSTR_md5),         MP_ROM_PTR(&md5_type) },
     { MP_ROM_QSTR(MP_QSTR_sha1),        MP_ROM_PTR(&sha1_type) },
     { MP_ROM_QSTR(MP_QSTR_sha256),      MP_ROM_PTR(&sha256_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
 
 const mp_obj_module_t mp_module_hashlib = {
     .base = { &mp_type_module },
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 6e50553365887..f7184df442736 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -93,7 +93,7 @@ extern OsiTaskHandle    xSimpleLinkSpawnTaskHndl;
 /******************************************************************************/
 // MicroPython bindings;
 
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     // disable wlan
     wlan_stop(SL_STOP_TIMEOUT_LONG);
     // reset the cpu and it's peripherals
@@ -103,7 +103,7 @@ NORETURN STATIC void mp_machine_reset(void) {
 }
 
 #ifdef DEBUG
-STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
+static mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
     // FreeRTOS info
     {
         printf("---------------------------------------------\n");
@@ -126,24 +126,24 @@ STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
 #endif
 
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     return mp_obj_new_int(HAL_FCPU_HZ);
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(NULL);
 }
 
-STATIC mp_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     uint8_t mac[SL_BSSID_LENGTH];
     wlan_get_mac (mac);
     return mp_obj_new_bytes(mac, SL_BSSID_LENGTH);
 }
 
-STATIC mp_obj_t machine_main(mp_obj_t main) {
+static mp_obj_t machine_main(mp_obj_t main) {
     if (mp_obj_is_str(main)) {
         MP_STATE_PORT(machine_config_main) = main;
     } else {
@@ -153,27 +153,27 @@ STATIC mp_obj_t machine_main(mp_obj_t main) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(machine_main_obj, machine_main);
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     __WFI();
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     pyb_sleep_sleep();
 }
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     pyb_sleep_deepsleep();
     for (;;) {
     }
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     return pyb_sleep_get_reset_cause();
 }
 
-STATIC mp_obj_t machine_wake_reason (void) {
+static mp_obj_t machine_wake_reason (void) {
     return mp_obj_new_int(pyb_sleep_get_wake_reason());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_wake_reason_obj, machine_wake_reason);
+static MP_DEFINE_CONST_FUN_OBJ_0(machine_wake_reason_obj, machine_wake_reason);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t machine_config_main);
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index 590e872683930..3a949136dcfdd 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -43,8 +43,8 @@ typedef struct {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC network_server_obj_t network_server_obj;
-STATIC const mp_obj_type_t network_server_type;
+static network_server_obj_t network_server_obj;
+static const mp_obj_type_t network_server_type;
 
 /// \module network - network configuration
 ///
@@ -54,7 +54,7 @@ void mod_network_init0(void) {
 }
 
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
-STATIC mp_obj_t network_server_init_helper(mp_obj_t self, const mp_arg_val_t *args) {
+static mp_obj_t network_server_init_helper(mp_obj_t self, const mp_arg_val_t *args) {
     const char *user = SERVERS_DEF_USER;
     const char *pass = SERVERS_DEF_PASS;
     if (args[0].u_obj != MP_OBJ_NULL) {
@@ -81,12 +81,12 @@ STATIC mp_obj_t network_server_init_helper(mp_obj_t self, const mp_arg_val_t *ar
     return mp_const_none;
 }
 
-STATIC const mp_arg_t network_server_args[] = {
+static const mp_arg_t network_server_args[] = {
     { MP_QSTR_id,                            MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     { MP_QSTR_login,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     { MP_QSTR_timeout,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
 };
-STATIC mp_obj_t network_server_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 network_server_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // parse args
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
@@ -108,16 +108,16 @@ STATIC mp_obj_t network_server_make_new(const mp_obj_type_t *type, size_t n_args
     return (mp_obj_t)self;
 }
 
-STATIC mp_obj_t network_server_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t network_server_init(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(network_server_args) - 1];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), &network_server_args[1], args);
     return network_server_init_helper(pos_args[0], args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_server_init_obj, 1, network_server_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_server_init_obj, 1, network_server_init);
 
 // timeout value given in seconds
-STATIC mp_obj_t network_server_timeout(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t network_server_timeout(size_t n_args, const mp_obj_t *args) {
     if (n_args > 1) {
         uint32_t timeout = mp_obj_get_int(args[1]);
         servers_set_timeout(timeout * 1000);
@@ -127,23 +127,23 @@ STATIC mp_obj_t network_server_timeout(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_int(servers_get_timeout() / 1000);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_server_timeout_obj, 1, 2, network_server_timeout);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_server_timeout_obj, 1, 2, network_server_timeout);
 
-STATIC mp_obj_t network_server_running(mp_obj_t self_in) {
+static mp_obj_t network_server_running(mp_obj_t self_in) {
     // get
     return mp_obj_new_bool(servers_are_enabled());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_server_running_obj, network_server_running);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_server_running_obj, network_server_running);
 
-STATIC mp_obj_t network_server_deinit(mp_obj_t self_in) {
+static mp_obj_t network_server_deinit(mp_obj_t self_in) {
     // simply stop the servers
     servers_stop();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_server_deinit_obj, network_server_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_server_deinit_obj, network_server_deinit);
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
+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_WLAN),                MP_ROM_PTR(&mod_network_nic_type_wlan) },
 
@@ -152,7 +152,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
 #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
 
 const mp_obj_module_t mp_module_network = {
     .base = { &mp_type_module },
@@ -162,16 +162,16 @@ const mp_obj_module_t mp_module_network = {
 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[] = {
+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) },
     { MP_ROM_QSTR(MP_QSTR_deinit),              MP_ROM_PTR(&network_server_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_timeout),             MP_ROM_PTR(&network_server_timeout_obj) },
     { MP_ROM_QSTR(MP_QSTR_isrunning),           MP_ROM_PTR(&network_server_running_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(network_server_locals_dict, network_server_locals_dict_table);
+static MP_DEFINE_CONST_DICT(network_server_locals_dict, network_server_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     network_server_type,
     MP_QSTR_Server,
     MP_TYPE_FLAG_NONE,
diff --git a/ports/cc3200/mods/modos.c b/ports/cc3200/mods/modos.c
index c62c5e22c45b4..8c22ad8dafed6 100644
--- a/ports/cc3200/mods/modos.c
+++ b/ports/cc3200/mods/modos.c
@@ -31,7 +31,7 @@
 #include "py/runtime.h"
 #include "random.h"
 
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -40,4 +40,4 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
diff --git a/ports/cc3200/mods/modsocket.c b/ports/cc3200/mods/modsocket.c
index 0f56c15e821fe..c9065d488d194 100644
--- a/ports/cc3200/mods/modsocket.c
+++ b/ports/cc3200/mods/modsocket.c
@@ -70,7 +70,7 @@
 
 #define SOCKET_TIMEOUT_QUANTA_MS (20)
 
-STATIC int convert_sl_errno(int sl_errno) {
+static int convert_sl_errno(int sl_errno) {
     return -sl_errno;
 }
 
@@ -93,7 +93,7 @@ int check_timedout(mod_network_socket_obj_t *s, int ret, uint32_t *timeout_ms, i
     return 0;
 }
 
-STATIC int wlan_gethostbyname(const char *name, mp_uint_t len, uint8_t *out_ip, uint8_t family) {
+static int wlan_gethostbyname(const char *name, mp_uint_t len, uint8_t *out_ip, uint8_t family) {
     uint32_t ip;
     int result = sl_NetAppDnsGetHostByName((_i8 *)name, (_u16)len, (_u32*)&ip, (_u8)family);
     out_ip[0] = ip;
@@ -103,7 +103,7 @@ STATIC int wlan_gethostbyname(const char *name, mp_uint_t len, uint8_t *out_ip,
     return result;
 }
 
-STATIC int wlan_socket_socket(mod_network_socket_obj_t *s, int *_errno) {
+static int wlan_socket_socket(mod_network_socket_obj_t *s, int *_errno) {
     int16_t sd = sl_Socket(s->sock_base.u_param.domain, s->sock_base.u_param.type, s->sock_base.u_param.proto);
     if (sd < 0) {
         *_errno = sd;
@@ -113,7 +113,7 @@ STATIC int wlan_socket_socket(mod_network_socket_obj_t *s, int *_errno) {
     return 0;
 }
 
-STATIC void wlan_socket_close(mod_network_socket_obj_t *s) {
+static void wlan_socket_close(mod_network_socket_obj_t *s) {
     // this is to prevent the finalizer to close a socket that failed when being created
     if (s->sock_base.sd >= 0) {
         modusocket_socket_delete(s->sock_base.sd);
@@ -122,7 +122,7 @@ STATIC void wlan_socket_close(mod_network_socket_obj_t *s) {
     }
 }
 
-STATIC int wlan_socket_bind(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno) {
+static int wlan_socket_bind(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno) {
     MAKE_SOCKADDR(addr, ip, port)
     int ret = sl_Bind(s->sock_base.sd, &addr, sizeof(addr));
     if (ret != 0) {
@@ -132,7 +132,7 @@ STATIC int wlan_socket_bind(mod_network_socket_obj_t *s, byte *ip, mp_uint_t por
     return 0;
 }
 
-STATIC int wlan_socket_listen(mod_network_socket_obj_t *s, mp_int_t backlog, int *_errno) {
+static int wlan_socket_listen(mod_network_socket_obj_t *s, mp_int_t backlog, int *_errno) {
     int ret = sl_Listen(s->sock_base.sd, backlog);
     if (ret != 0) {
         *_errno = ret;
@@ -141,7 +141,7 @@ STATIC int wlan_socket_listen(mod_network_socket_obj_t *s, mp_int_t backlog, int
     return 0;
 }
 
-STATIC int wlan_socket_accept(mod_network_socket_obj_t *s, mod_network_socket_obj_t *s2, byte *ip, mp_uint_t *port, int *_errno) {
+static int wlan_socket_accept(mod_network_socket_obj_t *s, mod_network_socket_obj_t *s2, byte *ip, mp_uint_t *port, int *_errno) {
     // accept incoming connection
     int16_t sd;
     SlSockAddr_t addr;
@@ -163,7 +163,7 @@ STATIC int wlan_socket_accept(mod_network_socket_obj_t *s, mod_network_socket_ob
     }
 }
 
-STATIC int wlan_socket_connect(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno) {
+static int wlan_socket_connect(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno) {
     MAKE_SOCKADDR(addr, ip, port)
     uint32_t timeout_ms = s->sock_base.timeout_ms;
 
@@ -195,7 +195,7 @@ STATIC int wlan_socket_connect(mod_network_socket_obj_t *s, byte *ip, mp_uint_t
     }
 }
 
-STATIC int wlan_socket_send(mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, int *_errno) {
+static int wlan_socket_send(mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, int *_errno) {
     if (len == 0) {
         return 0;
     }
@@ -211,7 +211,7 @@ STATIC int wlan_socket_send(mod_network_socket_obj_t *s, const byte *buf, mp_uin
     }
 }
 
-STATIC int wlan_socket_recv(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, int *_errno) {
+static int wlan_socket_recv(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, int *_errno) {
     uint32_t timeout_ms = s->sock_base.timeout_ms;
     for (;;) {
         int ret = sl_Recv(s->sock_base.sd, buf, MIN(len, WLAN_MAX_RX_SIZE), 0);
@@ -224,7 +224,7 @@ STATIC int wlan_socket_recv(mod_network_socket_obj_t *s, byte *buf, mp_uint_t le
     }
 }
 
-STATIC int wlan_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
+static int wlan_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
     MAKE_SOCKADDR(addr, ip, port)
     uint32_t timeout_ms = s->sock_base.timeout_ms;
     for (;;) {
@@ -238,7 +238,7 @@ STATIC int wlan_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_
     }
 }
 
-STATIC int wlan_socket_recvfrom(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
+static int wlan_socket_recvfrom(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
     SlSockAddr_t addr;
     SlSocklen_t addr_len = sizeof(addr);
     uint32_t timeout_ms = s->sock_base.timeout_ms;
@@ -254,7 +254,7 @@ STATIC int wlan_socket_recvfrom(mod_network_socket_obj_t *s, byte *buf, mp_uint_
     }
 }
 
-STATIC int wlan_socket_setsockopt(mod_network_socket_obj_t *s, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
+static int wlan_socket_setsockopt(mod_network_socket_obj_t *s, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
     int ret = sl_SetSockOpt(s->sock_base.sd, level, opt, optval, optlen);
     if (ret < 0) {
         *_errno = ret;
@@ -263,7 +263,7 @@ STATIC int wlan_socket_setsockopt(mod_network_socket_obj_t *s, mp_uint_t level,
     return 0;
 }
 
-STATIC int wlan_socket_settimeout(mod_network_socket_obj_t *s, mp_uint_t timeout_s, int *_errno) {
+static int wlan_socket_settimeout(mod_network_socket_obj_t *s, mp_uint_t timeout_s, int *_errno) {
     SlSockNonblocking_t option;
     if (timeout_s == 0 || timeout_s == -1) {
         if (timeout_s == 0) {
@@ -289,7 +289,7 @@ STATIC int wlan_socket_settimeout(mod_network_socket_obj_t *s, mp_uint_t timeout
     return 0;
 }
 
-STATIC int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t arg, int *_errno) {
+static int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t arg, int *_errno) {
     mp_int_t ret;
     if (request == MP_STREAM_POLL) {
         mp_uint_t flags = arg;
@@ -361,9 +361,9 @@ typedef struct {
 /******************************************************************************
  DEFINE PRIVATE DATA
  ******************************************************************************/
-STATIC const mp_obj_type_t socket_type;
-STATIC OsiLockObj_t modusocket_LockObj;
-STATIC modusocket_sock_t modusocket_sockets[MOD_NETWORK_MAX_SOCKETS] = {{.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1},
+static const mp_obj_type_t socket_type;
+static OsiLockObj_t modusocket_LockObj;
+static modusocket_sock_t modusocket_sockets[MOD_NETWORK_MAX_SOCKETS] = {{.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1},
                                                                         {.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1}};
 
 /******************************************************************************
@@ -432,7 +432,7 @@ void modusocket_close_all_user_sockets (void) {
 // socket class
 
 // constructor socket(family=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP, 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) {
+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);
 
     // create socket object
@@ -468,7 +468,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 }
 
 // method socket.bind(address)
-STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     mod_network_socket_obj_t *self = self_in;
 
     // get address
@@ -482,10 +482,10 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
 // method socket.listen([backlog])
-STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+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 = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
@@ -500,10 +500,10 @@ 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_VAR_BETWEEN(socket_listen_obj, 1, 2, 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) {
+static mp_obj_t socket_accept(mp_obj_t self_in) {
     mod_network_socket_obj_t *self = self_in;
 
     // create new socket object
@@ -528,10 +528,10 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     client->items[1] = netutils_format_inet_addr(ip, port, NETUTILS_LITTLE);
     return client;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
+static MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 
 // method socket.connect(address)
-STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     mod_network_socket_obj_t *self = self_in;
 
     // get address
@@ -548,10 +548,10 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
 
 // method socket.send(bytes)
-STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
+static mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     mod_network_socket_obj_t *self = self_in;
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
@@ -562,10 +562,10 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     }
     return mp_obj_new_int_from_uint(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
 
 // method socket.recv(bufsize)
-STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     mod_network_socket_obj_t *self = self_in;
     mp_int_t len = mp_obj_get_int(len_in);
     vstr_t vstr;
@@ -582,10 +582,10 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     vstr.buf[vstr.len] = '\0';
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
 // method socket.sendto(bytes, address)
-STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
+static mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
     mod_network_socket_obj_t *self = self_in;
 
     // get the data
@@ -604,10 +604,10 @@ 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(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
+static MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
 
 // method socket.recvfrom(bufsize)
-STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     mod_network_socket_obj_t *self = self_in;
     vstr_t vstr;
     vstr_init_len(&vstr, mp_obj_get_int(len_in));
@@ -629,10 +629,10 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_LITTLE);
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
 
 // method socket.setsockopt(level, optname, value)
-STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     mod_network_socket_obj_t *self = args[0];
 
     mp_int_t level = mp_obj_get_int(args[1]);
@@ -658,13 +658,13 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
 
 // method socket.settimeout(value)
 // timeout=0 means non-blocking
 // timeout=None means blocking
 // otherwise, timeout is in seconds
-STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
+static mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     mod_network_socket_obj_t *self = self_in;
     mp_uint_t timeout;
     if (timeout_in == mp_const_none) {
@@ -678,25 +678,25 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
 
 // method socket.setblocking(flag)
-STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
+static mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
     if (mp_obj_is_true(blocking)) {
         return socket_settimeout(self_in, mp_const_none);
     } else {
         return socket_settimeout(self_in, MP_OBJ_NEW_SMALL_INT(0));
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
+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) {
+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, 6, socket_makefile);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 6, socket_makefile);
 
-STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { 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) },
@@ -722,7 +722,7 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
 
 MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
-STATIC mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     mod_network_socket_obj_t *self = self_in;
     mp_int_t ret = wlan_socket_recv(self, buf, size, errcode);
     if (ret < 0) {
@@ -737,7 +737,7 @@ STATIC mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *e
     return ret;
 }
 
-STATIC mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static 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 = self_in;
     mp_int_t ret = wlan_socket_send(self, buf, size, errcode);
     if (ret < 0) {
@@ -746,7 +746,7 @@ STATIC mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size,
     return ret;
 }
 
-STATIC mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+static mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
     mod_network_socket_obj_t *self = self_in;
     return wlan_socket_ioctl(self, request, arg, errcode);
 }
@@ -758,7 +758,7 @@ const mp_stream_p_t socket_stream_p = {
     .is_text = false,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
@@ -772,7 +772,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 
 // function socket.getaddrinfo(host, port)
 /// \function getaddrinfo(host, port)
-STATIC mp_obj_t mod_socket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
+static mp_obj_t mod_socket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
     size_t hlen;
     const char *host = mp_obj_str_get_data(host_in, &hlen);
     mp_int_t port = mp_obj_get_int(port_in);
@@ -791,9 +791,9 @@ STATIC mp_obj_t mod_socket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
     tuple->items[4] = netutils_format_inet_addr(out_ip, port, NETUTILS_LITTLE);
     return mp_obj_new_list(1, (mp_obj_t*)&tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_socket_getaddrinfo_obj, mod_socket_getaddrinfo);
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_socket_getaddrinfo_obj, mod_socket_getaddrinfo);
 
-STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket),          MP_ROM_PTR(&socket_type) },
@@ -810,7 +810,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_UDP),     MP_ROM_INT(SL_IPPROTO_UDP) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
 const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
diff --git a/ports/cc3200/mods/modssl.c b/ports/cc3200/mods/modssl.c
index 15c825fcf4dcb..62067d3f32273 100644
--- a/ports/cc3200/mods/modssl.c
+++ b/ports/cc3200/mods/modssl.c
@@ -53,14 +53,14 @@ typedef struct _mp_obj_ssl_socket_t {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC const mp_obj_type_t ssl_socket_type;
+static const mp_obj_type_t ssl_socket_type;
 
 /******************************************************************************/
 // MicroPython bindings; SSL class
 
 // ssl sockets inherit from normal socket, so we take its
 // locals and stream methods
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ssl_socket_type,
     MP_QSTR_ssl,
     MP_TYPE_FLAG_NONE,
@@ -68,8 +68,8 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     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) {
-    STATIC const mp_arg_t allowed_args[] = {
+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[] = {
         { MP_QSTR_sock,             MP_ARG_REQUIRED | MP_ARG_OBJ,  },
         { MP_QSTR_keyfile,          MP_ARG_KW_ONLY  | MP_ARG_OBJ,  {.u_obj = mp_const_none} },
         { MP_QSTR_certfile,         MP_ARG_KW_ONLY  | MP_ARG_OBJ,  {.u_obj = mp_const_none} },
@@ -133,9 +133,9 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
 arg_error:
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 0, mod_ssl_wrap_socket);
+static MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 0, mod_ssl_wrap_socket);
 
-STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_ssl) },
     { MP_ROM_QSTR(MP_QSTR_wrap_socket),         MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
 
@@ -153,7 +153,7 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLSv1_2),    MP_ROM_INT(SL_SO_SEC_METHOD_TLSV1_2) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
 
 const mp_obj_module_t mp_module_ssl = {
     .base = { &mp_type_module },
diff --git a/ports/cc3200/mods/modtime.c b/ports/cc3200/mods/modtime.c
index 6fa98296d2fbd..21388568ab8e8 100644
--- a/ports/cc3200/mods/modtime.c
+++ b/ports/cc3200/mods/modtime.c
@@ -30,7 +30,7 @@
 #include "pybrtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     timeutils_struct_time_t tm;
 
     // get the seconds from the RTC
@@ -49,6 +49,6 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     return mp_obj_new_int(pyb_rtc_get_seconds());
 }
diff --git a/ports/cc3200/mods/modwipy.c b/ports/cc3200/mods/modwipy.c
index 110c3cfd3622f..bb0ac4978df06 100644
--- a/ports/cc3200/mods/modwipy.c
+++ b/ports/cc3200/mods/modwipy.c
@@ -7,7 +7,7 @@
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC mp_obj_t mod_wipy_heartbeat(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_wipy_heartbeat(size_t n_args, const mp_obj_t *args) {
     if (n_args) {
         mperror_enable_heartbeat (mp_obj_is_true(args[0]));
         return mp_const_none;
@@ -15,14 +15,14 @@ STATIC mp_obj_t mod_wipy_heartbeat(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_bool(mperror_is_heartbeat_enabled());
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_wipy_heartbeat_obj, 0, 1, mod_wipy_heartbeat);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_wipy_heartbeat_obj, 0, 1, mod_wipy_heartbeat);
 
-STATIC const mp_rom_map_elem_t wipy_module_globals_table[] = {
+static const mp_rom_map_elem_t wipy_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_wipy) },
     { MP_ROM_QSTR(MP_QSTR_heartbeat),       MP_ROM_PTR(&mod_wipy_heartbeat_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(wipy_module_globals, wipy_module_globals_table);
+static MP_DEFINE_CONST_DICT(wipy_module_globals, wipy_module_globals_table);
 
 const mp_obj_module_t wipy_module = {
     .base = { &mp_type_module },
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 8d98dd0421de2..fc55201eaa3c0 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -114,7 +114,7 @@ typedef enum{
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC wlan_obj_t wlan_obj = {
+static wlan_obj_t wlan_obj = {
         .mode = -1,
         .status = 0,
         .ip = 0,
@@ -130,7 +130,7 @@ STATIC wlan_obj_t wlan_obj = {
     #endif
 };
 
-STATIC const mp_irq_methods_t wlan_irq_methods;
+static const mp_irq_methods_t wlan_irq_methods;
 
 /******************************************************************************
  DECLARE PUBLIC DATA
@@ -142,31 +142,31 @@ OsiLockObj_t wlan_LockObj;
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void wlan_clear_data (void);
-STATIC void wlan_reenable (SlWlanMode_t mode);
-STATIC void wlan_servers_start (void);
-STATIC void wlan_servers_stop (void);
-STATIC void wlan_reset (void);
-STATIC void wlan_validate_mode (uint mode);
-STATIC void wlan_set_mode (uint mode);
-STATIC void wlan_validate_ssid_len (uint32_t len);
-STATIC void wlan_set_ssid (const char *ssid, uint8_t len, bool add_mac);
-STATIC void wlan_validate_security (uint8_t auth, const char *key, uint8_t len);
-STATIC void wlan_set_security (uint8_t auth, const char *key, uint8_t len);
-STATIC void wlan_validate_channel (uint8_t channel);
-STATIC void wlan_set_channel (uint8_t channel);
+static void wlan_clear_data (void);
+static void wlan_reenable (SlWlanMode_t mode);
+static void wlan_servers_start (void);
+static void wlan_servers_stop (void);
+static void wlan_reset (void);
+static void wlan_validate_mode (uint mode);
+static void wlan_set_mode (uint mode);
+static void wlan_validate_ssid_len (uint32_t len);
+static void wlan_set_ssid (const char *ssid, uint8_t len, bool add_mac);
+static void wlan_validate_security (uint8_t auth, const char *key, uint8_t len);
+static void wlan_set_security (uint8_t auth, const char *key, uint8_t len);
+static void wlan_validate_channel (uint8_t channel);
+static void wlan_set_channel (uint8_t channel);
 #if MICROPY_HW_ANTENNA_DIVERSITY
-STATIC void wlan_validate_antenna (uint8_t antenna);
-STATIC void wlan_set_antenna (uint8_t antenna);
+static void wlan_validate_antenna (uint8_t antenna);
+static void wlan_set_antenna (uint8_t antenna);
 #endif
-STATIC void wlan_sl_disconnect (void);
-STATIC modwlan_Status_t wlan_do_connect (const char* ssid, uint32_t ssid_len, const char* bssid, uint8_t sec,
+static void wlan_sl_disconnect (void);
+static modwlan_Status_t wlan_do_connect (const char* ssid, uint32_t ssid_len, const char* bssid, uint8_t sec,
                                          const char* key, uint32_t key_len, int32_t timeout);
-STATIC void wlan_get_sl_mac (void);
-STATIC void wlan_wep_key_unhexlify (const char *key, char *key_out);
-STATIC void wlan_lpds_irq_enable (mp_obj_t self_in);
-STATIC void wlan_lpds_irq_disable (mp_obj_t self_in);
-STATIC bool wlan_scan_result_is_unique (const mp_obj_list_t *nets, _u8 *bssid);
+static void wlan_get_sl_mac (void);
+static void wlan_wep_key_unhexlify (const char *key, char *key_out);
+static void wlan_lpds_irq_enable (mp_obj_t self_in);
+static void wlan_lpds_irq_disable (mp_obj_t self_in);
+static bool wlan_scan_result_is_unique (const mp_obj_list_t *nets, _u8 *bssid);
 
 //*****************************************************************************
 //
@@ -541,14 +541,14 @@ void wlan_off_on (void) {
 // DEFINE STATIC FUNCTIONS
 //*****************************************************************************
 
-STATIC void wlan_clear_data (void) {
+static void wlan_clear_data (void) {
     CLR_STATUS_BIT_ALL(wlan_obj.status);
     wlan_obj.ip = 0;
     //memset(wlan_obj.ssid_o, 0, sizeof(wlan_obj.ssid));
     //memset(wlan_obj.bssid, 0, sizeof(wlan_obj.bssid));
 }
 
-STATIC void wlan_reenable (SlWlanMode_t mode) {
+static void wlan_reenable (SlWlanMode_t mode) {
     // stop and start again
     #ifdef SL_PLATFORM_MULTI_THREADED
     sl_LockObjLock (&wlan_LockObj, SL_OS_WAIT_FOREVER);
@@ -562,7 +562,7 @@ STATIC void wlan_reenable (SlWlanMode_t mode) {
     ASSERT (wlan_obj.mode == mode);
 }
 
-STATIC void wlan_servers_start (void) {
+static void wlan_servers_start (void) {
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
     // start the servers if they were enabled before
     if (wlan_obj.servers_enabled) {
@@ -571,7 +571,7 @@ STATIC void wlan_servers_start (void) {
 #endif
 }
 
-STATIC void wlan_servers_stop (void) {
+static void wlan_servers_stop (void) {
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
     // Stop all other processes using the wlan engine
     if ((wlan_obj.servers_enabled = servers_are_enabled())) {
@@ -580,30 +580,30 @@ STATIC void wlan_servers_stop (void) {
 #endif
 }
 
-STATIC void wlan_reset (void) {
+static void wlan_reset (void) {
     wlan_servers_stop();
     wlan_reenable (wlan_obj.mode);
     wlan_servers_start();
 }
 
-STATIC void wlan_validate_mode (uint mode) {
+static void wlan_validate_mode (uint mode) {
     if (mode != ROLE_STA && mode != ROLE_AP) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
 }
 
-STATIC void wlan_set_mode (uint mode) {
+static void wlan_set_mode (uint mode) {
     wlan_obj.mode = mode;
     ASSERT_ON_ERROR(sl_WlanSetMode(mode));
 }
 
-STATIC void wlan_validate_ssid_len (uint32_t len) {
+static void wlan_validate_ssid_len (uint32_t len) {
     if (len > MODWLAN_SSID_LEN_MAX) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
 }
 
-STATIC void wlan_set_ssid (const char *ssid, uint8_t len, bool add_mac) {
+static void wlan_set_ssid (const char *ssid, uint8_t len, bool add_mac) {
     if (ssid != NULL) {
         // save the ssid
         memcpy(&wlan_obj.ssid, ssid, len);
@@ -618,7 +618,7 @@ STATIC void wlan_set_ssid (const char *ssid, uint8_t len, bool add_mac) {
     }
 }
 
-STATIC void wlan_validate_security (uint8_t auth, const char *key, uint8_t len) {
+static void wlan_validate_security (uint8_t auth, const char *key, uint8_t len) {
     if (auth != SL_SEC_TYPE_WEP && auth != SL_SEC_TYPE_WPA_WPA2) {
         goto invalid_args;
     }
@@ -635,7 +635,7 @@ STATIC void wlan_validate_security (uint8_t auth, const char *key, uint8_t len)
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
 
-STATIC void wlan_set_security (uint8_t auth, const char *key, uint8_t len) {
+static void wlan_set_security (uint8_t auth, const char *key, uint8_t len) {
     wlan_obj.auth = auth;
     ASSERT_ON_ERROR(sl_WlanSet(SL_WLAN_CFG_AP_ID, WLAN_AP_OPT_SECURITY_TYPE, sizeof(uint8_t), &auth));
     if (key != NULL) {
@@ -653,31 +653,31 @@ STATIC void wlan_set_security (uint8_t auth, const char *key, uint8_t len) {
     }
 }
 
-STATIC void wlan_validate_channel (uint8_t channel) {
+static void wlan_validate_channel (uint8_t channel) {
     if (channel < 1 || channel > 11) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
 }
 
-STATIC void wlan_set_channel (uint8_t channel) {
+static void wlan_set_channel (uint8_t channel) {
     wlan_obj.channel = channel;
     ASSERT_ON_ERROR(sl_WlanSet(SL_WLAN_CFG_AP_ID, WLAN_AP_OPT_CHANNEL, 1, &channel));
 }
 
 #if MICROPY_HW_ANTENNA_DIVERSITY
-STATIC void wlan_validate_antenna (uint8_t antenna) {
+static void wlan_validate_antenna (uint8_t antenna) {
     if (antenna != ANTENNA_TYPE_INTERNAL && antenna != ANTENNA_TYPE_EXTERNAL) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
 }
 
-STATIC void wlan_set_antenna (uint8_t antenna) {
+static void wlan_set_antenna (uint8_t antenna) {
     wlan_obj.antenna = antenna;
     antenna_select(antenna);
 }
 #endif
 
-STATIC void wlan_sl_disconnect (void) {
+static void wlan_sl_disconnect (void) {
     // Device in station-mode. Disconnect previous connection if any
     // The function returns 0 if 'Disconnected done', negative number if already
     // disconnected Wait for 'disconnection' event if 0 is returned, Ignore
@@ -690,7 +690,7 @@ STATIC void wlan_sl_disconnect (void) {
     }
 }
 
-STATIC modwlan_Status_t wlan_do_connect (const char* ssid, uint32_t ssid_len, const char* bssid, uint8_t sec,
+static modwlan_Status_t wlan_do_connect (const char* ssid, uint32_t ssid_len, const char* bssid, uint8_t sec,
                                          const char* key, uint32_t key_len, int32_t timeout) {
     SlSecParams_t secParams;
     secParams.Key = (_i8*)key;
@@ -716,13 +716,13 @@ STATIC modwlan_Status_t wlan_do_connect (const char* ssid, uint32_t ssid_len, co
     return MODWLAN_ERROR_INVALID_PARAMS;
 }
 
-STATIC void wlan_get_sl_mac (void) {
+static void wlan_get_sl_mac (void) {
     // Get the MAC address
     uint8_t macAddrLen = SL_MAC_ADDR_LEN;
     sl_NetCfgGet(SL_MAC_ADDRESS_GET, NULL, &macAddrLen, wlan_obj.mac);
 }
 
-STATIC void wlan_wep_key_unhexlify (const char *key, char *key_out) {
+static void wlan_wep_key_unhexlify (const char *key, char *key_out) {
     byte hex_byte = 0;
     for (mp_uint_t i = strlen(key); i > 0 ; i--) {
         hex_byte += unichar_xdigit_value(*key++);
@@ -735,22 +735,22 @@ STATIC void wlan_wep_key_unhexlify (const char *key, char *key_out) {
     }
 }
 
-STATIC void wlan_lpds_irq_enable (mp_obj_t self_in) {
+static void wlan_lpds_irq_enable (mp_obj_t self_in) {
     wlan_obj_t *self = self_in;
     self->irq_enabled = true;
 }
 
-STATIC void wlan_lpds_irq_disable (mp_obj_t self_in) {
+static void wlan_lpds_irq_disable (mp_obj_t self_in) {
     wlan_obj_t *self = self_in;
     self->irq_enabled = false;
 }
 
-STATIC int wlan_irq_flags (mp_obj_t self_in) {
+static int wlan_irq_flags (mp_obj_t self_in) {
     wlan_obj_t *self = self_in;
     return self->irq_flags;
 }
 
-STATIC bool wlan_scan_result_is_unique (const mp_obj_list_t *nets, _u8 *bssid) {
+static bool wlan_scan_result_is_unique (const mp_obj_list_t *nets, _u8 *bssid) {
     for (int i = 0; i < nets->len; i++) {
         // index 1 in the list is the bssid
         mp_obj_str_t *_bssid = (mp_obj_str_t *)((mp_obj_tuple_t *)nets->items[i])->items[1];
@@ -766,7 +766,7 @@ STATIC bool wlan_scan_result_is_unique (const mp_obj_list_t *nets, _u8 *bssid) {
 
 /// \class WLAN - WiFi driver
 
-STATIC mp_obj_t wlan_init_helper(wlan_obj_t *self, const mp_arg_val_t *args) {
+static mp_obj_t wlan_init_helper(wlan_obj_t *self, const mp_arg_val_t *args) {
     // get the mode
     int8_t mode = args[0].u_int;
     wlan_validate_mode(mode);
@@ -808,7 +808,7 @@ STATIC mp_obj_t wlan_init_helper(wlan_obj_t *self, const mp_arg_val_t *args) {
     return mp_const_none;
 }
 
-STATIC const mp_arg_t wlan_init_args[] = {
+static const mp_arg_t wlan_init_args[] = {
     { MP_QSTR_id,                             MP_ARG_INT,  {.u_int = 0} },
     { MP_QSTR_mode,                           MP_ARG_INT,  {.u_int = ROLE_STA} },
     { MP_QSTR_ssid,         MP_ARG_KW_ONLY  | MP_ARG_OBJ,  {.u_obj = MP_OBJ_NULL} },
@@ -818,7 +818,7 @@ STATIC const mp_arg_t wlan_init_args[] = {
     { MP_QSTR_antenna,      MP_ARG_KW_ONLY  | MP_ARG_INT,  {.u_int = ANTENNA_TYPE_INTERNAL} },
     #endif
 };
-STATIC mp_obj_t wlan_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 wlan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // parse args
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
@@ -844,16 +844,16 @@ STATIC mp_obj_t wlan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     return (mp_obj_t)self;
 }
 
-STATIC mp_obj_t wlan_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t wlan_init(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(wlan_init_args) - 1];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), &wlan_init_args[1], args);
     return wlan_init_helper(pos_args[0], args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wlan_init_obj, 1, wlan_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(wlan_init_obj, 1, wlan_init);
 
-STATIC mp_obj_t wlan_scan(mp_obj_t self_in) {
-    STATIC const qstr wlan_scan_info_fields[] = {
+static mp_obj_t wlan_scan(mp_obj_t self_in) {
+    static const qstr wlan_scan_info_fields[] = {
         MP_QSTR_ssid, MP_QSTR_bssid, MP_QSTR_sec, MP_QSTR_channel, MP_QSTR_rssi
     };
 
@@ -901,10 +901,10 @@ STATIC mp_obj_t wlan_scan(mp_obj_t self_in) {
 
     return nets;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wlan_scan_obj, wlan_scan);
+static MP_DEFINE_CONST_FUN_OBJ_1(wlan_scan_obj, wlan_scan);
 
-STATIC mp_obj_t wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t allowed_args[] = {
+static mp_obj_t wlan_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, },
         { MP_QSTR_auth,                       MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_bssid,    MP_ARG_KW_ONLY  | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -967,21 +967,21 @@ STATIC mp_obj_t wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wlan_connect_obj, 1, wlan_connect);
+static MP_DEFINE_CONST_FUN_OBJ_KW(wlan_connect_obj, 1, wlan_connect);
 
-STATIC mp_obj_t wlan_disconnect(mp_obj_t self_in) {
+static mp_obj_t wlan_disconnect(mp_obj_t self_in) {
     wlan_sl_disconnect();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wlan_disconnect_obj, wlan_disconnect);
+static MP_DEFINE_CONST_FUN_OBJ_1(wlan_disconnect_obj, wlan_disconnect);
 
-STATIC mp_obj_t wlan_isconnected(mp_obj_t self_in) {
+static mp_obj_t wlan_isconnected(mp_obj_t self_in) {
     return wlan_is_connected() ? mp_const_true : mp_const_false;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wlan_isconnected_obj, wlan_isconnected);
+static MP_DEFINE_CONST_FUN_OBJ_1(wlan_isconnected_obj, wlan_isconnected);
 
-STATIC mp_obj_t wlan_ifconfig(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t wlan_ifconfig_args[] = {
+static mp_obj_t wlan_ifconfig(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t wlan_ifconfig_args[] = {
         { MP_QSTR_id,               MP_ARG_INT,     {.u_int = 0} },
         { MP_QSTR_config,           MP_ARG_OBJ,     {.u_obj = MP_OBJ_NULL} },
     };
@@ -1055,9 +1055,9 @@ STATIC mp_obj_t wlan_ifconfig(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wlan_ifconfig_obj, 1, wlan_ifconfig);
+static MP_DEFINE_CONST_FUN_OBJ_KW(wlan_ifconfig_obj, 1, wlan_ifconfig);
 
-STATIC mp_obj_t wlan_mode(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t wlan_mode(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
         return mp_obj_new_int(self->mode);
@@ -1069,9 +1069,9 @@ STATIC mp_obj_t wlan_mode(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_mode_obj, 1, 2, wlan_mode);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_mode_obj, 1, 2, wlan_mode);
 
-STATIC mp_obj_t wlan_ssid(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t wlan_ssid(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
         return mp_obj_new_str((const char *)self->ssid, strlen((const char *)self->ssid));
@@ -1084,9 +1084,9 @@ STATIC mp_obj_t wlan_ssid(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_ssid_obj, 1, 2, wlan_ssid);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_ssid_obj, 1, 2, wlan_ssid);
 
-STATIC mp_obj_t wlan_auth(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t wlan_auth(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
         if (self->auth == SL_SEC_TYPE_OPEN) {
@@ -1114,9 +1114,9 @@ STATIC mp_obj_t wlan_auth(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_auth_obj, 1, 2, wlan_auth);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_auth_obj, 1, 2, wlan_auth);
 
-STATIC mp_obj_t wlan_channel(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t wlan_channel(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
         return mp_obj_new_int(self->channel);
@@ -1128,9 +1128,9 @@ STATIC mp_obj_t wlan_channel(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_channel_obj, 1, 2, wlan_channel);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_channel_obj, 1, 2, wlan_channel);
 
-STATIC mp_obj_t wlan_antenna(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t wlan_antenna(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
         return mp_obj_new_int(self->antenna);
@@ -1143,9 +1143,9 @@ STATIC mp_obj_t wlan_antenna(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_antenna_obj, 1, 2, wlan_antenna);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_antenna_obj, 1, 2, wlan_antenna);
 
-STATIC mp_obj_t wlan_mac(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t wlan_mac(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
         return mp_obj_new_bytes((const byte *)self->mac, SL_BSSID_LENGTH);
@@ -1161,9 +1161,9 @@ STATIC mp_obj_t wlan_mac(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_mac_obj, 1, 2, wlan_mac);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_mac_obj, 1, 2, wlan_mac);
 
-STATIC mp_obj_t wlan_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t wlan_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_val_t args[mp_irq_INIT_NUM_ARGS];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mp_irq_INIT_NUM_ARGS, mp_irq_init_args, args);
 
@@ -1191,7 +1191,7 @@ STATIC mp_obj_t wlan_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_a
 invalid_args:
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wlan_irq_obj, 1, wlan_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(wlan_irq_obj, 1, wlan_irq);
 
 //STATIC mp_obj_t wlan_connections (mp_obj_t self_in) {
 //    mp_obj_t device[2];
@@ -1238,7 +1238,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wlan_irq_obj, 1, wlan_irq);
 //}
 //STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_urn_obj, 1, 2, wlan_urn);
 
-STATIC mp_obj_t wlan_print_ver(void) {
+static mp_obj_t wlan_print_ver(void) {
     SlVersionFull ver;
     byte config_opt = SL_DEVICE_GENERAL_VERSION;
     byte config_len = sizeof(ver);
@@ -1250,10 +1250,10 @@ STATIC mp_obj_t wlan_print_ver(void) {
                                  ver.ChipFwAndPhyVersion.PhyVersion[2], ver.ChipFwAndPhyVersion.PhyVersion[3]);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(wlan_print_ver_fun_obj, wlan_print_ver);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(wlan_print_ver_obj, MP_ROM_PTR(&wlan_print_ver_fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_0(wlan_print_ver_fun_obj, wlan_print_ver);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(wlan_print_ver_obj, MP_ROM_PTR(&wlan_print_ver_fun_obj));
 
-STATIC const mp_rom_map_elem_t wlan_locals_dict_table[] = {
+static const mp_rom_map_elem_t wlan_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&wlan_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_scan),                MP_ROM_PTR(&wlan_scan_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect),             MP_ROM_PTR(&wlan_connect_obj) },
@@ -1283,7 +1283,7 @@ STATIC const mp_rom_map_elem_t wlan_locals_dict_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_ANY_EVENT),           MP_ROM_INT(MODWLAN_WIFI_EVENT_ANY) },
 };
-STATIC MP_DEFINE_CONST_DICT(wlan_locals_dict, wlan_locals_dict_table);
+static MP_DEFINE_CONST_DICT(wlan_locals_dict, wlan_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mod_network_nic_type_wlan,
@@ -1293,7 +1293,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &wlan_locals_dict
     );
 
-STATIC const mp_irq_methods_t wlan_irq_methods = {
+static const mp_irq_methods_t wlan_irq_methods = {
     .init = wlan_irq,
     .enable = wlan_lpds_irq_enable,
     .disable = wlan_lpds_irq_disable,
diff --git a/ports/cc3200/mods/pybadc.c b/ports/cc3200/mods/pybadc.c
index 6f9f1f19ae47d..cfa19a408e012 100644
--- a/ports/cc3200/mods/pybadc.c
+++ b/ports/cc3200/mods/pybadc.c
@@ -74,23 +74,23 @@ typedef struct {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC pyb_adc_channel_obj_t pyb_adc_channel_obj[PYB_ADC_NUM_CHANNELS] = { {.pin = &pin_GP2, .channel = ADC_CH_0, .id = 0, .enabled = false},
+static pyb_adc_channel_obj_t pyb_adc_channel_obj[PYB_ADC_NUM_CHANNELS] = { {.pin = &pin_GP2, .channel = ADC_CH_0, .id = 0, .enabled = false},
                                                                            {.pin = &pin_GP3, .channel = ADC_CH_1, .id = 1, .enabled = false},
                                                                            {.pin = &pin_GP4, .channel = ADC_CH_2, .id = 2, .enabled = false},
                                                                            {.pin = &pin_GP5, .channel = ADC_CH_3, .id = 3, .enabled = false} };
-STATIC pyb_adc_obj_t pyb_adc_obj = {.enabled = false};
+static pyb_adc_obj_t pyb_adc_obj = {.enabled = false};
 
-STATIC const mp_obj_type_t pyb_adc_channel_type;
+static const mp_obj_type_t pyb_adc_channel_type;
 
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC mp_obj_t adc_channel_deinit(mp_obj_t self_in);
+static mp_obj_t adc_channel_deinit(mp_obj_t self_in);
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
  ******************************************************************************/
-STATIC void pyb_adc_init (pyb_adc_obj_t *self) {
+static void pyb_adc_init (pyb_adc_obj_t *self) {
     // enable and configure the timer
     MAP_ADCTimerConfig(ADC_BASE, (1 << 17) - 1);
     MAP_ADCTimerEnable(ADC_BASE);
@@ -99,14 +99,14 @@ STATIC void pyb_adc_init (pyb_adc_obj_t *self) {
     self->enabled = true;
 }
 
-STATIC void pyb_adc_check_init(void) {
+static void pyb_adc_check_init(void) {
     // not initialized
     if (!pyb_adc_obj.enabled) {
         mp_raise_OSError(MP_EPERM);
     }
 }
 
-STATIC void pyb_adc_channel_init (pyb_adc_channel_obj_t *self) {
+static void pyb_adc_channel_init (pyb_adc_channel_obj_t *self) {
     // the ADC block must be enabled first
     pyb_adc_check_init();
     // configure the pin in analog mode
@@ -116,7 +116,7 @@ STATIC void pyb_adc_channel_init (pyb_adc_channel_obj_t *self) {
     self->enabled = true;
 }
 
-STATIC void pyb_adc_deinit_all_channels (void) {
+static void pyb_adc_deinit_all_channels (void) {
     for (int i = 0; i < PYB_ADC_NUM_CHANNELS; i++) {
         adc_channel_deinit(&pyb_adc_channel_obj[i]);
     }
@@ -125,7 +125,7 @@ STATIC void pyb_adc_deinit_all_channels (void) {
 /******************************************************************************/
 /* MicroPython bindings : adc object                                         */
 
-STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_adc_obj_t *self = self_in;
     if (self->enabled) {
         mp_printf(print, "ADC(0, bits=12)");
@@ -134,11 +134,11 @@ STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     }
 }
 
-STATIC const mp_arg_t pyb_adc_init_args[] = {
+static const mp_arg_t pyb_adc_init_args[] = {
     { MP_QSTR_id,                          MP_ARG_INT, {.u_int = 0} },
     { MP_QSTR_bits,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 12} },
 };
-STATIC mp_obj_t adc_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 adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // parse args
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
@@ -165,7 +165,7 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     return self;
 }
 
-STATIC mp_obj_t adc_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t adc_init(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(pyb_adc_init_args) - 1];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), &pyb_adc_init_args[1], args);
@@ -176,9 +176,9 @@ STATIC mp_obj_t adc_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_a
     pyb_adc_init(pos_args[0]);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adc_init_obj, 1, adc_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(adc_init_obj, 1, adc_init);
 
-STATIC mp_obj_t adc_deinit(mp_obj_t self_in) {
+static mp_obj_t adc_deinit(mp_obj_t self_in) {
     pyb_adc_obj_t *self = self_in;
     // first deinit all channels
     pyb_adc_deinit_all_channels();
@@ -188,10 +188,10 @@ STATIC mp_obj_t adc_deinit(mp_obj_t self_in) {
     pyb_sleep_remove ((const mp_obj_t)self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_deinit_obj, adc_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_deinit_obj, adc_deinit);
 
-STATIC mp_obj_t adc_channel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t pyb_adc_channel_args[] = {
+static mp_obj_t adc_channel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t pyb_adc_channel_args[] = {
         { MP_QSTR_id,                          MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_pin,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
@@ -223,15 +223,15 @@ STATIC mp_obj_t adc_channel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     pyb_sleep_add ((const mp_obj_t)self, (WakeUpCB_t)pyb_adc_channel_init);
     return self;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adc_channel_obj, 1, adc_channel);
+static MP_DEFINE_CONST_FUN_OBJ_KW(adc_channel_obj, 1, adc_channel);
 
-STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
+static const mp_rom_map_elem_t adc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&adc_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit),              MP_ROM_PTR(&adc_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_channel),             MP_ROM_PTR(&adc_channel_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_type,
@@ -242,7 +242,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     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) {
+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;
     if (self->enabled) {
         mp_printf(print, "ADCChannel(%u, pin=%q)", self->id, self->pin->name);
@@ -251,15 +251,15 @@ STATIC void adc_channel_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     }
 }
 
-STATIC mp_obj_t adc_channel_init(mp_obj_t self_in) {
+static mp_obj_t adc_channel_init(mp_obj_t self_in) {
     pyb_adc_channel_obj_t *self = self_in;
     // re-enable it
     pyb_adc_channel_init(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_channel_init_obj, adc_channel_init);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_channel_init_obj, adc_channel_init);
 
-STATIC mp_obj_t adc_channel_deinit(mp_obj_t self_in) {
+static mp_obj_t adc_channel_deinit(mp_obj_t self_in) {
     pyb_adc_channel_obj_t *self = self_in;
 
     MAP_ADCChannelDisable(ADC_BASE, self->channel);
@@ -268,9 +268,9 @@ STATIC mp_obj_t adc_channel_deinit(mp_obj_t self_in) {
     self->enabled = false;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_channel_deinit_obj, adc_channel_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_channel_deinit_obj, adc_channel_deinit);
 
-STATIC mp_obj_t adc_channel_value(mp_obj_t self_in) {
+static mp_obj_t adc_channel_value(mp_obj_t self_in) {
     pyb_adc_channel_obj_t *self = self_in;
     uint32_t value;
 
@@ -286,22 +286,22 @@ STATIC mp_obj_t adc_channel_value(mp_obj_t self_in) {
     // the 12 bit sampled value is stored in bits [13:2]
     return MP_OBJ_NEW_SMALL_INT((value & 0x3FFF) >> 2);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_channel_value_obj, adc_channel_value);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_channel_value_obj, adc_channel_value);
 
-STATIC mp_obj_t adc_channel_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t adc_channel_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, 0, false);
     return adc_channel_value (self_in);
 }
 
-STATIC const mp_rom_map_elem_t adc_channel_locals_dict_table[] = {
+static const mp_rom_map_elem_t adc_channel_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&adc_channel_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit),              MP_ROM_PTR(&adc_channel_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),               MP_ROM_PTR(&adc_channel_value_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(adc_channel_locals_dict, adc_channel_locals_dict_table);
+static MP_DEFINE_CONST_DICT(adc_channel_locals_dict, adc_channel_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_channel_type,
     MP_QSTR_ADCChannel,
     MP_TYPE_FLAG_NONE,
diff --git a/ports/cc3200/mods/pybflash.c b/ports/cc3200/mods/pybflash.c
index 46b7be234f9cb..671b5137e275c 100644
--- a/ports/cc3200/mods/pybflash.c
+++ b/ports/cc3200/mods/pybflash.c
@@ -37,9 +37,9 @@
 // block protocol.
 
 // there is a singleton Flash object
-STATIC const mp_obj_base_t pyb_flash_obj = {&pyb_flash_type};
+static const mp_obj_base_t pyb_flash_obj = {&pyb_flash_type};
 
-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 *args) {
+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 *args) {
     // check arguments
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
@@ -47,23 +47,23 @@ STATIC mp_obj_t pyb_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return (mp_obj_t)&pyb_flash_obj;
 }
 
-STATIC mp_obj_t pyb_flash_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t pyb_flash_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
     DRESULT res = sflash_disk_read(bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SFLASH_SECTOR_SIZE);
     return MP_OBJ_NEW_SMALL_INT(res != RES_OK); // return of 0 means success
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_readblocks_obj, pyb_flash_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_readblocks_obj, pyb_flash_readblocks);
 
-STATIC mp_obj_t pyb_flash_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t pyb_flash_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
     DRESULT res = sflash_disk_write(bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SFLASH_SECTOR_SIZE);
     return MP_OBJ_NEW_SMALL_INT(res != RES_OK); // return of 0 means success
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_writeblocks_obj, pyb_flash_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_writeblocks_obj, pyb_flash_writeblocks);
 
-STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t pyb_flash_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) {
     mp_int_t cmd = mp_obj_get_int(cmd_in);
     switch (cmd) {
         case MP_BLOCKDEV_IOCTL_INIT: return MP_OBJ_NEW_SMALL_INT(sflash_disk_init() != RES_OK);
@@ -74,15 +74,15 @@ STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in)
         default: return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_ioctl_obj, pyb_flash_ioctl);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pyb_flash_locals_dict, pyb_flash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_flash_type,
diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
index a413eddeb2e3c..0a9e778081c3f 100644
--- a/ports/cc3200/mods/pybi2c.c
+++ b/ports/cc3200/mods/pybi2c.c
@@ -74,18 +74,18 @@ typedef struct _pyb_i2c_obj_t {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC pyb_i2c_obj_t pyb_i2c_obj = {.baudrate = 0};
+static pyb_i2c_obj_t pyb_i2c_obj = {.baudrate = 0};
 
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC bool pyb_i2c_write(byte addr, byte *data, uint len, bool stop);
+static bool pyb_i2c_write(byte addr, byte *data, uint len, bool stop);
 
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
 // only master mode is available for the moment
-STATIC void i2c_init (pyb_i2c_obj_t *self) {
+static void i2c_init (pyb_i2c_obj_t *self) {
     // Enable the I2C Peripheral
     MAP_PRCMPeripheralClkEnable(PRCM_I2CA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
     MAP_PRCMPeripheralReset(PRCM_I2CA0);
@@ -93,7 +93,7 @@ STATIC void i2c_init (pyb_i2c_obj_t *self) {
     MAP_I2CMasterInitExpClk(I2CA0_BASE, self->baudrate);
 }
 
-STATIC bool pyb_i2c_transaction(uint cmd) {
+static bool pyb_i2c_transaction(uint cmd) {
     // Convert the timeout to microseconds
     int32_t timeout = PYBI2C_TRANSC_TIMEOUT_MS * 1000;
     // Sanity check, t_timeout must be between 1 and 255
@@ -137,14 +137,14 @@ STATIC bool pyb_i2c_transaction(uint cmd) {
     return true;
 }
 
-STATIC void pyb_i2c_check_init(pyb_i2c_obj_t *self) {
+static void pyb_i2c_check_init(pyb_i2c_obj_t *self) {
     // not initialized
     if (!self->baudrate) {
         mp_raise_OSError(MP_EPERM);
     }
 }
 
-STATIC bool pyb_i2c_scan_device(byte devAddr) {
+static bool pyb_i2c_scan_device(byte devAddr) {
     bool ret = false;
     // Set the I2C slave address
     MAP_I2CMasterSlaveAddrSet(I2CA0_BASE, devAddr, true);
@@ -163,7 +163,7 @@ STATIC bool pyb_i2c_scan_device(byte devAddr) {
     return ret;
 }
 
-STATIC bool pyb_i2c_mem_addr_write (byte addr, byte *mem_addr, uint mem_addr_len) {
+static bool pyb_i2c_mem_addr_write (byte addr, byte *mem_addr, uint mem_addr_len) {
     // Set I2C codec slave address
     MAP_I2CMasterSlaveAddrSet(I2CA0_BASE, addr, false);
     // Write the first byte to the controller.
@@ -181,7 +181,7 @@ STATIC bool pyb_i2c_mem_addr_write (byte addr, byte *mem_addr, uint mem_addr_len
     return true;
 }
 
-STATIC bool pyb_i2c_mem_write (byte addr, byte *mem_addr, uint mem_addr_len, byte *data, uint data_len) {
+static bool pyb_i2c_mem_write (byte addr, byte *mem_addr, uint mem_addr_len, byte *data, uint data_len) {
     if (pyb_i2c_mem_addr_write (addr, mem_addr, mem_addr_len)) {
         // Loop until the completion of transfer or error
         while (data_len--) {
@@ -197,7 +197,7 @@ STATIC bool pyb_i2c_mem_write (byte addr, byte *mem_addr, uint mem_addr_len, byt
     return false;
 }
 
-STATIC bool pyb_i2c_write(byte addr, byte *data, uint len, bool stop) {
+static bool pyb_i2c_write(byte addr, byte *data, uint len, bool stop) {
     // Set I2C codec slave address
     MAP_I2CMasterSlaveAddrSet(I2CA0_BASE, addr, false);
     // Write the first byte to the controller.
@@ -220,7 +220,7 @@ STATIC bool pyb_i2c_write(byte addr, byte *data, uint len, bool stop) {
     return true;
 }
 
-STATIC bool pyb_i2c_read(byte addr, byte *data, uint len) {
+static bool pyb_i2c_read(byte addr, byte *data, uint len) {
     // Initiate a burst or single receive sequence
     uint cmd = --len > 0 ? I2C_MASTER_CMD_BURST_RECEIVE_START : I2C_MASTER_CMD_SINGLE_RECEIVE;
     // Set I2C codec slave address
@@ -245,7 +245,7 @@ STATIC bool pyb_i2c_read(byte addr, byte *data, uint len) {
     return true;
 }
 
-STATIC void pyb_i2c_read_into (mp_arg_val_t *args, vstr_t *vstr) {
+static void pyb_i2c_read_into (mp_arg_val_t *args, vstr_t *vstr) {
     pyb_i2c_check_init(&pyb_i2c_obj);
     // get the buffer to receive into
     pyb_buf_get_for_recv(args[1].u_obj, vstr);
@@ -256,7 +256,7 @@ STATIC void pyb_i2c_read_into (mp_arg_val_t *args, vstr_t *vstr) {
     }
 }
 
-STATIC void pyb_i2c_readmem_into (mp_arg_val_t *args, vstr_t *vstr) {
+static void pyb_i2c_readmem_into (mp_arg_val_t *args, vstr_t *vstr) {
     pyb_i2c_check_init(&pyb_i2c_obj);
     // get the buffer to receive into
     pyb_buf_get_for_recv(args[2].u_obj, vstr);
@@ -281,7 +281,7 @@ STATIC void pyb_i2c_readmem_into (mp_arg_val_t *args, vstr_t *vstr) {
 /******************************************************************************/
 /* MicroPython bindings                                                      */
 /******************************************************************************/
-STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_i2c_obj_t *self = self_in;
     if (self->baudrate > 0) {
         mp_printf(print, "I2C(0, baudrate=%u)", self->baudrate);
@@ -290,7 +290,7 @@ STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     }
 }
 
-STATIC mp_obj_t pyb_i2c_init_helper(pyb_i2c_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_init_helper(pyb_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 };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -322,7 +322,7 @@ STATIC mp_obj_t pyb_i2c_init_helper(pyb_i2c_obj_t *self, size_t n_args, const mp
     return mp_const_none;
 }
 
-STATIC mp_obj_t pyb_i2c_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 pyb_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // check the id argument, if given
     if (n_args > 0) {
         if (all_args[0] != MP_OBJ_NEW_SMALL_INT(0)) {
@@ -346,12 +346,12 @@ STATIC mp_obj_t pyb_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return (mp_obj_t)self;
 }
 
-STATIC mp_obj_t pyb_i2c_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     return pyb_i2c_init_helper(pos_args[0], n_args - 1, pos_args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_init_obj, 1, pyb_i2c_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_init_obj, 1, pyb_i2c_init);
 
-STATIC mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) {
     // disable the peripheral
     MAP_I2CMasterDisable(I2CA0_BASE);
     MAP_PRCMPeripheralClkDisable(PRCM_I2CA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
@@ -361,9 +361,9 @@ STATIC mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) {
     pyb_sleep_remove ((const mp_obj_t)self_in);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_deinit_obj, pyb_i2c_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_deinit_obj, pyb_i2c_deinit);
 
-STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
+static mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
     pyb_i2c_check_init(&pyb_i2c_obj);
     mp_obj_t list = mp_obj_new_list(0, NULL);
     for (uint addr = 0x08; addr <= 0x77; addr++) {
@@ -376,10 +376,10 @@ STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
     }
     return list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan);
 
-STATIC mp_obj_t pyb_i2c_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t pyb_i2c_readfrom_args[] = {
+static mp_obj_t pyb_i2c_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t pyb_i2c_readfrom_args[] = {
         { MP_QSTR_addr,    MP_ARG_REQUIRED | MP_ARG_INT, },
         { MP_QSTR_nbytes,  MP_ARG_REQUIRED | MP_ARG_OBJ, },
     };
@@ -394,10 +394,10 @@ STATIC mp_obj_t pyb_i2c_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map
     // return the received data
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_obj, 3, pyb_i2c_readfrom);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_obj, 3, pyb_i2c_readfrom);
 
-STATIC mp_obj_t pyb_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t pyb_i2c_readfrom_into_args[] = {
+static mp_obj_t pyb_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t pyb_i2c_readfrom_into_args[] = {
         { MP_QSTR_addr,    MP_ARG_REQUIRED | MP_ARG_INT, },
         { MP_QSTR_buf,     MP_ARG_REQUIRED | MP_ARG_OBJ, },
     };
@@ -412,10 +412,10 @@ STATIC mp_obj_t pyb_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, m
     // return the number of bytes received
     return mp_obj_new_int(vstr.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_into_obj, 1, pyb_i2c_readfrom_into);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_into_obj, 1, pyb_i2c_readfrom_into);
 
-STATIC mp_obj_t pyb_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t pyb_i2c_writeto_args[] = {
+static mp_obj_t pyb_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t pyb_i2c_writeto_args[] = {
         { MP_QSTR_addr,    MP_ARG_REQUIRED | MP_ARG_INT,  },
         { MP_QSTR_buf,     MP_ARG_REQUIRED | MP_ARG_OBJ,  },
         { MP_QSTR_stop,    MP_ARG_KW_ONLY  | MP_ARG_BOOL, {.u_bool = true} },
@@ -440,10 +440,10 @@ STATIC mp_obj_t pyb_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_
     // return the number of bytes written
     return mp_obj_new_int(bufinfo.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_writeto_obj, 1, pyb_i2c_writeto);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_writeto_obj, 1, pyb_i2c_writeto);
 
-STATIC mp_obj_t pyb_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t pyb_i2c_readfrom_mem_args[] = {
+static mp_obj_t pyb_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t pyb_i2c_readfrom_mem_args[] = {
         { MP_QSTR_addr,     MP_ARG_REQUIRED  | MP_ARG_INT, },
         { MP_QSTR_memaddr,  MP_ARG_REQUIRED  | MP_ARG_INT, },
         { MP_QSTR_nbytes,   MP_ARG_REQUIRED  | MP_ARG_OBJ, },
@@ -458,16 +458,16 @@ STATIC mp_obj_t pyb_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args, mp
     pyb_i2c_readmem_into (args, &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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_mem_obj, 1, pyb_i2c_readfrom_mem);
 
-STATIC const mp_arg_t pyb_i2c_readfrom_mem_into_args[] = {
+static const mp_arg_t pyb_i2c_readfrom_mem_into_args[] = {
     { MP_QSTR_addr,     MP_ARG_REQUIRED  | MP_ARG_INT, },
     { MP_QSTR_memaddr,  MP_ARG_REQUIRED  | MP_ARG_INT, },
     { MP_QSTR_buf,      MP_ARG_REQUIRED  | MP_ARG_OBJ, },
     { MP_QSTR_addrsize, MP_ARG_KW_ONLY   | MP_ARG_INT, {.u_int = 8} },
 };
 
-STATIC mp_obj_t pyb_i2c_readfrom_mem_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_readfrom_mem_into(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(pyb_i2c_readfrom_mem_into_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), pyb_i2c_readfrom_mem_into_args, args);
@@ -477,9 +477,9 @@ STATIC mp_obj_t pyb_i2c_readfrom_mem_into(size_t n_args, const mp_obj_t *pos_arg
     pyb_i2c_readmem_into (args, &vstr);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_mem_into_obj, 1, pyb_i2c_readfrom_mem_into);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_mem_into_obj, 1, pyb_i2c_readfrom_mem_into);
 
-STATIC mp_obj_t pyb_i2c_writeto_mem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_writeto_mem(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(pyb_i2c_readfrom_mem_into_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(pyb_i2c_readfrom_mem_into_args), pyb_i2c_readfrom_mem_into_args, args);
@@ -504,9 +504,9 @@ STATIC mp_obj_t pyb_i2c_writeto_mem(size_t n_args, const mp_obj_t *pos_args, mp_
 
     mp_raise_OSError(MP_EIO);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_writeto_mem_obj, 1, pyb_i2c_writeto_mem);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_writeto_mem_obj, 1, pyb_i2c_writeto_mem);
 
-STATIC const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&pyb_i2c_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit),              MP_ROM_PTR(&pyb_i2c_deinit_obj) },
@@ -519,7 +519,7 @@ STATIC const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_writeto_mem),         MP_ROM_PTR(&pyb_i2c_writeto_mem_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_i2c_type,
diff --git a/ports/cc3200/mods/pybpin.c b/ports/cc3200/mods/pybpin.c
index 6d10abab570f1..037c78a32cbf2 100644
--- a/ports/cc3200/mods/pybpin.c
+++ b/ports/cc3200/mods/pybpin.c
@@ -53,26 +53,26 @@
 /******************************************************************************
 DECLARE PRIVATE FUNCTIONS
 ******************************************************************************/
-STATIC pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name);
-STATIC pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uint port, uint bit);
-STATIC int8_t pin_obj_find_af (const pin_obj_t* pin, uint8_t fn, uint8_t unit, uint8_t type);
-STATIC void pin_free_af_from_pins (uint8_t fn, uint8_t unit, uint8_t type);
-STATIC void pin_deassign (pin_obj_t* pin);
-STATIC void pin_obj_configure (const pin_obj_t *self);
-STATIC void pin_get_hibernate_pin_and_idx (const pin_obj_t *self, uint *wake_pin, uint *idx);
-STATIC void pin_irq_enable (mp_obj_t self_in);
-STATIC void pin_irq_disable (mp_obj_t self_in);
-STATIC void pin_extint_register(pin_obj_t *self, uint32_t intmode, uint32_t priority);
-STATIC void pin_validate_mode (uint mode);
-STATIC void pin_validate_pull (uint pull);
-STATIC void pin_validate_drive (uint strength);
-STATIC void pin_validate_af(const pin_obj_t* pin, int8_t idx, uint8_t *fn, uint8_t *unit, uint8_t *type);
-STATIC uint8_t pin_get_value(const pin_obj_t* self);
-STATIC void GPIOA0IntHandler (void);
-STATIC void GPIOA1IntHandler (void);
-STATIC void GPIOA2IntHandler (void);
-STATIC void GPIOA3IntHandler (void);
-STATIC void EXTI_Handler(uint port);
+static pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name);
+static pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uint port, uint bit);
+static int8_t pin_obj_find_af (const pin_obj_t* pin, uint8_t fn, uint8_t unit, uint8_t type);
+static void pin_free_af_from_pins (uint8_t fn, uint8_t unit, uint8_t type);
+static void pin_deassign (pin_obj_t* pin);
+static void pin_obj_configure (const pin_obj_t *self);
+static void pin_get_hibernate_pin_and_idx (const pin_obj_t *self, uint *wake_pin, uint *idx);
+static void pin_irq_enable (mp_obj_t self_in);
+static void pin_irq_disable (mp_obj_t self_in);
+static void pin_extint_register(pin_obj_t *self, uint32_t intmode, uint32_t priority);
+static void pin_validate_mode (uint mode);
+static void pin_validate_pull (uint pull);
+static void pin_validate_drive (uint strength);
+static void pin_validate_af(const pin_obj_t* pin, int8_t idx, uint8_t *fn, uint8_t *unit, uint8_t *type);
+static uint8_t pin_get_value(const pin_obj_t* self);
+static void GPIOA0IntHandler (void);
+static void GPIOA1IntHandler (void);
+static void GPIOA2IntHandler (void);
+static void GPIOA3IntHandler (void);
+static void EXTI_Handler(uint port);
 
 /******************************************************************************
 DEFINE CONSTANTS
@@ -100,8 +100,8 @@ typedef struct {
 /******************************************************************************
 DECLARE PRIVATE DATA
 ******************************************************************************/
-STATIC const mp_irq_methods_t pin_irq_methods;
-STATIC pybpin_wake_pin_t pybpin_wake_pin[PYBPIN_NUM_WAKE_PINS] =
+static const mp_irq_methods_t pin_irq_methods;
+static pybpin_wake_pin_t pybpin_wake_pin[PYBPIN_NUM_WAKE_PINS] =
                                     { {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
                                       {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
                                       {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
@@ -205,7 +205,7 @@ int8_t pin_find_af_index (const pin_obj_t* pin, uint8_t fn, uint8_t unit, uint8_
 /******************************************************************************
 DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+static 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 != NULL) {
@@ -214,7 +214,7 @@ STATIC pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t n
     return NULL;
 }
 
-STATIC pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uint port, uint bit) {
+static pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uint port, uint bit) {
     const mp_map_t *named_map = &named_pins->map;
     for (uint i = 0; i < named_map->used; i++) {
         if ((((pin_obj_t *)named_map->table[i].value)->port == port) &&
@@ -225,7 +225,7 @@ STATIC pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uin
     return NULL;
 }
 
-STATIC int8_t pin_obj_find_af (const pin_obj_t* pin, uint8_t fn, uint8_t unit, uint8_t type) {
+static int8_t pin_obj_find_af (const pin_obj_t* pin, uint8_t fn, uint8_t unit, uint8_t type) {
     for (int i = 0; i < pin->num_afs; i++) {
         if (pin->af_list[i].fn == fn && pin->af_list[i].unit == unit && pin->af_list[i].type == type) {
             return pin->af_list[i].idx;
@@ -234,7 +234,7 @@ STATIC int8_t pin_obj_find_af (const pin_obj_t* pin, uint8_t fn, uint8_t unit, u
     return -1;
 }
 
-STATIC void pin_free_af_from_pins (uint8_t fn, uint8_t unit, uint8_t type) {
+static void pin_free_af_from_pins (uint8_t fn, uint8_t unit, uint8_t type) {
     const mp_map_t *named_map = &pin_board_pins_locals_dict.map;
     for (uint i = 0; i < named_map->used - 1; i++) {
         pin_obj_t * pin = (pin_obj_t *)named_map->table[i].value;
@@ -250,12 +250,12 @@ STATIC void pin_free_af_from_pins (uint8_t fn, uint8_t unit, uint8_t type) {
     }
 }
 
-STATIC void pin_deassign (pin_obj_t* pin) {
+static void pin_deassign (pin_obj_t* pin) {
     pin_config (pin, PIN_MODE_0, GPIO_DIR_MODE_IN, PIN_TYPE_STD, -1, PIN_STRENGTH_4MA);
     pin->used = false;
 }
 
-STATIC void pin_obj_configure (const pin_obj_t *self) {
+static void pin_obj_configure (const pin_obj_t *self) {
     uint32_t type;
     if (self->mode == PIN_TYPE_ANALOG) {
         type = PIN_TYPE_ANALOG;
@@ -299,7 +299,7 @@ STATIC void pin_obj_configure (const pin_obj_t *self) {
     MAP_PinConfigSet(self->pin_num, self->strength, type);
 }
 
-STATIC void pin_get_hibernate_pin_and_idx (const pin_obj_t *self, uint *hib_pin, uint *idx) {
+static void pin_get_hibernate_pin_and_idx (const pin_obj_t *self, uint *hib_pin, uint *idx) {
     // pin_num is actually : (package_pin - 1)
     switch (self->pin_num) {
     case 56:    // GP2
@@ -332,7 +332,7 @@ STATIC void pin_get_hibernate_pin_and_idx (const pin_obj_t *self, uint *hib_pin,
     }
 }
 
-STATIC void pin_irq_enable (mp_obj_t self_in) {
+static void pin_irq_enable (mp_obj_t self_in) {
     const pin_obj_t *self = self_in;
     uint hib_pin, idx;
 
@@ -364,7 +364,7 @@ STATIC void pin_irq_enable (mp_obj_t self_in) {
     }
 }
 
-STATIC void pin_irq_disable (mp_obj_t self_in) {
+static void pin_irq_disable (mp_obj_t self_in) {
     const pin_obj_t *self = self_in;
     uint hib_pin, idx;
 
@@ -383,12 +383,12 @@ STATIC void pin_irq_disable (mp_obj_t self_in) {
     MAP_GPIOIntDisable(self->port, self->bit);
 }
 
-STATIC int pin_irq_flags (mp_obj_t self_in) {
+static int pin_irq_flags (mp_obj_t self_in) {
     const pin_obj_t *self = self_in;
     return self->irq_flags;
 }
 
-STATIC void pin_extint_register(pin_obj_t *self, uint32_t intmode, uint32_t priority) {
+static void pin_extint_register(pin_obj_t *self, uint32_t intmode, uint32_t priority) {
     void *handler;
     uint32_t intnum;
 
@@ -419,25 +419,25 @@ STATIC void pin_extint_register(pin_obj_t *self, uint32_t intmode, uint32_t prio
     MAP_IntPrioritySet(intnum, priority);
 }
 
-STATIC void pin_validate_mode (uint mode) {
+static void pin_validate_mode (uint mode) {
     if (mode != GPIO_DIR_MODE_IN && mode != GPIO_DIR_MODE_OUT && mode != PIN_TYPE_OD &&
         mode != GPIO_DIR_MODE_ALT && mode != GPIO_DIR_MODE_ALT_OD) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
 }
-STATIC void pin_validate_pull (uint pull) {
+static void pin_validate_pull (uint pull) {
     if (pull != PIN_TYPE_STD && pull != PIN_TYPE_STD_PU && pull != PIN_TYPE_STD_PD) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
 }
 
-STATIC void pin_validate_drive(uint strength) {
+static void pin_validate_drive(uint strength) {
     if (strength != PIN_STRENGTH_2MA && strength != PIN_STRENGTH_4MA && strength != PIN_STRENGTH_6MA) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
 }
 
-STATIC void pin_validate_af(const pin_obj_t* pin, int8_t idx, uint8_t *fn, uint8_t *unit, uint8_t *type) {
+static void pin_validate_af(const pin_obj_t* pin, int8_t idx, uint8_t *fn, uint8_t *unit, uint8_t *type) {
     for (int i = 0; i < pin->num_afs; i++) {
         if (pin->af_list[i].idx == idx) {
             *fn = pin->af_list[i].fn;
@@ -449,7 +449,7 @@ STATIC void pin_validate_af(const pin_obj_t* pin, int8_t idx, uint8_t *fn, uint8
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
 
-STATIC uint8_t pin_get_value (const pin_obj_t* self) {
+static uint8_t pin_get_value (const pin_obj_t* self) {
     uint32_t value;
     bool setdir = false;
     if (self->mode == PIN_TYPE_OD || self->mode == GPIO_DIR_MODE_ALT_OD) {
@@ -472,24 +472,24 @@ STATIC uint8_t pin_get_value (const pin_obj_t* self) {
     return value ? 1 : 0;
 }
 
-STATIC void GPIOA0IntHandler (void) {
+static void GPIOA0IntHandler (void) {
     EXTI_Handler(GPIOA0_BASE);
 }
 
-STATIC void GPIOA1IntHandler (void) {
+static void GPIOA1IntHandler (void) {
     EXTI_Handler(GPIOA1_BASE);
 }
 
-STATIC void GPIOA2IntHandler (void) {
+static void GPIOA2IntHandler (void) {
     EXTI_Handler(GPIOA2_BASE);
 }
 
-STATIC void GPIOA3IntHandler (void) {
+static void GPIOA3IntHandler (void) {
     EXTI_Handler(GPIOA3_BASE);
 }
 
 // common interrupt handler
-STATIC void EXTI_Handler(uint port) {
+static void EXTI_Handler(uint port) {
     uint32_t bits = MAP_GPIOIntStatus(port, true);
     MAP_GPIOIntClear(port, bits);
 
@@ -517,7 +517,7 @@ STATIC void EXTI_Handler(uint port) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC const mp_arg_t pin_init_args[] = {
+static const mp_arg_t pin_init_args[] = {
     { MP_QSTR_mode,                        MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     { 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} },
@@ -526,7 +526,7 @@ STATIC const mp_arg_t pin_init_args[] = {
 };
 #define pin_INIT_NUM_ARGS MP_ARRAY_SIZE(pin_init_args)
 
-STATIC mp_obj_t pin_obj_init_helper(pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pin_obj_init_helper(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[pin_INIT_NUM_ARGS];
     mp_arg_parse_all(n_args, pos_args, kw_args, pin_INIT_NUM_ARGS, pin_init_args, args);
@@ -590,7 +590,7 @@ STATIC mp_obj_t pin_obj_init_helper(pin_obj_t *self, size_t n_args, const mp_obj
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
 
-STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pin_obj_t *self = self_in;
     uint32_t pull = self->pull;
     uint32_t drive = self->strength;
@@ -643,7 +643,7 @@ STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     mp_printf(print, ", alt=%d)", alt);
 }
 
-STATIC mp_obj_t pin_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 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.
@@ -656,12 +656,12 @@ STATIC mp_obj_t pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     return (mp_obj_t)pin;
 }
 
-STATIC mp_obj_t pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(pin_init_obj, 1, pin_obj_init);
 
-STATIC mp_obj_t pin_value(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_value(size_t n_args, const mp_obj_t *args) {
     pin_obj_t *self = args[0];
     if (n_args == 1) {
         // get the value
@@ -678,15 +678,15 @@ STATIC mp_obj_t pin_value(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
 
-STATIC mp_obj_t pin_id(mp_obj_t self_in) {
+static mp_obj_t pin_id(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     return MP_OBJ_NEW_QSTR(self->name);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_id_obj, pin_id);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_id_obj, pin_id);
 
-STATIC mp_obj_t pin_mode(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_mode(size_t n_args, const mp_obj_t *args) {
     pin_obj_t *self = args[0];
     if (n_args == 1) {
         return mp_obj_new_int(self->mode);
@@ -698,9 +698,9 @@ STATIC mp_obj_t pin_mode(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_mode_obj, 1, 2, pin_mode);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_mode_obj, 1, 2, pin_mode);
 
-STATIC mp_obj_t pin_pull(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_pull(size_t n_args, const mp_obj_t *args) {
     pin_obj_t *self = args[0];
     if (n_args == 1) {
         if (self->pull == PIN_TYPE_STD) {
@@ -720,9 +720,9 @@ STATIC mp_obj_t pin_pull(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_pull_obj, 1, 2, pin_pull);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_pull_obj, 1, 2, pin_pull);
 
-STATIC mp_obj_t pin_drive(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_drive(size_t n_args, const mp_obj_t *args) {
     pin_obj_t *self = args[0];
     if (n_args == 1) {
         return mp_obj_new_int(self->strength);
@@ -734,15 +734,15 @@ STATIC mp_obj_t pin_drive(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_drive_obj, 1, 2, pin_drive);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_drive_obj, 1, 2, pin_drive);
 
-STATIC mp_obj_t pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t 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);
     mp_obj_t _args[2] = {self_in, *args};
     return pin_value (n_args + 1, _args);
 }
 
-STATIC mp_obj_t pin_alt_list(mp_obj_t self_in) {
+static mp_obj_t pin_alt_list(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     mp_obj_t af[2];
     mp_obj_t afs = mp_obj_new_list(0, NULL);
@@ -754,10 +754,10 @@ STATIC mp_obj_t pin_alt_list(mp_obj_t self_in) {
     }
     return afs;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_alt_list_obj, pin_alt_list);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_alt_list_obj, pin_alt_list);
 
 /// \method irq(trigger, priority, handler, wake)
-STATIC mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_val_t args[mp_irq_INIT_NUM_ARGS];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mp_irq_INIT_NUM_ARGS, mp_irq_init_args, args);
     pin_obj_t *self = pos_args[0];
@@ -896,9 +896,9 @@ STATIC mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
 invalid_args:
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
 
-STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
+static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),                    MP_ROM_PTR(&pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),                   MP_ROM_PTR(&pin_value_obj) },
@@ -929,7 +929,7 @@ STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IRQ_HIGH_LEVEL),          MP_ROM_INT(PYB_PIN_HIGH_LEVEL) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pin_type,
@@ -941,14 +941,14 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &pin_locals_dict
     );
 
-STATIC const mp_irq_methods_t pin_irq_methods = {
+static const mp_irq_methods_t pin_irq_methods = {
     .init = pin_irq,
     .enable = pin_irq_enable,
     .disable = pin_irq_disable,
     .flags = pin_irq_flags,
 };
 
-STATIC void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pin_named_pins_obj_t *self = self_in;
     mp_printf(print, "<Pin.%q>", self->name);
 }
diff --git a/ports/cc3200/mods/pybrtc.c b/ports/cc3200/mods/pybrtc.c
index 340e86e158883..243fe999312ec 100644
--- a/ports/cc3200/mods/pybrtc.c
+++ b/ports/cc3200/mods/pybrtc.c
@@ -48,8 +48,8 @@
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC const mp_irq_methods_t pyb_rtc_irq_methods;
-STATIC pyb_rtc_obj_t pyb_rtc_obj;
+static const mp_irq_methods_t pyb_rtc_irq_methods;
+static pyb_rtc_obj_t pyb_rtc_obj;
 
 /******************************************************************************
  FUNCTION-LIKE MACROS
@@ -60,16 +60,16 @@ STATIC pyb_rtc_obj_t pyb_rtc_obj;
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void pyb_rtc_set_time (uint32_t secs, uint16_t msecs);
-STATIC uint32_t pyb_rtc_reset (void);
-STATIC void pyb_rtc_disable_interupt (void);
-STATIC void pyb_rtc_irq_enable (mp_obj_t self_in);
-STATIC void pyb_rtc_irq_disable (mp_obj_t self_in);
-STATIC int pyb_rtc_irq_flags (mp_obj_t self_in);
-STATIC uint pyb_rtc_datetime_s_us(const mp_obj_t datetime, uint32_t *seconds);
-STATIC mp_obj_t pyb_rtc_datetime(mp_obj_t self, const mp_obj_t datetime);
-STATIC void pyb_rtc_set_alarm (pyb_rtc_obj_t *self, uint32_t seconds, uint16_t mseconds);
-STATIC void rtc_msec_add(uint16_t msecs_1, uint32_t *secs, uint16_t *msecs_2);
+static void pyb_rtc_set_time (uint32_t secs, uint16_t msecs);
+static uint32_t pyb_rtc_reset (void);
+static void pyb_rtc_disable_interupt (void);
+static void pyb_rtc_irq_enable (mp_obj_t self_in);
+static void pyb_rtc_irq_disable (mp_obj_t self_in);
+static int pyb_rtc_irq_flags (mp_obj_t self_in);
+static uint pyb_rtc_datetime_s_us(const mp_obj_t datetime, uint32_t *seconds);
+static mp_obj_t pyb_rtc_datetime(mp_obj_t self, const mp_obj_t datetime);
+static void pyb_rtc_set_alarm (pyb_rtc_obj_t *self, uint32_t seconds, uint16_t mseconds);
+static void rtc_msec_add(uint16_t msecs_1, uint32_t *secs, uint16_t *msecs_2);
 
 /******************************************************************************
  DECLARE PUBLIC FUNCTIONS
@@ -137,7 +137,7 @@ void pyb_rtc_disable_alarm (void) {
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void pyb_rtc_set_time (uint32_t secs, uint16_t msecs) {
+static void pyb_rtc_set_time (uint32_t secs, uint16_t msecs) {
     // add the RTC access time
     rtc_msec_add(RTC_ACCESS_TIME_MSEC, &secs, &msecs);
     // convert from mseconds to cycles
@@ -146,7 +146,7 @@ STATIC void pyb_rtc_set_time (uint32_t secs, uint16_t msecs) {
     MAP_PRCMRTCSet(secs, msecs);
 }
 
-STATIC uint32_t pyb_rtc_reset (void) {
+static uint32_t pyb_rtc_reset (void) {
     // fresh reset; configure the RTC Calendar
     // set the date to 1st Jan 2015
     // set the time to 00:00:00
@@ -158,14 +158,14 @@ STATIC uint32_t pyb_rtc_reset (void) {
     return seconds;
 }
 
-STATIC void pyb_rtc_disable_interupt (void) {
+static void pyb_rtc_disable_interupt (void) {
     uint primsk = disable_irq();
     MAP_PRCMIntDisable(PRCM_INT_SLOW_CLK_CTR);
     (void)MAP_PRCMIntStatus();
     enable_irq(primsk);
 }
 
-STATIC void pyb_rtc_irq_enable (mp_obj_t self_in) {
+static void pyb_rtc_irq_enable (mp_obj_t self_in) {
     pyb_rtc_obj_t *self = self_in;
     // we always need interrupts if repeat is enabled
     if ((self->pwrmode & PYB_PWR_MODE_ACTIVE) || self->repeat) {
@@ -176,7 +176,7 @@ STATIC void pyb_rtc_irq_enable (mp_obj_t self_in) {
     self->irq_enabled = true;
 }
 
-STATIC void pyb_rtc_irq_disable (mp_obj_t self_in) {
+static void pyb_rtc_irq_disable (mp_obj_t self_in) {
     pyb_rtc_obj_t *self = self_in;
     self->irq_enabled = false;
     if (!self->repeat) { // we always need interrupts if repeat is enabled
@@ -184,12 +184,12 @@ STATIC void pyb_rtc_irq_disable (mp_obj_t self_in) {
     }
 }
 
-STATIC int pyb_rtc_irq_flags (mp_obj_t self_in) {
+static int pyb_rtc_irq_flags (mp_obj_t self_in) {
     pyb_rtc_obj_t *self = self_in;
     return self->irq_flags;
 }
 
-STATIC uint pyb_rtc_datetime_s_us(const mp_obj_t datetime, uint32_t *seconds) {
+static uint pyb_rtc_datetime_s_us(const mp_obj_t datetime, uint32_t *seconds) {
     timeutils_struct_time_t tm;
     uint32_t useconds;
 
@@ -234,7 +234,7 @@ STATIC uint pyb_rtc_datetime_s_us(const mp_obj_t datetime, uint32_t *seconds) {
 ///
 ///     (year, month, day, hours, minutes, seconds, milliseconds, tzinfo=None)
 ///
-STATIC mp_obj_t pyb_rtc_datetime(mp_obj_t self_in, const mp_obj_t datetime) {
+static mp_obj_t pyb_rtc_datetime(mp_obj_t self_in, const mp_obj_t datetime) {
     uint32_t seconds;
     uint32_t useconds;
 
@@ -250,7 +250,7 @@ STATIC mp_obj_t pyb_rtc_datetime(mp_obj_t self_in, const mp_obj_t datetime) {
     return mp_const_none;
 }
 
-STATIC void pyb_rtc_set_alarm (pyb_rtc_obj_t *self, uint32_t seconds, uint16_t mseconds) {
+static void pyb_rtc_set_alarm (pyb_rtc_obj_t *self, uint32_t seconds, uint16_t mseconds) {
     // disable the interrupt before updating anything
     if (self->irq_enabled) {
         MAP_PRCMIntDisable(PRCM_INT_SLOW_CLK_CTR);
@@ -266,7 +266,7 @@ STATIC void pyb_rtc_set_alarm (pyb_rtc_obj_t *self, uint32_t seconds, uint16_t m
     }
 }
 
-STATIC void rtc_msec_add (uint16_t msecs_1, uint32_t *secs, uint16_t *msecs_2) {
+static void rtc_msec_add (uint16_t msecs_1, uint32_t *secs, uint16_t *msecs_2) {
     if (msecs_1 + *msecs_2 >= 1000) { // larger than one second
         *msecs_2 = (msecs_1 + *msecs_2) - 1000;
         *secs += 1; // carry flag
@@ -279,11 +279,11 @@ STATIC void rtc_msec_add (uint16_t msecs_1, uint32_t *secs, uint16_t *msecs_2) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC const mp_arg_t pyb_rtc_init_args[] = {
+static const mp_arg_t pyb_rtc_init_args[] = {
     { MP_QSTR_id,                             MP_ARG_INT, {.u_int = 0} },
     { MP_QSTR_datetime,                       MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
 };
-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 *all_args) {
+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 *all_args) {
     // parse args
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
@@ -309,15 +309,15 @@ 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;
 }
 
-STATIC mp_obj_t pyb_rtc_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_rtc_init(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(pyb_rtc_init_args) - 1];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), &pyb_rtc_init_args[1], args);
     return pyb_rtc_datetime(pos_args[0], args[0].u_obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_init_obj, 1, pyb_rtc_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_init_obj, 1, pyb_rtc_init);
 
-STATIC mp_obj_t pyb_rtc_now (mp_obj_t self_in) {
+static mp_obj_t pyb_rtc_now (mp_obj_t self_in) {
     timeutils_struct_time_t tm;
     uint32_t seconds;
     uint16_t mseconds;
@@ -338,16 +338,16 @@ STATIC mp_obj_t pyb_rtc_now (mp_obj_t self_in) {
     };
     return mp_obj_new_tuple(8, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_now_obj, pyb_rtc_now);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_now_obj, pyb_rtc_now);
 
-STATIC mp_obj_t pyb_rtc_deinit (mp_obj_t self_in) {
+static mp_obj_t pyb_rtc_deinit (mp_obj_t self_in) {
     pyb_rtc_reset();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_deinit_obj, pyb_rtc_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_deinit_obj, pyb_rtc_deinit);
 
-STATIC mp_obj_t pyb_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t allowed_args[] = {
+static mp_obj_t pyb_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,                            MP_ARG_INT,  {.u_int = 0} },
         { MP_QSTR_time,                          MP_ARG_OBJ,  {.u_obj = mp_const_none} },
         { MP_QSTR_repeat,     MP_ARG_KW_ONLY   | MP_ARG_BOOL, {.u_bool = false} },
@@ -385,9 +385,9 @@ STATIC mp_obj_t pyb_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_alarm_obj, 1, pyb_rtc_alarm);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_alarm_obj, 1, pyb_rtc_alarm);
 
-STATIC mp_obj_t pyb_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
     pyb_rtc_obj_t *self = args[0];
     int32_t ms_left;
     uint32_t c_seconds;
@@ -408,9 +408,9 @@ STATIC mp_obj_t pyb_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
     }
     return mp_obj_new_int(ms_left);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_alarm_left_obj, 1, 2, pyb_rtc_alarm_left);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_alarm_left_obj, 1, 2, pyb_rtc_alarm_left);
 
-STATIC mp_obj_t pyb_rtc_alarm_cancel(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_rtc_alarm_cancel(size_t n_args, const mp_obj_t *args) {
     // only alarm id 0 is available
     if (n_args > 1 && mp_obj_get_int(args[1]) != 0) {
         mp_raise_OSError(MP_ENODEV);
@@ -419,10 +419,10 @@ STATIC mp_obj_t pyb_rtc_alarm_cancel(size_t n_args, const mp_obj_t *args) {
     pyb_rtc_disable_alarm();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_alarm_cancel_obj, 1, 2, pyb_rtc_alarm_cancel);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_alarm_cancel_obj, 1, 2, pyb_rtc_alarm_cancel);
 
 /// \method irq(trigger, priority, handler, wake)
-STATIC mp_obj_t pyb_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_val_t args[mp_irq_INIT_NUM_ARGS];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mp_irq_INIT_NUM_ARGS, mp_irq_init_args, args);
     pyb_rtc_obj_t *self = pos_args[0];
@@ -453,9 +453,9 @@ STATIC mp_obj_t pyb_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 invalid_args:
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_irq_obj, 1, pyb_rtc_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_irq_obj, 1, pyb_rtc_irq);
 
-STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
+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_deinit),          MP_ROM_PTR(&pyb_rtc_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_now),             MP_ROM_PTR(&pyb_rtc_now_obj) },
@@ -467,7 +467,7 @@ STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
     // class constants
     { MP_ROM_QSTR(MP_QSTR_ALARM0),          MP_ROM_INT(PYB_RTC_ALARM0) },
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_rtc_type,
@@ -477,7 +477,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &pyb_rtc_locals_dict
     );
 
-STATIC const mp_irq_methods_t pyb_rtc_irq_methods = {
+static const mp_irq_methods_t pyb_rtc_irq_methods = {
     .init = pyb_rtc_irq,
     .enable = pyb_rtc_irq_enable,
     .disable = pyb_rtc_irq_disable,
diff --git a/ports/cc3200/mods/pybsd.c b/ports/cc3200/mods/pybsd.c
index 952a117c4580a..98972ce3a5dda 100644
--- a/ports/cc3200/mods/pybsd.c
+++ b/ports/cc3200/mods/pybsd.c
@@ -59,20 +59,20 @@ pybsd_obj_t pybsd_obj;
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC const mp_obj_t pyb_sd_def_pin[3] = {&pin_GP10, &pin_GP11, &pin_GP15};
+static const mp_obj_t pyb_sd_def_pin[3] = {&pin_GP10, &pin_GP11, &pin_GP15};
 
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void pyb_sd_hw_init (pybsd_obj_t *self);
-STATIC mp_obj_t pyb_sd_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 pyb_sd_deinit (mp_obj_t self_in);
+static void pyb_sd_hw_init (pybsd_obj_t *self);
+static mp_obj_t pyb_sd_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 pyb_sd_deinit (mp_obj_t self_in);
 
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
 /// Initializes the sd card hardware driver
-STATIC void pyb_sd_hw_init (pybsd_obj_t *self) {
+static void pyb_sd_hw_init (pybsd_obj_t *self) {
     if (self->pin_clk) {
         // Configure the clock pin as output only
         MAP_PinDirModeSet(((pin_obj_t *)(self->pin_clk))->pin_num, PIN_DIR_MODE_OUT);
@@ -90,7 +90,7 @@ STATIC void pyb_sd_hw_init (pybsd_obj_t *self) {
     self->enabled = true;
 }
 
-STATIC mp_obj_t pyb_sd_init_helper (pybsd_obj_t *self, const mp_arg_val_t *args) {
+static mp_obj_t pyb_sd_init_helper (pybsd_obj_t *self, const mp_arg_val_t *args) {
     // assign the pins
     mp_obj_t pins_o = args[0].u_obj;
     if (pins_o != mp_const_none) {
@@ -120,11 +120,11 @@ STATIC mp_obj_t pyb_sd_init_helper (pybsd_obj_t *self, const mp_arg_val_t *args)
 // MicroPython bindings
 //
 
-STATIC const mp_arg_t pyb_sd_init_args[] = {
+static const mp_arg_t pyb_sd_init_args[] = {
     { MP_QSTR_id,                          MP_ARG_INT, {.u_int = 0} },
     { MP_QSTR_pins,                        MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
 };
-STATIC mp_obj_t pyb_sd_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 pyb_sd_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // parse args
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
@@ -143,15 +143,15 @@ STATIC mp_obj_t pyb_sd_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return self;
 }
 
-STATIC mp_obj_t pyb_sd_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_sd_init(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(pyb_sd_init_args) - 1];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), &pyb_sd_init_args[1], args);
     return pyb_sd_init_helper(pos_args[0], args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_sd_init_obj, 1, pyb_sd_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_sd_init_obj, 1, pyb_sd_init);
 
-STATIC mp_obj_t pyb_sd_deinit (mp_obj_t self_in) {
+static mp_obj_t pyb_sd_deinit (mp_obj_t self_in) {
     pybsd_obj_t *self = self_in;
     // disable the peripheral
     self->enabled = false;
@@ -162,25 +162,25 @@ STATIC mp_obj_t pyb_sd_deinit (mp_obj_t self_in) {
     pyb_sleep_remove (self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_sd_deinit_obj, pyb_sd_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_sd_deinit_obj, pyb_sd_deinit);
 
-STATIC mp_obj_t pyb_sd_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t pyb_sd_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
     DRESULT res = sd_disk_read(bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SD_SECTOR_SIZE);
     return MP_OBJ_NEW_SMALL_INT(res != RES_OK); // return of 0 means success
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_sd_readblocks_obj, pyb_sd_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_sd_readblocks_obj, pyb_sd_readblocks);
 
-STATIC mp_obj_t pyb_sd_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t pyb_sd_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
     DRESULT res = sd_disk_write(bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SD_SECTOR_SIZE);
     return MP_OBJ_NEW_SMALL_INT(res != RES_OK); // return of 0 means success
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_sd_writeblocks_obj, pyb_sd_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_sd_writeblocks_obj, pyb_sd_writeblocks);
 
-STATIC mp_obj_t pyb_sd_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t pyb_sd_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) {
     mp_int_t cmd = mp_obj_get_int(cmd_in);
     switch (cmd) {
         case MP_BLOCKDEV_IOCTL_INIT:
@@ -199,9 +199,9 @@ STATIC mp_obj_t pyb_sd_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) {
             return MP_OBJ_NEW_SMALL_INT(-1); // error
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_sd_ioctl_obj, pyb_sd_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_sd_ioctl_obj, pyb_sd_ioctl);
 
-STATIC const mp_rom_map_elem_t pyb_sd_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_sd_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_sd_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_sd_deinit_obj) },
     // block device protocol
@@ -210,7 +210,7 @@ STATIC const mp_rom_map_elem_t pyb_sd_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&pyb_sd_ioctl_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_sd_locals_dict, pyb_sd_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_sd_locals_dict, pyb_sd_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_sd_type,
diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c
index ea2642c260942..9d04dd411ddcd 100644
--- a/ports/cc3200/mods/pybsleep.c
+++ b/ports/cc3200/mods/pybsleep.c
@@ -120,12 +120,12 @@ typedef struct {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC nvic_reg_store_t    *nvic_reg_store;
-STATIC pybsleep_data_t   pybsleep_data = {NULL, NULL, NULL};
+static nvic_reg_store_t    *nvic_reg_store;
+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 MP_DEFINE_CONST_OBJ_TYPE(
+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 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_sleep_type,
     MP_QSTR_sleep,
     MP_TYPE_FLAG_NONE
@@ -134,15 +134,15 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC pyb_sleep_obj_t *pyb_sleep_find (mp_obj_t obj);
-STATIC void pyb_sleep_flash_powerdown (void);
-STATIC NORETURN void pyb_sleep_suspend_enter (void);
+static pyb_sleep_obj_t *pyb_sleep_find (mp_obj_t obj);
+static void pyb_sleep_flash_powerdown (void);
+static NORETURN void pyb_sleep_suspend_enter (void);
 void pyb_sleep_suspend_exit (void);
-STATIC void pyb_sleep_obj_wakeup (void);
-STATIC void PRCMInterruptHandler (void);
-STATIC void pyb_sleep_iopark (bool hibernate);
-STATIC bool setup_timer_lpds_wake (void);
-STATIC bool setup_timer_hibernate_wake (void);
+static void pyb_sleep_obj_wakeup (void);
+static void PRCMInterruptHandler (void);
+static void pyb_sleep_iopark (bool hibernate);
+static bool setup_timer_lpds_wake (void);
+static bool setup_timer_hibernate_wake (void);
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
@@ -304,7 +304,7 @@ pybsleep_wake_reason_t pyb_sleep_get_wake_reason (void) {
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC pyb_sleep_obj_t *pyb_sleep_find (mp_obj_t obj) {
+static pyb_sleep_obj_t *pyb_sleep_find (mp_obj_t obj) {
     for (mp_uint_t i = 0; i < MP_STATE_PORT(pyb_sleep_obj_list).len; i++) {
         // search for the object and then remove it
         pyb_sleep_obj_t *sleep_obj = ((pyb_sleep_obj_t *)(MP_STATE_PORT(pyb_sleep_obj_list).items[i]));
@@ -315,7 +315,7 @@ STATIC pyb_sleep_obj_t *pyb_sleep_find (mp_obj_t obj) {
     return NULL;
 }
 
-STATIC void pyb_sleep_flash_powerdown (void) {
+static void pyb_sleep_flash_powerdown (void) {
     uint32_t status;
 
     // Enable clock for SSPI module
@@ -360,7 +360,7 @@ STATIC void pyb_sleep_flash_powerdown (void) {
     MAP_SPICSDisable(SSPI_BASE);
 }
 
-STATIC NORETURN void pyb_sleep_suspend_enter (void) {
+static NORETURN void pyb_sleep_suspend_enter (void) {
     // enable full RAM retention
     MAP_PRCMSRAMRetentionEnable(PRCM_SRAM_COL_1 | PRCM_SRAM_COL_2 | PRCM_SRAM_COL_3 | PRCM_SRAM_COL_4, PRCM_SRAM_LPDS_RET);
 
@@ -479,7 +479,7 @@ void pyb_sleep_suspend_exit (void) {
     mp_raise_type(&mp_type_SystemExit);
 }
 
-STATIC void PRCMInterruptHandler (void) {
+static void PRCMInterruptHandler (void) {
     // reading the interrupt status automatically clears the interrupt
     if (PRCM_INT_SLOW_CLK_CTR == MAP_PRCMIntStatus()) {
         // reconfigure it again (if repeat is true)
@@ -519,14 +519,14 @@ STATIC void PRCMInterruptHandler (void) {
     }
 }
 
-STATIC void pyb_sleep_obj_wakeup (void) {
+static void pyb_sleep_obj_wakeup (void) {
     for (mp_uint_t i = 0; i < MP_STATE_PORT(pyb_sleep_obj_list).len; i++) {
         pyb_sleep_obj_t *sleep_obj = ((pyb_sleep_obj_t *)MP_STATE_PORT(pyb_sleep_obj_list).items[i]);
         sleep_obj->wakeup(sleep_obj->obj);
     }
 }
 
-STATIC void pyb_sleep_iopark (bool hibernate) {
+static void pyb_sleep_iopark (bool hibernate) {
     const mp_map_t *named_map = &pin_board_pins_locals_dict.map;
     for (uint i = 0; i < named_map->used; i++) {
         pin_obj_t * pin = (pin_obj_t *)named_map->table[i].value;
@@ -583,7 +583,7 @@ STATIC void pyb_sleep_iopark (bool hibernate) {
 #endif
 }
 
-STATIC bool setup_timer_lpds_wake (void) {
+static bool setup_timer_lpds_wake (void) {
     uint64_t t_match, t_curr;
     int64_t t_remaining;
 
@@ -618,7 +618,7 @@ STATIC bool setup_timer_lpds_wake (void) {
     return false;
 }
 
-STATIC bool setup_timer_hibernate_wake (void) {
+static bool setup_timer_hibernate_wake (void) {
     uint64_t t_match, t_curr;
     int64_t t_remaining;
 
diff --git a/ports/cc3200/mods/pybspi.c b/ports/cc3200/mods/pybspi.c
index fa38f0c6576c7..e49bb14b475f8 100644
--- a/ports/cc3200/mods/pybspi.c
+++ b/ports/cc3200/mods/pybspi.c
@@ -68,15 +68,15 @@ typedef struct _pyb_spi_obj_t {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC pyb_spi_obj_t pyb_spi_obj = {.baudrate = 0};
+static pyb_spi_obj_t pyb_spi_obj = {.baudrate = 0};
 
-STATIC const mp_obj_t pyb_spi_def_pin[3] = {&pin_GP14, &pin_GP16, &pin_GP30};
+static const mp_obj_t pyb_spi_def_pin[3] = {&pin_GP14, &pin_GP16, &pin_GP30};
 
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
 // only master mode is available for the moment
-STATIC void pybspi_init (const pyb_spi_obj_t *self) {
+static void pybspi_init (const pyb_spi_obj_t *self) {
     // enable the peripheral clock
     MAP_PRCMPeripheralClkEnable(PRCM_GSPI, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
     MAP_PRCMPeripheralReset(PRCM_GSPI);
@@ -90,7 +90,7 @@ STATIC void pybspi_init (const pyb_spi_obj_t *self) {
     MAP_SPIEnable(GSPI_BASE);
 }
 
-STATIC void pybspi_tx (pyb_spi_obj_t *self, const void *data) {
+static void pybspi_tx (pyb_spi_obj_t *self, const void *data) {
     uint32_t txdata;
     switch (self->wlen) {
     case 1:
@@ -108,7 +108,7 @@ STATIC void pybspi_tx (pyb_spi_obj_t *self, const void *data) {
     MAP_SPIDataPut (GSPI_BASE, txdata);
 }
 
-STATIC void pybspi_rx (pyb_spi_obj_t *self, void *data) {
+static void pybspi_rx (pyb_spi_obj_t *self, void *data) {
     uint32_t rxdata;
     MAP_SPIDataGet (GSPI_BASE, &rxdata);
     if (data) {
@@ -128,7 +128,7 @@ STATIC void pybspi_rx (pyb_spi_obj_t *self, void *data) {
     }
 }
 
-STATIC void pybspi_transfer (pyb_spi_obj_t *self, const char *txdata, char *rxdata, uint32_t len, uint32_t *txchar) {
+static void pybspi_transfer (pyb_spi_obj_t *self, const char *txdata, char *rxdata, uint32_t len, uint32_t *txchar) {
     if (!self->baudrate) {
         mp_raise_OSError(MP_EPERM);
     }
@@ -144,7 +144,7 @@ STATIC void pybspi_transfer (pyb_spi_obj_t *self, const char *txdata, char *rxda
 /******************************************************************************/
 /* MicroPython bindings                                                      */
 /******************************************************************************/
-STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_spi_obj_t *self = self_in;
     if (self->baudrate > 0) {
         mp_printf(print, "SPI(0, baudrate=%u, bits=%u, polarity=%u, phase=%u, firstbit=SPI.MSB)",
@@ -154,7 +154,7 @@ STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     }
 }
 
-STATIC mp_obj_t pyb_spi_init_helper(pyb_spi_obj_t *self, const mp_arg_val_t *args) {
+static mp_obj_t pyb_spi_init_helper(pyb_spi_obj_t *self, const mp_arg_val_t *args) {
     uint bits;
     switch (args[1].u_int) {
     case 8:
@@ -224,7 +224,7 @@ static const mp_arg_t pyb_spi_init_args[] = {
     { MP_QSTR_firstbit,     MP_ARG_KW_ONLY  | MP_ARG_INT,  {.u_int = PYBSPI_FIRST_BIT_MSB} },
     { MP_QSTR_pins,         MP_ARG_KW_ONLY  | MP_ARG_OBJ,  {.u_obj = MP_OBJ_NULL} },
 };
-STATIC mp_obj_t pyb_spi_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 pyb_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // parse args
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
@@ -246,17 +246,17 @@ STATIC mp_obj_t pyb_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return self;
 }
 
-STATIC mp_obj_t pyb_spi_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_spi_init(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(pyb_spi_init_args) - 1];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), &pyb_spi_init_args[1], args);
     return pyb_spi_init_helper(pos_args[0], args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_init_obj, 1, pyb_spi_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_init_obj, 1, pyb_spi_init);
 
 /// \method deinit()
 /// Turn off the spi bus.
-STATIC mp_obj_t pyb_spi_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_spi_deinit(mp_obj_t self_in) {
     // disable the peripheral
     MAP_SPIDisable(GSPI_BASE);
     MAP_PRCMPeripheralClkDisable(PRCM_GSPI, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
@@ -266,9 +266,9 @@ STATIC mp_obj_t pyb_spi_deinit(mp_obj_t self_in) {
     pyb_sleep_remove((const mp_obj_t)self_in);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_spi_deinit_obj, pyb_spi_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_spi_deinit_obj, pyb_spi_deinit);
 
-STATIC mp_obj_t pyb_spi_write (mp_obj_t self_in, mp_obj_t buf) {
+static mp_obj_t pyb_spi_write (mp_obj_t self_in, mp_obj_t buf) {
     // parse args
     pyb_spi_obj_t *self = self_in;
 
@@ -283,9 +283,9 @@ STATIC mp_obj_t pyb_spi_write (mp_obj_t self_in, mp_obj_t buf) {
     // return the number of bytes written
     return mp_obj_new_int(bufinfo.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_spi_write_obj, pyb_spi_write);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_spi_write_obj, pyb_spi_write);
 
-STATIC mp_obj_t pyb_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_nbytes,    MP_ARG_REQUIRED | MP_ARG_OBJ, },
         { MP_QSTR_write,     MP_ARG_INT, {.u_int = 0x00} },
@@ -307,9 +307,9 @@ STATIC mp_obj_t pyb_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     // return the received data
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_read_obj, 1, pyb_spi_read);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_read_obj, 1, pyb_spi_read);
 
-STATIC mp_obj_t pyb_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_buf,       MP_ARG_REQUIRED | MP_ARG_OBJ, },
         { MP_QSTR_write,     MP_ARG_INT, {.u_int = 0x00} },
@@ -331,9 +331,9 @@ STATIC mp_obj_t pyb_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map
     // return the number of bytes received
     return mp_obj_new_int(vstr.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_readinto_obj, 1, pyb_spi_readinto);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_readinto_obj, 1, pyb_spi_readinto);
 
-STATIC mp_obj_t pyb_spi_write_readinto (mp_obj_t self, mp_obj_t writebuf, mp_obj_t readbuf) {
+static mp_obj_t pyb_spi_write_readinto (mp_obj_t self, mp_obj_t writebuf, mp_obj_t readbuf) {
     // get buffers to write from/read to
     mp_buffer_info_t bufinfo_write;
     uint8_t data_send[1];
@@ -360,9 +360,9 @@ STATIC mp_obj_t pyb_spi_write_readinto (mp_obj_t self, mp_obj_t writebuf, mp_obj
     // return the number of transferred bytes
     return mp_obj_new_int(bufinfo_write.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_spi_write_readinto_obj, pyb_spi_write_readinto);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_spi_write_readinto_obj, pyb_spi_write_readinto);
 
-STATIC const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&pyb_spi_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit),              MP_ROM_PTR(&pyb_spi_deinit_obj) },
@@ -375,7 +375,7 @@ STATIC const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MSB),                 MP_ROM_INT(PYBSPI_FIRST_BIT_MSB) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_spi_locals_dict, pyb_spi_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_spi_locals_dict, pyb_spi_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_spi_type,
diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c
index be365f3c92b26..a9a154308e43b 100644
--- a/ports/cc3200/mods/pybtimer.c
+++ b/ports/cc3200/mods/pybtimer.c
@@ -96,28 +96,28 @@ typedef struct _pyb_timer_channel_obj_t {
 /******************************************************************************
  DEFINE PRIVATE DATA
  ******************************************************************************/
-STATIC const mp_irq_methods_t pyb_timer_channel_irq_methods;
-STATIC pyb_timer_obj_t pyb_timer_obj[PYBTIMER_NUM_TIMERS] = {{.timer = TIMERA0_BASE, .peripheral = PRCM_TIMERA0},
+static const mp_irq_methods_t pyb_timer_channel_irq_methods;
+static pyb_timer_obj_t pyb_timer_obj[PYBTIMER_NUM_TIMERS] = {{.timer = TIMERA0_BASE, .peripheral = PRCM_TIMERA0},
                                                              {.timer = TIMERA1_BASE, .peripheral = PRCM_TIMERA1},
                                                              {.timer = TIMERA2_BASE, .peripheral = PRCM_TIMERA2},
                                                              {.timer = TIMERA3_BASE, .peripheral = PRCM_TIMERA3}};
-STATIC const mp_obj_type_t pyb_timer_channel_type;
-STATIC const mp_obj_t pyb_timer_pwm_pin[8] = {&pin_GP24, MP_OBJ_NULL, &pin_GP25, MP_OBJ_NULL, MP_OBJ_NULL, &pin_GP9, &pin_GP10, &pin_GP11};
+static const mp_obj_type_t pyb_timer_channel_type;
+static const mp_obj_t pyb_timer_pwm_pin[8] = {&pin_GP24, MP_OBJ_NULL, &pin_GP25, MP_OBJ_NULL, MP_OBJ_NULL, &pin_GP9, &pin_GP10, &pin_GP11};
 
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC mp_obj_t pyb_timer_channel_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
-STATIC void timer_disable (pyb_timer_obj_t *tim);
-STATIC void timer_channel_init (pyb_timer_channel_obj_t *ch);
-STATIC void TIMER0AIntHandler(void);
-STATIC void TIMER0BIntHandler(void);
-STATIC void TIMER1AIntHandler(void);
-STATIC void TIMER1BIntHandler(void);
-STATIC void TIMER2AIntHandler(void);
-STATIC void TIMER2BIntHandler(void);
-STATIC void TIMER3AIntHandler(void);
-STATIC void TIMER3BIntHandler(void);
+static mp_obj_t pyb_timer_channel_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+static void timer_disable (pyb_timer_obj_t *tim);
+static void timer_channel_init (pyb_timer_channel_obj_t *ch);
+static void TIMER0AIntHandler(void);
+static void TIMER0BIntHandler(void);
+static void TIMER1AIntHandler(void);
+static void TIMER1BIntHandler(void);
+static void TIMER2AIntHandler(void);
+static void TIMER2BIntHandler(void);
+static void TIMER3AIntHandler(void);
+static void TIMER3BIntHandler(void);
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
@@ -129,23 +129,23 @@ void timer_init0 (void) {
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void pyb_timer_channel_irq_enable (mp_obj_t self_in) {
+static void pyb_timer_channel_irq_enable (mp_obj_t self_in) {
     pyb_timer_channel_obj_t *self = self_in;
     MAP_TimerIntClear(self->timer->timer, self->timer->irq_trigger & self->channel);
     MAP_TimerIntEnable(self->timer->timer, self->timer->irq_trigger & self->channel);
 }
 
-STATIC void pyb_timer_channel_irq_disable (mp_obj_t self_in) {
+static void pyb_timer_channel_irq_disable (mp_obj_t self_in) {
     pyb_timer_channel_obj_t *self = self_in;
     MAP_TimerIntDisable(self->timer->timer, self->timer->irq_trigger & self->channel);
 }
 
-STATIC int pyb_timer_channel_irq_flags (mp_obj_t self_in) {
+static int pyb_timer_channel_irq_flags (mp_obj_t self_in) {
     pyb_timer_channel_obj_t *self = self_in;
     return self->timer->irq_flags;
 }
 
-STATIC pyb_timer_channel_obj_t *pyb_timer_channel_find (uint32_t timer, uint16_t channel_n) {
+static pyb_timer_channel_obj_t *pyb_timer_channel_find (uint32_t timer, uint16_t channel_n) {
     for (mp_uint_t i = 0; i < MP_STATE_PORT(pyb_timer_channel_obj_list).len; i++) {
         pyb_timer_channel_obj_t *ch = ((pyb_timer_channel_obj_t *)(MP_STATE_PORT(pyb_timer_channel_obj_list).items[i]));
         // any 32-bit timer must be matched by any of its 16-bit versions
@@ -156,7 +156,7 @@ STATIC pyb_timer_channel_obj_t *pyb_timer_channel_find (uint32_t timer, uint16_t
     return MP_OBJ_NULL;
 }
 
-STATIC void pyb_timer_channel_remove (pyb_timer_channel_obj_t *ch) {
+static void pyb_timer_channel_remove (pyb_timer_channel_obj_t *ch) {
     pyb_timer_channel_obj_t *channel;
     if ((channel = pyb_timer_channel_find(ch->timer->timer, ch->channel))) {
         mp_obj_list_remove(&MP_STATE_PORT(pyb_timer_channel_obj_list), channel);
@@ -165,7 +165,7 @@ STATIC void pyb_timer_channel_remove (pyb_timer_channel_obj_t *ch) {
     }
 }
 
-STATIC void pyb_timer_channel_add (pyb_timer_channel_obj_t *ch) {
+static void pyb_timer_channel_add (pyb_timer_channel_obj_t *ch) {
     // remove it in case it already exists
     pyb_timer_channel_remove(ch);
     mp_obj_list_append(&MP_STATE_PORT(pyb_timer_channel_obj_list), ch);
@@ -173,7 +173,7 @@ STATIC void pyb_timer_channel_add (pyb_timer_channel_obj_t *ch) {
     pyb_sleep_add((const mp_obj_t)ch, (WakeUpCB_t)timer_channel_init);
 }
 
-STATIC void timer_disable (pyb_timer_obj_t *tim) {
+static void timer_disable (pyb_timer_obj_t *tim) {
     // disable all timers and it's interrupts
     MAP_TimerDisable(tim->timer, TIMER_A | TIMER_B);
     MAP_TimerIntDisable(tim->timer, tim->irq_trigger);
@@ -190,7 +190,7 @@ STATIC void timer_disable (pyb_timer_obj_t *tim) {
 }
 
 // computes prescaler period and match value so timer triggers at freq-Hz
-STATIC uint32_t compute_prescaler_period_and_match_value(pyb_timer_channel_obj_t *ch, uint32_t *period_out, uint32_t *match_out) {
+static uint32_t compute_prescaler_period_and_match_value(pyb_timer_channel_obj_t *ch, uint32_t *period_out, uint32_t *match_out) {
     uint32_t maxcount = (ch->channel == (TIMER_A | TIMER_B)) ? 0xFFFFFFFF : 0xFFFF;
     uint32_t prescaler;
     uint32_t period_c = (ch->frequency > 0) ? PYBTIMER_SRC_FREQ_HZ / ch->frequency : ((PYBTIMER_SRC_FREQ_HZ / 1000000) * ch->period);
@@ -223,13 +223,13 @@ STATIC uint32_t compute_prescaler_period_and_match_value(pyb_timer_channel_obj_t
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
 
-STATIC void timer_init (pyb_timer_obj_t *tim) {
+static void timer_init (pyb_timer_obj_t *tim) {
     MAP_PRCMPeripheralClkEnable(tim->peripheral, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
     MAP_PRCMPeripheralReset(tim->peripheral);
     MAP_TimerConfigure(tim->timer, tim->config);
 }
 
-STATIC void timer_channel_init (pyb_timer_channel_obj_t *ch) {
+static void timer_channel_init (pyb_timer_channel_obj_t *ch) {
     // calculate the period, the prescaler and the match value
     uint32_t period_c;
     uint32_t match;
@@ -262,7 +262,7 @@ STATIC void timer_channel_init (pyb_timer_channel_obj_t *ch) {
 /******************************************************************************/
 /* MicroPython bindings                                                      */
 
-STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_timer_obj_t *tim = self_in;
     uint32_t mode = tim->config & 0xFF;
 
@@ -281,7 +281,7 @@ STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     mp_printf(print, "Timer(%u, mode=Timer.%q)", tim->id, mode_qst);
 }
 
-STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *tim, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *tim, 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_width,        MP_ARG_KW_ONLY  | MP_ARG_INT, {.u_int = 16} },
@@ -319,7 +319,7 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *tim, size_t n_args, const
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
 
-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) {
+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);
 
@@ -342,19 +342,19 @@ STATIC mp_obj_t pyb_timer_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return (mp_obj_t)tim;
 }
 
-STATIC mp_obj_t pyb_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+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(args[0], n_args - 1, args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_init_obj, 1, pyb_timer_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_init_obj, 1, pyb_timer_init);
 
-STATIC mp_obj_t pyb_timer_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_timer_deinit(mp_obj_t self_in) {
     pyb_timer_obj_t *self = self_in;
     timer_disable(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
 
-STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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_freq,                MP_ARG_KW_ONLY  | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_period,              MP_ARG_KW_ONLY  | MP_ARG_INT, {.u_int = 0} },
@@ -438,9 +438,9 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
 error:
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_obj, 2, pyb_timer_channel);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_obj, 2, pyb_timer_channel);
 
-STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
+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) },
@@ -457,7 +457,7 @@ STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TIMEOUT),                 MP_ROM_INT(PYBTIMER_TIMEOUT_TRIGGER) },
     { MP_ROM_QSTR(MP_QSTR_MATCH),                   MP_ROM_INT(PYBTIMER_MATCH_TRIGGER) },
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_type,
@@ -468,14 +468,14 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &pyb_timer_locals_dict
     );
 
-STATIC const mp_irq_methods_t pyb_timer_channel_irq_methods = {
+static const mp_irq_methods_t pyb_timer_channel_irq_methods = {
     .init = pyb_timer_channel_irq,
     .enable = pyb_timer_channel_irq_enable,
     .disable = pyb_timer_channel_irq_disable,
     .flags = pyb_timer_channel_irq_flags,
 };
 
-STATIC void TIMERGenericIntHandler(uint32_t timer, uint16_t channel) {
+static void TIMERGenericIntHandler(uint32_t timer, uint16_t channel) {
     pyb_timer_channel_obj_t *self;
     uint32_t status;
     if ((self = pyb_timer_channel_find(timer, channel))) {
@@ -485,39 +485,39 @@ STATIC void TIMERGenericIntHandler(uint32_t timer, uint16_t channel) {
     }
 }
 
-STATIC void TIMER0AIntHandler(void) {
+static void TIMER0AIntHandler(void) {
     TIMERGenericIntHandler(TIMERA0_BASE, TIMER_A);
 }
 
-STATIC void TIMER0BIntHandler(void) {
+static void TIMER0BIntHandler(void) {
     TIMERGenericIntHandler(TIMERA0_BASE, TIMER_B);
 }
 
-STATIC void TIMER1AIntHandler(void) {
+static void TIMER1AIntHandler(void) {
     TIMERGenericIntHandler(TIMERA1_BASE, TIMER_A);
 }
 
-STATIC void TIMER1BIntHandler(void) {
+static void TIMER1BIntHandler(void) {
     TIMERGenericIntHandler(TIMERA1_BASE, TIMER_B);
 }
 
-STATIC void TIMER2AIntHandler(void) {
+static void TIMER2AIntHandler(void) {
     TIMERGenericIntHandler(TIMERA2_BASE, TIMER_A);
 }
 
-STATIC void TIMER2BIntHandler(void) {
+static void TIMER2BIntHandler(void) {
     TIMERGenericIntHandler(TIMERA2_BASE, TIMER_B);
 }
 
-STATIC void TIMER3AIntHandler(void) {
+static void TIMER3AIntHandler(void) {
     TIMERGenericIntHandler(TIMERA3_BASE, TIMER_A);
 }
 
-STATIC void TIMER3BIntHandler(void) {
+static void TIMER3BIntHandler(void) {
     TIMERGenericIntHandler(TIMERA3_BASE, TIMER_B);
 }
 
-STATIC void pyb_timer_channel_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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 *ch = self_in;
     char *ch_id = "AB";
     // timer channel
@@ -548,7 +548,7 @@ STATIC void pyb_timer_channel_print(const mp_print_t *print, mp_obj_t self_in, m
     mp_printf(print, ")");
 }
 
-STATIC mp_obj_t pyb_timer_channel_freq(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_timer_channel_freq(size_t n_args, const mp_obj_t *args) {
     pyb_timer_channel_obj_t *ch = args[0];
     if (n_args == 1) {
         // get
@@ -565,9 +565,9 @@ STATIC mp_obj_t pyb_timer_channel_freq(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_freq_obj, 1, 2, pyb_timer_channel_freq);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_freq_obj, 1, 2, pyb_timer_channel_freq);
 
-STATIC mp_obj_t pyb_timer_channel_period(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_timer_channel_period(size_t n_args, const mp_obj_t *args) {
     pyb_timer_channel_obj_t *ch = args[0];
     if (n_args == 1) {
         // get
@@ -584,9 +584,9 @@ STATIC mp_obj_t pyb_timer_channel_period(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_period_obj, 1, 2, pyb_timer_channel_period);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_period_obj, 1, 2, pyb_timer_channel_period);
 
-STATIC mp_obj_t pyb_timer_channel_duty_cycle(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_timer_channel_duty_cycle(size_t n_args, const mp_obj_t *args) {
     pyb_timer_channel_obj_t *ch = args[0];
     if (n_args == 1) {
         // get
@@ -608,9 +608,9 @@ STATIC mp_obj_t pyb_timer_channel_duty_cycle(size_t n_args, const mp_obj_t *args
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_duty_cycle_obj, 1, 3, pyb_timer_channel_duty_cycle);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_duty_cycle_obj, 1, 3, pyb_timer_channel_duty_cycle);
 
-STATIC mp_obj_t pyb_timer_channel_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_timer_channel_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_val_t args[mp_irq_INIT_NUM_ARGS];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mp_irq_INIT_NUM_ARGS, mp_irq_init_args, args);
     pyb_timer_channel_obj_t *ch = pos_args[0];
@@ -711,18 +711,18 @@ STATIC mp_obj_t pyb_timer_channel_irq(size_t n_args, const mp_obj_t *pos_args, m
 invalid_args:
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_irq_obj, 1, pyb_timer_channel_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_irq_obj, 1, pyb_timer_channel_irq);
 
-STATIC const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_freq),                 MP_ROM_PTR(&pyb_timer_channel_freq_obj) },
     { MP_ROM_QSTR(MP_QSTR_period),               MP_ROM_PTR(&pyb_timer_channel_period_obj) },
     { MP_ROM_QSTR(MP_QSTR_duty_cycle),           MP_ROM_PTR(&pyb_timer_channel_duty_cycle_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq),                  MP_ROM_PTR(&pyb_timer_channel_irq_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_channel_type,
     MP_QSTR_TimerChannel,
     MP_TYPE_FLAG_NONE,
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index c9a753da04853..6ab2371ba708f 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -76,15 +76,15 @@
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void uart_init (pyb_uart_obj_t *self);
-STATIC bool uart_rx_wait (pyb_uart_obj_t *self);
-STATIC void uart_check_init(pyb_uart_obj_t *self);
-STATIC mp_obj_t uart_irq_new (pyb_uart_obj_t *self, byte trigger, mp_int_t priority, mp_obj_t handler);
-STATIC void UARTGenericIntHandler(uint32_t uart_id);
-STATIC void UART0IntHandler(void);
-STATIC void UART1IntHandler(void);
-STATIC void uart_irq_enable (mp_obj_t self_in);
-STATIC void uart_irq_disable (mp_obj_t self_in);
+static void uart_init (pyb_uart_obj_t *self);
+static bool uart_rx_wait (pyb_uart_obj_t *self);
+static void uart_check_init(pyb_uart_obj_t *self);
+static mp_obj_t uart_irq_new (pyb_uart_obj_t *self, byte trigger, mp_int_t priority, mp_obj_t handler);
+static void UARTGenericIntHandler(uint32_t uart_id);
+static void UART0IntHandler(void);
+static void UART1IntHandler(void);
+static void uart_irq_enable (mp_obj_t self_in);
+static void uart_irq_disable (mp_obj_t self_in);
 
 /******************************************************************************
  DEFINE PRIVATE TYPES
@@ -108,11 +108,11 @@ struct _pyb_uart_obj_t {
 /******************************************************************************
  DECLARE PRIVATE DATA
  ******************************************************************************/
-STATIC pyb_uart_obj_t pyb_uart_obj[PYB_NUM_UARTS] = { {.reg = UARTA0_BASE, .baudrate = 0, .read_buf = NULL, .peripheral = PRCM_UARTA0},
+static pyb_uart_obj_t pyb_uart_obj[PYB_NUM_UARTS] = { {.reg = UARTA0_BASE, .baudrate = 0, .read_buf = NULL, .peripheral = PRCM_UARTA0},
                                                       {.reg = UARTA1_BASE, .baudrate = 0, .read_buf = NULL, .peripheral = PRCM_UARTA1} };
-STATIC const mp_irq_methods_t uart_irq_methods;
+static const mp_irq_methods_t uart_irq_methods;
 
-STATIC const mp_obj_t pyb_uart_def_pin[PYB_NUM_UARTS][2] = { {&pin_GP1, &pin_GP2}, {&pin_GP3, &pin_GP4} };
+static const mp_obj_t pyb_uart_def_pin[PYB_NUM_UARTS][2] = { {&pin_GP1, &pin_GP2}, {&pin_GP3, &pin_GP4} };
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
@@ -168,7 +168,7 @@ bool uart_tx_strn(pyb_uart_obj_t *self, const char *str, uint len) {
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
 // assumes init parameters have been set up correctly
-STATIC void uart_init (pyb_uart_obj_t *self) {
+static void uart_init (pyb_uart_obj_t *self) {
     // Enable the peripheral clock
     MAP_PRCMPeripheralClkEnable(self->peripheral, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
 
@@ -198,7 +198,7 @@ STATIC void uart_init (pyb_uart_obj_t *self) {
 // Waits at most timeout microseconds for at least 1 char to become ready for
 // reading (from buf or for direct reading).
 // Returns true if something available, false if not.
-STATIC bool uart_rx_wait (pyb_uart_obj_t *self) {
+static bool uart_rx_wait (pyb_uart_obj_t *self) {
     int timeout = PYBUART_RX_TIMEOUT_US(self->baudrate);
     for ( ; ; ) {
         if (uart_rx_any(self)) {
@@ -214,7 +214,7 @@ STATIC bool uart_rx_wait (pyb_uart_obj_t *self) {
     }
 }
 
-STATIC mp_obj_t uart_irq_new (pyb_uart_obj_t *self, byte trigger, mp_int_t priority, mp_obj_t handler) {
+static mp_obj_t uart_irq_new (pyb_uart_obj_t *self, byte trigger, mp_int_t priority, mp_obj_t handler) {
     // disable the uart interrupts before updating anything
     uart_irq_disable (self);
 
@@ -235,7 +235,7 @@ STATIC mp_obj_t uart_irq_new (pyb_uart_obj_t *self, byte trigger, mp_int_t prior
     return _irq;
 }
 
-STATIC void UARTGenericIntHandler(uint32_t uart_id) {
+static void UARTGenericIntHandler(uint32_t uart_id) {
     pyb_uart_obj_t *self;
     uint32_t status;
 
@@ -272,22 +272,22 @@ STATIC void UARTGenericIntHandler(uint32_t uart_id) {
     self->irq_flags = 0;
 }
 
-STATIC void uart_check_init(pyb_uart_obj_t *self) {
+static void uart_check_init(pyb_uart_obj_t *self) {
     // not initialized
     if (!self->baudrate) {
         mp_raise_OSError(MP_EPERM);
     }
 }
 
-STATIC void UART0IntHandler(void) {
+static void UART0IntHandler(void) {
     UARTGenericIntHandler(0);
 }
 
-STATIC void UART1IntHandler(void) {
+static void UART1IntHandler(void) {
     UARTGenericIntHandler(1);
 }
 
-STATIC void uart_irq_enable (mp_obj_t self_in) {
+static void uart_irq_enable (mp_obj_t self_in) {
     pyb_uart_obj_t *self = self_in;
     // check for any of the rx interrupt types
     if (self->irq_trigger & (UART_TRIGGER_RX_ANY | UART_TRIGGER_RX_HALF | UART_TRIGGER_RX_FULL)) {
@@ -297,12 +297,12 @@ STATIC void uart_irq_enable (mp_obj_t self_in) {
     self->irq_enabled = true;
 }
 
-STATIC void uart_irq_disable (mp_obj_t self_in) {
+static void uart_irq_disable (mp_obj_t self_in) {
     pyb_uart_obj_t *self = self_in;
     self->irq_enabled = false;
 }
 
-STATIC int uart_irq_flags (mp_obj_t self_in) {
+static int uart_irq_flags (mp_obj_t self_in) {
     pyb_uart_obj_t *self = self_in;
     return self->irq_flags;
 }
@@ -310,7 +310,7 @@ STATIC int uart_irq_flags (mp_obj_t self_in) {
 /******************************************************************************/
 /* MicroPython bindings                                                      */
 
-STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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 = self_in;
     if (self->baudrate > 0) {
         mp_printf(print, "UART(%u, baudrate=%u, bits=", self->uart_id, self->baudrate);
@@ -342,7 +342,7 @@ STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
     }
 }
 
-STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, const mp_arg_val_t *args) {
+static mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, const mp_arg_val_t *args) {
     // get the baudrate
     if (args[0].u_int <= 0) {
         goto error;
@@ -433,7 +433,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, const mp_arg_val_t *a
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
 
-STATIC const mp_arg_t pyb_uart_init_args[] = {
+static const mp_arg_t pyb_uart_init_args[] = {
     { MP_QSTR_id,                             MP_ARG_OBJ,  {.u_obj = MP_OBJ_NULL} },
     { MP_QSTR_baudrate,                       MP_ARG_INT,  {.u_int = 9600} },
     { MP_QSTR_bits,                           MP_ARG_INT,  {.u_int = 8} },
@@ -441,7 +441,7 @@ STATIC const mp_arg_t pyb_uart_init_args[] = {
     { MP_QSTR_stop,                           MP_ARG_INT,  {.u_int = 1} },
     { MP_QSTR_pins,         MP_ARG_KW_ONLY  | MP_ARG_OBJ,  {.u_obj = MP_OBJ_NULL} },
 };
-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 *all_args) {
+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 *all_args) {
     // parse args
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
@@ -484,15 +484,15 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
     return self;
 }
 
-STATIC mp_obj_t pyb_uart_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_uart_init(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(pyb_uart_init_args) - 1];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(args), &pyb_uart_init_args[1], args);
     return pyb_uart_init_helper(pos_args[0], args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_init_obj, 1, pyb_uart_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_init_obj, 1, pyb_uart_init);
 
-STATIC mp_obj_t pyb_uart_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_uart_deinit(mp_obj_t self_in) {
     pyb_uart_obj_t *self = self_in;
 
     // unregister it with the sleep module
@@ -506,16 +506,16 @@ STATIC mp_obj_t pyb_uart_deinit(mp_obj_t self_in) {
     MAP_PRCMPeripheralClkDisable(self->peripheral, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
     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(pyb_uart_deinit_obj, pyb_uart_deinit);
 
-STATIC mp_obj_t pyb_uart_any(mp_obj_t self_in) {
+static mp_obj_t pyb_uart_any(mp_obj_t self_in) {
     pyb_uart_obj_t *self = self_in;
     uart_check_init(self);
     return mp_obj_new_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(pyb_uart_any_obj, pyb_uart_any);
 
-STATIC mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
+static mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
     pyb_uart_obj_t *self = self_in;
     uart_check_init(self);
     // send a break signal for at least 2 complete frames
@@ -524,10 +524,10 @@ STATIC mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
     MAP_UARTBreakCtl(self->reg, false);
     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(pyb_uart_sendbreak_obj, pyb_uart_sendbreak);
 
 /// \method irq(trigger, priority, handler, wake)
-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 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_INIT_NUM_ARGS];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mp_irq_INIT_NUM_ARGS, mp_irq_init_args, args);
 
@@ -556,9 +556,9 @@ STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 invalid_args:
     mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_irq_obj, 1, pyb_uart_irq);
+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) {
+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) {
@@ -567,9 +567,9 @@ STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
         return mp_const_false;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+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[] = {
+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) },
@@ -592,9 +592,9 @@ STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_RX_ANY),      MP_ROM_INT(UART_TRIGGER_RX_ANY) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, 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) {
+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 = self_in;
     byte *buf = buf_in;
     uart_check_init(self);
@@ -622,7 +622,7 @@ 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) {
+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 = self_in;
     const char *buf = buf_in;
     uart_check_init(self);
@@ -634,7 +634,7 @@ STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t
     return size;
 }
 
-STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+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;
     uart_check_init(self);
@@ -670,14 +670,14 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t a
     return ret;
 }
 
-STATIC const mp_stream_p_t uart_stream_p = {
+static const mp_stream_p_t uart_stream_p = {
     .read = pyb_uart_read,
     .write = pyb_uart_write,
     .ioctl = pyb_uart_ioctl,
     .is_text = false,
 };
 
-STATIC const mp_irq_methods_t uart_irq_methods = {
+static const mp_irq_methods_t uart_irq_methods = {
     .init = pyb_uart_irq,
     .enable = uart_irq_enable,
     .disable = uart_irq_disable,
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index 83b5c091b80e3..656a8fb8721b1 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -80,10 +80,10 @@
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
-STATIC void mptask_pre_init(void);
-STATIC void mptask_init_sflash_filesystem(void);
-STATIC void mptask_enter_ap_mode(void);
-STATIC void mptask_create_main_py(void);
+static void mptask_pre_init(void);
+static void mptask_init_sflash_filesystem(void);
+static void mptask_enter_ap_mode(void);
+static void mptask_create_main_py(void);
 
 /******************************************************************************
  DECLARE PUBLIC DATA
@@ -256,7 +256,7 @@ void TASK_MicroPython(void *pvParameters) {
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
 __attribute__ ((section(".boot")))
-STATIC void mptask_pre_init(void) {
+static void mptask_pre_init(void) {
     // this one only makes sense after a poweron reset
     pyb_rtc_pre_init();
 
@@ -288,7 +288,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.
@@ -371,7 +371,7 @@ 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)
@@ -380,7 +380,7 @@ STATIC void mptask_enter_ap_mode(void) {
         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/mpthreadport.c b/ports/cc3200/mpthreadport.c
index c3f5f38d061a6..6c3a581871411 100644
--- a/ports/cc3200/mpthreadport.c
+++ b/ports/cc3200/mpthreadport.c
@@ -46,9 +46,9 @@ typedef struct _mp_thread_t {
 } mp_thread_t;
 
 // the mutex controls access to the linked list
-STATIC mp_thread_mutex_t thread_mutex;
-STATIC mp_thread_t thread_entry0;
-STATIC mp_thread_t *thread; // root pointer, handled bp mp_thread_gc_others
+static mp_thread_mutex_t thread_mutex;
+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);
@@ -103,9 +103,9 @@ void mp_thread_start(void) {
     mp_thread_mutex_unlock(&thread_mutex);
 }
 
-STATIC void *(*ext_thread_entry)(void *) = NULL;
+static void *(*ext_thread_entry)(void *) = NULL;
 
-STATIC void freertos_entry(void *arg) {
+static void freertos_entry(void *arg) {
     if (ext_thread_entry) {
         ext_thread_entry(arg);
     }
diff --git a/ports/cc3200/util/random.c b/ports/cc3200/util/random.c
index f8e9cdf0cb21f..e6285c98eb76d 100644
--- a/ports/cc3200/util/random.c
+++ b/ports/cc3200/util/random.c
@@ -56,12 +56,12 @@ static uint32_t s_seed;
 /******************************************************************************
 * LOCAL FUNCTION DECLARATIONS
 ******************************************************************************/
-STATIC uint32_t lfsr (uint32_t input);
+static uint32_t lfsr (uint32_t input);
 
 /******************************************************************************
 * PRIVATE FUNCTIONS
 ******************************************************************************/
-STATIC uint32_t lfsr (uint32_t input) {
+static uint32_t lfsr (uint32_t input) {
     assert( input != 0 );
     return (input >> 1) ^ (-(input & 0x01) & 0x00E10000);
 }
@@ -69,7 +69,7 @@ STATIC uint32_t lfsr (uint32_t input) {
 /******************************************************************************/
 // MicroPython bindings;
 
-STATIC mp_obj_t machine_rng_get(void) {
+static mp_obj_t machine_rng_get(void) {
     return mp_obj_new_int(rng_get());
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_rng_get_obj, machine_rng_get);
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
index 0b3661918c771..daeec4c26913b 100644
--- a/ports/esp32/esp32_nvs.c
+++ b/ports/esp32/esp32_nvs.c
@@ -43,7 +43,7 @@ typedef struct _esp32_nvs_obj_t {
 } 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) {
+static esp32_nvs_obj_t *esp32_nvs_new(nvs_handle_t namespace) {
     esp32_nvs_obj_t *self = mp_obj_malloc(esp32_nvs_obj_t, &esp32_nvs_type);
     self->namespace = namespace;
     return self;
@@ -51,13 +51,13 @@ STATIC esp32_nvs_obj_t *esp32_nvs_new(nvs_handle_t namespace) {
 
 // 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) {
+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) {
+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);
 
@@ -69,27 +69,27 @@ STATIC mp_obj_t esp32_nvs_make_new(const mp_obj_type_t *type, size_t n_args, siz
 }
 
 // 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) {
+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);
+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) {
+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);
+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) {
+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;
@@ -97,10 +97,10 @@ STATIC mp_obj_t esp32_nvs_set_blob(mp_obj_t self_in, mp_obj_t key_in, mp_obj_t v
     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);
+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) {
+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
@@ -112,26 +112,26 @@ STATIC mp_obj_t esp32_nvs_get_blob(mp_obj_t self_in, mp_obj_t key_in, mp_obj_t v
     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);
+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) {
+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);
+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) {
+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 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[] = {
+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) },
@@ -139,7 +139,7 @@ STATIC const mp_rom_map_elem_t esp32_nvs_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(esp32_nvs_locals_dict, esp32_nvs_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp32_nvs_type,
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 3bca3b52731d8..e5d48096204b8 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -53,7 +53,7 @@ typedef struct _esp32_partition_obj_t {
     uint16_t block_size;
 } esp32_partition_obj_t;
 
-STATIC esp32_partition_obj_t *esp32_partition_new(const esp_partition_t *part, uint16_t block_size) {
+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);
     }
@@ -68,7 +68,7 @@ STATIC esp32_partition_obj_t *esp32_partition_new(const esp_partition_t *part, u
     return self;
 }
 
-STATIC void esp32_partition_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void esp32_partition_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<Partition type=%u, subtype=%u, address=%u, size=%u, label=%s, encrypted=%u>",
         self->part->type, self->part->subtype,
@@ -77,7 +77,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) {
+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, 2, false);
 
@@ -114,7 +114,7 @@ STATIC mp_obj_t esp32_partition_make_new(const mp_obj_type_t *type, size_t n_arg
     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) {
+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, ARG_block_size };
     static const mp_arg_t allowed_args[] = {
@@ -146,10 +146,10 @@ STATIC mp_obj_t esp32_partition_find(size_t n_args, const mp_obj_t *pos_args, mp
 
     return list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_partition_find_fun_obj, 0, esp32_partition_find);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_partition_find_obj, MP_ROM_PTR(&esp32_partition_find_fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_partition_find_fun_obj, 0, esp32_partition_find);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_partition_find_obj, MP_ROM_PTR(&esp32_partition_find_fun_obj));
 
-STATIC mp_obj_t esp32_partition_info(mp_obj_t self_in) {
+static mp_obj_t esp32_partition_info(mp_obj_t self_in) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t tuple[] = {
         MP_OBJ_NEW_SMALL_INT(self->part->type),
@@ -161,9 +161,9 @@ STATIC mp_obj_t esp32_partition_info(mp_obj_t self_in) {
     };
     return mp_obj_new_tuple(6, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_info_obj, esp32_partition_info);
+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) {
+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]) * self->block_size;
     mp_buffer_info_t bufinfo;
@@ -174,9 +174,9 @@ STATIC mp_obj_t esp32_partition_readblocks(size_t n_args, const mp_obj_t *args)
     check_esp_err(esp_partition_read(self->part, offset, bufinfo.buf, bufinfo.len));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_partition_readblocks_obj, 3, 4, esp32_partition_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_partition_readblocks_obj, 3, 4, esp32_partition_readblocks);
 
-STATIC mp_obj_t esp32_partition_writeblocks(size_t n_args, const mp_obj_t *args) {
+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]) * self->block_size;
     mp_buffer_info_t bufinfo;
@@ -213,9 +213,9 @@ STATIC mp_obj_t esp32_partition_writeblocks(size_t n_args, const mp_obj_t *args)
     check_esp_err(esp_partition_write(self->part, offset, bufinfo.buf, bufinfo.len));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_partition_writeblocks_obj, 3, 4, esp32_partition_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_partition_writeblocks_obj, 3, 4, esp32_partition_writeblocks);
 
-STATIC mp_obj_t esp32_partition_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t esp32_partition_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t cmd = mp_obj_get_int(cmd_in);
     switch (cmd) {
@@ -241,31 +241,31 @@ STATIC mp_obj_t esp32_partition_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_partition_ioctl_obj, esp32_partition_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(esp32_partition_ioctl_obj, esp32_partition_ioctl);
 
-STATIC mp_obj_t esp32_partition_set_boot(mp_obj_t self_in) {
+static mp_obj_t esp32_partition_set_boot(mp_obj_t self_in) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
     check_esp_err(esp_ota_set_boot_partition(self->part));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_set_boot_obj, esp32_partition_set_boot);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_set_boot_obj, esp32_partition_set_boot);
 
-STATIC mp_obj_t esp32_partition_get_next_update(mp_obj_t self_in) {
+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), NATIVE_BLOCK_SIZE_BYTES));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_get_next_update_obj, esp32_partition_get_next_update);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_get_next_update_obj, esp32_partition_get_next_update);
 
-STATIC mp_obj_t esp32_partition_mark_app_valid_cancel_rollback(mp_obj_t cls_in) {
+static mp_obj_t esp32_partition_mark_app_valid_cancel_rollback(mp_obj_t cls_in) {
     check_esp_err(esp_ota_mark_app_valid_cancel_rollback());
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_mark_app_valid_cancel_rollback_fun_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_mark_app_valid_cancel_rollback_fun_obj,
     esp32_partition_mark_app_valid_cancel_rollback);
-STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(esp32_partition_mark_app_valid_cancel_rollback_obj,
+static MP_DEFINE_CONST_CLASSMETHOD_OBJ(esp32_partition_mark_app_valid_cancel_rollback_obj,
     MP_ROM_PTR(&esp32_partition_mark_app_valid_cancel_rollback_fun_obj));
 
-STATIC const mp_rom_map_elem_t esp32_partition_locals_dict_table[] = {
+static const mp_rom_map_elem_t esp32_partition_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&esp32_partition_find_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&esp32_partition_info_obj) },
@@ -282,7 +282,7 @@ STATIC const mp_rom_map_elem_t esp32_partition_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TYPE_APP), MP_ROM_INT(ESP_PARTITION_TYPE_APP) },
     { MP_ROM_QSTR(MP_QSTR_TYPE_DATA), MP_ROM_INT(ESP_PARTITION_TYPE_DATA) },
 };
-STATIC MP_DEFINE_CONST_DICT(esp32_partition_locals_dict, esp32_partition_locals_dict_table);
+static MP_DEFINE_CONST_DICT(esp32_partition_locals_dict, esp32_partition_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp32_partition_type,
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 494ae48f46cfe..c765a9741bcaa 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -75,7 +75,7 @@ typedef struct _rmt_install_state_t {
     esp_err_t ret;
 } rmt_install_state_t;
 
-STATIC void rmt_install_task(void *pvParameter) {
+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);
@@ -107,7 +107,7 @@ esp_err_t rmt_driver_install_core1(uint8_t channel_id) {
 
 #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 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} },
         { MP_QSTR_pin,       MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -177,7 +177,7 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void esp32_rmt_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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) {
         bool idle_output_en;
@@ -190,7 +190,7 @@ STATIC void esp32_rmt_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     }
 }
 
-STATIC mp_obj_t esp32_rmt_deinit(mp_obj_t self_in) {
+static mp_obj_t esp32_rmt_deinit(mp_obj_t self_in) {
     // fixme: check for valid channel. Return exception if error occurs.
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->pin != -1) { // Check if channel has already been deinitialised.
@@ -200,28 +200,28 @@ STATIC mp_obj_t esp32_rmt_deinit(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_deinit_obj, esp32_rmt_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_deinit_obj, esp32_rmt_deinit);
 
 // Return the source frequency.
 // Currently only the APB clock (80MHz) can be used but it is possible other
 // clock sources will added in the future.
-STATIC mp_obj_t esp32_rmt_source_freq() {
+static mp_obj_t esp32_rmt_source_freq() {
     return mp_obj_new_int(APB_CLK_FREQ);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp32_rmt_source_freq_obj, esp32_rmt_source_freq);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_source_obj, MP_ROM_PTR(&esp32_rmt_source_freq_obj));
+static MP_DEFINE_CONST_FUN_OBJ_0(esp32_rmt_source_freq_obj, esp32_rmt_source_freq);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_source_obj, MP_ROM_PTR(&esp32_rmt_source_freq_obj));
 
 // Return the clock divider.
-STATIC mp_obj_t esp32_rmt_clock_div(mp_obj_t self_in) {
+static mp_obj_t esp32_rmt_clock_div(mp_obj_t self_in) {
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(self->clock_div);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_clock_div_obj, esp32_rmt_clock_div);
+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 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 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[] = {
         { MP_QSTR_self,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -235,9 +235,9 @@ STATIC mp_obj_t esp32_rmt_wait_done(size_t n_args, const mp_obj_t *pos_args, mp_
     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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_rmt_wait_done_obj, 1, esp32_rmt_wait_done);
 
-STATIC mp_obj_t esp32_rmt_loop(mp_obj_t self_in, mp_obj_t loop) {
+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);
     self->loop_en = mp_obj_get_int(loop);
     if (!self->loop_en) {
@@ -250,9 +250,9 @@ STATIC mp_obj_t esp32_rmt_loop(mp_obj_t self_in, mp_obj_t loop) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_rmt_loop_obj, esp32_rmt_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 *args) {
+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;
@@ -337,9 +337,9 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_rmt_write_pulses_obj, 2, 3, esp32_rmt_write_pulses);
+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) {
+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;
@@ -357,10 +357,10 @@ STATIC mp_obj_t esp32_rmt_bitstream_channel(size_t n_args, const mp_obj_t *args)
         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 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[] = {
+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) },
     { MP_ROM_QSTR(MP_QSTR_clock_div), MP_ROM_PTR(&esp32_rmt_clock_div_obj) },
@@ -377,7 +377,7 @@ STATIC const mp_rom_map_elem_t esp32_rmt_locals_dict_table[] = {
     // Constants
     { MP_ROM_QSTR(MP_QSTR_PULSE_MAX), MP_ROM_INT(32767) },
 };
-STATIC MP_DEFINE_CONST_DICT(esp32_rmt_locals_dict, esp32_rmt_locals_dict_table);
+static MP_DEFINE_CONST_DICT(esp32_rmt_locals_dict, esp32_rmt_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp32_rmt_type,
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 97041c60bd6be..17d210952f465 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -43,9 +43,9 @@ typedef struct _esp32_ulp_obj_t {
 const mp_obj_type_t esp32_ulp_type;
 
 // singleton ULP object
-STATIC const esp32_ulp_obj_t esp32_ulp_obj = {{&esp32_ulp_type}};
+static const esp32_ulp_obj_t esp32_ulp_obj = {{&esp32_ulp_type}};
 
-STATIC mp_obj_t esp32_ulp_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 esp32_ulp_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);
 
@@ -53,7 +53,7 @@ STATIC mp_obj_t esp32_ulp_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return (mp_obj_t)&esp32_ulp_obj;
 }
 
-STATIC mp_obj_t esp32_ulp_set_wakeup_period(mp_obj_t self_in, mp_obj_t period_index_in, mp_obj_t period_us_in) {
+static mp_obj_t esp32_ulp_set_wakeup_period(mp_obj_t self_in, mp_obj_t period_index_in, mp_obj_t period_us_in) {
     mp_uint_t period_index = mp_obj_get_int(period_index_in);
     mp_uint_t period_us = mp_obj_get_int(period_us_in);
     int _errno = ulp_set_wakeup_period(period_index, period_us);
@@ -62,9 +62,9 @@ STATIC mp_obj_t esp32_ulp_set_wakeup_period(mp_obj_t self_in, mp_obj_t period_in
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_ulp_set_wakeup_period_obj, esp32_ulp_set_wakeup_period);
+static MP_DEFINE_CONST_FUN_OBJ_3(esp32_ulp_set_wakeup_period_obj, esp32_ulp_set_wakeup_period);
 
-STATIC mp_obj_t esp32_ulp_load_binary(mp_obj_t self_in, mp_obj_t load_addr_in, mp_obj_t program_binary_in) {
+static mp_obj_t esp32_ulp_load_binary(mp_obj_t self_in, mp_obj_t load_addr_in, mp_obj_t program_binary_in) {
     mp_uint_t load_addr = mp_obj_get_int(load_addr_in);
 
     mp_buffer_info_t bufinfo;
@@ -76,9 +76,9 @@ STATIC mp_obj_t esp32_ulp_load_binary(mp_obj_t self_in, mp_obj_t load_addr_in, m
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_ulp_load_binary_obj, esp32_ulp_load_binary);
+static MP_DEFINE_CONST_FUN_OBJ_3(esp32_ulp_load_binary_obj, esp32_ulp_load_binary);
 
-STATIC mp_obj_t esp32_ulp_run(mp_obj_t self_in, mp_obj_t entry_point_in) {
+static mp_obj_t esp32_ulp_run(mp_obj_t self_in, mp_obj_t entry_point_in) {
     mp_uint_t entry_point = mp_obj_get_int(entry_point_in);
     int _errno = ulp_run(entry_point / sizeof(uint32_t));
     if (_errno != ESP_OK) {
@@ -86,15 +86,15 @@ STATIC mp_obj_t esp32_ulp_run(mp_obj_t self_in, mp_obj_t entry_point_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_ulp_run_obj, esp32_ulp_run);
+static MP_DEFINE_CONST_FUN_OBJ_2(esp32_ulp_run_obj, esp32_ulp_run);
 
-STATIC const mp_rom_map_elem_t esp32_ulp_locals_dict_table[] = {
+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) },
     { MP_ROM_QSTR(MP_QSTR_RESERVE_MEM), MP_ROM_INT(CONFIG_ULP_COPROC_RESERVE_MEM) },
 };
-STATIC MP_DEFINE_CONST_DICT(esp32_ulp_locals_dict, esp32_ulp_locals_dict_table);
+static MP_DEFINE_CONST_DICT(esp32_ulp_locals_dict, esp32_ulp_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp32_ulp_type,
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index b5233e4ddadd8..0ac9f5d266d9c 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -67,7 +67,7 @@
     MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_12 \
     MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_13 \
 
-STATIC const machine_adc_obj_t madc_obj[] = {
+static const machine_adc_obj_t madc_obj[] = {
     #if CONFIG_IDF_TARGET_ESP32
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_36},
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_37},
@@ -121,7 +121,7 @@ STATIC const machine_adc_obj_t 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 uint8_t madc_obj_atten[MP_ARRAY_SIZE(madc_obj)];
 
 static inline adc_atten_t madc_atten_get(const machine_adc_obj_t *self) {
     uint8_t value = madc_obj_atten[self - &madc_obj[0]];
@@ -142,12 +142,12 @@ const machine_adc_obj_t *madc_search_helper(machine_adc_block_obj_t *block, adc_
     return NULL;
 }
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     const machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "ADC(Pin(%u), atten=%u)", self->gpio_id, madc_atten_get(self));
 }
 
-STATIC void madc_atten_helper(const machine_adc_obj_t *self, mp_int_t atten) {
+static void madc_atten_helper(const machine_adc_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);
@@ -180,11 +180,11 @@ void madc_init_helper(const machine_adc_obj_t *self, size_t n_pos_args, const mp
     }
 }
 
-STATIC void mp_machine_adc_init_helper(machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static void mp_machine_adc_init_helper(machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     madc_init_helper(self, n_pos_args, pos_args, kw_args);
 }
 
-STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+static mp_obj_t mp_machine_adc_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 machine_adc_obj_t *self = madc_search_helper(NULL, -1, gpio_id);
@@ -203,16 +203,16 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_pos_
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t mp_machine_adc_block(machine_adc_obj_t *self) {
+static mp_obj_t mp_machine_adc_block(machine_adc_obj_t *self) {
     return MP_OBJ_FROM_PTR(self->block);
 }
 
-STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
     mp_int_t raw = madcblock_read_helper(self->block, self->channel_id);
     return raw;
 }
 
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     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)
     mp_int_t bits = self->block->bits;
@@ -220,15 +220,15 @@ STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     return u16;
 }
 
-STATIC mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self) {
     adc_atten_t atten = madc_atten_get(self);
     return madcblock_read_uv_helper(self->block, self->channel_id, atten);
 }
 
-STATIC void mp_machine_adc_atten_set(machine_adc_obj_t *self, mp_int_t atten) {
+static void mp_machine_adc_atten_set(machine_adc_obj_t *self, mp_int_t atten) {
     madc_atten_helper(self, atten);
 }
 
-STATIC void mp_machine_adc_width_set(machine_adc_obj_t *self, mp_int_t width) {
+static void mp_machine_adc_width_set(machine_adc_obj_t *self, mp_int_t width) {
     madcblock_bits_helper(self->block, width);
 }
diff --git a/ports/esp32/machine_adc_block.c b/ports/esp32/machine_adc_block.c
index f2975ff2f21d2..c610233900569 100644
--- a/ports/esp32/machine_adc_block.c
+++ b/ports/esp32/machine_adc_block.c
@@ -41,11 +41,11 @@ machine_adc_block_obj_t madcblock_obj[] = {
     #endif
 };
 
-STATIC void mp_machine_adc_block_print(const mp_print_t *print, machine_adc_block_obj_t *self) {
+static void mp_machine_adc_block_print(const mp_print_t *print, machine_adc_block_obj_t *self) {
     mp_printf(print, "ADCBlock(%u, bits=%u)", self->unit_id, self->bits);
 }
 
-STATIC void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_t bits) {
+static void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_t bits) {
     if (bits != -1) {
         madcblock_bits_helper(self, bits);
     } else if (self->width == -1) {
@@ -53,7 +53,7 @@ STATIC void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_
     }
 }
 
-STATIC machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit) {
+static machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit) {
     for (int i = 0; i < MP_ARRAY_SIZE(madcblock_obj); i++) {
         if (unit == madcblock_obj[i].unit_id) {
             return &madcblock_obj[i];
@@ -62,7 +62,7 @@ STATIC machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit) {
     return NULL;
 }
 
-STATIC machine_adc_obj_t *mp_machine_adc_block_connect(machine_adc_block_obj_t *self, mp_int_t channel_id, mp_hal_pin_obj_t gpio_id, mp_map_t *kw_args) {
+static machine_adc_obj_t *mp_machine_adc_block_connect(machine_adc_block_obj_t *self, mp_int_t channel_id, mp_hal_pin_obj_t gpio_id, mp_map_t *kw_args) {
     const machine_adc_obj_t *adc = madc_search_helper(self, channel_id, gpio_id);
     if (adc == NULL) {
         return NULL;
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index 87a5ae53cfe54..ceb1e6ad14291 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -40,7 +40,7 @@
 #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) {
+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) {
@@ -97,13 +97,13 @@ STATIC void IRAM_ATTR machine_bitstream_high_low_bitbang(mp_hal_pin_obj_t pin, u
 
 // 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 }}};
+static rmt_item32_t bitstream_high_low_0 = {{{ 0, 1, 0, 0 }}};
+static rmt_item32_t bitstream_high_low_1 = {{{ 0, 1, 0, 0 }}};
 
 // 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) {
+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;
@@ -134,7 +134,7 @@ 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.
-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) {
+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).
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index 34f51cc521d94..3d1d2df80818a 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -51,7 +51,7 @@ typedef struct _mdac_obj_t {
     #endif
 } mdac_obj_t;
 
-STATIC mdac_obj_t mdac_obj[] = {
+static mdac_obj_t mdac_obj[] = {
     #if CONFIG_IDF_TARGET_ESP32
     {{&machine_dac_type}, GPIO_NUM_25, DAC_CHAN_0},
     {{&machine_dac_type}, GPIO_NUM_26, DAC_CHAN_1},
@@ -61,7 +61,7 @@ STATIC mdac_obj_t mdac_obj[] = {
     #endif
 };
 
-STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
+static mp_obj_t mdac_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);
@@ -94,12 +94,12 @@ STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     #endif
 }
 
-STATIC void mdac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mdac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mdac_obj_t *self = self_in;
     mp_printf(print, "DAC(Pin(%u))", self->gpio_id);
 }
 
-STATIC mp_obj_t mdac_write(mp_obj_t self_in, mp_obj_t value_in) {
+static mp_obj_t mdac_write(mp_obj_t self_in, mp_obj_t value_in) {
     mdac_obj_t *self = self_in;
     int value = mp_obj_get_int(value_in);
     if (value < 0 || value > 255) {
@@ -119,11 +119,11 @@ STATIC mp_obj_t mdac_write(mp_obj_t self_in, mp_obj_t value_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mdac_write_obj, mdac_write);
 
-STATIC const mp_rom_map_elem_t mdac_locals_dict_table[] = {
+static const mp_rom_map_elem_t mdac_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mdac_write_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mdac_locals_dict, mdac_locals_dict_table);
+static MP_DEFINE_CONST_DICT(mdac_locals_dict, mdac_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_dac_type,
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 06e9ec3c8291c..a0531b95f8eaa 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -111,7 +111,7 @@ typedef struct _machine_hw_spi_obj_t {
 } 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[MICROPY_HW_SPI_MAX] = {
+static const machine_hw_spi_default_pins_t machine_hw_spi_default_pins[MICROPY_HW_SPI_MAX] = {
     { .pins = { .sck = MICROPY_HW_SPI1_SCK, .mosi = MICROPY_HW_SPI1_MOSI, .miso = MICROPY_HW_SPI1_MISO }},
     #ifdef MICROPY_HW_SPI2_SCK
     { .pins = { .sck = MICROPY_HW_SPI2_SCK, .mosi = MICROPY_HW_SPI2_MOSI, .miso = MICROPY_HW_SPI2_MISO }},
@@ -133,9 +133,9 @@ static const mp_arg_t spi_allowed_args[] = {
 };
 
 // Static objects mapping to SPI2 (and SPI3 if available) hardware peripherals.
-STATIC machine_hw_spi_obj_t machine_hw_spi_obj[MICROPY_HW_SPI_MAX];
+static machine_hw_spi_obj_t machine_hw_spi_obj[MICROPY_HW_SPI_MAX];
 
-STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
+static void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
     switch (spi_bus_remove_device(self->spi)) {
         case ESP_ERR_INVALID_ARG:
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid configuration"));
@@ -167,7 +167,7 @@ STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
     }
 }
 
-STATIC void machine_hw_spi_init_internal(machine_hw_spi_obj_t *self, mp_arg_val_t args[]) {
+static void machine_hw_spi_init_internal(machine_hw_spi_obj_t *self, mp_arg_val_t args[]) {
 
     // if we're not initialized, then we're
     // implicitly 'changed', since this is the init routine
@@ -292,7 +292,7 @@ STATIC void machine_hw_spi_init_internal(machine_hw_spi_obj_t *self, mp_arg_val_
     self->state = MACHINE_HW_SPI_STATE_INIT;
 }
 
-STATIC void machine_hw_spi_deinit(mp_obj_base_t *self_in) {
+static void machine_hw_spi_deinit(mp_obj_base_t *self_in) {
     machine_hw_spi_obj_t *self = (machine_hw_spi_obj_t *)self_in;
     if (self->state == MACHINE_HW_SPI_STATE_INIT) {
         self->state = MACHINE_HW_SPI_STATE_DEINIT;
@@ -300,7 +300,7 @@ 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) {
+static mp_uint_t gcd(mp_uint_t x, mp_uint_t y) {
     while (x != y) {
         if (x > y) {
             x -= y;
@@ -311,7 +311,7 @@ STATIC mp_uint_t gcd(mp_uint_t x, mp_uint_t y) {
     return x;
 }
 
-STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+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);
 
     if (self->state == MACHINE_HW_SPI_STATE_DEINIT) {
@@ -389,7 +389,7 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui
 /******************************************************************************/
 // MicroPython bindings for hw_spi
 
-STATIC void machine_hw_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void machine_hw_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_hw_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "SPI(id=%u, baudrate=%u, polarity=%u, phase=%u, bits=%u, firstbit=%u, sck=%d, mosi=%d, miso=%d)",
         self->host, self->baudrate, self->polarity,
@@ -401,7 +401,7 @@ STATIC void machine_hw_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 // into all the u_int fields.
 // The behavior is slightly different for a new call vs an init method on an existing object.
 // Unspecified arguments for new will use defaults, for init they keep the existing value.
-STATIC void machine_hw_spi_argcheck(mp_arg_val_t args[], const machine_hw_spi_default_pins_t *default_pins) {
+static void machine_hw_spi_argcheck(mp_arg_val_t args[], const machine_hw_spi_default_pins_t *default_pins) {
 // A non-NULL default_pins argument will trigger the "use default" behavior.
     // Replace pin args with default/current values for new vs init call, respectively
     for (int i = ARG_sck; i <= ARG_miso; i++) {
@@ -415,7 +415,7 @@ STATIC void machine_hw_spi_argcheck(mp_arg_val_t args[], const machine_hw_spi_de
     }
 }
 
-STATIC void machine_hw_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static void machine_hw_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     machine_hw_spi_obj_t *self = (machine_hw_spi_obj_t *)self_in;
 
     mp_arg_val_t args[MP_ARRAY_SIZE(spi_allowed_args)];
@@ -465,7 +465,7 @@ spi_host_device_t machine_hw_spi_get_host(mp_obj_t in) {
     return self->host;
 }
 
-STATIC const mp_machine_spi_p_t machine_hw_spi_p = {
+static const mp_machine_spi_p_t machine_hw_spi_p = {
     .init = machine_hw_spi_init,
     .deinit = machine_hw_spi_deinit,
     .transfer = machine_hw_spi_transfer,
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index f4cfa58166e06..fe42d2e8c27cc 100755
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -66,9 +66,9 @@ typedef struct _machine_hw_i2c_obj_t {
     gpio_num_t sda : 8;
 } machine_hw_i2c_obj_t;
 
-STATIC machine_hw_i2c_obj_t machine_hw_i2c_obj[I2C_NUM_MAX];
+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) {
+static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, uint32_t freq, uint32_t timeout_us, bool first_init) {
     if (!first_init) {
         i2c_driver_delete(self->port);
     }
@@ -137,7 +137,7 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_
 /******************************************************************************/
 // MicroPython bindings for machine API
 
-STATIC void machine_hw_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void machine_hw_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_hw_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int h, l;
     i2c_get_period(self->port, &h, &l);
@@ -198,7 +198,7 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC const mp_machine_i2c_p_t machine_hw_i2c_p = {
+static const mp_machine_i2c_p_t machine_hw_i2c_p = {
     .transfer_supports_write1 = true,
     .transfer = machine_hw_i2c_transfer,
 };
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 3b7bcfeffc673..574125ad6a0d9 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -81,12 +81,12 @@ typedef struct _machine_i2s_obj_t {
     TaskHandle_t non_blocking_mode_task;
 } machine_i2s_obj_t;
 
-STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
+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] = {
+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
@@ -122,7 +122,7 @@ void machine_i2s_init0() {
 //    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) {
+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;
@@ -133,7 +133,7 @@ STATIC void swap_32_bit_stereo_channels(mp_buffer_info_t *bufinfo) {
     }
 }
 
-STATIC int8_t get_frame_mapping_index(i2s_bits_per_sample_t bits, format_t format) {
+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;
@@ -149,7 +149,7 @@ STATIC int8_t get_frame_mapping_index(i2s_bits_per_sample_t bits, format_t forma
     }
 }
 
-STATIC i2s_bits_per_sample_t get_dma_bits(uint8_t mode, i2s_bits_per_sample_t bits) {
+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
@@ -158,7 +158,7 @@ STATIC i2s_bits_per_sample_t get_dma_bits(uint8_t mode, i2s_bits_per_sample_t bi
     }
 }
 
-STATIC i2s_channel_fmt_t get_dma_format(uint8_t mode, format_t format) {
+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;
@@ -171,7 +171,7 @@ STATIC i2s_channel_fmt_t get_dma_format(uint8_t mode, format_t format) {
     }
 }
 
-STATIC uint32_t get_dma_buf_count(uint8_t mode, i2s_bits_per_sample_t bits, format_t format, int32_t ibuf) {
+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);
@@ -181,7 +181,7 @@ STATIC uint32_t get_dma_buf_count(uint8_t mode, i2s_bits_per_sample_t bits, form
     return dma_buf_count;
 }
 
-STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+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
@@ -256,7 +256,7 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
     return a_index;
 }
 
-STATIC size_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);
     }
@@ -289,7 +289,7 @@ STATIC size_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appb
 }
 
 // FreeRTOS task used for non-blocking mode
-STATIC void task_for_non_blocking_mode(void *self_in) {
+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;
@@ -306,7 +306,7 @@ STATIC void task_for_non_blocking_mode(void *self_in) {
     }
 }
 
-STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
+static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // are Pins valid?
     int8_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sck].u_obj);
     int8_t ws = args[ARG_ws].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_ws].u_obj);
@@ -398,7 +398,7 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     check_esp_err(i2s_set_pin(self->i2s_id, &pin_config));
 }
 
-STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
+static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     if (i2s_id < 0 || i2s_id >= I2S_NUM_AUTO) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
     }
@@ -416,7 +416,7 @@ STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     return self;
 }
 
-STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     i2s_driver_uninstall(self->i2s_id);
 
     if (self->non_blocking_mode_task != NULL) {
@@ -432,7 +432,7 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     self->i2s_event_queue = NULL;
 }
 
-STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
     if (self->io_mode == NON_BLOCKING) {
         // create a queue linking the MicroPython task to a FreeRTOS task
         // that manages the non blocking mode of operation
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 34c6512c8da79..1e7b86baeb379 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -63,7 +63,7 @@
 // Return the machine_pin_obj_t pointer corresponding to a machine_pin_irq_obj_t pointer.
 #define PIN_OBJ_PTR_FROM_IRQ_OBJ_PTR(self) ((machine_pin_obj_t *)((uintptr_t)(self) - offsetof(machine_pin_obj_t, irq)))
 
-STATIC const machine_pin_obj_t *machine_pin_find_named(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+static 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) {
@@ -89,14 +89,14 @@ void machine_pins_deinit(void) {
     }
 }
 
-STATIC void machine_pin_isr_handler(void *arg) {
+static void machine_pin_isr_handler(void *arg) {
     machine_pin_obj_t *self = arg;
     mp_obj_t handler = MP_STATE_PORT(machine_pin_irq_handler)[PIN_OBJ_PTR_INDEX(self)];
     mp_sched_schedule(handler, MP_OBJ_FROM_PTR(self));
     mp_hal_wake_main_task_from_isr();
 }
 
-STATIC const machine_pin_obj_t *machine_pin_find(mp_obj_t pin_in) {
+static const machine_pin_obj_t *machine_pin_find(mp_obj_t pin_in) {
     if (mp_obj_is_type(pin_in, &machine_pin_type)) {
         return pin_in;
     }
@@ -128,13 +128,13 @@ gpio_num_t machine_pin_get_id(mp_obj_t pin_in) {
     return PIN_OBJ_PTR_INDEX(self);
 }
 
-STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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)", PIN_OBJ_PTR_INDEX(self));
 }
 
 // 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) {
+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_hold };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = mp_const_none}},
@@ -241,7 +241,7 @@ 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) {
+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_num_t index = PIN_OBJ_PTR_INDEX(self);
@@ -256,35 +256,35 @@ 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) {
+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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
 
 // pin.off()
-STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
+static mp_obj_t machine_pin_off(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     gpio_set_level(PIN_OBJ_PTR_INDEX(self), 0);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
+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) {
+static mp_obj_t machine_pin_on(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     gpio_set_level(PIN_OBJ_PTR_INDEX(self), 1);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
 
 // 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) {
+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} },
@@ -347,7 +347,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     // return the irq object
     return MP_OBJ_FROM_PTR(&self->irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_board_pins_obj_type,
@@ -356,7 +356,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_pin_board_pins_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+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) },
@@ -383,7 +383,7 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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) {
+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_num_t index = PIN_OBJ_PTR_INDEX(self);
@@ -400,9 +400,9 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     return -1;
 }
 
-STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
-STATIC const mp_pin_p_t pin_pin_p = {
+static const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
@@ -420,14 +420,14 @@ MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // Pin IRQ object
 
-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) {
+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 *)PIN_OBJ_PTR_FROM_IRQ_OBJ_PTR(self));
     return mp_const_none;
 }
 
-STATIC mp_obj_t machine_pin_irq_trigger(size_t n_args, const mp_obj_t *args) {
+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];
     gpio_num_t index = PIN_OBJ_PTR_INDEX(PIN_OBJ_PTR_FROM_IRQ_OBJ_PTR(self));
     uint32_t orig_trig = GPIO.pin[index].int_type;
@@ -438,12 +438,12 @@ STATIC mp_obj_t machine_pin_irq_trigger(size_t n_args, const mp_obj_t *args) {
     // 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 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[] = {
+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 MP_DEFINE_CONST_DICT(machine_pin_irq_locals_dict, machine_pin_irq_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_irq_type,
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 03ef2d77fd299..e5d8986c8a839 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -52,7 +52,7 @@ typedef struct _chan_t {
 } chan_t;
 
 // List of PWM channels
-STATIC chan_t chans[PWM_CHANNEL_MAX];
+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[]
@@ -64,7 +64,7 @@ STATIC chan_t chans[PWM_CHANNEL_MAX];
 #define PWM_TIMER_MAX (LEDC_SPEED_MODE_MAX * LEDC_TIMER_MAX)
 
 // List of timer configs
-STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
+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[]
@@ -104,7 +104,7 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 #endif
 
 // Config of timer upon which we run all PWM'ed GPIO pins
-STATIC bool pwm_inited = false;
+static bool pwm_inited = false;
 
 // MicroPython PWM object struct
 typedef struct _machine_pwm_obj_t {
@@ -120,12 +120,12 @@ typedef struct _machine_pwm_obj_t {
     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 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) {
+static void pwm_init(void) {
     // Initial condition: no channels assigned
     for (int i = 0; i < PWM_CHANNEL_MAX; ++i) {
         chans[i].pin = -1;
@@ -145,7 +145,7 @@ STATIC void pwm_init(void) {
 }
 
 // Deinit channel and timer if the timer is unused
-STATIC void pwm_deinit(int channel_idx) {
+static void pwm_deinit(int channel_idx) {
     // Valid channel?
     if ((channel_idx >= 0) && (channel_idx < PWM_CHANNEL_MAX)) {
         // Clean up timer if necessary
@@ -193,7 +193,7 @@ void machine_pwm_deinit_all(void) {
     }
 }
 
-STATIC void configure_channel(machine_pwm_obj_t *self) {
+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,
@@ -207,7 +207,7 @@ 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) {
+static void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_config_t *timer) {
     if (freq != timer->freq_hz) {
         // Find the highest bit resolution for the requested frequency
         unsigned int i = APB_CLK_FREQ; // 80 MHz
@@ -274,7 +274,7 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
 }
 
 // Calculate the duty parameters based on an ns value
-STATIC int ns_to_duty(machine_pwm_obj_t *self, int ns) {
+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)) {
@@ -285,7 +285,7 @@ STATIC int ns_to_duty(machine_pwm_obj_t *self, int ns) {
     return duty;
 }
 
-STATIC int duty_to_ns(machine_pwm_obj_t *self, int 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);
     return ns;
@@ -293,13 +293,13 @@ 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) {
+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) {
+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);
@@ -311,17 +311,17 @@ STATIC uint32_t get_duty_u16(machine_pwm_obj_t *self) {
     return duty;
 }
 
-STATIC uint32_t get_duty_u10(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) {
+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) {
+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);
@@ -360,7 +360,7 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
     self->duty_u16 = duty;
 }
 
-STATIC void set_duty_u10(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);
@@ -370,7 +370,7 @@ STATIC void set_duty_u10(machine_pwm_obj_t *self, int duty) {
     self->duty_u10 = duty;
 }
 
-STATIC void set_duty_ns(machine_pwm_obj_t *self, int ns) {
+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));
@@ -387,7 +387,7 @@ STATIC void set_duty_ns(machine_pwm_obj_t *self, int ns) {
 #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(unsigned 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) {
@@ -407,7 +407,7 @@ STATIC int find_timer(unsigned int freq, bool same_freq_only, int mode) {
 }
 
 // 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) {
+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;
@@ -419,7 +419,7 @@ STATIC bool is_timer_in_use(int current_channel_idx, int timer_idx) {
 
 // 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) {
+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) {
@@ -441,7 +441,7 @@ STATIC int find_channel(int pin, int mode) {
 /******************************************************************************/
 // 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) {
+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);
     if (self->active) {
@@ -465,7 +465,7 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 }
 
 // This called from pwm.init() method
-STATIC void mp_machine_pwm_init_helper(machine_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, ARG_duty_u16, ARG_duty_ns };
     static const mp_arg_t allowed_args[] = {
@@ -563,7 +563,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
 }
 
 // This called from PWM() constructor
-STATIC mp_obj_t mp_machine_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, 2, true);
     gpio_num_t pin_id = machine_pin_get_id(args[0]);
@@ -592,7 +592,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
 }
 
 // This called from pwm.deinit() method
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     int channel_idx = CHANNEL_IDX(self->mode, self->channel);
     pwm_deinit(channel_idx);
     self->active = false;
@@ -604,12 +604,12 @@ STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
 
 // Set and get methods of PWM class
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+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) {
+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("frequency must be from 1Hz to 40MHz"));
@@ -658,26 +658,26 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     set_freq(self, freq, &timers[current_timer_idx]);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *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) {
+static void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     set_duty_u10(self, duty);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+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) {
+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) {
+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) {
+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/machine_rtc.c b/ports/esp32/machine_rtc.c
index cbbfb4b84c2de..087ba9d69efe7 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -79,14 +79,14 @@ _USER_MEM_ATTR uint8_t rtc_user_mem_data[MICROPY_HW_RTC_USER_MEM_MAX];
 #undef _USER_MEM_ATTR
 
 // singleton RTC object
-STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+static const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 machine_rtc_config_t machine_rtc_config = {
     .ext1_pins = 0,
     .ext0_pin = -1
 };
 
-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) {
+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);
 
@@ -101,7 +101,7 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     return (mp_obj_t)&machine_rtc_obj;
 }
 
-STATIC mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         // Get time
 
@@ -138,21 +138,21 @@ 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(size_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);
+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) {
+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_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(size_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];
@@ -171,17 +171,17 @@ STATIC mp_obj_t machine_rtc_memory(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_memory_obj, 1, 2, machine_rtc_memory);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_memory_obj, 1, 2, machine_rtc_memory);
 #endif
 
-STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+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) },
     #if MICROPY_HW_RTC_USER_MEM_MAX > 0
     { MP_ROM_QSTR(MP_QSTR_memory), MP_ROM_PTR(&machine_rtc_memory_obj) },
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 8cc6452ddc503..92c6e64698c33 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -135,7 +135,7 @@ static const sdspi_device_config_t spi_dev_defaults[2] = {
     if (arg_vals[arg_id].u_obj != mp_const_none) \
     config.pin_var = machine_pin_get_id(arg_vals[arg_id].u_obj)
 
-STATIC esp_err_t sdcard_ensure_card_init(sdcard_card_obj_t *self, bool force) {
+static esp_err_t sdcard_ensure_card_init(sdcard_card_obj_t *self, bool force) {
     if (force || !(self->flags & SDCARD_CARD_FLAGS_CARD_INIT_DONE)) {
         DEBUG_printf("  Calling card init");
 
@@ -166,7 +166,7 @@ STATIC esp_err_t sdcard_ensure_card_init(sdcard_card_obj_t *self, bool force) {
 // transfers. Only 1-bit is supported on the SPI interfaces.
 // card = SDCard(slot=1, width=None, present_pin=None, wp_pin=None)
 
-STATIC mp_obj_t machine_sdcard_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_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check arguments
     enum {
         ARG_slot,
@@ -179,7 +179,7 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         ARG_cs,
         ARG_freq,
     };
-    STATIC const mp_arg_t allowed_args[] = {
+    static const mp_arg_t allowed_args[] = {
         { MP_QSTR_slot,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
         { MP_QSTR_width,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
         { MP_QSTR_cd,       MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -315,7 +315,7 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t sd_deinit(mp_obj_t self_in) {
+static mp_obj_t sd_deinit(mp_obj_t self_in) {
     sdcard_card_obj_t *self = self_in;
 
     DEBUG_printf("De-init host\n");
@@ -335,9 +335,9 @@ STATIC mp_obj_t sd_deinit(mp_obj_t self_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(sd_deinit_obj, sd_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(sd_deinit_obj, sd_deinit);
 
-STATIC mp_obj_t sd_info(mp_obj_t self_in) {
+static mp_obj_t sd_info(mp_obj_t self_in) {
     sdcard_card_obj_t *self = self_in;
     // We could potential return a great deal more SD card data but it
     // is not clear that it is worth the extra code space to do
@@ -355,9 +355,9 @@ STATIC mp_obj_t sd_info(mp_obj_t self_in) {
     };
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(sd_info_obj, sd_info);
+static MP_DEFINE_CONST_FUN_OBJ_1(sd_info_obj, sd_info);
 
-STATIC mp_obj_t machine_sdcard_readblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t machine_sdcard_readblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
     sdcard_card_obj_t *self = self_in;
     mp_buffer_info_t bufinfo;
     esp_err_t err;
@@ -372,9 +372,9 @@ STATIC mp_obj_t machine_sdcard_readblocks(mp_obj_t self_in, mp_obj_t block_num,
 
     return mp_obj_new_bool(err == ESP_OK);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_readblocks_obj, machine_sdcard_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_readblocks_obj, machine_sdcard_readblocks);
 
-STATIC mp_obj_t machine_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t machine_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
     sdcard_card_obj_t *self = self_in;
     mp_buffer_info_t bufinfo;
     esp_err_t err;
@@ -389,9 +389,9 @@ STATIC mp_obj_t machine_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t block_num,
 
     return mp_obj_new_bool(err == ESP_OK);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_writeblocks_obj, machine_sdcard_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_writeblocks_obj, machine_sdcard_writeblocks);
 
-STATIC mp_obj_t machine_sdcard_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t machine_sdcard_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
     sdcard_card_obj_t *self = self_in;
     esp_err_t err = ESP_OK;
     mp_int_t cmd = mp_obj_get_int(cmd_in);
@@ -428,9 +428,9 @@ STATIC mp_obj_t machine_sdcard_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t
             return MP_OBJ_NEW_SMALL_INT(-1); // error
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_ioctl_obj, machine_sdcard_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_ioctl_obj, machine_sdcard_ioctl);
 
-STATIC const mp_rom_map_elem_t machine_sdcard_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_sdcard_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&sd_info_obj) },
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&sd_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&sd_deinit_obj) },
@@ -440,7 +440,7 @@ STATIC const mp_rom_map_elem_t machine_sdcard_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&machine_sdcard_ioctl_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(machine_sdcard_locals_dict, machine_sdcard_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_sdcard_locals_dict, machine_sdcard_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_sdcard_type,
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index aba3db1983fce..5e249e46e62c7 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -66,8 +66,8 @@ 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);
+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
@@ -80,14 +80,14 @@ void machine_timer_deinit_all(void) {
     }
 }
 
-STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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 = self_in;
     qstr mode = self->repeat ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
     uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms
     mp_printf(print, "Timer(%u, mode=%q, period=%lu)", (self->group << 1) | self->index, mode, period);
 }
 
-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) {
+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, 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;
@@ -121,7 +121,7 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     return self;
 }
 
-STATIC void machine_timer_disable(machine_timer_obj_t *self) {
+static void machine_timer_disable(machine_timer_obj_t *self) {
     if (self->hal_context.dev != NULL) {
         // Disable the counter and alarm.
         timer_ll_enable_counter(self->hal_context.dev, self->index, false);
@@ -138,7 +138,7 @@ STATIC void machine_timer_disable(machine_timer_obj_t *self) {
     // referenced elsewhere
 }
 
-STATIC void machine_timer_isr(void *self_in) {
+static void machine_timer_isr(void *self_in) {
     machine_timer_obj_t *self = self_in;
 
     uint32_t intr_status = timer_ll_get_intr_status(self->hal_context.dev);
@@ -153,7 +153,7 @@ STATIC void machine_timer_isr(void *self_in) {
     }
 }
 
-STATIC void machine_timer_enable(machine_timer_obj_t *self) {
+static void machine_timer_enable(machine_timer_obj_t *self) {
     // Initialise the timer.
     timer_hal_init(&self->hal_context, self->group, self->index);
     timer_ll_enable_counter(self->hal_context.dev, self->index, false);
@@ -183,7 +183,7 @@ STATIC void machine_timer_enable(machine_timer_obj_t *self) {
     timer_ll_enable_counter(self->hal_context.dev, self->index, true);
 }
 
-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) {
+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) {
     enum {
         ARG_mode,
         ARG_callback,
@@ -230,26 +230,26 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
     return mp_const_none;
 }
 
-STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+static mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
     machine_timer_disable(self_in);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
 
-STATIC mp_obj_t machine_timer_init(size_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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
 
-STATIC mp_obj_t machine_timer_value(mp_obj_t self_in) {
+static mp_obj_t machine_timer_value(mp_obj_t self_in) {
     machine_timer_obj_t *self = self_in;
     uint64_t result = timer_ll_get_counter_value(self->hal_context.dev, self->index);
     return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result / (TIMER_SCALE / 1000))); // value in ms
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_value_obj, machine_timer_value);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_value_obj, machine_timer_value);
 
-STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
+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_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
@@ -257,7 +257,7 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(false) },
     { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(true) },
 };
-STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index d9f4ef3ebc7f4..7612063e51d4a 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -43,7 +43,7 @@ typedef struct _mtp_obj_t {
     touch_pad_t touchpad_id;
 } mtp_obj_t;
 
-STATIC const mtp_obj_t touchpad_obj[] = {
+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},
@@ -73,7 +73,7 @@ STATIC const mtp_obj_t touchpad_obj[] = {
     #endif
 };
 
-STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
+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]);
@@ -108,7 +108,7 @@ STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
 }
 
-STATIC mp_obj_t mtp_config(mp_obj_t self_in, mp_obj_t value_in) {
+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);
@@ -123,7 +123,7 @@ STATIC mp_obj_t mtp_config(mp_obj_t self_in, mp_obj_t value_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mtp_config_obj, mtp_config);
 
-STATIC mp_obj_t mtp_read(mp_obj_t self_in) {
+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;
@@ -139,13 +139,13 @@ STATIC mp_obj_t mtp_read(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mtp_read_obj, mtp_read);
 
-STATIC const mp_rom_map_elem_t mtp_locals_dict_table[] = {
+static const mp_rom_map_elem_t mtp_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&mtp_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mtp_read_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mtp_locals_dict, mtp_locals_dict_table);
+static MP_DEFINE_CONST_DICT(mtp_locals_dict, mtp_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_touchpad_type,
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 0e384dc07a2d7..b7adbf81c7aa7 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -68,7 +68,7 @@ typedef struct _machine_uart_obj_t {
     uint32_t invert;        // lines to invert
 } machine_uart_obj_t;
 
-STATIC const char *_parity_name[] = {"None", "1", "0"};
+static const char *_parity_name[] = {"None", "1", "0"};
 
 /******************************************************************************/
 // MicroPython bindings for UART
@@ -81,7 +81,7 @@ STATIC const char *_parity_name[] = {"None", "1", "0"};
     { 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 void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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);
     uint32_t baudrate;
     check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
@@ -133,7 +133,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
     mp_printf(print, ")");
 }
 
-STATIC void mp_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 void mp_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, ARG_flow };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 0} },
@@ -309,7 +309,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     check_esp_err(uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, UART_FIFO_LEN - UART_FIFO_LEN / 4));
 }
 
-STATIC mp_obj_t mp_machine_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 mp_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 id
@@ -386,21 +386,21 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     check_esp_err(uart_driver_delete(self->uart_num));
 }
 
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     size_t rxbufsize;
     check_esp_err(uart_get_buffered_data_len(self->uart_num, &rxbufsize));
     return rxbufsize;
 }
 
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     return uart_wait_tx_done(self->uart_num, 0) == ESP_OK;
 }
 
-STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     // Save settings
     uint32_t baudrate;
     check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
@@ -417,7 +417,7 @@ STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     check_esp_err(uart_set_baudrate(self->uart_num, baudrate));
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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);
 
     // make sure we want at least 1 char
@@ -451,7 +451,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     return bytes_read;
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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);
 
     int bytes_written = uart_write_bytes(self->uart_num, buf_in, size);
@@ -465,7 +465,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     return bytes_written;
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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/machine_wdt.c b/ports/esp32/machine_wdt.c
index cee761f265e79..06bdc9d10185a 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -35,11 +35,11 @@ typedef struct _machine_wdt_obj_t {
     esp_task_wdt_user_handle_t twdt_user_handle;
 } machine_wdt_obj_t;
 
-STATIC machine_wdt_obj_t wdt_default = {
+static machine_wdt_obj_t wdt_default = {
     {&machine_wdt_type}, 0
 };
 
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     if (id != 0) {
         mp_raise_ValueError(NULL);
     }
@@ -68,7 +68,7 @@ STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t
     return &wdt_default;
 }
 
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     (void)self;
     mp_int_t rs_code = esp_task_wdt_reset_user(wdt_default.twdt_user_handle);
     if (rs_code != ESP_OK) {
diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index f51ba6ab34d50..d3cefbe219662 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -36,7 +36,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
-STATIC mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) {
     esp_log_level_t level = LOG_LOCAL_LEVEL; // Maximum available level
     if (n_args == 2) {
         level = mp_obj_get_int(args[1]);
@@ -51,9 +51,9 @@ STATIC mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_osdebug_obj, 1, 2, esp_osdebug);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_osdebug_obj, 1, 2, esp_osdebug);
 
-STATIC mp_obj_t esp_flash_read_(mp_obj_t offset_in, mp_obj_t buf_in) {
+static mp_obj_t esp_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);
@@ -63,9 +63,9 @@ STATIC mp_obj_t esp_flash_read_(mp_obj_t offset_in, mp_obj_t buf_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_read_obj, esp_flash_read_);
+static MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_read_obj, esp_flash_read_);
 
-STATIC mp_obj_t esp_flash_write_(mp_obj_t offset_in, mp_obj_t buf_in) {
+static mp_obj_t esp_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);
@@ -75,9 +75,9 @@ STATIC mp_obj_t esp_flash_write_(mp_obj_t offset_in, mp_obj_t buf_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_write_obj, esp_flash_write_);
+static MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_write_obj, esp_flash_write_);
 
-STATIC mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
+static mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
     mp_int_t sector = mp_obj_get_int(sector_in);
     esp_err_t res = esp_flash_erase_region(NULL, sector * 4096, 4096);
     if (res != ESP_OK) {
@@ -85,34 +85,34 @@ STATIC mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_flash_erase_obj, esp_flash_erase);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_flash_erase_obj, esp_flash_erase);
 
-STATIC mp_obj_t esp_flash_size(void) {
+static mp_obj_t esp_flash_size(void) {
     uint32_t size;
     esp_flash_get_size(NULL, &size);
     return mp_obj_new_int_from_uint(size);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
 
-STATIC mp_obj_t esp_flash_user_start(void) {
+static mp_obj_t esp_flash_user_start(void) {
     return MP_OBJ_NEW_SMALL_INT(0x200000);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_user_start_obj, esp_flash_user_start);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_user_start_obj, esp_flash_user_start);
 
-STATIC mp_obj_t esp_gpio_matrix_in(mp_obj_t pin, mp_obj_t sig, mp_obj_t inv) {
+static mp_obj_t esp_gpio_matrix_in(mp_obj_t pin, mp_obj_t sig, mp_obj_t inv) {
     esp_rom_gpio_connect_in_signal(mp_obj_get_int(pin), mp_obj_get_int(sig), mp_obj_get_int(inv));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_gpio_matrix_in_obj, esp_gpio_matrix_in);
+static MP_DEFINE_CONST_FUN_OBJ_3(esp_gpio_matrix_in_obj, esp_gpio_matrix_in);
 
-STATIC mp_obj_t esp_gpio_matrix_out(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_gpio_matrix_out(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     esp_rom_gpio_connect_out_signal(mp_obj_get_int(args[0]), mp_obj_get_int(args[1]), mp_obj_get_int(args[2]), mp_obj_get_int(args[3]));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_gpio_matrix_out_obj, 4, 4, esp_gpio_matrix_out);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_gpio_matrix_out_obj, 4, 4, esp_gpio_matrix_out);
 
-STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
+static const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp) },
 
     { MP_ROM_QSTR(MP_QSTR_osdebug), MP_ROM_PTR(&esp_osdebug_obj) },
@@ -135,7 +135,7 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LOG_VERBOSE), MP_ROM_INT((mp_uint_t)ESP_LOG_VERBOSE)},
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp_module_globals, esp_module_globals_table);
+static MP_DEFINE_CONST_DICT(esp_module_globals, esp_module_globals_table);
 
 const mp_obj_module_t esp_module = {
     .base = { &mp_type_module },
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index ef3ad0b76d459..f363939483c6c 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -49,7 +49,7 @@
 #include "../multi_heap_platform.h"
 #include "../heap_private.h"
 
-STATIC mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
+static mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
 
     if (machine_rtc_config.ext0_pin != -1) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
@@ -59,9 +59,9 @@ STATIC mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
     machine_rtc_config.wake_on_touch = mp_obj_is_true(wake);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_touch_obj, esp32_wake_on_touch);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_touch_obj, esp32_wake_on_touch);
 
-STATIC mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
 
     if (machine_rtc_config.wake_on_touch) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
@@ -91,9 +91,9 @@ STATIC mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_m
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext0_obj, 0, esp32_wake_on_ext0);
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext0_obj, 0, esp32_wake_on_ext0);
 
-STATIC mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_pins, ARG_level};
     const mp_arg_t allowed_args[] = {
         { MP_QSTR_pins, MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -127,18 +127,18 @@ STATIC mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_m
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1);
+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) {
+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_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) {
+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 {
@@ -146,13 +146,13 @@ STATIC mp_obj_t esp32_gpio_deep_sleep_hold(const mp_obj_t enable) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_gpio_deep_sleep_hold_obj, esp32_gpio_deep_sleep_hold);
+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"
 
-STATIC mp_obj_t esp32_raw_temperature(void) {
+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);
     CLEAR_PERI_REG_MASK(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_POWER_UP);
@@ -166,11 +166,11 @@ STATIC mp_obj_t esp32_raw_temperature(void) {
 
     return mp_obj_new_int(res);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp32_raw_temperature_obj, esp32_raw_temperature);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp32_raw_temperature_obj, esp32_raw_temperature);
 
 #endif
 
-STATIC mp_obj_t esp32_idf_heap_info(const mp_obj_t cap_in) {
+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;
     heap_t *heap;
@@ -190,9 +190,9 @@ STATIC mp_obj_t esp32_idf_heap_info(const mp_obj_t cap_in) {
     }
     return heap_list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_idf_heap_info_obj, esp32_idf_heap_info);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_idf_heap_info_obj, esp32_idf_heap_info);
 
-STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
+static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32) },
 
     { MP_ROM_QSTR(MP_QSTR_wake_on_touch), MP_ROM_PTR(&esp32_wake_on_touch_obj) },
@@ -219,7 +219,7 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_HEAP_EXEC), MP_ROM_INT(MALLOC_CAP_EXEC) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp32_module_globals, esp32_module_globals_table);
+static MP_DEFINE_CONST_DICT(esp32_module_globals, esp32_module_globals_table);
 
 const mp_obj_module_t esp32_module = {
     .base = { &mp_type_module },
diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index 77dc970f517d8..e7e51ee57ec0f 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -149,7 +149,7 @@ static esp_espnow_obj_t *_get_singleton_initialised() {
 
 // Allocate and initialise the ESPNow module as a singleton.
 // Returns the initialised espnow_singleton.
-STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
+static mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
     size_t n_kw, const mp_obj_t *all_args) {
 
     // The espnow_singleton must be defined in MICROPY_PORT_ROOT_POINTERS
@@ -180,9 +180,9 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
 }
 
 // Forward declare the send and recv ESPNow callbacks
-STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
+static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
 
-STATIC void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len);
+static void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len);
 
 // ESPNow.init(): Initialise the data buffers and ESP-NOW functions.
 // Initialise the Espressif ESPNOW software stack, register callbacks and
@@ -205,7 +205,7 @@ static mp_obj_t espnow_init(mp_obj_t _) {
 // ESPNow.deinit(): De-initialise the ESPNOW software stack, disable callbacks
 // and deallocate the recv data buffers.
 // Note: this function is called from main.c:mp_task() to cleanup before soft
-// reset, so cannot be declared STATIC and must guard against self == NULL;.
+// reset, so cannot be declared static and must guard against self == NULL;.
 mp_obj_t espnow_deinit(mp_obj_t _) {
     esp_espnow_obj_t *self = _get_singleton();
     if (self != NULL && self->recv_buffer != NULL) {
@@ -220,7 +220,7 @@ mp_obj_t espnow_deinit(mp_obj_t _) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton();
     if (n_args > 1) {
         if (mp_obj_is_true(args[1])) {
@@ -231,13 +231,13 @@ STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
     }
     return self->recv_buffer != NULL ? mp_const_true : mp_const_false;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_active);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_active);
 
 // ESPNow.config(['param'|param=value, ..])
 // Get or set configuration values. Supported config params:
 //    buffer: size of buffer for rx packets (default=514 bytes)
 //    timeout: Default read timeout (default=300,000 milliseconds)
-STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     esp_espnow_obj_t *self = _get_singleton();
     enum { ARG_get, ARG_rxbuf, ARG_timeout_ms, ARG_rate };
     static const mp_arg_t allowed_args[] = {
@@ -278,11 +278,11 @@ STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
 
 // ESPNow.irq(recv_cb)
 // Set callback function to be invoked when a message is received.
-STATIC mp_obj_t espnow_irq(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_irq(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton();
     mp_obj_t recv_cb = args[1];
     if (recv_cb != mp_const_none && !mp_obj_is_callable(recv_cb)) {
@@ -292,12 +292,12 @@ STATIC mp_obj_t espnow_irq(size_t n_args, const mp_obj_t *args) {
     self->recv_cb_arg = (n_args > 2) ? args[2] : mp_const_none;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_irq_obj, 2, 3, espnow_irq);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_irq_obj, 2, 3, espnow_irq);
 
 // ESPnow.stats(): Provide some useful stats.
 // Returns a tuple of:
 //   (tx_pkts, tx_responses, tx_failures, rx_pkts, dropped_rx_pkts)
-STATIC mp_obj_t espnow_stats(mp_obj_t _) {
+static mp_obj_t espnow_stats(mp_obj_t _) {
     const esp_espnow_obj_t *self = _get_singleton();
     return NEW_TUPLE(
         mp_obj_new_int(self->tx_packets),
@@ -306,7 +306,7 @@ STATIC mp_obj_t espnow_stats(mp_obj_t _) {
         mp_obj_new_int(self->rx_packets),
         mp_obj_new_int(self->dropped_rx_pkts));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_obj, espnow_stats);
+static MP_DEFINE_CONST_FUN_OBJ_1(espnow_stats_obj, espnow_stats);
 
 #if MICROPY_PY_ESPNOW_RSSI
 // ### Maintaining the peer table and reading RSSI values
@@ -401,7 +401,7 @@ static int ringbuf_get_bytes_wait(ringbuf_t *r, uint8_t *data, size_t len, mp_in
 // loaded into the 3rd and 4th elements.
 // Default timeout is set with ESPNow.config(timeout=milliseconds).
 // Return (None, None) on timeout.
-STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     mp_int_t timeout_ms = ((n_args > 2 && args[2] != mp_const_none)
@@ -456,15 +456,15 @@ STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_NEW_SMALL_INT(msg_len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recvinto_obj, 2, 3, espnow_recvinto);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recvinto_obj, 2, 3, espnow_recvinto);
 
 // Test if data is available to read from the buffers
-STATIC mp_obj_t espnow_any(const mp_obj_t _) {
+static mp_obj_t espnow_any(const mp_obj_t _) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     return ringbuf_avail(self->recv_buffer) ? mp_const_true : mp_const_false;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_any_obj, espnow_any);
+static MP_DEFINE_CONST_FUN_OBJ_1(espnow_any_obj, espnow_any);
 
 // Used by espnow_send() for sends() with sync==True.
 // Wait till all pending sent packet responses have been received.
@@ -494,7 +494,7 @@ static void _wait_for_pending_responses(esp_espnow_obj_t *self) {
 //   True  if sync==True and message is received successfully by all recipients
 //   False if sync==True and message is not received by at least one recipient
 // Raises: EAGAIN if the internal espnow buffers are full.
-STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
     // Check the various combinations of input arguments
     const uint8_t *peer = (n_args > 2) ? _get_peer(args[1]) : NULL;
@@ -532,7 +532,7 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
     // Return False if sync and any peers did not respond.
     return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 2, 4, espnow_send);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 2, 4, espnow_send);
 
 // ### The ESP_Now send and recv callback routines
 //
@@ -540,7 +540,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 2, 4, espnow_send);
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send() logic.
-STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
+static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
     esp_espnow_obj_t *self = _get_singleton();
     self->tx_responses++;
     if (status != ESP_NOW_SEND_SUCCESS) {
@@ -553,7 +553,7 @@ STATIC void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
 // ESPNow packet.
 // If the buffer is full, drop the message and increment the dropped count.
 // Schedules the user callback if one has been registered (ESPNow.config()).
-STATIC void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len) {
+static void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len) {
     esp_espnow_obj_t *self = _get_singleton();
     ringbuf_t *buf = self->recv_buffer;
     // TODO: Test this works with ">".
@@ -584,17 +584,17 @@ STATIC void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, in
 // Set the ESP-NOW Primary Master Key (pmk) (for encrypted communications).
 // Raise OSError if ESP-NOW functions are not initialised.
 // Raise ValueError if key is not a bytes-like object exactly 16 bytes long.
-STATIC mp_obj_t espnow_set_pmk(mp_obj_t _, mp_obj_t key) {
+static mp_obj_t espnow_set_pmk(mp_obj_t _, mp_obj_t key) {
     check_esp_err(esp_now_set_pmk(_get_bytes_len(key, ESP_NOW_KEY_LEN)));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
+static MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
 
 // Common code for add_peer() and mod_peer() to process the args and kw_args:
 // Raise ValueError if the LMK is not a bytes-like object of exactly 16 bytes.
 // Raise TypeError if invalid keyword args or too many positional args.
 // Return true if all args parsed correctly.
-STATIC bool _update_peer_info(
+static bool _update_peer_info(
     esp_now_peer_info_t *peer, size_t n_args,
     const mp_obj_t *pos_args, mp_map_t *kw_args) {
 
@@ -630,7 +630,7 @@ STATIC bool _update_peer_info(
 // Update the cached peer count in self->peer_count;
 // The peer_count ignores broadcast and multicast addresses and is used for the
 // send() logic and is updated from add_peer(), mod_peer() and del_peer().
-STATIC void _update_peer_count() {
+static void _update_peer_count() {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     esp_now_peer_info_t peer = {0};
@@ -654,7 +654,7 @@ STATIC void _update_peer_count() {
 // Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
 // Raise TypeError if invalid keyword args or too many positional args.
 // Return None.
-STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     esp_now_peer_info_t peer = {0};
     memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
     _update_peer_info(&peer, n_args - 2, args + 2, kw_args);
@@ -664,13 +664,13 @@ STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args, mp_map_t *k
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_add_peer_obj, 2, espnow_add_peer);
+static MP_DEFINE_CONST_FUN_OBJ_KW(espnow_add_peer_obj, 2, espnow_add_peer);
 
 // ESPNow.del_peer(peer_mac): Unregister peer_mac.
 // Raise OSError if ESPNow.init() has not been called.
 // Raise ValueError if peer is not a bytes-like objects or wrong length.
 // Return None.
-STATIC mp_obj_t espnow_del_peer(mp_obj_t _, mp_obj_t peer) {
+static mp_obj_t espnow_del_peer(mp_obj_t _, mp_obj_t peer) {
     uint8_t peer_addr[ESP_NOW_ETH_ALEN];
     memcpy(peer_addr, _get_peer(peer), ESP_NOW_ETH_ALEN);
 
@@ -679,7 +679,7 @@ STATIC mp_obj_t espnow_del_peer(mp_obj_t _, mp_obj_t peer) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_del_peer_obj, espnow_del_peer);
+static MP_DEFINE_CONST_FUN_OBJ_2(espnow_del_peer_obj, espnow_del_peer);
 
 // Convert a peer_info struct to python tuple
 // Used by espnow_get_peer() and espnow_get_peers()
@@ -697,7 +697,7 @@ static mp_obj_t _peer_info_to_tuple(const esp_now_peer_info_t *peer) {
 // Return a tuple of tuples:
 //     ((peer_addr, lmk, channel, ifidx, encrypt),
 //      (peer_addr, lmk, channel, ifidx, encrypt), ...)
-STATIC mp_obj_t espnow_get_peers(mp_obj_t _) {
+static mp_obj_t espnow_get_peers(mp_obj_t _) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     // Build and initialise the peer info tuple.
@@ -711,14 +711,14 @@ STATIC mp_obj_t espnow_get_peers(mp_obj_t _) {
 
     return peerinfo_tuple;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
+static MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers);
 
 #if MICROPY_PY_ESPNOW_EXTRA_PEER_METHODS
 // ESPNow.get_peer(peer_mac): Get the peer info for peer_mac as a tuple.
 // Raise OSError if ESPNow.init() has not been called.
 // Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
 // Return a tuple of (peer_addr, lmk, channel, ifidx, encrypt).
-STATIC mp_obj_t espnow_get_peer(mp_obj_t _, mp_obj_t arg1) {
+static mp_obj_t espnow_get_peer(mp_obj_t _, mp_obj_t arg1) {
     esp_now_peer_info_t peer = {0};
     memcpy(peer.peer_addr, _get_peer(arg1), ESP_NOW_ETH_ALEN);
 
@@ -726,7 +726,7 @@ STATIC mp_obj_t espnow_get_peer(mp_obj_t _, mp_obj_t arg1) {
 
     return _peer_info_to_tuple(&peer);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
+static MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
 
 // ESPNow.mod_peer(peer_mac, [lmk, [channel, [ifidx, [encrypt]]]]) or
 // ESPNow.mod_peer(peer_mac, [lmk=b'0123456789abcdef'|b''|None|False],
@@ -736,7 +736,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_get_peer_obj, espnow_get_peer);
 // Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
 // Raise TypeError if invalid keyword args or too many positional args.
 // Return None.
-STATIC mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     esp_now_peer_info_t peer = {0};
     memcpy(peer.peer_addr, _get_peer(args[1]), ESP_NOW_ETH_ALEN);
     check_esp_err(esp_now_get_peer(peer.peer_addr, &peer));
@@ -748,12 +748,12 @@ STATIC mp_obj_t espnow_mod_peer(size_t n_args, const mp_obj_t *args, mp_map_t *k
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
+static MP_DEFINE_CONST_FUN_OBJ_KW(espnow_mod_peer_obj, 2, espnow_mod_peer);
 
 // ESPNow.espnow_peer_count(): Get the number of registered peers.
 // Raise OSError if ESPNow.init() has not been called.
 // Return a tuple of (num_total_peers, num_encrypted_peers).
-STATIC mp_obj_t espnow_peer_count(mp_obj_t _) {
+static mp_obj_t espnow_peer_count(mp_obj_t _) {
     esp_now_peer_num_t peer_num = {0};
     check_esp_err(esp_now_get_peer_num(&peer_num));
 
@@ -761,10 +761,10 @@ STATIC mp_obj_t espnow_peer_count(mp_obj_t _) {
         mp_obj_new_int(peer_num.total_num),
         mp_obj_new_int(peer_num.encrypt_num));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_count_obj, espnow_peer_count);
+static MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_count_obj, espnow_peer_count);
 #endif
 
-STATIC const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
+static const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&espnow_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&espnow_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&espnow_irq_obj) },
@@ -786,9 +786,9 @@ STATIC const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_peer_count), MP_ROM_PTR(&espnow_peer_count_obj) },
     #endif // MICROPY_PY_ESPNOW_EXTRA_PEER_METHODS
 };
-STATIC MP_DEFINE_CONST_DICT(esp_espnow_locals_dict, esp_espnow_locals_dict_table);
+static MP_DEFINE_CONST_DICT(esp_espnow_locals_dict, esp_espnow_locals_dict_table);
 
-STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
+static const mp_rom_map_elem_t espnow_globals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__espnow) },
     { MP_ROM_QSTR(MP_QSTR_ESPNowBase), MP_ROM_PTR(&esp_espnow_type) },
     { MP_ROM_QSTR(MP_QSTR_MAX_DATA_LEN), MP_ROM_INT(ESP_NOW_MAX_DATA_LEN)},
@@ -797,13 +797,13 @@ STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MAX_TOTAL_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_TOTAL_PEER_NUM)},
     { MP_ROM_QSTR(MP_QSTR_MAX_ENCRYPT_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_ENCRYPT_PEER_NUM)},
 };
-STATIC MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
+static MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
 
 // ### Dummy Buffer Protocol support
 // ...so asyncio can poll.ipoll() on this device
 
 // Support ioctl(MP_STREAM_POLL, ) for asyncio
-STATIC mp_uint_t espnow_stream_ioctl(
+static mp_uint_t espnow_stream_ioctl(
     mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     if (request != MP_STREAM_POLL) {
         *errcode = MP_EINVAL;
@@ -818,7 +818,7 @@ STATIC mp_uint_t espnow_stream_ioctl(
                ((self->tx_responses < self->tx_packets) ? MP_STREAM_POLL_WR : 0));
 }
 
-STATIC const mp_stream_p_t espnow_stream_p = {
+static const mp_stream_p_t espnow_stream_p = {
     .ioctl = espnow_stream_ioctl,
 };
 
@@ -830,7 +830,7 @@ STATIC const mp_stream_p_t espnow_stream_p = {
 //   rssi is the wifi signal strength from the last msg received
 //       (in dBm from -127 to 0)
 //   time_sec is the time in milliseconds since device last booted.
-STATIC void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void espnow_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     esp_espnow_obj_t *self = _get_singleton();
     if (dest[0] != MP_OBJ_NULL) {   // Only allow "Load" operation
         return;
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 145ae9341cf2a..6e6a57896814c 100755
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -88,17 +88,17 @@ typedef enum {
     MP_SOFT_RESET
 } reset_reason_t;
 
-STATIC bool is_soft_reset = 0;
+static bool is_soft_reset = 0;
 
 #if CONFIG_IDF_TARGET_ESP32C3
 int esp_clk_cpu_freq(void);
 #endif
 
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     return mp_obj_new_int(esp_rom_get_cpu_ticks_per_us() * 1000000);
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
     if (freq != 20 && freq != 40 && freq != 80 && freq != 160
         #if !CONFIG_IDF_TARGET_ESP32C3
@@ -136,7 +136,7 @@ STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-STATIC void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_obj_t *args) {
+static void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_obj_t *args) {
     // First, disable any previously set wake-up source
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
 
@@ -182,16 +182,16 @@ STATIC void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_
     }
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     machine_sleep_helper(MACHINE_WAKE_SLEEP, n_args, args);
 };
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     machine_sleep_helper(MACHINE_WAKE_DEEPSLEEP, n_args, args);
     mp_machine_reset();
 };
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     if (is_soft_reset) {
         return MP_SOFT_RESET;
     }
@@ -235,22 +235,22 @@ void machine_deinit(void) {
     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) {
+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());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_wake_reason_obj, 0,  machine_wake_reason);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_wake_reason_obj, 0,  machine_wake_reason);
 
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     esp_restart();
 }
 
-STATIC mp_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     uint8_t chipid[6];
     esp_efuse_mac_get_default(chipid);
     return mp_obj_new_bytes(chipid, 6);
 }
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     MP_THREAD_GIL_EXIT();
     taskYIELD();
     MP_THREAD_GIL_ENTER();
diff --git a/ports/esp32/modos.c b/ports/esp32/modos.c
index 5b055eb979817..d5ba611e88b36 100644
--- a/ports/esp32/modos.c
+++ b/ports/esp32/modos.c
@@ -36,7 +36,7 @@
 #include "py/mphal.h"
 #include "extmod/misc.h"
 
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -50,4 +50,4 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 9280ab203d25b..507609dfef6b1 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -83,7 +83,7 @@ typedef struct _socket_obj_t {
     #endif
 } socket_obj_t;
 
-STATIC const char *TAG = "modsocket";
+static const char *TAG = "modsocket";
 
 void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms);
 
@@ -93,21 +93,21 @@ void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms);
 // This divisor is used to reduce the load on the system, so it doesn't poll sockets too often
 #define USOCKET_EVENTS_DIVISOR (8)
 
-STATIC uint8_t socket_events_divisor;
-STATIC socket_obj_t *socket_events_head;
+static uint8_t socket_events_divisor;
+static socket_obj_t *socket_events_head;
 
 void socket_events_deinit(void) {
     socket_events_head = NULL;
 }
 
 // Assumes the socket is not already in the linked list, and adds it
-STATIC void socket_events_add(socket_obj_t *sock) {
+static void socket_events_add(socket_obj_t *sock) {
     sock->events_next = socket_events_head;
     socket_events_head = sock;
 }
 
 // Assumes the socket is already in the linked list, and removes it
-STATIC void socket_events_remove(socket_obj_t *sock) {
+static void socket_events_remove(socket_obj_t *sock) {
     for (socket_obj_t **s = &socket_events_head;; s = &(*s)->events_next) {
         if (*s == sock) {
             *s = (*s)->events_next;
@@ -158,7 +158,7 @@ static inline void check_for_exceptions(void) {
 
 #if MICROPY_HW_ENABLE_MDNS_QUERIES
 // This function mimics lwip_getaddrinfo, but makes an mDNS query
-STATIC int mdns_getaddrinfo(const char *host_str, const char *port_str,
+static int mdns_getaddrinfo(const char *host_str, const char *port_str,
     const struct addrinfo *hints, struct addrinfo **res) {
     int host_len = strlen(host_str);
     const int local_len = sizeof(MDNS_LOCAL_SUFFIX) - 1;
@@ -261,13 +261,13 @@ static void _getaddrinfo_inner(const mp_obj_t host, const mp_obj_t portx,
     assert(retval == 0 && *res != NULL);
 }
 
-STATIC void _socket_getaddrinfo(const mp_obj_t addrtuple, struct addrinfo **resp) {
+static void _socket_getaddrinfo(const mp_obj_t addrtuple, struct addrinfo **resp) {
     mp_obj_t *elem;
     mp_obj_get_array_fixed_n(addrtuple, 2, &elem);
     _getaddrinfo_inner(elem[0], elem[1], NULL, resp);
 }
 
-STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t socket_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, 0, 3, false);
 
     socket_obj_t *sock = mp_obj_malloc_with_finaliser(socket_obj_t, type_in);
@@ -302,7 +302,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, siz
     return MP_OBJ_FROM_PTR(sock);
 }
 
-STATIC mp_obj_t socket_bind(const mp_obj_t arg0, const mp_obj_t arg1) {
+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);
@@ -314,10 +314,10 @@ STATIC mp_obj_t socket_bind(const mp_obj_t arg0, const mp_obj_t arg1) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
 // method socket.listen([backlog])
-STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+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 = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
@@ -333,9 +333,9 @@ 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_VAR_BETWEEN(socket_listen_obj, 1, 2, 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) {
+static mp_obj_t socket_accept(const mp_obj_t arg0) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
 
     struct sockaddr addr;
@@ -380,9 +380,9 @@ STATIC mp_obj_t socket_accept(const mp_obj_t arg0) {
 
     return client;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
+static MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 
-STATIC mp_obj_t socket_connect(const mp_obj_t arg0, const mp_obj_t arg1) {
+static mp_obj_t socket_connect(const mp_obj_t arg0, const mp_obj_t arg1) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
     struct addrinfo *res;
     bool blocking = false;
@@ -477,9 +477,9 @@ STATIC mp_obj_t socket_connect(const mp_obj_t arg0, const mp_obj_t arg1) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
 
-STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // always 4
     socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
@@ -550,7 +550,7 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
 
 void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms) {
     // Rather than waiting for the entire timeout specified, we wait sock->retries times
@@ -568,7 +568,7 @@ void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms) {
     lwip_fcntl(sock->fd, F_SETFL, timeout_ms ? 0 : O_NONBLOCK);
 }
 
-STATIC mp_obj_t socket_settimeout(const mp_obj_t arg0, const mp_obj_t arg1) {
+static mp_obj_t socket_settimeout(const mp_obj_t arg0, const mp_obj_t arg1) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
     if (arg1 == mp_const_none) {
         _socket_settimeout(self, UINT64_MAX);
@@ -581,9 +581,9 @@ STATIC mp_obj_t socket_settimeout(const mp_obj_t arg0, const mp_obj_t arg1) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
 
-STATIC mp_obj_t socket_setblocking(const mp_obj_t arg0, const mp_obj_t arg1) {
+static mp_obj_t socket_setblocking(const mp_obj_t arg0, const mp_obj_t arg1) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
     if (mp_obj_is_true(arg1)) {
         _socket_settimeout(self, UINT64_MAX);
@@ -592,12 +592,12 @@ STATIC mp_obj_t socket_setblocking(const mp_obj_t arg0, const mp_obj_t arg1) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
 
 // 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,
+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);
 
@@ -668,12 +668,12 @@ mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
 
-STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     return _socket_recvfrom(self_in, len_in, NULL, NULL);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
-STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     struct sockaddr from;
     socklen_t fromlen = sizeof(from);
 
@@ -686,7 +686,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
 
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
 
 int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
     int sentlen = 0;
@@ -709,16 +709,16 @@ int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
     return sentlen;
 }
 
-STATIC mp_obj_t socket_send(const mp_obj_t arg0, const mp_obj_t arg1) {
+static mp_obj_t socket_send(const mp_obj_t arg0, const mp_obj_t arg1) {
     socket_obj_t *sock = MP_OBJ_TO_PTR(arg0);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg1, &bufinfo, MP_BUFFER_READ);
     int r = _socket_send(sock, bufinfo.buf, bufinfo.len);
     return mp_obj_new_int(r);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
 
-STATIC mp_obj_t socket_sendall(const mp_obj_t arg0, const mp_obj_t arg1) {
+static mp_obj_t socket_sendall(const mp_obj_t arg0, const mp_obj_t arg1) {
     // XXX behaviour when nonblocking (see extmod/modlwip.c)
     // XXX also timeout behaviour.
     socket_obj_t *sock = MP_OBJ_TO_PTR(arg0);
@@ -730,9 +730,9 @@ STATIC mp_obj_t socket_sendall(const mp_obj_t arg0, const mp_obj_t arg1) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, socket_sendall);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, socket_sendall);
 
-STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
+static mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
     socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // get the buffer to send
@@ -760,25 +760,25 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_
     }
     mp_raise_OSError(MP_ETIMEDOUT);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
+static MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
 
-STATIC mp_obj_t socket_fileno(const mp_obj_t arg0) {
+static mp_obj_t socket_fileno(const mp_obj_t arg0) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
     return mp_obj_new_int(self->fd);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_fileno_obj, socket_fileno);
+static MP_DEFINE_CONST_FUN_OBJ_1(socket_fileno_obj, socket_fileno);
 
-STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
 
-STATIC mp_uint_t socket_stream_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t socket_stream_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     return _socket_read_data(self_in, buf, size, NULL, NULL, errcode);
 }
 
-STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     socket_obj_t *sock = self_in;
     for (int i = 0; i <= sock->retries; i++) {
         MP_THREAD_GIL_EXIT();
@@ -798,7 +798,7 @@ STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_
     return MP_STREAM_ERROR;
 }
 
-STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     socket_obj_t *socket = self_in;
     if (request == MP_STREAM_POLL) {
         if (socket->fd == -1) {
@@ -867,7 +867,7 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
     return MP_STREAM_ERROR;
 }
 
-STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { 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) },
@@ -890,15 +890,15 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { 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 MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
-STATIC const mp_stream_p_t socket_stream_p = {
+static const mp_stream_p_t socket_stream_p = {
     .read = socket_stream_read,
     .write = socket_stream_write,
     .ioctl = socket_stream_ioctl
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
@@ -907,7 +907,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &socket_locals_dict
     );
 
-STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     struct addrinfo hints = { };
     struct addrinfo *res = NULL;
 
@@ -963,9 +963,9 @@ STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     lwip_freeaddrinfo(res);
     return ret_list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_socket_getaddrinfo_obj, 2, 6, esp_socket_getaddrinfo);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_socket_getaddrinfo_obj, 2, 6, esp_socket_getaddrinfo);
 
-STATIC mp_obj_t esp_socket_initialize() {
+static mp_obj_t esp_socket_initialize() {
     static int initialized = 0;
     if (!initialized) {
         ESP_LOGI(TAG, "Initializing");
@@ -974,9 +974,9 @@ STATIC mp_obj_t esp_socket_initialize() {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_socket_initialize_obj, esp_socket_initialize);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_socket_initialize_obj, esp_socket_initialize);
 
-STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&esp_socket_initialize_obj) },
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
@@ -997,7 +997,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IP_ADD_MEMBERSHIP), MP_ROM_INT(IP_ADD_MEMBERSHIP) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
 const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
diff --git a/ports/esp32/modtime.c b/ports/esp32/modtime.c
index 7a2b2150869e1..4695dd23e7f3e 100644
--- a/ports/esp32/modtime.c
+++ b/ports/esp32/modtime.c
@@ -32,7 +32,7 @@
 #include "shared/timeutils/timeutils.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
     timeutils_struct_time_t tm;
@@ -51,7 +51,7 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
     return mp_obj_new_int(tv.tv_sec);
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index fb322dff6dd54..fd1cbcdb985f1 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -49,7 +49,7 @@
 
 TaskHandle_t mp_main_task_handle;
 
-STATIC uint8_t stdin_ringbuf_array[260];
+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.
diff --git a/ports/esp32/mpnimbleport.c b/ports/esp32/mpnimbleport.c
index 5b57edf3c1c19..669aeb746a58d 100644
--- a/ports/esp32/mpnimbleport.c
+++ b/ports/esp32/mpnimbleport.c
@@ -38,7 +38,7 @@
 
 #include "extmod/nimble/modbluetooth_nimble.h"
 
-STATIC void ble_host_task(void *param) {
+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();
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 74dbc14797432..1c13e928d9722 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -52,9 +52,9 @@ typedef struct _mp_thread_t {
 } mp_thread_t;
 
 // the mutex controls access to the linked list
-STATIC mp_thread_mutex_t thread_mutex;
-STATIC mp_thread_t thread_entry0;
-STATIC mp_thread_t *thread = NULL; // root pointer, handled by mp_thread_gc_others
+static mp_thread_mutex_t thread_mutex;
+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);
@@ -113,9 +113,9 @@ void mp_thread_start(void) {
     mp_thread_mutex_unlock(&thread_mutex);
 }
 
-STATIC void *(*ext_thread_entry)(void *) = NULL;
+static void *(*ext_thread_entry)(void *) = NULL;
 
-STATIC void freertos_entry(void *arg) {
+static void freertos_entry(void *arg) {
     if (ext_thread_entry) {
         ext_thread_entry(arg);
     }
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index 1c5979175d0a1..fb51656817153 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -81,7 +81,7 @@ NORETURN void esp_exceptions_helper(esp_err_t e) {
     }
 }
 
-STATIC mp_obj_t esp_initialize() {
+static mp_obj_t esp_initialize() {
     static int initialized = 0;
     if (!initialized) {
         esp_exceptions(esp_netif_init());
@@ -91,7 +91,7 @@ STATIC mp_obj_t esp_initialize() {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(esp_network_initialize_obj, esp_initialize);
 
-STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
     base_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     esp_netif_ip_info_t info;
     esp_netif_dns_info_t dns_info;
@@ -163,7 +163,7 @@ mp_obj_t esp_ifname(esp_netif_t *netif) {
     return ret;
 }
 
-STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj, 0, 1, esp_phy_mode);
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index f66895f9e098a..d7d9a9f7ac540 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -61,8 +61,8 @@ typedef struct _lan_if_obj_t {
 } 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, NULL}, false, false};
-STATIC uint8_t eth_status = 0;
+static lan_if_obj_t lan_obj = {{{&lan_if_type}, ESP_IF_ETH, NULL}, false, false};
+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) {
@@ -92,7 +92,7 @@ static void eth_event_handler(void *arg, esp_event_base_t event_base,
     }
 }
 
-STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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;
 
     if (self->initialized) {
@@ -298,7 +298,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(esp_network_get_lan_obj, 0, get_lan);
 
-STATIC mp_obj_t lan_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t lan_active(size_t n_args, const mp_obj_t *args) {
     lan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (n_args > 1) {
@@ -318,20 +318,20 @@ STATIC mp_obj_t lan_active(size_t n_args, const mp_obj_t *args) {
 
     return mp_obj_new_bool(self->base.active);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lan_active_obj, 1, 2, lan_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) {
+static mp_obj_t lan_status(mp_obj_t self_in) {
     return MP_OBJ_NEW_SMALL_INT(eth_status);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(lan_status_obj, lan_status);
+static MP_DEFINE_CONST_FUN_OBJ_1(lan_status_obj, lan_status);
 
-STATIC mp_obj_t lan_isconnected(mp_obj_t self_in) {
+static mp_obj_t lan_isconnected(mp_obj_t self_in) {
     lan_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(self->base.active && (eth_status == ETH_GOT_IP));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(lan_isconnected_obj, lan_isconnected);
+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) {
+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"));
     }
@@ -386,9 +386,9 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
 
     return val;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(lan_config_obj, 1, lan_config);
+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[] = {
+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) },
@@ -396,7 +396,7 @@ STATIC const mp_rom_map_elem_t lan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_network_ifconfig_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(lan_if_locals_dict, lan_if_locals_dict_table);
+static MP_DEFINE_CONST_DICT(lan_if_locals_dict, lan_if_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     lan_if_type,
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index cf644a6bd7319..4e9b2a32ca0b6 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -84,7 +84,7 @@ static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
     }
 }
 
-STATIC mp_obj_t ppp_make_new(mp_obj_t stream) {
+static mp_obj_t ppp_make_new(mp_obj_t stream) {
     mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
 
     ppp_if_obj_t *self = mp_obj_malloc_with_finaliser(ppp_if_obj_t, &ppp_if_type);
@@ -123,7 +123,7 @@ static void pppos_client_task(void *self_in) {
     }
 }
 
-STATIC mp_obj_t ppp_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t ppp_active(size_t n_args, const mp_obj_t *args) {
     ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (n_args > 1) {
@@ -169,9 +169,9 @@ STATIC mp_obj_t ppp_active(size_t n_args, const mp_obj_t *args) {
     }
     return mp_obj_new_bool(self->active);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ppp_active_obj, 1, 2, ppp_active);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ppp_active_obj, 1, 2, ppp_active);
 
-STATIC mp_obj_t ppp_connect_py(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t ppp_connect_py(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     enum { ARG_authmode, ARG_username, ARG_password };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_authmode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PPPAUTHTYPE_NONE} },
@@ -224,7 +224,7 @@ STATIC mp_obj_t ppp_connect_py(size_t n_args, const mp_obj_t *args, mp_map_t *kw
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(ppp_connect_obj, 1, ppp_connect_py);
 
-STATIC mp_obj_t ppp_delete(mp_obj_t self_in) {
+static mp_obj_t ppp_delete(mp_obj_t self_in) {
     ppp_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t args[] = {self, mp_const_false};
     ppp_active(2, args);
@@ -232,7 +232,7 @@ STATIC mp_obj_t ppp_delete(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(ppp_delete_obj, ppp_delete);
 
-STATIC mp_obj_t ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
     ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
         // get
@@ -266,18 +266,18 @@ STATIC mp_obj_t ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ppp_ifconfig_obj, 1, 2, ppp_ifconfig);
 
-STATIC mp_obj_t ppp_status(mp_obj_t self_in) {
+static mp_obj_t ppp_status(mp_obj_t self_in) {
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ppp_status_obj, ppp_status);
+static MP_DEFINE_CONST_FUN_OBJ_1(ppp_status_obj, ppp_status);
 
-STATIC mp_obj_t ppp_isconnected(mp_obj_t self_in) {
+static mp_obj_t ppp_isconnected(mp_obj_t self_in) {
     ppp_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(self->connected);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ppp_isconnected_obj, ppp_isconnected);
+static MP_DEFINE_CONST_FUN_OBJ_1(ppp_isconnected_obj, ppp_isconnected);
 
-STATIC mp_obj_t ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static mp_obj_t ppp_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"));
     }
@@ -319,9 +319,9 @@ STATIC mp_obj_t ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
 
     return val;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ppp_config_obj, 1, ppp_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(ppp_config_obj, 1, ppp_config);
 
-STATIC const mp_rom_map_elem_t ppp_if_locals_dict_table[] = {
+static const mp_rom_map_elem_t ppp_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&ppp_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&ppp_connect_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&ppp_isconnected_obj) },
@@ -333,7 +333,7 @@ STATIC const mp_rom_map_elem_t ppp_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AUTH_PAP), MP_ROM_INT(PPPAUTHTYPE_PAP) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_CHAP), MP_ROM_INT(PPPAUTHTYPE_CHAP) },
 };
-STATIC MP_DEFINE_CONST_DICT(ppp_if_locals_dict, ppp_if_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ppp_if_locals_dict, ppp_if_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ppp_if_type,
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index e8c75c619df6c..dfa3347c67953 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -55,8 +55,8 @@
 
 typedef base_if_obj_t wlan_if_obj_t;
 
-STATIC wlan_if_obj_t wlan_sta_obj;
-STATIC wlan_if_obj_t wlan_ap_obj;
+static wlan_if_obj_t wlan_sta_obj;
+static wlan_if_obj_t wlan_ap_obj;
 
 // Set to "true" if esp_wifi_start() was called
 static bool wifi_started = false;
@@ -183,7 +183,7 @@ static void network_wlan_ip_event_handler(void *event_handler_arg, esp_event_bas
     }
 }
 
-STATIC void require_if(mp_obj_t wlan_if, int if_no) {
+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 == ESP_IF_WIFI_STA ? MP_ERROR_TEXT("STA required") : MP_ERROR_TEXT("AP required"));
@@ -233,7 +233,7 @@ void esp_initialise_wifi(void) {
     }
 }
 
-STATIC mp_obj_t network_wlan_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 network_wlan_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);
 
     esp_initialise_wifi();
@@ -248,7 +248,7 @@ STATIC mp_obj_t network_wlan_make_new(const mp_obj_type_t *type, size_t n_args,
     }
 }
 
-STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
+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;
@@ -284,9 +284,9 @@ STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
 
     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_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) {
+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_key, ARG_bssid };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -334,16 +334,16 @@ STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_wlan_connect_obj, 1, network_wlan_connect);
+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) {
+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_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) {
+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 == ESP_IF_WIFI_STA) {
@@ -405,9 +405,9 @@ STATIC mp_obj_t network_wlan_status(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_wlan_status_obj, 1, 2, network_wlan_status);
+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) {
+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));
@@ -448,9 +448,9 @@ STATIC mp_obj_t network_wlan_scan(mp_obj_t self_in) {
     }
     return list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_wlan_scan_obj, network_wlan_scan);
+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) {
+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 == ESP_IF_WIFI_STA) {
         return mp_obj_new_bool(wifi_sta_connected);
@@ -460,9 +460,9 @@ STATIC mp_obj_t network_wlan_isconnected(mp_obj_t self_in) {
         return mp_obj_new_bool(sta.num != 0);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_wlan_isconnected_obj, network_wlan_isconnected);
+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) {
+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"));
     }
@@ -697,7 +697,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
 }
 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[] = {
+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) },
@@ -712,7 +712,7 @@ STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(WIFI_PS_MIN_MODEM) },
     { MP_ROM_QSTR(MP_QSTR_PM_POWERSAVE), MP_ROM_INT(WIFI_PS_MAX_MODEM) },
 };
-STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
+static MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp_network_wlan_type,
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index b82a638a5b27a..863301143d9ac 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -37,7 +37,7 @@
 #include "driver/uart.h" // For uart_get_sclk_freq()
 #include "hal/uart_hal.h"
 
-STATIC void uart_irq_handler(void *arg);
+static void uart_irq_handler(void *arg);
 
 // Declaring the HAL structure on the stack saves a tiny amount of static RAM
 #define REPL_HAL_DEFN() { .dev = UART_LL_GET_HW(MICROPY_HW_UART_REPL) }
@@ -99,7 +99,7 @@ int uart_stdout_tx_strn(const char *str, size_t len) {
 }
 
 // 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) {
+static void IRAM_ATTR uart_irq_handler(void *arg) {
     uint8_t rbuf[SOC_UART_FIFO_LEN];
     int len;
     uart_hal_context_t repl_hal = REPL_HAL_DEFN();
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 6f158058d9acc..75588f73b72b7 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -36,7 +36,7 @@
 #include "extmod/misc.h"
 #include "shared/runtime/pyexec.h"
 
-STATIC byte stdin_ringbuf_array[256];
+static byte stdin_ringbuf_array[256];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 void mp_hal_debug_tx_strn_cooked(void *env, const char *str, uint32_t len);
 const mp_print_t mp_debug_print = {NULL, mp_hal_debug_tx_strn_cooked};
diff --git a/ports/esp8266/esppwm.c b/ports/esp8266/esppwm.c
index d7ac44a1786c8..be11272c48f00 100644
--- a/ports/esp8266/esppwm.c
+++ b/ports/esp8266/esppwm.c
@@ -41,23 +41,23 @@ struct pwm_param {
     uint16_t duty[PWM_CHANNEL];
 };
 
-STATIC const uint8_t pin_num[PWM_CHANNEL] = {0, 2, 4, 5, 12, 13, 14, 15};
+static const uint8_t pin_num[PWM_CHANNEL] = {0, 2, 4, 5, 12, 13, 14, 15};
 
-STATIC struct pwm_single_param pwm_single_toggle[2][PWM_CHANNEL + 1];
-STATIC struct pwm_single_param *pwm_single;
+static struct pwm_single_param pwm_single_toggle[2][PWM_CHANNEL + 1];
+static struct pwm_single_param *pwm_single;
 
-STATIC struct pwm_param pwm;
+static struct pwm_param pwm;
 
-STATIC int8_t pwm_out_io_num[PWM_CHANNEL] = {-1, -1, -1, -1, -1, -1, -1, -1};
+static int8_t pwm_out_io_num[PWM_CHANNEL] = {-1, -1, -1, -1, -1, -1, -1, -1};
 
-STATIC uint8_t pwm_channel_toggle[2];
-STATIC uint8_t *pwm_channel;
-STATIC uint8_t pwm_toggle = 1;
-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;
+static uint8_t pwm_channel_toggle[2];
+static uint8_t *pwm_channel;
+static uint8_t pwm_toggle = 1;
+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)          \
@@ -81,7 +81,7 @@ typedef enum {
     TM_EDGE_INT   = 0,
 } TIMER_INT_MODE;
 
-STATIC void ICACHE_FLASH_ATTR
+static void ICACHE_FLASH_ATTR
 pwm_insert_sort(struct pwm_single_param pwm[], uint8 n) {
     uint8 i;
 
@@ -106,7 +106,7 @@ pwm_insert_sort(struct pwm_single_param pwm[], uint8 n) {
     }
 }
 
-STATIC volatile uint8 critical = 0;
+static volatile uint8 critical = 0;
 
 #define LOCK_PWM(c)  do {                       \
         while ((c) == 1);                            \
@@ -298,7 +298,7 @@ pwm_get_freq(uint8 channel) {
  * Parameters   : NONE
  * Returns      : NONE
 *******************************************************************************/
-STATIC void ICACHE_RAM_ATTR
+static void ICACHE_RAM_ATTR
 pwm_tim1_intr_handler(void *dummy) {
     (void)dummy;
 
diff --git a/ports/esp8266/lexerstr32.c b/ports/esp8266/lexerstr32.c
index a921efbbdcec5..51d5658e43dc3 100644
--- a/ports/esp8266/lexerstr32.c
+++ b/ports/esp8266/lexerstr32.c
@@ -35,7 +35,7 @@ typedef struct _mp_lexer_str32_buf_t {
     uint8_t byte_off;
 } mp_lexer_str32_buf_t;
 
-STATIC mp_uint_t str32_buf_next_byte(void *sb_in) {
+static mp_uint_t str32_buf_next_byte(void *sb_in) {
     mp_lexer_str32_buf_t *sb = (mp_lexer_str32_buf_t *)sb_in;
     byte c = sb->val & 0xff;
     if (c == 0) {
@@ -52,7 +52,7 @@ STATIC mp_uint_t str32_buf_next_byte(void *sb_in) {
     return c;
 }
 
-STATIC void str32_buf_free(void *sb_in) {
+static void str32_buf_free(void *sb_in) {
     mp_lexer_str32_buf_t *sb = (mp_lexer_str32_buf_t *)sb_in;
     m_del_obj(mp_lexer_str32_buf_t, sb);
 }
diff --git a/ports/esp8266/machine_adc.c b/ports/esp8266/machine_adc.c
index 83384eea971a8..840b5ac6cd77d 100644
--- a/ports/esp8266/machine_adc.c
+++ b/ports/esp8266/machine_adc.c
@@ -37,10 +37,10 @@ typedef struct _machine_adc_obj_t {
     bool isvdd;
 } machine_adc_obj_t;
 
-STATIC machine_adc_obj_t machine_adc_vdd3 = {{&machine_adc_type}, true};
-STATIC machine_adc_obj_t machine_adc_adc = {{&machine_adc_type}, false};
+static machine_adc_obj_t machine_adc_vdd3 = {{&machine_adc_type}, true};
+static machine_adc_obj_t machine_adc_adc = {{&machine_adc_type}, false};
 
-STATIC uint16_t adc_read(machine_adc_obj_t *self) {
+static uint16_t adc_read(machine_adc_obj_t *self) {
     if (self->isvdd) {
         return system_get_vdd33();
     } else {
@@ -48,12 +48,12 @@ STATIC uint16_t adc_read(machine_adc_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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(%u)", self->isvdd);
 }
 
-STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t mp_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, 1, false);
 
     mp_int_t chn = mp_obj_get_int(args[0]);
@@ -69,12 +69,12 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type_in, size_t n_a
 }
 
 // read_u16()
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     uint32_t value = adc_read(self);
     return value * 65535 / 1024;
 }
 
 // Legacy method
-STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
     return adc_read(self);
 }
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index 344197da94720..ec22c7c588c4e 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -61,8 +61,8 @@ typedef struct _pin_irq_obj_t {
     uint16_t phys_port;
 } pin_irq_obj_t;
 
-STATIC void pin_intr_handler_part1(void *arg);
-STATIC void pin_intr_handler_part2(uint32_t status);
+static void pin_intr_handler_part1(void *arg);
+static void pin_intr_handler_part2(uint32_t status);
 
 const pyb_pin_obj_t pyb_pin_obj[16 + 1] = {
     {{&pyb_pin_type}, 0, FUNC_GPIO0, PERIPHS_IO_MUX_GPIO0_U},
@@ -89,7 +89,7 @@ const pyb_pin_obj_t pyb_pin_obj[16 + 1] = {
 uint8_t pin_mode[16 + 1];
 
 // forward declaration
-STATIC const pin_irq_obj_t pin_irq_obj[16];
+static const pin_irq_obj_t pin_irq_obj[16];
 
 void pin_init0(void) {
     ETS_GPIO_INTR_DISABLE();
@@ -242,7 +242,7 @@ void pin_set(uint pin, int value) {
     }
 }
 
-STATIC void pyb_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_pin_obj_t *self = self_in;
 
     // pin name
@@ -250,7 +250,7 @@ STATIC void pyb_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
 }
 
 // pin.init(mode, pull=None, *, value)
-STATIC mp_obj_t pyb_pin_obj_init_helper(pyb_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_pin_obj_init_helper(pyb_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_REQUIRED | MP_ARG_INT },
@@ -334,7 +334,7 @@ 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 pyb_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t pyb_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);
     pyb_pin_obj_t *self = self_in;
     if (n_args == 0) {
@@ -348,33 +348,33 @@ STATIC mp_obj_t pyb_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
 }
 
 // pin.init(mode, pull)
-STATIC mp_obj_t pyb_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pyb_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(pyb_pin_init_obj, 1, pyb_pin_obj_init);
 
 // pin.value([value])
-STATIC mp_obj_t pyb_pin_value(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_pin_value(size_t n_args, const mp_obj_t *args) {
     return pyb_pin_call(args[0], n_args - 1, 0, args + 1);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_pin_value_obj, 1, 2, pyb_pin_value);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_pin_value_obj, 1, 2, pyb_pin_value);
 
-STATIC mp_obj_t pyb_pin_off(mp_obj_t self_in) {
+static mp_obj_t pyb_pin_off(mp_obj_t self_in) {
     pyb_pin_obj_t *self = self_in;
     pin_set(self->phys_port, 0);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_pin_off_obj, pyb_pin_off);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_pin_off_obj, pyb_pin_off);
 
-STATIC mp_obj_t pyb_pin_on(mp_obj_t self_in) {
+static mp_obj_t pyb_pin_on(mp_obj_t self_in) {
     pyb_pin_obj_t *self = self_in;
     pin_set(self->phys_port, 1);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_pin_on_obj, pyb_pin_on);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_pin_on_obj, pyb_pin_on);
 
 // pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
-STATIC mp_obj_t pyb_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_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_obj = mp_const_none} },
@@ -410,10 +410,10 @@ STATIC mp_obj_t pyb_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     // return the irq object
     return MP_OBJ_FROM_PTR(&pin_irq_obj[self->phys_port]);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_pin_irq_obj, 1, pyb_pin_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_pin_irq_obj, 1, pyb_pin_irq);
 
-STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode);
-STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode);
+static mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     (void)errcode;
     pyb_pin_obj_t *self = self_in;
 
@@ -429,7 +429,7 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     return -1;
 }
 
-STATIC const mp_rom_map_elem_t pyb_pin_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&pyb_pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&pyb_pin_value_obj) },
@@ -449,9 +449,9 @@ STATIC const mp_rom_map_elem_t pyb_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_PIN_INTR_NEGEDGE) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_pin_locals_dict, pyb_pin_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_pin_locals_dict, pyb_pin_locals_dict_table);
 
-STATIC const mp_pin_p_t pin_pin_p = {
+static const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
@@ -469,9 +469,9 @@ MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // Pin IRQ object
 
-STATIC const mp_obj_type_t pin_irq_type;
+static const mp_obj_type_t pin_irq_type;
 
-STATIC const pin_irq_obj_t pin_irq_obj[16] = {
+static const pin_irq_obj_t pin_irq_obj[16] = {
     {{&pin_irq_type}, 0},
     {{&pin_irq_type}, 1},
     {{&pin_irq_type}, 2},
@@ -490,14 +490,14 @@ STATIC const pin_irq_obj_t pin_irq_obj[16] = {
     {{&pin_irq_type}, 15},
 };
 
-STATIC mp_obj_t pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     pin_irq_obj_t *self = self_in;
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
     pin_intr_handler_part2(1 << self->phys_port);
     return mp_const_none;
 }
 
-STATIC mp_obj_t pin_irq_trigger(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_irq_trigger(size_t n_args, const mp_obj_t *args) {
     pin_irq_obj_t *self = args[0];
     uint32_t orig_trig = GET_TRIGGER(self->phys_port);
     if (n_args == 2) {
@@ -507,15 +507,15 @@ STATIC mp_obj_t pin_irq_trigger(size_t n_args, const mp_obj_t *args) {
     // return original trigger value
     return MP_OBJ_NEW_SMALL_INT(orig_trig);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_irq_trigger_obj, 1, 2, pin_irq_trigger);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_irq_trigger_obj, 1, 2, pin_irq_trigger);
 
-STATIC const mp_rom_map_elem_t pin_irq_locals_dict_table[] = {
+static const mp_rom_map_elem_t pin_irq_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_trigger),  MP_ROM_PTR(&pin_irq_trigger_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pin_irq_locals_dict, pin_irq_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pin_irq_locals_dict, pin_irq_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     pin_irq_type,
     MP_QSTR_IRQ,
     MP_TYPE_FLAG_NONE,
diff --git a/ports/esp8266/machine_pwm.c b/ports/esp8266/machine_pwm.c
index b9e499d252bc1..25a2d6898f7c7 100644
--- a/ports/esp8266/machine_pwm.c
+++ b/ports/esp8266/machine_pwm.c
@@ -38,14 +38,14 @@ typedef struct _machine_pwm_obj_t {
     int32_t duty_ns;
 } machine_pwm_obj_t;
 
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty);
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty);
 
-STATIC bool pwm_inited = false;
+static bool pwm_inited = false;
 
 /******************************************************************************/
 // 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) {
+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) {
@@ -55,7 +55,7 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     mp_printf(print, ")");
 }
 
-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) {
+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, ARG_duty_u16, ARG_duty_ns };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_freq, MP_ARG_INT, {.u_int = -1} },
@@ -96,7 +96,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, c
     pwm_start();
 }
 
-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) {
+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]);
 
@@ -121,17 +121,17 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     pwm_delete(self->channel);
     self->active = 0;
     pwm_start();
 }
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+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 void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     pwm_set_freq(freq, 0);
     if (self->duty_ns != -1) {
         mp_machine_pwm_duty_set_ns(self, self->duty_ns);
@@ -140,7 +140,7 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     }
 }
 
-STATIC void set_active(machine_pwm_obj_t *self, bool set_pin) {
+static void set_active(machine_pwm_obj_t *self, bool set_pin) {
     if (!self->active) {
         pwm_add(self->pin->phys_port, self->pin->periph, self->pin->func);
         self->active = 1;
@@ -150,37 +150,37 @@ STATIC void set_active(machine_pwm_obj_t *self, bool set_pin) {
     }
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     set_active(self, true);
     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) {
+static void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     set_active(self, false);
     self->duty_ns = -1;
     pwm_set_duty(duty, self->channel);
     pwm_start();
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     set_active(self, true);
     return MP_OBJ_NEW_SMALL_INT(pwm_get_duty(self->channel) * 65536 / 1024);
 }
 
-STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
     set_active(self, false);
     self->duty_ns = -1;
     pwm_set_duty(duty * 1024 / 65536, self->channel);
     pwm_start();
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     set_active(self, true);
     uint32_t freq = pwm_get_freq(0);
     return MP_OBJ_NEW_SMALL_INT(pwm_get_duty(self->channel) * 976563 / freq);
 }
 
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
     set_active(self, false);
     self->duty_ns = duty;
     uint32_t freq = pwm_get_freq(0);
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index d8cbb8f8247dc..9c4d46f370f42 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -45,14 +45,14 @@ typedef struct _pyb_rtc_obj_t {
 #define MEM_USER_MAXLEN     (512 - (MEM_USER_DATA_ADDR - MEM_DELTA_ADDR) * 4)
 
 // singleton RTC object
-STATIC const pyb_rtc_obj_t pyb_rtc_obj = {{&pyb_rtc_type}};
+static const pyb_rtc_obj_t pyb_rtc_obj = {{&pyb_rtc_type}};
 
 // ALARM0 state
 uint32_t pyb_rtc_alarm0_wake; // see MACHINE_WAKE_xxx constants
 uint64_t pyb_rtc_alarm0_expiry; // in microseconds
 
 // RTC overflow checking
-STATIC uint32_t rtc_last_ticks;
+static uint32_t rtc_last_ticks;
 
 void mp_hal_rtc_init(void) {
     uint32_t magic;
@@ -76,7 +76,7 @@ void mp_hal_rtc_init(void) {
     pyb_rtc_alarm0_expiry = 0;
 }
 
-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 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);
 
@@ -124,7 +124,7 @@ void rtc_prepare_deepsleep(uint64_t 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) {
+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_epoch() / 1000;
@@ -161,9 +161,9 @@ STATIC mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
 
-STATIC mp_obj_t pyb_rtc_memory(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_rtc_memory(size_t n_args, const mp_obj_t *args) {
     uint8_t rtcram[MEM_USER_MAXLEN];
     uint32_t len;
 
@@ -198,9 +198,9 @@ STATIC mp_obj_t pyb_rtc_memory(size_t n_args, const mp_obj_t *args) {
     }
 
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_memory_obj, 1, 2, pyb_rtc_memory);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_memory_obj, 1, 2, pyb_rtc_memory);
 
-STATIC mp_obj_t pyb_rtc_alarm(mp_obj_t self_in, mp_obj_t alarm_id, mp_obj_t time_in) {
+static mp_obj_t pyb_rtc_alarm(mp_obj_t self_in, mp_obj_t alarm_id, mp_obj_t time_in) {
     (void)self_in; // unused
 
     // check we want alarm0
@@ -214,9 +214,9 @@ STATIC mp_obj_t pyb_rtc_alarm(mp_obj_t self_in, mp_obj_t alarm_id, mp_obj_t time
     return mp_const_none;
 
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_rtc_alarm_obj, pyb_rtc_alarm);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_rtc_alarm_obj, pyb_rtc_alarm);
 
-STATIC mp_obj_t pyb_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
     // check we want alarm0
     if (n_args > 1 && mp_obj_get_int(args[1]) != 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid alarm"));
@@ -229,9 +229,9 @@ STATIC mp_obj_t pyb_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_int((pyb_rtc_alarm0_expiry - now) / 1000);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_alarm_left_obj, 1, 2, pyb_rtc_alarm_left);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_alarm_left_obj, 1, 2, pyb_rtc_alarm_left);
 
-STATIC mp_obj_t pyb_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_trigger, ARG_wake };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_trigger, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -250,9 +250,9 @@ STATIC mp_obj_t pyb_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_irq_obj, 1, pyb_rtc_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_irq_obj, 1, pyb_rtc_irq);
 
-STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
+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) },
     { MP_ROM_QSTR(MP_QSTR_memory), MP_ROM_PTR(&pyb_rtc_memory_obj) },
     { MP_ROM_QSTR(MP_QSTR_alarm), MP_ROM_PTR(&pyb_rtc_alarm_obj) },
@@ -260,7 +260,7 @@ STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_rtc_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_ALARM0), MP_ROM_INT(0) },
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_rtc_type,
diff --git a/ports/esp8266/machine_spi.c b/ports/esp8266/machine_spi.c
index b7f8ecf240010..68a6b82ed381e 100644
--- a/ports/esp8266/machine_spi.c
+++ b/ports/esp8266/machine_spi.c
@@ -48,7 +48,7 @@ typedef struct _machine_spi_obj_t {
     uint8_t phase;
 } machine_spi_obj_t;
 
-STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+static void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     (void)self_in;
 
     if (dest == NULL) {
@@ -94,13 +94,13 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
 /******************************************************************************/
 // MicroPython bindings for HSPI
 
-STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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, "HSPI(id=1, baudrate=%u, polarity=%u, phase=%u)",
         self->baudrate, 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) {
+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) {
     machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
 
     enum { ARG_baudrate, ARG_polarity, ARG_phase };
@@ -170,7 +170,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC const mp_machine_spi_p_t machine_spi_p = {
+static const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
     .transfer = machine_spi_transfer,
 };
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index eaaa8ac865991..7c9b071a1a595 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -47,7 +47,7 @@ typedef struct _machine_uart_obj_t {
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
 } machine_uart_obj_t;
 
-STATIC const char *_parity_name[] = {"None", "1", "0"};
+static const char *_parity_name[] = {"None", "1", "0"};
 
 /******************************************************************************/
 // MicroPython bindings for UART
@@ -55,14 +55,14 @@ STATIC const char *_parity_name[] = {"None", "1", "0"};
 // The UART class doesn't have any constants for this port.
 #define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
 
-STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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=%u, timeout=%u, timeout_char=%u)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
         self->stop, uart0_get_rxbuf_len() - 1, self->timeout, self->timeout_char);
 }
 
-STATIC void mp_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 void mp_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_rxbuf, ARG_timeout, ARG_timeout_char };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 0} },
@@ -190,7 +190,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     uart_setup(self->uart_id);
 }
 
-STATIC mp_obj_t mp_machine_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 mp_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 id
@@ -217,19 +217,19 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     (void)self;
 }
 
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     return uart_rx_any(self->uart_id);
 }
 
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     return uart_txdone(self->uart_id);
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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);
 
     if (self->uart_id == 1) {
@@ -258,7 +258,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     }
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
 
@@ -279,7 +279,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index 074ee56598cf7..f9399e63ad3eb 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -34,9 +34,9 @@ typedef struct _machine_wdt_obj_t {
     mp_obj_base_t base;
 } machine_wdt_obj_t;
 
-STATIC machine_wdt_obj_t wdt_default = {{&machine_wdt_type}};
+static machine_wdt_obj_t wdt_default = {{&machine_wdt_type}};
 
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     // The timeout on ESP8266 is fixed, so raise an exception if the argument is not the default.
     if (timeout_ms != 5000) {
         mp_raise_ValueError(NULL);
@@ -52,7 +52,7 @@ STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t
     }
 }
 
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     (void)self;
     system_soft_wdt_feed();
 }
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index d774bbd35a7e3..2dd7c1dece3a4 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -47,9 +47,9 @@
 #include "modespnow.h"
 #endif
 
-STATIC char heap[38 * 1024];
+static char heap[38 * 1024];
 
-STATIC void mp_reset(void) {
+static void mp_reset(void) {
     mp_stack_set_top((void *)0x40000000);
     mp_stack_set_limit(8192);
     mp_hal_init();
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index 95595faebc792..f303da1a33289 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -46,7 +46,7 @@ void error_check(bool status, mp_rom_error_text_t msg) {
     }
 }
 
-STATIC mp_obj_t esp_osdebug(mp_obj_t val) {
+static mp_obj_t esp_osdebug(mp_obj_t val) {
     if (val == mp_const_none) {
         uart_os_config(-1);
     } else {
@@ -54,9 +54,9 @@ STATIC mp_obj_t esp_osdebug(mp_obj_t val) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_osdebug_obj, esp_osdebug);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_osdebug_obj, esp_osdebug);
 
-STATIC mp_obj_t esp_sleep_type(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_sleep_type(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return mp_obj_new_int(wifi_get_sleep_type());
     } else {
@@ -64,9 +64,9 @@ STATIC mp_obj_t esp_sleep_type(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_sleep_type_obj, 0, 1, esp_sleep_type);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_sleep_type_obj, 0, 1, esp_sleep_type);
 
-STATIC mp_obj_t esp_deepsleep(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_deepsleep(size_t n_args, const mp_obj_t *args) {
     uint32_t sleep_us = n_args > 0 ? mp_obj_get_int(args[0]) : 0;
     // prepare for RTC reset at wake up
     rtc_prepare_deepsleep(sleep_us);
@@ -74,14 +74,14 @@ STATIC mp_obj_t esp_deepsleep(size_t n_args, const mp_obj_t *args) {
     system_deep_sleep(sleep_us);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_deepsleep_obj, 0, 2, esp_deepsleep);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_deepsleep_obj, 0, 2, esp_deepsleep);
 
-STATIC mp_obj_t esp_flash_id() {
+static mp_obj_t esp_flash_id() {
     return mp_obj_new_int(spi_flash_get_id());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_id_obj, esp_flash_id);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_id_obj, esp_flash_id);
 
-STATIC mp_obj_t esp_flash_read(mp_obj_t offset_in, mp_obj_t len_or_buf_in) {
+static mp_obj_t esp_flash_read(mp_obj_t offset_in, mp_obj_t len_or_buf_in) {
     mp_int_t offset = mp_obj_get_int(offset_in);
 
     mp_int_t len;
@@ -111,9 +111,9 @@ STATIC mp_obj_t esp_flash_read(mp_obj_t offset_in, mp_obj_t len_or_buf_in) {
     }
     mp_raise_OSError(res == SPI_FLASH_RESULT_TIMEOUT ? MP_ETIMEDOUT : MP_EIO);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_read_obj, esp_flash_read);
+static MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_read_obj, esp_flash_read);
 
-STATIC mp_obj_t esp_flash_write(mp_obj_t offset_in, const mp_obj_t buf_in) {
+static mp_obj_t esp_flash_write(mp_obj_t offset_in, const 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);
@@ -128,9 +128,9 @@ STATIC mp_obj_t esp_flash_write(mp_obj_t offset_in, const mp_obj_t buf_in) {
     }
     mp_raise_OSError(res == SPI_FLASH_RESULT_TIMEOUT ? MP_ETIMEDOUT : MP_EIO);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_write_obj, esp_flash_write);
+static MP_DEFINE_CONST_FUN_OBJ_2(esp_flash_write_obj, esp_flash_write);
 
-STATIC mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
+static mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
     mp_int_t sector = mp_obj_get_int(sector_in);
     ets_loop_iter(); // flash access takes time so run any pending tasks
     SpiFlashOpResult res = spi_flash_erase_sector(sector);
@@ -140,9 +140,9 @@ STATIC mp_obj_t esp_flash_erase(mp_obj_t sector_in) {
     }
     mp_raise_OSError(res == SPI_FLASH_RESULT_TIMEOUT ? MP_ETIMEDOUT : MP_EIO);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_flash_erase_obj, esp_flash_erase);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_flash_erase_obj, esp_flash_erase);
 
-STATIC mp_obj_t esp_flash_size(void) {
+static mp_obj_t esp_flash_size(void) {
     extern char flashchip;
     // For SDK 1.5.2, either address has shifted and not mirrored in
     // eagle.rom.addr.v6.ld, or extra initial member was added.
@@ -157,7 +157,7 @@ STATIC mp_obj_t esp_flash_size(void) {
     #endif
     return mp_obj_new_int_from_uint(flash->chip_size);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
 
 // If there's just 1 loadable segment at the start of flash,
 // we assume there's a yaota8266 bootloader.
@@ -165,12 +165,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
 
 extern byte _firmware_size[];
 
-STATIC mp_obj_t esp_flash_user_start(void) {
+static mp_obj_t esp_flash_user_start(void) {
     return MP_OBJ_NEW_SMALL_INT((uint32_t)_firmware_size);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_user_start_obj, esp_flash_user_start);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_user_start_obj, esp_flash_user_start);
 
-STATIC mp_obj_t esp_check_fw(void) {
+static mp_obj_t esp_check_fw(void) {
     MD5_CTX ctx;
     char *fw_start = (char *)0x40200000;
     if (IS_OTA_FIRMWARE()) {
@@ -195,10 +195,10 @@ STATIC mp_obj_t esp_check_fw(void) {
     printf("\n");
     return mp_obj_new_bool(memcmp(digest, fw_start + size, sizeof(digest)) == 0);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_check_fw_obj, esp_check_fw);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_check_fw_obj, esp_check_fw);
 
 #if MICROPY_ESP8266_APA102
-STATIC mp_obj_t esp_apa102_write_(mp_obj_t clockPin, mp_obj_t dataPin, mp_obj_t buf) {
+static mp_obj_t esp_apa102_write_(mp_obj_t clockPin, mp_obj_t dataPin, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
     esp_apa102_write(mp_obj_get_pin(clockPin),
@@ -206,35 +206,35 @@ STATIC mp_obj_t esp_apa102_write_(mp_obj_t clockPin, mp_obj_t dataPin, mp_obj_t
         (uint8_t *)bufinfo.buf, bufinfo.len);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_apa102_write_obj, esp_apa102_write_);
+static MP_DEFINE_CONST_FUN_OBJ_3(esp_apa102_write_obj, esp_apa102_write_);
 #endif
 
-STATIC mp_obj_t esp_freemem() {
+static mp_obj_t esp_freemem() {
     return MP_OBJ_NEW_SMALL_INT(system_get_free_heap_size());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_freemem_obj, esp_freemem);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_freemem_obj, esp_freemem);
 
-STATIC mp_obj_t esp_meminfo() {
+static mp_obj_t esp_meminfo() {
     system_print_meminfo();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_meminfo_obj, esp_meminfo);
+static MP_DEFINE_CONST_FUN_OBJ_0(esp_meminfo_obj, esp_meminfo);
 
-STATIC mp_obj_t esp_malloc(mp_obj_t size_in) {
+static mp_obj_t esp_malloc(mp_obj_t size_in) {
     return MP_OBJ_NEW_SMALL_INT((mp_uint_t)os_malloc(mp_obj_get_int(size_in)));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_malloc_obj, esp_malloc);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_malloc_obj, esp_malloc);
 
-STATIC mp_obj_t esp_free(mp_obj_t addr_in) {
+static mp_obj_t esp_free(mp_obj_t addr_in) {
     os_free((void *)mp_obj_get_int(addr_in));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_free_obj, esp_free);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_free_obj, esp_free);
 
-STATIC mp_obj_t esp_esf_free_bufs(mp_obj_t idx_in) {
+static mp_obj_t esp_esf_free_bufs(mp_obj_t idx_in) {
     return MP_OBJ_NEW_SMALL_INT(ets_esf_free_bufs(mp_obj_get_int(idx_in)));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_esf_free_bufs_obj, esp_esf_free_bufs);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_esf_free_bufs_obj, esp_esf_free_bufs);
 
 #if MICROPY_EMIT_XTENSA || MICROPY_EMIT_INLINE_XTENSA
 
@@ -257,11 +257,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_esf_free_bufs_obj, esp_esf_free_bufs);
 #define ESP_NATIVE_CODE_FLASH (1)
 
 extern uint32_t _lit4_end;
-STATIC uint32_t esp_native_code_location;
-STATIC uint32_t esp_native_code_start;
-STATIC uint32_t esp_native_code_end;
-STATIC uint32_t esp_native_code_cur;
-STATIC uint32_t esp_native_code_erased;
+static uint32_t esp_native_code_location;
+static uint32_t esp_native_code_start;
+static uint32_t esp_native_code_end;
+static uint32_t esp_native_code_cur;
+static uint32_t esp_native_code_erased;
 
 void esp_native_code_init(void) {
     esp_native_code_location = ESP_NATIVE_CODE_IRAM1;
@@ -317,7 +317,7 @@ void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     return dest;
 }
 
-STATIC mp_obj_t esp_set_native_code_location(mp_obj_t start_in, mp_obj_t len_in) {
+static mp_obj_t esp_set_native_code_location(mp_obj_t start_in, mp_obj_t len_in) {
     if (start_in == mp_const_none && len_in == mp_const_none) {
         // use end of iram1 region
         esp_native_code_init();
@@ -335,11 +335,11 @@ STATIC mp_obj_t esp_set_native_code_location(mp_obj_t start_in, mp_obj_t len_in)
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_set_native_code_location_obj, esp_set_native_code_location);
+static MP_DEFINE_CONST_FUN_OBJ_2(esp_set_native_code_location_obj, esp_set_native_code_location);
 
 #endif
 
-STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
+static const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp) },
 
     { MP_ROM_QSTR(MP_QSTR_osdebug), MP_ROM_PTR(&esp_osdebug_obj) },
@@ -371,7 +371,7 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(esp_module_globals, esp_module_globals_table);
+static MP_DEFINE_CONST_DICT(esp_module_globals, esp_module_globals_table);
 
 const mp_obj_module_t esp_module = {
     .base = { &mp_type_module },
diff --git a/ports/esp8266/modespnow.c b/ports/esp8266/modespnow.c
index 170e488c10a04..91510a3f9df14 100644
--- a/ports/esp8266/modespnow.c
+++ b/ports/esp8266/modespnow.c
@@ -142,21 +142,21 @@ static esp_espnow_obj_t *_get_singleton_initialised() {
 
 // Allocate and initialise the ESPNow module as a singleton.
 // Returns the initialised espnow_singleton.
-STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
+static mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
     size_t n_kw, const mp_obj_t *all_args) {
 
     return _get_singleton();
 }
 
 // Forward declare the send and recv ESPNow callbacks
-STATIC void send_cb(uint8_t *mac_addr, uint8_t status);
+static void send_cb(uint8_t *mac_addr, uint8_t status);
 
-STATIC void recv_cb(uint8_t *mac_addr, uint8_t *data, uint8_t len);
+static void recv_cb(uint8_t *mac_addr, uint8_t *data, uint8_t len);
 
 // ESPNow.deinit(): De-initialise the ESPNOW software stack, disable callbacks
 // and deallocate the recv data buffers.
 // Note: this function is called from main.c:mp_task() to cleanup before soft
-// reset, so cannot be declared STATIC and must guard against self == NULL;.
+// reset, so cannot be declared static and must guard against self == NULL;.
 mp_obj_t espnow_deinit(mp_obj_t _) {
     esp_espnow_obj_t *self = _get_singleton();
     if (self->recv_buffer != NULL) {
@@ -174,7 +174,7 @@ mp_obj_t espnow_deinit(mp_obj_t _) {
 // Initialise the Espressif ESPNOW software stack, register callbacks and
 // allocate the recv data buffers.
 // Returns True if interface is active, else False.
-STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = args[0];
     if (n_args > 1) {
         if (mp_obj_is_true(args[1])) {
@@ -193,13 +193,13 @@ STATIC mp_obj_t espnow_active(size_t n_args, const mp_obj_t *args) {
     }
     return mp_obj_new_bool(self->recv_buffer != NULL);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_active);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_active_obj, 1, 2, espnow_active);
 
 // ESPNow.config(): Initialise the data buffers and ESP-NOW functions.
 // Initialise the Espressif ESPNOW software stack, register callbacks and
 // allocate the recv data buffers.
 // Returns True if interface is active, else False.
-STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     esp_espnow_obj_t *self = _get_singleton();
     enum { ARG_rxbuf, ARG_timeout_ms };
     static const mp_arg_t allowed_args[] = {
@@ -217,7 +217,7 @@ STATIC mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
 
 // ### The ESP_Now send and recv callback routines
 //
@@ -225,7 +225,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_config_obj, 1, espnow_config);
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send()/write() logic.
-STATIC void send_cb(uint8_t *mac_addr, uint8_t status) {
+static void send_cb(uint8_t *mac_addr, uint8_t status) {
     esp_espnow_obj_t *self = _get_singleton();
     self->tx_responses++;
     if (status != ESP_NOW_SEND_SUCCESS) {
@@ -238,7 +238,7 @@ STATIC void send_cb(uint8_t *mac_addr, uint8_t status) {
 // ESPNow packet.
 // If the buffer is full, drop the message and increment the dropped count.
 // Schedules the user callback if one has been registered (ESPNow.config()).
-STATIC void recv_cb(uint8_t *mac_addr, uint8_t *msg, uint8_t msg_len) {
+static void recv_cb(uint8_t *mac_addr, uint8_t *msg, uint8_t msg_len) {
     esp_espnow_obj_t *self = _get_singleton();
     ringbuf_t *buf = self->recv_buffer;
     // TODO: Test this works with ">".
@@ -298,7 +298,7 @@ static int ringbuf_get_bytes_wait(ringbuf_t *r, uint8_t *data, size_t len, mp_in
 //      buffers: list of bytearrays to store values: [peer, message].
 // Default timeout is set with ESPNow.config(timeout=milliseconds).
 // Return (None, None) on timeout.
-STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     size_t timeout_ms = ((n_args > 2 && args[2] != mp_const_none)
@@ -339,7 +339,7 @@ STATIC mp_obj_t espnow_recvinto(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_NEW_SMALL_INT(msg_len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recvinto_obj, 2, 3, espnow_recvinto);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_recvinto_obj, 2, 3, espnow_recvinto);
 
 // Used by espnow_send() for sends() with sync==True.
 // Wait till all pending sent packet responses have been received.
@@ -365,7 +365,7 @@ static void _wait_for_pending_responses(esp_espnow_obj_t *self) {
 //   True  if sync==True and message is received successfully by all recipients
 //   False if sync==True and message is not received by at least one recipient
 // Raises: EAGAIN if the internal espnow buffers are full.
-STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
     esp_espnow_obj_t *self = _get_singleton_initialised();
 
     bool sync = n_args <= 3 || args[3] == mp_const_none || mp_obj_is_true(args[3]);
@@ -402,7 +402,7 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *args) {
     // Return False if sync and any peers did not respond.
     return mp_obj_new_bool(!(sync && self->tx_failures != saved_failures));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 3, 4, espnow_send);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 3, 4, espnow_send);
 
 // ### Peer Management Functions
 //
@@ -410,11 +410,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 3, 4, espnow_send);
 // Set the ESP-NOW Primary Master Key (pmk) (for encrypted communications).
 // Raise OSError if not initialised.
 // Raise ValueError if key is not a bytes-like object exactly 16 bytes long.
-STATIC mp_obj_t espnow_set_pmk(mp_obj_t _, mp_obj_t key) {
+static mp_obj_t espnow_set_pmk(mp_obj_t _, mp_obj_t key) {
     check_esp_err(esp_now_set_kok(_get_bytes_len(key, ESP_NOW_KEY_LEN), ESP_NOW_KEY_LEN));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
+static MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
 
 // ESPNow.add_peer(peer_mac, [lmk, [channel, [ifidx, [encrypt]]]])
 // Positional args set to None will be left at defaults.
@@ -422,7 +422,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk);
 // Raise ValueError if mac or LMK are not bytes-like objects or wrong length.
 // Raise TypeError if invalid keyword args or too many positional args.
 // Return None.
-STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args) {
     check_esp_err(
         esp_now_add_peer(
             _get_bytes_len(args[1], ESP_NOW_ETH_ALEN),
@@ -433,19 +433,19 @@ STATIC mp_obj_t espnow_add_peer(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_add_peer_obj, 2, 4, espnow_add_peer);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_add_peer_obj, 2, 4, espnow_add_peer);
 
 // ESPNow.del_peer(peer_mac): Unregister peer_mac.
 // Raise OSError if not initialised.
 // Raise ValueError if peer is not a bytes-like objects or wrong length.
 // Return None.
-STATIC mp_obj_t espnow_del_peer(mp_obj_t _, mp_obj_t peer) {
+static mp_obj_t espnow_del_peer(mp_obj_t _, mp_obj_t peer) {
     esp_now_del_peer(_get_bytes_len(peer, ESP_NOW_ETH_ALEN));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_del_peer_obj, espnow_del_peer);
+static MP_DEFINE_CONST_FUN_OBJ_2(espnow_del_peer_obj, espnow_del_peer);
 
-STATIC const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
+static const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&espnow_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&espnow_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_recvinto), MP_ROM_PTR(&espnow_recvinto_obj) },
@@ -456,9 +456,9 @@ STATIC const mp_rom_map_elem_t esp_espnow_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_add_peer), MP_ROM_PTR(&espnow_add_peer_obj) },
     { MP_ROM_QSTR(MP_QSTR_del_peer), MP_ROM_PTR(&espnow_del_peer_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(esp_espnow_locals_dict, esp_espnow_locals_dict_table);
+static MP_DEFINE_CONST_DICT(esp_espnow_locals_dict, esp_espnow_locals_dict_table);
 
-STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
+static const mp_rom_map_elem_t espnow_globals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__espnow) },
     { MP_ROM_QSTR(MP_QSTR_ESPNowBase), MP_ROM_PTR(&esp_espnow_type) },
     { MP_ROM_QSTR(MP_QSTR_MAX_DATA_LEN), MP_ROM_INT(ESP_NOW_MAX_DATA_LEN)},
@@ -467,13 +467,13 @@ STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MAX_TOTAL_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_TOTAL_PEER_NUM)},
     { MP_ROM_QSTR(MP_QSTR_MAX_ENCRYPT_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_ENCRYPT_PEER_NUM)},
 };
-STATIC MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
+static MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
 
 // ### Dummy Buffer Protocol support
 // ...so asyncio can poll.ipoll() on this device
 
 // Support ioctl(MP_STREAM_POLL, ) for asyncio
-STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request,
+static mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request,
     uintptr_t arg, int *errcode) {
     if (request != MP_STREAM_POLL) {
         *errcode = MP_EINVAL;
@@ -484,7 +484,7 @@ STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request,
            arg ^ ((ringbuf_avail(self->recv_buffer) == 0) ? MP_STREAM_POLL_RD : 0);
 }
 
-STATIC const mp_stream_p_t espnow_stream_p = {
+static const mp_stream_p_t espnow_stream_p = {
     .ioctl = espnow_stream_ioctl,
 };
 
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 3cf5e3dd3bc54..23ccf8cebfb0d 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -59,11 +59,11 @@
     { MP_ROM_QSTR(MP_QSTR_WDT_RESET), MP_ROM_INT(REASON_WDT_RST) }, \
     { MP_ROM_QSTR(MP_QSTR_SOFT_RESET), MP_ROM_INT(REASON_SOFT_RESTART) }, \
 
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     return mp_obj_new_int(system_get_cpu_freq() * 1000000);
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
     if (freq != 80 && freq != 160) {
         mp_raise_ValueError(MP_ERROR_TEXT("frequency can only be either 80Mhz or 160MHz"));
@@ -71,7 +71,7 @@ STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     system_update_cpu_freq(freq);
 }
 
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     system_restart();
 
     // we must not return
@@ -80,21 +80,21 @@ NORETURN STATIC void mp_machine_reset(void) {
     }
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     return system_get_rst_info()->reason;
 }
 
-STATIC mp_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     uint32_t id = system_get_chip_id();
     return mp_obj_new_bytes((byte *)&id, sizeof(id));
 }
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     asm ("waiti 0");
     mp_event_handle_nowait(); // handle any events after possibly a long wait (eg feed WDT)
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     uint32_t max_us = 0xffffffff;
     if (n_args == 1) {
         mp_int_t max_ms = mp_obj_get_int(args[0]);
@@ -114,7 +114,7 @@ STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     // default to sleep forever
     uint32_t sleep_us = 0;
 
@@ -172,7 +172,7 @@ typedef struct _esp_timer_obj_t {
     mp_obj_t callback;
 } esp_timer_obj_t;
 
-STATIC void esp_timer_arm_ms(esp_timer_obj_t *self, uint32_t ms, bool repeat) {
+static void esp_timer_arm_ms(esp_timer_obj_t *self, uint32_t ms, bool repeat) {
     if (ms <= ESP_TIMER_MS_MAX) {
         self->remain_ms = 0;
         self->period_ms = 0;
@@ -189,7 +189,7 @@ STATIC void esp_timer_arm_ms(esp_timer_obj_t *self, uint32_t ms, bool repeat) {
     os_timer_arm(&self->timer, ms, repeat);
 }
 
-STATIC void esp_timer_arm_us(esp_timer_obj_t *self, uint32_t us, bool repeat) {
+static void esp_timer_arm_us(esp_timer_obj_t *self, uint32_t us, bool repeat) {
     if (us < ESP_TIMER_US_MIN) {
         us = ESP_TIMER_US_MIN;
     }
@@ -204,18 +204,18 @@ STATIC void esp_timer_arm_us(esp_timer_obj_t *self, uint32_t us, bool repeat) {
 
 const mp_obj_type_t esp_timer_type;
 
-STATIC void esp_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void esp_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     esp_timer_obj_t *self = self_in;
     mp_printf(print, "Timer(%p)", &self->timer);
 }
 
-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) {
+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 = mp_obj_malloc(esp_timer_obj_t, &esp_timer_type);
     return tim;
 }
 
-STATIC void esp_timer_cb(void *arg) {
+static void esp_timer_cb(void *arg) {
     esp_timer_obj_t *self = arg;
     if (self->remain_ms != 0) {
         // Handle periods larger than the maximum system period
@@ -234,7 +234,7 @@ STATIC void esp_timer_cb(void *arg) {
     }
 }
 
-STATIC mp_obj_t esp_timer_init_helper(esp_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t esp_timer_init_helper(esp_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {
         ARG_mode,
         ARG_callback,
@@ -298,26 +298,26 @@ STATIC mp_obj_t esp_timer_init_helper(esp_timer_obj_t *self, size_t n_args, cons
     return mp_const_none;
 }
 
-STATIC mp_obj_t esp_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t esp_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return esp_timer_init_helper(args[0], n_args - 1, args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp_timer_init_obj, 1, esp_timer_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp_timer_init_obj, 1, esp_timer_init);
 
-STATIC mp_obj_t esp_timer_deinit(mp_obj_t self_in) {
+static mp_obj_t esp_timer_deinit(mp_obj_t self_in) {
     esp_timer_obj_t *self = self_in;
     os_timer_disarm(&self->timer);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_timer_deinit_obj, esp_timer_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_timer_deinit_obj, esp_timer_deinit);
 
-STATIC const mp_rom_map_elem_t esp_timer_locals_dict_table[] = {
+static const mp_rom_map_elem_t esp_timer_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp_timer_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&esp_timer_init_obj) },
 //    { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&esp_timer_callback_obj) },
     { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(false) },
     { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(true) },
 };
-STATIC MP_DEFINE_CONST_DICT(esp_timer_locals_dict, esp_timer_locals_dict_table);
+static MP_DEFINE_CONST_DICT(esp_timer_locals_dict, esp_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp_timer_type,
diff --git a/ports/esp8266/modos.c b/ports/esp8266/modos.c
index 32c6a066761ee..8149c087fd24f 100644
--- a/ports/esp8266/modos.c
+++ b/ports/esp8266/modos.c
@@ -31,11 +31,11 @@
 #include "extmod/modmachine.h"
 #include "user_interface.h"
 
-STATIC const char *mp_os_uname_release(void) {
+static const char *mp_os_uname_release(void) {
     return system_get_sdk_version();
 }
 
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -44,7 +44,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
 void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
     if (mp_obj_get_type(stream_attached) == &machine_uart_type) {
diff --git a/ports/esp8266/modtime.c b/ports/esp8266/modtime.c
index 21dd3cbcd9099..090300559751b 100644
--- a/ports/esp8266/modtime.c
+++ b/ports/esp8266/modtime.c
@@ -30,7 +30,7 @@
 #include "modmachine.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     mp_int_t seconds = pyb_rtc_get_us_since_epoch() / 1000 / 1000;
     timeutils_struct_time_t tm;
     timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     // get date and time
     return mp_obj_new_int(pyb_rtc_get_us_since_epoch() / 1000 / 1000);
 }
diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index b0e6b3aeb1753..5838cc8bc6a86 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -48,19 +48,19 @@ typedef struct _wlan_if_obj_t {
 
 void error_check(bool status, const char *msg);
 
-STATIC const wlan_if_obj_t wlan_objs[] = {
+static const wlan_if_obj_t wlan_objs[] = {
     {{&esp_network_wlan_type}, STATION_IF},
     {{&esp_network_wlan_type}, SOFTAP_IF},
 };
 
-STATIC void require_if(mp_obj_t wlan_if, int if_no) {
+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) {
         error_check(false, if_no == STATION_IF ? "STA required" : "AP required");
     }
 }
 
-STATIC mp_obj_t esp_wlan_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 esp_wlan_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);
     int idx = 0;
     if (n_args > 0) {
@@ -72,7 +72,7 @@ STATIC mp_obj_t esp_wlan_make_new(const mp_obj_type_t *type, size_t n_args, size
     return MP_OBJ_FROM_PTR(&wlan_objs[idx]);
 }
 
-STATIC mp_obj_t esp_active(size_t n_args, const mp_obj_t *args) {
+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]);
     uint32_t mode = wifi_get_opmode();
     if (n_args > 1) {
@@ -105,9 +105,9 @@ STATIC mp_obj_t esp_active(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_bool(mode & SOFTAP_MODE);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_active_obj, 1, 2, esp_active);
+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) {
+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_key, ARG_bssid };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -158,16 +158,16 @@ STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp_connect_obj, 1, esp_connect);
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp_connect_obj, 1, esp_connect);
 
-STATIC mp_obj_t esp_disconnect(mp_obj_t self_in) {
+static mp_obj_t esp_disconnect(mp_obj_t self_in) {
     require_if(self_in, STATION_IF);
     error_check(wifi_station_disconnect(), "Cannot disconnect from AP");
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_disconnect_obj, esp_disconnect);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_disconnect_obj, esp_disconnect);
 
-STATIC mp_obj_t esp_status(size_t n_args, const mp_obj_t *args) {
+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) {
         // Get link status
@@ -186,11 +186,11 @@ STATIC mp_obj_t esp_status(size_t n_args, const mp_obj_t *args) {
         mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_status_obj, 1, 2, esp_status);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_status_obj, 1, 2, esp_status);
 
-STATIC mp_obj_t *esp_scan_list = NULL;
+static mp_obj_t *esp_scan_list = NULL;
 
-STATIC void esp_scan_cb(void *result, STATUS status) {
+static void esp_scan_cb(void *result, STATUS status) {
     if (esp_scan_list == NULL) {
         // called unexpectedly
         return;
@@ -228,7 +228,7 @@ STATIC void esp_scan_cb(void *result, STATUS status) {
     esp_scan_list = NULL;
 }
 
-STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
+static mp_obj_t esp_scan(mp_obj_t self_in) {
     require_if(self_in, STATION_IF);
     if ((wifi_get_opmode() & STATION_MODE) == 0) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("STA must be active"));
@@ -252,12 +252,12 @@ STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
     }
     return list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_scan_obj, esp_scan);
+static MP_DEFINE_CONST_FUN_OBJ_1(esp_scan_obj, esp_scan);
 
 /// \method isconnected()
 /// Return True if connected to an AP and an IP address has been assigned,
 ///     false otherwise.
-STATIC mp_obj_t esp_isconnected(mp_obj_t self_in) {
+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 == STATION_IF) {
         if (wifi_station_get_connect_status() == STATION_GOT_IP) {
@@ -271,9 +271,9 @@ STATIC mp_obj_t esp_isconnected(mp_obj_t self_in) {
     return mp_const_false;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_isconnected_obj, esp_isconnected);
+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) {
+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]);
     struct ip_info info;
     ip_addr_t dns_addr;
@@ -328,9 +328,9 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_ifconfig_obj, 1, 2, esp_ifconfig);
+static 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) {
+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"));
     }
@@ -503,9 +503,9 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
 unknown:
     mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp_config_obj, 1, esp_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp_config_obj, 1, esp_config);
 
-STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
+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) },
@@ -521,7 +521,7 @@ STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PM_POWERSAVE), MP_ROM_INT(LIGHT_SLEEP_T) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
+static MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     esp_network_wlan_type,
@@ -531,7 +531,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &wlan_if_locals_dict
     );
 
-STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return mp_obj_new_int(wifi_get_phy_mode());
     } else {
diff --git a/ports/mimxrt/dma_manager.c b/ports/mimxrt/dma_manager.c
index 2890a155864ff..d332c9a1c2888 100644
--- a/ports/mimxrt/dma_manager.c
+++ b/ports/mimxrt/dma_manager.c
@@ -42,7 +42,7 @@ static bool channel_list[FSL_FEATURE_DMAMUX_MODULE_CHANNEL] = {
     #endif
 };
 
-STATIC bool dma_initialized = false;
+static bool dma_initialized = false;
 
 // allocate_channel(): retrieve an available channel. Return the number or -1
 int allocate_dma_channel(void) {
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index ed9db81298094..3eb1a0cc35202 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -177,7 +177,7 @@ static uint8_t hw_addr_1[6]; // The MAC address field
 #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) {
+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;
@@ -197,7 +197,7 @@ STATIC void eth_trace(eth_t *self, size_t len, const void *data, unsigned int fl
     }
 }
 
-STATIC void eth_process_frame(eth_t *self, uint8_t *buf, size_t length) {
+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) {
@@ -240,7 +240,7 @@ void eth_irq_handler(ENET_Type *base, enet_handle_t *handle,
 }
 
 // Configure the ethernet clock
-STATIC uint32_t eth_clock_init(int eth_id, bool phy_clock) {
+static uint32_t eth_clock_init(int eth_id, bool phy_clock) {
 
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
@@ -282,7 +282,7 @@ STATIC uint32_t eth_clock_init(int eth_id, bool phy_clock) {
 }
 
 // eth_gpio_init: Configure the GPIO pins
-STATIC void eth_gpio_init(const iomux_table_t iomux_table[], size_t iomux_table_size,
+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};
@@ -328,7 +328,7 @@ STATIC void eth_gpio_init(const iomux_table_t iomux_table[], size_t iomux_table_
 }
 
 // eth_phy_init: Initilaize the PHY interface
-STATIC void eth_phy_init(phy_handle_t *phyHandle, phy_config_t *phy_config,
+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) {
 
     bool link = false;
@@ -471,12 +471,12 @@ void eth_init_1(eth_t *self, int eth_id, const phy_operations_t *phy_ops, int ph
 
 #endif
 // Initialize the phy interface
-STATIC int eth_mac_init(eth_t *self) {
+static int eth_mac_init(eth_t *self) {
     return 0;
 }
 
 // Deinit the interface
-STATIC void eth_mac_deinit(eth_t *self) {
+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).
 }
@@ -488,7 +488,7 @@ 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) {
+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
@@ -504,7 +504,7 @@ STATIC err_t eth_send_frame_blocking(ENET_Type *base, enet_handle_t *handle, uin
     return status;
 }
 
-STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
+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;
@@ -536,7 +536,7 @@ STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
     return status == kStatus_Success ? ERR_OK : ERR_BUF;
 }
 
-STATIC err_t eth_netif_init(struct netif *netif) {
+static err_t eth_netif_init(struct netif *netif) {
     netif->linkoutput = eth_netif_output;
     netif->output = etharp_output;
     netif->mtu = 1500;
@@ -552,7 +552,7 @@ STATIC err_t eth_netif_init(struct netif *netif) {
     return ERR_OK;
 }
 
-STATIC void eth_lwip_init(eth_t *self) {
+static void eth_lwip_init(eth_t *self) {
     struct netif *n = &self->netif;
     ip_addr_t ipconfig[4];
 
@@ -588,7 +588,7 @@ STATIC void eth_lwip_init(eth_t *self) {
     MICROPY_PY_LWIP_EXIT
 }
 
-STATIC void eth_lwip_deinit(eth_t *self) {
+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) {
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index 0be5f9a7d2beb..29b73a20652ce 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -49,9 +49,9 @@ typedef struct _machine_adc_obj_t {
     uint16_t resolution;
 } machine_adc_obj_t;
 
-STATIC ADC_Type *const adc_bases[] = ADC_BASE_PTRS;
+static ADC_Type *const adc_bases[] = ADC_BASE_PTRS;
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -64,7 +64,7 @@ STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     }
 }
 
-STATIC mp_obj_t mp_machine_adc_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_adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
     // Unpack and check parameter
@@ -99,7 +99,7 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
 
 // read_u16()
 #if defined(MIMXRT117x_SERIES)
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     lpadc_conv_command_config_t adc_config;
     lpadc_conv_trigger_config_t trigger_config;
 
@@ -133,7 +133,7 @@ void machine_adc_init(void) {
 
 #else
 
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     // Initiate conversion
     adc_channel_config_t channel_config = {
         .channelNumber = self->channel,
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index cef17272c4a22..89fe47dbf60c1 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -55,8 +55,8 @@ typedef struct _iomux_table_t {
     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 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)
@@ -80,7 +80,7 @@ bool lpi2c_set_iomux(int8_t hw_i2c, uint8_t drive) {
     }
 }
 
-STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
@@ -133,7 +133,7 @@ static void lpi2c_master_callback(LPI2C_Type *base, lpi2c_master_handle_t *handl
     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) {
+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;
@@ -185,7 +185,7 @@ STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     }
 }
 
-STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+static const mp_machine_i2c_p_t machine_i2c_p = {
     .transfer = mp_machine_i2c_transfer_adaptor,
     .transfer_single = machine_i2c_transfer_single,
 };
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 077c9e76fa8e6..8553cb285b668 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -126,12 +126,12 @@ typedef struct _i2s_clock_config_t {
     uint32_t clock_divider;
 } i2s_clock_config_t;
 
-STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
+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] = {
+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
@@ -143,7 +143,7 @@ STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYT
 
 // Configuration 1: for sampling frequencies [Hz]:  8000, 12000, 16000, 24000, 32000, 48000
 // Clock frequency = 786,432,000 Hz = 48000 * 64 * 256
-STATIC const clock_audio_pll_config_t audioPllConfig_8000_48000 = {
+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 = 76800,         // 30 bit numerator of fractional loop divider
@@ -155,7 +155,7 @@ STATIC const clock_audio_pll_config_t audioPllConfig_8000_48000 = {
 
 // Configuration 2: for sampling frequencies [Hz]:  11025, 22050, 44100
 // Clock frequency = 722,534,400 = 44100 * 64 * 256
-STATIC const clock_audio_pll_config_t audioPllConfig_11025_44100 = {
+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 = 10560,         // 30 bit numerator of fractional loop divider
@@ -170,7 +170,7 @@ STATIC const clock_audio_pll_config_t audioPllConfig_11025_44100 = {
 // 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[] = {
+static const i2s_clock_config_t clock_config_map[] = {
     {kSAI_SampleRate8KHz, &audioPllConfig_8000_48000, 1, 192},     // 384
     {kSAI_SampleRate11025Hz, &audioPllConfig_11025_44100, 1, 128}, // 256
     {kSAI_SampleRate12KHz, &audioPllConfig_8000_48000, 1, 128},    // 256
@@ -182,10 +182,10 @@ STATIC const i2s_clock_config_t clock_config_map[] = {
     {kSAI_SampleRate48KHz, &audioPllConfig_8000_48000, 0, 64}      // 64
 };
 
-STATIC const clock_root_t i2s_clock_mux[] = I2S_CLOCK_MUX;
+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[] = {
+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
@@ -197,18 +197,18 @@ STATIC const i2s_clock_config_t clock_config_map[] = {
     {kSAI_SampleRate48KHz, &audioPllConfig_8000_48000, 0, 63}      // 64
 };
 
-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 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 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;
-AT_NONCACHEABLE_SECTION_ALIGN(STATIC edma_tcd_t edmaTcd[MICROPY_HW_I2S_NUM], 32);
+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(edma_tcd_t edmaTcd[MICROPY_HW_I2S_NUM], 32);
 
 // called on processor reset
 void machine_i2s_init0() {
@@ -228,7 +228,7 @@ void machine_i2s_deinit_all(void) {
     }
 }
 
-STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
+static int8_t get_frame_mapping_index(int8_t bits, format_t format) {
     if (format == MONO) {
         if (bits == 16) {
             return 0;
@@ -244,7 +244,7 @@ STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
     }
 }
 
-STATIC int8_t get_dma_bits(uint16_t mode, int8_t bits) {
+static int8_t get_dma_bits(uint16_t mode, int8_t bits) {
     if (mode == TX) {
         if (bits == 16) {
             return 16;
@@ -258,7 +258,7 @@ STATIC int8_t get_dma_bits(uint16_t mode, int8_t bits) {
     }
 }
 
-STATIC bool lookup_gpio(const machine_pin_obj_t *pin, i2s_pin_function_t fn, uint8_t hw_id, uint16_t *index) {
+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) &&
@@ -270,7 +270,7 @@ STATIC bool lookup_gpio(const machine_pin_obj_t *pin, i2s_pin_function_t fn, uin
     return false;
 }
 
-STATIC bool set_iomux(const machine_pin_obj_t *pin, i2s_pin_function_t fn, uint8_t hw_id) {
+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;
@@ -283,7 +283,7 @@ STATIC bool set_iomux(const machine_pin_obj_t *pin, i2s_pin_function_t fn, uint8
     }
 }
 
-STATIC bool is_rate_supported(int32_t rate) {
+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;
@@ -292,7 +292,7 @@ STATIC bool is_rate_supported(int32_t rate) {
     return false;
 }
 
-STATIC const clock_audio_pll_config_t *get_pll_config(int32_t rate) {
+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;
@@ -301,7 +301,7 @@ STATIC const clock_audio_pll_config_t *get_pll_config(int32_t rate) {
     return 0;
 }
 
-STATIC const uint32_t get_clock_pre_divider(int32_t rate) {
+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;
@@ -310,7 +310,7 @@ STATIC const uint32_t get_clock_pre_divider(int32_t rate) {
     return 0;
 }
 
-STATIC const uint32_t get_clock_divider(int32_t rate) {
+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;
@@ -320,7 +320,7 @@ STATIC const uint32_t get_clock_divider(int32_t rate) {
 }
 
 // function is used in IRQ context
-STATIC void empty_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+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) {
@@ -343,7 +343,7 @@ STATIC void empty_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
 }
 
 // function is used in IRQ context
-STATIC void feed_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+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) {
@@ -387,7 +387,7 @@ STATIC void feed_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
     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) {
+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) {
@@ -423,7 +423,7 @@ STATIC void edma_i2s_callback(edma_handle_t *handle, void *userData, bool transf
     }
 }
 
-STATIC bool i2s_init(machine_i2s_obj_t *self) {
+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);
@@ -570,7 +570,7 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
     return true;
 }
 
-STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
+static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // is Mode valid?
     uint16_t i2s_mode = args[ARG_mode].u_int;
     if ((i2s_mode != (RX)) &&
@@ -667,7 +667,7 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     }
 }
 
-STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
+static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     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);
     }
@@ -694,7 +694,7 @@ STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     return self;
 }
 
-STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     // use self->i2s_inst as in indication that I2S object has already been de-initialized
     if (self->i2s_inst != NULL) {
         EDMA_AbortTransfer(&self->edmaHandle);
@@ -718,7 +718,7 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
     (void)self;
 }
 
diff --git a/ports/mimxrt/machine_led.c b/ports/mimxrt/machine_led.c
index a927c570a2532..2e9b17c883fe8 100644
--- a/ports/mimxrt/machine_led.c
+++ b/ports/mimxrt/machine_led.c
@@ -30,13 +30,13 @@
 
 #if defined(MICROPY_HW_LED1_PIN)
 
-STATIC void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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) {
+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
@@ -51,34 +51,34 @@ STATIC mp_obj_t led_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(&machine_led_obj[led_id - 1]);
 }
 
-STATIC mp_obj_t led_obj_on(mp_obj_t self_in) {
+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_DEFINE_CONST_FUN_OBJ_1(led_obj_on_obj, led_obj_on);
 
-STATIC mp_obj_t led_obj_off(mp_obj_t self_in) {
+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_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
 
-STATIC mp_obj_t led_obj_toggle(mp_obj_t self_in) {
+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 MP_DEFINE_CONST_FUN_OBJ_1(led_obj_toggle_obj, led_obj_toggle);
 
-STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
+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);
+static MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_led_type,
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 3ebccb1755ad8..ad4158c6bdee9 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -39,18 +39,18 @@
 #endif
 
 // 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);
+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 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);
 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);
-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);
+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 {
@@ -75,12 +75,12 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_pin_board_pins_locals_dict
     );
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods;
+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};
+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) {
@@ -254,7 +254,7 @@ void machine_pin_config(const machine_pin_obj_t *self, uint8_t mode,
     }
 }
 
-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_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;
 
@@ -266,7 +266,7 @@ STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint
     }
 }
 
-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 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}},
@@ -326,7 +326,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     return mp_const_none;
 }
 
-STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+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));
@@ -349,43 +349,43 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
 }
 
 // pin.off()
-STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
+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);
+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) {
+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);
+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) {
+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);
+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) {
+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);
+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) {
+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);
 
 // 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) {
+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} },
@@ -452,9 +452,9 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 
     return MP_OBJ_FROM_PTR(irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_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[] = {
+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) },
@@ -491,9 +491,9 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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);
+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) {
+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;
 
@@ -509,7 +509,7 @@ STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return -1;
 }
 
-STATIC const mp_pin_p_t machine_pin_obj_protocol = {
+static const mp_pin_p_t machine_pin_obj_protocol = {
     .ioctl = machine_pin_ioctl,
 };
 
@@ -534,7 +534,7 @@ 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) {
+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)]);
@@ -551,7 +551,7 @@ STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger
     return 0;
 }
 
-STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+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)]);
@@ -563,7 +563,7 @@ STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     return 0;
 }
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+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/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index 98545eec95c51..f9ae5e22edcc3 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -70,9 +70,9 @@ 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 mp_machine_pwm_start(machine_pwm_obj_t *self);
+static void mp_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) {
+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);
@@ -103,7 +103,7 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 
 // Utility functions for decoding and converting
 //
-STATIC uint32_t duty_ns_to_duty_u16(uint32_t freq, uint32_t duty_ns) {
+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));
@@ -111,7 +111,7 @@ STATIC uint32_t duty_ns_to_duty_u16(uint32_t freq, uint32_t duty_ns) {
     return (uint32_t)duty;
 }
 
-STATIC uint8_t module_decode(char channel) {
+static uint8_t module_decode(char channel) {
     switch (channel) {
         case '0':
             return kPWM_Module_0;
@@ -126,7 +126,7 @@ STATIC uint8_t module_decode(char channel) {
     }
 }
 
-STATIC uint8_t channel_decode(char channel) {
+static uint8_t channel_decode(char channel) {
     switch (channel) {
         case 'A':
             return kPWM_PwmA;
@@ -140,7 +140,7 @@ STATIC uint8_t channel_decode(char channel) {
 }
 
 // decode the AF objects module and Port number. 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,
+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;
@@ -158,7 +158,7 @@ STATIC const machine_pin_af_obj_t *af_name_decode_flexpwm(const machine_pin_af_o
 }
 
 #ifdef FSL_FEATURE_SOC_TMR_COUNT
-STATIC uint8_t qtmr_decode(char channel) {
+static uint8_t qtmr_decode(char channel) {
     switch (channel) {
         case '0':
             return kQTMR_Channel_0;
@@ -174,7 +174,7 @@ STATIC uint8_t qtmr_decode(char channel) {
 }
 
 // decode the AF objects module and Port number. 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) {
+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);
@@ -190,7 +190,7 @@ STATIC const machine_pin_af_obj_t *af_name_decode_qtmr(const machine_pin_af_obj_
 }
 #endif
 
-STATIC bool is_board_pin(const machine_pin_obj_t *pin) {
+static bool is_board_pin(const machine_pin_obj_t *pin) {
     const mp_map_t *board_map = &machine_pin_board_pins_locals_dict.map;
     for (uint i = 0; i < board_map->alloc; i++) {
         if (pin == MP_OBJ_TO_PTR(board_map->table[i].value)) {
@@ -202,7 +202,7 @@ STATIC bool is_board_pin(const machine_pin_obj_t *pin) {
 
 // Functions for configuring the PWM Device
 //
-STATIC int calc_prescaler(uint32_t clock, uint32_t freq) {
+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) {
@@ -213,7 +213,7 @@ STATIC int calc_prescaler(uint32_t clock, uint32_t freq) {
     return -1;
 }
 
-STATIC void configure_flexpwm(machine_pwm_obj_t *self) {
+static void configure_flexpwm(machine_pwm_obj_t *self) {
     pwm_signal_param_u16_t pwmSignal;
 
     // Initialize PWM module.
@@ -300,7 +300,7 @@ STATIC void configure_flexpwm(machine_pwm_obj_t *self) {
 }
 
 #ifdef FSL_FEATURE_SOC_TMR_COUNT
-STATIC void configure_qtmr(machine_pwm_obj_t *self) {
+static void configure_qtmr(machine_pwm_obj_t *self) {
     qtmr_config_t qtmrConfig;
     int prescale;
     #if defined(MIMXRT117x_SERIES)
@@ -331,7 +331,7 @@ STATIC void configure_qtmr(machine_pwm_obj_t *self) {
 }
 #endif // FSL_FEATURE_SOC_TMR_COUNT
 
-STATIC void configure_pwm(machine_pwm_obj_t *self) {
+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;
@@ -360,7 +360,7 @@ STATIC void configure_pwm(machine_pwm_obj_t *self) {
 
 // Micropython API functions
 //
-STATIC void mp_machine_pwm_init_helper(machine_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_u16, ARG_duty_ns, ARG_center, ARG_align,
            ARG_invert, ARG_sync, ARG_xor, ARG_deadtime };
@@ -444,7 +444,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *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) {
+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);
 
@@ -580,7 +580,7 @@ void machine_pwm_deinit_all(void) {
     #endif
 }
 
-STATIC void mp_machine_pwm_start(machine_pwm_obj_t *self) {
+static void mp_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
@@ -590,7 +590,7 @@ STATIC void mp_machine_pwm_start(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+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
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 61b410a652cf8..294942cf5a03f 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -35,7 +35,7 @@
 #include "fsl_snvs_lp.h"
 #include "fsl_snvs_hp.h"
 
-STATIC mp_int_t timeout = 0;
+static mp_int_t timeout = 0;
 
 void machine_rtc_alarm_clear_en(void) {
     SNVS_LP_SRTC_DisableInterrupts(SNVS, SNVS_LPCR_LPTA_EN_MASK);
@@ -103,7 +103,7 @@ typedef struct _machine_rtc_irq_obj_t {
     mp_irq_obj_t base;
 } machine_rtc_irq_obj_t;
 
-STATIC mp_uint_t machine_rtc_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+static mp_uint_t machine_rtc_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     new_trigger /= 1000;
     if (!new_trigger) {
         machine_rtc_alarm_off(true);
@@ -113,11 +113,11 @@ STATIC mp_uint_t machine_rtc_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger
     return 0;
 }
 
-STATIC mp_uint_t machine_rtc_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+static mp_uint_t machine_rtc_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     return 0;
 }
 
-STATIC const mp_irq_methods_t machine_rtc_irq_methods = {
+static const mp_irq_methods_t machine_rtc_irq_methods = {
     .trigger = machine_rtc_irq_trigger,
     .info = machine_rtc_irq_info,
 };
@@ -148,7 +148,7 @@ typedef struct _machine_rtc_obj_t {
 } machine_rtc_obj_t;
 
 // Singleton RTC object.
-STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+static const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 // Start the RTC Timer.
 void machine_rtc_start(void) {
@@ -177,7 +177,7 @@ void machine_rtc_start(void) {
     }
 }
 
-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) {
+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);
 
@@ -185,7 +185,7 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     return (mp_obj_t)&machine_rtc_obj;
 }
 
-STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args) {
+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;
@@ -225,12 +225,12 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
     }
 }
 
-STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+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_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) {
+static mp_obj_t machine_rtc_now(mp_obj_t self_in) {
     // Get date and time in CPython order.
     snvs_lp_srtc_datetime_t srtc_date;
     SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
@@ -247,18 +247,18 @@ STATIC mp_obj_t machine_rtc_now(mp_obj_t self_in) {
     };
     return mp_obj_new_tuple(8, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_now_obj, machine_rtc_now);
+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) {
+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_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) {
+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);
@@ -271,10 +271,10 @@ STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t cal_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_calibration_obj, machine_rtc_calibration);
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_calibration_obj, machine_rtc_calibration);
 
-STATIC mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    STATIC const mp_arg_t allowed_args[] = {
+static mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,                            MP_ARG_INT,  {.u_int = 0} },
         { MP_QSTR_time,                          MP_ARG_OBJ,  {.u_obj = mp_const_none} },
         { MP_QSTR_repeat,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
@@ -321,9 +321,9 @@ STATIC mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_ma
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_alarm_obj, 1, machine_rtc_alarm);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_alarm_obj, 1, machine_rtc_alarm);
 
-STATIC mp_obj_t machine_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
     // only alarm id 0 is available
     if (n_args > 1 && mp_obj_get_int(args[1]) != 0) {
         mp_raise_OSError(MP_ENODEV);
@@ -332,9 +332,9 @@ STATIC mp_obj_t machine_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
     uint32_t alarmSeconds = SNVS->LPTAR;
     return mp_obj_new_int((alarmSeconds >= seconds) ? ((alarmSeconds - seconds) * 1000) : 0);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_alarm_left_obj, 1, 2, machine_rtc_alarm_left);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_alarm_left_obj, 1, 2, machine_rtc_alarm_left);
 
-STATIC mp_obj_t machine_rtc_alarm_cancel(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_rtc_alarm_cancel(size_t n_args, const mp_obj_t *args) {
     // only alarm id 0 is available
     if (n_args > 1 && mp_obj_get_int(args[1]) != 0) {
         mp_raise_OSError(MP_ENODEV);
@@ -342,9 +342,9 @@ STATIC mp_obj_t machine_rtc_alarm_cancel(size_t n_args, const mp_obj_t *args) {
     machine_rtc_alarm_off(true);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_alarm_cancel_obj, 1, 2, machine_rtc_alarm_cancel);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_alarm_cancel_obj, 1, 2, machine_rtc_alarm_cancel);
 
-STATIC mp_obj_t machine_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_trigger, ARG_handler, ARG_wake, ARG_hard };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_trigger, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -384,9 +384,9 @@ STATIC mp_obj_t machine_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 
     return MP_OBJ_FROM_PTR(irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_irq_obj, 1, machine_rtc_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_irq_obj, 1, machine_rtc_irq);
 
-STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+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) },
@@ -398,7 +398,7 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_rtc_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_ALARM0), MP_ROM_INT(0) },
 };
-STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
index b0bf8613c24ab..c938fdf2e597d 100644
--- a/ports/mimxrt/machine_sdcard.c
+++ b/ports/mimxrt/machine_sdcard.c
@@ -44,19 +44,19 @@
 enum { SDCARD_INIT_ARG_ID };
 
 
-STATIC const mp_arg_t sdcard_init_allowed_args[] = {
+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) {
+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) {
+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);
 
@@ -81,7 +81,7 @@ STATIC mp_obj_t sdcard_obj_make_new(const mp_obj_type_t *type, size_t n_args, si
 }
 
 // init()
-STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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)) {
@@ -89,18 +89,18 @@ STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_sdcard_init_obj, 1, machine_sdcard_init);
+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) {
+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);
+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) {
+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);
@@ -111,16 +111,16 @@ STATIC mp_obj_t machine_sdcard_readblocks(mp_obj_t self_in, mp_obj_t block_num,
         return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_readblocks_obj, machine_sdcard_readblocks);
+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) {
+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_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_present_obj, machine_sdcard_present);
 
-STATIC mp_obj_t machine_sdcard_info(mp_obj_t self_in) {
+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)) {
@@ -136,10 +136,10 @@ STATIC mp_obj_t machine_sdcard_info(mp_obj_t self_in) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_info_obj, machine_sdcard_info);
+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) {
+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);
@@ -150,10 +150,10 @@ STATIC mp_obj_t machine_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t block_num,
         return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_writeblocks_obj, machine_sdcard_writeblocks);
+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) {
+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);
 
@@ -200,9 +200,9 @@ STATIC mp_obj_t machine_sdcard_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t
         }
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_ioctl_obj, machine_sdcard_ioctl);
+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[] = {
+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) },
@@ -212,7 +212,7 @@ STATIC const mp_rom_map_elem_t sdcard_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(sdcard_locals_dict, sdcard_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_sdcard_type,
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 35deaa7ae6ae9..56e155ff22f4b 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -78,8 +78,8 @@ typedef struct _iomux_table_t {
     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 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
 };
@@ -118,7 +118,7 @@ bool lpspi_set_iomux(int8_t spi, uint8_t drive, int8_t cs) {
     }
 }
 
-STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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)",
@@ -193,7 +193,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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) {
+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} },
@@ -236,7 +236,7 @@ STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
     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) {
+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;
 
     if (len > 0) {
@@ -255,7 +255,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 = {
+static const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
     .transfer = machine_spi_transfer,
 };
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 4dbe1d2e5e8ec..7ae584fdd7454 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -73,8 +73,8 @@ typedef struct _iomux_table_t {
     uint32_t configRegister;
 } iomux_table_t;
 
-STATIC const uint8_t uart_index_table[] = MICROPY_HW_UART_INDEX;
-STATIC LPUART_Type *uart_base_ptr_table[] = LPUART_BASE_PTRS;
+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
 };
@@ -82,9 +82,9 @@ static const iomux_table_t iomux_table_uart_cts_rts[] = {
     IOMUX_TABLE_UART_CTS_RTS
 };
 
-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"};
-STATIC const char *_flow_name[] = {"None", "RTS", "CTS", "RTS|CTS"};
+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"};
+static const char *_flow_name[] = {"None", "RTS", "CTS", "RTS|CTS"};
 
 #define RX (iomux_table_uart[index + 1])
 #define TX (iomux_table_uart[index])
@@ -171,7 +171,7 @@ void machine_uart_set_baudrate(mp_obj_t uart_in, uint32_t baudrate) {
     { 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 void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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, flow=%s, "
         "rxbuf=%d, txbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
@@ -182,7 +182,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         _invert_name[self->invert]);
 }
 
-STATIC void mp_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 void mp_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_flow,
            ARG_timeout, ARG_timeout_char, ARG_invert, ARG_rxbuf, ARG_txbuf};
     static const mp_arg_t allowed_args[] = {
@@ -338,7 +338,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     }
 }
 
-STATIC mp_obj_t mp_machine_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 mp_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.
@@ -372,21 +372,21 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 // uart.deinit()
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     LPUART_SoftwareReset(self->lpuart);
 }
 
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     machine_uart_ensure_active(self);
     size_t count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
     return count;
 }
 
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     return self->tx_status == kStatus_LPUART_TxIdle;
 }
 
-STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     machine_uart_ensure_active(self);
     self->lpuart->CTRL |= 1 << LPUART_CTRL_SBK_SHIFT; // Set SBK bit
     self->lpuart->CTRL &= ~LPUART_CTRL_SBK_MASK; // Clear SBK bit
@@ -401,7 +401,7 @@ void machine_uart_deinit_all(void) {
     }
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
@@ -436,7 +436,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
@@ -496,7 +496,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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/mimxrt/machine_wdt.c b/ports/mimxrt/machine_wdt.c
index 176e114f72960..24945efbfba8f 100644
--- a/ports/mimxrt/machine_wdt.c
+++ b/ports/mimxrt/machine_wdt.c
@@ -36,9 +36,9 @@ 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 const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
 
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     // Verify the WDT id.
     if (id != 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("WDT(%d) doesn't exist"), id);
@@ -59,12 +59,12 @@ STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t
     return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     (void)self;
     WDOG_Refresh(WDOG1);
 }
 
-STATIC void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self, mp_int_t timeout_ms) {
+static void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self, mp_int_t timeout_ms) {
     (void)self;
 
     // confine to the valid range
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index d229367e81060..fdd48e280bc15 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -42,11 +42,11 @@ typedef struct _mimxrt_flash_obj_t {
     uint32_t flash_size;
 } mimxrt_flash_obj_t;
 
-STATIC mimxrt_flash_obj_t mimxrt_flash_obj = {
+static mimxrt_flash_obj_t mimxrt_flash_obj = {
     .base = { &mimxrt_flash_type }
 };
 
-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) {
+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);
 
@@ -62,7 +62,7 @@ STATIC mp_obj_t mimxrt_flash_make_new(const mp_obj_type_t *type, size_t n_args,
 
 // 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) {
+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);
@@ -76,13 +76,13 @@ STATIC mp_obj_t mimxrt_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     flash_read_block((self->flash_base + offset), (uint8_t *)bufinfo.buf, (uint32_t)bufinfo.len);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mimxrt_flash_readblocks_obj, 3, 4, mimxrt_flash_readblocks);
+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) {
+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;
@@ -110,10 +110,10 @@ STATIC mp_obj_t mimxrt_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
 
     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);
+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) {
+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;
@@ -137,14 +137,14 @@ STATIC mp_obj_t mimxrt_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t a
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mimxrt_flash_ioctl_obj, mimxrt_flash_ioctl);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(mimxrt_flash_locals_dict, mimxrt_flash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mimxrt_flash_type,
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index e01703af8cd4b..1212914d3b452 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -76,20 +76,20 @@ typedef enum {
     MP_SOFT_RESET
 } reset_reason_t;
 
-STATIC mp_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     unsigned char id[8];
     mp_hal_get_unique_id(id);
     return mp_obj_new_bytes(id, sizeof(id));
 }
 
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     WDOG_TriggerSystemSoftwareReset(WDOG1);
     while (true) {
         ;
     }
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     #ifdef MIMXRT117x_SERIES
     uint32_t user_reset_flag = kSRC_M7CoreIppUserResetFlag;
     #else
@@ -110,23 +110,23 @@ STATIC mp_int_t mp_machine_reset_cause(void) {
     return reset_cause;
 }
 
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq());
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(NULL);
 }
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(NULL);
 }
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     if (n_args != 0) {
         mp_int_t seconds = mp_obj_get_int(args[0]) / 1000;
         if (seconds > 0) {
diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
index 4756efc0a27e7..0f67538ce0d21 100644
--- a/ports/mimxrt/modmimxrt.c
+++ b/ports/mimxrt/modmimxrt.c
@@ -28,11 +28,11 @@
 #include "py/runtime.h"
 #include "modmimxrt.h"
 
-STATIC const mp_rom_map_elem_t mimxrt_module_globals_table[] = {
+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);
+static MP_DEFINE_CONST_DICT(mimxrt_module_globals, mimxrt_module_globals_table);
 
 const mp_obj_module_t mp_module_mimxrt = {
     .base = { &mp_type_module },
diff --git a/ports/mimxrt/modos.c b/ports/mimxrt/modos.c
index 2ee841815252c..0eb32afba3e31 100644
--- a/ports/mimxrt/modos.c
+++ b/ports/mimxrt/modos.c
@@ -43,8 +43,8 @@
 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;
+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);
@@ -52,7 +52,7 @@ AT_NONCACHEABLE_SECTION(static caam_job_ring_interface_t s_jrif0);
 static caam_job_ring_interface_t s_jrif0;
 #endif
 
-STATIC void trng_start(void) {
+static void trng_start(void) {
     caam_config_t config;
 
     if (!initialized) {
@@ -71,7 +71,7 @@ void trng_random_data(unsigned char *output, size_t len) {
 
 #else
 
-STATIC void trng_start(void) {
+static void trng_start(void) {
     trng_config_t trngConfig;
 
     if (!initialized) {
@@ -99,7 +99,7 @@ uint32_t trng_random_u32(void) {
 }
 
 #if MICROPY_PY_OS_URANDOM
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -109,5 +109,5 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
 
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
diff --git a/ports/mimxrt/modtime.c b/ports/mimxrt/modtime.c
index b0c927899f996..a2ccf1b273fc7 100644
--- a/ports/mimxrt/modtime.c
+++ b/ports/mimxrt/modtime.c
@@ -30,7 +30,7 @@
 #include "fsl_snvs_lp.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     // Get current date and time.
     snvs_lp_srtc_datetime_t t;
     SNVS_LP_SRTC_GetDatetime(SNVS, &t);
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     snvs_lp_srtc_datetime_t t;
     SNVS_LP_SRTC_GetDatetime(SNVS, &t);
     // EPOCH is 1970 for this port, which leads to the following trouble:
diff --git a/ports/mimxrt/mpbthciport.c b/ports/mimxrt/mpbthciport.c
index 2b0bcd2cf6c4d..45f729671728d 100644
--- a/ports/mimxrt/mpbthciport.c
+++ b/ports/mimxrt/mpbthciport.c
@@ -46,10 +46,10 @@
 
 uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 
-STATIC mp_sched_node_t mp_bluetooth_hci_sched_node;
-STATIC soft_timer_entry_t mp_bluetooth_hci_soft_timer;
+static mp_sched_node_t mp_bluetooth_hci_sched_node;
+static soft_timer_entry_t mp_bluetooth_hci_soft_timer;
 
-STATIC void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
+static void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
     mp_bluetooth_hci_poll_now();
 }
 
@@ -62,7 +62,7 @@ void mp_bluetooth_hci_init(void) {
         );
 }
 
-STATIC void mp_bluetooth_hci_start_polling(void) {
+static void mp_bluetooth_hci_start_polling(void) {
     mp_bluetooth_hci_poll_now();
 }
 
@@ -71,7 +71,7 @@ void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
 }
 
 // For synchronous mode, we run all BLE stack code inside a scheduled task.
-STATIC void run_events_scheduled_task(mp_sched_node_t *node) {
+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.
     mp_bluetooth_hci_poll();
 }
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index be4b1d8b5c815..6e982b8c8e245 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -41,7 +41,7 @@
 
 #include CPU_HEADER_H
 
-STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
+static uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
 uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
diff --git a/ports/mimxrt/mpnetworkport.c b/ports/mimxrt/mpnetworkport.c
index 2ca3426197538..aa8eef3ee2390 100644
--- a/ports/mimxrt/mpnetworkport.c
+++ b/ports/mimxrt/mpnetworkport.c
@@ -55,7 +55,7 @@ u32_t sys_now(void) {
     return mp_hal_ticks_ms();
 }
 
-STATIC void pyb_lwip_poll(void) {
+static void pyb_lwip_poll(void) {
     // Run the lwIP internal updates
     sys_check_timeouts();
 }
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index 355698e0b5882..e01079cbf3144 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -55,12 +55,12 @@ typedef struct _network_lan_obj_t {
 } network_lan_obj_t;
 
 
-STATIC const network_lan_obj_t network_lan_eth0 = { { &network_lan_type }, &eth_instance0 };
+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 };
+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) {
+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);
@@ -74,7 +74,7 @@ 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) {
+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_ref_clk_mode};
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
@@ -148,7 +148,7 @@ STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t network_lan_active(size_t n_args, const mp_obj_t *args) {
+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));
@@ -165,21 +165,21 @@ STATIC mp_obj_t network_lan_active(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_lan_active_obj, 1, 2, network_lan_active);
+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) {
+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_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) {
+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) {
+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;
 
@@ -190,9 +190,9 @@ STATIC mp_obj_t network_lan_status(size_t n_args, const mp_obj_t *args) {
 
     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_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) {
+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) {
@@ -235,9 +235,9 @@ STATIC mp_obj_t network_lan_config(size_t n_args, const mp_obj_t *args, mp_map_t
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_lan_config_obj, 1, network_lan_config);
+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[] = {
+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) },
@@ -252,7 +252,7 @@ STATIC const mp_rom_map_elem_t network_lan_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     network_lan_type,
diff --git a/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
index ff3c499fa3251..dea12faf42cb0 100644
--- a/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
+++ b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
@@ -135,7 +135,7 @@ bool microbit_display_active_animation(void) {
     return async_mode == ASYNC_MODE_ANIMATION;
 }
 
-STATIC void async_stop(void) {
+static void async_stop(void) {
     async_iterator = NULL;
     async_mode = ASYNC_MODE_STOPPED;
     async_tick = 0;
@@ -146,7 +146,7 @@ STATIC void async_stop(void) {
     wakeup_event = true;
 }
 
-STATIC void wait_for_event(void) {
+static void wait_for_event(void) {
     while (!wakeup_event) {
         // allow CTRL-C to stop the animation
         if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
@@ -508,7 +508,7 @@ void microbit_display_set_pixel(microbit_display_obj_t *display, mp_int_t x, mp_
     display->brightnesses |= (1 << bright);
 }
 
-STATIC mp_obj_t microbit_display_set_pixel_func(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t microbit_display_set_pixel_func(mp_uint_t n_args, const mp_obj_t *args) {
     (void)n_args;
     microbit_display_obj_t *self = (microbit_display_obj_t*)args[0];
     microbit_display_set_pixel(self, mp_obj_get_int(args[1]), mp_obj_get_int(args[2]), mp_obj_get_int(args[3]));
@@ -523,13 +523,13 @@ mp_int_t microbit_display_get_pixel(microbit_display_obj_t *display, mp_int_t x,
     return display->image_buffer[x][y];
 }
 
-STATIC mp_obj_t microbit_display_get_pixel_func(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
+static mp_obj_t microbit_display_get_pixel_func(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
     microbit_display_obj_t *self = (microbit_display_obj_t*)self_in;
     return MP_OBJ_NEW_SMALL_INT(microbit_display_get_pixel(self, mp_obj_get_int(x_in), mp_obj_get_int(y_in)));
 }
 MP_DEFINE_CONST_FUN_OBJ_3(microbit_display_get_pixel_obj, microbit_display_get_pixel_func);
 
-STATIC const mp_rom_map_elem_t microbit_display_locals_dict_table[] = {
+static const mp_rom_map_elem_t microbit_display_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_get_pixel),  MP_ROM_PTR(&microbit_display_get_pixel_obj) },
     { MP_ROM_QSTR(MP_QSTR_set_pixel),  MP_ROM_PTR(&microbit_display_set_pixel_obj) },
     { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&microbit_display_show_obj) },
@@ -540,7 +540,7 @@ STATIC const mp_rom_map_elem_t microbit_display_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_is_on),  MP_ROM_PTR(&microbit_display_is_on_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(microbit_display_locals_dict, microbit_display_locals_dict_table);
+static MP_DEFINE_CONST_DICT(microbit_display_locals_dict, microbit_display_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     microbit_display_type,
diff --git a/ports/nrf/boards/MICROBIT/modules/microbitimage.c b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
index b3505c20a394d..43fae777c7ff9 100644
--- a/ports/nrf/boards/MICROBIT/modules/microbitimage.c
+++ b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
@@ -40,7 +40,7 @@ const monochrome_5by5_t microbit_blank_image = {
     { 0, 0, 0 }
 };
 
-STATIC void microbit_image_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void microbit_image_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     microbit_image_obj_t *self = (microbit_image_obj_t*)self_in;
     mp_printf(print, "Image(");
     if (kind == PRINT_STR)
@@ -112,7 +112,7 @@ mp_int_t imageHeight(microbit_image_obj_t * p_image) {
         return p_image->greyscale.height;
 }
 
-STATIC greyscale_t *greyscale_new(mp_int_t w, mp_int_t h) {
+static greyscale_t *greyscale_new(mp_int_t w, mp_int_t h) {
     greyscale_t *result = mp_obj_malloc_var(greyscale_t, byte_data, uint8_t, (w*h+1)>>1, &microbit_image_type);
     result->five = 0;
     result->width = w;
@@ -144,7 +144,7 @@ greyscale_t * imageInvert(microbit_image_obj_t * p_image) {
     return result;
 }
 
-STATIC microbit_image_obj_t *image_from_parsed_str(const char *s, mp_int_t len) {
+static microbit_image_obj_t *image_from_parsed_str(const char *s, mp_int_t len) {
     mp_int_t w = 0;
     mp_int_t h = 0;
     mp_int_t line_len = 0;
@@ -201,7 +201,7 @@ STATIC microbit_image_obj_t *image_from_parsed_str(const char *s, mp_int_t len)
 }
 
 
-STATIC mp_obj_t microbit_image_make_new(const mp_obj_type_t *type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+static mp_obj_t microbit_image_make_new(const mp_obj_type_t *type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
     (void)type_in;
     mp_arg_check_num(n_args, n_kw, 0, 3, false);
 
@@ -270,7 +270,7 @@ static void clear_rect(greyscale_t *img, mp_int_t x0, mp_int_t y0,mp_int_t x1, m
     }
 }
 
-STATIC void image_blit(microbit_image_obj_t *src, greyscale_t *dest, mp_int_t x, mp_int_t y, mp_int_t w, mp_int_t h, mp_int_t xdest, mp_int_t ydest) {
+static void image_blit(microbit_image_obj_t *src, greyscale_t *dest, mp_int_t x, mp_int_t y, mp_int_t w, mp_int_t h, mp_int_t xdest, mp_int_t ydest) {
     if (w < 0)
         w = 0;
     if (h < 0)
@@ -323,7 +323,7 @@ greyscale_t *image_shift(microbit_image_obj_t *self, mp_int_t x, mp_int_t y) {
     return result;
 }
 
-STATIC microbit_image_obj_t *image_crop(microbit_image_obj_t *img, mp_int_t x, mp_int_t y, mp_int_t w, mp_int_t h) {
+static microbit_image_obj_t *image_crop(microbit_image_obj_t *img, mp_int_t x, mp_int_t y, mp_int_t w, mp_int_t h) {
     if (w < 0)
         w = 0;
     if (h < 0)
@@ -483,7 +483,7 @@ mp_obj_t microbit_image_invert(mp_obj_t self_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(microbit_image_invert_obj, microbit_image_invert);
 
 
-STATIC const mp_rom_map_elem_t microbit_image_locals_dict_table[] = {
+static const mp_rom_map_elem_t microbit_image_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&microbit_image_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&microbit_image_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_pixel), MP_ROM_PTR(&microbit_image_get_pixel_obj) },
@@ -565,14 +565,14 @@ STATIC const mp_rom_map_elem_t microbit_image_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SNAKE), MP_ROM_PTR(&microbit_const_image_snake_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(microbit_image_locals_dict, microbit_image_locals_dict_table);
+static MP_DEFINE_CONST_DICT(microbit_image_locals_dict, microbit_image_locals_dict_table);
 
 #define THE_FONT font_pendolino3_5x5_pad3msb
 
 #define ASCII_START 32
 #define ASCII_END 126
 
-STATIC const unsigned char *get_font_data_from_char(char c) {
+static const unsigned char *get_font_data_from_char(char c) {
     if (c < ASCII_START || c > ASCII_END) {
         c = '?';
     }
@@ -580,7 +580,7 @@ STATIC const unsigned char *get_font_data_from_char(char c) {
     return THE_FONT + offset;
 }
 
-STATIC mp_int_t get_pixel_from_font_data(const unsigned char *data, int x, int y) {
+static mp_int_t get_pixel_from_font_data(const unsigned char *data, int x, int y) {
     /* The following logic belongs in MicroBitFont */
     return ((data[y]>>(4-x))&1);
 }
@@ -645,7 +645,7 @@ microbit_image_obj_t *microbit_image_sum(microbit_image_obj_t *lhs, microbit_ima
     return (microbit_image_obj_t *)result;
 }
 
-STATIC mp_obj_t image_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t image_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     if (mp_obj_get_type(lhs_in) != &microbit_image_type) {
         return MP_OBJ_NULL; // op not supported
     }
@@ -724,7 +724,7 @@ mp_obj_t scrolling_string_image_iterable(const char* str, mp_uint_t len, mp_obj_
     return result;
 }
 
-STATIC int font_column_non_blank(const unsigned char *font_data, unsigned int col) {
+static int font_column_non_blank(const unsigned char *font_data, unsigned int col) {
     for (int y = 0; y < 5; ++y) {
         if (get_pixel_from_font_data(font_data, col, y)) {
             return 1;
@@ -734,7 +734,7 @@ STATIC int font_column_non_blank(const unsigned char *font_data, unsigned int co
 }
 
 /* Not strictly the rightmost non-blank column, but the rightmost in columns 2,3 or 4. */
-STATIC unsigned int rightmost_non_blank_column(const unsigned char *font_data) {
+static unsigned int rightmost_non_blank_column(const unsigned char *font_data) {
     if (font_column_non_blank(font_data, 4)) {
         return 4;
     }
@@ -760,7 +760,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) {
+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 = mp_obj_malloc(scrolling_string_iterator_t, &microbit_scrolling_string_iterator_type);
@@ -774,7 +774,7 @@ STATIC mp_obj_t get_microbit_scrolling_string_iter(mp_obj_t o_in, mp_obj_iter_bu
     return result;
 }
 
-STATIC mp_obj_t microbit_scrolling_string_iter_next(mp_obj_t o_in) {
+static mp_obj_t microbit_scrolling_string_iter_next(mp_obj_t o_in) {
     scrolling_string_iterator_t *iter = (scrolling_string_iterator_t *)o_in;
     if (iter->next_char == iter->end && iter->offset == 5) {
         if (iter->repeat) {
diff --git a/ports/nrf/boards/MICROBIT/modules/modmicrobit.c b/ports/nrf/boards/MICROBIT/modules/modmicrobit.c
index 06b3e5f6ab916..e56f6441594a5 100644
--- a/ports/nrf/boards/MICROBIT/modules/modmicrobit.c
+++ b/ports/nrf/boards/MICROBIT/modules/modmicrobit.c
@@ -35,13 +35,13 @@
 
 extern uint32_t ticks;
 
-STATIC mp_obj_t microbit_reset_(void) {
+static mp_obj_t microbit_reset_(void) {
     NVIC_SystemReset();
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(microbit_reset_obj, microbit_reset_);
 
-STATIC mp_obj_t microbit_sleep(mp_obj_t ms_in) {
+static mp_obj_t microbit_sleep(mp_obj_t ms_in) {
     mp_int_t ms = 0;
     if (mp_obj_is_integer(ms_in)) {
         ms = mp_obj_get_int(ms_in);
@@ -57,7 +57,7 @@ STATIC mp_obj_t microbit_sleep(mp_obj_t ms_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(microbit_sleep_obj, microbit_sleep);
 
-STATIC mp_obj_t microbit_running_time(void) {
+static mp_obj_t microbit_running_time(void) {
     return MP_OBJ_NEW_SMALL_INT(ticks);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(microbit_running_time_obj, microbit_running_time);
@@ -70,7 +70,7 @@ static const monochrome_5by5_t panic = SMALL_IMAGE(
     1,0,0,0,1
 );
 
-STATIC mp_obj_t microbit_panic(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t microbit_panic(mp_uint_t n_args, const mp_obj_t *args) {
     while(true) {
         microbit_display_show(&microbit_display_obj, (microbit_image_obj_t*)&panic);
         mp_hal_delay_ms(1000);
@@ -95,7 +95,7 @@ STATIC mp_obj_t microbit_panic(mp_uint_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(microbit_panic_obj, 0, 1, microbit_panic);
 
-STATIC mp_obj_t microbit_temperature(void) {
+static mp_obj_t microbit_temperature(void) {
     int temp = temp_read();
 #if MICROPY_PY_BUILTINS_FLOAT
     return mp_obj_new_float((mp_float_t)temp / MICROPY_FLOAT_CONST(100.0));
@@ -109,7 +109,7 @@ void board_modules_init0(void) {
     ticker_register_low_pri_callback(microbit_display_tick);
 }
 
-STATIC const mp_rom_map_elem_t microbit_module_globals_table[] = {
+static const mp_rom_map_elem_t microbit_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Image), MP_ROM_PTR(&microbit_image_type) },
 
     { MP_ROM_QSTR(MP_QSTR_display), MP_ROM_PTR(&microbit_display_obj) },
@@ -150,7 +150,7 @@ STATIC const mp_rom_map_elem_t microbit_module_globals_table[] = {
 */
 };
 
-STATIC MP_DEFINE_CONST_DICT(microbit_module_globals, microbit_module_globals_table);
+static MP_DEFINE_CONST_DICT(microbit_module_globals, microbit_module_globals_table);
 
 const mp_obj_module_t microbit_module = {
     .base = { &mp_type_module },
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 57e815a43d949..30da035589daf 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -241,7 +241,7 @@ def parse_board_file(self, filename):
 
     def print_named(self, label, named_pins, out_source):
         print(
-            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
+            "static const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label),
             file=out_source,
         )
         for named_pin in named_pins:
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 4ea811572518f..a342a1e00610c 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -173,7 +173,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 }
 #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) {
+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);
 
     if (event_id == 16) {                // connect event
@@ -187,7 +187,7 @@ STATIC void gap_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t conn
     }
 }
 
-STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data) {
+static void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data) {
     ubluepy_peripheral_obj_t * self = MP_OBJ_TO_PTR(self_in);
     (void)self;
 
diff --git a/ports/nrf/drivers/flash.c b/ports/nrf/drivers/flash.c
index 85e5f71d63ae3..74a7794ee8327 100644
--- a/ports/nrf/drivers/flash.c
+++ b/ports/nrf/drivers/flash.c
@@ -33,13 +33,13 @@
 #include "nrf_soc.h"
 
 // Rotates bits in `value` left `shift` times.
-STATIC inline uint32_t rotate_left(uint32_t value, uint32_t shift) {
+static inline uint32_t rotate_left(uint32_t value, uint32_t shift) {
     return (value << shift) | (value >> (32 - shift));
 }
 
-STATIC volatile flash_state_t flash_operation_state = FLASH_STATE_BUSY;
+static volatile flash_state_t flash_operation_state = FLASH_STATE_BUSY;
 
-STATIC void operation_init(void) {
+static void operation_init(void) {
     flash_operation_state = FLASH_STATE_BUSY;
 }
 
@@ -47,7 +47,7 @@ void flash_operation_finished(flash_state_t result) {
     flash_operation_state = result;
 }
 
-STATIC bool operation_wait(uint32_t result) {
+static bool operation_wait(uint32_t result) {
     if (ble_drv_stack_enabled() != 1) {
         // SoftDevice is not enabled, no event will be generated.
         return result == NRF_SUCCESS;
diff --git a/ports/nrf/modules/ble/modble.c b/ports/nrf/modules/ble/modble.c
index 3a9c6b20da790..7a9b55523efb7 100644
--- a/ports/nrf/modules/ble/modble.c
+++ b/ports/nrf/modules/ble/modble.c
@@ -81,12 +81,12 @@ mp_obj_t ble_obj_address(void) {
     return mac_str;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_enable_obj, ble_obj_enable);
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_disable_obj, ble_obj_disable);
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_enabled_obj, ble_obj_enabled);
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_address_obj, ble_obj_address);
+static MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_enable_obj, ble_obj_enable);
+static MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_disable_obj, ble_obj_disable);
+static MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_enabled_obj, ble_obj_enabled);
+static MP_DEFINE_CONST_FUN_OBJ_0(ble_obj_address_obj, ble_obj_address);
 
-STATIC const mp_rom_map_elem_t ble_module_globals_table[] = {
+static const mp_rom_map_elem_t ble_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ble) },
     { MP_ROM_QSTR(MP_QSTR_enable),   MP_ROM_PTR(&ble_obj_enable_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable),  MP_ROM_PTR(&ble_obj_disable_obj) },
@@ -95,7 +95,7 @@ STATIC const mp_rom_map_elem_t ble_module_globals_table[] = {
 };
 
 
-STATIC MP_DEFINE_CONST_DICT(ble_module_globals, ble_module_globals_table);
+static MP_DEFINE_CONST_DICT(ble_module_globals, ble_module_globals_table);
 
 const mp_obj_module_t ble_module = {
     .base = { &mp_type_module },
diff --git a/ports/nrf/modules/board/led.c b/ports/nrf/modules/board/led.c
index 57065a48517a2..6c0df5652633b 100644
--- a/ports/nrf/modules/board/led.c
+++ b/ports/nrf/modules/board/led.c
@@ -142,7 +142,7 @@ void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t ki
 /// 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) {
+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);
 
@@ -182,17 +182,17 @@ mp_obj_t led_obj_toggle(mp_obj_t self_in) {
     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 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     board_led_type,
diff --git a/ports/nrf/modules/board/modboard.c b/ports/nrf/modules/board/modboard.c
index 1fe3dcc5c9817..7675a254f424b 100644
--- a/ports/nrf/modules/board/modboard.c
+++ b/ports/nrf/modules/board/modboard.c
@@ -38,7 +38,7 @@
 #define PYB_LED_MODULE
 #endif
 
-STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_board) },
     #if MICROPY_REPL_INFO
     { MP_ROM_QSTR(MP_QSTR_repl_info), MP_ROM_PTR(&pyb_set_repl_info_obj) },
@@ -47,7 +47,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 };
 
 
-STATIC MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
+static MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
 
 const mp_obj_module_t board_module = {
     .base = { &mp_type_module },
diff --git a/ports/nrf/modules/machine/adc.c b/ports/nrf/modules/machine/adc.c
index 9bebcbe0869fe..c45d0ba5ffdab 100644
--- a/ports/nrf/modules/machine/adc.c
+++ b/ports/nrf/modules/machine/adc.c
@@ -44,7 +44,7 @@ typedef struct _machine_adc_obj_t {
 #endif
 } machine_adc_obj_t;
 
-STATIC const machine_adc_obj_t machine_adc_obj[] = {
+static const machine_adc_obj_t machine_adc_obj[] = {
 #if NRF51
     {{&machine_adc_type}, .id = 0, .ain = NRF_ADC_CONFIG_INPUT_0},
     {{&machine_adc_type}, .id = 1, .ain = NRF_ADC_CONFIG_INPUT_1},
@@ -73,7 +73,7 @@ void adc_init0(void) {
 #endif
 }
 
-STATIC int adc_find(mp_obj_t id) {
+static int adc_find(mp_obj_t id) {
     int adc_idx;
     if (mp_obj_is_int(id)) {
         // Given an integer id
@@ -104,14 +104,14 @@ STATIC int adc_find(mp_obj_t id) {
     { MP_ROM_QSTR(MP_QSTR_battery_level), MP_ROM_PTR(&mp_machine_adc_battery_level_obj) }, /* class method */ \
 
 // Return a string describing the ADC object.
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void mp_machine_adc_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     machine_adc_obj_t *self = o;
 
     mp_printf(print, "ADC(%u)", self->id);
 }
 
 // for make_new
-STATIC mp_obj_t mp_machine_adc_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_adc_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 };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1) } },
@@ -171,7 +171,7 @@ int16_t machine_adc_value_read(machine_adc_obj_t * adc_obj) {
 }
 
 // read_u16()
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     int16_t raw = machine_adc_value_read(self);
     #if defined(NRF52_SERIES)
     // raw is signed but the channel is in single-ended mode and this method cannot return negative values
@@ -192,7 +192,7 @@ mp_obj_t machine_adc_value(mp_obj_t self_in) {
 
     return MP_OBJ_NEW_SMALL_INT(value);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_machine_adc_value_obj, machine_adc_value);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_machine_adc_value_obj, machine_adc_value);
 
 #if NRF51
 
@@ -278,4 +278,4 @@ mp_obj_t machine_adc_battery_level(void) {
 
     return MP_OBJ_NEW_SMALL_INT(batt_in_percent);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_machine_adc_battery_level_obj, machine_adc_battery_level);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_machine_adc_battery_level_obj, machine_adc_battery_level);
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 6d2b83a454380..7e488366d70ba 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -71,7 +71,7 @@ typedef struct _machine_hard_i2c_obj_t {
     nrfx_twi_t    p_twi;  // Driver instance
 } machine_hard_i2c_obj_t;
 
-STATIC const machine_hard_i2c_obj_t machine_hard_i2c_obj[] = {
+static const machine_hard_i2c_obj_t machine_hard_i2c_obj[] = {
     {{&machine_i2c_type}, .p_twi = NRFX_TWI_INSTANCE(0)},
     {{&machine_i2c_type}, .p_twi = NRFX_TWI_INSTANCE(1)},
 };
@@ -79,7 +79,7 @@ STATIC const machine_hard_i2c_obj_t machine_hard_i2c_obj[] = {
 void i2c_init0(void) {
 }
 
-STATIC int i2c_find(mp_obj_t id) {
+static int i2c_find(mp_obj_t id) {
     // given an integer id
     int i2c_id = mp_obj_get_int(id);
     if (i2c_id >= 0 && i2c_id < MP_ARRAY_SIZE(machine_hard_i2c_obj)) {
@@ -88,7 +88,7 @@ STATIC int i2c_find(mp_obj_t id) {
     mp_raise_ValueError(MP_ERROR_TEXT("I2C doesn't exist"));
 }
 
-STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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, "I2C(%u)", self->p_twi.drv_inst_idx);
 }
@@ -171,7 +171,7 @@ int machine_hard_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size
     return transfer_ret;
 }
 
-STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
+static const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer = mp_machine_i2c_transfer_adaptor,
     .transfer_single = machine_hard_i2c_transfer_single,
 };
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 7cdeb78c0a310..9ad8d606a2654 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -102,7 +102,7 @@
     { MP_ROM_QSTR(MP_QSTR_DEBUG_IF_RESET),     MP_ROM_INT(PYB_RESET_DIF) }, \
     MICROPY_PY_MACHINE_NFC_RESET_ENTRY \
 
-STATIC uint32_t reset_cause;
+static uint32_t reset_cause;
 
 void machine_init(void) {
     uint32_t state = NRF_POWER->RESETREAS;
@@ -134,7 +134,7 @@ void machine_init(void) {
 
 // machine.info([dump_alloc_table])
 // Print out lots of information about the board.
-STATIC mp_obj_t machine_info(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_info(mp_uint_t n_args, const mp_obj_t *args) {
     // to print info about memory
     {
         printf("_etext=%p\n", &_etext);
@@ -174,14 +174,14 @@ STATIC mp_obj_t machine_info(mp_uint_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
 
-STATIC mp_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     return mp_const_empty_bytes;
 }
 
 // Resets the board in a manner similar to pushing the external RESET button.
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     NVIC_SystemReset();
 }
 
@@ -191,31 +191,31 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     __WFE();
 }
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_reset();
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     return reset_cause;
 }
 
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     mp_raise_NotImplementedError(NULL);
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(NULL);
 }
 
-STATIC mp_obj_t machine_enable_irq(void) {
+static mp_obj_t machine_enable_irq(void) {
 #ifndef BLUETOOTH_SD
     __enable_irq();
 #else
@@ -226,7 +226,7 @@ STATIC mp_obj_t machine_enable_irq(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_enable_irq_obj, machine_enable_irq);
 
 // Resets the board in a manner similar to pushing the external RESET button.
-STATIC mp_obj_t machine_disable_irq(void) {
+static mp_obj_t machine_disable_irq(void) {
 #ifndef BLUETOOTH_SD
     __disable_irq();
 #else
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index 974074fc91261..e72a16eee7c29 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -107,7 +107,7 @@ extern const uint8_t machine_pin_num_of_board_pins;
 
 // Pin class variables
 #if PIN_DEBUG
-STATIC bool pin_class_debug;
+static bool pin_class_debug;
 #else
 #define pin_class_debug (0)
 #endif
@@ -218,7 +218,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
 
 /// \method __str__()
 /// Return a string describing the pin object.
-STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pin_obj_t *self = self_in;
 
     char *pull = "PULL_DISABLED";
@@ -239,12 +239,12 @@ STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
             pull);
 }
 
-STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *pin, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
+static mp_obj_t pin_obj_init_helper(const pin_obj_t *pin, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
 
 /// \classmethod \constructor(id, ...)
 /// Create a new Pin object associated with the id.  If additional arguments are given,
 /// they are used to initialise the pin.  See `init`.
-STATIC mp_obj_t pin_make_new(const mp_obj_type_t *type, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+static mp_obj_t pin_make_new(const mp_obj_type_t *type, mp_uint_t n_args, mp_uint_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.
@@ -261,7 +261,7 @@ STATIC mp_obj_t pin_make_new(const mp_obj_type_t *type, mp_uint_t n_args, mp_uin
 }
 
 // fast method for getting/setting pin value
-STATIC mp_obj_t pin_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 pin_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);
     pin_obj_t *self = self_in;
     if (n_args == 0) {
@@ -274,47 +274,47 @@ STATIC mp_obj_t pin_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, con
     }
 }
 
-STATIC mp_obj_t pin_off(mp_obj_t self_in) {
+static mp_obj_t pin_off(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     mp_hal_pin_low(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_off_obj, pin_off);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_off_obj, pin_off);
 
-STATIC mp_obj_t pin_on(mp_obj_t self_in) {
+static mp_obj_t pin_on(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     mp_hal_pin_high(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_on_obj, pin_on);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_on_obj, pin_on);
 
 /// \classmethod mapper([fun])
 /// Get or set the pin mapper function.
-STATIC mp_obj_t pin_mapper(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_mapper(mp_uint_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_obj_t)&pin_mapper_fun_obj);
+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_obj_t)&pin_mapper_fun_obj);
 
 /// \classmethod dict([dict])
 /// Get or set the pin mapper dictionary.
-STATIC mp_obj_t pin_map_dict(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_map_dict(mp_uint_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_obj_t)&pin_map_dict_fun_obj);
+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_obj_t)&pin_map_dict_fun_obj);
 
 /// \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) {
+static mp_obj_t pin_af_list(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     mp_obj_t result = mp_obj_new_list(0, NULL);
 
@@ -324,24 +324,24 @@ STATIC mp_obj_t pin_af_list(mp_obj_t self_in) {
     }
     return result;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_list_obj, pin_af_list);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_af_list_obj, pin_af_list);
 
 #if PIN_DEBUG
 /// \classmethod debug([state])
 /// Get or set the debugging state (`True` or `False` for on or off).
-STATIC mp_obj_t pin_debug(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_debug(mp_uint_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_obj_t)&pin_debug_fun_obj);
+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_obj_t)&pin_debug_fun_obj);
 #endif
 
 // init(mode, pull=None, af=-1, *, value, alt)
-STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pin_obj_init_helper(const pin_obj_t *self, 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_mode, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = mp_const_none}},
@@ -387,7 +387,7 @@ STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *self, mp_uint_t n_args, con
     return mp_const_none;
 }
 
-STATIC mp_obj_t pin_obj_init(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pin_obj_init(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(pin_init_obj, 1, pin_obj_init);
@@ -399,40 +399,40 @@ MP_DEFINE_CONST_FUN_OBJ_KW(pin_init_obj, 1, pin_obj_init);
 ///   - With `value` given, set the logic level of the pin.  `value` can be
 ///   anything that converts to a boolean.  If it converts to `True`, the pin
 ///   is set high, otherwise it is set low.
-STATIC mp_obj_t pin_value(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_value(mp_uint_t n_args, const mp_obj_t *args) {
     return pin_call(args[0], n_args - 1, 0, args + 1);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
 
 /// \method low()
 /// Set the pin to a low logic level.
-STATIC mp_obj_t pin_low(mp_obj_t self_in) {
+static mp_obj_t pin_low(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     mp_hal_pin_low(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_low_obj, pin_low);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_low_obj, pin_low);
 
 /// \method high()
 /// Set the pin to a high logic level.
-STATIC mp_obj_t pin_high(mp_obj_t self_in) {
+static mp_obj_t pin_high(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     mp_hal_pin_high(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_high_obj, pin_high);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_high_obj, pin_high);
 
 /// \method name()
 /// Get the pin name.
-STATIC mp_obj_t pin_name(mp_obj_t self_in) {
+static mp_obj_t pin_name(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     return MP_OBJ_NEW_QSTR(self->name);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_name_obj, pin_name);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_name_obj, pin_name);
 
 /// \method names()
 /// Returns the cpu and board names for this pin.
-STATIC mp_obj_t pin_names(mp_obj_t self_in) {
+static mp_obj_t pin_names(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     mp_obj_t result = mp_obj_new_list(0, NULL);
     mp_obj_list_append(result, MP_OBJ_NEW_QSTR(self->name));
@@ -447,53 +447,53 @@ STATIC mp_obj_t pin_names(mp_obj_t self_in) {
     }
     return result;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_names_obj, pin_names);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_names_obj, pin_names);
 
 /// \method port()
 /// Get the pin port.
-STATIC mp_obj_t pin_port(mp_obj_t self_in) {
+static mp_obj_t pin_port(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     return MP_OBJ_NEW_SMALL_INT(self->pin / 32);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_port_obj, pin_port);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_port_obj, pin_port);
 
 /// \method pin()
 /// Get the pin number.
-STATIC mp_obj_t pin_pin(mp_obj_t self_in) {
+static mp_obj_t pin_pin(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     return MP_OBJ_NEW_SMALL_INT(self->pin);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_pin_obj, pin_pin);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_pin_obj, pin_pin);
 
 /// \method mode()
 /// Returns the currently configured mode of the pin. The integer returned
 /// will match one of the allowed constants for the mode argument to the init
 /// function.
-STATIC mp_obj_t pin_mode(mp_obj_t self_in) {
+static mp_obj_t pin_mode(mp_obj_t self_in) {
     return mp_const_none; // TODO: MP_OBJ_NEW_SMALL_INT(pin_get_mode(self_in));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_mode_obj, pin_mode);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_mode_obj, pin_mode);
 
 /// \method pull()
 /// Returns the currently configured pull of the pin. The integer returned
 /// will match one of the allowed constants for the pull argument to the init
 /// function.
-STATIC mp_obj_t pin_pull(mp_obj_t self_in) {
+static mp_obj_t pin_pull(mp_obj_t self_in) {
     return mp_const_none; // TODO: MP_OBJ_NEW_SMALL_INT(pin_get_pull(self_in));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_pull_obj, pin_pull);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_pull_obj, pin_pull);
 
 /// \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 pin_af(mp_obj_t self_in) {
+static mp_obj_t pin_af(mp_obj_t self_in) {
     return mp_const_none; // TODO: MP_OBJ_NEW_SMALL_INT(pin_get_af(self_in));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_obj, pin_af);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_af_obj, pin_af);
 
 
-STATIC void pin_common_irq_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
+static void pin_common_irq_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
     mp_obj_t pin_handler = MP_STATE_PORT(pin_irq_handlers)[pin];
     mp_obj_t pin_number = MP_OBJ_NEW_SMALL_INT(pin);
     const pin_obj_t *pin_obj  = pin_find(pin_number);
@@ -501,7 +501,7 @@ STATIC void pin_common_irq_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t
     mp_call_function_1(pin_handler, (mp_obj_t)pin_obj);
 }
 
-STATIC mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t 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 | MP_ARG_REQUIRED,  {.u_obj = mp_const_none} },
@@ -536,9 +536,9 @@ STATIC mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     // return the irq object
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
 
-STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
+static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&pin_value_obj) },
@@ -594,7 +594,7 @@ STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
 #include "genhdr/pins_af_const.h"
 };
 
-STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pin_type,
@@ -635,42 +635,42 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 /// \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) {
+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 = 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) {
+static mp_obj_t pin_af_index(mp_obj_t self_in) {
     pin_af_obj_t *af = self_in;
     return MP_OBJ_NEW_SMALL_INT(af->idx);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_index_obj, pin_af_index);
+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) {
+static mp_obj_t pin_af_name(mp_obj_t self_in) {
     pin_af_obj_t *af = 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_DEFINE_CONST_FUN_OBJ_1(pin_af_name_obj, pin_af_name);
 
 /// \method reg()
 /// Return the base register associated with the peripheral assigned to this
 /// alternate function.
-STATIC mp_obj_t pin_af_reg(mp_obj_t self_in) {
+static mp_obj_t pin_af_reg(mp_obj_t self_in) {
     pin_af_obj_t *af = self_in;
     return MP_OBJ_NEW_SMALL_INT((mp_uint_t)af->reg);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_reg_obj, pin_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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pin_af_locals_dict, pin_af_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pin_af_type,
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index f0c11fa8fc08c..393d1061799dd 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -81,7 +81,7 @@ typedef struct _machine_pwm_obj_t {
     uint8_t channel;
 } machine_pwm_obj_t;
 
-STATIC const nrfx_pwm_t machine_hard_pwm_instances[] = {
+static const nrfx_pwm_t machine_hard_pwm_instances[] = {
     #if defined(NRF52_SERIES)
     NRFX_PWM_INSTANCE(0),
     NRFX_PWM_INSTANCE(1),
@@ -92,9 +92,9 @@ STATIC const nrfx_pwm_t machine_hard_pwm_instances[] = {
     #endif
 };
 
-STATIC machine_pwm_config_t hard_configs[MP_ARRAY_SIZE(machine_hard_pwm_instances)];
+static machine_pwm_config_t hard_configs[MP_ARRAY_SIZE(machine_hard_pwm_instances)];
 
-STATIC const machine_pwm_obj_t machine_hard_pwm_obj[] = {
+static const machine_pwm_obj_t machine_hard_pwm_obj[] = {
     #if defined(NRF52_SERIES)
     {{&machine_pwm_type}, .p_pwm = &machine_hard_pwm_instances[0], .p_config = &hard_configs[0], 0, 0},
     {{&machine_pwm_type}, .p_pwm = &machine_hard_pwm_instances[0], .p_config = &hard_configs[0], 0, 1},
@@ -127,7 +127,7 @@ void pwm_init0(void) {
 }
 
 // Find a free PWM object
-STATIC int hard_pwm_find() {
+static int hard_pwm_find() {
     // look for a free module.
     for (int j = 0; j < MP_ARRAY_SIZE(hard_configs); j++) {
         if (hard_configs[j].active == FREE) {
@@ -137,7 +137,7 @@ STATIC int hard_pwm_find() {
     mp_raise_ValueError(MP_ERROR_TEXT("all PWM devices in use"));
 }
 
-STATIC void mp_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 = self_in;
     static char *duty_suffix[] = { "", "", "_u16", "_ns" };
     mp_printf(print, "<PWM: Pin=%u freq=%dHz duty%s=%d invert=%d id=%u channel=%u>",
@@ -149,7 +149,7 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 /******************************************************************************/
 /* MicroPython bindings for machine API                                       */
 
-STATIC void machine_hard_pwm_start(const machine_pwm_obj_t *self);
+static void machine_hard_pwm_start(const machine_pwm_obj_t *self);
 
 static const mp_arg_t allowed_args[] = {
     { MP_QSTR_pin,      MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -162,7 +162,7 @@ static const mp_arg_t allowed_args[] = {
     { MP_QSTR_channel,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
 };
 
-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) {
+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_pin, ARG_freq, ARG_duty, ARG_duty_u16, ARG_duty_ns, ARG_invert, ARG_device, ARG_channel };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -190,7 +190,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, c
 }
 
 
-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) {
+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, ARG_duty_u16, ARG_duty_ns, ARG_invert, ARG_device, ARG_channel };
 
     // parse args
@@ -250,17 +250,17 @@ void pwm_deinit_all(void) {
 }
 
 // Stop the PWM module, but do not release it.
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     self->p_config->active = STOPPED;
     nrfx_pwm_stop(self->p_pwm, true);
     nrfx_pwm_uninit(self->p_pwm);
 }
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     return MP_OBJ_NEW_SMALL_INT(self->p_config->freq);
 }
 
-STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
 
     uint8_t div = 0;
     if (freq > (PWM_MAX_BASE_FREQ / 3) || freq <= (PWM_MIN_BASE_FREQ / PWM_MAX_PERIOD)) {
@@ -276,7 +276,7 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     machine_hard_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_PERCENT) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else if (self->p_config->duty_mode[self->channel] == DUTY_U16) {
@@ -286,13 +286,13 @@ STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     self->p_config->duty[self->channel] = duty;
     self->p_config->duty_mode[self->channel] = DUTY_PERCENT;
     machine_hard_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_U16) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else if (self->p_config->duty_mode[self->channel] == DUTY_PERCENT) {
@@ -302,13 +302,13 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
     self->p_config->duty[self->channel] = duty;
     self->p_config->duty_mode[self->channel] = DUTY_U16;
     machine_hard_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_NS) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else {
@@ -316,7 +316,7 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
     self->p_config->duty[self->channel] = duty;
     self->p_config->duty_mode[self->channel] = DUTY_NS;
     machine_hard_pwm_start(self);
@@ -324,7 +324,7 @@ STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
 
 /* code for hard implementation ***********************************************/
 
-STATIC void machine_hard_pwm_start(const machine_pwm_obj_t *self) {
+static void machine_hard_pwm_start(const machine_pwm_obj_t *self) {
 
     nrfx_pwm_config_t config;
 
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index d52ca3e9a3366..d85db9b9b7aa1 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -55,7 +55,7 @@ typedef struct _machine_rtc_obj_t {
     machine_rtc_config_t * config;  // pointer to volatile part
 } machine_rtc_obj_t;
 
-STATIC const nrfx_rtc_t machine_rtc_instances[] = {
+static const nrfx_rtc_t machine_rtc_instances[] = {
     NRFX_RTC_INSTANCE(0),
     NRFX_RTC_INSTANCE(1),
 #if defined(NRF52_SERIES)
@@ -63,15 +63,15 @@ STATIC const nrfx_rtc_t machine_rtc_instances[] = {
 #endif
 };
 
-STATIC machine_rtc_config_t configs[MP_ARRAY_SIZE(machine_rtc_instances)];
+static machine_rtc_config_t configs[MP_ARRAY_SIZE(machine_rtc_instances)];
 
-STATIC void interrupt_handler0(nrfx_rtc_int_type_t int_type);
-STATIC void interrupt_handler1(nrfx_rtc_int_type_t int_type);
+static void interrupt_handler0(nrfx_rtc_int_type_t int_type);
+static void interrupt_handler1(nrfx_rtc_int_type_t int_type);
 #if defined(NRF52_SERIES)
-STATIC void interrupt_handler2(nrfx_rtc_int_type_t int_type);
+static void interrupt_handler2(nrfx_rtc_int_type_t int_type);
 #endif
 
-STATIC const machine_rtc_obj_t machine_rtc_obj[] = {
+static const machine_rtc_obj_t machine_rtc_obj[] = {
     {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[0], .handler=interrupt_handler0, .config=&configs[0]},
     {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[1], .handler=interrupt_handler1, .config=&configs[1]},
 #if defined(NRF52_SERIES)
@@ -79,7 +79,7 @@ STATIC const machine_rtc_obj_t machine_rtc_obj[] = {
 #endif
 };
 
-STATIC void interrupt_handler(size_t instance_id) {
+static void interrupt_handler(size_t instance_id) {
     const machine_rtc_obj_t * self = &machine_rtc_obj[instance_id];
     machine_rtc_config_t *config = self->config;
     if (config->callback != NULL) {
@@ -93,16 +93,16 @@ STATIC void interrupt_handler(size_t instance_id) {
     }
 }
 
-STATIC void interrupt_handler0(nrfx_rtc_int_type_t int_type) {
+static void interrupt_handler0(nrfx_rtc_int_type_t int_type) {
     interrupt_handler(0);
 }
 
-STATIC void interrupt_handler1(nrfx_rtc_int_type_t int_type) {
+static void interrupt_handler1(nrfx_rtc_int_type_t int_type) {
     interrupt_handler(1);
 }
 
 #if defined(NRF52_SERIES)
-STATIC void interrupt_handler2(nrfx_rtc_int_type_t int_type) {
+static void interrupt_handler2(nrfx_rtc_int_type_t int_type) {
     interrupt_handler(2);
 }
 #endif
@@ -110,7 +110,7 @@ STATIC void interrupt_handler2(nrfx_rtc_int_type_t int_type) {
 void rtc_init0(void) {
 }
 
-STATIC int rtc_find(mp_obj_t id) {
+static int rtc_find(mp_obj_t id) {
     // given an integer id
     int rtc_id = mp_obj_get_int(id);
     if (rtc_id >= 0 && rtc_id < MP_ARRAY_SIZE(machine_rtc_obj)) {
@@ -119,7 +119,7 @@ STATIC int rtc_find(mp_obj_t id) {
     mp_raise_ValueError(MP_ERROR_TEXT("RTCounter doesn't exist"));
 }
 
-STATIC void rtc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void rtc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_rtc_obj_t *self = self_in;
     mp_printf(print, "RTCounter(%u)", self->p_rtc->instance_id);
 }
@@ -138,7 +138,7 @@ const nrfx_rtc_config_t machine_rtc_config = {
     #endif
 };
 
-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 *all_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 *all_args) {
     enum { ARG_id, ARG_period, ARG_mode, ARG_callback };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)} },
@@ -201,54 +201,54 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
 /// Start the RTCounter. Timeout occurs after number of periods
 /// in the configured frequency has been reached.
 ///
-STATIC mp_obj_t machine_rtc_start(mp_obj_t self_in) {
+static mp_obj_t machine_rtc_start(mp_obj_t self_in) {
     machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_rtc_enable(self->p_rtc);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_start_obj, machine_rtc_start);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_start_obj, machine_rtc_start);
 
 /// \method stop()
 /// Stop the RTCounter.
 ///
-STATIC mp_obj_t machine_rtc_stop(mp_obj_t self_in) {
+static mp_obj_t machine_rtc_stop(mp_obj_t self_in) {
     machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_rtc_disable(self->p_rtc);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_stop_obj, machine_rtc_stop);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_stop_obj, machine_rtc_stop);
 
 /// \method counter()
 /// Return the current counter value. Wraps around after about 24 days
 /// with the current prescaler (2^24 / 8 = 2097152 seconds).
 ///
-STATIC mp_obj_t machine_rtc_counter(mp_obj_t self_in) {
+static mp_obj_t machine_rtc_counter(mp_obj_t self_in) {
     machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     uint32_t counter = nrfx_rtc_counter_get(self->p_rtc);
 
     return MP_OBJ_NEW_SMALL_INT(counter);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_counter_obj, machine_rtc_counter);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_counter_obj, machine_rtc_counter);
 
 /// \method deinit()
 /// Free resources associated with this RTC.
 ///
-STATIC mp_obj_t machine_rtc_deinit(mp_obj_t self_in) {
+static mp_obj_t machine_rtc_deinit(mp_obj_t self_in) {
     machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_rtc_uninit(self->p_rtc);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_deinit_obj, machine_rtc_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_deinit_obj, machine_rtc_deinit);
 
 
-STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_start),     MP_ROM_PTR(&machine_rtc_start_obj) },
     { MP_ROM_QSTR(MP_QSTR_stop),      MP_ROM_PTR(&machine_rtc_stop_obj) },
     { MP_ROM_QSTR(MP_QSTR_counter),   MP_ROM_PTR(&machine_rtc_counter_obj) },
@@ -260,7 +260,7 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_FREQUENCY), MP_ROM_INT(RTC_FREQUENCY) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtcounter_type,
diff --git a/ports/nrf/modules/machine/soft_pwm.c b/ports/nrf/modules/machine/soft_pwm.c
index c69b5f0bbe022..c61e1f86baa37 100644
--- a/ports/nrf/modules/machine/soft_pwm.c
+++ b/ports/nrf/modules/machine/soft_pwm.c
@@ -49,7 +49,7 @@ typedef struct _machine_pwm_obj_t {
 #define SOFT_PWM_BASE_FREQ      (1000000)
 #define DUTY_FULL_SCALE         (1024)
 
-STATIC void mp_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 = self_in;
     static char *duty_suffix[] = { "", "", "_u16", "_ns" };
     mp_printf(print, "<PWM: Pin=%u freq=%dHz duty%s=%d>",
@@ -59,9 +59,9 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 
 // MicroPython bindings for machine API
 
-STATIC void machine_soft_pwm_start(machine_pwm_obj_t *self);
+static void machine_soft_pwm_start(machine_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) {
+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, ARG_duty_u16, ARG_duty_ns };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_freq,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
@@ -91,7 +91,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, c
     machine_soft_pwm_start(self);
 }
 
-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) {
+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) {
     enum { ARG_pin, ARG_freq, ARG_duty, ARG_duty_u16, ARG_duty_ns, ARG_id };
 
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
@@ -117,15 +117,15 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     pwm_release(self->pwm_pin);
 }
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     return MP_OBJ_NEW_SMALL_INT(self->freq);
 }
 
-STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
 
     if (freq > (SOFT_PWM_BASE_FREQ / 256)) {
         mp_raise_ValueError(MP_ERROR_TEXT("frequency out of range"));
@@ -134,7 +134,7 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     machine_soft_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     if (self->duty_mode) {
         return MP_OBJ_NEW_SMALL_INT(self->duty);
     } else if (self->duty_mode == DUTY_U16) {
@@ -144,13 +144,13 @@ STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     self->duty = duty;
     self->duty_mode = DUTY;
     machine_soft_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     if (self->duty_mode == DUTY_U16) {
         return MP_OBJ_NEW_SMALL_INT(self->duty);
     } else if (self->duty_mode == DUTY) {
@@ -160,13 +160,13 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
     self->duty = duty;
     self->duty_mode = DUTY_U16;
     machine_soft_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     if (self->duty_mode == DUTY_NS) {
         return MP_OBJ_NEW_SMALL_INT(self->duty);
     } else {
@@ -174,7 +174,7 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
     self->duty = duty;
     self->duty_mode = DUTY_NS;
     machine_soft_pwm_start(self);
@@ -182,7 +182,7 @@ STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
 
 /* Interface for the implementation */
 
-STATIC void machine_soft_pwm_start(machine_pwm_obj_t *self) {
+static void machine_soft_pwm_start(machine_pwm_obj_t *self) {
 
     // check if ready to go
     if (self->defer_start == true || self->freq == 0 || self->duty_mode == DUTY_NOT_SET) {
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index cb09a23491630..4baee39d01dc3 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -103,7 +103,7 @@ typedef struct _machine_hard_spi_obj_t {
     nrfx_spi_config_t  * p_config; // pointer to volatile part
 } machine_hard_spi_obj_t;
 
-STATIC const nrfx_spi_t machine_spi_instances[] = {
+static const nrfx_spi_t machine_spi_instances[] = {
     NRFX_SPI_INSTANCE(0),
     NRFX_SPI_INSTANCE(1),
 #if defined(NRF52_SERIES)
@@ -114,9 +114,9 @@ STATIC const nrfx_spi_t machine_spi_instances[] = {
 #endif // NRF52_SERIES
 };
 
-STATIC nrfx_spi_config_t configs[MP_ARRAY_SIZE(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[] = {
+static const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     {{&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)
@@ -130,7 +130,7 @@ STATIC const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
 void spi_init0(void) {
 }
 
-STATIC int spi_find(mp_obj_t id) {
+static int spi_find(mp_obj_t id) {
     if (mp_obj_is_str(id)) {
         // given a string id
         const char *port = mp_obj_str_get_str(id);
@@ -187,14 +187,14 @@ enum {
     ARG_INIT_firstbit
 };
 
-STATIC void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_arg_val_t *args);
+static void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_arg_val_t *args);
 
-STATIC void machine_hard_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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(%u)", self->p_spi->drv_inst_idx);
 }
 
-STATIC 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) {
+static 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) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 1000000} },
@@ -243,7 +243,7 @@ STATIC mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_ar
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_arg_val_t *args) {
+static void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_arg_val_t *args) {
     int baudrate = args[ARG_INIT_baudrate].u_int;
 
     if (baudrate <= 125000) {
@@ -304,7 +304,7 @@ STATIC void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_
     }
 }
 
-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) {
+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) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000000} },
         { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -321,17 +321,17 @@ STATIC void machine_hard_spi_init(mp_obj_base_t *self_in, size_t n_args, const m
     machine_hard_spi_init_helper(self, args);
 }
 
-STATIC void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
+static void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
     const machine_hard_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     nrfx_spi_uninit(self->p_spi);
 }
 
-STATIC void machine_hard_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+static void machine_hard_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     const machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t*)self_in;
     spi_transfer(self, len, src, dest);
 }
 
-STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
+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,
diff --git a/ports/nrf/modules/machine/temp.c b/ports/nrf/modules/machine/temp.c
index dff15a9d14974..0d206fee47a66 100644
--- a/ports/nrf/modules/machine/temp.c
+++ b/ports/nrf/modules/machine/temp.c
@@ -50,7 +50,7 @@ typedef struct _machine_temp_obj_t {
 
 /// \method __str__()
 /// Return a string describing the Temp object.
-STATIC void machine_temp_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void machine_temp_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     machine_temp_obj_t *self = o;
 
     (void)self;
@@ -61,7 +61,7 @@ STATIC void machine_temp_print(const mp_print_t *print, mp_obj_t o, mp_print_kin
 /******************************************************************************/
 /* MicroPython bindings for machine API                                       */
 
-STATIC mp_obj_t machine_temp_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 machine_temp_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[] = {
         { },
     };
@@ -89,7 +89,7 @@ int32_t temp_read(void) {
 
 /// \method read()
 /// Get temperature.
-STATIC mp_obj_t machine_temp_read(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_temp_read(mp_uint_t n_args, const mp_obj_t *args) {
 
 #if BLUETOOTH_SD
     if (BLUETOOTH_STACK_ENABLED() == 1) {
@@ -102,15 +102,15 @@ STATIC mp_obj_t machine_temp_read(mp_uint_t n_args, const mp_obj_t *args) {
     return MP_OBJ_NEW_SMALL_INT(temp_read());
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_temp_read_obj, 0, 1, machine_temp_read);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_temp_read_obj, 0, 1, machine_temp_read);
 
-STATIC const mp_rom_map_elem_t machine_temp_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_temp_locals_dict_table[] = {
     // instance methods
     // class methods
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_machine_temp_read_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(machine_temp_locals_dict, machine_temp_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_temp_locals_dict, machine_temp_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_temp_type,
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c
index db9f04c2fa7f4..3c2a039b84dfa 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -41,7 +41,7 @@ typedef struct _machine_timer_obj_t {
     nrfx_timer_t   p_instance;
 } machine_timer_obj_t;
 
-STATIC mp_obj_t machine_timer_callbacks[] = {
+static mp_obj_t machine_timer_callbacks[] = {
     NULL,
     NULL,
     NULL,
@@ -51,7 +51,7 @@ STATIC mp_obj_t machine_timer_callbacks[] = {
 #endif
 };
 
-STATIC const machine_timer_obj_t machine_timer_obj[] = {
+static const machine_timer_obj_t machine_timer_obj[] = {
     {{&machine_timer_type}, NRFX_TIMER_INSTANCE(0)},
 #if MICROPY_PY_MACHINE_SOFT_PWM
     { },
@@ -71,7 +71,7 @@ void timer_init0(void) {
     }
 }
 
-STATIC int timer_find(mp_obj_t id) {
+static int timer_find(mp_obj_t id) {
     // given an integer id
     int timer_id = mp_obj_get_int(id);
     if (timer_id >= 0 && timer_id < MP_ARRAY_SIZE(machine_timer_obj)) {
@@ -80,12 +80,12 @@ STATIC int timer_find(mp_obj_t id) {
     mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
 }
 
-STATIC void timer_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void timer_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     machine_timer_obj_t *self = o;
     mp_printf(print, "Timer(%u)", self->p_instance.instance_id);
 }
 
-STATIC void timer_event_handler(nrf_timer_event_t event_type, void *p_context) {
+static void timer_event_handler(nrf_timer_event_t event_type, void *p_context) {
     machine_timer_obj_t *self = p_context;
     mp_obj_t callback = machine_timer_callbacks[self->p_instance.instance_id];
     if (callback != NULL) {
@@ -96,7 +96,7 @@ STATIC void timer_event_handler(nrf_timer_event_t event_type, void *p_context) {
 /******************************************************************************/
 /* MicroPython bindings for machine API                                       */
 
-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 *all_args) {
+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 *all_args) {
     enum { ARG_id, ARG_period, ARG_mode, ARG_callback };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)} },
@@ -175,52 +175,52 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
 /// \method period()
 /// Return counter value, which is currently in us.
 ///
-STATIC mp_obj_t machine_timer_period(mp_obj_t self_in) {
+static mp_obj_t machine_timer_period(mp_obj_t self_in) {
     machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     uint32_t period = nrfx_timer_capture(&self->p_instance, NRF_TIMER_CC_CHANNEL1);
 
     return MP_OBJ_NEW_SMALL_INT(period);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_period_obj, machine_timer_period);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_period_obj, machine_timer_period);
 
 /// \method start()
 /// Start the timer.
 ///
-STATIC mp_obj_t machine_timer_start(mp_obj_t self_in) {
+static mp_obj_t machine_timer_start(mp_obj_t self_in) {
     machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_timer_enable(&self->p_instance);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_start_obj, machine_timer_start);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_start_obj, machine_timer_start);
 
 /// \method stop()
 /// Stop the timer.
 ///
-STATIC mp_obj_t machine_timer_stop(mp_obj_t self_in) {
+static mp_obj_t machine_timer_stop(mp_obj_t self_in) {
     machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_timer_disable(&self->p_instance);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_stop_obj, machine_timer_stop);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_stop_obj, machine_timer_stop);
 
 /// \method deinit()
 /// Free resources associated with the timer.
 ///
-STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+static mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
     machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_timer_uninit(&self->p_instance);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+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[] = {
+static const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_time),     MP_ROM_PTR(&machine_timer_period_obj) }, // alias
     { MP_ROM_QSTR(MP_QSTR_period),   MP_ROM_PTR(&machine_timer_period_obj) },
     { MP_ROM_QSTR(MP_QSTR_start),    MP_ROM_PTR(&machine_timer_start_obj) },
@@ -232,7 +232,7 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index e0b56e831004d..6da797df1f559 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -97,14 +97,14 @@ typedef struct _machine_uart_obj_t {
 
 static const nrfx_uart_t instance0 = NRFX_UART_INSTANCE(0);
 
-STATIC machine_uart_obj_t machine_uart_obj[] = {
+static machine_uart_obj_t machine_uart_obj[] = {
     {{&machine_uart_type}, .p_uart = &instance0}
 };
 
 void uart_init0(void) {
 }
 
-STATIC int uart_find(mp_obj_t id) {
+static int uart_find(mp_obj_t id) {
     // given an integer id
     int uart_id = mp_obj_get_int(id);
     if (uart_id >= 0 && uart_id < MP_ARRAY_SIZE(machine_uart_obj)) {
@@ -113,7 +113,7 @@ STATIC int uart_find(mp_obj_t id) {
     mp_raise_ValueError(MP_ERROR_TEXT("UART doesn't exist"));
 }
 
-STATIC void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context) {
+static void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context) {
     machine_uart_obj_t *self = p_context;
     if (p_event->type == NRFX_UART_EVT_RX_DONE) {
         nrfx_uart_rx(self->p_uart, &self->buf.rx_buf[0], 1);
@@ -142,7 +142,7 @@ int uart_rx_char(machine_uart_obj_t *self) {
     return ringbuf_get((ringbuf_t *)&self->buf.rx_ringbuf);
 }
 
-STATIC nrfx_err_t uart_tx_char(machine_uart_obj_t *self, int c) {
+static nrfx_err_t uart_tx_char(machine_uart_obj_t *self, int c) {
     while (nrfx_uart_tx_in_progress(self->p_uart)) {
         ;
     }
@@ -172,11 +172,11 @@ void uart_tx_strn_cooked(machine_uart_obj_t *uart_obj, const char *str, uint len
 // The UART class doesn't have any constants for this port.
 #define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
 
-STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_printf(print, "UART(0)");
 }
 
-STATIC void mp_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 void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // Parse args (none supported at this stage).
     mp_arg_parse_all(n_args, pos_args, kw_args, 0, NULL, NULL);
 }
@@ -186,7 +186,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
 // Initialise the UART bus with the given parameters:
 //   - `id`is bus id.
 //   - `baudrate` is the clock rate.
-STATIC mp_obj_t mp_machine_uart_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_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_timeout, ARG_timeout_char };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -266,12 +266,12 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     (void)self;
 }
 
 // Write a single character on the bus.  `data` is an integer to write.
-STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
+static void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
     nrfx_err_t err = uart_tx_char(self, data);
     if (err != NRFX_SUCCESS) {
         mp_hal_raise(err);
@@ -280,21 +280,21 @@ STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
 
 // Receive a single character on the bus.
 // Return value: The character read, as an integer.  Returns -1 on timeout.
-STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     return uart_rx_char(self);
 }
 
 // uart.any()
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     return ringbuf_avail((ringbuf_t *)&self->buf.rx_ringbuf);
 }
 
 // uart.txdone()
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     return !nrfx_uart_tx_in_progress(self->p_uart);
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
     machine_uart_obj_t *self = self_in;
     byte *buf = buf_in;
     uint32_t t = self->timeout + mp_hal_ticks_ms();
@@ -319,7 +319,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
     machine_uart_obj_t *self = self_in;
 
     nrfx_err_t err = nrfx_uart_tx(self->p_uart, buf_in, size);
@@ -335,7 +335,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     }
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     machine_uart_obj_t *self = self_in;
     (void)self;
     mp_uint_t ret = 0;
diff --git a/ports/nrf/modules/music/modmusic.c b/ports/nrf/modules/music/modmusic.c
index a0ae7f7c8e860..2c63497565156 100644
--- a/ports/nrf/modules/music/modmusic.c
+++ b/ports/nrf/modules/music/modmusic.c
@@ -74,7 +74,7 @@ enum {
 
 extern volatile uint32_t ticks;
 
-STATIC uint32_t start_note(const char *note_str, size_t note_len, const pin_obj_t *pin);
+static uint32_t start_note(const char *note_str, size_t note_len, const pin_obj_t *pin);
 
 void microbit_music_init0(void) {
     ticker_register_low_pri_callback(microbit_music_tick);
@@ -136,7 +136,7 @@ void microbit_music_tick(void) {
     }
 }
 
-STATIC void wait_async_music_idle(void) {
+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
@@ -148,7 +148,7 @@ STATIC void wait_async_music_idle(void) {
     }
 }
 
-STATIC uint32_t start_note(const char *note_str, size_t note_len, const pin_obj_t *pin) {
+static uint32_t start_note(const char *note_str, size_t note_len, const pin_obj_t *pin) {
     pwm_set_duty_cycle(pin->pin, 128); // TODO: remove pin setting.
 
     // [NOTE](#|b)(octave)(:length)
@@ -157,9 +157,9 @@ STATIC uint32_t start_note(const char *note_str, size_t note_len, const pin_obj_
     // array of us periods
 
     // these are the periods of note4 (the octave ascending from middle c) from A->B then C->G
-    STATIC uint16_t periods_us[] = {2273, 2025, 3822, 3405, 3034, 2863, 2551};
+    static uint16_t periods_us[] = {2273, 2025, 3822, 3405, 3034, 2863, 2551};
     // A#, -, C#, D#, -, F#, G#
-    STATIC uint16_t periods_sharps_us[] = {2145, 0, 3608, 3214, 0, 2703, 2408};
+    static uint16_t periods_sharps_us[] = {2145, 0, 3608, 3214, 0, 2703, 2408};
 
     // we'll represent the note as an integer (A=0, G=6)
     // TODO: validate the note
@@ -258,7 +258,7 @@ STATIC uint32_t start_note(const char *note_str, size_t note_len, const pin_obj_
     return gap_ms;
 }
 
-STATIC mp_obj_t microbit_music_reset(void) {
+static mp_obj_t microbit_music_reset(void) {
     music_data->bpm = DEFAULT_BPM;
     music_data->ticks = DEFAULT_TICKS;
     music_data->last_octave = DEFAULT_OCTAVE;
@@ -268,7 +268,7 @@ STATIC mp_obj_t microbit_music_reset(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(microbit_music_reset_obj, microbit_music_reset);
 
-STATIC mp_obj_t microbit_music_get_tempo(void) {
+static mp_obj_t microbit_music_get_tempo(void) {
     mp_obj_t tempo_tuple[2];
 
     tempo_tuple[0] = mp_obj_new_int(music_data->bpm);
@@ -278,7 +278,7 @@ STATIC mp_obj_t microbit_music_get_tempo(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(microbit_music_get_tempo_obj, microbit_music_get_tempo);
 
-STATIC mp_obj_t microbit_music_stop(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t microbit_music_stop(mp_uint_t n_args, const mp_obj_t *args) {
     const pin_obj_t *pin;
     if (n_args == 0) {
 #ifdef MICROPY_HW_MUSIC_PIN
@@ -301,7 +301,7 @@ STATIC mp_obj_t microbit_music_stop(mp_uint_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(microbit_music_stop_obj, 0, 1, microbit_music_stop);
 
-STATIC mp_obj_t microbit_music_play(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t microbit_music_play(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_music, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_pin,   MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -370,7 +370,7 @@ STATIC mp_obj_t microbit_music_play(mp_uint_t n_args, const mp_obj_t *pos_args,
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(microbit_music_play_obj, 0, microbit_music_play);
 
-STATIC mp_obj_t microbit_music_pitch(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t microbit_music_pitch(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_frequency, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_duration, MP_ARG_INT, {.u_int = -1} },
@@ -433,7 +433,7 @@ STATIC mp_obj_t microbit_music_pitch(mp_uint_t n_args, const mp_obj_t *pos_args,
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(microbit_music_pitch_obj, 0, microbit_music_pitch);
 
-STATIC mp_obj_t microbit_music_set_tempo(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t microbit_music_set_tempo(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_ticks, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_bpm,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -469,7 +469,7 @@ static mp_obj_t music_init(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(music___init___obj, music_init);
 
-STATIC const mp_rom_map_elem_t microbit_music_locals_dict_table[] = {
+static const mp_rom_map_elem_t microbit_music_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&music___init___obj) },
 
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&microbit_music_reset_obj) },
@@ -502,7 +502,7 @@ STATIC const mp_rom_map_elem_t microbit_music_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_POWER_DOWN), MP_ROM_PTR(&microbit_music_tune_power_down_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(microbit_music_locals_dict, microbit_music_locals_dict_table);
+static MP_DEFINE_CONST_DICT(microbit_music_locals_dict, microbit_music_locals_dict_table);
 
 const mp_obj_module_t music_module = {
     .base = { &mp_type_module },
diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
index e92919cac5a22..e490dc53dd677 100644
--- a/ports/nrf/modules/nrf/flashbdev.c
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -74,7 +74,7 @@ mp_obj_t nrf_flashbdev_readblocks(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_NEW_SMALL_INT(0);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(nrf_flashbdev_readblocks_obj, 3, 4, nrf_flashbdev_readblocks);
+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]);
@@ -95,7 +95,7 @@ mp_obj_t nrf_flashbdev_writeblocks(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_NEW_SMALL_INT(0);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(nrf_flashbdev_writeblocks_obj, 3, 4, nrf_flashbdev_writeblocks);
+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);
@@ -137,21 +137,21 @@ mp_obj_t nrf_flashbdev_ioctl(mp_obj_t self_in, mp_obj_t op_in, mp_obj_t arg_in)
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(nrf_flashbdev_ioctl_obj, nrf_flashbdev_ioctl);
+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[] = {
+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 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) {
+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) {
+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[] = {
diff --git a/ports/nrf/modules/nrf/modnrf.c b/ports/nrf/modules/nrf/modnrf.c
index 6533fa121e506..ce75635c767e4 100644
--- a/ports/nrf/modules/nrf/modnrf.c
+++ b/ports/nrf/modules/nrf/modnrf.c
@@ -45,7 +45,7 @@ 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) {
+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
@@ -59,14 +59,14 @@ STATIC mp_obj_t dcdc(size_t n_args, const mp_obj_t *args) {
     }
     return mp_obj_new_bool(nrf_power_dcdcen_get(NRF_POWER));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dcdc_obj, 0, 1, dcdc);
+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));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(nrf_modnrf_freeflash_start_aligned_obj, nrf_modnrf_freeflash_start_aligned);
+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);
@@ -74,10 +74,10 @@ mp_obj_t nrf_modnrf_freeflash_length_aligned(void) {
     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);
+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[] = {
+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) },
@@ -88,7 +88,7 @@ STATIC const mp_rom_map_elem_t nrf_module_globals_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(nrf_module_globals, nrf_module_globals_table);
 
 const mp_obj_module_t nrf_module = {
     .base = { &mp_type_module },
diff --git a/ports/nrf/modules/os/microbitfs.c b/ports/nrf/modules/os/microbitfs.c
index bc007c161f340..f549e6f32edfe 100644
--- a/ports/nrf/modules/os/microbitfs.c
+++ b/ports/nrf/modules/os/microbitfs.c
@@ -121,13 +121,13 @@ extern const mp_obj_type_t os_mbfs_fileio_type;
 extern const mp_obj_type_t os_mbfs_textio_type;
 
 // Page indexes count down from the end of ROM.
-STATIC uint8_t first_page_index;
-STATIC uint8_t last_page_index;
+static uint8_t first_page_index;
+static uint8_t last_page_index;
 // The number of usable chunks in the file system.
-STATIC uint8_t chunks_in_file_system;
+static uint8_t chunks_in_file_system;
 // Index of chunk to start searches. This is randomised to even out wear.
-STATIC uint8_t start_index;
-STATIC file_chunk *file_system_chunks;
+static uint8_t start_index;
+static file_chunk *file_system_chunks;
 
 // Defined by the linker
 extern byte _fs_start[];
@@ -136,25 +136,25 @@ extern byte _fs_end[];
 STATIC_ASSERT((sizeof(file_chunk) == CHUNK_SIZE));
 
 // From micro:bit memory.h
-STATIC inline byte *rounddown(byte *addr, uint32_t align) {
+static inline byte *rounddown(byte *addr, uint32_t align) {
     return (byte*)(((uint32_t)addr)&(-align));
 }
 
 // From micro:bit memory.h
-STATIC inline byte *roundup(byte *addr, uint32_t align) {
+static inline byte *roundup(byte *addr, uint32_t align) {
     return (byte*)((((uint32_t)addr)+align-1)&(-align));
 }
 
 
-STATIC inline void *first_page(void) {
+static inline void *first_page(void) {
     return _fs_end - FLASH_PAGESIZE * first_page_index;
 }
 
-STATIC inline void *last_page(void) {
+static inline void *last_page(void) {
     return _fs_end - FLASH_PAGESIZE * last_page_index;
 }
 
-STATIC void init_limits(void) {
+static void init_limits(void) {
     // First determine where to end
     byte *end = _fs_end;
     end = rounddown(end, FLASH_PAGESIZE)-FLASH_PAGESIZE;
@@ -169,7 +169,7 @@ STATIC void init_limits(void) {
     chunks_in_file_system = (end-start)>>MBFS_LOG_CHUNK_SIZE;
 }
 
-STATIC void randomise_start_index(void) {
+static void randomise_start_index(void) {
     start_index = rng_generate_random_word() % chunks_in_file_system + 1;
 }
 
@@ -187,7 +187,7 @@ void microbit_filesystem_init(void) {
     }
 }
 
-STATIC void copy_page(void *dest, void *src) {
+static void copy_page(void *dest, void *src) {
     DEBUG(("FILE DEBUG: Copying page from %lx to %lx.\r\n", (uint32_t)src, (uint32_t)dest));
     flash_page_erase((uint32_t)dest);
     file_chunk *src_chunk = src;
@@ -210,7 +210,7 @@ STATIC void copy_page(void *dest, void *src) {
 // Then all the pages are copied, one by one, into the adjacent newly unused page.
 // Finally, the persistent data is saved back to the opposite end of the filesystem from whence it came.
 //
-STATIC void filesystem_sweep(void) {
+static void filesystem_sweep(void) {
     persistent_config_t config;
     uint8_t *page;
     uint8_t *end_page;
@@ -240,11 +240,11 @@ STATIC void filesystem_sweep(void) {
 }
 
 
-STATIC inline byte *seek_address(file_descriptor_obj *self) {
+static inline byte *seek_address(file_descriptor_obj *self) {
     return (byte*)&(file_system_chunks[self->seek_chunk].data[self->seek_offset]);
 }
 
-STATIC uint8_t microbit_find_file(const char *name, int name_len) {
+static uint8_t microbit_find_file(const char *name, int name_len) {
     for (uint8_t index = 1; index <= chunks_in_file_system; index++) {
         const file_chunk *p = &file_system_chunks[index];
         if (p->marker != FILE_START)
@@ -268,7 +268,7 @@ STATIC uint8_t microbit_find_file(const char *name, int name_len) {
 // 3a. Sweep the filesystem and restart.
 // 3b. Otherwise, fail and return FILE_NOT_FOUND.
 //
-STATIC uint8_t find_chunk_and_erase(void) {
+static uint8_t find_chunk_and_erase(void) {
     // Start search at a random chunk to spread the wear more evenly.
     // Search for unused chunk
     uint8_t index = start_index;
@@ -316,13 +316,13 @@ STATIC uint8_t find_chunk_and_erase(void) {
     return find_chunk_and_erase();
 }
 
-STATIC mp_obj_t microbit_file_name(file_descriptor_obj *fd) {
+static mp_obj_t microbit_file_name(file_descriptor_obj *fd) {
     return mp_obj_new_str(&(file_system_chunks[fd->start_chunk].header.filename[0]), file_system_chunks[fd->start_chunk].header.name_len);
 }
 
-STATIC file_descriptor_obj *microbit_file_descriptor_new(uint8_t start_chunk, bool write, bool binary);
+static file_descriptor_obj *microbit_file_descriptor_new(uint8_t start_chunk, bool write, bool binary);
 
-STATIC void clear_file(uint8_t chunk) {
+static void clear_file(uint8_t chunk) {
     do {
         flash_write_byte((uint32_t)&(file_system_chunks[chunk].marker), FREED_CHUNK);
         DEBUG(("FILE DEBUG: Freeing chunk %d.\n", chunk));
@@ -330,7 +330,7 @@ STATIC void clear_file(uint8_t chunk) {
     } while (chunk <= chunks_in_file_system);
 }
 
-STATIC file_descriptor_obj *microbit_file_open(const char *name, size_t name_len, bool write, bool binary) {
+static file_descriptor_obj *microbit_file_open(const char *name, size_t name_len, bool write, bool binary) {
     if (name_len > MAX_FILENAME_LENGTH) {
         return NULL;
     }
@@ -355,7 +355,7 @@ STATIC file_descriptor_obj *microbit_file_open(const char *name, size_t name_len
     return microbit_file_descriptor_new(index, write, binary);
 }
 
-STATIC file_descriptor_obj *microbit_file_descriptor_new(uint8_t start_chunk, bool write, bool binary) {
+static file_descriptor_obj *microbit_file_descriptor_new(uint8_t start_chunk, bool write, bool binary) {
     file_descriptor_obj *res = mp_obj_malloc(file_descriptor_obj, binary ? &os_mbfs_fileio_type : &os_mbfs_textio_type);
     res->start_chunk = start_chunk;
     res->seek_chunk = start_chunk;
@@ -366,7 +366,7 @@ STATIC file_descriptor_obj *microbit_file_descriptor_new(uint8_t start_chunk, bo
     return res;
 }
 
-STATIC mp_obj_t microbit_remove(mp_obj_t filename) {
+static mp_obj_t microbit_remove(mp_obj_t filename) {
     size_t name_len;
     const char *name = mp_obj_str_get_data(filename, &name_len);
     mp_uint_t index = microbit_find_file(name, name_len);
@@ -377,13 +377,13 @@ STATIC mp_obj_t microbit_remove(mp_obj_t filename) {
     return mp_const_none;
 }
 
-STATIC void check_file_open(file_descriptor_obj *self) {
+static void check_file_open(file_descriptor_obj *self) {
     if (!self->open) {
         mp_raise_ValueError(MP_ERROR_TEXT("I/O operation on closed file"));
     }
 }
 
-STATIC int advance(file_descriptor_obj *self, uint32_t n, bool write) {
+static int advance(file_descriptor_obj *self, uint32_t n, bool write) {
     DEBUG(("FILE DEBUG: Advancing from chunk %d, offset %d.\r\n", self->seek_chunk, self->seek_offset));
     self->seek_offset += n;
     if (self->seek_offset == DATA_PER_CHUNK) {
@@ -405,7 +405,7 @@ STATIC int advance(file_descriptor_obj *self, uint32_t n, bool write) {
     return 0;
 }
 
-STATIC mp_uint_t microbit_file_read(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t microbit_file_read(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode) {
     file_descriptor_obj *self = (file_descriptor_obj *)obj;
     check_file_open(self);
     if (self->writable || file_system_chunks[self->start_chunk].marker == FREED_CHUNK) {
@@ -435,7 +435,7 @@ STATIC mp_uint_t microbit_file_read(mp_obj_t obj, void *buf, mp_uint_t size, int
     return bytes_read;
 }
 
-STATIC mp_uint_t microbit_file_write(mp_obj_t obj, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t microbit_file_write(mp_obj_t obj, const void *buf, mp_uint_t size, int *errcode) {
     file_descriptor_obj *self = (file_descriptor_obj *)obj;
     check_file_open(self);
     if (!self->writable || file_system_chunks[self->start_chunk].marker == FREED_CHUNK) {
@@ -458,14 +458,14 @@ STATIC mp_uint_t microbit_file_write(mp_obj_t obj, const void *buf, mp_uint_t si
     return size;
 }
 
-STATIC void microbit_file_close(file_descriptor_obj *fd) {
+static void microbit_file_close(file_descriptor_obj *fd) {
     if (fd->writable) {
         flash_write_byte((uint32_t)&(file_system_chunks[fd->start_chunk].header.end_offset), fd->seek_offset);
     }
     fd->open = false;
 }
 
-STATIC mp_obj_t microbit_file_list(void) {
+static mp_obj_t microbit_file_list(void) {
     mp_obj_t res = mp_obj_new_list(0, NULL);
     for (uint8_t index = 1; index <= chunks_in_file_system; index++) {
         if (file_system_chunks[index].marker == FILE_START) {
@@ -476,7 +476,7 @@ STATIC mp_obj_t microbit_file_list(void) {
     return res;
 }
 
-STATIC mp_obj_t microbit_file_size(mp_obj_t filename) {
+static mp_obj_t microbit_file_size(mp_obj_t filename) {
     size_t name_len;
     const char *name = mp_obj_str_get_data(filename, &name_len);
     uint8_t chunk = microbit_find_file(name, name_len);
@@ -495,7 +495,7 @@ STATIC mp_obj_t microbit_file_size(mp_obj_t filename) {
     return mp_obj_new_int(len);
 }
 
-STATIC mp_uint_t file_read_byte(file_descriptor_obj *fd) {
+static mp_uint_t file_read_byte(file_descriptor_obj *fd) {
     if (file_system_chunks[fd->seek_chunk].next_chunk == UNUSED_CHUNK) {
         uint8_t end_offset = file_system_chunks[fd->start_chunk].header.end_offset;
         if (end_offset == UNUSED_CHUNK || fd->seek_offset == end_offset) {
@@ -530,29 +530,29 @@ mp_import_stat_t os_mbfs_import_stat(const char *path) {
     }
 }
 
-STATIC mp_obj_t os_mbfs_file_name(mp_obj_t self) {
+static mp_obj_t os_mbfs_file_name(mp_obj_t self) {
     file_descriptor_obj *fd = (file_descriptor_obj*)self;
     return microbit_file_name(fd);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_file_name_obj, os_mbfs_file_name);
+static MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_file_name_obj, os_mbfs_file_name);
 
-STATIC mp_obj_t os_mbfs_file_close(mp_obj_t self) {
+static mp_obj_t os_mbfs_file_close(mp_obj_t self) {
     file_descriptor_obj *fd = (file_descriptor_obj*)self;
     microbit_file_close(fd);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_file_close_obj, os_mbfs_file_close);
+static MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_file_close_obj, os_mbfs_file_close);
 
-STATIC mp_obj_t os_mbfs_remove(mp_obj_t name) {
+static mp_obj_t os_mbfs_remove(mp_obj_t name) {
     return microbit_remove(name);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(os_mbfs_remove_obj, os_mbfs_remove);
 
-STATIC mp_obj_t os_mbfs_file___exit__(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t os_mbfs_file___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     return os_mbfs_file_close(args[0]);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_mbfs_file___exit___obj, 4, 4, os_mbfs_file___exit__);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_mbfs_file___exit___obj, 4, 4, os_mbfs_file___exit__);
 
 typedef struct {
     mp_obj_base_t base;
@@ -560,7 +560,7 @@ typedef struct {
     uint8_t index;
 } os_mbfs_ilistdir_it_t;
 
-STATIC mp_obj_t os_mbfs_ilistdir_it_iternext(mp_obj_t self_in) {
+static mp_obj_t os_mbfs_ilistdir_it_iternext(mp_obj_t self_in) {
     os_mbfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
 
     // Read until the next FILE_START chunk.
@@ -585,7 +585,7 @@ STATIC mp_obj_t os_mbfs_ilistdir_it_iternext(mp_obj_t self_in) {
     return MP_OBJ_STOP_ITERATION;
 }
 
-STATIC mp_obj_t os_mbfs_ilistdir(void) {
+static mp_obj_t os_mbfs_ilistdir(void) {
     os_mbfs_ilistdir_it_t *iter = mp_obj_malloc(os_mbfs_ilistdir_it_t, &mp_type_polymorph_iter);
     iter->iternext = os_mbfs_ilistdir_it_iternext;
     iter->index = 1;
@@ -596,12 +596,12 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_mbfs_ilistdir_obj, os_mbfs_ilistdir);
 
 MP_DEFINE_CONST_FUN_OBJ_0(os_mbfs_listdir_obj, microbit_file_list);
 
-STATIC mp_obj_t microbit_file_writable(mp_obj_t self) {
+static mp_obj_t microbit_file_writable(mp_obj_t self) {
     return mp_obj_new_bool(((file_descriptor_obj *)self)->writable);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(microbit_file_writable_obj, microbit_file_writable);
+static MP_DEFINE_CONST_FUN_OBJ_1(microbit_file_writable_obj, microbit_file_writable);
 
-STATIC const mp_map_elem_t os_mbfs_file_locals_dict_table[] = {
+static const mp_map_elem_t os_mbfs_file_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&os_mbfs_file_close_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_name), (mp_obj_t)&os_mbfs_file_name_obj },
     { MP_ROM_QSTR(MP_QSTR___enter__), (mp_obj_t)&mp_identity_obj },
@@ -613,10 +613,10 @@ STATIC const mp_map_elem_t os_mbfs_file_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj},
     { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj},
 };
-STATIC MP_DEFINE_CONST_DICT(os_mbfs_file_locals_dict, os_mbfs_file_locals_dict_table);
+static MP_DEFINE_CONST_DICT(os_mbfs_file_locals_dict, os_mbfs_file_locals_dict_table);
 
 
-STATIC const mp_stream_p_t textio_stream_p = {
+static const mp_stream_p_t textio_stream_p = {
     .read = microbit_file_read,
     .write = microbit_file_write,
     .is_text = true,
@@ -631,7 +631,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 
-STATIC const mp_stream_p_t fileio_stream_p = {
+static const mp_stream_p_t fileio_stream_p = {
     .read = microbit_file_read,
     .write = microbit_file_write,
 };
@@ -679,7 +679,7 @@ mp_obj_t os_mbfs_open(size_t n_args, const mp_obj_t *args) {
     mp_raise_ValueError(MP_ERROR_TEXT("illegal mode"));
 }
 
-STATIC mp_obj_t os_mbfs_stat(mp_obj_t filename) {
+static mp_obj_t os_mbfs_stat(mp_obj_t filename) {
     mp_obj_t file_size = microbit_file_size(filename);
 
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
diff --git a/ports/nrf/modules/os/modos.c b/ports/nrf/modules/os/modos.c
index 31bf1b2920ef1..f000e1eeb6457 100644
--- a/ports/nrf/modules/os/modos.c
+++ b/ports/nrf/modules/os/modos.c
@@ -33,7 +33,7 @@
 
 #if MICROPY_PY_OS_URANDOM
 // Return a bytes object with n random bytes, generated by the hardware random number generator.
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -42,7 +42,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
 
 #if MICROPY_PY_OS_DUPTERM
diff --git a/ports/nrf/modules/ubluepy/modubluepy.c b/ports/nrf/modules/ubluepy/modubluepy.c
index fd42c4940bb75..e84c2ebd6d56a 100644
--- a/ports/nrf/modules/ubluepy/modubluepy.c
+++ b/ports/nrf/modules/ubluepy/modubluepy.c
@@ -37,7 +37,7 @@ extern const mp_obj_type_t ubluepy_constants_type;
 extern const mp_obj_type_t ubluepy_scanner_type;
 extern const mp_obj_type_t ubluepy_scan_entry_type;
 
-STATIC const mp_rom_map_elem_t mp_module_ubluepy_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_ubluepy_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_ubluepy) },
 #if MICROPY_PY_UBLUEPY_PERIPHERAL
     { MP_ROM_QSTR(MP_QSTR_Peripheral),      MP_ROM_PTR(&ubluepy_peripheral_type) },
@@ -60,7 +60,7 @@ STATIC const mp_rom_map_elem_t mp_module_ubluepy_globals_table[] = {
 };
 
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ubluepy_globals, mp_module_ubluepy_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_ubluepy_globals, mp_module_ubluepy_globals_table);
 
 const mp_obj_module_t mp_module_ubluepy = {
     .base = { &mp_type_module },
diff --git a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
index 7b9e3af6a3174..074cf0396e3a6 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
@@ -32,14 +32,14 @@
 #include "modubluepy.h"
 #include "ble_drv.h"
 
-STATIC void ubluepy_characteristic_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_characteristic_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_characteristic_obj_t * self = (ubluepy_characteristic_obj_t *)o;
 
     mp_printf(print, "Characteristic(handle: 0x" HEX2_FMT ", conn_handle: " HEX2_FMT ")",
               self->handle, self->p_service->p_periph->conn_handle);
 }
 
-STATIC mp_obj_t ubluepy_characteristic_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 ubluepy_characteristic_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_uuid,  MP_ARG_REQUIRED| MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_props, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = UBLUEPY_PROP_READ | UBLUEPY_PROP_WRITE} },
@@ -90,7 +90,7 @@ void char_data_callback(mp_obj_t self_in, uint16_t length, uint8_t * p_data) {
 /// \method read()
 /// Read Characteristic value.
 ///
-STATIC mp_obj_t char_read(mp_obj_t self_in) {
+static mp_obj_t char_read(mp_obj_t self_in) {
     ubluepy_characteristic_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
 #if MICROPY_PY_UBLUEPY_CENTRAL
@@ -107,12 +107,12 @@ STATIC mp_obj_t char_read(mp_obj_t self_in) {
     return mp_const_none;
 #endif
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_read_obj, char_read);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_read_obj, char_read);
 
 /// \method write(data, [with_response=False])
 /// Write Characteristic value.
 ///
-STATIC mp_obj_t char_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t char_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     ubluepy_characteristic_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_obj_t data                      = pos_args[1];
 
@@ -155,28 +155,28 @@ STATIC mp_obj_t char_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_characteristic_write_obj, 2, char_write);
+static MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_characteristic_write_obj, 2, char_write);
 
 /// \method properties()
 /// Read Characteristic value properties.
 ///
-STATIC mp_obj_t char_properties(mp_obj_t self_in) {
+static mp_obj_t char_properties(mp_obj_t self_in) {
     ubluepy_characteristic_obj_t * self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->props);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_get_properties_obj, char_properties);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_get_properties_obj, char_properties);
 
 /// \method uuid()
 /// Get UUID instance of the characteristic.
 ///
-STATIC mp_obj_t char_uuid(mp_obj_t self_in) {
+static mp_obj_t char_uuid(mp_obj_t self_in) {
     ubluepy_characteristic_obj_t * self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(self->p_uuid);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_get_uuid_obj, char_uuid);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_get_uuid_obj, char_uuid);
 
 
-STATIC const mp_rom_map_elem_t ubluepy_characteristic_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_characteristic_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_read),                MP_ROM_PTR(&ubluepy_characteristic_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_write),               MP_ROM_PTR(&ubluepy_characteristic_write_obj) },
 #if 0
@@ -207,7 +207,7 @@ STATIC const mp_rom_map_elem_t ubluepy_characteristic_locals_dict_table[] = {
 #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_characteristic_locals_dict, ubluepy_characteristic_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_characteristic_locals_dict, ubluepy_characteristic_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_characteristic_type,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_constants.c b/ports/nrf/modules/ubluepy/ubluepy_constants.c
index cad9adbb03256..d102c41da3b47 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_constants.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_constants.c
@@ -31,7 +31,7 @@
 
 #include "modubluepy.h"
 
-STATIC const mp_rom_map_elem_t ubluepy_constants_ad_types_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_constants_ad_types_locals_dict_table[] = {
     // GAP AD Types
     { MP_ROM_QSTR(MP_QSTR_AD_TYPE_FLAGS),                              MP_ROM_INT(0x01) },
     { MP_ROM_QSTR(MP_QSTR_AD_TYPE_16BIT_SERVICE_UUID_MORE_AVAILABLE),  MP_ROM_INT(0x02) },
@@ -67,7 +67,7 @@ STATIC const mp_rom_map_elem_t ubluepy_constants_ad_types_locals_dict_table[] =
     { MP_ROM_QSTR(MP_QSTR_AD_TYPE_MANUFACTURER_SPECIFIC_DATA),         MP_ROM_INT(0xFF) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_constants_ad_types_locals_dict, 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);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_constants_ad_types_type,
@@ -76,7 +76,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &ubluepy_constants_ad_types_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t ubluepy_constants_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_constants_locals_dict_table[] = {
     // GAP events
     { MP_ROM_QSTR(MP_QSTR_EVT_GAP_CONNECTED),       MP_ROM_INT(16) },
     { MP_ROM_QSTR(MP_QSTR_EVT_GAP_DISCONNECTED),    MP_ROM_INT(17) },
@@ -89,7 +89,7 @@ STATIC const mp_rom_map_elem_t ubluepy_constants_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ad_types),                MP_ROM_PTR(&ubluepy_constants_ad_types_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_constants_locals_dict, ubluepy_constants_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_constants_locals_dict, ubluepy_constants_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_constants_type,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_delegate.c b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
index 43720b4186b0a..3aa06d83bf840 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_delegate.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
@@ -31,13 +31,13 @@
 
 #include "modubluepy.h"
 
-STATIC void ubluepy_delegate_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_delegate_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_delegate_obj_t * self = (ubluepy_delegate_obj_t *)o;
     (void)self;
     mp_printf(print, "DefaultDelegate()");
 }
 
-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) {
+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 = mp_obj_malloc(ubluepy_delegate_obj_t, type);
 
     return MP_OBJ_FROM_PTR(s);
@@ -46,28 +46,28 @@ STATIC mp_obj_t ubluepy_delegate_make_new(const mp_obj_type_t *type, size_t n_ar
 /// \method handleConnection()
 /// Handle connection events.
 ///
-STATIC mp_obj_t delegate_handle_conn(mp_obj_t self_in) {
+static mp_obj_t delegate_handle_conn(mp_obj_t self_in) {
     ubluepy_delegate_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     (void)self;
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_delegate_handle_conn_obj, delegate_handle_conn);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_delegate_handle_conn_obj, delegate_handle_conn);
 
 /// \method handleNotification()
 /// Handle notification events.
 ///
-STATIC mp_obj_t delegate_handle_notif(mp_obj_t self_in) {
+static mp_obj_t delegate_handle_notif(mp_obj_t self_in) {
     ubluepy_delegate_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     (void)self;
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_delegate_handle_notif_obj, delegate_handle_notif);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_delegate_handle_notif_obj, delegate_handle_notif);
 
-STATIC const mp_rom_map_elem_t ubluepy_delegate_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_delegate_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_handleConnection),   MP_ROM_PTR(&ubluepy_delegate_handle_conn_obj) },
     { MP_ROM_QSTR(MP_QSTR_handleNotification), MP_ROM_PTR(&ubluepy_delegate_handle_notif_obj) },
 #if 0
@@ -75,7 +75,7 @@ STATIC const mp_rom_map_elem_t ubluepy_delegate_locals_dict_table[] = {
 #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_delegate_locals_dict, ubluepy_delegate_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_delegate_locals_dict, ubluepy_delegate_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_delegate_type,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
index 062b4210941f7..d2a256d5c32bc 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
@@ -34,14 +34,14 @@
 #include "modubluepy.h"
 #include "ble_drv.h"
 
-STATIC void ubluepy_descriptor_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_descriptor_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_descriptor_obj_t * self = (ubluepy_descriptor_obj_t *)o;
 
     mp_printf(print, "Descriptor(uuid: 0x" HEX2_FMT HEX2_FMT ")",
               self->p_uuid->value[1], self->p_uuid->value[0]);
 }
 
-STATIC mp_obj_t ubluepy_descriptor_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 ubluepy_descriptor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
 
     enum { ARG_NEW_UUID };
 
@@ -62,13 +62,13 @@ STATIC mp_obj_t ubluepy_descriptor_make_new(const mp_obj_type_t *type, size_t n_
     return MP_OBJ_FROM_PTR(s);
 }
 
-STATIC const mp_rom_map_elem_t ubluepy_descriptor_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_descriptor_locals_dict_table[] = {
 #if 0
     { MP_ROM_QSTR(MP_QSTR_binVal), MP_ROM_PTR(&ubluepy_descriptor_bin_val_obj) },
 #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_descriptor_locals_dict, ubluepy_descriptor_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_descriptor_locals_dict, ubluepy_descriptor_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_descriptor_type,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index 7de9aa26bbae8..443345042938d 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -34,14 +34,14 @@
 
 #include "ble_drv.h"
 
-STATIC void ubluepy_peripheral_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_peripheral_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_peripheral_obj_t * self = (ubluepy_peripheral_obj_t *)o;
     (void)self;
     mp_printf(print, "Peripheral(conn_handle: " HEX2_FMT ")",
               self->conn_handle);
 }
 
-STATIC void gap_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t conn_handle, uint16_t length, uint8_t * data) {
+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);
 
     if (event_id == 16) {                // connect event
@@ -68,7 +68,7 @@ STATIC void gap_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t conn
     (void)self;
 }
 
-STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data) {
+static void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->conn_handler != mp_const_none) {
@@ -92,14 +92,14 @@ STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t at
 
 static volatile bool m_disc_evt_received;
 
-STATIC void gattc_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data) {
+static void gattc_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
     (void)self;
     m_disc_evt_received = true;
 }
 #endif
 
-STATIC mp_obj_t ubluepy_peripheral_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 ubluepy_peripheral_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum {
         ARG_NEW_DEVICE_ADDR,
         ARG_NEW_ADDR_TYPE
@@ -129,45 +129,45 @@ STATIC mp_obj_t ubluepy_peripheral_make_new(const mp_obj_type_t *type, size_t n_
 /// \method withDelegate(DefaultDelegate)
 /// Set delegate instance for handling Bluetooth LE events.
 ///
-STATIC mp_obj_t peripheral_with_delegate(mp_obj_t self_in, mp_obj_t delegate) {
+static mp_obj_t peripheral_with_delegate(mp_obj_t self_in, mp_obj_t delegate) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     self->delegate = delegate;
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_with_delegate_obj, peripheral_with_delegate);
+static MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_with_delegate_obj, peripheral_with_delegate);
 
 /// \method setNotificationHandler(func)
 /// Set handler for Bluetooth LE notification events.
 ///
-STATIC mp_obj_t peripheral_set_notif_handler(mp_obj_t self_in, mp_obj_t func) {
+static mp_obj_t peripheral_set_notif_handler(mp_obj_t self_in, mp_obj_t func) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     self->notif_handler = func;
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_set_notif_handler_obj, peripheral_set_notif_handler);
+static MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_set_notif_handler_obj, peripheral_set_notif_handler);
 
 /// \method setConnectionHandler(func)
 /// Set handler for Bluetooth LE connection events.
 ///
-STATIC mp_obj_t peripheral_set_conn_handler(mp_obj_t self_in, mp_obj_t func) {
+static mp_obj_t peripheral_set_conn_handler(mp_obj_t self_in, mp_obj_t func) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     self->conn_handler = func;
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_set_conn_handler_obj, peripheral_set_conn_handler);
+static MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_set_conn_handler_obj, peripheral_set_conn_handler);
 
 #if MICROPY_PY_UBLUEPY_PERIPHERAL
 
 /// \method advertise(device_name, [service=[service1, service2, ...]], [data=bytearray], [connectable=True])
 /// Start advertising. Connectable advertisement type by default.
 ///
-STATIC mp_obj_t peripheral_advertise(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t peripheral_advertise(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_device_name, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_services,    MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -231,12 +231,12 @@ STATIC mp_obj_t peripheral_advertise(mp_uint_t n_args, const mp_obj_t *pos_args,
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_peripheral_advertise_obj, 0, peripheral_advertise);
+static MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_peripheral_advertise_obj, 0, peripheral_advertise);
 
 /// \method advertise_stop()
 /// Stop advertisement if any onging advertisement.
 ///
-STATIC mp_obj_t peripheral_advertise_stop(mp_obj_t self_in) {
+static mp_obj_t peripheral_advertise_stop(mp_obj_t self_in) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     (void)self;
@@ -245,26 +245,26 @@ STATIC mp_obj_t peripheral_advertise_stop(mp_obj_t self_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_advertise_stop_obj, peripheral_advertise_stop);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_advertise_stop_obj, peripheral_advertise_stop);
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL
 
 /// \method disconnect()
 /// disconnect connection.
 ///
-STATIC mp_obj_t peripheral_disconnect(mp_obj_t self_in) {
+static mp_obj_t peripheral_disconnect(mp_obj_t self_in) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     (void)self;
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_disconnect_obj, peripheral_disconnect);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_disconnect_obj, peripheral_disconnect);
 
 /// \method addService(Service)
 /// Add service to the Peripheral.
 ///
-STATIC mp_obj_t peripheral_add_service(mp_obj_t self_in, mp_obj_t service) {
+static mp_obj_t peripheral_add_service(mp_obj_t self_in, mp_obj_t service) {
     ubluepy_peripheral_obj_t * self = MP_OBJ_TO_PTR(self_in);
     ubluepy_service_obj_t    * p_service = MP_OBJ_TO_PTR(service);
 
@@ -274,17 +274,17 @@ STATIC mp_obj_t peripheral_add_service(mp_obj_t self_in, mp_obj_t service) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_add_service_obj, peripheral_add_service);
+static MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_add_service_obj, peripheral_add_service);
 
 /// \method getServices()
 /// Return list with all service registered in the Peripheral.
 ///
-STATIC mp_obj_t peripheral_get_services(mp_obj_t self_in) {
+static mp_obj_t peripheral_get_services(mp_obj_t self_in) {
     ubluepy_peripheral_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     return self->service_list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_get_services_obj, peripheral_get_services);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_get_services_obj, peripheral_get_services);
 
 #if MICROPY_PY_UBLUEPY_CENTRAL
 
@@ -337,7 +337,7 @@ void static disc_add_char(mp_obj_t service_in, ble_drv_char_data_t * p_desc_data
 /// addr_type can be either ADDR_TYPE_PUBLIC (default) or
 /// ADDR_TYPE_RANDOM_STATIC.
 ///
-STATIC mp_obj_t peripheral_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t peripheral_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_obj_t dev_addr              = pos_args[1];
 
@@ -439,11 +439,11 @@ STATIC mp_obj_t peripheral_connect(mp_uint_t n_args, const mp_obj_t *pos_args, m
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_peripheral_connect_obj, 2, peripheral_connect);
+static MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_peripheral_connect_obj, 2, peripheral_connect);
 
 #endif
 
-STATIC const mp_rom_map_elem_t ubluepy_peripheral_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_peripheral_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_withDelegate),           MP_ROM_PTR(&ubluepy_peripheral_with_delegate_obj) },
     { MP_ROM_QSTR(MP_QSTR_setNotificationHandler), MP_ROM_PTR(&ubluepy_peripheral_set_notif_handler_obj) },
     { MP_ROM_QSTR(MP_QSTR_setConnectionHandler),   MP_ROM_PTR(&ubluepy_peripheral_set_conn_handler_obj) },
@@ -480,7 +480,7 @@ STATIC const mp_rom_map_elem_t ubluepy_peripheral_locals_dict_table[] = {
 #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_peripheral_locals_dict, ubluepy_peripheral_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_peripheral_locals_dict, ubluepy_peripheral_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_peripheral_type,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
index 626578360ac95..cf329ddd9d780 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
@@ -37,7 +37,7 @@
 
 #include "ble_drv.h"
 
-STATIC void ubluepy_scan_entry_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_scan_entry_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_scan_entry_obj_t * self = (ubluepy_scan_entry_obj_t *)o;
     (void)self;
     mp_printf(print, "ScanEntry");
@@ -46,34 +46,34 @@ STATIC void ubluepy_scan_entry_print(const mp_print_t *print, mp_obj_t o, mp_pri
 /// \method addr()
 /// Return address as text string.
 ///
-STATIC mp_obj_t scan_entry_get_addr(mp_obj_t self_in) {
+static mp_obj_t scan_entry_get_addr(mp_obj_t self_in) {
     ubluepy_scan_entry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return self->addr;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_addr_obj, scan_entry_get_addr);
+static MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_addr_obj, scan_entry_get_addr);
 
 /// \method addr_type()
 /// Return address type value.
 ///
-STATIC mp_obj_t scan_entry_get_addr_type(mp_obj_t self_in) {
+static mp_obj_t scan_entry_get_addr_type(mp_obj_t self_in) {
     ubluepy_scan_entry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(self->addr_type);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_addr_type_obj, scan_entry_get_addr_type);
+static MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_addr_type_obj, scan_entry_get_addr_type);
 
 /// \method rssi()
 /// Return RSSI value.
 ///
-STATIC mp_obj_t scan_entry_get_rssi(mp_obj_t self_in) {
+static mp_obj_t scan_entry_get_rssi(mp_obj_t self_in) {
     ubluepy_scan_entry_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(self->rssi);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_rssi_obj, scan_entry_get_rssi);
+static MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_rssi_obj, scan_entry_get_rssi);
 
 /// \method getScanData()
 /// Return list of the scan data tuples (ad_type, description, value)
 ///
-STATIC mp_obj_t scan_entry_get_scan_data(mp_obj_t self_in) {
+static mp_obj_t scan_entry_get_scan_data(mp_obj_t self_in) {
     ubluepy_scan_entry_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     mp_obj_t retval_list = mp_obj_new_list(0, NULL);
@@ -125,16 +125,16 @@ STATIC mp_obj_t scan_entry_get_scan_data(mp_obj_t self_in) {
 
     return retval_list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_scan_entry_get_scan_data_obj, scan_entry_get_scan_data);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_scan_entry_get_scan_data_obj, scan_entry_get_scan_data);
 
-STATIC const mp_rom_map_elem_t ubluepy_scan_entry_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_scan_entry_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_addr),        MP_ROM_PTR(&bluepy_scan_entry_get_addr_obj) },
     { MP_ROM_QSTR(MP_QSTR_addr_type),   MP_ROM_PTR(&bluepy_scan_entry_get_addr_type_obj) },
     { MP_ROM_QSTR(MP_QSTR_rssi),        MP_ROM_PTR(&bluepy_scan_entry_get_rssi_obj) },
     { MP_ROM_QSTR(MP_QSTR_getScanData), MP_ROM_PTR(&ubluepy_scan_entry_get_scan_data_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_scan_entry_locals_dict, ubluepy_scan_entry_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_scan_entry_locals_dict, ubluepy_scan_entry_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_scan_entry_type,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index ffb7e946717b2..17d697b86e3ba 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -35,7 +35,7 @@
 #include "ble_drv.h"
 #include "mphalport.h"
 
-STATIC void adv_event_handler(mp_obj_t self_in, uint16_t event_id, ble_drv_adv_data_t * data) {
+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 = mp_obj_malloc(ubluepy_scan_entry_obj_t, &ubluepy_scan_entry_type);
@@ -62,13 +62,13 @@ STATIC void adv_event_handler(mp_obj_t self_in, uint16_t event_id, ble_drv_adv_d
     ble_drv_scan_start(true);
 }
 
-STATIC void ubluepy_scanner_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_scanner_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_scanner_obj_t * self = (ubluepy_scanner_obj_t *)o;
     (void)self;
     mp_printf(print, "Scanner");
 }
 
-STATIC mp_obj_t ubluepy_scanner_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 ubluepy_scanner_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[] = {
 
     };
@@ -86,7 +86,7 @@ STATIC mp_obj_t ubluepy_scanner_make_new(const mp_obj_type_t *type, size_t n_arg
 /// Scan for devices. Timeout is in milliseconds and will set the duration
 /// of the scanning.
 ///
-STATIC mp_obj_t scanner_scan(mp_obj_t self_in, mp_obj_t timeout_in) {
+static mp_obj_t scanner_scan(mp_obj_t self_in, mp_obj_t timeout_in) {
     ubluepy_scanner_obj_t * self = MP_OBJ_TO_PTR(self_in);
     mp_int_t timeout = mp_obj_get_int(timeout_in);
 
@@ -105,13 +105,13 @@ STATIC mp_obj_t scanner_scan(mp_obj_t self_in, mp_obj_t timeout_in) {
 
     return self->adv_reports;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_scanner_scan_obj, scanner_scan);
+static MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_scanner_scan_obj, scanner_scan);
 
-STATIC const mp_rom_map_elem_t ubluepy_scanner_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_scanner_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&ubluepy_scanner_scan_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_scanner_locals_dict, ubluepy_scanner_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_scanner_locals_dict, ubluepy_scanner_locals_dict_table);
 
 
 MP_DEFINE_CONST_OBJ_TYPE(
diff --git a/ports/nrf/modules/ubluepy/ubluepy_service.c b/ports/nrf/modules/ubluepy/ubluepy_service.c
index bf336d04c58ab..3c72c02c4af78 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_service.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_service.c
@@ -33,13 +33,13 @@
 #include "modubluepy.h"
 #include "ble_drv.h"
 
-STATIC void ubluepy_service_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_service_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_service_obj_t * self = (ubluepy_service_obj_t *)o;
 
     mp_printf(print, "Service(handle: 0x" HEX2_FMT ")", self->handle);
 }
 
-STATIC mp_obj_t ubluepy_service_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 ubluepy_service_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
 
     enum { ARG_NEW_UUID, ARG_NEW_TYPE };
 
@@ -86,7 +86,7 @@ STATIC mp_obj_t ubluepy_service_make_new(const mp_obj_type_t *type, size_t n_arg
 /// \method addCharacteristic(Characteristic)
 /// Add Characteristic to the Service.
 ///
-STATIC mp_obj_t service_add_characteristic(mp_obj_t self_in, mp_obj_t characteristic) {
+static mp_obj_t service_add_characteristic(mp_obj_t self_in, mp_obj_t characteristic) {
     ubluepy_service_obj_t        * self   = MP_OBJ_TO_PTR(self_in);
     ubluepy_characteristic_obj_t * p_char = MP_OBJ_TO_PTR(characteristic);
 
@@ -103,22 +103,22 @@ STATIC mp_obj_t service_add_characteristic(mp_obj_t self_in, mp_obj_t characteri
     // return mp_obj_new_bool(retval);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_service_add_char_obj, service_add_characteristic);
+static MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_service_add_char_obj, service_add_characteristic);
 
 /// \method getCharacteristics()
 /// Return list with all characteristics registered in the Service.
 ///
-STATIC mp_obj_t service_get_chars(mp_obj_t self_in) {
+static mp_obj_t service_get_chars(mp_obj_t self_in) {
     ubluepy_service_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     return self->char_list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_service_get_chars_obj, service_get_chars);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_service_get_chars_obj, service_get_chars);
 
 /// \method getCharacteristic(UUID)
 /// Return Characteristic with the given UUID.
 ///
-STATIC mp_obj_t service_get_characteristic(mp_obj_t self_in, mp_obj_t uuid) {
+static mp_obj_t service_get_characteristic(mp_obj_t self_in, mp_obj_t uuid) {
     ubluepy_service_obj_t * self   = MP_OBJ_TO_PTR(self_in);
     ubluepy_uuid_obj_t    * p_uuid = MP_OBJ_TO_PTR(uuid);
 
@@ -145,18 +145,18 @@ STATIC mp_obj_t service_get_characteristic(mp_obj_t self_in, mp_obj_t uuid) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_service_get_char_obj, service_get_characteristic);
+static MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_service_get_char_obj, service_get_characteristic);
 
 /// \method uuid()
 /// Get UUID instance of the Service.
 ///
-STATIC mp_obj_t service_uuid(mp_obj_t self_in) {
+static mp_obj_t service_uuid(mp_obj_t self_in) {
     ubluepy_service_obj_t * self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_FROM_PTR(self->p_uuid);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_service_get_uuid_obj, service_uuid);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_service_get_uuid_obj, service_uuid);
 
-STATIC const mp_rom_map_elem_t ubluepy_service_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_service_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_getCharacteristic),  MP_ROM_PTR(&ubluepy_service_get_char_obj) },
     { MP_ROM_QSTR(MP_QSTR_addCharacteristic),  MP_ROM_PTR(&ubluepy_service_add_char_obj) },
     { MP_ROM_QSTR(MP_QSTR_getCharacteristics), MP_ROM_PTR(&ubluepy_service_get_chars_obj) },
@@ -169,7 +169,7 @@ STATIC const mp_rom_map_elem_t ubluepy_service_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SECONDARY),  MP_ROM_INT(UBLUEPY_SERVICE_SECONDARY) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_service_locals_dict, ubluepy_service_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_service_locals_dict, ubluepy_service_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_service_type,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_uuid.c b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
index abfe3cadd525b..06313e8da2cbf 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_uuid.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
@@ -34,7 +34,7 @@
 #include "modubluepy.h"
 #include "ble_drv.h"
 
-STATIC void ubluepy_uuid_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+static void ubluepy_uuid_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
     ubluepy_uuid_obj_t * self = (ubluepy_uuid_obj_t *)o;
     if (self->type == UBLUEPY_UUID_16_BIT) {
         mp_printf(print, "UUID(uuid: 0x" HEX2_FMT HEX2_FMT ")",
@@ -45,7 +45,7 @@ STATIC void ubluepy_uuid_print(const mp_print_t *print, mp_obj_t o, mp_print_kin
     }
 }
 
-STATIC mp_obj_t ubluepy_uuid_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 ubluepy_uuid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
 
     enum { ARG_NEW_UUID };
 
@@ -140,7 +140,7 @@ STATIC mp_obj_t ubluepy_uuid_make_new(const mp_obj_type_t *type, size_t n_args,
 /// \method binVal()
 /// Get binary value of the 16 or 128 bit UUID. Returned as bytearray type.
 ///
-STATIC mp_obj_t uuid_bin_val(mp_obj_t self_in) {
+static mp_obj_t uuid_bin_val(mp_obj_t self_in) {
     ubluepy_uuid_obj_t * self = MP_OBJ_TO_PTR(self_in);
 
     // TODO: Extend the uint16 byte value to 16 byte if 128-bit,
@@ -148,9 +148,9 @@ STATIC mp_obj_t uuid_bin_val(mp_obj_t self_in) {
     //       the uint16_t field of the UUID.
     return MP_OBJ_NEW_SMALL_INT(self->value[0] | self->value[1] << 8);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_uuid_bin_val_obj, uuid_bin_val);
+static MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_uuid_bin_val_obj, uuid_bin_val);
 
-STATIC const mp_rom_map_elem_t ubluepy_uuid_locals_dict_table[] = {
+static const mp_rom_map_elem_t ubluepy_uuid_locals_dict_table[] = {
 #if 0
     { MP_ROM_QSTR(MP_QSTR_getCommonName), MP_ROM_PTR(&ubluepy_uuid_get_common_name_obj) },
 #endif
@@ -158,7 +158,7 @@ STATIC const mp_rom_map_elem_t ubluepy_uuid_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_binVal), MP_ROM_PTR(&ubluepy_uuid_bin_val_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ubluepy_uuid_locals_dict, ubluepy_uuid_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ubluepy_uuid_locals_dict, ubluepy_uuid_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_uuid_type,
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index c964a26c2e371..2a1a4cb13ba36 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -86,7 +86,7 @@ const nrfx_rtc_config_t rtc_config_time_ticks = {
     #endif
 };
 
-STATIC void rtc_irq_time(nrfx_rtc_int_type_t event) {
+static void rtc_irq_time(nrfx_rtc_int_type_t event) {
     // irq handler for overflow
     if (event == NRFX_RTC_INT_OVERFLOW) {
         rtc_overflows += 1;
diff --git a/ports/nrf/pin_named_pins.c b/ports/nrf/pin_named_pins.c
index 30e60692f7410..6fbe75c757a8a 100644
--- a/ports/nrf/pin_named_pins.c
+++ b/ports/nrf/pin_named_pins.c
@@ -31,7 +31,7 @@
 #include "py/mphal.h"
 #include "pin.h"
 
-STATIC void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pin_named_pins_obj_t *self = self_in;
     mp_printf(print, "<Pin.%q>", self->name);
 }
diff --git a/ports/pic16bit/modpyb.c b/ports/pic16bit/modpyb.c
index 9774105d66ae5..5e31eb8af8ca1 100644
--- a/ports/pic16bit/modpyb.c
+++ b/ports/pic16bit/modpyb.c
@@ -30,28 +30,28 @@
 #include "py/mphal.h"
 #include "modpyb.h"
 
-STATIC mp_obj_t pyb_millis(void) {
+static mp_obj_t pyb_millis(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_millis_obj, pyb_millis);
+static MP_DEFINE_CONST_FUN_OBJ_0(pyb_millis_obj, pyb_millis);
 
-STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
+static mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
     uint32_t startMillis = mp_obj_get_int(start);
     uint32_t currMillis = mp_hal_ticks_ms();
     return MP_OBJ_NEW_SMALL_INT((currMillis - startMillis) & 0x1fff);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
 
-STATIC mp_obj_t pyb_delay(mp_obj_t ms_in) {
+static mp_obj_t pyb_delay(mp_obj_t ms_in) {
     mp_int_t ms = mp_obj_get_int(ms_in);
     if (ms >= 0) {
         mp_hal_delay_ms(ms);
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_delay_obj, pyb_delay);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_delay_obj, pyb_delay);
 
-STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
+static const mp_rom_map_elem_t pyb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pyb) },
 
     { MP_ROM_QSTR(MP_QSTR_millis), MP_ROM_PTR(&pyb_millis_obj) },
@@ -62,7 +62,7 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Switch), MP_ROM_PTR(&pyb_switch_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);
+static MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);
 
 const mp_obj_module_t pyb_module = {
     .base = { &mp_type_module },
diff --git a/ports/pic16bit/modpybled.c b/ports/pic16bit/modpybled.c
index 47e83e0409215..34d41caec2325 100644
--- a/ports/pic16bit/modpybled.c
+++ b/ports/pic16bit/modpybled.c
@@ -32,7 +32,7 @@ typedef struct _pyb_led_obj_t {
     mp_obj_base_t base;
 } pyb_led_obj_t;
 
-STATIC const pyb_led_obj_t pyb_led_obj[] = {
+static const pyb_led_obj_t pyb_led_obj[] = {
     {{&pyb_led_type}},
     {{&pyb_led_type}},
     {{&pyb_led_type}},
@@ -46,7 +46,7 @@ void pyb_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t ki
     mp_printf(print, "LED(%u)", LED_ID(self));
 }
 
-STATIC mp_obj_t pyb_led_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 pyb_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, 1, false);
     mp_int_t led_id = mp_obj_get_int(args[0]);
     if (!(1 <= led_id && led_id <= NUM_LED)) {
@@ -60,29 +60,29 @@ mp_obj_t pyb_led_on(mp_obj_t self_in) {
     led_state(LED_ID(self), 1);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_led_on_obj, pyb_led_on);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_led_on_obj, pyb_led_on);
 
 mp_obj_t pyb_led_off(mp_obj_t self_in) {
     pyb_led_obj_t *self = self_in;
     led_state(LED_ID(self), 0);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_led_off_obj, pyb_led_off);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_led_off_obj, pyb_led_off);
 
 mp_obj_t pyb_led_toggle(mp_obj_t self_in) {
     pyb_led_obj_t *self = self_in;
     led_toggle(LED_ID(self));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_led_toggle_obj, pyb_led_toggle);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_led_toggle_obj, pyb_led_toggle);
 
-STATIC const mp_rom_map_elem_t pyb_led_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_led_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&pyb_led_on_obj) },
     { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&pyb_led_off_obj) },
     { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&pyb_led_toggle_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_led_locals_dict, pyb_led_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_led_locals_dict, pyb_led_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_led_type,
diff --git a/ports/pic16bit/modpybswitch.c b/ports/pic16bit/modpybswitch.c
index b7192c5bba69b..3e319f01b6c63 100644
--- a/ports/pic16bit/modpybswitch.c
+++ b/ports/pic16bit/modpybswitch.c
@@ -32,7 +32,7 @@ typedef struct _pyb_switch_obj_t {
     mp_obj_base_t base;
 } pyb_switch_obj_t;
 
-STATIC const pyb_switch_obj_t pyb_switch_obj[] = {
+static const pyb_switch_obj_t pyb_switch_obj[] = {
     {{&pyb_switch_type}},
     {{&pyb_switch_type}},
 };
@@ -45,7 +45,7 @@ void pyb_switch_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     mp_printf(print, "Switch(%u)", SWITCH_ID(self));
 }
 
-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) {
+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) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
     mp_int_t sw_id = mp_obj_get_int(args[0]);
     if (!(1 <= sw_id && sw_id <= NUM_SWITCH)) {
@@ -58,18 +58,18 @@ mp_obj_t pyb_switch_value(mp_obj_t self_in) {
     pyb_switch_obj_t *self = self_in;
     return switch_get(SWITCH_ID(self)) ? mp_const_true : mp_const_false;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_switch_value_obj, pyb_switch_value);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_switch_value_obj, pyb_switch_value);
 
 mp_obj_t pyb_switch_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, 0, false);
     return pyb_switch_value(self_in);
 }
 
-STATIC const mp_rom_map_elem_t pyb_switch_locals_dict_table[] = {
+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) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_type,
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 72eaad6eab392..5f6db937c3384 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -30,6 +30,6 @@
 // This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
 int pyexec_system_exit = 0;
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     // Do nothing.
 }
diff --git a/ports/renesas-ra/boardctrl.c b/ports/renesas-ra/boardctrl.c
index b6f0a9093843e..6459c029a7f3f 100644
--- a/ports/renesas-ra/boardctrl.c
+++ b/ports/renesas-ra/boardctrl.c
@@ -32,7 +32,7 @@
 #include "led.h"
 #include "usrsw.h"
 
-STATIC void flash_error(int n) {
+static void flash_error(int n) {
     for (int i = 0; i < n; i++) {
         led_state(RA_LED1, 1);
         mp_hal_delay_ms(250);
@@ -42,7 +42,7 @@ STATIC void flash_error(int n) {
 }
 
 #if !MICROPY_HW_USES_BOOTLOADER
-STATIC uint update_reset_mode(uint reset_mode) {
+static uint update_reset_mode(uint reset_mode) {
     #if MICROPY_HW_HAS_SWITCH
     bool press_status;
 
diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
index 915c23e3cd853..f1d445346d56e 100644
--- a/ports/renesas-ra/extint.c
+++ b/ports/renesas-ra/extint.c
@@ -91,8 +91,8 @@ typedef struct {
     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];
+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];
@@ -270,7 +270,7 @@ void extint_trigger_mode(uint line, uint32_t mode) {
 
 /// \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) {
+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);
@@ -280,45 +280,45 @@ STATIC mp_obj_t extint_obj_irq_no(mp_obj_t self_in) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_irq_no_obj, extint_obj_irq_no);
+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) {
+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);
+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) {
+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);
+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) {
+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);
+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) {
+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));
+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:
@@ -335,7 +335,7 @@ STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(extint_regs_obj, MP_ROM_PTR(&extint_regs
 ///   - `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[] = {
+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} },
@@ -343,7 +343,7 @@ STATIC const mp_arg_t pyb_extint_make_new_args[] = {
 };
 #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) {
+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
@@ -358,12 +358,12 @@ STATIC mp_obj_t extint_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     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) {
+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[] = {
+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) },
@@ -372,7 +372,7 @@ STATIC const mp_rom_map_elem_t extint_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_regs),    MP_ROM_PTR(&extint_regs_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
+static MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     extint_type,
diff --git a/ports/renesas-ra/flashbdev.c b/ports/renesas-ra/flashbdev.c
index c213ed8f9b89e..c3c252232c421 100644
--- a/ports/renesas-ra/flashbdev.c
+++ b/ports/renesas-ra/flashbdev.c
@@ -66,7 +66,7 @@ extern uint8_t _micropy_hw_internal_flash_storage_end;
 #error "no internal flash storage support for this MCU"
 #endif
 
-STATIC byte flash_cache_mem[FLASH_SECTOR_SIZE_MAX] __attribute__((aligned(16)));
+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)
diff --git a/ports/renesas-ra/irq.c b/ports/renesas-ra/irq.c
index fdaf2385cc9d1..3bef1712fccf3 100644
--- a/ports/renesas-ra/irq.c
+++ b/ports/renesas-ra/irq.c
@@ -36,7 +36,7 @@ uint32_t irq_stats[IRQ_STATS_MAX] = {0};
 // 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) {
+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);
@@ -44,7 +44,7 @@ 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) {
+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;
 }
@@ -52,7 +52,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj, 0, 1, machine_enable
 
 #if IRQ_ENABLE_STATS
 // return a memoryview of the irq statistics array
-STATIC mp_obj_t pyb_irq_stats(void) {
+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);
diff --git a/ports/renesas-ra/led.c b/ports/renesas-ra/led.c
index a2284c5339b94..c52cd50e7808a 100644
--- a/ports/renesas-ra/led.c
+++ b/ports/renesas-ra/led.c
@@ -51,7 +51,7 @@ typedef struct _ra_led_obj_t {
     const machine_pin_obj_t *led_pin;
 } ra_led_obj_t;
 
-STATIC const ra_led_obj_t ra_led_obj[] = {
+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},
@@ -118,7 +118,7 @@ void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t ki
 /// 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) {
+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);
 
@@ -158,17 +158,17 @@ mp_obj_t led_obj_toggle(mp_obj_t self_in) {
     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 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     ra_led_type,
diff --git a/ports/renesas-ra/machine_adc.c b/ports/renesas-ra/machine_adc.c
index 4ba30dff01e10..c617b69658e2e 100644
--- a/ports/renesas-ra/machine_adc.c
+++ b/ports/renesas-ra/machine_adc.c
@@ -70,14 +70,14 @@ typedef struct _machine_adc_obj_t {
     uint32_t sample_time;
 } machine_adc_obj_t;
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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 mp_machine_adc_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_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);
 
@@ -110,11 +110,11 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
     return ra_adc_read((uint32_t)(self->pin));
 }
 
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     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)
diff --git a/ports/renesas-ra/machine_dac.c b/ports/renesas-ra/machine_dac.c
index 0d9c779497588..5889fca1c253c 100644
--- a/ports/renesas-ra/machine_dac.c
+++ b/ports/renesas-ra/machine_dac.c
@@ -43,7 +43,7 @@ typedef struct _machine_dac_obj_t {
     mp_hal_pin_obj_t dac;
 } machine_dac_obj_t;
 
-STATIC machine_dac_obj_t machine_dac_obj[] = {
+static machine_dac_obj_t machine_dac_obj[] = {
     #if defined(MICROPY_HW_DAC0)
     {{&machine_dac_type}, 0, 0, 0, MICROPY_HW_DAC0},
     #endif
@@ -52,12 +52,12 @@ STATIC machine_dac_obj_t machine_dac_obj[] = {
     #endif
 };
 
-STATIC void machine_dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void machine_dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);     // const char *qstr_str(qstr q);
     mp_printf(print, "DAC(DA%d [#%d], active=%u, out=%u mV)", self->ch, self->dac->pin, self->active, self->mv);
 }
 
-STATIC mp_obj_t machine_dac_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_dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_hal_pin_obj_t pin_id = MP_OBJ_NULL;
     machine_dac_obj_t *self = MP_OBJ_NULL;
 
@@ -99,7 +99,7 @@ STATIC mp_obj_t machine_dac_make_new(const mp_obj_type_t *type, size_t n_args, s
 }
 
 // DAC.deinit()
-STATIC mp_obj_t machine_dac_deinit(mp_obj_t self_in) {
+static mp_obj_t machine_dac_deinit(mp_obj_t self_in) {
     machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     ra_dac_deinit(self->dac->pin, self->ch);
@@ -108,10 +108,10 @@ STATIC mp_obj_t machine_dac_deinit(mp_obj_t self_in) {
     self->mv = 0;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_deinit_obj, machine_dac_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_deinit_obj, machine_dac_deinit);
 
 // DAC.write(value)
-STATIC mp_obj_t machine_dac_write(mp_obj_t self_in, mp_obj_t data) { // mp_obj_t value_in
+static mp_obj_t machine_dac_write(mp_obj_t self_in, mp_obj_t data) { // mp_obj_t value_in
     machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t value = mp_obj_get_int(data);
 
@@ -124,18 +124,18 @@ STATIC mp_obj_t machine_dac_write(mp_obj_t self_in, mp_obj_t data) { // mp_obj_t
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_dac_write_obj, machine_dac_write);
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_dac_write_obj, machine_dac_write);
 
 // DAC.read()
-STATIC mp_obj_t machine_dac_read(mp_obj_t self_in) {
+static mp_obj_t machine_dac_read(mp_obj_t self_in) {
     machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     return MP_OBJ_NEW_SMALL_INT(ra_dac_read(self->ch));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_read_obj, machine_dac_read);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_read_obj, machine_dac_read);
 
 // DAC.write_mv(Vout)
-STATIC mp_obj_t machine_dac_write_mv(mp_obj_t self_in, mp_obj_t data) {  // mp_obj_t self_in, mp_obj_t value_in
+static mp_obj_t machine_dac_write_mv(mp_obj_t self_in, mp_obj_t data) {  // mp_obj_t self_in, mp_obj_t value_in
     machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t Vout = mp_obj_get_int(data);
 
@@ -149,19 +149,19 @@ STATIC mp_obj_t machine_dac_write_mv(mp_obj_t self_in, mp_obj_t data) {  // mp_o
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_dac_write_mv_obj, machine_dac_write_mv);
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_dac_write_mv_obj, machine_dac_write_mv);
 
 // DAC.read_mv()
-STATIC mp_obj_t machine_dac_read_mv(mp_obj_t self_in) {
+static mp_obj_t machine_dac_read_mv(mp_obj_t self_in) {
     machine_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     return MP_OBJ_NEW_SMALL_INT(self->mv);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_read_mv_obj, machine_dac_read_mv);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_dac_read_mv_obj, machine_dac_read_mv);
 
 // MP_DEFINE_CONST_FUN_OBJ_2(mp_machine_dac_write_obj, mp_machine_dac_write);
 
-STATIC const mp_rom_map_elem_t machine_dac_locals_dict_table[] = {
+static const mp_rom_map_elem_t machine_dac_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_dac_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&machine_dac_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&machine_dac_write_obj) },
@@ -169,7 +169,7 @@ STATIC const mp_rom_map_elem_t machine_dac_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write_mv), MP_ROM_PTR(&machine_dac_write_mv_obj) }
 };
 
-STATIC MP_DEFINE_CONST_DICT(machine_dac_locals_dict, machine_dac_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_dac_locals_dict, machine_dac_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_dac_type,
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index dc14be9594116..63bc4a4ec41de 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -49,7 +49,7 @@ typedef struct _machine_i2c_obj_t {
     uint32_t freq;
 } machine_i2c_obj_t;
 
-STATIC machine_i2c_obj_t machine_i2c_obj[] = {
+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
@@ -61,10 +61,10 @@ STATIC machine_i2c_obj_t machine_i2c_obj[] = {
     #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);
+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) {
+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;
@@ -74,7 +74,7 @@ STATIC int i2c_read(machine_i2c_obj_t *self, uint16_t addr, uint8_t *dest, size_
     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) {
+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;
@@ -86,18 +86,18 @@ STATIC int i2c_write(machine_i2c_obj_t *self, uint16_t addr, const uint8_t *src,
 
 // 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) {
+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) {
+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) {
+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[] = {
@@ -136,7 +136,7 @@ STATIC mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, s
     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) {
+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;
@@ -149,7 +149,7 @@ STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     return ret;
 }
 
-STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+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,
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
index e11188118c4bd..e8802b2e7a892 100644
--- a/ports/renesas-ra/machine_pin.c
+++ b/ports/renesas-ra/machine_pin.c
@@ -71,7 +71,7 @@ const machine_pin_obj_t *machine_pin_find(mp_obj_t 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) {
+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
@@ -142,7 +142,7 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 }
 
 // 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) {
+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}},
@@ -222,7 +222,7 @@ 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) {
+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) {
@@ -236,35 +236,35 @@ 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) {
+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) {
+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);
+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) {
+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);
+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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
 
 // 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) {
+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} },
@@ -288,9 +288,9 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     // 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);
+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[] = {
+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) },
@@ -323,9 +323,9 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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);
+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) {
+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);
 
@@ -341,7 +341,7 @@ STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return -1;
 }
 
-STATIC const mp_pin_p_t machine_pin_pin_p = {
+static const mp_pin_p_t machine_pin_pin_p = {
     .ioctl = machine_pin_ioctl,
 };
 
diff --git a/ports/renesas-ra/machine_pwm.c b/ports/renesas-ra/machine_pwm.c
index 69dc5bad59932..3044367a2e5a1 100644
--- a/ports/renesas-ra/machine_pwm.c
+++ b/ports/renesas-ra/machine_pwm.c
@@ -44,7 +44,7 @@ typedef struct _machine_pwm_obj_t {
     mp_hal_pin_obj_t pwm;
 } machine_pwm_obj_t;
 
-STATIC machine_pwm_obj_t machine_pwm_obj[] = {
+static machine_pwm_obj_t machine_pwm_obj[] = {
     #if defined(MICROPY_HW_PWM_0A)
     {{&machine_pwm_type}, R_GPT0, 0, 0, 'A', 0, 0ul, MICROPY_HW_PWM_0A},
     #endif
@@ -134,12 +134,12 @@ STATIC machine_pwm_obj_t machine_pwm_obj[] = {
 /******************************************************************************/
 // 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) {
+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(GTIOC %d%c[#%d], active=%u, freq=%u, duty=%u)", self->ch, self->id, self->pwm->pin, self->active, self->freq, self->duty);
 }
 
-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) {
+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) {
     uint32_t D = 0ul;
 
     enum { ARG_freq, ARG_duty };
@@ -178,7 +178,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, c
     }
 }
 
-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) {
+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_hal_pin_obj_t pin_id = MP_OBJ_NULL;
     machine_pwm_obj_t *self = MP_OBJ_NULL;
 
@@ -223,7 +223,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     ra_gpt_timer_deinit(self->pwm->pin, self->ch, self->id);
     self->active = 0;
     self->ch = 0;
@@ -232,11 +232,11 @@ STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     self->freq = 0;
 }
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     return MP_OBJ_NEW_SMALL_INT((uint32_t)ra_gpt_timer_get_freq(self->ch));
 }
 
-STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     if (freq) {
         ra_gpt_timer_set_freq(self->ch, (float)freq);
         self->freq = (uint32_t)ra_gpt_timer_get_freq(self->ch);
@@ -255,13 +255,13 @@ 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(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     // give the result in %
     uint64_t Dc = ra_gpt_timer_get_duty(self->ch, self->id) * 100;
     return MP_OBJ_NEW_SMALL_INT(Dc / ra_gpt_timer_get_period(self->ch));
 }
 
-STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
+static void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     // assume duty is in %
     if (duty < 0 || duty > 100) {
         mp_raise_ValueError(MP_ERROR_TEXT("duty should be 0-100"));
@@ -286,13 +286,13 @@ STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     }
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     // give the result in ratio (u16 / 65535)
     uint64_t Dc = ra_gpt_timer_get_duty(self->ch, self->id) * 65535;
     return MP_OBJ_NEW_SMALL_INT(Dc / ra_gpt_timer_get_period(self->ch));
 }
 
-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_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
     // assume duty is a ratio (u16 / 65535)
     if (duty_u16 < 0 || duty_u16 > 65535) {
         mp_raise_ValueError(MP_ERROR_TEXT("duty should be 0-65535"));
@@ -317,14 +317,14 @@ 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) {
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     // give the result in ns
     float ns = ra_gpt_timer_tick_time(self->ch);
     ns *= (float)ra_gpt_timer_get_duty(self->ch, self->id);
     return MP_OBJ_NEW_SMALL_INT(ns);
 }
 
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
     // assume duty is ns
     uint32_t ns_min = (uint32_t)ra_gpt_timer_tick_time(self->ch);
     uint32_t ns_max = ns_min * ra_gpt_timer_get_period(self->ch);
diff --git a/ports/renesas-ra/machine_rtc.c b/ports/renesas-ra/machine_rtc.c
index 6637ea44ccbd3..853b0e8fcbd75 100644
--- a/ports/renesas-ra/machine_rtc.c
+++ b/ports/renesas-ra/machine_rtc.c
@@ -62,11 +62,11 @@
 // 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 uint32_t rtc_startup_tick;
+static bool rtc_need_init_finalise = false;
+static uint32_t rtc_wakeup_param;
 
-STATIC void rtc_calendar_config(void) {
+static void rtc_calendar_config(void) {
     ra_rtc_t tm;
     tm.year = RTC_INIT_YEAR - 2000;
     tm.month = RTC_INIT_MONTH;
@@ -155,11 +155,11 @@ typedef struct _machine_rtc_obj_t {
     mp_obj_base_t base;
 } machine_rtc_obj_t;
 
-STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+static const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 /// \classmethod \constructor()
 /// Create an RTC object.
-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) {
+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);
 
@@ -333,14 +333,14 @@ mp_obj_t machine_rtc_calibration(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_calibration_obj, 1, 2, machine_rtc_calibration);
 
-STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+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(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
diff --git a/ports/renesas-ra/machine_sdcard.c b/ports/renesas-ra/machine_sdcard.c
index 2ed0d6653567a..ec3033a8a3451 100644
--- a/ports/renesas-ra/machine_sdcard.c
+++ b/ports/renesas-ra/machine_sdcard.c
@@ -47,7 +47,7 @@ typedef struct _machine_sdcard_obj_t {
     uint32_t block_count;
 } machine_sdcard_obj_t;
 
-STATIC machine_sdcard_obj_t machine_sdcard_objs[] = {
+static machine_sdcard_obj_t machine_sdcard_objs[] = {
     {{&machine_sdcard_type}, {false, false, false}, 0, 0}
 };
 
@@ -78,7 +78,7 @@ void sdhi_ISR(sdmmc_callback_args_t *p_args) {
     }
 }
 
-STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     fsp_err_t err = FSP_SUCCESS;
     machine_sdcard_obj_t *self = mp_const_none;
 
@@ -117,9 +117,9 @@ STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_
 
     return MP_OBJ_FROM_PTR(self);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_sdcard_init_obj, 1, machine_sdcard_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_sdcard_init_obj, 1, machine_sdcard_init);
 
-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) {
+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_arg_check_num(n_args, n_kw, 0, 0, true);
@@ -128,17 +128,17 @@ STATIC mp_obj_t sdcard_obj_make_new(const mp_obj_type_t *type, size_t n_args, si
 }
 
 // deinit()
-STATIC mp_obj_t machine_sdcard_deinit(mp_obj_t self_in) {
+static mp_obj_t machine_sdcard_deinit(mp_obj_t self_in) {
     machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     R_SDHI_Close(&g_sdmmc0_ctrl);
     self->block_count = self->block_len = 0;
     self->status.card_inserted = self->status.initialized = self->status.transfer_in_progress = false;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_deinit_obj, machine_sdcard_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_deinit_obj, machine_sdcard_deinit);
 
 // present()
-STATIC mp_obj_t machine_sdcard_present(mp_obj_t self_in) {
+static mp_obj_t machine_sdcard_present(mp_obj_t self_in) {
     fsp_err_t err = FSP_SUCCESS;
     machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if ((err = R_SDHI_StatusGet(&g_sdmmc0_ctrl, &self->status)) == FSP_SUCCESS) {
@@ -147,9 +147,9 @@ STATIC mp_obj_t machine_sdcard_present(mp_obj_t self_in) {
         mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_present_obj, machine_sdcard_present);
+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) {
+static mp_obj_t machine_sdcard_info(mp_obj_t self_in) {
     machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->status.card_inserted && self->status.initialized) {
@@ -165,10 +165,10 @@ STATIC mp_obj_t machine_sdcard_info(mp_obj_t self_in) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_info_obj, machine_sdcard_info);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_info_obj, machine_sdcard_info);
 
 // 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) {
+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;
     machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
@@ -188,10 +188,10 @@ STATIC mp_obj_t machine_sdcard_readblocks(mp_obj_t self_in, mp_obj_t block_num,
         return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_readblocks_obj, machine_sdcard_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_readblocks_obj, machine_sdcard_readblocks);
 
 // 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) {
+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;
     machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
@@ -211,10 +211,10 @@ STATIC mp_obj_t machine_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t block_num,
         return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_writeblocks_obj, machine_sdcard_writeblocks);
+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) {
+static mp_obj_t machine_sdcard_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
     machine_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t cmd = mp_obj_get_int(cmd_in);
 
@@ -313,9 +313,9 @@ STATIC mp_obj_t machine_sdcard_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t
             break;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_ioctl_obj, machine_sdcard_ioctl);
+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[] = {
+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) },
@@ -325,7 +325,7 @@ STATIC const mp_rom_map_elem_t sdcard_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(sdcard_locals_dict, sdcard_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_sdcard_type,
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index 04505178dab57..06a5a8fc4f7c4 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -66,7 +66,7 @@ typedef struct _machine_hard_spi_obj_t {
 /******************************************************************************/
 // Implementation of hard SPI for machine module
 
-STATIC machine_hard_spi_obj_t machine_hard_spi_obj[] = {
+static machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     #if defined(MICROPY_HW_SPI0_RSPCK)
     {
         {&machine_spi_type}, 0,
@@ -85,7 +85,7 @@ STATIC machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     #endif
 };
 
-STATIC void spi_init(machine_hard_spi_obj_t *self) {
+static void spi_init(machine_hard_spi_obj_t *self) {
     const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
 
     if (0) {
@@ -126,7 +126,7 @@ STATIC void spi_init(machine_hard_spi_obj_t *self) {
     ra_spi_init(self->spi_id, pins[3]->pin, pins[2]->pin, pins[1]->pin, pins[0]->pin, self->baudrate, self->bits, self->polarity, self->phase, self->firstbit);
 }
 
-STATIC void machine_hard_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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,
@@ -233,7 +233,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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) {
+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 };
@@ -315,17 +315,17 @@ STATIC void machine_hard_spi_init(mp_obj_base_t *self_in, size_t n_args, const m
     spi_init(self);
 }
 
-STATIC void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
+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) {
+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 = {
+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,
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 6c520f941f870..26ed625404374 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -42,9 +42,9 @@
     { 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 const char *_parity_name[] = {"None", "ODD", "EVEN"};
+static const char *_parity_name[] = {"None", "ODD", "EVEN"};
 
-STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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);
@@ -82,7 +82,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
 ///   - `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 void mp_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 void mp_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} },
@@ -221,7 +221,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
 ///   - `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 mp_machine_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 mp_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);
 
@@ -306,27 +306,27 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 // Turn off the UART bus.
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     uart_deinit(self);
 }
 
 // Return number of characters waiting.
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     return uart_rx_any(self);
 }
 
 // Return `true` if all characters have been sent.
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     return !uart_tx_busy(self);
 }
 
 // Send a break condition.
-STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     ra_sci_tx_break((uint32_t)self->uart_id);
 }
 
 // Write a single character on the bus.  `data` is an integer to write.
-STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
+static void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
     int errcode;
     if (uart_tx_wait(self, self->timeout)) {
         uart_tx_data(self, &data, 1, &errcode);
@@ -341,7 +341,7 @@ STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
 
 // Receive a single character on the bus.
 // Return value: The character read, as an integer.  Returns -1 on timeout.
-STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     if (uart_rx_wait(self, self->timeout)) {
         return uart_rx_char(self);
     } else {
@@ -350,7 +350,7 @@ STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     }
 }
 
-STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
     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));
@@ -381,7 +381,7 @@ STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
     return self->mp_irq_obj;
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
 
@@ -423,7 +423,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     }
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
 
@@ -452,7 +452,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     }
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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) {
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index 5925606f9c770..febb7b6d7aaa3 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -77,15 +77,15 @@
 #define RA_EARLY_PRINT  1       /* for enabling mp_print in boardctrl. */
 
 #if MICROPY_PY_THREAD
-STATIC pyb_thread_t pyb_thread_main;
+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 machine_uart_obj_t machine_uart_repl_obj;
-STATIC uint8_t machine_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) {
@@ -126,7 +126,7 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
 }
 #endif
 
-STATIC mp_obj_t pyb_main(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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} }
     };
@@ -147,7 +147,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) {
+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();
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 5bfbb919f44b4..dc38d809dd701 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -79,7 +79,7 @@
     { 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) }, \
 
-STATIC uint32_t reset_cause;
+static uint32_t reset_cause;
 
 void get_unique_id(uint8_t *id) {
     uint32_t *p = (uint32_t *)id;
@@ -100,7 +100,7 @@ void machine_deinit(void) {
 
 // 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) {
+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];
@@ -177,14 +177,14 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
 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 mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     uint8_t id[16];
     get_unique_id((uint8_t *)&id);
     return mp_obj_new_bytes(id, 16);
 }
 
 // Resets the pyboard in a manner similar to pushing the external RESET button.
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     powerctrl_mcu_reset();
 }
 
@@ -209,22 +209,22 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
 }
 
 // get or set the MCU frequencies
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     return mp_obj_new_int(SystemCoreClock);
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(MP_ERROR_TEXT("machine.freq set not supported yet"));
 }
 
 // idle()
 // This executies a wfi machine instruction which reduces power consumption
 // of the MCU until an interrupt occurs, at which point execution continues.
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     __WFI();
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_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]};
         machine_rtc_wakeup(2, args2);
@@ -232,7 +232,7 @@ STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     powerctrl_enter_stop_mode();
 }
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_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]};
         machine_rtc_wakeup(2, args2);
@@ -240,6 +240,6 @@ NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     powerctrl_enter_standby_mode();
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     return reset_cause;
 }
diff --git a/ports/renesas-ra/modos.c b/ports/renesas-ra/modos.c
index 8fd11007eaff0..2051e9420f909 100644
--- a/ports/renesas-ra/modos.c
+++ b/ports/renesas-ra/modos.c
@@ -46,7 +46,7 @@ void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t s
 }
 
 #if MICROPY_PY_OS_URANDOM
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -55,5 +55,5 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
diff --git a/ports/renesas-ra/modtime.c b/ports/renesas-ra/modtime.c
index 1ab51e336deb8..cbd639721fc2a 100644
--- a/ports/renesas-ra/modtime.c
+++ b/ports/renesas-ra/modtime.c
@@ -29,7 +29,7 @@
 #include "rtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     // get current date and time
     rtc_init_finalise();
     ra_rtc_t time;
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     // get date and time
     rtc_init_finalise();
     ra_rtc_t time;
diff --git a/ports/renesas-ra/mpbthciport.c b/ports/renesas-ra/mpbthciport.c
index 2e9f6d916698b..3fc7e8411f8ed 100644
--- a/ports/renesas-ra/mpbthciport.c
+++ b/ports/renesas-ra/mpbthciport.c
@@ -42,10 +42,10 @@
 
 uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 
-STATIC mp_sched_node_t mp_bluetooth_hci_sched_node;
-STATIC soft_timer_entry_t mp_bluetooth_hci_soft_timer;
+static mp_sched_node_t mp_bluetooth_hci_sched_node;
+static soft_timer_entry_t mp_bluetooth_hci_soft_timer;
 
-STATIC void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
+static void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
     mp_bluetooth_hci_poll_now();
 }
 
@@ -58,7 +58,7 @@ void mp_bluetooth_hci_init(void) {
         );
 }
 
-STATIC void mp_bluetooth_hci_start_polling(void) {
+static void mp_bluetooth_hci_start_polling(void) {
     mp_bluetooth_hci_poll_now();
 }
 
@@ -67,7 +67,7 @@ void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
 }
 
 // For synchronous mode, we run all BLE stack code inside a scheduled task.
-STATIC void run_events_scheduled_task(mp_sched_node_t *node) {
+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.
     mp_bluetooth_hci_poll();
 }
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index 8a8bfd8dc7a77..7a5bcba2c9128 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -47,7 +47,7 @@ void flash_cache_commit(void);
 #define MICROPY_HW_STDIN_BUFFER_LEN 512
 #endif
 
-STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_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
diff --git a/ports/renesas-ra/mpthreadport.c b/ports/renesas-ra/mpthreadport.c
index a7d85cfe32987..621b4311bfc34 100644
--- a/ports/renesas-ra/mpthreadport.c
+++ b/ports/renesas-ra/mpthreadport.c
@@ -34,7 +34,7 @@
 #if MICROPY_PY_THREAD
 
 // the mutex controls access to the linked list
-STATIC mp_thread_mutex_t thread_mutex;
+static mp_thread_mutex_t thread_mutex;
 
 void mp_thread_init(void) {
     mp_thread_mutex_init(&thread_mutex);
diff --git a/ports/renesas-ra/pybthread.c b/ports/renesas-ra/pybthread.c
index 603bc2e4ec090..cf3f4bc2e5ae7 100644
--- a/ports/renesas-ra/pybthread.c
+++ b/ports/renesas-ra/pybthread.c
@@ -88,7 +88,7 @@ void pyb_thread_deinit() {
     enable_irq(irq_state);
 }
 
-STATIC void pyb_thread_terminate(void) {
+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
diff --git a/ports/renesas-ra/ra_it.c b/ports/renesas-ra/ra_it.c
index de5a4e8daa7cc..71a5a66967068 100644
--- a/ports/renesas-ra/ra_it.c
+++ b/ports/renesas-ra/ra_it.c
@@ -50,7 +50,7 @@ extern void __fatal_error(const char *);
 // 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) {
+static char *fmt_hex(uint32_t val, char *buf) {
     const char *hexDig = "0123456789abcdef";
 
     buf[0] = hexDig[(val >> 28) & 0x0f];
@@ -66,7 +66,7 @@ STATIC char *fmt_hex(uint32_t val, char *buf) {
     return buf;
 }
 
-STATIC void print_reg(const char *label, uint32_t val) {
+static void print_reg(const char *label, uint32_t val) {
     char hexStr[9];
 
     mp_hal_stdout_tx_str(label);
@@ -74,7 +74,7 @@ STATIC void print_reg(const char *label, uint32_t val) {
     mp_hal_stdout_tx_str("\r\n");
 }
 
-STATIC void print_hex_hex(const char *label, uint32_t val1, uint32_t val2) {
+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));
diff --git a/ports/renesas-ra/storage.c b/ports/renesas-ra/storage.c
index 18dff9780078c..12416e4dc7a9f 100644
--- a/ports/renesas-ra/storage.c
+++ b/ports/renesas-ra/storage.c
@@ -249,7 +249,7 @@ const pyb_flash_obj_t pyb_flash_obj = {
     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) {
+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()");
@@ -258,7 +258,7 @@ STATIC void pyb_flash_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     }
 }
 
-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) {
+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[] = {
@@ -297,7 +297,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(self);
 }
 
-STATIC mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+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;
@@ -318,9 +318,9 @@ STATIC mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     #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_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) {
+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;
@@ -341,9 +341,9 @@ STATIC mp_obj_t pyb_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     #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_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) {
+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) {
@@ -390,15 +390,15 @@ STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_ioctl_obj, pyb_flash_ioctl);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pyb_flash_locals_dict, pyb_flash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_flash_type,
diff --git a/ports/renesas-ra/timer.c b/ports/renesas-ra/timer.c
index 1b32bc1eee29e..d264ab0612989 100644
--- a/ports/renesas-ra/timer.c
+++ b/ports/renesas-ra/timer.c
@@ -37,7 +37,7 @@
 #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);
+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 {
@@ -59,10 +59,10 @@ typedef struct _pyb_timer_obj_t {
 } 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);
+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);
+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};
 
@@ -86,7 +86,7 @@ void timer_deinit(void) {
  * Timer Class
  */
 
-STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
 }
@@ -106,7 +106,7 @@ STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 ///   - `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) {
+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[] = {
@@ -145,7 +145,7 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
 /// 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) {
+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);
 
@@ -174,10 +174,10 @@ STATIC mp_obj_t pyb_timer_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_init_obj, 1, pyb_timer_init);
 
 /// \method deinit()
 /// Deinitialises the timer.
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_init_obj, 1, pyb_timer_init);
 /// 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) {
+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
@@ -207,7 +207,7 @@ STATIC mp_obj_t pyb_timer_deinit(mp_obj_t self_in) {
     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);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
 
 #if defined(TIMER_CHANNEL)
 /// \method channel(channel, mode, ...)
@@ -221,7 +221,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
 /// 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 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} },
@@ -294,14 +294,14 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
     // ToDo
     return MP_OBJ_FROM_PTR(chan);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_obj, 2, pyb_timer_channel);
+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) {
+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
@@ -312,12 +312,12 @@ STATIC mp_obj_t pyb_timer_counter(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_counter_obj, 1, 2, pyb_timer_counter);
+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) {
+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) {
@@ -349,13 +349,13 @@ STATIC mp_obj_t pyb_timer_freq(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_freq_obj, 1, 2, pyb_timer_freq);
+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) {
+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
@@ -367,14 +367,14 @@ STATIC mp_obj_t pyb_timer_period(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_period_obj, 1, 2, pyb_timer_period);
+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) {
+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)
@@ -393,9 +393,9 @@ STATIC mp_obj_t pyb_timer_callback(mp_obj_t self_in, mp_obj_t callback) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_timer_callback_obj, pyb_timer_callback);
+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[] = {
+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) },
@@ -408,7 +408,7 @@ STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
     #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);
+static MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_type,
@@ -430,7 +430,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 /// 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) {
+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",
@@ -455,7 +455,7 @@ STATIC void pyb_timer_channel_print(const mp_print_t *print, mp_obj_t self_in, m
 ///
 /// 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) {
+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
@@ -466,13 +466,13 @@ STATIC mp_obj_t pyb_timer_channel_capture_compare(size_t n_args, const mp_obj_t
         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);
+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) {
+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)
@@ -493,17 +493,17 @@ STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback)
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_timer_channel_callback_obj, pyb_timer_channel_callback);
+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[] = {
+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 MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_channel_type,
     MP_QSTR_TimerChannel,
     MP_TYPE_FLAG_NONE,
@@ -512,7 +512,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif
 
-STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_obj_t callback) {
+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) {
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index 47c793e7d3b29..30707552b3efb 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -506,7 +506,7 @@ void uart_tx_strn(machine_uart_obj_t *uart_obj, const char *str, uint len) {
     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) {
+static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uart_irq_config(self, false);
     self->mp_irq_trigger = new_trigger;
@@ -514,7 +514,7 @@ STATIC mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     return 0;
 }
 
-STATIC mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+static mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (info_type == MP_IRQ_INFO_FLAGS) {
         return self->mp_irq_flags;
diff --git a/ports/renesas-ra/usrsw.c b/ports/renesas-ra/usrsw.c
index edbe519683013..746c7714a6232 100644
--- a/ports/renesas-ra/usrsw.c
+++ b/ports/renesas-ra/usrsw.c
@@ -69,7 +69,7 @@ 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}};
+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()");
@@ -77,7 +77,7 @@ void pyb_switch_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
 
 /// \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) {
+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);
 
@@ -101,15 +101,15 @@ 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_DEFINE_CONST_FUN_OBJ_1(pyb_switch_value_obj, pyb_switch_value);
 
-STATIC mp_obj_t switch_callback(mp_obj_t line) {
+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);
+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.
@@ -126,14 +126,14 @@ mp_obj_t pyb_switch_callback(mp_obj_t self_in, mp_obj_t callback) {
         true);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_switch_callback_obj, pyb_switch_callback);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_type,
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 3a7a71a741124..e5a428563d1ce 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -35,7 +35,7 @@
 #define ADC_CHANNEL_FROM_GPIO(gpio) ((gpio) - 26)
 #define ADC_CHANNEL_TEMPSENSOR (4)
 
-STATIC uint16_t adc_config_and_read_u16(uint32_t channel) {
+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;
@@ -57,13 +57,13 @@ typedef struct _machine_adc_obj_t {
     #endif
 } machine_adc_obj_t;
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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 mp_machine_adc_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_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);
 
@@ -132,7 +132,7 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
 }
 
 // read_u16()
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     #if MICROPY_HW_ADC_EXT_COUNT
     if (self->is_ext) {
         return machine_pin_ext_read_u16(self->channel);
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 9bea4be2caf57..28032e8085c24 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -83,12 +83,12 @@ typedef struct _machine_i2c_obj_t {
     uint32_t timeout;
 } machine_i2c_obj_t;
 
-STATIC machine_i2c_obj_t machine_i2c_obj[] = {
+static machine_i2c_obj_t machine_i2c_obj[] = {
     {{&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) {
+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, timeout=%u)",
         self->i2c_id, self->freq, self->scl, self->sda, self->timeout);
@@ -148,7 +148,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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) {
+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);
@@ -189,7 +189,7 @@ STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     }
 }
 
-STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+static const mp_machine_i2c_p_t machine_i2c_p = {
     .transfer = mp_machine_i2c_transfer_adaptor,
     .transfer_single = machine_i2c_transfer_single,
 };
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index ae8026a4af662..47eb5350a6439 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -97,14 +97,14 @@ typedef struct _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] = {
+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};
+static const PIO pio_instances[NUM_PIOS] = {pio0, pio1};
 
 //  PIO program for 16-bit write
 //    set(x, 14)                  .side(0b01)
@@ -117,8 +117,8 @@ STATIC const PIO pio_instances[NUM_PIOS] = {pio0, pio1};
 //    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 = {
+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
@@ -135,8 +135,8 @@ STATIC const pio_program_t pio_write_16 = {
 //    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 = {
+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
@@ -153,17 +153,17 @@ STATIC const pio_program_t pio_write_32 = {
 //    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 = {
+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);
+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++) {
@@ -171,7 +171,7 @@ void machine_i2s_init0(void) {
     }
 }
 
-STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
+static int8_t get_frame_mapping_index(int8_t bits, format_t format) {
     if (format == MONO) {
         if (bits == 16) {
             return 0;
@@ -188,7 +188,7 @@ STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
 }
 
 // function is used in IRQ context
-STATIC void empty_dma(machine_i2s_obj_t *self, uint8_t *dma_buffer_p) {
+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++) {
@@ -198,7 +198,7 @@ STATIC void empty_dma(machine_i2s_obj_t *self, uint8_t *dma_buffer_p) {
 }
 
 // function is used in IRQ context
-STATIC void feed_dma(machine_i2s_obj_t *self, uint8_t *dma_buffer_p) {
+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) {
 
@@ -230,7 +230,7 @@ STATIC void feed_dma(machine_i2s_obj_t *self, uint8_t *dma_buffer_p) {
     }
 }
 
-STATIC void irq_configure(machine_i2s_obj_t *self) {
+static void irq_configure(machine_i2s_obj_t *self) {
     if (self->i2s_id == 0) {
         irq_add_shared_handler(DMA_IRQ_0, dma_irq0_handler, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
         irq_set_enabled(DMA_IRQ_0, true);
@@ -240,7 +240,7 @@ STATIC void irq_configure(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC void irq_deinit(machine_i2s_obj_t *self) {
+static void irq_deinit(machine_i2s_obj_t *self) {
     if (self->i2s_id == 0) {
         irq_remove_handler(DMA_IRQ_0, dma_irq0_handler);
     } else {
@@ -248,7 +248,7 @@ STATIC void irq_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC void pio_configure(machine_i2s_obj_t *self) {
+static void pio_configure(machine_i2s_obj_t *self) {
     if (self->mode == TX) {
         if (self->bits == 16) {
             self->pio_program = &pio_write_16;
@@ -322,7 +322,7 @@ STATIC void pio_configure(machine_i2s_obj_t *self) {
     pio_sm_set_config(self->pio, self->sm, &config);
 }
 
-STATIC void pio_deinit(machine_i2s_obj_t *self) {
+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);
@@ -330,14 +330,14 @@ STATIC void pio_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-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) {
+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) {
+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) {
@@ -347,7 +347,7 @@ STATIC void gpio_configure(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC uint8_t dma_get_bits(i2s_mode_t mode, int8_t bits) {
+static uint8_t dma_get_bits(i2s_mode_t mode, int8_t bits) {
     if (mode == TX) {
         return bits;
     } else { // RX
@@ -357,7 +357,7 @@ STATIC uint8_t dma_get_bits(i2s_mode_t mode, int8_t bits) {
 }
 
 // determine which DMA channel is associated to this IRQ
-STATIC uint dma_map_irq_to_channel(uint irq_index) {
+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;
@@ -368,7 +368,7 @@ STATIC uint dma_map_irq_to_channel(uint irq_index) {
 }
 
 // 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) {
+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);
@@ -378,7 +378,7 @@ STATIC uint8_t *dma_get_buffer(machine_i2s_obj_t *i2s_obj, uint channel) {
     return NULL;
 }
 
-STATIC void dma_configure(machine_i2s_obj_t *self) {
+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)) {
@@ -433,7 +433,7 @@ STATIC void dma_configure(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC void dma_deinit(machine_i2s_obj_t *self) {
+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];
 
@@ -448,7 +448,7 @@ STATIC void dma_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC void dma_irq_handler(uint8_t irq_index) {
+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
@@ -488,15 +488,15 @@ STATIC void dma_irq_handler(uint8_t irq_index) {
     }
 }
 
-STATIC void dma_irq0_handler(void) {
+static void dma_irq0_handler(void) {
     dma_irq_handler(0);
 }
 
-STATIC void dma_irq1_handler(void) {
+static void dma_irq1_handler(void) {
     dma_irq_handler(1);
 }
 
-STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
+static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // 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);
@@ -563,7 +563,7 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     dma_channel_start(self->dma_channel[0]);
 }
 
-STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
+static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     if (i2s_id >= MAX_I2S_RP2) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
     }
@@ -581,7 +581,7 @@ STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     return self;
 }
 
-STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     // use self->pio as in indication that I2S object has already been de-initialized
     if (self->pio != NULL) {
         pio_deinit(self);
@@ -592,7 +592,7 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
     (void)self;
 }
 
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index b277a939e5abe..de217785690c2 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -85,21 +85,21 @@ typedef struct _machine_pin_irq_obj_t {
     uint32_t trigger;
 } machine_pin_irq_obj_t;
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods;
+static const mp_irq_methods_t machine_pin_irq_methods;
 extern const machine_pin_obj_t machine_pin_obj_table[NUM_BANK0_GPIOS];
 
 // 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_EXT_COUNT
-STATIC inline bool is_ext_pin(__unused const machine_pin_obj_t *self) {
+static inline bool is_ext_pin(__unused const machine_pin_obj_t *self) {
     return self->is_ext;
 }
 #else
 #define is_ext_pin(x) false
 #endif
 
-STATIC void gpio_irq(void) {
+static void gpio_irq(void) {
     for (int i = 0; i < 4; ++i) {
         uint32_t intr = iobank0_hw->intr[i];
         if (intr) {
@@ -196,7 +196,7 @@ const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
     mp_raise_ValueError("invalid pin");
 }
 
-STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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;
@@ -252,7 +252,7 @@ static const mp_arg_t allowed_args[] = {
     {MP_QSTR_alt,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_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 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)];
@@ -329,7 +329,7 @@ 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) {
+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) {
@@ -359,19 +359,19 @@ 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) {
+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) {
+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);
+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) {
+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_ext_pin(self)) {
         #if MICROPY_HW_PIN_EXT_COUNT
@@ -384,10 +384,10 @@ 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);
+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) {
+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_ext_pin(self)) {
         #if MICROPY_HW_PIN_EXT_COUNT
@@ -401,10 +401,10 @@ 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);
+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) {
+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_ext_pin(self)) {
         #if MICROPY_HW_PIN_EXT_COUNT
@@ -421,9 +421,9 @@ 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);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
 
-STATIC machine_pin_irq_obj_t *machine_pin_get_irq(mp_hal_pin_obj_t pin) {
+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[pin]);
 
@@ -459,7 +459,7 @@ void mp_hal_pin_interrupt(mp_hal_pin_obj_t pin, mp_obj_t handler, mp_uint_t trig
 }
 
 // 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) {
+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} },
@@ -485,9 +485,9 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     }
     return MP_OBJ_FROM_PTR(irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_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[] = {
+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) },
@@ -523,9 +523,9 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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);
+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) {
+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;
 
@@ -553,7 +553,7 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     return -1;
 }
 
-STATIC const mp_pin_p_t pin_pin_p = {
+static const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
@@ -568,7 +568,7 @@ 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) {
+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);
@@ -578,7 +578,7 @@ STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger
     return 0;
 }
 
-STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+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) {
@@ -589,7 +589,7 @@ STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     return 0;
 }
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+static const mp_irq_methods_t machine_pin_irq_methods = {
     .trigger = machine_pin_irq_trigger,
     .info = machine_pin_irq_info,
 };
diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index 0248b3142a0b6..4c0bc2c103243 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -50,7 +50,7 @@ enum {
     DUTY_NS
 };
 
-STATIC machine_pwm_obj_t machine_pwm_obj[] = {
+static machine_pwm_obj_t machine_pwm_obj[] = {
     {{&machine_pwm_type}, 0, PWM_CHAN_A, 0, DUTY_NOT_SET, 0 },
     {{&machine_pwm_type}, 0, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
     {{&machine_pwm_type}, 1, PWM_CHAN_A, 0, DUTY_NOT_SET, 0 },
@@ -69,14 +69,14 @@ STATIC machine_pwm_obj_t machine_pwm_obj[] = {
     {{&machine_pwm_type}, 7, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
 };
 
-STATIC bool defer_start;
-STATIC bool slice_freq_set[8];
+static bool defer_start;
+static bool slice_freq_set[8];
 
-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_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) {
+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 invert=%u>",
         self->slice, self->channel, self->invert);
@@ -94,7 +94,7 @@ void machine_pwm_start(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_init_helper(machine_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_u16, ARG_duty_ns, ARG_invert };
     static const mp_arg_t allowed_args[] = {
@@ -128,7 +128,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
 }
 
 // PWM(pin [, 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) {
+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, MP_OBJ_FUN_ARGS_MAX, true);
 
@@ -161,7 +161,7 @@ void machine_pwm_deinit_all(void) {
     }
 }
 
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     pwm_set_enabled(self->slice, false);
 }
 
@@ -188,7 +188,7 @@ 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) {
+static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     if (slice_freq_set[self->slice] == true) {
         uint32_t div16 = pwm_hw->slice[self->slice].div;
         uint32_t top = pwm_hw->slice[self->slice].top;
@@ -199,7 +199,7 @@ STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t 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
@@ -248,7 +248,7 @@ 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) {
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     if (self->duty_type != DUTY_NOT_SET && slice_freq_set[self->slice] == true) {
         uint32_t top = pwm_hw->slice[self->slice].top;
         uint32_t cc = pwm_hw->slice[self->slice].cc;
@@ -262,7 +262,7 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     }
 }
 
-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_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
     uint32_t top = pwm_hw->slice[self->slice].top;
 
     // Limit duty_u16 to 65535
@@ -277,7 +277,7 @@ STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u
     machine_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     if (self->duty_type != DUTY_NOT_SET && slice_freq_set[self->slice] == true) {
         uint32_t slice_hz = get_slice_hz_round(pwm_hw->slice[self->slice].div);
         uint32_t cc = pwm_hw->slice[self->slice].cc;
@@ -288,7 +288,7 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
     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;
     uint32_t top = pwm_hw->slice[self->slice].top;
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index eb2e1615b48f8..ce224be711b89 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -45,9 +45,9 @@ typedef struct _machine_rtc_obj_t {
 } machine_rtc_obj_t;
 
 // singleton RTC object
-STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+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) {
+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();
@@ -64,7 +64,7 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     return (mp_obj_t)&machine_rtc_obj;
 }
 
-STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+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;
@@ -110,12 +110,12 @@ STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index a4f4243b7a1fd..abf0a70bd0ebc 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -103,7 +103,7 @@ typedef struct _machine_spi_obj_t {
     uint32_t baudrate;
 } machine_spi_obj_t;
 
-STATIC machine_spi_obj_t machine_spi_obj[] = {
+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,
@@ -118,7 +118,7 @@ STATIC machine_spi_obj_t machine_spi_obj[] = {
     },
 };
 
-STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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,
@@ -197,7 +197,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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) {
+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} },
@@ -242,7 +242,7 @@ STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
     }
 }
 
-STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+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;
@@ -304,7 +304,7 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
 
 // Buffer protocol implementation for SPI.
 // The buffer represents the SPI data FIFO.
-STATIC mp_int_t machine_spi_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+static mp_int_t machine_spi_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     machine_spi_obj_t *self = MP_OBJ_TO_PTR(o_in);
 
     bufinfo->len = 4;
@@ -314,7 +314,7 @@ STATIC mp_int_t machine_spi_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo,
     return 0;
 }
 
-STATIC const mp_machine_spi_p_t machine_spi_p = {
+static const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
     .transfer = machine_spi_transfer,
 };
diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index f154507141a1f..6f8b04f10eab0 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -44,7 +44,7 @@ typedef struct _machine_timer_obj_t {
 
 const mp_obj_type_t machine_timer_type;
 
-STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
+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) {
@@ -54,7 +54,7 @@ STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
     }
 }
 
-STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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, tick_hz=1000000, period=", mode);
@@ -65,7 +65,7 @@ STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
     }
 }
 
-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) {
+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} },
@@ -104,7 +104,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     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) {
+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 = mp_obj_malloc_with_finaliser(machine_timer_obj_t, &machine_timer_type);
     self->pool = alarm_pool_get_default();
     self->alarm_id = ALARM_ID_INVALID;
@@ -130,7 +130,7 @@ 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_init(size_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) {
     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);
@@ -138,9 +138,9 @@ STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t
     }
     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_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) {
+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);
@@ -148,9 +148,9 @@ STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+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[] = {
+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) },
@@ -158,7 +158,7 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 72e68a6fb6b61..ccbf8f781ac82 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -81,10 +81,10 @@
 #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;
+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);
@@ -113,7 +113,7 @@ typedef struct _machine_uart_obj_t {
     mutex_t *write_mutex;
 } machine_uart_obj_t;
 
-STATIC machine_uart_obj_t machine_uart_obj[] = {
+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}, &read_mutex_0, {NULL, 1, 0, 0}, &write_mutex_0},
@@ -122,8 +122,8 @@ STATIC machine_uart_obj_t machine_uart_obj[] = {
      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"};
-STATIC const char *_invert_name[] = {"None", "INV_TX", "INV_RX", "INV_TX|INV_RX"};
+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
@@ -145,7 +145,7 @@ static inline void read_mutex_unlock(machine_uart_obj_t *u) {
 }
 
 // take all bytes from the fifo and store them in the buffer
-STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self) {
+static void uart_drain_rx_fifo(machine_uart_obj_t *self) {
     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. Every entry from
@@ -176,7 +176,7 @@ STATIC void uart_drain_rx_fifo(machine_uart_obj_t *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) {
+static void uart_fill_tx_fifo(machine_uart_obj_t *self) {
     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
@@ -186,7 +186,7 @@ STATIC void uart_fill_tx_fifo(machine_uart_obj_t *self) {
     }
 }
 
-STATIC inline void uart_service_interrupt(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 | 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);
@@ -199,11 +199,11 @@ STATIC inline void uart_service_interrupt(machine_uart_obj_t *self) {
     }
 }
 
-STATIC void uart0_irq_handler(void) {
+static void uart0_irq_handler(void) {
     uart_service_interrupt(&machine_uart_obj[0]);
 }
 
-STATIC void uart1_irq_handler(void) {
+static void uart1_irq_handler(void) {
     uart_service_interrupt(&machine_uart_obj[1]);
 }
 
@@ -216,7 +216,7 @@ STATIC void uart1_irq_handler(void) {
     { 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 void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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, "
         "txbuf=%d, rxbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
@@ -225,7 +225,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         self->timeout, self->timeout_char, _invert_name[self->invert]);
 }
 
-STATIC void mp_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 void mp_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[] = {
@@ -411,7 +411,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     }
 }
 
-STATIC mp_obj_t mp_machine_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 mp_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.
@@ -431,7 +431,7 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     uart_deinit(self->uart);
     if (self->uart_id == 0) {
         irq_set_enabled(UART0_IRQ, false);
@@ -443,24 +443,24 @@ STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     MP_STATE_PORT(rp2_uart_tx_buffer[self->uart_id]) = NULL;
 }
 
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     // get all bytes from the fifo first
     uart_drain_rx_fifo(self);
     return ringbuf_avail(&self->read_buffer);
 }
 
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     return ringbuf_avail(&self->write_buffer) == 0
            && (uart_get_hw(self->uart)->fr & UART_UARTFR_TXFE_BITS);
 }
 
-STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     uart_set_break(self->uart, true);
     mp_hal_delay_us(13000000 / self->baudrate + 1);
     uart_set_break(self->uart, false);
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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);
     mp_uint_t start = mp_hal_ticks_ms();
     mp_uint_t timeout = self->timeout;
@@ -492,7 +492,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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);
     mp_uint_t start = mp_hal_ticks_ms();
     mp_uint_t timeout = self->timeout;
@@ -534,7 +534,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
index 58c372176c721..9cc955810c6ea 100644
--- a/ports/rp2/machine_wdt.c
+++ b/ports/rp2/machine_wdt.c
@@ -36,9 +36,9 @@ 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 const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
 
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     // Verify the WDT id.
     if (id != 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("WDT(%d) doesn't exist"), id);
@@ -54,7 +54,7 @@ STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t
     return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     (void)self;
     watchdog_update();
 }
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 70b22dac01fc3..6189e7dc53796 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -55,20 +55,20 @@
     { 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_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_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));
 }
 
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     watchdog_reboot(0, SRAM_END, 0);
     for (;;) {
         __wfi();
     }
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     int reset_cause;
     if (watchdog_caused_reboot()) {
         reset_cause = RP2_RESET_WDT;
@@ -86,11 +86,11 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq());
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     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"));
@@ -101,11 +101,11 @@ STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     #endif
 }
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     __wfe();
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_int_t delay_ms = 0;
     bool use_timer_alarm = false;
 
@@ -189,7 +189,7 @@ STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     restore_interrupts(my_interrupts);
 }
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_lightsleep(n_args, args);
     mp_machine_reset();
 }
diff --git a/ports/rp2/modos.c b/ports/rp2/modos.c
index 77f980a731bb8..0008854a16e30 100644
--- a/ports/rp2/modos.c
+++ b/ports/rp2/modos.c
@@ -28,7 +28,7 @@
 
 uint8_t rosc_random_u8(size_t cycles);
 
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -37,4 +37,4 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index bd00eaf40c89d..c90b6d5840208 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -44,7 +44,7 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj);
 
 // Improved version of
 // https://github.com/raspberrypi/pico-examples/blob/master/picoboard/button/button.c
-STATIC bool __no_inline_not_in_flash_func(bootsel_button)(void) {
+static bool __no_inline_not_in_flash_func(bootsel_button)(void) {
     const uint CS_PIN_INDEX = 1;
 
     // Disable interrupts and the other core since they might be
@@ -77,13 +77,13 @@ STATIC bool __no_inline_not_in_flash_func(bootsel_button)(void) {
     return button_state;
 }
 
-STATIC mp_obj_t rp2_bootsel_button(void) {
+static mp_obj_t rp2_bootsel_button(void) {
     return MP_OBJ_NEW_SMALL_INT(bootsel_button());
 }
 MP_DEFINE_CONST_FUN_OBJ_0(rp2_bootsel_button_obj, rp2_bootsel_button);
 
 
-STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
+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) },
@@ -96,7 +96,7 @@ STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_country),             MP_ROM_PTR(&mod_network_country_obj) },
     #endif
 };
-STATIC MP_DEFINE_CONST_DICT(rp2_module_globals, rp2_module_globals_table);
+static MP_DEFINE_CONST_DICT(rp2_module_globals, rp2_module_globals_table);
 
 const mp_obj_module_t mp_module_rp2 = {
     .base = { &mp_type_module },
diff --git a/ports/rp2/modtime.c b/ports/rp2/modtime.c
index b4120be7c3ea6..21e5cb459b283 100644
--- a/ports/rp2/modtime.c
+++ b/ports/rp2/modtime.c
@@ -29,7 +29,7 @@
 #include "hardware/rtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     datetime_t t;
     rtc_get_datetime(&t);
     mp_obj_t tuple[8] = {
@@ -46,7 +46,7 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(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));
diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index 1aacbe881f9f0..0112304620deb 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -65,7 +65,7 @@ void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
 
 // 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 void run_events_scheduled_task(mp_sched_node_t *node) {
+static void run_events_scheduled_task(mp_sched_node_t *node) {
     (void)node;
     // This will process all buffered HCI UART data, and run any callouts or events.
     mp_bluetooth_hci_poll();
@@ -81,7 +81,7 @@ void mp_bluetooth_hci_poll_now(void) {
 
 mp_obj_t mp_bthci_uart;
 
-STATIC void mp_bluetooth_hci_start_polling(void) {
+static void mp_bluetooth_hci_start_polling(void) {
     mp_bluetooth_hci_poll_now();
 }
 
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index c5ae221e984b4..1641eadb7b696 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -44,7 +44,7 @@
 
 // This needs to be added to the result of time_us_64() to get the number of
 // microseconds since the Epoch.
-STATIC uint64_t time_us_64_offset_from_epoch;
+static uint64_t time_us_64_offset_from_epoch;
 
 static alarm_id_t soft_timer_alarm_id = 0;
 
@@ -54,7 +54,7 @@ static alarm_id_t soft_timer_alarm_id = 0;
 #define MICROPY_HW_STDIN_BUFFER_LEN 512
 #endif
 
-STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_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
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 977df80449b1e..8d8f13a089059 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -39,14 +39,14 @@ extern uint8_t __StackTop, __StackBottom;
 void *core_state[2];
 
 // This will be non-NULL while Python code is executing.
-STATIC void *(*core1_entry)(void *) = NULL;
+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;
+static void *core1_arg = NULL;
+static uint32_t *core1_stack = NULL;
+static size_t core1_stack_num_words = 0;
 
 // Thread mutex.
-STATIC mutex_t atomic_mutex;
+static mutex_t atomic_mutex;
 
 uint32_t mp_thread_begin_atomic_section(void) {
     if (core1_entry) {
@@ -102,7 +102,7 @@ void mp_thread_gc_others(void) {
     }
 }
 
-STATIC void core1_entry_wrapper(void) {
+static void core1_entry_wrapper(void) {
     // Allow MICROPY_BEGIN_ATOMIC_SECTION to be invoked from core0.
     multicore_lockout_victim_init();
 
diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
index 27624ea8bfe12..3afcf8b5d63af 100644
--- a/ports/rp2/rp2_dma.c
+++ b/ports/rp2/rp2_dma.c
@@ -56,7 +56,7 @@ typedef struct _rp2_dma_ctrl_field_t {
     uint8_t read_only : 1;
 } rp2_dma_ctrl_field_t;
 
-STATIC rp2_dma_ctrl_field_t rp2_dma_ctrl_fields_table[] = {
+static rp2_dma_ctrl_field_t rp2_dma_ctrl_fields_table[] = {
     { MP_QSTR_enable,        0, 1, 0 },
     { MP_QSTR_high_pri,      1, 1, 0 },
     { MP_QSTR_size,          2, 2, 0 },
@@ -76,14 +76,14 @@ STATIC rp2_dma_ctrl_field_t rp2_dma_ctrl_fields_table[] = {
     { MP_QSTR_ahb_err,      31, 1, 1 },
 };
 
-STATIC const uint32_t rp2_dma_ctrl_field_count = MP_ARRAY_SIZE(rp2_dma_ctrl_fields_table);
+static const uint32_t rp2_dma_ctrl_field_count = MP_ARRAY_SIZE(rp2_dma_ctrl_fields_table);
 
 #define REG_TYPE_COUNT       0  // Accept just integers
 #define REG_TYPE_CONF        1  // Accept integers or ctrl values
 #define REG_TYPE_ADDR_READ   2  // Accept integers, buffers or objects that can be read from
 #define REG_TYPE_ADDR_WRITE  3  // Accept integers, buffers or objects that can be written to
 
-STATIC uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) {
+static uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) {
     if (reg_type == REG_TYPE_ADDR_READ || reg_type == REG_TYPE_ADDR_WRITE) {
         mp_buffer_info_t buf_info;
         mp_uint_t flags = (reg_type == REG_TYPE_ADDR_READ) ? MP_BUFFER_READ : MP_BUFFER_WRITE;
@@ -95,7 +95,7 @@ STATIC uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) {
     return mp_obj_get_int_truncated(o);
 }
 
-STATIC void rp2_dma_irq_handler(void) {
+static void rp2_dma_irq_handler(void) {
     // Main IRQ handler
     uint32_t irq_bits = dma_hw->ints0;
 
@@ -113,7 +113,7 @@ STATIC void rp2_dma_irq_handler(void) {
     }
 }
 
-STATIC mp_uint_t rp2_dma_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+static mp_uint_t rp2_dma_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
     irq_set_enabled(DMA_IRQ_0, false);
     self->irq_flag = 0;
@@ -122,7 +122,7 @@ STATIC mp_uint_t rp2_dma_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     return 0;
 }
 
-STATIC mp_uint_t rp2_dma_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+static mp_uint_t rp2_dma_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (info_type == MP_IRQ_INFO_FLAGS) {
         return self->irq_flag;
@@ -132,12 +132,12 @@ STATIC mp_uint_t rp2_dma_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     return 0;
 }
 
-STATIC const mp_irq_methods_t rp2_dma_irq_methods = {
+static const mp_irq_methods_t rp2_dma_irq_methods = {
     .trigger = rp2_dma_irq_trigger,
     .info = rp2_dma_irq_info,
 };
 
-STATIC mp_obj_t rp2_dma_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 rp2_dma_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);
 
     int dma_channel = dma_claim_unused_channel(false);
@@ -152,13 +152,13 @@ STATIC mp_obj_t rp2_dma_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void rp2_dma_error_if_closed(rp2_dma_obj_t *self) {
+static void rp2_dma_error_if_closed(rp2_dma_obj_t *self) {
     if (self->channel == CHANNEL_CLOSED) {
         mp_raise_ValueError(MP_ERROR_TEXT("channel closed"));
     }
 }
 
-STATIC void rp2_dma_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
+static void rp2_dma_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (dest[0] == MP_OBJ_NULL) {
@@ -215,13 +215,13 @@ STATIC void rp2_dma_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
     }
 }
 
-STATIC void rp2_dma_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void rp2_dma_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "DMA(%u)", self->channel);
 }
 
 // DMA.config(*, read, write, count, ctrl, trigger)
-STATIC mp_obj_t rp2_dma_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t rp2_dma_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(*pos_args);
 
     rp2_dma_error_if_closed(self);
@@ -277,10 +277,10 @@ STATIC mp_obj_t rp2_dma_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_config_obj, 1, rp2_dma_config);
+static MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_config_obj, 1, rp2_dma_config);
 
 // DMA.active([value])
-STATIC mp_obj_t rp2_dma_active(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t rp2_dma_active(size_t n_args, const mp_obj_t *args) {
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     rp2_dma_error_if_closed(self);
 
@@ -295,13 +295,13 @@ STATIC mp_obj_t rp2_dma_active(size_t n_args, const mp_obj_t *args) {
     uint32_t busy = dma_channel_is_busy(self->channel);
     return mp_obj_new_bool((mp_int_t)busy);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_dma_active_obj, 1, 2, rp2_dma_active);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_dma_active_obj, 1, 2, rp2_dma_active);
 
 // Default is quiet, unpaced, read and write incrementing, word transfers, enabled
 #define DEFAULT_DMA_CONFIG (1 << 21) | (0x3f << 15) | (1 << 5) | (1 << 4) | (2 << 2) | (1 << 0)
 
 // DMA.pack_ctrl(...)
-STATIC mp_obj_t rp2_dma_pack_ctrl(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t rp2_dma_pack_ctrl(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // Pack keyword settings into a control register value, using either the default for this
     // DMA channel or the provided defaults
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -346,10 +346,10 @@ STATIC mp_obj_t rp2_dma_pack_ctrl(size_t n_pos_args, const mp_obj_t *pos_args, m
 
     return mp_obj_new_int_from_uint(value);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_pack_ctrl_obj, 1, rp2_dma_pack_ctrl);
+static MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_pack_ctrl_obj, 1, rp2_dma_pack_ctrl);
 
 // DMA.unpack_ctrl(value)
-STATIC mp_obj_t rp2_dma_unpack_ctrl(mp_obj_t value_obj) {
+static mp_obj_t rp2_dma_unpack_ctrl(mp_obj_t value_obj) {
     // Return a dict representing the unpacked fields of a control register value
     mp_obj_t result_dict[rp2_dma_ctrl_field_count * 2];
 
@@ -364,10 +364,10 @@ STATIC mp_obj_t rp2_dma_unpack_ctrl(mp_obj_t value_obj) {
 
     return mp_obj_dict_make_new(&mp_type_dict, 0, rp2_dma_ctrl_field_count, result_dict);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_dma_unpack_ctrl_fun_obj, rp2_dma_unpack_ctrl);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(rp2_dma_unpack_ctrl_obj, MP_ROM_PTR(&rp2_dma_unpack_ctrl_fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_1(rp2_dma_unpack_ctrl_fun_obj, rp2_dma_unpack_ctrl);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(rp2_dma_unpack_ctrl_obj, MP_ROM_PTR(&rp2_dma_unpack_ctrl_fun_obj));
 
-STATIC mp_obj_t rp2_dma_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t rp2_dma_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_handler, ARG_hard };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} },
@@ -409,10 +409,10 @@ STATIC mp_obj_t rp2_dma_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     return MP_OBJ_FROM_PTR(irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_irq_obj, 1, rp2_dma_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(rp2_dma_irq_obj, 1, rp2_dma_irq);
 
 // DMA.close()
-STATIC mp_obj_t rp2_dma_close(mp_obj_t self_in) {
+static mp_obj_t rp2_dma_close(mp_obj_t self_in) {
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint8_t channel = self->channel;
 
@@ -431,9 +431,9 @@ STATIC mp_obj_t rp2_dma_close(mp_obj_t self_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_dma_close_obj, rp2_dma_close);
+static MP_DEFINE_CONST_FUN_OBJ_1(rp2_dma_close_obj, rp2_dma_close);
 
-STATIC const mp_rom_map_elem_t rp2_dma_locals_dict_table[] = {
+static const mp_rom_map_elem_t rp2_dma_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&rp2_dma_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&rp2_dma_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&rp2_dma_irq_obj) },
@@ -442,7 +442,7 @@ STATIC const mp_rom_map_elem_t rp2_dma_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_pack_ctrl), MP_ROM_PTR(&rp2_dma_pack_ctrl_obj) },
     { MP_ROM_QSTR(MP_QSTR_unpack_ctrl), MP_ROM_PTR(&rp2_dma_unpack_ctrl_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(rp2_dma_locals_dict, rp2_dma_locals_dict_table);
+static MP_DEFINE_CONST_DICT(rp2_dma_locals_dict, rp2_dma_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     rp2_dma_type,
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 35c51641692f4..c1acb54e75748 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -53,7 +53,7 @@ typedef struct _rp2_flash_obj_t {
     uint32_t flash_size;
 } rp2_flash_obj_t;
 
-STATIC rp2_flash_obj_t rp2_flash_obj = {
+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,
@@ -86,7 +86,7 @@ static void end_critical_flash_section(uint32_t state) {
     }
 }
 
-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) {
+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) {
     // Parse arguments
     enum { ARG_start, ARG_len };
     static const mp_arg_t allowed_args[] = {
@@ -128,7 +128,7 @@ STATIC mp_obj_t rp2_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t rp2_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+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;
@@ -143,9 +143,9 @@ STATIC mp_obj_t rp2_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     mp_event_handle_nowait();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_flash_readblocks_obj, 3, 4, rp2_flash_readblocks);
+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) {
+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;
@@ -166,9 +166,9 @@ STATIC mp_obj_t rp2_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     // 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_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) {
+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) {
@@ -194,14 +194,14 @@ STATIC mp_obj_t rp2_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(rp2_flash_ioctl_obj, rp2_flash_ioctl);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(rp2_flash_locals_dict, rp2_flash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     rp2_flash_type,
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 42e61684b3369..b882bbbc50c8c 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -65,17 +65,17 @@ typedef struct _rp2_state_machine_irq_obj_t {
     uint8_t trigger;
 } 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 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 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 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) {
+static void pio_irq0(PIO pio) {
     uint32_t ints = pio->ints0;
 
     // Acknowledge SM0-3 IRQs if they are enabled on this IRQ0.
@@ -98,16 +98,16 @@ STATIC void pio_irq0(PIO pio) {
     }
 }
 
-STATIC void pio0_irq0(void) {
+static void pio0_irq0(void) {
     pio_irq0(pio0);
 }
 
-STATIC void pio1_irq0(void) {
+static void pio1_irq0(void) {
     pio_irq0(pio1);
 }
 
 // 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) {
+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;
@@ -115,7 +115,7 @@ STATIC uint rp2_pio_add_managed_program(PIO pio, struct pio_program *pio_program
 }
 
 // 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) {
+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;
@@ -123,7 +123,7 @@ STATIC void rp2_pio_remove_managed_program(PIO pio, struct pio_program *pio_prog
 
 // 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) {
+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)) {
@@ -188,13 +188,13 @@ typedef struct _asm_pio_config_t {
     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) {
+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) {
+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)) {
@@ -223,7 +223,7 @@ STATIC void asm_pio_get_pins(const char *type, mp_obj_t prog_pins, mp_obj_t arg_
     }
 }
 
-STATIC void asm_pio_init_gpio(PIO pio, uint32_t sm, asm_pio_config_t *config) {
+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);
@@ -235,20 +235,20 @@ STATIC void asm_pio_init_gpio(PIO pio, uint32_t sm, asm_pio_config_t *config) {
 /******************************************************************************/
 // PIO object
 
-STATIC const mp_irq_methods_t rp2_pio_irq_methods;
+static const mp_irq_methods_t rp2_pio_irq_methods;
 
-STATIC rp2_pio_obj_t rp2_pio_obj[] = {
+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) {
+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) {
+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.
@@ -263,7 +263,7 @@ STATIC mp_obj_t rp2_pio_make_new(const mp_obj_type_t *type, size_t n_args, size_
 }
 
 // PIO.add_program(prog)
-STATIC mp_obj_t rp2_pio_add_program(mp_obj_t self_in, mp_obj_t prog_in) {
+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.
@@ -284,10 +284,10 @@ STATIC mp_obj_t rp2_pio_add_program(mp_obj_t self_in, mp_obj_t prog_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(rp2_pio_add_program_obj, rp2_pio_add_program);
+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) {
+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.
@@ -315,10 +315,10 @@ STATIC mp_obj_t rp2_pio_remove_program(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_pio_remove_program_obj, 1, 2, rp2_pio_remove_program);
+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) {
+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.
@@ -340,7 +340,7 @@ STATIC mp_obj_t rp2_pio_state_machine(size_t n_args, const mp_obj_t *pos_args, m
 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) {
+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} },
@@ -388,9 +388,9 @@ STATIC mp_obj_t rp2_pio_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     return MP_OBJ_FROM_PTR(irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_pio_irq_obj, 1, rp2_pio_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[] = {
+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) },
@@ -413,7 +413,7 @@ STATIC const mp_rom_map_elem_t rp2_pio_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(rp2_pio_locals_dict, rp2_pio_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     rp2_pio_type,
@@ -424,7 +424,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &rp2_pio_locals_dict
     );
 
-STATIC mp_uint_t rp2_pio_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+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);
@@ -434,7 +434,7 @@ STATIC mp_uint_t rp2_pio_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     return 0;
 }
 
-STATIC mp_uint_t rp2_pio_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+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) {
@@ -445,7 +445,7 @@ STATIC mp_uint_t rp2_pio_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     return 0;
 }
 
-STATIC const mp_irq_methods_t rp2_pio_irq_methods = {
+static const mp_irq_methods_t rp2_pio_irq_methods = {
     .trigger = rp2_pio_irq_trigger,
     .info = rp2_pio_irq_info,
 };
@@ -454,11 +454,11 @@ 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 uint32_t rp2_state_machine_claimed_mask;
 
-STATIC const mp_irq_methods_t rp2_state_machine_irq_methods;
+static const mp_irq_methods_t rp2_state_machine_irq_methods;
 
-STATIC const rp2_state_machine_obj_t rp2_state_machine_obj[] = {
+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 },
@@ -469,7 +469,7 @@ 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) {
+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");
     }
@@ -487,7 +487,7 @@ STATIC const rp2_state_machine_obj_t *rp2_state_machine_get_object(mp_int_t sm_i
     return sm_obj;
 }
 
-STATIC void rp2_state_machine_reset_all(void) {
+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];
@@ -498,7 +498,7 @@ STATIC void rp2_state_machine_reset_all(void) {
     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) {
+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);
 }
@@ -508,7 +508,7 @@ STATIC void rp2_state_machine_print(const mp_print_t *print, mp_obj_t self_in, m
 //     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) {
+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_jmp_pin, ARG_sideset_base,
@@ -639,7 +639,7 @@ STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
 }
 
 // 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) {
+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.
@@ -657,32 +657,32 @@ STATIC mp_obj_t rp2_state_machine_make_new(const mp_obj_type_t *type, size_t n_a
     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) {
+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);
+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) {
+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);
+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) {
+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);
+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) {
+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_int_t encoded = 0;
     if (!mp_obj_get_int_maybe(instr_in, &encoded)) {
@@ -700,10 +700,10 @@ STATIC mp_obj_t rp2_state_machine_exec(mp_obj_t self_in, mp_obj_t instr_in) {
     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);
+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) {
+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;
@@ -752,10 +752,10 @@ STATIC mp_obj_t rp2_state_machine_get(size_t n_args, const mp_obj_t *args) {
         }
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_get_obj, 1, 3, rp2_state_machine_get);
+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) {
+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) {
@@ -793,26 +793,26 @@ STATIC mp_obj_t rp2_state_machine_put(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_put_obj, 2, 3, rp2_state_machine_put);
+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) {
+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);
+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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_1(rp2_state_machine_tx_fifo_obj, rp2_state_machine_tx_fifo);
 
 // Buffer protocol implementation for StateMachine.
 // The buffer represents one of the FIFO ports of the state machine. Note that a different
 // pointer is returned depending on if this is for reading or writing.
-STATIC mp_int_t rp2_state_machine_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+static mp_int_t rp2_state_machine_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(o_in);
 
     bufinfo->len = 4;
@@ -827,7 +827,7 @@ STATIC mp_int_t rp2_state_machine_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bu
 }
 
 // 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) {
+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} },
@@ -880,9 +880,9 @@ STATIC mp_obj_t rp2_state_machine_irq(size_t n_args, const mp_obj_t *pos_args, m
 
     return MP_OBJ_FROM_PTR(irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_state_machine_irq_obj, 1, rp2_state_machine_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[] = {
+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) },
@@ -893,7 +893,7 @@ STATIC const mp_rom_map_elem_t rp2_state_machine_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(rp2_state_machine_locals_dict, rp2_state_machine_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     rp2_state_machine_type,
@@ -905,7 +905,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     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) {
+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);
@@ -915,7 +915,7 @@ STATIC mp_uint_t rp2_state_machine_irq_trigger(mp_obj_t self_in, mp_uint_t new_t
     return 0;
 }
 
-STATIC mp_uint_t rp2_state_machine_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+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) {
@@ -926,7 +926,7 @@ STATIC mp_uint_t rp2_state_machine_irq_info(mp_obj_t self_in, mp_uint_t info_typ
     return 0;
 }
 
-STATIC const mp_irq_methods_t rp2_state_machine_irq_methods = {
+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/samd/machine_adc.c b/ports/samd/machine_adc.c
index 2e4d4ed842326..665af6f6f2785 100644
--- a/ports/samd/machine_adc.c
+++ b/ports/samd/machine_adc.c
@@ -85,7 +85,7 @@ static uint8_t resolution[] = {
 
 extern mp_int_t log2i(mp_int_t num);
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -94,7 +94,7 @@ STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_p
         self->adc_config.channel, self->bits, 1 << self->avg, self->vref);
 }
 
-STATIC mp_obj_t mp_machine_adc_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_adc_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, ARG_vref };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -138,7 +138,7 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
 }
 
 // read_u16()
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     Adc *adc = adc_bases[self->adc_config.device];
     // Set the reference voltage. Default: external AREFA.
     adc->REFCTRL.reg = adc_vref_table[self->vref];
@@ -156,7 +156,7 @@ STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
 }
 
 // deinit() : release the ADC channel
-STATIC void mp_machine_adc_deinit(machine_adc_obj_t *self) {
+static void mp_machine_adc_deinit(machine_adc_obj_t *self) {
     busy_flags &= ~((1 << (self->adc_config.device * 16 + self->adc_config.channel)));
 }
 
diff --git a/ports/samd/machine_dac.c b/ports/samd/machine_dac.c
index 5c9d77624dce4..c611f95e653d0 100644
--- a/ports/samd/machine_dac.c
+++ b/ports/samd/machine_dac.c
@@ -44,7 +44,7 @@ typedef struct _dac_obj_t {
     uint8_t vref;
 } dac_obj_t;
 
-STATIC 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)
@@ -76,7 +76,7 @@ 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,
+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 *all_args) {
 
     enum { ARG_id, ARG_vref };
@@ -150,12 +150,12 @@ STATIC mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     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) {
+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=%q, vref=%d)", self->id, pin_find_by_id(self->gpio_id)->name, self->vref);
 }
 
-STATIC mp_obj_t dac_write(mp_obj_t self_in, mp_obj_t value_in) {
+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) {
@@ -172,11 +172,11 @@ STATIC mp_obj_t dac_write(mp_obj_t self_in, mp_obj_t value_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(dac_write_obj, dac_write);
 
-STATIC const mp_rom_map_elem_t dac_locals_dict_table[] = {
+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);
+static MP_DEFINE_CONST_DICT(dac_locals_dict, dac_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_dac_type,
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index ea5178dc061f9..a7b728ddaf362 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -70,7 +70,7 @@ typedef struct _machine_i2c_obj_t {
     uint8_t *buf;
 } machine_i2c_obj_t;
 
-STATIC void i2c_send_command(Sercom *i2c, uint8_t command) {
+static void i2c_send_command(Sercom *i2c, uint8_t command) {
     i2c->I2CM.CTRLB.bit.CMD = command;
     while (i2c->I2CM.SYNCBUSY.bit.SYSOP) {
     }
@@ -117,7 +117,7 @@ void common_i2c_irq_handler(int i2c_id) {
     }
 }
 
-STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
@@ -212,7 +212,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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) {
+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;
 
@@ -260,7 +260,7 @@ STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     return len;
 }
 
-STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+static const mp_machine_i2c_p_t machine_i2c_p = {
     .transfer = mp_machine_i2c_transfer_adaptor,
     .transfer_single = machine_i2c_transfer_single,
 };
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 30b254722b842..4dfbd69dcde62 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -69,7 +69,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_pin_board_pins_locals_dict
     );
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods;
+static const mp_irq_methods_t machine_pin_irq_methods;
 
 bool EIC_occured;
 
@@ -78,7 +78,7 @@ uint32_t machine_pin_open_drain_mask[4];
 // 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) {
+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;
     char *mode_str;
     char *pull_str[] = {"PULL_OFF", "PULL_UP", "PULL_DOWN"};
@@ -94,14 +94,14 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         pull_str[mp_hal_get_pull_mode(self->pin_id)]);
 }
 
-STATIC void pin_validate_drive(bool strength) {
+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) {
+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}},
@@ -193,7 +193,7 @@ mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
 }
 
 // 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) {
+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);
@@ -202,18 +202,18 @@ MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
 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);
+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) {
+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->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);
+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) {
+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->pin_id)) {
         mp_hal_pin_od_low(self->pin_id);
@@ -225,7 +225,7 @@ STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
 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) {
+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->pin_id)) {
         mp_hal_pin_od_high(self->pin_id);
@@ -237,7 +237,7 @@ STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
 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) {
+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.
@@ -259,7 +259,7 @@ STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
 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) {
+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;
@@ -274,10 +274,10 @@ STATIC mp_obj_t machine_pin_drive(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_drive_obj, 1, 2, machine_pin_drive);
+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) {
+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} },
@@ -375,7 +375,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     }
     return MP_OBJ_FROM_PTR(irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
 
 void pin_irq_deinit_all(void) {
 
@@ -412,7 +412,7 @@ void EIC_Handler() {
     }
 }
 
-STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+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) },
@@ -441,9 +441,9 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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_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) {
+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;
 
@@ -459,7 +459,7 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     return -1;
 }
 
-STATIC const mp_pin_p_t pin_pin_p = {
+static const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
@@ -484,7 +484,7 @@ static uint8_t find_eic_id(int pin) {
     return 0xff;
 }
 
-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_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->pin_id);
     if (eic_id != 0xff) {
@@ -497,7 +497,7 @@ STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger
     return 0;
 }
 
-STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+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->pin_id);
     if (eic_id != 0xff) {
@@ -511,7 +511,7 @@ STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     return 0;
 }
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+static const mp_irq_methods_t machine_pin_irq_methods = {
     .trigger = machine_pin_irq_trigger,
     .info = machine_pin_irq_info,
 };
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index 6fc8145372bce..b2a383c21cba1 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -105,21 +105,21 @@ 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 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_start(machine_pwm_obj_t *self);
-STATIC void mp_machine_pwm_stop(machine_pwm_obj_t *self);
+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_start(machine_pwm_obj_t *self);
+static void mp_machine_pwm_stop(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) {
+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(%q, device=%u, channel=%u, output=%u)",
         pin_find_by_id(self->pin_id)->name, self->device, self->channel, self->output);
 }
 
 // called by the constructor and init()
-STATIC void mp_machine_pwm_init_helper(machine_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_u16, ARG_duty_ns, ARG_invert, ARG_device };
     static const mp_arg_t allowed_args[] = {
@@ -225,7 +225,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
 }
 
 // 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 *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);
@@ -245,7 +245,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_pwm_stop(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_stop(machine_pwm_obj_t *self) {
     Tcc *tcc = tcc_instance[self->device];
     tcc->CTRLA.bit.ENABLE = 0;
     while (tcc->SYNCBUSY.reg & TCC_SYNCBUSY_ENABLE) {
@@ -271,7 +271,7 @@ void pwm_deinit_all(void) {
 // switch off that device.
 // This stops all channels, but keeps the configuration
 // Calling pwm.freq(n), pwm.duty_x() or pwm.init() will start it again.
-STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+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.
@@ -280,7 +280,7 @@ STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void wait_for_register_update(Tcc *tcc) {
+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++) {
@@ -293,7 +293,7 @@ STATIC void wait_for_register_update(Tcc *tcc) {
     tcc->INTFLAG.reg = TCC_INTFLAG_OVF;
 }
 
-STATIC void mp_machine_pwm_start(machine_pwm_obj_t *self) {
+static void mp_machine_pwm_start(machine_pwm_obj_t *self) {
     // Start the PWM. 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};
@@ -357,16 +357,16 @@ STATIC void mp_machine_pwm_start(machine_pwm_obj_t *self) {
     tcc->CTRLBCLR.reg = TCC_CTRLBCLR_LUPD;
 }
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     return MP_OBJ_NEW_SMALL_INT(self->freq);
 }
 
-STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     self->freq = freq;
     mp_machine_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     if (duty_type_flags[self->device] & (1 << self->channel)) {
         return MP_OBJ_NEW_SMALL_INT(get_duty_value(self->device, self->channel));
     } else {
@@ -374,13 +374,13 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     }
 }
 
-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_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
     put_duty_value(self->device, self->channel, duty_u16);
     duty_type_flags[self->device] |= 1 << self->channel;
     mp_machine_pwm_start(self);
 }
 
-STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     if (!(duty_type_flags[self->device] & (1 << self->channel))) {
         return MP_OBJ_NEW_SMALL_INT(get_duty_value(self->device, self->channel));
     } else {
@@ -388,7 +388,7 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+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);
     duty_type_flags[self->device] &= ~(1 << self->channel);
     mp_machine_pwm_start(self);
diff --git a/ports/samd/machine_rtc.c b/ports/samd/machine_rtc.c
index 1f0c9f4dca990..a906f9176f9fe 100644
--- a/ports/samd/machine_rtc.c
+++ b/ports/samd/machine_rtc.c
@@ -37,7 +37,7 @@ typedef struct _machine_rtc_obj_t {
 } machine_rtc_obj_t;
 
 // Singleton RTC object.
-STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+static const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 // Start the RTC Timer.
 void machine_rtc_start(bool force) {
@@ -85,7 +85,7 @@ void rtc_gettime(timeutils_struct_time_t *tm) {
     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) {
+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.
@@ -93,7 +93,7 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     return (mp_obj_t)&machine_rtc_obj;
 }
 
-STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args) {
+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.
@@ -137,21 +137,21 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
     }
 }
 
-STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+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_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) {
+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_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) {
+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
@@ -159,14 +159,14 @@ STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t 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 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 3d5729c1f4264..9c31cc2778dba 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -80,13 +80,13 @@ 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) {
+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) {
+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[] = {
@@ -231,7 +231,7 @@ STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
     }
 }
 
-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) {
+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.
@@ -260,7 +260,7 @@ 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) {
+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)
@@ -270,7 +270,7 @@ STATIC void machine_sercom_deinit(mp_obj_base_t *self_in) {
     MP_STATE_PORT(sercom_table[self->id]) = NULL;
 }
 
-STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+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];
@@ -316,7 +316,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 = {
+static const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
     .deinit = machine_sercom_deinit,
     .transfer = machine_spi_transfer,
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index de6c92c5f5e78..b560e0e8e6924 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -69,12 +69,12 @@ typedef struct _machine_uart_obj_t {
     #endif
 } machine_uart_obj_t;
 
-STATIC const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
+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) {
+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
@@ -114,7 +114,7 @@ void common_uart_irq_handler(int uart_id) {
 }
 
 // Configure the Sercom device
-STATIC void machine_sercom_configure(machine_uart_obj_t *self) {
+static void machine_sercom_configure(machine_uart_obj_t *self) {
     Sercom *uart = sercom_instance[self->id];
 
     // Reset (clear) the peripheral registers.
@@ -192,7 +192,7 @@ void machine_uart_set_baudrate(mp_obj_t self_in, uint32_t baudrate) {
     machine_sercom_configure(self);
 }
 
-STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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"
@@ -215,7 +215,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         );
 }
 
-STATIC void mp_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 void mp_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, ARG_rts, ARG_cts };
     static const mp_arg_t allowed_args[] = {
@@ -363,7 +363,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     }
 }
 
-STATIC mp_obj_t mp_machine_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 mp_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.
@@ -396,7 +396,7 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     // Check if it is the active object.
     if (MP_STATE_PORT(sercom_table)[self->id] == self) {
         Sercom *uart = sercom_instance[self->id];
@@ -409,11 +409,11 @@ STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     }
 }
 
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     return ringbuf_avail(&self->read_buffer);
 }
 
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     Sercom *uart = sercom_instance[self->id];
 
     return uart->USART.INTFLAG.bit.DRE
@@ -423,7 +423,7 @@ STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
            && uart->USART.INTFLAG.bit.TXC;
 }
 
-STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     uint32_t break_time_us = 13 * 1000000 / self->baudrate;
 
     // Wait for the tx buffer to drain.
@@ -445,7 +445,7 @@ STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     mp_hal_set_pin_mux(self->tx, self->tx_pad_config.alt_fct);
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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);
     Sercom *uart = sercom_instance[self->id];
     uint64_t t = mp_hal_ticks_ms_64() + self->timeout;
@@ -475,7 +475,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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 i = 0;
     const uint8_t *src = buf_in;
@@ -514,7 +514,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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;
     Sercom *uart = sercom_instance[self->id];
diff --git a/ports/samd/machine_wdt.c b/ports/samd/machine_wdt.c
index d6fadfd1232db..301abbe90c7cf 100644
--- a/ports/samd/machine_wdt.c
+++ b/ports/samd/machine_wdt.c
@@ -45,9 +45,9 @@ mp_int_t log2i(mp_int_t num) {
     return res;
 }
 
-STATIC const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
+static const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
 
-STATIC void set_timeout(uint32_t timeout) {
+static void set_timeout(uint32_t timeout) {
     // Set new timeout. Have to disable WDT first.
 
     // Confine to the valid range
@@ -76,7 +76,7 @@ STATIC void set_timeout(uint32_t timeout) {
     #endif
 }
 
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     #if defined(MCU_SAMD51)
     // Verify the WDT id. SAMD51 only, saving a few bytes for SAMD21
     if (id != 0) {
@@ -105,12 +105,12 @@ STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t
     return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     (void)self;
     WDT->CLEAR.reg = 0xa5;
 }
 
-STATIC void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self, mp_int_t timeout_ms) {
+static void mp_machine_wdt_timeout_ms_set(machine_wdt_obj_t *self, mp_int_t timeout_ms) {
     (void)self;
     set_timeout(timeout_ms);
 }
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index c39aec95ea156..65dbf8a7f5039 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -65,7 +65,7 @@
 extern bool EIC_occured;
 extern uint32_t _dbl_tap_addr;
 
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_RESET;
     #ifdef DBL_TAP_ADDR_ALT
     *DBL_TAP_ADDR_ALT = DBL_TAP_MAGIC_RESET;
@@ -81,28 +81,28 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     NVIC_SystemReset();
 }
 
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     return MP_OBJ_NEW_SMALL_INT(get_cpu_freq());
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_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);
     }
 }
 
-STATIC mp_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     samd_unique_id_t id;
     samd_get_unique_id(&id);
     return mp_obj_new_bytes((byte *)&id.bytes, sizeof(id.bytes));
 }
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     MICROPY_EVENT_POLL_HOOK;
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     #if defined(MCU_SAMD21)
     return PM->RCAUSE.reg;
     #elif defined(MCU_SAMD51)
@@ -112,7 +112,7 @@ STATIC mp_int_t mp_machine_reset_cause(void) {
     #endif
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_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) {
@@ -164,7 +164,7 @@ STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     set_cpu_freq(freq);
 }
 
-NORETURN STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_lightsleep(n_args, args);
     mp_machine_reset();
 }
diff --git a/ports/samd/modos.c b/ports/samd/modos.c
index 16b9eb084104e..64d40a46cc0a4 100644
--- a/ports/samd/modos.c
+++ b/ports/samd/modos.c
@@ -40,7 +40,7 @@
 #if defined(MCU_SAMD51)
 static bool initialized = false;
 
-STATIC void trng_start(void) {
+static void trng_start(void) {
     if (!initialized) {
         MCLK->APBCMASK.bit.TRNG_ = 1;
         REG_TRNG_CTRLA = TRNG_CTRLA_ENABLE;
@@ -73,7 +73,7 @@ uint32_t trng_random_u32(int delay) {
 #endif
 
 #if MICROPY_PY_OS_URANDOM
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -89,7 +89,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
 #endif // MICROPY_PY_OS_URANDOM
 
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 307de62af56e8..2afe1d1222ed2 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -45,7 +45,7 @@ extern const mp_obj_type_t samd_spiflash_type;
 #define SPIFLASH_TYPE samd_spiflash_type
 #endif
 
-STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
+static mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
     const machine_pin_obj_t *pin_af = pin_find(pin_obj);
     #if defined(MCU_SAMD21)
     mp_obj_t tuple[7] = {
@@ -74,14 +74,14 @@ STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
     #endif
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(samd_pininfo_obj, samd_pininfo);
+static MP_DEFINE_CONST_FUN_OBJ_1(samd_pininfo_obj, samd_pininfo);
 
-STATIC const mp_rom_map_elem_t samd_module_globals_table[] = {
+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(&SPIFLASH_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);
+static MP_DEFINE_CONST_DICT(samd_module_globals, samd_module_globals_table);
 
 const mp_obj_module_t mp_module_samd = {
     .base = { &mp_type_module },
diff --git a/ports/samd/modtime.c b/ports/samd/modtime.c
index aa5bd33609f08..83072dd16feeb 100644
--- a/ports/samd/modtime.c
+++ b/ports/samd/modtime.c
@@ -29,7 +29,7 @@
 #include "modmachine.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     timeutils_struct_time_t tm;
     rtc_gettime(&tm);
     tm.tm_wday = timeutils_calc_weekday(tm.tm_year, tm.tm_mon, tm.tm_mday);
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     timeutils_struct_time_t tm;
     rtc_gettime(&tm);
     return mp_obj_new_int_from_uint(timeutils_mktime(
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index de1650c9914b1..3fc6875908975 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -40,7 +40,7 @@
 
 extern volatile uint32_t ticks_us64_upper;
 
-STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
+static uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
 ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0 };
 
 // Explicitly run the USB stack in case the scheduler is locked (eg we are in an
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index a73c6591dd9a4..5d05b6d18d5c1 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -53,7 +53,7 @@ const machine_pin_obj_t *pin_find_by_id(int pin_id) {
     mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
 }
 
-STATIC const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+static const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
     mp_map_elem_t *named_elem = mp_map_lookup((mp_map_t *)&named_pins->map, name, MP_MAP_LOOKUP);
     if (named_elem != NULL) {
         return named_elem->value;
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index b00b4af6032bf..ef0de7b6fb585 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -45,7 +45,7 @@
 #endif
 
 static struct flash_descriptor flash_desc;
-STATIC mp_int_t BLOCK_SIZE = VFS_BLOCK_SIZE_BYTES; // Board specific: mpconfigboard.h
+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 {
@@ -57,7 +57,7 @@ typedef struct _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 = {
+static samd_flash_obj_t samd_flash_obj = {
     .base = { &samd_flash_type },
     .flash_base = (uint32_t)&_oflash_fs, // Get from MCU-Specific loader script.
     .flash_size = (uint32_t)&_sflash_fs, // Get from MCU-Specific loader script.
@@ -65,7 +65,7 @@ STATIC samd_flash_obj_t samd_flash_obj = {
 
 // Flash init (from cctpy)
 // Method is needed for when MP starts up in _boot.py
-STATIC void samd_flash_init(void) {
+static void samd_flash_init(void) {
     #ifdef SAMD51
     hri_mclk_set_AHBMASK_NVMCTRL_bit(MCLK);
     #endif
@@ -76,7 +76,7 @@ STATIC void samd_flash_init(void) {
     flash_init(&flash_desc, NVMCTRL);
 }
 
-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) {
+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);
 
@@ -87,7 +87,7 @@ STATIC mp_obj_t samd_flash_make_new(const mp_obj_type_t *type, size_t n_args, si
 }
 
 // Function for ioctl.
-STATIC mp_obj_t eraseblock(uint32_t sector_in) {
+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
@@ -97,12 +97,12 @@ STATIC mp_obj_t eraseblock(uint32_t sector_in) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t samd_flash_version(void) {
+static mp_obj_t samd_flash_version(void) {
     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_FUN_OBJ_0(samd_flash_version_obj, samd_flash_version);
 
-STATIC mp_obj_t samd_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+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);
@@ -115,9 +115,9 @@ STATIC mp_obj_t samd_flash_readblocks(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_flash_readblocks_obj, 3, 4, samd_flash_readblocks);
+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) {
+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);
@@ -132,9 +132,9 @@ STATIC mp_obj_t samd_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     // 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_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) {
+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);
 
@@ -159,15 +159,15 @@ STATIC mp_obj_t samd_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(samd_flash_ioctl_obj, samd_flash_ioctl);
+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[] = {
+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_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);
+static MP_DEFINE_CONST_DICT(samd_flash_locals_dict, samd_flash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     samd_flash_type,
diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
index 054bfd231e041..60aa434dcfdaa 100644
--- a/ports/samd/samd_qspiflash.c
+++ b/ports/samd/samd_qspiflash.c
@@ -257,7 +257,7 @@ int get_sfdp_table(uint8_t *table, int maxlen) {
     return len;
 }
 
-STATIC mp_obj_t samd_qspiflash_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 samd_qspiflash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
     // The QSPI is a singleton
@@ -374,7 +374,7 @@ STATIC mp_obj_t samd_qspiflash_make_new(const mp_obj_type_t *type, size_t n_args
     return self;
 }
 
-STATIC mp_obj_t samd_qspiflash_read(samd_qspiflash_obj_t *self, uint32_t addr, uint8_t *dest, uint32_t len) {
+static mp_obj_t samd_qspiflash_read(samd_qspiflash_obj_t *self, uint32_t addr, uint8_t *dest, uint32_t len) {
     if (len > 0) {
         wait_for_flash_ready();
         // Command 0x6B 1 line address, 4 line Data
@@ -385,7 +385,7 @@ STATIC mp_obj_t samd_qspiflash_read(samd_qspiflash_obj_t *self, uint32_t addr, u
     return mp_const_none;
 }
 
-STATIC mp_obj_t samd_qspiflash_write(samd_qspiflash_obj_t *self, uint32_t addr, uint8_t *src, uint32_t len) {
+static mp_obj_t samd_qspiflash_write(samd_qspiflash_obj_t *self, uint32_t addr, uint8_t *src, uint32_t len) {
     uint32_t length = len;
     uint32_t pos = 0;
     uint8_t *buf = src;
@@ -405,7 +405,7 @@ STATIC mp_obj_t samd_qspiflash_write(samd_qspiflash_obj_t *self, uint32_t addr,
     return mp_const_none;
 }
 
-STATIC mp_obj_t samd_qspiflash_erase(uint32_t addr) {
+static mp_obj_t samd_qspiflash_erase(uint32_t addr) {
     wait_for_flash_ready();
     write_enable();
     erase_command(QSPI_CMD_ERASE_SECTOR, addr);
@@ -413,7 +413,7 @@ STATIC mp_obj_t samd_qspiflash_erase(uint32_t addr) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t samd_qspiflash_readblocks(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t samd_qspiflash_readblocks(size_t n_args, const mp_obj_t *args) {
     samd_qspiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
     mp_buffer_info_t bufinfo;
@@ -427,9 +427,9 @@ STATIC mp_obj_t samd_qspiflash_readblocks(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_qspiflash_readblocks_obj, 3, 4, samd_qspiflash_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_qspiflash_readblocks_obj, 3, 4, samd_qspiflash_readblocks);
 
-STATIC mp_obj_t samd_qspiflash_writeblocks(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t samd_qspiflash_writeblocks(size_t n_args, const mp_obj_t *args) {
     samd_qspiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
     mp_buffer_info_t bufinfo;
@@ -445,9 +445,9 @@ STATIC mp_obj_t samd_qspiflash_writeblocks(size_t n_args, const mp_obj_t *args)
     // TODO check return value
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_qspiflash_writeblocks_obj, 3, 4, samd_qspiflash_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_qspiflash_writeblocks_obj, 3, 4, samd_qspiflash_writeblocks);
 
-STATIC mp_obj_t samd_qspiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t samd_qspiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
     samd_qspiflash_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t cmd = mp_obj_get_int(cmd_in);
 
@@ -471,14 +471,14 @@ STATIC mp_obj_t samd_qspiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(samd_qspiflash_ioctl_obj, samd_qspiflash_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(samd_qspiflash_ioctl_obj, samd_qspiflash_ioctl);
 
-STATIC const mp_rom_map_elem_t samd_qspiflash_locals_dict_table[] = {
+static const mp_rom_map_elem_t samd_qspiflash_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&samd_qspiflash_readblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&samd_qspiflash_writeblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&samd_qspiflash_ioctl_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(samd_qspiflash_locals_dict, samd_qspiflash_locals_dict_table);
+static MP_DEFINE_CONST_DICT(samd_qspiflash_locals_dict, samd_qspiflash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     samd_qspiflash_type,
diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
index f17d3c45ca524..1313a6fd9d0d0 100644
--- a/ports/samd/samd_spiflash.c
+++ b/ports/samd/samd_spiflash.c
@@ -128,7 +128,7 @@ static void get_sfdp(spiflash_obj_t *self, uint32_t addr, uint8_t *buffer, int s
     mp_hal_pin_write(self->cs, 1);
 }
 
-STATIC mp_obj_t spiflash_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 spiflash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
     // Set up the object
@@ -179,7 +179,7 @@ STATIC mp_obj_t spiflash_make_new(const mp_obj_type_t *type, size_t n_args, size
     return self;
 }
 
-STATIC mp_obj_t spiflash_read(spiflash_obj_t *self, uint32_t addr, uint8_t *dest, uint32_t len) {
+static mp_obj_t spiflash_read(spiflash_obj_t *self, uint32_t addr, uint8_t *dest, uint32_t len) {
     if (len > 0) {
         write_addr(self, self->commands[_READ_INDEX], addr);
         spi_transfer(self->spi, len, dest, dest);
@@ -189,7 +189,7 @@ STATIC mp_obj_t spiflash_read(spiflash_obj_t *self, uint32_t addr, uint8_t *dest
     return mp_const_none;
 }
 
-STATIC mp_obj_t spiflash_write(spiflash_obj_t *self, uint32_t addr, uint8_t *src, uint32_t len) {
+static mp_obj_t spiflash_write(spiflash_obj_t *self, uint32_t addr, uint8_t *src, uint32_t len) {
     uint32_t length = len;
     uint32_t pos = 0;
     uint8_t *buf = src;
@@ -211,7 +211,7 @@ STATIC mp_obj_t spiflash_write(spiflash_obj_t *self, uint32_t addr, uint8_t *src
     return mp_const_none;
 }
 
-STATIC mp_obj_t spiflash_erase(spiflash_obj_t *self, uint32_t addr) {
+static mp_obj_t spiflash_erase(spiflash_obj_t *self, uint32_t addr) {
     write_enable(self);
     write_addr(self, self->commands[_SECTOR_ERASE_INDEX], addr);
     mp_hal_pin_write(self->cs, 1);
@@ -220,7 +220,7 @@ STATIC mp_obj_t spiflash_erase(spiflash_obj_t *self, uint32_t addr) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t spiflash_readblocks(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t spiflash_readblocks(size_t n_args, const mp_obj_t *args) {
     spiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
     mp_buffer_info_t bufinfo;
@@ -234,9 +234,9 @@ STATIC mp_obj_t spiflash_readblocks(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spiflash_readblocks_obj, 3, 4, spiflash_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spiflash_readblocks_obj, 3, 4, spiflash_readblocks);
 
-STATIC mp_obj_t spiflash_writeblocks(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t spiflash_writeblocks(size_t n_args, const mp_obj_t *args) {
     spiflash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t offset = (mp_obj_get_int(args[1]) * self->sectorsize);
     mp_buffer_info_t bufinfo;
@@ -252,9 +252,9 @@ STATIC mp_obj_t spiflash_writeblocks(size_t n_args, const mp_obj_t *args) {
     // TODO check return value
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spiflash_writeblocks_obj, 3, 4, spiflash_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spiflash_writeblocks_obj, 3, 4, spiflash_writeblocks);
 
-STATIC mp_obj_t spiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t spiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
     spiflash_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t cmd = mp_obj_get_int(cmd_in);
 
@@ -278,14 +278,14 @@ STATIC mp_obj_t spiflash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_i
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(spiflash_ioctl_obj, spiflash_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(spiflash_ioctl_obj, spiflash_ioctl);
 
-STATIC const mp_rom_map_elem_t spiflash_locals_dict_table[] = {
+static const mp_rom_map_elem_t spiflash_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&spiflash_readblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&spiflash_writeblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&spiflash_ioctl_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(spiflash_locals_dict, spiflash_locals_dict_table);
+static MP_DEFINE_CONST_DICT(spiflash_locals_dict, spiflash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     samd_spiflash_type,
diff --git a/ports/stm32/accel.c b/ports/stm32/accel.c
index 19e16831ead84..9f1d4ee9a0384 100644
--- a/ports/stm32/accel.c
+++ b/ports/stm32/accel.c
@@ -89,7 +89,7 @@ void accel_init(void) {
     #endif
 }
 
-STATIC void accel_start(void) {
+static void accel_start(void) {
     // start the I2C bus in master mode
     i2c_init(I2C1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA, 400000, I2C_TIMEOUT_MS);
 
@@ -153,7 +153,7 @@ typedef struct _pyb_accel_obj_t {
     int16_t buf[NUM_AXIS * FILT_DEPTH];
 } pyb_accel_obj_t;
 
-STATIC pyb_accel_obj_t pyb_accel_obj;
+static pyb_accel_obj_t pyb_accel_obj;
 
 /// \classmethod \constructor()
 /// Create and return an accelerometer object.
@@ -166,7 +166,7 @@ STATIC pyb_accel_obj_t pyb_accel_obj;
 ///     accel = pyb.Accel()
 ///     pyb.delay(20)
 ///     print(accel.x())
-STATIC mp_obj_t pyb_accel_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 pyb_accel_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);
 
@@ -177,7 +177,7 @@ STATIC mp_obj_t pyb_accel_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(&pyb_accel_obj);
 }
 
-STATIC mp_obj_t read_axis(int axis) {
+static mp_obj_t read_axis(int axis) {
     uint8_t data[1] = { axis };
     i2c_writeto(I2C1, ACCEL_ADDR, data, 1, false);
     i2c_readfrom(I2C1, ACCEL_ADDR, data, 1, true);
@@ -186,28 +186,28 @@ STATIC mp_obj_t read_axis(int axis) {
 
 /// \method x()
 /// Get the x-axis value.
-STATIC mp_obj_t pyb_accel_x(mp_obj_t self_in) {
+static mp_obj_t pyb_accel_x(mp_obj_t self_in) {
     return read_axis(ACCEL_REG_X);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_x_obj, pyb_accel_x);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_x_obj, pyb_accel_x);
 
 /// \method y()
 /// Get the y-axis value.
-STATIC mp_obj_t pyb_accel_y(mp_obj_t self_in) {
+static mp_obj_t pyb_accel_y(mp_obj_t self_in) {
     return read_axis(ACCEL_REG_Y);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_y_obj, pyb_accel_y);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_y_obj, pyb_accel_y);
 
 /// \method z()
 /// Get the z-axis value.
-STATIC mp_obj_t pyb_accel_z(mp_obj_t self_in) {
+static mp_obj_t pyb_accel_z(mp_obj_t self_in) {
     return read_axis(ACCEL_REG_Z);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_z_obj, pyb_accel_z);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_z_obj, pyb_accel_z);
 
 /// \method tilt()
 /// Get the tilt register.
-STATIC mp_obj_t pyb_accel_tilt(mp_obj_t self_in) {
+static mp_obj_t pyb_accel_tilt(mp_obj_t self_in) {
     #if MICROPY_HW_HAS_MMA7660
     uint8_t data[1] = { ACCEL_REG_TILT };
     i2c_writeto(I2C1, ACCEL_ADDR, data, 1, false);
@@ -218,11 +218,11 @@ STATIC mp_obj_t pyb_accel_tilt(mp_obj_t self_in) {
     return 0;
     #endif
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_tilt_obj, pyb_accel_tilt);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_tilt_obj, pyb_accel_tilt);
 
 /// \method filtered_xyz()
 /// Get a 3-tuple of filtered x, y and z values.
-STATIC mp_obj_t pyb_accel_filtered_xyz(mp_obj_t self_in) {
+static mp_obj_t pyb_accel_filtered_xyz(mp_obj_t self_in) {
     pyb_accel_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     memmove(self->buf, self->buf + NUM_AXIS, NUM_AXIS * (FILT_DEPTH - 1) * sizeof(int16_t));
@@ -251,9 +251,9 @@ STATIC mp_obj_t pyb_accel_filtered_xyz(mp_obj_t self_in) {
 
     return mp_obj_new_tuple(3, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_filtered_xyz_obj, pyb_accel_filtered_xyz);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_accel_filtered_xyz_obj, pyb_accel_filtered_xyz);
 
-STATIC mp_obj_t pyb_accel_read(mp_obj_t self_in, mp_obj_t reg) {
+static mp_obj_t pyb_accel_read(mp_obj_t self_in, mp_obj_t reg) {
     uint8_t data[1] = { mp_obj_get_int(reg) };
     i2c_writeto(I2C1, ACCEL_ADDR, data, 1, false);
     i2c_readfrom(I2C1, ACCEL_ADDR, data, 1, true);
@@ -261,14 +261,14 @@ STATIC mp_obj_t pyb_accel_read(mp_obj_t self_in, mp_obj_t reg) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(pyb_accel_read_obj, pyb_accel_read);
 
-STATIC mp_obj_t pyb_accel_write(mp_obj_t self_in, mp_obj_t reg, mp_obj_t val) {
+static mp_obj_t pyb_accel_write(mp_obj_t self_in, mp_obj_t reg, mp_obj_t val) {
     uint8_t data[2] = { mp_obj_get_int(reg), mp_obj_get_int(val) };
     i2c_writeto(I2C1, ACCEL_ADDR, data, 2, true);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_3(pyb_accel_write_obj, pyb_accel_write);
 
-STATIC const mp_rom_map_elem_t pyb_accel_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_accel_locals_dict_table[] = {
     // TODO add init, deinit, and perhaps reset methods
     { MP_ROM_QSTR(MP_QSTR_x), MP_ROM_PTR(&pyb_accel_x_obj) },
     { MP_ROM_QSTR(MP_QSTR_y), MP_ROM_PTR(&pyb_accel_y_obj) },
@@ -279,7 +279,7 @@ STATIC const mp_rom_map_elem_t pyb_accel_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&pyb_accel_write_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_accel_locals_dict, pyb_accel_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_accel_locals_dict, pyb_accel_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_accel_type,
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index ddb8a35703bb4..3549fc29a98b8 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -245,7 +245,7 @@ static inline uint32_t adc_get_internal_channel(uint32_t channel) {
     return channel;
 }
 
-STATIC bool is_adcx_channel(int channel) {
+static bool is_adcx_channel(int channel) {
     #if defined(STM32F411xE)
     // The HAL has an incorrect IS_ADC_CHANNEL macro for the F411 so we check for temp
     return IS_ADC_CHANNEL(channel) || channel == ADC_CHANNEL_TEMPSENSOR;
@@ -272,7 +272,7 @@ STATIC bool is_adcx_channel(int channel) {
     #endif
 }
 
-STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, 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) || defined(STM32L1)
     while ((adcHandle->Instance->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
@@ -287,7 +287,7 @@ STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, int32_t ti
     }
 }
 
-STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
+static void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
     ADCx_CLK_ENABLE();
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -316,7 +316,7 @@ STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     #endif
 }
 
-STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
+static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adcx_clock_enable(adch);
 
     adch->Init.Resolution = resolution;
@@ -384,7 +384,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     #endif
 }
 
-STATIC void adc_init_single(pyb_obj_adc_t *adc_obj, ADC_TypeDef *adc) {
+static void adc_init_single(pyb_obj_adc_t *adc_obj, ADC_TypeDef *adc) {
     adc_obj->handle.Instance = adc;
     adcx_init_periph(&adc_obj->handle, ADC_RESOLUTION_12B);
 
@@ -397,7 +397,7 @@ STATIC void adc_init_single(pyb_obj_adc_t *adc_obj, ADC_TypeDef *adc) {
     #endif
 }
 
-STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
+static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
     ADC_ChannelConfTypeDef sConfig;
 
     #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
@@ -462,7 +462,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     HAL_ADC_ConfigChannel(adc_handle, &sConfig);
 }
 
-STATIC uint32_t adc_read_channel(ADC_HandleTypeDef *adcHandle) {
+static uint32_t adc_read_channel(ADC_HandleTypeDef *adcHandle) {
     uint32_t value;
     #if defined(STM32G4)
     // For STM32G4 there is errata 2.7.7, "Wrong ADC result if conversion done late after
@@ -479,7 +479,7 @@ STATIC uint32_t adc_read_channel(ADC_HandleTypeDef *adcHandle) {
     return value;
 }
 
-STATIC uint32_t adc_config_and_read_channel(ADC_HandleTypeDef *adcHandle, uint32_t channel) {
+static uint32_t adc_config_and_read_channel(ADC_HandleTypeDef *adcHandle, uint32_t channel) {
     adc_config_channel(adcHandle, channel);
     uint32_t raw_value = adc_read_channel(adcHandle);
 
@@ -498,7 +498,7 @@ STATIC uint32_t adc_config_and_read_channel(ADC_HandleTypeDef *adcHandle, uint32
 /******************************************************************************/
 /* MicroPython bindings : adc object (single channel)                         */
 
-STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_obj_adc_t *self = MP_OBJ_TO_PTR(self_in);
     #if defined STM32H5
     unsigned adc_id = 1;
@@ -516,7 +516,7 @@ STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
 /// \classmethod \constructor(pin)
 /// Create an ADC object associated with the given pin.
 /// This allows you to then read analog values on that pin.
-STATIC mp_obj_t adc_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 adc_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, 1, false);
 
@@ -587,11 +587,11 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 /// \method read()
 /// Read the value on the analog pin and return it.  The returned value
 /// will be between 0 and 4095.
-STATIC mp_obj_t adc_read(mp_obj_t self_in) {
+static mp_obj_t adc_read(mp_obj_t self_in) {
     pyb_obj_adc_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(adc_config_and_read_channel(&self->handle, self->channel));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
 
 /// \method read_timed(buf, timer)
 ///
@@ -627,7 +627,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
 ///         print(val)                      # print the value out
 ///
 /// This function does not allocate any memory.
-STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_in) {
+static mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_in) {
     pyb_obj_adc_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_buffer_info_t bufinfo;
@@ -699,7 +699,7 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
 
     return mp_obj_new_int(bufinfo.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(adc_read_timed_obj, adc_read_timed);
+static MP_DEFINE_CONST_FUN_OBJ_3(adc_read_timed_obj, adc_read_timed);
 
 // read_timed_multi((adcx, adcy, ...), (bufx, bufy, ...), timer)
 //
@@ -709,7 +709,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(adc_read_timed_obj, adc_read_timed);
 // the sample resolution will be reduced to 8 bits.
 //
 // This function should not allocate any heap memory.
-STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_in, mp_obj_t tim_in) {
+static mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_in, mp_obj_t tim_in) {
     size_t nadcs, nbufs;
     mp_obj_t *adc_array, *buf_array;
     mp_obj_get_array(adc_array_in, &nadcs, &adc_array);
@@ -802,16 +802,16 @@ STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_i
 
     return mp_obj_new_bool(success);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(adc_read_timed_multi_fun_obj, adc_read_timed_multi);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(adc_read_timed_multi_obj, MP_ROM_PTR(&adc_read_timed_multi_fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_3(adc_read_timed_multi_fun_obj, adc_read_timed_multi);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(adc_read_timed_multi_obj, MP_ROM_PTR(&adc_read_timed_multi_fun_obj));
 
-STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
+static const mp_rom_map_elem_t adc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&adc_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_read_timed), MP_ROM_PTR(&adc_read_timed_obj) },
     { MP_ROM_QSTR(MP_QSTR_read_timed_multi), MP_ROM_PTR(&adc_read_timed_multi_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+static MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_type,
@@ -897,7 +897,7 @@ int adc_get_resolution(ADC_HandleTypeDef *adcHandle) {
     return 12;
 }
 
-STATIC uint32_t adc_config_and_read_ref(ADC_HandleTypeDef *adcHandle, uint32_t channel) {
+static uint32_t adc_config_and_read_ref(ADC_HandleTypeDef *adcHandle, uint32_t channel) {
     uint32_t raw_value = adc_config_and_read_channel(adcHandle, channel);
     // Scale raw reading to the number of bits used by the calibration constants
     return raw_value << (ADC_CAL_BITS - adc_get_resolution(adcHandle));
@@ -919,7 +919,7 @@ int adc_read_core_temp(ADC_HandleTypeDef *adcHandle) {
 
 #if MICROPY_PY_BUILTINS_FLOAT
 // correction factor for reference value
-STATIC volatile float adc_refcor = 1.0f;
+static volatile float adc_refcor = 1.0f;
 
 float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
     #if defined(STM32G4) || defined(STM32L1) || defined(STM32L4)
@@ -974,7 +974,7 @@ float adc_read_core_vref(ADC_HandleTypeDef *adcHandle) {
 /******************************************************************************/
 /* MicroPython bindings : adc_all object                                      */
 
-STATIC mp_obj_t adc_all_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 adc_all_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, 2, false);
 
@@ -990,7 +990,7 @@ STATIC mp_obj_t adc_all_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t adc_all_read_channel(mp_obj_t self_in, mp_obj_t channel) {
+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)) {
@@ -999,9 +999,9 @@ STATIC mp_obj_t adc_all_read_channel(mp_obj_t self_in, mp_obj_t channel) {
     uint32_t data = adc_config_and_read_channel(&self->handle, chan);
     return mp_obj_new_int(data);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(adc_all_read_channel_obj, adc_all_read_channel);
+static MP_DEFINE_CONST_FUN_OBJ_2(adc_all_read_channel_obj, adc_all_read_channel);
 
-STATIC mp_obj_t adc_all_read_core_temp(mp_obj_t self_in) {
+static mp_obj_t adc_all_read_core_temp(mp_obj_t self_in) {
     pyb_adc_all_obj_t *self = MP_OBJ_TO_PTR(self_in);
     #if MICROPY_PY_BUILTINS_FLOAT
     float data = adc_read_core_temp_float(&self->handle);
@@ -1011,32 +1011,32 @@ STATIC mp_obj_t adc_all_read_core_temp(mp_obj_t self_in) {
     return mp_obj_new_int(data);
     #endif
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_temp_obj, adc_all_read_core_temp);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_temp_obj, adc_all_read_core_temp);
 
 #if MICROPY_PY_BUILTINS_FLOAT
-STATIC mp_obj_t adc_all_read_core_vbat(mp_obj_t self_in) {
+static mp_obj_t adc_all_read_core_vbat(mp_obj_t self_in) {
     pyb_adc_all_obj_t *self = MP_OBJ_TO_PTR(self_in);
     float data = adc_read_core_vbat(&self->handle);
     return mp_obj_new_float(data);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vbat_obj, adc_all_read_core_vbat);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vbat_obj, adc_all_read_core_vbat);
 
-STATIC mp_obj_t adc_all_read_core_vref(mp_obj_t self_in) {
+static mp_obj_t adc_all_read_core_vref(mp_obj_t self_in) {
     pyb_adc_all_obj_t *self = MP_OBJ_TO_PTR(self_in);
     float data = adc_read_core_vref(&self->handle);
     return mp_obj_new_float(data);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vref_obj, adc_all_read_core_vref);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vref_obj, adc_all_read_core_vref);
 
-STATIC mp_obj_t adc_all_read_vref(mp_obj_t self_in) {
+static mp_obj_t adc_all_read_vref(mp_obj_t self_in) {
     pyb_adc_all_obj_t *self = MP_OBJ_TO_PTR(self_in);
     adc_read_core_vref(&self->handle);
     return mp_obj_new_float(ADC_SCALE_V * adc_refcor);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_vref_obj, adc_all_read_vref);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_vref_obj, adc_all_read_vref);
 #endif
 
-STATIC const mp_rom_map_elem_t adc_all_locals_dict_table[] = {
+static const mp_rom_map_elem_t adc_all_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_read_channel), MP_ROM_PTR(&adc_all_read_channel_obj) },
     { MP_ROM_QSTR(MP_QSTR_read_core_temp), MP_ROM_PTR(&adc_all_read_core_temp_obj) },
     #if MICROPY_PY_BUILTINS_FLOAT
@@ -1046,7 +1046,7 @@ STATIC const mp_rom_map_elem_t adc_all_locals_dict_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(adc_all_locals_dict, adc_all_locals_dict_table);
+static MP_DEFINE_CONST_DICT(adc_all_locals_dict, adc_all_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_all_type,
diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 85a42a240ff0d..8f0d066f372b4 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -55,7 +55,7 @@ NORETURN void boardctrl_fatal_error(const char *msg) {
     }
 }
 
-STATIC void flash_error(int n) {
+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);
@@ -88,7 +88,7 @@ void boardctrl_maybe_enter_mboot(size_t n_args, const void *args_in) {
 #endif
 
 #if !MICROPY_HW_USES_BOOTLOADER
-STATIC uint update_reset_mode(uint reset_mode) {
+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.
 
diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c
index 402d5b83a97bc..3a6336bc2c756 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c
@@ -4,7 +4,7 @@
 
 #if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 
-STATIC const spi_proto_cfg_t spi_bus = {
+static const spi_proto_cfg_t spi_bus = {
     .spi = &spi_obj[0], // SPI1
     .baudrate = 25000000,
     .polarity = 0,
@@ -13,7 +13,7 @@ STATIC const spi_proto_cfg_t spi_bus = {
     .firstbit = SPI_FIRSTBIT_MSB,
 };
 
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
diff --git a/ports/stm32/boards/ARDUINO_GIGA/bdev.c b/ports/stm32/boards/ARDUINO_GIGA/bdev.c
index caadc2b649eed..fea6241686a08 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/bdev.c
+++ b/ports/stm32/boards/ARDUINO_GIGA/bdev.c
@@ -29,7 +29,7 @@
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // Shared cache for first and second SPI block devices
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 #endif
 
 // First external SPI flash uses hardware QSPI interface
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/bdev.c b/ports/stm32/boards/ARDUINO_NICLA_VISION/bdev.c
index caadc2b649eed..fea6241686a08 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/bdev.c
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/bdev.c
@@ -29,7 +29,7 @@
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // Shared cache for first and second SPI block devices
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 #endif
 
 // First external SPI flash uses hardware QSPI interface
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c b/ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c
index bba81990cf90b..1e9248636828f 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c
@@ -29,7 +29,7 @@
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // Shared cache for first and second SPI block devices
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 #endif
 
 // First external SPI flash uses hardware QSPI interface
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
index c90614a0289a0..0c9b6e4797190 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
@@ -32,7 +32,7 @@
 
 // Mboot doesn't support hardware SPI, so use software SPI instead.
 
-STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+static const mp_soft_spi_obj_t soft_spi_bus = {
     .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
     .polarity = 0,
     .phase = 0,
@@ -52,7 +52,7 @@ mp_spiflash_t board_mboot_spiflash;
 
 #else
 
-STATIC const spi_proto_cfg_t spi_bus = {
+static const spi_proto_cfg_t spi_bus = {
     .spi = &spi_obj[1], // SPI2 hardware peripheral
     .baudrate = 25000000,
     .polarity = 0,
@@ -61,7 +61,7 @@ STATIC const spi_proto_cfg_t spi_bus = {
     .firstbit = SPI_FIRSTBIT_MSB,
 };
 
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
index 6ec20935f001a..b47c1aafc2400 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
@@ -44,7 +44,7 @@
 #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) {
+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;
diff --git a/ports/stm32/boards/MIKROE_QUAIL/bdev.c b/ports/stm32/boards/MIKROE_QUAIL/bdev.c
index 7095817e494cc..913b308339ebd 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/bdev.c
+++ b/ports/stm32/boards/MIKROE_QUAIL/bdev.c
@@ -4,7 +4,7 @@
 
 #if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 
-STATIC const spi_proto_cfg_t spi_bus = {
+static const spi_proto_cfg_t spi_bus = {
     .spi = &spi_obj[2], // SPI3 hardware peripheral
     .baudrate = 25000000,
     .polarity = 0,
@@ -13,7 +13,7 @@ STATIC const spi_proto_cfg_t spi_bus = {
     .firstbit = SPI_FIRSTBIT_MSB,
 };
 
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
diff --git a/ports/stm32/boards/PYBD_SF2/bdev.c b/ports/stm32/boards/PYBD_SF2/bdev.c
index fba0b8f22790a..2c9dd5b0d4577 100644
--- a/ports/stm32/boards/PYBD_SF2/bdev.c
+++ b/ports/stm32/boards/PYBD_SF2/bdev.c
@@ -29,12 +29,12 @@
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // Shared cache for first and second SPI block devices
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 #endif
 
 // First external SPI flash uses software QSPI interface
 
-STATIC const mp_soft_qspi_obj_t soft_qspi_bus = {
+static const mp_soft_qspi_obj_t soft_qspi_bus = {
     .cs = MICROPY_HW_SPIFLASH_CS,
     .clk = MICROPY_HW_SPIFLASH_SCK,
     .io0 = MICROPY_HW_SPIFLASH_IO0,
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
index dd62a0eb17fd1..0e23a9df6aab8 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
@@ -4,7 +4,7 @@
 
 // External SPI flash uses standard SPI interface
 
-STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+static const mp_soft_spi_obj_t soft_spi_bus = {
     .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
     .polarity = 0,
     .phase = 0,
@@ -13,7 +13,7 @@ STATIC const mp_soft_spi_obj_t soft_spi_bus = {
     .miso = MICROPY_HW_SPIFLASH_MISO,
 };
 
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
diff --git a/ports/stm32/boards/STM32F769DISC/board_init.c b/ports/stm32/boards/STM32F769DISC/board_init.c
index e89d187fece7a..578dc9adb6c82 100644
--- a/ports/stm32/boards/STM32F769DISC/board_init.c
+++ b/ports/stm32/boards/STM32F769DISC/board_init.c
@@ -4,7 +4,7 @@
 // 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;
+static mp_spiflash_cache_t spi_bdev_cache;
 #endif
 
 const mp_spiflash_config_t spiflash_config = {
diff --git a/ports/stm32/boards/STM32L476DISC/bdev.c b/ports/stm32/boards/STM32L476DISC/bdev.c
index c76eb6e2c9077..b5628c4fba793 100644
--- a/ports/stm32/boards/STM32L476DISC/bdev.c
+++ b/ports/stm32/boards/STM32L476DISC/bdev.c
@@ -2,7 +2,7 @@
 
 // External SPI flash uses standard SPI interface
 
-STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+static const mp_soft_spi_obj_t soft_spi_bus = {
     .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
     .polarity = 0,
     .phase = 0,
@@ -11,7 +11,7 @@ STATIC const mp_soft_spi_obj_t soft_spi_bus = {
     .miso = MICROPY_HW_SPIFLASH_MISO,
 };
 
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
diff --git a/ports/stm32/boards/VCC_GND_F407VE/bdev.c b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
index dd62a0eb17fd1..0e23a9df6aab8 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/bdev.c
+++ b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
@@ -4,7 +4,7 @@
 
 // External SPI flash uses standard SPI interface
 
-STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+static const mp_soft_spi_obj_t soft_spi_bus = {
     .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
     .polarity = 0,
     .phase = 0,
@@ -13,7 +13,7 @@ STATIC const mp_soft_spi_obj_t soft_spi_bus = {
     .miso = MICROPY_HW_SPIFLASH_MISO,
 };
 
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/bdev.c b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
index dd62a0eb17fd1..0e23a9df6aab8 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
+++ b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
@@ -4,7 +4,7 @@
 
 // External SPI flash uses standard SPI interface
 
-STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+static const mp_soft_spi_obj_t soft_spi_bus = {
     .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
     .polarity = 0,
     .phase = 0,
@@ -13,7 +13,7 @@ STATIC const mp_soft_spi_obj_t soft_spi_bus = {
     .miso = MICROPY_HW_SPIFLASH_MISO,
 };
 
-STATIC mp_spiflash_cache_t spi_bdev_cache;
+static mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
diff --git a/ports/stm32/can.c b/ports/stm32/can.c
index 9248e216c9782..27d29207227ba 100644
--- a/ports/stm32/can.c
+++ b/ports/stm32/can.c
@@ -312,7 +312,7 @@ HAL_StatusTypeDef CAN_Transmit(CAN_HandleTypeDef *hcan, uint32_t Timeout) {
     }
 }
 
-STATIC void can_rx_irq_handler(uint can_id, uint fifo_id) {
+static void can_rx_irq_handler(uint can_id, uint fifo_id) {
     mp_obj_t callback;
     pyb_can_obj_t *self;
     mp_obj_t irq_reason = MP_OBJ_NEW_SMALL_INT(0);
@@ -354,7 +354,7 @@ STATIC void can_rx_irq_handler(uint can_id, uint fifo_id) {
     pyb_can_handle_callback(self, fifo_id, callback, irq_reason);
 }
 
-STATIC void can_sce_irq_handler(uint can_id) {
+static void can_sce_irq_handler(uint can_id) {
     pyb_can_obj_t *self = MP_STATE_PORT(pyb_can_obj_all)[can_id - 1];
     if (self) {
         self->can.Instance->MSR = CAN_MSR_ERRI;
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 252af369c0087..54d5acc6cea9d 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -71,7 +71,7 @@
 #endif
 
 #if defined(TIM6)
-STATIC void TIM6_Config(uint freq) {
+static void TIM6_Config(uint freq) {
     // Init TIM6 at the required frequency (in Hz)
     TIM_HandleTypeDef *tim = timer_tim6_init(freq);
 
@@ -86,7 +86,7 @@ STATIC void TIM6_Config(uint freq) {
 }
 #endif
 
-STATIC uint32_t TIMx_Config(mp_obj_t timer) {
+static uint32_t TIMx_Config(mp_obj_t timer) {
     // TRGO selection to trigger DAC
     TIM_HandleTypeDef *tim = pyb_timer_get_handle(timer);
     TIM_MasterConfigTypeDef config;
@@ -122,7 +122,7 @@ STATIC uint32_t TIMx_Config(mp_obj_t timer) {
     }
 }
 
-STATIC void dac_deinit(uint32_t dac_channel) {
+static void dac_deinit(uint32_t dac_channel) {
     DAC->CR &= ~(DAC_CR_EN1 << dac_channel);
     #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4)
     DAC->MCR = (DAC->MCR & ~(DAC_MCR_MODE1_Msk << dac_channel)) | (DAC_OUTPUTBUFFER_DISABLE << dac_channel);
@@ -138,7 +138,7 @@ void dac_deinit_all(void) {
     #endif
 }
 
-STATIC void dac_config_channel(uint32_t dac_channel, uint32_t trig, uint32_t outbuf) {
+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;
     uint32_t cr_on = trig;
@@ -151,7 +151,7 @@ STATIC void dac_config_channel(uint32_t dac_channel, uint32_t trig, uint32_t out
     DAC->CR = (DAC->CR & ~(cr_off << dac_channel)) | (cr_on << dac_channel);
 }
 
-STATIC void dac_set_value(uint32_t dac_channel, uint32_t align, uint32_t value) {
+static void dac_set_value(uint32_t dac_channel, uint32_t align, uint32_t value) {
     uint32_t base;
     if (dac_channel == DAC_CHANNEL_1) {
         base = (uint32_t)&DAC->DHR12R1;
@@ -163,11 +163,11 @@ STATIC void dac_set_value(uint32_t dac_channel, uint32_t align, uint32_t value)
     *(volatile uint32_t *)(base + align) = value;
 }
 
-STATIC void dac_start(uint32_t dac_channel) {
+static void dac_start(uint32_t dac_channel) {
     DAC->CR |= DAC_CR_EN1 << dac_channel;
 }
 
-STATIC void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, uint32_t dma_mode, uint32_t bit_size, uint32_t dac_align, size_t len, void *buf) {
+static void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, uint32_t dma_mode, uint32_t bit_size, uint32_t dac_align, size_t len, void *buf) {
     uint32_t dma_align;
     if (bit_size == 8) {
         #if defined(STM32G4)
@@ -216,9 +216,9 @@ typedef struct _pyb_dac_obj_t {
     uint8_t outbuf_waveform;
 } pyb_dac_obj_t;
 
-STATIC pyb_dac_obj_t pyb_dac_obj[2];
+static pyb_dac_obj_t pyb_dac_obj[2];
 
-STATIC void pyb_dac_reconfigure(pyb_dac_obj_t *self, uint32_t cr, uint32_t outbuf, uint32_t value) {
+static void pyb_dac_reconfigure(pyb_dac_obj_t *self, uint32_t cr, uint32_t outbuf, uint32_t value) {
     bool restart = false;
     const uint32_t cr_mask = DAC_CR_DMAEN1 | DAC_CR_MAMP1 | DAC_CR_WAVE1 | DAC_CR_TSEL1 | DAC_CR_TEN1 | DAC_CR_EN1;
     if (((DAC->CR >> self->dac_channel) & cr_mask) != (cr | DAC_CR_EN1)) {
@@ -240,14 +240,14 @@ STATIC void pyb_dac_reconfigure(pyb_dac_obj_t *self, uint32_t cr, uint32_t outbu
     }
 }
 
-STATIC void pyb_dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "DAC(%u, bits=%u)",
         self->dac_channel == DAC_CHANNEL_1 ? 1 : 2,
         self->bits);
 }
 
-STATIC mp_obj_t pyb_dac_init_helper(pyb_dac_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_dac_init_helper(pyb_dac_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_bits, MP_ARG_INT, {.u_int = 8} },
         { MP_QSTR_buffering, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -315,7 +315,7 @@ STATIC mp_obj_t pyb_dac_init_helper(pyb_dac_obj_t *self, size_t n_args, const mp
 ///
 /// `port` can be a pin object, or an integer (1 or 2).
 /// DAC(1) is on pin X5 and DAC(2) is on pin X6.
-STATIC mp_obj_t pyb_dac_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 pyb_dac_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);
 
@@ -360,25 +360,25 @@ STATIC mp_obj_t pyb_dac_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(dac);
 }
 
-STATIC mp_obj_t pyb_dac_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_dac_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pyb_dac_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_dac_init_obj, 1, pyb_dac_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_dac_init_obj, 1, pyb_dac_init);
 
 /// \method deinit()
 /// Turn off the DAC, enable other use of pin.
-STATIC mp_obj_t pyb_dac_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_dac_deinit(mp_obj_t self_in) {
     pyb_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
     dac_deinit(self->dac_channel);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_dac_deinit_obj, pyb_dac_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_dac_deinit_obj, pyb_dac_deinit);
 
 #if defined(TIM6)
 /// \method noise(freq)
 /// Generate a pseudo-random noise signal.  A new random sample is written
 /// to the DAC output at the given frequency.
-STATIC mp_obj_t pyb_dac_noise(mp_obj_t self_in, mp_obj_t freq) {
+static mp_obj_t pyb_dac_noise(mp_obj_t self_in, mp_obj_t freq) {
     pyb_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // set TIM6 to trigger the DAC at the given frequency
@@ -390,7 +390,7 @@ STATIC mp_obj_t pyb_dac_noise(mp_obj_t self_in, mp_obj_t freq) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_dac_noise_obj, pyb_dac_noise);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_dac_noise_obj, pyb_dac_noise);
 #endif
 
 #if defined(TIM6)
@@ -398,7 +398,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_dac_noise_obj, pyb_dac_noise);
 /// Generate a triangle wave.  The value on the DAC output changes at
 /// the given frequency, and the frequency of the repeating triangle wave
 /// itself is 8192 times smaller.
-STATIC mp_obj_t pyb_dac_triangle(mp_obj_t self_in, mp_obj_t freq) {
+static mp_obj_t pyb_dac_triangle(mp_obj_t self_in, mp_obj_t freq) {
     pyb_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // set TIM6 to trigger the DAC at the given frequency
@@ -410,12 +410,12 @@ STATIC mp_obj_t pyb_dac_triangle(mp_obj_t self_in, mp_obj_t freq) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_dac_triangle_obj, pyb_dac_triangle);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_dac_triangle_obj, pyb_dac_triangle);
 #endif
 
 /// \method write(value)
 /// Direct access to the DAC output (8 bit only at the moment).
-STATIC mp_obj_t pyb_dac_write(mp_obj_t self_in, mp_obj_t val) {
+static mp_obj_t pyb_dac_write(mp_obj_t self_in, mp_obj_t val) {
     pyb_dac_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // DAC output is always 12-bit at the hardware level, and we provide support
@@ -426,7 +426,7 @@ STATIC mp_obj_t pyb_dac_write(mp_obj_t self_in, mp_obj_t val) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_dac_write_obj, pyb_dac_write);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_dac_write_obj, pyb_dac_write);
 
 #if defined(TIM6)
 /// \method write_timed(data, freq, *, mode=DAC.NORMAL)
@@ -497,10 +497,10 @@ mp_obj_t pyb_dac_write_timed(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_dac_write_timed_obj, 1, pyb_dac_write_timed);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_dac_write_timed_obj, 1, pyb_dac_write_timed);
 #endif
 
-STATIC const mp_rom_map_elem_t pyb_dac_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_dac_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_dac_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_dac_deinit_obj) },
@@ -516,7 +516,7 @@ STATIC const mp_rom_map_elem_t pyb_dac_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_CIRCULAR), MP_ROM_INT(DMA_CIRCULAR) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_dac_locals_dict, pyb_dac_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_dac_locals_dict, pyb_dac_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_dac_type,
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 363357dac9ecd..12c29f071616b 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -143,10 +143,10 @@ static eth_dma_t eth_dma __attribute__((aligned(16384)));
 
 eth_t eth_instance;
 
-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_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) {
+static void eth_phy_write(uint32_t reg, uint32_t val) {
     #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
@@ -172,7 +172,7 @@ STATIC void eth_phy_write(uint32_t reg, uint32_t val) {
     #endif
 }
 
-STATIC uint32_t eth_phy_read(uint32_t reg) {
+static uint32_t eth_phy_read(uint32_t reg) {
     #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
@@ -231,7 +231,7 @@ void eth_set_trace(eth_t *self, uint32_t value) {
     self->trace_flags = value;
 }
 
-STATIC int eth_mac_init(eth_t *self) {
+static int eth_mac_init(eth_t *self) {
     // Configure MPU
     uint32_t irq_state = mpu_config_start();
     #if defined(STM32H5)
@@ -540,7 +540,7 @@ STATIC int eth_mac_init(eth_t *self) {
     return 0;
 }
 
-STATIC void eth_mac_deinit(eth_t *self) {
+static void eth_mac_deinit(eth_t *self) {
     (void)self;
     HAL_NVIC_DisableIRQ(ETH_IRQn);
     #if defined(STM32H5)
@@ -558,7 +558,7 @@ STATIC void eth_mac_deinit(eth_t *self) {
     #endif
 }
 
-STATIC int eth_tx_buf_get(size_t len, uint8_t **buf) {
+static int eth_tx_buf_get(size_t len, uint8_t **buf) {
     if (len > TX_BUF_SIZE) {
         return -MP_EINVAL;
     }
@@ -597,7 +597,7 @@ STATIC int eth_tx_buf_get(size_t len, uint8_t **buf) {
     return 0;
 }
 
-STATIC int eth_tx_buf_send(void) {
+static int eth_tx_buf_send(void) {
     // Get TX descriptor and move to next one
     eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[eth_dma.tx_descr_idx];
     eth_dma.tx_descr_idx = (eth_dma.tx_descr_idx + 1) % TX_BUF_NUM;
@@ -637,7 +637,7 @@ STATIC int eth_tx_buf_send(void) {
     return 0;
 }
 
-STATIC void eth_dma_rx_free(void) {
+static void eth_dma_rx_free(void) {
     // Get RX descriptor, RX buffer and move to next one
     eth_dma_rx_descr_t *rx_descr = &eth_dma.rx_descr[eth_dma.rx_descr_idx];
     uint8_t *buf = &eth_dma.rx_buf[eth_dma.rx_descr_idx * RX_BUF_SIZE];
@@ -727,7 +727,7 @@ void ETH_IRQHandler(void) {
 #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) {
+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;
@@ -747,7 +747,7 @@ STATIC void eth_trace(eth_t *self, size_t len, const void *data, unsigned int fl
     }
 }
 
-STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
+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
 
     LINK_STATS_INC(link.xmit);
@@ -763,7 +763,7 @@ STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
     return ret ? ERR_BUF : ERR_OK;
 }
 
-STATIC err_t eth_netif_init(struct netif *netif) {
+static err_t eth_netif_init(struct netif *netif) {
     netif->linkoutput = eth_netif_output;
     netif->output = etharp_output;
     netif->mtu = 1500;
@@ -778,7 +778,7 @@ STATIC err_t eth_netif_init(struct netif *netif) {
     return ERR_OK;
 }
 
-STATIC void eth_lwip_init(eth_t *self) {
+static void eth_lwip_init(eth_t *self) {
     ip_addr_t ipconfig[4];
     IP4_ADDR(&ipconfig[0], 0, 0, 0, 0);
     IP4_ADDR(&ipconfig[2], 192, 168, 0, 1);
@@ -804,7 +804,7 @@ STATIC void eth_lwip_init(eth_t *self) {
     MICROPY_PY_LWIP_EXIT
 }
 
-STATIC void eth_lwip_deinit(eth_t *self) {
+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) {
@@ -816,7 +816,7 @@ STATIC void eth_lwip_deinit(eth_t *self) {
     MICROPY_PY_LWIP_EXIT
 }
 
-STATIC void eth_process_frame(eth_t *self, size_t len, const uint8_t *buf) {
+static void eth_process_frame(eth_t *self, size_t len, const uint8_t *buf) {
     eth_trace(self, len, buf, NETUTILS_TRACE_NEWLINE);
 
     struct netif *netif = &self->netif;
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index f6db1e632880a..2a08810125572 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -123,11 +123,11 @@ typedef struct {
     mp_int_t line;
 } extint_obj_t;
 
-STATIC uint8_t pyb_extint_mode[EXTI_NUM_VECTORS];
-STATIC bool pyb_extint_hard_irq[EXTI_NUM_VECTORS];
+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
-STATIC mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
+static mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
 
 #if !defined(ETH)
 #define ETH_WKUP_IRQn   62  // Some MCUs don't have ETH, but we want a value to put in our table
@@ -143,7 +143,7 @@ STATIC mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
 #define TAMP_STAMP_IRQn RTC_TAMP_LSECSS_IRQn
 #endif
 
-STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
+static const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     #if defined(STM32F0) || defined(STM32L0) || defined(STM32G0)
 
     EXTI0_1_IRQn,  EXTI0_1_IRQn,  EXTI2_3_IRQn,  EXTI2_3_IRQn,
@@ -531,44 +531,44 @@ void extint_trigger_mode(uint line, uint32_t mode) {
 
 /// \method line()
 /// Return the line number that the pin is mapped to.
-STATIC mp_obj_t extint_obj_line(mp_obj_t self_in) {
+static mp_obj_t extint_obj_line(mp_obj_t self_in) {
     extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->line);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_line_obj, extint_obj_line);
+static MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_line_obj, extint_obj_line);
 
 /// \method enable()
 /// Enable a disabled interrupt.
-STATIC mp_obj_t extint_obj_enable(mp_obj_t self_in) {
+static mp_obj_t extint_obj_enable(mp_obj_t self_in) {
     extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
     extint_enable(self->line);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_enable_obj, extint_obj_enable);
+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) {
+static mp_obj_t extint_obj_disable(mp_obj_t self_in) {
     extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
     extint_disable(self->line);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_disable_obj, extint_obj_disable);
+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) {
+static mp_obj_t extint_obj_swint(mp_obj_t self_in) {
     extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
     extint_swint(self->line);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
+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) {
+static mp_obj_t extint_regs(void) {
     const mp_print_t *print = &mp_plat_print;
 
     #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
@@ -621,8 +621,8 @@ STATIC mp_obj_t extint_regs(void) {
 
     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));
+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:
@@ -639,7 +639,7 @@ STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(extint_regs_obj, MP_ROM_PTR(&extint_regs
 ///   - `callback` is the function to call when the interrupt triggers.  The
 ///   callback function must accept exactly 1 argument, which is the line that
 ///   triggered the interrupt.
-STATIC const mp_arg_t pyb_extint_make_new_args[] = {
+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} },
@@ -647,7 +647,7 @@ STATIC const mp_arg_t pyb_extint_make_new_args[] = {
 };
 #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) {
+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
@@ -660,12 +660,12 @@ STATIC mp_obj_t extint_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     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) {
+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 line=%u>", self->line);
 }
 
-STATIC const mp_rom_map_elem_t extint_locals_dict_table[] = {
+static const mp_rom_map_elem_t extint_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_line),    MP_ROM_PTR(&extint_obj_line_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) },
@@ -684,7 +684,7 @@ STATIC const mp_rom_map_elem_t extint_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_EVT_RISING_FALLING), MP_ROM_INT(GPIO_MODE_EVT_RISING_FALLING) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
+static MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     extint_type,
diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 640244a3b9d8b..26a8860988418 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -340,7 +340,7 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
     return 0; // success
 }
 
-STATIC void can_rx_irq_handler(uint can_id, uint fifo_id) {
+static void can_rx_irq_handler(uint can_id, uint fifo_id) {
     mp_obj_t callback;
     pyb_can_obj_t *self;
     mp_obj_t irq_reason = MP_OBJ_NEW_SMALL_INT(0);
diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 52f227a950eb9..9d128acc3cdd2 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -34,7 +34,7 @@
 
 #if defined(STM32F4) || defined(STM32L1)
 
-STATIC uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
+static uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
 
 int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t freq, uint16_t timeout_ms) {
     uint32_t i2c_id = ((uint32_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
@@ -93,7 +93,7 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
     return 0;
 }
 
-STATIC int i2c_wait_sr1_set(i2c_t *i2c, uint32_t mask) {
+static int i2c_wait_sr1_set(i2c_t *i2c, uint32_t mask) {
     uint32_t i2c_id = ((uint32_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
     uint32_t t0 = HAL_GetTick();
     while (!(i2c->SR1 & mask)) {
@@ -105,7 +105,7 @@ STATIC int i2c_wait_sr1_set(i2c_t *i2c, uint32_t mask) {
     return 0;
 }
 
-STATIC int i2c_wait_stop(i2c_t *i2c) {
+static int i2c_wait_stop(i2c_t *i2c) {
     uint32_t i2c_id = ((uint32_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
     uint32_t t0 = HAL_GetTick();
     while (i2c->CR1 & I2C_CR1_STOP) {
@@ -284,7 +284,7 @@ int i2c_write(i2c_t *i2c, const uint8_t *src, size_t len, size_t next_len) {
 #endif
 #endif
 
-STATIC uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
+static uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
 
 static uint32_t i2c_get_id(i2c_t *i2c) {
     #if defined(STM32H7)
@@ -362,7 +362,7 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
     return 0;
 }
 
-STATIC int i2c_wait_cr2_clear(i2c_t *i2c, uint32_t mask) {
+static int i2c_wait_cr2_clear(i2c_t *i2c, uint32_t mask) {
     uint32_t i2c_id = i2c_get_id(i2c);
 
     uint32_t t0 = HAL_GetTick();
@@ -375,7 +375,7 @@ STATIC int i2c_wait_cr2_clear(i2c_t *i2c, uint32_t mask) {
     return 0;
 }
 
-STATIC int i2c_wait_isr_set(i2c_t *i2c, uint32_t mask) {
+static int i2c_wait_isr_set(i2c_t *i2c, uint32_t mask) {
     uint32_t i2c_id = i2c_get_id(i2c);
 
     uint32_t t0 = HAL_GetTick();
@@ -423,7 +423,7 @@ int i2c_start_addr(i2c_t *i2c, int rd_wrn, uint16_t addr, size_t len, bool stop)
     return 0;
 }
 
-STATIC int i2c_check_stop(i2c_t *i2c) {
+static int i2c_check_stop(i2c_t *i2c) {
     if (i2c->CR2 & I2C_CR2_AUTOEND) {
         // Wait for the STOP condition and then disable the peripheral
         int ret;
@@ -539,7 +539,7 @@ int i2c_writeto(i2c_t *i2c, uint16_t addr, const uint8_t *src, size_t len, bool
 
 #endif
 
-STATIC const uint8_t i2c_available =
+static const uint8_t i2c_available =
     0
     #if defined(MICROPY_HW_I2C1_SCL)
     | 1 << 1
diff --git a/ports/stm32/irq.c b/ports/stm32/irq.c
index fdaf2385cc9d1..3bef1712fccf3 100644
--- a/ports/stm32/irq.c
+++ b/ports/stm32/irq.c
@@ -36,7 +36,7 @@ uint32_t irq_stats[IRQ_STATS_MAX] = {0};
 // 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) {
+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);
@@ -44,7 +44,7 @@ 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) {
+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;
 }
@@ -52,7 +52,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj, 0, 1, machine_enable
 
 #if IRQ_ENABLE_STATS
 // return a memoryview of the irq statistics array
-STATIC mp_obj_t pyb_irq_stats(void) {
+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);
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index a78718872baed..ec53b1c46bf37 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -105,11 +105,11 @@ typedef struct _pyb_lcd_obj_t {
     byte pix_buf2[LCD_PIX_BUF_BYTE_SIZE];
 } pyb_lcd_obj_t;
 
-STATIC void lcd_delay(void) {
+static void lcd_delay(void) {
     __asm volatile ("nop\nnop");
 }
 
-STATIC void lcd_out(pyb_lcd_obj_t *lcd, int instr_data, uint8_t i) {
+static void lcd_out(pyb_lcd_obj_t *lcd, int instr_data, uint8_t i) {
     lcd_delay();
     mp_hal_pin_low(lcd->pin_cs1); // CS=0; enable
     if (instr_data == LCD_INSTR) {
@@ -125,7 +125,7 @@ STATIC void lcd_out(pyb_lcd_obj_t *lcd, int instr_data, uint8_t i) {
 
 // write a string to the LCD at the current cursor location
 // output it straight away (doesn't use the pixel buffer)
-STATIC void lcd_write_strn(pyb_lcd_obj_t *lcd, const char *str, unsigned int len) {
+static void lcd_write_strn(pyb_lcd_obj_t *lcd, const char *str, unsigned int len) {
     int redraw_min = lcd->line * LCD_CHAR_BUF_W + lcd->column;
     int redraw_max = redraw_min;
     for (; len > 0; len--, str++) {
@@ -192,7 +192,7 @@ STATIC void lcd_write_strn(pyb_lcd_obj_t *lcd, const char *str, unsigned int len
 ///
 /// 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.
-STATIC mp_obj_t pyb_lcd_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 pyb_lcd_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);
 
@@ -323,7 +323,7 @@ STATIC mp_obj_t pyb_lcd_make_new(const mp_obj_type_t *type, size_t n_args, size_
 /// Send an arbitrary command to the LCD.  Pass 0 for `instr_data` to send an
 /// instruction, otherwise pass 1 to send data.  `buf` is a buffer with the
 /// instructions/data to send.
-STATIC mp_obj_t pyb_lcd_command(mp_obj_t self_in, mp_obj_t instr_data_in, mp_obj_t val) {
+static mp_obj_t pyb_lcd_command(mp_obj_t self_in, mp_obj_t instr_data_in, mp_obj_t val) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // get whether instr or data
@@ -341,12 +341,12 @@ STATIC mp_obj_t pyb_lcd_command(mp_obj_t self_in, mp_obj_t instr_data_in, mp_obj
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_lcd_command_obj, pyb_lcd_command);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_lcd_command_obj, pyb_lcd_command);
 
 /// \method contrast(value)
 ///
 /// Set the contrast of the LCD.  Valid values are between 0 and 47.
-STATIC mp_obj_t pyb_lcd_contrast(mp_obj_t self_in, mp_obj_t contrast_in) {
+static mp_obj_t pyb_lcd_contrast(mp_obj_t self_in, mp_obj_t contrast_in) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int contrast = mp_obj_get_int(contrast_in);
     if (contrast < 0) {
@@ -358,12 +358,12 @@ STATIC mp_obj_t pyb_lcd_contrast(mp_obj_t self_in, mp_obj_t contrast_in) {
     lcd_out(self, LCD_INSTR, contrast); // electronic volume register set
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_contrast_obj, pyb_lcd_contrast);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_contrast_obj, pyb_lcd_contrast);
 
 /// \method light(value)
 ///
 /// Turn the backlight on/off.  True or 1 turns it on, False or 0 turns it off.
-STATIC mp_obj_t pyb_lcd_light(mp_obj_t self_in, mp_obj_t value) {
+static mp_obj_t pyb_lcd_light(mp_obj_t self_in, mp_obj_t value) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (mp_obj_is_true(value)) {
         mp_hal_pin_high(self->pin_bl); // set pin high to turn backlight on
@@ -372,26 +372,26 @@ STATIC mp_obj_t pyb_lcd_light(mp_obj_t self_in, mp_obj_t value) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_light_obj, pyb_lcd_light);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_light_obj, pyb_lcd_light);
 
 /// \method write(str)
 ///
 /// Write the string `str` to the screen.  It will appear immediately.
-STATIC mp_obj_t pyb_lcd_write(mp_obj_t self_in, mp_obj_t str) {
+static mp_obj_t pyb_lcd_write(mp_obj_t self_in, mp_obj_t str) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(self_in);
     size_t len;
     const char *data = mp_obj_str_get_data(str, &len);
     lcd_write_strn(self, data, len);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_write_obj, pyb_lcd_write);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_write_obj, pyb_lcd_write);
 
 /// \method fill(colour)
 ///
 /// Fill the screen with the given colour (0 or 1 for white or black).
 ///
 /// This method writes to the hidden buffer.  Use `show()` to show the buffer.
-STATIC mp_obj_t pyb_lcd_fill(mp_obj_t self_in, mp_obj_t col_in) {
+static mp_obj_t pyb_lcd_fill(mp_obj_t self_in, mp_obj_t col_in) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int col = mp_obj_get_int(col_in);
     if (col) {
@@ -401,14 +401,14 @@ STATIC mp_obj_t pyb_lcd_fill(mp_obj_t self_in, mp_obj_t col_in) {
     memset(self->pix_buf2, col, LCD_PIX_BUF_BYTE_SIZE);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_fill_obj, pyb_lcd_fill);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_lcd_fill_obj, pyb_lcd_fill);
 
 /// \method get(x, y)
 ///
 /// Get the pixel at the position `(x, y)`.  Returns 0 or 1.
 ///
 /// This method reads from the visible buffer.
-STATIC mp_obj_t pyb_lcd_get(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
+static mp_obj_t pyb_lcd_get(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int x = mp_obj_get_int(x_in);
     int y = mp_obj_get_int(y_in);
@@ -420,14 +420,14 @@ STATIC mp_obj_t pyb_lcd_get(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) {
     }
     return mp_obj_new_int(0);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_lcd_get_obj, pyb_lcd_get);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_lcd_get_obj, pyb_lcd_get);
 
 /// \method pixel(x, y, colour)
 ///
 /// Set the pixel at `(x, y)` to the given colour (0 or 1).
 ///
 /// This method writes to the hidden buffer.  Use `show()` to show the buffer.
-STATIC mp_obj_t pyb_lcd_pixel(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_lcd_pixel(size_t n_args, const mp_obj_t *args) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     int x = mp_obj_get_int(args[1]);
     int y = mp_obj_get_int(args[2]);
@@ -441,14 +441,14 @@ STATIC mp_obj_t pyb_lcd_pixel(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_lcd_pixel_obj, 4, 4, pyb_lcd_pixel);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_lcd_pixel_obj, 4, 4, pyb_lcd_pixel);
 
 /// \method text(str, x, y, colour)
 ///
 /// Draw the given text to the position `(x, y)` using the given colour (0 or 1).
 ///
 /// This method writes to the hidden buffer.  Use `show()` to show the buffer.
-STATIC mp_obj_t pyb_lcd_text(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_lcd_text(size_t n_args, const mp_obj_t *args) {
     // extract arguments
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     size_t len;
@@ -490,12 +490,12 @@ STATIC mp_obj_t pyb_lcd_text(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_lcd_text_obj, 5, 5, pyb_lcd_text);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_lcd_text_obj, 5, 5, pyb_lcd_text);
 
 /// \method show()
 ///
 /// Show the hidden buffer on the screen.
-STATIC mp_obj_t pyb_lcd_show(mp_obj_t self_in) {
+static mp_obj_t pyb_lcd_show(mp_obj_t self_in) {
     pyb_lcd_obj_t *self = MP_OBJ_TO_PTR(self_in);
     memcpy(self->pix_buf, self->pix_buf2, LCD_PIX_BUF_BYTE_SIZE);
     for (uint page = 0; page < 4; page++) {
@@ -508,9 +508,9 @@ STATIC mp_obj_t pyb_lcd_show(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_lcd_show_obj, pyb_lcd_show);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_lcd_show_obj, pyb_lcd_show);
 
-STATIC const mp_rom_map_elem_t pyb_lcd_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_lcd_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_command), MP_ROM_PTR(&pyb_lcd_command_obj) },
     { MP_ROM_QSTR(MP_QSTR_contrast), MP_ROM_PTR(&pyb_lcd_contrast_obj) },
@@ -523,7 +523,7 @@ STATIC const mp_rom_map_elem_t pyb_lcd_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&pyb_lcd_show_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_lcd_locals_dict, pyb_lcd_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_lcd_locals_dict, pyb_lcd_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_lcd_type,
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 39b1f7e388814..795d8c1109621 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -50,7 +50,7 @@ typedef struct _pyb_led_obj_t {
     const machine_pin_obj_t *led_pin;
 } pyb_led_obj_t;
 
-STATIC const pyb_led_obj_t pyb_led_obj[] = {
+static const pyb_led_obj_t pyb_led_obj[] = {
     {{&pyb_led_type}, 1, MICROPY_HW_LED1},
     #if defined(MICROPY_HW_LED2)
     {{&pyb_led_type}, 2, MICROPY_HW_LED2},
@@ -125,7 +125,7 @@ typedef struct _led_pwm_config_t {
     uint8_t alt_func;
 } led_pwm_config_t;
 
-STATIC const led_pwm_config_t led_pwm_config[] = {
+static const led_pwm_config_t led_pwm_config[] = {
     MICROPY_HW_LED1_PWM,
     MICROPY_HW_LED2_PWM,
     MICROPY_HW_LED3_PWM,
@@ -134,15 +134,15 @@ STATIC const led_pwm_config_t led_pwm_config[] = {
     MICROPY_HW_LED6_PWM,
 };
 
-STATIC uint8_t led_pwm_state = 0;
+static uint8_t led_pwm_state = 0;
 
 static inline bool led_pwm_is_enabled(int led) {
     return (led_pwm_state & (1 << led)) != 0;
 }
 
 // this function has a large stack so it should not be inlined
-STATIC void led_pwm_init(int led) __attribute__((noinline));
-STATIC void led_pwm_init(int led) {
+static void led_pwm_init(int led) __attribute__((noinline));
+static void led_pwm_init(int led) {
     const machine_pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
     const led_pwm_config_t *pwm_cfg = &led_pwm_config[led - 1];
 
@@ -190,7 +190,7 @@ STATIC void led_pwm_init(int led) {
     led_pwm_state |= 1 << led;
 }
 
-STATIC void led_pwm_deinit(int led) {
+static void led_pwm_deinit(int led) {
     // make the LED's pin a standard GPIO output pin
     const machine_pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
     GPIO_TypeDef *g = led_pin->gpio;
@@ -312,7 +312,7 @@ void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t ki
 /// 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) {
+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);
 
@@ -366,19 +366,19 @@ mp_obj_t led_obj_intensity(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-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 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(led_obj_intensity_obj, 1, 2, led_obj_intensity);
+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 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(led_obj_intensity_obj, 1, 2, led_obj_intensity);
 
-STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
+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) },
     { MP_ROM_QSTR(MP_QSTR_intensity), MP_ROM_PTR(&led_obj_intensity_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
+static MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_led_type,
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 91094427b86cc..8f07075914b88 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -112,7 +112,7 @@ typedef enum _machine_adc_internal_ch_t {
 
 // Convert machine_adc_internal_ch_t value to STM32 library ADC channel literal.
 // This function is required as literals are uint32_t types that don't map with MP_ROM_INT (31 bit signed).
-STATIC uint32_t adc_ll_channel(uint32_t channel_id) {
+static uint32_t adc_ll_channel(uint32_t channel_id) {
     uint32_t adc_ll_ch;
     switch (channel_id) {
         // external channels map 1:1
@@ -154,7 +154,7 @@ static inline void adc_stabilisation_delay_us(uint32_t us) {
     mp_hal_delay_us(us + 1);
 }
 
-STATIC void adc_wait_eoc(ADC_TypeDef *adc, int32_t timeout_ms) {
+static void adc_wait_eoc(ADC_TypeDef *adc, int32_t timeout_ms) {
     uint32_t t0 = mp_hal_ticks_ms();
     #if ADC_V2
     while (!(adc->ISR & ADC_ISR_EOC))
@@ -169,9 +169,9 @@ STATIC void adc_wait_eoc(ADC_TypeDef *adc, int32_t timeout_ms) {
 }
 
 #if defined(STM32H7)
-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[] = {16, 14, 12, 10, 8, 8, 8, 8};
 #else
-STATIC const uint8_t adc_cr_to_bits_table[] = {12, 10, 8, 6};
+static const uint8_t adc_cr_to_bits_table[] = {12, 10, 8, 6};
 #endif
 
 void adc_config(ADC_TypeDef *adc, uint32_t bits) {
@@ -313,7 +313,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     #endif
 }
 
-STATIC int adc_get_bits(ADC_TypeDef *adc) {
+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) || defined(STM32L1)
@@ -324,7 +324,7 @@ STATIC int adc_get_bits(ADC_TypeDef *adc) {
     return adc_cr_to_bits_table[res];
 }
 
-STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time) {
+static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time) {
     #if ADC_V2
     if (!(adc->CR & ADC_CR_ADEN)) {
         if (adc->CR & 0x3f) {
@@ -443,7 +443,7 @@ STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     #endif
 }
 
-STATIC uint32_t adc_read_channel(ADC_TypeDef *adc) {
+static uint32_t adc_read_channel(ADC_TypeDef *adc) {
     uint32_t value;
     #if defined(STM32G4)
     // For STM32G4 there is errata 2.7.7, "Wrong ADC result if conversion done late after
@@ -520,7 +520,7 @@ typedef struct _machine_adc_obj_t {
     uint32_t sample_time;
 } machine_adc_obj_t;
 
-STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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);
     unsigned adc_id = 1;
     #if defined(ADC2)
@@ -537,7 +537,7 @@ STATIC void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 }
 
 // ADC(id)
-STATIC mp_obj_t mp_machine_adc_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_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);
 
@@ -607,7 +607,7 @@ STATIC mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
 }
 
 // read_u16()
-STATIC mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     return adc_config_and_read_u16(self->adc, self->channel, self->sample_time);
 }
 
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 8beefcad6d2f1..ca2170e32d3bc 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -43,7 +43,7 @@ typedef struct _machine_hard_i2c_obj_t {
     mp_hal_pin_obj_t sda;
 } machine_hard_i2c_obj_t;
 
-STATIC const machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
+static const machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
     #if defined(MICROPY_HW_I2C1_SCL)
     [0] = {{&machine_i2c_type}, I2C1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
     #endif
@@ -58,7 +58,7 @@ STATIC const machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
     #endif
 };
 
-STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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) || defined(STM32L1)
@@ -134,7 +134,7 @@ int machine_hard_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, m
 
 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] = {
+static machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
     #if defined(MICROPY_HW_I2C1_SCL)
     [0] = {{&machine_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
     #endif
@@ -149,14 +149,14 @@ STATIC machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
     #endif
 };
 
-STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
     mp_printf(print, "I2C(%u, scl=%q, sda=%q, freq=%u, timeout=%u)",
         self - &machine_hard_i2c_obj[0] + 1,
         self->scl->name, self->sda->name, 500000 / self->us_delay, self->us_timeout);
 }
 
-STATIC void machine_hard_i2c_init(machine_hard_i2c_obj_t *self, uint32_t freq, uint32_t timeout) {
+static void machine_hard_i2c_init(machine_hard_i2c_obj_t *self, uint32_t freq, uint32_t timeout) {
     // set parameters
     if (freq >= 1000000) {
         // allow fastest possible bit-bang rate
@@ -228,7 +228,7 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
+static const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer = machine_hard_i2c_transfer,
 };
 
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index dbee81bb395a6..a2a0a8291008c 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -94,19 +94,19 @@ typedef struct _machine_i2s_obj_t {
     const dma_descr_t *dma_descr_rx;
 } machine_i2s_obj_t;
 
-STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
+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] = {
+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, -1, -1,  2,  3, -1, -1 },  // Stereo, 16-bits
     { 2,  3,  0,  1,  6,  7,  4,  5 },  // Stereo, 32-bits
 };
 
-STATIC const plli2s_config_t plli2s_config[] = PLLI2S_TABLE;
+static const plli2s_config_t plli2s_config[] = PLLI2S_TABLE;
 
 void machine_i2s_init0() {
     for (uint8_t i = 0; i < MICROPY_HW_MAX_I2S; i++) {
@@ -114,7 +114,7 @@ void machine_i2s_init0() {
     }
 }
 
-STATIC bool lookup_plli2s_config(int8_t bits, int32_t rate, uint16_t *plli2sn, uint16_t *plli2sr) {
+static bool lookup_plli2s_config(int8_t bits, int32_t rate, uint16_t *plli2sn, uint16_t *plli2sr) {
     for (uint16_t i = 0; i < MP_ARRAY_SIZE(plli2s_config); i++) {
         if ((plli2s_config[i].bits == bits) && (plli2s_config[i].rate == rate)) {
             *plli2sn = plli2s_config[i].plli2sn;
@@ -148,7 +148,7 @@ STATIC bool lookup_plli2s_config(int8_t bits, int32_t rate, uint16_t *plli2sn, u
 //   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) {
+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++) {
@@ -158,7 +158,7 @@ STATIC void reformat_32_bit_samples(int32_t *sample, uint32_t num_samples) {
     }
 }
 
-STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
+static int8_t get_frame_mapping_index(int8_t bits, format_t format) {
     if (format == MONO) {
         if (bits == 16) {
             return 0;
@@ -174,7 +174,7 @@ STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
     }
 }
 
-STATIC int8_t get_dma_bits(uint16_t mode, int8_t bits) {
+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;
@@ -189,7 +189,7 @@ STATIC int8_t get_dma_bits(uint16_t mode, int8_t bits) {
 }
 
 // function is used in IRQ context
-STATIC void empty_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+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) {
@@ -212,7 +212,7 @@ STATIC void empty_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
 }
 
 // function is used in IRQ context
-STATIC void feed_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+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) {
@@ -262,7 +262,7 @@ STATIC void feed_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
     MP_HAL_CLEAN_DCACHE(dma_buffer_p, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
 }
 
-STATIC bool i2s_init(machine_i2s_obj_t *self) {
+static bool i2s_init(machine_i2s_obj_t *self) {
 
     // init the GPIO lines
     GPIO_InitTypeDef GPIO_InitStructure;
@@ -439,7 +439,7 @@ void HAL_I2S_TxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
     feed_dma(self, TOP_HALF);
 }
 
-STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
+static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     memset(&self->hi2s, 0, sizeof(self->hi2s));
 
     // are I2S pin assignments valid?
@@ -558,7 +558,7 @@ STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     }
 }
 
-STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
+static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     uint8_t i2s_id_zero_base = 0;
 
     if (0) {
@@ -590,7 +590,7 @@ STATIC machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
     return self;
 }
 
-STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     if (self->ring_buffer_storage != NULL) {
         dma_deinit(self->dma_descr_tx);
         dma_deinit(self->dma_descr_rx);
@@ -611,7 +611,7 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
+static void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
     (void)self;
 }
 
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index 0a5a67ef2ed9b..a2e3e3595412a 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -33,7 +33,7 @@
 /******************************************************************************/
 // Implementation of hard SPI for machine module
 
-STATIC const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
+static const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     {{&machine_spi_type}, &spi_obj[0]},
     {{&machine_spi_type}, &spi_obj[1]},
     {{&machine_spi_type}, &spi_obj[2]},
@@ -42,7 +42,7 @@ STATIC const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     {{&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) {
+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);
     spi_print(print, self->spi, false);
 }
@@ -101,7 +101,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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) {
+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 };
@@ -127,17 +127,17 @@ STATIC void machine_hard_spi_init(mp_obj_base_t *self_in, size_t n_args, const m
     }
 }
 
-STATIC void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
+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);
 }
 
-STATIC void machine_hard_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+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, len, src, dest, SPI_TRANSFER_TIMEOUT(len));
 }
 
-STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
+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,
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 6f1a7f9a2d5fd..0f139ae83272f 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -42,7 +42,7 @@
     { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_FLAG_IDLE) }, \
 
-STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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) {
         #if defined(LPUART1)
@@ -140,7 +140,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
 ///   - `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 void mp_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 void mp_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_REQUIRED | MP_ARG_INT, {.u_int = 9600} },
         { MP_QSTR_bits, MP_ARG_INT, {.u_int = 8} },
@@ -278,7 +278,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
 ///   - `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 mp_machine_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 mp_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);
 
@@ -381,23 +381,23 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 // Turn off the UART bus.
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     uart_deinit(self);
 }
 
 // Return number of characters waiting.
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     return uart_rx_any(self);
 }
 
 // Since uart.write() waits up to the last byte, uart.txdone() always returns True.
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     (void)self;
     return true;
 }
 
 // Send a break condition.
-STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
+static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     self->uartx->RQR = USART_RQR_SBKRQ; // write-only register
     #else
@@ -407,7 +407,7 @@ STATIC void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
 
 // Write a single character on the bus.  `data` is an integer to write.
 // The `data` can be up to 9 bits.
-STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
+static void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
     // write the character
     int errcode;
     if (uart_tx_wait(self, self->timeout)) {
@@ -423,7 +423,7 @@ STATIC void mp_machine_uart_writechar(machine_uart_obj_t *self, uint16_t data) {
 
 // Receive a single character on the bus.
 // Return value: The character read, as an integer.  Returns -1 on timeout.
-STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     if (uart_rx_wait(self, self->timeout)) {
         return uart_rx_char(self);
     } else {
@@ -432,7 +432,7 @@ STATIC mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     }
 }
 
-STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
     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));
@@ -463,7 +463,7 @@ STATIC mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
     return self->mp_irq_obj;
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
 
@@ -505,7 +505,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     }
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
 
@@ -532,7 +532,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     }
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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) {
diff --git a/ports/stm32/machine_wdt.c b/ports/stm32/machine_wdt.c
index e0605751d1f4e..4789b85a60955 100644
--- a/ports/stm32/machine_wdt.c
+++ b/ports/stm32/machine_wdt.c
@@ -37,9 +37,9 @@ 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 const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
 
-STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
     if (id != 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("WDT(%d) doesn't exist"), id);
     }
@@ -77,7 +77,7 @@ STATIC machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t
     return (machine_wdt_obj_t *)&machine_wdt;
 }
 
-STATIC void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
     (void)self;
     IWDG->KR = 0xaaaa;
 }
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 3279770ea03ce..802a884d87d7f 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -90,15 +90,15 @@
 #include "subghz.h"
 
 #if MICROPY_PY_THREAD
-STATIC pyb_thread_t pyb_thread_main;
+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 machine_uart_obj_t pyb_uart_repl_obj;
-STATIC uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
+static machine_uart_obj_t pyb_uart_repl_obj;
+static uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
 #endif
 
 void nlr_jump_fail(void *val) {
@@ -119,7 +119,7 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
 }
 #endif
 
-STATIC mp_obj_t pyb_main(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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} }
     };
@@ -140,7 +140,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) {
+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();
@@ -215,7 +215,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
 #endif
 
 #if MICROPY_HW_SDCARD_MOUNT_AT_BOOT
-STATIC bool init_sdcard_fs(void) {
+static bool init_sdcard_fs(void) {
     bool first_part = true;
     for (int part_num = 1; part_num <= 5; ++part_num) {
         // create vfs object
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 6d64fe3cfaf4f..4ef6143bda560 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -213,7 +213,7 @@ def print_regs_as_submodules(reg_name, reg_defs, modules):
 
     print(
         """
-STATIC const mp_rom_map_elem_t stm_%s_globals_table[] = {
+static const mp_rom_map_elem_t stm_%s_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_%s) },
 """
         % (mod_name_lower, mod_name_upper)
@@ -228,7 +228,7 @@ def print_regs_as_submodules(reg_name, reg_defs, modules):
     print(
         """};
 
-STATIC MP_DEFINE_CONST_DICT(stm_%s_globals, stm_%s_globals_table);
+static MP_DEFINE_CONST_DICT(stm_%s_globals, stm_%s_globals_table);
 
 const mp_obj_module_t stm_%s_obj = {
     .base = { &mp_type_module },
@@ -310,7 +310,7 @@ def main():
         for mpz in sorted(needed_mpzs):
             assert 0 <= mpz <= 0xFFFFFFFF
             print(
-                "STATIC const mp_obj_int_t mpz_%08x = {{&mp_type_int}, "
+                "static const mp_obj_int_t mpz_%08x = {{&mp_type_int}, "
                 "{.neg=0, .fixed_dig=1, .alloc=2, .len=2, "
                 ".dig=(uint16_t*)(const uint16_t[]){%#x, %#x}}};"
                 % (mpz, mpz & 0xFFFF, (mpz >> 16) & 0xFFFF),
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 39492b4e5474e..9bb2dcfcaf408 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1051,7 +1051,7 @@ typedef struct _pyb_usbdd_obj_t {
 #define MSFT100_VENDOR_CODE (0x42)
 
 #if !MICROPY_HW_USB_IS_MULTI_OTG
-STATIC const uint8_t usbd_fifo_size[USBD_PMA_NUM_FIFO] = {
+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
 };
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 206d28a89e25d..7c1c4da60bff2 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -114,7 +114,7 @@
     { 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) }, \
 
-STATIC uint32_t reset_cause;
+static uint32_t reset_cause;
 
 void machine_init(void) {
     #if defined(STM32F4)
@@ -186,7 +186,7 @@ void machine_deinit(void) {
 
 // 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) {
+static mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
     const mp_print_t *print = &mp_plat_print;
 
     // get and print unique id; 96 bits
@@ -277,13 +277,13 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
 
 // Returns a string of 12 bytes (96 bits), which is the unique ID for the MCU.
-STATIC mp_obj_t mp_machine_unique_id(void) {
+static mp_obj_t mp_machine_unique_id(void) {
     byte *id = (byte *)MP_HAL_UNIQUE_ID_ADDRESS;
     return mp_obj_new_bytes(id, 12);
 }
 
 // Resets the pyboard in a manner similar to pushing the external RESET button.
-NORETURN STATIC void mp_machine_reset(void) {
+NORETURN static void mp_machine_reset(void) {
     powerctrl_mcu_reset();
 }
 
@@ -314,7 +314,7 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
 }
 
 // get or set the MCU frequencies
-STATIC mp_obj_t mp_machine_get_freq(void) {
+static mp_obj_t mp_machine_get_freq(void) {
     mp_obj_t tuple[] = {
         mp_obj_new_int(HAL_RCC_GetSysClockFreq()),
         mp_obj_new_int(HAL_RCC_GetHCLKFreq()),
@@ -326,7 +326,7 @@ STATIC mp_obj_t mp_machine_get_freq(void) {
     return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
 }
 
-STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     #if defined(STM32F0) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32G0)
     mp_raise_NotImplementedError(MP_ERROR_TEXT("machine.freq set not supported yet"));
     #else
@@ -365,11 +365,11 @@ STATIC void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
 // idle()
 // This executies a wfi machine instruction which reduces power consumption
 // of the MCU until an interrupt occurs, at which point execution continues.
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     __WFI();
 }
 
-STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_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);
@@ -377,7 +377,7 @@ STATIC void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     powerctrl_enter_stop_mode();
 }
 
-STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+static void mp_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);
@@ -385,6 +385,6 @@ STATIC void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     powerctrl_enter_standby_mode();
 }
 
-STATIC mp_int_t mp_machine_reset_cause(void) {
+static mp_int_t mp_machine_reset_cause(void) {
     return reset_cause;
 }
diff --git a/ports/stm32/modos.c b/ports/stm32/modos.c
index 6f3577f44a2ed..7949cf87cdecd 100644
--- a/ports/stm32/modos.c
+++ b/ports/stm32/modos.c
@@ -34,7 +34,7 @@
 // urandom(n)
 // Return a bytes object with n random bytes, generated by the hardware
 // random number generator.
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -43,7 +43,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
 
 bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) {
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 165c982f5daf7..176010a7e5107 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -59,37 +59,37 @@
 
 #if MICROPY_PY_PYB
 
-STATIC mp_obj_t pyb_fault_debug(mp_obj_t value) {
+static mp_obj_t pyb_fault_debug(mp_obj_t value) {
     pyb_hard_fault_debug = mp_obj_is_true(value);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_fault_debug_obj, pyb_fault_debug);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_fault_debug_obj, pyb_fault_debug);
 
-STATIC mp_obj_t pyb_idle(void) {
+static mp_obj_t pyb_idle(void) {
     __WFI();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_idle_obj, pyb_idle);
+static MP_DEFINE_CONST_FUN_OBJ_0(pyb_idle_obj, pyb_idle);
 
 #if MICROPY_PY_PYB_LEGACY
 
 // Returns the number of milliseconds which have elapsed since `start`.
 // This function takes care of counter wrap and always returns a positive number.
-STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
+static mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
     uint32_t startMillis = mp_obj_get_int(start);
     uint32_t currMillis = mp_hal_ticks_ms();
     return MP_OBJ_NEW_SMALL_INT((currMillis - startMillis) & 0x3fffffff);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
 
 // Returns the number of microseconds which have elapsed since `start`.
 // This function takes care of counter wrap and always returns a positive number.
-STATIC mp_obj_t pyb_elapsed_micros(mp_obj_t start) {
+static mp_obj_t pyb_elapsed_micros(mp_obj_t start) {
     uint32_t startMicros = mp_obj_get_int(start);
     uint32_t currMicros = mp_hal_ticks_us();
     return MP_OBJ_NEW_SMALL_INT((currMicros - startMicros) & 0x3fffffff);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);
 
 #endif
 
@@ -97,7 +97,7 @@ MP_DECLARE_CONST_FUN_OBJ_KW(pyb_main_obj); // defined in main.c
 
 // Get or set the UART object that the REPL is repeated on.
 // This is a legacy function, use of os.dupterm is preferred.
-STATIC mp_obj_t pyb_repl_uart(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_repl_uart(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         if (MP_STATE_PORT(pyb_stdio_uart) == NULL) {
             return mp_const_none;
@@ -119,22 +119,22 @@ STATIC mp_obj_t pyb_repl_uart(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_repl_uart_obj, 0, 1, pyb_repl_uart);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_repl_uart_obj, 0, 1, pyb_repl_uart);
 
 #if MICROPY_PY_NETWORK
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj);
 #else
 // Provide a no-op version of pyb.country for backwards compatibility on
 // boards that don't support networking.
-STATIC mp_obj_t pyb_country(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_country(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     (void)args;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj, 0, 1, pyb_country);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj, 0, 1, pyb_country);
 #endif
 
-STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
+static const mp_rom_map_elem_t pyb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pyb) },
 
     { MP_ROM_QSTR(MP_QSTR_fault_debug), MP_ROM_PTR(&pyb_fault_debug_obj) },
@@ -262,7 +262,7 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);
+static MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);
 
 const mp_obj_module_t pyb_module = {
     .base = { &mp_type_module },
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 896465d0cc927..4f26dce790f43 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -38,7 +38,7 @@
 
 #include "genhdr/modstm_mpz.h"
 
-STATIC const mp_rom_map_elem_t stm_module_globals_table[] = {
+static const mp_rom_map_elem_t stm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_stm) },
 
     { MP_ROM_QSTR(MP_QSTR_mem8), MP_ROM_PTR(&machine_mem8_obj) },
@@ -62,7 +62,7 @@ STATIC const mp_rom_map_elem_t stm_module_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(stm_module_globals, stm_module_globals_table);
+static MP_DEFINE_CONST_DICT(stm_module_globals, stm_module_globals_table);
 
 const mp_obj_module_t stm_module = {
     .base = { &mp_type_module },
diff --git a/ports/stm32/modtime.c b/ports/stm32/modtime.c
index e7160cd5b2cc0..ff1495a5d965a 100644
--- a/ports/stm32/modtime.c
+++ b/ports/stm32/modtime.c
@@ -29,7 +29,7 @@
 #include "rtc.h"
 
 // Return the localtime as an 8-tuple.
-STATIC mp_obj_t mp_time_localtime_get(void) {
+static mp_obj_t mp_time_localtime_get(void) {
     // get current date and time
     // note: need to call get time then get date to correctly access the registers
     rtc_init_finalise();
@@ -51,7 +51,7 @@ STATIC mp_obj_t mp_time_localtime_get(void) {
 }
 
 // Returns the number of seconds, as an integer, since 1/1/2000.
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     // get date and time
     // note: need to call get time then get date to correctly access the registers
     rtc_init_finalise();
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index 06ff8a7faa658..3f71146834e91 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -41,10 +41,10 @@
 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;
+static soft_timer_entry_t mp_bluetooth_hci_soft_timer;
 
 // 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) {
+static void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
     mp_bluetooth_hci_poll_now();
 }
 
@@ -57,7 +57,7 @@ void mp_bluetooth_hci_init(void) {
         );
 }
 
-STATIC void mp_bluetooth_hci_start_polling(void) {
+static void mp_bluetooth_hci_start_polling(void) {
     mp_bluetooth_hci_poll_now();
 }
 
@@ -67,12 +67,12 @@ 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;
+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 void run_events_scheduled_task(mp_sched_node_t *node) {
+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();
@@ -133,7 +133,7 @@ int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t 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) {
+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]);
diff --git a/ports/stm32/mpbtstackport.c b/ports/stm32/mpbtstackport.c
index 728594d19c96a..bbc1280b8624b 100644
--- a/ports/stm32/mpbtstackport.c
+++ b/ports/stm32/mpbtstackport.c
@@ -106,7 +106,7 @@ static const btstack_run_loop_t mp_btstack_runloop_stm32 = {
     &mp_btstack_runloop_get_time_ms,
 };
 
-STATIC const hci_transport_config_uart_t hci_transport_config_uart = {
+static const hci_transport_config_uart_t hci_transport_config_uart = {
     HCI_TRANSPORT_CONFIG_UART,
     MICROPY_HW_BLE_UART_BAUDRATE,
     MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY,
diff --git a/ports/stm32/mpnetworkport.c b/ports/stm32/mpnetworkport.c
index 3b9591213a8d2..6db3e91ba90ef 100644
--- a/ports/stm32/mpnetworkport.c
+++ b/ports/stm32/mpnetworkport.c
@@ -64,7 +64,7 @@ u32_t sys_now(void) {
     return mp_hal_ticks_ms();
 }
 
-STATIC void pyb_lwip_poll(void) {
+static void pyb_lwip_poll(void) {
     #if MICROPY_PY_NETWORK_WIZNET5K
     // Poll the NIC for incoming data
     wiznet5k_poll();
diff --git a/ports/stm32/mpthreadport.c b/ports/stm32/mpthreadport.c
index a7d85cfe32987..621b4311bfc34 100644
--- a/ports/stm32/mpthreadport.c
+++ b/ports/stm32/mpthreadport.c
@@ -34,7 +34,7 @@
 #if MICROPY_PY_THREAD
 
 // the mutex controls access to the linked list
-STATIC mp_thread_mutex_t thread_mutex;
+static mp_thread_mutex_t thread_mutex;
 
 void mp_thread_init(void) {
     mp_thread_mutex_init(&thread_mutex);
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 556adebd8fe95..2f70caf0123a4 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -38,9 +38,9 @@ typedef struct _network_lan_obj_t {
     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_instance };
 
-STATIC void network_lan_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
@@ -53,14 +53,14 @@ 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) {
+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);
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t network_lan_active(size_t n_args, const mp_obj_t *args) {
+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));
@@ -77,21 +77,21 @@ STATIC mp_obj_t network_lan_active(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_lan_active_obj, 1, 2, network_lan_active);
+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) {
+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_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) {
+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) {
+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;
 
@@ -102,9 +102,9 @@ STATIC mp_obj_t network_lan_status(size_t n_args, const mp_obj_t *args) {
 
     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_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) {
+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) {
@@ -147,16 +147,16 @@ STATIC mp_obj_t network_lan_config(size_t n_args, const mp_obj_t *args, mp_map_t
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_lan_config_obj, 1, network_lan_config);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     network_lan_type,
diff --git a/ports/stm32/octospi.c b/ports/stm32/octospi.c
index f2854f3796eb2..1d59e2b560eda 100644
--- a/ports/stm32/octospi.c
+++ b/ports/stm32/octospi.c
@@ -92,7 +92,7 @@ void octospi_init(void) {
     OCTOSPI1->CR |= OCTOSPI_CR_EN;
 }
 
-STATIC int octospi_ioctl(void *self_in, uint32_t cmd) {
+static int octospi_ioctl(void *self_in, uint32_t cmd) {
     (void)self_in;
     switch (cmd) {
         case MP_QSPI_IOCTL_INIT:
@@ -112,7 +112,7 @@ STATIC int octospi_ioctl(void *self_in, uint32_t cmd) {
     return 0; // success
 }
 
-STATIC int octospi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
+static int octospi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
     (void)self_in;
 
     OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
@@ -166,7 +166,7 @@ STATIC int octospi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32
     return 0;
 }
 
-STATIC int octospi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
+static int octospi_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;
@@ -231,7 +231,7 @@ STATIC int octospi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr
     return 0;
 }
 
-STATIC int octospi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
+static int octospi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
     (void)self_in;
 
     OCTOSPI1->FCR = OCTOSPI_FCR_CTCF; // clear TC flag
@@ -269,7 +269,7 @@ STATIC int octospi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *de
     return 0;
 }
 
-STATIC int octospi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
+static int octospi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
     (void)self_in;
 
     #if defined(MICROPY_HW_OSPIFLASH_IO1) && !defined(MICROPY_HW_OSPIFLASH_IO2) && !defined(MICROPY_HW_OSPIFLASH_IO4)
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 599d61de41682..0b939334a2b6d 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -88,7 +88,7 @@
 /// how a particular object gets mapped to a pin.
 
 // Pin class variables
-STATIC bool pin_class_debug;
+static bool pin_class_debug;
 
 void pin_init0(void) {
     MP_STATE_PORT(pin_class_mapper) = mp_const_none;
@@ -179,7 +179,7 @@ const machine_pin_obj_t *pin_find(mp_obj_t user_obj) {
 
 /// \method __str__()
 /// Return a string describing the pin object.
-STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void 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
@@ -238,7 +238,7 @@ STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     }
 }
 
-STATIC mp_obj_t pin_obj_init_helper(const machine_pin_obj_t *pin, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
+static mp_obj_t pin_obj_init_helper(const machine_pin_obj_t *pin, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
 
 /// \classmethod \constructor(id, ...)
 /// Create a new Pin object associated with the id.  If additional arguments are given,
@@ -263,7 +263,7 @@ 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 pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t 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) {
@@ -278,31 +278,31 @@ STATIC mp_obj_t pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_
 
 /// \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) {
+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));
+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) {
+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));
+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));
 
 /// \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) {
+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);
 
@@ -312,22 +312,22 @@ STATIC mp_obj_t pin_af_list(mp_obj_t self_in) {
     }
     return result;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_list_obj, pin_af_list);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_af_list_obj, pin_af_list);
 
 /// \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) {
+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));
+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, alt=-1, *, value, alt)
-STATIC mp_obj_t 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 mp_obj_t 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}},
@@ -384,7 +384,7 @@ STATIC mp_obj_t pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args
     return mp_const_none;
 }
 
-STATIC mp_obj_t pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pin_obj_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(pin_init_obj, 1, pin_obj_init);
@@ -396,27 +396,27 @@ MP_DEFINE_CONST_FUN_OBJ_KW(pin_init_obj, 1, pin_obj_init);
 ///   - With `value` given, set the logic level of the pin.  `value` can be
 ///   anything that converts to a boolean.  If it converts to `True`, the pin
 ///   is set high, otherwise it is set low.
-STATIC mp_obj_t pin_value(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pin_value(size_t n_args, const mp_obj_t *args) {
     return pin_call(args[0], n_args - 1, 0, args + 1);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
 
-STATIC mp_obj_t pin_off(mp_obj_t self_in) {
+static mp_obj_t pin_off(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_hal_pin_low(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_off_obj, pin_off);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_off_obj, pin_off);
 
-STATIC mp_obj_t pin_on(mp_obj_t self_in) {
+static mp_obj_t pin_on(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_hal_pin_high(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_on_obj, pin_on);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_on_obj, pin_on);
 
 // pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
-STATIC mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t 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} },
@@ -436,19 +436,19 @@ STATIC mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     // TODO should return an IRQ object
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
 
 /// \method name()
 /// Get the pin name.
-STATIC mp_obj_t pin_name(mp_obj_t self_in) {
+static mp_obj_t pin_name(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_QSTR(self->name);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_name_obj, pin_name);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_name_obj, pin_name);
 
 /// \method names()
 /// Returns the cpu and board names for this pin.
-STATIC mp_obj_t pin_names(mp_obj_t self_in) {
+static mp_obj_t pin_names(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);
     mp_obj_list_append(result, MP_OBJ_NEW_QSTR(self->name));
@@ -463,60 +463,60 @@ STATIC mp_obj_t pin_names(mp_obj_t self_in) {
     }
     return result;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_names_obj, pin_names);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_names_obj, pin_names);
 
 /// \method port()
 /// Get the pin port.
-STATIC mp_obj_t pin_port(mp_obj_t self_in) {
+static mp_obj_t pin_port(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->port);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_port_obj, pin_port);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_port_obj, pin_port);
 
 /// \method pin()
 /// Get the pin number.
-STATIC mp_obj_t pin_pin(mp_obj_t self_in) {
+static mp_obj_t pin_pin(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->pin);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_pin_obj, pin_pin);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_pin_obj, pin_pin);
 
 /// \method gpio()
 /// Returns the base address of the GPIO block associated with this pin.
-STATIC mp_obj_t pin_gpio(mp_obj_t self_in) {
+static mp_obj_t pin_gpio(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT((intptr_t)self->gpio);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_gpio_obj, pin_gpio);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_gpio_obj, pin_gpio);
 
 /// \method mode()
 /// Returns the currently configured mode of the pin. The integer returned
 /// will match one of the allowed constants for the mode argument to the init
 /// function.
-STATIC mp_obj_t pin_mode(mp_obj_t self_in) {
+static mp_obj_t 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(pin_mode_obj, pin_mode);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_mode_obj, pin_mode);
 
 /// \method pull()
 /// Returns the currently configured pull of the pin. The integer returned
 /// will match one of the allowed constants for the pull argument to the init
 /// function.
-STATIC mp_obj_t pin_pull(mp_obj_t self_in) {
+static mp_obj_t 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(pin_pull_obj, pin_pull);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_pull_obj, pin_pull);
 
 /// \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 pin_af(mp_obj_t self_in) {
+static mp_obj_t 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(pin_af_obj, pin_af);
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_af_obj, pin_af);
 
-STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
+static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&pin_value_obj) },
@@ -568,9 +568,9 @@ STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
     #include "genhdr/pins_af_const.h"
 };
 
-STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
 
-STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+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 = MP_OBJ_TO_PTR(self_in);
 
@@ -586,7 +586,7 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     return -1;
 }
 
-STATIC const mp_pin_p_t pin_pin_p = {
+static const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
@@ -630,43 +630,43 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 /// \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) {
+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) {
+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);
+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) {
+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_DEFINE_CONST_FUN_OBJ_1(pin_af_name_obj, pin_af_name);
 
 /// \method reg()
 /// Return the base register associated with the peripheral assigned to this
 /// alternate function. For example, if the alternate function were TIM2_CH3
 /// this would return stm.TIM2
-STATIC mp_obj_t pin_af_reg(mp_obj_t self_in) {
+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 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pin_af_locals_dict, pin_af_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pin_af_type,
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 712021edb63ce..7755149227216 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -162,14 +162,14 @@ typedef struct _sysclk_scaling_table_entry_t {
 } sysclk_scaling_table_entry_t;
 
 #if defined(STM32F7)
-STATIC const sysclk_scaling_table_entry_t volt_scale_table[] = {
+static const sysclk_scaling_table_entry_t volt_scale_table[] = {
     { 151, PWR_REGULATOR_VOLTAGE_SCALE3 },
     { 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[] = {
+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},
@@ -177,7 +177,7 @@ STATIC const sysclk_scaling_table_entry_t volt_scale_table[] = {
     {280, PWR_REGULATOR_VOLTAGE_SCALE0},
 };
 #elif defined(STM32H7)
-STATIC const sysclk_scaling_table_entry_t volt_scale_table[] = {
+static const sysclk_scaling_table_entry_t volt_scale_table[] = {
     // See table 55 "Kernel clock distribution overview" of RM0433.
     {200, PWR_REGULATOR_VOLTAGE_SCALE3},
     {300, PWR_REGULATOR_VOLTAGE_SCALE2},
@@ -186,7 +186,7 @@ STATIC const sysclk_scaling_table_entry_t volt_scale_table[] = {
 };
 #endif
 
-STATIC int powerctrl_config_vos(uint32_t sysclk_mhz) {
+static int powerctrl_config_vos(uint32_t sysclk_mhz) {
     #if defined(STM32F7) || defined(STM32H7)
     uint32_t volt_scale = PWR_REGULATOR_VOLTAGE_SCALE1;
     for (int i = 0; i < MP_ARRAY_SIZE(volt_scale_table); ++i) {
@@ -291,7 +291,7 @@ int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk
 
 #if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32L0) && !defined(STM32L1) && !defined(STM32L4)
 
-STATIC uint32_t calc_ahb_div(uint32_t wanted_div) {
+static uint32_t calc_ahb_div(uint32_t wanted_div) {
     #if defined(STM32H7)
     if (wanted_div <= 1) {
         return RCC_HCLK_DIV1;
@@ -335,7 +335,7 @@ STATIC uint32_t calc_ahb_div(uint32_t wanted_div) {
     #endif
 }
 
-STATIC uint32_t calc_apb1_div(uint32_t wanted_div) {
+static uint32_t calc_apb1_div(uint32_t wanted_div) {
     #if defined(STM32H7)
     if (wanted_div <= 1) {
         return RCC_APB1_DIV1;
@@ -363,7 +363,7 @@ STATIC uint32_t calc_apb1_div(uint32_t wanted_div) {
     #endif
 }
 
-STATIC uint32_t calc_apb2_div(uint32_t wanted_div) {
+static uint32_t calc_apb2_div(uint32_t wanted_div) {
     #if defined(STM32H7)
     if (wanted_div <= 1) {
         return RCC_APB2_DIV1;
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 3c61405e7c317..71c717782449f 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -123,11 +123,11 @@ extern const uint8_t DLCtoBytes[16];
 #define CAN_FLAG_FIFO0_OVRF         CAN_FLAG_FOV0
 #define CAN_FLAG_FIFO1_OVRF         CAN_FLAG_FOV1
 
-STATIC uint8_t can2_start_bank = 14;
+static uint8_t can2_start_bank = 14;
 
 #endif
 
-STATIC void pyb_can_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_can_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->is_enabled) {
         mp_printf(print, "CAN(%u)", self->can_id);
@@ -160,7 +160,7 @@ 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() {
+static uint32_t pyb_can_get_source_freq() {
     uint32_t can_kern_clk = 0;
 
     // Find CAN kernel clock
@@ -192,7 +192,7 @@ 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,
+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();
@@ -215,7 +215,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) {
+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_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[] = {
@@ -285,7 +285,7 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
 }
 
 // CAN(bus, ...)
-STATIC mp_obj_t pyb_can_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 pyb_can_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);
 
@@ -354,21 +354,21 @@ STATIC mp_obj_t pyb_can_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t pyb_can_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_can_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pyb_can_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_init_obj, 1, pyb_can_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_init_obj, 1, pyb_can_init);
 
 // deinit()
-STATIC mp_obj_t pyb_can_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_can_deinit(mp_obj_t self_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     can_deinit(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_can_deinit_obj, pyb_can_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_can_deinit_obj, pyb_can_deinit);
 
 // Force a software restart of the controller, to allow transmission after a bus error
-STATIC mp_obj_t pyb_can_restart(mp_obj_t self_in) {
+static mp_obj_t pyb_can_restart(mp_obj_t self_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->is_enabled) {
         mp_raise_ValueError(NULL);
@@ -394,10 +394,10 @@ STATIC mp_obj_t pyb_can_restart(mp_obj_t self_in) {
     #endif
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_can_restart_obj, pyb_can_restart);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_can_restart_obj, pyb_can_restart);
 
 // Get the state of the controller
-STATIC mp_obj_t pyb_can_state(mp_obj_t self_in) {
+static mp_obj_t pyb_can_state(mp_obj_t self_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t state = CAN_STATE_STOPPED;
     if (self->is_enabled) {
@@ -427,10 +427,10 @@ STATIC mp_obj_t pyb_can_state(mp_obj_t self_in) {
     }
     return MP_OBJ_NEW_SMALL_INT(state);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_can_state_obj, pyb_can_state);
+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) {
+static mp_obj_t pyb_can_info(size_t n_args, const mp_obj_t *args) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_obj_list_t *list;
     if (n_args == 1) {
@@ -473,10 +473,10 @@ STATIC mp_obj_t pyb_can_info(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_FROM_PTR(list);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_can_info_obj, 1, 2, pyb_can_info);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_can_info_obj, 1, 2, pyb_can_info);
 
 // any(fifo) - return `True` if any message waiting on the FIFO, else `False`
-STATIC mp_obj_t pyb_can_any(mp_obj_t self_in, mp_obj_t fifo_in) {
+static mp_obj_t pyb_can_any(mp_obj_t self_in, mp_obj_t fifo_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t fifo = mp_obj_get_int(fifo_in);
     if (fifo == 0) {
@@ -490,10 +490,10 @@ STATIC mp_obj_t pyb_can_any(mp_obj_t self_in, mp_obj_t fifo_in) {
     }
     return mp_const_false;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_any_obj, pyb_can_any);
+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) {
+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_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} },
@@ -611,10 +611,10 @@ STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_send_obj, 1, pyb_can_send);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_send_obj, 1, pyb_can_send);
 
 // recv(fifo, list=None, *, timeout=5000)
-STATIC mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_fifo, ARG_list, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_fifo,    MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
@@ -730,9 +730,9 @@ STATIC mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     // Return the result
     return ret_obj;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_recv_obj, 1, pyb_can_recv);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_recv_obj, 1, pyb_can_recv);
 
-STATIC mp_obj_t pyb_can_clearfilter(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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} },
@@ -754,11 +754,11 @@ STATIC mp_obj_t pyb_can_clearfilter(size_t n_args, const mp_obj_t *pos_args, mp_
     #endif
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_clearfilter_obj, 2, 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) {
+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, ARG_extframe };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_bank,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
@@ -930,9 +930,9 @@ STATIC mp_obj_t pyb_can_setfilter(size_t n_args, const mp_obj_t *pos_args, mp_ma
 error:
     mp_raise_ValueError(MP_ERROR_TEXT("CAN filter parameter error"));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_setfilter_obj, 1, pyb_can_setfilter);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_setfilter_obj, 1, pyb_can_setfilter);
 
-STATIC mp_obj_t pyb_can_rxcallback(mp_obj_t self_in, mp_obj_t fifo_in, mp_obj_t callback_in) {
+static mp_obj_t pyb_can_rxcallback(mp_obj_t self_in, mp_obj_t fifo_in, mp_obj_t callback_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t fifo = mp_obj_get_int(fifo_in);
     mp_obj_t *callback;
@@ -971,9 +971,9 @@ STATIC mp_obj_t pyb_can_rxcallback(mp_obj_t self_in, mp_obj_t fifo_in, mp_obj_t
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_can_rxcallback_obj, pyb_can_rxcallback);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_can_rxcallback_obj, pyb_can_rxcallback);
 
-STATIC const mp_rom_map_elem_t pyb_can_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_can_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_can_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_can_deinit_obj) },
@@ -1018,9 +1018,9 @@ STATIC const mp_rom_map_elem_t pyb_can_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ERROR_PASSIVE), MP_ROM_INT(CAN_STATE_ERROR_PASSIVE) },
     { MP_ROM_QSTR(MP_QSTR_BUS_OFF), MP_ROM_INT(CAN_STATE_BUS_OFF) },
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_can_locals_dict, pyb_can_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_can_locals_dict, pyb_can_locals_dict_table);
 
-STATIC mp_uint_t can_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t can_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
     if (request == MP_STREAM_POLL) {
@@ -1065,7 +1065,7 @@ void pyb_can_handle_callback(pyb_can_obj_t *self, uint fifo_id, mp_obj_t callbac
     }
 }
 
-STATIC const mp_stream_p_t can_stream_p = {
+static const mp_stream_p_t can_stream_p = {
     // .read = can_read, // is read sensible for CAN?
     // .write = can_write, // is write sensible for CAN?
     .ioctl = can_ioctl,
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index fa38ef372dabe..0529d3bd56e40 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -103,7 +103,7 @@ I2C_HandleTypeDef I2CHandle3 = {.Instance = NULL};
 I2C_HandleTypeDef I2CHandle4 = {.Instance = NULL};
 #endif
 
-STATIC bool pyb_i2c_use_dma[4];
+static bool pyb_i2c_use_dma[4];
 
 const pyb_i2c_obj_t pyb_i2c_obj[] = {
     #if defined(MICROPY_HW_I2C1_SCL)
@@ -219,14 +219,14 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
 #error "no I2C timings for this MCU"
 #endif
 
-STATIC const struct {
+static const struct {
     uint32_t baudrate;
     uint32_t timing;
 } pyb_i2c_baudrate_timing[] = MICROPY_HW_I2C_BAUDRATE_TIMING;
 
 #define NUM_BAUDRATE_TIMINGS MP_ARRAY_SIZE(pyb_i2c_baudrate_timing)
 
-STATIC void i2c_set_baudrate(I2C_InitTypeDef *init, uint32_t baudrate) {
+static void i2c_set_baudrate(I2C_InitTypeDef *init, uint32_t baudrate) {
     for (int i = 0; i < NUM_BAUDRATE_TIMINGS; i++) {
         if (pyb_i2c_baudrate_timing[i].baudrate == baudrate) {
             init->Timing = pyb_i2c_baudrate_timing[i].timing;
@@ -252,7 +252,7 @@ uint32_t pyb_i2c_get_baudrate(I2C_HandleTypeDef *i2c) {
 #define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
 #define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FULL)
 
-STATIC void i2c_set_baudrate(I2C_InitTypeDef *init, uint32_t baudrate) {
+static void i2c_set_baudrate(I2C_InitTypeDef *init, uint32_t baudrate) {
     init->ClockSpeed = baudrate;
     init->DutyCycle = I2C_DUTYCYCLE_16_9;
 }
@@ -428,7 +428,7 @@ int pyb_i2c_init_freq(const pyb_i2c_obj_t *self, mp_int_t freq) {
     return pyb_i2c_init(self->i2c);
 }
 
-STATIC void i2c_reset_after_error(I2C_HandleTypeDef *i2c) {
+static void i2c_reset_after_error(I2C_HandleTypeDef *i2c) {
     // wait for bus-busy flag to be cleared, with a timeout
     for (int timeout = 50; timeout > 0; --timeout) {
         if (!__HAL_I2C_GET_FLAG(i2c, I2C_FLAG_BUSY)) {
@@ -581,7 +581,7 @@ void i2c_er_irq_handler(mp_uint_t i2c_id) {
     #endif
 }
 
-STATIC HAL_StatusTypeDef i2c_wait_dma_finished(I2C_HandleTypeDef *i2c, uint32_t timeout) {
+static HAL_StatusTypeDef i2c_wait_dma_finished(I2C_HandleTypeDef *i2c, uint32_t timeout) {
     // Note: we can't use WFI to idle in this loop because the DMA completion
     // interrupt may occur before the WFI.  Hence we miss it and have to wait
     // until the next sys-tick (up to 1ms).
@@ -601,7 +601,7 @@ static inline bool in_master_mode(pyb_i2c_obj_t *self) {
     return self->i2c->Init.OwnAddress1 == PYB_I2C_MASTER_ADDRESS;
 }
 
-STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     uint i2c_num = 0;
@@ -655,7 +655,7 @@ STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
 ///   - `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 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[] = {
         { MP_QSTR_mode,     MP_ARG_INT, {.u_int = PYB_I2C_MASTER} },
         { MP_QSTR_addr,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0x12} },
@@ -721,7 +721,7 @@ STATIC mp_obj_t pyb_i2c_init_helper(const pyb_i2c_obj_t *self, size_t n_args, co
 ///
 ///   - `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)`
-STATIC mp_obj_t pyb_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 pyb_i2c_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);
 
@@ -739,23 +739,23 @@ STATIC mp_obj_t pyb_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(i2c_obj);
 }
 
-STATIC mp_obj_t pyb_i2c_init_(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_init_(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pyb_i2c_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_init_obj, 1, pyb_i2c_init_);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_init_obj, 1, pyb_i2c_init_);
 
 /// \method deinit()
 /// Turn off the I2C bus.
-STATIC mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) {
     pyb_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     i2c_deinit(self->i2c);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_deinit_obj, pyb_i2c_deinit);
+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 controller mode.
-STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) {
+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)) {
@@ -773,12 +773,12 @@ STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) {
 
     return mp_const_false;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_i2c_is_ready_obj, pyb_i2c_is_ready);
+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 controller mode.
-STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
+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)) {
@@ -796,7 +796,7 @@ STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
 
     return list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan);
 
 /// \method send(send, addr=0x00, timeout=5000)
 /// Send data on the bus:
@@ -806,7 +806,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan);
 ///   - `timeout` is the timeout in milliseconds to wait for the send
 ///
 /// Return value: `None`.
-STATIC mp_obj_t pyb_i2c_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_send,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_addr,    MP_ARG_INT, {.u_int = PYB_I2C_MASTER_ADDRESS} },
@@ -873,7 +873,7 @@ STATIC mp_obj_t pyb_i2c_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_send_obj, 1, pyb_i2c_send);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_send_obj, 1, pyb_i2c_send);
 
 /// \method recv(recv, addr=0x00, timeout=5000)
 ///
@@ -886,7 +886,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_send_obj, 1, pyb_i2c_send);
 ///
 /// 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`.
-STATIC mp_obj_t pyb_i2c_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_recv,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_addr,    MP_ARG_INT, {.u_int = PYB_I2C_MASTER_ADDRESS} },
@@ -954,7 +954,7 @@ STATIC mp_obj_t pyb_i2c_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         return mp_obj_new_bytes_from_vstr(&vstr);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
 
 /// \method mem_read(data, addr, memaddr, timeout=5000, addr_size=8)
 ///
@@ -968,7 +968,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
 ///
 /// Returns the read data.
 /// This is only valid in controller mode.
-STATIC const mp_arg_t pyb_i2c_mem_read_allowed_args[] = {
+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} },
     { MP_QSTR_memaddr, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
@@ -976,7 +976,7 @@ STATIC const mp_arg_t pyb_i2c_mem_read_allowed_args[] = {
     { MP_QSTR_addr_size, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
 };
 
-STATIC mp_obj_t pyb_i2c_mem_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_i2c_mem_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // parse args
     pyb_i2c_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_arg_val_t args[MP_ARRAY_SIZE(pyb_i2c_mem_read_allowed_args)];
@@ -1030,7 +1030,7 @@ STATIC mp_obj_t pyb_i2c_mem_read(size_t n_args, const mp_obj_t *pos_args, mp_map
         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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read);
 
 /// \method mem_write(data, addr, memaddr, timeout=5000, addr_size=8)
 ///
@@ -1044,7 +1044,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read);
 ///
 /// Returns `None`.
 /// 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) {
+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]);
     mp_arg_val_t args[MP_ARRAY_SIZE(pyb_i2c_mem_read_allowed_args)];
@@ -1094,9 +1094,9 @@ STATIC mp_obj_t pyb_i2c_mem_write(size_t n_args, const mp_obj_t *pos_args, mp_ma
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_write_obj, 1, pyb_i2c_mem_write);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_write_obj, 1, pyb_i2c_mem_write);
 
-STATIC const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_i2c_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_i2c_deinit_obj) },
@@ -1117,7 +1117,7 @@ STATIC const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SLAVE), MP_ROM_INT(PYB_I2C_SLAVE) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_i2c_type,
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index f92642dddcd88..2fcccaf161bde 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -57,7 +57,7 @@
 //     spi.send_recv(b'1234', buf)          # send 4 bytes and receive 4 into buf
 //     spi.send_recv(buf, buf)              # send/recv 4 bytes from/to buf
 
-STATIC const pyb_spi_obj_t pyb_spi_obj[] = {
+static const pyb_spi_obj_t pyb_spi_obj[] = {
     {{&pyb_spi_type}, &spi_obj[0]},
     {{&pyb_spi_type}, &spi_obj[1]},
     {{&pyb_spi_type}, &spi_obj[2]},
@@ -66,7 +66,7 @@ STATIC const pyb_spi_obj_t pyb_spi_obj[] = {
     {{&pyb_spi_type}, &spi_obj[5]},
 };
 
-STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     spi_print(print, self->spi, true);
 }
@@ -76,7 +76,7 @@ STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
 // Initialise the SPI bus with the given parameters:
 //   - `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 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} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 328125} },
@@ -136,7 +136,7 @@ STATIC mp_obj_t pyb_spi_init_helper(const pyb_spi_obj_t *self, size_t n_args, co
 //
 // At the moment, the NSS pin is not used by the SPI driver and is free
 // for other use.
-STATIC mp_obj_t pyb_spi_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 pyb_spi_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);
 
@@ -156,19 +156,19 @@ STATIC mp_obj_t pyb_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(spi_obj);
 }
 
-STATIC mp_obj_t pyb_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pyb_spi_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_init_obj, 1, pyb_spi_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_init_obj, 1, pyb_spi_init);
 
 // deinit()
 // Turn off the SPI bus.
-STATIC mp_obj_t pyb_spi_deinit(mp_obj_t self_in) {
+static mp_obj_t pyb_spi_deinit(mp_obj_t self_in) {
     pyb_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
     spi_deinit(self->spi);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_spi_deinit_obj, pyb_spi_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_spi_deinit_obj, pyb_spi_deinit);
 
 // send(send, *, timeout=5000)
 // Send data on the bus:
@@ -176,7 +176,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_spi_deinit_obj, pyb_spi_deinit);
 //   - `timeout` is the timeout in milliseconds to wait for the send.
 //
 // Return value: `None`.
-STATIC mp_obj_t pyb_spi_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_spi_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // TODO assumes transmission size is 8-bits wide
 
     static const mp_arg_t allowed_args[] = {
@@ -199,7 +199,7 @@ STATIC mp_obj_t pyb_spi_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_send_obj, 1, pyb_spi_send);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_send_obj, 1, pyb_spi_send);
 
 // recv(recv, *, timeout=5000)
 //
@@ -210,7 +210,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_send_obj, 1, pyb_spi_send);
 //
 // 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`.
-STATIC mp_obj_t pyb_spi_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_spi_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // TODO assumes transmission size is 8-bits wide
 
     static const mp_arg_t allowed_args[] = {
@@ -237,7 +237,7 @@ STATIC mp_obj_t pyb_spi_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         return mp_obj_new_bytes_from_vstr(&vstr);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_recv_obj, 1, pyb_spi_recv);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_recv_obj, 1, pyb_spi_recv);
 
 // send_recv(send, recv=None, *, timeout=5000)
 //
@@ -249,7 +249,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_recv_obj, 1, pyb_spi_recv);
 //   - `timeout` is the timeout in milliseconds to wait for the receive.
 //
 // Return value: the buffer with the received bytes.
-STATIC mp_obj_t pyb_spi_send_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_spi_send_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // TODO assumes transmission size is 8-bits wide
 
     static const mp_arg_t allowed_args[] = {
@@ -306,9 +306,9 @@ STATIC mp_obj_t pyb_spi_send_recv(size_t n_args, const mp_obj_t *pos_args, mp_ma
         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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_send_recv_obj, 1, pyb_spi_send_recv);
 
-STATIC const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_spi_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_spi_deinit_obj) },
@@ -344,14 +344,14 @@ STATIC const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_NSS_HARD_OUTPUT             ((uint32_t)0x00040000)
     */
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_spi_locals_dict, pyb_spi_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_spi_locals_dict, pyb_spi_locals_dict_table);
 
-STATIC void spi_transfer_machine(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+static void spi_transfer_machine(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     pyb_spi_obj_t *self = (pyb_spi_obj_t *)self_in;
     spi_transfer(self->spi, len, src, dest, SPI_TRANSFER_TIMEOUT(len));
 }
 
-STATIC const mp_machine_spi_p_t pyb_spi_p = {
+static const mp_machine_spi_p_t pyb_spi_p = {
     .transfer = spi_transfer_machine,
 };
 
diff --git a/ports/stm32/pybthread.c b/ports/stm32/pybthread.c
index 57c8d1fddefaf..e2f2de7ff05b5 100644
--- a/ports/stm32/pybthread.c
+++ b/ports/stm32/pybthread.c
@@ -84,7 +84,7 @@ void pyb_thread_deinit() {
     enable_irq(irq_state);
 }
 
-STATIC void pyb_thread_terminate(void) {
+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
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index c10bec2365504..a560f8fb6265d 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -172,7 +172,7 @@ void qspi_memory_map(void) {
     qspi_mpu_enable_mapped();
 }
 
-STATIC int qspi_ioctl(void *self_in, uint32_t cmd) {
+static int qspi_ioctl(void *self_in, uint32_t cmd) {
     (void)self_in;
     switch (cmd) {
         case MP_QSPI_IOCTL_INIT:
@@ -196,7 +196,7 @@ STATIC int qspi_ioctl(void *self_in, uint32_t cmd) {
     return 0; // success
 }
 
-STATIC int 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
@@ -252,7 +252,7 @@ STATIC int qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t
     return 0;
 }
 
-STATIC int 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;
@@ -316,7 +316,7 @@ STATIC int qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, s
     return 0;
 }
 
-STATIC int qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
+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
@@ -350,7 +350,7 @@ STATIC int qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest)
     return 0;
 }
 
-STATIC int 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;
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 2e660d6d9e17e..05582e887eeb5 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -195,33 +195,33 @@ typedef struct __attribute__((packed)) _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 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 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 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
+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
 
-STATIC void tl_list_init(volatile tl_list_node_t *n) {
+static void tl_list_init(volatile tl_list_node_t *n) {
     n->next = n;
     n->prev = n;
 }
 
-STATIC volatile tl_list_node_t *tl_list_unlink(volatile tl_list_node_t *n) {
+static volatile tl_list_node_t *tl_list_unlink(volatile tl_list_node_t *n) {
     volatile tl_list_node_t *next = n->next;
     volatile tl_list_node_t *prev = n->prev;
     prev->next = next;
@@ -229,7 +229,7 @@ STATIC volatile tl_list_node_t *tl_list_unlink(volatile tl_list_node_t *n) {
     return next;
 }
 
-STATIC void tl_list_append(volatile tl_list_node_t *head, volatile tl_list_node_t *n) {
+static void tl_list_append(volatile tl_list_node_t *head, volatile tl_list_node_t *n) {
     n->next = head;
     n->prev = head->prev;
     head->prev->next = n;
@@ -239,7 +239,7 @@ STATIC void tl_list_append(volatile tl_list_node_t *head, volatile tl_list_node_
 /******************************************************************************/
 // IPCC interface
 
-STATIC volatile ipcc_ref_table_t *get_buffer_table(void) {
+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);
@@ -299,9 +299,9 @@ void ipcc_init(uint32_t irq_pri) {
 // 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 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) {
+static size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
     const char *info;
     #if HCI_TRACE
     int applied_set_event_event_mask2_fix = 0;
@@ -408,7 +408,7 @@ STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
     return len;
 }
 
-STATIC size_t 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;
@@ -441,7 +441,7 @@ STATIC size_t tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, par
 }
 
 // Only call this when IRQs are disabled on this channel.
-STATIC size_t 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.
@@ -458,7 +458,7 @@ STATIC size_t tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse
     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) {
+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 = NULL;
     n->prev = NULL;
@@ -480,7 +480,7 @@ 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, mp_int_t timeout_ms) {
+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);
@@ -498,12 +498,12 @@ STATIC ssize_t tl_sys_wait_ack(const uint8_t *buf, mp_int_t timeout_ms) {
     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, mp_int_t timeout_ms) {
+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, timeout_ms);
 }
 
-STATIC int tl_ble_wait_resp(void) {
+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) {
@@ -518,7 +518,7 @@ STATIC int tl_ble_wait_resp(void) {
 }
 
 // Synchronously send a BLE command.
-STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t len) {
+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);
@@ -743,19 +743,19 @@ void IPCC_C1_RX_IRQHandler(void) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC mp_obj_t rfcore_status(void) {
+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) {
+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) {
+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);
     }
@@ -773,7 +773,7 @@ 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(size_t n_args, const mp_obj_t *args) {
+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);
     }
diff --git a/ports/stm32/rng.c b/ports/stm32/rng.c
index 236d79ea87952..400e1bd16da88 100644
--- a/ports/stm32/rng.c
+++ b/ports/stm32/rng.c
@@ -57,7 +57,7 @@ uint32_t rng_get(void) {
 }
 
 // Return a 30-bit hardware generated random number.
-STATIC mp_obj_t pyb_rng_get(void) {
+static mp_obj_t pyb_rng_get(void) {
     return mp_obj_new_int(rng_get() >> 2);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(pyb_rng_get_obj, pyb_rng_get);
@@ -72,7 +72,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(pyb_rng_get_obj, pyb_rng_get);
 
 // Yasmarang random number generator by Ilya Levin
 // http://www.literatecode.com/yasmarang
-STATIC uint32_t pyb_rng_yasmarang(void) {
+static uint32_t pyb_rng_yasmarang(void) {
     static bool seeded = false;
     static uint32_t pad = 0, n = 0, d = 0;
     static uint8_t dat = 0;
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index b209ea83540d8..8dadc4a88d760 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -67,18 +67,18 @@ static mp_uint_t rtc_info;
 #define RTC_SYNCH_PREDIV  (0x00ff)
 #endif
 
-STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc);
-STATIC void PYB_RTC_MspInit_Kick(RTC_HandleTypeDef *hrtc, bool rtc_use_lse, bool rtc_use_byp);
-STATIC HAL_StatusTypeDef PYB_RTC_MspInit_Finalise(RTC_HandleTypeDef *hrtc);
-STATIC void RTC_CalendarConfig(void);
+static HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc);
+static void PYB_RTC_MspInit_Kick(RTC_HandleTypeDef *hrtc, bool rtc_use_lse, bool rtc_use_byp);
+static HAL_StatusTypeDef PYB_RTC_MspInit_Finalise(RTC_HandleTypeDef *hrtc);
+static void RTC_CalendarConfig(void);
 
 #if MICROPY_HW_RTC_USE_LSE || MICROPY_HW_RTC_USE_BYPASS
-STATIC bool rtc_use_lse = true;
+static bool rtc_use_lse = true;
 #else
-STATIC bool rtc_use_lse = false;
+static bool rtc_use_lse = false;
 #endif
-STATIC uint32_t rtc_startup_tick;
-STATIC bool rtc_need_init_finalise = false;
+static uint32_t rtc_startup_tick;
+static bool rtc_need_init_finalise = false;
 
 #if defined(STM32L0)
 #define BDCR CSR
@@ -262,7 +262,7 @@ void rtc_init_finalise() {
     rtc_need_init_finalise = false;
 }
 
-STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct) {
+static HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct) {
     /*------------------------------ LSI Configuration -------------------------*/
     if ((RCC_OscInitStruct->OscillatorType & RCC_OSCILLATORTYPE_LSI) == RCC_OSCILLATORTYPE_LSI) {
         // Check the LSI State
@@ -331,7 +331,7 @@ STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
     return HAL_OK;
 }
 
-STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
+static HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
     // Check the RTC peripheral state
     if (hrtc == NULL) {
         return HAL_ERROR;
@@ -399,7 +399,7 @@ STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
     }
 }
 
-STATIC void PYB_RTC_MspInit_Kick(RTC_HandleTypeDef *hrtc, bool rtc_use_lse, bool rtc_use_byp) {
+static void PYB_RTC_MspInit_Kick(RTC_HandleTypeDef *hrtc, bool rtc_use_lse, bool rtc_use_byp) {
     /* To change the source clock of the RTC feature (LSE, LSI), You have to:
        - Enable the power clock using __PWR_CLK_ENABLE()
        - Enable write access using HAL_PWR_EnableBkUpAccess() function before to
@@ -443,7 +443,7 @@ STATIC void PYB_RTC_MspInit_Kick(RTC_HandleTypeDef *hrtc, bool rtc_use_lse, bool
 #define MICROPY_HW_RTC_BYP_TIMEOUT_MS 150
 #endif
 
-STATIC HAL_StatusTypeDef PYB_RTC_MspInit_Finalise(RTC_HandleTypeDef *hrtc) {
+static HAL_StatusTypeDef PYB_RTC_MspInit_Finalise(RTC_HandleTypeDef *hrtc) {
     // we already had a kick so now wait for the corresponding ready state...
     if (rtc_use_lse) {
         // we now have to wait for LSE ready or timeout
@@ -486,7 +486,7 @@ STATIC HAL_StatusTypeDef PYB_RTC_MspInit_Finalise(RTC_HandleTypeDef *hrtc) {
     return HAL_OK;
 }
 
-STATIC void RTC_CalendarConfig(void) {
+static void RTC_CalendarConfig(void) {
     // set the date to 1st Jan 2015
     RTC_DateTypeDef date;
     date.Year = 15;
@@ -538,11 +538,11 @@ 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}};
+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) {
+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);
 
@@ -862,14 +862,14 @@ mp_obj_t pyb_rtc_calibration(size_t n_args, const mp_obj_t *args) {
 }
 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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_rtc_type,
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index a903f79ed2161..a7d0629399651 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -208,7 +208,7 @@ void sdcard_select_mmc(void) {
     pyb_sdmmc_flags |= PYB_SDMMC_FLAG_MMC;
 }
 
-STATIC void sdmmc_msp_init(void) {
+static void sdmmc_msp_init(void) {
     // enable SDIO clock
     SDMMC_CLK_ENABLE();
 
@@ -264,7 +264,7 @@ bool sdcard_is_present(void) {
 }
 
 #if MICROPY_HW_ENABLE_SDCARD
-STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
+static HAL_StatusTypeDef sdmmc_init_sd(void) {
     // SD device interface configuration
     sdmmc_handle.sd.Instance = SDIO;
     sdmmc_handle.sd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
@@ -299,7 +299,7 @@ STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
 #endif
 
 #if MICROPY_HW_ENABLE_MMCARD
-STATIC HAL_StatusTypeDef sdmmc_init_mmc(void) {
+static HAL_StatusTypeDef sdmmc_init_mmc(void) {
     // MMC device interface configuration
     sdmmc_handle.mmc.Instance = SDIO;
     sdmmc_handle.mmc.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
@@ -410,7 +410,7 @@ uint64_t sdcard_get_capacity_in_bytes(void) {
     }
 }
 
-STATIC void sdmmc_irq_handler(void) {
+static void sdmmc_irq_handler(void) {
     switch (pyb_sdmmc_flags) {
         #if MICROPY_HW_ENABLE_SDCARD
         case PYB_SDMMC_FLAG_ACTIVE | PYB_SDMMC_FLAG_SD:
@@ -431,7 +431,7 @@ void SDMMC_IRQHandler(void) {
     IRQ_EXIT(SDMMC_IRQn);
 }
 
-STATIC void sdcard_reset_periph(void) {
+static void sdcard_reset_periph(void) {
     // Fully reset the SDMMC peripheral before calling HAL SD DMA functions.
     // (There could be an outstanding DTIMEOUT event from a previous call and the
     // HAL function enables IRQs before fully configuring the SDMMC peripheral.)
@@ -441,7 +441,7 @@ STATIC void sdcard_reset_periph(void) {
     SDIO->ICR = SDMMC_STATIC_FLAGS;
 }
 
-STATIC HAL_StatusTypeDef sdcard_wait_finished(uint32_t timeout) {
+static HAL_StatusTypeDef sdcard_wait_finished(uint32_t timeout) {
     // Wait for HAL driver to be ready (eg for DMA to finish)
     uint32_t start = HAL_GetTick();
     for (;;) {
@@ -699,7 +699,7 @@ const mp_obj_base_t pyb_mmcard_obj = {&pyb_mmcard_type};
 #endif
 
 #if MICROPY_HW_ENABLE_SDCARD
-STATIC mp_obj_t pyb_sdcard_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 pyb_sdcard_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);
 
@@ -717,7 +717,7 @@ STATIC mp_obj_t pyb_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, si
 #endif
 
 #if MICROPY_HW_ENABLE_MMCARD
-STATIC mp_obj_t pyb_mmcard_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 pyb_mmcard_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);
 
@@ -734,12 +734,12 @@ STATIC mp_obj_t pyb_mmcard_make_new(const mp_obj_type_t *type, size_t n_args, si
 }
 #endif
 
-STATIC mp_obj_t sd_present(mp_obj_t self) {
+static mp_obj_t sd_present(mp_obj_t self) {
     return mp_obj_new_bool(sdcard_is_present());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(sd_present_obj, sd_present);
+static MP_DEFINE_CONST_FUN_OBJ_1(sd_present_obj, sd_present);
 
-STATIC mp_obj_t sd_power(mp_obj_t self, mp_obj_t state) {
+static mp_obj_t sd_power(mp_obj_t self, mp_obj_t state) {
     bool result;
     if (mp_obj_is_true(state)) {
         result = sdcard_power_on();
@@ -749,9 +749,9 @@ STATIC mp_obj_t sd_power(mp_obj_t self, mp_obj_t state) {
     }
     return mp_obj_new_bool(result);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(sd_power_obj, sd_power);
+static MP_DEFINE_CONST_FUN_OBJ_2(sd_power_obj, sd_power);
 
-STATIC mp_obj_t sd_info(mp_obj_t self) {
+static mp_obj_t sd_info(mp_obj_t self) {
     if (!(pyb_sdmmc_flags & PYB_SDMMC_FLAG_ACTIVE)) {
         return mp_const_none;
     }
@@ -778,10 +778,10 @@ STATIC mp_obj_t sd_info(mp_obj_t self) {
     };
     return mp_obj_new_tuple(3, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(sd_info_obj, sd_info);
+static MP_DEFINE_CONST_FUN_OBJ_1(sd_info_obj, sd_info);
 
 // now obsolete, kept for backwards compatibility
-STATIC mp_obj_t sd_read(mp_obj_t self, mp_obj_t block_num) {
+static mp_obj_t sd_read(mp_obj_t self, mp_obj_t block_num) {
     uint8_t *dest = m_new(uint8_t, SDCARD_BLOCK_SIZE);
     mp_uint_t ret = sdcard_read_blocks(dest, mp_obj_get_int(block_num), 1);
 
@@ -792,10 +792,10 @@ STATIC mp_obj_t sd_read(mp_obj_t self, mp_obj_t block_num) {
 
     return mp_obj_new_bytearray_by_ref(SDCARD_BLOCK_SIZE, dest);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(sd_read_obj, sd_read);
+static MP_DEFINE_CONST_FUN_OBJ_2(sd_read_obj, sd_read);
 
 // now obsolete, kept for backwards compatibility
-STATIC mp_obj_t sd_write(mp_obj_t self, mp_obj_t block_num, mp_obj_t data) {
+static mp_obj_t sd_write(mp_obj_t self, mp_obj_t block_num, mp_obj_t data) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
     if (bufinfo.len % SDCARD_BLOCK_SIZE != 0) {
@@ -810,25 +810,25 @@ STATIC mp_obj_t sd_write(mp_obj_t self, mp_obj_t block_num, mp_obj_t data) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(sd_write_obj, sd_write);
+static MP_DEFINE_CONST_FUN_OBJ_3(sd_write_obj, sd_write);
 
-STATIC mp_obj_t pyb_sdcard_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t pyb_sdcard_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
     mp_uint_t ret = sdcard_read_blocks(bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SDCARD_BLOCK_SIZE);
     return mp_obj_new_bool(ret == 0);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_sdcard_readblocks_obj, pyb_sdcard_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_sdcard_readblocks_obj, pyb_sdcard_readblocks);
 
-STATIC mp_obj_t pyb_sdcard_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t pyb_sdcard_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
     mp_uint_t ret = sdcard_write_blocks(bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SDCARD_BLOCK_SIZE);
     return mp_obj_new_bool(ret == 0);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_sdcard_writeblocks_obj, pyb_sdcard_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_sdcard_writeblocks_obj, pyb_sdcard_writeblocks);
 
-STATIC mp_obj_t pyb_sdcard_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t pyb_sdcard_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) {
     mp_int_t cmd = mp_obj_get_int(cmd_in);
     switch (cmd) {
         case MP_BLOCKDEV_IOCTL_INIT:
@@ -855,9 +855,9 @@ STATIC mp_obj_t pyb_sdcard_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in
             return MP_OBJ_NEW_SMALL_INT(-1); // error
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_sdcard_ioctl_obj, pyb_sdcard_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(pyb_sdcard_ioctl_obj, pyb_sdcard_ioctl);
 
-STATIC const mp_rom_map_elem_t pyb_sdcard_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_sdcard_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_present), MP_ROM_PTR(&sd_present_obj) },
     { MP_ROM_QSTR(MP_QSTR_power), MP_ROM_PTR(&sd_power_obj) },
     { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&sd_info_obj) },
@@ -869,7 +869,7 @@ STATIC const mp_rom_map_elem_t pyb_sdcard_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&pyb_sdcard_ioctl_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_sdcard_locals_dict, pyb_sdcard_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_sdcard_locals_dict, pyb_sdcard_locals_dict_table);
 
 #if MICROPY_HW_ENABLE_SDCARD
 MP_DEFINE_CONST_OBJ_TYPE(
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index 07cc4eab88536..ea8205756a682 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -60,7 +60,7 @@ typedef struct _pyb_servo_obj_t {
     uint16_t time_left;
 } pyb_servo_obj_t;
 
-STATIC pyb_servo_obj_t pyb_servo_obj[PYB_SERVO_NUM];
+static pyb_servo_obj_t pyb_servo_obj[PYB_SERVO_NUM];
 
 void servo_init(void) {
     // reset servo objects
@@ -123,7 +123,7 @@ void servo_timer_irq_callback(void) {
     }
 }
 
-STATIC void servo_init_channel(pyb_servo_obj_t *s) {
+static void servo_init_channel(pyb_servo_obj_t *s) {
     static const uint8_t channel_table[4] =
     {TIM_CHANNEL_1, TIM_CHANNEL_2, TIM_CHANNEL_3, TIM_CHANNEL_4};
     uint32_t channel = channel_table[s->pin->pin];
@@ -150,7 +150,7 @@ STATIC void servo_init_channel(pyb_servo_obj_t *s) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC mp_obj_t pyb_servo_set(mp_obj_t port, mp_obj_t value) {
+static mp_obj_t pyb_servo_set(mp_obj_t port, mp_obj_t value) {
     int p = mp_obj_get_int(port);
     int v = mp_obj_get_int(value);
     if (v < 50) {
@@ -178,7 +178,7 @@ STATIC mp_obj_t pyb_servo_set(mp_obj_t port, mp_obj_t value) {
 
 MP_DEFINE_CONST_FUN_OBJ_2(pyb_servo_set_obj, pyb_servo_set);
 
-STATIC mp_obj_t pyb_pwm_set(mp_obj_t period, mp_obj_t pulse) {
+static mp_obj_t pyb_pwm_set(mp_obj_t period, mp_obj_t pulse) {
     int pe = mp_obj_get_int(period);
     int pu = mp_obj_get_int(pulse);
     TIM5->ARR = pe;
@@ -188,14 +188,14 @@ STATIC mp_obj_t pyb_pwm_set(mp_obj_t period, mp_obj_t pulse) {
 
 MP_DEFINE_CONST_FUN_OBJ_2(pyb_pwm_set_obj, pyb_pwm_set);
 
-STATIC void pyb_servo_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void pyb_servo_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_servo_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<Servo %u at %uus>", self - &pyb_servo_obj[0] + 1, 10 * self->pulse_cur);
 }
 
 /// \classmethod \constructor(id)
 /// Create a servo object.  `id` is 1-4.
-STATIC mp_obj_t pyb_servo_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 pyb_servo_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);
 
@@ -218,7 +218,7 @@ STATIC mp_obj_t pyb_servo_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
 /// \method pulse_width([value])
 /// Get or set the pulse width in milliseconds.
-STATIC mp_obj_t pyb_servo_pulse_width(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_servo_pulse_width(size_t n_args, const mp_obj_t *args) {
     pyb_servo_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
         // get pulse width, in us
@@ -231,12 +231,12 @@ STATIC mp_obj_t pyb_servo_pulse_width(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_pulse_width_obj, 1, 2, pyb_servo_pulse_width);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_pulse_width_obj, 1, 2, pyb_servo_pulse_width);
 
 /// \method calibration([pulse_min, pulse_max, pulse_centre, [pulse_angle_90, pulse_speed_100]])
 /// Get or set the calibration of the servo timing.
 // TODO should accept 1 arg, a 5-tuple of values to set
-STATIC mp_obj_t pyb_servo_calibration(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_servo_calibration(size_t n_args, const mp_obj_t *args) {
     pyb_servo_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
         // get calibration values
@@ -264,14 +264,14 @@ STATIC mp_obj_t pyb_servo_calibration(size_t n_args, const mp_obj_t *args) {
     // bad number of arguments
     mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("calibration expecting 1, 4 or 6 arguments, got %d"), n_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_calibration_obj, 1, 6, pyb_servo_calibration);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_calibration_obj, 1, 6, pyb_servo_calibration);
 
 /// \method angle([angle, time=0])
 /// Get or set the angle of the servo.
 ///
 ///   - `angle` is the angle to move to in degrees.
 ///   - `time` is the number of milliseconds to take to get to the specified angle.
-STATIC mp_obj_t pyb_servo_angle(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_servo_angle(size_t n_args, const mp_obj_t *args) {
     pyb_servo_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
         // get angle
@@ -294,14 +294,14 @@ STATIC mp_obj_t pyb_servo_angle(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_angle_obj, 1, 3, pyb_servo_angle);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_angle_obj, 1, 3, pyb_servo_angle);
 
 /// \method speed([speed, time=0])
 /// Get or set the speed of a continuous rotation servo.
 ///
 ///   - `speed` is the speed to move to change to, between -100 and 100.
 ///   - `time` is the number of milliseconds to take to get to the specified speed.
-STATIC mp_obj_t pyb_servo_speed(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_servo_speed(size_t n_args, const mp_obj_t *args) {
     pyb_servo_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
         // get speed
@@ -325,16 +325,16 @@ STATIC mp_obj_t pyb_servo_speed(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_speed_obj, 1, 3, pyb_servo_speed);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_speed_obj, 1, 3, pyb_servo_speed);
 
-STATIC const mp_rom_map_elem_t pyb_servo_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_servo_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_pulse_width), MP_ROM_PTR(&pyb_servo_pulse_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&pyb_servo_calibration_obj) },
     { MP_ROM_QSTR(MP_QSTR_angle), MP_ROM_PTR(&pyb_servo_angle_obj) },
     { MP_ROM_QSTR(MP_QSTR_speed), MP_ROM_PTR(&pyb_servo_speed_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_servo_locals_dict, pyb_servo_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_servo_locals_dict, pyb_servo_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_servo_type,
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index df71efd3fe11a..5aace8e9a3e1f 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -46,22 +46,22 @@
 // SPI6_RX: DMA2_Stream6.CHANNEL_1
 
 #if defined(MICROPY_HW_SPI1_SCK)
-STATIC SPI_HandleTypeDef SPIHandle1 = {.Instance = NULL};
+static SPI_HandleTypeDef SPIHandle1 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI2_SCK)
-STATIC SPI_HandleTypeDef SPIHandle2 = {.Instance = NULL};
+static SPI_HandleTypeDef SPIHandle2 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI3_SCK)
-STATIC SPI_HandleTypeDef SPIHandle3 = {.Instance = NULL};
+static SPI_HandleTypeDef SPIHandle3 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI4_SCK)
-STATIC SPI_HandleTypeDef SPIHandle4 = {.Instance = NULL};
+static SPI_HandleTypeDef SPIHandle4 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI5_SCK)
-STATIC SPI_HandleTypeDef SPIHandle5 = {.Instance = NULL};
+static SPI_HandleTypeDef SPIHandle5 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI6_SCK)
-STATIC SPI_HandleTypeDef SPIHandle6 = {.Instance = NULL};
+static SPI_HandleTypeDef SPIHandle6 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SUBGHZSPI_ID)
 static SPI_HandleTypeDef SPIHandleSubGhz = {.Instance = NULL};
@@ -231,7 +231,7 @@ int spi_find_index(mp_obj_t id) {
     return spi_id;
 }
 
-STATIC uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
+static uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
     #if defined(STM32F0) || defined(STM32G0)
     return HAL_RCC_GetPCLK1Freq();
     #elif defined(STM32H5)
@@ -545,7 +545,7 @@ void spi_deinit(const spi_t *spi_obj) {
     }
 }
 
-STATIC HAL_StatusTypeDef spi_wait_dma_finished(const spi_t *spi, uint32_t t_start, uint32_t timeout) {
+static HAL_StatusTypeDef spi_wait_dma_finished(const spi_t *spi, uint32_t t_start, uint32_t timeout) {
     volatile HAL_SPI_StateTypeDef *state = &spi->spi->State;
     for (;;) {
         // Do an atomic check of the state; WFI will exit even if IRQs are disabled
@@ -768,7 +768,7 @@ mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
 /******************************************************************************/
 // Implementation of low-level SPI C protocol
 
-STATIC int spi_proto_ioctl(void *self_in, uint32_t cmd) {
+static int spi_proto_ioctl(void *self_in, uint32_t cmd) {
     spi_proto_cfg_t *self = (spi_proto_cfg_t *)self_in;
 
     switch (cmd) {
@@ -790,7 +790,7 @@ STATIC int spi_proto_ioctl(void *self_in, uint32_t cmd) {
     return 0;
 }
 
-STATIC void spi_proto_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+static void spi_proto_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     spi_proto_cfg_t *self = (spi_proto_cfg_t *)self_in;
     spi_transfer(self->spi, len, src, dest, SPI_TRANSFER_TIMEOUT(len));
 }
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 50fd56ecaed0f..bc1feceb9c2b5 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -98,7 +98,7 @@ extern PCD_HandleTypeDef pcd_hs_handle;
 // 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) {
+static char *fmt_hex(uint32_t val, char *buf) {
     const char *hexDig = "0123456789abcdef";
 
     buf[0] = hexDig[(val >> 28) & 0x0f];
@@ -114,7 +114,7 @@ STATIC char *fmt_hex(uint32_t val, char *buf) {
     return buf;
 }
 
-STATIC void print_reg(const char *label, uint32_t val) {
+static void print_reg(const char *label, uint32_t val) {
     char hexStr[9];
 
     mp_hal_stdout_tx_str(label);
@@ -122,7 +122,7 @@ STATIC void print_reg(const char *label, uint32_t val) {
     mp_hal_stdout_tx_str("\r\n");
 }
 
-STATIC void print_hex_hex(const char *label, uint32_t val1, uint32_t val2) {
+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));
@@ -356,7 +356,7 @@ void OTG_HS_IRQHandler(void) {
   * @param  *pcd_handle for FS or HS
   * @retval None
   */
-STATIC void OTG_CMD_WKUP_Handler(PCD_HandleTypeDef *pcd_handle) {
+static void OTG_CMD_WKUP_Handler(PCD_HandleTypeDef *pcd_handle) {
 
     if (pcd_handle->Init.low_power_enable) {
         /* Reset SLEEPDEEP bit of Cortex System Control Register */
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index 4623225804ce0..a6594fd4d98c9 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -273,7 +273,7 @@ const pyb_flash_obj_t pyb_flash_obj = {
     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) {
+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()");
@@ -282,7 +282,7 @@ STATIC void pyb_flash_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     }
 }
 
-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) {
+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[] = {
@@ -322,7 +322,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(self);
 }
 
-STATIC mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+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;
@@ -347,9 +347,9 @@ STATIC mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     #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_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) {
+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;
@@ -374,9 +374,9 @@ STATIC mp_obj_t pyb_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     #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_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) {
+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) {
@@ -438,15 +438,15 @@ STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_ioctl_obj, pyb_flash_ioctl);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pyb_flash_locals_dict, pyb_flash_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_flash_type,
diff --git a/ports/stm32/subghz.c b/ports/stm32/subghz.c
index 1daed59aaf2aa..f131a2f91a33c 100644
--- a/ports/stm32/subghz.c
+++ b/ports/stm32/subghz.c
@@ -34,7 +34,7 @@
 
 // Interface to the STM32WL series "SUBGHZ Radio" module
 
-STATIC void handle_radio_irq() {
+static void handle_radio_irq() {
     // Level-triggered interrupts means the interrupt has to be cleared before
     // this function returns.
     //
@@ -90,7 +90,7 @@ void subghz_deinit(void) {
     __HAL_RCC_SUBGHZ_RADIO_RELEASE_RESET();
 }
 
-STATIC mp_obj_t subghz_cs(mp_obj_t value) {
+static mp_obj_t subghz_cs(mp_obj_t value) {
     // Treat the same as normal SPI - truthy is "unselected",
     //   falsey is active low "selected",
     if (mp_obj_is_true(value)) {
@@ -103,7 +103,7 @@ STATIC mp_obj_t subghz_cs(mp_obj_t value) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(subghz_cs_obj, subghz_cs);
 
-STATIC mp_obj_t subghz_irq(mp_obj_t handler) {
+static mp_obj_t subghz_irq(mp_obj_t handler) {
     MP_STATE_PORT(subghz_callback) = handler;
 
     if (mp_obj_is_true(handler)) {
@@ -117,7 +117,7 @@ STATIC mp_obj_t subghz_irq(mp_obj_t handler) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(subghz_irq_obj, subghz_irq);
 
-STATIC mp_obj_t subghz_is_busy(void) {
+static mp_obj_t subghz_is_busy(void) {
     // Read the raw unmasked busy signal. This should be checked before driving
     // CS low to start a command.
     //
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 41e5c6157d5ac..d999e57462edb 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -93,7 +93,7 @@ typedef enum {
     CHANNEL_MODE_ENC_AB,
 } pyb_channel_mode;
 
-STATIC const struct {
+static const struct {
     qstr name;
     uint32_t oc_mode;
 } channel_mode_info[] = {
@@ -147,9 +147,9 @@ TIM_HandleTypeDef TIM6_Handle;
 
 #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);
-STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback);
+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);
+static mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback);
 
 void timer_init0(void) {
     for (uint i = 0; i < PYB_TIMER_OBJ_ALL_NUM; i++) {
@@ -304,14 +304,14 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
 /******************************************************************************/
 /* MicroPython bindings                                                       */
 
-STATIC const mp_obj_type_t pyb_timer_channel_type;
+static const mp_obj_type_t pyb_timer_channel_type;
 
 // This is the largest value that we can multiply by 100 and have the result
 // fit in a uint32_t.
 #define MAX_PERIOD_DIV_100  42949672
 
 // computes prescaler and period so TIM triggers at freq-Hz
-STATIC uint32_t compute_prescaler_period_from_freq(pyb_timer_obj_t *self, mp_obj_t freq_in, uint32_t *period_out) {
+static uint32_t compute_prescaler_period_from_freq(pyb_timer_obj_t *self, mp_obj_t freq_in, uint32_t *period_out) {
     uint32_t source_freq = timer_get_source_freq(self->tim_id);
     uint32_t prescaler = 1;
     uint32_t period;
@@ -357,7 +357,7 @@ STATIC uint32_t compute_prescaler_period_from_freq(pyb_timer_obj_t *self, mp_obj
 }
 
 // computes prescaler and period so TIM triggers with a period of t_num/t_den seconds
-STATIC uint32_t compute_prescaler_period_from_t(pyb_timer_obj_t *self, int32_t t_num, int32_t t_den, uint32_t *period_out) {
+static uint32_t compute_prescaler_period_from_t(pyb_timer_obj_t *self, int32_t t_num, int32_t t_den, uint32_t *period_out) {
     uint32_t source_freq = timer_get_source_freq(self->tim_id);
     if (t_num <= 0 || t_den <= 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("must have positive freq"));
@@ -391,7 +391,7 @@ STATIC uint32_t compute_prescaler_period_from_t(pyb_timer_obj_t *self, int32_t t
 }
 
 // Helper function for determining the period used for calculating percent
-STATIC uint32_t compute_period(pyb_timer_obj_t *self) {
+static uint32_t compute_period(pyb_timer_obj_t *self) {
     // In center mode,  compare == period corresponds to 100%
     // In edge mode, compare == (period + 1) corresponds to 100%
     uint32_t period = (__HAL_TIM_GET_AUTORELOAD(&self->tim) & TIMER_CNT_MASK(self));
@@ -408,7 +408,7 @@ STATIC uint32_t compute_period(pyb_timer_obj_t *self) {
 // Helper function to compute PWM value from timer period and percent value.
 // 'percent_in' can be an int or a float between 0 and 100 (out of range
 // values are clamped).
-STATIC uint32_t compute_pwm_value_from_percent(uint32_t period, mp_obj_t percent_in) {
+static uint32_t compute_pwm_value_from_percent(uint32_t period, mp_obj_t percent_in) {
     uint32_t cmp;
     if (0) {
     #if MICROPY_PY_BUILTINS_FLOAT
@@ -441,7 +441,7 @@ STATIC uint32_t compute_pwm_value_from_percent(uint32_t period, mp_obj_t percent
 }
 
 // Helper function to compute percentage from timer perion and PWM value.
-STATIC mp_obj_t compute_percent_from_pwm_value(uint32_t period, uint32_t cmp) {
+static mp_obj_t compute_percent_from_pwm_value(uint32_t period, uint32_t cmp) {
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_float_t percent;
     if (cmp >= period) {
@@ -472,7 +472,7 @@ STATIC mp_obj_t compute_percent_from_pwm_value(uint32_t period, uint32_t cmp) {
 // 128-256 ticks in increments of 2
 // 256-512 ticks in increments of 8
 // 512-1008 ticks in increments of 16
-STATIC uint32_t compute_dtg_from_ticks(mp_int_t ticks) {
+static uint32_t compute_dtg_from_ticks(mp_int_t ticks) {
     if (ticks <= 0) {
         return 0;
     }
@@ -493,7 +493,7 @@ STATIC uint32_t compute_dtg_from_ticks(mp_int_t ticks) {
 
 // Given the 8-bit value stored in the DTG field of the BDTR register, compute
 // the number of ticks.
-STATIC mp_int_t compute_ticks_from_dtg(uint32_t dtg) {
+static mp_int_t compute_ticks_from_dtg(uint32_t dtg) {
     if ((dtg & 0x80) == 0) {
         return dtg & 0x7F;
     }
@@ -506,7 +506,7 @@ STATIC mp_int_t compute_ticks_from_dtg(uint32_t dtg) {
     return 512 + ((dtg & 0x1F) * 16);
 }
 
-STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk) {
+static void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk) {
     TIM_BreakDeadTimeConfigTypeDef deadTimeConfig = {0};
     deadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE;
     deadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE;
@@ -534,7 +534,7 @@ TIM_HandleTypeDef *pyb_timer_get_handle(mp_obj_t timer) {
     return &self->tim;
 }
 
-STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
 
     if (self->tim.State == HAL_TIM_STATE_RESET) {
@@ -628,7 +628,7 @@ STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 ///
 ///
 ///  You must either specify freq or both of period and prescaler.
-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) {
+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, ARG_brk };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -834,7 +834,7 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
 // This table encodes the timer instance and irq number (for the update irq).
 // It assumes that timer instance pointer has the lower 8 bits cleared.
 #define TIM_ENTRY(id, irq) [id - 1] = (uint32_t)TIM##id | irq
-STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
+static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #if defined(TIM1)
     #if defined(STM32F0) || defined(STM32G0)
     TIM_ENTRY(1, TIM1_BRK_UP_TRG_COM_IRQn),
@@ -977,7 +977,7 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
 /// 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) {
+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);
 
@@ -1026,13 +1026,13 @@ STATIC mp_obj_t pyb_timer_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_init_obj, 1, pyb_timer_init);
 
 // timer.deinit()
-STATIC mp_obj_t pyb_timer_deinit(mp_obj_t self_in) {
+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
@@ -1055,7 +1055,7 @@ STATIC mp_obj_t pyb_timer_deinit(mp_obj_t self_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
 
 /// \method channel(channel, mode, ...)
 ///
@@ -1129,7 +1129,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
 ///     timer = pyb.Timer(2, freq=1000)
 ///     ch2 = timer.channel(2, pyb.Timer.PWM, pin=pyb.Pin.board.X2, pulse_width=210000)
 ///     ch3 = timer.channel(3, pyb.Timer.PWM, pin=pyb.Pin.board.X3, pulse_width=420000)
-STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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_mode,                MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_callback,            MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -1386,11 +1386,11 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
 
     return MP_OBJ_FROM_PTR(chan);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_obj, 2, pyb_timer_channel);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_obj, 2, pyb_timer_channel);
 
 /// \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) {
+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
@@ -1401,20 +1401,20 @@ STATIC mp_obj_t pyb_timer_counter(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_counter_obj, 1, 2, pyb_timer_counter);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_counter_obj, 1, 2, pyb_timer_counter);
 
 /// \method source_freq()
 /// Get the frequency of the source of the timer.
-STATIC mp_obj_t pyb_timer_source_freq(mp_obj_t self_in) {
+static mp_obj_t pyb_timer_source_freq(mp_obj_t self_in) {
     pyb_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint32_t source_freq = timer_get_source_freq(self->tim_id);
     return mp_obj_new_int(source_freq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_source_freq_obj, pyb_timer_source_freq);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_source_freq_obj, pyb_timer_source_freq);
 
 /// \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) {
+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]);
     if (n_args == 1) {
         // get
@@ -1445,11 +1445,11 @@ STATIC mp_obj_t pyb_timer_freq(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_freq_obj, 1, 2, pyb_timer_freq);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_freq_obj, 1, 2, pyb_timer_freq);
 
 /// \method prescaler([value])
 /// Get or set the prescaler for the timer.
-STATIC mp_obj_t pyb_timer_prescaler(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_timer_prescaler(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
@@ -1460,11 +1460,11 @@ STATIC mp_obj_t pyb_timer_prescaler(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_prescaler_obj, 1, 2, pyb_timer_prescaler);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_prescaler_obj, 1, 2, pyb_timer_prescaler);
 
 /// \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) {
+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
@@ -1475,13 +1475,13 @@ STATIC mp_obj_t pyb_timer_period(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_period_obj, 1, 2, pyb_timer_period);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_period_obj, 1, 2, pyb_timer_period);
 
 /// \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) {
+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)
@@ -1501,9 +1501,9 @@ STATIC mp_obj_t pyb_timer_callback(mp_obj_t self_in, mp_obj_t callback) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_timer_callback_obj, pyb_timer_callback);
+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[] = {
+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) },
@@ -1538,7 +1538,7 @@ STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BRK_LOW), MP_ROM_INT(BRK_LOW) },
     { MP_ROM_QSTR(MP_QSTR_BRK_HIGH), MP_ROM_INT(BRK_HIGH) },
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_type,
@@ -1555,7 +1555,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 /// 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) {
+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, mode=%s)",
@@ -1581,7 +1581,7 @@ STATIC void pyb_timer_channel_print(const mp_print_t *print, mp_obj_t self_in, m
 ///
 /// 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) {
+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
@@ -1592,7 +1592,7 @@ STATIC mp_obj_t pyb_timer_channel_capture_compare(size_t n_args, const mp_obj_t
         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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_capture_compare_obj, 1, 2, pyb_timer_channel_capture_compare);
 
 /// \method pulse_width_percent([value])
 /// Get or set the pulse width percentage associated with a channel.  The value
@@ -1600,7 +1600,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_capture_compare_obj
 /// 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%.
-STATIC mp_obj_t pyb_timer_channel_pulse_width_percent(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t pyb_timer_channel_pulse_width_percent(size_t n_args, const mp_obj_t *args) {
     pyb_timer_channel_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t period = compute_period(self->timer);
     if (n_args == 1) {
@@ -1614,13 +1614,13 @@ STATIC mp_obj_t pyb_timer_channel_pulse_width_percent(size_t n_args, const mp_ob
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_pulse_width_percent_obj, 1, 2, pyb_timer_channel_pulse_width_percent);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_pulse_width_percent_obj, 1, 2, pyb_timer_channel_pulse_width_percent);
 
 /// \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) {
+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)
@@ -1668,9 +1668,9 @@ STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback)
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_timer_channel_callback_obj, pyb_timer_channel_callback);
+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[] = {
+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_pulse_width), MP_ROM_PTR(&pyb_timer_channel_capture_compare_obj) },
@@ -1678,9 +1678,9 @@ STATIC const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
     { 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 MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_channel_type,
     MP_QSTR_TimerChannel,
     MP_TYPE_FLAG_NONE,
@@ -1688,7 +1688,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     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) {
+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);
 
     if (__HAL_TIM_GET_FLAG(&tim->tim, irq_mask) != RESET) {
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 83e9e0fdd8597..886cf1ab340ba 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -122,7 +122,7 @@ typedef struct _machine_uart_irq_map_t {
     uint16_t flag;
 } machine_uart_irq_map_t;
 
-STATIC const machine_uart_irq_map_t mp_uart_irq_map[] = {
+static const machine_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(STM32G0) || defined(STM32WL)
@@ -1038,7 +1038,7 @@ bool uart_tx_wait(machine_uart_obj_t *self, uint32_t timeout) {
 
 // Waits at most timeout milliseconds for UART flag to be set.
 // Returns true if flag is/was set, false on timeout.
-STATIC bool uart_wait_flag_set(machine_uart_obj_t *self, uint32_t flag, uint32_t timeout) {
+static bool uart_wait_flag_set(machine_uart_obj_t *self, uint32_t flag, uint32_t timeout) {
     // Note: we don't use WFI to idle in this loop because UART tx doesn't generate
     // an interrupt and the flag can be set quickly if the baudrate is large.
     uint32_t start = HAL_GetTick();
@@ -1215,7 +1215,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
     }
 }
 
-STATIC mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uart_irq_config(self, false);
     self->mp_irq_trigger = new_trigger;
@@ -1223,7 +1223,7 @@ STATIC mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     return 0;
 }
 
-STATIC mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+static mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (info_type == MP_IRQ_INFO_FLAGS) {
         return self->mp_irq_flags;
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index df6b2cf62a1ff..af9dd1d70ec2b 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -74,7 +74,7 @@
 // Constants for USB_VCP.irq trigger.
 #define USBD_CDC_IRQ_RX (1)
 
-STATIC void pyb_usb_vcp_init0(void);
+static void pyb_usb_vcp_init0(void);
 
 // this will be persistent across a soft-reset
 mp_uint_t pyb_usb_flags = 0;
@@ -97,14 +97,14 @@ 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)
 
-STATIC const uint8_t usbd_fifo_size_cdc1[USBD_PMA_NUM_FIFO] = {
+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] = {
+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, 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)
@@ -112,7 +112,7 @@ STATIC const uint8_t usbd_fifo_size_cdc2[USBD_PMA_NUM_FIFO] = {
 };
 
 // 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] = {
+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)
@@ -128,7 +128,7 @@ STATIC const uint8_t usbd_fifo_size_cdc2_msc_hid[USBD_PMA_NUM_FIFO] = {
 // HS: there are 1024x 32-bit words in total to use here
 
 // RX; EP0(in), MSC/HID, CDC_CMD, CDC_DATA
-STATIC const uint8_t usbd_fifo_size_cdc1[] = {
+static const uint8_t usbd_fifo_size_cdc1[] = {
     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
@@ -136,7 +136,7 @@ STATIC const uint8_t usbd_fifo_size_cdc1[] = {
 };
 
 // RX; EP0(in), MSC/HID, CDC_CMD, CDC_DATA, HID
-STATIC const uint8_t usbd_fifo_size_cdc1_msc_hid[] = {
+static const uint8_t usbd_fifo_size_cdc1_msc_hid[] = {
     32, 8, 16, 4, 12, 8, 0,
     #if MICROPY_HW_USB_HS
     116, 8, 64, 4, 56, 8, 0, 0, 0, 0,
@@ -145,7 +145,7 @@ STATIC const uint8_t usbd_fifo_size_cdc1_msc_hid[] = {
 
 #if MICROPY_HW_USB_CDC_NUM >= 2
 // RX; EP0(in), MSC/HID, CDC_CMD, CDC_DATA, CDC2_CMD, CDC2_DATA
-STATIC const uint8_t usbd_fifo_size_cdc2[] = {
+static const uint8_t usbd_fifo_size_cdc2[] = {
     32, 8, 16, 4, 8, 4, 8,
     #if MICROPY_HW_USB_HS
     116, 8, 64, 2, 32, 2, 32, 0, 0, 0,
@@ -153,7 +153,7 @@ STATIC const uint8_t usbd_fifo_size_cdc2[] = {
 };
 
 // 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[] = {
+static const uint8_t usbd_fifo_size_cdc2_msc_hid[] = {
     0, 0, 0, 0, 0, 0, 0, // FS: can't support 2xVCP+MSC+HID
     #if MICROPY_HW_USB_HS
     102, 8, 64, 2, 32, 8, 32, 8, 0, 0,
@@ -163,7 +163,7 @@ STATIC const uint8_t usbd_fifo_size_cdc2_msc_hid[] = {
 
 #if MICROPY_HW_USB_CDC_NUM >= 3
 // RX; EP0(in), MSC/HID, CDC_CMD, CDC_DATA, CDC2_CMD, CDC2_DATA, CDC3_CMD, CDC3_DATA
-STATIC const uint8_t usbd_fifo_size_cdc3[] = {
+static const uint8_t usbd_fifo_size_cdc3[] = {
     0, 0, 0, 0, 0, 0, 0, // FS: can't support 3x VCP mode
     #if MICROPY_HW_USB_HS
     82, 8, 64, 2, 32, 2, 32, 2, 32, 0,
@@ -171,7 +171,7 @@ STATIC const uint8_t usbd_fifo_size_cdc3[] = {
 };
 
 // RX; EP0(in), MSC/HID, CDC_CMD, CDC_DATA, CDC2_CMD/HID, CDC2_DATA, CDC3_CMD/HID, CDC3_DATA, HID
-STATIC const uint8_t usbd_fifo_size_cdc3_msc_hid[] = {
+static const uint8_t usbd_fifo_size_cdc3_msc_hid[] = {
     0, 0, 0, 0, 0, 0, 0, // FS: can't support 3x VCP mode
     #if MICROPY_HW_USB_HS
     82, 8, 64, 2, 25, 8, 25, 8, 25, 8,
@@ -183,7 +183,7 @@ STATIC const uint8_t usbd_fifo_size_cdc3_msc_hid[] = {
 
 #if MICROPY_HW_USB_HID
 // predefined hid mouse data
-STATIC const mp_obj_str_t pyb_usb_hid_mouse_desc_obj = {
+static const mp_obj_str_t pyb_usb_hid_mouse_desc_obj = {
     {&mp_type_bytes},
     0, // hash not valid
     USBD_HID_MOUSE_REPORT_DESC_SIZE,
@@ -202,7 +202,7 @@ const mp_rom_obj_tuple_t pyb_usb_hid_mouse_obj = {
 };
 
 // predefined hid keyboard data
-STATIC const mp_obj_str_t pyb_usb_hid_keyboard_desc_obj = {
+static const mp_obj_str_t pyb_usb_hid_keyboard_desc_obj = {
     {&mp_type_bytes},
     0, // hash not valid
     USBD_HID_KEYBOARD_REPORT_DESC_SIZE,
@@ -423,7 +423,7 @@ typedef struct _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[] = {
+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 },
@@ -443,7 +443,7 @@ STATIC const pyb_usb_mode_table_t pyb_usb_mode_table[] = {
     #endif
 };
 
-STATIC mp_obj_t pyb_usb_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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,
         #if MICROPY_HW_USB_MSC
@@ -638,9 +638,9 @@ 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 bool pyb_usb_vcp_irq_scheduled[MICROPY_HW_USB_CDC_NUM];
 
-STATIC void pyb_usb_vcp_init0(void) {
+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;
@@ -651,7 +651,7 @@ STATIC void pyb_usb_vcp_init0(void) {
     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) {
+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];
@@ -661,7 +661,7 @@ STATIC mp_obj_t pyb_usb_vcp_irq_run(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_irq_run_obj, pyb_usb_vcp_irq_run);
+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;
@@ -672,7 +672,7 @@ void usbd_cdc_rx_event_callback(usbd_cdc_itf_t *cdc) {
     }
 }
 
-STATIC void pyb_usb_vcp_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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->cdc_idx;
     mp_printf(print, "USB_VCP(%u)", id);
 }
@@ -689,7 +689,7 @@ void usb_vcp_attach_to_repl(const pyb_usb_vcp_obj_t *self, bool attached) {
 
 /// \classmethod \constructor()
 /// Create a new USB_VCP object.
-STATIC mp_obj_t pyb_usb_vcp_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 pyb_usb_vcp_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, 1, false);
 
@@ -704,7 +704,7 @@ STATIC mp_obj_t pyb_usb_vcp_make_new(const mp_obj_type_t *type, size_t n_args, s
 }
 
 // init(*, flow=-1)
-STATIC mp_obj_t pyb_usb_vcp_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t pyb_usb_vcp_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_flow };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_flow, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
@@ -722,29 +722,29 @@ STATIC mp_obj_t pyb_usb_vcp_init(size_t n_args, const mp_obj_t *pos_args, mp_map
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_init_obj, 1, pyb_usb_vcp_init);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_init_obj, 1, pyb_usb_vcp_init);
 
-STATIC mp_obj_t pyb_usb_vcp_setinterrupt(mp_obj_t self_in, mp_obj_t int_chr_in) {
+static mp_obj_t pyb_usb_vcp_setinterrupt(mp_obj_t self_in, mp_obj_t int_chr_in) {
     mp_hal_set_interrupt_char(mp_obj_get_int(int_chr_in));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_usb_vcp_setinterrupt_obj, pyb_usb_vcp_setinterrupt);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_usb_vcp_setinterrupt_obj, pyb_usb_vcp_setinterrupt);
 
-STATIC mp_obj_t pyb_usb_vcp_isconnected(mp_obj_t self_in) {
+static mp_obj_t pyb_usb_vcp_isconnected(mp_obj_t self_in) {
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(usbd_cdc_is_connected(self->cdc_itf));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_isconnected_obj, pyb_usb_vcp_isconnected);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_isconnected_obj, pyb_usb_vcp_isconnected);
 
 // deprecated in favour of USB_VCP.isconnected
-STATIC mp_obj_t pyb_have_cdc(void) {
+static mp_obj_t pyb_have_cdc(void) {
     return pyb_usb_vcp_isconnected(MP_OBJ_FROM_PTR(&pyb_usb_vcp_obj[0]));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(pyb_have_cdc_obj, pyb_have_cdc);
 
 /// \method any()
 /// Return `True` if any characters waiting, else `False`.
-STATIC mp_obj_t pyb_usb_vcp_any(mp_obj_t self_in) {
+static mp_obj_t pyb_usb_vcp_any(mp_obj_t self_in) {
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (usbd_cdc_rx_num(self->cdc_itf) > 0) {
         return mp_const_true;
@@ -752,7 +752,7 @@ STATIC mp_obj_t pyb_usb_vcp_any(mp_obj_t self_in) {
         return mp_const_false;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_any_obj, pyb_usb_vcp_any);
+static MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_any_obj, pyb_usb_vcp_any);
 
 /// \method send(data, *, timeout=5000)
 /// Send data over the USB VCP:
@@ -761,13 +761,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_any_obj, pyb_usb_vcp_any);
 ///   - `timeout` is the timeout in milliseconds to wait for the send.
 ///
 /// Return value: number of bytes sent.
-STATIC const mp_arg_t pyb_usb_vcp_send_args[] = {
+static const mp_arg_t pyb_usb_vcp_send_args[] = {
     { MP_QSTR_data,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} },
 };
 #define PYB_USB_VCP_SEND_NUM_ARGS MP_ARRAY_SIZE(pyb_usb_vcp_send_args)
 
-STATIC mp_obj_t pyb_usb_vcp_send(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_usb_vcp_send(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     // parse args
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_arg_val_t vals[PYB_USB_VCP_SEND_NUM_ARGS];
@@ -783,7 +783,7 @@ STATIC mp_obj_t pyb_usb_vcp_send(size_t n_args, const mp_obj_t *args, mp_map_t *
 
     return mp_obj_new_int(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_send_obj, 1, pyb_usb_vcp_send);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_send_obj, 1, pyb_usb_vcp_send);
 
 /// \method recv(data, *, timeout=5000)
 ///
@@ -795,7 +795,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_send_obj, 1, pyb_usb_vcp_send);
 ///
 /// 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.
-STATIC mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     // parse args
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_arg_val_t vals[PYB_USB_VCP_SEND_NUM_ARGS];
@@ -816,10 +816,10 @@ STATIC mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t *
         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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_recv_obj, 1, pyb_usb_vcp_recv);
 
 // 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) {
+static mp_obj_t pyb_usb_vcp_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} },
@@ -856,9 +856,9 @@ STATIC mp_obj_t pyb_usb_vcp_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_irq_obj, 1, pyb_usb_vcp_irq);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_irq_obj, 1, pyb_usb_vcp_irq);
 
-STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_usb_vcp_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_setinterrupt), MP_ROM_PTR(&pyb_usb_vcp_setinterrupt_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&pyb_usb_vcp_isconnected_obj) },
@@ -882,9 +882,9 @@ STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(pyb_usb_vcp_locals_dict, pyb_usb_vcp_locals_dict_table);
 
-STATIC mp_uint_t pyb_usb_vcp_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t pyb_usb_vcp_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int ret = usbd_cdc_rx(self->cdc_itf, (byte *)buf, size, 0);
     if (ret == 0) {
@@ -895,7 +895,7 @@ STATIC mp_uint_t pyb_usb_vcp_read(mp_obj_t self_in, void *buf, mp_uint_t size, i
     return ret;
 }
 
-STATIC mp_uint_t pyb_usb_vcp_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t pyb_usb_vcp_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int ret = usbd_cdc_tx_flow(self->cdc_itf, (const byte *)buf, size);
     if (ret == 0) {
@@ -906,7 +906,7 @@ STATIC mp_uint_t pyb_usb_vcp_write(mp_obj_t self_in, const void *buf, mp_uint_t
     return ret;
 }
 
-STATIC mp_uint_t pyb_usb_vcp_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t pyb_usb_vcp_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_uint_t ret;
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (request == MP_STREAM_POLL) {
@@ -927,7 +927,7 @@ STATIC mp_uint_t pyb_usb_vcp_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return ret;
 }
 
-STATIC const mp_stream_p_t pyb_usb_vcp_stream_p = {
+static const mp_stream_p_t pyb_usb_vcp_stream_p = {
     .read = pyb_usb_vcp_read,
     .write = pyb_usb_vcp_write,
     .ioctl = pyb_usb_vcp_ioctl,
@@ -953,9 +953,9 @@ typedef struct _pyb_usb_hid_obj_t {
     usb_device_t *usb_dev;
 } pyb_usb_hid_obj_t;
 
-STATIC const pyb_usb_hid_obj_t pyb_usb_hid_obj = {{&pyb_usb_hid_type}, &usb_device};
+static const pyb_usb_hid_obj_t pyb_usb_hid_obj = {{&pyb_usb_hid_type}, &usb_device};
 
-STATIC mp_obj_t pyb_usb_hid_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 pyb_usb_hid_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);
 
@@ -975,7 +975,7 @@ STATIC mp_obj_t pyb_usb_hid_make_new(const mp_obj_type_t *type, size_t n_args, s
 ///
 /// 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.
-STATIC mp_obj_t pyb_usb_hid_recv(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+static mp_obj_t pyb_usb_hid_recv(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_data,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} },
@@ -1006,9 +1006,9 @@ STATIC mp_obj_t pyb_usb_hid_recv(size_t n_args, const mp_obj_t *args, mp_map_t *
         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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_hid_recv_obj, 1, pyb_usb_hid_recv);
 
-STATIC mp_obj_t pyb_usb_hid_send(mp_obj_t self_in, mp_obj_t report_in) {
+static mp_obj_t pyb_usb_hid_send(mp_obj_t self_in, mp_obj_t report_in) {
     pyb_usb_hid_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_buffer_info_t bufinfo;
     byte temp_buf[8];
@@ -1035,22 +1035,22 @@ STATIC mp_obj_t pyb_usb_hid_send(mp_obj_t self_in, mp_obj_t report_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_usb_hid_send_obj, pyb_usb_hid_send);
+static MP_DEFINE_CONST_FUN_OBJ_2(pyb_usb_hid_send_obj, pyb_usb_hid_send);
 
 // deprecated in favour of USB_HID.send
-STATIC mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
+static mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
     return pyb_usb_hid_send(MP_OBJ_FROM_PTR(&pyb_usb_hid_obj), arg);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(pyb_hid_send_report_obj, pyb_hid_send_report);
 
-STATIC const mp_rom_map_elem_t pyb_usb_hid_locals_dict_table[] = {
+static const mp_rom_map_elem_t pyb_usb_hid_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&pyb_usb_hid_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&pyb_usb_hid_recv_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_usb_hid_locals_dict, pyb_usb_hid_locals_dict_table);
+static MP_DEFINE_CONST_DICT(pyb_usb_hid_locals_dict, pyb_usb_hid_locals_dict_table);
 
-STATIC mp_uint_t pyb_usb_hid_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t pyb_usb_hid_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     pyb_usb_hid_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
     if (request == MP_STREAM_POLL) {
@@ -1069,7 +1069,7 @@ STATIC mp_uint_t pyb_usb_hid_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return ret;
 }
 
-STATIC const mp_stream_p_t pyb_usb_hid_stream_p = {
+static const mp_stream_p_t pyb_usb_hid_stream_p = {
     .ioctl = pyb_usb_hid_ioctl,
 };
 
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index 20d8b3036dc1f..88a9cafe0c495 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -75,7 +75,7 @@ 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) {
+static void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
     mp_hal_delay_ms(250);
     machine_bootloader(0, NULL);
 }
diff --git a/ports/stm32/usbd_desc.c b/ports/stm32/usbd_desc.c
index db94fd2be8986..340d317c547f9 100644
--- a/ports/stm32/usbd_desc.c
+++ b/ports/stm32/usbd_desc.c
@@ -86,7 +86,7 @@ void USBD_SetVIDPIDRelease(usbd_cdc_msc_hid_state_t *usbd, uint16_t vid, uint16_
   * @param  length: Pointer to data length variable
   * @retval Pointer to descriptor buffer
   */
-STATIC uint8_t *USBD_DeviceDescriptor(USBD_HandleTypeDef *pdev, uint16_t *length) {
+static uint8_t *USBD_DeviceDescriptor(USBD_HandleTypeDef *pdev, uint16_t *length) {
     uint8_t *dev_desc = ((usbd_cdc_msc_hid_state_t *)pdev->pClassData)->usbd_device_desc;
     *length = USB_LEN_DEV_DESC;
     return dev_desc;
@@ -98,7 +98,7 @@ STATIC uint8_t *USBD_DeviceDescriptor(USBD_HandleTypeDef *pdev, uint16_t *length
   * @param  length: Pointer to data length variable
   * @retval Pointer to descriptor buffer, or NULL if idx is invalid
   */
-STATIC uint8_t *USBD_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, uint16_t *length) {
+static uint8_t *USBD_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, uint16_t *length) {
     char str_buf[16];
     const char *str = NULL;
 
diff --git a/ports/stm32/usbd_msc_interface.c b/ports/stm32/usbd_msc_interface.c
index a294a295b3eb4..68236e5c51205 100644
--- a/ports/stm32/usbd_msc_interface.c
+++ b/ports/stm32/usbd_msc_interface.c
@@ -41,9 +41,9 @@
 
 #define FLAGS_READONLY (0x02)
 
-STATIC const void *usbd_msc_lu_data[USBD_MSC_MAX_LUN];
-STATIC uint8_t usbd_msc_lu_num;
-STATIC uint16_t usbd_msc_lu_flags;
+static const void *usbd_msc_lu_data[USBD_MSC_MAX_LUN];
+static uint8_t usbd_msc_lu_num;
+static uint16_t usbd_msc_lu_flags;
 
 static inline void lu_flag_set(uint8_t lun, uint8_t flag) {
     usbd_msc_lu_flags |= flag << (lun * 2);
@@ -75,7 +75,7 @@ const uint8_t USBD_MSC_Mode_Sense10_Data[8] = {
     0x00, 0x00, // block descriptor length
 };
 
-STATIC const uint8_t usbd_msc_vpd00[6] = {
+static const uint8_t usbd_msc_vpd00[6] = {
     0x00, // peripheral qualifier; peripheral device type
     0x00, // page code
     0x00, // reserved
@@ -84,13 +84,13 @@ STATIC const uint8_t usbd_msc_vpd00[6] = {
     0x83, // page 0x83 supported
 };
 
-STATIC const uint8_t usbd_msc_vpd83[4] = {
+static const uint8_t usbd_msc_vpd83[4] = {
     0x00, // peripheral qualifier; peripheral device type
     0x83, // page code
     0x00, 0x00, // page length (additional bytes beyond this entry)
 };
 
-STATIC const int8_t usbd_msc_inquiry_data[STANDARD_INQUIRY_DATA_LEN] = \
+static const int8_t usbd_msc_inquiry_data[STANDARD_INQUIRY_DATA_LEN] = \
     "\x00"          // peripheral qualifier; peripheral device type
     "\x80"          // 0x00 for a fixed drive, 0x80 for a removable drive
     "\x02"          // version
@@ -110,7 +110,7 @@ void usbd_msc_init_lu(size_t lu_n, const void *lu_data) {
 }
 
 // Helper function to perform an ioctl on a logical unit
-STATIC int lu_ioctl(uint8_t lun, int op, uint32_t *data) {
+static int lu_ioctl(uint8_t lun, int op, uint32_t *data) {
     if (lun >= usbd_msc_lu_num) {
         return -1;
     }
@@ -165,7 +165,7 @@ STATIC int lu_ioctl(uint8_t lun, int op, uint32_t *data) {
 }
 
 // Initialise all logical units (it's only ever called once, with lun_in=0)
-STATIC int8_t usbd_msc_Init(uint8_t lun_in) {
+static int8_t usbd_msc_Init(uint8_t lun_in) {
     if (lun_in != 0) {
         return 0;
     }
@@ -185,7 +185,7 @@ STATIC int8_t usbd_msc_Init(uint8_t lun_in) {
 }
 
 // Process SCSI INQUIRY command for the logical unit
-STATIC int usbd_msc_Inquiry(uint8_t lun, const uint8_t *params, uint8_t *data_out) {
+static int usbd_msc_Inquiry(uint8_t lun, const uint8_t *params, uint8_t *data_out) {
     if (params[1] & 1) {
         // EVPD set - return vital product data parameters
         uint8_t page_code = params[2];
@@ -234,7 +234,7 @@ STATIC int usbd_msc_Inquiry(uint8_t lun, const uint8_t *params, uint8_t *data_ou
 }
 
 // Get storage capacity of a logical unit
-STATIC int8_t usbd_msc_GetCapacity(uint8_t lun, uint32_t *block_num, uint16_t *block_size) {
+static int8_t usbd_msc_GetCapacity(uint8_t lun, uint32_t *block_num, uint16_t *block_size) {
     uint32_t block_size_u32 = 0;
     int res = lu_ioctl(lun, MP_BLOCKDEV_IOCTL_BLOCK_SIZE, &block_size_u32);
     if (res != 0) {
@@ -245,7 +245,7 @@ STATIC int8_t usbd_msc_GetCapacity(uint8_t lun, uint32_t *block_num, uint16_t *b
 }
 
 // Check if a logical unit is ready
-STATIC int8_t usbd_msc_IsReady(uint8_t lun) {
+static int8_t usbd_msc_IsReady(uint8_t lun) {
     if (lun >= usbd_msc_lu_num) {
         return -1;
     }
@@ -253,7 +253,7 @@ STATIC int8_t usbd_msc_IsReady(uint8_t lun) {
 }
 
 // Check if a logical unit is write protected
-STATIC int8_t usbd_msc_IsWriteProtected(uint8_t lun) {
+static int8_t usbd_msc_IsWriteProtected(uint8_t lun) {
     if (lun >= usbd_msc_lu_num) {
         return -1;
     }
@@ -261,7 +261,7 @@ STATIC int8_t usbd_msc_IsWriteProtected(uint8_t lun) {
 }
 
 // Start or stop a logical unit
-STATIC int8_t usbd_msc_StartStopUnit(uint8_t lun, uint8_t started) {
+static int8_t usbd_msc_StartStopUnit(uint8_t lun, uint8_t started) {
     if (lun >= usbd_msc_lu_num) {
         return -1;
     }
@@ -274,14 +274,14 @@ STATIC int8_t usbd_msc_StartStopUnit(uint8_t lun, uint8_t started) {
 }
 
 // Prepare a logical unit for possible removal
-STATIC int8_t usbd_msc_PreventAllowMediumRemoval(uint8_t lun, uint8_t param) {
+static int8_t usbd_msc_PreventAllowMediumRemoval(uint8_t lun, uint8_t param) {
     uint32_t dummy;
     // Sync the logical unit so the device can be unplugged/turned off
     return lu_ioctl(lun, MP_BLOCKDEV_IOCTL_SYNC, &dummy);
 }
 
 // Read data from a logical unit
-STATIC int8_t usbd_msc_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) {
+static int8_t usbd_msc_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) {
     if (lun >= usbd_msc_lu_num) {
         return -1;
     }
@@ -305,7 +305,7 @@ STATIC int8_t usbd_msc_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16
 }
 
 // Write data to a logical unit
-STATIC int8_t usbd_msc_Write(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) {
+static int8_t usbd_msc_Write(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len) {
     if (lun >= usbd_msc_lu_num) {
         return -1;
     }
@@ -329,7 +329,7 @@ STATIC int8_t usbd_msc_Write(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint1
 }
 
 // Get the number of attached logical units
-STATIC int8_t usbd_msc_GetMaxLun(void) {
+static int8_t usbd_msc_GetMaxLun(void) {
     return usbd_msc_lu_num - 1;
 }
 
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index 170c01bd6d043..cbf4a36fb4828 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -68,7 +68,7 @@ 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}};
+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()");
@@ -76,7 +76,7 @@ void pyb_switch_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
 
 /// \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) {
+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);
 
@@ -100,15 +100,15 @@ 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_DEFINE_CONST_FUN_OBJ_1(pyb_switch_value_obj, pyb_switch_value);
 
-STATIC mp_obj_t switch_callback(mp_obj_t line) {
+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);
+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.
@@ -125,14 +125,14 @@ mp_obj_t pyb_switch_callback(mp_obj_t self_in, mp_obj_t callback) {
         true);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_switch_callback_obj, pyb_switch_callback);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_type,
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 543af365c25e9..803f849535cbe 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -31,7 +31,7 @@ typedef struct _mp_obj_streamtest_t {
     int error_code;
 } mp_obj_streamtest_t;
 
-STATIC mp_obj_t stest_set_buf(mp_obj_t o_in, mp_obj_t buf_in) {
+static mp_obj_t stest_set_buf(mp_obj_t o_in, mp_obj_t buf_in) {
     mp_obj_streamtest_t *o = MP_OBJ_TO_PTR(o_in);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
@@ -41,16 +41,16 @@ STATIC mp_obj_t stest_set_buf(mp_obj_t o_in, mp_obj_t buf_in) {
     o->pos = 0;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(stest_set_buf_obj, stest_set_buf);
+static MP_DEFINE_CONST_FUN_OBJ_2(stest_set_buf_obj, stest_set_buf);
 
-STATIC mp_obj_t stest_set_error(mp_obj_t o_in, mp_obj_t err_in) {
+static mp_obj_t stest_set_error(mp_obj_t o_in, mp_obj_t err_in) {
     mp_obj_streamtest_t *o = MP_OBJ_TO_PTR(o_in);
     o->error_code = mp_obj_get_int(err_in);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(stest_set_error_obj, stest_set_error);
+static MP_DEFINE_CONST_FUN_OBJ_2(stest_set_error_obj, stest_set_error);
 
-STATIC mp_uint_t stest_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stest_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_streamtest_t *o = MP_OBJ_TO_PTR(o_in);
     if (o->pos < o->len) {
         if (size > o->len - o->pos) {
@@ -67,7 +67,7 @@ STATIC mp_uint_t stest_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errco
     }
 }
 
-STATIC mp_uint_t stest_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stest_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_streamtest_t *o = MP_OBJ_TO_PTR(o_in);
     (void)buf;
     (void)size;
@@ -75,7 +75,7 @@ STATIC mp_uint_t stest_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int
     return MP_STREAM_ERROR;
 }
 
-STATIC mp_uint_t stest_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t stest_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_obj_streamtest_t *o = MP_OBJ_TO_PTR(o_in);
     (void)arg;
     (void)request;
@@ -87,7 +87,7 @@ STATIC mp_uint_t stest_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, in
     return 0;
 }
 
-STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
+static const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_set_buf), MP_ROM_PTR(&stest_set_buf_obj) },
     { MP_ROM_QSTR(MP_QSTR_set_error), MP_ROM_PTR(&stest_set_error_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
@@ -99,15 +99,15 @@ STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
+static MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
 
-STATIC const mp_stream_p_t fileio_stream_p = {
+static const mp_stream_p_t fileio_stream_p = {
     .read = stest_read,
     .write = stest_write,
     .ioctl = stest_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_stest_fileio,
     MP_QSTR_stest_fileio,
     MP_TYPE_FLAG_NONE,
@@ -116,7 +116,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 // 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) {
+static mp_uint_t stest_read2(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     (void)o_in;
     (void)buf;
     (void)size;
@@ -124,19 +124,19 @@ STATIC mp_uint_t stest_read2(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
     return MP_STREAM_ERROR;
 }
 
-STATIC const mp_rom_map_elem_t rawfile_locals_dict_table2[] = {
+static const mp_rom_map_elem_t rawfile_locals_dict_table2[] = {
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict2, rawfile_locals_dict_table2);
+static MP_DEFINE_CONST_DICT(rawfile_locals_dict2, rawfile_locals_dict_table2);
 
-STATIC const mp_stream_p_t textio_stream_p2 = {
+static const mp_stream_p_t textio_stream_p2 = {
     .read = stest_read2,
     .write = NULL,
     .is_text = true,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_stest_textio2,
     MP_QSTR_stest_textio2,
     MP_TYPE_FLAG_NONE,
@@ -145,15 +145,15 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 // 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"};
-STATIC const mp_obj_str_t bytes_no_hash_obj = {{&mp_type_bytes}, 0, 10, (const byte *)"0123456789"};
+static const mp_obj_str_t str_no_hash_obj = {{&mp_type_str}, 0, 10, (const byte *)"0123456789"};
+static const mp_obj_str_t bytes_no_hash_obj = {{&mp_type_bytes}, 0, 10, (const byte *)"0123456789"};
 
-STATIC int pairheap_lt(mp_pairheap_t *a, mp_pairheap_t *b) {
+static int pairheap_lt(mp_pairheap_t *a, mp_pairheap_t *b) {
     return (uintptr_t)a < (uintptr_t)b;
 }
 
 // ops array contain operations: x>=0 means push(x), x<0 means delete(-x)
-STATIC void pairheap_test(size_t nops, int *ops) {
+static void pairheap_test(size_t nops, int *ops) {
     mp_pairheap_t node[8];
     for (size_t i = 0; i < MP_ARRAY_SIZE(node); ++i) {
         mp_pairheap_init_node(pairheap_lt, &node[i]);
@@ -183,7 +183,7 @@ STATIC void pairheap_test(size_t nops, int *ops) {
 }
 
 // function to run extra tests for things that can't be checked by scripts
-STATIC mp_obj_t extra_coverage(void) {
+static mp_obj_t extra_coverage(void) {
     // mp_printf (used by ports that don't have a native printf)
     {
         mp_printf(&mp_plat_print, "# mp_printf\n");
diff --git a/ports/unix/coveragecpp.cpp b/ports/unix/coveragecpp.cpp
index ea7418e1dd46a..93c1b387fe285 100644
--- a/ports/unix/coveragecpp.cpp
+++ b/ports/unix/coveragecpp.cpp
@@ -5,7 +5,7 @@ extern "C" {
 #if defined(MICROPY_UNIX_COVERAGE)
 
 // Just to test building of C++ code.
-STATIC mp_obj_t extra_cpp_coverage_impl() {
+static mp_obj_t extra_cpp_coverage_impl() {
     return mp_const_none;
 }
 
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 468fc409640b3..0cf11d37cf8d9 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -55,8 +55,8 @@
 #include "input.h"
 
 // Command line options, with their defaults
-STATIC bool compile_only = false;
-STATIC uint emit_opt = MP_EMIT_OPT_NONE;
+static bool compile_only = false;
+static uint emit_opt = MP_EMIT_OPT_NONE;
 
 #if MICROPY_ENABLE_GC
 // Heap size of GC heap (if enabled)
@@ -77,7 +77,7 @@ long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
 #error "The unix port requires MICROPY_PY_SYS_ARGV=1"
 #endif
 
-STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
+static void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t ret;
     MP_HAL_RETRY_SYSCALL(ret, write(STDERR_FILENO, str, len), {});
@@ -90,7 +90,7 @@ const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
 // If exc is SystemExit, return value where FORCED_EXIT bit set,
 // and lower 8 bits are SystemExit value. For all other exceptions,
 // return 1.
-STATIC int handle_uncaught_exception(mp_obj_base_t *exc) {
+static int handle_uncaught_exception(mp_obj_base_t *exc) {
     // check for SystemExit
     if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
         // None is an exit value of 0; an int is its value; anything else is 1
@@ -115,7 +115,7 @@ STATIC int handle_uncaught_exception(mp_obj_base_t *exc) {
 // Returns standard error codes: 0 for success, 1 for all other errors,
 // except if FORCED_EXIT bit is set then script raised SystemExit and the
 // value of the exit is in the lower 8 bits of the return value
-STATIC int execute_from_lexer(int source_kind, const void *source, mp_parse_input_kind_t input_kind, bool is_repl) {
+static int execute_from_lexer(int source_kind, const void *source, mp_parse_input_kind_t input_kind, bool is_repl) {
     mp_hal_set_interrupt_char(CHAR_CTRL_C);
 
     nlr_buf_t nlr;
@@ -177,7 +177,7 @@ STATIC int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
 #if MICROPY_USE_READLINE == 1
 #include "shared/readline/readline.h"
 #else
-STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
+static char *strjoin(const char *s1, int sep_char, const char *s2) {
     int l1 = strlen(s1);
     int l2 = strlen(s2);
     char *s = malloc(l1 + l2 + 2);
@@ -192,7 +192,7 @@ STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
 }
 #endif
 
-STATIC int do_repl(void) {
+static int do_repl(void) {
     mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
     mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE);
     mp_hal_stdout_tx_str("\nUse Ctrl-D to exit, Ctrl-E for paste mode\n");
@@ -306,15 +306,15 @@ STATIC int do_repl(void) {
     #endif
 }
 
-STATIC int do_file(const char *file) {
+static int do_file(const char *file) {
     return execute_from_lexer(LEX_SRC_FILENAME, file, MP_PARSE_FILE_INPUT, false);
 }
 
-STATIC int do_str(const char *str) {
+static int do_str(const char *str) {
     return execute_from_lexer(LEX_SRC_STR, str, MP_PARSE_FILE_INPUT, false);
 }
 
-STATIC void print_help(char **argv) {
+static void print_help(char **argv) {
     printf(
         "usage: %s [<opts>] [-X <implopt>] [-c <command> | -m <module> | <filename>]\n"
         "Options:\n"
@@ -353,13 +353,13 @@ STATIC void print_help(char **argv) {
     }
 }
 
-STATIC int invalid_args(void) {
+static int invalid_args(void) {
     fprintf(stderr, "Invalid command line arguments. Use -h option for help.\n");
     return 1;
 }
 
 // Process options which set interpreter init options
-STATIC void pre_process_options(int argc, char **argv) {
+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) {
@@ -439,7 +439,7 @@ STATIC void pre_process_options(int argc, char **argv) {
     }
 }
 
-STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
+static void set_sys_argv(char *argv[], int argc, int start_arg) {
     for (int i = start_arg; i < argc; i++) {
         mp_obj_list_append(mp_sys_argv, MP_OBJ_NEW_QSTR(qstr_from_str(argv[i])));
     }
@@ -447,9 +447,9 @@ 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 char executable_path[MICROPY_ALLOC_PATH_MAX];
 
-STATIC void sys_set_excecutable(char *argv0) {
+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));
     }
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 897fa07ace1f3..b7d03e84dde6f 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -107,13 +107,13 @@ typedef struct _mp_obj_fficallback_t {
     ffi_type *params[];
 } mp_obj_fficallback_t;
 
-// STATIC const mp_obj_type_t opaque_type;
-STATIC const mp_obj_type_t ffimod_type;
-STATIC const mp_obj_type_t ffifunc_type;
-STATIC const mp_obj_type_t fficallback_type;
-STATIC const mp_obj_type_t ffivar_type;
+// static const mp_obj_type_t opaque_type;
+static const mp_obj_type_t ffimod_type;
+static const mp_obj_type_t ffifunc_type;
+static const mp_obj_type_t fficallback_type;
+static const mp_obj_type_t ffivar_type;
 
-STATIC ffi_type *char2ffi_type(char c) {
+static ffi_type *char2ffi_type(char c) {
     switch (c) {
         case 'b':
             return &ffi_type_schar;
@@ -154,7 +154,7 @@ STATIC ffi_type *char2ffi_type(char c) {
     }
 }
 
-STATIC ffi_type *get_ffi_type(mp_obj_t o_in) {
+static ffi_type *get_ffi_type(mp_obj_t o_in) {
     if (mp_obj_is_str(o_in)) {
         const char *s = mp_obj_str_get_str(o_in);
         ffi_type *t = char2ffi_type(*s);
@@ -167,7 +167,7 @@ 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_union_t *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->ffi;
@@ -209,20 +209,20 @@ STATIC mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
 
 // FFI module
 
-STATIC void ffimod_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void ffimod_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_ffimod_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<ffimod %p>", self->handle);
 }
 
-STATIC mp_obj_t ffimod_close(mp_obj_t self_in) {
+static mp_obj_t ffimod_close(mp_obj_t self_in) {
     mp_obj_ffimod_t *self = MP_OBJ_TO_PTR(self_in);
     dlclose(self->handle);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ffimod_close_obj, ffimod_close);
+static MP_DEFINE_CONST_FUN_OBJ_1(ffimod_close_obj, ffimod_close);
 
-STATIC mp_obj_t make_func(mp_obj_t rettype_in, void *func, mp_obj_t argtypes_in) {
+static mp_obj_t make_func(mp_obj_t rettype_in, void *func, mp_obj_t argtypes_in) {
     const char *rettype = mp_obj_str_get_str(rettype_in);
     const char *argtypes = mp_obj_str_get_str(argtypes_in);
 
@@ -249,7 +249,7 @@ STATIC mp_obj_t make_func(mp_obj_t rettype_in, void *func, mp_obj_t argtypes_in)
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t ffimod_func(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t ffimod_func(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // always 4
     mp_obj_ffimod_t *self = MP_OBJ_TO_PTR(args[0]);
     const char *symname = mp_obj_str_get_str(args[2]);
@@ -262,13 +262,13 @@ STATIC mp_obj_t ffimod_func(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ffimod_func_obj, 4, 4, ffimod_func);
 
-STATIC mp_obj_t mod_ffi_func(mp_obj_t rettype, mp_obj_t addr_in, mp_obj_t argtypes) {
+static mp_obj_t mod_ffi_func(mp_obj_t rettype, mp_obj_t addr_in, mp_obj_t argtypes) {
     void *addr = (void *)MP_OBJ_TO_PTR(mp_obj_int_get_truncated(addr_in));
     return make_func(rettype, addr, argtypes);
 }
 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 *user_data) {
+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;
@@ -283,7 +283,7 @@ STATIC void call_py_func(ffi_cif *cif, void *ret, void **args, void *user_data)
     }
 }
 
-STATIC void call_py_func_with_lock(ffi_cif *cif, void *ret, void **args, void *user_data) {
+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;
@@ -316,7 +316,7 @@ STATIC void call_py_func_with_lock(ffi_cif *cif, void *ret, void **args, void *u
     #endif
 }
 
-STATIC mp_obj_t mod_ffi_callback(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+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];
@@ -364,7 +364,7 @@ STATIC mp_obj_t mod_ffi_callback(size_t n_args, const mp_obj_t *pos_args, mp_map
 }
 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) {
+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);
     const char *rettype = mp_obj_str_get_str(vartype_in);
     const char *symname = mp_obj_str_get_str(symname_in);
@@ -381,7 +381,7 @@ STATIC mp_obj_t ffimod_var(mp_obj_t self_in, mp_obj_t vartype_in, mp_obj_t symna
 }
 MP_DEFINE_CONST_FUN_OBJ_3(ffimod_var_obj, ffimod_var);
 
-STATIC mp_obj_t ffimod_addr(mp_obj_t self_in, mp_obj_t symname_in) {
+static mp_obj_t ffimod_addr(mp_obj_t self_in, mp_obj_t symname_in) {
     mp_obj_ffimod_t *self = MP_OBJ_TO_PTR(self_in);
     const char *symname = mp_obj_str_get_str(symname_in);
 
@@ -393,7 +393,7 @@ STATIC mp_obj_t ffimod_addr(mp_obj_t self_in, mp_obj_t symname_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(ffimod_addr_obj, ffimod_addr);
 
-STATIC mp_obj_t ffimod_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 ffimod_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)n_args;
     (void)n_kw;
 
@@ -411,16 +411,16 @@ STATIC mp_obj_t ffimod_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC const mp_rom_map_elem_t ffimod_locals_dict_table[] = {
+static const mp_rom_map_elem_t ffimod_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_func), MP_ROM_PTR(&ffimod_func_obj) },
     { MP_ROM_QSTR(MP_QSTR_var), MP_ROM_PTR(&ffimod_var_obj) },
     { MP_ROM_QSTR(MP_QSTR_addr), MP_ROM_PTR(&ffimod_addr_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&ffimod_close_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ffimod_locals_dict, ffimod_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ffimod_locals_dict, ffimod_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ffimod_type,
     MP_QSTR_ffimod,
     MP_TYPE_FLAG_NONE,
@@ -431,13 +431,13 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 
 // FFI function
 
-STATIC void ffifunc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void ffifunc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_ffifunc_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<ffifunc %p>", self->func);
 }
 
-STATIC unsigned long long ffi_get_int_value(mp_obj_t o) {
+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 {
@@ -447,7 +447,7 @@ STATIC unsigned long long ffi_get_int_value(mp_obj_t o) {
     }
 }
 
-STATIC ffi_union_t ffi_int_obj_to_ffi_union(mp_obj_t o, const char argtype) {
+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);
@@ -479,7 +479,7 @@ STATIC ffi_union_t ffi_int_obj_to_ffi_union(mp_obj_t o, const char argtype) {
     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) {
+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);
     assert(n_kw == 0);
@@ -530,7 +530,7 @@ 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 MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ffifunc_type,
     MP_QSTR_ffifunc,
     MP_TYPE_FLAG_NONE,
@@ -540,24 +540,24 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 
 // FFI callback for Python function
 
-STATIC void fficallback_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void fficallback_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_fficallback_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<fficallback %p>", self->func);
 }
 
-STATIC mp_obj_t fficallback_cfun(mp_obj_t self_in) {
+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 MP_DEFINE_CONST_FUN_OBJ_1(fficallback_cfun_obj, fficallback_cfun);
 
-STATIC const mp_rom_map_elem_t fficallback_locals_dict_table[] = {
+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 MP_DEFINE_CONST_DICT(fficallback_locals_dict, fficallback_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     fficallback_type,
     MP_QSTR_fficallback,
     MP_TYPE_FLAG_NONE,
@@ -567,34 +567,34 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 
 // FFI variable
 
-STATIC void ffivar_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void ffivar_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_ffivar_t *self = MP_OBJ_TO_PTR(self_in);
     // Variable value printed as cast to int
     mp_printf(print, "<ffivar @%p: 0x%x>", self->var, *(int *)self->var);
 }
 
-STATIC mp_obj_t ffivar_get(mp_obj_t self_in) {
+static mp_obj_t ffivar_get(mp_obj_t self_in) {
     mp_obj_ffivar_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_binary_get_val_array(self->type, self->var, 0);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(ffivar_get_obj, ffivar_get);
 
-STATIC mp_obj_t ffivar_set(mp_obj_t self_in, mp_obj_t val_in) {
+static mp_obj_t ffivar_set(mp_obj_t self_in, mp_obj_t val_in) {
     mp_obj_ffivar_t *self = MP_OBJ_TO_PTR(self_in);
     mp_binary_set_val_array(self->type, self->var, 0, val_in);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(ffivar_set_obj, ffivar_set);
 
-STATIC const mp_rom_map_elem_t ffivar_locals_dict_table[] = {
+static const mp_rom_map_elem_t ffivar_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&ffivar_get_obj) },
     { MP_ROM_QSTR(MP_QSTR_set), MP_ROM_PTR(&ffivar_set_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(ffivar_locals_dict, ffivar_locals_dict_table);
+static MP_DEFINE_CONST_DICT(ffivar_locals_dict, ffivar_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     ffivar_type,
     MP_QSTR_ffivar,
     MP_TYPE_FLAG_NONE,
@@ -605,7 +605,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 // Generic opaque storage object (unused)
 
 /*
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     opaque_type,
     MP_QSTR_opaqueval,
     MP_TYPE_FLAG_NONE,
@@ -613,17 +613,17 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 */
 
-STATIC mp_obj_t mod_ffi_open(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_ffi_open(size_t n_args, const mp_obj_t *args) {
     return ffimod_make_new(&ffimod_type, n_args, 0, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_ffi_open_obj, 1, 2, mod_ffi_open);
 
-STATIC mp_obj_t mod_ffi_as_bytearray(mp_obj_t ptr, mp_obj_t size) {
+static mp_obj_t mod_ffi_as_bytearray(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(mod_ffi_as_bytearray_obj, mod_ffi_as_bytearray);
 
-STATIC const mp_rom_map_elem_t mp_module_ffi_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_ffi_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ffi) },
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mod_ffi_open_obj) },
     { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&mod_ffi_callback_obj) },
@@ -631,7 +631,7 @@ STATIC const mp_rom_map_elem_t mp_module_ffi_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_as_bytearray), MP_ROM_PTR(&mod_ffi_as_bytearray_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ffi_globals, mp_module_ffi_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_ffi_globals, mp_module_ffi_globals_table);
 
 const mp_obj_module_t mp_module_ffi = {
     .base = { &mp_type_module },
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index a1cfca81495f4..d953e7e015237 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -59,13 +59,13 @@ static jmethodID List_size_mid;
 
 static jclass IndexException_class;
 
-STATIC const mp_obj_type_t jobject_type;
-STATIC const mp_obj_type_t jmethod_type;
+static const mp_obj_type_t jobject_type;
+static const mp_obj_type_t jmethod_type;
 
-STATIC mp_obj_t new_jobject(jobject jo);
-STATIC mp_obj_t new_jclass(jclass jc);
-STATIC mp_obj_t call_method(jobject obj, const char *name, jarray methods, bool is_constr, size_t n_args, const mp_obj_t *args);
-STATIC bool py2jvalue(const char **jtypesig, mp_obj_t arg, jvalue *out);
+static mp_obj_t new_jobject(jobject jo);
+static mp_obj_t new_jclass(jclass jc);
+static mp_obj_t call_method(jobject obj, const char *name, jarray methods, bool is_constr, size_t n_args, const mp_obj_t *args);
+static bool py2jvalue(const char **jtypesig, mp_obj_t arg, jvalue *out);
 
 typedef struct _mp_obj_jclass_t {
     mp_obj_base_t base;
@@ -87,7 +87,7 @@ typedef struct _mp_obj_jmethod_t {
 
 // Utility functions
 
-STATIC bool is_object_type(const char *jtypesig) {
+static bool is_object_type(const char *jtypesig) {
     while (*jtypesig != ' ' && *jtypesig) {
         if (*jtypesig == '.') {
             return true;
@@ -97,7 +97,7 @@ STATIC bool is_object_type(const char *jtypesig) {
     return false;
 }
 
-STATIC void check_exception(void) {
+static void check_exception(void) {
     jobject exc = JJ1(ExceptionOccurred);
     if (exc) {
         // JJ1(ExceptionDescribe);
@@ -110,7 +110,7 @@ STATIC void check_exception(void) {
     }
 }
 
-STATIC void print_jobject(const mp_print_t *print, jobject obj) {
+static void print_jobject(const mp_print_t *print, jobject obj) {
     jobject str_o = JJ(CallObjectMethod, obj, Object_toString_mid);
     const char *str = JJ(GetStringUTFChars, str_o, NULL);
     mp_printf(print, str);
@@ -119,7 +119,7 @@ STATIC void print_jobject(const mp_print_t *print, jobject obj) {
 
 // jclass
 
-STATIC void jclass_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void jclass_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_obj_jclass_t *self = MP_OBJ_TO_PTR(self_in);
     if (kind == PRINT_REPR) {
         mp_printf(print, "<jclass @%p \"", self->cls);
@@ -130,7 +130,7 @@ STATIC void jclass_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
     }
 }
 
-STATIC void jclass_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
+static void jclass_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
         // load attribute
         mp_obj_jclass_t *self = MP_OBJ_TO_PTR(self_in);
@@ -156,7 +156,7 @@ STATIC void jclass_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
     }
 }
 
-STATIC mp_obj_t jclass_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t jclass_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     if (n_kw != 0) {
         mp_raise_TypeError(MP_ERROR_TEXT("kwargs not supported"));
     }
@@ -167,14 +167,14 @@ STATIC mp_obj_t jclass_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     return call_method(self->cls, NULL, methods, true, n_args, args);
 }
 
-STATIC const mp_rom_map_elem_t jclass_locals_dict_table[] = {
+static const mp_rom_map_elem_t jclass_locals_dict_table[] = {
 //    { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&ffivar_get_obj) },
 //    { MP_ROM_QSTR(MP_QSTR_set), MP_ROM_PTR(&ffivar_set_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(jclass_locals_dict, jclass_locals_dict_table);
+static MP_DEFINE_CONST_DICT(jclass_locals_dict, jclass_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     jclass_type,
     MP_QSTR_jclass,
     MP_TYPE_FLAG_NONE,
@@ -184,7 +184,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &jclass_locals_dict
     );
 
-STATIC mp_obj_t new_jclass(jclass jc) {
+static mp_obj_t new_jclass(jclass jc) {
     mp_obj_jclass_t *o = mp_obj_malloc(mp_obj_jclass_t, &jclass_type);
     o->cls = jc;
     return MP_OBJ_FROM_PTR(o);
@@ -192,7 +192,7 @@ STATIC mp_obj_t new_jclass(jclass jc) {
 
 // jobject
 
-STATIC void jobject_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void jobject_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_obj_jobject_t *self = MP_OBJ_TO_PTR(self_in);
     if (kind == PRINT_REPR) {
         mp_printf(print, "<jobject @%p \"", self->obj);
@@ -203,7 +203,7 @@ STATIC void jobject_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     }
 }
 
-STATIC void jobject_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
+static void jobject_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
         // load attribute
         mp_obj_jobject_t *self = MP_OBJ_TO_PTR(self_in);
@@ -233,7 +233,7 @@ STATIC void jobject_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
     }
 }
 
-STATIC void get_jclass_name(jobject obj, char *buf) {
+static void get_jclass_name(jobject obj, char *buf) {
     jclass obj_class = JJ(GetObjectClass, obj);
     jstring name = JJ(CallObjectMethod, obj_class, Class_getName_mid);
     jint len = JJ(GetStringLength, name);
@@ -241,7 +241,7 @@ STATIC void get_jclass_name(jobject obj, char *buf) {
     check_exception();
 }
 
-STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_jobject_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t idx = mp_obj_get_int(index);
     char class_name[64];
@@ -291,7 +291,7 @@ STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value)
     return MP_OBJ_NULL;
 }
 
-STATIC mp_obj_t jobject_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t jobject_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_jobject_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -309,19 +309,19 @@ STATIC mp_obj_t jobject_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 
 // TODO: subscr_load_adaptor & subscr_getiter convenience functions
 // should be moved to common location for reuse.
-STATIC mp_obj_t subscr_load_adaptor(mp_obj_t self_in, mp_obj_t index_in) {
+static mp_obj_t subscr_load_adaptor(mp_obj_t self_in, mp_obj_t index_in) {
     return mp_obj_subscr(self_in, index_in, MP_OBJ_SENTINEL);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(subscr_load_adaptor_obj, subscr_load_adaptor);
 
 // .getiter special method which returns iterator which works in terms
 // of object subscription.
-STATIC mp_obj_t subscr_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t subscr_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     mp_obj_t dest[2] = {MP_OBJ_FROM_PTR(&subscr_load_adaptor_obj), self_in};
     return mp_obj_new_getitem_iter(dest, iter_buf);
 }
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     jobject_type,
     MP_QSTR_jobject,
     MP_TYPE_FLAG_ITER_IS_GETITER,
@@ -332,7 +332,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     iter, subscr_getiter
     );
 
-STATIC mp_obj_t new_jobject(jobject jo) {
+static mp_obj_t new_jobject(jobject jo) {
     if (jo == NULL) {
         return mp_const_none;
     } else if (JJ(IsInstanceOf, jo, String_class)) {
@@ -353,7 +353,7 @@ STATIC mp_obj_t new_jobject(jobject jo) {
 
 // jmethod
 
-STATIC void jmethod_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void jmethod_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_jmethod_t *self = MP_OBJ_TO_PTR(self_in);
     // Variable value printed as cast to int
@@ -368,14 +368,14 @@ STATIC void jmethod_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     } \
     arg_type += sizeof(java_type_name) - 1;
 
-STATIC const char *strprev(const char *s, char c) {
+static const char *strprev(const char *s, char c) {
     while (*s != c) {
         s--;
     }
     return s;
 }
 
-STATIC bool py2jvalue(const char **jtypesig, mp_obj_t arg, jvalue *out) {
+static bool py2jvalue(const char **jtypesig, mp_obj_t arg, jvalue *out) {
     const char *arg_type = *jtypesig;
     const mp_obj_type_t *type = mp_obj_get_type(arg);
 
@@ -442,7 +442,7 @@ STATIC bool py2jvalue(const char **jtypesig, mp_obj_t arg, jvalue *out) {
 // perspective, it's aggregate object which may require passing via stack
 // instead of registers. Work that around by passing jobject and typecasting
 // it.
-STATIC mp_obj_t jvalue2py(const char *jtypesig, jobject arg) {
+static mp_obj_t jvalue2py(const char *jtypesig, jobject arg) {
     if (arg == NULL || MATCH(jtypesig, "void")) {
         return mp_const_none;
     } else if (MATCH(jtypesig, "boolean")) {
@@ -460,7 +460,7 @@ STATIC mp_obj_t jvalue2py(const char *jtypesig, jobject arg) {
 }
 #endif
 
-STATIC mp_obj_t call_method(jobject obj, const char *name, jarray methods, bool is_constr, size_t n_args, const mp_obj_t *args) {
+static mp_obj_t call_method(jobject obj, const char *name, jarray methods, bool is_constr, size_t n_args, const mp_obj_t *args) {
     jvalue jargs[n_args];
 //    printf("methods=%p\n", methods);
     jsize num_methods = JJ(GetArrayLength, methods);
@@ -550,7 +550,7 @@ STATIC mp_obj_t call_method(jobject obj, const char *name, jarray methods, bool
 }
 
 
-STATIC mp_obj_t jmethod_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t jmethod_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     if (n_kw != 0) {
         mp_raise_TypeError(MP_ERROR_TEXT("kwargs not supported"));
     }
@@ -568,7 +568,7 @@ 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 MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     jmethod_type,
     MP_QSTR_jmethod,
     MP_TYPE_FLAG_NONE,
@@ -582,7 +582,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 #define LIBJVM_SO "libjvm.so"
 #endif
 
-STATIC void create_jvm(void) {
+static void create_jvm(void) {
     JavaVMInitArgs args;
     JavaVMOption options;
     options.optionString = "-Djava.class.path=.";
@@ -635,7 +635,7 @@ STATIC void create_jvm(void) {
     IndexException_class = JJ(FindClass, "java/lang/IndexOutOfBoundsException");
 }
 
-STATIC mp_obj_t mod_jni_cls(mp_obj_t cls_name_in) {
+static mp_obj_t mod_jni_cls(mp_obj_t cls_name_in) {
     const char *cls_name = mp_obj_str_get_str(cls_name_in);
     if (!env) {
         create_jvm();
@@ -648,7 +648,7 @@ STATIC mp_obj_t mod_jni_cls(mp_obj_t cls_name_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mod_jni_cls_obj, mod_jni_cls);
 
-STATIC mp_obj_t mod_jni_array(mp_obj_t type_in, mp_obj_t size_in) {
+static mp_obj_t mod_jni_array(mp_obj_t type_in, mp_obj_t size_in) {
     if (!env) {
         create_jvm();
     }
@@ -696,19 +696,19 @@ STATIC mp_obj_t mod_jni_array(mp_obj_t type_in, mp_obj_t size_in) {
 MP_DEFINE_CONST_FUN_OBJ_2(mod_jni_array_obj, mod_jni_array);
 
 
-STATIC mp_obj_t mod_jni_env(void) {
+static mp_obj_t mod_jni_env(void) {
     return mp_obj_new_int((mp_int_t)(uintptr_t)env);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mod_jni_env_obj, mod_jni_env);
 
-STATIC const mp_rom_map_elem_t mp_module_jni_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_jni_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_jni) },
     { MP_ROM_QSTR(MP_QSTR_cls), MP_ROM_PTR(&mod_jni_cls_obj) },
     { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mod_jni_array_obj) },
     { MP_ROM_QSTR(MP_QSTR_env), MP_ROM_PTR(&mod_jni_env_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_jni_globals, mp_module_jni_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_jni_globals, mp_module_jni_globals_table);
 
 const mp_obj_module_t mp_module_jni = {
     .base = { &mp_type_module },
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 40d08d9111422..6f3ab80944061 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -70,7 +70,7 @@ uintptr_t mod_machine_mem_get_addr(mp_obj_t addr_o, uint align) {
     return addr;
 }
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     #ifdef MICROPY_UNIX_MACHINE_IDLE
     MICROPY_UNIX_MACHINE_IDLE
     #else
diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index 1d5e2afef4ad9..d5e963583b7a4 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-STATIC mp_obj_t mp_os_getenv(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_os_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) {
@@ -42,9 +42,9 @@ STATIC mp_obj_t mp_os_getenv(size_t n_args, const mp_obj_t *args) {
     }
     return mp_obj_new_str(s, strlen(s));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_getenv_obj, 1, 2, mp_os_getenv);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_getenv_obj, 1, 2, mp_os_getenv);
 
-STATIC mp_obj_t mp_os_putenv(mp_obj_t key_in, mp_obj_t value_in) {
+static mp_obj_t mp_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;
@@ -60,9 +60,9 @@ STATIC mp_obj_t mp_os_putenv(mp_obj_t key_in, mp_obj_t value_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_os_putenv_obj, mp_os_putenv);
+static MP_DEFINE_CONST_FUN_OBJ_2(mp_os_putenv_obj, mp_os_putenv);
 
-STATIC mp_obj_t mp_os_unsetenv(mp_obj_t key_in) {
+static mp_obj_t mp_os_unsetenv(mp_obj_t key_in) {
     const char *key = mp_obj_str_get_str(key_in);
     int ret;
 
@@ -77,9 +77,9 @@ STATIC mp_obj_t mp_os_unsetenv(mp_obj_t key_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_unsetenv_obj, mp_os_unsetenv);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_unsetenv_obj, mp_os_unsetenv);
 
-STATIC mp_obj_t mp_os_system(mp_obj_t cmd_in) {
+static mp_obj_t mp_os_system(mp_obj_t cmd_in) {
     const char *cmd = mp_obj_str_get_str(cmd_in);
 
     MP_THREAD_GIL_EXIT();
@@ -90,18 +90,18 @@ STATIC mp_obj_t mp_os_system(mp_obj_t cmd_in) {
 
     return MP_OBJ_NEW_SMALL_INT(r);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_system_obj, mp_os_system);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_system_obj, mp_os_system);
 
-STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
     mp_hal_get_random(n, vstr.buf);
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 
-STATIC mp_obj_t mp_os_errno(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_os_errno(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return MP_OBJ_NEW_SMALL_INT(errno);
     }
@@ -109,4 +109,4 @@ STATIC mp_obj_t mp_os_errno(size_t n_args, const mp_obj_t *args) {
     errno = mp_obj_get_int(args[0]);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_errno_obj, 0, 1, mp_os_errno);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_errno_obj, 0, 1, mp_os_errno);
diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index 5c935d2299bae..6d6059ae44c54 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -82,7 +82,7 @@ static inline mp_obj_t mp_obj_from_sockaddr(const struct sockaddr *addr, socklen
     return mp_obj_new_bytes((const byte *)addr, len);
 }
 
-STATIC mp_obj_socket_t *socket_new(int fd) {
+static mp_obj_socket_t *socket_new(int fd) {
     mp_obj_socket_t *o = mp_obj_malloc(mp_obj_socket_t, &mp_type_socket);
     o->fd = fd;
     o->blocking = true;
@@ -90,13 +90,13 @@ STATIC mp_obj_socket_t *socket_new(int fd) {
 }
 
 
-STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<_socket %d>", self->fd);
 }
 
-STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_socket_t *o = MP_OBJ_TO_PTR(o_in);
     ssize_t r;
     MP_HAL_RETRY_SYSCALL(r, read(o->fd, buf, size), {
@@ -112,7 +112,7 @@ STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
     return (mp_uint_t)r;
 }
 
-STATIC mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_socket_t *o = MP_OBJ_TO_PTR(o_in);
     ssize_t r;
     MP_HAL_RETRY_SYSCALL(r, write(o->fd, buf, size), {
@@ -128,7 +128,7 @@ STATIC mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, in
     return (mp_uint_t)r;
 }
 
-STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(o_in);
     (void)arg;
     switch (request) {
@@ -186,13 +186,13 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
     }
 }
 
-STATIC mp_obj_t socket_fileno(mp_obj_t self_in) {
+static mp_obj_t socket_fileno(mp_obj_t self_in) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(self->fd);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_fileno_obj, socket_fileno);
+static MP_DEFINE_CONST_FUN_OBJ_1(socket_fileno_obj, socket_fileno);
 
-STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(addr_in, &bufinfo, MP_BUFFER_READ);
@@ -220,9 +220,9 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
 
-STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(addr_in, &bufinfo, MP_BUFFER_READ);
@@ -232,10 +232,10 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     RAISE_ERRNO(r, errno);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
 // method socket.listen([backlog])
-STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+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 = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
@@ -250,9 +250,9 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
     RAISE_ERRNO(r, errno);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, 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) {
+static mp_obj_t socket_accept(mp_obj_t self_in) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
     // sockaddr_storage isn't stack-friendly (129 bytes or so)
     // struct sockaddr_storage addr;
@@ -273,12 +273,12 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
 
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
+static MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 
 // Note: besides flag param, this differs from read() in that
 // this does not swallow blocking errors (EAGAIN, EWOULDBLOCK) -
 // these would be thrown as exceptions.
-STATIC mp_obj_t socket_recv(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_recv(size_t n_args, const mp_obj_t *args) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
     int sz = MP_OBJ_SMALL_INT_VALUE(args[1]);
     int flags = 0;
@@ -294,9 +294,9 @@ STATIC mp_obj_t socket_recv(size_t n_args, const mp_obj_t *args) {
     m_del(char, buf, sz);
     return ret;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recv_obj, 2, 3, socket_recv);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recv_obj, 2, 3, socket_recv);
 
-STATIC mp_obj_t socket_recvfrom(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_recvfrom(size_t n_args, const mp_obj_t *args) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
     int sz = MP_OBJ_SMALL_INT_VALUE(args[1]);
     int flags = 0;
@@ -321,12 +321,12 @@ STATIC mp_obj_t socket_recvfrom(size_t n_args, const mp_obj_t *args) {
 
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recvfrom_obj, 2, 3, socket_recvfrom);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recvfrom_obj, 2, 3, socket_recvfrom);
 
 // Note: besides flag param, this differs from write() in that
 // this does not swallow blocking errors (EAGAIN, EWOULDBLOCK) -
 // these would be thrown as exceptions.
-STATIC mp_obj_t socket_send(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_send(size_t n_args, const mp_obj_t *args) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
     int flags = 0;
 
@@ -341,9 +341,9 @@ STATIC mp_obj_t socket_send(size_t n_args, const mp_obj_t *args) {
         mp_raise_OSError(err));
     return MP_OBJ_NEW_SMALL_INT(out_sz);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_send_obj, 2, 3, socket_send);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_send_obj, 2, 3, socket_send);
 
-STATIC mp_obj_t socket_sendto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_sendto(size_t n_args, const mp_obj_t *args) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
     int flags = 0;
 
@@ -361,9 +361,9 @@ STATIC mp_obj_t socket_sendto(size_t n_args, const mp_obj_t *args) {
         (struct sockaddr *)addr_bi.buf, addr_bi.len), mp_raise_OSError(err));
     return MP_OBJ_NEW_SMALL_INT(out_sz);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_sendto_obj, 3, 4, socket_sendto);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_sendto_obj, 3, 4, socket_sendto);
 
-STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // always 4
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
     int level = MP_OBJ_SMALL_INT_VALUE(args[1]);
@@ -388,9 +388,9 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     RAISE_ERRNO(r, errno);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
 
-STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
+static mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
     int val = mp_obj_is_true(flag_in);
     MP_THREAD_GIL_EXIT();
@@ -410,9 +410,9 @@ STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
     self->blocking = val;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
+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) {
+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, };
     bool new_blocking = true;
@@ -455,9 +455,9 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, socket_settimeout);
 
-STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
     // TODO: CPython explicitly says that closing returned object doesn't close
     // the original socket (Python2 at all says that fd is dup()ed). But we
     // save on the bloat.
@@ -467,9 +467,9 @@ STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
     new_args[0] = MP_OBJ_NEW_SMALL_INT(self->fd);
     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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
 
-STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t socket_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;
     (void)n_kw;
 
@@ -497,7 +497,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, siz
     return MP_OBJ_FROM_PTR(socket_new(fd));
 }
 
-STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_fileno), MP_ROM_PTR(&socket_fileno_obj) },
     { MP_ROM_QSTR(MP_QSTR_makefile), MP_ROM_PTR(&socket_makefile_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
@@ -518,9 +518,9 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
+static MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
-STATIC const mp_stream_p_t socket_stream_p = {
+static const mp_stream_p_t socket_stream_p = {
     .read = socket_read,
     .write = socket_write,
     .ioctl = socket_ioctl,
@@ -537,7 +537,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 #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) {
+static mp_obj_t mod_socket_inet_pton(mp_obj_t family_in, mp_obj_t addr_in) {
     int family = mp_obj_get_int(family_in);
     byte binaddr[BINADDR_MAX_LEN];
     int r = inet_pton(family, mp_obj_str_get_str(addr_in), binaddr);
@@ -556,9 +556,9 @@ STATIC mp_obj_t mod_socket_inet_pton(mp_obj_t family_in, mp_obj_t addr_in) {
     }
     return mp_obj_new_bytes(binaddr, binaddr_len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_socket_inet_pton_obj, mod_socket_inet_pton);
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_socket_inet_pton_obj, mod_socket_inet_pton);
 
-STATIC mp_obj_t mod_socket_inet_ntop(mp_obj_t family_in, mp_obj_t binaddr_in) {
+static mp_obj_t mod_socket_inet_ntop(mp_obj_t family_in, mp_obj_t binaddr_in) {
     int family = mp_obj_get_int(family_in);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(binaddr_in, &bufinfo, MP_BUFFER_READ);
@@ -570,9 +570,9 @@ STATIC mp_obj_t mod_socket_inet_ntop(mp_obj_t family_in, mp_obj_t binaddr_in) {
     vstr.len = strlen(vstr.buf);
     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);
+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) {
+static mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
 
     const char *host = mp_obj_str_get_str(args[0]);
     const char *serv = NULL;
@@ -647,9 +647,9 @@ 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, 6, 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) {
+static mp_obj_t mod_socket_sockaddr(mp_obj_t sockaddr_in) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(sockaddr_in, &bufinfo, MP_BUFFER_READ);
     switch (((struct sockaddr *)bufinfo.buf)->sa_family) {
@@ -681,9 +681,9 @@ STATIC mp_obj_t mod_socket_sockaddr(mp_obj_t sockaddr_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_socket_sockaddr_obj, mod_socket_sockaddr);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_socket_sockaddr_obj, mod_socket_sockaddr);
 
-STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_type_socket) },
     { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&mod_socket_getaddrinfo_obj) },
@@ -711,7 +711,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
 #undef C
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
 const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c
index 8a79bc3a5943d..b1ad9a450e0c8 100644
--- a/ports/unix/modtermios.c
+++ b/ports/unix/modtermios.c
@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-STATIC mp_obj_t mod_termios_tcgetattr(mp_obj_t fd_in) {
+static mp_obj_t mod_termios_tcgetattr(mp_obj_t fd_in) {
     struct termios term;
     int fd = mp_obj_get_int(fd_in);
 
@@ -65,9 +65,9 @@ STATIC mp_obj_t mod_termios_tcgetattr(mp_obj_t fd_in) {
     }
     return MP_OBJ_FROM_PTR(r);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_termios_tcgetattr_obj, mod_termios_tcgetattr);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_termios_tcgetattr_obj, mod_termios_tcgetattr);
 
-STATIC mp_obj_t mod_termios_tcsetattr(mp_obj_t fd_in, mp_obj_t when_in, mp_obj_t attrs_in) {
+static mp_obj_t mod_termios_tcsetattr(mp_obj_t fd_in, mp_obj_t when_in, mp_obj_t attrs_in) {
     struct termios term;
     int fd = mp_obj_get_int(fd_in);
     int when = mp_obj_get_int(when_in);
@@ -105,9 +105,9 @@ STATIC mp_obj_t mod_termios_tcsetattr(mp_obj_t fd_in, mp_obj_t when_in, mp_obj_t
     RAISE_ERRNO(res, errno);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_termios_tcsetattr_obj, mod_termios_tcsetattr);
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_termios_tcsetattr_obj, mod_termios_tcsetattr);
 
-STATIC mp_obj_t mod_termios_setraw(mp_obj_t fd_in) {
+static mp_obj_t mod_termios_setraw(mp_obj_t fd_in) {
     struct termios term;
     int fd = mp_obj_get_int(fd_in);
     int res = tcgetattr(fd, &term);
@@ -123,9 +123,9 @@ STATIC mp_obj_t mod_termios_setraw(mp_obj_t fd_in) {
     RAISE_ERRNO(res, errno);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_termios_setraw_obj, mod_termios_setraw);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_termios_setraw_obj, mod_termios_setraw);
 
-STATIC const mp_rom_map_elem_t mp_module_termios_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_termios_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_termios) },
     { MP_ROM_QSTR(MP_QSTR_tcgetattr), MP_ROM_PTR(&mod_termios_tcgetattr_obj) },
     { MP_ROM_QSTR(MP_QSTR_tcsetattr), MP_ROM_PTR(&mod_termios_tcsetattr_obj) },
@@ -144,7 +144,7 @@ STATIC const mp_rom_map_elem_t mp_module_termios_globals_table[] = {
 #undef C
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_termios_globals, mp_module_termios_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_termios_globals, mp_module_termios_globals_table);
 
 const mp_obj_module_t mp_module_termios = {
     .base = { &mp_type_module },
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index b6fbae0d1c24b..fbd94b5ecd129 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -61,7 +61,7 @@ static inline int msec_sleep_tv(struct timeval *tv) {
 #error Unsupported clock() implementation
 #endif
 
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
     struct timeval tv;
     gettimeofday(&tv, NULL);
@@ -73,7 +73,7 @@ STATIC mp_obj_t mp_time_time_get(void) {
 }
 
 // Note: this is deprecated since CPy3.3, but pystone still uses it.
-STATIC mp_obj_t mod_time_clock(void) {
+static mp_obj_t mod_time_clock(void) {
     #if MICROPY_PY_BUILTINS_FLOAT
     // float cannot represent full range of int32 precisely, so we pre-divide
     // int to reduce resolution, and then actually do float division hoping
@@ -83,9 +83,9 @@ STATIC mp_obj_t mod_time_clock(void) {
     return mp_obj_new_int((mp_int_t)clock());
     #endif
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);
 
-STATIC mp_obj_t mp_time_sleep(mp_obj_t arg) {
+static mp_obj_t mp_time_sleep(mp_obj_t arg) {
     #if MICROPY_PY_BUILTINS_FLOAT
     struct timeval tv;
     mp_float_t val = mp_obj_get_float(arg);
@@ -125,7 +125,7 @@ STATIC mp_obj_t mp_time_sleep(mp_obj_t arg) {
     return mp_const_none;
 }
 
-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)) {
+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);
@@ -159,17 +159,17 @@ STATIC mp_obj_t mod_time_gm_local_time(size_t n_args, const mp_obj_t *args, stru
     return ret;
 }
 
-STATIC mp_obj_t mod_time_gmtime(size_t n_args, const mp_obj_t *args) {
+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_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) {
+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_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) {
+static mp_obj_t mod_time_mktime(mp_obj_t tuple) {
     size_t len;
     mp_obj_t *elem;
     mp_obj_get_array(tuple, &len, &elem);
diff --git a/ports/unix/mpbthciport.c b/ports/unix/mpbthciport.c
index 8813ce147c1ee..95c39f559910d 100644
--- a/ports/unix/mpbthciport.c
+++ b/ports/unix/mpbthciport.c
@@ -54,7 +54,7 @@
 
 uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 
-STATIC int uart_fd = -1;
+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);
@@ -68,9 +68,9 @@ extern bool mp_bluetooth_hci_poll(void);
 extern bool mp_bluetooth_hci_active(void);
 
 // Prevent double-enqueuing of the scheduled task.
-STATIC volatile bool events_task_is_scheduled = false;
+static volatile bool events_task_is_scheduled = false;
 
-STATIC mp_obj_t run_events_scheduled_task(mp_obj_t none_in) {
+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;
@@ -78,14 +78,14 @@ STATIC mp_obj_t run_events_scheduled_task(mp_obj_t none_in) {
     mp_bluetooth_hci_poll();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(run_events_scheduled_task_obj, run_events_scheduled_task);
+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 const useconds_t UART_POLL_INTERVAL_US = 1000;
+static pthread_t hci_poll_thread_id;
 
-STATIC void *hci_poll_thread(void *arg) {
+static void *hci_poll_thread(void *arg) {
     (void)arg;
 
     DEBUG_printf("hci_poll_thread: starting\n");
@@ -118,7 +118,7 @@ STATIC void *hci_poll_thread(void *arg) {
     return NULL;
 }
 
-STATIC int configure_uart(void) {
+static int configure_uart(void) {
     struct termios toptions;
 
     // Get existing config.
diff --git a/ports/unix/mpbtstackport_h4.c b/ports/unix/mpbtstackport_h4.c
index a2038c16a90a8..14d418c63f229 100644
--- a/ports/unix/mpbtstackport_h4.c
+++ b/ports/unix/mpbtstackport_h4.c
@@ -44,7 +44,7 @@
 
 #define DEBUG_printf(...) // printf(__VA_ARGS__)
 
-STATIC hci_transport_config_uart_t hci_transport_config_uart = {
+static hci_transport_config_uart_t hci_transport_config_uart = {
     .type = HCI_TRANSPORT_CONFIG_UART,
     .baudrate_init = 1000000,
     .baudrate_main = 0,
diff --git a/ports/unix/mpbtstackport_usb.c b/ports/unix/mpbtstackport_usb.c
index 1793e2bacd21e..8b1d1fff2189f 100644
--- a/ports/unix/mpbtstackport_usb.c
+++ b/ports/unix/mpbtstackport_usb.c
@@ -49,7 +49,7 @@
 #error Unix btstack requires MICROPY_PY_THREAD
 #endif
 
-STATIC const useconds_t USB_POLL_INTERVAL_US = 1000;
+static const useconds_t USB_POLL_INTERVAL_US = 1000;
 
 void mp_bluetooth_btstack_port_init_usb(void) {
     // MICROPYBTUSB can be a ':'' or '-' separated port list.
@@ -73,7 +73,7 @@ void mp_bluetooth_btstack_port_init_usb(void) {
     hci_init(hci_transport_usb_instance(), NULL);
 }
 
-STATIC pthread_t bstack_thread_id;
+static pthread_t bstack_thread_id;
 
 void mp_bluetooth_btstack_port_deinit(void) {
     hci_power_control(HCI_POWER_OFF);
@@ -86,7 +86,7 @@ void mp_bluetooth_btstack_port_deinit(void) {
 // Provided by mpbstackport_common.c.
 extern bool mp_bluetooth_hci_poll(void);
 
-STATIC void *btstack_thread(void *arg) {
+static void *btstack_thread(void *arg) {
     (void)arg;
     hci_power_control(HCI_POWER_ON);
 
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 2190bf4ad1ba3..16ac4da8bf56f 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -60,21 +60,21 @@ typedef struct _mp_thread_t {
     struct _mp_thread_t *next;
 } mp_thread_t;
 
-STATIC pthread_key_t tls_key;
+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;
-STATIC mp_thread_t *thread;
+static pthread_mutex_t thread_mutex;
+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
 #if defined(__APPLE__)
-STATIC char thread_signal_done_name[25];
-STATIC sem_t *thread_signal_done_p;
+static char thread_signal_done_name[25];
+static sem_t *thread_signal_done_p;
 #else
-STATIC sem_t thread_signal_done;
+static sem_t thread_signal_done;
 #endif
 
 void mp_thread_unix_begin_atomic_section(void) {
@@ -86,7 +86,7 @@ void mp_thread_unix_end_atomic_section(void) {
 }
 
 // this signal handler is used to scan the regs and stack of a thread
-STATIC void mp_thread_gc(int signo, siginfo_t *info, void *context) {
+static void mp_thread_gc(int signo, siginfo_t *info, void *context) {
     (void)info; // unused
     (void)context; // unused
     if (signo == MP_THREAD_GC_SIGNAL) {
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 24c0fa3cdae53..5f5abc2e056f6 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -46,7 +46,7 @@
 #ifndef _WIN32
 #include <signal.h>
 
-STATIC void sighandler(int signum) {
+static void sighandler(int signum) {
     if (signum == SIGINT) {
         #if MICROPY_ASYNC_KBD_INTR
         #if MICROPY_PY_THREAD_GIL
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index c3cb8c1974ee9..0aacf1ee095be 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -112,7 +112,7 @@ void mp_js_init_repl() {
     pyexec_event_repl_init();
 }
 
-STATIC void gc_scan_func(void *begin, void *end) {
+static void gc_scan_func(void *begin, void *end) {
     gc_collect_root((void **)begin, (void **)end - (void **)begin + 1);
 }
 
diff --git a/ports/windows/fmode.c b/ports/windows/fmode.c
index a7976b87e32dc..128c951ec40cd 100644
--- a/ports/windows/fmode.c
+++ b/ports/windows/fmode.c
@@ -31,7 +31,7 @@
 
 // Workaround for setting file translation mode: we must distinguish toolsets
 // since mingw has no _set_fmode, and altering msvc's _fmode directly has no effect
-STATIC int set_fmode_impl(int mode) {
+static int set_fmode_impl(int mode) {
     #ifndef _MSC_VER
     _fmode = mode;
     return 0;
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index dcee20784e79f..b636393f5401c 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -38,14 +38,14 @@ HANDLE std_in = NULL;
 HANDLE con_out = NULL;
 DWORD orig_mode = 0;
 
-STATIC void assure_stdin_handle() {
+static void assure_stdin_handle() {
     if (!std_in) {
         std_in = GetStdHandle(STD_INPUT_HANDLE);
         assert(std_in != INVALID_HANDLE_VALUE);
     }
 }
 
-STATIC void assure_conout_handle() {
+static void assure_conout_handle() {
     if (!con_out) {
         con_out = CreateFile("CONOUT$", GENERIC_READ | GENERIC_WRITE,
             FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -143,7 +143,7 @@ typedef struct item_t {
 } item_t;
 
 // map virtual key codes to key sequences known by MicroPython's readline implementation
-STATIC item_t keyCodeMap[] = {
+static item_t keyCodeMap[] = {
     {VK_UP, "[A"},
     {VK_DOWN, "[B"},
     {VK_RIGHT, "[C"},
@@ -155,7 +155,7 @@ STATIC item_t keyCodeMap[] = {
 };
 
 // likewise, but with Ctrl key down
-STATIC item_t ctrlKeyCodeMap[] = {
+static item_t ctrlKeyCodeMap[] = {
     {VK_LEFT, "b"},
     {VK_RIGHT, "f"},
     {VK_DELETE, "d"},
@@ -163,9 +163,9 @@ STATIC item_t ctrlKeyCodeMap[] = {
     {0, ""} // sentinel
 };
 
-STATIC const char *cur_esc_seq = NULL;
+static const char *cur_esc_seq = NULL;
 
-STATIC int esc_seq_process_vk(WORD vk, bool ctrl_key_down) {
+static int esc_seq_process_vk(WORD vk, bool ctrl_key_down) {
     for (item_t *p = (ctrl_key_down ? ctrlKeyCodeMap : keyCodeMap); p->vkey != 0; ++p) {
         if (p->vkey == vk) {
             cur_esc_seq = p->seq;
@@ -175,7 +175,7 @@ STATIC int esc_seq_process_vk(WORD vk, bool ctrl_key_down) {
     return 0; // nothing found
 }
 
-STATIC int esc_seq_chr() {
+static int esc_seq_chr() {
     if (cur_esc_seq) {
         const char c = *cur_esc_seq++;
         if (c) {
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 36d88204f4a5b..27c0a63a0ef9c 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -46,7 +46,7 @@ typedef struct _machine_hard_i2c_obj_t {
     bool restart;
 } 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) {
+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->name);
 }
@@ -90,7 +90,7 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC int machine_hard_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags) {
+static int machine_hard_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags) {
     machine_hard_i2c_obj_t *self = (machine_hard_i2c_obj_t *)self_in;
     struct i2c_msg msg;
     int ret;
@@ -120,7 +120,7 @@ STATIC int machine_hard_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t add
     return (ret < 0) ? -MP_EIO : len;
 }
 
-STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
+static const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer = mp_machine_i2c_transfer_adaptor,
     .transfer_single = machine_hard_i2c_transfer_single,
 };
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index d27b5900929f6..97a852be8abca 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -47,7 +47,7 @@ typedef struct _machine_pin_irq_obj_t {
     struct gpio_callback callback;
 } machine_pin_irq_obj_t;
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods;
+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) {
@@ -59,7 +59,7 @@ void machine_pin_deinit(void) {
     MP_STATE_PORT(machine_pin_irq_list) = NULL;
 }
 
-STATIC void gpio_callback_handler(const 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
@@ -80,13 +80,13 @@ STATIC void gpio_callback_handler(const struct device *port, struct gpio_callbac
     #endif
 }
 
-STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
 }
 
 // pin.init(mode, pull=None, *, value)
-STATIC mp_obj_t machine_pin_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(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_REQUIRED | MP_ARG_INT },
@@ -154,7 +154,7 @@ 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) {
+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) {
@@ -167,33 +167,33 @@ 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) {
+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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
 
-STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
+static mp_obj_t machine_pin_off(mp_obj_t self_in) {
     machine_pin_obj_t *self = self_in;
     (void)gpio_pin_set_raw(self->port, self->pin, 0);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
 
-STATIC mp_obj_t machine_pin_on(mp_obj_t self_in) {
+static mp_obj_t machine_pin_on(mp_obj_t self_in) {
     machine_pin_obj_t *self = self_in;
     (void)gpio_pin_set_raw(self->port, self->pin, 1);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
+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) {
+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} },
@@ -246,9 +246,9 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 
     return MP_OBJ_FROM_PTR(self->irq);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_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) {
+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;
 
@@ -263,7 +263,7 @@ STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return -1;
 }
 
-STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+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) },
@@ -280,9 +280,9 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
-STATIC const mp_pin_p_t machine_pin_pin_p = {
+static const mp_pin_p_t machine_pin_pin_p = {
     .ioctl = machine_pin_ioctl,
 };
 
@@ -297,7 +297,7 @@ 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) {
+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;
@@ -309,7 +309,7 @@ STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger
     return 0;
 }
 
-STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+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);
@@ -319,7 +319,7 @@ STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     return 0;
 }
 
-STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+static const mp_irq_methods_t machine_pin_irq_methods = {
     .trigger = machine_pin_irq_trigger,
     .info = machine_pin_irq_info,
 };
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 5c882a6ae3c0e..5c090e15cfa27 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -52,7 +52,7 @@ typedef struct _machine_hard_spi_obj_t {
     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) {
+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,
@@ -112,7 +112,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     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) {
+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[] = {
@@ -163,7 +163,7 @@ STATIC void machine_hard_spi_init(mp_obj_base_t *obj, size_t n_args, const mp_ob
     self->config = cfg;
 }
 
-STATIC void machine_hard_spi_transfer(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest) {
+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;
@@ -191,7 +191,7 @@ STATIC void machine_hard_spi_transfer(mp_obj_base_t *obj, size_t len, const uint
     }
 }
 
-STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
+static const mp_machine_spi_p_t machine_hard_spi_p = {
     .init = machine_hard_spi_init,
     .transfer = machine_hard_spi_transfer,
 };
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 2c4b3a470b58e..bd40137a3e7d6 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -43,12 +43,12 @@ typedef struct _machine_uart_obj_t {
     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 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 mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void mp_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);
@@ -58,7 +58,7 @@ STATIC void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         self->timeout, self->timeout_char);
 }
 
-STATIC void mp_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 void mp_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} },
@@ -71,7 +71,7 @@ STATIC void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     self->timeout_char = args[ARG_timeout_char].u_int;
 }
 
-STATIC mp_obj_t mp_machine_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 mp_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);
 
     machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
@@ -87,21 +87,21 @@ STATIC mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     (void)self;
 }
 
-STATIC mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     (void)self;
     mp_raise_NotImplementedError(NULL); // TODO
 }
 
-STATIC bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     (void)self;
     mp_raise_NotImplementedError(NULL); // TODO
 }
 
-STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
@@ -122,7 +122,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     return bytes_read;
 }
 
-STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+static mp_uint_t mp_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;
 
@@ -133,7 +133,7 @@ STATIC mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     return size;
 }
 
-STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t mp_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) {
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 36bc628bbe953..314bbfd263b45 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -96,7 +96,7 @@ void init_zephyr(void) {
 }
 
 #if MICROPY_VFS
-STATIC void vfs_init(void) {
+static void vfs_init(void) {
     mp_obj_t bdev = NULL;
     mp_obj_t mount_point;
     const char *mount_point_str = NULL;
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index 279e4ca9a03bc..b427a6cd98b9f 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -61,21 +61,21 @@ typedef struct _mp_bluetooth_zephyr_root_pointers_t {
     mp_gatts_db_t gatts_db;
 } mp_bluetooth_zephyr_root_pointers_t;
 
-STATIC int mp_bluetooth_zephyr_ble_state;
+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;
+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) {
+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) {
+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];
     }
@@ -98,12 +98,12 @@ void gap_scan_cb_recv(const struct bt_le_scan_recv_info *info, struct net_buf_si
     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) {
+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);
+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");
@@ -212,7 +212,7 @@ int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len) {
 
 // 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) {
+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) {
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 7015989784f5c..bbb9280a5dcb9 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -45,19 +45,19 @@
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) }, \
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) }, \
 
-STATIC mp_obj_t machine_reset(void) {
+static mp_obj_t machine_reset(void) {
     sys_reboot(SYS_REBOOT_COLD);
     // Won't get here, Zephyr has infiniloop on its side
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-STATIC mp_obj_t machine_reset_cause(void) {
+static mp_obj_t machine_reset_cause(void) {
     printf("Warning: %s is not implemented\n", __func__);
     return MP_OBJ_NEW_SMALL_INT(42);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
-STATIC void mp_machine_idle(void) {
+static void mp_machine_idle(void) {
     k_yield();
 }
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index 3d91fa976930d..12c4c934bcd2f 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -59,21 +59,21 @@ typedef struct _socket_obj_t {
     int8_t state;
 } socket_obj_t;
 
-STATIC const mp_obj_type_t socket_type;
+static const mp_obj_type_t socket_type;
 
 // Helper functions
 
 #define RAISE_ERRNO(x) { int _err = x; if (_err < 0) mp_raise_OSError(-_err); }
 #define RAISE_SOCK_ERRNO(x) { if ((int)(x) == -1) mp_raise_OSError(errno); }
 
-STATIC void socket_check_closed(socket_obj_t *socket) {
+static void socket_check_closed(socket_obj_t *socket) {
     if (socket->ctx == -1) {
         // already closed
         mp_raise_OSError(EBADF);
     }
 }
 
-STATIC void parse_inet_addr(socket_obj_t *socket, mp_obj_t addr_in, struct sockaddr *sockaddr) {
+static void parse_inet_addr(socket_obj_t *socket, mp_obj_t addr_in, struct sockaddr *sockaddr) {
     // We employ the fact that port and address offsets are the same for IPv4 & IPv6
     struct sockaddr_in *sockaddr_in = (struct sockaddr_in *)sockaddr;
 
@@ -85,7 +85,7 @@ STATIC void parse_inet_addr(socket_obj_t *socket, mp_obj_t addr_in, struct socka
     sockaddr_in->sin_port = htons(mp_obj_get_int(addr_items[1]));
 }
 
-STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
+static mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
     // We employ the fact that port and address offsets are the same for IPv4 & IPv6
     struct sockaddr_in6 *sockaddr_in6 = (struct sockaddr_in6 *)addr;
     char buf[40];
@@ -114,7 +114,7 @@ socket_obj_t *socket_new(void) {
 
 // Methods
 
-STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     socket_obj_t *self = self_in;
     if (self->ctx == -1) {
         mp_printf(print, "<socket NULL>");
@@ -124,7 +124,7 @@ STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
     }
 }
 
-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) {
+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);
 
     socket_obj_t *socket = socket_new();
@@ -156,7 +156,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(socket);
 }
 
-STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
     socket_obj_t *socket = self_in;
     socket_check_closed(socket);
 
@@ -168,9 +168,9 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
-STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
+static mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
     socket_obj_t *socket = self_in;
     socket_check_closed(socket);
 
@@ -182,10 +182,10 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
 
 // method socket.listen([backlog])
-STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+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);
 
@@ -200,9 +200,9 @@ 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_VAR_BETWEEN(socket_listen_obj, 1, 2, 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) {
+static mp_obj_t socket_accept(mp_obj_t self_in) {
     socket_obj_t *socket = self_in;
     socket_check_closed(socket);
 
@@ -220,9 +220,9 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
 
     return MP_OBJ_FROM_PTR(client);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
+static MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 
-STATIC mp_uint_t sock_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t sock_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     socket_obj_t *socket = self_in;
     if (socket->ctx == -1) {
         // already closed
@@ -239,7 +239,7 @@ STATIC mp_uint_t sock_write(mp_obj_t self_in, const void *buf, mp_uint_t size, i
     return len;
 }
 
-STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
+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 err = 0;
@@ -249,9 +249,9 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     }
     return mp_obj_new_int_from_uint(len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
 
-STATIC mp_uint_t sock_read(mp_obj_t self_in, void *buf, mp_uint_t max_len, int *errcode) {
+static mp_uint_t sock_read(mp_obj_t self_in, void *buf, mp_uint_t max_len, int *errcode) {
     socket_obj_t *socket = self_in;
     if (socket->ctx == -1) {
         // already closed
@@ -268,7 +268,7 @@ STATIC mp_uint_t sock_read(mp_obj_t self_in, void *buf, mp_uint_t max_len, int *
     return recv_len;
 }
 
-STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     mp_int_t max_len = mp_obj_get_int(len_in);
     vstr_t vstr;
     // +1 to accommodate for trailing \0
@@ -290,22 +290,22 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     vstr.len = len;
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
+static MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
-STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // always 4
     mp_warning(MP_WARN_CAT(RuntimeWarning), "setsockopt() not implemented");
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
+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) {
+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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
 
-STATIC mp_uint_t sock_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t sock_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     socket_obj_t *socket = o_in;
     (void)arg;
     switch (request) {
@@ -327,7 +327,7 @@ STATIC mp_uint_t sock_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int
     }
 }
 
-STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
+static const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { 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) },
@@ -344,15 +344,15 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_makefile), MP_ROM_PTR(&socket_makefile_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
+static MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
-STATIC const mp_stream_p_t socket_stream_p = {
+static const mp_stream_p_t socket_stream_p = {
     .read = sock_read,
     .write = sock_write,
     .ioctl = sock_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
@@ -397,7 +397,7 @@ void dns_resolve_cb(enum dns_resolve_status status, struct dns_addrinfo *info, v
     mp_obj_list_append(state->result, MP_OBJ_FROM_PTR(tuple));
 }
 
-STATIC mp_obj_t mod_getaddrinfo(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     mp_obj_t host_in = args[0], port_in = args[1];
     const char *host = mp_obj_str_get_str(host_in);
     mp_int_t family = 0;
@@ -431,10 +431,10 @@ STATIC mp_obj_t mod_getaddrinfo(size_t n_args, const mp_obj_t *args) {
 
     return state.result;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_getaddrinfo_obj, 2, 3, mod_getaddrinfo);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_getaddrinfo_obj, 2, 3, mod_getaddrinfo);
 
 
-STATIC mp_obj_t pkt_get_info(void) {
+static mp_obj_t pkt_get_info(void) {
     struct k_mem_slab *rx, *tx;
     struct net_buf_pool *rx_data, *tx_data;
     net_pkt_get_info(&rx, &tx, &rx_data, &tx_data);
@@ -445,9 +445,9 @@ STATIC mp_obj_t pkt_get_info(void) {
     t->items[3] = MP_OBJ_NEW_SMALL_INT(tx_data->avail_count);
     return MP_OBJ_FROM_PTR(t);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pkt_get_info_obj, pkt_get_info);
+static MP_DEFINE_CONST_FUN_OBJ_0(pkt_get_info_obj, pkt_get_info);
 
-STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
     // objects
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
@@ -465,7 +465,7 @@ STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_pkt_get_info), MP_ROM_PTR(&pkt_get_info_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
 const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
diff --git a/ports/zephyr/modtime.c b/ports/zephyr/modtime.c
index 65ba1e6e6917c..f1181232ae2df 100644
--- a/ports/zephyr/modtime.c
+++ b/ports/zephyr/modtime.c
@@ -29,7 +29,7 @@
 
 #include "py/obj.h"
 
-STATIC mp_obj_t mp_time_time_get(void) {
+static mp_obj_t mp_time_time_get(void) {
     /* The absence of FP support is deliberate. The Zephyr port uses
      * single precision floats so the fraction component will start to
      * lose precision on devices with a long uptime.
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index f87e2e33f3c78..2e3fc2fecf533 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -37,34 +37,34 @@
 #include "modzephyr.h"
 #include "py/runtime.h"
 
-STATIC mp_obj_t mod_is_preempt_thread(void) {
+static mp_obj_t mod_is_preempt_thread(void) {
     return mp_obj_new_bool(k_is_preempt_thread());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_is_preempt_thread_obj, mod_is_preempt_thread);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_is_preempt_thread_obj, mod_is_preempt_thread);
 
-STATIC mp_obj_t mod_current_tid(void) {
+static mp_obj_t mod_current_tid(void) {
     return MP_OBJ_NEW_SMALL_INT(k_current_get());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_current_tid_obj, mod_current_tid);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_current_tid_obj, mod_current_tid);
 
 #ifdef CONFIG_THREAD_ANALYZER
-STATIC mp_obj_t mod_thread_analyze(void) {
+static mp_obj_t mod_thread_analyze(void) {
     thread_analyzer_print();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_analyze_obj, mod_thread_analyze);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_analyze_obj, mod_thread_analyze);
 #endif
 
 #ifdef CONFIG_SHELL_BACKEND_SERIAL
-STATIC mp_obj_t mod_shell_exec(mp_obj_t cmd_in) {
+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_1(mod_shell_exec_obj, mod_shell_exec);
+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[] = {
+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) },
@@ -82,7 +82,7 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
 
 const mp_obj_module_t mp_module_zephyr = {
     .base = { &mp_type_module },
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 5b55f0ebbaa1e..2a7278a61481e 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -38,7 +38,7 @@ typedef struct _mp_obj_sensor_t {
     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) {
+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 = mp_obj_malloc(mp_obj_sensor_t, type);
     o->dev = device_get_binding(mp_obj_str_get_str(args[0]));
@@ -48,7 +48,7 @@ STATIC mp_obj_t sensor_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t sensor_measure(mp_obj_t self_in) {
+static mp_obj_t sensor_measure(mp_obj_t self_in) {
     mp_obj_sensor_t *self = MP_OBJ_TO_PTR(self_in);
     int st = sensor_sample_fetch(self->dev);
     if (st != 0) {
@@ -58,7 +58,7 @@ STATIC mp_obj_t sensor_measure(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(sensor_measure_obj, sensor_measure);
 
-STATIC void sensor_get_internal(mp_obj_t self_in, mp_obj_t channel_in, struct sensor_value *res) {
+static void sensor_get_internal(mp_obj_t self_in, mp_obj_t channel_in, struct sensor_value *res) {
     mp_obj_sensor_t *self = MP_OBJ_TO_PTR(self_in);
 
     int st = sensor_channel_get(self->dev, mp_obj_get_int(channel_in), res);
@@ -67,35 +67,35 @@ STATIC void sensor_get_internal(mp_obj_t self_in, mp_obj_t channel_in, struct se
     }
 }
 
-STATIC mp_obj_t sensor_get_float(mp_obj_t self_in, mp_obj_t channel_in) {
+static mp_obj_t sensor_get_float(mp_obj_t self_in, mp_obj_t channel_in) {
     struct sensor_value val;
     sensor_get_internal(self_in, channel_in, &val);
     return mp_obj_new_float(val.val1 + (mp_float_t)val.val2 / 1000000);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(sensor_get_float_obj, sensor_get_float);
 
-STATIC mp_obj_t sensor_get_micros(mp_obj_t self_in, mp_obj_t channel_in) {
+static mp_obj_t sensor_get_micros(mp_obj_t self_in, mp_obj_t channel_in) {
     struct sensor_value val;
     sensor_get_internal(self_in, channel_in, &val);
     return MP_OBJ_NEW_SMALL_INT(val.val1 * 1000000 + val.val2);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(sensor_get_micros_obj, sensor_get_micros);
 
-STATIC mp_obj_t sensor_get_millis(mp_obj_t self_in, mp_obj_t channel_in) {
+static mp_obj_t sensor_get_millis(mp_obj_t self_in, mp_obj_t channel_in) {
     struct sensor_value val;
     sensor_get_internal(self_in, channel_in, &val);
     return MP_OBJ_NEW_SMALL_INT(val.val1 * 1000 + val.val2 / 1000);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(sensor_get_millis_obj, sensor_get_millis);
 
-STATIC mp_obj_t sensor_get_int(mp_obj_t self_in, mp_obj_t channel_in) {
+static mp_obj_t sensor_get_int(mp_obj_t self_in, mp_obj_t channel_in) {
     struct sensor_value val;
     sensor_get_internal(self_in, channel_in, &val);
     return MP_OBJ_NEW_SMALL_INT(val.val1);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(sensor_get_int_obj, sensor_get_int);
 
-STATIC const mp_rom_map_elem_t sensor_locals_dict_table[] = {
+static const mp_rom_map_elem_t sensor_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_measure), MP_ROM_PTR(&sensor_measure_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_float), MP_ROM_PTR(&sensor_get_float_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_micros), MP_ROM_PTR(&sensor_get_micros_obj) },
@@ -103,9 +103,9 @@ STATIC const mp_rom_map_elem_t sensor_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_get_int), MP_ROM_PTR(&sensor_get_int_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(sensor_locals_dict, sensor_locals_dict_table);
+static MP_DEFINE_CONST_DICT(sensor_locals_dict, sensor_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     sensor_type,
     MP_QSTR_Sensor,
     MP_TYPE_FLAG_NONE,
@@ -113,7 +113,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &sensor_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zsensor) },
     { MP_ROM_QSTR(MP_QSTR_Sensor), MP_ROM_PTR(&sensor_type) },
 
@@ -136,7 +136,7 @@ STATIC const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
 #undef C
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_zsensor_globals, mp_module_zsensor_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_zsensor_globals, mp_module_zsensor_globals_table);
 
 const mp_obj_module_t mp_module_zsensor = {
     .base = { &mp_type_module },
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 498fea6fb1c8d..af1772205e06c 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -47,12 +47,12 @@ typedef struct _zephyr_disk_access_obj_t {
     int block_count;
 } zephyr_disk_access_obj_t;
 
-STATIC void zephyr_disk_access_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void zephyr_disk_access_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     zephyr_disk_access_obj_t *self = self_in;
     mp_printf(print, "DiskAccess(%s)", self->pdrv);
 }
 
-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) {
+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 = mp_obj_malloc(zephyr_disk_access_obj_t, type);
     self->pdrv = mp_obj_str_get_str(args[0]);
@@ -72,7 +72,7 @@ STATIC mp_obj_t zephyr_disk_access_make_new(const mp_obj_type_t *type, size_t n_
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t zephyr_disk_access_readblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t zephyr_disk_access_readblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
     zephyr_disk_access_obj_t *self = self_in;
     mp_buffer_info_t bufinfo;
     int ret;
@@ -81,9 +81,9 @@ STATIC mp_obj_t zephyr_disk_access_readblocks(mp_obj_t self_in, mp_obj_t block_n
     ret = disk_access_read(self->pdrv, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / self->block_size);
     return MP_OBJ_NEW_SMALL_INT(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(zephyr_disk_access_readblocks_obj, zephyr_disk_access_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_disk_access_readblocks_obj, zephyr_disk_access_readblocks);
 
-STATIC mp_obj_t zephyr_disk_access_writeblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
+static mp_obj_t zephyr_disk_access_writeblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
     zephyr_disk_access_obj_t *self = self_in;
     mp_buffer_info_t bufinfo;
     int ret;
@@ -92,9 +92,9 @@ STATIC mp_obj_t zephyr_disk_access_writeblocks(mp_obj_t self_in, mp_obj_t block_
     ret = disk_access_write(self->pdrv, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / self->block_size);
     return MP_OBJ_NEW_SMALL_INT(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(zephyr_disk_access_writeblocks_obj, zephyr_disk_access_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_disk_access_writeblocks_obj, zephyr_disk_access_writeblocks);
 
-STATIC mp_obj_t zephyr_disk_access_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t zephyr_disk_access_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
     zephyr_disk_access_obj_t *self = self_in;
     mp_int_t cmd = mp_obj_get_int(cmd_in);
     int buf;
@@ -119,14 +119,14 @@ STATIC mp_obj_t zephyr_disk_access_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_o
             return MP_OBJ_NEW_SMALL_INT(-1);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(zephyr_disk_access_ioctl_obj, zephyr_disk_access_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_disk_access_ioctl_obj, zephyr_disk_access_ioctl);
 
-STATIC const mp_rom_map_elem_t zephyr_disk_access_locals_dict_table[] = {
+static const mp_rom_map_elem_t zephyr_disk_access_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&zephyr_disk_access_readblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&zephyr_disk_access_writeblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&zephyr_disk_access_ioctl_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(zephyr_disk_access_locals_dict, zephyr_disk_access_locals_dict_table);
+static MP_DEFINE_CONST_DICT(zephyr_disk_access_locals_dict, zephyr_disk_access_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     zephyr_disk_access_type,
@@ -149,12 +149,12 @@ typedef struct _zephyr_flash_area_obj_t {
     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) {
+static void zephyr_flash_area_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     zephyr_flash_area_obj_t *self = self_in;
     mp_printf(print, "FlashArea(%d)", self->id);
 }
 
-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) {
+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 = mp_obj_malloc(zephyr_flash_area_obj_t, type);
     self->id = mp_obj_get_int(args[0]);
@@ -173,7 +173,7 @@ STATIC mp_obj_t zephyr_flash_area_make_new(const mp_obj_type_t *type, size_t n_a
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t zephyr_flash_area_readblocks(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t zephyr_flash_area_readblocks(size_t n_args, const mp_obj_t *args) {
     zephyr_flash_area_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t block_num = mp_obj_get_int(args[1]);
     off_t offset = block_num * self->block_size;
@@ -188,9 +188,9 @@ STATIC mp_obj_t zephyr_flash_area_readblocks(size_t n_args, const mp_obj_t *args
     ret = flash_area_read(self->area, offset, bufinfo.buf, bufinfo.len);
     return MP_OBJ_NEW_SMALL_INT(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zephyr_flash_area_readblocks_obj, 3, 4, zephyr_flash_area_readblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zephyr_flash_area_readblocks_obj, 3, 4, zephyr_flash_area_readblocks);
 
-STATIC mp_obj_t zephyr_flash_area_writeblocks(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t zephyr_flash_area_writeblocks(size_t n_args, const mp_obj_t *args) {
     zephyr_flash_area_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t block_num = mp_obj_get_int(args[1]);
     off_t offset = block_num * self->block_size;
@@ -210,9 +210,9 @@ STATIC mp_obj_t zephyr_flash_area_writeblocks(size_t n_args, const mp_obj_t *arg
     ret = flash_area_write(self->area, offset, bufinfo.buf, bufinfo.len);
     return MP_OBJ_NEW_SMALL_INT(ret);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zephyr_flash_area_writeblocks_obj, 3, 4, zephyr_flash_area_writeblocks);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zephyr_flash_area_writeblocks_obj, 3, 4, zephyr_flash_area_writeblocks);
 
-STATIC mp_obj_t zephyr_flash_area_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+static mp_obj_t zephyr_flash_area_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
     zephyr_flash_area_obj_t *self = self_in;
     mp_int_t cmd = mp_obj_get_int(cmd_in);
     mp_int_t block_num = mp_obj_get_int(arg_in);
@@ -238,9 +238,9 @@ STATIC mp_obj_t zephyr_flash_area_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_ob
             return MP_OBJ_NEW_SMALL_INT(-1);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(zephyr_flash_area_ioctl_obj, zephyr_flash_area_ioctl);
+static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_flash_area_ioctl_obj, zephyr_flash_area_ioctl);
 
-STATIC const mp_rom_map_elem_t zephyr_flash_area_locals_dict_table[] = {
+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) },
@@ -248,7 +248,7 @@ STATIC const mp_rom_map_elem_t zephyr_flash_area_locals_dict_table[] = {
     { 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);
+static MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     zephyr_flash_area_type,
diff --git a/py/asmarm.c b/py/asmarm.c
index 42724e4d4b37c..cd346949eb0db 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -39,7 +39,7 @@
 #define SIGNED_FIT24(x) (((x) & 0xff800000) == 0) || (((x) & 0xff000000) == 0xff000000)
 
 // Insert word into instruction flow
-STATIC void emit(asm_arm_t *as, uint op) {
+static void emit(asm_arm_t *as, uint op) {
     uint8_t *c = mp_asm_base_get_cur_to_write_bytes(&as->base, 4);
     if (c != NULL) {
         *(uint32_t *)c = op;
@@ -47,73 +47,73 @@ STATIC void emit(asm_arm_t *as, uint op) {
 }
 
 // Insert word into instruction flow, add "ALWAYS" condition code
-STATIC void emit_al(asm_arm_t *as, uint op) {
+static void emit_al(asm_arm_t *as, uint op) {
     emit(as, op | ASM_ARM_CC_AL);
 }
 
 // Basic instructions without condition code
-STATIC uint asm_arm_op_push(uint reglist) {
+static uint asm_arm_op_push(uint reglist) {
     // stmfd sp!, {reglist}
     return 0x92d0000 | (reglist & 0xFFFF);
 }
 
-STATIC uint asm_arm_op_pop(uint reglist) {
+static uint asm_arm_op_pop(uint reglist) {
     // ldmfd sp!, {reglist}
     return 0x8bd0000 | (reglist & 0xFFFF);
 }
 
-STATIC uint asm_arm_op_mov_reg(uint rd, uint rn) {
+static uint asm_arm_op_mov_reg(uint rd, uint rn) {
     // mov rd, rn
     return 0x1a00000 | (rd << 12) | rn;
 }
 
-STATIC uint asm_arm_op_mov_imm(uint rd, uint imm) {
+static uint asm_arm_op_mov_imm(uint rd, uint imm) {
     // mov rd, #imm
     return 0x3a00000 | (rd << 12) | imm;
 }
 
-STATIC uint asm_arm_op_mvn_imm(uint rd, uint imm) {
+static uint asm_arm_op_mvn_imm(uint rd, uint imm) {
     // mvn rd, #imm
     return 0x3e00000 | (rd << 12) | imm;
 }
 
-STATIC uint asm_arm_op_add_imm(uint rd, uint rn, uint imm) {
+static uint asm_arm_op_add_imm(uint rd, uint rn, uint imm) {
     // add rd, rn, #imm
     return 0x2800000 | (rn << 16) | (rd << 12) | (imm & 0xFF);
 }
 
-STATIC uint asm_arm_op_add_reg(uint rd, uint rn, uint rm) {
+static uint asm_arm_op_add_reg(uint rd, uint rn, uint rm) {
     // add rd, rn, rm
     return 0x0800000 | (rn << 16) | (rd << 12) | rm;
 }
 
-STATIC uint asm_arm_op_sub_imm(uint rd, uint rn, uint imm) {
+static uint asm_arm_op_sub_imm(uint rd, uint rn, uint imm) {
     // sub rd, rn, #imm
     return 0x2400000 | (rn << 16) | (rd << 12) | (imm & 0xFF);
 }
 
-STATIC uint asm_arm_op_sub_reg(uint rd, uint rn, uint rm) {
+static uint asm_arm_op_sub_reg(uint rd, uint rn, uint rm) {
     // sub rd, rn, rm
     return 0x0400000 | (rn << 16) | (rd << 12) | rm;
 }
 
-STATIC uint asm_arm_op_mul_reg(uint rd, uint rm, uint rs) {
+static uint asm_arm_op_mul_reg(uint rd, uint rm, uint rs) {
     // mul rd, rm, rs
     assert(rd != rm);
     return 0x0000090 | (rd << 16) | (rs << 8) | rm;
 }
 
-STATIC uint asm_arm_op_and_reg(uint rd, uint rn, uint rm) {
+static uint asm_arm_op_and_reg(uint rd, uint rn, uint rm) {
     // and rd, rn, rm
     return 0x0000000 | (rn << 16) | (rd << 12) | rm;
 }
 
-STATIC uint asm_arm_op_eor_reg(uint rd, uint rn, uint rm) {
+static uint asm_arm_op_eor_reg(uint rd, uint rn, uint rm) {
     // eor rd, rn, rm
     return 0x0200000 | (rn << 16) | (rd << 12) | rm;
 }
 
-STATIC uint asm_arm_op_orr_reg(uint rd, uint rn, uint rm) {
+static uint asm_arm_op_orr_reg(uint rd, uint rn, uint rm) {
     // orr rd, rn, rm
     return 0x1800000 | (rn << 16) | (rd << 12) | rm;
 }
diff --git a/py/asmthumb.c b/py/asmthumb.c
index 395134028aaa9..0df79e5fd6203 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -79,7 +79,7 @@ static inline byte *asm_thumb_get_cur_to_write_bytes(asm_thumb_t *as, int n) {
 }
 
 /*
-STATIC void asm_thumb_write_byte_1(asm_thumb_t *as, byte b1) {
+static void asm_thumb_write_byte_1(asm_thumb_t *as, byte b1) {
     byte *c = asm_thumb_get_cur_to_write_bytes(as, 1);
     c[0] = b1;
 }
@@ -91,7 +91,7 @@ STATIC void asm_thumb_write_byte_1(asm_thumb_t *as, byte b1) {
 #define IMM32_L2(x) (((x) >> 16) & 0xff)
 #define IMM32_L3(x) (((x) >> 24) & 0xff)
 
-STATIC void asm_thumb_write_word32(asm_thumb_t *as, int w32) {
+static void asm_thumb_write_word32(asm_thumb_t *as, int w32) {
     byte *c = asm_thumb_get_cur_to_write_bytes(as, 4);
     c[0] = IMM32_L0(w32);
     c[1] = IMM32_L1(w32);
@@ -216,7 +216,7 @@ void asm_thumb_exit(asm_thumb_t *as) {
     asm_thumb_op16(as, OP_POP_RLIST_PC(as->push_reglist));
 }
 
-STATIC mp_uint_t get_label_dest(asm_thumb_t *as, uint label) {
+static mp_uint_t get_label_dest(asm_thumb_t *as, uint label) {
     assert(label < as->base.max_num_labels);
     return as->base.label_offsets[label];
 }
diff --git a/py/asmx64.c b/py/asmx64.c
index 5c923a523ca54..abddc162696c0 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -123,14 +123,14 @@ static inline byte *asm_x64_get_cur_to_write_bytes(asm_x64_t *as, int n) {
     return mp_asm_base_get_cur_to_write_bytes(&as->base, n);
 }
 
-STATIC void asm_x64_write_byte_1(asm_x64_t *as, byte b1) {
+static void asm_x64_write_byte_1(asm_x64_t *as, byte b1) {
     byte *c = asm_x64_get_cur_to_write_bytes(as, 1);
     if (c != NULL) {
         c[0] = b1;
     }
 }
 
-STATIC void asm_x64_write_byte_2(asm_x64_t *as, byte b1, byte b2) {
+static void asm_x64_write_byte_2(asm_x64_t *as, byte b1, byte b2) {
     byte *c = asm_x64_get_cur_to_write_bytes(as, 2);
     if (c != NULL) {
         c[0] = b1;
@@ -138,7 +138,7 @@ STATIC void asm_x64_write_byte_2(asm_x64_t *as, byte b1, byte b2) {
     }
 }
 
-STATIC void asm_x64_write_byte_3(asm_x64_t *as, byte b1, byte b2, byte b3) {
+static void asm_x64_write_byte_3(asm_x64_t *as, byte b1, byte b2, byte b3) {
     byte *c = asm_x64_get_cur_to_write_bytes(as, 3);
     if (c != NULL) {
         c[0] = b1;
@@ -147,7 +147,7 @@ STATIC void asm_x64_write_byte_3(asm_x64_t *as, byte b1, byte b2, byte b3) {
     }
 }
 
-STATIC void asm_x64_write_word32(asm_x64_t *as, int w32) {
+static void asm_x64_write_word32(asm_x64_t *as, int w32) {
     byte *c = asm_x64_get_cur_to_write_bytes(as, 4);
     if (c != NULL) {
         c[0] = IMM32_L0(w32);
@@ -157,7 +157,7 @@ STATIC void asm_x64_write_word32(asm_x64_t *as, int w32) {
     }
 }
 
-STATIC void asm_x64_write_word64(asm_x64_t *as, int64_t w64) {
+static void asm_x64_write_word64(asm_x64_t *as, int64_t w64) {
     byte *c = asm_x64_get_cur_to_write_bytes(as, 8);
     if (c != NULL) {
         c[0] = IMM32_L0(w64);
@@ -172,7 +172,7 @@ STATIC void asm_x64_write_word64(asm_x64_t *as, int64_t w64) {
 }
 
 /* unused
-STATIC void asm_x64_write_word32_to(asm_x64_t *as, int offset, int w32) {
+static void asm_x64_write_word32_to(asm_x64_t *as, int offset, int w32) {
     byte* c;
     assert(offset + 4 <= as->code_size);
     c = as->code_base + offset;
@@ -183,7 +183,7 @@ STATIC void asm_x64_write_word32_to(asm_x64_t *as, int offset, int w32) {
 }
 */
 
-STATIC void asm_x64_write_r64_disp(asm_x64_t *as, int r64, int disp_r64, int disp_offset) {
+static void asm_x64_write_r64_disp(asm_x64_t *as, int r64, int disp_r64, int disp_offset) {
     uint8_t rm_disp;
     if (disp_offset == 0 && (disp_r64 & 7) != ASM_X64_REG_RBP) {
         rm_disp = MODRM_RM_DISP0;
@@ -204,7 +204,7 @@ STATIC void asm_x64_write_r64_disp(asm_x64_t *as, int r64, int disp_r64, int dis
     }
 }
 
-STATIC void asm_x64_generic_r64_r64(asm_x64_t *as, int dest_r64, int src_r64, int op) {
+static void asm_x64_generic_r64_r64(asm_x64_t *as, int dest_r64, int src_r64, int op) {
     asm_x64_write_byte_3(as, REX_PREFIX | REX_W | REX_R_FROM_R64(src_r64) | REX_B_FROM_R64(dest_r64), op, MODRM_R64(src_r64) | MODRM_RM_REG | MODRM_RM_R64(dest_r64));
 }
 
@@ -243,7 +243,7 @@ void asm_x64_pop_r64(asm_x64_t *as, int dest_r64) {
     }
 }
 
-STATIC void asm_x64_ret(asm_x64_t *as) {
+static void asm_x64_ret(asm_x64_t *as) {
     asm_x64_write_byte_1(as, OPCODE_RET);
 }
 
@@ -317,7 +317,7 @@ void asm_x64_mov_mem64_to_r64(asm_x64_t *as, int src_r64, int src_disp, int dest
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }
 
-STATIC void asm_x64_lea_disp_to_r64(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
+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
     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);
@@ -414,7 +414,7 @@ void asm_x64_sub_i32_from_r32(asm_x64_t *as, int src_i32, int dest_r32) {
 }
 */
 
-STATIC void asm_x64_sub_r64_i32(asm_x64_t *as, int dest_r64, int src_i32) {
+static void asm_x64_sub_r64_i32(asm_x64_t *as, int dest_r64, int src_i32) {
     assert(dest_r64 < 8);
     if (SIGNED_FIT8(src_i32)) {
         // use REX prefix for 64 bit operation
@@ -480,7 +480,7 @@ void asm_x64_jmp_reg(asm_x64_t *as, int src_r64) {
     asm_x64_write_byte_2(as, OPCODE_JMP_RM64, MODRM_R64(4) | MODRM_RM_REG | MODRM_RM_R64(src_r64));
 }
 
-STATIC mp_uint_t get_label_dest(asm_x64_t *as, mp_uint_t label) {
+static mp_uint_t get_label_dest(asm_x64_t *as, mp_uint_t label) {
     assert(label < as->base.max_num_labels);
     return as->base.label_offsets[label];
 }
@@ -560,7 +560,7 @@ void asm_x64_exit(asm_x64_t *as) {
 //  ^                ^
 //  | low address    | high address in RAM
 //
-STATIC int asm_x64_local_offset_from_rsp(asm_x64_t *as, int local_num) {
+static int asm_x64_local_offset_from_rsp(asm_x64_t *as, int local_num) {
     (void)as;
     // Stack is full descending, RSP points to local0
     return local_num * WORD_SIZE;
diff --git a/py/asmx86.c b/py/asmx86.c
index 4b0f8047f6eb7..94e0213d65c0f 100644
--- a/py/asmx86.c
+++ b/py/asmx86.c
@@ -103,14 +103,14 @@
 
 #define SIGNED_FIT8(x) (((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80)
 
-STATIC void asm_x86_write_byte_1(asm_x86_t *as, byte b1) {
+static void asm_x86_write_byte_1(asm_x86_t *as, byte b1) {
     byte *c = mp_asm_base_get_cur_to_write_bytes(&as->base, 1);
     if (c != NULL) {
         c[0] = b1;
     }
 }
 
-STATIC void asm_x86_write_byte_2(asm_x86_t *as, byte b1, byte b2) {
+static void asm_x86_write_byte_2(asm_x86_t *as, byte b1, byte b2) {
     byte *c = mp_asm_base_get_cur_to_write_bytes(&as->base, 2);
     if (c != NULL) {
         c[0] = b1;
@@ -118,7 +118,7 @@ STATIC void asm_x86_write_byte_2(asm_x86_t *as, byte b1, byte b2) {
     }
 }
 
-STATIC void asm_x86_write_byte_3(asm_x86_t *as, byte b1, byte b2, byte b3) {
+static void asm_x86_write_byte_3(asm_x86_t *as, byte b1, byte b2, byte b3) {
     byte *c = mp_asm_base_get_cur_to_write_bytes(&as->base, 3);
     if (c != NULL) {
         c[0] = b1;
@@ -127,7 +127,7 @@ STATIC void asm_x86_write_byte_3(asm_x86_t *as, byte b1, byte b2, byte b3) {
     }
 }
 
-STATIC void asm_x86_write_word32(asm_x86_t *as, int w32) {
+static void asm_x86_write_word32(asm_x86_t *as, int w32) {
     byte *c = mp_asm_base_get_cur_to_write_bytes(&as->base, 4);
     if (c != NULL) {
         c[0] = IMM32_L0(w32);
@@ -137,7 +137,7 @@ STATIC void asm_x86_write_word32(asm_x86_t *as, int w32) {
     }
 }
 
-STATIC void asm_x86_write_r32_disp(asm_x86_t *as, int r32, int disp_r32, int disp_offset) {
+static void asm_x86_write_r32_disp(asm_x86_t *as, int r32, int disp_r32, int disp_offset) {
     uint8_t rm_disp;
     if (disp_offset == 0 && disp_r32 != ASM_X86_REG_EBP) {
         rm_disp = MODRM_RM_DISP0;
@@ -158,17 +158,17 @@ STATIC void asm_x86_write_r32_disp(asm_x86_t *as, int r32, int disp_r32, int dis
     }
 }
 
-STATIC void asm_x86_generic_r32_r32(asm_x86_t *as, int dest_r32, int src_r32, int op) {
+static void asm_x86_generic_r32_r32(asm_x86_t *as, int dest_r32, int src_r32, int op) {
     asm_x86_write_byte_2(as, op, MODRM_R32(src_r32) | MODRM_RM_REG | MODRM_RM_R32(dest_r32));
 }
 
 #if 0
-STATIC void asm_x86_nop(asm_x86_t *as) {
+static void asm_x86_nop(asm_x86_t *as) {
     asm_x86_write_byte_1(as, OPCODE_NOP);
 }
 #endif
 
-STATIC void asm_x86_push_r32(asm_x86_t *as, int src_r32) {
+static void asm_x86_push_r32(asm_x86_t *as, int src_r32) {
     asm_x86_write_byte_1(as, OPCODE_PUSH_R32 | src_r32);
 }
 
@@ -184,11 +184,11 @@ void asm_x86_push_disp(asm_x86_t *as, int src_r32, int src_offset) {
 }
 #endif
 
-STATIC void asm_x86_pop_r32(asm_x86_t *as, int dest_r32) {
+static void asm_x86_pop_r32(asm_x86_t *as, int dest_r32) {
     asm_x86_write_byte_1(as, OPCODE_POP_R32 | dest_r32);
 }
 
-STATIC void asm_x86_ret(asm_x86_t *as) {
+static void asm_x86_ret(asm_x86_t *as) {
     asm_x86_write_byte_1(as, OPCODE_RET);
 }
 
@@ -226,7 +226,7 @@ void asm_x86_mov_mem32_to_r32(asm_x86_t *as, int src_r32, int src_disp, int dest
     asm_x86_write_r32_disp(as, dest_r32, src_r32, src_disp);
 }
 
-STATIC void asm_x86_lea_disp_to_r32(asm_x86_t *as, int src_r32, int src_disp, int dest_r32) {
+static void asm_x86_lea_disp_to_r32(asm_x86_t *as, int src_r32, int src_disp, int dest_r32) {
     asm_x86_write_byte_1(as, OPCODE_LEA_MEM_TO_R32);
     asm_x86_write_r32_disp(as, dest_r32, src_r32, src_disp);
 }
@@ -272,7 +272,7 @@ void asm_x86_add_r32_r32(asm_x86_t *as, int dest_r32, int src_r32) {
     asm_x86_generic_r32_r32(as, dest_r32, src_r32, OPCODE_ADD_R32_TO_RM32);
 }
 
-STATIC void asm_x86_add_i32_to_r32(asm_x86_t *as, int src_i32, int dest_r32) {
+static void asm_x86_add_i32_to_r32(asm_x86_t *as, int src_i32, int dest_r32) {
     if (SIGNED_FIT8(src_i32)) {
         asm_x86_write_byte_2(as, OPCODE_ADD_I8_TO_RM32, MODRM_R32(0) | MODRM_RM_REG | MODRM_RM_R32(dest_r32));
         asm_x86_write_byte_1(as, src_i32 & 0xff);
@@ -286,7 +286,7 @@ void asm_x86_sub_r32_r32(asm_x86_t *as, int dest_r32, int src_r32) {
     asm_x86_generic_r32_r32(as, dest_r32, src_r32, OPCODE_SUB_R32_FROM_RM32);
 }
 
-STATIC void asm_x86_sub_r32_i32(asm_x86_t *as, int dest_r32, int src_i32) {
+static void asm_x86_sub_r32_i32(asm_x86_t *as, int dest_r32, int src_i32) {
     if (SIGNED_FIT8(src_i32)) {
         // defaults to 32 bit operation
         asm_x86_write_byte_2(as, OPCODE_SUB_I8_FROM_RM32, MODRM_R32(5) | MODRM_RM_REG | MODRM_RM_R32(dest_r32));
@@ -353,7 +353,7 @@ void asm_x86_jmp_reg(asm_x86_t *as, int src_r32) {
     asm_x86_write_byte_2(as, OPCODE_JMP_RM32, MODRM_R32(4) | MODRM_RM_REG | MODRM_RM_R32(src_r32));
 }
 
-STATIC mp_uint_t get_label_dest(asm_x86_t *as, mp_uint_t label) {
+static mp_uint_t get_label_dest(asm_x86_t *as, mp_uint_t label) {
     assert(label < as->base.max_num_labels);
     return as->base.label_offsets[label];
 }
@@ -422,7 +422,7 @@ void asm_x86_exit(asm_x86_t *as) {
     asm_x86_ret(as);
 }
 
-STATIC int asm_x86_arg_offset_from_esp(asm_x86_t *as, size_t arg_num) {
+static int asm_x86_arg_offset_from_esp(asm_x86_t *as, size_t arg_num) {
     // Above esp are: locals, 4 saved registers, return eip, arguments
     return (as->num_locals + 4 + 1 + arg_num) * WORD_SIZE;
 }
@@ -454,7 +454,7 @@ void asm_x86_mov_r32_to_arg(asm_x86_t *as, int src_r32, int dest_arg_num) {
 //  ^                ^
 //  | low address    | high address in RAM
 //
-STATIC int asm_x86_local_offset_from_esp(asm_x86_t *as, int local_num) {
+static int asm_x86_local_offset_from_esp(asm_x86_t *as, int local_num) {
     (void)as;
     // Stack is full descending, ESP points to local0
     return local_num * WORD_SIZE;
diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 8ac914ec412a4..84018402f69e9 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -117,7 +117,7 @@ void asm_xtensa_exit_win(asm_xtensa_t *as) {
     asm_xtensa_op_retw_n(as);
 }
 
-STATIC uint32_t get_label_dest(asm_xtensa_t *as, uint label) {
+static uint32_t get_label_dest(asm_xtensa_t *as, uint label) {
     assert(label < as->base.max_num_labels);
     return as->base.label_offsets[label];
 }
diff --git a/py/bc.c b/py/bc.c
index dc70fddf2bca7..899dbd6a0727d 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -88,7 +88,7 @@ const byte *mp_decode_uint_skip(const byte *ptr) {
     return ptr;
 }
 
-STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected, size_t given) {
+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
     (void)f;
@@ -107,7 +107,7 @@ STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected,
 }
 
 #if DEBUG_PRINT
-STATIC void dump_args(const mp_obj_t *a, size_t sz) {
+static void dump_args(const mp_obj_t *a, size_t sz) {
     DEBUG_printf("%p: ", a);
     for (size_t i = 0; i < sz; i++) {
         DEBUG_printf("%p ", a[i]);
@@ -124,7 +124,7 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
 //    - 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
-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) {
+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.
 
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 7737e67f2cd22..e25cbd4d08502 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -38,13 +38,13 @@ typedef struct _mp_obj_code_t {
     mp_obj_t module_fun;
 } mp_obj_code_t;
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_code,
     MP_QSTR_code,
     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) {
+static mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj_dict_t *locals) {
     // save context
     nlr_jump_callback_node_globals_locals_t ctx;
     ctx.globals = mp_globals_get();
@@ -78,7 +78,7 @@ STATIC mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj
     return ret;
 }
 
-STATIC mp_obj_t mp_builtin_compile(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_compile(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
 
     // get the source
@@ -118,7 +118,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_compile_obj, 3, 6, mp_builtin_com
 
 #if MICROPY_PY_BUILTINS_EVAL_EXEC
 
-STATIC mp_obj_t eval_exec_helper(size_t n_args, const mp_obj_t *args, mp_parse_input_kind_t parse_input_kind) {
+static mp_obj_t eval_exec_helper(size_t n_args, const mp_obj_t *args, mp_parse_input_kind_t parse_input_kind) {
     // work out the context
     mp_obj_dict_t *globals = mp_globals_get();
     mp_obj_dict_t *locals = mp_locals_get();
@@ -158,12 +158,12 @@ STATIC mp_obj_t eval_exec_helper(size_t n_args, const mp_obj_t *args, mp_parse_i
     return mp_parse_compile_execute(lex, parse_input_kind, globals, locals);
 }
 
-STATIC mp_obj_t mp_builtin_eval(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_eval(size_t n_args, const mp_obj_t *args) {
     return eval_exec_helper(n_args, args, MP_PARSE_EVAL_INPUT);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_eval_obj, 1, 3, mp_builtin_eval);
 
-STATIC mp_obj_t mp_builtin_exec(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_exec(size_t n_args, const mp_obj_t *args) {
     return eval_exec_helper(n_args, args, MP_PARSE_FILE_INPUT);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_exec_obj, 1, 3, mp_builtin_exec);
@@ -171,7 +171,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_exec_obj, 1, 3, mp_builtin_exec);
 #endif // MICROPY_PY_BUILTINS_EVAL_EXEC
 
 #if MICROPY_PY_BUILTINS_EXECFILE
-STATIC mp_obj_t mp_builtin_execfile(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_execfile(size_t n_args, const mp_obj_t *args) {
     // MP_PARSE_SINGLE_INPUT is used to indicate a file input
     return eval_exec_helper(n_args, args, MP_PARSE_SINGLE_INPUT);
 }
diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index 9bd56cca0962e..a3fcc4dfb77c6 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -47,7 +47,7 @@ const char mp_help_default_text[] =
     "For further help on a specific object, type help(obj)\n"
 ;
 
-STATIC void mp_help_print_info_about_object(mp_obj_t name_o, mp_obj_t value) {
+static void mp_help_print_info_about_object(mp_obj_t name_o, mp_obj_t value) {
     mp_print_str(MP_PYTHON_PRINTER, "  ");
     mp_obj_print(name_o, PRINT_STR);
     mp_print_str(MP_PYTHON_PRINTER, " -- ");
@@ -56,7 +56,7 @@ STATIC void mp_help_print_info_about_object(mp_obj_t name_o, mp_obj_t value) {
 }
 
 #if MICROPY_PY_BUILTINS_HELP_MODULES
-STATIC void mp_help_add_from_map(mp_obj_t list, const mp_map_t *map) {
+static void mp_help_add_from_map(mp_obj_t list, const mp_map_t *map) {
     for (size_t i = 0; i < map->alloc; i++) {
         if (mp_map_slot_is_filled(map, i)) {
             mp_obj_list_append(list, map->table[i].key);
@@ -65,7 +65,7 @@ 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) {
+static void mp_help_add_from_names(mp_obj_t list, const char *name) {
     while (*name) {
         size_t len = strlen(name);
         // name should end in '.py' and we strip it off
@@ -75,7 +75,7 @@ STATIC void mp_help_add_from_names(mp_obj_t list, const char *name) {
 }
 #endif
 
-STATIC void mp_help_print_modules(void) {
+static void mp_help_print_modules(void) {
     mp_obj_t list = mp_obj_new_list(0, NULL);
 
     mp_help_add_from_map(list, &mp_builtin_module_map);
@@ -122,7 +122,7 @@ STATIC void mp_help_print_modules(void) {
 }
 #endif
 
-STATIC void mp_help_print_obj(const mp_obj_t obj) {
+static void mp_help_print_obj(const mp_obj_t obj) {
     #if MICROPY_PY_BUILTINS_HELP_MODULES
     if (obj == MP_OBJ_NEW_QSTR(MP_QSTR_modules)) {
         mp_help_print_modules();
@@ -158,7 +158,7 @@ STATIC void mp_help_print_obj(const mp_obj_t obj) {
     }
 }
 
-STATIC mp_obj_t mp_builtin_help(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_help(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // print a general help message
         mp_print_str(MP_PYTHON_PRINTER, MICROPY_PY_BUILTINS_HELP_TEXT);
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 002a5cb853529..0611926fdd52a 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -57,7 +57,7 @@
 // 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(vstr_t *path) {
+static mp_import_stat_t stat_path(vstr_t *path) {
     const char *str = vstr_null_terminated_str(path);
     #if MICROPY_MODULE_FROZEN
     // Only try and load as a frozen module if it starts with .frozen/.
@@ -75,7 +75,7 @@ STATIC mp_import_stat_t stat_path(vstr_t *path) {
 // argument. This is the logic that makes .py files take precedent over .mpy
 // files. This uses stat_path above, rather than mp_import_stat directly, so
 // that the .frozen path prefix is handled.
-STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
+static mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
     mp_import_stat_t stat = stat_path(path);
     if (stat == MP_IMPORT_STAT_FILE) {
         return stat;
@@ -99,7 +99,7 @@ STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
 // or "foo/bar.(m)py" in either the filesystem or frozen modules. If the
 // result is a file, the path argument will be updated to include the file
 // extension.
-STATIC mp_import_stat_t stat_module(vstr_t *path) {
+static mp_import_stat_t stat_module(vstr_t *path) {
     mp_import_stat_t stat = stat_path(path);
     DEBUG_printf("stat %s: %d\n", vstr_str(path), stat);
     if (stat == MP_IMPORT_STAT_DIR) {
@@ -114,7 +114,7 @@ STATIC mp_import_stat_t stat_module(vstr_t *path) {
 // Given a top-level module name, try and find it in each of the sys.path
 // entries. Note: On success, the dest argument will be updated to the matching
 // path (i.e. "<entry>/mod_name(.py)").
-STATIC mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
+static mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
     DEBUG_printf("stat_top_level: '%s'\n", qstr_str(mod_name));
     #if MICROPY_PY_SYS
     size_t path_num;
@@ -152,7 +152,7 @@ STATIC mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
 }
 
 #if MICROPY_MODULE_FROZEN_STR || MICROPY_ENABLE_COMPILER
-STATIC void do_load_from_lexer(mp_module_context_t *context, 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(MP_OBJ_FROM_PTR(&context->module), MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
@@ -165,7 +165,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_proto_fun(const mp_module_context_t *context, mp_proto_fun_t proto_fun, qstr source_name) {
+static void do_execute_proto_fun(const mp_module_context_t *context, mp_proto_fun_t proto_fun, qstr source_name) {
     #if MICROPY_PY___FILE__
     mp_store_attr(MP_OBJ_FROM_PTR(&context->module), MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
     #else
@@ -196,7 +196,7 @@ STATIC void do_execute_proto_fun(const mp_module_context_t *context, mp_proto_fu
 }
 #endif
 
-STATIC void do_load(mp_module_context_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
@@ -267,7 +267,7 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
 
 // 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) {
+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.
@@ -350,7 +350,7 @@ typedef struct _nlr_jump_callback_node_unregister_module_t {
     qstr name;
 } nlr_jump_callback_node_unregister_module_t;
 
-STATIC void unregister_module_from_nlr_jump_callback(void *ctx_in) {
+static void unregister_module_from_nlr_jump_callback(void *ctx_in) {
     nlr_jump_callback_node_unregister_module_t *ctx = ctx_in;
     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(ctx->name), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
@@ -363,7 +363,7 @@ STATIC void unregister_module_from_nlr_jump_callback(void *ctx_in) {
 //                   attribute on it) (or MP_OBJ_NULL for top-level).
 // 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, bool override_main) {
+static mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name, mp_obj_t outer_module_obj, bool override_main) {
     // Immediately return if the module at this level is already loaded.
     mp_map_elem_t *elem;
 
diff --git a/py/compile.c b/py/compile.c
index fe7ad6e13c307..7a359e662e731 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -90,7 +90,7 @@ typedef enum {
 #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])
 
-STATIC const emit_method_table_t *emit_native_table[] = {
+static const emit_method_table_t *emit_native_table[] = {
     NULL,
     &emit_native_x86_method_table,
     &emit_native_x64_method_table,
@@ -129,7 +129,7 @@ STATIC const emit_method_table_t *emit_native_table[] = {
 #define ASM_EMITTER(f) emit_asm_table[mp_dynamic_compiler.native_arch]->asm_##f
 #define ASM_EMITTER_TABLE emit_asm_table[mp_dynamic_compiler.native_arch]
 
-STATIC const emit_inline_asm_method_table_t *emit_asm_table[] = {
+static const emit_inline_asm_method_table_t *emit_asm_table[] = {
     NULL,
     NULL,
     NULL,
@@ -200,7 +200,7 @@ typedef struct _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) {
+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);
 
@@ -211,7 +211,7 @@ STATIC void mp_emit_common_init(mp_emit_common_t *emit, qstr source_file) {
     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) {
+static void mp_emit_common_start_pass(mp_emit_common_t *emit, pass_kind_t pass) {
     emit->pass = pass;
     if (pass == MP_PASS_CODE_SIZE) {
         if (emit->ct_cur_child == 0) {
@@ -223,7 +223,7 @@ 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_populate_module_context(mp_emit_common_t *emit, qstr source_file, mp_module_context_t *context) {
+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->const_obj_list.len);
@@ -246,14 +246,14 @@ STATIC void mp_emit_common_populate_module_context(mp_emit_common_t *emit, qstr
 
 /******************************************************************************/
 
-STATIC void compile_error_set_line(compiler_t *comp, mp_parse_node_t pn) {
+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)) {
         comp->compile_error_line = ((mp_parse_node_struct_t *)pn)->source_line;
     }
 }
 
-STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, mp_rom_error_text_t msg) {
+static void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, mp_rom_error_text_t msg) {
     // only register the error if there has been no other error
     if (comp->compile_error == MP_OBJ_NULL) {
         comp->compile_error = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg);
@@ -261,17 +261,17 @@ STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, mp_rom_er
     }
 }
 
-STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_arglist, bool is_method_call, int n_positional_extra);
-STATIC void compile_comprehension(compiler_t *comp, mp_parse_node_struct_t *pns, scope_kind_t kind);
-STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *pns, bool create_map);
-STATIC void compile_node(compiler_t *comp, mp_parse_node_t pn);
+static void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_arglist, bool is_method_call, int n_positional_extra);
+static void compile_comprehension(compiler_t *comp, mp_parse_node_struct_t *pns, scope_kind_t kind);
+static void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *pns, bool create_map);
+static void compile_node(compiler_t *comp, mp_parse_node_t pn);
 
-STATIC uint comp_next_label(compiler_t *comp) {
+static uint comp_next_label(compiler_t *comp) {
     return comp->next_label++;
 }
 
 #if MICROPY_EMIT_NATIVE
-STATIC void reserve_labels_for_native(compiler_t *comp, int n) {
+static void reserve_labels_for_native(compiler_t *comp, int n) {
     if (comp->scope_cur->emit_options != MP_EMIT_OPT_BYTECODE) {
         comp->next_label += n;
     }
@@ -280,7 +280,7 @@ STATIC void reserve_labels_for_native(compiler_t *comp, int n) {
 #define reserve_labels_for_native(comp, n)
 #endif
 
-STATIC void compile_increase_except_level(compiler_t *comp, uint label, int kind) {
+static void compile_increase_except_level(compiler_t *comp, uint label, int kind) {
     EMIT_ARG(setup_block, label, kind);
     comp->cur_except_level += 1;
     if (comp->cur_except_level > comp->scope_cur->exc_stack_size) {
@@ -288,14 +288,14 @@ STATIC void compile_increase_except_level(compiler_t *comp, uint label, int kind
     }
 }
 
-STATIC void compile_decrease_except_level(compiler_t *comp) {
+static void compile_decrease_except_level(compiler_t *comp) {
     assert(comp->cur_except_level > 0);
     comp->cur_except_level -= 1;
     EMIT(end_finally);
     reserve_labels_for_native(comp, 1);
 }
 
-STATIC scope_t *scope_new_and_link(compiler_t *comp, scope_kind_t kind, mp_parse_node_t pn, uint emit_options) {
+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, emit_options);
     scope->parent = comp->scope_cur;
     scope->next = NULL;
@@ -313,7 +313,7 @@ STATIC scope_t *scope_new_and_link(compiler_t *comp, scope_kind_t kind, mp_parse
 
 typedef void (*apply_list_fun_t)(compiler_t *comp, mp_parse_node_t pn);
 
-STATIC void apply_to_single_or_list(compiler_t *comp, mp_parse_node_t pn, pn_kind_t pn_list_kind, apply_list_fun_t f) {
+static void apply_to_single_or_list(compiler_t *comp, mp_parse_node_t pn, pn_kind_t pn_list_kind, apply_list_fun_t f) {
     if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, pn_list_kind)) {
         mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
         int num_nodes = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
@@ -325,7 +325,7 @@ STATIC void apply_to_single_or_list(compiler_t *comp, mp_parse_node_t pn, pn_kin
     }
 }
 
-STATIC void compile_generic_all_nodes(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_generic_all_nodes(compiler_t *comp, mp_parse_node_struct_t *pns) {
     int num_nodes = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
     for (int i = 0; i < num_nodes; i++) {
         compile_node(comp, pns->nodes[i]);
@@ -337,7 +337,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) {
+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 {
@@ -349,7 +349,7 @@ STATIC void compile_load_id(compiler_t *comp, qstr qst) {
     }
 }
 
-STATIC void compile_store_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 {
@@ -361,7 +361,7 @@ STATIC void compile_store_id(compiler_t *comp, qstr qst) {
     }
 }
 
-STATIC void compile_delete_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 {
@@ -373,7 +373,7 @@ STATIC void compile_delete_id(compiler_t *comp, qstr qst) {
     }
 }
 
-STATIC void compile_generic_tuple(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_generic_tuple(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // a simple tuple expression
     size_t num_nodes = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
     for (size_t i = 0; i < num_nodes; i++) {
@@ -382,7 +382,7 @@ STATIC void compile_generic_tuple(compiler_t *comp, mp_parse_node_struct_t *pns)
     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) {
+static void c_if_cond(compiler_t *comp, mp_parse_node_t pn, bool jump_if, int label) {
     if (mp_parse_node_is_const_false(pn)) {
         if (jump_if == false) {
             EMIT_ARG(jump, label);
@@ -430,9 +430,9 @@ STATIC void c_if_cond(compiler_t *comp, mp_parse_node_t pn, bool jump_if, int la
 }
 
 typedef enum { ASSIGN_STORE, ASSIGN_AUG_LOAD, ASSIGN_AUG_STORE } assign_kind_t;
-STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t kind);
+static void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t kind);
 
-STATIC void c_assign_atom_expr(compiler_t *comp, mp_parse_node_struct_t *pns, assign_kind_t assign_kind) {
+static void c_assign_atom_expr(compiler_t *comp, mp_parse_node_struct_t *pns, assign_kind_t assign_kind) {
     if (assign_kind != ASSIGN_AUG_STORE) {
         compile_node(comp, pns->nodes[0]);
     }
@@ -481,7 +481,7 @@ 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"));
 }
 
-STATIC void c_assign_tuple(compiler_t *comp, uint num_tail, mp_parse_node_t *nodes_tail) {
+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;
     for (uint i = 0; i < num_tail; i++) {
@@ -508,7 +508,7 @@ STATIC void c_assign_tuple(compiler_t *comp, uint num_tail, mp_parse_node_t *nod
 }
 
 // assigns top of stack to pn
-STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_kind) {
+static void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_kind) {
     assert(!MP_PARSE_NODE_IS_NULL(pn));
     if (MP_PARSE_NODE_IS_LEAF(pn)) {
         if (MP_PARSE_NODE_IS_ID(pn)) {
@@ -599,7 +599,7 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
 //  if n_pos_defaults > 0 then there is a tuple on the stack with the positional defaults
 //  if n_kw_defaults > 0 then there is a dictionary on the stack with the keyword defaults
 //  if both exist, the tuple is above the dictionary (ie the first pop gets the tuple)
-STATIC void close_over_variables_etc(compiler_t *comp, scope_t *this_scope, int n_pos_defaults, int n_kw_defaults) {
+static void close_over_variables_etc(compiler_t *comp, scope_t *this_scope, int n_pos_defaults, int n_kw_defaults) {
     assert(n_pos_defaults >= 0);
     assert(n_kw_defaults >= 0);
 
@@ -641,7 +641,7 @@ STATIC void close_over_variables_etc(compiler_t *comp, scope_t *this_scope, int
     }
 }
 
-STATIC void compile_funcdef_lambdef_param(compiler_t *comp, mp_parse_node_t pn) {
+static void compile_funcdef_lambdef_param(compiler_t *comp, mp_parse_node_t pn) {
     // For efficiency of the code below we extract the parse-node kind here
     int pn_kind;
     if (MP_PARSE_NODE_IS_ID(pn)) {
@@ -732,7 +732,7 @@ STATIC void compile_funcdef_lambdef_param(compiler_t *comp, mp_parse_node_t pn)
     }
 }
 
-STATIC void compile_funcdef_lambdef(compiler_t *comp, scope_t *scope, mp_parse_node_t pn_params, pn_kind_t pn_list_kind) {
+static void compile_funcdef_lambdef(compiler_t *comp, scope_t *scope, mp_parse_node_t pn_params, pn_kind_t pn_list_kind) {
     // When we call compile_funcdef_lambdef_param below it can compile an arbitrary
     // expression for default arguments, which may contain a lambda.  The lambda will
     // call here in a nested way, so we must save and restore the relevant state.
@@ -768,7 +768,7 @@ STATIC void compile_funcdef_lambdef(compiler_t *comp, scope_t *scope, mp_parse_n
 
 // leaves function object on stack
 // returns function name
-STATIC qstr compile_funcdef_helper(compiler_t *comp, mp_parse_node_struct_t *pns, uint emit_options) {
+static qstr compile_funcdef_helper(compiler_t *comp, mp_parse_node_struct_t *pns, uint emit_options) {
     if (comp->pass == MP_PASS_SCOPE) {
         // create a new scope for this function
         scope_t *s = scope_new_and_link(comp, SCOPE_FUNCTION, (mp_parse_node_t)pns, emit_options);
@@ -788,7 +788,7 @@ STATIC qstr compile_funcdef_helper(compiler_t *comp, mp_parse_node_struct_t *pns
 
 // leaves class object on stack
 // returns class name
-STATIC qstr compile_classdef_helper(compiler_t *comp, mp_parse_node_struct_t *pns, uint emit_options) {
+static qstr compile_classdef_helper(compiler_t *comp, mp_parse_node_struct_t *pns, uint emit_options) {
     if (comp->pass == MP_PASS_SCOPE) {
         // create a new scope for this class
         scope_t *s = scope_new_and_link(comp, SCOPE_CLASS, (mp_parse_node_t)pns, emit_options);
@@ -820,7 +820,7 @@ STATIC qstr compile_classdef_helper(compiler_t *comp, mp_parse_node_struct_t *pn
 }
 
 // returns true if it was a built-in decorator (even if the built-in had an error)
-STATIC bool compile_built_in_decorator(compiler_t *comp, size_t name_len, mp_parse_node_t *name_nodes, uint *emit_options) {
+static bool compile_built_in_decorator(compiler_t *comp, size_t name_len, mp_parse_node_t *name_nodes, uint *emit_options) {
     if (MP_PARSE_NODE_LEAF_ARG(name_nodes[0]) != MP_QSTR_micropython) {
         return false;
     }
@@ -869,7 +869,7 @@ STATIC bool compile_built_in_decorator(compiler_t *comp, size_t name_len, mp_par
     return true;
 }
 
-STATIC void compile_decorated(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_decorated(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // get the list of decorators
     mp_parse_node_t *nodes;
     size_t n = mp_parse_node_extract_list(&pns->nodes[0], PN_decorators, &nodes);
@@ -937,13 +937,13 @@ STATIC void compile_decorated(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_store_id(comp, body_name);
 }
 
-STATIC void compile_funcdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_funcdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
     qstr fname = compile_funcdef_helper(comp, pns, comp->scope_cur->emit_options);
     // store function object into function name
     compile_store_id(comp, fname);
 }
 
-STATIC void c_del_stmt(compiler_t *comp, mp_parse_node_t pn) {
+static void c_del_stmt(compiler_t *comp, mp_parse_node_t pn) {
     if (MP_PARSE_NODE_IS_ID(pn)) {
         compile_delete_id(comp, MP_PARSE_NODE_LEAF_ARG(pn));
     } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, PN_atom_expr_normal)) {
@@ -999,11 +999,11 @@ STATIC void c_del_stmt(compiler_t *comp, mp_parse_node_t pn) {
     compile_syntax_error(comp, (mp_parse_node_t)pn, MP_ERROR_TEXT("can't delete expression"));
 }
 
-STATIC void compile_del_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_del_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     apply_to_single_or_list(comp, pns->nodes[0], PN_exprlist, c_del_stmt);
 }
 
-STATIC void compile_break_cont_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_break_cont_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     uint16_t label;
     if (MP_PARSE_NODE_STRUCT_KIND(pns) == PN_break_stmt) {
         label = comp->break_label;
@@ -1017,7 +1017,7 @@ STATIC void compile_break_cont_stmt(compiler_t *comp, mp_parse_node_struct_t *pn
     EMIT_ARG(unwind_jump, label, comp->cur_except_level - comp->break_continue_except_level);
 }
 
-STATIC void compile_return_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_return_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     #if MICROPY_CPYTHON_COMPAT
     if (comp->scope_cur->kind != SCOPE_FUNCTION) {
         compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("'return' outside function"));
@@ -1045,12 +1045,12 @@ STATIC void compile_return_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     EMIT(return_value);
 }
 
-STATIC void compile_yield_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_yield_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_node(comp, pns->nodes[0]);
     EMIT(pop_top);
 }
 
-STATIC void compile_raise_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_raise_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (MP_PARSE_NODE_IS_NULL(pns->nodes[0])) {
         // raise
         EMIT_ARG(raise_varargs, 0);
@@ -1070,7 +1070,7 @@ STATIC void compile_raise_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
 // q_base holds the base of the name
 // eg   a -> q_base=a
 //      a.b.c -> q_base=a
-STATIC void do_import_name(compiler_t *comp, mp_parse_node_t pn, qstr *q_base) {
+static void do_import_name(compiler_t *comp, mp_parse_node_t pn, qstr *q_base) {
     bool is_as = false;
     if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, PN_dotted_as_name)) {
         mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
@@ -1131,7 +1131,7 @@ STATIC void do_import_name(compiler_t *comp, mp_parse_node_t pn, qstr *q_base) {
     }
 }
 
-STATIC void compile_dotted_as_name(compiler_t *comp, mp_parse_node_t pn) {
+static void compile_dotted_as_name(compiler_t *comp, mp_parse_node_t pn) {
     EMIT_ARG(load_const_small_int, 0); // level 0 import
     EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE); // not importing from anything
     qstr q_base;
@@ -1139,11 +1139,11 @@ STATIC void compile_dotted_as_name(compiler_t *comp, mp_parse_node_t pn) {
     compile_store_id(comp, q_base);
 }
 
-STATIC void compile_import_name(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_import_name(compiler_t *comp, mp_parse_node_struct_t *pns) {
     apply_to_single_or_list(comp, pns->nodes[0], PN_dotted_as_names, compile_dotted_as_name);
 }
 
-STATIC void compile_import_from(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_import_from(compiler_t *comp, mp_parse_node_struct_t *pns) {
     mp_parse_node_t pn_import_source = pns->nodes[0];
 
     // extract the preceding .'s (if any) for a relative import, to compute the import level
@@ -1231,7 +1231,7 @@ STATIC void compile_import_from(compiler_t *comp, mp_parse_node_struct_t *pns) {
     }
 }
 
-STATIC void compile_declare_global(compiler_t *comp, mp_parse_node_t pn, id_info_t *id_info) {
+static void compile_declare_global(compiler_t *comp, mp_parse_node_t pn, id_info_t *id_info) {
     if (id_info->kind != ID_INFO_KIND_UNDECIDED && id_info->kind != ID_INFO_KIND_GLOBAL_EXPLICIT) {
         compile_syntax_error(comp, pn, MP_ERROR_TEXT("identifier redefined as global"));
         return;
@@ -1245,7 +1245,7 @@ STATIC void compile_declare_global(compiler_t *comp, mp_parse_node_t pn, id_info
     }
 }
 
-STATIC void compile_declare_nonlocal(compiler_t *comp, mp_parse_node_t pn, id_info_t *id_info) {
+static void compile_declare_nonlocal(compiler_t *comp, mp_parse_node_t pn, id_info_t *id_info) {
     if (id_info->kind == ID_INFO_KIND_UNDECIDED) {
         id_info->kind = ID_INFO_KIND_GLOBAL_IMPLICIT;
         scope_check_to_close_over(comp->scope_cur, id_info);
@@ -1257,7 +1257,7 @@ STATIC void compile_declare_nonlocal(compiler_t *comp, mp_parse_node_t pn, id_in
     }
 }
 
-STATIC void compile_declare_global_or_nonlocal(compiler_t *comp, mp_parse_node_t pn, id_info_t *id_info, bool is_global) {
+static void compile_declare_global_or_nonlocal(compiler_t *comp, mp_parse_node_t pn, id_info_t *id_info, bool is_global) {
     if (is_global) {
         compile_declare_global(comp, pn, id_info);
     } else {
@@ -1265,7 +1265,7 @@ STATIC void compile_declare_global_or_nonlocal(compiler_t *comp, mp_parse_node_t
     }
 }
 
-STATIC void compile_global_nonlocal_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_global_nonlocal_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (comp->pass == MP_PASS_SCOPE) {
         bool is_global = MP_PARSE_NODE_STRUCT_KIND(pns) == PN_global_stmt;
 
@@ -1284,7 +1284,7 @@ STATIC void compile_global_nonlocal_stmt(compiler_t *comp, mp_parse_node_struct_
     }
 }
 
-STATIC void compile_assert_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_assert_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // with optimisations enabled we don't compile assertions
     if (MP_STATE_VM(mp_optimise_value) != 0) {
         return;
@@ -1302,7 +1302,7 @@ STATIC void compile_assert_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     EMIT_ARG(label_assign, l_end);
 }
 
-STATIC void compile_if_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_if_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     uint l_end = comp_next_label(comp);
 
     // optimisation: don't emit anything when "if False"
@@ -1372,7 +1372,7 @@ STATIC void compile_if_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     comp->continue_label = old_continue_label; \
     comp->break_continue_except_level = old_break_continue_except_level;
 
-STATIC void compile_while_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_while_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     START_BREAK_CONTINUE_BLOCK
 
     if (!mp_parse_node_is_const_false(pns->nodes[0])) { // optimisation: don't emit anything for "while False"
@@ -1410,7 +1410,7 @@ STATIC void compile_while_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
 // If <end> is a small-int, then the stack during the for-loop contains just
 // the current value of <var>.  Otherwise, the stack contains <end> then the
 // current value of <var>.
-STATIC void compile_for_stmt_optimised_range(compiler_t *comp, mp_parse_node_t pn_var, mp_parse_node_t pn_start, mp_parse_node_t pn_end, mp_parse_node_t pn_step, mp_parse_node_t pn_body, mp_parse_node_t pn_else) {
+static void compile_for_stmt_optimised_range(compiler_t *comp, mp_parse_node_t pn_var, mp_parse_node_t pn_start, mp_parse_node_t pn_end, mp_parse_node_t pn_step, mp_parse_node_t pn_body, mp_parse_node_t pn_else) {
     START_BREAK_CONTINUE_BLOCK
 
     uint top_label = comp_next_label(comp);
@@ -1492,7 +1492,7 @@ STATIC void compile_for_stmt_optimised_range(compiler_t *comp, mp_parse_node_t p
     }
 }
 
-STATIC void compile_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // this bit optimises: for <x> in range(...), turning it into an explicitly incremented variable
     // this is actually slower, but uses no heap memory
     // for viper it will be much, much faster
@@ -1572,7 +1572,7 @@ STATIC void compile_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     EMIT_ARG(label_assign, break_label);
 }
 
-STATIC void compile_try_except(compiler_t *comp, mp_parse_node_t pn_body, int n_except, mp_parse_node_t *pn_excepts, mp_parse_node_t pn_else) {
+static void compile_try_except(compiler_t *comp, mp_parse_node_t pn_body, int n_except, mp_parse_node_t *pn_excepts, mp_parse_node_t pn_else) {
     // setup code
     uint l1 = comp_next_label(comp);
     uint success_label = comp_next_label(comp);
@@ -1669,7 +1669,7 @@ STATIC void compile_try_except(compiler_t *comp, mp_parse_node_t pn_body, int n_
     EMIT_ARG(label_assign, l2);
 }
 
-STATIC void compile_try_finally(compiler_t *comp, mp_parse_node_t pn_body, int n_except, mp_parse_node_t *pn_except, mp_parse_node_t pn_else, mp_parse_node_t pn_finally) {
+static void compile_try_finally(compiler_t *comp, mp_parse_node_t pn_body, int n_except, mp_parse_node_t *pn_except, mp_parse_node_t pn_else, mp_parse_node_t pn_finally) {
     uint l_finally_block = comp_next_label(comp);
 
     compile_increase_except_level(comp, l_finally_block, MP_EMIT_SETUP_BLOCK_FINALLY);
@@ -1698,7 +1698,7 @@ STATIC void compile_try_finally(compiler_t *comp, mp_parse_node_t pn_body, int n
     compile_decrease_except_level(comp);
 }
 
-STATIC void compile_try_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_try_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     assert(MP_PARSE_NODE_IS_STRUCT(pns->nodes[1])); // should be
     {
         mp_parse_node_struct_t *pns2 = (mp_parse_node_struct_t *)pns->nodes[1];
@@ -1725,7 +1725,7 @@ STATIC void compile_try_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     }
 }
 
-STATIC void compile_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_node_t *nodes, mp_parse_node_t body) {
+static void compile_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_node_t *nodes, mp_parse_node_t body) {
     if (n == 0) {
         // no more pre-bits, compile the body of the with
         compile_node(comp, body);
@@ -1752,7 +1752,7 @@ STATIC void compile_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_node_t
     }
 }
 
-STATIC void compile_with_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_with_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // get the nodes for the pre-bit of the with (the a as b, c as d, ... bit)
     mp_parse_node_t *nodes;
     size_t n = mp_parse_node_extract_list(&pns->nodes[0], PN_with_stmt_list, &nodes);
@@ -1762,7 +1762,7 @@ STATIC void compile_with_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_with_stmt_helper(comp, n, nodes, pns->nodes[1]);
 }
 
-STATIC void compile_yield_from(compiler_t *comp) {
+static void compile_yield_from(compiler_t *comp) {
     EMIT_ARG(get_iter, false);
     EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
     EMIT_ARG(yield, MP_EMIT_YIELD_FROM);
@@ -1770,13 +1770,13 @@ STATIC void compile_yield_from(compiler_t *comp) {
 }
 
 #if MICROPY_PY_ASYNC_AWAIT
-STATIC void compile_await_object_method(compiler_t *comp, qstr method) {
+static void compile_await_object_method(compiler_t *comp, qstr method) {
     EMIT_ARG(load_method, method, false);
     EMIT_ARG(call_method, 0, 0, 0);
     compile_yield_from(comp);
 }
 
-STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // Allocate labels.
     uint while_else_label = comp_next_label(comp);
     uint try_exception_label = comp_next_label(comp);
@@ -1843,7 +1843,7 @@ STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns
     // Stack: (...)
 }
 
-STATIC void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_node_t *nodes, mp_parse_node_t body) {
+static void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_node_t *nodes, mp_parse_node_t body) {
     if (n == 0) {
         // no more pre-bits, compile the body of the with
         compile_node(comp, body);
@@ -1955,7 +1955,7 @@ STATIC void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_
     }
 }
 
-STATIC void compile_async_with_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_async_with_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // get the nodes for the pre-bit of the with (the a as b, c as d, ... bit)
     mp_parse_node_t *nodes;
     size_t n = mp_parse_node_extract_list(&pns->nodes[0], PN_with_stmt_list, &nodes);
@@ -1965,7 +1965,7 @@ STATIC void compile_async_with_stmt(compiler_t *comp, mp_parse_node_struct_t *pn
     compile_async_with_stmt_helper(comp, n, nodes, pns->nodes[1]);
 }
 
-STATIC void compile_async_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_async_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     assert(MP_PARSE_NODE_IS_STRUCT(pns->nodes[0]));
     mp_parse_node_struct_t *pns0 = (mp_parse_node_struct_t *)pns->nodes[0];
     if (MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_funcdef) {
@@ -1994,7 +1994,7 @@ 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) {
+static void compile_expr_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     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) {
@@ -2109,7 +2109,7 @@ STATIC void compile_expr_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     }
 }
 
-STATIC void compile_test_if_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_test_if_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
     assert(MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[1], PN_test_if_else));
     mp_parse_node_struct_t *pns_test_if_else = (mp_parse_node_struct_t *)pns->nodes[1];
 
@@ -2124,7 +2124,7 @@ STATIC void compile_test_if_expr(compiler_t *comp, mp_parse_node_struct_t *pns)
     EMIT_ARG(label_assign, l_end);
 }
 
-STATIC void compile_lambdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_lambdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (comp->pass == MP_PASS_SCOPE) {
         // create a new scope for this lambda
         scope_t *s = scope_new_and_link(comp, SCOPE_LAMBDA, (mp_parse_node_t)pns, comp->scope_cur->emit_options);
@@ -2140,7 +2140,7 @@ STATIC void compile_lambdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
 }
 
 #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) {
+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"));
     }
@@ -2172,12 +2172,12 @@ STATIC void compile_namedexpr_helper(compiler_t *comp, mp_parse_node_t pn_name,
     compile_store_id(comp, target);
 }
 
-STATIC void compile_namedexpr(compiler_t *comp, mp_parse_node_struct_t *pns) {
+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) {
+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);
     int n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
@@ -2190,12 +2190,12 @@ STATIC void compile_or_and_test(compiler_t *comp, mp_parse_node_struct_t *pns) {
     EMIT_ARG(label_assign, l_end);
 }
 
-STATIC void compile_not_test_2(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_not_test_2(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_node(comp, pns->nodes[0]);
     EMIT_ARG(unary_op, MP_UNARY_OP_NOT);
 }
 
-STATIC void compile_comparison(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_comparison(compiler_t *comp, mp_parse_node_struct_t *pns) {
     int num_nodes = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
     compile_node(comp, pns->nodes[0]);
     bool multi = (num_nodes > 3);
@@ -2248,11 +2248,11 @@ STATIC void compile_comparison(compiler_t *comp, mp_parse_node_struct_t *pns) {
     }
 }
 
-STATIC void compile_star_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_star_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("*x must be assignment target"));
 }
 
-STATIC void compile_binary_op(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_binary_op(compiler_t *comp, mp_parse_node_struct_t *pns) {
     MP_STATIC_ASSERT(MP_BINARY_OP_OR + PN_xor_expr - PN_expr == MP_BINARY_OP_XOR);
     MP_STATIC_ASSERT(MP_BINARY_OP_OR + PN_and_expr - PN_expr == MP_BINARY_OP_AND);
     mp_binary_op_t binary_op = MP_BINARY_OP_OR + MP_PARSE_NODE_STRUCT_KIND(pns) - PN_expr;
@@ -2264,7 +2264,7 @@ STATIC void compile_binary_op(compiler_t *comp, mp_parse_node_struct_t *pns) {
     }
 }
 
-STATIC void compile_term(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_term(compiler_t *comp, mp_parse_node_struct_t *pns) {
     int num_nodes = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
     compile_node(comp, pns->nodes[0]);
     for (int i = 1; i + 1 < num_nodes; i += 2) {
@@ -2275,7 +2275,7 @@ STATIC void compile_term(compiler_t *comp, mp_parse_node_struct_t *pns) {
     }
 }
 
-STATIC void compile_factor_2(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_factor_2(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_node(comp, pns->nodes[1]);
     mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(pns->nodes[0]);
     mp_unary_op_t op;
@@ -2288,7 +2288,7 @@ STATIC void compile_factor_2(compiler_t *comp, mp_parse_node_struct_t *pns) {
     EMIT_ARG(unary_op, op);
 }
 
-STATIC void compile_atom_expr_normal(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_atom_expr_normal(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // compile the subject of the expression
     compile_node(comp, pns->nodes[0]);
 
@@ -2384,12 +2384,12 @@ STATIC void compile_atom_expr_normal(compiler_t *comp, mp_parse_node_struct_t *p
     }
 }
 
-STATIC void compile_power(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_power(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_generic_all_nodes(comp, pns); // 2 nodes, arguments of power
     EMIT_ARG(binary_op, MP_BINARY_OP_POWER);
 }
 
-STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_arglist, bool is_method_call, int n_positional_extra) {
+static void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_arglist, bool is_method_call, int n_positional_extra) {
     // function to call is on top of stack
 
     // get the list of arguments
@@ -2484,7 +2484,7 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
 }
 
 // pns needs to have 2 nodes, first is lhs of comprehension, second is PN_comp_for node
-STATIC void compile_comprehension(compiler_t *comp, mp_parse_node_struct_t *pns, scope_kind_t kind) {
+static void compile_comprehension(compiler_t *comp, mp_parse_node_struct_t *pns, scope_kind_t kind) {
     assert(MP_PARSE_NODE_STRUCT_NUM_NODES(pns) == 2);
     assert(MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[1], PN_comp_for));
     mp_parse_node_struct_t *pns_comp_for = (mp_parse_node_struct_t *)pns->nodes[1];
@@ -2509,7 +2509,7 @@ STATIC void compile_comprehension(compiler_t *comp, mp_parse_node_struct_t *pns,
     EMIT_ARG(call_function, 1, 0, 0);
 }
 
-STATIC void compile_atom_paren(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
         EMIT_ARG(build, 0, MP_EMIT_BUILD_TUPLE);
@@ -2526,7 +2526,7 @@ STATIC void compile_atom_paren(compiler_t *comp, mp_parse_node_struct_t *pns) {
     }
 }
 
-STATIC void compile_atom_bracket(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_atom_bracket(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (MP_PARSE_NODE_IS_NULL(pns->nodes[0])) {
         // empty list
         EMIT_ARG(build, 0, MP_EMIT_BUILD_LIST);
@@ -2547,7 +2547,7 @@ STATIC void compile_atom_bracket(compiler_t *comp, mp_parse_node_struct_t *pns)
     }
 }
 
-STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *pns, bool create_map) {
+static void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *pns, bool create_map) {
     mp_parse_node_t pn = pns->nodes[0];
     if (MP_PARSE_NODE_IS_NULL(pn)) {
         // empty dict
@@ -2649,27 +2649,27 @@ STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *
     }
 }
 
-STATIC void compile_atom_brace(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_atom_brace(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_atom_brace_helper(comp, pns, true);
 }
 
-STATIC void compile_trailer_paren(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_trailer_paren(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_trailer_paren_helper(comp, pns->nodes[0], false, 0);
 }
 
-STATIC void compile_trailer_bracket(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_trailer_bracket(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // object who's index we want is on top of stack
     compile_node(comp, pns->nodes[0]); // the index
     EMIT_ARG(subscr, MP_EMIT_SUBSCR_LOAD);
 }
 
-STATIC void compile_trailer_period(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_trailer_period(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // object who's attribute we want is on top of stack
     EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(pns->nodes[0]), MP_EMIT_ATTR_LOAD); // attribute to get
 }
 
 #if MICROPY_PY_BUILTINS_SLICE
-STATIC void compile_subscript(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_subscript(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (MP_PARSE_NODE_STRUCT_KIND(pns) == PN_subscript_2) {
         compile_node(comp, pns->nodes[0]); // start of slice
         assert(MP_PARSE_NODE_IS_STRUCT(pns->nodes[1])); // should always be
@@ -2724,19 +2724,19 @@ STATIC void compile_subscript(compiler_t *comp, mp_parse_node_struct_t *pns) {
 }
 #endif // MICROPY_PY_BUILTINS_SLICE
 
-STATIC void compile_dictorsetmaker_item(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_dictorsetmaker_item(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // if this is called then we are compiling a dict key:value pair
     compile_node(comp, pns->nodes[1]); // value
     compile_node(comp, pns->nodes[0]); // key
 }
 
-STATIC void compile_classdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_classdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
     qstr cname = compile_classdef_helper(comp, pns, comp->scope_cur->emit_options);
     // store class object into class name
     compile_store_id(comp, cname);
 }
 
-STATIC void compile_yield_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_yield_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (comp->scope_cur->kind != SCOPE_FUNCTION && comp->scope_cur->kind != SCOPE_LAMBDA) {
         compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("'yield' outside function"));
         return;
@@ -2757,7 +2757,7 @@ STATIC void compile_yield_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
 }
 
 #if MICROPY_PY_ASYNC_AWAIT
-STATIC void compile_atom_expr_await(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_atom_expr_await(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (comp->scope_cur->kind != SCOPE_FUNCTION && comp->scope_cur->kind != SCOPE_LAMBDA) {
         compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("'await' outside function"));
         return;
@@ -2767,16 +2767,16 @@ 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) {
+static mp_obj_t get_const_object(mp_parse_node_struct_t *pns) {
     return mp_parse_node_extract_const_object(pns);
 }
 
-STATIC void compile_const_object(compiler_t *comp, mp_parse_node_struct_t *pns) {
+static void compile_const_object(compiler_t *comp, mp_parse_node_struct_t *pns) {
     EMIT_ARG(load_const_obj, get_const_object(pns));
 }
 
 typedef void (*compile_function_t)(compiler_t *, mp_parse_node_struct_t *);
-STATIC const compile_function_t compile_function[] = {
+static const compile_function_t compile_function[] = {
 // only define rules with a compile function
 #define c(f) compile_##f
 #define DEF_RULE(rule, comp, kind, ...) comp,
@@ -2788,7 +2788,7 @@ STATIC const compile_function_t compile_function[] = {
     compile_const_object,
 };
 
-STATIC void compile_node(compiler_t *comp, mp_parse_node_t pn) {
+static void compile_node(compiler_t *comp, mp_parse_node_t pn) {
     if (MP_PARSE_NODE_IS_NULL(pn)) {
         // pass
     } else if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
@@ -2824,7 +2824,7 @@ STATIC void compile_node(compiler_t *comp, mp_parse_node_t pn) {
 }
 
 #if MICROPY_EMIT_NATIVE
-STATIC int compile_viper_type_annotation(compiler_t *comp, mp_parse_node_t pn_annotation) {
+static int compile_viper_type_annotation(compiler_t *comp, mp_parse_node_t pn_annotation) {
     int native_type = MP_NATIVE_TYPE_OBJ;
     if (MP_PARSE_NODE_IS_NULL(pn_annotation)) {
         // No annotation, type defaults to object
@@ -2842,7 +2842,7 @@ STATIC int compile_viper_type_annotation(compiler_t *comp, mp_parse_node_t pn_an
 }
 #endif
 
-STATIC void compile_scope_func_lambda_param(compiler_t *comp, mp_parse_node_t pn, pn_kind_t pn_name, pn_kind_t pn_star, pn_kind_t pn_dbl_star) {
+static void compile_scope_func_lambda_param(compiler_t *comp, mp_parse_node_t pn, pn_kind_t pn_name, pn_kind_t pn_star, pn_kind_t pn_dbl_star) {
     (void)pn_dbl_star;
 
     // check that **kw is last
@@ -2929,15 +2929,15 @@ STATIC void compile_scope_func_lambda_param(compiler_t *comp, mp_parse_node_t pn
     }
 }
 
-STATIC void compile_scope_func_param(compiler_t *comp, mp_parse_node_t pn) {
+static void compile_scope_func_param(compiler_t *comp, mp_parse_node_t pn) {
     compile_scope_func_lambda_param(comp, pn, PN_typedargslist_name, PN_typedargslist_star, PN_typedargslist_dbl_star);
 }
 
-STATIC void compile_scope_lambda_param(compiler_t *comp, mp_parse_node_t pn) {
+static void compile_scope_lambda_param(compiler_t *comp, mp_parse_node_t pn) {
     compile_scope_func_lambda_param(comp, pn, PN_varargslist_name, PN_varargslist_star, PN_varargslist_dbl_star);
 }
 
-STATIC void compile_scope_comp_iter(compiler_t *comp, mp_parse_node_struct_t *pns_comp_for, mp_parse_node_t pn_inner_expr, int for_depth) {
+static void compile_scope_comp_iter(compiler_t *comp, mp_parse_node_struct_t *pns_comp_for, mp_parse_node_t pn_inner_expr, int for_depth) {
     uint l_top = comp_next_label(comp);
     uint l_end = comp_next_label(comp);
     EMIT_ARG(label_assign, l_top);
@@ -2976,7 +2976,7 @@ STATIC void compile_scope_comp_iter(compiler_t *comp, mp_parse_node_struct_t *pn
     EMIT(for_iter_end);
 }
 
-STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {
+static void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {
     #if MICROPY_ENABLE_DOC_STRING
     // see http://www.python.org/dev/peps/pep-0257/
 
@@ -3021,7 +3021,7 @@ STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {
     #endif
 }
 
-STATIC bool 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;
@@ -3186,7 +3186,7 @@ STATIC bool compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
 
 #if MICROPY_EMIT_INLINE_ASM
 // requires 3 passes: SCOPE, CODE_SIZE, EMIT
-STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
+static void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
     comp->pass = pass;
     comp->scope_cur = scope;
     comp->next_label = 0;
@@ -3361,7 +3361,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) {
     // 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;
@@ -3455,7 +3455,7 @@ STATIC void scope_compute_things(scope_t *scope) {
 }
 
 #if !MICROPY_PERSISTENT_CODE_SAVE
-STATIC
+static
 #endif
 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
diff --git a/py/emitbc.c b/py/emitbc.c
index 85fc5f218b0af..05754cfabf65d 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -92,7 +92,7 @@ void emit_bc_free(emit_t *emit) {
 }
 
 // all functions must go through this one to emit code info
-STATIC uint8_t *emit_get_cur_to_write_code_info(void *emit_in, size_t 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;
@@ -105,16 +105,16 @@ STATIC uint8_t *emit_get_cur_to_write_code_info(void *emit_in, size_t num_bytes_
     }
 }
 
-STATIC void emit_write_code_info_byte(emit_t *emit, byte val) {
+static void emit_write_code_info_byte(emit_t *emit, byte val) {
     *emit_get_cur_to_write_code_info(emit, 1) = val;
 }
 
-STATIC void emit_write_code_info_qstr(emit_t *emit, qstr qst) {
+static void emit_write_code_info_qstr(emit_t *emit, qstr qst) {
     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
-STATIC void emit_write_code_info_bytes_lines(emit_t *emit, mp_uint_t bytes_to_skip, mp_uint_t lines_to_skip) {
+static void emit_write_code_info_bytes_lines(emit_t *emit, mp_uint_t bytes_to_skip, mp_uint_t lines_to_skip) {
     assert(bytes_to_skip > 0 || lines_to_skip > 0);
     while (bytes_to_skip > 0 || lines_to_skip > 0) {
         mp_uint_t b, l;
@@ -143,7 +143,7 @@ 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 uint8_t *emit_get_cur_to_write_bytecode(void *emit_in, size_t 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->suppress) {
         return emit->dummy_data;
@@ -159,19 +159,19 @@ STATIC uint8_t *emit_get_cur_to_write_bytecode(void *emit_in, size_t num_bytes_t
     }
 }
 
-STATIC void emit_write_bytecode_raw_byte(emit_t *emit, byte b1) {
+static void emit_write_bytecode_raw_byte(emit_t *emit, byte b1) {
     byte *c = emit_get_cur_to_write_bytecode(emit, 1);
     c[0] = b1;
 }
 
-STATIC void emit_write_bytecode_byte(emit_t *emit, int stack_adj, byte b1) {
+static void emit_write_bytecode_byte(emit_t *emit, int stack_adj, byte b1) {
     mp_emit_bc_adjust_stack_size(emit, stack_adj);
     byte *c = emit_get_cur_to_write_bytecode(emit, 1);
     c[0] = b1;
 }
 
 // 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) {
+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
@@ -197,24 +197,24 @@ STATIC void emit_write_bytecode_byte_int(emit_t *emit, int stack_adj, byte b1, m
     *c = *p;
 }
 
-STATIC void emit_write_bytecode_byte_uint(emit_t *emit, int stack_adj, byte b, mp_uint_t val) {
+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);
     mp_encode_uint(emit, emit_get_cur_to_write_bytecode, val);
 }
 
-STATIC void emit_write_bytecode_byte_const(emit_t *emit, int stack_adj, byte b, mp_uint_t n) {
+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);
 }
 
-STATIC void emit_write_bytecode_byte_qstr(emit_t *emit, int stack_adj, byte b, qstr qst) {
+static void emit_write_bytecode_byte_qstr(emit_t *emit, int stack_adj, byte b, qstr qst) {
     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) {
+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_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) {
+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,
         mp_emit_common_alloc_const_child(emit->emit_common, rc));
     #if MICROPY_PY_SYS_SETTRACE
@@ -227,7 +227,7 @@ STATIC void emit_write_bytecode_byte_child(emit_t *emit, int stack_adj, byte b,
 // 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) {
+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) {
@@ -768,7 +768,7 @@ 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) {
+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) {
         // 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.
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 29487f10483f9..7818bb4f46da8 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -74,11 +74,11 @@ static inline bool emit_inline_thumb_allow_float(emit_inline_asm_t *emit) {
 
 #endif
 
-STATIC void emit_inline_thumb_error_msg(emit_inline_asm_t *emit, mp_rom_error_text_t msg) {
+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);
 }
 
-STATIC void emit_inline_thumb_error_exc(emit_inline_asm_t *emit, mp_obj_t exc) {
+static void emit_inline_thumb_error_exc(emit_inline_asm_t *emit, mp_obj_t exc) {
     *emit->error_slot = exc;
 }
 
@@ -97,7 +97,7 @@ void emit_inline_thumb_free(emit_inline_asm_t *emit) {
     m_del_obj(emit_inline_asm_t, emit);
 }
 
-STATIC void emit_inline_thumb_start_pass(emit_inline_asm_t *emit, pass_kind_t pass, mp_obj_t *error_slot) {
+static void emit_inline_thumb_start_pass(emit_inline_asm_t *emit, pass_kind_t pass, mp_obj_t *error_slot) {
     emit->pass = pass;
     emit->error_slot = error_slot;
     if (emit->pass == MP_PASS_CODE_SIZE) {
@@ -107,12 +107,12 @@ STATIC void emit_inline_thumb_start_pass(emit_inline_asm_t *emit, pass_kind_t pa
     asm_thumb_entry(&emit->as, 0);
 }
 
-STATIC void emit_inline_thumb_end_pass(emit_inline_asm_t *emit, mp_uint_t type_sig) {
+static void emit_inline_thumb_end_pass(emit_inline_asm_t *emit, mp_uint_t type_sig) {
     asm_thumb_exit(&emit->as);
     asm_thumb_end_pass(&emit->as);
 }
 
-STATIC mp_uint_t emit_inline_thumb_count_params(emit_inline_asm_t *emit, mp_uint_t n_params, mp_parse_node_t *pn_params) {
+static mp_uint_t emit_inline_thumb_count_params(emit_inline_asm_t *emit, mp_uint_t n_params, mp_parse_node_t *pn_params) {
     if (n_params > 4) {
         emit_inline_thumb_error_msg(emit, MP_ERROR_TEXT("can only have up to 4 parameters to Thumb assembly"));
         return 0;
@@ -131,7 +131,7 @@ STATIC mp_uint_t emit_inline_thumb_count_params(emit_inline_asm_t *emit, mp_uint
     return n_params;
 }
 
-STATIC bool emit_inline_thumb_label(emit_inline_asm_t *emit, mp_uint_t label_num, qstr label_id) {
+static bool emit_inline_thumb_label(emit_inline_asm_t *emit, mp_uint_t label_num, qstr label_id) {
     assert(label_num < emit->max_num_labels);
     if (emit->pass == MP_PASS_CODE_SIZE) {
         // check for duplicate label on first pass
@@ -149,7 +149,7 @@ STATIC bool emit_inline_thumb_label(emit_inline_asm_t *emit, mp_uint_t label_num
 typedef struct _reg_name_t { byte reg;
                              byte name[3];
 } reg_name_t;
-STATIC const reg_name_t reg_name_table[] = {
+static const reg_name_t reg_name_table[] = {
     {0, "r0\0"},
     {1, "r1\0"},
     {2, "r2\0"},
@@ -177,14 +177,14 @@ STATIC const reg_name_t reg_name_table[] = {
 typedef struct _special_reg_name_t { byte reg;
                                      char name[MAX_SPECIAL_REGISTER_NAME_LENGTH + 1];
 } special_reg_name_t;
-STATIC const special_reg_name_t special_reg_name_table[] = {
+static const special_reg_name_t special_reg_name_table[] = {
     {5, "IPSR"},
     {17, "BASEPRI"},
 };
 
 // return empty string in case of error, so we can attempt to parse the string
 // without a special check if it was in fact a string
-STATIC const char *get_arg_str(mp_parse_node_t pn) {
+static const char *get_arg_str(mp_parse_node_t pn) {
     if (MP_PARSE_NODE_IS_ID(pn)) {
         qstr qst = MP_PARSE_NODE_LEAF_ARG(pn);
         return qstr_str(qst);
@@ -193,7 +193,7 @@ STATIC const char *get_arg_str(mp_parse_node_t pn) {
     }
 }
 
-STATIC mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, mp_uint_t max_reg) {
+static mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, mp_uint_t max_reg) {
     const char *reg_str = get_arg_str(pn);
     for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(reg_name_table); i++) {
         const reg_name_t *r = &reg_name_table[i];
@@ -217,7 +217,7 @@ STATIC mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_n
     return 0;
 }
 
-STATIC mp_uint_t get_arg_special_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
+static mp_uint_t get_arg_special_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
     const char *reg_str = get_arg_str(pn);
     for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(special_reg_name_table); i++) {
         const special_reg_name_t *r = &special_reg_name_table[i];
@@ -231,7 +231,7 @@ STATIC mp_uint_t get_arg_special_reg(emit_inline_asm_t *emit, const char *op, mp
     return 0;
 }
 
-STATIC mp_uint_t get_arg_vfpreg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
+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') {
         mp_uint_t regno = 0;
@@ -258,7 +258,7 @@ STATIC mp_uint_t get_arg_vfpreg(emit_inline_asm_t *emit, const char *op, mp_pars
     return 0;
 }
 
-STATIC mp_uint_t get_arg_reglist(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
+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
 
     if (!MP_PARSE_NODE_IS_STRUCT_KIND(pn, PN_atom_brace)) {
@@ -310,7 +310,7 @@ STATIC mp_uint_t get_arg_reglist(emit_inline_asm_t *emit, const char *op, mp_par
     return 0;
 }
 
-STATIC uint32_t get_arg_i(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, uint32_t fit_mask) {
+static uint32_t get_arg_i(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, uint32_t fit_mask) {
     mp_obj_t o;
     if (!mp_parse_node_get_int_maybe(pn, &o)) {
         emit_inline_thumb_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, MP_ERROR_TEXT("'%s' expects an integer"), op));
@@ -324,7 +324,7 @@ STATIC uint32_t get_arg_i(emit_inline_asm_t *emit, const char *op, mp_parse_node
     return i;
 }
 
-STATIC bool get_arg_addr(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, mp_parse_node_t *pn_base, mp_parse_node_t *pn_offset) {
+static bool get_arg_addr(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, mp_parse_node_t *pn_base, mp_parse_node_t *pn_offset) {
     if (!MP_PARSE_NODE_IS_STRUCT_KIND(pn, PN_atom_bracket)) {
         goto bad_arg;
     }
@@ -346,7 +346,7 @@ STATIC bool get_arg_addr(emit_inline_asm_t *emit, const char *op, mp_parse_node_
     return false;
 }
 
-STATIC int get_arg_label(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
+static int get_arg_label(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
     if (!MP_PARSE_NODE_IS_ID(pn)) {
         emit_inline_thumb_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, MP_ERROR_TEXT("'%s' expects a label"), op));
         return 0;
@@ -367,7 +367,7 @@ STATIC int get_arg_label(emit_inline_asm_t *emit, const char *op, mp_parse_node_
 typedef struct _cc_name_t { byte cc;
                             byte name[2];
 } cc_name_t;
-STATIC const cc_name_t cc_name_table[] = {
+static const cc_name_t cc_name_table[] = {
     { ASM_THUMB_CC_EQ, "eq" },
     { ASM_THUMB_CC_NE, "ne" },
     { ASM_THUMB_CC_CS, "cs" },
@@ -388,7 +388,7 @@ typedef struct _format_4_op_t { byte op;
                                 char name[3];
 } format_4_op_t;
 #define X(x) (((x) >> 4) & 0xff) // only need 1 byte to distinguish these ops
-STATIC const format_4_op_t format_4_op_table[] = {
+static const format_4_op_t format_4_op_table[] = {
     { X(ASM_THUMB_FORMAT_4_EOR), "eor" },
     { X(ASM_THUMB_FORMAT_4_LSL), "lsl" },
     { X(ASM_THUMB_FORMAT_4_LSR), "lsr" },
@@ -412,7 +412,7 @@ typedef struct _format_9_10_op_t { uint16_t op;
                                    uint16_t name;
 } format_9_10_op_t;
 #define X(x) (x)
-STATIC const format_9_10_op_t format_9_10_op_table[] = {
+static const format_9_10_op_t format_9_10_op_table[] = {
     { X(ASM_THUMB_FORMAT_9_LDR | ASM_THUMB_FORMAT_9_WORD_TRANSFER), MP_QSTR_ldr },
     { X(ASM_THUMB_FORMAT_9_LDR | ASM_THUMB_FORMAT_9_BYTE_TRANSFER), MP_QSTR_ldrb },
     { X(ASM_THUMB_FORMAT_10_LDRH), MP_QSTR_ldrh },
@@ -427,7 +427,7 @@ 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[] = {
+static const format_vfp_op_t format_vfp_op_table[] = {
     { 0x30, "add" },
     { 0x34, "sub" },
     { 0x20, "mul" },
@@ -437,7 +437,7 @@ STATIC const format_vfp_op_t format_vfp_op_table[] = {
 // shorthand alias for whether we allow ARMv7-M instructions
 #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) {
+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:
     // one_args =
     // "b", LAB, asm_thumb_b_n,
diff --git a/py/emitinlinextensa.c b/py/emitinlinextensa.c
index 5dac2ae3907f1..57056d597aab7 100644
--- a/py/emitinlinextensa.c
+++ b/py/emitinlinextensa.c
@@ -43,11 +43,11 @@ struct _emit_inline_asm_t {
     qstr *label_lookup;
 };
 
-STATIC void emit_inline_xtensa_error_msg(emit_inline_asm_t *emit, mp_rom_error_text_t msg) {
+static void emit_inline_xtensa_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);
 }
 
-STATIC void emit_inline_xtensa_error_exc(emit_inline_asm_t *emit, mp_obj_t exc) {
+static void emit_inline_xtensa_error_exc(emit_inline_asm_t *emit, mp_obj_t exc) {
     *emit->error_slot = exc;
 }
 
@@ -66,7 +66,7 @@ void emit_inline_xtensa_free(emit_inline_asm_t *emit) {
     m_del_obj(emit_inline_asm_t, emit);
 }
 
-STATIC void emit_inline_xtensa_start_pass(emit_inline_asm_t *emit, pass_kind_t pass, mp_obj_t *error_slot) {
+static void emit_inline_xtensa_start_pass(emit_inline_asm_t *emit, pass_kind_t pass, mp_obj_t *error_slot) {
     emit->pass = pass;
     emit->error_slot = error_slot;
     if (emit->pass == MP_PASS_CODE_SIZE) {
@@ -76,12 +76,12 @@ STATIC void emit_inline_xtensa_start_pass(emit_inline_asm_t *emit, pass_kind_t p
     asm_xtensa_entry(&emit->as, 0);
 }
 
-STATIC void emit_inline_xtensa_end_pass(emit_inline_asm_t *emit, mp_uint_t type_sig) {
+static void emit_inline_xtensa_end_pass(emit_inline_asm_t *emit, mp_uint_t type_sig) {
     asm_xtensa_exit(&emit->as);
     asm_xtensa_end_pass(&emit->as);
 }
 
-STATIC mp_uint_t emit_inline_xtensa_count_params(emit_inline_asm_t *emit, mp_uint_t n_params, mp_parse_node_t *pn_params) {
+static mp_uint_t emit_inline_xtensa_count_params(emit_inline_asm_t *emit, mp_uint_t n_params, mp_parse_node_t *pn_params) {
     if (n_params > 4) {
         emit_inline_xtensa_error_msg(emit, MP_ERROR_TEXT("can only have up to 4 parameters to Xtensa assembly"));
         return 0;
@@ -100,7 +100,7 @@ STATIC mp_uint_t emit_inline_xtensa_count_params(emit_inline_asm_t *emit, mp_uin
     return n_params;
 }
 
-STATIC bool emit_inline_xtensa_label(emit_inline_asm_t *emit, mp_uint_t label_num, qstr label_id) {
+static bool emit_inline_xtensa_label(emit_inline_asm_t *emit, mp_uint_t label_num, qstr label_id) {
     assert(label_num < emit->max_num_labels);
     if (emit->pass == MP_PASS_CODE_SIZE) {
         // check for duplicate label on first pass
@@ -118,7 +118,7 @@ STATIC bool emit_inline_xtensa_label(emit_inline_asm_t *emit, mp_uint_t label_nu
 typedef struct _reg_name_t { byte reg;
                              byte name[3];
 } reg_name_t;
-STATIC const reg_name_t reg_name_table[] = {
+static const reg_name_t reg_name_table[] = {
     {0, "a0\0"},
     {1, "a1\0"},
     {2, "a2\0"},
@@ -139,7 +139,7 @@ STATIC const reg_name_t reg_name_table[] = {
 
 // return empty string in case of error, so we can attempt to parse the string
 // without a special check if it was in fact a string
-STATIC const char *get_arg_str(mp_parse_node_t pn) {
+static const char *get_arg_str(mp_parse_node_t pn) {
     if (MP_PARSE_NODE_IS_ID(pn)) {
         qstr qst = MP_PARSE_NODE_LEAF_ARG(pn);
         return qstr_str(qst);
@@ -148,7 +148,7 @@ STATIC const char *get_arg_str(mp_parse_node_t pn) {
     }
 }
 
-STATIC mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
+static mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
     const char *reg_str = get_arg_str(pn);
     for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(reg_name_table); i++) {
         const reg_name_t *r = &reg_name_table[i];
@@ -165,7 +165,7 @@ STATIC mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_n
     return 0;
 }
 
-STATIC uint32_t get_arg_i(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, int min, int max) {
+static uint32_t get_arg_i(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn, int min, int max) {
     mp_obj_t o;
     if (!mp_parse_node_get_int_maybe(pn, &o)) {
         emit_inline_xtensa_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, MP_ERROR_TEXT("'%s' expects an integer"), op));
@@ -179,7 +179,7 @@ STATIC uint32_t get_arg_i(emit_inline_asm_t *emit, const char *op, mp_parse_node
     return i;
 }
 
-STATIC int get_arg_label(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
+static int get_arg_label(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
     if (!MP_PARSE_NODE_IS_ID(pn)) {
         emit_inline_xtensa_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, MP_ERROR_TEXT("'%s' expects a label"), op));
         return 0;
@@ -208,7 +208,7 @@ typedef struct _opcode_table_3arg_t {
     uint8_t a1 : 4;
 } opcode_table_3arg_t;
 
-STATIC const opcode_table_3arg_t opcode_table_3arg[] = {
+static const opcode_table_3arg_t opcode_table_3arg[] = {
     // arithmetic opcodes: reg, reg, reg
     {MP_QSTR_and_, RRR, 0, 1},
     {MP_QSTR_or_, RRR, 0, 2},
@@ -242,7 +242,7 @@ STATIC const opcode_table_3arg_t opcode_table_3arg[] = {
     {MP_QSTR_bnone, RRI8_B, ASM_XTENSA_CC_NONE, 0},
 };
 
-STATIC void emit_inline_xtensa_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_args, mp_parse_node_t *pn_args) {
+static void emit_inline_xtensa_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_args, mp_parse_node_t *pn_args) {
     size_t op_len;
     const char *op_str = (const char *)qstr_data(op, &op_len);
 
diff --git a/py/emitnative.c b/py/emitnative.c
index 6b5c9452ae6aa..f80461dd42f3b 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -156,7 +156,7 @@
 #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};
+static const uint8_t reg_local_table[MAX_REGS_FOR_LOCAL_VARS] = {REG_LOCAL_1, REG_LOCAL_2};
 
 #else
 
@@ -168,7 +168,7 @@ STATIC const uint8_t reg_local_table[MAX_REGS_FOR_LOCAL_VARS] = {REG_LOCAL_1, RE
 #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};
+static const uint8_t reg_local_table[MAX_REGS_FOR_LOCAL_VARS] = {REG_LOCAL_1, REG_LOCAL_2, REG_LOCAL_3};
 
 #endif
 
@@ -202,7 +202,7 @@ typedef enum {
     VTYPE_BUILTIN_CAST = 0x70 | MP_NATIVE_TYPE_OBJ,
 } vtype_kind_t;
 
-STATIC qstr vtype_to_qstr(vtype_kind_t vtype) {
+static qstr vtype_to_qstr(vtype_kind_t vtype) {
     switch (vtype) {
         case VTYPE_PYOBJ:
             return MP_QSTR_object;
@@ -280,10 +280,10 @@ struct _emit_t {
     ASM_T *as;
 };
 
-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);
+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);
 
 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);
@@ -308,13 +308,13 @@ void EXPORT_FUN(free)(emit_t * emit) {
     m_del_obj(emit_t, emit);
 }
 
-STATIC void emit_call_with_imm_arg(emit_t *emit, mp_fun_kind_t fun_kind, mp_int_t arg_val, int arg_reg);
+static void emit_call_with_imm_arg(emit_t *emit, mp_fun_kind_t fun_kind, mp_int_t arg_val, int arg_reg);
 
-STATIC void emit_native_mov_reg_const(emit_t *emit, int reg_dest, int const_val) {
+static void emit_native_mov_reg_const(emit_t *emit, int reg_dest, int const_val) {
     ASM_LOAD_REG_REG_OFFSET(emit->as, reg_dest, REG_FUN_TABLE, const_val);
 }
 
-STATIC void emit_native_mov_state_reg(emit_t *emit, int local_num, int reg_src) {
+static void emit_native_mov_state_reg(emit_t *emit, int local_num, int reg_src) {
     if (emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR) {
         ASM_STORE_REG_REG_OFFSET(emit->as, reg_src, REG_GENERATOR_STATE, local_num);
     } else {
@@ -322,7 +322,7 @@ STATIC void emit_native_mov_state_reg(emit_t *emit, int local_num, int reg_src)
     }
 }
 
-STATIC void emit_native_mov_reg_state(emit_t *emit, int reg_dest, int local_num) {
+static void emit_native_mov_reg_state(emit_t *emit, int reg_dest, int local_num) {
     if (emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR) {
         ASM_LOAD_REG_REG_OFFSET(emit->as, reg_dest, REG_GENERATOR_STATE, local_num);
     } else {
@@ -330,7 +330,7 @@ STATIC void emit_native_mov_reg_state(emit_t *emit, int reg_dest, int local_num)
     }
 }
 
-STATIC void emit_native_mov_reg_state_addr(emit_t *emit, int reg_dest, int local_num) {
+static void emit_native_mov_reg_state_addr(emit_t *emit, int reg_dest, int local_num) {
     if (emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR) {
         ASM_MOV_REG_IMM(emit->as, reg_dest, local_num * ASM_WORD_SIZE);
         ASM_ADD_REG_REG(emit->as, reg_dest, REG_GENERATOR_STATE);
@@ -339,7 +339,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) {
+static void emit_native_mov_reg_qstr(emit_t *emit, int arg_reg, qstr qst) {
     #if MICROPY_PERSISTENT_CODE_SAVE
     ASM_LOAD16_REG_REG_OFFSET(emit->as, arg_reg, REG_QSTR_TABLE, mp_emit_common_use_qstr(emit->emit_common, qst));
     #else
@@ -347,7 +347,7 @@ STATIC void emit_native_mov_reg_qstr(emit_t *emit, int arg_reg, qstr qst) {
     #endif
 }
 
-STATIC void emit_native_mov_reg_qstr_obj(emit_t *emit, int reg_dest, qstr qst) {
+static void emit_native_mov_reg_qstr_obj(emit_t *emit, int reg_dest, qstr qst) {
     #if MICROPY_PERSISTENT_CODE_SAVE
     emit_load_reg_with_object(emit, reg_dest, MP_OBJ_NEW_QSTR(qst));
     #else
@@ -361,7 +361,7 @@ 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)
 
-STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
+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);
 
     emit->pass = pass;
@@ -632,7 +632,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 bool 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) {
@@ -723,7 +723,7 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
     return true;
 }
 
-STATIC void ensure_extra_stack(emit_t *emit, size_t delta) {
+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;
         emit->stack_info = m_renew(stack_info_t, emit->stack_info, emit->stack_info_alloc, new_alloc);
@@ -731,7 +731,7 @@ STATIC void ensure_extra_stack(emit_t *emit, size_t delta) {
     }
 }
 
-STATIC void adjust_stack(emit_t *emit, mp_int_t stack_size_delta) {
+static void adjust_stack(emit_t *emit, mp_int_t stack_size_delta) {
     assert((mp_int_t)emit->stack_size + stack_size_delta >= 0);
     assert((mp_int_t)emit->stack_size + stack_size_delta <= (mp_int_t)emit->stack_info_alloc);
     emit->stack_size += stack_size_delta;
@@ -748,7 +748,7 @@ STATIC void adjust_stack(emit_t *emit, mp_int_t stack_size_delta) {
     #endif
 }
 
-STATIC void emit_native_adjust_stack_size(emit_t *emit, mp_int_t delta) {
+static void emit_native_adjust_stack_size(emit_t *emit, mp_int_t delta) {
     DEBUG_printf("adjust_stack_size(" INT_FMT ")\n", delta);
     if (delta > 0) {
         ensure_extra_stack(emit, delta);
@@ -772,23 +772,23 @@ STATIC void emit_native_adjust_stack_size(emit_t *emit, mp_int_t delta) {
     adjust_stack(emit, delta);
 }
 
-STATIC void emit_native_set_source_line(emit_t *emit, mp_uint_t source_line) {
+static void emit_native_set_source_line(emit_t *emit, mp_uint_t source_line) {
     (void)emit;
     (void)source_line;
 }
 
 // this must be called at start of emit functions
-STATIC void emit_native_pre(emit_t *emit) {
+static void emit_native_pre(emit_t *emit) {
     (void)emit;
 }
 
 // depth==0 is top, depth==1 is before top, etc
-STATIC stack_info_t *peek_stack(emit_t *emit, mp_uint_t depth) {
+static stack_info_t *peek_stack(emit_t *emit, mp_uint_t depth) {
     return &emit->stack_info[emit->stack_size - 1 - depth];
 }
 
 // depth==0 is top, depth==1 is before top, etc
-STATIC vtype_kind_t peek_vtype(emit_t *emit, mp_uint_t depth) {
+static vtype_kind_t peek_vtype(emit_t *emit, mp_uint_t depth) {
     if (emit->do_viper_types) {
         return peek_stack(emit, depth)->vtype;
     } else {
@@ -799,7 +799,7 @@ STATIC vtype_kind_t peek_vtype(emit_t *emit, mp_uint_t depth) {
 
 // pos=1 is TOS, pos=2 is next, etc
 // use pos=0 for no skipping
-STATIC void need_reg_single(emit_t *emit, int reg_needed, int skip_stack_pos) {
+static void need_reg_single(emit_t *emit, int reg_needed, int skip_stack_pos) {
     skip_stack_pos = emit->stack_size - skip_stack_pos;
     for (int i = 0; i < emit->stack_size; i++) {
         if (i != skip_stack_pos) {
@@ -814,7 +814,7 @@ 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) {
+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) {
@@ -825,7 +825,7 @@ STATIC void need_reg_all(emit_t *emit) {
     }
 }
 
-STATIC vtype_kind_t load_reg_stack_imm(emit_t *emit, int reg_dest, const stack_info_t *si, bool convert_to_pyobj) {
+static vtype_kind_t load_reg_stack_imm(emit_t *emit, int reg_dest, const stack_info_t *si, bool convert_to_pyobj) {
     if (!convert_to_pyobj && emit->do_viper_types) {
         ASM_MOV_REG_IMM(emit->as, reg_dest, si->data.u_imm);
         return si->vtype;
@@ -849,7 +849,7 @@ STATIC vtype_kind_t load_reg_stack_imm(emit_t *emit, int reg_dest, const stack_i
 // concrete Python stack.  This ensures the concrete Python stack holds valid
 // values for the current stack_size.
 // This function may clobber REG_TEMP1.
-STATIC void need_stack_settled(emit_t *emit) {
+static void need_stack_settled(emit_t *emit) {
     DEBUG_printf("  need_stack_settled; stack_size=%d\n", emit->stack_size);
     need_reg_all(emit);
     for (int i = 0; i < emit->stack_size; i++) {
@@ -865,7 +865,7 @@ STATIC void need_stack_settled(emit_t *emit) {
 }
 
 // pos=1 is TOS, pos=2 is next, etc
-STATIC void emit_access_stack(emit_t *emit, int pos, vtype_kind_t *vtype, int reg_dest) {
+static void emit_access_stack(emit_t *emit, int pos, vtype_kind_t *vtype, int reg_dest) {
     need_reg_single(emit, reg_dest, pos);
     stack_info_t *si = &emit->stack_info[emit->stack_size - pos];
     *vtype = si->vtype;
@@ -888,7 +888,7 @@ STATIC void emit_access_stack(emit_t *emit, int pos, vtype_kind_t *vtype, int re
 
 // does an efficient X=pop(); discard(); push(X)
 // needs a (non-temp) register in case the popped element was stored in the stack
-STATIC void emit_fold_stack_top(emit_t *emit, int reg_dest) {
+static void emit_fold_stack_top(emit_t *emit, int reg_dest) {
     stack_info_t *si = &emit->stack_info[emit->stack_size - 2];
     si[0] = si[1];
     if (si->kind == STACK_VALUE) {
@@ -902,7 +902,7 @@ 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) {
+static void emit_pre_pop_reg_flexible(emit_t *emit, vtype_kind_t *vtype, int *reg_dest, int not_r1, int not_r2) {
     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;
@@ -914,36 +914,36 @@ STATIC void emit_pre_pop_reg_flexible(emit_t *emit, vtype_kind_t *vtype, int *re
     adjust_stack(emit, -1);
 }
 
-STATIC void emit_pre_pop_discard(emit_t *emit) {
+static void emit_pre_pop_discard(emit_t *emit) {
     adjust_stack(emit, -1);
 }
 
-STATIC void emit_pre_pop_reg(emit_t *emit, vtype_kind_t *vtype, int reg_dest) {
+static void emit_pre_pop_reg(emit_t *emit, vtype_kind_t *vtype, int reg_dest) {
     emit_access_stack(emit, 1, vtype, reg_dest);
     adjust_stack(emit, -1);
 }
 
-STATIC void emit_pre_pop_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int rega, vtype_kind_t *vtypeb, int regb) {
+static void emit_pre_pop_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int rega, vtype_kind_t *vtypeb, int regb) {
     emit_pre_pop_reg(emit, vtypea, rega);
     emit_pre_pop_reg(emit, vtypeb, regb);
 }
 
-STATIC void emit_pre_pop_reg_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int rega, vtype_kind_t *vtypeb, int regb, vtype_kind_t *vtypec, int regc) {
+static void emit_pre_pop_reg_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int rega, vtype_kind_t *vtypeb, int regb, vtype_kind_t *vtypec, int regc) {
     emit_pre_pop_reg(emit, vtypea, rega);
     emit_pre_pop_reg(emit, vtypeb, regb);
     emit_pre_pop_reg(emit, vtypec, regc);
 }
 
-STATIC void emit_post(emit_t *emit) {
+static void emit_post(emit_t *emit) {
     (void)emit;
 }
 
-STATIC void emit_post_top_set_vtype(emit_t *emit, vtype_kind_t new_vtype) {
+static void emit_post_top_set_vtype(emit_t *emit, vtype_kind_t new_vtype) {
     stack_info_t *si = &emit->stack_info[emit->stack_size - 1];
     si->vtype = new_vtype;
 }
 
-STATIC void emit_post_push_reg(emit_t *emit, vtype_kind_t vtype, int reg) {
+static void emit_post_push_reg(emit_t *emit, vtype_kind_t vtype, int reg) {
     ensure_extra_stack(emit, 1);
     stack_info_t *si = &emit->stack_info[emit->stack_size];
     si->vtype = vtype;
@@ -952,7 +952,7 @@ STATIC void emit_post_push_reg(emit_t *emit, vtype_kind_t vtype, int reg) {
     adjust_stack(emit, 1);
 }
 
-STATIC void emit_post_push_imm(emit_t *emit, vtype_kind_t vtype, mp_int_t imm) {
+static void emit_post_push_imm(emit_t *emit, vtype_kind_t vtype, mp_int_t imm) {
     ensure_extra_stack(emit, 1);
     stack_info_t *si = &emit->stack_info[emit->stack_size];
     si->vtype = vtype;
@@ -961,43 +961,43 @@ STATIC void emit_post_push_imm(emit_t *emit, vtype_kind_t vtype, mp_int_t imm) {
     adjust_stack(emit, 1);
 }
 
-STATIC void emit_post_push_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb) {
+static void emit_post_push_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb) {
     emit_post_push_reg(emit, vtypea, rega);
     emit_post_push_reg(emit, vtypeb, regb);
 }
 
-STATIC void emit_post_push_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb, vtype_kind_t vtypec, int regc) {
+static void emit_post_push_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb, vtype_kind_t vtypec, int regc) {
     emit_post_push_reg(emit, vtypea, rega);
     emit_post_push_reg(emit, vtypeb, regb);
     emit_post_push_reg(emit, vtypec, regc);
 }
 
-STATIC void emit_post_push_reg_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb, vtype_kind_t vtypec, int regc, vtype_kind_t vtyped, int regd) {
+static void emit_post_push_reg_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb, vtype_kind_t vtypec, int regc, vtype_kind_t vtyped, int regd) {
     emit_post_push_reg(emit, vtypea, rega);
     emit_post_push_reg(emit, vtypeb, regb);
     emit_post_push_reg(emit, vtypec, regc);
     emit_post_push_reg(emit, vtyped, regd);
 }
 
-STATIC void emit_call(emit_t *emit, mp_fun_kind_t fun_kind) {
+static void emit_call(emit_t *emit, mp_fun_kind_t fun_kind) {
     need_reg_all(emit);
     ASM_CALL_IND(emit->as, fun_kind);
 }
 
-STATIC void emit_call_with_imm_arg(emit_t *emit, mp_fun_kind_t fun_kind, mp_int_t arg_val, int arg_reg) {
+static void emit_call_with_imm_arg(emit_t *emit, mp_fun_kind_t fun_kind, mp_int_t arg_val, int arg_reg) {
     need_reg_all(emit);
     ASM_MOV_REG_IMM(emit->as, arg_reg, arg_val);
     ASM_CALL_IND(emit->as, fun_kind);
 }
 
-STATIC void emit_call_with_2_imm_args(emit_t *emit, mp_fun_kind_t fun_kind, mp_int_t arg_val1, int arg_reg1, mp_int_t arg_val2, int arg_reg2) {
+static void emit_call_with_2_imm_args(emit_t *emit, mp_fun_kind_t fun_kind, mp_int_t arg_val1, int arg_reg1, mp_int_t arg_val2, int arg_reg2) {
     need_reg_all(emit);
     ASM_MOV_REG_IMM(emit->as, arg_reg1, arg_val1);
     ASM_MOV_REG_IMM(emit->as, arg_reg2, arg_val2);
     ASM_CALL_IND(emit->as, fun_kind);
 }
 
-STATIC void emit_call_with_qstr_arg(emit_t *emit, mp_fun_kind_t fun_kind, qstr qst, int arg_reg) {
+static void emit_call_with_qstr_arg(emit_t *emit, mp_fun_kind_t fun_kind, qstr qst, int arg_reg) {
     need_reg_all(emit);
     emit_native_mov_reg_qstr(emit, arg_reg, qst);
     ASM_CALL_IND(emit->as, fun_kind);
@@ -1007,7 +1007,7 @@ STATIC void emit_call_with_qstr_arg(emit_t *emit, mp_fun_kind_t fun_kind, qstr q
 // Will convert any items that are not VTYPE_PYOBJ to this type and put them back on the stack.
 // If any conversions of non-immediate values are needed, then it uses REG_ARG_1, REG_ARG_2 and REG_RET.
 // Otherwise, it does not use any temporary registers (but may use reg_dest before loading it with stack pointer).
-STATIC void emit_get_stack_pointer_to_reg_for_pop(emit_t *emit, mp_uint_t reg_dest, mp_uint_t n_pop) {
+static void emit_get_stack_pointer_to_reg_for_pop(emit_t *emit, mp_uint_t reg_dest, mp_uint_t n_pop) {
     need_reg_all(emit);
 
     // First, store any immediate values to their respective place on the stack.
@@ -1044,7 +1044,7 @@ STATIC void emit_get_stack_pointer_to_reg_for_pop(emit_t *emit, mp_uint_t reg_de
 }
 
 // vtype of all n_push objects is VTYPE_PYOBJ
-STATIC void emit_get_stack_pointer_to_reg_for_push(emit_t *emit, mp_uint_t reg_dest, mp_uint_t n_push) {
+static void emit_get_stack_pointer_to_reg_for_push(emit_t *emit, mp_uint_t reg_dest, mp_uint_t n_push) {
     need_reg_all(emit);
     ensure_extra_stack(emit, n_push);
     for (mp_uint_t i = 0; i < n_push; i++) {
@@ -1055,7 +1055,7 @@ STATIC void emit_get_stack_pointer_to_reg_for_push(emit_t *emit, mp_uint_t reg_d
     adjust_stack(emit, n_push);
 }
 
-STATIC void emit_native_push_exc_stack(emit_t *emit, uint label, bool is_finally) {
+static void emit_native_push_exc_stack(emit_t *emit, uint label, bool is_finally) {
     if (emit->exc_stack_size + 1 > emit->exc_stack_alloc) {
         size_t new_alloc = emit->exc_stack_alloc + 4;
         emit->exc_stack = m_renew(exc_stack_entry_t, emit->exc_stack, emit->exc_stack_alloc, new_alloc);
@@ -1072,7 +1072,7 @@ STATIC void emit_native_push_exc_stack(emit_t *emit, uint label, bool is_finally
     ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_PC(emit), REG_RET);
 }
 
-STATIC void emit_native_leave_exc_stack(emit_t *emit, bool start_of_handler) {
+static void emit_native_leave_exc_stack(emit_t *emit, bool start_of_handler) {
     assert(emit->exc_stack_size > 0);
 
     // Get current exception handler and deactivate it
@@ -1098,14 +1098,14 @@ STATIC void emit_native_leave_exc_stack(emit_t *emit, bool start_of_handler) {
     ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_PC(emit), REG_RET);
 }
 
-STATIC exc_stack_entry_t *emit_native_pop_exc_stack(emit_t *emit) {
+static exc_stack_entry_t *emit_native_pop_exc_stack(emit_t *emit) {
     assert(emit->exc_stack_size > 0);
     exc_stack_entry_t *e = &emit->exc_stack[--emit->exc_stack_size];
     assert(e->is_active == false);
     return e;
 }
 
-STATIC void emit_load_reg_with_object(emit_t *emit, int reg, mp_obj_t obj) {
+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));
@@ -1114,14 +1114,14 @@ STATIC void emit_load_reg_with_object(emit_t *emit, int reg, mp_obj_t obj) {
     ASM_LOAD_REG_REG_OFFSET(emit->as, reg, REG_TEMP0, table_off);
 }
 
-STATIC void emit_load_reg_with_child(emit_t *emit, int reg, mp_raw_code_t *rc) {
+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) {
+static void emit_native_label_assign(emit_t *emit, mp_uint_t l) {
     DEBUG_printf("label_assign(" UINT_FMT ")\n", l);
 
     bool is_finally = false;
@@ -1149,7 +1149,7 @@ STATIC void emit_native_label_assign(emit_t *emit, mp_uint_t l) {
     }
 }
 
-STATIC void emit_native_global_exc_entry(emit_t *emit) {
+static void emit_native_global_exc_entry(emit_t *emit) {
     // Note: 4 labels are reserved for this function, starting at *emit->label_slot
 
     emit->exit_label = *emit->label_slot;
@@ -1251,7 +1251,7 @@ STATIC void emit_native_global_exc_entry(emit_t *emit) {
     }
 }
 
-STATIC void emit_native_global_exc_exit(emit_t *emit) {
+static void emit_native_global_exc_exit(emit_t *emit) {
     // Label for end of function
     emit_native_label_assign(emit, emit->exit_label);
 
@@ -1286,7 +1286,7 @@ STATIC void emit_native_global_exc_exit(emit_t *emit) {
     ASM_EXIT(emit->as);
 }
 
-STATIC void emit_native_import_name(emit_t *emit, qstr qst) {
+static void emit_native_import_name(emit_t *emit, qstr qst) {
     DEBUG_printf("import_name %s\n", qstr_str(qst));
 
     // get arguments from stack: arg2 = fromlist, arg3 = level
@@ -1305,7 +1305,7 @@ STATIC void emit_native_import_name(emit_t *emit, qstr qst) {
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_import_from(emit_t *emit, qstr qst) {
+static void emit_native_import_from(emit_t *emit, qstr qst) {
     DEBUG_printf("import_from %s\n", qstr_str(qst));
     emit_native_pre(emit);
     vtype_kind_t vtype_module;
@@ -1315,7 +1315,7 @@ STATIC void emit_native_import_from(emit_t *emit, qstr qst) {
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_import_star(emit_t *emit) {
+static void emit_native_import_star(emit_t *emit) {
     DEBUG_printf("import_star\n");
     vtype_kind_t vtype_module;
     emit_pre_pop_reg(emit, &vtype_module, REG_ARG_1); // arg1 = module
@@ -1324,7 +1324,7 @@ STATIC void emit_native_import_star(emit_t *emit) {
     emit_post(emit);
 }
 
-STATIC void emit_native_import(emit_t *emit, qstr qst, int kind) {
+static void emit_native_import(emit_t *emit, qstr qst, int kind) {
     if (kind == MP_EMIT_IMPORT_NAME) {
         emit_native_import_name(emit, qst);
     } else if (kind == MP_EMIT_IMPORT_FROM) {
@@ -1334,7 +1334,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) {
+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) {
         emit_native_load_const_obj(emit, MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj));
@@ -1348,13 +1348,13 @@ STATIC void emit_native_load_const_tok(emit_t *emit, mp_token_kind_t tok) {
     }
 }
 
-STATIC void emit_native_load_const_small_int(emit_t *emit, mp_int_t arg) {
+static void emit_native_load_const_small_int(emit_t *emit, mp_int_t arg) {
     DEBUG_printf("load_const_small_int(int=" INT_FMT ")\n", arg);
     emit_native_pre(emit);
     emit_post_push_imm(emit, VTYPE_INT, arg);
 }
 
-STATIC void emit_native_load_const_str(emit_t *emit, qstr qst) {
+static void emit_native_load_const_str(emit_t *emit, qstr qst) {
     emit_native_pre(emit);
     // TODO: Eventually we want to be able to work with raw pointers in viper to
     // do native array access.  For now we just load them as any other object.
@@ -1371,19 +1371,19 @@ 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) {
+static void emit_native_load_const_obj(emit_t *emit, mp_obj_t obj) {
     emit_native_pre(emit);
     need_reg_single(emit, REG_RET, 0);
     emit_load_reg_with_object(emit, REG_RET, obj);
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_load_null(emit_t *emit) {
+static void emit_native_load_null(emit_t *emit) {
     emit_native_pre(emit);
     emit_post_push_imm(emit, VTYPE_PYOBJ, 0);
 }
 
-STATIC void emit_native_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
+static void emit_native_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
     DEBUG_printf("load_fast(%s, " UINT_FMT ")\n", qstr_str(qst), local_num);
     vtype_kind_t vtype = emit->local_vtype[local_num];
     if (vtype == VTYPE_UNBOUND) {
@@ -1399,7 +1399,7 @@ STATIC void emit_native_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
     }
 }
 
-STATIC void emit_native_load_deref(emit_t *emit, qstr qst, mp_uint_t local_num) {
+static void emit_native_load_deref(emit_t *emit, qstr qst, mp_uint_t local_num) {
     DEBUG_printf("load_deref(%s, " UINT_FMT ")\n", qstr_str(qst), local_num);
     need_reg_single(emit, REG_RET, 0);
     emit_native_load_fast(emit, qst, local_num);
@@ -1411,7 +1411,7 @@ STATIC void emit_native_load_deref(emit_t *emit, qstr qst, mp_uint_t local_num)
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_load_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
+static void emit_native_load_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
     if (kind == MP_EMIT_IDOP_LOCAL_FAST) {
         emit_native_load_fast(emit, qst, local_num);
     } else {
@@ -1419,7 +1419,7 @@ STATIC void emit_native_load_local(emit_t *emit, qstr qst, mp_uint_t local_num,
     }
 }
 
-STATIC void emit_native_load_global(emit_t *emit, qstr qst, int kind) {
+static void emit_native_load_global(emit_t *emit, qstr qst, int kind) {
     MP_STATIC_ASSERT(MP_F_LOAD_NAME + MP_EMIT_IDOP_GLOBAL_NAME == MP_F_LOAD_NAME);
     MP_STATIC_ASSERT(MP_F_LOAD_NAME + MP_EMIT_IDOP_GLOBAL_GLOBAL == MP_F_LOAD_GLOBAL);
     emit_native_pre(emit);
@@ -1440,7 +1440,7 @@ STATIC void emit_native_load_global(emit_t *emit, qstr qst, int kind) {
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_load_attr(emit_t *emit, qstr qst) {
+static void emit_native_load_attr(emit_t *emit, qstr qst) {
     // depends on type of subject:
     //  - integer, function, pointer to integers: error
     //  - pointer to structure: get member, quite easy
@@ -1452,7 +1452,7 @@ STATIC void emit_native_load_attr(emit_t *emit, qstr qst) {
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_load_method(emit_t *emit, qstr qst, bool is_super) {
+static void emit_native_load_method(emit_t *emit, qstr qst, bool is_super) {
     if (is_super) {
         emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_2, 3); // arg2 = dest ptr
         emit_get_stack_pointer_to_reg_for_push(emit, REG_ARG_2, 2); // arg2 = dest ptr
@@ -1466,13 +1466,13 @@ STATIC void emit_native_load_method(emit_t *emit, qstr qst, bool is_super) {
     }
 }
 
-STATIC void emit_native_load_build_class(emit_t *emit) {
+static void emit_native_load_build_class(emit_t *emit) {
     emit_native_pre(emit);
     emit_call(emit, MP_F_LOAD_BUILD_CLASS);
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_load_subscr(emit_t *emit) {
+static void emit_native_load_subscr(emit_t *emit) {
     DEBUG_printf("load_subscr\n");
     // need to compile: base[index]
 
@@ -1612,7 +1612,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) {
+static void emit_native_store_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
     vtype_kind_t vtype;
     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]);
@@ -1634,7 +1634,7 @@ STATIC void emit_native_store_fast(emit_t *emit, qstr qst, mp_uint_t local_num)
     }
 }
 
-STATIC void emit_native_store_deref(emit_t *emit, qstr qst, mp_uint_t local_num) {
+static void emit_native_store_deref(emit_t *emit, qstr qst, mp_uint_t local_num) {
     DEBUG_printf("store_deref(%s, " UINT_FMT ")\n", qstr_str(qst), local_num);
     need_reg_single(emit, REG_TEMP0, 0);
     need_reg_single(emit, REG_TEMP1, 0);
@@ -1648,7 +1648,7 @@ STATIC void emit_native_store_deref(emit_t *emit, qstr qst, mp_uint_t local_num)
     emit_post(emit);
 }
 
-STATIC void emit_native_store_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
+static void emit_native_store_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
     if (kind == MP_EMIT_IDOP_LOCAL_FAST) {
         emit_native_store_fast(emit, qst, local_num);
     } else {
@@ -1656,7 +1656,7 @@ STATIC void emit_native_store_local(emit_t *emit, qstr qst, mp_uint_t local_num,
     }
 }
 
-STATIC void emit_native_store_global(emit_t *emit, qstr qst, int kind) {
+static void emit_native_store_global(emit_t *emit, qstr qst, int kind) {
     MP_STATIC_ASSERT(MP_F_STORE_NAME + MP_EMIT_IDOP_GLOBAL_NAME == MP_F_STORE_NAME);
     MP_STATIC_ASSERT(MP_F_STORE_NAME + MP_EMIT_IDOP_GLOBAL_GLOBAL == MP_F_STORE_GLOBAL);
     if (kind == MP_EMIT_IDOP_GLOBAL_NAME) {
@@ -1678,7 +1678,7 @@ STATIC void emit_native_store_global(emit_t *emit, qstr qst, int kind) {
     emit_post(emit);
 }
 
-STATIC void emit_native_store_attr(emit_t *emit, qstr qst) {
+static void emit_native_store_attr(emit_t *emit, qstr qst) {
     vtype_kind_t vtype_base;
     vtype_kind_t vtype_val = peek_vtype(emit, 1);
     if (vtype_val == VTYPE_PYOBJ) {
@@ -1695,7 +1695,7 @@ STATIC void emit_native_store_attr(emit_t *emit, qstr qst) {
     emit_post(emit);
 }
 
-STATIC void emit_native_store_subscr(emit_t *emit) {
+static void emit_native_store_subscr(emit_t *emit) {
     DEBUG_printf("store_subscr\n");
     // need to compile: base[index] = value
 
@@ -1872,7 +1872,7 @@ STATIC void emit_native_store_subscr(emit_t *emit) {
     }
 }
 
-STATIC void emit_native_delete_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
+static void emit_native_delete_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
     if (kind == MP_EMIT_IDOP_LOCAL_FAST) {
         // TODO: This is not compliant implementation. We could use MP_OBJ_SENTINEL
         // to mark deleted vars but then every var would need to be checked on
@@ -1884,7 +1884,7 @@ STATIC void emit_native_delete_local(emit_t *emit, qstr qst, mp_uint_t local_num
     }
 }
 
-STATIC void emit_native_delete_global(emit_t *emit, qstr qst, int kind) {
+static void emit_native_delete_global(emit_t *emit, qstr qst, int kind) {
     MP_STATIC_ASSERT(MP_F_DELETE_NAME + MP_EMIT_IDOP_GLOBAL_NAME == MP_F_DELETE_NAME);
     MP_STATIC_ASSERT(MP_F_DELETE_NAME + MP_EMIT_IDOP_GLOBAL_GLOBAL == MP_F_DELETE_GLOBAL);
     emit_native_pre(emit);
@@ -1892,7 +1892,7 @@ STATIC void emit_native_delete_global(emit_t *emit, qstr qst, int kind) {
     emit_post(emit);
 }
 
-STATIC void emit_native_delete_attr(emit_t *emit, qstr qst) {
+static void emit_native_delete_attr(emit_t *emit, qstr qst) {
     vtype_kind_t vtype_base;
     emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1); // arg1 = base
     assert(vtype_base == VTYPE_PYOBJ);
@@ -1901,7 +1901,7 @@ STATIC void emit_native_delete_attr(emit_t *emit, qstr qst) {
     emit_post(emit);
 }
 
-STATIC void emit_native_delete_subscr(emit_t *emit) {
+static void emit_native_delete_subscr(emit_t *emit) {
     vtype_kind_t vtype_index, vtype_base;
     emit_pre_pop_reg_reg(emit, &vtype_index, REG_ARG_2, &vtype_base, REG_ARG_1); // index, base
     assert(vtype_index == VTYPE_PYOBJ);
@@ -1909,7 +1909,7 @@ STATIC void emit_native_delete_subscr(emit_t *emit) {
     emit_call_with_imm_arg(emit, MP_F_OBJ_SUBSCR, (mp_uint_t)MP_OBJ_NULL, REG_ARG_3);
 }
 
-STATIC void emit_native_subscr(emit_t *emit, int kind) {
+static void emit_native_subscr(emit_t *emit, int kind) {
     if (kind == MP_EMIT_SUBSCR_LOAD) {
         emit_native_load_subscr(emit);
     } else if (kind == MP_EMIT_SUBSCR_STORE) {
@@ -1919,7 +1919,7 @@ STATIC void emit_native_subscr(emit_t *emit, int kind) {
     }
 }
 
-STATIC void emit_native_attr(emit_t *emit, qstr qst, int kind) {
+static void emit_native_attr(emit_t *emit, qstr qst, int kind) {
     if (kind == MP_EMIT_ATTR_LOAD) {
         emit_native_load_attr(emit, qst);
     } else if (kind == MP_EMIT_ATTR_STORE) {
@@ -1929,7 +1929,7 @@ STATIC void emit_native_attr(emit_t *emit, qstr qst, int kind) {
     }
 }
 
-STATIC void emit_native_dup_top(emit_t *emit) {
+static void emit_native_dup_top(emit_t *emit) {
     DEBUG_printf("dup_top\n");
     vtype_kind_t vtype;
     int reg = REG_TEMP0;
@@ -1937,33 +1937,33 @@ STATIC void emit_native_dup_top(emit_t *emit) {
     emit_post_push_reg_reg(emit, vtype, reg, vtype, reg);
 }
 
-STATIC void emit_native_dup_top_two(emit_t *emit) {
+static void emit_native_dup_top_two(emit_t *emit) {
     vtype_kind_t vtype0, vtype1;
     emit_pre_pop_reg_reg(emit, &vtype0, REG_TEMP0, &vtype1, REG_TEMP1);
     emit_post_push_reg_reg_reg_reg(emit, vtype1, REG_TEMP1, vtype0, REG_TEMP0, vtype1, REG_TEMP1, vtype0, REG_TEMP0);
 }
 
-STATIC void emit_native_pop_top(emit_t *emit) {
+static void emit_native_pop_top(emit_t *emit) {
     DEBUG_printf("pop_top\n");
     emit_pre_pop_discard(emit);
     emit_post(emit);
 }
 
-STATIC void emit_native_rot_two(emit_t *emit) {
+static void emit_native_rot_two(emit_t *emit) {
     DEBUG_printf("rot_two\n");
     vtype_kind_t vtype0, vtype1;
     emit_pre_pop_reg_reg(emit, &vtype0, REG_TEMP0, &vtype1, REG_TEMP1);
     emit_post_push_reg_reg(emit, vtype0, REG_TEMP0, vtype1, REG_TEMP1);
 }
 
-STATIC void emit_native_rot_three(emit_t *emit) {
+static void emit_native_rot_three(emit_t *emit) {
     DEBUG_printf("rot_three\n");
     vtype_kind_t vtype0, vtype1, vtype2;
     emit_pre_pop_reg_reg_reg(emit, &vtype0, REG_TEMP0, &vtype1, REG_TEMP1, &vtype2, REG_TEMP2);
     emit_post_push_reg_reg_reg(emit, vtype0, REG_TEMP0, vtype2, REG_TEMP2, vtype1, REG_TEMP1);
 }
 
-STATIC void emit_native_jump(emit_t *emit, mp_uint_t label) {
+static void emit_native_jump(emit_t *emit, mp_uint_t label) {
     DEBUG_printf("jump(label=" UINT_FMT ")\n", label);
     emit_native_pre(emit);
     // need to commit stack because we are jumping elsewhere
@@ -1973,7 +1973,7 @@ STATIC void emit_native_jump(emit_t *emit, mp_uint_t label) {
     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) {
+static void emit_native_jump_helper(emit_t *emit, bool cond, mp_uint_t label, bool pop) {
     vtype_kind_t vtype = peek_vtype(emit, 0);
     if (vtype == VTYPE_PYOBJ) {
         emit_pre_pop_reg(emit, &vtype, REG_ARG_1);
@@ -2010,17 +2010,17 @@ STATIC void emit_native_jump_helper(emit_t *emit, bool cond, mp_uint_t label, bo
     emit_post(emit);
 }
 
-STATIC void emit_native_pop_jump_if(emit_t *emit, bool cond, mp_uint_t label) {
+static void emit_native_pop_jump_if(emit_t *emit, bool cond, mp_uint_t label) {
     DEBUG_printf("pop_jump_if(cond=%u, label=" UINT_FMT ")\n", cond, label);
     emit_native_jump_helper(emit, cond, label, true);
 }
 
-STATIC void emit_native_jump_if_or_pop(emit_t *emit, bool cond, mp_uint_t label) {
+static void emit_native_jump_if_or_pop(emit_t *emit, bool cond, mp_uint_t label) {
     DEBUG_printf("jump_if_or_pop(cond=%u, label=" UINT_FMT ")\n", cond, label);
     emit_native_jump_helper(emit, cond, label, false);
 }
 
-STATIC void emit_native_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t except_depth) {
+static void emit_native_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t except_depth) {
     if (except_depth > 0) {
         exc_stack_entry_t *first_finally = NULL;
         exc_stack_entry_t *prev_finally = NULL;
@@ -2063,7 +2063,7 @@ STATIC void emit_native_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t exc
     emit_native_jump(emit, label & ~MP_EMIT_BREAK_FROM_FOR);
 }
 
-STATIC void emit_native_setup_with(emit_t *emit, mp_uint_t label) {
+static void emit_native_setup_with(emit_t *emit, mp_uint_t label) {
     // the context manager is on the top of the stack
     // stack: (..., ctx_mgr)
 
@@ -2102,7 +2102,7 @@ STATIC void emit_native_setup_with(emit_t *emit, mp_uint_t label) {
     // stack: (..., __exit__, self, as_value, as_value)
 }
 
-STATIC void emit_native_setup_block(emit_t *emit, mp_uint_t label, int kind) {
+static void emit_native_setup_block(emit_t *emit, mp_uint_t label, int kind) {
     if (kind == MP_EMIT_SETUP_BLOCK_WITH) {
         emit_native_setup_with(emit, label);
     } else {
@@ -2114,7 +2114,7 @@ STATIC void emit_native_setup_block(emit_t *emit, mp_uint_t label, int kind) {
     }
 }
 
-STATIC void emit_native_with_cleanup(emit_t *emit, mp_uint_t label) {
+static void emit_native_with_cleanup(emit_t *emit, mp_uint_t label) {
     // Note: 3 labels are reserved for this function, starting at *emit->label_slot
 
     // stack: (..., __exit__, self, as_value)
@@ -2181,7 +2181,7 @@ STATIC void emit_native_with_cleanup(emit_t *emit, mp_uint_t label) {
     // Exception is in nlr_buf.ret_val slot
 }
 
-STATIC void emit_native_end_finally(emit_t *emit) {
+static void emit_native_end_finally(emit_t *emit) {
     // logic:
     //   exc = pop_stack
     //   if exc == None: pass
@@ -2207,7 +2207,7 @@ STATIC void emit_native_end_finally(emit_t *emit) {
     emit_post(emit);
 }
 
-STATIC void emit_native_get_iter(emit_t *emit, bool use_stack) {
+static void emit_native_get_iter(emit_t *emit, bool use_stack) {
     // perhaps the difficult one, as we want to rewrite for loops using native code
     // in cases where we iterate over a Python object, can we use normal runtime calls?
 
@@ -2225,7 +2225,7 @@ STATIC void emit_native_get_iter(emit_t *emit, bool use_stack) {
     }
 }
 
-STATIC void emit_native_for_iter(emit_t *emit, mp_uint_t label) {
+static void emit_native_for_iter(emit_t *emit, mp_uint_t label) {
     emit_native_pre(emit);
     emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_1, MP_OBJ_ITER_BUF_NSLOTS);
     adjust_stack(emit, MP_OBJ_ITER_BUF_NSLOTS);
@@ -2240,14 +2240,14 @@ STATIC void emit_native_for_iter(emit_t *emit, mp_uint_t label) {
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_for_iter_end(emit_t *emit) {
+static void emit_native_for_iter_end(emit_t *emit) {
     // adjust stack counter (we get here from for_iter ending, which popped the value for us)
     emit_native_pre(emit);
     adjust_stack(emit, -MP_OBJ_ITER_BUF_NSLOTS);
     emit_post(emit);
 }
 
-STATIC void emit_native_pop_except_jump(emit_t *emit, mp_uint_t label, bool within_exc_handler) {
+static void emit_native_pop_except_jump(emit_t *emit, mp_uint_t label, bool within_exc_handler) {
     if (within_exc_handler) {
         // Cancel any active exception so subsequent handlers don't see it
         ASM_MOV_REG_IMM(emit->as, REG_TEMP0, (mp_uint_t)MP_OBJ_NULL);
@@ -2258,7 +2258,7 @@ STATIC void emit_native_pop_except_jump(emit_t *emit, mp_uint_t label, bool with
     emit_native_jump(emit, label);
 }
 
-STATIC void emit_native_unary_op(emit_t *emit, mp_unary_op_t op) {
+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) {
@@ -2271,7 +2271,7 @@ STATIC void emit_native_unary_op(emit_t *emit, mp_unary_op_t op) {
     }
 }
 
-STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
+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);
@@ -2534,10 +2534,10 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
 }
 
 #if MICROPY_PY_BUILTINS_SLICE
-STATIC void emit_native_build_slice(emit_t *emit, mp_uint_t n_args);
+static void emit_native_build_slice(emit_t *emit, mp_uint_t n_args);
 #endif
 
-STATIC void emit_native_build(emit_t *emit, mp_uint_t n_args, int kind) {
+static void emit_native_build(emit_t *emit, mp_uint_t n_args, int kind) {
     // for viper: call runtime, with types of args
     //   if wrapped in byte_array, or something, allocates memory and fills it
     MP_STATIC_ASSERT(MP_F_BUILD_TUPLE + MP_EMIT_BUILD_TUPLE == MP_F_BUILD_TUPLE);
@@ -2558,7 +2558,7 @@ STATIC void emit_native_build(emit_t *emit, mp_uint_t n_args, int kind) {
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET); // new tuple/list/map/set
 }
 
-STATIC void emit_native_store_map(emit_t *emit) {
+static void emit_native_store_map(emit_t *emit) {
     vtype_kind_t vtype_key, vtype_value, vtype_map;
     emit_pre_pop_reg_reg_reg(emit, &vtype_key, REG_ARG_2, &vtype_value, REG_ARG_3, &vtype_map, REG_ARG_1); // key, value, map
     assert(vtype_key == VTYPE_PYOBJ);
@@ -2569,7 +2569,7 @@ STATIC void emit_native_store_map(emit_t *emit) {
 }
 
 #if MICROPY_PY_BUILTINS_SLICE
-STATIC void emit_native_build_slice(emit_t *emit, mp_uint_t n_args) {
+static void emit_native_build_slice(emit_t *emit, mp_uint_t n_args) {
     DEBUG_printf("build_slice %d\n", n_args);
     if (n_args == 2) {
         vtype_kind_t vtype_start, vtype_stop;
@@ -2590,7 +2590,7 @@ STATIC void emit_native_build_slice(emit_t *emit, mp_uint_t n_args) {
 }
 #endif
 
-STATIC void emit_native_store_comp(emit_t *emit, scope_kind_t kind, mp_uint_t collection_index) {
+static void emit_native_store_comp(emit_t *emit, scope_kind_t kind, mp_uint_t collection_index) {
     mp_fun_kind_t f;
     if (kind == SCOPE_LIST_COMP) {
         vtype_kind_t vtype_item;
@@ -2619,7 +2619,7 @@ STATIC void emit_native_store_comp(emit_t *emit, scope_kind_t kind, mp_uint_t co
     emit_post(emit);
 }
 
-STATIC void emit_native_unpack_sequence(emit_t *emit, mp_uint_t n_args) {
+static void emit_native_unpack_sequence(emit_t *emit, mp_uint_t n_args) {
     DEBUG_printf("unpack_sequence %d\n", n_args);
     vtype_kind_t vtype_base;
     emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1); // arg1 = seq
@@ -2628,7 +2628,7 @@ STATIC void emit_native_unpack_sequence(emit_t *emit, mp_uint_t n_args) {
     emit_call_with_imm_arg(emit, MP_F_UNPACK_SEQUENCE, n_args, REG_ARG_2); // arg2 = n_args
 }
 
-STATIC void emit_native_unpack_ex(emit_t *emit, mp_uint_t n_left, mp_uint_t n_right) {
+static void emit_native_unpack_ex(emit_t *emit, mp_uint_t n_left, mp_uint_t n_right) {
     DEBUG_printf("unpack_ex %d %d\n", n_left, n_right);
     vtype_kind_t vtype_base;
     emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1); // arg1 = seq
@@ -2637,7 +2637,7 @@ STATIC void emit_native_unpack_ex(emit_t *emit, mp_uint_t n_left, mp_uint_t n_ri
     emit_call_with_imm_arg(emit, MP_F_UNPACK_EX, n_left | (n_right << 8), REG_ARG_2); // arg2 = n_left + n_right
 }
 
-STATIC void emit_native_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
+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));
@@ -2654,7 +2654,7 @@ STATIC void emit_native_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_
     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) {
+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));
@@ -2683,7 +2683,7 @@ STATIC void emit_native_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_c
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
-STATIC void emit_native_call_function(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {
+static void emit_native_call_function(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {
     DEBUG_printf("call_function(n_pos=" UINT_FMT ", n_kw=" UINT_FMT ", star_flags=" UINT_FMT ")\n", n_positional, n_keyword, star_flags);
 
     // TODO: in viper mode, call special runtime routine with type info for args,
@@ -2738,7 +2738,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) {
+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 + 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);
@@ -2751,7 +2751,7 @@ STATIC void emit_native_call_method(emit_t *emit, mp_uint_t n_positional, mp_uin
     }
 }
 
-STATIC void emit_native_return_value(emit_t *emit) {
+static void emit_native_return_value(emit_t *emit) {
     DEBUG_printf("return_value\n");
 
     if (emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR) {
@@ -2804,7 +2804,7 @@ STATIC void emit_native_return_value(emit_t *emit) {
     emit_native_unwind_jump(emit, emit->exit_label, emit->exc_stack_size);
 }
 
-STATIC void emit_native_raise_varargs(emit_t *emit, mp_uint_t n_args) {
+static void emit_native_raise_varargs(emit_t *emit, mp_uint_t n_args) {
     (void)n_args;
     assert(n_args == 1);
     vtype_kind_t vtype_exc;
@@ -2817,7 +2817,7 @@ STATIC void emit_native_raise_varargs(emit_t *emit, mp_uint_t n_args) {
     mp_asm_base_suppress_code(&emit->as->base);
 }
 
-STATIC void emit_native_yield(emit_t *emit, int kind) {
+static void emit_native_yield(emit_t *emit, int kind) {
     // Note: 1 (yield) or 3 (yield from) labels are reserved for this function, starting at *emit->label_slot
 
     if (emit->do_viper_types) {
@@ -2900,7 +2900,7 @@ STATIC void emit_native_yield(emit_t *emit, int kind) {
     }
 }
 
-STATIC void emit_native_start_except_handler(emit_t *emit) {
+static void emit_native_start_except_handler(emit_t *emit) {
     // Protected block has finished so leave the current exception handler
     emit_native_leave_exc_stack(emit, true);
 
@@ -2909,7 +2909,7 @@ STATIC void emit_native_start_except_handler(emit_t *emit) {
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_TEMP0);
 }
 
-STATIC void emit_native_end_except_handler(emit_t *emit) {
+static void emit_native_end_except_handler(emit_t *emit) {
     adjust_stack(emit, -1); // pop the exception (end_finally didn't use it)
 }
 
diff --git a/py/emitnx86.c b/py/emitnx86.c
index cb2b7f19eac73..1d2aefa7920bc 100644
--- a/py/emitnx86.c
+++ b/py/emitnx86.c
@@ -13,7 +13,7 @@
 #define NLR_BUF_IDX_LOCAL_1 (5) // ebx
 
 // x86 needs a table to know how many args a given function has
-STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
+static byte mp_f_n_args[MP_F_NUMBER_OF] = {
     [MP_F_CONVERT_OBJ_TO_NATIVE] = 2,
     [MP_F_CONVERT_NATIVE_TO_OBJ] = 2,
     [MP_F_NATIVE_SWAP_GLOBALS] = 1,
diff --git a/py/gc.c b/py/gc.c
index b6969dfd42429..8a03ce5264e89 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -121,7 +121,7 @@
 #endif
 
 // TODO waste less memory; currently requires that all entries in alloc_table have a corresponding block in pool
-STATIC void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
+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
@@ -239,7 +239,7 @@ void gc_add(void *start, void *end) {
 
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 // Try to automatically add a heap area large enough to fulfill 'failed_alloc'.
-STATIC bool gc_try_add_heap(size_t failed_alloc) {
+static bool gc_try_add_heap(size_t failed_alloc) {
     // 'needed' is the size of a heap large enough to hold failed_alloc, with
     // the additional metadata overheads as calculated in gc_setup_area().
     //
@@ -349,7 +349,7 @@ bool gc_is_locked(void) {
 #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) {
+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;
     }
@@ -383,9 +383,9 @@ STATIC inline mp_state_mem_area_t *gc_get_ptr_area(const void *ptr) {
 // blocks on the stack. When all children have been checked, pop off the
 // topmost block on the stack and repeat with that one.
 #if MICROPY_GC_SPLIT_HEAP
-STATIC void gc_mark_subtree(mp_state_mem_area_t *area, size_t block)
+static void gc_mark_subtree(mp_state_mem_area_t *area, size_t block)
 #else
-STATIC void gc_mark_subtree(size_t block)
+static void gc_mark_subtree(size_t block)
 #endif
 {
     // Start with the block passed in the argument.
@@ -456,7 +456,7 @@ STATIC void gc_mark_subtree(size_t block)
     }
 }
 
-STATIC void gc_deal_with_stack_overflow(void) {
+static void gc_deal_with_stack_overflow(void) {
     while (MP_STATE_MEM(gc_stack_overflow)) {
         MP_STATE_MEM(gc_stack_overflow) = 0;
 
@@ -477,7 +477,7 @@ STATIC void gc_deal_with_stack_overflow(void) {
     }
 }
 
-STATIC void gc_sweep(void) {
+static void gc_sweep(void) {
     #if MICROPY_PY_GC_COLLECT_RETVAL
     MP_STATE_MEM(gc_collected) = 0;
     #endif
diff --git a/py/lexer.c b/py/lexer.c
index 5e911a1a23337..bff8e637656d6 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -42,74 +42,74 @@
 #define MP_LEXER_EOF ((unichar)MP_READER_EOF)
 #define CUR_CHAR(lex) ((lex)->chr0)
 
-STATIC bool is_end(mp_lexer_t *lex) {
+static bool is_end(mp_lexer_t *lex) {
     return lex->chr0 == MP_LEXER_EOF;
 }
 
-STATIC bool is_physical_newline(mp_lexer_t *lex) {
+static bool is_physical_newline(mp_lexer_t *lex) {
     return lex->chr0 == '\n';
 }
 
-STATIC bool is_char(mp_lexer_t *lex, byte c) {
+static bool is_char(mp_lexer_t *lex, byte c) {
     return lex->chr0 == c;
 }
 
-STATIC bool is_char_or(mp_lexer_t *lex, byte c1, byte c2) {
+static bool is_char_or(mp_lexer_t *lex, byte c1, byte c2) {
     return lex->chr0 == c1 || lex->chr0 == c2;
 }
 
-STATIC bool is_char_or3(mp_lexer_t *lex, byte c1, byte c2, byte c3) {
+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) {
+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) {
+static bool is_char_following(mp_lexer_t *lex, byte c) {
     return lex->chr1 == c;
 }
 
-STATIC bool is_char_following_or(mp_lexer_t *lex, byte c1, byte c2) {
+static bool is_char_following_or(mp_lexer_t *lex, byte c1, byte c2) {
     return lex->chr1 == c1 || lex->chr1 == c2;
 }
 
-STATIC bool is_char_following_following_or(mp_lexer_t *lex, byte c1, byte c2) {
+static bool is_char_following_following_or(mp_lexer_t *lex, byte c1, byte c2) {
     return lex->chr2 == c1 || lex->chr2 == c2;
 }
 
-STATIC bool is_char_and(mp_lexer_t *lex, byte c1, byte c2) {
+static bool is_char_and(mp_lexer_t *lex, byte c1, byte c2) {
     return lex->chr0 == c1 && lex->chr1 == c2;
 }
 
-STATIC bool is_whitespace(mp_lexer_t *lex) {
+static bool is_whitespace(mp_lexer_t *lex) {
     return unichar_isspace(lex->chr0);
 }
 
-STATIC bool is_letter(mp_lexer_t *lex) {
+static bool is_letter(mp_lexer_t *lex) {
     return unichar_isalpha(lex->chr0);
 }
 
-STATIC bool is_digit(mp_lexer_t *lex) {
+static bool is_digit(mp_lexer_t *lex) {
     return unichar_isdigit(lex->chr0);
 }
 
-STATIC bool is_following_digit(mp_lexer_t *lex) {
+static bool is_following_digit(mp_lexer_t *lex) {
     return unichar_isdigit(lex->chr1);
 }
 
-STATIC bool is_following_base_char(mp_lexer_t *lex) {
+static bool is_following_base_char(mp_lexer_t *lex) {
     const unichar chr1 = lex->chr1 | 0x20;
     return chr1 == 'b' || chr1 == 'o' || chr1 == 'x';
 }
 
-STATIC bool is_following_odigit(mp_lexer_t *lex) {
+static bool is_following_odigit(mp_lexer_t *lex) {
     return lex->chr1 >= '0' && lex->chr1 <= '7';
 }
 
-STATIC bool is_string_or_bytes(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, '\'', '\"'))
@@ -123,15 +123,15 @@ STATIC bool is_string_or_bytes(mp_lexer_t *lex) {
 }
 
 // to easily parse utf-8 identifiers we allow any raw byte with high bit set
-STATIC bool is_head_of_identifier(mp_lexer_t *lex) {
+static bool is_head_of_identifier(mp_lexer_t *lex) {
     return is_letter(lex) || lex->chr0 == '_' || lex->chr0 >= 0x80;
 }
 
-STATIC bool is_tail_of_identifier(mp_lexer_t *lex) {
+static bool is_tail_of_identifier(mp_lexer_t *lex) {
     return is_head_of_identifier(lex) || is_digit(lex);
 }
 
-STATIC void next_char(mp_lexer_t *lex) {
+static void next_char(mp_lexer_t *lex) {
     if (lex->chr0 == '\n') {
         // a new line
         ++lex->line;
@@ -189,7 +189,7 @@ STATIC void next_char(mp_lexer_t *lex) {
     }
 }
 
-STATIC void indent_push(mp_lexer_t *lex, size_t indent) {
+static void indent_push(mp_lexer_t *lex, size_t indent) {
     if (lex->num_indent_level >= lex->alloc_indent_level) {
         lex->indent_level = m_renew(uint16_t, lex->indent_level, lex->alloc_indent_level, lex->alloc_indent_level + MICROPY_ALLOC_LEXEL_INDENT_INC);
         lex->alloc_indent_level += MICROPY_ALLOC_LEXEL_INDENT_INC;
@@ -197,11 +197,11 @@ STATIC void indent_push(mp_lexer_t *lex, size_t indent) {
     lex->indent_level[lex->num_indent_level++] = indent;
 }
 
-STATIC size_t indent_top(mp_lexer_t *lex) {
+static size_t indent_top(mp_lexer_t *lex) {
     return lex->indent_level[lex->num_indent_level - 1];
 }
 
-STATIC void indent_pop(mp_lexer_t *lex) {
+static void indent_pop(mp_lexer_t *lex) {
     lex->num_indent_level -= 1;
 }
 
@@ -211,7 +211,7 @@ STATIC void indent_pop(mp_lexer_t *lex) {
 //     c<op> = continue with <op>, if this opchar matches then continue matching
 // 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 =
+static const char *const tok_enc =
     "()[]{},;~"   // singles
     ":e="         // : :=
     "<e=c<e="     // < <= << <<=
@@ -229,7 +229,7 @@ STATIC const char *const tok_enc =
     "!.";         // start of special cases: != . ...
 
 // TODO static assert that number of tokens is less than 256 so we can safely make this table with byte sized entries
-STATIC const uint8_t tok_enc_kind[] = {
+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,
@@ -252,7 +252,7 @@ STATIC const uint8_t tok_enc_kind[] = {
 
 // must have the same order as enum in lexer.h
 // must be sorted according to strcmp
-STATIC const char *const tok_kw[] = {
+static const char *const tok_kw[] = {
     "False",
     "None",
     "True",
@@ -296,7 +296,7 @@ STATIC const char *const tok_kw[] = {
 // This is called with CUR_CHAR() before first hex digit, and should return with
 // it pointing to last hex digit
 // num_digits must be greater than zero
-STATIC bool get_hex(mp_lexer_t *lex, size_t num_digits, mp_uint_t *result) {
+static bool get_hex(mp_lexer_t *lex, size_t num_digits, mp_uint_t *result) {
     mp_uint_t num = 0;
     while (num_digits-- != 0) {
         next_char(lex);
@@ -310,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, bool is_fstring) {
+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, '\"')) {
@@ -529,7 +529,7 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
 
 // This function returns whether it has crossed a newline or not.
 // It therefore always return true if stop_at_newline is true
-STATIC bool skip_whitespace(mp_lexer_t *lex, bool stop_at_newline) {
+static bool skip_whitespace(mp_lexer_t *lex, bool stop_at_newline) {
     while (!is_end(lex)) {
         if (is_physical_newline(lex)) {
             if (stop_at_newline && lex->nested_bracket_level == 0) {
diff --git a/py/malloc.c b/py/malloc.c
index ddf139e386053..f557ade44f500 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -69,7 +69,7 @@
 #error MICROPY_ENABLE_FINALISER requires MICROPY_ENABLE_GC
 #endif
 
-STATIC void *realloc_ext(void *ptr, size_t n_bytes, bool allow_move) {
+static void *realloc_ext(void *ptr, size_t n_bytes, bool allow_move) {
     if (allow_move) {
         return realloc(ptr, n_bytes);
     } else {
@@ -221,7 +221,7 @@ typedef struct _m_tracked_node_t {
 } m_tracked_node_t;
 
 #if MICROPY_DEBUG_VERBOSE
-STATIC size_t m_tracked_count_links(size_t *nb) {
+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;
diff --git a/py/map.c b/py/map.c
index c18df5a9f333c..d40e3dc4d02d7 100644
--- a/py/map.c
+++ b/py/map.c
@@ -65,14 +65,14 @@
 // 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
 // prime.  The latter sizes are prime and increase at an increasing rate.
-STATIC const uint16_t hash_allocation_sizes[] = {
+static const uint16_t hash_allocation_sizes[] = {
     0, 2, 4, 6, 8, 10, 12, // +2
     17, 23, 29, 37, 47, 59, 73, // *1.25
     97, 127, 167, 223, 293, 389, 521, 691, 919, 1223, 1627, 2161, // *1.33
     3229, 4831, 7243, 10861, 16273, 24407, 36607, 54907, // *1.5
 };
 
-STATIC size_t get_hash_alloc_greater_or_equal_to(size_t x) {
+static size_t get_hash_alloc_greater_or_equal_to(size_t x) {
     for (size_t i = 0; i < MP_ARRAY_SIZE(hash_allocation_sizes); i++) {
         if (hash_allocation_sizes[i] >= x) {
             return hash_allocation_sizes[i];
@@ -128,7 +128,7 @@ void mp_map_clear(mp_map_t *map) {
     map->table = NULL;
 }
 
-STATIC void mp_map_rehash(mp_map_t *map) {
+static void mp_map_rehash(mp_map_t *map) {
     size_t old_alloc = map->alloc;
     size_t new_alloc = get_hash_alloc_greater_or_equal_to(map->alloc + 1);
     DEBUG_printf("mp_map_rehash(%p): " UINT_FMT " -> " UINT_FMT "\n", map, old_alloc, new_alloc);
@@ -332,7 +332,7 @@ void mp_set_init(mp_set_t *set, size_t n) {
     set->table = m_new0(mp_obj_t, set->alloc);
 }
 
-STATIC void mp_set_rehash(mp_set_t *set) {
+static void mp_set_rehash(mp_set_t *set) {
     size_t old_alloc = set->alloc;
     mp_obj_t *old_table = set->table;
     set->alloc = get_hash_alloc_greater_or_equal_to(set->alloc + 1);
diff --git a/py/modarray.c b/py/modarray.c
index ac2e56ed38b40..116c844e8eb1c 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -28,12 +28,12 @@
 
 #if MICROPY_PY_ARRAY
 
-STATIC const mp_rom_map_elem_t mp_module_array_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_array_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_array) },
     { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_type_array) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_array_globals, mp_module_array_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_array_globals, mp_module_array_globals_table);
 
 const mp_obj_module_t mp_module_array = {
     .base = { &mp_type_module },
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 4ff7d445097df..51cf3137bfddb 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -46,7 +46,7 @@ extern struct _mp_dummy_t mp_sys_stdout_obj; // type is irrelevant, just need po
 // args[0] is function from class body
 // args[1] is class name
 // args[2:] are base objects
-STATIC mp_obj_t mp_builtin___build_class__(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin___build_class__(size_t n_args, const mp_obj_t *args) {
     assert(2 <= n_args);
 
     // set the new classes __locals__ object
@@ -88,12 +88,12 @@ STATIC mp_obj_t mp_builtin___build_class__(size_t n_args, const mp_obj_t *args)
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR(mp_builtin___build_class___obj, 2, mp_builtin___build_class__);
 
-STATIC mp_obj_t mp_builtin_abs(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_abs(mp_obj_t o_in) {
     return mp_unary_op(MP_UNARY_OP_ABS, o_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_abs_obj, mp_builtin_abs);
 
-STATIC mp_obj_t mp_builtin_all(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_all(mp_obj_t o_in) {
     mp_obj_iter_buf_t iter_buf;
     mp_obj_t iterable = mp_getiter(o_in, &iter_buf);
     mp_obj_t item;
@@ -106,7 +106,7 @@ STATIC mp_obj_t mp_builtin_all(mp_obj_t o_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_all_obj, mp_builtin_all);
 
-STATIC mp_obj_t mp_builtin_any(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_any(mp_obj_t o_in) {
     mp_obj_iter_buf_t iter_buf;
     mp_obj_t iterable = mp_getiter(o_in, &iter_buf);
     mp_obj_t item;
@@ -119,13 +119,13 @@ STATIC mp_obj_t mp_builtin_any(mp_obj_t o_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_any_obj, mp_builtin_any);
 
-STATIC mp_obj_t mp_builtin_bin(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_bin(mp_obj_t o_in) {
     mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR__brace_open__colon__hash_b_brace_close_), o_in };
     return mp_obj_str_format(MP_ARRAY_SIZE(args), args, NULL);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_bin_obj, mp_builtin_bin);
 
-STATIC mp_obj_t mp_builtin_callable(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_callable(mp_obj_t o_in) {
     if (mp_obj_is_callable(o_in)) {
         return mp_const_true;
     } else {
@@ -134,7 +134,7 @@ STATIC mp_obj_t mp_builtin_callable(mp_obj_t o_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_callable_obj, mp_builtin_callable);
 
-STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
     #if MICROPY_PY_BUILTINS_STR_UNICODE
     mp_uint_t c = mp_obj_get_int(o_in);
     if (c >= 0x110000) {
@@ -155,7 +155,7 @@ STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_chr_obj, mp_builtin_chr);
 
-STATIC mp_obj_t mp_builtin_dir(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_dir(size_t n_args, const mp_obj_t *args) {
     mp_obj_t dir = mp_obj_new_list(0, NULL);
     if (n_args == 0) {
         // Make a list of names in the local namespace
@@ -188,18 +188,18 @@ STATIC mp_obj_t mp_builtin_dir(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_dir_obj, 0, 1, mp_builtin_dir);
 
-STATIC mp_obj_t mp_builtin_divmod(mp_obj_t o1_in, mp_obj_t o2_in) {
+static mp_obj_t mp_builtin_divmod(mp_obj_t o1_in, mp_obj_t o2_in) {
     return mp_binary_op(MP_BINARY_OP_DIVMOD, o1_in, o2_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_divmod_obj, mp_builtin_divmod);
 
-STATIC mp_obj_t mp_builtin_hash(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_hash(mp_obj_t o_in) {
     // result is guaranteed to be a (small) int
     return mp_unary_op(MP_UNARY_OP_HASH, o_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_hash_obj, mp_builtin_hash);
 
-STATIC mp_obj_t mp_builtin_hex(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_hex(mp_obj_t o_in) {
     #if MICROPY_PY_BUILTINS_STR_OP_MODULO
     return mp_binary_op(MP_BINARY_OP_MODULO, MP_OBJ_NEW_QSTR(MP_QSTR__percent__hash_x), o_in);
     #else
@@ -219,7 +219,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_hex_obj, mp_builtin_hex);
 #define mp_hal_readline readline
 #endif
 
-STATIC mp_obj_t mp_builtin_input(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_input(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         mp_obj_print(args[0], PRINT_STR);
     }
@@ -238,14 +238,14 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj, 0, 1, mp_builtin_input
 
 #endif
 
-STATIC mp_obj_t mp_builtin_iter(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_iter(mp_obj_t o_in) {
     return mp_getiter(o_in, NULL);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_iter_obj, mp_builtin_iter);
 
 #if MICROPY_PY_BUILTINS_MIN_MAX
 
-STATIC mp_obj_t mp_builtin_min_max(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs, mp_uint_t op) {
+static mp_obj_t mp_builtin_min_max(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs, mp_uint_t op) {
     mp_map_elem_t *key_elem = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_key), MP_MAP_LOOKUP);
     mp_map_elem_t *default_elem;
     mp_obj_t key_fn = key_elem == NULL ? MP_OBJ_NULL : key_elem->value;
@@ -287,12 +287,12 @@ STATIC mp_obj_t mp_builtin_min_max(size_t n_args, const mp_obj_t *args, mp_map_t
     }
 }
 
-STATIC mp_obj_t mp_builtin_max(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static mp_obj_t mp_builtin_max(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     return mp_builtin_min_max(n_args, args, kwargs, MP_BINARY_OP_MORE);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_max_obj, 1, mp_builtin_max);
 
-STATIC mp_obj_t mp_builtin_min(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static mp_obj_t mp_builtin_min(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     return mp_builtin_min_max(n_args, args, kwargs, MP_BINARY_OP_LESS);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_min_obj, 1, mp_builtin_min);
@@ -300,7 +300,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_min_obj, 1, mp_builtin_min);
 #endif
 
 #if MICROPY_PY_BUILTINS_NEXT2
-STATIC mp_obj_t mp_builtin_next(size_t n_args, const mp_obj_t *args) {
+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) {
@@ -315,7 +315,7 @@ STATIC mp_obj_t mp_builtin_next(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_next_obj, 1, 2, mp_builtin_next);
 #else
-STATIC mp_obj_t mp_builtin_next(mp_obj_t o) {
+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_StopIteration(MP_STATE_THREAD(stop_iteration_arg));
@@ -326,7 +326,7 @@ STATIC mp_obj_t mp_builtin_next(mp_obj_t o) {
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_next_obj, mp_builtin_next);
 #endif
 
-STATIC mp_obj_t mp_builtin_oct(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_oct(mp_obj_t o_in) {
     #if MICROPY_PY_BUILTINS_STR_OP_MODULO
     return mp_binary_op(MP_BINARY_OP_MODULO, MP_OBJ_NEW_QSTR(MP_QSTR__percent__hash_o), o_in);
     #else
@@ -336,7 +336,7 @@ STATIC mp_obj_t mp_builtin_oct(mp_obj_t o_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_oct_obj, mp_builtin_oct);
 
-STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
     size_t len;
     const byte *str = (const byte *)mp_obj_str_get_data(o_in, &len);
     #if MICROPY_PY_BUILTINS_STR_UNICODE
@@ -363,7 +363,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_ord_obj, mp_builtin_ord);
 
-STATIC mp_obj_t mp_builtin_pow(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_pow(size_t n_args, const mp_obj_t *args) {
     switch (n_args) {
         case 2:
             return mp_binary_op(MP_BINARY_OP_POWER, args[0], args[1]);
@@ -379,7 +379,7 @@ STATIC mp_obj_t mp_builtin_pow(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_pow_obj, 2, 3, mp_builtin_pow);
 
-STATIC mp_obj_t mp_builtin_print(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t mp_builtin_print(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_sep, ARG_end, ARG_file };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_sep, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_QSTR(MP_QSTR__space_)} },
@@ -430,7 +430,7 @@ STATIC mp_obj_t mp_builtin_print(size_t n_args, const mp_obj_t *pos_args, mp_map
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_print_obj, 0, mp_builtin_print);
 
-STATIC mp_obj_t mp_builtin___repl_print__(mp_obj_t o) {
+static mp_obj_t mp_builtin___repl_print__(mp_obj_t o) {
     if (o != mp_const_none) {
         mp_obj_print_helper(MP_PYTHON_PRINTER, o, PRINT_REPR);
         mp_print_str(MP_PYTHON_PRINTER, "\n");
@@ -444,7 +444,7 @@ STATIC mp_obj_t mp_builtin___repl_print__(mp_obj_t o) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin___repl_print___obj, mp_builtin___repl_print__);
 
-STATIC mp_obj_t mp_builtin_repr(mp_obj_t o_in) {
+static mp_obj_t mp_builtin_repr(mp_obj_t o_in) {
     vstr_t vstr;
     mp_print_t print;
     vstr_init_print(&vstr, 16, &print);
@@ -453,7 +453,7 @@ STATIC mp_obj_t mp_builtin_repr(mp_obj_t o_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_repr_obj, mp_builtin_repr);
 
-STATIC mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) {
     mp_obj_t o_in = args[0];
     if (mp_obj_is_int(o_in)) {
         if (n_args <= 1) {
@@ -505,7 +505,7 @@ STATIC mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_round_obj, 1, 2, mp_builtin_round);
 
-STATIC mp_obj_t mp_builtin_sum(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_sum(size_t n_args, const mp_obj_t *args) {
     mp_obj_t value;
     switch (n_args) {
         case 1:
@@ -525,7 +525,7 @@ STATIC mp_obj_t mp_builtin_sum(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_sum_obj, 1, 2, mp_builtin_sum);
 
-STATIC mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     if (n_args > 1) {
         mp_raise_TypeError(MP_ERROR_TEXT("must use keyword argument for key function"));
     }
@@ -556,7 +556,7 @@ static inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t d
     }
 }
 
-STATIC mp_obj_t mp_builtin_getattr(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_builtin_getattr(size_t n_args, const mp_obj_t *args) {
     mp_obj_t defval = MP_OBJ_NULL;
     if (n_args > 2) {
         defval = args[2];
@@ -565,20 +565,20 @@ STATIC mp_obj_t mp_builtin_getattr(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr);
 
-STATIC mp_obj_t mp_builtin_setattr(mp_obj_t base, mp_obj_t attr, mp_obj_t value) {
+static mp_obj_t mp_builtin_setattr(mp_obj_t base, mp_obj_t attr, mp_obj_t value) {
     mp_store_attr(base, mp_obj_str_get_qstr(attr), value);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_3(mp_builtin_setattr_obj, mp_builtin_setattr);
 
 #if MICROPY_CPYTHON_COMPAT
-STATIC mp_obj_t mp_builtin_delattr(mp_obj_t base, mp_obj_t attr) {
+static mp_obj_t mp_builtin_delattr(mp_obj_t base, mp_obj_t attr) {
     return mp_builtin_setattr(base, attr, MP_OBJ_NULL);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_delattr_obj, mp_builtin_delattr);
 #endif
 
-STATIC mp_obj_t mp_builtin_hasattr(mp_obj_t object_in, mp_obj_t attr_in) {
+static mp_obj_t mp_builtin_hasattr(mp_obj_t object_in, mp_obj_t attr_in) {
     qstr attr = mp_obj_str_get_qstr(attr_in);
     mp_obj_t dest[2];
     mp_load_method_protected(object_in, attr, dest, false);
@@ -586,12 +586,12 @@ STATIC mp_obj_t mp_builtin_hasattr(mp_obj_t object_in, mp_obj_t attr_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_hasattr_obj, mp_builtin_hasattr);
 
-STATIC mp_obj_t mp_builtin_globals(void) {
+static mp_obj_t mp_builtin_globals(void) {
     return MP_OBJ_FROM_PTR(mp_globals_get());
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_globals_obj, mp_builtin_globals);
 
-STATIC mp_obj_t mp_builtin_locals(void) {
+static mp_obj_t mp_builtin_locals(void) {
     return MP_OBJ_FROM_PTR(mp_locals_get());
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_locals_obj, mp_builtin_locals);
@@ -600,7 +600,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_locals_obj, mp_builtin_locals);
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_id_obj, mp_obj_id);
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_len_obj, mp_obj_len);
 
-STATIC const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_builtins) },
 
     // built-in core functions
diff --git a/py/modcmath.c b/py/modcmath.c
index 1418362ad9b1e..33cb00cbe7e69 100644
--- a/py/modcmath.c
+++ b/py/modcmath.c
@@ -31,15 +31,15 @@
 #include <math.h>
 
 // phase(z): returns the phase of the number z in the range (-pi, +pi]
-STATIC mp_obj_t mp_cmath_phase(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_phase(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     return mp_obj_new_float(MICROPY_FLOAT_C_FUN(atan2)(imag, real));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_phase_obj, mp_cmath_phase);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_phase_obj, mp_cmath_phase);
 
 // polar(z): returns the polar form of z as a tuple
-STATIC mp_obj_t mp_cmath_polar(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_polar(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     mp_obj_t tuple[2] = {
@@ -48,71 +48,71 @@ STATIC mp_obj_t mp_cmath_polar(mp_obj_t z_obj) {
     };
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_polar_obj, mp_cmath_polar);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_polar_obj, mp_cmath_polar);
 
 // rect(r, phi): returns the complex number with modulus r and phase phi
-STATIC mp_obj_t mp_cmath_rect(mp_obj_t r_obj, mp_obj_t phi_obj) {
+static mp_obj_t mp_cmath_rect(mp_obj_t r_obj, mp_obj_t phi_obj) {
     mp_float_t r = mp_obj_get_float(r_obj);
     mp_float_t phi = mp_obj_get_float(phi_obj);
     return mp_obj_new_complex(r * MICROPY_FLOAT_C_FUN(cos)(phi), r * MICROPY_FLOAT_C_FUN(sin)(phi));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_cmath_rect_obj, mp_cmath_rect);
+static MP_DEFINE_CONST_FUN_OBJ_2(mp_cmath_rect_obj, mp_cmath_rect);
 
 // exp(z): return the exponential of z
-STATIC mp_obj_t mp_cmath_exp(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_exp(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     mp_float_t exp_real = MICROPY_FLOAT_C_FUN(exp)(real);
     return mp_obj_new_complex(exp_real * MICROPY_FLOAT_C_FUN(cos)(imag), exp_real * MICROPY_FLOAT_C_FUN(sin)(imag));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_exp_obj, mp_cmath_exp);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_exp_obj, mp_cmath_exp);
 
 // log(z): return the natural logarithm of z, with branch cut along the negative real axis
 // TODO can take second argument, being the base
-STATIC mp_obj_t mp_cmath_log(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_log(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     return mp_obj_new_complex(MICROPY_FLOAT_CONST(0.5) * MICROPY_FLOAT_C_FUN(log)(real * real + imag * imag), MICROPY_FLOAT_C_FUN(atan2)(imag, real));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log_obj, mp_cmath_log);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log_obj, mp_cmath_log);
 
 #if MICROPY_PY_MATH_SPECIAL_FUNCTIONS
 // log10(z): return the base-10 logarithm of z, with branch cut along the negative real axis
-STATIC mp_obj_t mp_cmath_log10(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_log10(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     return mp_obj_new_complex(MICROPY_FLOAT_CONST(0.5) * MICROPY_FLOAT_C_FUN(log10)(real * real + imag * imag), MICROPY_FLOAT_CONST(0.4342944819032518) * MICROPY_FLOAT_C_FUN(atan2)(imag, real));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log10_obj, mp_cmath_log10);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log10_obj, mp_cmath_log10);
 #endif
 
 // sqrt(z): return the square-root of z
-STATIC mp_obj_t mp_cmath_sqrt(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_sqrt(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     mp_float_t sqrt_abs = MICROPY_FLOAT_C_FUN(pow)(real * real + imag * imag, MICROPY_FLOAT_CONST(0.25));
     mp_float_t theta = MICROPY_FLOAT_CONST(0.5) * MICROPY_FLOAT_C_FUN(atan2)(imag, real);
     return mp_obj_new_complex(sqrt_abs * MICROPY_FLOAT_C_FUN(cos)(theta), sqrt_abs * MICROPY_FLOAT_C_FUN(sin)(theta));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_sqrt_obj, mp_cmath_sqrt);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_sqrt_obj, mp_cmath_sqrt);
 
 // cos(z): return the cosine of z
-STATIC mp_obj_t mp_cmath_cos(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_cos(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     return mp_obj_new_complex(MICROPY_FLOAT_C_FUN(cos)(real) * MICROPY_FLOAT_C_FUN(cosh)(imag), -MICROPY_FLOAT_C_FUN(sin)(real) * MICROPY_FLOAT_C_FUN(sinh)(imag));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_cos_obj, mp_cmath_cos);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_cos_obj, mp_cmath_cos);
 
 // sin(z): return the sine of z
-STATIC mp_obj_t mp_cmath_sin(mp_obj_t z_obj) {
+static mp_obj_t mp_cmath_sin(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
     return mp_obj_new_complex(MICROPY_FLOAT_C_FUN(sin)(real) * MICROPY_FLOAT_C_FUN(cosh)(imag), MICROPY_FLOAT_C_FUN(cos)(real) * MICROPY_FLOAT_C_FUN(sinh)(imag));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_sin_obj, mp_cmath_sin);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_sin_obj, mp_cmath_sin);
 
-STATIC const mp_rom_map_elem_t mp_module_cmath_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_cmath_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cmath) },
     { MP_ROM_QSTR(MP_QSTR_e), mp_const_float_e },
     { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
@@ -142,7 +142,7 @@ STATIC const mp_rom_map_elem_t mp_module_cmath_globals_table[] = {
     // { MP_ROM_QSTR(MP_QSTR_isnan), MP_ROM_PTR(&mp_cmath_isnan_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_cmath_globals, mp_module_cmath_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_cmath_globals, mp_module_cmath_globals_table);
 
 const mp_obj_module_t mp_module_cmath = {
     .base = { &mp_type_module },
diff --git a/py/modcollections.c b/py/modcollections.c
index 30a5881bc2c3a..46326d13eef5a 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -28,7 +28,7 @@
 
 #if MICROPY_PY_COLLECTIONS
 
-STATIC const mp_rom_map_elem_t mp_module_collections_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_collections_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_collections) },
     #if MICROPY_PY_COLLECTIONS_DEQUE
     { MP_ROM_QSTR(MP_QSTR_deque), MP_ROM_PTR(&mp_type_deque) },
@@ -39,7 +39,7 @@ STATIC const mp_rom_map_elem_t mp_module_collections_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_collections_globals, mp_module_collections_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_collections_globals, mp_module_collections_globals_table);
 
 const mp_obj_module_t mp_module_collections = {
     .base = { &mp_type_module },
diff --git a/py/moderrno.c b/py/moderrno.c
index 4f0673a23a255..58a141c102025 100644
--- a/py/moderrno.c
+++ b/py/moderrno.c
@@ -62,13 +62,13 @@
 #endif
 
 #if MICROPY_PY_ERRNO_ERRORCODE
-STATIC const mp_rom_map_elem_t errorcode_table[] = {
+static const mp_rom_map_elem_t errorcode_table[] = {
     #define X(e) { MP_ROM_INT(MP_##e), MP_ROM_QSTR(MP_QSTR_##e) },
     MICROPY_PY_ERRNO_LIST
 #undef X
 };
 
-STATIC const mp_obj_dict_t errorcode_dict = {
+static const mp_obj_dict_t errorcode_dict = {
     .base = {&mp_type_dict},
     .map = {
         .all_keys_are_qstrs = 0, // keys are integers
@@ -81,7 +81,7 @@ STATIC const mp_obj_dict_t errorcode_dict = {
 };
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_errno_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_errno_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_errno) },
     #if MICROPY_PY_ERRNO_ERRORCODE
     { MP_ROM_QSTR(MP_QSTR_errorcode), MP_ROM_PTR(&errorcode_dict) },
@@ -92,7 +92,7 @@ STATIC const mp_rom_map_elem_t mp_module_errno_globals_table[] = {
 #undef X
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_errno_globals, mp_module_errno_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_errno_globals, mp_module_errno_globals_table);
 
 const mp_obj_module_t mp_module_errno = {
     .base = { &mp_type_module },
diff --git a/py/modgc.c b/py/modgc.c
index 7b18045b083a3..47902d8c95bce 100644
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -31,7 +31,7 @@
 #if MICROPY_PY_GC && MICROPY_ENABLE_GC
 
 // collect(): run a garbage collection
-STATIC mp_obj_t py_gc_collect(void) {
+static mp_obj_t py_gc_collect(void) {
     gc_collect();
     #if MICROPY_PY_GC_COLLECT_RETVAL
     return MP_OBJ_NEW_SMALL_INT(MP_STATE_MEM(gc_collected));
@@ -42,26 +42,26 @@ STATIC mp_obj_t py_gc_collect(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(gc_collect_obj, py_gc_collect);
 
 // disable(): disable the garbage collector
-STATIC mp_obj_t gc_disable(void) {
+static mp_obj_t gc_disable(void) {
     MP_STATE_MEM(gc_auto_collect_enabled) = 0;
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(gc_disable_obj, gc_disable);
 
 // enable(): enable the garbage collector
-STATIC mp_obj_t gc_enable(void) {
+static mp_obj_t gc_enable(void) {
     MP_STATE_MEM(gc_auto_collect_enabled) = 1;
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(gc_enable_obj, gc_enable);
 
-STATIC mp_obj_t gc_isenabled(void) {
+static mp_obj_t gc_isenabled(void) {
     return mp_obj_new_bool(MP_STATE_MEM(gc_auto_collect_enabled));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(gc_isenabled_obj, gc_isenabled);
 
 // mem_free(): return the number of bytes of available heap RAM
-STATIC mp_obj_t gc_mem_free(void) {
+static mp_obj_t gc_mem_free(void) {
     gc_info_t info;
     gc_info(&info);
     #if MICROPY_GC_SPLIT_HEAP_AUTO
@@ -74,7 +74,7 @@ STATIC mp_obj_t gc_mem_free(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(gc_mem_free_obj, gc_mem_free);
 
 // mem_alloc(): return the number of bytes of heap RAM that are allocated
-STATIC mp_obj_t gc_mem_alloc(void) {
+static mp_obj_t gc_mem_alloc(void) {
     gc_info_t info;
     gc_info(&info);
     return MP_OBJ_NEW_SMALL_INT(info.used);
@@ -82,7 +82,7 @@ STATIC mp_obj_t gc_mem_alloc(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(gc_mem_alloc_obj, gc_mem_alloc);
 
 #if MICROPY_GC_ALLOC_THRESHOLD
-STATIC mp_obj_t gc_threshold(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t gc_threshold(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         if (MP_STATE_MEM(gc_alloc_threshold) == (size_t)-1) {
             return MP_OBJ_NEW_SMALL_INT(-1);
@@ -100,7 +100,7 @@ STATIC mp_obj_t gc_threshold(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gc_threshold_obj, 0, 1, gc_threshold);
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_gc_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_gc_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gc) },
     { MP_ROM_QSTR(MP_QSTR_collect), MP_ROM_PTR(&gc_collect_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable), MP_ROM_PTR(&gc_disable_obj) },
@@ -113,7 +113,7 @@ STATIC const mp_rom_map_elem_t mp_module_gc_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_gc_globals, mp_module_gc_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_gc_globals, mp_module_gc_globals_table);
 
 const mp_obj_module_t mp_module_gc = {
     .base = { &mp_type_module },
diff --git a/py/modio.c b/py/modio.c
index 37eff3c41c4a0..d3e563dbcf447 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -39,11 +39,11 @@
 
 #if MICROPY_PY_IO_IOBASE
 
-STATIC const mp_obj_type_t mp_type_iobase;
+static const mp_obj_type_t mp_type_iobase;
 
-STATIC const mp_obj_base_t iobase_singleton = {&mp_type_iobase};
+static const mp_obj_base_t iobase_singleton = {&mp_type_iobase};
 
-STATIC mp_obj_t iobase_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 iobase_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)type;
     (void)n_args;
     (void)n_kw;
@@ -51,7 +51,7 @@ STATIC mp_obj_t iobase_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(&iobase_singleton);
 }
 
-STATIC mp_uint_t iobase_read_write(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode, qstr qst) {
+static mp_uint_t iobase_read_write(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode, qstr qst) {
     mp_obj_t dest[3];
     mp_load_method(obj, qst, dest);
     mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, size, buf};
@@ -69,15 +69,15 @@ STATIC mp_uint_t iobase_read_write(mp_obj_t obj, void *buf, mp_uint_t size, int
         return MP_STREAM_ERROR;
     }
 }
-STATIC mp_uint_t iobase_read(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t iobase_read(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode) {
     return iobase_read_write(obj, buf, size, errcode, MP_QSTR_readinto);
 }
 
-STATIC mp_uint_t iobase_write(mp_obj_t obj, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t iobase_write(mp_obj_t obj, const void *buf, mp_uint_t size, int *errcode) {
     return iobase_read_write(obj, (void *)buf, size, errcode, MP_QSTR_write);
 }
 
-STATIC mp_uint_t iobase_ioctl(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t iobase_ioctl(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_obj_t dest[4];
     mp_load_method(obj, MP_QSTR_ioctl, dest);
     dest[2] = mp_obj_new_int_from_uint(request);
@@ -91,13 +91,13 @@ STATIC mp_uint_t iobase_ioctl(mp_obj_t obj, mp_uint_t request, uintptr_t arg, in
     }
 }
 
-STATIC const mp_stream_p_t iobase_p = {
+static const mp_stream_p_t iobase_p = {
     .read = iobase_read,
     .write = iobase_write,
     .ioctl = iobase_ioctl,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_iobase,
     MP_QSTR_IOBase,
     MP_TYPE_FLAG_NONE,
@@ -116,7 +116,7 @@ typedef struct _mp_obj_bufwriter_t {
     byte buf[0];
 } 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) {
+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 = mp_obj_malloc_var(mp_obj_bufwriter_t, buf, byte, alloc, type);
@@ -126,7 +126,7 @@ STATIC mp_obj_t bufwriter_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return o;
 }
 
-STATIC mp_uint_t bufwriter_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t bufwriter_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_bufwriter_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_uint_t org_size = size;
@@ -162,7 +162,7 @@ STATIC mp_uint_t bufwriter_write(mp_obj_t self_in, const void *buf, mp_uint_t si
     return org_size;
 }
 
-STATIC mp_obj_t bufwriter_flush(mp_obj_t self_in) {
+static mp_obj_t bufwriter_flush(mp_obj_t self_in) {
     mp_obj_bufwriter_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->len != 0) {
@@ -180,19 +180,19 @@ STATIC mp_obj_t bufwriter_flush(mp_obj_t self_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bufwriter_flush_obj, bufwriter_flush);
+static MP_DEFINE_CONST_FUN_OBJ_1(bufwriter_flush_obj, bufwriter_flush);
 
-STATIC const mp_rom_map_elem_t bufwriter_locals_dict_table[] = {
+static const mp_rom_map_elem_t bufwriter_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&bufwriter_flush_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(bufwriter_locals_dict, bufwriter_locals_dict_table);
+static MP_DEFINE_CONST_DICT(bufwriter_locals_dict, bufwriter_locals_dict_table);
 
-STATIC const mp_stream_p_t bufwriter_stream_p = {
+static const mp_stream_p_t bufwriter_stream_p = {
     .write = bufwriter_write,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bufwriter,
     MP_QSTR_BufferedWriter,
     MP_TYPE_FLAG_NONE,
@@ -202,7 +202,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif // MICROPY_PY_IO_BUFFEREDWRITER
 
-STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_io_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io) },
     // Note: mp_builtin_open_obj should be defined by port, it's not
     // part of the core.
@@ -219,7 +219,7 @@ STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_io_globals, mp_module_io_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_io_globals, mp_module_io_globals_table);
 
 const mp_obj_module_t mp_module_io = {
     .base = { &mp_type_module },
diff --git a/py/modmath.c b/py/modmath.c
index 861a23b48b3e6..db30f0e62559c 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -37,11 +37,11 @@
 #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) {
+static NORETURN void math_error(void) {
     mp_raise_ValueError(MP_ERROR_TEXT("math domain error"));
 }
 
-STATIC mp_obj_t math_generic_1(mp_obj_t x_obj, mp_float_t (*f)(mp_float_t)) {
+static mp_obj_t math_generic_1(mp_obj_t x_obj, mp_float_t (*f)(mp_float_t)) {
     mp_float_t x = mp_obj_get_float(x_obj);
     mp_float_t ans = f(x);
     if ((isnan(ans) && !isnan(x)) || (isinf(ans) && !isinf(x))) {
@@ -50,7 +50,7 @@ STATIC mp_obj_t math_generic_1(mp_obj_t x_obj, mp_float_t (*f)(mp_float_t)) {
     return mp_obj_new_float(ans);
 }
 
-STATIC mp_obj_t math_generic_2(mp_obj_t x_obj, mp_obj_t y_obj, mp_float_t (*f)(mp_float_t, mp_float_t)) {
+static mp_obj_t math_generic_2(mp_obj_t x_obj, mp_obj_t y_obj, mp_float_t (*f)(mp_float_t, mp_float_t)) {
     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);
@@ -61,30 +61,30 @@ STATIC mp_obj_t math_generic_2(mp_obj_t x_obj, mp_obj_t y_obj, mp_float_t (*f)(m
 }
 
 #define MATH_FUN_1(py_name, c_name) \
-    STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { \
+    static mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { \
         return math_generic_1(x_obj, MICROPY_FLOAT_C_FUN(c_name)); \
     } \
-    STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name);
+    static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name);
 
 #define MATH_FUN_1_TO_BOOL(py_name, c_name) \
-    STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_bool(c_name(mp_obj_get_float(x_obj))); } \
-    STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name);
+    static mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_bool(c_name(mp_obj_get_float(x_obj))); } \
+    static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name);
 
 #define MATH_FUN_1_TO_INT(py_name, c_name) \
-    STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_int_from_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \
-    STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name);
+    static mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_int_from_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \
+    static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name);
 
 #define MATH_FUN_2(py_name, c_name) \
-    STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj, mp_obj_t y_obj) { \
+    static mp_obj_t mp_math_##py_name(mp_obj_t x_obj, mp_obj_t y_obj) { \
         return math_generic_2(x_obj, y_obj, MICROPY_FLOAT_C_FUN(c_name)); \
     } \
-    STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_math_##py_name##_obj, mp_math_##py_name);
+    static MP_DEFINE_CONST_FUN_OBJ_2(mp_math_##py_name##_obj, mp_math_##py_name);
 
 #define MATH_FUN_2_FLT_INT(py_name, c_name) \
-    STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj, mp_obj_t y_obj) { \
+    static mp_obj_t mp_math_##py_name(mp_obj_t x_obj, mp_obj_t y_obj) { \
         return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj), mp_obj_get_int(y_obj))); \
     } \
-    STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_math_##py_name##_obj, mp_math_##py_name);
+    static MP_DEFINE_CONST_FUN_OBJ_2(mp_math_##py_name##_obj, mp_math_##py_name);
 
 #if MP_NEED_LOG2
 #undef log2
@@ -160,12 +160,12 @@ MATH_FUN_2(atan2, atan2)
 // ceil(x)
 MATH_FUN_1_TO_INT(ceil, ceil)
 // copysign(x, y)
-STATIC mp_float_t MICROPY_FLOAT_C_FUN(copysign_func)(mp_float_t x, mp_float_t y) {
+static mp_float_t MICROPY_FLOAT_C_FUN(copysign_func)(mp_float_t x, mp_float_t y) {
     return MICROPY_FLOAT_C_FUN(copysign)(x, y);
 }
 MATH_FUN_2(copysign, copysign_func)
 // fabs(x)
-STATIC mp_float_t MICROPY_FLOAT_C_FUN(fabs_func)(mp_float_t x) {
+static mp_float_t MICROPY_FLOAT_C_FUN(fabs_func)(mp_float_t x) {
     return MICROPY_FLOAT_C_FUN(fabs)(x);
 }
 MATH_FUN_1(fabs, fabs_func)
@@ -203,7 +203,7 @@ MATH_FUN_1(lgamma, lgamma)
 // TODO: fsum
 
 #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) {
+static mp_obj_t mp_math_isclose(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_rel_tol, ARG_abs_tol };
     static const mp_arg_t allowed_args[] = {
         {MP_QSTR_rel_tol, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
@@ -239,7 +239,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_math_isclose_obj, 2, mp_math_isclose);
 // Function that takes a variable number of arguments
 
 // log(x[, base])
-STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) {
     mp_float_t x = mp_obj_get_float(args[0]);
     if (x <= (mp_float_t)0.0) {
         math_error();
@@ -257,12 +257,12 @@ STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_float(l / MICROPY_FLOAT_C_FUN(log)(base));
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_math_log_obj, 1, 2, mp_math_log);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_math_log_obj, 1, 2, mp_math_log);
 
 // Functions that return a tuple
 
 // frexp(x): converts a floating-point number to fractional and integral components
-STATIC mp_obj_t mp_math_frexp(mp_obj_t x_obj) {
+static mp_obj_t mp_math_frexp(mp_obj_t x_obj) {
     int int_exponent = 0;
     mp_float_t significand = MICROPY_FLOAT_C_FUN(frexp)(mp_obj_get_float(x_obj), &int_exponent);
     mp_obj_t tuple[2];
@@ -270,10 +270,10 @@ STATIC mp_obj_t mp_math_frexp(mp_obj_t x_obj) {
     tuple[1] = mp_obj_new_int(int_exponent);
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_frexp_obj, mp_math_frexp);
+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) {
+static mp_obj_t mp_math_modf(mp_obj_t x_obj) {
     mp_float_t int_part = 0.0;
     mp_float_t x = mp_obj_get_float(x_obj);
     mp_float_t fractional_part = MICROPY_FLOAT_C_FUN(modf)(x, &int_part);
@@ -287,28 +287,28 @@ STATIC mp_obj_t mp_math_modf(mp_obj_t x_obj) {
     tuple[1] = mp_obj_new_float(int_part);
     return mp_obj_new_tuple(2, tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_modf_obj, mp_math_modf);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_modf_obj, mp_math_modf);
 
 // Angular conversions
 
 // radians(x)
-STATIC mp_obj_t mp_math_radians(mp_obj_t x_obj) {
+static mp_obj_t mp_math_radians(mp_obj_t x_obj) {
     return mp_obj_new_float(mp_obj_get_float(x_obj) * (MP_PI / MICROPY_FLOAT_CONST(180.0)));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_radians_obj, mp_math_radians);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_radians_obj, mp_math_radians);
 
 // degrees(x)
-STATIC mp_obj_t mp_math_degrees(mp_obj_t x_obj) {
+static mp_obj_t mp_math_degrees(mp_obj_t x_obj) {
     return mp_obj_new_float(mp_obj_get_float(x_obj) * (MICROPY_FLOAT_CONST(180.0) / MP_PI));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_degrees_obj, mp_math_degrees);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_degrees_obj, mp_math_degrees);
 
 #if MICROPY_PY_MATH_FACTORIAL
 
 #if MICROPY_OPT_MATH_FACTORIAL
 
 // factorial(x): slightly efficient recursive implementation
-STATIC mp_obj_t mp_math_factorial_inner(mp_uint_t start, mp_uint_t end) {
+static mp_obj_t mp_math_factorial_inner(mp_uint_t start, mp_uint_t end) {
     if (start == end) {
         return mp_obj_new_int(start);
     } else if (end - start == 1) {
@@ -326,7 +326,7 @@ STATIC mp_obj_t mp_math_factorial_inner(mp_uint_t start, mp_uint_t end) {
         return mp_binary_op(MP_BINARY_OP_MULTIPLY, left, right);
     }
 }
-STATIC mp_obj_t mp_math_factorial(mp_obj_t x_obj) {
+static mp_obj_t mp_math_factorial(mp_obj_t x_obj) {
     mp_int_t max = mp_obj_get_int(x_obj);
     if (max < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("negative factorial"));
@@ -340,7 +340,7 @@ STATIC mp_obj_t mp_math_factorial(mp_obj_t x_obj) {
 
 // factorial(x): squared difference implementation
 // based on http://www.luschny.de/math/factorial/index.html
-STATIC mp_obj_t mp_math_factorial(mp_obj_t x_obj) {
+static mp_obj_t mp_math_factorial(mp_obj_t x_obj) {
     mp_int_t max = mp_obj_get_int(x_obj);
     if (max < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("negative factorial"));
@@ -363,11 +363,11 @@ STATIC mp_obj_t mp_math_factorial(mp_obj_t x_obj) {
 
 #endif
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_factorial_obj, mp_math_factorial);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_factorial_obj, mp_math_factorial);
 
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_math_globals_table[] = {
+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 },
@@ -428,7 +428,7 @@ STATIC const mp_rom_map_elem_t mp_module_math_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_math_globals, mp_module_math_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_math_globals, mp_module_math_globals_table);
 
 const mp_obj_module_t mp_module_math = {
     .base = { &mp_type_module },
diff --git a/py/modmicropython.c b/py/modmicropython.c
index bdb1e8b9b4c00..af6ad01795f67 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -38,7 +38,7 @@
 // living in micropython module
 
 #if MICROPY_ENABLE_COMPILER
-STATIC mp_obj_t mp_micropython_opt_level(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_micropython_opt_level(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return MP_OBJ_NEW_SMALL_INT(MP_STATE_VM(mp_optimise_value));
     } else {
@@ -46,26 +46,26 @@ STATIC mp_obj_t mp_micropython_opt_level(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_opt_level_obj, 0, 1, mp_micropython_opt_level);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_opt_level_obj, 0, 1, mp_micropython_opt_level);
 #endif
 
 #if MICROPY_PY_MICROPYTHON_MEM_INFO
 
 #if MICROPY_MEM_STATS
-STATIC mp_obj_t mp_micropython_mem_total(void) {
+static mp_obj_t mp_micropython_mem_total(void) {
     return MP_OBJ_NEW_SMALL_INT(m_get_total_bytes_allocated());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_total_obj, mp_micropython_mem_total);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_total_obj, mp_micropython_mem_total);
 
-STATIC mp_obj_t mp_micropython_mem_current(void) {
+static mp_obj_t mp_micropython_mem_current(void) {
     return MP_OBJ_NEW_SMALL_INT(m_get_current_bytes_allocated());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_current_obj, mp_micropython_mem_current);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_current_obj, mp_micropython_mem_current);
 
-STATIC mp_obj_t mp_micropython_mem_peak(void) {
+static mp_obj_t mp_micropython_mem_peak(void) {
     return MP_OBJ_NEW_SMALL_INT(m_get_peak_bytes_allocated());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_peak_obj, mp_micropython_mem_peak);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_peak_obj, mp_micropython_mem_peak);
 #endif
 
 mp_obj_t mp_micropython_mem_info(size_t n_args, const mp_obj_t *args) {
@@ -91,9 +91,9 @@ mp_obj_t mp_micropython_mem_info(size_t n_args, const mp_obj_t *args) {
     #endif
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_mem_info_obj, 0, 1, mp_micropython_mem_info);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_mem_info_obj, 0, 1, mp_micropython_mem_info);
 
-STATIC mp_obj_t mp_micropython_qstr_info(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_micropython_qstr_info(size_t n_args, const mp_obj_t *args) {
     (void)args;
     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);
@@ -105,68 +105,68 @@ STATIC mp_obj_t mp_micropython_qstr_info(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_qstr_info_obj, 0, 1, mp_micropython_qstr_info);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_qstr_info_obj, 0, 1, mp_micropython_qstr_info);
 
 #endif // MICROPY_PY_MICROPYTHON_MEM_INFO
 
 #if MICROPY_PY_MICROPYTHON_STACK_USE
-STATIC mp_obj_t mp_micropython_stack_use(void) {
+static mp_obj_t mp_micropython_stack_use(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_stack_usage());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_stack_use_obj, mp_micropython_stack_use);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_stack_use_obj, mp_micropython_stack_use);
 #endif
 
 #if MICROPY_ENABLE_PYSTACK
-STATIC mp_obj_t mp_micropython_pystack_use(void) {
+static mp_obj_t mp_micropython_pystack_use(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_pystack_usage());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_pystack_use_obj, mp_micropython_pystack_use);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_pystack_use_obj, mp_micropython_pystack_use);
 #endif
 
 #if MICROPY_ENABLE_GC
-STATIC mp_obj_t mp_micropython_heap_lock(void) {
+static mp_obj_t mp_micropython_heap_lock(void) {
     gc_lock();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_lock_obj, mp_micropython_heap_lock);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_lock_obj, mp_micropython_heap_lock);
 
-STATIC mp_obj_t mp_micropython_heap_unlock(void) {
+static mp_obj_t mp_micropython_heap_unlock(void) {
     gc_unlock();
     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);
+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) {
+static mp_obj_t mp_micropython_heap_locked(void) {
     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);
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_locked_obj, mp_micropython_heap_locked);
 #endif
 #endif
 
 #if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF && (MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE == 0)
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_alloc_emergency_exception_buf_obj, mp_alloc_emergency_exception_buf);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_alloc_emergency_exception_buf_obj, mp_alloc_emergency_exception_buf);
 #endif
 
 #if MICROPY_KBD_EXCEPTION
-STATIC mp_obj_t mp_micropython_kbd_intr(mp_obj_t int_chr_in) {
+static mp_obj_t mp_micropython_kbd_intr(mp_obj_t int_chr_in) {
     mp_hal_set_interrupt_char(mp_obj_get_int(int_chr_in));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_micropython_kbd_intr_obj, mp_micropython_kbd_intr);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_micropython_kbd_intr_obj, mp_micropython_kbd_intr);
 #endif
 
 #if MICROPY_ENABLE_SCHEDULER
-STATIC mp_obj_t mp_micropython_schedule(mp_obj_t function, mp_obj_t arg) {
+static mp_obj_t mp_micropython_schedule(mp_obj_t function, mp_obj_t arg) {
     if (!mp_sched_schedule(function, arg)) {
         mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("schedule queue full"));
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_micropython_schedule_obj, mp_micropython_schedule);
+static MP_DEFINE_CONST_FUN_OBJ_2(mp_micropython_schedule_obj, mp_micropython_schedule);
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_micropython_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_micropython_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_micropython) },
     { MP_ROM_QSTR(MP_QSTR_const), MP_ROM_PTR(&mp_identity_obj) },
     #if MICROPY_ENABLE_COMPILER
@@ -205,7 +205,7 @@ STATIC const mp_rom_map_elem_t mp_module_micropython_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_micropython_globals, mp_module_micropython_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_micropython_globals, mp_module_micropython_globals_table);
 
 const mp_obj_module_t mp_module_micropython = {
     .base = { &mp_type_module },
diff --git a/py/modstruct.c b/py/modstruct.c
index b3edc96328703..3b9dd30aa707a 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -52,7 +52,7 @@
         character data".
  */
 
-STATIC char get_fmt_type(const char **fmt) {
+static char get_fmt_type(const char **fmt) {
     char t = **fmt;
     switch (t) {
         case '!':
@@ -71,7 +71,7 @@ STATIC char get_fmt_type(const char **fmt) {
     return t;
 }
 
-STATIC mp_uint_t get_fmt_num(const char **p) {
+static mp_uint_t get_fmt_num(const char **p) {
     const char *num = *p;
     uint len = 1;
     while (unichar_isdigit(*++num)) {
@@ -82,7 +82,7 @@ STATIC mp_uint_t get_fmt_num(const char **p) {
     return val;
 }
 
-STATIC size_t calc_size_items(const char *fmt, size_t *total_sz) {
+static size_t calc_size_items(const char *fmt, size_t *total_sz) {
     char fmt_type = get_fmt_type(&fmt);
     size_t total_cnt = 0;
     size_t size;
@@ -112,7 +112,7 @@ STATIC size_t calc_size_items(const char *fmt, size_t *total_sz) {
     return total_cnt;
 }
 
-STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) {
+static mp_obj_t struct_calcsize(mp_obj_t fmt_in) {
     const char *fmt = mp_obj_str_get_str(fmt_in);
     size_t size;
     calc_size_items(fmt, &size);
@@ -120,7 +120,7 @@ STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(struct_calcsize_obj, struct_calcsize);
 
-STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
     // unpack requires that the buffer be exactly the right size.
     // unpack_from requires that the buffer be "big enough".
     // Since we implement unpack and unpack_from using the same function
@@ -180,7 +180,7 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_unpack_from_obj, 2, 3, struct_unpack_from);
 
 // This function assumes there is enough room in p to store all the values
-STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, const mp_obj_t *args) {
+static void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, const mp_obj_t *args) {
     const char *fmt = mp_obj_str_get_str(fmt_in);
     char fmt_type = get_fmt_type(&fmt);
 
@@ -219,7 +219,7 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, c
     }
 }
 
-STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
     // TODO: "The arguments must match the values required by the format exactly."
     mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
     vstr_t vstr;
@@ -231,7 +231,7 @@ STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_obj, 1, MP_OBJ_FUN_ARGS_MAX, struct_pack);
 
-STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
     mp_int_t offset = mp_obj_get_int(args[2]);
@@ -257,7 +257,7 @@ STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX, struct_pack_into);
 
-STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_struct) },
     { MP_ROM_QSTR(MP_QSTR_calcsize), MP_ROM_PTR(&struct_calcsize_obj) },
     { MP_ROM_QSTR(MP_QSTR_pack), MP_ROM_PTR(&struct_pack_obj) },
@@ -266,7 +266,7 @@ STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_unpack_from), MP_ROM_PTR(&struct_unpack_from_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_table);
 
 const mp_obj_module_t mp_module_struct = {
     .base = { &mp_type_module },
diff --git a/py/modsys.c b/py/modsys.c
index 2af81046f483b..e90ea2233a732 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -56,15 +56,15 @@ 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; " MICROPY_BANNER_NAME_AND_VERSION);
+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
 // TODO: CPython is now at 5-element array (major, minor, micro, releaselevel, serial), but save 2 els so far...
-STATIC const mp_rom_obj_tuple_t mp_sys_version_info_obj = {{&mp_type_tuple}, 3, {MP_ROM_INT(3), MP_ROM_INT(4), MP_ROM_INT(0)}};
+static const mp_rom_obj_tuple_t mp_sys_version_info_obj = {{&mp_type_tuple}, 3, {MP_ROM_INT(3), MP_ROM_INT(4), MP_ROM_INT(0)}};
 
 // sys.implementation object
 // this holds the MicroPython version
-STATIC const mp_rom_obj_tuple_t mp_sys_implementation_version_info_obj = {
+static const mp_rom_obj_tuple_t mp_sys_implementation_version_info_obj = {
     {&mp_type_tuple},
     4,
     {
@@ -78,7 +78,7 @@ STATIC const mp_rom_obj_tuple_t mp_sys_implementation_version_info_obj = {
         #endif
     }
 };
-STATIC const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER_MACHINE);
+static const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER_MACHINE);
 #define SYS_IMPLEMENTATION_ELEMS_BASE \
     MP_ROM_QSTR(MP_QSTR_micropython), \
     MP_ROM_PTR(&mp_sys_implementation_version_info_obj), \
@@ -99,7 +99,7 @@ STATIC const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER
 #define SYS_IMPLEMENTATION_ELEMS__V2
 #endif
 
-STATIC const qstr impl_fields[] = {
+static const qstr impl_fields[] = {
     MP_QSTR_name,
     MP_QSTR_version,
     MP_QSTR__machine,
@@ -110,7 +110,7 @@ STATIC const qstr impl_fields[] = {
     MP_QSTR__v2,
     #endif
 };
-STATIC MP_DEFINE_ATTRTUPLE(
+static MP_DEFINE_ATTRTUPLE(
     mp_sys_implementation_obj,
     impl_fields,
     3 + MICROPY_PERSISTENT_CODE_LOAD + MICROPY_PREVIEW_VERSION_2,
@@ -119,7 +119,7 @@ STATIC MP_DEFINE_ATTRTUPLE(
     SYS_IMPLEMENTATION_ELEMS__V2
     );
 #else
-STATIC const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
+static const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
     {&mp_type_tuple},
     3 + MICROPY_PERSISTENT_CODE_LOAD,
     // Do not include SYS_IMPLEMENTATION_ELEMS__V2 because
@@ -138,7 +138,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(mp_sys_platform_obj, MICROPY_PY_SYS_PLATFORM);
+static const MP_DEFINE_STR_OBJ(mp_sys_platform_obj, MICROPY_PY_SYS_PLATFORM);
 #endif
 
 #ifdef MICROPY_PY_SYS_EXECUTABLE
@@ -152,7 +152,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_intern_obj, mp_obj_str_intern_checked);
 #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) {
+static mp_obj_t mp_sys_exit(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         mp_raise_type(&mp_type_SystemExit);
     } else {
@@ -161,7 +161,7 @@ STATIC mp_obj_t mp_sys_exit(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit);
 
-STATIC mp_obj_t mp_sys_print_exception(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_sys_print_exception(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
     void *stream_obj = &mp_sys_stdout_obj;
     if (n_args > 1) {
@@ -181,7 +181,7 @@ STATIC mp_obj_t mp_sys_print_exception(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_print_exception_obj, 1, 2, mp_sys_print_exception);
 
 #if MICROPY_PY_SYS_EXC_INFO
-STATIC mp_obj_t mp_sys_exc_info(void) {
+static mp_obj_t mp_sys_exc_info(void) {
     mp_obj_t cur_exc = MP_OBJ_FROM_PTR(MP_STATE_VM(cur_exception));
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL));
 
@@ -201,25 +201,25 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_sys_exc_info_obj, mp_sys_exc_info);
 #endif
 
 #if MICROPY_PY_SYS_GETSIZEOF
-STATIC mp_obj_t mp_sys_getsizeof(mp_obj_t obj) {
+static mp_obj_t mp_sys_getsizeof(mp_obj_t obj) {
     return mp_unary_op(MP_UNARY_OP_SIZEOF, obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_getsizeof_obj, mp_sys_getsizeof);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_getsizeof_obj, mp_sys_getsizeof);
 #endif
 
 #if MICROPY_PY_SYS_ATEXIT
 // atexit(callback): Callback is called when sys.exit is called.
-STATIC mp_obj_t mp_sys_atexit(mp_obj_t obj) {
+static mp_obj_t mp_sys_atexit(mp_obj_t obj) {
     mp_obj_t old = MP_STATE_VM(sys_exitfunc);
     MP_STATE_VM(sys_exitfunc) = obj;
     return old;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_atexit_obj, mp_sys_atexit);
+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.
-STATIC mp_obj_t mp_sys_settrace(mp_obj_t obj) {
+static mp_obj_t mp_sys_settrace(mp_obj_t obj) {
     return mp_prof_settrace(obj);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_settrace_obj, mp_sys_settrace);
@@ -243,7 +243,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_settrace_obj, mp_sys_settrace);
 
 #if MICROPY_PY_SYS_ATTR_DELEGATION
 // Must be kept in sync with the enum at the top of mpstate.h.
-STATIC const uint16_t sys_mutable_keys[] = {
+static const uint16_t sys_mutable_keys[] = {
     #if MICROPY_PY_SYS_PATH
     // Code should access this (as an mp_obj_t) for use with e.g.
     // mp_obj_list_append by using the `mp_sys_path` macro defined in runtime.h.
@@ -266,7 +266,7 @@ void mp_module_sys_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
-STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sys) },
 
     #if MICROPY_PY_SYS_ARGV
@@ -339,7 +339,7 @@ STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_sys_globals, mp_module_sys_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_sys_globals, mp_module_sys_globals_table);
 
 const mp_obj_module_t mp_module_sys = {
     .base = { &mp_type_module },
diff --git a/py/modthread.c b/py/modthread.c
index 9fc20570be1f0..2826fadeaa6b4 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -45,7 +45,7 @@
 /****************************************************************/
 // Lock object
 
-STATIC const mp_obj_type_t mp_type_thread_lock;
+static const mp_obj_type_t mp_type_thread_lock;
 
 typedef struct _mp_obj_thread_lock_t {
     mp_obj_base_t base;
@@ -53,14 +53,14 @@ typedef struct _mp_obj_thread_lock_t {
     volatile bool locked;
 } mp_obj_thread_lock_t;
 
-STATIC mp_obj_thread_lock_t *mp_obj_new_thread_lock(void) {
+static mp_obj_thread_lock_t *mp_obj_new_thread_lock(void) {
     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;
 }
 
-STATIC mp_obj_t thread_lock_acquire(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t thread_lock_acquire(size_t n_args, const mp_obj_t *args) {
     mp_obj_thread_lock_t *self = MP_OBJ_TO_PTR(args[0]);
     bool wait = true;
     if (n_args > 1) {
@@ -79,9 +79,9 @@ STATIC mp_obj_t thread_lock_acquire(size_t n_args, const mp_obj_t *args) {
         mp_raise_OSError(-ret);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(thread_lock_acquire_obj, 1, 3, thread_lock_acquire);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(thread_lock_acquire_obj, 1, 3, thread_lock_acquire);
 
-STATIC mp_obj_t thread_lock_release(mp_obj_t self_in) {
+static mp_obj_t thread_lock_release(mp_obj_t self_in) {
     mp_obj_thread_lock_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->locked) {
         mp_raise_msg(&mp_type_RuntimeError, NULL);
@@ -92,21 +92,21 @@ STATIC mp_obj_t thread_lock_release(mp_obj_t self_in) {
     MP_THREAD_GIL_ENTER();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(thread_lock_release_obj, thread_lock_release);
+static MP_DEFINE_CONST_FUN_OBJ_1(thread_lock_release_obj, thread_lock_release);
 
-STATIC mp_obj_t thread_lock_locked(mp_obj_t self_in) {
+static mp_obj_t thread_lock_locked(mp_obj_t self_in) {
     mp_obj_thread_lock_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_bool(self->locked);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(thread_lock_locked_obj, thread_lock_locked);
+static MP_DEFINE_CONST_FUN_OBJ_1(thread_lock_locked_obj, thread_lock_locked);
 
-STATIC mp_obj_t thread_lock___exit__(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t thread_lock___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // unused
     return thread_lock_release(args[0]);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(thread_lock___exit___obj, 4, 4, thread_lock___exit__);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(thread_lock___exit___obj, 4, 4, thread_lock___exit__);
 
-STATIC const mp_rom_map_elem_t thread_lock_locals_dict_table[] = {
+static const mp_rom_map_elem_t thread_lock_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_acquire), MP_ROM_PTR(&thread_lock_acquire_obj) },
     { MP_ROM_QSTR(MP_QSTR_release), MP_ROM_PTR(&thread_lock_release_obj) },
     { MP_ROM_QSTR(MP_QSTR_locked), MP_ROM_PTR(&thread_lock_locked_obj) },
@@ -114,9 +114,9 @@ STATIC const mp_rom_map_elem_t thread_lock_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&thread_lock___exit___obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(thread_lock_locals_dict, thread_lock_locals_dict_table);
+static MP_DEFINE_CONST_DICT(thread_lock_locals_dict, thread_lock_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_thread_lock,
     MP_QSTR_lock,
     MP_TYPE_FLAG_NONE,
@@ -126,14 +126,14 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 /****************************************************************/
 // _thread module
 
-STATIC size_t thread_stack_size = 0;
+static size_t thread_stack_size = 0;
 
-STATIC mp_obj_t mod_thread_get_ident(void) {
+static mp_obj_t mod_thread_get_ident(void) {
     return mp_obj_new_int_from_uint(mp_thread_get_id());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_get_ident_obj, mod_thread_get_ident);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_get_ident_obj, mod_thread_get_ident);
 
-STATIC mp_obj_t mod_thread_stack_size(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_thread_stack_size(size_t n_args, const mp_obj_t *args) {
     mp_obj_t ret = mp_obj_new_int_from_uint(thread_stack_size);
     if (n_args == 0) {
         thread_stack_size = 0;
@@ -142,7 +142,7 @@ STATIC mp_obj_t mod_thread_stack_size(size_t n_args, const mp_obj_t *args) {
     }
     return ret;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_thread_stack_size_obj, 0, 1, mod_thread_stack_size);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_thread_stack_size_obj, 0, 1, mod_thread_stack_size);
 
 typedef struct _thread_entry_args_t {
     mp_obj_dict_t *dict_locals;
@@ -154,7 +154,7 @@ typedef struct _thread_entry_args_t {
     mp_obj_t args[];
 } thread_entry_args_t;
 
-STATIC void *thread_entry(void *args_in) {
+static void *thread_entry(void *args_in) {
     // Execution begins here for a new thread.  We do not have the GIL.
 
     thread_entry_args_t *args = (thread_entry_args_t *)args_in;
@@ -207,7 +207,7 @@ STATIC void *thread_entry(void *args_in) {
     return NULL;
 }
 
-STATIC mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args) {
     // This structure holds the Python function and arguments for thread entry.
     // We copy all arguments into this structure to keep ownership of them.
     // We must be very careful about root pointers because this pointer may
@@ -258,19 +258,19 @@ STATIC mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args)
     // spawn the thread!
     return mp_obj_new_int_from_uint(mp_thread_create(thread_entry, th_args, &th_args->stack_size));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_thread_start_new_thread_obj, 2, 3, mod_thread_start_new_thread);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_thread_start_new_thread_obj, 2, 3, mod_thread_start_new_thread);
 
-STATIC mp_obj_t mod_thread_exit(void) {
+static mp_obj_t mod_thread_exit(void) {
     mp_raise_type(&mp_type_SystemExit);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_exit_obj, mod_thread_exit);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_exit_obj, mod_thread_exit);
 
-STATIC mp_obj_t mod_thread_allocate_lock(void) {
+static mp_obj_t mod_thread_allocate_lock(void) {
     return MP_OBJ_FROM_PTR(mp_obj_new_thread_lock());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_allocate_lock_obj, mod_thread_allocate_lock);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_allocate_lock_obj, mod_thread_allocate_lock);
 
-STATIC const mp_rom_map_elem_t mp_module_thread_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_thread_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__thread) },
     { MP_ROM_QSTR(MP_QSTR_LockType), MP_ROM_PTR(&mp_type_thread_lock) },
     { MP_ROM_QSTR(MP_QSTR_get_ident), MP_ROM_PTR(&mod_thread_get_ident_obj) },
@@ -280,7 +280,7 @@ STATIC const mp_rom_map_elem_t mp_module_thread_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_allocate_lock), MP_ROM_PTR(&mod_thread_allocate_lock_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_thread_globals, mp_module_thread_globals_table);
+static MP_DEFINE_CONST_DICT(mp_module_thread_globals, mp_module_thread_globals_table);
 
 const mp_obj_module_t mp_module_thread = {
     .base = { &mp_type_module },
diff --git a/py/mpconfig.h b/py/mpconfig.h
index e7b72c642274f..90f8e592bfe8b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1862,12 +1862,6 @@ typedef double mp_float_t;
 #endif
 #endif
 
-// Allow to override static modifier for global objects, e.g. to use with
-// object code analysis tools which don't support static symbols.
-#ifndef STATIC
-#define STATIC static
-#endif
-
 // 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))
diff --git a/py/mpprint.c b/py/mpprint.c
index 3218bd2f4dcf8..291e4145ff0cd 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -43,7 +43,7 @@
 static const char pad_spaces[] = "                ";
 static const char pad_zeroes[] = "0000000000000000";
 
-STATIC void plat_print_strn(void *env, const char *str, size_t len) {
+static void plat_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     MP_PLAT_PRINT_STRN(str, len);
 }
@@ -127,7 +127,7 @@ int mp_print_strn(const mp_print_t *print, const char *str, size_t len, int flag
 
 // This function is used exclusively by mp_vprintf to format ints.
 // It needs to be a separate function to mp_print_mp_int, since converting to a mp_int looses the MSB.
-STATIC int mp_print_int(const mp_print_t *print, mp_uint_t x, int sgn, int base, int base_char, int flags, char fill, int width) {
+static int mp_print_int(const mp_print_t *print, mp_uint_t x, int sgn, int base, int base_char, int flags, char fill, int width) {
     char sign = 0;
     if (sgn) {
         if ((mp_int_t)x < 0) {
diff --git a/py/mpz.c b/py/mpz.c
index b61997e2fd4ed..502d4e1c138f0 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -49,7 +49,7 @@
  Definition of normalise: ?
 */
 
-STATIC size_t mpn_remove_trailing_zeros(mpz_dig_t *oidig, mpz_dig_t *idig) {
+static size_t mpn_remove_trailing_zeros(mpz_dig_t *oidig, mpz_dig_t *idig) {
     for (--idig; idig >= oidig && *idig == 0; --idig) {
     }
     return idig + 1 - oidig;
@@ -59,7 +59,7 @@ STATIC size_t mpn_remove_trailing_zeros(mpz_dig_t *oidig, mpz_dig_t *idig) {
    returns sign(i - j)
    assumes i, j are normalised
 */
-STATIC int mpn_cmp(const mpz_dig_t *idig, size_t ilen, const mpz_dig_t *jdig, size_t jlen) {
+static int mpn_cmp(const mpz_dig_t *idig, size_t ilen, const mpz_dig_t *jdig, size_t jlen) {
     if (ilen < jlen) {
         return -1;
     }
@@ -85,7 +85,7 @@ STATIC int mpn_cmp(const mpz_dig_t *idig, size_t ilen, const mpz_dig_t *jdig, si
    assumes enough memory in i; assumes normalised j; assumes n > 0
    can have i, j pointing to same memory
 */
-STATIC size_t mpn_shl(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n) {
+static size_t mpn_shl(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n) {
     mp_uint_t n_whole = (n + DIG_SIZE - 1) / DIG_SIZE;
     mp_uint_t n_part = n % DIG_SIZE;
     if (n_part == 0) {
@@ -124,7 +124,7 @@ STATIC size_t mpn_shl(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n
    assumes enough memory in i; assumes normalised j; assumes n > 0
    can have i, j pointing to same memory
 */
-STATIC size_t mpn_shr(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n) {
+static size_t mpn_shr(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n) {
     mp_uint_t n_whole = n / DIG_SIZE;
     mp_uint_t n_part = n % DIG_SIZE;
 
@@ -156,7 +156,7 @@ STATIC size_t mpn_shr(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n
    assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen
    can have i, j, k pointing to same memory
 */
-STATIC size_t mpn_add(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
+static size_t mpn_add(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
     mpz_dig_t *oidig = idig;
     mpz_dbl_dig_t carry = 0;
 
@@ -186,7 +186,7 @@ STATIC size_t mpn_add(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const
    assumes enough memory in i; assumes normalised j, k; assumes j >= k
    can have i, j, k pointing to same memory
 */
-STATIC size_t mpn_sub(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
+static size_t mpn_sub(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
     mpz_dig_t *oidig = idig;
     mpz_dbl_dig_signed_t borrow = 0;
 
@@ -214,7 +214,7 @@ STATIC size_t mpn_sub(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const
    assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen (jlen argument not needed)
    can have i, j, k pointing to same memory
 */
-STATIC size_t mpn_and(mpz_dig_t *idig, const mpz_dig_t *jdig, const mpz_dig_t *kdig, size_t klen) {
+static size_t mpn_and(mpz_dig_t *idig, const mpz_dig_t *jdig, const mpz_dig_t *kdig, size_t klen) {
     mpz_dig_t *oidig = idig;
 
     for (; klen > 0; --klen, ++idig, ++jdig, ++kdig) {
@@ -235,7 +235,7 @@ STATIC size_t mpn_and(mpz_dig_t *idig, const mpz_dig_t *jdig, const mpz_dig_t *k
    assumes enough memory in i; assumes normalised j, k; assumes length j >= length k
    can have i, j, k pointing to same memory
 */
-STATIC size_t mpn_and_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
+static size_t mpn_and_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
     mpz_dbl_dig_t carryi, mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
     mpz_dig_t *oidig = idig;
     mpz_dig_t imask = (0 == carryi) ? 0 : DIG_MASK;
@@ -266,7 +266,7 @@ STATIC size_t mpn_and_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, c
    assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen
    can have i, j, k pointing to same memory
 */
-STATIC size_t mpn_or(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
+static size_t mpn_or(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
     mpz_dig_t *oidig = idig;
 
     jlen -= klen;
@@ -296,7 +296,7 @@ STATIC size_t mpn_or(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const
 
 #if MICROPY_OPT_MPZ_BITWISE
 
-STATIC size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
+static size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
     mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
     mpz_dig_t *oidig = idig;
     mpz_dbl_dig_t carryi = 1;
@@ -326,7 +326,7 @@ STATIC size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, co
 
 #else
 
-STATIC size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
+static size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
     mpz_dbl_dig_t carryi, mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
     mpz_dig_t *oidig = idig;
     mpz_dig_t imask = (0 == carryi) ? 0 : DIG_MASK;
@@ -358,7 +358,7 @@ STATIC size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, co
    assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen
    can have i, j, k pointing to same memory
 */
-STATIC size_t mpn_xor(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
+static size_t mpn_xor(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
     mpz_dig_t *oidig = idig;
 
     jlen -= klen;
@@ -385,7 +385,7 @@ STATIC size_t mpn_xor(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const
    assumes enough memory in i; assumes normalised j, k; assumes length j >= length k
    can have i, j, k pointing to same memory
 */
-STATIC size_t mpn_xor_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
+static size_t mpn_xor_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
     mpz_dbl_dig_t carryi, mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
     mpz_dig_t *oidig = idig;
 
@@ -410,7 +410,7 @@ STATIC size_t mpn_xor_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, c
    returns number of digits in i
    assumes enough memory in i; assumes normalised i; assumes dmul != 0
 */
-STATIC size_t mpn_mul_dig_add_dig(mpz_dig_t *idig, size_t ilen, mpz_dig_t dmul, mpz_dig_t dadd) {
+static size_t mpn_mul_dig_add_dig(mpz_dig_t *idig, size_t ilen, mpz_dig_t dmul, mpz_dig_t dadd) {
     mpz_dig_t *oidig = idig;
     mpz_dbl_dig_t carry = dadd;
 
@@ -432,7 +432,7 @@ STATIC size_t mpn_mul_dig_add_dig(mpz_dig_t *idig, size_t ilen, mpz_dig_t dmul,
    assumes enough memory in i; assumes i is zeroed; assumes normalised j, k
    can have j, k point to same memory
 */
-STATIC size_t mpn_mul(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mpz_dig_t *kdig, size_t klen) {
+static size_t mpn_mul(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mpz_dig_t *kdig, size_t klen) {
     mpz_dig_t *oidig = idig;
     size_t ilen = 0;
 
@@ -463,7 +463,7 @@ STATIC size_t mpn_mul(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mpz_dig_t *
    assumes quo_dig has enough memory (as many digits as num)
    assumes quo_dig is filled with zeros
 */
-STATIC void mpn_div(mpz_dig_t *num_dig, size_t *num_len, const mpz_dig_t *den_dig, size_t den_len, mpz_dig_t *quo_dig, size_t *quo_len) {
+static void mpn_div(mpz_dig_t *num_dig, size_t *num_len, const mpz_dig_t *den_dig, size_t den_len, mpz_dig_t *quo_dig, size_t *quo_len) {
     mpz_dig_t *orig_num_dig = num_dig;
     mpz_dig_t *orig_quo_dig = quo_dig;
     mpz_dig_t norm_shift = 0;
@@ -668,14 +668,14 @@ mpz_t *mpz_from_str(const char *str, size_t len, bool neg, unsigned int base) {
 }
 #endif
 
-STATIC void mpz_free(mpz_t *z) {
+static void mpz_free(mpz_t *z) {
     if (z != NULL) {
         m_del(mpz_dig_t, z->dig, z->alloc);
         m_del_obj(mpz_t, z);
     }
 }
 
-STATIC void mpz_need_dig(mpz_t *z, size_t need) {
+static void mpz_need_dig(mpz_t *z, size_t need) {
     if (need < MIN_ALLOC) {
         need = MIN_ALLOC;
     }
@@ -689,7 +689,7 @@ STATIC void mpz_need_dig(mpz_t *z, size_t need) {
     }
 }
 
-STATIC mpz_t *mpz_clone(const mpz_t *src) {
+static mpz_t *mpz_clone(const mpz_t *src) {
     assert(src->alloc != 0);
     mpz_t *z = m_new_obj(mpz_t);
     z->neg = src->neg;
diff --git a/py/nativeglue.c b/py/nativeglue.c
index 074b1206ee5f5..4cd090c0a2a78 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -139,7 +139,7 @@ mp_obj_t mp_obj_new_slice(mp_obj_t ostart, mp_obj_t ostop, mp_obj_t ostep) {
 }
 #endif
 
-STATIC mp_obj_dict_t *mp_native_swap_globals(mp_obj_dict_t *new_globals) {
+static mp_obj_dict_t *mp_native_swap_globals(mp_obj_dict_t *new_globals) {
     if (new_globals == NULL) {
         // Globals were the originally the same so don't restore them
         return NULL;
@@ -155,20 +155,20 @@ STATIC mp_obj_dict_t *mp_native_swap_globals(mp_obj_dict_t *new_globals) {
 
 // wrapper that accepts n_args and n_kw in one argument
 // (native emitter can only pass at most 3 arguments to a function)
-STATIC mp_obj_t mp_native_call_function_n_kw(mp_obj_t fun_in, size_t n_args_kw, const mp_obj_t *args) {
+static mp_obj_t mp_native_call_function_n_kw(mp_obj_t fun_in, size_t n_args_kw, const mp_obj_t *args) {
     return mp_call_function_n_kw(fun_in, n_args_kw & 0xff, (n_args_kw >> 8) & 0xff, args);
 }
 
 // wrapper that makes raise obj and raises it
 // END_FINALLY opcode requires that we don't raise if o==None
-STATIC void mp_native_raise(mp_obj_t o) {
+static void mp_native_raise(mp_obj_t o) {
     if (o != MP_OBJ_NULL && o != mp_const_none) {
         nlr_raise(mp_make_raise_obj(o));
     }
 }
 
 // wrapper that handles iterator buffer
-STATIC mp_obj_t mp_native_getiter(mp_obj_t obj, mp_obj_iter_buf_t *iter) {
+static mp_obj_t mp_native_getiter(mp_obj_t obj, mp_obj_iter_buf_t *iter) {
     if (iter == NULL) {
         return mp_getiter(obj, NULL);
     } else {
@@ -183,7 +183,7 @@ STATIC mp_obj_t mp_native_getiter(mp_obj_t obj, mp_obj_iter_buf_t *iter) {
 }
 
 // wrapper that handles iterator buffer
-STATIC mp_obj_t mp_native_iternext(mp_obj_iter_buf_t *iter) {
+static mp_obj_t mp_native_iternext(mp_obj_iter_buf_t *iter) {
     mp_obj_t obj;
     if (iter->base.type == MP_OBJ_NULL) {
         obj = iter->buf[0];
@@ -193,7 +193,7 @@ STATIC mp_obj_t mp_native_iternext(mp_obj_iter_buf_t *iter) {
     return mp_iternext(obj);
 }
 
-STATIC bool mp_native_yield_from(mp_obj_t gen, mp_obj_t send_value, mp_obj_t *ret_value) {
+static bool mp_native_yield_from(mp_obj_t gen, mp_obj_t send_value, mp_obj_t *ret_value) {
     mp_vm_return_kind_t ret_kind;
     nlr_buf_t nlr_buf;
     mp_obj_t throw_value = *ret_value;
@@ -231,22 +231,22 @@ STATIC bool mp_native_yield_from(mp_obj_t gen, mp_obj_t send_value, mp_obj_t *re
 
 #if !MICROPY_PY_BUILTINS_FLOAT
 
-STATIC mp_obj_t mp_obj_new_float_from_f(float f) {
+static mp_obj_t mp_obj_new_float_from_f(float f) {
     (void)f;
     mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("float unsupported"));
 }
 
-STATIC mp_obj_t mp_obj_new_float_from_d(double d) {
+static mp_obj_t mp_obj_new_float_from_d(double d) {
     (void)d;
     mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("float unsupported"));
 }
 
-STATIC float mp_obj_get_float_to_f(mp_obj_t o) {
+static float mp_obj_get_float_to_f(mp_obj_t o) {
     (void)o;
     mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("float unsupported"));
 }
 
-STATIC double mp_obj_get_float_to_d(mp_obj_t o) {
+static double mp_obj_get_float_to_d(mp_obj_t o) {
     (void)o;
     mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("float unsupported"));
 }
diff --git a/py/objarray.c b/py/objarray.c
index a3adb255e8381..1fff234822521 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -61,16 +61,16 @@
 // so not defined to catch errors
 #endif
 
-STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf);
-STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg);
-STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in);
-STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
+static mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf);
+static mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg);
+static mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in);
+static mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
 
 /******************************************************************************/
 // array
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
-STATIC void array_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void array_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_array_t *o = MP_OBJ_TO_PTR(o_in);
     if (o->typecode == BYTEARRAY_TYPECODE) {
@@ -94,7 +94,7 @@ STATIC void array_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
 #endif
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
-STATIC mp_obj_array_t *array_new(char typecode, size_t n) {
+static mp_obj_array_t *array_new(char typecode, size_t n) {
     int typecode_size = mp_binary_get_size('@', typecode, NULL);
     mp_obj_array_t *o = m_new_obj(mp_obj_array_t);
     #if MICROPY_PY_BUILTINS_BYTEARRAY && MICROPY_PY_ARRAY
@@ -113,7 +113,7 @@ STATIC mp_obj_array_t *array_new(char typecode, size_t n) {
 #endif
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
-STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
+static mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
     // bytearrays can be raw-initialised from anything with the buffer protocol
     // other arrays can only be raw-initialised from bytes and bytearray objects
     mp_buffer_info_t bufinfo;
@@ -159,7 +159,7 @@ STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
 #endif
 
 #if MICROPY_PY_ARRAY
-STATIC mp_obj_t array_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t array_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, 1, 2, false);
 
@@ -177,7 +177,7 @@ STATIC mp_obj_t array_make_new(const mp_obj_type_t *type_in, size_t n_args, size
 #endif
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY
-STATIC mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t bytearray_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;
     // Can take 2nd/3rd arg if constructs from str
     mp_arg_check_num(n_args, n_kw, 0, 3, false);
@@ -214,7 +214,7 @@ mp_obj_t mp_obj_new_memoryview(byte typecode, size_t nitems, void *items) {
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t memoryview_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t memoryview_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;
 
     // TODO possibly allow memoryview constructor to take start/stop so that one
@@ -246,7 +246,7 @@ STATIC mp_obj_t memoryview_make_new(const mp_obj_type_t *type_in, size_t n_args,
 }
 
 #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-STATIC void memoryview_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void memoryview_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         return;
     }
@@ -265,7 +265,7 @@ STATIC void memoryview_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 
 #endif
 
-STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
+static mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     mp_obj_array_t *o = MP_OBJ_TO_PTR(o_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -277,7 +277,7 @@ STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     }
 }
 
-STATIC int typecode_for_comparison(int typecode, bool *is_unsigned) {
+static int typecode_for_comparison(int typecode, bool *is_unsigned) {
     if (typecode == BYTEARRAY_TYPECODE) {
         typecode = 'B';
     }
@@ -288,7 +288,7 @@ STATIC int typecode_for_comparison(int typecode, bool *is_unsigned) {
     return typecode;
 }
 
-STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+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) {
         case MP_BINARY_OP_ADD: {
@@ -383,7 +383,7 @@ STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
 }
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
-STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
     // self is not a memoryview, so we don't need to use (& TYPECODE_MASK)
     assert((MICROPY_PY_BUILTINS_BYTEARRAY && mp_obj_is_type(self_in, &mp_type_bytearray))
         || (MICROPY_PY_ARRAY && mp_obj_is_type(self_in, &mp_type_array)));
@@ -404,7 +404,7 @@ STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
 }
 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) {
+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)
     assert((MICROPY_PY_BUILTINS_BYTEARRAY && mp_obj_is_type(self_in, &mp_type_bytearray))
         || (MICROPY_PY_ARRAY && mp_obj_is_type(self_in, &mp_type_array)));
@@ -437,7 +437,7 @@ STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
 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) {
+static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
         // TODO implement
@@ -568,7 +568,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
     }
 }
 
-STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+static mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     mp_obj_array_t *o = MP_OBJ_TO_PTR(o_in);
     size_t sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
     bufinfo->buf = o->items;
@@ -682,7 +682,7 @@ typedef struct _mp_obj_array_it_t {
     size_t cur;
 } mp_obj_array_it_t;
 
-STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
+static mp_obj_t array_it_iternext(mp_obj_t self_in) {
     mp_obj_array_it_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->cur < self->array->len) {
         return mp_binary_get_val_array(self->array->typecode & TYPECODE_MASK, self->array->items, self->offset + self->cur++);
@@ -691,14 +691,14 @@ STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_array_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     iter, array_it_iternext
     );
 
-STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf) {
+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));
     mp_obj_array_t *array = MP_OBJ_TO_PTR(array_in);
     mp_obj_array_it_t *o = (mp_obj_array_it_t *)iter_buf;
diff --git a/py/objattrtuple.c b/py/objattrtuple.c
index 1ec9499893236..1280e3308938e 100644
--- a/py/objattrtuple.c
+++ b/py/objattrtuple.c
@@ -30,7 +30,7 @@
 
 // this helper function is used by collections.namedtuple
 #if !MICROPY_PY_COLLECTIONS
-STATIC
+static
 #endif
 void mp_obj_attrtuple_print_helper(const mp_print_t *print, const qstr *fields, mp_obj_tuple_t *o) {
     mp_print_str(print, "(");
@@ -48,14 +48,14 @@ void mp_obj_attrtuple_print_helper(const mp_print_t *print, const qstr *fields,
 
 #if MICROPY_PY_ATTRTUPLE
 
-STATIC void mp_obj_attrtuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void mp_obj_attrtuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_tuple_t *o = MP_OBJ_TO_PTR(o_in);
     const qstr *fields = (const qstr *)MP_OBJ_TO_PTR(o->items[o->len]);
     mp_obj_attrtuple_print_helper(print, fields, o);
 }
 
-STATIC void mp_obj_attrtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void mp_obj_attrtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
         // load attribute
         mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/py/objbool.c b/py/objbool.c
index 96f0e60dd1765..5b3e3660e9510 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -43,7 +43,7 @@ typedef struct _mp_obj_bool_t {
 
 #endif
 
-STATIC void bool_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void bool_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     bool value = BOOL_VALUE(self_in);
     if (MICROPY_PY_JSON && kind == PRINT_JSON) {
         if (value) {
@@ -60,7 +60,7 @@ STATIC void bool_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
     }
 }
 
-STATIC mp_obj_t bool_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t bool_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);
 
@@ -71,7 +71,7 @@ STATIC mp_obj_t bool_make_new(const mp_obj_type_t *type_in, size_t n_args, size_
     }
 }
 
-STATIC mp_obj_t bool_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
+static mp_obj_t bool_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     if (op == MP_UNARY_OP_LEN) {
         return MP_OBJ_NULL;
     }
@@ -79,7 +79,7 @@ STATIC mp_obj_t bool_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     return mp_unary_op(op, MP_OBJ_NEW_SMALL_INT(value));
 }
 
-STATIC mp_obj_t bool_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t bool_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     bool value = BOOL_VALUE(lhs_in);
     return mp_binary_op(op, MP_OBJ_NEW_SMALL_INT(value), rhs_in);
 }
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index b0be810c5c15e..e3503ff154a65 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -36,7 +36,7 @@ typedef struct _mp_obj_bound_meth_t {
 } mp_obj_bound_meth_t;
 
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-STATIC void bound_meth_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void bound_meth_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_bound_meth_t *o = MP_OBJ_TO_PTR(o_in);
     mp_printf(print, "<bound_method %p ", o);
@@ -78,12 +78,12 @@ mp_obj_t mp_call_method_self_n_kw(mp_obj_t meth, mp_obj_t self, size_t n_args, s
     return res;
 }
 
-STATIC mp_obj_t bound_meth_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t bound_meth_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_bound_meth_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_call_method_self_n_kw(self->meth, self->self, n_args, n_kw, args);
 }
 
-STATIC mp_obj_t bound_meth_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t bound_meth_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_bound_meth_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_HASH:
@@ -93,7 +93,7 @@ STATIC mp_obj_t bound_meth_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     // The MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE flag is clear for this type, so if this
     // function is called with MP_BINARY_OP_EQUAL then lhs_in and rhs_in must have the
     // same type, which is mp_type_bound_meth.
@@ -106,7 +106,7 @@ STATIC mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_
 }
 
 #if MICROPY_PY_FUNCTION_ATTRS
-STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
         return;
diff --git a/py/objcell.c b/py/objcell.c
index 0a74e29d2064a..95966c7917cb7 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -27,7 +27,7 @@
 #include "py/obj.h"
 
 #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) {
+static void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_cell_t *o = MP_OBJ_TO_PTR(o_in);
     mp_printf(print, "<cell %p ", o->obj);
@@ -46,7 +46,7 @@ STATIC void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
 #define CELL_TYPE_PRINT
 #endif
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     // cell representation is just value in < >
     mp_type_cell, MP_QSTR_, MP_TYPE_FLAG_NONE
     CELL_TYPE_PRINT
diff --git a/py/objclosure.c b/py/objclosure.c
index 88109cc919642..3ba507b959382 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -36,7 +36,7 @@ typedef struct _mp_obj_closure_t {
     mp_obj_t closed[];
 } mp_obj_closure_t;
 
-STATIC mp_obj_t closure_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t closure_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_closure_t *self = MP_OBJ_TO_PTR(self_in);
 
     // need to concatenate closed-over-vars and args
@@ -60,7 +60,7 @@ STATIC mp_obj_t closure_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
 }
 
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_closure_t *o = MP_OBJ_TO_PTR(o_in);
     mp_print_str(print, "<closure ");
@@ -79,7 +79,7 @@ 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) {
+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);
diff --git a/py/objcomplex.c b/py/objcomplex.c
index ddd103eeb46e3..85b5852845737 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -42,7 +42,7 @@ typedef struct _mp_obj_complex_t {
     mp_float_t imag;
 } mp_obj_complex_t;
 
-STATIC void complex_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void complex_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_complex_t *o = MP_OBJ_TO_PTR(o_in);
     #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
@@ -70,7 +70,7 @@ STATIC void complex_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_
     }
 }
 
-STATIC mp_obj_t complex_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t complex_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, 2, false);
 
@@ -115,7 +115,7 @@ STATIC mp_obj_t complex_make_new(const mp_obj_type_t *type_in, size_t n_args, si
     }
 }
 
-STATIC mp_obj_t complex_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
+static mp_obj_t complex_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     mp_obj_complex_t *o = MP_OBJ_TO_PTR(o_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -133,12 +133,12 @@ STATIC mp_obj_t complex_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     }
 }
 
-STATIC mp_obj_t complex_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t complex_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_obj_complex_t *lhs = MP_OBJ_TO_PTR(lhs_in);
     return mp_obj_complex_binary_op(op, lhs->real, lhs->imag, rhs_in);
 }
 
-STATIC void complex_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void complex_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
         return;
diff --git a/py/objdeque.c b/py/objdeque.c
index 8b52b8d387303..68e1621793116 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -42,7 +42,7 @@ typedef struct _mp_obj_deque_t {
     #define FLAG_CHECK_OVERFLOW 1
 } mp_obj_deque_t;
 
-STATIC mp_obj_t deque_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 deque_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);
 
     /* Initialization from existing sequence is not supported, so an empty
@@ -69,7 +69,7 @@ STATIC mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t deque_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t deque_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -92,7 +92,7 @@ STATIC mp_obj_t deque_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
 
     size_t new_i_put = self->i_put + 1;
@@ -115,9 +115,9 @@ STATIC mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(deque_append_obj, mp_obj_deque_append);
+static MP_DEFINE_CONST_FUN_OBJ_2(deque_append_obj, mp_obj_deque_append);
 
-STATIC mp_obj_t deque_popleft(mp_obj_t self_in) {
+static mp_obj_t deque_popleft(mp_obj_t self_in) {
     mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->i_get == self->i_put) {
@@ -133,19 +133,19 @@ STATIC mp_obj_t deque_popleft(mp_obj_t self_in) {
 
     return ret;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(deque_popleft_obj, deque_popleft);
+static MP_DEFINE_CONST_FUN_OBJ_1(deque_popleft_obj, deque_popleft);
 
 #if 0
-STATIC mp_obj_t deque_clear(mp_obj_t self_in) {
+static mp_obj_t deque_clear(mp_obj_t self_in) {
     mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
     self->i_get = self->i_put = 0;
     mp_seq_clear(self->items, 0, self->alloc, sizeof(*self->items));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(deque_clear_obj, deque_clear);
+static MP_DEFINE_CONST_FUN_OBJ_1(deque_clear_obj, deque_clear);
 #endif
 
-STATIC const mp_rom_map_elem_t deque_locals_dict_table[] = {
+static const mp_rom_map_elem_t deque_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&deque_append_obj) },
     #if 0
     { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&deque_clear_obj) },
@@ -153,7 +153,7 @@ STATIC const mp_rom_map_elem_t deque_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_popleft), MP_ROM_PTR(&deque_popleft_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table);
+static MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_deque,
diff --git a/py/objdict.c b/py/objdict.c
index 8aafe607d69ff..cf64fa9555a28 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -49,12 +49,12 @@ const mp_obj_dict_t mp_const_empty_dict_obj = {
     }
 };
 
-STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
+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
 // the iteration is held in *cur and should be initialised with zero for the
 // first call.  Will return NULL when no more elements are available.
-STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) {
+static mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) {
     size_t max = dict->map.alloc;
     mp_map_t *map = &dict->map;
 
@@ -70,7 +70,7 @@ STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) {
     return NULL;
 }
 
-STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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 = ", ";
@@ -129,7 +129,7 @@ mp_obj_t mp_obj_dict_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     return dict_out;
 }
 
-STATIC mp_obj_t dict_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t dict_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -147,7 +147,7 @@ STATIC mp_obj_t dict_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t dict_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t dict_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_obj_dict_t *o = MP_OBJ_TO_PTR(lhs_in);
     switch (op) {
         case MP_BINARY_OP_CONTAINS: {
@@ -218,7 +218,7 @@ mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
     }
 }
 
-STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete
         mp_obj_dict_delete(self_in, index);
@@ -242,13 +242,13 @@ STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 /******************************************************************************/
 /* dict methods                                                               */
 
-STATIC void mp_ensure_not_fixed(const mp_obj_dict_t *dict) {
+static void mp_ensure_not_fixed(const mp_obj_dict_t *dict) {
     if (dict->map.is_fixed) {
         mp_raise_TypeError(NULL);
     }
 }
 
-STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
+static mp_obj_t dict_clear(mp_obj_t 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);
@@ -257,7 +257,7 @@ STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
+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_or_ordereddict(self_in));
@@ -272,11 +272,11 @@ mp_obj_t mp_obj_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, mp_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
-STATIC mp_obj_t dict_fromkeys(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t dict_fromkeys(size_t n_args, const mp_obj_t *args) {
     mp_obj_t iter = mp_getiter(args[1], NULL);
     mp_obj_t value = mp_const_none;
     mp_obj_t next = MP_OBJ_NULL;
@@ -302,11 +302,11 @@ STATIC mp_obj_t dict_fromkeys(size_t n_args, const mp_obj_t *args) {
 
     return self_out;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys);
-STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, MP_ROM_PTR(&dict_fromkeys_fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys);
+static MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, MP_ROM_PTR(&dict_fromkeys_fun_obj));
 #endif
 
-STATIC mp_obj_t dict_get_helper(size_t n_args, const mp_obj_t *args, mp_map_lookup_kind_t lookup_kind) {
+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_or_ordereddict(args[0]));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
     if (lookup_kind != MP_MAP_LOOKUP) {
@@ -336,22 +336,22 @@ STATIC mp_obj_t dict_get_helper(size_t n_args, const mp_obj_t *args, mp_map_look
     return value;
 }
 
-STATIC mp_obj_t dict_get(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t dict_get(size_t n_args, const mp_obj_t *args) {
     return dict_get_helper(n_args, args, MP_MAP_LOOKUP);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
 
-STATIC mp_obj_t dict_pop(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t dict_pop(size_t n_args, const mp_obj_t *args) {
     return dict_get_helper(n_args, args, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
 
-STATIC mp_obj_t dict_setdefault(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t dict_setdefault(size_t n_args, const mp_obj_t *args) {
     return dict_get_helper(n_args, args, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
+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) {
+static mp_obj_t dict_popitem(mp_obj_t 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);
@@ -374,9 +374,9 @@ STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
 
     return tuple;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
+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) {
+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_or_ordereddict(args[0]));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_ensure_not_fixed(self);
@@ -424,14 +424,14 @@ STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwarg
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dict_update_obj, 1, dict_update);
+static MP_DEFINE_CONST_FUN_OBJ_KW(dict_update_obj, 1, dict_update);
 
 
 /******************************************************************************/
 /* dict views                                                                 */
 
-STATIC const mp_obj_type_t mp_type_dict_view;
-STATIC const mp_obj_type_t mp_type_dict_view_it;
+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,
@@ -439,7 +439,7 @@ typedef enum _mp_dict_view_kind_t {
     MP_DICT_VIEW_VALUES,
 } mp_dict_view_kind_t;
 
-STATIC const char *const mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
+static const char *const mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
 
 typedef struct _mp_obj_dict_view_it_t {
     mp_obj_base_t base;
@@ -454,7 +454,7 @@ typedef struct _mp_obj_dict_view_t {
     mp_dict_view_kind_t kind;
 } mp_obj_dict_view_t;
 
-STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
+static mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
     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);
@@ -476,14 +476,14 @@ STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict_view_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_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) {
+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, &mp_type_dict_view));
     mp_obj_dict_view_t *view = MP_OBJ_TO_PTR(view_in);
@@ -495,7 +495,7 @@ STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in, mp_obj_iter_buf_t *iter_buf)
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC void dict_view_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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, &mp_type_dict_view));
     mp_obj_dict_view_t *self = MP_OBJ_TO_PTR(self_in);
@@ -515,7 +515,7 @@ STATIC void dict_view_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     mp_print_str(print, "])");
 }
 
-STATIC mp_obj_t dict_view_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
+static mp_obj_t dict_view_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     mp_obj_dict_view_t *o = MP_OBJ_TO_PTR(o_in);
     // only dict.values() supports __hash__.
     if (op == MP_UNARY_OP_HASH && o->kind == MP_DICT_VIEW_VALUES) {
@@ -524,7 +524,7 @@ STATIC mp_obj_t dict_view_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     return MP_OBJ_NULL;
 }
 
-STATIC mp_obj_t dict_view_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t dict_view_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     // only supported for the 'keys' kind until sets and dicts are refactored
     mp_obj_dict_view_t *o = MP_OBJ_TO_PTR(lhs_in);
     if (o->kind != MP_DICT_VIEW_KEYS) {
@@ -536,7 +536,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 MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict_view,
     MP_QSTR_dict_view,
     MP_TYPE_FLAG_ITER_IS_GETITER,
@@ -546,37 +546,37 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     iter, dict_view_getiter
     );
 
-STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
+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);
     o->dict = dict;
     o->kind = kind;
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t dict_view(mp_obj_t self_in, 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_or_ordereddict(self_in));
     return mp_obj_new_dict_view(self_in, kind);
 }
 
-STATIC mp_obj_t dict_items(mp_obj_t self_in) {
+static mp_obj_t dict_items(mp_obj_t self_in) {
     return dict_view(self_in, MP_DICT_VIEW_ITEMS);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
+static MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
 
-STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
+static mp_obj_t dict_keys(mp_obj_t self_in) {
     return dict_view(self_in, MP_DICT_VIEW_KEYS);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
+static MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
 
-STATIC mp_obj_t dict_values(mp_obj_t self_in) {
+static mp_obj_t dict_values(mp_obj_t self_in) {
     return dict_view(self_in, MP_DICT_VIEW_VALUES);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
+static MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
 
 /******************************************************************************/
 /* dict iterator                                                              */
 
-STATIC mp_obj_t dict_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
+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;
@@ -590,7 +590,7 @@ STATIC mp_obj_t dict_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
 /******************************************************************************/
 /* dict constructors & public C API                                           */
 
-STATIC const mp_rom_map_elem_t dict_locals_dict_table[] = {
+static const mp_rom_map_elem_t dict_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&dict_clear_obj) },
     { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&dict_copy_obj) },
     #if MICROPY_PY_BUILTINS_DICT_FROMKEYS
@@ -609,7 +609,7 @@ STATIC const mp_rom_map_elem_t dict_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___delitem__), MP_ROM_PTR(&mp_op_delitem_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
+static MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict,
diff --git a/py/objenumerate.c b/py/objenumerate.c
index 40bed919ed750..8217a0d4f9927 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -37,9 +37,9 @@ typedef struct _mp_obj_enumerate_t {
     mp_int_t cur;
 } mp_obj_enumerate_t;
 
-STATIC mp_obj_t enumerate_iternext(mp_obj_t self_in);
+static mp_obj_t enumerate_iternext(mp_obj_t self_in);
 
-STATIC mp_obj_t enumerate_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 enumerate_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     #if MICROPY_CPYTHON_COMPAT
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_iterable, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
@@ -75,7 +75,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     iter, enumerate_iternext
     );
 
-STATIC mp_obj_t enumerate_iternext(mp_obj_t self_in) {
+static mp_obj_t enumerate_iternext(mp_obj_t self_in) {
     assert(mp_obj_is_type(self_in, &mp_type_enumerate));
     mp_obj_enumerate_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t next = mp_iternext(self->iter);
diff --git a/py/objexcept.c b/py/objexcept.c
index fe74458cae8c3..5bf4e672baaf1 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -117,7 +117,7 @@ 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) {
+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);
@@ -126,7 +126,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) {
+static void decompress_error_text_maybe(mp_obj_exception_t *o) {
     #if MICROPY_ROM_TEXT_COMPRESSION
     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]);
@@ -439,7 +439,7 @@ struct _exc_printer_t {
     byte *buf;
 };
 
-STATIC void exc_add_strn(void *data, const char *str, size_t len) {
+static void exc_add_strn(void *data, const char *str, size_t len) {
     struct _exc_printer_t *pr = data;
     if (pr->len + len >= pr->alloc) {
         // Not enough room for data plus a null byte so try to grow the buffer
diff --git a/py/objfilter.c b/py/objfilter.c
index 2a657fde4b71b..7f1f700f6a607 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -34,7 +34,7 @@ typedef struct _mp_obj_filter_t {
     mp_obj_t iter;
 } 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) {
+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 = mp_obj_malloc(mp_obj_filter_t, type);
     o->fun = args[0];
@@ -42,7 +42,7 @@ STATIC mp_obj_t filter_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t filter_iternext(mp_obj_t self_in) {
+static mp_obj_t filter_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_filter));
     mp_obj_filter_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t next;
diff --git a/py/objfloat.c b/py/objfloat.c
index c862b4843b278..5c90b1491cebf 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -102,7 +102,7 @@ mp_int_t mp_float_hash(mp_float_t src) {
 }
 #endif
 
-STATIC void float_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void float_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_float_t o_val = mp_obj_float_get(o_in);
     #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
@@ -124,7 +124,7 @@ STATIC void float_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
     }
 }
 
-STATIC mp_obj_t float_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t float_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);
 
@@ -149,7 +149,7 @@ STATIC mp_obj_t float_make_new(const mp_obj_type_t *type_in, size_t n_args, size
     }
 }
 
-STATIC mp_obj_t float_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
+static mp_obj_t float_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     mp_float_t val = mp_obj_float_get(o_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -172,7 +172,7 @@ STATIC mp_obj_t float_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     }
 }
 
-STATIC mp_obj_t float_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t float_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_float_t lhs_val = mp_obj_float_get(lhs_in);
     #if MICROPY_PY_BUILTINS_COMPLEX
     if (mp_obj_is_type(rhs_in, &mp_type_complex)) {
@@ -208,7 +208,7 @@ mp_float_t mp_obj_float_get(mp_obj_t self_in) {
 
 #endif
 
-STATIC void mp_obj_float_divmod(mp_float_t *x, mp_float_t *y) {
+static void mp_obj_float_divmod(mp_float_t *x, mp_float_t *y) {
     // logic here follows that of CPython
     // https://docs.python.org/3/reference/expressions.html#binary-arithmetic-operations
     // x == (x//y)*y + (x%y)
diff --git a/py/objfun.c b/py/objfun.c
index 2e86aaa14d594..1ebfa3d5af217 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -48,7 +48,7 @@
 /******************************************************************************/
 /* builtin functions                                                          */
 
-STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)args;
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_0));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
@@ -61,7 +61,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     call, fun_builtin_0_call
     );
 
-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) {
+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));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
@@ -73,7 +73,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     call, fun_builtin_1_call
     );
 
-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) {
+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));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
@@ -85,7 +85,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     call, fun_builtin_2_call
     );
 
-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) {
+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));
     mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
     mp_arg_check_num(n_args, n_kw, 3, 3, false);
@@ -97,7 +97,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     call, fun_builtin_3_call
     );
 
-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) {
+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));
     mp_obj_fun_builtin_var_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -150,7 +150,7 @@ qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
 }
 
 #if MICROPY_CPYTHON_COMPAT
-STATIC void fun_bc_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void fun_bc_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(o_in);
     mp_printf(print, "<function %q at 0x%p>", mp_obj_fun_get_name(o_in), o);
@@ -158,7 +158,7 @@ STATIC void fun_bc_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
 #endif
 
 #if DEBUG_PRINT
-STATIC void dump_args(const mp_obj_t *a, size_t sz) {
+static void dump_args(const mp_obj_t *a, size_t sz) {
     DEBUG_printf("%p: ", a);
     for (size_t i = 0; i < sz; i++) {
         DEBUG_printf("%p ", a[i]);
@@ -224,7 +224,7 @@ mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t self_in, size_t n_args
 }
 #endif
 
-STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     MP_STACK_CHECK();
 
     DEBUG_printf("Input n_args: " UINT_FMT ", n_kw: " UINT_FMT "\n", n_args, n_kw);
@@ -396,7 +396,7 @@ mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_
 
 #if MICROPY_EMIT_NATIVE
 
-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) {
+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 = MP_OBJ_TO_PTR(self_in);
     mp_call_fun_t fun = mp_obj_fun_native_get_function_start(self);
@@ -430,7 +430,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 #if MICROPY_EMIT_NATIVE
 
-STATIC mp_obj_t fun_viper_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t fun_viper_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 = MP_OBJ_TO_PTR(self_in);
     mp_call_fun_t fun = MICROPY_MAKE_POINTER_CALLABLE((void *)self->bytecode);
@@ -458,7 +458,7 @@ typedef mp_uint_t (*inline_asm_fun_3_t)(mp_uint_t, mp_uint_t, mp_uint_t);
 typedef mp_uint_t (*inline_asm_fun_4_t)(mp_uint_t, mp_uint_t, mp_uint_t, mp_uint_t);
 
 // convert a MicroPython object to a sensible value for inline asm
-STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
+static mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
     // TODO for byte_array, pass pointer to the array
     if (mp_obj_is_small_int(obj)) {
         return MP_OBJ_SMALL_INT_VALUE(obj);
@@ -501,7 +501,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) {
+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 = MP_OBJ_TO_PTR(self_in);
 
     mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false);
diff --git a/py/objgenerator.c b/py/objgenerator.c
index e4acd5e49b9cc..431cbad5a79d8 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -50,7 +50,7 @@ typedef struct _mp_obj_gen_instance_t {
     mp_code_state_t code_state;
 } mp_obj_gen_instance_t;
 
-STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // A generating function is just a bytecode function with type mp_type_gen_wrap
     mp_obj_fun_bc_t *self_fun = MP_OBJ_TO_PTR(self_in);
 
@@ -96,7 +96,7 @@ typedef struct _mp_obj_gen_instance_native_t {
     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) {
+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);
 
@@ -144,7 +144,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 /* generator instance                                                         */
 
-STATIC void gen_instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void gen_instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_gen_instance_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<generator object '%q' at %p>", mp_obj_fun_get_name(MP_OBJ_FROM_PTR(self->code_state.fun_bc)), self);
@@ -254,7 +254,7 @@ 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, bool raise_stop_iteration) {
+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:
@@ -278,16 +278,16 @@ 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) {
+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, false);
 }
 
-STATIC mp_obj_t gen_instance_send(mp_obj_t self_in, mp_obj_t send_value) {
+static mp_obj_t gen_instance_send(mp_obj_t self_in, mp_obj_t send_value) {
     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);
+static MP_DEFINE_CONST_FUN_OBJ_2(gen_instance_send_obj, gen_instance_send);
 
-STATIC mp_obj_t gen_instance_throw(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t gen_instance_throw(size_t n_args, const mp_obj_t *args) {
     // The signature of this function is: throw(type[, value[, traceback]])
     // CPython will pass all given arguments through the call chain and process them
     // at the point they are used (native generators will handle them differently to
@@ -307,9 +307,9 @@ STATIC mp_obj_t gen_instance_throw(size_t n_args, const mp_obj_t *args) {
 
     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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gen_instance_throw_obj, 2, 4, gen_instance_throw);
 
-STATIC mp_obj_t gen_instance_close(mp_obj_t self_in) {
+static mp_obj_t gen_instance_close(mp_obj_t self_in) {
     mp_obj_t ret;
     switch (mp_obj_gen_resume(self_in, mp_const_none, MP_OBJ_FROM_PTR(&mp_const_GeneratorExit_obj), &ret)) {
         case MP_VM_RETURN_YIELD:
@@ -328,10 +328,10 @@ STATIC mp_obj_t gen_instance_close(mp_obj_t self_in) {
             return mp_const_none;
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(gen_instance_close_obj, gen_instance_close);
+static MP_DEFINE_CONST_FUN_OBJ_1(gen_instance_close_obj, gen_instance_close);
 
 #if MICROPY_PY_GENERATOR_PEND_THROW
-STATIC mp_obj_t gen_instance_pend_throw(mp_obj_t self_in, mp_obj_t exc_in) {
+static mp_obj_t gen_instance_pend_throw(mp_obj_t self_in, mp_obj_t exc_in) {
     mp_obj_gen_instance_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->pend_exc == MP_OBJ_NULL) {
         mp_raise_ValueError(MP_ERROR_TEXT("generator already executing"));
@@ -340,10 +340,10 @@ STATIC mp_obj_t gen_instance_pend_throw(mp_obj_t self_in, mp_obj_t exc_in) {
     self->pend_exc = exc_in;
     return prev;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(gen_instance_pend_throw_obj, gen_instance_pend_throw);
+static MP_DEFINE_CONST_FUN_OBJ_2(gen_instance_pend_throw_obj, gen_instance_pend_throw);
 #endif
 
-STATIC const mp_rom_map_elem_t gen_instance_locals_dict_table[] = {
+static const mp_rom_map_elem_t gen_instance_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&gen_instance_close_obj) },
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&gen_instance_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_throw), MP_ROM_PTR(&gen_instance_throw_obj) },
@@ -352,7 +352,7 @@ STATIC const mp_rom_map_elem_t gen_instance_locals_dict_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(gen_instance_locals_dict, gen_instance_locals_dict_table);
+static MP_DEFINE_CONST_DICT(gen_instance_locals_dict, gen_instance_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_gen_instance,
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index c598d1daaca9a..c735c65b652d6 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -35,7 +35,7 @@ typedef struct _mp_obj_getitem_iter_t {
     mp_obj_t args[3];
 } mp_obj_getitem_iter_t;
 
-STATIC mp_obj_t it_iternext(mp_obj_t self_in) {
+static mp_obj_t it_iternext(mp_obj_t self_in) {
     mp_obj_getitem_iter_t *self = MP_OBJ_TO_PTR(self_in);
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
@@ -56,7 +56,7 @@ STATIC mp_obj_t it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
diff --git a/py/objint.c b/py/objint.c
index be5f4653a7dec..6caa608f33035 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -40,7 +40,7 @@
 #endif
 
 // This dispatcher function is expected to be independent of the implementation of long int
-STATIC mp_obj_t mp_obj_int_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t mp_obj_int_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, 2, false);
 
@@ -83,7 +83,7 @@ typedef enum {
     MP_FP_CLASS_OVERFLOW
 } mp_fp_as_int_class_t;
 
-STATIC mp_fp_as_int_class_t mp_classify_fp_as_int(mp_float_t val) {
+static mp_fp_as_int_class_t mp_classify_fp_as_int(mp_float_t val) {
     union {
         mp_float_t f;
         #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
@@ -193,7 +193,7 @@ void mp_obj_int_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     }
 }
 
-STATIC const uint8_t log_base2_floor[] = {
+static const uint8_t log_base2_floor[] = {
     0, 1, 1, 2,
     2, 2, 2, 3,
     3, 3, 3, 3,
@@ -388,7 +388,7 @@ mp_obj_t mp_obj_int_binary_op_extra_cases(mp_binary_op_t op, mp_obj_t lhs_in, mp
 }
 
 // this is a classmethod
-STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
     // TODO: Support signed param (assumes signed=False at the moment)
     (void)n_args;
 
@@ -417,10 +417,10 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
     return mp_obj_new_int_from_uint(value);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 3, 4, int_from_bytes);
-STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_bytes_fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 3, 4, int_from_bytes);
+static MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_bytes_fun_obj));
 
-STATIC mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
     // TODO: Support signed param (assumes signed=False)
     (void)n_args;
 
@@ -448,14 +448,14 @@ STATIC mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
 
     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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_to_bytes_obj, 3, 4, int_to_bytes);
 
-STATIC const mp_rom_map_elem_t int_locals_dict_table[] = {
+static const mp_rom_map_elem_t int_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_from_bytes), MP_ROM_PTR(&int_from_bytes_obj) },
     { MP_ROM_QSTR(MP_QSTR_to_bytes), MP_ROM_PTR(&int_to_bytes_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(int_locals_dict, int_locals_dict_table);
+static MP_DEFINE_CONST_DICT(int_locals_dict, int_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_int,
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 8078441d66a0b..600316a42abba 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -43,7 +43,7 @@
 // Export value for sys.maxsize
 // *FORMAT-OFF*
 #define DIG_MASK ((MPZ_LONG_1 << MPZ_DIG_SIZE) - 1)
-STATIC const mpz_dig_t maxsize_dig[] = {
+static const mpz_dig_t maxsize_dig[] = {
     #define NUM_DIG 1
     (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 0) & DIG_MASK,
     #if (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 0) > DIG_MASK
@@ -335,7 +335,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 MICROPY_PY_BUILTINS_POW3
-STATIC mpz_t *mp_mpz_for_int(mp_obj_t arg, mpz_t *temp) {
+static mpz_t *mp_mpz_for_int(mp_obj_t arg, mpz_t *temp) {
     if (mp_obj_is_small_int(arg)) {
         mpz_init_from_int(temp, MP_OBJ_SMALL_INT_VALUE(arg));
         return temp;
diff --git a/py/objlist.c b/py/objlist.c
index 1423cb1deeb73..2198beb839f14 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -31,10 +31,10 @@
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 
-STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf);
-STATIC mp_obj_list_t *list_new(size_t n);
-STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in);
-STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args);
+static mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf);
+static mp_obj_list_t *list_new(size_t n);
+static mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in);
+static mp_obj_t list_pop(size_t n_args, const mp_obj_t *args);
 
 // TODO: Move to mpconfig.h
 #define LIST_MIN_ALLOC 4
@@ -42,7 +42,7 @@ STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args);
 /******************************************************************************/
 /* list                                                                       */
 
-STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+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_JSON && kind == PRINT_JSON)) {
@@ -62,7 +62,7 @@ STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
     mp_print_str(print, "]");
 }
 
-STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) {
+static mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) {
     mp_obj_t iter = mp_getiter(iterable, NULL);
     mp_obj_t item;
     while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
@@ -90,7 +90,7 @@ mp_obj_t mp_obj_list_make_new(const mp_obj_type_t *type_in, size_t n_args, size_
     }
 }
 
-STATIC mp_obj_t list_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t list_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -108,7 +108,7 @@ STATIC mp_obj_t list_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
+static mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
     mp_obj_list_t *o = MP_OBJ_TO_PTR(lhs);
     switch (op) {
         case MP_BINARY_OP_ADD: {
@@ -158,7 +158,7 @@ STATIC mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
     }
 }
 
-STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete
         #if MICROPY_PY_BUILTINS_SLICE
@@ -234,7 +234,7 @@ STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     }
 }
 
-STATIC mp_obj_t list_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t list_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
     return mp_obj_new_list_iterator(o_in, 0, iter_buf);
 }
 
@@ -250,7 +250,7 @@ mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) {
     return mp_const_none; // return None, as per CPython
 }
 
-STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
+static mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
     if (mp_obj_is_type(arg_in, &mp_type_list)) {
         mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
@@ -271,7 +271,7 @@ STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
     return mp_const_none; // return None, as per CPython
 }
 
-STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]);
     if (self->len == 0) {
@@ -290,7 +290,7 @@ STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) {
     return ret;
 }
 
-STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, mp_obj_t binop_less_result) {
+static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, mp_obj_t binop_less_result) {
     MP_STACK_CHECK();
     while (head < tail) {
         mp_obj_t *h = head - 1;
@@ -348,7 +348,7 @@ mp_obj_t mp_obj_list_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_
     return mp_const_none;
 }
 
-STATIC mp_obj_t list_clear(mp_obj_t self_in) {
+static mp_obj_t list_clear(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
     self->len = 0;
@@ -358,25 +358,25 @@ STATIC mp_obj_t list_clear(mp_obj_t self_in) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t list_copy(mp_obj_t self_in) {
+static mp_obj_t list_copy(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_list(self->len, self->items);
 }
 
-STATIC mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
+static mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_seq_count_obj(self->items, self->len, value);
 }
 
-STATIC mp_obj_t list_index(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t list_index(size_t n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]);
     return mp_seq_index_obj(self->items, self->len, n_args, args);
 }
 
-STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
+static mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
     // insert has its own strange index logic
@@ -410,7 +410,7 @@ mp_obj_t mp_obj_list_remove(mp_obj_t self_in, mp_obj_t value) {
     return mp_const_none;
 }
 
-STATIC mp_obj_t list_reverse(mp_obj_t self_in) {
+static mp_obj_t list_reverse(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -424,19 +424,19 @@ STATIC mp_obj_t list_reverse(mp_obj_t self_in) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, mp_obj_list_remove);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 1, mp_obj_list_sort);
-
-STATIC const mp_rom_map_elem_t list_locals_dict_table[] = {
+static MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
+static MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend);
+static MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
+static MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
+static MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
+static MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
+static MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, mp_obj_list_remove);
+static MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
+static MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 1, mp_obj_list_sort);
+
+static const mp_rom_map_elem_t list_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&list_append_obj) },
     { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&list_clear_obj) },
     { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&list_copy_obj) },
@@ -450,7 +450,7 @@ STATIC const mp_rom_map_elem_t list_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_sort), MP_ROM_PTR(&list_sort_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);
+static MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_list,
@@ -474,7 +474,7 @@ void mp_obj_list_init(mp_obj_list_t *o, size_t n) {
     mp_seq_clear(o->items, n, o->alloc, sizeof(*o->items));
 }
 
-STATIC mp_obj_list_t *list_new(size_t n) {
+static mp_obj_list_t *list_new(size_t n) {
     mp_obj_list_t *o = m_new_obj(mp_obj_list_t);
     mp_obj_list_init(o, n);
     return o;
@@ -519,7 +519,7 @@ typedef struct _mp_obj_list_it_t {
     size_t cur;
 } mp_obj_list_it_t;
 
-STATIC mp_obj_t list_it_iternext(mp_obj_t self_in) {
+static mp_obj_t list_it_iternext(mp_obj_t self_in) {
     mp_obj_list_it_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
     if (self->cur < list->len) {
diff --git a/py/objmap.c b/py/objmap.c
index 98ff19bb7bb6f..1911a7510abe8 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -36,7 +36,7 @@ typedef struct _mp_obj_map_t {
     mp_obj_t iters[];
 } 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) {
+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 = mp_obj_malloc_var(mp_obj_map_t, iters, mp_obj_t, n_args - 1, type);
     o->n_iters = n_args - 1;
@@ -47,7 +47,7 @@ STATIC mp_obj_t map_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t map_iternext(mp_obj_t self_in) {
+static mp_obj_t map_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_map));
     mp_obj_map_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t *nextses = m_new(mp_obj_t, self->n_iters);
diff --git a/py/objmodule.c b/py/objmodule.c
index 5266421b79645..5ce373b83d3f1 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -34,7 +34,7 @@
 #include "py/runtime.h"
 #include "py/builtin.h"
 
-STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+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);
 
@@ -57,9 +57,9 @@ 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);
+static void module_attr_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 
-STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+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) {
         // load attribute
@@ -146,13 +146,13 @@ 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[] = {
+static const mp_rom_map_elem_t mp_builtin_module_table[] = {
     // built-in modules declared with MP_REGISTER_MODULE()
     MICROPY_REGISTERED_MODULES
 };
 MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
 
-STATIC const mp_rom_map_elem_t mp_builtin_extensible_module_table[] = {
+static const mp_rom_map_elem_t mp_builtin_extensible_module_table[] = {
     // built-in modules declared with MP_REGISTER_EXTENSIBLE_MODULE()
     MICROPY_REGISTERED_EXTENSIBLE_MODULES
 };
@@ -164,7 +164,7 @@ typedef struct _mp_module_delegation_entry_t {
     mp_attr_fun_t fun;
 } mp_module_delegation_entry_t;
 
-STATIC const mp_module_delegation_entry_t mp_builtin_module_delegation_table[] = {
+static const mp_module_delegation_entry_t mp_builtin_module_delegation_table[] = {
     // delegation entries declared with MP_REGISTER_MODULE_DELEGATION()
     MICROPY_MODULE_DELEGATIONS
 };
@@ -223,7 +223,7 @@ mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
     return elem->value;
 }
 
-STATIC void module_attr_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void module_attr_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     #if MICROPY_MODULE_ATTR_DELEGATION && defined(MICROPY_MODULE_DELEGATIONS)
     // Delegate lookup to a module's custom attr method.
     size_t n = MP_ARRAY_SIZE(mp_builtin_module_delegation_table);
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 0adf83fe96bcd..f019604d5257b 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -44,7 +44,7 @@ size_t mp_obj_namedtuple_find_field(const mp_obj_namedtuple_type_t *type, qstr n
 }
 
 #if MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT
-STATIC mp_obj_t namedtuple_asdict(mp_obj_t self_in) {
+static mp_obj_t namedtuple_asdict(mp_obj_t self_in) {
     mp_obj_namedtuple_t *self = MP_OBJ_TO_PTR(self_in);
     const qstr *fields = ((mp_obj_namedtuple_type_t *)self->tuple.base.type)->fields;
     mp_obj_t dict = mp_obj_new_dict(self->tuple.len);
@@ -60,7 +60,7 @@ STATIC mp_obj_t namedtuple_asdict(mp_obj_t self_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(namedtuple_asdict_obj, namedtuple_asdict);
 #endif
 
-STATIC void namedtuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void namedtuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_namedtuple_t *o = MP_OBJ_TO_PTR(o_in);
     mp_printf(print, "%q", o->tuple.base.type->name);
@@ -68,7 +68,7 @@ STATIC void namedtuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_ki
     mp_obj_attrtuple_print_helper(print, fields, &o->tuple);
 }
 
-STATIC void namedtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void namedtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
         // load attribute
         mp_obj_namedtuple_t *self = MP_OBJ_TO_PTR(self_in);
@@ -91,7 +91,7 @@ STATIC void namedtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *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) {
@@ -151,7 +151,7 @@ mp_obj_namedtuple_type_t *mp_obj_new_namedtuple_base(size_t n_fields, mp_obj_t *
     return o;
 }
 
-STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t *fields) {
+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);
     mp_obj_type_t *type = (mp_obj_type_t *)&o->base;
     type->base.type = &mp_type_type;
@@ -168,7 +168,7 @@ STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t new_namedtuple_type(mp_obj_t name_in, mp_obj_t fields_in) {
+static mp_obj_t new_namedtuple_type(mp_obj_t name_in, mp_obj_t fields_in) {
     qstr name = mp_obj_str_get_qstr(name_in);
     size_t n_fields;
     mp_obj_t *fields;
diff --git a/py/objnone.c b/py/objnone.c
index 5b25cd38c46d5..a8ce8ebfedf82 100644
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -34,7 +34,7 @@ typedef struct _mp_obj_none_t {
 } mp_obj_none_t;
 #endif
 
-STATIC void none_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void none_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)self_in;
     if (MICROPY_PY_JSON && kind == PRINT_JSON) {
         mp_print_str(print, "null");
diff --git a/py/objobject.c b/py/objobject.c
index 1acae6d00b189..ff93fd0827d2f 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -33,7 +33,7 @@ typedef struct _mp_obj_object_t {
     mp_obj_base_t base;
 } 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) {
+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 = mp_obj_malloc(mp_obj_object_t, type);
@@ -41,13 +41,13 @@ STATIC mp_obj_t object_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 }
 
 #if MICROPY_CPYTHON_COMPAT
-STATIC mp_obj_t object___init__(mp_obj_t self) {
+static mp_obj_t object___init__(mp_obj_t self) {
     (void)self;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(object___init___obj, object___init__);
+static MP_DEFINE_CONST_FUN_OBJ_1(object___init___obj, object___init__);
 
-STATIC mp_obj_t object___new__(mp_obj_t cls) {
+static mp_obj_t object___new__(mp_obj_t cls) {
     if (!mp_obj_is_type(cls, &mp_type_type) || !mp_obj_is_instance_type((mp_obj_type_t *)MP_OBJ_TO_PTR(cls))) {
         mp_raise_TypeError(MP_ERROR_TEXT("arg must be user-type"));
     }
@@ -58,11 +58,11 @@ STATIC mp_obj_t object___new__(mp_obj_t cls) {
     const mp_obj_type_t *native_base;
     return MP_OBJ_FROM_PTR(mp_obj_new_instance(MP_OBJ_TO_PTR(cls), &native_base));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(object___new___fun_obj, object___new__);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(object___new___obj, MP_ROM_PTR(&object___new___fun_obj));
+static MP_DEFINE_CONST_FUN_OBJ_1(object___new___fun_obj, object___new__);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(object___new___obj, MP_ROM_PTR(&object___new___fun_obj));
 
 #if MICROPY_PY_DELATTR_SETATTR
-STATIC mp_obj_t object___setattr__(mp_obj_t self_in, mp_obj_t attr, mp_obj_t value) {
+static mp_obj_t object___setattr__(mp_obj_t self_in, mp_obj_t attr, mp_obj_t value) {
     if (!mp_obj_is_instance_type(mp_obj_get_type(self_in))) {
         mp_raise_TypeError(MP_ERROR_TEXT("arg must be user-type"));
     }
@@ -75,9 +75,9 @@ STATIC mp_obj_t object___setattr__(mp_obj_t self_in, mp_obj_t attr, mp_obj_t val
     mp_map_lookup(&self->members, attr, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(object___setattr___obj, object___setattr__);
+static MP_DEFINE_CONST_FUN_OBJ_3(object___setattr___obj, object___setattr__);
 
-STATIC mp_obj_t object___delattr__(mp_obj_t self_in, mp_obj_t attr) {
+static mp_obj_t object___delattr__(mp_obj_t self_in, mp_obj_t attr) {
     if (!mp_obj_is_instance_type(mp_obj_get_type(self_in))) {
         mp_raise_TypeError(MP_ERROR_TEXT("arg must be user-type"));
     }
@@ -92,10 +92,10 @@ STATIC mp_obj_t object___delattr__(mp_obj_t self_in, mp_obj_t attr) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(object___delattr___obj, object___delattr__);
+static MP_DEFINE_CONST_FUN_OBJ_2(object___delattr___obj, object___delattr__);
 #endif
 
-STATIC const mp_rom_map_elem_t object_locals_dict_table[] = {
+static const mp_rom_map_elem_t object_locals_dict_table[] = {
     #if MICROPY_CPYTHON_COMPAT
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&object___init___obj) },
     #endif
@@ -108,7 +108,7 @@ STATIC const mp_rom_map_elem_t object_locals_dict_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table);
+static MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table);
 #endif
 
 #if MICROPY_CPYTHON_COMPAT
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 78b600abacdcd..65c1f182ec8ec 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -39,7 +39,7 @@ typedef struct _mp_obj_polymorph_iter_t {
     mp_fun_1_t iternext;
 } mp_obj_polymorph_iter_t;
 
-STATIC mp_obj_t polymorph_it_iternext(mp_obj_t self_in) {
+static mp_obj_t polymorph_it_iternext(mp_obj_t self_in) {
     mp_obj_polymorph_iter_t *self = MP_OBJ_TO_PTR(self_in);
     // Redirect call to object instance's iternext method
     return self->iternext(self_in);
@@ -64,17 +64,17 @@ typedef struct _mp_obj_polymorph_iter_with_finaliser_t {
     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) {
+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 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);
+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[] = {
+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);
+static MP_DEFINE_CONST_DICT(mp_obj_polymorph_iter_locals_dict, mp_obj_polymorph_iter_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_polymorph_iter_with_finaliser,
diff --git a/py/objproperty.c b/py/objproperty.c
index 2d3af10e8c70a..155ffb16b58a2 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -36,7 +36,7 @@ typedef struct _mp_obj_property_t {
     mp_obj_t proxy[3]; // getter, setter, deleter
 } mp_obj_property_t;
 
-STATIC mp_obj_t property_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 property_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     enum { ARG_fget, ARG_fset, ARG_fdel, ARG_doc };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -55,40 +55,40 @@ STATIC mp_obj_t property_make_new(const mp_obj_type_t *type, size_t n_args, size
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t property_getter(mp_obj_t self_in, mp_obj_t getter) {
+static mp_obj_t property_getter(mp_obj_t self_in, mp_obj_t getter) {
     mp_obj_property_t *p2 = m_new_obj(mp_obj_property_t);
     *p2 = *(mp_obj_property_t *)MP_OBJ_TO_PTR(self_in);
     p2->proxy[0] = getter;
     return MP_OBJ_FROM_PTR(p2);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(property_getter_obj, property_getter);
+static MP_DEFINE_CONST_FUN_OBJ_2(property_getter_obj, property_getter);
 
-STATIC mp_obj_t property_setter(mp_obj_t self_in, mp_obj_t setter) {
+static mp_obj_t property_setter(mp_obj_t self_in, mp_obj_t setter) {
     mp_obj_property_t *p2 = m_new_obj(mp_obj_property_t);
     *p2 = *(mp_obj_property_t *)MP_OBJ_TO_PTR(self_in);
     p2->proxy[1] = setter;
     return MP_OBJ_FROM_PTR(p2);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(property_setter_obj, property_setter);
+static MP_DEFINE_CONST_FUN_OBJ_2(property_setter_obj, property_setter);
 
-STATIC mp_obj_t property_deleter(mp_obj_t self_in, mp_obj_t deleter) {
+static mp_obj_t property_deleter(mp_obj_t self_in, mp_obj_t deleter) {
     mp_obj_property_t *p2 = m_new_obj(mp_obj_property_t);
     *p2 = *(mp_obj_property_t *)MP_OBJ_TO_PTR(self_in);
     p2->proxy[2] = deleter;
     return MP_OBJ_FROM_PTR(p2);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(property_deleter_obj, property_deleter);
+static MP_DEFINE_CONST_FUN_OBJ_2(property_deleter_obj, property_deleter);
 
-STATIC const mp_rom_map_elem_t property_locals_dict_table[] = {
+static const mp_rom_map_elem_t property_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_getter), MP_ROM_PTR(&property_getter_obj) },
     { MP_ROM_QSTR(MP_QSTR_setter), MP_ROM_PTR(&property_setter_obj) },
     { MP_ROM_QSTR(MP_QSTR_deleter), MP_ROM_PTR(&property_deleter_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(property_locals_dict, property_locals_dict_table);
+static MP_DEFINE_CONST_DICT(property_locals_dict, property_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_property,
diff --git a/py/objrange.c b/py/objrange.c
index f0fe56d9db12e..9a4ecd3fcd7f2 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -39,7 +39,7 @@ typedef struct _mp_obj_range_it_t {
     mp_int_t step;
 } mp_obj_range_it_t;
 
-STATIC mp_obj_t range_it_iternext(mp_obj_t o_in) {
+static mp_obj_t range_it_iternext(mp_obj_t o_in) {
     mp_obj_range_it_t *o = MP_OBJ_TO_PTR(o_in);
     if ((o->step > 0 && o->cur < o->stop) || (o->step < 0 && o->cur > o->stop)) {
         mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(o->cur);
@@ -50,14 +50,14 @@ STATIC mp_obj_t range_it_iternext(mp_obj_t o_in) {
     }
 }
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_range_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_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) {
+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 = &mp_type_range_it;
@@ -78,7 +78,7 @@ typedef struct _mp_obj_range_t {
     mp_int_t step;
 } mp_obj_range_t;
 
-STATIC void range_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void range_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_range_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "range(" INT_FMT ", " INT_FMT "", self->start, self->stop);
@@ -89,7 +89,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) {
+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 = mp_obj_malloc(mp_obj_range_t, type);
@@ -112,7 +112,7 @@ STATIC mp_obj_t range_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_int_t range_len(mp_obj_range_t *self) {
+static mp_int_t range_len(mp_obj_range_t *self) {
     // When computing length, need to take into account step!=1 and step<0.
     mp_int_t len = self->stop - self->start + self->step;
     if (self->step > 0) {
@@ -127,7 +127,7 @@ STATIC mp_int_t range_len(mp_obj_range_t *self) {
     return len;
 }
 
-STATIC mp_obj_t range_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t range_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_range_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t len = range_len(self);
     switch (op) {
@@ -141,7 +141,7 @@ STATIC mp_obj_t range_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 }
 
 #if MICROPY_PY_BUILTINS_RANGE_BINOP
-STATIC mp_obj_t range_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t range_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     if (!mp_obj_is_type(rhs_in, &mp_type_range) || op != MP_BINARY_OP_EQUAL) {
         return MP_OBJ_NULL; // op not supported
     }
@@ -158,7 +158,7 @@ STATIC mp_obj_t range_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
 }
 #endif
 
-STATIC mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_SENTINEL) {
         // load
         mp_obj_range_t *self = MP_OBJ_TO_PTR(self_in);
@@ -185,14 +185,14 @@ STATIC mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     }
 }
 
-STATIC mp_obj_t range_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t range_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
     mp_obj_range_t *o = MP_OBJ_TO_PTR(o_in);
     return mp_obj_new_range_iterator(o->start, o->stop, o->step, iter_buf);
 }
 
 
 #if MICROPY_PY_BUILTINS_RANGE_ATTRS
-STATIC void range_attr(mp_obj_t o_in, qstr attr, mp_obj_t *dest) {
+static void range_attr(mp_obj_t o_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
         return;
diff --git a/py/objreversed.c b/py/objreversed.c
index c66698f028adf..c580ee286b76d 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -37,7 +37,7 @@ typedef struct _mp_obj_reversed_t {
     mp_uint_t cur_index;    // current index, plus 1; 0=no more, 1=last one (index 0)
 } mp_obj_reversed_t;
 
-STATIC mp_obj_t reversed_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 reversed_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);
 
     // check if __reversed__ exists, and if so delegate to it
@@ -54,7 +54,7 @@ STATIC mp_obj_t reversed_make_new(const mp_obj_type_t *type, size_t n_args, size
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t reversed_iternext(mp_obj_t self_in) {
+static mp_obj_t reversed_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_reversed));
     mp_obj_reversed_t *self = MP_OBJ_TO_PTR(self_in);
 
diff --git a/py/objset.c b/py/objset.c
index 906807889ab36..c8fa12a7ec58f 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -45,7 +45,7 @@ typedef struct _mp_obj_set_it_t {
     size_t cur;
 } mp_obj_set_it_t;
 
-STATIC bool is_set_or_frozenset(mp_obj_t o) {
+static bool is_set_or_frozenset(mp_obj_t o) {
     return mp_obj_is_type(o, &mp_type_set)
            #if MICROPY_PY_BUILTINS_FROZENSET
            || mp_obj_is_type(o, &mp_type_frozenset)
@@ -60,7 +60,7 @@ STATIC bool is_set_or_frozenset(mp_obj_t o) {
 // set or frozenset for methods that operate on both of these types.
 #define check_set_or_frozenset(o) mp_check_self(is_set_or_frozenset(o))
 
-STATIC void set_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void set_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     #if MICROPY_PY_BUILTINS_FROZENSET
@@ -99,7 +99,7 @@ STATIC void set_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     #endif
 }
 
-STATIC mp_obj_t set_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 set_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);
 
     switch (n_args) {
@@ -127,7 +127,7 @@ STATIC mp_obj_t set_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     }
 }
 
-STATIC mp_obj_t set_it_iternext(mp_obj_t self_in) {
+static mp_obj_t set_it_iternext(mp_obj_t self_in) {
     mp_obj_set_it_t *self = MP_OBJ_TO_PTR(self_in);
     size_t max = self->set->set.alloc;
     mp_set_t *set = &self->set->set;
@@ -142,7 +142,7 @@ STATIC mp_obj_t set_it_iternext(mp_obj_t self_in) {
     return MP_OBJ_STOP_ITERATION;
 }
 
-STATIC mp_obj_t set_getiter(mp_obj_t set_in, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t set_getiter(mp_obj_t set_in, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_set_it_t) <= sizeof(mp_obj_iter_buf_t));
     mp_obj_set_it_t *o = (mp_obj_set_it_t *)iter_buf;
     o->base.type = &mp_type_polymorph_iter;
@@ -155,23 +155,23 @@ STATIC mp_obj_t set_getiter(mp_obj_t set_in, mp_obj_iter_buf_t *iter_buf) {
 /******************************************************************************/
 /* set methods                                                                */
 
-STATIC mp_obj_t set_add(mp_obj_t self_in, mp_obj_t item) {
+static mp_obj_t set_add(mp_obj_t self_in, mp_obj_t item) {
     check_set(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_add_obj, set_add);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_add_obj, set_add);
 
-STATIC mp_obj_t set_clear(mp_obj_t self_in) {
+static mp_obj_t set_clear(mp_obj_t self_in) {
     check_set(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     mp_set_clear(&self->set);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_clear_obj, set_clear);
+static MP_DEFINE_CONST_FUN_OBJ_1(set_clear_obj, set_clear);
 
-STATIC mp_obj_t set_copy(mp_obj_t self_in) {
+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 = mp_obj_malloc(mp_obj_set_t, self->base.type);
@@ -180,17 +180,17 @@ STATIC mp_obj_t set_copy(mp_obj_t self_in) {
     memcpy(other->set.table, self->set.table, self->set.alloc * sizeof(mp_obj_t));
     return MP_OBJ_FROM_PTR(other);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_copy_obj, set_copy);
+static MP_DEFINE_CONST_FUN_OBJ_1(set_copy_obj, set_copy);
 
-STATIC mp_obj_t set_discard(mp_obj_t self_in, mp_obj_t item) {
+static mp_obj_t set_discard(mp_obj_t self_in, mp_obj_t item) {
     check_set(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_discard_obj, set_discard);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_discard_obj, set_discard);
 
-STATIC mp_obj_t set_diff_int(size_t n_args, const mp_obj_t *args, bool update) {
+static mp_obj_t set_diff_int(size_t n_args, const mp_obj_t *args, bool update) {
     mp_obj_t self;
     if (update) {
         check_set(args[0]);
@@ -216,18 +216,18 @@ STATIC mp_obj_t set_diff_int(size_t n_args, const mp_obj_t *args, bool update) {
     return self;
 }
 
-STATIC mp_obj_t set_diff(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t set_diff(size_t n_args, const mp_obj_t *args) {
     return set_diff_int(n_args, args, false);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_obj, 1, set_diff);
+static MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_obj, 1, set_diff);
 
-STATIC mp_obj_t set_diff_update(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t set_diff_update(size_t n_args, const mp_obj_t *args) {
     set_diff_int(n_args, args, true);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_update_obj, 1, set_diff_update);
+static MP_DEFINE_CONST_FUN_OBJ_VAR(set_diff_update_obj, 1, set_diff_update);
 
-STATIC mp_obj_t set_intersect_int(mp_obj_t self_in, mp_obj_t other, bool update) {
+static mp_obj_t set_intersect_int(mp_obj_t self_in, mp_obj_t other, bool update) {
     if (update) {
         check_set(self_in);
     } else {
@@ -259,17 +259,17 @@ STATIC mp_obj_t set_intersect_int(mp_obj_t self_in, mp_obj_t other, bool update)
     return update ? mp_const_none : MP_OBJ_FROM_PTR(out);
 }
 
-STATIC mp_obj_t set_intersect(mp_obj_t self_in, mp_obj_t other) {
+static mp_obj_t set_intersect(mp_obj_t self_in, mp_obj_t other) {
     return set_intersect_int(self_in, other, false);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_obj, set_intersect);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_obj, set_intersect);
 
-STATIC mp_obj_t set_intersect_update(mp_obj_t self_in, mp_obj_t other) {
+static mp_obj_t set_intersect_update(mp_obj_t self_in, mp_obj_t other) {
     return set_intersect_int(self_in, other, true);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_update_obj, set_intersect_update);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_intersect_update_obj, set_intersect_update);
 
-STATIC mp_obj_t set_isdisjoint(mp_obj_t self_in, mp_obj_t other) {
+static mp_obj_t set_isdisjoint(mp_obj_t self_in, mp_obj_t other) {
     check_set_or_frozenset(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -283,9 +283,9 @@ STATIC mp_obj_t set_isdisjoint(mp_obj_t self_in, mp_obj_t other) {
     }
     return mp_const_true;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_isdisjoint_obj, set_isdisjoint);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_isdisjoint_obj, set_isdisjoint);
 
-STATIC mp_obj_t set_issubset_internal(mp_obj_t self_in, mp_obj_t other_in, bool proper) {
+static mp_obj_t set_issubset_internal(mp_obj_t self_in, mp_obj_t other_in, bool proper) {
     mp_obj_set_t *self;
     bool cleanup_self = false;
     if (is_set_or_frozenset(self_in)) {
@@ -327,25 +327,25 @@ STATIC mp_obj_t set_issubset_internal(mp_obj_t self_in, mp_obj_t other_in, bool
     return out;
 }
 
-STATIC mp_obj_t set_issubset(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_issubset(mp_obj_t self_in, mp_obj_t other_in) {
     return set_issubset_internal(self_in, other_in, false);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_issubset_obj, set_issubset);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_issubset_obj, set_issubset);
 
-STATIC mp_obj_t set_issubset_proper(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_issubset_proper(mp_obj_t self_in, mp_obj_t other_in) {
     return set_issubset_internal(self_in, other_in, true);
 }
 
-STATIC mp_obj_t set_issuperset(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_issuperset(mp_obj_t self_in, mp_obj_t other_in) {
     return set_issubset_internal(other_in, self_in, false);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_issuperset_obj, set_issuperset);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_issuperset_obj, set_issuperset);
 
-STATIC mp_obj_t set_issuperset_proper(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_issuperset_proper(mp_obj_t self_in, mp_obj_t other_in) {
     return set_issubset_internal(other_in, self_in, true);
 }
 
-STATIC mp_obj_t set_equal(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_equal(mp_obj_t self_in, mp_obj_t other_in) {
     assert(is_set_or_frozenset(other_in));
     check_set_or_frozenset(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
@@ -356,7 +356,7 @@ STATIC mp_obj_t set_equal(mp_obj_t self_in, mp_obj_t other_in) {
     return set_issubset(self_in, other_in);
 }
 
-STATIC mp_obj_t set_pop(mp_obj_t self_in) {
+static mp_obj_t set_pop(mp_obj_t self_in) {
     check_set(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t obj = mp_set_remove_first(&self->set);
@@ -365,9 +365,9 @@ STATIC mp_obj_t set_pop(mp_obj_t self_in) {
     }
     return obj;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_pop_obj, set_pop);
+static MP_DEFINE_CONST_FUN_OBJ_1(set_pop_obj, set_pop);
 
-STATIC mp_obj_t set_remove(mp_obj_t self_in, mp_obj_t item) {
+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) {
@@ -375,9 +375,9 @@ STATIC mp_obj_t set_remove(mp_obj_t self_in, mp_obj_t item) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_remove_obj, set_remove);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_remove_obj, set_remove);
 
-STATIC mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other_in) {
     check_set_or_frozenset(self_in); // can be frozenset due to call from set_symmetric_difference
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t iter = mp_getiter(other_in, NULL);
@@ -387,16 +387,16 @@ STATIC mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_update_obj, set_symmetric_difference_update);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_update_obj, set_symmetric_difference_update);
 
-STATIC mp_obj_t set_symmetric_difference(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_symmetric_difference(mp_obj_t self_in, mp_obj_t other_in) {
     mp_obj_t self_out = set_copy(self_in);
     set_symmetric_difference_update(self_out, other_in);
     return self_out;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_obj, set_symmetric_difference);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_obj, set_symmetric_difference);
 
-STATIC void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) {
+static void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) {
     mp_obj_t iter = mp_getiter(other_in, NULL);
     mp_obj_t next;
     while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
@@ -404,7 +404,7 @@ STATIC void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) {
     }
 }
 
-STATIC mp_obj_t set_update(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t set_update(size_t n_args, const mp_obj_t *args) {
     check_set(args[0]);
     for (size_t i = 1; i < n_args; i++) {
         set_update_int(MP_OBJ_TO_PTR(args[0]), args[i]);
@@ -412,17 +412,17 @@ STATIC mp_obj_t set_update(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(set_update_obj, 1, set_update);
+static MP_DEFINE_CONST_FUN_OBJ_VAR(set_update_obj, 1, set_update);
 
-STATIC mp_obj_t set_union(mp_obj_t self_in, mp_obj_t other_in) {
+static mp_obj_t set_union(mp_obj_t self_in, mp_obj_t other_in) {
     check_set_or_frozenset(self_in);
     mp_obj_t self = set_copy(self_in);
     set_update_int(MP_OBJ_TO_PTR(self), other_in);
     return self;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_union_obj, set_union);
+static MP_DEFINE_CONST_FUN_OBJ_2(set_union_obj, set_union);
 
-STATIC mp_obj_t set_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t set_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -451,7 +451,7 @@ STATIC mp_obj_t set_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t set_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
+static mp_obj_t set_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
     mp_obj_t args[] = {lhs, rhs};
     #if MICROPY_PY_BUILTINS_FROZENSET
     bool update = mp_obj_is_type(lhs, &mp_type_set);
@@ -517,7 +517,7 @@ STATIC mp_obj_t set_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
 /******************************************************************************/
 /* set constructors & public C API                                            */
 
-STATIC const mp_rom_map_elem_t set_locals_dict_table[] = {
+static const mp_rom_map_elem_t set_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_add), MP_ROM_PTR(&set_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&set_clear_obj) },
     { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&set_copy_obj) },
@@ -537,7 +537,7 @@ STATIC const mp_rom_map_elem_t set_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&set_update_obj) },
     { MP_ROM_QSTR(MP_QSTR___contains__), MP_ROM_PTR(&mp_op_contains_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table);
+static MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_set,
@@ -552,7 +552,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 #if MICROPY_PY_BUILTINS_FROZENSET
-STATIC const mp_rom_map_elem_t frozenset_locals_dict_table[] = {
+static const mp_rom_map_elem_t frozenset_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&set_copy_obj) },
     { MP_ROM_QSTR(MP_QSTR_difference), MP_ROM_PTR(&set_diff_obj) },
     { MP_ROM_QSTR(MP_QSTR_intersection), MP_ROM_PTR(&set_intersect_obj) },
@@ -563,7 +563,7 @@ STATIC const mp_rom_map_elem_t frozenset_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_union), MP_ROM_PTR(&set_union_obj) },
     { MP_ROM_QSTR(MP_QSTR___contains__), MP_ROM_PTR(&mp_op_contains_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(frozenset_locals_dict, frozenset_locals_dict_table);
+static MP_DEFINE_CONST_DICT(frozenset_locals_dict, frozenset_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_frozenset,
diff --git a/py/objsingleton.c b/py/objsingleton.c
index 6537676c52329..c1f102c94c014 100644
--- a/py/objsingleton.c
+++ b/py/objsingleton.c
@@ -37,7 +37,7 @@ typedef struct _mp_obj_singleton_t {
     qstr name;
 } mp_obj_singleton_t;
 
-STATIC void singleton_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void singleton_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_singleton_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "%q", self->name);
diff --git a/py/objslice.c b/py/objslice.c
index dcd6af8b2856f..3e7575522b28d 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -34,7 +34,7 @@
 
 #if MICROPY_PY_BUILTINS_SLICE
 
-STATIC void slice_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void slice_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_slice_t *o = MP_OBJ_TO_PTR(o_in);
     mp_print_str(print, "slice(");
@@ -46,14 +46,14 @@ STATIC void slice_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
     mp_print_str(print, ")");
 }
 
-STATIC mp_obj_t slice_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
+static mp_obj_t slice_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     // Needed to explicitly opt out of default __hash__.
     // REVISIT: CPython implements comparison operators for slice.
     return MP_OBJ_NULL;
 }
 
 #if MICROPY_PY_BUILTINS_SLICE_INDICES
-STATIC mp_obj_t slice_indices(mp_obj_t self_in, mp_obj_t length_obj) {
+static mp_obj_t slice_indices(mp_obj_t self_in, mp_obj_t length_obj) {
     mp_int_t length = mp_obj_get_int(length_obj);
     mp_bound_slice_t bound_indices;
     mp_obj_slice_indices(self_in, length, &bound_indices);
@@ -65,11 +65,11 @@ STATIC mp_obj_t slice_indices(mp_obj_t self_in, mp_obj_t length_obj) {
     };
     return mp_obj_new_tuple(3, results);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(slice_indices_obj, slice_indices);
+static MP_DEFINE_CONST_FUN_OBJ_2(slice_indices_obj, slice_indices);
 #endif
 
 #if MICROPY_PY_BUILTINS_SLICE_ATTRS
-STATIC void slice_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void slice_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
         return;
@@ -92,10 +92,10 @@ STATIC void slice_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 #endif
 
 #if MICROPY_PY_BUILTINS_SLICE_INDICES && !MICROPY_PY_BUILTINS_SLICE_ATTRS
-STATIC const mp_rom_map_elem_t slice_locals_dict_table[] = {
+static const mp_rom_map_elem_t slice_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_indices), MP_ROM_PTR(&slice_indices_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(slice_locals_dict, slice_locals_dict_table);
+static MP_DEFINE_CONST_DICT(slice_locals_dict, slice_locals_dict_table);
 #endif
 
 #if MICROPY_PY_BUILTINS_SLICE_ATTRS
diff --git a/py/objstr.c b/py/objstr.c
index 5dfe94ac4fe1c..c7e4ebf53b753 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -35,15 +35,15 @@
 #include "py/stackctrl.h"
 
 #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);
+static mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict);
 #endif
 
-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_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 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) {
+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.
@@ -63,7 +63,7 @@ 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) {
+static void check_is_str_or_bytes(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_str_or_bytes(self_in));
 }
 
@@ -135,7 +135,7 @@ void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str
 }
 #endif
 
-STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     GET_STR_DATA_LEN(self_in, str_data, str_len);
     #if MICROPY_PY_JSON
     if (kind == PRINT_JSON) {
@@ -212,7 +212,7 @@ mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     }
 }
 
-STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t bytes_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;
 
     #if MICROPY_CPYTHON_COMPAT
@@ -458,7 +458,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
 #endif
 
 // This is used for both bytes and 8-bit strings. This is not used for unicode strings.
-STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     const mp_obj_type_t *type = mp_obj_get_type(self_in);
     GET_STR_DATA_LEN(self_in, self_data, self_len);
     if (value == MP_OBJ_SENTINEL) {
@@ -484,7 +484,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) {
+static mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
     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;
@@ -628,7 +628,7 @@ mp_obj_t mp_obj_str_split(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, mp_obj_str_split);
 
 #if MICROPY_PY_BUILTINS_STR_SPLITLINES
-STATIC mp_obj_t str_splitlines(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+static mp_obj_t str_splitlines(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_keepends };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_keepends, MP_ARG_BOOL, {.u_bool = false} },
@@ -674,7 +674,7 @@ STATIC mp_obj_t str_splitlines(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 MP_DEFINE_CONST_FUN_OBJ_KW(str_splitlines_obj, 1, str_splitlines);
 #endif
 
-STATIC mp_obj_t str_rsplit(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_rsplit(size_t n_args, const mp_obj_t *args) {
     if (n_args < 3) {
         // If we don't have split limit, it doesn't matter from which side
         // we split.
@@ -739,7 +739,7 @@ STATIC mp_obj_t str_rsplit(size_t n_args, const mp_obj_t *args) {
 }
 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) {
+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]);
     check_is_str_or_bytes(args[0]);
 
@@ -782,28 +782,28 @@ STATIC mp_obj_t str_finder(size_t n_args, const mp_obj_t *args, int direction, b
     }
 }
 
-STATIC mp_obj_t str_find(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_find(size_t n_args, const mp_obj_t *args) {
     return str_finder(n_args, args, 1, false);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
 
-STATIC mp_obj_t str_rfind(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_rfind(size_t n_args, const mp_obj_t *args) {
     return str_finder(n_args, args, -1, false);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
 
-STATIC mp_obj_t str_index(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_index(size_t n_args, const mp_obj_t *args) {
     return str_finder(n_args, args, 1, true);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
 
-STATIC mp_obj_t str_rindex(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_rindex(size_t n_args, const mp_obj_t *args) {
     return str_finder(n_args, args, -1, true);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
 
 // TODO: (Much) more variety in args
-STATIC mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) {
     const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
     GET_STR_DATA_LEN(args[0], str, str_len);
     size_t prefix_len;
@@ -819,7 +819,7 @@ STATIC mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
 
-STATIC mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) {
     GET_STR_DATA_LEN(args[0], str, str_len);
     size_t suffix_len;
     const char *suffix = mp_obj_str_get_data(args[1], &suffix_len);
@@ -836,7 +836,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) {
+static mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) {
     check_is_str_or_bytes(args[0]);
     const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
 
@@ -905,23 +905,23 @@ STATIC mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) {
     return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
 }
 
-STATIC mp_obj_t str_strip(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_strip(size_t n_args, const mp_obj_t *args) {
     return str_uni_strip(STRIP, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
 
-STATIC mp_obj_t str_lstrip(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_lstrip(size_t n_args, const mp_obj_t *args) {
     return str_uni_strip(LSTRIP, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
 
-STATIC mp_obj_t str_rstrip(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_rstrip(size_t n_args, const mp_obj_t *args) {
     return str_uni_strip(RSTRIP, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
 
 #if MICROPY_PY_BUILTINS_STR_CENTER
-STATIC mp_obj_t str_center(mp_obj_t str_in, mp_obj_t width_in) {
+static mp_obj_t str_center(mp_obj_t str_in, mp_obj_t width_in) {
     GET_STR_DATA_LEN(str_in, str, str_len);
     mp_uint_t width = mp_obj_get_int(width_in);
     if (str_len >= width) {
@@ -940,7 +940,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(str_center_obj, str_center);
 
 // Takes an int arg, but only parses unsigned numbers, and only changes
 // *num if at least one digit was parsed.
-STATIC const char *str_to_int(const char *str, const char *top, int *num) {
+static const char *str_to_int(const char *str, const char *top, int *num) {
     if (str < top && '0' <= *str && *str <= '9') {
         *num = 0;
         do {
@@ -952,19 +952,19 @@ STATIC const char *str_to_int(const char *str, const char *top, int *num) {
     return str;
 }
 
-STATIC bool isalignment(char ch) {
+static bool isalignment(char ch) {
     return ch && strchr("<>=^", ch) != NULL;
 }
 
-STATIC bool istype(char ch) {
+static bool istype(char ch) {
     return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
 }
 
-STATIC bool arg_looks_integer(mp_obj_t arg) {
+static bool arg_looks_integer(mp_obj_t arg) {
     return mp_obj_is_bool(arg) || mp_obj_is_int(arg);
 }
 
-STATIC bool arg_looks_numeric(mp_obj_t arg) {
+static bool arg_looks_numeric(mp_obj_t arg) {
     return arg_looks_integer(arg)
            #if MICROPY_PY_BUILTINS_FLOAT
            || mp_obj_is_float(arg)
@@ -973,7 +973,7 @@ STATIC bool arg_looks_numeric(mp_obj_t arg) {
 }
 
 #if MICROPY_PY_BUILTINS_STR_OP_MODULO
-STATIC mp_obj_t arg_as_int(mp_obj_t arg) {
+static mp_obj_t arg_as_int(mp_obj_t arg) {
     #if MICROPY_PY_BUILTINS_FLOAT
     if (mp_obj_is_float(arg)) {
         return mp_obj_new_int_from_float(mp_obj_float_get(arg));
@@ -984,7 +984,7 @@ STATIC mp_obj_t arg_as_int(mp_obj_t arg) {
 #endif
 
 #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
-STATIC NORETURN void terse_str_format_value_error(void) {
+static NORETURN void terse_str_format_value_error(void) {
     mp_raise_ValueError(MP_ERROR_TEXT("bad format string"));
 }
 #else
@@ -992,7 +992,7 @@ STATIC NORETURN void terse_str_format_value_error(void) {
 #define terse_str_format_value_error()
 #endif
 
-STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *arg_i, size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *arg_i, size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     vstr_t vstr;
     mp_print_t print;
     vstr_init_print(&vstr, 16, &print);
@@ -1449,7 +1449,7 @@ mp_obj_t mp_obj_str_format(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
 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) {
+static mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict) {
     check_is_str_or_bytes(pattern);
 
     GET_STR_DATA_LEN(pattern, str, len);
@@ -1657,7 +1657,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) {
+static mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) {
     check_is_str_or_bytes(args[0]);
 
     mp_int_t max_rep = -1;
@@ -1759,7 +1759,7 @@ STATIC mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) {
 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) {
+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]);
     check_is_str_or_bytes(args[0]);
 
@@ -1802,7 +1802,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
 #endif
 
 #if MICROPY_PY_BUILTINS_STR_PARTITION
-STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
+static mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
     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);
@@ -1848,19 +1848,19 @@ STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
     return mp_obj_new_tuple(3, result);
 }
 
-STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
     return str_partitioner(self_in, arg, 1);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
 
-STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
     return str_partitioner(self_in, arg, -1);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
 #endif
 
 // Supposedly not too critical operations, so optimize for code size
-STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
+static mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
     GET_STR_DATA_LEN(self_in, self_data, self_len);
     vstr_t vstr;
     vstr_init_len(&vstr, self_len);
@@ -1871,17 +1871,17 @@ STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
     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) {
+static mp_obj_t str_lower(mp_obj_t self_in) {
     return str_caseconv(unichar_tolower, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
 
-STATIC mp_obj_t str_upper(mp_obj_t self_in) {
+static mp_obj_t str_upper(mp_obj_t self_in) {
     return str_caseconv(unichar_toupper, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
 
-STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
+static mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
     GET_STR_DATA_LEN(self_in, self_data, self_len);
 
     if (self_len == 0) {
@@ -1914,27 +1914,27 @@ STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
     return mp_const_true;
 }
 
-STATIC mp_obj_t str_isspace(mp_obj_t self_in) {
+static mp_obj_t str_isspace(mp_obj_t self_in) {
     return str_uni_istype(unichar_isspace, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace);
 
-STATIC mp_obj_t str_isalpha(mp_obj_t self_in) {
+static mp_obj_t str_isalpha(mp_obj_t self_in) {
     return str_uni_istype(unichar_isalpha, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha);
 
-STATIC mp_obj_t str_isdigit(mp_obj_t self_in) {
+static mp_obj_t str_isdigit(mp_obj_t self_in) {
     return str_uni_istype(unichar_isdigit, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit);
 
-STATIC mp_obj_t str_isupper(mp_obj_t self_in) {
+static mp_obj_t str_isupper(mp_obj_t self_in) {
     return str_uni_istype(unichar_isupper, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper);
 
-STATIC mp_obj_t str_islower(mp_obj_t self_in) {
+static mp_obj_t str_islower(mp_obj_t self_in) {
     return str_uni_istype(unichar_islower, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
@@ -1943,7 +1943,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
 // These methods are superfluous in the presence of str() and bytes()
 // constructors.
 // TODO: should accept kwargs too
-STATIC mp_obj_t bytes_decode(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t bytes_decode(size_t n_args, const mp_obj_t *args) {
     mp_obj_t new_args[2];
     if (n_args == 1) {
         new_args[0] = args[0];
@@ -1956,7 +1956,7 @@ STATIC mp_obj_t bytes_decode(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
 
 // TODO: should accept kwargs too
-STATIC mp_obj_t str_encode(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t str_encode(size_t n_args, const mp_obj_t *args) {
     mp_obj_t new_args[2];
     if (n_args == 1) {
         new_args[0] = args[0];
@@ -2038,13 +2038,13 @@ mp_obj_t mp_obj_bytes_fromhex(mp_obj_t type_in, mp_obj_t data) {
     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) {
+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_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));
+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) {
@@ -2068,7 +2068,7 @@ void mp_obj_str_set_data(mp_obj_str_t *str, const byte *data, size_t 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[] = {
+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) },
@@ -2168,7 +2168,7 @@ MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_memoryview_locals_dict,
 #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);
+static mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_str,
@@ -2240,7 +2240,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.
-STATIC mp_obj_t mp_obj_new_str_type_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);
@@ -2342,7 +2342,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) {
+static NORETURN void bad_implicit_conversion(mp_obj_t self_in) {
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("can't convert to str implicitly"));
     #else
@@ -2411,7 +2411,7 @@ typedef struct _mp_obj_str8_it_t {
 } mp_obj_str8_it_t;
 
 #if !MICROPY_PY_BUILTINS_STR_UNICODE
-STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
+static mp_obj_t str_it_iternext(mp_obj_t self_in) {
     mp_obj_str8_it_t *self = MP_OBJ_TO_PTR(self_in);
     GET_STR_DATA_LEN(self->str, str, len);
     if (self->cur < len) {
@@ -2423,7 +2423,7 @@ STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_str8_it_t) <= sizeof(mp_obj_iter_buf_t));
     mp_obj_str8_it_t *o = (mp_obj_str8_it_t *)iter_buf;
     o->base.type = &mp_type_polymorph_iter;
@@ -2434,7 +2434,7 @@ STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_bu
 }
 #endif
 
-STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
+static mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
     mp_obj_str8_it_t *self = MP_OBJ_TO_PTR(self_in);
     GET_STR_DATA_LEN(self->str, str, len);
     if (self->cur < len) {
diff --git a/py/objstringio.c b/py/objstringio.c
index a3c66ed010cc0..a4dc8cfc9151b 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -36,7 +36,7 @@
 #if MICROPY_PY_IO
 
 #if MICROPY_CPYTHON_COMPAT
-STATIC void check_stringio_is_open(const mp_obj_stringio_t *o) {
+static void check_stringio_is_open(const mp_obj_stringio_t *o) {
     if (o->vstr == NULL) {
         mp_raise_ValueError(MP_ERROR_TEXT("I/O operation on closed file"));
     }
@@ -45,13 +45,13 @@ STATIC void check_stringio_is_open(const mp_obj_stringio_t *o) {
 #define check_stringio_is_open(o)
 #endif
 
-STATIC void stringio_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void stringio_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_stringio_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, self->base.type == &mp_type_stringio ? "<io.StringIO 0x%x>" : "<io.BytesIO 0x%x>", self);
 }
 
-STATIC mp_uint_t stringio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stringio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     (void)errcode;
     mp_obj_stringio_t *o = MP_OBJ_TO_PTR(o_in);
     check_stringio_is_open(o);
@@ -67,7 +67,7 @@ STATIC mp_uint_t stringio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *er
     return size;
 }
 
-STATIC void stringio_copy_on_write(mp_obj_stringio_t *o) {
+static void stringio_copy_on_write(mp_obj_stringio_t *o) {
     const void *buf = o->vstr->buf;
     o->vstr->buf = m_new(char, o->vstr->len);
     o->vstr->fixed_buf = false;
@@ -75,7 +75,7 @@ STATIC void stringio_copy_on_write(mp_obj_stringio_t *o) {
     memcpy(o->vstr->buf, buf, o->vstr->len);
 }
 
-STATIC mp_uint_t stringio_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stringio_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
     (void)errcode;
     mp_obj_stringio_t *o = MP_OBJ_TO_PTR(o_in);
     check_stringio_is_open(o);
@@ -109,7 +109,7 @@ STATIC mp_uint_t stringio_write(mp_obj_t o_in, const void *buf, mp_uint_t size,
     return size;
 }
 
-STATIC mp_uint_t stringio_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t stringio_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     (void)errcode;
     mp_obj_stringio_t *o = MP_OBJ_TO_PTR(o_in);
     switch (request) {
@@ -162,22 +162,22 @@ STATIC mp_uint_t stringio_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg,
 
 #define STREAM_TO_CONTENT_TYPE(o) (((o)->base.type == &mp_type_stringio) ? &mp_type_str : &mp_type_bytes)
 
-STATIC mp_obj_t stringio_getvalue(mp_obj_t self_in) {
+static mp_obj_t stringio_getvalue(mp_obj_t self_in) {
     mp_obj_stringio_t *self = MP_OBJ_TO_PTR(self_in);
     check_stringio_is_open(self);
     // TODO: Try to avoid copying string
     return mp_obj_new_str_of_type(STREAM_TO_CONTENT_TYPE(self), (byte *)self->vstr->buf, self->vstr->len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(stringio_getvalue_obj, stringio_getvalue);
+static MP_DEFINE_CONST_FUN_OBJ_1(stringio_getvalue_obj, stringio_getvalue);
 
-STATIC mp_obj_stringio_t *stringio_new(const mp_obj_type_t *type) {
+static mp_obj_stringio_t *stringio_new(const mp_obj_type_t *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;
 }
 
-STATIC mp_obj_t stringio_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t stringio_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)n_kw; // TODO check n_kw==0
 
     mp_uint_t sz = 16;
@@ -215,7 +215,7 @@ STATIC mp_obj_t stringio_make_new(const mp_obj_type_t *type_in, size_t n_args, s
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC const mp_rom_map_elem_t stringio_locals_dict_table[] = {
+static const mp_rom_map_elem_t stringio_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) },
@@ -229,9 +229,9 @@ STATIC const mp_rom_map_elem_t stringio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(stringio_locals_dict, stringio_locals_dict_table);
+static MP_DEFINE_CONST_DICT(stringio_locals_dict, stringio_locals_dict_table);
 
-STATIC const mp_stream_p_t stringio_stream_p = {
+static const mp_stream_p_t stringio_stream_p = {
     .read = stringio_read,
     .write = stringio_write,
     .ioctl = stringio_ioctl,
@@ -249,7 +249,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 #if MICROPY_PY_IO_BYTESIO
-STATIC const mp_stream_p_t bytesio_stream_p = {
+static const mp_stream_p_t bytesio_stream_p = {
     .read = stringio_read,
     .write = stringio_write,
     .ioctl = stringio_ioctl,
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index cbc797de29128..d7ce4fca0e58e 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -34,12 +34,12 @@
 
 #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);
+static mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
 
 /******************************************************************************/
 /* str                                                                        */
 
-STATIC void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint str_len) {
+static void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint str_len) {
     // this escapes characters, but it will be very slow to print (calling print many times)
     bool has_single_quote = false;
     bool has_double_quote = false;
@@ -83,7 +83,7 @@ STATIC void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint
     mp_printf(print, "%c", quote_char);
 }
 
-STATIC void uni_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void uni_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     GET_STR_DATA_LEN(self_in, str_data, str_len);
     #if MICROPY_PY_JSON
     if (kind == PRINT_JSON) {
@@ -98,7 +98,7 @@ STATIC void uni_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     }
 }
 
-STATIC mp_obj_t uni_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t uni_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     GET_STR_DATA_LEN(self_in, str_data, str_len);
     switch (op) {
         case MP_UNARY_OP_BOOL:
@@ -178,7 +178,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
     return s;
 }
 
-STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     const mp_obj_type_t *type = mp_obj_get_type(self_in);
     assert(type == &mp_type_str);
     GET_STR_DATA_LEN(self_in, self_data, self_len);
@@ -253,7 +253,7 @@ typedef struct _mp_obj_str_it_t {
     size_t cur;
 } mp_obj_str_it_t;
 
-STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
+static mp_obj_t str_it_iternext(mp_obj_t self_in) {
     mp_obj_str_it_t *self = MP_OBJ_TO_PTR(self_in);
     GET_STR_DATA_LEN(self->str, str, len);
     if (self->cur < len) {
@@ -267,7 +267,7 @@ STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_str_it_t) <= sizeof(mp_obj_iter_buf_t));
     mp_obj_str_it_t *o = (mp_obj_str_it_t *)iter_buf;
     o->base.type = &mp_type_polymorph_iter;
diff --git a/py/objtuple.c b/py/objtuple.c
index cb1d7cd388a91..2cbcc0e502f9a 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -65,7 +65,7 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
     }
 }
 
-STATIC mp_obj_t mp_obj_tuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t mp_obj_tuple_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);
@@ -107,7 +107,7 @@ STATIC mp_obj_t mp_obj_tuple_make_new(const mp_obj_type_t *type_in, size_t n_arg
 }
 
 // Don't pass MP_BINARY_OP_NOT_EQUAL here
-STATIC mp_obj_t tuple_cmp_helper(mp_uint_t op, mp_obj_t self_in, mp_obj_t another_in) {
+static mp_obj_t tuple_cmp_helper(mp_uint_t op, mp_obj_t self_in, mp_obj_t another_in) {
     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);
@@ -203,26 +203,26 @@ mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     }
 }
 
-STATIC mp_obj_t tuple_count(mp_obj_t self_in, mp_obj_t value) {
+static mp_obj_t tuple_count(mp_obj_t self_in, mp_obj_t value) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_tuple));
     mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_seq_count_obj(self->items, self->len, value);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(tuple_count_obj, tuple_count);
+static MP_DEFINE_CONST_FUN_OBJ_2(tuple_count_obj, tuple_count);
 
-STATIC mp_obj_t tuple_index(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t tuple_index(size_t n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_type(args[0], &mp_type_tuple));
     mp_obj_tuple_t *self = MP_OBJ_TO_PTR(args[0]);
     return mp_seq_index_obj(self->items, self->len, n_args, args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tuple_index_obj, 2, 4, tuple_index);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tuple_index_obj, 2, 4, tuple_index);
 
-STATIC const mp_rom_map_elem_t tuple_locals_dict_table[] = {
+static const mp_rom_map_elem_t tuple_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&tuple_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&tuple_index_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table);
+static MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_tuple,
@@ -277,7 +277,7 @@ typedef struct _mp_obj_tuple_it_t {
     size_t cur;
 } mp_obj_tuple_it_t;
 
-STATIC mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
+static mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
     mp_obj_tuple_it_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->cur < self->tuple->len) {
         mp_obj_t o_out = self->tuple->items[self->cur];
diff --git a/py/objtype.c b/py/objtype.c
index 694db3008f6f2..8b2eb6de04eec 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -44,12 +44,12 @@
 #define ENABLE_SPECIAL_ACCESSORS \
     (MICROPY_PY_DESCRIPTORS || MICROPY_PY_DELATTR_SETATTR || MICROPY_PY_BUILTINS_PROPERTY)
 
-STATIC mp_obj_t static_class_method_make_new(const mp_obj_type_t *self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
+static mp_obj_t static_class_method_make_new(const mp_obj_type_t *self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 /******************************************************************************/
 // instance object
 
-STATIC int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_type_t **last_native_base) {
+static int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_type_t **last_native_base) {
     int count = 0;
     for (;;) {
         if (type == &mp_type_object) {
@@ -84,17 +84,17 @@ STATIC int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_t
 
 // This wrapper function is allows a subclass of a native type to call the
 // __init__() method (corresponding to type->make_new) of the native type.
-STATIC mp_obj_t native_base_init_wrapper(size_t n_args, const mp_obj_t *args) {
+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] = 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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(native_base_init_wrapper_obj, 1, MP_OBJ_FUN_ARGS_MAX, native_base_init_wrapper);
 
 #if !MICROPY_CPYTHON_COMPAT
-STATIC
+static
 #endif
 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);
@@ -132,7 +132,7 @@ struct class_lookup_data {
     bool is_type;
 };
 
-STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_type_t *type) {
+static void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_type_t *type) {
     assert(lookup->dest[0] == MP_OBJ_NULL);
     assert(lookup->dest[1] == MP_OBJ_NULL);
     for (;;) {
@@ -235,7 +235,7 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_t
     }
 }
 
-STATIC void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
     qstr meth = (kind == PRINT_STR) ? MP_QSTR___str__ : MP_QSTR___repr__;
     mp_obj_t member[2] = {MP_OBJ_NULL};
@@ -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);
 }
 
-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) {
+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
@@ -392,7 +392,7 @@ const byte mp_unary_op_method_name[MP_UNARY_OP_NUM_RUNTIME] = {
     #endif
 };
 
-STATIC mp_obj_t instance_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
+static mp_obj_t instance_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
 
     #if MICROPY_PY_SYS_GETSIZEOF
@@ -530,7 +530,7 @@ const byte mp_binary_op_method_name[MP_BINARY_OP_NUM_RUNTIME] = {
     #endif
 };
 
-STATIC mp_obj_t instance_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+static mp_obj_t instance_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     // Note: For ducktyping, CPython does not look in the instance members or use
     // __getattr__ or __getattribute__.  It only looks in the class dictionary.
     mp_obj_instance_t *lhs = MP_OBJ_TO_PTR(lhs_in);
@@ -572,7 +572,7 @@ STATIC mp_obj_t instance_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t
     return res;
 }
 
-STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     // logic: look in instance members then class locals
     assert(mp_obj_is_instance_type(mp_obj_get_type(self_in)));
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
@@ -669,7 +669,7 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
     }
 }
 
-STATIC bool mp_obj_instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
+static bool mp_obj_instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (!(self->base.type->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS)) {
@@ -792,7 +792,7 @@ STATIC bool mp_obj_instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t val
     }
 }
 
-STATIC void mp_obj_instance_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void mp_obj_instance_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
         mp_obj_instance_load_attr(self_in, attr, dest);
     } else {
@@ -802,7 +802,7 @@ STATIC void mp_obj_instance_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+static mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t member[4] = {MP_OBJ_NULL, MP_OBJ_NULL, index, value};
     struct class_lookup_data lookup = {
@@ -837,7 +837,7 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
     }
 }
 
-STATIC mp_obj_t mp_obj_instance_get_call(mp_obj_t self_in, mp_obj_t *member) {
+static mp_obj_t mp_obj_instance_get_call(mp_obj_t self_in, mp_obj_t *member) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
     struct class_lookup_data lookup = {
         .obj = self,
@@ -903,7 +903,7 @@ mp_obj_t mp_obj_instance_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf)
     }
 }
 
-STATIC mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+static mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t member[2] = {MP_OBJ_NULL};
     struct class_lookup_data lookup = {
@@ -929,7 +929,7 @@ STATIC mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
 //  - creating a new class (a new type) creates a new mp_obj_type_t
 
 #if ENABLE_SPECIAL_ACCESSORS
-STATIC bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
+static bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
     #if MICROPY_PY_DELATTR_SETATTR
     if (key == MP_OBJ_NEW_QSTR(MP_QSTR___setattr__) || key == MP_OBJ_NEW_QSTR(MP_QSTR___delattr__)) {
         return true;
@@ -956,13 +956,13 @@ STATIC bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
 }
 #endif
 
-STATIC void type_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void type_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<class '%q'>", self->name);
 }
 
-STATIC mp_obj_t type_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t type_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, 1, 3, false);
@@ -982,7 +982,7 @@ STATIC mp_obj_t type_make_new(const mp_obj_type_t *type_in, size_t n_args, size_
     }
 }
 
-STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // instantiate an instance of a class
 
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
@@ -1002,7 +1002,7 @@ STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
     return o;
 }
 
-STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     assert(mp_obj_is_type(self_in, &mp_type_type));
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -1235,7 +1235,7 @@ typedef struct _mp_obj_super_t {
     mp_obj_t obj;
 } mp_obj_super_t;
 
-STATIC void super_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+static void super_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_super_t *self = MP_OBJ_TO_PTR(self_in);
     mp_print_str(print, "<super: ");
@@ -1245,7 +1245,7 @@ STATIC void super_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind
     mp_print_str(print, ">");
 }
 
-STATIC mp_obj_t super_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t super_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;
     // 0 arguments are turned into 2 in the compiler
     // 1 argument is not yet implemented
@@ -1258,7 +1258,7 @@ STATIC mp_obj_t super_make_new(const mp_obj_type_t *type_in, size_t n_args, size
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
         return;
@@ -1386,7 +1386,7 @@ bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo) {
     }
 }
 
-STATIC mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
+static mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
     size_t len;
     mp_obj_t *items;
     if (mp_obj_is_type(classinfo, &mp_type_type)) {
@@ -1407,7 +1407,7 @@ STATIC mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
     return mp_const_false;
 }
 
-STATIC mp_obj_t mp_builtin_issubclass(mp_obj_t object, mp_obj_t classinfo) {
+static mp_obj_t mp_builtin_issubclass(mp_obj_t object, mp_obj_t classinfo) {
     if (!mp_obj_is_type(object, &mp_type_type)) {
         mp_raise_TypeError(MP_ERROR_TEXT("issubclass() arg 1 must be a class"));
     }
@@ -1416,7 +1416,7 @@ STATIC mp_obj_t mp_builtin_issubclass(mp_obj_t object, mp_obj_t classinfo) {
 
 MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_issubclass_obj, mp_builtin_issubclass);
 
-STATIC mp_obj_t mp_builtin_isinstance(mp_obj_t object, mp_obj_t classinfo) {
+static mp_obj_t mp_builtin_isinstance(mp_obj_t object, mp_obj_t classinfo) {
     return mp_obj_is_subclass(MP_OBJ_FROM_PTR(mp_obj_get_type(object)), classinfo);
 }
 
@@ -1438,7 +1438,7 @@ mp_obj_t mp_obj_cast_to_native_base(mp_obj_t self_in, mp_const_obj_t native_type
 /******************************************************************************/
 // staticmethod and classmethod types (probably should go in a different file)
 
-STATIC mp_obj_t static_class_method_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 static_class_method_make_new(const mp_obj_type_t *self, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(self == &mp_type_staticmethod || self == &mp_type_classmethod);
 
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
diff --git a/py/objzip.c b/py/objzip.c
index 7b4ae7548e8a5..dd2b39ee07110 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -36,7 +36,7 @@ typedef struct _mp_obj_zip_t {
     mp_obj_t iters[];
 } 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) {
+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 = mp_obj_malloc_var(mp_obj_zip_t, iters, mp_obj_t, n_args, type);
@@ -47,7 +47,7 @@ STATIC mp_obj_t zip_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t zip_iternext(mp_obj_t self_in) {
+static mp_obj_t zip_iternext(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_zip));
     mp_obj_zip_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->n_iters == 0) {
diff --git a/py/opmethods.c b/py/opmethods.c
index c3931fd358466..32ab187b05510 100644
--- a/py/opmethods.c
+++ b/py/opmethods.c
@@ -27,28 +27,28 @@
 #include "py/obj.h"
 #include "py/builtin.h"
 
-STATIC mp_obj_t op_getitem(mp_obj_t self_in, mp_obj_t key_in) {
+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);
     // 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) {
+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);
     // 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) {
+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);
     // 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) {
+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);
     // 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);
diff --git a/py/parse.c b/py/parse.c
index e86103ed8e02a..54be8b97d092d 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -75,7 +75,7 @@ enum {
 };
 
 // Define an array of actions corresponding to each rule
-STATIC const uint8_t rule_act_table[] = {
+static const uint8_t rule_act_table[] = {
 #define or(n)                   (RULE_ACT_OR | n)
 #define and(n)                  (RULE_ACT_AND | n)
 #define and_ident(n)            (RULE_ACT_AND | n | RULE_ACT_ALLOW_IDENT)
@@ -108,7 +108,7 @@ STATIC const uint8_t rule_act_table[] = {
 };
 
 // Define the argument data for each rule, as a combined array
-STATIC const uint16_t rule_arg_combined_table[] = {
+static const uint16_t rule_arg_combined_table[] = {
 #define tok(t)                  (RULE_ARG_TOK | MP_TOKEN_##t)
 #define rule(r)                 (RULE_ARG_RULE | RULE_##r)
 #define opt_rule(r)             (RULE_ARG_OPT_RULE | RULE_##r)
@@ -161,7 +161,7 @@ enum {
 // data, which indexes rule_arg_combined_table.  The offsets require 9 bits of
 // storage but only the lower 8 bits are stored here.  The 9th bit is computed
 // in get_rule_arg using the FIRST_RULE_WITH_OFFSET_ABOVE_255 constant.
-STATIC const uint8_t rule_arg_offset_table[] = {
+static const uint8_t rule_arg_offset_table[] = {
 #define DEF_RULE(rule, comp, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) & 0xff,
 #define DEF_RULE_NC(rule, kind, ...)
 #include "py/grammar.h"
@@ -191,7 +191,7 @@ static const size_t FIRST_RULE_WITH_OFFSET_ABOVE_255 =
 
 #if MICROPY_DEBUG_PARSE_RULE_NAME
 // Define an array of rule names corresponding to each rule
-STATIC const char *const rule_name_table[] = {
+static const char *const rule_name_table[] = {
 #define DEF_RULE(rule, comp, kind, ...) #rule,
 #define DEF_RULE_NC(rule, kind, ...)
 #include "py/grammar.h"
@@ -242,9 +242,9 @@ typedef struct _parser_t {
     #endif
 } parser_t;
 
-STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args);
+static void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args);
 
-STATIC const uint16_t *get_rule_arg(uint8_t r_id) {
+static const uint16_t *get_rule_arg(uint8_t r_id) {
     size_t off = rule_arg_offset_table[r_id];
     if (r_id >= FIRST_RULE_WITH_OFFSET_ABOVE_255) {
         off |= 0x100;
@@ -252,7 +252,7 @@ STATIC const uint16_t *get_rule_arg(uint8_t r_id) {
     return &rule_arg_combined_table[off];
 }
 
-STATIC void *parser_alloc(parser_t *parser, size_t num_bytes) {
+static void *parser_alloc(parser_t *parser, size_t num_bytes) {
     // use a custom memory allocator to store parse nodes sequentially in large chunks
 
     mp_parse_chunk_t *chunk = parser->cur_chunk;
@@ -294,7 +294,7 @@ STATIC void *parser_alloc(parser_t *parser, size_t num_bytes) {
 }
 
 #if MICROPY_COMP_CONST_TUPLE
-STATIC void parser_free_parse_node_struct(parser_t *parser, mp_parse_node_struct_t *pns) {
+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);
@@ -303,7 +303,7 @@ STATIC void parser_free_parse_node_struct(parser_t *parser, mp_parse_node_struct
 }
 #endif
 
-STATIC void push_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t arg_i) {
+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);
         parser->rule_stack = rs;
@@ -315,13 +315,13 @@ STATIC void push_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t
     rs->arg_i = arg_i;
 }
 
-STATIC void push_rule_from_arg(parser_t *parser, size_t arg) {
+static void push_rule_from_arg(parser_t *parser, size_t arg) {
     assert((arg & RULE_ARG_KIND_MASK) == RULE_ARG_RULE || (arg & RULE_ARG_KIND_MASK) == RULE_ARG_OPT_RULE);
     size_t rule_id = arg & RULE_ARG_ARG_MASK;
     push_rule(parser, parser->lexer->tok_line, rule_id, 0);
 }
 
-STATIC uint8_t pop_rule(parser_t *parser, size_t *arg_i, size_t *src_line) {
+static uint8_t pop_rule(parser_t *parser, size_t *arg_i, size_t *src_line) {
     parser->rule_stack_top -= 1;
     uint8_t rule_id = parser->rule_stack[parser->rule_stack_top].rule_id;
     *arg_i = parser->rule_stack[parser->rule_stack_top].arg_i;
@@ -330,7 +330,7 @@ STATIC uint8_t pop_rule(parser_t *parser, size_t *arg_i, size_t *src_line) {
 }
 
 #if MICROPY_COMP_CONST_TUPLE
-STATIC uint8_t peek_rule(parser_t *parser, size_t n) {
+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;
 }
@@ -350,7 +350,7 @@ bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
 }
 
 #if MICROPY_COMP_CONST_TUPLE || MICROPY_COMP_CONST
-STATIC bool mp_parse_node_is_const(mp_parse_node_t pn) {
+static bool mp_parse_node_is_const(mp_parse_node_t pn) {
     if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
         // Small integer.
         return true;
@@ -377,7 +377,7 @@ STATIC bool mp_parse_node_is_const(mp_parse_node_t pn) {
     return false;
 }
 
-STATIC mp_obj_t mp_parse_node_convert_to_obj(mp_parse_node_t pn) {
+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);
@@ -419,7 +419,7 @@ 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) {
+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;
@@ -513,7 +513,7 @@ void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t ind
 #endif // MICROPY_DEBUG_PRINTERS
 
 /*
-STATIC void result_stack_show(const mp_print_t *print, parser_t *parser) {
+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(print, parser->result_stack[i], 0);
@@ -521,17 +521,17 @@ STATIC void result_stack_show(const mp_print_t *print, parser_t *parser) {
 }
 */
 
-STATIC mp_parse_node_t pop_result(parser_t *parser) {
+static mp_parse_node_t pop_result(parser_t *parser) {
     assert(parser->result_stack_top > 0);
     return parser->result_stack[--parser->result_stack_top];
 }
 
-STATIC mp_parse_node_t peek_result(parser_t *parser, size_t pos) {
+static mp_parse_node_t peek_result(parser_t *parser, size_t pos) {
     assert(parser->result_stack_top > pos);
     return parser->result_stack[parser->result_stack_top - 1 - pos];
 }
 
-STATIC void push_result_node(parser_t *parser, mp_parse_node_t pn) {
+static void push_result_node(parser_t *parser, mp_parse_node_t pn) {
     if (parser->result_stack_top >= parser->result_stack_alloc) {
         mp_parse_node_t *stack = m_renew(mp_parse_node_t, parser->result_stack, parser->result_stack_alloc, parser->result_stack_alloc + MICROPY_ALLOC_PARSE_RESULT_INC);
         parser->result_stack = stack;
@@ -540,7 +540,7 @@ STATIC void push_result_node(parser_t *parser, mp_parse_node_t pn) {
     parser->result_stack[parser->result_stack_top++] = pn;
 }
 
-STATIC mp_parse_node_t make_node_const_object(parser_t *parser, size_t src_line, mp_obj_t obj) {
+static mp_parse_node_t make_node_const_object(parser_t *parser, size_t src_line, mp_obj_t obj) {
     mp_parse_node_struct_t *pn = parser_alloc(parser, sizeof(mp_parse_node_struct_t) + sizeof(mp_obj_t));
     pn->source_line = src_line;
     #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
@@ -557,7 +557,7 @@ STATIC mp_parse_node_t make_node_const_object(parser_t *parser, size_t src_line,
 
 // Create a parse node representing 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) {
+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 mp_parse_node_t make_node_const_object_optimised(parser_t *parser, size_t
     }
 }
 
-STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
+static void push_result_token(parser_t *parser, uint8_t rule_id) {
     mp_parse_node_t pn;
     mp_lexer_t *lex = parser->lexer;
     if (lex->tok_kind == MP_TOKEN_NAME) {
@@ -635,7 +635,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
 #if MICROPY_COMP_CONST_FOLDING
 
 #if MICROPY_COMP_MODULE_CONST
-STATIC const mp_rom_map_elem_t mp_constants_table[] = {
+static const mp_rom_map_elem_t mp_constants_table[] = {
     #if MICROPY_PY_ERRNO
     { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_errno) },
     #endif
@@ -645,7 +645,7 @@ STATIC const mp_rom_map_elem_t mp_constants_table[] = {
     // Extra constants as defined by a port
     MICROPY_PORT_CONSTANTS
 };
-STATIC MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
+static MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
 #endif
 
 #if MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND
@@ -653,7 +653,7 @@ STATIC MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
 // 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) {
+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) {
         // folding for binary logical ops: or and
@@ -710,7 +710,7 @@ STATIC bool fold_logical_constants(parser_t *parser, uint8_t rule_id, size_t *nu
     return false;
 }
 
-STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
+static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
     // this code does folding of arbitrary integer expressions, eg 1 + 2 * 3 + 4
     // it does not do partial folding, eg 1 + 2 + x -> 3 + x
 
@@ -894,7 +894,7 @@ STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
 #endif // MICROPY_COMP_CONST_FOLDING
 
 #if MICROPY_COMP_CONST_TUPLE
-STATIC bool build_tuple_from_stack(parser_t *parser, size_t src_line, size_t num_args) {
+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)) {
@@ -913,7 +913,7 @@ STATIC bool build_tuple_from_stack(parser_t *parser, size_t src_line, size_t num
     return true;
 }
 
-STATIC bool build_tuple(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
+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,)".
@@ -946,7 +946,7 @@ STATIC bool build_tuple(parser_t *parser, size_t src_line, uint8_t rule_id, size
 }
 #endif
 
-STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
+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) {
         // Remove parenthesis around a single expression if possible.
diff --git a/py/parsenum.c b/py/parsenum.c
index e3ad8070c6e02..b33ffb6ff23e0 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -36,7 +36,7 @@
 #include <math.h>
 #endif
 
-STATIC NORETURN void raise_exc(mp_obj_t exc, mp_lexer_t *lex) {
+static NORETURN void raise_exc(mp_obj_t exc, mp_lexer_t *lex) {
     // if lex!=NULL then the parser called us and we need to convert the
     // exception's type from ValueError to SyntaxError and add traceback info
     if (lex != NULL) {
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 1fe9a9a23fde8..5088c05f03c2b 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -69,8 +69,8 @@ typedef struct _bytecode_prelude_t {
 
 #include "py/parsenum.h"
 
-STATIC int read_byte(mp_reader_t *reader);
-STATIC size_t read_uint(mp_reader_t *reader);
+static int read_byte(mp_reader_t *reader);
+static size_t read_uint(mp_reader_t *reader);
 
 #if MICROPY_EMIT_MACHINE_CODE
 
@@ -138,17 +138,17 @@ void mp_native_relocate(void *ri_in, uint8_t *text, uintptr_t reloc_text) {
 
 #endif
 
-STATIC int read_byte(mp_reader_t *reader) {
+static int read_byte(mp_reader_t *reader) {
     return reader->readbyte(reader->data);
 }
 
-STATIC void read_bytes(mp_reader_t *reader, byte *buf, size_t len) {
+static void read_bytes(mp_reader_t *reader, byte *buf, size_t len) {
     while (len-- > 0) {
         *buf++ = reader->readbyte(reader->data);
     }
 }
 
-STATIC size_t read_uint(mp_reader_t *reader) {
+static size_t read_uint(mp_reader_t *reader) {
     size_t unum = 0;
     for (;;) {
         byte b = reader->readbyte(reader->data);
@@ -160,7 +160,7 @@ STATIC size_t read_uint(mp_reader_t *reader) {
     return unum;
 }
 
-STATIC qstr load_qstr(mp_reader_t *reader) {
+static qstr load_qstr(mp_reader_t *reader) {
     size_t len = read_uint(reader);
     if (len & 1) {
         // static qstr
@@ -175,7 +175,7 @@ STATIC qstr load_qstr(mp_reader_t *reader) {
     return qst;
 }
 
-STATIC mp_obj_t load_obj(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 == MP_PERSISTENT_OBJ_FUN_TABLE) {
@@ -221,7 +221,7 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) {
     }
 }
 
-STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *context) {
+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;
@@ -468,12 +468,12 @@ void mp_raw_code_load_file(qstr filename, mp_compiled_module_t *context) {
 
 #include "py/objstr.h"
 
-STATIC void mp_print_bytes(mp_print_t *print, const byte *data, size_t len) {
+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 ((MP_BYTES_PER_OBJ_WORD * 8 + 6) / 7)
-STATIC void mp_print_uint(mp_print_t *print, size_t n) {
+static void mp_print_uint(mp_print_t *print, size_t n) {
     byte buf[BYTES_FOR_INT];
     byte *p = buf + sizeof(buf);
     *--p = n & 0x7f;
@@ -484,7 +484,7 @@ 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 qst) {
+static void save_qstr(mp_print_t *print, qstr qst) {
     if (qst <= QSTR_LAST_STATIC) {
         // encode static qstr
         mp_print_uint(print, qst << 1 | 1);
@@ -496,7 +496,7 @@ STATIC void save_qstr(mp_print_t *print, qstr qst) {
     mp_print_bytes(print, str, len + 1); // +1 to store null terminator
 }
 
-STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
+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 = MP_PERSISTENT_OBJ_FUN_TABLE;
@@ -562,7 +562,7 @@ STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
     }
 }
 
-STATIC void save_raw_code(mp_print_t *print, const mp_raw_code_t *rc) {
+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 << 3) | ((rc->n_children != 0) << 2) | (rc->kind - MP_CODE_BYTECODE));
 
@@ -637,7 +637,7 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
 #include <sys/stat.h>
 #include <fcntl.h>
 
-STATIC void fd_print_strn(void *env, const char *str, size_t len) {
+static void fd_print_strn(void *env, const char *str, size_t len) {
     int fd = (intptr_t)env;
     MP_THREAD_GIL_EXIT();
     ssize_t ret = write(fd, str, len);
diff --git a/py/profile.c b/py/profile.c
index 274089d7022f1..92f414ace7c92 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -40,7 +40,7 @@
 #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) {
+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, prelude->line_info_top, bc);
 }
@@ -71,7 +71,7 @@ void mp_prof_extract_prelude(const byte *bytecode, mp_bytecode_prelude_t *prelud
 /******************************************************************************/
 // code object
 
-STATIC void code_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void code_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_code_t *o = MP_OBJ_TO_PTR(o_in);
     const mp_raw_code_t *rc = o->rc;
@@ -85,7 +85,7 @@ STATIC void code_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
         );
 }
 
-STATIC mp_obj_tuple_t *code_consts(const mp_module_context_t *context, const mp_raw_code_t *rc) {
+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;
@@ -101,7 +101,7 @@ STATIC mp_obj_tuple_t *code_consts(const mp_module_context_t *context, const mp_
     return consts;
 }
 
-STATIC mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
+static mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
     // const mp_bytecode_prelude_t *prelude = &rc->prelude;
     uint start = 0;
     uint stop = rc->fun_data_len - start;
@@ -139,7 +139,7 @@ STATIC mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
     return o;
 }
 
-STATIC void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
         return;
@@ -202,7 +202,7 @@ mp_obj_t mp_obj_new_code(const mp_module_context_t *context, const mp_raw_code_t
 /******************************************************************************/
 // frame object
 
-STATIC void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+static void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_frame_t *frame = MP_OBJ_TO_PTR(o_in);
     mp_obj_code_t *code = frame->code;
@@ -217,7 +217,7 @@ STATIC void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
         );
 }
 
-STATIC void frame_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void frame_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
         return;
@@ -294,7 +294,7 @@ typedef struct {
     mp_obj_t arg;
 } prof_callback_args_t;
 
-STATIC mp_obj_t mp_prof_callback_invoke(mp_obj_t callback, prof_callback_args_t *args) {
+static mp_obj_t mp_prof_callback_invoke(mp_obj_t callback, prof_callback_args_t *args) {
     assert(mp_obj_is_callable(callback));
 
     mp_prof_is_executing = true;
@@ -474,7 +474,7 @@ typedef struct _mp_dis_instruction_t {
     mp_obj_t argobjex_cache;
 } mp_dis_instruction_t;
 
-STATIC const byte *mp_prof_opcode_decode(const byte *ip, const mp_uint_t *const_table, mp_dis_instruction_t *instruction) {
+static const byte *mp_prof_opcode_decode(const byte *ip, const mp_uint_t *const_table, mp_dis_instruction_t *instruction) {
     mp_uint_t unum;
     const byte *ptr;
     mp_obj_t obj;
diff --git a/py/qstr.c b/py/qstr.c
index 204becd2136e0..3720932250ca8 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -187,7 +187,7 @@ void qstr_init(void) {
     #endif
 }
 
-STATIC const 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
     const qstr_pool_t *pool = MP_STATE_VM(last_pool);
@@ -200,7 +200,7 @@ STATIC const qstr_pool_t *find_qstr(qstr *q) {
 }
 
 // qstr_mutex must be taken while in this function
-STATIC qstr qstr_add(mp_uint_t len, const char *q_ptr) {
+static qstr qstr_add(mp_uint_t len, const char *q_ptr) {
     #if MICROPY_QSTR_BYTES_IN_HASH
     mp_uint_t hash = qstr_compute_hash((const byte *)q_ptr, len);
     DEBUG_printf("QSTR: add hash=%d len=%d data=%.*s\n", hash, len, len, q_ptr);
@@ -444,7 +444,7 @@ void qstr_dump_data(void) {
 #else
 
 // Emit the compressed_string_data string.
-#define MP_COMPRESSED_DATA(x) STATIC const char *compressed_string_data = x;
+#define MP_COMPRESSED_DATA(x) static const char *compressed_string_data = x;
 #define MP_MATCH_COMPRESSED(a, b)
 #include "genhdr/compressed.data.h"
 #undef MP_COMPRESSED_DATA
@@ -458,7 +458,7 @@ void qstr_dump_data(void) {
 // The compressed string data is delimited by setting high bit in the final char of each word.
 // e.g. aaaa<0x80|a>bbbbbb<0x80|b>....
 // This method finds the n'th string.
-STATIC const byte *find_uncompressed_string(uint8_t n) {
+static const byte *find_uncompressed_string(uint8_t n) {
     const byte *c = (byte *)compressed_string_data;
     while (n > 0) {
         while ((*c & 0x80) == 0) {
diff --git a/py/reader.c b/py/reader.c
index d2af62cfb344d..151e04cac2c71 100644
--- a/py/reader.c
+++ b/py/reader.c
@@ -39,7 +39,7 @@ typedef struct _mp_reader_mem_t {
     const byte *end;
 } mp_reader_mem_t;
 
-STATIC mp_uint_t mp_reader_mem_readbyte(void *data) {
+static mp_uint_t mp_reader_mem_readbyte(void *data) {
     mp_reader_mem_t *reader = (mp_reader_mem_t *)data;
     if (reader->cur < reader->end) {
         return *reader->cur++;
@@ -48,7 +48,7 @@ STATIC mp_uint_t mp_reader_mem_readbyte(void *data) {
     }
 }
 
-STATIC void mp_reader_mem_close(void *data) {
+static void mp_reader_mem_close(void *data) {
     mp_reader_mem_t *reader = (mp_reader_mem_t *)data;
     if (reader->free_len > 0) {
         m_del(char, (char *)reader->beg, reader->free_len);
@@ -81,7 +81,7 @@ typedef struct _mp_reader_posix_t {
     byte buf[20];
 } mp_reader_posix_t;
 
-STATIC mp_uint_t mp_reader_posix_readbyte(void *data) {
+static mp_uint_t mp_reader_posix_readbyte(void *data) {
     mp_reader_posix_t *reader = (mp_reader_posix_t *)data;
     if (reader->pos >= reader->len) {
         if (reader->len == 0) {
@@ -101,7 +101,7 @@ STATIC mp_uint_t mp_reader_posix_readbyte(void *data) {
     return reader->buf[reader->pos++];
 }
 
-STATIC void mp_reader_posix_close(void *data) {
+static void mp_reader_posix_close(void *data) {
     mp_reader_posix_t *reader = (mp_reader_posix_t *)data;
     if (reader->close_fd) {
         MP_THREAD_GIL_EXIT();
diff --git a/py/repl.c b/py/repl.c
index cf69d3d8993df..b79a2d3c42783 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -43,7 +43,7 @@ const char *mp_repl_get_psx(unsigned int entry) {
 }
 #endif
 
-STATIC bool str_startswith_word(const char *str, const char *head) {
+static bool str_startswith_word(const char *str, const char *head) {
     size_t i;
     for (i = 0; str[i] && head[i]; i++) {
         if (str[i] != head[i]) {
@@ -154,7 +154,7 @@ bool mp_repl_continue_with_input(const char *input) {
     return false;
 }
 
-STATIC bool test_qstr(mp_obj_t obj, qstr name) {
+static bool test_qstr(mp_obj_t obj, qstr name) {
     if (obj) {
         // try object member
         mp_obj_t dest[2];
@@ -167,7 +167,7 @@ STATIC bool test_qstr(mp_obj_t obj, qstr name) {
     }
 }
 
-STATIC const char *find_completions(const char *s_start, size_t s_len,
+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;
@@ -207,7 +207,7 @@ STATIC const char *find_completions(const char *s_start, size_t s_len,
     return match_str;
 }
 
-STATIC void print_completions(const mp_print_t *print,
+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) {
 
diff --git a/py/runtime.c b/py/runtime.c
index 6d8eddedc8646..f7e0abdb46009 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -731,7 +731,7 @@ mp_obj_t mp_call_method_n_kw(size_t n_args, size_t n_kw, const mp_obj_t *args) {
 
 // This function only needs to be exposed externally when in stackless mode.
 #if !MICROPY_STACKLESS
-STATIC
+static
 #endif
 void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_obj_t *args, mp_call_args_t *out_args) {
     mp_obj_t fun = *args++;
@@ -1074,7 +1074,7 @@ typedef struct _mp_obj_checked_fun_t {
     mp_obj_t fun;
 } mp_obj_checked_fun_t;
 
-STATIC mp_obj_t checked_fun_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t checked_fun_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_checked_fun_t *self = MP_OBJ_TO_PTR(self_in);
     if (n_args > 0) {
         const mp_obj_type_t *arg0_type = mp_obj_get_type(args[0]);
@@ -1090,14 +1090,14 @@ 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 MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_checked_fun,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
     call, checked_fun_call
     );
 
-STATIC mp_obj_t mp_obj_new_checked_fun(const mp_obj_type_t *type, mp_obj_t 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 = mp_obj_malloc(mp_obj_checked_fun_t, &mp_type_checked_fun);
     o->type = type;
     o->fun = fun;
@@ -1326,7 +1326,7 @@ 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) {
+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) {
         return mp_stream_unbuffered_iter;
     } else if (type->flags & MP_TYPE_FLAG_ITER_IS_ITERNEXT) {
diff --git a/py/scope.c b/py/scope.c
index 8fc0943289b4f..1a4c6cc77f156 100644
--- a/py/scope.c
+++ b/py/scope.c
@@ -31,7 +31,7 @@
 #if MICROPY_ENABLE_COMPILER
 
 // These low numbered qstrs should fit in 8 bits.  See assertions below.
-STATIC const uint8_t scope_simple_name_table[] = {
+static const uint8_t scope_simple_name_table[] = {
     [SCOPE_MODULE] = MP_QSTR__lt_module_gt_,
     [SCOPE_LAMBDA] = MP_QSTR__lt_lambda_gt_,
     [SCOPE_LIST_COMP] = MP_QSTR__lt_listcomp_gt_,
@@ -111,7 +111,7 @@ id_info_t *scope_find_global(scope_t *scope, qstr qst) {
     return scope_find(scope, qst);
 }
 
-STATIC void scope_close_over_in_parents(scope_t *scope, qstr qst) {
+static void scope_close_over_in_parents(scope_t *scope, qstr qst) {
     assert(scope->parent != NULL); // we should have at least 1 parent
     for (scope_t *s = scope->parent;; s = s->parent) {
         assert(s->parent != NULL); // we should not get to the outer scope
diff --git a/py/stream.c b/py/stream.c
index ac0234ac1353c..aa905ca8cc904 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -38,7 +38,7 @@
 // TODO: should be in mpconfig.h
 #define DEFAULT_BUFFER_SIZE 256
 
-STATIC mp_obj_t stream_readall(mp_obj_t self_in);
+static mp_obj_t stream_readall(mp_obj_t self_in);
 
 // 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
@@ -96,7 +96,7 @@ const mp_stream_p_t *mp_get_stream_raise(mp_obj_t self_in, int flags) {
     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) {
+static mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte flags) {
     // What to do if sz < -1?  Python docs don't specify this case.
     // CPython does a readall, but here we silently let negatives through,
     // and they will cause a MemoryError.
@@ -218,12 +218,12 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
     }
 }
 
-STATIC mp_obj_t stream_read(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_read(size_t n_args, const mp_obj_t *args) {
     return stream_read_generic(n_args, args, MP_STREAM_RW_READ);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_read_obj, 1, 2, stream_read);
 
-STATIC mp_obj_t stream_read1(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_read1(size_t n_args, const mp_obj_t *args) {
     return stream_read_generic(n_args, args, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_read1_obj, 1, 2, stream_read1);
@@ -249,7 +249,7 @@ void mp_stream_write_adaptor(void *self, const char *buf, size_t len) {
     mp_stream_write(MP_OBJ_FROM_PTR(self), buf, len, MP_STREAM_RW_WRITE);
 }
 
-STATIC mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
     size_t max_len = (size_t)-1;
@@ -268,14 +268,14 @@ STATIC mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write_obj, 2, 4, stream_write_method);
 
-STATIC mp_obj_t stream_write1_method(mp_obj_t self_in, mp_obj_t arg) {
+static mp_obj_t stream_write1_method(mp_obj_t self_in, mp_obj_t arg) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     return mp_stream_write(self_in, bufinfo.buf, bufinfo.len, MP_STREAM_RW_WRITE | MP_STREAM_RW_ONCE);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_stream_write1_obj, stream_write1_method);
 
-STATIC mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
 
@@ -303,7 +303,7 @@ STATIC mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto_obj, 2, 3, stream_readinto);
 
-STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
+static mp_obj_t stream_readall(mp_obj_t self_in) {
     const mp_stream_p_t *stream_p = mp_get_stream(self_in);
 
     mp_uint_t total_size = 0;
@@ -348,7 +348,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
 }
 
 // Unbuffered, inefficient implementation of readline() for raw I/O files.
-STATIC mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args) {
     const mp_stream_p_t *stream_p = mp_get_stream(args[0]);
 
     mp_int_t max_size = -1;
@@ -406,7 +406,7 @@ STATIC mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args)
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_unbuffered_readline_obj, 1, 2, stream_unbuffered_readline);
 
 // TODO take an optional extra argument (what does it do exactly?)
-STATIC mp_obj_t stream_unbuffered_readlines(mp_obj_t self) {
+static mp_obj_t stream_unbuffered_readlines(mp_obj_t self) {
     mp_obj_t lines = mp_obj_new_list(0, NULL);
     for (;;) {
         mp_obj_t line = stream_unbuffered_readline(1, &self);
@@ -438,13 +438,13 @@ mp_obj_t mp_stream_close(mp_obj_t stream) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_close_obj, mp_stream_close);
 
-STATIC mp_obj_t mp_stream___exit__(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_stream___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     return mp_stream_close(args[0]);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream___exit___obj, 4, 4, mp_stream___exit__);
 
-STATIC mp_obj_t stream_seek(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_seek(size_t n_args, const mp_obj_t *args) {
     struct mp_stream_seek_t seek_s;
     // TODO: Could be uint64
     seek_s.offset = mp_obj_get_int(args[1]);
@@ -470,7 +470,7 @@ STATIC mp_obj_t stream_seek(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_seek_obj, 2, 3, stream_seek);
 
-STATIC mp_obj_t stream_tell(mp_obj_t self) {
+static mp_obj_t stream_tell(mp_obj_t self) {
     mp_obj_t offset = MP_OBJ_NEW_SMALL_INT(0);
     mp_obj_t whence = MP_OBJ_NEW_SMALL_INT(SEEK_CUR);
     const mp_obj_t args[3] = {self, offset, whence};
@@ -478,7 +478,7 @@ STATIC mp_obj_t stream_tell(mp_obj_t self) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_tell_obj, stream_tell);
 
-STATIC mp_obj_t stream_flush(mp_obj_t self) {
+static mp_obj_t stream_flush(mp_obj_t self) {
     const mp_stream_p_t *stream_p = mp_get_stream(self);
     int error;
     mp_uint_t res = stream_p->ioctl(self, MP_STREAM_FLUSH, 0, &error);
@@ -489,7 +489,7 @@ STATIC mp_obj_t stream_flush(mp_obj_t self) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_flush_obj, stream_flush);
 
-STATIC mp_obj_t stream_ioctl(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_ioctl(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     uintptr_t val = 0;
     if (n_args > 2) {
diff --git a/py/unicode.c b/py/unicode.c
index 5acaad378843c..81a37880f3c72 100644
--- a/py/unicode.c
+++ b/py/unicode.c
@@ -48,7 +48,7 @@
 #define AT_LX (FL_LOWER | FL_ALPHA | FL_PRINT | FL_XDIGIT)
 
 // table of attributes for ascii characters
-STATIC const uint8_t attr[] = {
+static const uint8_t attr[] = {
     0, 0, 0, 0, 0, 0, 0, 0,
     0, AT_SP, AT_SP, AT_SP, AT_SP, AT_SP, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/py/vstr.c b/py/vstr.c
index 56327b5f7ac7c..fc55d6948ccf2 100644
--- a/py/vstr.c
+++ b/py/vstr.c
@@ -104,7 +104,7 @@ char *vstr_extend(vstr_t *vstr, size_t size) {
     return p;
 }
 
-STATIC void vstr_ensure_extra(vstr_t *vstr, size_t size) {
+static void vstr_ensure_extra(vstr_t *vstr, size_t size) {
     if (vstr->len + size > vstr->alloc) {
         if (vstr->fixed_buf) {
             // We can't reallocate, and the caller is expecting the space to
@@ -183,7 +183,7 @@ void vstr_add_strn(vstr_t *vstr, const char *str, size_t len) {
     vstr->len += len;
 }
 
-STATIC char *vstr_ins_blank_bytes(vstr_t *vstr, size_t byte_pos, size_t byte_len) {
+static char *vstr_ins_blank_bytes(vstr_t *vstr, size_t byte_pos, size_t byte_len) {
     size_t l = vstr->len;
     if (byte_pos > l) {
         byte_pos = l;
diff --git a/shared/libc/printf.c b/shared/libc/printf.c
index 715181229e4fc..50b04ce9be082 100644
--- a/shared/libc/printf.c
+++ b/shared/libc/printf.c
@@ -87,7 +87,7 @@ typedef struct _strn_print_env_t {
     size_t remain;
 } strn_print_env_t;
 
-STATIC void strn_print_strn(void *data, const char *str, size_t len) {
+static void strn_print_strn(void *data, const char *str, size_t len) {
     strn_print_env_t *strn_print_env = data;
     if (len > strn_print_env->remain) {
         len = strn_print_env->remain;
diff --git a/shared/readline/readline.c b/shared/readline/readline.c
index b85bbd5bea85a..c9386f16b575d 100644
--- a/shared/readline/readline.c
+++ b/shared/readline/readline.c
@@ -55,7 +55,7 @@ void readline_init0(void) {
     memset(MP_STATE_PORT(readline_hist), 0, MICROPY_READLINE_HISTORY_SIZE * sizeof(const char*));
 }
 
-STATIC char *str_dup_maybe(const char *str) {
+static char *str_dup_maybe(const char *str) {
     uint32_t len = strlen(str);
     char *s2 = m_new_maybe(char, len + 1);
     if (s2 == NULL) {
@@ -72,7 +72,7 @@ STATIC char *str_dup_maybe(const char *str) {
 
 // ...and provide the implementation using them
 #if MICROPY_HAL_HAS_VT100
-STATIC void mp_hal_move_cursor_back(uint pos) {
+static void mp_hal_move_cursor_back(uint pos) {
     if (pos <= 4) {
         // fast path for most common case of 1 step back
         mp_hal_stdout_tx_strn("\b\b\b\b", pos);
@@ -88,7 +88,7 @@ STATIC void mp_hal_move_cursor_back(uint pos) {
     }
 }
 
-STATIC void mp_hal_erase_line_from_cursor(uint n_chars_to_erase) {
+static void mp_hal_erase_line_from_cursor(uint n_chars_to_erase) {
     (void)n_chars_to_erase;
     mp_hal_stdout_tx_strn("\x1b[K", 3);
 }
@@ -107,10 +107,10 @@ typedef struct _readline_t {
     const char *prompt;
 } readline_t;
 
-STATIC readline_t rl;
+static readline_t rl;
 
 #if MICROPY_REPL_EMACS_WORDS_MOVE
-STATIC size_t cursor_count_word(int forward) {
+static size_t cursor_count_word(int forward) {
     const char *line_buf = vstr_str(rl.line);
     size_t pos = rl.cursor_pos;
     bool in_word = false;
@@ -481,7 +481,7 @@ int readline_process_char(int c) {
 }
 
 #if MICROPY_REPL_AUTO_INDENT
-STATIC void readline_auto_indent(void) {
+static void readline_auto_indent(void) {
     if (!(rl.auto_indent_state & AUTO_INDENT_ENABLED)) {
         return;
     }
diff --git a/shared/runtime/gchelper_generic.c b/shared/runtime/gchelper_generic.c
index 272e37056aaa8..4ef2e73f7a2ee 100644
--- a/shared/runtime/gchelper_generic.c
+++ b/shared/runtime/gchelper_generic.c
@@ -42,7 +42,7 @@
 // stack already by the caller.
 #if defined(__x86_64__)
 
-STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
+static void gc_helper_get_regs(gc_helper_regs_t arr) {
     register long rbx asm ("rbx");
     register long rbp asm ("rbp");
     register long r12 asm ("r12");
@@ -73,7 +73,7 @@ STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
 
 #elif defined(__i386__)
 
-STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
+static void gc_helper_get_regs(gc_helper_regs_t arr) {
     register long ebx asm ("ebx");
     register long esi asm ("esi");
     register long edi asm ("edi");
@@ -100,7 +100,7 @@ STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
 
 // Fallback implementation, prefer gchelper_thumb1.s or gchelper_thumb2.s
 
-STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
+static void gc_helper_get_regs(gc_helper_regs_t arr) {
     register long r4 asm ("r4");
     register long r5 asm ("r5");
     register long r6 asm ("r6");
@@ -125,7 +125,7 @@ STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
 
 #elif defined(__aarch64__)
 
-STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
+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");
@@ -161,7 +161,7 @@ STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
 // Even if we have specific support for an architecture, it is
 // possible to force use of setjmp-based implementation.
 
-STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
+static void gc_helper_get_regs(gc_helper_regs_t arr) {
     setjmp(arr);
 }
 
diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index acd727403b558..6111b9b10cfe4 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -96,13 +96,13 @@ void mp_irq_handler(mp_irq_obj_t *self) {
 /******************************************************************************/
 // MicroPython bindings
 
-STATIC mp_obj_t mp_irq_flags(mp_obj_t self_in) {
+static mp_obj_t mp_irq_flags(mp_obj_t self_in) {
     mp_irq_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return mp_obj_new_int(self->methods->info(self->parent, MP_IRQ_INFO_FLAGS));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_flags_obj, mp_irq_flags);
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_irq_flags_obj, mp_irq_flags);
 
-STATIC mp_obj_t mp_irq_trigger(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mp_irq_trigger(size_t n_args, const mp_obj_t *args) {
     mp_irq_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_obj_t ret_obj = mp_obj_new_int(self->methods->info(self->parent, MP_IRQ_INFO_TRIGGERS));
     if (n_args == 2) {
@@ -111,19 +111,19 @@ STATIC mp_obj_t mp_irq_trigger(size_t n_args, const mp_obj_t *args) {
     }
     return ret_obj;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_irq_trigger_obj, 1, 2, mp_irq_trigger);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_irq_trigger_obj, 1, 2, mp_irq_trigger);
 
-STATIC mp_obj_t mp_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+static mp_obj_t mp_irq_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, 0, false);
     mp_irq_handler(MP_OBJ_TO_PTR(self_in));
     return mp_const_none;
 }
 
-STATIC const mp_rom_map_elem_t mp_irq_locals_dict_table[] = {
+static const mp_rom_map_elem_t mp_irq_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_flags),               MP_ROM_PTR(&mp_irq_flags_obj) },
     { MP_ROM_QSTR(MP_QSTR_trigger),             MP_ROM_PTR(&mp_irq_trigger_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(mp_irq_locals_dict, mp_irq_locals_dict_table);
+static MP_DEFINE_CONST_DICT(mp_irq_locals_dict, mp_irq_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_irq_type,
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index cc2aa535042c8..a305e6a5df6dd 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -47,7 +47,7 @@ pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
 int pyexec_system_exit = 0;
 
 #if MICROPY_REPL_INFO
-STATIC bool repl_display_debugging_info = 0;
+static bool repl_display_debugging_info = 0;
 #endif
 
 #define EXEC_FLAG_PRINT_EOF             (1 << 0)
@@ -64,7 +64,7 @@ STATIC bool repl_display_debugging_info = 0;
 // 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, mp_uint_t 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;
@@ -201,7 +201,7 @@ typedef struct _mp_reader_stdin_t {
     uint16_t window_remain;
 } mp_reader_stdin_t;
 
-STATIC mp_uint_t mp_reader_stdin_readbyte(void *data) {
+static mp_uint_t mp_reader_stdin_readbyte(void *data) {
     mp_reader_stdin_t *reader = (mp_reader_stdin_t *)data;
 
     if (reader->eof) {
@@ -233,7 +233,7 @@ STATIC mp_uint_t mp_reader_stdin_readbyte(void *data) {
     return c;
 }
 
-STATIC void mp_reader_stdin_close(void *data) {
+static void mp_reader_stdin_close(void *data) {
     mp_reader_stdin_t *reader = (mp_reader_stdin_t *)data;
     if (!reader->eof) {
         reader->eof = true;
@@ -247,7 +247,7 @@ STATIC void mp_reader_stdin_close(void *data) {
     }
 }
 
-STATIC void mp_reader_new_stdin(mp_reader_t *reader, mp_reader_stdin_t *reader_stdin, uint16_t buf_max) {
+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).
@@ -263,7 +263,7 @@ STATIC void mp_reader_new_stdin(mp_reader_t *reader, mp_reader_stdin_t *reader_s
     reader->close = mp_reader_stdin_close;
 }
 
-STATIC int do_reader_stdin(int c) {
+static int do_reader_stdin(int c) {
     if (c != 'A') {
         // Unsupported command.
         mp_hal_stdout_tx_strn("R\x00", 2);
@@ -294,8 +294,8 @@ typedef struct _repl_t {
 
 repl_t repl;
 
-STATIC int pyexec_raw_repl_process_char(int c);
-STATIC int pyexec_friendly_repl_process_char(int c);
+static int pyexec_raw_repl_process_char(int c);
+static int pyexec_friendly_repl_process_char(int c);
 
 void pyexec_event_repl_init(void) {
     MP_STATE_VM(repl_line) = vstr_new(32);
@@ -310,7 +310,7 @@ void pyexec_event_repl_init(void) {
     }
 }
 
-STATIC int pyexec_raw_repl_process_char(int c) {
+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) {
@@ -364,7 +364,7 @@ STATIC int pyexec_raw_repl_process_char(int c) {
     return 0;
 }
 
-STATIC int pyexec_friendly_repl_process_char(int c) {
+static int pyexec_friendly_repl_process_char(int c) {
     if (repl.paste_mode) {
         if (c == CHAR_CTRL_C) {
             // cancel everything
diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
index 468fa95b7208c..13a6e78777ef4 100644
--- a/shared/runtime/softtimer.c
+++ b/shared/runtime/softtimer.c
@@ -56,9 +56,9 @@ static void soft_timer_schedule_at_ms(uint32_t ticks_ms) {
 // 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 soft_timer_entry_t *soft_timer_heap;
 
-STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
+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 soft_timer_ticks_diff(e1->expiry_ms, e2->expiry_ms) < 0;
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index b7a35a5cbaa0b..ad045fb3a9537 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -49,15 +49,15 @@ typedef struct _sys_stdio_obj_t {
 } sys_stdio_obj_t;
 
 #if MICROPY_PY_SYS_STDIO_BUFFER
-STATIC const sys_stdio_obj_t stdio_buffer_obj;
+static const sys_stdio_obj_t stdio_buffer_obj;
 #endif
 
-STATIC 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);
 }
 
-STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     sys_stdio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->fd == STDIO_FD_IN) {
         for (uint i = 0; i < size; i++) {
@@ -74,7 +74,7 @@ STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *er
     }
 }
 
-STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     sys_stdio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->fd == STDIO_FD_OUT || self->fd == STDIO_FD_ERR) {
         mp_hal_stdout_tx_strn_cooked(buf, size);
@@ -85,7 +85,7 @@ STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size,
     }
 }
 
-STATIC mp_uint_t stdio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static mp_uint_t stdio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     (void)self_in;
     if (request == MP_STREAM_POLL) {
         return mp_hal_stdio_poll(arg);
@@ -97,7 +97,7 @@ STATIC mp_uint_t stdio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg,
     }
 }
 
-STATIC const mp_rom_map_elem_t stdio_locals_dict_table[] = {
+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) },
     #endif
@@ -111,9 +111,9 @@ STATIC const mp_rom_map_elem_t stdio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(stdio_locals_dict, stdio_locals_dict_table);
+static MP_DEFINE_CONST_DICT(stdio_locals_dict, stdio_locals_dict_table);
 
-STATIC const mp_stream_p_t stdio_obj_stream_p = {
+static const mp_stream_p_t stdio_obj_stream_p = {
     .read = stdio_read,
     .write = stdio_write,
     .ioctl = stdio_ioctl,
@@ -134,25 +134,25 @@ const sys_stdio_obj_t mp_sys_stdout_obj = {{&stdio_obj_type}, .fd = STDIO_FD_OUT
 const sys_stdio_obj_t mp_sys_stderr_obj = {{&stdio_obj_type}, .fd = STDIO_FD_ERR};
 
 #if MICROPY_PY_SYS_STDIO_BUFFER
-STATIC mp_uint_t stdio_buffer_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stdio_buffer_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     for (uint i = 0; i < size; i++) {
         ((byte *)buf)[i] = mp_hal_stdin_rx_chr();
     }
     return size;
 }
 
-STATIC mp_uint_t stdio_buffer_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static mp_uint_t stdio_buffer_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     return mp_hal_stdout_tx_strn(buf, size);
 }
 
-STATIC const mp_stream_p_t stdio_buffer_obj_stream_p = {
+static const mp_stream_p_t stdio_buffer_obj_stream_p = {
     .read = stdio_buffer_read,
     .write = stdio_buffer_write,
     .ioctl = stdio_ioctl,
     .is_text = false,
 };
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+static MP_DEFINE_CONST_OBJ_TYPE(
     stdio_buffer_obj_type,
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
@@ -161,5 +161,5 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &stdio_locals_dict
     );
 
-STATIC const sys_stdio_obj_t stdio_buffer_obj = {{&stdio_buffer_obj_type}, .fd = 0}; // fd unused
+static const sys_stdio_obj_t stdio_buffer_obj = {{&stdio_buffer_obj_type}, .fd = 0}; // fd unused
 #endif
diff --git a/shared/timeutils/timeutils.c b/shared/timeutils/timeutils.c
index 6bf3eca84a82b..4282a0178dd6e 100644
--- a/shared/timeutils/timeutils.c
+++ b/shared/timeutils/timeutils.c
@@ -40,7 +40,7 @@
 #define DAYS_PER_100Y (365 * 100 + 24)
 #define DAYS_PER_4Y   (365 * 4 + 1)
 
-STATIC const uint16_t days_since_jan1[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 };
+static const uint16_t days_since_jan1[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 };
 
 bool timeutils_is_leap_year(mp_uint_t year) {
     return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0;
@@ -125,7 +125,7 @@ void timeutils_seconds_since_2000_to_struct_time(mp_uint_t t, timeutils_struct_t
     tm->tm_year = 2000 + years + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles;
 
     // Note: days_in_month[0] corresponds to March
-    STATIC const int8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29};
+    static const int8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29};
 
     mp_int_t month;
     for (month = 0; days_in_month[month] <= days; month++) {
diff --git a/shared/tinyusb/mp_cdc_common.c b/shared/tinyusb/mp_cdc_common.c
index 8278685262fa1..e790646f4f86d 100644
--- a/shared/tinyusb/mp_cdc_common.c
+++ b/shared/tinyusb/mp_cdc_common.c
@@ -34,7 +34,7 @@
 
 static mp_sched_node_t mp_bootloader_sched_node;
 
-STATIC void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
+static void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
     mp_hal_delay_ms(250);
     machine_bootloader(0, NULL);
 }
diff --git a/tools/boardgen.py b/tools/boardgen.py
index caa9fe851c768..41a8e9f2e597b 100644
--- a/tools/boardgen.py
+++ b/tools/boardgen.py
@@ -289,7 +289,7 @@ def find_pin_by_cpu_pin_name(self, cpu_pin_name, create=True):
     def print_board_locals_dict(self, out_source):
         print(file=out_source)
         print(
-            "STATIC const mp_rom_map_elem_t machine_pin_board_pins_locals_dict_table[] = {",
+            "static const mp_rom_map_elem_t machine_pin_board_pins_locals_dict_table[] = {",
             file=out_source,
         )
         for pin in self.available_pins():
@@ -318,7 +318,7 @@ def print_board_locals_dict(self, out_source):
     def print_cpu_locals_dict(self, out_source):
         print(file=out_source)
         print(
-            "STATIC const mp_rom_map_elem_t machine_pin_cpu_pins_locals_dict_table[] = {",
+            "static const mp_rom_map_elem_t machine_pin_cpu_pins_locals_dict_table[] = {",
             file=out_source,
         )
         for pin in self.available_pins(exclude_hidden=True):

From dda9b9c6da5d3c31fa8769e581a753e95a270803 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 29 Feb 2024 00:27:06 +0000
Subject: [PATCH 0882/3129] all: Prune trailing whitespace.

Prune trailing whitespace across the whole project (almost), done
automatically with:

    grep -IUrl --color "[[:blank:]]$" --exclude-dir=.git --exclude=*.exp |\
        xargs sed -i 's/[[:space:]]*$//'

Exceptions:
- Skip third-party code in lib/ and drivers/cc3100/
- Skip generated code in bluetooth_init_cc2564C_1.5.c
- Preserve command output whitespace in docs, eg:
  docs/esp8266/tutorial/repl.rst

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 .github/workflows/ports_windows.yml           |   6 +-
 docs/develop/gettingstarted.rst               |   2 +-
 docs/differences/python_37.rst                |   2 +-
 docs/library/machine.ADCBlock.rst             |   2 +-
 docs/library/machine.PWM.rst                  |   4 +-
 docs/mimxrt/pinout.rst                        |   4 +-
 docs/mimxrt/quickref.rst                      |   2 +-
 docs/samd/pinout.rst                          |  86 +++----
 extmod/axtls-include/config.h                 |  14 +-
 logo/FONT-LICENSE.txt                         |   2 +-
 ports/cc3200/README.md                        |  10 +-
 ports/cc3200/application.lds                  |   4 +-
 ports/cc3200/bootmgr/bootgen.sh               |   2 +-
 ports/cc3200/bootmgr/bootloader.mk            |   4 +-
 ports/cc3200/bootmgr/flc.h                    |   6 +-
 ports/cc3200/bootmgr/sl/user.h                |  56 ++---
 ports/cc3200/fatfs/src/drivers/stdcmd.h       |  34 +--
 ports/cc3200/hal/cc3200_hal.c                 |   2 +-
 ports/cc3200/hal/gpio.c                       |   2 +-
 ports/cc3200/hal/inc/hw_memmap.h              |   2 +-
 ports/cc3200/hal/pin.h                        |   4 +-
 ports/cc3200/hal/prcm.h                       |   4 +-
 ports/cc3200/hal/spi.c                        |   2 +-
 ports/cc3200/simplelink/oslib/osi.h           |  64 +++---
 ports/cc3200/simplelink/oslib/osi_freertos.c  |  56 ++---
 ports/cc3200/simplelink/user.h                |  56 ++---
 ports/embed/embed.mk                          |   2 +-
 ports/esp32/README.ulp.md                     |  12 +-
 .../boards/OLIMEX_RT1010/deploy_olimex.md     |   8 +-
 .../boards/SEEED_ARCH_MIX/mpconfigboard.mk    |   2 +-
 ports/mimxrt/boards/common.ld                 |  14 +-
 .../boards/ACTINIUS_ICARUS/mpconfigboard.mk   |   2 +-
 .../boards/NRF52840_MDK_USB_DONGLE/README.md  |   2 +-
 .../drivers/bluetooth/download_ble_stack.sh   |   4 +-
 ports/renesas-ra/Makefile                     |   4 +-
 ports/rp2/CMakeLists.txt                      |   2 +-
 ports/stm32/Makefile                          |   2 +-
 ports/stm32/boards/stm32h7b3.ld               |   2 +-
 .../stm32/usbdev/class/inc/usbd_cdc_msc_hid.h |  14 +-
 tests/README.md                               |   2 +-
 tests/basics/generator_throw.py               |   4 +-
 tests/basics/int_big_and2.py                  |   4 +-
 tests/basics/int_big_and3.py                  |   4 +-
 tests/basics/int_big_or.py                    |   8 +-
 tests/basics/int_big_or2.py                   |   4 +-
 tests/basics/int_big_or3.py                   |   4 +-
 tests/basics/int_big_xor.py                   |   8 +-
 tests/basics/int_big_xor2.py                  |   4 +-
 tests/basics/int_big_xor3.py                  |   4 +-
 tests/io/data/bigfile1                        | 214 +++++++++---------
 tests/ports/cc3200/pin.py                     |   6 +-
 tests/ports/cc3200/uart.py                    |   2 +-
 tools/codestats.sh                            |   2 +-
 53 files changed, 386 insertions(+), 386 deletions(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index a2759880a2f65..be2a2a8dac332 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -56,14 +56,14 @@ jobs:
     - uses: actions/setup-python@v5
       if: matrix.runner == 'windows-2019'
       with:
-        python-version: '3.9' 
+        python-version: '3.9'
     - uses: actions/checkout@v4
     - name: Build mpy-cross.exe
       run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
     - name: Update submodules
       run: git submodule update --init lib/micropython-lib
     - name: Build micropython.exe
-      run: msbuild ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} 
+      run: msbuild ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }}
     - name: Get micropython.exe path
       id: get_path
       run: |
@@ -123,7 +123,7 @@ jobs:
         msystem: ${{ matrix.sys }}
         update: true
         install: >-
-          make 
+          make
           mingw-w64-${{ matrix.env }}-gcc
           pkg-config
           python3
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index a17a320671f52..c1fd338c54cc0 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -112,7 +112,7 @@ Check that you have Python available on your system:
 .. code-block:: bash
 
    $ python3
-   Python 3.5.0 (default, Jul 17 2020, 14:04:10) 
+   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.
    >>> 
diff --git a/docs/differences/python_37.rst b/docs/differences/python_37.rst
index 86d1b6e81f96d..2b9a089217f6d 100644
--- a/docs/differences/python_37.rst
+++ b/docs/differences/python_37.rst
@@ -105,4 +105,4 @@ Changes to built-in modules:
 
 .. rubric:: Notes
 
-.. [#ftimenanosec] Only :func:`time.time_ns` is implemented. 
+.. [#ftimenanosec] Only :func:`time.time_ns` is implemented.
diff --git a/docs/library/machine.ADCBlock.rst b/docs/library/machine.ADCBlock.rst
index eb94362d5597c..e947f70815071 100644
--- a/docs/library/machine.ADCBlock.rst
+++ b/docs/library/machine.ADCBlock.rst
@@ -26,7 +26,7 @@ Constructors
 
    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.
diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
index b9cf00240314c..5f592b8dff593 100644
--- a/docs/library/machine.PWM.rst
+++ b/docs/library/machine.PWM.rst
@@ -86,7 +86,7 @@ Specific PWM class implementations
 
 The following concrete class(es) implement enhancements to the PWM class.
 
-   | :ref:`pyb.Timer for PyBoard <pyb.Timer>`  
+   | :ref:`pyb.Timer for PyBoard <pyb.Timer>`
 
 Limitations of PWM
 ------------------
@@ -103,7 +103,7 @@ Limitations of PWM
   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. 
+  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
diff --git a/docs/mimxrt/pinout.rst b/docs/mimxrt/pinout.rst
index 16bb4722734a2..3ff892c64d688 100644
--- a/docs/mimxrt/pinout.rst
+++ b/docs/mimxrt/pinout.rst
@@ -319,7 +319,7 @@ 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
-Adafruit Metro M7  -/-/MOSI/MISO/SCK                -                        -         
+Adafruit Metro M7  -/-/MOSI/MISO/SCK                -                        -
 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
 =================  =========================  =======================  ===============
@@ -375,7 +375,7 @@ 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
-Adafruit Metro M7  1   D8     D10      D9      D12     D14      D15     D13     
+Adafruit Metro M7  1   D8     D10      D9      D12     D14      D15     D13
 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"
diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index 519313438321c..1a73929bedbe3 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -309,7 +309,7 @@ rates (up to 30Mhz).  Hardware SPI is accessed via the
 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. 
+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/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 5ff72b83586ac..5da4ae78d45b5 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -17,12 +17,12 @@ Adafruit ItsyBitsy 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     - 
+  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
@@ -30,31 +30,31 @@ Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
   8 PA08           D4   -  16    0/0     2/0   0/0    1/2
  15 PA15           D5  15   -    2/3     4/3   3/1    0/5
  21 PA21           D7   5   -    5/3     3/3   7/1    0/7
-  7 PA07           D9   7   7     -      0/3   1/1     - 
+  7 PA07           D9   7   7     -      0/3   1/1     -
  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
-  0 PA00  DOTSTAR_CLK   0   -     -      1/0   2/0     - 
-  1 PA01 DOTSTAR_DATA   1   -     -      1/1   2/1     - 
- 27 PA27     FLASH_CS  15   -     -       -     -      - 
- 35 PB03   FLASH_MISO   3  11     -      5/1   6/1     - 
- 54 PB22   FLASH_MOSI   6   -     -      5/2   7/0     - 
- 55 PB23    FLASH_SCK   7   -     -      5/3   7/1     - 
+  0 PA00  DOTSTAR_CLK   0   -     -      1/0   2/0     -
+  1 PA01 DOTSTAR_DATA   1   -     -      1/1   2/1     -
+ 27 PA27     FLASH_CS  15   -     -       -     -      -
+ 35 PB03   FLASH_MISO   3  11     -      5/1   6/1     -
+ 54 PB22   FLASH_MOSI   6   -     -      5/2   7/0     -
+ 55 PB23    FLASH_SCK   7   -     -      5/3   7/1     -
  12 PA12         MISO  12   -    2/0     4/0   2/0    0/6
  42 PB10         MOSI  10   -     -      4/2   5/0    0/4
  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     - 
+ 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     -       -     -      - 
-  6 PA06                6   6     -      0/2   1/0     - 
+  3 PA03                3   1     -       -     -      -
+  6 PA06                6   6     -      0/2   1/0     -
  13 PA13               13   -    2/1     4/1   2/0    0/7
  20 PA20                4   -    5/2     3/2   7/0    0/4
- 28 PA28                8   -     -       -     -      - 
+ 28 PA28                8   -     -       -     -      -
 === ==== ============ ==== ==== ====== ====== ====== ======
 
 
@@ -348,12 +348,12 @@ Adafruit Metro M4 Airlift 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    -     - 
-  6 PA06           A2  6     6    -     -     0/2   1/0    -     - 
- 32 PB00           A3  9    12    -     -     5/2   7/0    -     - 
- 40 PB08           A4  8     2    0     -     4/0   4/0    -     - 
- 41 PB09           A5  9     3    1     -     4/1   4/1    -     - 
+  2 PA02           A0  2     0    -     -      -     -     -     -
+  5 PA05           A1  5     5    -     -     0/1   0/1    -     -
+  6 PA06           A2  6     6    -     -     0/2   1/0    -     -
+ 32 PB00           A3  9    12    -     -     5/2   7/0    -     -
+ 40 PB08           A4  8     2    0     -     4/0   4/0    -     -
+ 41 PB09           A5  9     3    1     -     4/1   4/1    -     -
  23 PA23           D0  7     -    -    3/1    5/0   4/1   1/7   0/3
  22 PA22           D1  6     -    -    3/0    5/1   4/0   1/6   0/2
  49 PB17           D2  1     -    -    5/1     -    6/1   3/1   0/5
@@ -364,17 +364,17 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  44 PB12           D7 12     -    -    4/0     -    4/0   3/0   0/0
  21 PA21           D8  5     -    -    5/3    3/3   7/1   1/5   0/1
  20 PA20           D9  4     -    -    5/2    3/2   7/0   1/4   0/0
-  3 PA03         AREF  3    10    -     -      -     -     -     - 
+  3 PA03         AREF  3    10    -     -      -     -     -     -
  18 PA18          D10  2     -    -    1/2    3/2   3/0   1/2   0/6
  19 PA19          D11  3     -    -    1/3    3/3   3/1   1/3   0/7
  16 PA16          D13  0     -    -    1/0    3/1   2/0   1/0   0/4
- 36 PB04     ESP_BUSY  4     -    6     -      -     -     -     - 
+ 36 PB04     ESP_BUSY  4     -    6     -      -     -     -     -
  15 PA15       ESP_CS 15     -    -    2/3    4/3   3/1   2/1   1/3
- 33 PB01    ESP_GPIO0  1    13    -     -     5/3   7/1    -     - 
- 37 PB05    ESP_RESET  5     -    7     -      -     -     -     - 
- 55 PB23      ESP_RTS  7     -    -    1/3    5/3   7/1    -     - 
-  7 PA07       ESP_RX  7     7    -     -     0/3   1/1    -     - 
-  4 PA04       ESP_TX  4     4    -     -     0/0   0/0    -     - 
+ 33 PB01    ESP_GPIO0  1    13    -     -     5/3   7/1    -     -
+ 37 PB05    ESP_RESET  5     -    7     -      -     -     -     -
+ 55 PB23      ESP_RTS  7     -    -    1/3    5/3   7/1    -     -
+  7 PA07       ESP_RX  7     7    -     -     0/3   1/1    -     -
+  4 PA04       ESP_TX  4     4    -     -     0/0   0/0    -     -
  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
@@ -383,21 +383,21 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  10 PA10     FLASH_WP 10    10    -    0/2    2/2   1/0   0/2   1/6
  14 PA14         MISO 14     -    -    2/2    4/2   3/0   2/0   1/2
  12 PA12         MOSI 12     -    -    2/0    4/1   2/0   0/6   1/2
- 54 PB22     NEOPIXEL 22     -    -    1/2    5/2   7/0    -     - 
- 38 PB06        RXLED  6     -    8     -      -     -     -     - 
+ 54 PB22     NEOPIXEL 22     -    -    1/2    5/2   7/0    -     -
+ 38 PB06        RXLED  6     -    8     -      -     -     -     -
  13 PA13          SCK 13     -    -    2/1    4/0   2/1   0/7   1/3
- 35 PB03          SCL  9    15    -     -     5/1   6/1    -     - 
- 34 PB02          SDA  2    14    -     -     5/0   6/0   2/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    - 
+ 35 PB03          SCL  9    15    -     -     5/1   6/1    -     -
+ 34 PB02          SDA  2    14    -     -     5/0   6/0   2/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    -
  62 PB30          SWO 14     -    -    7/0    5/1   0/0   4/0   0/6
- 39 PB07        TXLED  7     -    9     -      -     -     -     - 
- 24 PA24       USB_DM  8     -    -    3/2    5/2   5/0   2/2    - 
- 25 PA25       USB_DP  9     -    -    3/3    5/3   5/1    -     - 
+ 39 PB07        TXLED  7     -    9     -      -     -     -     -
+ 24 PA24       USB_DM  8     -    -    3/2    5/2   5/0   2/2    -
+ 25 PA25       USB_DP  9     -    -    3/3    5/3   5/1    -     -
  17 PA17   USB_HOSTEN  1     -    -    1/1    3/0   2/1   1/1   0/5
-  0 PA00            -  0     -    -     -     1/0   2/0    -     - 
-  1 PA01            -  1     -    -     -     1/1   2/1    -     - 
- 27 PA27            - 11     -    -     -      -     -     -     - 
+  0 PA00            -  0     -    -     -     1/0   2/0    -     -
+  1 PA01            -  1     -    -     -     1/1   2/1    -     -
+ 27 PA27            - 11     -    -     -      -     -     -     -
  63 PB31            - 15     -    -    7/1    5/0   0/1   4/1   0/7
 === ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
 
diff --git a/extmod/axtls-include/config.h b/extmod/axtls-include/config.h
index a0dd2b2b60f6d..4cb1aed9ca71c 100644
--- a/extmod/axtls-include/config.h
+++ b/extmod/axtls-include/config.h
@@ -46,7 +46,7 @@
 #define CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME ""
 #undef CONFIG_SSL_HAS_PEM
 #undef CONFIG_SSL_USE_PKCS12
-#define CONFIG_SSL_EXPIRY_TIME 
+#define CONFIG_SSL_EXPIRY_TIME
 #define CONFIG_X509_MAX_CA_CERTS 0
 #define CONFIG_SSL_MAX_CERTS 3
 #undef CONFIG_SSL_CTX_MUTEXING
@@ -58,11 +58,11 @@
 #undef CONFIG_AXTLSWRAP
 #undef CONFIG_AXHTTPD
 #undef CONFIG_HTTP_STATIC_BUILD
-#define CONFIG_HTTP_PORT 
-#define CONFIG_HTTP_HTTPS_PORT 
-#define CONFIG_HTTP_SESSION_CACHE_SIZE 
+#define CONFIG_HTTP_PORT
+#define CONFIG_HTTP_HTTPS_PORT
+#define CONFIG_HTTP_SESSION_CACHE_SIZE
 #define CONFIG_HTTP_WEBROOT ""
-#define CONFIG_HTTP_TIMEOUT 
+#define CONFIG_HTTP_TIMEOUT
 #undef CONFIG_HTTP_HAS_CGI
 #define CONFIG_HTTP_CGI_EXTENSIONS ""
 #undef CONFIG_HTTP_ENABLE_LUA
@@ -107,8 +107,8 @@
 #undef CONFIG_BIGINT_BARRETT
 #undef CONFIG_BIGINT_CRT
 #undef CONFIG_BIGINT_KARATSUBA
-#define MUL_KARATSUBA_THRESH 
-#define SQU_KARATSUBA_THRESH 
+#define MUL_KARATSUBA_THRESH
+#define SQU_KARATSUBA_THRESH
 #undef CONFIG_BIGINT_SLIDING_WINDOW
 #undef CONFIG_BIGINT_SQUARE
 #undef CONFIG_BIGINT_CHECK_ON
diff --git a/logo/FONT-LICENSE.txt b/logo/FONT-LICENSE.txt
index 69c49d84c83c2..b63d4875e7757 100644
--- a/logo/FONT-LICENSE.txt
+++ b/logo/FONT-LICENSE.txt
@@ -22,7 +22,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
diff --git a/ports/cc3200/README.md b/ports/cc3200/README.md
index 53cad3ba0ff15..093feba4e243e 100644
--- a/ports/cc3200/README.md
+++ b/ports/cc3200/README.md
@@ -61,7 +61,7 @@ below).
 
 Flashing process using TI Uniflash:
 
-- Open CCS_Uniflash and connect to the board (by default on port 22). 
+- Open CCS_Uniflash and connect to the board (by default on port 22).
 - Format the serial flash (select 1MB size in case of the CC3200-LAUNCHXL, 2MB in case of the WiPy, leave the rest unchecked).
 - Mark the following files for erasing: `/cert/ca.pem`, `/cert/client.pem`, `/cert/private.key` and `/tmp/pac.bin`.
 - Add a new file with the name of /sys/mcuimg.bin, and select the URL to point to cc3200\bootmgr\build\<BOARD_NAME>\bootloader.bin.
@@ -94,7 +94,7 @@ Once the software is running, you have two options to access the MicroPython REP
     in boot.py, so you can override it at runtime regardless of MICROPY_STDIO_UART
     setting).
 
-The board has a small file system of 192K (WiPy) or 64K (Launchpad) located in the serial flash connected to the CC3200. 
+The board has a small file system of 192K (WiPy) or 64K (Launchpad) located in the serial flash connected to the CC3200.
 SD cards are also supported, you can connect any SD card and configure the pinout using the SD class API.
 
 ## Uploading scripts:
@@ -142,7 +142,7 @@ there. Make sure to use a **v4.1 (or higher) LAUNCHXL board** when trying this p
 
 ### Note regarding FileZilla
 
-Do not use the quick connect button, instead, open the site manager and create a new configuration. In the "General" tab make 
-sure that encryption is set to: "Only use plain FTP (insecure)". In the Transfer Settings tab limit the max number of connections 
-to one, otherwise FileZilla will try to open a second command connection when retrieving and saving files, and for simplicity and 
+Do not use the quick connect button, instead, open the site manager and create a new configuration. In the "General" tab make
+sure that encryption is set to: "Only use plain FTP (insecure)". In the Transfer Settings tab limit the max number of connections
+to one, otherwise FileZilla will try to open a second command connection when retrieving and saving files, and for simplicity and
 to reduce code size, only one command and one data connections are possible.
diff --git a/ports/cc3200/application.lds b/ports/cc3200/application.lds
index 2d7dd04621306..b1ca73350eb29 100644
--- a/ports/cc3200/application.lds
+++ b/ports/cc3200/application.lds
@@ -36,7 +36,7 @@ MEMORY
 ENTRY(ResetISR)
 
 SECTIONS
-{  
+{
     /* place the FreeRTOS heap (the MicroPython stack will live here) */
     .rtos_heap (NOLOAD) :
     {
@@ -92,7 +92,7 @@ SECTIONS
         . = ALIGN(8);
         _eboot = .;
     } > SRAM
-     
+
     /* allocate the MicroPython heap */
     .heap :
     {
diff --git a/ports/cc3200/bootmgr/bootgen.sh b/ports/cc3200/bootmgr/bootgen.sh
index f4bf32540c066..a802afef6e7c9 100644
--- a/ports/cc3200/bootmgr/bootgen.sh
+++ b/ports/cc3200/bootmgr/bootgen.sh
@@ -37,7 +37,7 @@ echo "Generating bootloader..."
 # Generate an all 0 bin file
 dd if=/dev/zero of=__tmp.bin ibs=1 count=256 conv=notrunc >/dev/null 2>&1
 
-# Generate a 0 padded version of the relocator 
+# Generate a 0 padded version of the relocator
 dd if=$RELOCATOR/relocator.bin of=__tmp.bin ibs=1 conv=notrunc >/dev/null 2>&1
 
 # Concatenate the re-locator and the boot-manager
diff --git a/ports/cc3200/bootmgr/bootloader.mk b/ports/cc3200/bootmgr/bootloader.mk
index 3aeda062ce422..39a960ef4fb0a 100644
--- a/ports/cc3200/bootmgr/bootloader.mk
+++ b/ports/cc3200/bootmgr/bootloader.mk
@@ -53,7 +53,7 @@ BOOT_SL_SRC_C = $(addprefix simplelink/,\
 
 BOOT_UTIL_SRC_C = $(addprefix util/,\
 	cryptohash.c \
-	) 
+	)
 
 BOOT_MAIN_SRC_C = \
 	bootmgr/main.c
@@ -114,7 +114,7 @@ $(BUILD)/bootmgr.axf: $(OBJ) $(LINKER_SCRIPT)
 	$(ECHO) "LINK $@"
 	$(Q)$(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
 	$(Q)$(SIZE) $@
-	
+
 $(BUILD)/bootmgr.bin: $(BUILD)/bootmgr.axf
 	$(ECHO) "Create $@"
 	$(Q)$(OBJCOPY) -O binary $< $@
diff --git a/ports/cc3200/bootmgr/flc.h b/ports/cc3200/bootmgr/flc.h
index 8f05bb320e726..2a319a42fd207 100644
--- a/ports/cc3200/bootmgr/flc.h
+++ b/ports/cc3200/bootmgr/flc.h
@@ -30,7 +30,7 @@
 
    If building with a C++ compiler, make all of the definitions in this header
    have a C binding.
-  
+
 *******************************************************************************/
 #ifdef __cplusplus
 extern "C"
@@ -84,9 +84,9 @@ typedef struct _sBootInfo_t
 
 
 /******************************************************************************
-  
+
    Mark the end of the C bindings section for C++ compilers.
-  
+
 *******************************************************************************/
 #ifdef __cplusplus
 }
diff --git a/ports/cc3200/bootmgr/sl/user.h b/ports/cc3200/bootmgr/sl/user.h
index be93029d1c0a5..6753188ee2dc3 100644
--- a/ports/cc3200/bootmgr/sl/user.h
+++ b/ports/cc3200/bootmgr/sl/user.h
@@ -1,40 +1,40 @@
 /*
  * user.h - CC31xx/CC32xx Host Driver Implementation
  *
- * Copyright (C) 2014 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 
+ * Copyright (C) 2014 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 
+ *    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   
+ *    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 
+ *  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 
+ *  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 
+ *  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 __USER_H__
 #define __USER_H__
@@ -63,8 +63,8 @@ extern "C" {
 
  ******************************************************************************
  */
-  
-#include <string.h>  
+
+#include <string.h>
 #include "cc_pal.h"
 
 /*!
@@ -90,8 +90,8 @@ extern "C" {
 /*!
 	\def		CPU_FREQ_IN_MHZ
     \brief      Defines CPU frequency for Host side, for better accuracy of busy loops, if any
-    \sa             
-    \note       
+    \sa
+    \note
 
     \warning    If not set the default CPU frequency is set to 200MHz
                 This option will be deprecated in future release
@@ -330,7 +330,7 @@ extern "C" {
 
     The enable/disable API provide mechanism to enable/disable the network processor
 
-   
+
     PORTING ACTION:
         - None
     @{
@@ -568,9 +568,9 @@ extern "C" {
 */
 
 #define sl_IfUnMaskIntHdlr()								NwpUnMaskInterrupt()
-    
+
 /*!
-    \brief 		Write Handers for statistics debug on write 
+    \brief 		Write Handers for statistics debug on write
 
 	\param	 	interface handler	-	pointer to interrupt handler routine
 
@@ -583,7 +583,7 @@ extern "C" {
 
     \note       belongs to \ref ported_sec
 
-    \warning        
+    \warning
 */
 /* #define SL_START_WRITE_STAT */
 
@@ -921,7 +921,7 @@ typedef OsiLockObj_t                            _SlLockObj_t;
     \brief
     \sa
     \note           belongs to \ref ported_sec
-    \warning        
+    \warning
 */
 #define sl_Malloc(Size)                                 malloc(Size)
 
@@ -929,7 +929,7 @@ typedef OsiLockObj_t                            _SlLockObj_t;
     \brief
     \sa
     \note           belongs to \ref ported_sec
-    \warning        
+    \warning
 */
 #define sl_Free(pMem)                                   free(pMem)
 #endif
@@ -973,9 +973,9 @@ typedef OsiLockObj_t                            _SlLockObj_t;
 
 /*!
     \brief          An event handler for WLAN connection or disconnection indication
-                    This event handles async WLAN events. 
+                    This event handles async WLAN events.
                     Possible events are:
-                    SL_WLAN_CONNECT_EVENT - indicates WLAN is connected 
+                    SL_WLAN_CONNECT_EVENT - indicates WLAN is connected
                     SL_WLAN_DISCONNECT_EVENT - indicates WLAN is disconnected
     \sa
 
diff --git a/ports/cc3200/fatfs/src/drivers/stdcmd.h b/ports/cc3200/fatfs/src/drivers/stdcmd.h
index 464e2ddfaaec8..a3e617b70adac 100644
--- a/ports/cc3200/fatfs/src/drivers/stdcmd.h
+++ b/ports/cc3200/fatfs/src/drivers/stdcmd.h
@@ -1,37 +1,37 @@
 //*****************************************************************************
 // stdcmd.h
 //
-// Defines standard SD Card commands for CC3200 SDHOST module. 
+// Defines standard SD Card commands for CC3200 SDHOST module.
 //
-// Copyright (C) 2014 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 
+// Copyright (C) 2014 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 
+//    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   
+//    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 
+//  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 
+//  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 
+//  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.
 //
 //*****************************************************************************
@@ -40,7 +40,7 @@
 #define __STDCMD_H__
 
 //*****************************************************************************
-// Standard MMC/SD Card Commands                           
+// Standard MMC/SD Card Commands
 //*****************************************************************************
 #define CMD_GO_IDLE_STATE    SDHOST_CMD_0
 #define CMD_SEND_IF_COND     SDHOST_CMD_8|SDHOST_RESP_LEN_48
diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index 8bfd2fda1c8ae..e149968a51d76 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -96,7 +96,7 @@ void HAL_SystemInit (void) {
 
 void HAL_SystemDeInit (void) {
 }
- 
+
 void HAL_IncrementTick(void) {
     HAL_tickCount++;
 }
diff --git a/ports/cc3200/hal/gpio.c b/ports/cc3200/hal/gpio.c
index 59aa71aa57008..84af18e0fac3a 100644
--- a/ports/cc3200/hal/gpio.c
+++ b/ports/cc3200/hal/gpio.c
@@ -74,7 +74,7 @@ GPIOBaseValid(unsigned long ulPort)
     return((ulPort == GPIOA0_BASE) ||
            (ulPort == GPIOA1_BASE) ||
            (ulPort == GPIOA2_BASE) ||
-           (ulPort == GPIOA3_BASE) ||             
+           (ulPort == GPIOA3_BASE) ||
            (ulPort == GPIOA4_BASE));
 }
 #else
diff --git a/ports/cc3200/hal/inc/hw_memmap.h b/ports/cc3200/hal/inc/hw_memmap.h
index 244905dd20ac3..b20a271287908 100644
--- a/ports/cc3200/hal/inc/hw_memmap.h
+++ b/ports/cc3200/hal/inc/hw_memmap.h
@@ -49,7 +49,7 @@
 #define GPIOA1_BASE             0x40005000
 #define GPIOA2_BASE             0x40006000
 #define GPIOA3_BASE             0x40007000
-#define GPIOA4_BASE             0x40024000 
+#define GPIOA4_BASE             0x40024000
 #define UARTA0_BASE             0x4000C000
 #define UARTA1_BASE             0x4000D000
 #define I2CA0_BASE              0x40020000
diff --git a/ports/cc3200/hal/pin.h b/ports/cc3200/hal/pin.h
index 784e9f46354b0..61b6446772f7f 100644
--- a/ports/cc3200/hal/pin.h
+++ b/ports/cc3200/hal/pin.h
@@ -116,8 +116,8 @@ extern "C"
 #define PIN_MODE_14	 0x0000000E
 #define PIN_MODE_15	 0x0000000F
 // Note : PIN_MODE_255 is a dummy define for pinmux utility code generation
-// PIN_MODE_255 should never be used in any user code.  
-#define PIN_MODE_255 0x000000FF  
+// PIN_MODE_255 should never be used in any user code.
+#define PIN_MODE_255 0x000000FF
 
 //*****************************************************************************
 // Macros that can be used with PinDirModeSet() and returned from
diff --git a/ports/cc3200/hal/prcm.h b/ports/cc3200/hal/prcm.h
index 2f700ae2c647f..d16538e4aff14 100644
--- a/ports/cc3200/hal/prcm.h
+++ b/ports/cc3200/hal/prcm.h
@@ -189,8 +189,8 @@ unsigned char ulRstReg;
 #define PRCM_SSPI                 0x00000013
 #define PRCM_I2CA0                0x00000014
 // Note : PRCM_ADC is a dummy define for pinmux utility code generation
-// PRCM_ADC should never be used in any user code. 
-#define PRCM_ADC                  0x000000FF 
+// PRCM_ADC should never be used in any user code.
+#define PRCM_ADC                  0x000000FF
 
 //*****************************************************************************
 // User bits in the PRCM persistent registers
diff --git a/ports/cc3200/hal/spi.c b/ports/cc3200/hal/spi.c
index 8c8c6782897e4..3a6371fd82e02 100644
--- a/ports/cc3200/hal/spi.c
+++ b/ports/cc3200/hal/spi.c
@@ -762,7 +762,7 @@ SPIConfigSetExpClk(unsigned long ulBase,unsigned long ulSPIClk,
   // Enable software control Chip Select, Init delay
   // and 3-pin mode
   //
-  ulRegData |= (((ulConfig >> 24) | ulMode) & 0xFF); 
+  ulRegData |= (((ulConfig >> 24) | ulMode) & 0xFF);
 
   //
   // Write the configuration
diff --git a/ports/cc3200/simplelink/oslib/osi.h b/ports/cc3200/simplelink/oslib/osi.h
index 11fe61bb63ac9..4ab811fc8ad7a 100644
--- a/ports/cc3200/simplelink/oslib/osi.h
+++ b/ports/cc3200/simplelink/oslib/osi.h
@@ -3,35 +3,35 @@
 //
 // MACRO and Function prototypes for TI-RTOS and Free-RTOS API calls
 //
-// Copyright (C) 2014 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 
+// Copyright (C) 2014 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 
+//    Redistributions of source code must retain the above copyright
 //    notice, this list zof 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   
+//    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 
+//  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 
+//  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 
+//  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.
 //
 //*****************************************************************************
@@ -367,23 +367,23 @@ OsiReturnVal_e osi_Spawn(P_OSI_SPAWN_ENTRY pEntry , void* pValue , unsigned long
 /*******************************************************************************
 
 This function creates a message queue that is typically used for inter thread
-communication. 
+communication.
 
 Parameters:
 
 	pMsgQ		-	pointer to the message queue control block
 	pMsgQName	-	pointer to the name of the message queue
-	MsgSize		-	the size of the message. 
+	MsgSize		-	the size of the message.
 
 			NOTICE: THE MESSGAE SIZE MUST BE SMALLER THAN 16
 
 	MaxMsgs		-	maximum number of messages.
 
-Please note that this function allocates the entire memory required 
-for the maximum number of messages (MsgSize * MaxMsgs). 
+Please note that this function allocates the entire memory required
+for the maximum number of messages (MsgSize * MaxMsgs).
 
 ********************************************************************************/
-OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* 		pMsgQ , 
+OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* 		pMsgQ ,
 							  char*				pMsgQName,
 							  unsigned long 		MsgSize,
 							  unsigned long 		MaxMsgs);
@@ -392,7 +392,7 @@ OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* 		pMsgQ ,
 
 This function deletes a specific message queue.
 All threads suspended waiting for a message from this queue are resumed with
-an error return value. 
+an error return value.
 
 Parameters:
 
@@ -406,11 +406,11 @@ OsiReturnVal_e osi_MsgQDelete(OsiMsgQ_t* pMsgQ);
 
 This function writes a message to a specific message queue.
 
-Notice that the message is copied to the queue from the memory area specified 
+Notice that the message is copied to the queue from the memory area specified
 by pMsg pointer.
 
 --------------------------------------------------------------------------------
-THIS FUNCTION COULD BE CALLED FROM ISR AS LONG AS THE TIMEOUT PARAMETER IS 
+THIS FUNCTION COULD BE CALLED FROM ISR AS LONG AS THE TIMEOUT PARAMETER IS
 SET TO "OSI_NO_WAIT"
 --------------------------------------------------------------------------------
 
@@ -418,7 +418,7 @@ SET TO "OSI_NO_WAIT"
 
 	pMsgQ		-	pointer to the message queue control block
 	pMsg		- 	pointer to the message
-	Timeout		-	numeric value specifies the maximum number of mSec to stay 
+	Timeout		-	numeric value specifies the maximum number of mSec to stay
 					suspended while waiting for available space for the message
 
 ********************************************************************************/
@@ -428,14 +428,14 @@ OsiReturnVal_e osi_MsgQWrite(OsiMsgQ_t* pMsgQ, void* pMsg , OsiTime_t Timeout);
 /*******************************************************************************
 
 This function retrieves a message from the specified message queue. The
-retrieved message is copied from the queue into the memory area specified by 
-the pMsg pointer 
+retrieved message is copied from the queue into the memory area specified by
+the pMsg pointer
 
 Parameters:
 
 	pMsgQ		-	pointer to the message queue control block
 	pMsg		- 	pointer that specify the location where to copy the message
-	Timeout		-	numeric value specifies the maximum number of mSec to stay 
+	Timeout		-	numeric value specifies the maximum number of mSec to stay
 					suspended while waiting for a message to be available
 
 ********************************************************************************/
@@ -478,7 +478,7 @@ void mem_Free(void *pMem);
 	\param	Size 		- 	Size of the memory to be set
     \sa
     \note
-    \warning        
+    \warning
 */
 void  mem_set(void *pBuf,int Val,size_t Size);
 
@@ -489,7 +489,7 @@ void  mem_set(void *pBuf,int Val,size_t Size);
 	\param	Size 		- 	Size of the memory to be copied
 	\return void
     \note
-    \warning        
+    \warning
 */
 void  mem_copy(void *pDst, void *pSrc,size_t Size);
 
@@ -497,7 +497,7 @@ void  mem_copy(void *pDst, void *pSrc,size_t Size);
     \brief			Enter Critical Section
     \sa
     \note
-    \warning        
+    \warning
 */
 void osi_EnterCritical(void);
 
@@ -505,7 +505,7 @@ void osi_EnterCritical(void);
     \brief			Exit Critical Section
     \sa
     \note
-    \warning        
+    \warning
 */
 void osi_ExitCritical(void);
 
@@ -563,7 +563,7 @@ typedef struct
     P_OSI_SPAWN_ENTRY pEntry;
     void* pValue;
 }tSimpleLinkSpawnMsg;
-  
+
 /* The queue used to send message to simple link spawn task. */
 extern void* xSimpleLinkSpawnQueue;
 
diff --git a/ports/cc3200/simplelink/oslib/osi_freertos.c b/ports/cc3200/simplelink/oslib/osi_freertos.c
index 53822add73d52..dcc7a2a7c7fbd 100644
--- a/ports/cc3200/simplelink/oslib/osi_freertos.c
+++ b/ports/cc3200/simplelink/oslib/osi_freertos.c
@@ -3,35 +3,35 @@
 //
 // Interface APIs for free-rtos function calls
 //
-// Copyright (C) 2014 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 
+// Copyright (C) 2014 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 
+//    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   
+//    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 
+//  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 
+//  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 
+//  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.
 //
 //*****************************************************************************
@@ -57,7 +57,7 @@ static void vSimpleLinkSpawnTask( void *pvParameters );
 //Queue Handler
 QueueHandle_t xSimpleLinkSpawnQueue = NULL;
 TaskHandle_t xSimpleLinkSpawnTaskHndl = NULL;
-// Queue size 
+// Queue size
 #define slQUEUE_SIZE				( 3 )
 #define SL_SPAWN_MAX_WAIT_MS        ( 200 )
 
@@ -282,7 +282,7 @@ OsiReturnVal_e osi_TaskCreate(P_OSI_TASK_ENTRY pEntry,const signed char * const
                               unsigned long uxPriority,OsiTaskHandle* pTaskHandle)
 {
 	ASSERT (pdPASS == xTaskCreate( pEntry, (char const*)pcName,
-                                (usStackDepth/(sizeof( portSTACK_TYPE ))), 
+                                (usStackDepth/(sizeof( portSTACK_TYPE ))),
                                 pvParameters,(unsigned portBASE_TYPE)uxPriority,
                                 (TaskHandle_t*)pTaskHandle ));
 	return OSI_OK;
@@ -417,7 +417,7 @@ OsiReturnVal_e osi_Spawn(P_OSI_SPAWN_ENTRY pEntry , void* pValue , unsigned long
 
 
 /*!
-	\brief 	This is the simplelink spawn task to call SL callback from a different context 
+	\brief 	This is the simplelink spawn task to call SL callback from a different context
 
 	\param	pvParameters		-	pointer to the task parameter
 
@@ -510,7 +510,7 @@ void VDeleteSimpleLinkSpawnTask( void )
 	\note
 	\warning
 */
-OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* 		pMsgQ , 
+OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* 		pMsgQ ,
 			      char*			pMsgQName,
 			      unsigned long 		MsgSize,
 			      unsigned long		MaxMsgs)
@@ -607,8 +607,8 @@ void * mem_Malloc(unsigned long Size)
 	\brief 	This function to call the memory de-allocation function of the FREERTOS
 
 	\param	pMem		-	pointer to the memory which needs to be freed
-	
-	\return - void 
+
+	\return - void
 	\note
 	\warning
 */
@@ -622,7 +622,7 @@ void mem_Free(void *pMem)
 	\param	pBuf	     -	 pointer to the memory to be fill
         \param  Val          -   Value to be fill
         \param  Size         -   Size of the memory which needs to be fill
-	\return - void 
+	\return - void
 	\note
 	\warning
 */
@@ -637,8 +637,8 @@ void  mem_set(void *pBuf,int Val,size_t Size)
       \param	pDst	-	pointer to the destination
       \param pSrc     -   pointer to the source
       \param Size     -   Size of the memory which needs to be copy
-      
-      \return - void 
+
+      \return - void
       \note
       \warning
 */
@@ -650,8 +650,8 @@ void  mem_copy(void *pDst, void *pSrc,size_t Size)
 
 /*!
 	\brief 	This function use to entering into critical section
-	\param	void		
-	\return - void 
+	\param	void
+	\return - void
 	\note
 	\warning
 */
@@ -663,8 +663,8 @@ void osi_EnterCritical(void)
 
 /*!
 	\brief 	This function use to exit critical section
-	\param	void		
-	\return - void 
+	\param	void
+	\return - void
 	\note
 	\warning
 */
diff --git a/ports/cc3200/simplelink/user.h b/ports/cc3200/simplelink/user.h
index d3f6d4adfb6fd..3ab0b09a7780b 100644
--- a/ports/cc3200/simplelink/user.h
+++ b/ports/cc3200/simplelink/user.h
@@ -1,40 +1,40 @@
 /*
  * user.h - CC31xx/CC32xx Host Driver Implementation
  *
- * Copyright (C) 2014 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 
+ * Copyright (C) 2014 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 
+ *    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   
+ *    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 
+ *  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 
+ *  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 
+ *  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 __USER_H__
 #define __USER_H__
@@ -63,8 +63,8 @@ extern "C" {
 
  ******************************************************************************
  */
-  
-#include <string.h>  
+
+#include <string.h>
 #include "cc_pal.h"
 #include "debug.h"
 
@@ -91,8 +91,8 @@ extern "C" {
 /*!
 	\def		CPU_FREQ_IN_MHZ
     \brief      Defines CPU frequency for Host side, for better accuracy of busy loops, if any
-    \sa             
-    \note       
+    \sa
+    \note
 
     \warning    If not set the default CPU frequency is set to 200MHz
                 This option will be deprecated in future release
@@ -331,7 +331,7 @@ extern "C" {
 
     The enable/disable API provide mechanism to enable/disable the network processor
 
-   
+
     PORTING ACTION:
         - None
     @{
@@ -569,9 +569,9 @@ extern "C" {
 */
 
 #define sl_IfUnMaskIntHdlr()								NwpUnMaskInterrupt()
-    
+
 /*!
-    \brief 		Write Handers for statistics debug on write 
+    \brief 		Write Handers for statistics debug on write
 
 	\param	 	interface handler	-	pointer to interrupt handler routine
 
@@ -584,7 +584,7 @@ extern "C" {
 
     \note       belongs to \ref ported_sec
 
-    \warning        
+    \warning
 */
 /* #define SL_START_WRITE_STAT */
 
@@ -921,7 +921,7 @@ typedef OsiLockObj_t                            _SlLockObj_t;
     \brief
     \sa
     \note           belongs to \ref ported_sec
-    \warning        
+    \warning
 */
 #define sl_Malloc(Size)                                 malloc(Size)
 
@@ -929,7 +929,7 @@ typedef OsiLockObj_t                            _SlLockObj_t;
     \brief
     \sa
     \note           belongs to \ref ported_sec
-    \warning        
+    \warning
 */
 #define sl_Free(pMem)                                   free(pMem)
 #endif
@@ -973,9 +973,9 @@ typedef OsiLockObj_t                            _SlLockObj_t;
 
 /*!
     \brief          An event handler for WLAN connection or disconnection indication
-                    This event handles async WLAN events. 
+                    This event handles async WLAN events.
                     Possible events are:
-                    SL_WLAN_CONNECT_EVENT - indicates WLAN is connected 
+                    SL_WLAN_CONNECT_EVENT - indicates WLAN is connected
                     SL_WLAN_DISCONNECT_EVENT - indicates WLAN is disconnected
     \sa
 
diff --git a/ports/embed/embed.mk b/ports/embed/embed.mk
index 84d45accd2d71..bea5e5d65bbab 100644
--- a/ports/embed/embed.mk
+++ b/ports/embed/embed.mk
@@ -1,7 +1,7 @@
 # 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.
diff --git a/ports/esp32/README.ulp.md b/ports/esp32/README.ulp.md
index cbc5771a9042f..ada19ec193188 100644
--- a/ports/esp32/README.ulp.md
+++ b/ports/esp32/README.ulp.md
@@ -13,7 +13,7 @@ ULP_LD_SCRIPT := esp32.ulp.ld
 SRC_PATH := src
 BUILD_PATH := build
 
-include $(ESPIDF)/components/ulp/Makefile.projbuild 
+include $(ESPIDF)/components/ulp/Makefile.projbuild
 
 ULP_ELF := $(ULP_APP_NAME).elf
 ULP_MAP := $(ULP_ELF:.elf=.map)
@@ -29,7 +29,7 @@ ULP_LISTINGS := $(notdir $(ULP_S_SOURCES:.S=.ulp.lst))
 
 .PHONY: all clean
 
-all: $(BUILD_PATH) $(BUILD_PATH)/$(ULP_BIN) 
+all: $(BUILD_PATH) $(BUILD_PATH)/$(ULP_BIN)
 
 clean:
 	rm -rf $(BUILD_PATH)
@@ -42,7 +42,7 @@ $(BUILD_PATH)/$(ULP_APP_NAME).ld: $(SRC_PATH)/$(ULP_LD_SCRIPT)
 	cpp -P $< -o $@
 
 # Generate preprocessed assembly files.
-# To inspect these preprocessed files, add a ".PRECIOUS: %.ulp.pS" rule. 
+# To inspect these preprocessed files, add a ".PRECIOUS: %.ulp.pS" rule.
 $(BUILD_PATH)/%.ulp.pS: $(SRC_PATH)/%.S
 	cpp $< -o $@
 
@@ -58,7 +58,7 @@ $(BUILD_PATH)/$(ULP_ELF): $(BUILD_PATH)/$(ULP_OBJECTS) $(BUILD_PATH)/$(ULP_APP_N
 $(ULP_SYM): $(ULP_ELF)
 	$(ULP_NM) -g -f posix $< > $@
 
-# Dump the binary for inclusion into the project 
+# Dump the binary for inclusion into the project
 $(BUILD_PATH)/$(ULP_BIN): $(BUILD_PATH)/$(ULP_ELF)
 	$(ULP_OBJCOPY) -O binary $< $@
 ```
@@ -90,11 +90,11 @@ SECTIONS
         . = ALIGN(4);
         *(.bss)
     } >ram
-    
+
     .header : AT(0)
     {
         LONG(ULP_BIN_MAGIC)
-        SHORT(LOADADDR(.text)) 
+        SHORT(LOADADDR(.text))
         SHORT(SIZEOF(.text))
         SHORT(SIZEOF(.data))
         SHORT(SIZEOF(.bss))
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
index 1238ded848c0a..92f3df57c9b84 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
@@ -17,11 +17,11 @@ Now you have all files at hand that you will need for updating.
 
 2. Push and hold the "Boot" button, then press "Reset", and release both buttons.
 
-3. Run the commands: 
+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 
+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:
 ```
@@ -32,7 +32,7 @@ You can put all of that in a script. Just add a short wait before the 3rd comman
 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. 
+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
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 2cf7d33c6331d..63e68e1e57994 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -4,7 +4,7 @@ MCU_VARIANT = MIMXRT1052DVL6B
 MICROPY_FLOAT_IMPL = double
 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/common.ld b/ports/mimxrt/boards/common.ld
index 6c78fea319f96..587fc82a1953d 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -1,7 +1,7 @@
 /*
 ** ###################################################################
 ** Linker script inspired by NXP linker script for MIMXRT10xx
-** 
+**
 ** Copyright for original linker script:
 **     Copyright 2016 Freescale Semiconductor, Inc.
 **     Copyright 2016-2018 NXP
@@ -26,7 +26,7 @@ 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 
+ * 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!
  */
@@ -41,7 +41,7 @@ MEMORY
   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_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
@@ -59,8 +59,8 @@ SECTIONS
   __sdram_start = sdram_start;
   #endif
   __vfs_start = ORIGIN(m_vfs);
-  __vfs_end = __vfs_start + LENGTH(m_vfs);  
-  
+  __vfs_end = __vfs_start + LENGTH(m_vfs);
+
   .flash_config :
   {
     . = ALIGN(4);
@@ -177,7 +177,7 @@ SECTIONS
     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 */
 
@@ -206,7 +206,7 @@ SECTIONS
     *(.text*)
     . = ALIGN(4);
     __ram_function_end__ = .;
-  } > m_itcm  
+  } > m_itcm
 
   __NDATA_ROM = __RAM_FUNCTIONS_ROM + (__ram_function_end__ - __ram_function_start__);
   .ncache.init : AT(__NDATA_ROM)
diff --git a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
index 8e6f75b36ce42..cc7e7c3683da6 100644
--- a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
@@ -3,6 +3,6 @@ MCU_VARIANT = nrf91
 MCU_SUB_VARIANT = nrf9160
 LD_FILES += boards/nrf9160_1M_256k.ld
 
-NRF_DEFINES += -DNRF9160_XXAA -DNRF_TRUSTZONE_NONSECURE 
+NRF_DEFINES += -DNRF9160_XXAA -DNRF_TRUSTZONE_NONSECURE
 
 MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
index f993c7dc53623..ecf9259042e6a 100644
--- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
@@ -45,4 +45,4 @@ built, the target can be deployed to the device as described in
 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/). 
+wiki](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/programming/).
diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh
index 6498278f496c7..7886682b718e0 100755
--- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh
+++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh
@@ -78,13 +78,13 @@ function download_s140_nrf52_7_3_0
 
 SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-if [ $# -eq 0 ]; then 
+if [ $# -eq 0 ]; then
     echo "No Bluetooth LE stack defined, downloading all."
     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 
+else
     case $1 in
         "s110_nrf51" )
             download_s110_nrf51_8_0_0 ${SCRIPT_DIR} ;;
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index f8b46fe453902..b4b9733182bc0 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -93,12 +93,12 @@ CFLAGS_CORTEX_M = -mthumb
 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 
+CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),m33))
-CFLAGS_CORTEX_M += -mfpu=fpv5-sp-d16 -mfloat-abi=hard 
+CFLAGS_CORTEX_M += -mfpu=fpv5-sp-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 endif
 
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 3a46fdaa7f47b..392fed29b1ff4 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -41,7 +41,7 @@ endif()
 set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
 
 # Include board config, it may override MICROPY_FROZEN_MANIFEST
-include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake) 
+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)
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 2947e4119beac..19f6f420e1fff 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -282,7 +282,7 @@ SRC_C += \
 SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
-    
+
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0))
 CSUPEROPT = -Os # save some code space
 SRC_O += \
diff --git a/ports/stm32/boards/stm32h7b3.ld b/ports/stm32/boards/stm32h7b3.ld
index cccea983fa89e..83a261029fb8b 100644
--- a/ports/stm32/boards/stm32h7b3.ld
+++ b/ports/stm32/boards/stm32h7b3.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/usbdev/class/inc/usbd_cdc_msc_hid.h b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
index d6c38bbd07e34..2c90ce165e2a7 100644
--- a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
+++ b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
@@ -68,22 +68,22 @@ typedef struct _USBD_STORAGE {
 } USBD_StorageTypeDef;
 
 typedef struct {
-  uint32_t                 max_lun;   
-  uint32_t                 interface; 
+  uint32_t                 max_lun;
+  uint32_t                 interface;
   uint8_t                  bot_state;
-  uint8_t                  bot_status;  
+  uint8_t                  bot_status;
   uint16_t                 bot_data_length;
-  uint8_t                  bot_data[MSC_MEDIA_PACKET];  
+  uint8_t                  bot_data[MSC_MEDIA_PACKET];
   USBD_MSC_BOT_CBWTypeDef  cbw;
   USBD_MSC_BOT_CSWTypeDef  csw;
-  
+
   USBD_SCSI_SenseTypeDef   scsi_sense [SENSE_LIST_DEEPTH];
   uint8_t                  scsi_sense_head;
   uint8_t                  scsi_sense_tail;
-  
+
   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/tests/README.md b/tests/README.md
index 3bc626bf9e416..54dd078053ef0 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -177,7 +177,7 @@ internal_bench/bytebuf:
 
 ## Test key/certificates
 
-SSL/TLS tests in `multi_net` and `net_inet` use a 
+SSL/TLS tests in `multi_net` and `net_inet` use a
 self-signed key/cert pair that is randomly generated and to be used for
 testing/demonstration only. You should always generate your own key/cert.
 
diff --git a/tests/basics/generator_throw.py b/tests/basics/generator_throw.py
index 1b43c125eabc1..067ab2b8eb2a1 100644
--- a/tests/basics/generator_throw.py
+++ b/tests/basics/generator_throw.py
@@ -2,7 +2,7 @@
 def gen():
     yield 123
     yield 456
-        
+
 g = gen()
 print(next(g))
 try:
@@ -31,7 +31,7 @@ def gen():
     except GeneratorExit as e:
         print('GeneratorExit', repr(e.args))
     yield 456
-        
+
 # thrown a class
 g = gen()
 print(next(g))
diff --git a/tests/basics/int_big_and2.py b/tests/basics/int_big_and2.py
index f8c81fe0cd22d..045a90ef75035 100644
--- a/tests/basics/int_big_and2.py
+++ b/tests/basics/int_big_and2.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      & 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@
 print( 40019818573920230246248826511203818792007462193311949166285967147
      & 9487909752)
 
-# test - - 
+# test - -
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      & -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_and3.py b/tests/basics/int_big_and3.py
index 788ecd823bc8f..7a3b415af71d1 100644
--- a/tests/basics/int_big_and3.py
+++ b/tests/basics/int_big_and3.py
@@ -1,4 +1,4 @@
-# test - + 
+# test - +
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      & 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@
 print( -40019818573920230246248826511203818792007462193311949166285967147
      & 9487909752)
 
-# test + - 
+# test + -
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      & -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_or.py b/tests/basics/int_big_or.py
index 17d9935265fce..ccded377812b0 100644
--- a/tests/basics/int_big_or.py
+++ b/tests/basics/int_big_or.py
@@ -3,7 +3,7 @@
 a = 0xfffffffffffffffffffffffffffff
 print(a | (1 << 200))
 
-# test + + 
+# test + +
 
 print(0 | (1 << 80))
 print((1 << 80) | (1 << 80))
@@ -15,7 +15,7 @@
 print(a | a == 0)
 print(bool(a | a))
 
-# test - + 
+# test - +
 
 print((-1 << 80) | (1 << 80))
 print((-1 << 80) | 0)
@@ -25,7 +25,7 @@
 print((-a) | a == 0)
 print(bool((-a) | a))
 
-# test + - 
+# test + -
 
 print(0 | (-1 << 80))
 print((1 << 80) | (-1 << 80))
@@ -35,7 +35,7 @@
 print(a | (-a) == 0)
 print(bool(a | (-a)))
 
-# test - - 
+# test - -
 
 print((-1 << 80) | (-1 << 80))
 
diff --git a/tests/basics/int_big_or2.py b/tests/basics/int_big_or2.py
index 255495150ab74..92d76c77034f1 100644
--- a/tests/basics/int_big_or2.py
+++ b/tests/basics/int_big_or2.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 print( 97989513389222316022151446562729620153292831887555425160965597396
      | 23716683549865351578586448630079789776107310103486834795830390982)
 
@@ -23,7 +23,7 @@
 print( 40019818573920230246248826511203818792007462193311949166285967147
      | 9487909752)
 
-# test - - 
+# test - -
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      | -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_or3.py b/tests/basics/int_big_or3.py
index 07edaea2df912..212b3da8a6442 100644
--- a/tests/basics/int_big_or3.py
+++ b/tests/basics/int_big_or3.py
@@ -1,4 +1,4 @@
-# test - + 
+# test - +
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      | 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@
 print( -40019818573920230246248826511203818792007462193311949166285967147
      | 9487909752)
 
-# test + - 
+# test + -
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      | -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_xor.py b/tests/basics/int_big_xor.py
index cd1d9ae97fa75..28b191d3d948e 100644
--- a/tests/basics/int_big_xor.py
+++ b/tests/basics/int_big_xor.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 
 print(0 ^ (1 << 80))
 print((1 << 80) ^ (1 << 80))
@@ -10,7 +10,7 @@
 print(a ^ a == 0)
 print(bool(a ^ a))
 
-# test - + 
+# test - +
 
 print((-1 << 80) ^ (1 << 80))
 print((-1 << 80) ^ 0)
@@ -22,7 +22,7 @@
 i = -1
 print(i ^ 0xffffffffffffffff) # carry overflows to higher digit
 
-# test + - 
+# test + -
 
 print(0 ^ (-1 << 80))
 print((1 << 80) ^ (-1 << 80))
@@ -32,7 +32,7 @@
 print(a ^ (-a) == 0)
 print(bool(a ^ (-a)))
 
-# test - - 
+# test - -
 
 print((-1 << 80) ^ (-1 << 80))
 
diff --git a/tests/basics/int_big_xor2.py b/tests/basics/int_big_xor2.py
index b5b3db60c69f7..21ef842f86620 100644
--- a/tests/basics/int_big_xor2.py
+++ b/tests/basics/int_big_xor2.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      ^ 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@
 print( 40019818573920230246248826511203818792007462193311949166285967147
      ^ 9487909752)
 
-# test - - 
+# test - -
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      ^ -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_xor3.py b/tests/basics/int_big_xor3.py
index 00881e3740985..ff5e9aeff2f9e 100644
--- a/tests/basics/int_big_xor3.py
+++ b/tests/basics/int_big_xor3.py
@@ -1,4 +1,4 @@
-# test - + 
+# test - +
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      ^ 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@
 print( -40019818573920230246248826511203818792007462193311949166285967147
      ^ 9487909752)
 
-# test + - 
+# test + -
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      ^ -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/io/data/bigfile1 b/tests/io/data/bigfile1
index 5afbf01a6f4e5..777c436a21f2f 100644
--- a/tests/io/data/bigfile1
+++ b/tests/io/data/bigfile1
@@ -1,147 +1,147 @@
 {
     "info": {
-        "maintainer": null, 
-        "docs_url": "", 
-        "requires_python": null, 
-        "maintainer_email": null, 
-        "cheesecake_code_kwalitee_id": null, 
-        "keywords": null, 
-        "package_url": "http://pypi.python.org/pypi/micropython-uasyncio", 
-        "author": "MicroPython Developers", 
-        "author_email": "micro-python@googlegroups.com", 
-        "download_url": "UNKNOWN", 
-        "platform": "UNKNOWN", 
-        "version": "0.8.1", 
-        "cheesecake_documentation_id": null, 
-        "_pypi_hidden": false, 
-        "description": "Lightweight asyncio-like library built around native Python coroutines, not around un-Python devices like callback mess.", 
-        "release_url": "http://pypi.python.org/pypi/micropython-uasyncio/0.8.1", 
+        "maintainer": null,
+        "docs_url": "",
+        "requires_python": null,
+        "maintainer_email": null,
+        "cheesecake_code_kwalitee_id": null,
+        "keywords": null,
+        "package_url": "http://pypi.python.org/pypi/micropython-uasyncio",
+        "author": "MicroPython Developers",
+        "author_email": "micro-python@googlegroups.com",
+        "download_url": "UNKNOWN",
+        "platform": "UNKNOWN",
+        "version": "0.8.1",
+        "cheesecake_documentation_id": null,
+        "_pypi_hidden": false,
+        "description": "Lightweight asyncio-like library built around native Python coroutines, not around un-Python devices like callback mess.",
+        "release_url": "http://pypi.python.org/pypi/micropython-uasyncio/0.8.1",
         "downloads": {
-            "last_month": 942, 
-            "last_week": 173, 
+            "last_month": 942,
+            "last_week": 173,
             "last_day": 29
-        }, 
-        "_pypi_ordering": 6, 
-        "classifiers": [], 
-        "name": "micropython-uasyncio", 
-        "bugtrack_url": null, 
-        "license": "MIT", 
-        "summary": "uasyncio module for MicroPython", 
-        "home_page": "https://github.com/micropython/micropython/issues/405", 
-        "stable_version": null, 
+        },
+        "_pypi_ordering": 6,
+        "classifiers": [],
+        "name": "micropython-uasyncio",
+        "bugtrack_url": null,
+        "license": "MIT",
+        "summary": "uasyncio module for MicroPython",
+        "home_page": "https://github.com/micropython/micropython/issues/405",
+        "stable_version": null,
         "cheesecake_installability_id": null
-    }, 
+    },
     "releases": {
         "0.8": [
             {
-                "has_sig": false, 
-                "upload_time": "2015-01-01T23:52:41", 
-                "comment_text": "", 
-                "python_version": "source", 
-                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.tar.gz", 
-                "md5_digest": "5df4d0d6b5fdb7c05fc418e5785e1336", 
-                "downloads": 352, 
-                "filename": "micropython-uasyncio-0.8.tar.gz", 
-                "packagetype": "sdist", 
+                "has_sig": false,
+                "upload_time": "2015-01-01T23:52:41",
+                "comment_text": "",
+                "python_version": "source",
+                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.tar.gz",
+                "md5_digest": "5df4d0d6b5fdb7c05fc418e5785e1336",
+                "downloads": 352,
+                "filename": "micropython-uasyncio-0.8.tar.gz",
+                "packagetype": "sdist",
                 "size": 2476
             }
-        ], 
+        ],
         "0.6.2": [
             {
-                "has_sig": false, 
-                "upload_time": "2014-10-18T11:26:52", 
-                "comment_text": "", 
-                "python_version": "source", 
-                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.2.tar.gz", 
-                "md5_digest": "c85fa7c11ef437f4e73c1fcd639db066", 
-                "downloads": 475, 
-                "filename": "micropython-uasyncio-0.6.2.tar.gz", 
-                "packagetype": "sdist", 
+                "has_sig": false,
+                "upload_time": "2014-10-18T11:26:52",
+                "comment_text": "",
+                "python_version": "source",
+                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.2.tar.gz",
+                "md5_digest": "c85fa7c11ef437f4e73c1fcd639db066",
+                "downloads": 475,
+                "filename": "micropython-uasyncio-0.6.2.tar.gz",
+                "packagetype": "sdist",
                 "size": 3262
             }
-        ], 
+        ],
         "0.6.1": [
             {
-                "has_sig": false, 
-                "upload_time": "2014-10-11T02:21:17", 
-                "comment_text": "", 
-                "python_version": "source", 
-                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.1.tar.gz", 
-                "md5_digest": "48cb0db7d8249d5f4a86db9c4b302d03", 
-                "downloads": 507, 
-                "filename": "micropython-uasyncio-0.6.1.tar.gz", 
-                "packagetype": "sdist", 
+                "has_sig": false,
+                "upload_time": "2014-10-11T02:21:17",
+                "comment_text": "",
+                "python_version": "source",
+                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.1.tar.gz",
+                "md5_digest": "48cb0db7d8249d5f4a86db9c4b302d03",
+                "downloads": 507,
+                "filename": "micropython-uasyncio-0.6.1.tar.gz",
+                "packagetype": "sdist",
                 "size": 3237
             }
-        ], 
+        ],
         "0.8.1": [
             {
-                "has_sig": false, 
-                "upload_time": "2015-01-04T20:02:03", 
-                "comment_text": "", 
-                "python_version": "source", 
-                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz", 
-                "md5_digest": "940d2647b8355289d54de543ff710b05", 
-                "downloads": 249, 
-                "filename": "micropython-uasyncio-0.8.1.tar.gz", 
-                "packagetype": "sdist", 
+                "has_sig": false,
+                "upload_time": "2015-01-04T20:02:03",
+                "comment_text": "",
+                "python_version": "source",
+                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz",
+                "md5_digest": "940d2647b8355289d54de543ff710b05",
+                "downloads": 249,
+                "filename": "micropython-uasyncio-0.8.1.tar.gz",
+                "packagetype": "sdist",
                 "size": 2484
             }
-        ], 
+        ],
         "0.7": [
             {
-                "has_sig": false, 
-                "upload_time": "2014-10-23T22:02:11", 
-                "comment_text": "", 
-                "python_version": "source", 
-                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.tar.gz", 
-                "md5_digest": "81250a0ee6649b5117878d5788ba96d3", 
-                "downloads": 457, 
-                "filename": "micropython-uasyncio-0.7.tar.gz", 
-                "packagetype": "sdist", 
+                "has_sig": false,
+                "upload_time": "2014-10-23T22:02:11",
+                "comment_text": "",
+                "python_version": "source",
+                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.tar.gz",
+                "md5_digest": "81250a0ee6649b5117878d5788ba96d3",
+                "downloads": 457,
+                "filename": "micropython-uasyncio-0.7.tar.gz",
+                "packagetype": "sdist",
                 "size": 2277
             }
-        ], 
+        ],
         "0.7.1": [
             {
-                "has_sig": false, 
-                "upload_time": "2014-11-04T00:56:16", 
-                "comment_text": "", 
-                "python_version": "source", 
-                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.1.tar.gz", 
-                "md5_digest": "21eda0501142830730cd82e1b0fa1a33", 
-                "downloads": 412, 
-                "filename": "micropython-uasyncio-0.7.1.tar.gz", 
-                "packagetype": "sdist", 
+                "has_sig": false,
+                "upload_time": "2014-11-04T00:56:16",
+                "comment_text": "",
+                "python_version": "source",
+                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.1.tar.gz",
+                "md5_digest": "21eda0501142830730cd82e1b0fa1a33",
+                "downloads": 412,
+                "filename": "micropython-uasyncio-0.7.1.tar.gz",
+                "packagetype": "sdist",
                 "size": 2474
             }
-        ], 
+        ],
         "0.6": [
             {
-                "has_sig": false, 
-                "upload_time": "2014-08-27T00:17:45", 
-                "comment_text": "", 
-                "python_version": "source", 
-                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.tar.gz", 
-                "md5_digest": "9d0b15108c5ade3a6902c9370c9dacf1", 
-                "downloads": 668, 
-                "filename": "micropython-uasyncio-0.6.tar.gz", 
-                "packagetype": "sdist", 
+                "has_sig": false,
+                "upload_time": "2014-08-27T00:17:45",
+                "comment_text": "",
+                "python_version": "source",
+                "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.tar.gz",
+                "md5_digest": "9d0b15108c5ade3a6902c9370c9dacf1",
+                "downloads": 668,
+                "filename": "micropython-uasyncio-0.6.tar.gz",
+                "packagetype": "sdist",
                 "size": 3246
             }
         ]
-    }, 
+    },
     "urls": [
         {
-            "has_sig": false, 
-            "upload_time": "2015-01-04T20:02:03", 
-            "comment_text": "", 
-            "python_version": "source", 
-            "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz", 
-            "md5_digest": "940d2647b8355289d54de543ff710b05", 
-            "downloads": 249, 
-            "filename": "micropython-uasyncio-0.8.1.tar.gz", 
-            "packagetype": "sdist", 
+            "has_sig": false,
+            "upload_time": "2015-01-04T20:02:03",
+            "comment_text": "",
+            "python_version": "source",
+            "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz",
+            "md5_digest": "940d2647b8355289d54de543ff710b05",
+            "downloads": 249,
+            "filename": "micropython-uasyncio-0.8.1.tar.gz",
+            "packagetype": "sdist",
             "size": 2484
         }
     ]
diff --git a/tests/ports/cc3200/pin.py b/tests/ports/cc3200/pin.py
index 9ffd152e93ea7..43537bba5ce07 100644
--- a/tests/ports/cc3200/pin.py
+++ b/tests/ports/cc3200/pin.py
@@ -1,7 +1,7 @@
-""" 
-This test need a set of pins which can be set as inputs and have no external 
+"""
+This test need a set of pins which can be set as inputs and have no external
 pull up or pull down connected.
-GP12 and GP17 must be connected together 
+GP12 and GP17 must be connected together
 """
 from machine import Pin
 import os
diff --git a/tests/ports/cc3200/uart.py b/tests/ports/cc3200/uart.py
index 94ac9051b24d3..c92c8041fc0ce 100644
--- a/tests/ports/cc3200/uart.py
+++ b/tests/ports/cc3200/uart.py
@@ -1,5 +1,5 @@
 """
-UART test for the CC3200 based boards. 
+UART test for the CC3200 based boards.
 UART0 and UART1 must be connected together for this test to pass.
 """
 
diff --git a/tools/codestats.sh b/tools/codestats.sh
index 74430739917b5..be796568a19d8 100755
--- a/tools/codestats.sh
+++ b/tools/codestats.sh
@@ -116,7 +116,7 @@ index 77d2945..dae0644 100644
 @@ -55,10 +55,8 @@ void msec_sleep_tv(struct timeval *tv) {
  #define MP_CLOCKS_PER_SEC CLOCKS_PER_SEC
  #endif
- 
+
 -#if defined(MP_CLOCKS_PER_SEC) && (MP_CLOCKS_PER_SEC == 1000000) // POSIX
 -#define CLOCK_DIV 1000.0
 -#elif defined(MP_CLOCKS_PER_SEC) && (MP_CLOCKS_PER_SEC == 1000) // WIN32

From b3c62f31690ba0e6458589d934acd2db5ee92375 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Mar 2024 16:29:46 +1100
Subject: [PATCH 0883/3129] top: Update .git-blame-ignore-revs for latest
 format/spell commits.

Signed-off-by: Damien George <damien@micropython.org>
---
 .git-blame-ignore-revs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 690e5f46a4fc0..195e1e06eea46 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,12 @@
+# all: Prune trailing whitespace.
+dda9b9c6da5d3c31fa8769e581a753e95a270803
+
+# all: Remove the "STATIC" macro and just use "static" instead.
+decf8e6a8bb940d5829ca3296790631fcece7b21
+
+# renesas-ra: Fix spelling mistakes found by codespell.
+b3f2f18f927fa2fad10daf63d8c391331f5edf58
+
 # all: Update Python formatting to ruff-format.
 bbd8760bd9a2302e5abee29db279102bb11d7732
 

From 185ae18360f47f8d97070689116b398b019e14db Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 8 Feb 2024 17:56:49 +0100
Subject: [PATCH 0884/3129] stm32/network_lan: Allow defining phy_addr in the
 LAN constructor.

The default value is 0, which is compatible with the existing behaviour.
Implementing that required changes to eth.c as well.  The value of phy_addr
is added to the eth_t data type.

Tested with a STM32F767 and a STM32H750 device.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../boards/ARDUINO_PORTENTA_H7/board_init.c   |  2 +-
 ports/stm32/eth.c                             | 37 +++++++++++--------
 ports/stm32/eth.h                             |  2 +-
 ports/stm32/network_lan.c                     | 13 +++++--
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
index 39f7828773130..ad275ef87c3e8 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
@@ -115,7 +115,7 @@ void PORTENTA_board_early_init(void) {
     mp_hal_pin_write(pyb_pin_ETH_RST, 1);
 
     // Put Eth in low-power mode
-    eth_init(&eth_instance, MP_HAL_MAC_ETH0);
+    eth_init(&eth_instance, MP_HAL_MAC_ETH0, 0);
     eth_low_power_mode(&eth_instance, true);
 
     #if MICROPY_HW_USB_HS_ULPI3320
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 12c29f071616b..e1e6f074cdf66 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -40,8 +40,7 @@
 #include "lwip/dhcp.h"
 #include "netif/ethernet.h"
 
-// ETH PHY register definitions (for LAN8742)
-
+// ETH PHY register definitions (for LAN8742 and LAN8720/LAN8710)
 #undef PHY_BCR
 #define PHY_BCR                 (0x0000)
 #define PHY_BCR_SOFT_RESET      (0x8000)
@@ -137,6 +136,7 @@ typedef struct _eth_t {
     uint32_t trace_flags;
     struct netif netif;
     struct dhcp dhcp_struct;
+    uint32_t phy_addr;
 } eth_t;
 
 static eth_dma_t eth_dma __attribute__((aligned(16384)));
@@ -146,11 +146,13 @@ eth_t eth_instance;
 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) {
+static void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val) {
     #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
     uint32_t ar = ETH->MACMDIOAR;
+    ar &= ~ETH_MACMDIOAR_PA_Msk;
+    ar |= (phy_addr << ETH_MACMDIOAR_PA_Pos);
     ar &= ~ETH_MACMDIOAR_RDA_Msk;
     ar |= reg << ETH_MACMDIOAR_RDA_Pos;
     ar &= ~ETH_MACMDIOAR_MOC_Msk;
@@ -165,18 +167,20 @@ static void eth_phy_write(uint32_t reg, uint32_t val) {
     }
     ETH->MACMIIDR = val;
     uint32_t ar = ETH->MACMIIAR;
-    ar = reg << ETH_MACMIIAR_MR_Pos | (ar & ETH_MACMIIAR_CR_Msk) | ETH_MACMIIAR_MW | ETH_MACMIIAR_MB;
+    ar = (phy_addr << ETH_MACMIIAR_PA_Pos) | (reg << ETH_MACMIIAR_MR_Pos) | (ar & ETH_MACMIIAR_CR_Msk) | ETH_MACMIIAR_MW | ETH_MACMIIAR_MB;
     ETH->MACMIIAR = ar;
     while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {
     }
     #endif
 }
 
-static uint32_t eth_phy_read(uint32_t reg) {
+static uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg) {
     #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
     uint32_t ar = ETH->MACMDIOAR;
+    ar &= ~ETH_MACMDIOAR_PA_Msk;
+    ar |= (phy_addr << ETH_MACMDIOAR_PA_Pos);
     ar &= ~ETH_MACMDIOAR_RDA_Msk;
     ar |= reg << ETH_MACMDIOAR_RDA_Pos;
     ar &= ~ETH_MACMDIOAR_MOC_Msk;
@@ -190,7 +194,7 @@ static uint32_t eth_phy_read(uint32_t reg) {
     while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {
     }
     uint32_t ar = ETH->MACMIIAR;
-    ar = reg << ETH_MACMIIAR_MR_Pos | (ar & ETH_MACMIIAR_CR_Msk) | ETH_MACMIIAR_MB;
+    ar = (phy_addr << ETH_MACMIIAR_PA_Pos) | (reg << ETH_MACMIIAR_MR_Pos) | (ar & ETH_MACMIIAR_CR_Msk) | ETH_MACMIIAR_MB;
     ETH->MACMIIAR = ar;
     while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {
     }
@@ -198,9 +202,10 @@ static uint32_t eth_phy_read(uint32_t reg) {
     #endif
 }
 
-void eth_init(eth_t *self, int mac_idx) {
+void eth_init(eth_t *self, int mac_idx, uint32_t phy_addr) {
     mp_hal_get_mac(mac_idx, &self->netif.hwaddr[0]);
     self->netif.hwaddr_len = 6;
+    self->phy_addr = phy_addr;
 
     // 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);
@@ -362,7 +367,7 @@ static int eth_mac_init(eth_t *self) {
     #endif
 
     // Reset the PHY
-    eth_phy_write(PHY_BCR, PHY_BCR_SOFT_RESET);
+    eth_phy_write(self->phy_addr, PHY_BCR, PHY_BCR_SOFT_RESET);
     mp_hal_delay_ms(50);
 
     // Wait for the PHY link to be established
@@ -373,8 +378,8 @@ static int eth_mac_init(eth_t *self) {
             eth_mac_deinit(self);
             return -MP_ETIMEDOUT;
         }
-        uint16_t bcr = eth_phy_read(0);
-        uint16_t bsr = eth_phy_read(1);
+        uint16_t bcr = eth_phy_read(self->phy_addr, PHY_BCR);
+        uint16_t bsr = eth_phy_read(self->phy_addr, PHY_BSR);
         switch (phy_state) {
             case 0:
                 if (!(bcr & PHY_BCR_SOFT_RESET)) {
@@ -383,7 +388,7 @@ static int eth_mac_init(eth_t *self) {
                 break;
             case 1:
                 if (bsr & PHY_BSR_LINK_STATUS) {
-                    eth_phy_write(PHY_BCR, PHY_BCR_AUTONEG_EN);
+                    eth_phy_write(self->phy_addr, PHY_BCR, PHY_BCR_AUTONEG_EN);
                     phy_state = 2;
                 }
                 break;
@@ -398,7 +403,7 @@ static int eth_mac_init(eth_t *self) {
     }
 
     // Get register with link status
-    uint16_t phy_scsr = eth_phy_read(PHY_SCSR);
+    uint16_t phy_scsr = eth_phy_read(self->phy_addr, PHY_SCSR);
 
     // Burst mode configuration
     #if defined(STM32H5) || defined(STM32H7)
@@ -845,7 +850,7 @@ int eth_link_status(eth_t *self) {
             return 2; // link no-ip;
         }
     } else {
-        if (eth_phy_read(PHY_BSR) & PHY_BSR_LINK_STATUS) {
+        if (eth_phy_read(self->phy_addr, PHY_BSR) & PHY_BSR_LINK_STATUS) {
             return 1; // link up
         } else {
             return 0; // link down
@@ -883,10 +888,10 @@ void eth_low_power_mode(eth_t *self, bool enable) {
     __HAL_RCC_ETH_CLK_ENABLE();
     #endif
 
-    uint16_t bcr = eth_phy_read(PHY_BCR);
+    uint16_t bcr = eth_phy_read(self->phy_addr, PHY_BCR);
     if (enable) {
         // Enable low-power mode.
-        eth_phy_write(PHY_BCR, bcr | PHY_BCR_POWER_DOWN);
+        eth_phy_write(self->phy_addr, PHY_BCR, bcr | PHY_BCR_POWER_DOWN);
         // Disable eth clock.
         #if defined(STM32H7)
         __HAL_RCC_ETH1MAC_CLK_DISABLE();
@@ -895,7 +900,7 @@ void eth_low_power_mode(eth_t *self, bool enable) {
         #endif
     } else {
         // Disable low-power mode.
-        eth_phy_write(PHY_BCR, bcr & (~PHY_BCR_POWER_DOWN));
+        eth_phy_write(self->phy_addr, 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 47344b9526fd4..45c385a2524ab 100644
--- a/ports/stm32/eth.h
+++ b/ports/stm32/eth.h
@@ -29,7 +29,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, uint32_t 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);
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 2f70caf0123a4..efdd354fb3a64 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -53,10 +53,17 @@ 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);
+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_phy_addr};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    };
+    // 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 network_lan_obj_t *self = &network_lan_eth0;
-    eth_init(self->eth, MP_HAL_MAC_ETH0);
+    eth_init(self->eth, MP_HAL_MAC_ETH0, args[ARG_phy_addr].u_int);
     return MP_OBJ_FROM_PTR(self);
 }
 

From 085e3244f0bc5a1ddaaad4ab32c33ce5545be4ac Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 11 Feb 2024 12:33:08 +0100
Subject: [PATCH 0885/3129] stm32/eth: Remove redundant ETH clock enable code.

The MAC clock was initialized both in eth_init() and eth_mac_init().  The
latter is not required.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/stm32/eth.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index e1e6f074cdf66..f5bdcc1524791 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -246,19 +246,12 @@ static int eth_mac_init(eth_t *self) {
     #endif
     mpu_config_end(irq_state);
 
-    // Enable peripheral clock
+    // Set MAC to reset state
     #if defined(STM32H5)
-    __HAL_RCC_ETH_CLK_ENABLE();
-    __HAL_RCC_ETHTX_CLK_ENABLE();
-    __HAL_RCC_ETHRX_CLK_ENABLE();
     __HAL_RCC_ETH_FORCE_RESET();
     #elif 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
 

From bf68bb95f9774127a026845e286822ca83bcaa37 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 15 Feb 2024 21:05:51 +0100
Subject: [PATCH 0886/3129] stm32/network_lan: Add the phy_type=x keyword
 option to network.LAN().

With LAN8742, LAN8720, LAN83825 and DP83848 as possible options, and the
symbols PHY_LAN8720, PHY_LAN8742, PHY_DP83825 and PHY_DP8348.  The default
is PHY_LAN8742 which is the existing behaviour.

The eth_init() parameters for the Portenta H7 board are set to phy_addr=0
and phy_type=LAN8742, which matches the previous defaults and the
schematics.

Tested with LAN8720 and DP83848 breakout boards at 10M Duplex and 100M
Duplex modes.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/stm32/Makefile                          |  1 +
 .../boards/ARDUINO_PORTENTA_H7/board_init.c   |  2 +-
 ports/stm32/eth.c                             | 52 +++++++-------
 ports/stm32/eth.h                             |  9 ++-
 ports/stm32/eth_phy.c                         | 59 ++++++++++++++++
 ports/stm32/eth_phy.h                         | 67 +++++++++++++++++++
 ports/stm32/network_lan.c                     | 12 +++-
 7 files changed, 171 insertions(+), 31 deletions(-)
 create mode 100644 ports/stm32/eth_phy.c
 create mode 100644 ports/stm32/eth_phy.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 19f6f420e1fff..d1694426d3529 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -251,6 +251,7 @@ SRC_C += \
 	pyb_can.c \
 	usb.c \
 	eth.c \
+	eth_phy.c \
 	gccollect.c \
 	help.c \
 	machine_bitstream.c \
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
index ad275ef87c3e8..04fa3b9bc37be 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
@@ -115,7 +115,7 @@ void PORTENTA_board_early_init(void) {
     mp_hal_pin_write(pyb_pin_ETH_RST, 1);
 
     // Put Eth in low-power mode
-    eth_init(&eth_instance, MP_HAL_MAC_ETH0, 0);
+    eth_init(&eth_instance, MP_HAL_MAC_ETH0, 0, ETH_PHY_LAN8742);
     eth_low_power_mode(&eth_instance, true);
 
     #if MICROPY_HW_USB_HS_ULPI3320
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index f5bdcc1524791..fd46bde23cb3f 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -32,6 +32,7 @@
 #include "extmod/modnetwork.h"
 #include "mpu.h"
 #include "eth.h"
+#include "eth_phy.h"
 
 #if defined(MICROPY_HW_ETH_MDC)
 
@@ -40,26 +41,6 @@
 #include "lwip/dhcp.h"
 #include "netif/ethernet.h"
 
-// ETH PHY register definitions (for LAN8742 and LAN8720/LAN8710)
-#undef PHY_BCR
-#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)
-#define PHY_BSR_LINK_STATUS     (0x0004)
-#define PHY_BSR_AUTONEG_DONE    (0x0020)
-
-#define PHY_SCSR                (0x001f)
-#define PHY_SCSR_SPEED_Pos      (2)
-#define PHY_SCSR_SPEED_Msk      (7 << PHY_SCSR_SPEED_Pos)
-#define PHY_SCSR_SPEED_10HALF   (1 << PHY_SCSR_SPEED_Pos)
-#define PHY_SCSR_SPEED_10FULL   (5 << PHY_SCSR_SPEED_Pos)
-#define PHY_SCSR_SPEED_100HALF  (2 << PHY_SCSR_SPEED_Pos)
-#define PHY_SCSR_SPEED_100FULL  (6 << PHY_SCSR_SPEED_Pos)
-
 // ETH DMA RX and TX descriptor definitions
 #if defined(STM32H5)
 #define RX_DESCR_3_OWN_Pos      (31)
@@ -137,6 +118,7 @@ typedef struct _eth_t {
     struct netif netif;
     struct dhcp dhcp_struct;
     uint32_t phy_addr;
+    int16_t (*phy_get_link_status)(uint32_t phy_addr);
 } eth_t;
 
 static eth_dma_t eth_dma __attribute__((aligned(16384)));
@@ -146,7 +128,7 @@ eth_t eth_instance;
 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 phy_addr, uint32_t reg, uint32_t val) {
+void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val) {
     #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
@@ -174,7 +156,7 @@ static void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val) {
     #endif
 }
 
-static uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg) {
+uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg) {
     #if defined(STM32H5) || defined(STM32H7)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
@@ -202,10 +184,17 @@ static uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg) {
     #endif
 }
 
-void eth_init(eth_t *self, int mac_idx, uint32_t phy_addr) {
+int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
     mp_hal_get_mac(mac_idx, &self->netif.hwaddr[0]);
     self->netif.hwaddr_len = 6;
     self->phy_addr = phy_addr;
+    if (phy_type == ETH_PHY_DP83825 || phy_type == ETH_PHY_DP83848) {
+        self->phy_get_link_status = eth_phy_dp838xx_get_link_status;
+    } else if (phy_type == ETH_PHY_LAN8720 || phy_type == ETH_PHY_LAN8742) {
+        self->phy_get_link_status = eth_phy_lan87xx_get_link_status;
+    } else {
+        return -1;
+    }
 
     // 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);
@@ -230,6 +219,7 @@ void eth_init(eth_t *self, int mac_idx, uint32_t phy_addr) {
     #else
     __HAL_RCC_ETH_CLK_ENABLE();
     #endif
+    return 0;
 }
 
 void eth_set_trace(eth_t *self, uint32_t value) {
@@ -381,6 +371,14 @@ static int eth_mac_init(eth_t *self) {
                 break;
             case 1:
                 if (bsr & PHY_BSR_LINK_STATUS) {
+                    // Announce all modes
+                    eth_phy_write(self->phy_addr, PHY_ANAR,
+                        PHY_ANAR_SPEED_10HALF |
+                        PHY_ANAR_SPEED_10FULL |
+                        PHY_ANAR_SPEED_100HALF |
+                        PHY_ANAR_SPEED_100FULL |
+                        PHY_ANAR_IEEE802_3);
+                    // Start autonegotiate.
                     eth_phy_write(self->phy_addr, PHY_BCR, PHY_BCR_AUTONEG_EN);
                     phy_state = 2;
                 }
@@ -396,7 +394,7 @@ static int eth_mac_init(eth_t *self) {
     }
 
     // Get register with link status
-    uint16_t phy_scsr = eth_phy_read(self->phy_addr, PHY_SCSR);
+    uint16_t phy_scsr = self->phy_get_link_status(self->phy_addr);
 
     // Burst mode configuration
     #if defined(STM32H5) || defined(STM32H7)
@@ -505,9 +503,9 @@ static int eth_mac_init(eth_t *self) {
 
     // Set main MAC control register
     ETH->MACCR =
-        (phy_scsr & PHY_SCSR_SPEED_Msk) == PHY_SCSR_SPEED_10FULL ? ETH_MACCR_DM
-        : (phy_scsr & PHY_SCSR_SPEED_Msk) == PHY_SCSR_SPEED_100HALF ? ETH_MACCR_FES
-        : (phy_scsr & PHY_SCSR_SPEED_Msk) == PHY_SCSR_SPEED_100FULL ? (ETH_MACCR_FES | ETH_MACCR_DM)
+        phy_scsr == PHY_SPEED_10FULL ? ETH_MACCR_DM
+        : phy_scsr == PHY_SPEED_100HALF ? ETH_MACCR_FES
+        : phy_scsr == PHY_SPEED_100FULL ? (ETH_MACCR_FES | ETH_MACCR_DM)
         : 0
     ;
     mp_hal_delay_ms(2);
diff --git a/ports/stm32/eth.h b/ports/stm32/eth.h
index 45c385a2524ab..5647449690cfa 100644
--- a/ports/stm32/eth.h
+++ b/ports/stm32/eth.h
@@ -26,10 +26,17 @@
 #ifndef MICROPY_INCLUDED_STM32_ETH_H
 #define MICROPY_INCLUDED_STM32_ETH_H
 
+enum {
+    ETH_PHY_LAN8742 = 0,
+    ETH_PHY_LAN8720,
+    ETH_PHY_DP83848,
+    ETH_PHY_DP83825
+};
+
 typedef struct _eth_t eth_t;
 extern eth_t eth_instance;
 
-void eth_init(eth_t *self, int mac_idx, uint32_t phy_addr);
+int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type);
 void eth_set_trace(eth_t *self, uint32_t value);
 struct netif *eth_netif(eth_t *self);
 int eth_link_status(eth_t *self);
diff --git a/ports/stm32/eth_phy.c b/ports/stm32/eth_phy.c
new file mode 100644
index 0000000000000..56cddba9c520b
--- /dev/null
+++ b/ports/stm32/eth_phy.c
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2024 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/mphal.h"
+#include "eth_phy.h"
+
+#if defined(MICROPY_HW_ETH_MDC)
+
+#define PHY_SCSR_LAN87XX                (0x001f)
+#define PHY_SCSR_LAN87XX_SPEED_Pos      (2)
+#define PHY_SCSR_LAN87XX_SPEED_Msk      (7)
+
+#define PHY_SCSR_DP838XX                (0x0010)
+#define PHY_RECR_DP838XX                (0x0015)
+#define PHY_SCSR_DP838XX_DUPLEX_Msk     (4)
+#define PHY_SCSR_DP838XX_10M_Msk        (2)
+
+int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr) {
+    // Get the link mode & speed
+    int16_t scsr = eth_phy_read(phy_addr, PHY_SCSR_LAN87XX);
+    return (scsr >> PHY_SCSR_LAN87XX_SPEED_Pos) & PHY_SCSR_LAN87XX_SPEED_Msk;
+}
+
+int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr) {
+    int16_t scsr = 0;
+    // Get the link mode & speed
+    uint16_t temp = eth_phy_read(phy_addr, PHY_SCSR_DP838XX);
+    scsr = (temp & PHY_SCSR_DP838XX_10M_Msk) ? PHY_SPEED_10HALF : PHY_SPEED_100HALF;
+    if (temp & PHY_SCSR_DP838XX_DUPLEX_Msk) {
+        scsr |= PHY_DUPLEX;
+    }
+    return scsr;
+}
+
+#endif
diff --git a/ports/stm32/eth_phy.h b/ports/stm32/eth_phy.h
new file mode 100644
index 0000000000000..5036905c1f582
--- /dev/null
+++ b/ports/stm32/eth_phy.h
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2024 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_STM32_PHY_H
+#define MICROPY_INCLUDED_STM32_PYH_H
+
+#if defined(MICROPY_HW_ETH_MDC)
+
+// Common ETH PHY register definitions
+#undef PHY_BCR
+#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)
+#define PHY_BSR_LINK_STATUS     (0x0004)
+#define PHY_BSR_AUTONEG_DONE    (0x0020)
+
+#undef PHY_ANAR
+#define PHY_ANAR                (0x0004)
+#define PHY_ANAR_SPEED_10HALF   (0x0020)
+#define PHY_ANAR_SPEED_10FULL   (0x0040)
+#define PHY_ANAR_SPEED_100HALF  (0x0080)
+#define PHY_ANAR_SPEED_100FULL  (0x0100)
+#define PHY_ANAR_IEEE802_3      (0x0001)
+
+#define PHY_SPEED_10HALF   (1)
+#define PHY_SPEED_10FULL   (5)
+#define PHY_SPEED_100HALF  (2)
+#define PHY_SPEED_100FULL  (6)
+#define PHY_DUPLEX         (4)
+
+uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg);
+void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val);
+
+int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr);
+int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr);
+
+#endif
+
+#endif  // MICROPY_INCLUDED_STM32_PHY_H
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index efdd354fb3a64..27f3e1337e693 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -54,16 +54,19 @@ 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_phy_addr};
+    enum { ARG_phy_addr, ARG_phy_type};
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_phy_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ETH_PHY_LAN8742} },
     };
     // 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 network_lan_obj_t *self = &network_lan_eth0;
-    eth_init(self->eth, MP_HAL_MAC_ETH0, args[ARG_phy_addr].u_int);
+    if (eth_init(self->eth, MP_HAL_MAC_ETH0, args[ARG_phy_addr].u_int, args[ARG_phy_type].u_int) != 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid phy_type"));
+    }
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -162,6 +165,11 @@ 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_LAN8742), MP_ROM_INT(ETH_PHY_LAN8742) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(ETH_PHY_LAN8720) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_DP83848), MP_ROM_INT(ETH_PHY_DP83848) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_DP83825), MP_ROM_INT(ETH_PHY_DP83825) },
 };
 static MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
 

From 5fe99013b6a58d6743706c5d76a1dbad133c300a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 20 Feb 2024 12:48:04 +1100
Subject: [PATCH 0887/3129] stm32: Simplify D-cache clean and invalidate
 macros.

The inline functions that these are wrappers around already account for
cache line size.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/mpconfigboard_common.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 6d9ef8de3b09f..16ee01b67bd9b 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -632,12 +632,12 @@
 
 // D-cache clean/invalidate helpers
 #if __DCACHE_PRESENT == 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)))
+// Note: The SCB_Clean<...> functions automatically align their arguments to cover full cache lines.
+// CLEANINVALIDATE will write back (flush) any dirty lines in this region to RAM, then
+// invalidate (evict) the whole region from the cache.
+#define MP_HAL_CLEANINVALIDATE_DCACHE(addr, size) SCB_CleanInvalidateDCache_by_Addr((volatile void *)(addr), (size))
+// CLEAN will write back (flush) any dirty lines in this region to RAM.
+#define MP_HAL_CLEAN_DCACHE(addr, size) SCB_CleanDCache_by_Addr((volatile void *)(addr), (size))
 #else
 #define MP_HAL_CLEANINVALIDATE_DCACHE(addr, size)
 #define MP_HAL_CLEAN_DCACHE(addr, size)

From 2345c1a04e6d8f8a7376c2c37c0f5248f7629bbb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 21 Feb 2024 12:31:11 +1100
Subject: [PATCH 0888/3129] stm32/mpu: Rename MPU_CONFIG_DISABLE to
 MPU_CONFIG_NOACCESS.

The existing MPU_CONFIG_DISABLE macro enables the MPU region but disables
all access to it.

The rename is necessary to support an MPU_CONFIG_DISABLE macro that
actually disables the MPU region entirely.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/mpu.h  |  7 ++++++-
 ports/stm32/qspi.c | 34 +++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index e260b502199c0..62a428198ef9f 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -37,7 +37,12 @@
 #define MPU_REGION_SDRAM1   (MPU_REGION_NUMBER4)
 #define MPU_REGION_SDRAM2   (MPU_REGION_NUMBER5)
 
-#define MPU_CONFIG_DISABLE(srd, size) ( \
+// Attribute value to disable a region entirely, remove it from the MPU
+// (i.e. the MPU_REGION_ENABLE bit is unset.)
+#define MPU_CONFIG_DISABLE 0
+
+// Configure a region with all access disabled. Can also set a Subregion Disable mask.
+#define MPU_CONFIG_NOACCESS(srd, size) ( \
     MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RASR_XN_Pos \
         | MPU_REGION_NO_ACCESS << MPU_RASR_AP_Pos \
         | MPU_TEX_LEVEL0 << MPU_RASR_TEX_Pos \
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index a560f8fb6265d..98364db41d4fb 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -68,7 +68,7 @@ static inline void qspi_mpu_disable_all(void) {
     // Configure MPU to disable access to entire QSPI region, to prevent CPU
     // speculative execution from accessing this region and modifying QSPI registers.
     uint32_t irq_state = mpu_config_start();
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x00, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x00, MPU_REGION_SIZE_256MB));
     mpu_config_end(irq_state);
 }
 
@@ -84,30 +84,30 @@ static inline void qspi_mpu_enable_mapped(void) {
     // 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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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(0x03, MPU_REGION_SIZE_32MB));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x0F, MPU_REGION_SIZE_32MB));
+    mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(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));
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_32MB));
+    mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x03, MPU_REGION_SIZE_4MB));
     #endif
     mpu_config_end(irq_state);
 }

From 7fd8a6d4bced2fcad11b30189e1fba4c32eaafc5 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 20 Feb 2024 12:14:44 +1100
Subject: [PATCH 0889/3129] stm32/dma: Add D-cache protection for DMA RX
 operations, including SPI.

This new DMA API corrects possible cache coherency issues on chips with
D-Cache, when working with buffers at arbitrary memory locations (i.e.
supplied by Python code).

The API is used by SPI to fix an issue with corrupt data when reading from
SPI using DMA in certain cases.  A regression test is included (it depends
on external hardware connection).

Explanation:

1) It's necessary to invalidate D-Cache after a DMA RX operation completes
   in case the CPU reads (or speculatively reads) from the DMA RX region
   during the operation.  This seems to have been the root cause of issue
   #13471 (only when src==dest for this case).

2) More generally, it is also necessary to temporarily mark the first and
   last cache lines of a DMA RX operation as "uncached", in case the DMA
   buffer shares this cache line with unrelated data.  The CPU could
   otherwise write the other data at any time during the DMA operation (for
   example from an interrupt handler), creating a dirty cache line that's
   inconsistent with the DMA result.

Fixes issue #13471.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/dma.c                             | 53 +++++++++++++++++++
 ports/stm32/dma.h                             | 38 +++++++++++++
 ports/stm32/mpu.h                             | 16 ++++++
 ports/stm32/spi.c                             |  8 ++-
 tests/ports/stm32_hardware/dma_alignment.py   | 43 +++++++++++++++
 .../ports/stm32_hardware/dma_alignment.py.exp |  2 +
 6 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 tests/ports/stm32_hardware/dma_alignment.py
 create mode 100644 tests/ports/stm32_hardware/dma_alignment.py.exp

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index af56d812367c7..df8a408cbf8ba 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -33,6 +33,7 @@
 #include "systick.h"
 #include "dma.h"
 #include "irq.h"
+#include "mpu.h"
 
 // When this option is enabled, the DMA will turn off automatically after
 // a period of inactivity.
@@ -1852,3 +1853,55 @@ void dma_external_acquire(uint32_t controller, uint32_t stream) {
 void dma_external_release(uint32_t controller, uint32_t stream) {
     dma_disable_clock(DMA_ID_FROM_CONTROLLER_STREAM(controller, stream));
 }
+
+#if __DCACHE_PRESENT
+
+void dma_protect_rx_region(void *dest, size_t len) {
+    #if __DCACHE_PRESENT
+    uint32_t start_addr = (uint32_t)dest;
+    uint32_t start_aligned = start_addr & ~(__SCB_DCACHE_LINE_SIZE - 1U);
+    uint32_t end_addr = start_addr + len - 1; // Address of last byte in the buffer
+    uint32_t end_aligned = end_addr & ~(__SCB_DCACHE_LINE_SIZE - 1U);
+
+    uint32_t irq_state = mpu_config_start();
+
+    // Clean (write back) any cached memory in this region, so there's no dirty
+    // cache entries that might be written back later after DMA RX is done.
+    MP_HAL_CLEAN_DCACHE(dest, len);
+
+    // The way we protect the whole region is to mark the first and last cache
+    // line as UNCACHED using the MPU. This means any unrelated reads/writes in
+    // these cache lines will bypass the cache, and can coexist with DMA also
+    // writing to parts of these cache lines.
+    //
+    // This is redundant sometimes (because the DMA region fills the entire cache line, or because
+    // the region fits in a single cache line.) However, the implementation is only 3 register writes so
+    // it's more efficient to call it every time.
+    mpu_config_region(MPU_REGION_DMA_UNCACHED_1, start_aligned, MPU_CONFIG_UNCACHED(MPU_REGION_SIZE_32B));
+    mpu_config_region(MPU_REGION_DMA_UNCACHED_2, end_aligned, MPU_CONFIG_UNCACHED(MPU_REGION_SIZE_32B));
+
+    mpu_config_end(irq_state);
+    #endif
+}
+
+void dma_unprotect_rx_region(void *dest, size_t len) {
+    #if __DCACHE_PRESENT
+    uint32_t irq_state = mpu_config_start();
+
+    // Disabling these regions removes them from the MPU
+    mpu_config_region(MPU_REGION_DMA_UNCACHED_1, 0, MPU_CONFIG_DISABLE);
+    mpu_config_region(MPU_REGION_DMA_UNCACHED_2, 0, MPU_CONFIG_DISABLE);
+
+    // Invalidate the whole region in the cache. This may seem redundant, but it
+    // is possible that during the DMA operation the CPU read inside this region
+    // (excluding the first & last cache lines), and cache lines were filled.
+    //
+    // (This can happen in SPI if src==dest, for example, possibly due to speculative
+    // cache line fills.)
+    MP_HAL_CLEANINVALIDATE_DCACHE(dest, len);
+
+    mpu_config_end(irq_state);
+    #endif
+}
+
+#endif
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index fa3238413ea49..7ba04baf520ba 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_STM32_DMA_H
 #define MICROPY_INCLUDED_STM32_DMA_H
 
+#include "py/mpconfig.h"
+
 typedef struct _dma_descr_t dma_descr_t;
 
 #if defined(STM32H5)
@@ -164,4 +166,40 @@ void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_a
 void dma_external_acquire(uint32_t controller, uint32_t stream);
 void dma_external_release(uint32_t controller, uint32_t stream);
 
+#if __DCACHE_PRESENT
+// On chips with D-Cache, it's necessary to call this function before using DMA to read
+// into a user-supplied buffer. It does two things:
+//
+// 1) Cleans this region in the cache.
+//
+// 2) Temporarily disables caching for the first and last cache lines of the
+// buffer. This prevents cache coherency issues if the start or end of the
+// buffer don't align to a cache line. (For example, this can happen if the CPU
+// accesses unrelated memory adjacent to the buffer and in the same cache
+// line.)
+//
+// Only one region can be protected in this way at a time.
+void dma_protect_rx_region(void *dest, size_t len);
+
+// Release the region protected by dma_protect_rx_region().
+//
+// Call this after the DMA operation completes, before the CPU reads any of the
+// data that was written.
+//
+// As well as restoring data caching, this function invalidates D-cache for the
+// entire specified region.
+void dma_unprotect_rx_region(void *dest, size_t len);
+
+#else
+
+inline static void dma_protect_rx_region(uint8_t *dest, size_t len) {
+    // No-ops on targets without D-Cache.
+}
+
+inline static void dma_unprotect_rx_region(void *dest, size_t len) {
+
+}
+
+#endif // __DCACHE_PRESENT
+
 #endif // MICROPY_INCLUDED_STM32_DMA_H
diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index 62a428198ef9f..64880a85db75f 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -37,6 +37,10 @@
 #define MPU_REGION_SDRAM1   (MPU_REGION_NUMBER4)
 #define MPU_REGION_SDRAM2   (MPU_REGION_NUMBER5)
 
+// Only relevant on CPUs with D-Cache, must be higher priority than SDRAM
+#define MPU_REGION_DMA_UNCACHED_1 (MPU_REGION_NUMBER6)
+#define MPU_REGION_DMA_UNCACHED_2 (MPU_REGION_NUMBER7)
+
 // Attribute value to disable a region entirely, remove it from the MPU
 // (i.e. the MPU_REGION_ENABLE bit is unset.)
 #define MPU_CONFIG_DISABLE 0
@@ -78,6 +82,18 @@
         | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
     )
 
+#define MPU_CONFIG_UNCACHED(size) ( \
+    MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RASR_XN_Pos \
+        | MPU_REGION_FULL_ACCESS << MPU_RASR_AP_Pos \
+        | MPU_TEX_LEVEL1 << MPU_RASR_TEX_Pos \
+        | MPU_ACCESS_NOT_SHAREABLE << MPU_RASR_S_Pos \
+        | MPU_ACCESS_NOT_CACHEABLE << MPU_RASR_C_Pos \
+        | MPU_ACCESS_NOT_BUFFERABLE << MPU_RASR_B_Pos \
+        | 0x00 << MPU_RASR_SRD_Pos \
+        | (size) << MPU_RASR_SIZE_Pos \
+        | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
+    )
+
 static inline void mpu_init(void) {
     MPU->CTRL = MPU_PRIVILEGED_DEFAULT | MPU_CTRL_ENABLE_Msk;
     SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 5aace8e9a3e1f..607b3fe685a4c 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -571,6 +571,8 @@ void spi_transfer(const spi_t *self, size_t len, const uint8_t *src, uint8_t *de
     // Note: DMA transfers are limited to 65535 bytes at a time.
 
     HAL_StatusTypeDef status;
+    void *odest = dest; // Original values of dest & len
+    size_t olen = len;
 
     if (dest == NULL) {
         // send only
@@ -613,7 +615,7 @@ void spi_transfer(const spi_t *self, size_t len, const uint8_t *src, uint8_t *de
             }
             dma_init(&rx_dma, self->rx_dma_descr, DMA_PERIPH_TO_MEMORY, self->spi);
             self->spi->hdmarx = &rx_dma;
-            MP_HAL_CLEANINVALIDATE_DCACHE(dest, len);
+            dma_protect_rx_region(dest, len);
             uint32_t t_start = HAL_GetTick();
             do {
                 uint32_t l = MIN(len, 65535);
@@ -632,6 +634,7 @@ void spi_transfer(const spi_t *self, size_t len, const uint8_t *src, uint8_t *de
                 dma_deinit(self->tx_dma_descr);
             }
             dma_deinit(self->rx_dma_descr);
+            dma_unprotect_rx_region(odest, olen);
         }
     } else {
         // send and receive
@@ -644,7 +647,7 @@ void spi_transfer(const spi_t *self, size_t len, const uint8_t *src, uint8_t *de
             dma_init(&rx_dma, self->rx_dma_descr, DMA_PERIPH_TO_MEMORY, self->spi);
             self->spi->hdmarx = &rx_dma;
             MP_HAL_CLEAN_DCACHE(src, len);
-            MP_HAL_CLEANINVALIDATE_DCACHE(dest, len);
+            dma_protect_rx_region(dest, len);
             uint32_t t_start = HAL_GetTick();
             do {
                 uint32_t l = MIN(len, 65535);
@@ -662,6 +665,7 @@ void spi_transfer(const spi_t *self, size_t len, const uint8_t *src, uint8_t *de
             } while (len);
             dma_deinit(self->tx_dma_descr);
             dma_deinit(self->rx_dma_descr);
+            dma_unprotect_rx_region(odest, olen);
         }
     }
 
diff --git a/tests/ports/stm32_hardware/dma_alignment.py b/tests/ports/stm32_hardware/dma_alignment.py
new file mode 100644
index 0000000000000..1836b25d86d53
--- /dev/null
+++ b/tests/ports/stm32_hardware/dma_alignment.py
@@ -0,0 +1,43 @@
+from machine import SPI
+# Regression test for DMA for DCache coherency bugs with cache line
+# written originally for https://github.com/micropython/micropython/issues/13471
+
+# IMPORTANT: This test requires SPI2 MISO (pin Y8 on Pyboard D) to be connected to GND
+
+SPI_NUM = 2
+
+spi = SPI(SPI_NUM, baudrate=5_000_000)
+buf = bytearray(1024)
+ok = True
+
+for offs in range(0, len(buf)):
+    v = memoryview(buf)[offs : offs + 128]
+    spi.readinto(v, 0xFF)
+    if not all(b == 0x00 for b in v):
+        print(offs, v.hex())
+        ok = False
+
+print("Variable offset fixed length " + ("OK" if ok else "FAIL"))
+
+# this takes around 30s to run, so skipped if already failing
+if ok:
+    for op_len in range(1, 66):
+        wr = b"\xFF" * op_len
+        for offs in range(1, len(buf) - op_len - 1):
+            # Place some "sentinel" values before and after the DMA buffer
+            before = offs & 0xFF
+            after = (~offs) & 0xFF
+            buf[offs - 1] = before
+            buf[offs + op_len] = after
+            v = memoryview(buf)[offs : offs + op_len]
+            spi.write_readinto(wr, v)
+            if (
+                not all(b == 0x00 for b in v)
+                or buf[offs - 1] != before
+                or buf[offs + op_len] != after
+            ):
+                print(v.hex())
+                print(hex(op_len), hex(offs), hex(buf[offs - 1]), hex(buf[offs + op_len]))
+                ok = False
+
+    print("Variable offset and lengths " + ("OK" if ok else "FAIL"))
diff --git a/tests/ports/stm32_hardware/dma_alignment.py.exp b/tests/ports/stm32_hardware/dma_alignment.py.exp
new file mode 100644
index 0000000000000..e890e0081c4b7
--- /dev/null
+++ b/tests/ports/stm32_hardware/dma_alignment.py.exp
@@ -0,0 +1,2 @@
+Variable offset fixed length OK
+Variable offset and lengths OK

From a9efffca96d321a09829bbba4de558f1ca718800 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Feb 2024 16:57:18 +1100
Subject: [PATCH 0890/3129] stm32: Add support for dual-analog-pad "_C" pins on
 H7 MCUs.

This commit adds support for the dual-analog-pads on STM32H7 parts.  These
pads/pins are called PA0_C/PA1_C/PC2_C/PC3_C in the datasheet.  They each
have an analog switch that can optionally connect them to their normal pin
(eg PA0).  When the switch is open, the normal and _C pin are independent
pins/pads.

The approach taken in this commit to make these _C pins available to Python
is:
- put them in their own, independent row in the stm32h7_af.csv definition
  file, with only the ADC column defined (they are separate machine.Pin
  entities, and doing it this way keeps make-pins.py pretty clean)
- allow a board to reference these pins in the board's pins.csv file by the
  name PA0_C etc (so a board can alias them, for example)
- these pins (when enabled in pins.csv) now become available like any other
  machine.Pin through both machine.Pin.board and machine.Pin.cpu
- BUT these _C pins have a separate pin type which doesn't have any
  methods, because they don't have any functionality
- these _C pins can be used with machine.ADC to construct the appropriate
  ADC object, either by passing the string as machine.ADC("PA0_C") or by
  passing the object as machine.ADC(machine.Pin.cpu.PA0_C)
- if a board defines both the normal and _C pin (eg both PA0 and PA0_C) in
  pins.csv then it must not define the analog switch to be closed (this is
  a sanity check for the build, because it doesn't make sense to close the
  switch and have two separate pins)

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/make-pins.py       | 18 ++++++-----
 ports/stm32/boards/stm32f4xx_prefix.c | 18 +++++++++++
 ports/stm32/boards/stm32h723_af.csv   |  6 ++--
 ports/stm32/boards/stm32h743_af.csv   | 12 +++++---
 ports/stm32/boards/stm32h7b3_af.csv   | 12 +++++---
 ports/stm32/mpconfigboard_common.h    |  9 ++++++
 ports/stm32/pin.c                     | 44 ++++++++++++++++++++++++++-
 ports/stm32/pin.h                     |  1 +
 8 files changed, 101 insertions(+), 19 deletions(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index bfa22d7974967..8fb442153fad9 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -59,6 +59,12 @@ class Stm32Pin(boardgen.Pin):
     def __init__(self, cpu_pin_name):
         super().__init__(cpu_pin_name)
 
+        # Pins ending in "_C" correspond to the analog-only pad of a pair
+        # of dual (analog) pads found on H7 MCUs (eg PA0 and PA0_C pair).
+        self._analog_only = cpu_pin_name.endswith("_C")
+        if self._analog_only:
+            cpu_pin_name = cpu_pin_name[:-2]
+
         # P<port><num> (already verified by validate_cpu_pin_name).
         self._port = cpu_pin_name[1]
         self._pin = int(cpu_pin_name[2:])
@@ -129,11 +135,6 @@ def add_adc(self, adc):
         # be the P for one channel, and the N for a different channel.
         # e.g. "ADC123_INP12/ADC123_INN11".
         for adc_name in adc.split("/"):
-            if adc_name.startswith("C_"):
-                # Currently unsupported, H7 dual-pad. The C_ADC entries should
-                # only be available directly from machine.ADC (not via the pin
-                # object).
-                continue
             m = re.match("ADC([1-5]+)_(IN[NP]?)([0-9]+)$", adc_name)
             if not m:
                 raise boardgen.PinGeneratorError(
@@ -167,8 +168,9 @@ def definition(self):
         )
 
         # PIN(p_port, p_pin, p_af, p_adc_num, p_adc_channel)
-        return "PIN({:s}, {:d}, pin_{:s}_af, {:s}, {:d})".format(
-            self._port, self._pin, self.name(), adc_units_bitfield, self._adc_channel
+        pin_macro = "PIN_ANALOG" if self._analog_only else "PIN"
+        return "{:s}({:s}, {:d}, pin_{:s}_af, {:s}, {:d})".format(
+            pin_macro, self._port, self._pin, self.name(), adc_units_bitfield, self._adc_channel
         )
 
     # This will be called at the start of the output (after the prefix). Use
@@ -210,7 +212,7 @@ def print_source(self, out_source):
     def validate_cpu_pin_name(cpu_pin_name):
         boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
 
-        if not re.match("P[A-K][0-9]+$", cpu_pin_name):
+        if not re.match("P[A-K][0-9]+(_C)?$", cpu_pin_name):
             raise boardgen.PinGeneratorError("Invalid cpu pin name '{}'".format(cpu_pin_name))
 
 
diff --git a/ports/stm32/boards/stm32f4xx_prefix.c b/ports/stm32/boards/stm32f4xx_prefix.c
index 99bf4473aa1a1..c06e366d712e2 100644
--- a/ports/stm32/boards/stm32f4xx_prefix.c
+++ b/ports/stm32/boards/stm32f4xx_prefix.c
@@ -30,3 +30,21 @@
         .adc_num = p_adc_num, \
         .adc_channel = p_adc_channel, \
     }
+
+#if MICROPY_HW_ENABLE_ANALOG_ONLY_PINS
+#define PIN_ANALOG(p_port, p_pin, p_af, p_adc_num, p_adc_channel) \
+    { \
+        { &pin_analog_type }, \
+        .name = MP_QSTR_##p_port##p_pin##_C, \
+        .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, \
+    }
+#else
+#define PIN_ANALOG DUAL_PAD_SUPPORT_NOT_ENABLED__CONFIGURE__MICROPY_HW_ANALOG_SWITCH_Pxy
+#endif
diff --git a/ports/stm32/boards/stm32h723_af.csv b/ports/stm32/boards/stm32h723_af.csv
index 71873e670b3d0..bf360a13c9249 100644
--- a/ports/stm32/boards/stm32h723_af.csv
+++ b/ports/stm32/boards/stm32h723_af.csv
@@ -34,8 +34,10 @@ PortB,PB14,             ,TIM1_CH2N                           ,TIM12_CH1
 PortB,PB15,RTC_REFIN    ,TIM1_CH3N                           ,TIM12_CH2                     ,TIM8_CH3N                                         ,USART1_RX                                                           ,SPI2_MOSI/I2S2_SDO                               ,DFSDM1_CKIN2                                  ,                                                  ,UART4_CTS                                  ,SDMMC2_D1                                                   ,                                                        ,                                                                              ,FMC_D11/FMC_AD11                           ,                              ,LCD_G7         ,EVENTOUT,
 PortC,PC0 ,             ,FMC_D12/FMC_AD12                    ,                              ,DFSDM1_CKIN0                                      ,                                                                    ,                                                 ,DFSDM1_DATIN4                                 ,                                                  ,SAI4_FS_B                                  ,FMC_A25                                                     ,OTG_HS_ULPI_STP                                         ,LCD_G2                                                                        ,FMC_SDNWE                                  ,                              ,LCD_R5         ,EVENTOUT,ADC123_INP10
 PortC,PC1 ,TRACED0      ,SAI4_D1                             ,SAI1_D1                       ,DFSDM1_DATIN0                                     ,DFSDM1_CKIN4                                                        ,SPI2_MOSI/I2S2_SDO                               ,SAI1_SD_A                                     ,                                                  ,SAI4_SD_A                                  ,SDMMC2_CK                                                   ,OCTOSPIM_P1_IO4                                         ,ETH_MDC                                                                       ,MDIOS_MDC                                  ,                              ,LCD_G5         ,EVENTOUT,ADC123_INP11/ADC123_INN10
-PortC,PC2 ,PWR_DEEPSLEEP,                                    ,                              ,DFSDM1_CKIN1                                      ,OCTOSPIM_P1_IO5                                                     ,SPI2_MISO/I2S2_SDI                               ,DFSDM1_CKOUT                                  ,                                                  ,                                           ,OCTOSPIM_P1_IO2                                             ,OTG_HS_ULPI_DIR                                         ,ETH_MII_TXD2                                                                  ,FMC_SDNE0                                  ,                              ,               ,EVENTOUT,ADC123_INP12/ADC123_INN11/C_ADC3_INN1/C_ADC3_INP0
-PortC,PC3 ,PWR_SLEEP    ,                                    ,                              ,DFSDM1_DATIN1                                     ,OCTOSPIM_P1_IO6                                                     ,SPI2_MOSI/I2S2_SDO                               ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_IO0                                             ,OTG_HS_ULPI_NXT                                         ,ETH_MII_TX_CLK                                                                ,FMC_SDCKE0                                 ,                              ,               ,EVENTOUT,ADC12_INP13/ADC12_INN12/C_ADC3_INP1
+PortC,PC2 ,PWR_DEEPSLEEP,                                    ,                              ,DFSDM1_CKIN1                                      ,OCTOSPIM_P1_IO5                                                     ,SPI2_MISO/I2S2_SDI                               ,DFSDM1_CKOUT                                  ,                                                  ,                                           ,OCTOSPIM_P1_IO2                                             ,OTG_HS_ULPI_DIR                                         ,ETH_MII_TXD2                                                                  ,FMC_SDNE0                                  ,                              ,               ,EVENTOUT,ADC123_INP12/ADC123_INN11
+PortC,PC2_C,            ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,        ,ADC3_INN1/ADC3_INP0
+PortC,PC3 ,PWR_SLEEP    ,                                    ,                              ,DFSDM1_DATIN1                                     ,OCTOSPIM_P1_IO6                                                     ,SPI2_MOSI/I2S2_SDO                               ,                                              ,                                                  ,                                           ,OCTOSPIM_P1_IO0                                             ,OTG_HS_ULPI_NXT                                         ,ETH_MII_TX_CLK                                                                ,FMC_SDCKE0                                 ,                              ,               ,EVENTOUT,ADC12_INP13/ADC12_INN12
+PortC,PC3_C,            ,                                    ,                              ,                                                  ,                                                                    ,                                                 ,                                              ,                                                  ,                                           ,                                                            ,                                                        ,                                                                              ,                                           ,                              ,               ,        ,ADC3_INP1
 PortC,PC4 ,PWR_DEEPSLEEP,FMC_A22                             ,                              ,DFSDM1_CKIN2                                      ,                                                                    ,I2S1_MCK                                         ,                                              ,                                                  ,                                           ,SPDIFRX1_IN3                                                ,SDMMC2_CKIN                                             ,ETH_MII_RXD0/ETH_RMII_RXD0                                                    ,FMC_SDNE0                                  ,                              ,LCD_R7         ,EVENTOUT,ADC12_INP4
 PortC,PC5 ,PWR_SLEEP    ,SAI4_D3                             ,SAI1_D3                       ,DFSDM1_DATIN2                                     ,PSSI_D15                                                            ,                                                 ,                                              ,                                                  ,                                           ,SPDIFRX1_IN4                                                ,OCTOSPIM_P1_DQS                                         ,ETH_MII_RXD1/ETH_RMII_RXD1                                                    ,FMC_SDCKE0                                 ,COMP1_OUT                     ,LCD_DE         ,EVENTOUT,ADC12_INP8/ADC12_INN4
 PortC,PC6 ,             ,                                    ,TIM3_CH1                      ,TIM8_CH1                                          ,DFSDM1_CKIN3                                                        ,I2S2_MCK                                         ,                                              ,USART6_TX                                         ,SDMMC1_D0DIR                               ,FMC_NWAIT                                                   ,SDMMC2_D6                                               ,                                                                              ,SDMMC1_D6                                  ,DCMI_D0/PSSI_D0               ,LCD_HSYNC      ,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h743_af.csv b/ports/stm32/boards/stm32h743_af.csv
index 4a291265c48fb..2c43b80dfe582 100644
--- a/ports/stm32/boards/stm32h743_af.csv
+++ b/ports/stm32/boards/stm32h743_af.csv
@@ -1,7 +1,9 @@
 Port ,Pin ,AF0          ,AF1                       ,AF2                    ,AF3                                  ,AF4                                     ,AF5               ,AF6                           ,AF7                               ,AF8                                        ,AF9                                                  ,AF10                                          ,AF11                                           ,AF12                               ,AF13              ,AF14     ,AF15    ,ADC
      ,    ,SYS          ,TIM1/2/16/17/LPTIM1/HRTIM1,SAI1/TIM3/4/5/12/HRTIM1,LPUART/TIM8/LPTIM2/3/4/5/HRTIM1/DFSDM,I2C1/2/3/4/USART1/TIM15/LPTIM2/DFSDM/CEC,SPI1/2/3/4/5/6/CEC,SPI2/3/SAI1/3/I2C4/UART4/DFSDM,SPI2/3/6/USART1/2/3/6/UART7/SDMMC1,SPI6/SAI2/4/UART4/5/8/LPUART/SDMMC1/SPDIFRX,SAI4/FDCAN1/2/TIM13/14/QUADSPI/FMC/SDMMC2/LCD/SPDIFRX,SAI2/4/TIM8/QUADSPI/SDMMC2/OTG1_HS/OTG2_FS/LCD,I2C4/UART7/SWPMI1/TIM1/8/DFSDM/SDMMC2/MDIOS/ETH,TIM1/8/FMC/SDMMC1/MDIOS/OTG1_FS/LCD,TIM1/DCMI/LCD/COMP,UART5/LCD,SYS     ,ADC
-PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR         ,TIM5_CH1               ,TIM8_ETR                             ,TIM15_BKIN                              ,                  ,                              ,USART2_CTS/USART2_NSS             ,UART4_TX                                   ,SDMMC2_CMD                                           ,SAI2_SD_B                                     ,ETH_MII_CRS                                    ,                                   ,                  ,         ,EVENTOUT,ADC1_INP16/C_ADC12_INN1/C_ADC12_INP0
-PortA,PA1 ,             ,TIM2_CH2                  ,TIM5_CH2               ,LPTIM3_OUT                           ,TIM15_CH1N                              ,                  ,                              ,USART2_RTS                        ,UART4_RX                                   ,QUADSPI_BK1_IO3                                      ,SAI2_MCK_B                                    ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK                ,                                   ,                  ,LCD_R2   ,EVENTOUT,ADC1_INN16/ADC1_INP17/C_ADC12_INP1
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR         ,TIM5_CH1               ,TIM8_ETR                             ,TIM15_BKIN                              ,                  ,                              ,USART2_CTS/USART2_NSS             ,UART4_TX                                   ,SDMMC2_CMD                                           ,SAI2_SD_B                                     ,ETH_MII_CRS                                    ,                                   ,                  ,         ,EVENTOUT,ADC1_INP16
+PortA,PA0_C,            ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,        ,ADC12_INP0
+PortA,PA1 ,             ,TIM2_CH2                  ,TIM5_CH2               ,LPTIM3_OUT                           ,TIM15_CH1N                              ,                  ,                              ,USART2_RTS                        ,UART4_RX                                   ,QUADSPI_BK1_IO3                                      ,SAI2_MCK_B                                    ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK                ,                                   ,                  ,LCD_R2   ,EVENTOUT,ADC1_INN16/ADC1_INP17/ADC12_INP1
+PortA,PA1_C,            ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,        ,ADC12_INP1
 PortA,PA2 ,             ,TIM2_CH3                  ,TIM5_CH3               ,LPTIM4_OUT                           ,TIM15_CH1                               ,                  ,                              ,USART2_TX                         ,SAI2_SCK_B                                 ,                                                     ,                                              ,ETH_MDIO                                       ,MDIOS_MDIO                         ,                  ,LCD_R1   ,EVENTOUT,ADC12_INP14
 PortA,PA3 ,             ,TIM2_CH4                  ,TIM5_CH4               ,LPTIM5_OUT                           ,TIM15_CH2                               ,                  ,                              ,USART2_RX                         ,                                           ,LCD_B2                                               ,OTG_HS_ULPI_D0                                ,ETH_MII_COL                                    ,                                   ,                  ,LCD_B5   ,EVENTOUT,ADC12_INP15
 PortA,PA4 ,             ,                          ,TIM5_ETR               ,                                     ,                                        ,SPI1_NSS/I2S1_WS  ,SPI3_NSS/I2S3_WS              ,USART2_CK                         ,SPI6_NSS                                   ,                                                     ,                                              ,                                               ,OTG_HS_SOF                         ,DCMI_HSYNC        ,LCD_VSYNC,EVENTOUT,ADC12_INP18
@@ -34,8 +36,10 @@ PortB,PB14,             ,TIM1_CH2N                 ,TIM12_CH1              ,TIM8
 PortB,PB15,RTC_REFIN    ,TIM1_CH3N                 ,TIM12_CH2              ,TIM8_CH3N                            ,USART1_RX                               ,SPI2_MOSI/I2S2_SDO,DFSDM_CKIN2                   ,                                  ,UART4_CTS                                  ,SDMMC2_D1                                            ,                                              ,                                               ,OTG_HS_DP                          ,                  ,         ,EVENTOUT,
 PortC,PC0 ,             ,                          ,                       ,DFSDM_CKIN0                          ,                                        ,                  ,DFSDM_DATIN4                  ,                                  ,SAI2_FS_B                                  ,                                                     ,OTG_HS_ULPI_STP                               ,                                               ,FMC_SDNWE                          ,                  ,LCD_R5   ,EVENTOUT,ADC123_INP10
 PortC,PC1 ,TRACED0      ,                          ,SAI1_D1                ,DFSDM_DATIN0                         ,DFSDM_CKIN4                             ,SPI2_MOSI/I2S2_SDO,SAI1_SD_A                     ,                                  ,SAI4_SD_A                                  ,SDMMC2_CK                                            ,SAI4_D1                                       ,ETH_MDC                                        ,MDIOS_MDC                          ,                  ,         ,EVENTOUT,ADC123_INN10/ADC123_INP11
-PortC,PC2 ,             ,                          ,                       ,DFSDM_CKIN1                          ,                                        ,SPI2_MISO/I2S2_SDI,DFSDM_CKOUT                   ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_DIR                               ,ETH_MII_TXD2                                   ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC123_INN11/ADC123_INP12/C_ADC3_INN1/C_ADC3_INP0
-PortC,PC3 ,             ,                          ,                       ,DFSDM_DATIN1                         ,                                        ,SPI2_MOSI/I2S2_SDO,                              ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_NXT                               ,ETH_MII_TX_CLK                                 ,FMC_SDCKE0                         ,                  ,         ,EVENTOUT,ADC12_INN12/ADC12_INP13/C_ADC3_INP1
+PortC,PC2 ,             ,                          ,                       ,DFSDM_CKIN1                          ,                                        ,SPI2_MISO/I2S2_SDI,DFSDM_CKOUT                   ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_DIR                               ,ETH_MII_TXD2                                   ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC123_INN11/ADC123_INP12
+PortC,PC2_C,            ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,        ,ADC3_INP0
+PortC,PC3 ,             ,                          ,                       ,DFSDM_DATIN1                         ,                                        ,SPI2_MOSI/I2S2_SDO,                              ,                                  ,                                           ,                                                     ,OTG_HS_ULPI_NXT                               ,ETH_MII_TX_CLK                                 ,FMC_SDCKE0                         ,                  ,         ,EVENTOUT,ADC12_INN12/ADC12_INP13
+PortC,PC3_C,            ,                          ,                       ,                                     ,                                        ,                  ,                              ,                                  ,                                           ,                                                     ,                                              ,                                               ,                                   ,                  ,         ,        ,ADC3_INP1
 PortC,PC4 ,             ,                          ,                       ,DFSDM_CKIN2                          ,                                        ,I2S1_MCK          ,                              ,                                  ,                                           ,SPDIFRX_IN2                                          ,                                              ,ETH_MII_RXD0/ETH_RMII_RXD0                     ,FMC_SDNE0                          ,                  ,         ,EVENTOUT,ADC12_INP4
 PortC,PC5 ,             ,                          ,SAI1_D3                ,DFSDM_DATIN2                         ,                                        ,                  ,                              ,                                  ,                                           ,SPDIFRX_IN3                                          ,SAI4_D3                                       ,ETH_MII_RXD1/ETH_RMII_RXD1                     ,FMC_SDCKE0                         ,COMP_1_OUT        ,         ,EVENTOUT,ADC12_INN4/ADC12_INP8
 PortC,PC6 ,             ,HRTIM_CHA1                ,TIM3_CH1               ,TIM8_CH1                             ,DFSDM_CKIN3                             ,I2S2_MCK          ,                              ,USART6_TX                         ,SDMMC1_D0DIR                               ,FMC_NWAIT                                            ,SDMMC2_D6                                     ,                                               ,SDMMC1_D6                          ,DCMI_D0           ,LCD_HSYNC,EVENTOUT,
diff --git a/ports/stm32/boards/stm32h7b3_af.csv b/ports/stm32/boards/stm32h7b3_af.csv
index 1acef21f37e56..f202f56c89bd9 100644
--- a/ports/stm32/boards/stm32h7b3_af.csv
+++ b/ports/stm32/boards/stm32h7b3_af.csv
@@ -1,7 +1,9 @@
 Port ,Pin ,AF0             ,AF1                ,AF2                    ,AF3                                       ,AF4                                                  ,AF5                                               ,AF6                                           ,AF7                                                    ,AF8                                             ,AF9                                                    ,AF10                                                    ,AF11                                                                    ,AF12                             ,AF13                           ,AF14      ,AF15    ,ADC
      ,    ,SYS             ,LPTIM1/TIM1/2/16/17,PDM_SAI1/TIM3/4/5/12/15,DFSDM1/LPTIM2/3/LPUART1/OCTOSPIM_P1/2/TIM8,CEC/DCMI/PSSI/DFSDM1/2/I2C1/2/3/4/LPTIM2/TIM15/USART1,CEC/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/SPI6/I2S6,DFSDM1/2/I2C4/OCTOSPIM_P1/SAI1/SPI3/I2S3/UART4,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/I2S6/UART7/USART1/2/3/6,LPUART1/SAI2/SDMMC1/SPDIFRX1/SPI6/I2S6/UART4/5/8,FDCAN1/2/FMC/LCD/OCTOSPIM_P1/2/SDMMC2/SPDIFRX1/TIM13/14,CRS/FMC/LCD/OCTOSPIM_P1/OTG1_FS/OTG1_HS/SAI2/SDMMC2/TIM8,DFSDM1/2/I2C4/LCD/MDIOS/OCTOSPIM_P1/SDMMC2/SWPMI1/TIM1/8/UART7/9/USART10,FMC/LCD/MDIOS/SDMMC1/TIM1/8      ,COMP/DCMI/PSSI/LCD/TIM1        ,LCD/UART5 ,SYS     ,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,ADC1_INP16/C_ADC1_INP0/C_ADC1_INN1
-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,ADC1_INN16/ADC1_INP17/C_ADC1_INP1
+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,ADC1_INP16
+PortA,PA0_C,               ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,        ,ADC1_INP0/ADC1_INN1
+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,ADC1_INN16/ADC1_INP17
+PortA,PA1_C,               ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,        ,ADC1_INP1
 PortA,PA2 ,                ,TIM2_CH3           ,TIM5_CH3               ,                                          ,TIM15_CH1                                            ,                                                  ,DFSDM2_CKIN1                                  ,USART2_TX                                              ,SAI2_SCK_B                                      ,                                                       ,                                                        ,                                                                        ,MDIOS_MDIO                       ,                               ,LTDC_R1   ,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,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,ADC1_INP18
@@ -34,8 +36,10 @@ PortB,PB14,                ,TIM1_CH2N          ,TIM12_CH1              ,TIM8_CH2
 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,
 PortC,PC0 ,                ,                   ,                       ,DFSDM1_CKIN0                              ,                                                     ,                                                  ,DFSDM1_DATIN4                                 ,                                                       ,SAI2_FS_B                                       ,FMC_A25                                                ,USB_OTG_HS_ULPI_STP                                     ,LTDC_G2                                                                 ,FMC_SDNWE                        ,                               ,LTDC_R5   ,EVENTOUT,ADC12_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,ADC12_INN10/ADC12_INP11
-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,ADC12_INN11/ADC12_INP12/C_ADC2_INP0/C_ADC2_INN1
-PortC,PC3 ,PWR_CSLEEP      ,                   ,                       ,DFSDM1_DATIN1                             ,                                                     ,I2S2_SDO/SPI2_MOSI                                ,                                              ,                                                       ,                                                ,OCTOSPIM_P1_IO0                                        ,USB_OTG_HS_ULPI_NXT                                     ,OCTOSPIM_P1_IO6                                                         ,FMC_SDCKE0                       ,                               ,          ,EVENTOUT,ADC12_INP13,ADC12_INN12/C_ADC2_INP1
+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,ADC12_INN11/ADC12_INP12
+PortC,PC2_C,               ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,        ,ADC2_INP0/ADC2_INN1
+PortC,PC3 ,PWR_CSLEEP      ,                   ,                       ,DFSDM1_DATIN1                             ,                                                     ,I2S2_SDO/SPI2_MOSI                                ,                                              ,                                                       ,                                                ,OCTOSPIM_P1_IO0                                        ,USB_OTG_HS_ULPI_NXT                                     ,OCTOSPIM_P1_IO6                                                         ,FMC_SDCKE0                       ,                               ,          ,EVENTOUT,ADC12_INP13,ADC12_INN12
+PortC,PC3_C,               ,                   ,                       ,                                          ,                                                     ,                                                  ,                                              ,                                                       ,                                                ,                                                       ,                                                        ,                                                                        ,                                 ,                               ,          ,        ,ADC2_INP1
 PortC,PC4 ,                ,                   ,                       ,DFSDM1_CKIN2                              ,                                                     ,I2S1_MCK                                          ,                                              ,                                                       ,                                                ,SPDIFRX_IN3                                            ,                                                        ,                                                                        ,FMC_SDNE0                        ,                               ,LTDC_R7   ,EVENTOUT,ADC12_INP4
 PortC,PC5 ,                ,                   ,SAI1_D3                ,DFSDM1_DATIN2                             ,PSSI_D15                                             ,                                                  ,                                              ,                                                       ,                                                ,SPDIFRX_IN4                                            ,OCTOSPIM_P1_DQS                                         ,                                                                        ,FMC_SDCKE0                       ,COMP1_OUT                      ,LTDC_DE   ,EVENTOUT,ADC12_INN4/ADC12_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,
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 16ee01b67bd9b..67a6ee990e399 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -390,6 +390,15 @@
 #define MICROPY_HW_MAX_UART (8)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#if defined(MICROPY_HW_ANALOG_SWITCH_PA0) \
+    || defined(MICROPY_HW_ANALOG_SWITCH_PA1) \
+    || defined(MICROPY_HW_ANALOG_SWITCH_PC2) \
+    || defined(MICROPY_HW_ANALOG_SWITCH_PC3)
+#define MICROPY_HW_ENABLE_ANALOG_ONLY_PINS (1)
+#else
+#define MICROPY_HW_ENABLE_ANALOG_ONLY_PINS (0)
+#endif
+
 // Configuration for STM32L0 series
 #elif defined(STM32L0)
 
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 0b939334a2b6d..117a8366dbffe 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -103,7 +103,11 @@ 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, &pin_type)) {
+    if (mp_obj_is_type(user_obj, &pin_type)
+        #if MICROPY_HW_ENABLE_ANALOG_ONLY_PINS
+        || mp_obj_is_type(user_obj, &pin_analog_type)
+        #endif
+        ) {
         pin_obj = MP_OBJ_TO_PTR(user_obj);
         if (pin_class_debug) {
             mp_printf(print, "Pin map passed pin ");
@@ -601,6 +605,44 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &pin_locals_dict
     );
 
+/******************************************************************************/
+// Special analog-only pin.
+
+#if MICROPY_HW_ENABLE_ANALOG_ONLY_PINS
+
+// When both normal and _C pins are defined in pins.csv, force the corresponding
+// analog switch to be open.  The macro code below will produce a compiler warning
+// if the board defines the switch as closed.
+#if defined(pin_A0) && defined(pin_A0_C)
+#define MICROPY_HW_ANALOG_SWITCH_PA0 (SYSCFG_SWITCH_PA0_OPEN)
+#endif
+#if defined(pin_A1) && defined(pin_A1_C)
+#define MICROPY_HW_ANALOG_SWITCH_PA1 (SYSCFG_SWITCH_PA1_OPEN)
+#endif
+#if defined(pin_C2) && defined(pin_C2_C)
+#define MICROPY_HW_ANALOG_SWITCH_PC2 (SYSCFG_SWITCH_PC2_OPEN)
+#endif
+#if defined(pin_C3) && defined(pin_C3_C)
+#define MICROPY_HW_ANALOG_SWITCH_PC3 (SYSCFG_SWITCH_PC3_OPEN)
+#endif
+
+static void pin_analog_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);
+    mp_printf(print, "Pin(Pin.cpu.%q, mode=Pin.ANALOG)", self->name);
+}
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_analog_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    print, pin_analog_print
+    );
+
+#endif
+
+/******************************************************************************/
+// PinAF class
+
 /// \moduleref pyb
 /// \class PinAF - Pin Alternate Functions
 ///
diff --git a/ports/stm32/pin.h b/ports/stm32/pin.h
index d16c176380262..04479bd042f71 100644
--- a/ports/stm32/pin.h
+++ b/ports/stm32/pin.h
@@ -56,6 +56,7 @@ typedef struct {
 } machine_pin_obj_t;
 
 extern const mp_obj_type_t pin_type;
+extern const mp_obj_type_t pin_analog_type;
 extern const mp_obj_type_t pin_af_type;
 
 // Include all of the individual pin objects

From 32623d3d198c702085d8cede8c306bb61962bd9a Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Mon, 29 Jan 2024 15:53:16 -0300
Subject: [PATCH 0891/3129] stm32/boards: Add named digital and analog pins for
 Arduino boardrs.

Adds Dx and Ax named pins for Arduino Gigi, Arduino Nicla Vision and
Arduino Portenta H7.  The analog pins include the dual-pad _C pins.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/stm32/boards/ARDUINO_GIGA/pins.csv      | 122 +++++++++++++++++-
 .../boards/ARDUINO_NICLA_VISION/pins.csv      |  24 ++++
 .../stm32/boards/ARDUINO_PORTENTA_H7/pins.csv |  31 +++++
 3 files changed, 175 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/pins.csv b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
index 9de1a316d1cd4..8a1f505aef5fa 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/pins.csv
+++ b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
@@ -166,6 +166,123 @@ PK4,PK4
 PK5,PK5
 PK6,PK6
 PK7,PK7
+
+# Arduino Digital Pins
+D0,PB7
+D1,PA9
+D2,PA3
+D3,PA2
+D4,PJ8
+D5,PA7
+D6,PD13
+D7,PB4
+D8,PB8
+D9,PB9
+D10,PK1
+D11,PJ10
+D12,PJ11
+D13,PH6
+D14,PG14
+D15,PC7
+D16,PH13
+D17,PI9
+D18,PD5
+D19,PD6
+D20,PB11
+D21,PH4
+D22,PJ12
+D23,PG13
+D24,PG12
+D25,PJ0
+D26,PJ14
+D27,PJ1
+D28,PJ15
+D29,PJ2
+D30,PK3
+D31,PJ3
+D32,PK4
+D33,PJ4
+D34,PK5
+D35,PJ5
+D36,PK6
+D37,PJ6
+D38,PJ7
+D39,PI14
+D40,PE6
+D41,PK7
+D42,PI15
+D43,PI10
+D44,PG10
+D45,PI13
+D46,PH15
+D47,PB2
+D48,PK0
+D49,PE4
+D50,PI11
+D51,PE5
+D52,PK2
+D53,PG7
+D54,PI5
+D55,PH8
+D56,PA6
+D57,PJ9
+D58,PI7
+D59,PI6
+D60,PI4
+D61,PH14
+D62,PG11
+D63,PH11
+D64,PH10
+D65,PH9
+D66,PA1
+D67,PD4
+D68,PC6
+D69,PI0
+D70,PI1
+D71,PI2
+D72,PI3
+D73,PC1
+D74,PB12
+D75,PD3
+D76,PC4
+D77,PC5
+D78,PB0
+D79,PB1
+D80,PC3
+D81,PC2
+D82,PC0
+D83,PA0
+D84,PA4
+D85,PA5
+D86,PI12
+D87,PJ13
+D88,PE3
+D89,PG9
+D90,PD7
+D91,PB3
+D92,PA15
+D93,PB5
+D94,PB13
+D100,PC13
+D101,PB6
+D102,PH12
+
+# Arduino Analog Pins
+A0,PC4
+A1,PC5
+A2,PB0
+A3,PB1
+A4,PC3
+A5,PC2
+A6,PC0
+A7,PA0
+A8,PC2_C
+A9,PC3_C
+A10,PA1_C
+A11,PA0_C
+A12,PA4
+A13,PA5
+
 UART1_TX,PA9
 UART1_RX,PB7
 UART2_TX,PD5
@@ -177,11 +294,12 @@ UART6_RX,PC7
 -USB_DM,PA11
 -USB_DP,PA12
 #BOOT0,BOOT0
-DAC1,PA4
-DAC2,PA5
+DAC0,PA4
+DAC1,PA5
 LEDR,PI12
 LEDG,PJ13
 LEDB,PE3
+LED_BUILTIN,PJ13
 LED_RED,PI12
 LED_GREEN,PJ13
 LED_BLUE,PE3
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
index 72f57adf74234..7996e75496eda 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
@@ -166,6 +166,30 @@ PK4,PK4
 PK5,PK5
 PK6,PK6
 PK7,PK7
+
+# Arduino Digital Pins
+D0,PG12
+D1,PA9
+D2,PA10
+D3,PG1
+
+# Arduino Analog Pins
+A0,PC4
+A1,PF13
+A2,PF3
+
+SCKL,PE12
+CIPO,PE13
+COPI,PE14
+CS,PE11
+LPIO0,PG12
+LPIO1,PA9
+LPIO2,PA10
+LPIO3,PG1
+SCL,PB8
+SDA,PB9
+UART_RX,PA10
+UART_TX,PA9
 UART1_TX,PA9
 UART1_RX,PA10
 UART4_TX,-PA0
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
index 3b93dcba73f91..64082d87b3d0e 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -166,6 +166,36 @@ PK4,PK4
 PK5,PK5
 PK6,PK6
 PK7,PK7
+
+# Arduino Digital Pins
+D0,PH15
+D1,PK1
+D2,PJ11
+D3,PG7
+D4,PC7
+D5,PC6
+D6,PA8
+D7,PI0
+D8,PC3
+D9,PI1
+D10,PC2
+D11,PH8
+D12,PH7
+D13,PA10
+D14,PA9
+D20,PC3
+D21,PA4
+
+# Arduino Analog Pins
+A0,PA0_C
+A1,PA1_C
+A2,PC2_C
+A3,PC3_C
+A4,PC2
+A5,PC3
+A6,PA4
+A7,PA6
+
 UART1_TX,PA9
 UART1_RX,PA10
 UART4_TX,PA0
@@ -209,6 +239,7 @@ LEDB,PK7
 LED_RED,PK5
 LED_GREEN,PK6
 LED_BLUE,PK7
+LED_BUILTIN,PK6
 I2C1_SDA,PB7
 I2C1_SCL,PB6
 I2C3_SDA,PH8

From ed29a4123f626ea912880dc8ae4ca8d183382858 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Mon, 29 Jan 2024 15:53:46 -0300
Subject: [PATCH 0892/3129] rp2/boards: Add named digital pins for Arduino Nano
 RP2040 Connect.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
index 5f8aeaf447f77..450f57d723805 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
@@ -12,6 +12,10 @@ D10,GPIO5
 D11,GPIO7
 D12,GPIO4
 D13,GPIO6
+D14,GPIO26
+D15,GPIO27
+D16,GPIO28
+D17,GPIO29
 LED,GPIO6
 LED_BUILTIN,GPIO6
 A0,GPIO26

From 27c0992343fe270c7b2e5ea24d2e47c9d8eb2430 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Mon, 29 Jan 2024 15:54:00 -0300
Subject: [PATCH 0893/3129] esp32/boards: Add missing named digital pins for
 Arduino Nano ESP32.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv b/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
index 5934ae7bf2a0c..fcd3d23004170 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/pins.csv
@@ -12,6 +12,14 @@ D10,GPIO21
 D11,GPIO38
 D12,GPIO47
 D13,GPIO48
+D17,GPIO1
+D18,GPIO2
+D19,GPIO3
+D20,GPIO4
+D21,GPIO11
+D22,GPIO12
+D23,GPIO13
+D24,GPIO14
 LEDR,GPIO46
 LEDG,GPIO0
 LEDB,GPIO45

From 5c5fe8782164057f13d2cb8a13ab6c933c5b90b7 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Mon, 29 Jan 2024 15:54:09 -0300
Subject: [PATCH 0894/3129] nrf/boards: Add named pins for Arduino Nano 33 BLE.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 .../boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
index 9d931634f627d..972dd9d3bdcb8 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
@@ -46,5 +46,37 @@ P44,P44
 P45,P45
 P46,P46
 P47,P47
+
+# Arduino Digital Pins
+D2,P43
+D3,P44
+D4,P47
+D5,P45
+D6,P46
+D7,P23
+D8,P21
+D9,P27
+D10,P34
+D11,P33
+D12,P40
+D13,P13
+
+# Arduino Analog Pins
+A0,P4
+A1,P5
+A2,P30
+A3,P29
+A4,P31
+A5,P2
+A6,P28
+A7,P3
+
+LEDR,P24
+LEDG,P16
+LEDB,P6
+LED_BUILTIN,P13
+LED_PWR,P41
+TX,P35
+RX,P42
 I2C_SCL,P2
 I2C_SDA,P31

From 4dc262c8fd1c4624ccbd76910c2578db1979e805 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Mon, 29 Jan 2024 15:54:20 -0300
Subject: [PATCH 0895/3129] renesas-ra/boards: Add named pins for Arduino
 Portenta C33.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 .../boards/ARDUINO_PORTENTA_C33/pins.csv        | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
index 77b5c3de52820..9c49fe3755e67 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
@@ -144,12 +144,29 @@ D2,P111
 D3,P303
 D4,P401
 D5,P210
+D6,P601
+D7,P402
+D8,P900
+D9,P204
+D10,P315
+D11,P407
+D12,P408
+D13,P110
+D14,P602
 LED1,P107
 LED2,P400
 LED3,P800
 LEDR,P107
 LEDG,P400
 LEDB,P800
+LED_BUILTIN,P400
 LED_RED,P107
 LED_GREEN,P400
 LED_BLUE,P800
+COPI,P900
+CIPO,P315
+SCK,P204
+CS,P402
+SS,P402
+UART_TX,P602
+UART_RX,P110

From 0b145fdc2d4857a77f9f0a3662646d52da61d5b2 Mon Sep 17 00:00:00 2001
From: MikeTeachman <mike.teachman@gmail.com>
Date: Tue, 20 Feb 2024 21:37:30 -0800
Subject: [PATCH 0896/3129] esp32/machine_i2s: Integrate new I2S IDF driver.

The legacy I2S "shim" is removed and replaced by the new I2S driver.  The
new driver fixes a bug where mono audio plays only in one channel.

Application code size is reduced by 2672 bytes with this change.  Tested on
ESP32, ESP32+spiram, ESP32-S3 using example code from
https://github.com/miketeachman/micropython-i2s-examples

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 extmod/machine_i2s.c              |  25 +--
 ports/esp32/boards/sdkconfig.base |   1 -
 ports/esp32/machine_i2s.c         | 280 +++++++++++++++---------------
 ports/esp32/mpconfigport.h        |   6 +-
 4 files changed, 150 insertions(+), 162 deletions(-)

diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
index 7e069c5d76cbf..9c92eb4c926b7 100644
--- a/extmod/machine_i2s.c
+++ b/extmod/machine_i2s.c
@@ -608,6 +608,7 @@ static mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
         #else
         uint32_t num_bytes_written = copy_appbuf_to_dma(self, &appbuf);
         #endif
+
         return num_bytes_written;
     }
 }
@@ -632,16 +633,8 @@ static mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
                 ret |= MP_STREAM_POLL_RD;
             }
             #else
-            // 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
-            i2s_event_t i2s_event;
-            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 (self->dma_buffer_status == DMA_MEMORY_NOT_EMPTY) {
+                ret |= MP_STREAM_POLL_RD;
             }
             #endif
         }
@@ -657,16 +650,8 @@ static mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
                 ret |= MP_STREAM_POLL_WR;
             }
             #else
-            // 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
-            i2s_event_t i2s_event;
-            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;
-                }
+            if (self->dma_buffer_status == DMA_MEMORY_NOT_FULL) {
+                ret |= MP_STREAM_POLL_WR;
             }
             #endif
         }
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 05624f0d7409b..fef25fe3087f5 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -112,7 +112,6 @@ CONFIG_UART_ISR_IN_IRAM=y
 # IDF 5 deprecated
 CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
-CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
 
 CONFIG_ETH_USE_SPI_ETHERNET=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 574125ad6a0d9..6ba2f54c354c6 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -28,9 +28,7 @@
 // extmod/machine_i2s.c via MICROPY_PY_MACHINE_I2S_INCLUDEFILE.
 
 #include "py/mphal.h"
-
-#include "driver/i2s.h"
-#include "soc/i2s_reg.h"
+#include "driver/i2s_std.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/queue.h"
@@ -62,23 +60,32 @@ typedef struct _non_blocking_descriptor_t {
     direction_t direction;
 } non_blocking_descriptor_t;
 
+typedef enum {
+    DMA_MEMORY_FULL,
+    DMA_MEMORY_NOT_FULL,
+    DMA_MEMORY_EMPTY,
+    DMA_MEMORY_NOT_EMPTY,
+} dma_buffer_status_t;
+
 typedef struct _machine_i2s_obj_t {
     mp_obj_base_t base;
     i2s_port_t i2s_id;
+    i2s_chan_handle_t i2s_chan_handle;
     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;
+    i2s_dir_t mode;
+    i2s_data_bit_width_t bits;
     format_t format;
     int32_t rate;
     int32_t ibuf;
     mp_obj_t callback_for_non_blocking;
     io_mode_t io_mode;
+    bool is_deinit;
     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;
+    dma_buffer_status_t dma_buffer_status;
 } machine_i2s_obj_t;
 
 static mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
@@ -87,10 +94,10 @@ static mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
 // 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
+    { 2,  3, -1, -1, -1, -1, -1, -1 },  // Mono, 16-bits
+    { 0,  1,  2,  3, -1, -1, -1, -1 },  // Mono, 32-bits
+    { 2,  3,  6,  7, -1, -1, -1, -1 },  // Stereo, 16-bits
+    { 0,  1,  2,  3,  4,  5,  6,  7 },  // Stereo, 32-bits
 };
 
 void machine_i2s_init0() {
@@ -99,49 +106,15 @@ void machine_i2s_init0() {
     }
 }
 
-//  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) {
+static int8_t get_frame_mapping_index(i2s_data_bit_width_t bits, format_t format) {
     if (format == MONO) {
-        if (bits == I2S_BITS_PER_SAMPLE_16BIT) {
+        if (bits == I2S_DATA_BIT_WIDTH_16BIT) {
             return 0;
         } else { // 32 bits
             return 1;
         }
     } else { // STEREO
-        if (bits == I2S_BITS_PER_SAMPLE_16BIT) {
+        if (bits == I2S_DATA_BIT_WIDTH_16BIT) {
             return 2;
         } else { // 32 bits
             return 3;
@@ -149,32 +122,32 @@ static int8_t get_frame_mapping_index(i2s_bits_per_sample_t bits, format_t forma
     }
 }
 
-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)) {
+static i2s_data_bit_width_t get_dma_bits(uint8_t mode, i2s_data_bit_width_t bits) {
+    if (mode == MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
         return bits;
     } else { // Master Rx
         // read 32 bit samples for I2S hardware.  e.g. MEMS microphones
-        return I2S_BITS_PER_SAMPLE_32BIT;
+        return I2S_DATA_BIT_WIDTH_32BIT;
     }
 }
 
-static i2s_channel_fmt_t get_dma_format(uint8_t mode, format_t format) {
-    if (mode == (I2S_MODE_MASTER | I2S_MODE_TX)) {
+static i2s_slot_mode_t get_dma_format(uint8_t mode, format_t format) {
+    if (mode == MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
         if (format == MONO) {
-            return I2S_CHANNEL_FMT_ONLY_LEFT;
+            return I2S_SLOT_MODE_MONO;
         } else {  // STEREO
-            return I2S_CHANNEL_FMT_RIGHT_LEFT;
+            return I2S_SLOT_MODE_STEREO;
         }
     } else { // Master Rx
         // read stereo frames for all I2S hardware
-        return I2S_CHANNEL_FMT_RIGHT_LEFT;
+        return I2S_SLOT_MODE_STEREO;
     }
 }
 
-static uint32_t get_dma_buf_count(uint8_t mode, i2s_bits_per_sample_t bits, format_t format, int32_t ibuf) {
+static uint32_t get_dma_buf_count(uint8_t mode, i2s_data_bit_width_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);
+        (get_dma_bits(mode, bits) / 8) * (get_dma_format(mode, format) == I2S_SLOT_MODE_STEREO ? 2: 1);
 
     uint32_t dma_buf_count = ibuf / (DMA_BUF_LEN_IN_I2S_FRAMES * dma_frame_size_in_bytes);
 
@@ -204,18 +177,23 @@ static uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
 
         TickType_t delay;
         if (self->io_mode == ASYNCIO) {
-            delay = 0; // stop i2s_read() operation if DMA memory becomes empty
+            delay = 0; // stop i2s_channel_read() operation if DMA memory becomes empty
         } else {
             delay = portMAX_DELAY;  // block until supplied buffer is filled
         }
 
-        esp_err_t ret = i2s_read(
-            self->i2s_id,
+        esp_err_t ret = i2s_channel_read(
+            self->i2s_chan_handle,
             self->transform_buffer,
             num_bytes_requested_from_dma,
             &num_bytes_received_from_dma,
             delay);
-        check_esp_err(ret);
+
+        // i2s_channel_read returns ESP_ERR_TIMEOUT when buffer cannot be filled by the timeout delay.
+        if ((self->io_mode != ASYNCIO) ||
+            ((self->io_mode == ASYNCIO) && (ret != ESP_ERR_TIMEOUT))) {
+            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.
@@ -246,9 +224,7 @@ static uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
 
         if ((self->io_mode == ASYNCIO) && (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);
+            self->dma_buffer_status = DMA_MEMORY_EMPTY;
             break;
         }
     }
@@ -257,34 +233,28 @@ static uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
 }
 
 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);
-    }
-
     size_t num_bytes_written = 0;
 
     TickType_t delay;
     if (self->io_mode == ASYNCIO) {
-        delay = 0;  // stop i2s_write() operation if DMA memory becomes full
+        delay = 0;  // stop i2s_channel_write() operation if DMA memory becomes full
     } else {
         delay = portMAX_DELAY;  // block until supplied buffer is emptied
     }
 
-    esp_err_t ret = i2s_write(self->i2s_id, appbuf->buf, appbuf->len, &num_bytes_written, delay);
-    check_esp_err(ret);
+    esp_err_t ret = i2s_channel_write(self->i2s_chan_handle, appbuf->buf, appbuf->len, &num_bytes_written, delay);
+
+    // i2s_channel_write returns ESP_ERR_TIMEOUT when buffer cannot be emptied by the timeout delay.
+    if ((self->io_mode != ASYNCIO) ||
+        ((self->io_mode == ASYNCIO) && (ret != ESP_ERR_TIMEOUT))) {
+        check_esp_err(ret);
+    }
 
     if ((self->io_mode == ASYNCIO) && (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 asyncio 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);
-        }
+        self->dma_buffer_status = DMA_MEMORY_FULL;
     }
+
     return num_bytes_written;
 }
 
@@ -306,6 +276,34 @@ static void task_for_non_blocking_mode(void *self_in) {
     }
 }
 
+// callback indicating that a DMA buffer was just filled with samples received from an I2S port
+static IRAM_ATTR bool i2s_rx_recv_callback(i2s_chan_handle_t handle, i2s_event_data_t *event, void *self_in) {
+    machine_i2s_obj_t *self = (machine_i2s_obj_t *)self_in;
+    self->dma_buffer_status = DMA_MEMORY_NOT_EMPTY;
+    return false;
+}
+
+// callback indicating that samples in a DMA buffer were just transmitted to an I2S port
+static IRAM_ATTR bool i2s_tx_sent_callback(i2s_chan_handle_t handle, i2s_event_data_t *event, void *self_in) {
+    machine_i2s_obj_t *self = (machine_i2s_obj_t *)self_in;
+    self->dma_buffer_status = DMA_MEMORY_NOT_FULL;
+    return false;
+}
+
+i2s_event_callbacks_t i2s_callbacks = {
+    .on_recv = i2s_rx_recv_callback,
+    .on_recv_q_ovf = NULL,
+    .on_sent = i2s_tx_sent_callback,
+    .on_send_q_ovf = NULL,
+};
+
+i2s_event_callbacks_t i2s_callbacks_null = {
+    .on_recv = NULL,
+    .on_recv_q_ovf = NULL,
+    .on_sent = NULL,
+    .on_send_q_ovf = NULL,
+};
+
 static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // are Pins valid?
     int8_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sck].u_obj);
@@ -313,16 +311,16 @@ static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     int8_t sd = args[ARG_sd].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(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))) {
+    int8_t mode = args[ARG_mode].u_int;
+    if ((mode != (MICROPY_PY_MACHINE_I2S_CONSTANT_RX)) &&
+        (mode != (MICROPY_PY_MACHINE_I2S_CONSTANT_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)) {
+    i2s_data_bit_width_t bits = args[ARG_bits].u_int;
+    if ((bits != I2S_DATA_BIT_WIDTH_16BIT) &&
+        (bits != I2S_DATA_BIT_WIDTH_32BIT)) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
     }
 
@@ -348,54 +346,57 @@ static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     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;
+    self->is_deinit = false;
+
+    if (mode == MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
+        self->dma_buffer_status = DMA_MEMORY_NOT_FULL;
+    } else { // rx
+        self->dma_buffer_status = DMA_MEMORY_NOT_EMPTY;
+    }
+
+    i2s_chan_config_t chan_config = I2S_CHANNEL_DEFAULT_CONFIG(self->i2s_id, I2S_ROLE_MASTER);
+    chan_config.dma_desc_num = get_dma_buf_count(mode, bits, format, self->ibuf);
+    chan_config.dma_frame_num = DMA_BUF_LEN_IN_I2S_FRAMES;
+    chan_config.auto_clear = true;
+
+    if (mode == MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
+        ESP_ERROR_CHECK(i2s_new_channel(&chan_config, &self->i2s_chan_handle, NULL));
+    } else { // rx
+        ESP_ERROR_CHECK(i2s_new_channel(&chan_config, NULL, &self->i2s_chan_handle));
+    }
 
-    i2s_config_t i2s_config;
-    i2s_config.communication_format = I2S_COMM_FORMAT_STAND_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_desc_num = get_dma_buf_count(mode, bits, format, self->ibuf);
-    i2s_config.dma_frame_num = DMA_BUF_LEN_IN_I2S_FRAMES;
-    i2s_config.use_apll = false;
-    i2s_config.tx_desc_auto_clear = true;
-    i2s_config.fixed_mclk = 0;
-    i2s_config.mclk_multiple = I2S_MCLK_MULTIPLE_256;
-    i2s_config.bits_per_chan = 0;
-
-    // I2S queue size equals the number of DMA buffers
-    check_esp_err(i2s_driver_install(self->i2s_id, &i2s_config, i2s_config.dma_desc_num, &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
-    #if CONFIG_IDF_TARGET_ESP32S3
-    REG_SET_BIT(I2S_TX_CONF_REG(self->i2s_id), I2S_TX_MSB_SHIFT);
-    REG_SET_BIT(I2S_TX_CONF_REG(self->i2s_id), I2S_RX_MSB_SHIFT);
-    #else
-    REG_SET_BIT(I2S_CONF_REG(self->i2s_id), I2S_TX_MSB_RIGHT);
-    REG_SET_BIT(I2S_CONF_REG(self->i2s_id), I2S_RX_MSB_RIGHT);
-    #endif
-
-    i2s_pin_config_t pin_config;
-    pin_config.mck_io_num = I2S_PIN_NO_CHANGE;
-    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 = I2S_PIN_NO_CHANGE;
-    } else { // TX
-        pin_config.data_in_num = I2S_PIN_NO_CHANGE;
-        pin_config.data_out_num = self->sd;
+    i2s_std_slot_config_t slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(get_dma_bits(mode, bits), get_dma_format(mode, format));
+    slot_cfg.slot_mask = I2S_STD_SLOT_BOTH;
+
+    i2s_std_config_t std_cfg = {
+        .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(self->rate),
+        .slot_cfg = slot_cfg,
+        .gpio_cfg = {
+            .mclk = I2S_GPIO_UNUSED,
+            .bclk = self->sck,
+            .ws = self->ws,
+            .invert_flags = {
+                .mclk_inv = false,
+                .bclk_inv = false,
+                .ws_inv = false,
+            },
+        },
+    };
+
+    if (mode == MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
+        std_cfg.gpio_cfg.dout = self->sd;
+        std_cfg.gpio_cfg.din = I2S_GPIO_UNUSED;
+    } else { // rx
+        std_cfg.gpio_cfg.dout = I2S_GPIO_UNUSED;
+        std_cfg.gpio_cfg.din = self->sd;
     }
 
-    check_esp_err(i2s_set_pin(self->i2s_id, &pin_config));
+    ESP_ERROR_CHECK(i2s_channel_init_std_mode(self->i2s_chan_handle, &std_cfg));
+    ESP_ERROR_CHECK(i2s_channel_register_event_callback(self->i2s_chan_handle, &i2s_callbacks, self));
+    ESP_ERROR_CHECK(i2s_channel_enable(self->i2s_chan_handle));
 }
 
 static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
@@ -417,19 +418,22 @@ static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
 }
 
 static void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
-    i2s_driver_uninstall(self->i2s_id);
+    if (!self->is_deinit) {
+        ESP_ERROR_CHECK(i2s_channel_disable(self->i2s_chan_handle));
+        ESP_ERROR_CHECK(i2s_channel_register_event_callback(self->i2s_chan_handle, &i2s_callbacks_null, self));
+        ESP_ERROR_CHECK(i2s_del_channel(self->i2s_chan_handle));
 
-    if (self->non_blocking_mode_task != NULL) {
-        vTaskDelete(self->non_blocking_mode_task);
-        self->non_blocking_mode_task = NULL;
-    }
+        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;
+        if (self->non_blocking_mode_queue != NULL) {
+            vQueueDelete(self->non_blocking_mode_queue);
+            self->non_blocking_mode_queue = NULL;
+        }
+        self->is_deinit = true;
     }
-
-    self->i2s_event_queue = NULL;
 }
 
 static void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index acf065384b7da..be02d45883bcd 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -9,7 +9,7 @@
 #include "esp_random.h"
 #include "esp_system.h"
 #include "freertos/FreeRTOS.h"
-#include "driver/i2s.h"
+#include "driver/i2s_std.h"
 #include "esp_wifi_types.h"
 
 #ifndef MICROPY_CONFIG_ROM_LEVEL
@@ -147,8 +147,8 @@
 #endif
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE  "ports/esp32/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_FINALISER    (1)
-#define MICROPY_PY_MACHINE_I2S_CONSTANT_RX  (I2S_MODE_MASTER | I2S_MODE_RX)
-#define MICROPY_PY_MACHINE_I2S_CONSTANT_TX  (I2S_MODE_MASTER | I2S_MODE_TX)
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_RX  (I2S_DIR_RX)
+#define MICROPY_PY_MACHINE_I2S_CONSTANT_TX  (I2S_DIR_TX)
 #define MICROPY_PY_MACHINE_UART             (1)
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/esp32/machine_uart.c"
 #define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)

From c92683d67c8f8320bd2ddd604b9abee712575b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 29 Feb 2024 14:04:23 +0100
Subject: [PATCH 0897/3129] esp32: Add support for IDF version v5.0.5.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/README.md            | 2 +-
 ports/esp32/modnetwork_globals.h | 2 +-
 ports/esp32/network_common.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index a7531b6eaa447..deed413f2560f 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 v5.0.4, v5.1.2.
+Currently MicroPython supports v5.0.4, v5.0.5, v5.1.2.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 56e5341915bfc..38c192f9a6eb9 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -31,7 +31,7 @@
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_WAPI_PSK), MP_ROM_INT(WIFI_AUTH_WAPI_PSK) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_OWE), MP_ROM_INT(WIFI_AUTH_OWE) },
-#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 1, 1)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_ENT_192), MP_ROM_INT(WIFI_AUTH_WPA3_ENT_192) },
 #endif
 { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index fb51656817153..a8c407b08c631 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -168,7 +168,7 @@ static mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj, 0, 1, esp_phy_mode);
 
-#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 1, 1)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
 _Static_assert(WIFI_AUTH_MAX == 11, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
 #else
 _Static_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");

From d6176c1f5e5556e25944ce52874ea2f2d82ccde5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 29 Feb 2024 14:05:01 +0100
Subject: [PATCH 0898/3129] esp32: Add support for IDF version v5.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/README.md            |  2 +-
 ports/esp32/machine_uart.c       |  7 ++++++-
 ports/esp32/modnetwork_globals.h |  9 +++++++++
 ports/esp32/mpthreadport.c       | 14 ++++++++++----
 ports/esp32/network_common.c     |  4 +++-
 ports/esp32/network_wlan.c       | 22 ++++++++++++++++++++++
 ports/esp32/uart.c               |  3 ++-
 7 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index deed413f2560f..2e03c55d3de18 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 v5.0.4, v5.0.5, v5.1.2.
+Currently MicroPython supports v5.0.4, v5.0.5, v5.1.2, v5.2.0.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index b7adbf81c7aa7..b5c5c016a5c69 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -306,7 +306,12 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         }
         self->flowcontrol = args[ARG_flow].u_int;
     }
-    check_esp_err(uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, UART_FIFO_LEN - UART_FIFO_LEN / 4));
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+    uint8_t uart_fifo_len = UART_HW_FIFO_LEN(self->uart_num);
+    #else
+    uint8_t uart_fifo_len = UART_FIFO_LEN;
+    #endif
+    check_esp_err(uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, uart_fifo_len - uart_fifo_len / 4));
 }
 
 static mp_obj_t mp_machine_uart_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/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 38c192f9a6eb9..7dd2ee9e66e7a 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -34,6 +34,10 @@
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_ENT_192), MP_ROM_INT(WIFI_AUTH_WPA3_ENT_192) },
 #endif
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_EXT_PSK), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK) },
+{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_EXT_PSK_MIXED_MODE), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE) },
+#endif
 { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
 #endif
 
@@ -69,6 +73,11 @@
 { MP_ROM_QSTR(MP_QSTR_STAT_GOT_IP), MP_ROM_INT(STAT_GOT_IP)},
 // Errors from the ESP-IDF
 { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND)},
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+{ MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND_IN_RSSI_THRESHOLD), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD)},
+{ MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD)},
+{ MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND_W_COMPATIBLE_SECURITY), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY)},
+#endif
 { MP_ROM_QSTR(MP_QSTR_STAT_WRONG_PASSWORD), MP_ROM_INT(WIFI_REASON_AUTH_FAIL)},
 { MP_ROM_QSTR(MP_QSTR_STAT_BEACON_TIMEOUT), MP_ROM_INT(WIFI_REASON_BEACON_TIMEOUT)},
 { MP_ROM_QSTR(MP_QSTR_STAT_ASSOC_FAIL), MP_ROM_INT(WIFI_REASON_ASSOC_FAIL)},
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 1c13e928d9722..12a6ede8668e6 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -41,6 +41,12 @@
 #define MP_THREAD_DEFAULT_STACK_SIZE                    (MP_THREAD_MIN_STACK_SIZE + 1024)
 #define MP_THREAD_PRIORITY                              (ESP_TASK_PRIO_MIN + 1)
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0) && !CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP
+#define FREERTOS_TASK_DELETE_HOOK                       vTaskPreDeletionHook
+#else
+#define FREERTOS_TASK_DELETE_HOOK                       vPortCleanUpTCB
+#endif
+
 // this structure forms a linked list, one node per active thread
 typedef struct _mp_thread_t {
     TaskHandle_t id;        // system id of thread
@@ -70,7 +76,7 @@ void mp_thread_init(void *stack, uint32_t stack_len) {
     // memory barrier to ensure above data is committed
     __sync_synchronize();
 
-    // vPortCleanUpTCB needs the thread ready after thread_mutex is ready
+    // FREERTOS_TASK_DELETE_HOOK needs the thread ready after thread_mutex is ready
     thread = &thread_entry0;
 }
 
@@ -179,7 +185,7 @@ void mp_thread_finish(void) {
 
 // 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) {
+void FREERTOS_TASK_DELETE_HOOK(void *tcb) {
     if (thread == NULL) {
         // threading not yet initialised
         return;
@@ -235,7 +241,7 @@ void mp_thread_deinit(void) {
             // No tasks left to delete
             break;
         } else {
-            // Call FreeRTOS to delete the task (it will call vPortCleanUpTCB)
+            // Call FreeRTOS to delete the task (it will call FREERTOS_TASK_DELETE_HOOK)
             vTaskDelete(id);
         }
     }
@@ -243,7 +249,7 @@ void mp_thread_deinit(void) {
 
 #else
 
-void vPortCleanUpTCB(void *tcb) {
+void FREERTOS_TASK_DELETE_HOOK(void *tcb) {
 }
 
 #endif // MICROPY_PY_THREAD
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index a8c407b08c631..223803a5d14ad 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -168,7 +168,9 @@ static mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj, 0, 1, esp_phy_mode);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+_Static_assert(WIFI_AUTH_MAX == 13, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
 _Static_assert(WIFI_AUTH_MAX == 11, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
 #else
 _Static_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index dfa3347c67953..ece88e705f942 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -113,6 +113,20 @@ static void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_b
                     // AP may not exist, or it may have momentarily dropped out; try to reconnect.
                     message = "no AP found";
                     break;
+                #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+                case WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD:
+                    // No AP with RSSI within given threshold exists, or it may have momentarily dropped out; try to reconnect.
+                    message = "no AP with RSSI within threshold found";
+                    break;
+                case WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD:
+                    // No AP with authmode within given threshold exists, or it may have momentarily dropped out; try to reconnect.
+                    message = "no AP with authmode within threshold found";
+                    break;
+                case WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY:
+                    // No AP with compatible security exists, or it may have momentarily dropped out; try to reconnect.
+                    message = "no AP with compatible security found";
+                    break;
+                #endif
                 case WIFI_REASON_AUTH_FAIL:
                     // Password may be wrong, or it just failed to connect; try to reconnect.
                     message = "authentication failed";
@@ -353,6 +367,14 @@ static mp_obj_t network_wlan_status(size_t n_args, const mp_obj_t *args) {
                 return MP_OBJ_NEW_SMALL_INT(STAT_GOT_IP);
             } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND) {
                 return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND);
+            #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+            } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD) {
+                return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD);
+            } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD) {
+                return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD);
+            } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY) {
+                return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY);
+            #endif
             } else if ((wifi_sta_disconn_reason == WIFI_REASON_AUTH_FAIL) || (wifi_sta_disconn_reason == WIFI_REASON_CONNECTION_FAIL)) {
                 // wrong password
                 return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_AUTH_FAIL);
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index 863301143d9ac..8336268509ecf 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include "driver/uart.h" // For uart_get_sclk_freq()
 #include "hal/uart_hal.h"
+#include "soc/uart_periph.h"
 
 static void uart_irq_handler(void *arg);
 
@@ -50,7 +51,7 @@ static void uart_irq_handler(void *arg);
 
 void uart_stdout_init(void) {
     uart_hal_context_t repl_hal = REPL_HAL_DEFN();
-    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
     uart_sclk_t sclk;
     #else
     soc_module_clk_t sclk;

From 27279e69b4d74b255bd8d8c5dd6668c97c942776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 29 Feb 2024 13:05:00 +0100
Subject: [PATCH 0899/3129] esp32: Add IDF-version-specific sdkconfig.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new IDF v5.2 deprecated the task cleanup callback we use, so support
for the new option has been implemented in the previous commit.  This also
requires a change in the sdkconfig, via a new variable
${SDKCONFIG_IDF_VERSION_SPECIFIC} which is used in all mpconfigboard.cmake
files to include an extra sdkconfig file based on the IDF version in use.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/CMakeLists.txt                             | 10 ++++++++++
 .../boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake      |  1 +
 ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake   |  1 +
 .../esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake  |  1 +
 .../esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake  |  1 +
 .../esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake  |  1 +
 .../boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake      |  1 +
 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake   |  1 +
 ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake   |  1 +
 ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake   |  1 +
 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake    |  1 +
 .../esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake  |  1 +
 ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake      |  1 +
 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake    |  1 +
 ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake |  1 +
 ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake    |  1 +
 ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake       |  1 +
 ports/esp32/boards/UM_PROS3/mpconfigboard.cmake        |  1 +
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake     |  1 +
 ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake       |  1 +
 ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake       |  1 +
 ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake  |  1 +
 ports/esp32/boards/sdkconfig.idf52                     |  2 ++
 23 files changed, 33 insertions(+)
 create mode 100644 ports/esp32/boards/sdkconfig.idf52

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 94047a0482d28..1537c1d723276 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -2,6 +2,10 @@
 
 cmake_minimum_required(VERSION 3.12)
 
+# Retrieve IDF version
+include($ENV{IDF_PATH}/tools/cmake/version.cmake)
+set(IDF_VERSION "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
+
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
     set(MICROPY_BOARD ESP32_GENERIC)
@@ -21,6 +25,12 @@ set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 # Save the manifest file set from the cmake command line.
 set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
 
+# Specific options for IDF v5.2 and later
+set(SDKCONFIG_IDF_VERSION_SPECIFIC "")
+if (IDF_VERSION VERSION_GREATER_EQUAL "5.2.0")
+    set(SDKCONFIG_IDF_VERSION_SPECIFIC boards/sdkconfig.idf52)
+endif()
+
 # Include board config; this is expected to set (among other options):
 # - SDKCONFIG_DEFAULTS
 # - IDF_TARGET
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
index 7ae4b38185353..40456f7c0b8a9 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
@@ -6,6 +6,7 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
index 0e1945dd8c5a0..a3e8f616bc009 100644
--- a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
 )
 
diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
index 429366afac979..8c9d7c27a1174 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/ESP32_GENERIC_C3/sdkconfig.c3usb
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
index 76d185d90d5fc..c9bc60d4cb57b 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.spiram_sx
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
index 36b4fe56240de..c60f1c280a3ee 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
index 5bbac10e22f10..42c431681ef11 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
 )
 
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
index 0ce7f85e5d580..7767e3b8497fb 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/LOLIN_C3_MINI/sdkconfig.board
 )
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
index dc9abd7478bca..8be4a69d72e75 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
 )
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
index dc9abd7478bca..8be4a69d72e75 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
 )
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
index f0355e2b0388b..19b55d1659786 100644
--- a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/M5STACK_ATOM/sdkconfig.board
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
index c460b07d5efac..59d2831b3e0d9 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/OLIMEX_ESP32_POE/sdkconfig.board
 )
diff --git a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
index a1460397b818b..9caef1123ccd6 100644
--- a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/SIL_WESP32/sdkconfig.board
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
index 5e570d513bb47..e3bcba9f509e7 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
     boards/UM_FEATHERS2/sdkconfig.board
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
index c98ef691769b5..fc7f246a7ee0f 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
     boards/UM_FEATHERS2NEO/sdkconfig.board
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
index 63d1af1da76ca..d7fcc34694853 100644
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
index 6c7f34009e432..9030d837289c3 100644
--- a/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
index 41a96f26e34c4..8bd67567ffdad 100644
--- a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
index 58b42b55eb7fb..c85fb9d723b06 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
index 70cb4a814ff24..1c794baeed6a3 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
     boards/UM_TINYS2/sdkconfig.board
diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
index 6c7f34009e432..9030d837289c3 100644
--- a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
index 089149c44c54d..e788dc965d150 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/sdkconfig.idf52 b/ports/esp32/boards/sdkconfig.idf52
new file mode 100644
index 0000000000000..49b7317d4d69f
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.idf52
@@ -0,0 +1,2 @@
+CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
+CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y

From 9fc450689b7505a44460bd6cc3a25961e1e4306e Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Sat, 2 Mar 2024 01:10:20 -0800
Subject: [PATCH 0900/3129] esp32/mpconfigport: Don't hang when
 machine.bootloader isn't supported.

Currently only the Arduino Nano ESP32 defines a machine.bootloader handler
for ESP32.  All other boards will intentionally hang.

There is no error message, nor is a NotImplementedError raised.  There's no
indication if Micropython has crashed, or if the bootloader was entered but
USB is not working, which is a real problem the ESP32 bootloader has.  It's
not possible escape from this hang with ^C or any other means besides
physical access to the reset pin or the ability to cycle power.

Change this to only define an implementation of machine.bootloader() when
there is a handler for it.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 ports/esp32/modmachine.c   | 2 ++
 ports/esp32/mpconfigport.h | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 ports/esp32/modmachine.c

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
old mode 100755
new mode 100644
index 6e6a57896814c..a61d381e03d96
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -220,11 +220,13 @@ static mp_int_t mp_machine_reset_cause(void) {
     }
 }
 
+#ifdef MICROPY_BOARD_ENTER_BOOTLOADER
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
     for (;;) {
     }
 }
+#endif
 
 void machine_init(void) {
     is_soft_reset = 0;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index be02d45883bcd..0474b7eafd3c0 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -115,7 +115,6 @@
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/esp32/modmachine.c"
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
-#define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
@@ -269,8 +268,10 @@ typedef long mp_off_t;
 #define MICROPY_HW_ENABLE_MDNS_RESPONDER    (1)
 #endif
 
-#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
-#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
+#ifdef MICROPY_BOARD_ENTER_BOOTLOADER
+#define MICROPY_PY_MACHINE_BOOTLOADER       (1)
+#else
+#define MICROPY_PY_MACHINE_BOOTLOADER       (0)
 #endif
 
 #ifndef MICROPY_BOARD_STARTUP

From af67be7adc4b76fead096fecd445ddeb6cc2c513 Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Sat, 2 Mar 2024 01:25:10 -0800
Subject: [PATCH 0901/3129] esp32/modmachine: Support bootloader on
 ESP32-S2/S3/C2/C3.

On these targets it's possible to enter the bootloader by setting a bit in
an RTC register before resetting.

Structure it in a way that a board can still provide a custom bootloader
handler.  The handler here will be the default if none is provided, for any
board based on the supported targets.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 ports/esp32/modmachine.c   | 8 ++++++++
 ports/esp32/mpconfigport.h | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index a61d381e03d96..759455a59a5d6 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -220,6 +220,14 @@ static mp_int_t mp_machine_reset_cause(void) {
     }
 }
 
+#if MICROPY_ESP32_USE_BOOTLOADER_RTC
+#include "soc/rtc_cntl_reg.h"
+NORETURN static void machine_bootloader_rtc(void) {
+    REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT);
+    esp_restart();
+}
+#endif
+
 #ifdef MICROPY_BOARD_ENTER_BOOTLOADER
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 0474b7eafd3c0..f004c78b0aef9 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -268,6 +268,14 @@ typedef long mp_off_t;
 #define MICROPY_HW_ENABLE_MDNS_RESPONDER    (1)
 #endif
 
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+// RTC has a register to trigger bootloader on these targets
+#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3
+#define MICROPY_ESP32_USE_BOOTLOADER_RTC    (1)
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) machine_bootloader_rtc()
+#endif
+#endif
+
 #ifdef MICROPY_BOARD_ENTER_BOOTLOADER
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #else

From cdfc6c159f6b51f67fd314a1dd4a61d5c18d5d93 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 3 Mar 2024 12:54:33 +0100
Subject: [PATCH 0902/3129] esp32/network_lan: Add a separate argument to set
 PHY power pin.

Prior to this commit, the pin defined for power would be used by the
esp_idf driver to reset the PHY.  That worked, but sometimes the MDIO
configuration started before the power was fully settled, leading to an
error.

With the change in this commit, the power for the PHY is independently
enabled in network_lan.c with a 100ms delay to allow the power to settle.
A separate define for a reset pin is provided, even if the PHY reset
pin is rarely connected.

Fixes issue #14013.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/esp32/quickref.rst   |  1 +
 ports/esp32/network_lan.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 9c77dc402ebef..6c07c584d325e 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -128,6 +128,7 @@ The keyword arguments for the constructor defining the PHY type and interface ar
 
 - mdc=pin-object    # set the mdc and mdio pins.
 - mdio=pin-object
+- reset=pin-object  # set the reset pin of the PHY device.
 - 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
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index d7d9a9f7ac540..570c9a4afdefb 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -51,6 +51,7 @@ typedef struct _lan_if_obj_t {
     bool initialized;
     int8_t mdc_pin;
     int8_t mdio_pin;
+    int8_t phy_reset_pin;
     int8_t phy_power_pin;
     int8_t phy_cs_pin;
     int8_t phy_int_pin;
@@ -99,12 +100,13 @@ 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_reset, ARG_power, ARG_phy_addr, ARG_phy_type,
            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} },
         { MP_QSTR_mdio,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_reset,        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 },
@@ -128,6 +130,7 @@ static mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
 
     self->mdc_pin = GET_PIN(ARG_mdc);
     self->mdio_pin = GET_PIN(ARG_mdio);
+    self->phy_reset_pin = GET_PIN(ARG_reset);
     self->phy_power_pin = GET_PIN(ARG_power);
     self->phy_cs_pin = GET_PIN(ARG_cs);
     self->phy_int_pin = GET_PIN(ARG_int);
@@ -179,8 +182,15 @@ static mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
 
     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;
+    phy_config.reset_gpio_num = self->phy_reset_pin;
     self->phy = NULL;
+    // Switch on the power before PHY is reset
+    if (self->phy_power_pin >= 0) {
+        mp_hal_pin_output(self->phy_power_pin);
+        mp_hal_pin_write(self->phy_power_pin, 1);
+        // let the power settle
+        mp_hal_delay_ms(100);
+    }
     #if CONFIG_ETH_USE_SPI_ETHERNET
     spi_device_interface_config_t devcfg = {
         .mode = 0,

From 20f85fb26e2b08b2e6114f31ea05d3da759432eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 12 Dec 2023 15:59:46 +0100
Subject: [PATCH 0903/3129] esp32/machine_uart: Always configure timeout_char
 setting in init().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the `timeout_char` parameter is not given, we should still configure the
UART to ensure the UART is always initialized consistently.  So the default
of 0 gets applied correctly, or if, for example, the baudrate was changed
the char timeout isn't still based on the old baudrate causing weird
behaviour, etc.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_uart.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index b5c5c016a5c69..50c9a19bef1bb 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -277,17 +277,17 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     }
 
     // set timeout_char
-    // 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 char_time_ms = 12000 / baudrate + 1;
-        uint32_t rx_timeout = self->timeout_char / char_time_ms;
-        if (rx_timeout < 1) {
-            check_esp_err(uart_set_rx_full_threshold(self->uart_num, 1));
-            check_esp_err(uart_set_rx_timeout(self->uart_num, 1));
-        } else {
-            check_esp_err(uart_set_rx_timeout(self->uart_num, rx_timeout));
-        }
+    }
+    // make sure it is at least as long as a whole character (12 bits here)
+    uint32_t char_time_ms = 12000 / baudrate + 1;
+    uint32_t rx_timeout = self->timeout_char / char_time_ms;
+    if (rx_timeout < 1) {
+        check_esp_err(uart_set_rx_full_threshold(self->uart_num, 1));
+        check_esp_err(uart_set_rx_timeout(self->uart_num, 1));
+    } else {
+        check_esp_err(uart_set_rx_timeout(self->uart_num, rx_timeout));
     }
 
     // set line inversion

From bedb649edf9a4e0d451daccda72ae35634b80dde Mon Sep 17 00:00:00 2001
From: Stanislav Ponomarev <me@stasponomarev.com>
Date: Tue, 27 Feb 2024 00:26:17 +0400
Subject: [PATCH 0904/3129] esp32/boards/ESP32_GENERIC_S3: Add 4MiB
 partitioning board variant.

Added a 4MiB flash partitioning variant for ESP32S3: adds support for 4MiB
discrete flash boards or ESP32-S3FH4R2 with embedded 4MiB flash based ones.

Tested on the waveshare ESP32-S3 Mini w/ESP32-S3FH4R2.

Signed-off-by: Stanislav Ponomarev <me@stasponomarev.com>
---
 ports/esp32/boards/ESP32_GENERIC_S3/board.json          | 3 ++-
 ports/esp32/boards/ESP32_GENERIC_S3/board.md            | 4 +++-
 ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake | 7 +++++++
 ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m  | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m

diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/board.json b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
index 671936c922ce0..c9794dba86131 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
@@ -18,6 +18,7 @@
     "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif",
     "variants": {
-        "SPIRAM_OCT": "Support for Octal-SPIRAM"
+        "SPIRAM_OCT": "Support for Octal-SPIRAM",
+        "FLASH_4M": "4MiB flash"
     }
 }
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/board.md b/ports/esp32/boards/ESP32_GENERIC_S3/board.md
index cc902eeb89fee..16930c9193c51 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/board.md
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/board.md
@@ -1,7 +1,9 @@
 The following files are firmware that should work on most ESP32-S3-based
-boards with 8MiB of flash, including WROOM and MINI modules.
+boards with 4/8MiB of flash, including WROOM and MINI modules.
 
 This firmware supports configurations with and without SPIRAM (also known as
 PSRAM) and will auto-detect a connected SPIRAM chip at startup and allocate
 the MicroPython heap accordingly. However if your board has Octal SPIRAM, then
 use the "spiram-oct" variant.
+
+If your board has 4MiB flash (including ESP32-S3FH4R2 based ones with embedded flash), then use the "flash-4m" build.
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
index c60f1c280a3ee..1f7440353b6cc 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -20,3 +20,10 @@ if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM_OCT")
         MICROPY_HW_BOARD_NAME="Generic ESP32S3 module with Octal-SPIRAM"
     )
 endif()
+
+if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_4M")
+    set(SDKCONFIG_DEFAULTS
+        ${SDKCONFIG_DEFAULTS}
+        boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
+    )
+endif()
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
new file mode 100644
index 0000000000000..c967c46ae6bed
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
@@ -0,0 +1,4 @@
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
+
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB.csv"

From d712feb68a3ac8ec181ff75a4ac55997141ad075 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Mar 2024 22:51:28 +1100
Subject: [PATCH 0905/3129] stm32/sdram: Fix MPU config to use
 MPU_CONFIG_NOACCESS.

Followup to 2345c1a04e6d8f8a7376c2c37c0f5248f7629bbb.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 1e1a08e4c63bd..e99f34d2262a8 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -263,7 +263,7 @@ static void sdram_init_seq(SDRAM_HandleTypeDef
        then enable access/caching for the size used
     */
     uint32_t irq_state = mpu_config_start();
-    mpu_config_region(MPU_REGION_SDRAM1, SDRAM_START_ADDRESS, MPU_CONFIG_DISABLE(0x00, MPU_REGION_SIZE_512MB));
+    mpu_config_region(MPU_REGION_SDRAM1, SDRAM_START_ADDRESS, MPU_CONFIG_NOACCESS(0x00, MPU_REGION_SIZE_512MB));
     mpu_config_region(MPU_REGION_SDRAM2, SDRAM_START_ADDRESS, MPU_CONFIG_SDRAM(SDRAM_MPU_REGION_SIZE));
     mpu_config_end(irq_state);
     #endif

From 8b4a21cd64c8199601629e6ae08c746f85fdd068 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 4 Mar 2024 12:11:27 +0100
Subject: [PATCH 0906/3129] extmod/network_ninaw10: Activate the NIC on demand.

Activate the NIC on calls to connect() or config() if it's not already
active. This change makes the NINA NIC more in line with CYW43 and other
NICs, which allow configuring the NIC before or after it is activated.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/network_ninaw10.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index e68a7a66e27d2..e53061557cd4e 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -193,8 +193,7 @@ 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]);
-        network_ninaw10_deinit();
-        if (active) {
+        if (active && !self->active) {
             int error = 0;
             if ((error = nina_init()) != 0) {
                 mp_raise_msg_varg(&mp_type_OSError,
@@ -223,7 +222,8 @@ static mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
                     semver[NINA_FW_VER_MINOR_OFFS] - 48, semver[NINA_FW_VER_PATCH_OFFS] - 48);
             }
             soft_timer_static_init(&mp_wifi_poll_timer, SOFT_TIMER_MODE_ONE_SHOT, 0, network_ninaw10_timer_callback);
-        } else {
+        } else if (!active && self->active) {
+            network_ninaw10_deinit();
             nina_deinit();
         }
         self->active = active;
@@ -289,6 +289,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!"));
     }
 
+    // Activate the interface if not active.
+    if (!self->active) {
+        network_ninaw10_active(2, (mp_obj_t [2]) { pos_args[0], mp_const_true });
+    }
+
     // Disconnect active connections first.
     if (nina_isconnected()) {
         nina_disconnect();

From 2b6f81f2b9d5135774d1b636802194f9666678d5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 4 Mar 2024 12:13:37 +0100
Subject: [PATCH 0907/3129] extmod/network_ninaw10: Set the proper security
 mode if none provided.

If no security mode is provided, use WPA for station and WEP for AP.  Note
only WEP is supported in AP mode.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/network_ninaw10.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index e53061557cd4e..6a60faeae9881 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -260,7 +260,7 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
     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 = NINA_SEC_WPA_PSK} },
+        { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_channel,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
     };
 
@@ -276,15 +276,21 @@ 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("SSID can't be empty!"));
     }
 
-    // get key and sec
+    // get encryption key
     const char *key = NULL;
-    mp_uint_t security = NINA_SEC_OPEN;
-
     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;
     }
 
+    // get security mode
+    mp_uint_t security = args[ARG_security].u_int;
+    if (security == -1 && self->itf == MOD_NETWORK_STA_IF) {
+        security = NINA_SEC_WPA_PSK;
+    } else if (security == -1 && self->itf == MOD_NETWORK_AP_IF) {
+        security = NINA_SEC_WEP;
+    }
+
+    // Ensure that the key is not empty if a security mode is used.
     if (security != NINA_SEC_OPEN && strlen(key) == 0) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Key can't be empty!"));
     }
@@ -316,7 +322,7 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
         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."));
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("AP mode only supports WEP or OPEN security modes"));
         }
 
         // Initialize WiFi in AP mode.

From c231c896519fa1b925d4465ed3d4bea437758854 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 14 Mar 2024 10:27:37 +0100
Subject: [PATCH 0908/3129] extmod/network_ninaw10: Fix error messages.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/network_ninaw10.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 6a60faeae9881..90cdafc7a430a 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -153,7 +153,7 @@ static void network_ninaw10_poll_connect(mp_sched_node_t *node) {
             debug_printf("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"),
+                    MP_ERROR_TEXT("could not connect to ssid=%s, sec=%d, key=%s"),
                     self->ssid, self->security, self->key);
             }
         } else {
@@ -197,14 +197,14 @@ static mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
             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);
+                    MP_ERROR_TEXT("failed to initialize Nina-W10 module, error: %d"), error);
             }
             // check firmware version
             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);
+                    MP_ERROR_TEXT("failed to read firmware version, error: %d"), error);
             }
             // Check the minimum supported firmware version.
             uint32_t fwmin = (NINA_FW_VER_MIN_MAJOR * 100) +
@@ -217,7 +217,7 @@ static mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
 
             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"),
+                    MP_ERROR_TEXT("firmware version mismatch, minimum supported firmware is v%d.%d.%d found v%d.%d.%d"),
                     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);
             }
@@ -273,7 +273,7 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
     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!"));
+        mp_raise_ValueError(MP_ERROR_TEXT("SSID can't be empty"));
     }
 
     // get encryption key
@@ -292,7 +292,7 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
 
     // Ensure that the key is not empty if a security mode is used.
     if (security != NINA_SEC_OPEN && strlen(key) == 0) {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Key can't be empty!"));
+        mp_raise_ValueError(MP_ERROR_TEXT("key can't be empty"));
     }
 
     // Activate the interface if not active.
@@ -309,7 +309,7 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
         // 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);
+                MP_ERROR_TEXT("could not connect to ssid=%s, sec=%d, key=%s"), ssid, security, key);
         }
 
         // Save connection info to re-connect if needed.

From 23ccbcf23043be5e621a4e49b7dd4549af4239fc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Mar 2024 10:58:41 +1100
Subject: [PATCH 0909/3129] extmod/modmachine: Add MICROPY_PY_MACHINE_SIGNAL
 configuration option.

Enabled by default.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_signal.c | 9 ++++-----
 extmod/modmachine.c     | 2 ++
 py/mpconfig.h           | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index 6295a496b3654..d2e7bc58cac07 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -24,12 +24,11 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpconfig.h"
-#if MICROPY_PY_MACHINE
-
 #include <string.h>
-
 #include "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_SIGNAL
+
 #include "extmod/modmachine.h"
 #include "extmod/virtpin.h"
 
@@ -181,4 +180,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &signal_locals_dict
     );
 
-#endif // MICROPY_PY_MACHINE
+#endif // MICROPY_PY_MACHINE_SIGNAL
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 90e2a38a73cfc..6fb6b9eaf5b9b 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -186,7 +186,9 @@ static const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_PIN_BASE
     { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) },
     #endif
+    #if MICROPY_PY_MACHINE_SIGNAL
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
+    #endif
 
     // Classes for software bus protocols.
     #if MICROPY_PY_MACHINE_SOFTI2C
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 90f8e592bfe8b..8b49c9ca08e6f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1702,6 +1702,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_PULSE (0)
 #endif
 
+// Whether to provide the "machine.Signal" class
+#ifndef MICROPY_PY_MACHINE_SIGNAL
+#define MICROPY_PY_MACHINE_SIGNAL (MICROPY_PY_MACHINE)
+#endif
+
 #ifndef MICROPY_PY_MACHINE_I2C
 #define MICROPY_PY_MACHINE_I2C (0)
 #endif

From dd134e4836ceee23234b35279bb120259b350787 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Mar 2024 11:01:33 +1100
Subject: [PATCH 0910/3129] extmod/modmachine: Add MICROPY_PY_MACHINE_MEMX
 configuration option.

Enabled by default.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_mem.c | 4 ++--
 extmod/modmachine.c  | 2 ++
 py/mpconfig.h        | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index c8f0889b9a728..c34ece2454cab 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -27,7 +27,7 @@
 #include "py/runtime.h"
 #include "extmod/modmachine.h"
 
-#if MICROPY_PY_MACHINE
+#if MICROPY_PY_MACHINE_MEMX
 
 // If you wish to override the functions for mapping the machine_mem read/write
 // address, then add a #define for MICROPY_MACHINE_MEM_GET_READ_ADDR and/or
@@ -113,4 +113,4 @@ const machine_mem_obj_t machine_mem8_obj = {{&machine_mem_type}, 1};
 const machine_mem_obj_t machine_mem16_obj = {{&machine_mem_type}, 2};
 const machine_mem_obj_t machine_mem32_obj = {{&machine_mem_type}, 4};
 
-#endif // MICROPY_PY_MACHINE
+#endif // MICROPY_PY_MACHINE_MEMX
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 6fb6b9eaf5b9b..792652659a9ec 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -138,9 +138,11 @@ static const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
 
     // Memory access objects.
+    #if MICROPY_PY_MACHINE_MEMX
     { 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) },
+    #endif
 
     // Miscellaneous functions.
     #if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 8b49c9ca08e6f..182115ed71a93 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1702,6 +1702,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_PULSE (0)
 #endif
 
+// Whether to provide the "machine.mem8/16/32" objects
+#ifndef MICROPY_PY_MACHINE_MEMX
+#define MICROPY_PY_MACHINE_MEMX (MICROPY_PY_MACHINE)
+#endif
+
 // Whether to provide the "machine.Signal" class
 #ifndef MICROPY_PY_MACHINE_SIGNAL
 #define MICROPY_PY_MACHINE_SIGNAL (MICROPY_PY_MACHINE)

From bfc3dde2c9cee31c85f838d0e89780378170551d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Mar 2024 11:09:14 +1100
Subject: [PATCH 0911/3129] extmod/modmachine: Add MICROPY_PY_MACHINE_RESET
 configuration option.

Disabled by default, but enabled on all boards that previously had
`MICROPY_PY_MACHINE_BARE_METAL_FUNCS` enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.c             | 25 ++++++++++++++++---------
 ports/cc3200/mpconfigport.h     |  1 +
 ports/esp32/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/rp2/mpconfigport.h        |  1 +
 ports/samd/mpconfigport.h       |  1 +
 ports/stm32/mpconfigport.h      |  1 +
 py/mpconfig.h                   |  5 +++++
 11 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 792652659a9ec..d7e82b124dc76 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -43,10 +43,13 @@ static void mp_machine_idle(void);
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args);
 #endif
 
-#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
-static mp_obj_t mp_machine_unique_id(void);
+#if MICROPY_PY_MACHINE_RESET
 NORETURN static void mp_machine_reset(void);
 static mp_int_t mp_machine_reset_cause(void);
+#endif
+
+#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+static mp_obj_t mp_machine_unique_id(void);
 static mp_obj_t mp_machine_get_freq(void);
 static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args);
 static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args);
@@ -77,12 +80,7 @@ static mp_obj_t machine_idle(void) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 
-#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
-
-static mp_obj_t machine_unique_id(void) {
-    return mp_machine_unique_id();
-}
-MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
+#if MICROPY_PY_MACHINE_RESET
 
 NORETURN static mp_obj_t machine_reset(void) {
     mp_machine_reset();
@@ -94,6 +92,15 @@ static mp_obj_t machine_reset_cause(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
+#endif
+
+#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+
+static mp_obj_t machine_unique_id(void) {
+    return mp_machine_unique_id();
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
+
 static mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return mp_machine_get_freq();
@@ -154,7 +161,7 @@ static const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_BOOTLOADER
     { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_obj) },
     #endif
-    #if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
+    #if MICROPY_PY_MACHINE_RESET
     { 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) },
     #endif
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 9cbc1afc0b092..f1ba4bedd002e 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -127,6 +127,7 @@
 #define MICROPY_PY_VFS                              (1)
 #define MICROPY_PY_MACHINE                          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE              "ports/cc3200/mods/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET                    (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS         (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ   (1)
 #define MICROPY_PY_MACHINE_WDT                      (1)
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index f004c78b0aef9..0afb12f85c1ac 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -114,6 +114,7 @@
 #define MICROPY_PY_OS_URANDOM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/esp32/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET            (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index bbfab64fba8c9..6504127755e85 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -66,6 +66,7 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/esp8266/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index c67b010c01acb..540357fa84209 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -79,6 +79,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (trng_random_u32())
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/mimxrt/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET            (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 30625382e43c2..37fbdf1eb3b29 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -174,6 +174,7 @@
 #define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/nrf/modules/machine/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index ebd055f2ee9bb..52effd64f9295 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -131,6 +131,7 @@
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/renesas-ra/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 8f073002e8632..c11d2fa69d5a9 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -115,6 +115,7 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/rp2/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET                (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS     (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER           (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 160442a4006b8..28a99333d35b9 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -73,6 +73,7 @@
 #define MICROPY_PY_TIME_INCLUDEFILE         "ports/samd/modtime.c"
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE      "ports/samd/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET            (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 300ad086bf473..9e1e24cf23828 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -111,6 +111,7 @@
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/stm32/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 182115ed71a93..85b9e2c9cd104 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1692,6 +1692,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE (0)
 #endif
 
+// Whether to include: reset, reset_cause
+#ifndef MICROPY_PY_MACHINE_RESET
+#define MICROPY_PY_MACHINE_RESET (0)
+#endif
+
 // Whether to include: bitstream
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
 #define MICROPY_PY_MACHINE_BITSTREAM (0)

From 58a596f4a9b11a4043a96e5b90b2cff982d2a48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 12 Mar 2024 15:11:23 +0100
Subject: [PATCH 0912/3129] extmod/nimble: Check for active before setting
 address mode.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`BLE().config(addr_mode=...)` is not safe to call if the NimBLE stack is
not yet active (because it tries to acquire mutexes which should be
initialized first).

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/nimble/modbluetooth_nimble.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 92bc6764edc63..8d555f1124f9a 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -728,6 +728,9 @@ void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *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:
             if (!has_public_address()) {

From fff66c3069dd2f2b1152cf3412dfbcb073ea804b Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Thu, 14 Mar 2024 11:25:56 -0700
Subject: [PATCH 0913/3129] mimxrt/mpconfigport: Enable cryptolib and hashlib
 md5.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 ports/mimxrt/mpconfigport.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 540357fa84209..637c38f432c12 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -131,9 +131,9 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_WEBSOCKET                (MICROPY_PY_LWIP)
 #define MICROPY_PY_WEBREPL                  (MICROPY_PY_LWIP)
 #define MICROPY_PY_LWIP_SOCK_RAW            (MICROPY_PY_LWIP)
-// #define MICROPY_PY_HASHLIB_MD5              (MICROPY_PY_SSL)
+#define MICROPY_PY_HASHLIB_MD5              (MICROPY_PY_SSL)
 #define MICROPY_PY_HASHLIB_SHA1             (MICROPY_PY_SSL)
-// #define MICROPY_PY_CRYPTOLIB                (MICROPY_PY_SSL)
+#define MICROPY_PY_CRYPTOLIB                (MICROPY_PY_SSL)
 
 #ifndef MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)

From 47e84751fb55fb522557ca3f2349c8a25295498a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 23 Nov 2023 09:43:06 +1100
Subject: [PATCH 0914/3129] py/objstr: Add a macro to define a bytes object at
 compile time.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/objstr.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/objstr.h b/py/objstr.h
index 72fe1cfef01a6..028fc9597ffc8 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -100,6 +100,8 @@ 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);
 
+#define MP_DEFINE_BYTES_OBJ(obj_name, target, len) mp_obj_str_t obj_name = {{&mp_type_bytes}, 0, (len), (const byte *)(target)}
+
 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 43904acea8b2087fdf9f283c0f8ce7d92d16e605 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Mar 2024 12:17:20 +1100
Subject: [PATCH 0915/3129] mimxrt: Define the MICROPY_HW_ENABLE_USBDEV macro.

Previously USB was always enabled, but this created some conflicts when
adding guards to other files on other ports.

Note the configuration with USB disabled hasn't been tested and probably
won't build or run without further work.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/mimxrt/main.c         | 2 ++
 ports/mimxrt/mpconfigport.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 761c491742bcf..dddf44e605f05 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -115,7 +115,9 @@ int main(void) {
         // Execute user scripts.
         int ret = pyexec_file_if_exists("boot.py");
 
+        #if MICROPY_HW_ENABLE_USBDEV
         mp_usbd_init();
+        #endif
 
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 637c38f432c12..a4c6d6e2060b9 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -147,6 +147,8 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-mimxrt"
 #endif
 
+#define MICROPY_HW_ENABLE_USBDEV            (1)
+
 // Hooks to add builtins
 
 #if defined(IOMUX_TABLE_ENET)

From 9d0d262be069089f01da6b40d2cd78f1da14de0f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 23 Nov 2023 09:48:41 +1100
Subject: [PATCH 0916/3129] extmod/machine_usb_device: Add support for Python
 USB devices.

This new machine-module driver provides a "USBDevice" singleton object and
a shim TinyUSB "runtime" driver that delegates the descriptors and all of
the TinyUSB callbacks to Python functions.  This allows writing arbitrary
USB devices in pure Python.  It's also possible to have a base built-in
USB device implemented in C (eg CDC, or CDC+MSC) and a Python USB device
added on top of that.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/machine.USBDevice.rst  | 286 ++++++++++++++
 docs/library/machine.rst            |   1 +
 extmod/extmod.cmake                 |   1 +
 extmod/extmod.mk                    |   1 +
 extmod/machine_usb_device.c         | 335 +++++++++++++++++
 extmod/modmachine.c                 |   3 +
 extmod/modmachine.h                 |   5 +
 py/runtime.c                        |   4 +
 shared/tinyusb/mp_usbd.c            |  34 +-
 shared/tinyusb/mp_usbd.h            | 101 ++++-
 shared/tinyusb/mp_usbd_descriptor.c | 112 +++---
 shared/tinyusb/mp_usbd_internal.h   |  34 --
 shared/tinyusb/mp_usbd_runtime.c    | 554 ++++++++++++++++++++++++++++
 shared/tinyusb/tusb_config.h        |  31 +-
 14 files changed, 1384 insertions(+), 118 deletions(-)
 create mode 100644 docs/library/machine.USBDevice.rst
 create mode 100644 extmod/machine_usb_device.c
 delete mode 100644 shared/tinyusb/mp_usbd_internal.h
 create mode 100644 shared/tinyusb/mp_usbd_runtime.c

diff --git a/docs/library/machine.USBDevice.rst b/docs/library/machine.USBDevice.rst
new file mode 100644
index 0000000000000..82897b280d0fe
--- /dev/null
+++ b/docs/library/machine.USBDevice.rst
@@ -0,0 +1,286 @@
+.. currentmodule:: machine
+.. _machine.USBDevice:
+
+class USBDevice -- USB Device driver
+====================================
+
+.. note:: ``machine.USBDevice`` is currently only supported on the rp2 and samd
+          ports.
+
+USBDevice provides a low-level Python API for implementing USB device functions using
+Python code. This low-level API assumes familiarity with the USB standard. It's
+not recommended to use this API directly, instead install the high-level usbd
+module from micropython-lib.
+
+.. warning:: This functionality is very new and the high-level usbd module is
+             not yet merged into micropython-lib. It can be found `here on
+             GitHub <https://github.com/micropython/micropython-lib/pull/558>`_.
+
+Terminology
+-----------
+
+- A "Runtime" USB device interface or driver is one which is defined using this
+  Python API after MicroPython initially starts up.
+
+- A "Built-in" USB device interface or driver is one that is compiled into the
+  MicroPython firmware, and is always available. Examples are USB-CDC (serial
+  port) which is usually enabled by default. Built-in USB-MSC (Mass Storage) is an
+  option on some ports.
+
+Lifecycle
+---------
+
+Managing a runtime USB interface can be tricky, especially if you are communicating
+with MicroPython over a built-in USB-CDC serial port that's part of the same USB
+device.
+
+- A MicroPython soft reset will always clear all runtime USB interfaces, which
+  results in the entire USB device disconnecting from the host. If MicroPython
+  is also providing a built-in USB-CDC serial port then this will re-appear
+  after the soft reset.
+
+  This means some functions (like ``mpremote run``) that target the USB-CDC
+  serial port will immediately fail if a runtime USB interface is active,
+  because the port goes away when ``mpremote`` triggers a soft reset. The
+  operation should succeed on the second try, as after the soft reset there is
+  no more runtime USB interface.
+
+- To configure a runtime USB device on every boot, it's recommended to place the
+  configuration code in the ``boot.py`` file on the :ref:`device VFS
+  <filesystem>`. On each reset this file is executed before the USB subsystem is
+  initialised (and before ``main.py``), so it allows the board to come up with the runtime
+  USB device immediately.
+
+- For development or debugging, it may be convenient to connect a hardware
+  serial REPL and disable the built-in USB-CDC serial port entirely. Not all ports
+  support this (currently only ``rp2``). The custom build should be configured
+  with ``#define MICROPY_HW_USB_CDC (0)`` and ``#define
+  MICROPY_HW_ENABLE_UART_REPL (1)``.
+
+Constructors
+------------
+
+.. class:: USBDevice()
+
+   Construct a USBDevice object.
+
+   .. note:: This object is a singleton, each call to this constructor
+             returns the same object reference.
+
+Methods
+-------
+
+.. method:: USBDevice.config(desc_dev, desc_cfg, desc_strs=None, open_itf_cb=None, reset_cb=None, control_xfer_cb=None, xfer_cb=None)
+
+    Configures the ``USBDevice`` singleton object with the USB runtime device
+    state and callback functions:
+
+    - ``desc_dev`` - A bytes-like object containing
+      the new USB device descriptor.
+
+    - ``desc_cfg`` - A bytes-like object containing the
+      new USB configuration descriptor.
+
+    - ``desc_strs`` - Optional object holding strings or bytes objects
+       containing USB string descriptor values. Can be a list, a dict, or any
+       object which supports subscript indexing with integer keys (USB string
+       descriptor index).
+
+       Strings are an optional USB feature, and this parameter can be unset
+       (default) if no strings are referenced in the device and configuration
+       descriptors, or if only built-in strings should be used.
+
+       Apart from index 0, all the string values should be plain ASCII. Index 0
+       is the special "languages" USB descriptor, represented as a bytes object
+       with a custom format defined in the USB standard. ``None`` can be
+       returned at index 0 in order to use a default "English" language
+       descriptor.
+
+       To fall back to providing a built-in string value for a given index, a
+       subscript lookup can return ``None``, raise ``KeyError``, or raise
+       ``IndexError``.
+
+    - ``open_itf_cb`` - This callback is called once for each interface
+      or Interface Association Descriptor in response to a Set
+      Configuration request from the USB Host (the final stage before
+      the USB device is available to the host).
+
+      The callback takes a single argument, which is a memoryview of the
+      interface or IAD descriptor that the host is accepting (including
+      all associated descriptors). It is a view into the same
+      ``desc_cfg`` object that was provided as a separate
+      argument to this function. The memoryview is only valid until the
+      callback function returns.
+
+    - ``reset_cb`` - This callback is called when the USB host performs
+      a bus reset. The callback takes no arguments. Any in-progress
+      transfers will never complete. The USB host will most likely
+      proceed to re-enumerate the USB device by calling the descriptor
+      callbacks and then ``open_itf_cb()``.
+
+    - ``control_xfer_cb`` - This callback is called one or more times
+      for each USB control transfer (device Endpoint 0). It takes two
+      arguments.
+
+      The first argument is the control transfer stage. It is one of:
+
+      - ``1`` for SETUP stage.
+      - ``2`` for DATA stage.
+      - ``3`` for ACK stage.
+
+      Second argument is a memoryview to read the USB control request
+      data for this stage. The memoryview is only valid until the
+      callback function returns.
+
+      The callback should return one of the following values:
+
+      - ``False`` to stall the endpoint and reject the transfer.
+      - ``True`` to continue the transfer to the next stage.
+      - A buffer object to provide data for this stage of the transfer.
+        This should be a writable buffer for an ``OUT`` direction transfer, or a
+        readable buffer with data for an ``IN`` direction transfer.
+
+    - ``xfer_cb`` - This callback is called whenever a non-control
+      transfer submitted by calling :func:`USBDevice.submit_xfer` completes.
+
+      The callback has three arguments:
+
+      1. The Endpoint number for the completed transfer.
+      2. Result value: ``True`` if the transfer succeeded, ``False``
+         otherwise.
+      3. Number of bytes successfully transferred. In the case of a
+         "short" transfer, The result is ``True`` and ``xferred_bytes``
+         will be smaller than the length of the buffer submitted for the
+         transfer.
+
+      .. note:: If a bus reset occurs (see :func:`USBDevice.reset`),
+                ``xfer_cb`` is not called for any transfers that have not
+                already completed.
+
+.. method:: USBDevice.active(self, [value] /)
+
+    Returns the current active state of this runtime USB device as a
+    boolean. The runtime USB device is "active" when it is available to
+    interact with the host, it doesn't mean that a USB Host is actually
+    present.
+
+    If the optional ``value`` argument is set to a truthy value, then
+    the USB device will be activated.
+
+    If the optional ``value`` argument is set to a falsey value, then
+    the USB device is deactivated. While the USB device is deactivated,
+    it will not be detected by the USB Host.
+
+    To simulate a disconnect and a reconnect of the USB device, call
+    ``active(False)`` followed by ``active(True)``. This may be
+    necessary if the runtime device configuration has changed, so that
+    the host sees the new device.
+
+.. attribute:: USDBD.builtin_driver
+
+   This attribute holds the current built-in driver configuration, and must be
+   set to one of the ``USBDevice.BUILTIN_`` named constants defined on this object.
+
+   By default it holds the value :data:`USBDevice.BUILTIN_NONE`.
+
+   Runtime USB device must be inactive when setting this field. Call the
+   :func:`USBDevice.active` function to deactivate before setting if necessary
+   (and again to activate after setting).
+
+   If this value is set to any value other than :data:`USBDevice.BUILTIN_NONE` then
+   the following restrictions apply to the :func:`USBDevice.config` arguments:
+
+   - ``desc_cfg`` should begin with the built-in USB interface descriptor data
+     accessible via :data:`USBDevice.builtin_driver` attribute ``desc_cfg``.
+     Descriptors appended after the built-in configuration descriptors should use
+     interface, string and endpoint numbers starting from the max built-in values
+     defined in :data:`USBDevice.builtin_driver` attributes ``itf_max``, ``str_max`` and
+     ``ep_max``.
+
+   - The ``bNumInterfaces`` field in the built-in configuration
+     descriptor will also need to be updated if any new interfaces
+     are appended to the end of ``desc_cfg``.
+
+   - ``desc_strs`` should either be ``None`` or a list/dictionary where index
+     values less than ``USBDevice.builtin_driver.str_max`` are missing or have
+     value ``None``. This reserves those string indexes for the built-in
+     drivers. Placing a different string at any of these indexes overrides that
+     string in the built-in driver.
+
+.. method:: USBDevice.submit_xfer(self, ep, buffer /)
+
+            Submit a USB transfer on endpoint number ``ep``. ``buffer`` must be
+            an object implementing the buffer interface, with read access for
+            ``IN`` endpoints and write access for ``OUT`` endpoints.
+
+            .. note:: ``ep`` cannot be the control Endpoint number 0. Control
+               transfers are built up through successive executions of
+               ``control_xfer_cb``, see above.
+
+            Returns ``True`` if successful, ``False`` if the transfer could not
+            be queued (as USB device is not configured by host, or because
+            another transfer is queued on this endpoint.)
+
+            When the USB host completes the transfer, the ``xfer_cb`` callback
+            is called (see above).
+
+            Raises ``OSError`` with reason ``MP_EINVAL`` If the USB device is not
+            active.
+
+.. method:: USBDevice.stall(self, ep, [stall] /)
+
+            Calling this function gets or sets the STALL state of a device endpoint.
+
+            ``ep`` is the number of the endpoint.
+
+            If the optional ``stall`` parameter is set, this is a boolean flag
+            for the STALL state.
+
+            The return value is the current stall state of the endpoint (before
+            any change made by this function).
+
+            An endpoint that is set to STALL may remain stalled until this
+            function is called again, or STALL may be cleared automatically by
+            the USB host.
+
+            Raises ``OSError`` with reason ``MP_EINVAL`` If the USB device is not
+            active.
+
+Constants
+---------
+
+.. data:: USBDevice.BUILTIN_NONE
+.. data:: USBDevice.BUILTIN_DEFAULT
+.. data:: USBDevice.BUILTIN_CDC
+.. data:: USBDevice.BUILTIN_MSC
+.. data:: USBDevice.BUILTIN_CDC_MSC
+
+          These constant objects hold the built-in descriptor data which is
+          compiled into the MicroPython firmware. ``USBDevice.BUILTIN_NONE`` and
+          ``USBDevice.BUILTIN_DEFAULT`` are always present. Additional objects may be present
+          depending on the firmware build configuration and the actual built-in drivers.
+
+          .. note:: Currently at most one of ``USBDevice.BUILTIN_CDC``,
+                    ``USBDevice.BUILTIN_MSC`` and ``USBDevice.BUILTIN_CDC_MSC`` is defined
+                    and will be the same object as ``USBDevice.BUILTIN_DEFAULT``.
+                    These constants are defined to allow run-time detection of
+                    the built-in driver (if any). Support for selecting one of
+                    multiple built-in driver configurations may be added in the
+                    future.
+
+          These values are assigned to :data:`USBDevice.builtin_driver` to get/set the
+          built-in configuration.
+
+          Each object contains the following read-only fields:
+
+          - ``itf_max`` - One more than the highest bInterfaceNumber value used
+            in the built-in configuration descriptor.
+          - ``ep_max`` - One more than the highest bEndpointAddress value used
+            in the built-in configuration descriptor. Does not include any
+            ``IN`` flag bit (0x80).
+          - ``str_max`` - One more than the highest string descriptor index
+            value used by any built-in descriptor.
+          - ``desc_dev`` - ``bytes`` object containing the built-in USB device
+            descriptor.
+          - ``desc_cfg`` - ``bytes`` object containing the complete built-in USB
+            configuration descriptor.
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 3f5cd6f13c72b..532266d1d9102 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -265,3 +265,4 @@ Classes
    machine.WDT.rst
    machine.SD.rst
    machine.SDCard.rst
+   machine.USBDevice.rst
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 53c774013236a..957580d15d36d 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -18,6 +18,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/machine_signal.c
     ${MICROPY_EXTMOD_DIR}/machine_spi.c
     ${MICROPY_EXTMOD_DIR}/machine_uart.c
+    ${MICROPY_EXTMOD_DIR}/machine_usb_device.c
     ${MICROPY_EXTMOD_DIR}/machine_wdt.c
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index f0428bcd05650..4f5f7d53ac4b8 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -15,6 +15,7 @@ SRC_EXTMOD_C += \
 	extmod/machine_spi.c \
 	extmod/machine_timer.c \
 	extmod/machine_uart.c \
+	extmod/machine_usb_device.c \
 	extmod/machine_wdt.c \
 	extmod/modasyncio.c \
 	extmod/modbinascii.c \
diff --git a/extmod/machine_usb_device.c b/extmod/machine_usb_device.c
new file mode 100644
index 0000000000000..69c3f38487006
--- /dev/null
+++ b/extmod/machine_usb_device.c
@@ -0,0 +1,335 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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 "py/mpconfig.h"
+
+#if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+
+#include "mp_usbd.h"
+#include "py/mperrno.h"
+#include "py/objstr.h"
+
+// Implements the singleton runtime USB object
+//
+// Currently this implementation references TinyUSB directly.
+
+#ifndef NO_QSTR
+#include "device/usbd_pvt.h"
+#endif
+
+#define HAS_BUILTIN_DRIVERS (MICROPY_HW_USB_CDC || MICROPY_HW_USB_MSC)
+
+const mp_obj_type_t machine_usb_device_type;
+
+static mp_obj_t usb_device_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    (void)type;
+    (void)n_args;
+    (void)n_kw;
+    (void)args;
+
+    if (MP_STATE_VM(usbd) == MP_OBJ_NULL) {
+        mp_obj_usb_device_t *o = m_new0(mp_obj_usb_device_t, 1);
+        o->base.type = &machine_usb_device_type;
+        o->desc_dev = mp_const_none;
+        o->desc_cfg = mp_const_none;
+        o->desc_strs = mp_const_none;
+        o->open_itf_cb = mp_const_none;
+        o->reset_cb = mp_const_none;
+        o->control_xfer_cb = mp_const_none;
+        o->xfer_cb = mp_const_none;
+        for (int i = 0; i < CFG_TUD_ENDPPOINT_MAX; i++) {
+            o->xfer_data[i][0] = mp_const_none;
+            o->xfer_data[i][1] = mp_const_none;
+        }
+        o->builtin_driver = MP_OBJ_FROM_PTR(&mp_type_usb_device_builtin_none);
+        o->active = false; // Builtin USB may be active already, but runtime is inactive
+        o->trigger = false;
+        o->control_data = MP_OBJ_TO_PTR(mp_obj_new_memoryview('B', 0, NULL));
+        o->num_pend_excs = 0;
+        for (int i = 0; i < MP_USBD_MAX_PEND_EXCS; i++) {
+            o->pend_excs[i] = mp_const_none;
+        }
+
+        MP_STATE_VM(usbd) = MP_OBJ_FROM_PTR(o);
+    }
+
+    return MP_STATE_VM(usbd);
+}
+
+// Utility helper to raise an error if USB device is not active
+// (or if a change of active state is triggered but not processed.)
+static void usb_device_check_active(mp_obj_usb_device_t *usbd) {
+    if (!usbd->active || usbd->trigger) {
+        mp_raise_OSError(MP_EINVAL);
+    }
+}
+
+static mp_obj_t usb_device_submit_xfer(mp_obj_t self, mp_obj_t ep, mp_obj_t buffer) {
+    mp_obj_usb_device_t *usbd = (mp_obj_usb_device_t *)MP_OBJ_TO_PTR(self);
+    int ep_addr;
+    mp_buffer_info_t buf_info = { 0 };
+    bool result;
+
+    usb_device_check_active(usbd);
+
+    // Unmarshal arguments, raises TypeError if invalid
+    ep_addr = mp_obj_get_int(ep);
+    mp_get_buffer_raise(buffer, &buf_info, ep_addr & TUSB_DIR_IN_MASK ? MP_BUFFER_READ : MP_BUFFER_RW);
+
+    uint8_t ep_num = tu_edpt_number(ep_addr);
+    uint8_t ep_dir = tu_edpt_dir(ep_addr);
+
+    if (ep_num == 0 || ep_num >= CFG_TUD_ENDPPOINT_MAX) {
+        // TinyUSB usbd API doesn't range check arguments, so this check avoids
+        // out of bounds array access, or submitting transfers on the control endpoint.
+        //
+        // This C layer doesn't otherwise keep track of which endpoints the host
+        // is aware of (or not).
+        mp_raise_ValueError("ep");
+    }
+
+    if (!usbd_edpt_claim(USBD_RHPORT, ep_addr)) {
+        mp_raise_OSError(MP_EBUSY);
+    }
+
+    result = usbd_edpt_xfer(USBD_RHPORT, ep_addr, buf_info.buf, buf_info.len);
+
+    if (result) {
+        // Store the buffer object until the transfer completes
+        usbd->xfer_data[ep_num][ep_dir] = buffer;
+    }
+
+    return mp_obj_new_bool(result);
+}
+static MP_DEFINE_CONST_FUN_OBJ_3(usb_device_submit_xfer_obj, usb_device_submit_xfer);
+
+static mp_obj_t usb_device_active(size_t n_args, const mp_obj_t *args) {
+    mp_obj_usb_device_t *usbd = (mp_obj_usb_device_t *)MP_OBJ_TO_PTR(args[0]);
+
+    bool result = usbd->active;
+    if (n_args == 2) {
+        bool value = mp_obj_is_true(args[1]);
+
+        if (value != result) {
+            if (value
+                && !mp_usb_device_builtin_enabled(usbd)
+                && usbd->desc_dev == mp_const_none) {
+                // Only allow activating if config() has already been called to set some descriptors, or a
+                // built-in driver is enabled
+                mp_raise_OSError(MP_EINVAL);
+            }
+
+            // Any change to active state is triggered here and processed
+            // from the TinyUSB task.
+            usbd->active = value;
+            usbd->trigger = true;
+            if (value) {
+                mp_usbd_init(); // Ensure TinyUSB has initialised by this point
+            }
+            mp_usbd_schedule_task();
+        }
+    }
+
+    return mp_obj_new_bool(result);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(usb_device_active_obj, 1, 2, usb_device_active);
+
+static mp_obj_t usb_device_stall(size_t n_args, const mp_obj_t *args) {
+    mp_obj_usb_device_t *self = (mp_obj_usb_device_t *)MP_OBJ_TO_PTR(args[0]);
+    int epnum = mp_obj_get_int(args[1]);
+
+    usb_device_check_active(self);
+
+    mp_obj_t res = mp_obj_new_bool(usbd_edpt_stalled(USBD_RHPORT, epnum));
+
+    if (n_args == 3) { // Set stall state
+        mp_obj_t stall = args[2];
+        if (mp_obj_is_true(stall)) {
+            usbd_edpt_stall(USBD_RHPORT, epnum);
+        } else {
+            usbd_edpt_clear_stall(USBD_RHPORT, epnum);
+        }
+    }
+
+    return res;
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(usb_device_stall_obj, 2, 3, usb_device_stall);
+
+// Configure the singleton USB device with all of the relevant transfer and descriptor
+// callbacks for dynamic devices.
+static mp_obj_t usb_device_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_obj_usb_device_t *self = (mp_obj_usb_device_t *)MP_OBJ_TO_PTR(pos_args[0]);
+
+    enum { ARG_desc_dev, ARG_desc_cfg, ARG_desc_strs, ARG_open_itf_cb,
+           ARG_reset_cb, ARG_control_xfer_cb, ARG_xfer_cb, ARG_active };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_desc_dev, MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_desc_cfg, MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_desc_strs, MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_open_itf_cb, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_reset_cb, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_control_xfer_cb, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_xfer_cb, MP_ARG_OBJ, {.u_obj = mp_const_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);
+
+    // Check descriptor arguments
+    mp_obj_t desc_dev = args[ARG_desc_dev].u_obj;
+    mp_obj_t desc_cfg = args[ARG_desc_cfg].u_obj;
+    mp_obj_t desc_strs = args[ARG_desc_strs].u_obj;
+    if (!MP_OBJ_TYPE_HAS_SLOT(mp_obj_get_type(desc_dev), buffer)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("desc_dev"));
+    }
+    if (!MP_OBJ_TYPE_HAS_SLOT(mp_obj_get_type(desc_cfg), buffer)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("desc_cfg"));
+    }
+    if (desc_strs != mp_const_none
+        && !MP_OBJ_TYPE_HAS_SLOT(mp_obj_get_type(desc_strs), subscr)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("desc_strs"));
+    }
+
+    self->desc_dev = desc_dev;
+    self->desc_cfg = desc_cfg;
+    self->desc_strs = desc_strs;
+    self->open_itf_cb = args[ARG_open_itf_cb].u_obj;
+    self->reset_cb = args[ARG_reset_cb].u_obj;
+    self->control_xfer_cb = args[ARG_control_xfer_cb].u_obj;
+    self->xfer_cb = args[ARG_xfer_cb].u_obj;
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(usb_device_config_obj, 1, usb_device_config);
+
+static const MP_DEFINE_BYTES_OBJ(builtin_default_desc_dev_obj,
+    &mp_usbd_builtin_desc_dev, sizeof(tusb_desc_device_t));
+
+#if HAS_BUILTIN_DRIVERS
+// BUILTIN_DEFAULT Python object holds properties of the built-in USB configuration
+// (i.e. values used by the C implementation of TinyUSB devices.)
+static const MP_DEFINE_BYTES_OBJ(builtin_default_desc_cfg_obj,
+    mp_usbd_builtin_desc_cfg, MP_USBD_BUILTIN_DESC_CFG_LEN);
+
+static const mp_rom_map_elem_t usb_device_builtin_default_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_itf_max), MP_OBJ_NEW_SMALL_INT(USBD_ITF_BUILTIN_MAX) },
+    { MP_ROM_QSTR(MP_QSTR_ep_max), MP_OBJ_NEW_SMALL_INT(USBD_EP_BUILTIN_MAX) },
+    { MP_ROM_QSTR(MP_QSTR_str_max), MP_OBJ_NEW_SMALL_INT(USBD_STR_BUILTIN_MAX) },
+    { MP_ROM_QSTR(MP_QSTR_desc_dev), MP_ROM_PTR(&builtin_default_desc_dev_obj)  },
+    { MP_ROM_QSTR(MP_QSTR_desc_cfg), MP_ROM_PTR(&builtin_default_desc_cfg_obj) },
+};
+static MP_DEFINE_CONST_DICT(usb_device_builtin_default_dict, usb_device_builtin_default_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_usb_device_builtin_default,
+    MP_QSTR_BUILTIN_DEFAULT,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &usb_device_builtin_default_dict
+    );
+#endif // HAS_BUILTIN_DRIVERS
+
+// BUILTIN_NONE holds properties for no enabled built-in USB device support
+static const mp_rom_map_elem_t usb_device_builtin_none_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_itf_max), MP_OBJ_NEW_SMALL_INT(0) },
+    { MP_ROM_QSTR(MP_QSTR_ep_max), MP_OBJ_NEW_SMALL_INT(0) },
+    { MP_ROM_QSTR(MP_QSTR_str_max), MP_OBJ_NEW_SMALL_INT(1) },
+    { MP_ROM_QSTR(MP_QSTR_desc_dev), MP_ROM_PTR(&builtin_default_desc_dev_obj)  },
+    { MP_ROM_QSTR(MP_QSTR_desc_cfg), mp_const_empty_bytes },
+};
+static MP_DEFINE_CONST_DICT(usb_device_builtin_none_dict, usb_device_builtin_none_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_usb_device_builtin_none,
+    MP_QSTR_BUILTIN_NONE,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &usb_device_builtin_none_dict
+    );
+
+static const mp_rom_map_elem_t usb_device_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&usb_device_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_submit_xfer), MP_ROM_PTR(&usb_device_submit_xfer_obj) },
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&usb_device_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stall), MP_ROM_PTR(&usb_device_stall_obj) },
+
+    // Built-in driver constants
+    { MP_ROM_QSTR(MP_QSTR_BUILTIN_NONE), MP_ROM_PTR(&mp_type_usb_device_builtin_none) },
+
+    #if !HAS_BUILTIN_DRIVERS
+    // No builtin-in drivers, so BUILTIN_DEFAULT is BUILTIN_NONE
+    { MP_ROM_QSTR(MP_QSTR_BUILTIN_DEFAULT), MP_ROM_PTR(&mp_type_usb_device_builtin_none) },
+    #else
+    { MP_ROM_QSTR(MP_QSTR_BUILTIN_DEFAULT), MP_ROM_PTR(&mp_type_usb_device_builtin_default) },
+
+    // Specific driver constant names are to support future switching of built-in drivers,
+    // but currently only one is present and it maps directly to BUILTIN_DEFAULT
+    #if MICROPY_HW_USB_CDC && !MICROPY_HW_USB_MSC
+    { MP_ROM_QSTR(MP_QSTR_BUILTIN_CDC), MP_ROM_PTR(&mp_type_usb_device_builtin_default) },
+    #endif
+    #if MICROPY_HW_USB_MSC && !MICROPY_HW_USB_CDC
+    { MP_ROM_QSTR(MP_QSTR_BUILTIN_MSC), MP_ROM_PTR(&mp_type_usb_device_builtin_default) },
+    #endif
+    #if MICROPY_HW_USB_CDC && MICROPY_HW_USB_MSC
+    { MP_ROM_QSTR(MP_QSTR_BUILTIN_CDC_MSC), MP_ROM_PTR(&mp_type_usb_device_builtin_default) },
+    #endif
+    #endif // !HAS_BUILTIN_DRIVERS
+};
+static MP_DEFINE_CONST_DICT(usb_device_locals_dict, usb_device_locals_dict_table);
+
+static void usb_device_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    mp_obj_usb_device_t *self = MP_OBJ_TO_PTR(self_in);
+    if (dest[0] == MP_OBJ_NULL) {
+        // Load attribute.
+        if (attr == MP_QSTR_builtin_driver) {
+            dest[0] = self->builtin_driver;
+        } else {
+            // Continue lookup in locals_dict.
+            dest[1] = MP_OBJ_SENTINEL;
+        }
+    } else if (dest[1] != MP_OBJ_NULL) {
+        // Store attribute.
+        if (attr == MP_QSTR_builtin_driver) {
+            if (self->active) {
+                mp_raise_OSError(MP_EINVAL); // Need to deactivate first
+            }
+            // Note: this value should be one of the BUILTIN_nnn constants,
+            // but not checked here to save code size in a low level API
+            self->builtin_driver = dest[1];
+            dest[0] = MP_OBJ_NULL;
+        }
+    }
+}
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_usb_device_type,
+    MP_QSTR_USBDevice,
+    MP_TYPE_FLAG_NONE,
+    make_new, usb_device_make_new,
+    locals_dict, &usb_device_locals_dict,
+    attr, &usb_device_attr
+    );
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t usbd);
+
+#endif
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index d7e82b124dc76..2a7e315bbb0ce 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -232,6 +232,9 @@ static const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
     #endif
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    { MP_ROM_QSTR(MP_QSTR_USBDevice), MP_ROM_PTR(&machine_usb_device_type) },
+    #endif
     #if MICROPY_PY_MACHINE_WDT
     { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
     #endif
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index e6b08b3fc9650..7c16ed302ee2f 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -213,6 +213,7 @@ extern const mp_obj_type_t machine_signal_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_usbd_type;
 extern const mp_obj_type_t machine_wdt_type;
 
 #if MICROPY_PY_MACHINE_SOFTI2C
@@ -230,6 +231,10 @@ extern const mp_machine_spi_p_t mp_machine_soft_spi_p;
 extern const mp_obj_dict_t mp_machine_spi_locals_dict;
 #endif
 
+#if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+extern const mp_obj_type_t machine_usb_device_type;
+#endif
+
 #if defined(MICROPY_MACHINE_MEM_GET_READ_ADDR)
 uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
 #endif
diff --git a/py/runtime.c b/py/runtime.c
index f7e0abdb46009..1836f5d92a851 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -171,6 +171,10 @@ void mp_init(void) {
     MP_STATE_VM(bluetooth) = MP_OBJ_NULL;
     #endif
 
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    MP_STATE_VM(usbd) = MP_OBJ_NULL;
+    #endif
+
     #if MICROPY_PY_THREAD_GIL
     mp_thread_mutex_init(&MP_STATE_VM(gil_mutex));
     #endif
diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
index 74b3f074927b8..436314dcde5c8 100644
--- a/shared/tinyusb/mp_usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -24,42 +24,42 @@
  * THE SOFTWARE.
  */
 
-#include <stdlib.h>
-
 #include "py/mpconfig.h"
-#include "py/runtime.h"
 
 #if MICROPY_HW_ENABLE_USBDEV
 
+#include "mp_usbd.h"
+
 #ifndef NO_QSTR
-#include "tusb.h" // TinyUSB is not available when running the string preprocessor
 #include "device/dcd.h"
-#include "device/usbd.h"
-#include "device/usbd_pvt.h"
 #endif
 
-// TinyUSB task function wrapper, as scheduled from the USB IRQ
-static void mp_usbd_task_callback(mp_sched_node_t *node);
-
-extern void __real_dcd_event_handler(dcd_event_t const *event, bool in_isr);
+#if !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
 
 void mp_usbd_task(void) {
     tud_task_ext(0, false);
 }
 
+void mp_usbd_task_callback(mp_sched_node_t *node) {
+    (void)node;
+    mp_usbd_task();
+}
+
+#endif // !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+
+extern void __real_dcd_event_handler(dcd_event_t const *event, bool in_isr);
+
 // If -Wl,--wrap=dcd_event_handler is passed to the linker, then this wrapper
 // will be called and allows MicroPython to schedule the TinyUSB task when
 // dcd_event_handler() is called from an ISR.
 TU_ATTR_FAST_FUNC void __wrap_dcd_event_handler(dcd_event_t const *event, bool in_isr) {
-    static mp_sched_node_t usbd_task_node;
-
     __real_dcd_event_handler(event, in_isr);
-    mp_sched_schedule_node(&usbd_task_node, mp_usbd_task_callback);
+    mp_usbd_schedule_task();
 }
 
-static void mp_usbd_task_callback(mp_sched_node_t *node) {
-    (void)node;
-    mp_usbd_task();
+TU_ATTR_FAST_FUNC void mp_usbd_schedule_task(void) {
+    static mp_sched_node_t usbd_task_node;
+    mp_sched_schedule_node(&usbd_task_node, mp_usbd_task_callback);
 }
 
 void mp_usbd_hex_str(char *out_str, const uint8_t *bytes, size_t bytes_len) {
@@ -72,4 +72,4 @@ void mp_usbd_hex_str(char *out_str, const uint8_t *bytes, size_t bytes_len) {
     out_str[hex_len] = 0;
 }
 
-#endif
+#endif // MICROPY_HW_ENABLE_USBDEV
diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 89f8bf0ee953b..ef32348451391 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -27,25 +27,110 @@
 #ifndef MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_H
 #define MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_H
 
+#include "py/mpconfig.h"
+
+#if MICROPY_HW_ENABLE_USBDEV
+
 #include "py/obj.h"
-#include "tusb.h"
+#include "py/objarray.h"
+#include "py/runtime.h"
 
-static inline void mp_usbd_init(void) {
-    // Currently this is a thin wrapper around tusb_init(), however
-    // runtime USB support will require this to be extended.
-    tusb_init();
-}
+#ifndef NO_QSTR
+#include "tusb.h"
+#include "device/dcd.h"
+#endif
 
-// Call this to explicitly run the TinyUSB device task.
+// Run the TinyUSB device task
 void mp_usbd_task(void);
 
+// Schedule a call to mp_usbd_task(), even if no USB interrupt has occurred
+void mp_usbd_schedule_task(void);
+
 // Function to be implemented in port code.
 // Can write a string up to MICROPY_HW_USB_DESC_STR_MAX characters long, plus terminating byte.
 extern void mp_usbd_port_get_serial_number(char *buf);
 
-// Most ports need to write a hexadecimal serial number from a byte array, this
+// Most ports need to write a hexadecimal serial number from a byte array. This
 // is a helper function for this. out_str must be long enough to hold a string of total
 // length (2 * bytes_len + 1) (including NUL terminator).
 void mp_usbd_hex_str(char *out_str, const uint8_t *bytes, size_t bytes_len);
 
+// Length of built-in configuration descriptor
+#define MP_USBD_BUILTIN_DESC_CFG_LEN (TUD_CONFIG_DESC_LEN +                     \
+    (CFG_TUD_CDC ? (TUD_CDC_DESC_LEN) : 0) +  \
+    (CFG_TUD_MSC ? (TUD_MSC_DESC_LEN) : 0)    \
+    )
+
+// Built-in USB device and configuration descriptor values
+extern const tusb_desc_device_t mp_usbd_builtin_desc_dev;
+extern const uint8_t mp_usbd_builtin_desc_cfg[MP_USBD_BUILTIN_DESC_CFG_LEN];
+
+void mp_usbd_task_callback(mp_sched_node_t *node);
+
+#if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+void mp_usbd_deinit(void);
+void mp_usbd_init(void);
+
+const char *mp_usbd_runtime_string_cb(uint8_t index);
+
+// Maximum number of pending exceptions per single TinyUSB task execution
+#define MP_USBD_MAX_PEND_EXCS 2
+
+typedef struct {
+    mp_obj_base_t base;
+
+    mp_obj_t desc_dev; // Device descriptor bytes
+    mp_obj_t desc_cfg; // Configuration descriptor bytes
+    mp_obj_t desc_strs; // List/dict/similar to look up string descriptors by index
+
+    // Runtime device driver callback functions
+    mp_obj_t open_itf_cb;
+    mp_obj_t reset_cb;
+    mp_obj_t control_xfer_cb;
+    mp_obj_t xfer_cb;
+
+    mp_obj_t builtin_driver; // Points to one of mp_type_usb_device_builtin_nnn
+
+    bool active; // Has the user set the USB device active?
+    bool trigger; // Has the user requested the active state change (or re-activate)?
+
+    // Temporary pointers for xfer data in progress on each endpoint
+    // Ensuring they aren't garbage collected until the xfer completes
+    mp_obj_t xfer_data[CFG_TUD_ENDPPOINT_MAX][2];
+
+    // Pointer to a memoryview that is reused to refer to various pieces of
+    // control transfer data that are pushed to USB control transfer
+    // callbacks. Python code can't rely on the memoryview contents
+    // to remain valid after the callback returns!
+    mp_obj_array_t *control_data;
+
+    // Pointers to exceptions thrown inside Python callbacks. See
+    // usbd_callback_function_n().
+    mp_uint_t num_pend_excs;
+    mp_obj_t pend_excs[MP_USBD_MAX_PEND_EXCS];
+} mp_obj_usb_device_t;
+
+// Built-in constant objects, possible values of builtin_driver
+//
+// (Currently not possible to change built-in drivers at runtime, just enable/disable.)
+extern const mp_obj_type_t mp_type_usb_device_builtin_default;
+extern const mp_obj_type_t mp_type_usb_device_builtin_none;
+
+// Return true if any built-in driver is enabled
+inline static bool mp_usb_device_builtin_enabled(const mp_obj_usb_device_t *usbd) {
+    return usbd->builtin_driver != MP_OBJ_FROM_PTR(&mp_type_usb_device_builtin_none);
+}
+
+#else // Static USBD drivers only
+
+static inline void mp_usbd_init(void) {
+    // Without runtime USB support, this can be a thin wrapper wrapper around tusb_init()
+    extern bool tusb_init(void);
+    tusb_init();
+}
+
+#endif
+
+#endif // MICROPY_HW_ENABLE_USBDEV
+
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H
diff --git a/shared/tinyusb/mp_usbd_descriptor.c b/shared/tinyusb/mp_usbd_descriptor.c
index 72a2652179869..be3473b6b9142 100644
--- a/shared/tinyusb/mp_usbd_descriptor.c
+++ b/shared/tinyusb/mp_usbd_descriptor.c
@@ -31,12 +31,11 @@
 
 #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 ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 64)
 
-const tusb_desc_device_t mp_usbd_desc_device_static = {
+const tusb_desc_device_t mp_usbd_builtin_desc_dev = {
     .bLength = sizeof(tusb_desc_device_t),
     .bDescriptorType = TUSB_DESC_DEVICE,
     .bcdUSB = 0x0200,
@@ -53,8 +52,8 @@ const tusb_desc_device_t mp_usbd_desc_device_static = {
     .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,
+const uint8_t mp_usbd_builtin_desc_cfg[MP_USBD_BUILTIN_DESC_CFG_LEN] = {
+    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_BUILTIN_MAX, USBD_STR_0, MP_USBD_BUILTIN_DESC_CFG_LEN,
         0, USBD_MAX_POWER_MA),
 
     #if CFG_TUD_CDC
@@ -69,51 +68,68 @@ const uint8_t mp_usbd_desc_cfg_static[USBD_STATIC_DESC_LEN] = {
 const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
     char serial_buf[MICROPY_HW_USB_DESC_STR_MAX + 1]; // Includes terminating NUL byte
     static uint16_t desc_wstr[MICROPY_HW_USB_DESC_STR_MAX + 1]; // Includes prefix uint16_t
-    const char *desc_str;
+    const char *desc_str = NULL;
     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;
-        #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;
-            break;
-        #endif
-        default:
-            desc_str = NULL;
-    }
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    desc_str = mp_usbd_runtime_string_cb(index);
+    #endif
 
-    if (index != 0) {
+    if (index == 0) {
+        // String descriptor 0 is special, see USB 2.0 section 9.6.7 String
+        //
+        // Expect any runtime value in desc_str to be a fully formed descriptor
         if (desc_str == NULL) {
-            return NULL; // Will STALL the endpoint
+            desc_str = "\x04\x03\x09\x04"; // Descriptor for "English"
         }
+        if (desc_str[0] < sizeof(desc_wstr)) {
+            memcpy(desc_wstr, desc_str, desc_str[0]);
+            return desc_wstr;
+        }
+        return NULL; // Descriptor length too long (or malformed), stall endpoint
+    }
 
-        // Convert from narrow string to wide string
-        desc_len = 2;
-        for (int i = 0; i < MICROPY_HW_USB_DESC_STR_MAX && desc_str[i] != 0; i++) {
-            desc_wstr[1 + i] = desc_str[i];
-            desc_len += 2;
+    // Otherwise, generate a "UNICODE" string descriptor from the C string
+
+    if (desc_str == NULL) {
+        // Fall back to the "static" string
+        switch (index) {
+            case USBD_STR_SERIAL:
+                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;
+            #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;
+                break;
+            #endif
+            default:
+                break;
         }
     }
+
+    if (desc_str == NULL) {
+        return NULL; // No string, STALL the endpoint
+    }
+
+    // Convert from narrow string to wide string
+    desc_len = 2;
+    for (int i = 0; i < MICROPY_HW_USB_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;
 
@@ -121,13 +137,21 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
 }
 
 
+#if !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+
 const uint8_t *tud_descriptor_device_cb(void) {
-    return (const void *)&mp_usbd_desc_device_static;
+    return (const void *)&mp_usbd_builtin_desc_dev;
 }
 
 const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
     (void)index;
-    return mp_usbd_desc_cfg_static;
+    return mp_usbd_builtin_desc_cfg;
 }
 
-#endif
+#else
+
+// If runtime device support is enabled, descriptor callbacks are implemented in usbd.c
+
+#endif // !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+
+#endif // MICROPY_HW_ENABLE_USBDEV
diff --git a/shared/tinyusb/mp_usbd_internal.h b/shared/tinyusb/mp_usbd_internal.h
deleted file mode 100644
index 8b8f50bae88ee..0000000000000
--- a/shared/tinyusb/mp_usbd_internal.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
new file mode 100644
index 0000000000000..a46c0f85e6bdd
--- /dev/null
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -0,0 +1,554 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Blake W. Felt
+ * Copyright (c) 2022-2023 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 <stdlib.h>
+
+#include "mp_usbd.h"
+#include "py/mpconfig.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "py/obj.h"
+#include "py/objarray.h"
+#include "py/objstr.h"
+#include "py/runtime.h"
+
+#if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+
+#ifndef NO_QSTR
+#include "tusb.h" // TinyUSB is not available when running the string preprocessor
+#include "device/dcd.h"
+#include "device/usbd.h"
+#include "device/usbd_pvt.h"
+#endif
+
+static bool in_usbd_task; // Flags if mp_usbd_task() is processing already
+
+// Some top-level functions that manage global TinyUSB USBD state, not the
+// singleton object visible to Python
+static void mp_usbd_disconnect(mp_obj_usb_device_t *usbd);
+static void mp_usbd_task_inner(void);
+
+// Pend an exception raise in a USBD callback to print when safe.
+//
+// We can't raise any exceptions out of the TinyUSB task, as it may still need
+// to do some state cleanup.
+//
+// The requirement for this becomes very similar to
+// mp_call_function_x_protected() for interrupts, but it's more restrictive: if
+// the C-based USB-CDC serial port is in use, we can't print from inside a
+// TinyUSB callback as it might try to recursively call into TinyUSB to flush
+// the CDC port and make room. Therefore, we have to store the exception and
+// print it as we exit the TinyUSB task.
+//
+// (Worse, a single TinyUSB task can process multiple callbacks and therefore generate
+// multiple exceptions...)
+static void usbd_pend_exception(mp_obj_t exception) {
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    assert(usbd != NULL);
+    if (usbd->num_pend_excs < MP_USBD_MAX_PEND_EXCS) {
+        usbd->pend_excs[usbd->num_pend_excs] = exception;
+    }
+    usbd->num_pend_excs++;
+}
+
+// Call a Python function from inside a TinyUSB callback.
+//
+// Handles any exception using usbd_pend_exception()
+static mp_obj_t usbd_callback_function_n(mp_obj_t fun, size_t n_args, const mp_obj_t *args) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t ret = mp_call_function_n_kw(fun, n_args, 0, args);
+        nlr_pop();
+        return ret;
+    } else {
+        usbd_pend_exception(MP_OBJ_FROM_PTR(nlr.ret_val));
+        return MP_OBJ_NULL;
+    }
+}
+
+// Return a pointer to the data inside a Python buffer provided in a callback
+static void *usbd_get_buffer_in_cb(mp_obj_t obj, mp_uint_t flags) {
+    mp_buffer_info_t buf_info;
+    if (obj == mp_const_none) {
+        // This is only if the user somehow
+        return NULL;
+    } else if (mp_get_buffer(obj, &buf_info, flags)) {
+        return buf_info.buf;
+    } else {
+        mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_TypeError,
+            MP_ERROR_TEXT("object with buffer protocol required"));
+        usbd_pend_exception(exc);
+        return NULL;
+    }
+}
+
+const uint8_t *tud_descriptor_device_cb(void) {
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    const void *result = NULL;
+    if (usbd) {
+        result = usbd_get_buffer_in_cb(usbd->desc_dev, MP_BUFFER_READ);
+    }
+    return result ? result : &mp_usbd_builtin_desc_dev;
+}
+
+const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
+    (void)index;
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    const void *result = NULL;
+    if (usbd) {
+        result = usbd_get_buffer_in_cb(usbd->desc_cfg, MP_BUFFER_READ);
+    }
+    return result ? result : &mp_usbd_builtin_desc_cfg;
+}
+
+const char *mp_usbd_runtime_string_cb(uint8_t index) {
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    nlr_buf_t nlr;
+
+    if (usbd == NULL || usbd->desc_strs == mp_const_none) {
+        return NULL;
+    }
+
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t res = mp_obj_subscr(usbd->desc_strs, mp_obj_new_int(index), MP_OBJ_SENTINEL);
+        nlr_pop();
+        if (res != mp_const_none) {
+            return usbd_get_buffer_in_cb(res, MP_BUFFER_READ);
+        }
+    } else {
+        mp_obj_t exception = MP_OBJ_FROM_PTR(nlr.ret_val);
+        if (!(mp_obj_is_type(exception, &mp_type_KeyError) || mp_obj_is_type(exception, &mp_type_IndexError))) {
+            // Don't print KeyError or IndexError, allowing dicts or lists to have missing entries.
+            // but log any more exotic errors that pop up
+            usbd_pend_exception(exception);
+        }
+    }
+
+    return NULL;
+}
+
+bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const *request) {
+    return false; // Currently no support for Vendor control transfers on the Python side
+}
+
+// Generic "runtime device" TinyUSB class driver, delegates everything to Python callbacks
+
+static void runtime_dev_init(void) {
+}
+
+static void runtime_dev_reset(uint8_t rhport) {
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    if (!usbd) {
+        return;
+    }
+
+    for (int epnum = 0; epnum < CFG_TUD_ENDPPOINT_MAX; epnum++) {
+        for (int dir = 0; dir < 2; dir++) {
+            usbd->xfer_data[epnum][dir] = mp_const_none;
+        }
+    }
+
+    if (mp_obj_is_callable(usbd->reset_cb)) {
+        usbd_callback_function_n(usbd->reset_cb, 0, NULL);
+    }
+}
+
+// Calculate how many interfaces TinyUSB expects us to claim from
+// driver open().
+//
+// Annoyingly, the calling function (process_set_config() in TinyUSB) knows
+// this but doesn't pass the information to us.
+//
+// The answer is:
+// - If an Interface Association Descriptor (IAD) is immediately before itf_desc
+//   in the configuration descriptor, then claim all of the associated interfaces.
+// - Otherwise, claim exactly one interface
+//
+// Relying on the implementation detail that itf_desc is a pointer inside the
+// tud_descriptor_configuration_cb() result. Therefore, we can iterate through
+// from the beginning to check for an IAD immediately preceding it.
+//
+// Returns the number of associated interfaces to claim.
+static uint8_t _runtime_dev_count_itfs(tusb_desc_interface_t const *itf_desc) {
+    const tusb_desc_configuration_t *cfg_desc = (const void *)tud_descriptor_configuration_cb(0);
+    const uint8_t *p_desc = (const void *)cfg_desc;
+    const uint8_t *p_end = p_desc + cfg_desc->wTotalLength;
+    assert(p_desc <= itf_desc && itf_desc < p_end);
+    while (p_desc != (const void *)itf_desc && p_desc < p_end) {
+        const uint8_t *next = tu_desc_next(p_desc);
+
+        if (tu_desc_type(p_desc) == TUSB_DESC_INTERFACE_ASSOCIATION
+            && next == (const void *)itf_desc) {
+            const tusb_desc_interface_assoc_t *desc_iad = (const void *)p_desc;
+            return desc_iad->bInterfaceCount;
+        }
+        p_desc = next;
+    }
+    return 1; // No IAD found
+}
+
+// Scan the other descriptors after these interface(s) to find the total associated length to claim
+// from driver open().
+//
+// Total number of interfaces to scan for is assoc_itf_count.
+//
+// Opens any associated endpoints so they can have transfers submitted against them.
+//
+// Returns the total number of descriptor bytes to claim.
+static uint16_t _runtime_dev_claim_itfs(tusb_desc_interface_t const *itf_desc, uint8_t assoc_itf_count, uint16_t max_len) {
+    const uint8_t *p_desc = (const void *)itf_desc;
+    const uint8_t *p_end = p_desc + max_len;
+    while (p_desc < p_end) {
+        if (tu_desc_type(p_desc) == TUSB_DESC_INTERFACE) {
+            if (assoc_itf_count > 0) {
+                // Claim this interface descriptor
+                assoc_itf_count--;
+            } else {
+                // This is the end of the previous interface's associated descriptors
+                break;
+            }
+        } else if (tu_desc_type(p_desc) == TUSB_DESC_ENDPOINT) {
+            // Open any endpoints that we come across
+            if (tu_desc_type(p_desc) == TUSB_DESC_ENDPOINT) {
+                bool r = usbd_edpt_open(USBD_RHPORT, (const void *)p_desc);
+                if (!r) {
+                    mp_obj_t exc = mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(MP_ENODEV));
+                    usbd_pend_exception(exc);
+                    break;
+                }
+            }
+        }
+        p_desc = tu_desc_next(p_desc);
+    }
+    return p_desc - (const uint8_t *)itf_desc;
+}
+
+// TinyUSB "Application driver" open callback. Called when the USB host sets
+// configuration. Returns number of bytes to claim from descriptors pointed to
+// by itf_desc.
+//
+// This is a little fiddly as it's called before any compiled-in "static"
+// TinyUSB drivers, but we don't want to override those.
+//
+// Also, TinyUSB expects us to know how many interfaces to claim for each time
+// this function is called, and will behave unexpectedly if we claim the wrong
+// number of interfaces. However, unlike a "normal" USB driver we don't know at
+// compile time how many interfaces we've implemented. Instead, we have to look
+// back through the configuration descriptor to figure this out.
+static uint16_t runtime_dev_open(uint8_t rhport, tusb_desc_interface_t const *itf_desc, uint16_t max_len) {
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+
+    // Runtime USB isn't initialised
+    if (!usbd) {
+        return 0;
+    }
+
+    // If TinyUSB built-in drivers are enabled, don't claim any interface in the static range
+    if (mp_usb_device_builtin_enabled(usbd) && itf_desc->bInterfaceNumber < USBD_ITF_BUILTIN_MAX) {
+        return 0;
+    }
+
+    // Determine the total descriptor length of the interface(s) we are going to claim
+    uint8_t assoc_itf_count = _runtime_dev_count_itfs(itf_desc);
+    uint16_t claim_len = _runtime_dev_claim_itfs(itf_desc, assoc_itf_count, max_len);
+
+    // Call the Python callback to allow the driver to start working with these interface(s)
+
+    if (mp_obj_is_callable(usbd->open_itf_cb)) {
+        // Repurpose the control_data memoryview to point into itf_desc for this one call
+        usbd->control_data->items = (void *)itf_desc;
+        usbd->control_data->len = claim_len;
+        mp_obj_t args[] = { MP_OBJ_FROM_PTR(usbd->control_data) };
+        usbd_callback_function_n(usbd->open_itf_cb, 1, args);
+        usbd->control_data->len = 0;
+        usbd->control_data->items = NULL;
+    }
+
+    return claim_len;
+}
+
+static bool runtime_dev_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const *request) {
+    mp_obj_t cb_res = mp_const_false;
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    tusb_dir_t dir = request->bmRequestType_bit.direction;
+    mp_buffer_info_t buf_info;
+
+    if (!usbd) {
+        return false;
+    }
+
+    if (mp_obj_is_callable(usbd->control_xfer_cb)) {
+        usbd->control_data->items = (void *)request;
+        usbd->control_data->len = sizeof(tusb_control_request_t);
+        mp_obj_t args[] = {
+            mp_obj_new_int(stage),
+            MP_OBJ_FROM_PTR(usbd->control_data),
+        };
+        cb_res = usbd_callback_function_n(usbd->control_xfer_cb, MP_ARRAY_SIZE(args), args);
+        usbd->control_data->items = NULL;
+        usbd->control_data->len = 0;
+
+        if (cb_res == MP_OBJ_NULL) {
+            // Exception occurred in the callback handler, stall this transfer
+            cb_res = mp_const_false;
+        }
+    }
+
+    // Check if callback returned any data to submit
+    if (mp_get_buffer(cb_res, &buf_info, dir == TUSB_DIR_IN ? MP_BUFFER_READ : MP_BUFFER_RW)) {
+        bool result = tud_control_xfer(USBD_RHPORT,
+            request,
+            buf_info.buf,
+            buf_info.len);
+
+        if (result) {
+            // Keep buffer object alive until the transfer completes
+            usbd->xfer_data[0][dir] = cb_res;
+        }
+
+        return result;
+    } else {
+        // Expect True or False to stall or continue
+
+        if (stage == CONTROL_STAGE_ACK) {
+            // Allow data to be GCed once it's no longer in use
+            usbd->xfer_data[0][dir] = mp_const_none;
+        }
+        return mp_obj_is_true(cb_res);
+    }
+}
+
+static bool runtime_dev_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes) {
+    mp_obj_t ep = mp_obj_new_int(ep_addr);
+    mp_obj_t cb_res = mp_const_false;
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    if (!usbd) {
+        return false;
+    }
+
+    if (mp_obj_is_callable(usbd->xfer_cb)) {
+        mp_obj_t args[] = {
+            ep,
+            MP_OBJ_NEW_SMALL_INT(result),
+            MP_OBJ_NEW_SMALL_INT(xferred_bytes),
+        };
+        cb_res = usbd_callback_function_n(usbd->xfer_cb, MP_ARRAY_SIZE(args), args);
+    }
+
+    // Clear any xfer_data for this endpoint
+    usbd->xfer_data[tu_edpt_number(ep_addr)][tu_edpt_dir(ep_addr)] = mp_const_none;
+
+    return cb_res != MP_OBJ_NULL && mp_obj_is_true(cb_res);
+}
+
+static usbd_class_driver_t const _runtime_dev_driver =
+{
+    #if CFG_TUSB_DEBUG >= 2
+    .name = "runtime_dev",
+    #endif
+    .init = runtime_dev_init,
+    .reset = runtime_dev_reset,
+    .open = runtime_dev_open,
+    .control_xfer_cb = runtime_dev_control_xfer_cb,
+    .xfer_cb = runtime_dev_xfer_cb,
+    .sof = NULL
+};
+
+usbd_class_driver_t const *usbd_app_driver_get_cb(uint8_t *driver_count) {
+    *driver_count = 1;
+    return &_runtime_dev_driver;
+}
+
+
+// Functions below here (named mp_usbd_xyz) apply to the whole TinyUSB C-based subsystem
+// and not necessarily the USBD singleton object (named usbd_xyz).
+
+// To support soft reset clearing USB runtime state, we manage three TinyUSB states:
+//
+// - "Not initialised" - tusb_inited() returns false, no USB at all). Only way
+//   back to this state is hard reset.
+//
+// - "Activated" - tusb_inited() returns true, USB device "connected" at device
+//   end and available to host.
+//
+// - "Deactivated" - tusb_inited() returns true, but USB device "disconnected"
+//   at device end and host can't see it.
+
+
+// Top-level USB device subsystem init.
+//
+// Makes an on-demand call to mp_usbd_activate(), if USB is needed.
+//
+// This is called on any soft reset after boot.py runs, or on demand if the
+// user activates USB and it hasn't activated yet.
+void mp_usbd_init(void) {
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    bool need_usb;
+
+    if (usbd == NULL) {
+        // No runtime USB device
+        #if CFG_TUD_CDC || CFG_TUD_MSC
+        // Builtin  drivers are available, so initialise as defaults
+        need_usb = true;
+        #else
+        // No static drivers, nothing to initialise
+        need_usb = false;
+        #endif
+    } else {
+        // Otherwise, initialise based on whether runtime USB is active
+        need_usb = usbd->active;
+    }
+
+    if (need_usb) {
+        tusb_init(); // Safe to call redundantly
+        tud_connect(); // Reconnect if mp_usbd_deinit() has disconnected
+    }
+}
+
+// Top-level USB device deinit.
+//
+// This variant is called from soft reset, NULLs out the USB device
+// singleton instance from MP_STATE_VM, and disconnects the port.
+void mp_usbd_deinit(void) {
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+    MP_STATE_VM(usbd) = MP_OBJ_NULL;
+    if (usbd) {
+        // Disconnect if a runtime USB device was active
+        mp_usbd_disconnect(usbd);
+    }
+}
+
+// Thin wrapper around tud_disconnect() that tells TinyUSB all endpoints
+// have stalled, to prevent it getting confused if a transfer is in progress.
+static void mp_usbd_disconnect(mp_obj_usb_device_t *usbd) {
+    if (!tusb_inited()) {
+        return; // TinyUSB hasn't initialised
+    }
+
+    if (usbd) {
+        // There might be USB transfers in progress right now, so need to stall any live
+        // endpoints
+        //
+        // TODO: figure out if we really need this
+        for (int epnum = 0; epnum < CFG_TUD_ENDPPOINT_MAX; epnum++) {
+            for (int dir = 0; dir < 2; dir++) {
+                if (usbd->xfer_data[epnum][dir] != mp_const_none) {
+                    usbd_edpt_stall(USBD_RHPORT, tu_edpt_addr(epnum, dir));
+                    usbd->xfer_data[epnum][dir] = mp_const_none;
+                }
+            }
+        }
+    }
+
+    #if MICROPY_HW_USB_CDC
+    // Ensure no pending static CDC writes, as these can cause TinyUSB to crash
+    tud_cdc_write_clear();
+    #endif
+
+    bool was_connected = tud_connected();
+    tud_disconnect();
+    if (was_connected) {
+        mp_hal_delay_ms(50); // TODO: Always???
+    }
+}
+
+// Thjs callback is queued by mp_usbd_schedule_task() to process USB later.
+void mp_usbd_task_callback(mp_sched_node_t *node) {
+    if (tud_inited() && !in_usbd_task) {
+        mp_usbd_task_inner();
+    }
+    // If in_usbd_task is set, it means something else has already manually called
+    // mp_usbd_task() (most likely: C-based USB-CDC serial port). Now the MP
+    // scheduler is running inside there and triggering this callback. It's OK
+    // to skip, the already-running outer TinyUSB task will process all pending
+    // events before it returns.
+}
+
+// Task function can be called manually to force processing of USB events
+// (mostly from USB-CDC serial port when blocking.)
+void mp_usbd_task(void) {
+    if (in_usbd_task) {
+        // If this exception triggers, it means a USB callback tried to do
+        // something that itself became blocked on TinyUSB (most likely: read or
+        // write from a C-based USB-CDC serial port.)
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("TinyUSB callback can't recurse"));
+    }
+
+    mp_usbd_task_inner();
+}
+
+static void mp_usbd_task_inner(void) {
+    in_usbd_task = true;
+
+    tud_task_ext(0, false);
+
+    mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
+
+    // Check for a triggered change to/from active state
+    if (usbd && usbd->trigger) {
+        if (usbd->active) {
+            if (tud_connected()) {
+                // If a SETUP packet has been received, first disconnect
+                // and wait for the host to recognise this and trigger a bus reset.
+                //
+                // Effectively this forces it to re-enumerate the device.
+                mp_usbd_disconnect(usbd);
+            }
+            tud_connect();
+        } else {
+            mp_usbd_disconnect(usbd);
+        }
+        usbd->trigger = false;
+    }
+
+    in_usbd_task = false;
+
+    if (usbd) {
+        // Print any exceptions that were raised by Python callbacks
+        // inside tud_task_ext(). See usbd_callback_function_n.
+
+        // As printing exceptions to USB-CDC may recursively call mp_usbd_task(),
+        // first copy out the pending data to the local stack
+        mp_uint_t num_pend_excs = usbd->num_pend_excs;
+        mp_obj_t pend_excs[MP_USBD_MAX_PEND_EXCS];
+        for (mp_uint_t i = 0; i < MIN(MP_USBD_MAX_PEND_EXCS, num_pend_excs); i++) {
+            pend_excs[i] = usbd->pend_excs[i];
+            usbd->pend_excs[i] = mp_const_none;
+        }
+        usbd->num_pend_excs = 0;
+
+        // Now print the exceptions stored from this mp_usbd_task() call
+        for (mp_uint_t i = 0; i < MIN(MP_USBD_MAX_PEND_EXCS, num_pend_excs); i++) {
+            mp_obj_print_exception(&mp_plat_print, pend_excs[i]);
+        }
+        if (num_pend_excs > MP_USBD_MAX_PEND_EXCS) {
+            mp_printf(&mp_plat_print, "%u additional exceptions in USB callbacks\n",
+                num_pend_excs - MP_USBD_MAX_PEND_EXCS);
+        }
+    }
+}
+
+#endif // MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index 266cb88cc2fe6..c5644e3d583b2 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -31,6 +31,10 @@
 
 #if MICROPY_HW_ENABLE_USBDEV
 
+#ifndef MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE 0
+#endif
+
 #ifndef MICROPY_HW_USB_MANUFACTURER_STRING
 #define MICROPY_HW_USB_MANUFACTURER_STRING "MicroPython"
 #endif
@@ -86,12 +90,9 @@
 #define CFG_TUD_MSC_BUFSIZE (MICROPY_FATFS_MAX_SS)
 #endif
 
-// Define static descriptor size and interface count based on the above config
+#define USBD_RHPORT (0) // Currently only one port is supported
 
-#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 built-in interface, string and endpoint numbering based on the above config
 
 #define USBD_STR_0 (0x00)
 #define USBD_STR_MANUF (0x01)
@@ -126,19 +127,19 @@
 #endif // CFG_TUD_CDC
 #endif // CFG_TUD_MSC
 
-/* Limits of statically defined USB interfaces, endpoints, strings */
+/* Limits of builtin USB interfaces, endpoints, strings */
 #if CFG_TUD_MSC
-#define USBD_ITF_STATIC_MAX (USBD_ITF_MSC + 1)
-#define USBD_STR_STATIC_MAX (USBD_STR_MSC + 1)
-#define USBD_EP_STATIC_MAX (EPNUM_MSC_OUT + 1)
+#define USBD_ITF_BUILTIN_MAX (USBD_ITF_MSC + 1)
+#define USBD_STR_BUILTIN_MAX (USBD_STR_MSC + 1)
+#define USBD_EP_BUILTIN_MAX (EPNUM_MSC_OUT + 1)
 #elif CFG_TUD_CDC
-#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)
+#define USBD_ITF_BUILTIN_MAX (USBD_ITF_CDC + 2)
+#define USBD_STR_BUILTIN_MAX (USBD_STR_CDC + 1)
+#define USBD_EP_BUILTIN_MAX (((USBD_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)
+#define USBD_ITF_BUILTIN_MAX (0)
+#define USBD_STR_BUILTIN_MAX (0)
+#define USBD_EP_BUILTIN_MAX (0)
 #endif
 
 #endif // MICROPY_HW_ENABLE_USBDEV

From 0baa3b5528257d2d8c3ada5842885d83b9acbb75 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Mar 2024 10:38:05 +1100
Subject: [PATCH 0917/3129] rp2: Enable support for Python USB devices.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/CMakeLists.txt | 2 ++
 ports/rp2/main.c         | 4 ++++
 ports/rp2/mpconfigport.h | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 392fed29b1ff4..b605faaf2100e 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -108,6 +108,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/tinyusb/mp_cdc_common.c
     ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
     ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c
 )
 
 set(MICROPY_SOURCE_DRIVERS
@@ -146,6 +147,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_DIR}/shared/readline/readline.c
     ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c
     ${MICROPY_PORT_DIR}/machine_adc.c
     ${MICROPY_PORT_DIR}/machine_i2c.c
     ${MICROPY_PORT_DIR}/machine_pin.c
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 70a67066fc9d7..40374faff92e3 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -221,6 +221,10 @@ int main(int argc, char **argv) {
         mp_thread_deinit();
         #endif
         soft_timer_deinit();
+        #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+        mp_usbd_deinit();
+        #endif
+
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index c11d2fa69d5a9..a29692d0be071 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -52,6 +52,10 @@
 #ifndef MICROPY_HW_USB_MSC
 #define MICROPY_HW_USB_MSC (0)
 #endif
+
+#ifndef MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE    (1) // Support machine.USBDevice
+#endif
 #endif
 
 #ifndef MICROPY_CONFIG_ROM_LEVEL

From 7f5d8c4605e9305b7d1dbb100d6704618f8f3b4b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 23 Nov 2023 09:53:16 +1100
Subject: [PATCH 0918/3129] samd: Enable support for Python USB devices.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/samd/Makefile       | 1 +
 ports/samd/main.c         | 3 +++
 ports/samd/mpconfigport.h | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 5a7cb9916a349..b678cd9828c6b 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -136,6 +136,7 @@ SHARED_SRC_C += \
 	shared/tinyusb/mp_cdc_common.c \
 	shared/tinyusb/mp_usbd.c \
 	shared/tinyusb/mp_usbd_descriptor.c \
+	shared/tinyusb/mp_usbd_runtime.c \
 
 ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
 	hal/src/hal_atomic.c \
diff --git a/ports/samd/main.c b/ports/samd/main.c
index f051e961ffa24..9f213f27d41cf 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -93,6 +93,9 @@ void samd_main(void) {
         pwm_deinit_all();
         #endif
         soft_timer_deinit();
+        #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+        mp_usbd_deinit();
+        #endif
         gc_sweep_all();
         #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
         sercom_deinit_all();
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 28a99333d35b9..0b47500bf7e7c 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -63,8 +63,13 @@
 #ifndef MICROPY_HW_USB_DESC_STR_MAX
 #define MICROPY_HW_USB_DESC_STR_MAX (32)
 #endif
+// Support machine.USBDevice
+#ifndef MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE    (1)
 #endif
 
+#endif // MICROPY_HW_ENABLE_USBDEV
+
 #define MICROPY_PY_SYS_PLATFORM             "samd"
 
 // Extended modules

From 5bed292c06ec712f501dda7e2cc202b7039c33b4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 13 Nov 2023 17:17:57 +0100
Subject: [PATCH 0919/3129] lib/open-amp: Add OpenAMP submodule.

OpenAMP framework provides a standard inter processor communications
infrastructure for RTOS and bare metal environments. There are 3 major
components in OpenAMP: libmetal, remoteproc and RPMsg. libmetal provides
abstraction of the low-level underlying hardware, remoteproc is used for
processor Life Cycle Management (LCM) like loading firmware, starting,
stopping a core etc., and RPMsg is a bus infrastructure that enables Inter
Processor Communications (IPC) between different cores.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .gitmodules  | 3 +++
 lib/open-amp | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/open-amp

diff --git a/.gitmodules b/.gitmodules
index 75bffdadddeb8..39cf208412404 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -59,3 +59,6 @@
 [submodule "lib/protobuf-c"]
 	path = lib/protobuf-c
 	url = https://github.com/protobuf-c/protobuf-c.git
+[submodule "lib/open-amp"]
+	path = lib/open-amp
+	url = https://github.com/OpenAMP/open-amp.git
diff --git a/lib/open-amp b/lib/open-amp
new file mode 160000
index 0000000000000..1904dee18da85
--- /dev/null
+++ b/lib/open-amp
@@ -0,0 +1 @@
+Subproject commit 1904dee18da85400e72b8f55c5c99e872a486573

From f6213ffc5cb7ea1cb3c7ec10ccd9032035c12159 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 20 Feb 2024 12:28:36 +0100
Subject: [PATCH 0920/3129] lib/libmetal: Add libmetal submodule.

libmetal provides an abstraction of the underlying hardware, to support
other OpenAMP components.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .gitmodules  | 3 +++
 lib/libmetal | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/libmetal

diff --git a/.gitmodules b/.gitmodules
index 39cf208412404..aa9bb3d6d94cd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -62,3 +62,6 @@
 [submodule "lib/open-amp"]
 	path = lib/open-amp
 	url = https://github.com/OpenAMP/open-amp.git
+[submodule "lib/libmetal"]
+	path = lib/libmetal
+	url = https://github.com/OpenAMP/libmetal.git
diff --git a/lib/libmetal b/lib/libmetal
new file mode 160000
index 0000000000000..0cb7d293a7f25
--- /dev/null
+++ b/lib/libmetal
@@ -0,0 +1 @@
+Subproject commit 0cb7d293a7f25394a06847a28d0f0ace9862936e

From 61ee59ad8917d64f4f4a0e7a261fd838c5724014 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 20 Feb 2024 12:41:04 +0100
Subject: [PATCH 0921/3129] extmod/libmetal: Add MicroPython platform for
 libmetal.

Add a MicroPython platform for libmetal, based on the generic platform.
The MicroPython platform uses common mp_hal_xxx functions and allows ports
to customize default configurations for libmetal.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/libmetal/libmetal.mk                   | 51 ++++++++++++
 extmod/libmetal/metal/config.h                | 81 +++++++++++++++++++
 .../libmetal/metal/system/micropython/alloc.h |  1 +
 .../libmetal/metal/system/micropython/log.h   |  1 +
 .../libmetal/metal/system/micropython/sleep.h |  1 +
 .../libmetal/metal/system/micropython/sys.h   |  5 ++
 6 files changed, 140 insertions(+)
 create mode 100644 extmod/libmetal/libmetal.mk
 create mode 100644 extmod/libmetal/metal/config.h
 create mode 100644 extmod/libmetal/metal/system/micropython/alloc.h
 create mode 100644 extmod/libmetal/metal/system/micropython/log.h
 create mode 100644 extmod/libmetal/metal/system/micropython/sleep.h
 create mode 100644 extmod/libmetal/metal/system/micropython/sys.h

diff --git a/extmod/libmetal/libmetal.mk b/extmod/libmetal/libmetal.mk
new file mode 100644
index 0000000000000..852b04289833b
--- /dev/null
+++ b/extmod/libmetal/libmetal.mk
@@ -0,0 +1,51 @@
+# Makefile directives for libmetal
+
+# libmetal is intended to run through a pre-processor (as part of its CMake-based build system).
+# This replicates the basic functionality of the pre-processor, including adding a "micropython"
+# platform that is almost identical to the built-in "generic" platform with a few small changes
+# provided by the files in extmod/libmetal.
+$(BUILD)/openamp: $(BUILD)
+	$(MKDIR) -p $@
+
+$(BUILD)/openamp/metal: $(BUILD)/openamp
+	$(MKDIR) -p $@
+
+$(BUILD)/openamp/metal/config.h: $(BUILD)/openamp/metal $(TOP)/$(LIBMETAL_DIR)/lib/config.h
+	@$(ECHO) "GEN $@"
+	@for file in $(TOP)/$(LIBMETAL_DIR)/lib/*.c $(TOP)/$(LIBMETAL_DIR)/lib/*.h; do $(SED) -e "s/@PROJECT_SYSTEM@/micropython/g" -e "s/@PROJECT_PROCESSOR@/arm/g" $$file > $(BUILD)/openamp/metal/$$(basename $$file); done
+	$(MKDIR) -p $(BUILD)/openamp/metal/processor/arm
+	@$(CP) $(TOP)/$(LIBMETAL_DIR)/lib/processor/arm/*.h $(BUILD)/openamp/metal/processor/arm
+	$(MKDIR) -p $(BUILD)/openamp/metal/compiler/gcc
+	@$(CP) $(TOP)/$(LIBMETAL_DIR)/lib/compiler/gcc/*.h $(BUILD)/openamp/metal/compiler/gcc
+	$(MKDIR) -p $(BUILD)/openamp/metal/system/micropython
+	@$(CP) $(TOP)/$(LIBMETAL_DIR)/lib/system/generic/*.c $(TOP)/$(LIBMETAL_DIR)/lib/system/generic/*.h $(BUILD)/openamp/metal/system/micropython
+	@$(CP) $(TOP)/extmod/libmetal/metal/system/micropython/* $(BUILD)/openamp/metal/system/micropython
+	@$(CP) $(TOP)/extmod/libmetal/metal/config.h $(BUILD)/openamp/metal/config.h
+
+# libmetal's source files.
+SRC_LIBMETAL_C := $(addprefix $(BUILD)/openamp/metal/,\
+	device.c \
+	dma.c \
+	init.c \
+	io.c \
+	irq.c \
+	log.c \
+	shmem.c \
+	softirq.c \
+	version.c \
+	device.c \
+	system/micropython/condition.c \
+	system/micropython/device.c \
+	system/micropython/io.c \
+	system/micropython/irq.c \
+	system/micropython/shmem.c \
+	system/micropython/time.c \
+	)
+
+# These files are generated by the rule above (along with config.h), so we need to make the .c
+# files depend on that step -- can't use the .o files as the target because the .c files don't
+# exist yet.
+$(SRC_LIBMETAL_C): $(BUILD)/openamp/metal/config.h
+
+# Qstr processing will include the generated libmetal headers, so add them as a qstr requirement.
+QSTR_GLOBAL_REQUIREMENTS += $(BUILD)/openamp/metal/config.h
diff --git a/extmod/libmetal/metal/config.h b/extmod/libmetal/metal/config.h
new file mode 100644
index 0000000000000..459a2f4ca424d
--- /dev/null
+++ b/extmod/libmetal/metal/config.h
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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.
+ *
+ * MicroPython libmetal config.
+ */
+#ifndef MICROPY_INCLUDED_METAL_MICROPYTHON_H
+#define MICROPY_INCLUDED_METAL_MICROPYTHON_H
+
+#include <stdlib.h>
+
+// Port-specific config.
+#include "mpmetalport.h"
+
+// Library major version number.
+#define METAL_VER_MAJOR     1
+
+// Library minor version number.
+#define METAL_VER_MINOR     5
+
+// Library patch level.
+#define METAL_VER_PATCH     0
+
+// Library version string.
+#define METAL_VER           "1.5.0"
+
+#if METAL_HAVE_STDATOMIC_H
+#define HAVE_STDATOMIC_H
+#endif
+
+#if METAL_HAVE_FUTEX_H
+#define HAVE_FUTEX_H
+#endif
+
+#ifndef METAL_MAX_DEVICE_REGIONS
+#define METAL_MAX_DEVICE_REGIONS 1
+#endif
+
+// generic/log.h
+#if METAL_LOG_HANDLER_ENABLE
+#include "py/mphal.h"
+#undef metal_log
+#define metal_log(level, ...) mp_printf(&mp_plat_print, __VA_ARGS__)
+#endif
+
+static inline void *__metal_allocate_memory(unsigned int size) {
+    return m_tracked_calloc(1, size);
+}
+
+static inline void __metal_free_memory(void *ptr) {
+    m_tracked_free(ptr);
+}
+
+// The following functions must be provided by the port (in mpmetalport.h / mpmetalport.c).
+int __metal_sleep_usec(unsigned int usec);
+void sys_irq_enable(unsigned int vector);
+void sys_irq_disable(unsigned int vector);
+void sys_irq_restore_enable(unsigned int flags);
+unsigned int sys_irq_save_disable(void);
+#endif // MICROPY_INCLUDED_METAL_MICROPYTHON_H
diff --git a/extmod/libmetal/metal/system/micropython/alloc.h b/extmod/libmetal/metal/system/micropython/alloc.h
new file mode 100644
index 0000000000000..dd0fdb13f9252
--- /dev/null
+++ b/extmod/libmetal/metal/system/micropython/alloc.h
@@ -0,0 +1 @@
+#include <metal/config.h>
diff --git a/extmod/libmetal/metal/system/micropython/log.h b/extmod/libmetal/metal/system/micropython/log.h
new file mode 100644
index 0000000000000..dd0fdb13f9252
--- /dev/null
+++ b/extmod/libmetal/metal/system/micropython/log.h
@@ -0,0 +1 @@
+#include <metal/config.h>
diff --git a/extmod/libmetal/metal/system/micropython/sleep.h b/extmod/libmetal/metal/system/micropython/sleep.h
new file mode 100644
index 0000000000000..dd0fdb13f9252
--- /dev/null
+++ b/extmod/libmetal/metal/system/micropython/sleep.h
@@ -0,0 +1 @@
+#include <metal/config.h>
diff --git a/extmod/libmetal/metal/system/micropython/sys.h b/extmod/libmetal/metal/system/micropython/sys.h
new file mode 100644
index 0000000000000..0f404dcd61284
--- /dev/null
+++ b/extmod/libmetal/metal/system/micropython/sys.h
@@ -0,0 +1,5 @@
+#include <metal/config.h>
+
+struct metal_state {
+    struct metal_common_state common;
+};

From 85028aadab6763a0d899e71f54643840d9f8546d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 20 Nov 2023 14:24:04 +0100
Subject: [PATCH 0922/3129] py/stream: Add mp_stream_seek() helper function.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 py/stream.c | 12 ++++++++++++
 py/stream.h |  1 +
 2 files changed, 13 insertions(+)

diff --git a/py/stream.c b/py/stream.c
index aa905ca8cc904..e008fb999ea32 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -82,6 +82,18 @@ mp_uint_t mp_stream_rw(mp_obj_t stream, void *buf_, mp_uint_t size, int *errcode
     return done;
 }
 
+mp_uint_t mp_stream_seek(mp_obj_t stream, mp_off_t offset, int whence, int *errcode) {
+    struct mp_stream_seek_t seek_s;
+    seek_s.offset = offset;
+    seek_s.whence = whence;
+    const mp_stream_p_t *stream_p = mp_get_stream(stream);
+    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, errcode);
+    if (res == MP_STREAM_ERROR) {
+        return -1;
+    }
+    return seek_s.offset;
+}
+
 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);
     if (MP_OBJ_TYPE_HAS_SLOT(type, protocol)) {
diff --git a/py/stream.h b/py/stream.h
index e6e6f283df177..7c2e87a87c47a 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -115,6 +115,7 @@ mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, size_t len, byte fla
 mp_uint_t mp_stream_rw(mp_obj_t stream, void *buf, mp_uint_t size, int *errcode, byte flags);
 #define mp_stream_write_exactly(stream, buf, size, err) mp_stream_rw(stream, (byte *)buf, size, err, MP_STREAM_RW_WRITE)
 #define mp_stream_read_exactly(stream, buf, size, err) mp_stream_rw(stream, buf, size, err, MP_STREAM_RW_READ)
+mp_uint_t mp_stream_seek(mp_obj_t stream, mp_off_t offset, int whence, int *errcode);
 
 void mp_stream_write_adaptor(void *self, const char *buf, size_t len);
 

From b72602250929234dbdbba084ca0dc4fc94b056ae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 15:21:56 +1100
Subject: [PATCH 0923/3129] py/stream: Factor stream implementations.

So there's only one location that does the ioctl(MP_STREAM_SEEK) call.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/stream.c | 31 ++++++++++++-------------------
 py/stream.h |  2 +-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/py/stream.c b/py/stream.c
index e008fb999ea32..d7a8881e1a32d 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -82,14 +82,14 @@ mp_uint_t mp_stream_rw(mp_obj_t stream, void *buf_, mp_uint_t size, int *errcode
     return done;
 }
 
-mp_uint_t mp_stream_seek(mp_obj_t stream, mp_off_t offset, int whence, int *errcode) {
+mp_off_t mp_stream_seek(mp_obj_t stream, mp_off_t offset, int whence, int *errcode) {
     struct mp_stream_seek_t seek_s;
     seek_s.offset = offset;
     seek_s.whence = whence;
     const mp_stream_p_t *stream_p = mp_get_stream(stream);
     mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, errcode);
     if (res == MP_STREAM_ERROR) {
-        return -1;
+        return (mp_off_t)-1;
     }
     return seek_s.offset;
 }
@@ -457,28 +457,26 @@ static mp_obj_t mp_stream___exit__(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream___exit___obj, 4, 4, mp_stream___exit__);
 
 static mp_obj_t stream_seek(size_t n_args, const mp_obj_t *args) {
-    struct mp_stream_seek_t seek_s;
     // TODO: Could be uint64
-    seek_s.offset = mp_obj_get_int(args[1]);
-    seek_s.whence = SEEK_SET;
+    mp_off_t offset = mp_obj_get_int(args[1]);
+    int whence = SEEK_SET;
     if (n_args == 3) {
-        seek_s.whence = mp_obj_get_int(args[2]);
+        whence = mp_obj_get_int(args[2]);
     }
 
     // In POSIX, it's error to seek before end of stream, we enforce it here.
-    if (seek_s.whence == SEEK_SET && seek_s.offset < 0) {
+    if (whence == SEEK_SET && offset < 0) {
         mp_raise_OSError(MP_EINVAL);
     }
 
-    const mp_stream_p_t *stream_p = mp_get_stream(args[0]);
     int error;
-    mp_uint_t res = stream_p->ioctl(args[0], MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, &error);
-    if (res == MP_STREAM_ERROR) {
+    mp_off_t res = mp_stream_seek(args[0], offset, whence, &error);
+    if (res == (mp_off_t)-1) {
         mp_raise_OSError(error);
     }
 
     // TODO: Could be uint64
-    return mp_obj_new_int_from_uint(seek_s.offset);
+    return mp_obj_new_int_from_uint(res);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_seek_obj, 2, 3, stream_seek);
 
@@ -557,16 +555,11 @@ 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 = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
-    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);
-    if (res == MP_STREAM_ERROR) {
+    mp_off_t res = mp_stream_seek(MP_OBJ_FROM_PTR(stream), offset, whence, &errno);
+    if (res == (mp_off_t)-1) {
         return -1;
     }
-    return seek_s.offset;
+    return res;
 }
 
 int mp_stream_posix_fsync(void *stream) {
diff --git a/py/stream.h b/py/stream.h
index 7c2e87a87c47a..7c4d38afa9b67 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -115,7 +115,7 @@ mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, size_t len, byte fla
 mp_uint_t mp_stream_rw(mp_obj_t stream, void *buf, mp_uint_t size, int *errcode, byte flags);
 #define mp_stream_write_exactly(stream, buf, size, err) mp_stream_rw(stream, (byte *)buf, size, err, MP_STREAM_RW_WRITE)
 #define mp_stream_read_exactly(stream, buf, size, err) mp_stream_rw(stream, buf, size, err, MP_STREAM_RW_READ)
-mp_uint_t mp_stream_seek(mp_obj_t stream, mp_off_t offset, int whence, int *errcode);
+mp_off_t mp_stream_seek(mp_obj_t stream, mp_off_t offset, int whence, int *errcode);
 
 void mp_stream_write_adaptor(void *self, const char *buf, size_t len);
 

From 162054be85a58466edea2297abba9aadc6c3d597 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 11 Dec 2023 13:19:07 +0100
Subject: [PATCH 0924/3129] stm32/mpu: Add MPU config for shared, uncached
 memory region.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/mpu.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index 64880a85db75f..5ef1466184aac 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -36,6 +36,7 @@
 #define MPU_REGION_QSPI3    (MPU_REGION_NUMBER3)
 #define MPU_REGION_SDRAM1   (MPU_REGION_NUMBER4)
 #define MPU_REGION_SDRAM2   (MPU_REGION_NUMBER5)
+#define MPU_REGION_OPENAMP  (MPU_REGION_NUMBER15)
 
 // Only relevant on CPUs with D-Cache, must be higher priority than SDRAM
 #define MPU_REGION_DMA_UNCACHED_1 (MPU_REGION_NUMBER6)
@@ -94,6 +95,18 @@
         | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
     )
 
+#define MPU_CONFIG_SHARED_UNCACHED(size) ( \
+    MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RASR_XN_Pos \
+        | MPU_REGION_FULL_ACCESS << MPU_RASR_AP_Pos \
+        | MPU_TEX_LEVEL1 << MPU_RASR_TEX_Pos \
+        | MPU_ACCESS_SHAREABLE << MPU_RASR_S_Pos \
+        | MPU_ACCESS_NOT_CACHEABLE << MPU_RASR_C_Pos \
+        | MPU_ACCESS_NOT_BUFFERABLE << MPU_RASR_B_Pos \
+        | 0x00 << MPU_RASR_SRD_Pos \
+        | (size) << MPU_RASR_SIZE_Pos \
+        | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
+    )
+
 static inline void mpu_init(void) {
     MPU->CTRL = MPU_PRIVILEGED_DEFAULT | MPU_CTRL_ENABLE_Msk;
     SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;

From 14dae42fe7a4c8c147d528e998e10a6a80d28ae5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 20 Feb 2024 14:07:13 +0100
Subject: [PATCH 0925/3129] extmod/modopenamp: Add new OpenAMP module.

This module implements OpenAMP's basic initialization and shared resources
support, and provides support for OpenAMP's RPMsg component, by providing
an `endpoint` type (a logical connection on top of RPMsg channel) which can
be used to communicate with the remote core.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/extmod.mk    |  42 +++++
 extmod/modopenamp.c | 395 ++++++++++++++++++++++++++++++++++++++++++++
 extmod/modopenamp.h |  81 +++++++++
 3 files changed, 518 insertions(+)
 create mode 100644 extmod/modopenamp.c
 create mode 100644 extmod/modopenamp.h

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 4f5f7d53ac4b8..54689ef65e9d4 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -31,6 +31,7 @@ SRC_EXTMOD_C += \
 	extmod/modmachine.c \
 	extmod/modnetwork.c \
 	extmod/modonewire.c \
+	extmod/modopenamp.c \
 	extmod/modos.c \
 	extmod/modplatform.c\
 	extmod/modrandom.c \
@@ -515,3 +516,44 @@ include $(TOP)/extmod/btstack/btstack.mk
 endif
 
 endif
+
+################################################################################
+# openamp
+
+ifeq ($(MICROPY_PY_OPENAMP),1)
+OPENAMP_DIR = lib/open-amp
+LIBMETAL_DIR = lib/libmetal
+GIT_SUBMODULES += $(LIBMETAL_DIR) $(OPENAMP_DIR)
+include $(TOP)/extmod/libmetal/libmetal.mk
+
+INC += -I$(TOP)/$(OPENAMP_DIR)
+CFLAGS += -DMICROPY_PY_OPENAMP=1
+
+CFLAGS_THIRDPARTY += \
+    -I$(BUILD)/openamp \
+    -I$(TOP)/$(OPENAMP_DIR) \
+    -I$(TOP)/$(OPENAMP_DIR)/lib/include/ \
+    -DMETAL_INTERNAL \
+    -DVIRTIO_DRIVER_ONLY \
+    -DNO_ATOMIC_64_SUPPORT \
+    -DRPMSG_BUFFER_SIZE=512 \
+
+# OpenAMP's source files.
+SRC_OPENAMP_C += $(addprefix $(OPENAMP_DIR)/lib/,\
+	rpmsg/rpmsg.c \
+	rpmsg/rpmsg_virtio.c \
+	virtio/virtio.c \
+	virtio/virtqueue.c \
+	virtio_mmio/virtio_mmio_drv.c \
+	)
+
+# Disable compiler warnings in OpenAMP (variables used only for assert).
+$(BUILD)/$(OPENAMP_DIR)/lib/rpmsg/rpmsg_virtio.o: CFLAGS += -Wno-unused-but-set-variable
+$(BUILD)/$(OPENAMP_DIR)/lib/virtio_mmio/virtio_mmio_drv.o: CFLAGS += -Wno-unused-but-set-variable
+
+# We need to have generated libmetal before compiling OpenAMP.
+$(addprefix $(BUILD)/, $(SRC_OPENAMP_C:.c=.o)): $(BUILD)/openamp/metal/config.h
+
+SRC_THIRDPARTY_C += $(SRC_LIBMETAL_C) $(SRC_OPENAMP_C)
+
+endif # MICROPY_PY_OPENAMP
diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
new file mode 100644
index 0000000000000..b0c834c2819bf
--- /dev/null
+++ b/extmod/modopenamp.c
@@ -0,0 +1,395 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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.
+ *
+ * OpenAMP's Python module.
+ */
+
+#if MICROPY_PY_OPENAMP
+
+#include "py/obj.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+
+#include "metal/sys.h"
+#include "metal/alloc.h"
+#include "metal/errno.h"
+#include "metal/io.h"
+#include "metal/device.h"
+#include "metal/utilities.h"
+
+#include "openamp/open_amp.h"
+#include "openamp/remoteproc.h"
+#include "openamp/remoteproc_loader.h"
+#include "modopenamp.h"
+
+#if !MICROPY_ENABLE_FINALISER
+#error "MICROPY_PY_OPENAMP requires MICROPY_ENABLE_FINALISER"
+#endif
+
+#if MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+#define VIRTIO_DEV_ID           0xFF
+#define VIRTIO_DEV_FEATURES     (1 << VIRTIO_RPMSG_F_NS)
+
+#define VRING0_ID               0   // VRING0 ID (host to remote) fixed to 0 for linux compatibility
+#define VRING1_ID               1   // VRING1 ID (remote to host) fixed to 1 for linux compatibility
+#define VRING_NOTIFY_ID         VRING0_ID
+
+#define VRING_COUNT             2
+#define VRING_ALIGNMENT         32
+// Note the number of buffers must be a power of 2
+#define VRING_NUM_BUFFS         64
+
+// The following config should be enough for about 128 descriptors.
+// See lib/include/openamp/virtio_ring.h for the layout of vrings
+// and vring_size() to calculate the vring size.
+#define VRING_RX_ADDR           (METAL_SHM_ADDR)
+#define VRING_TX_ADDR           (METAL_SHM_ADDR + 0x1000)
+#define VRING_BUFF_ADDR         (METAL_SHM_ADDR + 0x2000)
+#define VRING_BUFF_SIZE         (METAL_SHM_SIZE - 0x2000)
+
+static const char openamp_trace_buf[128];
+#define MICROPY_PY_OPENAMP_TRACE_BUF       ((uint32_t)openamp_trace_buf)
+#define MICROPY_PY_OPENAMP_TRACE_BUF_LEN   sizeof(MICROPY_PY_OPENAMP_TRACE_BUF)
+
+#endif // MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+
+#define debug_printf(...)       // mp_printf(&mp_plat_print, __VA_ARGS__)
+
+static struct metal_device shm_device = {
+    .name = METAL_SHM_NAME,
+    // The number of IO regions is fixed and must match the number and
+    // layout of the remote processor's IO regions. The first region is
+    // used for the vring shared memory, and the second one is used for
+    // the shared resource table.
+    .num_regions = METAL_MAX_DEVICE_REGIONS,
+    .regions = { { 0 } },
+    .node = { NULL },
+    .irq_num = 0,
+    .irq_info = NULL
+};
+static metal_phys_addr_t shm_physmap[] = { 0 };
+
+// ###################### Virtio device class ######################
+typedef struct _virtio_dev_obj_t {
+    mp_obj_base_t base;
+    struct rpmsg_virtio_device rvdev;
+    struct rpmsg_virtio_shm_pool shm_pool;
+    mp_obj_t ns_callback;
+} virtio_dev_obj_t;
+
+static mp_obj_t virtio_dev_deinit(mp_obj_t self_in) {
+    virtio_dev_obj_t *virtio_device = MP_OBJ_TO_PTR(self_in);
+    rpmsg_deinit_vdev(&virtio_device->rvdev);
+    metal_finish();
+    MP_STATE_PORT(virtio_device) = NULL;
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(virtio_dev_deinit_obj, virtio_dev_deinit);
+
+static const mp_rom_map_elem_t virtio_dev_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_VirtIODev) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&virtio_dev_deinit_obj) },
+};
+static MP_DEFINE_CONST_DICT(virtio_dev_locals_dict, virtio_dev_locals_dict_table);
+
+static MP_DEFINE_CONST_OBJ_TYPE(
+    virtio_dev_type,
+    MP_QSTR_VirtIODev,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &virtio_dev_locals_dict
+    );
+
+// ###################### RPMsg Endpoint class ######################
+typedef struct _endpoint_obj_t {
+    mp_obj_base_t base;
+    mp_obj_t name;
+    mp_obj_t callback;
+    struct rpmsg_endpoint ep;
+} endpoint_obj_t;
+
+static const mp_obj_type_t endpoint_type;
+
+static int endpoint_recv_callback(struct rpmsg_endpoint *ept, void *data, size_t len, uint32_t src, void *priv) {
+    debug_printf("endpoint_recv_callback() message received src: %lu msg len: %d\n", src, len);
+    endpoint_obj_t *self = metal_container_of(ept, endpoint_obj_t, ep);
+    if (self->callback != mp_const_none) {
+        mp_call_function_2(self->callback, mp_obj_new_int(src), mp_obj_new_bytearray_by_ref(len, data));
+    }
+    return 0;
+}
+
+static mp_obj_t endpoint_send(uint n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_src, ARG_dest, ARG_timeout };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_src, MP_ARG_INT | MP_ARG_KW_ONLY,  {.u_int = -1 } },
+        { MP_QSTR_dest, MP_ARG_INT | MP_ARG_KW_ONLY,  {.u_int = -1 } },
+        { MP_QSTR_timeout, MP_ARG_INT | MP_ARG_KW_ONLY,  {.u_int = -1 } },
+    };
+
+    // Parse args.
+    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);
+
+    endpoint_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+
+    if (is_rpmsg_ept_ready(&self->ep) == false) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Endpoint not ready"));
+    }
+
+    uint32_t src = self->ep.addr;
+    if (args[ARG_src].u_int != -1) {
+        src = args[ARG_src].u_int;
+    }
+
+    uint32_t dest = self->ep.dest_addr;
+    if (args[ARG_dest].u_int != -1) {
+        dest = args[ARG_dest].u_int;
+    }
+
+    mp_buffer_info_t rbuf;
+    mp_get_buffer_raise(pos_args[1], &rbuf, MP_BUFFER_READ);
+    debug_printf("endpoint_send() msg len: %d\n", rbuf.len);
+
+    int bytes = 0;
+    mp_int_t timeout = args[ARG_timeout].u_int;
+    for (mp_uint_t start = mp_hal_ticks_ms(); ;) {
+        bytes = rpmsg_send_offchannel_raw(&self->ep, src, dest, rbuf.buf, rbuf.len, false);
+        if (bytes > 0 || timeout == 0) {
+            MICROPY_EVENT_POLL_HOOK
+            break;
+        }
+        if (timeout > 0 && (mp_hal_ticks_ms() - start > timeout)) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("timeout waiting for a free buffer"));
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+    return mp_obj_new_int(bytes);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(endpoint_send_obj, 2, endpoint_send);
+
+static mp_obj_t endpoint_is_ready(mp_obj_t self_in) {
+    endpoint_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return is_rpmsg_ept_ready(&self->ep) ? mp_const_true : mp_const_false;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(endpoint_is_ready_obj, endpoint_is_ready);
+
+static mp_obj_t endpoint_deinit(mp_obj_t self_in) {
+    endpoint_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    rpmsg_destroy_ept(&self->ep);
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(endpoint_deinit_obj, endpoint_deinit);
+
+static mp_obj_t endpoint_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_name, ARG_callback, ARG_src, ARG_dest };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_name, MP_ARG_OBJ | MP_ARG_REQUIRED,  {.u_rom_obj = MP_ROM_NONE } },
+        { MP_QSTR_callback, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE } },
+        { MP_QSTR_src, MP_ARG_INT | MP_ARG_KW_ONLY,  {.u_int = RPMSG_ADDR_ANY } },
+        { MP_QSTR_dest, MP_ARG_INT | MP_ARG_KW_ONLY,  {.u_int = RPMSG_ADDR_ANY } },
+    };
+
+    // 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);
+
+    endpoint_obj_t *self = mp_obj_malloc_with_finaliser(endpoint_obj_t, &endpoint_type);
+    self->name = args[ARG_name].u_obj;
+    self->callback = args[ARG_callback].u_obj;
+
+    if (MP_STATE_PORT(virtio_device) == NULL) {
+        openamp_init();
+    }
+
+    if (rpmsg_create_ept(&self->ep, &MP_STATE_PORT(virtio_device)->rvdev.rdev, mp_obj_str_get_str(self->name),
+        args[ARG_src].u_int, args[ARG_dest].u_int, endpoint_recv_callback, NULL) != 0) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to create RPMsg endpoint"));
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static const mp_rom_map_elem_t endpoint_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_Endpoint) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&endpoint_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&endpoint_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_is_ready), MP_ROM_PTR(&endpoint_is_ready_obj) },
+};
+static MP_DEFINE_CONST_DICT(endpoint_locals_dict, endpoint_locals_dict_table);
+
+static MP_DEFINE_CONST_OBJ_TYPE(
+    endpoint_type,
+    MP_QSTR_Endpoint,
+    MP_TYPE_FLAG_NONE,
+    make_new, endpoint_make_new,
+    locals_dict, &endpoint_locals_dict
+    );
+
+// ###################### openamp module ######################
+void openamp_remoteproc_notified(mp_sched_node_t *node) {
+    (void)node;
+    rproc_virtio_notified(MP_STATE_PORT(virtio_device)->rvdev.vdev, VRING_NOTIFY_ID);
+}
+
+static void openamp_ns_callback(struct rpmsg_device *rdev, const char *name, uint32_t dest) {
+    debug_printf("rpmsg_new_service_callback() new service request name: %s dest %lu\n", name, dest);
+    // The remote processor advertises its presence to the host by sending
+    // the Name Service (NS) announcement containing the name of the channel.
+    virtio_dev_obj_t *virtio_device = metal_container_of(rdev, virtio_dev_obj_t, rvdev);
+    if (virtio_device->ns_callback != mp_const_none) {
+        mp_call_function_2(virtio_device->ns_callback, mp_obj_new_int(dest), mp_obj_new_str(name, strlen(name)));
+    }
+}
+
+#if MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+// The shared resource table must be initialized manually by the host here,
+// because it's not located in the data region, so the startup code doesn't
+// know about it.
+static void openamp_rsc_table_init(openamp_rsc_table_t **rsc_table_out) {
+    openamp_rsc_table_t *rsc_table = METAL_RSC_ADDR;
+    memset(rsc_table, 0, METAL_RSC_SIZE);
+
+    rsc_table->version = 1;
+    rsc_table->num = MP_ARRAY_SIZE(rsc_table->offset);
+    rsc_table->offset[0] = offsetof(openamp_rsc_table_t, vdev);
+    #if MICROPY_PY_OPENAMP_TRACE_BUF_ENABLE
+    rsc_table->offset[1] = offsetof(openamp_rsc_table_t, trace);
+    #endif
+    rsc_table->vdev = (struct fw_rsc_vdev) {
+        RSC_VDEV, VIRTIO_ID_RPMSG, 0, VIRTIO_DEV_FEATURES, 0, 0, 0, VRING_COUNT, {0, 0}
+    };
+    rsc_table->vring0 = (struct fw_rsc_vdev_vring) {
+        VRING_TX_ADDR, VRING_ALIGNMENT, VRING_NUM_BUFFS, VRING0_ID, 0
+    };
+    rsc_table->vring1 = (struct fw_rsc_vdev_vring) {
+        VRING_RX_ADDR, VRING_ALIGNMENT, VRING_NUM_BUFFS, VRING1_ID, 0
+    };
+    #if MICROPY_PY_OPENAMP_TRACE_BUF_ENABLE
+    rsc_table->trace = (struct fw_rsc_trace) {
+        RSC_TRACE, MICROPY_PY_OPENAMP_TRACE_BUF, MICROPY_PY_OPENAMP_TRACE_BUF_LEN, 0, "trace_buf"
+    };
+    #endif
+    #ifdef VIRTIO_USE_DCACHE
+    // Flush resource table.
+    metal_cache_flush((uint32_t *)rsc_table, sizeof(openamp_rsc_table_t));
+    #endif
+    *rsc_table_out = rsc_table;
+}
+#endif // MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+
+static mp_obj_t openamp_new_service_callback(mp_obj_t ns_callback) {
+    if (MP_STATE_PORT(virtio_device) == NULL) {
+        openamp_init();
+    }
+    if (ns_callback != mp_const_none && !mp_obj_is_callable(ns_callback)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid callback"));
+    }
+    MP_STATE_PORT(virtio_device)->ns_callback = ns_callback;
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(openamp_new_service_callback_obj, openamp_new_service_callback);
+
+void openamp_init(void) {
+    if (MP_STATE_PORT(virtio_device) != NULL) {
+        // Already initialized.
+        return;
+    }
+
+    struct metal_device *device;
+    struct metal_init_params metal_params = METAL_INIT_DEFAULTS;
+
+    // Initialize libmetal.
+    metal_init(&metal_params);
+
+    // Initialize the shared resource table.
+    openamp_rsc_table_t *rsc_table;
+    openamp_rsc_table_init(&rsc_table);
+
+    if (metal_register_generic_device(&shm_device) != 0) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to register metal device"));
+    }
+
+    if (metal_device_open("generic", METAL_SHM_NAME, &device) != 0) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to open metal device"));
+    }
+
+    // Initialize shared memory IO region.
+    metal_io_init(&device->regions[0], (void *)METAL_SHM_ADDR, (void *)shm_physmap, METAL_SHM_SIZE, -1U, 0, NULL);
+    struct metal_io_region *shm_io = metal_device_io_region(device, 0);
+    if (shm_io == NULL) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to initialize device io region"));
+    }
+
+    // Initialize resource table IO region.
+    metal_io_init(&device->regions[1], (void *)rsc_table, (void *)rsc_table, sizeof(*rsc_table), -1U, 0, NULL);
+    struct metal_io_region *rsc_io = metal_device_io_region(device, 1);
+    if (rsc_io == NULL) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to initialize device io region"));
+    }
+
+    // Create virtio device.
+    struct virtio_device *vdev = rproc_virtio_create_vdev(RPMSG_HOST, VIRTIO_DEV_ID,
+        &rsc_table->vdev, rsc_io, NULL, metal_rproc_notify, NULL);
+    if (vdev == NULL) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to create virtio device"));
+    }
+
+    // Initialize vrings.
+    struct fw_rsc_vdev_vring *vring_rsc = &rsc_table->vring0;
+    for (int i = 0; i < VRING_COUNT; i++, vring_rsc++) {
+        if (rproc_virtio_init_vring(vdev, vring_rsc->notifyid, vring_rsc->notifyid,
+            (void *)vring_rsc->da, shm_io, vring_rsc->num, vring_rsc->align) != 0) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to initialize vrings"));
+        }
+    }
+
+    virtio_dev_obj_t *virtio_device = mp_obj_malloc_with_finaliser(virtio_dev_obj_t, &virtio_dev_type);
+    virtio_device->ns_callback = mp_const_none;
+
+    // The remote processor detects that the virtio device is ready by polling
+    // the status field in the resource table.
+    rpmsg_virtio_init_shm_pool(&virtio_device->shm_pool, (void *)VRING_BUFF_ADDR, (size_t)VRING_BUFF_SIZE);
+    rpmsg_init_vdev(&virtio_device->rvdev, vdev, openamp_ns_callback, shm_io, &virtio_device->shm_pool);
+
+    MP_STATE_PORT(virtio_device) = virtio_device;
+}
+
+static const mp_rom_map_elem_t globals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_openamp) },
+    { MP_ROM_QSTR(MP_QSTR_ENDPOINT_ADDR_ANY), MP_ROM_INT(RPMSG_ADDR_ANY) },
+    { MP_ROM_QSTR(MP_QSTR_new_service_callback), MP_ROM_PTR(&openamp_new_service_callback_obj) },
+    { MP_ROM_QSTR(MP_QSTR_Endpoint), MP_ROM_PTR(&endpoint_type) },
+};
+static MP_DEFINE_CONST_DICT(globals_dict, globals_dict_table);
+
+const mp_obj_module_t openamp_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_t)&globals_dict,
+};
+
+MP_REGISTER_ROOT_POINTER(struct _virtio_dev_obj_t *virtio_device);
+MP_REGISTER_MODULE(MP_QSTR_openamp, openamp_module);
+
+#endif // MICROPY_PY_OPENAMP
diff --git a/extmod/modopenamp.h b/extmod/modopenamp.h
new file mode 100644
index 0000000000000..750f68929770f
--- /dev/null
+++ b/extmod/modopenamp.h
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * OpenAMP's Python module.
+ */
+#ifndef MICROPY_INCLUDED_MODOPENAMP_H
+#define MICROPY_INCLUDED_MODOPENAMP_H
+
+// Include a port config file if one is defined.
+#ifdef MICROPY_PY_OPENAMP_CONFIG_FILE
+#include MICROPY_PY_OPENAMP_CONFIG_FILE
+#endif
+
+// Use the default resource table layout and initialization code.
+// Note ports and boards can override the default table and provide
+// a custom one in openamp_rsc_table_t and openamp_rsc_table_init()
+#ifndef MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+#define MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE   (1)
+#endif
+
+// This enables a trace buffer that can be used by remote processor for
+// writing trace logs. This is enabled by default to increase the default
+// resource table's compatibility with common OpenAMP examples.
+#ifndef MICROPY_PY_OPENAMP_TRACE_BUF_ENABLE
+#define MICROPY_PY_OPENAMP_TRACE_BUF_ENABLE (1)
+#endif
+
+// The resource table is used for sharing the configuration of the virtio
+// device, vrings and other resources, between the host and remote cores.
+// The layout and address the table structure must match the one used in
+// the remote processor's firmware.
+#if MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+typedef struct openamp_rsc_table {
+    unsigned int version;
+    unsigned int num;
+    unsigned int reserved[2];
+    #if MICROPY_PY_OPENAMP_TRACE_BUF_ENABLE
+    unsigned int offset[2];
+    #else
+    unsigned int offset[1];
+    #endif
+    struct fw_rsc_vdev vdev;
+    struct fw_rsc_vdev_vring vring0;
+    struct fw_rsc_vdev_vring vring1;
+    #if MICROPY_PY_OPENAMP_TRACE_BUF_ENABLE
+    struct fw_rsc_trace trace;
+    #endif
+} openamp_rsc_table_t;
+#endif // MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+
+// Performs low-level initialization of OpenAMP, such as initializing libmetal,
+// the shared resource table, shared memory regions, vrings and virtio device.
+void openamp_init(void);
+
+// Ports should run this callback in scheduler context, when
+// the remote processor notifies the host of pending messages.
+void openamp_remoteproc_notified(mp_sched_node_t *node);
+
+#endif // MICROPY_INCLUDED_MODOPENAMP_H

From 81aba8253ae3be7090cc0fcb4702f38cdd0c50c8 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 20 Feb 2024 14:09:42 +0100
Subject: [PATCH 0926/3129] extmod/modopenamp_remoteproc: Add new OpenAMP
 RemoteProc class.

RemoteProc provides an API to load firmware and control remote processors.

Note: port-specific operations must be implemented to support this class.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/extmod.mk                     |  16 +++
 extmod/modopenamp.c                  |   7 ++
 extmod/modopenamp.h                  |  12 ++
 extmod/modopenamp_remoteproc.c       | 175 +++++++++++++++++++++++++++
 extmod/modopenamp_remoteproc.h       |  46 +++++++
 extmod/modopenamp_remoteproc_store.c | 146 ++++++++++++++++++++++
 6 files changed, 402 insertions(+)
 create mode 100644 extmod/modopenamp_remoteproc.c
 create mode 100644 extmod/modopenamp_remoteproc.h
 create mode 100644 extmod/modopenamp_remoteproc_store.c

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 54689ef65e9d4..bf686fbbb4d95 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -32,6 +32,8 @@ SRC_EXTMOD_C += \
 	extmod/modnetwork.c \
 	extmod/modonewire.c \
 	extmod/modopenamp.c \
+	extmod/modopenamp_remoteproc.c \
+	extmod/modopenamp_remoteproc_store.c \
 	extmod/modos.c \
 	extmod/modplatform.c\
 	extmod/modrandom.c \
@@ -529,6 +531,10 @@ include $(TOP)/extmod/libmetal/libmetal.mk
 INC += -I$(TOP)/$(OPENAMP_DIR)
 CFLAGS += -DMICROPY_PY_OPENAMP=1
 
+ifeq ($(MICROPY_PY_OPENAMP_REMOTEPROC),1)
+CFLAGS += -DMICROPY_PY_OPENAMP_REMOTEPROC=1
+endif
+
 CFLAGS_THIRDPARTY += \
     -I$(BUILD)/openamp \
     -I$(TOP)/$(OPENAMP_DIR) \
@@ -547,6 +553,16 @@ SRC_OPENAMP_C += $(addprefix $(OPENAMP_DIR)/lib/,\
 	virtio_mmio/virtio_mmio_drv.c \
 	)
 
+# OpenAMP's remoteproc source files.
+ifeq ($(MICROPY_PY_OPENAMP_REMOTEPROC),1)
+SRC_OPENAMP_C += $(addprefix $(OPENAMP_DIR)/lib/remoteproc/,\
+	elf_loader.c \
+	remoteproc.c \
+	remoteproc_virtio.c \
+	rsc_table_parser.c \
+	)
+endif # MICROPY_PY_OPENAMP_REMOTEPROC
+
 # Disable compiler warnings in OpenAMP (variables used only for assert).
 $(BUILD)/$(OPENAMP_DIR)/lib/rpmsg/rpmsg_virtio.o: CFLAGS += -Wno-unused-but-set-variable
 $(BUILD)/$(OPENAMP_DIR)/lib/virtio_mmio/virtio_mmio_drv.o: CFLAGS += -Wno-unused-but-set-variable
diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index b0c834c2819bf..eb19c4b737ac1 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -77,6 +77,10 @@ static const char openamp_trace_buf[128];
 
 #define debug_printf(...)       // mp_printf(&mp_plat_print, __VA_ARGS__)
 
+#if MICROPY_PY_OPENAMP_REMOTEPROC
+extern mp_obj_type_t openamp_remoteproc_type;
+#endif
+
 static struct metal_device shm_device = {
     .name = METAL_SHM_NAME,
     // The number of IO regions is fixed and must match the number and
@@ -381,6 +385,9 @@ static const mp_rom_map_elem_t globals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ENDPOINT_ADDR_ANY), MP_ROM_INT(RPMSG_ADDR_ANY) },
     { MP_ROM_QSTR(MP_QSTR_new_service_callback), MP_ROM_PTR(&openamp_new_service_callback_obj) },
     { MP_ROM_QSTR(MP_QSTR_Endpoint), MP_ROM_PTR(&endpoint_type) },
+    #if MICROPY_PY_OPENAMP_REMOTEPROC
+    { MP_ROM_QSTR(MP_QSTR_RemoteProc), MP_ROM_PTR(&openamp_remoteproc_type) },
+    #endif
 };
 static MP_DEFINE_CONST_DICT(globals_dict, globals_dict_table);
 
diff --git a/extmod/modopenamp.h b/extmod/modopenamp.h
index 750f68929770f..8f677788f90be 100644
--- a/extmod/modopenamp.h
+++ b/extmod/modopenamp.h
@@ -47,6 +47,18 @@
 #define MICROPY_PY_OPENAMP_TRACE_BUF_ENABLE (1)
 #endif
 
+// For ports that don't define a custom image store, this enables a generic
+// VFS-based image store that supports loading elf files from storage.
+#ifndef MICROPY_PY_OPENAMP_REMOTEPROC_STORE_ENABLE
+#define MICROPY_PY_OPENAMP_REMOTEPROC_STORE_ENABLE (1)
+#endif
+
+// Enable or disable support for loading elf files. This option saves
+// around 7KBs when disabled.
+#ifndef MICROPY_PY_OPENAMP_REMOTEPROC_ELFLD_ENABLE
+#define MICROPY_PY_OPENAMP_REMOTEPROC_ELFLD_ENABLE (1)
+#endif
+
 // The resource table is used for sharing the configuration of the virtio
 // device, vrings and other resources, between the host and remote cores.
 // The layout and address the table structure must match the one used in
diff --git a/extmod/modopenamp_remoteproc.c b/extmod/modopenamp_remoteproc.c
new file mode 100644
index 0000000000000..6f43c71546bf2
--- /dev/null
+++ b/extmod/modopenamp_remoteproc.c
@@ -0,0 +1,175 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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.
+ *
+ * OpenAMP's remoteproc class.
+ */
+
+#if MICROPY_PY_OPENAMP_REMOTEPROC
+
+#include "py/obj.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "extmod/vfs.h"
+
+#include "metal/sys.h"
+#include "metal/alloc.h"
+#include "metal/errno.h"
+#include "metal/io.h"
+
+#include "openamp/open_amp.h"
+#include "openamp/remoteproc.h"
+#include "openamp/remoteproc_loader.h"
+
+#include "modopenamp.h"
+#include "modopenamp_remoteproc.h"
+
+#define DEBUG_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
+
+#if !MICROPY_PY_OPENAMP
+#error "MICROPY_PY_OPENAMP_REMOTEPROC requires MICROPY_PY_OPENAMP"
+#endif
+
+typedef struct openamp_remoteproc_obj {
+    mp_obj_base_t base;
+    struct remoteproc rproc;
+} openamp_remoteproc_obj_t;
+
+const mp_obj_type_t openamp_remoteproc_type;
+
+// Port-defined image store operations.
+extern struct image_store_ops openamp_remoteproc_store_ops;
+
+// Port-defined remote-proc operations.
+const struct remoteproc_ops openamp_remoteproc_ops = {
+    .init = mp_openamp_remoteproc_init,
+    .mmap = mp_openamp_remoteproc_mmap,
+    .start = mp_openamp_remoteproc_start,
+    .stop = mp_openamp_remoteproc_stop,
+    .config = mp_openamp_remoteproc_config,
+    .remove = mp_openamp_remoteproc_remove,
+    .shutdown = mp_openamp_remoteproc_shutdown,
+};
+
+static mp_obj_t openamp_remoteproc_start(mp_obj_t self_in) {
+    openamp_remoteproc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Start the processor to run the application.
+    int error = remoteproc_start(&self->rproc);
+    if (error != 0) {
+        self->rproc.state = RPROC_ERROR;
+        mp_raise_OSError(error);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(openamp_remoteproc_start_obj, openamp_remoteproc_start);
+
+static mp_obj_t openamp_remoteproc_stop(mp_obj_t self_in) {
+    openamp_remoteproc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Stop the processor, but the processor is not powered down.
+    int error = remoteproc_stop(&self->rproc);
+    if (error != 0) {
+        mp_raise_OSError(error);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(openamp_remoteproc_stop_obj, openamp_remoteproc_stop);
+
+static mp_obj_t openamp_remoteproc_shutdown(mp_obj_t self_in) {
+    openamp_remoteproc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Shutdown the remoteproc and release its resources.
+    int error = remoteproc_shutdown(&self->rproc);
+    if (error != 0) {
+        mp_raise_OSError(error);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(openamp_remoteproc_shutdown_obj, openamp_remoteproc_shutdown);
+
+mp_obj_t openamp_remoteproc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_entry };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_entry, MP_ARG_OBJ | MP_ARG_REQUIRED,  {.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);
+
+    openamp_remoteproc_obj_t *self = mp_obj_malloc_with_finaliser(openamp_remoteproc_obj_t, &openamp_remoteproc_type);
+
+    // Make sure OpenAMP is initialized.
+    if (MP_STATE_PORT(virtio_device) == NULL) {
+        openamp_init();
+    }
+
+    // Create a remoteproc instance.
+    // NOTE: ports should use rproc->priv to allocate the image store,
+    // which gets passed to remoteproc_load(), and all of the store ops.
+    remoteproc_init(&self->rproc, &openamp_remoteproc_ops, NULL);
+
+    // Configure the remote before loading applications (optional).
+    int error = remoteproc_config(&self->rproc, NULL);
+    if (error != 0) {
+        mp_raise_OSError(error);
+    }
+
+    if (mp_obj_is_int(args[ARG_entry].u_obj)) {
+        self->rproc.bootaddr = mp_obj_get_int(args[ARG_entry].u_obj);
+    } else {
+        #if MICROPY_PY_OPENAMP_REMOTEPROC_ELFLD_ENABLE
+        // Load firmware.
+        const char *path = mp_obj_str_get_str(args[ARG_entry].u_obj);
+        int error = remoteproc_load(&self->rproc, path, self->rproc.priv, &openamp_remoteproc_store_ops, NULL);
+        if (error != 0) {
+            mp_raise_OSError(error);
+        }
+        #else
+        mp_raise_TypeError(MP_ERROR_TEXT("loading firmware is not supported."));
+        #endif
+    }
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static const mp_rom_map_elem_t openamp_remoteproc_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_RemoteProc) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&openamp_remoteproc_shutdown_obj) },
+    { MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR(&openamp_remoteproc_start_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&openamp_remoteproc_stop_obj) },
+    { MP_ROM_QSTR(MP_QSTR_shutdown), MP_ROM_PTR(&openamp_remoteproc_shutdown_obj) },
+};
+static MP_DEFINE_CONST_DICT(openamp_remoteproc_dict, openamp_remoteproc_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    openamp_remoteproc_type,
+    MP_QSTR_RemoteProc,
+    MP_TYPE_FLAG_NONE,
+    make_new, openamp_remoteproc_make_new,
+    locals_dict, &openamp_remoteproc_dict
+    );
+
+#endif // MICROPY_PY_OPENAMP_REMOTEPROC
diff --git a/extmod/modopenamp_remoteproc.h b/extmod/modopenamp_remoteproc.h
new file mode 100644
index 0000000000000..9bc2b07064b4b
--- /dev/null
+++ b/extmod/modopenamp_remoteproc.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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.
+ *
+ * OpenAMP's remoteproc class.
+ */
+#ifndef MICROPY_INCLUDED_MODOPENAMP_REMOTEPROC_H
+#define MICROPY_INCLUDED_MODOPENAMP_REMOTEPROC_H
+
+#include "openamp/remoteproc.h"
+#include "openamp/remoteproc_loader.h"
+
+void *mp_openamp_remoteproc_store_alloc(void);
+struct remoteproc *mp_openamp_remoteproc_init(struct remoteproc *rproc,
+    const struct remoteproc_ops *ops, void *arg);
+void *mp_openamp_remoteproc_mmap(struct remoteproc *rproc, metal_phys_addr_t *pa,
+    metal_phys_addr_t *da, size_t size, unsigned int attribute,
+    struct metal_io_region **io);
+int mp_openamp_remoteproc_start(struct remoteproc *rproc);
+int mp_openamp_remoteproc_stop(struct remoteproc *rproc);
+int mp_openamp_remoteproc_config(struct remoteproc *rproc, void *data);
+void mp_openamp_remoteproc_remove(struct remoteproc *rproc);
+int mp_openamp_remoteproc_shutdown(struct remoteproc *rproc);
+
+#endif // MICROPY_INCLUDED_MODOPENAMP_REMOTEPROC_H
diff --git a/extmod/modopenamp_remoteproc_store.c b/extmod/modopenamp_remoteproc_store.c
new file mode 100644
index 0000000000000..857c133469d6e
--- /dev/null
+++ b/extmod/modopenamp_remoteproc_store.c
@@ -0,0 +1,146 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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.
+ *
+ * OpenAMP's remoteproc store.
+ */
+
+#if MICROPY_PY_OPENAMP_REMOTEPROC
+
+#include "py/obj.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "extmod/vfs.h"
+
+#include "metal/sys.h"
+#include "metal/alloc.h"
+#include "metal/errno.h"
+#include "metal/io.h"
+
+#include "openamp/remoteproc.h"
+#include "openamp/remoteproc_loader.h"
+
+#include "modopenamp.h"
+#include "modopenamp_remoteproc.h"
+
+#if MICROPY_PY_OPENAMP_REMOTEPROC_STORE_ENABLE
+
+#define DEBUG_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
+
+// Note the initial file buffer size needs to be at least 512 to read
+// enough of the elf headers on the first call to store_open(), and on
+// subsequent calls to store functions, it gets reallocated if needed.
+#define RPROC_FILE_STORE_BUF_SIZE   (1024)
+
+typedef struct openamp_remoteproc_filestore {
+    size_t len;
+    uint8_t *buf;
+    mp_obj_t file;
+} openamp_remoteproc_filestore_t;
+
+void *mp_openamp_remoteproc_store_alloc(void) {
+    // Allocate an rproc filestore.
+    openamp_remoteproc_filestore_t *fstore;
+    fstore = metal_allocate_memory(sizeof(openamp_remoteproc_filestore_t));
+    fstore->len = RPROC_FILE_STORE_BUF_SIZE;
+    fstore->buf = metal_allocate_memory(RPROC_FILE_STORE_BUF_SIZE);
+    return fstore;
+}
+
+static int openamp_remoteproc_store_open(void *store, const char *path, const void **image_data) {
+    DEBUG_printf("store_open(): %s\n", path);
+    mp_obj_t args[2] = {
+        mp_obj_new_str(path, strlen(path)),
+        MP_OBJ_NEW_QSTR(MP_QSTR_rb),
+    };
+
+    openamp_remoteproc_filestore_t *fstore = store;
+    fstore->file = mp_vfs_open(MP_ARRAY_SIZE(args), args, (mp_map_t *)&mp_const_empty_map);
+
+    int error = 0;
+    mp_uint_t bytes = mp_stream_read_exactly(fstore->file, fstore->buf, RPROC_FILE_STORE_BUF_SIZE, &error);
+    if (error != 0 || bytes != RPROC_FILE_STORE_BUF_SIZE) {
+        return -EINVAL;
+    }
+    *image_data = fstore->buf;
+    return bytes;
+}
+
+static void openamp_remoteproc_store_close(void *store) {
+    DEBUG_printf("store_close()\n");
+    openamp_remoteproc_filestore_t *fstore = store;
+    mp_stream_close(fstore->file);
+    metal_free_memory(fstore->buf);
+    metal_free_memory(fstore);
+}
+
+static int openamp_remoteproc_store_load(void *store, size_t offset, size_t size,
+    const void **data, metal_phys_addr_t pa,
+    struct metal_io_region *io,
+    char is_blocking) {
+
+    int error = 0;
+    openamp_remoteproc_filestore_t *fstore = store;
+
+    if (mp_stream_seek(fstore->file, offset, MP_SEEK_SET, &error) == -1) {
+        return -EINVAL;
+    }
+
+    if (pa == METAL_BAD_PHYS) {
+        if (size > fstore->len) {
+            // Note tracked allocs don't support realloc.
+            fstore->len = size;
+            fstore->buf = metal_allocate_memory(size);
+            DEBUG_printf("store_load() realloc to %lu\n", fstore->len);
+        }
+        *data = fstore->buf;
+        DEBUG_printf("store_load(): pa 0x%lx offset %u size %u \n", (uint32_t)pa, offset, size);
+    } else {
+        void *va = metal_io_phys_to_virt(io, pa);
+        if (va == NULL) {
+            return -EINVAL;
+        }
+        *data = va;
+        DEBUG_printf("store_load(): pa 0x%lx va 0x%p offset %u size %u \n", (uint32_t)pa, va, offset, size);
+    }
+
+    mp_uint_t bytes = mp_stream_read_exactly(fstore->file, (void *)*data, size, &error);
+    if (bytes != size || error != 0) {
+        return -EINVAL;
+    }
+
+    return bytes;
+}
+
+const struct image_store_ops openamp_remoteproc_store_ops = {
+    .open = openamp_remoteproc_store_open,
+    .close = openamp_remoteproc_store_close,
+    .load = openamp_remoteproc_store_load,
+    .features = SUPPORT_SEEK,
+};
+
+#endif // MICROPY_PY_OPENAMP_REMOTEPROC_STORE_ENABLE
+
+#endif // MICROPY_PY_OPENAMP_REMOTEPROC

From 13297d8c3a3cedbf5fd0d2817077270b284fe401 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 13 Nov 2023 17:24:41 +0100
Subject: [PATCH 0927/3129] stm32: Implement port backend for libmetal.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/Makefile      |   7 +++
 ports/stm32/irq.h         |   2 +
 ports/stm32/mpmetalport.c | 107 ++++++++++++++++++++++++++++++++++++++
 ports/stm32/mpmetalport.h |  76 +++++++++++++++++++++++++++
 4 files changed, 192 insertions(+)
 create mode 100644 ports/stm32/mpmetalport.c
 create mode 100644 ports/stm32/mpmetalport.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d1694426d3529..75609031966d5 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -422,6 +422,13 @@ endif
 
 endif # MICROPY_PY_BLUETOOTH
 
+# Add stm32-specific implementation of libmetal (and optionally OpenAMP's rproc).
+# Note: libmetal code is generated via a pre-processor so ensure that runs first.
+ifeq ($(MICROPY_PY_OPENAMP),1)
+SRC_C += mpmetalport.c
+$(BUILD)/mpmetalport.o: $(BUILD)/openamp/metal/config.h
+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))
diff --git a/ports/stm32/irq.h b/ports/stm32/irq.h
index e3a204ec96a32..58e6d0a804854 100644
--- a/ports/stm32/irq.h
+++ b/ports/stm32/irq.h
@@ -174,6 +174,8 @@ static inline void restore_irq_pri(uint32_t state) {
 
 #define IRQ_PRI_SPI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 8, 0)
 
+#define IRQ_PRI_HSEM            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 10, 0)
+
 // Interrupt priority for non-special timers.
 #define IRQ_PRI_TIMX            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 13, 0)
 
diff --git a/ports/stm32/mpmetalport.c b/ports/stm32/mpmetalport.c
new file mode 100644
index 0000000000000..72f5537ce5746
--- /dev/null
+++ b/ports/stm32/mpmetalport.c
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * libmetal stm32 port.
+ */
+
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#include "mpu.h"
+
+#include "metal/sys.h"
+#include "metal/utilities.h"
+#include "metal/device.h"
+
+struct metal_state _metal;
+static mp_sched_node_t rproc_notify_node;
+
+int metal_sys_init(const struct metal_init_params *params) {
+    metal_unused(params);
+
+    // Clear HSEM pending IRQ.
+    HSEM_COMMON->ICR |= (uint32_t)__HAL_HSEM_SEMID_TO_MASK(METAL_HSEM_MASTER_ID);
+    HAL_NVIC_ClearPendingIRQ(HSEM1_IRQn);
+
+    // Enable and configure HSEM.
+    __HAL_RCC_HSEM_CLK_ENABLE();
+    NVIC_SetPriority(HSEM1_IRQn, IRQ_PRI_HSEM);
+    HAL_NVIC_EnableIRQ(HSEM1_IRQn);
+    HAL_HSEM_ActivateNotification(__HAL_HSEM_SEMID_TO_MASK(METAL_HSEM_MASTER_ID));
+
+    #ifndef VIRTIO_USE_DCACHE
+    // If cache management is not enabled, configure the MPU to disable caching
+    // for the entire shared memory region.
+    uint32_t irq_state = mpu_config_start();
+    mpu_config_region(MPU_REGION_OPENAMP, METAL_MPU_REGION_BASE, MPU_CONFIG_SHARED_UNCACHED(METAL_MPU_REGION_SIZE));
+    mpu_config_end(irq_state);
+    #endif
+
+    metal_bus_register(&metal_generic_bus);
+    return 0;
+}
+
+void metal_sys_finish(void) {
+    HAL_NVIC_DisableIRQ(HSEM1_IRQn);
+    HAL_HSEM_DeactivateNotification(__HAL_HSEM_SEMID_TO_MASK(METAL_HSEM_MASTER_ID));
+    __HAL_RCC_HSEM_CLK_DISABLE();
+    metal_bus_unregister(&metal_generic_bus);
+}
+
+unsigned int sys_irq_save_disable(void) {
+    return disable_irq();
+}
+
+void sys_irq_restore_enable(unsigned int state) {
+    enable_irq(state);
+}
+
+void *metal_machine_io_mem_map(void *va, metal_phys_addr_t pa,
+    size_t size, unsigned int flags) {
+    metal_unused(pa);
+    metal_unused(size);
+    metal_unused(flags);
+    return va;
+}
+
+void metal_machine_cache_flush(void *addr, unsigned int len) {
+    SCB_CleanDCache_by_Addr(addr, len);
+}
+
+void metal_machine_cache_invalidate(void *addr, unsigned int len) {
+    SCB_InvalidateDCache_by_Addr(addr, len);
+}
+
+int metal_rproc_notify(void *priv, uint32_t id) {
+    HAL_HSEM_FastTake(METAL_HSEM_REMOTE_ID);
+    HAL_HSEM_Release(METAL_HSEM_REMOTE_ID, 0);
+    return 0;
+}
+
+void HSEM1_IRQHandler(void) {
+    HAL_HSEM_IRQHandler();
+    mp_sched_schedule_node(&rproc_notify_node, openamp_remoteproc_notified);
+    HAL_HSEM_ActivateNotification(__HAL_HSEM_SEMID_TO_MASK(METAL_HSEM_MASTER_ID));
+}
diff --git a/ports/stm32/mpmetalport.h b/ports/stm32/mpmetalport.h
new file mode 100644
index 0000000000000..53f329d15b093
--- /dev/null
+++ b/ports/stm32/mpmetalport.h
@@ -0,0 +1,76 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 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.
+ *
+ * libmetal stm32 port.
+ */
+#ifndef MICROPY_INCLUDED_STM32_MPMETALPORT_H
+#define MICROPY_INCLUDED_STM32_MPMETALPORT_H
+
+#include <stdlib.h>
+#include "py/mphal.h"
+#include "py/runtime.h"
+
+#define METAL_HAVE_STDATOMIC_H      0
+#define METAL_HAVE_FUTEX_H          0
+
+#define METAL_MAX_DEVICE_REGIONS    2
+
+#define METAL_HSEM_REMOTE_ID        0
+#define METAL_HSEM_MASTER_ID        1
+
+// Set to 1 to enable log output.
+#define METAL_LOG_HANDLER_ENABLE    0
+
+#define metal_cpu_yield()
+
+// Shared memory config
+#define METAL_SHM_NAME              "OPENAMP_SHM"
+// Note 1K must be reserved at the start of the openamp
+// shared memory region, for the shared resource table.
+#define METAL_RSC_ADDR              ((void *)_openamp_shm_region_start)
+#define METAL_RSC_SIZE              (1024)
+
+#define METAL_SHM_ADDR              ((metal_phys_addr_t)(_openamp_shm_region_start + METAL_RSC_SIZE))
+#define METAL_SHM_SIZE              ((size_t)(_openamp_shm_region_end - _openamp_shm_region_start - METAL_RSC_SIZE))
+
+#define METAL_MPU_REGION_BASE       ((uint32_t)_openamp_shm_region_start)
+#define METAL_MPU_REGION_SIZE       (MPU_REGION_SIZE_64KB)
+
+extern const char _openamp_shm_region_start[];
+extern const char _openamp_shm_region_end[];
+
+int metal_rproc_notify(void *priv, uint32_t id);
+extern void openamp_remoteproc_notified(mp_sched_node_t *node);
+
+static inline int __metal_sleep_usec(unsigned int usec) {
+    mp_hal_delay_us(usec);
+    return 0;
+}
+
+static inline void metal_generic_default_poll(void) {
+    MICROPY_EVENT_POLL_HOOK
+}
+
+#endif // MICROPY_INCLUDED_STM32_METAL_PORT_H

From 09eb4caccb34b16647a650ddd396bcdd318613dc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 13 Nov 2023 17:25:11 +0100
Subject: [PATCH 0928/3129] stm32: Implement port backend for OpenAMP's
 remoteproc.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/Makefile           |   4 +
 ports/stm32/mpremoteprocport.c | 153 +++++++++++++++++++++++++++++++++
 2 files changed, 157 insertions(+)
 create mode 100644 ports/stm32/mpremoteprocport.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 75609031966d5..50ac48e5a18eb 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -427,6 +427,10 @@ endif # MICROPY_PY_BLUETOOTH
 ifeq ($(MICROPY_PY_OPENAMP),1)
 SRC_C += mpmetalport.c
 $(BUILD)/mpmetalport.o: $(BUILD)/openamp/metal/config.h
+ifeq ($(MICROPY_PY_OPENAMP_REMOTEPROC),1)
+SRC_C += mpremoteprocport.c
+$(BUILD)/mpremoteprocport.o: $(BUILD)/openamp/metal/config.h
+endif
 endif
 
 # SRC_O should be placed first to work around this LTO bug with binutils <2.35:
diff --git a/ports/stm32/mpremoteprocport.c b/ports/stm32/mpremoteprocport.c
new file mode 100644
index 0000000000000..56dff43da4e73
--- /dev/null
+++ b/ports/stm32/mpremoteprocport.c
@@ -0,0 +1,153 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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.
+ *
+ * modremoteproc stm32 port.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "metal/alloc.h"
+#include "metal/errno.h"
+#include "metal/io.h"
+#include "metal/sys.h"
+#include "metal/device.h"
+#include "metal/utilities.h"
+#include "extmod/modopenamp_remoteproc.h"
+
+#define DEBUG_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
+
+struct remoteproc *mp_openamp_remoteproc_init(struct remoteproc *rproc,
+    const struct remoteproc_ops *ops, void *arg) {
+    DEBUG_printf("rproc_init()\n");
+
+    rproc->ops = ops;
+    rproc->state = RPROC_OFFLINE;
+    // Allocate the image store and save it in private data.
+    rproc->priv = mp_openamp_remoteproc_store_alloc();
+    return rproc;
+}
+
+void *mp_openamp_remoteproc_mmap(struct remoteproc *rproc, metal_phys_addr_t *pa,
+    metal_phys_addr_t *da, size_t size, unsigned int attribute,
+    struct metal_io_region **io) {
+    DEBUG_printf("rproc_mmap(): pa 0x%p da 0x%p io 0x%p size %u\n", *pa, *da, *io, size);
+
+    struct remoteproc_mem *mem;
+    metal_phys_addr_t lpa = *pa;
+    metal_phys_addr_t lda = *da;
+
+    if (lda == METAL_BAD_PHYS) {
+        return NULL;
+    }
+
+    if (lpa == METAL_BAD_PHYS) {
+        lpa = lda;
+    }
+
+    // Currently this port doesn't support loading firmware to flash,
+    // only SD/SRAM images are supported. Check of load address is in
+    // the flash region, and if so return NULL.
+    if (lda >= FLASH_BASE && lda < FLASH_END) {
+        return NULL;
+    }
+
+    mem = metal_allocate_memory(sizeof(*mem));
+    if (!mem) {
+        return NULL;
+    }
+
+    *io = metal_allocate_memory(sizeof(struct metal_io_region));
+    if (!*io) {
+        metal_free_memory(mem);
+        return NULL;
+    }
+
+    remoteproc_init_mem(mem, NULL, lpa, lda, size, *io);
+
+    metal_io_init(*io, (void *)mem->da, &mem->pa, size,
+        sizeof(metal_phys_addr_t) << 3, attribute, NULL);
+
+    remoteproc_add_mem(rproc, mem);
+    *pa = lpa;
+    *da = lda;
+    return metal_io_phys_to_virt(*io, mem->pa);
+}
+
+int mp_openamp_remoteproc_start(struct remoteproc *rproc) {
+    DEBUG_printf("rproc_start()\n");
+    if ((RCC->GCR & RCC_GCR_BOOT_C2) || (FLASH->OPTSR_CUR & FLASH_OPTSR_BCM4)) {
+        // The CM4 core has already been started manually, or auto-boot is enabled
+        // via the option bytes, in either case the core can't be restarted.
+        DEBUG_printf("rproc_start(): CM4 core is already booted.\n");
+        return -1;
+    }
+
+    // Flush M7 cache.
+    struct metal_list *node;
+    metal_list_for_each(&rproc->mems, node) {
+        struct remoteproc_mem *mem;
+        mem = metal_container_of(node, struct remoteproc_mem, node);
+        SCB_CleanDCache_by_Addr((uint32_t *)mem->pa, mem->size);
+    }
+
+    HAL_SYSCFG_CM4BootAddConfig(SYSCFG_BOOT_ADDR0, (uint32_t)rproc->bootaddr);
+    HAL_RCCEx_EnableBootCore(RCC_BOOT_C2);
+    return 0;
+}
+
+int mp_openamp_remoteproc_stop(struct remoteproc *rproc) {
+    DEBUG_printf("rproc_stop()\n");
+    if (rproc->state == RPROC_RUNNING) {
+        // There's no straightforward way to reset or shut down
+        // the remote processor, so a full system reset is needed.
+        NVIC_SystemReset();
+    }
+    return 0;
+}
+
+int mp_openamp_remoteproc_config(struct remoteproc *rproc, void *data) {
+    DEBUG_printf("rproc_config()\n");
+    (void)rproc;
+    return 0;
+}
+
+void mp_openamp_remoteproc_remove(struct remoteproc *rproc) {
+    DEBUG_printf("rproc_remove()\n");
+    (void)rproc;
+}
+
+int mp_openamp_remoteproc_shutdown(struct remoteproc *rproc) {
+    DEBUG_printf("rproc_shutdown()\n");
+    if (rproc->state == RPROC_RUNNING) {
+        // There's no straightforward way to reset or shut down
+        // the remote processor, so a full system reset is needed.
+        NVIC_SystemReset();
+    }
+    return 0;
+}

From c859978da31bde0a43848490a4da339cdea22c2f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 20 Nov 2023 10:03:22 +0100
Subject: [PATCH 0929/3129] stm32/boards/ARDUINO_GIGA: Enable OpenAMP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk |  2 ++
 ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld     | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
index b927388c5577a..46fe40c2a6a82 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
@@ -23,6 +23,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_PY_OPENAMP = 1
+MICROPY_PY_OPENAMP_REMOTEPROC = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
 MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'
diff --git a/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld b/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
index d5bd9598f9820..793a76b970292 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
@@ -14,10 +14,10 @@ MEMORY
     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 */
+    FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
+    FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
+    FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1280K   /* CM7 firmware */
+    FLASH_CM4 (rx)  : ORIGIN = 0x08180000, LENGTH = 512K    /* CM4 firmware */
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -44,4 +44,8 @@ _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);
 
+/* OpenAMP shared memory region */
+_openamp_shm_region_start = ORIGIN(SRAM4);
+_openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);
+
 INCLUDE common_blifs.ld

From fc9734363919c1ecba1f9ae58f8c093e47e55d56 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 11 Mar 2024 09:31:11 +0100
Subject: [PATCH 0930/3129] stm32/boards/ARDUINO_NICLA_VISION: Enable OpenAMP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .../boards/ARDUINO_NICLA_VISION/mpconfigboard.mk     |  2 ++
 ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
index 2c48c17f3805e..77d547bce05e9 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
@@ -23,6 +23,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_PY_OPENAMP = 1
+MICROPY_PY_OPENAMP_REMOTEPROC = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
 MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld
index fcbfc94d46204..6d6ce279f299c 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld
@@ -14,10 +14,10 @@ MEMORY
     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 */
+    FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
+    FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
+    FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1280K   /* CM7 firmware */
+    FLASH_CM4 (rx)  : ORIGIN = 0x08180000, LENGTH = 512K    /* CM4 firmware */
 }
 
 _cm4_ram_start = ORIGIN(SRAM4);
@@ -46,4 +46,8 @@ _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);
 
+/* OpenAMP shared memory region */
+_openamp_shm_region_start = ORIGIN(SRAM4);
+_openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);
+
 INCLUDE common_blifs.ld

From 864e4596bf1c99112019b3d0d169f140ea9f2284 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 11 Mar 2024 09:32:10 +0100
Subject: [PATCH 0931/3129] stm32/boards/ARDUINO_PORTENTA_H7: Enable OpenAMP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .../boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk      |  2 ++
 ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld  | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
index cf4d40e5fe9b9..c56c8f005f72b 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
@@ -23,6 +23,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_PY_OPENAMP = 1
+MICROPY_PY_OPENAMP_REMOTEPROC = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
 MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
index d5bd9598f9820..793a76b970292 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
@@ -14,10 +14,10 @@ MEMORY
     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 */
+    FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
+    FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
+    FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1280K   /* CM7 firmware */
+    FLASH_CM4 (rx)  : ORIGIN = 0x08180000, LENGTH = 512K    /* CM4 firmware */
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -44,4 +44,8 @@ _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);
 
+/* OpenAMP shared memory region */
+_openamp_shm_region_start = ORIGIN(SRAM4);
+_openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);
+
 INCLUDE common_blifs.ld

From e5ca06a06fbb36b82dc50c118735cc1c10506080 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 29 Feb 2024 12:31:24 +0100
Subject: [PATCH 0932/3129] docs/library/openamp: Document the new openamp
 module.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 docs/library/index.rst   |   1 +
 docs/library/openamp.rst | 115 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 docs/library/openamp.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index eb29b7680542e..4209a0781a60e 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -103,6 +103,7 @@ the following libraries.
    micropython.rst
    neopixel.rst
    network.rst
+   openamp.rst
    uctypes.rst
    vfs.rst
 
diff --git a/docs/library/openamp.rst b/docs/library/openamp.rst
new file mode 100644
index 0000000000000..de4d51ad06b5e
--- /dev/null
+++ b/docs/library/openamp.rst
@@ -0,0 +1,115 @@
+:mod:`openamp` -- provides standard Asymmetric Multiprocessing (AMP) support
+============================================================================
+
+.. module:: openamp
+   :synopsis: provides standard Asymmetric Multiprocessing (AMP) support
+
+The ``openamp`` module provides a standard inter-processor communications infrastructure
+for MicroPython. The module handles all of the details of OpenAMP, such as setting up
+the shared resource table, initializing vrings, etc. It provides an API for using the
+RPMsg bus infrastructure with the `Endpoint` class, and provides processor Life Cycle
+Management (LCM) support, such as loading firmware and starting and stopping a remote
+core, via the `RemoteProc` class.
+
+Example usage::
+
+    import openamp
+
+    def ept_recv_callback(src, data):
+        print("Received message on endpoint", data)
+
+    # Create a new RPMsg endpoint to communicate with the remote core.
+    ept = openamp.Endpoint("vuart-channel", callback=ept_recv_callback)
+
+    # Create a RemoteProc object, load its firmware and start it.
+    rproc = openamp.RemoteProc("virtual_uart.elf") # Or entry point address (ex 0x081E0000)
+    rproc.start()
+
+    while True:
+        if ept.is_ready():
+            ept.send("data")
+
+Functions
+---------
+
+.. function:: new_service_callback(ns_callback)
+
+    Set the new service callback.
+
+    The *ns_callback* argument is a function that will be called when the remote processor
+    announces new services. At that point the host processor can choose to create the
+    announced endpoint, if this particular service is supported, or ignore it if it's
+    not. If this function is not set, the host processor should first register the
+    endpoint locally, and it will be automatically bound when the remote announces
+    the service.
+
+Endpoint class
+--------------
+
+.. class:: Endpoint(name, callback, src=ENDPOINT_ADDR_ANY, dest=ENDPOINT_ADDR_ANY)
+
+   Construct a new RPMsg Endpoint. An endpoint is a bidirectional communication
+   channel between two cores.
+
+   Arguments are:
+
+        - *name* is the name of the endpoint.
+        - *callback* is a function that is called when the endpoint receives data with the
+          source address of the remote point, and the data as bytes passed by reference.
+        - *src* is the endpoint source address. If none is provided one will be assigned
+          to the endpoint by the library.
+        - *dest* is the endpoint destination address. If the endpoint is created from the
+          new_service_callback, this must be provided and it must match the remote endpoint's
+          source address. If the endpoint is registered locally, before the announcement, the
+          destination address will be assigned by the library when the endpoint is bound.
+
+.. method:: Endpoint.deinit()
+
+   Destroy the endpoint and release all of its resources.
+
+.. method:: Endpoint.is_ready()
+
+   Returns True if the endpoint is ready to send (i.e., has both a source and destination addresses)
+
+.. method:: Endpoint.send(src=-1, dest=-1, timeout=-1)
+
+   Send a message to the remote processor over this endpoint.
+
+   Arguments are:
+
+        - *src* is the source endpoint address of the message. If none is provided, the
+          source address the endpoint is bound to is used.
+        - *dest* is the destination endpoint address of the message. If none is provided,
+          the destination address the endpoint is bound to is used.
+        - *timeout* specifies the time in milliseconds to wait for a free buffer. By default
+          the function is blocking.
+
+RemoteProc class
+----------------
+
+.. class:: RemoteProc(entry)
+
+   The RemoteProc object provides processor Life Cycle Management (LCM) support, such as
+   loading firmware, starting and stopping a remote core.
+
+   The *entry* argument can be a path to firmware image, in which case the firmware is
+   loaded from file to its target memory, or an entry point address, in which case the
+   firmware must be loaded already at the given address.
+
+.. method:: RemoteProc.start()
+
+   Starts the remote processor.
+
+.. method:: RemoteProc.stop()
+
+   Stops the remote processor. The exact behavior is platform-dependent. On the STM32H7 for
+   example it's not possible to stop and then restart the Cortex-M4 core, so a complete
+   system reset is performed on a call to this function.
+
+.. method:: RemoteProc.shutdown()
+
+   Shutdown stops the remote processor and releases all of its resources. The exact behavior
+   is platform-dependent, however typically it disables power and clocks to the remote core.
+   This function is also used as the finaliser (i.e., called when ``RemoteProc`` object is
+   collected). Note that on the STM32H7, it's not possible to stop and then restart the
+   Cortex-M4 core, so a complete system reset is performed on a call to this function.

From 486ca3a688542f9f535522c29342e2dafe805d5a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 14 Mar 2024 08:41:52 +0100
Subject: [PATCH 0933/3129] tools/ci.sh: Add Arduino GIGA to stm32 CI build.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .github/workflows/ports_stm32.yml | 1 +
 tools/ci.sh                       | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index 84d30b27f6e66..f5e01dc1f620e 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -25,6 +25,7 @@ jobs:
         ci_func:  # names are functions in ci.sh
           - stm32_pyb_build
           - stm32_nucleo_build
+          - stm32_misc_build
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
diff --git a/tools/ci.sh b/tools/ci.sh
index 3cbc51cfad625..f94f23893b710 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -366,6 +366,12 @@ function ci_stm32_nucleo_build {
     diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu
 }
 
+function ci_stm32_misc_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/stm32 BOARD=ARDUINO_GIGA submodules
+    make ${MAKEOPTS} -C ports/stm32 BOARD=ARDUINO_GIGA
+}
+
 ########################################################################################
 # ports/unix
 

From df2ff0c3553f67c3e8fe29f41013f27a75b608af Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Mar 2024 17:51:47 +1100
Subject: [PATCH 0934/3129] LICENSE: Add libmetal and open-amp to 3rd-party
 license list.

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

diff --git a/LICENSE b/LICENSE
index b85f31808a483..9142c46045846 100644
--- a/LICENSE
+++ b/LICENSE
@@ -48,12 +48,14 @@ used during the build process and is not part of the compiled source code.
         /cmsis (BSD-3-clause)
         /crypto-algorithms (NONE)
         /libhydrogen (ISC)
+        /libmetal (BSD-3-clause)
         /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)
+        /open-amp (BSD-3-clause)
         /pico-sdk (BSD-3-clause)
         /re15 (BSD-3-clause)
         /stm32lib (BSD-3-clause)

From fb3820e3d62d284472420c68828a6b6443265b61 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 16 Mar 2024 00:40:39 +1100
Subject: [PATCH 0935/3129] nrf/boards: Enable MICROPY_HW_ENABLE_USBDEV on
 boards with USB CDC.

These boards were broken by 9d0d262be069089f01da6b40d2cd78f1da14de0f.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h | 1 +
 ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h          | 1 +
 ports/nrf/boards/PCA10059/mpconfigboard.h                | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
index 94624be028a17..499abbc4efc3c 100644
--- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
@@ -37,6 +37,7 @@
 
 #define MICROPY_HW_ENABLE_RNG        (1)
 
+#define MICROPY_HW_ENABLE_USBDEV     (1)
 #define MICROPY_HW_USB_CDC           (1)
 
 #define MICROPY_HW_HAS_LED           (1)
diff --git a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
index 343fa4c2f3944..35b70d61290ff 100644
--- a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
+++ b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
@@ -37,6 +37,7 @@
 
 #define MICROPY_HW_ENABLE_RNG       (1)
 
+#define MICROPY_HW_ENABLE_USBDEV    (1)
 #define MICROPY_HW_USB_CDC          (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10059/mpconfigboard.h b/ports/nrf/boards/PCA10059/mpconfigboard.h
index 1c87731584de7..97f6ccb9410f0 100644
--- a/ports/nrf/boards/PCA10059/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10059/mpconfigboard.h
@@ -37,6 +37,7 @@
 
 #define MICROPY_HW_ENABLE_RNG       (1)
 
+#define MICROPY_HW_ENABLE_USBDEV    (1)
 #define MICROPY_HW_USB_CDC          (1)
 
 #define MICROPY_HW_HAS_LED          (1)

From 01c31ea804c7e2a034e1249b43c30673b4382116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sat, 24 Feb 2024 23:44:47 +0000
Subject: [PATCH 0936/3129] extmod/os_dupterm: Handle exception properly when
 it occurs in parallel.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When an exception is handled and the stream is closed, but while this
happens, another exception occurs or dupterm is deactivated for another
reason, the initial deactivation crashes, because its dupterm is removed.

Co-authored-by: Damien George <damien@micropython.org>

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/os_dupterm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extmod/os_dupterm.c b/extmod/os_dupterm.c
index 156766a43c508..399f2237fbb2f 100644
--- a/extmod/os_dupterm.c
+++ b/extmod/os_dupterm.c
@@ -45,6 +45,10 @@ void mp_os_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) {
     if (exc != MP_OBJ_NULL) {
         mp_obj_print_exception(&mp_plat_print, exc);
     }
+    if (term == MP_OBJ_NULL) {
+        // Dupterm was already closed.
+        return;
+    }
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_stream_close(term);

From 305707b281bc64aacb154e0165bd0a9ca3fedfe8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Mar 2024 18:39:23 +1100
Subject: [PATCH 0937/3129] lib/berkeley-db-1.xx: Update submodule URL and
 version.

This updates the berkeley-db-1.xx submodule URL to a repository hosted
under the micropython organisation, and makes the following changes:

- Moves the berkeley-db header files to a single directory within the
  submodule, and references all these headers with a much fuller path,
  which prevents symbol clashes (eg with esp32 and queue.h).

- Removes unused/non-working files from berkeley-db, which removes all
  symlinks in that repo (symlinks don't play well under Windows).

- Allows injecting an external configuration header into berkeley-db, so
  the configuration doesn't have to be provided by -Dxx=yy flags to the
  compiler (and possibly clashing with other symbols).

- Removes the advertising clause from the BSD 4-clause license of
  berkeley-db (see relevant commit and README.Impt.License.Change for
  details).

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules          | 2 +-
 lib/berkeley-db-1.xx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index aa9bb3d6d94cd..423d1bbeed8fb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 	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
+	url = https://github.com/micropython/berkeley-db-1.xx
 [submodule "lib/stm32lib"]
 	path = lib/stm32lib
 	url = https://github.com/micropython/stm32lib
diff --git a/lib/berkeley-db-1.xx b/lib/berkeley-db-1.xx
index 35aaec4418ad7..85373b548f1fb 160000
--- a/lib/berkeley-db-1.xx
+++ b/lib/berkeley-db-1.xx
@@ -1 +1 @@
-Subproject commit 35aaec4418ad78628a3b935885dd189d41ce779b
+Subproject commit 85373b548f1fb0119a463582570b44189dfb09ae

From cd8eea2ae99542257a33b29c9dfdc02b63fc1bd6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Mar 2024 22:43:52 +1100
Subject: [PATCH 0938/3129] all: Update extmod, ports, examples to build with
 new berkeley-db lib.

This provides a MicroPython-specific berkeley-db configuration in
extmod/berkeley-db/berkeley_db_config_port.h, and cleans up the include
path for this library.

Fixes issue #13092.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/natmod/btree/Makefile               |  7 ++++---
 examples/natmod/btree/btree_c.c              |  4 ++++
 extmod/berkeley-db/berkeley_db_config_port.h | 16 ++++++++++++++++
 extmod/extmod.cmake                          | 16 ++++++++--------
 extmod/extmod.mk                             | 10 +++++-----
 extmod/modbtree.c                            |  4 ++--
 ports/esp8266/Makefile                       |  2 +-
 7 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 extmod/berkeley-db/berkeley_db_config_port.h

diff --git a/examples/natmod/btree/Makefile b/examples/natmod/btree/Makefile
index d795102b4aad8..218ec15a2a009 100644
--- a/examples/natmod/btree/Makefile
+++ b/examples/natmod/btree/Makefile
@@ -11,9 +11,10 @@ SRC = btree_c.c btree_py.py
 ARCH = x64
 
 BTREE_DIR = $(MPY_DIR)/lib/berkeley-db-1.xx
-BTREE_DEFS = -D__DBINTERFACE_PRIVATE=1 -Dmpool_error="(void)" -Dabort=abort_ "-Dvirt_fd_t=void*" $(BTREE_DEFS_EXTRA)
-CFLAGS += -I$(BTREE_DIR)/PORT/include
-CFLAGS += -Wno-old-style-definition -Wno-sign-compare -Wno-unused-parameter $(BTREE_DEFS)
+BERKELEY_DB_CONFIG_FILE ?= \"extmod/berkeley-db/berkeley_db_config_port.h\"
+CFLAGS += -I$(BTREE_DIR)/include
+CFLAGS += -DBERKELEY_DB_CONFIG_FILE=$(BERKELEY_DB_CONFIG_FILE)
+CFLAGS += -Wno-old-style-definition -Wno-sign-compare -Wno-unused-parameter
 
 SRC += $(addprefix $(realpath $(BTREE_DIR))/,\
 	btree/bt_close.c \
diff --git a/examples/natmod/btree/btree_c.c b/examples/natmod/btree/btree_c.c
index 3c60e41b2d663..bbf51c731fbd1 100644
--- a/examples/natmod/btree/btree_c.c
+++ b/examples/natmod/btree/btree_c.c
@@ -39,6 +39,10 @@ void abort_(void) {
     nlr_raise(mp_obj_new_exception(mp_load_global(MP_QSTR_RuntimeError)));
 }
 
+int puts(const char *s) {
+    return mp_printf(&mp_plat_print, "%s\n", s);
+}
+
 int native_errno;
 #if defined(__linux__)
 int *__errno_location (void)
diff --git a/extmod/berkeley-db/berkeley_db_config_port.h b/extmod/berkeley-db/berkeley_db_config_port.h
new file mode 100644
index 0000000000000..41e4acd81e80f
--- /dev/null
+++ b/extmod/berkeley-db/berkeley_db_config_port.h
@@ -0,0 +1,16 @@
+// Berkeley-db configuration.
+
+#define __DBINTERFACE_PRIVATE 1
+#define mpool_error printf
+#define abort abort_
+#define virt_fd_t void*
+
+#ifdef MICROPY_BERKELEY_DB_DEFPSIZE
+#define DEFPSIZE MICROPY_BERKELEY_DB_DEFPSIZE
+#endif
+
+#ifdef MICROPY_BERKELEY_DB_MINCACHE
+#define MINCACHE MICROPY_BERKELEY_DB_MINCACHE
+#endif
+
+__attribute__((noreturn)) void abort_(void);
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 957580d15d36d..60f1a23ad6b22 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -132,27 +132,27 @@ if(MICROPY_PY_BTREE)
         )
 
         target_include_directories(micropy_extmod_btree PRIVATE
-            ${MICROPY_LIB_BERKELEY_DIR}/PORT/include
+            ${MICROPY_LIB_BERKELEY_DIR}/include
         )
 
+        if(NOT BERKELEY_DB_CONFIG_FILE)
+            set(BERKELEY_DB_CONFIG_FILE "${MICROPY_DIR}/extmod/berkeley-db/berkeley_db_config_port.h")
+        endif()
+
         target_compile_definitions(micropy_extmod_btree PRIVATE
-            __DBINTERFACE_PRIVATE=1
-            mpool_error=printf
-            abort=abort_
-            "virt_fd_t=void*"
+            BERKELEY_DB_CONFIG_FILE="${BERKELEY_DB_CONFIG_FILE}"
         )
 
         # 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"
+            "${MICROPY_LIB_BERKELEY_DIR}/include"
         )
 
         list(APPEND MICROPY_DEF_CORE
             MICROPY_PY_BTREE=1
-            __DBINTERFACE_PRIVATE=1
-            "virt_fd_t=void*"
+            BERKELEY_DB_CONFIG_FILE="${BERKELEY_DB_CONFIG_FILE}"
         )
 
         list(APPEND MICROPY_SOURCE_EXTMOD
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index bf686fbbb4d95..f7c6f9988e675 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -381,8 +381,10 @@ endif
 
 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
+BERKELEY_DB_CONFIG_FILE ?= \"extmod/berkeley-db/berkeley_db_config_port.h\"
+CFLAGS_EXTMOD += -DBERKELEY_DB_CONFIG_FILE=$(BERKELEY_DB_CONFIG_FILE)
+CFLAGS_EXTMOD += $(BTREE_DEFS_EXTRA)
+INC += -I$(TOP)/$(BTREE_DIR)/include
 SRC_THIRDPARTY_C += $(addprefix $(BTREE_DIR)/,\
 	btree/bt_close.c \
 	btree/bt_conv.c \
@@ -401,9 +403,7 @@ SRC_THIRDPARTY_C += $(addprefix $(BTREE_DIR)/,\
 	)
 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 -Wno-deprecated-non-prototype -Wno-unknown-warning-option $(BTREE_DEFS)
-$(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS)
+$(BUILD)/$(BTREE_DIR)/%.o: CFLAGS += -Wno-old-style-definition -Wno-sign-compare -Wno-unused-parameter -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 endif
 
 ################################################################################
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index f8c38e0ad4306..55c13ac911a73 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -57,8 +57,8 @@
 #undef CIRCLEQ_INSERT_TAIL
 #undef CIRCLEQ_REMOVE
 
-#include <db.h>
-#include <../../btree/btree.h>
+#include "berkeley-db/db.h"
+#include "berkeley-db/btree.h"
 
 typedef struct _mp_obj_btree_t {
     mp_obj_base_t base;
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 32eb39a203e70..8af7aba0aa9de 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -38,7 +38,7 @@ MICROPY_ROM_TEXT_COMPRESSION ?= 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_AXTLS = 1
 AXTLS_DEFS_EXTRA = -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
-BTREE_DEFS_EXTRA = -DDEFPSIZE=1024 -DMINCACHE=3
+BTREE_DEFS_EXTRA = -DMICROPY_BERKELEY_DB_DEFPSIZE=1024 -DMICROPY_BERKELEY_DB_MINCACHE=3
 
 FROZEN_MANIFEST ?= boards/manifest.py
 

From 7dff38fdc190d7b731fad8319d2ae8aa13fde18a Mon Sep 17 00:00:00 2001
From: Dash Peters <dash.peters@gmail.com>
Date: Sat, 11 Feb 2023 18:49:15 -0800
Subject: [PATCH 0939/3129] py/objdeque: Expand implementation to be
 doubly-ended and support iter.

Add `pop()`, `appendleft()`, and `extend()` methods, support iteration
and indexing, and initializing from an existing sequence.

Iteration and indexing (subscription) have independent configuration flags
to enable them.  They are enabled by default at the same level that
collections.deque is enabled (the extra features level).

Also add tests for checking new behavior.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/windows/mpconfigport.h |   2 +
 py/mpconfig.h                |  10 ++
 py/objdeque.c                | 183 +++++++++++++++++++++++++++++++----
 tests/basics/deque1.py       |  49 ++++++++++
 tests/basics/deque2.py       |  64 ++++++++++--
 tests/basics/deque2.py.exp   |  15 ++-
 tests/basics/deque_slice.py  |  29 ++++++
 7 files changed, 324 insertions(+), 28 deletions(-)
 create mode 100644 tests/basics/deque_slice.py

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index dee5568c6225c..55e44c6f5c8c5 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -117,6 +117,8 @@
 #define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_PY_SYS_EXC_INFO     (1)
 #define MICROPY_PY_COLLECTIONS_DEQUE (1)
+#define MICROPY_PY_COLLECTIONS_DEQUE_ITER (1)
+#define MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR (1)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
 #ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 85b9e2c9cd104..cb0f050a74bd8 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1303,6 +1303,16 @@ typedef double mp_float_t;
 #define MICROPY_PY_COLLECTIONS_DEQUE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether "collections.deque" supports iteration
+#ifndef MICROPY_PY_COLLECTIONS_DEQUE_ITER
+#define MICROPY_PY_COLLECTIONS_DEQUE_ITER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
+// Whether "collections.deque" supports subscription
+#ifndef MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR
+#define MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR (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 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/objdeque.c b/py/objdeque.c
index 68e1621793116..583537017fdb2 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -25,13 +25,11 @@
  */
 
 #include <unistd.h> // for ssize_t
-#include <string.h>
-
-#include "py/mpconfig.h"
-#if MICROPY_PY_COLLECTIONS_DEQUE
 
 #include "py/runtime.h"
 
+#if MICROPY_PY_COLLECTIONS_DEQUE
+
 typedef struct _mp_obj_deque_t {
     mp_obj_base_t base;
     size_t alloc;
@@ -42,15 +40,15 @@ typedef struct _mp_obj_deque_t {
     #define FLAG_CHECK_OVERFLOW 1
 } mp_obj_deque_t;
 
+static mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg);
+static mp_obj_t mp_obj_deque_extend(mp_obj_t self_in, mp_obj_t arg_in);
+#if MICROPY_PY_COLLECTIONS_DEQUE_ITER
+static mp_obj_t mp_obj_new_deque_it(mp_obj_t deque, mp_obj_iter_buf_t *iter_buf);
+#endif
+
 static mp_obj_t deque_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);
 
-    /* Initialization from existing sequence is not supported, so an empty
-       tuple must be passed as such. */
-    if (args[0] != mp_const_empty_tuple) {
-        mp_raise_ValueError(NULL);
-    }
-
     // Protect against -1 leading to zero-length allocation and bad array access
     mp_int_t maxlen = mp_obj_get_int(args[1]);
     if (maxlen < 0) {
@@ -66,21 +64,27 @@ static mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         o->flags = mp_obj_get_int(args[2]);
     }
 
+    mp_obj_deque_extend(MP_OBJ_FROM_PTR(o), args[0]);
+
     return MP_OBJ_FROM_PTR(o);
 }
 
+static size_t deque_len(mp_obj_deque_t *self) {
+    ssize_t len = self->i_put - self->i_get;
+    if (len < 0) {
+        len += self->alloc;
+    }
+    return len;
+}
+
 static mp_obj_t deque_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL:
             return mp_obj_new_bool(self->i_get != self->i_put);
-        case MP_UNARY_OP_LEN: {
-            ssize_t len = self->i_put - self->i_get;
-            if (len < 0) {
-                len += self->alloc;
-            }
-            return MP_OBJ_NEW_SMALL_INT(len);
-        }
+        case MP_UNARY_OP_LEN:
+            return MP_OBJ_NEW_SMALL_INT(deque_len(self));
+
         #if MICROPY_PY_SYS_GETSIZEOF
         case MP_UNARY_OP_SIZEOF: {
             size_t sz = sizeof(*self) + sizeof(mp_obj_t) * self->alloc;
@@ -117,6 +121,45 @@ static mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(deque_append_obj, mp_obj_deque_append);
 
+static mp_obj_t mp_obj_deque_appendleft(mp_obj_t self_in, mp_obj_t arg) {
+    mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
+
+    size_t new_i_get = self->i_get - 1;
+    if (self->i_get == 0) {
+        new_i_get = self->alloc - 1;
+    }
+
+    if (self->flags & FLAG_CHECK_OVERFLOW && new_i_get == self->i_put) {
+        mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("full"));
+    }
+
+    self->i_get = new_i_get;
+    self->items[self->i_get] = arg;
+
+    // overwriting first element in deque
+    if (self->i_put == new_i_get) {
+        if (self->i_put == 0) {
+            self->i_put = self->alloc - 1;
+        } else {
+            self->i_put--;
+        }
+    }
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(deque_appendleft_obj, mp_obj_deque_appendleft);
+
+static mp_obj_t mp_obj_deque_extend(mp_obj_t self_in, mp_obj_t arg_in) {
+    mp_obj_iter_buf_t iter_buf;
+    mp_obj_t iter = mp_getiter(arg_in, &iter_buf);
+    mp_obj_t item;
+    while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
+        mp_obj_deque_append(self_in, item);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(deque_extend_obj, mp_obj_deque_extend);
+
 static mp_obj_t deque_popleft(mp_obj_t self_in) {
     mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -135,6 +178,51 @@ static mp_obj_t deque_popleft(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(deque_popleft_obj, deque_popleft);
 
+static mp_obj_t deque_pop(mp_obj_t self_in) {
+    mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->i_get == self->i_put) {
+        mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty"));
+    }
+
+    if (self->i_put == 0) {
+        self->i_put = self->alloc - 1;
+    } else {
+        self->i_put--;
+    }
+
+    mp_obj_t ret = self->items[self->i_put];
+    self->items[self->i_put] = MP_OBJ_NULL;
+
+    return ret;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(deque_pop_obj, deque_pop);
+
+#if MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR
+static mp_obj_t deque_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+    if (value == MP_OBJ_NULL) {
+        // delete not supported, fall back to mp_obj_subscr() error message
+        return MP_OBJ_NULL;
+    }
+    mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
+
+    size_t offset = mp_get_index(self->base.type, deque_len(self), index, false);
+    size_t index_val = self->i_get + offset;
+    if (index_val > self->alloc) {
+        index_val -= self->alloc;
+    }
+
+    if (value == MP_OBJ_SENTINEL) {
+        // load
+        return self->items[index_val];
+    } else {
+        // store into deque
+        self->items[index_val] = value;
+        return mp_const_none;
+    }
+}
+#endif
+
 #if 0
 static mp_obj_t deque_clear(mp_obj_t self_in) {
     mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in);
@@ -147,21 +235,80 @@ static MP_DEFINE_CONST_FUN_OBJ_1(deque_clear_obj, deque_clear);
 
 static const mp_rom_map_elem_t deque_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&deque_append_obj) },
+    { MP_ROM_QSTR(MP_QSTR_appendleft), MP_ROM_PTR(&deque_appendleft_obj) },
+    { MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&deque_extend_obj) },
     #if 0
     { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&deque_clear_obj) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&deque_pop_obj) },
     { MP_ROM_QSTR(MP_QSTR_popleft), MP_ROM_PTR(&deque_popleft_obj) },
 };
 
 static MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table);
 
+#if MICROPY_PY_COLLECTIONS_DEQUE_ITER
+#define DEQUE_TYPE_FLAGS MP_TYPE_FLAG_ITER_IS_GETITER
+#define DEQUE_TYPE_ITER iter, mp_obj_new_deque_it,
+#else
+#define DEQUE_TYPE_FLAGS MP_TYPE_FLAG_NONE
+#define DEQUE_TYPE_ITER
+#endif
+
+#if MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR
+#define DEQUE_TYPE_SUBSCR subscr, deque_subscr,
+#else
+#define DEQUE_TYPE_SUBSCR
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_deque,
     MP_QSTR_deque,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     make_new, deque_make_new,
     unary_op, deque_unary_op,
+    DEQUE_TYPE_SUBSCR
+    DEQUE_TYPE_ITER
     locals_dict, &deque_locals_dict
     );
 
+/******************************************************************************/
+/* deque iterator                                                             */
+
+#if MICROPY_PY_COLLECTIONS_DEQUE_ITER
+
+typedef struct _mp_obj_deque_it_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    mp_obj_t deque;
+    size_t cur;
+} mp_obj_deque_it_t;
+
+static mp_obj_t deque_it_iternext(mp_obj_t self_in) {
+    mp_obj_deque_it_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_deque_t *deque = MP_OBJ_TO_PTR(self->deque);
+    if (self->cur != deque->i_put) {
+        mp_obj_t o_out = deque->items[self->cur];
+        if (++self->cur == deque->alloc) {
+            self->cur = 0;
+        }
+        return o_out;
+    } else {
+        return MP_OBJ_STOP_ITERATION;
+    }
+}
+
+static mp_obj_t mp_obj_new_deque_it(mp_obj_t deque, mp_obj_iter_buf_t *iter_buf) {
+    mp_obj_deque_t *deque_ = MP_OBJ_TO_PTR(deque);
+    size_t i_get = deque_->i_get;
+    assert(sizeof(mp_obj_deque_it_t) <= sizeof(mp_obj_iter_buf_t));
+    mp_obj_deque_it_t *o = (mp_obj_deque_it_t *)iter_buf;
+    o->base.type = &mp_type_polymorph_iter;
+    o->iternext = deque_it_iternext;
+    o->deque = deque;
+    o->cur = i_get;
+    return MP_OBJ_FROM_PTR(o);
+}
+
+#endif
+
 #endif // MICROPY_PY_COLLECTIONS_DEQUE
diff --git a/tests/basics/deque1.py b/tests/basics/deque1.py
index 8b7874e2b1d37..188069bcbf30a 100644
--- a/tests/basics/deque1.py
+++ b/tests/basics/deque1.py
@@ -63,3 +63,52 @@
     ~d
 except TypeError:
     print("TypeError")
+
+
+# Same tests, but now with pop() and appendleft()
+
+d = deque((), 2)
+print(len(d))
+print(bool(d))
+
+try:
+    d.popleft()
+except IndexError:
+    print("IndexError")
+
+print(d.append(1))
+print(len(d))
+print(bool(d))
+print(d.popleft())
+print(len(d))
+
+d.append(2)
+print(d.popleft())
+
+d.append(3)
+d.append(4)
+print(len(d))
+print(d.popleft(), d.popleft())
+try:
+    d.popleft()
+except IndexError:
+    print("IndexError")
+
+d.append(5)
+d.append(6)
+d.append(7)
+print(len(d))
+print(d.popleft(), d.popleft())
+print(len(d))
+try:
+    d.popleft()
+except IndexError:
+    print("IndexError")
+
+d = deque((), 2)
+d.appendleft(1)
+d.appendleft(2)
+d.appendleft(3)
+d.appendleft(4)
+d.appendleft(5)
+print(d.pop(), d.pop())
\ No newline at end of file
diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py
index 80fcd66785663..743c040789d69 100644
--- a/tests/basics/deque2.py
+++ b/tests/basics/deque2.py
@@ -6,18 +6,50 @@
     print("SKIP")
     raise SystemExit
 
+# Initial sequence is supported
+d = deque([1, 2, 3], 10)
+
+# iteration over sequence
+for x in d:
+    print(x)
+
+# Iterables larger than maxlen have the beginnings removed, also tests
+# iteration through conversion to list
+d = deque([1, 2, 3, 4, 5], 3)
+print(list(d))
+
+# Empty iterables are also supported
+deque([], 10)
+
+# Extending deques with iterables
+d.extend([6, 7])
+print(list(d))
+
+# Accessing queue elements via index
+d = deque((0, 1, 2, 3), 5)
+print(d[0], d[1], d[-1])
+
+# Writing queue elements via index
+d[3] = 5
+print(d[3])
+
+# Accessing indices out of bounds raises IndexError
+try:
+    d[4]
+except IndexError:
+    print("IndexError")
 
-# Initial sequence is not supported
 try:
-    deque([1, 2, 3], 10)
-except ValueError:
-    print("ValueError")
+    d[4] = 0
+except IndexError:
+    print("IndexError")
 
-# Not even empty list, only empty tuple
+# Removing elements with del is not supported, fall back on mp_obj_subscr() error message
 try:
-    deque([], 10)
-except ValueError:
-    print("ValueError")
+    del d[0]
+except TypeError:
+    print("TypeError")
+
 
 # Only fixed-size deques are supported, so length arg is mandatory
 try:
@@ -32,6 +64,11 @@
 except IndexError:
     print("IndexError")
 
+try:
+    d.pop()
+except IndexError:
+    print("IndexError")
+
 print(d.append(1))
 print(d.popleft())
 
@@ -46,6 +83,11 @@
 except IndexError as e:
     print(repr(e))
 
+try:
+    d.pop()
+except IndexError as e:
+    print(repr(e))
+
 d.append(5)
 d.append(6)
 print(len(d))
@@ -53,6 +95,12 @@
     d.append(7)
 except IndexError as e:
     print(repr(e))
+
+try:
+    d.appendleft(8)
+except IndexError as e:
+    print(repr(e))
+
 print(len(d))
 
 print(d.popleft(), d.popleft())
diff --git a/tests/basics/deque2.py.exp b/tests/basics/deque2.py.exp
index 3df8acf405627..71f74ed6c4aaf 100644
--- a/tests/basics/deque2.py.exp
+++ b/tests/basics/deque2.py.exp
@@ -1,14 +1,25 @@
-ValueError
-ValueError
+1
+2
+3
+[3, 4, 5]
+[5, 6, 7]
+0 1 3
+5
+IndexError
+IndexError
 TypeError
+TypeError
+IndexError
 IndexError
 None
 1
 2
 3 4
 IndexError('empty',)
+IndexError('empty',)
 2
 IndexError('full',)
+IndexError('full',)
 2
 5 6
 0
diff --git a/tests/basics/deque_slice.py b/tests/basics/deque_slice.py
new file mode 100644
index 0000000000000..367aeea3a171c
--- /dev/null
+++ b/tests/basics/deque_slice.py
@@ -0,0 +1,29 @@
+try:
+    from collections import deque
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+d = deque((), 10)
+
+d.append(1)
+d.append(2)
+d.append(3)
+
+# Index slicing for reads is not supported in CPython
+try:
+    d[0:1]
+except TypeError:
+    print("TypeError")
+
+# Index slicing for writes is not supported in CPython
+try:
+    d[0:1] = (-1, -2)
+except TypeError:
+    print("TypeError")
+
+# Index slicing for writes is not supported in CPython
+try:
+    del d[0:1]
+except TypeError:
+    print("TypeError")

From bf18ddd98930787c22b561884e0b3807b47d412b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Mar 2024 10:04:29 +1100
Subject: [PATCH 0940/3129] tools/mpy-tool.py: Fix merging of more than 128 mpy
 files.

The argument to MP_BC_MAKE_FUNCTION (raw code index) was being encoded as a
byte instead of a variable unsigned int.  That meant that if there were
more than 128 merged mpy files the encoding would be invalid.

Fix that by using `mp_encode_uint(idx)` to encode the raw code index.  And
also use `Opcode` constants for the opcode values to make it easier to
understand the code.

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

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 35c06a30282e0..06ccd6a1da8f3 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1730,10 +1730,13 @@ def copy_section(file, offset, offset2):
         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(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
+            bytecode.append(Opcode.MP_BC_MAKE_FUNCTION)
+            bytecode.extend(mp_encode_uint(idx))  # index of raw code
+            bytecode.append(Opcode.MP_BC_CALL_FUNCTION)
+            bytecode.append(0)  # 0 arguments
+            bytecode.append(Opcode.MP_BC_POP_TOP)
+        bytecode.append(Opcode.MP_BC_LOAD_CONST_NONE)
+        bytecode.append(Opcode.MP_BC_RETURN_VALUE)
 
         merged_mpy.extend(mp_encode_uint(len(bytecode) << 3 | 1 << 2))  # length, has_children
         merged_mpy.extend(bytecode)

From c9016b4979a718c7a66b2145e00fbdabfa2dc509 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Mar 2024 22:41:28 +1100
Subject: [PATCH 0941/3129] tests/basics: Split MicroPython-specific deque
 tests to separate file.

So that the MicroPython-specific behaviour can be isolated, and the CPython
compatible test don't need a .exp file.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/deque2.py                        | 68 -----------------
 tests/basics/deque_micropython.py             | 75 +++++++++++++++++++
 ...deque2.py.exp => deque_micropython.py.exp} | 11 +--
 3 files changed, 76 insertions(+), 78 deletions(-)
 create mode 100644 tests/basics/deque_micropython.py
 rename tests/basics/{deque2.py.exp => deque_micropython.py.exp} (75%)

diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py
index 743c040789d69..3552d5be37abe 100644
--- a/tests/basics/deque2.py
+++ b/tests/basics/deque2.py
@@ -1,5 +1,3 @@
-# Tests for deques with "check overflow" flag and other extensions
-# wrt to CPython.
 try:
     from collections import deque
 except ImportError:
@@ -43,69 +41,3 @@
     d[4] = 0
 except IndexError:
     print("IndexError")
-
-# Removing elements with del is not supported, fall back on mp_obj_subscr() error message
-try:
-    del d[0]
-except TypeError:
-    print("TypeError")
-
-
-# Only fixed-size deques are supported, so length arg is mandatory
-try:
-    deque(())
-except TypeError:
-    print("TypeError")
-
-d = deque((), 2, True)
-
-try:
-    d.popleft()
-except IndexError:
-    print("IndexError")
-
-try:
-    d.pop()
-except IndexError:
-    print("IndexError")
-
-print(d.append(1))
-print(d.popleft())
-
-d.append(2)
-print(d.popleft())
-
-d.append(3)
-d.append(4)
-print(d.popleft(), d.popleft())
-try:
-    d.popleft()
-except IndexError as e:
-    print(repr(e))
-
-try:
-    d.pop()
-except IndexError as e:
-    print(repr(e))
-
-d.append(5)
-d.append(6)
-print(len(d))
-try:
-    d.append(7)
-except IndexError as e:
-    print(repr(e))
-
-try:
-    d.appendleft(8)
-except IndexError as e:
-    print(repr(e))
-
-print(len(d))
-
-print(d.popleft(), d.popleft())
-print(len(d))
-try:
-    d.popleft()
-except IndexError as e:
-    print(repr(e))
diff --git a/tests/basics/deque_micropython.py b/tests/basics/deque_micropython.py
new file mode 100644
index 0000000000000..5f32bbc496a3c
--- /dev/null
+++ b/tests/basics/deque_micropython.py
@@ -0,0 +1,75 @@
+# Test MicroPython-specific features of collections.deque.
+
+try:
+    from collections import deque
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+# Only fixed-size deques are supported, so length arg is mandatory.
+try:
+    deque(())
+except TypeError:
+    print("TypeError")
+
+# Test third argument: flags when True means check for under/overflow
+d = deque((), 2, True)
+
+try:
+    d.popleft()
+except IndexError:
+    print("IndexError")
+
+try:
+    d.pop()
+except IndexError:
+    print("IndexError")
+
+# Removing elements with del is not supported, fallback to
+# mp_obj_subscr() error message.
+try:
+    del d[0]
+except TypeError:
+    print("TypeError")
+
+print(d.append(1))
+print(d.popleft())
+
+d.append(2)
+print(d.popleft())
+
+d.append(3)
+d.append(4)
+print(d.popleft(), d.popleft())
+try:
+    d.popleft()
+except IndexError as e:
+    print(repr(e))
+
+try:
+    d.pop()
+except IndexError as e:
+    print(repr(e))
+
+d.append(5)
+d.append(6)
+print(len(d))
+try:
+    d.append(7)
+except IndexError as e:
+    print(repr(e))
+
+try:
+    d.appendleft(8)
+except IndexError as e:
+    print(repr(e))
+
+print(len(d))
+
+print(d.popleft(), d.popleft())
+print(len(d))
+try:
+    d.popleft()
+except IndexError as e:
+    print(repr(e))
diff --git a/tests/basics/deque2.py.exp b/tests/basics/deque_micropython.py.exp
similarity index 75%
rename from tests/basics/deque2.py.exp
rename to tests/basics/deque_micropython.py.exp
index 71f74ed6c4aaf..f1ff7b77ac880 100644
--- a/tests/basics/deque2.py.exp
+++ b/tests/basics/deque_micropython.py.exp
@@ -1,16 +1,7 @@
-1
-2
-3
-[3, 4, 5]
-[5, 6, 7]
-0 1 3
-5
-IndexError
-IndexError
-TypeError
 TypeError
 IndexError
 IndexError
+TypeError
 None
 1
 2

From d92dff881ca99281893b1d77eee4bf2eca25d0c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Mar 2024 22:42:33 +1100
Subject: [PATCH 0942/3129] docs/library/collections: Update deque docs to
 describe new features.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/collections.rst | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index 6cf2c096ffc62..6a23e456c66a7 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -18,7 +18,9 @@ Classes
     appends and pops from either side of the deque.  New deques are created
     using the following arguments:
 
-        - *iterable* must be the empty tuple, and the new deque is created empty.
+        - *iterable* is an iterable used to populate the deque when it is
+          created.  It can be an empty tuple or list to create a deque that
+          is initially empty.
 
         - *maxlen* must be specified and the deque will be bounded to this
           maximum length.  Once the deque is full, any new items added will
@@ -26,18 +28,37 @@ Classes
 
         - The optional *flags* can be 1 to check for overflow when adding items.
 
-    As well as supporting `bool` and `len`, deque objects have the following
-    methods:
+    Deque objects support `bool`, `len`, iteration and subscript load and store.
+    They also have the following methods:
 
     .. method:: deque.append(x)
 
         Add *x* to the right side of the deque.
-        Raises IndexError if overflow checking is enabled and there is no more room left.
+        Raises ``IndexError`` if overflow checking is enabled and there is
+        no more room in the queue.
+
+    .. method:: deque.appendleft(x)
+
+        Add *x* to the left side of the deque.
+        Raises ``IndexError`` if overflow checking is enabled and there is
+        no more room in the queue.
+
+    .. method:: deque.pop()
+
+        Remove and return an item from the right side of the deque.
+        Raises ``IndexError`` if no items are present.
 
     .. method:: deque.popleft()
 
         Remove and return an item from the left side of the deque.
-        Raises IndexError if no items are present.
+        Raises ``IndexError`` if no items are present.
+
+    .. method:: deque.extend(iterable)
+
+        Extend the deque by appending all the items from *iterable* to
+        the right of the deque.
+        Raises ``IndexError`` if overflow checking is enabled and there is
+        no more room in the deque.
 
 .. function:: namedtuple(name, fields)
 

From f52b0d0ff1788225fd61a748e0786aa90e953481 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Mar 2024 12:29:11 +1100
Subject: [PATCH 0943/3129] py/asm: Add ASM_NOT_REG and ASM_NEG_REG macros for
 unary ops.

ASM_NOT_REG is optional, it can be synthesised by xor(reg, -1).
ASM_NEG_REG can also be synthesised with a subtraction, but most
architectures have a dedicated instruction for it.

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

diff --git a/py/asmarm.c b/py/asmarm.c
index cd346949eb0db..6006490701251 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -77,6 +77,11 @@ static uint asm_arm_op_mvn_imm(uint rd, uint imm) {
     return 0x3e00000 | (rd << 12) | imm;
 }
 
+static uint asm_arm_op_mvn_reg(uint rd, uint rm) {
+    // mvn rd, rm
+    return 0x1e00000 | (rd << 12) | rm;
+}
+
 static uint asm_arm_op_add_imm(uint rd, uint rn, uint imm) {
     // add rd, rn, #imm
     return 0x2800000 | (rn << 16) | (rd << 12) | (imm & 0xFF);
@@ -97,6 +102,11 @@ static uint asm_arm_op_sub_reg(uint rd, uint rn, uint rm) {
     return 0x0400000 | (rn << 16) | (rd << 12) | rm;
 }
 
+static uint asm_arm_op_rsb_imm(uint rd, uint rn, uint imm) {
+    // rsb rd, rn, #imm
+    return 0x2600000 | (rn << 16) | (rd << 12) | (imm & 0xFF);
+}
+
 static uint asm_arm_op_mul_reg(uint rd, uint rm, uint rs) {
     // mul rd, rm, rs
     assert(rd != rm);
@@ -228,11 +238,23 @@ void asm_arm_setcc_reg(asm_arm_t *as, uint rd, uint cond) {
     emit(as, asm_arm_op_mov_imm(rd, 0) | (cond ^ (1 << 28))); // mov!COND rd, #0
 }
 
+void asm_arm_mvn_reg_reg(asm_arm_t *as, uint rd, uint rm) {
+    // mvn rd, rm
+    // computes: rd := ~rm
+    emit_al(as, asm_arm_op_mvn_reg(rd, rm));
+}
+
 void asm_arm_add_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm) {
     // add rd, rn, rm
     emit_al(as, asm_arm_op_add_reg(rd, rn, rm));
 }
 
+void asm_arm_rsb_reg_reg_imm(asm_arm_t *as, uint rd, uint rn, uint imm) {
+    // rsb rd, rn, #imm
+    // computes: rd := #imm - rn
+    emit_al(as, asm_arm_op_rsb_imm(rd, rn, imm));
+}
+
 void asm_arm_sub_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm) {
     // sub rd, rn, rm
     emit_al(as, asm_arm_op_sub_reg(rd, rn, rm));
diff --git a/py/asmarm.h b/py/asmarm.h
index 81c3f7b1cf416..4a4253aef6878 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -94,8 +94,10 @@ void asm_arm_cmp_reg_i8(asm_arm_t *as, uint rd, int imm);
 void asm_arm_cmp_reg_reg(asm_arm_t *as, uint rd, uint rn);
 
 // arithmetic
+void asm_arm_mvn_reg_reg(asm_arm_t *as, uint rd, uint rm);
 void asm_arm_add_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm);
 void asm_arm_sub_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm);
+void asm_arm_rsb_reg_reg_imm(asm_arm_t *as, uint rd, uint rn, uint imm);
 void asm_arm_mul_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm);
 void asm_arm_and_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm);
 void asm_arm_eor_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm);
@@ -188,6 +190,8 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_arm_mov_reg_local_addr((as), (reg_dest), (local_num))
 #define ASM_MOV_REG_PCREL(as, reg_dest, label) asm_arm_mov_reg_pcrel((as), (reg_dest), (label))
 
+#define ASM_NOT_REG(as, reg_dest) asm_arm_mvn_reg_reg((as), (reg_dest), (reg_dest))
+#define ASM_NEG_REG(as, reg_dest) asm_arm_rsb_reg_reg_imm((as), (reg_dest), (reg_dest), 0)
 #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))
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 2829ac4c7e413..a9e68d7adbbea 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -406,6 +406,8 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_thumb_mov_reg_local_addr((as), (reg_dest), (local_num))
 #define ASM_MOV_REG_PCREL(as, rlo_dest, label) asm_thumb_mov_reg_pcrel((as), (rlo_dest), (label))
 
+#define ASM_NOT_REG(as, reg_dest) asm_thumb_mvn_rlo_rlo((as), (reg_dest), (reg_dest))
+#define ASM_NEG_REG(as, reg_dest) asm_thumb_neg_rlo_rlo((as), (reg_dest), (reg_dest))
 #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))
diff --git a/py/asmx64.c b/py/asmx64.c
index abddc162696c0..d9f33cfb2ad7e 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -54,6 +54,8 @@
 #define OPCODE_MOVZX_RM8_TO_R64  (0xb6) /* 0x0f 0xb6/r */
 #define OPCODE_MOVZX_RM16_TO_R64 (0xb7) /* 0x0f 0xb7/r */
 #define OPCODE_LEA_MEM_TO_R64    (0x8d) /* /r */
+#define OPCODE_NOT_RM64          (0xf7) /* /2 */
+#define OPCODE_NEG_RM64          (0xf7) /* /3 */
 #define OPCODE_AND_R64_TO_RM64   (0x21) /* /r */
 #define OPCODE_OR_R64_TO_RM64    (0x09) /* /r */
 #define OPCODE_XOR_R64_TO_RM64   (0x31) /* /r */
@@ -362,6 +364,14 @@ void asm_x64_mov_i64_to_r64_optimised(asm_x64_t *as, int64_t src_i64, int dest_r
     }
 }
 
+void asm_x64_not_r64(asm_x64_t *as, int dest_r64) {
+    asm_x64_generic_r64_r64(as, dest_r64, 2, OPCODE_NOT_RM64);
+}
+
+void asm_x64_neg_r64(asm_x64_t *as, int dest_r64) {
+    asm_x64_generic_r64_r64(as, dest_r64, 3, OPCODE_NEG_RM64);
+}
+
 void asm_x64_and_r64_r64(asm_x64_t *as, int dest_r64, int src_r64) {
     asm_x64_generic_r64_r64(as, dest_r64, src_r64, OPCODE_AND_R64_TO_RM64);
 }
diff --git a/py/asmx64.h b/py/asmx64.h
index a8efc2bf60161..c63e31797ef54 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -97,6 +97,8 @@ void asm_x64_mov_mem8_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int des
 void asm_x64_mov_mem16_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64);
 void asm_x64_mov_mem32_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64);
 void asm_x64_mov_mem64_to_r64(asm_x64_t *as, int src_r64, int src_disp, int dest_r64);
+void asm_x64_not_r64(asm_x64_t *as, int dest_r64);
+void asm_x64_neg_r64(asm_x64_t *as, int dest_r64);
 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);
@@ -191,6 +193,8 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_x64_mov_local_addr_to_r64((as), (local_num), (reg_dest))
 #define ASM_MOV_REG_PCREL(as, reg_dest, label) asm_x64_mov_reg_pcrel((as), (reg_dest), (label))
 
+#define ASM_NOT_REG(as, reg) asm_x64_not_r64((as), (reg))
+#define ASM_NEG_REG(as, reg) asm_x64_neg_r64((as), (reg))
 #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))
diff --git a/py/asmx86.c b/py/asmx86.c
index 94e0213d65c0f..4acac1b46ac4f 100644
--- a/py/asmx86.c
+++ b/py/asmx86.c
@@ -54,6 +54,8 @@
 #define OPCODE_MOVZX_RM8_TO_R32  (0xb6) /* 0x0f 0xb6/r */
 #define OPCODE_MOVZX_RM16_TO_R32 (0xb7) /* 0x0f 0xb7/r */
 #define OPCODE_LEA_MEM_TO_R32    (0x8d) /* /r */
+#define OPCODE_NOT_RM32          (0xf7) /* /2 */
+#define OPCODE_NEG_RM32          (0xf7) /* /3 */
 #define OPCODE_AND_R32_TO_RM32   (0x21) /* /r */
 #define OPCODE_OR_R32_TO_RM32    (0x09) /* /r */
 #define OPCODE_XOR_R32_TO_RM32   (0x31) /* /r */
@@ -244,6 +246,14 @@ size_t asm_x86_mov_i32_to_r32(asm_x86_t *as, int32_t src_i32, int dest_r32) {
     return loc;
 }
 
+void asm_x86_not_r32(asm_x86_t *as, int dest_r32) {
+    asm_x86_generic_r32_r32(as, dest_r32, 2, OPCODE_NOT_RM32);
+}
+
+void asm_x86_neg_r32(asm_x86_t *as, int dest_r32) {
+    asm_x86_generic_r32_r32(as, dest_r32, 3, OPCODE_NEG_RM32);
+}
+
 void asm_x86_and_r32_r32(asm_x86_t *as, int dest_r32, int src_r32) {
     asm_x86_generic_r32_r32(as, dest_r32, src_r32, OPCODE_AND_R32_TO_RM32);
 }
diff --git a/py/asmx86.h b/py/asmx86.h
index ac98643a6a866..027d44151e82e 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -92,6 +92,8 @@ void asm_x86_mov_r32_to_mem32(asm_x86_t *as, int src_r32, int dest_r32, int dest
 void asm_x86_mov_mem8_to_r32zx(asm_x86_t *as, int src_r32, int src_disp, int dest_r32);
 void asm_x86_mov_mem16_to_r32zx(asm_x86_t *as, int src_r32, int src_disp, int dest_r32);
 void asm_x86_mov_mem32_to_r32(asm_x86_t *as, int src_r32, int src_disp, int dest_r32);
+void asm_x86_not_r32(asm_x86_t *as, int dest_r32);
+void asm_x86_neg_r32(asm_x86_t *as, int dest_r32);
 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);
@@ -186,6 +188,8 @@ 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_LOCAL_ADDR(as, reg_dest, local_num) asm_x86_mov_local_addr_to_r32((as), (local_num), (reg_dest))
 #define ASM_MOV_REG_PCREL(as, reg_dest, label) asm_x86_mov_reg_pcrel((as), (reg_dest), (label))
 
+#define ASM_NOT_REG(as, reg) asm_x86_not_r32((as), (reg))
+#define ASM_NEG_REG(as, reg) asm_x86_neg_r32((as), (reg))
 #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))
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 5bd6426a14481..aef9e74625d3a 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -211,6 +211,10 @@ static inline void asm_xtensa_op_mull(asm_xtensa_t *as, uint reg_dest, uint reg_
     asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 2, 8, reg_dest, reg_src_a, reg_src_b));
 }
 
+static inline void asm_xtensa_op_neg(asm_xtensa_t *as, uint reg_dest, uint reg_src) {
+    asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 0, 6, reg_dest, 0, reg_src));
+}
+
 static inline void asm_xtensa_op_or(asm_xtensa_t *as, uint reg_dest, uint reg_src_a, uint reg_src_b) {
     asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 0, 2, reg_dest, reg_src_a, reg_src_b));
 }
@@ -371,6 +375,7 @@ void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 #define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) asm_xtensa_mov_reg_local_addr((as), (reg_dest), ASM_NUM_REGS_SAVED + (local_num))
 #define ASM_MOV_REG_PCREL(as, reg_dest, label) asm_xtensa_mov_reg_pcrel((as), (reg_dest), (label))
 
+#define ASM_NEG_REG(as, reg_dest) asm_xtensa_op_neg((as), (reg_dest), (reg_dest))
 #define ASM_LSL_REG_REG(as, reg_dest, reg_shift) \
     do { \
         asm_xtensa_op_ssl((as), (reg_shift)); \

From b50efbd0e319764dab3f49b64519cfea5f2c2bab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Mar 2024 12:30:09 +1100
Subject: [PATCH 0944/3129] py/asmxtensa: Optimise
 asm_xtensa_mov_reg_i32_optimised() for tiny ints.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmxtensa.c | 4 +++-
 py/asmxtensa.h | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 84018402f69e9..0fbe351dcf3c7 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -185,7 +185,9 @@ size_t asm_xtensa_mov_reg_i32(asm_xtensa_t *as, uint reg_dest, uint32_t i32) {
 }
 
 void asm_xtensa_mov_reg_i32_optimised(asm_xtensa_t *as, uint reg_dest, uint32_t i32) {
-    if (SIGNED_FIT12(i32)) {
+    if (-32 <= (int)i32 && (int)i32 <= 95) {
+        asm_xtensa_op_movi_n(as, reg_dest, i32);
+    } else if (SIGNED_FIT12(i32)) {
         asm_xtensa_op_movi(as, reg_dest, i32);
     } else {
         asm_xtensa_mov_reg_i32(as, reg_dest, i32);
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index aef9e74625d3a..f226624a82631 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -203,8 +203,9 @@ static inline void asm_xtensa_op_movi(asm_xtensa_t *as, uint reg_dest, int32_t i
     asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRI8(2, 10, (imm12 >> 8) & 0xf, reg_dest, imm12 & 0xff));
 }
 
-static inline void asm_xtensa_op_movi_n(asm_xtensa_t *as, uint reg_dest, int imm4) {
-    asm_xtensa_op16(as, ASM_XTENSA_ENCODE_RI7(12, reg_dest, imm4));
+// Argument must be in the range (-32 .. 95) inclusive.
+static inline void asm_xtensa_op_movi_n(asm_xtensa_t *as, uint reg_dest, int imm7) {
+    asm_xtensa_op16(as, ASM_XTENSA_ENCODE_RI7(12, reg_dest, imm7));
 }
 
 static inline void asm_xtensa_op_mull(asm_xtensa_t *as, uint reg_dest, uint reg_src_a, uint reg_src_b) {

From 3c445f66369a49ba2dfa7e008d0a93c71fb1b6d3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Mar 2024 12:29:29 +1100
Subject: [PATCH 0945/3129] py/emitnative: Implement viper unary ops positive,
 negative and invert.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c                      | 33 +++++++++++++++++++++++-----
 tests/micropython/viper_error.py     |  7 +++---
 tests/micropython/viper_error.py.exp |  5 ++---
 tests/micropython/viper_unop.py      | 31 ++++++++++++++++++++++++++
 tests/micropython/viper_unop.py.exp  |  9 ++++++++
 5 files changed, 74 insertions(+), 11 deletions(-)
 create mode 100644 tests/micropython/viper_unop.py
 create mode 100644 tests/micropython/viper_unop.py.exp

diff --git a/py/emitnative.c b/py/emitnative.c
index f80461dd42f3b..0b84a2ec8a85d 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -2259,15 +2259,38 @@ static void emit_native_pop_except_jump(emit_t *emit, mp_uint_t label, bool with
 }
 
 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) {
+    vtype_kind_t vtype = peek_vtype(emit, 0);
+    if (vtype == VTYPE_INT || vtype == VTYPE_UINT) {
+        if (op == MP_UNARY_OP_POSITIVE) {
+            // No-operation, just leave the argument on the stack.
+        } else if (op == MP_UNARY_OP_NEGATIVE) {
+            int reg = REG_RET;
+            emit_pre_pop_reg_flexible(emit, &vtype, &reg, reg, reg);
+            ASM_NEG_REG(emit->as, reg);
+            emit_post_push_reg(emit, vtype, reg);
+        } else if (op == MP_UNARY_OP_INVERT) {
+            #ifdef ASM_NOT_REG
+            int reg = REG_RET;
+            emit_pre_pop_reg_flexible(emit, &vtype, &reg, reg, reg);
+            ASM_NOT_REG(emit->as, reg);
+            #else
+            int reg = REG_RET;
+            emit_pre_pop_reg_flexible(emit, &vtype, &reg, REG_ARG_1, reg);
+            ASM_MOV_REG_IMM(emit->as, REG_ARG_1, -1);
+            ASM_XOR_REG_REG(emit->as, reg, REG_ARG_1);
+            #endif
+            emit_post_push_reg(emit, vtype, reg);
+        } else {
+            EMIT_NATIVE_VIPER_TYPE_ERROR(emit,
+                MP_ERROR_TEXT("'not' not implemented"), mp_binary_op_method_name[op]);
+        }
+    } else if (vtype == VTYPE_PYOBJ) {
+        emit_pre_pop_reg(emit, &vtype, REG_ARG_2);
         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]);
+            MP_ERROR_TEXT("can't do unary op of '%q'"), vtype_to_qstr(vtype));
     }
 }
 
diff --git a/tests/micropython/viper_error.py b/tests/micropython/viper_error.py
index 80617af0c1f29..6c5c3ba200702 100644
--- a/tests/micropython/viper_error.py
+++ b/tests/micropython/viper_error.py
@@ -50,6 +50,9 @@ def f():
 # incorrect return type
 test("@micropython.viper\ndef f() -> int: return []")
 
+# can't do unary op of incompatible type
+test("@micropython.viper\ndef f(x:ptr): -x")
+
 # 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")
@@ -69,9 +72,7 @@ def f():
 test("@micropython.viper\ndef f(): raise 1")
 
 # unary ops not implemented
-test("@micropython.viper\ndef f(x:int): +x")
-test("@micropython.viper\ndef f(x:int): -x")
-test("@micropython.viper\ndef f(x:int): ~x")
+test("@micropython.viper\ndef f(x:int): not x")
 
 # binary op not implemented
 test("@micropython.viper\ndef f(x:uint, y:uint): res = x // y")
diff --git a/tests/micropython/viper_error.py.exp b/tests/micropython/viper_error.py.exp
index 31c85b1d872af..51cbd6c7097cd 100644
--- a/tests/micropython/viper_error.py.exp
+++ b/tests/micropython/viper_error.py.exp
@@ -5,6 +5,7 @@ ViperTypeError("local 'x' used before type known",)
 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 unary op of 'ptr'",)
 ViperTypeError("can't do binary op between 'int' and 'object'",)
 ViperTypeError('comparison of int and uint',)
 ViperTypeError("can't load from 'int'",)
@@ -15,9 +16,7 @@ ViperTypeError("can't store to 'int'",)
 ViperTypeError("can't store 'None'",)
 ViperTypeError("can't store 'None'",)
 ViperTypeError('must raise an object',)
-ViperTypeError('unary op __pos__ not implemented',)
-ViperTypeError('unary op __neg__ not implemented',)
-ViperTypeError('unary op __invert__ not implemented',)
+ViperTypeError("'not' not implemented",)
 ViperTypeError('div/mod not implemented for uint',)
 ViperTypeError('div/mod not implemented for uint',)
 ViperTypeError('binary op  not implemented',)
diff --git a/tests/micropython/viper_unop.py b/tests/micropython/viper_unop.py
new file mode 100644
index 0000000000000..61cbd5125f167
--- /dev/null
+++ b/tests/micropython/viper_unop.py
@@ -0,0 +1,31 @@
+# test unary operators
+
+
+@micropython.viper
+def pos(x: int) -> int:
+    return +x
+
+
+print(pos(0))
+print(pos(1))
+print(pos(-2))
+
+
+@micropython.viper
+def neg(x: int) -> int:
+    return -x
+
+
+print(neg(0))
+print(neg(1))
+print(neg(-2))
+
+
+@micropython.viper
+def inv(x: int) -> int:
+    return ~x
+
+
+print(inv(0))
+print(inv(1))
+print(inv(-2))
diff --git a/tests/micropython/viper_unop.py.exp b/tests/micropython/viper_unop.py.exp
new file mode 100644
index 0000000000000..6d93312caa136
--- /dev/null
+++ b/tests/micropython/viper_unop.py.exp
@@ -0,0 +1,9 @@
+0
+1
+-2
+0
+-1
+2
+-1
+-2
+1

From 9651046edd4ebf6e2141f889c6068f4ed565f13f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Mar 2024 19:01:46 +1100
Subject: [PATCH 0946/3129] stm32/mboot: Add support for a raw filesystem.

This is enabled by default if MBOOT_FSLOAD is enabled, although a board
can explicitly disable it by `#define MBOOT_VFS_RAW (0)`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile    |  1 +
 ports/stm32/mboot/README.md   | 16 ++++--
 ports/stm32/mboot/fsload.c    | 59 +++++++++++++++++++----
 ports/stm32/mboot/fwupdate.py | 50 +++++++++++++------
 ports/stm32/mboot/mboot.h     | 26 ++++++++++
 ports/stm32/mboot/vfs.h       | 18 +++++++
 ports/stm32/mboot/vfs_raw.c   | 91 +++++++++++++++++++++++++++++++++++
 7 files changed, 232 insertions(+), 29 deletions(-)
 create mode 100644 ports/stm32/mboot/vfs_raw.c

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 389f9f5d0f4ad..07053b3293907 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -120,6 +120,7 @@ SRC_C += \
 	ui.c \
 	vfs_fat.c \
 	vfs_lfs.c \
+	vfs_raw.c \
 	drivers/bus/softspi.c \
 	drivers/bus/softqspi.c \
 	drivers/memory/spiflash.c \
diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index 73e32fcedcc97..221e3a7c3acad 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -71,13 +71,23 @@ 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):
+   support is required in Mboot:
 
     #define MBOOT_VFS_FAT (1)
     #define MBOOT_VFS_LFS1 (1)
     #define MBOOT_VFS_LFS2 (1)
+    #define MBOOT_VFS_RAW (1)
+
+   Note that the FAT and LFS2 drivers are read-only and quite compact, but
+   LFS1 supports both read and write so is rather large.
+
+   The raw filesystem type is enabled by default and is a flat section of
+   storage containing a single file without any metadata.  The raw filesystem
+   can either be one regoin, or split over two separate, contiguous regions.
+   The latter is useful for wear levelling: given a chunk of flash, write the
+   firmware starting at a random block within that chunk and wrap around to
+   the beginning of the chunk when the end is reached.  Then use a split
+   raw filesystem to inform mboot of this wrapping.
 
 2. Build the board's main application firmware as usual.
 
diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index abc3514ed146c..83905eb491070 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -39,7 +39,7 @@
 
 #if MBOOT_FSLOAD
 
-#if !(MBOOT_VFS_FAT || MBOOT_VFS_LFS1 || MBOOT_VFS_LFS2)
+#if !(MBOOT_VFS_FAT || MBOOT_VFS_LFS1 || MBOOT_VFS_LFS2 || MBOOT_VFS_RAW)
 #error Must enable at least one VFS component
 #endif
 
@@ -234,28 +234,51 @@ int fsload_process(void) {
             // End of elements.
             return -MBOOT_ERRNO_FSLOAD_NO_MOUNT;
         }
+
+        // Extract element arguments based on the element length:
+        // - 10 bytes: mount_point fs_type uint32_t uint32_t
+        // - 14 bytes: mount_point fs_type uint32_t uint32_t uint32_t
+        // - 18 bytes: mount_point fs_type uint32_t uint32_t uint32_t uint32_t
+        // - 22 bytes: mount_point fs_type uint64_t uint64_t uint32_t
+        // - 34 bytes: mount_point fs_type uint64_t uint64_t uint64_t uint64_t
         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) {
+        mboot_addr_t arg2 = 0;
+        mboot_addr_t arg3 = 0;
+        (void)arg2;
+        (void)arg3;
+        uint8_t elem_len = elem[-1];
+        if (elem_len == 10 || elem_len == 14 || elem_len == 18) {
             // 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 (elem_len >= 14) {
+                // Argument 2 given, extract it.
+                arg2 = get_le32(&elem[10]);
+                if (elem_len == 18) {
+                    // Argument 3 given, extract it.
+                    arg3 = get_le32(&elem[14]);
+                }
             }
         #if MBOOT_ADDRESS_SPACE_64BIT
-        } else if (elem[-1] == 22) {
-            // 64-bit base and length given, and block size, so extract them.
+        } else if (elem_len == 22 || elem_len == 34) {
+            // 64-bit base and length given, so extract them.
             base_addr = get_le64(&elem[2]);
             byte_len = get_le64(&elem[10]);
-            block_size = get_le32(&elem[18]);
+            if (elem_len == 22) {
+                // 32-bit argument 2 given, extract it.
+                arg2 = get_le32(&elem[18]);
+            } else {
+                // 64-bit argument 2 and 3 given, extract them.
+                arg2 = get_le64(&elem[18]);
+                arg3 = get_le64(&elem[26]);
+            }
         #endif
         } else {
             // Invalid MOUNT element.
             return -MBOOT_ERRNO_FSLOAD_INVALID_MOUNT;
         }
+
         if (elem[0] == mount_point) {
             int ret;
             union {
@@ -268,27 +291,43 @@ int fsload_process(void) {
                 #if MBOOT_VFS_LFS2
                 vfs_lfs2_context_t lfs2;
                 #endif
+                #if MBOOT_VFS_RAW
+                vfs_raw_context_t raw;
+                #endif
             } ctx;
             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) {
+                uint32_t block_size = arg2;
+                if (block_size == 0) {
+                    block_size = MBOOT_FSLOAD_DEFAULT_BLOCK_SIZE;
+                }
                 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) {
+                uint32_t block_size = arg2;
+                if (block_size == 0) {
+                    block_size = MBOOT_FSLOAD_DEFAULT_BLOCK_SIZE;
+                }
                 ret = vfs_lfs2_mount(&ctx.lfs2, base_addr, byte_len, block_size);
                 methods = &vfs_lfs2_stream_methods;
             } else
             #endif
+            #if MBOOT_VFS_RAW
+            if (elem[1] == ELEM_MOUNT_RAW) {
+                ret = vfs_raw_mount(&ctx.raw, base_addr, byte_len, arg2, arg3);
+                methods = &vfs_raw_stream_methods;
+            } else
+            #endif
             {
                 // Unknown filesystem type
                 return -MBOOT_ERRNO_FSLOAD_INVALID_MOUNT;
diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 47ceb19ba5dae..8578ff4fc9032 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -9,6 +9,7 @@
 VFS_FAT = 1
 VFS_LFS1 = 2
 VFS_LFS2 = 3
+VFS_RAW = 4
 
 # Constants for creating mboot elements.
 _ELEM_TYPE_END = const(1)
@@ -226,28 +227,45 @@ def _create_element(kind, body):
 
 
 def update_app_elements(
-    filename, fs_base, fs_len, fs_type=VFS_FAT, fs_blocksize=0, status_addr=None, addr_64bit=False
+    filename,
+    fs_base,
+    fs_len,
+    fs_type=VFS_FAT,
+    fs_blocksize=0,
+    status_addr=None,
+    addr_64bit=False,
+    *,
+    fs_base2=0,
+    fs_len2=0,
 ):
-    # Check firmware is of .dfu or .dfu.gz type
-    try:
-        with open(filename, "rb") as f:
-            hdr = deflate.DeflateIO(f, deflate.GZIP).read(6)
-    except Exception:
-        with open(filename, "rb") as f:
-            hdr = f.read(6)
-    if hdr != b"DfuSe\x01":
-        print("Firmware must be a .dfu(.gz) file.")
-        return ()
+    if fs_type != VFS_RAW:
+        # Check firmware is of .dfu or .dfu.gz type
+        try:
+            with open(filename, "rb") as f:
+                hdr = deflate.DeflateIO(f, deflate.GZIP).read(6)
+        except Exception:
+            with open(filename, "rb") as f:
+                hdr = f.read(6)
+        if hdr != b"DfuSe\x01":
+            print("Firmware must be a .dfu(.gz) file.")
+            return ()
 
     if fs_type in (VFS_LFS1, VFS_LFS2) and not fs_blocksize:
         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(mount_encoding, mount_point, fs_type, fs_base, fs_len, fs_blocksize),
-    )
+    if fs_type == VFS_RAW:
+        mount_encoding = "<BBQQQQ" if addr_64bit else "<BBLLLL"
+        elems = _create_element(
+            _ELEM_TYPE_MOUNT,
+            struct.pack(mount_encoding, mount_point, fs_type, fs_base, fs_len, fs_base2, fs_len2),
+        )
+    else:
+        mount_encoding = "<BBQQL" if addr_64bit else "<BBLLL"
+        elems = _create_element(
+            _ELEM_TYPE_MOUNT,
+            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/mboot.h b/ports/stm32/mboot/mboot.h
index 2c4813332796a..1fabff0080b1c 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -92,6 +92,31 @@
 #define MBOOT_LED_STATE_LED2 (0x04)
 #define MBOOT_LED_STATE_LED3 (0x08)
 
+// Whether to support loading firmware from a filesystem.
+#ifndef MBOOT_FSLOAD
+#define MBOOT_FSLOAD (0)
+#endif
+
+// Whether to support FAT filesystems.
+#ifndef MBOOT_VFS_FAT
+#define MBOOT_VFS_FAT (0)
+#endif
+
+// Whether to support Littlefs v1 filesystems.
+#ifndef MBOOT_VFS_LFS1
+#define MBOOT_VFS_LFS1 (0)
+#endif
+
+// Whether to support Littlefs v2 filesystems.
+#ifndef MBOOT_VFS_LFS2
+#define MBOOT_VFS_LFS2 (0)
+#endif
+
+// Whether to support raw filesystems.
+#ifndef MBOOT_VFS_RAW
+#define MBOOT_VFS_RAW (MBOOT_FSLOAD)
+#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
@@ -158,6 +183,7 @@ enum {
     ELEM_MOUNT_FAT = 1,
     ELEM_MOUNT_LFS1,
     ELEM_MOUNT_LFS2,
+    ELEM_MOUNT_RAW,
 };
 
 // Configure the type used to hold an address in the mboot address space.
diff --git a/ports/stm32/mboot/vfs.h b/ports/stm32/mboot/vfs.h
index 53dac88009bf6..a2e13b1588c38 100644
--- a/ports/stm32/mboot/vfs.h
+++ b/ports/stm32/mboot/vfs.h
@@ -93,4 +93,22 @@ int vfs_lfs2_mount(vfs_lfs2_context_t *ctx, mboot_addr_t base_addr, mboot_addr_t
 
 #endif
 
+#if MBOOT_VFS_RAW
+
+// A raw VFS contains a contiguous, single file without any metadata.
+
+typedef struct _vfs_raw_context_t {
+    mboot_addr_t seg0_base_addr;
+    mboot_addr_t seg0_byte_len;
+    mboot_addr_t seg1_base_addr;
+    mboot_addr_t seg1_byte_len;
+    mboot_addr_t file_pos;
+} vfs_raw_context_t;
+
+extern const stream_methods_t vfs_raw_stream_methods;
+
+int vfs_raw_mount(vfs_raw_context_t *ctx, mboot_addr_t seg0_base_addr, mboot_addr_t seg0_byte_len, mboot_addr_t seg1_base_addr, mboot_addr_t seg1_byte_len);
+
+#endif
+
 #endif // MICROPY_INCLUDED_STM32_MBOOT_VFS_H
diff --git a/ports/stm32/mboot/vfs_raw.c b/ports/stm32/mboot/vfs_raw.c
new file mode 100644
index 0000000000000..05539c69550a1
--- /dev/null
+++ b/ports/stm32/mboot/vfs_raw.c
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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 "vfs.h"
+
+#if MBOOT_FSLOAD && MBOOT_VFS_RAW
+
+#ifndef MIN
+#define MIN(x, y) ((x) < (y) ? (x) : (y))
+#endif
+
+int vfs_raw_mount(vfs_raw_context_t *ctx, mboot_addr_t seg0_base_addr, mboot_addr_t seg0_byte_len, mboot_addr_t seg1_base_addr, mboot_addr_t seg1_byte_len) {
+    ctx->seg0_base_addr = seg0_base_addr;
+    ctx->seg0_byte_len = seg0_byte_len;
+    ctx->seg1_base_addr = seg1_base_addr;
+    ctx->seg1_byte_len = seg1_byte_len;
+    return 0;
+}
+
+static int vfs_raw_stream_open(void *stream_in, const char *fname) {
+    vfs_raw_context_t *stream = stream_in;
+    (void)fname;
+    stream->file_pos = 0;
+    return 0;
+}
+
+static void vfs_raw_stream_close(void *stream_in) {
+    (void)stream_in;
+}
+
+static int vfs_raw_stream_read(void *stream_in, uint8_t *buf, size_t len) {
+    vfs_raw_context_t *stream = stream_in;
+    size_t orig_len = len;
+    while (len) {
+        mboot_addr_t addr;
+        mboot_addr_t remain;
+        if (stream->file_pos < stream->seg0_byte_len) {
+            // Reading from segment 0.
+            mboot_addr_t seg0_pos = stream->file_pos;
+            addr = stream->seg0_base_addr + seg0_pos;
+            remain = stream->seg0_byte_len - seg0_pos;
+        } else {
+            // Reading from segment 1.
+            mboot_addr_t seg1_pos = stream->file_pos - stream->seg0_byte_len;
+            addr = stream->seg1_base_addr + seg1_pos;
+            remain = stream->seg1_byte_len - seg1_pos;
+            if (!remain) {
+                // At the end of segment 1.
+                break;
+            }
+        }
+        size_t l = MIN(len, remain);
+        hw_read(addr, l, buf);
+        stream->file_pos += l;
+        buf += l;
+        len -= l;
+    }
+    return orig_len - len;
+}
+
+const stream_methods_t vfs_raw_stream_methods = {
+    vfs_raw_stream_open,
+    vfs_raw_stream_close,
+    vfs_raw_stream_read,
+};
+
+#endif // MBOOT_FSLOAD && MBOOT_VFS_RAW

From 899592ac341ed9f10ee554424f964f6880fc8c48 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Mar 2024 18:03:19 +1100
Subject: [PATCH 0947/3129] stm32/boards/LEGO_HUB_NO6: Move robust logic to
 mboot.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/appupdate.py | 12 ------------
 ports/stm32/boards/LEGO_HUB_NO6/board_init.c |  9 ++++++++-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
index 02398e81243fc..9cfbc06e56590 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
@@ -7,9 +7,6 @@
 _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)
 
 # Roundabout way to get actual filesystem size from config.
@@ -26,9 +23,6 @@ def update_app(filename):
     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=machine.Pin.board.FLASH_SCK,
@@ -41,11 +35,5 @@ def update_app(filename):
     # 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.
-    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/board_init.c b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
index db4c07914af95..5e4e7791b50d3 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
@@ -194,7 +194,14 @@ int board_mboot_get_reset_mode(uint32_t *initial_r0) {
 }
 
 void board_mboot_state_change(int state, uint32_t arg) {
-    if (state == MBOOT_STATE_FSLOAD_END) {
+    if (state == MBOOT_STATE_FSLOAD_START) {
+        // The FS-load update is about to start.  Program the update key and FS-load elements
+        // into the flash so they can be retrieved if there is a power failure during the update.
+        mp_spiflash_erase_block(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR);
+        uint32_t key = SPIFLASH_UPDATE_KEY_VALUE;
+        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR, 4, (const uint8_t *)&key);
+        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, ELEM_DATA_SIZE, ELEM_DATA_START);
+    } else 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);

From 52c678c6f85b17e542520b44e2facaae44f61b11 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Mar 2024 10:28:00 +1100
Subject: [PATCH 0948/3129] stm32/boards/LEGO_HUB_NO6: Use a raw filesystem for
 mboot to update fw.

The C-based SPI flash driver is needed because the
`_copy_file_to_raw_filesystem()` function must copy from a filesystem (eg
FAT) to another part of flash, and the same C code must be used for both
reading (from FAT) and writing (to flash).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/appupdate.py |  70 +++++---
 ports/stm32/boards/LEGO_HUB_NO6/manifest.py  |   1 -
 ports/stm32/boards/LEGO_HUB_NO6/spiflash.c   | 166 +++++++++++++++++++
 ports/stm32/boards/LEGO_HUB_NO6/spiflash.py  |  90 ----------
 4 files changed, 212 insertions(+), 115 deletions(-)
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/spiflash.c
 delete mode 100644 ports/stm32/boards/LEGO_HUB_NO6/spiflash.py

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
index 9cfbc06e56590..8229004fbbd0e 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
@@ -1,39 +1,61 @@
 # Application firmware update function for LEGO_HUB_NO6.
-# MIT license; Copyright (c) 2022 Damien P. George
+# MIT license; Copyright (c) 2022-2024 Damien P. George
 
 from micropython import const
-import struct, machine, fwupdate, spiflash, pyb
+import random, struct, machine, fwupdate, spiflash, pyb
 
 _IOCTL_BLOCK_COUNT = const(4)
 _IOCTL_BLOCK_SIZE = const(5)
 
-_FILESYSTEM_ADDR = const(0x8000_0000 + 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)
+# Mboot addresses the external SPI flash at this location.
+_MBOOT_SPIFLASH_BASE_ADDR = 0x80000000
+
+# The raw filesystem is in the first 1MiB of external SPI flash,
+# but skip the first and last flash sectors.
+_RAW_FILESYSTEM_ADDR = const(4 * 1024)
+_RAW_FILESYSTEM_LEN = const(1016 * 1024)
+
+
+def _copy_file_to_raw_filesystem(filename, flash, block):
+    block_count = flash.ioctl(_IOCTL_BLOCK_COUNT, 0)
+    block_size = flash.ioctl(_IOCTL_BLOCK_SIZE, 0)
+    buf = bytearray(block_size)
+    with open(filename, "rb") as file:
+        while True:
+            n = file.readinto(buf)
+            if not n:
+                break
+            flash.writeblocks(block, buf)
+            block += 1
+            if block >= block_count:
+                print("|", end="")
+                block = 0
+            print(".", end="")
+    print()
 
 
 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 a SPI flash object.
-    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)
-
     # We can't use pyb.Flash() because we need to write to the "reserved" 1M area.
-    flash = spiflash.SPIFlash(spi, cs)
+    flash = spiflash.SPIFlash(start=_RAW_FILESYSTEM_ADDR, len=_RAW_FILESYSTEM_LEN)
+
+    # Partition the raw filesystem into two segments for wear levelling.
+    block_count = flash.ioctl(_IOCTL_BLOCK_COUNT, 0)
+    block_size = flash.ioctl(_IOCTL_BLOCK_SIZE, 0)
+    block_start = random.randrange(0, block_count)
+    print(f"Raw filesystem block layout: 0 .. {block_start} .. {block_count}")
+
+    # Copy the file to the special raw filesystem.
+    _copy_file_to_raw_filesystem(filename, flash, block_start)
 
     # Enter mboot with a request to do a filesystem-load update.
-    machine.bootloader(elems)
+    # Note: the filename doesn't mean anything here, but still needs to be non-empty.
+    fwupdate.update_mpy(
+        filename,
+        fs_type=fwupdate.VFS_RAW,
+        fs_base=_MBOOT_SPIFLASH_BASE_ADDR + _RAW_FILESYSTEM_ADDR + block_start * block_size,
+        fs_len=(block_count - block_start) * block_size,
+        fs_base2=_MBOOT_SPIFLASH_BASE_ADDR + _RAW_FILESYSTEM_ADDR,
+        fs_len2=block_start * block_size,
+    )
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/manifest.py b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
index 1be4246e37882..afbfdc0a822ce 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
@@ -4,5 +4,4 @@
 
 # Modules for application firmware update.
 module("fwupdate.py", base_path="$(PORT_DIR)/mboot", opt=3)
-module("spiflash.py", opt=3)
 module("appupdate.py", opt=3)
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/spiflash.c b/ports/stm32/boards/LEGO_HUB_NO6/spiflash.c
new file mode 100644
index 0000000000000..37df7c9530355
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/spiflash.c
@@ -0,0 +1,166 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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.
+ */
+
+#if !BUILDING_MBOOT
+
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+
+#include "storage.h"
+
+// Expose the entire external SPI flash as an object with the block protocol.
+
+#define FLASH_SIZE (MICROPY_HW_SPIFLASH_OFFSET_BYTES + MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
+#define BLOCK_SIZE (4096)
+
+typedef struct _spi_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t start; // in bytes
+    uint32_t len; // in bytes
+} spi_flash_obj_t;
+
+static const mp_obj_type_t spi_flash_type;
+
+static void spi_flash_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    spi_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SPIFlash(start=%u, len=%u)", self->start, self->len);
+}
+
+static mp_obj_t spi_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_start, ARG_len };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { 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);
+
+    spi_flash_obj_t *self = mp_obj_malloc(spi_flash_obj_t, &spi_flash_type);
+
+    mp_int_t start = args[ARG_start].u_int;
+    if (!(0 <= start && start < FLASH_SIZE && start % BLOCK_SIZE == 0)) {
+        mp_raise_ValueError(NULL);
+    }
+
+    mp_int_t len = args[ARG_len].u_int;
+    if (len == -1) {
+        len = FLASH_SIZE - start;
+    } else if (!(0 < len && start + len <= FLASH_SIZE && len % BLOCK_SIZE == 0)) {
+        mp_raise_ValueError(NULL);
+    }
+
+    self->start = start;
+    self->len = len;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static mp_obj_t spi_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+    spi_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t block_num = self->start / BLOCK_SIZE + mp_obj_get_int(args[1]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+    int ret = spi_bdev_readblocks_raw(&spi_bdev, bufinfo.buf, block_num, 0, bufinfo.len);
+    return MP_OBJ_NEW_SMALL_INT(ret);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spi_flash_readblocks_obj, 3, 3, spi_flash_readblocks);
+
+static mp_obj_t spi_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    spi_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t block_num = self->start / BLOCK_SIZE + mp_obj_get_int(args[1]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    int ret = spi_bdev_eraseblocks_raw(&spi_bdev, block_num, bufinfo.len);
+    if (ret == 0) {
+        ret = spi_bdev_writeblocks_raw(&spi_bdev, bufinfo.buf, block_num, 0, bufinfo.len);
+    }
+    return MP_OBJ_NEW_SMALL_INT(ret);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(spi_flash_writeblocks_obj, 3, 3, spi_flash_writeblocks);
+
+static mp_obj_t spi_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    spi_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:
+            storage_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: {
+            mp_int_t n = self->len / BLOCK_SIZE;
+            return MP_OBJ_NEW_SMALL_INT(n);
+        }
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(BLOCK_SIZE);
+
+        default:
+            return mp_const_none;
+    }
+}
+static MP_DEFINE_CONST_FUN_OBJ_3(spi_flash_ioctl_obj, spi_flash_ioctl);
+
+static const mp_rom_map_elem_t spi_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&spi_flash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&spi_flash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&spi_flash_ioctl_obj) },
+};
+static MP_DEFINE_CONST_DICT(spi_flash_locals_dict, spi_flash_locals_dict_table);
+
+static MP_DEFINE_CONST_OBJ_TYPE(
+    spi_flash_type,
+    MP_QSTR_SPIFlash,
+    MP_TYPE_FLAG_NONE,
+    make_new, spi_flash_make_new,
+    print, spi_flash_print,
+    locals_dict, &spi_flash_locals_dict
+    );
+
+/******************************************************************************/
+// The `spiflash` module.
+
+static const mp_rom_map_elem_t spiflash_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_spiflash) },
+
+    { MP_ROM_QSTR(MP_QSTR_SPIFlash), MP_ROM_PTR(&spi_flash_type) },
+};
+static MP_DEFINE_CONST_DICT(spiflash_module_globals, spiflash_module_globals_table);
+
+const mp_obj_module_t spiflash_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&spiflash_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_spiflash, spiflash_module);
+
+#endif
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py b/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py
deleted file mode 100644
index e483ace950842..0000000000000
--- a/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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_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_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
-        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(self._ERASE, addr, None)
-
-    def readinto(self, addr, buf):
-        self.cs(0)
-        self.spi.write(bytearray([self._READ, 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(self._WRITE, addr, buf[buf_offset : buf_offset + l])
-            remain -= l
-            addr += l
-            buf_offset += l
-            offset = 0

From 1c6012b0b5c62f18130217f30e73ad3ce4c8c9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 10 Oct 2023 16:13:24 +0000
Subject: [PATCH 0949/3129] extmod/modnetwork: Implement IPv6 API to set and
 get NIC configuration.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit implements a new <AbstractNIC>.ipconfig() function for the NIC
classes that use lwIP, to set and retrieve network configuration for a NIC.
Currently this method supports:
- ipconfig("addr4"): obtain a tuple (addr, netmask) of the currently
  configured ipv4 address
- ipconfig("addr6"): obtain a list of tuples (addr, state,
  prefered_lifetime, valid_lifetime) of all currently active ipv6
  addresses; this includes static, slaac and link-local addresses
- ipconfig("has_dhcp4"): whether ipv4 dhcp has supplied an address
- ipconfig("has_autoconf6"): if there is a valid, non-static ipv6 address
- ipconfig(addr4="1.2.3.4/24"): to set the ipv4 address and netmask
- ipconfig(addr6="2a01::2"): to set a static ipv6 address; note that this
  does not configure an interface route, as this does not seem supported by
  lwIP
- ipconfig(autoconf6=True): to enable ipv6 network configuration with slaac
- ipconfig(gw4="1.2.3.1"): to set the ipv4 gateway
- ipconfig(dhcp4=True): enable ipv4 dhcp; this sets ipv4 address, netmask,
  gateway and a dns server
- ipconfig(dhcp4=False): stops dhcp, releases the ip, and clears the
  configured ipv4 address.
- ipconfig(dhcp6=True): enable stateless dhcpv6 to obtain a dns server

There is also a new global configuration function network.ipconfig() that
supports the following:
- network.ipconfig(dns="2a01::2"): set the primary dns server (can be a
  ipv4 or ipv6 address)
- network.ipconfig(prefer=6): to prefer ipv6 addresses to be returned as
  dns responses (falling back to ipv4 if the host does not have an ipv6
  address); note that this does not flush the dns cache, so if a host is
  already in the dns cache with its v4 address, subsequent lookups will
  return that address even if prefer=6 is set

This interface replaces NIC.ifconfig() completely, and ifconfig() should be
marked as deprecated and removed in a future version.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 extmod/modlwip.c            |  11 +-
 extmod/modnetwork.c         |   7 +
 extmod/modnetwork.h         |   8 +
 extmod/network_cyw43.c      |   7 +
 extmod/network_esp_hosted.c |   8 +
 extmod/network_lwip.c       | 296 ++++++++++++++++++++++++++++++++++++
 extmod/network_wiznet5k.c   |   9 ++
 7 files changed, 345 insertions(+), 1 deletion(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 607143bb7e4c6..d4e25917a67b8 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -38,6 +38,7 @@
 #if MICROPY_PY_LWIP
 
 #include "shared/netutils/netutils.h"
+#include "modnetwork.h"
 
 #include "lwip/init.h"
 #include "lwip/tcp.h"
@@ -353,8 +354,12 @@ static void lwip_socket_free_incoming(lwip_socket_obj_t *socket) {
     }
 }
 
+#if LWIP_VERSION_MAJOR < 2
+#define IPADDR_STRLEN_MAX 46
+#endif
 mp_obj_t lwip_format_inet_addr(const ip_addr_t *ip, mp_uint_t port) {
-    char *ipstr = ipaddr_ntoa(ip);
+    char ipstr[IPADDR_STRLEN_MAX];
+    ipaddr_ntoa_r(ip, ipstr, sizeof(ipstr));
     mp_obj_t tuple[2] = {
         tuple[0] = mp_obj_new_str(ipstr, strlen(ipstr)),
         tuple[1] = mp_obj_new_int(port),
@@ -1750,7 +1755,11 @@ static mp_obj_t lwip_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     state.status = 0;
 
     MICROPY_PY_LWIP_ENTER
+    #if LWIP_VERSION_MAJOR < 2
     err_t ret = dns_gethostbyname(host, (ip_addr_t *)&state.ipaddr, lwip_getaddrinfo_cb, &state);
+    #else
+    err_t ret = dns_gethostbyname_addrtype(host, (ip_addr_t *)&state.ipaddr, lwip_getaddrinfo_cb, &state, mp_mod_network_prefer_dns_use_ip_version == 4 ? LWIP_DNS_ADDRTYPE_IPV4_IPV6 : LWIP_DNS_ADDRTYPE_IPV6_IPV4);
+    #endif
     MICROPY_PY_LWIP_EXIT
 
     switch (ret) {
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index c8d2b9e3ff40a..aa237bd93c15f 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -141,10 +141,17 @@ mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_hostname_obj, 0, 1, mod_network_hostname);
 
+#if LWIP_VERSION_MAJOR >= 2
+MP_DEFINE_CONST_FUN_OBJ_KW(mod_network_ipconfig_obj, 0, mod_network_ipconfig);
+#endif
+
 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_country), MP_ROM_PTR(&mod_network_country_obj) },
     { MP_ROM_QSTR(MP_QSTR_hostname), MP_ROM_PTR(&mod_network_hostname_obj) },
+    #if LWIP_VERSION_MAJOR >= 2
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&mod_network_ipconfig_obj) },
+    #endif
 
     // Defined per port in mpconfigport.h
     #ifdef MICROPY_PORT_NETWORK_INTERFACES
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 0a7897faaa90f..2ff9ce09dea18 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -69,10 +69,18 @@ extern char mod_network_hostname_data[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1];
 mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args);
 
 #if MICROPY_PY_LWIP
+
+#include "lwip/init.h"
+
 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);
+#if LWIP_VERSION_MAJOR >= 2
+mp_obj_t mod_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
+mp_obj_t mod_network_nic_ipconfig(struct netif *netif, size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
+extern int mp_mod_network_prefer_dns_use_ip_version;
+#endif
 #elif defined(MICROPY_PORT_NETWORK_INTERFACES)
 
 struct _mod_network_socket_obj_t;
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 89e68e248836e..d3543c5260435 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -321,6 +321,12 @@ static mp_obj_t network_cyw43_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_cyw43_ifconfig_obj, 1, 2, network_cyw43_ifconfig);
 
+static mp_obj_t network_cyw43_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    return mod_network_nic_ipconfig(&self->cyw->netif[self->itf], n_args - 1, args + 1, kwargs);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_cyw43_ipconfig_obj, 1, network_cyw43_ipconfig);
+
 static mp_obj_t network_cyw43_status(size_t n_args, const mp_obj_t *args) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     (void)self;
@@ -532,6 +538,7 @@ static const mp_rom_map_elem_t network_cyw43_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&network_cyw43_disconnect_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&network_cyw43_isconnected_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&network_cyw43_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&network_cyw43_ipconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&network_cyw43_status_obj) },
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&network_cyw43_config_obj) },
 
diff --git a/extmod/network_esp_hosted.c b/extmod/network_esp_hosted.c
index 14e8be8b6a4e4..f86eaad37ca0f 100644
--- a/extmod/network_esp_hosted.c
+++ b/extmod/network_esp_hosted.c
@@ -204,6 +204,13 @@ static mp_obj_t network_esp_hosted_ifconfig(size_t n_args, const mp_obj_t *args)
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_esp_hosted_ifconfig_obj, 1, 2, network_esp_hosted_ifconfig);
 
+static mp_obj_t network_esp_hosted_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    void *netif = esp_hosted_wifi_get_netif(self->itf);
+    return mod_network_nic_ipconfig(netif, n_args - 1, args + 1, kwargs);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_esp_hosted_ipconfig_obj, 1, network_esp_hosted_ipconfig);
+
 static mp_obj_t network_esp_hosted_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     esp_hosted_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
@@ -299,6 +306,7 @@ static const mp_rom_map_elem_t network_esp_hosted_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disconnect),          MP_ROM_PTR(&network_esp_hosted_disconnect_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected),         MP_ROM_PTR(&network_esp_hosted_isconnected_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig),            MP_ROM_PTR(&network_esp_hosted_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig),            MP_ROM_PTR(&network_esp_hosted_ipconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_config),              MP_ROM_PTR(&network_esp_hosted_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_status),              MP_ROM_PTR(&network_esp_hosted_status_obj) },
     { MP_ROM_QSTR(MP_QSTR_OPEN),                MP_ROM_INT(ESP_HOSTED_SEC_OPEN) },
diff --git a/extmod/network_lwip.c b/extmod/network_lwip.c
index caa30f6fff4d2..97cb43902df63 100644
--- a/extmod/network_lwip.c
+++ b/extmod/network_lwip.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "py/parsenum.h"
 
 #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
 
@@ -40,9 +41,19 @@
 #include "lwip/timeouts.h"
 #include "lwip/dns.h"
 #include "lwip/dhcp.h"
+#include "lwip/nd6.h"
+#include "lwip/dhcp6.h"
+#include "lwip/prot/dhcp.h"
+#include "lwip/prot/dhcp6.h"
+#include <string.h>
+#include <stdlib.h>
+
+int mp_mod_network_prefer_dns_use_ip_version = 4;
 
 // Implementations of network methods that can be used by any interface.
 
+// This function provides the implementation of nic.ifconfig, is deprecated and will be removed.
+// Use network.ipconfig and nic.ipconfig instead.
 mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // Get IP addresses
@@ -90,6 +101,291 @@ mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_o
     }
 }
 
+// This function provides the common implementation of network.ipconfig
+mp_obj_t mod_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+
+        switch (mp_obj_str_get_qstr(args[0])) {
+            case MP_QSTR_dns: {
+                char addr_str[IPADDR_STRLEN_MAX];
+                ipaddr_ntoa_r(dns_getserver(0), addr_str, sizeof(addr_str));
+                return mp_obj_new_str(addr_str, strlen(addr_str));
+            }
+            case MP_QSTR_prefer: {
+                return MP_OBJ_NEW_SMALL_INT(mp_mod_network_prefer_dns_use_ip_version);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+    } else {
+        // Set config value(s)
+        if (n_args != 0) {
+            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_dns: {
+                        ip_addr_t dns;
+                        size_t addr_len;
+                        const char *addr_str = mp_obj_str_get_data(e->value, &addr_len);
+                        if (!ipaddr_aton(addr_str, &dns)) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments as dns server"));
+                        }
+                        dns_setserver(0, &dns);
+                        break;
+                    }
+                    case MP_QSTR_prefer: {
+                        int value = mp_obj_get_int(e->value);
+                        if (value != 4 && value != 6) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid prefer argument"));
+                        }
+                        mp_mod_network_prefer_dns_use_ip_version = value;
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+
+mp_obj_t mod_network_nic_ipconfig(struct netif *netif, size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+
+        switch (mp_obj_str_get_qstr(args[0])) {
+            case MP_QSTR_dhcp4: {
+                struct dhcp *dhcp = netif_dhcp_data(netif);
+                return mp_obj_new_bool(dhcp != NULL && dhcp->state != DHCP_STATE_OFF);
+            }
+            case MP_QSTR_has_dhcp4: {
+                return mp_obj_new_bool(dhcp_supplied_address(netif));
+            }
+            #if LWIP_IPV6_DHCP6
+            case MP_QSTR_dhcp6: {
+                struct dhcp6 *dhcp = netif_dhcp6_data(netif);
+                return mp_obj_new_bool(dhcp != NULL && dhcp->state != DHCP6_STATE_OFF);
+            }
+            #endif
+            #if LWIP_IPV6_AUTOCONFIG
+            case MP_QSTR_autoconf6: {
+                return netif->ip6_autoconfig_enabled ?  mp_const_true : mp_const_false;
+            }
+            case MP_QSTR_has_autoconf6: {
+                int found = 0;
+                for (int i = 1; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+                    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
+                        !netif_ip6_addr_isstatic(netif, i)) {
+                        found = 1;
+                        break;
+                    }
+                }
+                if (found) {
+                    break;
+                }
+                return mp_obj_new_bool(found);
+            }
+            #endif
+            case MP_QSTR_addr4: {
+                mp_obj_t tuple[2] = {
+                    netutils_format_ipv4_addr((uint8_t *)&netif->ip_addr, NETUTILS_BIG),
+                    netutils_format_ipv4_addr((uint8_t *)&netif->netmask, NETUTILS_BIG),
+                };
+                return mp_obj_new_tuple(2, tuple);
+            }
+            #if LWIP_IPV6
+            case MP_QSTR_addr6: {
+                mp_obj_t addrs[LWIP_IPV6_NUM_ADDRESSES];
+                size_t n_addrs = 0;
+                for (int i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+                    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) {
+                        char addr_str[IPADDR_STRLEN_MAX];
+                        ipaddr_ntoa_r(netif_ip_addr6(netif, i), addr_str, sizeof(addr_str));
+                        mp_obj_t tuple[4] = {
+                            mp_obj_new_str(addr_str, strlen(addr_str)),
+                            MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_state(netif, i)),
+                            MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_pref_life(netif, i)), // preferred
+                            MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_valid_life(netif, i))
+                        };
+                        addrs[n_addrs++] = mp_obj_new_tuple(4, tuple);
+                    }
+                }
+                return mp_obj_new_list(n_addrs, addrs);
+            }
+            #endif
+            case MP_QSTR_gw4: {
+                return netutils_format_ipv4_addr((uint8_t *)&netif->gw, NETUTILS_BIG);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+        return mp_const_none;
+    } else {
+        // Set config value(s)
+        if (n_args != 0) {
+            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_dhcp4: {
+                        if (mp_obj_is_true(e->value)) {
+                            if (dhcp_supplied_address(netif)) {
+                                dhcp_renew(netif);
+                            } else {
+                                dhcp_release_and_stop(netif);
+                                dhcp_start(netif);
+                            }
+                        } else {
+                            dhcp_release_and_stop(netif);
+                        }
+                        break;
+                    }
+                    #if LWIP_IPV6_DHCP6
+                    case MP_QSTR_dhcp6: {
+                        dhcp6_disable(netif);
+                        dhcp6_enable_stateless(netif);
+                        break;
+                    }
+                    #endif
+                    #if LWIP_IPV6_AUTOCONFIG
+                    case MP_QSTR_autoconf6: {
+                        netif_set_ip6_autoconfig_enabled(netif, mp_obj_is_true(e->value));
+                        if (mp_obj_is_true(e->value)) {
+                            nd6_restart_netif(netif);
+                        } else {
+                            // Clear out any non-static addresses, skip link-local address in slot 0
+                            for (i = 1; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+                                if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
+                                    !netif_ip6_addr_isstatic(netif, i)) {
+                                    netif_ip6_addr_set_state(netif, i, IP6_ADDR_INVALID);
+                                }
+                            }
+                        }
+                        break;
+                    }
+                    #endif
+                    case MP_QSTR_addr4:
+                    case MP_QSTR_addr6: {
+                        ip_addr_t ip_addr;
+                        ip_addr_t netmask;
+                        int prefix_bits = 32;
+                        if (e->value != mp_const_none && mp_obj_is_str(e->value)) {
+                            size_t addr_len;
+                            const char *input_str = mp_obj_str_get_data(e->value, &addr_len);
+                            char plain_ip[IPADDR_STRLEN_MAX];
+                            char *split = strchr(input_str, '/');
+                            const char *addr_str = input_str;
+                            if (split) {
+                                int to_copy = sizeof(plain_ip) - 1;
+                                if (split - addr_str < to_copy) {
+                                    to_copy = split - addr_str;
+                                }
+                                memcpy(plain_ip, addr_str, to_copy);
+                                mp_obj_t prefix_obj = mp_parse_num_integer(split + 1, strlen(split + 1), 10, NULL);
+                                prefix_bits = mp_obj_get_int(prefix_obj);
+                            }
+                            if (mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr4) {
+                                uint32_t mask = -(1u << (32 - prefix_bits));
+                                ip_addr_set_ip4_u32_val(netmask, ((mask & 0xFF) << 24) | ((mask & 0xFF00) << 8) | ((mask >> 8) & 0xFF00) | ((mask >> 24) & 0xFF));
+                            }
+                            if (!ipaddr_aton(addr_str, &ip_addr)) {
+                                mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
+                            }
+                            if ((mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr6) != IP_IS_V6(&ip_addr)
+                                || (mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr4) != IP_IS_V4(&ip_addr)) {
+                                mp_raise_ValueError(MP_ERROR_TEXT("invalid address type"));
+                            }
+                        } else if (e->value != mp_const_none) {
+                            mp_obj_t *items;
+                            mp_obj_get_array_fixed_n(e->value, 2, &items);
+                            size_t addr_len;
+                            const char *ip_addr_str = mp_obj_str_get_data(items[0], &addr_len);
+                            const char *netmask_str = mp_obj_str_get_data(items[1], &addr_len);
+                            if (!ipaddr_aton(ip_addr_str, &ip_addr)) {
+                                mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
+                            }
+                            if (!ipaddr_aton(netmask_str, &netmask)) {
+                                mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
+                            }
+                            if (!IP_IS_V4(&ip_addr) || !IP_IS_V4(&netmask)) {
+                                mp_raise_ValueError(MP_ERROR_TEXT("invalid address type"));
+                            }
+                        }
+                        if (mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr4) {
+                            if (e->value != mp_const_none) {
+                                netif->ip_addr = ip_addr;
+                                netif->netmask = netmask;
+                            } else {
+                                ip4_addr_set_any(ip_2_ip4(&netif->ip_addr));
+                                ip4_addr_set_any(ip_2_ip4(&netif->netmask));
+                            }
+                        #if LWIP_IPV6
+                        } else if (mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr6) {
+                            // Clear out any existing static addresses. Address 0 comes from autoconf.
+                            for (i = 1; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+                                if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
+                                    netif_ip6_addr_isstatic(netif, i)) {
+                                    netif_ip6_addr_set_state(netif, i, IP6_ADDR_INVALID);
+                                }
+                            }
+                            if (e->value != mp_const_none) {
+                                s8_t free_idx;
+                                netif_add_ip6_address(netif, ip_2_ip6(&ip_addr), &free_idx);
+                                netif_ip6_addr_set_valid_life(netif, free_idx, IP6_ADDR_LIFE_STATIC);
+                                netif_ip6_addr_set_pref_life(netif, free_idx, IP6_ADDR_LIFE_STATIC);
+                                netif_ip6_addr_set_state(netif, free_idx, IP6_ADDR_PREFERRED);
+                            }
+                        #endif
+                        }
+                        break;
+                    }
+                    case MP_QSTR_gw4: {
+                        ip_addr_t ip_addr;
+                        size_t addr_len;
+                        const char *addr_str = mp_obj_str_get_data(e->value, &addr_len);
+                        if (!ipaddr_aton(addr_str, &ip_addr)) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
+                        }
+                        if (IP_IS_V4(&ip_addr)) {
+                            netif->gw = ip_addr;
+                        } else {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid address type"));
+                        }
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+
 #endif // LWIP_VERSION_MAJOR >= 2
 
 #endif  // MICROPY_PY_NETWORK && MICROPY_PY_LWIP
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index d1aadc3e15584..b550f8c1f45f2 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -915,6 +915,12 @@ static mp_obj_t wiznet5k_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_ifconfig_obj, 1, 2, wiznet5k_ifconfig);
 
+static mp_obj_t network_wiznet5k_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    return mod_network_nic_ipconfig(&self->netif, n_args - 1, args + 1, kwargs);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(wiznet5k_ipconfig_obj, 1, network_wiznet5k_ipconfig);
+
 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;
@@ -1008,6 +1014,9 @@ static const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
     { 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) },
+    #if WIZNET5K_WITH_LWIP_STACK
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&wiznet5k_ipconfig_obj) },
+    #endif
     { 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

From 77f08b72caeb26c7e3be5975d976e77d44099d43 Mon Sep 17 00:00:00 2001
From: Nicko van Someren <nicko@nicko.org>
Date: Thu, 28 Dec 2023 14:22:40 -0700
Subject: [PATCH 0950/3129] docs/library/rp2.DMA: Add documentation for rp2 DMA
 support.

Signed-off-by: Nicko van Someren <nicko@nicko.org>
---
 docs/library/rp2.DMA.rst          | 293 ++++++++++++++++++++++++++++++
 docs/library/rp2.StateMachine.rst |   7 +
 docs/library/rp2.rst              |   1 +
 3 files changed, 301 insertions(+)
 create mode 100644 docs/library/rp2.DMA.rst

diff --git a/docs/library/rp2.DMA.rst b/docs/library/rp2.DMA.rst
new file mode 100644
index 0000000000000..c5e3f31aa2ed6
--- /dev/null
+++ b/docs/library/rp2.DMA.rst
@@ -0,0 +1,293 @@
+.. currentmodule:: rp2
+.. _rp2.DMA:
+
+class DMA -- access to the RP2040's DMA controller
+==================================================
+
+The :class:`DMA` class offers access to the RP2040's Direct Memory Access (DMA)
+controller, providing the ability move data between memory blocks and/or IO registers. The DMA
+controller has its own, separate read and write bus master connections onto the bus fabric and
+each DMA channel can independently read data from one address and write it back to another
+address, optionally incrementing one or both pointers, allowing it to perform transfers on behalf
+of the processor while the processor carries out other tasks or enters a low power state. The
+RP2040's DMA controller has 12 independent DMA channels that can run concurrently. For full
+details of the RP2040's DMA system see section 2.5 of the `RP2040 Datasheet
+<https://datasheets.raspberrypi.org/rp2040/rp2040-datasheet.pdf>`_.
+
+Examples
+--------
+
+The simplest use of the DMA controller is to move data from one block of memory to another.
+This can be accomplished with the following code::
+
+    a = bytearray(32*1024)
+    b = bytearray(32*1024)
+    d = rp2.DMA()
+    c = d.pack_ctrl()  # Just use the default control value.
+    # The count is in 'transfers', which defaults to four-byte words, so divide length by 4
+    d.config(read=a, write=b, count=len(a)//4, ctrl=c, trigger=True)
+    # Wait for completion
+    while d.active():
+        pass
+
+Note that while this example sits in an idle loop while it waits for the transfer to complete,
+the program could just as well do some useful work in this time instead.
+
+Another, perhaps more common use of the DMA controller is to transfer between memory and an IO
+peripheral. In this situation the address of the IO register does not change for each transfer but
+the memory address needs to be incremented. It is also necessary to control the pace of the
+transfer so as to not write data before it can be accepted by a peripheral or read it before the
+data is ready, and this can be controlled with the ``treq_sel`` field of the DMA channel's control
+register. The various fields of the control register for each DMA channel can be packed
+using the :meth:`DMA.pack_ctrl()` method and unpacked using the :meth:`DMA.unpack_ctrl()`
+static method. Code to transfer data from a byte array to the TX FIFO of a PIO state machine,
+one byte at a time, looks like this::
+
+    # pio_num is index of the PIO block being used, sm_num is the state machine in that block.
+    # my_state_machine is an rp2.PIO() instance.
+    DATA_REQUEST_INDEX = (pio_num << 3) + sm_num
+
+    src_data = bytearray(1024)
+    d = rp2.DMA()
+
+    # Transfer bytes, rather than words, don't increment the write address and pace the transfer.
+    c = d.pack_ctrl(size=0, inc_write=False, treq_sel=DATA_REQUEST_INDEX)
+
+    d.config(
+        read=src_data,
+        write=my_state_machine,
+        count=len(src_data),
+        ctrl=c,
+        trigger=True
+    )
+
+Note that in this example the value given for the write address is just the PIO state machine to
+which we are sending the data. This works because PIO state machines present the buffer protocol,
+allowing direct access to their data FIFO registers.
+
+Constructor
+-----------
+
+.. class:: DMA()
+
+    Claim one of the DMA controller channels for exclusive use.
+
+Methods
+-------
+
+.. method:: DMA.config(read=None, write=None, count=None, ctrl=None, trigger=False)
+
+    Configure the DMA registers for the channel and optionally start the transfer.
+    Parameters are:
+
+    - *read*: The address from which the DMA controller will start reading data or
+      an object that will provide data to be read. It can be an integer or any
+      object that supports the buffer protocol.
+    - *write*: The address to which the DMA controller will start writing or an
+      object into which data will be written. It can be an integer or any object
+      that supports the buffer protocol.
+    - *count*: The number of bus transfers that will execute before this channel
+      stops. Note that this is the number of transfers, not the number of bytes.
+      If the transfers are 2 or 4 bytes wide then the total amount of data moved
+      (and thus the size of required buffer) needs to be multiplied accordingly.
+    - *ctrl*: The value for the DMA control register. This is an integer value
+      that is typically packed using the :meth:`DMA.pack_ctrl()`.
+    - *trigger*: Optionally commence the transfer immediately.
+
+.. method:: DMA.irq(handler=None, hard=False)
+
+    Returns the IRQ object for this DMA channel and optionally configures it.
+
+.. method:: DMA.close()
+
+    Release the claim on the underlying DMA channel and free the interrupt
+    handler. The :class:`DMA` object can not be used after this operation.
+
+.. method:: DMA.pack_ctrl(default=None, **kwargs)
+
+    Pack the values provided in the keyword arguments into the named fields of a new control
+    register value. Any field that is not provided will be set to a default value. The
+    default will either be taken from the provided ``default`` value, or if that is not
+    given, a default suitable for the current channel; setting this to the current value
+    of the `DMA.ctrl` attribute provides an easy way to override a subset of the fields.
+
+    The keys for the keyword arguments can be any key returned by the :meth:`DMA.unpack_ctrl()`
+    method. The writable values are:
+
+    - *enable*: ``bool`` Set to enable the channel (default: ``True``).
+
+    - *high_pri*: ``bool`` Make this channel's bus traffic high priority (default: ``False``).
+
+    - *size*: ``int`` Transfer size: 0=byte, 1=half word, 2=word (default: 2).
+
+    - *inc_read*: ``bool`` Increment the read address after each transfer (default: ``True``).
+
+    - *inc_write*: ``bool`` Increment the write address after each transfer (default: ``True``).
+
+    - *ring_size*: ``int`` If non-zero, only the bottom ``ring_size`` bits of one
+      address register will change when an address is incremented, causing the
+      address to wrap at the next ``1 << ring_size`` byte boundary. Which
+      address is wrapped is controlled by the ``ring_sel`` flag. A zero value
+      disables address wrapping.
+
+    - *ring_sel*: ``bool`` Set to ``False`` to have the ``ring_size`` apply to the read address
+      or ``True`` to apply to the write address.
+
+    - *chain_to*: ``int`` The channel number for a channel to trigger after this transfer
+      completes. Setting this value to this DMA object's own channel number
+      disables chaining (this is the default).
+
+    - *treq_sel*: ``int`` Select a Transfer Request signal. See section 2.5.3 in the RP2040
+      datasheet for details.
+
+    - *irq_quiet*: ``bool`` Do not generate interrupt at the end of each transfer. Interrupts
+      will instead be generated when a zero value is written to the trigger
+      register, which will halt a sequence of chained transfers (default:
+      ``True``).
+
+    - *bswap*: ``bool`` If set to true, bytes in words or half-words will be reversed before
+      writing (default: ``True``).
+
+    - *sniff_en*: ``bool`` Set to ``True`` to allow data to be accessed by the chips sniff
+      hardware (default: ``False``).
+
+    - *write_err*: ``bool`` Setting this to ``True`` will clear a previously reported write
+      error.
+
+    - *read_err*: ``bool`` Setting this to ``True`` will clear a previously reported read
+      error.
+
+    See the description of the ``CH0_CTRL_TRIG`` register in section 2.5.7 of the RP2040
+    datasheet for details of all of these fields.
+
+.. method:: DMA.unpack_ctrl(value)
+
+    Unpack a value for a DMA channel control register into a dictionary with key/value pairs
+    for each of the fields in the control register.  *value* is the ``ctrl`` register value
+    to unpack.
+
+    This method will return values for all the keys that can be passed to ``DMA.pack_ctrl``.
+    In addition, it will also return the read-only flags in the control register: ``busy``,
+    which goes high when a transfer starts and low when it ends, and ``ahb_err``, which is
+    the logical OR of the ``read_err`` and ``write_err`` flags. These values will be ignored
+    when packing, so that the dictionary created by unpacking a control register can be used
+    directly as the keyword arguments for packing.
+
+.. method:: DMA.active([value])
+
+    Gets or sets whether the DMA channel is currently running.
+
+    >>> sm.active()
+    0
+    >>> sm.active(1)
+    >>> while sm.active():
+    ...     pass
+
+Attributes
+----------
+
+.. attribute:: DMA.read
+
+    This attribute reflects the address from which the next bus transfer
+    will read. It may be written with either an integer or an object
+    that supports the buffer protocol and doing so has immediate effect.
+
+.. attribute:: DMA.write
+
+    This attribute reflects the address to which the next bus transfer
+    will write.  It may be written with either an integer or an object
+    that supports the buffer protocol and doing so has immediate effect.
+
+.. attribute:: DMA.count
+
+    Reading this attribute will return the number of remaining bus
+    transfers in the *current* transfer sequence. Writing this attribute
+    sets the total number of transfers to be the *next* transfer sequence.
+
+.. attribute:: DMA.ctrl
+
+    This attribute reflects DMA channel control register. It is typically written
+    with an integer packed using the :meth:`DMA.pack_ctrl()` method. The returned
+    register value can be unpacked using the :meth:`DMA.unpack_ctrl()` method.
+
+.. attribute:: DMA.channel
+
+    The channel number of the DMA channel. This can be passed in the ``chain_to``
+    argument of `DMA.pack_ctrl()` on another channel to allow DMA chaining.
+
+.. attribute:: DMA.registers
+
+    This attribute is an array-like object that allows direct access to
+    the DMA channel's registers. The index is by word, rather than by byte,
+    so the register indices are the register address offsets divided by 4.
+    See the RP2040 data sheet for register details.
+
+Chaining and trigger register access
+------------------------------------
+
+The DMA controller in the RP2040 offers a couple advanced features to allow one DMA channel
+to initiate a transfer on another channel. One is the use of the ``chain_to`` value in the
+control register and the other is writing to one of the DMA channel's registers that has a
+trigger effect. When coupled with the ability to have one DMA channel write directly to the
+`DMA.registers` of another channel, this allows for complex transactions to be performed
+without any CPU intervention.
+
+Below is an example of using both chaining and register
+triggering to implement gathering of multiple blocks of data into a single destination. Full
+details of these features can be found in section 2.5 of the RP2040 data sheet and the code
+below is a Pythonic version of the example in sub-section 2.5.6.2.
+
+.. code-block:: python
+
+    from rp2 import DMA
+    from uctypes import addressof
+    from array import array
+
+    def gather_strings(string_list, buf):
+        # We use two DMA channels. The first sends lengths and source addresses from the gather
+        # list to the registers of the second. The second copies the data itself.
+        gather_dma = DMA()
+        buffer_dma = DMA()
+
+        # Pack up length/address pairs to be sent to the registers.
+        gather_list = array("I")
+
+        for s in string_list:
+            gather_list.append(len(s))
+            gather_list.append(addressof(s))
+
+        gather_list.append(0)
+        gather_list.append(0)
+
+        # When writing to the registers of the second DMA channel, we need to wrap the
+        # write address on an 8-byte (1<<3 bytes) boundary. We write to the ``TRANS_COUNT``
+        # and ``READ_ADD_TRIG`` registers in the last register alias (registers 14 and 15).
+        gather_ctrl = gather_dma.pack_ctrl(ring_size=3, ring_sel=True)
+        gather_dma.config(
+            read=gather_list, write=buffer_dma.registers[14:16],
+            count=2, ctrl=gather_ctrl
+        )
+
+        # When copying the data, the transfer size is single bytes, and when completed we need
+        # to chain back to the start another gather DMA transaction.
+        buffer_ctrl = buffer_dma.pack_ctrl(size=0, chain_to=gather_dma.channel)
+        # The read and count values will be set by the other DMA channel.
+        buffer_dma.config(write=buf, ctrl=buffer_ctrl)
+
+        # Set the transfer in motion.
+        gather_dma.active(1)
+
+        # Wait until all the register values have been sent
+        end_address = addressof(gather_list) + 4 * len(gather_list)
+        while gather_dma.read != end_address:
+            pass
+
+    input = ["This is ", "a ", "test", " of the scatter", " gather", " process"]
+    output = bytearray(64)
+
+    print(output)
+    gather_strings(input, output)
+    print(output)
+
+This example idles while waiting for the transfer to complete; alternatively it could
+set an interrupt handler and return immediately.
diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
index e8c167c09f573..1cb87e90b6e2d 100644
--- a/docs/library/rp2.StateMachine.rst
+++ b/docs/library/rp2.StateMachine.rst
@@ -140,3 +140,10 @@ Methods
 
      Optionally configure it.
 
+Buffer protocol
+---------------
+
+The StateMachine class supports the `buffer protocol`, allowing direct access to the transmit
+and receive FIFOs for each state machine. This is primarily in order to allow StateMachine
+objects to be passed directly as the read or write parameters when configuring a `rp2.DMA()`
+channel.
diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index 7a473387b4a81..f0189327dfb77 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -241,6 +241,7 @@ Classes
 .. toctree::
     :maxdepth: 1
 
+    rp2.DMA.rst
     rp2.Flash.rst
     rp2.PIO.rst
     rp2.StateMachine.rst

From e520fa2e0fb3cfafe27a1f9e7e9b230dd58d7a33 Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Wed, 25 Oct 2023 19:17:47 +0200
Subject: [PATCH 0951/3129] py/binary: Support half-float 'e' format in struct
 pack/unpack.

This commit implements the 'e' half-float format: 10-bit mantissa, 5-bit
exponent.  It uses native _Float16 if supported by the compiler, otherwise
uses custom bitshifting encoding/decoding routines.

Signed-off-by: Matthias Urlichs <matthias@urlichs.de>
Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/struct.rst     |   2 +
 py/binary.c                 | 109 +++++++++++++++++++++++++++++++++++-
 py/mpconfig.h               |   9 +++
 tests/float/float_struct.py |   2 +-
 4 files changed, 119 insertions(+), 3 deletions(-)

diff --git a/docs/library/struct.rst b/docs/library/struct.rst
index 026cb5e8ac3b4..c2357505960d7 100644
--- a/docs/library/struct.rst
+++ b/docs/library/struct.rst
@@ -45,6 +45,8 @@ The following data types are supported:
 +--------+--------------------+-------------------+---------------+
 | Q      | unsigned long long | integer (`1<fn>`) | 8             |
 +--------+--------------------+-------------------+---------------+
+| e      | n/a (half-float)   | float (`2<fn>`)   | 2             |
++--------+--------------------+-------------------+---------------+
 | f      | float              | float (`2<fn>`)   | 4             |
 +--------+--------------------+-------------------+---------------+
 | d      | double             | float (`2<fn>`)   | 8             |
diff --git a/py/binary.c b/py/binary.c
index 4c8b6ffcdc49a..7c01cfa1c8284 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -74,11 +74,14 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
                 case 'S':
                     size = sizeof(void *);
                     break;
+                case 'e':
+                    size = 2;
+                    break;
                 case 'f':
-                    size = sizeof(float);
+                    size = 4;
                     break;
                 case 'd':
-                    size = sizeof(double);
+                    size = 8;
                     break;
             }
             break;
@@ -122,6 +125,10 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
                     align = alignof(void *);
                     size = sizeof(void *);
                     break;
+                case 'e':
+                    align = 2;
+                    size = 2;
+                    break;
                 case 'f':
                     align = alignof(float);
                     size = sizeof(float);
@@ -144,6 +151,99 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
     return size;
 }
 
+#if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_USE_NATIVE_FLT16
+
+static inline float mp_decode_half_float(uint16_t hf) {
+    union {
+        uint16_t i;
+        _Float16 f;
+    } fpu = { .i = hf };
+    return fpu.f;
+}
+
+static inline uint16_t mp_encode_half_float(float x) {
+    union {
+        uint16_t i;
+        _Float16 f;
+    } fp_sp = { .f = (_Float16)x };
+    return fp_sp.i;
+}
+
+#elif MICROPY_PY_BUILTINS_FLOAT
+
+static float mp_decode_half_float(uint16_t hf) {
+    union {
+        uint32_t i;
+        float f;
+    } fpu;
+
+    uint16_t m = hf & 0x3ff;
+    int e = (hf >> 10) & 0x1f;
+    if (e == 0x1f) {
+        // Half-float is infinity.
+        e = 0xff;
+    } else if (e) {
+        // Half-float is normal.
+        e += 127 - 15;
+    } else if (m) {
+        // Half-float is subnormal, make it normal.
+        e = 127 - 15;
+        while (!(m & 0x400)) {
+            m <<= 1;
+            --e;
+        }
+        m -= 0x400;
+        ++e;
+    }
+
+    fpu.i = ((hf & 0x8000) << 16) | (e << 23) | (m << 13);
+    return fpu.f;
+}
+
+static uint16_t mp_encode_half_float(float x) {
+    union {
+        uint32_t i;
+        float f;
+    } fpu = { .f = x };
+
+    uint16_t m = (fpu.i >> 13) & 0x3ff;
+    if (fpu.i & (1 << 12)) {
+        // Round up.
+        ++m;
+    }
+    int e = (fpu.i >> 23) & 0xff;
+
+    if (e == 0xff) {
+        // Infinity.
+        e = 0x1f;
+    } else if (e != 0) {
+        e -= 127 - 15;
+        if (e < 0) {
+            // Underflow: denormalized, or zero.
+            if (e >= -11) {
+                m = (m | 0x400) >> -e;
+                if (m & 1) {
+                    m = (m >> 1) + 1;
+                } else {
+                    m >>= 1;
+                }
+            } else {
+                m = 0;
+            }
+            e = 0;
+        } else if (e > 0x3f) {
+            // Overflow: infinity.
+            e = 0x1f;
+            m = 0;
+        }
+    }
+
+    uint16_t bits = ((fpu.i >> 16) & 0x8000) | (e << 10) | m;
+    return bits;
+}
+
+#endif
+
 mp_obj_t mp_binary_get_val_array(char typecode, void *p, size_t index) {
     mp_int_t val = 0;
     switch (typecode) {
@@ -240,6 +340,8 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
         const char *s_val = (const char *)(uintptr_t)(mp_uint_t)val;
         return mp_obj_new_str(s_val, strlen(s_val));
     #if MICROPY_PY_BUILTINS_FLOAT
+    } else if (val_type == 'e') {
+        return mp_obj_new_float_from_f(mp_decode_half_float(val));
     } else if (val_type == 'f') {
         union {
             uint32_t i;
@@ -309,6 +411,9 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
             val = (mp_uint_t)val_in;
             break;
         #if MICROPY_PY_BUILTINS_FLOAT
+        case 'e':
+            val = mp_encode_half_float(mp_obj_get_float_to_f(val_in));
+            break;
         case 'f': {
             union {
                 uint32_t i;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index cb0f050a74bd8..d9cff930d1485 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -830,6 +830,15 @@ typedef double mp_float_t;
 #define MICROPY_PY_BUILTINS_COMPLEX (MICROPY_PY_BUILTINS_FLOAT)
 #endif
 
+// Whether to use the native _Float16 for 16-bit float support
+#ifndef MICROPY_FLOAT_USE_NATIVE_FLT16
+#ifdef __FLT16_MAX__
+#define MICROPY_FLOAT_USE_NATIVE_FLT16 (1)
+#else
+#define MICROPY_FLOAT_USE_NATIVE_FLT16 (0)
+#endif
+#endif
+
 // 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
diff --git a/tests/float/float_struct.py b/tests/float/float_struct.py
index 47fe405018038..6e282a6afe3ee 100644
--- a/tests/float/float_struct.py
+++ b/tests/float/float_struct.py
@@ -8,7 +8,7 @@
 i = 1.0 + 1 / 2
 # TODO: it looks like '=' format modifier is not yet supported
 # for fmt in ('f', 'd', '>f', '>d', '<f', '<d', '=f', '=d'):
-for fmt in ("f", "d", ">f", ">d", "<f", "<d"):
+for fmt in ("e", "f", "d", ">e", ">f", ">d", "<e", "<f", "<d"):
     x = struct.pack(fmt, i)
     v = struct.unpack(fmt, x)[0]
     print("%2s: %.17f - %s" % (fmt, v, (i == v) and "passed" or "failed"))

From 0c800cefeac0ffbe934909f745471788edbf159a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Mar 2024 22:56:38 +1100
Subject: [PATCH 0952/3129] stm32/stm32.mk: Enable _Float16 support on MCUs
 with hardware floats.

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

diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index b9f70db73e0a1..718fa8cf0679d 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -44,14 +44,14 @@ ifneq ($(BUILDING_MBOOT),1)
 SUPPORTS_HARDWARE_FP_SINGLE = 0
 SUPPORTS_HARDWARE_FP_DOUBLE = 0
 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
+CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard -mfp16-format=ieee
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1
 else
 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
+CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mfp16-format=ieee
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 endif
 endif

From b80607ecafeb47664b35e4f255ed43171719ecf5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Mar 2024 23:09:11 +1100
Subject: [PATCH 0953/3129] unix/variants: Don't use native _Float16 type.

Using it increases code size by about 2k.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/mpconfigvariant_common.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 981babca9f10b..2e34055bf773f 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -41,6 +41,11 @@
 #define MICROPY_FLOAT_IMPL             (MICROPY_FLOAT_IMPL_DOUBLE)
 #endif
 
+// Don't use native _Float16 because it increases code size by a lot.
+#ifndef MICROPY_FLOAT_USE_NATIVE_FLT16
+#define MICROPY_FLOAT_USE_NATIVE_FLT16 (0)
+#endif
+
 // Enable arbitrary precision long-int by default.
 #ifndef MICROPY_LONGINT_IMPL
 #define MICROPY_LONGINT_IMPL           (MICROPY_LONGINT_IMPL_MPZ)

From 9d27183bde0a70521a0d189636e53975df2260eb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Mar 2024 13:30:22 +1100
Subject: [PATCH 0954/3129] tests/float/float_struct_e.py: Add specific test
 for struct 'e' type.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/float_struct_e.py | 43 +++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 tests/float/float_struct_e.py

diff --git a/tests/float/float_struct_e.py b/tests/float/float_struct_e.py
new file mode 100644
index 0000000000000..403fbc5db4cde
--- /dev/null
+++ b/tests/float/float_struct_e.py
@@ -0,0 +1,43 @@
+# Test struct pack/unpack with 'e' typecode.
+
+try:
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+test_values = (
+    1e-7,
+    2e-7,
+    1e-6,
+    1e-5,
+    1e-4,
+    1e-3,
+    1e-2,
+    0.1,
+    0,
+    1,
+    2,
+    4,
+    8,
+    10,
+    100,
+    1e3,
+    1e4,
+    6e4,
+    float("inf"),
+)
+
+for j in test_values:
+    for i in (j, -j):
+        x = struct.pack("<e", i)
+        v = struct.unpack("<e", x)[0]
+        print("%.7f %s %.15f %s" % (i, x, v, i == v))
+
+# In CPython, packing a float that doesn't fit into a half-float raises OverflowError.
+# But in MicroPython it does not, but rather stores the value as inf.
+# This test is here for coverage.
+try:
+    struct.pack("e", 1e15)
+except OverflowError:
+    pass

From 71044a4186bda22477e7daf98e718c144d22d519 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Mar 2024 16:19:33 +1100
Subject: [PATCH 0955/3129] py/parse: Zero out dangling parse tree pointer to
 fix potential GC leak.

This fixes a bug where a random Python object may become
un-garbage-collectable until an enclosing Python file (compiled on device)
finishes executing.

Details:

The mp_parse_tree_t structure is stored on the stack in top-level functions
such as parse_compile_execute() in pyexec.c (and others).

Although it quickly falls out of scope in these functions, it is usually
still in the current stack frame when the compiled code executes. (Compiler
dependent, but usually it's one stack push per function.)

This means if any Python object happens to allocate at the same address as
the (freed) root parse tree chunk, it's un-garbage-collectable as there's a
(dangling) pointer up the stack referencing this same address.

As reported by @GitHubsSilverBullet here:
https://github.com/orgs/micropython/discussions/14116#discussioncomment-8837214

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/parse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/parse.c b/py/parse.c
index 54be8b97d092d..1392303e6ff97 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -1386,6 +1386,7 @@ void mp_parse_tree_clear(mp_parse_tree_t *tree) {
         m_del(byte, chunk, sizeof(mp_parse_chunk_t) + chunk->alloc);
         chunk = next;
     }
+    tree->chunk = NULL; // Avoid dangling pointer that may live on stack
 }
 
 #endif // MICROPY_ENABLE_COMPILER

From acbdbcd95e6d953b08f0642a844c1808323e0b7c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 21 Mar 2024 15:46:41 +1100
Subject: [PATCH 0956/3129] esp32: Workaround IDF issue placing ISR ringbuf
 functions in IRAM.

This workaround makes sure that all ringbuf functions that may be called
from an ISR are placed in IRAM.  See
https://github.com/espressif/esp-idf/issues/13378

Note that this means that all esp32-og builds get non-ISR ringbuf functions
placed in flash now, whereas previously it was just the spiram variant.
This might be a good thing (e.g. free up some IRAM for native/viper).

Fixes issue #14005.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/sdkconfig.spiram |  2 +-
 ports/esp32/esp32_common.cmake      |  2 ++
 ports/esp32/main_esp32/linker.lf    | 39 +++++++++++++++++++++++++++++
 ports/esp32/main_esp32c3/linker.lf  |  1 +
 ports/esp32/main_esp32s2/linker.lf  |  1 +
 ports/esp32/main_esp32s3/linker.lf  |  1 +
 6 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32/main_esp32/linker.lf
 create mode 100644 ports/esp32/main_esp32c3/linker.lf
 create mode 100644 ports/esp32/main_esp32s2/linker.lf
 create mode 100644 ports/esp32/main_esp32s3/linker.lf

diff --git a/ports/esp32/boards/sdkconfig.spiram b/ports/esp32/boards/sdkconfig.spiram
index f5503d554149c..35fe3c676ddf4 100644
--- a/ports/esp32/boards/sdkconfig.spiram
+++ b/ports/esp32/boards/sdkconfig.spiram
@@ -13,6 +13,6 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192
 # to PSRAM bug workarounds.  Apply some options to reduce the firmware size.
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
-CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
+# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y # Workaround required: see main_esp32/linker.lf
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index a3637870f4fe3..89e46f9cfb3df 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -151,6 +151,8 @@ idf_component_register(
         ${MICROPY_PORT_DIR}
         ${MICROPY_BOARD_DIR}
         ${CMAKE_BINARY_DIR}
+    LDFRAGMENTS
+        linker.lf
     REQUIRES
         ${IDF_COMPONENTS}
 )
diff --git a/ports/esp32/main_esp32/linker.lf b/ports/esp32/main_esp32/linker.lf
new file mode 100644
index 0000000000000..e00cd63f5548d
--- /dev/null
+++ b/ports/esp32/main_esp32/linker.lf
@@ -0,0 +1,39 @@
+# This fixes components/esp_ringbuf/linker.lf to allow us to put non-ISR ringbuf functions in flash.
+
+# Requires that both RINGBUF_PLACE_FUNCTIONS_INTO_FLASH and RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH
+# are set to "n" (which is the default), otherwise this would result in duplicate section config
+# when resolving the linker fragments.
+
+# The effect of this file is to leave the ISR functions in RAM (which we require), but apply a fixed
+# version of RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y (leaving out prvGetFreeSize and prvGetCurMaxSizeByteBuf)
+# See https://github.com/espressif/esp-idf/issues/13378
+
+[mapping:esp_ringbuf_fix]
+archive: libesp_ringbuf.a
+entries:
+    # This is exactly the list of functions from RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y,
+    # but with prvGetFreeSize and prvGetCurMaxSizeByteBuf removed.
+    ringbuf: prvGetCurMaxSizeNoSplit (default)
+    ringbuf: prvGetCurMaxSizeAllowSplit (default)
+    ringbuf: prvInitializeNewRingbuffer (default)
+    ringbuf: prvReceiveGeneric (default)
+    ringbuf: vRingbufferDelete (default)
+    ringbuf: vRingbufferGetInfo (default)
+    ringbuf: vRingbufferReturnItem (default)
+    ringbuf: xRingbufferAddToQueueSetRead (default)
+    ringbuf: xRingbufferCanRead (default)
+    ringbuf: xRingbufferCreate (default)
+    ringbuf: xRingbufferCreateStatic (default)
+    ringbuf: xRingbufferCreateNoSplit (default)
+    ringbuf: xRingbufferReceive (default)
+    ringbuf: xRingbufferReceiveSplit (default)
+    ringbuf: xRingbufferReceiveUpTo (default)
+    ringbuf: xRingbufferRemoveFromQueueSetRead (default)
+    ringbuf: xRingbufferSend (default)
+    ringbuf: xRingbufferSendAcquire (default)
+    ringbuf: xRingbufferSendComplete (default)
+    ringbuf: xRingbufferPrintInfo (default)
+    ringbuf: xRingbufferGetMaxItemSize (default)
+    ringbuf: xRingbufferGetCurFreeSize (default)
+
+    # Everything else will have the default rule already applied (i.e. noflash_text).
diff --git a/ports/esp32/main_esp32c3/linker.lf b/ports/esp32/main_esp32c3/linker.lf
new file mode 100644
index 0000000000000..31c5b4563ca9a
--- /dev/null
+++ b/ports/esp32/main_esp32c3/linker.lf
@@ -0,0 +1 @@
+# Empty linker fragment (no workaround required for C3, see main_esp32/linker.lf).
diff --git a/ports/esp32/main_esp32s2/linker.lf b/ports/esp32/main_esp32s2/linker.lf
new file mode 100644
index 0000000000000..3c496fa878b3f
--- /dev/null
+++ b/ports/esp32/main_esp32s2/linker.lf
@@ -0,0 +1 @@
+# Empty linker fragment (no workaround required for S2, see main_esp32/linker.lf).
diff --git a/ports/esp32/main_esp32s3/linker.lf b/ports/esp32/main_esp32s3/linker.lf
new file mode 100644
index 0000000000000..81d27906be0e4
--- /dev/null
+++ b/ports/esp32/main_esp32s3/linker.lf
@@ -0,0 +1 @@
+# Empty linker fragment (no workaround required for S3, see main_esp32/linker.lf).

From 2b8e88c563e4bab53e3183d15f04795d645eea28 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 24 Jun 2023 17:02:58 +1000
Subject: [PATCH 0957/3129] py/compile: Add option to allow compiling top-level
 await.

Enabled by MICROPY_COMPILE_ALLOW_TOP_LEVEL_AWAIT.  When enabled, this means
that scope such as module-level functions and REPL statements can yield.
The outer C code must then handle this yielded generator.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c  | 13 +++++++++++--
 py/compile.h  |  5 +++++
 py/mpconfig.h |  5 +++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 7a359e662e731..62757de3c083c 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -196,6 +196,10 @@ typedef struct _compiler_t {
     mp_emit_common_t emit_common;
 } compiler_t;
 
+#if MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT
+bool mp_compile_allow_top_level_await = false;
+#endif
+
 /******************************************************************************/
 // mp_emit_common_t helper functions
 // These are defined here so they can be inlined, to reduce code size.
@@ -2759,8 +2763,13 @@ static void compile_yield_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {
 #if MICROPY_PY_ASYNC_AWAIT
 static void compile_atom_expr_await(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (comp->scope_cur->kind != SCOPE_FUNCTION && comp->scope_cur->kind != SCOPE_LAMBDA) {
-        compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("'await' outside function"));
-        return;
+        #if MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT
+        if (!mp_compile_allow_top_level_await)
+        #endif
+        {
+            compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("'await' outside function"));
+            return;
+        }
     }
     compile_atom_expr_normal(comp, pns);
     compile_yield_from(comp);
diff --git a/py/compile.h b/py/compile.h
index 5e0fd8b31c4a8..f9970a521d644 100644
--- a/py/compile.h
+++ b/py/compile.h
@@ -30,6 +30,11 @@
 #include "py/parse.h"
 #include "py/emitglue.h"
 
+#if MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT
+// set to `true` to allow top-level await expressions
+extern bool mp_compile_allow_top_level_await;
+#endif
+
 // 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
diff --git a/py/mpconfig.h b/py/mpconfig.h
index d9cff930d1485..af2480266bcab 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -446,6 +446,11 @@
 #define MICROPY_DYNAMIC_COMPILER (0)
 #endif
 
+// Whether the compiler allows compiling top-level await expressions
+#ifndef MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT
+#define MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT (0)
+#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)

From ff15dfcaa84dc7d29b9e791f01eaba21dbc2fd72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 15 Apr 2023 09:27:43 +1000
Subject: [PATCH 0958/3129] webassembly: Include lib in sys.path.

Following other ports.

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

diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 0aacf1ee095be..1b053046bfb99 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -105,6 +105,7 @@ void mp_js_init(int heap_size) {
         mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
         MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_mount_table);
     }
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     #endif
 }
 
diff --git a/ports/webassembly/qstrdefsport.h b/ports/webassembly/qstrdefsport.h
index 00d3e2ae3c555..472d05f4375f6 100644
--- a/ports/webassembly/qstrdefsport.h
+++ b/ports/webassembly/qstrdefsport.h
@@ -1,2 +1,3 @@
 // qstrs specific to this port
 // *FORMAT-OFF*
+Q(/lib)

From 8282bd93a2381dcc235ee89093832bb5e76e8102 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 May 2023 13:13:39 +1000
Subject: [PATCH 0959/3129] webassembly: Move MP_JS_EPOCH init to library
 postset.

This eliminates the need for wrapper.js to run to set up the time.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/library.js | 7 ++++---
 ports/webassembly/wrapper.js | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index 009b0a4dcc20c..f554f681c9332 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -35,9 +35,10 @@ mergeInto(LibraryManager.library, {
         }
     },
 
-    mp_js_ticks_ms: function() {
-        return Date.now() - MP_JS_EPOCH;
-    },
+    // This string will be emitted directly into the output file by Emscripten.
+    mp_js_ticks_ms__postset: "var MP_JS_EPOCH = Date.now()",
+
+    mp_js_ticks_ms: () => Date.now() - MP_JS_EPOCH,
 
     mp_js_hook: function() {
         if (ENVIRONMENT_IS_NODE) {
diff --git a/ports/webassembly/wrapper.js b/ports/webassembly/wrapper.js
index e63abfffe4ae9..399801b7afcb9 100644
--- a/ports/webassembly/wrapper.js
+++ b/ports/webassembly/wrapper.js
@@ -33,8 +33,6 @@ 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'], {async: true});
 
-  MP_JS_EPOCH = Date.now();
-
   if (typeof window === 'undefined' && require.main === module) {
       var fs = require('fs');
       var heap_size = 128 * 1024;

From 76898cbfa1b8c48ec5f2ac75bc060675895bb67a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Dec 2023 13:10:03 +1100
Subject: [PATCH 0960/3129] webassembly: Implement
 MICROPY_PY_RANDOM_SEED_INIT_FUNC.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/library.h      | 1 +
 ports/webassembly/library.js     | 7 +++++++
 ports/webassembly/mpconfigport.h | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/ports/webassembly/library.h b/ports/webassembly/library.h
index 47982e064007a..21027c1372f0e 100644
--- a/ports/webassembly/library.h
+++ b/ports/webassembly/library.h
@@ -29,3 +29,4 @@
 extern void mp_js_write(const char *str, mp_uint_t len);
 extern int mp_js_ticks_ms(void);
 extern void mp_js_hook(void);
+extern uint32_t mp_js_random_u32(void);
diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index f554f681c9332..4a17942bb4e83 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -63,4 +63,11 @@ mergeInto(LibraryManager.library, {
             }
         }
     },
+
+    // Node prior to v19 did not expose "crypto" as a global, so make sure it exists.
+    mp_js_random_u32__postset:
+        "if (globalThis.crypto === undefined) { globalThis.crypto = require('crypto'); }",
+
+    mp_js_random_u32: () =>
+        globalThis.crypto.getRandomValues(new Uint32Array(1))[0],
 });
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index e0d1af0cce2bd..43a029c530ca8 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -49,6 +49,8 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
+
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (mp_js_random_u32())
 #ifndef MICROPY_VFS
 #define MICROPY_VFS                 (1)
 #endif
@@ -95,3 +97,5 @@ typedef long mp_off_t;
 // _GNU_SOURCE must be defined to get definitions of DT_xxx symbols from dirent.h.
 #define _GNU_SOURCE
 #endif
+
+uint32_t mp_js_random_u32(void);

From 8e3b701dee944582739adfa9a97de8ea76911a80 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Dec 2023 13:48:32 +1100
Subject: [PATCH 0961/3129] webassembly: Enable time localtime, gmtime, time,
 time_ns.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile       |  1 +
 ports/webassembly/library.h      |  1 +
 ports/webassembly/library.js     |  2 ++
 ports/webassembly/modtime.c      | 51 ++++++++++++++++++++++++++++++++
 ports/webassembly/mpconfigport.h |  4 +++
 ports/webassembly/mphalport.c    |  9 ++++++
 ports/webassembly/mphalport.h    |  1 +
 7 files changed, 69 insertions(+)
 create mode 100644 ports/webassembly/modtime.c

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index c5ee80fe0046f..4e1d53b0ccfdf 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -23,6 +23,7 @@ SRC_SHARED = $(addprefix shared/,\
 	runtime/stdout_helpers.c \
 	runtime/pyexec.c \
 	readline/readline.c \
+	timeutils/timeutils.c \
 	)
 
 SRC_C = \
diff --git a/ports/webassembly/library.h b/ports/webassembly/library.h
index 21027c1372f0e..04b408d71a25a 100644
--- a/ports/webassembly/library.h
+++ b/ports/webassembly/library.h
@@ -29,4 +29,5 @@
 extern void mp_js_write(const char *str, mp_uint_t len);
 extern int mp_js_ticks_ms(void);
 extern void mp_js_hook(void);
+extern double mp_js_time_ms(void);
 extern uint32_t mp_js_random_u32(void);
diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index 4a17942bb4e83..d1266598da93e 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -64,6 +64,8 @@ mergeInto(LibraryManager.library, {
         }
     },
 
+    mp_js_time_ms: () => Date.now(),
+
     // Node prior to v19 did not expose "crypto" as a global, so make sure it exists.
     mp_js_random_u32__postset:
         "if (globalThis.crypto === undefined) { globalThis.crypto = require('crypto'); }",
diff --git a/ports/webassembly/modtime.c b/ports/webassembly/modtime.c
new file mode 100644
index 0000000000000..1b1e63d4ddf3a
--- /dev/null
+++ b/ports/webassembly/modtime.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "py/obj.h"
+#include "shared/timeutils/timeutils.h"
+#include "library.h"
+
+// Return the localtime as an 8-tuple.
+static mp_obj_t mp_time_localtime_get(void) {
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_epoch_to_struct_time(mp_hal_time_ms() / 1000, &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(tm.tm_hour),
+        mp_obj_new_int(tm.tm_min),
+        mp_obj_new_int(tm.tm_sec),
+        mp_obj_new_int(tm.tm_wday),
+        mp_obj_new_int(tm.tm_yday),
+    };
+    return mp_obj_new_tuple(8, tuple);
+}
+
+// Returns the number of seconds, as a float, since the Epoch.
+static mp_obj_t mp_time_time_get(void) {
+    return mp_obj_new_float((mp_float_t)mp_hal_time_ms() / 1000);
+}
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 43a029c530ca8..79537dd72de4c 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -50,7 +50,11 @@
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
 
+#define MICROPY_EPOCH_IS_1970       (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (mp_js_random_u32())
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS (1)
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/webassembly/modtime.c"
 #ifndef MICROPY_VFS
 #define MICROPY_VFS                 (1)
 #endif
diff --git a/ports/webassembly/mphalport.c b/ports/webassembly/mphalport.c
index f91a509013a3c..72a326e30d1f9 100644
--- a/ports/webassembly/mphalport.c
+++ b/ports/webassembly/mphalport.c
@@ -56,6 +56,15 @@ mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
 
+uint64_t mp_hal_time_ms(void) {
+    double mm = mp_js_time_ms();
+    return (uint64_t)mm;
+}
+
+uint64_t mp_hal_time_ns(void) {
+    return mp_hal_time_ms() * 1000000ULL;
+}
+
 extern int mp_interrupt_char;
 
 int mp_hal_get_interrupt_char(void) {
diff --git a/ports/webassembly/mphalport.h b/ports/webassembly/mphalport.h
index 1b3179698644b..a90de8ec5fb0e 100644
--- a/ports/webassembly/mphalport.h
+++ b/ports/webassembly/mphalport.h
@@ -35,6 +35,7 @@ void mp_hal_delay_us(mp_uint_t us);
 mp_uint_t mp_hal_ticks_ms(void);
 mp_uint_t mp_hal_ticks_us(void);
 mp_uint_t mp_hal_ticks_cpu(void);
+uint64_t mp_hal_time_ms(void);
 
 int mp_hal_get_interrupt_char(void);
 

From ae6bcc9d2345d73016fd22f9cc22b56c73bae432 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 31 May 2023 11:44:45 +1000
Subject: [PATCH 0962/3129] webassembly: Use POSIX write for output and add
 stderr.

All output is now handled by Emscripten's stdio facility.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/library.js     | 10 ----------
 ports/webassembly/mpconfigport.h |  4 +++-
 ports/webassembly/mphalport.c    | 11 +++++++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index d1266598da93e..db5bac2691443 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -25,16 +25,6 @@
  */
 
 mergeInto(LibraryManager.library, {
-    mp_js_write: function(ptr, len) {
-        const buffer = HEAPU8.subarray(ptr, ptr + len)
-        if (ENVIRONMENT_IS_NODE) {
-            process.stdout.write(buffer);
-        } else {
-            const printEvent = new CustomEvent('micropython-print', { detail: buffer });
-            document.dispatchEvent(printEvent);
-        }
-    },
-
     // This string will be emitted directly into the output file by Emscripten.
     mp_js_ticks_ms__postset: "var MP_JS_EPOCH = Date.now()",
 
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 79537dd72de4c..6b0f2753a960a 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -46,6 +46,7 @@
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_DOC_STRING   (1)
 #define MICROPY_WARNINGS            (1)
+#define MICROPY_ERROR_PRINTER       (&mp_stderr_print)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
@@ -60,7 +61,6 @@
 #endif
 #define MICROPY_VFS_POSIX           (MICROPY_VFS)
 #define MICROPY_PY_SYS_PLATFORM     "webassembly"
-#define MICROPY_PY_SYS_STDFILES     (0)
 
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
@@ -102,4 +102,6 @@ typedef long mp_off_t;
 #define _GNU_SOURCE
 #endif
 
+extern const struct _mp_print_t mp_stderr_print;
+
 uint32_t mp_js_random_u32(void);
diff --git a/ports/webassembly/mphalport.c b/ports/webassembly/mphalport.c
index 72a326e30d1f9..9ab47762e3e97 100644
--- a/ports/webassembly/mphalport.c
+++ b/ports/webassembly/mphalport.c
@@ -24,12 +24,19 @@
  * THE SOFTWARE.
  */
 
+#include <unistd.h>
 #include "library.h"
 #include "mphalport.h"
 
+static void stderr_print_strn(void *env, const char *str, size_t len) {
+    (void)env;
+    write(2, str, len);
+}
+
+const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
+
 mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
-    mp_js_write(str, len);
-    return len;
+    return write(1, str, len);
 }
 
 void mp_hal_delay_ms(mp_uint_t ms) {

From 98a8ff7a1a42211acc62e5c41a445a9d6f256e70 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jun 2023 17:31:40 +1000
Subject: [PATCH 0963/3129] webassembly: Add support for enabling
 MICROPY_GC_SPLIT_HEAP_AUTO.

When enabled the GC will not reclaim any memory on a call to
`gc_collect()`.  Instead it will grow the heap.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/main.c         | 15 +++++++++++++++
 ports/webassembly/mpconfigport.h |  1 +
 2 files changed, 16 insertions(+)

diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 1b053046bfb99..ebde8ac7008ba 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -113,6 +113,19 @@ void mp_js_init_repl() {
     pyexec_event_repl_init();
 }
 
+#if MICROPY_GC_SPLIT_HEAP_AUTO
+
+// The largest new region that is available to become Python heap.
+size_t gc_get_max_new_split(void) {
+    return 128 * 1024 * 1024;
+}
+
+// Don't collect anything.  Instead require the heap to grow.
+void gc_collect(void) {
+}
+
+#else
+
 static void gc_scan_func(void *begin, void *end) {
     gc_collect_root((void **)begin, (void **)end - (void **)begin + 1);
 }
@@ -124,6 +137,8 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
+#endif
+
 #if !MICROPY_VFS
 mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
     mp_raise_OSError(MP_ENOENT);
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 6b0f2753a960a..d0261362390fa 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -26,6 +26,7 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h> // for malloc, for MICROPY_GC_SPLIT_HEAP_AUTO
 
 // options to control how MicroPython is built
 

From 691cd3a56d74354bf2cb3d6f46dc226760134297 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 May 2023 13:15:58 +1000
Subject: [PATCH 0964/3129] webassembly: Clean up Makefile and add variant
 support.

This commit cleans up and generalises the Makefile, adds support for
variants (following the unix port) and adds the "standard" variant as the
default variant.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile                    | 78 +++++++++++++++----
 ports/webassembly/mpconfigport.h              | 21 +++--
 .../variants/standard/mpconfigvariant.h       |  1 +
 .../variants/standard/mpconfigvariant.mk      |  1 +
 4 files changed, 82 insertions(+), 19 deletions(-)
 create mode 100644 ports/webassembly/variants/standard/mpconfigvariant.h
 create mode 100644 ports/webassembly/variants/standard/mpconfigvariant.mk

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index 4e1d53b0ccfdf..e8f27d862bb8a 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -1,23 +1,67 @@
-include ../../py/mkenv.mk
+################################################################################
+# Initial setup of Makefile environment.
+
+# 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
+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)
 
-CROSS = 0
+include ../../py/mkenv.mk
+include $(VARIANT_DIR)/mpconfigvariant.mk
 
+# Qstr definitions (must come before including py.mk).
 QSTR_DEFS = qstrdefsport.h
 
+# Include py core make definitions.
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
+################################################################################
+# Project specific settings and compiler/linker flags.
+
 CC = emcc
 LD = emcc
+TERSER ?= npx terser
 
 INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
+INC += -I$(VARIANT_DIR)
 
 CFLAGS += -std=c99 -Wall -Werror -Wdouble-promotion -Wfloat-conversion
 CFLAGS += -Os -DNDEBUG
 CFLAGS += $(INC)
 
+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$(EXPORTED_FUNCTIONS_EXTRA)"
+JSFLAGS += -s EXPORTED_RUNTIME_METHODS="\
+	ccall,\
+	cwrap,\
+	FS$(EXPORTED_RUNTIME_METHODS_EXTRA)"
+JSFLAGS += --js-library library.js
+JSFLAGS += -s SUPPORT_LONGJMP=emscripten
+
+################################################################################
+# Source files and libraries.
+
 SRC_SHARED = $(addprefix shared/,\
 	runtime/interrupt_char.c \
 	runtime/stdout_helpers.c \
@@ -26,33 +70,41 @@ SRC_SHARED = $(addprefix shared/,\
 	timeutils/timeutils.c \
 	)
 
-SRC_C = \
+SRC_C += \
 	main.c \
 	mphalport.c \
 
+# List of sources for qstr extraction.
 SRC_QSTR += $(SRC_C) $(SRC_SHARED)
 
+SRC_JS ?= wrapper.js
+
 OBJ += $(PY_O)
 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']"
-JSFLAGS += -s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap', 'FS']"
-JSFLAGS += --js-library library.js
+################################################################################
+# Main targets.
+
+.PHONY: all min test
 
 all: $(BUILD)/micropython.js
 
-$(BUILD)/micropython.js: $(OBJ) library.js wrapper.js
-	$(ECHO) "LINK $(BUILD)/firmware.js"
-	$(Q)emcc $(LDFLAGS) -o $(BUILD)/firmware.js $(OBJ) $(JSFLAGS)
-	cat wrapper.js $(BUILD)/firmware.js > $@
+$(BUILD)/micropython.js: $(OBJ) library.js $(SRC_JS)
+	$(ECHO) "LINK $@"
+	$(Q)emcc $(LDFLAGS) -o $@ $(OBJ) $(JSFLAGS)
+	$(Q)cat $(SRC_JS) >> $@
 
-min: $(BUILD)/micropython.js
-	uglifyjs $< -c -o $(BUILD)/micropython.min.js
+$(BUILD)/micropython.min.js: $(BUILD)/micropython.js
+	$(TERSER) $< --compress --module -o $@
+
+min: $(BUILD)/micropython.min.js
 
 test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/webassembly/node_run.sh ./run-tests.py -j1
 
+################################################################################
+# Remaining make rules.
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index d0261362390fa..abfbbca7941f8 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -25,17 +25,18 @@
  * THE SOFTWARE.
  */
 
+// Options to control how MicroPython is built for this port, overriding
+// defaults in py/mpconfig.h.
+
 #include <stdint.h>
 #include <stdlib.h> // for malloc, for MICROPY_GC_SPLIT_HEAP_AUTO
 
-// options to control how MicroPython is built
+// Variant-specific definitions.
+#include "mpconfigvariant.h"
 
+#ifndef MICROPY_CONFIG_ROM_LEVEL
 #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)
+#endif
 
 #define MICROPY_ALLOC_PATH_MAX      (256)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
@@ -69,6 +70,13 @@
         mp_handle_pending(true); \
     } while (0);
 
+// Whether the VM will periodically call mp_js_hook(), which checks for
+// interrupt characters on stdin (or equivalent input).
+#ifndef MICROPY_VARIANT_ENABLE_JS_HOOK
+#define MICROPY_VARIANT_ENABLE_JS_HOOK (0)
+#endif
+
+#if MICROPY_VARIANT_ENABLE_JS_HOOK
 #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) { \
@@ -78,6 +86,7 @@
 }
 #define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
 #define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
+#endif
 
 // type definitions for the specific machine
 
diff --git a/ports/webassembly/variants/standard/mpconfigvariant.h b/ports/webassembly/variants/standard/mpconfigvariant.h
new file mode 100644
index 0000000000000..7be62ea7f4f3f
--- /dev/null
+++ b/ports/webassembly/variants/standard/mpconfigvariant.h
@@ -0,0 +1 @@
+#define MICROPY_VARIANT_ENABLE_JS_HOOK (1)
diff --git a/ports/webassembly/variants/standard/mpconfigvariant.mk b/ports/webassembly/variants/standard/mpconfigvariant.mk
new file mode 100644
index 0000000000000..62ee161907de2
--- /dev/null
+++ b/ports/webassembly/variants/standard/mpconfigvariant.mk
@@ -0,0 +1 @@
+JSFLAGS += -s ASYNCIFY

From 39bd0b8a0a18d7bfc499acc7a11028da12f43edc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 31 May 2023 11:45:34 +1000
Subject: [PATCH 0965/3129] webassembly: Add JavaScript proxying, and js and
 jsffi modules.

This commit improves the webassembly port by adding:

- Proxying of Python objects to JavaScript with a PyProxy type that lives
  on the JavaScript side.  PyProxy implements JavaScript Proxy traps such
  as has, get, set and ownKeys, to make Python objects have functionality
  on the JavaScript side.

- Proxying of JavaScript objects to Python with a JsProxy type that lives
  on the Python side.  JsProxy passes through calls, attributes,
  subscription and iteration from Python to JavaScript.

- A top-level API on the JavaScript side to construct a MicroPython
  interpreter instance via `loadMicroPython()`.  That function returns an
  object that can be used to execute Python code, access the Python globals
  dict, access the Emscripten filesystem, and other things.  This API is
  based on the API provided by Pyodide (https://pyodide.org/).  As part of
  this, the top-level file is changed from `micropython.js` to
  `micropython.mjs`.

- A Python `js` module which can be used to access all JavaScript-side
  symbols, for example the DOM when run within a browser.

- A Python `jsffi` module with various helper functions like
  `create_proxy()` and `to_js()`.

- A dedenting lexer which automatically dedents Python source code if every
  non-empty line in that source starts with a common whitespace prefix.
  This is very helpful when Python source code is indented within a string
  within HTML or JavaScript for formatting reasons.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile       |  56 +++++-
 ports/webassembly/api.js         | 146 ++++++++++++++
 ports/webassembly/lexer_dedent.c | 105 ++++++++++
 ports/webassembly/lexer_dedent.h |  36 ++++
 ports/webassembly/main.c         |  56 ++++++
 ports/webassembly/modjs.c        |  55 ++++++
 ports/webassembly/modjsffi.c     |  80 ++++++++
 ports/webassembly/mpconfigport.h |   8 +
 ports/webassembly/objjsproxy.c   | 330 +++++++++++++++++++++++++++++++
 ports/webassembly/objpyproxy.js  | 191 ++++++++++++++++++
 ports/webassembly/proxy_c.c      | 281 ++++++++++++++++++++++++++
 ports/webassembly/proxy_c.h      |  58 ++++++
 ports/webassembly/proxy_js.js    | 222 +++++++++++++++++++++
 13 files changed, 1615 insertions(+), 9 deletions(-)
 create mode 100644 ports/webassembly/api.js
 create mode 100644 ports/webassembly/lexer_dedent.c
 create mode 100644 ports/webassembly/lexer_dedent.h
 create mode 100644 ports/webassembly/modjs.c
 create mode 100644 ports/webassembly/modjsffi.c
 create mode 100644 ports/webassembly/objjsproxy.c
 create mode 100644 ports/webassembly/objpyproxy.js
 create mode 100644 ports/webassembly/proxy_c.c
 create mode 100644 ports/webassembly/proxy_c.h
 create mode 100644 ports/webassembly/proxy_js.js

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index e8f27d862bb8a..2a5669392eb41 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -45,7 +45,34 @@ CFLAGS += -std=c99 -Wall -Werror -Wdouble-promotion -Wfloat-conversion
 CFLAGS += -Os -DNDEBUG
 CFLAGS += $(INC)
 
+EXPORTED_FUNCTIONS_EXTRA += ,\
+	_mp_js_do_exec,\
+	_mp_js_do_import,\
+	_mp_js_register_js_module,\
+	_proxy_c_init,\
+	_proxy_c_to_js_call,\
+	_proxy_c_to_js_delete_attr,\
+	_proxy_c_to_js_dir,\
+	_proxy_c_to_js_get_array,\
+	_proxy_c_to_js_get_dict,\
+	_proxy_c_to_js_get_type,\
+	_proxy_c_to_js_has_attr,\
+	_proxy_c_to_js_lookup_attr,\
+	_proxy_c_to_js_store_attr,\
+	_proxy_convert_mp_to_js_obj_cside
+
+EXPORTED_RUNTIME_METHODS_EXTRA += ,\
+	PATH,\
+	PATH_FS,\
+	UTF8ToString,\
+	getValue,\
+	lengthBytesUTF8,\
+	setValue,\
+	stringToUTF8
+
 JSFLAGS += -s EXPORTED_FUNCTIONS="\
+	_free,\
+	_malloc,\
 	_mp_js_init,\
 	_mp_js_init_repl,\
 	_mp_js_do_str,\
@@ -58,6 +85,7 @@ JSFLAGS += -s EXPORTED_RUNTIME_METHODS="\
 	FS$(EXPORTED_RUNTIME_METHODS_EXTRA)"
 JSFLAGS += --js-library library.js
 JSFLAGS += -s SUPPORT_LONGJMP=emscripten
+JSFLAGS += -s MODULARIZE -s EXPORT_NAME=_createMicroPythonModule
 
 ################################################################################
 # Source files and libraries.
@@ -71,13 +99,21 @@ SRC_SHARED = $(addprefix shared/,\
 	)
 
 SRC_C += \
+	lexer_dedent.c \
 	main.c \
+	modjs.c \
+	modjsffi.c \
 	mphalport.c \
+	objjsproxy.c \
+	proxy_c.c \
 
 # List of sources for qstr extraction.
 SRC_QSTR += $(SRC_C) $(SRC_SHARED)
 
-SRC_JS ?= wrapper.js
+SRC_JS += \
+	api.js \
+	objpyproxy.js \
+	proxy_js.js \
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED:.c=.o))
@@ -86,23 +122,25 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 ################################################################################
 # Main targets.
 
-.PHONY: all min test
+.PHONY: all min test test_min
 
-all: $(BUILD)/micropython.js
+all: $(BUILD)/micropython.mjs
 
-$(BUILD)/micropython.js: $(OBJ) library.js $(SRC_JS)
+$(BUILD)/micropython.mjs: $(OBJ) library.js $(SRC_JS)
 	$(ECHO) "LINK $@"
 	$(Q)emcc $(LDFLAGS) -o $@ $(OBJ) $(JSFLAGS)
 	$(Q)cat $(SRC_JS) >> $@
 
-$(BUILD)/micropython.min.js: $(BUILD)/micropython.js
+$(BUILD)/micropython.min.mjs: $(BUILD)/micropython.mjs
 	$(TERSER) $< --compress --module -o $@
 
-min: $(BUILD)/micropython.min.js
+min: $(BUILD)/micropython.min.mjs
+
+test: $(BUILD)/micropython.mjs $(TOP)/tests/run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON_MJS=../ports/webassembly/$< ./run-tests.py --target webassembly
 
-test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/webassembly/node_run.sh ./run-tests.py -j1
+test_min: $(BUILD)/micropython.min.mjs $(TOP)/tests/run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON_MJS=../ports/webassembly/$< ./run-tests.py --target webassembly
 
 ################################################################################
 # Remaining make rules.
diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
new file mode 100644
index 0000000000000..dfe7561768a4f
--- /dev/null
+++ b/ports/webassembly/api.js
@@ -0,0 +1,146 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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:
+// - heapsize: size in bytes of the MicroPython GC heap.
+// - url: location to load `micropython.mjs`.
+// - stdin: function to return input characters.
+// - stdout: function that takes one argument, and is passed lines of stdout
+//   output as they are produced.  By default this is handled by Emscripten
+//   and in a browser goes to console, in node goes to process.stdout.write.
+// - stderr: same behaviour as stdout but for error output.
+// - linebuffer: whether to buffer line-by-line to stdout/stderr.
+export async function loadMicroPython(options) {
+    const { heapsize, url, stdin, stdout, stderr, linebuffer } = Object.assign(
+        { heapsize: 1024 * 1024, linebuffer: true },
+        options,
+    );
+    const Module = {};
+    Module.locateFile = (path, scriptDirectory) =>
+        url || scriptDirectory + path;
+    Module._textDecoder = new TextDecoder();
+    if (stdin !== undefined) {
+        Module.stdin = stdin;
+    }
+    if (stdout !== undefined) {
+        if (linebuffer) {
+            Module._stdoutBuffer = [];
+            Module.stdout = (c) => {
+                if (c === 10) {
+                    stdout(
+                        Module._textDecoder.decode(
+                            new Uint8Array(Module._stdoutBuffer),
+                        ),
+                    );
+                    Module._stdoutBuffer = [];
+                } else {
+                    Module._stdoutBuffer.push(c);
+                }
+            };
+        } else {
+            Module.stdout = (c) => stdout(new Uint8Array([c]));
+        }
+    }
+    if (stderr !== undefined) {
+        if (linebuffer) {
+            Module._stderrBuffer = [];
+            Module.stderr = (c) => {
+                if (c === 10) {
+                    stderr(
+                        Module._textDecoder.decode(
+                            new Uint8Array(Module._stderrBuffer),
+                        ),
+                    );
+                    Module._stderrBuffer = [];
+                } else {
+                    Module._stderrBuffer.push(c);
+                }
+            };
+        } else {
+            Module.stderr = (c) => stderr(new Uint8Array([c]));
+        }
+    }
+    const moduleLoaded = new Promise((r) => {
+        Module.postRun = r;
+    });
+    _createMicroPythonModule(Module);
+    await moduleLoaded;
+    globalThis.Module = Module;
+    proxy_js_init();
+    const pyimport = (name) => {
+        const value = Module._malloc(3 * 4);
+        Module.ccall(
+            "mp_js_do_import",
+            "null",
+            ["string", "pointer"],
+            [name, value],
+        );
+        return proxy_convert_mp_to_js_obj_jsside_with_free(value);
+    };
+    Module.ccall("mp_js_init", "null", ["number"], [heapsize]);
+    Module.ccall("proxy_c_init", "null", [], []);
+    return {
+        _module: Module,
+        PyProxy: PyProxy,
+        FS: Module.FS,
+        globals: {
+            __dict__: pyimport("__main__").__dict__,
+            get(key) {
+                return this.__dict__[key];
+            },
+            set(key, value) {
+                this.__dict__[key] = value;
+            },
+            delete(key) {
+                delete this.__dict__[key];
+            },
+        },
+        registerJsModule(name, module) {
+            const value = Module._malloc(3 * 4);
+            proxy_convert_js_to_mp_obj_jsside(module, value);
+            Module.ccall(
+                "mp_js_register_js_module",
+                "null",
+                ["string", "pointer"],
+                [name, value],
+            );
+            Module._free(value);
+        },
+        pyimport: pyimport,
+        runPython(code) {
+            const value = Module._malloc(3 * 4);
+            Module.ccall(
+                "mp_js_do_exec",
+                "number",
+                ["string", "pointer"],
+                [code, value],
+            );
+            return proxy_convert_mp_to_js_obj_jsside_with_free(value);
+        },
+    };
+}
+
+globalThis.loadMicroPython = loadMicroPython;
diff --git a/ports/webassembly/lexer_dedent.c b/ports/webassembly/lexer_dedent.c
new file mode 100644
index 0000000000000..555caea89692b
--- /dev/null
+++ b/ports/webassembly/lexer_dedent.c
@@ -0,0 +1,105 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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 "lexer_dedent.h"
+
+typedef struct _mp_reader_mem_dedent_t {
+    size_t free_len; // if >0 mem is freed on close by: m_free(beg, free_len)
+    const byte *beg;
+    const byte *cur;
+    const byte *end;
+    size_t dedent_prefix;
+} mp_reader_mem_dedent_t;
+
+// Work out the amount of common whitespace among all non-empty lines.
+static size_t dedent(const byte *text, size_t len) {
+    size_t min_prefix = -1;
+    size_t cur_prefix = 0;
+    bool start_of_line = true;
+    for (const byte *t = text; t < text + len; ++t) {
+        if (*t == '\n') {
+            start_of_line = true;
+            cur_prefix = 0;
+        } else if (start_of_line) {
+            if (unichar_isspace(*t)) {
+                ++cur_prefix;
+            } else {
+                if (cur_prefix < min_prefix) {
+                    min_prefix = cur_prefix;
+                    if (min_prefix == 0) {
+                        return min_prefix;
+                    }
+                }
+                start_of_line = false;
+            }
+        }
+    }
+    return min_prefix;
+}
+
+static mp_uint_t mp_reader_mem_dedent_readbyte(void *data) {
+    mp_reader_mem_dedent_t *reader = (mp_reader_mem_dedent_t *)data;
+    if (reader->cur < reader->end) {
+        byte c = *reader->cur++;
+        if (c == '\n') {
+            for (size_t i = 0; i < reader->dedent_prefix; ++i) {
+                if (*reader->cur == '\n') {
+                    break;
+                }
+                ++reader->cur;
+            }
+        }
+        return c;
+    } else {
+        return MP_READER_EOF;
+    }
+}
+
+static void mp_reader_mem_dedent_close(void *data) {
+    mp_reader_mem_dedent_t *reader = (mp_reader_mem_dedent_t *)data;
+    if (reader->free_len > 0) {
+        m_del(char, (char *)reader->beg, reader->free_len);
+    }
+    m_del_obj(mp_reader_mem_dedent_t, reader);
+}
+
+static void mp_reader_new_mem_dedent(mp_reader_t *reader, const byte *buf, size_t len, size_t free_len) {
+    mp_reader_mem_dedent_t *rm = m_new_obj(mp_reader_mem_dedent_t);
+    rm->free_len = free_len;
+    rm->beg = buf;
+    rm->cur = buf;
+    rm->end = buf + len;
+    rm->dedent_prefix = dedent(buf, len);
+    reader->data = rm;
+    reader->readbyte = mp_reader_mem_dedent_readbyte;
+    reader->close = mp_reader_mem_dedent_close;
+}
+
+mp_lexer_t *mp_lexer_new_from_str_len_dedent(qstr src_name, const char *str, size_t len, size_t free_len) {
+    mp_reader_t reader;
+    mp_reader_new_mem_dedent(&reader, (const byte *)str, len, free_len);
+    return mp_lexer_new(src_name, reader);
+}
diff --git a/ports/webassembly/lexer_dedent.h b/ports/webassembly/lexer_dedent.h
new file mode 100644
index 0000000000000..a8cc2526b4f53
--- /dev/null
+++ b/ports/webassembly/lexer_dedent.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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_WEBASSEMBLY_LEXER_DEDENT_H
+#define MICROPY_INCLUDED_WEBASSEMBLY_LEXER_DEDENT_H
+
+#include "py/lexer.h"
+
+// This function creates a new "dedenting lexer" which automatically dedents the input
+// source code if every non-empty line in that source starts with a common whitespace
+// prefix.  It does this dedenting inplace as the memory is read.
+mp_lexer_t *mp_lexer_new_from_str_len_dedent(qstr src_name, const char *str, size_t len, size_t free_len);
+
+#endif // MICROPY_INCLUDED_WEBASSEMBLY_LEXER_DEDENT_H
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index ebde8ac7008ba..c1c7a88840ec3 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -40,7 +40,9 @@
 #include "shared/runtime/pyexec.h"
 
 #include "emscripten.h"
+#include "lexer_dedent.h"
 #include "library.h"
+#include "proxy_c.h"
 
 #if MICROPY_ENABLE_COMPILER
 int do_str(const char *src, mp_parse_input_kind_t input_kind) {
@@ -113,6 +115,60 @@ void mp_js_init_repl() {
     pyexec_event_repl_init();
 }
 
+void mp_js_register_js_module(const char *name, uint32_t *value) {
+    mp_obj_t module_name = MP_OBJ_NEW_QSTR(qstr_from_str(name));
+    mp_obj_t module = proxy_convert_js_to_mp_obj_cside(value);
+    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;
+}
+
+void mp_js_do_import(const char *name, uint32_t *out) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t ret = mp_import_name(qstr_from_str(name), mp_const_none, MP_OBJ_NEW_SMALL_INT(0));
+        // Return the leaf of the import, eg for "a.b.c" return "c".
+        const char *m = name;
+        const char *n = name;
+        for (;; ++n) {
+            if (*n == '\0' || *n == '.') {
+                if (m != name) {
+                    ret = mp_load_attr(ret, qstr_from_strn(m, n - m));
+                }
+                m = n + 1;
+                if (*n == '\0') {
+                    break;
+                }
+            }
+        }
+        nlr_pop();
+        proxy_convert_mp_to_js_obj_cside(ret, out);
+    } else {
+        // uncaught exception
+        proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+    }
+}
+
+void mp_js_do_exec(const char *src, uint32_t *out) {
+    // Collect at the top-level, where there are no root pointers from stack/registers.
+    gc_collect_start();
+    gc_collect_end();
+
+    mp_parse_input_kind_t input_kind = MP_PARSE_FILE_INPUT;
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_lexer_t *lex = mp_lexer_new_from_str_len_dedent(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, false);
+        mp_obj_t ret = mp_call_function_0(module_fun);
+        nlr_pop();
+        proxy_convert_mp_to_js_obj_cside(ret, out);
+    } else {
+        // uncaught exception
+        proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+    }
+}
+
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 
 // The largest new region that is available to become Python heap.
diff --git a/ports/webassembly/modjs.c b/ports/webassembly/modjs.c
new file mode 100644
index 0000000000000..bed09086ab7cf
--- /dev/null
+++ b/ports/webassembly/modjs.c
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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/objmodule.h"
+#include "py/runtime.h"
+#include "proxy_c.h"
+
+#if MICROPY_PY_JS
+
+/******************************************************************************/
+// js module
+
+void mp_module_js_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    mp_obj_jsproxy_t global_this;
+    global_this.ref = 0;
+    mp_obj_jsproxy_attr(MP_OBJ_FROM_PTR(&global_this), attr, dest);
+}
+
+static const mp_rom_map_elem_t mp_module_js_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_js) },
+};
+static MP_DEFINE_CONST_DICT(mp_module_js_globals, mp_module_js_globals_table);
+
+const mp_obj_module_t mp_module_js = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&mp_module_js_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_js, mp_module_js);
+MP_REGISTER_MODULE_DELEGATION(mp_module_js, mp_module_js_attr);
+
+#endif // MICROPY_PY_JS
diff --git a/ports/webassembly/modjsffi.c b/ports/webassembly/modjsffi.c
new file mode 100644
index 0000000000000..d4e61e368f009
--- /dev/null
+++ b/ports/webassembly/modjsffi.c
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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 "emscripten.h"
+#include "py/objmodule.h"
+#include "py/runtime.h"
+#include "proxy_c.h"
+
+#if MICROPY_PY_JSFFI
+
+/******************************************************************************/
+// jsffi module
+
+EM_JS(void, proxy_convert_mp_to_js_then_js_to_mp_obj_jsside, (uint32_t * out), {
+    const ret = proxy_convert_mp_to_js_obj_jsside(out);
+    proxy_convert_js_to_mp_obj_jsside_force_double_proxy(ret, out);
+});
+
+static mp_obj_t mp_jsffi_create_proxy(mp_obj_t arg) {
+    uint32_t out[3];
+    proxy_convert_mp_to_js_obj_cside(arg, out);
+    proxy_convert_mp_to_js_then_js_to_mp_obj_jsside(out);
+    return proxy_convert_js_to_mp_obj_cside(out);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_jsffi_create_proxy_obj, mp_jsffi_create_proxy);
+
+EM_JS(void, proxy_convert_mp_to_js_then_js_to_js_then_js_to_mp_obj_jsside, (uint32_t * out), {
+    const ret = proxy_convert_mp_to_js_obj_jsside(out);
+    const js_obj = PyProxy.toJs(ret);
+    proxy_convert_js_to_mp_obj_jsside(js_obj, out);
+});
+
+static mp_obj_t mp_jsffi_to_js(mp_obj_t arg) {
+    uint32_t out[3];
+    proxy_convert_mp_to_js_obj_cside(arg, out);
+    proxy_convert_mp_to_js_then_js_to_js_then_js_to_mp_obj_jsside(out);
+    return proxy_convert_js_to_mp_obj_cside(out);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_jsffi_to_js_obj, mp_jsffi_to_js);
+
+static const mp_rom_map_elem_t mp_module_jsffi_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_jsffi) },
+
+    { MP_ROM_QSTR(MP_QSTR_JsProxy), MP_ROM_PTR(&mp_type_jsproxy) },
+    { MP_ROM_QSTR(MP_QSTR_create_proxy), MP_ROM_PTR(&mp_jsffi_create_proxy_obj) },
+    { MP_ROM_QSTR(MP_QSTR_to_js), MP_ROM_PTR(&mp_jsffi_to_js_obj) },
+};
+static MP_DEFINE_CONST_DICT(mp_module_jsffi_globals, mp_module_jsffi_globals_table);
+
+const mp_obj_module_t mp_module_jsffi = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&mp_module_jsffi_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_jsffi, mp_module_jsffi);
+
+#endif // MICROPY_PY_JSFFI
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index abfbbca7941f8..fc7ba2f82d33c 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -64,6 +64,14 @@
 #define MICROPY_VFS_POSIX           (MICROPY_VFS)
 #define MICROPY_PY_SYS_PLATFORM     "webassembly"
 
+#ifndef MICROPY_PY_JS
+#define MICROPY_PY_JS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
+#ifndef MICROPY_PY_JSFFI
+#define MICROPY_PY_JSFFI (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
new file mode 100644
index 0000000000000..a28b791cf23d4
--- /dev/null
+++ b/ports/webassembly/objjsproxy.c
@@ -0,0 +1,330 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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 <stdlib.h>
+
+#include "emscripten.h"
+#include "py/objmodule.h"
+#include "py/runtime.h"
+#include "proxy_c.h"
+
+// *FORMAT-OFF*
+EM_JS(bool, lookup_attr, (int jsref, const char *str, uint32_t * out), {
+    const base = proxy_js_ref[jsref];
+    const attr = UTF8ToString(str);
+    if (attr in base) {
+        let value = base[attr];
+        if (typeof value == "function") {
+            if (base !== globalThis) {
+                value = value.bind(base);
+            }
+        }
+        proxy_convert_js_to_mp_obj_jsside(value, out);
+        return true;
+    } else {
+        return false;
+    }
+});
+// *FORMAT-ON*
+
+EM_JS(void, store_attr, (int jsref, const char *attr_ptr, uint32_t * value_ref), {
+    const attr = UTF8ToString(attr_ptr);
+    const value = proxy_convert_mp_to_js_obj_jsside(value_ref);
+    proxy_js_ref[jsref][attr] = value;
+});
+
+EM_JS(void, call0, (int f_ref, uint32_t * out), {
+    // Because of JavaScript "this" semantics, we must extract the target function
+    // to a variable before calling it, so "this" is bound to the correct value.
+    //
+    // In detail:
+    // In JavaScript, proxy_js_ref[f_ref] acts like a function call
+    // proxy_js_ref.at(f_ref), and "this" will be bound to proxy_js_ref if
+    // there is a chain of calls, such as proxy_js_ref.at(f_ref)().
+    // But proxy_js_ref is not "this" in the context of the call, so we
+    // must extract the function to an independent variable and then call
+    // that variable, so that "this" is correct (it will be "undefined").
+
+    const f = proxy_js_ref[f_ref];
+    const ret = f();
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(int, call1, (int f_ref, uint32_t * a0, uint32_t * out), {
+    const a0_js = proxy_convert_mp_to_js_obj_jsside(a0);
+    const f = proxy_js_ref[f_ref];
+    const ret = f(a0_js);
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(int, call2, (int f_ref, uint32_t * a0, uint32_t * a1, uint32_t * out), {
+    const a0_js = proxy_convert_mp_to_js_obj_jsside(a0);
+    const a1_js = proxy_convert_mp_to_js_obj_jsside(a1);
+    const f = proxy_js_ref[f_ref];
+    const ret = f(a0_js, a1_js);
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(int, calln, (int f_ref, uint32_t n_args, uint32_t * value, uint32_t * out), {
+    const f = proxy_js_ref[f_ref];
+    const a = [];
+    for (let i = 0; i < n_args; ++i) {
+        const v = proxy_convert_mp_to_js_obj_jsside(value + i * 3 * 4);
+        a.push(v);
+    }
+    const ret = f(... a);
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(void, call0_kwarg, (int f_ref, uint32_t n_kw, uint32_t * key, uint32_t * value, uint32_t * out), {
+    const f = proxy_js_ref[f_ref];
+    const a = {};
+    for (let i = 0; i < n_kw; ++i) {
+        const k = UTF8ToString(getValue(key + i * 4, "i32"));
+        const v = proxy_convert_mp_to_js_obj_jsside(value + i * 3 * 4);
+        a[k] = v;
+    }
+    const ret = f(a);
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(void, call1_kwarg, (int f_ref, uint32_t * arg0, uint32_t n_kw, uint32_t * key, uint32_t * value, uint32_t * out), {
+    const f = proxy_js_ref[f_ref];
+    const a0 = proxy_convert_mp_to_js_obj_jsside(arg0);
+    const a = {};
+    for (let i = 0; i < n_kw; ++i) {
+        const k = UTF8ToString(getValue(key + i * 4, "i32"));
+        const v = proxy_convert_mp_to_js_obj_jsside(value + i * 3 * 4);
+        a[k] = v;
+    }
+    const ret = f(a0, a);
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(void, js_reflect_construct, (int f_ref, uint32_t n_args, uint32_t * args, uint32_t * out), {
+    const f = proxy_js_ref[f_ref];
+    const as = [];
+    for (let i = 0; i < n_args; ++i) {
+        as.push(proxy_convert_mp_to_js_obj_jsside(args + i * 4));
+    }
+    const ret = Reflect.construct(f, as);
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(int, js_get_len, (int f_ref), {
+    return proxy_js_ref[f_ref].length;
+});
+
+EM_JS(void, js_subscr_int, (int f_ref, int idx, uint32_t * out), {
+    const f = proxy_js_ref[f_ref];
+    const ret = f[idx];
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(void, js_subscr_load, (int f_ref, uint32_t * index_ref, uint32_t * out), {
+    const target = proxy_js_ref[f_ref];
+    const index = python_index_semantics(target, proxy_convert_mp_to_js_obj_jsside(index_ref));
+    const ret = target[index];
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+
+EM_JS(void, js_subscr_store, (int f_ref, uint32_t * idx, uint32_t * value), {
+    const f = proxy_js_ref[f_ref];
+    f[proxy_convert_mp_to_js_obj_jsside(idx)] = proxy_convert_mp_to_js_obj_jsside(value);
+});
+
+static void jsproxy_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "<JsProxy %d>", self->ref);
+}
+
+static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (n_kw == 0) {
+        mp_arg_check_num(n_args, n_kw, 0, MP_OBJ_FUN_ARGS_MAX, false);
+    } else {
+        mp_arg_check_num(n_args, n_kw, 0, 1, true);
+        uint32_t key[n_kw];
+        uint32_t value[PVN * n_kw];
+        for (int i = 0; i < n_kw; ++i) {
+            key[i] = (uintptr_t)mp_obj_str_get_str(args[n_args + i * 2]);
+            proxy_convert_mp_to_js_obj_cside(args[n_args + i * 2 + 1], &value[i * PVN]);
+        }
+        uint32_t out[3];
+        if (n_args == 0) {
+            call0_kwarg(self->ref, n_kw, key, value, out);
+        } else {
+            // n_args == 1
+            uint32_t arg0[PVN];
+            proxy_convert_mp_to_js_obj_cside(args[0], arg0);
+            call1_kwarg(self->ref, arg0, n_kw, key, value, out);
+        }
+        return proxy_convert_js_to_mp_obj_cside(out);
+    }
+
+    if (n_args == 0) {
+        uint32_t out[3];
+        call0(self->ref, out);
+        return proxy_convert_js_to_mp_obj_cside(out);
+    } else if (n_args == 1) {
+        uint32_t arg0[PVN];
+        uint32_t out[PVN];
+        proxy_convert_mp_to_js_obj_cside(args[0], arg0);
+        call1(self->ref, arg0, out);
+        return proxy_convert_js_to_mp_obj_cside(out);
+    } else if (n_args == 2) {
+        uint32_t arg0[PVN];
+        proxy_convert_mp_to_js_obj_cside(args[0], arg0);
+        uint32_t arg1[PVN];
+        proxy_convert_mp_to_js_obj_cside(args[1], arg1);
+        uint32_t out[3];
+        call2(self->ref, arg0, arg1, out);
+        return proxy_convert_js_to_mp_obj_cside(out);
+    } else {
+        uint32_t value[PVN * n_args];
+        for (int i = 0; i < n_args; ++i) {
+            proxy_convert_mp_to_js_obj_cside(args[i], &value[i * PVN]);
+        }
+        uint32_t out[3];
+        calln(self->ref, n_args, value, out);
+        return proxy_convert_js_to_mp_obj_cside(out);
+    }
+}
+
+static mp_obj_t jsproxy_reflect_construct(size_t n_args, const mp_obj_t *args) {
+    int arg0 = mp_obj_jsproxy_get_ref(args[0]);
+    n_args -= 1;
+    args += 1;
+    uint32_t args_conv[n_args];
+    for (unsigned int i = 0; i < n_args; ++i) {
+        proxy_convert_mp_to_js_obj_cside(args[i], &args_conv[i * PVN]);
+    }
+    uint32_t out[3];
+    js_reflect_construct(arg0, n_args, args_conv, out);
+    return proxy_convert_js_to_mp_obj_cside(out);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR(jsproxy_reflect_construct_obj, 1, jsproxy_reflect_construct);
+
+static mp_obj_t jsproxy_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
+    if (value == MP_OBJ_SENTINEL) {
+        // Load subscript.
+        uint32_t idx[PVN], out[PVN];
+        proxy_convert_mp_to_js_obj_cside(index, idx);
+        js_subscr_load(self->ref, idx, out);
+        return proxy_convert_js_to_mp_obj_cside(out);
+    } else if (value == MP_OBJ_NULL) {
+        // Delete subscript.
+        return MP_OBJ_NULL; // not supported
+    } else {
+        // Store subscript.
+        uint32_t idx[PVN], val[PVN];
+        proxy_convert_mp_to_js_obj_cside(index, idx);
+        proxy_convert_mp_to_js_obj_cside(value, val);
+        js_subscr_store(self->ref, idx, val);
+        return mp_const_none;
+    }
+}
+
+void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
+    if (dest[0] == MP_OBJ_NULL) {
+        // Load attribute.
+        uint32_t out[PVN];
+        if (lookup_attr(self->ref, qstr_str(attr), out)) {
+            dest[0] = proxy_convert_js_to_mp_obj_cside(out);
+        } else if (attr == MP_QSTR_new) {
+            // Special case to handle construction of JS objects.
+            // JS objects don't have a ".new" attribute, doing "Obj.new" is a Pyodide idiom for "new Obj".
+            // It translates to the JavaScript "Reflect.construct(Obj, Array(...args))".
+            dest[0] = MP_OBJ_FROM_PTR(&jsproxy_reflect_construct_obj);
+            dest[1] = self_in;
+        }
+    } else if (dest[1] == MP_OBJ_NULL) {
+        // Delete attribute.
+    } else {
+        // Store attribute.
+        uint32_t value[PVN];
+        proxy_convert_mp_to_js_obj_cside(dest[1], value);
+        store_attr(self->ref, qstr_str(attr), value);
+        dest[0] = MP_OBJ_NULL;
+    }
+}
+
+/******************************************************************************/
+// jsproxy iterator
+
+typedef struct _jsproxy_it_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    int ref;
+    uint16_t cur;
+    uint16_t len;
+} jsproxy_it_t;
+
+static mp_obj_t jsproxy_it_iternext(mp_obj_t self_in) {
+    jsproxy_it_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->cur < self->len) {
+        uint32_t out[3];
+        js_subscr_int(self->ref, self->cur, out);
+        self->cur += 1;
+        return proxy_convert_js_to_mp_obj_cside(out);
+    } else {
+        return MP_OBJ_STOP_ITERATION;
+    }
+}
+
+static mp_obj_t jsproxy_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
+    assert(sizeof(jsproxy_it_t) <= sizeof(mp_obj_iter_buf_t));
+    jsproxy_it_t *o = (jsproxy_it_t *)iter_buf;
+    o->base.type = &mp_type_polymorph_iter;
+    o->iternext = jsproxy_it_iternext;
+    o->ref = mp_obj_jsproxy_get_ref(o_in);
+    o->cur = 0;
+    o->len = js_get_len(o->ref);
+    return MP_OBJ_FROM_PTR(o);
+}
+
+/******************************************************************************/
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_jsproxy,
+    MP_QSTR_JsProxy,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
+    print, jsproxy_print,
+    call, jsproxy_call,
+    attr, mp_obj_jsproxy_attr,
+    subscr, jsproxy_subscr,
+    iter, jsproxy_getiter
+    );
+
+mp_obj_t mp_obj_new_jsproxy(int ref) {
+    mp_obj_jsproxy_t *o = mp_obj_malloc(mp_obj_jsproxy_t, &mp_type_jsproxy);
+    o->ref = ref;
+    return MP_OBJ_FROM_PTR(o);
+}
diff --git a/ports/webassembly/objpyproxy.js b/ports/webassembly/objpyproxy.js
new file mode 100644
index 0000000000000..52670b66e9542
--- /dev/null
+++ b/ports/webassembly/objpyproxy.js
@@ -0,0 +1,191 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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.
+ */
+
+class PyProxy {
+    constructor(ref) {
+        this._ref = ref;
+    }
+
+    // Convert js_obj -- which is possibly a PyProxy -- to a JavaScript object.
+    static toJs(js_obj) {
+        if (!(js_obj instanceof PyProxy)) {
+            return js_obj;
+        }
+
+        const type = Module.ccall(
+            "proxy_c_to_js_get_type",
+            "number",
+            ["number"],
+            [js_obj._ref],
+        );
+
+        if (type === 1 || type === 2) {
+            // List or tuple.
+            const array_ref = Module._malloc(2 * 4);
+            const item = Module._malloc(3 * 4);
+            Module.ccall(
+                "proxy_c_to_js_get_array",
+                "null",
+                ["number", "pointer"],
+                [js_obj._ref, array_ref],
+            );
+            const len = Module.getValue(array_ref, "i32");
+            const items_ptr = Module.getValue(array_ref + 4, "i32");
+            const js_array = [];
+            for (let i = 0; i < len; ++i) {
+                Module.ccall(
+                    "proxy_convert_mp_to_js_obj_cside",
+                    "null",
+                    ["pointer", "pointer"],
+                    [Module.getValue(items_ptr + i * 4, "i32"), item],
+                );
+                const js_item = proxy_convert_mp_to_js_obj_jsside(item);
+                js_array.push(PyProxy.toJs(js_item));
+            }
+            Module._free(array_ref);
+            Module._free(item);
+            return js_array;
+        }
+
+        if (type === 3) {
+            // Dict.
+            const map_ref = Module._malloc(2 * 4);
+            const item = Module._malloc(3 * 4);
+            Module.ccall(
+                "proxy_c_to_js_get_dict",
+                "null",
+                ["number", "pointer"],
+                [js_obj._ref, map_ref],
+            );
+            const alloc = Module.getValue(map_ref, "i32");
+            const table_ptr = Module.getValue(map_ref + 4, "i32");
+            const js_dict = {};
+            for (let i = 0; i < alloc; ++i) {
+                const mp_key = Module.getValue(table_ptr + i * 8, "i32");
+                if (mp_key > 8) {
+                    // Convert key to JS object.
+                    Module.ccall(
+                        "proxy_convert_mp_to_js_obj_cside",
+                        "null",
+                        ["pointer", "pointer"],
+                        [mp_key, item],
+                    );
+                    const js_key = proxy_convert_mp_to_js_obj_jsside(item);
+
+                    // Convert value to JS object.
+                    const mp_value = Module.getValue(
+                        table_ptr + i * 8 + 4,
+                        "i32",
+                    );
+                    Module.ccall(
+                        "proxy_convert_mp_to_js_obj_cside",
+                        "null",
+                        ["pointer", "pointer"],
+                        [mp_value, item],
+                    );
+                    const js_value = proxy_convert_mp_to_js_obj_jsside(item);
+
+                    // Populate JS dict.
+                    js_dict[js_key] = PyProxy.toJs(js_value);
+                }
+            }
+            Module._free(map_ref);
+            Module._free(item);
+            return js_dict;
+        }
+
+        // Cannot convert to JS, leave as a PyProxy.
+        return js_obj;
+    }
+}
+
+// This handler's goal is to allow minimal introspection
+// of Python references from the JS world/utilities.
+const py_proxy_handler = {
+    isExtensible() {
+        return true;
+    },
+    ownKeys(target) {
+        const value = Module._malloc(3 * 4);
+        Module.ccall(
+            "proxy_c_to_js_dir",
+            "null",
+            ["number", "pointer"],
+            [target._ref, value],
+        );
+        const dir = proxy_convert_mp_to_js_obj_jsside_with_free(value);
+        return PyProxy.toJs(dir).filter((attr) => !attr.startsWith("__"));
+    },
+    getOwnPropertyDescriptor(target, prop) {
+        return {
+            value: target[prop],
+            enumerable: true,
+            writable: true,
+            configurable: true,
+        };
+    },
+    has(target, prop) {
+        return Module.ccall(
+            "proxy_c_to_js_has_attr",
+            "number",
+            ["number", "string"],
+            [target._ref, prop],
+        );
+    },
+    get(target, prop) {
+        if (prop === "_ref") {
+            return target._ref;
+        }
+        const value = Module._malloc(3 * 4);
+        Module.ccall(
+            "proxy_c_to_js_lookup_attr",
+            "number",
+            ["number", "string", "pointer"],
+            [target._ref, prop, value],
+        );
+        return proxy_convert_mp_to_js_obj_jsside_with_free(value);
+    },
+    set(target, prop, value) {
+        const value_conv = Module._malloc(3 * 4);
+        proxy_convert_js_to_mp_obj_jsside(value, value_conv);
+        const ret = Module.ccall(
+            "proxy_c_to_js_store_attr",
+            "number",
+            ["number", "string", "number"],
+            [target._ref, prop, value_conv],
+        );
+        Module._free(value_conv);
+        return ret;
+    },
+    deleteProperty(target, prop) {
+        return Module.ccall(
+            "proxy_c_to_js_delete_attr",
+            "number",
+            ["number", "string"],
+            [target._ref, prop],
+        );
+    },
+};
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
new file mode 100644
index 0000000000000..809dd44ddefd1
--- /dev/null
+++ b/ports/webassembly/proxy_c.c
@@ -0,0 +1,281 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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 <string.h>
+
+#include "py/builtin.h"
+#include "py/runtime.h"
+#include "proxy_c.h"
+
+// These constants should match the constants in proxy_js.js.
+
+enum {
+    PROXY_KIND_MP_EXCEPTION = -1,
+    PROXY_KIND_MP_NULL = 0,
+    PROXY_KIND_MP_NONE = 1,
+    PROXY_KIND_MP_BOOL = 2,
+    PROXY_KIND_MP_INT = 3,
+    PROXY_KIND_MP_FLOAT = 4,
+    PROXY_KIND_MP_STR = 5,
+    PROXY_KIND_MP_CALLABLE = 6,
+    PROXY_KIND_MP_OBJECT = 7,
+    PROXY_KIND_MP_JSPROXY = 8,
+};
+
+enum {
+    PROXY_KIND_JS_NULL = 1,
+    PROXY_KIND_JS_BOOLEAN = 2,
+    PROXY_KIND_JS_INTEGER = 3,
+    PROXY_KIND_JS_DOUBLE = 4,
+    PROXY_KIND_JS_STRING = 5,
+    PROXY_KIND_JS_OBJECT = 6,
+    PROXY_KIND_JS_PYPROXY = 7,
+};
+
+void proxy_c_init(void) {
+    MP_STATE_PORT(proxy_c_ref) = mp_obj_new_list(0, NULL);
+    mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), MP_OBJ_NULL);
+}
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t proxy_c_ref);
+
+static inline mp_obj_t proxy_c_get_obj(uint32_t c_ref) {
+    return ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->items[c_ref];
+}
+
+mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value) {
+    if (value[0] == PROXY_KIND_JS_NULL) {
+        return mp_const_none;
+    } else if (value[0] == PROXY_KIND_JS_BOOLEAN) {
+        return mp_obj_new_bool(value[1]);
+    } else if (value[0] == PROXY_KIND_JS_INTEGER) {
+        return mp_obj_new_int(value[1]);
+    } else if (value[0] == PROXY_KIND_JS_DOUBLE) {
+        return mp_obj_new_float_from_d(*(double *)&value[1]);
+    } else if (value[0] == PROXY_KIND_JS_STRING) {
+        mp_obj_t s = mp_obj_new_str((void *)value[2], value[1]);
+        free((void *)value[2]);
+        return s;
+    } else if (value[0] == PROXY_KIND_JS_PYPROXY) {
+        return proxy_c_get_obj(value[1]);
+    } else {
+        // PROXY_KIND_JS_OBJECT
+        return mp_obj_new_jsproxy(value[1]);
+    }
+}
+
+void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
+    uint32_t kind;
+    if (obj == MP_OBJ_NULL) {
+        kind = PROXY_KIND_MP_NULL;
+    } else if (obj == mp_const_none) {
+        kind = PROXY_KIND_MP_NONE;
+    } else if (mp_obj_is_bool(obj)) {
+        kind = PROXY_KIND_MP_BOOL;
+        out[1] = mp_obj_is_true(obj);
+    } else if (mp_obj_is_int(obj)) {
+        kind = PROXY_KIND_MP_INT;
+        out[1] = mp_obj_get_int_truncated(obj); // TODO support big int
+    } else if (mp_obj_is_float(obj)) {
+        kind = PROXY_KIND_MP_FLOAT;
+        *(double *)&out[1] = mp_obj_get_float(obj);
+    } else if (mp_obj_is_str(obj)) {
+        kind = PROXY_KIND_MP_STR;
+        size_t len;
+        const char *str = mp_obj_str_get_data(obj, &len);
+        out[1] = len;
+        out[2] = (uintptr_t)str;
+    } else if (mp_obj_is_jsproxy(obj)) {
+        kind = PROXY_KIND_MP_JSPROXY;
+        out[1] = mp_obj_jsproxy_get_ref(obj);
+    } else {
+        if (mp_obj_is_callable(obj)) {
+            kind = PROXY_KIND_MP_CALLABLE;
+        } else {
+            kind = PROXY_KIND_MP_OBJECT;
+        }
+        size_t id = ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->len;
+        mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), obj);
+        out[1] = id;
+    }
+    out[0] = kind;
+}
+
+void proxy_convert_mp_to_js_exc_cside(void *exc, uint32_t *out) {
+    out[0] = PROXY_KIND_MP_EXCEPTION;
+    vstr_t vstr;
+    mp_print_t print;
+    vstr_init_print(&vstr, 64, &print);
+    vstr_add_str(&vstr, qstr_str(mp_obj_get_type(MP_OBJ_FROM_PTR(exc))->name));
+    vstr_add_char(&vstr, '\x04');
+    mp_obj_print_exception(&print, MP_OBJ_FROM_PTR(exc));
+    char *s = malloc(vstr_len(&vstr) + 1);
+    memcpy(s, vstr_str(&vstr), vstr_len(&vstr));
+    out[1] = vstr_len(&vstr);
+    out[2] = (uintptr_t)s;
+    vstr_clear(&vstr);
+}
+
+void proxy_c_to_js_call(uint32_t c_ref, uint32_t n_args, uint32_t *args_value, uint32_t *out) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t args[4] = { mp_const_none, mp_const_none, mp_const_none, mp_const_none };
+        for (size_t i = 0; i < n_args; ++i) {
+            args[i] = proxy_convert_js_to_mp_obj_cside(args_value + i * 3);
+        }
+        mp_obj_t obj = proxy_c_get_obj(c_ref);
+        mp_obj_t member = mp_call_function_n_kw(obj, n_args, 0, args);
+        nlr_pop();
+        proxy_convert_mp_to_js_obj_cside(member, out);
+    } else {
+        // uncaught exception
+        proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+    }
+}
+
+void proxy_c_to_js_dir(uint32_t c_ref, uint32_t *out) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t obj = proxy_c_get_obj(c_ref);
+        mp_obj_t dir;
+        if (mp_obj_is_dict_or_ordereddict(obj)) {
+            mp_map_t *map = mp_obj_dict_get_map(obj);
+            dir = mp_obj_new_list(0, NULL);
+            for (size_t i = 0; i < map->alloc; i++) {
+                if (mp_map_slot_is_filled(map, i)) {
+                    mp_obj_list_append(dir, map->table[i].key);
+                }
+            }
+        } else {
+            mp_obj_t args[1] = { obj };
+            dir = mp_builtin_dir_obj.fun.var(1, args);
+        }
+        nlr_pop();
+        return proxy_convert_mp_to_js_obj_cside(dir, out);
+    } else {
+        // uncaught exception
+        return proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+    }
+}
+
+bool proxy_c_to_js_has_attr(uint32_t c_ref, const char *attr_in) {
+    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    qstr attr = qstr_from_str(attr_in);
+    if (mp_obj_is_dict_or_ordereddict(obj)) {
+        mp_map_t *map = mp_obj_dict_get_map(obj);
+        mp_map_elem_t *elem = mp_map_lookup(map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
+        return elem != NULL;
+    } else {
+        mp_obj_t dest[2];
+        mp_load_method_protected(obj, attr, dest, true);
+        if (dest[0] != MP_OBJ_NULL) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void proxy_c_to_js_lookup_attr(uint32_t c_ref, const char *attr_in, uint32_t *out) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t obj = proxy_c_get_obj(c_ref);
+        qstr attr = qstr_from_str(attr_in);
+        mp_obj_t member;
+        if (mp_obj_is_dict_or_ordereddict(obj)) {
+            member = mp_obj_dict_get(obj, MP_OBJ_NEW_QSTR(attr));
+        } else {
+            member = mp_load_attr(obj, attr);
+        }
+        nlr_pop();
+        return proxy_convert_mp_to_js_obj_cside(member, out);
+    } else {
+        // uncaught exception
+        return proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+    }
+}
+
+static bool proxy_c_to_js_store_helper(uint32_t c_ref, const char *attr_in, mp_obj_t value) {
+    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    qstr attr = qstr_from_str(attr_in);
+
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        if (mp_obj_is_dict_or_ordereddict(obj)) {
+            if (value == MP_OBJ_NULL) {
+                mp_obj_dict_delete(obj, MP_OBJ_NEW_QSTR(attr));
+            } else {
+                mp_obj_dict_store(obj, MP_OBJ_NEW_QSTR(attr), value);
+            }
+        } else {
+            mp_store_attr(obj, attr, value);
+        }
+        nlr_pop();
+        return true;
+    } else {
+        // uncaught exception
+        return false;
+    }
+}
+
+bool proxy_c_to_js_store_attr(uint32_t c_ref, const char *attr_in, uint32_t *value_in) {
+    mp_obj_t value = proxy_convert_js_to_mp_obj_cside(value_in);
+    return proxy_c_to_js_store_helper(c_ref, attr_in, value);
+}
+
+bool proxy_c_to_js_delete_attr(uint32_t c_ref, const char *attr_in) {
+    return proxy_c_to_js_store_helper(c_ref, attr_in, MP_OBJ_NULL);
+}
+
+uint32_t proxy_c_to_js_get_type(uint32_t c_ref) {
+    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    const mp_obj_type_t *type = mp_obj_get_type(obj);
+    if (type == &mp_type_tuple) {
+        return 1;
+    } else if (type == &mp_type_list) {
+        return 2;
+    } else if (type == &mp_type_dict) {
+        return 3;
+    } else {
+        return 4;
+    }
+}
+
+void proxy_c_to_js_get_array(uint32_t c_ref, uint32_t *out) {
+    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    size_t len;
+    mp_obj_t *items;
+    mp_obj_get_array(obj, &len, &items);
+    out[0] = len;
+    out[1] = (uintptr_t)items;
+}
+
+void proxy_c_to_js_get_dict(uint32_t c_ref, uint32_t *out) {
+    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    mp_map_t *map = mp_obj_dict_get_map(obj);
+    out[0] = map->alloc;
+    out[1] = (uintptr_t)map->table;
+}
diff --git a/ports/webassembly/proxy_c.h b/ports/webassembly/proxy_c.h
new file mode 100644
index 0000000000000..3e68d2504958c
--- /dev/null
+++ b/ports/webassembly/proxy_c.h
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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_WEBASSEMBLY_PROXY_C_H
+#define MICROPY_INCLUDED_WEBASSEMBLY_PROXY_C_H
+
+#include "py/obj.h"
+
+// proxy value number of items
+#define PVN (3)
+
+typedef struct _mp_obj_jsproxy_t {
+    mp_obj_base_t base;
+    int ref;
+} mp_obj_jsproxy_t;
+
+extern const mp_obj_type_t mp_type_jsproxy;
+
+void proxy_c_init(void);
+mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value);
+void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out);
+void proxy_convert_mp_to_js_exc_cside(void *exc, uint32_t *out);
+
+mp_obj_t mp_obj_new_jsproxy(int ref);
+void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
+
+static inline bool mp_obj_is_jsproxy(mp_obj_t o) {
+    return mp_obj_get_type(o) == &mp_type_jsproxy;
+}
+
+static inline int mp_obj_jsproxy_get_ref(mp_obj_t o) {
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(o);
+    return self->ref;
+}
+
+#endif // MICROPY_INCLUDED_WEBASSEMBLY_PROXY_C_H
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
new file mode 100644
index 0000000000000..1835bdfdfadaa
--- /dev/null
+++ b/ports/webassembly/proxy_js.js
@@ -0,0 +1,222 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023-2024 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.
+ */
+
+// These constants should match the constants in proxy_c.c.
+
+const PROXY_KIND_MP_EXCEPTION = -1;
+const PROXY_KIND_MP_NULL = 0;
+const PROXY_KIND_MP_NONE = 1;
+const PROXY_KIND_MP_BOOL = 2;
+const PROXY_KIND_MP_INT = 3;
+const PROXY_KIND_MP_FLOAT = 4;
+const PROXY_KIND_MP_STR = 5;
+const PROXY_KIND_MP_CALLABLE = 6;
+const PROXY_KIND_MP_OBJECT = 7;
+const PROXY_KIND_MP_JSPROXY = 8;
+
+const PROXY_KIND_JS_NULL = 1;
+const PROXY_KIND_JS_BOOLEAN = 2;
+const PROXY_KIND_JS_INTEGER = 3;
+const PROXY_KIND_JS_DOUBLE = 4;
+const PROXY_KIND_JS_STRING = 5;
+const PROXY_KIND_JS_OBJECT = 6;
+const PROXY_KIND_JS_PYPROXY = 7;
+
+class PythonError extends Error {
+    constructor(exc_type, exc_details) {
+        super(exc_details);
+        this.name = "PythonError";
+        this.type = exc_type;
+    }
+}
+
+function proxy_js_init() {
+    globalThis.proxy_js_ref = [globalThis];
+}
+
+function proxy_call_python(target, argumentsList) {
+    let args = 0;
+
+    // Strip trailing "undefined" arguments.
+    while (
+        argumentsList.length > 0 &&
+        argumentsList[argumentsList.length - 1] === undefined
+    ) {
+        argumentsList.pop();
+    }
+
+    if (argumentsList.length > 0) {
+        // TODO use stackAlloc/stackRestore?
+        args = Module._malloc(argumentsList.length * 3 * 4);
+        for (const i in argumentsList) {
+            proxy_convert_js_to_mp_obj_jsside(
+                argumentsList[i],
+                args + i * 3 * 4,
+            );
+        }
+    }
+    const value = Module._malloc(3 * 4);
+    Module.ccall(
+        "proxy_c_to_js_call",
+        "null",
+        ["number", "number", "number", "pointer"],
+        [target, argumentsList.length, args, value],
+    );
+    if (argumentsList.length > 0) {
+        Module._free(args);
+    }
+    return proxy_convert_mp_to_js_obj_jsside_with_free(value);
+}
+
+function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
+    let kind;
+    if (js_obj === null) {
+        kind = PROXY_KIND_JS_NULL;
+    } else if (typeof js_obj === "boolean") {
+        kind = PROXY_KIND_JS_BOOLEAN;
+        Module.setValue(out + 4, js_obj, "i32");
+    } else if (typeof js_obj === "number") {
+        if (Number.isInteger(js_obj)) {
+            kind = PROXY_KIND_JS_INTEGER;
+            Module.setValue(out + 4, js_obj, "i32");
+        } else {
+            kind = PROXY_KIND_JS_DOUBLE;
+            // double must be stored to an address that's a multiple of 8
+            const temp = (out + 4) & ~7;
+            Module.setValue(temp, js_obj, "double");
+            const double_lo = Module.getValue(temp, "i32");
+            const double_hi = Module.getValue(temp + 4, "i32");
+            Module.setValue(out + 4, double_lo, "i32");
+            Module.setValue(out + 8, double_hi, "i32");
+        }
+    } else if (typeof js_obj === "string") {
+        kind = PROXY_KIND_JS_STRING;
+        const len = Module.lengthBytesUTF8(js_obj);
+        const buf = Module._malloc(len + 1);
+        Module.stringToUTF8(js_obj, buf, len + 1);
+        Module.setValue(out + 4, len, "i32");
+        Module.setValue(out + 8, buf, "i32");
+    } else if (js_obj instanceof PyProxy) {
+        kind = PROXY_KIND_JS_PYPROXY;
+        Module.setValue(out + 4, js_obj._ref, "i32");
+    } else {
+        kind = PROXY_KIND_JS_OBJECT;
+        const id = proxy_js_ref.length;
+        proxy_js_ref[id] = js_obj;
+        Module.setValue(out + 4, id, "i32");
+    }
+    Module.setValue(out + 0, kind, "i32");
+}
+
+function proxy_convert_js_to_mp_obj_jsside_force_double_proxy(js_obj, out) {
+    if (js_obj instanceof PyProxy) {
+        const kind = PROXY_KIND_JS_OBJECT;
+        const id = proxy_js_ref.length;
+        proxy_js_ref[id] = js_obj;
+        Module.setValue(out + 4, id, "i32");
+        Module.setValue(out + 0, kind, "i32");
+    } else {
+        proxy_convert_js_to_mp_obj_jsside(js_obj, out);
+    }
+}
+
+function proxy_convert_mp_to_js_obj_jsside(value) {
+    const kind = Module.getValue(value, "i32");
+    let obj;
+    if (kind === PROXY_KIND_MP_EXCEPTION) {
+        // Exception
+        const str_len = Module.getValue(value + 4, "i32");
+        const str_ptr = Module.getValue(value + 8, "i32");
+        const str = Module.UTF8ToString(str_ptr, str_len);
+        Module._free(str_ptr);
+        const str_split = str.split("\x04");
+        throw new PythonError(str_split[0], str_split[1]);
+    }
+    if (kind === PROXY_KIND_MP_NULL) {
+        // MP_OBJ_NULL
+        throw new Error("NULL object");
+    }
+    if (kind === PROXY_KIND_MP_NONE) {
+        // None
+        obj = null;
+    } else if (kind === PROXY_KIND_MP_BOOL) {
+        // bool
+        obj = Module.getValue(value + 4, "i32") ? true : false;
+    } else if (kind === PROXY_KIND_MP_INT) {
+        // int
+        obj = Module.getValue(value + 4, "i32");
+    } else if (kind === PROXY_KIND_MP_FLOAT) {
+        // float
+        // double must be loaded from an address that's a multiple of 8
+        const temp = (value + 4) & ~7;
+        const double_lo = Module.getValue(value + 4, "i32");
+        const double_hi = Module.getValue(value + 8, "i32");
+        Module.setValue(temp, double_lo, "i32");
+        Module.setValue(temp + 4, double_hi, "i32");
+        obj = Module.getValue(temp, "double");
+    } else if (kind === PROXY_KIND_MP_STR) {
+        // str
+        const str_len = Module.getValue(value + 4, "i32");
+        const str_ptr = Module.getValue(value + 8, "i32");
+        obj = Module.UTF8ToString(str_ptr, str_len);
+    } else if (kind === PROXY_KIND_MP_JSPROXY) {
+        // js proxy
+        const id = Module.getValue(value + 4, "i32");
+        obj = proxy_js_ref[id];
+    } else {
+        // obj
+        const id = Module.getValue(value + 4, "i32");
+        if (kind === PROXY_KIND_MP_CALLABLE) {
+            obj = (...args) => {
+                return proxy_call_python(id, args);
+            };
+        } else {
+            // PROXY_KIND_MP_OBJECT
+            const target = new PyProxy(id);
+            obj = new Proxy(target, py_proxy_handler);
+        }
+    }
+    return obj;
+}
+
+function proxy_convert_mp_to_js_obj_jsside_with_free(value) {
+    const ret = proxy_convert_mp_to_js_obj_jsside(value);
+    Module._free(value);
+    return ret;
+}
+
+function python_index_semantics(target, index_in) {
+    let index = index_in;
+    if (typeof index === "number") {
+        if (index < 0) {
+            index += target.length;
+        }
+        if (index < 0 || index >= target.length) {
+            throw new PythonError("IndexError", "index out of range");
+        }
+    }
+    return index;
+}

From 9b090603a04e69ec710e14f6c8bd93011516c5a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 24 Jun 2023 17:19:05 +1000
Subject: [PATCH 0966/3129] webassembly: Implement runPythonAsync() for
 top-level async code.

With this commit, `interpreter.runPythonAsync(code)` can now be used to run
Python code that uses `await` at the top level.  That will yield up to
JavaScript and produce a thenable, which the JavaScript runtime can then
resume.  Also implemented is the ability for Python code to await on
JavaScript promises/thenables.  For example, outer JavaScript code can
await on `runPythonAsync(code)` which then runs Python code that does
`await js.fetch(url)`.  The entire chain of calls will be suspended until
the fetch completes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile       |   2 +
 ports/webassembly/api.js         |  10 ++
 ports/webassembly/main.c         |   6 ++
 ports/webassembly/mpconfigport.h |   1 +
 ports/webassembly/objjsproxy.c   | 163 ++++++++++++++++++++++++++++++-
 ports/webassembly/objpyproxy.js  |  23 +++++
 ports/webassembly/proxy_c.c      |  83 +++++++++++++++-
 ports/webassembly/proxy_js.js    |  10 +-
 8 files changed, 291 insertions(+), 7 deletions(-)

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index 2a5669392eb41..05e0c1f0f9085 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -47,6 +47,7 @@ CFLAGS += $(INC)
 
 EXPORTED_FUNCTIONS_EXTRA += ,\
 	_mp_js_do_exec,\
+	_mp_js_do_exec_async,\
 	_mp_js_do_import,\
 	_mp_js_register_js_module,\
 	_proxy_c_init,\
@@ -58,6 +59,7 @@ EXPORTED_FUNCTIONS_EXTRA += ,\
 	_proxy_c_to_js_get_type,\
 	_proxy_c_to_js_has_attr,\
 	_proxy_c_to_js_lookup_attr,\
+	_proxy_c_to_js_resume,\
 	_proxy_c_to_js_store_attr,\
 	_proxy_convert_mp_to_js_obj_cside
 
diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index dfe7561768a4f..ec0601c612ade 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -140,6 +140,16 @@ export async function loadMicroPython(options) {
             );
             return proxy_convert_mp_to_js_obj_jsside_with_free(value);
         },
+        runPythonAsync(code) {
+            const value = Module._malloc(3 * 4);
+            Module.ccall(
+                "mp_js_do_exec_async",
+                "number",
+                ["string", "pointer"],
+                [code, value],
+            );
+            return proxy_convert_mp_to_js_obj_jsside_with_free(value);
+        },
     };
 }
 
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index c1c7a88840ec3..5bb4222aaa726 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -169,6 +169,12 @@ void mp_js_do_exec(const char *src, uint32_t *out) {
     }
 }
 
+void mp_js_do_exec_async(const char *src, uint32_t *out) {
+    mp_compile_allow_top_level_await = true;
+    mp_js_do_exec(src, out);
+    mp_compile_allow_top_level_await = false;
+}
+
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 
 // The largest new region that is available to become Python heap.
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index fc7ba2f82d33c..ae5dfa6fa50b8 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -39,6 +39,7 @@
 #endif
 
 #define MICROPY_ALLOC_PATH_MAX      (256)
+#define MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT (1)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_PYSTACK      (1)
diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index a28b791cf23d4..5e2aeb6a36e4b 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -32,6 +32,16 @@
 #include "py/runtime.h"
 #include "proxy_c.h"
 
+EM_JS(bool, has_attr, (int jsref, const char *str), {
+    const base = proxy_js_ref[jsref];
+    const attr = UTF8ToString(str);
+    if (attr in base) {
+        return true;
+    } else {
+        return false;
+    }
+});
+
 // *FORMAT-OFF*
 EM_JS(bool, lookup_attr, (int jsref, const char *str, uint32_t * out), {
     const base = proxy_js_ref[jsref];
@@ -299,19 +309,166 @@ static mp_obj_t jsproxy_it_iternext(mp_obj_t self_in) {
     }
 }
 
-static mp_obj_t jsproxy_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
+static mp_obj_t jsproxy_new_it(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(jsproxy_it_t) <= sizeof(mp_obj_iter_buf_t));
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
     jsproxy_it_t *o = (jsproxy_it_t *)iter_buf;
     o->base.type = &mp_type_polymorph_iter;
     o->iternext = jsproxy_it_iternext;
-    o->ref = mp_obj_jsproxy_get_ref(o_in);
+    o->ref = self->ref;
     o->cur = 0;
-    o->len = js_get_len(o->ref);
+    o->len = js_get_len(self->ref);
+    return MP_OBJ_FROM_PTR(o);
+}
+
+/******************************************************************************/
+// jsproxy generator
+
+enum {
+    JSOBJ_GEN_STATE_WAITING,
+    JSOBJ_GEN_STATE_COMPLETED,
+    JSOBJ_GEN_STATE_EXHAUSTED,
+};
+
+typedef struct _jsproxy_gen_t {
+    mp_obj_base_t base;
+    mp_obj_t thenable;
+    int state;
+} jsproxy_gen_t;
+
+mp_vm_return_kind_t jsproxy_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) {
+    jsproxy_gen_t *self = MP_OBJ_TO_PTR(self_in);
+    switch (self->state) {
+        case JSOBJ_GEN_STATE_WAITING:
+            self->state = JSOBJ_GEN_STATE_COMPLETED;
+            *ret_val = self->thenable;
+            return MP_VM_RETURN_YIELD;
+
+        case JSOBJ_GEN_STATE_COMPLETED:
+            self->state = JSOBJ_GEN_STATE_EXHAUSTED;
+            *ret_val = send_value;
+            return MP_VM_RETURN_NORMAL;
+
+        case JSOBJ_GEN_STATE_EXHAUSTED:
+        default:
+            // Trying to resume an already stopped generator.
+            // This is an optimised "raise StopIteration(None)".
+            *ret_val = mp_const_none;
+            return MP_VM_RETURN_NORMAL;
+    }
+}
+
+static mp_obj_t jsproxy_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 (jsproxy_gen_resume(self_in, send_value, throw_value, &ret)) {
+        case MP_VM_RETURN_NORMAL:
+        default:
+            // 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 {
+                return mp_make_stop_iteration(ret);
+            }
+
+        case MP_VM_RETURN_YIELD:
+            return ret;
+
+        case MP_VM_RETURN_EXCEPTION:
+            nlr_raise(ret);
+    }
+}
+
+static mp_obj_t jsproxy_gen_instance_iternext(mp_obj_t self_in) {
+    return jsproxy_gen_resume_and_raise(self_in, mp_const_none, MP_OBJ_NULL, false);
+}
+
+static mp_obj_t jsproxy_gen_instance_send(mp_obj_t self_in, mp_obj_t send_value) {
+    return jsproxy_gen_resume_and_raise(self_in, send_value, MP_OBJ_NULL, true);
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(jsproxy_gen_instance_send_obj, jsproxy_gen_instance_send);
+
+static mp_obj_t jsproxy_gen_instance_throw(size_t n_args, const mp_obj_t *args) {
+    // The signature of this function is: throw(type[, value[, traceback]])
+    // CPython will pass all given arguments through the call chain and process them
+    // at the point they are used (native generators will handle them differently to
+    // user-defined generators with a throw() method).  To save passing multiple
+    // values, MicroPython instead does partial processing here to reduce it down to
+    // one argument and passes that through:
+    // - if only args[1] is given, or args[2] is given but is None, args[1] is
+    //   passed through (in the standard case it is an exception class or instance)
+    // - if args[2] is given and not None it is passed through (in the standard
+    //   case it would be an exception instance and args[1] its corresponding class)
+    // - args[3] is always ignored
+
+    mp_obj_t exc = args[1];
+    if (n_args > 2 && args[2] != mp_const_none) {
+        exc = args[2];
+    }
+
+    return jsproxy_gen_resume_and_raise(args[0], mp_const_none, exc, true);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(jsproxy_gen_instance_throw_obj, 2, 4, jsproxy_gen_instance_throw);
+
+static mp_obj_t jsproxy_gen_instance_close(mp_obj_t self_in) {
+    mp_obj_t ret;
+    switch (jsproxy_gen_resume(self_in, mp_const_none, MP_OBJ_FROM_PTR(&mp_const_GeneratorExit_obj), &ret)) {
+        case MP_VM_RETURN_YIELD:
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("generator ignored GeneratorExit"));
+
+        // Swallow GeneratorExit (== successful close), and re-raise any other
+        case MP_VM_RETURN_EXCEPTION:
+            // ret should always be an instance of an exception class
+            if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(ret)), MP_OBJ_FROM_PTR(&mp_type_GeneratorExit))) {
+                return mp_const_none;
+            }
+            nlr_raise(ret);
+
+        default:
+            // The only choice left is MP_VM_RETURN_NORMAL which is successful close
+            return mp_const_none;
+    }
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(jsproxy_gen_instance_close_obj, jsproxy_gen_instance_close);
+
+static const mp_rom_map_elem_t jsproxy_gen_instance_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&jsproxy_gen_instance_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&jsproxy_gen_instance_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_throw), MP_ROM_PTR(&jsproxy_gen_instance_throw_obj) },
+};
+static MP_DEFINE_CONST_DICT(jsproxy_gen_instance_locals_dict, jsproxy_gen_instance_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_jsproxy_gen,
+    MP_QSTR_generator,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
+    iter, jsproxy_gen_instance_iternext,
+    locals_dict, &jsproxy_gen_instance_locals_dict
+    );
+
+static mp_obj_t jsproxy_new_gen(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
+    assert(sizeof(jsproxy_gen_t) <= sizeof(mp_obj_iter_buf_t));
+    jsproxy_gen_t *o = (jsproxy_gen_t *)iter_buf;
+    o->base.type = &mp_type_jsproxy_gen;
+    o->thenable = self_in;
+    o->state = JSOBJ_GEN_STATE_WAITING;
     return MP_OBJ_FROM_PTR(o);
 }
 
 /******************************************************************************/
 
+static mp_obj_t jsproxy_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
+    if (has_attr(self->ref, "then")) {
+        return jsproxy_new_gen(self_in, iter_buf);
+    } else {
+        return jsproxy_new_it(self_in, iter_buf);
+    }
+}
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_jsproxy,
     MP_QSTR_JsProxy,
diff --git a/ports/webassembly/objpyproxy.js b/ports/webassembly/objpyproxy.js
index 52670b66e9542..9ba06283ea2b0 100644
--- a/ports/webassembly/objpyproxy.js
+++ b/ports/webassembly/objpyproxy.js
@@ -159,6 +159,9 @@ const py_proxy_handler = {
         if (prop === "_ref") {
             return target._ref;
         }
+        if (prop === "then") {
+            return null;
+        }
         const value = Module._malloc(3 * 4);
         Module.ccall(
             "proxy_c_to_js_lookup_attr",
@@ -189,3 +192,23 @@ const py_proxy_handler = {
         );
     },
 };
+
+// PyProxy of a Python generator, that implements the thenable interface.
+class PyProxyThenable {
+    constructor(ref) {
+        this._ref = ref;
+    }
+
+    then(resolve, reject) {
+        const values = Module._malloc(3 * 3 * 4);
+        proxy_convert_js_to_mp_obj_jsside(resolve, values + 3 * 4);
+        proxy_convert_js_to_mp_obj_jsside(reject, values + 2 * 3 * 4);
+        Module.ccall(
+            "proxy_c_to_js_resume",
+            "null",
+            ["number", "pointer"],
+            [this._ref, values],
+        );
+        return proxy_convert_mp_to_js_obj_jsside_with_free(values);
+    }
+}
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 809dd44ddefd1..1e4573ce0ba55 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "emscripten.h"
 #include "py/builtin.h"
 #include "py/runtime.h"
 #include "proxy_c.h"
@@ -42,8 +43,9 @@ enum {
     PROXY_KIND_MP_FLOAT = 4,
     PROXY_KIND_MP_STR = 5,
     PROXY_KIND_MP_CALLABLE = 6,
-    PROXY_KIND_MP_OBJECT = 7,
-    PROXY_KIND_MP_JSPROXY = 8,
+    PROXY_KIND_MP_GENERATOR = 7,
+    PROXY_KIND_MP_OBJECT = 8,
+    PROXY_KIND_MP_JSPROXY = 9,
 };
 
 enum {
@@ -115,6 +117,8 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
     } else {
         if (mp_obj_is_callable(obj)) {
             kind = PROXY_KIND_MP_CALLABLE;
+        } else if (mp_obj_is_type(obj, &mp_type_gen_instance)) {
+            kind = PROXY_KIND_MP_GENERATOR;
         } else {
             kind = PROXY_KIND_MP_OBJECT;
         }
@@ -279,3 +283,78 @@ void proxy_c_to_js_get_dict(uint32_t c_ref, uint32_t *out) {
     out[0] = map->alloc;
     out[1] = (uintptr_t)map->table;
 }
+
+/******************************************************************************/
+// Bridge Python generator to JavaScript thenable.
+
+static const mp_obj_fun_builtin_var_t resume_obj;
+
+EM_JS(void, js_then_resolve, (uint32_t * resolve, uint32_t * reject), {
+    const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
+    const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
+    resolve_js(null);
+});
+
+EM_JS(void, js_then_reject, (uint32_t * resolve, uint32_t * reject), {
+    const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
+    const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
+    reject_js(null);
+});
+
+// *FORMAT-OFF*
+EM_JS(void, js_then_continue, (int jsref, uint32_t * py_resume, uint32_t * resolve, uint32_t * reject, uint32_t * out), {
+    const py_resume_js = proxy_convert_mp_to_js_obj_jsside(py_resume);
+    const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
+    const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
+    const ret = proxy_js_ref[jsref].then((x) => {py_resume_js(x, resolve_js, reject_js);}, reject_js);
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+// *FORMAT-ON*
+
+static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t value, mp_obj_t resolve, mp_obj_t reject) {
+    mp_obj_t ret_value;
+    mp_vm_return_kind_t ret_kind = mp_resume(self_in, value, MP_OBJ_NULL, &ret_value);
+
+    uint32_t out_resolve[PVN];
+    uint32_t out_reject[PVN];
+    proxy_convert_mp_to_js_obj_cside(resolve, out_resolve);
+    proxy_convert_mp_to_js_obj_cside(reject, out_reject);
+
+    if (ret_kind == MP_VM_RETURN_NORMAL) {
+        js_then_resolve(out_resolve, out_reject);
+        return mp_const_none;
+    } else if (ret_kind == MP_VM_RETURN_YIELD) {
+        // ret_value should be a JS thenable
+        mp_obj_t py_resume = mp_obj_new_bound_meth(MP_OBJ_FROM_PTR(&resume_obj), self_in);
+        int ref = mp_obj_jsproxy_get_ref(ret_value);
+        uint32_t out_py_resume[PVN];
+        proxy_convert_mp_to_js_obj_cside(py_resume, out_py_resume);
+        uint32_t out[PVN];
+        js_then_continue(ref, out_py_resume, out_resolve, out_reject, out);
+        return proxy_convert_js_to_mp_obj_cside(out);
+    } else {
+        // MP_VM_RETURN_EXCEPTION;
+        js_then_reject(out_resolve, out_reject);
+        nlr_raise(ret_value);
+    }
+}
+
+static mp_obj_t resume_fun(size_t n_args, const mp_obj_t *args) {
+    return proxy_resume_execute(args[0], args[1], args[2], args[3]);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(resume_obj, 4, 4, resume_fun);
+
+void proxy_c_to_js_resume(uint32_t c_ref, uint32_t *args) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t obj = proxy_c_get_obj(c_ref);
+        mp_obj_t resolve = proxy_convert_js_to_mp_obj_cside(args + 1 * 3);
+        mp_obj_t reject = proxy_convert_js_to_mp_obj_cside(args + 2 * 3);
+        mp_obj_t ret = proxy_resume_execute(obj, mp_const_none, resolve, reject);
+        nlr_pop();
+        return proxy_convert_mp_to_js_obj_cside(ret, args);
+    } else {
+        // uncaught exception
+        return proxy_convert_mp_to_js_exc_cside(nlr.ret_val, args);
+    }
+}
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 1835bdfdfadaa..7a0a1bbe8932d 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -34,8 +34,9 @@ const PROXY_KIND_MP_INT = 3;
 const PROXY_KIND_MP_FLOAT = 4;
 const PROXY_KIND_MP_STR = 5;
 const PROXY_KIND_MP_CALLABLE = 6;
-const PROXY_KIND_MP_OBJECT = 7;
-const PROXY_KIND_MP_JSPROXY = 8;
+const PROXY_KIND_MP_GENERATOR = 7;
+const PROXY_KIND_MP_OBJECT = 8;
+const PROXY_KIND_MP_JSPROXY = 9;
 
 const PROXY_KIND_JS_NULL = 1;
 const PROXY_KIND_JS_BOOLEAN = 2;
@@ -122,6 +123,9 @@ function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
     } else if (js_obj instanceof PyProxy) {
         kind = PROXY_KIND_JS_PYPROXY;
         Module.setValue(out + 4, js_obj._ref, "i32");
+    } else if (js_obj instanceof PyProxyThenable) {
+        kind = PROXY_KIND_JS_PYPROXY;
+        Module.setValue(out + 4, js_obj._ref, "i32");
     } else {
         kind = PROXY_KIND_JS_OBJECT;
         const id = proxy_js_ref.length;
@@ -193,6 +197,8 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
             obj = (...args) => {
                 return proxy_call_python(id, args);
             };
+        } else if (kind === PROXY_KIND_MP_GENERATOR) {
+            obj = new PyProxyThenable(id);
         } else {
             // PROXY_KIND_MP_OBJECT
             const target = new PyProxy(id);

From 625b17a410f9e26d6c1ab0b81e475848d70af236 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 Feb 2024 17:46:34 +1100
Subject: [PATCH 0967/3129] webassembly: Implement runCLI() for a Node-based
 CLI.

This allows running MicroPython webassembly from the command line using:

    node micropython.mjs

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/api.js | 92 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index ec0601c612ade..2a5522dfb0d9e 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -154,3 +154,95 @@ export async function loadMicroPython(options) {
 }
 
 globalThis.loadMicroPython = loadMicroPython;
+
+async function runCLI() {
+    const fs = await import("fs");
+    let heap_size = 128 * 1024;
+    let contents = "";
+    let repl = true;
+
+    for (let i = 2; i < process.argv.length; i++) {
+        if (process.argv[i] === "-X" && i < process.argv.length - 1) {
+            if (process.argv[i + 1].includes("heapsize=")) {
+                heap_size = parseInt(process.argv[i + 1].split("heapsize=")[1]);
+                const suffix = process.argv[i + 1].substr(-1).toLowerCase();
+                if (suffix === "k") {
+                    heap_size *= 1024;
+                } else if (suffix === "m") {
+                    heap_size *= 1024 * 1024;
+                }
+                ++i;
+            }
+        } else {
+            contents += fs.readFileSync(process.argv[i], "utf8");
+            repl = false;
+        }
+    }
+
+    if (process.stdin.isTTY === false) {
+        contents = fs.readFileSync(0, "utf8");
+        repl = false;
+    }
+
+    const mp = await loadMicroPython({
+        heapsize: heap_size,
+        stdout: (data) => process.stdout.write(data),
+        linebuffer: false,
+    });
+
+    if (repl) {
+        mp_js_init_repl();
+        process.stdin.setRawMode(true);
+        process.stdin.on("data", (data) => {
+            for (let i = 0; i < data.length; i++) {
+                mp_js_process_char(data[i]).then((result) => {
+                    if (result) {
+                        process.exit();
+                    }
+                });
+            }
+        });
+    } else {
+        try {
+            mp.runPython(contents);
+        } catch (error) {
+            if (error.name === "PythonError") {
+                if (error.type === "SystemExit") {
+                    // SystemExit, this is a valid exception to successfully end a script.
+                } else {
+                    // An unhandled Python exception, print in out.
+                    console.error(error.message);
+                }
+            } else {
+                // A non-Python exception.  Re-raise it.
+                throw error;
+            }
+        }
+    }
+}
+
+// Check if Node is running (equivalent to ENVIRONMENT_IS_NODE).
+if (
+    typeof process === "object" &&
+    typeof process.versions === "object" &&
+    typeof process.versions.node === "string"
+) {
+    // Check if this module is ron from the command line.
+    //
+    // See https://stackoverflow.com/questions/6398196/detect-if-called-through-require-or-directly-by-command-line/66309132#66309132
+    //
+    // Note:
+    // - `resolve()` is used to handle symlinks
+    // - `includes()` is used to handle cases where the file extension was omitted when passed to node
+
+    const path = await import("path");
+    const url = await import("url");
+
+    const pathToThisFile = path.resolve(url.fileURLToPath(import.meta.url));
+    const pathPassedToNode = path.resolve(process.argv[1]);
+    const isThisFileBeingRunViaCLI = pathToThisFile.includes(pathPassedToNode);
+
+    if (isThisFileBeingRunViaCLI) {
+        runCLI();
+    }
+}

From 6ff3e356e2cef310ea5e6481d60163a8138c3d66 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Mar 2024 10:16:52 +1100
Subject: [PATCH 0968/3129] webassembly: Implement replInit() and
 replProcessChar().

This is the JavaScript API for starting and running a REPL.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile   | 11 +++--
 ports/webassembly/api.js     | 25 ++++++++++-
 ports/webassembly/main.c     | 52 ++++------------------
 ports/webassembly/wrapper.js | 85 ------------------------------------
 4 files changed, 38 insertions(+), 135 deletions(-)
 delete mode 100644 ports/webassembly/wrapper.js

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index 05e0c1f0f9085..d0a8aa99243ca 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -34,6 +34,7 @@ include $(TOP)/extmod/extmod.mk
 
 CC = emcc
 LD = emcc
+NODE ?= node
 TERSER ?= npx terser
 
 INC += -I.
@@ -76,9 +77,8 @@ JSFLAGS += -s EXPORTED_FUNCTIONS="\
 	_free,\
 	_malloc,\
 	_mp_js_init,\
-	_mp_js_init_repl,\
-	_mp_js_do_str,\
-	_mp_js_process_char,\
+	_mp_js_repl_init,\
+	_mp_js_repl_process_char,\
 	_mp_hal_get_interrupt_char,\
 	_mp_sched_keyboard_interrupt$(EXPORTED_FUNCTIONS_EXTRA)"
 JSFLAGS += -s EXPORTED_RUNTIME_METHODS="\
@@ -124,7 +124,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 ################################################################################
 # Main targets.
 
-.PHONY: all min test test_min
+.PHONY: all repl min test test_min
 
 all: $(BUILD)/micropython.mjs
 
@@ -136,6 +136,9 @@ $(BUILD)/micropython.mjs: $(OBJ) library.js $(SRC_JS)
 $(BUILD)/micropython.min.mjs: $(BUILD)/micropython.mjs
 	$(TERSER) $< --compress --module -o $@
 
+repl: $(BUILD)/micropython.mjs
+	$(NODE) $<
+
 min: $(BUILD)/micropython.min.mjs
 
 test: $(BUILD)/micropython.mjs $(TOP)/tests/run-tests.py
diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index 2a5522dfb0d9e..7d1832af4f2ba 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -150,6 +150,27 @@ export async function loadMicroPython(options) {
             );
             return proxy_convert_mp_to_js_obj_jsside_with_free(value);
         },
+        replInit() {
+            Module.ccall("mp_js_repl_init", "null", ["null"]);
+        },
+        replProcessChar(chr) {
+            return Module.ccall(
+                "mp_js_repl_process_char",
+                "number",
+                ["number"],
+                [chr],
+            );
+        },
+        // Needed if the GC/asyncify is enabled.
+        async replProcessCharWithAsyncify(chr) {
+            return Module.ccall(
+                "mp_js_repl_process_char",
+                "number",
+                ["number"],
+                [chr],
+                { async: true },
+            );
+        },
     };
 }
 
@@ -191,11 +212,11 @@ async function runCLI() {
     });
 
     if (repl) {
-        mp_js_init_repl();
+        mp.replInit();
         process.stdin.setRawMode(true);
         process.stdin.on("data", (data) => {
             for (let i = 0; i < data.length; i++) {
-                mp_js_process_char(data[i]).then((result) => {
+                mp.replProcessCharWithAsyncify(data[i]).then((result) => {
                     if (result) {
                         process.exit();
                     }
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 5bb4222aaa726..441c6d67e350a 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -44,46 +44,6 @@
 #include "library.h"
 #include "proxy_c.h"
 
-#if MICROPY_ENABLE_COMPILER
-int do_str(const char *src, mp_parse_input_kind_t input_kind) {
-    int ret = 0;
-    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, false);
-        mp_call_function_0(module_fun);
-        nlr_pop();
-    } else {
-        // uncaught exception
-        if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_SystemExit)) {
-            mp_obj_t exit_val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val));
-            if (exit_val != mp_const_none) {
-                mp_int_t int_val;
-                if (mp_obj_get_int_maybe(exit_val, &int_val)) {
-                    ret = int_val & 255;
-                } else {
-                    ret = 1;
-                }
-            }
-        } else {
-            mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
-            ret = 1;
-        }
-    }
-    return ret;
-}
-#endif
-
-int mp_js_do_str(const char *code) {
-    return do_str(code, MP_PARSE_FILE_INPUT);
-}
-
-int mp_js_process_char(int c) {
-    return pyexec_event_repl_process_char(c);
-}
-
 void mp_js_init(int heap_size) {
     #if MICROPY_ENABLE_GC
     char *heap = (char *)malloc(heap_size * sizeof(char));
@@ -111,10 +71,6 @@ void mp_js_init(int heap_size) {
     #endif
 }
 
-void mp_js_init_repl() {
-    pyexec_event_repl_init();
-}
-
 void mp_js_register_js_module(const char *name, uint32_t *value) {
     mp_obj_t module_name = MP_OBJ_NEW_QSTR(qstr_from_str(name));
     mp_obj_t module = proxy_convert_js_to_mp_obj_cside(value);
@@ -175,6 +131,14 @@ void mp_js_do_exec_async(const char *src, uint32_t *out) {
     mp_compile_allow_top_level_await = false;
 }
 
+void mp_js_repl_init(void) {
+    pyexec_event_repl_init();
+}
+
+int mp_js_repl_process_char(int c) {
+    return pyexec_event_repl_process_char(c);
+}
+
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 
 // The largest new region that is available to become Python heap.
diff --git a/ports/webassembly/wrapper.js b/ports/webassembly/wrapper.js
deleted file mode 100644
index 399801b7afcb9..0000000000000
--- a/ports/webassembly/wrapper.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * 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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-var Module = {};
-
-var mainProgram = function()
-{
-  mp_js_init = Module.cwrap('mp_js_init', 'null', ['number']);
-  mp_js_do_str = Module.cwrap('mp_js_do_str', 'number', ['string'], {async: true});
-  mp_js_init_repl = Module.cwrap('mp_js_init_repl', 'null', ['null']);
-  mp_js_process_char = Module.cwrap('mp_js_process_char', 'number', ['number'], {async: true});
-
-  if (typeof window === 'undefined' && require.main === module) {
-      var fs = require('fs');
-      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('heapsize=')) {
-                  heap_size = parseInt(process.argv[i + 1].split('heapsize=')[1]);
-                  if (process.argv[i + 1].substr(-1).toLowerCase() === 'k') {
-                      heap_size *= 1024;
-                  } else if (process.argv[i + 1].substr(-1).toLowerCase() === 'm') {
-                      heap_size *= 1024 * 1024;
-                  }
-              }
-          } else if (process.argv[i].includes('.py')) {
-              contents += fs.readFileSync(process.argv[i], 'utf8');
-              repl = false;;
-          }
-      }
-
-      if (process.stdin.isTTY === false) {
-          contents = fs.readFileSync(0, 'utf8');
-          repl = 0;
-      }
-
-      mp_js_init(heap_size);
-
-      if (repl) {
-          mp_js_init_repl();
-          process.stdin.setRawMode(true);
-          process.stdin.on('data', function (data) {
-              for (var i = 0; i < data.length; i++) {
-                  mp_js_process_char(data[i]).then(result => {
-                      if (result) {
-                          process.exit()
-                      }
-                  })
-              }
-          });
-      } else {
-          mp_js_do_str(contents).then(exitCode => {
-              process.exitCode = exitCode
-          })
-      }
-  }
-}
-
-Module["onRuntimeInitialized"] = mainProgram;

From b9eb74e73b8ad7be7c3d3d2eca2b1755041f03e6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 31 May 2023 11:45:34 +1000
Subject: [PATCH 0969/3129] webassembly/variants/pyscript: Add pyscript
 variant.

This commit adds a pyscript variant for use in https://pyscript.net/.

The configuration is:
- No ASYNCIFY, in order to keep the WASM size down and have good
  performance.
- MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES to enable most features.
- Custom manifest that includes many of the python-stdlib libraries.
- MICROPY_GC_SPLIT_HEAP_AUTO to increase GC heap size instead of doing a
  collection when memory is exhausted.  This is needed because ASYNCIFY is
  disabled.  Instead the GC collection is run at the top-level before
  executing any Python code.
- No MICROPY_VARIANT_ENABLE_JS_HOOK because there is no asynchronous
  keyboard input to interrupt a running script.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../webassembly/variants/pyscript/manifest.py | 27 +++++++++++++++++++
 .../variants/pyscript/mpconfigvariant.h       |  3 +++
 .../variants/pyscript/mpconfigvariant.mk      |  3 +++
 3 files changed, 33 insertions(+)
 create mode 100644 ports/webassembly/variants/pyscript/manifest.py
 create mode 100644 ports/webassembly/variants/pyscript/mpconfigvariant.h
 create mode 100644 ports/webassembly/variants/pyscript/mpconfigvariant.mk

diff --git a/ports/webassembly/variants/pyscript/manifest.py b/ports/webassembly/variants/pyscript/manifest.py
new file mode 100644
index 0000000000000..0646e1d897f0c
--- /dev/null
+++ b/ports/webassembly/variants/pyscript/manifest.py
@@ -0,0 +1,27 @@
+require("abc")
+require("base64")
+require("collections")
+require("collections-defaultdict")
+require("copy")
+require("datetime")
+require("fnmatch")
+require("functools")
+require("gzip")
+require("hmac")
+require("html")
+require("inspect")
+require("io")
+require("itertools")
+require("locale")
+require("logging")
+require("operator")
+require("os")
+require("os-path")
+require("pathlib")
+require("stat")
+require("tarfile")
+require("tarfile-write")
+require("time")
+require("unittest")
+require("uu")
+require("zlib")
diff --git a/ports/webassembly/variants/pyscript/mpconfigvariant.h b/ports/webassembly/variants/pyscript/mpconfigvariant.h
new file mode 100644
index 0000000000000..ed8e812803533
--- /dev/null
+++ b/ports/webassembly/variants/pyscript/mpconfigvariant.h
@@ -0,0 +1,3 @@
+#define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
+#define MICROPY_GC_SPLIT_HEAP                   (1)
+#define MICROPY_GC_SPLIT_HEAP_AUTO              (1)
diff --git a/ports/webassembly/variants/pyscript/mpconfigvariant.mk b/ports/webassembly/variants/pyscript/mpconfigvariant.mk
new file mode 100644
index 0000000000000..016b96a99af0a
--- /dev/null
+++ b/ports/webassembly/variants/pyscript/mpconfigvariant.mk
@@ -0,0 +1,3 @@
+JSFLAGS += -s ALLOW_MEMORY_GROWTH
+
+FROZEN_MANIFEST ?= variants/pyscript/manifest.py

From 26d6969fefa18c1dbbb7bc852588fa00ae253d74 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Mar 2024 10:27:54 +1100
Subject: [PATCH 0970/3129] webassembly: Update README.md to describe latest
 changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/README.md | 147 +++++++++++++++++++++++-------------
 1 file changed, 96 insertions(+), 51 deletions(-)

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index abd2864a56cb3..af395778a748e 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -6,22 +6,22 @@ MicroPython for [WebAssembly](https://webassembly.org/).
 Dependencies
 ------------
 
-Building webassembly port bears the same requirements as the standard
-MicroPython ports with the addition of Emscripten (and uglify-js for the
-minified file).
+Building the webassembly port bears the same requirements as the standard
+MicroPython ports with the addition of Emscripten, and optionally terser for
+the minified file.
 
-The output includes `micropython.js` (a JavaScript wrapper for the
-MicroPython runtime) and `firmware.wasm` (actual MicroPython compiled to
+The output includes `micropython.mjs` (a JavaScript wrapper for the
+MicroPython runtime) and `micropython.wasm` (actual MicroPython compiled to
 WASM).
 
 Build instructions
 ------------------
 
-In order to build micropython.js, run:
+In order to build `micropython.mjs`, run:
 
     $ make
 
-To generate the minified file micropython.min.js, run:
+To generate the minified file `micropython.min.mjs`, run:
 
     $ make min
 
@@ -30,55 +30,90 @@ Running with Node.js
 
 Access the repl with:
 
-    $ node build/micropython.js
+    $ make repl
 
-Stack size may be modified using:
+This is the same as running:
 
-    $ node build/micropython.js -X stack=64K
+    $ node build-standard/micropython.mjs
 
-Where stack size may be represented in Bytes, KiB or MiB.
+The initial MicroPython GC heap size may be modified using:
+
+    $ node build-standard/micropython.mjs -X heapsize=64k
+
+Where stack size may be represented in bytes, or have a `k` or `m` suffix.
 
 MicroPython scripts may be executed using:
 
-    $ node build/micropython.js hello.py
+    $ node build-standard/micropython.mjs hello.py
 
-Alternatively micropython.js may by accessed by other javascript programs in node
+Alternatively `micropython.mjs` may by accessed by other JavaScript programs in node
 using the require command and the general API outlined below. For example:
 
 ```javascript
-var mp_js = require('./build/micropython.js');
+const mp_mjs = await import("micropython.mjs");
+const mp = await mp_mjs.loadMicroPython();
+
+mp.runPython("print('hello world')");
+```
 
-mp_js_init(64 * 1024);
-await mp_js_do_str("print('hello world')\n");
+Or without await notation:
+
+```javascript
+import("micropython.mjs").then((mp_mjs) => {
+    mp_mjs.loadMicroPython().then((mp) => {
+        mp.runPython("print('hello world')");
+    });
+});
 ```
 
 Running with HTML
 -----------------
 
-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:
+The following code demonstrates the simplest way to load `micropython.mjs` in a
+browser, create an interpreter context, and run some Python code:
+
+```html
+<!doctype html>
+<html>
+  <head>
+    <script src="build-standard/micropython.mjs" type="module"></script>
+  </head>
+  <body>
+    <script type="module">
+      const mp = await loadMicroPython();
+      mp.runPython("print('hello world')");
+    </script>
+  </body>
+</html>
+```
+
+The output in the above example will go to the JavaScript console.  It's possible
+to instead capture the output and print it somewhere else, for example in an
+HTML element.  The following example shows how to do this, and also demonstrates
+the use of top-level await and the `js` module:
 
 ```html
 <!doctype html>
 <html>
   <head>
-    <script src="build/micropython.js"></script>
+    <script src="build-standard/micropython.mjs" type="module"></script>
   </head>
   <body>
     <pre id="micropython-stdout"></pre>
-    <script>
-      document.addEventListener("micropython-print", function(e) {
-        let output = document.getElementById("micropython-stdout");
-        output.innerText += new TextDecoder().decode(e.detail);
-      }, false);
-
-      var mp_js_startup = Module["onRuntimeInitialized"];
-      Module["onRuntimeInitialized"] = async function() {
-        mp_js_startup();
-        mp_js_init(64 * 1024);
-        await mp_js_do_str("print('hello world')");
+    <script type="module">
+      const stdoutWriter = (line) => {
+        document.getElementById("micropython-stdout").innerText += line + "\n";
       };
+      const mp = await loadMicroPython({stdout:stdoutWriter});
+      await mp.runPythonAsync(`
+        import js
+        url = "https://api.github.com/users/micropython"
+        print(f"fetching {url}...")
+        res = await js.fetch(url)
+        json = await res.json()
+        for i in dir(json):
+          print(f"{i}: {json[i]}")
+      `);
     </script>
   </body>
 </html>
@@ -98,31 +133,41 @@ Run the test suite using:
 API
 ---
 
-The following functions have been exposed to javascript.
+The following functions have been exposed to JavaScript through the interpreter
+context, created and returned by `loadMicroPython()`.
 
-```
-mp_js_init(stack_size)
-```
+- `PyProxy`: the type of the object that proxies Python objects.
 
-Initialize MicroPython with the given stack size in bytes. This must be
-called before attempting to interact with MicroPython.
+- `FS`: the Emscripten filesystem object.
 
-```
-await mp_js_do_str(code)
-```
+- `globals`: an object exposing the globals from the Python `__main__` module,
+  with methods `get(key)`, `set(key, value)` and `delete(key)`.
 
-Execute the input code. `code` must be a `string`.
+- `registerJsModule(name, module)`: register a JavaScript object as importable
+  from Python with the given name.
 
-```
-mp_js_init_repl()
-```
+- `pyimport`: import a Python module and return it.
 
-Initialize MicroPython repl. Must be called before entering characters into
-the repl.
+- `runPython(code)`: execute Python code and return the result.
 
-```
-await mp_js_process_char(char)
-```
+- `runPythonAsync(code)`: execute Python code and return the result, allowing for
+  top-level await expressions (this call must be await'ed on the JavaScript side).
+
+- `replInit()`: initialise the REPL.
+
+- `replProcessChar(chr)`: process an incoming character at the REPL.
+
+- `replProcessCharWithAsyncify(chr)`: process an incoming character at the REPL,
+  for use when ASYNCIFY is enabled.
+
+Proxying
+--------
+
+A Python `dict` instance is proxied such that:
+
+    for (const key in dict) {
+        print(key, dict[key]);
+    }
 
-Input character into MicroPython repl. `char` must be of type `number`. This
-will execute MicroPython code when necessary.
+works as expected on the JavaScript side and iterates through the keys of the
+Python `dict`.

From c2cf58befcfd54d886fca879f05d8af2368d6cbe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Mar 2024 15:02:41 +1100
Subject: [PATCH 0971/3129] webassembly/library: Fix formatting and style for
 Biome.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/library.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index db5bac2691443..3f6c9cb61f189 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -30,23 +30,33 @@ mergeInto(LibraryManager.library, {
 
     mp_js_ticks_ms: () => Date.now() - MP_JS_EPOCH,
 
-    mp_js_hook: function() {
+    mp_js_hook: () => {
         if (ENVIRONMENT_IS_NODE) {
-            var mp_interrupt_char = Module.ccall('mp_hal_get_interrupt_char', 'number', ['number'], ['null']);
-            var fs = require('fs');
+            const mp_interrupt_char = Module.ccall(
+                "mp_hal_get_interrupt_char",
+                "number",
+                ["number"],
+                ["null"],
+            );
+            const fs = require("fs");
 
-            var buf = Buffer.alloc(1);
+            const buf = Buffer.alloc(1);
             try {
-                var n = fs.readSync(process.stdin.fd, buf, 0, 1);
+                const n = fs.readSync(process.stdin.fd, buf, 0, 1);
                 if (n > 0) {
-                    if (buf[0] == mp_interrupt_char) {
-                        Module.ccall('mp_sched_keyboard_interrupt', 'null', ['null'], ['null']);
+                    if (buf[0] === mp_interrupt_char) {
+                        Module.ccall(
+                            "mp_sched_keyboard_interrupt",
+                            "null",
+                            ["null"],
+                            ["null"],
+                        );
                     } else {
                         process.stdout.write(String.fromCharCode(buf[0]));
                     }
                 }
             } catch (e) {
-                if (e.code === 'EAGAIN') {
+                if (e.code === "EAGAIN") {
                 } else {
                     throw e;
                 }

From e41b571a297bd1682edf6fd98121512bc14ed60d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 Feb 2024 17:40:59 +1100
Subject: [PATCH 0972/3129] tests/run-tests.py: Support running webassembly
 tests via node.

This allows running tests with a .js/.mjs suffix, and also .py tests using
node and the webassembly port.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 70279d379df60..83af61c83d20b 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -308,7 +308,9 @@ def send_get(what):
 
     else:
         # run via pyboard interface
-        had_crash, output_mupy = run_script_on_remote_target(pyb, args, test_file, is_special)
+        had_crash, output_mupy = pyb.run_script_on_remote_target(
+            args, test_file_abspath, 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")
@@ -393,6 +395,51 @@ def value(self):
         return self._value
 
 
+class PyboardNodeRunner:
+    def __init__(self):
+        mjs = os.getenv("MICROPY_MICROPYTHON_MJS")
+        if mjs is None:
+            mjs = base_path("../ports/webassembly/build-standard/micropython.mjs")
+        else:
+            mjs = os.path.abspath(mjs)
+        self.micropython_mjs = mjs
+
+    def close(self):
+        pass
+
+    def run_script_on_remote_target(self, args, test_file, is_special):
+        cwd = os.path.dirname(test_file)
+
+        # Create system command list.
+        cmdlist = ["node"]
+        if test_file.endswith(".py"):
+            # Run a Python script indirectly via "node micropython.mjs <script.py>".
+            cmdlist.append(self.micropython_mjs)
+            if args.heapsize is not None:
+                cmdlist.extend(["-X", "heapsize=" + args.heapsize])
+            cmdlist.append(test_file)
+        else:
+            # Run a js/mjs script directly with Node, passing in the path to micropython.mjs.
+            cmdlist.append(test_file)
+            cmdlist.append(self.micropython_mjs)
+
+        # Run the script.
+        try:
+            had_crash = False
+            output_mupy = subprocess.check_output(
+                cmdlist, stderr=subprocess.STDOUT, timeout=TEST_TIMEOUT, cwd=cwd
+            )
+        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"
+
+        # Return the results.
+        return had_crash, output_mupy
+
+
 def run_tests(pyb, tests, args, result_dir, num_threads=1):
     test_count = ThreadSafeCounter()
     testcase_count = ThreadSafeCounter()
@@ -631,6 +678,20 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             )  # 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
+        elif args.target == "webassembly":
+            skip_tests.add("basics/string_format_modulo.py")  # can't print nulls to stdout
+            skip_tests.add("basics/string_strip.py")  # can't print nulls to stdout
+            skip_tests.add("extmod/binascii_a2b_base64.py")
+            skip_tests.add("extmod/re_stack_overflow.py")
+            skip_tests.add("extmod/time_res.py")
+            skip_tests.add("extmod/vfs_posix.py")
+            skip_tests.add("extmod/vfs_posix_enoent.py")
+            skip_tests.add("extmod/vfs_posix_paths.py")
+            skip_tests.add("extmod/vfs_userfs.py")
+            skip_tests.add("micropython/emg_exc.py")
+            skip_tests.add("micropython/extreme_exc.py")
+            skip_tests.add("micropython/heapalloc_exc_compressed_emg_exc.py")
+            skip_tests.add("micropython/import_mpy_invalid.py")
 
     # Some tests are known to fail on 64-bit machines
     if pyb is None and platform.architecture()[0] == "64bit":
@@ -977,6 +1038,7 @@ def main():
     LOCAL_TARGETS = (
         "unix",
         "qemu-arm",
+        "webassembly",
     )
     EXTERNAL_TARGETS = (
         "pyboard",
@@ -997,6 +1059,8 @@ def main():
                 args.mpy_cross_flags = "-march=host"
             elif args.target == "qemu-arm":
                 args.mpy_cross_flags = "-march=armv7m"
+        if args.target == "webassembly":
+            pyb = PyboardNodeRunner()
     elif args.target in EXTERNAL_TARGETS:
         global pyboard
         sys.path.append(base_path("../tools"))
@@ -1015,6 +1079,7 @@ def main():
                 args.mpy_cross_flags = "-march=armv7m"
 
         pyb = pyboard.Pyboard(args.device, args.baudrate, args.user, args.password)
+        pyboard.Pyboard.run_script_on_remote_target = run_script_on_remote_target
         pyb.enter_raw_repl()
     else:
         raise ValueError("target must be one of %s" % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
@@ -1032,6 +1097,10 @@ def main():
         else:
             tests = []
     elif len(args.files) == 0:
+        test_extensions = ("*.py",)
+        if args.target == "webassembly":
+            test_extensions += ("*.js", "*.mjs")
+
         if args.test_dirs is None:
             test_dirs = (
                 "basics",
@@ -1072,12 +1141,16 @@ def main():
                     "inlineasm",
                     "ports/qemu-arm",
                 )
+            elif args.target == "webassembly":
+                test_dirs += ("float",)
         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_files in (
+                glob(os.path.join(dir, ext)) for dir in test_dirs for ext in test_extensions
+            )
             for test_file in test_files
         )
     else:

From c1513a078dcde3eba74c4572b62b354aed404e21 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 Feb 2024 17:43:25 +1100
Subject: [PATCH 0973/3129] tests/ports/webassembly: Add webassembly JS tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/webassembly/basic.js              |   8 ++
 tests/ports/webassembly/basic.js.exp          |   3 +
 tests/ports/webassembly/filesystem.mjs        |   9 ++
 tests/ports/webassembly/filesystem.mjs.exp    |   3 +
 tests/ports/webassembly/float.mjs             |  43 +++++++
 tests/ports/webassembly/float.mjs.exp         |  14 +++
 tests/ports/webassembly/fun_call.mjs          |  17 +++
 tests/ports/webassembly/fun_call.mjs.exp      |   7 ++
 tests/ports/webassembly/globals.mjs           |  13 ++
 tests/ports/webassembly/globals.mjs.exp       |   4 +
 tests/ports/webassembly/heap_expand.mjs       |  15 +++
 tests/ports/webassembly/heap_expand.mjs.exp   |  48 ++++++++
 .../ports/webassembly/jsffi_create_proxy.mjs  |  15 +++
 .../webassembly/jsffi_create_proxy.mjs.exp    |   6 +
 tests/ports/webassembly/jsffi_to_js.mjs       |  28 +++++
 tests/ports/webassembly/jsffi_to_js.mjs.exp   |  11 ++
 tests/ports/webassembly/override_new.mjs      |  33 +++++
 tests/ports/webassembly/override_new.mjs.exp  |   7 ++
 .../webassembly/promise_with_resolvers.mjs    |  23 ++++
 .../promise_with_resolvers.mjs.exp            |   1 +
 tests/ports/webassembly/py_proxy_delete.mjs   |  30 +++++
 .../ports/webassembly/py_proxy_delete.mjs.exp |   2 +
 tests/ports/webassembly/py_proxy_dict.mjs     |  34 ++++++
 tests/ports/webassembly/py_proxy_dict.mjs.exp |  11 ++
 tests/ports/webassembly/py_proxy_has.mjs      |  11 ++
 tests/ports/webassembly/py_proxy_has.mjs.exp  |   2 +
 tests/ports/webassembly/py_proxy_own_keys.mjs |  11 ++
 .../webassembly/py_proxy_own_keys.mjs.exp     |   9 ++
 tests/ports/webassembly/py_proxy_set.mjs      |  27 ++++
 tests/ports/webassembly/py_proxy_set.mjs.exp  |   2 +
 tests/ports/webassembly/py_proxy_to_js.mjs    |  20 +++
 .../ports/webassembly/py_proxy_to_js.mjs.exp  |   4 +
 tests/ports/webassembly/register_js_module.js |   6 +
 .../webassembly/register_js_module.js.exp     |   2 +
 tests/ports/webassembly/run_python_async.mjs  | 115 ++++++++++++++++++
 .../webassembly/run_python_async.mjs.exp      |  38 ++++++
 tests/ports/webassembly/run_python_async2.mjs |  42 +++++++
 .../webassembly/run_python_async2.mjs.exp     |   8 ++
 tests/ports/webassembly/this_behaviour.mjs    |  24 ++++
 .../ports/webassembly/this_behaviour.mjs.exp  |   4 +
 tests/ports/webassembly/various.js            |  38 ++++++
 tests/ports/webassembly/various.js.exp        |   8 ++
 tests/run-tests.py                            |   2 +-
 43 files changed, 757 insertions(+), 1 deletion(-)
 create mode 100644 tests/ports/webassembly/basic.js
 create mode 100644 tests/ports/webassembly/basic.js.exp
 create mode 100644 tests/ports/webassembly/filesystem.mjs
 create mode 100644 tests/ports/webassembly/filesystem.mjs.exp
 create mode 100644 tests/ports/webassembly/float.mjs
 create mode 100644 tests/ports/webassembly/float.mjs.exp
 create mode 100644 tests/ports/webassembly/fun_call.mjs
 create mode 100644 tests/ports/webassembly/fun_call.mjs.exp
 create mode 100644 tests/ports/webassembly/globals.mjs
 create mode 100644 tests/ports/webassembly/globals.mjs.exp
 create mode 100644 tests/ports/webassembly/heap_expand.mjs
 create mode 100644 tests/ports/webassembly/heap_expand.mjs.exp
 create mode 100644 tests/ports/webassembly/jsffi_create_proxy.mjs
 create mode 100644 tests/ports/webassembly/jsffi_create_proxy.mjs.exp
 create mode 100644 tests/ports/webassembly/jsffi_to_js.mjs
 create mode 100644 tests/ports/webassembly/jsffi_to_js.mjs.exp
 create mode 100644 tests/ports/webassembly/override_new.mjs
 create mode 100644 tests/ports/webassembly/override_new.mjs.exp
 create mode 100644 tests/ports/webassembly/promise_with_resolvers.mjs
 create mode 100644 tests/ports/webassembly/promise_with_resolvers.mjs.exp
 create mode 100644 tests/ports/webassembly/py_proxy_delete.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_delete.mjs.exp
 create mode 100644 tests/ports/webassembly/py_proxy_dict.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_dict.mjs.exp
 create mode 100644 tests/ports/webassembly/py_proxy_has.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_has.mjs.exp
 create mode 100644 tests/ports/webassembly/py_proxy_own_keys.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_own_keys.mjs.exp
 create mode 100644 tests/ports/webassembly/py_proxy_set.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_set.mjs.exp
 create mode 100644 tests/ports/webassembly/py_proxy_to_js.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_to_js.mjs.exp
 create mode 100644 tests/ports/webassembly/register_js_module.js
 create mode 100644 tests/ports/webassembly/register_js_module.js.exp
 create mode 100644 tests/ports/webassembly/run_python_async.mjs
 create mode 100644 tests/ports/webassembly/run_python_async.mjs.exp
 create mode 100644 tests/ports/webassembly/run_python_async2.mjs
 create mode 100644 tests/ports/webassembly/run_python_async2.mjs.exp
 create mode 100644 tests/ports/webassembly/this_behaviour.mjs
 create mode 100644 tests/ports/webassembly/this_behaviour.mjs.exp
 create mode 100644 tests/ports/webassembly/various.js
 create mode 100644 tests/ports/webassembly/various.js.exp

diff --git a/tests/ports/webassembly/basic.js b/tests/ports/webassembly/basic.js
new file mode 100644
index 0000000000000..19b1881faf5ca
--- /dev/null
+++ b/tests/ports/webassembly/basic.js
@@ -0,0 +1,8 @@
+import(process.argv[2]).then((mp) => {
+    mp.loadMicroPython().then((py) => {
+        py.runPython("1");
+        py.runPython("print('hello')");
+        py.runPython("import sys; print(f'hello from {sys.platform}')");
+        py.runPython("import collections; print(collections.OrderedDict)");
+    });
+});
diff --git a/tests/ports/webassembly/basic.js.exp b/tests/ports/webassembly/basic.js.exp
new file mode 100644
index 0000000000000..6459b2492cf86
--- /dev/null
+++ b/tests/ports/webassembly/basic.js.exp
@@ -0,0 +1,3 @@
+hello
+hello from webassembly
+<class 'OrderedDict'>
diff --git a/tests/ports/webassembly/filesystem.mjs b/tests/ports/webassembly/filesystem.mjs
new file mode 100644
index 0000000000000..e9e2920a16105
--- /dev/null
+++ b/tests/ports/webassembly/filesystem.mjs
@@ -0,0 +1,9 @@
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.FS.mkdir("/lib/");
+mp.FS.writeFile("/lib/testmod.py", "x = 1; print(__name__, x)");
+mp.runPython("import testmod");
+
+mp.runPython("import sys; sys.modules.clear()");
+const testmod = mp.pyimport("testmod");
+console.log("testmod:", testmod, testmod.x);
diff --git a/tests/ports/webassembly/filesystem.mjs.exp b/tests/ports/webassembly/filesystem.mjs.exp
new file mode 100644
index 0000000000000..25a48b10832c5
--- /dev/null
+++ b/tests/ports/webassembly/filesystem.mjs.exp
@@ -0,0 +1,3 @@
+testmod 1
+testmod 1
+testmod: PyProxy { _ref: 3 } 1
diff --git a/tests/ports/webassembly/float.mjs b/tests/ports/webassembly/float.mjs
new file mode 100644
index 0000000000000..53bb8b1c4d0ad
--- /dev/null
+++ b/tests/ports/webassembly/float.mjs
@@ -0,0 +1,43 @@
+// Test passing floats between JavaScript and Python.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.a = 1 / 2;
+globalThis.b = Infinity;
+globalThis.c = NaN;
+
+mp.runPython(`
+import js
+
+# Test retrieving floats from JS.
+print(js.a)
+print(js.b)
+print(js.c)
+
+# Test calling JS which returns a float.
+r = js.Math.random()
+print(type(r), 0 < r < 1)
+
+x = 1 / 2
+y = float("inf")
+z = float("nan")
+
+# Test passing floats to a JS function.
+js.console.log(x)
+js.console.log(x, y)
+js.console.log(x, y, z)
+`);
+
+// Test retrieving floats from Python.
+console.log(mp.globals.get("x"));
+console.log(mp.globals.get("y"));
+console.log(mp.globals.get("z"));
+
+// Test passing floats to a Python function.
+const mp_print = mp.pyimport("builtins").print;
+mp_print(globalThis.a);
+mp_print(globalThis.a, globalThis.b);
+mp_print(globalThis.a, globalThis.b, globalThis.c);
+
+// Test calling Python which returns a float.
+console.log(mp.pyimport("math").sqrt(0.16));
diff --git a/tests/ports/webassembly/float.mjs.exp b/tests/ports/webassembly/float.mjs.exp
new file mode 100644
index 0000000000000..57eff74acd8af
--- /dev/null
+++ b/tests/ports/webassembly/float.mjs.exp
@@ -0,0 +1,14 @@
+0.5
+inf
+nan
+<class 'float'> True
+0.5
+0.5 Infinity
+0.5 Infinity NaN
+0.5
+Infinity
+NaN
+0.5
+0.5 inf
+0.5 inf nan
+0.4
diff --git a/tests/ports/webassembly/fun_call.mjs b/tests/ports/webassembly/fun_call.mjs
new file mode 100644
index 0000000000000..295745d2e2e34
--- /dev/null
+++ b/tests/ports/webassembly/fun_call.mjs
@@ -0,0 +1,17 @@
+// Test calling JavaScript functions from Python.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.f = (a, b, c, d, e) => {
+    console.log(a, b, c, d, e);
+};
+mp.runPython(`
+import js
+js.f()
+js.f(1)
+js.f(1, 2)
+js.f(1, 2, 3)
+js.f(1, 2, 3, 4)
+js.f(1, 2, 3, 4, 5)
+js.f(1, 2, 3, 4, 5, 6)
+`);
diff --git a/tests/ports/webassembly/fun_call.mjs.exp b/tests/ports/webassembly/fun_call.mjs.exp
new file mode 100644
index 0000000000000..e9ed5f6ddf9de
--- /dev/null
+++ b/tests/ports/webassembly/fun_call.mjs.exp
@@ -0,0 +1,7 @@
+undefined undefined undefined undefined undefined
+1 undefined undefined undefined undefined
+1 2 undefined undefined undefined
+1 2 3 undefined undefined
+1 2 3 4 undefined
+1 2 3 4 5
+1 2 3 4 5
diff --git a/tests/ports/webassembly/globals.mjs b/tests/ports/webassembly/globals.mjs
new file mode 100644
index 0000000000000..3d5ecb4167878
--- /dev/null
+++ b/tests/ports/webassembly/globals.mjs
@@ -0,0 +1,13 @@
+// Test accessing Python globals dict via mp.globals.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython("x = 1");
+console.log(mp.globals.get("x"));
+
+mp.globals.set("y", 2);
+mp.runPython("print(y)");
+
+mp.runPython("print('y' in globals())");
+mp.globals.delete("y");
+mp.runPython("print('y' in globals())");
diff --git a/tests/ports/webassembly/globals.mjs.exp b/tests/ports/webassembly/globals.mjs.exp
new file mode 100644
index 0000000000000..a118c13fecba9
--- /dev/null
+++ b/tests/ports/webassembly/globals.mjs.exp
@@ -0,0 +1,4 @@
+1
+2
+True
+False
diff --git a/tests/ports/webassembly/heap_expand.mjs b/tests/ports/webassembly/heap_expand.mjs
new file mode 100644
index 0000000000000..2cf7c07b0b823
--- /dev/null
+++ b/tests/ports/webassembly/heap_expand.mjs
@@ -0,0 +1,15 @@
+// Test expanding the MicroPython GC heap.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+import gc
+bs = []
+for i in range(24):
+    b = bytearray(1 << i)
+    bs.append(b)
+    gc.collect()
+    print(gc.mem_free())
+for b in bs:
+    print(len(b))
+`);
diff --git a/tests/ports/webassembly/heap_expand.mjs.exp b/tests/ports/webassembly/heap_expand.mjs.exp
new file mode 100644
index 0000000000000..ee14908409d86
--- /dev/null
+++ b/tests/ports/webassembly/heap_expand.mjs.exp
@@ -0,0 +1,48 @@
+135241360
+135241328
+135241296
+135241264
+135241216
+135241168
+135241088
+135240944
+135240640
+135240112
+135239072
+135237008
+135232896
+135224688
+135208288
+135175504
+135109888
+134978800
+134716640
+135216848
+136217216
+138218032
+142219616
+150222864
+1
+2
+4
+8
+16
+32
+64
+128
+256
+512
+1024
+2048
+4096
+8192
+16384
+32768
+65536
+131072
+262144
+524288
+1048576
+2097152
+4194304
+8388608
diff --git a/tests/ports/webassembly/jsffi_create_proxy.mjs b/tests/ports/webassembly/jsffi_create_proxy.mjs
new file mode 100644
index 0000000000000..5f04bf44d7e21
--- /dev/null
+++ b/tests/ports/webassembly/jsffi_create_proxy.mjs
@@ -0,0 +1,15 @@
+// Test jsffi.create_proxy().
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+import jsffi
+x = jsffi.create_proxy(1)
+print(x)
+y = jsffi.create_proxy([2])
+print(y)
+`);
+console.log(mp.globals.get("x"));
+console.log(mp.PyProxy.toJs(mp.globals.get("x")));
+console.log(mp.globals.get("y"));
+console.log(mp.PyProxy.toJs(mp.globals.get("y")));
diff --git a/tests/ports/webassembly/jsffi_create_proxy.mjs.exp b/tests/ports/webassembly/jsffi_create_proxy.mjs.exp
new file mode 100644
index 0000000000000..a3b38a78b1132
--- /dev/null
+++ b/tests/ports/webassembly/jsffi_create_proxy.mjs.exp
@@ -0,0 +1,6 @@
+1
+<JsProxy 1>
+1
+1
+PyProxy { _ref: 3 }
+[ 2 ]
diff --git a/tests/ports/webassembly/jsffi_to_js.mjs b/tests/ports/webassembly/jsffi_to_js.mjs
new file mode 100644
index 0000000000000..714af6b629937
--- /dev/null
+++ b/tests/ports/webassembly/jsffi_to_js.mjs
@@ -0,0 +1,28 @@
+// Test jsffi.to_js().
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+import jsffi
+x = jsffi.to_js(1)
+print(x)
+y = jsffi.to_js([2])
+print(y)
+z = jsffi.to_js({"three":3})
+print(z)
+`);
+
+const x = mp.globals.get("x");
+const y = mp.globals.get("y");
+const z = mp.globals.get("z");
+
+console.log(Array.isArray(x));
+console.log(x);
+
+console.log(Array.isArray(y));
+console.log(y);
+console.log(Reflect.ownKeys(y));
+
+console.log(Array.isArray(z));
+console.log(z);
+console.log(Reflect.ownKeys(z));
diff --git a/tests/ports/webassembly/jsffi_to_js.mjs.exp b/tests/ports/webassembly/jsffi_to_js.mjs.exp
new file mode 100644
index 0000000000000..399dd0aa8c9cb
--- /dev/null
+++ b/tests/ports/webassembly/jsffi_to_js.mjs.exp
@@ -0,0 +1,11 @@
+1
+<JsProxy 1>
+<JsProxy 2>
+false
+1
+true
+[ 2 ]
+[ '0', 'length' ]
+false
+{ three: 3 }
+[ 'three' ]
diff --git a/tests/ports/webassembly/override_new.mjs b/tests/ports/webassembly/override_new.mjs
new file mode 100644
index 0000000000000..f5d64d7d11379
--- /dev/null
+++ b/tests/ports/webassembly/override_new.mjs
@@ -0,0 +1,33 @@
+// Test overriding .new() on a JavaScript class.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.MyClass1 = class {
+    new() {
+        console.log("MyClass1 new");
+        return 1;
+    }
+};
+
+globalThis.MyClass2 = class {
+    static new() {
+        console.log("MyClass2 static new");
+        return 2;
+    }
+    new() {
+        console.log("MyClass2 new");
+        return 3;
+    }
+};
+
+globalThis.myClass2Instance = new globalThis.MyClass2();
+
+mp.runPython(`
+    import js
+
+    print(type(js.MyClass1.new()))
+    print(js.MyClass1.new().new())
+
+    print(js.MyClass2.new())
+    print(js.myClass2Instance.new())
+`);
diff --git a/tests/ports/webassembly/override_new.mjs.exp b/tests/ports/webassembly/override_new.mjs.exp
new file mode 100644
index 0000000000000..2efb669714ed4
--- /dev/null
+++ b/tests/ports/webassembly/override_new.mjs.exp
@@ -0,0 +1,7 @@
+<class 'JsProxy'>
+MyClass1 new
+1
+MyClass2 static new
+2
+MyClass2 new
+3
diff --git a/tests/ports/webassembly/promise_with_resolvers.mjs b/tests/ports/webassembly/promise_with_resolvers.mjs
new file mode 100644
index 0000000000000..a2c6d509a6095
--- /dev/null
+++ b/tests/ports/webassembly/promise_with_resolvers.mjs
@@ -0,0 +1,23 @@
+// Test polyfill of a method on a built-in.
+
+// Implement Promise.withResolvers, and make sure it has a unique name so
+// the test below is guaranteed to use this version.
+Promise.withResolversCustom = function withResolversCustom() {
+    let a;
+    let b;
+    const c = new this((resolve, reject) => {
+        a = resolve;
+        b = reject;
+    });
+    return { resolve: a, reject: b, promise: c };
+};
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+    from js import Promise
+
+    deferred = Promise.withResolversCustom()
+    deferred.promise.then(print)
+    deferred.resolve('OK')
+`);
diff --git a/tests/ports/webassembly/promise_with_resolvers.mjs.exp b/tests/ports/webassembly/promise_with_resolvers.mjs.exp
new file mode 100644
index 0000000000000..d86bac9de59ab
--- /dev/null
+++ b/tests/ports/webassembly/promise_with_resolvers.mjs.exp
@@ -0,0 +1 @@
+OK
diff --git a/tests/ports/webassembly/py_proxy_delete.mjs b/tests/ports/webassembly/py_proxy_delete.mjs
new file mode 100644
index 0000000000000..2afea0b9f2221
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_delete.mjs
@@ -0,0 +1,30 @@
+// Test `delete <py-obj>.<attr>` on the JavaScript side, which tests PyProxy.deleteProperty.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+class A:
+    pass
+x = A()
+x.foo = 1
+y = []
+`);
+
+const x = mp.globals.get("x");
+const y = mp.globals.get("y");
+
+// Should pass.
+// biome-ignore lint/performance/noDelete: test delete statement
+delete x.foo;
+
+mp.runPython(`
+print(hasattr(x, "foo"))
+`);
+
+// Should fail, can't delete attributes on MicroPython lists.
+try {
+    // biome-ignore lint/performance/noDelete: test delete statement
+    delete y.sort;
+} catch (error) {
+    console.log(error.message);
+}
diff --git a/tests/ports/webassembly/py_proxy_delete.mjs.exp b/tests/ports/webassembly/py_proxy_delete.mjs.exp
new file mode 100644
index 0000000000000..8eb9ad1501419
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_delete.mjs.exp
@@ -0,0 +1,2 @@
+False
+'deleteProperty' on proxy: trap returned falsish for property 'sort'
diff --git a/tests/ports/webassembly/py_proxy_dict.mjs b/tests/ports/webassembly/py_proxy_dict.mjs
new file mode 100644
index 0000000000000..201f179ef377b
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_dict.mjs
@@ -0,0 +1,34 @@
+// Test passing a Python dict into JavaScript, it should act like a JS object.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+x = {"a": 1, "b": 2}
+`);
+
+const x = mp.globals.get("x");
+
+// Test has, get, keys/iteration.
+console.log("a" in x, "b" in x, "c" in x);
+console.log(x.a, x.b);
+for (const k in x) {
+    console.log(k, x[k]);
+}
+console.log(Object.keys(x));
+console.log(Reflect.ownKeys(x));
+
+// Test set.
+x.c = 3;
+console.log(Object.keys(x));
+
+// Test delete.
+// biome-ignore lint/performance/noDelete: test delete statement
+delete x.b;
+console.log(Object.keys(x));
+
+// Make sure changes on the JavaScript side are reflected in Python.
+mp.runPython(`
+print(x["a"])
+print("b" in x)
+print(x["c"])
+`);
diff --git a/tests/ports/webassembly/py_proxy_dict.mjs.exp b/tests/ports/webassembly/py_proxy_dict.mjs.exp
new file mode 100644
index 0000000000000..f0e15034bd71c
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_dict.mjs.exp
@@ -0,0 +1,11 @@
+true true false
+1 2
+a 1
+b 2
+[ 'a', 'b' ]
+[ 'a', 'b' ]
+[ 'a', 'c', 'b' ]
+[ 'a', 'c' ]
+1
+False
+3
diff --git a/tests/ports/webassembly/py_proxy_has.mjs b/tests/ports/webassembly/py_proxy_has.mjs
new file mode 100644
index 0000000000000..8881776fdbe51
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_has.mjs
@@ -0,0 +1,11 @@
+// Test `<attr> in <py-obj>` on the JavaScript side, which tests PyProxy.has.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+x = []
+`);
+
+const x = mp.globals.get("x");
+console.log("no_exist" in x);
+console.log("sort" in x);
diff --git a/tests/ports/webassembly/py_proxy_has.mjs.exp b/tests/ports/webassembly/py_proxy_has.mjs.exp
new file mode 100644
index 0000000000000..1d474d5255713
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_has.mjs.exp
@@ -0,0 +1,2 @@
+false
+true
diff --git a/tests/ports/webassembly/py_proxy_own_keys.mjs b/tests/ports/webassembly/py_proxy_own_keys.mjs
new file mode 100644
index 0000000000000..bbf5b4f01c056
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_own_keys.mjs
@@ -0,0 +1,11 @@
+// Test `Reflect.ownKeys(<py-obj>)` on the JavaScript side, which tests PyProxy.ownKeys.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+x = []
+y = {"a": 1}
+`);
+
+console.log(Reflect.ownKeys(mp.globals.get("x")));
+console.log(Reflect.ownKeys(mp.globals.get("y")));
diff --git a/tests/ports/webassembly/py_proxy_own_keys.mjs.exp b/tests/ports/webassembly/py_proxy_own_keys.mjs.exp
new file mode 100644
index 0000000000000..313d06d4d75da
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_own_keys.mjs.exp
@@ -0,0 +1,9 @@
+[
+  'append', 'clear',
+  'copy',   'count',
+  'extend', 'index',
+  'insert', 'pop',
+  'remove', 'reverse',
+  'sort'
+]
+[ 'a' ]
diff --git a/tests/ports/webassembly/py_proxy_set.mjs b/tests/ports/webassembly/py_proxy_set.mjs
new file mode 100644
index 0000000000000..30360a847d806
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_set.mjs
@@ -0,0 +1,27 @@
+// Test `<py-obj>.<attr> = <value>` on the JavaScript side, which tests PyProxy.set.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+class A:
+    pass
+x = A()
+y = []
+`);
+
+const x = mp.globals.get("x");
+const y = mp.globals.get("y");
+
+// Should pass.
+x.foo = 1;
+
+mp.runPython(`
+print(x.foo)
+`);
+
+// Should fail, can't set attributes on MicroPython lists.
+try {
+    y.bar = 1;
+} catch (error) {
+    console.log(error.message);
+}
diff --git a/tests/ports/webassembly/py_proxy_set.mjs.exp b/tests/ports/webassembly/py_proxy_set.mjs.exp
new file mode 100644
index 0000000000000..e1d995156341e
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_set.mjs.exp
@@ -0,0 +1,2 @@
+1
+'set' on proxy: trap returned falsish for property 'bar'
diff --git a/tests/ports/webassembly/py_proxy_to_js.mjs b/tests/ports/webassembly/py_proxy_to_js.mjs
new file mode 100644
index 0000000000000..f9fce606f1fdf
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_to_js.mjs
@@ -0,0 +1,20 @@
+// Test PyProxy.toJs().
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+a = 1
+b = (1, 2, 3)
+c = [None, True, 1.2]
+d = {"one": 1, "tuple": b, "list": c}
+`);
+
+const py_a = mp.globals.get("a");
+const py_b = mp.globals.get("b");
+const py_c = mp.globals.get("c");
+const py_d = mp.globals.get("d");
+
+console.log(py_a instanceof mp.PyProxy, mp.PyProxy.toJs(py_a));
+console.log(py_b instanceof mp.PyProxy, mp.PyProxy.toJs(py_b));
+console.log(py_c instanceof mp.PyProxy, mp.PyProxy.toJs(py_c));
+console.log(py_d instanceof mp.PyProxy, mp.PyProxy.toJs(py_d));
diff --git a/tests/ports/webassembly/py_proxy_to_js.mjs.exp b/tests/ports/webassembly/py_proxy_to_js.mjs.exp
new file mode 100644
index 0000000000000..279df7bdfbb84
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_to_js.mjs.exp
@@ -0,0 +1,4 @@
+false 1
+true [ 1, 2, 3 ]
+true [ null, true, 1.2 ]
+true { tuple: [ 1, 2, 3 ], one: 1, list: [ null, true, 1.2 ] }
diff --git a/tests/ports/webassembly/register_js_module.js b/tests/ports/webassembly/register_js_module.js
new file mode 100644
index 0000000000000..b512f2c0dd465
--- /dev/null
+++ b/tests/ports/webassembly/register_js_module.js
@@ -0,0 +1,6 @@
+import(process.argv[2]).then((mp) => {
+    mp.loadMicroPython().then((py) => {
+        py.registerJsModule("js_module", { y: 2 });
+        py.runPython("import js_module; print(js_module); print(js_module.y)");
+    });
+});
diff --git a/tests/ports/webassembly/register_js_module.js.exp b/tests/ports/webassembly/register_js_module.js.exp
new file mode 100644
index 0000000000000..bb45f4ce00285
--- /dev/null
+++ b/tests/ports/webassembly/register_js_module.js.exp
@@ -0,0 +1,2 @@
+<JsProxy 1>
+2
diff --git a/tests/ports/webassembly/run_python_async.mjs b/tests/ports/webassembly/run_python_async.mjs
new file mode 100644
index 0000000000000..44f2a90ab175d
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async.mjs
@@ -0,0 +1,115 @@
+// Test runPythonAsync() and top-level await in Python.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+/**********************************************************/
+// Using only promise objects, no await's.
+
+console.log("= TEST 1 ==========");
+
+globalThis.p = new Promise((resolve, reject) => {
+    resolve(123);
+});
+
+console.log(1);
+
+mp.runPython(`
+import js
+print(js.p)
+print("py 1")
+print(js.p.then(lambda x: print("resolved", x)))
+print("py 2")
+`);
+
+console.log(2);
+
+// Let the promise resolve.
+await globalThis.p;
+
+console.log(3);
+
+/**********************************************************/
+// Using setTimeout to resolve the promise.
+
+console.log("= TEST 2 ==========");
+
+globalThis.p = new Promise((resolve, reject) => {
+    setTimeout(() => {
+        resolve(123);
+        console.log("setTimeout resolved");
+    }, 100);
+});
+
+console.log(1);
+
+mp.runPython(`
+import js
+print(js.p)
+print("py 1")
+print(js.p.then(lambda x: print("resolved", x)))
+print("py 2")
+`);
+
+console.log(2);
+
+// Let the promise resolve.
+await globalThis.p;
+
+console.log(3);
+
+/**********************************************************/
+// Using setTimeout and await within Python.
+
+console.log("= TEST 3 ==========");
+
+globalThis.p = new Promise((resolve, reject) => {
+    setTimeout(() => {
+        resolve(123);
+        console.log("setTimeout resolved");
+    }, 100);
+});
+
+console.log(1);
+
+const ret3 = await mp.runPythonAsync(`
+import js
+print("py 1")
+print("resolved value:", await js.p)
+print("py 2")
+`);
+
+console.log(2, ret3);
+
+/**********************************************************/
+// Multiple setTimeout's and await's within Python.
+
+console.log("= TEST 4 ==========");
+
+globalThis.p1 = new Promise((resolve, reject) => {
+    setTimeout(() => {
+        resolve(123);
+        console.log("setTimeout A resolved");
+    }, 100);
+});
+
+globalThis.p2 = new Promise((resolve, reject) => {
+    setTimeout(() => {
+        resolve(456);
+        console.log("setTimeout B resolved");
+    }, 200);
+});
+
+console.log(1);
+
+const ret4 = await mp.runPythonAsync(`
+import js
+print("py 1")
+print("resolved value:", await js.p1)
+print("py 2")
+print("resolved value:", await js.p1)
+print("py 3")
+print("resolved value:", await js.p2)
+print("py 4")
+`);
+
+console.log(2, ret4);
diff --git a/tests/ports/webassembly/run_python_async.mjs.exp b/tests/ports/webassembly/run_python_async.mjs.exp
new file mode 100644
index 0000000000000..f441bc5cf1db6
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async.mjs.exp
@@ -0,0 +1,38 @@
+= TEST 1 ==========
+1
+<JsProxy 1>
+py 1
+<JsProxy 4>
+py 2
+2
+resolved 123
+3
+= TEST 2 ==========
+1
+<JsProxy 5>
+py 1
+<JsProxy 8>
+py 2
+2
+setTimeout resolved
+resolved 123
+3
+= TEST 3 ==========
+1
+py 1
+setTimeout resolved
+resolved value: 123
+py 2
+2 null
+= TEST 4 ==========
+1
+py 1
+setTimeout A resolved
+resolved value: 123
+py 2
+resolved value: 123
+py 3
+setTimeout B resolved
+resolved value: 456
+py 4
+2 null
diff --git a/tests/ports/webassembly/run_python_async2.mjs b/tests/ports/webassembly/run_python_async2.mjs
new file mode 100644
index 0000000000000..87067e6e8c403
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async2.mjs
@@ -0,0 +1,42 @@
+// Test runPythonAsync() and top-level await in Python, with multi-level awaits.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+// simulate a 2-step resolution of the string "OK".
+await mp.runPythonAsync(`
+import js
+
+def _timeout(resolve, _):
+    js.setTimeout(resolve, 100)
+
+def _fetch():
+    return js.Promise.new(_timeout)
+
+async def _text(promise):
+    if not promise._response:
+        print("_text await start")
+        await promise
+        print("_text awaited end")
+    ret = await promise._response.text()
+    return ret
+
+class _Response:
+    async def text(self):
+        print('_Response.text start')
+        await js.Promise.new(_timeout)
+        print('_Response.text end')
+        return "OK"
+
+def _response(promise):
+    promise._response = _Response()
+    return promise._response
+
+def fetch(url):
+    promise = _fetch().then(lambda *_: _response(promise))
+    promise._response = None
+    promise.text = lambda: _text(promise)
+    return promise
+
+print(await fetch("config.json").text())
+print(await (await fetch("config.json")).text())
+`);
diff --git a/tests/ports/webassembly/run_python_async2.mjs.exp b/tests/ports/webassembly/run_python_async2.mjs.exp
new file mode 100644
index 0000000000000..60d68c5d3b55c
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async2.mjs.exp
@@ -0,0 +1,8 @@
+_text await start
+_text awaited end
+_Response.text start
+_Response.text end
+OK
+_Response.text start
+_Response.text end
+OK
diff --git a/tests/ports/webassembly/this_behaviour.mjs b/tests/ports/webassembly/this_behaviour.mjs
new file mode 100644
index 0000000000000..6411b6ce63485
--- /dev/null
+++ b/tests/ports/webassembly/this_behaviour.mjs
@@ -0,0 +1,24 @@
+// Test "this" behaviour.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+// "this" should be undefined.
+globalThis.func0 = function () {
+    console.log("func0", this);
+};
+mp.runPython("import js; js.func0()");
+
+globalThis.func1 = function (a) {
+    console.log("func1", a, this);
+};
+mp.runPython("import js; js.func1(123)");
+
+globalThis.func2 = function (a, b) {
+    console.log("func2", a, b, this);
+};
+mp.runPython("import js; js.func2(123, 456)");
+
+globalThis.func3 = function (a, b, c) {
+    console.log("func3", a, b, c, this);
+};
+mp.runPython("import js; js.func3(123, 456, 789)");
diff --git a/tests/ports/webassembly/this_behaviour.mjs.exp b/tests/ports/webassembly/this_behaviour.mjs.exp
new file mode 100644
index 0000000000000..4762026ab2027
--- /dev/null
+++ b/tests/ports/webassembly/this_behaviour.mjs.exp
@@ -0,0 +1,4 @@
+func0 undefined
+func1 123 undefined
+func2 123 456 undefined
+func3 123 456 789 undefined
diff --git a/tests/ports/webassembly/various.js b/tests/ports/webassembly/various.js
new file mode 100644
index 0000000000000..e2fa9362c4f3d
--- /dev/null
+++ b/tests/ports/webassembly/various.js
@@ -0,0 +1,38 @@
+import(process.argv[2]).then((mp) => {
+    mp.loadMicroPython().then((py) => {
+        globalThis.jsadd = (x, y) => {
+            return x + y;
+        };
+        py.runPython("import js; print(js); print(js.jsadd(4, 9))");
+
+        py.runPython(
+            "def set_timeout_callback():\n print('set_timeout_callback')",
+        );
+        py.runPython("import js; js.setTimeout(set_timeout_callback, 100)");
+
+        py.runPython("obj = js.Object(a=1)");
+        console.log("main", py.pyimport("__main__").obj);
+
+        console.log("=======");
+        py.runPython(`
+            from js import Array, Promise, Reflect
+
+            def callback(resolve, reject):
+                resolve('OK1')
+
+            p = Reflect.construct(Promise, Array(callback))
+            p.then(print)
+        `);
+
+        console.log("=======");
+        py.runPython(`
+            from js import Promise
+
+            def callback(resolve, reject):
+                resolve('OK2')
+
+            p = Promise.new(callback)
+            p.then(print)
+        `);
+    });
+});
diff --git a/tests/ports/webassembly/various.js.exp b/tests/ports/webassembly/various.js.exp
new file mode 100644
index 0000000000000..502ab2cccf000
--- /dev/null
+++ b/tests/ports/webassembly/various.js.exp
@@ -0,0 +1,8 @@
+<module 'js'>
+13
+main { a: 1 }
+=======
+=======
+OK1
+OK2
+set_timeout_callback
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 83af61c83d20b..4f55cdd39842e 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1142,7 +1142,7 @@ def main():
                     "ports/qemu-arm",
                 )
             elif args.target == "webassembly":
-                test_dirs += ("float",)
+                test_dirs += ("float", "ports/webassembly")
         else:
             # run tests from these directories
             test_dirs = args.test_dirs

From badc0106bdc20e95d427184395c43ffd9d9beea8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Feb 2024 12:03:25 +1100
Subject: [PATCH 0974/3129] tools/ci.sh: Update webassembly CI tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index f94f23893b710..ad5e79c4ad07c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -178,18 +178,19 @@ function ci_esp8266_build {
 # ports/webassembly
 
 function ci_webassembly_setup {
+    npm install terser
     git clone https://github.com/emscripten-core/emsdk.git
     (cd emsdk && ./emsdk install latest && ./emsdk activate latest)
 }
 
 function ci_webassembly_build {
     source emsdk/emsdk_env.sh
-    make ${MAKEOPTS} -C ports/webassembly
+    make ${MAKEOPTS} -C ports/webassembly VARIANT=pyscript submodules
+    make ${MAKEOPTS} -C ports/webassembly VARIANT=pyscript
 }
 
 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/webassembly/node_run.sh ./run-tests.py -j1 basics/builtin_*.py)
+    make -C ports/webassembly VARIANT=pyscript test_min
 }
 
 ########################################################################################

From 35b2edfc240050fc5310093db29927f6226c3157 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Feb 2024 13:00:50 +1100
Subject: [PATCH 0975/3129] github/workflows: Add Biome workflow for JavaScript
 formatting/linting.

Enable Biome on all of webassembly port and tests.

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

diff --git a/.github/workflows/biome.yml b/.github/workflows/biome.yml
new file mode 100644
index 0000000000000..88744f16ca7d6
--- /dev/null
+++ b/.github/workflows/biome.yml
@@ -0,0 +1,16 @@
+name: JavaScript code lint and formatting with Biome
+
+on: [push, pull_request]
+
+jobs:
+  eslint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Biome
+      uses: biomejs/setup-biome@v2
+      with:
+        version: 1.5.3
+    - name: Run Biome
+      run: biome ci --indent-style=space --indent-width=4 tests/ ports/webassembly

From 35f3f0a87db2580041dd0f7dfd4361df48887796 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Mar 2024 15:08:42 +1100
Subject: [PATCH 0976/3129] py/nlr: Add "memory" to asm clobbers list in
 nlr_jump.

Newer versions of gcc (14 and up) have more sophisticated dead-code
detection, and the asm clobbers list needs to contain "memory" to inform
the compiler that the asm code actually does something.

Tested that adding this "memory" line does not change the generated code on
ARM Thumb2, x86-64 and Xtensa targets (using gcc 13.2).

Fixes issue #14115.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/nlraarch64.c | 2 +-
 py/nlrmips.c    | 2 +-
 py/nlrpowerpc.c | 4 ++--
 py/nlrthumb.c   | 2 +-
 py/nlrx64.c     | 2 +-
 py/nlrx86.c     | 2 +-
 py/nlrxtensa.c  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/py/nlraarch64.c b/py/nlraarch64.c
index fcc318f2dc182..d6d87ebc50db8 100644
--- a/py/nlraarch64.c
+++ b/py/nlraarch64.c
@@ -75,7 +75,7 @@ NORETURN void nlr_jump(void *val) {
         "ret                     \n"
         :
         : "r" (top)
-        :
+        : "memory"
         );
 
     MP_UNREACHABLE
diff --git a/py/nlrmips.c b/py/nlrmips.c
index bd5d73b6f767b..cba52b16a266a 100644
--- a/py/nlrmips.c
+++ b/py/nlrmips.c
@@ -78,7 +78,7 @@ NORETURN void nlr_jump(void *val) {
         "nop            \n"
         :
         : "r" (top)
-        :
+        : "memory"
         );
     MP_UNREACHABLE
 }
diff --git a/py/nlrpowerpc.c b/py/nlrpowerpc.c
index 448459216b6e8..8a69fe1eeca6b 100644
--- a/py/nlrpowerpc.c
+++ b/py/nlrpowerpc.c
@@ -114,7 +114,7 @@ NORETURN void nlr_jump(void *val) {
         "blr ;"
         :
         : "r" (&top->regs)
-        :
+        : "memory"
         );
 
     MP_UNREACHABLE;
@@ -203,7 +203,7 @@ NORETURN void nlr_jump(void *val) {
         "blr ;"
         :
         : "r" (&top->regs)
-        :
+        : "memory"
         );
 
     MP_UNREACHABLE;
diff --git a/py/nlrthumb.c b/py/nlrthumb.c
index a8ffecc470335..a22c5df5b9418 100644
--- a/py/nlrthumb.c
+++ b/py/nlrthumb.c
@@ -132,7 +132,7 @@ NORETURN void nlr_jump(void *val) {
         "bx     lr                  \n" // return
         :                           // output operands
         : "r" (top)                 // input operands
-        :                           // clobbered registers
+        : "memory"                  // clobbered registers
         );
 
     MP_UNREACHABLE
diff --git a/py/nlrx64.c b/py/nlrx64.c
index 6b7d0262f5491..d1ad91ff7d718 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -123,7 +123,7 @@ NORETURN void nlr_jump(void *val) {
         "ret                        \n" // return
         :                           // output operands
         : "r" (top)                 // input operands
-        :                           // clobbered registers
+        : "memory"                  // clobbered registers
         );
 
     MP_UNREACHABLE
diff --git a/py/nlrx86.c b/py/nlrx86.c
index f658d41910c8d..085e30d2034a1 100644
--- a/py/nlrx86.c
+++ b/py/nlrx86.c
@@ -95,7 +95,7 @@ NORETURN void nlr_jump(void *val) {
         "ret                        \n" // return
         :                           // output operands
         : "r" (top)                 // input operands
-        :                           // clobbered registers
+        : "memory"                  // clobbered registers
         );
 
     MP_UNREACHABLE
diff --git a/py/nlrxtensa.c b/py/nlrxtensa.c
index abe9042af9f17..ff7af6edeef98 100644
--- a/py/nlrxtensa.c
+++ b/py/nlrxtensa.c
@@ -74,7 +74,7 @@ NORETURN void nlr_jump(void *val) {
         "ret.n                      \n" // return
         :                           // output operands
         : "r" (top)                 // input operands
-        :                           // clobbered registers
+        : "memory"                  // clobbered registers
         );
 
     MP_UNREACHABLE

From a0efe2d368456ec35c32d439d121cf8d7557bbd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 11 Mar 2024 17:32:13 +0100
Subject: [PATCH 0977/3129] esp32/main: Check if main GC heap allocation
 failed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the heap allocation fails we will crash if we continue, so at least we
can show a clear error message so one can figure out memory allocation was
the problem (instead of just seeing some arbitrary null pointer error
later).

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 6fb15d3cc8906..62dd7ae3cccf6 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -116,6 +116,10 @@ void mp_task(void *pvParameter) {
     }
 
     void *mp_task_heap = MP_PLAT_ALLOC_HEAP(MICROPY_GC_INITIAL_HEAP_SIZE);
+    if (mp_task_heap == NULL) {
+        printf("mp_task_heap allocation failed!\n");
+        esp_restart();
+    }
 
 soft_reset:
     // initialise the stack pointer for the main thread

From fcaf10991727bdf125b2b4f21e4557dd4f74d255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Fri, 15 Mar 2024 16:51:18 +0100
Subject: [PATCH 0978/3129] top: Skip codespell for IDF managed components.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During a build the ESP-IDF downloads managed components in the
ports/esp32/managed_components directory, which shouldn't be spellchecked.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 0b3a40d9c95f7..e44afe37e0ebb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,6 +13,7 @@ skip = """
 ./ports/cc3200/hal,\
 ./ports/cc3200/simplelink,\
 ./ports/cc3200/telnet,\
+./ports/esp32/managed_components,\
 ./ports/nrf/drivers/bluetooth/s1*,\
 ./ports/stm32/usbhost,\
 ./tests,\

From 086d4d127d2b85d8e04c73f7f54fc90c0a2e5c57 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Wed, 20 Mar 2024 09:04:49 -0500
Subject: [PATCH 0979/3129] extmod/network_wiznet5k: Properly enable interrupt
 signal on w5100s.

According to the datasheet, the IEN bit to enable the interrupt is in the
MR2 register, not the MR register.

This is just cleanup as the interrupt appears to be enabled by default
after resetting the chip.

Tested on W5100S_EVB_PICO.
---
 extmod/network_wiznet5k.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index b550f8c1f45f2..b8ca075b3d14f 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -221,7 +221,7 @@ static void wiznet5k_init(void) {
         setSn_IMR(0, Sn_IR_RECV);
         #if _WIZCHIP_ == W5100S
         // Enable interrupt pin
-        setMR(MR2_G_IEN);
+        setMR2(getMR2() | MR2_G_IEN);
         #endif
 
         mp_hal_pin_input(wiznet5k_obj.pin_intn);

From 51d05c442afca147d225f99fcec5f66b89b1c525 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Mar 2024 13:36:30 +1100
Subject: [PATCH 0980/3129] tools/manifestfile.py: Fix freeze() when script is
 an empty iterable.

The documentation for `freeze()` says that:
- 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.

This commit makes sure this behaviour is followed when an empty tuple/list
is passed in for `script` (previously an empty tuple/list froze all files).

Fixes issue #14125.

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

diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index c1fc836585fb9..beaa36d0f5fc2 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -291,7 +291,7 @@ def _add_file(self, full_path, target_path, kind=KIND_AUTO, opt=None):
     def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=False):
         base_path = self._resolve_path(base_path)
 
-        if files:
+        if files is not None:
             # Use explicit list of files (relative to package_path).
             for file in files:
                 if package_path:

From d1a3e7d292b63fe4307c3bd417b6df8efe7c6700 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Sun, 26 Nov 2023 17:05:44 +0100
Subject: [PATCH 0981/3129] nrf/Makefile: Allow external board definitions.

Trying to use an external board definition according to
https://github.com/micropython/micropython-example-boards on the nrf port
failed with "Invalid BOARD specified".  Replacing all ocurrences of
"boards/$(BOARD)" with "$(BOARD_DIR)" following the example of
stm32/Makefile fixes that.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 ports/nrf/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 7150aa6399b01..31d0bc7668342 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -9,8 +9,8 @@ BOARD ?= PCA10040
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
-ifeq ($(wildcard boards/$(BOARD)/.),)
-$(error Invalid BOARD specified)
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
 # If SoftDevice is selected, try to use that one.
@@ -19,7 +19,7 @@ SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
 
 # TODO: Verify that it is a valid target.
 
-include boards/$(BOARD)/mpconfigboard.mk
+include $(BOARD_DIR)/mpconfigboard.mk
 
 ifeq ($(SD), )
 	# If the build directory is not given, make it reflect the board name.
@@ -48,7 +48,7 @@ ifneq ($(LD_FILE),)
 	LD_FILES = $(LD_FILE)
 endif
 
--include boards/$(BOARD)/modules/boardmodules.mk
+-include $(BOARD_DIR)/modules/boardmodules.mk
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
@@ -113,7 +113,7 @@ 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
+BOARD_PINS = $(BOARD_DIR)/pins.csv
 AF_FILE = $(MCU_VARIANT)_af.csv
 PREFIX_FILE = boards/$(MCU_VARIANT)_prefix.c
 GEN_PINS_SRC = $(BUILD)/pins_gen.c
@@ -139,7 +139,7 @@ endif
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(INC) -Wall -Werror -ansi -std=c11 -nostdlib $(COPT) $(NRF_DEFINES) $(CFLAGS_EXTRA)
 CFLAGS += -fno-strict-aliasing
-CFLAGS += -Iboards/$(BOARD)
+CFLAGS += -I$(BOARD_DIR)
 CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
 
 LDFLAGS += $(CFLAGS)
@@ -481,7 +481,7 @@ $(OBJ): | $(HEADER_BUILD)/pins.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 $(HEADER_BUILD)/%_af_const.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h: $(BOARD_DIR)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
 	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) --output-af-const $(GEN_PINS_AF_CONST)

From be89d4376b810dcaf5b3d26526f0207b6eb0e570 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Fri, 5 Jan 2024 15:52:09 +0100
Subject: [PATCH 0982/3129] nrf/modules/machine: Enable code formatting.

It destroys a few manual alignments, but these seem minor compared to
the benefit of automated code style consistency.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 ports/nrf/modules/machine/adc.c        | 89 +++++++++++++-------------
 ports/nrf/modules/machine/adc.h        |  2 +-
 ports/nrf/modules/machine/i2c.c        |  5 +-
 ports/nrf/modules/machine/modmachine.c | 20 +++---
 ports/nrf/modules/machine/pin.c        | 20 +++---
 ports/nrf/modules/machine/pin.h        | 46 ++++++-------
 ports/nrf/modules/machine/rtcounter.c  | 38 +++++------
 ports/nrf/modules/machine/soft_pwm.c   |  4 +-
 ports/nrf/modules/machine/spi.c        | 50 +++++++--------
 ports/nrf/modules/machine/spi.h        |  8 +--
 ports/nrf/modules/machine/temp.c       |  4 +-
 ports/nrf/modules/machine/timer.c      | 46 ++++++-------
 ports/nrf/modules/machine/uart.c       | 24 +++----
 tools/codeformat.py                    |  2 -
 14 files changed, 177 insertions(+), 181 deletions(-)

diff --git a/ports/nrf/modules/machine/adc.c b/ports/nrf/modules/machine/adc.c
index c45d0ba5ffdab..9fa8005a22809 100644
--- a/ports/nrf/modules/machine/adc.c
+++ b/ports/nrf/modules/machine/adc.c
@@ -38,14 +38,14 @@
 
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
-    uint8_t       id;
-#if NRF51
-    uint8_t       ain;
-#endif
+    uint8_t id;
+    #if NRF51
+    uint8_t ain;
+    #endif
 } machine_adc_obj_t;
 
 static const machine_adc_obj_t machine_adc_obj[] = {
-#if NRF51
+    #if NRF51
     {{&machine_adc_type}, .id = 0, .ain = NRF_ADC_CONFIG_INPUT_0},
     {{&machine_adc_type}, .id = 1, .ain = NRF_ADC_CONFIG_INPUT_1},
     {{&machine_adc_type}, .id = 2, .ain = NRF_ADC_CONFIG_INPUT_2},
@@ -54,7 +54,7 @@ static const machine_adc_obj_t machine_adc_obj[] = {
     {{&machine_adc_type}, .id = 5, .ain = NRF_ADC_CONFIG_INPUT_5},
     {{&machine_adc_type}, .id = 6, .ain = NRF_ADC_CONFIG_INPUT_6},
     {{&machine_adc_type}, .id = 7, .ain = NRF_ADC_CONFIG_INPUT_7},
-#else
+    #else
     {{&machine_adc_type}, .id = 0},
     {{&machine_adc_type}, .id = 1},
     {{&machine_adc_type}, .id = 2},
@@ -63,14 +63,14 @@ static const machine_adc_obj_t machine_adc_obj[] = {
     {{&machine_adc_type}, .id = 5},
     {{&machine_adc_type}, .id = 6},
     {{&machine_adc_type}, .id = 7},
-#endif
+    #endif
 };
 
 void adc_init0(void) {
-#if defined(NRF52_SERIES)
+    #if defined(NRF52_SERIES)
     const uint8_t interrupt_priority = 6;
     nrfx_saadc_init(interrupt_priority);
-#endif
+    #endif
 }
 
 static int adc_find(mp_obj_t id) {
@@ -124,49 +124,49 @@ static mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
     int adc_id = adc_find(args[ARG_id].u_obj);
     const machine_adc_obj_t *self = &machine_adc_obj[adc_id];
 
-#if defined(NRF52_SERIES)
+    #if defined(NRF52_SERIES)
     const nrfx_saadc_channel_t config = {                                                           \
         .channel_config =
         {
             .resistor_p = NRF_SAADC_RESISTOR_DISABLED,
             .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
-            .gain       = NRF_SAADC_GAIN1_4,
-            .reference  = NRF_SAADC_REFERENCE_VDD4,
-            .acq_time   = NRF_SAADC_ACQTIME_3US,
-            .mode       = NRF_SAADC_MODE_SINGLE_ENDED,
-            .burst      = NRF_SAADC_BURST_DISABLED,
+            .gain = NRF_SAADC_GAIN1_4,
+            .reference = NRF_SAADC_REFERENCE_VDD4,
+            .acq_time = NRF_SAADC_ACQTIME_3US,
+            .mode = NRF_SAADC_MODE_SINGLE_ENDED,
+            .burst = NRF_SAADC_BURST_DISABLED,
         },
-        .pin_p          = (nrf_saadc_input_t)(1 + self->id), // pin_p=0 is AIN0, pin_p=8 is AIN7
-        .pin_n          = NRF_SAADC_INPUT_DISABLED,
-        .channel_index  = self->id,
+        .pin_p = (nrf_saadc_input_t)(1 + self->id),          // pin_p=0 is AIN0, pin_p=8 is AIN7
+        .pin_n = NRF_SAADC_INPUT_DISABLED,
+        .channel_index = self->id,
     };
     nrfx_saadc_channels_config(&config, 1);
-#endif
+    #endif
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-int16_t machine_adc_value_read(machine_adc_obj_t * adc_obj) {
+int16_t machine_adc_value_read(machine_adc_obj_t *adc_obj) {
 
-#if NRF51
+    #if NRF51
     nrf_adc_value_t value = 0;
 
     nrfx_adc_channel_t channel_config = {
         .config.resolution = NRF_ADC_CONFIG_RES_8BIT,
-        .config.input      = NRF_ADC_CONFIG_SCALING_INPUT_TWO_THIRDS,
-        .config.reference  = NRF_ADC_CONFIG_REF_VBG,
-        .config.input      = adc_obj->ain,
-        .config.extref     = ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos // Currently not defined in nrfx/hal.
+        .config.input = NRF_ADC_CONFIG_SCALING_INPUT_TWO_THIRDS,
+        .config.reference = NRF_ADC_CONFIG_REF_VBG,
+        .config.input = adc_obj->ain,
+        .config.extref = ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos     // Currently not defined in nrfx/hal.
     };
 
     nrfx_adc_sample_convert(&channel_config, &value);
-#else // NRF52
+    #else // NRF52
     nrf_saadc_value_t value = 0;
 
     nrfx_saadc_simple_mode_set((1 << adc_obj->id), NRF_SAADC_RESOLUTION_8BIT, NRF_SAADC_INPUT_DISABLED, NULL);
     nrfx_saadc_buffer_set(&value, 1);
     nrfx_saadc_mode_trigger();
-#endif
+    #endif
     return value;
 }
 
@@ -209,10 +209,9 @@ static MP_DEFINE_CONST_FUN_OBJ_1(mp_machine_adc_value_obj, machine_adc_value);
 #define DIODE_VOLT_DROP_MILLIVOLT    (270)  // Voltage drop over diode.
 
 #define BATTERY_MILLIVOLT(VALUE) \
-        ((((VALUE) * ADC_REF_VOLTAGE_IN_MILLIVOLT) / 255) * ADC_PRE_SCALING_MULTIPLIER)
+    ((((VALUE)*ADC_REF_VOLTAGE_IN_MILLIVOLT) / 255) * ADC_PRE_SCALING_MULTIPLIER)
 
-static uint8_t battery_level_in_percent(const uint16_t mvolts)
-{
+static uint8_t battery_level_in_percent(const uint16_t mvolts) {
     uint8_t battery_level;
 
     if (mvolts >= 3000) {
@@ -236,19 +235,19 @@ static uint8_t battery_level_in_percent(const uint16_t mvolts)
 /// Get battery level in percentage.
 mp_obj_t machine_adc_battery_level(void) {
 
-#if NRF51
+    #if NRF51
     nrf_adc_value_t value = 0;
 
     nrfx_adc_channel_t channel_config = {
         .config.resolution = NRF_ADC_CONFIG_RES_8BIT,
-        .config.input      = NRF_ADC_CONFIG_SCALING_SUPPLY_ONE_THIRD,
-        .config.reference  = NRF_ADC_CONFIG_REF_VBG,
-        .config.input      = NRF_ADC_CONFIG_INPUT_DISABLED,
-        .config.extref     = ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos // Currently not defined in nrfx/hal.
+        .config.input = NRF_ADC_CONFIG_SCALING_SUPPLY_ONE_THIRD,
+        .config.reference = NRF_ADC_CONFIG_REF_VBG,
+        .config.input = NRF_ADC_CONFIG_INPUT_DISABLED,
+        .config.extref = ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos     // Currently not defined in nrfx/hal.
     };
 
     nrfx_adc_sample_convert(&channel_config, &value);
-#else // NRF52
+    #else // NRF52
     nrf_saadc_value_t value = 0;
 
     const nrfx_saadc_channel_t config = {                                                           \
@@ -256,22 +255,22 @@ mp_obj_t machine_adc_battery_level(void) {
         {
             .resistor_p = NRF_SAADC_RESISTOR_DISABLED,
             .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
-            .gain       = NRF_SAADC_GAIN1_6,
-            .reference  = NRF_SAADC_REFERENCE_INTERNAL,
-            .acq_time   = NRF_SAADC_ACQTIME_3US,
-            .mode       = NRF_SAADC_MODE_SINGLE_ENDED,
-            .burst      = NRF_SAADC_BURST_DISABLED,
+            .gain = NRF_SAADC_GAIN1_6,
+            .reference = NRF_SAADC_REFERENCE_INTERNAL,
+            .acq_time = NRF_SAADC_ACQTIME_3US,
+            .mode = NRF_SAADC_MODE_SINGLE_ENDED,
+            .burst = NRF_SAADC_BURST_DISABLED,
         },
-        .pin_p          = NRF_SAADC_INPUT_VDD,
-        .pin_n          = NRF_SAADC_INPUT_DISABLED,
-        .channel_index  = 0,
+        .pin_p = NRF_SAADC_INPUT_VDD,
+        .pin_n = NRF_SAADC_INPUT_DISABLED,
+        .channel_index = 0,
     };
     nrfx_saadc_channels_config(&config, 1);
 
     nrfx_saadc_simple_mode_set((1 << 0), NRF_SAADC_RESOLUTION_8BIT, NRF_SAADC_INPUT_DISABLED, NULL);
     nrfx_saadc_buffer_set(&value, 1);
     nrfx_saadc_mode_trigger();
-#endif
+    #endif
 
     uint16_t batt_lvl_in_milli_volts = BATTERY_MILLIVOLT(value) + DIODE_VOLT_DROP_MILLIVOLT;
     uint16_t batt_in_percent = battery_level_in_percent(batt_lvl_in_milli_volts);
diff --git a/ports/nrf/modules/machine/adc.h b/ports/nrf/modules/machine/adc.h
index 84e5cdbb85f3e..9ef1b470447b7 100644
--- a/ports/nrf/modules/machine/adc.h
+++ b/ports/nrf/modules/machine/adc.h
@@ -31,6 +31,6 @@ typedef struct _machine_adc_obj_t machine_adc_obj_t;
 
 void adc_init0(void);
 
-int16_t machine_adc_value_read(machine_adc_obj_t * adc_obj);
+int16_t machine_adc_value_read(machine_adc_obj_t *adc_obj);
 
 #endif // ADC_H__
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 7e488366d70ba..6c2b3e94838e5 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -68,7 +68,7 @@
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
-    nrfx_twi_t    p_twi;  // Driver instance
+    nrfx_twi_t p_twi;     // Driver instance
 } machine_hard_i2c_obj_t;
 
 static const machine_hard_i2c_obj_t machine_hard_i2c_obj[] = {
@@ -159,8 +159,7 @@ int machine_hard_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size
     if (err_code != NRFX_SUCCESS) {
         if (err_code == NRFX_ERROR_DRV_TWI_ERR_ANACK) {
             return -MP_ENODEV;
-        }
-        else if (err_code == NRFX_ERROR_DRV_TWI_ERR_DNACK) {
+        } else if (err_code == NRFX_ERROR_DRV_TWI_ERR_DNACK) {
             return -MP_EIO;
         }
         return -MP_ETIMEDOUT;
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 9ad8d606a2654..de1d0e31246b4 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -116,16 +116,16 @@ void machine_init(void) {
         reset_cause = PYB_RESET_LOCKUP;
     } else if (state & POWER_RESETREAS_OFF_Msk) {
         reset_cause = PYB_RESET_POWER_ON;
-#if !defined(NRF9160_XXAA)
+    #if !defined(NRF9160_XXAA)
     } else if (state & POWER_RESETREAS_LPCOMP_Msk) {
         reset_cause = PYB_RESET_LPCOMP;
-#endif
+    #endif
     } else if (state & POWER_RESETREAS_DIF_Msk) {
         reset_cause = PYB_RESET_DIF;
-#if defined(NRF52_SERIES)
+    #if defined(NRF52_SERIES)
     } else if (state & POWER_RESETREAS_NFC_Msk) {
         reset_cause = PYB_RESET_NFC;
-#endif
+    #endif
     }
 
     // clear reset reason
@@ -216,22 +216,22 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
 }
 
 static mp_obj_t machine_enable_irq(void) {
-#ifndef BLUETOOTH_SD
+    #ifndef BLUETOOTH_SD
     __enable_irq();
-#else
+    #else
 
-#endif
+    #endif
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_enable_irq_obj, machine_enable_irq);
 
 // Resets the board in a manner similar to pushing the external RESET button.
 static mp_obj_t machine_disable_irq(void) {
-#ifndef BLUETOOTH_SD
+    #ifndef BLUETOOTH_SD
     __disable_irq();
-#else
+    #else
 
-#endif
+    #endif
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index e72a16eee7c29..f86d878d17d7e 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -234,9 +234,9 @@ static void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     }
 
     mp_printf(print, "Pin(%d, mode=%s, pull=%s)",
-            self->pin,
-            (nrf_gpio_pin_dir_get(self->pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? "OUT" : "IN",
-            pull);
+        self->pin,
+        (nrf_gpio_pin_dir_get(self->pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? "OUT" : "IN",
+        pull);
 }
 
 static mp_obj_t pin_obj_init_helper(const pin_obj_t *pin, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
@@ -375,11 +375,11 @@ static mp_obj_t pin_obj_init_helper(const pin_obj_t *self, mp_uint_t n_args, con
 
     if (mode == NRF_GPIO_PIN_DIR_OUTPUT || mode == NRF_GPIO_PIN_DIR_INPUT) {
         nrf_gpio_cfg(self->pin,
-                     mode,
-                     input,
-                     pull,
-                     NRF_GPIO_PIN_S0S1,
-                     NRF_GPIO_PIN_NOSENSE);
+            mode,
+            input,
+            pull,
+            NRF_GPIO_PIN_S0S1,
+            NRF_GPIO_PIN_NOSENSE);
     } else {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin mode: %d"), mode);
     }
@@ -496,7 +496,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(pin_af_obj, pin_af);
 static void pin_common_irq_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
     mp_obj_t pin_handler = MP_STATE_PORT(pin_irq_handlers)[pin];
     mp_obj_t pin_number = MP_OBJ_NEW_SMALL_INT(pin);
-    const pin_obj_t *pin_obj  = pin_find(pin_number);
+    const pin_obj_t *pin_obj = pin_find(pin_number);
 
     mp_call_function_1(pin_handler, (mp_obj_t)pin_obj);
 }
@@ -591,7 +591,7 @@ static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AF_OD),     MP_ROM_INT(GPIO_MODE_AF_OD) },
     { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
 */
-#include "genhdr/pins_af_const.h"
+    #include "genhdr/pins_af_const.h"
 };
 
 static MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
diff --git a/ports/nrf/modules/machine/pin.h b/ports/nrf/modules/machine/pin.h
index 7004b320b1b6b..41579011b5d84 100644
--- a/ports/nrf/modules/machine/pin.h
+++ b/ports/nrf/modules/machine/pin.h
@@ -34,43 +34,43 @@
 #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;
-
-  union {
-    void          *reg;
-
-    PIN_DEFS_PORT_AF_UNION
-  };
+    mp_obj_base_t base;
+    qstr name;
+    uint8_t idx;
+    uint8_t fn;
+    uint8_t unit;
+    uint8_t type;
+
+    union {
+        void *reg;
+
+        PIN_DEFS_PORT_AF_UNION
+    };
 } pin_af_obj_t;
 
 typedef struct {
-  mp_obj_base_t base;
-  qstr name;
-  uint32_t pin : 8;
-  uint32_t num_af : 4;
-  uint32_t adc_channel : 5; // Some ARM processors use 32 bits/PORT
-  uint32_t adc_num  : 3;    // 1 bit per ADC
-  const pin_af_obj_t *af;
-  uint32_t pull;
+    mp_obj_base_t base;
+    qstr name;
+    uint32_t pin : 8;
+    uint32_t num_af : 4;
+    uint32_t adc_channel : 5; // Some ARM processors use 32 bits/PORT
+    uint32_t adc_num  : 3;  // 1 bit per ADC
+    const pin_af_obj_t *af;
+    uint32_t pull;
 } pin_obj_t;
 
 extern const mp_obj_type_t pin_type;
 extern const mp_obj_type_t pin_af_type;
 
 typedef struct {
-  const char *name;
-  const pin_obj_t *pin;
+    const char *name;
+    const 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[];
 
-//extern pin_map_obj_t pin_map_obj;
+// extern pin_map_obj_t pin_map_obj;
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index d85db9b9b7aa1..08d31f61d0f9e 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -49,18 +49,18 @@ typedef struct {
 
 // Non-volatile part of the RTCounter object.
 typedef struct _machine_rtc_obj_t {
-    mp_obj_base_t          base;
-    const nrfx_rtc_t     * p_rtc;   // Driver instance
-    nrfx_rtc_handler_t     handler; // interrupt callback
-    machine_rtc_config_t * config;  // pointer to volatile part
+    mp_obj_base_t base;
+    const nrfx_rtc_t *p_rtc;        // Driver instance
+    nrfx_rtc_handler_t handler;     // interrupt callback
+    machine_rtc_config_t *config;   // pointer to volatile part
 } machine_rtc_obj_t;
 
 static const nrfx_rtc_t machine_rtc_instances[] = {
     NRFX_RTC_INSTANCE(0),
     NRFX_RTC_INSTANCE(1),
-#if defined(NRF52_SERIES)
+    #if defined(NRF52_SERIES)
     NRFX_RTC_INSTANCE(2),
-#endif
+    #endif
 };
 
 static machine_rtc_config_t configs[MP_ARRAY_SIZE(machine_rtc_instances)];
@@ -72,15 +72,15 @@ static void interrupt_handler2(nrfx_rtc_int_type_t int_type);
 #endif
 
 static const machine_rtc_obj_t machine_rtc_obj[] = {
-    {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[0], .handler=interrupt_handler0, .config=&configs[0]},
-    {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[1], .handler=interrupt_handler1, .config=&configs[1]},
-#if defined(NRF52_SERIES)
-    {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[2], .handler=interrupt_handler2, .config=&configs[2]},
-#endif
+    {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[0], .handler = interrupt_handler0, .config = &configs[0]},
+    {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[1], .handler = interrupt_handler1, .config = &configs[1]},
+    #if defined(NRF52_SERIES)
+    {{&machine_rtcounter_type}, .p_rtc = &machine_rtc_instances[2], .handler = interrupt_handler2, .config = &configs[2]},
+    #endif
 };
 
 static void interrupt_handler(size_t instance_id) {
-    const machine_rtc_obj_t * self = &machine_rtc_obj[instance_id];
+    const machine_rtc_obj_t *self = &machine_rtc_obj[instance_id];
     machine_rtc_config_t *config = self->config;
     if (config->callback != NULL) {
         mp_call_function_1((mp_obj_t)config->callback, (mp_obj_t)self);
@@ -128,8 +128,8 @@ static void rtc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
 /* MicroPython bindings for machine API                                       */
 
 const nrfx_rtc_config_t machine_rtc_config = {
-    .prescaler    = RTC_FREQ_TO_PRESCALER(RTC_FREQUENCY),
-    .reliable     = 0,
+    .prescaler = RTC_FREQ_TO_PRESCALER(RTC_FREQUENCY),
+    .reliable = 0,
     .tick_latency = 0, // ignored when reliable == 0
     #ifdef NRF51
     .interrupt_priority = 3,
@@ -161,7 +161,7 @@ static mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     #endif
 
     // const and non-const part of the RTC object.
-    const machine_rtc_obj_t * self = &machine_rtc_obj[rtc_id];
+    const machine_rtc_obj_t *self = &machine_rtc_obj[rtc_id];
     machine_rtc_config_t *config = self->config;
 
     if (args[ARG_callback].u_obj == mp_const_none) {
@@ -202,7 +202,7 @@ static mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
 /// in the configured frequency has been reached.
 ///
 static mp_obj_t machine_rtc_start(mp_obj_t self_in) {
-    machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_rtc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_rtc_enable(self->p_rtc);
 
@@ -214,7 +214,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_start_obj, machine_rtc_start);
 /// Stop the RTCounter.
 ///
 static mp_obj_t machine_rtc_stop(mp_obj_t self_in) {
-    machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_rtc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_rtc_disable(self->p_rtc);
 
@@ -227,7 +227,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_stop_obj, machine_rtc_stop);
 /// with the current prescaler (2^24 / 8 = 2097152 seconds).
 ///
 static mp_obj_t machine_rtc_counter(mp_obj_t self_in) {
-    machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_rtc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     uint32_t counter = nrfx_rtc_counter_get(self->p_rtc);
 
@@ -239,7 +239,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_counter_obj, machine_rtc_counter);
 /// Free resources associated with this RTC.
 ///
 static mp_obj_t machine_rtc_deinit(mp_obj_t self_in) {
-    machine_rtc_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_rtc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_rtc_uninit(self->p_rtc);
 
diff --git a/ports/nrf/modules/machine/soft_pwm.c b/ports/nrf/modules/machine/soft_pwm.c
index c61e1f86baa37..2fa3362658986 100644
--- a/ports/nrf/modules/machine/soft_pwm.c
+++ b/ports/nrf/modules/machine/soft_pwm.c
@@ -102,7 +102,7 @@ static mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
         mp_raise_ValueError(MP_ERROR_TEXT("Pin number >31"));
     }
 
-    machine_pwm_obj_t *self = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);;
+    machine_pwm_obj_t *self = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
     self->defer_start = false;
     self->pwm_pin = pwm_pin;
     self->duty_mode = DUTY_NOT_SET;
@@ -197,7 +197,7 @@ static void machine_soft_pwm_start(machine_pwm_obj_t *self) {
             duty_width = self->duty * DUTY_FULL_SCALE / 100;
         } else if (self->duty_mode == DUTY_U16) {
             duty_width = self->duty * DUTY_FULL_SCALE / 65536;
-        }if (self->duty_mode == DUTY_NS) {
+        } else if (self->duty_mode == DUTY_NS) {
             duty_width = (uint64_t)self->duty * self->freq * DUTY_FULL_SCALE / 1000000000ULL;
         }
         pwm_set_duty_cycle(self->pwm_pin, duty_width);
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 4baee39d01dc3..b00a5706c66c0 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -98,20 +98,20 @@
 #endif // NRFX_SPIM_ENABLED
 
 typedef struct _machine_hard_spi_obj_t {
-    mp_obj_base_t       base;
-    const nrfx_spi_t   * p_spi;    // Driver instance
-    nrfx_spi_config_t  * p_config; // pointer to volatile part
+    mp_obj_base_t base;
+    const nrfx_spi_t *p_spi;       // Driver instance
+    nrfx_spi_config_t *p_config;   // pointer to volatile part
 } machine_hard_spi_obj_t;
 
 static const nrfx_spi_t machine_spi_instances[] = {
     NRFX_SPI_INSTANCE(0),
     NRFX_SPI_INSTANCE(1),
-#if defined(NRF52_SERIES)
+    #if defined(NRF52_SERIES)
     NRFX_SPI_INSTANCE(2),
-#if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
+    #if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
     NRFX_SPI_INSTANCE(3),
-#endif // NRF52840_XXAA && NRFX_SPIM_ENABLED
-#endif // NRF52_SERIES
+    #endif // NRF52840_XXAA && NRFX_SPIM_ENABLED
+    #endif // NRF52_SERIES
 };
 
 static nrfx_spi_config_t configs[MP_ARRAY_SIZE(machine_spi_instances)];
@@ -119,12 +119,12 @@ static nrfx_spi_config_t configs[MP_ARRAY_SIZE(machine_spi_instances)];
 static const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     {{&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)
+    #if defined(NRF52_SERIES)
     {{&machine_spi_type}, .p_spi = &machine_spi_instances[2], .p_config = &configs[2]},
-#if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
+    #if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
     {{&machine_spi_type}, .p_spi = &machine_spi_instances[3], .p_config = &configs[3]},
-#endif // NRF52840_XXAA && NRFX_SPIM_ENABLED
-#endif // NRF52_SERIES
+    #endif // NRF52840_XXAA && NRFX_SPIM_ENABLED
+    #endif // NRF52_SERIES
 };
 
 void spi_init0(void) {
@@ -151,12 +151,12 @@ static int spi_find(mp_obj_t id) {
     }
 }
 
-void spi_transfer(const machine_hard_spi_obj_t * self, size_t len, const void * src, void * dest) {
+void spi_transfer(const machine_hard_spi_obj_t *self, size_t len, const void *src, void *dest) {
     nrfx_spi_xfer_desc_t xfer_desc = {
         .p_tx_buffer = src,
-        .tx_length   = len,
+        .tx_length = len,
         .p_rx_buffer = dest,
-        .rx_length   = len
+        .rx_length = len
     };
 
     nrfx_spi_xfer(self->p_spi, &xfer_desc, 0);
@@ -220,11 +220,11 @@ static mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_ar
         && args[ARG_NEW_mosi].u_obj != MP_OBJ_NULL
         && args[ARG_NEW_miso].u_obj != MP_OBJ_NULL) {
 
-        self->p_config->sck_pin  = mp_hal_get_pin_obj(args[ARG_NEW_sck].u_obj)->pin;
+        self->p_config->sck_pin = mp_hal_get_pin_obj(args[ARG_NEW_sck].u_obj)->pin;
         self->p_config->mosi_pin = mp_hal_get_pin_obj(args[ARG_NEW_mosi].u_obj)->pin;
         self->p_config->miso_pin = mp_hal_get_pin_obj(args[ARG_NEW_miso].u_obj)->pin;
     } else {
-        self->p_config->sck_pin  = MICROPY_HW_SPI0_SCK;
+        self->p_config->sck_pin = MICROPY_HW_SPI0_SCK;
         self->p_config->mosi_pin = MICROPY_HW_SPI0_MOSI;
         self->p_config->miso_pin = MICROPY_HW_SPI0_MISO;
     }
@@ -232,11 +232,11 @@ static mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_ar
     // Manually trigger slave select from upper layer.
     self->p_config->ss_pin = NRFX_SPI_PIN_NOT_USED;
 
-#ifdef NRF51
+    #ifdef NRF51
     self->p_config->irq_priority = 3;
-#else
+    #else
     self->p_config->irq_priority = 6;
-#endif
+    #endif
 
     machine_hard_spi_init_helper(self, &args[1]); // Skip instance id param.
 
@@ -260,18 +260,18 @@ static void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_
         self->p_config->frequency = NRF_SPI_FREQ_4M;
     } else if (baudrate <= 8000000) {
         self->p_config->frequency = NRF_SPI_FREQ_8M;
-#if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
+    #if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
     } else if (baudrate <= 16000000) {
         self->p_config->frequency = NRF_SPIM_FREQ_16M;
     } else if (baudrate <= 32000000) {
         self->p_config->frequency = NRF_SPIM_FREQ_32M;
-#endif // NRF52840_XXAA && NRFX_SPIM_ENABLED
+    #endif // NRF52840_XXAA && NRFX_SPIM_ENABLED
     } else { // Default
         self->p_config->frequency = NRF_SPI_FREQ_1M;
     }
 
-    // Active high
     if (args[ARG_INIT_polarity].u_int == 0) {
+        // Active high
         if (args[ARG_INIT_phase].u_int == 0) {
             // First clock edge
             self->p_config->mode = NRF_SPI_MODE_0;
@@ -279,8 +279,8 @@ static void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_
             // Second clock edge
             self->p_config->mode = NRF_SPI_MODE_1;
         }
-    // Active low
     } else {
+        // Active low
         if (args[ARG_INIT_phase].u_int == 0) {
             // First clock edge
             self->p_config->mode = NRF_SPI_MODE_2;
@@ -290,7 +290,7 @@ static void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_
         }
     }
 
-    self->p_config->orc  = 0xFF; // Overrun character
+    self->p_config->orc = 0xFF;  // Overrun character
     self->p_config->bit_order = (args[ARG_INIT_firstbit].u_int == 0) ? NRF_SPI_BIT_ORDER_MSB_FIRST : NRF_SPI_BIT_ORDER_LSB_FIRST;
 
     // Set context to this instance of SPI
@@ -327,7 +327,7 @@ static void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
 }
 
 static void machine_hard_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
-    const machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t*)self_in;
+    const machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)self_in;
     spi_transfer(self, len, src, dest);
 }
 
diff --git a/ports/nrf/modules/machine/spi.h b/ports/nrf/modules/machine/spi.h
index 1a1998d25aefe..602829869fd24 100644
--- a/ports/nrf/modules/machine/spi.h
+++ b/ports/nrf/modules/machine/spi.h
@@ -29,7 +29,7 @@
 typedef struct _machine_hard_spi_obj_t machine_hard_spi_obj_t;
 
 void spi_init0(void);
-void spi_transfer(const machine_hard_spi_obj_t * self,
-                  size_t                         len,
-                  const void *                   src,
-                  void *                         dest);
+void spi_transfer(const machine_hard_spi_obj_t *self,
+    size_t len,
+    const void *src,
+    void *dest);
diff --git a/ports/nrf/modules/machine/temp.c b/ports/nrf/modules/machine/temp.c
index 0d206fee47a66..aa20087c6cd1c 100644
--- a/ports/nrf/modules/machine/temp.c
+++ b/ports/nrf/modules/machine/temp.c
@@ -91,13 +91,13 @@ int32_t temp_read(void) {
 /// Get temperature.
 static mp_obj_t machine_temp_read(mp_uint_t n_args, const mp_obj_t *args) {
 
-#if BLUETOOTH_SD
+    #if BLUETOOTH_SD
     if (BLUETOOTH_STACK_ENABLED() == 1) {
         int32_t temp;
         (void)sd_temp_get(&temp);
         return MP_OBJ_NEW_SMALL_INT(temp / 4); // resolution of 0.25 degree celsius
     }
-#endif // BLUETOOTH_SD
+    #endif // BLUETOOTH_SD
 
     return MP_OBJ_NEW_SMALL_INT(temp_read());
 }
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c
index 3c2a039b84dfa..42a40ad2f26ae 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -37,32 +37,32 @@ enum {
 };
 
 typedef struct _machine_timer_obj_t {
-    mp_obj_base_t  base;
-    nrfx_timer_t   p_instance;
+    mp_obj_base_t base;
+    nrfx_timer_t p_instance;
 } machine_timer_obj_t;
 
 static mp_obj_t machine_timer_callbacks[] = {
     NULL,
     NULL,
     NULL,
-#if defined(NRF52_SERIES)
+    #if defined(NRF52_SERIES)
     NULL,
     NULL,
-#endif
+    #endif
 };
 
 static const machine_timer_obj_t machine_timer_obj[] = {
     {{&machine_timer_type}, NRFX_TIMER_INSTANCE(0)},
-#if MICROPY_PY_MACHINE_SOFT_PWM
+    #if MICROPY_PY_MACHINE_SOFT_PWM
     { },
-#else
+    #else
     {{&machine_timer_type}, NRFX_TIMER_INSTANCE(1)},
-#endif
+    #endif
     {{&machine_timer_type}, NRFX_TIMER_INSTANCE(2)},
-#if defined(NRF52_SERIES)
+    #if defined(NRF52_SERIES)
     {{&machine_timer_type}, NRFX_TIMER_INSTANCE(3)},
     {{&machine_timer_type}, NRFX_TIMER_INSTANCE(4)},
-#endif
+    #endif
 };
 
 void timer_init0(void) {
@@ -112,19 +112,19 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     // get static peripheral object
     int timer_id = timer_find(args[ARG_id].u_obj);
 
-#if BLUETOOTH_SD
+    #if BLUETOOTH_SD
     if (timer_id == 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("Timer reserved by Bluetooth LE stack"));
     }
-#endif
+    #endif
 
-#if MICROPY_PY_MACHINE_SOFT_PWM
+    #if MICROPY_PY_MACHINE_SOFT_PWM
     if (timer_id == 1) {
         mp_raise_ValueError(MP_ERROR_TEXT("Timer reserved by ticker driver"));
     }
-#endif
+    #endif
 
-    machine_timer_obj_t *self = (machine_timer_obj_t*)&machine_timer_obj[timer_id];
+    machine_timer_obj_t *self = (machine_timer_obj_t *)&machine_timer_obj[timer_id];
 
     if (mp_obj_is_fun(args[ARG_callback].u_obj)) {
         machine_timer_callbacks[timer_id] = args[ARG_callback].u_obj;
@@ -163,11 +163,11 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
         ((args[ARG_mode].u_int == TIMER_MODE_ONESHOT) ? NRF_TIMER_SHORT_COMPARE0_STOP_MASK : 0);
     bool enable_interrupts = true;
     nrfx_timer_extended_compare(
-            &self->p_instance,
-            NRF_TIMER_CC_CHANNEL0,
-            args[ARG_period].u_int,
-            short_mask,
-            enable_interrupts);
+        &self->p_instance,
+        NRF_TIMER_CC_CHANNEL0,
+        args[ARG_period].u_int,
+        short_mask,
+        enable_interrupts);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -176,7 +176,7 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
 /// Return counter value, which is currently in us.
 ///
 static mp_obj_t machine_timer_period(mp_obj_t self_in) {
-    machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     uint32_t period = nrfx_timer_capture(&self->p_instance, NRF_TIMER_CC_CHANNEL1);
 
@@ -188,7 +188,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_period_obj, machine_timer_period)
 /// Start the timer.
 ///
 static mp_obj_t machine_timer_start(mp_obj_t self_in) {
-    machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_timer_enable(&self->p_instance);
 
@@ -200,7 +200,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_start_obj, machine_timer_start);
 /// Stop the timer.
 ///
 static mp_obj_t machine_timer_stop(mp_obj_t self_in) {
-    machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_timer_disable(&self->p_instance);
 
@@ -212,7 +212,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_stop_obj, machine_timer_stop);
 /// Free resources associated with the timer.
 ///
 static mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
-    machine_timer_obj_t * self = MP_OBJ_TO_PTR(self_in);
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     nrfx_timer_uninit(&self->p_instance);
 
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 6da797df1f559..9e502941ab68e 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -88,8 +88,8 @@ typedef struct _machine_uart_buf_t {
 #endif
 
 typedef struct _machine_uart_obj_t {
-    mp_obj_base_t       base;
-    const nrfx_uart_t * p_uart;      // Driver instance
+    mp_obj_base_t base;
+    const nrfx_uart_t *p_uart;       // Driver instance
     machine_uart_buf_t buf;
     uint16_t timeout;       // timeout waiting for first char (in ms)
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
@@ -206,19 +206,19 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     nrfx_uart_config_t config;
 
     // flow control
-#if MICROPY_HW_UART1_HWFC
+    #if MICROPY_HW_UART1_HWFC
     config.hal_cfg.hwfc = NRF_UART_HWFC_ENABLED;
-#else
+    #else
     config.hal_cfg.hwfc = NRF_UART_HWFC_DISABLED;
-#endif
+    #endif
 
     config.hal_cfg.parity = NRF_UART_PARITY_EXCLUDED;
 
-#if (BLUETOOTH_SD == 100)
+    #if (BLUETOOTH_SD == 100)
     config.interrupt_priority = 3;
-#else
+    #else
     config.interrupt_priority = 6;
-#endif
+    #endif
 
     // These baudrates are not supported, it seems.
     if (args[ARG_baudrate].u_int < 1200 || args[ARG_baudrate].u_int > 1000000) {
@@ -239,10 +239,10 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     config.pseltxd = MICROPY_HW_UART1_TX;
     config.pselrxd = MICROPY_HW_UART1_RX;
 
-#if MICROPY_HW_UART1_HWFC
+    #if MICROPY_HW_UART1_HWFC
     config.pselrts = MICROPY_HW_UART1_RTS;
     config.pselcts = MICROPY_HW_UART1_CTS;
-#endif
+    #endif
     self->timeout = args[ARG_timeout].u_int;
     self->timeout_char = args[ARG_timeout_char].u_int;
 
@@ -259,9 +259,9 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     nrfx_uart_init(self->p_uart, &config, uart_event_handler);
     nrfx_uart_rx(self->p_uart, &self->buf.rx_buf[0], 1);
 
-#if NRFX_UART_ENABLED
+    #if NRFX_UART_ENABLED
     nrfx_uart_rx_enable(self->p_uart);
-#endif
+    #endif
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/tools/codeformat.py b/tools/codeformat.py
index bd37aec467f18..c65174ddc1278 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -59,11 +59,9 @@
     "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/os/*.[ch]",
-    "ports/nrf/modules/time/*.[ch]",
     # STM32 USB dev/host code is mostly 3rd party.
     "ports/stm32/usbdev/**/*.[ch]",
     "ports/stm32/usbhost/**/*.[ch]",

From b10182bbcc0ee78ce5d12902bc8da68bdc4429c5 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Mon, 1 Jan 2024 18:21:39 +0100
Subject: [PATCH 0983/3129] nrf: Fix non-running LFCLK.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Under some circumstances, after a hard reset, the low-frequency clock would
not be running.  This caused time.ticks_ms() to return 0, time.sleep_ms()
to get stuck, and other misbehavior.  A soft reboot would return it to a
working state.

The cause was a race condition that was hit when the bootloader would
itself turn LFCLK on, but turn it off again shortly before launching the
main application (this apparently happens with the Adafruit bootloader
from https://github.com/fanoush/ds-d6/tree/master/micropython).  Stopping
the clock is an asynchronous operation and it continues running for a short
time after the stop command is given.  When MicroPython checked whether to
start it by looking at the LFCLKSTAT register (nrf_clock_lf_is_running)
during that time, it would mistakenly not be started again.  What
MicroPython should be looking at is not whether the clock is running at
this time, but whether a start/stop command has been given, which is
indicated by the LFCLKRUN register (nrf_clock_lf_start_task_status_get).
It is not clearly documented, but empirically LFCLKRUN is not just set when
the LFCLKSTART task is triggered, but also cleared when the LFCLKSTOP task
is triggered, which is exactly what we need.

The matter is complicated by the fact that the nRF52832 has an anomaly
(see [errata](https://infocenter.nordicsemi.com/topic/errata_nRF52832_Rev3/ERR/nRF52832/Rev3/latest/anomaly_832_132.html?cp=5_2_1_0_1_33))
where starting the LFCLK will not work between 66µs and 138µs after it last
stopped. Apply a workaround for that.  See nrfx_clock_lfclk_start() in
micropython/lib/nrfx/drivers/src/nrfx_clock.c for reference, but we are not
using that because it also does other things and makes the code larger.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 ports/nrf/modules/machine/rtcounter.c |  5 ++--
 ports/nrf/mphalport.c                 | 34 ++++++++++++++++++++++++---
 ports/nrf/mphalport.h                 |  2 ++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index 08d31f61d0f9e..c1ef1b4dd977d 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -27,6 +27,7 @@
 
 #include "py/nlr.h"
 #include "py/runtime.h"
+#include "mphalport.h"
 #include "rtcounter.h"
 #include "nrfx_rtc.h"
 #include "nrf_clock.h"
@@ -182,9 +183,7 @@ static mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     }
 
     // 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);
-    }
+    mp_nrf_start_lfclk();
 
     // Make sure it's uninitialized.
     nrfx_rtc_uninit(self->p_rtc);
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 2a1a4cb13ba36..06c6ba5cc2e76 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -40,6 +40,36 @@
 #include "nrf_clock.h"
 #endif
 
+#if !defined(USE_WORKAROUND_FOR_ANOMALY_132) && \
+    (defined(NRF52832_XXAA) || defined(NRF52832_XXAB))
+// ANOMALY 132 - LFCLK needs to avoid frame from 66us to 138us after LFCLK stop.
+#define USE_WORKAROUND_FOR_ANOMALY_132 1
+#endif
+
+#if USE_WORKAROUND_FOR_ANOMALY_132
+#include "soc/nrfx_coredep.h"
+#endif
+
+void mp_nrf_start_lfclk(void) {
+    if (!nrf_clock_lf_start_task_status_get(NRF_CLOCK)) {
+        // Check if the clock was recently stopped but is still running.
+        #if USE_WORKAROUND_FOR_ANOMALY_132
+        bool was_running = nrf_clock_lf_is_running(NRF_CLOCK);
+        // If so, wait for it to stop. This ensures that the delay for anomaly 132 workaround does
+        // not land us in the middle of the forbidden interval.
+        while (nrf_clock_lf_is_running(NRF_CLOCK)) {
+        }
+        // If the clock just stopped, we can start it again right away as we are certainly before
+        // the forbidden 66-138us interval. Otherwise, apply a delay of 138us to make sure we are
+        // after the interval.
+        if (!was_running) {
+            nrfx_coredep_delay_us(138);
+        }
+        #endif
+        nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_LFCLKSTART);
+    }
+}
+
 #if MICROPY_PY_TIME_TICKS
 
 // Use RTC1 for time ticks generation (ms and us) with 32kHz tick resolution
@@ -99,9 +129,7 @@ static void rtc_irq_time(nrfx_rtc_int_type_t event) {
 
 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);
-    }
+    mp_nrf_start_lfclk();
     // 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);
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 1ba4b6e70f081..7efe05a15fc8e 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -54,6 +54,8 @@ void mp_hal_delay_us(mp_uint_t us);
 
 const char *nrfx_error_code_lookup(uint32_t err_code);
 
+void mp_nrf_start_lfclk(void);
+
 #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)

From 5e926b222259cb38db5c044b2f7656e2bdba2513 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Fri, 5 Jan 2024 16:17:55 +0100
Subject: [PATCH 0984/3129] nrf/modules/machine: Catch exceptions from pin
 interrupts.

Exceptions in pin interrupt handlers would end up crashing MicroPython with
a "FATAL: uncaught exception".

In addition, MicroPython would get stuck trying to output this error
message, or generally any print output from inside a pin interrupt handler,
through the UART after the first character, so that only "F" was visible.
The reason was a matching interrupt priority between the running pin
interrupt and the UARTE interrupt signaling completion of the output
operation.  Fix that by increasing the UARTE interrupt priority.

Code taken from the stm32 port and adapted.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 ports/nrf/modules/machine/pin.c  | 25 ++++++++++++++++++++++++-
 ports/nrf/modules/machine/uart.c |  8 +++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index f86d878d17d7e..2191cc9521d01 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -33,6 +33,7 @@
 #include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "py/gc.h"
 #include "pin.h"
 #include "nrf_gpio.h"
 #include "nrfx_gpiote.h"
@@ -498,7 +499,29 @@ static void pin_common_irq_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t
     mp_obj_t pin_number = MP_OBJ_NEW_SMALL_INT(pin);
     const pin_obj_t *pin_obj = pin_find(pin_number);
 
-    mp_call_function_1(pin_handler, (mp_obj_t)pin_obj);
+    if (pin_handler != mp_const_none) {
+        #if MICROPY_ENABLE_SCHEDULER
+        mp_sched_lock();
+        #endif
+        // 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(pin_handler, (mp_obj_t)pin_obj);
+            nlr_pop();
+        } else {
+            // Uncaught exception; disable the callback so it doesn't run again.
+            MP_STATE_PORT(pin_irq_handlers)[pin] = mp_const_none;
+            nrfx_gpiote_in_uninit(pin);
+            mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in interrupt handler for Pin('%q')\n", pin_obj->name);
+            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+        gc_unlock();
+        #if MICROPY_ENABLE_SCHEDULER
+        mp_sched_unlock();
+        #endif
+    }
 }
 
 static mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 9e502941ab68e..de26fa1b12787 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -214,11 +214,9 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 
     config.hal_cfg.parity = NRF_UART_PARITY_EXCLUDED;
 
-    #if (BLUETOOTH_SD == 100)
-    config.interrupt_priority = 3;
-    #else
-    config.interrupt_priority = 6;
-    #endif
+    // Higher priority than pin interrupts, otherwise printing exceptions from
+    // interrupt handlers gets stuck.
+    config.interrupt_priority = NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY - 1;
 
     // These baudrates are not supported, it seems.
     if (args[ARG_baudrate].u_int < 1200 || args[ARG_baudrate].u_int > 1000000) {

From 4dd288ff62a14d973166ef3b041ab0fe7c78863c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 22 Jan 2024 18:04:44 +0100
Subject: [PATCH 0985/3129] nrf/modules/machine/pwm: Tag a PWM device as used
 in the constructor.

When PWM constructor was created without specifying a device or setting
both freq and duty rate, it was not tagged as used, and further calls to
get a PWM object may get the same PWM device assigned.

Fixes #13494.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/nrf/modules/machine/pwm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index 393d1061799dd..8145509c76284 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -233,6 +233,11 @@ static mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     self->p_config->mode[pwm_channel] = MODE_HIGH_LOW;
     self->p_config->defer_start = false;
 
+    // Allocate the device if it was not used before.
+    if (hard_configs[pwm_id].active == FREE) {
+        hard_configs[pwm_id].active = STOPPED;
+    }
+
     // start the PWM running for this channel
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);

From 34c4625dcc52aa3f8284a43e86ca7f39e11c15f1 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 21 Mar 2024 10:23:14 +1100
Subject: [PATCH 0986/3129] nrf/main: Fix build of microbit when SD is enabled.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/nrf/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index dd9f232b80c55..07bf3e8adb5c6 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -262,7 +262,7 @@ void NORETURN _start(void) {
     led_state(1, 0);
 
     #if MICROPY_VFS || MICROPY_MBFS || MICROPY_MODULE_FROZEN
-    ret = pyexec_file_if_exists("boot.py");
+    ret_code = pyexec_file_if_exists("boot.py");
     #endif
 
     #if MICROPY_HW_USB_CDC
@@ -270,7 +270,7 @@ void NORETURN _start(void) {
     #endif
 
     #if MICROPY_VFS || MICROPY_MBFS || MICROPY_MODULE_FROZEN
-    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
+    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret_code != 0) {
         pyexec_file_if_exists("main.py");
     }
     #endif

From 994021e1e063c69ff79ea1d6c8ac263420ec3809 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 22 Mar 2024 13:55:03 +1100
Subject: [PATCH 0987/3129] nrf/Makefile: Clean up dangling LIBS declaration.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/nrf/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 31d0bc7668342..4fe921f0fad88 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -163,8 +163,6 @@ CFLAGS += -Os -DNDEBUG
 LDFLAGS += -Os
 endif
 
-LIBS = \
-
 ifeq ($(MCU_VARIANT), nrf52)
 
 SRC_LIB_C += $(SRC_LIB_LIBM_C)

From 438e5229115f18644b1cb463701fb6c8689d8ab5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Mar 2024 09:12:03 +0100
Subject: [PATCH 0988/3129] lib/arduino-lib: Add Arduino's external library.

This library contains external modules for Arduino boards.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .gitmodules     | 3 +++
 lib/arduino-lib | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/arduino-lib

diff --git a/.gitmodules b/.gitmodules
index 423d1bbeed8fb..e6712c1f9f40e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -65,3 +65,6 @@
 [submodule "lib/libmetal"]
 	path = lib/libmetal
 	url = https://github.com/OpenAMP/libmetal.git
+[submodule "lib/arduino-lib"]
+	path = lib/arduino-lib
+	url = https://github.com/arduino/arduino-lib-mpy.git
diff --git a/lib/arduino-lib b/lib/arduino-lib
new file mode 160000
index 0000000000000..277efd50fcc63
--- /dev/null
+++ b/lib/arduino-lib
@@ -0,0 +1 @@
+Subproject commit 277efd50fcc637e2e2e87c9aa50c06acc9080970

From 27aa3c19bf347945fcd867095353b9b7df4af871 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 13 Feb 2024 08:48:34 +0100
Subject: [PATCH 0989/3129] stm32/boards/ARDUINO_GIGA: Add Arduino's external
 library.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/manifest.py      | 6 ++++++
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/manifest.py b/ports/stm32/boards/ARDUINO_GIGA/manifest.py
index b3c6b02e5ba07..b7b9a2b470d02 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/manifest.py
+++ b/ports/stm32/boards/ARDUINO_GIGA/manifest.py
@@ -10,3 +10,9 @@
 
 # Bluetooth
 require("aioble")
+
+# Register external library
+add_library("arduino-lib", "$(ARDUINO_LIB_DIR)")
+
+# RPC
+require("msgpackrpc", library="arduino-lib")
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
index 46fe40c2a6a82..f58c98af83cfd 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk
@@ -26,5 +26,8 @@ MICROPY_SSL_MBEDTLS = 1
 MICROPY_PY_OPENAMP = 1
 MICROPY_PY_OPENAMP_REMOTEPROC = 1
 
+ARDUINO_LIB_DIR = lib/arduino-lib
+GIT_SUBMODULES += $(ARDUINO_LIB_DIR)
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+MICROPY_MANIFEST_ARDUINO_LIB_DIR = $(TOP)/$(ARDUINO_LIB_DIR)
 MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'

From 723cd03aeb2803dbeeb7d654202964c076043f54 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Mar 2024 09:09:01 +0100
Subject: [PATCH 0990/3129] stm32/boards/ARDUINO_NICLA_VISION: Add Arduino's
 external library.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py      | 6 ++++++
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py b/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py
index b3c6b02e5ba07..b7b9a2b470d02 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py
@@ -10,3 +10,9 @@
 
 # Bluetooth
 require("aioble")
+
+# Register external library
+add_library("arduino-lib", "$(ARDUINO_LIB_DIR)")
+
+# RPC
+require("msgpackrpc", library="arduino-lib")
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
index 77d547bce05e9..0e8ff0e82d388 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
@@ -26,5 +26,8 @@ MICROPY_SSL_MBEDTLS = 1
 MICROPY_PY_OPENAMP = 1
 MICROPY_PY_OPENAMP_REMOTEPROC = 1
 
+ARDUINO_LIB_DIR = lib/arduino-lib
+GIT_SUBMODULES += $(ARDUINO_LIB_DIR)
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+MICROPY_MANIFEST_ARDUINO_LIB_DIR = $(TOP)/$(ARDUINO_LIB_DIR)
 MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'

From da09646eabe7ac605d1bc5fe55c671a9856e1137 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Mar 2024 09:09:42 +0100
Subject: [PATCH 0991/3129] stm32/boards/ARDUINO_PORTENTA_H7: Add Arduino's
 external library.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py      | 7 +++++++
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index b3c6b02e5ba07..eb53df0fbdeb2 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -10,3 +10,10 @@
 
 # Bluetooth
 require("aioble")
+
+# Register external library
+add_library("arduino-lib", "$(ARDUINO_LIB_DIR)")
+
+# RPC
+require("cmwx1", library="arduino-lib")
+require("msgpackrpc", library="arduino-lib")
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
index c56c8f005f72b..3b173b3acdb92 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
@@ -26,5 +26,8 @@ MICROPY_SSL_MBEDTLS = 1
 MICROPY_PY_OPENAMP = 1
 MICROPY_PY_OPENAMP_REMOTEPROC = 1
 
+ARDUINO_LIB_DIR = lib/arduino-lib
+GIT_SUBMODULES += $(ARDUINO_LIB_DIR)
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+MICROPY_MANIFEST_ARDUINO_LIB_DIR = $(TOP)/$(ARDUINO_LIB_DIR)
 MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'

From fa6ccc7e722a4516a173087cd0812711f8452da7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 15 Mar 2024 12:05:30 +0100
Subject: [PATCH 0992/3129] renesas-ra/boards/ARDUINO_PORTENTA_C33: Add
 Arduino's external library.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py    | 6 ++++++
 .../renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py
index b3c6b02e5ba07..7b35b54c7a90b 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/manifest.py
@@ -10,3 +10,9 @@
 
 # Bluetooth
 require("aioble")
+
+# Register external library
+add_library("arduino-lib", "$(ARDUINO_LIB_DIR)")
+
+# CMWX1 Lora module.
+require("cmwx1", library="arduino-lib")
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk
index de9902c16cf7f..9bb336d65e9d5 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.mk
@@ -18,5 +18,8 @@ MICROPY_SSL_MBEDTLS = 1
 MICROPY_PY_NETWORK = 1
 MICROPY_PY_NETWORK_ESP_HOSTED = 1
 
+ARDUINO_LIB_DIR = lib/arduino-lib
+GIT_SUBMODULES += $(ARDUINO_LIB_DIR)
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+MICROPY_MANIFEST_ARDUINO_LIB_DIR = $(TOP)/$(ARDUINO_LIB_DIR)
 MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'

From a0d31e54ae5219a2794784311b6df45b680007d2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 26 Mar 2024 13:10:45 +1100
Subject: [PATCH 0993/3129] esp8266/Makefile: Add support for C++ user C
 modules.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 8af7aba0aa9de..1b9e9623b6297 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -96,6 +96,9 @@ COPT += -Os -DNDEBUG
 LDFLAGS += --gc-sections
 endif
 
+# Flags for optional C++ source code
+CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS))
+
 # Options for mpy-cross
 MPY_CROSS_FLAGS += -march=xtensa
 

From 57de9da35233b4120a00386c52485e68bbc931fb Mon Sep 17 00:00:00 2001
From: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
Date: Sun, 1 Oct 2023 14:30:15 +0330
Subject: [PATCH 0994/3129] docs/library/machine.RTC: Add docs for RTC.memory()
 method.

Co-Authored-By: glenn20 <glenn20@users.noreply.github.com>

Signed-off-by: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
---
 docs/library/machine.RTC.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index be2be2eee5eea..fcd78f1c39863 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -75,6 +75,21 @@ Methods
       - ``wake`` specifies the sleep mode from where this interrupt can wake
         up the system.
 
+.. method:: RTC.memory([data])
+
+   ``RTC.memory(data)`` will write *data* to the RTC memory, where *data* is any
+   object which supports the buffer protocol (including `bytes`, `bytearray`,
+   `memoryview` and `array.array`). ``RTC.memory()`` reads RTC memory and returns
+   a `bytes` object.
+
+   Data written to RTC user memory is persistent across restarts, including
+   `machine.soft_reset()` and `machine.deepsleep()`.
+
+   The maximum length of RTC user memory is 2048 bytes by default on esp32,
+   and 492 bytes on esp8266.
+
+   Availability: esp32, esp8266 ports.
+
 Constants
 ---------
 

From d694ac6e1b316ad3aaed2589eb261a52aa6e22c9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 26 Mar 2024 15:23:21 +1100
Subject: [PATCH 0995/3129] py/makeqstrdata.py: Ensure that scope names get low
 qstr values.

Originally implemented in a patch file provided by @ironss-iotec.

Fixes issue #14093.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/makeqstrdata.py | 17 ++++++++++++-----
 py/objtype.c       |  4 ++++
 py/qstr.c          |  2 +-
 py/scope.c         |  2 ++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 3e5e7930a5b88..480344180a88a 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -223,11 +223,11 @@
     "zip",
 ]
 
-# Additional QSTRs that must have index <255 because they are stored in
-# `mp_binary_op_method_name` and `mp_unary_op_method_name` (see py/objtype.c).
+# Additional QSTRs that must have index <255 because they are stored as `byte` values.
 # These are not part of the .mpy compatibility list, but we place them in the
 # fixed unsorted pool (i.e. QDEF0) to ensure their indices are small.
-operator_qstr_list = {
+unsorted_qstr_list = {
+    # From py/objtype.c: used in the `mp_binary_op_method_name` and `mp_unary_op_method_name` tables.
     "__bool__",
     "__pos__",
     "__neg__",
@@ -286,6 +286,13 @@
     "__get__",
     "__set__",
     "__delete__",
+    # From py/scope.c: used in `scope_simple_name_table` table.
+    # Note: "<module>" is already in `static_qstr_list`.
+    "<lambda>",
+    "<listcomp>",
+    "<dictcomp>",
+    "<setcomp>",
+    "<genexpr>",
 }
 
 
@@ -404,10 +411,10 @@ def print_qstr_data(qcfgs, qstrs):
         print("QDEF0(MP_QSTR_%s, %s)" % (qstr_escape(qstr), qbytes))
 
     # add remaining qstrs to the sorted (by value) pool (unless they're in
-    # operator_qstr_list, in which case add them to the unsorted pool)
+    # unsorted_qstr_list, in which case add them to the unsorted pool)
     for ident, qstr in sorted(qstrs.values(), key=lambda x: x[1]):
         qbytes = make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr)
-        pool = 0 if qstr in operator_qstr_list else 1
+        pool = 0 if qstr in unsorted_qstr_list else 1
         print("QDEF%d(MP_QSTR_%s, %s)" % (pool, ident, qbytes))
 
 
diff --git a/py/objtype.c b/py/objtype.c
index 8b2eb6de04eec..b6d600e9434d7 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -370,6 +370,8 @@ static mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_arg
 
 // Qstrs for special methods are guaranteed to have a small value, so we use byte
 // type to represent them.
+// The (unescaped) names appear in `unsorted_str_list` in the QSTR
+// generator script py/makeqstrdata.py to ensure they are assigned low numbers.
 const byte mp_unary_op_method_name[MP_UNARY_OP_NUM_RUNTIME] = {
     [MP_UNARY_OP_BOOL] = MP_QSTR___bool__,
     [MP_UNARY_OP_LEN] = MP_QSTR___len__,
@@ -468,6 +470,8 @@ static mp_obj_t instance_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 // fail).  They can be added at the expense of code size for the qstr.
 // Qstrs for special methods are guaranteed to have a small value, so we use byte
 // type to represent them.
+// The (unescaped) names appear in `unsorted_str_list` in the QSTR
+// generator script py/makeqstrdata.py to ensure they are assigned low numbers.
 const byte mp_binary_op_method_name[MP_BINARY_OP_NUM_RUNTIME] = {
     [MP_BINARY_OP_LESS] = MP_QSTR___lt__,
     [MP_BINARY_OP_MORE] = MP_QSTR___gt__,
diff --git a/py/qstr.c b/py/qstr.c
index 3720932250ca8..fea7f44fe13bf 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -79,7 +79,7 @@ size_t qstr_compute_hash(const byte *data, size_t len) {
 // it is part of the .mpy ABI. See the top of py/persistentcode.c and
 // static_qstr_list in makeqstrdata.py. This pool is unsorted (although in a
 // future .mpy version we could re-order them and make it sorted). It also
-// contains additional qstrs that must have IDs <256, see operator_qstr_list
+// contains additional qstrs that must have IDs <256, see unsorted_qstr_list
 // in makeqstrdata.py.
 #if MICROPY_QSTR_BYTES_IN_HASH
 const qstr_hash_t mp_qstr_const_hashes_static[] = {
diff --git a/py/scope.c b/py/scope.c
index 1a4c6cc77f156..4893e7cc4e5e1 100644
--- a/py/scope.c
+++ b/py/scope.c
@@ -31,6 +31,8 @@
 #if MICROPY_ENABLE_COMPILER
 
 // These low numbered qstrs should fit in 8 bits.  See assertions below.
+// The (unescaped) names appear in `unsorted_str_list` in the QSTR
+// generator script py/makeqstrdata.py to ensure they are assigned low numbers.
 static const uint8_t scope_simple_name_table[] = {
     [SCOPE_MODULE] = MP_QSTR__lt_module_gt_,
     [SCOPE_LAMBDA] = MP_QSTR__lt_lambda_gt_,

From 79edaddf501f30b44c544fd9dbef8b073c63cd0f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Mar 2024 18:57:18 +1100
Subject: [PATCH 0996/3129] rp2/CMakeLists: Apply O2 optimisation to map, mpz
 and vm source code.

Enabling this optimisation increases the RPI_PICO firmware by +3344 bytes.

Performace change is:

diff of scores (higher is better)
N=100 M=100             rpi-base -> rpi-opt      diff      diff% (error%)
bm_chaos.py               196.56 ->  215.26 :  +18.70 =  +9.514% (+/-0.05%)
bm_fannkuch.py             52.47 ->   54.37 :   +1.90 =  +3.621% (+/-0.05%)
bm_fft.py                1476.74 -> 1530.06 :  +53.32 =  +3.611% (+/-0.01%)
bm_float.py              2305.65 -> 2444.11 : +138.46 =  +6.005% (+/-0.08%)
bm_hexiom.py               32.83 ->   35.09 :   +2.26 =  +6.884% (+/-0.05%)
bm_nqueens.py            2335.85 -> 2259.78 :  -76.07 =  -3.257% (+/-0.06%)
bm_pidigits.py            366.23 ->  465.81 :  +99.58 = +27.191% (+/-0.04%)
bm_wordcount.py            41.20 ->   41.87 :   +0.67 =  +1.626% (+/-0.01%)
core_import_mpy_multi.py  327.44 ->  335.24 :   +7.80 =  +2.382% (+/-0.08%)
core_import_mpy_single.py  63.41 ->   64.98 :   +1.57 =  +2.476% (+/-0.21%)
core_locals.py             27.24 ->   29.19 :   +1.95 =  +7.159% (+/-0.01%)
core_qstr.py              137.31 ->  140.84 :   +3.53 =  +2.571% (+/-0.03%)
core_str.py                18.44 ->   18.10 :   -0.34 =  -1.844% (+/-0.03%)
core_yield_from.py        221.69 ->  211.72 :   -9.97 =  -4.497% (+/-0.01%)
misc_aes.py               303.38 ->  308.72 :   +5.34 =  +1.760% (+/-0.02%)
misc_mandel.py           1501.00 -> 1746.60 : +245.60 = +16.362% (+/-0.04%)
misc_pystone.py          1348.22 -> 1456.75 : +108.53 =  +8.050% (+/-0.07%)
misc_raytrace.py          223.81 ->  246.16 :  +22.35 =  +9.986% (+/-0.07%)
viper_call0.py            331.05 ->  331.10 :   +0.05 =  +0.015% (+/-0.00%)
viper_call1a.py           323.34 ->  323.39 :   +0.05 =  +0.015% (+/-0.00%)
viper_call1b.py           241.01 ->  241.04 :   +0.03 =  +0.012% (+/-0.00%)
viper_call1c.py           242.88 ->  242.92 :   +0.04 =  +0.016% (+/-0.00%)
viper_call2a.py           318.41 ->  318.46 :   +0.05 =  +0.016% (+/-0.00%)
viper_call2b.py           211.27 ->  211.30 :   +0.03 =  +0.014% (+/-0.00%)

And the test `tests/basics/builtin_pow3_intbig.py` now passes (it uses a
lot of mpz code and previously took longer than 10 seconds to run on
RPI_PICO, which would lead to a timeout in the test runner).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index b605faaf2100e..fcc435b7b9f34 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -455,6 +455,15 @@ target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--wrap=dcd_event_handler
 )
 
+# Apply optimisations to performance-critical source code.
+set_source_files_properties(
+    ${MICROPY_PY_DIR}/map.c
+    ${MICROPY_PY_DIR}/mpz.c
+    ${MICROPY_PY_DIR}/vm.c
+    PROPERTIES
+    COMPILE_OPTIONS "-O2"
+)
+
 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

From 935f5391b51fb1e9f998cd7a38622296e3a79815 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Mar 2024 14:52:09 +1100
Subject: [PATCH 0997/3129] shared/tinyusb: Don't disconnect on soft reset
 unless USB was active.

Previously, constructing the singleton USBDevice object was enough to
trigger a USB disconnect on soft reset. Now it also has to be active.

The only case where this changes the behaviour is if the USBDevice object
has been constructed but never set to active (no more disconnect in this
case). Otherwise, behaviour is the same.

This change was requested by hippy on the raspberrypi forums.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd_runtime.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index a46c0f85e6bdd..2e2f7b75e406c 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -431,11 +431,12 @@ void mp_usbd_init(void) {
 // Top-level USB device deinit.
 //
 // This variant is called from soft reset, NULLs out the USB device
-// singleton instance from MP_STATE_VM, and disconnects the port.
+// singleton instance from MP_STATE_VM, and disconnects the port if a
+// runtime device was active.
 void mp_usbd_deinit(void) {
     mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
     MP_STATE_VM(usbd) = MP_OBJ_NULL;
-    if (usbd) {
+    if (usbd && usbd->active) {
         // Disconnect if a runtime USB device was active
         mp_usbd_disconnect(usbd);
     }

From 0f16ae92c0cf1e18d9612d0e2b29475a4d6719d8 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Mar 2024 14:55:16 +1100
Subject: [PATCH 0998/3129] shared/tinyusb: Update some code comments for
 runtime USB.

Updates a few code comments that were out of date or poorly worded. No code
changes.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd_runtime.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index 2e2f7b75e406c..0b4c79831becd 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -44,7 +44,7 @@
 #include "device/usbd_pvt.h"
 #endif
 
-static bool in_usbd_task; // Flags if mp_usbd_task() is processing already
+static bool in_usbd_task; // Flags if mp_usbd_task() is currently running
 
 // Some top-level functions that manage global TinyUSB USBD state, not the
 // singleton object visible to Python
@@ -250,8 +250,8 @@ static uint16_t _runtime_dev_claim_itfs(tusb_desc_interface_t const *itf_desc, u
 // configuration. Returns number of bytes to claim from descriptors pointed to
 // by itf_desc.
 //
-// This is a little fiddly as it's called before any compiled-in "static"
-// TinyUSB drivers, but we don't want to override those.
+// This is a little fiddly as it's called before any built-in TinyUSB drivers,
+// but we don't want to override those.
 //
 // Also, TinyUSB expects us to know how many interfaces to claim for each time
 // this function is called, and will behave unexpectedly if we claim the wrong
@@ -266,7 +266,7 @@ static uint16_t runtime_dev_open(uint8_t rhport, tusb_desc_interface_t const *it
         return 0;
     }
 
-    // If TinyUSB built-in drivers are enabled, don't claim any interface in the static range
+    // If TinyUSB built-in drivers are enabled, don't claim any interface in the built-in range
     if (mp_usb_device_builtin_enabled(usbd) && itf_desc->bInterfaceNumber < USBD_ITF_BUILTIN_MAX) {
         return 0;
     }
@@ -400,7 +400,7 @@ usbd_class_driver_t const *usbd_app_driver_get_cb(uint8_t *driver_count) {
 
 // Top-level USB device subsystem init.
 //
-// Makes an on-demand call to mp_usbd_activate(), if USB is needed.
+// Initialises TinyUSB and/or re-activates it, provided USB is needed.
 //
 // This is called on any soft reset after boot.py runs, or on demand if the
 // user activates USB and it hasn't activated yet.
@@ -414,7 +414,7 @@ void mp_usbd_init(void) {
         // Builtin  drivers are available, so initialise as defaults
         need_usb = true;
         #else
-        // No static drivers, nothing to initialise
+        // No builtin drivers, nothing to initialise
         need_usb = false;
         #endif
     } else {
@@ -472,7 +472,10 @@ static void mp_usbd_disconnect(mp_obj_usb_device_t *usbd) {
     bool was_connected = tud_connected();
     tud_disconnect();
     if (was_connected) {
-        mp_hal_delay_ms(50); // TODO: Always???
+        // Need to ensure a long enough delay before TinyUSB re-connects that
+        // the host triggers a bus reset. This may happen anyway, but delaying here
+        // lets us be "belt and braces" sure.
+        mp_hal_delay_ms(50);
     }
 }
 

From 35e8d184b1456ae0ed6f1df60e5559462179ded1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Mar 2024 15:00:37 +1100
Subject: [PATCH 0999/3129] shared/tinyusb: Increase default string descr max
 length to 40 chars.

When defining custom USB devices, longer strings may be needed.  Eventually
the memory for string descriptors can be allocated on demand, but for now
this bigger value should be reasonable.

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 c5644e3d583b2..ab47321afdc04 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -104,7 +104,7 @@
 #define USBD_MAX_POWER_MA (250)
 
 #ifndef MICROPY_HW_USB_DESC_STR_MAX
-#define MICROPY_HW_USB_DESC_STR_MAX (20)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
 #endif
 
 #if CFG_TUD_CDC

From db1b5df16c193190aa2f86ccfad97f6d014bd4c1 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Wed, 27 Mar 2024 10:53:33 +1100
Subject: [PATCH 1000/3129] stm32/README: Update list of supported STM32
 series.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/stm32/README.md | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/README.md b/ports/stm32/README.md
index 15025c5ae15cc..cd9e291396efe 100644
--- a/ports/stm32/README.md
+++ b/ports/stm32/README.md
@@ -2,9 +2,9 @@ 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,
-STM32H7, STM32L0, STM32L4 and STM32WB.  Parts of the code here utilise the
-STM32Cube HAL library.
+microcontrollers.  Supported MCU series are: STM32F0, STM32F4, STM32F7, STM32G0,
+STM32G4, STM32H5, STM32H7, STM32L0, STM32L1, STM32L4, STM32WL 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), PYBLITEv1.0 (with STM32F411) and PYBD-SFx (with
@@ -16,12 +16,6 @@ Other boards that are supported include ST Discovery and Nucleo boards.
 See the boards/ subdirectory, which contains the configuration files used
 to build each individual board.
 
-The STM32H7 series has preliminary support: there is a working REPL via
-USB and UART, as well as very basic peripheral support, but some things do
-not work and none of the advanced features of the STM32H7 are yet supported,
-such as the clock tree.  At this point the STM32H7 should be considered as a
-fast version of the STM32F7.
-
 Build instructions
 ------------------
 

From 5a7d78c732f5bdf608298c261549ab605ca5c338 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 3 Mar 2024 16:25:45 +0100
Subject: [PATCH 1001/3129] mimxrt,stm32: Set the security mode for the default
 WiFi AP.

The default CYW43 WiFi AP settings were missing the security mode, leaving
the AP in open mode by default.  That's changed by this commit to use
WPA/WPA2 by default.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/main.c | 1 +
 ports/stm32/main.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index dddf44e605f05..adb071a7fee8f 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -87,6 +87,7 @@ int main(void) {
         memcpy(&buf[0], "PYBD", 4);
         mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, (char *)&buf[4]);
         cyw43_wifi_ap_set_ssid(&cyw43_state, 8, buf);
+        cyw43_wifi_ap_set_auth(&cyw43_state, CYW43_AUTH_WPA2_MIXED_PSK);
         cyw43_wifi_ap_set_password(&cyw43_state, 8, (const uint8_t *)"pybd0123");
     }
     #endif
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 802a884d87d7f..90a62c024427e 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -477,6 +477,7 @@ void stm32_main(uint32_t reset_mode) {
         memcpy(&buf[0], "PYBD", 4);
         mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, (char *)&buf[4]);
         cyw43_wifi_ap_set_ssid(&cyw43_state, 8, buf);
+        cyw43_wifi_ap_set_auth(&cyw43_state, CYW43_AUTH_WPA2_MIXED_PSK);
         cyw43_wifi_ap_set_password(&cyw43_state, 8, (const uint8_t *)"pybd0123");
     }
     #endif

From 7753045a8febc69e9476f0985573575a05938c71 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 3 Mar 2024 16:13:55 +0100
Subject: [PATCH 1002/3129] extmod: Add interface and security constants at
 WLAN class level.

Other constants such as `machine.Pin.OUT` are defined on the class that
uses them, rather than at the module level.  This commit makes that the
case for WLAN network interfaces, adding IF_xxx and SEC_xxx constants.

The SEC_xxx constants are named as such to match the `security` keyword
that they are used with.  And the IF_xxx constants have IF as a prefix so
they are grouped together as names.

This scheme of putting constants on the class means that only the available
features (eg security configurations) are made available as constants.  It
also means that different network interfaces (eg WLAN vs LAN) can keep
their own specific constants within their class, such as PHY_xxx for LAN.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/network_cyw43.c      |  5 +++++
 extmod/network_esp_hosted.c |  9 +++++++++
 extmod/network_ninaw10.c    | 12 +++++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index d3543c5260435..3066cac75d3b7 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -543,6 +543,11 @@ static const mp_rom_map_elem_t network_cyw43_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&network_cyw43_config_obj) },
 
     // Class constants.
+    { MP_ROM_QSTR(MP_QSTR_IF_STA), MP_ROM_INT(MOD_NETWORK_STA_IF) },
+    { MP_ROM_QSTR(MP_QSTR_IF_AP), MP_ROM_INT(MOD_NETWORK_AP_IF) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_OPEN), MP_ROM_INT(CYW43_AUTH_OPEN) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA_WPA2), MP_ROM_INT(CYW43_AUTH_WPA2_MIXED_PSK) },
+
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(PM_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(PM_PERFORMANCE) },
     { MP_ROM_QSTR(MP_QSTR_PM_POWERSAVE), MP_ROM_INT(PM_POWERSAVE) },
diff --git a/extmod/network_esp_hosted.c b/extmod/network_esp_hosted.c
index f86eaad37ca0f..0747343d87ea6 100644
--- a/extmod/network_esp_hosted.c
+++ b/extmod/network_esp_hosted.c
@@ -309,6 +309,15 @@ static const mp_rom_map_elem_t network_esp_hosted_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ipconfig),            MP_ROM_PTR(&network_esp_hosted_ipconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_config),              MP_ROM_PTR(&network_esp_hosted_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_status),              MP_ROM_PTR(&network_esp_hosted_status_obj) },
+
+    // Class constants.
+    { MP_ROM_QSTR(MP_QSTR_IF_STA),              MP_ROM_INT(MOD_NETWORK_STA_IF) },
+    { MP_ROM_QSTR(MP_QSTR_IF_AP),               MP_ROM_INT(MOD_NETWORK_AP_IF) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_OPEN),            MP_ROM_INT(ESP_HOSTED_SEC_OPEN) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WEP),             MP_ROM_INT(ESP_HOSTED_SEC_WEP) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA_WPA2),        MP_ROM_INT(ESP_HOSTED_SEC_WPA_WPA2_PSK) },
+
+    // For backwards compatibility.
     { MP_ROM_QSTR(MP_QSTR_OPEN),                MP_ROM_INT(ESP_HOSTED_SEC_OPEN) },
     { MP_ROM_QSTR(MP_QSTR_WEP),                 MP_ROM_INT(ESP_HOSTED_SEC_WEP) },
     { MP_ROM_QSTR(MP_QSTR_WPA_PSK),             MP_ROM_INT(ESP_HOSTED_SEC_WPA_WPA2_PSK) },
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 90cdafc7a430a..926e228a35b88 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -860,11 +860,17 @@ static const mp_rom_map_elem_t nina_locals_dict_table[] = {
     { 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.
+    // Class constants.
+    { MP_ROM_QSTR(MP_QSTR_IF_STA),              MP_ROM_INT(MOD_NETWORK_STA_IF) },
+    { MP_ROM_QSTR(MP_QSTR_IF_AP),               MP_ROM_INT(MOD_NETWORK_AP_IF) },
+
+    { MP_ROM_QSTR(MP_QSTR_SEC_OPEN),            MP_ROM_INT(NINA_SEC_OPEN) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WEP),             MP_ROM_INT(NINA_SEC_WEP) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA_WPA2),        MP_ROM_INT(NINA_SEC_WPA_PSK) },
+
+    // For backwards compatibility.
     { 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) },
 };
 

From 81dff08bf24c78bdb06413a8e459b6dd305111da Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 14 Mar 2024 14:39:20 +0100
Subject: [PATCH 1003/3129] esp8266/network_wlan: Add interface and security
 WLAN constants.

Following the same change to extmod network interfaces.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/esp8266/network_wlan.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index 5838cc8bc6a86..af1611a2496ed 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -516,6 +516,15 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_ifconfig_obj) },
 
     // Constants
+    { MP_ROM_QSTR(MP_QSTR_IF_STA), MP_ROM_INT(STATION_IF)},
+    { MP_ROM_QSTR(MP_QSTR_IF_AP), MP_ROM_INT(SOFTAP_IF)},
+
+    { MP_ROM_QSTR(MP_QSTR_SEC_OPEN), MP_ROM_INT(AUTH_OPEN) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WEP), MP_ROM_INT(AUTH_WEP) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA), MP_ROM_INT(AUTH_WPA_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA2), MP_ROM_INT(AUTH_WPA2_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA_WPA2), MP_ROM_INT(AUTH_WPA_WPA2_PSK) },
+
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(NONE_SLEEP_T) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(MODEM_SLEEP_T) },
     { MP_ROM_QSTR(MP_QSTR_PM_POWERSAVE), MP_ROM_INT(LIGHT_SLEEP_T) },

From e8dd519e2dfb5c33cb7c304cd94ad24757bec0d3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 14 Mar 2024 14:39:53 +0100
Subject: [PATCH 1004/3129] esp32/network_wlan: Add interface and security WLAN
 constants.

Following the same change to extmod network interfaces.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/esp32/network_wlan.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index ece88e705f942..eb2bcda03e1b8 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -730,6 +730,20 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_network_ifconfig_obj) },
 
     // Constants
+    { MP_ROM_QSTR(MP_QSTR_IF_STA), MP_ROM_INT(WIFI_IF_STA)},
+    { MP_ROM_QSTR(MP_QSTR_IF_AP), MP_ROM_INT(WIFI_IF_AP)},
+
+    { MP_ROM_QSTR(MP_QSTR_SEC_OPEN), MP_ROM_INT(WIFI_AUTH_OPEN) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WEP), MP_ROM_INT(WIFI_AUTH_WEP) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA), MP_ROM_INT(WIFI_AUTH_WPA_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA2), MP_ROM_INT(WIFI_AUTH_WPA2_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA_WPA2), MP_ROM_INT(WIFI_AUTH_WPA_WPA2_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA2_ENT), MP_ROM_INT(WIFI_AUTH_WPA2_ENTERPRISE) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA3), MP_ROM_INT(WIFI_AUTH_WPA3_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA2_WPA3), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WAPI), MP_ROM_INT(WIFI_AUTH_WAPI_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_OWE), MP_ROM_INT(WIFI_AUTH_OWE) },
+
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(WIFI_PS_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(WIFI_PS_MIN_MODEM) },
     { MP_ROM_QSTR(MP_QSTR_PM_POWERSAVE), MP_ROM_INT(WIFI_PS_MAX_MODEM) },

From 328b6df0581cdc1bd72bf2624a5cc31d86ba7693 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 3 Mar 2024 20:24:31 +0100
Subject: [PATCH 1005/3129] samd/README: Fix incorrect port directory name.

At a single place, STM32 was used instead of SAMD.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/samd/README.md b/ports/samd/README.md
index 49e967102ecd9..8a7f121b66d30 100644
--- a/ports/samd/README.md
+++ b/ports/samd/README.md
@@ -23,7 +23,7 @@ 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.
+All other commands below should be executed from the ports/samd/ 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

From b41360d11920ae0bc97262bbfc20f3ab1572fae2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 19 Mar 2024 07:54:43 +0100
Subject: [PATCH 1006/3129] samd/boards: Enable MICROPY_HW_DFLL_USB_SYNC on
 appropriate boards.

For the boards ADAFRUIT_TRINKET_M0 and MINISAM_M4.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h | 2 ++
 ports/samd/boards/MINISAM_M4/mpconfigboard.h          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
index d3a6ba2d8687e..5732a20e3adc4 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "Trinket M0"
 #define MICROPY_HW_MCU_NAME   "SAMD21E18A"
+
+#define MICROPY_HW_DFLL_USB_SYNC    (1)
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.h b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
index 2dc403bad60fe..87acf301e36b5 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.h
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
@@ -1,4 +1,6 @@
 #define MICROPY_HW_BOARD_NAME "Mini SAM M4"
 #define MICROPY_HW_MCU_NAME   "SAMD51G19A"
 
+#define MICROPY_HW_DFLL_USB_SYNC    (1)
+
 #define MICROPY_HW_QSPIFLASH   GD25Q16C

From e8e9a39a6df11dbac0c2ffa1d863e6763e818165 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 19 Mar 2024 17:16:41 +0100
Subject: [PATCH 1007/3129] samd/mcu: Update clock config after changes to USB.

For all MCUs: run the test for USB clock recovery mode fallback after USB
has been started.

For samd21: change DFLL48 config from the open loop mode variant to sync
with the XOSC32KULP.  Matches better the 48MHz value.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/clock_config.h            |  2 +-
 ports/samd/main.c                    |  2 +
 ports/samd/mcu/samd21/clock_config.c | 74 +++++++++++++++++++---------
 ports/samd/mcu/samd51/clock_config.c |  6 +--
 ports/samd/samd_soc.c                |  1 -
 5 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/ports/samd/clock_config.h b/ports/samd/clock_config.h
index 35b7e532814b4..b045299396b1f 100644
--- a/ports/samd/clock_config.h
+++ b/ports/samd/clock_config.h
@@ -30,5 +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_peripheral_freq(void);
-void check_usb_recovery_mode(void);
+void check_usb_clock_recovery_mode(void);
 void enable_sercom_clock(int id);
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 9f213f27d41cf..2bbaf63e6e4c5 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -34,6 +34,7 @@
 #include "shared/runtime/pyexec.h"
 #include "shared/runtime/softtimer.h"
 #include "shared/tinyusb/mp_usbd.h"
+#include "clock_config.h"
 
 extern uint8_t _sstack, _estack, _sheap, _eheap;
 extern void adc_deinit_all(void);
@@ -59,6 +60,7 @@ void samd_main(void) {
         int ret = pyexec_file_if_exists("boot.py");
 
         mp_usbd_init();
+        check_usb_clock_recovery_mode();
 
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index d84ee526767c9..033d0f7c1b1eb 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -111,8 +111,29 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     SysTick_Config(cpu_freq / 1000);
 }
 
-void check_usb_recovery_mode(void) {
-    #if !MICROPY_HW_XOSC32K
+static void sync_dfll48_with_xosc32kulp(void) {
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
+    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+    }
+    // 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) {
+    }
+    // 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) {
+    }
+    // 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_STABLE |
+        SYSCTRL_DFLLCTRL_BPLCKC | SYSCTRL_DFLLCTRL_ENABLE;
+    while (!SYSCTRL->PCLKSR.bit.DFLLLCKF) {
+    }
+}
+
+void check_usb_clock_recovery_mode(void) {
+    #if MICROPY_HW_DFLL_USB_SYNC
     // Check USB status for up to 1 second. If not connected,
     // switch DFLL48M back to open loop
     for (int i = 0; i < 100; i++) {
@@ -121,10 +142,9 @@ void check_usb_recovery_mode(void) {
         }
         mp_hal_delay_ms(10);
     }
-    // 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
+    // No USB sync. Use XOSC32KULP as clock reference for DFLL48M
+    sync_dfll48_with_xosc32kulp();
+    #endif
 }
 
 // Purpose of the #defines for the clock configuration.
@@ -178,12 +198,12 @@ void init_clocks(uint32_t cpu_freq) {
     // GCLK1: 32kHz, source: XOSC32K or OSCULP32K, usage: FDPLL96M reference
     // GCLK2: 1-48MHz, source: DFLL48M, usage: Peripherals
     // GCLK3: 2Mhz,  source: DFLL48M, usage: us-counter (TC4/TC5)
-    // GCLK4: 32kHz, source: XOSC32K, if crystal present, usage: DFLL48M reference
+    // GCLK4: 32kHz, source: XOSC32K or OSCULP32K, 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: either XOSC32K or OSCULP32K or USB clock
-    //            from GCLK4.
+    //          - in closed loop mode: either XOSC32K or OSCULP32K from GCLK4
+    //            or USB clock.
     //          - in open loop mode: None
     // FDPLL96M: Reference source GCLK1
     //           Used for the CPU clock for freq >= 48Mhz
@@ -256,6 +276,17 @@ void init_clocks(uint32_t cpu_freq) {
 
     #else // MICROPY_HW_XOSC32K
 
+    // 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) {
+    }
+    // Connect the GCLK4 to the XOSC32KULP
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(4) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(4);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+
     // Enable DFLL48M
     SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
     while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
@@ -263,35 +294,30 @@ void init_clocks(uint32_t cpu_freq) {
 
     uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
         >> FUSES_DFLL48M_COARSE_CAL_Pos;
+    uint32_t fine = (*((uint32_t *)FUSES_DFLL48M_FINE_CAL_ADDR) & FUSES_DFLL48M_FINE_CAL_Msk)
+        >> FUSES_DFLL48M_COARSE_CAL_Pos;
     if (coarse == 0x3f) {
         coarse = 0x1f;
     }
-    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(511);
+    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(fine);
+    dfll48m_calibration = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(fine);
 
     #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) {
     }
 
-    // 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) {
-    }
+    #else  // MICROPY_HW_DFLL_USB_SYNC
+
+    sync_dfll48_with_xosc32kulp();
+
+    #endif  // MICROPY_HW_DFLL_USB_SYNC
+
     // 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);
diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index b30cc46f24596..77b6e4c632cd8 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -115,8 +115,8 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     SysTick_Config(cpu_freq / 1000);
 }
 
-void check_usb_recovery_mode(void) {
-    #if !MICROPY_HW_XOSC32K
+void check_usb_clock_recovery_mode(void) {
+    #if MICROPY_HW_DFLL_USB_SYNC
     // Check USB status for up to 1 second. If not connected,
     // switch DFLL48M back to open loop
     for (int i = 0; i < 100; i++) {
@@ -144,7 +144,7 @@ void check_usb_recovery_mode(void) {
     OSCCTRL->DFLLCTRLB.reg = 0;
     while (OSCCTRL->DFLLSYNC.bit.DFLLCTRLB == 1) {
     }
-    #endif // MICROPY_HW_XOSC32K
+    #endif
 }
 
 // Purpose of the #defines for the clock configuration.
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 5e6c5c4fc2407..1c8d49d1573db 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -116,7 +116,6 @@ void samd_init(void) {
     init_clocks(get_cpu_freq());
     init_us_counter();
     usb_init();
-    check_usb_recovery_mode();
     #if defined(MCU_SAMD51)
     mp_hal_ticks_cpu_enable();
     #endif

From 3980b361730a4d3313f6456fca1697db96b73870 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 20 Mar 2024 20:23:49 +0100
Subject: [PATCH 1008/3129] samd/samd_spiflash: Allow configuring the flash SPI
 baudrate.

Using a define for MICROPY_HW_SPIFLASH_BAUDRATE in mpconfigboard.h.  If not
defined the default is 24MHz.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/samd_spiflash.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
index 1313a6fd9d0d0..cd4f10640dbf1 100644
--- a/ports/samd/samd_spiflash.c
+++ b/ports/samd/samd_spiflash.c
@@ -49,6 +49,9 @@ const uint8_t _COMMANDS_32BIT[] = {0x13, 0x12, 0x21};  // READ, PROGRAM_PAGE, ER
 #define COMMAND_READ_SFDP (0x5A)
 #define PAGE_SIZE (256)
 #define SECTOR_SIZE (4096)
+#ifndef MICROPY_HW_SPIFLASH_BAUDRATE
+#define MICROPY_HW_SPIFLASH_BAUDRATE (24000000)
+#endif
 
 typedef struct _spiflash_obj_t {
     mp_obj_base_t base;
@@ -136,7 +139,7 @@ static mp_obj_t spiflash_make_new(const mp_obj_type_t *type, size_t n_args, size
 
     mp_obj_t spi_args[] = {
         MP_OBJ_NEW_SMALL_INT(MICROPY_HW_SPIFLASH_ID),
-        MP_OBJ_NEW_SMALL_INT(24000000),  // baudrate
+        MP_OBJ_NEW_SMALL_INT(MICROPY_HW_SPIFLASH_BAUDRATE),
         MP_OBJ_NEW_QSTR(MP_QSTR_mosi), MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_MOSI),
         MP_OBJ_NEW_QSTR(MP_QSTR_miso), MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_MISO),
         MP_OBJ_NEW_QSTR(MP_QSTR_sck), MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_SCK),

From d9b9e88899df86fec5679138f5f60ed62df0975f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 27 Mar 2024 10:53:29 +0100
Subject: [PATCH 1009/3129] samd/samd_qspiflash: Avoid reading status byte 2
 when not available.

Change provided by @ironss-iotec.

Tested with Adafruit, SEEED and MiniFig boards for non-interference.

Fixes issue #14190.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/samd_qspiflash.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
index 60aa434dcfdaa..d027a0495f3c0 100644
--- a/ports/samd/samd_qspiflash.c
+++ b/ports/samd/samd_qspiflash.c
@@ -337,9 +337,13 @@ static mp_obj_t samd_qspiflash_make_new(const mp_obj_type_t *type, size_t n_args
     // The write in progress bit should be low.
     while (read_status() & 0x01) {
     }
-    // The suspended write/erase bit should be low.
-    while (read_status2() & 0x80) {
+
+    if (!flash_device->single_status_byte) {
+        // The suspended write/erase bit should be low.
+        while (read_status2() & 0x80) {
+        }
     }
+
     run_command(QSPI_CMD_ENABLE_RESET);
     run_command(QSPI_CMD_RESET);
     // Wait 30us for the reset

From 4662a71f44bd8a0f8ff96d12e43f69be3bff8488 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 27 Mar 2024 11:11:57 +0100
Subject: [PATCH 1010/3129] drivers/memory: Add IS25LPWP064D chip to list of
 external flash devices.

Confirguration provided by by @ironss-iotec.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 drivers/memory/external_flash_device.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/memory/external_flash_device.h b/drivers/memory/external_flash_device.h
index 03798446036aa..b5cf4a8877ff5 100644
--- a/drivers/memory/external_flash_device.h
+++ b/drivers/memory/external_flash_device.h
@@ -442,6 +442,23 @@ typedef struct {
         .single_status_byte = false, \
 }
 
+// Settings for the ISSI devices
+#define IS25LPWP064D { \
+        .total_size = (1 << 23), /* 8 MiB */ \
+        .start_up_time_us = 5000, \
+        .manufacturer_id = 0x9D, \
+        .memory_type = 0x60, \
+        .capacity = 0x17, \
+        .max_clock_speed_mhz = 80, \
+        .quad_enable_bit_mask = 0x40, \
+        .has_sector_protection = false, \
+        .supports_fast_read = true, \
+        .supports_qspi = true, \
+        .supports_qspi_writes = true, \
+        .write_status_register_split = false, \
+        .single_status_byte = true, \
+}
+
 // Settings for a GENERIC device with the most common setting
 #define GENERIC { \
         .total_size = (1 << 21), /* 2 MiB */ \

From d2276f0d41c2fa66a224725fdb2411846c91cf1a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Mar 2024 13:10:12 +1100
Subject: [PATCH 1011/3129] py/dynruntime: Add
 mp_binary_get_size/get_val_array/set_val_array.

These are needed to read/write array.array objects, which is useful in
native code to provide fast extensions that work with big arrays of data.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h | 5 +++++
 py/nativeglue.c | 4 ++++
 py/nativeglue.h | 5 +++++
 tools/mpy_ld.py | 3 ++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 7765fca40d598..d07b1dce2c4e5 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -29,6 +29,7 @@
 // This header file contains definitions to dynamically implement the static
 // MicroPython runtime API defined in py/obj.h and py/runtime.h.
 
+#include "py/binary.h"
 #include "py/nativeglue.h"
 #include "py/objfun.h"
 #include "py/objstr.h"
@@ -184,6 +185,10 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 /******************************************************************************/
 // General runtime functions
 
+#define mp_binary_get_size(struct_type, val_type, palign) (mp_fun_table.binary_get_size((struct_type), (val_type), (palign)))
+#define mp_binary_get_val_array(typecode, p, index) (mp_fun_table.binary_get_val_array((typecode), (p), (index)))
+#define mp_binary_set_val_array(typecode, p, index, val_in) (mp_fun_table.binary_set_val_array((typecode), (p), (index), (val_in)))
+
 #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)))
diff --git a/py/nativeglue.c b/py/nativeglue.c
index 4cd090c0a2a78..ba3d93f760707 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "py/binary.h"
 #include "py/runtime.h"
 #include "py/smallint.h"
 #include "py/nativeglue.h"
@@ -330,6 +331,9 @@ const mp_fun_table_t mp_fun_table = {
     mp_obj_get_float_to_d,
     mp_get_buffer,
     mp_get_stream_raise,
+    mp_binary_get_size,
+    mp_binary_get_val_array,
+    mp_binary_set_val_array,
     &mp_plat_print,
     &mp_type_type,
     &mp_type_str,
diff --git a/py/nativeglue.h b/py/nativeglue.h
index 113f5fde6528f..1fa85933452cb 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -156,7 +156,12 @@ typedef struct _mp_fun_table_t {
     double (*obj_get_float_to_d)(mp_obj_t o);
     bool (*get_buffer)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
     const mp_stream_p_t *(*get_stream_raise)(mp_obj_t self_in, int flags);
+    size_t (*binary_get_size)(char struct_type, char val_type, size_t *palign);
+    mp_obj_t (*binary_get_val_array)(char typecode, void *p, size_t index);
+    void (*binary_set_val_array)(char typecode, void *p, size_t index, mp_obj_t val_in);
     const mp_print_t *plat_print;
+    // The following entries start at index 70 and are referenced by tools-mpy_ld.py,
+    // see constant MP_FUN_TABLE_MP_TYPE_TYPE_OFFSET.
     const mp_obj_type_t *type_type;
     const mp_obj_type_t *type_str;
     const mp_obj_type_t *type_list;
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index d7d0b945c5db1..b768b109a8425 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -52,6 +52,7 @@
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
 MP_SCOPE_FLAG_VIPERBSS = 0x40
 MP_SMALL_INT_BITS = 31
+MP_FUN_TABLE_MP_TYPE_TYPE_OFFSET = 70
 
 # ELF constants
 R_386_32 = 1
@@ -754,7 +755,7 @@ def link_objects(env, native_qstr_vals_len):
     # Resolve unknown symbols
     mp_fun_table_sec = Section(".external.mp_fun_table", b"", 0)
     fun_table = {
-        key: 67 + idx
+        key: MP_FUN_TABLE_MP_TYPE_TYPE_OFFSET + idx
         for idx, key in enumerate(
             [
                 "mp_type_type",

From 8b0efde927afb8409314ddf16f16a78b44b93d7a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Mar 2024 13:12:08 +1100
Subject: [PATCH 1012/3129] examples/natmod/framebuf: Enable FrameBuffer.poly
 method.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/natmod/framebuf/framebuf.c | 10 ++++++----
 extmod/modframebuf.c                |  7 +++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index e8f99b3b20cdd..1ba702e33d907 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -1,3 +1,4 @@
+#define MICROPY_PY_ARRAY (1)
 #define MICROPY_PY_FRAMEBUF (1)
 
 #include "py/dynruntime.h"
@@ -12,7 +13,7 @@ mp_obj_full_type_t mp_type_framebuf;
 
 #include "extmod/modframebuf.c"
 
-mp_map_elem_t framebuf_locals_dict_table[11];
+mp_map_elem_t framebuf_locals_dict_table[12];
 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) {
@@ -30,9 +31,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[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_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) };
+    framebuf_locals_dict_table[8] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_poly), MP_OBJ_FROM_PTR(&framebuf_poly_obj) };
+    framebuf_locals_dict_table[9] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
+    framebuf_locals_dict_table[10] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
+    framebuf_locals_dict_table[11] = (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, 2);
 
     mp_store_global(MP_QSTR_FrameBuffer, MP_OBJ_FROM_PTR(&mp_type_framebuf));
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 693e837f786a0..f3ce5b5ef0ec6 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -577,9 +577,7 @@ 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.
+#if MICROPY_PY_ARRAY
 
 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));
@@ -696,7 +694,8 @@ static mp_obj_t framebuf_poly(size_t n_args, const mp_obj_t *args_in) {
     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
+
+#endif // MICROPY_PY_ARRAY
 
 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]);

From bdbc869f9ea200c0d28b2bc7bfb60acd9d884e1b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Mar 2024 12:25:01 +1100
Subject: [PATCH 1013/3129] py/persistentcode: Bump .mpy sub-version to 6.3.

This is required because the .mpy native ABI was changed by the
introduction of `mp_proto_fun_t`, see commits:
- 416465d81e911b088836f4e7c37fac2bc0f67917
- 5e3006f1172d0eabbbefeb3268dfb942ec7cf9cd
- e2ff00e81113d7a3f32f860652017644b5d68bf1

And three `mp_binary` functions were added to `mp_fun_table` in
commit d2276f0d41c2fa66a224725fdb2411846c91cf1a.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.h                       | 2 +-
 tests/micropython/import_mpy_native_gc.py | 4 ++--
 tools/mpy-tool.py                         | 2 +-
 tools/mpy_ld.py                           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/persistentcode.h b/py/persistentcode.h
index 45a268d63fb91..d2b310f241f8d 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -35,7 +35,7 @@
 // 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 2
+#define MPY_SUB_VERSION 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)
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 6b8d7ddd632e2..7f4b2aefd59f4 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -52,9 +52,9 @@ def open(self, path, mode):
 # cat features0.mpy | python -c 'import sys; print(sys.stdin.buffer.read())'
 features0_file_contents = {
     # -march=x64
-    0x806: b'M\x06\x0a\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\x0b\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&\xa9 \x01"\xff',
     # -march=armv6m
-    0x1006: b"M\x06\x12\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\x13\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>\xa98\x01:\xff",
 }
 
 # Populate armv7m-derived archs based on armv6m.
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 06ccd6a1da8f3..86c4ba7579358 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -88,7 +88,7 @@ def __str__(self):
 
 class Config:
     MPY_VERSION = 6
-    MPY_SUB_VERSION = 2
+    MPY_SUB_VERSION = 3
     MICROPY_LONGINT_IMPL_NONE = 0
     MICROPY_LONGINT_IMPL_LONGLONG = 1
     MICROPY_LONGINT_IMPL_MPZ = 2
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index b768b109a8425..2e3da53eb57e0 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -36,7 +36,7 @@
 
 # MicroPython constants
 MPY_VERSION = 6
-MPY_SUB_VERSION = 2
+MPY_SUB_VERSION = 3
 MP_CODE_BYTECODE = 2
 MP_CODE_NATIVE_VIPER = 4
 MP_NATIVE_ARCH_X86 = 1

From 628a37e6cf157bab048f8d43b0e68f65a1e917f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Mar 2024 13:18:38 +1100
Subject: [PATCH 1014/3129] docs/reference/mpyfiles: Document change in .mpy
 sub-version.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpyfiles.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 02bac3d411e02..8e8284928dacb 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -86,7 +86,8 @@ and .mpy version.
 =================== ============
 MicroPython release .mpy version
 =================== ============
-v1.22.0 and up      6.2
+v1.23.0 and up      6.3
+v1.22.x             6.2
 v1.20 - v1.21.0     6.1
 v1.19.x             6
 v1.12 - v1.18       5
@@ -102,6 +103,7 @@ MicroPython repository at which the .mpy version was changed.
 =================== ========================================
 .mpy version change Git commit
 =================== ========================================
+6.2 to 6.3          bdbc869f9ea200c0d28b2bc7bfb60acd9d884e1b
 6.1 to 6.2          6967ff3c581a66f73e9f3d78975f47528db39980
 6 to 6.1            d94141e1473aebae0d3c63aeaa8397651ad6fa01
 5 to 6              f2040bfc7ee033e48acef9f289790f3b4e6b74e5

From c3e37d1fac380721b20f968bd33cb6633a53d126 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Mar 2024 17:28:06 +1100
Subject: [PATCH 1015/3129] extmod/modtls_axtls: Add verify_mode and CERT_NONE
 constant.

Supporting `verify_mode` and `CERT_NONE` is required for the new `ssl.py`
code, as well as `requests` to work.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modtls_axtls.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/extmod/modtls_axtls.c b/extmod/modtls_axtls.c
index 08a355cddb605..0e49fde2d84c5 100644
--- a/extmod/modtls_axtls.c
+++ b/extmod/modtls_axtls.c
@@ -39,6 +39,8 @@
 #define PROTOCOL_TLS_CLIENT (0)
 #define PROTOCOL_TLS_SERVER (1)
 
+#define CERT_NONE (0)
+
 // This corresponds to an SSLContext object.
 typedef struct _mp_obj_ssl_context_t {
     mp_obj_base_t base;
@@ -155,6 +157,25 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
+static void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    if (dest[0] == MP_OBJ_NULL) {
+        // Load attribute.
+        if (attr == MP_QSTR_verify_mode) {
+            // CERT_NONE is the only supported verify_mode value.
+            dest[0] = MP_OBJ_NEW_SMALL_INT(CERT_NONE);
+        } else {
+            // Continue lookup in locals_dict.
+            dest[1] = MP_OBJ_SENTINEL;
+        }
+    } else if (dest[1] != MP_OBJ_NULL) {
+        // Store attribute.
+        if (attr == MP_QSTR_verify_mode) {
+            // CERT_NONE is the only supported verify_mode value, so no need to store anything.
+            dest[0] = MP_OBJ_NULL;
+        }
+    }
+}
+
 static void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
     self->key = key_obj;
     self->cert = cert_obj;
@@ -199,6 +220,7 @@ static MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SSLContext,
     MP_TYPE_FLAG_NONE,
     make_new, ssl_context_make_new,
+    attr, ssl_context_attr,
     locals_dict, &ssl_context_locals_dict
     );
 
@@ -429,6 +451,7 @@ static const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
     // Constants.
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(PROTOCOL_TLS_CLIENT) },
     { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(PROTOCOL_TLS_SERVER) },
+    { MP_ROM_QSTR(MP_QSTR_CERT_NONE), MP_ROM_INT(CERT_NONE) },
 };
 static MP_DEFINE_CONST_DICT(mp_module_tls_globals, mp_module_tls_globals_table);
 

From 20a86eff5382d874f8f95a8009f76155c43a6aa9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Mar 2024 17:59:56 +1100
Subject: [PATCH 1016/3129] tests/net_inet: Add simpler tls sites test, and
 skip existing on axtls.

Ports that use axtls cannot run the `test_tls_sites.py` test because the
sites it connects to use advanced ciphers.  So skip this test on such
ports, and add a new, simpler test that doesn't require certificate
verification and works with axtls.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/test_tls_sites.py        |  7 ++++
 tests/net_inet/test_tls_sites_simple.py | 43 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 tests/net_inet/test_tls_sites_simple.py

diff --git a/tests/net_inet/test_tls_sites.py b/tests/net_inet/test_tls_sites.py
index d60f4872b6c52..3637194ad7998 100644
--- a/tests/net_inet/test_tls_sites.py
+++ b/tests/net_inet/test_tls_sites.py
@@ -1,8 +1,15 @@
+# Test making HTTPS requests to sites that may require advanced ciphers.
+
 import sys
 import select
 import socket
 import ssl
 
+# Don't run if ssl doesn't support required certificates (eg axtls).
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 
 def test_one(site, opts):
     ai = socket.getaddrinfo(site, 443, socket.AF_INET)
diff --git a/tests/net_inet/test_tls_sites_simple.py b/tests/net_inet/test_tls_sites_simple.py
new file mode 100644
index 0000000000000..9dece9d99c792
--- /dev/null
+++ b/tests/net_inet/test_tls_sites_simple.py
@@ -0,0 +1,43 @@
+# Test making HTTPS requests to sites that allow simple ciphers.
+
+import sys
+import socket
+import ssl
+
+SITES = (
+    ("micropython.org", "/ks/test.html"),
+    ("pypi.org", "/"),
+)
+
+
+def test_one(site, path):
+    ai = socket.getaddrinfo(site, 443, socket.AF_INET)
+    addr = ai[0][-1]
+
+    # Create SSLContext.
+    ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    if sys.implementation.name != "micropython":
+        # CPython compatibility: disable check_hostname
+        ssl_context.check_hostname = False
+    ssl_context.verify_mode = ssl.CERT_NONE
+
+    s = socket.socket(socket.AF_INET)
+    s.connect(addr)
+    s = ssl_context.wrap_socket(s)
+
+    s.write(b"GET %s HTTP/1.0\r\nHost: %s\r\n\r\n" % (bytes(path, "ascii"), bytes(site, "ascii")))
+    resp = s.read(4096)
+    s.close()
+
+    if resp.startswith(b"HTTP/1."):
+        print(site, "ok")
+    else:
+        print(site, "response doesn't start with HTTP/1.")
+
+
+def main():
+    for site, path in SITES:
+        test_one(site, path)
+
+
+main()

From b82945035954e7f28c64f1f962e17b280cdf7ea5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Mar 2024 17:48:06 +1100
Subject: [PATCH 1017/3129] samd/mcu: Guard static function with appropriate
 #if.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/mcu/samd21/clock_config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index 033d0f7c1b1eb..5ce127ec83ace 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -111,6 +111,7 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     SysTick_Config(cpu_freq / 1000);
 }
 
+#if !MICROPY_HW_XOSC32K || MICROPY_HW_DFLL_USB_SYNC
 static void sync_dfll48_with_xosc32kulp(void) {
     SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
     while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
@@ -131,6 +132,7 @@ static void sync_dfll48_with_xosc32kulp(void) {
     while (!SYSCTRL->PCLKSR.bit.DFLLLCKF) {
     }
 }
+#endif
 
 void check_usb_clock_recovery_mode(void) {
     #if MICROPY_HW_DFLL_USB_SYNC

From aa0f3ebe93b7e621a1852da21744d7763db27611 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 21 Mar 2024 12:02:24 +0100
Subject: [PATCH 1018/3129] extmod/modopenamp: Set a default log handler for
 ports.

Use the existing metal log handling mechanism instead of overriding the
metal_log, which causes build issues when logging is enabled.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/libmetal/metal/config.h |  7 -------
 extmod/modopenamp.c            | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/extmod/libmetal/metal/config.h b/extmod/libmetal/metal/config.h
index 459a2f4ca424d..e553f107837b0 100644
--- a/extmod/libmetal/metal/config.h
+++ b/extmod/libmetal/metal/config.h
@@ -57,13 +57,6 @@
 #define METAL_MAX_DEVICE_REGIONS 1
 #endif
 
-// generic/log.h
-#if METAL_LOG_HANDLER_ENABLE
-#include "py/mphal.h"
-#undef metal_log
-#define metal_log(level, ...) mp_printf(&mp_plat_print, __VA_ARGS__)
-#endif
-
 static inline void *__metal_allocate_memory(unsigned int size) {
     return m_tracked_calloc(1, size);
 }
diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index eb19c4b737ac1..1392f5427e5f5 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -28,9 +28,11 @@
 
 #if MICROPY_PY_OPENAMP
 
+#include <stdarg.h>
 #include "py/obj.h"
 #include "py/nlr.h"
 #include "py/runtime.h"
+#include "py/mpprint.h"
 
 #include "metal/sys.h"
 #include "metal/alloc.h"
@@ -315,6 +317,13 @@ static mp_obj_t openamp_new_service_callback(mp_obj_t ns_callback) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(openamp_new_service_callback_obj, openamp_new_service_callback);
 
+void openamp_metal_log_handler(enum metal_log_level level, const char *fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    mp_vprintf(&mp_plat_print, fmt, args);
+    va_end(args);
+}
+
 void openamp_init(void) {
     if (MP_STATE_PORT(virtio_device) != NULL) {
         // Already initialized.
@@ -322,7 +331,14 @@ void openamp_init(void) {
     }
 
     struct metal_device *device;
-    struct metal_init_params metal_params = METAL_INIT_DEFAULTS;
+    struct metal_init_params metal_params = { 0 };
+
+    #if METAL_LOG_HANDLER_ENABLE
+    // If logging is enabled, set the default log level and handler before
+    // calling metal_init, to allow ports to override them in metal_sys_init.
+    metal_params.log_level = METAL_LOG_DEBUG;
+    metal_params.log_handler = openamp_metal_log_handler;
+    #endif
 
     // Initialize libmetal.
     metal_init(&metal_params);

From 8936d3af468d922d284ebe8dbf831f5a25d84882 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 28 Mar 2024 08:22:55 +0100
Subject: [PATCH 1019/3129] extmod/modopenamp: Use metal logging functions
 exclusively.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/modopenamp.c                  |  8 +++-----
 extmod/modopenamp_remoteproc.c       |  2 --
 extmod/modopenamp_remoteproc_store.c | 12 +++++-------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index 1392f5427e5f5..7a19e55a660d9 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -77,8 +77,6 @@ static const char openamp_trace_buf[128];
 
 #endif // MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
 
-#define debug_printf(...)       // mp_printf(&mp_plat_print, __VA_ARGS__)
-
 #if MICROPY_PY_OPENAMP_REMOTEPROC
 extern mp_obj_type_t openamp_remoteproc_type;
 #endif
@@ -138,7 +136,7 @@ typedef struct _endpoint_obj_t {
 static const mp_obj_type_t endpoint_type;
 
 static int endpoint_recv_callback(struct rpmsg_endpoint *ept, void *data, size_t len, uint32_t src, void *priv) {
-    debug_printf("endpoint_recv_callback() message received src: %lu msg len: %d\n", src, len);
+    metal_log(METAL_LOG_DEBUG, "endpoint_recv_callback() message received src: %lu msg len: %d\n", src, len);
     endpoint_obj_t *self = metal_container_of(ept, endpoint_obj_t, ep);
     if (self->callback != mp_const_none) {
         mp_call_function_2(self->callback, mp_obj_new_int(src), mp_obj_new_bytearray_by_ref(len, data));
@@ -176,7 +174,7 @@ static mp_obj_t endpoint_send(uint n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     mp_buffer_info_t rbuf;
     mp_get_buffer_raise(pos_args[1], &rbuf, MP_BUFFER_READ);
-    debug_printf("endpoint_send() msg len: %d\n", rbuf.len);
+    metal_log(METAL_LOG_DEBUG, "endpoint_send() msg len: %d\n", rbuf.len);
 
     int bytes = 0;
     mp_int_t timeout = args[ARG_timeout].u_int;
@@ -260,7 +258,7 @@ void openamp_remoteproc_notified(mp_sched_node_t *node) {
 }
 
 static void openamp_ns_callback(struct rpmsg_device *rdev, const char *name, uint32_t dest) {
-    debug_printf("rpmsg_new_service_callback() new service request name: %s dest %lu\n", name, dest);
+    metal_log(METAL_LOG_DEBUG, "rpmsg_new_service_callback() new service request name: %s dest %lu\n", name, dest);
     // The remote processor advertises its presence to the host by sending
     // the Name Service (NS) announcement containing the name of the channel.
     virtio_dev_obj_t *virtio_device = metal_container_of(rdev, virtio_dev_obj_t, rvdev);
diff --git a/extmod/modopenamp_remoteproc.c b/extmod/modopenamp_remoteproc.c
index 6f43c71546bf2..20e4a47c18718 100644
--- a/extmod/modopenamp_remoteproc.c
+++ b/extmod/modopenamp_remoteproc.c
@@ -46,8 +46,6 @@
 #include "modopenamp.h"
 #include "modopenamp_remoteproc.h"
 
-#define DEBUG_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
-
 #if !MICROPY_PY_OPENAMP
 #error "MICROPY_PY_OPENAMP_REMOTEPROC requires MICROPY_PY_OPENAMP"
 #endif
diff --git a/extmod/modopenamp_remoteproc_store.c b/extmod/modopenamp_remoteproc_store.c
index 857c133469d6e..262e6f2ec79b1 100644
--- a/extmod/modopenamp_remoteproc_store.c
+++ b/extmod/modopenamp_remoteproc_store.c
@@ -47,8 +47,6 @@
 
 #if MICROPY_PY_OPENAMP_REMOTEPROC_STORE_ENABLE
 
-#define DEBUG_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
-
 // Note the initial file buffer size needs to be at least 512 to read
 // enough of the elf headers on the first call to store_open(), and on
 // subsequent calls to store functions, it gets reallocated if needed.
@@ -70,7 +68,7 @@ void *mp_openamp_remoteproc_store_alloc(void) {
 }
 
 static int openamp_remoteproc_store_open(void *store, const char *path, const void **image_data) {
-    DEBUG_printf("store_open(): %s\n", path);
+    metal_log(METAL_LOG_DEBUG, "store_open(): %s\n", path);
     mp_obj_t args[2] = {
         mp_obj_new_str(path, strlen(path)),
         MP_OBJ_NEW_QSTR(MP_QSTR_rb),
@@ -89,7 +87,7 @@ static int openamp_remoteproc_store_open(void *store, const char *path, const vo
 }
 
 static void openamp_remoteproc_store_close(void *store) {
-    DEBUG_printf("store_close()\n");
+    metal_log(METAL_LOG_DEBUG, "store_close()\n");
     openamp_remoteproc_filestore_t *fstore = store;
     mp_stream_close(fstore->file);
     metal_free_memory(fstore->buf);
@@ -113,17 +111,17 @@ static int openamp_remoteproc_store_load(void *store, size_t offset, size_t size
             // Note tracked allocs don't support realloc.
             fstore->len = size;
             fstore->buf = metal_allocate_memory(size);
-            DEBUG_printf("store_load() realloc to %lu\n", fstore->len);
+            metal_log(METAL_LOG_DEBUG, "store_load() realloc to %lu\n", fstore->len);
         }
         *data = fstore->buf;
-        DEBUG_printf("store_load(): pa 0x%lx offset %u size %u \n", (uint32_t)pa, offset, size);
+        metal_log(METAL_LOG_DEBUG, "store_load(): pa 0x%lx offset %u size %u \n", (uint32_t)pa, offset, size);
     } else {
         void *va = metal_io_phys_to_virt(io, pa);
         if (va == NULL) {
             return -EINVAL;
         }
         *data = va;
-        DEBUG_printf("store_load(): pa 0x%lx va 0x%p offset %u size %u \n", (uint32_t)pa, va, offset, size);
+        metal_log(METAL_LOG_DEBUG, "store_load(): pa 0x%lx va 0x%p offset %u size %u \n", (uint32_t)pa, va, offset, size);
     }
 
     mp_uint_t bytes = mp_stream_read_exactly(fstore->file, (void *)*data, size, &error);

From 23d7a915c1a2a5a9114640feba836ce57529a2e1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 24 Mar 2024 16:10:41 +0100
Subject: [PATCH 1020/3129] stm32/mpremoteprocport: Use metal logging
 functions.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/mpremoteprocport.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/ports/stm32/mpremoteprocport.c b/ports/stm32/mpremoteprocport.c
index 56dff43da4e73..11369e7aa00f5 100644
--- a/ports/stm32/mpremoteprocport.c
+++ b/ports/stm32/mpremoteprocport.c
@@ -40,11 +40,9 @@
 #include "metal/utilities.h"
 #include "extmod/modopenamp_remoteproc.h"
 
-#define DEBUG_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
-
 struct remoteproc *mp_openamp_remoteproc_init(struct remoteproc *rproc,
     const struct remoteproc_ops *ops, void *arg) {
-    DEBUG_printf("rproc_init()\n");
+    metal_log(METAL_LOG_DEBUG, "rproc_init()\n");
 
     rproc->ops = ops;
     rproc->state = RPROC_OFFLINE;
@@ -56,7 +54,7 @@ struct remoteproc *mp_openamp_remoteproc_init(struct remoteproc *rproc,
 void *mp_openamp_remoteproc_mmap(struct remoteproc *rproc, metal_phys_addr_t *pa,
     metal_phys_addr_t *da, size_t size, unsigned int attribute,
     struct metal_io_region **io) {
-    DEBUG_printf("rproc_mmap(): pa 0x%p da 0x%p io 0x%p size %u\n", *pa, *da, *io, size);
+    metal_log(METAL_LOG_DEBUG, "rproc_mmap(): pa 0x%p da 0x%p io 0x%p size %u\n", *pa, *da, *io, size);
 
     struct remoteproc_mem *mem;
     metal_phys_addr_t lpa = *pa;
@@ -100,11 +98,11 @@ void *mp_openamp_remoteproc_mmap(struct remoteproc *rproc, metal_phys_addr_t *pa
 }
 
 int mp_openamp_remoteproc_start(struct remoteproc *rproc) {
-    DEBUG_printf("rproc_start()\n");
+    metal_log(METAL_LOG_DEBUG, "rproc_start()\n");
     if ((RCC->GCR & RCC_GCR_BOOT_C2) || (FLASH->OPTSR_CUR & FLASH_OPTSR_BCM4)) {
         // The CM4 core has already been started manually, or auto-boot is enabled
         // via the option bytes, in either case the core can't be restarted.
-        DEBUG_printf("rproc_start(): CM4 core is already booted.\n");
+        metal_log(METAL_LOG_DEBUG, "rproc_start(): CM4 core is already booted.\n");
         return -1;
     }
 
@@ -122,7 +120,7 @@ int mp_openamp_remoteproc_start(struct remoteproc *rproc) {
 }
 
 int mp_openamp_remoteproc_stop(struct remoteproc *rproc) {
-    DEBUG_printf("rproc_stop()\n");
+    metal_log(METAL_LOG_DEBUG, "rproc_stop()\n");
     if (rproc->state == RPROC_RUNNING) {
         // There's no straightforward way to reset or shut down
         // the remote processor, so a full system reset is needed.
@@ -132,18 +130,18 @@ int mp_openamp_remoteproc_stop(struct remoteproc *rproc) {
 }
 
 int mp_openamp_remoteproc_config(struct remoteproc *rproc, void *data) {
-    DEBUG_printf("rproc_config()\n");
+    metal_log(METAL_LOG_DEBUG, "rproc_config()\n");
     (void)rproc;
     return 0;
 }
 
 void mp_openamp_remoteproc_remove(struct remoteproc *rproc) {
-    DEBUG_printf("rproc_remove()\n");
+    metal_log(METAL_LOG_DEBUG, "rproc_remove()\n");
     (void)rproc;
 }
 
 int mp_openamp_remoteproc_shutdown(struct remoteproc *rproc) {
-    DEBUG_printf("rproc_shutdown()\n");
+    metal_log(METAL_LOG_DEBUG, "rproc_shutdown()\n");
     if (rproc->state == RPROC_RUNNING) {
         // There's no straightforward way to reset or shut down
         // the remote processor, so a full system reset is needed.

From 87d821ab495cc409d2da91f261474b8b72f2c483 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 23 Mar 2024 16:11:15 +0100
Subject: [PATCH 1021/3129] mimxrt: Add support for OpenAMP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile                         |  14 +-
 .../boards/MIMXRT1170_EVK/mpconfigboard.mk    |   2 +
 ports/mimxrt/boards/MIMXRT1176.ld             |   4 +
 ports/mimxrt/mpmetalport.c                    | 111 ++++++++++++
 ports/mimxrt/mpmetalport.h                    |  73 ++++++++
 ports/mimxrt/mpremoteprocport.c               | 161 ++++++++++++++++++
 6 files changed, 364 insertions(+), 1 deletion(-)
 create mode 100644 ports/mimxrt/mpmetalport.c
 create mode 100644 ports/mimxrt/mpmetalport.h
 create mode 100644 ports/mimxrt/mpremoteprocport.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index dd1f5aa7c6ca5..96abb11bff433 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -172,7 +172,8 @@ SRC_HAL_IMX_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
+	$(MCU_DIR)/drivers/fsl_lpadc.c \
+	$(MCU_DIR)/drivers/fsl_mu.c
 else
 SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_adc.c \
@@ -267,6 +268,17 @@ ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
 SRC_C += mpnimbleport.c
 endif
 
+# Add mimxrt-specific implementation of libmetal (and optionally OpenAMP's rproc).
+# Note: libmetal code is generated via a pre-processor so ensure that runs first.
+ifeq ($(MICROPY_PY_OPENAMP),1)
+SRC_C += mpmetalport.c
+$(BUILD)/mpmetalport.o: $(BUILD)/openamp/metal/config.h
+ifeq ($(MICROPY_PY_OPENAMP_REMOTEPROC),1)
+SRC_C += mpremoteprocport.c
+$(BUILD)/mpremoteprocport.o: $(BUILD)/openamp/metal/config.h
+endif
+endif
+
 # Math library source files
 ifeq ($(MICROPY_FLOAT_IMPL),double)
     LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
index 1488730f7c7cf..6e5ee56aa1081 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
@@ -13,6 +13,8 @@ MICROPY_HW_SDRAM_SIZE  = 0x4000000  # 64MB
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_PY_OPENAMP = 1
+MICROPY_PY_OPENAMP_REMOTEPROC = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
 
diff --git a/ports/mimxrt/boards/MIMXRT1176.ld b/ports/mimxrt/boards/MIMXRT1176.ld
index d66c86a046024..4d114ef96fa4a 100644
--- a/ports/mimxrt/boards/MIMXRT1176.ld
+++ b/ports/mimxrt/boards/MIMXRT1176.ld
@@ -57,3 +57,7 @@ _gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
 _gc_heap_start = ORIGIN(m_ocrm);
 _gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
 #endif
+
+/* CM4 DTCM */
+_openamp_shm_region_start = 0x20220000;
+_openamp_shm_region_end  = 0x20230000;
diff --git a/ports/mimxrt/mpmetalport.c b/ports/mimxrt/mpmetalport.c
new file mode 100644
index 0000000000000..ca0c30fb2a56a
--- /dev/null
+++ b/ports/mimxrt/mpmetalport.c
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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.
+ *
+ * libmetal mimxrt port.
+ */
+
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#include "fsl_common.h"
+#include "fsl_mu.h"
+#include CPU_HEADER_H
+
+#include "metal/sys.h"
+#include "metal/utilities.h"
+#include "metal/device.h"
+
+struct metal_state _metal;
+static mp_sched_node_t rproc_notify_node;
+
+#define IRQ_PRI_MU  NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 10, 0)
+
+int metal_sys_init(const struct metal_init_params *params) {
+    metal_unused(params);
+
+    // Init MU.
+    MU_Init(MUA);
+
+    // Configure and enable MU IRQs.
+    MU_ClearStatusFlags(MUA, kMU_GenInt0Flag);
+    NVIC_SetPriority(MUA_IRQn, IRQ_PRI_MU);
+    NVIC_EnableIRQ(MUA_IRQn);
+    MU_EnableInterrupts(MUA, kMU_GenInt0InterruptEnable);
+
+    #ifndef VIRTIO_USE_DCACHE
+    // If cache management is not enabled, configure the MPU to disable caching
+    // for the entire shared memory region.
+    ARM_MPU_Disable();
+    MPU->RBAR = ARM_MPU_RBAR(10, METAL_MPU_REGION_BASE);
+    // Normal type, not shareable, non-cacheable
+    MPU->RASR = ARM_MPU_RASR(0, ARM_MPU_AP_FULL, 1, 0, 0, 0, 0, METAL_MPU_REGION_SIZE);
+    ARM_MPU_Enable(MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_HFNMIENA_Msk);
+    #endif
+
+    metal_bus_register(&metal_generic_bus);
+    return 0;
+}
+
+void metal_sys_finish(void) {
+    NVIC_DisableIRQ(MUA_IRQn);
+    metal_bus_unregister(&metal_generic_bus);
+}
+
+unsigned int sys_irq_save_disable(void) {
+    return disable_irq();
+}
+
+void sys_irq_restore_enable(unsigned int state) {
+    enable_irq(state);
+}
+
+void *metal_machine_io_mem_map(void *va, metal_phys_addr_t pa,
+    size_t size, unsigned int flags) {
+    metal_unused(pa);
+    metal_unused(size);
+    metal_unused(flags);
+    return va;
+}
+
+void metal_machine_cache_flush(void *addr, unsigned int len) {
+    SCB_CleanDCache_by_Addr(addr, len);
+}
+
+void metal_machine_cache_invalidate(void *addr, unsigned int len) {
+    SCB_InvalidateDCache_by_Addr(addr, len);
+}
+
+int metal_rproc_notify(void *priv, uint32_t id) {
+    MU_TriggerInterrupts(MUA, kMU_GenInt0InterruptTrigger);
+    return 0;
+}
+
+void MUA_IRQHandler(void) {
+    if (MU_GetStatusFlags(MUA) & kMU_GenInt0Flag) {
+        MU_ClearStatusFlags(MUA, kMU_GenInt0Flag);
+        mp_sched_schedule_node(&rproc_notify_node, openamp_remoteproc_notified);
+    }
+    __DSB();
+}
diff --git a/ports/mimxrt/mpmetalport.h b/ports/mimxrt/mpmetalport.h
new file mode 100644
index 0000000000000..994d57cc39fb4
--- /dev/null
+++ b/ports/mimxrt/mpmetalport.h
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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.
+ *
+ * libmetal mimxrt port.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_MPMETALPORT_H
+#define MICROPY_INCLUDED_MIMXRT_MPMETALPORT_H
+
+#include <stdlib.h>
+#include "py/mphal.h"
+#include "py/runtime.h"
+
+#define METAL_HAVE_STDATOMIC_H      0
+#define METAL_HAVE_FUTEX_H          0
+
+#define METAL_MAX_DEVICE_REGIONS    2
+
+// Set to 1 to enable the default log handler.
+#define METAL_LOG_HANDLER_ENABLE    0
+
+#define metal_cpu_yield()
+
+// Shared memory config
+#define METAL_SHM_NAME              "OPENAMP_SHM"
+// Note 1K must be reserved at the start of the openamp
+// shared memory region, for the shared resource table.
+#define METAL_RSC_ADDR              ((void *)_openamp_shm_region_start)
+#define METAL_RSC_SIZE              (1024)
+
+#define METAL_SHM_ADDR              ((metal_phys_addr_t)(_openamp_shm_region_start + METAL_RSC_SIZE))
+#define METAL_SHM_SIZE              ((size_t)(_openamp_shm_region_end - _openamp_shm_region_start - METAL_RSC_SIZE))
+
+#define METAL_MPU_REGION_BASE       ((uint32_t)_openamp_shm_region_start)
+#define METAL_MPU_REGION_SIZE       (ARM_MPU_REGION_SIZE_64KB)
+
+extern const char _openamp_shm_region_start[];
+extern const char _openamp_shm_region_end[];
+
+int metal_rproc_notify(void *priv, uint32_t id);
+extern void openamp_remoteproc_notified(mp_sched_node_t *node);
+
+static inline int __metal_sleep_usec(unsigned int usec) {
+    mp_hal_delay_us(usec);
+    return 0;
+}
+
+static inline void metal_generic_default_poll(void) {
+    MICROPY_EVENT_POLL_HOOK
+}
+
+#endif // MICROPY_INCLUDED_MIMXRT_METAL_PORT_H
diff --git a/ports/mimxrt/mpremoteprocport.c b/ports/mimxrt/mpremoteprocport.c
new file mode 100644
index 0000000000000..1e2cefc7ea69a
--- /dev/null
+++ b/ports/mimxrt/mpremoteprocport.c
@@ -0,0 +1,161 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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.
+ *
+ * modremoteproc mimxrt port.
+ */
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "fsl_common.h"
+#include "fsl_mu.h"
+
+#include "metal/alloc.h"
+#include "metal/errno.h"
+#include "metal/io.h"
+#include "metal/sys.h"
+#include "metal/device.h"
+#include "metal/utilities.h"
+#include "extmod/modopenamp_remoteproc.h"
+
+struct remoteproc *mp_openamp_remoteproc_init(struct remoteproc *rproc,
+    const struct remoteproc_ops *ops, void *arg) {
+    metal_log(METAL_LOG_DEBUG, "rproc_init()\n");
+
+    rproc->ops = ops;
+    rproc->state = RPROC_OFFLINE;
+    // Allocate the image store and save it in private data.
+    rproc->priv = mp_openamp_remoteproc_store_alloc();
+    return rproc;
+}
+
+void *mp_openamp_remoteproc_mmap(struct remoteproc *rproc, metal_phys_addr_t *pa,
+    metal_phys_addr_t *da, size_t size, unsigned int attribute,
+    struct metal_io_region **io) {
+    metal_log(METAL_LOG_DEBUG, "rproc_mmap(): pa 0x%p da 0x%p io 0x%p size %u\n", *pa, *da, *io, size);
+
+    struct remoteproc_mem *mem;
+    metal_phys_addr_t lpa = *pa;
+    metal_phys_addr_t lda = *da;
+
+    if (lda == METAL_BAD_PHYS) {
+        return NULL;
+    }
+
+    if (lpa == METAL_BAD_PHYS) {
+        lpa = lda;
+    }
+
+    if (lpa >= 0x1FFE0000 && lpa < 0x1FFFFFFF) {
+        // Map CM4 ITCM to CM7 address space.
+        lpa = 0x20200000 | (((uint32_t)lpa) & 0x1FFFF);
+        metal_log(METAL_LOG_DEBUG, "rproc_mmap(): remap 0x%p -> 0x%p\n", lda, lpa);
+    } else if (lpa >= 0x20000000 && lpa < 0x20020000) {
+        // Map CM4 DTCM to CM7 address space.
+        lpa = 0x20220000 | (((uint32_t)lpa) & 0x1FFFF);
+        metal_log(METAL_LOG_DEBUG, "rproc_mmap(): remap 0x%p -> 0x%p\n", lda, lpa);
+    }
+
+    mem = metal_allocate_memory(sizeof(*mem));
+    if (!mem) {
+        return NULL;
+    }
+
+    *io = metal_allocate_memory(sizeof(struct metal_io_region));
+    if (!*io) {
+        metal_free_memory(mem);
+        return NULL;
+    }
+
+    remoteproc_init_mem(mem, NULL, lpa, lda, size, *io);
+
+    metal_io_init(*io, (void *)lpa, &mem->pa, size,
+        sizeof(metal_phys_addr_t) << 3, attribute, NULL);
+
+    remoteproc_add_mem(rproc, mem);
+    *pa = lpa;
+    *da = lda;
+    return metal_io_phys_to_virt(*io, mem->pa);
+}
+
+int mp_openamp_remoteproc_start(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_start()\n");
+    if (SRC->SCR & SRC_SCR_BT_RELEASE_M4_MASK) {
+        // The CM4 core is already running.
+        metal_log(METAL_LOG_DEBUG, "rproc_start(): CM4 core is already booted.\n");
+        return -1;
+    }
+
+    // Flush M7 cache.
+    struct metal_list *node;
+    metal_list_for_each(&rproc->mems, node) {
+        struct remoteproc_mem *mem;
+        mem = metal_container_of(node, struct remoteproc_mem, node);
+        metal_log(METAL_LOG_DEBUG, "rproc_start() clean: pa 0x%p size %u\n", (uint32_t *)mem->pa, mem->size);
+        SCB_CleanDCache_by_Addr((uint32_t *)mem->pa, mem->size);
+    }
+
+    unsigned long offset = 0;
+    struct metal_io_region *io = remoteproc_get_io_with_da(rproc, rproc->bootaddr, &offset);
+    if (!io) {
+        return -1;
+    }
+
+    IOMUXC_LPSR_GPR->GPR0 = IOMUXC_LPSR_GPR_GPR0_CM4_INIT_VTOR_LOW(((uint32_t)io->virt) >> 3);
+    (void)IOMUXC_LPSR_GPR->GPR0;
+    IOMUXC_LPSR_GPR->GPR1 = IOMUXC_LPSR_GPR_GPR1_CM4_INIT_VTOR_HIGH(((uint32_t)io->virt) >> 16);
+    (void)IOMUXC_LPSR_GPR->GPR1;
+
+    SRC->CTRL_M4CORE = SRC_CTRL_M4CORE_SW_RESET_MASK;
+    SRC->SCR |= SRC_SCR_BT_RELEASE_M4_MASK;
+    return 0;
+}
+
+int mp_openamp_remoteproc_stop(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_stop()\n");
+    if (rproc->state == RPROC_RUNNING) {
+        NVIC_SystemReset();
+    }
+    return 0;
+}
+
+int mp_openamp_remoteproc_config(struct remoteproc *rproc, void *data) {
+    metal_log(METAL_LOG_DEBUG, "rproc_config()\n");
+    (void)rproc;
+    return 0;
+}
+
+void mp_openamp_remoteproc_remove(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_remove()\n");
+    (void)rproc;
+}
+
+int mp_openamp_remoteproc_shutdown(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_shutdown()\n");
+    if (rproc->state == RPROC_RUNNING) {
+        NVIC_SystemReset();
+    }
+    return 0;
+}

From 3997532186016c14753098294e4f3fcfad77ac2f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Mar 2024 23:07:32 +1100
Subject: [PATCH 1022/3129] webassembly/proxy_c: Ensure return value of async
 fun is passed to JS.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/proxy_c.c                   |  9 +++--
 tests/ports/webassembly/await_js_async_py.mjs | 35 +++++++++++++++++++
 .../webassembly/await_js_async_py.mjs.exp     | 12 +++++++
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 tests/ports/webassembly/await_js_async_py.mjs
 create mode 100644 tests/ports/webassembly/await_js_async_py.mjs.exp

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 1e4573ce0ba55..8d137f6271297 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -289,10 +289,11 @@ void proxy_c_to_js_get_dict(uint32_t c_ref, uint32_t *out) {
 
 static const mp_obj_fun_builtin_var_t resume_obj;
 
-EM_JS(void, js_then_resolve, (uint32_t * resolve, uint32_t * reject), {
+EM_JS(void, js_then_resolve, (uint32_t * ret_value, uint32_t * resolve, uint32_t * reject), {
+    const ret_value_js = proxy_convert_mp_to_js_obj_jsside(ret_value);
     const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
     const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
-    resolve_js(null);
+    resolve_js(ret_value_js);
 });
 
 EM_JS(void, js_then_reject, (uint32_t * resolve, uint32_t * reject), {
@@ -321,7 +322,9 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t value, mp_obj_t
     proxy_convert_mp_to_js_obj_cside(reject, out_reject);
 
     if (ret_kind == MP_VM_RETURN_NORMAL) {
-        js_then_resolve(out_resolve, out_reject);
+        uint32_t out_ret_value[PVN];
+        proxy_convert_mp_to_js_obj_cside(ret_value, out_ret_value);
+        js_then_resolve(out_ret_value, out_resolve, out_reject);
         return mp_const_none;
     } else if (ret_kind == MP_VM_RETURN_YIELD) {
         // ret_value should be a JS thenable
diff --git a/tests/ports/webassembly/await_js_async_py.mjs b/tests/ports/webassembly/await_js_async_py.mjs
new file mode 100644
index 0000000000000..953a7b783d5dc
--- /dev/null
+++ b/tests/ports/webassembly/await_js_async_py.mjs
@@ -0,0 +1,35 @@
+// Test JavaScript await'ing on Python async functions.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.asyncTimeout = (ms) =>
+    new Promise((resolve) => setTimeout(resolve, ms));
+
+mp.runPython(`
+import js
+
+def f0():
+    print("f0 run")
+    return 1
+
+async def f1():
+    print("f1 run")
+    return 2
+
+async def f2():
+    print("f2 start")
+    await js.asyncTimeout(0)
+    print("f2 end")
+    return 3
+
+async def f3():
+    print("f3 start")
+    ret = await f2()
+    print("f3 end")
+    return ret + 1
+`);
+
+console.log("f0 return:", await mp.globals.get("f0")());
+console.log("f1 return:", await mp.globals.get("f1")());
+console.log("f2 return:", await mp.globals.get("f2")());
+console.log("f3 return:", await mp.globals.get("f3")());
diff --git a/tests/ports/webassembly/await_js_async_py.mjs.exp b/tests/ports/webassembly/await_js_async_py.mjs.exp
new file mode 100644
index 0000000000000..ab8cbabebb31f
--- /dev/null
+++ b/tests/ports/webassembly/await_js_async_py.mjs.exp
@@ -0,0 +1,12 @@
+f0 run
+f0 return: 1
+f1 run
+f1 return: 2
+f2 start
+f2 end
+f2 return: 3
+f3 start
+f2 start
+f2 end
+f3 end
+f3 return: 4

From 7c62fbe3f227eb87c21295efddbb7dcf101a4bab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Mar 2024 23:07:39 +1100
Subject: [PATCH 1023/3129] webassembly/proxy_js: Promote Python thenable to a
 Promise.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/proxy_js.js                 | 17 +++++++++-
 .../ports/webassembly/fun_py_callback_js.mjs  | 31 +++++++++++++++++++
 .../webassembly/fun_py_callback_js.mjs.exp    |  8 +++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 tests/ports/webassembly/fun_py_callback_js.mjs
 create mode 100644 tests/ports/webassembly/fun_py_callback_js.mjs.exp

diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 7a0a1bbe8932d..1f60bf41e81a0 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -89,7 +89,22 @@ function proxy_call_python(target, argumentsList) {
     if (argumentsList.length > 0) {
         Module._free(args);
     }
-    return proxy_convert_mp_to_js_obj_jsside_with_free(value);
+    const ret = proxy_convert_mp_to_js_obj_jsside_with_free(value);
+    if (ret instanceof PyProxyThenable) {
+        // In Python when an async function is called it creates the
+        // corresponding "generator", which must then be executed at
+        // the top level by an asyncio-like scheduler.  In JavaScript
+        // the semantics for async functions is that they are started
+        // immediately (their non-async prefix code is executed immediately)
+        // and only if they await do they return a Promise to delay the
+        // execution of the remainder of the function.
+        //
+        // Emulate the JavaScript behaviour here by resolving the Python
+        // async function.  We assume that the caller who gets this
+        // return is JavaScript.
+        return Promise.resolve(ret);
+    }
+    return ret;
 }
 
 function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
diff --git a/tests/ports/webassembly/fun_py_callback_js.mjs b/tests/ports/webassembly/fun_py_callback_js.mjs
new file mode 100644
index 0000000000000..5541e7a4617fe
--- /dev/null
+++ b/tests/ports/webassembly/fun_py_callback_js.mjs
@@ -0,0 +1,31 @@
+// Test using Python functions as JS callbacks.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.asyncTimeout = (ms) =>
+    new Promise((resolve) => setTimeout(resolve, ms));
+
+mp.runPython(`
+import js
+
+def f0():
+    print("f0 run")
+
+async def f1():
+    print("f1 run")
+
+async def f2():
+    print("f2 start")
+    await js.asyncTimeout(0)
+    print("f2 end")
+
+async def f3():
+    print("f3 start")
+    await f2()
+    print("f3 end")
+
+js.setTimeout(f0, 0)
+js.setTimeout(f1, 50)
+js.setTimeout(f2, 100)
+js.setTimeout(f3, 150)
+`);
diff --git a/tests/ports/webassembly/fun_py_callback_js.mjs.exp b/tests/ports/webassembly/fun_py_callback_js.mjs.exp
new file mode 100644
index 0000000000000..732062c840e2a
--- /dev/null
+++ b/tests/ports/webassembly/fun_py_callback_js.mjs.exp
@@ -0,0 +1,8 @@
+f0 run
+f1 run
+f2 start
+f2 end
+f3 start
+f2 start
+f2 end
+f3 end

From 5114f2c1ea7c05fc7ab920299967595cfc5307de Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Mar 2024 23:58:50 +1100
Subject: [PATCH 1024/3129] webassembly/proxy_js: Allow a Python proxy of a
 function to be undone.

This optimises the case where a Python function is, for example, stored to
a JavaScript attribute and then later retrieved from Python.  The Python
function no longer needs to be a proxy with double proxying needed for the
call from Python -> JavaScript -> Python.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/objjsproxy.c            | 12 +++++-
 ports/webassembly/proxy_js.js             | 16 ++++---
 tests/ports/webassembly/fun_proxy.mjs     | 52 +++++++++++++++++++++++
 tests/ports/webassembly/fun_proxy.mjs.exp | 19 +++++++++
 4 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100644 tests/ports/webassembly/fun_proxy.mjs
 create mode 100644 tests/ports/webassembly/fun_proxy.mjs.exp

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 5e2aeb6a36e4b..098f4e75f5466 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -48,9 +48,17 @@ EM_JS(bool, lookup_attr, (int jsref, const char *str, uint32_t * out), {
     const attr = UTF8ToString(str);
     if (attr in base) {
         let value = base[attr];
-        if (typeof value == "function") {
+        if (typeof value === "function") {
             if (base !== globalThis) {
-                value = value.bind(base);
+                if ("_ref" in value) {
+                    // This is a proxy of a Python function, it doesn't need
+                    // binding.  And not binding it means if it's passed back
+                    // to Python then it can be extracted from the proxy as a
+                    // true Python function.
+                } else {
+                    // A function that is not a Python function.  Bind it.
+                    value = value.bind(base);
+                }
             }
         }
         proxy_convert_js_to_mp_obj_jsside(value, out);
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 1f60bf41e81a0..042deb7b05c7f 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -135,10 +135,11 @@ function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
         Module.stringToUTF8(js_obj, buf, len + 1);
         Module.setValue(out + 4, len, "i32");
         Module.setValue(out + 8, buf, "i32");
-    } else if (js_obj instanceof PyProxy) {
-        kind = PROXY_KIND_JS_PYPROXY;
-        Module.setValue(out + 4, js_obj._ref, "i32");
-    } else if (js_obj instanceof PyProxyThenable) {
+    } else if (
+        js_obj instanceof PyProxy ||
+        (typeof js_obj === "function" && "_ref" in js_obj) ||
+        js_obj instanceof PyProxyThenable
+    ) {
         kind = PROXY_KIND_JS_PYPROXY;
         Module.setValue(out + 4, js_obj._ref, "i32");
     } else {
@@ -151,7 +152,11 @@ function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
 }
 
 function proxy_convert_js_to_mp_obj_jsside_force_double_proxy(js_obj, out) {
-    if (js_obj instanceof PyProxy) {
+    if (
+        js_obj instanceof PyProxy ||
+        (typeof js_obj === "function" && "_ref" in js_obj) ||
+        js_obj instanceof PyProxyThenable
+    ) {
         const kind = PROXY_KIND_JS_OBJECT;
         const id = proxy_js_ref.length;
         proxy_js_ref[id] = js_obj;
@@ -212,6 +217,7 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
             obj = (...args) => {
                 return proxy_call_python(id, args);
             };
+            obj._ref = id;
         } else if (kind === PROXY_KIND_MP_GENERATOR) {
             obj = new PyProxyThenable(id);
         } else {
diff --git a/tests/ports/webassembly/fun_proxy.mjs b/tests/ports/webassembly/fun_proxy.mjs
new file mode 100644
index 0000000000000..87cce44f2bc49
--- /dev/null
+++ b/tests/ports/webassembly/fun_proxy.mjs
@@ -0,0 +1,52 @@
+// Test proxying of functions between Python and JavaScript.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+// Create JS functions living on the JS and Py sides.
+globalThis.jsFunAdd = (x, y) => x + y;
+mp.globals.set("js_fun_sub", (x, y) => x - y);
+
+console.log("== JavaScript side ==");
+
+// JS function living on the JS side, should be a function.
+console.log(globalThis.jsFunAdd);
+console.log(globalThis.jsFunAdd(1, 2));
+
+// JS function living on the Py side, should be a function.
+console.log(mp.globals.get("js_fun_sub"));
+console.log(mp.globals.get("js_fun_sub")(1, 2));
+
+mp.runPython(`
+import js
+
+print("== Python side ==")
+
+py_fun_mul = lambda x, y: x * y
+js.pyFunDiv = lambda x, y: x / y
+
+# JS function living on the JS side, should be a JsProxy.
+print(type(js.jsFunAdd))
+print(js.jsFunAdd(1, 2))
+
+# JS function living on the Py side, should be a JsProxy.
+print(type(js_fun_sub))
+print(js_fun_sub(1, 2))
+
+# Py function living on the Py side, should be a function.
+print(type(py_fun_mul))
+print(py_fun_mul(2, 3))
+
+# Py function living on the JS side, should be a function.
+print(type(js.pyFunDiv))
+print(js.pyFunDiv(6, 2))
+`);
+
+console.log("== JavaScript side ==");
+
+// Py function living on the Py side, should be a proxy function.
+console.log(mp.globals.get("py_fun_mul"));
+console.log(mp.globals.get("py_fun_mul")(2, 3));
+
+// Py function living on the JS side, should be a proxy function.
+console.log(globalThis.pyFunDiv);
+console.log(globalThis.pyFunDiv(6, 2));
diff --git a/tests/ports/webassembly/fun_proxy.mjs.exp b/tests/ports/webassembly/fun_proxy.mjs.exp
new file mode 100644
index 0000000000000..4aeaa47b22517
--- /dev/null
+++ b/tests/ports/webassembly/fun_proxy.mjs.exp
@@ -0,0 +1,19 @@
+== JavaScript side ==
+[Function (anonymous)]
+3
+[Function (anonymous)]
+-1
+== Python side ==
+<class 'JsProxy'>
+3
+<class 'JsProxy'>
+-1
+<class 'function'>
+6
+<class 'function'>
+3.0
+== JavaScript side ==
+[Function: obj] { _ref: 4 }
+6
+[Function: obj] { _ref: 3 }
+3

From 53d0050255ef92df5adc9255380f170eb33bd2c9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 11 Apr 2024 17:03:57 +0200
Subject: [PATCH 1025/3129] lib/arduino-lib: Update submodule to the latest.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 lib/arduino-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/arduino-lib b/lib/arduino-lib
index 277efd50fcc63..89424753e18ed 160000
--- a/lib/arduino-lib
+++ b/lib/arduino-lib
@@ -1 +1 @@
-Subproject commit 277efd50fcc637e2e2e87c9aa50c06acc9080970
+Subproject commit 89424753e18ed58b7d8041085c9d2e1d162f09ca

From d11ca092f75d2652df403dda7448fe1bc8f98cf7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 5 Apr 2024 14:46:45 +1100
Subject: [PATCH 1026/3129] shared/tinyusb: Fix dynamic USB control callbacks
 for wLength==0.

In the case where an OUT control transfer triggers with wLength==0 (i.e.
all data sent in the SETUP phase, and no additional data phase) the
callbacks were previously implemented to return b"" (i.e. an empty buffer
for the data phase).

However this didn't actually work as intended because b"" can't provide a
RW buffer (needed for OUT transfers with a data phase to write data into),
so actually the endpoint would stall.

The symptom was often that the device process the request (if processing
it in the SETUP phase when all information was already available), but the
host sees the endpoint stall and eventually returns an error.

This commit changes the behaviour so returning True from the SETUP phase of
a control transfer queues a zero length status response.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/machine.USBDevice.rst | 20 +++++++++++++++-----
 shared/tinyusb/mp_usbd_runtime.c   | 15 ++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/docs/library/machine.USBDevice.rst b/docs/library/machine.USBDevice.rst
index 82897b280d0fe..e02d3c02df336 100644
--- a/docs/library/machine.USBDevice.rst
+++ b/docs/library/machine.USBDevice.rst
@@ -130,15 +130,25 @@ Methods
 
       Second argument is a memoryview to read the USB control request
       data for this stage. The memoryview is only valid until the
-      callback function returns.
+      callback function returns. Data in this memoryview will be the same
+      across each of the three stages of a single transfer.
+
+      A successful transfer consists of this callback being called in sequence
+      for the three stages. Generally speaking, if a device wants to do
+      something in response to a control request then it's best to wait until
+      the ACK stage to confirm the host controller completed the transfer as
+      expected.
 
       The callback should return one of the following values:
 
-      - ``False`` to stall the endpoint and reject the transfer.
+      - ``False`` to stall the endpoint and reject the transfer. It won't
+        proceed to any remaining stages.
       - ``True`` to continue the transfer to the next stage.
-      - A buffer object to provide data for this stage of the transfer.
-        This should be a writable buffer for an ``OUT`` direction transfer, or a
-        readable buffer with data for an ``IN`` direction transfer.
+      - A buffer object can be returned at the SETUP stage when the transfer
+        will send or receive additional data. Typically this is the case when
+        the ``wLength`` field in the request has a non-zero value. This should
+        be a writable buffer for an ``OUT`` direction transfer, or a readable
+        buffer with data for an ``IN`` direction transfer.
 
     - ``xfer_cb`` - This callback is called whenever a non-control
       transfer submitted by calling :func:`USBDevice.submit_xfer` completes.
diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index 0b4c79831becd..7ff7dd4ab2ff0 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -295,6 +295,7 @@ static bool runtime_dev_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_cont
     mp_obj_usb_device_t *usbd = MP_OBJ_TO_PTR(MP_STATE_VM(usbd));
     tusb_dir_t dir = request->bmRequestType_bit.direction;
     mp_buffer_info_t buf_info;
+    bool result;
 
     if (!usbd) {
         return false;
@@ -319,7 +320,7 @@ static bool runtime_dev_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_cont
 
     // Check if callback returned any data to submit
     if (mp_get_buffer(cb_res, &buf_info, dir == TUSB_DIR_IN ? MP_BUFFER_READ : MP_BUFFER_RW)) {
-        bool result = tud_control_xfer(USBD_RHPORT,
+        result = tud_control_xfer(USBD_RHPORT,
             request,
             buf_info.buf,
             buf_info.len);
@@ -328,17 +329,21 @@ static bool runtime_dev_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_cont
             // Keep buffer object alive until the transfer completes
             usbd->xfer_data[0][dir] = cb_res;
         }
-
-        return result;
     } else {
         // Expect True or False to stall or continue
+        result = mp_obj_is_true(cb_res);
 
-        if (stage == CONTROL_STAGE_ACK) {
+        if (stage == CONTROL_STAGE_SETUP && result) {
+            // If no additional data but callback says to continue transfer then
+            // queue a status response.
+            tud_control_status(rhport, request);
+        } else if (stage == CONTROL_STAGE_ACK) {
             // Allow data to be GCed once it's no longer in use
             usbd->xfer_data[0][dir] = mp_const_none;
         }
-        return mp_obj_is_true(cb_res);
     }
+
+    return result;
 }
 
 static bool runtime_dev_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes) {

From f76cf2940288f699b8c6346beabdf4de65ddfa31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= <j.ne@posteo.net>
Date: Sat, 20 Apr 2024 19:36:03 +0200
Subject: [PATCH 1027/3129] github/workflows: Update coverage workflow to
 codecov-action@v4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: https://github.com/micropython/micropython/issues/14340

Signed-off-by: J. Neuschäfer <j.ne@posteo.net>
---
 .github/workflows/ports_unix.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 2367eddbe6ea5..4473847db61ef 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -88,10 +88,11 @@ 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@v3
+      uses: codecov/codecov-action@v4
       with:
         fail_ci_if_error: true
         verbose: true
+        token: ${{ secrets.CODECOV_TOKEN }}
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures

From 19844b4983066c5771cb60a341c3fce52bca2a87 Mon Sep 17 00:00:00 2001
From: Simon Wood <simon@mungewell.org>
Date: Thu, 28 Mar 2024 09:27:25 -0600
Subject: [PATCH 1028/3129] rp2/modmachine: Prevent lock-up when lightsleep()
 called within thread.

When `lightsleep()` is called from within a thread the interrupts may not
be enabled on current core, and thus the call to `lightsleep()` never
completes.

Fixes issue #14092.

Signed-off-by: Simon Wood <simon@mungewell.org>
---
 ports/rp2/modmachine.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 6189e7dc53796..5551bf723a797 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -127,10 +127,10 @@ static void mp_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();
+    uint32_t my_interrupts = mp_thread_begin_atomic_section();
     #if MICROPY_PY_NETWORK_CYW43
     if (cyw43_has_pending && cyw43_poll != NULL) {
-        restore_interrupts(my_interrupts);
+        mp_thread_end_atomic_section(my_interrupts);
         return;
     }
     #endif
@@ -165,8 +165,15 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     } else {
         uint32_t sleep_en0 = clocks_hw->sleep_en0;
         uint32_t sleep_en1 = clocks_hw->sleep_en1;
+        bool timer3_enabled = irq_is_enabled(3);
+
         clocks_hw->sleep_en0 = CLOCKS_SLEEP_EN0_CLK_RTC_RTC_BITS;
         if (use_timer_alarm) {
+            // Make sure ALARM3/IRQ3 is enabled on _this_ core
+            timer_hw->inte |= 1 << 3;
+            if (!timer3_enabled) {
+                irq_set_enabled(3, true);
+            }
             // 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;
@@ -177,6 +184,9 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         scb_hw->scr |= M0PLUS_SCR_SLEEPDEEP_BITS;
         __wfi();
         scb_hw->scr &= ~M0PLUS_SCR_SLEEPDEEP_BITS;
+        if (!timer3_enabled) {
+            irq_set_enabled(3, false);
+        }
         clocks_hw->sleep_en0 = sleep_en0;
         clocks_hw->sleep_en1 = sleep_en1;
     }
@@ -186,7 +196,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     // Bring back all clocks.
     clocks_init();
-    restore_interrupts(my_interrupts);
+    mp_thread_end_atomic_section(my_interrupts);
 }
 
 NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {

From 3129b69e0f990d9f9bf8cc73d7650ddd8a5e06a3 Mon Sep 17 00:00:00 2001
From: "Michiel W. Beijen" <mb@x14.nl>
Date: Tue, 2 Apr 2024 21:58:29 +0200
Subject: [PATCH 1029/3129] rp2/README: Fix typo, improve sentence about
 building with other boards.

Signed-off-by: Michiel W. Beijen <mb@x14.nl>
---
 ports/rp2/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/README.md b/ports/rp2/README.md
index e22fb3093d72b..c2f3771cd313f 100644
--- a/ports/rp2/README.md
+++ b/ports/rp2/README.md
@@ -37,7 +37,7 @@ 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
+If you are using a board other than a Raspberry Pi Pico, you should
 pass the board name to the build; e.g. for Raspberry Pi Pico W:
 
     $ make BOARD=RPI_PICO_W submodules

From 40f7e9ce20e845ce2372347e5b5fd4dbff69ef6e Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 18 Apr 2024 12:01:45 +0200
Subject: [PATCH 1030/3129] py/objfun: Fix C++ compatibility with casting in
 inline functions.

Explicit casts are needed.

Fixes recent changes from 648a7578da21cc7ddb4046fc59891144e797b983 and
9400229766624e80db6a6f95af287a5542dc1b43.

Signed-off-by: stijn <stijn@ignitron.net>
---
 py/objfun.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/objfun.h b/py/objfun.h
index af7c334858836..f16ef76b80e70 100644
--- a/py/objfun.h
+++ b/py/objfun.h
@@ -56,14 +56,14 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 #if MICROPY_EMIT_NATIVE
 
 static inline 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));
+    mp_obj_fun_bc_t *o = (mp_obj_fun_bc_t *)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);
 }
 
 static inline mp_obj_t mp_obj_new_fun_viper(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_malloc(mp_obj_fun_bc_t, &mp_type_fun_viper);
-    o->bytecode = fun_data;
+    o->bytecode = (const byte *)fun_data;
     o->context = mc;
     o->child_table = child_table;
     return MP_OBJ_FROM_PTR(o);
@@ -101,9 +101,9 @@ static inline void *mp_obj_fun_native_get_generator_resume(const mp_obj_fun_bc_t
 
 #if MICROPY_EMIT_INLINE_ASM
 static inline 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);
+    mp_obj_fun_asm_t *o = (mp_obj_fun_asm_t *)mp_obj_malloc(mp_obj_fun_asm_t, &mp_type_fun_asm);
     o->n_args = n_args;
-    o->fun_data = fun_data;
+    o->fun_data = (const byte *)fun_data;
     o->type_sig = type_sig;
     return MP_OBJ_FROM_PTR(o);
 }

From ce491ab0d168a8278062e1fc7ebed3ca47ab89d2 Mon Sep 17 00:00:00 2001
From: Vonasmic <kasarkal123@gmail.com>
Date: Wed, 3 Apr 2024 10:35:58 +0200
Subject: [PATCH 1031/3129] py/obj: Fix initialiser order in
 MP_DEFINE_CONST_OBJ_TYPE_NARGS_ macros.

This commit swaps the order of the `flags` and `name` struct initialisers
for `mp_obj_type_t`, to fix an incompatibility with C++.  The original
order of the initialiser didn't match the definition of the type, and
although that's still legal C, it's not legal C++.

Signed-off-by: Vonasmic <kasarkal123@gmail.com>
---
 py/obj.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 9f2bb46e41d74..86952565c55d6 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -753,20 +753,20 @@ 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{''.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, } }
+//     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 }}, .flags = _flags, .name = _name{''.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 }, .flags = _flags, .name = _name }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_1(_struct_type, _typename, _name, _flags, f1, v1) const _struct_type _typename = { .base = { &mp_type_type }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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 }, .flags = _flags, .name = _name, .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

From 4bed614e707c0644c06e117f848fa12605c711cd Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 09:24:36 +1100
Subject: [PATCH 1032/3129] py/objarray: Fix use-after-free if extending a
 bytearray from itself.

Two cases, one assigning to a slice.
Closes https://github.com/micropython/micropython/issues/13283

Second is extending a slice from itself, similar logic.

In both cases the problem occurs when m_renew causes realloc to move the
buffer, leaving a dangling pointer behind.

There are more complex and hard to fix cases when either argument is a
memoryview into the buffer, currently resizing to a new address breaks
memoryviews into that object.

Reproducing this bug and confirming the fix was done by running the unix
port under valgrind with GC-aware extensions.

Note in default configurations with GIL this bug exists but has no impact
(the free buffer won't be reused while the function is still executing, and
is no longer referenced after it returns).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/objarray.c                          | 20 ++++++++++++++++----
 tests/basics/bytearray_add.py          |  9 ++++++++-
 tests/basics/bytearray_add_self.py     |  8 ++++++++
 tests/basics/bytearray_add_self.py.exp |  1 +
 tests/basics/bytearray_slice_assign.py | 18 ++++++++++++------
 5 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 tests/basics/bytearray_add_self.py
 create mode 100644 tests/basics/bytearray_add_self.py.exp

diff --git a/py/objarray.c b/py/objarray.c
index 1fff234822521..803af2cd270c7 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -424,6 +424,13 @@ static mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
     if (self->free < len) {
         self->items = m_renew(byte, self->items, (self->len + self->free) * sz, (self->len + len) * sz);
         self->free = 0;
+
+        if (self_in == arg_in) {
+            // Get arg_bufinfo again in case self->items has moved
+            //
+            // (Note not possible to handle case that arg_in is a memoryview into self)
+            mp_get_buffer_raise(arg_in, &arg_bufinfo, MP_BUFFER_READ);
+        }
     } else {
         self->free -= len;
     }
@@ -456,7 +463,8 @@ static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
                 #if MICROPY_PY_ARRAY_SLICE_ASSIGN
                 // Assign
                 size_t src_len;
-                void *src_items;
+                uint8_t *src_items;
+                size_t src_offs = 0;
                 size_t item_sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
                 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
@@ -469,7 +477,7 @@ static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
                     src_items = src_slice->items;
                     #if MICROPY_PY_BUILTINS_MEMORYVIEW
                     if (mp_obj_is_type(value, &mp_type_memoryview)) {
-                        src_items = (uint8_t *)src_items + (src_slice->memview_offset * item_sz);
+                        src_offs = src_slice->memview_offset * item_sz;
                     }
                     #endif
                 } else if (mp_obj_is_type(value, &mp_type_bytes)) {
@@ -504,13 +512,17 @@ static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
                         // TODO: alloc policy; at the moment we go conservative
                         o->items = m_renew(byte, o->items, (o->len + o->free) * item_sz, (o->len + len_adj) * item_sz);
                         o->free = len_adj;
+                        // m_renew may have moved o->items
+                        if (src_items == dest_items) {
+                            src_items = o->items;
+                        }
                         dest_items = o->items;
                     }
                     mp_seq_replace_slice_grow_inplace(dest_items, o->len,
-                        slice.start, slice.stop, src_items, src_len, len_adj, item_sz);
+                        slice.start, slice.stop, src_items + src_offs, src_len, len_adj, item_sz);
                 } else {
                     mp_seq_replace_slice_no_grow(dest_items, o->len,
-                        slice.start, slice.stop, src_items, src_len, item_sz);
+                        slice.start, slice.stop, src_items + src_offs, src_len, item_sz);
                     // Clear "freed" elements at the end of list
                     // TODO: This is actually only needed for typecode=='O'
                     mp_seq_clear(dest_items, o->len + len_adj, o->len, item_sz);
diff --git a/tests/basics/bytearray_add.py b/tests/basics/bytearray_add.py
index a7e2b57374255..1f30a3b740e95 100644
--- a/tests/basics/bytearray_add.py
+++ b/tests/basics/bytearray_add.py
@@ -15,4 +15,11 @@
 
 # this inplace add tests the code when the buffer doesn't need to be increased
 b = bytearray()
-b += b''
+b += b""
+
+# extend a bytearray from itself
+b = bytearray(b"abcdefgh")
+for _ in range(4):
+    c = bytearray(b)  # extra allocation, as above
+    b.extend(b)
+print(b)
diff --git a/tests/basics/bytearray_add_self.py b/tests/basics/bytearray_add_self.py
new file mode 100644
index 0000000000000..94ae8689fd16c
--- /dev/null
+++ b/tests/basics/bytearray_add_self.py
@@ -0,0 +1,8 @@
+# add a bytearray to itself
+# This is not supported by CPython as of 3.11.18.
+
+b = bytearray(b"123456789")
+for _ in range(4):
+    c = bytearray(b)  # extra allocation increases chance 'b' has to relocate
+    b += b
+print(b)
diff --git a/tests/basics/bytearray_add_self.py.exp b/tests/basics/bytearray_add_self.py.exp
new file mode 100644
index 0000000000000..5ef948157ac0f
--- /dev/null
+++ b/tests/basics/bytearray_add_self.py.exp
@@ -0,0 +1 @@
+bytearray(b'123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789')
diff --git a/tests/basics/bytearray_slice_assign.py b/tests/basics/bytearray_slice_assign.py
index fa7878e10ddbb..4de0819042a13 100644
--- a/tests/basics/bytearray_slice_assign.py
+++ b/tests/basics/bytearray_slice_assign.py
@@ -18,7 +18,7 @@
 l[1:3] = bytearray()
 print(l)
 l = bytearray(x)
-#del l[1:3]
+# del l[1:3]
 print(l)
 
 l = bytearray(x)
@@ -28,7 +28,7 @@
 l[:3] = bytearray()
 print(l)
 l = bytearray(x)
-#del l[:3]
+# del l[:3]
 print(l)
 
 l = bytearray(x)
@@ -38,7 +38,7 @@
 l[:-3] = bytearray()
 print(l)
 l = bytearray(x)
-#del l[:-3]
+# del l[:-3]
 print(l)
 
 # slice assignment that extends the array
@@ -61,8 +61,14 @@
 print(b)
 
 # Growth of bytearray via slice extension
-b = bytearray(b'12345678')
-b.append(57) # expand and add a bit of unused space at end of the bytearray
+b = bytearray(b"12345678")
+b.append(57)  # expand and add a bit of unused space at end of the bytearray
 for i in range(400):
-    b[-1:] = b'ab' # grow slowly into the unused space
+    b[-1:] = b"ab"  # grow slowly into the unused space
+print(len(b), b)
+
+# Growth of bytearray via slice extension from itself
+b = bytearray(b"1234567")
+for i in range(3):
+    b[-1:] = b
 print(len(b), b)

From 6877987002684465d30b349759285648824553da Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Mar 2024 17:25:25 +1100
Subject: [PATCH 1033/3129] tests/cpydiff: Add a note about risk of resizing
 memoryview targets.

This a stop-gap until there is a proper fix for this.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/cpydiff/types_memoryview_invalid.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/cpydiff/types_memoryview_invalid.py

diff --git a/tests/cpydiff/types_memoryview_invalid.py b/tests/cpydiff/types_memoryview_invalid.py
new file mode 100644
index 0000000000000..c995a2e8991c6
--- /dev/null
+++ b/tests/cpydiff/types_memoryview_invalid.py
@@ -0,0 +1,12 @@
+"""
+categories: Types,memoryview
+description: memoryview can become invalid if its target is resized
+cause: CPython prevents a ``bytearray`` or ``io.bytesIO`` object from changing size while there is a ``memoryview`` object that references it. MicroPython requires the programmer to manually ensure that an object is not resized while any ``memoryview`` references it.
+
+In the worst case scenario, resizing an object which is the target of a memoryview can cause the memoryview(s) to reference invalid freed memory (a use-after-free bug) and corrupt the MicroPython runtime.
+workaround: Do not change the size of any ``bytearray`` or ``io.bytesIO`` object that has a ``memoryview`` assigned to it.
+"""
+b = bytearray(b"abcdefg")
+m = memoryview(b)
+b.extend(b"hijklmnop")
+print(b, bytes(m))

From 49ce7a607517dc0152a4f8768f5d03b3e5613e02 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 22 Apr 2024 12:35:31 +1000
Subject: [PATCH 1034/3129] github/workflows: Run code size workflow on shared
 or port code changes.

To get more insight to firmware size changes when code changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/code_size.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index a65a00201a7d2..1ef43d1fd396c 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -8,9 +8,15 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'ports/bare-arm/**'
+      - 'ports/mimxrt/**'
       - 'ports/minimal/**'
+      - 'ports/rp2/**'
+      - 'ports/samd/**'
+      - 'ports/stm32/**'
+      - 'ports/unix/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From 45848f77cac07dac1c77680041862ba444c1f3a3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 Apr 2024 13:00:20 +1000
Subject: [PATCH 1035/3129] webassembly/api: Fix waiting for Emscripten module
 to be loaded.

In modularize mode, the `_createMicroPythonModule()` constructor must be
await'ed on, before `Module` is ready to use.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/api.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index 7d1832af4f2ba..2459075fc5848 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -38,7 +38,7 @@ export async function loadMicroPython(options) {
         { heapsize: 1024 * 1024, linebuffer: true },
         options,
     );
-    const Module = {};
+    let Module = {};
     Module.locateFile = (path, scriptDirectory) =>
         url || scriptDirectory + path;
     Module._textDecoder = new TextDecoder();
@@ -83,11 +83,7 @@ export async function loadMicroPython(options) {
             Module.stderr = (c) => stderr(new Uint8Array([c]));
         }
     }
-    const moduleLoaded = new Promise((r) => {
-        Module.postRun = r;
-    });
-    _createMicroPythonModule(Module);
-    await moduleLoaded;
+    Module = await _createMicroPythonModule(Module);
     globalThis.Module = Module;
     proxy_js_init();
     const pyimport = (name) => {

From 9c7f0659e2a6db37125fa092ebe5150125eb14b3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Apr 2024 14:25:48 +1000
Subject: [PATCH 1036/3129] webassembly/api: Allocate code data on C heap when
 running Python code.

Otherwise Emscripten allocates it on the Emscripten C stack, which will
overflow for large amounts of code.

Fixes issue #14307.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/api.js | 16 ++++++++++++----
 ports/webassembly/main.c |  8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index 2459075fc5848..2f2ad95221ccd 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -127,23 +127,31 @@ export async function loadMicroPython(options) {
         },
         pyimport: pyimport,
         runPython(code) {
+            const len = Module.lengthBytesUTF8(code);
+            const buf = Module._malloc(len + 1);
+            Module.stringToUTF8(code, buf, len + 1);
             const value = Module._malloc(3 * 4);
             Module.ccall(
                 "mp_js_do_exec",
                 "number",
-                ["string", "pointer"],
-                [code, value],
+                ["pointer", "number", "pointer"],
+                [buf, len, value],
             );
+            Module._free(buf);
             return proxy_convert_mp_to_js_obj_jsside_with_free(value);
         },
         runPythonAsync(code) {
+            const len = Module.lengthBytesUTF8(code);
+            const buf = Module._malloc(len + 1);
+            Module.stringToUTF8(code, buf, len + 1);
             const value = Module._malloc(3 * 4);
             Module.ccall(
                 "mp_js_do_exec_async",
                 "number",
-                ["string", "pointer"],
-                [code, value],
+                ["pointer", "number", "pointer"],
+                [buf, len, value],
             );
+            Module._free(buf);
             return proxy_convert_mp_to_js_obj_jsside_with_free(value);
         },
         replInit() {
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 441c6d67e350a..23d12b6dbbc76 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -104,7 +104,7 @@ void mp_js_do_import(const char *name, uint32_t *out) {
     }
 }
 
-void mp_js_do_exec(const char *src, uint32_t *out) {
+void mp_js_do_exec(const char *src, size_t len, uint32_t *out) {
     // Collect at the top-level, where there are no root pointers from stack/registers.
     gc_collect_start();
     gc_collect_end();
@@ -112,7 +112,7 @@ void mp_js_do_exec(const char *src, uint32_t *out) {
     mp_parse_input_kind_t input_kind = MP_PARSE_FILE_INPUT;
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
-        mp_lexer_t *lex = mp_lexer_new_from_str_len_dedent(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
+        mp_lexer_t *lex = mp_lexer_new_from_str_len_dedent(MP_QSTR__lt_stdin_gt_, src, len, 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, false);
@@ -125,9 +125,9 @@ void mp_js_do_exec(const char *src, uint32_t *out) {
     }
 }
 
-void mp_js_do_exec_async(const char *src, uint32_t *out) {
+void mp_js_do_exec_async(const char *src, size_t len, uint32_t *out) {
     mp_compile_allow_top_level_await = true;
-    mp_js_do_exec(src, out);
+    mp_js_do_exec(src, len, out);
     mp_compile_allow_top_level_await = false;
 }
 

From 4c3f5f552b15f74984e906db799812df6b3e9555 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Apr 2024 17:19:56 +1000
Subject: [PATCH 1037/3129] webassembly/objjsproxy: Fix handling of thrown
 value into JS generator.

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

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 098f4e75f5466..65c806536dea2 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -346,6 +346,12 @@ typedef struct _jsproxy_gen_t {
 
 mp_vm_return_kind_t jsproxy_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) {
     jsproxy_gen_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (throw_value) {
+        *ret_val = throw_value;
+        return MP_VM_RETURN_EXCEPTION;
+    }
+
     switch (self->state) {
         case JSOBJ_GEN_STATE_WAITING:
             self->state = JSOBJ_GEN_STATE_COMPLETED;

From 92b3b69648304b292fb59e734fc9a61a188ba419 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Apr 2024 17:20:28 +1000
Subject: [PATCH 1038/3129] webassembly/proxy_c: Fix proxy then reject
 handling.

An exception on the Python side should be passed to the Promise reject
callback on the JavaScript side.

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

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 8d137f6271297..fc863c06be5e3 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -296,10 +296,11 @@ EM_JS(void, js_then_resolve, (uint32_t * ret_value, uint32_t * resolve, uint32_t
     resolve_js(ret_value_js);
 });
 
-EM_JS(void, js_then_reject, (uint32_t * resolve, uint32_t * reject), {
+EM_JS(void, js_then_reject, (uint32_t * ret_value, uint32_t * resolve, uint32_t * reject), {
+    const ret_value_js = proxy_convert_mp_to_js_obj_jsside(ret_value);
     const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
     const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
-    reject_js(null);
+    reject_js(ret_value_js);
 });
 
 // *FORMAT-OFF*
@@ -335,10 +336,12 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t value, mp_obj_t
         uint32_t out[PVN];
         js_then_continue(ref, out_py_resume, out_resolve, out_reject, out);
         return proxy_convert_js_to_mp_obj_cside(out);
-    } else {
-        // MP_VM_RETURN_EXCEPTION;
-        js_then_reject(out_resolve, out_reject);
-        nlr_raise(ret_value);
+    } else { // ret_kind == MP_VM_RETURN_EXCEPTION;
+        // Pass the exception through as an object to reject the promise (don't raise/throw it).
+        uint32_t out_ret_value[PVN];
+        proxy_convert_mp_to_js_obj_cside(ret_value, out_ret_value);
+        js_then_reject(out_ret_value, out_resolve, out_reject);
+        return mp_const_none;
     }
 }
 

From d998ca78c8abb975ba00a658544a1b72575f9732 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Apr 2024 17:20:57 +1000
Subject: [PATCH 1039/3129] webassembly/proxy_c: Fix then-continue to convert
 reason to throw value.

When a Promise is rejected on the JavaScript side, the reject reason should
be thrown into the encapsulating generator on the Python side.

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

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index fc863c06be5e3..ebf670b56ec5b 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -308,14 +308,34 @@ EM_JS(void, js_then_continue, (int jsref, uint32_t * py_resume, uint32_t * resol
     const py_resume_js = proxy_convert_mp_to_js_obj_jsside(py_resume);
     const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
     const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
-    const ret = proxy_js_ref[jsref].then((x) => {py_resume_js(x, resolve_js, reject_js);}, reject_js);
+    const ret = proxy_js_ref[jsref].then(
+        (result) => {
+            // The Promise is fulfilled on the JavaScript side.  Take the result and
+            // send it to the encapsulating generator on the Python side, so it
+            // becomes the result of the "yield from" that deferred to this Promise.
+            py_resume_js(result, null, resolve_js, reject_js);
+        },
+        (reason) => {
+            // The Promise is rejected on the JavaScript side.  Take the reason and
+            // throw it into the encapsulating generator on the Python side.
+            py_resume_js(null, reason, resolve_js, reject_js);
+        },
+    );
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 // *FORMAT-ON*
 
-static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t value, mp_obj_t resolve, mp_obj_t reject) {
+static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t resolve, mp_obj_t reject) {
+    if (throw_value != MP_OBJ_NULL && throw_value != mp_const_none) {
+        if (send_value == mp_const_none) {
+            send_value = MP_OBJ_NULL;
+        }
+    } else {
+        throw_value = MP_OBJ_NULL;
+    }
+
     mp_obj_t ret_value;
-    mp_vm_return_kind_t ret_kind = mp_resume(self_in, value, MP_OBJ_NULL, &ret_value);
+    mp_vm_return_kind_t ret_kind = mp_resume(self_in, send_value, throw_value, &ret_value);
 
     uint32_t out_resolve[PVN];
     uint32_t out_reject[PVN];
@@ -346,9 +366,9 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t value, mp_obj_t
 }
 
 static mp_obj_t resume_fun(size_t n_args, const mp_obj_t *args) {
-    return proxy_resume_execute(args[0], args[1], args[2], args[3]);
+    return proxy_resume_execute(args[0], args[1], args[2], args[3], args[4]);
 }
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(resume_obj, 4, 4, resume_fun);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(resume_obj, 5, 5, resume_fun);
 
 void proxy_c_to_js_resume(uint32_t c_ref, uint32_t *args) {
     nlr_buf_t nlr;
@@ -356,7 +376,7 @@ void proxy_c_to_js_resume(uint32_t c_ref, uint32_t *args) {
         mp_obj_t obj = proxy_c_get_obj(c_ref);
         mp_obj_t resolve = proxy_convert_js_to_mp_obj_cside(args + 1 * 3);
         mp_obj_t reject = proxy_convert_js_to_mp_obj_cside(args + 2 * 3);
-        mp_obj_t ret = proxy_resume_execute(obj, mp_const_none, resolve, reject);
+        mp_obj_t ret = proxy_resume_execute(obj, mp_const_none, mp_const_none, resolve, reject);
         nlr_pop();
         return proxy_convert_mp_to_js_obj_cside(ret, args);
     } else {

From 967ad38ac7e09270e9f5734c59baebf2d1eb3723 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Apr 2024 12:14:49 +1000
Subject: [PATCH 1040/3129] extmod/modasyncio: Make mp_asyncio_context variable
 public.

So it can be accessed by a port if needed, for example to see if asyncio
has been imported.

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

diff --git a/extmod/modasyncio.c b/extmod/modasyncio.c
index 61dd707223ff1..4f82370d238a9 100644
--- a/extmod/modasyncio.c
+++ b/extmod/modasyncio.c
@@ -156,7 +156,7 @@ static MP_DEFINE_CONST_OBJ_TYPE(
 // Task class
 
 // This is the core asyncio context with cur_task, _task_queue and CancelledError.
-static mp_obj_t asyncio_context = MP_OBJ_NULL;
+mp_obj_t mp_asyncio_context = MP_OBJ_NULL;
 
 static mp_obj_t task_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);
@@ -168,7 +168,7 @@ static mp_obj_t task_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     self->state = TASK_STATE_RUNNING_NOT_WAITED_ON;
     self->ph_key = MP_OBJ_NEW_SMALL_INT(0);
     if (n_args == 2) {
-        asyncio_context = args[1];
+        mp_asyncio_context = args[1];
     }
     return MP_OBJ_FROM_PTR(self);
 }
@@ -186,7 +186,7 @@ static mp_obj_t task_cancel(mp_obj_t self_in) {
         return mp_const_false;
     }
     // Can't cancel self (not supported yet).
-    mp_obj_t cur_task = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
+    mp_obj_t cur_task = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
     if (self_in == cur_task) {
         mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("can't cancel self"));
     }
@@ -195,7 +195,7 @@ static mp_obj_t task_cancel(mp_obj_t self_in) {
         self = MP_OBJ_TO_PTR(self->data);
     }
 
-    mp_obj_t _task_queue = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__task_queue));
+    mp_obj_t _task_queue = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__task_queue));
 
     // Reschedule Task as a cancelled task.
     mp_obj_t dest[3];
@@ -218,7 +218,7 @@ static mp_obj_t task_cancel(mp_obj_t self_in) {
         task_queue_push(2, dest);
     }
 
-    self->data = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_CancelledError));
+    self->data = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_CancelledError));
 
     return mp_const_true;
 }
@@ -278,7 +278,7 @@ static mp_obj_t task_iternext(mp_obj_t self_in) {
         nlr_raise(self->data);
     } else {
         // Put calling task on waiting queue.
-        mp_obj_t cur_task = mp_obj_dict_get(asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
+        mp_obj_t cur_task = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
         mp_obj_t args[2] = { self->state, cur_task };
         task_queue_push(2, args);
         // Set calling task's data to this task that it waits on, to double-link it.

From 84d6f8e8cb993e82f03e209ffd49d5c44fc780e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Apr 2024 12:16:27 +1000
Subject: [PATCH 1041/3129] webassembly/modjsffi: Add jsffi.async_timeout_ms.

This function exposes `setTimeout()` as an async function.

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

diff --git a/ports/webassembly/modjsffi.c b/ports/webassembly/modjsffi.c
index d4e61e368f009..cb2f578f8f593 100644
--- a/ports/webassembly/modjsffi.c
+++ b/ports/webassembly/modjsffi.c
@@ -61,12 +61,27 @@ static mp_obj_t mp_jsffi_to_js(mp_obj_t arg) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_jsffi_to_js_obj, mp_jsffi_to_js);
 
+// *FORMAT-OFF*
+EM_JS(void, promise_with_timeout_ms, (double ms, uint32_t * out), {
+    const ret = new Promise((resolve) => setTimeout(resolve, ms));
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
+});
+// *FORMAT-ON*
+
+static mp_obj_t mp_jsffi_async_timeout_ms(mp_obj_t arg) {
+    uint32_t out[PVN];
+    promise_with_timeout_ms(mp_obj_get_float_to_d(arg), out);
+    return proxy_convert_js_to_mp_obj_cside(out);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_jsffi_async_timeout_ms_obj, mp_jsffi_async_timeout_ms);
+
 static const mp_rom_map_elem_t mp_module_jsffi_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_jsffi) },
 
     { MP_ROM_QSTR(MP_QSTR_JsProxy), MP_ROM_PTR(&mp_type_jsproxy) },
     { MP_ROM_QSTR(MP_QSTR_create_proxy), MP_ROM_PTR(&mp_jsffi_create_proxy_obj) },
     { MP_ROM_QSTR(MP_QSTR_to_js), MP_ROM_PTR(&mp_jsffi_to_js_obj) },
+    { MP_ROM_QSTR(MP_QSTR_async_timeout_ms), MP_ROM_PTR(&mp_jsffi_async_timeout_ms_obj) },
 };
 static MP_DEFINE_CONST_DICT(mp_module_jsffi_globals, mp_module_jsffi_globals_table);
 

From 8a3546b3bd71dbc6d79900afbe58767e09b82c3e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Apr 2024 12:17:11 +1000
Subject: [PATCH 1042/3129] webassembly: Add JavaScript-based asyncio support.

This commit adds a significant portion of the existing MicroPython asyncio
module to the webassembly port, using parts of the existing asyncio code
and some custom JavaScript parts.

The key difference to the standard asyncio is that this version uses the
JavaScript runtime to do the actual scheduling and waiting on events, eg
Promise fulfillment, timeouts, fetching URLs.

This implementation does not include asyncio.run(). Instead one just uses
asyncio.create_task(..) to start tasks and then returns to the JavaScript.
Then JavaScript will run the tasks.

The implementation here tries to reuse as much existing asyncio code as
possible, and gets all the semantics correct for things like cancellation
and asyncio.wait_for.  An alternative approach would reimplement Task,
Event, etc using JavaScript Promise's.  That approach is very difficult to
get right when trying to implement cancellation (because it's not possible
to cancel a JavaScript Promise).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile                    |   3 +
 ports/webassembly/asyncio/__init__.py         |   9 +
 ports/webassembly/asyncio/core.py             | 249 ++++++++++++++++++
 ports/webassembly/objjsproxy.c                |  20 ++
 ports/webassembly/variants/manifest.py        |  24 ++
 .../webassembly/variants/pyscript/manifest.py |   2 +
 .../ports/webassembly/asyncio_create_task.mjs |  44 ++++
 .../webassembly/asyncio_create_task.mjs.exp   |  14 +
 tests/ports/webassembly/asyncio_sleep.mjs     |  25 ++
 tests/ports/webassembly/asyncio_sleep.mjs.exp |   6 +
 tests/run-tests.py                            |  11 +
 11 files changed, 407 insertions(+)
 create mode 100644 ports/webassembly/asyncio/__init__.py
 create mode 100644 ports/webassembly/asyncio/core.py
 create mode 100644 ports/webassembly/variants/manifest.py
 create mode 100644 tests/ports/webassembly/asyncio_create_task.mjs
 create mode 100644 tests/ports/webassembly/asyncio_create_task.mjs.exp
 create mode 100644 tests/ports/webassembly/asyncio_sleep.mjs
 create mode 100644 tests/ports/webassembly/asyncio_sleep.mjs.exp

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index d0a8aa99243ca..93b92ef583989 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -22,6 +22,9 @@ BUILD ?= build-$(VARIANT)
 include ../../py/mkenv.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk
 
+# Use the default frozen manifest, variants may override this.
+FROZEN_MANIFEST ?= variants/manifest.py
+
 # Qstr definitions (must come before including py.mk).
 QSTR_DEFS = qstrdefsport.h
 
diff --git a/ports/webassembly/asyncio/__init__.py b/ports/webassembly/asyncio/__init__.py
new file mode 100644
index 0000000000000..ba1ca635148f4
--- /dev/null
+++ b/ports/webassembly/asyncio/__init__.py
@@ -0,0 +1,9 @@
+# MicroPython asyncio module, for use with webassembly port
+# MIT license; Copyright (c) 2024 Damien P. George
+
+from .core import *
+from .funcs import wait_for, wait_for_ms, gather
+from .event import Event
+from .lock import Lock
+
+__version__ = (3, 0, 0)
diff --git a/ports/webassembly/asyncio/core.py b/ports/webassembly/asyncio/core.py
new file mode 100644
index 0000000000000..a128bb6055058
--- /dev/null
+++ b/ports/webassembly/asyncio/core.py
@@ -0,0 +1,249 @@
+# MicroPython asyncio module, for use with webassembly port
+# MIT license; Copyright (c) 2019-2024 Damien P. George
+
+from time import ticks_ms as ticks, ticks_diff, ticks_add
+import sys, js, jsffi
+
+# Import TaskQueue and Task from built-in C code.
+from _asyncio import TaskQueue, Task
+
+
+################################################################################
+# Exceptions
+
+
+class CancelledError(BaseException):
+    pass
+
+
+class TimeoutError(Exception):
+    pass
+
+
+# Used when calling Loop.call_exception_handler.
+_exc_context = {"message": "Task exception wasn't retrieved", "exception": None, "future": None}
+
+
+################################################################################
+# Sleep functions
+
+
+# "Yield" once, then raise StopIteration
+class SingletonGenerator:
+    def __init__(self):
+        self.state = None
+        self.exc = StopIteration()
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        if self.state is not None:
+            _task_queue.push(cur_task, self.state)
+            self.state = None
+            return None
+        else:
+            self.exc.__traceback__ = None
+            raise self.exc
+
+
+# Pause task execution for the given time (integer in milliseconds, uPy extension)
+# Use a SingletonGenerator to do it without allocating on the heap
+def sleep_ms(t, sgen=SingletonGenerator()):
+    if cur_task is None:
+        # Support top-level asyncio.sleep, via a JavaScript Promise.
+        return jsffi.async_timeout_ms(t)
+    assert sgen.state is None
+    sgen.state = ticks_add(ticks(), max(0, t))
+    return sgen
+
+
+# Pause task execution for the given time (in seconds)
+def sleep(t):
+    return sleep_ms(int(t * 1000))
+
+
+################################################################################
+# Main run loop
+
+asyncio_timer = None
+
+
+class ThenableEvent:
+    def __init__(self, thenable):
+        self.result = None  # Result of the thenable
+        self.waiting = None  # Task waiting on completion of this thenable
+        thenable.then(self.set)
+
+    def set(self, value):
+        # Thenable/Promise is fulfilled, set result and schedule any waiting task.
+        self.result = value
+        if self.waiting:
+            _task_queue.push(self.waiting)
+            self.waiting = None
+            _schedule_run_iter(0)
+
+    def remove(self, task):
+        self.waiting = None
+
+    # async
+    def wait(self):
+        # Set the calling task as the task waiting on this thenable.
+        self.waiting = cur_task
+        # Set calling task's data to this object so it can be removed if needed.
+        cur_task.data = self
+        # Wait for the thenable to fulfill.
+        yield
+        # Return the result of the thenable.
+        return self.result
+
+
+# Ensure the awaitable is a task
+def _promote_to_task(aw):
+    return aw if isinstance(aw, Task) else create_task(aw)
+
+
+def _schedule_run_iter(dt):
+    global asyncio_timer
+    if asyncio_timer is not None:
+        js.clearTimeout(asyncio_timer)
+    asyncio_timer = js.setTimeout(_run_iter, dt)
+
+
+def _run_iter():
+    global cur_task
+    excs_all = (CancelledError, Exception)  # To prevent heap allocation in loop
+    excs_stop = (CancelledError, StopIteration)  # To prevent heap allocation in loop
+    while True:
+        # Wait until the head of _task_queue is ready to run
+        t = _task_queue.peek()
+        if t:
+            # A task waiting on _task_queue; "ph_key" is time to schedule task at
+            dt = max(0, ticks_diff(t.ph_key, ticks()))
+        else:
+            # No tasks can be woken so finished running
+            cur_task = None
+            return
+
+        if dt > 0:
+            # schedule to call again later
+            cur_task = None
+            _schedule_run_iter(dt)
+            return
+
+        # Get next task to run and continue it
+        t = _task_queue.pop()
+        cur_task = t
+        try:
+            # Continue running the coroutine, it's responsible for rescheduling itself
+            exc = t.data
+            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:
+            # Check the task is not on any event queue
+            assert t.data is None
+            # This task is done.
+            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
+                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():
+                        _task_queue.push(t.state.pop())
+                        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(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.
+
+                # Save exception raised by the coro for later use.
+                t.data = exc
+
+                # Create exception context and call the exception handler.
+                _exc_context["exception"] = exc
+                _exc_context["future"] = t
+                Loop.call_exception_handler(_exc_context)
+
+
+# Create and schedule a new task from a coroutine.
+def create_task(coro):
+    if not hasattr(coro, "send"):
+        raise TypeError("coroutine expected")
+    t = Task(coro, globals())
+    _task_queue.push(t)
+    _schedule_run_iter(0)
+    return t
+
+
+################################################################################
+# Event loop wrapper
+
+
+cur_task = None
+
+
+class Loop:
+    _exc_handler = None
+
+    def create_task(coro):
+        return create_task(coro)
+
+    def close():
+        pass
+
+    def set_exception_handler(handler):
+        Loop._exc_handler = handler
+
+    def get_exception_handler():
+        return Loop._exc_handler
+
+    def default_exception_handler(loop, context):
+        print(context["message"], file=sys.stderr)
+        print("future:", context["future"], "coro=", context["future"].coro, file=sys.stderr)
+        sys.print_exception(context["exception"], sys.stderr)
+
+    def call_exception_handler(context):
+        (Loop._exc_handler or Loop.default_exception_handler)(Loop, context)
+
+
+def get_event_loop():
+    return Loop
+
+
+def current_task():
+    if cur_task is None:
+        raise RuntimeError("no running event loop")
+    return cur_task
+
+
+def new_event_loop():
+    global _task_queue
+    _task_queue = TaskQueue()  # TaskQueue of Task instances.
+    return Loop
+
+
+# Initialise default event loop.
+new_event_loop()
diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 65c806536dea2..15fbb57523fc7 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -474,9 +474,29 @@ static mp_obj_t jsproxy_new_gen(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
 
 /******************************************************************************/
 
+#if MICROPY_PY_ASYNCIO
+extern mp_obj_t mp_asyncio_context;
+#endif
+
 static mp_obj_t jsproxy_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
     if (has_attr(self->ref, "then")) {
+        #if MICROPY_PY_ASYNCIO
+        // When asyncio is running and the caller here is a task, wrap the JavaScript
+        // thenable in a ThenableEvent, and get the task to wait on that event.  This
+        // decouples the task from the thenable and allows cancelling the task.
+        if (mp_asyncio_context != MP_OBJ_NULL) {
+            mp_obj_t cur_task = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
+            if (cur_task != mp_const_none) {
+                mp_obj_t thenable_event_class = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_ThenableEvent));
+                mp_obj_t thenable_event = mp_call_function_1(thenable_event_class, self_in);
+                mp_obj_t dest[2];
+                mp_load_method(thenable_event, MP_QSTR_wait, dest);
+                mp_obj_t wait_gen = mp_call_method_n_kw(0, 0, dest);
+                return mp_getiter(wait_gen, iter_buf);
+            }
+        }
+        #endif
         return jsproxy_new_gen(self_in, iter_buf);
     } else {
         return jsproxy_new_it(self_in, iter_buf);
diff --git a/ports/webassembly/variants/manifest.py b/ports/webassembly/variants/manifest.py
new file mode 100644
index 0000000000000..b2ee8cd640d68
--- /dev/null
+++ b/ports/webassembly/variants/manifest.py
@@ -0,0 +1,24 @@
+# The asyncio package is built from the standard implementation but with the
+# core scheduler replaced with a custom scheduler that uses the JavaScript
+# runtime (with setTimeout an Promise's) to contrtol the scheduling.
+
+package(
+    "asyncio",
+    (
+        "event.py",
+        "funcs.py",
+        "lock.py",
+    ),
+    base_path="$(MPY_DIR)/extmod",
+    opt=3,
+)
+
+package(
+    "asyncio",
+    (
+        "__init__.py",
+        "core.py",
+    ),
+    base_path="$(PORT_DIR)",
+    opt=3,
+)
diff --git a/ports/webassembly/variants/pyscript/manifest.py b/ports/webassembly/variants/pyscript/manifest.py
index 0646e1d897f0c..db088e70d0ccd 100644
--- a/ports/webassembly/variants/pyscript/manifest.py
+++ b/ports/webassembly/variants/pyscript/manifest.py
@@ -1,3 +1,5 @@
+include("$(PORT_DIR)/variants/manifest.py")
+
 require("abc")
 require("base64")
 require("collections")
diff --git a/tests/ports/webassembly/asyncio_create_task.mjs b/tests/ports/webassembly/asyncio_create_task.mjs
new file mode 100644
index 0000000000000..e388ade4f1228
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_create_task.mjs
@@ -0,0 +1,44 @@
+// Test asyncio.create_task(), and tasks waiting on a Promise.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.p0 = new Promise((resolve, reject) => {
+    resolve(123);
+});
+
+globalThis.p1 = new Promise((resolve, reject) => {
+    setTimeout(() => {
+        console.log("setTimeout resolved");
+        resolve(456);
+    }, 200);
+});
+
+mp.runPython(`
+import js
+import asyncio
+
+async def task(id, promise):
+    print("task start", id)
+    print("task await", id, await promise)
+    print("task await", id, await promise)
+    print("task end", id)
+
+print("start")
+t1 = asyncio.create_task(task(1, js.p0))
+t2 = asyncio.create_task(task(2, js.p1))
+print("t1", t1.done(), t2.done())
+print("end")
+`);
+
+// Wait for p1 to fulfill so t2 can continue.
+await globalThis.p1;
+
+// Wait a little longer so t2 can complete.
+await new Promise((resolve, reject) => {
+    setTimeout(resolve, 10);
+});
+
+mp.runPython(`
+print("restart")
+print("t1", t1.done(), t2.done())
+`);
diff --git a/tests/ports/webassembly/asyncio_create_task.mjs.exp b/tests/ports/webassembly/asyncio_create_task.mjs.exp
new file mode 100644
index 0000000000000..c1958bba5930b
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_create_task.mjs.exp
@@ -0,0 +1,14 @@
+start
+t1 False False
+end
+task start 1
+task start 2
+task await 1 123
+task await 1 123
+task end 1
+setTimeout resolved
+task await 2 456
+task await 2 456
+task end 2
+restart
+t1 True True
diff --git a/tests/ports/webassembly/asyncio_sleep.mjs b/tests/ports/webassembly/asyncio_sleep.mjs
new file mode 100644
index 0000000000000..74d22ee1f854a
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_sleep.mjs
@@ -0,0 +1,25 @@
+// Test asyncio.sleep(), both at the top level and within a task.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+await mp.runPythonAsync(`
+import time
+import asyncio
+
+print("main start")
+t0 = time.time()
+await asyncio.sleep(0.25)
+dt = time.time() - t0
+print(0.2 <= dt <= 0.3)
+
+async def task():
+    print("task start")
+    t0 = time.time()
+    await asyncio.sleep(0.25)
+    dt = time.time() - t0
+    print(0.2 <= dt <= 0.3)
+    print("task end")
+
+asyncio.create_task(task())
+print("main end")
+`);
diff --git a/tests/ports/webassembly/asyncio_sleep.mjs.exp b/tests/ports/webassembly/asyncio_sleep.mjs.exp
new file mode 100644
index 0000000000000..619ba175f6c00
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_sleep.mjs.exp
@@ -0,0 +1,6 @@
+main start
+True
+main end
+task start
+True
+task end
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 4f55cdd39842e..8acdcd2b36204 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -681,6 +681,17 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         elif args.target == "webassembly":
             skip_tests.add("basics/string_format_modulo.py")  # can't print nulls to stdout
             skip_tests.add("basics/string_strip.py")  # can't print nulls to stdout
+            skip_tests.add("extmod/asyncio_basic2.py")
+            skip_tests.add("extmod/asyncio_cancel_self.py")
+            skip_tests.add("extmod/asyncio_current_task.py")
+            skip_tests.add("extmod/asyncio_exception.py")
+            skip_tests.add("extmod/asyncio_gather_finished_early.py")
+            skip_tests.add("extmod/asyncio_get_event_loop.py")
+            skip_tests.add("extmod/asyncio_heaplock.py")
+            skip_tests.add("extmod/asyncio_loop_stop.py")
+            skip_tests.add("extmod/asyncio_new_event_loop.py")
+            skip_tests.add("extmod/asyncio_threadsafeflag.py")
+            skip_tests.add("extmod/asyncio_wait_for_fwd.py")
             skip_tests.add("extmod/binascii_a2b_base64.py")
             skip_tests.add("extmod/re_stack_overflow.py")
             skip_tests.add("extmod/time_res.py")

From 49af8cad49415521813bda6d756dbe50a125f472 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Apr 2024 16:36:34 +1000
Subject: [PATCH 1043/3129] webassembly/api: Inject asyncio.run if needed by
 the script.

This allows a simple way to run the existing asyncio tests under the
webassembly port, which doesn't support `asyncio.run()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/api.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index 2f2ad95221ccd..2be82e890705f 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -228,6 +228,16 @@ async function runCLI() {
             }
         });
     } else {
+        // If the script to run ends with a running of the asyncio main loop, then inject
+        // a simple `asyncio.run` hook that starts the main task.  This is primarily to
+        // support running the standard asyncio tests.
+        if (contents.endsWith("asyncio.run(main())\n")) {
+            const asyncio = mp.pyimport("asyncio");
+            asyncio.run = async (task) => {
+                await asyncio.create_task(task);
+            };
+        }
+
         try {
             mp.runPython(contents);
         } catch (error) {

From 7b050b366b7dacfb43779c51702a892d8f1873d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= <j.ne@posteo.net>
Date: Sun, 2 Apr 2023 19:58:42 +0200
Subject: [PATCH 1044/3129] py/nlrthumb: Make non-Thumb2 long-jump workaround
 opt-in.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Although the original motivation given for the workaround[1] is correct,
nlr.o and nlrthumb.o are linked with a small enough distance that the
problem does not occur, and the workaround isn't necessary. The distance
between the b instruction and its target (nlr_push_tail) is just 64
bytes[2], well within the ±2046 byte range addressable by an
unconditional branch instruction in Thumb mode.

The workaround induces a relocation in the text section (textrel), which
isn't supported everywhere, notably not on musl-libc[3], where it causes
a crash on start-up. With the workaround removed, micropython works on an
ARMv5T Linux system built with musl-libc.

This commit changes nlrthumb.c to use a direct jump by default, but
leaves the long jump workaround as an option for those cases where it's
actually needed.

[1]: commit dd376a239dc4f47b0ee7866810fcda151f3cf6dd

Author: Damien George <damien.p.george@gmail.com>
Date:   Fri Sep 1 15:25:29 2017 +1000

    py/nlrthumb: Get working again on standard Thumb arch (ie not Thumb2).

    "b" on Thumb might not be long enough for the jump to nlr_push_tail so
    it must be done indirectly.

[2]: Excerpt from objdump -d micropython:

000095c4 <nlr_push_tail>:
    95c4:       b510            push    {r4, lr}
    95c6:       0004            movs    r4, r0
    95c8:       f02d fd42       bl      37050 <mp_thread_get_state>
    95cc:       6943            ldr     r3, [r0, #20]
    95ce:       6023            str     r3, [r4, #0]
    95d0:       6144            str     r4, [r0, #20]
    95d2:       2000            movs    r0, #0
    95d4:       bd10            pop     {r4, pc}

000095d6 <nlr_pop>:
    95d6:       b510            push    {r4, lr}
    95d8:       f02d fd3a       bl      37050 <mp_thread_get_state>
    95dc:       6943            ldr     r3, [r0, #20]
    95de:       681b            ldr     r3, [r3, #0]
    95e0:       6143            str     r3, [r0, #20]
    95e2:       bd10            pop     {r4, pc}

000095e4 <nlr_push>:
    95e4:       60c4            str     r4, [r0, #12]
    95e6:       6105            str     r5, [r0, #16]
    95e8:       6146            str     r6, [r0, #20]
    95ea:       6187            str     r7, [r0, #24]
    95ec:       4641            mov     r1, r8
    95ee:       61c1            str     r1, [r0, #28]
    95f0:       4649            mov     r1, r9
    95f2:       6201            str     r1, [r0, #32]
    95f4:       4651            mov     r1, sl
    95f6:       6241            str     r1, [r0, #36]   @ 0x24
    95f8:       4659            mov     r1, fp
    95fa:       6281            str     r1, [r0, #40]   @ 0x28
    95fc:       4669            mov     r1, sp
    95fe:       62c1            str     r1, [r0, #44]   @ 0x2c
    9600:       4671            mov     r1, lr
    9602:       6081            str     r1, [r0, #8]
    9604:       e7de            b.n     95c4 <nlr_push_tail>

[3]: https://www.openwall.com/lists/musl/2020/09/25/4

Signed-off-by: J. Neuschäfer <j.ne@posteo.net>
---
 py/mpconfig.h |  6 ++++++
 py/nlrthumb.c | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index af2480266bcab..1aa3e06994d3f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -587,6 +587,12 @@
 /*****************************************************************************/
 /* Python internal features                                                  */
 
+// Use a special long jump in nlrthumb.c, which may be necessary if nlr.o and
+// nlrthumb.o are linked far apart from each other.
+#ifndef MICROPY_NLR_THUMB_USE_LONG_JUMP
+#define MICROPY_NLR_THUMB_USE_LONG_JUMP (0)
+#endif
+
 // Whether to enable import of external modules
 // When disabled, only importing of built-in modules is supported
 // When enabled, a port must implement mp_import_stat (among other things)
diff --git a/py/nlrthumb.c b/py/nlrthumb.c
index a22c5df5b9418..e7b24f242bc52 100644
--- a/py/nlrthumb.c
+++ b/py/nlrthumb.c
@@ -38,6 +38,14 @@
 
 __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
 
+    // If you get a linker error here, indicating that a relocation doesn't
+    // fit, try the following (in that order):
+    //
+    // 1. Ensure that nlr.o nlrthumb.o are linked closely together, i.e.
+    //    there aren't too many other files between them in the linker list
+    //    (PY_CORE_O_BASENAME in py/py.mk)
+    // 2. Set -DMICROPY_NLR_THUMB_USE_LONG_JUMP=1 during the build
+    //
     __asm volatile (
         "str    r4, [r0, #12]       \n" // store r4 into nlr_buf
         "str    r5, [r0, #16]       \n" // store r5 into nlr_buf
@@ -71,7 +79,7 @@ __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
         "str    lr, [r0, #8]        \n" // store lr into nlr_buf
         #endif
 
-        #if !defined(__thumb2__)
+        #if MICROPY_NLR_THUMB_USE_LONG_JUMP
         "ldr    r1, nlr_push_tail_var \n"
         "bx     r1                  \n" // do the rest in C
         ".align 2                   \n"

From e60e8079a7e1f6edd308e2e8981096e42ec6a78c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Apr 2024 11:15:59 +1000
Subject: [PATCH 1045/3129] nrf/mpconfigport: Enable
 MICROPY_NLR_THUMB_USE_LONG_JUMP on nRF51xx.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/mpconfigport.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 37fbdf1eb3b29..6e92fa876ef4b 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -59,6 +59,12 @@
 
 // options to control how MicroPython is built
 
+// Due to the use of LTO and the unknown distance between nlr.o and nlrthumb.o code,
+// MCUs using the Thumb 1 instruction set must enable this NLR long jump feature.
+#if defined(NRF51822)
+#define MICROPY_NLR_THUMB_USE_LONG_JUMP    (1)
+#endif
+
 #ifndef MICROPY_VFS
 #define MICROPY_VFS                        (CORE_FEAT)
 #endif

From b1ac266bb5cd0fcfa53539cb3230e7b3f323a09b Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Mon, 29 Apr 2024 09:18:03 +1000
Subject: [PATCH 1046/3129] docs/develop/optimizations: Fix typo identified in
 issue 14391.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 docs/develop/optimizations.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/develop/optimizations.rst b/docs/develop/optimizations.rst
index 7f2c8cbe7282c..533dd64116f03 100644
--- a/docs/develop/optimizations.rst
+++ b/docs/develop/optimizations.rst
@@ -33,7 +33,7 @@ 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
+Local variables on the other hand 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.
 

From b896fa9b1f5f17d9f92901dd9a75a0efdec39a92 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 28 Apr 2024 15:37:40 +1000
Subject: [PATCH 1047/3129] stm32/boards/LEGO_HUB_NO6: Write key after writing
 elements.

In case there is a power failure after during this operation, the key must
be the last thing that is written, to indicate valid data.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/board_init.c | 2 +-
 1 file changed, 1 insertion(+), 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 5e4e7791b50d3..3a785859af2f4 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
@@ -198,9 +198,9 @@ void board_mboot_state_change(int state, uint32_t arg) {
         // The FS-load update is about to start.  Program the update key and FS-load elements
         // into the flash so they can be retrieved if there is a power failure during the update.
         mp_spiflash_erase_block(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR);
+        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, ELEM_DATA_SIZE, ELEM_DATA_START);
         uint32_t key = SPIFLASH_UPDATE_KEY_VALUE;
         mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR, 4, (const uint8_t *)&key);
-        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, ELEM_DATA_SIZE, ELEM_DATA_START);
     } else 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.

From 64f28dc1eb542c90e38e89cd55b5452ed59290d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 28 Apr 2024 15:39:00 +1000
Subject: [PATCH 1048/3129] stm32/boards/LEGO_HUB_NO7: Add robust update logic
 to mboot.

Following change in 899592ac341ed9f10ee554424f964f6880fc8c48

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO7/board_init.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO7/board_init.c b/ports/stm32/boards/LEGO_HUB_NO7/board_init.c
index 7b155b1c3cea8..4f7b36c295437 100644
--- a/ports/stm32/boards/LEGO_HUB_NO7/board_init.c
+++ b/ports/stm32/boards/LEGO_HUB_NO7/board_init.c
@@ -199,7 +199,14 @@ int board_mboot_get_reset_mode(uint32_t *initial_r0) {
 }
 
 void board_mboot_state_change(int state, uint32_t arg) {
-    if (state == MBOOT_STATE_FSLOAD_END) {
+    if (state == MBOOT_STATE_FSLOAD_START) {
+        // The FS-load update is about to start.  Program the update key and FS-load elements
+        // into the flash so they can be retrieved if there is a power failure during the update.
+        mp_spiflash_erase_block(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR);
+        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, ELEM_DATA_SIZE, ELEM_DATA_START);
+        uint32_t key = SPIFLASH_UPDATE_KEY_VALUE;
+        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR, 4, (const uint8_t *)&key);
+    } else 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);

From d3fe0a06e8799ef95716aaada0a95505aebab48c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 28 Apr 2024 15:35:38 +1000
Subject: [PATCH 1049/3129] stm32/flash: Fix writing final words to flash on H5
 and H7 MCUs.

The calculations `num_word32 / 4` and `num_word32 / 8` were rounding down
the number of words to program to flash, and therefore possibly truncating
the data (eg mboot could miss writing the final few words of the firmware).

That's fixed in this commit by adding extra logic to program any remaining
words.  And the logic for H5 and H7 is combined.

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

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 10c5f296a28c8..7668b53a43b58 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include <string.h>
 #include "py/mpconfig.h"
 #include "py/misc.h"
 #include "py/mphal.h"
@@ -450,28 +451,38 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
         #endif
     }
 
-    #elif defined(STM32H5)
+    #elif defined(STM32H5) || defined(STM32H7)
 
-    // program the flash 128 bits (4 words) at a time
-    for (int i = 0; i < num_word32 / 4; i++) {
-        status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_QUADWORD, flash_dest, (uint64_t)(uint32_t)src);
-        if (status != HAL_OK) {
-            break;
-        }
-        flash_dest += 16;
-        src += 4;
-    }
+    #if defined(STM32H5)
+    static const unsigned int WORD32_PER_FLASHWORD = 4;
+    static const unsigned int PROGRAM_TYPE = FLASH_TYPEPROGRAM_QUADWORD;
+    #else
+    static const unsigned int WORD32_PER_FLASHWORD = FLASH_NB_32BITWORD_IN_FLASHWORD;
+    static const unsigned int PROGRAM_TYPE = FLASH_TYPEPROGRAM_FLASHWORD;
+    #endif
 
-    #elif defined(STM32H7)
+    if (flash_dest % (WORD32_PER_FLASHWORD * sizeof(uint32_t))) {
+        // The flash_dest address is not aligned correctly.
+        status = HAL_ERROR;
+    } else {
+        // Program the flash WORD32_PER_FLASHWORD words at a time.
+        for (int i = 0; i < num_word32 / WORD32_PER_FLASHWORD; i++) {
+            status = HAL_FLASH_Program(PROGRAM_TYPE, flash_dest, (uint32_t)src);
+            if (status != HAL_OK) {
+                break;
+            }
+            flash_dest += WORD32_PER_FLASHWORD * sizeof(uint32_t);
+            src += WORD32_PER_FLASHWORD;
+        }
 
-    // program the flash 256 bits at a time
-    for (int i = 0; i < num_word32 / 8; i++) {
-        status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_FLASHWORD, flash_dest, (uint64_t)(uint32_t)src);
-        if (status != HAL_OK) {
-            break;
+        // Program any remaining words from src.
+        // Additional bytes beyond that are programmed to 0xff.
+        if (num_word32 % WORD32_PER_FLASHWORD) {
+            uint32_t buf[WORD32_PER_FLASHWORD];
+            memset(buf, 0xff, sizeof(buf));
+            memcpy(buf, src, (num_word32 % WORD32_PER_FLASHWORD) * sizeof(uint32_t));
+            status = HAL_FLASH_Program(PROGRAM_TYPE, flash_dest, (uint32_t)buf);
         }
-        flash_dest += 32;
-        src += 8;
     }
 
     #else

From a7d34b6f7c48cd5920ae52b2e6fb35cc196a606b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 28 Apr 2024 15:36:08 +1000
Subject: [PATCH 1050/3129] stm32/mboot: Buffer the correct amount of bytes for
 a flash write.

Different MCUs have different requirements for the minimum number of bytes
that can be written to internal flash.

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

diff --git a/ports/stm32/mboot/pack.c b/ports/stm32/mboot/pack.c
index 7d4adf4780d5b..719cfce3202c7 100644
--- a/ports/stm32/mboot/pack.c
+++ b/ports/stm32/mboot/pack.c
@@ -42,6 +42,17 @@
 #define MBOOT_PACK_GZIP_BUFFER_SIZE (2048)
 #endif
 
+// Configure the minimum number of bytes that can be written at once to the internal flash.
+#if defined(STM32H5)
+#define FLASH_MIN_WRITE_BYTES (16)
+#elif defined(STM32H7)
+#define FLASH_MIN_WRITE_BYTES (4 * FLASH_NB_32BITWORD_IN_FLASHWORD)
+#else
+// This default is 8 bytes due to STM32WB MCUs requiring that a double-word write
+// to flash can only be done once (due to ECC).
+#define FLASH_MIN_WRITE_BYTES (8)
+#endif
+
 // State to manage automatic flash erasure.
 static uint32_t erased_base_addr;
 static uint32_t erased_top_addr;
@@ -57,9 +68,8 @@ static uint8_t decrypted_buf[MBOOT_PACK_DFU_CHUNK_BUF_SIZE] __attribute__((align
 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] __attribute__((aligned(8)));
+// entire firmware is validated.
+static uint8_t firmware_head[FLASH_MIN_WRITE_BYTES] __attribute__((aligned(FLASH_MIN_WRITE_BYTES)));
 
 // Flag to indicate that firmware_head contains valid data.
 static bool firmware_head_valid;
@@ -100,7 +110,7 @@ static int mboot_pack_commit_chunk(uint32_t addr, uint8_t *data, size_t len) {
         return ret;
     }
 
-    if (addr == APPLICATION_ADDR) {
+    if (addr == APPLICATION_ADDR && len >= sizeof(firmware_head)) {
         // 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));

From a521df27dc483c5376ef7e348aa9fbbd0c4e67a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Mar 2024 13:53:24 +1100
Subject: [PATCH 1051/3129] stm32/i2c: Fix clock enable for I2C4 on STM32F7
 MCUs.

This was broken by 5aec051f9f0e1be9750ca4f08478275f298087a3 when adding
support for I2C4 on H7 MCUs.

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

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 9d128acc3cdd2..a1fde7e6ba114 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -312,19 +312,15 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
     // Enable I2C peripheral clock
     volatile uint32_t tmp;
     (void)tmp;
-    switch (i2c_id) {
-        case 0:
-        case 1:
-        case 2:
-            RCC->APB1ENR |= RCC_APB1ENR_I2C1EN << i2c_id;
-            tmp = RCC->APB1ENR; // delay after RCC clock enable
-            break;
-        #if defined(STM32H7)
-        case 3:
-            RCC->APB4ENR |= RCC_APB4ENR_I2C4EN;
-            tmp = RCC->APB4ENR; // delay after RCC clock enable
-            break;
-        #endif
+    #if defined(STM32H7)
+    if (i2c_id == 3) {
+        RCC->APB4ENR |= RCC_APB4ENR_I2C4EN;
+        tmp = RCC->APB4ENR; // delay after RCC clock enable
+    } else
+    #endif
+    {
+        RCC->APB1ENR |= RCC_APB1ENR_I2C1EN << i2c_id;
+        tmp = RCC->APB1ENR; // delay after RCC clock enable
     }
 
     // Initialise I2C peripheral

From 9681a66c6b79a5f4721c74b756256336c47c9879 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 May 2024 16:29:39 +1000
Subject: [PATCH 1052/3129] webassembly/api: Fix importing micropython.mjs
 module from node REPL.

Fixes issue #14363.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/api.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index 2be82e890705f..f3245451e4ad0 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -262,7 +262,7 @@ if (
     typeof process.versions === "object" &&
     typeof process.versions.node === "string"
 ) {
-    // Check if this module is ron from the command line.
+    // Check if this module is run from the command line via `node micropython.mjs`.
     //
     // See https://stackoverflow.com/questions/6398196/detect-if-called-through-require-or-directly-by-command-line/66309132#66309132
     //
@@ -270,14 +270,17 @@ if (
     // - `resolve()` is used to handle symlinks
     // - `includes()` is used to handle cases where the file extension was omitted when passed to node
 
-    const path = await import("path");
-    const url = await import("url");
+    if (process.argv.length > 1) {
+        const path = await import("path");
+        const url = await import("url");
 
-    const pathToThisFile = path.resolve(url.fileURLToPath(import.meta.url));
-    const pathPassedToNode = path.resolve(process.argv[1]);
-    const isThisFileBeingRunViaCLI = pathToThisFile.includes(pathPassedToNode);
+        const pathToThisFile = path.resolve(url.fileURLToPath(import.meta.url));
+        const pathPassedToNode = path.resolve(process.argv[1]);
+        const isThisFileBeingRunViaCLI =
+            pathToThisFile.includes(pathPassedToNode);
 
-    if (isThisFileBeingRunViaCLI) {
-        runCLI();
+        if (isThisFileBeingRunViaCLI) {
+            runCLI();
+        }
     }
 }

From 9da63a343e08c2a453ff32801bb0d9545e538497 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 6 May 2024 12:26:20 +1000
Subject: [PATCH 1053/3129] webassembly/proxy_c: Reject promises with a
 PythonError instance.

The `reason` in a rejected promise should be an instance of `Error`.  That
leads to better error messages on the JavaScript side.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/proxy_c.c                           | 11 +++++++++--
 tests/ports/webassembly/run_python_async_error.mjs    | 11 +++++++++++
 .../ports/webassembly/run_python_async_error.mjs.exp  |  5 +++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 tests/ports/webassembly/run_python_async_error.mjs
 create mode 100644 tests/ports/webassembly/run_python_async_error.mjs.exp

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index ebf670b56ec5b..9b32b6450a489 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -297,7 +297,14 @@ EM_JS(void, js_then_resolve, (uint32_t * ret_value, uint32_t * resolve, uint32_t
 });
 
 EM_JS(void, js_then_reject, (uint32_t * ret_value, uint32_t * resolve, uint32_t * reject), {
-    const ret_value_js = proxy_convert_mp_to_js_obj_jsside(ret_value);
+    // The ret_value object should be a Python exception.  Convert it to a
+    // JavaScript PythonError and pass it as the reason to reject the promise.
+    let ret_value_js;
+    try {
+        ret_value_js = proxy_convert_mp_to_js_obj_jsside(ret_value);
+    } catch(error) {
+        ret_value_js = error;
+    }
     const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
     const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
     reject_js(ret_value_js);
@@ -359,7 +366,7 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t send_value, mp_o
     } else { // ret_kind == MP_VM_RETURN_EXCEPTION;
         // Pass the exception through as an object to reject the promise (don't raise/throw it).
         uint32_t out_ret_value[PVN];
-        proxy_convert_mp_to_js_obj_cside(ret_value, out_ret_value);
+        proxy_convert_mp_to_js_exc_cside(ret_value, out_ret_value);
         js_then_reject(out_ret_value, out_resolve, out_reject);
         return mp_const_none;
     }
diff --git a/tests/ports/webassembly/run_python_async_error.mjs b/tests/ports/webassembly/run_python_async_error.mjs
new file mode 100644
index 0000000000000..ce4db0ff07880
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async_error.mjs
@@ -0,0 +1,11 @@
+// Test raising an exception in async Python code running in runPythonAsync,
+// that the JavaScript-level promise is rejected with a PythonError.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+try {
+    await mp.runPythonAsync("await fail");
+} catch (error) {
+    console.log(error.name, error.type);
+    console.log(error.message);
+}
diff --git a/tests/ports/webassembly/run_python_async_error.mjs.exp b/tests/ports/webassembly/run_python_async_error.mjs.exp
new file mode 100644
index 0000000000000..c77de4bb345fe
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async_error.mjs.exp
@@ -0,0 +1,5 @@
+PythonError NameError
+Traceback (most recent call last):
+  File "<stdin>", line 1, in <module>
+NameError: name 'fail' isn't defined
+

From 50b43fec1a01710a08e1b56c1cf312877457bfa1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 6 May 2024 12:33:16 +1000
Subject: [PATCH 1054/3129] webassembly/proxy_c: Only proxy across
 resolve/reject funs when needed.

To improve efficiency.

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

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 9b32b6450a489..ade9d36dee847 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -289,14 +289,13 @@ void proxy_c_to_js_get_dict(uint32_t c_ref, uint32_t *out) {
 
 static const mp_obj_fun_builtin_var_t resume_obj;
 
-EM_JS(void, js_then_resolve, (uint32_t * ret_value, uint32_t * resolve, uint32_t * reject), {
+EM_JS(void, js_then_resolve, (uint32_t * ret_value, uint32_t * resolve), {
     const ret_value_js = proxy_convert_mp_to_js_obj_jsside(ret_value);
     const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
-    const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
     resolve_js(ret_value_js);
 });
 
-EM_JS(void, js_then_reject, (uint32_t * ret_value, uint32_t * resolve, uint32_t * reject), {
+EM_JS(void, js_then_reject, (uint32_t * ret_value, uint32_t * reject), {
     // The ret_value object should be a Python exception.  Convert it to a
     // JavaScript PythonError and pass it as the reason to reject the promise.
     let ret_value_js;
@@ -305,7 +304,6 @@ EM_JS(void, js_then_reject, (uint32_t * ret_value, uint32_t * resolve, uint32_t
     } catch(error) {
         ret_value_js = error;
     }
-    const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
     const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
     reject_js(ret_value_js);
 });
@@ -344,30 +342,33 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t send_value, mp_o
     mp_obj_t ret_value;
     mp_vm_return_kind_t ret_kind = mp_resume(self_in, send_value, throw_value, &ret_value);
 
-    uint32_t out_resolve[PVN];
-    uint32_t out_reject[PVN];
-    proxy_convert_mp_to_js_obj_cside(resolve, out_resolve);
-    proxy_convert_mp_to_js_obj_cside(reject, out_reject);
-
     if (ret_kind == MP_VM_RETURN_NORMAL) {
         uint32_t out_ret_value[PVN];
+        uint32_t out_resolve[PVN];
         proxy_convert_mp_to_js_obj_cside(ret_value, out_ret_value);
-        js_then_resolve(out_ret_value, out_resolve, out_reject);
+        proxy_convert_mp_to_js_obj_cside(resolve, out_resolve);
+        js_then_resolve(out_ret_value, out_resolve);
         return mp_const_none;
     } else if (ret_kind == MP_VM_RETURN_YIELD) {
         // ret_value should be a JS thenable
         mp_obj_t py_resume = mp_obj_new_bound_meth(MP_OBJ_FROM_PTR(&resume_obj), self_in);
         int ref = mp_obj_jsproxy_get_ref(ret_value);
         uint32_t out_py_resume[PVN];
+        uint32_t out_resolve[PVN];
+        uint32_t out_reject[PVN];
         proxy_convert_mp_to_js_obj_cside(py_resume, out_py_resume);
+        proxy_convert_mp_to_js_obj_cside(resolve, out_resolve);
+        proxy_convert_mp_to_js_obj_cside(reject, out_reject);
         uint32_t out[PVN];
         js_then_continue(ref, out_py_resume, out_resolve, out_reject, out);
         return proxy_convert_js_to_mp_obj_cside(out);
     } else { // ret_kind == MP_VM_RETURN_EXCEPTION;
         // Pass the exception through as an object to reject the promise (don't raise/throw it).
         uint32_t out_ret_value[PVN];
+        uint32_t out_reject[PVN];
         proxy_convert_mp_to_js_exc_cside(ret_value, out_ret_value);
-        js_then_reject(out_ret_value, out_resolve, out_reject);
+        proxy_convert_mp_to_js_obj_cside(reject, out_reject);
+        js_then_reject(out_ret_value, out_reject);
         return mp_const_none;
     }
 }

From e860e32e24e1c32db48f1d8b6f260c27aeb75657 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 6 May 2024 12:35:23 +1000
Subject: [PATCH 1055/3129] webassembly/objjsproxy: Fix proxying in arguments
 to JS new function.

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

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 15fbb57523fc7..b575839d982e5 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -147,7 +147,7 @@ EM_JS(void, js_reflect_construct, (int f_ref, uint32_t n_args, uint32_t * args,
     const f = proxy_js_ref[f_ref];
     const as = [];
     for (let i = 0; i < n_args; ++i) {
-        as.push(proxy_convert_mp_to_js_obj_jsside(args + i * 4));
+        as.push(proxy_convert_mp_to_js_obj_jsside(args + i * 3 * 4));
     }
     const ret = Reflect.construct(f, as);
     proxy_convert_js_to_mp_obj_jsside(ret, out);
@@ -242,7 +242,7 @@ static mp_obj_t jsproxy_reflect_construct(size_t n_args, const mp_obj_t *args) {
     for (unsigned int i = 0; i < n_args; ++i) {
         proxy_convert_mp_to_js_obj_cside(args[i], &args_conv[i * PVN]);
     }
-    uint32_t out[3];
+    uint32_t out[PVN];
     js_reflect_construct(arg0, n_args, args_conv, out);
     return proxy_convert_js_to_mp_obj_cside(out);
 }

From c056840ee8f7a154ff437a335eb4a83f14d47f0f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 6 May 2024 13:47:48 +1000
Subject: [PATCH 1056/3129] webassembly/objpyproxy: Implement JS iterator
 protocol for Py iterables.

This allows using JavaScript for..of on Python iterables.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile               |  2 ++
 ports/webassembly/objpyproxy.js          | 29 +++++++++++++++-
 ports/webassembly/proxy_c.c              | 42 ++++++++++++++++++++++--
 tests/ports/webassembly/iterator.mjs     | 21 ++++++++++++
 tests/ports/webassembly/iterator.mjs.exp |  7 ++++
 5 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 tests/ports/webassembly/iterator.mjs
 create mode 100644 tests/ports/webassembly/iterator.mjs.exp

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index 93b92ef583989..fddfb5094aac5 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -60,8 +60,10 @@ EXPORTED_FUNCTIONS_EXTRA += ,\
 	_proxy_c_to_js_dir,\
 	_proxy_c_to_js_get_array,\
 	_proxy_c_to_js_get_dict,\
+	_proxy_c_to_js_get_iter,\
 	_proxy_c_to_js_get_type,\
 	_proxy_c_to_js_has_attr,\
+	_proxy_c_to_js_iternext,\
 	_proxy_c_to_js_lookup_attr,\
 	_proxy_c_to_js_resume,\
 	_proxy_c_to_js_store_attr,\
diff --git a/ports/webassembly/objpyproxy.js b/ports/webassembly/objpyproxy.js
index 9ba06283ea2b0..3b94f8aadc782 100644
--- a/ports/webassembly/objpyproxy.js
+++ b/ports/webassembly/objpyproxy.js
@@ -162,10 +162,37 @@ const py_proxy_handler = {
         if (prop === "then") {
             return null;
         }
+
+        if (prop === Symbol.iterator) {
+            // Get the Python object iterator, and return a JavaScript generator.
+            const iter_ref = Module.ccall(
+                "proxy_c_to_js_get_iter",
+                "number",
+                ["number"],
+                [target._ref],
+            );
+            return function* () {
+                const value = Module._malloc(3 * 4);
+                while (true) {
+                    const valid = Module.ccall(
+                        "proxy_c_to_js_iternext",
+                        "number",
+                        ["number", "pointer"],
+                        [iter_ref, value],
+                    );
+                    if (!valid) {
+                        break;
+                    }
+                    yield proxy_convert_mp_to_js_obj_jsside(value);
+                }
+                Module._free(value);
+            };
+        }
+
         const value = Module._malloc(3 * 4);
         Module.ccall(
             "proxy_c_to_js_lookup_attr",
-            "number",
+            "null",
             ["number", "string", "pointer"],
             [target._ref, prop, value],
         );
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index ade9d36dee847..b874b36c02c6b 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -65,6 +65,12 @@ void proxy_c_init(void) {
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t proxy_c_ref);
 
+static inline size_t proxy_c_add_obj(mp_obj_t obj) {
+    size_t id = ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->len;
+    mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), obj);
+    return id;
+}
+
 static inline mp_obj_t proxy_c_get_obj(uint32_t c_ref) {
     return ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->items[c_ref];
 }
@@ -122,9 +128,7 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
         } else {
             kind = PROXY_KIND_MP_OBJECT;
         }
-        size_t id = ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->len;
-        mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), obj);
-        out[1] = id;
+        out[1] = proxy_c_add_obj(obj);
     }
     out[0] = kind;
 }
@@ -284,6 +288,38 @@ void proxy_c_to_js_get_dict(uint32_t c_ref, uint32_t *out) {
     out[1] = (uintptr_t)map->table;
 }
 
+/******************************************************************************/
+// Bridge Python iterator to JavaScript iterator protocol.
+
+uint32_t proxy_c_to_js_get_iter(uint32_t c_ref) {
+    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    mp_obj_t iter = mp_getiter(obj, NULL);
+    return proxy_c_add_obj(iter);
+}
+
+bool proxy_c_to_js_iternext(uint32_t c_ref, uint32_t *out) {
+    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t iter = mp_iternext_allow_raise(obj);
+        if (iter == MP_OBJ_STOP_ITERATION) {
+            nlr_pop();
+            return false;
+        }
+        nlr_pop();
+        proxy_convert_mp_to_js_obj_cside(iter, out);
+        return true;
+    } 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 false;
+        } else {
+            // uncaught exception
+            proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+            return true;
+        }
+    }
+}
+
 /******************************************************************************/
 // Bridge Python generator to JavaScript thenable.
 
diff --git a/tests/ports/webassembly/iterator.mjs b/tests/ports/webassembly/iterator.mjs
new file mode 100644
index 0000000000000..91415d530f93c
--- /dev/null
+++ b/tests/ports/webassembly/iterator.mjs
@@ -0,0 +1,21 @@
+// Test accessing Python iterables from JavaScript via the JavaScript iterator protocol.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+    s = "abc"
+    l = [1, 2, 3]
+`);
+
+// Iterate a Python string.
+for (const value of mp.globals.get("s")) {
+    console.log(value);
+}
+
+// Iterate a Python list.
+for (const value of mp.globals.get("l")) {
+    console.log(value);
+}
+
+// Iterate a Python list from a built-in JavaScript constructor.
+mp.runPython("import js; print(js.Set.new([1, 2, 3]).has(3))");
diff --git a/tests/ports/webassembly/iterator.mjs.exp b/tests/ports/webassembly/iterator.mjs.exp
new file mode 100644
index 0000000000000..9d1aaac117d84
--- /dev/null
+++ b/tests/ports/webassembly/iterator.mjs.exp
@@ -0,0 +1,7 @@
+a
+b
+c
+1
+2
+3
+True

From be1ecb54e6be1ee5017a1a8aeca83d9e12ad16c9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 May 2024 11:33:05 +1000
Subject: [PATCH 1057/3129] webassembly/api: Resolve thenables returned from
 runPythonAsync.

JavaScript semantics are such that the caller of an async function does not
need to await that function for it to run to completion.  This commit makes
that behaviour also apply to top-level async Python code run via
`runPythonAsync()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/api.js                      |  6 ++++-
 .../webassembly/run_python_async_no_await.mjs | 24 +++++++++++++++++++
 .../run_python_async_no_await.mjs.exp         |  6 +++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 tests/ports/webassembly/run_python_async_no_await.mjs
 create mode 100644 tests/ports/webassembly/run_python_async_no_await.mjs.exp

diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index f3245451e4ad0..c00edf575fa96 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -152,7 +152,11 @@ export async function loadMicroPython(options) {
                 [buf, len, value],
             );
             Module._free(buf);
-            return proxy_convert_mp_to_js_obj_jsside_with_free(value);
+            const ret = proxy_convert_mp_to_js_obj_jsside_with_free(value);
+            if (ret instanceof PyProxyThenable) {
+                return Promise.resolve(ret);
+            }
+            return ret;
         },
         replInit() {
             Module.ccall("mp_js_repl_init", "null", ["null"]);
diff --git a/tests/ports/webassembly/run_python_async_no_await.mjs b/tests/ports/webassembly/run_python_async_no_await.mjs
new file mode 100644
index 0000000000000..19462d6e7f628
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async_no_await.mjs
@@ -0,0 +1,24 @@
+// Test runPythonAsync() without await'ing it.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.p = new Promise((resolve, reject) => {
+    setTimeout(() => {
+        resolve(123);
+        console.log("setTimeout resolved");
+    }, 100);
+});
+
+console.log(1);
+
+const ret = mp.runPythonAsync(`
+import js
+print("py 1")
+print("resolved value:", await js.p)
+print("py 2")
+`);
+
+// `ret` should be a Promise.
+console.log(2, ret);
+
+// Here, the Python async code should continue to run until completed.
diff --git a/tests/ports/webassembly/run_python_async_no_await.mjs.exp b/tests/ports/webassembly/run_python_async_no_await.mjs.exp
new file mode 100644
index 0000000000000..1dbf7f95f4d78
--- /dev/null
+++ b/tests/ports/webassembly/run_python_async_no_await.mjs.exp
@@ -0,0 +1,6 @@
+1
+2 Promise { <pending> }
+py 1
+setTimeout resolved
+resolved value: 123
+py 2

From 595f86155aa76c4fd7c9b46a848023a93f6ddd32 Mon Sep 17 00:00:00 2001
From: Rick Sorensen <rick.sorensen@gmail.com>
Date: Tue, 26 Dec 2023 12:57:46 -0600
Subject: [PATCH 1058/3129] docs/esp32/quickref: Add note about different ESP32
 varieties.

Signed-off-by: Rick Sorensen <rick.sorensen@gmail.com>
---
 docs/esp32/quickref.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 6c07c584d325e..3f0db22861d3a 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -18,6 +18,9 @@ working with this board it may be useful to get an overview of the microcontroll
    general.rst
    tutorial/index.rst
 
+Note that there are several varieties of ESP32 -- ESP32, ESP32C3, ESP32S2, ESP32S3 --
+supported by MicroPython, with some differences in functionality between them.
+
 Installing MicroPython
 ----------------------
 
@@ -58,7 +61,7 @@ The :mod:`esp32` module::
     import esp32
 
     esp32.raw_temperature() # read the internal temperature of the MCU, in Fahrenheit
-    esp32.ULP()             # access to the Ultra-Low-Power Co-processor
+    esp32.ULP()             # access to the Ultra-Low-Power Co-processor, not on ESP32C3
 
 Note that the temperature sensor in the ESP32 will typically read higher than
 ambient due to the IC getting warm while it runs.  This effect can be minimised

From 63c30a2dfc3118f2f82693dd96114b1efebf071c Mon Sep 17 00:00:00 2001
From: Rick Sorensen <rick.sorensen@gmail.com>
Date: Tue, 26 Dec 2023 12:57:46 -0600
Subject: [PATCH 1059/3129] esp32/modesp32: Add mcu_temperature() function for
 C3/S2/S3 devices.

For ESP32C3/S2/S3 IDFv5 exposes new internal temperature API which is
different to the base ESP32, IDFv4.

Thanks to @robert-hh for cleaner code and testing sensor capability in
these devices.

See discussion #10443.

Signed-off-by: Rick Sorensen <rick.sorensen@gmail.com>
---
 docs/esp32/quickref.rst |  6 ++++++
 ports/esp32/modesp32.c  | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 3f0db22861d3a..2be1dbadc353a 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -67,6 +67,12 @@ Note that the temperature sensor in the ESP32 will typically read higher than
 ambient due to the IC getting warm while it runs.  This effect can be minimised
 by reading the temperature sensor immediately after waking up from sleep.
 
+ESP32C3, ESP32S2, and ESP32S3 also have an internal temperature sensor available.
+It is implemented a bit differently to the ESP32 and returns the temperature in
+Celsius::
+
+    esp32.mcu_temperature() # read the internal temperature of the MCU, in Celsius
+
 Networking
 ----------
 
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index f363939483c6c..1ee9153d7d620 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -168,6 +168,26 @@ static mp_obj_t esp32_raw_temperature(void) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(esp32_raw_temperature_obj, esp32_raw_temperature);
 
+#else
+
+// IDF 5 exposes new internal temperature interface, and the ESP32C3/S2/S3
+// now have calibrated temperature settings in 5 discrete ranges.
+#include "driver/temperature_sensor.h"
+
+static mp_obj_t esp32_mcu_temperature(void) {
+    static temperature_sensor_handle_t temp_sensor = NULL;
+    float tvalue;
+    if (temp_sensor == NULL) {
+        temperature_sensor_config_t temp_sensor_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(-10, 80);
+        ESP_ERROR_CHECK(temperature_sensor_install(&temp_sensor_config, &temp_sensor));
+    }
+    ESP_ERROR_CHECK(temperature_sensor_enable(temp_sensor));
+    ESP_ERROR_CHECK(temperature_sensor_get_celsius(temp_sensor, &tvalue));
+    ESP_ERROR_CHECK(temperature_sensor_disable(temp_sensor));
+    return mp_obj_new_int((int)(tvalue + 0.5));
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(esp32_mcu_temperature_obj, esp32_mcu_temperature);
+
 #endif
 
 static mp_obj_t esp32_idf_heap_info(const mp_obj_t cap_in) {
@@ -202,6 +222,8 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { 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) },
+    #else
+    { MP_ROM_QSTR(MP_QSTR_mcu_temperature), MP_ROM_PTR(&esp32_mcu_temperature_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_idf_heap_info), MP_ROM_PTR(&esp32_idf_heap_info_obj) },
 

From 8762fe8b4c6a7608d48daa8458e6501fafd3eafc Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 1 Apr 2024 09:10:49 -0500
Subject: [PATCH 1060/3129] extmod/network_wiznet5k: Properly enable socket
 buffers for W5100(S).

The W5100 and W5100S only have 4 available sockets and 16kB of socket
buffer.  Allocating 16kB to either the receive or transmit buffer of a
single socket is not allowed, so the current setup does not change the
allocation for socket 0 from the reset default.  ctlwizchip is returning -1
to indicate the error, but the response isn't being inspected and probably
doesn't need to be.

Signed-off-by: Jared Hancock <jared@greezybacon.me>
---
 extmod/network_wiznet5k.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index b8ca075b3d14f..1eaabe9ebeac3 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -211,7 +211,11 @@ static void wiznet5k_init(void) {
     // Configure wiznet for raw ethernet frame usage.
 
     // Configure 16k buffers for fast MACRAW
+    #if _WIZCHIP_ < W5200
+    uint8_t sn_size[8] = {8, 0, 0, 0, 8, 0, 0, 0};
+    #else
     uint8_t sn_size[16] = {16, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0};
+    #endif
     ctlwizchip(CW_INIT_WIZCHIP, sn_size);
 
     if (wiznet5k_obj.use_interrupt) {

From 9a43989a8651dacc004f9bb8df6574c814ec98ca Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 7 May 2024 17:02:11 +1000
Subject: [PATCH 1061/3129] shared/tinyusb: Stall the CDC IN endpoint while
 disconnecting.

Only when dynamic USB devices are enabled.

The issue here is that when the USB reset triggers, the dynamic USB device
reset callback is called from inside the TinyUSB task.

If that callback tries to print something then it'll call through to
tud_cdc_write_flush(), but TinyUSB hasn't finished updating state yet to
know it's no longer configured. Subsequently it may try to queue a transfer
and then the low-level DCD layer panics.

By explicitly stalling the endpoint first, usbd_edpt_claim() will fail and
tud_cdc_write_flush() returns immediately.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd_runtime.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index 7ff7dd4ab2ff0..e10d1cb3f62d2 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -472,6 +472,8 @@ static void mp_usbd_disconnect(mp_obj_usb_device_t *usbd) {
     #if MICROPY_HW_USB_CDC
     // Ensure no pending static CDC writes, as these can cause TinyUSB to crash
     tud_cdc_write_clear();
+    // Prevent cdc write flush from initiating any new transfers while disconnecting
+    usbd_edpt_stall(USBD_RHPORT, USBD_CDC_EP_IN);
     #endif
 
     bool was_connected = tud_connected();

From c3301da17626663d7d6e5fc79a1010842528c9b1 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 2 May 2024 13:37:33 +1000
Subject: [PATCH 1062/3129] docs/library/machine.USBDevice: Update note about
 packages in mp-lib.

Also fix a small typo.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/machine.USBDevice.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/library/machine.USBDevice.rst b/docs/library/machine.USBDevice.rst
index e02d3c02df336..5fc71651612b1 100644
--- a/docs/library/machine.USBDevice.rst
+++ b/docs/library/machine.USBDevice.rst
@@ -8,13 +8,11 @@ class USBDevice -- USB Device driver
           ports.
 
 USBDevice provides a low-level Python API for implementing USB device functions using
-Python code. This low-level API assumes familiarity with the USB standard. It's
-not recommended to use this API directly, instead install the high-level usbd
-module from micropython-lib.
+Python code.
 
-.. warning:: This functionality is very new and the high-level usbd module is
-             not yet merged into micropython-lib. It can be found `here on
-             GitHub <https://github.com/micropython/micropython-lib/pull/558>`_.
+.. warning:: This low-level API assumes familiarity with the USB standard. There
+   are high-level `usb driver modules in micropython-lib`_ which provide a
+   simpler interface and more built-in functionality.
 
 Terminology
 -----------
@@ -186,7 +184,7 @@ Methods
     necessary if the runtime device configuration has changed, so that
     the host sees the new device.
 
-.. attribute:: USDBD.builtin_driver
+.. attribute:: USBDevice.builtin_driver
 
    This attribute holds the current built-in driver configuration, and must be
    set to one of the ``USBDevice.BUILTIN_`` named constants defined on this object.
@@ -294,3 +292,5 @@ Constants
             descriptor.
           - ``desc_cfg`` - ``bytes`` object containing the complete built-in USB
             configuration descriptor.
+
+.. _usb driver modules in micropython-lib: https://github.com/micropython/micropython-lib/tree/master/micropython/usb#readme

From b2df89c417841a7db18120fb40e1dee96cf71865 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Apr 2024 11:33:39 +1000
Subject: [PATCH 1063/3129] examples/usb: Add a very simple USBDevice example
 with host.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/usb/usb_simple_device.py     | 144 ++++++++++++++++++++++++++
 examples/usb/usb_simple_host_pyusb.py |  47 +++++++++
 2 files changed, 191 insertions(+)
 create mode 100644 examples/usb/usb_simple_device.py
 create mode 100755 examples/usb/usb_simple_host_pyusb.py

diff --git a/examples/usb/usb_simple_device.py b/examples/usb/usb_simple_device.py
new file mode 100644
index 0000000000000..0b0921f547325
--- /dev/null
+++ b/examples/usb/usb_simple_device.py
@@ -0,0 +1,144 @@
+# Implementation of a very simple, custom USB device in Python.  The device has an
+# IN and OUT endpoint, accepts up to 64 bytes of data on the OUT endpoint, and echos
+# that data back to the IN endpoint.
+#
+# To run, just execute this file on a device with machine.USBDevice support.  The device
+# will then change to the custom USB device.
+#
+# For example, use `mpremote` (the `--no-follow` option starts the script running
+# without waiting for a response, because there won't be a response after the device
+# changes its USB mode):
+#
+# $ mpremote run --no-follow usb_simple_device.py
+#
+# Then, run the host side of the example on your PC using:
+#
+# $ sudo python usb_simple_host_pyusb.py
+#
+# You'll need to have `pyusb` installed via `pip install pyusb` to run the host PC code.
+# And `sudo` is most likely needed to access the custom USB device.
+#
+# Once you have finished running the code, you will need to reset or unplug the USB
+# device to stop it.
+
+import machine
+
+# VID and PID of the USB device.
+VID = 0xF055
+PID = 0x9999
+
+# USB endpoints used by the device.
+EP_OUT = 0x01
+EP_IN = 0x81
+
+# USB device descriptor.
+_desc_dev = bytes(
+    [
+        0x12,  # bLength
+        0x01,  # bDescriptorType: Device
+        0x00,
+        0x02,  # USB version: 2.00
+        0xFF,  # bDeviceClass: vendor
+        0x00,  # bDeviceSubClass
+        0x01,  # bDeviceProtocol
+        0x40,  # bMaxPacketSize
+        VID & 0xFF,
+        VID >> 8 & 0xFF,  # VID
+        PID & 0xFF,
+        PID >> 8 & 0xFF,  # PID
+        0x00,
+        0x01,  # bcdDevice: 1.00
+        0x11,  # iManufacturer
+        0x12,  # iProduct
+        0x13,  # iSerialNumber
+        0x01,  # bNumConfigurations: 1
+    ]
+)
+
+# USB configuration descriptor.
+_desc_cfg = bytes(
+    [
+        # Configuration Descriptor.
+        0x09,  # bLength
+        0x02,  # bDescriptorType: configuration
+        0x20,
+        0x00,  # wTotalLength: 32
+        0x01,  # bNumInterfaces
+        0x01,  # bConfigurationValue
+        0x14,  # iConfiguration
+        0xA0,  # bmAttributes
+        0x96,  # bMaxPower
+        # Interface Descriptor.
+        0x09,  # bLength
+        0x04,  # bDescriptorType: interface
+        0x00,  # bInterfaceNumber
+        0x00,  # bAlternateSetting
+        0x02,  # bNumEndpoints
+        0xFF,  # bInterfaceClass
+        0x03,  # bInterfaceSubClass
+        0x00,  # bInterfaceProtocol
+        0x15,  # iInterface
+        # Endpoint IN1.
+        0x07,  # bLength
+        0x05,  # bDescriptorType: endpoint
+        EP_IN,  # bEndpointAddress
+        0x03,  # bmAttributes: interrupt
+        0x40,
+        0x00,  # wMaxPacketSize
+        0x0A,  # bInterval
+        # Endpoint OUT1.
+        0x07,  # bLength
+        0x05,  # bDescriptorType: endpoint
+        EP_OUT,  # bEndpointAddress
+        0x02,  # bmAttributes: bulk
+        0x40,
+        0x00,  # wMaxPacketSize
+        0x00,  # bInterval
+    ]
+)
+
+# USB strings.
+_desc_strs = {
+    0x11: b"iManufacturer",
+    0x12: b"iProduct",
+    0x13: b"iSerial",
+    0x14: b"iInterface",
+    0x15: b"iInterface",
+    0x16: b"Extra information",
+}
+
+
+# USB callback for when our custom USB interface is opened by the host.
+def _open_itf_cb(interface_desc_view):
+    print("_open_itf_cb", bytes(interface_desc_view))
+    # Prepare to receive first data packet on the OUT endpoint.
+    usbd.submit_xfer(EP_OUT, usbd_buf)
+
+
+# USB callback for when a data transfer (IN or OUT) has completed.
+def _xfer_cb(ep_addr, result, xferred_bytes):
+    print("_xfer_cb", ep_addr, result, xferred_bytes)
+    if ep_addr == EP_OUT:
+        # Received data packet from the host, print it out.
+        print(usbd_buf)
+        # And then echo the data back to the host.
+        usbd.submit_xfer(EP_IN, memoryview(usbd_buf)[:xferred_bytes])
+    elif ep_addr == EP_IN:
+        # Host got our data, prepare to receive the next data packet.
+        usbd.submit_xfer(EP_OUT, usbd_buf)
+
+
+# USB data buffer, for IN and OUT transfers.
+usbd_buf = bytearray(64)
+
+# Switch the USB device to our custom USB driver.
+usbd = machine.USBDevice()
+usbd.builtin_driver = usbd.BUILTIN_NONE
+usbd.config(
+    desc_dev=_desc_dev,
+    desc_cfg=_desc_cfg,
+    desc_strs=_desc_strs,
+    open_itf_cb=_open_itf_cb,
+    xfer_cb=_xfer_cb,
+)
+usbd.active(1)
diff --git a/examples/usb/usb_simple_host_pyusb.py b/examples/usb/usb_simple_host_pyusb.py
new file mode 100755
index 0000000000000..d8ac2dd9c3e34
--- /dev/null
+++ b/examples/usb/usb_simple_host_pyusb.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+#
+# Host side of the `usb_simple_device.py` example.  This must be run using standard
+# Python on a PC.  See further instructions in `usb_simple_device.py`.
+
+import sys
+import usb.core
+import usb.util
+
+# VID and PID of the custom USB device.
+VID = 0xF055
+PID = 0x9999
+
+# USB endpoints used by the device.
+EP_OUT = 0x01
+EP_IN = 0x81
+
+
+def main():
+    # Search for the custom USB device by VID/PID.
+    dev = usb.core.find(idVendor=VID, idProduct=PID)
+
+    if dev is None:
+        print("No USB device found")
+        sys.exit(1)
+
+    # Claim the USB device.
+    usb.util.claim_interface(dev, 0)
+
+    # Read the device's strings.
+    for i in range(0x11, 0x17):
+        print(f"str{i}:", usb.util.get_string(dev, i))
+
+    # Test writing to the device.
+    ret = dev.write(EP_OUT, b"01234567", timeout=1000)
+    print(ret)
+
+    # Test reading from the device.
+    print(dev.read(EP_IN, 64))
+
+    # Release the USB device.
+    usb.util.release_interface(dev, 0)
+    usb.util.dispose_resources(dev)
+
+
+if __name__ == "__main__":
+    main()

From eb517a0a12c09b2ca8958c7481344c187a91b48f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Apr 2024 11:33:58 +1000
Subject: [PATCH 1064/3129] examples/usb: Add a USBDevice example implementing
 the DFU protocol.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/usb/usb_dfu_device.py | 327 +++++++++++++++++++++++++++++++++
 1 file changed, 327 insertions(+)
 create mode 100644 examples/usb/usb_dfu_device.py

diff --git a/examples/usb/usb_dfu_device.py b/examples/usb/usb_dfu_device.py
new file mode 100644
index 0000000000000..5158befd40482
--- /dev/null
+++ b/examples/usb/usb_dfu_device.py
@@ -0,0 +1,327 @@
+# Implementation of USB DFU device in Python.
+#
+# To run, just execute this file on a device with machine.USBDevice support.  The device
+# will then change to DFU mode.
+#
+# For example, use `mpremote` (the `--no-follow` option starts the script running
+# without waiting for a response, because there won't be a response, the USB will change
+# to a DFU device):
+#
+# $ mpremote run --no-follow usb_dfu_device.py
+#
+# Then you can access the DFU device using the `pydfu.py` script in this repository, to
+# list DFU device, copy a file to the device, then exit DFU mode:
+#
+# $ ../../tools/pydfu.py -l
+# $ ../../tools/pydfu.py -u <file.dfu>
+#
+# After running the last command above, the USB CDC device and REPL should reappear.
+
+import struct, machine
+
+# USB constants for bmRequestType.
+USB_REQ_RECIP_INTERFACE = 0x01
+USB_REQ_TYPE_CLASS = 0x20
+USB_DIR_OUT = 0x00
+USB_DIR_IN = 0x80
+
+# String describing the memory layout of the DFU device.
+MEMORY_LAYOUT = b"@Internal Flash  /0x08000000/16*128Kg"
+
+# VID and PID of the DFU device (these are the ST values).
+VID = 0x0483
+PID = 0xDF11
+
+# Maximum transfer size for RX and TX.
+wTransferSize = 2048
+
+# DFU device descriptor.
+_desc_dev = bytes(
+    [
+        0x12,  # bLength
+        0x01,  # bDescriptorType: Device
+        0x00,
+        0x02,  # USB version: 2.00
+        0x00,  # bDeviceClass
+        0x00,  # bDeviceSubClass
+        0x00,  # bDeviceProtocol
+        0x40,  # bMaxPacketSize
+        VID & 0xFF,
+        VID >> 8,  # VID
+        PID & 0xFF,
+        PID >> 8,  # PID
+        0x00,
+        0x01,  # bcdDevice: 1.00
+        0x11,  # iManufacturer
+        0x12,  # iProduct
+        0x13,  # iSerialNumber
+        0x01,  # bNumConfigurations: 1
+    ]
+)
+
+# DFU configuration descriptor.
+_desc_cfg = bytes(
+    [
+        # Configuration Descriptor.
+        0x09,  # bLength
+        0x02,  # bDescriptorType
+        0x1B,
+        0x00,  # wTotalLength: 27
+        0x01,  # bNumInterfaces
+        0x01,  # bConfigurationValue
+        0x00,  # iConfiguration
+        0x80,  # bmAttributes (bus powered)
+        0x32,  # bMaxPower
+        # Interface Descriptor.
+        0x09,  # bLength
+        0x04,  # bDescriptorType
+        0x00,  # bInterfaceNumber
+        0x00,  # bNumEndpointns
+        0x00,  # bAlternateSetting
+        0xFE,  # bInterfaceClass: application specific interface
+        0x01,  # bInterfaceSubClasse: device firmware update
+        0x02,  # bInterfaceProtocol
+        0x14,  # iInterface
+        # Device Firmware Upgrade Interface Descriptor.
+        0x09,  # bLength
+        0x21,  # bDescriptorType
+        0x0B,  # bmAttributes (will detach, upload supported, download supported)
+        0xFF,
+        0x00,  # wDetatchTimeout
+        wTransferSize & 0xFF,
+        wTransferSize >> 8,  # wTransferSize
+        0x1A,
+        0x01,  # bcdDFUVersion
+    ]
+)
+
+# DFU strings.
+_desc_strs = {
+    0x11: b"iManufacturer",
+    0x12: b"iProduct",
+    0x13: b"iSerialNumber",
+    0x14: MEMORY_LAYOUT,
+}
+
+
+# This class handles the DFU USB device logic.
+class DFUOverUSB:
+    def __init__(self, dfu):
+        # USB buffer for transfers.
+        self.usb_buf = bytearray(wTransferSize)
+        # Instance of the DFU state machine.
+        self.dfu = dfu
+
+    def _control_xfer_cb(self, stage, request):
+        bmRequestType, bRequest, wValue, wIndex, wLength = struct.unpack("<BBHHH", request)
+        if stage == 1:  # SETUP
+            if bmRequestType == USB_DIR_OUT | USB_REQ_TYPE_CLASS | USB_REQ_RECIP_INTERFACE:
+                # Data coming from host, prepare to receive it.
+                return memoryview(self.usb_buf)[:wLength]
+            if bmRequestType == USB_DIR_IN | USB_REQ_TYPE_CLASS | USB_REQ_RECIP_INTERFACE:
+                # Host requests data, prepare to send it.
+                buf = memoryview(self.usb_buf)[:wLength]
+                return self.dfu.handle_tx(bRequest, wValue, buf)
+        elif stage == 3:  # ACK
+            if bmRequestType & USB_DIR_IN:
+                # EP0 TX sent.
+                self.dfu.process()
+            else:
+                # EP0 RX ready.
+                buf = memoryview(self.usb_buf)[:wLength]
+                self.dfu.handle_rx(bRequest, wValue, buf)
+        return True
+
+
+# This class handles the DFU state machine.
+class DFU:
+    # DFU class requests.
+    DETACH = 0
+    DNLOAD = 1
+    UPLOAD = 2
+    GETSTATUS = 3
+    CLRSTATUS = 4
+    GETSTATE = 5
+    ABORT = 6
+
+    # DFU states.
+    STATE_IDLE = 2
+    STATE_BUSY = 4
+    STATE_DNLOAD_IDLE = 5
+    STATE_MANIFEST = 7
+    STATE_UPLOAD_IDLE = 9
+    STATE_ERROR = 0xA
+
+    # DFU commands.
+    CMD_NONE = 0
+    CMD_EXIT = 1
+    CMD_UPLOAD = 7
+    CMD_DNLOAD = 8
+
+    # Download sub-commands.
+    CMD_DNLOAD_SET_ADDRESS = 0x21
+    CMD_DNLOAD_ERASE = 0x41
+    CMD_DNLOAD_READ_UNPROTECT = 0x92
+
+    # Error status flags.
+    STATUS_OK = 0x00
+
+    def __init__(self):
+        self.state = DFU.STATE_IDLE
+        self.cmd = DFU.CMD_NONE
+        self.status = DFU.STATUS_OK
+        self.error = 0
+        self.leave_dfu = False
+        self.addr = 0
+        self.dnload_block_num = 0
+        self.dnload_len = 0
+        self.dnload_buf = bytearray(wTransferSize)
+
+    def handle_rx(self, cmd, arg, buf):
+        # Handle an incoming packet of data.
+        if cmd == DFU.CLRSTATUS:
+            self.state = DFU.STATE_IDLE
+            self.cmd = DFU.CMD_NONE
+            self.status = DFU.STATUS_OK
+            self.error = 0
+        elif cmd == DFU.ABORT:
+            self.state = DFU.STATE_IDLE
+            self.cmd = DFU.CMD_NONE
+            self.status = DFU.STATUS_OK
+            self.error = 0
+        elif cmd == DFU.DNLOAD:
+            if len(buf) == 0:
+                # Exit DFU.
+                self.cmd = DFU.CMD_EXIT
+            else:
+                # Download data to device.
+                self.cmd = DFU.CMD_DNLOAD
+                self.dnload_block_num = arg
+                self.dnload_len = len(buf)
+                self.dnload_buf[: len(buf)] = buf
+
+    def handle_tx(self, cmd, arg, buf):
+        # Prepare data to go to the host.
+        if cmd == DFU.UPLOAD:
+            if arg >= 2:
+                self.cmd = DFU.CMD_UPLOAD
+                addr = (arg - 2) * len(buf) + self.addr
+                self.do_read(addr, buf)
+                return buf
+            return None
+        elif cmd == DFU.GETSTATUS and len(buf) == 6:
+            if self.cmd == DFU.CMD_NONE:
+                pass
+            elif self.cmd == DFU.CMD_EXIT:
+                self.state = DFU.STATE_MANIFEST
+            elif self.cmd == DFU.CMD_UPLOAD:
+                self.state = DFU.STATE_UPLOAD_IDLE
+            elif self.cmd == DFU.CMD_DNLOAD:
+                self.state = DFU.STATE_BUSY
+            else:
+                self.state = DFU.STATE_BUSY
+
+            # Populate the buffer to return to the host.
+            buf[0] = self.status
+            buf[1] = 0
+            buf[2] = 0
+            buf[3] = 0
+            buf[4] = self.state
+            buf[5] = self.error
+
+            # Clear errors now they've been sent to host.
+            self.status = DFU.STATUS_OK
+            self.error = 0
+
+            return buf
+        else:
+            return None
+
+    def process(self):
+        # Transition the DFU state machine.
+        if self.state == DFU.STATE_MANIFEST:
+            self.leave_dfu = True
+        elif self.state == DFU.STATE_BUSY:
+            if self.cmd == DFU.CMD_DNLOAD:
+                self.cmd = DFU.CMD_NONE
+                self.state = self.process_dnload()
+
+    def process_dnload(self):
+        ret = -1  # Assume error.
+        if self.dnload_block_num == 0:
+            # Download control commands.
+            if self.dnload_len >= 1 and self.dnload_buf[0] == DFU.CMD_DNLOAD_ERASE:
+                if self.dnload_len == 1:
+                    # Mass erase.
+                    ret = self.do_mass_erase()
+                    if ret != 0:
+                        self.cmd = DFU.CMD_NONE
+                elif self.dnload_len == 5:
+                    # Erase page.
+                    addr = struct.unpack_from("<L", self.dnload_buf, 1)[0]
+                    ret = self.do_page_erase(addr)
+            elif self.dnload_len >= 1 and self.dnload_buf[0] == DFU.CMD_DNLOAD_SET_ADDRESS:
+                if self.dnload_len == 5:
+                    # Set address.
+                    self.addr = struct.unpack_from("<L", self.dnload_buf, 1)[0]
+                    ret = 0
+        elif self.dnload_block_num > 1:
+            # Write data to memory.
+            addr = (self.dnload_block_num - 2) * wTransferSize + self.addr
+            ret = self.do_write(addr, self.dnload_len, self.dnload_buf)
+        if ret == 0:
+            return DFU.STATE_DNLOAD_IDLE
+        else:
+            return DFU.STATE_ERROR
+
+    def do_mass_erase(self):
+        # This function would implement a mass erase of flash memory.
+        return 0  # indicate success
+
+    def do_page_erase(self, addr):
+        # This function would implement an erase of a page in flash memory.
+        return 0  # indicate success
+
+    def do_read(self, addr, buf):
+        # This function would implement a read at the given address of flash memory.
+        # Return some dummy bytes.
+        for i in range(len(buf)):
+            buf[i] = i & 0xFF
+        return 0  # indicate success
+
+    def do_write(self, addr, size, buf):
+        # This function would implement a write of the given data to flash memory.
+        return 0  # indicate success
+
+
+# Create an instance of the DFU state machine.
+dfu = DFU()
+
+# Create an instance of the DFU USB handler.
+dfu_usb = DFUOverUSB(dfu)
+
+# Switch the USB device to the custom DFU driver.
+usbd = machine.USBDevice()
+usbd.active(0)
+usbd.builtin_driver = usbd.BUILTIN_NONE
+usbd.config(
+    desc_dev=_desc_dev,
+    desc_cfg=_desc_cfg,
+    desc_strs=_desc_strs,
+    control_xfer_cb=dfu_usb._control_xfer_cb,
+)
+usbd.active(1)
+
+# Wait for the DFU state machine to complete.
+while not dfu.leave_dfu:
+    machine.idle()
+
+# Switch the USB device back to the default built-in driver.
+usbd.active(0)
+usbd.builtin_driver = usbd.BUILTIN_DEFAULT
+usbd.config(
+    desc_dev=usbd.builtin_driver.desc_dev,
+    desc_cfg=usbd.builtin_driver.desc_cfg,
+    desc_strs=(),
+)
+usbd.active(1)

From bd610ff0160f8dad2b4a3592d5351b6029af5caa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 27 Apr 2024 13:39:57 +1000
Subject: [PATCH 1065/3129] examples/network: Rename SSL examples to start with
 https.

It's better for discoverability to have these examples named `https_xxx.py`
rather than `http_xxx_ssl.py`.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/network/{http_client_ssl.py => https_client.py} | 0
 examples/network/{http_server_ssl.py => https_server.py} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename examples/network/{http_client_ssl.py => https_client.py} (100%)
 rename examples/network/{http_server_ssl.py => https_server.py} (100%)

diff --git a/examples/network/http_client_ssl.py b/examples/network/https_client.py
similarity index 100%
rename from examples/network/http_client_ssl.py
rename to examples/network/https_client.py
diff --git a/examples/network/http_server_ssl.py b/examples/network/https_server.py
similarity index 100%
rename from examples/network/http_server_ssl.py
rename to examples/network/https_server.py

From cc3550eeeff011f98361b8318447faf57bbac036 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 27 Apr 2024 13:42:21 +1000
Subject: [PATCH 1066/3129] examples/network: Add example of HTTPS client using
 non-blocking socket.

Non-blocking SSL streams can be difficult to get right, so provide a
working example, of a HTTPS client.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/network/https_client_nonblocking.py | 75 ++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 examples/network/https_client_nonblocking.py

diff --git a/examples/network/https_client_nonblocking.py b/examples/network/https_client_nonblocking.py
new file mode 100644
index 0000000000000..6e6b7f37bc7b1
--- /dev/null
+++ b/examples/network/https_client_nonblocking.py
@@ -0,0 +1,75 @@
+# Example of a HTTPS client working with non-blocking sockets.
+#
+# Non-blocking SSL streams works differently in MicroPython compared to CPython.  In
+# CPython a write to an SSLSocket may raise ssl.SSLWantReadError.  In MicroPython an
+# SSLSocket behaves like a normal socket/stream and can be polled for reading/writing.
+
+from errno import EINPROGRESS
+import select
+import socket
+import ssl
+
+
+def connect_nonblocking(sock, addr):
+    sock.setblocking(False)
+    try:
+        sock.connect(addr)
+    except OSError as er:
+        if er.errno != EINPROGRESS:
+            raise er
+
+
+def write_nonblocking(poller, sock, data):
+    poller.register(sock, select.POLLOUT)
+    while data:
+        poller.poll()
+        n = sock.write(data)
+        print("Wrote:", n)
+        if n is not None:
+            data = data[n:]
+
+
+def read_nonblocking(poller, sock, n):
+    poller.register(sock, select.POLLIN)
+    poller.poll()
+    data = sock.read(n)
+    print("Read:", len(data))
+    return data
+
+
+def main(url):
+    # Split the given URL into components.
+    proto, _, host, path = url.split(b"/", 3)
+    assert proto == b"https:"
+
+    # Note: this getaddrinfo() call is blocking!
+    ai = socket.getaddrinfo(host, 443)[0]
+    addr = ai[-1]
+    print("Connect address:", addr)
+
+    # Create a TCP socket and connect to the server in non-blocking mode.
+    sock = socket.socket(ai[0], ai[1], ai[2])
+    connect_nonblocking(sock, addr)
+
+    # Wrap the TCP socket in an SSL stream in non-blocking mode.
+    ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    sock = ctx.wrap_socket(sock, server_hostname=host, do_handshake_on_connect=False)
+    sock.setblocking(False)
+
+    # Create an object to poll the SSL stream for readability/writability.
+    poller = select.poll()
+
+    # Send the HTTP request on the SSL stream.
+    request = b"GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n" % (path, host)
+    write_nonblocking(poller, sock, request)
+
+    # Receive the HTTP response from the SSL stream.
+    response = read_nonblocking(poller, sock, 1000)
+    for line in response.split(b"\n"):
+        print(line)
+
+    # Close the SSL stream.  This will also close the underlying TCP socket.
+    sock.close()
+
+
+main(b"https://micropython.org/ks/test.html")

From c37eb93f2dd75bf49c6cc5105494c5f176c3d541 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 May 2024 15:03:55 +1000
Subject: [PATCH 1067/3129] webassembly/proxy_c: Support more than 4 args when
 JS calls Py func.

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

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index b874b36c02c6b..4e2fdc8f2a34d 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -151,7 +151,7 @@ void proxy_convert_mp_to_js_exc_cside(void *exc, uint32_t *out) {
 void proxy_c_to_js_call(uint32_t c_ref, uint32_t n_args, uint32_t *args_value, uint32_t *out) {
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
-        mp_obj_t args[4] = { mp_const_none, mp_const_none, mp_const_none, mp_const_none };
+        mp_obj_t args[n_args];
         for (size_t i = 0; i < n_args; ++i) {
             args[i] = proxy_convert_js_to_mp_obj_cside(args_value + i * 3);
         }

From 3f34be69c77dfbd1533af1f04ea460d7da2d118a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 May 2024 15:07:11 +1000
Subject: [PATCH 1068/3129] webassembly/asyncio: Fix case where a Promise is
 resolved with no arg.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/asyncio/core.py             |  2 +-
 .../asyncio_await_resolve_no_arg.mjs          | 21 +++++++++++++++++++
 .../asyncio_await_resolve_no_arg.mjs.exp      |  5 +++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs
 create mode 100644 tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs.exp

diff --git a/ports/webassembly/asyncio/core.py b/ports/webassembly/asyncio/core.py
index a128bb6055058..f6f9d19e5c154 100644
--- a/ports/webassembly/asyncio/core.py
+++ b/ports/webassembly/asyncio/core.py
@@ -75,7 +75,7 @@ def __init__(self, thenable):
         self.waiting = None  # Task waiting on completion of this thenable
         thenable.then(self.set)
 
-    def set(self, value):
+    def set(self, value=None):
         # Thenable/Promise is fulfilled, set result and schedule any waiting task.
         self.result = value
         if self.waiting:
diff --git a/tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs b/tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs
new file mode 100644
index 0000000000000..0334a14f11891
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs
@@ -0,0 +1,21 @@
+// Test an asyncio task await'ing on a Promise that's resolved without an argument.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.foo = new Promise((resolve) => {
+    console.log(1);
+    resolve(); // resolve without an argument
+    console.log(2);
+});
+
+mp.runPython(`
+import asyncio
+import js
+
+async def task():
+    print(3)
+    print(await js.foo)
+    print(4)
+
+asyncio.create_task(task())
+`);
diff --git a/tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs.exp b/tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs.exp
new file mode 100644
index 0000000000000..f3ca0f268af6a
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_await_resolve_no_arg.mjs.exp
@@ -0,0 +1,5 @@
+1
+2
+3
+None
+4

From a67e326cb9753f53e14a42b347133a571f972140 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 May 2024 15:11:21 +1000
Subject: [PATCH 1069/3129] webassembly/proxy_c: Ensure objs thrown into
 generators are exceptions.

This commit defines a new `JsException` exception type which is used on the
Python side to wrap JavaScript errors.  That's then used when a JavaScript
Promise is rejected, and the reason is then converted to a `JsException`
for the Python side to handle.

This new exception is exposed as `jsffi.JsException`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/modjsffi.c                  |  1 +
 ports/webassembly/proxy_c.c                   | 35 +++++++++++++++++++
 ports/webassembly/proxy_c.h                   |  1 +
 .../webassembly/await_error_handling.mjs      | 22 ++++++++++++
 .../webassembly/await_error_handling.mjs.exp  |  5 +++
 5 files changed, 64 insertions(+)
 create mode 100644 tests/ports/webassembly/await_error_handling.mjs
 create mode 100644 tests/ports/webassembly/await_error_handling.mjs.exp

diff --git a/ports/webassembly/modjsffi.c b/ports/webassembly/modjsffi.c
index cb2f578f8f593..c77d899fb7f8c 100644
--- a/ports/webassembly/modjsffi.c
+++ b/ports/webassembly/modjsffi.c
@@ -79,6 +79,7 @@ static const mp_rom_map_elem_t mp_module_jsffi_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_jsffi) },
 
     { MP_ROM_QSTR(MP_QSTR_JsProxy), MP_ROM_PTR(&mp_type_jsproxy) },
+    { MP_ROM_QSTR(MP_QSTR_JsException), MP_ROM_PTR(&mp_type_JsException) },
     { MP_ROM_QSTR(MP_QSTR_create_proxy), MP_ROM_PTR(&mp_jsffi_create_proxy_obj) },
     { MP_ROM_QSTR(MP_QSTR_to_js), MP_ROM_PTR(&mp_jsffi_to_js_obj) },
     { MP_ROM_QSTR(MP_QSTR_async_timeout_ms), MP_ROM_PTR(&mp_jsffi_async_timeout_ms_obj) },
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 4e2fdc8f2a34d..3097d6d3a4693 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -58,6 +58,8 @@ enum {
     PROXY_KIND_JS_PYPROXY = 7,
 };
 
+MP_DEFINE_EXCEPTION(JsException, Exception)
+
 void proxy_c_init(void) {
     MP_STATE_PORT(proxy_c_ref) = mp_obj_new_list(0, NULL);
     mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), MP_OBJ_NULL);
@@ -120,6 +122,15 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
     } else if (mp_obj_is_jsproxy(obj)) {
         kind = PROXY_KIND_MP_JSPROXY;
         out[1] = mp_obj_jsproxy_get_ref(obj);
+    } else if (mp_obj_get_type(obj) == &mp_type_JsException) {
+        mp_obj_exception_t *exc = MP_OBJ_TO_PTR(obj);
+        if (exc->args->len > 0 && mp_obj_is_jsproxy(exc->args->items[0])) {
+            kind = PROXY_KIND_MP_JSPROXY;
+            out[1] = mp_obj_jsproxy_get_ref(exc->args->items[0]);
+        } else {
+            kind = PROXY_KIND_MP_OBJECT;
+            out[1] = proxy_c_add_obj(obj);
+        }
     } else {
         if (mp_obj_is_callable(obj)) {
             kind = PROXY_KIND_MP_CALLABLE;
@@ -288,6 +299,24 @@ void proxy_c_to_js_get_dict(uint32_t c_ref, uint32_t *out) {
     out[1] = (uintptr_t)map->table;
 }
 
+EM_JS(void, js_get_error_info, (int jsref, uint32_t * out_name, uint32_t * out_message), {
+    const error = proxy_js_ref[jsref];
+    proxy_convert_js_to_mp_obj_jsside(error.name, out_name);
+    proxy_convert_js_to_mp_obj_jsside(error.message, out_message);
+});
+
+mp_obj_t mp_obj_jsproxy_make_js_exception(mp_obj_t error) {
+    uint32_t out_name[PVN];
+    uint32_t out_message[PVN];
+    js_get_error_info(mp_obj_jsproxy_get_ref(error), out_name, out_message);
+    mp_obj_t args[3] = {
+        error,
+        proxy_convert_js_to_mp_obj_cside(out_name),
+        proxy_convert_js_to_mp_obj_cside(out_message),
+    };
+    return mp_obj_new_exception_args(&mp_type_JsException, MP_ARRAY_SIZE(args), args);
+}
+
 /******************************************************************************/
 // Bridge Python iterator to JavaScript iterator protocol.
 
@@ -371,6 +400,12 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t send_value, mp_o
         if (send_value == mp_const_none) {
             send_value = MP_OBJ_NULL;
         }
+        // Ensure that the `throw_value` is a proper Python exception instance.
+        if (mp_obj_is_jsproxy(throw_value)) {
+            throw_value = mp_obj_jsproxy_make_js_exception(throw_value);
+        } else {
+            throw_value = mp_make_raise_obj(throw_value);
+        }
     } else {
         throw_value = MP_OBJ_NULL;
     }
diff --git a/ports/webassembly/proxy_c.h b/ports/webassembly/proxy_c.h
index 3e68d2504958c..751d14332b4b3 100644
--- a/ports/webassembly/proxy_c.h
+++ b/ports/webassembly/proxy_c.h
@@ -37,6 +37,7 @@ typedef struct _mp_obj_jsproxy_t {
 } mp_obj_jsproxy_t;
 
 extern const mp_obj_type_t mp_type_jsproxy;
+extern const mp_obj_type_t mp_type_JsException;
 
 void proxy_c_init(void);
 mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value);
diff --git a/tests/ports/webassembly/await_error_handling.mjs b/tests/ports/webassembly/await_error_handling.mjs
new file mode 100644
index 0000000000000..067bc2513818e
--- /dev/null
+++ b/tests/ports/webassembly/await_error_handling.mjs
@@ -0,0 +1,22 @@
+// Test await'ing on a JavaScript async function that throws a JavaScript Error.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.foo = async () => {
+    console.log(2);
+    throw Error("test");
+};
+
+await mp.runPythonAsync(`
+import js, jsffi
+print(1)
+try:
+    await js.foo()
+except jsffi.JsException as er:
+    error = er
+print(error)
+print(3)
+`);
+
+const error = mp.globals.get("error");
+console.log(error instanceof Error, error.name, error.message);
diff --git a/tests/ports/webassembly/await_error_handling.mjs.exp b/tests/ports/webassembly/await_error_handling.mjs.exp
new file mode 100644
index 0000000000000..149f8914d488e
--- /dev/null
+++ b/tests/ports/webassembly/await_error_handling.mjs.exp
@@ -0,0 +1,5 @@
+1
+2
+(<JsProxy 6>, 'Error', 'test')
+3
+true Error test

From fa23e4b093f81f03a24187c7ea0c928a9b4a661b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 May 2024 15:36:30 +1000
Subject: [PATCH 1070/3129] webassembly/proxy_js: Convert JS undefined and JS
 null to Py None.

And change Py None conversion so it converts to JS undefined.

The semantics for conversion of these objects are then:
- Python None           -> JavaScript undefined
- JavaScript undefined  -> Python None
- JavaScript null       -> Python None

This follows Pyodide:
https://pyodide.org/en/stable/usage/type-conversions.html

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/proxy_c.c                      | 5 ++++-
 ports/webassembly/proxy_js.js                    | 7 +++++--
 tests/ports/webassembly/py_proxy_to_js.mjs.exp   | 4 ++--
 tests/ports/webassembly/run_python_async.mjs.exp | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 3097d6d3a4693..f8d6d85303e76 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -49,6 +49,7 @@ enum {
 };
 
 enum {
+    PROXY_KIND_JS_UNDEFINED = 0,
     PROXY_KIND_JS_NULL = 1,
     PROXY_KIND_JS_BOOLEAN = 2,
     PROXY_KIND_JS_INTEGER = 3,
@@ -78,7 +79,9 @@ static inline mp_obj_t proxy_c_get_obj(uint32_t c_ref) {
 }
 
 mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value) {
-    if (value[0] == PROXY_KIND_JS_NULL) {
+    if (value[0] == PROXY_KIND_JS_UNDEFINED) {
+        return mp_const_none;
+    } else if (value[0] == PROXY_KIND_JS_NULL) {
         return mp_const_none;
     } else if (value[0] == PROXY_KIND_JS_BOOLEAN) {
         return mp_obj_new_bool(value[1]);
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 042deb7b05c7f..05d0f2da4d8ae 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -38,6 +38,7 @@ const PROXY_KIND_MP_GENERATOR = 7;
 const PROXY_KIND_MP_OBJECT = 8;
 const PROXY_KIND_MP_JSPROXY = 9;
 
+const PROXY_KIND_JS_UNDEFINED = 0;
 const PROXY_KIND_JS_NULL = 1;
 const PROXY_KIND_JS_BOOLEAN = 2;
 const PROXY_KIND_JS_INTEGER = 3;
@@ -109,7 +110,9 @@ function proxy_call_python(target, argumentsList) {
 
 function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
     let kind;
-    if (js_obj === null) {
+    if (js_obj === undefined) {
+        kind = PROXY_KIND_JS_UNDEFINED;
+    } else if (js_obj === null) {
         kind = PROXY_KIND_JS_NULL;
     } else if (typeof js_obj === "boolean") {
         kind = PROXY_KIND_JS_BOOLEAN;
@@ -185,7 +188,7 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
     }
     if (kind === PROXY_KIND_MP_NONE) {
         // None
-        obj = null;
+        obj = undefined;
     } else if (kind === PROXY_KIND_MP_BOOL) {
         // bool
         obj = Module.getValue(value + 4, "i32") ? true : false;
diff --git a/tests/ports/webassembly/py_proxy_to_js.mjs.exp b/tests/ports/webassembly/py_proxy_to_js.mjs.exp
index 279df7bdfbb84..3fd38c2b5672e 100644
--- a/tests/ports/webassembly/py_proxy_to_js.mjs.exp
+++ b/tests/ports/webassembly/py_proxy_to_js.mjs.exp
@@ -1,4 +1,4 @@
 false 1
 true [ 1, 2, 3 ]
-true [ null, true, 1.2 ]
-true { tuple: [ 1, 2, 3 ], one: 1, list: [ null, true, 1.2 ] }
+true [ undefined, true, 1.2 ]
+true { tuple: [ 1, 2, 3 ], one: 1, list: [ undefined, true, 1.2 ] }
diff --git a/tests/ports/webassembly/run_python_async.mjs.exp b/tests/ports/webassembly/run_python_async.mjs.exp
index f441bc5cf1db6..827f853b99b4a 100644
--- a/tests/ports/webassembly/run_python_async.mjs.exp
+++ b/tests/ports/webassembly/run_python_async.mjs.exp
@@ -23,7 +23,7 @@ py 1
 setTimeout resolved
 resolved value: 123
 py 2
-2 null
+2 undefined
 = TEST 4 ==========
 1
 py 1
@@ -35,4 +35,4 @@ py 3
 setTimeout B resolved
 resolved value: 456
 py 4
-2 null
+2 undefined

From 154d602b6e92cd5781d87291fa0e7455a14af334 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 May 2024 15:18:48 +1000
Subject: [PATCH 1071/3129] webassembly/mpconfigport: Enable importing of .mpy
 files.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/mpconfigport.h | 1 +
 tests/run-tests.py               | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index ae5dfa6fa50b8..ece7868fb95ab 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -39,6 +39,7 @@
 #endif
 
 #define MICROPY_ALLOC_PATH_MAX      (256)
+#define MICROPY_PERSISTENT_CODE_LOAD (1)
 #define MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT (1)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
 #define MICROPY_ENABLE_GC           (1)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 8acdcd2b36204..1e1bd160af3c9 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -702,7 +702,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             skip_tests.add("micropython/emg_exc.py")
             skip_tests.add("micropython/extreme_exc.py")
             skip_tests.add("micropython/heapalloc_exc_compressed_emg_exc.py")
-            skip_tests.add("micropython/import_mpy_invalid.py")
 
     # Some tests are known to fail on 64-bit machines
     if pyb is None and platform.architecture()[0] == "64bit":

From 025d10a702c0815946418f37300f64fdba43f371 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 May 2024 15:19:30 +1000
Subject: [PATCH 1072/3129] tests/micropython/import_mpy_invalid.py: Skip if
 target cant import mpy.

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

diff --git a/tests/micropython/import_mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
index c7f0a2c1a1c61..89fdf44839bb1 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -3,6 +3,7 @@
 try:
     import sys, io, vfs
 
+    sys.implementation._mpy
     io.IOBase
 except (ImportError, AttributeError):
     print("SKIP")

From 85c85e8f0d6e44827553f67a4ab67c2cb3078fdd Mon Sep 17 00:00:00 2001
From: Olivier Lenoir <olivier.len02@gmail.com>
Date: Wed, 13 Mar 2024 21:51:22 +0100
Subject: [PATCH 1073/3129] tools/mpremote: Add support to mip install from
 GitLab.

Changes are:
- main.py: Add gitlab:org/repo, gitlab:org/repo@branch.
- mip.py: Implement install from GitLab.
- README.md: Add mip install gitlab:org/repo@branch example.

Signed-off-by: Olivier Lenoir <olivier.len02@gmail.com>
---
 tools/mpremote/README.md        |  1 +
 tools/mpremote/mpremote/main.py |  2 +-
 tools/mpremote/mpremote/mip.py  | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
index 4eb1b86fb4dbf..3d428f12874d8 100644
--- a/tools/mpremote/README.md
+++ b/tools/mpremote/README.md
@@ -80,3 +80,4 @@ Examples:
     mpremote cp -r dir/ :
     mpremote mip install aioble
     mpremote mip install github:org/repo@branch
+    mpremote mip install gitlab:org/repo@branch
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index eeb9cbd989389..e4d15fb47c69b 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -214,7 +214,7 @@ def argparse_mip():
     cmd_parser.add_argument(
         "packages",
         nargs="+",
-        help="list package specifications, e.g. name, name@version, github:org/repo, github:org/repo@branch",
+        help="list package specifications, e.g. name, name@version, github:org/repo, github:org/repo@branch, gitlab:org/repo, gitlab:org/repo@branch",
     )
     return cmd_parser
 
diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index f42c7a0b4293b..46c9686ad1987 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -65,6 +65,18 @@ def _rewrite_url(url, branch=None):
             + "/"
             + "/".join(url[2:])
         )
+    elif url.startswith("gitlab:"):
+        url = url[7:].split("/")
+        url = (
+            "https://gitlab.com/"
+            + url[0]
+            + "/"
+            + url[1]
+            + "/-/raw/"
+            + branch
+            + "/"
+            + "/".join(url[2:])
+        )
     return url
 
 
@@ -116,6 +128,7 @@ def _install_package(transport, package, index, target, version, mpy):
         package.startswith("http://")
         or package.startswith("https://")
         or package.startswith("github:")
+        or package.startswith("gitlab:")
     ):
         if package.endswith(".py") or package.endswith(".mpy"):
             print(f"Downloading {package} to {target}")

From e816b49c44f70ec2ca28cb5a2caefc7446a6c8e5 Mon Sep 17 00:00:00 2001
From: Olivier Lenoir <olivier.len02@gmail.com>
Date: Wed, 13 Mar 2024 21:57:06 +0100
Subject: [PATCH 1074/3129] docs/reference: Document how to mip install
 packages from GitLab.

Signed-off-by: Olivier Lenoir <olivier.len02@gmail.com>
---
 docs/reference/mpremote.rst |  7 +++++++
 docs/reference/packages.rst | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 08ef5d31ff572..bf25e29d93d9c 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -682,6 +682,13 @@ See :ref:`packages`.
 Install the package from the specified branch at org/repo on GitHub to the
 device. See :ref:`packages`.
 
+.. code-block:: bash
+
+  mpremote mip install gitlab:org/repo@branch
+
+Install the package from the specified branch at org/repo on GitLab to the
+device. See :ref:`packages`.
+
 .. code-block:: bash
 
   mpremote mip install --target /flash/third-party functools
diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index c9deedea771c3..e47c226b24187 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -7,7 +7,7 @@ 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).
+from :term:`micropython-lib` and from third-party sites (including GitHub, GitLab).
 
 ``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`
@@ -38,24 +38,28 @@ install third-party libraries. The simplest way is to download a file directly::
 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::
+The URL can also start with ``github:`` or ``gitlab:`` as a simple way of pointing to content
+hosted on GitHub or GitLab::
 
     >>> 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
+    >>> mip.install("gitlab:org/repo/path/foo.py")  # Uses default branch
+    >>> mip.install("gitlab: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")
+    >>> mip.install("gitlab: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")  # Uses default branch of that repo
     >>> mip.install("github:org/repo", version="branch-or-tag")
-
+    >>> mip.install("gitlab:org/repo")  # Uses default branch of that repo
+    >>> mip.install("gitlab:org/repo", version="branch-or-tag")
 
 Using ``mip`` on the Unix port
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -83,6 +87,8 @@ can be used from a host PC to install packages to a locally connected device
     $ 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
+    $ mpremote mip install gitlab:org/repo
+    $ mpremote mip install gitlab:org/repo@branch-or-tag
 
 The ``--target=path``, ``--no-mpy``, and ``--index`` arguments can be set::
 
@@ -120,7 +126,8 @@ A typical ``package.json`` for an example ``mlx90640`` library looks like::
       "deps": [
         ["collections-defaultdict", "latest"],
         ["os-path", "latest"],
-        ["github:org/micropython-additions", "main"]
+        ["github:org/micropython-additions", "main"],
+        ["gitlab:org/micropython-otheradditions", "main"]
       ],
       "version": "0.2"
     }

From abd1f28bc20a220658cfec8f03169edfd0097421 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 May 2024 14:13:30 +1000
Subject: [PATCH 1075/3129] docs/library/asyncio: Document that ThreadSafeFlag
 now works on unix.

ThreadSafeFlag works on the unix port since commit
df08c38c286561c08d5ac354428074817eb0c163.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/asyncio.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/library/asyncio.rst b/docs/library/asyncio.rst
index b57f1ee04eaec..51ad8a2876a34 100644
--- a/docs/library/asyncio.rst
+++ b/docs/library/asyncio.rst
@@ -149,8 +149,7 @@ 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.  The class does not currently
-    work under the Unix build of MicroPython.
+    callbacks.  Flags start in the cleared state.
 
 .. method:: ThreadSafeFlag.set()
 

From 47ae73940983caa2d109e7c4e5192db8294748f2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 May 2024 10:24:11 +1000
Subject: [PATCH 1076/3129] examples/usb: Add README that points out the
 alternative usb modules.

If someone starts from this directory then they won't know they exist,
otherwise.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 examples/usb/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 examples/usb/README.md

diff --git a/examples/usb/README.md b/examples/usb/README.md
new file mode 100644
index 0000000000000..b3dad17633231
--- /dev/null
+++ b/examples/usb/README.md
@@ -0,0 +1,16 @@
+## USBDevice Examples
+
+These are examples of how to use the low-level `machine.USBDevice` class to create custom
+USB device functionality.
+
+Alternatively, there are [usb driver modules in
+micropython-lib](https://github.com/micropython/micropython-lib/tree/master/micropython/usb#readme)
+which provide a simpler interface and more built-in functionality.
+
+In this directory:
+
+* `usb_dfu_device.py` implements the USB Device Firmware Update protocol.
+* `usb_simple_device.py` implements a custom USB protocol, with a matching host
+  program to run on a PC.
+
+See comments at the top of each Python file for more details.

From a0d4fdcce0aa332770065707a63be6b9b1aa1617 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 15 May 2024 11:19:21 +1000
Subject: [PATCH 1077/3129] stm32/pyb_can: Fix STM32G4 FDCAN source clock
 frequency.

Fixes automatic baudrate calculation results.

Default clock source on this SoC is HSE not PCLK1.  We could fix this by
switching to PCLK1 instead, but two extra complications:

- PCLK1 on this board is a 42.5MHz and the Pyboard CAN sample_point
  calculation requires an exact match, which is harder to hit with this
  source frequency.

- Would be a breaking change for any existing Python code on this board,
  i.e. specifying brp, bs1, bs2 to initialise CAN.

In the future it might be worth looking switching to the PLL source on this
SoC instead, as this is a much higher frequency that would give higher
quality BRS bitrate matches (probably too high without using the second
divider going into the CAN peripheral though, so more code changes needed
also).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/pyb_can.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 71c717782449f..563758831cc5e 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -182,7 +182,10 @@ static uint32_t pyb_can_get_source_freq() {
             break;
         }
     }
-    #else // F4 and F7 and assume other MCUs too.
+    #elif defined(STM32G4)
+    // STM32G4 CAN clock from reset is HSE, unchanged by MicroPython
+    can_kern_clk = HSE_VALUE;
+    #else // G0, F4, 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);

From c10a74b1625f668edddf9e76719584165473143b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 13 Mar 2024 18:23:17 +0100
Subject: [PATCH 1078/3129] esp32/panichandler: Print support information on
 panic.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a fatal error occurs it's important to know which precise version it
occurred on in order to be able to decode the crash dump information such
as the backtrace.

By wrapping around the built-in IDF panic handler we can print some extra
information whenever a fatal error occurs.  The message links to a new wiki
page which contains additional information on how to debug ESP32 issues,
and links to the bug reporting issue template.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/CMakeLists.txt     |  3 ++
 ports/esp32/esp32_common.cmake |  1 +
 ports/esp32/panichandler.c     | 68 ++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 ports/esp32/panichandler.c

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 1537c1d723276..3fe0830025579 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -59,5 +59,8 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 # Set the location of the main component for the project (one per target).
 list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
 
+# Enable the panic handler wrapper
+idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
+
 # Define the project.
 project(micropython)
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 89e46f9cfb3df..e928fb439da5e 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -53,6 +53,7 @@ list(APPEND MICROPY_SOURCE_DRIVERS
 )
 
 list(APPEND MICROPY_SOURCE_PORT
+    panichandler.c
     adc.c
     main.c
     ppp_set_auth.c
diff --git a/ports/esp32/panichandler.c b/ports/esp32/panichandler.c
new file mode 100644
index 0000000000000..e6ff98ded272e
--- /dev/null
+++ b/ports/esp32/panichandler.c
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Mindhash B.V.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "genhdr/mpversion.h"
+#include "py/mpconfig.h"
+
+#ifdef MICROPY_BUILD_TYPE
+#define MICROPY_BUILD_TYPE_PAREN " (" MICROPY_BUILD_TYPE ")"
+#else
+#define MICROPY_BUILD_TYPE_PAREN
+#endif
+
+#ifdef CONFIG_ESP_PANIC_HANDLER_IRAM
+#define MICROPY_WRAP_PANICHANDLER_FUN(f) IRAM_ATTR f
+#define MICROPY_WRAP_PANICHANDLER_STR(s) DRAM_STR(s)
+#else
+#define MICROPY_WRAP_PANICHANDLER_FUN(f) f
+#define MICROPY_WRAP_PANICHANDLER_STR(s) (s)
+#endif
+
+void __real_esp_panic_handler(void *);
+void esp_panic_handler_reconfigure_wdts(uint32_t timeout_ms);
+void panic_print_str(const char *str);
+
+void MICROPY_WRAP_PANICHANDLER_FUN(__wrap_esp_panic_handler)(void *info) {
+    esp_panic_handler_reconfigure_wdts(1000);
+
+    const static char *msg = MICROPY_WRAP_PANICHANDLER_STR(
+        "\r\n"
+        "A fatal error occurred. The crash dump printed below may be used to help\r\n"
+        "determine what caused it. If you are not already running the most recent\r\n"
+        "version of MicroPython, consider upgrading. New versions often fix bugs.\r\n"
+        "\r\n"
+        "To learn more about how to debug and/or report this crash visit the wiki\r\n"
+        "page at: https://github.com/micropython/micropython/wiki/ESP32-debugging\r\n"
+        "\r\n"
+        "MPY version : " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN "\r\n"
+        "IDF version : " IDF_VER "\r\n"
+        "Machine     : " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"
+        "\r\n"
+        );
+    panic_print_str(msg);
+
+    __real_esp_panic_handler(info);
+}

From 0148bbb495d6bacf66c00e730818cbb8eca45ffb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 May 2024 21:54:14 +1000
Subject: [PATCH 1079/3129] webassembly/proxy_js: Revert back to converting Py
 None to JS null.

This reverts part of commit fa23e4b093f81f03a24187c7ea0c928a9b4a661b, to
make it so that Python `None` converts to JavaScript `null` (and JavaScript
`null` already converts to Python `None`).  That's consistent with how the
`json` module converts these values back and forth.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/proxy_js.js                    | 2 +-
 tests/ports/webassembly/py_proxy_to_js.mjs.exp   | 4 ++--
 tests/ports/webassembly/run_python_async.mjs.exp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 05d0f2da4d8ae..f1f273d6b30a5 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -188,7 +188,7 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
     }
     if (kind === PROXY_KIND_MP_NONE) {
         // None
-        obj = undefined;
+        obj = null;
     } else if (kind === PROXY_KIND_MP_BOOL) {
         // bool
         obj = Module.getValue(value + 4, "i32") ? true : false;
diff --git a/tests/ports/webassembly/py_proxy_to_js.mjs.exp b/tests/ports/webassembly/py_proxy_to_js.mjs.exp
index 3fd38c2b5672e..279df7bdfbb84 100644
--- a/tests/ports/webassembly/py_proxy_to_js.mjs.exp
+++ b/tests/ports/webassembly/py_proxy_to_js.mjs.exp
@@ -1,4 +1,4 @@
 false 1
 true [ 1, 2, 3 ]
-true [ undefined, true, 1.2 ]
-true { tuple: [ 1, 2, 3 ], one: 1, list: [ undefined, true, 1.2 ] }
+true [ null, true, 1.2 ]
+true { tuple: [ 1, 2, 3 ], one: 1, list: [ null, true, 1.2 ] }
diff --git a/tests/ports/webassembly/run_python_async.mjs.exp b/tests/ports/webassembly/run_python_async.mjs.exp
index 827f853b99b4a..f441bc5cf1db6 100644
--- a/tests/ports/webassembly/run_python_async.mjs.exp
+++ b/tests/ports/webassembly/run_python_async.mjs.exp
@@ -23,7 +23,7 @@ py 1
 setTimeout resolved
 resolved value: 123
 py 2
-2 undefined
+2 null
 = TEST 4 ==========
 1
 py 1
@@ -35,4 +35,4 @@ py 3
 setTimeout B resolved
 resolved value: 456
 py 4
-2 undefined
+2 null

From aa2e3880c13036c65aa3381ed5f104c59ebad86e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 May 2024 21:56:36 +1000
Subject: [PATCH 1080/3129] webassembly/proxy_js: Create a special "undefined"
 type for Python.

This adds a new undefined singleton to Python, that corresponds directly to
JavaScript `undefined`.  It's accessible via `js.undefined`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/README.md                       | 12 ++++++++++++
 ports/webassembly/proxy_c.c                       | 15 ++++++++++++++-
 ports/webassembly/proxy_js.js                     |  2 +-
 .../webassembly/await_error_handling.mjs.exp      |  2 +-
 .../ports/webassembly/jsffi_create_proxy.mjs.exp  |  2 +-
 tests/ports/webassembly/jsffi_to_js.mjs.exp       |  2 +-
 tests/ports/webassembly/register_js_module.js.exp |  2 +-
 tests/ports/webassembly/run_python_async.mjs.exp  |  8 ++++----
 8 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index af395778a748e..97cb397fd495d 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -160,6 +160,18 @@ context, created and returned by `loadMicroPython()`.
 - `replProcessCharWithAsyncify(chr)`: process an incoming character at the REPL,
   for use when ASYNCIFY is enabled.
 
+Type conversions
+----------------
+
+Read-only objects (booleanns, numbers, strings, etc) are converted when passed between
+Python and JavaScript.  The conversions are:
+
+- JavaScript `null` converts to/from Python `None`.
+- JavaScript `undefined` converts to/from Python `js.undefined`.
+
+The conversion between `null` and `None` matches the behaviour of the Python `json`
+module.
+
 Proxying
 --------
 
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index f8d6d85303e76..b55740175b283 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -59,6 +59,16 @@ enum {
     PROXY_KIND_JS_PYPROXY = 7,
 };
 
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_undefined,
+    MP_QSTR_undefined,
+    MP_TYPE_FLAG_NONE
+    );
+
+static const mp_obj_base_t mp_const_undefined_obj = {&mp_type_undefined};
+
+#define mp_const_undefined (MP_OBJ_FROM_PTR(&mp_const_undefined_obj))
+
 MP_DEFINE_EXCEPTION(JsException, Exception)
 
 void proxy_c_init(void) {
@@ -80,7 +90,7 @@ static inline mp_obj_t proxy_c_get_obj(uint32_t c_ref) {
 
 mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value) {
     if (value[0] == PROXY_KIND_JS_UNDEFINED) {
-        return mp_const_none;
+        return mp_const_undefined;
     } else if (value[0] == PROXY_KIND_JS_NULL) {
         return mp_const_none;
     } else if (value[0] == PROXY_KIND_JS_BOOLEAN) {
@@ -122,6 +132,9 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
         const char *str = mp_obj_str_get_data(obj, &len);
         out[1] = len;
         out[2] = (uintptr_t)str;
+    } else if (obj == mp_const_undefined) {
+        kind = PROXY_KIND_MP_JSPROXY;
+        out[1] = 1;
     } else if (mp_obj_is_jsproxy(obj)) {
         kind = PROXY_KIND_MP_JSPROXY;
         out[1] = mp_obj_jsproxy_get_ref(obj);
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index f1f273d6b30a5..2a34f01a7b511 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -56,7 +56,7 @@ class PythonError extends Error {
 }
 
 function proxy_js_init() {
-    globalThis.proxy_js_ref = [globalThis];
+    globalThis.proxy_js_ref = [globalThis, undefined];
 }
 
 function proxy_call_python(target, argumentsList) {
diff --git a/tests/ports/webassembly/await_error_handling.mjs.exp b/tests/ports/webassembly/await_error_handling.mjs.exp
index 149f8914d488e..0c8eb52f20fdb 100644
--- a/tests/ports/webassembly/await_error_handling.mjs.exp
+++ b/tests/ports/webassembly/await_error_handling.mjs.exp
@@ -1,5 +1,5 @@
 1
 2
-(<JsProxy 6>, 'Error', 'test')
+(<JsProxy 7>, 'Error', 'test')
 3
 true Error test
diff --git a/tests/ports/webassembly/jsffi_create_proxy.mjs.exp b/tests/ports/webassembly/jsffi_create_proxy.mjs.exp
index a3b38a78b1132..5e541f0b0d8a5 100644
--- a/tests/ports/webassembly/jsffi_create_proxy.mjs.exp
+++ b/tests/ports/webassembly/jsffi_create_proxy.mjs.exp
@@ -1,5 +1,5 @@
 1
-<JsProxy 1>
+<JsProxy 2>
 1
 1
 PyProxy { _ref: 3 }
diff --git a/tests/ports/webassembly/jsffi_to_js.mjs.exp b/tests/ports/webassembly/jsffi_to_js.mjs.exp
index 399dd0aa8c9cb..6cfd123c01777 100644
--- a/tests/ports/webassembly/jsffi_to_js.mjs.exp
+++ b/tests/ports/webassembly/jsffi_to_js.mjs.exp
@@ -1,6 +1,6 @@
 1
-<JsProxy 1>
 <JsProxy 2>
+<JsProxy 3>
 false
 1
 true
diff --git a/tests/ports/webassembly/register_js_module.js.exp b/tests/ports/webassembly/register_js_module.js.exp
index bb45f4ce00285..6e2bad3ce56fb 100644
--- a/tests/ports/webassembly/register_js_module.js.exp
+++ b/tests/ports/webassembly/register_js_module.js.exp
@@ -1,2 +1,2 @@
-<JsProxy 1>
+<JsProxy 2>
 2
diff --git a/tests/ports/webassembly/run_python_async.mjs.exp b/tests/ports/webassembly/run_python_async.mjs.exp
index f441bc5cf1db6..ad6c49e336e5c 100644
--- a/tests/ports/webassembly/run_python_async.mjs.exp
+++ b/tests/ports/webassembly/run_python_async.mjs.exp
@@ -1,17 +1,17 @@
 = TEST 1 ==========
 1
-<JsProxy 1>
+<JsProxy 2>
 py 1
-<JsProxy 4>
+<JsProxy 5>
 py 2
 2
 resolved 123
 3
 = TEST 2 ==========
 1
-<JsProxy 5>
+<JsProxy 6>
 py 1
-<JsProxy 8>
+<JsProxy 9>
 py 2
 2
 setTimeout resolved

From cfd5a8ea3a80930a79dbae6a6aff54587393d0b8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 May 2024 22:15:48 +1000
Subject: [PATCH 1081/3129] webassembly/proxy_c: Return undefined if dict
 lookup failed on JS side.

Instead of raising KeyError.  These semantics match JavaScript behaviour
and make it much more seamless to pass Python dicts through to JavaScript
as though they were JavaScript {} objects.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/README.md                   |  4 ++-
 ports/webassembly/proxy_c.c                   | 11 +++++-
 .../webassembly/py_proxy_dict_undefined.mjs   | 34 +++++++++++++++++++
 .../py_proxy_dict_undefined.mjs.exp           | 11 ++++++
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 tests/ports/webassembly/py_proxy_dict_undefined.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_dict_undefined.mjs.exp

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index 97cb397fd495d..8a3029aa07610 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -182,4 +182,6 @@ A Python `dict` instance is proxied such that:
     }
 
 works as expected on the JavaScript side and iterates through the keys of the
-Python `dict`.
+Python `dict`.  Furthermore, when JavaScript accesses a key that does not exist
+in the Python dict, the JavaScript code receives `undefined` instead of a
+`KeyError` exception being raised.
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index b55740175b283..7d5b623686b58 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -241,8 +241,17 @@ void proxy_c_to_js_lookup_attr(uint32_t c_ref, const char *attr_in, uint32_t *ou
         qstr attr = qstr_from_str(attr_in);
         mp_obj_t member;
         if (mp_obj_is_dict_or_ordereddict(obj)) {
-            member = mp_obj_dict_get(obj, MP_OBJ_NEW_QSTR(attr));
+            // Lookup the requested attribute as a key in the target dict, and
+            // return `undefined` if not found (instead of raising `KeyError`).
+            mp_obj_dict_t *self = MP_OBJ_TO_PTR(obj);
+            mp_map_elem_t *elem = mp_map_lookup(&self->map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
+            if (elem == NULL) {
+                member = mp_const_undefined;
+            } else {
+                member = elem->value;
+            }
         } else {
+            // Lookup the requested attribute as a member/method of the target object.
             member = mp_load_attr(obj, attr);
         }
         nlr_pop();
diff --git a/tests/ports/webassembly/py_proxy_dict_undefined.mjs b/tests/ports/webassembly/py_proxy_dict_undefined.mjs
new file mode 100644
index 0000000000000..d47a6a028b61f
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_dict_undefined.mjs
@@ -0,0 +1,34 @@
+// Test passing a Python dict into JavaScript, how it behaves with undefined keys.
+// If JavaScript accesses a key that does not exist, `undefined` should be returned.
+// This is different to Python-side behaviour, where `KeyError` is raised.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+// Create a JavaScript function with default arguments.
+// When `value` is `undefined` it will receive its default.
+function withDefault({ value = "OK" } = {}) {
+    console.log(value);
+}
+
+globalThis.withDefault = withDefault;
+
+// Call the function from JavaScript with various arguments.
+withDefault();
+withDefault({});
+withDefault({ value: null });
+withDefault({ value: undefined });
+withDefault({ value: () => {} });
+
+console.log("====");
+
+// Call the function from Python with the same arguments as above.
+// The results should be the same.
+mp.runPython(`
+import js
+
+js.withDefault()
+js.withDefault({})
+js.withDefault({"value": None})
+js.withDefault({"value": js.undefined})
+js.withDefault({"value": (lambda: {})})
+`);
diff --git a/tests/ports/webassembly/py_proxy_dict_undefined.mjs.exp b/tests/ports/webassembly/py_proxy_dict_undefined.mjs.exp
new file mode 100644
index 0000000000000..6cf5b9fa128f9
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_dict_undefined.mjs.exp
@@ -0,0 +1,11 @@
+OK
+OK
+null
+OK
+[Function: value]
+====
+OK
+OK
+null
+OK
+[Function: obj] { _ref: 7 }

From d7f031397d9e793de5c05184a4957dc4e3a4bacb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 May 2024 11:37:37 +1000
Subject: [PATCH 1082/3129] webassembly/objjsproxy: Make jsproxy_it keep ref to
 jsproxy.

So that there is a one-to-one correspondence between js_ref and
JsProxy objects.

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

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index b575839d982e5..05fe715162a74 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -300,7 +300,7 @@ void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 typedef struct _jsproxy_it_t {
     mp_obj_base_t base;
     mp_fun_1_t iternext;
-    int ref;
+    mp_obj_jsproxy_t *obj;
     uint16_t cur;
     uint16_t len;
 } jsproxy_it_t;
@@ -309,7 +309,7 @@ static mp_obj_t jsproxy_it_iternext(mp_obj_t self_in) {
     jsproxy_it_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->cur < self->len) {
         uint32_t out[3];
-        js_subscr_int(self->ref, self->cur, out);
+        js_subscr_int(self->obj->ref, self->cur, out);
         self->cur += 1;
         return proxy_convert_js_to_mp_obj_cside(out);
     } else {
@@ -323,7 +323,7 @@ static mp_obj_t jsproxy_new_it(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     jsproxy_it_t *o = (jsproxy_it_t *)iter_buf;
     o->base.type = &mp_type_polymorph_iter;
     o->iternext = jsproxy_it_iternext;
-    o->ref = self->ref;
+    o->obj = self;
     o->cur = 0;
     o->len = js_get_len(self->ref);
     return MP_OBJ_FROM_PTR(o);

From ed2885facbf0393046bd9560a8912c52d47f2aab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 May 2024 11:38:46 +1000
Subject: [PATCH 1083/3129] webassembly/proxy_c: Don't return value of a void
 function.

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

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 7d5b623686b58..2ab92303d2db3 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -210,10 +210,10 @@ void proxy_c_to_js_dir(uint32_t c_ref, uint32_t *out) {
             dir = mp_builtin_dir_obj.fun.var(1, args);
         }
         nlr_pop();
-        return proxy_convert_mp_to_js_obj_cside(dir, out);
+        proxy_convert_mp_to_js_obj_cside(dir, out);
     } else {
         // uncaught exception
-        return proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+        proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
 }
 
@@ -255,10 +255,10 @@ void proxy_c_to_js_lookup_attr(uint32_t c_ref, const char *attr_in, uint32_t *ou
             member = mp_load_attr(obj, attr);
         }
         nlr_pop();
-        return proxy_convert_mp_to_js_obj_cside(member, out);
+        proxy_convert_mp_to_js_obj_cside(member, out);
     } else {
         // uncaught exception
-        return proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+        proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
 }
 
@@ -482,9 +482,9 @@ void proxy_c_to_js_resume(uint32_t c_ref, uint32_t *args) {
         mp_obj_t reject = proxy_convert_js_to_mp_obj_cside(args + 2 * 3);
         mp_obj_t ret = proxy_resume_execute(obj, mp_const_none, mp_const_none, resolve, reject);
         nlr_pop();
-        return proxy_convert_mp_to_js_obj_cside(ret, args);
+        proxy_convert_mp_to_js_obj_cside(ret, args);
     } else {
         // uncaught exception
-        return proxy_convert_mp_to_js_exc_cside(nlr.ret_val, args);
+        proxy_convert_mp_to_js_exc_cside(nlr.ret_val, args);
     }
 }

From cdaf2de80cd875da4644455673e81af261f1f3ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 May 2024 11:36:41 +1000
Subject: [PATCH 1084/3129] webassembly: Track the current depth of calls to
 external C functions.

So it's possible to know when an external C function is being called at the
top-level, eg by JavaScript without any intermediate C->JS->C calls.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/main.c    | 24 ++++++++++++++++++++++-
 ports/webassembly/proxy_c.c | 39 +++++++++++++++++++++++++++++--------
 ports/webassembly/proxy_c.h |  3 +++
 3 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 23d12b6dbbc76..fd331f8dcb486 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -44,6 +44,19 @@
 #include "library.h"
 #include "proxy_c.h"
 
+// This counter tracks the current depth of calls into C code that originated
+// externally, ie from JavaScript.  When the counter is 0 that corresponds to
+// the top-level call into C.
+static size_t external_call_depth = 0;
+
+void external_call_depth_inc(void) {
+    ++external_call_depth;
+}
+
+void external_call_depth_dec(void) {
+    --external_call_depth;
+}
+
 void mp_js_init(int heap_size) {
     #if MICROPY_ENABLE_GC
     char *heap = (char *)malloc(heap_size * sizeof(char));
@@ -79,6 +92,7 @@ void mp_js_register_js_module(const char *name, uint32_t *value) {
 }
 
 void mp_js_do_import(const char *name, uint32_t *out) {
+    external_call_depth_inc();
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_obj_t ret = mp_import_name(qstr_from_str(name), mp_const_none, MP_OBJ_NEW_SMALL_INT(0));
@@ -97,9 +111,11 @@ void mp_js_do_import(const char *name, uint32_t *out) {
             }
         }
         nlr_pop();
+        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(ret, out);
     } else {
         // uncaught exception
+        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
 }
@@ -109,6 +125,7 @@ void mp_js_do_exec(const char *src, size_t len, uint32_t *out) {
     gc_collect_start();
     gc_collect_end();
 
+    external_call_depth_inc();
     mp_parse_input_kind_t input_kind = MP_PARSE_FILE_INPUT;
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
@@ -118,9 +135,11 @@ void mp_js_do_exec(const char *src, size_t len, uint32_t *out) {
         mp_obj_t module_fun = mp_compile(&parse_tree, source_name, false);
         mp_obj_t ret = mp_call_function_0(module_fun);
         nlr_pop();
+        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(ret, out);
     } else {
         // uncaught exception
+        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
 }
@@ -136,7 +155,10 @@ void mp_js_repl_init(void) {
 }
 
 int mp_js_repl_process_char(int c) {
-    return pyexec_event_repl_process_char(c);
+    external_call_depth_inc();
+    int ret = pyexec_event_repl_process_char(c);
+    external_call_depth_dec();
+    return ret;
 }
 
 #if MICROPY_GC_SPLIT_HEAP_AUTO
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 2ab92303d2db3..22f879177a92d 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -176,6 +176,7 @@ void proxy_convert_mp_to_js_exc_cside(void *exc, uint32_t *out) {
 }
 
 void proxy_c_to_js_call(uint32_t c_ref, uint32_t n_args, uint32_t *args_value, uint32_t *out) {
+    external_call_depth_inc();
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_obj_t args[n_args];
@@ -185,14 +186,17 @@ void proxy_c_to_js_call(uint32_t c_ref, uint32_t n_args, uint32_t *args_value, u
         mp_obj_t obj = proxy_c_get_obj(c_ref);
         mp_obj_t member = mp_call_function_n_kw(obj, n_args, 0, args);
         nlr_pop();
+        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(member, out);
     } else {
         // uncaught exception
+        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
 }
 
 void proxy_c_to_js_dir(uint32_t c_ref, uint32_t *out) {
+    external_call_depth_inc();
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_obj_t obj = proxy_c_get_obj(c_ref);
@@ -210,9 +214,11 @@ void proxy_c_to_js_dir(uint32_t c_ref, uint32_t *out) {
             dir = mp_builtin_dir_obj.fun.var(1, args);
         }
         nlr_pop();
+        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(dir, out);
     } else {
         // uncaught exception
+        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
 }
@@ -235,6 +241,7 @@ bool proxy_c_to_js_has_attr(uint32_t c_ref, const char *attr_in) {
 }
 
 void proxy_c_to_js_lookup_attr(uint32_t c_ref, const char *attr_in, uint32_t *out) {
+    external_call_depth_inc();
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_obj_t obj = proxy_c_get_obj(c_ref);
@@ -255,19 +262,27 @@ void proxy_c_to_js_lookup_attr(uint32_t c_ref, const char *attr_in, uint32_t *ou
             member = mp_load_attr(obj, attr);
         }
         nlr_pop();
+        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(member, out);
     } else {
         // uncaught exception
+        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
 }
 
-static bool proxy_c_to_js_store_helper(uint32_t c_ref, const char *attr_in, mp_obj_t value) {
-    mp_obj_t obj = proxy_c_get_obj(c_ref);
-    qstr attr = qstr_from_str(attr_in);
-
+static bool proxy_c_to_js_store_helper(uint32_t c_ref, const char *attr_in, uint32_t *value_in) {
+    external_call_depth_inc();
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
+        mp_obj_t obj = proxy_c_get_obj(c_ref);
+        qstr attr = qstr_from_str(attr_in);
+
+        mp_obj_t value = MP_OBJ_NULL;
+        if (value_in != NULL) {
+            value = proxy_convert_js_to_mp_obj_cside(value_in);
+        }
+
         if (mp_obj_is_dict_or_ordereddict(obj)) {
             if (value == MP_OBJ_NULL) {
                 mp_obj_dict_delete(obj, MP_OBJ_NEW_QSTR(attr));
@@ -278,20 +293,21 @@ static bool proxy_c_to_js_store_helper(uint32_t c_ref, const char *attr_in, mp_o
             mp_store_attr(obj, attr, value);
         }
         nlr_pop();
+        external_call_depth_dec();
         return true;
     } else {
         // uncaught exception
+        external_call_depth_dec();
         return false;
     }
 }
 
 bool proxy_c_to_js_store_attr(uint32_t c_ref, const char *attr_in, uint32_t *value_in) {
-    mp_obj_t value = proxy_convert_js_to_mp_obj_cside(value_in);
-    return proxy_c_to_js_store_helper(c_ref, attr_in, value);
+    return proxy_c_to_js_store_helper(c_ref, attr_in, value_in);
 }
 
 bool proxy_c_to_js_delete_attr(uint32_t c_ref, const char *attr_in) {
-    return proxy_c_to_js_store_helper(c_ref, attr_in, MP_OBJ_NULL);
+    return proxy_c_to_js_store_helper(c_ref, attr_in, NULL);
 }
 
 uint32_t proxy_c_to_js_get_type(uint32_t c_ref) {
@@ -352,18 +368,22 @@ uint32_t proxy_c_to_js_get_iter(uint32_t c_ref) {
 }
 
 bool proxy_c_to_js_iternext(uint32_t c_ref, uint32_t *out) {
-    mp_obj_t obj = proxy_c_get_obj(c_ref);
+    external_call_depth_inc();
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
+        mp_obj_t obj = proxy_c_get_obj(c_ref);
         mp_obj_t iter = mp_iternext_allow_raise(obj);
         if (iter == MP_OBJ_STOP_ITERATION) {
+            external_call_depth_dec();
             nlr_pop();
             return false;
         }
         nlr_pop();
+        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(iter, out);
         return true;
     } else {
+        external_call_depth_dec();
         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 false;
         } else {
@@ -475,6 +495,7 @@ static mp_obj_t resume_fun(size_t n_args, const mp_obj_t *args) {
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(resume_obj, 5, 5, resume_fun);
 
 void proxy_c_to_js_resume(uint32_t c_ref, uint32_t *args) {
+    external_call_depth_inc();
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_obj_t obj = proxy_c_get_obj(c_ref);
@@ -482,9 +503,11 @@ void proxy_c_to_js_resume(uint32_t c_ref, uint32_t *args) {
         mp_obj_t reject = proxy_convert_js_to_mp_obj_cside(args + 2 * 3);
         mp_obj_t ret = proxy_resume_execute(obj, mp_const_none, mp_const_none, resolve, reject);
         nlr_pop();
+        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(ret, args);
     } else {
         // uncaught exception
+        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, args);
     }
 }
diff --git a/ports/webassembly/proxy_c.h b/ports/webassembly/proxy_c.h
index 751d14332b4b3..d3567c195e7ac 100644
--- a/ports/webassembly/proxy_c.h
+++ b/ports/webassembly/proxy_c.h
@@ -39,6 +39,9 @@ typedef struct _mp_obj_jsproxy_t {
 extern const mp_obj_type_t mp_type_jsproxy;
 extern const mp_obj_type_t mp_type_JsException;
 
+void external_call_depth_inc(void);
+void external_call_depth_dec(void);
+
 void proxy_c_init(void);
 mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value);
 void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out);

From c0ca4bb85f4f1307cbd34fe499035b16bcd22637 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 May 2024 11:36:41 +1000
Subject: [PATCH 1085/3129] webassembly: Set GC threshold and do top-level GC
 collect when possible.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/main.c | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index fd331f8dcb486..6502ed16d3aae 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -49,8 +49,17 @@
 // the top-level call into C.
 static size_t external_call_depth = 0;
 
+#if MICROPY_GC_SPLIT_HEAP_AUTO
+static void gc_collect_top_level(void);
+#endif
+
 void external_call_depth_inc(void) {
     ++external_call_depth;
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    if (external_call_depth == 1) {
+        gc_collect_top_level();
+    }
+    #endif
 }
 
 void external_call_depth_dec(void) {
@@ -63,6 +72,14 @@ void mp_js_init(int heap_size) {
     gc_init(heap, heap + heap_size);
     #endif
 
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    // When MICROPY_GC_SPLIT_HEAP_AUTO is enabled, set the GC threshold to a low
+    // value so that a collection is triggered before the heap fills up.  The actual
+    // garbage collection will happen later when control returns to the top-level,
+    // via the `gc_collect_pending` flag and `gc_collect_top_level()`.
+    MP_STATE_MEM(gc_alloc_threshold) = 16 * 1024 / MICROPY_BYTES_PER_GC_BLOCK;
+    #endif
+
     #if MICROPY_ENABLE_PYSTACK
     static mp_obj_t pystack[1024];
     mp_pystack_init(pystack, &pystack[MP_ARRAY_SIZE(pystack)]);
@@ -121,10 +138,6 @@ void mp_js_do_import(const char *name, uint32_t *out) {
 }
 
 void mp_js_do_exec(const char *src, size_t len, uint32_t *out) {
-    // Collect at the top-level, where there are no root pointers from stack/registers.
-    gc_collect_start();
-    gc_collect_end();
-
     external_call_depth_inc();
     mp_parse_input_kind_t input_kind = MP_PARSE_FILE_INPUT;
     nlr_buf_t nlr;
@@ -163,6 +176,8 @@ int mp_js_repl_process_char(int c) {
 
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 
+static bool gc_collect_pending = false;
+
 // The largest new region that is available to become Python heap.
 size_t gc_get_max_new_split(void) {
     return 128 * 1024 * 1024;
@@ -170,6 +185,16 @@ size_t gc_get_max_new_split(void) {
 
 // Don't collect anything.  Instead require the heap to grow.
 void gc_collect(void) {
+    gc_collect_pending = true;
+}
+
+// Collect at the top-level, where there are no root pointers from stack/registers.
+static void gc_collect_top_level(void) {
+    if (gc_collect_pending) {
+        gc_collect_pending = false;
+        gc_collect_start();
+        gc_collect_end();
+    }
 }
 
 #else

From 5c7a414574f06cf50ee9edec449f35f6740a1261 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 May 2024 11:41:46 +1000
Subject: [PATCH 1086/3129] webassembly: Add C-level finaliser to JsProxy
 object.

And clear the corresponding `proxy_js_ref[js_ref]` entry when the finaliser
runs.  This then allows the JavaScript side to (eventually) free the
corresponding JavaScript object.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/objjsproxy.c | 24 ++++++++++++++++++++++--
 ports/webassembly/proxy_js.js  | 31 +++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 05fe715162a74..5c09e003fdccc 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -234,6 +234,22 @@ static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     }
 }
 
+EM_JS(void, proxy_js_free_obj, (int js_ref), {
+    if (js_ref >= PROXY_JS_REF_NUM_STATIC) {
+        proxy_js_ref[js_ref] = undefined;
+        if (js_ref < proxy_js_ref_next) {
+            proxy_js_ref_next = js_ref;
+        }
+    }
+});
+
+static mp_obj_t jsproxy___del__(mp_obj_t self_in) {
+    mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
+    proxy_js_free_obj(self->ref);
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(jsproxy___del___obj, jsproxy___del__);
+
 static mp_obj_t jsproxy_reflect_construct(size_t n_args, const mp_obj_t *args) {
     int arg0 = mp_obj_jsproxy_get_ref(args[0]);
     n_args -= 1;
@@ -274,7 +290,11 @@ void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
         // Load attribute.
         uint32_t out[PVN];
-        if (lookup_attr(self->ref, qstr_str(attr), out)) {
+        if (attr == MP_QSTR___del__) {
+            // For finaliser.
+            dest[0] = MP_OBJ_FROM_PTR(&jsproxy___del___obj);
+            dest[1] = self_in;
+        } else if (lookup_attr(self->ref, qstr_str(attr), out)) {
             dest[0] = proxy_convert_js_to_mp_obj_cside(out);
         } else if (attr == MP_QSTR_new) {
             // Special case to handle construction of JS objects.
@@ -515,7 +535,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 mp_obj_t mp_obj_new_jsproxy(int ref) {
-    mp_obj_jsproxy_t *o = mp_obj_malloc(mp_obj_jsproxy_t, &mp_type_jsproxy);
+    mp_obj_jsproxy_t *o = mp_obj_malloc_with_finaliser(mp_obj_jsproxy_t, &mp_type_jsproxy);
     o->ref = ref;
     return MP_OBJ_FROM_PTR(o);
 }
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 2a34f01a7b511..20f13f1d7423b 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -24,6 +24,9 @@
  * THE SOFTWARE.
  */
 
+// Number of static entries at the start of proxy_js_ref.
+const PROXY_JS_REF_NUM_STATIC = 2;
+
 // These constants should match the constants in proxy_c.c.
 
 const PROXY_KIND_MP_EXCEPTION = -1;
@@ -57,6 +60,28 @@ class PythonError extends Error {
 
 function proxy_js_init() {
     globalThis.proxy_js_ref = [globalThis, undefined];
+    globalThis.proxy_js_ref_next = PROXY_JS_REF_NUM_STATIC;
+}
+
+// js_obj cannot be undefined
+function proxy_js_add_obj(js_obj) {
+    // Search for the first free slot in proxy_js_ref.
+    while (proxy_js_ref_next < proxy_js_ref.length) {
+        if (proxy_js_ref[proxy_js_ref_next] === undefined) {
+            // Free slot found, reuse it.
+            const id = proxy_js_ref_next;
+            ++proxy_js_ref_next;
+            proxy_js_ref[id] = js_obj;
+            return id;
+        }
+        ++proxy_js_ref_next;
+    }
+
+    // No free slots, so grow proxy_js_ref by one (append at the end of the array).
+    const id = proxy_js_ref.length;
+    proxy_js_ref[id] = js_obj;
+    proxy_js_ref_next = proxy_js_ref.length;
+    return id;
 }
 
 function proxy_call_python(target, argumentsList) {
@@ -147,8 +172,7 @@ function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
         Module.setValue(out + 4, js_obj._ref, "i32");
     } else {
         kind = PROXY_KIND_JS_OBJECT;
-        const id = proxy_js_ref.length;
-        proxy_js_ref[id] = js_obj;
+        const id = proxy_js_add_obj(js_obj);
         Module.setValue(out + 4, id, "i32");
     }
     Module.setValue(out + 0, kind, "i32");
@@ -161,8 +185,7 @@ function proxy_convert_js_to_mp_obj_jsside_force_double_proxy(js_obj, out) {
         js_obj instanceof PyProxyThenable
     ) {
         const kind = PROXY_KIND_JS_OBJECT;
-        const id = proxy_js_ref.length;
-        proxy_js_ref[id] = js_obj;
+        const id = proxy_js_add_obj(js_obj);
         Module.setValue(out + 4, id, "i32");
         Module.setValue(out + 0, kind, "i32");
     } else {

From 57a9ffa6320bc9e5c7979a7f35c7de7a18f74720 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 May 2024 11:42:51 +1000
Subject: [PATCH 1087/3129] webassembly: Register PyProxy objects for JS-side
 finalisation.

And clear the corresponding `proxy_c_ref[c_ref]` entry when the finaliser
runs.  This then allows the C side to (eventually) garbage collect the
corresponding Python object.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile    |  1 +
 ports/webassembly/proxy_c.c   | 32 +++++++++++++++++++++++++++++++-
 ports/webassembly/proxy_js.js |  6 ++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index fddfb5094aac5..435636531cc26 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -54,6 +54,7 @@ EXPORTED_FUNCTIONS_EXTRA += ,\
 	_mp_js_do_exec_async,\
 	_mp_js_do_import,\
 	_mp_js_register_js_module,\
+	_proxy_c_free_obj,\
 	_proxy_c_init,\
 	_proxy_c_to_js_call,\
 	_proxy_c_to_js_delete_attr,\
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 22f879177a92d..6e6f928a2ee4b 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -32,6 +32,9 @@
 #include "py/runtime.h"
 #include "proxy_c.h"
 
+// Number of static entries at the start of proxy_c_ref.
+#define PROXY_C_REF_NUM_STATIC (1)
+
 // These constants should match the constants in proxy_js.js.
 
 enum {
@@ -71,16 +74,36 @@ static const mp_obj_base_t mp_const_undefined_obj = {&mp_type_undefined};
 
 MP_DEFINE_EXCEPTION(JsException, Exception)
 
+// Index to start searching for the next available slot in proxy_c_ref.
+static size_t proxy_c_ref_next;
+
 void proxy_c_init(void) {
     MP_STATE_PORT(proxy_c_ref) = mp_obj_new_list(0, NULL);
     mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), MP_OBJ_NULL);
+    proxy_c_ref_next = PROXY_C_REF_NUM_STATIC;
 }
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t proxy_c_ref);
 
+// obj cannot be MP_OBJ_NULL.
 static inline size_t proxy_c_add_obj(mp_obj_t obj) {
-    size_t id = ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->len;
+    // Search for the first free slot in proxy_c_ref.
+    mp_obj_list_t *l = (mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref));
+    while (proxy_c_ref_next < l->len) {
+        if (l->items[proxy_c_ref_next] == MP_OBJ_NULL) {
+            // Free slot found, reuse it.
+            size_t id = proxy_c_ref_next;
+            ++proxy_c_ref_next;
+            l->items[id] = obj;
+            return id;
+        }
+        ++proxy_c_ref_next;
+    }
+
+    // No free slots, so grow proxy_c_ref by one (append at the end of the list).
+    size_t id = l->len;
     mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), obj);
+    proxy_c_ref_next = l->len;
     return id;
 }
 
@@ -88,6 +111,13 @@ static inline mp_obj_t proxy_c_get_obj(uint32_t c_ref) {
     return ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->items[c_ref];
 }
 
+void proxy_c_free_obj(uint32_t c_ref) {
+    if (c_ref >= PROXY_C_REF_NUM_STATIC) {
+        ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->items[c_ref] = MP_OBJ_NULL;
+        proxy_c_ref_next = MIN(proxy_c_ref_next, c_ref);
+    }
+}
+
 mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value) {
     if (value[0] == PROXY_KIND_JS_UNDEFINED) {
         return mp_const_undefined;
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 20f13f1d7423b..fe92b5725a049 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -61,6 +61,11 @@ class PythonError extends Error {
 function proxy_js_init() {
     globalThis.proxy_js_ref = [globalThis, undefined];
     globalThis.proxy_js_ref_next = PROXY_JS_REF_NUM_STATIC;
+    globalThis.pyProxyFinalizationRegistry = new FinalizationRegistry(
+        (cRef) => {
+            Module.ccall("proxy_c_free_obj", "null", ["number"], [cRef]);
+        },
+    );
 }
 
 // js_obj cannot be undefined
@@ -251,6 +256,7 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
             const target = new PyProxy(id);
             obj = new Proxy(target, py_proxy_handler);
         }
+        globalThis.pyProxyFinalizationRegistry.register(obj, id);
     }
     return obj;
 }

From a919ce26d325b0169a5cfaf65fe4a71ece9dfa1f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 May 2024 11:43:00 +1000
Subject: [PATCH 1088/3129] webassembly/modjsffi: Add mem_info function to get
 detailed stats.

This allows querying the GC heap size/used/free values, as well as the
number of alive JsProxy and PyProxy objects, referenced by proxy_c_ref and
proxy_js_ref.

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

diff --git a/ports/webassembly/modjsffi.c b/ports/webassembly/modjsffi.c
index c77d899fb7f8c..202e1d7ec0149 100644
--- a/ports/webassembly/modjsffi.c
+++ b/ports/webassembly/modjsffi.c
@@ -25,6 +25,7 @@
  */
 
 #include "emscripten.h"
+#include "py/gc.h"
 #include "py/objmodule.h"
 #include "py/runtime.h"
 #include "proxy_c.h"
@@ -75,6 +76,44 @@ static mp_obj_t mp_jsffi_async_timeout_ms(mp_obj_t arg) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_jsffi_async_timeout_ms_obj, mp_jsffi_async_timeout_ms);
 
+// *FORMAT-OFF*
+EM_JS(void, js_get_proxy_js_ref_info, (uint32_t * out), {
+    let used = 0;
+    for (const elem of proxy_js_ref) {
+        if (elem !== undefined) {
+            ++used;
+        }
+    }
+    Module.setValue(out, proxy_js_ref.length, "i32");
+    Module.setValue(out + 4, used, "i32");
+});
+// *FORMAT-ON*
+
+static mp_obj_t mp_jsffi_mem_info(void) {
+    mp_obj_list_t *l = (mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref));
+    mp_int_t used = 0;
+    for (size_t i = 0; i < l->len; ++i) {
+        if (l->items[i] != MP_OBJ_NULL) {
+            ++used;
+        }
+    }
+    uint32_t proxy_js_ref_info[2];
+    js_get_proxy_js_ref_info(proxy_js_ref_info);
+    gc_info_t info;
+    gc_info(&info);
+    mp_obj_t elems[] = {
+        MP_OBJ_NEW_SMALL_INT(info.total), // GC heap total bytes
+        MP_OBJ_NEW_SMALL_INT(info.used), // GC heap used bytes
+        MP_OBJ_NEW_SMALL_INT(info.free), // GC heap free bytes
+        MP_OBJ_NEW_SMALL_INT(l->len), // proxy_c_ref allocated size
+        MP_OBJ_NEW_SMALL_INT(used), // proxy_c_ref used
+        MP_OBJ_NEW_SMALL_INT(proxy_js_ref_info[0]), // proxy_js_ref allocated size
+        MP_OBJ_NEW_SMALL_INT(proxy_js_ref_info[1]), // proxy_js_ref used
+    };
+    return mp_obj_new_tuple(MP_ARRAY_SIZE(elems), elems);
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_jsffi_mem_info_obj, mp_jsffi_mem_info);
+
 static const mp_rom_map_elem_t mp_module_jsffi_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_jsffi) },
 
@@ -83,6 +122,7 @@ static const mp_rom_map_elem_t mp_module_jsffi_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_create_proxy), MP_ROM_PTR(&mp_jsffi_create_proxy_obj) },
     { MP_ROM_QSTR(MP_QSTR_to_js), MP_ROM_PTR(&mp_jsffi_to_js_obj) },
     { MP_ROM_QSTR(MP_QSTR_async_timeout_ms), MP_ROM_PTR(&mp_jsffi_async_timeout_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem_info), MP_ROM_PTR(&mp_jsffi_mem_info_obj) },
 };
 static MP_DEFINE_CONST_DICT(mp_module_jsffi_globals, mp_module_jsffi_globals_table);
 

From 482292cc664be63af985b5bde3a5c83ddcc9180a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 May 2024 10:43:34 +1000
Subject: [PATCH 1089/3129] py/dynruntime: Add mp_obj_exception_init function
 to create C exception.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h | 15 +++++++++++++++
 py/nativeglue.c |  1 +
 py/nativeglue.h |  1 +
 tools/mpy_ld.py |  1 +
 4 files changed, 18 insertions(+)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index d07b1dce2c4e5..5503a1014f12b 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -90,6 +90,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #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_Exception                   (*mp_fun_table.type_Exception)
 #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)))
 #define mp_type_KeyError                    (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_KeyError)))
@@ -236,6 +237,10 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 /******************************************************************************/
 // Exceptions
 
+#define mp_obj_exception_make_new               (MP_OBJ_TYPE_GET_SLOT(&mp_type_Exception, make_new))
+#define mp_obj_exception_print                  (MP_OBJ_TYPE_GET_SLOT(&mp_type_Exception, print))
+#define mp_obj_exception_attr                   (MP_OBJ_TYPE_GET_SLOT(&mp_type_Exception, attr))
+
 #define mp_obj_new_exception(o)                 ((mp_obj_t)(o)) // Assumes returned object will be raised, will create instance then
 #define mp_obj_new_exception_arg1(e_type, arg)  (mp_obj_new_exception_arg1_dyn((e_type), (arg)))
 
@@ -263,6 +268,16 @@ static inline void mp_raise_OSError_dyn(int er) {
     nlr_raise(mp_call_function_n_kw(mp_load_global(MP_QSTR_OSError), 1, 0, &args[0]));
 }
 
+static inline void mp_obj_exception_init(mp_obj_full_type_t *exc, qstr name, const mp_obj_type_t *base) {
+    exc->base.type = &mp_type_type;
+    exc->flags = MP_TYPE_FLAG_NONE;
+    exc->name = name;
+    MP_OBJ_TYPE_SET_SLOT(exc, make_new, mp_obj_exception_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(exc, print, mp_obj_exception_print, 1);
+    MP_OBJ_TYPE_SET_SLOT(exc, attr, mp_obj_exception_attr, 2);
+    MP_OBJ_TYPE_SET_SLOT(exc, parent, base, 3);
+}
+
 /******************************************************************************/
 // Floating point
 
diff --git a/py/nativeglue.c b/py/nativeglue.c
index ba3d93f760707..ad2483caed787 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -344,6 +344,7 @@ const mp_fun_table_t mp_fun_table = {
     &mp_type_fun_builtin_2,
     &mp_type_fun_builtin_3,
     &mp_type_fun_builtin_var,
+    &mp_type_Exception,
     &mp_stream_read_obj,
     &mp_stream_readinto_obj,
     &mp_stream_unbuffered_readline_obj,
diff --git a/py/nativeglue.h b/py/nativeglue.h
index 1fa85933452cb..4c114de421667 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -171,6 +171,7 @@ typedef struct _mp_fun_table_t {
     const mp_obj_type_t *type_fun_builtin_2;
     const mp_obj_type_t *type_fun_builtin_3;
     const mp_obj_type_t *type_fun_builtin_var;
+    const mp_obj_type_t *type_Exception;
     const mp_obj_fun_builtin_var_t *stream_read_obj;
     const mp_obj_fun_builtin_var_t *stream_readinto_obj;
     const mp_obj_fun_builtin_var_t *stream_unbuffered_readline_obj;
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 2e3da53eb57e0..029b02fa42e4d 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -767,6 +767,7 @@ def link_objects(env, native_qstr_vals_len):
                 "mp_type_fun_builtin_2",
                 "mp_type_fun_builtin_3",
                 "mp_type_fun_builtin_var",
+                "mp_type_Exception",
                 "mp_stream_read_obj",
                 "mp_stream_readinto_obj",
                 "mp_stream_unbuffered_readline_obj",

From d532f960a4c40e4e6661ddc1d9eced18c37e3377 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 May 2024 10:43:51 +1000
Subject: [PATCH 1090/3129] examples/natmod/features4: Create custom
 FactorialError as exc example.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/natmod/features4/features4.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/examples/natmod/features4/features4.c b/examples/natmod/features4/features4.c
index a52e9e45662aa..e64c7f759213c 100644
--- a/examples/natmod/features4/features4.c
+++ b/examples/natmod/features4/features4.c
@@ -1,5 +1,6 @@
 /*
-  This example extends on features0 but demonstrates how to define a class.
+  This example extends on features0 but demonstrates how to define a class,
+  and a custom exception.
 
   The Factorial class constructor takes an integer, and then the calculate
   method can be called to get the factorial.
@@ -8,6 +9,9 @@
   >>> f = features4.Factorial(4)
   >>> f.calculate()
   24
+
+  If the argument to the Factorial class constructor is less than zero, a
+  FactorialError is raised.
 */
 
 // Include the header file to get access to the MicroPython API
@@ -22,6 +26,8 @@ typedef struct {
     mp_int_t n;
 } mp_obj_factorial_t;
 
+mp_obj_full_type_t mp_type_FactorialError;
+
 // Essentially Factorial.__new__ (but also kind of __init__).
 // Takes a single argument (the number to find the factorial of)
 static mp_obj_t factorial_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
@@ -30,6 +36,10 @@ static mp_obj_t factorial_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_obj_factorial_t *o = mp_obj_malloc(mp_obj_factorial_t, type);
     o->n = mp_obj_get_int(args_in[0]);
 
+    if (o->n < 0) {
+        mp_raise_msg((mp_obj_type_t *)&mp_type_FactorialError, "argument must be zero or above");
+    }
+
     return MP_OBJ_FROM_PTR(o);
 }
 
@@ -68,6 +78,12 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     // Make the Factorial type available on the module.
     mp_store_global(MP_QSTR_Factorial, MP_OBJ_FROM_PTR(&mp_type_factorial));
 
+    // Initialise the exception type.
+    mp_obj_exception_init(&mp_type_FactorialError, MP_QSTR_FactorialError, &mp_type_Exception);
+
+    // Make the FactorialError type available on the module.
+    mp_store_global(MP_QSTR_FactorialError, MP_OBJ_FROM_PTR(&mp_type_FactorialError));
+
     // This must be last, it restores the globals dict
     MP_DYNRUNTIME_INIT_EXIT
 }

From b1e960270213a88eb02219d85201198c4a8671c6 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 18 Mar 2024 16:38:15 -0500
Subject: [PATCH 1091/3129] extmod/modlwip: Use Nagle algorithm and add support
 for TCP_NODELAY.

This adds support to use the Nagle algorithm implemented already in lwIP to
determine when TCP data should be sent.

As currently written, MicroPython will only create packets if there is <25%
remaining in the send buffer.  Using it, sending a small message of ~50
bytes will not trigger output of the message on the network.  So it will
remained queued until the TCP interval timer expires, which can be up to
500ms.

Using Nagle's algorithm, the first write, no matter how small, will
generate a packet on the network.  And sending lots of data still makes
efficient use of the link.

In addition to this, an application designer may choose to always create
packets for every write by setting the TCP_NODELAY socket option.  That's
also implemented in this commit.
---
 extmod/modlwip.c | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index d4e25917a67b8..afac512e834de 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -69,6 +69,8 @@
 #define IP_ADD_MEMBERSHIP 0x400
 #define IP_DROP_MEMBERSHIP 0x401
 
+#define TCP_NODELAY TF_NODELAY
+
 // For compatibilily with older lwIP versions.
 #ifndef ip_set_option
 #define ip_set_option(pcb, opt)   ((pcb)->so_options |= (opt))
@@ -76,6 +78,12 @@
 #ifndef ip_reset_option
 #define ip_reset_option(pcb, opt) ((pcb)->so_options &= ~(opt))
 #endif
+#ifndef tcp_set_flags
+#define tcp_set_flags(pcb, set_flags) do { (pcb)->flags |= (set_flags); } while (0)
+#endif
+#ifndef tcp_clear_flags
+#define tcp_clear_flags(pcb, clear_flags) do { (pcb)->flags &= ~(clear_flags); } while (0)
+#endif
 
 // A port can define these hooks to provide concurrency protection
 #ifndef MICROPY_PY_LWIP_ENTER
@@ -742,9 +750,10 @@ static mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
         MICROPY_PY_LWIP_REENTER
     }
 
-    // If the output buffer is getting full then send the data to the lower layers
-    if (err == ERR_OK && tcp_sndbuf(socket->pcb.tcp) < TCP_SND_BUF / 4) {
-        err = tcp_output(socket->pcb.tcp);
+    // Use nagle algorithm to determine when to send segment buffer (can be
+    // disabled with TCP_NODELAY socket option)
+    if (err == ERR_OK) {
+        err = tcp_output_nagle(socket->pcb.tcp);
     }
 
     MICROPY_PY_LWIP_EXIT
@@ -1440,6 +1449,17 @@ static mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
             break;
         }
 
+        // level: IPPROTO_TCP
+        case TCP_NODELAY: {
+            mp_int_t val = mp_obj_get_int(args[3]);
+            if (val) {
+                tcp_set_flags(socket->pcb.tcp, opt);
+            } else {
+                tcp_clear_flags(socket->pcb.tcp, opt);
+            }
+            break;
+        }
+
         default:
             printf("Warning: lwip.setsockopt() not implemented\n");
     }
@@ -1829,6 +1849,9 @@ 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) },
+
+    { MP_ROM_QSTR(MP_QSTR_IPPROTO_TCP), MP_ROM_INT(IP_PROTO_TCP) },
+    { MP_ROM_QSTR(MP_QSTR_TCP_NODELAY), MP_ROM_INT(TCP_NODELAY) },
 };
 
 static MP_DEFINE_CONST_DICT(mp_module_lwip_globals, mp_module_lwip_globals_table);

From a196468c4752997a11cf06b65cb2147465b7f8eb Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@greezybacon.me>
Date: Thu, 23 May 2024 20:37:55 -0500
Subject: [PATCH 1092/3129] esp32: Add support for TCP_NODELAY.

This adds support for the TCP_NODELAY socket option for lwIP sockets.
Generally, TCP sockets use the Nagle algorithm and will send data when
an ACK is received or after all previously-sent data has already been
ACKed.

If the TCP_NODELAY option is set for a socket, every write to the socket
will trigger a packet to be sent.

Signed-off-by: Jared Hancock <jared@greezybacon.me>
---
 ports/esp32/modsocket.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 507609dfef6b1..44f945c4503b0 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -528,6 +528,16 @@ static mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
         }
             #endif
 
+        // level: IPPROTO_TCP
+        case TCP_NODELAY: {
+            int val = mp_obj_get_int(args[3]);
+            int ret = lwip_setsockopt(self->fd, IPPROTO_TCP, opt, &val, sizeof(int));
+            if (ret != 0) {
+                mp_raise_OSError(errno);
+            }
+            break;
+        }
+
         // level: IPPROTO_IP
         case IP_ADD_MEMBERSHIP: {
             mp_buffer_info_t bufinfo;
@@ -995,6 +1005,7 @@ static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SO_BROADCAST), MP_ROM_INT(SO_BROADCAST) },
     { MP_ROM_QSTR(MP_QSTR_SO_BINDTODEVICE), MP_ROM_INT(SO_BINDTODEVICE) },
     { MP_ROM_QSTR(MP_QSTR_IP_ADD_MEMBERSHIP), MP_ROM_INT(IP_ADD_MEMBERSHIP) },
+    { MP_ROM_QSTR(MP_QSTR_TCP_NODELAY), MP_ROM_INT(TCP_NODELAY) },
 };
 
 static MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);

From c624a5c0c4d02fd67e2ad5a0f36a141d2a6ef2ff Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Fri, 19 Apr 2024 16:37:51 -0700
Subject: [PATCH 1093/3129] py/dynruntime: Export mp_load_method_maybe and
 mp_arg_parse_all* funcs.

Also define `mp_type_bytearray`.  These all help to write native modules.

Signed-off-by: Brian Pugh <bnp117@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h                           | 8 ++++++++
 py/nativeglue.c                           | 3 +++
 py/nativeglue.h                           | 5 ++++-
 tests/micropython/import_mpy_native_gc.py | 4 ++--
 tools/mpy_ld.py                           | 2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 5503a1014f12b..d360d824ac39c 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -88,6 +88,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #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_bytearray                   (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_bytearray)))
 #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_Exception                   (*mp_fun_table.type_Exception)
@@ -194,6 +195,7 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 #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_method_maybe(base, attr, dest) (mp_fun_table.load_method_maybe((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)))
@@ -211,6 +213,12 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 #define mp_arg_check_num(n_args, n_kw, n_args_min, n_args_max, takes_kw) \
     (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_arg_parse_all(n_pos, pos, kws, n_allowed, allowed, out_vals) \
+    (mp_fun_table.arg_parse_all((n_pos), (pos), (kws), (n_allowed), (allowed), (out_vals)))
+
+#define mp_arg_parse_all_kw_array(n_pos, n_kw, args, n_allowed, allowed, out_vals) \
+    (mp_fun_table.arg_parse_all_kw_array((n_pos), (n_kw), (args), (n_allowed), (allowed), (out_vals)))
+
 #define MP_DYNRUNTIME_INIT_ENTRY \
     mp_obj_t old_globals = mp_fun_table.swap_globals(self->context->module.globals); \
     mp_raw_code_truncated_t rc; \
diff --git a/py/nativeglue.c b/py/nativeglue.c
index ad2483caed787..6bf16f1acc29a 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -329,8 +329,11 @@ const mp_fun_table_t mp_fun_table = {
     mp_obj_new_float_from_d,
     mp_obj_get_float_to_f,
     mp_obj_get_float_to_d,
+    mp_load_method_maybe,
     mp_get_buffer,
     mp_get_stream_raise,
+    mp_arg_parse_all,
+    mp_arg_parse_all_kw_array,
     mp_binary_get_size,
     mp_binary_get_val_array,
     mp_binary_set_val_array,
diff --git a/py/nativeglue.h b/py/nativeglue.h
index 4c114de421667..e96fd7b66a03f 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -154,13 +154,16 @@ typedef struct _mp_fun_table_t {
     mp_obj_t (*obj_new_float_from_d)(double d);
     float (*obj_get_float_to_f)(mp_obj_t o);
     double (*obj_get_float_to_d)(mp_obj_t o);
+    void (*load_method_maybe)(mp_obj_t base, qstr attr, mp_obj_t *dest);
     bool (*get_buffer)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
     const mp_stream_p_t *(*get_stream_raise)(mp_obj_t self_in, int flags);
+    void (*arg_parse_all)(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
+    void (*arg_parse_all_kw_array)(size_t n_pos, size_t n_kw, const mp_obj_t *args, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
     size_t (*binary_get_size)(char struct_type, char val_type, size_t *palign);
     mp_obj_t (*binary_get_val_array)(char typecode, void *p, size_t index);
     void (*binary_set_val_array)(char typecode, void *p, size_t index, mp_obj_t val_in);
     const mp_print_t *plat_print;
-    // The following entries start at index 70 and are referenced by tools-mpy_ld.py,
+    // The following entries start at index 73 and are referenced by tools-mpy_ld.py,
     // see constant MP_FUN_TABLE_MP_TYPE_TYPE_OFFSET.
     const mp_obj_type_t *type_type;
     const mp_obj_type_t *type_str;
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 7f4b2aefd59f4..4b7acd9c652e0 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -52,9 +52,9 @@ def open(self, path, mode):
 # cat features0.mpy | python -c 'import sys; print(sys.stdin.buffer.read())'
 features0_file_contents = {
     # -march=x64
-    0x806: b'M\x06\x0b\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&\xa9 \x01"\xff',
+    0x806: b'M\x06\x0b\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&\xaf \x01"\xff',
     # -march=armv6m
-    0x1006: b"M\x06\x13\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>\xa98\x01:\xff",
+    0x1006: b"M\x06\x13\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>\xaf8\x01:\xff",
 }
 
 # Populate armv7m-derived archs based on armv6m.
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 029b02fa42e4d..7046b6a8556f0 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -52,7 +52,7 @@
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
 MP_SCOPE_FLAG_VIPERBSS = 0x40
 MP_SMALL_INT_BITS = 31
-MP_FUN_TABLE_MP_TYPE_TYPE_OFFSET = 70
+MP_FUN_TABLE_MP_TYPE_TYPE_OFFSET = 73
 
 # ELF constants
 R_386_32 = 1

From df419137821a07a382eb78ce528c700870a4351c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 May 2024 13:19:47 +1000
Subject: [PATCH 1094/3129] examples/natmod/btree: Make btree.open use
 mp_arg_parse_all for kwargs.

Python code is no longer needed to implement keyword arguments in
`btree.open()`, it can now be done in C.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/natmod/btree/Makefile    |  2 +-
 examples/natmod/btree/btree_c.c   | 36 ++++++++++++++++++++++---------
 examples/natmod/btree/btree_py.py |  7 ------
 3 files changed, 27 insertions(+), 18 deletions(-)
 delete mode 100644 examples/natmod/btree/btree_py.py

diff --git a/examples/natmod/btree/Makefile b/examples/natmod/btree/Makefile
index 218ec15a2a009..b5846f90065ee 100644
--- a/examples/natmod/btree/Makefile
+++ b/examples/natmod/btree/Makefile
@@ -5,7 +5,7 @@ MPY_DIR = ../../..
 MOD = btree_$(ARCH)
 
 # Source files (.c or .py)
-SRC = btree_c.c btree_py.py
+SRC = btree_c.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
 ARCH = x64
diff --git a/examples/natmod/btree/btree_c.c b/examples/natmod/btree/btree_c.c
index bbf51c731fbd1..4f494817e7bc0 100644
--- a/examples/natmod/btree/btree_c.c
+++ b/examples/natmod/btree/btree_c.c
@@ -106,23 +106,39 @@ mp_getiter_iternext_custom_t btree_getiter_iternext;
 mp_map_elem_t btree_locals_dict_table[8];
 static MP_DEFINE_CONST_DICT(btree_locals_dict, btree_locals_dict_table);
 
-static mp_obj_t btree_open(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t btree_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // The allowed_args array must have its qstr's populated at runtime.
+    enum { ARG_flags, ARG_cachesize, ARG_pagesize, ARG_minkeypage };
+    mp_arg_t allowed_args[] = {
+        { MP_QSTR_, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    };
+    allowed_args[0].qst = MP_QSTR_flags;
+    allowed_args[1].qst = MP_QSTR_cachesize;
+    allowed_args[2].qst = MP_QSTR_pagesize;
+    allowed_args[3].qst = MP_QSTR_minkeypage;
+
     // Make sure we got a stream object
-    mp_get_stream_raise(args[0], MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
+    mp_get_stream_raise(pos_args[0], MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
+
+    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);
 
     BTREEINFO openinfo = {0};
-    openinfo.flags = mp_obj_get_int(args[1]);
-    openinfo.cachesize = mp_obj_get_int(args[2]);
-    openinfo.psize = mp_obj_get_int(args[3]);
-    openinfo.minkeypage = mp_obj_get_int(args[4]);
-    DB *db = __bt_open(MP_OBJ_TO_PTR(args[0]), &btree_stream_fvtable, &openinfo, 0);
+    openinfo.flags = args[ARG_flags].u_int;
+    openinfo.cachesize = args[ARG_cachesize].u_int;
+    openinfo.psize = args[ARG_pagesize].u_int;
+    openinfo.minkeypage = args[ARG_minkeypage].u_int;
+    DB *db = __bt_open(MP_OBJ_TO_PTR(pos_args[0]), &btree_stream_fvtable, &openinfo, 0);
     if (db == NULL) {
         mp_raise_OSError(native_errno);
     }
 
-    return MP_OBJ_FROM_PTR(btree_new(db, args[0]));
+    return MP_OBJ_FROM_PTR(btree_new(db, pos_args[0]));
 }
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_open_obj, 5, 5, btree_open);
+static MP_DEFINE_CONST_FUN_OBJ_KW(btree_open_obj, 1, 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
@@ -147,7 +163,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[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, 4);
 
-    mp_store_global(MP_QSTR__open, MP_OBJ_FROM_PTR(&btree_open_obj));
+    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));
     mp_store_global(MP_QSTR_DESC, MP_OBJ_NEW_SMALL_INT(FLAG_DESC));
 
diff --git a/examples/natmod/btree/btree_py.py b/examples/natmod/btree/btree_py.py
deleted file mode 100644
index 461b045c98dfc..0000000000000
--- a/examples/natmod/btree/btree_py.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Implemented in Python to support keyword arguments
-
-# ruff: noqa: F821 - this file is evaluated with C-defined names in scope
-
-
-def open(stream, *, flags=0, cachesize=0, pagesize=0, minkeypage=0):
-    return _open(stream, flags, cachesize, pagesize, minkeypage)

From 5d07d0c7b0b2b3601d69a74da837d77e65941f75 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 11:44:54 +1000
Subject: [PATCH 1095/3129] tests/run-natmodtests.py: Fix search for supported
 native tests.

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

diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index e61cf09933f0c..f1a2a974690ee 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -97,8 +97,9 @@ def run_script(self, script):
 def run_tests(target_truth, target, args, stats):
     for test_file in args.files:
         # Find supported test
+        test_file_basename = os.path.basename(test_file)
         for k, v in TEST_MAPPINGS.items():
-            if test_file.find(k) != -1:
+            if test_file_basename.startswith(k):
                 test_module = k
                 test_mpy = v.replace("$(ARCH)", args.arch)
                 break

From fbf811474af1c5a7c4c03743b11b248151199a36 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 11:45:59 +1000
Subject: [PATCH 1096/3129] tools/ci.sh: Simplify selection of natmod tests to
 run.

The `run-natmodtests.py` script now properly excludes tests that don't use
the corresponding native module.

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 ad5e79c4ad07c..bac225caa4df1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -517,7 +517,7 @@ function ci_unix_coverage_run_mpy_merge_tests {
 
 function ci_unix_coverage_run_native_mpy_tests {
     MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython -m features2
-    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,deflate*,framebuf*,heapq*,random*,re*}.py)
+    (cd tests && ./run-natmodtests.py "$@" extmod/*.py)
 }
 
 function ci_unix_32bit_setup {

From c0a25a69eb9532396c7ff06dd8ab506403aba4a2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 11:49:06 +1000
Subject: [PATCH 1097/3129] extmod/modos: Only sync FAT filesystems using
 disk_ioctl.

Eventually this needs to be made a generic call to the underlying VFS.  But
for now this prevents `disk_ioctl()` crashing on non-FAT filesystems.

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

diff --git a/extmod/modos.c b/extmod/modos.c
index eda359b97b1b0..7f1e31fba7793 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -76,8 +76,9 @@
 static mp_obj_t mp_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);
+        if (mp_obj_is_type(vfs->obj, &mp_fat_vfs_type)) {
+            disk_ioctl(MP_OBJ_TO_PTR(vfs->obj), CTRL_SYNC, NULL);
+        }
     }
     #endif
     return mp_const_none;

From 1ea06b99d8cc0cbcdb6d136eee607db67d12b37c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 12:01:05 +1000
Subject: [PATCH 1098/3129] tests/extmod: Fix regex strings to be of r"" type.

Otherwise escape characters like \s and \W won't work correctly.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/re_namedclass.py | 6 +++---
 tests/extmod/re_sub.py        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/extmod/re_namedclass.py b/tests/extmod/re_namedclass.py
index 442172f4ab0c7..e71256671923d 100644
--- a/tests/extmod/re_namedclass.py
+++ b/tests/extmod/re_namedclass.py
@@ -31,6 +31,6 @@ def print_groups(match):
 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"))
+print_groups(re.match(r"([^\s]+)\s*([^\s]+)", "1 23"))
+print_groups(re.match(r"([\s\d]+)([\W]+)", "1  2-+="))
+print_groups(re.match(r"([\W]+)([^\W]+)([^\S]+)([^\D]+)", " a_1 23"))
diff --git a/tests/extmod/re_sub.py b/tests/extmod/re_sub.py
index 229c0e63eed3d..2c7c6c10f1a49 100644
--- a/tests/extmod/re_sub.py
+++ b/tests/extmod/re_sub.py
@@ -15,9 +15,9 @@ def multiply(m):
     return str(int(m.group(0)) * 2)
 
 
-print(re.sub("\d+", multiply, "10 20 30 40 50"))
+print(re.sub(r"\d+", multiply, "10 20 30 40 50"))
 
-print(re.sub("\d+", lambda m: str(int(m.group(0)) // 2), "10 20 30 40 50"))
+print(re.sub(r"\d+", lambda m: str(int(m.group(0)) // 2), "10 20 30 40 50"))
 
 
 def A():

From 2e852522b178e6e9b2f0cdb954ba44aa9e7d7c0d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 12:27:22 +1000
Subject: [PATCH 1099/3129] tests/extmod: Add .exp test files for
 asyncio.get_event_loop tests.

And use `asyncio.new_event_loop()` where possible.  This change is needed
because CPython 3.12 deprecated the `get_event_loop()` function.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/asyncio_get_event_loop.py     | 1 +
 tests/extmod/asyncio_get_event_loop.py.exp | 2 ++
 tests/extmod/asyncio_loop_stop.py          | 2 +-
 tests/extmod/asyncio_new_event_loop.py     | 1 +
 tests/extmod/asyncio_new_event_loop.py.exp | 6 ++++++
 5 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 tests/extmod/asyncio_get_event_loop.py.exp
 create mode 100644 tests/extmod/asyncio_new_event_loop.py.exp

diff --git a/tests/extmod/asyncio_get_event_loop.py b/tests/extmod/asyncio_get_event_loop.py
index b2d50e3cba7a0..bbc1a6b2dce95 100644
--- a/tests/extmod/asyncio_get_event_loop.py
+++ b/tests/extmod/asyncio_get_event_loop.py
@@ -1,4 +1,5 @@
 # Test get_event_loop()
+# Note: CPython deprecated get_event_loop() so this test needs a .exp
 
 try:
     import asyncio
diff --git a/tests/extmod/asyncio_get_event_loop.py.exp b/tests/extmod/asyncio_get_event_loop.py.exp
new file mode 100644
index 0000000000000..5d0fb3b2d2edd
--- /dev/null
+++ b/tests/extmod/asyncio_get_event_loop.py.exp
@@ -0,0 +1,2 @@
+start
+end
diff --git a/tests/extmod/asyncio_loop_stop.py b/tests/extmod/asyncio_loop_stop.py
index b4bd0c74ad90a..e2a4cdc1af853 100644
--- a/tests/extmod/asyncio_loop_stop.py
+++ b/tests/extmod/asyncio_loop_stop.py
@@ -34,7 +34,7 @@ async def main():
     loop.stop()
 
 
-loop = asyncio.get_event_loop()
+loop = asyncio.new_event_loop()
 loop.create_task(main())
 
 for i in range(3):
diff --git a/tests/extmod/asyncio_new_event_loop.py b/tests/extmod/asyncio_new_event_loop.py
index a3feb02126c70..5bb31f1292bb1 100644
--- a/tests/extmod/asyncio_new_event_loop.py
+++ b/tests/extmod/asyncio_new_event_loop.py
@@ -1,4 +1,5 @@
 # Test Loop.new_event_loop()
+# Note: CPython deprecated get_event_loop() so this test needs a .exp
 
 try:
     import asyncio
diff --git a/tests/extmod/asyncio_new_event_loop.py.exp b/tests/extmod/asyncio_new_event_loop.py.exp
new file mode 100644
index 0000000000000..9e104fda39c94
--- /dev/null
+++ b/tests/extmod/asyncio_new_event_loop.py.exp
@@ -0,0 +1,6 @@
+start
+task 0
+stop
+start
+task 0
+stop

From 1a2fdcac0d3f38146286e8fc3a504648f499c215 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 12:38:55 +1000
Subject: [PATCH 1100/3129] tests/basics: Split out generator.throw tests that
 pass multiple args.

The three-argument form of `.throw()` is deprecated since CPython 3.12.  So
split out into separate tests (with .exp files) the parts of the generator
tests that test more than one argument.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/gen_yield_from_throw.py          | 18 ----------
 .../basics/gen_yield_from_throw_multi_arg.py  | 34 +++++++++++++++++++
 .../gen_yield_from_throw_multi_arg.py.exp     |  8 +++++
 tests/basics/generator_throw.py               | 10 ------
 tests/basics/generator_throw_multi_arg.py     | 21 ++++++++++++
 tests/basics/generator_throw_multi_arg.py.exp |  6 ++++
 6 files changed, 69 insertions(+), 28 deletions(-)
 create mode 100644 tests/basics/gen_yield_from_throw_multi_arg.py
 create mode 100644 tests/basics/gen_yield_from_throw_multi_arg.py.exp
 create mode 100644 tests/basics/generator_throw_multi_arg.py
 create mode 100644 tests/basics/generator_throw_multi_arg.py.exp

diff --git a/tests/basics/gen_yield_from_throw.py b/tests/basics/gen_yield_from_throw.py
index 1f76e13f3c34c..063bed25e200b 100644
--- a/tests/basics/gen_yield_from_throw.py
+++ b/tests/basics/gen_yield_from_throw.py
@@ -17,24 +17,6 @@ def gen2():
 except TypeError:
     print("got TypeError from downstream!")
 
-# passing None as second argument to throw
-g = gen2()
-print(next(g))
-print(g.throw(ValueError, None))
-try:
-    print(next(g))
-except TypeError:
-    print("got TypeError from downstream!")
-
-# passing an exception instance as second argument to throw
-g = gen2()
-print(next(g))
-print(g.throw(ValueError, ValueError(123)))
-try:
-    print(next(g))
-except TypeError:
-    print("got TypeError from downstream!")
-
 # thrown value is caught and then generator returns normally
 def gen():
     try:
diff --git a/tests/basics/gen_yield_from_throw_multi_arg.py b/tests/basics/gen_yield_from_throw_multi_arg.py
new file mode 100644
index 0000000000000..86d580a6d5332
--- /dev/null
+++ b/tests/basics/gen_yield_from_throw_multi_arg.py
@@ -0,0 +1,34 @@
+# Test generator .throw() with multiple arguments.
+# Using multiple arguments is deprecated since CPython 3.12.
+
+
+def gen():
+    try:
+        yield 1
+    except ValueError as e:
+        print("got ValueError from upstream!", repr(e.args))
+    yield "str1"
+    raise TypeError
+
+
+def gen2():
+    print((yield from gen()))
+
+
+# Passing None as second argument to throw.
+g = gen2()
+print(next(g))
+print(g.throw(ValueError, None))
+try:
+    print(next(g))
+except TypeError:
+    print("got TypeError from downstream!")
+
+# Passing an exception instance as second argument to throw.
+g = gen2()
+print(next(g))
+print(g.throw(ValueError, ValueError(123)))
+try:
+    print(next(g))
+except TypeError:
+    print("got TypeError from downstream!")
diff --git a/tests/basics/gen_yield_from_throw_multi_arg.py.exp b/tests/basics/gen_yield_from_throw_multi_arg.py.exp
new file mode 100644
index 0000000000000..218e332e5017a
--- /dev/null
+++ b/tests/basics/gen_yield_from_throw_multi_arg.py.exp
@@ -0,0 +1,8 @@
+1
+got ValueError from upstream! ()
+str1
+got TypeError from downstream!
+1
+got ValueError from upstream! (123,)
+str1
+got TypeError from downstream!
diff --git a/tests/basics/generator_throw.py b/tests/basics/generator_throw.py
index 067ab2b8eb2a1..536f500823647 100644
--- a/tests/basics/generator_throw.py
+++ b/tests/basics/generator_throw.py
@@ -41,13 +41,3 @@ def gen():
 g = gen()
 print(next(g))
 print(g.throw(GeneratorExit()))
-
-# thrown an instance with None as second arg
-g = gen()
-print(next(g))
-print(g.throw(GeneratorExit(), None))
-
-# thrown a class and instance
-g = gen()
-print(next(g))
-print(g.throw(GeneratorExit, GeneratorExit(123)))
diff --git a/tests/basics/generator_throw_multi_arg.py b/tests/basics/generator_throw_multi_arg.py
new file mode 100644
index 0000000000000..acdb6a06c96d0
--- /dev/null
+++ b/tests/basics/generator_throw_multi_arg.py
@@ -0,0 +1,21 @@
+# Test generator .throw() with multiple arguments.
+# Using multiple arguments is deprecated since CPython 3.12.
+
+# Generator ignores a thrown GeneratorExit (this is allowed).
+def gen():
+    try:
+        yield 123
+    except GeneratorExit as e:
+        print("GeneratorExit", repr(e.args))
+    yield 456
+
+
+# Thrown an instance with None as second arg.
+g = gen()
+print(next(g))
+print(g.throw(GeneratorExit(), None))
+
+# Thrown a class and instance.
+g = gen()
+print(next(g))
+print(g.throw(GeneratorExit, GeneratorExit(123)))
diff --git a/tests/basics/generator_throw_multi_arg.py.exp b/tests/basics/generator_throw_multi_arg.py.exp
new file mode 100644
index 0000000000000..6e976eab1db23
--- /dev/null
+++ b/tests/basics/generator_throw_multi_arg.py.exp
@@ -0,0 +1,6 @@
+123
+GeneratorExit ()
+456
+123
+GeneratorExit (123,)
+456

From e1111d873aaa342df9e0b121cacf9f5184e41a58 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 11:46:56 +1000
Subject: [PATCH 1101/3129] tests/net_hosted/ssl_verify_callback.py: Make exp
 match actual output.

The `cert` argument passed to the verify callback is actually a memoryview.
And the `depth` argument seems to start at 1 for the tested URL.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_hosted/ssl_verify_callback.py.exp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/net_hosted/ssl_verify_callback.py.exp b/tests/net_hosted/ssl_verify_callback.py.exp
index e27dcbb9d5f70..e4564ce5abaa9 100644
--- a/tests/net_hosted/ssl_verify_callback.py.exp
+++ b/tests/net_hosted/ssl_verify_callback.py.exp
@@ -1,5 +1,4 @@
-verify_callback: <class 'bytes'> True 2
-verify_callback: <class 'bytes'> True 1
-verify_callback: <class 'bytes'> True 0
-verify_callback_fail: <class 'bytes'> True 2
+verify_callback: <class 'memoryview'> True 1
+verify_callback: <class 'memoryview'> True 0
+verify_callback_fail: <class 'memoryview'> True 1
 MBEDTLS_ERR_ERROR_GENERIC_ERROR

From a34b5d1b7950a01582e20f2ec602d08794c2a83e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 13:56:04 +1000
Subject: [PATCH 1102/3129] tests/net_inet/tls_text_errors.py: Tweak test for
 newer CPython version.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/tls_text_errors.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/net_inet/tls_text_errors.py b/tests/net_inet/tls_text_errors.py
index 034cc8d36e7aa..f7c8014d75c28 100644
--- a/tests/net_inet/tls_text_errors.py
+++ b/tests/net_inet/tls_text_errors.py
@@ -17,10 +17,12 @@ def test(addr):
         # mbedtls produces "mbedtls -0x7200: SSL - An invalid SSL record was received"
         # axtls produces "RECORD_OVERFLOW" but also prints "TLS buffer overflow,..."
         # CPython produces "[SSL: WRONG_VERSION_NUMBER] wrong version number (_ssl.c:1108)"
+        # CPython newer version produces "[SSL] record layer failure (_ssl.c:1000)"
         ok = (
             "SSL_INVALID_RECORD" in str(e)
             or "RECORD_OVERFLOW" in str(e)
             or "wrong version" in str(e)
+            or "record layer failure" in str(e)
         )
         print("wrap:", ok)
         if not ok:

From 03cf4d4980af604ebae6928f51a311b53d98e2c8 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sun, 26 May 2024 19:39:26 +1000
Subject: [PATCH 1103/3129] rp2/boards/W5500_EVB_PICO: Update incorrect url in
 board.json.

Fixes issue #15122.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/rp2/boards/W5500_EVB_PICO/board.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/boards/W5500_EVB_PICO/board.json b/ports/rp2/boards/W5500_EVB_PICO/board.json
index 93598255599bf..e7625c343698e 100644
--- a/ports/rp2/boards/W5500_EVB_PICO/board.json
+++ b/ports/rp2/boards/W5500_EVB_PICO/board.json
@@ -15,6 +15,6 @@
     "mcu": "rp2040",
     "product": "Wiznet W5500-EVB-Pico",
     "thumbnail": "",
-    "url": "https://www.wiznet.io/product-item/w5500-evb-pico/",
+    "url": "https://docs.wiznet.io/Product/iEthernet/W5500/w5500-evb-pico",
     "vendor": "Wiznet"
 }

From 8a8c65f309a39e99b3bd5a74c5da313d8a5ec5fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 16:05:31 +1000
Subject: [PATCH 1104/3129] lib/micropython-lib: Update submodule to latest.

This brings in:
- fixes to: aiohttp, tarfile, lora, gzip
- fixes and improvements to aioble
- deprecation of cbor2 decoder and encoder modules
- new usb package
- new pyusb 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 ddb1a279578bf..50ed36fbeb919 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit ddb1a279578bfff8c1b18aff3baa668620684f64
+Subproject commit 50ed36fbeb919753bcc26ce13a8cffd7691d06ef

From 5f6e6891245c5c766801bb6c0a62395fefae132c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 May 2024 23:39:16 +1000
Subject: [PATCH 1105/3129] LICENSE,docs: Update copyright year range to
 include 2024.

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 9142c46045846..469ae1927396d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2023 Damien P. George
+Copyright (c) 2013-2024 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 728e3c4285d82..32cc2be10e343 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,7 +68,7 @@
 
 # General information about the project.
 project = "MicroPython"
-copyright = "- The MicroPython Documentation is Copyright © 2014-2023, Damien P. George, Paul Sokolovsky, and contributors"
+copyright = "- The MicroPython Documentation is Copyright © 2014-2024, 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 ad6750b22ef160a233acf0fbf52619d13bcf273e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 28 May 2024 10:49:22 +1000
Subject: [PATCH 1106/3129] tests/float: Use "not" instead of ~ to invert bool
 value.

Otherwise CPython gives a deprecation warning.

This test is not actually testing inversion of bools, rather that bit of
the test is used to compute the pass/fail result.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/float2int_doubleprec_intbig.py | 2 +-
 tests/float/float2int_fp30_intbig.py       | 2 +-
 tests/float/float2int_intbig.py            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/float/float2int_doubleprec_intbig.py b/tests/float/float2int_doubleprec_intbig.py
index 402966cace271..565698d8770b5 100644
--- a/tests/float/float2int_doubleprec_intbig.py
+++ b/tests/float/float2int_doubleprec_intbig.py
@@ -59,7 +59,7 @@
 def fp2int_test(num, name, should_fail):
     try:
         x = int(num)
-        passed = ~should_fail
+        passed = not should_fail
     except:
         passed = should_fail
     print("%s: %s" % (name, passed and "passed" or "failed"))
diff --git a/tests/float/float2int_fp30_intbig.py b/tests/float/float2int_fp30_intbig.py
index 1b22fe9646f5a..eb65f89502512 100644
--- a/tests/float/float2int_fp30_intbig.py
+++ b/tests/float/float2int_fp30_intbig.py
@@ -56,7 +56,7 @@
 def fp2int_test(num, name, should_fail):
     try:
         x = int(num)
-        passed = ~should_fail
+        passed = not should_fail
     except:
         passed = should_fail
     print("%s: %s" % (name, passed and "passed" or "failed"))
diff --git a/tests/float/float2int_intbig.py b/tests/float/float2int_intbig.py
index d047f247f2777..17414501c619f 100644
--- a/tests/float/float2int_intbig.py
+++ b/tests/float/float2int_intbig.py
@@ -59,7 +59,7 @@
 def fp2int_test(num, name, should_fail):
     try:
         x = int(num)
-        passed = ~should_fail
+        passed = not should_fail
     except:
         passed = should_fail
     print("%s: %s" % (name, passed and "passed" or "failed"))

From dd4767a7d1ba57f107a652310fdfbd0f0274a0c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 28 May 2024 10:50:57 +1000
Subject: [PATCH 1107/3129] tests/basics: Add .exp file for slice_op test.

CPython 3.12 implemented hashing for slices, so now differs to MicroPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/slice_op.py     | 2 ++
 tests/basics/slice_op.py.exp | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 tests/basics/slice_op.py.exp

diff --git a/tests/basics/slice_op.py b/tests/basics/slice_op.py
index f1e83c5e27dca..0bb6e365bfd85 100644
--- a/tests/basics/slice_op.py
+++ b/tests/basics/slice_op.py
@@ -1,3 +1,5 @@
+# Test slice unary operations.
+# CPython allows hashing slices, but MicroPython does not.
 
 try:
     t = [][:]
diff --git a/tests/basics/slice_op.py.exp b/tests/basics/slice_op.py.exp
new file mode 100644
index 0000000000000..6002b71c56ea0
--- /dev/null
+++ b/tests/basics/slice_op.py.exp
@@ -0,0 +1 @@
+TypeError

From 30a9ccf4caa72c62cb8656a1572518fef34b08a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 28 May 2024 10:52:12 +1000
Subject: [PATCH 1108/3129] tests/basics: Move str/bytes tests that give
 SyntaxWarning to sep file.

In CPython 3.12 these invalid str/bytes/fstring escapes will issue a
SyntaxWarning, and so differ to MicroPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/bytes.py                      |  1 -
 tests/basics/bytes_escape_unicode.py       |  3 +++
 tests/basics/bytes_escape_unicode.py.exp   |  1 +
 tests/basics/string1.py                    |  1 -
 tests/basics/string_escape_invalid.py      |  4 ++++
 tests/basics/string_escape_invalid.py.exp  |  1 +
 tests/basics/string_fstring.py             | 15 ---------------
 tests/basics/string_fstring_invalid.py     | 13 +++++++++++++
 tests/basics/string_fstring_invalid.py.exp |  4 ++++
 9 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 tests/basics/bytes_escape_unicode.py
 create mode 100644 tests/basics/bytes_escape_unicode.py.exp
 create mode 100644 tests/basics/string_escape_invalid.py
 create mode 100644 tests/basics/string_escape_invalid.py.exp
 create mode 100644 tests/basics/string_fstring_invalid.py
 create mode 100644 tests/basics/string_fstring_invalid.py.exp

diff --git a/tests/basics/bytes.py b/tests/basics/bytes.py
index 0b6b14fa55bb2..ba14c26da8dea 100644
--- a/tests/basics/bytes.py
+++ b/tests/basics/bytes.py
@@ -2,7 +2,6 @@
 print(b'123')
 print(br'123')
 print(rb'123')
-print(b'\u1234')
 
 # construction
 print(bytes())
diff --git a/tests/basics/bytes_escape_unicode.py b/tests/basics/bytes_escape_unicode.py
new file mode 100644
index 0000000000000..1e450696f4f4f
--- /dev/null
+++ b/tests/basics/bytes_escape_unicode.py
@@ -0,0 +1,3 @@
+# Coverage test for unicode escape in a bytes literal.
+# CPython issues a SyntaxWarning for this.
+print(b"\u1234")
diff --git a/tests/basics/bytes_escape_unicode.py.exp b/tests/basics/bytes_escape_unicode.py.exp
new file mode 100644
index 0000000000000..6affe51896eb1
--- /dev/null
+++ b/tests/basics/bytes_escape_unicode.py.exp
@@ -0,0 +1 @@
+b'\\u1234'
diff --git a/tests/basics/string1.py b/tests/basics/string1.py
index b3abfb9c608bd..ca8dfd5399a5d 100644
--- a/tests/basics/string1.py
+++ b/tests/basics/string1.py
@@ -5,7 +5,6 @@
 print(r'abc')
 print(u'abc')
 print(repr('\a\b\t\n\v\f\r'))
-print('\z') # unrecognised escape char
 
 # construction
 print(str())
diff --git a/tests/basics/string_escape_invalid.py b/tests/basics/string_escape_invalid.py
new file mode 100644
index 0000000000000..d9fdd6e546588
--- /dev/null
+++ b/tests/basics/string_escape_invalid.py
@@ -0,0 +1,4 @@
+# Test invalid escape characters.
+# CPython issues a SyntaxWarning for this.
+
+print("\z")
diff --git a/tests/basics/string_escape_invalid.py.exp b/tests/basics/string_escape_invalid.py.exp
new file mode 100644
index 0000000000000..c642929c6e846
--- /dev/null
+++ b/tests/basics/string_escape_invalid.py.exp
@@ -0,0 +1 @@
+\z
diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
index 1a3960680e4f8..42d093b37b508 100644
--- a/tests/basics/string_fstring.py
+++ b/tests/basics/string_fstring.py
@@ -29,21 +29,6 @@ def foo(a, b):
 # 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.
-
-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'{{}}')
diff --git a/tests/basics/string_fstring_invalid.py b/tests/basics/string_fstring_invalid.py
new file mode 100644
index 0000000000000..6fce323c5bce4
--- /dev/null
+++ b/tests/basics/string_fstring_invalid.py
@@ -0,0 +1,13 @@
+# 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")
diff --git a/tests/basics/string_fstring_invalid.py.exp b/tests/basics/string_fstring_invalid.py.exp
new file mode 100644
index 0000000000000..bcb7f259e5567
--- /dev/null
+++ b/tests/basics/string_fstring_invalid.py.exp
@@ -0,0 +1,4 @@
+\
+#
+SyntaxError
+SyntaxError

From a61c446c0b34e82aeb54b9770250d267656f2b7f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 31 May 2024 14:19:55 +1000
Subject: [PATCH 1109/3129] all: Bump version to 1.23.0.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 1aa3e06994d3f..0ea52b1d8bbad 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -32,7 +32,7 @@
 #define MICROPY_VERSION_MAJOR 1
 #define MICROPY_VERSION_MINOR 23
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 1
+#define MICROPY_VERSION_PRERELEASE 0
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 2926001b60fb5060727f3d8034c84cfb014a5dca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 31 May 2024 16:35:27 +1000
Subject: [PATCH 1110/3129] all: Bump version to 1.24.0-preview.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 0ea52b1d8bbad..61cfe96da8027 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -30,9 +30,9 @@
 // as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
 // are unavailable.
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 23
+#define MICROPY_VERSION_MINOR 24
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 0
+#define MICROPY_VERSION_PRERELEASE 1
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 74fb42aa82d537b6fefb463907274bd660c6ce8d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 2 Jan 2024 12:19:33 +1100
Subject: [PATCH 1111/3129] rp2: Refactor soft timer to use hardware timer
 alarm.

Progress towards removing pico-sdk alarm pool, due to a known issue.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/main.c           |  2 ++
 ports/rp2/mpconfigport.h   |  4 ++++
 ports/rp2/mphalport.c      | 28 ++++++++++++++++------------
 ports/rp2/mpnetworkport.c  |  2 +-
 ports/rp2/pendsv.h         |  3 +++
 shared/runtime/softtimer.h |  3 +++
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 40374faff92e3..668017668a28b 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -76,6 +76,8 @@ int main(int argc, char **argv) {
     // This is a tickless port, interrupts should always trigger SEV.
     SCB->SCR |= SCB_SCR_SEVONPEND_Msk;
 
+    soft_timer_init();
+
     #if MICROPY_HW_ENABLE_UART_REPL
     bi_decl(bi_program_feature("UART REPL"))
     setup_default_uart();
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index a29692d0be071..6ef994bb83272 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -154,6 +154,10 @@
 #define MICROPY_SSL_MBEDTLS                     (1)
 #define MICROPY_PY_LWIP_SOCK_RAW                (MICROPY_PY_LWIP)
 
+// Hardware timer alarm index. Available range 0-3.
+// Number 3 is currently used by pico-sdk (PICO_TIME_DEFAULT_ALARM_POOL_HARDWARE_ALARM_NUM)
+#define MICROPY_HW_SOFT_TIMER_ALARM_NUM         (2)
+
 // fatfs configuration
 #define MICROPY_FATFS_ENABLE_LFN                (1)
 #define MICROPY_FATFS_LFN_CODE_PAGE             437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 1641eadb7b696..ac3a70822a2c6 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -35,6 +35,7 @@
 #include "pendsv.h"
 #include "tusb.h"
 #include "uart.h"
+#include "hardware/irq.h"
 #include "hardware/rtc.h"
 #include "pico/unique_id.h"
 
@@ -46,8 +47,6 @@
 // microseconds since the Epoch.
 static uint64_t time_us_64_offset_from_epoch;
 
-static alarm_id_t soft_timer_alarm_id = 0;
-
 #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
@@ -273,21 +272,26 @@ uint32_t storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blo
     panic_unsupported();
 }
 
-static int64_t soft_timer_callback(alarm_id_t id, void *user_data) {
-    soft_timer_alarm_id = 0;
-    pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
-    return 0; // don't reschedule this alarm
-}
-
 uint32_t soft_timer_get_ms(void) {
     return mp_hal_ticks_ms();
 }
 
 void soft_timer_schedule_at_ms(uint32_t ticks_ms) {
-    if (soft_timer_alarm_id != 0) {
-        cancel_alarm(soft_timer_alarm_id);
-    }
     int32_t ms = soft_timer_ticks_diff(ticks_ms, mp_hal_ticks_ms());
     ms = MAX(0, ms);
-    soft_timer_alarm_id = add_alarm_in_ms(ms, soft_timer_callback, NULL, true);
+    if (hardware_alarm_set_target(MICROPY_HW_SOFT_TIMER_ALARM_NUM, delayed_by_ms(get_absolute_time(), ms))) {
+        // "missed" hardware alarm target
+        hardware_alarm_force_irq(MICROPY_HW_SOFT_TIMER_ALARM_NUM);
+    }
+}
+
+static void soft_timer_hardware_callback(unsigned int alarm_num) {
+    // The timer alarm ISR needs to call here and trigger PendSV dispatch via
+    // a second ISR, as PendSV may be currently suspended by the other CPU.
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+}
+
+void soft_timer_init(void) {
+    hardware_alarm_claim(MICROPY_HW_SOFT_TIMER_ALARM_NUM);
+    hardware_alarm_set_callback(MICROPY_HW_SOFT_TIMER_ALARM_NUM, soft_timer_hardware_callback);
 }
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 09a543c2db34f..4690a4e511024 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -66,7 +66,7 @@ static void gpio_irq_handler(void) {
 void cyw43_irq_init(void) {
     gpio_add_raw_irq_handler_with_order_priority(CYW43_PIN_WL_HOST_WAKE, gpio_irq_handler, CYW43_SHARED_IRQ_HANDLER_PRIORITY);
     irq_set_enabled(IO_IRQ_BANK0, true);
-    NVIC_SetPriority(PendSV_IRQn, PICO_LOWEST_IRQ_PRIORITY);
+    NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
 }
 
 void cyw43_post_poll_hook(void) {
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
index bc8e8d61c8c0f..c9bdb27637507 100644
--- a/ports/rp2/pendsv.h
+++ b/ports/rp2/pendsv.h
@@ -42,6 +42,9 @@ enum {
 
 #define PENDSV_DISPATCH_NUM_SLOTS PENDSV_DISPATCH_MAX
 
+// PendSV IRQ priority, to run system-level tasks that preempt the main thread.
+#define IRQ_PRI_PENDSV PICO_LOWEST_IRQ_PRIORITY
+
 typedef void (*pendsv_dispatch_t)(void);
 
 void pendsv_suspend(void);
diff --git a/shared/runtime/softtimer.h b/shared/runtime/softtimer.h
index fe5d02b90787b..6921c9f47d66a 100644
--- a/shared/runtime/softtimer.h
+++ b/shared/runtime/softtimer.h
@@ -81,6 +81,9 @@ static inline void soft_timer_reinsert(soft_timer_entry_t *entry, uint32_t initi
 //   pend-SV IRQ level, or equivalent.
 uint32_t soft_timer_get_ms(void);
 void soft_timer_schedule_at_ms(uint32_t ticks_ms);
+
+// Optional port-specific initialisation function (provided and called by the port if needed).
+void soft_timer_init(void);
 #endif
 
 #endif // MICROPY_INCLUDED_SHARED_RUNTIME_SOFTTIMER_H

From 83e82c5ad3fb9e8796d786e01509d264cfb205d3 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 2 Jan 2024 16:35:27 +1100
Subject: [PATCH 1112/3129] rp2: Refactor to not use pico-sdk alarm pool
 functions for sleeping.

The best_effort_wfe_or_timeout() and sleep_us() pico-sdk functions use the
pico-sdk alarm pool internally, and that has a bug.

Some usages inside pico-sdk (notably multicore_lockout_start_blocking())
will still end up calling best_effort_wfe_or_timeout(), although usually
with "end_of_time" as the timeout value so it should avoid any alarm pool
race conditions.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mphalport.c      | 40 ++++++++++++++++++++++++++++++++------
 ports/rp2/mphalport.h      |  9 ++++-----
 shared/runtime/softtimer.c |  2 +-
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index ac3a70822a2c6..a13a0edc30093 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -198,17 +198,31 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     return did_write ? ret : 0;
 }
 
+void mp_hal_delay_us(mp_uint_t us) {
+    // Avoid calling sleep_us() and invoking the alarm pool by splitting long
+    // sleeps into an optional longer sleep and a shorter busy-wait
+    uint64_t end = time_us_64() + us;
+    if (us > 1000) {
+        mp_hal_delay_ms(us / 1000);
+    }
+    while (time_us_64() < end) {
+        // Tight loop busy-wait for accurate timing
+    }
+}
+
 void mp_hal_delay_ms(mp_uint_t ms) {
-    absolute_time_t t = make_timeout_time_ms(ms);
+    mp_uint_t start = mp_hal_ticks_ms();
+    mp_uint_t elapsed = 0;
     do {
-        mp_event_handle_nowait();
-    } while (!best_effort_wfe_or_timeout(t));
+        mp_event_wait_ms(ms - elapsed);
+        elapsed = mp_hal_ticks_ms() - start;
+    } while (elapsed < ms);
 }
 
 void mp_hal_time_ns_set_from_rtc(void) {
-    // Delay at least one RTC clock cycle so it's registers have updated with the most
-    // recent time settings.
-    sleep_us(23);
+    // Outstanding RTC register writes need at least two RTC clock cycles to
+    // update. (See RP2040 datasheet section 4.8.4 "Reference clock").
+    mp_hal_delay_us(44);
 
     // Sample RTC and time_us_64() as close together as possible, so the offset
     // calculated for the latter can be as accurate as possible.
@@ -295,3 +309,17 @@ void soft_timer_init(void) {
     hardware_alarm_claim(MICROPY_HW_SOFT_TIMER_ALARM_NUM);
     hardware_alarm_set_callback(MICROPY_HW_SOFT_TIMER_ALARM_NUM, soft_timer_hardware_callback);
 }
+
+void mp_wfe_or_timeout(uint32_t timeout_ms) {
+    soft_timer_entry_t timer;
+
+    // Note the timer doesn't have an associated callback, it just exists to create a
+    // hardware interrupt to wake the CPU
+    soft_timer_static_init(&timer, SOFT_TIMER_MODE_ONE_SHOT, 0, NULL);
+    soft_timer_insert(&timer, timeout_ms);
+
+    __wfe();
+
+    // Clean up the timer node if it's not already
+    soft_timer_remove(&timer);
+}
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index d2d74d783a628..bc09f8c4a572f 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -62,23 +62,22 @@
         if ((TIMEOUT_MS) < 0) { \
             __wfe(); \
         } else { \
-            best_effort_wfe_or_timeout(make_timeout_time_ms(TIMEOUT_MS)); \
+            mp_wfe_or_timeout(TIMEOUT_MS); \
         } \
     } while (0)
 
 extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
+// Port-specific function to create a wakeup interrupt after timeout_ms and enter WFE
+void mp_wfe_or_timeout(uint32_t timeout_ms);
+
 uint32_t mp_thread_begin_atomic_section(void);
 void mp_thread_end_atomic_section(uint32_t);
 
 void mp_hal_set_interrupt_char(int c);
 void mp_hal_time_ns_set_from_rtc(void);
 
-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);
 }
diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
index 13a6e78777ef4..92a0d6d511100 100644
--- a/shared/runtime/softtimer.c
+++ b/shared/runtime/softtimer.c
@@ -89,7 +89,7 @@ void soft_timer_handler(void) {
         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 {
+        } else if (entry->c_callback) {
             entry->c_callback(entry);
         }
         if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {

From 3af006efb39ad0b7aa7c0401c93329b654bca617 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 10 Jan 2024 11:36:17 +1100
Subject: [PATCH 1113/3129] rp2: Support calling pendsv_suspend/resume from
 core 1.

Previously, this was subject to races incrementing/decrementing
the counter variable pendsv_lock.

Technically, all that's needed here would be to make pendsv_lock an atomic
counter.

This implementation fulfils a stronger guarantee: it also provides mutual
exclusion for the core which calls pendsv_suspend(). This is because the
current use of pendsv_suspend/resume in MicroPython is to ensure exclusive
access to softtimer data structures, and this does require mutual
exclusion.

The conceptually cleaner implementation would split the mutual exclusion
part out into a softtimer-specific spinlock, but this increases the
complexity and doesn't seem like it makes for a better implementation in
the long run.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/main.c   |  1 +
 ports/rp2/pendsv.c | 32 +++++++++++++++++++++++++-------
 ports/rp2/pendsv.h |  1 +
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 668017668a28b..5fb47cc4028ef 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -76,6 +76,7 @@ int main(int argc, char **argv) {
     // This is a tickless port, interrupts should always trigger SEV.
     SCB->SCR |= SCB_SCR_SEVONPEND_Msk;
 
+    pendsv_init();
     soft_timer_init();
 
     #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index e4f662715f1c1..d24b4cb0122b3 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -25,6 +25,7 @@
  */
 
 #include <assert.h>
+#include "pico/mutex.h"
 #include "py/mpconfig.h"
 #include "pendsv.h"
 #include "RP2040.h"
@@ -34,15 +35,21 @@
 #endif
 
 static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
-static int pendsv_lock;
+static recursive_mutex_t pendsv_mutex;
+
+void pendsv_init(void) {
+    recursive_mutex_init(&pendsv_mutex);
+}
 
 void pendsv_suspend(void) {
-    pendsv_lock++;
+    // Recursive Mutex here as either core may call pendsv_suspend() and expect
+    // both mutual exclusion (other core can't enter pendsv_suspend() at the
+    // same time), and that no PendSV handler will run.
+    recursive_mutex_enter_blocking(&pendsv_mutex);
 }
 
 void pendsv_resume(void) {
-    pendsv_lock--;
-    assert(pendsv_lock >= 0);
+    recursive_mutex_exit(&pendsv_mutex);
     // 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;
@@ -55,9 +62,11 @@ void pendsv_resume(void) {
 }
 
 void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
-    assert(pendsv_lock >= 0);
     pendsv_dispatch_table[slot] = f;
-    if (pendsv_lock == 0) {
+    if (pendsv_mutex.enter_count == 0) {
+        // There is a race here where other core calls pendsv_suspend() before
+        // ISR can execute, but dispatch will happen later when other core
+        // calls pendsv_resume().
         SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
     } else {
         #if MICROPY_PY_NETWORK_CYW43
@@ -68,7 +77,14 @@ void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
 
 // PendSV interrupt handler to perform background processing.
 void PendSV_Handler(void) {
-    assert(pendsv_lock == 0);
+
+    if (!recursive_mutex_try_enter(&pendsv_mutex, NULL)) {
+        // Failure here means core 1 holds pendsv_mutex. ISR will
+        // run again after core 1 calls pendsv_resume().
+        return;
+    }
+    // Core 0 should not already have locked pendsv_mutex
+    assert(pensv_mutex.enter_count == 1);
 
     #if MICROPY_PY_NETWORK_CYW43
     CYW43_STAT_INC(PENDSV_RUN_COUNT);
@@ -81,4 +97,6 @@ void PendSV_Handler(void) {
             f();
         }
     }
+
+    recursive_mutex_exit(&pendsv_mutex);
 }
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
index c9bdb27637507..a5d9440211a10 100644
--- a/ports/rp2/pendsv.h
+++ b/ports/rp2/pendsv.h
@@ -47,6 +47,7 @@ enum {
 
 typedef void (*pendsv_dispatch_t)(void);
 
+void pendsv_init(void);
 void pendsv_suspend(void);
 void pendsv_resume(void);
 void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f);

From 3613ad96244ecaa67e8d45b637dc6b24fd2942be Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 9 May 2024 06:33:57 +0200
Subject: [PATCH 1114/3129] lib/libm: Do not force floating point type size
 evaluation.

Since C99, `FLT_EVAL_METHOD` should be left for the compiler/libc to
define.  Its redefinition breaks compilation with picolibc as the
target's libc, since it defines said symbol in math.h before the libm
define is evaluated by the compiler.

In its place, there is a check to make sure floating point type sizes
are what are expected to be, triggering a compilation error if those
assumptions are no longer valid.

Co-authored-by: Angus Gratton <angus@redyak.com.au>
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 lib/libm/libm.h     | 5 ++++-
 lib/libm_dbl/libm.h | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/libm/libm.h b/lib/libm/libm.h
index f782249e53465..78de4c3ee4b0f 100644
--- a/lib/libm/libm.h
+++ b/lib/libm/libm.h
@@ -19,7 +19,10 @@
 #include <stdint.h>
 #include <math.h>
 
-#define FLT_EVAL_METHOD 0
+// These lines verify that FLT_EVAL_METHOD==0, MicroPython's libm requires this.
+// If compilation fails here then check the host compiler's FLT_EVAL_METHOD.
+typedef float float_t;
+typedef double double_t;
 
 #define FORCE_EVAL(x) do {                        \
 	if (sizeof(x) == sizeof(float)) {         \
diff --git a/lib/libm_dbl/libm.h b/lib/libm_dbl/libm.h
index dc0b431a44857..cbae6916625e2 100644
--- a/lib/libm_dbl/libm.h
+++ b/lib/libm_dbl/libm.h
@@ -15,7 +15,10 @@
 #include <stdint.h>
 #include <math.h>
 
-#define FLT_EVAL_METHOD 0
+// These lines verify that FLT_EVAL_METHOD==0, MicroPython's libm requires this.
+// If compilation fails here then check the host compiler's FLT_EVAL_METHOD.
+typedef float float_t;
+typedef double double_t;
 
 #define FORCE_EVAL(x) do {                        \
 	if (sizeof(x) == sizeof(float)) {         \

From c98789a6d8e05acb608afe4b30cf3ca563419b2d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 10 May 2024 22:20:11 +1000
Subject: [PATCH 1115/3129] shared/tinyusb: Add common CDC TX/RX functions.

There are a few TinyUSB CDC functions used for stdio that are currently
replicated across a number of ports.  Not surprisingly in a couple of cases
these have started to diverge slightly, with additional features added to
one of them.

This commit consolidates a couple of key shared functions used directly by
TinyUSB based ports, and makes those functions available to all.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 .../ARDUINO_NANO_ESP32/mpconfigboard.cmake    |   2 +-
 ports/nrf/Makefile                            |   2 +-
 ports/renesas-ra/Makefile                     |   2 +-
 ports/rp2/CMakeLists.txt                      |   2 +-
 ports/samd/Makefile                           |   2 +-
 shared/tinyusb/mp_usbd_cdc.c                  | 153 ++++++++++++++++++
 .../{mp_cdc_common.c => mp_usbd_cdc.h}        |  41 ++---
 7 files changed, 168 insertions(+), 36 deletions(-)
 create mode 100644 shared/tinyusb/mp_usbd_cdc.c
 rename shared/tinyusb/{mp_cdc_common.c => mp_usbd_cdc.h} (55%)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
index 40456f7c0b8a9..d7db192ca43f5 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
@@ -18,7 +18,7 @@ set(SDKCONFIG_DEFAULTS
 set(MICROPY_SOURCE_BOARD
     ${MICROPY_BOARD_DIR}/board_init.c
     ${MICROPY_BOARD_DIR}/double_tap.c
-    ${MICROPY_DIR}/shared/tinyusb/mp_cdc_common.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
 )
 
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 4fe921f0fad88..1691719dbb1b1 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -185,7 +185,7 @@ SRC_SHARED_C += $(addprefix shared/,\
 	runtime/pyexec.c \
 	runtime/sys_stdio_mphal.c \
 	runtime/interrupt_char.c \
-	tinyusb/mp_cdc_common.c \
+	tinyusb/mp_usbd_cdc.c \
 	timeutils/timeutils.c \
 	)
 
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index b4b9733182bc0..3a9abf7246516 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -174,8 +174,8 @@ SHARED_SRC_C += $(addprefix shared/,\
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
-	tinyusb/mp_cdc_common.c \
 	tinyusb/mp_usbd.c \
+	tinyusb/mp_usbd_cdc.c \
 	tinyusb/mp_usbd_descriptor.c \
 	)
 
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index fcc435b7b9f34..f86224a5c0672 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -105,8 +105,8 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/runtime/softtimer.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
-    ${MICROPY_DIR}/shared/tinyusb/mp_cdc_common.c
     ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
     ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
     ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c
 )
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index b678cd9828c6b..487a9cb38bbce 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -133,8 +133,8 @@ SHARED_SRC_C += \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
-	shared/tinyusb/mp_cdc_common.c \
 	shared/tinyusb/mp_usbd.c \
+	shared/tinyusb/mp_usbd_cdc.c \
 	shared/tinyusb/mp_usbd_descriptor.c \
 	shared/tinyusb/mp_usbd_runtime.c \
 
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
new file mode 100644
index 0000000000000..4135cd720fef5
--- /dev/null
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -0,0 +1,153 @@
+/*
+ * 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 "py/mpconfig.h"
+#include "py/stream.h"
+#include "extmod/modmachine.h"
+
+#if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV
+#include "tusb.h"
+#include "device/usbd.h"
+
+#include "mp_usbd_cdc.h"
+#include "mp_usbd.h"
+
+static uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
+
+uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if (!cdc_itf_pending) {
+        // Explicitly run the USB stack as the scheduler may be locked (eg we are in
+        // an interrupt handler) while there is data pending.
+        mp_usbd_task();
+    }
+
+    // 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;
+                }
+            }
+        }
+    }
+    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    if ((poll_flags & MP_STREAM_POLL_WR) && tud_cdc_connected() && tud_cdc_write_available() > 0) {
+        // When connected operate as blocking, only allow if space is available.
+        ret |= MP_STREAM_POLL_WR;
+    }
+    return ret;
+}
+
+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;
+        }
+    }
+}
+
+mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
+    size_t i = 0;
+    if (tud_cdc_connected()) {
+        while (i < len) {
+            uint32_t n = len - i;
+            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
+                n = CFG_TUD_CDC_EP_BUFSIZE;
+            }
+            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) {
+                mp_event_wait_ms(1);
+
+                // Explicitly run the USB stack as the scheduler may be locked (eg we
+                // are in an interrupt handler), while there is data pending.
+                mp_usbd_task();
+            }
+            if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+                break;
+            }
+            uint32_t n2 = tud_cdc_write(str + i, n);
+            tud_cdc_write_flush();
+            i += n2;
+        }
+    }
+    return i;
+}
+
+#if MICROPY_HW_USB_CDC_1200BPS_TOUCH && MICROPY_HW_ENABLE_USBDEV
+
+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
+#if MICROPY_HW_USB_EXTERNAL_TINYUSB
+mp_usbd_line_state_cb
+#else
+tud_cdc_line_state_cb
+#endif
+    (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
+#endif
diff --git a/shared/tinyusb/mp_cdc_common.c b/shared/tinyusb/mp_usbd_cdc.h
similarity index 55%
rename from shared/tinyusb/mp_cdc_common.c
rename to shared/tinyusb/mp_usbd_cdc.h
index e790646f4f86d..f84cf8d03e5a2 100644
--- a/shared/tinyusb/mp_cdc_common.c
+++ b/shared/tinyusb/mp_usbd_cdc.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ * 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,37 +24,16 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "extmod/modmachine.h"
+#ifndef MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H
+#define MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H
 
-#if MICROPY_HW_USB_CDC_1200BPS_TOUCH && MICROPY_HW_ENABLE_USBDEV
-
-#include "tusb.h"
+#ifndef MICROPY_HW_USB_CDC_TX_TIMEOUT
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
+#endif
 
-static mp_sched_node_t mp_bootloader_sched_node;
+uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags);
+void tud_cdc_rx_cb(uint8_t itf);
+mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len);
 
-static void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
-    mp_hal_delay_ms(250);
-    machine_bootloader(0, NULL);
-}
 
-void
-#if MICROPY_HW_USB_EXTERNAL_TINYUSB
-mp_usbd_line_state_cb
-#else
-tud_cdc_line_state_cb
-#endif
-    (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
+#endif // MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H

From 1eaa562fdf2a7472991bbfe2d2bc0e8d0b11bb28 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 10 May 2024 22:23:05 +1000
Subject: [PATCH 1116/3129] rp2/mphalport: Refactor to use shared TinyUSB CDC
 functions.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/rp2/mphalport.c | 89 ++++---------------------------------------
 1 file changed, 7 insertions(+), 82 deletions(-)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index a13a0edc30093..3fe5357c89664 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -32,6 +32,7 @@
 #include "shared/runtime/softtimer.h"
 #include "shared/timeutils/timeutils.h"
 #include "shared/tinyusb/mp_usbd.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
 #include "pendsv.h"
 #include "tusb.h"
 #include "uart.h"
@@ -58,68 +59,14 @@ ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
 
 #endif
 
-#if MICROPY_HW_USB_CDC
-
-uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
-
-void poll_cdc_interfaces(void) {
-    if (!cdc_itf_pending) {
-        // Explicitly run the USB stack as the scheduler may be locked (eg we are in
-        // an interrupt handler) while there is data pending.
-        mp_usbd_task();
-    }
-
-    // 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 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_USB_CDC
-    poll_cdc_interfaces();
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
     #endif
-    #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;
-    }
+    #if MICROPY_HW_ENABLE_UART_REPL
     if (poll_flags & MP_STREAM_POLL_WR) {
-        #if MICROPY_HW_ENABLE_UART_REPL
         ret |= MP_STREAM_POLL_WR;
-        #else
-        if (tud_cdc_connected() && tud_cdc_write_available() > 0) {
-            ret |= MP_STREAM_POLL_WR;
-        }
-        #endif
     }
     #endif
     #if MICROPY_PY_OS_DUPTERM
@@ -132,7 +79,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         #if MICROPY_HW_USB_CDC
-        poll_cdc_interfaces();
+        mp_usbd_cdc_poll_interfaces(0);
         #endif
 
         int c = ringbuf_get(&stdin_ringbuf);
@@ -159,32 +106,10 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     #endif
 
     #if MICROPY_HW_USB_CDC
-    if (tud_cdc_connected()) {
-        size_t i = 0;
-        while (i < len) {
-            uint32_t n = len - i;
-            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
-                n = CFG_TUD_CDC_EP_BUFSIZE;
-            }
-            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) {
-                mp_event_wait_ms(1);
-
-                // Explicitly run the USB stack as the scheduler may be locked (eg we
-                // are in an interrupt handler), while there is data pending.
-                mp_usbd_task();
-            }
-            if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
-                ret = i;
-                break;
-            }
-            uint32_t n2 = tud_cdc_write(str + i, n);
-            tud_cdc_write_flush();
-            i += n2;
-        }
-        ret = MIN(i, ret);
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
         did_write = true;
+        ret = MIN(cdc_res, ret);
     }
     #endif
 

From 2475a52f5cb8dfdf62a5ca5fe0eb9eeb14fc61b9 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Sat, 11 May 2024 08:50:13 +1000
Subject: [PATCH 1117/3129] mimxrt/mphalport: Refactor to use shared TinyUSB
 CDC functions.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/mimxrt/Makefile       |  2 ++
 ports/mimxrt/mpconfigport.h |  1 +
 ports/mimxrt/mphalport.c    | 72 ++++---------------------------------
 ports/mimxrt/mphalport.h    |  1 +
 4 files changed, 10 insertions(+), 66 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 96abb11bff433..75cf9caec962c 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -232,6 +232,8 @@ SHARED_SRC_C += \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
+	shared/tinyusb/mp_usbd.c \
+	shared/tinyusb/mp_usbd_cdc.c \
 
 # Set flash driver name, base address and internal flash flag, based on the flash type.
 ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash))
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index a4c6d6e2060b9..ac918ba4da8d5 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -148,6 +148,7 @@ uint32_t trng_random_u32(void);
 #endif
 
 #define MICROPY_HW_ENABLE_USBDEV            (1)
+#define MICROPY_HW_USB_CDC                  (1)
 
 // Hooks to add builtins
 
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 6e982b8c8e245..be5abd95bec54 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -30,6 +30,7 @@
 #include "py/mphal.h"
 #include "shared/timeutils/timeutils.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
 #include "extmod/misc.h"
 #include "ticks.h"
 #include "tusb.h"
@@ -44,51 +45,9 @@
 static uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
-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 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 ((poll_flags & MP_STREAM_POLL_WR) && tud_cdc_connected() && tud_cdc_write_available() > 0) {
-        ret |= MP_STREAM_POLL_WR;
-    }
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
     #if MICROPY_PY_OS_DUPTERM
     ret |= mp_os_dupterm_poll(poll_flags);
     #endif
@@ -97,7 +56,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        poll_cdc_interfaces();
+        mp_usbd_cdc_poll_interfaces(0);
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
@@ -115,29 +74,10 @@ int mp_hal_stdin_rx_chr(void) {
 mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     mp_uint_t ret = len;
     bool did_write = false;
-    if (tud_cdc_connected()) {
-        size_t i = 0;
-        while (i < len) {
-            uint32_t n = len - i;
-            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
-                n = CFG_TUD_CDC_EP_BUFSIZE;
-            }
-            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) {
-                ret = i;
-                break;
-            }
-
-            uint32_t n2 = tud_cdc_write(str + i, n);
-            tud_cdc_write_flush();
-            i += n2;
-        }
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
         did_write = true;
-        ret = MIN(i, ret);
+        ret = MIN(cdc_res, ret);
     }
     #if MICROPY_PY_OS_DUPTERM
     int dupterm_res = mp_os_dupterm_tx_strn(str, len);
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 7f5a228fada9f..c69ebf58106b2 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -72,6 +72,7 @@
 #define MP_HAL_PIN_TRIGGER_RISE         kGPIO_IntRisingEdge
 #define MP_HAL_PIN_TRIGGER_RISE_FALL    kGPIO_IntRisingOrFallingEdge
 
+extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
 // Define an alias for systick_ms, because the shared softtimer.c uses

From 2d33071b171e2de4a3e04f48d1f19b5bbe87c663 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Sat, 11 May 2024 08:53:21 +1000
Subject: [PATCH 1118/3129] renesas-ra/mphalport: Refactor to use shared
 TinyUSB CDC functions.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/renesas-ra/mphalport.c | 76 ++++--------------------------------
 ports/renesas-ra/mphalport.h |  1 +
 2 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index 7a5bcba2c9128..1c62c23dd70be 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -34,6 +34,7 @@
 #include "py/ringbuf.h"
 #include "extmod/misc.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
 #include "tusb.h"
 #include "uart.h"
 
@@ -64,62 +65,16 @@ NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
     mp_raise_OSError(mp_hal_status_to_errno_table[status]);
 }
 
-#if MICROPY_HW_USB_CDC
-
 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 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_USB_CDC
-    poll_cdc_interfaces();
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
     #endif
-    #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;
-    }
+    #if MICROPY_HW_ENABLE_UART_REPL
     if (poll_flags & MP_STREAM_POLL_WR) {
-        #if MICROPY_HW_ENABLE_UART_REPL
         ret |= MP_STREAM_POLL_WR;
-        #else
-        if (tud_cdc_connected() && tud_cdc_write_available() > 0) {
-            ret |= MP_STREAM_POLL_WR;
-        }
-        #endif
     }
     #endif
     #if MICROPY_PY_OS_DUPTERM
@@ -132,7 +87,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         #if MICROPY_HW_USB_CDC
-        poll_cdc_interfaces();
+        mp_usbd_cdc_poll_interfaces(0);
         #endif
 
         #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
@@ -165,27 +120,10 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     #endif
 
     #if MICROPY_HW_USB_CDC
-    if (tud_cdc_connected()) {
-        size_t i = 0;
-        while (i < len) {
-            uint32_t n = len - i;
-            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
-                n = CFG_TUD_CDC_EP_BUFSIZE;
-            }
-            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;
-        }
-        ret = MIN(i, ret);
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
         did_write = true;
+        ret = MIN(cdc_res, ret);
     }
     #endif
 
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index c5d27f2e43e9d..14e6ee0c3eea6 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -42,6 +42,7 @@
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 extern const unsigned char mp_hal_status_to_errno_table[4];
+extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 
 static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {

From c11efc74ee72021987a75f1b17d1375d592db1a5 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Sat, 11 May 2024 08:53:44 +1000
Subject: [PATCH 1119/3129] samd/mphalport: Refactor to use shared TinyUSB CDC
 functions.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/samd/mphalport.c | 80 ++++--------------------------------------
 ports/samd/mphalport.h |  1 +
 2 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 3fc6875908975..80904804c9980 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -30,6 +30,7 @@
 #include "py/stream.h"
 #include "shared/runtime/interrupt_char.h"
 #include "shared/tinyusb/mp_usbd.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
 #include "extmod/misc.h"
 #include "samd_soc.h"
 #include "tusb.h"
@@ -51,48 +52,6 @@ ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0,
         mp_usbd_task(); \
     } while (0)
 
-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 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;
     int port_grp = (pin % 32) / 2;
@@ -165,16 +124,7 @@ uint64_t mp_hal_ticks_us_64(void) {
 
 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 ((poll_flags & MP_STREAM_POLL_WR) && tud_cdc_connected() && tud_cdc_write_available() > 0) {
-        ret |= MP_STREAM_POLL_WR;
-    }
-
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
     #if MICROPY_PY_OS_DUPTERM
     ret |= mp_os_dupterm_poll(poll_flags);
     #endif
@@ -184,7 +134,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
 
-        poll_cdc_interfaces();
+        mp_usbd_cdc_poll_interfaces(0);
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
@@ -203,28 +153,10 @@ int mp_hal_stdin_rx_chr(void) {
 mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     mp_uint_t ret = len;
     bool did_write = false;
-    if (tud_cdc_connected()) {
-        size_t i = 0;
-        while (i < len) {
-            uint32_t n = len - i;
-            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
-                n = CFG_TUD_CDC_EP_BUFSIZE;
-            }
-            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_WITH_USB;
-            }
-            if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
-                ret = i;
-                break;
-            }
-            uint32_t n2 = tud_cdc_write(str + i, n);
-            tud_cdc_write_flush();
-            i += n2;
-        }
-        ret = MIN(i, ret);
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
         did_write = true;
+        ret = MIN(cdc_res, ret);
     }
     #if MICROPY_PY_OS_DUPTERM
     int dupterm_res = mp_os_dupterm_tx_strn(str, len);
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 48f047066d43e..ee1ebf7aea2b0 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -44,6 +44,7 @@
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 extern int mp_interrupt_char;
+extern ringbuf_t stdin_ringbuf;
 extern volatile uint32_t systick_ms;
 uint64_t mp_hal_ticks_us_64(void);
 

From c1a6b95bf2653b5bf4a9ad9fed84610e749e40f9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 24 May 2024 14:28:00 +1000
Subject: [PATCH 1120/3129] github/ISSUE_TEMPLATE: Update issue form to remove
 checklist generation.

Update to the issue forms added earlier this year, that seem to generally
be working well.  Improvements in this commit:

- No longer generates TODO checklists in new issues.

- Issue bodies (and therefore email previews) no longer start with the same
  fixed checklist text for each new issue.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 30 ++++++++-------
 .github/ISSUE_TEMPLATE/documentation.yml   | 28 +++++++-------
 .github/ISSUE_TEMPLATE/feature_request.yml | 43 +++++++++++++---------
 .github/ISSUE_TEMPLATE/security.yml        | 31 ++++++++--------
 4 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c44a140faf0ff..1ec6c7067f9cd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -11,19 +11,10 @@ body:
 
         * If you have a question \"How Do I ...?\", please post it on [GitHub Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead of here.
         * For missing or incorrect documentation, or feature requests, then please [choose a different issue type](https://github.com/micropython/micropython/issues/new/choose).
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checks
-      description: |
-        Before submitting your bug report, please go over these check points:
-      options:
-      - label: |
-           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
-        required: true
-      - label: |
-          I've searched for [existing issues](https://github.com/micropython/micropython/issues) matching this bug, and didn't find any.
-        required: true
+
+        #### Existing issue?
+
+        * Please search for [existing issues](https://github.com/micropython/micropython/issues) matching this bug before reporting.
   - type: input
     id: port-board-hw
     attributes:
@@ -33,7 +24,7 @@ body:
       placeholder: |
         esp32 port, ESP32-Fantastic board.
     validations:
-       required: true
+      required: true
   - type: textarea
     id: version
     attributes:
@@ -101,6 +92,17 @@ body:
       description: |
         Is there anything else that might help to resolve this issue?
       value: No, I've provided everything above.
+  - type: dropdown
+    id: code-of-conduct
+    attributes:
+      label: Code of Conduct
+      description: |
+        Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
+      options:
+        - "Yes, I agree"
+      multiple: true
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: |
diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
index 5be0241701747..93051e51c80c7 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yml
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -9,19 +9,10 @@ body:
         This form is for reporting issues with the documentation or examples provided with MicroPython.
 
         If you have a general question \"How Do I ...?\", please post it on [GitHub Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead of here.
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checks
-      description: |
-        Before submitting your bug report, please go over these check points:
-      options:
-      - label: |
-           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
-        required: true
-      - label: |
-          I've searched for [existing issues](https://github.com/micropython/micropython/issues) and didn't find any that matched.
-        required: true
+
+        #### Existing issue?
+
+        * Please search for [existing issues](https://github.com/micropython/micropython/issues) before reporting a new one.
   - type: input
     id: page
     attributes:
@@ -38,6 +29,17 @@ body:
         Please describe what was missing from the documentation and/or what was incorrect/incomplete.
     validations:
       required: true
+  - type: dropdown
+    id: code-of-conduct
+    attributes:
+      label: Code of Conduct
+      description: |
+        Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
+      options:
+        - "Yes, I agree"
+      multiple: true
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: |
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 845fbed810ef9..7d5162a32a4af 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -15,19 +15,10 @@ body:
 
         * If you have a question \"How Do I ...?\", please post it on GitHub Discussions or Discord instead of here.
         * Could this feature be implemented as a pure Python library? If so, please open the request on the [micropython-lib repository](https://github.com/micropython/micropython-lib/issues) instead.
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checks
-      description: |
-        Before submitting your feature request, please go over these check points:
-      options:
-      - label: |
-           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
-        required: true
-      - label: |
-          I've searched for [existing issues](https://github.com/micropython/micropython/issues) regarding this feature, and didn't find any.
-        required: true
+
+        #### Existing issue?
+
+        * Please search for [existing issues](https://github.com/micropython/micropython/issues) before opening a new one.
   - type: textarea
     id: feature
     attributes:
@@ -51,14 +42,32 @@ body:
          MicroPython aims to strike a balance between functionality and code size. Can this feature be optionally enabled?
 
          If you believe the usefulness of this feature would outweigh the additional code size, please explain. (It's OK to say you're unsure here, we're happy to discuss this with you.)
-  - type: checkboxes
+  - type: dropdown
     id: implementation
     attributes:
       label: Implementation
+      description: |
+        What is your suggestion for implementing this feature?
+
+        (See also: [How to sponsor](https://github.com/sponsors/micropython#sponsors), [How to submit a Pull Request](https://github.com/micropython/micropython/wiki/ContributorGuidelines).)
       options:
-      - label: I intend to implement this feature and would submit a Pull Request if desirable.
-      - label: I hope the MicroPython maintainers or community will implement this feature.
-      - label: I would like to [Sponsor](https://github.com/sponsors/micropython#sponsors) development of this feature.
+        - I hope the MicroPython maintainers or community will implement this feature
+        - I intend to implement this feature and would submit a Pull Request if desirable
+        - I would like to sponsor development of this feature
+      multiple: true
+    validations:
+      required: true
+  - type: dropdown
+    id: code-of-conduct
+    attributes:
+      label: Code of Conduct
+      description: |
+        Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
+      options:
+        - "Yes, I agree"
+      multiple: true
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: |
diff --git a/.github/ISSUE_TEMPLATE/security.yml b/.github/ISSUE_TEMPLATE/security.yml
index 7d66a72f64120..57c2a5885ed85 100644
--- a/.github/ISSUE_TEMPLATE/security.yml
+++ b/.github/ISSUE_TEMPLATE/security.yml
@@ -9,21 +9,11 @@ body:
 
         1. For issues that are readily exploitable or have high impact, please email contact@micropython.org instead.
         1. If this is a question about security, please ask it in [Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead.
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checks
-      description: |
-        Before submitting your bug report, please go over these check points:
-      options:
-      - label: |
-           I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
-        required: true
-      - label: I wish to report a specific security issue that is **not readily exploitable and does not have high impact** for MicroPython developers or users.
-        required: true
-      - label: |
-          I've searched for [existing issues](https://github.com/micropython/micropython/issues) and didn't find any that matched.
-        required: true
+
+        #### Existing issue?
+
+        * Please search for [existing issues](https://github.com/micropython/micropython/issues) before reporting a new one.
+
   - type: input
     id: port-board-hw
     attributes:
@@ -57,3 +47,14 @@ body:
         * How does the attacker exploit this issue?
     validations:
       required: true
+  - type: dropdown
+    id: code-of-conduct
+    attributes:
+      label: Code of Conduct
+      description: |
+        Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
+      options:
+        - "Yes, I agree"
+      multiple: true
+    validations:
+      required: true

From 84a8f7ea6dfa3529b024d31fa25bb91153bbfc35 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 2 Jun 2024 22:16:29 +1000
Subject: [PATCH 1121/3129] shared/tinyusb: Allow ports to use 1200bps-touch
 without other CDC code.

This fixes the build for some esp32 and nrf boards (for example
`ARDUINO_NANO_33_BLE_SENSE` and `ARDUINO_NANO_ESP32`) due to commit
c98789a6d8e05acb608afe4b30cf3ca563419b2d.  Changes are:

- Allow the CDC TX/RX functions in `mp_usbd_cdc.c` to be enabled
  separately to those needed for `MICROPY_HW_USB_CDC_1200BPS_TOUCH`.

- Add `MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC` option as a temporary
  workaround for the nrf port to use.

- Declare `mp_usbd_line_state_cb()` in a header as a public function.

- Fix warning with type cast of `.callback_line_state_changed`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c |  2 +-
 ports/esp32/usb.c                                  |  2 +-
 ports/nrf/mpconfigport.h                           |  1 +
 shared/tinyusb/mp_usbd_cdc.c                       | 12 +++++-------
 shared/tinyusb/mp_usbd_cdc.h                       |  3 +++
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c b/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
index ab03139d9055f..69a414cd5d9e3 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 #include "py/mphal.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
 
 #include <esp_system.h>
 #include <esp_ota_ops.h>
@@ -87,7 +88,6 @@ void NANO_ESP32_enter_bootloader(void) {
 }
 
 void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event_in) {
-    extern void mp_usbd_line_state_cb(uint8_t itf, bool dtr, bool rts);
     cdcacm_event_t *event = event_in;
     mp_usbd_line_state_cb(itf, event->line_state_changed_data.dtr, event->line_state_changed_data.rts);
 }
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 316482e1898a0..2a3a2595dea0d 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -79,7 +79,7 @@ void usb_init(void) {
         .callback_rx_wanted_char = &MICROPY_HW_USB_CUSTOM_RX_WANTED_CHAR_CB,
         #endif
         #ifdef MICROPY_HW_USB_CUSTOM_LINE_STATE_CB
-        .callback_line_state_changed = &MICROPY_HW_USB_CUSTOM_LINE_STATE_CB,
+        .callback_line_state_changed = (tusb_cdcacm_callback_t)&MICROPY_HW_USB_CUSTOM_LINE_STATE_CB,
         #endif
         #ifdef MICROPY_HW_USB_CUSTOM_LINE_CODING_CB
         .callback_line_coding_changed = &MICROPY_HW_USB_CUSTOM_LINE_CODING_CB,
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 6e92fa876ef4b..0b9b667eeaf31 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -335,6 +335,7 @@ long unsigned int rng_generate_random_word(void);
 #if MICROPY_HW_USB_CDC
 #include "device/usbd.h"
 #define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
+#define MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC (1)
 #else
 #define MICROPY_HW_USBDEV_TASK_HOOK ;
 #endif
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index 4135cd720fef5..6d789ff5e81ca 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -26,16 +26,13 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "py/mpconfig.h"
 #include "py/stream.h"
 #include "extmod/modmachine.h"
 
-#if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV
-#include "tusb.h"
-#include "device/usbd.h"
-
-#include "mp_usbd_cdc.h"
 #include "mp_usbd.h"
+#include "mp_usbd_cdc.h"
+
+#if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC
 
 static uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
 
@@ -122,6 +119,8 @@ mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
     return i;
 }
 
+#endif
+
 #if MICROPY_HW_USB_CDC_1200BPS_TOUCH && MICROPY_HW_ENABLE_USBDEV
 
 static mp_sched_node_t mp_bootloader_sched_node;
@@ -150,4 +149,3 @@ tud_cdc_line_state_cb
 }
 
 #endif
-#endif
diff --git a/shared/tinyusb/mp_usbd_cdc.h b/shared/tinyusb/mp_usbd_cdc.h
index f84cf8d03e5a2..1abe0fa0a41b3 100644
--- a/shared/tinyusb/mp_usbd_cdc.h
+++ b/shared/tinyusb/mp_usbd_cdc.h
@@ -35,5 +35,8 @@ uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags);
 void tud_cdc_rx_cb(uint8_t itf);
 mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len);
 
+#if MICROPY_HW_USB_EXTERNAL_TINYUSB
+void mp_usbd_line_state_cb(uint8_t itf, bool dtr, bool rts);
+#endif
 
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H

From 93394da69c46324b53465abaee05919d543a754a Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Fri, 31 May 2024 18:49:59 +0200
Subject: [PATCH 1122/3129] rp2/modmachine: Use atomic section macros in
 lightsleep code.

To avoid undefined references to `mp_thread_begin_atomic_section()` /
`mp_thread_end_atomic_section()`, replace them with the
`MICROPY_BEGIN_ATOMIC_SECTION` / `MICROPY_END_ATOMIC_SECTION`
macros.  That way, it's possible to build again with `MICROPY_PY_THREAD`
disabled (made possible by efa54c27b9eab3b61319e7f16d05db0ac3b6bc14).

Fixes commit 19844b4983066c5771cb60a341c3fce52bca2a87.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 ports/rp2/modmachine.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 5551bf723a797..e6a8542d77307 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -127,10 +127,10 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     const uint32_t xosc_hz = XOSC_MHZ * 1000000;
 
-    uint32_t my_interrupts = mp_thread_begin_atomic_section();
+    uint32_t my_interrupts = MICROPY_BEGIN_ATOMIC_SECTION();
     #if MICROPY_PY_NETWORK_CYW43
     if (cyw43_has_pending && cyw43_poll != NULL) {
-        mp_thread_end_atomic_section(my_interrupts);
+        MICROPY_END_ATOMIC_SECTION(my_interrupts);
         return;
     }
     #endif
@@ -196,7 +196,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     // Bring back all clocks.
     clocks_init();
-    mp_thread_end_atomic_section(my_interrupts);
+    MICROPY_END_ATOMIC_SECTION(my_interrupts);
 }
 
 NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {

From a84c7a0ed931667cda44a8e27888f066e085d5eb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 24 May 2024 15:57:01 +1000
Subject: [PATCH 1123/3129] rp2/modmachine: Selectively leave the USB clocks
 enabled in lightsleep.

Without this change going to lightsleep stops the USB peripheral clock, and
can lead to either the device going into a weird state or the host deciding
to issue a bus reset.

This change only keeps the USB peripheral clocks enabled if the USB device
is currently active and a host has configured the device.  This means the
USB device continues to respond to host transfers and (presumably) will
even complete pending endpoint transfers.  All other requests are NAKed
while still asleep, but the interaction with the host seems to resume
correctly on wake

Otherwise, if USB is not active or configured by a host, USB clocks are
disabled, the same as before.

With the change, one can issue a `machine.lightsleep(...)` with USB CDC
connected and the USB CDC remains connected during the sleep and resumes
when the lightsleep finishes.

Tested on a RPi Pico, the power consumption is:
- During normal idle at the REPL, about 15.3mA.
- During lightsleep, prior to this change, about 1.35mA.
- During lightsleep, with this change and USB CDC connected, about 3.7mA.

If power consumption should be as low as possible when USB is connected,
one can use `machine.USBDevice` to disable the USB before entering
lightsleep.

As discussed at https://github.com/orgs/micropython/discussions/14401

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/modmachine.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index e6a8542d77307..4eebb3d16c64e 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -28,6 +28,7 @@
 // extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
 #include "py/mphal.h"
+#include "mp_usbd.h"
 #include "modmachine.h"
 #include "uart.h"
 #include "hardware/clocks.h"
@@ -134,8 +135,17 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         return;
     }
     #endif
-    // Disable USB and ADC clocks.
-    clock_stop(clk_usb);
+
+    #if MICROPY_HW_ENABLE_USBDEV
+    // Only disable the USB clock if a USB host has not configured the device
+    bool disable_usb = !tud_mounted();
+    #else
+    bool disable_usb = true;
+    #endif
+    if (disable_usb) {
+        clock_stop(clk_usb);
+    }
+
     clock_stop(clk_adc);
 
     // CLK_REF = XOSC
@@ -152,7 +162,9 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     // Disable PLLs.
     pll_deinit(pll_sys);
-    pll_deinit(pll_usb);
+    if (disable_usb) {
+        pll_deinit(pll_usb);
+    }
 
     // Disable ROSC.
     rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_DISABLE << ROSC_CTRL_ENABLE_LSB;
@@ -181,6 +193,12 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
             // TODO: Use RTC alarm to wake.
             clocks_hw->sleep_en1 = 0;
         }
+
+        if (!disable_usb) {
+            clocks_hw->sleep_en0 |= CLOCKS_SLEEP_EN0_CLK_SYS_PLL_USB_BITS;
+            clocks_hw->sleep_en1 |= CLOCKS_SLEEP_EN1_CLK_USB_USBCTRL_BITS;
+        }
+
         scb_hw->scr |= M0PLUS_SCR_SLEEPDEEP_BITS;
         __wfi();
         scb_hw->scr &= ~M0PLUS_SCR_SLEEPDEEP_BITS;

From 932f76c6ba64c5a3e68de3324556d9979f09303b Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 27 Feb 2024 10:19:35 +0000
Subject: [PATCH 1124/3129] rp2/CMakeLists: Use MICROPY_BOARD_DIR to find
 pins.csv.

Assuming that ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD} is equal to
${MICROPY_BOARD_DIR} is not valid, because the latter could point to a path
outside the main MicroPython repository.

Replace this path with the canonical ${MICROPY_BOARD_DIR} so that pins.csv
is correctly located when building against out-of-tree board definitions.

Additionally remove MICROPY_BOARDS_DIR to discourage similar mistakes.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/CMakeLists.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index f86224a5c0672..d3ecee586054c 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -530,15 +530,14 @@ 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_AF_CSV "${MICROPY_PORT_DIR}/boards/rp2_af.csv")
+set(GEN_PINS_PREFIX "${MICROPY_PORT_DIR}/boards/rp2_prefix.c")
+set(GEN_PINS_MKPINS "${MICROPY_PORT_DIR}/boards/make-pins.py")
 set(GEN_PINS_SRC "${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c")
 set(GEN_PINS_HDR "${MICROPY_GENHDR_DIR}/pins.h")
 
-if(EXISTS "${MICROPY_BOARDS_DIR}/${MICROPY_BOARD}/pins.csv")
-    set(GEN_PINS_BOARD_CSV "${MICROPY_BOARDS_DIR}/${MICROPY_BOARD}/pins.csv")
+if(EXISTS "${MICROPY_BOARD_DIR}/pins.csv")
+    set(GEN_PINS_BOARD_CSV "${MICROPY_BOARD_DIR}/pins.csv")
     set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
 endif()
 

From 0e19286c944d12a0eb7b15f004e368a09affbccd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 Jun 2024 09:52:31 +1000
Subject: [PATCH 1125/3129] tools/metrics.py: Change rp2 board selection to
 RPI_PICO_W.

This tool is used to compute size differences in the firmware (eg as part
of CI), but it doesn't currently check any firmware that has bare-metal
lwIP/networking, making it hard to see how firmware size changes when
networking related changes are made.

So, change the board selection for the rp2 port to RPI_PICO_W.  Changes in
size to standard RPI_PICO firmware will be very similar to other bare-metal
boards like PYBV10.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh      | 2 +-
 tools/metrics.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index bac225caa4df1..b0746178b6689 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -55,7 +55,7 @@ function ci_code_size_setup {
 function ci_code_size_build {
     # check the following ports for the change in their code size
     PORTS_TO_CHECK=bmusxpd
-    SUBMODULES="lib/asf4 lib/berkeley-db-1.xx lib/mbedtls lib/micropython-lib lib/nxp_driver lib/pico-sdk lib/stm32lib lib/tinyusb"
+    SUBMODULES="lib/asf4 lib/berkeley-db-1.xx lib/btstack lib/cyw43-driver lib/lwip lib/mbedtls lib/micropython-lib lib/nxp_driver 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
diff --git a/tools/metrics.py b/tools/metrics.py
index 9c5ed1d7d5a60..2064675be9f5c 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -69,7 +69,7 @@ def __init__(self, name, dir, output, make_flags=None):
     "x": PortData("mimxrt", "mimxrt", "build-TEENSY40/firmware.elf"),
     "e": PortData("renesas-ra", "renesas-ra", "build-EK_RA6M2/firmware.elf"),
     "r": PortData("nrf", "nrf", "build-PCA10040/firmware.elf"),
-    "p": PortData("rp2", "rp2", "build-RPI_PICO/firmware.elf"),
+    "p": PortData("rp2", "rp2", "build-RPI_PICO_W/firmware.elf", "BOARD=RPI_PICO_W"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),
 }
 

From 1f23ab1e3dabbbe1812f60dfeb5301d887954ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Wed, 27 Mar 2024 21:53:34 +0000
Subject: [PATCH 1126/3129] esp32,mimxrt,stm32: Implement ipconfig() for more
 network interfaces.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implements:
- esp32: network.ipconfig()
- esp32: network.LAN.ipconfig()
- esp32: network.WLAN.ipconfig()
- mimxrt: network.LAN.ipconfig()
- stm32: network.LAN.ipconfig()

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 ports/esp32/modnetwork.h         |   2 +
 ports/esp32/modnetwork_globals.h |   1 +
 ports/esp32/network_common.c     | 172 ++++++++++++++++++++++++++++++-
 ports/esp32/network_lan.c        |   1 +
 ports/esp32/network_wlan.c       |   1 +
 ports/mimxrt/network_lan.c       |   7 ++
 ports/stm32/network_lan.c        |   7 ++
 7 files changed, 190 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index e57b80657f58f..387f961976d60 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -54,6 +54,8 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_get_wlan_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(esp_network_get_lan_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(esp_network_ppp_make_new_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_ifconfig_obj);
+MP_DECLARE_CONST_FUN_OBJ_KW(esp_network_ipconfig_obj);
+MP_DECLARE_CONST_FUN_OBJ_KW(esp_nic_ipconfig_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(esp_network_config_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj);
 
diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 7dd2ee9e66e7a..c0cf229421daf 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -11,6 +11,7 @@
 { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&esp_network_ppp_make_new_obj) },
 #endif
 { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_network_phy_mode_obj) },
+{ MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&esp_network_ipconfig_obj) },
 
 #if MICROPY_PY_NETWORK_WLAN
 { MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(WIFI_IF_STA)},
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index 223803a5d14ad..6e957909eafe7 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -34,6 +34,7 @@
 #include <string.h>
 
 #include "py/runtime.h"
+#include "py/parsenum.h"
 #include "py/mperrno.h"
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
@@ -42,7 +43,7 @@
 #include "esp_netif.h"
 #include "esp_wifi.h"
 #include "lwip/sockets.h"
-// #include "lwip/dns.h"
+#include "lwip/dns.h"
 
 NORETURN void esp_exceptions_helper(esp_err_t e) {
     switch (e) {
@@ -154,6 +155,175 @@ static mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_ifconfig_obj, 1, 2, esp_ifconfig);
 
+static mp_obj_t esp_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+
+        switch (mp_obj_str_get_qstr(args[0])) {
+            case MP_QSTR_dns: {
+                char addr_str[IPADDR_STRLEN_MAX];
+                ipaddr_ntoa_r(dns_getserver(0), addr_str, sizeof(addr_str));
+                return mp_obj_new_str(addr_str, strlen(addr_str));
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+    } else {
+        // Set config value(s)
+        if (n_args != 0) {
+            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_dns: {
+                        ip_addr_t dns;
+                        size_t addr_len;
+                        const char *addr_str = mp_obj_str_get_data(e->value, &addr_len);
+                        if (!ipaddr_aton(addr_str, &dns)) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments as dns server"));
+                        }
+                        dns_setserver(0, &dns);
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(esp_network_ipconfig_obj, 0, esp_network_ipconfig);
+
+static mp_obj_t esp_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    base_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    esp_netif_ip_info_t info;
+    esp_netif_get_ip_info(self->netif, &info);
+
+    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_dhcp4: {
+                if (self->if_id == ESP_IF_WIFI_STA || self->if_id == ESP_IF_ETH) {
+                    esp_netif_dhcp_status_t status;
+                    esp_exceptions(esp_netif_dhcpc_get_status(self->netif, &status));
+                    return mp_obj_new_bool(status == ESP_NETIF_DHCP_STARTED);
+                } else {
+                    mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                    break;
+                }
+            }
+            case MP_QSTR_addr4: {
+                mp_obj_t tuple[2] = {
+                    netutils_format_ipv4_addr((uint8_t *)&info.ip, NETUTILS_BIG),
+                    netutils_format_ipv4_addr((uint8_t *)&info.netmask, NETUTILS_BIG),
+                };
+                return mp_obj_new_tuple(2, tuple);
+            }
+            case MP_QSTR_gw4: {
+                return netutils_format_ipv4_addr((uint8_t *)&info.gw, NETUTILS_BIG);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+        return mp_const_none;
+    } else {
+        // Set config value(s)
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
+        }
+        int touched_ip_info = 0;
+        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_dhcp4: {
+                        esp_netif_dhcp_status_t status;
+                        if (self->if_id == ESP_IF_WIFI_STA || self->if_id == ESP_IF_ETH) {
+                            esp_exceptions(esp_netif_dhcpc_get_status(self->netif, &status));
+                            if (mp_obj_is_true(e->value) && status != ESP_NETIF_DHCP_STARTED) {
+                                esp_exceptions(esp_netif_dhcpc_start(self->netif));
+                            } else if (!mp_obj_is_true(e->value) && status == ESP_NETIF_DHCP_STARTED) {
+                                esp_exceptions(esp_netif_dhcpc_stop(self->netif));
+                            }
+                        } else {
+                            mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                            break;
+                        }
+                        break;
+                    }
+                    case MP_QSTR_addr4: {
+                        if (e->value != mp_const_none && mp_obj_is_str(e->value)) {
+                            size_t addr_len;
+                            const char *input_str = mp_obj_str_get_data(e->value, &addr_len);
+                            char *split = strchr(input_str, '/');
+                            if (split) {
+                                mp_obj_t prefix_obj = mp_parse_num_integer(split + 1, strlen(split + 1), 10, NULL);
+                                int prefix_bits = mp_obj_get_int(prefix_obj);
+                                uint32_t mask = -(1u << (32 - prefix_bits));
+                                uint32_t *m = (uint32_t *)&info.netmask;
+                                *m = esp_netif_htonl(mask);
+                            }
+                            netutils_parse_ipv4_addr(e->value, (void *)&info.ip, NETUTILS_BIG);
+                        } else if (e->value != mp_const_none) {
+                            mp_obj_t *items;
+                            mp_obj_get_array_fixed_n(e->value, 2, &items);
+                            netutils_parse_ipv4_addr(items[0], (void *)&info.ip, NETUTILS_BIG);
+                            netutils_parse_ipv4_addr(items[1], (void *)&info.netmask, NETUTILS_BIG);
+                        }
+                        touched_ip_info = 1;
+                        break;
+                    }
+                    case MP_QSTR_gw4: {
+                        netutils_parse_ipv4_addr(e->value, (void *)&info.gw, NETUTILS_BIG);
+                        touched_ip_info = 1;
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+        if (self->if_id == ESP_IF_WIFI_STA || self->if_id == ESP_IF_ETH) {
+            if (touched_ip_info) {
+                esp_err_t e = esp_netif_dhcpc_stop(self->netif);
+                if (e != ESP_OK && e != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
+                    esp_exceptions_helper(e);
+                }
+                esp_exceptions(esp_netif_set_ip_info(self->netif, &info));
+            }
+        } else if (self->if_id == ESP_IF_WIFI_AP) {
+            esp_err_t e = esp_netif_dhcps_stop(self->netif);
+            if (e != ESP_OK && e != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
+                esp_exceptions_helper(e);
+            }
+            esp_exceptions(esp_netif_set_ip_info(self->netif, &info));
+            esp_exceptions(esp_netif_dhcps_start(self->netif));
+        }
+
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(esp_nic_ipconfig_obj, 1, esp_ipconfig);
+
 mp_obj_t esp_ifname(esp_netif_t *netif) {
     char ifname[NETIF_NAMESIZE + 1] = {0};
     mp_obj_t ret = mp_const_none;
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 570c9a4afdefb..7e7ebcc929185 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -404,6 +404,7 @@ static const mp_rom_map_elem_t lan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&lan_status_obj) },
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&lan_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_network_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&esp_nic_ipconfig_obj) },
 };
 
 static MP_DEFINE_CONST_DICT(lan_if_locals_dict, lan_if_locals_dict_table);
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index eb2bcda03e1b8..6d051f0256291 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -728,6 +728,7 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { 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_network_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&esp_nic_ipconfig_obj) },
 
     // Constants
     { MP_ROM_QSTR(MP_QSTR_IF_STA), MP_ROM_INT(WIFI_IF_STA)},
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index e01079cbf3144..7d6ae2d7277fb 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -179,6 +179,12 @@ static mp_obj_t network_lan_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_lan_ifconfig_obj, 1, 2, network_lan_ifconfig);
 
+static mp_obj_t network_lan_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    return mod_network_nic_ipconfig(eth_netif(self->eth), n_args - 1, args + 1, kwargs);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_lan_ipconfig_obj, 1, network_lan_ipconfig);
+
 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;
@@ -241,6 +247,7 @@ 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_ipconfig), MP_ROM_PTR(&network_lan_ipconfig_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) },
 
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 27f3e1337e693..0ef33e29777f9 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -101,6 +101,12 @@ static mp_obj_t network_lan_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_lan_ifconfig_obj, 1, 2, network_lan_ifconfig);
 
+static mp_obj_t network_lan_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    return mod_network_nic_ipconfig(eth_netif(self->eth), n_args - 1, args + 1, kwargs);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_lan_ipconfig_obj, 1, network_lan_ipconfig);
+
 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;
@@ -163,6 +169,7 @@ 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_ipconfig), MP_ROM_PTR(&network_lan_ipconfig_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) },
 

From 7e7cc2b427f588559d50bae35d49c305201c2365 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 28 Mar 2024 08:03:41 +0100
Subject: [PATCH 1127/3129] extmod/network_ninaw10: Implement the ipconfig
 methods for ninaw10.

This implements network.ipconfig() and network.WLAN.ipconfig() when the
ninaw10 driver is used for WLAN.

Due to a omission in the ninaw10 driver stack, setting the DNS address has
no effect.  But the interface is kept here just in case it's fixed
eventually.

dhcp4 and has_dhcp4 are dummy arguments.  Ninaw10 seems to always use DHCP.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 extmod/modnetwork.c        |   5 +-
 extmod/modnetwork.h        |   4 +
 extmod/network_ninaw10.c   | 151 +++++++++++++++++++++++++++++++++++++
 shared/netutils/netutils.c |   8 +-
 4 files changed, 166 insertions(+), 2 deletions(-)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index aa237bd93c15f..88f9d37180bcd 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -144,12 +144,15 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_hostname_obj, 0, 1, mod_n
 #if LWIP_VERSION_MAJOR >= 2
 MP_DEFINE_CONST_FUN_OBJ_KW(mod_network_ipconfig_obj, 0, mod_network_ipconfig);
 #endif
+#if MICROPY_PY_NETWORK_NINAW10
+MP_DEFINE_CONST_FUN_OBJ_KW(mod_network_ipconfig_obj, 0, network_ninaw10_ipconfig);
+#endif
 
 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_country), MP_ROM_PTR(&mod_network_country_obj) },
     { MP_ROM_QSTR(MP_QSTR_hostname), MP_ROM_PTR(&mod_network_hostname_obj) },
-    #if LWIP_VERSION_MAJOR >= 2
+    #if LWIP_VERSION_MAJOR >= 2 || MICROPY_PY_NETWORK_NINAW10
     { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&mod_network_ipconfig_obj) },
     #endif
 
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 2ff9ce09dea18..1a4aa7797e455 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -83,6 +83,10 @@ extern int mp_mod_network_prefer_dns_use_ip_version;
 #endif
 #elif defined(MICROPY_PORT_NETWORK_INTERFACES)
 
+#if MICROPY_PY_NETWORK_NINAW10
+mp_obj_t network_ninaw10_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
+#endif
+
 struct _mod_network_socket_obj_t;
 
 typedef struct _mod_network_nic_protocol_t {
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 926e228a35b88..702adcd9762e5 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -41,6 +41,7 @@
 #include "py/runtime.h"
 #include "py/misc.h"
 #include "py/mperrno.h"
+#include "py/parsenum.h"
 #include "shared/netutils/netutils.h"
 #include "shared/runtime/softtimer.h"
 #include "extmod/modnetwork.h"
@@ -75,6 +76,8 @@ typedef struct _nina_obj_t {
 #define SO_NO_CHECK             (0x100a)
 #define NINAW10_POLL_INTERVAL   (100)
 
+#define IPADDR_STRLEN_MAX       46
+
 #define is_nonblocking_error(errno) ((errno) == MP_EAGAIN || (errno) == MP_EWOULDBLOCK || (errno) == MP_EINPROGRESS)
 
 #define debug_printf(...) // mp_printf(&mp_plat_print, __VA_ARGS__)
@@ -87,6 +90,8 @@ static mp_sched_node_t mp_wifi_poll_node;
 static soft_timer_entry_t mp_wifi_poll_timer;
 static void network_ninaw10_deinit(void);
 
+static bool network_ninaw10_dhcp_active = false;
+
 static bool network_ninaw10_poll_list_is_empty(void) {
     return MP_STATE_PORT(mp_wifi_poll_list) == NULL ||
            MP_STATE_PORT(mp_wifi_poll_list)->len == 0;
@@ -199,6 +204,7 @@ static mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
                 mp_raise_msg_varg(&mp_type_OSError,
                     MP_ERROR_TEXT("failed to initialize Nina-W10 module, error: %d"), error);
             }
+            network_ninaw10_dhcp_active = true;
             // check firmware version
             uint8_t semver[NINA_FW_VER_LEN];
             if (nina_fw_version(semver) != 0) {
@@ -367,11 +373,155 @@ static mp_obj_t network_ninaw10_ifconfig(size_t n_args, const mp_obj_t *args) {
         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);
+        network_ninaw10_dhcp_active = false;
         return mp_const_none;
     }
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_ifconfig_obj, 1, 2, network_ninaw10_ifconfig);
 
+mp_obj_t network_ninaw10_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    nina_ifconfig_t ifconfig;
+    // get ifconfig info
+    nina_ifconfig(&ifconfig, false);
+
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+        switch (mp_obj_str_get_qstr(args[0])) {
+            case MP_QSTR_dns: {
+                return netutils_format_ipv4_addr(ifconfig.dns_addr, NETUTILS_BIG);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+    } else {
+        // Set config value(s)
+        if (n_args != 0) {
+            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_dns: {
+                        netutils_parse_ipv4_addr(e->value, ifconfig.dns_addr, NETUTILS_BIG);
+                        nina_ifconfig(&ifconfig, true);
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+
+static mp_obj_t network_ninaw10_nic_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    nina_ifconfig_t ifconfig;
+    // get ifconfig info
+    nina_ifconfig(&ifconfig, false);
+
+    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_dhcp4: {
+                return mp_obj_new_bool(network_ninaw10_dhcp_active);
+            }
+            case MP_QSTR_has_dhcp4: {
+                uint16_t ip_sum =
+                    ifconfig.ip_addr[0] + ifconfig.ip_addr[1] + ifconfig.ip_addr[2] + ifconfig.ip_addr[3];
+                if (network_ninaw10_dhcp_active) {
+                    return mp_obj_new_bool(ip_sum != 0);
+                } else {
+                    return mp_const_false;
+                }
+            }
+            case MP_QSTR_addr4: {
+                mp_obj_t tuple[2] = {
+                    netutils_format_ipv4_addr(ifconfig.ip_addr, NETUTILS_BIG),
+                    netutils_format_ipv4_addr(ifconfig.subnet_addr, NETUTILS_BIG),
+                };
+                return mp_obj_new_tuple(2, tuple);
+            }
+            case MP_QSTR_gw4: {
+                return netutils_format_ipv4_addr(ifconfig.gateway_addr, NETUTILS_BIG);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+        return mp_const_none;
+    } 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_dhcp4: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("DHCP control unsupported"));
+                        break;
+                    }
+                    case MP_QSTR_addr4: {
+                        int prefix_bits = 32;
+                        if (e->value != mp_const_none && mp_obj_is_str(e->value)) {
+                            size_t addr_len;
+                            const char *input_str = mp_obj_str_get_data(e->value, &addr_len);
+                            char *split = strchr(input_str, '/');
+                            if (split) {
+                                mp_obj_t prefix_obj = mp_parse_num_integer(split + 1, strlen(split + 1), 10, NULL);
+                                prefix_bits = mp_obj_get_int(prefix_obj);
+                                uint32_t mask = -(1u << (32 - prefix_bits));
+                                ifconfig.subnet_addr[0] = (mask >> 24) & 0xFF;
+                                ifconfig.subnet_addr[1] = (mask >> 16) & 0xFF;
+                                ifconfig.subnet_addr[2] = (mask >> 8) & 0xFF;
+                                ifconfig.subnet_addr[3] = mask & 0xFF;
+                            }
+                            netutils_parse_ipv4_addr(e->value, ifconfig.ip_addr, NETUTILS_BIG);
+                        } else if (e->value != mp_const_none) {
+                            mp_obj_t *items;
+                            mp_obj_get_array_fixed_n(e->value, 2, &items);
+                            netutils_parse_ipv4_addr(items[0], ifconfig.ip_addr, NETUTILS_BIG);
+                            netutils_parse_ipv4_addr(items[1], ifconfig.subnet_addr, NETUTILS_BIG);
+                        }
+                        nina_ifconfig(&ifconfig, true);
+                        network_ninaw10_dhcp_active = false;
+                        break;
+                    }
+                    case MP_QSTR_gw4: {
+                        netutils_parse_ipv4_addr(e->value, ifconfig.gateway_addr, NETUTILS_BIG);
+                        nina_ifconfig(&ifconfig, true);
+                        network_ninaw10_dhcp_active = false;
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_ninaw10_nic_ipconfig_obj, 1, network_ninaw10_nic_ipconfig);
+
 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;
@@ -856,6 +1006,7 @@ static const mp_rom_map_elem_t nina_locals_dict_table[] = {
     { 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_ipconfig),            MP_ROM_PTR(&network_ninaw10_nic_ipconfig_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) },
diff --git a/shared/netutils/netutils.c b/shared/netutils/netutils.c
index 84b4405c41d38..cd1422f7c8058 100644
--- a/shared/netutils/netutils.c
+++ b/shared/netutils/netutils.c
@@ -63,7 +63,13 @@ void netutils_parse_ipv4_addr(mp_obj_t addr_in, uint8_t *out_ip, netutils_endian
         return;
     }
     const char *s = addr_str;
-    const char *s_top = addr_str + addr_len;
+    const char *s_top;
+    // Scan for the end of valid address characters
+    for (s_top = addr_str; s_top < addr_str + addr_len; s_top++) {
+        if (!(*s_top == '.' || (*s_top >= '0' && *s_top <= '9'))) {
+            break;
+        }
+    }
     for (mp_uint_t i = 3; ; i--) {
         mp_uint_t val = 0;
         for (; s < s_top && *s != '.'; s++) {

From a71471be66300eb9415f05e030cd92649f810b34 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 28 Mar 2024 13:19:51 +0100
Subject: [PATCH 1128/3129] extmod/network_lwip: Allow using the CIDR notation
 for addr4.

There was a little omisssion in the code.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 extmod/network_lwip.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/extmod/network_lwip.c b/extmod/network_lwip.c
index 97cb43902df63..329a45c46fb99 100644
--- a/extmod/network_lwip.c
+++ b/extmod/network_lwip.c
@@ -297,20 +297,23 @@ mp_obj_t mod_network_nic_ipconfig(struct netif *netif, size_t n_args, const mp_o
                             char plain_ip[IPADDR_STRLEN_MAX];
                             char *split = strchr(input_str, '/');
                             const char *addr_str = input_str;
+                            int to_copy = MIN(sizeof(plain_ip) - 1, addr_len);
+                            memcpy(plain_ip, addr_str, to_copy);
                             if (split) {
-                                int to_copy = sizeof(plain_ip) - 1;
                                 if (split - addr_str < to_copy) {
                                     to_copy = split - addr_str;
                                 }
-                                memcpy(plain_ip, addr_str, to_copy);
                                 mp_obj_t prefix_obj = mp_parse_num_integer(split + 1, strlen(split + 1), 10, NULL);
                                 prefix_bits = mp_obj_get_int(prefix_obj);
+                                if (mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr4) {
+                                    uint32_t mask = -(1u << (32 - prefix_bits));
+                                    ip_addr_set_ip4_u32_val(netmask, ((mask & 0xFF) << 24) | ((mask & 0xFF00) << 8) | ((mask >> 8) & 0xFF00) | ((mask >> 24) & 0xFF));
+                                }
+                            } else {
+                                netmask = netif->netmask;
                             }
-                            if (mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr4) {
-                                uint32_t mask = -(1u << (32 - prefix_bits));
-                                ip_addr_set_ip4_u32_val(netmask, ((mask & 0xFF) << 24) | ((mask & 0xFF00) << 8) | ((mask >> 8) & 0xFF00) | ((mask >> 24) & 0xFF));
-                            }
-                            if (!ipaddr_aton(addr_str, &ip_addr)) {
+                            plain_ip[to_copy] = '\0';
+                            if (!ipaddr_aton(plain_ip, &ip_addr)) {
                                 mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
                             }
                             if ((mp_obj_str_get_qstr(args[0]) == MP_QSTR_addr6) != IP_IS_V6(&ip_addr)

From b555d6ccafe2ff93bc6372aa322e31a69c56ee40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 28 Mar 2024 17:06:10 +0000
Subject: [PATCH 1129/3129] esp32/network_ppp: Implement network.PPP.ipconfig
 method.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 ports/esp32/network_ppp.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 4e9b2a32ca0b6..47a9b72dc15cf 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -266,6 +266,42 @@ static mp_obj_t ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ppp_ifconfig_obj, 1, 2, ppp_ifconfig);
 
+static mp_obj_t ppp_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    if (kwargs->used == 0) {
+        ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+        if (self->pcb == NULL) {
+            mp_raise_ValueError(MP_ERROR_TEXT("PPP not active"));
+        }
+        struct netif *netif = ppp_netif(self->pcb);
+        // 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_addr4: {
+                mp_obj_t tuple[2] = {
+                    netutils_format_ipv4_addr((uint8_t *)&netif->ip_addr, NETUTILS_BIG),
+                    netutils_format_ipv4_addr((uint8_t *)&netif->netmask, NETUTILS_BIG),
+                };
+                return mp_obj_new_tuple(2, tuple);
+            }
+            case MP_QSTR_gw4: {
+                return netutils_format_ipv4_addr((uint8_t *)&netif->gw, NETUTILS_BIG);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+        return mp_const_none;
+    } else {
+        mp_raise_TypeError(MP_ERROR_TEXT("setting properties not supported"));
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(ppp_ipconfig_obj, 1, ppp_ipconfig);
+
 static mp_obj_t ppp_status(mp_obj_t self_in) {
     return mp_const_none;
 }
@@ -328,6 +364,7 @@ static const mp_rom_map_elem_t ppp_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&ppp_status_obj) },
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&ppp_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&ppp_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&ppp_ipconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&ppp_delete_obj) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_NONE), MP_ROM_INT(PPPAUTHTYPE_NONE) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_PAP), MP_ROM_INT(PPPAUTHTYPE_PAP) },

From 9ece9f9b52ccaab7bbc5bee369b9f5ebac2e5745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Fri, 29 Mar 2024 09:45:04 +0000
Subject: [PATCH 1130/3129] esp8266/network_wlan: Implement network.ipconfig
 and WLAN.ipconfig.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: robert-hh <robert@hammelrath.com>

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 ports/esp8266/modnetwork.h         |   1 +
 ports/esp8266/modnetwork_globals.h |   1 +
 ports/esp8266/network_wlan.c       | 171 +++++++++++++++++++++++++++++
 3 files changed, 173 insertions(+)

diff --git a/ports/esp8266/modnetwork.h b/ports/esp8266/modnetwork.h
index 5fd142e71eefb..5f451c866acda 100644
--- a/ports/esp8266/modnetwork.h
+++ b/ports/esp8266/modnetwork.h
@@ -1,3 +1,4 @@
 extern const mp_obj_type_t esp_network_wlan_type;
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj);
+MP_DECLARE_CONST_FUN_OBJ_KW(esp_network_ipconfig_obj);
diff --git a/ports/esp8266/modnetwork_globals.h b/ports/esp8266/modnetwork_globals.h
index 1a04568024b56..972b0e9806690 100644
--- a/ports/esp8266/modnetwork_globals.h
+++ b/ports/esp8266/modnetwork_globals.h
@@ -1,5 +1,6 @@
 { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&esp_network_wlan_type) },
 { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_network_phy_mode_obj) },
+{ MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&esp_network_ipconfig_obj) },
 
 { MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(STATION_IF)},
 { MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(SOFTAP_IF)},
diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index af1611a2496ed..57ad5d8305c1d 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -31,6 +31,7 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "py/parsenum.h"
 #include "extmod/modnetwork.h"
 #include "shared/netutils/netutils.h"
 #include "queue.h"
@@ -41,6 +42,8 @@
 #include "lwip/dns.h"
 #include "modnetwork.h"
 
+#define IPADDR_STRLEN_MAX  (20)
+
 typedef struct _wlan_if_obj_t {
     mp_obj_base_t base;
     int if_id;
@@ -330,6 +333,173 @@ static mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_ifconfig_obj, 1, 2, esp_ifconfig);
 
+static mp_obj_t esp_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+
+        switch (mp_obj_str_get_qstr(args[0])) {
+            case MP_QSTR_dns: {
+                char addr_str[IPADDR_STRLEN_MAX];
+                ip_addr_t dns_addr = dns_getserver(0);
+                ipaddr_ntoa_r(&dns_addr, addr_str, sizeof(addr_str));
+                return mp_obj_new_str(addr_str, strlen(addr_str));
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+    } else {
+        // Set config value(s)
+        if (n_args != 0) {
+            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_dns: {
+                        ip_addr_t dns;
+                        size_t addr_len;
+                        const char *addr_str = mp_obj_str_get_data(e->value, &addr_len);
+                        if (!ipaddr_aton(addr_str, &dns)) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments as dns server"));
+                        }
+                        dns_setserver(0, &dns);
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(esp_network_ipconfig_obj, 0, esp_network_ipconfig);
+
+static mp_obj_t esp_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    struct ip_info info;
+    wifi_get_ip_info(self->if_id, &info);
+
+    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_dhcp4: {
+                if (self->if_id == STATION_IF) {
+                    return mp_obj_new_bool(wifi_station_dhcpc_status() == DHCP_STARTED);
+                } else if (self->if_id == SOFTAP_IF) {
+                    return mp_obj_new_bool(wifi_softap_dhcps_status() == DHCP_STARTED);
+                } else {
+                    mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                    break;
+                }
+            }
+            case MP_QSTR_addr4: {
+                mp_obj_t tuple[2] = {
+                    netutils_format_ipv4_addr((uint8_t *)&info.ip, NETUTILS_BIG),
+                    netutils_format_ipv4_addr((uint8_t *)&info.netmask, NETUTILS_BIG),
+                };
+                return mp_obj_new_tuple(2, tuple);
+            }
+            case MP_QSTR_gw4: {
+                return netutils_format_ipv4_addr((uint8_t *)&info.gw, NETUTILS_BIG);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+        return mp_const_none;
+    } else {
+        // Set config value(s)
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
+        }
+        int touched_ip_info = 0;
+        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_dhcp4: {
+                        if (self->if_id == STATION_IF) {
+                            enum dhcp_status status = wifi_station_dhcpc_status();
+                            if (mp_obj_is_true(e->value) && status != DHCP_STARTED) {
+                                wifi_station_dhcpc_start();
+                            } else if (!mp_obj_is_true(e->value) && status == DHCP_STARTED) {
+                                wifi_station_dhcpc_stop();
+                            }
+                        } else {
+                            mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                            break;
+                        }
+                        break;
+                    }
+                    case MP_QSTR_addr4: {
+                        if (e->value != mp_const_none && mp_obj_is_str(e->value)) {
+                            size_t addr_len;
+                            const char *input_str = mp_obj_str_get_data(e->value, &addr_len);
+                            char *split = strchr(input_str, '/');
+                            if (split) {
+                                mp_obj_t prefix_obj = mp_parse_num_integer(split + 1, strlen(split + 1), 10, NULL);
+                                int prefix_bits = mp_obj_get_int(prefix_obj);
+                                uint32_t mask = -(1u << (32 - prefix_bits));
+                                uint32_t *m = (uint32_t *)&info.netmask;
+                                *m = htonl(mask);
+                            }
+                            netutils_parse_ipv4_addr(e->value, (void *)&info.ip, NETUTILS_BIG);
+                        } else if (e->value != mp_const_none) {
+                            mp_obj_t *items;
+                            mp_obj_get_array_fixed_n(e->value, 2, &items);
+                            netutils_parse_ipv4_addr(items[0], (void *)&info.ip, NETUTILS_BIG);
+                            netutils_parse_ipv4_addr(items[1], (void *)&info.netmask, NETUTILS_BIG);
+                        }
+                        touched_ip_info = 1;
+                        break;
+                    }
+                    case MP_QSTR_gw4: {
+                        netutils_parse_ipv4_addr(e->value, (void *)&info.gw, NETUTILS_BIG);
+                        touched_ip_info = 1;
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+        bool restart_dhcp_server = false;
+        if (self->if_id == STATION_IF) {
+            if (touched_ip_info) {
+                wifi_station_dhcpc_stop();
+                wifi_set_ip_info(self->if_id, &info);
+            }
+        } else {
+            restart_dhcp_server = wifi_softap_dhcps_status();
+            wifi_softap_dhcps_stop();
+            wifi_set_ip_info(self->if_id, &info);
+        }
+        if (restart_dhcp_server) {
+            wifi_softap_dhcps_start();
+        }
+
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp_nic_ipconfig_obj, 1, esp_ipconfig);
+
 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"));
@@ -514,6 +684,7 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { 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) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&esp_nic_ipconfig_obj) },
 
     // Constants
     { MP_ROM_QSTR(MP_QSTR_IF_STA), MP_ROM_INT(STATION_IF)},

From e138bafbc7888108a22dd1c9c5c7105d5facfde1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 29 Mar 2024 15:25:16 +0100
Subject: [PATCH 1131/3129] cc3200/mods: Implement network.ipconfig and
 network.WLAN.ipconfig.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/cc3200/mods/modnetwork.c |  49 +++++++++++++++
 ports/cc3200/mods/modwlan.c    | 112 +++++++++++++++++++++++++++++++++
 2 files changed, 161 insertions(+)

diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index 3a949136dcfdd..e16668f8adb0d 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -28,6 +28,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 #include "serverstask.h"
 #include "simplelink.h"
@@ -53,6 +54,53 @@ static const mp_obj_type_t network_server_type;
 void mod_network_init0(void) {
 }
 
+static mp_obj_t mod_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    unsigned char len = sizeof(SlNetCfgIpV4Args_t);
+    unsigned char dhcpIsOn;
+    SlNetCfgIpV4Args_t ipV4;
+    sl_NetCfgGet(SL_IPV4_STA_P2P_CL_GET_INFO, &dhcpIsOn, &len, (uint8_t *)&ipV4);
+
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+        switch (mp_obj_str_get_qstr(args[0])) {
+            case MP_QSTR_dns: {
+                return netutils_format_ipv4_addr((uint8_t *)&ipV4.ipV4DnsServer, NETUTILS_LITTLE);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+    } else {
+        // Set config value(s)
+        if (n_args != 0) {
+            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_dns: {
+                        netutils_parse_ipv4_addr(e->value, (uint8_t *)&ipV4.ipV4DnsServer, NETUTILS_LITTLE);
+                        sl_NetCfgSet(SL_IPV4_STA_P2P_CL_STATIC_ENABLE, IPCONFIG_MODE_ENABLE_IPV4, sizeof(SlNetCfgIpV4Args_t), (_u8 *)&ipV4);
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(mod_network_ipconfig_obj, 0, mod_network_ipconfig);
+
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
 static mp_obj_t network_server_init_helper(mp_obj_t self, const mp_arg_val_t *args) {
     const char *user = SERVERS_DEF_USER;
@@ -145,6 +193,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(network_server_deinit_obj, network_server_deini
 
 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_ipconfig),            MP_ROM_PTR(&mod_network_ipconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_WLAN),                MP_ROM_PTR(&mod_network_nic_type_wlan) },
 
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index fc55201eaa3c0..34b5adab28b8c 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -32,6 +32,7 @@
 #include "py/mpconfig.h"
 #include "py/obj.h"
 #include "py/objstr.h"
+#include "py/parsenum.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
@@ -1057,6 +1058,116 @@ static mp_obj_t wlan_ifconfig(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(wlan_ifconfig_obj, 1, wlan_ifconfig);
 
+static mp_obj_t wlan_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    unsigned char len = sizeof(SlNetCfgIpV4Args_t);
+    unsigned char dhcpIsOn;
+    SlNetCfgIpV4Args_t ipV4;
+    sl_NetCfgGet(SL_IPV4_STA_P2P_CL_GET_INFO, &dhcpIsOn, &len, (uint8_t *)&ipV4);
+
+    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_dhcp4: {
+                return mp_obj_new_bool(dhcpIsOn);
+            }
+            case MP_QSTR_has_dhcp4: {
+                return mp_obj_new_bool(dhcpIsOn && ipV4.ipV4 != 0);
+            }
+            case MP_QSTR_addr4: {
+                mp_obj_t tuple[2] = {
+                    netutils_format_ipv4_addr((uint8_t *)&ipV4.ipV4, NETUTILS_LITTLE),
+                    netutils_format_ipv4_addr((uint8_t *)&ipV4.ipV4Mask, NETUTILS_LITTLE),
+                };
+                return mp_obj_new_tuple(2, tuple);
+            }
+            case MP_QSTR_gw4: {
+                return netutils_format_ipv4_addr((uint8_t *)&ipV4.ipV4Gateway, NETUTILS_LITTLE);
+            }
+            default: {
+                mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                break;
+            }
+        }
+        return mp_const_none;
+    } 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_dhcp4: {
+                        if (wlan_obj.mode == ROLE_AP) {
+                            if (mp_obj_is_true(e->value)) {
+                                sl_NetCfgSet(SL_IPV4_AP_P2P_GO_STATIC_ENABLE, IPCONFIG_MODE_ENABLE_IPV4,
+                                    sizeof(SlNetCfgIpV4Args_t), (_u8 *)&ipV4);
+                                SlNetAppDhcpServerBasicOpt_t dhcpParams;
+                                dhcpParams.lease_time      =  4096;                             // lease time (in seconds) of the IP Address
+                                dhcpParams.ipv4_addr_start =  ipV4.ipV4 + 1;                    // first IP Address for allocation.
+                                dhcpParams.ipv4_addr_last  =  (ipV4.ipV4 & 0xFFFFFF00) + 254;   // last IP Address for allocation.
+                                sl_NetAppStop(SL_NET_APP_DHCP_SERVER_ID);      // stop DHCP server before settings
+                                sl_NetAppSet(SL_NET_APP_DHCP_SERVER_ID, NETAPP_SET_DHCP_SRV_BASIC_OPT,
+                                    sizeof(SlNetAppDhcpServerBasicOpt_t), (_u8* )&dhcpParams);  // set parameters
+                                sl_NetAppStart(SL_NET_APP_DHCP_SERVER_ID);     // start DHCP server with new settings
+                            } else {
+                                sl_NetAppStop(SL_NET_APP_DHCP_SERVER_ID);      // stop DHCP server before settings
+                            }
+                        } else {
+                            _u8 val = 1;
+                            if (mp_obj_is_true(e->value)) {
+                                sl_NetCfgSet(SL_IPV4_STA_P2P_CL_DHCP_ENABLE, IPCONFIG_MODE_ENABLE_IPV4, 1, &val);
+                            } else {
+                                sl_NetCfgSet(SL_IPV4_STA_P2P_CL_STATIC_ENABLE, IPCONFIG_MODE_ENABLE_IPV4,
+                                    sizeof(SlNetCfgIpV4Args_t), (_u8 *)&ipV4);
+                            }
+                        }
+                        break;
+                    }
+                    case MP_QSTR_addr4: {
+                        int prefix_bits = 32;
+                        if (e->value != mp_const_none && mp_obj_is_str(e->value)) {
+                            size_t addr_len;
+                            const char *input_str = mp_obj_str_get_data(e->value, &addr_len);
+                            char *split = strchr(input_str, '/');
+                            if (split) {
+                                mp_obj_t prefix_obj = mp_parse_num_integer(split + 1, strlen(split + 1), 10, NULL);
+                                prefix_bits = mp_obj_get_int(prefix_obj);
+                                ipV4.ipV4Mask = -(1u << (32 - prefix_bits));
+                            }
+                            netutils_parse_ipv4_addr(e->value, (uint8_t *)&ipV4.ipV4, NETUTILS_LITTLE);
+                        } else if (e->value != mp_const_none) {
+                            mp_obj_t *items;
+                            mp_obj_get_array_fixed_n(e->value, 2, &items);
+                            netutils_parse_ipv4_addr(items[0], (uint8_t *)&ipV4.ipV4, NETUTILS_LITTLE);
+                            netutils_parse_ipv4_addr(items[1], (uint8_t *)&ipV4.ipV4Mask, NETUTILS_LITTLE);
+                        }
+                        ASSERT_ON_ERROR(sl_NetCfgSet(SL_IPV4_STA_P2P_CL_STATIC_ENABLE, IPCONFIG_MODE_ENABLE_IPV4, sizeof(SlNetCfgIpV4Args_t), (_u8 *)&ipV4));
+                        break;
+                    }
+                    case MP_QSTR_gw4: {
+                        netutils_parse_ipv4_addr(e->value, (uint8_t *)&ipV4.ipV4Gateway, NETUTILS_LITTLE);
+                        sl_NetCfgSet(SL_IPV4_STA_P2P_CL_STATIC_ENABLE, IPCONFIG_MODE_ENABLE_IPV4, sizeof(SlNetCfgIpV4Args_t), (_u8 *)&ipV4);
+                        break;
+                    }
+                    default: {
+                        mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(wlan_ipconfig_obj, 1, wlan_ipconfig);
+
 static mp_obj_t wlan_mode(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
@@ -1260,6 +1371,7 @@ static const mp_rom_map_elem_t wlan_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disconnect),          MP_ROM_PTR(&wlan_disconnect_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected),         MP_ROM_PTR(&wlan_isconnected_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig),            MP_ROM_PTR(&wlan_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig),            MP_ROM_PTR(&wlan_ipconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_mode),                MP_ROM_PTR(&wlan_mode_obj) },
     { MP_ROM_QSTR(MP_QSTR_ssid),                MP_ROM_PTR(&wlan_ssid_obj) },
     { MP_ROM_QSTR(MP_QSTR_auth),                MP_ROM_PTR(&wlan_auth_obj) },

From d144f0699de10b10ce42f3013f46d46b8fe97c13 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 15 May 2024 14:40:23 +1000
Subject: [PATCH 1132/3129] lib/tinyusb: Update to the most recent master.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 1fdf29075d4e6..d10b65ada4be7 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 1fdf29075d4e613eacfa881166015263797db0f6
+Subproject commit d10b65ada4be7d5754b3128e80a9b4db72bdb23f

From 8809ae71610c2b3af4128c498d711535195d5221 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 15 May 2024 14:40:23 +1000
Subject: [PATCH 1133/3129] shared/tinyusb: Buffer startup CDC data to send to
 host on connection.

At startup, buffer initial stdout / MicroyPthon banner so that it can be
sent to the host on initial connection of the USB serial port.  This
buffering also works for when the CDC becomes disconnected and the device
is still printing to stdout, and when CDC is reconnected the most recent
part of stdout (depending on how big the internal USB FIFO is) is flushed
to the host.

This change is most obvious when you've first plugged in a MicroPython
device (or hit reset), when it's a board that uses USB (CDC) serial in the
chip itself for the REPL interface.  This doesn't apply to UART going via a
separate USB-serial chip.

The stm32 port already has this buffering behaviour (it doesn't use
TinyUSB) and this commit extends such behaviour to rp2, mimxrt, samd and
renesas-ra ports, which do use TinyUSB.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/mimxrt/tusb_config.h   |  1 +
 shared/tinyusb/mp_usbd_cdc.c | 53 +++++++++++++++++++++++++++---------
 shared/tinyusb/tusb_config.h |  1 +
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/ports/mimxrt/tusb_config.h b/ports/mimxrt/tusb_config.h
index 862fb6c52d2e5..607f36446f858 100644
--- a/ports/mimxrt/tusb_config.h
+++ b/ports/mimxrt/tusb_config.h
@@ -32,5 +32,6 @@
 #define CFG_TUD_CDC             (1)
 #define CFG_TUD_CDC_RX_BUFSIZE  (512)
 #define CFG_TUD_CDC_TX_BUFSIZE  (512)
+#define CFG_TUD_CDC_PERSISTENT_TX_BUFF (1)
 
 #endif // MICROPY_INCLUDED_MIMXRT_TUSB_CONFIG_H
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index 6d789ff5e81ca..674d6b089947e 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -35,6 +35,7 @@
 #if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC
 
 static uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
+static int8_t cdc_connected_flush_delay = 0;
 
 uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags) {
     uintptr_t ret = 0;
@@ -58,7 +59,9 @@ uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags) {
     if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
         ret |= MP_STREAM_POLL_RD;
     }
-    if ((poll_flags & MP_STREAM_POLL_WR) && tud_cdc_connected() && tud_cdc_write_available() > 0) {
+    if ((poll_flags & MP_STREAM_POLL_WR) &&
+        (!tud_cdc_connected() || (tud_cdc_connected() && tud_cdc_write_available() > 0))) {
+        // Always allow write when not connected, fifo will retain latest.
         // When connected operate as blocking, only allow if space is available.
         ret |= MP_STREAM_POLL_WR;
     }
@@ -93,14 +96,14 @@ void tud_cdc_rx_cb(uint8_t itf) {
 
 mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
     size_t i = 0;
-    if (tud_cdc_connected()) {
-        while (i < len) {
-            uint32_t n = len - i;
-            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
-                n = CFG_TUD_CDC_EP_BUFSIZE;
-            }
+    while (i < len) {
+        uint32_t n = len - i;
+        if (n > CFG_TUD_CDC_EP_BUFSIZE) {
+            n = CFG_TUD_CDC_EP_BUFSIZE;
+        }
+        if (tud_cdc_connected()) {
             int timeout = 0;
-            // Wait with a max of USC_CDC_TIMEOUT ms
+            // If CDC port is connected but the buffer is full, wait for up to USC_CDC_TIMEOUT ms.
             while (n > tud_cdc_write_available() && timeout++ < MICROPY_HW_USB_CDC_TX_TIMEOUT) {
                 mp_event_wait_ms(1);
 
@@ -108,27 +111,40 @@ mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
                 // are in an interrupt handler), while there is data pending.
                 mp_usbd_task();
             }
-            if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+            // Limit write to available space in tx buffer when connected.
+            n = MIN(n, tud_cdc_write_available());
+            if (n == 0) {
                 break;
             }
-            uint32_t n2 = tud_cdc_write(str + i, n);
-            tud_cdc_write_flush();
-            i += n2;
         }
+        // When not connected we always write to usb fifo, ensuring it has latest data.
+        uint32_t n2 = tud_cdc_write(str + i, n);
+        tud_cdc_write_flush();
+        i += n2;
     }
     return i;
 }
 
+void tud_sof_cb(uint32_t frame_count) {
+    if (--cdc_connected_flush_delay < 0) {
+        // Finished on-connection delay, disable SOF interrupt again.
+        tud_sof_cb_enable(false);
+        tud_cdc_write_flush();
+    }
+}
+
 #endif
 
-#if MICROPY_HW_USB_CDC_1200BPS_TOUCH && MICROPY_HW_ENABLE_USBDEV
+#if MICROPY_HW_ENABLE_USBDEV && (MICROPY_HW_USB_CDC_1200BPS_TOUCH || MICROPY_HW_USB_CDC)
 
+#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
 
 void
 #if MICROPY_HW_USB_EXTERNAL_TINYUSB
@@ -137,6 +153,16 @@ mp_usbd_line_state_cb
 tud_cdc_line_state_cb
 #endif
     (uint8_t itf, bool dtr, bool rts) {
+    #if MICROPY_HW_USB_CDC && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC
+    if (dtr) {
+        // A host application has started to open the cdc serial port.
+        // Wait a few ms for host to be ready then send tx buffer.
+        // High speed connection SOF fires at 125us, full speed at 1ms.
+        cdc_connected_flush_delay = (tud_speed_get() == TUSB_SPEED_HIGH) ? 128 : 16;
+        tud_sof_cb_enable(true);
+    }
+    #endif
+    #if MICROPY_HW_USB_CDC_1200BPS_TOUCH
     if (dtr == false && rts == false) {
         // Device is disconnected.
         cdc_line_coding_t line_coding;
@@ -146,6 +172,7 @@ tud_cdc_line_state_cb
             mp_sched_schedule_node(&mp_bootloader_sched_node, usbd_cdc_run_bootloader_task);
         }
     }
+    #endif
 }
 
 #endif
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index ab47321afdc04..1f8f5e5f6dc56 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -79,6 +79,7 @@
 #if CFG_TUD_CDC
 #define CFG_TUD_CDC_RX_BUFSIZE  ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
 #define CFG_TUD_CDC_TX_BUFSIZE  ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
+#define CFG_TUD_CDC_PERSISTENT_TX_BUFF (1)
 #endif
 
 // MSC Configuration

From 596f92bf77a44cefe5a3ec6e0c3fee8cfb5a3906 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 13 Oct 2023 18:52:15 +0200
Subject: [PATCH 1134/3129] tools/makemanifest.py: Generate working code for
 empty manifests.

When no usable manifest directives are found (as opposed to no manifest
being set in the makefile), non-compiling code was generated for the
empty frozen constants pool block.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/makemanifest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index a74a6934aeabe..e076a03e0be3c 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -245,7 +245,11 @@ def main():
             b'#include "py/emitglue.h"\n'
             b"extern const qstr_pool_t mp_qstr_const_pool;\n"
             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"    #if MICROPY_QSTR_BYTES_IN_HASH\n"
+            b"    (qstr_pool_t*)&mp_qstr_const_pool, MP_QSTRnumber_of, 0, 0, 0, NULL, NULL, {},\n"
+            b"    #else\n"
+            b"    (qstr_pool_t*)&mp_qstr_const_pool, MP_QSTRnumber_of, 0, 0, 0, NULL, {},\n"
+            b"    #endif\n"
             b"};\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"

From e6ae69999851c143e97f1214678e8f966ee69803 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 22 May 2024 08:07:26 +0200
Subject: [PATCH 1135/3129] py/nlrrv32: Add RISC-V RV32I NLR implementation.

Add custom NLR support for 32 bits RISC-V RV32I targets.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/nlr.h     |  4 +++
 py/nlrrv32.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 py/py.cmake  |  1 +
 py/py.mk     |  1 +
 4 files changed, 87 insertions(+)
 create mode 100644 py/nlrrv32.c

diff --git a/py/nlr.h b/py/nlr.h
index 62972dba62713..80f6d7cc11493 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -44,6 +44,7 @@
 #define MICROPY_NLR_NUM_REGS_MIPS           (13)
 #define MICROPY_NLR_NUM_REGS_XTENSA         (10)
 #define MICROPY_NLR_NUM_REGS_XTENSAWIN      (17)
+#define MICROPY_NLR_NUM_REGS_RV32I          (14)
 
 // *FORMAT-OFF*
 
@@ -88,6 +89,9 @@
 #elif defined(__mips__)
     #define MICROPY_NLR_MIPS (1)
     #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_MIPS)
+#elif defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen == 32)
+    #define MICROPY_NLR_RV32I (1)
+    #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_RV32I)
 #else
     #define MICROPY_NLR_SETJMP (1)
     //#warning "No native NLR support for this arch, using setjmp implementation"
diff --git a/py/nlrrv32.c b/py/nlrrv32.c
new file mode 100644
index 0000000000000..9a12ede400daa
--- /dev/null
+++ b/py/nlrrv32.c
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_RV32I
+
+#undef nlr_push
+
+__attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
+    __asm volatile (
+        "sw   x1,  8(x10)       \n" // Store RA.
+        "sw   x8, 12(x10)       \n" // Store S0.
+        "sw   x9, 16(x10)       \n" // Store S1.
+        "sw  x18, 20(x10)       \n" // Store S2.
+        "sw  x19, 24(x10)       \n" // Store S3.
+        "sw  x20, 28(x10)       \n" // Store S4.
+        "sw  x21, 32(x10)       \n" // Store S5.
+        "sw  x22, 36(x10)       \n" // Store S6.
+        "sw  x23, 40(x10)       \n" // Store S7.
+        "sw  x24, 44(x10)       \n" // Store S8.
+        "sw  x25, 48(x10)       \n" // Store S9.
+        "sw  x26, 52(x10)       \n" // Store S10.
+        "sw  x27, 56(x10)       \n" // Store S11.
+        "sw   x2, 60(x10)       \n" // Store SP.
+        "jal  x0, nlr_push_tail \n" // Jump to the C part.
+        );
+}
+
+NORETURN void nlr_jump(void *val) {
+    MP_NLR_JUMP_HEAD(val, top)
+    __asm volatile (
+        "add  x10, x0, %0  \n" // Load nlr_buf address.
+        "lw   x1,  8(x10)  \n" // Retrieve RA.
+        "lw   x8, 12(x10)  \n" // Retrieve S0.
+        "lw   x9, 16(x10)  \n" // Retrieve S1.
+        "lw  x18, 20(x10)  \n" // Retrieve S2.
+        "lw  x19, 24(x10)  \n" // Retrieve S3.
+        "lw  x20, 28(x10)  \n" // Retrieve S4.
+        "lw  x21, 32(x10)  \n" // Retrieve S5.
+        "lw  x22, 36(x10)  \n" // Retrieve S6.
+        "lw  x23, 40(x10)  \n" // Retrieve S7.
+        "lw  x24, 44(x10)  \n" // Retrieve S8.
+        "lw  x25, 48(x10)  \n" // Retrieve S9.
+        "lw  x26, 52(x10)  \n" // Retrieve S10.
+        "lw  x27, 56(x10)  \n" // Retrieve S11.
+        "lw   x2, 60(x10)  \n" // Retrieve SP.
+        "addi x10, x0, 1   \n" // Return 1 for a non-local return.
+        "jalr  x0, x1, 0   \n" // Return.
+        :                      // Outputs.
+        : "r" (top)            // Inputs.
+        : "memory"             // Clobbered.
+        );
+
+    MP_UNREACHABLE
+}
+
+#endif // MICROPY_NLR_RV32I
diff --git a/py/py.cmake b/py/py.cmake
index 95a841b5f4a02..74a433c97a3f1 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -55,6 +55,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/nlr.c
     ${MICROPY_PY_DIR}/nlrmips.c
     ${MICROPY_PY_DIR}/nlrpowerpc.c
+    ${MICROPY_PY_DIR}/nlrrv32.c
     ${MICROPY_PY_DIR}/nlrsetjmp.c
     ${MICROPY_PY_DIR}/nlrthumb.c
     ${MICROPY_PY_DIR}/nlrx64.c
diff --git a/py/py.mk b/py/py.mk
index e81df52fb7f99..1378968c9646b 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -83,6 +83,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	nlrmips.o \
 	nlrpowerpc.o \
 	nlrxtensa.o \
+	nlrrv32.o \
 	nlrsetjmp.o \
 	malloc.o \
 	gc.o \

From de0e13a9a82fb27a50aa632b6c22663d9d58a4a0 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 22 May 2024 09:03:10 +0200
Subject: [PATCH 1136/3129] shared/runtime/gchelper: Add RISC-V RV32I native
 gchelper.

Add native gchelper support for 32 bits RISC-V RV32I targets.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 shared/runtime/gchelper.h         |  2 ++
 shared/runtime/gchelper_generic.c | 31 ++++++++++++++++++
 shared/runtime/gchelper_rv32i.s   | 52 +++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 shared/runtime/gchelper_rv32i.s

diff --git a/shared/runtime/gchelper.h b/shared/runtime/gchelper.h
index 645ee837f5146..a863fb9aa880a 100644
--- a/shared/runtime/gchelper.h
+++ b/shared/runtime/gchelper.h
@@ -41,6 +41,8 @@ typedef uintptr_t gc_helper_regs_t[4];
 typedef uintptr_t gc_helper_regs_t[10];
 #elif defined(__aarch64__)
 typedef uintptr_t gc_helper_regs_t[11]; // x19-x29
+#elif defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen == 32)
+typedef uintptr_t gc_helper_regs_t[12]; // S0-S11
 #endif
 
 #endif
diff --git a/shared/runtime/gchelper_generic.c b/shared/runtime/gchelper_generic.c
index 4ef2e73f7a2ee..f1087e1990f60 100644
--- a/shared/runtime/gchelper_generic.c
+++ b/shared/runtime/gchelper_generic.c
@@ -150,6 +150,37 @@ static void gc_helper_get_regs(gc_helper_regs_t arr) {
     arr[10] = x29;
 }
 
+#elif defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen == 32)
+
+// Fallback implementation for RV32I, prefer gchelper_rv32i.s
+
+static void gc_helper_get_regs(gc_helper_regs_t arr) {
+    register long s0 asm ("x8");
+    register long s1 asm ("x9");
+    register long s2 asm ("x18");
+    register long s3 asm ("x19");
+    register long s4 asm ("x20");
+    register long s5 asm ("x21");
+    register long s6 asm ("x22");
+    register long s7 asm ("x23");
+    register long s8 asm ("x24");
+    register long s9 asm ("x25");
+    register long s10 asm ("x26");
+    register long s11 asm ("x27");
+    arr[0] = s0;
+    arr[1] = s1;
+    arr[2] = s2;
+    arr[3] = s3;
+    arr[4] = s4;
+    arr[5] = s5;
+    arr[6] = s6;
+    arr[7] = s7;
+    arr[8] = s8;
+    arr[9] = s9;
+    arr[10] = s10;
+    arr[11] = s11;
+}
+
 #else
 
 #error "Architecture not supported for gc_helper_get_regs. Set MICROPY_GCREGS_SETJMP to use the fallback implementation."
diff --git a/shared/runtime/gchelper_rv32i.s b/shared/runtime/gchelper_rv32i.s
new file mode 100644
index 0000000000000..64248e771a861
--- /dev/null
+++ b/shared/runtime/gchelper_rv32i.s
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+    .global gc_helper_get_regs_and_sp
+    .type   gc_helper_get_regs_and_sp, @function
+
+gc_helper_get_regs_and_sp:
+
+    /* Store registers into the given array. */
+
+    sw    x8,  0(x10)  /* Save S0.  */
+    sw    x9,  4(x10)  /* Save S1.  */
+    sw   x18,  8(x10)  /* Save S2.  */
+    sw   x19, 12(x10)  /* Save S3.  */
+    sw   x20, 16(x10)  /* Save S4.  */
+    sw   x21, 20(x10)  /* Save S5.  */
+    sw   x22, 24(x10)  /* Save S6.  */
+    sw   x23, 28(x10)  /* Save S7.  */
+    sw   x24, 32(x10)  /* Save S8.  */
+    sw   x25, 36(x10)  /* Save S9.  */
+    sw   x26, 40(x10)  /* Save S10. */
+    sw   x27, 44(x10)  /* Save S11. */
+
+    /* Return the stack pointer. */
+
+    add  x10, x0, x2
+    jalr  x0, x1, 0
+
+    .size gc_helper_get_regs_and_sp, .-gc_helper_get_regs_and_sp

From 90d50ce9189feffb63ebf9b92d4302bd5c12730b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 22 May 2024 10:17:13 +0200
Subject: [PATCH 1137/3129] shared/runtime/semihosting: Rename ARM semihosting
 files.

Make room for RISC-V semihosting code, by renaming the existing
`semihosting.[ch]` files into `semihosting_arm.[ch]`.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 shared/runtime/{semihosting.c => semihosting_arm.c} |  2 +-
 shared/runtime/{semihosting.h => semihosting_arm.h} | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename shared/runtime/{semihosting.c => semihosting_arm.c} (99%)
 rename shared/runtime/{semihosting.h => semihosting_arm.h} (86%)

diff --git a/shared/runtime/semihosting.c b/shared/runtime/semihosting_arm.c
similarity index 99%
rename from shared/runtime/semihosting.c
rename to shared/runtime/semihosting_arm.c
index 18c7f5d57a3f3..3ca29d5d752c4 100644
--- a/shared/runtime/semihosting.c
+++ b/shared/runtime/semihosting_arm.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "semihosting.h"
+#include "semihosting_arm.h"
 
 // Resources:
 // http://embed.rs/articles/2016/semi-hosting-rust/
diff --git a/shared/runtime/semihosting.h b/shared/runtime/semihosting_arm.h
similarity index 86%
rename from shared/runtime/semihosting.h
rename to shared/runtime/semihosting_arm.h
index d053a03edaae9..7e90f25ac916c 100644
--- a/shared/runtime/semihosting.h
+++ b/shared/runtime/semihosting_arm.h
@@ -23,16 +23,16 @@
  * 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
+#ifndef MICROPY_INCLUDED_SHARED_RUNTIME_SEMIHOSTING_ARM_H
+#define MICROPY_INCLUDED_SHARED_RUNTIME_SEMIHOSTING_ARM_H
 
 /*
 
 To use semi-hosting for a replacement UART:
-- Add lib/semihosting/semihosting.c to the Makefile sources.
+- Add shared/runtime/semihosting_arm.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.
+- Include shared/runtime/semihosting_arm.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
@@ -48,4 +48,4 @@ 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
+#endif // MICROPY_INCLUDED_SHARED_RUNTIME_SEMIHOSTING_ARM_H

From ace08c39786871f4674c2d36a4b59343d64c7603 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 22 May 2024 10:50:20 +0200
Subject: [PATCH 1138/3129] shared/runtime/semihosting: Add RISC-V semihosting
 support.

This adds a RISC-V RV32 semihosting implementation, with all defined
system calls exposed to the user.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 shared/runtime/semihosting_rv32.c | 481 ++++++++++++++++++++++++++++++
 shared/runtime/semihosting_rv32.h | 247 +++++++++++++++
 2 files changed, 728 insertions(+)
 create mode 100644 shared/runtime/semihosting_rv32.c
 create mode 100644 shared/runtime/semihosting_rv32.h

diff --git a/shared/runtime/semihosting_rv32.c b/shared/runtime/semihosting_rv32.c
new file mode 100644
index 0000000000000..1d02b69b23ea8
--- /dev/null
+++ b/shared/runtime/semihosting_rv32.c
@@ -0,0 +1,481 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "semihosting_rv32.h"
+
+#if !defined(__riscv) || !defined(__riscv_xlen) || (__riscv_xlen != 32)
+#error "This semihosting support code is only available for RV32 targets."
+#endif
+
+// Features file magic header.
+#define MAGIC_SIZE 4
+#define MAGIC_0 0x53 // 'S'
+#define MAGIC_1 0x48 // 'H'
+#define MAGIC_2 0x46 // 'B'
+#define MAGIC_3 0x42 // 'F'
+
+#define CMDLINE_MIN_BUFFER_SIZE 80
+
+#define SYS_OPEN          0x01
+#define SYS_CLOSE         0x02
+#define SYS_WRITEC        0x03
+#define SYS_WRITE0        0x04
+#define SYS_WRITE         0x05
+#define SYS_READ          0x06
+#define SYS_READC         0x07
+#define SYS_ISERROR       0x08
+#define SYS_ISTTY         0x09
+#define SYS_SEEK          0x0A
+#define SYS_FLEN          0x0C
+#define SYS_TMPNAM        0x0D
+#define SYS_REMOVE        0x0E
+#define SYS_RENAME        0x0F
+#define SYS_CLOCK         0x10
+#define SYS_TIME          0x11
+#define SYS_SYSTEM        0x12
+#define SYS_ERRNO         0x13
+#define SYS_GET_CMDLINE   0x15
+#define SYS_HEAPINFO      0x16
+#define SYS_EXIT          0x18
+#define SYS_EXIT_EXTENDED 0x20
+#define SYS_ELAPSED       0x30
+#define SYS_TICKFREQ      0x31
+
+// Extended features availability flags.
+static bool exit_extended_available = false;
+static bool split_stdout_stderr = false;
+
+// Perform a semihosting call with the given call number and using the given
+// parameters block.
+int mp_semihosting_call(uint32_t num, void *arg);
+
+// Convert the given fopen(3) open mode string into the appropriate integer
+// value required by SYS_OPEN.  If the mode is invalid, it will return -1.
+static int mp_lookup_open_mode(const char *mode);
+
+// Computes the length of the given string.  If it gets passed a NULL pointer
+// it will return -1.
+static int mp_strlen(const char *string);
+
+// Check which extended features are advertised by the host system.
+static void mp_check_extended_features_availability(void);
+
+// Write the given string to the host system's debug console.
+static int mp_write_to_debug_console(const char *string, size_t length);
+
+// The host system's STDOUT file handle.
+int mp_semihosting_stdout = -1;
+
+// The host system's STDERR file handle.
+int mp_semihosting_stderr = -1;
+
+int mp_semihosting_open(const char *file_name, const char *file_mode) {
+    if (file_name == NULL || file_mode == NULL) {
+        return -1;
+    }
+
+    int file_name_length = mp_strlen(file_name);
+    if (file_name_length <= 0) {
+        return -1;
+    }
+    int file_open_mode = mp_lookup_open_mode(file_mode);
+    if (file_open_mode < 0) {
+        return -1;
+    }
+
+    uint32_t arguments[3] = { (uintptr_t)file_name, file_open_mode, file_name_length };
+    return mp_semihosting_call(SYS_OPEN, arguments);
+}
+
+int mp_semihosting_close(int handle) {
+    uint32_t arguments[] = { handle };
+    return mp_semihosting_call(SYS_CLOSE, arguments);
+}
+
+void mp_semihosting_writec(char character) {
+    uint32_t arguments[] = { character };
+    mp_semihosting_call(SYS_WRITEC, arguments);
+}
+
+void mp_semihosting_write0(const char *string) {
+    if (string == NULL) {
+        return;
+    }
+    uint32_t arguments[] = { (uintptr_t)string };
+    mp_semihosting_call(SYS_WRITE0, arguments);
+}
+
+int mp_semihosting_write(int handle, const void *data, size_t length) {
+    if (data == NULL) {
+        return length;
+    }
+    if (length == 0) {
+        return 0;
+    }
+
+    uint32_t arguments[] = { handle, (uintptr_t)data, length };
+    return mp_semihosting_call(SYS_WRITE, arguments);
+}
+
+int mp_semihosting_read(int handle, void *data, size_t length) {
+    if (data == NULL) {
+        return -1;
+    }
+    if (length == 0) {
+        return 0;
+    }
+
+    uint32_t arguments[] = { handle, (uintptr_t)data, length };
+    return mp_semihosting_call(SYS_READ, arguments);
+}
+
+inline int mp_semihosting_readc(void) {
+    return mp_semihosting_call(SYS_READC, NULL);
+}
+
+int mp_semihosting_iserror(int code) {
+    uint32_t arguments[] = { code };
+    return mp_semihosting_call(SYS_ISERROR, arguments);
+}
+
+int mp_semihosting_istty(int handle) {
+    uint32_t arguments[] = { handle };
+    return mp_semihosting_call(SYS_ISTTY, arguments);
+}
+
+int mp_semihosting_seek(int handle, uint32_t offset) {
+    uint32_t arguments[] = { handle, offset };
+    return mp_semihosting_call(SYS_SEEK, arguments);
+}
+
+int mp_semihosting_flen(int handle) {
+    uint32_t arguments[] = { handle };
+    return mp_semihosting_call(SYS_FLEN, arguments);
+}
+
+int mp_semihosting_tmpnam(uint8_t identifier, void *buffer, size_t buffer_length) {
+    if (buffer == NULL || buffer_length == 0) {
+        return -1;
+    }
+
+    uint32_t arguments[] = { (uintptr_t)buffer, identifier, buffer_length };
+    return mp_semihosting_call(SYS_TMPNAM, arguments);
+}
+
+int mp_semihosting_remove(const char *file_name) {
+    if (file_name == NULL) {
+        return -1;
+    }
+
+    int file_name_length = mp_strlen(file_name);
+    if (file_name_length <= 0) {
+        return -1;
+    }
+
+    uint32_t arguments[] = { (uintptr_t)file_name, file_name_length };
+    return mp_semihosting_call(SYS_REMOVE, arguments);
+}
+
+int mp_semihosting_rename(const char *old_name, const char *new_name) {
+    if (old_name == NULL || new_name == NULL) {
+        return -1;
+    }
+
+    int old_name_length = mp_strlen(old_name);
+    if (old_name_length <= 0) {
+        return -1;
+    }
+
+    int new_name_length = mp_strlen(new_name);
+    if (new_name_length <= 0) {
+        return -1;
+    }
+
+    uint32_t arguments[] = {
+        (uintptr_t)old_name, old_name_length, (uintptr_t)new_name, new_name_length
+    };
+    return mp_semihosting_call(SYS_RENAME, arguments);
+}
+
+inline int mp_semihosting_clock(void) {
+    return mp_semihosting_call(SYS_CLOCK, NULL);
+}
+
+inline int mp_semihosting_time(void) {
+    return mp_semihosting_call(SYS_TIME, NULL);
+}
+
+int mp_semihosting_system(const char *command) {
+    if (command == NULL) {
+        return -1;
+    }
+
+    int command_length = mp_strlen(command);
+    if (command_length <= 0) {
+        return -1;
+    }
+
+    uint32_t arguments[] = { (uintptr_t)command, command_length };
+    return mp_semihosting_call(SYS_SYSTEM, arguments);
+}
+
+inline int mp_semihosting_errno(void) {
+    return mp_semihosting_call(SYS_ERRNO, NULL);
+}
+
+int mp_semihosting_get_cmdline(void *buffer, size_t buffer_length) {
+    if (buffer == NULL || buffer_length < CMDLINE_MIN_BUFFER_SIZE) {
+        return -1;
+    }
+
+    uint32_t arguments[] = { (uintptr_t)buffer, buffer_length };
+    return mp_semihosting_call(SYS_GET_CMDLINE, arguments);
+}
+
+void mp_semihosting_heapinfo(mp_semihosting_heap_info_t *block) {
+    if (block == NULL) {
+        return;
+    }
+
+    uint32_t arguments[] = { (uintptr_t)block };
+    mp_semihosting_call(SYS_HEAPINFO, arguments);
+}
+
+void mp_semihosting_exit(uint32_t code, uint32_t subcode) {
+    uint32_t arguments[] = { code, subcode };
+    mp_semihosting_call(SYS_EXIT, arguments);
+    for (;;) {}
+}
+
+void mp_semihosting_exit_extended(uint32_t code, uint32_t subcode) {
+    uint32_t arguments[] = { code, subcode };
+    mp_semihosting_call(SYS_EXIT_EXTENDED, arguments);
+    for (;;) {}
+}
+
+int mp_semihosting_elapsed(mp_semihosting_elapsed_ticks_t *ticks) {
+    if (ticks == NULL) {
+        return -1;
+    }
+
+    uint32_t arguments[] = { (uintptr_t)ticks };
+    return mp_semihosting_call(SYS_ELAPSED, arguments);
+}
+
+inline int mp_semihosting_tickfreq(void) {
+    return mp_semihosting_call(SYS_TICKFREQ, NULL);
+}
+
+void mp_semihosting_init() {
+    mp_check_extended_features_availability();
+    mp_semihosting_stdout = mp_semihosting_open(":tt", "w");
+    if (split_stdout_stderr) {
+        mp_semihosting_stderr = mp_semihosting_open(":tt", "a");
+    } else {
+        mp_semihosting_stderr = mp_semihosting_stdout;
+    }
+}
+
+void mp_check_extended_features_availability(void) {
+    int features_handle = mp_semihosting_open(":semihosting-features", "r");
+    if (features_handle < 0) {
+        return;
+    }
+
+    uint8_t magic_buffer[MAGIC_SIZE];
+    if (mp_semihosting_flen(features_handle) < sizeof(magic_buffer)) {
+        mp_semihosting_close(features_handle);
+        return;
+    }
+
+    if (mp_semihosting_read(features_handle, magic_buffer, sizeof(magic_buffer)) != 0) {
+        mp_semihosting_close(features_handle);
+        return;
+    }
+
+    if (magic_buffer[0] != MAGIC_0 ||
+        magic_buffer[1] != MAGIC_1 ||
+        magic_buffer[2] != MAGIC_2 ||
+        magic_buffer[3] != MAGIC_3) {
+        mp_semihosting_close(features_handle);
+        return;
+    }
+
+    uint8_t features_byte = 0;
+    if (mp_semihosting_read(features_handle, &features_byte, sizeof(features_byte)) != 0) {
+        mp_semihosting_close(features_handle);
+        return;
+    }
+
+    mp_semihosting_close(features_handle);
+
+    exit_extended_available = (features_byte & 0x01) != 0;
+    split_stdout_stderr = (features_byte & 0x02) != 0;
+}
+
+int mp_strlen(const char *string) {
+    int length = 0;
+    while (*string++ != 0) {
+        length += 1;
+    }
+    return length;
+}
+
+int mp_lookup_open_mode(const char *mode) {
+    if (mode == NULL) {
+        return -1;
+    }
+
+    int mode_found;
+
+    switch (mode[0]) {
+        case 'r':
+            mode_found = 0x00;
+            break;
+        case 'w':
+            mode_found = 0x04;
+            break;
+        case 'a':
+            mode_found = 0x08;
+            break;
+        default:
+            return -1;
+    }
+
+    switch (mode[1]) {
+        case 'b':
+            mode_found |= 0x01;
+            break;
+        case '+':
+            mode_found |= 0x02;
+            break;
+        case '\0':
+            return mode_found;
+        default:
+            return -1;
+    }
+
+    switch (mode[2]) {
+        case 'b':
+            if (mode_found & 0x01) {
+                // 'b' was already seen.
+                return -1;
+            }
+            mode_found |= 1;
+            break;
+        case '+':
+            if (mode_found & 0x02) {
+                // '+' was already seen.
+                return -1;
+            }
+            mode_found |= 2;
+            break;
+        case '\0':
+            return mode_found;
+        default:
+            return -1;
+    }
+
+    return mode[3] == '\0' ? mode_found : -1;
+}
+
+int mp_semihosting_call(uint32_t num, void *arg) {
+    register uint32_t call_number_register __asm__ ("x10") = num;
+    register void *arguments_register __asm__ ("x11") = arg;
+
+    __asm volatile (
+        ".option push            \n" // Transient options
+        ".option norvc           \n" // Do not emit compressed instructions
+        ".align 4                \n" // 16 bytes alignment
+        "slli   zero, zero, 0x1F \n" // Entry NOP
+        "ebreak                  \n" // Give control to the debugger
+        "srai   zero, zero, 7    \n" // Semihosting call
+        ".option pop             \n" // Restore previous options set
+        : "+r" (call_number_register)
+        : "r" (arguments_register)
+        : "memory"
+        );
+
+    return call_number_register;
+}
+
+inline int mp_semihosting_rx_char() {
+    return mp_semihosting_call(SYS_READC, NULL);
+}
+
+int mp_write_to_debug_console(const char *string, size_t length) {
+    if (length == 0) {
+        return 0;
+    }
+
+    if (length == 1) {
+        mp_semihosting_writec(*string);
+        return 0;
+    }
+
+    return mp_semihosting_write(mp_semihosting_stdout, string, length);
+}
+
+void mp_semihosting_terminate(uint32_t code, uint32_t subcode) {
+    if (exit_extended_available) {
+        mp_semihosting_exit_extended(code, subcode);
+    } else {
+        mp_semihosting_exit(code, subcode);
+    }
+}
+
+int mp_semihosting_tx_strn(const char *string, size_t length) {
+    if (string == NULL) {
+        return -1;
+    }
+
+    return mp_write_to_debug_console(string, length);
+}
+
+int mp_semihosting_tx_strn_cooked(const char *string, size_t length) {
+    if (string == NULL) {
+        return -1;
+    }
+
+    if (length == 0) {
+        return 0;
+    }
+
+    size_t current_offset = 0;
+    for (size_t index = 0; index < length; index++) {
+        if (string[index] != '\n') {
+            continue;
+        }
+
+        mp_write_to_debug_console(string + current_offset, index - current_offset);
+        mp_semihosting_writec('\r');
+        current_offset = index;
+    }
+
+    return mp_write_to_debug_console(string + current_offset, length - current_offset);
+}
diff --git a/shared/runtime/semihosting_rv32.h b/shared/runtime/semihosting_rv32.h
new file mode 100644
index 0000000000000..7cabd1692c1cf
--- /dev/null
+++ b/shared/runtime/semihosting_rv32.h
@@ -0,0 +1,247 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_SEMIHOSTING_RV32_H
+#define MICROPY_INCLUDED_SHARED_RUNTIME_SEMIHOSTING_RV32_H
+
+/*
+ * To integrate semihosting, make sure to call mp_semihosting_init() first.
+ * Then, if the host system's STDOUT should be used instead of a UART, replace
+ * mp_hal_stdin_rx_chr and similar calls in mphalport.c with the semihosting
+ * equivalents.
+ *
+ * At runtime, make sure that the debugger is attached and semihosting is
+ * enabled on its end.  The terminal must be configured in raw mode with local
+ * echo disabled, on Linux this can be done with "stty raw -echo" on the
+ * command line.
+ */
+
+/*
+ * This follows the RISC-V Semihosting specification version 0.3.
+ *
+ * That document can be downloaded from
+ * https://github.com/riscv-non-isa/riscv-semihosting/releases/
+ *
+ * Version 0.3 claims that the current RISC-V Semihosting implementation
+ * should follow Arm's, and more precisely the "Semihosting for AArch32
+ * and AArch64" document, revision 2023Q3.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdnoreturn.h>
+
+// A container for heap and stack pointers as returned by SYS_HEAPINFO.
+typedef struct {
+    void *heap_base;
+    void *heap_limit;
+    void *stack_base;
+    void *stack_limit;
+} mp_semihosting_heap_info_t;
+
+// A 64-bits value indicating how many ticks were counted since the target
+// image's execution started.
+typedef struct {
+    uint32_t low;
+    uint32_t high;
+} mp_semihosting_elapsed_ticks_t;
+
+// The host system's STDOUT file handle.
+extern int mp_semihosting_stdout;
+
+// The host system's STDERR file handle.  If the host system does not support
+// explicit STDOUT and STDERR handles, this handle will be aliased to STDOUT
+// instead.
+extern int mp_semihosting_stderr;
+
+/*
+ * Even though exit codes from 0x20000 to 0x20007 are part of the original Arm
+ * specification document, they are omitted due to them being tied to hardware
+ * events.  Whilst some of them may still have a meaning on the RISC-V
+ * platform, it is not yet clear which ones are available and which ones are
+ * not.  Thus, only "soft" error codes are provided here although the SYS_EXIT
+ * and SYS_EXIT_EXTENDED semihosting calls accept any 32-bits integer as an
+ * exit code.
+ */
+
+enum {
+    MP_SEMIHOSTING_EXIT_BREAKPOINT = 0x20020,
+    MP_SEMIHOSTING_EXIT_WATCHPOINT,
+    MP_SEMIHOSTING_EXIT_STEP_COMPLETE,
+    MP_SEMIHOSTING_EXIT_RUNTIME_ERROR_UNKNOWN,
+    MP_SEMIHOSTING_EXIT_INTERNAL_ERROR,
+    MP_SEMIHOSTING_EXIT_USER_INTERRUPTION,
+    MP_SEMIHOSTING_EXIT_APPLICATION_EXIT,
+    MP_SEMIHOSTING_EXIT_STACK_OVERFLOW,
+    MP_SEMIHOSTING_EXIT_DIVISION_BY_ZERO,
+    MP_SEMIHOSTING_EXIT_OS_SPECIFIC
+};
+
+// Initialises semihosting support.
+void mp_semihosting_init();
+
+// Read a character from the host system's STDIN stream.
+int mp_semihosting_rx_char();
+
+// Write the given string to the host system's STDOUT stream.
+int mp_semihosting_tx_strn(const char *string, size_t length);
+
+// Write the given string to the host system's STDOUT stream, writing a CR byte
+// before each LF byte to be written.
+int mp_semihosting_tx_strn_cooked(const char *string, size_t length);
+
+// Terminates execution with the given code and an optional subcode.  This
+// will choose the appropriate semihosting call (either SYS_EXIT or
+// SYS_EXIT_EXTENDED) depending on the host system's reported capabilities.
+noreturn void mp_semihosting_terminate(uint32_t code, uint32_t subcode);
+
+// Direct semihosting calls access.
+
+// Open a file on the host system with the given name and file mode.
+// The file mode follows fopen(3)'s syntax.  The function will return -1 if it
+// failed to open the required file, or a file handle number if the operation
+// succeeded.  To see why the operation failed, call mp_semihosting_errno.
+int mp_semihosting_open(const char *file_name, const char *file_mode);
+
+// Close a file previously opened with mp_semihosting_open.  If the file cannot
+// be closed, the function will return -1, otherwise it will return 0.  To see
+// why the operation failed, call mp_semihosting_errno.
+int mp_semihosting_close(int handle);
+
+// Write the given character to the host system's STDOUT file handle.
+void mp_semihosting_writec(char character);
+
+// Write the given NULL-terminated string to the host system's STDOUT file
+// handle.
+void mp_semihosting_write0(const char *string);
+
+// Write the given buffer to the given host system file handle.  The function
+// will return how many characters were left to be written (0 if the operation
+// wrote the whole buffer), or -1 if the input buffer pointer is NULL.
+int mp_semihosting_write(int handle, const void *data, size_t length);
+
+// Read from the given host system file handle into the given buffer. The
+// function will return how many characters were left to be read (0 if the
+// operation read whole buffer), or -1 if the input buffer pointer is NULL.
+int mp_semihosting_read(int handle, void *data, size_t length);
+
+// Read a single character from the host system's STDIN file handle.
+int mp_semihosting_readc(void);
+
+// Check whether the given result code represents an error.  The function will
+// return a non-zero value if the code is indeed an error, or zero otherwise.
+int mp_semihosting_iserror(int code);
+
+// Check whether the given host system file handle is mapped to an interactive
+// device.  The function will return 1 if the handle is mapped to an
+// interactive device, 0 if it is mapped to a regular file, and anything else
+// if an error occurred.
+int mp_semihosting_istty(int handle);
+
+// Move the file pointer on the given host system's file handle to the given
+// absolute offset (in bytes).  The function will return 0 if the file pointer
+// was moved to the requested position, or a negative value if it was not
+// possible to do so.  To see why the operation failed, call
+// mp_semihosting_errno.
+int mp_semihosting_seek(int handle, uint32_t offset);
+
+// Get the length (in bytes) of the host system's file mapped to the given
+// handle.  The function will return a negative value if an error occurred, or
+// the requested file's length (in bytes).
+int mp_semihosting_flen(int handle);
+
+// Create a temporary file on the host system.  The function requires a file
+// identifier between 0 and 255 (inclusive) that will be bound to the requested
+// temporary file.  Subsequent calls to mp_semihosting_tmpnam with the same
+// identifier will always return the same host system file name.  On success,
+// the function will fill the given buffer with the host system's file name,
+// and will return 0.  If the buffer pointer is NULL, the buffer name area is
+// too small, or the operation failed on the host system's end, the function
+// will return -1 instead.  Make sure that the buffer is big enough to contain
+// a host system's full path name.
+int mp_semihosting_tmpnam(uint8_t identifier, void *buffer, size_t buffer_length);
+
+// Delete a file on the host system's matching the given file name.  The
+// function will return 0 if the deletion operation succeeded, or a host system
+// dependent error code instead.
+int mp_semihosting_remove(const char *file_name);
+
+// Rename a file on the host system's name matching the given file name to the
+// new chosen name.  The function will return 0 if the rename operation
+// succeeded, or a host system dependent error code instead.
+int mp_semihosting_rename(const char *old_name, const char *new_name);
+
+// Get how many hundredths of a second passed since execution started.  If an
+// error occurred whilst retrieving clock value, the function will return -1.
+int mp_semihosting_clock(void);
+
+// Get the host system's clock in seconds since midnight of January 1st, 1970
+// at UTC.
+int mp_semihosting_time(void);
+
+// Execute the given command on the host system.  The function will return the
+// command's result code retrieved on the host system.
+int mp_semihosting_system(const char *command);
+
+// Get the last operation's status code.  The function will return the host
+// system's errno variable contents, and can be used to see the exact result
+// code for failed I/O operations.
+int mp_semihosting_errno(void);
+
+// Get the host system's command line that started execution of the target
+// image.  The function will fill the given buffer with the command line
+// arguments passed to the target executable.  The function will return 0 on
+// success, or -1 if it failed.  Make sure that the buffer can contain at
+// least 80 bytes, as it is the minimum supported size defined by the
+// specifications document.
+int mp_semihosting_get_cmdline(void *buffer, size_t buffer_length);
+
+// Fill the given heap info structure with the system's stack and heap
+// start/end addresses.
+void mp_semihosting_heapinfo(mp_semihosting_heap_info_t *block);
+
+// Terminate the execution with the given reason code and optional subcode.
+// This should be preferred over mp_semihosting_exit_extended if the host
+// system does not support the SYS_EXIT_EXTENDED semihosting call.  In doubt
+// use mp_semihosting_terminate instead.
+noreturn void mp_semihosting_exit(uint32_t code, uint32_t subcode);
+
+// Terminate the execution with the given reason code and optional subcode.
+// This should be preferred over mp_semihosting_exit if the host system
+// supports this semihosting call.  In doubt use mp_semihosting_terminate
+// instead.
+noreturn void mp_semihosting_exit_extended(uint32_t code, uint32_t subcode);
+
+// Fill the given structure with how many ticks were counted since execution
+// started.  On success, the function will return 0, or -1 if it was not
+// possible to compute the ticks count.
+int mp_semihosting_elapsed(mp_semihosting_elapsed_ticks_t *ticks);
+
+// Get the system's tick frequency.  If this value is not known, the function
+// will return -1 instead.
+int mp_semihosting_tickfreq(void);
+
+#endif // MICROPY_INCLUDED_SHARED_SEMIHOSTING_RUNTIME_RV32_H

From d7aa2fe9d7efc30591e22ddcd276e85f1d13e9d2 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 1 Jun 2024 11:49:38 +0200
Subject: [PATCH 1139/3129] lib/libm: Define _IEEE_LIBM only if not set.

fdilibm was originally meant to see _IEEE_LIBM defined from outside the
libm code, not it being hardcoded in.  Picolibc assumes this assumption
holds true and attempts to define itself, conflicting with the existing
definition.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 lib/libm/wf_lgamma.c | 2 ++
 lib/libm/wf_tgamma.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/libm/wf_lgamma.c b/lib/libm/wf_lgamma.c
index 834a4de482223..4b07a7289288d 100644
--- a/lib/libm/wf_lgamma.c
+++ b/lib/libm/wf_lgamma.c
@@ -24,7 +24,9 @@
  */
 
 #include "fdlibm.h"
+#ifndef _IEEE_LIBM
 #define _IEEE_LIBM 1
+#endif
 
 #ifdef __STDC__
 	float lgammaf(float x)
diff --git a/lib/libm/wf_tgamma.c b/lib/libm/wf_tgamma.c
index 3ff05f331d099..1a6c74ca11d86 100644
--- a/lib/libm/wf_tgamma.c
+++ b/lib/libm/wf_tgamma.c
@@ -24,7 +24,9 @@
 
 #include "math.h"
 #include "fdlibm.h"
+#ifndef _IEEE_LIBM
 #define _IEEE_LIBM 1
+#endif
 
 #ifdef __STDC__
 	float tgammaf(float x)

From a066f2308f7b0d872352073cec0a945dca3a7a9c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jun 2024 11:14:28 +1000
Subject: [PATCH 1140/3129] py/lexer: Support concatenation of adjacent
 f-strings.

This is quite a simple and small change to support concatenation of
adjacent f-strings, and improve compatibility with CPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/lexer.c                           |  8 ++++++--
 tests/basics/string_fstring.py       | 10 ++++++++++
 tests/cpydiff/core_fstring_concat.py |  5 ++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/py/lexer.c b/py/lexer.c
index bff8e637656d6..2774759a15d47 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -336,8 +336,12 @@ static void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool 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(");
+        // lex->fstring_args is reset when finished, so at this point there are two cases:
+        // - lex->fstring_args is empty: start of a new f-string
+        // - lex->fstring_args is non-empty: concatenation of adjacent f-strings
+        if (vstr_len(&lex->fstring_args) == 0) {
+            vstr_add_str(&lex->fstring_args, ".format(");
+        }
     }
     #endif
 
diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
index 42d093b37b508..3a8969272d6dd 100644
--- a/tests/basics/string_fstring.py
+++ b/tests/basics/string_fstring.py
@@ -65,3 +65,13 @@ def foo(a, b):
 # Still allow ! in expressions.
 print(f"{'1' if a != '456' else '0'!r:8s}")
 print(f"{'1' if a != '456' else '0'!s:8s}")
+
+# Concatenation of adjacent f-strings.
+print(f"" f"")
+print(f"a" f"b")
+print(f"{x}" f"{y}")
+print(
+    f"a{x}b---------------------------------"
+    f"cd---------------------------------"
+    f"e{y}f---------------------------------"
+)
diff --git a/tests/cpydiff/core_fstring_concat.py b/tests/cpydiff/core_fstring_concat.py
index c2bdb4e666a2d..83bf18820ece1 100644
--- a/tests/cpydiff/core_fstring_concat.py
+++ b/tests/cpydiff/core_fstring_concat.py
@@ -1,8 +1,8 @@
 """
 categories: Core
-description: f-strings don't support concatenation with adjacent literals if the adjacent literals contain braces or are f-strings
+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 or both are f-strings
+workaround: Use the + operator between literal strings when they are not both f-strings
 """
 
 x, y = 1, 2
@@ -10,4 +10,3 @@
 print(f"{x}" "ab")  # works
 print("a{}a" f"{x}")  # fails
 print(f"{x}" "a{}b")  # fails
-print(f"{x}" f"{y}")  # fails

From 3c8089d1b10683ee31ddbaeebd0b18c47bf6d09d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jun 2024 17:31:19 +1000
Subject: [PATCH 1141/3129] py/lexer: Support raw f-strings.

Support for raw str/bytes already exists, and extending that to raw
f-strings is easy.  It also reduces code size because it eliminates an
error message.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/lexer.c                         | 14 ++++++--------
 py/lexer.h                         |  1 -
 py/parse.c                         |  3 ---
 tests/basics/string_fstring.py     |  4 ++++
 tests/cmdline/cmd_parsetree.py.exp |  4 ++--
 tests/cpydiff/core_fstring_raw.py  |  8 --------
 6 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 tests/cpydiff/core_fstring_raw.py

diff --git a/py/lexer.c b/py/lexer.c
index 2774759a15d47..48497663c58d1 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -661,21 +661,19 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
                 }
                 #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;
+                    is_fstring = true;
+                    n_char = 2;
                 }
                 #endif
             }
             #if MICROPY_PY_FSTRINGS
             else if (is_char(lex, 'f')) {
+                is_fstring = true;
+                n_char = 1;
                 if (is_char_following(lex, 'r')) {
-                    // raw-f-strings unsupported, immediately return (invalid) token.
-                    lex->tok_kind = MP_TOKEN_FSTRING_RAW;
-                    break;
+                    is_raw = true;
+                    n_char = 2;
                 }
-                n_char = 1;
-                is_fstring = true;
             }
             #endif
 
diff --git a/py/lexer.h b/py/lexer.h
index 2d9d0447b8ba3..e0b506b20b66e 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -46,7 +46,6 @@ typedef enum _mp_token_kind_t {
     MP_TOKEN_LONELY_STRING_OPEN,
     #if MICROPY_PY_FSTRINGS
     MP_TOKEN_MALFORMED_FSTRING,
-    MP_TOKEN_FSTRING_RAW,
     #endif
 
     MP_TOKEN_NEWLINE,
diff --git a/py/parse.c b/py/parse.c
index 1392303e6ff97..4ba9560734f04 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -1351,9 +1351,6 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
         } 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,
diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
index 3a8969272d6dd..d94cc0cd3e630 100644
--- a/tests/basics/string_fstring.py
+++ b/tests/basics/string_fstring.py
@@ -75,3 +75,7 @@ def foo(a, b):
     f"cd---------------------------------"
     f"e{y}f---------------------------------"
 )
+
+# Raw f-strings.
+print(rf"\r\a\w {'f'} \s\t\r\i\n\g")
+print(fr"\r{x}")
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 6ec553b8a9ae2..672c212a965b9 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -1,6 +1,6 @@
 ----------------
 [   1] file_input_2(1) (n=10)
-         tok(6)
+         tok(5)
 [   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(16)
+           tok(15)
 [   7]   \(rule\|expr_stmt\)(5) (n=2)
            id(b)
            str(str)
diff --git a/tests/cpydiff/core_fstring_raw.py b/tests/cpydiff/core_fstring_raw.py
deleted file mode 100644
index 84e265f70fc52..0000000000000
--- a/tests/cpydiff/core_fstring_raw.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-categories: Core
-description: Raw f-strings are not supported
-cause: MicroPython is optimised for code space.
-workaround: Unknown
-"""
-
-rf"hello"

From 80a4f632ee812de9f2b22e88abb36ca36d230ec0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 7 Jun 2024 11:43:06 +1000
Subject: [PATCH 1142/3129] rp2/cyw43_configport: Make cyw43_delay_ms() a busy
 loop.

Currently, `cyw43_delay_ms()` calls `mp_hal_delay_ms()` which uses PendSV
to set up a timer and wait for an interrupt, using wfe.  But in the cyw43
initialisation stage PendSV is disabled and so this delay suspends on the
wfe instruction for an indefinite amount of time.

Work around this by changing the implementation of `cyw43_delay_ms()` to a
busy loop.

Fixes issue #15220.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/cyw43_configport.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index b69cfbc263a28..7b1a1ae3d4f02 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -117,7 +117,12 @@ static inline void cyw43_delay_us(uint32_t us) {
 }
 
 static inline void cyw43_delay_ms(uint32_t ms) {
-    mp_hal_delay_ms(ms);
+    // PendSV may be disabled via CYW43_THREAD_ENTER, so this delay is a busy loop.
+    uint32_t us = ms * 1000;
+    uint32_t start = mp_hal_ticks_us();
+    while (mp_hal_ticks_us() - start < us) {
+        mp_event_handle_nowait();
+    }
 }
 
 #define CYW43_EVENT_POLL_HOOK mp_event_handle_nowait()

From df0d7e942986b65ed42fbbf75712639f4a83dc0e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 7 Jun 2024 13:33:47 +1000
Subject: [PATCH 1143/3129] extmod/modlwip: Make socket.connect raise ETIMEDOUT
 on non-zero timeout.

If the socket timeout is 0 then a failed socket.connect() raises
EINPROGRESS (which is what the lwIP bindings already did), but if the
socket timeout is non-zero then a failed socket.connect() should raise
ETIMEDOUT.  The latter is fixed in this commit.

A test is added for these timeout cases.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modlwip.c                    | 28 ++++++++++++++++------------
 tests/net_hosted/connect_timeout.py | 24 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 tests/net_hosted/connect_timeout.py

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index afac512e834de..1ae8c114c3dfb 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -326,6 +326,10 @@ typedef struct _lwip_socket_obj_t {
     int8_t state;
 } lwip_socket_obj_t;
 
+static inline bool socket_is_timedout(lwip_socket_obj_t *socket, mp_uint_t ticks_start) {
+    return socket->timeout != -1 && (mp_uint_t)(mp_hal_ticks_ms() - ticks_start) >= socket->timeout;
+}
+
 static inline void poll_sockets(void) {
     mp_event_wait_ms(1);
 }
@@ -1130,21 +1134,21 @@ static mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
             MICROPY_PY_LWIP_EXIT
 
             // And now we wait...
-            if (socket->timeout != -1) {
-                for (mp_uint_t retries = socket->timeout / 100; retries--;) {
-                    mp_hal_delay_ms(100);
-                    if (socket->state != STATE_CONNECTING) {
-                        break;
-                    }
-                }
-                if (socket->state == STATE_CONNECTING) {
-                    mp_raise_OSError(MP_EINPROGRESS);
+            mp_uint_t ticks_start = mp_hal_ticks_ms();
+            for (;;) {
+                poll_sockets();
+                if (socket->state != STATE_CONNECTING) {
+                    break;
                 }
-            } else {
-                while (socket->state == STATE_CONNECTING) {
-                    poll_sockets();
+                if (socket_is_timedout(socket, ticks_start)) {
+                    if (socket->timeout == 0) {
+                        mp_raise_OSError(MP_EINPROGRESS);
+                    } else {
+                        mp_raise_OSError(MP_ETIMEDOUT);
+                    }
                 }
             }
+
             if (socket->state == STATE_CONNECTED) {
                 err = ERR_OK;
             } else {
diff --git a/tests/net_hosted/connect_timeout.py b/tests/net_hosted/connect_timeout.py
new file mode 100644
index 0000000000000..5f35047c8c892
--- /dev/null
+++ b/tests/net_hosted/connect_timeout.py
@@ -0,0 +1,24 @@
+# Test that socket.connect() on a socket with timeout raises EINPROGRESS or ETIMEDOUT appropriately.
+
+import errno
+import socket
+
+
+def test(peer_addr, timeout, expected_exc):
+    s = socket.socket()
+    s.settimeout(timeout)
+    try:
+        s.connect(peer_addr)
+        print("OK")
+    except OSError as er:
+        print(er.args[0] in expected_exc)
+    s.close()
+
+
+if __name__ == "__main__":
+    # This test needs an address that doesn't respond to TCP connections.
+    # 1.1.1.1:8000 seem to reliably timeout, so use that.
+    addr = socket.getaddrinfo("1.1.1.1", 8000)[0][-1]
+
+    test(addr, 0, (errno.EINPROGRESS,))
+    test(addr, 1, (errno.ETIMEDOUT, "timed out"))  # CPython uses a string instead of errno

From 5903ee561c8e2fec7ecc8f08f221c27574090649 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 7 Jun 2024 13:36:30 +1000
Subject: [PATCH 1144/3129] extmod/modlwip: Consolidate socket.accept timeout
 logic.

This makes the code a bit simpler to understand for the three cases of
timeout behaviour (-1, 0, non-zero), and eliminates a dependency on the
(slow) `mp_hal_delay_ms(100)` call.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modlwip.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 1ae8c114c3dfb..bcee3f0ff1a93 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1040,26 +1040,22 @@ static mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
     // accept incoming connection
     struct tcp_pcb *volatile *incoming_connection = &lwip_socket_incoming_array(socket)[socket->incoming.connection.iget];
     if (*incoming_connection == NULL) {
-        if (socket->timeout == 0) {
+        mp_uint_t ticks_start = mp_hal_ticks_ms();
+        for (;;) {
             MICROPY_PY_LWIP_EXIT
-            m_del_obj(lwip_socket_obj_t, socket2);
-            mp_raise_OSError(MP_EAGAIN);
-        } else if (socket->timeout != -1) {
-            mp_uint_t retries = socket->timeout / 100;
-            while (*incoming_connection == NULL) {
+            poll_sockets();
+            MICROPY_PY_LWIP_REENTER
+            if (*incoming_connection != NULL) {
+                break;
+            }
+            if (socket_is_timedout(socket, ticks_start)) {
                 MICROPY_PY_LWIP_EXIT
-                if (retries-- == 0) {
-                    m_del_obj(lwip_socket_obj_t, socket2);
+                m_del_obj(lwip_socket_obj_t, socket2);
+                if (socket->timeout == 0) {
+                    mp_raise_OSError(MP_EAGAIN);
+                } else {
                     mp_raise_OSError(MP_ETIMEDOUT);
                 }
-                mp_hal_delay_ms(100);
-                MICROPY_PY_LWIP_REENTER
-            }
-        } else {
-            while (*incoming_connection == NULL) {
-                MICROPY_PY_LWIP_EXIT
-                poll_sockets();
-                MICROPY_PY_LWIP_REENTER
             }
         }
     }

From 9bfb4cec6e832c38eb04ad680a2b5e377830d3af Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Jun 2024 12:13:37 +1000
Subject: [PATCH 1145/3129] qemu-arm: Add license and copyright to files
 missing them.

All of these files are first-party code written from scratch as part of
this repository, and were added when the top-level MIT license was active,
so they have an MIT license by default.  Tracing back the git history show
the original authors/source/copyright as follows:

- main.c, mpconfigport.h: copied from the bare-arm port [1].

- test_main.c: added in [2].

- mphalport.h: added in [3] then updated in [4].

- mps2.ld, nrf51.ld, stm32.ld, uart.h: added in [4].

- imx6.ld, uart.c, startup.c: added in [4] and updated in [5].

[1] Commit c55721582282f282d33e35e458a2944890210ebc in 2014, the initial
    bare-arm port; see related ee857853d60a135685c5088e5492dfe6e8a5acb0.
[2] Commit c1c32d65af038ba1b2a2a8dd69e3f7e63eac5f3e in 2014, initial
    qemu-arm CI tests.
[3] Commit b0a15aa73540f82ef47c9492af7ce196d1b1a6e9 in 2016, enabling
    extmods and their tests.
[4] Commit e7332b05841549a41614e522285639dcaa7bd526 in 2018, big refactor.
[5] Commit b84406f3133a36a703a1506d754fc046dd955922 in 2021, adding
    Cortex-A9 support.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/imx6.ld        |  5 +++++
 ports/qemu-arm/main.c         | 26 ++++++++++++++++++++++++++
 ports/qemu-arm/mpconfigport.h | 26 ++++++++++++++++++++++++++
 ports/qemu-arm/mphalport.h    | 26 ++++++++++++++++++++++++++
 ports/qemu-arm/mps2.ld        |  5 +++++
 ports/qemu-arm/nrf51.ld       |  5 +++++
 ports/qemu-arm/startup.c      | 26 ++++++++++++++++++++++++++
 ports/qemu-arm/stm32.ld       |  5 +++++
 ports/qemu-arm/test_main.c    | 26 ++++++++++++++++++++++++++
 ports/qemu-arm/uart.c         | 26 ++++++++++++++++++++++++++
 ports/qemu-arm/uart.h         | 26 ++++++++++++++++++++++++++
 11 files changed, 202 insertions(+)

diff --git a/ports/qemu-arm/imx6.ld b/ports/qemu-arm/imx6.ld
index 7155956f15ad5..c6d8e0818111b 100644
--- a/ports/qemu-arm/imx6.ld
+++ b/ports/qemu-arm/imx6.ld
@@ -1,3 +1,8 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2021 Damien P. George
+ */
+
 /* Vector table is at 0x00000000, entry point is 0x10000000. */
 
 MEMORY
diff --git a/ports/qemu-arm/main.c b/ports/qemu-arm/main.c
index f57c03fb9ec84..212fd60215178 100644
--- a/ports/qemu-arm/main.c
+++ b/ports/qemu-arm/main.c
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-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>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index ccee777752bdf..fce379e47ecf4 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2024 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
diff --git a/ports/qemu-arm/mphalport.h b/ports/qemu-arm/mphalport.h
index 29f080805f53a..d854cd82d9928 100644
--- a/ports/qemu-arm/mphalport.h
+++ b/ports/qemu-arm/mphalport.h
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-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 <stddef.h>
 #include "uart.h"
 
diff --git a/ports/qemu-arm/mps2.ld b/ports/qemu-arm/mps2.ld
index 5c1aa21ca249b..dffefa3b00254 100644
--- a/ports/qemu-arm/mps2.ld
+++ b/ports/qemu-arm/mps2.ld
@@ -1,3 +1,8 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Damien P. George
+ */
+
 MEMORY
 {
     RAM : ORIGIN = 0x00000000, LENGTH = 4M
diff --git a/ports/qemu-arm/nrf51.ld b/ports/qemu-arm/nrf51.ld
index 70269773cb9f7..46d7201b32aed 100644
--- a/ports/qemu-arm/nrf51.ld
+++ b/ports/qemu-arm/nrf51.ld
@@ -1,3 +1,8 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Damien P. George
+ */
+
 MEMORY
 {
     ROM : ORIGIN = 0x00000000, LENGTH = 1M
diff --git a/ports/qemu-arm/startup.c b/ports/qemu-arm/startup.c
index a52b068c332ae..a1e89d111c007 100644
--- a/ports/qemu-arm/startup.c
+++ b/ports/qemu-arm/startup.c
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
diff --git a/ports/qemu-arm/stm32.ld b/ports/qemu-arm/stm32.ld
index 4e541526b70b9..835f9bbe970fd 100644
--- a/ports/qemu-arm/stm32.ld
+++ b/ports/qemu-arm/stm32.ld
@@ -1,3 +1,8 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Damien P. George
+ */
+
 MEMORY
 {
     ROM : ORIGIN = 0x00000000, LENGTH = 1M
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index bd0a9918da565..13d18bb0f094b 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Ilya Dmitrichenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
 #include <stdio.h>
diff --git a/ports/qemu-arm/uart.c b/ports/qemu-arm/uart.c
index 828398cd175a8..d7338f9a24230 100644
--- a/ports/qemu-arm/uart.c
+++ b/ports/qemu-arm/uart.c
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stddef.h>
 
diff --git a/ports/qemu-arm/uart.h b/ports/qemu-arm/uart.h
index a89e3f26e209f..b2b9e523cd60f 100644
--- a/ports/qemu-arm/uart.h
+++ b/ports/qemu-arm/uart.h
@@ -1,2 +1,28 @@
+/*
+ * 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.
+ */
+
 void uart_init(void);
 void uart_tx_strn(const char *buf, size_t len);

From d7d77d91becd0716ac1672c92652d9dd72ec613f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Jun 2024 16:31:49 +1000
Subject: [PATCH 1146/3129] qemu-arm: Clean up header file includes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/main.c      | 5 -----
 ports/qemu-arm/mphalport.h | 1 -
 ports/qemu-arm/test_main.c | 4 ----
 ports/qemu-arm/uart.h      | 6 ++++++
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ports/qemu-arm/main.c b/ports/qemu-arm/main.c
index 212fd60215178..025c1f17da04a 100644
--- a/ports/qemu-arm/main.c
+++ b/ports/qemu-arm/main.c
@@ -24,18 +24,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#include <malloc.h>
 
-#include "py/obj.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/gc.h"
-#include "py/repl.h"
 #include "py/mperrno.h"
 
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
diff --git a/ports/qemu-arm/mphalport.h b/ports/qemu-arm/mphalport.h
index d854cd82d9928..8a40505ba6b3a 100644
--- a/ports/qemu-arm/mphalport.h
+++ b/ports/qemu-arm/mphalport.h
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include <stddef.h>
 #include "uart.h"
 
 #define mp_hal_stdin_rx_chr() (0)
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index 13d18bb0f094b..96984f7cd16ed 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -24,12 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#include <malloc.h>
-#include <setjmp.h>
 
 #include "py/compile.h"
 #include "py/runtime.h"
diff --git a/ports/qemu-arm/uart.h b/ports/qemu-arm/uart.h
index b2b9e523cd60f..33eae05bd76dd 100644
--- a/ports/qemu-arm/uart.h
+++ b/ports/qemu-arm/uart.h
@@ -23,6 +23,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#ifndef MICROPY_INCLUDED_QEMU_ARM_UART_H
+#define MICROPY_INCLUDED_QEMU_ARM_UART_H
+
+#include <stddef.h>
 
 void uart_init(void);
 void uart_tx_strn(const char *buf, size_t len);
+
+#endif // MICROPY_INCLUDED_QEMU_ARM_UART_H

From 2d69aab7b350810322a4cba2667626949ee3d974 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 31 Oct 2023 21:55:07 +0100
Subject: [PATCH 1147/3129] qemu-riscv: Add new QEMU RV32 port.

This adds a QEMU-based bare metal RISC-V 32 bits port.  For the time being
only QEMU's "virt" 32 bits board is supported, using the ilp32 ABI and the
RV32IMC architecture.

The top-level README and the run-tests.py files are updated for this new
port.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 README.md                          |   3 +-
 ports/qemu-riscv/Makefile          | 128 +++++++++++++
 ports/qemu-riscv/Makefile.test     |  31 +++
 ports/qemu-riscv/README.md         |  29 +++
 ports/qemu-riscv/entrypoint.s      |  70 +++++++
 ports/qemu-riscv/interrupts.c      | 292 +++++++++++++++++++++++++++++
 ports/qemu-riscv/mpconfigport.h    |  76 ++++++++
 ports/qemu-riscv/mphalport.h       |  32 ++++
 ports/qemu-riscv/qstrdefsport.h    |   2 +
 ports/qemu-riscv/startup.c         |  86 +++++++++
 ports/qemu-riscv/test_main.c       |  66 +++++++
 ports/qemu-riscv/tests_profile.txt |  53 ++++++
 ports/qemu-riscv/uart.c            |  45 +++++
 ports/qemu-riscv/uart.h            |  33 ++++
 ports/qemu-riscv/virt.ld           |  98 ++++++++++
 tests/run-tests.py                 |   9 +
 16 files changed, 1052 insertions(+), 1 deletion(-)
 create mode 100644 ports/qemu-riscv/Makefile
 create mode 100644 ports/qemu-riscv/Makefile.test
 create mode 100644 ports/qemu-riscv/README.md
 create mode 100644 ports/qemu-riscv/entrypoint.s
 create mode 100644 ports/qemu-riscv/interrupts.c
 create mode 100644 ports/qemu-riscv/mpconfigport.h
 create mode 100644 ports/qemu-riscv/mphalport.h
 create mode 100644 ports/qemu-riscv/qstrdefsport.h
 create mode 100644 ports/qemu-riscv/startup.c
 create mode 100644 ports/qemu-riscv/test_main.c
 create mode 100644 ports/qemu-riscv/tests_profile.txt
 create mode 100644 ports/qemu-riscv/uart.c
 create mode 100644 ports/qemu-riscv/uart.h
 create mode 100644 ports/qemu-riscv/virt.ld

diff --git a/README.md b/README.md
index f5bc6d78f0a40..a20e0aaf13a28 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,8 @@ In addition, the following ports are provided in this repository:
  - [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)
+ - [qemu-arm](ports/qemu-arm) -- QEMU-based Arm emulated target (for testing)
+ - [qemu-riscv](ports/qemu-riscv) -- QEMU-based RISC-V 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.
diff --git a/ports/qemu-riscv/Makefile b/ports/qemu-riscv/Makefile
new file mode 100644
index 0000000000000..6f15ce52e73c7
--- /dev/null
+++ b/ports/qemu-riscv/Makefile
@@ -0,0 +1,128 @@
+include ../../py/mkenv.mk
+-include mpconfigport.mk
+
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS = qstrdefsport.h
+
+# MicroPython feature configurations
+MICROPY_ROM_TEXT_COMPRESSION ?= 1
+
+# include py core make definitions
+include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
+
+BOARD ?= virt
+
+CROSS_COMPILE ?= riscv64-unknown-elf-
+
+GCC_VERSION = $(word 1, $(subst ., , $(shell $(CC) -dumpversion)))
+
+# If Picolibc is available then select it explicitly.  Ubuntu 22.04 ships its
+# bare metal RISC-V toolchain with Picolibc rather than Newlib, and the default
+# is "nosys" so a value must be provided.  To avoid having per-distro
+# workarounds, always select Picolibc if available.
+PICOLIBC_SPECS = $(shell $(CC) --print-file-name=picolibc.specs)
+ifeq ($(PICOLIBC_SPECS),picolibc.specs)
+# Picolibc was not found.
+SPECS_FRAGMENT =
+else
+SPECS_FRAGMENT = --specs=$(PICOLIBC_SPECS)
+CFLAGS += $(SPECS_FRAGMENT)
+endif
+
+ifeq ($(BOARD),virt)
+ABI = ilp32
+# GCC 10 and lower do not recognise the Zicsr extension in the
+# architecture name.  "Make" unfortunately does not provide any simple way
+# to perform numeric comparisons, so to keep things simple we assume that
+# GCC is at least version 10 for the time being.
+ifeq ($(GCC_VERSION),10)
+ARCH ?= rv32imac
+else
+# Recent GCC versions explicitly require to declare extensions.
+ARCH ?= rv32imac_zicsr
+ARCH_LD ?= rv32imac_zicsr
+endif
+AFLAGS = -mabi=$(ABI) -march=$(ARCH)
+CFLAGS += $(AFLAGS)
+CFLAGS += -DQEMU_SOC_VIRT
+ARCH_LD ?= $(ARCH)
+LDSCRIPT = virt.ld
+LDFLAGS += -mabi=$(ABI) -march=$(ARCH_LD) -T $(LDSCRIPT) -Wl,-EL
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
+SRC_BOARD_O += entrypoint.o
+endif
+
+INC += -I.
+INC += -I$(TOP)
+INC += -I$(BUILD)
+
+CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 $(COPT) \
+	 -ffunction-sections -fdata-sections
+CFLAGS += $(CFLAGS_EXTRA)
+
+LD = $(CC)
+
+# Debugging/Optimization
+ifeq ($(DEBUG), 1)
+CFLAGS += -g
+COPT = -O0
+else
+COPT += -Os -DNDEBUG
+endif
+
+LDFLAGS += $(SPECS_FRAGMENT) -Wl,--gc-sections -Wl,-Map=$(@:.elf=.map)
+
+SRC_COMMON_C = \
+	interrupts.c \
+	startup.c \
+	uart.c \
+	shared/libc/string0.c \
+	shared/runtime/sys_stdio_mphal.c \
+
+SRC_RUN_C = \
+	ports/qemu-arm/main.c \
+
+SRC_TEST_C = \
+	test_main.c \
+	lib/tinytest/tinytest.c \
+
+LIB_SRC_C += $(SRC_LIB_LIBM_C)
+LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
+
+OBJ_COMMON =
+OBJ_COMMON += $(PY_O)
+OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_COMMON_C:.c=.o))
+OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_BOARD_O))
+OBJ_COMMON += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
+
+OBJ_RUN =
+OBJ_RUN += $(addprefix $(BUILD)/, $(SRC_RUN_C:.c=.o))
+
+ALL_OBJ_RUN = $(OBJ_COMMON) $(OBJ_RUN)
+
+OBJ_TEST =
+OBJ_TEST += $(addprefix $(BUILD)/, $(SRC_TEST_C:.c=.o))
+
+ALL_OBJ_TEST = $(OBJ_COMMON) $(OBJ_TEST)
+
+# All object files, needed to get dependencies correct
+OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST)
+
+# List of sources for qstr extraction
+SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(LIB_SRC_C)
+
+all: run
+
+# `make debug` will block QEMU until a debugger is connected to port 1234.
+debug: $(BUILD)/firmware.elf
+	qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -serial mon:stdio -S -s -kernel $<
+
+run: $(BUILD)/firmware.elf
+	qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -kernel $<
+
+$(BUILD)/firmware.elf: $(LDSCRIPT) $(ALL_OBJ_RUN)
+	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_RUN) $(LIBS)
+	$(Q)$(SIZE) $@
+
+include $(TOP)/py/mkrules.mk
diff --git a/ports/qemu-riscv/Makefile.test b/ports/qemu-riscv/Makefile.test
new file mode 100644
index 0000000000000..df64a8d7cc920
--- /dev/null
+++ b/ports/qemu-riscv/Makefile.test
@@ -0,0 +1,31 @@
+LIB_SRC_C = shared/upytesthelper/upytesthelper.c
+
+include Makefile
+
+CFLAGS += -DTEST
+
+.PHONY: $(BUILD)/genhdr/tests.h
+
+TESTS_PROFILE = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))/tests_profile.txt
+
+$(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
+$(BUILD)/genhdr/tests.h:
+	(cd $(TOP)/tests; ./run-tests.py --target=qemu-riscv --write-exp)
+	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py --profile $(TESTS_PROFILE) $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
+
+$(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
+
+$(BUILD)/firmware-test.elf: $(LDSCRIPT) $(ALL_OBJ_TEST)
+	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_TEST) $(LIBS)
+	$(Q)$(SIZE) $@
+
+# Note: Using timeout(1) to handle cases where qemu hangs (e.g. this can happen with alignment errors).
+test: $(BUILD)/firmware-test.elf
+	timeout --foreground -k 5s 60s qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -kernel $< > $(BUILD)/console.out
+	$(Q)tail -n2 $(BUILD)/console.out
+	$(Q)tail -n1 $(BUILD)/console.out | grep -q "status: 0"
+
+# `make debugtest` will block QEMU until a debugger is connected to port 1234.
+
+debugtest: $(BUILD)/firmware-test.elf
+	qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -serial mon:stdio -S -s -kernel $<
diff --git a/ports/qemu-riscv/README.md b/ports/qemu-riscv/README.md
new file mode 100644
index 0000000000000..50b1a65374d2b
--- /dev/null
+++ b/ports/qemu-riscv/README.md
@@ -0,0 +1,29 @@
+This is an experimental, community-supported port for RISC-V RV32IMC emulation
+as provided by QEMU (http://qemu.org).
+
+The purposes of this port are to enable:
+
+1. Continuous integration
+    - run tests against architecture-specific parts of code base
+2. Experimentation
+    - simulation & prototyping of anything that has architecture-specific
+      code
+    - exploring instruction set in terms of optimising some part of
+      MicroPython or a module
+3. Streamlined debugging
+    - no need for JTAG or even an MCU chip itself
+    - 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 requires a bare metal RISC-V toolchain with GCC 10 or later, either
+with multilib support or 32 bits specific (M, C, and Zicsr extensions must be
+supported, along with ilp32 ABI).  Both newlib and picolibc are supported,
+with the latter having precedence if found.
+
+Most pre-built toolchains should work out of the box, either coming from your
+Linux distribution's package manager, or independently packaged ones like
+[xPack](https://xpack.github.io/dev-tools/riscv-none-elf-gcc/).
+
+To build and run the image with builtin testsuite:
+
+    make -f Makefile.test test
diff --git a/ports/qemu-riscv/entrypoint.s b/ports/qemu-riscv/entrypoint.s
new file mode 100644
index 0000000000000..9144c0c485421
--- /dev/null
+++ b/ports/qemu-riscv/entrypoint.s
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+        .section .start
+        .option  norvc           /* Do not emit compressed instructions. */
+        .type    start, @function
+        .global  start
+
+start:
+        .cfi_startproc
+
+        .option push
+        .option norelax
+        la   gp, _global_pointer /* Load global pointer register. */
+        .option pop
+
+        csrw satp, zero          /* Disable supervisor mode. */
+
+        /* Fill stack with a canary value. */
+
+        li   t0, 0xBBBBBBBB      /* Load canary value. */
+        la   t1, _sstack         /* Load stack area start address. */
+        la   t2, _estack         /* Load stack area end address. */
+1:
+        sw   t0, (t1)            /* Write canary. */
+        addi t1, t1, 4           /* Next word. */
+        bltu t1, t2, 1b          /* Loop until stack is filled. */
+
+        la   sp, _estack         /* Load stack pointer. */
+
+        /* Clear BSS area. */
+
+        la   t1, _sbss           /* Load BSS area start address. */
+        la   t2, _ebss           /* Load BSS area end address. */
+1:
+        sw   zero, (t1)          /* Clear word. */
+        addi t1, t1, 4           /* Next word. */
+        bltu t1, t2, 1b          /* Loop until BSS is cleared. */
+
+        /* Set program counter. */
+
+        la   t0, _entry_point    /* Load program counter address. */
+        csrw mepc, t0            /* Store it into machine exception PC. */
+        tail _entry_point        /* Jump to entry point. */
+
+        .cfi_endproc
+        .end
diff --git a/ports/qemu-riscv/interrupts.c b/ports/qemu-riscv/interrupts.c
new file mode 100644
index 0000000000000..ccb4644f9d5b9
--- /dev/null
+++ b/ports/qemu-riscv/interrupts.c
@@ -0,0 +1,292 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
+#include <stdint.h>
+
+// Vector table
+
+void mtvec_table(void) __attribute__((naked, section(".text.mtvec"), aligned(256)));
+
+// Default interrupts
+
+#define ASSIGN_EMPTY_MACHINE_INTERRUPT(interrupt_name) \
+    void interrupt_name(void) __attribute__((alias("mtvec_nop")))
+
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_ssi);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_msi);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_sti);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_mti);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_sei);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_mei);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq0);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq1);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq2);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq3);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq4);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq5);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq6);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq7);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq8);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq9);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq10);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq11);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq12);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq13);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq14);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq15);
+
+void mtvec_table(void) {
+    __asm volatile (
+        ".org mtvec_table + 0       \n"
+        "jal  zero, mtvec_exception \n" // Exception Handler
+        ".org mtvec_table + 4       \n"
+        "jal  zero, mtvec_ssi       \n" // Supervisor Software Interrupt
+        ".org mtvec_table + 12      \n"
+        "jal  zero, mtvec_msi       \n" // Machine Software Interrupt
+        ".org mtvec_table + 20      \n"
+        "jal  zero, mtvec_sti       \n" // Supervisor Timer Interrupt
+        ".org mtvec_table + 28      \n"
+        "jal  zero, mtvec_mti       \n" // Machine Timer Interrupt
+        ".org mtvec_table + 36      \n"
+        "jal  zero, mtvec_sei       \n" // Supervisor External Interrupt
+        ".org mtvec_table + 44      \n"
+        "jal  zero, mtvec_mei       \n" // Machine External Interrupt
+        // Not sure how many platform interrupts QEMU handles...
+        ".org mtvec_table + 48      \n"
+        "jal  mtvec_plat_irq0       \n" // Platform Interrupt #0
+        "jal  mtvec_plat_irq1       \n" // Platform Interrupt #1
+        "jal  mtvec_plat_irq2       \n" // Platform Interrupt #2
+        "jal  mtvec_plat_irq3       \n" // Platform Interrupt #3
+        "jal  mtvec_plat_irq4       \n" // Platform Interrupt #4
+        "jal  mtvec_plat_irq5       \n" // Platform Interrupt #5
+        "jal  mtvec_plat_irq6       \n" // Platform Interrupt #6
+        "jal  mtvec_plat_irq7       \n" // Platform Interrupt #7
+        "jal  mtvec_plat_irq8       \n" // Platform Interrupt #8
+        "jal  mtvec_plat_irq9       \n" // Platform Interrupt #9
+        "jal  mtvec_plat_irq10      \n" // Platform Interrupt #10
+        "jal  mtvec_plat_irq11      \n" // Platform Interrupt #11
+        "jal  mtvec_plat_irq12      \n" // Platform Interrupt #12
+        "jal  mtvec_plat_irq13      \n" // Platform Interrupt #13
+        "jal  mtvec_plat_irq14      \n" // Platform Interrupt #14
+        "jal  mtvec_plat_irq15      \n" // Platform Interrupt #15
+        :
+        :
+        : "memory"
+        );
+}
+
+volatile uint32_t registers_copy[35] = { 0 };
+
+const char *exception_causes[] = {
+    "Reserved",                       // 0
+    "Supervisor software interrupt",  // 1
+    "Machine software interrupt",     // 2
+    "Supervisor timer interrupt",     // 3
+    "Machine timer interrupt",        // 4
+    "Supervisor external interrupt",  // 5
+    "Machine external interrupt",     // 6
+    "Designated for platform use",    // 7
+    "Instruction address misaligned", // 8
+    "Instruction address fault",      // 9
+    "Illegal instruction",            // 10
+    "Breakpoint",                     // 11
+    "Load address misaligned",        // 12
+    "Load address fault",             // 13
+    "Store/AMO address misaligned",   // 14
+    "Store/AMO access fault",         // 15
+    "Environment call from U-mode",   // 16
+    "Environment call from S-mode",   // 17
+    "Environment call from M-mode",   // 18
+    "Instruction page fault",         // 19
+    "Load page fault",                // 20
+    "Store/AMO page fault",           // 21
+    "Designated for custom use"       // 22
+};
+
+const char *lookup_cause(uint32_t mcause) {
+    if (mcause & 0x80000000) {
+        switch (mcause & 0x7FFFFFFF) {
+            case 1:
+                return exception_causes[1];
+            case 3:
+                return exception_causes[2];
+            case 5:
+                return exception_causes[3];
+            case 7:
+                return exception_causes[4];
+            case 9:
+                return exception_causes[5];
+            case 11:
+                return exception_causes[6];
+            default:
+                return (mcause >= 16) ?
+                       exception_causes[7] :
+                       exception_causes[0];
+        }
+    }
+
+    switch (mcause) {
+        case 0:
+            return exception_causes[8];
+        case 1:
+            return exception_causes[9];
+        case 2:
+            return exception_causes[10];
+        case 3:
+            return exception_causes[11];
+        case 4:
+            return exception_causes[12];
+        case 5:
+            return exception_causes[13];
+        case 6:
+            return exception_causes[14];
+        case 7:
+            return exception_causes[15];
+        case 8:
+            return exception_causes[16];
+        case 9:
+            return exception_causes[17];
+        case 11:
+            return exception_causes[18];
+        case 12:
+            return exception_causes[19];
+        case 13:
+            return exception_causes[20];
+        case 15:
+            return exception_causes[21];
+        default: {
+            if ((mcause >= 24 && mcause <= 31) ||
+                (mcause >= 48 && mcause <= 63)) {
+                return exception_causes[22];
+            }
+
+            return exception_causes[0];
+        }
+    }
+}
+
+#pragma GCC push_options
+#pragma GCC optimize ("align-functions=4")
+
+__attribute__((interrupt("machine"), weak)) void mtvec_nop(void) {
+}
+
+__attribute__((interrupt("machine"), weak)) void mtvec_exception(void) {
+    __asm volatile (
+        "csrrw x31, mscratch, x31  \n" // Save X31
+        "la    x31, registers_copy \n" // Load target address
+        "sw    x1, 0(x31)          \n" // Save X1
+        "sw    x2, 4(x31)          \n" // Save X2
+        "sw    x3, 8(x31)          \n" // Save X3
+        "sw    x4, 12(x31)         \n" // Save X4
+        "sw    x5, 16(x31)         \n" // Save X5
+        "sw    x6, 20(x31)         \n" // Save X6
+        "sw    x7, 24(x31)         \n" // Save X7
+        "sw    x8, 28(x31)         \n" // Save X8
+        "sw    x9, 32(x31)         \n" // Save X9
+        "sw    x10, 36(x31)        \n" // Save X10
+        "sw    x11, 40(x31)        \n" // Save X11
+        "sw    x12, 44(x31)        \n" // Save X12
+        "sw    x13, 48(x31)        \n" // Save X13
+        "sw    x14, 52(x31)        \n" // Save X14
+        "sw    x15, 56(x31)        \n" // Save X15
+        "sw    x16, 60(x31)        \n" // Save X16
+        "sw    x17, 64(x31)        \n" // Save X17
+        "sw    x18, 68(x31)        \n" // Save X18
+        "sw    x19, 72(x31)        \n" // Save X19
+        "sw    x20, 76(x31)        \n" // Save X20
+        "sw    x21, 80(x31)        \n" // Save X21
+        "sw    x22, 84(x31)        \n" // Save X22
+        "sw    x23, 88(x31)        \n" // Save X23
+        "sw    x24, 92(x31)        \n" // Save X24
+        "sw    x25, 98(x31)        \n" // Save X25
+        "sw    x26, 100(x31)       \n" // Save X26
+        "sw    x27, 104(x31)       \n" // Save X27
+        "sw    x28, 108(x31)       \n" // Save X28
+        "sw    x29, 112(x31)       \n" // Save X29
+        "sw    x30, 116(x31)       \n" // Save X30
+        "csrr  x30, mscratch       \n" // Restore X31
+        "sw    x30, 120(x31)       \n" // Save X31
+        "csrr  x30, mepc           \n" // Load MEPC
+        "sw    x30, 124(x31)       \n" // Save MEPC
+        "csrr  x30, mcause         \n" // Load MCAUSE
+        "sw    x30, 128(x31)       \n" // Save MCAUSE
+        "csrr  x30, mtval          \n" // Load MTVAL
+        "sw    x30, 132(x31)       \n" // Save MTVAL
+        "csrr  x30, mstatus        \n" // Load MSTATUS
+        "sw    x30, 138(x31)       \n" // Save MSTATUS
+        "lw    x30, 116(x31)       \n" // Restore X30
+        "lw    x31, 120(x31)       \n" // Restore X31
+        :
+        :
+        : "memory"
+        );
+
+    printf("\nMACHINE EXCEPTION CAUGHT:\n\n");
+
+    printf(" RA=%08lX  SP=%08lX  GP=%08lX  TP=%08lX  T0=%08lX  T1=%08lX\n",
+        registers_copy[0], registers_copy[1], registers_copy[2],
+        registers_copy[3], registers_copy[4], registers_copy[5]);
+    printf(" T2=%08lX  S0=%08lX  S1=%08lX  A0=%08lX  A1=%08lX  A2=%08lX\n",
+        registers_copy[6], registers_copy[7], registers_copy[8],
+        registers_copy[9], registers_copy[10], registers_copy[11]);
+    printf(" A3=%08lX  A4=%08lX  A5=%08lX  A6=%08lX  A7=%08lX  S2=%08lX\n",
+        registers_copy[12], registers_copy[13], registers_copy[14],
+        registers_copy[15], registers_copy[16], registers_copy[17]);
+    printf(" S3=%08lX  S4=%08lX  S5=%08lX  S6=%08lX  S7=%08lX  S8=%08lX\n",
+        registers_copy[18], registers_copy[19], registers_copy[20],
+        registers_copy[21], registers_copy[22], registers_copy[23]);
+    printf(" S9=%08lX S10=%08lX S11=%08lX  T3=%08lX  T4=%08lX  T5=%08lX\n",
+        registers_copy[24], registers_copy[25], registers_copy[26],
+        registers_copy[27], registers_copy[28], registers_copy[29]);
+    printf(" T6=%08lX\n\n", registers_copy[30]);
+
+    printf(" MEPC=%08lX MTVAL=%08lX MSTATUS=%08lx MCAUSE=%08lx (%s)\n",
+        registers_copy[31], registers_copy[33], registers_copy[34],
+        registers_copy[32], lookup_cause(registers_copy[32]));
+
+    exit(-1);
+}
+
+#pragma GCC pop_options
+
+void set_interrupt_table(void) {
+    __asm volatile (
+        "csrrci s0, mstatus, 8 \n" // S0 = MSTATUS & ~MIE
+        "csrw   mstatus, s0    \n" // Global machine interrupts are disabled
+        "csrw   mie, zero      \n" // Disable machine interrupts
+        "csrw   mip, zero      \n" // Clear pending machine interrupts
+        "addi   s0, %0, 1      \n" // Vectored machine interrupts enabled
+        "csrw   mtvec, s0      \n" // Set new machine vector table
+        "csrrsi s0, mstatus, 8 \n" // S0 = MSTATUS | MIE
+        "csrw   mstatus, s0    \n" // Global machine interrupts are enabled
+        :
+        : "r" (mtvec_table)
+        : "memory"
+        );
+}
diff --git a/ports/qemu-riscv/mpconfigport.h b/ports/qemu-riscv/mpconfigport.h
new file mode 100644
index 0000000000000..8f50828e0f1a4
--- /dev/null
+++ b/ports/qemu-riscv/mpconfigport.h
@@ -0,0 +1,76 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2024 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
+
+#define MICROPY_CONFIG_ROM_LEVEL           (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
+#define MICROPY_MEM_STATS                  (1)
+#define MICROPY_ENABLE_GC                  (1)
+#define MICROPY_KBD_EXCEPTION              (0)
+#define MICROPY_HELPER_REPL                (0)
+#define MICROPY_LONGINT_IMPL               (MICROPY_LONGINT_IMPL_MPZ)
+#define MICROPY_FLOAT_IMPL                 (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_WARNINGS                   (1)
+#define MICROPY_PY_BUILTINS_INPUT          (0)
+#define MICROPY_PY_BUILTINS_HELP           (0)
+#define MICROPY_PY_IO_IOBASE               (0)
+#define MICROPY_PY_SYS_PLATFORM            "qemu-riscv32"
+#define MICROPY_PY_SYS_STDFILES            (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER        (0)
+#define MICROPY_PY_SELECT                  (0)
+#define MICROPY_PY_TIME                    (0)
+#define MICROPY_PY_ASYNCIO                 (0)
+#define MICROPY_PY_MACHINE                 (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE     "ports/qemu-arm/modmachine.c"
+#define MICROPY_PY_MACHINE_PIN_BASE        (1)
+#define MICROPY_VFS                        (1)
+
+// type definitions for the specific machine
+
+#define MP_SSIZE_MAX (0x7fffffff)
+
+#define UINT_FMT "%lu"
+#define INT_FMT "%ld"
+
+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;
+
+// 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>
+
+#ifdef TEST
+#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-riscv/mphalport.h b/ports/qemu-riscv/mphalport.h
new file mode 100644
index 0000000000000..0cbdfc039144b
--- /dev/null
+++ b/ports/qemu-riscv/mphalport.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-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 <stddef.h>
+
+#include "uart.h"
+
+#define mp_hal_stdin_rx_chr() (0)
+#define mp_hal_stdout_tx_strn_cooked(s, l) uart_tx_strn((s), (l))
diff --git a/ports/qemu-riscv/qstrdefsport.h b/ports/qemu-riscv/qstrdefsport.h
new file mode 100644
index 0000000000000..00d3e2ae3c555
--- /dev/null
+++ b/ports/qemu-riscv/qstrdefsport.h
@@ -0,0 +1,2 @@
+// qstrs specific to this port
+// *FORMAT-OFF*
diff --git a/ports/qemu-riscv/startup.c b/ports/qemu-riscv/startup.c
new file mode 100644
index 0000000000000..298bd605ed552
--- /dev/null
+++ b/ports/qemu-riscv/startup.c
@@ -0,0 +1,86 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
+
+#include "uart.h"
+
+extern void set_interrupt_table(void);
+extern int main(int argc, char **argv);
+
+void _entry_point(void) {
+    // Set interrupt table
+    set_interrupt_table();
+    // Enable UART
+    uart_init();
+    // Now that we have a basic system up and running we can call main
+    main(0, 0);
+    // Finished
+    exit(0);
+}
+
+void exit(int status) {
+    uint32_t semihosting_arguments[2] = { 0 };
+
+    // Exit via QEMU's RISC-V semihosting support.
+    __asm volatile (
+        ".option push            \n" // Transient options
+        ".option norvc           \n" // Do not emit compressed instructions
+        ".align 4                \n" // 16 bytes alignment
+        "mv     a1, %0           \n" // Load buffer
+        "li     t0, 0x20026      \n" // ADP_Stopped_ApplicationExit
+        "sw     t0, 0(a1)        \n" // ADP_Stopped_ApplicationExit
+        "sw     %1, 4(a1)        \n" // Exit code
+        "addi   a0, zero, 0x20   \n" // TARGET_SYS_EXIT_EXTENDED
+        "slli   zero, zero, 0x1F \n" // Entry NOP
+        "ebreak                  \n" // Give control to the debugger
+        "srai   zero, zero, 7    \n" // Semihosting call
+        ".option pop             \n" // Restore previous options set
+        :
+        : "r" (semihosting_arguments), "r" (status)
+        : "memory"
+        );
+
+    // Should never reach here.
+    for (;;) {
+    }
+}
+
+#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
+
+// Picolibc requires `stdout` to be explicitly defined.
+
+#ifdef _PICOLIBC__
+FILE *const stdout;
+#endif
diff --git a/ports/qemu-riscv/test_main.c b/ports/qemu-riscv/test_main.c
new file mode 100644
index 0000000000000..ca796766aca5a
--- /dev/null
+++ b/ports/qemu-riscv/test_main.c
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Ilya Dmitrichenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdio.h>
+
+#include "py/compile.h"
+#include "py/runtime.h"
+#include "py/stackctrl.h"
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "shared/runtime/gchelper.h"
+#include "lib/tinytest/tinytest.h"
+#include "lib/tinytest/tinytest_macros.h"
+
+#define HEAP_SIZE (200 * 1024)
+
+#include "genhdr/tests.h"
+
+int main() {
+    mp_stack_ctrl_init();
+    mp_stack_set_limit(10240);
+    static uint32_t heap[HEAP_SIZE / sizeof(uint32_t)];
+    upytest_set_heap(heap, (char *)heap + HEAP_SIZE);
+    int r = tinytest_main(0, NULL, groups);
+    printf("status: %d\n", r);
+    return r;
+}
+
+void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    gc_collect_end();
+}
+
+mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
+    mp_raise_OSError(MP_ENOENT);
+}
+
+void nlr_jump_fail(void *val) {
+    printf("uncaught NLR\n");
+    exit(1);
+}
diff --git a/ports/qemu-riscv/tests_profile.txt b/ports/qemu-riscv/tests_profile.txt
new file mode 100644
index 0000000000000..2f3bb7300ddf4
--- /dev/null
+++ b/ports/qemu-riscv/tests_profile.txt
@@ -0,0 +1,53 @@
+# Port-specific tests exclusion list.
+
+exclude_tests = exclude_tests.union(
+    (
+        # Native code generation is not yet supported.
+        "micropython/native_closure.py",
+        "micropython/native_const.py",
+        "micropython/native_const_intbig.py",
+        "micropython/native_for.py",
+        "micropython/native_fun_attrs.py",
+        "micropython/native_gen.py",
+        "micropython/native_misc.py",
+        "micropython/native_try.py",
+        "micropython/native_try_deep.py",
+        "micropython/native_while.py",
+        "micropython/native_with.py",
+
+        # Viper code generator is not yet supported.
+        "micropython/viper_addr.py",
+        "micropython/viper_args.py",
+        "micropython/viper_binop_arith.py",
+        "micropython/viper_binop_arith_uint.py",
+        "micropython/viper_binop_bitwise_uint.py",
+        "micropython/viper_binop_comp.py",
+        "micropython/viper_binop_comp_imm.py",
+        "micropython/viper_binop_comp_uint.py",
+        "micropython/viper_binop_divmod.py",
+        "micropython/viper_binop_multi_comp.py",
+        "micropython/viper_cond.py",
+        "micropython/viper_const.py",
+        "micropython/viper_const_intbig.py",
+        "micropython/viper_error.py",
+        "micropython/viper_globals.py",
+        "micropython/viper_import.py",
+        "micropython/viper_misc.py",
+        "micropython/viper_misc2.py",
+        "micropython/viper_misc3.py",
+        "micropython/viper_misc_intbig.py",
+        "micropython/viper_ptr16_load.py",
+        "micropython/viper_ptr16_store.py",
+        "micropython/viper_ptr32_load.py",
+        "micropython/viper_ptr32_store.py",
+        "micropython/viper_ptr8_load.py",
+        "micropython/viper_ptr8_store.py",
+        "micropython/viper_storeattr.py",
+        "micropython/viper_subscr.py",
+        "micropython/viper_subscr_multi.py",
+        "micropython/viper_try.py",
+        "micropython/viper_types.py",
+        "micropython/viper_unop.py",
+        "micropython/viper_with.py",
+    )
+)
diff --git a/ports/qemu-riscv/uart.c b/ports/qemu-riscv/uart.c
new file mode 100644
index 0000000000000..a266d6e6fdc8b
--- /dev/null
+++ b/ports/qemu-riscv/uart.c
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "uart.h"
+
+#if defined(QEMU_SOC_VIRT)
+
+volatile unsigned char *uart_buffer = (volatile unsigned char *)0x10000000;
+
+void uart_init(void) {
+}
+
+void uart_tx_strn(const char *buffer, size_t length) {
+    for (size_t index = 0; index < length; index++) {
+        *uart_buffer = buffer[index];
+    }
+}
+
+#endif // QEMU_SOC_VIRT
diff --git a/ports/qemu-riscv/uart.h b/ports/qemu-riscv/uart.h
new file mode 100644
index 0000000000000..fdaae424e19d1
--- /dev/null
+++ b/ports/qemu-riscv/uart.h
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+#ifndef MICROPY_INCLUDED_QEMU_RISCV_UART_H
+#define MICROPY_INCLUDED_QEMU_RISCV_UART_H
+
+void uart_init(void);
+void uart_tx_strn(const char *buf, size_t len);
+
+#endif // MICROPY_INCLUDED_QEMU_RISCV_UART_H
diff --git a/ports/qemu-riscv/virt.ld b/ports/qemu-riscv/virt.ld
new file mode 100644
index 0000000000000..64675ad4ee856
--- /dev/null
+++ b/ports/qemu-riscv/virt.ld
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/* Output format is 32 bits little endian. */
+OUTPUT_FORMAT("elf32-littleriscv", "elf32-littleriscv", "elf32-littleriscv");
+
+/*
+ * Memory layout:
+ *
+ * 0x8000_0000: .text
+ *   .........: .rodata
+ * 0x8040_0000: .data
+ *   .........: _global_pointer
+ *   .........: .bss
+ * 0x8060_0000: .stack
+ * 0x8060_0000: _sstack
+ * 0x8060_FFFF: _estack
+ */
+MEMORY
+{
+    ROM   (xr)  : ORIGIN = 0x80000000,                LENGTH = 4M
+    RAM   (xrw) : ORIGIN = ORIGIN(ROM) + LENGTH(ROM), LENGTH = 2M
+    STACK (rw)  : ORIGIN = ORIGIN(RAM) + LENGTH(RAM), LENGTH = 64K
+}
+
+SECTIONS
+{
+    /* Code + Read-Only data segment */
+
+    .text : ALIGN (4K)
+    {
+        *(.start)
+        *(.text)
+        . = ALIGN (4K);
+        *(.rodata)
+        _sirodata = .;
+    } > ROM
+
+    .rodata : AT (_sirodata) ALIGN (4K)
+    {
+        *(.rodata)
+    } > ROM
+
+    /* Data + BSS segment */
+
+    .data : ALIGN (4K)
+    {
+        *(.data)
+        _sibss = .;
+    } > RAM
+
+    .bss : AT (_sibss) ALIGN (4K)
+    {
+        /* Mark global pointer address. */
+        _global_pointer = .;
+
+        /* Mark BSS start. */
+        . = . + 4;
+        _sbss = .;
+        *(.bss)
+        /* Mark BSS end. */
+        _ebss = .;
+    } > RAM
+
+    /* Isolated stack segment. */
+
+    .stack : ALIGN(4K)
+    {
+        /* Mark stack start. */
+        _sstack = .;
+        . = LENGTH(STACK);
+        /* Mark stack end. */
+        _estack = .;
+    } > STACK
+}
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 1e1bd160af3c9..fa6c2a0331a10 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -678,6 +678,8 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             )  # 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
+        elif args.target == "qemu-riscv":
+            skip_tests.add("misc/print_exception.py")  # requires sys stdfiles
         elif args.target == "webassembly":
             skip_tests.add("basics/string_format_modulo.py")  # can't print nulls to stdout
             skip_tests.add("basics/string_strip.py")  # can't print nulls to stdout
@@ -1048,6 +1050,7 @@ def main():
     LOCAL_TARGETS = (
         "unix",
         "qemu-arm",
+        "qemu-riscv",
         "webassembly",
     )
     EXTERNAL_TARGETS = (
@@ -1151,6 +1154,12 @@ def main():
                     "inlineasm",
                     "ports/qemu-arm",
                 )
+            elif args.target == "qemu-riscv":
+                if not args.write_exp:
+                    raise ValueError("--target=qemu-riscv 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",)
             elif args.target == "webassembly":
                 test_dirs += ("float", "ports/webassembly")
         else:

From 1b10cb843cd678cdf1a6112739a452eec0293fcd Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 31 May 2024 14:38:52 +0200
Subject: [PATCH 1148/3129] github/workflows: Add qemu-riscv port to CI.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .github/workflows/ports_qemu-riscv.yml | 33 ++++++++++++++++++++++++++
 tools/ci.sh                            | 24 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 .github/workflows/ports_qemu-riscv.yml

diff --git a/.github/workflows/ports_qemu-riscv.yml b/.github/workflows/ports_qemu-riscv.yml
new file mode 100644
index 0000000000000..39ba06adb6cbd
--- /dev/null
+++ b/.github/workflows/ports_qemu-riscv.yml
@@ -0,0 +1,33 @@
+name: qemu-riscv port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'shared/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/qemu-arm/main.c'
+      - 'ports/qemu-riscv/**'
+      - 'tests/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_qemu_riscv_setup
+    - name: Build and run test suite
+      run: source tools/ci.sh && ci_qemu_riscv_build
+    - name: Print failures
+      if: failure()
+      run: grep --before-context=100 --text "FAIL" ports/qemu-riscv/build/console.out
diff --git a/tools/ci.sh b/tools/ci.sh
index b0746178b6689..7ba4ac4e57532 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -17,6 +17,11 @@ function ci_gcc_arm_setup {
     arm-none-eabi-gcc --version
 }
 
+function ci_gcc_riscv_setup {
+    sudo apt-get install gcc-riscv64-unknown-elf picolibc-riscv64-unknown-elf
+    riscv64-unknown-elf-gcc --version
+}
+
 ########################################################################################
 # c code formatting
 
@@ -259,6 +264,25 @@ function ci_qemu_arm_build {
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test BOARD=sabrelite test
 }
 
+########################################################################################
+# ports/qemu-riscv
+
+function ci_qemu_riscv_setup {
+    ci_gcc_riscv_setup
+    sudo apt-get update
+    sudo apt-get install qemu-system
+    qemu-system-riscv32 --version
+}
+
+function ci_qemu_riscv_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/qemu-riscv submodules
+    make ${MAKEOPTS} -C ports/qemu-riscv
+    make ${MAKEOPTS} -C ports/qemu-riscv clean
+    make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test submodules
+    make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test test
+}
+
 ########################################################################################
 # ports/renesas-ra
 

From 411d66586c0979d441404f8f68d7557aa8151c6a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 10 Jun 2024 10:02:36 +0200
Subject: [PATCH 1149/3129] extmod/modplatform: Add picolibc to the recognised
 libcs list.

This adds picolibc to the list of the recognised libc options.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 extmod/modplatform.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/modplatform.h b/extmod/modplatform.h
index 56a50e53c5445..b932551c7ccb2 100644
--- a/extmod/modplatform.h
+++ b/extmod/modplatform.h
@@ -83,6 +83,9 @@
 #elif defined(__NEWLIB__)
 #define MICROPY_PLATFORM_LIBC_LIB       "newlib"
 #define MICROPY_PLATFORM_LIBC_VER       _NEWLIB_VERSION
+#elif defined(_PICOLIBC__)
+#define MICROPY_PLATFORM_LIBC_LIB       "picolibc"
+#define MICROPY_PLATFORM_LIBC_VER       _PICOLIBC_VERSION
 #else
 #define MICROPY_PLATFORM_LIBC_LIB       ""
 #define MICROPY_PLATFORM_LIBC_VER       ""

From 0466560b12bce9e9007df620e4f6d273e922e40e Mon Sep 17 00:00:00 2001
From: Jason Kridner <jkridner@beagleboard.org>
Date: Wed, 22 Feb 2023 00:09:22 -0500
Subject: [PATCH 1150/3129] zephyr/modzsensor: Add additional sensor type
 constants.

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
---
 ports/zephyr/modzsensor.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 2a7278a61481e..58775b980ad3f 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -128,11 +128,24 @@ static const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
     C(MAGN_Y),
     C(MAGN_Z),
     C(DIE_TEMP),
+    C(AMBIENT_TEMP),
     C(PRESS),
     C(PROX),
     C(HUMIDITY),
     C(LIGHT),
+    C(IR),
+    C(RED),
+    C(GREEN),
+    C(BLUE),
     C(ALTITUDE),
+    C(PM_1_0),
+    C(PM_2_5),
+    C(PM_10),
+    C(DISTANCE),
+    C(CO2),
+    C(VOC),
+    C(GAS_RES),
+    C(VOLTAGE),
 #undef C
 };
 

From c211c052915fdb6007d79abf70329918381c3974 Mon Sep 17 00:00:00 2001
From: Jason Kridner <jkridner@beagleboard.org>
Date: Wed, 22 Feb 2023 00:21:16 -0500
Subject: [PATCH 1151/3129] zephyr/modsocket: Add socket.recvfrom method.

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
---
 ports/zephyr/modsocket.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index 12c4c934bcd2f..7732e0a64a40d 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -292,6 +292,35 @@ static mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
+static mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
+    socket_obj_t *socket = self_in;
+    socket_check_closed(socket);
+
+    mp_int_t max_len = mp_obj_get_int(len_in);
+    vstr_t vstr;
+    // +1 to accommodate for trailing \0
+    vstr_init_len(&vstr, max_len + 1);
+    struct sockaddr_in6 saddr;
+    socklen_t slen = sizeof(saddr);
+
+    ssize_t recv_len = zsock_recvfrom(socket->ctx, vstr.buf, max_len, 0, (struct sockaddr *)&saddr, &slen);
+    if (recv_len == -1) {
+        vstr_clear(&vstr);
+        mp_raise_OSError(errno);
+    }
+
+    mp_obj_t ret[2];
+    if (recv_len == 0) {
+        ret[0] = mp_const_empty_bytes;
+    } else {
+        vstr.len = recv_len;
+        ret[0] = mp_obj_new_bytes_from_vstr(&vstr);
+    }
+    ret[1] = format_inet_addr((struct sockaddr *)&saddr, 0);
+    return mp_obj_new_tuple(2, ret);
+}
+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) {
     (void)n_args; // always 4
     mp_warning(MP_WARN_CAT(RuntimeWarning), "setsockopt() not implemented");
@@ -336,6 +365,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_send), MP_ROM_PTR(&socket_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&socket_recv_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_read), MP_ROM_PTR(&mp_stream_read_obj) },

From 2b0e64beaf5998bae794d2d67827f70a8bf0fe74 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@analog.com>
Date: Tue, 2 Jan 2024 14:21:37 -0600
Subject: [PATCH 1152/3129] zephyr: Link MicroPython with the Zephyr kernel
 library.

Unlike most other Zephyr libraries, libkernel.a is not built as a
whole-archive.

This change also fixes a linker error observed on nucleo_wb55rg while
preparing an upgrade to Zephyr v3.5.0, caused by an undefined reference to
`z_impl_k_busy_wait`.

Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 ports/zephyr/CMakeLists.txt     | 1 +
 ports/zephyr/src/zephyr_start.c | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 743907e623a25..c048d92d2ae24 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -109,6 +109,7 @@ zephyr_library_compile_definitions(
 )
 
 zephyr_library_sources(${MICROPY_SOURCE_QSTR})
+zephyr_library_link_libraries(kernel)
 
 add_dependencies(${MICROPY_TARGET} zephyr_generated_headers)
 
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index b24e501c33363..bcd68f92ce052 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -36,8 +36,4 @@ 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 a053e639147d97c4a306ab272c12d9520a80e805 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jun 2024 23:32:09 +1000
Subject: [PATCH 1153/3129] webassembly/objjsproxy: Implement proxying of JS
 iterable protocol.

This allows Python to iterate over JavaScript objects that provide
Symbol.iterator.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/objjsproxy.c                | 33 ++++++++++---------
 tests/ports/webassembly/js_proxy_iterator.mjs | 14 ++++++++
 .../webassembly/js_proxy_iterator.mjs.exp     |  4 +++
 3 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 tests/ports/webassembly/js_proxy_iterator.mjs
 create mode 100644 tests/ports/webassembly/js_proxy_iterator.mjs.exp

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 5c09e003fdccc..cbfe8be49baf2 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -153,14 +153,21 @@ EM_JS(void, js_reflect_construct, (int f_ref, uint32_t n_args, uint32_t * args,
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(int, js_get_len, (int f_ref), {
-    return proxy_js_ref[f_ref].length;
+EM_JS(void, js_get_iter, (int f_ref, uint32_t * out), {
+    const f = proxy_js_ref[f_ref];
+    const ret = f[Symbol.iterator]();
+    proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(void, js_subscr_int, (int f_ref, int idx, uint32_t * out), {
+EM_JS(bool, js_iter_next, (int f_ref, uint32_t * out), {
     const f = proxy_js_ref[f_ref];
-    const ret = f[idx];
-    proxy_convert_js_to_mp_obj_jsside(ret, out);
+    const ret = f.next();
+    if (ret.done) {
+        return false;
+    } else {
+        proxy_convert_js_to_mp_obj_jsside(ret.value, out);
+        return true;
+    }
 });
 
 EM_JS(void, js_subscr_load, (int f_ref, uint32_t * index_ref, uint32_t * out), {
@@ -320,17 +327,13 @@ void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 typedef struct _jsproxy_it_t {
     mp_obj_base_t base;
     mp_fun_1_t iternext;
-    mp_obj_jsproxy_t *obj;
-    uint16_t cur;
-    uint16_t len;
+    mp_obj_jsproxy_t *iter;
 } jsproxy_it_t;
 
 static mp_obj_t jsproxy_it_iternext(mp_obj_t self_in) {
     jsproxy_it_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->cur < self->len) {
-        uint32_t out[3];
-        js_subscr_int(self->obj->ref, self->cur, out);
-        self->cur += 1;
+    uint32_t out[3];
+    if (js_iter_next(self->iter->ref, out)) {
         return proxy_convert_js_to_mp_obj_cside(out);
     } else {
         return MP_OBJ_STOP_ITERATION;
@@ -343,9 +346,9 @@ static mp_obj_t jsproxy_new_it(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     jsproxy_it_t *o = (jsproxy_it_t *)iter_buf;
     o->base.type = &mp_type_polymorph_iter;
     o->iternext = jsproxy_it_iternext;
-    o->obj = self;
-    o->cur = 0;
-    o->len = js_get_len(self->ref);
+    uint32_t out[3];
+    js_get_iter(self->ref, out);
+    o->iter = proxy_convert_js_to_mp_obj_cside(out);
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/tests/ports/webassembly/js_proxy_iterator.mjs b/tests/ports/webassembly/js_proxy_iterator.mjs
new file mode 100644
index 0000000000000..34b54b4837a85
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_iterator.mjs
@@ -0,0 +1,14 @@
+// Test accessing JavaScript iterables (objects with Symbol.iterator) from Python.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+import js
+
+for v in js.Set.new([1, 2]):
+    print(v)
+
+url_search_params = js.URLSearchParams.new("one=1&two=2")
+for key in url_search_params.keys():
+    print(key, list(url_search_params.getAll(key)))
+`);
diff --git a/tests/ports/webassembly/js_proxy_iterator.mjs.exp b/tests/ports/webassembly/js_proxy_iterator.mjs.exp
new file mode 100644
index 0000000000000..e8d11286c60a2
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_iterator.mjs.exp
@@ -0,0 +1,4 @@
+1
+2
+one ['1']
+two ['2']

From e9c898cb3312c2e2cf9e0da1d099541bf7bdf4d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 Jun 2024 17:35:24 +1000
Subject: [PATCH 1154/3129] webassembly/asyncio: Support top-level await of
 asyncio Task and Event.

This change allows doing a top-level await on an asyncio primitive like
Task and Event.

This feature enables a better interaction and synchronisation between
JavaScript and Python, because `api.runPythonAsync` can now be used (called
from JavaScript) to await on the completion of asyncio primitives.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/asyncio/core.py             | 24 ++++++++++----
 ports/webassembly/modjsffi.c                  | 15 ---------
 ports/webassembly/proxy_c.c                   | 33 ++++++++++++++++++-
 ports/webassembly/qstrdefsport.h              |  1 +
 .../webassembly/asyncio_top_level_await.mjs   | 25 ++++++++++++++
 .../asyncio_top_level_await.mjs.exp           |  7 ++++
 6 files changed, 83 insertions(+), 22 deletions(-)
 create mode 100644 tests/ports/webassembly/asyncio_top_level_await.mjs
 create mode 100644 tests/ports/webassembly/asyncio_top_level_await.mjs.exp

diff --git a/ports/webassembly/asyncio/core.py b/ports/webassembly/asyncio/core.py
index f6f9d19e5c154..cc26e7b8d5a82 100644
--- a/ports/webassembly/asyncio/core.py
+++ b/ports/webassembly/asyncio/core.py
@@ -50,9 +50,6 @@ def __next__(self):
 # Pause task execution for the given time (integer in milliseconds, uPy extension)
 # Use a SingletonGenerator to do it without allocating on the heap
 def sleep_ms(t, sgen=SingletonGenerator()):
-    if cur_task is None:
-        # Support top-level asyncio.sleep, via a JavaScript Promise.
-        return jsffi.async_timeout_ms(t)
     assert sgen.state is None
     sgen.state = ticks_add(ticks(), max(0, t))
     return sgen
@@ -69,6 +66,18 @@ def sleep(t):
 asyncio_timer = None
 
 
+class TopLevelCoro:
+    @staticmethod
+    def set(resolve, reject):
+        TopLevelCoro.resolve = resolve
+        TopLevelCoro.reject = reject
+        _schedule_run_iter(0)
+
+    @staticmethod
+    def send(value):
+        TopLevelCoro.resolve()
+
+
 class ThenableEvent:
     def __init__(self, thenable):
         self.result = None  # Result of the thenable
@@ -122,12 +131,12 @@ def _run_iter():
             dt = max(0, ticks_diff(t.ph_key, ticks()))
         else:
             # No tasks can be woken so finished running
-            cur_task = None
+            cur_task = _top_level_task
             return
 
         if dt > 0:
             # schedule to call again later
-            cur_task = None
+            cur_task = _top_level_task
             _schedule_run_iter(dt)
             return
 
@@ -198,11 +207,14 @@ def create_task(coro):
     return t
 
 
+# Task used to suspend and resume top-level await.
+_top_level_task = Task(TopLevelCoro, globals())
+
 ################################################################################
 # Event loop wrapper
 
 
-cur_task = None
+cur_task = _top_level_task
 
 
 class Loop:
diff --git a/ports/webassembly/modjsffi.c b/ports/webassembly/modjsffi.c
index 202e1d7ec0149..ac3d860235240 100644
--- a/ports/webassembly/modjsffi.c
+++ b/ports/webassembly/modjsffi.c
@@ -62,20 +62,6 @@ static mp_obj_t mp_jsffi_to_js(mp_obj_t arg) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_jsffi_to_js_obj, mp_jsffi_to_js);
 
-// *FORMAT-OFF*
-EM_JS(void, promise_with_timeout_ms, (double ms, uint32_t * out), {
-    const ret = new Promise((resolve) => setTimeout(resolve, ms));
-    proxy_convert_js_to_mp_obj_jsside(ret, out);
-});
-// *FORMAT-ON*
-
-static mp_obj_t mp_jsffi_async_timeout_ms(mp_obj_t arg) {
-    uint32_t out[PVN];
-    promise_with_timeout_ms(mp_obj_get_float_to_d(arg), out);
-    return proxy_convert_js_to_mp_obj_cside(out);
-}
-static MP_DEFINE_CONST_FUN_OBJ_1(mp_jsffi_async_timeout_ms_obj, mp_jsffi_async_timeout_ms);
-
 // *FORMAT-OFF*
 EM_JS(void, js_get_proxy_js_ref_info, (uint32_t * out), {
     let used = 0;
@@ -121,7 +107,6 @@ static const mp_rom_map_elem_t mp_module_jsffi_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_JsException), MP_ROM_PTR(&mp_type_JsException) },
     { MP_ROM_QSTR(MP_QSTR_create_proxy), MP_ROM_PTR(&mp_jsffi_create_proxy_obj) },
     { MP_ROM_QSTR(MP_QSTR_to_js), MP_ROM_PTR(&mp_jsffi_to_js_obj) },
-    { MP_ROM_QSTR(MP_QSTR_async_timeout_ms), MP_ROM_PTR(&mp_jsffi_async_timeout_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem_info), MP_ROM_PTR(&mp_jsffi_mem_info_obj) },
 };
 static MP_DEFINE_CONST_DICT(mp_module_jsffi_globals, mp_module_jsffi_globals_table);
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 6e6f928a2ee4b..a8c444faaebca 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -470,6 +470,12 @@ EM_JS(void, js_then_continue, (int jsref, uint32_t * py_resume, uint32_t * resol
 });
 // *FORMAT-ON*
 
+EM_JS(void, create_promise, (uint32_t * out_set, uint32_t * out_promise), {
+    const out_set_js = proxy_convert_mp_to_js_obj_jsside(out_set);
+    const promise = new Promise(out_set_js);
+    proxy_convert_js_to_mp_obj_jsside(promise, out_promise);
+});
+
 static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t resolve, mp_obj_t reject) {
     if (throw_value != MP_OBJ_NULL && throw_value != mp_const_none) {
         if (send_value == mp_const_none) {
@@ -483,6 +489,9 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t send_value, mp_o
         }
     } else {
         throw_value = MP_OBJ_NULL;
+        if (send_value == mp_const_undefined) {
+            send_value = mp_const_none;
+        }
     }
 
     mp_obj_t ret_value;
@@ -496,7 +505,29 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t send_value, mp_o
         js_then_resolve(out_ret_value, out_resolve);
         return mp_const_none;
     } else if (ret_kind == MP_VM_RETURN_YIELD) {
-        // ret_value should be a JS thenable
+        // If ret_value is None then there has been a top-level await of an asyncio primitive.
+        // Otherwise, ret_value should be a JS thenable.
+
+        if (ret_value == mp_const_none) {
+            // Waiting on an asyncio primitive to complete, eg a Task or Event.
+            //
+            // Completion of this primitive will occur when the asyncio.core._top_level_task
+            // Task is made runable and its coroutine's send() method is called.  Need to
+            // construct a Promise that resolves when that send() method is called, because
+            // that will resume the top-level await from the JavaScript side.
+            //
+            // This is accomplished via the asyncio.core.TopLevelCoro class and its methods.
+            mp_obj_t asyncio = mp_import_name(MP_QSTR_asyncio_dot_core, mp_const_none, MP_OBJ_NEW_SMALL_INT(0));
+            mp_obj_t asyncio_core = mp_load_attr(asyncio, MP_QSTR_core);
+            mp_obj_t top_level_coro = mp_load_attr(asyncio_core, MP_QSTR_TopLevelCoro);
+            mp_obj_t top_level_coro_set = mp_load_attr(top_level_coro, MP_QSTR_set);
+            uint32_t out_set[PVN];
+            proxy_convert_mp_to_js_obj_cside(top_level_coro_set, out_set);
+            uint32_t out_promise[PVN];
+            create_promise(out_set, out_promise);
+            ret_value = proxy_convert_js_to_mp_obj_cside(out_promise);
+        }
+
         mp_obj_t py_resume = mp_obj_new_bound_meth(MP_OBJ_FROM_PTR(&resume_obj), self_in);
         int ref = mp_obj_jsproxy_get_ref(ret_value);
         uint32_t out_py_resume[PVN];
diff --git a/ports/webassembly/qstrdefsport.h b/ports/webassembly/qstrdefsport.h
index 472d05f4375f6..421344bd494da 100644
--- a/ports/webassembly/qstrdefsport.h
+++ b/ports/webassembly/qstrdefsport.h
@@ -1,3 +1,4 @@
 // qstrs specific to this port
 // *FORMAT-OFF*
 Q(/lib)
+Q(asyncio.core)
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs b/tests/ports/webassembly/asyncio_top_level_await.mjs
new file mode 100644
index 0000000000000..d8a9cad422e9b
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs
@@ -0,0 +1,25 @@
+// Test top-level await on asyncio primitives: Task, Event.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+await mp.runPythonAsync(`
+import asyncio
+
+async def task(event):
+    print("task set event")
+    event.set()
+    print("task sleep")
+    await asyncio.sleep(0.1)
+    print("task end")
+
+event = asyncio.Event()
+t = asyncio.create_task(task(event))
+
+print("top-level wait event")
+await event.wait()
+print("top-level wait task")
+await t
+print("top-level end")
+`);
+
+console.log("finished");
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs.exp b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
new file mode 100644
index 0000000000000..7232c5d4f0d2d
--- /dev/null
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
@@ -0,0 +1,7 @@
+top-level wait event
+task set event
+task sleep
+top-level wait task
+task end
+top-level end
+finished

From 8ac9c8f392000febb6ca58c470b653589dd7c710 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Jun 2024 17:27:31 +1000
Subject: [PATCH 1155/3129] extmod/modasyncio: Add support for a callback on
 TaskQueue push.

Allows passing in a callback to `TaskQueue()` that is called when something
is pushed on to the queue.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modasyncio.c | 17 ++++++++++++++++-
 py/mpconfig.h       |  4 ++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/extmod/modasyncio.c b/extmod/modasyncio.c
index 4f82370d238a9..6161500bf5e7c 100644
--- a/extmod/modasyncio.c
+++ b/extmod/modasyncio.c
@@ -53,6 +53,9 @@ typedef struct _mp_obj_task_t {
 typedef struct _mp_obj_task_queue_t {
     mp_obj_base_t base;
     mp_obj_task_t *heap;
+    #if MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK
+    mp_obj_t push_callback;
+    #endif
 } mp_obj_task_queue_t;
 
 static const mp_obj_type_t task_queue_type;
@@ -86,9 +89,16 @@ 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_arg_check_num(n_args, n_kw, 0, MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK ? 1 : 0, false);
     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);
+    #if MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK
+    if (n_args == 1) {
+        self->push_callback = args[0];
+    } else {
+        self->push_callback = MP_OBJ_NULL;
+    }
+    #endif
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -113,6 +123,11 @@ static mp_obj_t task_queue_push(size_t n_args, const mp_obj_t *args) {
         task->ph_key = args[2];
     }
     self->heap = (mp_obj_task_t *)mp_pairheap_push(task_lt, TASK_PAIRHEAP(self->heap), TASK_PAIRHEAP(task));
+    #if MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK
+    if (self->push_callback != MP_OBJ_NULL) {
+        mp_call_function_1(self->push_callback, MP_OBJ_NEW_SMALL_INT(0));
+    }
+    #endif
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(task_queue_push_obj, 2, 3, task_queue_push);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 61cfe96da8027..2cbf5b88efab0 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1610,6 +1610,10 @@ typedef double mp_float_t;
 #define MICROPY_PY_ASYNCIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+#ifndef MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK
+#define MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK (0)
+#endif
+
 #ifndef MICROPY_PY_UCTYPES
 #define MICROPY_PY_UCTYPES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif

From 13195a678d0155a52818beaa5ffc4f4678a4226d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Jun 2024 15:04:12 +1000
Subject: [PATCH 1156/3129] webassembly/asyncio: Schedule run loop when tasks
 are pushed to queue.

In the webassembly port there is no asyncio run loop running at the top
level.  Instead the Python asyncio run loop is scheduled through setTimeout
and run by the outer JavaScript event loop.  Because tasks can become
runable from an external (to Python) event (eg a JavaScript callback), the
run loop must be scheduled whenever a task is pushed to the asyncio task
queue, otherwise tasks may be waiting forever on the queue.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/asyncio/core.py             |  5 +-
 ports/webassembly/mpconfigport.h              |  1 +
 .../webassembly/asyncio_top_level_await.mjs   | 65 +++++++++++++++++++
 .../asyncio_top_level_await.mjs.exp           | 12 ++++
 4 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/ports/webassembly/asyncio/core.py b/ports/webassembly/asyncio/core.py
index cc26e7b8d5a82..47846fc25a331 100644
--- a/ports/webassembly/asyncio/core.py
+++ b/ports/webassembly/asyncio/core.py
@@ -71,7 +71,6 @@ class TopLevelCoro:
     def set(resolve, reject):
         TopLevelCoro.resolve = resolve
         TopLevelCoro.reject = reject
-        _schedule_run_iter(0)
 
     @staticmethod
     def send(value):
@@ -90,7 +89,6 @@ def set(self, value=None):
         if self.waiting:
             _task_queue.push(self.waiting)
             self.waiting = None
-            _schedule_run_iter(0)
 
     def remove(self, task):
         self.waiting = None
@@ -203,7 +201,6 @@ def create_task(coro):
         raise TypeError("coroutine expected")
     t = Task(coro, globals())
     _task_queue.push(t)
-    _schedule_run_iter(0)
     return t
 
 
@@ -253,7 +250,7 @@ def current_task():
 
 def new_event_loop():
     global _task_queue
-    _task_queue = TaskQueue()  # TaskQueue of Task instances.
+    _task_queue = TaskQueue(_schedule_run_iter)  # TaskQueue of Task instances.
     return Loop
 
 
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index ece7868fb95ab..ab56162ca2b07 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -56,6 +56,7 @@
 #define MICROPY_USE_INTERNAL_PRINTF (0)
 
 #define MICROPY_EPOCH_IS_1970       (1)
+#define MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (mp_js_random_u32())
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs b/tests/ports/webassembly/asyncio_top_level_await.mjs
index d8a9cad422e9b..234b7a6ce6fb9 100644
--- a/tests/ports/webassembly/asyncio_top_level_await.mjs
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs
@@ -2,6 +2,71 @@
 
 const mp = await (await import(process.argv[2])).loadMicroPython();
 
+/**********************************************************/
+// Top-level await for an Event which is set by a JavaScript
+// callback.
+
+console.log("= TEST 1 ==========");
+
+await mp.runPythonAsync(`
+import asyncio
+import js
+
+event = asyncio.Event()
+
+def callback():
+    print("callback set event")
+    event.set()
+
+js.setTimeout(callback, 100)
+
+print("top-level wait event")
+await event.wait()
+print("top-level end")
+`);
+
+console.log("finished");
+
+/**********************************************************/
+// Top-level await for a Task which is cancelled by a
+// JavaScript callback.
+
+console.log("= TEST 2 ==========");
+
+await mp.runPythonAsync(`
+import asyncio
+import js
+import time
+
+async def task():
+    print("task start")
+    await asyncio.sleep(5)
+    print("task end")
+
+def callback():
+    print("callback cancel task")
+    t.cancel()
+
+t  = asyncio.create_task(task())
+js.setTimeout(callback, 100)
+
+print("top-level wait task")
+try:
+    t0 = time.time()
+    await t
+except asyncio.CancelledError:
+    dt = time.time() - t0
+    print("top-level task CancelledError", dt < 1)
+`);
+
+console.log("finished");
+
+/**********************************************************/
+// Top-level await for an Event and a Task, with the task
+// setting the event.
+
+console.log("= TEST 3 ==========");
+
 await mp.runPythonAsync(`
 import asyncio
 
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs.exp b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
index 7232c5d4f0d2d..66fefd2dcef86 100644
--- a/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
@@ -1,3 +1,15 @@
+= TEST 1 ==========
+top-level wait event
+callback set event
+top-level end
+finished
+= TEST 2 ==========
+top-level wait task
+task start
+callback cancel task
+top-level task CancelledError True
+finished
+= TEST 3 ==========
 top-level wait event
 task set event
 task sleep

From 88513d12268f5a5c3f3488f1a2d70cb605129537 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Jun 2024 15:17:21 +1000
Subject: [PATCH 1157/3129] webassembly/api: Allow specifying the pystack size.

This allows increasing the Python recursion depth if needed.

Also increase the default to 2k words.  There is enough RAM in the
browser/node context for this to be increased, and having a larger pystack
allows more complex code to run without hitting the limit.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/api.js                    | 17 ++++++++++++-----
 ports/webassembly/main.c                    | 12 ++++++------
 tests/ports/webassembly/heap_expand.mjs.exp | 10 +++++-----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ports/webassembly/api.js b/ports/webassembly/api.js
index c00edf575fa96..0718d13d6786f 100644
--- a/ports/webassembly/api.js
+++ b/ports/webassembly/api.js
@@ -25,6 +25,7 @@
  */
 
 // Options:
+// - pystack: size in words of the MicroPython Python stack.
 // - heapsize: size in bytes of the MicroPython GC heap.
 // - url: location to load `micropython.mjs`.
 // - stdin: function to return input characters.
@@ -34,10 +35,11 @@
 // - stderr: same behaviour as stdout but for error output.
 // - linebuffer: whether to buffer line-by-line to stdout/stderr.
 export async function loadMicroPython(options) {
-    const { heapsize, url, stdin, stdout, stderr, linebuffer } = Object.assign(
-        { heapsize: 1024 * 1024, linebuffer: true },
-        options,
-    );
+    const { pystack, heapsize, url, stdin, stdout, stderr, linebuffer } =
+        Object.assign(
+            { pystack: 2 * 1024, heapsize: 1024 * 1024, linebuffer: true },
+            options,
+        );
     let Module = {};
     Module.locateFile = (path, scriptDirectory) =>
         url || scriptDirectory + path;
@@ -96,7 +98,12 @@ export async function loadMicroPython(options) {
         );
         return proxy_convert_mp_to_js_obj_jsside_with_free(value);
     };
-    Module.ccall("mp_js_init", "null", ["number"], [heapsize]);
+    Module.ccall(
+        "mp_js_init",
+        "null",
+        ["number", "number"],
+        [pystack, heapsize],
+    );
     Module.ccall("proxy_c_init", "null", [], []);
     return {
         _module: Module,
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 6502ed16d3aae..c542f0cd72efe 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -66,7 +66,12 @@ void external_call_depth_dec(void) {
     --external_call_depth;
 }
 
-void mp_js_init(int heap_size) {
+void mp_js_init(int pystack_size, int heap_size) {
+    #if MICROPY_ENABLE_PYSTACK
+    mp_obj_t *pystack = (mp_obj_t *)malloc(pystack_size * sizeof(mp_obj_t));
+    mp_pystack_init(pystack, pystack + pystack_size);
+    #endif
+
     #if MICROPY_ENABLE_GC
     char *heap = (char *)malloc(heap_size * sizeof(char));
     gc_init(heap, heap + heap_size);
@@ -80,11 +85,6 @@ void mp_js_init(int heap_size) {
     MP_STATE_MEM(gc_alloc_threshold) = 16 * 1024 / MICROPY_BYTES_PER_GC_BLOCK;
     #endif
 
-    #if MICROPY_ENABLE_PYSTACK
-    static mp_obj_t pystack[1024];
-    mp_pystack_init(pystack, &pystack[MP_ARRAY_SIZE(pystack)]);
-    #endif
-
     mp_init();
 
     #if MICROPY_VFS_POSIX
diff --git a/tests/ports/webassembly/heap_expand.mjs.exp b/tests/ports/webassembly/heap_expand.mjs.exp
index ee14908409d86..5efa8567f7707 100644
--- a/tests/ports/webassembly/heap_expand.mjs.exp
+++ b/tests/ports/webassembly/heap_expand.mjs.exp
@@ -17,11 +17,11 @@
 135109888
 134978800
 134716640
-135216848
-136217216
-138218032
-142219616
-150222864
+135216784
+136217152
+138217840
+142219296
+150222224
 1
 2
 4

From 5040b13dd47e1d3dad401f45ba23f4b17fd2d670 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 20 Jun 2024 08:22:56 -0400
Subject: [PATCH 1158/3129] py/objdeque: Fix deque type flags based on option
 settings.

This fixes a minor issue in the changes made by
7dff38fdc190d7b731fad8319d2ae8aa13fde18a: the type flags for deque were
meant to be conditionalized based on MICROPY_PY_COLLECTIONS_DEQUE_ITER, but
the computed conditionalized value wasn't used.

Signed-off-by: Dan Halbert <halbert@halwitz.org>
---
 py/objdeque.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objdeque.c b/py/objdeque.c
index 583537017fdb2..2ad771284df53 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -263,7 +263,7 @@ static MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table);
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_deque,
     MP_QSTR_deque,
-    MP_TYPE_FLAG_ITER_IS_GETITER,
+    DEQUE_TYPE_FLAGS,
     make_new, deque_make_new,
     unary_op, deque_unary_op,
     DEQUE_TYPE_SUBSCR

From 407464348d64759e7b4d9a129ff367074c5797bd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jun 2024 14:35:43 +1000
Subject: [PATCH 1159/3129] tests/cpydiff: Remove deque difference test.

Because `collections.deque` is now a built-in type in MicroPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cpydiff/modules_deque.py | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 tests/cpydiff/modules_deque.py

diff --git a/tests/cpydiff/modules_deque.py b/tests/cpydiff/modules_deque.py
deleted file mode 100644
index 4d2746d1f864e..0000000000000
--- a/tests/cpydiff/modules_deque.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""
-categories: Modules,deque
-description: Deque not implemented
-cause: Unknown
-workaround: Use regular lists. micropython-lib has implementation of collections.deque.
-"""
-import collections
-
-D = collections.deque()
-print(D)

From 5a778ebc378d7a1bc9716177950c9e8ac000bb56 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Jun 2024 19:07:14 +1000
Subject: [PATCH 1160/3129] tests/thread: Re-enable GC before stress_schedule
 test ends.

Otherwise GC stays disabled (not re-enabled by soft reset) and later test
runs fail with MemoryError.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/thread/stress_schedule.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/thread/stress_schedule.py b/tests/thread/stress_schedule.py
index a5d7dc824edea..97876f0f77ca8 100644
--- a/tests/thread/stress_schedule.py
+++ b/tests/thread/stress_schedule.py
@@ -52,6 +52,8 @@ def thread():
 thread_run = False
 time.sleep_ms(20)
 
+gc.enable()
+
 if n < _NUM_TASKS:
     # Not all the tasks were scheduled, likely the scheduler stopped working.
     print(n)

From 8338f663523d675847b8c0b9b92977b76995de8f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 8 Jun 2024 11:00:08 +0200
Subject: [PATCH 1161/3129] py/asmrv32: Add RISC-V RV32IMC native code emitter.

This adds a native code generation backend for RISC-V RV32I CPUs, currently
limited to the I, M, and C instruction sets.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmbase.h    |   1 +
 py/asmrv32.c    | 595 ++++++++++++++++++++++++++++++++++++++++++++++++
 py/asmrv32.h    | 464 +++++++++++++++++++++++++++++++++++++
 py/compile.c    |   3 +
 py/emit.h       |   3 +
 py/emitglue.c   |   2 +-
 py/emitnative.c |  32 ++-
 py/emitnrv32.c  |  44 ++++
 py/mpconfig.h   |   7 +-
 py/py.cmake     |   2 +
 py/py.mk        |   2 +
 11 files changed, 1152 insertions(+), 3 deletions(-)
 create mode 100644 py/asmrv32.c
 create mode 100644 py/asmrv32.h
 create mode 100644 py/emitnrv32.c

diff --git a/py/asmbase.h b/py/asmbase.h
index 352d2f54cc810..461393fe77fb7 100644
--- a/py/asmbase.h
+++ b/py/asmbase.h
@@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_PY_ASMBASE_H
 
 #include <stdint.h>
+#include <stddef.h>
 #include <stdbool.h>
 
 #define MP_ASM_PASS_COMPUTE (1)
diff --git a/py/asmrv32.c b/py/asmrv32.c
new file mode 100644
index 0000000000000..228edfc22c102
--- /dev/null
+++ b/py/asmrv32.c
@@ -0,0 +1,595 @@
+/*
+ * This file is part of the MicroPython project, https://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
+#include <string.h>
+
+#include "py/emit.h"
+#include "py/mpconfig.h"
+
+// wrapper around everything in this file
+#if MICROPY_EMIT_RV32
+
+#include "py/asmrv32.h"
+
+#if MICROPY_DEBUG_VERBOSE
+#define DEBUG_PRINT (1)
+#define DEBUG_printf DEBUG_printf
+#else
+#define DEBUG_printf(...) (void)0
+#endif
+
+#ifndef MP_POPCOUNT
+#ifdef _MSC_VER
+#include <intrin.h>
+#define MP_POPCOUNT __popcnt
+#else
+#if defined __has_builtin
+#if __has_builtin(__builtin_popcount)
+#define MP_POPCOUNT __builtin_popcount
+#endif
+#else
+static uint32_t fallback_popcount(uint32_t value) {
+    value = value - ((value >> 1) & 0x55555555);
+    value = (value & 0x33333333) + ((value >> 2) & 0x33333333);
+    value = (value + (value >> 4)) & 0x0F0F0F0F;
+    return value * 0x01010101;
+}
+#define MP_POPCOUNT fallback_popcount
+#endif
+#endif
+#endif
+
+#define INTERNAL_TEMPORARY ASM_RV32_REG_T4
+#define AVAILABLE_REGISTERS_COUNT 32
+
+#define FIT_UNSIGNED(value, bits) (((value) & ~((1U << (bits)) - 1)) == 0)
+#define FIT_SIGNED(value, bits) \
+    ((((value) & ~((1U << ((bits) - 1)) - 1)) == 0) ||                                      \
+    (((value) & ~((1U << ((bits) - 1)) - 1)) == ~((1U << ((bits) - 1)) - 1)))
+
+///////////////////////////////////////////////////////////////////////////////
+
+void asm_rv32_emit_word_opcode(asm_rv32_t *state, mp_uint_t word) {
+    uint8_t *cursor = mp_asm_base_get_cur_to_write_bytes(&state->base, sizeof(uint32_t));
+    if (cursor == NULL) {
+        return;
+    }
+
+    #if MP_ENDIANNESS_LITTLE
+    cursor[0] = word & 0xFF;
+    cursor[1] = (word >> 8) & 0xFF;
+    cursor[2] = (word >> 16) & 0xFF;
+    cursor[3] = (word >> 24) & 0xFF;
+    #else
+    cursor[0] = (word >> 24) & 0xFF;
+    cursor[1] = (word >> 16) & 0xFF;
+    cursor[2] = (word >> 8) & 0xFF;
+    cursor[3] = word & 0xFF;
+    #endif
+}
+
+void asm_rv32_emit_halfword_opcode(asm_rv32_t *state, mp_uint_t word) {
+    uint8_t *cursor = mp_asm_base_get_cur_to_write_bytes(&state->base, sizeof(uint16_t));
+    if (cursor == NULL) {
+        return;
+    }
+
+    #if MP_ENDIANNESS_LITTLE
+    cursor[0] = word & 0xFF;
+    cursor[1] = (word >> 8) & 0xFF;
+    #else
+    cursor[0] = (word >> 8) & 0xFF;
+    cursor[1] = word & 0xFF;
+    #endif
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+static void split_immediate(mp_int_t immediate, mp_uint_t *upper, mp_uint_t *lower) {
+    assert(upper != NULL && "Upper pointer is NULL.");
+    assert(lower != NULL && "Lower pointer is NULL.");
+
+    mp_uint_t unsigned_immediate = *((mp_uint_t *)&immediate);
+    *upper = unsigned_immediate & 0xFFFFF000;
+    *lower = unsigned_immediate & 0x00000FFF;
+
+    // Turn the lower half from unsigned to signed.
+    if ((*lower & 0x800) != 0) {
+        *upper += 0x1000;
+        *lower -= 0x1000;
+    }
+}
+
+static void load_upper_immediate(asm_rv32_t *state, mp_uint_t rd, mp_uint_t immediate) {
+    // if immediate fits in 17 bits and is ≠ 0:
+    //   c.lui  rd, HI(immediate)
+    // else:
+    //   lui    rd, HI(immediate)
+    if (FIT_SIGNED(immediate, 17) && ((immediate >> 12) != 0)) {
+        asm_rv32_opcode_clui(state, rd, immediate);
+    } else {
+        asm_rv32_opcode_lui(state, rd, immediate);
+    }
+}
+
+static void load_lower_immediate(asm_rv32_t *state, mp_uint_t rd, mp_uint_t immediate) {
+    // WARNING: This must be executed on a register that has either been
+    //          previously cleared or was the target of a LUI/C.LUI or
+    //          AUIPC opcode.
+
+    if (immediate == 0) {
+        return;
+    }
+
+    // if LO(immediate) fits in 6 bits:
+    //   c.addi rd, LO(immediate)
+    // else:
+    //   addi   rd, rd, LO(immediate)
+    if (FIT_SIGNED(immediate, 6)) {
+        asm_rv32_opcode_caddi(state, rd, immediate);
+    } else {
+        asm_rv32_opcode_addi(state, rd, rd, immediate);
+    }
+}
+
+static void load_full_immediate(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(immediate, &upper, &lower);
+
+    // if immediate fits in 17 bits:
+    //   c.lui  rd, HI(immediate)
+    // else:
+    //   lui    rd, HI(immediate)
+    // if LO(immediate) fits in 6 bits && LO(immediate) != 0:
+    //   c.addi rd, LO(immediate)
+    // else:
+    //   addi   rd, rd, LO(immediate)
+    load_upper_immediate(state, rd, upper);
+    load_lower_immediate(state, rd, lower);
+}
+
+void asm_rv32_emit_optimised_load_immediate(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    if (FIT_SIGNED(immediate, 6)) {
+        // c.li rd, immediate
+        asm_rv32_opcode_cli(state, rd, immediate);
+        return;
+    }
+
+    if (FIT_SIGNED(immediate, 12)) {
+        // addi rd, zero, immediate
+        asm_rv32_opcode_addi(state, rd, ASM_RV32_REG_ZERO, immediate);
+        return;
+    }
+
+    load_full_immediate(state, rd, immediate);
+}
+
+// RV32 does not have dedicated push/pop opcodes, so series of loads and
+// stores are generated in their place.
+
+static void emit_registers_store(asm_rv32_t *state, mp_uint_t registers_mask) {
+    mp_uint_t offset = 0;
+    for (mp_uint_t register_index = 0; register_index < AVAILABLE_REGISTERS_COUNT; register_index++) {
+        if (registers_mask & (1U << register_index)) {
+            assert(FIT_UNSIGNED(offset >> 2, 6) && "Registers save stack offset out of range.");
+            // c.swsp register, offset
+            asm_rv32_opcode_cswsp(state, register_index, offset);
+            offset += sizeof(uint32_t);
+        }
+    }
+}
+
+static void emit_registers_load(asm_rv32_t *state, mp_uint_t registers_mask) {
+    mp_uint_t offset = 0;
+    for (mp_uint_t register_index = 0; register_index < AVAILABLE_REGISTERS_COUNT; register_index++) {
+        if (registers_mask & (1U << register_index)) {
+            assert(FIT_UNSIGNED(offset >> 2, 6) && "Registers load stack offset out of range.");
+            // c.lwsp register, offset
+            asm_rv32_opcode_clwsp(state, register_index, offset);
+            offset += sizeof(uint32_t);
+        }
+    }
+}
+
+static void adjust_stack(asm_rv32_t *state, mp_int_t stack_size) {
+    if (stack_size == 0) {
+        return;
+    }
+
+    if (FIT_SIGNED(stack_size, 6)) {
+        // c.addi sp, stack_size
+        asm_rv32_opcode_caddi(state, ASM_RV32_REG_SP, stack_size);
+        return;
+    }
+
+    if (FIT_SIGNED(stack_size, 12)) {
+        // addi sp, sp, stack_size
+        asm_rv32_opcode_addi(state, ASM_RV32_REG_SP, ASM_RV32_REG_SP, stack_size);
+        return;
+    }
+
+    // li    temporary, stack_size
+    // c.add sp, temporary
+    load_full_immediate(state, REG_TEMP0, stack_size);
+    asm_rv32_opcode_cadd(state, ASM_RV32_REG_SP, REG_TEMP0);
+}
+
+// Generate a generic function entry prologue code sequence, setting up the
+// stack to hold all the tainted registers and an arbitrary amount of space
+// for locals.
+static void emit_function_prologue(asm_rv32_t *state, mp_uint_t registers) {
+    mp_uint_t registers_count = MP_POPCOUNT(registers);
+    state->stack_size = (registers_count + state->locals_count) * sizeof(uint32_t);
+    mp_uint_t old_saved_registers_mask = state->saved_registers_mask;
+    // Move stack pointer up.
+    adjust_stack(state, -state->stack_size);
+    // Store registers at the top of the saved stack area.
+    emit_registers_store(state, registers);
+    state->locals_stack_offset = registers_count * sizeof(uint32_t);
+    state->saved_registers_mask = old_saved_registers_mask;
+}
+
+// Restore registers and reset the stack pointer to its initial value.
+static void emit_function_epilogue(asm_rv32_t *state, mp_uint_t registers) {
+    mp_uint_t old_saved_registers_mask = state->saved_registers_mask;
+    // Restore registers from the top of the stack area.
+    emit_registers_load(state, registers);
+    // Move stack pointer down.
+    adjust_stack(state, state->stack_size);
+    state->saved_registers_mask = old_saved_registers_mask;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void asm_rv32_entry(asm_rv32_t *state, mp_uint_t locals) {
+    state->saved_registers_mask |= (1U << REG_FUN_TABLE) | (1U << REG_LOCAL_1) | \
+        (1U << REG_LOCAL_2) | (1U << REG_LOCAL_3);
+    state->locals_count = locals;
+    emit_function_prologue(state, state->saved_registers_mask);
+}
+
+void asm_rv32_exit(asm_rv32_t *state) {
+    emit_function_epilogue(state, state->saved_registers_mask);
+    // c.jr ra
+    asm_rv32_opcode_cjr(state, ASM_RV32_REG_RA);
+}
+
+void asm_rv32_end_pass(asm_rv32_t *state) {
+    (void)state;
+}
+
+void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index) {
+    mp_uint_t offset = index * ASM_WORD_SIZE;
+    state->saved_registers_mask |= (1U << ASM_RV32_REG_RA);
+
+    if (FIT_UNSIGNED(offset, 11)) {
+        // lw     temporary, offset(fun_table)
+        // c.jalr temporary
+        asm_rv32_opcode_lw(state, INTERNAL_TEMPORARY, REG_FUN_TABLE, offset);
+        asm_rv32_opcode_cjalr(state, INTERNAL_TEMPORARY);
+        return;
+    }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(offset, &upper, &lower);
+
+    // TODO: Can this clobber REG_TEMP[0:2]?
+
+    // lui    temporary, HI(index) ; Or c.lui if possible
+    // c.add  temporary, fun_table
+    // lw     temporary, LO(index)(temporary)
+    // c.jalr temporary
+    load_upper_immediate(state, INTERNAL_TEMPORARY, upper);
+    asm_rv32_opcode_cadd(state, INTERNAL_TEMPORARY, REG_FUN_TABLE);
+    asm_rv32_opcode_lw(state, INTERNAL_TEMPORARY, INTERNAL_TEMPORARY, lower);
+    asm_rv32_opcode_cjalr(state, INTERNAL_TEMPORARY);
+}
+
+void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t label) {
+    ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
+
+    // The least significant bit is ignored anyway.
+    if (FIT_SIGNED(displacement, 13)) {
+        // beq rs1, rs2, displacement
+        asm_rv32_opcode_beq(state, rs1, rs2, displacement);
+        return;
+    }
+
+    // Compensate for the initial BNE opcode.
+    displacement -= ASM_WORD_SIZE;
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(displacement, &upper, &lower);
+
+    // TODO: Can this clobber REG_TEMP[0:2]?
+
+    // bne   rs1, rs2, 12                      ; PC + 0
+    // auipc temporary, HI(displacement)       ; PC + 4
+    // jalr  zero, temporary, LO(displacement) ; PC + 8
+    // ...                                     ; PC + 12
+    asm_rv32_opcode_bne(state, rs1, rs2, 12);
+    asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
+    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
+}
+
+void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_t label) {
+    ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
+
+    // The least significant bit is ignored anyway.
+    if (FIT_SIGNED(displacement, 13)) {
+        // bne rs, zero, displacement
+        asm_rv32_opcode_bne(state, rs, ASM_RV32_REG_ZERO, displacement);
+        return;
+    }
+
+    // Compensate for the initial BEQ opcode.
+    displacement -= ASM_WORD_SIZE;
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(displacement, &upper, &lower);
+
+    // TODO: Can this clobber REG_TEMP[0:2]?
+
+    // beq   rs1, zero, 12                     ; PC + 0
+    // auipc temporary, HI(displacement)       ; PC + 4
+    // jalr  zero, temporary, LO(displacement) ; PC + 8
+    // ...                                     ; PC + 12
+    asm_rv32_opcode_beq(state, rs, ASM_RV32_REG_ZERO, 12);
+    asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
+    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
+}
+
+void asm_rv32_emit_mov_local_reg(asm_rv32_t *state, mp_uint_t local, mp_uint_t rs) {
+    mp_uint_t offset = state->locals_stack_offset + (local * ASM_WORD_SIZE);
+
+    if (FIT_UNSIGNED(offset >> 2, 6)) {
+        // c.swsp rs, offset
+        asm_rv32_opcode_cswsp(state, rs, offset);
+        return;
+    }
+
+    if (FIT_UNSIGNED(offset, 11)) {
+        // sw rs, offset(sp)
+        asm_rv32_opcode_sw(state, rs, ASM_RV32_REG_SP, offset);
+        return;
+    }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(offset, &upper, &lower);
+
+    // TODO: Can this clobber REG_TEMP[0:2]?
+
+    // lui   temporary, HI(offset) ; Or c.lui if possible
+    // c.add temporary, sp
+    // sw    rs, LO(offset)(temporary)
+    load_upper_immediate(state, INTERNAL_TEMPORARY, upper);
+    asm_rv32_opcode_cadd(state, INTERNAL_TEMPORARY, ASM_RV32_REG_SP);
+    asm_rv32_opcode_sw(state, rs, INTERNAL_TEMPORARY, lower);
+}
+
+void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local) {
+    mp_uint_t offset = state->locals_stack_offset + (local * ASM_WORD_SIZE);
+
+    if (FIT_UNSIGNED(offset >> 2, 6)) {
+        // c.lwsp rd, offset
+        asm_rv32_opcode_clwsp(state, rd, offset);
+        return;
+    }
+
+    if (FIT_UNSIGNED(offset, 11)) {
+        // lw rd, offset(sp)
+        asm_rv32_opcode_lw(state, rd, ASM_RV32_REG_SP, offset);
+        return;
+    }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(offset, &upper, &lower);
+
+    // lui   rd, HI(offset) ; Or c.lui if possible
+    // c.add rd, sp
+    // lw    rd, LO(offset)(rd)
+    load_upper_immediate(state, rd, upper);
+    asm_rv32_opcode_cadd(state, rd, ASM_RV32_REG_SP);
+    asm_rv32_opcode_lw(state, rd, rd, lower);
+}
+
+void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local) {
+    mp_uint_t offset = state->locals_stack_offset + (local * ASM_WORD_SIZE);
+
+    if (FIT_SIGNED(offset, 11)) {
+        // addi rd, sp, offset
+        asm_rv32_opcode_addi(state, rd, ASM_RV32_REG_SP, offset);
+        return;
+    }
+
+    // li    rd, offset
+    // c.add rd, sp
+    load_full_immediate(state, rd, offset);
+    asm_rv32_opcode_cadd(state, rd, ASM_RV32_REG_SP);
+}
+
+void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    mp_int_t scaled_offset = offset * sizeof(ASM_WORD_SIZE);
+
+    if (FIT_SIGNED(scaled_offset, 12)) {
+        // lw rd, offset(rs)
+        asm_rv32_opcode_lw(state, rd, rs, scaled_offset);
+        return;
+    }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(scaled_offset, &upper, &lower);
+
+    // lui   rd, HI(offset) ; Or c.lui if possible
+    // c.add rd, rs
+    // lw    rd, LO(offset)(rd)
+    load_upper_immediate(state, rd, upper);
+    asm_rv32_opcode_cadd(state, rd, rs);
+    asm_rv32_opcode_lw(state, rd, rd, lower);
+}
+
+void asm_rv32_emit_jump(asm_rv32_t *state, mp_uint_t label) {
+    ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
+
+    // The least significant bit is ignored anyway.
+    if (FIT_SIGNED(displacement, 13)) {
+        // c.j displacement
+        asm_rv32_opcode_cj(state, displacement);
+        return;
+    }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(displacement, &upper, &lower);
+
+    // TODO: Can this clobber REG_TEMP[0:2]?
+
+    // auipc temporary, HI(displacement)
+    // jalr  zero, temporary, LO(displacement)
+    asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
+    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
+}
+
+void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    mp_int_t scaled_offset = offset * ASM_WORD_SIZE;
+
+    if (FIT_SIGNED(scaled_offset, 12)) {
+        // sw rd, offset(rs)
+        asm_rv32_opcode_sw(state, rd, rs, scaled_offset);
+        return;
+    }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(scaled_offset, &upper, &lower);
+
+    // lui   rd, HI(offset) ; Or c.lui if possible
+    // c.add rd, rs
+    // sw    rd, LO(offset)(rd)
+    load_upper_immediate(state, rd, upper);
+    asm_rv32_opcode_cadd(state, rd, rs);
+    asm_rv32_opcode_sw(state, rd, rd, lower);
+}
+
+void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t label) {
+    ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(displacement, &upper, &lower);
+
+    // Compressed instructions are not used even if they may allow for code size
+    // savings as the code changes size between compute and emit passes
+    // otherwise.  If that happens then the assertion at asmbase.c:93 triggers
+    // when built in debug mode.
+
+    // auipc rd, HI(relative)
+    // addi  rd, rd, LO(relative)
+    asm_rv32_opcode_auipc(state, rd, upper);
+    asm_rv32_opcode_addi(state, rd, rd, lower);
+}
+
+void asm_rv32_emit_load16_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    mp_int_t scaled_offset = offset * sizeof(uint16_t);
+
+    if (FIT_SIGNED(scaled_offset, 12)) {
+        // lhu rd, offset(rs)
+        asm_rv32_opcode_lhu(state, rd, rs, scaled_offset);
+        return;
+    }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(scaled_offset, &upper, &lower);
+
+    // lui   rd, HI(offset) ; Or c.lui if possible
+    // c.add rd, rs
+    // lhu   rd, LO(offset)(rd)
+    load_upper_immediate(state, rd, upper);
+    asm_rv32_opcode_cadd(state, rd, rs);
+    asm_rv32_opcode_lhu(state, rd, rd, lower);
+}
+
+void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
+    if (rs == rd) {
+        // c.li rd, 0
+        asm_rv32_opcode_cli(state, rd, 0);
+        return;
+    }
+
+    // xor rd, rd, rs
+    asm_rv32_opcode_xor(state, rd, rd, rs);
+}
+
+void asm_rv32_meta_comparison_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {
+    // c.li rd, 1       ;
+    // beq  rs1, rs2, 8 ; PC + 0
+    // addi rd, zero, 0 ; PC + 4
+    // ...              ; PC + 8
+    asm_rv32_opcode_cli(state, rd, 1);
+    asm_rv32_opcode_beq(state, rs1, rs2, 8);
+    asm_rv32_opcode_addi(state, rd, ASM_RV32_REG_ZERO, 0);
+}
+
+void asm_rv32_meta_comparison_ne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {
+    // sub  rd, rs1, rs2
+    // sltu rd, zero, rd
+    asm_rv32_opcode_sub(state, rd, rs1, rs2);
+    asm_rv32_opcode_sltu(state, rd, ASM_RV32_REG_ZERO, rd);
+}
+
+void asm_rv32_meta_comparison_lt(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison) {
+    // slt(u) rd, rs1, rs2
+    if (unsigned_comparison) {
+        asm_rv32_opcode_sltu(state, rd, rs1, rs2);
+    } else {
+        asm_rv32_opcode_slt(state, rd, rs1, rs2);
+    }
+}
+
+void asm_rv32_meta_comparison_le(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison) {
+    // c.li   rd, 1        ;
+    // beq    rs1, rs2, 8  ; PC + 0
+    // slt(u) rd, rs1, rs2 ; PC + 4
+    // ...                 ; PC + 8
+    asm_rv32_opcode_cli(state, rd, 1);
+    asm_rv32_opcode_beq(state, rs1, rs2, 8);
+    if (unsigned_comparison) {
+        asm_rv32_opcode_sltu(state, rd, rs1, rs2);
+    } else {
+        asm_rv32_opcode_slt(state, rd, rs1, rs2);
+    }
+}
+
+#endif // MICROPY_EMIT_RV32
diff --git a/py/asmrv32.h b/py/asmrv32.h
new file mode 100644
index 0000000000000..4061fd5f86be1
--- /dev/null
+++ b/py/asmrv32.h
@@ -0,0 +1,464 @@
+/*
+ * This file is part of the MicroPython project, https://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_PY_ASMRV32_H
+#define MICROPY_INCLUDED_PY_ASMRV32_H
+
+#include <assert.h>
+
+#include "py/asmbase.h"
+#include "py/emit.h"
+#include "py/misc.h"
+#include "py/persistentcode.h"
+
+#define ASM_RV32_REG_X0 (0)   // Zero
+#define ASM_RV32_REG_X1 (1)   // RA
+#define ASM_RV32_REG_X2 (2)   // SP
+#define ASM_RV32_REG_X3 (3)   // GP
+#define ASM_RV32_REG_X4 (4)   // TP
+#define ASM_RV32_REG_X5 (5)   // T0
+#define ASM_RV32_REG_X6 (6)   // T1
+#define ASM_RV32_REG_X7 (7)   // T2
+#define ASM_RV32_REG_X8 (8)   // S0
+#define ASM_RV32_REG_X9 (9)   // S1
+#define ASM_RV32_REG_X10 (10) // A0
+#define ASM_RV32_REG_X11 (11) // A1
+#define ASM_RV32_REG_X12 (12) // A2
+#define ASM_RV32_REG_X13 (13) // A3
+#define ASM_RV32_REG_X14 (14) // A4
+#define ASM_RV32_REG_X15 (15) // A5
+#define ASM_RV32_REG_X16 (16) // A6
+#define ASM_RV32_REG_X17 (17) // A7
+#define ASM_RV32_REG_X18 (18) // S2
+#define ASM_RV32_REG_X19 (19) // S3
+#define ASM_RV32_REG_X20 (20) // S4
+#define ASM_RV32_REG_X21 (21) // S5
+#define ASM_RV32_REG_X22 (22) // S6
+#define ASM_RV32_REG_X23 (23) // S7
+#define ASM_RV32_REG_X24 (24) // S8
+#define ASM_RV32_REG_X25 (25) // S9
+#define ASM_RV32_REG_X26 (26) // S10
+#define ASM_RV32_REG_X27 (27) // S11
+#define ASM_RV32_REG_X28 (28) // T3
+#define ASM_RV32_REG_X29 (29) // T4
+#define ASM_RV32_REG_X30 (30) // T5
+#define ASM_RV32_REG_X31 (31) // T6
+
+// Alternate register names.
+
+#define ASM_RV32_REG_ZERO (ASM_RV32_REG_X0)
+#define ASM_RV32_REG_RA (ASM_RV32_REG_X1)
+#define ASM_RV32_REG_SP (ASM_RV32_REG_X2)
+#define ASM_RV32_REG_GP (ASM_RV32_REG_X3)
+#define ASM_RV32_REG_TP (ASM_RV32_REG_X4)
+#define ASM_RV32_REG_T0 (ASM_RV32_REG_X5)
+#define ASM_RV32_REG_T1 (ASM_RV32_REG_X6)
+#define ASM_RV32_REG_T2 (ASM_RV32_REG_X7)
+#define ASM_RV32_REG_A0 (ASM_RV32_REG_X10)
+#define ASM_RV32_REG_A1 (ASM_RV32_REG_X11)
+#define ASM_RV32_REG_A2 (ASM_RV32_REG_X12)
+#define ASM_RV32_REG_A3 (ASM_RV32_REG_X13)
+#define ASM_RV32_REG_A4 (ASM_RV32_REG_X14)
+#define ASM_RV32_REG_A5 (ASM_RV32_REG_X15)
+#define ASM_RV32_REG_A6 (ASM_RV32_REG_X16)
+#define ASM_RV32_REG_A7 (ASM_RV32_REG_X17)
+#define ASM_RV32_REG_T3 (ASM_RV32_REG_X28)
+#define ASM_RV32_REG_T4 (ASM_RV32_REG_X29)
+#define ASM_RV32_REG_T5 (ASM_RV32_REG_X30)
+#define ASM_RV32_REG_T6 (ASM_RV32_REG_X31)
+#define ASM_RV32_REG_FP (ASM_RV32_REG_X8)
+#define ASM_RV32_REG_S0 (ASM_RV32_REG_X8)
+#define ASM_RV32_REG_S1 (ASM_RV32_REG_X9)
+#define ASM_RV32_REG_S2 (ASM_RV32_REG_X18)
+#define ASM_RV32_REG_S3 (ASM_RV32_REG_X19)
+#define ASM_RV32_REG_S4 (ASM_RV32_REG_X20)
+#define ASM_RV32_REG_S5 (ASM_RV32_REG_X21)
+#define ASM_RV32_REG_S6 (ASM_RV32_REG_X22)
+#define ASM_RV32_REG_S7 (ASM_RV32_REG_X23)
+#define ASM_RV32_REG_S8 (ASM_RV32_REG_X24)
+#define ASM_RV32_REG_S9 (ASM_RV32_REG_X25)
+#define ASM_RV32_REG_S10 (ASM_RV32_REG_X26)
+#define ASM_RV32_REG_S11 (ASM_RV32_REG_X27)
+
+typedef struct _asm_rv32_t {
+    // Opaque emitter state.
+    mp_asm_base_t base;
+    // Which registers are tainted and need saving/restoring.
+    mp_uint_t saved_registers_mask;
+    // How many locals must be stored on the stack.
+    mp_uint_t locals_count;
+    // The computed function stack size.
+    mp_uint_t stack_size;
+    // The stack offset where stack-based locals start to be stored.
+    mp_uint_t locals_stack_offset;
+} asm_rv32_t;
+
+void asm_rv32_entry(asm_rv32_t *state, mp_uint_t locals);
+void asm_rv32_exit(asm_rv32_t *state);
+void asm_rv32_end_pass(asm_rv32_t *state);
+
+////////////////////////////////////////////////////////////////////////////////
+
+#define RV32_ENCODE_TYPE_B(op, ft3, rs1, rs2, imm)                                              \
+    ((op & 0b1111111) | ((ft3 & 0b111) << 12) | ((imm & 0b100000000000) >> 4) |  \
+    ((imm & 0b11110) << 7) | ((rs1 & 0b11111) << 15) |                          \
+    ((rs2 & 0b11111) << 20) | ((imm & 0b11111100000) << 20) |                   \
+    ((imm & 0b1000000000000) << 19))
+
+#define RV32_ENCODE_TYPE_I(op, ft3, rd, rs, imm)                               \
+    ((op & 0b1111111) | ((rd & 0b11111) << 7) | ((ft3 & 0b111) << 12) |          \
+    ((rs & 0b11111) << 15) | ((imm & 0b111111111111) << 20))
+
+#define RV32_ENCODE_TYPE_J(op, rd, imm)                                        \
+    ((op & 0b1111111) | ((rd & 0b11111) << 7) | (imm & 0b11111111000000000000) | \
+    ((imm & 0b100000000000) << 9) | ((imm & 0b11111111110) << 20) |             \
+    ((imm & 0b100000000000000000000) << 11))
+
+#define RV32_ENCODE_TYPE_R(op, ft3, ft7, rd, rs1, rs2)                         \
+    ((op & 0b1111111) | ((rd & 0b11111) << 7) | ((ft3 & 0b111) << 12) |          \
+    ((rs1 & 0b11111) << 15) | ((rs2 & 0b11111) << 20) |                         \
+    ((ft7 & 0b1111111) << 25))
+
+#define RV32_ENCODE_TYPE_S(op, ft3, rs1, rs2, imm)                             \
+    ((op & 0b1111111) | ((imm & 0b11111) << 7) | ((ft3 & 0b111) << 12) |         \
+    ((rs1 & 0b11111) << 15) | ((rs2 & 0b11111) << 20) |                         \
+    ((imm & 0b111111100000) << 20))
+
+#define RV32_ENCODE_TYPE_U(op, rd, imm)                                        \
+    ((op & 0b1111111) | ((rd & 0b11111) << 7) |                                  \
+    (imm & 0b11111111111111111111000000000000))
+
+#define RV32_ENCODE_TYPE_CI(op, ft3, rd, imm) \
+    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rd & 0b11111) << 7) | \
+    (((imm) & 0b100000) << 7) | (((imm) & 0b11111) << 2))
+
+#define RV32_ENCODE_TYPE_CJ(op, ft3, imm) \
+    ((op & 0b11) | ((ft3 & 0b111) << 13) | \
+    ((imm & 0b1110) << 2) | ((imm & 0b1100000000) << 1) | \
+    ((imm & 0b100000000000) << 1) | ((imm & 0b10000000000) >> 2) | \
+    ((imm & 0b10000000) >> 1) | ((imm & 0b1000000) << 1) | \
+    ((imm & 0b100000) >> 3) | ((imm & 0b10000) << 7))
+
+#define RV32_ENCODE_TYPE_CR(op, ft4, rs1, rs2) \
+    ((op & 0b11) | ((rs2 & 0b11111) << 2) | ((rs1 & 0b11111) << 7) | \
+    ((ft4 & 0b1111) << 12))
+
+#define RV32_ENCODE_TYPE_CSS(op, ft3, rs, imm) \
+    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rs & 0b11111) << 2) | ((imm) & 0b111111) << 7)
+
+void asm_rv32_emit_word_opcode(asm_rv32_t *state, mp_uint_t opcode);
+void asm_rv32_emit_halfword_opcode(asm_rv32_t *state, mp_uint_t opcode);
+
+// ADD RD, RS1, RS2
+static inline void asm_rv32_opcode_add(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 000 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b000, 0b0000000, rd, rs1, rs2));
+}
+
+// ADDI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_addi(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 000 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0010011, 0b000, rd, rs, immediate));
+}
+
+// AND RD, RS1, RS2
+static inline void asm_rv32_opcode_and(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 111 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b111, 0b0000000, rd, rs1, rs2));
+}
+
+// AUIPC RD, offset
+static inline void asm_rv32_opcode_auipc(asm_rv32_t *state, mp_uint_t rd, mp_int_t offset) {
+    // U: .................... ..... 0010111
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_U(0b0010111, rd, offset));
+}
+
+// BEQ RS1, RS2, OFFSET
+static inline void asm_rv32_opcode_beq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
+    // B: . ...... ..... ..... 000 .... . 1100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0b1100011, 0b000, rs1, rs2, offset));
+}
+
+// BNE RS1, RS2, OFFSET
+static inline void asm_rv32_opcode_bne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
+    // B: . ...... ..... ..... 001 .... . 1100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0b1100011, 0b001, rs1, rs2, offset));
+}
+
+// C.ADD RD, RS
+static inline void asm_rv32_opcode_cadd(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
+    // CR: 1001 ..... ..... 10
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1001, rd, rs));
+}
+
+// C.ADDI RD, IMMEDIATE
+static inline void asm_rv32_opcode_caddi(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // CI: 000 . ..... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b000, rd, immediate));
+}
+
+// C.J OFFSET
+static inline void asm_rv32_opcode_cj(asm_rv32_t *state, mp_uint_t offset) {
+    // CJ: 101 ........... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CJ(0b01, 0b001, offset));
+}
+
+// C.JALR RS
+static inline void asm_rv32_opcode_cjalr(asm_rv32_t *state, mp_uint_t rs) {
+    // CR: 1001 ..... 00000 10
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1001, rs, 0));
+}
+
+// C.JR RS
+static inline void asm_rv32_opcode_cjr(asm_rv32_t *state, mp_uint_t rs) {
+    // CR: 1000 ..... 00000 10
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1000, rs, 0));
+}
+
+// C.LI RD, IMMEDIATE
+static inline void asm_rv32_opcode_cli(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // CI: 010 . ..... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b010, rd, immediate));
+}
+
+// C.LUI RD, IMMEDIATE
+static inline void asm_rv32_opcode_clui(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // CI: 011 . ..... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b011, rd, immediate >> 12));
+}
+
+// C.LWSP RD, OFFSET
+static inline void asm_rv32_opcode_clwsp(asm_rv32_t *state, mp_uint_t rd, mp_uint_t offset) {
+    // CI: 010 . ..... ..... 10
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b10, 0b010, rd, ((offset & 0b11000000) >> 6) | (offset & 0b111100)));
+}
+
+// C.MV RD, RS
+static inline void asm_rv32_opcode_cmv(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
+    // CR: 1000 ..... ..... 10
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1000, rd, rs));
+}
+
+// C.SWSP RS, OFFSET
+static inline void asm_rv32_opcode_cswsp(asm_rv32_t *state, mp_uint_t rs, mp_uint_t offset) {
+    // CSS: 010 ...... ..... 10
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CSS(0b10, 0b110, rs, ((offset & 0b11000000) >> 6) | (offset & 0b111100)));
+}
+
+// JALR RD, RS, offset
+static inline void asm_rv32_opcode_jalr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    // I: ............ ..... 000 ..... 1100111
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b1100111, 0b000, rd, rs, offset));
+}
+
+// LBU RD, OFFSET(RS)
+static inline void asm_rv32_opcode_lbu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    // I: ............ ..... 100 ..... 0000011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0000011, 0b100, rd, rs, offset));
+}
+
+// LHU RD, OFFSET(RS)
+static inline void asm_rv32_opcode_lhu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    // I: ............ ..... 101 ..... 0000011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0000011, 0b101, rd, rs, offset));
+}
+
+// LUI RD, immediate
+static inline void asm_rv32_opcode_lui(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // U: .................... ..... 0110111
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_U(0b0110111, rd, immediate));
+}
+
+// LW RD, OFFSET(RS)
+static inline void asm_rv32_opcode_lw(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    // I: ............ ..... 010 ..... 0000011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0000011, 0b010, rd, rs, offset));
+}
+
+// MUL RD, RS1, RS2
+static inline void asm_rv32m_opcode_mul(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 000 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b000, 0b0000001, rd, rs1, rs2));
+}
+
+// OR RD, RS1, RS2
+static inline void asm_rv32_opcode_or(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 110 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b110, 0b0000000, rd, rs1, rs2));
+}
+
+// SLL RD, RS1, RS2
+static inline void asm_rv32_opcode_sll(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 001 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b001, 0b0000000, rd, rs1, rs2));
+}
+
+// SLLI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_slli(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_uint_t immediate) {
+    // I: 0000000..... ..... 001 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0010011, 0b001, rd, rs, immediate & 0x1F));
+}
+
+// SRL RD, RS1, RS2
+static inline void asm_rv32_opcode_srl(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 101 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b101, 0b0000000, rd, rs1, rs2));
+}
+
+// SLT RD, RS1, RS2
+static inline void asm_rv32_opcode_slt(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 010 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b010, 0b0000000, rd, rs1, rs2));
+}
+
+// SLTU RD, RS1, RS2
+static inline void asm_rv32_opcode_sltu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 011 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b011, 0b0000000, rd, rs1, rs2));
+}
+
+// SRA RD, RS1, RS2
+static inline void asm_rv32_opcode_sra(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0100000 ..... ..... 101 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b101, 0b0100000, rd, rs1, rs2));
+}
+
+// SUB RD, RS1, RS2
+static inline void asm_rv32_opcode_sub(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0100000 ..... ..... 000 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b000, 0b0100000, rd, rs1, rs2));
+}
+
+// SB RS2, OFFSET(RS1)
+static inline void asm_rv32_opcode_sb(asm_rv32_t *state, mp_uint_t rs2, mp_uint_t rs1, mp_int_t offset) {
+    // S: ....... ..... ..... 000 ..... 0100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0b0100011, 0b000, rs1, rs2, offset));
+}
+
+// SH RS2, OFFSET(RS1)
+static inline void asm_rv32_opcode_sh(asm_rv32_t *state, mp_uint_t rs2, mp_uint_t rs1, mp_int_t offset) {
+    // S: ....... ..... ..... 001 ..... 0100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0b0100011, 0b001, rs1, rs2, offset));
+}
+
+// SW RS2, OFFSET(RS1)
+static inline void asm_rv32_opcode_sw(asm_rv32_t *state, mp_uint_t rs2, mp_uint_t rs1, mp_int_t offset) {
+    // S: ....... ..... ..... 010 ..... 0100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0b0100011, 0b010, rs1, rs2, offset));
+}
+
+// XOR RD, RS1, RS2
+static inline void asm_rv32_opcode_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 100 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b100, 0b0000000, rd, rs1, rs2));
+}
+
+// XORI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_xori(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 100 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0010011, 0b100, rd, rs, immediate));
+}
+
+#define ASM_WORD_SIZE (4)
+
+#define REG_RET ASM_RV32_REG_A0
+#define REG_ARG_1 ASM_RV32_REG_A0
+#define REG_ARG_2 ASM_RV32_REG_A1
+#define REG_ARG_3 ASM_RV32_REG_A2
+#define REG_ARG_4 ASM_RV32_REG_A3
+#define REG_TEMP0 ASM_RV32_REG_T1
+#define REG_TEMP1 ASM_RV32_REG_T2
+#define REG_TEMP2 ASM_RV32_REG_T3
+// S0 may be used as the frame pointer by the compiler.
+#define REG_FUN_TABLE ASM_RV32_REG_S2
+#define REG_LOCAL_1 ASM_RV32_REG_S3
+#define REG_LOCAL_2 ASM_RV32_REG_S4
+#define REG_LOCAL_3 ASM_RV32_REG_S5
+
+void asm_rv32_meta_comparison_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd);
+void asm_rv32_meta_comparison_ne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd);
+void asm_rv32_meta_comparison_lt(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison);
+void asm_rv32_meta_comparison_le(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison);
+
+#ifdef GENERIC_ASM_API
+
+void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index);
+void asm_rv32_emit_jump(asm_rv32_t *state, mp_uint_t label);
+void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t label);
+void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_t label);
+void asm_rv32_emit_load16_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset);
+void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset);
+void asm_rv32_emit_mov_local_reg(asm_rv32_t *state, mp_uint_t local, mp_uint_t rs);
+void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local);
+void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local);
+void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t label);
+void asm_rv32_emit_optimised_load_immediate(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate);
+void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs);
+void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_uint_t base, mp_int_t offset);
+
+#define ASM_T asm_rv32_t
+#define ASM_ENTRY(state, labels) asm_rv32_entry(state, labels)
+#define ASM_EXIT(state) asm_rv32_exit(state)
+#define ASM_END_PASS(state) asm_rv32_end_pass(state)
+
+#define ASM_ADD_REG_REG(state, rd, rs) asm_rv32_opcode_cadd(state, rd, rs)
+#define ASM_AND_REG_REG(state, rd, rs) asm_rv32_opcode_and(state, rd, rs, rd)
+#define ASM_ASR_REG_REG(state, rd, rs) asm_rv32_opcode_sra(state, rd, rd, rs)
+#define ASM_CALL_IND(state, index) asm_rv32_emit_call_ind(state, index)
+#define ASM_JUMP(state, label) asm_rv32_emit_jump(state, label)
+#define ASM_JUMP_IF_REG_EQ(state, rs1, rs2, label) asm_rv32_emit_jump_if_reg_eq(state, rs1, rs2, label)
+#define ASM_JUMP_IF_REG_NONZERO(state, rs, label, bool_test) asm_rv32_emit_jump_if_reg_nonzero(state, rs, label)
+#define ASM_JUMP_IF_REG_ZERO(state, rs, label, bool_test) asm_rv32_emit_jump_if_reg_eq(state, rs, ASM_RV32_REG_ZERO, label)
+#define ASM_JUMP_REG(state, rs) asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, rs, 0)
+#define ASM_LOAD16_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load16_reg_reg_offset(state, rd, rs, offset)
+#define ASM_LOAD16_REG_REG(state, rd, rs) asm_rv32_opcode_lhu(state, rd, rs, 0)
+#define ASM_LOAD32_REG_REG(state, rd, rs) asm_rv32_opcode_lw(state, rd, rs, 0)
+#define ASM_LOAD8_REG_REG(state, rd, rs) asm_rv32_opcode_lbu(state, rd, rs, 0)
+#define ASM_LOAD_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset)
+#define ASM_LOAD_REG_REG(state, rd, rs) ASM_LOAD32_REG_REG(state, rd, rs)
+#define ASM_LSL_REG_REG(state, rd, rs) asm_rv32_opcode_sll(state, rd, rd, rs)
+#define ASM_LSR_REG_REG(state, rd, rs) asm_rv32_opcode_srl(state, rd, rd, rs)
+#define ASM_MOV_LOCAL_REG(state, local, rs) asm_rv32_emit_mov_local_reg(state, local, rs)
+#define ASM_MOV_REG_IMM(state, rd, imm) asm_rv32_emit_optimised_load_immediate(state, rd, imm)
+#define ASM_MOV_REG_LOCAL_ADDR(state, rd, local) asm_rv32_emit_mov_reg_local_addr(state, rd, local)
+#define ASM_MOV_REG_LOCAL(state, rd, local) asm_rv32_emit_mov_reg_local(state, rd, local)
+#define ASM_MOV_REG_PCREL(state, rd, label) asm_rv32_emit_mov_reg_pcrel(state, rd, label)
+#define ASM_MOV_REG_REG(state, rd, rs) asm_rv32_opcode_cmv(state, rd, rs)
+#define ASM_MUL_REG_REG(state, rd, rs) asm_rv32m_opcode_mul(state, rd, rd, rs)
+#define ASM_NEG_REG(state, rd) asm_rv32_opcode_sub(state, rd, ASM_RV32_REG_ZERO, rd)
+#define ASM_NOT_REG(state, rd) asm_rv32_opcode_xori(state, rd, rd, -1)
+#define ASM_OR_REG_REG(state, rd, rs) asm_rv32_opcode_or(state, rd, rd, rs)
+#define ASM_STORE16_REG_REG(state, rs1, rs2) asm_rv32_opcode_sh(state, rs1, rs2, 0)
+#define ASM_STORE32_REG_REG(state, rs1, rs2) asm_rv32_opcode_sw(state, rs1, rs2, 0)
+#define ASM_STORE8_REG_REG(state, rs1, rs2) asm_rv32_opcode_sb(state, rs1, rs2, 0)
+#define ASM_STORE_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset)
+#define ASM_STORE_REG_REG(state, rs1, rs2) ASM_STORE32_REG_REG(state, rs1, rs2)
+#define ASM_SUB_REG_REG(state, rd, rs) asm_rv32_opcode_sub(state, rd, rd, rs)
+#define ASM_XOR_REG_REG(state, rd, rs) asm_rv32_emit_optimised_xor(state, rd, rs)
+
+#endif
+
+#endif // MICROPY_INCLUDED_PY_ASMRV32_H
diff --git a/py/compile.c b/py/compile.c
index 62757de3c083c..9b012f8787004 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -102,6 +102,7 @@ static const emit_method_table_t *emit_native_table[] = {
     &emit_native_thumb_method_table,
     &emit_native_xtensa_method_table,
     &emit_native_xtensawin_method_table,
+    &emit_native_rv32_method_table,
 };
 
 #elif MICROPY_EMIT_NATIVE
@@ -118,6 +119,8 @@ static const emit_method_table_t *emit_native_table[] = {
 #define NATIVE_EMITTER(f) emit_native_xtensa_##f
 #elif MICROPY_EMIT_XTENSAWIN
 #define NATIVE_EMITTER(f) emit_native_xtensawin_##f
+#elif MICROPY_EMIT_RV32
+#define NATIVE_EMITTER(f) emit_native_rv32_##f
 #else
 #error "unknown native emitter"
 #endif
diff --git a/py/emit.h b/py/emit.h
index 26f978ba598ab..0c5019f07ac3f 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -201,6 +201,7 @@ extern const emit_method_table_t emit_native_thumb_method_table;
 extern const emit_method_table_t emit_native_arm_method_table;
 extern const emit_method_table_t emit_native_xtensa_method_table;
 extern const emit_method_table_t emit_native_xtensawin_method_table;
+extern const emit_method_table_t emit_native_rv32_method_table;
 
 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;
@@ -213,6 +214,7 @@ emit_t *emit_native_thumb_new(mp_emit_common_t *emit_common, mp_obj_t *error_slo
 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);
+emit_t *emit_native_rv32_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);
 
@@ -223,6 +225,7 @@ void emit_native_thumb_free(emit_t *emit);
 void emit_native_arm_free(emit_t *emit);
 void emit_native_xtensa_free(emit_t *emit);
 void emit_native_xtensawin_free(emit_t *emit);
+void emit_native_rv32_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);
diff --git a/py/emitglue.c b/py/emitglue.c
index 6b6d5ccba2195..444e480477e54 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -158,7 +158,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, cons
     }
     DEBUG_printf("\n");
 
-    #ifdef WRITE_CODE
+    #if WRITE_CODE
     FILE *fp_write_code = fopen("out-code", "wb");
     fwrite(fun_data, fun_len, 1, fp_write_code);
     fclose(fp_write_code);
diff --git a/py/emitnative.c b/py/emitnative.c
index 0b84a2ec8a85d..7557e4ba48fac 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -59,7 +59,7 @@
 #endif
 
 // wrapper around everything in this file
-#if N_X64 || N_X86 || N_THUMB || N_ARM || N_XTENSA || N_XTENSAWIN
+#if N_X64 || N_X86 || N_THUMB || N_ARM || N_XTENSA || N_XTENSAWIN || N_RV32
 
 // C stack layout for native functions:
 //  0:                          nlr_buf_t [optional]
@@ -2522,6 +2522,36 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             } else {
                 asm_xtensa_setcc_reg_reg_reg(emit->as, cc & ~0x80, REG_RET, reg_rhs, REG_ARG_2);
             }
+            #elif N_RV32
+            (void)op_idx;
+            switch (op) {
+                case MP_BINARY_OP_LESS:
+                    asm_rv32_meta_comparison_lt(emit->as, REG_ARG_2, reg_rhs, REG_RET, vtype_lhs == VTYPE_UINT);
+                    break;
+
+                case MP_BINARY_OP_MORE:
+                    asm_rv32_meta_comparison_lt(emit->as, reg_rhs, REG_ARG_2, REG_RET, vtype_lhs == VTYPE_UINT);
+                    break;
+
+                case MP_BINARY_OP_EQUAL:
+                    asm_rv32_meta_comparison_eq(emit->as, REG_ARG_2, reg_rhs, REG_RET);
+                    break;
+
+                case MP_BINARY_OP_LESS_EQUAL:
+                    asm_rv32_meta_comparison_le(emit->as, REG_ARG_2, reg_rhs, REG_RET, vtype_lhs == VTYPE_UINT);
+                    break;
+
+                case MP_BINARY_OP_MORE_EQUAL:
+                    asm_rv32_meta_comparison_le(emit->as, reg_rhs, REG_ARG_2, REG_RET, vtype_lhs == VTYPE_UINT);
+                    break;
+
+                case MP_BINARY_OP_NOT_EQUAL:
+                    asm_rv32_meta_comparison_ne(emit->as, reg_rhs, REG_ARG_2, REG_RET);
+                    break;
+
+                default:
+                    break;
+            }
             #else
             #error not implemented
             #endif
diff --git a/py/emitnrv32.c b/py/emitnrv32.c
new file mode 100644
index 0000000000000..4a44100093141
--- /dev/null
+++ b/py/emitnrv32.c
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, https://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// RISC-V RV32 specific stuff
+
+#include "py/mpconfig.h"
+
+#if MICROPY_EMIT_RV32
+
+// this is defined so that the assembler exports generic assembler API macros
+#define GENERIC_ASM_API (1)
+#include "py/asmrv32.h"
+
+// Word indices of REG_LOCAL_x in nlr_buf_t
+#define NLR_BUF_IDX_LOCAL_1 (6) // S3
+
+#define N_RV32 (1)
+#define EXPORT_FUN(name) emit_native_rv32_##name
+#include "py/emitnative.c"
+
+#endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2cbf5b88efab0..efb30ac04dada 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -406,8 +406,13 @@
 #define MICROPY_EMIT_XTENSAWIN (0)
 #endif
 
+// Whether to emit RISC-V RV32 native code
+#ifndef MICROPY_EMIT_RV32
+#define MICROPY_EMIT_RV32 (0)
+#endif
+
 // 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)
+#define MICROPY_EMIT_NATIVE (MICROPY_EMIT_X64 || MICROPY_EMIT_X86 || MICROPY_EMIT_THUMB || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN || MICROPY_EMIT_RV32)
 
 // 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)
diff --git a/py/py.cmake b/py/py.cmake
index 74a433c97a3f1..f47661c409a14 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -9,6 +9,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/argcheck.c
     ${MICROPY_PY_DIR}/asmarm.c
     ${MICROPY_PY_DIR}/asmbase.c
+    ${MICROPY_PY_DIR}/asmrv32.c
     ${MICROPY_PY_DIR}/asmthumb.c
     ${MICROPY_PY_DIR}/asmx64.c
     ${MICROPY_PY_DIR}/asmx86.c
@@ -25,6 +26,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/emitinlinethumb.c
     ${MICROPY_PY_DIR}/emitinlinextensa.c
     ${MICROPY_PY_DIR}/emitnarm.c
+    ${MICROPY_PY_DIR}/emitnrv32.c
     ${MICROPY_PY_DIR}/emitnthumb.c
     ${MICROPY_PY_DIR}/emitnx64.c
     ${MICROPY_PY_DIR}/emitnx86.c
diff --git a/py/py.mk b/py/py.mk
index 1378968c9646b..0b429f9efe7ac 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -114,6 +114,8 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	emitnxtensa.o \
 	emitinlinextensa.o \
 	emitnxtensawin.o \
+	asmrv32.o \
+	emitnrv32.o \
 	formatfloat.o \
 	parsenumbase.o \
 	parsenum.o \

From 99f5659cf5fa84d3b9dc8bbd286315fcf56ad899 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 16 Jun 2024 20:40:28 +0200
Subject: [PATCH 1162/3129] mpy-cross: Add RISC-V RV32IMC support in MPY files.

MPY files can now hold generated RV32IMC native code.  This can be
accomplished by passing the `-march=rv32imc` flag to mpy-cross.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/reference/mpyfiles.rst     | 2 +-
 mpy-cross/main.c                | 6 +++++-
 mpy-cross/mpconfigport.h        | 1 +
 mpy-cross/mpy_cross/__init__.py | 1 +
 py/persistentcode.h             | 3 +++
 tools/mpy-tool.py               | 7 +++++--
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 8e8284928dacb..be0114701aea7 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -58,7 +58,7 @@ If importing an .mpy file fails then try the following:
     sys_mpy = sys.implementation._mpy
     arch = [None, 'x86', 'x64',
         'armv6', 'armv6m', 'armv7m', 'armv7em', 'armv7emsp', 'armv7emdp',
-        'xtensa', 'xtensawin'][sys_mpy >> 10]
+        'xtensa', 'xtensawin', 'rv32imc'][sys_mpy >> 10]
     print('mpy version:', sys_mpy & 0xff)
     print('mpy sub-version:', sys_mpy >> 8 & 3)
     print('mpy flags:', end='')
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 0ac2e891d6dea..a9066215d0381 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -129,7 +129,8 @@ 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, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin\n"
+        "-march=<arch> : set architecture for native emitter;\n"
+        "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin, rv32imc\n"
         "\n"
         "Implementation specific options:\n", argv[0]
         );
@@ -312,6 +313,9 @@ 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, "rv32imc") == 0) {
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_RV32IMC;
+                    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_RV32I;
                 } else if (strcmp(arch, "host") == 0) {
                     #if defined(__i386__) || defined(_M_IX86)
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86;
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 4304c552bc45b..009aed33393a3 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -46,6 +46,7 @@
 #define MICROPY_EMIT_XTENSA         (1)
 #define MICROPY_EMIT_INLINE_XTENSA  (1)
 #define MICROPY_EMIT_XTENSAWIN      (1)
+#define MICROPY_EMIT_RV32           (1)
 
 #define MICROPY_DYNAMIC_COMPILER    (1)
 #define MICROPY_COMP_CONST_FOLDING  (1)
diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index 5020033e8c808..91cd6f99335b3 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -43,6 +43,7 @@
     "NATIVE_ARCH_ARMV7EMDP": "armv7emdp",
     "NATIVE_ARCH_XTENSA": "xtensa",
     "NATIVE_ARCH_XTENSAWIN": "xtensawin",
+    "NATIVE_ARCH_RV32IMC": "rv32imc",
 }
 
 globals().update(NATIVE_ARCHS)
diff --git a/py/persistentcode.h b/py/persistentcode.h
index d2b310f241f8d..3f3c67764d1c8 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -71,6 +71,8 @@
     #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_XTENSA)
 #elif MICROPY_EMIT_XTENSAWIN
     #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_XTENSAWIN)
+#elif MICROPY_EMIT_RV32
+    #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_RV32IMC)
 #else
     #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_NONE)
 #endif
@@ -95,6 +97,7 @@ enum {
     MP_NATIVE_ARCH_ARMV7EMDP,
     MP_NATIVE_ARCH_XTENSA,
     MP_NATIVE_ARCH_XTENSAWIN,
+    MP_NATIVE_ARCH_RV32IMC,
 };
 
 enum {
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 86c4ba7579358..3b06572c3a308 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -113,6 +113,7 @@ class Config:
 MP_NATIVE_ARCH_ARMV7EMDP = 8
 MP_NATIVE_ARCH_XTENSA = 9
 MP_NATIVE_ARCH_XTENSAWIN = 10
+MP_NATIVE_ARCH_RV32IMC = 11
 
 MP_PERSISTENT_OBJ_FUN_TABLE = 0
 MP_PERSISTENT_OBJ_NONE = 1
@@ -1094,8 +1095,10 @@ def __init__(
         ):
             # ARMV6 or Xtensa -- four byte align.
             self.fun_data_attributes += " __attribute__ ((aligned (4)))"
-        elif MP_NATIVE_ARCH_ARMV6M <= config.native_arch <= MP_NATIVE_ARCH_ARMV7EMDP:
-            # ARMVxxM -- two byte align.
+        elif (
+            MP_NATIVE_ARCH_ARMV6M <= config.native_arch <= MP_NATIVE_ARCH_ARMV7EMDP
+        ) or config.native_arch == MP_NATIVE_ARCH_RV32IMC:
+            # ARMVxxM or RV32IMC -- two byte align.
             self.fun_data_attributes += " __attribute__ ((aligned (2)))"
 
     def disassemble(self):

From 3dd1130f6d85e9d378609fb244332d52a6caa059 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 14 Jun 2024 19:43:47 +0200
Subject: [PATCH 1163/3129] py/emitnative: Emit better load/store sequences for
 RISC-V RV32IMC.

Selected load/store code sequences have been optimised for RV32IMC when the
chance to use fewer and smaller opcodes was possible.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitnative.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 7557e4ba48fac..3294fd9ea3a96 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -178,6 +178,12 @@ static const uint8_t reg_local_table[MAX_REGS_FOR_LOCAL_VARS] = {REG_LOCAL_1, RE
         *emit->error_slot = mp_obj_new_exception_msg_varg(&mp_type_ViperTypeError, __VA_ARGS__); \
 } while (0)
 
+#if N_RV32
+#define FIT_SIGNED(value, bits)                                                                                     \
+    ((((value) & ~((1U << ((bits) - 1)) - 1)) == 0) ||                                      \
+    (((value) & ~((1U << ((bits) - 1)) - 1)) == ~((1U << ((bits) - 1)) - 1)))
+#endif
+
 typedef enum {
     STACK_VALUE,
     STACK_REG,
@@ -1519,6 +1525,11 @@ static void emit_native_load_subscr(emit_t *emit) {
                             asm_thumb_ldrb_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
                             break;
                         }
+                        #elif N_RV32
+                        if (FIT_SIGNED(index_value, 12)) {
+                            asm_rv32_opcode_lbu(emit->as, REG_RET, reg_base, index_value);
+                            break;
+                        }
                         #endif
                         need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
@@ -1537,6 +1548,11 @@ static void emit_native_load_subscr(emit_t *emit) {
                             asm_thumb_ldrh_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
                             break;
                         }
+                        #elif N_RV32
+                        if (FIT_SIGNED(index_value, 11)) {
+                            asm_rv32_opcode_lhu(emit->as, REG_RET, reg_base, index_value << 1);
+                            break;
+                        }
                         #endif
                         need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value << 1);
@@ -1555,6 +1571,11 @@ static void emit_native_load_subscr(emit_t *emit) {
                             asm_thumb_ldr_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
                             break;
                         }
+                        #elif N_RV32
+                        if (FIT_SIGNED(index_value, 10)) {
+                            asm_rv32_opcode_lw(emit->as, REG_RET, reg_base, index_value << 2);
+                            break;
+                        }
                         #endif
                         need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value << 2);
@@ -1596,6 +1617,12 @@ static void emit_native_load_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR32: {
                     // pointer to word-size memory
+                    #if N_RV32
+                    asm_rv32_opcode_slli(emit->as, REG_TEMP2, reg_index, 2);
+                    asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
+                    asm_rv32_opcode_lw(emit->as, REG_RET, REG_ARG_1, 0);
+                    break;
+                    #endif
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
@@ -1751,6 +1778,11 @@ static void emit_native_store_subscr(emit_t *emit) {
                             asm_thumb_strb_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
                             break;
                         }
+                        #elif N_RV32
+                        if (FIT_SIGNED(index_value, 12)) {
+                            asm_rv32_opcode_sb(emit->as, reg_value, reg_base, index_value);
+                            break;
+                        }
                         #endif
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
                         #if N_ARM
@@ -1772,6 +1804,11 @@ static void emit_native_store_subscr(emit_t *emit) {
                             asm_thumb_strh_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
                             break;
                         }
+                        #elif N_RV32
+                        if (FIT_SIGNED(index_value, 11)) {
+                            asm_rv32_opcode_sh(emit->as, reg_value, reg_base, index_value << 1);
+                            break;
+                        }
                         #endif
                         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
@@ -1789,8 +1826,12 @@ static void emit_native_store_subscr(emit_t *emit) {
                             asm_thumb_str_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
                             break;
                         }
-                        #endif
-                        #if N_ARM
+                        #elif N_RV32
+                        if (FIT_SIGNED(index_value, 10)) {
+                            asm_rv32_opcode_sw(emit->as, reg_value, reg_base, index_value << 2);
+                            break;
+                        }
+                        #elif N_ARM
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
                         asm_arm_str_reg_reg_reg(emit->as, reg_value, reg_base, reg_index);
                         return;
@@ -1855,6 +1896,11 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_str_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
                     break;
+                    #elif N_RV32
+                    asm_rv32_opcode_slli(emit->as, REG_TEMP2, reg_index, 2);
+                    asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
+                    asm_rv32_opcode_sw(emit->as, reg_value, REG_ARG_1, 0);
+                    break;
                     #endif
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base

From c1882e48669bfd637efd086e6a16a5cdbd47fdea Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 17 Jun 2024 22:07:26 +0200
Subject: [PATCH 1164/3129] qemu-riscv: Enable native code generation by
 default.

This turns on the native RV32IMC code generator for the QEMU-based
RISC-V port, and removes tests that relies on native code generation
from the exclusion list (ie enables these tests).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu-riscv/mpconfigport.h    |  1 +
 ports/qemu-riscv/tests_profile.txt | 52 +-----------------------------
 2 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/ports/qemu-riscv/mpconfigport.h b/ports/qemu-riscv/mpconfigport.h
index 8f50828e0f1a4..38bc70e986adb 100644
--- a/ports/qemu-riscv/mpconfigport.h
+++ b/ports/qemu-riscv/mpconfigport.h
@@ -30,6 +30,7 @@
 
 #define MICROPY_CONFIG_ROM_LEVEL           (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
+#define MICROPY_EMIT_RV32                  (1)
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS                  (1)
 #define MICROPY_ENABLE_GC                  (1)
diff --git a/ports/qemu-riscv/tests_profile.txt b/ports/qemu-riscv/tests_profile.txt
index 2f3bb7300ddf4..1079ca18124dc 100644
--- a/ports/qemu-riscv/tests_profile.txt
+++ b/ports/qemu-riscv/tests_profile.txt
@@ -1,53 +1,3 @@
 # Port-specific tests exclusion list.
 
-exclude_tests = exclude_tests.union(
-    (
-        # Native code generation is not yet supported.
-        "micropython/native_closure.py",
-        "micropython/native_const.py",
-        "micropython/native_const_intbig.py",
-        "micropython/native_for.py",
-        "micropython/native_fun_attrs.py",
-        "micropython/native_gen.py",
-        "micropython/native_misc.py",
-        "micropython/native_try.py",
-        "micropython/native_try_deep.py",
-        "micropython/native_while.py",
-        "micropython/native_with.py",
-
-        # Viper code generator is not yet supported.
-        "micropython/viper_addr.py",
-        "micropython/viper_args.py",
-        "micropython/viper_binop_arith.py",
-        "micropython/viper_binop_arith_uint.py",
-        "micropython/viper_binop_bitwise_uint.py",
-        "micropython/viper_binop_comp.py",
-        "micropython/viper_binop_comp_imm.py",
-        "micropython/viper_binop_comp_uint.py",
-        "micropython/viper_binop_divmod.py",
-        "micropython/viper_binop_multi_comp.py",
-        "micropython/viper_cond.py",
-        "micropython/viper_const.py",
-        "micropython/viper_const_intbig.py",
-        "micropython/viper_error.py",
-        "micropython/viper_globals.py",
-        "micropython/viper_import.py",
-        "micropython/viper_misc.py",
-        "micropython/viper_misc2.py",
-        "micropython/viper_misc3.py",
-        "micropython/viper_misc_intbig.py",
-        "micropython/viper_ptr16_load.py",
-        "micropython/viper_ptr16_store.py",
-        "micropython/viper_ptr32_load.py",
-        "micropython/viper_ptr32_store.py",
-        "micropython/viper_ptr8_load.py",
-        "micropython/viper_ptr8_store.py",
-        "micropython/viper_storeattr.py",
-        "micropython/viper_subscr.py",
-        "micropython/viper_subscr_multi.py",
-        "micropython/viper_try.py",
-        "micropython/viper_types.py",
-        "micropython/viper_unop.py",
-        "micropython/viper_with.py",
-    )
-)
+exclude_tests = exclude_tests.union(())

From e2ae03e97963c2d338752bc4cbe8bd87981014fb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 11:13:31 +1100
Subject: [PATCH 1165/3129] py/emitnative: Add more DEBUG_printf statements.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/py/emitnative.c b/py/emitnative.c
index 3294fd9ea3a96..99e5a24c1b465 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1459,6 +1459,7 @@ static void emit_native_load_attr(emit_t *emit, qstr qst) {
 }
 
 static void emit_native_load_method(emit_t *emit, qstr qst, bool is_super) {
+    DEBUG_printf("load_method(%s, %d)\n", qstr_str(qst), is_super);
     if (is_super) {
         emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_2, 3); // arg2 = dest ptr
         emit_get_stack_pointer_to_reg_for_push(emit, REG_ARG_2, 2); // arg2 = dest ptr
@@ -2149,6 +2150,7 @@ static void emit_native_setup_with(emit_t *emit, mp_uint_t label) {
 }
 
 static void emit_native_setup_block(emit_t *emit, mp_uint_t label, int kind) {
+    DEBUG_printf("setup_block(%d, %d)\n", (int)label, kind);
     if (kind == MP_EMIT_SETUP_BLOCK_WITH) {
         emit_native_setup_with(emit, label);
     } else {
@@ -2233,6 +2235,8 @@ static void emit_native_end_finally(emit_t *emit) {
     //   if exc == None: pass
     //   else: raise exc
     // the check if exc is None is done in the MP_F_NATIVE_RAISE stub
+    DEBUG_printf("end_finally\n");
+
     emit_native_pre(emit);
     ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_EXC_VAL(emit));
     emit_call(emit, MP_F_NATIVE_RAISE);
@@ -2257,6 +2261,8 @@ static void emit_native_get_iter(emit_t *emit, bool use_stack) {
     // perhaps the difficult one, as we want to rewrite for loops using native code
     // in cases where we iterate over a Python object, can we use normal runtime calls?
 
+    DEBUG_printf("get_iter(%d)\n", use_stack);
+
     vtype_kind_t vtype;
     emit_pre_pop_reg(emit, &vtype, REG_ARG_1);
     assert(vtype == VTYPE_PYOBJ);
@@ -2838,6 +2844,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) {
+    DEBUG_printf("call_method(%d, %d, %d)\n", n_positional, n_keyword, star_flags);
     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_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);
@@ -2904,6 +2911,7 @@ static void emit_native_return_value(emit_t *emit) {
 }
 
 static void emit_native_raise_varargs(emit_t *emit, mp_uint_t n_args) {
+    DEBUG_printf("raise_varargs(%d)\n", n_args);
     (void)n_args;
     assert(n_args == 1);
     vtype_kind_t vtype_exc;
@@ -2919,6 +2927,8 @@ static void emit_native_raise_varargs(emit_t *emit, mp_uint_t n_args) {
 static void emit_native_yield(emit_t *emit, int kind) {
     // Note: 1 (yield) or 3 (yield from) labels are reserved for this function, starting at *emit->label_slot
 
+    DEBUG_printf("yield(%d)\n", kind);
+
     if (emit->do_viper_types) {
         mp_raise_NotImplementedError(MP_ERROR_TEXT("native yield"));
     }

From 9dbc787ce8dda9df39eb68c03de144155b2253f0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Mar 2024 11:38:27 +1100
Subject: [PATCH 1166/3129] py/emitndebug: Add native debug emitter.

This emitter prints out pseudo-machine instructions, instead of the usual
output of the native emitter.  It can be enabled on any port via
`MICROPY_EMIT_NATIVE_DEBUG` (make sure other native emitters are disabled)
but the easiest way to use it is with mpy-cross:

    $ mpy-cross -march=debug file.py

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/main.c         |   7 +-
 mpy-cross/mpconfigport.h |   4 +
 py/asmbase.c             |   6 +
 py/compile.c             |   3 +
 py/emit.h                |   3 +
 py/emitnative.c          |   6 +-
 py/emitndebug.c          | 285 +++++++++++++++++++++++++++++++++++++++
 py/mpconfig.h            |   2 +-
 py/persistentcode.h      |   1 +
 py/py.cmake              |   1 +
 py/py.mk                 |   1 +
 11 files changed, 315 insertions(+), 4 deletions(-)
 create mode 100644 py/emitndebug.c

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index a9066215d0381..72b6e10fce9d2 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -54,7 +54,7 @@ static void stdout_print_strn(void *env, const char *str, size_t len) {
     (void)dummy;
 }
 
-static const mp_print_t mp_stdout_print = {NULL, stdout_print_strn};
+const mp_print_t mp_stdout_print = {NULL, stdout_print_strn};
 
 static void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
@@ -130,7 +130,7 @@ static int usage(char **argv) {
         "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;\n"
-        "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin, rv32imc\n"
+        "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin, rv32imc, debug\n"
         "\n"
         "Implementation specific options:\n", argv[0]
         );
@@ -316,6 +316,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 } else if (strcmp(arch, "rv32imc") == 0) {
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_RV32IMC;
                     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_RV32I;
+                } else if (strcmp(arch, "debug") == 0) {
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_DEBUG;
+                    mp_dynamic_compiler.nlr_buf_num_regs = 0;
                 } else if (strcmp(arch, "host") == 0) {
                     #if defined(__i386__) || defined(_M_IX86)
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86;
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 009aed33393a3..8723472eb710c 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -47,6 +47,8 @@
 #define MICROPY_EMIT_INLINE_XTENSA  (1)
 #define MICROPY_EMIT_XTENSAWIN      (1)
 #define MICROPY_EMIT_RV32           (1)
+#define MICROPY_EMIT_NATIVE_DEBUG   (1)
+#define MICROPY_EMIT_NATIVE_DEBUG_PRINTER (&mp_stdout_print)
 
 #define MICROPY_DYNAMIC_COMPILER    (1)
 #define MICROPY_COMP_CONST_FOLDING  (1)
@@ -164,3 +166,5 @@ typedef int ssize_t;
 typedef mp_off_t off_t;
 
 #endif
+
+extern const struct _mp_print_t mp_stdout_print;
diff --git a/py/asmbase.c b/py/asmbase.c
index cf64e3f3d054f..3fce543a7f485 100644
--- a/py/asmbase.c
+++ b/py/asmbase.c
@@ -30,6 +30,7 @@
 #include "py/obj.h"
 #include "py/misc.h"
 #include "py/asmbase.h"
+#include "py/persistentcode.h"
 
 #if MICROPY_EMIT_MACHINE_CODE
 
@@ -91,6 +92,11 @@ void mp_asm_base_label_assign(mp_asm_base_t *as, size_t label) {
     } else {
         // ensure label offset has not changed from PASS_COMPUTE to PASS_EMIT
         assert(as->label_offsets[label] == as->code_offset);
+        #if MICROPY_DYNAMIC_COMPILER && MICROPY_EMIT_NATIVE_DEBUG
+        if (mp_dynamic_compiler.native_arch == MP_NATIVE_ARCH_DEBUG) {
+            mp_printf(MICROPY_EMIT_NATIVE_DEBUG_PRINTER, "label(label_%u)\n", (unsigned int)label);
+        }
+        #endif
     }
 }
 
diff --git a/py/compile.c b/py/compile.c
index 9b012f8787004..3429e384c0050 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -103,6 +103,7 @@ static const emit_method_table_t *emit_native_table[] = {
     &emit_native_xtensa_method_table,
     &emit_native_xtensawin_method_table,
     &emit_native_rv32_method_table,
+    &emit_native_debug_method_table,
 };
 
 #elif MICROPY_EMIT_NATIVE
@@ -121,6 +122,8 @@ static const emit_method_table_t *emit_native_table[] = {
 #define NATIVE_EMITTER(f) emit_native_xtensawin_##f
 #elif MICROPY_EMIT_RV32
 #define NATIVE_EMITTER(f) emit_native_rv32_##f
+#elif MICROPY_EMIT_NATIVE_DEBUG
+#define NATIVE_EMITTER(f) emit_native_debug_##f
 #else
 #error "unknown native emitter"
 #endif
diff --git a/py/emit.h b/py/emit.h
index 0c5019f07ac3f..9aad6ebafb89b 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -202,6 +202,7 @@ extern const emit_method_table_t emit_native_arm_method_table;
 extern const emit_method_table_t emit_native_xtensa_method_table;
 extern const emit_method_table_t emit_native_xtensawin_method_table;
 extern const emit_method_table_t emit_native_rv32_method_table;
+extern const emit_method_table_t emit_native_debug_method_table;
 
 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;
@@ -215,6 +216,7 @@ emit_t *emit_native_arm_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot,
 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);
 emit_t *emit_native_rv32_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_debug_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);
 
@@ -226,6 +228,7 @@ void emit_native_arm_free(emit_t *emit);
 void emit_native_xtensa_free(emit_t *emit);
 void emit_native_xtensawin_free(emit_t *emit);
 void emit_native_rv32_free(emit_t *emit);
+void emit_native_debug_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);
diff --git a/py/emitnative.c b/py/emitnative.c
index 99e5a24c1b465..9d3f698b25abb 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -59,7 +59,7 @@
 #endif
 
 // wrapper around everything in this file
-#if N_X64 || N_X86 || N_THUMB || N_ARM || N_XTENSA || N_XTENSAWIN || N_RV32
+#if N_X64 || N_X86 || N_THUMB || N_ARM || N_XTENSA || N_XTENSAWIN || N_RV32 || N_DEBUG
 
 // C stack layout for native functions:
 //  0:                          nlr_buf_t [optional]
@@ -348,6 +348,8 @@ 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
     ASM_LOAD16_REG_REG_OFFSET(emit->as, arg_reg, REG_QSTR_TABLE, mp_emit_common_use_qstr(emit->emit_common, qst));
+    #elif defined(ASM_MOV_REG_QSTR)
+    ASM_MOV_REG_QSTR(emit->as, arg_reg, qst);
     #else
     ASM_MOV_REG_IMM(emit->as, arg_reg, qst);
     #endif
@@ -2604,6 +2606,8 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
                 default:
                     break;
             }
+            #elif N_DEBUG
+            asm_debug_setcc_reg_reg_reg(emit->as, op_idx, REG_RET, REG_ARG_2, reg_rhs);
             #else
             #error not implemented
             #endif
diff --git a/py/emitndebug.c b/py/emitndebug.c
new file mode 100644
index 0000000000000..bd896a75c8ddf
--- /dev/null
+++ b/py/emitndebug.c
@@ -0,0 +1,285 @@
+// native-debug specific stuff
+
+#include "py/mpconfig.h"
+
+#if MICROPY_EMIT_NATIVE_DEBUG
+
+#include "py/asmbase.h"
+#include "py/nativeglue.h"
+
+#define asm_debug_printf(as, fmt, ...) \
+    do { \
+        if (as->base.pass == MP_ASM_PASS_EMIT) { \
+            if (fmt[0] != 'E') { \
+                mp_printf(MICROPY_EMIT_NATIVE_DEBUG_PRINTER, "    "); \
+            } \
+            if (as->base.suppress) { \
+                mp_printf(MICROPY_EMIT_NATIVE_DEBUG_PRINTER, "dead_code "); \
+            } \
+            mp_printf(MICROPY_EMIT_NATIVE_DEBUG_PRINTER, fmt, __VA_ARGS__); \
+        } \
+    } while (0)
+
+enum {
+    ASM_DEBUG_REG_R00,
+    ASM_DEBUG_REG_R01,
+    ASM_DEBUG_REG_R02,
+    ASM_DEBUG_REG_R03,
+    ASM_DEBUG_REG_R04,
+    ASM_DEBUG_REG_R05,
+    ASM_DEBUG_REG_R06,
+    ASM_DEBUG_REG_R07,
+    ASM_DEBUG_REG_R08,
+    ASM_DEBUG_REG_R09,
+    ASM_DEBUG_REG_R10,
+    ASM_DEBUG_REG_R11,
+};
+
+typedef struct _asm_debug_t {
+    mp_asm_base_t base;
+} asm_debug_t;
+
+static const char *const reg_name_table[] = {
+    "r_ret",
+    "r_arg1",
+    "r_arg2",
+    "r_arg3",
+    "r_arg4",
+    "r_temp0",
+    "r_temp1",
+    "r_temp2",
+    "r_local1",
+    "r_local2",
+    "r_local3",
+    "r_fun_table",
+};
+
+static const char *const fun_name_table[MP_F_NUMBER_OF] = {
+    [MP_F_CONVERT_OBJ_TO_NATIVE] = "convert_obj_to_native",
+    [MP_F_CONVERT_NATIVE_TO_OBJ] = "convert_native_to_obj",
+    [MP_F_NATIVE_SWAP_GLOBALS] = "native_swap_globals",
+    [MP_F_LOAD_NAME] = "load_name",
+    [MP_F_LOAD_GLOBAL] = "load_global",
+    [MP_F_LOAD_BUILD_CLASS] = "load_build_class",
+    [MP_F_LOAD_ATTR] = "load_attr",
+    [MP_F_LOAD_METHOD] = "load_method",
+    [MP_F_LOAD_SUPER_METHOD] = "load_super_method",
+    [MP_F_STORE_NAME] = "store_name",
+    [MP_F_STORE_GLOBAL] = "store_global",
+    [MP_F_STORE_ATTR] = "store_attr",
+    [MP_F_OBJ_SUBSCR] = "obj_subscr",
+    [MP_F_OBJ_IS_TRUE] = "obj_is_true",
+    [MP_F_UNARY_OP] = "unary_op",
+    [MP_F_BINARY_OP] = "binary_op",
+    [MP_F_BUILD_TUPLE] = "build_tuple",
+    [MP_F_BUILD_LIST] = "build_list",
+    [MP_F_BUILD_MAP] = "build_map",
+    [MP_F_BUILD_SET] = "build_set",
+    [MP_F_STORE_SET] = "store_set",
+    [MP_F_LIST_APPEND] = "list_append",
+    [MP_F_STORE_MAP] = "store_map",
+    [MP_F_MAKE_FUNCTION_FROM_PROTO_FUN] = "make_function_from_proto_fun",
+    [MP_F_NATIVE_CALL_FUNCTION_N_KW] = "native_call_function_n_kw",
+    [MP_F_CALL_METHOD_N_KW] = "call_method_n_kw",
+    [MP_F_CALL_METHOD_N_KW_VAR] = "call_method_n_kw_var",
+    [MP_F_NATIVE_GETITER] = "native_getiter",
+    [MP_F_NATIVE_ITERNEXT] = "native_iternext",
+    [MP_F_NLR_PUSH] = "nlr_push",
+    [MP_F_NLR_POP] = "nlr_pop",
+    [MP_F_NATIVE_RAISE] = "native_raise",
+    [MP_F_IMPORT_NAME] = "import_name",
+    [MP_F_IMPORT_FROM] = "import_from",
+    [MP_F_IMPORT_ALL] = "import_all",
+    [MP_F_NEW_SLICE] = "new_slice",
+    [MP_F_UNPACK_SEQUENCE] = "unpack_sequence",
+    [MP_F_UNPACK_EX] = "unpack_ex",
+    [MP_F_DELETE_NAME] = "delete_name",
+    [MP_F_DELETE_GLOBAL] = "delete_global",
+    [MP_F_NEW_CLOSURE] = "new_closure",
+    [MP_F_ARG_CHECK_NUM_SIG] = "arg_check_num_sig",
+    [MP_F_SETUP_CODE_STATE] = "setup_code_state",
+    [MP_F_SMALL_INT_FLOOR_DIVIDE] = "small_int_floor_divide",
+    [MP_F_SMALL_INT_MODULO] = "small_int_modulo",
+    [MP_F_NATIVE_YIELD_FROM] = "native_yield_from",
+    [MP_F_SETJMP] = "setjmp",
+};
+
+static void asm_debug_end_pass(asm_debug_t *as) {
+    (void)as;
+}
+
+static void asm_debug_entry(asm_debug_t *as, int num_locals) {
+    asm_debug_printf(as, "ENTRY(num_locals=%d)\n", num_locals);
+}
+
+static void asm_debug_exit(asm_debug_t *as) {
+    asm_debug_printf(as, "EXIT(%u)\n", 0);
+}
+
+static void asm_debug_fun(asm_debug_t *as, const char *op, int fun_idx) {
+    asm_debug_printf(as, "%s(%s)\n", op, fun_name_table[fun_idx]);
+}
+
+static void asm_debug_reg(asm_debug_t *as, const char *op, int reg) {
+    asm_debug_printf(as, "%s(%s)\n", op, reg_name_table[reg]);
+}
+
+static void asm_debug_label(asm_debug_t *as, const char *op, unsigned int label) {
+    asm_debug_printf(as, "%s(label_%u)\n", op, label);
+}
+
+static void asm_debug_reg_imm(asm_debug_t *as, const char *op, int reg, int imm) {
+    asm_debug_printf(as, "%s(%s, %d=0x%x)\n", op, reg_name_table[reg], imm, imm);
+}
+
+#if !MICROPY_PERSISTENT_CODE_SAVE
+static void asm_debug_reg_qstr(asm_debug_t *as, const char *op, int reg, int qst) {
+    asm_debug_printf(as, "%s(%s, %s)\n", op, reg_name_table[reg], qstr_str(qst));
+}
+#endif
+
+static void asm_debug_reg_reg(asm_debug_t *as, const char *op, int reg1, int reg2) {
+    asm_debug_printf(as, "%s(%s, %s)\n", op, reg_name_table[reg1], reg_name_table[reg2]);
+}
+
+static void asm_debug_reg_local(asm_debug_t *as, const char *op, int reg, unsigned int local) {
+    asm_debug_printf(as, "%s(%s, local_%u)\n", op, reg_name_table[reg], local);
+}
+
+static void asm_debug_reg_label(asm_debug_t *as, const char *op, int reg, unsigned int label) {
+    asm_debug_printf(as, "%s(%s, label_%u)\n", op, reg_name_table[reg], label);
+}
+
+static void asm_debug_local_reg(asm_debug_t *as, const char *op, int local, int reg) {
+    asm_debug_printf(as, "%s(local_%d, %s)\n", op, local, reg_name_table[reg]);
+}
+
+static void asm_debug_reg_label_bool(asm_debug_t *as, const char *op, int reg, unsigned int label, bool b) {
+    asm_debug_printf(as, "%s(%s, label_%u, %s)\n", op, reg_name_table[reg], label, b ? "true" : "false");
+}
+
+static void asm_debug_reg_reg_offset(asm_debug_t *as, const char *op, int reg1, int reg2, int offset) {
+    asm_debug_printf(as, "%s(%s, %s, %d)\n", op, reg_name_table[reg1], reg_name_table[reg2], offset);
+}
+
+static void asm_debug_reg_reg_label(asm_debug_t *as, const char *op, int reg1, int reg2, unsigned int label) {
+    asm_debug_printf(as, "%s(%s, %s, label_%u)\n", op, reg_name_table[reg1], reg_name_table[reg2], label);
+}
+
+static void asm_debug_setcc_reg_reg_reg(asm_debug_t *as, int op, int reg1, int reg2, int reg3) {
+    asm_debug_printf(as, "setcc(%d, %s, %s, %s)\n", op, reg_name_table[reg1], reg_name_table[reg2], reg_name_table[reg3]);
+}
+
+// The following macros provide a (mostly) arch-independent API to
+// generate native code, and are used by the native emitter.
+
+#define ASM_WORD_SIZE (8)
+
+#define REG_RET ASM_DEBUG_REG_R00
+#define REG_ARG_1 ASM_DEBUG_REG_R01
+#define REG_ARG_2 ASM_DEBUG_REG_R02
+#define REG_ARG_3 ASM_DEBUG_REG_R03
+#define REG_ARG_4 ASM_DEBUG_REG_R04
+
+#define REG_TEMP0 ASM_DEBUG_REG_R05
+#define REG_TEMP1 ASM_DEBUG_REG_R06
+#define REG_TEMP2 ASM_DEBUG_REG_R07
+
+#define REG_LOCAL_1 ASM_DEBUG_REG_R08
+#define REG_LOCAL_2 ASM_DEBUG_REG_R09
+#define REG_LOCAL_3 ASM_DEBUG_REG_R10
+#define REG_LOCAL_NUM (3)
+
+// Holds a pointer to mp_fun_table
+#define REG_FUN_TABLE ASM_DEBUG_REG_R11
+
+#define ASM_T               asm_debug_t
+#define ASM_END_PASS        asm_debug_end_pass
+#define ASM_ENTRY(as, num_locals) \
+    asm_debug_entry(as, num_locals)
+#define ASM_EXIT(as) \
+    asm_debug_exit(as)
+
+#define ASM_JUMP(as, label) \
+    asm_debug_label(as, "jump", label)
+#define ASM_JUMP_IF_REG_ZERO(as, reg, label, bool_test) \
+    asm_debug_reg_label_bool(as, "jump_if_reg_zero", reg, label, bool_test)
+#define ASM_JUMP_IF_REG_NONZERO(as, reg, label, bool_test) \
+    asm_debug_reg_label_bool(as, "jump_if_reg_nonzero", reg, label, bool_test)
+#define ASM_JUMP_IF_REG_EQ(as, reg1, reg2, label) \
+    asm_debug_reg_reg_label(as, "jump_if_reg_eq", reg1, reg2, label)
+#define ASM_JUMP_REG(as, reg) \
+    asm_debug_reg(as, "jump_reg", reg)
+#define ASM_CALL_IND(as, idx) \
+    asm_debug_fun(as, "call_ind", idx)
+
+#define ASM_MOV_LOCAL_REG(as, local_num, reg_src) \
+    asm_debug_local_reg(as, "mov_local_reg", local_num, reg_src)
+#define ASM_MOV_REG_IMM(as, reg_dest, imm) \
+    asm_debug_reg_imm(as, "mov_reg_imm", reg_dest, imm)
+#define ASM_MOV_REG_QSTR(as, reg_dest, qst) \
+    asm_debug_reg_qstr(as, "mov_reg_qstr", reg_dest, qst)
+#define ASM_MOV_REG_LOCAL(as, reg_dest, local_num) \
+    asm_debug_reg_local(as, "mov_reg_local", reg_dest, local_num)
+#define ASM_MOV_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "mov_reg_reg", reg_dest, reg_src)
+#define ASM_MOV_REG_LOCAL_ADDR(as, reg_dest, local_num) \
+    asm_debug_reg_local(as, "mov_reg_local_addr", reg_dest, local_num)
+#define ASM_MOV_REG_PCREL(as, reg_dest, label) \
+    asm_debug_reg_label(as, "mov_reg_pcrel", reg_dest, label)
+
+#define ASM_NOT_REG(as, reg_dest) \
+    asm_debug_reg(as, "not", reg_dest)
+#define ASM_NEG_REG(as, reg_dest) \
+    asm_debug_reg(as, "neg", reg_dest)
+#define ASM_LSL_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "lsl", reg_dest, reg_src)
+#define ASM_LSR_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "lsr", reg_dest, reg_src)
+#define ASM_ASR_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "asr", reg_dest, reg_src)
+#define ASM_OR_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "or", reg_dest, reg_src)
+#define ASM_XOR_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "xor", reg_dest, reg_src)
+#define ASM_AND_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "and", reg_dest, reg_src)
+#define ASM_ADD_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "add", reg_dest, reg_src)
+#define ASM_SUB_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "sub", reg_dest, reg_src)
+#define ASM_MUL_REG_REG(as, reg_dest, reg_src) \
+    asm_debug_reg_reg(as, "mul", reg_dest, reg_src)
+
+#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) \
+    asm_debug_reg_reg(as, "load", reg_dest, reg_base)
+#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) \
+    asm_debug_reg_reg_offset(as, "load", reg_dest, reg_base, word_offset)
+#define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) \
+    asm_debug_reg_reg(as, "load8", reg_dest, reg_base)
+#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) \
+    asm_debug_reg_reg(as, "load16", reg_dest, reg_base)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, uint16_offset) \
+    asm_debug_reg_reg_offset(as, "load16", reg_dest, reg_base, uint16_offset)
+#define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) \
+    asm_debug_reg_reg(as, "load32", reg_dest, reg_base)
+
+#define ASM_STORE_REG_REG(as, reg_src, reg_base) \
+    asm_debug_reg_reg(as, "store", reg_src, reg_base)
+#define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) \
+    asm_debug_reg_reg_offset(as, "store", reg_src, reg_base, word_offset)
+#define ASM_STORE8_REG_REG(as, reg_src, reg_base) \
+    asm_debug_reg_reg(as, "store8", reg_src, reg_base)
+#define ASM_STORE16_REG_REG(as, reg_src, reg_base) \
+    asm_debug_reg_reg(as, "store16", reg_src, reg_base)
+#define ASM_STORE32_REG_REG(as, reg_src, reg_base) \
+    asm_debug_reg_reg(as, "store32", reg_src, reg_base)
+
+// Word indices of REG_LOCAL_x in nlr_buf_t
+#define NLR_BUF_IDX_LOCAL_1 (5) // rbx
+
+#define N_DEBUG (1)
+#define EXPORT_FUN(name) emit_native_debug_##name
+#include "py/emitnative.c"
+
+#endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index efb30ac04dada..bc6bf75fe57c5 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -412,7 +412,7 @@
 #endif
 
 // 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 || MICROPY_EMIT_RV32)
+#define MICROPY_EMIT_NATIVE (MICROPY_EMIT_X64 || MICROPY_EMIT_X86 || MICROPY_EMIT_THUMB || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN || MICROPY_EMIT_RV32 || MICROPY_EMIT_NATIVE_DEBUG)
 
 // 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)
diff --git a/py/persistentcode.h b/py/persistentcode.h
index 3f3c67764d1c8..f0b7f70f7d7fa 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -98,6 +98,7 @@ enum {
     MP_NATIVE_ARCH_XTENSA,
     MP_NATIVE_ARCH_XTENSAWIN,
     MP_NATIVE_ARCH_RV32IMC,
+    MP_NATIVE_ARCH_DEBUG, // this entry should always be last
 };
 
 enum {
diff --git a/py/py.cmake b/py/py.cmake
index f47661c409a14..ccd0577c386d6 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -26,6 +26,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/emitinlinethumb.c
     ${MICROPY_PY_DIR}/emitinlinextensa.c
     ${MICROPY_PY_DIR}/emitnarm.c
+    ${MICROPY_PY_DIR}/emitndebug.c
     ${MICROPY_PY_DIR}/emitnrv32.c
     ${MICROPY_PY_DIR}/emitnthumb.c
     ${MICROPY_PY_DIR}/emitnx64.c
diff --git a/py/py.mk b/py/py.mk
index 0b429f9efe7ac..cd9392edbba4c 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -116,6 +116,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	emitnxtensawin.o \
 	asmrv32.o \
 	emitnrv32.o \
+	emitndebug.o \
 	formatfloat.o \
 	parsenumbase.o \
 	parsenum.o \

From a19214d897f7891d177dc22bb8fc555f7e6b65bb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Apr 2024 09:29:13 +1000
Subject: [PATCH 1167/3129] py/emitnative: Place thrown value in dedicated
 local variable.

A value thrown/injected into a native generator needs to be stored in a
dedicated variable outside `nlr_buf_t`, following the `inject_exc` variable
in `py/vm.c`.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c    | 26 ++++++++++++++++++--------
 tests/run-tests.py |  3 ---
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 9d3f698b25abb..db31f51e652ca 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -129,6 +129,7 @@
 
 // Whether a slot is needed to store LOCAL_IDX_EXC_HANDLER_UNWIND
 #define NEED_EXC_HANDLER_UNWIND(emit) ((emit)->scope->exc_stack_size > 0)
+#define NEED_THROW_VAL(emit) ((emit)->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR)
 
 // 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
@@ -139,6 +140,7 @@
 #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 + 1) // this needs a dedicated variable outside nlr_buf_t
+#define LOCAL_IDX_THROW_VAL(emit) (SIZEOF_NLR_BUF + 2) // needs a dedicated variable outside nlr_buf_t, following inject_exc in py/vm.c
 #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)
@@ -426,7 +428,9 @@ static void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
     if (NEED_GLOBAL_EXC_HANDLER(emit)) {
         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)) {
+        if (NEED_THROW_VAL(emit)) {
+            emit->code_state_start += 2;
+        } else if (NEED_EXC_HANDLER_UNWIND(emit)) {
             emit->code_state_start += 1;
         }
     }
@@ -545,11 +549,11 @@ static void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             ASM_MOV_REG_REG(emit->as, REG_GENERATOR_STATE, REG_PARENT_ARG_1);
             #endif
 
-            // Put throw value into LOCAL_IDX_EXC_VAL slot, for yield/yield-from
+            // Put throw value into LOCAL_IDX_THROW_VAL slot, for yield/yield-from
             #if N_X86
             asm_x86_mov_arg_to_r32(emit->as, 1, REG_PARENT_ARG_2);
             #endif
-            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_PARENT_ARG_2);
+            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_PARENT_ARG_2);
 
             // 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));
@@ -1252,8 +1256,10 @@ static void emit_native_global_exc_entry(emit_t *emit) {
 
             // This is the first entry of the generator
 
-            // Check LOCAL_IDX_EXC_VAL for any injected value
-            ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_EXC_VAL(emit));
+            // Check LOCAL_IDX_THROW_VAL for any injected value
+            ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_THROW_VAL(emit));
+            ASM_MOV_REG_IMM(emit->as, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL);
+            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_ARG_2);
             emit_call(emit, MP_F_NATIVE_RAISE);
         }
     }
@@ -2988,18 +2994,22 @@ static void emit_native_yield(emit_t *emit, int kind) {
     emit_native_adjust_stack_size(emit, 1); // send_value
 
     if (kind == MP_EMIT_YIELD_VALUE) {
-        // Check LOCAL_IDX_EXC_VAL for any injected value
-        ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_EXC_VAL(emit));
+        // Check LOCAL_IDX_THROW_VAL for any injected value
+        ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_THROW_VAL(emit));
+        ASM_MOV_REG_IMM(emit->as, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL);
+        ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_ARG_2);
         emit_call(emit, MP_F_NATIVE_RAISE);
     } else {
         // Label loop entry
         emit_native_label_assign(emit, *emit->label_slot + 2);
 
         // Get the next item from the delegate generator
+        ASM_MOV_REG_LOCAL(emit->as, REG_ARG_3, LOCAL_IDX_THROW_VAL(emit)); // throw_value
+        ASM_MOV_REG_IMM(emit->as, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL);
+        ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_ARG_2);
         vtype_kind_t vtype;
         emit_pre_pop_reg(emit, &vtype, REG_ARG_2); // send_value
         emit_access_stack(emit, 1, &vtype, REG_ARG_1); // generator
-        ASM_MOV_REG_LOCAL(emit->as, REG_ARG_3, LOCAL_IDX_EXC_VAL(emit)); // throw_value
         emit_post_push_reg(emit, VTYPE_PYOBJ, REG_ARG_3);
         emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, 1); // ret_value
         emit_call(emit, MP_F_NATIVE_YIELD_FROM);
diff --git a/tests/run-tests.py b/tests/run-tests.py
index fa6c2a0331a10..a551f35c679e3 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -731,10 +731,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         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/asyncio_event.py")  # unknown issue
         skip_tests.add("extmod/asyncio_lock.py")  # requires async with
-        skip_tests.add("extmod/asyncio_micropython.py")  # unknown issue
-        skip_tests.add("extmod/asyncio_wait_for.py")  # unknown issue
         skip_tests.add("misc/features.py")  # requires raise_varargs
         skip_tests.add(
             "misc/print_exception.py"

From 038125be79569548f5ebc0a336bda587ea7d63ca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 11:13:56 +1100
Subject: [PATCH 1168/3129] py/emitnative: Fix native async with.

The code generating the entry to the finally handler of an async-with
statement was simply wrong for the case of the native emitter.  Among other
things the layout of the stack was incorrect.

This is fixed by this commit.  The setup of the async-with finally handler
is now put in a dedicated emit function, for both the bytecode and native
emitters to implement in their own way (the bytecode emitter is unchanged,
just factored to a function).

With this fix all of the async-with tests now work when using the native
emitter.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c       | 18 +++++-------------
 py/emit.h          |  6 ++++++
 py/emitbc.c        | 24 ++++++++++++++++++++++++
 py/emitnative.c    | 38 +++++++++++++++++++++++++++++++++++---
 tests/run-tests.py |  4 ----
 5 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 3429e384c0050..d2af6aaf2cb6b 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1899,19 +1899,7 @@ static void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_
 
         // Handle case 1: call __aexit__
         // Stack: (..., ctx_mgr)
-        EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE); // to tell end_finally there's no exception
-        EMIT(rot_two);
-        EMIT_ARG(jump, l_aexit_no_exc); // jump to code below to call __aexit__
-
-        // Start of "finally" block
-        // At this point we have case 2 or 3, we detect which one by the TOS being an exception or not
-        EMIT_ARG(label_assign, l_finally_block);
-
-        // Detect if TOS an exception or not
-        EMIT(dup_top);
-        EMIT_LOAD_GLOBAL(MP_QSTR_BaseException);
-        EMIT_ARG(binary_op, MP_BINARY_OP_EXCEPTION_MATCH);
-        EMIT_ARG(pop_jump_if, false, l_ret_unwind_jump); // if not an exception then we have case 3
+        EMIT_ARG(async_with_setup_finally, l_aexit_no_exc, l_finally_block, l_ret_unwind_jump);
 
         // Handle case 2: call __aexit__ and either swallow or re-raise the exception
         // Stack: (..., ctx_mgr, exc)
@@ -1937,6 +1925,7 @@ static void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_
         EMIT_ARG(pop_jump_if, false, l_end);
         EMIT(pop_top); // pop exception
         EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE); // replace with None to swallow exception
+        // Stack: (..., None)
         EMIT_ARG(jump, l_end);
         EMIT_ARG(adjust_stack_size, 2);
 
@@ -1946,6 +1935,8 @@ static void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_
         EMIT(rot_three);
         EMIT(rot_three);
         EMIT_ARG(label_assign, l_aexit_no_exc);
+        // We arrive here from either case 1 (a jump) or case 3 (fall through)
+        // Stack: case 1: (..., None, ctx_mgr) or case 3: (..., X, INT, ctx_mgr)
         EMIT_ARG(load_method, MP_QSTR___aexit__, false);
         EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
         EMIT(dup_top);
@@ -1953,6 +1944,7 @@ static void compile_async_with_stmt_helper(compiler_t *comp, size_t n, mp_parse_
         EMIT_ARG(call_method, 3, 0, 0);
         compile_yield_from(comp);
         EMIT(pop_top);
+        // Stack: case 1: (..., None) or case 3: (..., X, INT)
         EMIT_ARG(adjust_stack_size, -1);
 
         // End of "finally" block
diff --git a/py/emit.h b/py/emit.h
index 9aad6ebafb89b..623b163490164 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -144,6 +144,9 @@ typedef struct _emit_method_table_t {
     void (*unwind_jump)(emit_t *emit, mp_uint_t label, mp_uint_t except_depth);
     void (*setup_block)(emit_t *emit, mp_uint_t label, int kind);
     void (*with_cleanup)(emit_t *emit, mp_uint_t label);
+    #if MICROPY_PY_ASYNC_AWAIT
+    void (*async_with_setup_finally)(emit_t *emit, mp_uint_t label_aexit_no_exc, mp_uint_t label_finally_block, mp_uint_t label_ret_unwind_jump);
+    #endif
     void (*end_finally)(emit_t *emit);
     void (*get_iter)(emit_t *emit, bool use_stack);
     void (*for_iter)(emit_t *emit, mp_uint_t label);
@@ -264,6 +267,9 @@ void mp_emit_bc_jump_if_or_pop(emit_t *emit, bool cond, mp_uint_t label);
 void mp_emit_bc_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t except_depth);
 void mp_emit_bc_setup_block(emit_t *emit, mp_uint_t label, int kind);
 void mp_emit_bc_with_cleanup(emit_t *emit, mp_uint_t label);
+#if MICROPY_PY_ASYNC_AWAIT
+void mp_emit_bc_async_with_setup_finally(emit_t *emit, mp_uint_t label_aexit_no_exc, mp_uint_t label_finally_block, mp_uint_t label_ret_unwind_jump);
+#endif
 void mp_emit_bc_end_finally(emit_t *emit);
 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);
diff --git a/py/emitbc.c b/py/emitbc.c
index 05754cfabf65d..f6bb229ba0d87 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -666,6 +666,27 @@ void mp_emit_bc_with_cleanup(emit_t *emit, mp_uint_t label) {
     mp_emit_bc_adjust_stack_size(emit, -4);
 }
 
+#if MICROPY_PY_ASYNC_AWAIT
+void mp_emit_bc_async_with_setup_finally(emit_t *emit, mp_uint_t label_aexit_no_exc, mp_uint_t label_finally_block, mp_uint_t label_ret_unwind_jump) {
+    // The async-with body has executed and no exception was raised, the execution fell through to this point.
+    // Stack: (..., ctx_mgr)
+
+    // Finish async-with body and prepare to enter "finally" block.
+    mp_emit_bc_load_const_tok(emit, MP_TOKEN_KW_NONE); // to tell end_finally there's no exception
+    mp_emit_bc_rot_two(emit);
+    mp_emit_bc_jump(emit, label_aexit_no_exc); // jump to code to call __aexit__
+
+    // Start of "finally" block which is entered via one of: an exception propagating out, a return, an unwind jump.
+    mp_emit_bc_label_assign(emit, label_finally_block);
+
+    // Detect which case we have by the TOS being an exception or not.
+    mp_emit_bc_dup_top(emit);
+    mp_emit_bc_load_global(emit, MP_QSTR_BaseException, MP_EMIT_IDOP_GLOBAL_GLOBAL);
+    mp_emit_bc_binary_op(emit, MP_BINARY_OP_EXCEPTION_MATCH);
+    mp_emit_bc_pop_jump_if(emit, false, label_ret_unwind_jump); // if not an exception then we have return or unwind jump.
+}
+#endif
+
 void mp_emit_bc_end_finally(emit_t *emit) {
     emit_write_bytecode_byte(emit, -1, MP_BC_END_FINALLY);
 }
@@ -862,6 +883,9 @@ const emit_method_table_t emit_bc_method_table = {
     mp_emit_bc_unwind_jump,
     mp_emit_bc_setup_block,
     mp_emit_bc_with_cleanup,
+    #if MICROPY_PY_ASYNC_AWAIT
+    mp_emit_bc_async_with_setup_finally,
+    #endif
     mp_emit_bc_end_finally,
     mp_emit_bc_get_iter,
     mp_emit_bc_for_iter,
diff --git a/py/emitnative.c b/py/emitnative.c
index db31f51e652ca..88ebf0bfcf3de 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1145,7 +1145,7 @@ static void emit_native_label_assign(emit_t *emit, mp_uint_t l) {
     if (is_finally) {
         // Label is at start of finally handler: store TOS into exception slot
         vtype_kind_t vtype;
-        emit_pre_pop_reg(emit, &vtype, REG_TEMP0);
+        emit_access_stack(emit, 1, &vtype, REG_TEMP0);
         ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_TEMP0);
     }
 
@@ -1201,6 +1201,10 @@ static void emit_native_global_exc_entry(emit_t *emit) {
             ASM_XOR_REG_REG(emit->as, REG_TEMP0, REG_TEMP0);
             ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_UNWIND(emit), REG_TEMP0);
 
+            // clear nlr.ret_val, because it's passed to mp_native_raise regardless
+            // of whether there was an exception or not
+            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_TEMP0);
+
             // Put PC of start code block into REG_LOCAL_1
             ASM_MOV_REG_PCREL(emit->as, REG_LOCAL_1, start_label);
 
@@ -2235,8 +2239,34 @@ static void emit_native_with_cleanup(emit_t *emit, mp_uint_t label) {
     emit_native_label_assign(emit, *emit->label_slot + 1);
 
     // Exception is in nlr_buf.ret_val slot
+    adjust_stack(emit, 1);
 }
 
+#if MICROPY_PY_ASYNC_AWAIT
+static void emit_native_async_with_setup_finally(emit_t *emit, mp_uint_t label_aexit_no_exc, mp_uint_t label_finally_block, mp_uint_t label_ret_unwind_jump) {
+    // The async-with body has executed and no exception was raised, the execution fell through to this point.
+    // Stack: (..., ctx_mgr)
+
+    // Insert a dummy value into the stack so the stack has the same layout to execute the code starting at label_aexit_no_exc
+    emit_native_adjust_stack_size(emit, 1); // push dummy value, it won't ever be used
+    emit_native_rot_two(emit);
+    emit_native_load_const_tok(emit, MP_TOKEN_KW_NONE); // to tell end_finally there's no exception
+    emit_native_rot_two(emit);
+    // Stack: (..., <dummy>, None, ctx_mgr)
+    emit_native_jump(emit, label_aexit_no_exc); // jump to code to call __aexit__
+    emit_native_adjust_stack_size(emit, -1);
+
+    // Start of "finally" block which is entered via one of: an exception propagating out, a return, an unwind jump.
+    emit_native_label_assign(emit, label_finally_block);
+
+    // Detect which case we have by the local exception slot holding an exception or not.
+    emit_pre_pop_discard(emit);
+    ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_EXC_VAL(emit)); // get exception
+    emit_post_push_reg(emit, VTYPE_PYOBJ, REG_ARG_1);
+    ASM_JUMP_IF_REG_ZERO(emit->as, REG_ARG_1, label_ret_unwind_jump, false); // if not an exception then we have return or unwind jump.
+}
+#endif
+
 static void emit_native_end_finally(emit_t *emit) {
     // logic:
     //   exc = pop_stack
@@ -2245,7 +2275,7 @@ static void emit_native_end_finally(emit_t *emit) {
     // the check if exc is None is done in the MP_F_NATIVE_RAISE stub
     DEBUG_printf("end_finally\n");
 
-    emit_native_pre(emit);
+    emit_pre_pop_discard(emit);
     ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_EXC_VAL(emit));
     emit_call(emit, MP_F_NATIVE_RAISE);
 
@@ -3033,7 +3063,6 @@ static void emit_native_start_except_handler(emit_t *emit) {
 }
 
 static void emit_native_end_except_handler(emit_t *emit) {
-    adjust_stack(emit, -1); // pop the exception (end_finally didn't use it)
 }
 
 const emit_method_table_t EXPORT_FUN(method_table) = {
@@ -3082,6 +3111,9 @@ const emit_method_table_t EXPORT_FUN(method_table) = {
     emit_native_unwind_jump,
     emit_native_setup_block,
     emit_native_with_cleanup,
+    #if MICROPY_PY_ASYNC_AWAIT
+    emit_native_async_with_setup_finally,
+    #endif
     emit_native_end_finally,
     emit_native_get_iter,
     emit_native_for_iter,
diff --git a/tests/run-tests.py b/tests/run-tests.py
index a551f35c679e3..a6caff7bbd8ea 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -717,9 +717,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     # Remove them from the below when they work
     if args.emit == "native":
         skip_tests.add("basics/gen_yield_from_close.py")  # require raise_varargs
-        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
@@ -731,7 +728,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         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/asyncio_lock.py")  # requires async with
         skip_tests.add("misc/features.py")  # requires raise_varargs
         skip_tests.add(
             "misc/print_exception.py"

From 0619f261a82ead92bbd05ba387ebb3292ae62de9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jun 2024 14:25:18 +1000
Subject: [PATCH 1169/3129] tests/basics: Add tests to test repeated throw into
 the same generator.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/gen_yield_from_throw_repeat.py | 22 +++++++++++++++++++++
 tests/basics/generator_throw_repeat.py      | 16 +++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 tests/basics/gen_yield_from_throw_repeat.py
 create mode 100644 tests/basics/generator_throw_repeat.py

diff --git a/tests/basics/gen_yield_from_throw_repeat.py b/tests/basics/gen_yield_from_throw_repeat.py
new file mode 100644
index 0000000000000..96636a624432e
--- /dev/null
+++ b/tests/basics/gen_yield_from_throw_repeat.py
@@ -0,0 +1,22 @@
+# Test throwing repeatedly into the same generator, where that generator
+# is yielding from another generator.
+
+
+def yielder():
+    yield 4
+    yield 5
+
+
+def gen():
+    while True:
+        try:
+            print("gen received:", (yield from yielder()))
+        except ValueError as exc:
+            print(repr(exc))
+
+
+g = gen()
+for i in range(2):
+    print("send, got:", g.send(None))
+    print("throw, got:", g.throw(ValueError("a", i)))
+    print("throw, got:", g.throw(ValueError("b", i)))
diff --git a/tests/basics/generator_throw_repeat.py b/tests/basics/generator_throw_repeat.py
new file mode 100644
index 0000000000000..6d6ef60a9b0d5
--- /dev/null
+++ b/tests/basics/generator_throw_repeat.py
@@ -0,0 +1,16 @@
+# Test throwing repeatedly into the same generator.
+
+
+def gen():
+    while True:
+        try:
+            print("gen received:", (yield "value"))
+        except ValueError as exc:
+            print(repr(exc))
+
+
+g = gen()
+for i in range(2):
+    print("send, got:", g.send(None))
+    print("throw, got:", g.throw(ValueError("a", i)))
+    print("throw, got:", g.throw(ValueError("b", i)))

From cebc9b0ae2b12c61eac39a3c599edb3b1b65dd54 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Jun 2024 12:11:26 +1000
Subject: [PATCH 1170/3129] tools/mpremote: Fix absolute path usage in remote
 mounted VFS.

Prior to this fix the current working path in the remote VFS would always
be prepended to the requested path to get the full path, even if the
requested path was already absolute, ie starting with "/".

So `os.chdir("/remote/dir1")` would set the working path to "/dir1/", and
a subsequent call with an absolute path like `os.listdir("/remote/dir2")`
would try to list the directory "/dir1/dir2/".

Fixes issue #15308.

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

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 3b4cd00078752..a97b7e0a08264 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -838,6 +838,9 @@ class RemoteFS:
     def __init__(self, cmd):
         self.cmd = cmd
 
+    def _abspath(self, path):
+        return path if path.startswith("/") else self.path + path
+
     def mount(self, readonly, mkfs):
         pass
 
@@ -859,7 +862,7 @@ def getcwd(self):
     def remove(self, path):
         c = self.cmd
         c.begin(CMD_REMOVE)
-        c.wr_str(self.path + path)
+        c.wr_str(self._abspath(path))
         res = c.rd_s32()
         c.end()
         if res < 0:
@@ -868,8 +871,8 @@ def remove(self, path):
     def rename(self, old, new):
         c = self.cmd
         c.begin(CMD_RENAME)
-        c.wr_str(self.path + old)
-        c.wr_str(self.path + new)
+        c.wr_str(self._abspath(old))
+        c.wr_str(self._abspath(new))
         res = c.rd_s32()
         c.end()
         if res < 0:
@@ -878,7 +881,7 @@ def rename(self, old, new):
     def mkdir(self, path):
         c = self.cmd
         c.begin(CMD_MKDIR)
-        c.wr_str(self.path + path)
+        c.wr_str(self._abspath(path))
         res = c.rd_s32()
         c.end()
         if res < 0:
@@ -887,7 +890,7 @@ def mkdir(self, path):
     def rmdir(self, path):
         c = self.cmd
         c.begin(CMD_RMDIR)
-        c.wr_str(self.path + path)
+        c.wr_str(self._abspath(path))
         res = c.rd_s32()
         c.end()
         if res < 0:
@@ -896,7 +899,7 @@ def rmdir(self, path):
     def stat(self, path):
         c = self.cmd
         c.begin(CMD_STAT)
-        c.wr_str(self.path + path)
+        c.wr_str(self._abspath(path))
         res = c.rd_s8()
         if res < 0:
             c.end()
@@ -912,7 +915,7 @@ def stat(self, path):
     def ilistdir(self, path):
         c = self.cmd
         c.begin(CMD_ILISTDIR_START)
-        c.wr_str(self.path + path)
+        c.wr_str(self._abspath(path))
         res = c.rd_s8()
         c.end()
         if res < 0:
@@ -933,7 +936,7 @@ def next():
     def open(self, path, mode):
         c = self.cmd
         c.begin(CMD_OPEN)
-        c.wr_str(self.path + path)
+        c.wr_str(self._abspath(path))
         c.wr_str(mode)
         fd = c.rd_s8()
         c.end()

From d933210d960a6f9337e85753e9568619bbfd54ec Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 16 Apr 2024 17:07:05 +1000
Subject: [PATCH 1171/3129] py/misc: Move mp_clz and mp_ctz intrinsics into
 misc.h.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/asmthumb.c | 18 +-----------------
 py/misc.h     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 0df79e5fd6203..420815e80269a 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -35,23 +35,7 @@
 
 #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
+#include "py/misc.h"
 
 #define UNSIGNED_FIT5(x) ((uint32_t)(x) < 32)
 #define UNSIGNED_FIT7(x) ((uint32_t)(x) < 128)
diff --git a/py/misc.h b/py/misc.h
index eea3e8b0fe7f5..9f8a8c1e13e53 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -334,4 +334,22 @@ typedef const char *mp_rom_error_text_t;
 // For now, forward directly to MP_COMPRESSED_ROM_TEXT.
 #define MP_ERROR_TEXT(x) (mp_rom_error_text_t)MP_COMPRESSED_ROM_TEXT(x)
 
+// Portable implementations of CLZ and CTZ intrinsics
+#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
+
 #endif // MICROPY_INCLUDED_PY_MISC_H

From 908ab1ceca15ee6fd0ef82ca4cba770a3ec41894 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 29 Nov 2023 11:23:16 +1100
Subject: [PATCH 1172/3129] py/objint: Fix int.to_bytes() buffer size checks.

Fixes and improvements to `int.to_bytes()` are:
- No longer overflows if byte size is 0 (closes #13041).
- Raises OverflowError in any case where number won't fit into byte length
  (now matches CPython, previously MicroPython would return a truncated
  bytes object).
- Document that `micropython int.to_bytes()` doesn't implement the optional
  signed kwarg, but will behave as if `signed=True` when the integer is
  negative (this is the current behaviour).  Add tests for this also.

Requires changes for small ints, MPZ large ints, and "long long" large
ints.

Adds a new set of unit tests for ints between 32 and 64 bits to increase
coverage of "long long" large ints, which are otherwise untested.

Tested on unix port (64 bit small ints, MPZ long ints) and Zephyr STM32WB
board (32 bit small ints, long long large ints).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/builtins.rst           |  4 ++
 py/misc.h                           | 33 +++++++++++++
 py/mpz.c                            | 32 ++++++++-----
 py/mpz.h                            |  9 ++--
 py/objint.c                         | 37 +++++++++++----
 py/objint.h                         |  3 +-
 py/objint_longlong.c                | 20 +++++++-
 py/objint_mpz.c                     |  4 +-
 tests/basics/int_bytes.py           | 73 +++++++++++++++++++++++++++++
 tests/basics/int_bytes_int64.py     | 52 ++++++++++++++++++++
 tests/basics/int_bytes_intbig.py    | 48 +++++++++++++++++++
 tests/cpydiff/types_int_to_bytes.py | 16 +++++++
 12 files changed, 302 insertions(+), 29 deletions(-)
 create mode 100644 tests/basics/int_bytes_int64.py
 create mode 100644 tests/cpydiff/types_int_to_bytes.py

diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 7a0229c2aaaf6..e489375b1f917 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -82,6 +82,10 @@ Functions and types
       In MicroPython, `byteorder` parameter must be positional (this is
       compatible with CPython).
 
+      .. note:: The optional ``signed`` kwarg from CPython is not supported.
+                MicroPython currently converts negative integers as signed,
+                and positive as unsigned. (:ref:`Details <cpydiff_types_int_to_bytes>`.)
+
 .. function:: isinstance()
 
 .. function:: issubclass()
diff --git a/py/misc.h b/py/misc.h
index 9f8a8c1e13e53..cf1810d4e784b 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -343,13 +343,46 @@ static uint32_t mp_clz(uint32_t x) {
     return _BitScanReverse(&lz, x) ? (sizeof(x) * 8 - 1) - lz : 0;
 }
 
+static uint32_t mp_clzl(unsigned long x) {
+    unsigned long lz = 0;
+    return _BitScanReverse(&lz, x) ? (sizeof(x) * 8 - 1) - lz : 0;
+}
+
+#ifdef _WIN64
+static uint32_t mp_clzll(unsigned long long x) {
+    unsigned long lz = 0;
+    return _BitScanReverse64(&lz, x) ? (sizeof(x) * 8 - 1) - lz : 0;
+}
+#else
+// Microsoft don't ship _BitScanReverse64 on Win32, so emulate it
+static uint32_t mp_clzll(unsigned long long x) {
+    unsigned long h = x >> 32;
+    return h ? mp_clzl(h) : (mp_clzl(x) + 32);
+}
+#endif
+
 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_clzl(x) __builtin_clzl(x)
+#define mp_clzll(x) __builtin_clzll(x)
 #define mp_ctz(x) __builtin_ctz(x)
 #endif
 
+// mp_int_t can be larger than long, i.e. Windows 64-bit, nan-box variants
+static inline uint32_t mp_clz_mpi(mp_int_t x) {
+    MP_STATIC_ASSERT(sizeof(mp_int_t) == sizeof(long long)
+        || sizeof(mp_int_t) == sizeof(long));
+
+    // ugly, but should compile to single intrinsic unless O0 is set
+    if (sizeof(mp_int_t) == sizeof(long)) {
+        return mp_clzl(x);
+    } else {
+        return mp_clzll(x);
+    }
+}
+
 #endif // MICROPY_INCLUDED_PY_MISC_H
diff --git a/py/mpz.c b/py/mpz.c
index 502d4e1c138f0..750664ad9aaf8 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -1589,7 +1589,7 @@ bool mpz_as_uint_checked(const mpz_t *i, mp_uint_t *value) {
     return true;
 }
 
-void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf) {
+bool mpz_as_bytes(const mpz_t *z, bool big_endian, bool as_signed, size_t len, byte *buf) {
     byte *b = buf;
     if (big_endian) {
         b += len;
@@ -1598,6 +1598,8 @@ void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf) {
     int bits = 0;
     mpz_dbl_dig_t d = 0;
     mpz_dbl_dig_t carry = 1;
+    size_t olen = len; // bytes in output buffer
+    bool ok = true;
     for (size_t zlen = z->len; zlen > 0; --zlen) {
         bits += DIG_SIZE;
         d = (d << DIG_SIZE) | *zdig++;
@@ -1607,28 +1609,32 @@ void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf) {
                 val = (~val & 0xff) + carry;
                 carry = val >> 8;
             }
+
+            if (!olen) {
+                // Buffer is full, only OK if all remaining bytes are zeroes
+                ok = ok && ((byte)val == 0);
+                continue;
+            }
+
             if (big_endian) {
                 *--b = val;
-                if (b == buf) {
-                    return;
-                }
             } else {
                 *b++ = val;
-                if (b == buf + len) {
-                    return;
-                }
             }
+            olen--;
         }
     }
 
-    // fill remainder of buf with zero/sign extension of the integer
-    if (big_endian) {
-        len = b - buf;
+    if (as_signed && olen == 0 && len > 0) {
+        // If output exhausted then ensure there was enough space for the sign bit
+        byte most_sig = big_endian ? buf[0] : buf[len - 1];
+        ok = ok && (bool)(most_sig & 0x80) == (bool)z->neg;
     } else {
-        len = buf + len - b;
-        buf = b;
+        // fill remainder of buf with zero/sign extension of the integer
+        memset(big_endian ? buf : b, z->neg ? 0xff : 0x00, olen);
     }
-    memset(buf, z->neg ? 0xff : 0x00, len);
+
+    return ok;
 }
 
 #if MICROPY_PY_BUILTINS_FLOAT
diff --git a/py/mpz.h b/py/mpz.h
index d27f5724047ae..6f1ac930b0214 100644
--- a/py/mpz.h
+++ b/py/mpz.h
@@ -93,9 +93,9 @@ typedef int8_t mpz_dbl_dig_signed_t;
 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);
-    size_t len;
+    size_t fixed_dig : 1; // flag, 'dig' buffer cannot be reallocated
+    size_t alloc : (8 * sizeof(size_t) - 2); // number of entries allocated in 'dig'
+    size_t len; // number of entries used in 'dig'
     mpz_dig_t *dig;
 } mpz_t;
 
@@ -145,7 +145,8 @@ static inline size_t mpz_max_num_bits(const mpz_t *z) {
 mp_int_t mpz_hash(const mpz_t *z);
 bool mpz_as_int_checked(const mpz_t *z, mp_int_t *value);
 bool mpz_as_uint_checked(const mpz_t *z, mp_uint_t *value);
-void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf);
+// Returns true if 'z' fit into 'len' bytes of 'buf' without overflowing, 'buf' is truncated otherwise.
+bool mpz_as_bytes(const mpz_t *z, bool big_endian, bool as_signed, size_t len, byte *buf);
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mpz_as_float(const mpz_t *z);
 #endif
diff --git a/py/objint.c b/py/objint.c
index 6caa608f33035..467a4714ef197 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -421,29 +421,50 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 3, 4, int_fro
 static MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_bytes_fun_obj));
 
 static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
-    // TODO: Support signed param (assumes signed=False)
+    // TODO: Support signed (currently behaves as if signed=(val < 0))
     (void)n_args;
+    bool overflow;
 
-    mp_int_t len = mp_obj_get_int(args[1]);
-    if (len < 0) {
+    mp_int_t dlen = mp_obj_get_int(args[1]);
+    if (dlen < 0) {
         mp_raise_ValueError(NULL);
     }
     bool big_endian = args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little);
 
     vstr_t vstr;
-    vstr_init_len(&vstr, len);
+    vstr_init_len(&vstr, dlen);
     byte *data = (byte *)vstr.buf;
-    memset(data, 0, len);
 
     #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
     if (!mp_obj_is_small_int(args[0])) {
-        mp_obj_int_to_bytes_impl(args[0], big_endian, len, data);
+        overflow = !mp_obj_int_to_bytes_impl(args[0], big_endian, dlen, data);
     } else
     #endif
     {
         mp_int_t val = MP_OBJ_SMALL_INT_VALUE(args[0]);
-        size_t l = MIN((size_t)len, sizeof(val));
-        mp_binary_set_int(l, big_endian, data + (big_endian ? (len - l) : 0), val);
+        int slen = 0;  // Number of bytes to represent val
+
+        // This logic has a twin in objint_longlong.c
+        if (val > 0) {
+            slen = (sizeof(mp_int_t) * 8 - mp_clz_mpi(val) + 7) / 8;
+        } else if (val < -1) {
+            slen = (sizeof(mp_int_t) * 8 - mp_clz_mpi(~val) + 8) / 8;
+        } else {
+            // clz of 0 is defined, so 0 and -1 map to 0 and 1
+            slen = -val;
+        }
+
+        if (slen <= dlen) {
+            memset(data, val < 0 ? 0xFF : 0x00, dlen);
+            mp_binary_set_int(slen, big_endian, data + (big_endian ? (dlen - slen) : 0), val);
+            overflow = false;
+        } else {
+            overflow = true;
+        }
+    }
+
+    if (overflow) {
+        mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("buffer too small"));
     }
 
     return mp_obj_new_bytes_from_vstr(&vstr);
diff --git a/py/objint.h b/py/objint.h
index 5eed87705dedb..28930e35adb49 100644
--- a/py/objint.h
+++ b/py/objint.h
@@ -55,7 +55,8 @@ char *mp_obj_int_formatted_impl(char **buf, size_t *buf_size, size_t *fmt_size,
     int base, const char *prefix, char base_char, char comma);
 mp_int_t mp_obj_int_hash(mp_obj_t self_in);
 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);
+// Returns true if 'self_in' fit into 'len' bytes of 'buf' without overflowing, 'buf' is truncated otherwise.
+bool mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf);
 int mp_obj_int_sign(mp_obj_t self_in);
 mp_obj_t mp_obj_int_unary_op(mp_unary_op_t op, mp_obj_t o_in);
 mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in);
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index ee499e0265b32..00fe5636c1607 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -57,10 +57,27 @@ mp_obj_t mp_obj_int_from_bytes_impl(bool big_endian, size_t len, const byte *buf
     return mp_obj_new_int_from_ll(value);
 }
 
-void mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf) {
+bool mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf) {
     assert(mp_obj_is_exact_type(self_in, &mp_type_int));
     mp_obj_int_t *self = self_in;
     long long val = self->val;
+    size_t slen; // Number of bytes to represent val
+
+    // This logic has a twin in objint.c
+    if (val > 0) {
+        slen = (sizeof(long long) * 8 - mp_clzll(val) + 7) / 8;
+    } else if (val < -1) {
+        slen = (sizeof(long long) * 8 - mp_clzll(~val) + 8) / 8;
+    } else {
+        // clz of 0 is defined, so 0 and -1 map to 0 and 1
+        slen = -val;
+    }
+
+    if (slen > len) {
+        return false; // Would overflow
+        // TODO: Determine whether to copy and truncate, as some callers probably expect this...?
+    }
+
     if (big_endian) {
         byte *b = buf + len;
         while (b > buf) {
@@ -73,6 +90,7 @@ void mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byt
             val >>= 8;
         }
     }
+    return true;
 }
 
 int mp_obj_int_sign(mp_obj_t self_in) {
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 600316a42abba..4a1a685bbd42e 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -112,10 +112,10 @@ mp_obj_t mp_obj_int_from_bytes_impl(bool big_endian, size_t len, const byte *buf
     return MP_OBJ_FROM_PTR(o);
 }
 
-void mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf) {
+bool mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf) {
     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);
+    return mpz_as_bytes(&self->mpz, big_endian, self->mpz.neg, len, buf);
 }
 
 int mp_obj_int_sign(mp_obj_t self_in) {
diff --git a/tests/basics/int_bytes.py b/tests/basics/int_bytes.py
index d1837ea75ca4a..15c12640e951b 100644
--- a/tests/basics/int_bytes.py
+++ b/tests/basics/int_bytes.py
@@ -1,3 +1,5 @@
+import sys
+
 print((10).to_bytes(1, "little"))
 print((111111).to_bytes(4, "little"))
 print((100).to_bytes(10, "little"))
@@ -20,3 +22,74 @@
     (1).to_bytes(-1, "little")
 except ValueError:
     print("ValueError")
+
+# zero byte destination should also raise an error
+try:
+    (1).to_bytes(0, "little")
+except OverflowError:
+    print("OverflowError")
+
+# except for converting 0 to a zero-length byte array
+print((0).to_bytes(0, "big"))
+
+# byte length can fit the integer directly
+print((0xFF).to_bytes(1, "little"))
+print((0xFF).to_bytes(1, "big"))
+print((0xEFF).to_bytes(2, "little"))
+print((0xEFF).to_bytes(2, "big"))
+print((0xCDEFF).to_bytes(3, "little"))
+print((0xCDEFF).to_bytes(3, "big"))
+
+# OverFlowError if not big enough
+
+try:
+    (0x123).to_bytes(1, "big")
+except OverflowError:
+    print("OverflowError")
+
+try:
+    (0x12345).to_bytes(2, "big")
+except OverflowError:
+    print("OverflowError")
+
+try:
+    (0x1234567).to_bytes(3, "big")
+except OverflowError:
+    print("OverflowError")
+
+
+# negative representations
+
+# MicroPython int.to_bytes() behaves as if signed=True for negative numbers
+if "micropython" in repr(sys.implementation):
+
+    def to_bytes_compat(i, l, e):
+        return i.to_bytes(l, e)
+else:
+    # Implement MicroPython compatible behaviour for CPython
+    def to_bytes_compat(i, l, e):
+        return i.to_bytes(l, e, signed=i < 0)
+
+
+print(to_bytes_compat(-1, 1, "little"))
+print(to_bytes_compat(-1, 3, "little"))
+print(to_bytes_compat(-1, 1, "big"))
+print(to_bytes_compat(-1, 3, "big"))
+print(to_bytes_compat(-128, 1, "big"))
+print(to_bytes_compat(-32768, 2, "big"))
+print(to_bytes_compat(-(1 << 23), 3, "big"))
+
+try:
+    print(to_bytes_compat(-129, 1, "big"))
+except OverflowError:
+    print("OverflowError")
+
+try:
+    print(to_bytes_compat(-32769, 2, "big"))
+except OverflowError:
+    print("OverflowError")
+
+try:
+    print(to_bytes_compat(-(1 << 23) - 1, 2, "big"))
+except OverflowError:
+    print("OverflowError")
diff --git a/tests/basics/int_bytes_int64.py b/tests/basics/int_bytes_int64.py
new file mode 100644
index 0000000000000..032dbccc5b14e
--- /dev/null
+++ b/tests/basics/int_bytes_int64.py
@@ -0,0 +1,52 @@
+import sys
+
+# Depending on the port, the numbers in this test may be implemented as "small"
+# native 64 bit ints, arbitrary precision large ints, or large integers using 64-bit
+# long longs.
+
+try:
+    x = int.from_bytes(b"\x6F\xAB\xCD\x12\x34\x56\x78\xFB", "big")
+except OverflowError:
+    print("SKIP")  # Port can't represent this size of integer at all
+    raise SystemExit
+
+print(hex(x))
+b = x.to_bytes(8, "little")
+print(b)
+print(x.to_bytes(8, "big"))
+
+# padding in output
+print(x.to_bytes(20, "little"))
+print(x.to_bytes(20, "big"))
+
+# check that extra zero bytes don't change the internal int value
+print(int.from_bytes(b + bytes(10), "little") == x)
+
+# can't write to a zero-length bytes object
+try:
+    x.to_bytes(0, "little")
+except OverflowError:
+    print("OverflowError")
+
+# or one that it too short
+try:
+    x.to_bytes(7, "big")
+except OverflowError:
+    print("OverflowError")
+
+# negative representations
+
+# MicroPython int.to_bytes() behaves as if signed=True for negative numbers
+if "micropython" in repr(sys.implementation):
+
+    def to_bytes_compat(i, l, e):
+        return i.to_bytes(l, e)
+else:
+    # Implement MicroPython compatible behaviour for CPython
+    def to_bytes_compat(i, l, e):
+        return i.to_bytes(l, e, signed=i < 0)
+
+
+print(to_bytes_compat(-x, 8, "little"))
+print(to_bytes_compat(-x, 20, "big"))
+print(to_bytes_compat(-x, 20, "little"))
diff --git a/tests/basics/int_bytes_intbig.py b/tests/basics/int_bytes_intbig.py
index 147362bef1378..13cf5d0085890 100644
--- a/tests/basics/int_bytes_intbig.py
+++ b/tests/basics/int_bytes_intbig.py
@@ -1,3 +1,5 @@
+import sys
+
 print((2**64).to_bytes(9, "little"))
 print((2**64).to_bytes(9, "big"))
 
@@ -10,5 +12,51 @@
 print(il.to_bytes(20, "little"))
 print(ib.to_bytes(20, "big"))
 
+# check padding comes out correctly
+print(il.to_bytes(40, "little"))
+print(ib.to_bytes(40, "big"))
+
 # check that extra zero bytes don't change the internal int value
 print(int.from_bytes(b + bytes(10), "little") == int.from_bytes(b, "little"))
+
+# can't write to a zero-length bytes object
+try:
+    ib.to_bytes(0, "little")
+except OverflowError:
+    print("OverflowError")
+
+# or one that it too short
+try:
+    ib.to_bytes(18, "big")
+except OverflowError:
+    print("OverflowError")
+
+# negative representations
+
+# MicroPython int.to_bytes() behaves as if signed=True for negative numbers
+if "micropython" in repr(sys.implementation):
+
+    def to_bytes_compat(i, l, e):
+        return i.to_bytes(l, e)
+else:
+    # Implement MicroPython compatible behaviour for CPython
+    def to_bytes_compat(i, l, e):
+        return i.to_bytes(l, e, signed=i < 0)
+
+
+print(to_bytes_compat(-ib, 20, "big"))
+print(to_bytes_compat(ib * -ib, 40, "big"))
+
+# case where an additional byte is needed for sign bit
+ib = (2**64) - 1
+print(ib.to_bytes(8, "little"))
+
+ib *= -1
+
+try:
+    print(to_bytes_compat(ib, 8, "little"))
+except OverflowError:
+    print("OverflowError")
+
+print(to_bytes_compat(ib, 9, "little"))
+print(to_bytes_compat(ib, 9, "big"))
diff --git a/tests/cpydiff/types_int_to_bytes.py b/tests/cpydiff/types_int_to_bytes.py
new file mode 100644
index 0000000000000..6530a2a32ecb7
--- /dev/null
+++ b/tests/cpydiff/types_int_to_bytes.py
@@ -0,0 +1,16 @@
+"""
+categories: Types,int
+description: ``to_bytes`` method doesn't implement signed parameter.
+cause: The ``signed`` keyword-only parameter is not implemented for ``int.to_bytes()``.
+
+When the integer is negative, MicroPython behaves the same as CPython ``int.to_bytes(..., signed=True)``
+
+When the integer is non-negative, MicroPython behaves the same as CPython ``int.to_bytes(..., signed=False)``.
+
+(The difference is subtle, but in CPython a positive integer converted with ``signed=True`` may require one byte more in the output length, in order to fit the 0 sign bit.)
+
+workaround: Take care when calling ``to_bytes()`` on an integer value which may be negative.
+"""
+
+x = -1
+print(x.to_bytes(1, "big"))

From cfa55b4ca1e24dc60dadc839c49fcee475cd40ef Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Jun 2024 17:19:10 +1000
Subject: [PATCH 1173/3129] rp2: Fix recursive atomic sections when core1 is
 active.

mp_thread_begin_atomic_section() is expected to be recursive (i.e. for
nested machine.disable_irq() calls, or if Python code calls disable_irq()
and then the Python runtime calls mp_handle_pending() which also enters an
atomic section to check the scheduler state).

On rp2 when not using core1 the atomic sections are recursive.

However when core1 was active (i.e. _thread) then there was a bug that
caused the core to live-lock if an atomic section recursed.

Adds a test case specifically for mutual exclusion and recursive atomic
sections when using two threads. Without this fix the test immediately
hangs on rp2.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mpthreadport.c        |  8 +++---
 ports/rp2/mutex_extra.c         | 13 ++++++---
 ports/rp2/mutex_extra.h         |  4 +--
 tests/thread/disable_irq.py     | 51 +++++++++++++++++++++++++++++++++
 tests/thread/disable_irq.py.exp |  2 ++
 5 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 tests/thread/disable_irq.py
 create mode 100644 tests/thread/disable_irq.py.exp

diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 8d8f13a089059..5b8e804f95fd8 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -46,13 +46,13 @@ static uint32_t *core1_stack = NULL;
 static size_t core1_stack_num_words = 0;
 
 // Thread mutex.
-static mutex_t atomic_mutex;
+static recursive_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.
-        return mutex_enter_blocking_and_disable_interrupts(&atomic_mutex);
+        return recursive_mutex_enter_blocking_and_disable_interrupts(&atomic_mutex);
     } else {
         return save_and_disable_interrupts();
     }
@@ -60,7 +60,7 @@ uint32_t mp_thread_begin_atomic_section(void) {
 
 void mp_thread_end_atomic_section(uint32_t state) {
     if (atomic_mutex.owner != LOCK_INVALID_OWNER_ID) {
-        mutex_exit_and_restore_interrupts(&atomic_mutex, state);
+        recursive_mutex_exit_and_restore_interrupts(&atomic_mutex, state);
     } else {
         restore_interrupts(state);
     }
@@ -70,7 +70,7 @@ void mp_thread_end_atomic_section(uint32_t state) {
 void mp_thread_init(void) {
     assert(get_core_num() == 0);
 
-    mutex_init(&atomic_mutex);
+    recursive_mutex_init(&atomic_mutex);
 
     // Allow MICROPY_BEGIN_ATOMIC_SECTION to be invoked from core1.
     multicore_lockout_victim_init();
diff --git a/ports/rp2/mutex_extra.c b/ports/rp2/mutex_extra.c
index 6df57e64ce50f..7a70a40acc13d 100644
--- a/ports/rp2/mutex_extra.c
+++ b/ports/rp2/mutex_extra.c
@@ -9,22 +9,27 @@
 // These functions are taken from lib/pico-sdk/src/common/pico_sync/mutex.c and modified
 // so that they atomically obtain the mutex and disable interrupts.
 
-uint32_t __time_critical_func(mutex_enter_blocking_and_disable_interrupts)(mutex_t * mtx) {
+uint32_t __time_critical_func(recursive_mutex_enter_blocking_and_disable_interrupts)(recursive_mutex_t * mtx) {
     lock_owner_id_t caller = lock_get_caller_owner_id();
     do {
         uint32_t save = spin_lock_blocking(mtx->core.spin_lock);
-        if (!lock_is_owner_id_valid(mtx->owner)) {
+        if (mtx->owner == caller || !lock_is_owner_id_valid(mtx->owner)) {
             mtx->owner = caller;
+            uint __unused total = ++mtx->enter_count;
             spin_unlock_unsafe(mtx->core.spin_lock);
+            assert(total); // check for overflow
             return save;
         }
         lock_internal_spin_unlock_with_wait(&mtx->core, save);
     } while (true);
 }
 
-void __time_critical_func(mutex_exit_and_restore_interrupts)(mutex_t * mtx, uint32_t save) {
+void __time_critical_func(recursive_mutex_exit_and_restore_interrupts)(recursive_mutex_t * mtx, uint32_t save) {
     spin_lock_unsafe_blocking(mtx->core.spin_lock);
     assert(lock_is_owner_id_valid(mtx->owner));
-    mtx->owner = LOCK_INVALID_OWNER_ID;
+    assert(mtx->enter_count);
+    if (!--mtx->enter_count) {
+        mtx->owner = LOCK_INVALID_OWNER_ID;
+    }
     lock_internal_spin_unlock_with_notify(&mtx->core, save);
 }
diff --git a/ports/rp2/mutex_extra.h b/ports/rp2/mutex_extra.h
index be7cb96dcc53d..61b6b40355f8d 100644
--- a/ports/rp2/mutex_extra.h
+++ b/ports/rp2/mutex_extra.h
@@ -28,7 +28,7 @@
 
 #include "pico/mutex.h"
 
-uint32_t mutex_enter_blocking_and_disable_interrupts(mutex_t *mtx);
-void mutex_exit_and_restore_interrupts(mutex_t *mtx, uint32_t save);
+uint32_t recursive_mutex_enter_blocking_and_disable_interrupts(recursive_mutex_t *mtx);
+void recursive_mutex_exit_and_restore_interrupts(recursive_mutex_t *mtx, uint32_t save);
 
 #endif // MICROPY_INCLUDED_RP2_MUTEX_EXTRA_H
diff --git a/tests/thread/disable_irq.py b/tests/thread/disable_irq.py
new file mode 100644
index 0000000000000..3f1ac74f30877
--- /dev/null
+++ b/tests/thread/disable_irq.py
@@ -0,0 +1,51 @@
+# Ensure that disabling IRQs creates mutual exclusion between threads
+# (also tests nesting of disable_irq across threads)
+import machine
+import time
+import _thread
+
+if not hasattr(machine, "disable_irq"):
+    print("SKIP")
+    raise SystemExit
+
+count = 0
+thread_done = False
+
+
+def inc_count():
+    global count
+    a = machine.disable_irq()
+    try:
+        count += 1
+        i = 0
+        while i < 20:
+            b = machine.disable_irq()
+            try:
+                count += 1
+                count -= 1
+                i += 1
+            finally:
+                machine.enable_irq(b)
+    finally:
+        machine.enable_irq(a)
+
+
+def inc_count_multiple(times):
+    for _ in range(times):
+        inc_count()
+
+
+def thread_entry(inc_times):
+    global thread_done
+    inc_count_multiple(inc_times)
+    thread_done = True
+
+
+_thread.start_new_thread(thread_entry, (1000,))
+inc_count_multiple(1000)
+
+time.sleep(1)
+
+print("count", count, thread_done)
+if count == 2000:
+    print("PASS")
diff --git a/tests/thread/disable_irq.py.exp b/tests/thread/disable_irq.py.exp
new file mode 100644
index 0000000000000..2174b91d0d044
--- /dev/null
+++ b/tests/thread/disable_irq.py.exp
@@ -0,0 +1,2 @@
+count 2000 True
+PASS

From 5dcffb53ab953e8264be33e7cb56280b7e20c345 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 25 Jun 2024 16:19:15 +1000
Subject: [PATCH 1174/3129] rp2/clocks_extra: Implement custom clocks_init
 function.

Adapts pico-sdk clocks_init() into clocks_init_optional_usb() which takes
an argument to initialise USB clocks or not.

To avoid a code size increase the SDK clocks_init() function is linker
wrapped to become clocks_init_optional_usb(true).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 LICENSE                  |   1 +
 ports/rp2/CMakeLists.txt |   2 +
 ports/rp2/clocks_extra.c | 102 +++++++++++++++++++++++++++++++++++++++
 ports/rp2/clocks_extra.h |  33 +++++++++++++
 4 files changed, 138 insertions(+)
 create mode 100644 ports/rp2/clocks_extra.c
 create mode 100644 ports/rp2/clocks_extra.h

diff --git a/LICENSE b/LICENSE
index 469ae1927396d..341698fa49a42 100644
--- a/LICENSE
+++ b/LICENSE
@@ -73,6 +73,7 @@ used during the build process and is not part of the compiled source code.
             /ppp_set_auth.* (Apache-2.0)
         /rp2
             /mutex_extra.c (BSD-3-clause)
+            /clocks_extra.c (BSD-3-clause)
         /stm32
             /usbd*.c (MCD-ST Liberty SW License Agreement V2)
             /stm32_it.* (MIT + BSD-3-clause)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index d3ecee586054c..8f5680092c925 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -117,6 +117,7 @@ set(MICROPY_SOURCE_DRIVERS
 )
 
 set(MICROPY_SOURCE_PORT
+    clocks_extra.c
     fatfs_port.c
     help.c
     machine_bitstream.c
@@ -453,6 +454,7 @@ target_compile_options(${MICROPY_TARGET} PRIVATE
 target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}
     -Wl,--wrap=dcd_event_handler
+    -Wl,--wrap=clocks_init
 )
 
 # Apply optimisations to performance-critical source code.
diff --git a/ports/rp2/clocks_extra.c b/ports/rp2/clocks_extra.c
new file mode 100644
index 0000000000000..e2c97962cb43d
--- /dev/null
+++ b/ports/rp2/clocks_extra.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include "pico.h"
+#include "clocks_extra.h"
+#include "hardware/regs/clocks.h"
+#include "hardware/platform_defs.h"
+#include "hardware/clocks.h"
+#include "hardware/watchdog.h"
+#include "hardware/pll.h"
+#include "hardware/xosc.h"
+#include "hardware/irq.h"
+#include "hardware/gpio.h"
+
+#define RTC_CLOCK_FREQ_HZ       (USB_CLK_KHZ * KHZ / 1024)
+
+// Wrap the SDK's clocks_init() function to save code size
+void __wrap_clocks_init(void) {
+    clocks_init_optional_usb(true);
+}
+
+// Copy of clocks_init() from pico-sdk, with USB
+// PLL and clock init made optional (for light sleep wakeup).
+void clocks_init_optional_usb(bool init_usb) {
+    // Start tick in watchdog, the argument is in 'cycles per microsecond' i.e. MHz
+    watchdog_start_tick(XOSC_KHZ / KHZ);
+
+    // Modification: removed FPGA check here
+
+    // Disable resus that may be enabled from previous software
+    clocks_hw->resus.ctrl = 0;
+
+    // Enable the xosc
+    xosc_init();
+
+    // Before we touch PLLs, switch sys and ref cleanly away from their aux sources.
+    hw_clear_bits(&clocks_hw->clk[clk_sys].ctrl, CLOCKS_CLK_SYS_CTRL_SRC_BITS);
+    while (clocks_hw->clk[clk_sys].selected != 0x1) {
+        tight_loop_contents();
+    }
+    hw_clear_bits(&clocks_hw->clk[clk_ref].ctrl, CLOCKS_CLK_REF_CTRL_SRC_BITS);
+    while (clocks_hw->clk[clk_ref].selected != 0x1) {
+        tight_loop_contents();
+    }
+
+    /// \tag::pll_init[]
+    pll_init(pll_sys, PLL_COMMON_REFDIV, PLL_SYS_VCO_FREQ_KHZ * KHZ, PLL_SYS_POSTDIV1, PLL_SYS_POSTDIV2);
+    if (init_usb) {
+        pll_init(pll_usb, PLL_COMMON_REFDIV, PLL_USB_VCO_FREQ_KHZ * KHZ, PLL_USB_POSTDIV1, PLL_USB_POSTDIV2);
+    }
+    /// \end::pll_init[]
+
+    // Configure clocks
+    // CLK_REF = XOSC (usually) 12MHz / 1 = 12MHz
+    clock_configure(clk_ref,
+        CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC,
+        0,             // No aux mux
+        XOSC_KHZ * KHZ,
+        XOSC_KHZ * KHZ);
+
+    /// \tag::configure_clk_sys[]
+    // CLK SYS = PLL SYS (usually) 125MHz / 1 = 125MHz
+    clock_configure(clk_sys,
+        CLOCKS_CLK_SYS_CTRL_SRC_VALUE_CLKSRC_CLK_SYS_AUX,
+        CLOCKS_CLK_SYS_CTRL_AUXSRC_VALUE_CLKSRC_PLL_SYS,
+        SYS_CLK_KHZ * KHZ,
+        SYS_CLK_KHZ * KHZ);
+    /// \end::configure_clk_sys[]
+
+    if (init_usb) {
+        // CLK USB = PLL USB 48MHz / 1 = 48MHz
+        clock_configure(clk_usb,
+            0, // No GLMUX
+            CLOCKS_CLK_USB_CTRL_AUXSRC_VALUE_CLKSRC_PLL_USB,
+            USB_CLK_KHZ * KHZ,
+            USB_CLK_KHZ * KHZ);
+    }
+
+    // CLK ADC = PLL USB 48MHZ / 1 = 48MHz
+    clock_configure(clk_adc,
+        0,             // No GLMUX
+        CLOCKS_CLK_ADC_CTRL_AUXSRC_VALUE_CLKSRC_PLL_USB,
+        USB_CLK_KHZ * KHZ,
+        USB_CLK_KHZ * KHZ);
+
+    // CLK RTC = PLL USB 48MHz / 1024 = 46875Hz
+    clock_configure(clk_rtc,
+        0,             // No GLMUX
+        CLOCKS_CLK_RTC_CTRL_AUXSRC_VALUE_CLKSRC_PLL_USB,
+        USB_CLK_KHZ * KHZ,
+        RTC_CLOCK_FREQ_HZ);
+
+    // CLK PERI = clk_sys. Used as reference clock for Peripherals. No dividers so just select and enable
+    // Normally choose clk_sys or clk_usb
+    clock_configure(clk_peri,
+        0,
+        CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS,
+        SYS_CLK_KHZ * KHZ,
+        SYS_CLK_KHZ * KHZ);
+}
diff --git a/ports/rp2/clocks_extra.h b/ports/rp2/clocks_extra.h
new file mode 100644
index 0000000000000..40f77f53bd850
--- /dev/null
+++ b/ports/rp2/clocks_extra.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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_RP2_CLOCKS_EXTRA_H
+#define MICROPY_INCLUDED_RP2_CLOCKS_EXTRA_H
+
+#include "hardware/clocks.h"
+
+void clocks_init_optional_usb(bool init_usb);
+
+#endif // MICROPY_INCLUDED_RP2_CLOCKS_EXTRA_H

From 068d9bf2cfa9110ae44008da45bfd0419cb45b52 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 25 Jun 2024 16:20:59 +1000
Subject: [PATCH 1175/3129] rp2: Fix USB PLL glitch during wake from light
 sleep.

Follow-up to a84c7a0ed93, this commit works most of the time but has an
intermittent bug where USB doesn't resume as expected after waking from
light sleep.

Turns out waking calls clocks_init() which will re-initialise the USB PLL.
Most of the time this is OK but occasionally it seems like the clock
glitches the USB peripheral and it stops working until the next hard reset.

Adds a machine.lightsleep() test that consistently hangs in the first
two dozen iterations on rp2 without this fix. Passed over 100 times in a
row with this fix.

The test is currently rp2-only as it seems similar lightsleep USB issues
exist on other ports (both pyboard and ESP32-S3 native USB don't send any
data to the host after waking, until they receive something from the host
first.)

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/modmachine.c                |  4 ++--
 tests/ports/rp2/rp2_lightsleep.py     | 31 +++++++++++++++++++++++++++
 tests/ports/rp2/rp2_lightsleep.py.exp |  2 ++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/ports/rp2/rp2_lightsleep.py
 create mode 100644 tests/ports/rp2/rp2_lightsleep.py.exp

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 4eebb3d16c64e..9cc15080cdad0 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -31,7 +31,7 @@
 #include "mp_usbd.h"
 #include "modmachine.h"
 #include "uart.h"
-#include "hardware/clocks.h"
+#include "clocks_extra.h"
 #include "hardware/pll.h"
 #include "hardware/structs/rosc.h"
 #include "hardware/structs/scb.h"
@@ -213,7 +213,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_ENABLE << ROSC_CTRL_ENABLE_LSB;
 
     // Bring back all clocks.
-    clocks_init();
+    clocks_init_optional_usb(disable_usb);
     MICROPY_END_ATOMIC_SECTION(my_interrupts);
 }
 
diff --git a/tests/ports/rp2/rp2_lightsleep.py b/tests/ports/rp2/rp2_lightsleep.py
new file mode 100644
index 0000000000000..3587def68fcd8
--- /dev/null
+++ b/tests/ports/rp2/rp2_lightsleep.py
@@ -0,0 +1,31 @@
+# This test is mostly intended for ensuring USB serial stays stable over
+# lightsleep, but can double as a general lightsleep test.
+#
+# In theory this should run on any port, but native USB REPL doesn't currently
+# recover automatically on all ports. On pyboard and ESP32-S3 the host needs to
+# send something to the port before it responds again. Possibly the same for other
+# ports with native USB.
+#
+# A range of sleep periods (1 to 512ms) are tested. The total nominal sleep time
+# is 10.23 seconds, but on most ports this will finish much earlier as interrupts
+# happen before each timeout expires.
+try:
+    from machine import lightsleep, Pin
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+from sys import stdout, platform
+
+try:
+    led = Pin(Pin.board.LED, Pin.OUT)
+except AttributeError:
+    led = None
+
+for n in range(100):
+    if led:
+        led.toggle()
+    stdout.write(chr(ord("a") + (n % 26)))
+    lightsleep(2 ** (n % 10))
+
+print("\nDONE")
diff --git a/tests/ports/rp2/rp2_lightsleep.py.exp b/tests/ports/rp2/rp2_lightsleep.py.exp
new file mode 100644
index 0000000000000..81d1c231c9a5e
--- /dev/null
+++ b/tests/ports/rp2/rp2_lightsleep.py.exp
@@ -0,0 +1,2 @@
+abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv
+DONE

From f60c71d131db76b4d6a0fe465afe7783a65ab2a7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 25 Jun 2024 16:48:39 +1000
Subject: [PATCH 1176/3129] rp2: Don't disable USB if going to DORMANT mode.

In this mode, XOSC is stopped so can't really keep
the USB PLL enabled.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/modmachine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 9cc15080cdad0..2cc79369f6149 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -138,7 +138,8 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     #if MICROPY_HW_ENABLE_USBDEV
     // Only disable the USB clock if a USB host has not configured the device
-    bool disable_usb = !tud_mounted();
+    // or if going to DORMANT mode.
+    bool disable_usb = !(tud_mounted() && n_args > 0);
     #else
     bool disable_usb = true;
     #endif

From e35f13a22df63cfa165a5fac7f8236a0d0711e77 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Thu, 13 Jun 2024 17:22:23 +0100
Subject: [PATCH 1177/3129] rp2/pendsv: Fix variable typo in assert so it
 compiles.

Fixes issue #15276.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/pendsv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index d24b4cb0122b3..68bb65f041c61 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -84,7 +84,7 @@ void PendSV_Handler(void) {
         return;
     }
     // Core 0 should not already have locked pendsv_mutex
-    assert(pensv_mutex.enter_count == 1);
+    assert(pendsv_mutex.enter_count == 1);
 
     #if MICROPY_PY_NETWORK_CYW43
     CYW43_STAT_INC(PENDSV_RUN_COUNT);

From 9111fa58312440fbddb4e67e9966386b3890d8d6 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Thu, 13 Jun 2024 17:23:35 +0100
Subject: [PATCH 1178/3129] shared/tinyusb/mp_usbd_runtime: Fix pointer
 comparison in assert.

Addresses build warning "comparison of distinct pointer types lacks a
cast".

Fixes issue #15276.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 shared/tinyusb/mp_usbd_runtime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index e10d1cb3f62d2..fe28a4a727791 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -196,7 +196,7 @@ static uint8_t _runtime_dev_count_itfs(tusb_desc_interface_t const *itf_desc) {
     const tusb_desc_configuration_t *cfg_desc = (const void *)tud_descriptor_configuration_cb(0);
     const uint8_t *p_desc = (const void *)cfg_desc;
     const uint8_t *p_end = p_desc + cfg_desc->wTotalLength;
-    assert(p_desc <= itf_desc && itf_desc < p_end);
+    assert(p_desc <= (const uint8_t *)itf_desc && (const uint8_t *)itf_desc < p_end);
     while (p_desc != (const void *)itf_desc && p_desc < p_end) {
         const uint8_t *next = tu_desc_next(p_desc);
 

From 3d93fed0aab85f5a7a64088026822ea55cc63541 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Thu, 13 Jun 2024 11:23:57 +0200
Subject: [PATCH 1179/3129] py/objarray: Fix buffer overflow in case of memory
 allocation failure.

If `array.append()` fails with an exception due to heap exhaustion, the
next attempt to grow the buffer will cause a buffer overflow because the
free slot count is increased before performing the allocation, and will
stay as if the allocation succeeded.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 py/objarray.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 803af2cd270c7..9d68aa70616ca 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -392,8 +392,9 @@ static mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
     if (self->free == 0) {
         size_t item_sz = mp_binary_get_size('@', self->typecode, NULL);
         // TODO: alloc policy
-        self->free = 8;
-        self->items = m_renew(byte, self->items, item_sz * self->len, item_sz * (self->len + self->free));
+        size_t add_cnt = 8;
+        self->items = m_renew(byte, self->items, item_sz * self->len, item_sz * (self->len + add_cnt));
+        self->free = add_cnt;
         mp_seq_clear(self->items, self->len + 1, self->len + self->free, item_sz);
     }
     mp_binary_set_val_array(self->typecode, self->items, self->len, arg);

From 206dc09456727415248c8d10f60b0121d391d38c Mon Sep 17 00:00:00 2001
From: tharuka <78165134+tharuka-pavith@users.noreply.github.com>
Date: Fri, 3 May 2024 10:41:05 +0530
Subject: [PATCH 1180/3129] README: Clean up a few bits of grammar.

The word "Select" could be confusing in this context, eg it could be
misunderstood as the `select` module.

Signed-off-by: tharuka <78165134+tharuka-pavith@users.noreply.github.com>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a20e0aaf13a28..02e0b3abb357b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ 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
+`os`, `sys`, `time`, `re`, and `struct`, etc. Some 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.
@@ -35,8 +35,8 @@ 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
+See the [online documentation](https://docs.micropython.org/) for the API
+reference and information about using MicroPython and information about how
 it is implemented.
 
 We use [GitHub Discussions](https://github.com/micropython/micropython/discussions)

From 0c28a5ab068e2cfd25bc7706019c4c695ba78f1e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 11 Jun 2024 11:06:48 +1000
Subject: [PATCH 1181/3129] github: Add Pull Request template.

Provides pull request submitters with contributor documentation, and
prompts them to provide relevant information about testing, and how they
came to implement this change.

Sections are deliberately small so they don't crowd out the GitHub Pull
Request description text field.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/pull_request_template.md | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000000..e11cebddb3710
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,33 @@
+<!-- Thanks for submitting a Pull Request! We appreciate you spending the
+     time to improve MicroPython. Please provide enough information so that
+     others can review your Pull Request.
+
+     Before submitting, please read:
+     https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md
+     https://github.com/micropython/micropython/wiki/ContributorGuidelines
+
+     Please check any CI failures that appear after your Pull Request is opened.
+-->
+
+### Summary
+
+<!-- Explain the reason for making this change. What problem does the pull request
+     solve, or what improvement does it add? Add links if relevant. -->
+
+
+### Testing
+
+<!-- Explain what testing you did, and on which boards/ports. If there are
+     boards or ports that you couldn't test, please mention this here as well.
+
+     If you leave this empty then your Pull Request may be closed. -->
+
+
+### Trade-offs and Alternatives
+
+<!-- If the Pull Request has some negative impact (i.e. increased code size)
+     then please explain why you think the trade-off improvement is worth it.
+     If you can think of alternative ways to do this, please explain that here too.
+
+     Delete this heading if not relevant (i.e. small fixes) -->
+

From 880f7bc0406a1ef249c833e1a88c023cd339ecf6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 24 Jun 2024 15:54:54 +1000
Subject: [PATCH 1182/3129] shared/tinyusb/mp_usbd_cdc: Fix short CDC TX
 timeouts.

The `mp_event_wait_ms()` function may return earlier than the requested
timeout, and if that happens repeatedly (eg due to lots of USB data and
IRQs) then the loop waiting for CDC TX FIFO space to become available may
exit much earlier than MICROPY_HW_USB_CDC_TX_TIMEOUT, even when there is
no space.

Fix this by using `mp_hal_ticks_ms()` to compute a more accurate timeout.

The `basics/int_big_mul.py` test fails on RPI_PICO without this fix.

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

diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index 674d6b089947e..63d015cb461f5 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -102,9 +102,9 @@ mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
             n = CFG_TUD_CDC_EP_BUFSIZE;
         }
         if (tud_cdc_connected()) {
-            int timeout = 0;
             // If CDC port is connected but the buffer is full, wait for up to USC_CDC_TIMEOUT ms.
-            while (n > tud_cdc_write_available() && timeout++ < MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+            mp_uint_t t0 = mp_hal_ticks_ms();
+            while (n > tud_cdc_write_available() && (mp_uint_t)(mp_hal_ticks_ms() - t0) < MICROPY_HW_USB_CDC_TX_TIMEOUT) {
                 mp_event_wait_ms(1);
 
                 // Explicitly run the USB stack as the scheduler may be locked (eg we

From 74f52374e49e3b2370c5fec0e9cfbadc7ec8121e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Jun 2024 11:17:59 +1000
Subject: [PATCH 1183/3129] extmod/extmod.mk: Disable maybe-uninitialized
 warnings in libm_dbl.

These warnings are emitted by arm-none-eabi-gcc 14.1.0 with -O2 enabled.

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

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index f7c6f9988e675..2207c21f0d8e9 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -167,6 +167,7 @@ SRC_LIB_LIBM_DBL_SQRT_HW_C += lib/libm_dbl/thumb_vfp_sqrt.c
 
 # Too many warnings in libm_dbl, disable for now.
 $(BUILD)/lib/libm_dbl/%.o: CFLAGS += -Wno-double-promotion -Wno-float-conversion
+$(BUILD)/lib/libm_dbl/__rem_pio2_large.o: CFLAGS += -Wno-maybe-uninitialized
 
 ################################################################################
 # VFS FAT FS

From 096adca0c88cd779b3e5e391e42db1d46f87bba1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Jun 2024 11:19:16 +1000
Subject: [PATCH 1184/3129] stm32/pin: Decrease machine_pin_obj_t.pin width
 from 5 to 4 bits.

Compiling using arm-none-eabi-gcc 14.1.0 with -O2 will give warnings about
possible overflow indexing extint arrays, such as `pyb_extint_callback`.
This is due to `machine_pin_obj_t.pin` having a bit-width of 5, and so a
possible value up to 31, which is usually larger than
`PYB_EXTI_NUM_VECTORS`.

To fix this, change `machine_pin_obj_t.pin` to a bit-width of 4.  Only 4
bits are needed for ST MCUs, which have up to 16 pins per port.

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

diff --git a/ports/stm32/pin.h b/ports/stm32/pin.h
index 04479bd042f71..33f34ebcc2838 100644
--- a/ports/stm32/pin.h
+++ b/ports/stm32/pin.h
@@ -45,8 +45,8 @@ typedef struct {
 typedef struct {
     mp_obj_base_t base;
     qstr name;
-    uint32_t port   : 4;
-    uint32_t pin    : 5;    // Some ARM processors use 32 bits/PORT
+    uint32_t port   : 4; // Allows GPIOA through GPIOP
+    uint32_t pin    : 4; // ST MCUs have a maximum of 16 pins per port
     uint32_t num_af : 4;
     uint32_t adc_channel : 5; // Some ARM processors use 32 bits/PORT
     uint32_t adc_num  : 3;  // 1 bit per ADC

From 706a4b44777280372ab5f77dd548f3764e82dbae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Jun 2024 11:24:00 +1000
Subject: [PATCH 1185/3129] tools/ci.sh: Build an stm32 board with -O2 enabled.

To test building with full optimisations.

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 7ba4ac4e57532..9c54d55a4e846 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -355,7 +355,7 @@ function ci_stm32_pyb_build {
     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=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=PYBD_SF6 COPT=-O2 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'

From b4213c9c920afb8da5d3d123b26527e26dceb877 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Wed, 26 Jun 2024 10:10:32 +0200
Subject: [PATCH 1186/3129] tools/mpy-tool.py: Implement freezing of long-long
 ints.

Allow inclusion of large integer constants in frozen files using long-long
representation (mpy-cross option -mlongint-impl=longlong).

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 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 3b06572c3a308..5007bbbaca013 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -735,8 +735,8 @@ def freeze_constant_obj(self, obj_name, 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
-                raise FreezeError(self, "freezing int to long-long is not implemented")
+                print("static const mp_obj_int_t %s = {{&mp_type_int}, %d};" % (obj_name, obj))
+                return "MP_ROM_PTR(&%s)" % obj_name
             elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_MPZ:
                 neg = 0
                 if obj < 0:

From 3af1425be7a786f79fe02902ca2f6079bacde809 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos.Verlinde@microsoft.com>
Date: Sun, 23 Jun 2024 14:17:47 +0200
Subject: [PATCH 1187/3129] tools/mpremote: Fix mpremote mip install with
 multiple lib in sys.path.

This is a fix for an algorithmic error in mpremote mip, that throws an
error due to a '\n' used in the concatenation and split when there is more
than one lib path in `sys.path`.

Signed-off-by: Jos Verlinde <Jos.Verlinde@microsoft.com>
---
 tools/mpremote/mpremote/mip.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index 46c9686ad1987..c86bf01f4f9d8 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -179,9 +179,9 @@ def do_mip(state, args):
             if args.target is None:
                 state.transport.exec("import sys")
                 lib_paths = (
-                    state.transport.eval("'\\n'.join(p for p in sys.path if p.endswith('/lib'))")
+                    state.transport.eval("'|'.join(p for p in sys.path if p.endswith('/lib'))")
                     .decode()
-                    .split("\n")
+                    .split("|")
                 )
                 if lib_paths and lib_paths[0]:
                     args.target = lib_paths[0]

From 43ebbec0c5c7a1b404ffdc738a8ab5f6fa0250cd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 5 Jun 2024 22:48:16 +1000
Subject: [PATCH 1188/3129] esp32: Rework board variant support to require
 mpconfigvariant file.

This commit reworks board variants on the esp32 port.  It's a simple change
that moves the board variant configuration from an "if" statement within
`mpconfigboard.cmake` into separate files for each variant, with the name
of the variant encoded in the filename: `mpconfigvariant_VARIANT.cmake`.

Optionally, the base variant can have its own options in
`mpconfigvariant.cmake` (this is an optional file, but all other variants
of the base must have a corresponding mpconfigvariant file).

There are two benefits to this:
- The build system now gives an error if the variant that you specified
  doesn't exist (because the mpconfigvariant file must exist with the
  variant name you specify).
- No more error-prone if-logic needed in the .cmake files.

The way to build a variant is unchanged, still via:

    $ make BOARD_VARIANT=VARIANT

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/CMakeLists.txt                    | 12 +++++
 .../boards/ESP32_GENERIC/mpconfigboard.cmake  | 47 -------------------
 .../ESP32_GENERIC/mpconfigvariant_D2WD.cmake  | 11 +++++
 .../ESP32_GENERIC/mpconfigvariant_OTA.cmake   |  8 ++++
 .../mpconfigvariant_SPIRAM.cmake              |  8 ++++
 .../mpconfigvariant_UNICORE.cmake             |  8 ++++
 .../ESP32_GENERIC_S3/mpconfigboard.cmake      | 19 --------
 .../mpconfigvariant_FLASH_4M.cmake            |  4 ++
 .../mpconfigvariant_SPIRAM_OCT.cmake          |  9 ++++
 9 files changed, 60 insertions(+), 66 deletions(-)
 create mode 100644 ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_OTA.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_SPIRAM.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_UNICORE.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT.cmake

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 3fe0830025579..d3927cd48d82a 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -19,6 +19,13 @@ if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
     message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
 endif()
 
+# If a board variant is specified, check that it exists.
+if(MICROPY_BOARD_VARIANT)
+    if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigvariant_${MICROPY_BOARD_VARIANT}.cmake)
+        message(FATAL_ERROR "Invalid MICROPY_BOARD_VARIANT specified: ${MICROPY_BOARD_VARIANT}")
+    endif()
+endif()
+
 # Define the output sdkconfig so it goes in the build directory.
 set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 
@@ -35,6 +42,11 @@ endif()
 # - SDKCONFIG_DEFAULTS
 # - IDF_TARGET
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
+if(NOT MICROPY_BOARD_VARIANT)
+    include(${MICROPY_BOARD_DIR}/mpconfigvariant.cmake OPTIONAL)
+else()
+    include(${MICROPY_BOARD_DIR}/mpconfigvariant_${MICROPY_BOARD_VARIANT}.cmake)
+endif()
 
 # 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.
diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
index a3e8f616bc009..9d0077a15e8d2 100644
--- a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
@@ -3,50 +3,3 @@ set(SDKCONFIG_DEFAULTS
     ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
 )
-
-if(MICROPY_BOARD_VARIANT STREQUAL "D2WD")
-    set(SDKCONFIG_DEFAULTS
-        ${SDKCONFIG_DEFAULTS}
-        boards/ESP32_GENERIC/sdkconfig.d2wd
-    )
-
-    list(APPEND MICROPY_DEF_BOARD
-        MICROPY_HW_MCU_NAME="ESP32-D2WD"
-        # Disable some options to reduce firmware size.
-        MICROPY_OPT_COMPUTED_GOTO=0
-        MICROPY_PY_NETWORK_LAN=0
-    )
-endif()
-
-if(MICROPY_BOARD_VARIANT STREQUAL "OTA")
-    set(SDKCONFIG_DEFAULTS
-        ${SDKCONFIG_DEFAULTS}
-        boards/ESP32_GENERIC/sdkconfig.ota
-    )
-
-    list(APPEND MICROPY_DEF_BOARD
-        MICROPY_HW_BOARD_NAME="Generic ESP32 module with OTA"
-    )
-endif()
-
-if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM")
-    set(SDKCONFIG_DEFAULTS
-        ${SDKCONFIG_DEFAULTS}
-        boards/sdkconfig.spiram
-    )
-
-    list(APPEND MICROPY_DEF_BOARD
-        MICROPY_HW_BOARD_NAME="Generic ESP32 module with SPIRAM"
-    )
-endif()
-
-if(MICROPY_BOARD_VARIANT STREQUAL "UNICORE")
-    set(SDKCONFIG_DEFAULTS
-        ${SDKCONFIG_DEFAULTS}
-        boards/ESP32_GENERIC/sdkconfig.unicore
-    )
-
-    list(APPEND MICROPY_DEF_BOARD
-        MICROPY_HW_MCU_NAME="ESP32-UNICORE"
-    )
-endif()
diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake
new file mode 100644
index 0000000000000..170c214bda073
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake
@@ -0,0 +1,11 @@
+set(SDKCONFIG_DEFAULTS
+    ${SDKCONFIG_DEFAULTS}
+    boards/ESP32_GENERIC/sdkconfig.d2wd
+)
+
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_MCU_NAME="ESP32-D2WD"
+    # Disable some options to reduce firmware size.
+    MICROPY_OPT_COMPUTED_GOTO=0
+    MICROPY_PY_NETWORK_LAN=0
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_OTA.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_OTA.cmake
new file mode 100644
index 0000000000000..7f649c36f6cc5
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_OTA.cmake
@@ -0,0 +1,8 @@
+set(SDKCONFIG_DEFAULTS
+    ${SDKCONFIG_DEFAULTS}
+    boards/ESP32_GENERIC/sdkconfig.ota
+)
+
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Generic ESP32 module with OTA"
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_SPIRAM.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_SPIRAM.cmake
new file mode 100644
index 0000000000000..11e9c4eda8188
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_SPIRAM.cmake
@@ -0,0 +1,8 @@
+set(SDKCONFIG_DEFAULTS
+    ${SDKCONFIG_DEFAULTS}
+    boards/sdkconfig.spiram
+)
+
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Generic ESP32 module with SPIRAM"
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_UNICORE.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_UNICORE.cmake
new file mode 100644
index 0000000000000..beed6eb09c781
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_UNICORE.cmake
@@ -0,0 +1,8 @@
+set(SDKCONFIG_DEFAULTS
+    ${SDKCONFIG_DEFAULTS}
+    boards/ESP32_GENERIC/sdkconfig.unicore
+)
+
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_MCU_NAME="ESP32-UNICORE"
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
index 1f7440353b6cc..2bfdad21df495 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -8,22 +8,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.spiram_sx
     boards/ESP32_GENERIC_S3/sdkconfig.board
 )
-
-if(MICROPY_BOARD_VARIANT STREQUAL "SPIRAM_OCT")
-    set(SDKCONFIG_DEFAULTS
-        ${SDKCONFIG_DEFAULTS}
-        boards/sdkconfig.240mhz
-        boards/sdkconfig.spiram_oct
-    )
-
-    list(APPEND MICROPY_DEF_BOARD
-        MICROPY_HW_BOARD_NAME="Generic ESP32S3 module with Octal-SPIRAM"
-    )
-endif()
-
-if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_4M")
-    set(SDKCONFIG_DEFAULTS
-        ${SDKCONFIG_DEFAULTS}
-        boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
-    )
-endif()
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake
new file mode 100644
index 0000000000000..e832cdb60fd72
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake
@@ -0,0 +1,4 @@
+set(SDKCONFIG_DEFAULTS
+    ${SDKCONFIG_DEFAULTS}
+    boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT.cmake
new file mode 100644
index 0000000000000..8b2eda27242c3
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT.cmake
@@ -0,0 +1,9 @@
+set(SDKCONFIG_DEFAULTS
+    ${SDKCONFIG_DEFAULTS}
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_oct
+)
+
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Generic ESP32S3 module with Octal-SPIRAM"
+)

From daa948fe05ee165a00a02f0b529c15601fe5ac5f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 5 Jun 2024 23:09:09 +1000
Subject: [PATCH 1189/3129] esp8266: Rework board variant support to require
 mpconfigvariant file.

Following how esp32 has been reworked, each variant now has a corresponding
`mpconfigvariant_VARIANT.mk` file associated with it.  The base variant
also has a `mpconfigvariant.mk` file because it has options that none of
the other variants use.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/Makefile                        | 15 +++++-
 .../boards/ESP8266_GENERIC/mpconfigboard.mk   | 51 +------------------
 .../boards/ESP8266_GENERIC/mpconfigvariant.mk | 12 +++++
 .../mpconfigvariant_FLASH_1M.mk               | 10 ++++
 .../mpconfigvariant_FLASH_512K.mk             |  7 +++
 .../ESP8266_GENERIC/mpconfigvariant_OTA.mk    | 10 ++++
 6 files changed, 53 insertions(+), 52 deletions(-)
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant.mk
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_1M.mk
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_512K.mk
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_OTA.mk

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 1b9e9623b6297..cd94a38a726e3 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -16,6 +16,12 @@ endif
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+ifneq ($(BOARD_VARIANT),)
+ifeq ($(wildcard $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk),)
+$(error Invalid BOARD_VARIANT specified: $(BOARD_VARIANT))
+endif
+endif
+
 # If the build directory is not given, make it reflect the board name (and
 # optionally the board variant).
 ifneq ($(BOARD_VARIANT),)
@@ -26,8 +32,13 @@ endif
 
 include ../../py/mkenv.mk
 
-# Optional
--include $(BOARD_DIR)/mpconfigboard.mk
+# Include board specific .mk file, and optional board variant .mk file.
+include $(BOARD_DIR)/mpconfigboard.mk
+ifeq ($(BOARD_VARIANT),)
+-include $(BOARD_DIR)/mpconfigvariant.mk
+else
+include $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk
+endif
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h #$(BUILD)/pins_qstr.h
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
index 69dbeb5fb9988..a9d8908c38bdf 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.mk
@@ -1,50 +1 @@
-ifeq ($(BOARD_VARIANT),)
-LD_FILES = boards/esp8266_2MiB.ld
-
-MICROPY_PY_ESPNOW ?= 1
-MICROPY_PY_BTREE ?= 1
-MICROPY_VFS_FAT ?= 1
-MICROPY_VFS_LFS2 ?= 1
-
-# Add asyncio and extra micropython-lib packages (in addition to the port manifest).
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_2MiB.py
-
-# Configure mpconfigboard.h.
-CFLAGS += -DMICROPY_ESP8266_2M
-endif
-
-ifeq ($(BOARD_VARIANT),FLASH_1M)
-LD_FILES = boards/esp8266_1MiB.ld
-
-MICROPY_PY_ESPNOW ?= 1
-MICROPY_PY_BTREE ?= 1
-MICROPY_VFS_LFS2 ?= 1
-
-# Note: Implicitly uses the port manifest.
-
-# Configure mpconfigboard.h.
-CFLAGS += -DMICROPY_ESP8266_1M
-endif
-
-ifeq ($(BOARD_VARIANT),OTA)
-LD_FILES = boards/esp8266_ota.ld
-
-MICROPY_PY_ESPNOW ?= 1
-MICROPY_PY_BTREE ?= 1
-MICROPY_VFS_LFS2 ?= 1
-
-# Note: Implicitly uses the port manifest.
-
-# Configure mpconfigboard.h.
-CFLAGS += -DMICROPY_ESP8266_1M
-endif
-
-ifeq ($(BOARD_VARIANT),FLASH_512K)
-LD_FILES = boards/esp8266_512kiB.ld
-
-# Note: Use the minimal manifest.py.
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_512kiB.py
-
-# Configure mpconfigboard.h.
-CFLAGS += -DMICROPY_ESP8266_512K
-endif
+# There are no common .mk settings among the variants, so this file is empty.
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant.mk
new file mode 100644
index 0000000000000..926fc15dab55a
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant.mk
@@ -0,0 +1,12 @@
+LD_FILES = boards/esp8266_2MiB.ld
+
+MICROPY_PY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Add asyncio and extra micropython-lib packages (in addition to the port manifest).
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_2MiB.py
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_2M
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_1M.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_1M.mk
new file mode 100644
index 0000000000000..6baad11470976
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_1M.mk
@@ -0,0 +1,10 @@
+LD_FILES = boards/esp8266_1MiB.ld
+
+MICROPY_PY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Note: Implicitly uses the port manifest.
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_1M
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_512K.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_512K.mk
new file mode 100644
index 0000000000000..bbbdbb9091dee
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_512K.mk
@@ -0,0 +1,7 @@
+LD_FILES = boards/esp8266_512kiB.ld
+
+# Note: Use the minimal manifest.py.
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_512kiB.py
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_512K
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_OTA.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_OTA.mk
new file mode 100644
index 0000000000000..759eab3dc750b
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_OTA.mk
@@ -0,0 +1,10 @@
+LD_FILES = boards/esp8266_ota.ld
+
+MICROPY_PY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Note: Implicitly uses the port manifest.
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_1M

From 81b1bfcfef67577707691a3941879c63df619dcd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Jun 2024 13:23:43 +1000
Subject: [PATCH 1190/3129] stm32: Rework board variant support to require
 mpconfigvariant file.

Following how the board variants now work in the esp8266 port.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                           | 13 +++++++++++++
 ports/stm32/boards/PYBLITEV10/mpconfigboard.mk | 18 ------------------
 .../boards/PYBLITEV10/mpconfigvariant_DP.mk    |  1 +
 .../PYBLITEV10/mpconfigvariant_DP_THREAD.mk    |  2 ++
 .../PYBLITEV10/mpconfigvariant_NETWORK.mk      |  1 +
 .../PYBLITEV10/mpconfigvariant_THREAD.mk       |  1 +
 ports/stm32/boards/PYBV10/mpconfigboard.mk     | 18 ------------------
 .../stm32/boards/PYBV10/mpconfigvariant_DP.mk  |  1 +
 .../boards/PYBV10/mpconfigvariant_DP_THREAD.mk |  2 ++
 .../boards/PYBV10/mpconfigvariant_NETWORK.mk   |  1 +
 .../boards/PYBV10/mpconfigvariant_THREAD.mk    |  1 +
 ports/stm32/boards/PYBV11/mpconfigboard.mk     | 18 ------------------
 .../stm32/boards/PYBV11/mpconfigvariant_DP.mk  |  1 +
 .../boards/PYBV11/mpconfigvariant_DP_THREAD.mk |  2 ++
 .../boards/PYBV11/mpconfigvariant_NETWORK.mk   |  1 +
 .../boards/PYBV11/mpconfigvariant_THREAD.mk    |  1 +
 16 files changed, 28 insertions(+), 54 deletions(-)
 create mode 100644 ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP.mk
 create mode 100644 ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP_THREAD.mk
 create mode 100644 ports/stm32/boards/PYBLITEV10/mpconfigvariant_NETWORK.mk
 create mode 100644 ports/stm32/boards/PYBLITEV10/mpconfigvariant_THREAD.mk
 create mode 100644 ports/stm32/boards/PYBV10/mpconfigvariant_DP.mk
 create mode 100644 ports/stm32/boards/PYBV10/mpconfigvariant_DP_THREAD.mk
 create mode 100644 ports/stm32/boards/PYBV10/mpconfigvariant_NETWORK.mk
 create mode 100644 ports/stm32/boards/PYBV10/mpconfigvariant_THREAD.mk
 create mode 100644 ports/stm32/boards/PYBV11/mpconfigvariant_DP.mk
 create mode 100644 ports/stm32/boards/PYBV11/mpconfigvariant_DP_THREAD.mk
 create mode 100644 ports/stm32/boards/PYBV11/mpconfigvariant_NETWORK.mk
 create mode 100644 ports/stm32/boards/PYBV11/mpconfigvariant_THREAD.mk

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 50ac48e5a18eb..497e409c66563 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -13,6 +13,12 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+ifneq ($(BOARD_VARIANT),)
+ifeq ($(wildcard $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk),)
+$(error Invalid BOARD_VARIANT specified: $(BOARD_VARIANT))
+endif
+endif
+
 # If the build directory is not given, make it reflect the board name (and
 # optionally the board variant).
 ifneq ($(BOARD_VARIANT),)
@@ -23,7 +29,14 @@ endif
 
 include ../../py/mkenv.mk
 -include mpconfigport.mk
+
+# Include board specific .mk file, and optional board variant .mk file.
 include $(BOARD_DIR)/mpconfigboard.mk
+ifeq ($(BOARD_VARIANT),)
+-include $(BOARD_DIR)/mpconfigvariant.mk
+else
+include $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk
+endif
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS += qstrdefsport.h
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index 1fe609cbb5849..603fa8865e2a0 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -5,23 +5,5 @@ LD_FILES = boards/stm32f411.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
 
-# Provide different variants for the downloads page.
-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
-endif
-
 # PYB-specific frozen modules
 FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP.mk b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP.mk
new file mode 100644
index 0000000000000..73b32b4901dbf
--- /dev/null
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP.mk
@@ -0,0 +1 @@
+MICROPY_FLOAT_IMPL = double
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP_THREAD.mk b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP_THREAD.mk
new file mode 100644
index 0000000000000..af6ec87ecfc12
--- /dev/null
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP_THREAD.mk
@@ -0,0 +1,2 @@
+MICROPY_FLOAT_IMPL = double
+CFLAGS += -DMICROPY_PY_THREAD=1
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigvariant_NETWORK.mk b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_NETWORK.mk
new file mode 100644
index 0000000000000..2e2988aa93056
--- /dev/null
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_NETWORK.mk
@@ -0,0 +1 @@
+MICROPY_PY_NETWORK_WIZNET5K = 5200
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigvariant_THREAD.mk b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_THREAD.mk
new file mode 100644
index 0000000000000..eab5c1c0d2333
--- /dev/null
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigvariant_THREAD.mk
@@ -0,0 +1 @@
+CFLAGS += -DMICROPY_PY_THREAD=1
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index 1a4d6763193ae..38f0b55f6c7c9 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -15,23 +15,5 @@ endif
 # MicroPython settings
 MICROPY_VFS_LFS2 = 1
 
-# Provide different variants for the downloads page.
-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
-endif
-
 # PYB-specific frozen modules
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/PYBV10/mpconfigvariant_DP.mk b/ports/stm32/boards/PYBV10/mpconfigvariant_DP.mk
new file mode 100644
index 0000000000000..73b32b4901dbf
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/mpconfigvariant_DP.mk
@@ -0,0 +1 @@
+MICROPY_FLOAT_IMPL = double
diff --git a/ports/stm32/boards/PYBV10/mpconfigvariant_DP_THREAD.mk b/ports/stm32/boards/PYBV10/mpconfigvariant_DP_THREAD.mk
new file mode 100644
index 0000000000000..af6ec87ecfc12
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/mpconfigvariant_DP_THREAD.mk
@@ -0,0 +1,2 @@
+MICROPY_FLOAT_IMPL = double
+CFLAGS += -DMICROPY_PY_THREAD=1
diff --git a/ports/stm32/boards/PYBV10/mpconfigvariant_NETWORK.mk b/ports/stm32/boards/PYBV10/mpconfigvariant_NETWORK.mk
new file mode 100644
index 0000000000000..2e2988aa93056
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/mpconfigvariant_NETWORK.mk
@@ -0,0 +1 @@
+MICROPY_PY_NETWORK_WIZNET5K = 5200
diff --git a/ports/stm32/boards/PYBV10/mpconfigvariant_THREAD.mk b/ports/stm32/boards/PYBV10/mpconfigvariant_THREAD.mk
new file mode 100644
index 0000000000000..eab5c1c0d2333
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/mpconfigvariant_THREAD.mk
@@ -0,0 +1 @@
+CFLAGS += -DMICROPY_PY_THREAD=1
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index 6dcb2fd1b4cd0..89e4a1d8a4d2a 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -15,23 +15,5 @@ endif
 # MicroPython settings
 MICROPY_VFS_LFS2 = 1
 
-# Provide different variants for the downloads page.
-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
-endif
-
 # PYB-specific frozen modules
 FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/PYBV11/mpconfigvariant_DP.mk b/ports/stm32/boards/PYBV11/mpconfigvariant_DP.mk
new file mode 100644
index 0000000000000..73b32b4901dbf
--- /dev/null
+++ b/ports/stm32/boards/PYBV11/mpconfigvariant_DP.mk
@@ -0,0 +1 @@
+MICROPY_FLOAT_IMPL = double
diff --git a/ports/stm32/boards/PYBV11/mpconfigvariant_DP_THREAD.mk b/ports/stm32/boards/PYBV11/mpconfigvariant_DP_THREAD.mk
new file mode 100644
index 0000000000000..af6ec87ecfc12
--- /dev/null
+++ b/ports/stm32/boards/PYBV11/mpconfigvariant_DP_THREAD.mk
@@ -0,0 +1,2 @@
+MICROPY_FLOAT_IMPL = double
+CFLAGS += -DMICROPY_PY_THREAD=1
diff --git a/ports/stm32/boards/PYBV11/mpconfigvariant_NETWORK.mk b/ports/stm32/boards/PYBV11/mpconfigvariant_NETWORK.mk
new file mode 100644
index 0000000000000..2e2988aa93056
--- /dev/null
+++ b/ports/stm32/boards/PYBV11/mpconfigvariant_NETWORK.mk
@@ -0,0 +1 @@
+MICROPY_PY_NETWORK_WIZNET5K = 5200
diff --git a/ports/stm32/boards/PYBV11/mpconfigvariant_THREAD.mk b/ports/stm32/boards/PYBV11/mpconfigvariant_THREAD.mk
new file mode 100644
index 0000000000000..eab5c1c0d2333
--- /dev/null
+++ b/ports/stm32/boards/PYBV11/mpconfigvariant_THREAD.mk
@@ -0,0 +1 @@
+CFLAGS += -DMICROPY_PY_THREAD=1

From 5dff78f38edc0354e854e6c73af61c5064afe9d3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 24 Jun 2024 12:37:13 +1000
Subject: [PATCH 1191/3129] rp2: Rework board variant support to require
 mpconfigvariant file.

Following how the board variants now work in the esp32 port.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt                         | 12 ++++++++++++
 ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake | 16 ----------------
 .../rp2/boards/WEACTSTUDIO/mpconfigvariant.cmake |  1 +
 .../WEACTSTUDIO/mpconfigvariant_FLASH_2M.cmake   |  1 +
 .../WEACTSTUDIO/mpconfigvariant_FLASH_4M.cmake   |  1 +
 .../WEACTSTUDIO/mpconfigvariant_FLASH_8M.cmake   |  1 +
 6 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_2M.cmake
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_4M.cmake
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_8M.cmake

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 8f5680092c925..8fff4251487ff 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -38,10 +38,22 @@ if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
     message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
 endif()
 
+# If a board variant is specified, check that it exists.
+if(MICROPY_BOARD_VARIANT)
+    if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigvariant_${MICROPY_BOARD_VARIANT}.cmake)
+        message(FATAL_ERROR "Invalid MICROPY_BOARD_VARIANT specified: ${MICROPY_BOARD_VARIANT}")
+    endif()
+endif()
+
 set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
 
 # Include board config, it may override MICROPY_FROZEN_MANIFEST
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
+if(NOT MICROPY_BOARD_VARIANT)
+    include(${MICROPY_BOARD_DIR}/mpconfigvariant.cmake OPTIONAL)
+else()
+    include(${MICROPY_BOARD_DIR}/mpconfigvariant_${MICROPY_BOARD_VARIANT}.cmake)
+endif()
 
 # Set the PICO_BOARD if it's not already set (allow a board to override it).
 if(NOT PICO_BOARD)
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
index 848b50f604db6..d922644bf6265 100644
--- a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
@@ -6,19 +6,3 @@ list(APPEND PICO_BOARD_HEADER_DIRS ${MICROPY_BOARD_DIR})
 
 # Freeze board.py
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-
-# Select the 16MB variant as the default
-set(PICO_BOARD "weactstudio_16MiB")
-
-# Provide different variants for the downloads page
-if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_2M")
-    set(PICO_BOARD "weactstudio_2MiB")
-endif()
-
-if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_4M")
-    set(PICO_BOARD "weactstudio_4MiB")
-endif()
-
-if(MICROPY_BOARD_VARIANT STREQUAL "FLASH_8M")
-    set(PICO_BOARD "weactstudio_8MiB")
-endif()
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..4e68b2112f1d8
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_BOARD "weactstudio_16MiB")
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_2M.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_2M.cmake
new file mode 100644
index 0000000000000..b8d7202dada5d
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_2M.cmake
@@ -0,0 +1 @@
+set(PICO_BOARD "weactstudio_2MiB")
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_4M.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_4M.cmake
new file mode 100644
index 0000000000000..75afb1ba40062
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_4M.cmake
@@ -0,0 +1 @@
+set(PICO_BOARD "weactstudio_4MiB")
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_8M.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_8M.cmake
new file mode 100644
index 0000000000000..359e47c01161e
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigvariant_FLASH_8M.cmake
@@ -0,0 +1 @@
+set(PICO_BOARD "weactstudio_8MiB")

From 95c19e05ffd204f8f375b6e04e4ae45770ec0dbc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 24 Jun 2024 13:03:44 +1000
Subject: [PATCH 1192/3129] webassembly/objjsproxy: Lookup attributes without
 testing they exist.

In JavaScript when accessing an attribute such as `obj.attr` a value of
`undefined` is returned if the attribute does not exist.  This is unlike
Python semantics where an `AttributeError` is raised.  Furthermore, in some
cases in JavaScript (eg a Proxy instance) `attr in obj` can return false
yet `obj.attr` is still valid and returns something other than `undefined`.
So the source of truth for whether a JavaScript attribute exists is to just
right away attempt `obj.attr`.

To more closely match these JavaScript semantics when proxying a JavaScript
object through to Python, change the attribute lookup logic on a `JsProxy`
so that it immediately attempts `obj.attr` instead of first testing if the
attribute exists via `attr in obj`.

This allows JavaScript objects which dynamically create attributes to work
correctly on the Python side, with both `obj.attr` and `obj["attr"]`.  Note
that `obj["attr"]` already works in all cases because it immediately does
the subscript access without first testing if the attribute exists.

As a benefit, this new behaviour matches the Pyodide behaviour.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/objjsproxy.c                | 10 ++++--
 .../ports/webassembly/js_proxy_attribute.mjs  | 34 +++++++++++++++++++
 .../webassembly/js_proxy_attribute.mjs.exp    |  9 +++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 tests/ports/webassembly/js_proxy_attribute.mjs
 create mode 100644 tests/ports/webassembly/js_proxy_attribute.mjs.exp

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index cbfe8be49baf2..167d4382bc630 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -46,8 +46,14 @@ EM_JS(bool, has_attr, (int jsref, const char *str), {
 EM_JS(bool, lookup_attr, (int jsref, const char *str, uint32_t * out), {
     const base = proxy_js_ref[jsref];
     const attr = UTF8ToString(str);
-    if (attr in base) {
-        let value = base[attr];
+
+    // Attempt to lookup the requested attribute from the base object:
+    // - If the value is not `undefined` then the attribute exists with that value.
+    // - Otherwise if the value is `undefined` and the `in` operator returns true, then
+    //   that attribute does exist and is intended to have a value of `undefined`.
+    // - Otherwise, the attribute does not exist.
+    let value = base[attr];
+    if (value !== undefined || attr in base) {
         if (typeof value === "function") {
             if (base !== globalThis) {
                 if ("_ref" in value) {
diff --git a/tests/ports/webassembly/js_proxy_attribute.mjs b/tests/ports/webassembly/js_proxy_attribute.mjs
new file mode 100644
index 0000000000000..5d950122778bf
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_attribute.mjs
@@ -0,0 +1,34 @@
+// Test lookup of attributes on JsProxy objects.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+// Simple attribute names and values.
+globalThis.obj1 = { a: 1, b: 2 };
+
+// Unconventional attribute names and values.
+globalThis.obj2 = { undefined: "undefined", undef: undefined };
+
+// Dynamically created attribute names and values.
+globalThis.obj3 = new Proxy(new Map(), {
+    get(map, name) {
+        if (!map.has(name)) {
+            console.log("creating attribute", name);
+            map.set(name, name);
+        }
+        return map.get(name);
+    },
+});
+
+mp.runPython(`
+import js
+
+print(js.obj1.a, js.obj1.b)
+print(js.obj1["a"], js.obj1["b"])
+
+print(js.obj2.undefined, js.obj2.undef)
+
+print(js.obj3.c)
+print(js.obj3["c"])
+print(hasattr(js.obj3, "d"))
+print(js.obj3.d)
+`);
diff --git a/tests/ports/webassembly/js_proxy_attribute.mjs.exp b/tests/ports/webassembly/js_proxy_attribute.mjs.exp
new file mode 100644
index 0000000000000..7de85a56648ab
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_attribute.mjs.exp
@@ -0,0 +1,9 @@
+1 2
+1 2
+undefined <undefined>
+creating attribute c
+c
+c
+creating attribute d
+True
+d

From 0dd25a369e70118829b3f176151c50440286e3fe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Jun 2024 22:32:11 +1000
Subject: [PATCH 1193/3129] rp2/boards/WEACTSTUDIO: Fix variant names in
 board.json.

It looks like the variants for this board were never being built properly,
because the auto-build system used the variant name from `board.json` which
did not match the variant names in the original `mpconfigboard.mk`.  Eg
`FLASH_2MB` in `board.json` but `FLASH_2M` in `mpconfigboard.mk`.

This mistake is apparent since 5dff78f38edc0354e854e6c73af61c5064afe9d3,
which made it a build error to specify an invalid variant.

Fix this by using the correct variant names in `board.json`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/boards/WEACTSTUDIO/board.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
index 223bbdc07b34a..8881b40e732a7 100644
--- a/ports/rp2/boards/WEACTSTUDIO/board.json
+++ b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -15,9 +15,9 @@
     "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"
+        "FLASH_2M": "2 MiB Flash",
+        "FLASH_4M": "4 MiB Flash",
+        "FLASH_8M": "8 MiB Flash"
     },
     "vendor": "WeAct"
 }

From 0e261443be9a9201fd786b54aa2d0198f21543f7 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 27 Jun 2024 14:51:12 +0100
Subject: [PATCH 1194/3129] rp2: Replace CMSIS funcs with Pico SDK equivalents.

Pico SDK defines `__dsb()` and `__sev()` so use those instead of the CMSIS
equivalents.  This matches the use of `__wfi()` in lieu of `__WFI()` and
lowers the dependency on CMSIS headers.

And then, move the include of "RP2040.h" from the widely-included
"mphalport.h" to specific source files that need this header, to keep its
inclusion contained.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/machine_uart.c  | 4 ++--
 ports/rp2/main.c          | 1 +
 ports/rp2/mphalport.h     | 1 -
 ports/rp2/mpnetworkport.c | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index ccbf8f781ac82..d9e97685f1f25 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -369,9 +369,9 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
 
         uart_init(self->uart, self->baudrate);
         uart_set_format(self->uart, self->bits, self->stop, self->parity);
-        __DSB(); // make sure UARTLCR_H register is written to
+        __dsb(); // make sure UARTLCR_H register is written to
         uart_set_fifo_enabled(self->uart, true);
-        __DSB(); // make sure UARTLCR_H register is written to
+        __dsb(); // make sure UARTLCR_H register is written to
         gpio_set_function(self->tx, GPIO_FUNC_UART);
         gpio_set_function(self->rx, GPIO_FUNC_UART);
         if (self->invert & UART_INVERT_RX) {
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 5fb47cc4028ef..3b4d351a78792 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -47,6 +47,7 @@
 #include "genhdr/mpversion.h"
 #include "mp_usbd.h"
 
+#include "RP2040.h" // cmsis, for PendSV_IRQn and SCB/SCB_SCR_SEVONPEND_Msk
 #include "pico/stdlib.h"
 #include "pico/binary_info.h"
 #include "pico/unique_id.h"
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index bc09f8c4a572f..16ac4259a6feb 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -30,7 +30,6 @@
 #include "pico/time.h"
 #include "hardware/clocks.h"
 #include "hardware/structs/systick.h"
-#include "RP2040.h" // cmsis, for __WFI
 #include "pendsv.h"
 
 #define SYSTICK_MAX (0xffffff)
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 4690a4e511024..e58adb3ba3595 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -43,6 +43,7 @@ static soft_timer_entry_t mp_network_soft_timer;
 #include "lib/cyw43-driver/src/cyw43.h"
 #include "lib/cyw43-driver/src/cyw43_stats.h"
 #include "hardware/irq.h"
+#include "RP2040.h" // cmsis, for NVIC_SetPriority and PendSV_IRQn
 
 #define CYW43_IRQ_LEVEL GPIO_IRQ_LEVEL_HIGH
 #define CYW43_SHARED_IRQ_HANDLER_PRIORITY PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY
@@ -57,7 +58,7 @@ static void gpio_irq_handler(void) {
         // 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;
-        __SEV();
+        __sev();
         pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
         CYW43_STAT_INC(IRQ_COUNT);
     }

From 0600e4f27333092884358c967123dcc040d7a1cc Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 25 Jun 2024 15:45:13 +0200
Subject: [PATCH 1195/3129] py/asmrv32: Make some code sequences smaller.

This commit changes a few code sequences to use more compressed opcodes
where possible.  The sequences in question are the ones that show up the
most in the test suite and require the least amount of code changes, namely
short offset loads from memory to RET/ARG registers, indirect calls through
the function table, register-based jumps, locals' offset calculation,
reg-is-null jumps, and register comparisons.

There are no speed losses or gains from these changes, but there is an
average 15-20% generated code size reduction.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 71 +++++++++++++++++++++++++++++++++++++++++-----------
 py/asmrv32.h | 57 +++++++++++++++++++++++++++++++++++------
 2 files changed, 105 insertions(+), 23 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index 228edfc22c102..7dd58becae6a6 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -64,9 +64,14 @@ static uint32_t fallback_popcount(uint32_t value) {
 #endif
 #endif
 
-#define INTERNAL_TEMPORARY ASM_RV32_REG_T4
+#define INTERNAL_TEMPORARY ASM_RV32_REG_S0
 #define AVAILABLE_REGISTERS_COUNT 32
 
+#define IS_IN_C_REGISTER_WINDOW(register_number) \
+    (((register_number) >= ASM_RV32_REG_X8) && ((register_number) <= ASM_RV32_REG_X15))
+#define MAP_IN_C_REGISTER_WINDOW(register_number) \
+    ((register_number) - ASM_RV32_REG_X8)
+
 #define FIT_UNSIGNED(value, bits) (((value) & ~((1U << (bits)) - 1)) == 0)
 #define FIT_SIGNED(value, bits) \
     ((((value) & ~((1U << ((bits) - 1)) - 1)) == 0) ||                                      \
@@ -269,7 +274,7 @@ static void emit_function_epilogue(asm_rv32_t *state, mp_uint_t registers) {
 
 void asm_rv32_entry(asm_rv32_t *state, mp_uint_t locals) {
     state->saved_registers_mask |= (1U << REG_FUN_TABLE) | (1U << REG_LOCAL_1) | \
-        (1U << REG_LOCAL_2) | (1U << REG_LOCAL_3);
+        (1U << REG_LOCAL_2) | (1U << REG_LOCAL_3) | (1U << INTERNAL_TEMPORARY);
     state->locals_count = locals;
     emit_function_prologue(state, state->saved_registers_mask);
 }
@@ -288,6 +293,14 @@ void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index) {
     mp_uint_t offset = index * ASM_WORD_SIZE;
     state->saved_registers_mask |= (1U << ASM_RV32_REG_RA);
 
+    if (IS_IN_C_REGISTER_WINDOW(REG_FUN_TABLE) && IS_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY) && FIT_SIGNED(offset, 7)) {
+        // c.lw   temporary, offset(fun_table)
+        // c.jalr temporary
+        asm_rv32_opcode_clw(state, MAP_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY), MAP_IN_C_REGISTER_WINDOW(REG_FUN_TABLE), offset);
+        asm_rv32_opcode_cjalr(state, INTERNAL_TEMPORARY);
+        return;
+    }
+
     if (FIT_UNSIGNED(offset, 11)) {
         // lw     temporary, offset(fun_table)
         // c.jalr temporary
@@ -343,6 +356,12 @@ void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs
 void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_t label) {
     ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
 
+    if (FIT_SIGNED(displacement, 9) && IS_IN_C_REGISTER_WINDOW(rs)) {
+        // c.bnez rs', displacement
+        asm_rv32_opcode_cbnez(state, MAP_IN_C_REGISTER_WINDOW(rs), displacement);
+        return;
+    }
+
     // The least significant bit is ignored anyway.
     if (FIT_SIGNED(displacement, 13)) {
         // bne rs, zero, displacement
@@ -350,8 +369,8 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
         return;
     }
 
-    // Compensate for the initial BEQ opcode.
-    displacement -= ASM_WORD_SIZE;
+    // Compensate for the initial C.BEQZ/BEQ opcode.
+    displacement -= IS_IN_C_REGISTER_WINDOW(rs) ? ASM_HALFWORD_SIZE : ASM_WORD_SIZE;
 
     mp_uint_t upper = 0;
     mp_uint_t lower = 0;
@@ -359,11 +378,21 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
 
     // TODO: Can this clobber REG_TEMP[0:2]?
 
-    // beq   rs1, zero, 12                     ; PC + 0
-    // auipc temporary, HI(displacement)       ; PC + 4
-    // jalr  zero, temporary, LO(displacement) ; PC + 8
-    // ...                                     ; PC + 12
-    asm_rv32_opcode_beq(state, rs, ASM_RV32_REG_ZERO, 12);
+    // if rs1 in C window (the offset always fits):
+    //    c.beqz rs', 10                           ; PC + 0
+    //    auipc  temporary, HI(displacement)       ; PC + 2
+    //    jalr   zero, temporary, LO(displacement) ; PC + 6
+    //    ...                                      ; PC + 10
+    // else:
+    //    beq    rs, zero, 12                      ; PC + 0
+    //    auipc  temporary, HI(displacement)       ; PC + 4
+    //    jalr   zero, temporary, LO(displacement) ; PC + 8
+    //    ...                                      ; PC + 12
+    if (IS_IN_C_REGISTER_WINDOW(rs)) {
+        asm_rv32_opcode_cbeqz(state, MAP_IN_C_REGISTER_WINDOW(rs), 10);
+    } else {
+        asm_rv32_opcode_beq(state, rs, ASM_RV32_REG_ZERO, 12);
+    }
     asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
     asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
 }
@@ -427,7 +456,13 @@ void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t loca
 void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local) {
     mp_uint_t offset = state->locals_stack_offset + (local * ASM_WORD_SIZE);
 
-    if (FIT_SIGNED(offset, 11)) {
+    if (FIT_UNSIGNED(offset, 10) && offset != 0 && IS_IN_C_REGISTER_WINDOW(rd)) {
+        // c.addi4spn rd', offset
+        asm_rv32_opcode_caddi4spn(state, MAP_IN_C_REGISTER_WINDOW(rd), offset);
+        return;
+    }
+
+    if (FIT_UNSIGNED(offset, 11)) {
         // addi rd, sp, offset
         asm_rv32_opcode_addi(state, rd, ASM_RV32_REG_SP, offset);
         return;
@@ -442,6 +477,12 @@ void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t
 void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     mp_int_t scaled_offset = offset * sizeof(ASM_WORD_SIZE);
 
+    if (IS_IN_C_REGISTER_WINDOW(rd) && IS_IN_C_REGISTER_WINDOW(rs) && FIT_SIGNED(offset, 7)) {
+        // c.lw rd', offset(rs')
+        asm_rv32_opcode_clw(state, MAP_IN_C_REGISTER_WINDOW(rd), MAP_IN_C_REGISTER_WINDOW(rs), scaled_offset);
+        return;
+    }
+
     if (FIT_SIGNED(scaled_offset, 12)) {
         // lw rd, offset(rs)
         asm_rv32_opcode_lw(state, rd, rs, scaled_offset);
@@ -554,12 +595,12 @@ void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs)
 
 void asm_rv32_meta_comparison_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {
     // c.li rd, 1       ;
-    // beq  rs1, rs2, 8 ; PC + 0
-    // addi rd, zero, 0 ; PC + 4
-    // ...              ; PC + 8
+    // beq  rs1, rs2, 6 ; PC + 0
+    // c.li rd, 0       ; PC + 4
+    // ...              ; PC + 6
     asm_rv32_opcode_cli(state, rd, 1);
-    asm_rv32_opcode_beq(state, rs1, rs2, 8);
-    asm_rv32_opcode_addi(state, rd, ASM_RV32_REG_ZERO, 0);
+    asm_rv32_opcode_beq(state, rs1, rs2, 6);
+    asm_rv32_opcode_cli(state, rd, 0);
 }
 
 void asm_rv32_meta_comparison_ne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 4061fd5f86be1..7f7602471c1d6 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -151,10 +151,21 @@ void asm_rv32_end_pass(asm_rv32_t *state);
     ((op & 0b1111111) | ((rd & 0b11111) << 7) |                                  \
     (imm & 0b11111111111111111111000000000000))
 
+#define RV32_ENCODE_TYPE_CB(op, ft3, rs, imm) \
+    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rs & 0b111) << 7) | \
+    (((imm) & 0b100000000) << 4) | (((imm) & 0b11000000) >> 1) | \
+    (((imm) & 0b100000) >> 3) | (((imm) & 0b11000) << 7) | \
+    (((imm) & 0b110) << 2))
+
 #define RV32_ENCODE_TYPE_CI(op, ft3, rd, imm) \
     ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rd & 0b11111) << 7) | \
     (((imm) & 0b100000) << 7) | (((imm) & 0b11111) << 2))
 
+#define RV32_ENCODE_TYPE_CIW(op, ft3, rd, imm) \
+    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rd & 0b111) << 2) | \
+    ((imm & 0b1111000000) << 1) | ((imm & 0b110000) << 7) | \
+    ((imm & 0b1000) << 2) | ((imm & 0b100) << 4))
+
 #define RV32_ENCODE_TYPE_CJ(op, ft3, imm) \
     ((op & 0b11) | ((ft3 & 0b111) << 13) | \
     ((imm & 0b1110) << 2) | ((imm & 0b1100000000) << 1) | \
@@ -162,12 +173,18 @@ void asm_rv32_end_pass(asm_rv32_t *state);
     ((imm & 0b10000000) >> 1) | ((imm & 0b1000000) << 1) | \
     ((imm & 0b100000) >> 3) | ((imm & 0b10000) << 7))
 
+#define RV32_ENCODE_TYPE_CL(op, ft3, rd, rs, imm) \
+    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rd & 0b111) << 2) | \
+    ((rs & 0b111) << 7) | ((imm & 0b1000000) >> 1) | \
+    ((imm & 0b111000) << 7) | ((imm & 0b100) << 4))
+
 #define RV32_ENCODE_TYPE_CR(op, ft4, rs1, rs2) \
     ((op & 0b11) | ((rs2 & 0b11111) << 2) | ((rs1 & 0b11111) << 7) | \
     ((ft4 & 0b1111) << 12))
 
 #define RV32_ENCODE_TYPE_CSS(op, ft3, rs, imm) \
-    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rs & 0b11111) << 2) | ((imm) & 0b111111) << 7)
+    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rs & 0b11111) << 2) | \
+    ((imm) & 0b111111) << 7)
 
 void asm_rv32_emit_word_opcode(asm_rv32_t *state, mp_uint_t opcode);
 void asm_rv32_emit_halfword_opcode(asm_rv32_t *state, mp_uint_t opcode);
@@ -220,10 +237,28 @@ static inline void asm_rv32_opcode_caddi(asm_rv32_t *state, mp_uint_t rd, mp_int
     asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b000, rd, immediate));
 }
 
+// C.ADDI4SPN RD', IMMEDIATE
+static inline void asm_rv32_opcode_caddi4spn(asm_rv32_t *state, mp_uint_t rd, mp_uint_t immediate) {
+    // CIW: 000 ........ ... 00
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CIW(0b00, 0b000, rd, immediate));
+}
+
+// C.BEQZ RS', IMMEDIATE
+static inline void asm_rv32_opcode_cbeqz(asm_rv32_t *state, mp_uint_t rs, mp_int_t offset) {
+    // CB: 110 ... ... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0b01, 0b110, rs, offset));
+}
+
+// C.BNEZ RS', IMMEDIATE
+static inline void asm_rv32_opcode_cbnez(asm_rv32_t *state, mp_uint_t rs, mp_int_t offset) {
+    // CB: 111 ... ... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0b01, 0b111, rs, offset));
+}
+
 // C.J OFFSET
-static inline void asm_rv32_opcode_cj(asm_rv32_t *state, mp_uint_t offset) {
+static inline void asm_rv32_opcode_cj(asm_rv32_t *state, mp_int_t offset) {
     // CJ: 101 ........... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CJ(0b01, 0b001, offset));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CJ(0b01, 0b101, offset));
 }
 
 // C.JALR RS
@@ -250,6 +285,12 @@ static inline void asm_rv32_opcode_clui(asm_rv32_t *state, mp_uint_t rd, mp_int_
     asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b011, rd, immediate >> 12));
 }
 
+// C.LW RD', OFFSET(RS')
+static inline void asm_rv32_opcode_clw(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    // CL: 010 ... ... .. ... 00
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CL(0b00, 0b010, rd, rs, offset));
+}
+
 // C.LWSP RD, OFFSET
 static inline void asm_rv32_opcode_clwsp(asm_rv32_t *state, mp_uint_t rd, mp_uint_t offset) {
     // CI: 010 . ..... ..... 10
@@ -383,6 +424,7 @@ static inline void asm_rv32_opcode_xori(asm_rv32_t *state, mp_uint_t rd, mp_uint
 }
 
 #define ASM_WORD_SIZE (4)
+#define ASM_HALFWORD_SIZE (2)
 
 #define REG_RET ASM_RV32_REG_A0
 #define REG_ARG_1 ASM_RV32_REG_A0
@@ -392,8 +434,7 @@ static inline void asm_rv32_opcode_xori(asm_rv32_t *state, mp_uint_t rd, mp_uint
 #define REG_TEMP0 ASM_RV32_REG_T1
 #define REG_TEMP1 ASM_RV32_REG_T2
 #define REG_TEMP2 ASM_RV32_REG_T3
-// S0 may be used as the frame pointer by the compiler.
-#define REG_FUN_TABLE ASM_RV32_REG_S2
+#define REG_FUN_TABLE ASM_RV32_REG_S1
 #define REG_LOCAL_1 ASM_RV32_REG_S3
 #define REG_LOCAL_2 ASM_RV32_REG_S4
 #define REG_LOCAL_3 ASM_RV32_REG_S5
@@ -432,10 +473,10 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_JUMP_IF_REG_EQ(state, rs1, rs2, label) asm_rv32_emit_jump_if_reg_eq(state, rs1, rs2, label)
 #define ASM_JUMP_IF_REG_NONZERO(state, rs, label, bool_test) asm_rv32_emit_jump_if_reg_nonzero(state, rs, label)
 #define ASM_JUMP_IF_REG_ZERO(state, rs, label, bool_test) asm_rv32_emit_jump_if_reg_eq(state, rs, ASM_RV32_REG_ZERO, label)
-#define ASM_JUMP_REG(state, rs) asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, rs, 0)
+#define ASM_JUMP_REG(state, rs) asm_rv32_opcode_cjr(state, rs)
 #define ASM_LOAD16_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load16_reg_reg_offset(state, rd, rs, offset)
 #define ASM_LOAD16_REG_REG(state, rd, rs) asm_rv32_opcode_lhu(state, rd, rs, 0)
-#define ASM_LOAD32_REG_REG(state, rd, rs) asm_rv32_opcode_lw(state, rd, rs, 0)
+#define ASM_LOAD32_REG_REG(state, rd, rs) ASM_LOAD_REG_REG_OFFSET(state, rd, rs, 0)
 #define ASM_LOAD8_REG_REG(state, rd, rs) asm_rv32_opcode_lbu(state, rd, rs, 0)
 #define ASM_LOAD_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset)
 #define ASM_LOAD_REG_REG(state, rd, rs) ASM_LOAD32_REG_REG(state, rd, rs)
@@ -452,7 +493,7 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_NOT_REG(state, rd) asm_rv32_opcode_xori(state, rd, rd, -1)
 #define ASM_OR_REG_REG(state, rd, rs) asm_rv32_opcode_or(state, rd, rd, rs)
 #define ASM_STORE16_REG_REG(state, rs1, rs2) asm_rv32_opcode_sh(state, rs1, rs2, 0)
-#define ASM_STORE32_REG_REG(state, rs1, rs2) asm_rv32_opcode_sw(state, rs1, rs2, 0)
+#define ASM_STORE32_REG_REG(state, rs1, rs2) ASM_STORE_REG_REG_OFFSET(state, rs1, rs2, 0)
 #define ASM_STORE8_REG_REG(state, rs1, rs2) asm_rv32_opcode_sb(state, rs1, rs2, 0)
 #define ASM_STORE_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset)
 #define ASM_STORE_REG_REG(state, rs1, rs2) ASM_STORE32_REG_REG(state, rs1, rs2)

From 557d31ed2c75e90b2f2c534c7019cb51aab5a7c8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 6 Oct 2022 13:44:54 +1100
Subject: [PATCH 1196/3129] py/objint: Try to convert big-int back to small-int
 after binary op.

Before this change, long/mpz ints propagated into all future calculations,
even if their value could fit in a small-int object.  With this change, the
result of a big-int binary op will now be converted to a small-int object
if the value fits in a small-int.

For example, a relatively common operation like `x = a * b // c` where
a,b,c all small ints would always result in a long/mpz int, even if it
didn't need to, and then this would impact all future calculations with
x.

This adds +24 bytes on PYBV11 but avoids heap allocations and potential
surprises (e.g. `big-big` is now a small `0`, and can safely be accessed
with MP_OBJ_SMALL_INT_VALUE).

Performance tests are unchanged on PYBV10, except for `bm_pidigits.py`
which makes heavy use of big-ints and gains about 8% in speed.

Unix coverage tests have been updated to cover mpz code that is now
unreachable by normal Python code (removing the unreachable code would lead
to some surprising gaps in the internal C functions and the functionality
may be needed in the future, so it is kept because it has minimal
overhead).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/coverage.c                  | 11 +++++++++++
 py/objint_longlong.c                   | 23 ++++++++---------------
 py/objint_mpz.c                        | 12 ++++++++++++
 tests/basics/int_big_to_small.py       | 22 ++++++++++++++++++++++
 tests/basics/int_big_to_small.py.exp   | 25 +++++++++++++++++++++++++
 tests/ports/unix/extra_coverage.py.exp |  2 ++
 6 files changed, 80 insertions(+), 15 deletions(-)
 create mode 100644 tests/basics/int_big_to_small.py
 create mode 100644 tests/basics/int_big_to_small.py.exp

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 803f849535cbe..b05e2dade60a8 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -4,6 +4,7 @@
 
 #include "py/obj.h"
 #include "py/objfun.h"
+#include "py/objint.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
@@ -454,6 +455,13 @@ static mp_obj_t extra_coverage(void) {
         mpz_mul_inpl(&mpz, &mpz2, &mpz);
         mpz_as_uint_checked(&mpz, &value);
         mp_printf(&mp_plat_print, "%d\n", (int)value);
+
+        // mpz_not_inpl with argument==0, testing ~0
+        mpz_set_from_int(&mpz, 0);
+        mpz_not_inpl(&mpz, &mpz);
+        mp_int_t value_signed;
+        mpz_as_int_checked(&mpz, &value_signed);
+        mp_printf(&mp_plat_print, "%d\n", (int)value_signed);
     }
 
     // runtime utils
@@ -470,6 +478,9 @@ static mp_obj_t extra_coverage(void) {
         // call mp_call_function_2_protected with invalid args
         mp_call_function_2_protected(MP_OBJ_FROM_PTR(&mp_builtin_divmod_obj), mp_obj_new_str("abc", 3), mp_obj_new_str("abc", 3));
 
+        // mp_obj_int_get_checked with mp_obj_int_t that has a value that is a small integer
+        mp_printf(&mp_plat_print, "%d\n", mp_obj_int_get_checked(mp_obj_int_new_mpz()));
+
         // mp_obj_int_get_uint_checked with non-negative small-int
         mp_printf(&mp_plat_print, "%d\n", (int)mp_obj_int_get_uint_checked(MP_OBJ_NEW_SMALL_INT(1)));
 
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 00fe5636c1607..1940b815386a6 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -247,25 +247,21 @@ 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 mp_obj_new_int(mp_int_t value) {
-    if (MP_SMALL_INT_FITS(value)) {
-        return MP_OBJ_NEW_SMALL_INT(value);
-    }
     return mp_obj_new_int_from_ll(value);
 }
 
 mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {
-    // SMALL_INT accepts only signed numbers, so make sure the input
-    // value fits completely in the small-int positive range.
-    if ((value & ~MP_SMALL_INT_POSITIVE_MASK) == 0) {
-        return MP_OBJ_NEW_SMALL_INT(value);
-    }
     return mp_obj_new_int_from_ll(value);
 }
 
 mp_obj_t mp_obj_new_int_from_ll(long long val) {
+    if ((long long)(mp_int_t)val == val && MP_SMALL_INT_FITS(val)) {
+        return MP_OBJ_NEW_SMALL_INT(val);
+    }
+
     mp_obj_int_t *o = mp_obj_malloc(mp_obj_int_t, &mp_type_int);
     o->val = val;
-    return o;
+    return MP_OBJ_FROM_PTR(o);
 }
 
 mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
@@ -273,19 +269,16 @@ 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 = mp_obj_malloc(mp_obj_int_t, &mp_type_int);
-    o->val = val;
-    return o;
+    return mp_obj_new_int_from_ll(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 = mp_obj_malloc(mp_obj_int_t, &mp_type_int);
     char *endptr;
-    o->val = strtoll(*str, &endptr, base);
+    mp_obj_t result = mp_obj_new_int_from_ll(strtoll(*str, &endptr, base));
     *str = endptr;
-    return o;
+    return result;
 }
 
 mp_int_t mp_obj_int_get_truncated(mp_const_obj_t self_in) {
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 4a1a685bbd42e..6f2ea616c779c 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -312,6 +312,14 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
                 return MP_OBJ_NULL; // op not supported
         }
 
+        // Check if the result fits in a small-int, and if so just return that.
+        mp_int_t res_small;
+        if (mpz_as_int_checked(&res->mpz, &res_small)) {
+            if (MP_SMALL_INT_FITS(res_small)) {
+                return MP_OBJ_NEW_SMALL_INT(res_small);
+            }
+        }
+
         return MP_OBJ_FROM_PTR(res);
 
     } else {
@@ -425,6 +433,10 @@ mp_int_t mp_obj_int_get_checked(mp_const_obj_t self_in) {
         const mp_obj_int_t *self = MP_OBJ_TO_PTR(self_in);
         mp_int_t value;
         if (mpz_as_int_checked(&self->mpz, &value)) {
+            // mp_obj_int_t objects should always contain a value that is a large
+            // integer (if the value fits in a small-int then it should have been
+            // converted to a small-int object), and so this code-path should never
+            // be taken in normal circumstances.
             return value;
         } else {
             // overflow
diff --git a/tests/basics/int_big_to_small.py b/tests/basics/int_big_to_small.py
new file mode 100644
index 0000000000000..64280d0c635f5
--- /dev/null
+++ b/tests/basics/int_big_to_small.py
@@ -0,0 +1,22 @@
+try:
+    import micropython
+    micropython.heap_lock
+except:
+    print("SKIP")
+    raise SystemExit
+
+# All less than small int max.
+for d in (0, 27, 1<<29, -1861, -(1<<29)):
+    i = 1<<70
+    print(i)
+    j = (1<<70) + d
+    print(j)
+    # k should now be a small int.
+    k = j - i
+    print(k)
+
+    # Now verify that working with k doesn't allocate (i.e. it's a small int).
+    micropython.heap_lock()
+    print(k + 20)
+    print(k // 20)
+    micropython.heap_unlock()
diff --git a/tests/basics/int_big_to_small.py.exp b/tests/basics/int_big_to_small.py.exp
new file mode 100644
index 0000000000000..1d4986e044372
--- /dev/null
+++ b/tests/basics/int_big_to_small.py.exp
@@ -0,0 +1,25 @@
+1180591620717411303424
+1180591620717411303424
+0
+20
+0
+1180591620717411303424
+1180591620717411303451
+27
+47
+1
+1180591620717411303424
+1180591620717948174336
+536870912
+536870932
+26843545
+1180591620717411303424
+1180591620717411301563
+-1861
+-1841
+-94
+1180591620717411303424
+1180591620716874432512
+-536870912
+-536870892
+-26843546
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index adffc2d5824a4..5e806ebe57ccf 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -88,9 +88,11 @@ data
 1
 12345
 6
+-1
 # runtime utils
 TypeError: unsupported type for __abs__: 'str'
 TypeError: unsupported types for __divmod__: 'str', 'str'
+0
 1
 2
 OverflowError: overflow converting long int to machine word

From bb6a4669b28b1cf9b314cb728cc7b319541a1cc0 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 1 Jul 2024 22:44:02 +0200
Subject: [PATCH 1197/3129] py/asmrv32: Do not use binary literals.

As per discussion in #15347, non-standard binary literals have been
removed in favour of their hexadecimal counterparts.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.h | 167 ++++++++++++++++++++++++---------------------------
 1 file changed, 79 insertions(+), 88 deletions(-)

diff --git a/py/asmrv32.h b/py/asmrv32.h
index 7f7602471c1d6..77a5b0ab67ac4 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -122,69 +122,60 @@ void asm_rv32_end_pass(asm_rv32_t *state);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#define RV32_ENCODE_TYPE_B(op, ft3, rs1, rs2, imm)                                              \
-    ((op & 0b1111111) | ((ft3 & 0b111) << 12) | ((imm & 0b100000000000) >> 4) |  \
-    ((imm & 0b11110) << 7) | ((rs1 & 0b11111) << 15) |                          \
-    ((rs2 & 0b11111) << 20) | ((imm & 0b11111100000) << 20) |                   \
-    ((imm & 0b1000000000000) << 19))
-
-#define RV32_ENCODE_TYPE_I(op, ft3, rd, rs, imm)                               \
-    ((op & 0b1111111) | ((rd & 0b11111) << 7) | ((ft3 & 0b111) << 12) |          \
-    ((rs & 0b11111) << 15) | ((imm & 0b111111111111) << 20))
-
-#define RV32_ENCODE_TYPE_J(op, rd, imm)                                        \
-    ((op & 0b1111111) | ((rd & 0b11111) << 7) | (imm & 0b11111111000000000000) | \
-    ((imm & 0b100000000000) << 9) | ((imm & 0b11111111110) << 20) |             \
-    ((imm & 0b100000000000000000000) << 11))
-
-#define RV32_ENCODE_TYPE_R(op, ft3, ft7, rd, rs1, rs2)                         \
-    ((op & 0b1111111) | ((rd & 0b11111) << 7) | ((ft3 & 0b111) << 12) |          \
-    ((rs1 & 0b11111) << 15) | ((rs2 & 0b11111) << 20) |                         \
-    ((ft7 & 0b1111111) << 25))
-
-#define RV32_ENCODE_TYPE_S(op, ft3, rs1, rs2, imm)                             \
-    ((op & 0b1111111) | ((imm & 0b11111) << 7) | ((ft3 & 0b111) << 12) |         \
-    ((rs1 & 0b11111) << 15) | ((rs2 & 0b11111) << 20) |                         \
-    ((imm & 0b111111100000) << 20))
-
-#define RV32_ENCODE_TYPE_U(op, rd, imm)                                        \
-    ((op & 0b1111111) | ((rd & 0b11111) << 7) |                                  \
-    (imm & 0b11111111111111111111000000000000))
+#define RV32_ENCODE_TYPE_B(op, ft3, rs1, rs2, imm) \
+    ((op & 0x7F) | ((ft3 & 0x07) << 12) | ((imm & 0x800) >> 4) | \
+    ((imm & 0x1E) << 7) | ((rs1 & 0x1F) << 15) | ((rs2 & 0x1F) << 20) | \
+    ((imm & 0x7E0) << 20) | ((imm & 0x1000) << 19))
+
+#define RV32_ENCODE_TYPE_I(op, ft3, rd, rs, imm) \
+    ((op & 0x7F) | ((rd & 0x1F) << 7) | ((ft3 & 0x07) << 12) | \
+    ((rs & 0x1F) << 15) | ((imm & 0xFFF) << 20))
+
+#define RV32_ENCODE_TYPE_J(op, rd, imm) \
+    ((op & 0x7F) | ((rd & 0x1F) << 7) | (imm & 0xFF000) | \
+    ((imm & 0x800) << 9) | ((imm & 0x7FE) << 20) | ((imm & 0x100000) << 11))
+
+#define RV32_ENCODE_TYPE_R(op, ft3, ft7, rd, rs1, rs2) \
+    ((op & 0x7F) | ((rd & 0x1F) << 7) | ((ft3 & 0x07) << 12) | \
+    ((rs1 & 0x1F) << 15) | ((rs2 & 0x1F) << 20) | ((ft7 & 0x7F) << 25))
+
+#define RV32_ENCODE_TYPE_S(op, ft3, rs1, rs2, imm) \
+    ((op & 0x7F) | ((imm & 0x1F) << 7) | ((ft3 & 0x07) << 12) | \
+    ((rs1 & 0x1F) << 15) | ((rs2 & 0x1F) << 20) | ((imm & 0xFE0) << 20))
+
+#define RV32_ENCODE_TYPE_U(op, rd, imm) \
+    ((op & 0x7F) | ((rd & 0x1F) << 7) | (imm & 0xFFFFF000))
 
 #define RV32_ENCODE_TYPE_CB(op, ft3, rs, imm) \
-    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rs & 0b111) << 7) | \
-    (((imm) & 0b100000000) << 4) | (((imm) & 0b11000000) >> 1) | \
-    (((imm) & 0b100000) >> 3) | (((imm) & 0b11000) << 7) | \
-    (((imm) & 0b110) << 2))
+    ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rs & 0x07) << 7) | \
+    (((imm) & 0x100) << 4) | (((imm) & 0xC0) >> 1) | (((imm) & 0x20) >> 3) | \
+    (((imm) & 0x18) << 7) | (((imm) & 0x06) << 2))
 
 #define RV32_ENCODE_TYPE_CI(op, ft3, rd, imm) \
-    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rd & 0b11111) << 7) | \
-    (((imm) & 0b100000) << 7) | (((imm) & 0b11111) << 2))
+    ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rd & 0x1F) << 7) | \
+    (((imm) & 0x20) << 7) | (((imm) & 0x1F) << 2))
 
 #define RV32_ENCODE_TYPE_CIW(op, ft3, rd, imm) \
-    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rd & 0b111) << 2) | \
-    ((imm & 0b1111000000) << 1) | ((imm & 0b110000) << 7) | \
-    ((imm & 0b1000) << 2) | ((imm & 0b100) << 4))
+    ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rd & 0x07) << 2) | \
+    ((imm & 0x3C0) << 1) | ((imm & 0x30) << 7) | \
+    ((imm & 0x08) << 2) | ((imm & 0x04) << 4))
 
 #define RV32_ENCODE_TYPE_CJ(op, ft3, imm) \
-    ((op & 0b11) | ((ft3 & 0b111) << 13) | \
-    ((imm & 0b1110) << 2) | ((imm & 0b1100000000) << 1) | \
-    ((imm & 0b100000000000) << 1) | ((imm & 0b10000000000) >> 2) | \
-    ((imm & 0b10000000) >> 1) | ((imm & 0b1000000) << 1) | \
-    ((imm & 0b100000) >> 3) | ((imm & 0b10000) << 7))
+    ((op & 0x03) | ((ft3 & 0x07) << 13) | ((imm & 0x0E) << 2) | \
+    ((imm & 0x300) << 1) | ((imm & 0x800) << 1) | ((imm & 0x400) >> 2) | \
+    ((imm & 0x80) >> 1) | ((imm & 0x40) << 1) | ((imm & 0x20) >> 3) | \
+    ((imm & 0x10) << 7))
 
 #define RV32_ENCODE_TYPE_CL(op, ft3, rd, rs, imm) \
-    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rd & 0b111) << 2) | \
-    ((rs & 0b111) << 7) | ((imm & 0b1000000) >> 1) | \
-    ((imm & 0b111000) << 7) | ((imm & 0b100) << 4))
+    ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rd & 0x07) << 2) | \
+    ((rs & 0x07) << 7) | ((imm & 0x40) >> 1) | ((imm & 0x38) << 7) | \
+    ((imm & 0x04) << 4))
 
 #define RV32_ENCODE_TYPE_CR(op, ft4, rs1, rs2) \
-    ((op & 0b11) | ((rs2 & 0b11111) << 2) | ((rs1 & 0b11111) << 7) | \
-    ((ft4 & 0b1111) << 12))
+    ((op & 0x03) | ((rs2 & 0x1F) << 2) | ((rs1 & 0x1F) << 7) | ((ft4 & 0x0F) << 12))
 
 #define RV32_ENCODE_TYPE_CSS(op, ft3, rs, imm) \
-    ((op & 0b11) | ((ft3 & 0b111) << 13) | ((rs & 0b11111) << 2) | \
-    ((imm) & 0b111111) << 7)
+    ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rs & 0x1F) << 2) | ((imm) & 0x3F) << 7)
 
 void asm_rv32_emit_word_opcode(asm_rv32_t *state, mp_uint_t opcode);
 void asm_rv32_emit_halfword_opcode(asm_rv32_t *state, mp_uint_t opcode);
@@ -192,235 +183,235 @@ void asm_rv32_emit_halfword_opcode(asm_rv32_t *state, mp_uint_t opcode);
 // ADD RD, RS1, RS2
 static inline void asm_rv32_opcode_add(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 000 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b000, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x00, 0x00, rd, rs1, rs2));
 }
 
 // ADDI RD, RS, IMMEDIATE
 static inline void asm_rv32_opcode_addi(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
     // I: ............ ..... 000 ..... 0010011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0010011, 0b000, rd, rs, immediate));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x00, rd, rs, immediate));
 }
 
 // AND RD, RS1, RS2
 static inline void asm_rv32_opcode_and(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 111 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b111, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x07, 0x00, rd, rs1, rs2));
 }
 
 // AUIPC RD, offset
 static inline void asm_rv32_opcode_auipc(asm_rv32_t *state, mp_uint_t rd, mp_int_t offset) {
     // U: .................... ..... 0010111
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_U(0b0010111, rd, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_U(0x17, rd, offset));
 }
 
 // BEQ RS1, RS2, OFFSET
 static inline void asm_rv32_opcode_beq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
     // B: . ...... ..... ..... 000 .... . 1100011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0b1100011, 0b000, rs1, rs2, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0x63, 0x00, rs1, rs2, offset));
 }
 
 // BNE RS1, RS2, OFFSET
 static inline void asm_rv32_opcode_bne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
     // B: . ...... ..... ..... 001 .... . 1100011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0b1100011, 0b001, rs1, rs2, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0x63, 0x01, rs1, rs2, offset));
 }
 
 // C.ADD RD, RS
 static inline void asm_rv32_opcode_cadd(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
     // CR: 1001 ..... ..... 10
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1001, rd, rs));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0x02, 0x09, rd, rs));
 }
 
 // C.ADDI RD, IMMEDIATE
 static inline void asm_rv32_opcode_caddi(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
     // CI: 000 . ..... ..... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b000, rd, immediate));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0x01, 0x00, rd, immediate));
 }
 
 // C.ADDI4SPN RD', IMMEDIATE
 static inline void asm_rv32_opcode_caddi4spn(asm_rv32_t *state, mp_uint_t rd, mp_uint_t immediate) {
     // CIW: 000 ........ ... 00
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CIW(0b00, 0b000, rd, immediate));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CIW(0x00, 0x00, rd, immediate));
 }
 
 // C.BEQZ RS', IMMEDIATE
 static inline void asm_rv32_opcode_cbeqz(asm_rv32_t *state, mp_uint_t rs, mp_int_t offset) {
     // CB: 110 ... ... ..... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0b01, 0b110, rs, offset));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x06, rs, offset));
 }
 
 // C.BNEZ RS', IMMEDIATE
 static inline void asm_rv32_opcode_cbnez(asm_rv32_t *state, mp_uint_t rs, mp_int_t offset) {
     // CB: 111 ... ... ..... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0b01, 0b111, rs, offset));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x07, rs, offset));
 }
 
 // C.J OFFSET
 static inline void asm_rv32_opcode_cj(asm_rv32_t *state, mp_int_t offset) {
     // CJ: 101 ........... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CJ(0b01, 0b101, offset));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CJ(0x01, 0x05, offset));
 }
 
 // C.JALR RS
 static inline void asm_rv32_opcode_cjalr(asm_rv32_t *state, mp_uint_t rs) {
     // CR: 1001 ..... 00000 10
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1001, rs, 0));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0x02, 0x09, rs, 0));
 }
 
 // C.JR RS
 static inline void asm_rv32_opcode_cjr(asm_rv32_t *state, mp_uint_t rs) {
     // CR: 1000 ..... 00000 10
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1000, rs, 0));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0x02, 0x08, rs, 0));
 }
 
 // C.LI RD, IMMEDIATE
 static inline void asm_rv32_opcode_cli(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
     // CI: 010 . ..... ..... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b010, rd, immediate));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0x01, 0x02, rd, immediate));
 }
 
 // C.LUI RD, IMMEDIATE
 static inline void asm_rv32_opcode_clui(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
     // CI: 011 . ..... ..... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b01, 0b011, rd, immediate >> 12));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0x01, 0x03, rd, immediate >> 12));
 }
 
 // C.LW RD', OFFSET(RS')
 static inline void asm_rv32_opcode_clw(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // CL: 010 ... ... .. ... 00
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CL(0b00, 0b010, rd, rs, offset));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CL(0x00, 0x02, rd, rs, offset));
 }
 
 // C.LWSP RD, OFFSET
 static inline void asm_rv32_opcode_clwsp(asm_rv32_t *state, mp_uint_t rd, mp_uint_t offset) {
     // CI: 010 . ..... ..... 10
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0b10, 0b010, rd, ((offset & 0b11000000) >> 6) | (offset & 0b111100)));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0x02, 0x02, rd, ((offset & 0xC0) >> 6) | (offset & 0x3C)));
 }
 
 // C.MV RD, RS
 static inline void asm_rv32_opcode_cmv(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
     // CR: 1000 ..... ..... 10
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0b10, 0b1000, rd, rs));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0x02, 0x08, rd, rs));
 }
 
 // C.SWSP RS, OFFSET
 static inline void asm_rv32_opcode_cswsp(asm_rv32_t *state, mp_uint_t rs, mp_uint_t offset) {
     // CSS: 010 ...... ..... 10
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CSS(0b10, 0b110, rs, ((offset & 0b11000000) >> 6) | (offset & 0b111100)));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CSS(0x02, 0x06, rs, ((offset & 0xC0) >> 6) | (offset & 0x3C)));
 }
 
 // JALR RD, RS, offset
 static inline void asm_rv32_opcode_jalr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // I: ............ ..... 000 ..... 1100111
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b1100111, 0b000, rd, rs, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x67, 0x00, rd, rs, offset));
 }
 
 // LBU RD, OFFSET(RS)
 static inline void asm_rv32_opcode_lbu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // I: ............ ..... 100 ..... 0000011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0000011, 0b100, rd, rs, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, 0x04, rd, rs, offset));
 }
 
 // LHU RD, OFFSET(RS)
 static inline void asm_rv32_opcode_lhu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // I: ............ ..... 101 ..... 0000011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0000011, 0b101, rd, rs, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, 0x05, rd, rs, offset));
 }
 
 // LUI RD, immediate
 static inline void asm_rv32_opcode_lui(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
     // U: .................... ..... 0110111
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_U(0b0110111, rd, immediate));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_U(0x37, rd, immediate));
 }
 
 // LW RD, OFFSET(RS)
 static inline void asm_rv32_opcode_lw(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // I: ............ ..... 010 ..... 0000011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0000011, 0b010, rd, rs, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, 0x02, rd, rs, offset));
 }
 
 // MUL RD, RS1, RS2
 static inline void asm_rv32m_opcode_mul(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000001 ..... ..... 000 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b000, 0b0000001, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x00, 0x01, rd, rs1, rs2));
 }
 
 // OR RD, RS1, RS2
 static inline void asm_rv32_opcode_or(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 110 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b110, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x06, 0x00, rd, rs1, rs2));
 }
 
 // SLL RD, RS1, RS2
 static inline void asm_rv32_opcode_sll(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 001 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b001, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x01, 0x00, rd, rs1, rs2));
 }
 
 // SLLI RD, RS, IMMEDIATE
 static inline void asm_rv32_opcode_slli(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_uint_t immediate) {
     // I: 0000000..... ..... 001 ..... 0010011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0010011, 0b001, rd, rs, immediate & 0x1F));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x01, rd, rs, immediate & 0x1F));
 }
 
 // SRL RD, RS1, RS2
 static inline void asm_rv32_opcode_srl(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 101 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b101, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x05, 0x00, rd, rs1, rs2));
 }
 
 // SLT RD, RS1, RS2
 static inline void asm_rv32_opcode_slt(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 010 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b010, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x02, 0x00, rd, rs1, rs2));
 }
 
 // SLTU RD, RS1, RS2
 static inline void asm_rv32_opcode_sltu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 011 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b011, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x03, 0x00, rd, rs1, rs2));
 }
 
 // SRA RD, RS1, RS2
 static inline void asm_rv32_opcode_sra(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0100000 ..... ..... 101 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b101, 0b0100000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x05, 0x20, rd, rs1, rs2));
 }
 
 // SUB RD, RS1, RS2
 static inline void asm_rv32_opcode_sub(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0100000 ..... ..... 000 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b000, 0b0100000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x00, 0x20, rd, rs1, rs2));
 }
 
 // SB RS2, OFFSET(RS1)
 static inline void asm_rv32_opcode_sb(asm_rv32_t *state, mp_uint_t rs2, mp_uint_t rs1, mp_int_t offset) {
     // S: ....... ..... ..... 000 ..... 0100011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0b0100011, 0b000, rs1, rs2, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0x23, 0x00, rs1, rs2, offset));
 }
 
 // SH RS2, OFFSET(RS1)
 static inline void asm_rv32_opcode_sh(asm_rv32_t *state, mp_uint_t rs2, mp_uint_t rs1, mp_int_t offset) {
     // S: ....... ..... ..... 001 ..... 0100011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0b0100011, 0b001, rs1, rs2, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0x23, 0x01, rs1, rs2, offset));
 }
 
 // SW RS2, OFFSET(RS1)
 static inline void asm_rv32_opcode_sw(asm_rv32_t *state, mp_uint_t rs2, mp_uint_t rs1, mp_int_t offset) {
     // S: ....... ..... ..... 010 ..... 0100011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0b0100011, 0b010, rs1, rs2, offset));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0x23, 0x02, rs1, rs2, offset));
 }
 
 // XOR RD, RS1, RS2
 static inline void asm_rv32_opcode_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 100 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0b0110011, 0b100, 0b0000000, rd, rs1, rs2));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x04, 0x00, rd, rs1, rs2));
 }
 
 // XORI RD, RS, IMMEDIATE
 static inline void asm_rv32_opcode_xori(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
     // I: ............ ..... 100 ..... 0010011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0b0010011, 0b100, rd, rs, immediate));
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x04, rd, rs, immediate));
 }
 
 #define ASM_WORD_SIZE (4)

From 57008a1e69166bc55c315a54f966694031be83f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Wed, 12 Jun 2024 06:56:51 +0000
Subject: [PATCH 1198/3129] extmod/machine_usb_device: Add
 USBDevice.remote_wakeup method.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This simply exposes the TinyUSB function.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 docs/library/machine.USBDevice.rst | 7 +++++++
 extmod/machine_usb_device.c        | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/docs/library/machine.USBDevice.rst b/docs/library/machine.USBDevice.rst
index 5fc71651612b1..a47fda2a28d35 100644
--- a/docs/library/machine.USBDevice.rst
+++ b/docs/library/machine.USBDevice.rst
@@ -215,6 +215,13 @@ Methods
      drivers. Placing a different string at any of these indexes overrides that
      string in the built-in driver.
 
+.. method:: USBDevice.remote_wakeup(self)
+
+    Wake up host if we are in suspend mode and the REMOTE_WAKEUP feature
+    is enabled by the host. This has to be enabled in the USB attributes,
+    and on the host. Returns ``True`` if remote wakeup was enabled and
+    active and the host was woken up.
+
 .. method:: USBDevice.submit_xfer(self, ep, buffer /)
 
             Submit a USB transfer on endpoint number ``ep``. ``buffer`` must be
diff --git a/extmod/machine_usb_device.c b/extmod/machine_usb_device.c
index 69c3f38487006..5c4e84c38d1fe 100644
--- a/extmod/machine_usb_device.c
+++ b/extmod/machine_usb_device.c
@@ -157,6 +157,11 @@ static mp_obj_t usb_device_active(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(usb_device_active_obj, 1, 2, usb_device_active);
 
+static mp_obj_t usb_remote_wakeup(mp_obj_t self) {
+    return mp_obj_new_bool(tud_remote_wakeup());
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(usb_remote_wakeup_obj, usb_remote_wakeup);
+
 static mp_obj_t usb_device_stall(size_t n_args, const mp_obj_t *args) {
     mp_obj_usb_device_t *self = (mp_obj_usb_device_t *)MP_OBJ_TO_PTR(args[0]);
     int epnum = mp_obj_get_int(args[1]);
@@ -272,6 +277,7 @@ static const mp_rom_map_elem_t usb_device_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_submit_xfer), MP_ROM_PTR(&usb_device_submit_xfer_obj) },
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&usb_device_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_stall), MP_ROM_PTR(&usb_device_stall_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remote_wakeup), MP_ROM_PTR(&usb_remote_wakeup_obj) },
 
     // Built-in driver constants
     { MP_ROM_QSTR(MP_QSTR_BUILTIN_NONE), MP_ROM_PTR(&mp_type_usb_device_builtin_none) },

From 838794ebccb0536606bc8e67fda2be5a47c2dffd Mon Sep 17 00:00:00 2001
From: Sylvain Zimmer <sylvain@sylvainzimmer.com>
Date: Wed, 5 Jun 2024 11:41:38 +0200
Subject: [PATCH 1199/3129] extmod/mbedtls: Enable GCM and ECDHE-RSA in common
 mbedtls config.

Enable support for cipher suites like
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, as suggested in
https://github.com/micropython/micropython/issues/14204#issuecomment-2024366349
and https://github.com/micropython/micropython/issues/10485#issuecomment-1396426824

Tests have been run on the top 500 domains from moz.com.  Without this
patch, 155 out of 500 fail to connect because of TLS issues.  This patch
fixes them all.  And it seems all existing mbedtls flags are needed to get
good coverage of those top 500 domains.

The `ssl_poll.py` test has the cipher bits increased from 512 to 1024 in
its test key/cert so that it can work with ECDHE-RSA which is now the
chosen cipher.

Signed-off-by: Sylvain Zimmer <sylvain@sylvainzimmer.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/mbedtls/mbedtls_config_common.h |  2 +
 tests/extmod/ssl_poll.py               | 66 ++++++++++++++++----------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index db1562f279732..4028bdf56d29b 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -46,6 +46,7 @@
 #define MBEDTLS_ECP_DP_SECP256K1_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 #define MBEDTLS_CAN_ECDH
 #define MBEDTLS_PK_CAN_ECDSA_SIGN
 #define MBEDTLS_PKCS1_V15
@@ -72,6 +73,7 @@
 #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
diff --git a/tests/extmod/ssl_poll.py b/tests/extmod/ssl_poll.py
index 347e5f7d37a42..42d7fb3f84982 100644
--- a/tests/extmod/ssl_poll.py
+++ b/tests/extmod/ssl_poll.py
@@ -2,7 +2,6 @@
     import select
     import ssl
     import io
-    import binascii
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -18,32 +17,47 @@
 
 # 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"
+# They has been generated using the following commands:
+# $ openssl req -x509 -newkey rsa:1024 -keyout rsa_key.pem -out rsa_cert.pem -days 3650 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
+# $ openssl pkey -in rsa_key.pem -out rsa_key.der -outform DER
+# $ openssl x509 -in rsa_cert.pem -out rsa_cert.der -outform DER
+key = bytes.fromhex(
+    "3082025d02010002818100eca28b2f8230237ae45e7a77ef495c05a786f423cc65caf6bc"
+    "1813d50eacf9d2d011a0e43a20fde947ff957075e4b3b6ded46c33f63af42597aac1c4cb"
+    "bb2d1a6aad91755707d8fc560e222b38c940a480da89ee849049613bd88d1ab283423aba"
+    "ba591c4fcc8ce89d19646e6b9f80de4efa7bbda68c569a5cbdb4235c3fc9990203010001"
+    "0281810089d4df978b90388a534c88af252ca8b20e7377ef0616609338da196b27422fbd"
+    "d03e04660b49be3bcc191dd5448632fb986d489d3795fd318c5704c879168c5cd0fa8551"
+    "f7f86073b95b092ffdb4f39c867a306a02f94cf3009df7055dab1f9277dd8914268d53a2"
+    "bd4de2cdf2ac90d8cd248b48868cb911781779750c344ae5024100f8c0d2cebfaccbdb1b"
+    "d8bc7519c84889cc6d5dff8fb994cf1a9492881289de66d689afb942d10dc0dc0f65464e"
+    "7cca7a53e451e6a8cfab0069d05065d56ba4bf024100f38757e2fc7f786e1a653c8a8b51"
+    "5b06a1d85db31998090fc4d52a88b8c5557e0a7bac10995e7e76cef6bfb59b67c01cbba7"
+    "edcfa7d3d623615a92459d07efa702407b149579fcf717caeb455b4229a6a2d5a3d3bd7d"
+    "d4f4833fd22c0f30cad372bab98e58e736bb4fadcc74c5ac7aeb5e1816e852e9e93f0fa2"
+    "5db8d7fefb118eeb024100caf0a0a6c1b02055f09d28c473b10a600e8356222853f04939"
+    "c84237c97278fa1e164d9f4f8fd56780b553b12d9e5a1417b5ab91fed3a381bc6153bfbb"
+    "4a9fc5024043eb4ff7e4dd6c12c6d6dc50977ee5d5f9730af4469d1f642321320fb4b969"
+    "90ed841e41bedda49ff89a0c28acf132e4af5f3ac406b1548d0f135aff6bf23ef1"
 )
-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"
+cert = bytes.fromhex(
+    "3082025a308201c3a003020102021475fd479918562f4c6cb08f63e8afbdfa3b884f8630"
+    "0d06092a864886f70d01010b0500303f311a301806035504030c116d6963726f70797468"
+    "6f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b30090603"
+    "55040613024155301e170d3234303730323030353931355a170d33343036333030303539"
+    "31355a303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c311430"
+    "12060355040a0c0b4d6963726f507974686f6e310b300906035504061302415530819f30"
+    "0d06092a864886f70d010101050003818d0030818902818100eca28b2f8230237ae45e7a"
+    "77ef495c05a786f423cc65caf6bc1813d50eacf9d2d011a0e43a20fde947ff957075e4b3"
+    "b6ded46c33f63af42597aac1c4cbbb2d1a6aad91755707d8fc560e222b38c940a480da89"
+    "ee849049613bd88d1ab283423ababa591c4fcc8ce89d19646e6b9f80de4efa7bbda68c56"
+    "9a5cbdb4235c3fc9990203010001a3533051301d0603551d0e04160414409545477a659a"
+    "16da174810ba9ad192ef962089301f0603551d23041830168014409545477a659a16da17"
+    "4810ba9ad192ef962089300f0603551d130101ff040530030101ff300d06092a864886f7"
+    "0d01010b0500038181007182e78cecceef00f98d0ee117cd9dc2f9fc84d581e7b1d9d43b"
+    "74db45e188368e264f79628e2bda89a545d50cd9925ad50f8e25decc9130164bdb9220c8"
+    "f49776d784511e9c4b94305cc2cb3eaf8204e42d31ba8aabd1d296b9ef51035b6df1ab75"
+    "89681f0026073ccac6bed5d8bd9235a4bb717b696ce518de4e35b751fa13"
 )
 
 

From 75350f9c8e2e433f997bb30cceed4b967ad55a19 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Jul 2024 10:31:44 +1000
Subject: [PATCH 1200/3129] rp2/mbedtls: Remove config options that are now in
 the common settings.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mbedtls/mbedtls_config_port.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/rp2/mbedtls/mbedtls_config_port.h b/ports/rp2/mbedtls/mbedtls_config_port.h
index 4e4c6e263fa59..b3f19f3a07dad 100644
--- a/ports/rp2/mbedtls/mbedtls_config_port.h
+++ b/ports/rp2/mbedtls/mbedtls_config_port.h
@@ -28,10 +28,6 @@
 
 // Set mbedtls configuration
 #define MBEDTLS_ECP_NIST_OPTIM
-#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-
-// Enable mbedtls modules
-#define MBEDTLS_GCM_C
 
 // Time hook
 #include <time.h>

From 462fa5f94ff7a90afb42e72ce145309fa671ddce Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Tue, 2 Jul 2024 12:33:34 +0100
Subject: [PATCH 1201/3129] rp2/rp2_pio: Replace PIO_NUM macro with
 pio_get_index.

The `PIO_NUM` macro was defined when `rp2_pio.c` was first conceived.
There's now a Pico SDK function for this, `pio_get_index()`, which is
already used in some parts of the code.

This commit removes `PIO_NUM` in favour of using `pio_get_index()`
everywhere.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/rp2_pio.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index b882bbbc50c8c..447ea244c75a5 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -37,8 +37,6 @@
 #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;
@@ -82,7 +80,7 @@ static void pio_irq0(PIO pio) {
     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)]);
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[pio_get_index(pio)]);
     if (irq != NULL && (ints & irq->trigger)) {
         irq->flags = ints & irq->trigger;
         mp_irq_handler(&irq->base);
@@ -90,7 +88,7 @@ static void pio_irq0(PIO pio) {
 
     // 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]);
+        rp2_state_machine_irq_obj_t *irq = MP_STATE_PORT(rp2_state_machine_irq_obj[pio_get_index(pio) * 4 + i]);
         if (irq != NULL && ((ints >> (8 + i)) & irq->trigger)) {
             irq->flags = 1;
             mp_irq_handler(&irq->base);
@@ -280,7 +278,7 @@ static mp_obj_t rp2_pio_add_program(mp_obj_t self_in, mp_obj_t prog_in) {
     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);
+    prog[PROG_OFFSET_PIO0 + pio_get_index(self->pio)] = MP_OBJ_NEW_SMALL_INT(offset);
 
     return mp_const_none;
 }
@@ -301,12 +299,12 @@ static mp_obj_t rp2_pio_remove_program(size_t n_args, const mp_obj_t *args) {
         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)]);
+        offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + pio_get_index(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);
+        prog[PROG_OFFSET_PIO0 + pio_get_index(self->pio)] = MP_OBJ_NEW_SMALL_INT(-1);
     }
 
     // Remove the program from the instruction memory.
@@ -354,7 +352,7 @@ static mp_obj_t rp2_pio_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     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)]);
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[pio_get_index(self->pio)]);
 
     // Allocate the IRQ object if it doesn't already exist.
     if (irq == NULL) {
@@ -364,7 +362,7 @@ static mp_obj_t rp2_pio_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
         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;
+        MP_STATE_PORT(rp2_pio_irq_obj[pio_get_index(self->pio)]) = irq;
     }
 
     if (n_args > 1 || kw_args->used != 0) {
@@ -426,7 +424,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 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)]);
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[pio_get_index(self->pio)]);
     irq_set_enabled(self->irq, false);
     irq->flags = 0;
     irq->trigger = new_trigger;
@@ -436,7 +434,7 @@ static mp_uint_t rp2_pio_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
 
 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)]);
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[pio_get_index(self->pio)]);
     if (info_type == MP_IRQ_INFO_FLAGS) {
         return irq->flags;
     } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
@@ -537,10 +535,10 @@ static mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
     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)]);
+    mp_int_t offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + pio_get_index(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)]);
+        rp2_pio_add_program(&rp2_pio_obj[pio_get_index(self->pio)], args[ARG_prog].u_obj);
+        offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + pio_get_index(self->pio)]);
     }
     rp2_state_machine_initial_pc[self->id] = offset;
 
@@ -907,7 +905,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 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)]);
+    rp2_state_machine_irq_obj_t *irq = MP_STATE_PORT(rp2_state_machine_irq_obj[pio_get_index(self->pio)]);
     irq_set_enabled(self->irq, false);
     irq->flags = 0;
     irq->trigger = new_trigger;
@@ -917,7 +915,7 @@ static mp_uint_t rp2_state_machine_irq_trigger(mp_obj_t self_in, mp_uint_t new_t
 
 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)]);
+    rp2_state_machine_irq_obj_t *irq = MP_STATE_PORT(rp2_state_machine_irq_obj[pio_get_index(self->pio)]);
     if (info_type == MP_IRQ_INFO_FLAGS) {
         return irq->flags;
     } else if (info_type == MP_IRQ_INFO_TRIGGERS) {

From f61fac0ba6e2684b8bb4b11c7a768b0cb805c198 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Tue, 2 Jul 2024 12:41:29 +0100
Subject: [PATCH 1202/3129] rp2/rp2_pio: Replace explicit pio ternary
 expression with pio_get_index.

There are three changes here:
- Fix `rp2_pio_print` to use `pio_get_index()` too, since it had its own
  copy of the ternary expression.
- Remove a ternary from `rp2_pio_state_machine` and calculate it from
  `pio_get_index`.
- Remove a ternary on `GPIO_FUNC_PIO0` vs `GPIO_FUNC_PIO1`.  These
  constants are sequentially ordered so we can calculate them too.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/rp2_pio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 447ea244c75a5..410269e2d3d31 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -226,7 +226,7 @@ static void asm_pio_init_gpio(PIO pio, uint32_t sm, asm_pio_config_t *config) {
     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);
+        gpio_set_function(config->base + i, GPIO_FUNC_PIO0 + pio_get_index(pio));
     }
 }
 
@@ -242,7 +242,7 @@ static rp2_pio_obj_t rp2_pio_obj[] = {
 
 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);
+    mp_printf(print, "PIO(%u)", pio_get_index(self->pio));
 }
 
 // constructor(id)
@@ -326,7 +326,7 @@ static mp_obj_t rp2_pio_state_machine(size_t n_args, const mp_obj_t *pos_args, m
     }
 
     // Return the correct StateMachine object.
-    const rp2_state_machine_obj_t *sm = rp2_state_machine_get_object((self->pio == pio0 ? 0 : 4) + sm_id);
+    const rp2_state_machine_obj_t *sm = rp2_state_machine_get_object(pio_get_index(self->pio) * 4 + sm_id);
 
     if (n_args > 2 || kw_args->used > 0) {
         // Configuration arguments given so init this StateMachine.

From 2b8de7436bbdb54da99bf6bdb79359876fd3bc1d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 24 Jan 2024 16:48:43 +0100
Subject: [PATCH 1203/3129] rp2/machine_adc: Initialise ADC GPIO when a Pin is
 referenced by int.

The change closes the gap in the API when an integer is used as Pin
reference.  With the change, e.g. ADC(26), ADC(Pin(26)) and ADC("GP26")
behave identically and the GPIO is initialised in ACD/high-Z mode.

Only when using ADC channel numbers 0-3 are the corresponding GPIO left
uninitialised, and then the user is responsible for configuring the GPIO.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/rp2/machine_adc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index e5a428563d1ce..3594f4b124022 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -74,14 +74,14 @@ static mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
     const machine_pin_obj_t *pin = NULL;
 
     if (mp_obj_is_int(source)) {
-        // Get and validate channel number.
         channel = mp_obj_get_int(source);
-        if (ADC_IS_VALID_GPIO(channel)) {
-            channel = ADC_CHANNEL_FROM_GPIO(channel);
-        } else if (!(channel >= 0 && channel <= ADC_CHANNEL_TEMPSENSOR)) {
-            mp_raise_ValueError(MP_ERROR_TEXT("invalid channel"));
+        if (!(channel >= 0 && channel <= ADC_CHANNEL_TEMPSENSOR)) {
+            // Not a valid ADC channel, fallback to searching for a pin.
+            channel = -1;
         }
-    } else {
+    }
+
+    if (channel == -1) {
         // Get GPIO and check it has ADC capabilities.
         pin = machine_pin_find(source);
         bool valid_adc_pin = false;

From f36a5654a87838e68fb313272098777f76a94865 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 2 Feb 2024 13:47:12 +0100
Subject: [PATCH 1204/3129] docs/rp2/quickref: Document the use of channel
 numbers for ADC.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/rp2/quickref.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 11a808c110278..ecf3f31861c22 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -187,6 +187,14 @@ Use the :ref:`machine.ADC <machine.ADC>` class::
     adc = ADC(Pin(26))     # create ADC object on ADC pin
     adc.read_u16()         # read value, 0-65535 across voltage range 0.0v - 3.3v
 
+The argument of the constructor ADC specifies either a Pin by number, name of as
+Pin object, or a channel number in the range 0 - 3 or ADC.CORE_TEMP for the
+internal temperature sensor. If a pin is specified,
+the pin is initialized in high-Z mode. If a channel number is used, the pin
+is not initialized and configuring is left to the user code. After hard reset,
+RP2040 pins operate in current sink mode at about 60µA. If the pin is not
+otherwise configured, that may lead to wrong ADC readings.
+
 Software SPI bus
 ----------------
 

From 289b2dd87960a4cdf019013cecd489f0d0cabc26 Mon Sep 17 00:00:00 2001
From: Jon Foster <jon@jon-foster.co.uk>
Date: Mon, 1 Apr 2024 19:19:29 +0100
Subject: [PATCH 1205/3129] py/objstr: Add new mp_obj_new_str_from_cstr()
 helper function.

There were lots of places where this pattern was duplicated, to convert a
standard C string to a MicroPython string:

    x = mp_obj_new_str(s, strlen(s));

This commit provides a simpler method that removes this code duplication:

    x = mp_obj_new_str_from_cstr(s);

This gives clearer, and probably smaller, code.

Signed-off-by: Jon Foster <jon@jon-foster.co.uk>
---
 py/obj.h    | 1 +
 py/objstr.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/py/obj.h b/py/obj.h
index 86952565c55d6..82f67fad4d96c 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -971,6 +971,7 @@ mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, uns
 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); // will check utf-8 (raises UnicodeError)
+mp_obj_t mp_obj_new_str_from_cstr(const char *str); // // accepts null-terminated string, 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
diff --git a/py/objstr.c b/py/objstr.c
index c7e4ebf53b753..346a6259f7423 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2308,6 +2308,10 @@ mp_obj_t mp_obj_new_str(const char *data, size_t len) {
     }
 }
 
+mp_obj_t mp_obj_new_str_from_cstr(const char *str) {
+    return mp_obj_new_str(str, strlen(str));
+}
+
 mp_obj_t mp_obj_str_intern(mp_obj_t str) {
     GET_STR_DATA_LEN(str, data, len);
     return mp_obj_new_str_via_qstr((const char *)data, len);

From 92484d8822635c125a7648d5b056ff7f78d62ab3 Mon Sep 17 00:00:00 2001
From: Jon Foster <jon@jon-foster.co.uk>
Date: Mon, 1 Apr 2024 19:23:49 +0100
Subject: [PATCH 1206/3129] all: Use new mp_obj_new_str_from_cstr() function.

Use new function mp_obj_new_str_from_cstr() where appropriate.  It
simplifies the code, and makes it smaller too.

Signed-off-by: Jon Foster <jon@jon-foster.co.uk>
---
 extmod/modlwip.c                     | 2 +-
 extmod/modnetwork.c                  | 2 +-
 extmod/modopenamp.c                  | 2 +-
 extmod/modopenamp_remoteproc_store.c | 2 +-
 extmod/modtls_mbedtls.c              | 6 +++---
 extmod/modwebrepl.c                  | 2 +-
 extmod/network_esp_hosted.c          | 2 +-
 extmod/network_lwip.c                | 4 ++--
 extmod/network_ninaw10.c             | 2 +-
 extmod/vfs.c                         | 2 +-
 extmod/vfs_fat.c                     | 4 ++--
 extmod/vfs_lfsx.c                    | 2 +-
 extmod/vfs_posix.c                   | 4 ++--
 ports/cc3200/mods/modwlan.c          | 6 +++---
 ports/esp32/esp32_partition.c        | 2 +-
 ports/esp32/modsocket.c              | 4 ++--
 ports/esp32/network_common.c         | 2 +-
 ports/esp32/network_ppp.c            | 2 +-
 ports/esp32/network_wlan.c           | 2 +-
 ports/esp8266/network_wlan.c         | 2 +-
 ports/unix/coverage.c                | 8 ++++----
 ports/unix/main.c                    | 2 +-
 ports/unix/modffi.c                  | 2 +-
 ports/unix/modjni.c                  | 2 +-
 ports/unix/modos.c                   | 2 +-
 ports/zephyr/main.c                  | 4 ++--
 ports/zephyr/modsocket.c             | 2 +-
 py/binary.c                          | 2 +-
 28 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index bcee3f0ff1a93..b07c1d8159c2f 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -373,7 +373,7 @@ mp_obj_t lwip_format_inet_addr(const ip_addr_t *ip, mp_uint_t port) {
     char ipstr[IPADDR_STRLEN_MAX];
     ipaddr_ntoa_r(ip, ipstr, sizeof(ipstr));
     mp_obj_t tuple[2] = {
-        tuple[0] = mp_obj_new_str(ipstr, strlen(ipstr)),
+        tuple[0] = mp_obj_new_str_from_cstr(ipstr),
         tuple[1] = mp_obj_new_int(port),
     };
     return mp_obj_new_tuple(2, tuple);
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 88f9d37180bcd..f3d7d0faa8e1d 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -127,7 +127,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj, 0, 1, network_count
 
 mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
-        return mp_obj_new_str(mod_network_hostname_data, strlen(mod_network_hostname_data));
+        return mp_obj_new_str_from_cstr(mod_network_hostname_data);
     } else {
         size_t len;
         const char *str = mp_obj_str_get_data(args[0], &len);
diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index 7a19e55a660d9..29135d57a80b3 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -263,7 +263,7 @@ static void openamp_ns_callback(struct rpmsg_device *rdev, const char *name, uin
     // the Name Service (NS) announcement containing the name of the channel.
     virtio_dev_obj_t *virtio_device = metal_container_of(rdev, virtio_dev_obj_t, rvdev);
     if (virtio_device->ns_callback != mp_const_none) {
-        mp_call_function_2(virtio_device->ns_callback, mp_obj_new_int(dest), mp_obj_new_str(name, strlen(name)));
+        mp_call_function_2(virtio_device->ns_callback, mp_obj_new_int(dest), mp_obj_new_str_from_cstr(name));
     }
 }
 
diff --git a/extmod/modopenamp_remoteproc_store.c b/extmod/modopenamp_remoteproc_store.c
index 262e6f2ec79b1..aed652c485553 100644
--- a/extmod/modopenamp_remoteproc_store.c
+++ b/extmod/modopenamp_remoteproc_store.c
@@ -70,7 +70,7 @@ void *mp_openamp_remoteproc_store_alloc(void) {
 static int openamp_remoteproc_store_open(void *store, const char *path, const void **image_data) {
     metal_log(METAL_LOG_DEBUG, "store_open(): %s\n", path);
     mp_obj_t args[2] = {
-        mp_obj_new_str(path, strlen(path)),
+        mp_obj_new_str_from_cstr(path),
         MP_OBJ_NEW_QSTR(MP_QSTR_rb),
     };
 
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 6db6ac1958dd2..5a9487ab89323 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -307,7 +307,7 @@ static mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
     mp_obj_t list = mp_obj_new_list(0, NULL);
     for (const int *cipher_list = mbedtls_ssl_list_ciphersuites(); *cipher_list; ++cipher_list) {
         const char *cipher_name = mbedtls_ssl_get_ciphersuite_name(*cipher_list);
-        mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str(cipher_name, strlen(cipher_name))));
+        mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str_from_cstr(cipher_name)));
     }
     return list;
 }
@@ -572,8 +572,8 @@ static mp_obj_t mod_ssl_cipher(mp_obj_t o_in) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
     const char *cipher_suite = mbedtls_ssl_get_ciphersuite(&o->ssl);
     const char *tls_version = mbedtls_ssl_get_version(&o->ssl);
-    mp_obj_t tuple[2] = {mp_obj_new_str(cipher_suite, strlen(cipher_suite)),
-                         mp_obj_new_str(tls_version, strlen(tls_version))};
+    mp_obj_t tuple[2] = {mp_obj_new_str_from_cstr(cipher_suite),
+                         mp_obj_new_str_from_cstr(tls_version)};
 
     return mp_obj_new_tuple(2, tuple);
 }
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index 9d09f65a37c1b..bac223d95243f 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -146,7 +146,7 @@ static void handle_op(mp_obj_webrepl_t *self) {
     // Handle operations requiring opened file
 
     mp_obj_t open_args[2] = {
-        mp_obj_new_str(self->hdr.fname, strlen(self->hdr.fname)),
+        mp_obj_new_str_from_cstr(self->hdr.fname),
         MP_OBJ_NEW_QSTR(MP_QSTR_rb)
     };
 
diff --git a/extmod/network_esp_hosted.c b/extmod/network_esp_hosted.c
index 0747343d87ea6..04cfc36b323ce 100644
--- a/extmod/network_esp_hosted.c
+++ b/extmod/network_esp_hosted.c
@@ -230,7 +230,7 @@ static mp_obj_t network_esp_hosted_config(size_t n_args, const mp_obj_t *args, m
             case MP_QSTR_essid: {
                 esp_hosted_netinfo_t netinfo;
                 esp_hosted_wifi_netinfo(&netinfo);
-                return mp_obj_new_str(netinfo.ssid, strlen(netinfo.ssid));
+                return mp_obj_new_str_from_cstr(netinfo.ssid);
             }
             case MP_QSTR_security: {
                 esp_hosted_netinfo_t netinfo;
diff --git a/extmod/network_lwip.c b/extmod/network_lwip.c
index 329a45c46fb99..71dc295e1846e 100644
--- a/extmod/network_lwip.c
+++ b/extmod/network_lwip.c
@@ -113,7 +113,7 @@ mp_obj_t mod_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwa
             case MP_QSTR_dns: {
                 char addr_str[IPADDR_STRLEN_MAX];
                 ipaddr_ntoa_r(dns_getserver(0), addr_str, sizeof(addr_str));
-                return mp_obj_new_str(addr_str, strlen(addr_str));
+                return mp_obj_new_str_from_cstr(addr_str);
             }
             case MP_QSTR_prefer: {
                 return MP_OBJ_NEW_SMALL_INT(mp_mod_network_prefer_dns_use_ip_version);
@@ -219,7 +219,7 @@ mp_obj_t mod_network_nic_ipconfig(struct netif *netif, size_t n_args, const mp_o
                         char addr_str[IPADDR_STRLEN_MAX];
                         ipaddr_ntoa_r(netif_ip_addr6(netif, i), addr_str, sizeof(addr_str));
                         mp_obj_t tuple[4] = {
-                            mp_obj_new_str(addr_str, strlen(addr_str)),
+                            mp_obj_new_str_from_cstr(addr_str),
                             MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_state(netif, i)),
                             MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_pref_life(netif, i)), // preferred
                             MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_valid_life(netif, i))
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 702adcd9762e5..62961f871fb8d 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -536,7 +536,7 @@ static mp_obj_t network_ninaw10_config(size_t n_args, const mp_obj_t *args, mp_m
             case MP_QSTR_ssid: {
                 nina_netinfo_t netinfo;
                 nina_netinfo(&netinfo);
-                return mp_obj_new_str(netinfo.ssid, strlen(netinfo.ssid));
+                return mp_obj_new_str_from_cstr(netinfo.ssid);
             }
             case MP_QSTR_security: {
                 nina_netinfo_t netinfo;
diff --git a/extmod/vfs.c b/extmod/vfs.c
index ae09b8afe8d08..5d564459c0c0b 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -139,7 +139,7 @@ mp_import_stat_t mp_vfs_import_stat(const char *path) {
     }
 
     // delegate to vfs.stat() method
-    mp_obj_t path_o = mp_obj_new_str(path_out, strlen(path_out));
+    mp_obj_t path_o = mp_obj_new_str_from_cstr(path_out);
     mp_obj_t stat;
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 38c16633630e5..4f01432f54968 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -144,7 +144,7 @@ static mp_obj_t mp_vfs_fat_ilistdir_it_iternext(mp_obj_t self_in) {
         // make 4-tuple with info about this entry
         mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(4, NULL));
         if (self->is_str) {
-            t->items[0] = mp_obj_new_str(fn, strlen(fn));
+            t->items[0] = mp_obj_new_str_from_cstr(fn);
         } else {
             t->items[0] = mp_obj_new_bytes((const byte *)fn, strlen(fn));
         }
@@ -291,7 +291,7 @@ static mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
     if (res != FR_OK) {
         mp_raise_OSError(fresult_to_errno_table[res]);
     }
-    return mp_obj_new_str(buf, strlen(buf));
+    return mp_obj_new_str_from_cstr(buf);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getcwd_obj, fat_vfs_getcwd);
 
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 19da4417e6d00..4b10ca3aa597c 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -192,7 +192,7 @@ static mp_obj_t MP_VFS_LFSx(ilistdir_it_iternext)(mp_obj_t self_in) {
     // make 4-tuple with info about this entry
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(4, NULL));
     if (self->is_str) {
-        t->items[0] = mp_obj_new_str(info.name, strlen(info.name));
+        t->items[0] = mp_obj_new_str_from_cstr(info.name);
     } else {
         t->items[0] = mp_obj_new_bytes((const byte *)info.name, strlen(info.name));
     }
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index ed4c06e36731e..bd9a6d84062cf 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -194,7 +194,7 @@ static mp_obj_t vfs_posix_getcwd(mp_obj_t self_in) {
         }
         #endif
     }
-    return mp_obj_new_str(ret, strlen(ret));
+    return mp_obj_new_str_from_cstr(ret);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_getcwd_obj, vfs_posix_getcwd);
 
@@ -234,7 +234,7 @@ static mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {
         mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL));
 
         if (self->is_str) {
-            t->items[0] = mp_obj_new_str(fn, strlen(fn));
+            t->items[0] = mp_obj_new_str_from_cstr(fn);
         } else {
             t->items[0] = mp_obj_new_bytes((const byte *)fn, strlen(fn));
         }
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 34b5adab28b8c..578f7bd73f173 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -1185,7 +1185,7 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_mode_obj, 1, 2, wlan_mode);
 static mp_obj_t wlan_ssid(size_t n_args, const mp_obj_t *args) {
     wlan_obj_t *self = args[0];
     if (n_args == 1) {
-        return mp_obj_new_str((const char *)self->ssid, strlen((const char *)self->ssid));
+        return mp_obj_new_str_from_cstr((const char *)self->ssid);
     } else {
         size_t len;
         const char *ssid = mp_obj_str_get_data(args[1], &len);
@@ -1205,7 +1205,7 @@ static mp_obj_t wlan_auth(size_t n_args, const mp_obj_t *args) {
         } else {
             mp_obj_t security[2];
             security[0] = mp_obj_new_int(self->auth);
-            security[1] = mp_obj_new_str((const char *)self->key, strlen((const char *)self->key));
+            security[1] = mp_obj_new_str_from_cstr((const char *)self->key);
             return mp_obj_new_tuple(2, security);
         }
     } else {
@@ -1309,7 +1309,7 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(wlan_irq_obj, 1, wlan_irq);
 //    mp_obj_t connections = mp_obj_new_list(0, NULL);
 //
 //    if (wlan_is_connected()) {
-//        device[0] = mp_obj_new_str((const char *)wlan_obj.ssid_o, strlen((const char *)wlan_obj.ssid_o));
+//        device[0] = mp_obj_new_str_from_cstr((const char *)wlan_obj.ssid_o);
 //        device[1] = mp_obj_new_bytes((const byte *)wlan_obj.bssid, SL_BSSID_LENGTH);
 //        // add the device to the list
 //        mp_obj_list_append(connections, mp_obj_new_tuple(MP_ARRAY_SIZE(device), device));
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index e5d48096204b8..cad707dfc0d23 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -156,7 +156,7 @@ static mp_obj_t esp32_partition_info(mp_obj_t self_in) {
         MP_OBJ_NEW_SMALL_INT(self->part->subtype),
         mp_obj_new_int_from_uint(self->part->address),
         mp_obj_new_int_from_uint(self->part->size),
-        mp_obj_new_str(&self->part->label[0], strlen(&self->part->label[0])),
+        mp_obj_new_str_from_cstr(&self->part->label[0]),
         mp_obj_new_bool(self->part->encrypted),
     };
     return mp_obj_new_tuple(6, tuple);
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 44f945c4503b0..916eb79bd9265 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -951,7 +951,7 @@ static mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
             mp_obj_new_int(resi->ai_family),
             mp_obj_new_int(resi->ai_socktype),
             mp_obj_new_int(resi->ai_protocol),
-            mp_obj_new_str(resi->ai_canonname, strlen(resi->ai_canonname)),
+            mp_obj_new_str_from_cstr(resi->ai_canonname),
             mp_const_none
         };
 
@@ -962,7 +962,7 @@ static mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
             char buf[16];
             ip4addr_ntoa_r(&ip4_addr, buf, sizeof(buf));
             mp_obj_t inaddr_objs[2] = {
-                mp_obj_new_str(buf, strlen(buf)),
+                mp_obj_new_str_from_cstr(buf),
                 mp_obj_new_int(ntohs(addr->sin_port))
             };
             addrinfo_objs[4] = mp_obj_new_tuple(2, inaddr_objs);
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index 6e957909eafe7..09daa5c045e18 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -328,7 +328,7 @@ mp_obj_t esp_ifname(esp_netif_t *netif) {
     char ifname[NETIF_NAMESIZE + 1] = {0};
     mp_obj_t ret = mp_const_none;
     if (esp_netif_get_netif_impl_name(netif, ifname) == ESP_OK && ifname[0] != 0) {
-        ret = mp_obj_new_str((char *)ifname, strlen(ifname));
+        ret = mp_obj_new_str_from_cstr((char *)ifname);
     }
     return ret;
 }
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 47a9b72dc15cf..f2813f430d482 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -344,7 +344,7 @@ static mp_obj_t ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                 char ifname[NETIF_NAMESIZE + 1] = {0};
                 netif_index_to_name(netif_get_index(pppif), ifname);
                 if (ifname[0] != 0) {
-                    val = mp_obj_new_str((char *)ifname, strlen(ifname));
+                    val = mp_obj_new_str_from_cstr((char *)ifname);
                 }
             }
             break;
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 6d051f0256291..7e802166c116c 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -640,7 +640,7 @@ static mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
         case MP_QSTR_essid:
             switch (self->if_id) {
                 case ESP_IF_WIFI_STA:
-                    val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
+                    val = mp_obj_new_str_from_cstr((char *)cfg.sta.ssid);
                     break;
                 case ESP_IF_WIFI_AP:
                     val = mp_obj_new_str((char *)cfg.ap.ssid, cfg.ap.ssid_len);
diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index 57ad5d8305c1d..bf6ac2538896b 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -626,7 +626,7 @@ static mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
         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));
+                val = mp_obj_new_str_from_cstr((char *)cfg.sta.ssid);
             } else {
                 val = mp_obj_new_str((char *)cfg.ap.ssid, cfg.ap.ssid_len);
             }
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index b05e2dade60a8..99a6d8c8c11f1 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -388,7 +388,7 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "# str\n");
 
         // intern string
-        mp_printf(&mp_plat_print, "%d\n", mp_obj_is_qstr(mp_obj_str_intern(mp_obj_new_str("intern me", 9))));
+        mp_printf(&mp_plat_print, "%d\n", mp_obj_is_qstr(mp_obj_str_intern(mp_obj_new_str_from_cstr("intern me"))));
     }
 
     // bytearray
@@ -471,12 +471,12 @@ static mp_obj_t extra_coverage(void) {
         // call mp_call_function_1_protected
         mp_call_function_1_protected(MP_OBJ_FROM_PTR(&mp_builtin_abs_obj), MP_OBJ_NEW_SMALL_INT(1));
         // call mp_call_function_1_protected with invalid args
-        mp_call_function_1_protected(MP_OBJ_FROM_PTR(&mp_builtin_abs_obj), mp_obj_new_str("abc", 3));
+        mp_call_function_1_protected(MP_OBJ_FROM_PTR(&mp_builtin_abs_obj), mp_obj_new_str_from_cstr("abc"));
 
         // call mp_call_function_2_protected
         mp_call_function_2_protected(MP_OBJ_FROM_PTR(&mp_builtin_divmod_obj), MP_OBJ_NEW_SMALL_INT(1), MP_OBJ_NEW_SMALL_INT(1));
         // call mp_call_function_2_protected with invalid args
-        mp_call_function_2_protected(MP_OBJ_FROM_PTR(&mp_builtin_divmod_obj), mp_obj_new_str("abc", 3), mp_obj_new_str("abc", 3));
+        mp_call_function_2_protected(MP_OBJ_FROM_PTR(&mp_builtin_divmod_obj), mp_obj_new_str_from_cstr("abc"), mp_obj_new_str_from_cstr("abc"));
 
         // mp_obj_int_get_checked with mp_obj_int_t that has a value that is a small integer
         mp_printf(&mp_plat_print, "%d\n", mp_obj_int_get_checked(mp_obj_int_new_mpz()));
@@ -733,7 +733,7 @@ static mp_obj_t extra_coverage(void) {
         // mp_obj_is_integer accepts ints and booleans
         mp_printf(&mp_plat_print, "%d %d\n", mp_obj_is_integer(MP_OBJ_NEW_SMALL_INT(1)), mp_obj_is_integer(mp_obj_new_int_from_ll(1)));
         mp_printf(&mp_plat_print, "%d %d\n", mp_obj_is_integer(mp_const_true), mp_obj_is_integer(mp_const_false));
-        mp_printf(&mp_plat_print, "%d %d\n", mp_obj_is_integer(mp_obj_new_str("1", 1)), mp_obj_is_integer(mp_const_none));
+        mp_printf(&mp_plat_print, "%d %d\n", mp_obj_is_integer(mp_obj_new_str_from_cstr("1")), mp_obj_is_integer(mp_const_none));
 
         // mp_obj_is_int accepts small int and object ints
         mp_printf(&mp_plat_print, "%d %d\n", mp_obj_is_int(MP_OBJ_NEW_SMALL_INT(1)), mp_obj_is_int(mp_obj_new_int_from_ll(1)));
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 0cf11d37cf8d9..79d1e88ad13f0 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -639,7 +639,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
                     return invalid_args();
                 }
                 mp_obj_t import_args[4];
-                import_args[0] = mp_obj_new_str(argv[a + 1], strlen(argv[a + 1]));
+                import_args[0] = mp_obj_new_str_from_cstr(argv[a + 1]);
                 import_args[1] = import_args[2] = mp_const_none;
                 // Ask __import__ to handle imported module specially - set its __name__
                 // to __main__, and also return this leaf module, not top-level package
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index b7d03e84dde6f..b3cd3380ccab9 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -174,7 +174,7 @@ static mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
             if (!s) {
                 return mp_const_none;
             }
-            return mp_obj_new_str(s, strlen(s));
+            return mp_obj_new_str_from_cstr(s);
         }
         case 'v':
             return mp_const_none;
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index d953e7e015237..dbce61aec1135 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -337,7 +337,7 @@ static mp_obj_t new_jobject(jobject jo) {
         return mp_const_none;
     } else if (JJ(IsInstanceOf, jo, String_class)) {
         const char *s = JJ(GetStringUTFChars, jo, NULL);
-        mp_obj_t ret = mp_obj_new_str(s, strlen(s));
+        mp_obj_t ret = mp_obj_new_str_from_cstr(s);
         JJ(ReleaseStringUTFChars, jo, s);
         return ret;
     } else if (JJ(IsInstanceOf, jo, Class_class)) {
diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index d5e963583b7a4..92211d689c7d0 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -40,7 +40,7 @@ static mp_obj_t mp_os_getenv(size_t n_args, const mp_obj_t *args) {
         }
         return mp_const_none;
     }
-    return mp_obj_new_str(s, strlen(s));
+    return mp_obj_new_str_from_cstr(s);
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_getenv_obj, 1, 2, mp_os_getenv);
 
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 314bbfd263b45..2ae5fd22273c1 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -103,7 +103,7 @@ static void vfs_init(void) {
     int ret = 0;
 
     #ifdef CONFIG_DISK_DRIVER_SDMMC
-    mp_obj_t args[] = { mp_obj_new_str(CONFIG_SDMMC_VOLUME_NAME, strlen(CONFIG_SDMMC_VOLUME_NAME)) };
+    mp_obj_t args[] = { mp_obj_new_str_from_cstr(CONFIG_SDMMC_VOLUME_NAME) };
     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)
@@ -113,7 +113,7 @@ static void vfs_init(void) {
     #endif
 
     if ((bdev != NULL)) {
-        mount_point = mp_obj_new_str(mount_point_str, strlen(mount_point_str));
+        mount_point = mp_obj_new_str_from_cstr(mount_point_str);
         ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
         // TODO: if this failed, make a new file system and try to mount again
     }
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index 7732e0a64a40d..cef9933b28fa7 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -92,7 +92,7 @@ static mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
     net_addr_ntop(addr->sa_family, &sockaddr_in6->sin6_addr, buf, sizeof(buf));
     mp_obj_tuple_t *tuple = mp_obj_new_tuple(addr->sa_family == AF_INET ? 2 : 4, NULL);
 
-    tuple->items[0] = mp_obj_new_str(buf, strlen(buf));
+    tuple->items[0] = mp_obj_new_str_from_cstr(buf);
     // We employ the fact that port offset is the same for IPv4 & IPv6
     // not filled in
     // tuple->items[1] = mp_obj_new_int(ntohs(((struct sockaddr_in*)addr)->sin_port));
diff --git a/py/binary.c b/py/binary.c
index 7c01cfa1c8284..4fc8f751ad39a 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -338,7 +338,7 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
         return (mp_obj_t)(mp_uint_t)val;
     } else if (val_type == 'S') {
         const char *s_val = (const char *)(uintptr_t)(mp_uint_t)val;
-        return mp_obj_new_str(s_val, strlen(s_val));
+        return mp_obj_new_str_from_cstr(s_val);
     #if MICROPY_PY_BUILTINS_FLOAT
     } else if (val_type == 'e') {
         return mp_obj_new_float_from_f(mp_decode_half_float(val));

From 0b58d02f70cb883bf19ceec5536be59984f22d90 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jul 2024 11:27:25 +1000
Subject: [PATCH 1207/3129] esp32,esp8266: Use new mp_obj_new_str_from_cstr()
 function.

These were missed in the previous commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/network_common.c | 2 +-
 ports/esp8266/network_wlan.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index 09daa5c045e18..d6bba32146c5c 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -166,7 +166,7 @@ static mp_obj_t esp_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map
             case MP_QSTR_dns: {
                 char addr_str[IPADDR_STRLEN_MAX];
                 ipaddr_ntoa_r(dns_getserver(0), addr_str, sizeof(addr_str));
-                return mp_obj_new_str(addr_str, strlen(addr_str));
+                return mp_obj_new_str_from_cstr(addr_str);
             }
             default: {
                 mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));
diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index bf6ac2538896b..44154ff6d8e54 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -345,7 +345,7 @@ static mp_obj_t esp_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map
                 char addr_str[IPADDR_STRLEN_MAX];
                 ip_addr_t dns_addr = dns_getserver(0);
                 ipaddr_ntoa_r(&dns_addr, addr_str, sizeof(addr_str));
-                return mp_obj_new_str(addr_str, strlen(addr_str));
+                return mp_obj_new_str_from_cstr(addr_str);
             }
             default: {
                 mp_raise_ValueError(MP_ERROR_TEXT("unexpected key"));

From 4d16a9cced42ad0a298f1be8b993357abe7398ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Mon, 18 Mar 2024 00:57:22 +0000
Subject: [PATCH 1208/3129] docs: Update docs to replace ifconfig with
 ipconfig.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow up to 1c6012b0b5c62f18130217f30e73ad3ce4c8c9e6

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 docs/esp32/quickref.rst                  |  6 +--
 docs/esp8266/quickref.rst                |  4 +-
 docs/esp8266/tutorial/network_basics.rst | 12 ++---
 docs/library/network.LAN.rst             |  2 +-
 docs/library/network.WIZNET5K.rst        | 17 +------
 docs/library/network.WLAN.rst            |  2 +-
 docs/library/network.WLANWiPy.rst        | 14 ++----
 docs/library/network.rst                 | 58 +++++++++++++++++++++++-
 docs/mimxrt/quickref.rst                 |  2 +-
 docs/reference/mpremote.rst              |  4 +-
 docs/wipy/quickref.rst                   |  6 +--
 docs/wipy/tutorial/wlan.rst              |  5 +-
 12 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 2be1dbadc353a..3d3fbe0b1ab34 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -89,7 +89,7 @@ The :mod:`network` module::
     wlan.isconnected()      # check if the station is connected 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
+    wlan.ipconfig('addr4')  # get the interface's IPv4 addresses
 
     ap = network.WLAN(network.AP_IF) # create access-point interface
     ap.config(ssid='ESP-AP') # set the SSID of the access point
@@ -107,7 +107,7 @@ A useful function for connecting to your local WiFi network is::
             wlan.connect('ssid', 'key')
             while not wlan.isconnected():
                 pass
-        print('network config:', wlan.ifconfig())
+        print('network config:', wlan.ipconfig('addr4'))
 
 Once the network is established the :mod:`socket <socket>` module can be used
 to create and use TCP/UDP sockets as usual, and the ``requests`` module for
@@ -130,7 +130,7 @@ To use the wired interfaces one has to specify the pins and mode ::
 
     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
+    lan.ipconfig('addr4')                 # get the interface's IPv4 addresses
 
 
 The keyword arguments for the constructor defining the PHY type and interface are:
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index ed2199737099a..b130ce65db2b7 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -59,7 +59,7 @@ The :mod:`network` module::
     wlan.isconnected()      # check if the station is connected 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
+    wlan.ipconfig('addr4')  # get the interface's IPv4 addresses
 
     ap = network.WLAN(network.AP_IF) # create access-point interface
     ap.active(True)         # activate the interface
@@ -76,7 +76,7 @@ A useful function for connecting to your local WiFi network is::
             wlan.connect('ssid', 'key')
             while not wlan.isconnected():
                 pass
-        print('network config:', wlan.ifconfig())
+        print('network config:', wlan.ipconfig('addr4'))
 
 Once the network is established the :mod:`socket <socket>` module can be used
 to create and use TCP/UDP sockets as usual.
diff --git a/docs/esp8266/tutorial/network_basics.rst b/docs/esp8266/tutorial/network_basics.rst
index dc3cd3dd5e070..9d74a6283ac47 100644
--- a/docs/esp8266/tutorial/network_basics.rst
+++ b/docs/esp8266/tutorial/network_basics.rst
@@ -19,10 +19,10 @@ You can check if the interfaces are active by::
 
 You can also check the network settings of the interface by::
 
-    >>> ap_if.ifconfig()
-    ('192.168.4.1', '255.255.255.0', '192.168.4.1', '8.8.8.8')
+    >>> ap_if.ipconfig('addr4')
+    ('192.168.4.1', '255.255.255.0')
 
-The returned values are: IP address, netmask, gateway, DNS.
+The returned values are: IP address and netmask.
 
 Configuration of the WiFi
 -------------------------
@@ -45,8 +45,8 @@ To check if the connection is established use::
 
 Once established you can check the IP address::
 
-    >>> sta_if.ifconfig()
-    ('192.168.0.2', '255.255.255.0', '192.168.0.1', '8.8.8.8')
+    >>> sta_if.ipconfig('addr4')
+    ('192.168.0.2', '255.255.255.0')
 
 You can then disable the access-point interface if you no longer need it::
 
@@ -64,7 +64,7 @@ connect to your WiFi network::
             sta_if.connect('<ssid>', '<key>')
             while not sta_if.isconnected():
                 pass
-        print('network config:', sta_if.ifconfig())
+        print('network config:', sta_if.ipconfig('addr4'))
 
 Sockets
 -------
diff --git a/docs/library/network.LAN.rst b/docs/library/network.LAN.rst
index 375e02cefecd0..31ce8e98411c2 100644
--- a/docs/library/network.LAN.rst
+++ b/docs/library/network.LAN.rst
@@ -10,7 +10,7 @@ Example usage::
 
     import network
     nic = network.LAN(0)
-    print(nic.ifconfig())
+    print(nic.ipconfig("addr4"))
 
     # now use socket as usual
     ...
diff --git a/docs/library/network.WIZNET5K.rst b/docs/library/network.WIZNET5K.rst
index c13d43a376ece..a19bd45282399 100644
--- a/docs/library/network.WIZNET5K.rst
+++ b/docs/library/network.WIZNET5K.rst
@@ -13,7 +13,7 @@ Example usage::
 
     import network
     nic = network.WIZNET5K(pyb.SPI(1), pyb.Pin.board.X5, pyb.Pin.board.X4)
-    print(nic.ifconfig())
+    print(nic.ipconfig("addr4"))
 
     # now use socket as usual
     ...
@@ -51,20 +51,7 @@ Constructors
 Methods
 -------
 
-.. method:: WIZNET5K.isconnected()
-
-   Returns ``True`` if the physical Ethernet link is connected and up.
-   Returns ``False`` otherwise.
-
-.. method:: WIZNET5K.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'))
+This class implements most methods from `AbstractNIC <AbstractNIC>`, which are documented there. Additional methods are:
 
 .. method:: WIZNET5K.regs()
 
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 68cd49769afff..c1eb520961fcb 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -107,7 +107,7 @@ Methods
 
    Get or set general network interface parameters. These methods allow to work
    with additional parameters beyond standard IP configuration (as dealt with by
-   `WLAN.ifconfig()`). These include network-specific and hardware-specific
+   `AbstractNIC.ipconfig()`). These include network-specific and hardware-specific
    parameters. For setting parameters, keyword argument syntax should be used,
    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::
diff --git a/docs/library/network.WLANWiPy.rst b/docs/library/network.WLANWiPy.rst
index 2a5ba118454bc..4ac82e92c6a58 100644
--- a/docs/library/network.WLANWiPy.rst
+++ b/docs/library/network.WLANWiPy.rst
@@ -20,7 +20,7 @@ This class provides a driver for the WiFi network processor in the WiPy. Example
     wlan.connect('your-ssid', auth=(WLAN.WPA2, 'your-key'))
     while not wlan.isconnected():
         time.sleep_ms(50)
-    print(wlan.ifconfig())
+    print(wlan.ipconfig("addr4"))
 
     # now use socket as usual
     ...
@@ -96,16 +96,10 @@ Methods
    In case of STA mode, returns ``True`` if connected to a WiFi access point and has a valid IP address.
    In AP mode returns ``True`` when a station is connected, ``False`` otherwise.
 
-.. method:: WLANWiPy.ifconfig(if_id=0, config=['dhcp' or configtuple])
+.. method:: WLANWiPy.ipconfig('param')
+            WLANWiPy.ipconfig(param=value, ...)
 
-   With no parameters given returns a 4-tuple of *(ip, subnet_mask, gateway, DNS_server)*.
-
-   if ``'dhcp'`` is passed as a parameter then the DHCP client is enabled and the IP params
-   are negotiated with the AP.
-
-   If the 4-tuple config is given then a static IP is configured. For instance::
-
-      wlan.ifconfig(config=('192.168.0.4', '255.255.255.0', '192.168.0.1', '8.8.8.8'))
+   See :meth:`AbstractNIC.ipconfig <AbstractNIC.ipconfig>`. Supported parameters are: ``dhcp4``, ``addr4``, ``gw4``.
 
 .. method:: WLANWiPy.mode([mode])
 
diff --git a/docs/library/network.rst b/docs/library/network.rst
index cc508842942a5..6a436fa85e052 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -24,7 +24,7 @@ For example::
         print("Waiting for connection...")
         while not nic.isconnected():
             time.sleep(1)
-    print(nic.ifconfig())
+    print(nic.ipconfig("addr4"))
 
     # now use socket as usual
     import socket
@@ -113,8 +113,48 @@ parameter should be `id`.
          connected to the AP.  The list contains tuples of the form
          (MAC, RSSI).
 
+.. method:: AbstractNIC.ipconfig('param')
+            AbstractNIC.ipconfig(param=value, ...)
+
+       Get or set interface-specific IP-configuration interface parameters.
+       Supported parameters are the following (availability of a particular
+       parameter depends on the port and the specific network interface):
+
+       * ``dhcp4`` (``True/False``) obtain an IPv4 address, gateway and dns
+         server via DHCP. This method does not block and wait for an address
+         to be obtained. To check if an address was obtained, use the read-only
+         property ``has_dhcp4``.
+       * ``gw4`` Get/set the IPv4 default-gateway.
+       * ``dhcp6`` (``True/False``) obtain a DNS server via stateless DHCPv6.
+         Obtaining IP Addresses via DHCPv6 is currently not implemented.
+       * ``autoconf6`` (``True/False``) obtain a stateless IPv6 address via
+         the network prefix shared in router advertisements. To check if a
+         stateless address was obtained, use the read-only
+         property ``has_autoconf6``.
+       * ``addr4`` (e.g. ``192.168.0.4/24``) obtain the current IPv4 address
+         and network mask as ``(ip, subnet)``-tuple, regardless of how this
+         address was obtained. This method can be used to set a static IPv4
+         address either as ``(ip, subnet)``-tuple or in CIDR-notation.
+       * ``addr6`` (e.g. ``fe80::1234:5678``) obtain a list of current IPv6
+         addresses as ``(ip, state, preferred_lifetime, valid_lifetime)``-tuple.
+         This include link-local, slaac and static addresses.
+         ``preferred_lifetime`` and ``valid_lifetime`` represent the remaining
+         valid and preferred lifetime of each IPv6 address, in seconds.
+         ``state`` indicates the current state of the address:
+
+         * ``0x08`` - ``0x0f`` indicates the address is tentative, counting the
+           number of probes sent.
+         * ``0x10`` The address is deprecated (but still valid)
+         * ``0x30`` The address is preferred (and valid)
+         * ``0x40`` The address is duplicated and can not be used.
+
+         This method can be used to set a static IPv6
+         address, by setting this parameter to the address, like ``fe80::1234:5678``.
+
 .. method:: AbstractNIC.ifconfig([(ip, subnet, gateway, dns)])
 
+       .. note:: This function is deprecated, use `ipconfig()` instead.
+
        Get/set IP-level network interface parameters: IP address, subnet mask,
        gateway and DNS server. When called with no arguments, this method returns
        a 4-tuple with the above information. To set the above values, pass a
@@ -127,7 +167,7 @@ parameter should be `id`.
 
        Get or set general network interface parameters. These methods allow to work
        with additional parameters beyond standard IP configuration (as dealt with by
-       `ifconfig()`). These include network-specific and hardware-specific
+       `ipconfig()`). These include network-specific and hardware-specific
        parameters. For setting parameters, the keyword argument
        syntax should be used, and multiple parameters can be set at once. For
        querying, a parameter name should be quoted as a string, and only one
@@ -195,6 +235,20 @@ The following are functions available in the network module.
 
     The default hostname is typically the name of the board.
 
+.. function:: ipconfig('param')
+              ipconfig(param=value, ...)
+
+       Get or set global IP-configuration parameters.
+       Supported parameters are the following (availability of a particular
+       parameter depends on the port and the specific network interface):
+
+       * ``dns`` Get/set DNS server. This method can support both, IPv4 and
+         IPv6 addresses.
+       * ``prefer`` (``4/6``) Specify which address type to return, if a domain
+         name has both A and AAAA records. Note, that this does not clear the
+         local DNS cache, so that any previously obtained addresses might not
+         change.
+
 .. function:: phy_mode([mode])
 
     Get or set the PHY mode.
diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index 1a73929bedbe3..79d2a1551e4c3 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -528,7 +528,7 @@ Ethernet.  Example usage::
     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
+Otherwise, the IP address can be set with lan.ipconfig(addr4="...").  The default address
 is 192.168.0.1.
 
 Teensy 4.1 does not have an Ethernet jack on the board, but PJRC offers an
diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index bf25e29d93d9c..3ed8a3dbc3be5 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -469,9 +469,9 @@ An example ``config.py`` might look like:
     for ap in wl.scan():
         print(ap)
     """,], # Print out nearby WiFi networks.
-        "wl_ifconfig": [
+        "wl_ipconfig": [
     "exec",
-    "import network; sta_if = network.WLAN(network.STA_IF); print(sta_if.ifconfig())",
+    "import network; sta_if = network.WLAN(network.STA_IF); print(sta_if.ipconfig('addr4'))",
     """,], # Print ip address of station interface.
         "test": ["mount", ".", "exec", "import test"], # Mount current directory and run test.py.
         "demo": ["run", "path/to/demo.py"], # Execute demo.py on the device.
diff --git a/docs/wipy/quickref.rst b/docs/wipy/quickref.rst
index d6abb8d1c7552..9068ee8a37cbf 100644
--- a/docs/wipy/quickref.rst
+++ b/docs/wipy/quickref.rst
@@ -184,18 +184,18 @@ WLAN (WiFi)
 
 See :ref:`network.WLAN <network.WLAN>` and :mod:`machine`. ::
 
-    import machine
+    import machine, network
     from network import WLAN
 
     # configure the WLAN subsystem in station mode (the default is AP)
     wlan = WLAN(mode=WLAN.STA)
     # go for fixed IP settings
-    wlan.ifconfig(config=('192.168.0.107', '255.255.255.0', '192.168.0.1', '8.8.8.8'))
+    network.ipconfig(dns='8.8.8.8')
+    wlan.ipconfig(addr4='192.168.0.107/24', gw4='192.168.0.1')
     wlan.scan()     # scan for available networks
     wlan.connect(ssid='mynetwork', auth=(WLAN.WPA2, 'mynetworkkey'))
     while not wlan.isconnected():
         pass
-    print(wlan.ifconfig())
     # enable wake on WLAN
     wlan.irq(trigger=WLAN.ANY_EVENT, wake=machine.SLEEP)
     # go to sleep
diff --git a/docs/wipy/tutorial/wlan.rst b/docs/wipy/tutorial/wlan.rst
index bdfd3e0a54737..acc67a4b281cb 100644
--- a/docs/wipy/tutorial/wlan.rst
+++ b/docs/wipy/tutorial/wlan.rst
@@ -50,14 +50,15 @@ Assigning a static IP address when booting
 If you want your WiPy to connect to your home router after boot-up, and with a fixed
 IP address so that you can access it via telnet or FTP, use the following script as /flash/boot.py::
 
-   import machine
+   import machine, network
    from network import WLAN
    wlan = WLAN() # get current object, without changing the mode
 
    if machine.reset_cause() != machine.SOFT_RESET:
        wlan.init(WLAN.STA)
        # configuration below MUST match your home router settings!!
-       wlan.ifconfig(config=('192.168.178.107', '255.255.255.0', '192.168.178.1', '8.8.8.8'))
+       network.ipconfig(dns='8.8.8.8')
+       wlan.ipconfig(addr4='192.168.0.107/24', gw4='192.168.0.1')
 
    if not wlan.isconnected():
        # change the line below to match your network ssid, security and password

From 633586a7162ea508b472ab5e82a512b38eff370f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jul 2024 17:04:24 +1000
Subject: [PATCH 1209/3129] tests/thread/stress_aes.py: Fix logic waiting for
 finished threads.

Because the main thread executes `thread_entry()` it means there's an
additional one added to `count`, so the test must wait for the count to
reach `n_thread + 1`.

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

diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index b25da855aeffc..9f4a4e6aebad5 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -282,6 +282,6 @@ def thread_entry(n_loop):
     for i in range(n_thread):
         _thread.start_new_thread(thread_entry, (n_loop,))
     thread_entry(n_loop)
-    while count.value < n_thread:
+    while count.value < n_thread + 1:
         time.sleep(1)
     print("done")

From 358e501e75c028133cff1045d2062ae31206a22c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Jul 2024 17:07:30 +1000
Subject: [PATCH 1210/3129] tests/stress/bytecode_limit.py: Make test more
 robust with low memory.

A target may have enough RAM to run the n=433 test but then run out of RAM
on the n=432 test.  So allow the test to skip on the n=432 case before it
prints any output.

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

diff --git a/tests/stress/bytecode_limit.py b/tests/stress/bytecode_limit.py
index ad090637f6a68..948d7668da551 100644
--- a/tests/stress/bytecode_limit.py
+++ b/tests/stress/bytecode_limit.py
@@ -3,14 +3,18 @@
 body = " with f()()() as a:\n  try:\n   f()()()\n  except Exception:\n   pass\n"
 
 # Test overflow of jump offset.
+# Print results at the end in case an intermediate value of n fails with MemoryError.
+results = []
 for n in (433, 432, 431, 430):
     try:
         exec("cond = 0\nif cond:\n" + body * n + "else:\n print('cond false')\n")
+        results.append((n, "ok"))
     except MemoryError:
         print("SKIP")
         raise SystemExit
     except RuntimeError:
-        print("RuntimeError")
+        results.append((n, "RuntimeError"))
+print(results)
 
 # 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
diff --git a/tests/stress/bytecode_limit.py.exp b/tests/stress/bytecode_limit.py.exp
index 1d892250b01e6..cda52b1b97348 100644
--- a/tests/stress/bytecode_limit.py.exp
+++ b/tests/stress/bytecode_limit.py.exp
@@ -1,5 +1,4 @@
-RuntimeError
-RuntimeError
 cond false
 cond false
+[(433, 'RuntimeError'), (432, 'RuntimeError'), (431, 'ok'), (430, 'ok')]
 [123]

From 2be45dd682f0ce01e4a1061375e96ce2c501a187 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 6 Jul 2024 09:18:22 +0200
Subject: [PATCH 1211/3129] extmod/modmachine: Allow more than one argument to
 machine.freq().

The limit is set by a `MICROPY_PY_MACHINE_FREQ_NUM_ARGS_MAX` define, which
defaults to 1 and is set for stm32 to 4.

For stm32 this fixes a regression introduced in commit
e1ec6af654b1c5c4a973b6c6b029ee68bb92eb89 where the maximum number of
arguments was changed from 4 to 1.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 extmod/modmachine.c        | 2 +-
 ports/stm32/mpconfigport.h | 1 +
 py/mpconfig.h              | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 2a7e315bbb0ce..2fe72817b6c2a 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -109,7 +109,7 @@ static mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, MICROPY_PY_MACHINE_FREQ_NUM_ARGS_MAX, machine_freq);
 
 static mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_lightsleep(n_args, args);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 9e1e24cf23828..bd1ab671e071d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -113,6 +113,7 @@
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/stm32/modmachine.c"
 #define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
+#define MICROPY_PY_MACHINE_FREQ_NUM_ARGS_MAX (4)
 #define MICROPY_PY_MACHINE_BOOTLOADER (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/stm32/machine_adc.c"
diff --git a/py/mpconfig.h b/py/mpconfig.h
index bc6bf75fe57c5..346d0c21e1222 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1736,6 +1736,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_RESET (0)
 #endif
 
+// Maximum number of arguments for machine.freq()
+#ifndef MICROPY_PY_MACHINE_FREQ_NUM_ARGS_MAX
+#define MICROPY_PY_MACHINE_FREQ_NUM_ARGS_MAX (1)
+#endif
+
 // Whether to include: bitstream
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
 #define MICROPY_PY_MACHINE_BITSTREAM (0)

From 20b00ca501f5e7ff096ae3e31c3e7e7d99963d23 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 24 Apr 2024 19:58:06 +0200
Subject: [PATCH 1212/3129] extmod/network_nina: Fix the AP security mode
 constants.

The only AP security mode supported is actually WPA/WPA2 not WEP. The
firmware command `0x19` starts the AP using `WIFI_AUTH_WPA_WPA2_PSK`
mode.

There are no functional changes in this commit, it just fixes the constant
names and removes the useless sanity checks for WEP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/ninaw10/nina_wifi_drv.c |  8 ++++----
 extmod/network_ninaw10.c        | 14 +-------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 6e4df84294c3d..1aaeec5a09c84 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -95,7 +95,7 @@ typedef enum {
 
     // AP mode commands.
     NINA_CMD_START_AP_OPEN          = 0x18,
-    NINA_CMD_START_AP_WEP           = 0x19,
+    NINA_CMD_START_AP_WPA           = 0x19,
 
     // AP mode scan commands.
     NINA_CMD_AP_START_SCAN          = 0x36,
@@ -395,7 +395,7 @@ int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t
     uint8_t status = NINA_STATUS_AP_FAILED;
 
     if ((key == NULL && security != NINA_SEC_OPEN) ||
-        (security != NINA_SEC_OPEN && security != NINA_SEC_WEP)) {
+        (security != NINA_SEC_OPEN && security != NINA_SEC_WPA_PSK)) {
         return -1;
     }
 
@@ -406,8 +406,8 @@ int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t
                 return -1;
             }
             break;
-        case NINA_SEC_WEP:
-            if (nina_send_command_read_ack(NINA_CMD_START_AP_WEP,
+        case NINA_SEC_WPA_PSK:
+            if (nina_send_command_read_ack(NINA_CMD_START_AP_WPA,
                 3, ARG_8BITS, NINA_ARGS(ARG_STR(ssid), ARG_STR(key), ARG_BYTE(channel))) != SPI_ACK) {
                 return -1;
             }
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 62961f871fb8d..a9abd5776e053 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -266,7 +266,7 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
     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 = -1} },
+        { 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} },
     };
 
@@ -277,7 +277,6 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
 
     // get ssid
     const char *ssid = mp_obj_str_get_str(args[ARG_ssid].u_obj);
-
     if (strlen(ssid) == 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("SSID can't be empty"));
     }
@@ -290,12 +289,6 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
 
     // get security mode
     mp_uint_t security = args[ARG_security].u_int;
-    if (security == -1 && self->itf == MOD_NETWORK_STA_IF) {
-        security = NINA_SEC_WPA_PSK;
-    } else if (security == -1 && self->itf == MOD_NETWORK_AP_IF) {
-        security = NINA_SEC_WEP;
-    }
-
     // Ensure that the key is not empty if a security mode is used.
     if (security != NINA_SEC_OPEN && strlen(key) == 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("key can't be empty"));
@@ -326,11 +319,6 @@ static mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
         soft_timer_reinsert(&mp_wifi_poll_timer, NINAW10_POLL_INTERVAL);
     } else {
         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 only supports WEP or OPEN security modes"));
-        }
-
         // 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"));

From ee1036023ef199636d96e70c6c7ed587ccaab92e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 15 May 2023 11:17:27 +0200
Subject: [PATCH 1213/3129] extmod/machine_spi: Support firstbit=LSB for
 machine.SoftSPI.

Being able to send data out in LSB format can be useful, and having support
in the low-level driver is much better than requiring Python code to
reorder the bits before sending them / after receiving them.  In particular
if the hardware does not support the LSB format (eg RP2040) then one needs
to use the SoftSPI in LSB mode.

For this change a default definition of `MICROPY_PY_MACHINE_SPI_MSB/_LSB`
was added to `py/mpconfig.h`, making them available to all ports.  The
identical defines in `esp32/mpconfigport.h` were deleted.

Resolves issues #5340, #11404.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 drivers/bus/softspi.c      | 30 ++++++++++++++++++++----------
 drivers/bus/spi.h          |  1 +
 extmod/machine_spi.c       | 20 ++++++++------------
 ports/esp32/mpconfigport.h |  2 --
 py/mpconfig.h              |  6 ++++++
 5 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/drivers/bus/softspi.c b/drivers/bus/softspi.c
index bc12d89d3b7e6..7d687a1a2fdf4 100644
--- a/drivers/bus/softspi.c
+++ b/drivers/bus/softspi.c
@@ -44,28 +44,36 @@ int mp_soft_spi_ioctl(void *self_in, uint32_t cmd) {
     return 0;
 }
 
+static uint8_t swap_bits(uint8_t byte) {
+    const static uint8_t swap_table[16] = {
+        0x00, 0x08, 0x04, 0x0c, 0x02, 0x0a, 0x06, 0x0e,
+        0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f
+    };
+    return ((swap_table[byte & 0x0f] << 4) | swap_table[byte >> 4]);
+}
+
 void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     mp_soft_spi_obj_t *self = (mp_soft_spi_obj_t*)self_in;
     uint32_t delay_half = self->delay_half;
 
-    // only MSB transfer is implemented
-
     // If a port defines MICROPY_HW_SOFTSPI_MIN_DELAY, and the configured
     // delay_half is equal to this value, then the software SPI implementation
     // will run as fast as possible, limited only by CPU speed and GPIO time.
     #ifdef MICROPY_HW_SOFTSPI_MIN_DELAY
     if (delay_half == MICROPY_HW_SOFTSPI_MIN_DELAY) {
         for (size_t i = 0; i < len; ++i) {
-            uint8_t data_out = src[i];
+            uint8_t data_out = self->firstbit != MICROPY_PY_MACHINE_SPI_MSB ?
+                src[i] : swap_bits(src[i]);
             uint8_t data_in = 0;
-            for (int j = 0; j < 8; ++j, data_out <<= 1) {
-                mp_hal_pin_write(self->mosi, (data_out >> 7) & 1);
+            for (int j = 0; j < 8; ++j, data_out >>= 1) {
+                mp_hal_pin_write(self->mosi, data_out & 1);
                 mp_hal_pin_write(self->sck, 1 - self->polarity);
                 data_in = (data_in << 1) | mp_hal_pin_read(self->miso);
                 mp_hal_pin_write(self->sck, self->polarity);
             }
             if (dest != NULL) {
-                dest[i] = data_in;
+                dest[i] = self->firstbit == MICROPY_PY_MACHINE_SPI_MSB ?
+                    data_in : swap_bits(data_in);
             }
         }
         return;
@@ -73,10 +81,11 @@ void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t
     #endif
 
     for (size_t i = 0; i < len; ++i) {
-        uint8_t data_out = src[i];
+        uint8_t data_out = self->firstbit != MICROPY_PY_MACHINE_SPI_MSB ?
+            src[i] : swap_bits(src[i]);
         uint8_t data_in = 0;
-        for (int j = 0; j < 8; ++j, data_out <<= 1) {
-            mp_hal_pin_write(self->mosi, (data_out >> 7) & 1);
+        for (int j = 0; j < 8; ++j, data_out >>= 1) {
+            mp_hal_pin_write(self->mosi, data_out & 1);
             if (self->phase == 0) {
                 mp_hal_delay_us_fast(delay_half);
                 mp_hal_pin_write(self->sck, 1 - self->polarity);
@@ -94,7 +103,8 @@ void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t
             }
         }
         if (dest != NULL) {
-            dest[i] = data_in;
+            dest[i] = self->firstbit == MICROPY_PY_MACHINE_SPI_MSB ?
+                data_in : swap_bits(data_in);
         }
     }
 }
diff --git a/drivers/bus/spi.h b/drivers/bus/spi.h
index 6d1b9c2f832ef..df7f790df80f3 100644
--- a/drivers/bus/spi.h
+++ b/drivers/bus/spi.h
@@ -42,6 +42,7 @@ typedef struct _mp_soft_spi_obj_t {
     uint32_t delay_half; // microsecond delay for half SCK period
     uint8_t polarity;
     uint8_t phase;
+    uint8_t firstbit;
     mp_hal_pin_obj_t sck;
     mp_hal_pin_obj_t mosi;
     mp_hal_pin_obj_t miso;
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index a1d18c905247a..5be30e9476b90 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -33,12 +33,6 @@
 
 #include "extmod/modmachine.h"
 
-// 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)
-#define MICROPY_PY_MACHINE_SPI_LSB (1)
-#endif
-
 /******************************************************************************/
 // MicroPython bindings for generic machine.SPI
 
@@ -154,9 +148,9 @@ static uint32_t baudrate_to_delay_half(uint32_t baudrate) {
 
 static void mp_machine_soft_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_machine_soft_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "SoftSPI(baudrate=%u, polarity=%u, phase=%u,"
+    mp_printf(print, "SoftSPI(baudrate=%u, polarity=%u, phase=%u, firstbit=%u,"
         " sck=" MP_HAL_PIN_FMT ", mosi=" MP_HAL_PIN_FMT ", miso=" MP_HAL_PIN_FMT ")",
-        baudrate_from_delay_half(self->spi.delay_half), self->spi.polarity, self->spi.phase,
+        baudrate_from_delay_half(self->spi.delay_half), self->spi.polarity, self->spi.phase, self->spi.firstbit,
         mp_hal_pin_name(self->spi.sck), mp_hal_pin_name(self->spi.mosi), mp_hal_pin_name(self->spi.miso));
 }
 
@@ -185,9 +179,7 @@ static mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n
     if (args[ARG_bits].u_int != 8) {
         mp_raise_ValueError(MP_ERROR_TEXT("bits must be 8"));
     }
-    if (args[ARG_firstbit].u_int != MICROPY_PY_MACHINE_SPI_MSB) {
-        mp_raise_ValueError(MP_ERROR_TEXT("firstbit must be MSB"));
-    }
+    self->spi.firstbit = args[ARG_firstbit].u_int;
     if (args[ARG_sck].u_obj == MP_OBJ_NULL
         || args[ARG_mosi].u_obj == MP_OBJ_NULL
         || args[ARG_miso].u_obj == MP_OBJ_NULL) {
@@ -206,11 +198,12 @@ static mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n
 static void mp_machine_soft_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_machine_soft_spi_obj_t *self = (mp_machine_soft_spi_obj_t *)self_in;
 
-    enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_sck, ARG_mosi, ARG_miso };
+    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_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} },
@@ -227,6 +220,9 @@ static void mp_machine_soft_spi_init(mp_obj_base_t *self_in, size_t n_args, cons
     if (args[ARG_phase].u_int != -1) {
         self->spi.phase = args[ARG_phase].u_int;
     }
+    if (args[ARG_firstbit].u_int != -1) {
+        self->spi.firstbit = args[ARG_firstbit].u_int;
+    }
     if (args[ARG_sck].u_obj != MP_OBJ_NULL) {
         self->spi.sck = mp_hal_get_pin_obj(args[ARG_sck].u_obj);
     }
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 0afb12f85c1ac..558fa6b8c602c 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -136,8 +136,6 @@
 #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)
-#define MICROPY_PY_MACHINE_SPI_LSB          (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #ifndef MICROPY_PY_MACHINE_DAC
 #define MICROPY_PY_MACHINE_DAC              (SOC_DAC_SUPPORTED)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 346d0c21e1222..98893ceb6d97b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1784,6 +1784,12 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_SOFTSPI (0)
 #endif
 
+// Values of SPI.MSB and SPI.LSB constants
+#ifndef MICROPY_PY_MACHINE_SPI_MSB
+#define MICROPY_PY_MACHINE_SPI_MSB (0)
+#define MICROPY_PY_MACHINE_SPI_LSB (1)
+#endif
+
 // Whether to provide the "machine.Timer" class
 #ifndef MICROPY_PY_MACHINE_TIMER
 #define MICROPY_PY_MACHINE_TIMER (0)

From 4fdad8eabef17aa8b920484e0af7db5ad9889167 Mon Sep 17 00:00:00 2001
From: Owen <owen@easytarget.org>
Date: Mon, 8 Jul 2024 16:55:56 +0200
Subject: [PATCH 1214/3129] extmod/modre: Rename re_exec to re_exec_helper to
 avoid clash on BSD.

The `re_exec` symbol is the name of a FreeBSD regex function, so needs to
be renamed to avoid a clash when building on FreeBSD.  (This clash was
fixed once before but then accidentally reintroduced by the u-module
renaming in 7f5d5c72718af773db751269c6ae14037b9c0727.)

Fixes issue #15430.

clarify as helper function
---
 extmod/modre.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extmod/modre.c b/extmod/modre.c
index 2a3fdfd3505f3..f3d2e302a0374 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -194,7 +194,8 @@ static void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     mp_printf(print, "<re %p>", self);
 }
 
-static mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
+// Note: this function can't be named re_exec because it may clash with system headers, eg on FreeBSD
+static mp_obj_t re_exec_helper(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], (mp_obj_type_t *)&re_type)) {
@@ -223,12 +224,12 @@ static mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
 }
 
 static mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {
-    return re_exec(true, n_args, args);
+    return re_exec_helper(true, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_match_obj, 2, 4, re_match);
 
 static mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {
-    return re_exec(false, n_args, args);
+    return re_exec_helper(false, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);
 

From abbce268afb351d623c2073a4e4ae62a9e71889a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Jul 2024 23:47:21 +1000
Subject: [PATCH 1215/3129] github/workflows: Use macos-latest for unix macos
 CI.

macos-11.0 is no longer available.

With this change in the macos version, some tests which previously failed
now pass, and some different tests now fail.  Exclude those that fail from
the CI until they can be fixed properly.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 2 +-
 tools/ci.sh                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 4473847db61ef..c83f67db875b3 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -194,7 +194,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   macos:
-    runs-on: macos-11.0
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
diff --git a/tools/ci.sh b/tools/ci.sh
index 9c54d55a4e846..53fcc8b5a3857 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -647,9 +647,9 @@ function ci_unix_macos_build {
 
 function ci_unix_macos_run_tests {
     # Issues with macOS tests:
-    # - import_pkg7 has a problem with relative imports
-    # - random_basic has a problem with getrandbits(0)
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude 'import_pkg7.py' --exclude 'random_basic.py')
+    # - float_parse and float_parse_doubleprec parse/print floats out by a few mantissa bits
+    # - ffi_callback crashes for an unknown reason
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude '(float_parse|float_parse_doubleprec|ffi_callback).py')
 }
 
 function ci_unix_qemu_mips_setup {

From 55e75c4ad4131e72a452e6190473098e8a0521c2 Mon Sep 17 00:00:00 2001
From: Lennart <Lennart@binarylabs.dev>
Date: Mon, 8 Jul 2024 14:30:01 +0200
Subject: [PATCH 1216/3129] unix/modtermios: Add more baudrate options.

This adds some more baudrate option as they are available in the termios.h
header - up to a point that seems reasonable in an embedded context.

Signed-off-by: Lennart Schierling <Lennart@binarylabs.dev>
---
 ports/unix/modtermios.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c
index b1ad9a450e0c8..d7b94038aa138 100644
--- a/ports/unix/modtermios.c
+++ b/ports/unix/modtermios.c
@@ -141,6 +141,27 @@ static const mp_rom_map_elem_t mp_module_termios_globals_table[] = {
     #ifdef B115200
     C(B115200),
     #endif
+    #ifdef B230400
+    C(B230400),
+    #endif
+    #ifdef B460800
+    C(B460800),
+    #endif
+    #ifdef B500000
+    C(B500000),
+    #endif
+    #ifdef B576000
+    C(B576000),
+    #endif
+    #ifdef B921600
+    C(B921600),
+    #endif
+    #ifdef B1000000
+    C(B1000000),
+    #endif
+    #ifdef B1152000
+    C(B1152000)
+    #endif
 #undef C
 };
 

From 220088fff679aa00feaaa1a842bdb1dddc10ff26 Mon Sep 17 00:00:00 2001
From: Leo Chung <gewalalb@gmail.com>
Date: Tue, 18 Jul 2023 13:46:28 +0800
Subject: [PATCH 1217/3129] unix/mpbthciport: Remove thread detached attribute.

A detached thread is not joinable, and the behavior maybe undefined.

Signed-off-by: Leo Chung <gewalalb@gmail.com>
---
 ports/unix/mpbthciport.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/unix/mpbthciport.c b/ports/unix/mpbthciport.c
index 95c39f559910d..765146677e8c5 100644
--- a/ports/unix/mpbthciport.c
+++ b/ports/unix/mpbthciport.c
@@ -196,10 +196,7 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     }
 
     // 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);
+    pthread_create(&hci_poll_thread_id, NULL, &hci_poll_thread, NULL);
 
     return 0;
 }

From b4b4d161c2fba54de7f4b297af66a2a807d62f98 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Jul 2024 14:59:55 +1000
Subject: [PATCH 1218/3129] unix/mpbtstackport_usb: Remove thread detached
 attribute.

As in the previous commit, the thread is later joined so can't be detached.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpbtstackport_usb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/unix/mpbtstackport_usb.c b/ports/unix/mpbtstackport_usb.c
index 8b1d1fff2189f..a924fc3ca912a 100644
--- a/ports/unix/mpbtstackport_usb.c
+++ b/ports/unix/mpbtstackport_usb.c
@@ -110,10 +110,7 @@ static void *btstack_thread(void *arg) {
 
 void mp_bluetooth_btstack_port_start(void) {
     // Create a thread to run the btstack loop.
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-    pthread_create(&bstack_thread_id, &attr, &btstack_thread, NULL);
+    pthread_create(&bstack_thread_id, NULL, &btstack_thread, NULL);
 }
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_USB

From fce3cea2440e0242fc4cf5c1825368795f540470 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jul 2024 10:03:28 +1000
Subject: [PATCH 1219/3129] tests/extmod: Make get_event_loop tests compatible
 with CPython 3.12.

Follow up to 2e852522b178e6e9b2f0cdb954ba44aa9e7d7c0d: instead of having
.exp files for the get_event_loop tests, tweak them so they are compatible
with CPython 3.12.  This requires calling `asyncio.set_event_loop()` so
there is an active event loop and `asyncio.get_event_loop()` succeeds
without a warning.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/asyncio_get_event_loop.py     | 6 +++++-
 tests/extmod/asyncio_get_event_loop.py.exp | 2 --
 tests/extmod/asyncio_new_event_loop.py     | 6 +++++-
 tests/extmod/asyncio_new_event_loop.py.exp | 6 ------
 4 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 tests/extmod/asyncio_get_event_loop.py.exp
 delete mode 100644 tests/extmod/asyncio_new_event_loop.py.exp

diff --git a/tests/extmod/asyncio_get_event_loop.py b/tests/extmod/asyncio_get_event_loop.py
index bbc1a6b2dce95..6ecbb13b57a6a 100644
--- a/tests/extmod/asyncio_get_event_loop.py
+++ b/tests/extmod/asyncio_get_event_loop.py
@@ -1,5 +1,4 @@
 # Test get_event_loop()
-# Note: CPython deprecated get_event_loop() so this test needs a .exp
 
 try:
     import asyncio
@@ -7,6 +6,11 @@
     print("SKIP")
     raise SystemExit
 
+# CPython 3.12 deprecated calling get_event_loop() when there is no current event
+# loop, so to make this test run on CPython requires setting the event loop.
+if hasattr(asyncio, "set_event_loop"):
+    asyncio.set_event_loop(asyncio.new_event_loop())
+
 
 async def main():
     print("start")
diff --git a/tests/extmod/asyncio_get_event_loop.py.exp b/tests/extmod/asyncio_get_event_loop.py.exp
deleted file mode 100644
index 5d0fb3b2d2edd..0000000000000
--- a/tests/extmod/asyncio_get_event_loop.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-start
-end
diff --git a/tests/extmod/asyncio_new_event_loop.py b/tests/extmod/asyncio_new_event_loop.py
index 5bb31f1292bb1..bebc3bf70cc57 100644
--- a/tests/extmod/asyncio_new_event_loop.py
+++ b/tests/extmod/asyncio_new_event_loop.py
@@ -1,5 +1,4 @@
 # Test Loop.new_event_loop()
-# Note: CPython deprecated get_event_loop() so this test needs a .exp
 
 try:
     import asyncio
@@ -7,6 +6,11 @@
     print("SKIP")
     raise SystemExit
 
+# CPython 3.12 deprecated calling get_event_loop() when there is no current event
+# loop, so to make this test run on CPython requires setting the event loop.
+if hasattr(asyncio, "set_event_loop"):
+    asyncio.set_event_loop(asyncio.new_event_loop())
+
 
 async def task():
     for i in range(4):
diff --git a/tests/extmod/asyncio_new_event_loop.py.exp b/tests/extmod/asyncio_new_event_loop.py.exp
deleted file mode 100644
index 9e104fda39c94..0000000000000
--- a/tests/extmod/asyncio_new_event_loop.py.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-start
-task 0
-stop
-start
-task 0
-stop

From e00d80d9e27552760603b507c77aad6f5705174f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jul 2024 12:35:42 +1000
Subject: [PATCH 1220/3129] py: Remove 5 TODOs in emitbc, objrange and repl.

These TODOs don't need to be done:

- Calling functions with keyword arguments is less common than without
  them, so adding an extra byte overhead to all calls regardless of whether
  they use keywords or not would overall increase generated bytecode size.

- Restricting `range` objects to machine-sized ints has been adequate for
  a long time now, so no need to change that and make it more complicated
  and slower.

- Printing spaces in tab completion does not need to be optimised.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitbc.c   | 4 ++--
 py/objrange.c | 2 --
 py/repl.c     | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/py/emitbc.c b/py/emitbc.c
index f6bb229ba0d87..0fbda56fdb006 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -794,10 +794,10 @@ static void emit_bc_call_function_method_helper(emit_t *emit, int stack_adj, mp_
         // 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?
+        emit_write_bytecode_byte_uint(emit, stack_adj, bytecode_base + 1, (n_keyword << 8) | n_positional);
     } else {
         stack_adj -= (int)n_positional + 2 * (int)n_keyword;
-        emit_write_bytecode_byte_uint(emit, stack_adj, bytecode_base, (n_keyword << 8) | n_positional); // TODO make it 2 separate uints?
+        emit_write_bytecode_byte_uint(emit, stack_adj, bytecode_base, (n_keyword << 8) | n_positional);
     }
 }
 
diff --git a/py/objrange.c b/py/objrange.c
index 9a4ecd3fcd7f2..5ccb04fba60c8 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -33,7 +33,6 @@
 
 typedef struct _mp_obj_range_it_t {
     mp_obj_base_t base;
-    // TODO make these values generic objects or something
     mp_int_t cur;
     mp_int_t stop;
     mp_int_t step;
@@ -72,7 +71,6 @@ static mp_obj_t mp_obj_new_range_iterator(mp_int_t cur, mp_int_t stop, mp_int_t
 
 typedef struct _mp_obj_range_t {
     mp_obj_base_t base;
-    // TODO make these values generic objects or something
     mp_int_t start;
     mp_int_t stop;
     mp_int_t step;
diff --git a/py/repl.c b/py/repl.c
index b79a2d3c42783..87c171cc87283 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -225,7 +225,6 @@ static void print_completions(const mp_print_t *print,
                     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, " ");
                     }

From 96007e7de55810b20134b050c80cbc7a6d1d5a57 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jul 2024 12:44:44 +1000
Subject: [PATCH 1221/3129] py/lexer: Add static assert that token enum values
 all fit in a byte.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/lexer.c | 4 +++-
 py/lexer.h | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/py/lexer.c b/py/lexer.c
index 48497663c58d1..98a10c87b2e5a 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -228,7 +228,6 @@ static const char *const tok_enc =
     "=e="         // = ==
     "!.";         // start of special cases: != . ...
 
-// TODO static assert that number of tokens is less than 256 so we can safely make this table with byte sized entries
 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,
@@ -774,6 +773,9 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
     } else {
         // search for encoded delimiter or operator
 
+        // assert that the token enum value fits in a byte, so they all fit in tok_enc_kind
+        MP_STATIC_ASSERT(MP_TOKEN_NUMBER_OF <= 256);
+
         const char *t = tok_enc;
         size_t tok_enc_index = 0;
         for (; *t != 0 && !is_char(lex, *t); t += 1) {
diff --git a/py/lexer.h b/py/lexer.h
index e0b506b20b66e..6e6c3e8f23e06 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -152,6 +152,8 @@ typedef enum _mp_token_kind_t {
     MP_TOKEN_DEL_SEMICOLON,
     MP_TOKEN_DEL_EQUAL,
     MP_TOKEN_DEL_MINUS_MORE,
+
+    MP_TOKEN_NUMBER_OF,
 } mp_token_kind_t;
 
 // this data structure is exposed for efficiency

From 1548132979ab6facd0d3d98fd381c5178330fa20 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jul 2024 12:45:05 +1000
Subject: [PATCH 1222/3129] py/sequence: Remove unused len argument from
 mp_seq_extract_slice.

Also put this function inside the `MICROPY_PY_BUILTINS_SLICE` guard,
because it's only usable when that option is enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h      | 2 +-
 py/objlist.c  | 2 +-
 py/sequence.c | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 82f67fad4d96c..46d42baf4bfc1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -1258,7 +1258,7 @@ bool mp_seq_cmp_bytes(mp_uint_t op, const byte *data1, size_t len1, const byte *
 bool mp_seq_cmp_objs(mp_uint_t op, const mp_obj_t *items1, size_t len1, const mp_obj_t *items2, size_t len2);
 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);
+mp_obj_t mp_seq_extract_slice(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))
diff --git a/py/objlist.c b/py/objlist.c
index 2198beb839f14..9c8cd0e86c844 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -188,7 +188,7 @@ static mp_obj_t list_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;
             if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
-                return mp_seq_extract_slice(self->len, self->items, &slice);
+                return mp_seq_extract_slice(self->items, &slice);
             }
             mp_obj_list_t *res = list_new(slice.stop - slice.start);
             mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);
diff --git a/py/sequence.c b/py/sequence.c
index 58386074312ed..9eb67ada6e82e 100644
--- a/py/sequence.c
+++ b/py/sequence.c
@@ -63,11 +63,7 @@ bool mp_seq_get_fast_slice_indexes(mp_uint_t len, mp_obj_t slice, mp_bound_slice
     return indexes->step == 1;
 }
 
-#endif
-
-mp_obj_t mp_seq_extract_slice(size_t len, const mp_obj_t *seq, mp_bound_slice_t *indexes) {
-    (void)len; // TODO can we remove len from the arg list?
-
+mp_obj_t mp_seq_extract_slice(const mp_obj_t *seq, mp_bound_slice_t *indexes) {
     mp_int_t start = indexes->start, stop = indexes->stop;
     mp_int_t step = indexes->step;
 
@@ -87,6 +83,8 @@ mp_obj_t mp_seq_extract_slice(size_t len, const mp_obj_t *seq, mp_bound_slice_t
     return res;
 }
 
+#endif
+
 // Special-case comparison function for sequences of bytes
 // Don't pass MP_BINARY_OP_NOT_EQUAL here
 bool mp_seq_cmp_bytes(mp_uint_t op, const byte *data1, size_t len1, const byte *data2, size_t len2) {

From 5147dc5de5ac1eb0c733005e4fbd665bcffd74d4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Jul 2024 10:35:16 +1000
Subject: [PATCH 1223/3129] py/gc: Remove commented-out functions.

These are old, unused, and most of them no longer compile.  The `gc_test()`
function is superseded by the test suite.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c | 77 ---------------------------------------------------------
 1 file changed, 77 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 8a03ce5264e89..bee44925076f0 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -880,16 +880,6 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
     return ret_ptr;
 }
 
-/*
-void *gc_alloc(mp_uint_t n_bytes) {
-    return _gc_alloc(n_bytes, false);
-}
-
-void *gc_alloc_with_finaliser(mp_uint_t n_bytes) {
-    return _gc_alloc(n_bytes, true);
-}
-*/
-
 // force the freeing of a piece of memory
 // TODO: freeing here does not call finaliser
 void gc_free(void *ptr) {
@@ -992,35 +982,6 @@ size_t gc_nbytes(const void *ptr) {
     return 0;
 }
 
-#if 0
-// old, simple realloc that didn't expand memory in place
-void *gc_realloc(void *ptr, mp_uint_t n_bytes) {
-    mp_uint_t n_existing = gc_nbytes(ptr);
-    if (n_bytes <= n_existing) {
-        return ptr;
-    } else {
-        bool has_finaliser;
-        if (ptr == NULL) {
-            has_finaliser = false;
-        } else {
-            #if MICROPY_ENABLE_FINALISER
-            has_finaliser = FTB_GET(BLOCK_FROM_PTR((mp_uint_t)ptr));
-            #else
-            has_finaliser = false;
-            #endif
-        }
-        void *ptr2 = gc_alloc(n_bytes, has_finaliser);
-        if (ptr2 == NULL) {
-            return ptr2;
-        }
-        memcpy(ptr2, ptr, n_existing);
-        gc_free(ptr);
-        return ptr2;
-    }
-}
-
-#else // Alternative gc_realloc impl
-
 void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     // check for pure allocation
     if (ptr_in == NULL) {
@@ -1170,7 +1131,6 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     gc_free(ptr_in);
     return ptr_out;
 }
-#endif // Alternative gc_realloc impl
 
 void gc_dump_info(const mp_print_t *print) {
     gc_info_t info;
@@ -1314,41 +1274,4 @@ void gc_dump_alloc_table(const mp_print_t *print) {
     GC_EXIT();
 }
 
-#if 0
-// For testing the GC functions
-void gc_test(void) {
-    mp_uint_t len = 500;
-    mp_uint_t *heap = malloc(len);
-    gc_init(heap, heap + len / sizeof(mp_uint_t));
-    void *ptrs[100];
-    {
-        mp_uint_t **p = gc_alloc(16, false);
-        p[0] = gc_alloc(64, false);
-        p[1] = gc_alloc(1, false);
-        p[2] = gc_alloc(1, false);
-        p[3] = gc_alloc(1, false);
-        mp_uint_t ***p2 = gc_alloc(16, false);
-        p2[0] = p;
-        p2[1] = p;
-        ptrs[0] = p2;
-    }
-    for (int i = 0; i < 25; i += 2) {
-        mp_uint_t *p = gc_alloc(i, false);
-        printf("p=%p\n", p);
-        if (i & 3) {
-            // ptrs[i] = p;
-        }
-    }
-
-    printf("Before GC:\n");
-    gc_dump_alloc_table(&mp_plat_print);
-    printf("Starting GC...\n");
-    gc_collect_start();
-    gc_collect_root(ptrs, sizeof(ptrs) / sizeof(void *));
-    gc_collect_end();
-    printf("After GC:\n");
-    gc_dump_alloc_table(&mp_plat_print);
-}
-#endif
-
 #endif // MICROPY_ENABLE_GC

From 77bd8fe5b80b0e7e02cdb6b4272c401ae3dca638 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Jun 2024 10:51:10 +1000
Subject: [PATCH 1224/3129] webassembly: Reuse PyProxy objects when they are
 the same Python object.

This commit makes it so that PyProxy objects are reused (on the JavaScript
side) when they correspond to an existing Python object that is the same
object.

For example, proxying the same Python function to JavaScript, the same
PyProxy instance is now used.  This means that if `foo` is a Python
function then accessing it on the JavaScript side such as
`api.globals().get("foo")` has the property that:

    api.globals().get("foo") === api.globals().get("foo")

Prior to this commit the above was not true because new PyProxy instances
were created each time `foo` was accessed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/proxy_c.c                   | 53 ++++++++++++++++---
 ports/webassembly/proxy_js.js                 | 32 +++++++++++
 tests/ports/webassembly/heap_expand.mjs.exp   | 42 +++++++--------
 tests/ports/webassembly/py_proxy_identity.mjs | 26 +++++++++
 .../webassembly/py_proxy_identity.mjs.exp     |  3 ++
 5 files changed, 129 insertions(+), 27 deletions(-)
 create mode 100644 tests/ports/webassembly/py_proxy_identity.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_identity.mjs.exp

diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index a8c444faaebca..00abc43bf2b3f 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -49,6 +49,7 @@ enum {
     PROXY_KIND_MP_GENERATOR = 7,
     PROXY_KIND_MP_OBJECT = 8,
     PROXY_KIND_MP_JSPROXY = 9,
+    PROXY_KIND_MP_EXISTING = 10,
 };
 
 enum {
@@ -79,40 +80,76 @@ static size_t proxy_c_ref_next;
 
 void proxy_c_init(void) {
     MP_STATE_PORT(proxy_c_ref) = mp_obj_new_list(0, NULL);
+    MP_STATE_PORT(proxy_c_dict) = mp_obj_new_dict(0);
     mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), MP_OBJ_NULL);
     proxy_c_ref_next = PROXY_C_REF_NUM_STATIC;
 }
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t proxy_c_ref);
+MP_REGISTER_ROOT_POINTER(mp_obj_t proxy_c_dict);
 
 // obj cannot be MP_OBJ_NULL.
 static inline size_t proxy_c_add_obj(mp_obj_t obj) {
     // Search for the first free slot in proxy_c_ref.
+    size_t id = 0;
     mp_obj_list_t *l = (mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref));
     while (proxy_c_ref_next < l->len) {
         if (l->items[proxy_c_ref_next] == MP_OBJ_NULL) {
             // Free slot found, reuse it.
-            size_t id = proxy_c_ref_next;
+            id = proxy_c_ref_next;
             ++proxy_c_ref_next;
             l->items[id] = obj;
-            return id;
+            break;
         }
         ++proxy_c_ref_next;
     }
 
-    // No free slots, so grow proxy_c_ref by one (append at the end of the list).
-    size_t id = l->len;
-    mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), obj);
-    proxy_c_ref_next = l->len;
+    if (id == 0) {
+        // No free slots, so grow proxy_c_ref by one (append at the end of the list).
+        id = l->len;
+        mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), obj);
+        proxy_c_ref_next = l->len;
+    }
+
+    // Add the object to proxy_c_dict, keyed by the object pointer, with value the object id.
+    mp_obj_t obj_key = mp_obj_new_int_from_uint((uintptr_t)obj);
+    mp_map_elem_t *elem = mp_map_lookup(mp_obj_dict_get_map(MP_STATE_PORT(proxy_c_dict)), obj_key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+    elem->value = mp_obj_new_int_from_uint(id);
+
     return id;
 }
 
+EM_JS(int, js_check_existing, (int c_ref), {
+    return proxy_js_check_existing(c_ref);
+});
+
+// obj cannot be MP_OBJ_NULL.
+static inline int proxy_c_check_existing(mp_obj_t obj) {
+    mp_obj_t obj_key = mp_obj_new_int_from_uint((uintptr_t)obj);
+    mp_map_elem_t *elem = mp_map_lookup(mp_obj_dict_get_map(MP_STATE_PORT(proxy_c_dict)), obj_key, MP_MAP_LOOKUP);
+    if (elem == NULL) {
+        return -1;
+    }
+    uint32_t c_ref = mp_obj_int_get_truncated(elem->value);
+    return js_check_existing(c_ref);
+}
+
 static inline mp_obj_t proxy_c_get_obj(uint32_t c_ref) {
     return ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->items[c_ref];
 }
 
 void proxy_c_free_obj(uint32_t c_ref) {
     if (c_ref >= PROXY_C_REF_NUM_STATIC) {
+        // Remove the object from proxy_c_dict if the c_ref in that dict corresponds to this object.
+        // (It may be that this object exists in the dict but with a different c_ref from a more
+        // recent proxy of this object.)
+        mp_obj_t obj_key = mp_obj_new_int_from_uint((uintptr_t)proxy_c_get_obj(c_ref));
+        mp_map_elem_t *elem = mp_map_lookup(mp_obj_dict_get_map(MP_STATE_PORT(proxy_c_dict)), obj_key, MP_MAP_LOOKUP);
+        if (elem != NULL && mp_obj_int_get_truncated(elem->value) == c_ref) {
+            mp_map_lookup(mp_obj_dict_get_map(MP_STATE_PORT(proxy_c_dict)), obj_key, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
+        }
+
+        // Clear the slot in proxy_c_ref used by this object, so the GC can reclaim the object.
         ((mp_obj_list_t *)MP_OBJ_TO_PTR(MP_STATE_PORT(proxy_c_ref)))->items[c_ref] = MP_OBJ_NULL;
         proxy_c_ref_next = MIN(proxy_c_ref_next, c_ref);
     }
@@ -143,6 +180,7 @@ mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value) {
 
 void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
     uint32_t kind;
+    int js_ref;
     if (obj == MP_OBJ_NULL) {
         kind = PROXY_KIND_MP_NULL;
     } else if (obj == mp_const_none) {
@@ -168,6 +206,9 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
     } else if (mp_obj_is_jsproxy(obj)) {
         kind = PROXY_KIND_MP_JSPROXY;
         out[1] = mp_obj_jsproxy_get_ref(obj);
+    } else if ((js_ref = proxy_c_check_existing(obj)) >= 0) {
+        kind = PROXY_KIND_MP_EXISTING;
+        out[1] = js_ref;
     } else if (mp_obj_get_type(obj) == &mp_type_JsException) {
         mp_obj_exception_t *exc = MP_OBJ_TO_PTR(obj);
         if (exc->args->len > 0 && mp_obj_is_jsproxy(exc->args->items[0])) {
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index fe92b5725a049..9e7c233e30bfc 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -40,6 +40,7 @@ const PROXY_KIND_MP_CALLABLE = 6;
 const PROXY_KIND_MP_GENERATOR = 7;
 const PROXY_KIND_MP_OBJECT = 8;
 const PROXY_KIND_MP_JSPROXY = 9;
+const PROXY_KIND_MP_EXISTING = 10;
 
 const PROXY_KIND_JS_UNDEFINED = 0;
 const PROXY_KIND_JS_NULL = 1;
@@ -61,13 +62,39 @@ class PythonError extends Error {
 function proxy_js_init() {
     globalThis.proxy_js_ref = [globalThis, undefined];
     globalThis.proxy_js_ref_next = PROXY_JS_REF_NUM_STATIC;
+    globalThis.proxy_js_map = new Map();
+    globalThis.proxy_js_existing = [undefined];
     globalThis.pyProxyFinalizationRegistry = new FinalizationRegistry(
         (cRef) => {
+            globalThis.proxy_js_map.delete(cRef);
             Module.ccall("proxy_c_free_obj", "null", ["number"], [cRef]);
         },
     );
 }
 
+// Check if the c_ref (Python proxy index) has a corresponding JavaScript-side PyProxy
+// associated with it.  If so, take a concrete reference to this PyProxy from the WeakRef
+// and put it in proxy_js_existing, to be referenced and reused by PROXY_KIND_MP_EXISTING.
+function proxy_js_check_existing(c_ref) {
+    const existing_obj = globalThis.proxy_js_map.get(c_ref)?.deref();
+    if (existing_obj === undefined) {
+        return -1;
+    }
+
+    // Search for a free slot in proxy_js_existing.
+    for (let i = 0; i < globalThis.proxy_js_existing.length; ++i) {
+        if (globalThis.proxy_js_existing[i] === undefined) {
+            // Free slot found, put existing_obj here and return the index.
+            globalThis.proxy_js_existing[i] = existing_obj;
+            return i;
+        }
+    }
+
+    // No free slot, so append to proxy_js_existing and return the new index.
+    globalThis.proxy_js_existing.push(existing_obj);
+    return globalThis.proxy_js_existing.length - 1;
+}
+
 // js_obj cannot be undefined
 function proxy_js_add_obj(js_obj) {
     // Search for the first free slot in proxy_js_ref.
@@ -241,6 +268,10 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
         // js proxy
         const id = Module.getValue(value + 4, "i32");
         obj = proxy_js_ref[id];
+    } else if (kind === PROXY_KIND_MP_EXISTING) {
+        const id = Module.getValue(value + 4, "i32");
+        obj = globalThis.proxy_js_existing[id];
+        globalThis.proxy_js_existing[id] = undefined;
     } else {
         // obj
         const id = Module.getValue(value + 4, "i32");
@@ -257,6 +288,7 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
             obj = new Proxy(target, py_proxy_handler);
         }
         globalThis.pyProxyFinalizationRegistry.register(obj, id);
+        globalThis.proxy_js_map.set(id, new WeakRef(obj));
     }
     return obj;
 }
diff --git a/tests/ports/webassembly/heap_expand.mjs.exp b/tests/ports/webassembly/heap_expand.mjs.exp
index 5efa8567f7707..56341351492f5 100644
--- a/tests/ports/webassembly/heap_expand.mjs.exp
+++ b/tests/ports/webassembly/heap_expand.mjs.exp
@@ -1,27 +1,27 @@
-135241360
 135241328
 135241296
 135241264
-135241216
-135241168
-135241088
-135240944
-135240640
-135240112
-135239072
-135237008
-135232896
-135224688
-135208288
-135175504
-135109888
-134978800
-134716640
-135216784
-136217152
-138217840
-142219296
-150222224
+135241232
+135241184
+135241136
+135241056
+135240912
+135240608
+135240080
+135239040
+135236976
+135232864
+135224656
+135208256
+135175472
+135109856
+134978768
+134716608
+135216752
+136217120
+138217808
+142219264
+150222192
 1
 2
 4
diff --git a/tests/ports/webassembly/py_proxy_identity.mjs b/tests/ports/webassembly/py_proxy_identity.mjs
new file mode 100644
index 0000000000000..d4a720b738a6c
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_identity.mjs
@@ -0,0 +1,26 @@
+// Test identity of PyProxy when they are the same Python object.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+l = []
+`);
+
+const l1 = mp.globals.get("l");
+const l2 = mp.globals.get("l");
+console.log(l1, l2);
+console.log(l1 === l2);
+
+globalThis.eventTarget = new EventTarget();
+globalThis.event = new Event("event");
+
+mp.runPython(`
+import js
+
+def callback(ev):
+    print("callback", ev)
+js.eventTarget.addEventListener("event", callback)
+js.eventTarget.dispatchEvent(js.event)
+js.eventTarget.removeEventListener("event", callback)
+js.eventTarget.dispatchEvent(js.event)
+`);
diff --git a/tests/ports/webassembly/py_proxy_identity.mjs.exp b/tests/ports/webassembly/py_proxy_identity.mjs.exp
new file mode 100644
index 0000000000000..01ccf0d892653
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_identity.mjs.exp
@@ -0,0 +1,3 @@
+PyProxy { _ref: 3 } PyProxy { _ref: 3 }
+true
+callback <JsProxy 7>

From 847ee20d9b18c36e2160aaadfe71d2f7814648b1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Jul 2024 17:46:33 +1000
Subject: [PATCH 1225/3129] tests/multi_bluetooth/perf_gatt_notify.py: Reduce
 connection interval.

To test that the notification ping-pong can be low latency.

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

diff --git a/tests/multi_bluetooth/perf_gatt_notify.py b/tests/multi_bluetooth/perf_gatt_notify.py
index 8acccc6470d60..ac791a3ebfa26 100644
--- a/tests/multi_bluetooth/perf_gatt_notify.py
+++ b/tests/multi_bluetooth/perf_gatt_notify.py
@@ -110,9 +110,9 @@ def instance1():
     ((char_handle,),) = ble.gatts_register_services(SERVICES)
     multitest.next()
     try:
-        # Connect to peripheral and then disconnect.
+        # Connect to peripheral, with a short connection interval to reduce notify latency.
         print("gap_connect")
-        ble.gap_connect(*BDADDR)
+        ble.gap_connect(BDADDR[0], BDADDR[1], 2000, 12500, 12500)
         conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
         # Discover characteristics.

From a734ee9057a760b0316eca110d71db1524142fec Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 17 Jul 2024 20:43:51 +0200
Subject: [PATCH 1226/3129] shared/tinyusb/mp_usbd_cdc: Skip writing to an
 uninitialized USB device.

During execution of `boot.py` the USB device is not yet initialized.  Any
attempt to write to the CDC (eg calling `print()`) would lock up the
device.  This commit skips writing when the USB device is not initialized.
Any output from `boot.py` is lost, but the device does not lock up.

Also removed unnecessary declaration of `tusb_init()`.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 shared/tinyusb/mp_usbd.h     | 1 -
 shared/tinyusb/mp_usbd_cdc.c | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index ef32348451391..31234566b6ca4 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -125,7 +125,6 @@ inline static bool mp_usb_device_builtin_enabled(const mp_obj_usb_device_t *usbd
 
 static inline void mp_usbd_init(void) {
     // Without runtime USB support, this can be a thin wrapper wrapper around tusb_init()
-    extern bool tusb_init(void);
     tusb_init();
 }
 
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index 63d015cb461f5..c6a88e467d398 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -95,6 +95,9 @@ void tud_cdc_rx_cb(uint8_t itf) {
 }
 
 mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
+    if (!tusb_inited()) {
+        return 0;
+    }
     size_t i = 0;
     while (i < len) {
         uint32_t n = len - i;

From 69c25ea8653566ec97690b5121bd10b753c89426 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jul 2024 13:20:31 +1000
Subject: [PATCH 1227/3129] shared/runtime/pyexec: Make a raised SystemExit
 always do a forced exit.

The current situation with SystemExit and soft reset is the following:
- `sys.exit()` follows CPython and just raises `SystemExit`.
- On the unix port, raising `SystemExit` quits the application/MicroPython,
  whether at the REPL or in code (this follows CPython behaviour).
- On bare-metal ports, raising `SystemExit` at the REPL does nothing,
  raising it in code will stop the code and drop into the REPL.
- `machine.soft_reset()` raises `SystemExit` but with a special flag set,
  and bare-metal targets check this flag when it propagates to the
  top-level and do a soft reset when they receive it.

The original idea here was that a bare-metal target can't "quit" like the
unix port can, and so dropping to the REPL was considered the same as
"quit".  But this bare-metal behaviour is arguably inconsistent with unix,
and "quit" should mean terminate everything, including REPL access.

This commit changes the behaviour to the following, which is more
consistent:
- Raising `SystemExit` on a bare-metal port will do a soft reset (unless
  the exception is caught by the application).
- `machine.soft_reset()` is now equivalent to `sys.exit()`.
- unix port behaviour remains unchanged.

Tested running the test suite on an stm32 board and everything still
passes, in particular tests that skip by raising `SystemExit` still
correctly skip.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.c         | 1 -
 ports/qemu-arm/modmachine.c | 3 ---
 ports/unix/modmachine.c     | 3 ---
 shared/runtime/pyexec.c     | 6 +-----
 shared/runtime/pyexec.h     | 5 -----
 5 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 2fe72817b6c2a..a423d8067cfba 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -62,7 +62,6 @@ NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
 #endif
 
 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);
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 5f6db937c3384..a897c5670e49b 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -27,9 +27,6 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
-// This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
-int pyexec_system_exit = 0;
-
 static void mp_machine_idle(void) {
     // Do nothing.
 }
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 6f3ab80944061..d1cdbe8619aba 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -36,9 +36,6 @@
 #define MICROPY_PAGE_MASK (MICROPY_PAGE_SIZE - 1)
 #endif
 
-// This variable is needed for machine.soft_reset(), but the variable is otherwise unused.
-int pyexec_system_exit = 0;
-
 uintptr_t mod_machine_mem_get_addr(mp_obj_t addr_o, uint align) {
     uintptr_t addr = mp_obj_get_int_truncated(addr_o);
     if ((addr & (align - 1)) != 0) {
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index a305e6a5df6dd..9dc4446ed4d66 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -44,7 +44,6 @@
 #include "genhdr/mpversion.h"
 
 pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
-int pyexec_system_exit = 0;
 
 #if MICROPY_REPL_INFO
 static bool repl_display_debugging_info = 0;
@@ -74,9 +73,6 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
     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) {
@@ -146,7 +142,7 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         // 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
-            ret = pyexec_system_exit;
+            ret = PYEXEC_FORCED_EXIT;
         } else {
             mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
             ret = 0;
diff --git a/shared/runtime/pyexec.h b/shared/runtime/pyexec.h
index 64c5ef94340d3..5779d3e09a8c4 100644
--- a/shared/runtime/pyexec.h
+++ b/shared/runtime/pyexec.h
@@ -35,11 +35,6 @@ typedef enum {
 
 extern pyexec_mode_kind_t pyexec_mode_kind;
 
-// Set this to the value (eg PYEXEC_FORCED_EXIT) that will be propagated through
-// the pyexec functions if a SystemExit exception is raised by the running code.
-// It will reset to 0 at the start of each execution (eg each REPL entry).
-extern int pyexec_system_exit;
-
 #define PYEXEC_FORCED_EXIT (0x100)
 
 int pyexec_raw_repl(void);

From 5f3ecc29f8f0d69d15710ded3278fe055f532517 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jul 2024 13:24:27 +1000
Subject: [PATCH 1228/3129] extmod/modmachine: Use sys.exit as implementation
 of machine.soft_reset.

It does the same thing, raising `SystemExit`.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modmachine.c | 12 ++++++------
 py/builtin.h        |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index a423d8067cfba..5906835949861 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "py/builtin.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_MACHINE
@@ -35,6 +36,10 @@
 #include "drivers/dht/dht.h"
 #endif
 
+#if !MICROPY_PY_SYS_EXIT
+#error MICROPY_PY_MACHINE requires MICROPY_PY_SYS_EXIT
+#endif
+
 // The port must provide implementations of these low-level machine functions.
 
 static void mp_machine_idle(void);
@@ -61,11 +66,6 @@ NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
 #include MICROPY_PY_MACHINE_INCLUDEFILE
 #endif
 
-static mp_obj_t machine_soft_reset(void) {
-    mp_raise_type(&mp_type_SystemExit);
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
-
 #if MICROPY_PY_MACHINE_BOOTLOADER
 NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     mp_machine_bootloader(n_args, args);
@@ -156,7 +156,7 @@ static const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
 
     // Reset related functions.
-    { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) },
+    { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&mp_sys_exit_obj) },
     #if MICROPY_PY_MACHINE_BOOTLOADER
     { MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_obj) },
     #endif
diff --git a/py/builtin.h b/py/builtin.h
index 81d0789802b9c..6efe3e8facabd 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -126,6 +126,8 @@ 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);
 
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_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__;

From 8159dcc276dc07bcb28d6ab3a3b7d2a5c1d90ab5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Jul 2024 22:36:15 +1000
Subject: [PATCH 1229/3129] extmod/modos: Include os.sep entry if MICROPY_VFS
 is enabled.

This simplifies configuration by removing the `MICROPY_PY_OS_SEP` option
and instead including `os.sep` if `MICROPY_VFS` is enabled.  That matches
the configuration of all existing ports that enabled `os.sep` (they also
had `MICROPY_VFS` enabled), and brings consistency to other ports.

Fixes issue #15116.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modos.c                               | 4 +---
 ports/nrf/mpconfigport.h                     | 1 -
 ports/renesas-ra/mpconfigport.h              | 1 -
 ports/stm32/mpconfigport.h                   | 1 -
 ports/unix/variants/mpconfigvariant_common.h | 1 -
 ports/windows/mpconfigport.h                 | 1 -
 6 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/extmod/modos.c b/extmod/modos.c
index 7f1e31fba7793..e7f7fc818cf08 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -153,9 +153,6 @@ static const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mp_os_putenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mp_os_unsetenv_obj) },
     #endif
-    #if MICROPY_PY_OS_SEP
-    { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
-    #endif
     #if MICROPY_PY_OS_SYNC
     { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_os_sync_obj) },
     #endif
@@ -170,6 +167,7 @@ static const mp_rom_map_elem_t os_module_globals_table[] = {
     #endif
 
     #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
     { 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) },
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 0b9b667eeaf31..48b58143acdd0 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -151,7 +151,6 @@
 #define MICROPY_PY_OS_INCLUDEFILE   "ports/nrf/modules/os/modos.c"
 #define MICROPY_PY_OS_DUPTERM       (1)
 #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
-#define MICROPY_PY_OS_SEP           (1)
 #define MICROPY_PY_OS_SYNC          (MICROPY_VFS)
 #define MICROPY_PY_OS_UNAME         (1)
 #define MICROPY_PY_OS_URANDOM       (MICROPY_HW_ENABLE_RNG)
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 52effd64f9295..a23a2c1065fa2 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -120,7 +120,6 @@
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
 #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
-#define MICROPY_PY_OS_SEP           (1)
 #define MICROPY_PY_OS_SYNC          (1)
 #define MICROPY_PY_OS_UNAME         (1)
 #define MICROPY_PY_OS_URANDOM       (MICROPY_HW_ENABLE_RNG)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index bd1ab671e071d..25fc9e11f9d68 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -99,7 +99,6 @@
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
 #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
-#define MICROPY_PY_OS_SEP           (1)
 #define MICROPY_PY_OS_SYNC          (1)
 #define MICROPY_PY_OS_UNAME         (1)
 #define MICROPY_PY_OS_URANDOM       (MICROPY_HW_ENABLE_RNG)
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 2e34055bf773f..cea0397414325 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -95,7 +95,6 @@
 #define MICROPY_PY_OS_INCLUDEFILE      "ports/unix/modos.c"
 #define MICROPY_PY_OS_ERRNO            (1)
 #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
-#define MICROPY_PY_OS_SEP              (1)
 #define MICROPY_PY_OS_SYSTEM           (1)
 #define MICROPY_PY_OS_URANDOM          (1)
 
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 55e44c6f5c8c5..fabc9072d6c70 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -136,7 +136,6 @@
 #define MICROPY_PY_OS_INCLUDEFILE   "ports/unix/modos.c"
 #define MICROPY_PY_OS_ERRNO         (1)
 #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
-#define MICROPY_PY_OS_SEP           (1)
 #define MICROPY_PY_OS_STATVFS       (0)
 #define MICROPY_PY_OS_SYSTEM        (1)
 #define MICROPY_PY_OS_URANDOM       (1)

From 6db91dfefb1a7ba0026106d8f0c6589630e9a012 Mon Sep 17 00:00:00 2001
From: Michael Vornovitsky <michaelvornovitskiy@outlook.com>
Date: Sat, 11 Nov 2023 20:10:51 -0500
Subject: [PATCH 1230/3129] extmod/modbtree: Add checks for already-closed
 database.

Fixes use-after-free when accessing the database after it is closed with
`btree_close`.  `btree_close` always succeeds when called with an
already-closed database.

The new test checks that operations that access the underlying database
(get, set, flush, seq) fail with a `ValueError` when the btree is already
closed.  It also checks that closing and printing the btree succeed when
the btree is already closed.

Fixes issue #12543.

Signed-off-by: Michael Vornovitsky <michaelvornovitskiy@outlook.com>
---
 extmod/modbtree.c                | 22 +++++++++++++++++-
 tests/extmod/btree_closed.py     | 39 ++++++++++++++++++++++++++++++++
 tests/extmod/btree_closed.py.exp |  5 ++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 tests/extmod/btree_closed.py
 create mode 100644 tests/extmod/btree_closed.py.exp

diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 55c13ac911a73..f48645a8270dc 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -89,6 +89,12 @@ void __dbpanic(DB *db) {
     mp_printf(&mp_plat_print, "__dbpanic(%p)\n", db);
 }
 
+static void check_btree_is_open(mp_obj_btree_t *self) {
+    if (!self->db) {
+        mp_raise_ValueError(MP_ERROR_TEXT("database closed"));
+    }
+}
+
 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, (mp_obj_type_t *)&btree_type);
     o->stream = stream;
@@ -114,19 +120,28 @@ static void btree_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind
 
 static mp_obj_t btree_flush(mp_obj_t self_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+    check_btree_is_open(self);
     return MP_OBJ_NEW_SMALL_INT(__bt_sync(self->db, 0));
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(btree_flush_obj, btree_flush);
 
 static mp_obj_t btree_close(mp_obj_t self_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(__bt_close(self->db));
+    int res;
+    if (self->db) {
+        res = __bt_close(self->db);
+        self->db = NULL;
+    } else {
+        res = RET_SUCCESS; // Closing an already-closed DB always succeeds.
+    }
+    return MP_OBJ_NEW_SMALL_INT(res);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(btree_close_obj, btree_close);
 
 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]);
+    check_btree_is_open(self);
     DBT key, val;
     buf_to_dbt(args[1], &key);
     buf_to_dbt(args[2], &val);
@@ -136,6 +151,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]);
+    check_btree_is_open(self);
     DBT key, val;
     buf_to_dbt(args[1], &key);
     int res = __bt_get(self->db, &key, &val, 0);
@@ -153,6 +169,7 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_get_obj, 2, 3, btree_get);
 
 static mp_obj_t btree_seq(size_t n_args, const mp_obj_t *args) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
+    check_btree_is_open(self);
     int flags = MP_OBJ_SMALL_INT_VALUE(args[1]);
     DBT key, val;
     if (n_args > 2) {
@@ -225,6 +242,7 @@ static mp_obj_t btree_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
 
 static mp_obj_t btree_iternext(mp_obj_t self_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+    check_btree_is_open(self);
     DBT key, val;
     int res;
     bool desc = self->flags & FLAG_DESC;
@@ -281,6 +299,7 @@ static mp_obj_t btree_iternext(mp_obj_t self_in) {
 
 static mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+    check_btree_is_open(self);
     if (value == MP_OBJ_NULL) {
         // delete
         DBT key;
@@ -314,6 +333,7 @@ static mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 
 static mp_obj_t btree_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(lhs_in);
+    check_btree_is_open(self);
     switch (op) {
         case MP_BINARY_OP_CONTAINS: {
             DBT key, val;
diff --git a/tests/extmod/btree_closed.py b/tests/extmod/btree_closed.py
new file mode 100644
index 0000000000000..ae61cd00836d2
--- /dev/null
+++ b/tests/extmod/btree_closed.py
@@ -0,0 +1,39 @@
+try:
+    import btree
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+f = io.BytesIO()
+db = btree.open(f)
+
+db[b"foo"] = b"42"
+
+db.close()
+
+# Accessing an already-closed database should fail.
+try:
+    print(db[b"foo"])
+except ValueError:
+    print("ValueError")
+
+try:
+    db[b"bar"] = b"43"
+except ValueError:
+    print("ValueError")
+
+try:
+    db.flush()
+except ValueError:
+    print("ValueError")
+
+try:
+    for k, v in db.items():
+        pass
+except ValueError:
+    print("ValueError")
+
+# Closing and printing an already-closed database should not fail.
+db.close()
+print(db)
diff --git a/tests/extmod/btree_closed.py.exp b/tests/extmod/btree_closed.py.exp
new file mode 100644
index 0000000000000..312edfd13dba6
--- /dev/null
+++ b/tests/extmod/btree_closed.py.exp
@@ -0,0 +1,5 @@
+ValueError
+ValueError
+ValueError
+ValueError
+<btree 0>

From 444d7bacbec51321cea955802b62dff9318dcbf6 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 8 Nov 2023 13:43:28 +0100
Subject: [PATCH 1231/3129] extmod/moductypes: Validate the descriptor tuple.

Fixes various null dereferencing, out-of-bounds memory accesses and
`assert(0)` failures in the case of an invalid `uctypes` descriptor.

By design `uctypes` can crash because it accesses arbitrary memory, but at
least describing the descriptor layout should be forced to be correct and
not crash.

Fixes issue #12702.

Signed-off-by: stijn <stijn@ignitron.net>
---
 extmod/moductypes.c                   | 17 +++++++++--
 tests/extmod/uctypes_sizeof.py        | 41 ++++++++++++++++++++++++++-
 tests/extmod/uctypes_sizeof.py.exp    |  8 ++++++
 tests/extmod/uctypes_sizeof_od.py     |  6 ----
 tests/extmod/uctypes_sizeof_od.py.exp |  1 -
 5 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index fa743eb637374..00a69a275a0ee 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -143,6 +143,10 @@ static inline mp_uint_t uctypes_struct_scalar_size(int val_type) {
 
 // Get size of aggregate type descriptor
 static mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_uint_t *max_field_size) {
+    if (t->len == 0) {
+        syntax_error();
+    }
+
     mp_uint_t total_size = 0;
 
     mp_int_t offset_ = MP_OBJ_SMALL_INT_VALUE(t->items[0]);
@@ -150,8 +154,15 @@ static mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
 
     switch (agg_type) {
         case STRUCT:
+            if (t->len != 2) {
+                syntax_error();
+            }
             return uctypes_struct_size(t->items[1], layout_type, max_field_size);
         case PTR:
+            // Second field ignored, but should still be present for consistency.
+            if (t->len != 2) {
+                syntax_error();
+            }
             if (sizeof(void *) > *max_field_size) {
                 *max_field_size = sizeof(void *);
             }
@@ -167,15 +178,17 @@ static mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
                 if (item_s > *max_field_size) {
                     *max_field_size = item_s;
                 }
-            } else {
+            } else if (t->len == 3) {
                 // Elements of array are aggregates
                 item_s = uctypes_struct_size(t->items[2], layout_type, max_field_size);
+            } else {
+                syntax_error();
             }
 
             return item_s * arr_sz;
         }
         default:
-            assert(0);
+            syntax_error();
     }
 
     return total_size;
diff --git a/tests/extmod/uctypes_sizeof.py b/tests/extmod/uctypes_sizeof.py
index 6e52232e39eba..d295cc85b6828 100644
--- a/tests/extmod/uctypes_sizeof.py
+++ b/tests/extmod/uctypes_sizeof.py
@@ -43,8 +43,47 @@
 print(uctypes.sizeof(S.sub))
 assert uctypes.sizeof(S.sub) == 1
 
-# invalid descriptor
+# invalid descriptors
 try:
     print(uctypes.sizeof([]))
 except TypeError:
     print("TypeError")
+
+try:
+    print(uctypes.sizeof(()))
+except TypeError:
+    print("TypeError")
+
+try:
+    print(uctypes.sizeof(("garbage",)))
+except TypeError:
+    print("TypeError")
+
+try:
+    # PTR * 3 is intended to be an invalid agg_type (STRUCT, PTR, ARRAY are valid ones).
+    print(uctypes.sizeof((uctypes.PTR * 3,)))
+except TypeError:
+    print("TypeError")
+
+try:
+    print(uctypes.sizeof((0, {}, "garbage")))
+except TypeError:
+    print("TypeError")
+
+try:
+    print(uctypes.sizeof((uctypes.PTR | 0,)))
+except TypeError:
+    print("TypeError")
+
+try:
+    print(uctypes.sizeof((uctypes.ARRAY | 0,)))
+except TypeError:
+    print("TypeError")
+
+try:
+    print(uctypes.sizeof((uctypes.ARRAY | 0, 1, {}, "garbage")))
+except TypeError:
+    print("TypeError")
+
+# empty descriptor
+print(uctypes.sizeof({}))
diff --git a/tests/extmod/uctypes_sizeof.py.exp b/tests/extmod/uctypes_sizeof.py.exp
index b35b11aa0cea9..edcc05a441f79 100644
--- a/tests/extmod/uctypes_sizeof.py.exp
+++ b/tests/extmod/uctypes_sizeof.py.exp
@@ -5,3 +5,11 @@ TypeError
 6
 1
 TypeError
+TypeError
+TypeError
+TypeError
+TypeError
+TypeError
+TypeError
+TypeError
+0
diff --git a/tests/extmod/uctypes_sizeof_od.py b/tests/extmod/uctypes_sizeof_od.py
index 375f05f5e2ce0..8aff363631508 100644
--- a/tests/extmod/uctypes_sizeof_od.py
+++ b/tests/extmod/uctypes_sizeof_od.py
@@ -45,9 +45,3 @@
 
 print(uctypes.sizeof(S.sub))
 assert uctypes.sizeof(S.sub) == 1
-
-# invalid descriptor
-try:
-    print(uctypes.sizeof([]))
-except TypeError:
-    print("TypeError")
diff --git a/tests/extmod/uctypes_sizeof_od.py.exp b/tests/extmod/uctypes_sizeof_od.py.exp
index b35b11aa0cea9..fb74def602b97 100644
--- a/tests/extmod/uctypes_sizeof_od.py.exp
+++ b/tests/extmod/uctypes_sizeof_od.py.exp
@@ -4,4 +4,3 @@
 TypeError
 6
 1
-TypeError

From 390390ec37d01c3f0ae0af7c489d36ac1e84fbe1 Mon Sep 17 00:00:00 2001
From: Terence Stenvold <tstenvold@gmail.com>
Date: Fri, 19 Jul 2024 12:38:44 +0200
Subject: [PATCH 1232/3129] extmod/vfs_fat: Set default volume label on mkfs if
 it's defined.

Using mkfs doesn't set a volume label for FAT filesystems.  This commit
will set the volume label if `MICROPY_HW_FLASH_FS_LABEL` is defined.
---
 extmod/vfs_fat.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 4f01432f54968..ee1169b8c3193 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -114,6 +114,11 @@ static mp_obj_t fat_vfs_mkfs(mp_obj_t bdev_in) {
         mp_raise_OSError(fresult_to_errno_table[res]);
     }
 
+    // set the filesystem label if it's configured
+    #ifdef MICROPY_HW_FLASH_FS_LABEL
+    f_setlabel(&vfs->fatfs, MICROPY_HW_FLASH_FS_LABEL);
+    #endif
+
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_mkfs_fun_obj, fat_vfs_mkfs);

From 29943546343c92334e8518695a11fc0e2ceea68b Mon Sep 17 00:00:00 2001
From: Junwha <qbit@unist.ac.kr>
Date: Wed, 3 Jan 2024 02:25:28 +0900
Subject: [PATCH 1233/3129] extmod/vfs: Fix buffer overflow of string
 comparison in umount.

The comparison between the given unmount string and existing mount strings
were made by the given string, which leads to buffer overflow.

Fixes issue #13006.

Signed-off-by: Junwha <qbit@unist.ac.kr>
---
 extmod/vfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 5d564459c0c0b..e545c9af93657 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -273,7 +273,7 @@ mp_obj_t mp_vfs_umount(mp_obj_t mnt_in) {
         mnt_str = mp_obj_str_get_data(mnt_in, &mnt_len);
     }
     for (mp_vfs_mount_t **vfsp = &MP_STATE_VM(vfs_mount_table); *vfsp != NULL; vfsp = &(*vfsp)->next) {
-        if ((mnt_str != NULL && !memcmp(mnt_str, (*vfsp)->str, mnt_len + 1)) || (*vfsp)->obj == mnt_in) {
+        if ((mnt_str != NULL && mnt_len == (*vfsp)->len && !memcmp(mnt_str, (*vfsp)->str, mnt_len)) || (*vfsp)->obj == mnt_in) {
             vfs = *vfsp;
             *vfsp = (*vfsp)->next;
             break;

From 337742f6c70a7b9d407df687774bb9c9cc6a1656 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 17 Jul 2024 15:38:55 +1000
Subject: [PATCH 1234/3129] esp32/mpthreadport: Fix uneven GIL allocation
 between Python threads.

Explicitly yield each time a thread mutex is unlocked.

Key to understanding this bug is that Python threads run at equal RTOS
priority, and although ESP-IDF FreeRTOS (and I think vanilla FreeRTOS)
scheduler will round-robin equal priority tasks in the ready state it does
not make a similar guarantee for tasks moving between ready and waiting.

The pathological case of this bug is when one Python thread task is busy
(i.e. never blocks) it will hog the CPU more than expected, sometimes for
an unbounded amount of time. This happens even though it periodically
unlocks the GIL to allow another task to run.

Assume T1 is busy and T2 is blocked waiting for the GIL. T1 is executing
and hits a condition to yield execution:

1. T1 calls MP_THREAD_GIL_EXIT
2. FreeRTOS sees T2 is waiting for the GIL and moves it to the Ready list
   (but does not preempt, as T2 is same priority, so T1 keeps running).
3. T1 immediately calls MP_THREAD_GIL_ENTER and re-takes the GIL.
4. Pre-emptive context switch happens, T2 wakes up, sees GIL is not
   available, and goes on the waiting list for the GIL again.

To break this cycle step 4 must happen before step 3, but this may be a
very narrow window of time so it may not happen regularly - and
quantisation of the timing of the tick interrupt to trigger a context
switch may mean it never happens.

Yielding at the end of step 2 maximises the chance for another task to run.

Adds a test that fails on esp32 before this fix and passes afterwards.

Fixes issue #15423.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/mpthreadport.c      |  5 ++++
 tests/thread/thread_coop.py     | 53 +++++++++++++++++++++++++++++++++
 tests/thread/thread_coop.py.exp |  2 ++
 3 files changed, 60 insertions(+)
 create mode 100644 tests/thread/thread_coop.py
 create mode 100644 tests/thread/thread_coop.py.exp

diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 12a6ede8668e6..34fef9f7beace 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -221,6 +221,11 @@ int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
 
 void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
     xSemaphoreGive(mutex->handle);
+    // Python threads run at equal priority, so pre-emptively yield here to
+    // prevent pathological imbalances where a thread unlocks and then
+    // immediately re-locks a mutex before a context switch can occur, leaving
+    // another thread waiting for an unbounded period of time.
+    taskYIELD();
 }
 
 void mp_thread_deinit(void) {
diff --git a/tests/thread/thread_coop.py b/tests/thread/thread_coop.py
new file mode 100644
index 0000000000000..aefc4af074db5
--- /dev/null
+++ b/tests/thread/thread_coop.py
@@ -0,0 +1,53 @@
+# Threads should be semi-cooperative, to the point where one busy
+# thread can't starve out another.
+#
+# (Note on ports without the GIL this one should always be true, on ports with GIL it's
+# a test of the GIL behaviour.)
+
+import _thread
+import sys
+from time import ticks_ms, ticks_diff, sleep_ms
+
+
+done = False
+
+ITERATIONS = 5
+SLEEP_MS = 250
+MAX_DELTA = 30
+
+if sys.platform in ("win32", "linux", "darwin"):
+    # Conventional operating systems get looser timing restrictions
+    SLEEP_MS = 300
+    MAX_DELTA = 100
+
+
+def busy_thread():
+    while not done:
+        pass
+
+
+def test_sleeps():
+    global done
+    ok = True
+    for _ in range(ITERATIONS):
+        t0 = ticks_ms()
+        sleep_ms(SLEEP_MS)
+        t1 = ticks_ms()
+        d = ticks_diff(t1, t0)
+        if d < SLEEP_MS - MAX_DELTA or d > SLEEP_MS + MAX_DELTA:
+            print("Slept too long ", d)
+            ok = False
+    print("OK" if ok else "Not OK")
+    done = True
+
+
+# make the thread the busy one, and check sleep time on main task
+_thread.start_new_thread(busy_thread, ())
+test_sleeps()
+
+sleep_ms(100)
+done = False
+
+# now swap them
+_thread.start_new_thread(test_sleeps, ())
+busy_thread()
diff --git a/tests/thread/thread_coop.py.exp b/tests/thread/thread_coop.py.exp
new file mode 100644
index 0000000000000..2c94e48371001
--- /dev/null
+++ b/tests/thread/thread_coop.py.exp
@@ -0,0 +1,2 @@
+OK
+OK

From 46c3df0229c81d5a6274e57315558404273b2fae Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 17 Jul 2024 16:28:20 +1000
Subject: [PATCH 1235/3129] tests/run-tests.py: Enable thread tests on esp32.

Before the fix in parent commit, some of these tests hung indefinitely.

After, they seem to consistently pass.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/run-tests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index a6caff7bbd8ea..e80d5b4633e31 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1121,7 +1121,9 @@ def main():
                 test_dirs += ("float", "inlineasm", "ports/renesas-ra")
             elif args.target == "rp2":
                 test_dirs += ("float", "stress", "inlineasm", "thread", "ports/rp2")
-            elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
+            elif args.target == "esp32":
+                test_dirs += ("float", "thread")
+            elif args.target in ("esp8266", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":
                 # run WiPy tests

From 594c4229b7aaa7b62ef2b24f47feeb7071714a0d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 3 Apr 2024 19:01:39 +0200
Subject: [PATCH 1236/3129] esp32/machine_timer: Limit timer numbers for
 ESP32C3.

The ESP32C3 has only two timers in one group.  In the code this is
reflected as two groups with one timer.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_timer.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 5e249e46e62c7..011f87ba9eb30 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -54,7 +54,7 @@ typedef struct _machine_timer_obj_t {
     mp_uint_t index;
 
     mp_uint_t repeat;
-    // ESP32 timers are 64-bit
+    // ESP32 timers are 64 or 54-bit
     uint64_t period;
 
     mp_obj_t callback;
@@ -84,13 +84,22 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
     machine_timer_obj_t *self = self_in;
     qstr mode = self->repeat ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
     uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms
+    #if CONFIG_IDF_TARGET_ESP32C3
+    mp_printf(print, "Timer(%u, mode=%q, period=%lu)", self->group, mode, period);
+    #else
     mp_printf(print, "Timer(%u, mode=%q, period=%lu)", (self->group << 1) | self->index, mode, period);
+    #endif
 }
 
 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, MP_OBJ_FUN_ARGS_MAX, true);
+    #if CONFIG_IDF_TARGET_ESP32C3
+    mp_uint_t group = mp_obj_get_int(args[0]) & 1;
+    mp_uint_t index = 0;
+    #else
     mp_uint_t group = (mp_obj_get_int(args[0]) >> 1) & 1;
     mp_uint_t index = mp_obj_get_int(args[0]) & 1;
+    #endif
 
     machine_timer_obj_t *self = NULL;
 

From 44527ada5f120f5f131bcd759e86e4e5323555aa Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 3 Nov 2023 21:27:24 +0100
Subject: [PATCH 1237/3129] unix/main: Fix GCC builds for RISC-V 64 bits.

This contains a workaround to silence a possibly incorrect warning when
building the Unix port with GCC targeting RISC-V 64 bits.

Fixes issue #12838.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 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 79d1e88ad13f0..d9ee6eec447b2 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -562,7 +562,12 @@ MP_NOINLINE int main_(int argc, char **argv) {
             // First entry is empty. We've already added an empty entry to sys.path, so skip it.
             ++path;
         }
-        bool path_remaining = *path;
+        // GCC targeting RISC-V 64 reports a warning about `path_remaining` being clobbered by
+        // either setjmp or vfork if that variable it is allocated on the stack.  This may
+        // probably be a compiler error as it occurs on a few recent GCC releases (up to 14.1.0)
+        // but LLVM doesn't report any warnings.
+        static bool path_remaining;
+        path_remaining = *path;
         while (path_remaining) {
             char *path_entry_end = strchr(path, PATHLIST_SEP_CHAR);
             if (path_entry_end == NULL) {

From eced9d86a709f3f267edc7bc08e52115d0c0c9df Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 5 Jul 2024 15:44:45 +1000
Subject: [PATCH 1238/3129] rp2: Fix power consumption when sleeping with a
 timeout.

Fixes a regression introduced in 3af006efb39ad0b7aa7c0401c93329b654bca617
where WFE never blocked in `mp_wfe_or_timeout()` function and would
busy-wait instead.  This increases power consumption measurably.

Root cause is that `mp_wfe_or_timeout()` calls soft timer functions that
(after the regression) call `recursive_mutex_enter()` and
`recursive_mutex_exit()`.  The exit calls
`lock_internal_spin_unlock_with_notify()` and the default pico-sdk
implementation of this macro issues a SEV which negates the WFE that
follows it, meaning the CPU never suspends.

See https://forums.raspberrypi.com/viewtopic.php?p=2233908 for more
details.

The fix in this comment adds a custom "nowait" variant mutex that doesn't
do WFE/SEV, and uses this one for PendSV.  This will use more power when
there's contention for the PendSV mutex as the other core will spin, but
this shouldn't happen very often.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mutex_extra.c | 19 +++++++++++++++++++
 ports/rp2/mutex_extra.h | 24 ++++++++++++++++++++++++
 ports/rp2/pendsv.c      | 22 +++++++++++++---------
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/ports/rp2/mutex_extra.c b/ports/rp2/mutex_extra.c
index 7a70a40acc13d..db84191701e49 100644
--- a/ports/rp2/mutex_extra.c
+++ b/ports/rp2/mutex_extra.c
@@ -33,3 +33,22 @@ void __time_critical_func(recursive_mutex_exit_and_restore_interrupts)(recursive
     }
     lock_internal_spin_unlock_with_notify(&mtx->core, save);
 }
+
+void __time_critical_func(recursive_mutex_nowait_enter_blocking)(recursive_mutex_nowait_t * mtx) {
+    while (!recursive_mutex_try_enter(&mtx->mutex, NULL)) {
+        tight_loop_contents();
+    }
+}
+
+void __time_critical_func(recursive_mutex_nowait_exit)(recursive_mutex_nowait_t * wrapper) {
+    recursive_mutex_t *mtx = &wrapper->mutex;
+    // Rest of this function is a copy of recursive_mutex_exit(), with
+    // lock_internal_spin_unlock_with_notify() removed.
+    uint32_t save = spin_lock_blocking(mtx->core.spin_lock);
+    assert(lock_is_owner_id_valid(mtx->owner));
+    assert(mtx->enter_count);
+    if (!--mtx->enter_count) {
+        mtx->owner = LOCK_INVALID_OWNER_ID;
+    }
+    spin_unlock(mtx->core.spin_lock, save);
+}
diff --git a/ports/rp2/mutex_extra.h b/ports/rp2/mutex_extra.h
index 61b6b40355f8d..5f4a2c3643b46 100644
--- a/ports/rp2/mutex_extra.h
+++ b/ports/rp2/mutex_extra.h
@@ -31,4 +31,28 @@
 uint32_t recursive_mutex_enter_blocking_and_disable_interrupts(recursive_mutex_t *mtx);
 void recursive_mutex_exit_and_restore_interrupts(recursive_mutex_t *mtx, uint32_t save);
 
+// Alternative version of recursive_mutex_t that doesn't issue WFE and SEV
+// instructions. This means it will use more power (busy-waits), but exiting
+// this mutex doesn't disrupt the calling CPU's event state in the same way a
+// recursive mutex does (because recurse_mutex_exit() executes SEV each time the
+// mutex is released.)
+//
+// Implement as a wrapper type because no longer compatible with the normal
+// recursive_mutex functions.
+
+typedef struct {
+    recursive_mutex_t mutex;
+} recursive_mutex_nowait_t;
+
+inline static void recursive_mutex_nowait_init(recursive_mutex_nowait_t *mtx) {
+    recursive_mutex_init(&mtx->mutex);
+}
+
+inline static bool recursive_mutex_nowait_try_enter(recursive_mutex_nowait_t *mtx, uint32_t *owner_out) {
+    return recursive_mutex_try_enter(&mtx->mutex, owner_out);
+}
+
+void recursive_mutex_nowait_enter_blocking(recursive_mutex_nowait_t *mtx);
+void recursive_mutex_nowait_exit(recursive_mutex_nowait_t *mtx);
+
 #endif // MICROPY_INCLUDED_RP2_MUTEX_EXTRA_H
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 68bb65f041c61..6cfe624c3037f 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -25,8 +25,8 @@
  */
 
 #include <assert.h>
-#include "pico/mutex.h"
 #include "py/mpconfig.h"
+#include "mutex_extra.h"
 #include "pendsv.h"
 #include "RP2040.h"
 
@@ -35,21 +35,25 @@
 #endif
 
 static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
-static recursive_mutex_t pendsv_mutex;
+
+// Using the nowait variant here as softtimer updates PendSV from the loop of mp_wfe_or_timeout(),
+// where we don't want the CPU event bit to be set.
+static recursive_mutex_nowait_t pendsv_mutex;
 
 void pendsv_init(void) {
-    recursive_mutex_init(&pendsv_mutex);
+    recursive_mutex_nowait_init(&pendsv_mutex);
 }
 
 void pendsv_suspend(void) {
     // Recursive Mutex here as either core may call pendsv_suspend() and expect
     // both mutual exclusion (other core can't enter pendsv_suspend() at the
     // same time), and that no PendSV handler will run.
-    recursive_mutex_enter_blocking(&pendsv_mutex);
+    recursive_mutex_nowait_enter_blocking(&pendsv_mutex);
 }
 
 void pendsv_resume(void) {
-    recursive_mutex_exit(&pendsv_mutex);
+    recursive_mutex_nowait_exit(&pendsv_mutex);
+
     // 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;
@@ -63,7 +67,7 @@ void pendsv_resume(void) {
 
 void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
     pendsv_dispatch_table[slot] = f;
-    if (pendsv_mutex.enter_count == 0) {
+    if (pendsv_mutex.mutex.enter_count == 0) {
         // There is a race here where other core calls pendsv_suspend() before
         // ISR can execute, but dispatch will happen later when other core
         // calls pendsv_resume().
@@ -78,13 +82,13 @@ void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
 // PendSV interrupt handler to perform background processing.
 void PendSV_Handler(void) {
 
-    if (!recursive_mutex_try_enter(&pendsv_mutex, NULL)) {
+    if (!recursive_mutex_nowait_try_enter(&pendsv_mutex, NULL)) {
         // Failure here means core 1 holds pendsv_mutex. ISR will
         // run again after core 1 calls pendsv_resume().
         return;
     }
     // Core 0 should not already have locked pendsv_mutex
-    assert(pendsv_mutex.enter_count == 1);
+    assert(pendsv_mutex.mutex.enter_count == 1);
 
     #if MICROPY_PY_NETWORK_CYW43
     CYW43_STAT_INC(PENDSV_RUN_COUNT);
@@ -98,5 +102,5 @@ void PendSV_Handler(void) {
         }
     }
 
-    recursive_mutex_exit(&pendsv_mutex);
+    recursive_mutex_nowait_exit(&pendsv_mutex);
 }

From 9db16cfe31c70a75bfd8a8d93401ff7f6010b1ae Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 3 Jul 2024 15:52:31 +1000
Subject: [PATCH 1239/3129] rp2: Fix wakeup from WFE on core1.

If core1 executes `mp_wfe_or_timeout()` then it needs to receive an
interrupt or a SEV to resume execution, but the soft timer interrupt only
fires on core 0.  This fix adds a SEV to the soft timer interrupt handler.

This issue was masked by the issue fixed in the previous commit, as WFE
previously wasn't suspending properly.

Verified via the existing thread_sleep2 test.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mphalport.c    | 7 +++++++
 ports/rp2/mpthreadport.c | 2 +-
 ports/rp2/mpthreadport.h | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 3fe5357c89664..ad51cf8e21f43 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -228,6 +228,13 @@ static void soft_timer_hardware_callback(unsigned int alarm_num) {
     // The timer alarm ISR needs to call here and trigger PendSV dispatch via
     // a second ISR, as PendSV may be currently suspended by the other CPU.
     pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+
+    // This ISR only runs on core0, but if core1 is running Python code then it
+    // may be blocked in WFE so wake it up as well. Unfortunately this also sets
+    // the event flag on core0, so a subsequent WFE on this core will not suspend
+    if (core1_entry != NULL) {
+        __sev();
+    }
 }
 
 void soft_timer_init(void) {
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 5b8e804f95fd8..0d3b343cab067 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -39,7 +39,7 @@ extern uint8_t __StackTop, __StackBottom;
 void *core_state[2];
 
 // This will be non-NULL while Python code is executing.
-static void *(*core1_entry)(void *) = NULL;
+core_entry_func_t core1_entry = NULL;
 
 static void *core1_arg = NULL;
 static uint32_t *core1_stack = NULL;
diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
index 7982de96a8deb..67a0da0e9373a 100644
--- a/ports/rp2/mpthreadport.h
+++ b/ports/rp2/mpthreadport.h
@@ -32,6 +32,10 @@ typedef struct mutex mp_thread_mutex_t;
 
 extern void *core_state[2];
 
+typedef void *(*core_entry_func_t)(void *);
+
+extern core_entry_func_t core1_entry;
+
 void mp_thread_init(void);
 void mp_thread_deinit(void);
 void mp_thread_gc_others(void);

From e1ecc232dc7ef2bd5f60cc5b93c5081c3e3c1fee Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Mon, 8 Jul 2024 11:45:12 +0100
Subject: [PATCH 1240/3129] rp2/rp2_pio: Disable correct IRQ for PIO1.

Fix a typo that was disabling PIO0_IRQ_1 instead of PIO1_IRQ_0.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 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 410269e2d3d31..da62e6bec9e8d 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -149,7 +149,7 @@ void rp2_pio_init(void) {
 
 void rp2_pio_deinit(void) {
     // Disable and clear interrupts.
-    irq_set_mask_enabled((1u << PIO0_IRQ_0) | (1u << PIO0_IRQ_1), false);
+    irq_set_mask_enabled((1u << PIO0_IRQ_0) | (1u << PIO1_IRQ_0), false);
     irq_remove_handler(PIO0_IRQ_0, pio0_irq0);
     irq_remove_handler(PIO1_IRQ_0, pio1_irq0);
 

From 81daba31c5f7541986b4cc1b12d2cf9c41e025e1 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 23 Jul 2024 16:42:42 +1000
Subject: [PATCH 1241/3129] docs: Specify that machine.idle() returns at least
 every 1ms.

A lot of existing code (i.e. micropython-lib lps22h, lcd160cr sensor
drivers, lora sync_modem driver, usb-device-hid) calls machine.idle()
inside a tight loop that is polling some condition. This reduces the power
usage compared to constantly looping, but can be faster than calling a
sleep function. However on a tickless port there's not always an interrupt
before the condition they are polling for, so it's difficult to restructure
this code if machine.idle() doesn't have any upper limit on execution time.

This commit specifies an upper limit of 1ms before machine.idle() resumes
execution. This is already the case for all ports except rp2.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/machine.rst | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 532266d1d9102..7d2eb26a7ea34 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -127,14 +127,20 @@ Power related functions
 
 .. function:: idle()
 
-   Gates the clock to the CPU, useful to reduce power consumption at any time during
-   short or long periods. Peripherals continue working and execution resumes as soon
-   as any interrupt is triggered (on many ports this includes system timer
-   interrupt occurring at regular intervals on the order of millisecond).
+   Gates the clock to the CPU, useful to reduce power consumption at any time
+   during short or long periods. Peripherals continue working and execution
+   resumes as soon as any interrupt is triggered, or at most one millisecond
+   after the CPU was paused.
+
+   It is recommended to call this function inside any tight loop that is
+   continuously checking for an external change (i.e. polling). This will reduce
+   power consumption without significantly impacting performance. To reduce
+   power consumption further then see the :func:`lightsleep`,
+   :func:`time.sleep()` and :func:`time.sleep_ms()` functions.
 
 .. function:: sleep()
 
-   .. note:: This function is deprecated, use `lightsleep()` instead with no arguments.
+   .. note:: This function is deprecated, use :func:`lightsleep()` instead with no arguments.
 
 .. function:: lightsleep([time_ms])
               deepsleep([time_ms])

From ba98533454eef5ab5783039f9929351c8f54d005 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 25 Jun 2024 15:30:02 +1000
Subject: [PATCH 1242/3129] rp2: Stop machine.idle() blocking indefinitely.

Updates rp2 port to always resume from idle within 1ms max.

When rp2 port went tickless the behaviour of machine.idle() changed as
there is no longer a tick interrupt to wake it up every millisecond. On a
quiet system it would now block indefinitely. No other port does this.

See parent commit for justification of why this change is useful.

Also adds a test case that fails without this change.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/modmachine.c                  |  2 +-
 tests/ports/rp2/rp2_machine_idle.py     | 36 +++++++++++++++++++++++++
 tests/ports/rp2/rp2_machine_idle.py.exp |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/ports/rp2/rp2_machine_idle.py
 create mode 100644 tests/ports/rp2/rp2_machine_idle.py.exp

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 2cc79369f6149..229000cc1797c 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -103,7 +103,7 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
 }
 
 static void mp_machine_idle(void) {
-    __wfe();
+    MICROPY_INTERNAL_WFE(1);
 }
 
 static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
diff --git a/tests/ports/rp2/rp2_machine_idle.py b/tests/ports/rp2/rp2_machine_idle.py
new file mode 100644
index 0000000000000..f9c28284782f8
--- /dev/null
+++ b/tests/ports/rp2/rp2_machine_idle.py
@@ -0,0 +1,36 @@
+import machine
+import time
+
+# Verify that machine.idle() resumes execution within 0.1 and 1.1ms (should be
+# 1ms max but allowing for some overhead).
+#
+# (A minimum sleep time for machine.idle() isn't specified but in a system like
+# this with no active interrupts then we should expect some idle time before
+# resuming. If it's consistently resuming immediately then that indicates a bug
+# is preventing proper idle.)
+#
+# This test doesn't contain any rp2-specific code, but rp2 is currently the only
+# tickless port - which is what led to the bug this is a regression test for.
+# Some other ports (unix, esp32) have idle behaviour that resumes immediately on
+# a quiet system, so this test is also less useful for those.
+#
+# Verification uses the average idle time, as individual iterations will always
+# have outliers due to interrupts, scheduler, etc.
+
+ITERATIONS = 500
+total = 0
+
+for _ in range(ITERATIONS):
+    before = time.ticks_us()
+    machine.idle()
+    total += time.ticks_diff(time.ticks_us(), before)
+
+total /= 1000  # us to ms
+average = total / ITERATIONS
+
+# print(f"Total {total}ms average {average}ms")  # uncomment for debug
+
+if 0.1 < average < 1.1:
+    print("PASS")
+else:
+    print(f"Total {total}ms average {average}ms, out of spec")
diff --git a/tests/ports/rp2/rp2_machine_idle.py.exp b/tests/ports/rp2/rp2_machine_idle.py.exp
new file mode 100644
index 0000000000000..7ef22e9a431ad
--- /dev/null
+++ b/tests/ports/rp2/rp2_machine_idle.py.exp
@@ -0,0 +1 @@
+PASS

From 7fe8f030eea0015962e729eae1f1c309dc83a469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 25 Aug 2022 17:26:37 +0000
Subject: [PATCH 1243/3129] rp2/lwip_inc: Enable IPv6 per default on rp2 port.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Having IPv6 support is important, especially for IoT-Devices which might be
many, requiring individual IP-addresses. In particular direct access via
link-local addresses and having deterministic SLAAC-addresses can be quite
convenient. Also in IPv6-only networks or for connecting to IPv6-only
services, this is very useful.

For the Pico W, there is enough flash and RAM that enabling IPv6 by default
is the right choice.

Should IPv6 support in a network exist (i.e. there are Router
Advertisements), but not provide connectivity, connecting by domain name
should not be a problem as DNS will default to return the IPv4-address (if
that exists), unless reconfigured at runtime to prefer IPv6.

In any case a user can disable obtaining SLAAC-addresses with:

    <nic>.ipconfig(autoconf6=False)

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 ports/rp2/lwip_inc/lwipopts.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/lwip_inc/lwipopts.h b/ports/rp2/lwip_inc/lwipopts.h
index 691b228db5c93..5f37ecdac2e9d 100644
--- a/ports/rp2/lwip_inc/lwipopts.h
+++ b/ports/rp2/lwip_inc/lwipopts.h
@@ -26,7 +26,10 @@
 #define LWIP_NETIF_EXT_STATUS_CALLBACK  1
 #define LWIP_NETIF_STATUS_CALLBACK      1
 
-#define LWIP_IPV6                       0
+#define LWIP_IPV4                       1
+#define LWIP_IPV6                       1
+#define LWIP_ND6_NUM_DESTINATIONS       4
+#define LWIP_ND6_QUEUEING               0
 #define LWIP_DHCP                       1
 #define LWIP_DHCP_CHECK_LINK_UP         1
 #define DHCP_DOES_ARP_CHECK             0 // to speed DHCP up

From 19b1333cb1376ef60376a07e8e76a41854014840 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Mon, 5 Dec 2022 16:51:20 +0100
Subject: [PATCH 1244/3129] examples/usercmodule/cexample: Add more advanced
 native class.

This adds a separate `AdvancedTimer` class that demonstrates a few more
advanced concepts usch as custom handlers for printing and attributes.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 examples/usercmodule/cexample/examplemodule.c | 82 +++++++++++++++++++
 tests/misc/cexample_class.py                  | 17 ++++
 tests/misc/cexample_class.py.exp              |  6 ++
 tests/misc/cexample_module.py                 |  1 +
 4 files changed, 106 insertions(+)

diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
index 2988fbd565f08..d13515e72cdd5 100644
--- a/examples/usercmodule/cexample/examplemodule.c
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -68,6 +68,87 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &example_Timer_locals_dict
     );
 
+// What follows is a *separate* class definition that demonstrates more
+// advanced techniques to implement other Python-like features, such as:
+//
+// - A custom representation for __repr__ and __str__.
+// - Custom attribute handling to create a read/write "property".
+//
+// It re-uses some of the elements of the basic Timer class. This is allowed
+// because they both use example_Timer_obj_t as the instance structure.
+
+// Handles AdvancedTimer.__repr__, AdvancedTimer.__str__.
+static void example_AdvancedTimer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+
+    // Get the elapsed time. In this case, it's also a demonstration of calling
+    // the equivalent of self.time() in the C API. This is not usually very
+    // efficient, but it can sometimes be useful.
+    mp_uint_t elapsed = mp_obj_get_int(example_Timer_time(self_in));
+
+    // We'll make all representations print at least the class name.
+    mp_printf(print, "%q()", MP_QSTR_AdvancedTimer);
+
+    // Decide what else to print based on print kind.
+    if (kind == PRINT_STR) {
+        // For __str__, let's attempt to make it more readable.
+        mp_printf(print, "  # created %d seconds ago", elapsed / 1000);
+    }
+}
+
+// Handles AdvancedTimer.seconds for reading and writing.
+static void example_AdvancedTimer_attribute_handler(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+
+    // In this example, we only want to handle the .seconds attribute in a
+    // special way.
+    if (attr != MP_QSTR_seconds) {
+        // Attribute not found, continue lookup in locals dict. This way,
+        // methods like .time() will be handled normally.
+        dest[1] = MP_OBJ_SENTINEL;
+        return;
+    }
+
+    // Get reference to AdvancedTimer instance.
+    example_Timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Check if this is a read operation.
+    if (dest[0] == MP_OBJ_NULL) {
+        // It's read, so "return" elapsed seconds by storing it in dest[0].
+        mp_uint_t elapsed = mp_hal_ticks_ms() - self->start_time;
+        dest[0] = mp_obj_new_int_from_uint(elapsed / 1000);
+        return;
+    }
+    // Check if this is a delete or store operation.
+    else if (dest[0] == MP_OBJ_SENTINEL) {
+        // It's delete or store. Now check which one.
+        if (dest[1] == MP_OBJ_NULL) {
+            // It's delete. But in this example we don't want to allow it
+            // so we just return.
+            return;
+        } else {
+            // It's write. First, get the value that the user is trying to set.
+            mp_uint_t desired_ms = mp_obj_get_int(dest[1]) * 1000;
+            // Use it to update the start time. This way, the next read will
+            // report the updated time.
+            self->start_time = mp_hal_ticks_ms() - desired_ms;
+
+            // Indicate successful store.
+            dest[0] = MP_OBJ_NULL;
+            return;
+        }
+    }
+}
+
+// This defines the type(AdvancedTimer) object.
+MP_DEFINE_CONST_OBJ_TYPE(
+    example_type_AdvancedTimer,
+    MP_QSTR_AdvancedTimer,
+    MP_TYPE_FLAG_NONE,
+    attr, example_AdvancedTimer_attribute_handler,
+    print, example_AdvancedTimer_print,
+    make_new, example_Timer_make_new,
+    locals_dict, &example_Timer_locals_dict
+    );
+
 // Define all attributes of the module.
 // Table entries are key/value pairs of the attribute name (a string)
 // and the MicroPython object reference.
@@ -77,6 +158,7 @@ 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) },
+    { MP_ROM_QSTR(MP_QSTR_AdvancedTimer),    MP_ROM_PTR(&example_type_AdvancedTimer) },
 };
 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
index 6b8718ad8cc5f..06d741922d289 100644
--- a/tests/misc/cexample_class.py
+++ b/tests/misc/cexample_class.py
@@ -22,3 +22,20 @@
 print(timer)
 print(0 <= t_start <= TOLERANCE_MS)
 print(SLEEP_MS - TOLERANCE_MS <= t_end <= SLEEP_MS + TOLERANCE_MS)
+
+advanced_timer = cexample.AdvancedTimer()
+
+time.sleep_ms(100)
+
+print(repr(advanced_timer))
+print(str(advanced_timer))
+
+print(advanced_timer.seconds)
+advanced_timer.seconds = 123
+print(advanced_timer.seconds)
+print(advanced_timer.time() < 123000 + TOLERANCE_MS)
+
+try:
+    advanced_timer.seconds = "bad input"
+except TypeError:
+    print("TypeError")
diff --git a/tests/misc/cexample_class.py.exp b/tests/misc/cexample_class.py.exp
index b9a06602a316a..a86d4d14f78df 100644
--- a/tests/misc/cexample_class.py.exp
+++ b/tests/misc/cexample_class.py.exp
@@ -1,3 +1,9 @@
 <Timer>
 True
 True
+AdvancedTimer()
+AdvancedTimer()  # created 0 seconds ago
+0
+123
+True
+TypeError
diff --git a/tests/misc/cexample_module.py b/tests/misc/cexample_module.py
index c1da2ecf7ab24..979c1fa24b376 100644
--- a/tests/misc/cexample_module.py
+++ b/tests/misc/cexample_module.py
@@ -12,5 +12,6 @@
 d = dir(cexample)
 d.index("add_ints")
 d.index("Timer")
+d.index("AdvancedTimer")
 
 print(cexample.add_ints(1, 3))

From 9ca668f881865958cbcc0e6341849a6133c4c7b4 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Mon, 21 Nov 2022 21:35:26 +0100
Subject: [PATCH 1245/3129] py/objtype: Avoid crash on calling members of
 uninitialized native type.

When subclassing a native type, calling native members in `__init__` before
`super().__init__()` has been called could cause a crash.  In this
situation, `self` in `mp_convert_member_lookup` is the
`native_base_init_wrapper_obj`.  The check added in this commit ensures
that an `AttributeError` is raised before this happens, which is consistent
with other failed lookups.

Also fix a typo in a related comment.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 py/objtype.c                        |  8 ++++++-
 tests/misc/cexample_subclass.py     | 37 +++++++++++++++++++++++++++++
 tests/misc/cexample_subclass.py.exp |  5 ++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 tests/misc/cexample_subclass.py
 create mode 100644 tests/misc/cexample_subclass.py.exp

diff --git a/py/objtype.c b/py/objtype.c
index b6d600e9434d7..f7a65a6ca5442 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -82,7 +82,7 @@ static int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_t
     }
 }
 
-// This wrapper function is allows a subclass of a native type to call the
+// This wrapper function allows a subclass of a native type to call the
 // __init__() method (corresponding to type->make_new) of the native type.
 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]);
@@ -170,6 +170,12 @@ static void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_t
                     if (obj != NULL && mp_obj_is_native_type(type) && type != &mp_type_object /* object is not a real type */) {
                         // If we're dealing with native base class, then it applies to native sub-object
                         obj_obj = obj->subobj[0];
+                        #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
+                        if (obj_obj == MP_OBJ_FROM_PTR(&native_base_init_wrapper_obj)) {
+                            // But we shouldn't attempt lookups on object that is not yet instantiated.
+                            mp_raise_msg(&mp_type_AttributeError, MP_ERROR_TEXT("call super().__init__() first"));
+                        }
+                        #endif // MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
                     } else {
                         obj_obj = MP_OBJ_FROM_PTR(obj);
                     }
diff --git a/tests/misc/cexample_subclass.py b/tests/misc/cexample_subclass.py
new file mode 100644
index 0000000000000..9f52a2c737add
--- /dev/null
+++ b/tests/misc/cexample_subclass.py
@@ -0,0 +1,37 @@
+# test subclassing custom native class
+
+try:
+    from cexample import AdvancedTimer
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+class SubTimer(AdvancedTimer):
+    def __init__(self):
+        # At this point, self does not yet represent a AdvancedTimer instance.
+        print(self)
+
+        # So lookups via type.attr handler will fail.
+        try:
+            self.seconds
+        except AttributeError:
+            print("AttributeError")
+
+        # Also applies to builtin methods.
+        try:
+            self.time()
+        except AttributeError:
+            print("AttributeError")
+
+        # Initialize base class.
+        super().__init__(self)
+
+        # Now you can access methods and attributes normally.
+        self.time()
+        print(self.seconds)
+        self.seconds = 123
+        print(self.seconds)
+
+
+watch = SubTimer()
diff --git a/tests/misc/cexample_subclass.py.exp b/tests/misc/cexample_subclass.py.exp
new file mode 100644
index 0000000000000..a035649e475db
--- /dev/null
+++ b/tests/misc/cexample_subclass.py.exp
@@ -0,0 +1,5 @@
+<function>
+AttributeError
+AttributeError
+0
+123

From d1bf0eeb0fb0c485da076075a15ffdfd5fb68303 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 17 Nov 2022 14:15:46 -0600
Subject: [PATCH 1246/3129] tests/cpydiff: Add diff for overriding __init__.

This adds a CPython diff that explains why calling `super().__init__()` is
required in MicroPython when subclassing a native type (because `__new__`
and `__init__` are not separate functions).

Signed-off-by: David Lechner <david@pybricks.com>
---
 tests/cpydiff/core_class_super_init.py | 31 ++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 tests/cpydiff/core_class_super_init.py

diff --git a/tests/cpydiff/core_class_super_init.py b/tests/cpydiff/core_class_super_init.py
new file mode 100644
index 0000000000000..1774f61dd82e4
--- /dev/null
+++ b/tests/cpydiff/core_class_super_init.py
@@ -0,0 +1,31 @@
+"""
+categories: Core,Classes
+description: When inheriting native types, calling a method in ``__init__(self, ...)`` before ``super().__init__()`` raises an ``AttributeError`` (or segfaults if ``MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG`` is not enabled).
+cause: MicroPython does not have separate ``__new__`` and ``__init__`` methods in native types.
+workaround: Call ``super().__init__()`` first.
+"""
+
+
+class L1(list):
+    def __init__(self, a):
+        self.append(a)
+
+
+try:
+    L1(1)
+    print("OK")
+except AttributeError:
+    print("AttributeError")
+
+
+class L2(list):
+    def __init__(self, a):
+        super().__init__()
+        self.append(a)
+
+
+try:
+    L2(1)
+    print("OK")
+except AttributeError:
+    print("AttributeError")

From 093d0c0a17751c11c24f82594bb8208ca1ea9744 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 8 Nov 2023 16:42:56 +0100
Subject: [PATCH 1247/3129] py/objtype: Validate super() arguments.

This fixes various null dereferencing and out-of-bounds access because
super_attr assumes the held obj is effectively an object of the held type,
which is now verified.

Fixes issue #12830.

Signed-off-by: stijn <stijn@ignitron.net>
---
 py/objtype.c                  |  9 ++++++++-
 tests/basics/builtin_super.py | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/basics/builtin_super.py

diff --git a/py/objtype.c b/py/objtype.c
index f7a65a6ca5442..16ff5310dac6f 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -44,6 +44,7 @@
 #define ENABLE_SPECIAL_ACCESSORS \
     (MICROPY_PY_DESCRIPTORS || MICROPY_PY_DELATTR_SETATTR || MICROPY_PY_BUILTINS_PROPERTY)
 
+static mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo);
 static mp_obj_t static_class_method_make_new(const mp_obj_type_t *self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 /******************************************************************************/
@@ -1260,9 +1261,15 @@ static mp_obj_t super_make_new(const mp_obj_type_t *type_in, size_t n_args, size
     // 0 arguments are turned into 2 in the compiler
     // 1 argument is not yet implemented
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
-    if (!mp_obj_is_type(args[0], &mp_type_type)) {
+
+    // Per CPython: "If the second argument is an object, isinstance(obj, type) must be true.
+    // If the second argument is a type, issubclass(type2, type) must be true (this is useful for classmethods)."
+    const mp_obj_type_t *second_arg_type = mp_obj_get_type(args[1]);
+    mp_obj_t second_arg_obj = second_arg_type == &mp_type_type ? args[1] : MP_OBJ_FROM_PTR(second_arg_type);
+    if (mp_obj_is_subclass(second_arg_obj, args[0]) == mp_const_false) {
         mp_raise_TypeError(NULL);
     }
+
     mp_obj_super_t *o = m_new_obj(mp_obj_super_t);
     *o = (mp_obj_super_t) {{type_in}, args[0], args[1]};
     return MP_OBJ_FROM_PTR(o);
diff --git a/tests/basics/builtin_super.py b/tests/basics/builtin_super.py
new file mode 100644
index 0000000000000..5f7c3ae017e7e
--- /dev/null
+++ b/tests/basics/builtin_super.py
@@ -0,0 +1,15 @@
+# Check that super rejects invalid arguments.
+try:
+    super(str, 0)
+except TypeError:
+    print("TypeError")
+
+try:
+    super(str, int)
+except TypeError:
+    print("TypeError")
+
+try:
+    super(0, int)
+except TypeError:
+    print("TypeError")

From 07bf3179f6d51a0e80fc48f06490f4e4d0d8488d Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 22 Jul 2024 13:41:02 +0200
Subject: [PATCH 1248/3129] py/misc: Fix msvc and C++ compatibility.

Use explicit casts to suppress warnings about implicit conversions, add a
workaround for constant expression conditional, and make functions static
inline (as is done in the rest of the codebase) to suppress 'warning C4505:
unreferenced function with internal linkage has been removed'.

(Follow up to fix commit 908ab1ceca15ee6fd0ef82ca4cba770a3ec41894)

Signed-off-by: stijn <stijn@ignitron.net>
---
 py/misc.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/py/misc.h b/py/misc.h
index cf1810d4e784b..96b13c151a6b9 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -338,38 +338,44 @@ typedef const char *mp_rom_error_text_t;
 #ifdef _MSC_VER
 #include <intrin.h>
 
-static uint32_t mp_clz(uint32_t x) {
+static inline 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_clzl(unsigned long x) {
+static inline uint32_t mp_clzl(unsigned long x) {
     unsigned long lz = 0;
     return _BitScanReverse(&lz, x) ? (sizeof(x) * 8 - 1) - lz : 0;
 }
 
 #ifdef _WIN64
-static uint32_t mp_clzll(unsigned long long x) {
+static inline uint32_t mp_clzll(unsigned long long x) {
     unsigned long lz = 0;
     return _BitScanReverse64(&lz, x) ? (sizeof(x) * 8 - 1) - lz : 0;
 }
 #else
 // Microsoft don't ship _BitScanReverse64 on Win32, so emulate it
-static uint32_t mp_clzll(unsigned long long x) {
+static inline uint32_t mp_clzll(unsigned long long x) {
     unsigned long h = x >> 32;
     return h ? mp_clzl(h) : (mp_clzl(x) + 32);
 }
 #endif
 
-static uint32_t mp_ctz(uint32_t x) {
+static inline uint32_t mp_ctz(uint32_t x) {
     unsigned long tz = 0;
     return _BitScanForward(&tz, x) ? tz : 0;
 }
+
+// Workaround for 'warning C4127: conditional expression is constant'.
+static inline bool mp_check(bool value) {
+    return value;
+}
 #else
 #define mp_clz(x) __builtin_clz(x)
 #define mp_clzl(x) __builtin_clzl(x)
 #define mp_clzll(x) __builtin_clzll(x)
 #define mp_ctz(x) __builtin_ctz(x)
+#define mp_check(x) (x)
 #endif
 
 // mp_int_t can be larger than long, i.e. Windows 64-bit, nan-box variants
@@ -378,10 +384,10 @@ static inline uint32_t mp_clz_mpi(mp_int_t x) {
         || sizeof(mp_int_t) == sizeof(long));
 
     // ugly, but should compile to single intrinsic unless O0 is set
-    if (sizeof(mp_int_t) == sizeof(long)) {
-        return mp_clzl(x);
+    if (mp_check(sizeof(mp_int_t) == sizeof(long))) {
+        return mp_clzl((unsigned long)x);
     } else {
-        return mp_clzll(x);
+        return mp_clzll((unsigned long long)x);
     }
 }
 

From 233f5ce661d31c8e606ff727ac0c6de27d32a715 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 Jul 2024 17:17:39 +1000
Subject: [PATCH 1249/3129] py/runtime: Fix self arg passed to classmethod when
 accessed via super.

Thanks to @AJMansfield for the original test case.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c                         |  4 ++++
 tests/basics/subclass_classmethod.py | 31 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/py/runtime.c b/py/runtime.c
index 1836f5d92a851..fd0a8e690135a 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1153,6 +1153,10 @@ void mp_convert_member_lookup(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t
             // 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);
+                if (type == &mp_type_type) {
+                    // `self` is already a type, so use `self` directly.
+                    type = MP_OBJ_TO_PTR(self);
+                }
             }
             dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
             dest[1] = MP_OBJ_FROM_PTR(type);
diff --git a/tests/basics/subclass_classmethod.py b/tests/basics/subclass_classmethod.py
index 00a2ebd7cd3bb..3089726aa9bf5 100644
--- a/tests/basics/subclass_classmethod.py
+++ b/tests/basics/subclass_classmethod.py
@@ -35,3 +35,34 @@ class B(A):
 B.bar() # class calling classmethod
 B().bar() # instance calling classmethod
 B().baz() # instance calling normal method
+
+# super inside a classmethod
+# ensure the argument of the super method that is called is the child type
+
+
+class C:
+    @classmethod
+    def f(cls):
+        print("C.f", cls.__name__)  # cls should be D
+
+    @classmethod
+    def g(cls):
+        print("C.g", cls.__name__)  # cls should be D
+
+
+class D(C):
+    @classmethod
+    def f(cls):
+        print("D.f", cls.__name__)
+        super().f()
+
+    @classmethod
+    def g(cls):
+        print("D.g", cls.__name__)
+        super(D, cls).g()
+
+
+D.f()
+D.g()
+D().f()
+D().g()

From a0c7bf12d21bd51e8af4acab466a6c124c480fa7 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 26 Mar 2024 16:09:15 +0100
Subject: [PATCH 1250/3129] github/workflows: Improve MSYS2-based CI builds.

Install the mingw variant of Python since it behaves more like a 'real'
Windows CPython than the msys2 variant: os.name == 'nt', not 'posix'.  Note
that os.sep is still '/' though so we don't actually need to skip the
import_file test.  This way one single Python version can be used both for
running run-tests.py and getting the expected test output.

Signed-off-by: stijn <stijn@ignitron.net>
---
 .github/workflows/ports_windows.yml | 15 ++-------------
 ports/windows/Makefile              |  3 +++
 ports/windows/README.md             |  2 +-
 tests/run-tests.py                  |  9 ++++-----
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index be2a2a8dac332..7647749f7710b 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -108,16 +108,6 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - name: Get Python path
-      id: python_path
-      shell: python
-      run: |
-        import os
-        import sys
-        output = f"python={os.fspath(sys.executable)}"
-        print(output)
-        with open(os.environ["GITHUB_OUTPUT"], "w") as f:
-            f.write(output)
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.sys }}
@@ -126,7 +116,7 @@ jobs:
           make
           mingw-w64-${{ matrix.env }}-gcc
           pkg-config
-          python3
+          mingw-w64-${{ matrix.env }}-python3
           git
           diffutils
     - uses: actions/checkout@v4
@@ -138,8 +128,7 @@ jobs:
       run: make -C ports/windows -j2 VARIANT=${{ matrix.variant }}
     - name: Run tests
       id: test
-      # msys python breaks tests so we need to use "real" windows python
-      run: MICROPY_CPYTHON3=$(cygpath "${{ steps.python_path.outputs.python }}") make -C ports/windows test_full VARIANT=${{ matrix.variant }}
+      run: make -C ports/windows test_full VARIANT=${{ matrix.variant }}
     - name: Print failures
       if: failure() && steps.test.conclusion == 'failure'
       working-directory: tests
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index bb635167da349..cf0a927014b1a 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -101,6 +101,9 @@ include $(TOP)/py/mkrules.mk
 
 .PHONY: test test_full
 
+# Note for recent gcc versions like 13.2:
+# - mingw64-x86_64 gcc builds will pass the math_domain_special test
+# - mingw64-ucrt64 gcc builds will pass all of the below tests
 RUN_TESTS_SKIP += -e math_fun -e float2int_double -e float_parse -e math_domain_special
 
 test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
diff --git a/ports/windows/README.md b/ports/windows/README.md
index 2b3ed44599918..57ec0e19149be 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -45,7 +45,7 @@ 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
+    pacman -S make mingw-w64-x86_64-gcc pkg-config mingw-w64-x86_64-python3
 
 Start the mingw64.exe shell and build:
 
diff --git a/tests/run-tests.py b/tests/run-tests.py
index e80d5b4633e31..a91b3e9e95ab0 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -3,6 +3,7 @@
 import os
 import subprocess
 import sys
+import sysconfig
 import platform
 import argparse
 import inspect
@@ -583,10 +584,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             # fails with stack overflow on Debug builds
             skip_tests.add("misc/sys_settrace_features.py")
 
-            if os.getenv("MSYSTEM") is not None:
-                # fails due to wrong path separator
-                skip_tests.add("import/import_file.py")
-
     if upy_float_precision == 0:
         skip_tests.add("extmod/uctypes_le_float.py")
         skip_tests.add("extmod/uctypes_native_float.py")
@@ -711,7 +708,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
 
     # 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 not sysconfig.get_platform().startswith("mingw"):
+            # Works but CPython uses '\' path separator
+            skip_tests.add("import/import_file.py")
 
     # Some tests are known to fail with native emitter
     # Remove them from the below when they work

From 1f907a2f5cc912744442a1cdc3b08a19abccc71b Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 26 Mar 2024 16:11:11 +0100
Subject: [PATCH 1251/3129] tests/run-tests.py: Make Windows test skipping more
 granular.

Signed-off-by: stijn <stijn@ignitron.net>
---
 .github/workflows/ports_windows.yml | 2 ++
 tests/run-tests.py                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 7647749f7710b..91a3192a10a48 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -42,6 +42,8 @@ jobs:
           configuration: Debug
         - visualstudio: '2019'
           configuration: Debug
+    env:
+      CI_BUILD_CONFIGURATION: ${{ matrix.configuration }}
     runs-on: ${{ matrix.runner }}
     steps:
     - name: Install Visual Studio 2017
diff --git a/tests/run-tests.py b/tests/run-tests.py
index a91b3e9e95ab0..e7ba0de565cfe 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -580,7 +580,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if os.getenv("GITHUB_ACTIONS") == "true":
         skip_tests.add("thread/stress_schedule.py")  # has reliability issues
 
-        if os.getenv("RUNNER_OS") == "Windows":
+        if os.getenv("RUNNER_OS") == "Windows" and os.getenv("CI_BUILD_CONFIGURATION") == "Debug":
             # fails with stack overflow on Debug builds
             skip_tests.add("misc/sys_settrace_features.py")
 

From 17f254df3589ce4a127ad4575ed2c031d5ab81b3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 24 Jul 2024 02:29:52 +0200
Subject: [PATCH 1252/3129] github/workflows: Add RISC-V 64 bits Unix port to
 CI.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .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 c83f67db875b3..1707fdc9fb37d 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -235,3 +235,17 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  qemu_riscv64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_qemu_riscv64_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_qemu_riscv64_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_qemu_riscv64_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 53fcc8b5a3857..b0a1022c3b195 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -427,6 +427,11 @@ CI_UNIX_OPTS_QEMU_ARM=(
     MICROPY_STANDALONE=1
 )
 
+CI_UNIX_OPTS_QEMU_RISCV64=(
+    CROSS_COMPILE=riscv64-linux-gnu-
+    VARIANT=coverage
+)
+
 function ci_unix_build_helper {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix "$@" submodules
@@ -692,6 +697,28 @@ function ci_unix_qemu_arm_run_tests {
     (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.*\.py')
 }
 
+function ci_unix_qemu_riscv64_setup {
+    . /etc/os-release
+    for repository in "${VERSION_CODENAME}" "${VERSION_CODENAME}-updates" "${VERSION_CODENAME}-security"
+    do
+        sudo add-apt-repository -y -n "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports ${repository} main"
+    done
+    sudo apt-get update
+    sudo dpkg --add-architecture riscv64
+    sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu libffi-dev:riscv64
+    sudo apt-get install qemu-user
+    qemu-riscv64 --version
+}
+
+function ci_unix_qemu_riscv64_build {
+    ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_RISCV64[@]}"
+}
+
+function ci_unix_qemu_riscv64_run_tests {
+    file ./ports/unix/build-coverage/micropython
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py)
+}
+
 ########################################################################################
 # ports/windows
 

From e1fe62f4fca9506980bb19bbc973bf21740625e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Jul 2024 16:51:07 +1000
Subject: [PATCH 1253/3129] tests/multi_net: Fix skipping of SSLContext tests
 when .der don't exist.

The `sslcontext_server_client_ciphers.py` test was using stat to test for
the .der files after it already tried to open them for reading.  That is
now fixed.  And `sslcontext_server_client.py` is adjusted to use the same
pattern for skipping the test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/sslcontext_server_client.py         | 12 ++++--------
 tests/multi_net/sslcontext_server_client_ciphers.py | 10 ++++------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py
index 473c9c376e38a..6516de53f7dfb 100644
--- a/tests/multi_net/sslcontext_server_client.py
+++ b/tests/multi_net/sslcontext_server_client.py
@@ -15,18 +15,14 @@
 keyfile = "ec_key.der"
 
 try:
-    os.stat(certfile)
-    os.stat(keyfile)
+    with open(certfile, "rb") as cf:
+        cert = cadata = cf.read()
+    with open(keyfile, "rb") as kf:
+        key = kf.read()
 except OSError:
     print("SKIP")
     raise SystemExit
 
-with open(certfile, "rb") as cf:
-    cert = cadata = cf.read()
-
-with open(keyfile, "rb") as kf:
-    key = kf.read()
-
 
 # Server
 def instance0():
diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py
index c168b444a992b..3334d9d9e4c17 100644
--- a/tests/multi_net/sslcontext_server_client_ciphers.py
+++ b/tests/multi_net/sslcontext_server_client_ciphers.py
@@ -13,14 +13,12 @@
 # These are test certificates. See tests/README.md for details.
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
-with open(cafile, "rb") as f:
-    cadata = f.read()
-with open(key, "rb") as f:
-    keydata = f.read()
 
 try:
-    os.stat(cafile)
-    os.stat(key)
+    with open(cafile, "rb") as f:
+        cadata = f.read()
+    with open(key, "rb") as f:
+        keydata = f.read()
 except OSError:
     print("SKIP")
     raise SystemExit

From 19075695da82e30850e8f595c58521d2b3787b4a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 28 May 2024 19:38:36 +1000
Subject: [PATCH 1254/3129] nrf: Consolidate all stdio functions.

Consolidate CDC, UART and NUS stdio interfaces into the one handler.
Allows any/all of them to be enabled separately.

Updates UART REPL to use similar define to other platforms:
`MICROPY_HW_ENABLE_UART_REPL`.

USB now uses the shared/tinyusb CDC implementation.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/nrf/Makefile                            |  25 ++--
 ports/nrf/bluetooth_conf.h                    |  13 +-
 .../ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h |   1 +
 ports/nrf/boards/PCA10056/mpconfigboard.h     |   4 +
 ports/nrf/boards/PCA10059/mpconfigboard.mk    |   4 +-
 .../boards/SEEED_XIAO_NRF52/mpconfigboard.h   |   1 +
 ports/nrf/drivers/bluetooth/ble_drv.c         |   4 +-
 ports/nrf/drivers/bluetooth/ble_uart.c        |  29 ++--
 ports/nrf/drivers/bluetooth/ble_uart.h        |   4 +
 ports/nrf/drivers/usb/tusb_config.h           |  14 +-
 ports/nrf/drivers/usb/usb_cdc.c               | 136 ++----------------
 ports/nrf/drivers/usb/usb_descriptors.c       | 117 ---------------
 ports/nrf/main.c                              |  10 +-
 ports/nrf/mpconfigport.h                      |  39 +++--
 ports/nrf/mphalport.c                         |  86 +++++++----
 ports/nrf/mphalport.h                         |   4 +
 16 files changed, 155 insertions(+), 336 deletions(-)
 delete mode 100644 ports/nrf/drivers/usb/usb_descriptors.c

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 1691719dbb1b1..d955d183a1b4c 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -80,15 +80,16 @@ 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
+INC += -I./drivers/bluetooth
+INC += -I./drivers/usb
 INC += -I../../lib/nrfx/
 INC += -I../../lib/nrfx/drivers
 INC += -I../../lib/nrfx/drivers/include
 INC += -I../../lib/nrfx/mdk
 INC += -I../../lib/nrfx/hal
 INC += -I../../lib/nrfx/drivers/src/
+INC += -I../../shared/readline
 
 MCU_VARIANT_UPPER = $(shell echo $(MCU_VARIANT) | tr '[:lower:]' '[:upper:]')
 MCU_SUB_VARIANT_UPPER = $(shell echo $(MCU_SUB_VARIANT) | tr '[:lower:]' '[:upper:]')
@@ -183,9 +184,12 @@ SRC_SHARED_C += $(addprefix shared/,\
 	libc/string0.c \
 	readline/readline.c \
 	runtime/pyexec.c \
+	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	runtime/interrupt_char.c \
+	tinyusb/mp_usbd.c \
 	tinyusb/mp_usbd_cdc.c \
+	tinyusb/mp_usbd_descriptor.c \
 	timeutils/timeutils.c \
 	)
 
@@ -200,13 +204,13 @@ endif
 SRC_NRFX += $(addprefix lib/nrfx/drivers/src/,\
 	prs/nrfx_prs.c \
 	nrfx_uart.c \
-        nrfx_uarte.c \
+	nrfx_uarte.c \
 	nrfx_adc.c \
 	nrfx_saadc.c \
 	nrfx_temp.c \
 	nrfx_rng.c \
 	nrfx_twi.c \
-        nrfx_twim.c \
+	nrfx_twim.c \
 	nrfx_spi.c \
 	nrfx_spim.c \
 	nrfx_rtc.c \
@@ -234,21 +238,17 @@ SRC_C += \
 	$(wildcard $(BOARD_DIR)/*.c) \
 
 ifeq ($(MCU_SUB_VARIANT), nrf52840)
+# Add support for USB using TinyUSB.
 
-INC += -I./drivers/usb
 INC += -I../../lib/tinyusb/src
 
-
 # If SoftDevice is selected.
 ifneq ($(SD), )
 # For external tinyusb drivers to enable SoftDevice mode.
 CFLAGS += -DSOFTDEVICE_PRESENT
 endif
 
-SRC_C += $(addprefix drivers/usb/,\
-	usb_cdc.c \
-	usb_descriptors.c \
-	)
+SRC_C += drivers/usb/usb_cdc.c
 
 SRC_C += $(addprefix lib/tinyusb/src/,\
 	common/tusb_fifo.c \
@@ -259,6 +259,7 @@ SRC_C += $(addprefix lib/tinyusb/src/,\
 	portable/nordic/nrf5x/dcd_nrf5x.c \
 	)
 
+LDFLAGS += -Wl,--wrap=dcd_event_handler
 endif
 
 DRIVERS_SRC_C += $(addprefix modules/,\
@@ -331,9 +332,9 @@ hex: $(BUILD)/$(OUTPUT_FILENAME).hex
 $(BUILD)/$(OUTPUT_FILENAME).hex: $(BUILD)/$(OUTPUT_FILENAME).elf
 	$(OBJCOPY) -O ihex $< $@
 
-FLASHER ?=
+FLASHER ?= jlink
 
-ifeq ($(FLASHER),)
+ifeq ($(FLASHER), jlink)
 
 ifeq ($(MCU_VARIANT), nrf91)
 
diff --git a/ports/nrf/bluetooth_conf.h b/ports/nrf/bluetooth_conf.h
index 58d47e2188686..a7deebdfdce5a 100644
--- a/ports/nrf/bluetooth_conf.h
+++ b/ports/nrf/bluetooth_conf.h
@@ -3,10 +3,15 @@
 
 // SD specific configurations.
 
+#ifndef MICROPY_PY_BLE_NUS
+// Nordic UART Service
+// If enabled, REPL will be available on this interface.
+#define MICROPY_PY_BLE_NUS              (0)
+#endif
+
 #if (BLUETOOTH_SD == 110)
 
 #define MICROPY_PY_BLE                  (1)
-#define MICROPY_PY_BLE_NUS              (0)
 #define BLUETOOTH_WEBBLUETOOTH_REPL     (0)
 #define MICROPY_PY_UBLUEPY              (1)
 #define MICROPY_PY_UBLUEPY_PERIPHERAL   (1)
@@ -14,7 +19,6 @@
 #elif (BLUETOOTH_SD == 132)
 
 #define MICROPY_PY_BLE                  (1)
-#define MICROPY_PY_BLE_NUS              (0)
 #define BLUETOOTH_WEBBLUETOOTH_REPL     (0)
 #define MICROPY_PY_UBLUEPY              (1)
 #define MICROPY_PY_UBLUEPY_PERIPHERAL   (1)
@@ -23,7 +27,6 @@
 #elif (BLUETOOTH_SD == 140)
 
 #define MICROPY_PY_BLE                  (1)
-#define MICROPY_PY_BLE_NUS              (0)
 #define BLUETOOTH_WEBBLUETOOTH_REPL     (0)
 #define MICROPY_PY_UBLUEPY              (1)
 #define MICROPY_PY_UBLUEPY_PERIPHERAL   (1)
@@ -39,8 +42,4 @@
 #define MICROPY_PY_BLE                  (0)
 #endif
 
-#ifndef MICROPY_PY_BLE_NUS
-#define MICROPY_PY_BLE_NUS              (0)
-#endif
-
 #endif
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 9b26b358da1b1..a4bb1d899e067 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
@@ -18,6 +18,7 @@
 #define MICROPY_PY_MACHINE_ADC          (1)
 #define MICROPY_PY_MACHINE_TEMP         (1)
 
+#define MICROPY_HW_ENABLE_USBDEV        (1)
 #define MICROPY_HW_USB_CDC              (1)
 #define MICROPY_HW_HAS_LED              (1)
 #define MICROPY_HW_HAS_SWITCH           (0)
diff --git a/ports/nrf/boards/PCA10056/mpconfigboard.h b/ports/nrf/boards/PCA10056/mpconfigboard.h
index 5b1b3a36ee26a..b3ad76a7f4464 100644
--- a/ports/nrf/boards/PCA10056/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10056/mpconfigboard.h
@@ -37,6 +37,9 @@
 
 #define MICROPY_HW_ENABLE_RNG       (1)
 
+#define MICROPY_HW_ENABLE_USBDEV    (1)
+#define MICROPY_HW_USB_CDC          (1)
+
 #define MICROPY_HW_HAS_LED          (1)
 #define MICROPY_HW_LED_COUNT        (4)
 #define MICROPY_HW_LED_PULLUP       (1)
@@ -47,6 +50,7 @@
 #define MICROPY_HW_LED4             (16) // LED4
 
 // UART config
+#define MICROPY_HW_ENABLE_UART_REPL (1)
 #define MICROPY_HW_UART1_RX         (8)
 #define MICROPY_HW_UART1_TX         (6)
 #define MICROPY_HW_UART1_CTS        (7)
diff --git a/ports/nrf/boards/PCA10059/mpconfigboard.mk b/ports/nrf/boards/PCA10059/mpconfigboard.mk
index 3a26a92b7dc1e..c6f087ad01da5 100644
--- a/ports/nrf/boards/PCA10059/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10059/mpconfigboard.mk
@@ -9,9 +9,7 @@ ifeq ($(DFU),1)
 BOOTLOADER=open_bootloader
 BOOTLOADER_VERSION_MAJOR=1
 BOOTLOADER_VERSION_MINOR=2
-FLASHER=nrfutil
-else
-FLASHER=segger
+FLASHER ?= nrfutil
 endif
 
 LD_FILES += boards/nrf52840_1M_256k.ld
diff --git a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
index 25a34541a4a53..1faa256d80b3c 100644
--- a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
@@ -32,6 +32,7 @@
 #define MICROPY_BOARD_DEINIT            XIAO_board_deinit
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) XIAO_board_enter_bootloader()
 
+#define MICROPY_HW_ENABLE_USBDEV    (1)
 #define MICROPY_HW_USB_CDC          (1)
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index b1caa187d5fc5..4bede3852a637 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -39,7 +39,7 @@
 #include "mphalport.h"
 
 
-#if MICROPY_HW_USB_CDC
+#if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
 #include "usb_cdc.h"
 #endif
 
@@ -941,7 +941,7 @@ static void sd_evt_handler(uint32_t evt_id) {
             // unhandled event!
             break;
     }
-#if MICROPY_HW_USB_CDC
+#if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
     // Forward SOC events to USB CDC driver.
     usb_cdc_sd_event_handler(evt_id);
 #endif
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index a342a1e00610c..69f86b489f313 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -97,20 +97,16 @@ static ubluepy_advertise_data_t m_adv_data_uart_service;
 static ubluepy_advertise_data_t m_adv_data_eddystone_url;
 #endif // BLUETOOTH_WEBBLUETOOTH_REPL
 
-int mp_hal_stdin_rx_chr(void) {
-    while (!ble_uart_enabled()) {
-        // wait for connection
+int mp_ble_uart_stdin_rx_chr(void) {
+    if (ble_uart_enabled() && !isBufferEmpty(mp_rx_ring_buffer)) {
+        uint8_t byte = -1;
+        bufferRead(mp_rx_ring_buffer, byte);
+        return (int)byte;
     }
-    while (isBufferEmpty(mp_rx_ring_buffer)) {
-        ;
-    }
-
-    uint8_t byte;
-    bufferRead(mp_rx_ring_buffer, byte);
-    return (int)byte;
+    return -1;
 }
 
-mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
+mp_uint_t mp_ble_uart_stdout_tx_strn(const char *str, size_t len) {
     // Not connected: drop output
     if (!ble_uart_enabled()) return 0;
 
@@ -150,17 +146,8 @@ void ble_uart_tx_char(char c) {
                           (uint8_t *)&c);
 }
 
-void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t 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
-uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+uintptr_t mp_ble_uart_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)) {
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.h b/ports/nrf/drivers/bluetooth/ble_uart.h
index e67176a26feb6..c00e1f4323f07 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.h
+++ b/ports/nrf/drivers/bluetooth/ble_uart.h
@@ -37,6 +37,10 @@ void ble_uart_advertise(void);
 bool ble_uart_connected(void);
 bool ble_uart_enabled(void);
 
+uintptr_t mp_ble_uart_stdio_poll(uintptr_t poll_flags);
+int mp_ble_uart_stdin_rx_chr(void);
+mp_uint_t mp_ble_uart_stdout_tx_strn(const char *str, size_t len);
+
 #endif // BLUETOOTH_SD
 
 #endif // BLUETOOTH_LE_UART_H__
diff --git a/ports/nrf/drivers/usb/tusb_config.h b/ports/nrf/drivers/usb/tusb_config.h
index 619578ad6ee3a..935d9c2291376 100644
--- a/ports/nrf/drivers/usb/tusb_config.h
+++ b/ports/nrf/drivers/usb/tusb_config.h
@@ -26,19 +26,9 @@
 #ifndef MICROPY_INCLUDED_NRF_TUSB_CONFIG_H
 #define MICROPY_INCLUDED_NRF_TUSB_CONFIG_H
 
-// Common configuration
-
-#define CFG_TUSB_MCU                OPT_MCU_NRF5X
-#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
-
-#define CFG_TUSB_MEM_SECTION
-#define CFG_TUSB_MEM_ALIGN          TU_ATTR_ALIGNED(4)
+#include "shared/tinyusb/tusb_config.h"
 
 // Device configuration
-
-#define CFG_TUD_ENDOINT0_SIZE       (64)
-#define CFG_TUD_CDC                 (1)
-#define CFG_TUD_CDC_RX_BUFSIZE      (64)
-#define CFG_TUD_CDC_TX_BUFSIZE      (64)
+#define CFG_TUSB_MCU                OPT_MCU_NRF5X
 
 #endif // MICROPY_INCLUDED_NRF_TUSB_CONFIG_H
diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index aef7354972722..4d6583fef02ca 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -27,7 +27,7 @@
 
 #include "py/mphal.h"
 
-#if MICROPY_HW_USB_CDC
+#if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
 
 #include "nrfx.h"
 #include "nrfx_power.h"
@@ -37,6 +37,9 @@
 #include "py/runtime.h"
 #include "shared/runtime/interrupt_char.h"
 #include "shared/tinyusb/mp_usbd.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
+#include "extmod/misc.h"
+#include <hal/nrf_ficr.h>
 
 #ifdef BLUETOOTH_SD
 #include "nrf_sdm.h"
@@ -46,13 +49,6 @@
 
 extern void tusb_hal_nrf_power_event(uint32_t event);
 
-static void cdc_task(bool tx);
-
-static uint8_t rx_ringbuf_array[1024];
-static uint8_t tx_ringbuf_array[1024];
-static volatile ringbuf_t rx_ringbuf;
-static volatile ringbuf_t tx_ringbuf;
-
 static void board_init(void) {
     // Config clock source.
 #ifndef BLUETOOTH_SD
@@ -105,89 +101,27 @@ static void board_init(void) {
 #endif
 }
 
-static bool cdc_rx_any(void) {
-    return rx_ringbuf.iput != rx_ringbuf.iget;
-}
-
-static int cdc_rx_char(void) {
-    return ringbuf_get((ringbuf_t*)&rx_ringbuf);
-}
-
-static bool cdc_tx_any(void) {
-    return tx_ringbuf.iput != tx_ringbuf.iget;
-}
-
-static int cdc_tx_char(void) {
-    return ringbuf_get((ringbuf_t*)&tx_ringbuf);
-}
-
-static void cdc_task(bool tx)
-{
-    if ( tud_cdc_connected() ) {
-        // connected and there are data available
-        while (tud_cdc_available()) {
-            int c = tud_cdc_read_char();
-            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);
-            }
-        }
-
-        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();
-        }
-    }
-}
-
-static void usb_cdc_loop(void) {
-    tud_task();
-    cdc_task(true);
-}
-
-void tud_cdc_rx_cb(uint8_t itf) {
-    cdc_task(false);
+void mp_usbd_port_get_serial_number(char *serial_buf) {
+    uint32_t deviceid[2];
+	deviceid[0] = nrf_ficr_deviceid_get(NRF_FICR, 0);
+	deviceid[1] = nrf_ficr_deviceid_get(NRF_FICR, 1);
+    MP_STATIC_ASSERT(sizeof(deviceid) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
+    mp_usbd_hex_str(serial_buf, (uint8_t *)deviceid, sizeof(deviceid));
 }
 
 int usb_cdc_init(void)
 {
     static bool initialized = false;
     if (!initialized) {
-
-#if BLUETOOTH_SD
+        #if BLUETOOTH_SD
         // Initialize the clock and BLE stack.
         ble_drv_stack_enable();
-#endif
-
+        #endif
         board_init();
         initialized = true;
     }
 
-    rx_ringbuf.buf = rx_ringbuf_array;
-    rx_ringbuf.size = sizeof(rx_ringbuf_array);
-    rx_ringbuf.iget = 0;
-    rx_ringbuf.iput = 0;
-
-    tx_ringbuf.buf = tx_ringbuf_array;
-    tx_ringbuf.size = sizeof(tx_ringbuf_array);
-    tx_ringbuf.iget = 0;
-    tx_ringbuf.iput = 0;
-
     mp_usbd_init();
-
     return 0;
 }
 
@@ -205,52 +139,6 @@ 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;
-        }
-    }
-    if (poll_flags & MP_STREAM_POLL_WR) {
-        ret |= MP_STREAM_POLL_WR;
-    }
-    return ret;
-}
-
-int mp_hal_stdin_rx_chr(void) {
-    for (;;) {
-        usb_cdc_loop();
-        if (cdc_rx_any()) {
-            return cdc_rx_char();
-        }
-        MICROPY_EVENT_POLL_HOOK
-    }
-
-    return 0;
-}
-
-mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-    for (const char *top = str + len; str < top; str++) {
-        ringbuf_put((ringbuf_t*)&tx_ringbuf, *str);
-        usb_cdc_loop();
-    }
-    return len;
-}
-
-void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
-
-    for (const char *top = str + len; str < top; str++) {
-        if (*str == '\n') {
-            ringbuf_put((ringbuf_t*)&tx_ringbuf, '\r');
-            usb_cdc_loop();
-        }
-        ringbuf_put((ringbuf_t*)&tx_ringbuf, *str);
-        usb_cdc_loop();
-    }
-}
-
 void USBD_IRQHandler(void) {
     tud_int_handler(0);
 }
diff --git a/ports/nrf/drivers/usb/usb_descriptors.c b/ports/nrf/drivers/usb/usb_descriptors.c
deleted file mode 100644
index b1edfcc18fd8f..0000000000000
--- a/ports/nrf/drivers/usb/usb_descriptors.c
+++ /dev/null
@@ -1,117 +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 "tusb.h"
-
-#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)
-
-#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_ENDOINT0_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,
-        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/nrf/main.c b/ports/nrf/main.c
index 07bf3e8adb5c6..62848ba8d6e27 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -73,7 +73,7 @@
 #include "softpwm.h"
 #endif
 
-#if MICROPY_HW_USB_CDC
+#if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
 #include "usb_cdc.h"
 #endif
 
@@ -165,11 +165,11 @@ void NORETURN _start(void) {
     uart_init0();
     #endif
 
-    #if (MICROPY_PY_BLE_NUS == 0) && (MICROPY_HW_USB_CDC == 0)
+    #if MICROPY_HW_ENABLE_UART_REPL
     {
         mp_obj_t args[2] = {
-            MP_OBJ_NEW_SMALL_INT(0),
-            MP_OBJ_NEW_SMALL_INT(115200),
+            MP_OBJ_NEW_SMALL_INT(MICROPY_HW_UART_REPL),
+            MP_OBJ_NEW_SMALL_INT(MICROPY_HW_UART_REPL_BAUD),
         };
         MP_STATE_VM(dupterm_objs[0]) = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, MP_ARRAY_SIZE(args), 0, args);
     }
@@ -265,7 +265,7 @@ void NORETURN _start(void) {
     ret_code = pyexec_file_if_exists("boot.py");
     #endif
 
-    #if MICROPY_HW_USB_CDC
+    #if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
     usb_cdc_init();
     #endif
 
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 48b58143acdd0..1c789f779b8e7 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -158,8 +158,7 @@
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
-#if MICROPY_HW_USB_CDC_1200BPS_TOUCH
-#define MICROPY_HW_ENABLE_USBDEV    (1)
+#if MICROPY_HW_ENABLE_USBDEV
 #define MICROPY_ENABLE_SCHEDULER    (1)
 #define MICROPY_SCHEDULER_STATIC_NODES (1)
 #endif
@@ -297,6 +296,24 @@
 #define MICROPY_PY_BLE_NUS                       (0)
 #endif
 
+// Whether to enable the REPL on a UART.
+#ifndef MICROPY_HW_ENABLE_UART_REPL
+// note: if both uart repl and cdc are enabled, uart hwfc can cause the cdc to lock up.
+#define MICROPY_HW_ENABLE_UART_REPL (!MICROPY_PY_BLE_NUS && !MICROPY_HW_USB_CDC)
+#endif
+
+#if MICROPY_HW_ENABLE_UART_REPL
+
+#ifndef MICROPY_HW_UART_REPL
+#define MICROPY_HW_UART_REPL (0)
+#endif
+
+#ifndef MICROPY_HW_UART_REPL_BAUD
+#define MICROPY_HW_UART_REPL_BAUD (115200)
+#endif
+
+#endif
+
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
@@ -331,17 +348,21 @@ long unsigned int rng_generate_random_word(void);
 
 #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();
-#define MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC (1)
-#else
-#define MICROPY_HW_USBDEV_TASK_HOOK ;
+#if MICROPY_HW_ENABLE_USBDEV
+#ifndef MICROPY_HW_USB_CDC
+#define MICROPY_HW_USB_CDC (1)
+#endif
+
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID  (0xf055)
+#endif
+#ifndef MICROPY_HW_USB_PID
+#define MICROPY_HW_USB_PID  (0x9802)
 #endif
+#endif // MICROPY_HW_ENABLE_USBDEV
 
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
-        MICROPY_HW_USBDEV_TASK_HOOK \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
         __WFI(); \
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 06c6ba5cc2e76..9bb51deb12153 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -29,11 +29,15 @@
 #include "py/mpstate.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
+#include "py/ringbuf.h"
 #include "py/runtime.h"
 #include "py/stream.h"
+#include "extmod/misc.h"
 #include "uart.h"
 #include "nrfx_errors.h"
 #include "nrfx_config.h"
+#include "drivers/bluetooth/ble_uart.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
 
 #if MICROPY_PY_TIME_TICKS
 #include "nrfx_rtc.h"
@@ -50,6 +54,14 @@
 #include "soc/nrfx_coredep.h"
 #endif
 
+#ifndef MICROPY_HW_STDIN_BUFFER_LEN
+#define MICROPY_HW_STDIN_BUFFER_LEN 512
+#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_nrf_start_lfclk(void) {
     if (!nrf_clock_lf_start_task_status_get(NRF_CLOCK)) {
         // Check if the clock was recently stopped but is still running.
@@ -200,47 +212,73 @@ void mp_hal_set_interrupt_char(int c) {
 }
 #endif
 
-#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_VM(dupterm_objs[0]) != MP_OBJ_NULL
-        && uart_rx_any(MP_STATE_VM(dupterm_objs[0]))) {
-        ret |= MP_STREAM_POLL_RD;
-    }
-    if ((poll_flags & MP_STREAM_POLL_WR) && MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
-        ret |= MP_STREAM_POLL_WR;
-    }
+    #if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
+    #endif
+    #if MICROPY_PY_BLE_NUS && MICROPY_PY_SYS_STDFILES
+    ret |= mp_ble_uart_stdio_poll(poll_flags);
+    #endif
+    #if MICROPY_PY_OS_DUPTERM
+    ret |= mp_os_dupterm_poll(poll_flags);
+    #endif
     return ret;
 }
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL && uart_rx_any(MP_STATE_VM(dupterm_objs[0]))) {
-            return uart_rx_char(MP_STATE_VM(dupterm_objs[0]));
+        #if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
+        mp_usbd_cdc_poll_interfaces(0);
+        #endif
+        int c = ringbuf_get(&stdin_ringbuf);
+        if (c != -1) {
+            return c;
+        }
+        #if MICROPY_PY_BLE_NUS
+        c = mp_ble_uart_stdin_rx_chr();
+        if (c != -1) {
+            return c;
+        }
+        #endif
+        #if MICROPY_PY_OS_DUPTERM
+        int dupterm_c = mp_os_dupterm_rx_chr();
+        if (dupterm_c >= 0) {
+            return dupterm_c;
         }
+        #endif
         MICROPY_EVENT_POLL_HOOK
     }
 
     return 0;
 }
 
+// Send string of given length
 mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-    if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
-        uart_tx_strn(MP_STATE_VM(dupterm_objs[0]), str, len);
-        return len;
+    mp_uint_t ret = len;
+    bool did_write = false;
+    #if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
+        did_write = true;
+        ret = MIN(cdc_res, ret);
     }
-    return 0;
-}
-
-void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
-    if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
-        uart_tx_strn_cooked(MP_STATE_VM(dupterm_objs[0]), str, len);
+    #endif
+    #if MICROPY_PY_BLE_NUS
+    mp_uint_t ble_res = mp_ble_uart_stdout_tx_strn(str, len);
+    if (ble_res > 0) {
+        did_write = true;
+        ret = MIN(ble_res, ret);
     }
-}
-#endif
-
-void mp_hal_stdout_tx_str(const char *str) {
-    mp_hal_stdout_tx_strn(str, strlen(str));
+    #endif
+    #if MICROPY_PY_OS_DUPTERM
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
+    #endif
+    return did_write ? ret : 0;
 }
 
 #if MICROPY_PY_TIME_TICKS
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 7efe05a15fc8e..50c61aefcdd59 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -28,10 +28,12 @@
 #define __NRF52_HAL
 
 #include "py/mpconfig.h"
+#include "py/ringbuf.h"
 #include <nrfx.h>
 #include "pin.h"
 #include "nrf_gpio.h"
 #include "nrfx_config.h"
+#include "shared/runtime/interrupt_char.h"
 
 typedef enum
 {
@@ -43,6 +45,8 @@ typedef enum
 
 extern const unsigned char mp_hal_status_to_errno_table[4];
 
+extern ringbuf_t stdin_ringbuf;
+
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 

From 56c161738496c03f0d651264861ff0c334b04e5d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 29 May 2024 11:48:19 +1000
Subject: [PATCH 1255/3129] nrf/modules/machine/uart: Support sending data
 stored in flash.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/nrf/modules/machine/uart.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index de26fa1b12787..90a67bcbc08ad 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -29,6 +29,7 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
+#include <string.h>
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/ringbuf.h"
@@ -317,10 +318,30 @@ static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     return size;
 }
 
-static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
-    machine_uart_obj_t *self = self_in;
+static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+    #if !NRFX_UART_ENABLED
+    if (!nrfx_is_in_ram(buf)) {
+        // Peripherals using EasyDMA require that transfer buffers are placed in DataRAM,
+        // they cannot access data directly from flash.
+        // If buf is in flash, copy to ram in chunks to send.
+        char rambuf[64];
+        char *flashbuf = (char *)buf;
+        mp_uint_t remaining = size;
+        while (remaining) {
+            mp_uint_t chunk = MIN(sizeof(rambuf), remaining);
+            memcpy(rambuf, flashbuf, chunk);
+            if (mp_machine_uart_write(self_in, rambuf, chunk, errcode) == MP_STREAM_ERROR) {
+                return MP_STREAM_ERROR;
+            }
+            remaining -= chunk;
+            flashbuf += chunk;
+        }
+        return size;
+    }
+    #endif
 
-    nrfx_err_t err = nrfx_uart_tx(self->p_uart, buf_in, size);
+    machine_uart_obj_t *self = self_in;
+    nrfx_err_t err = nrfx_uart_tx(self->p_uart, buf, size);
     if (err == NRFX_SUCCESS) {
         while (nrfx_uart_tx_in_progress(self->p_uart)) {
             MICROPY_EVENT_POLL_HOOK;

From 62e0fa04a7a6f9044db1bb0f20ea7a2e00599921 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 5 Jun 2024 12:01:12 +1000
Subject: [PATCH 1256/3129] nrf/Makefile: Enable LTO by default only on newer
 gcc.

Older gcc/binutils linker does not support lto with wrap.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/nrf/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index d955d183a1b4c..621f7d33c60c8 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -129,7 +129,15 @@ CFLAGS_MCU_m4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-s
 
 CFLAGS_MCU_m0 = $(CFLAGS_CORTEX_M) -fshort-enums -mtune=cortex-m0 -mcpu=cortex-m0 -mfloat-abi=soft
 
+# linker wrap does not work with lto on older gcc/binutils: https://sourceware.org/bugzilla/show_bug.cgi?id=24406
+GCC_VERSION = $(shell arm-none-eabi-gcc --version | sed -n -E 's:^arm.*([0-9]+\.[0-9]+\.[0-9]+).*$$:\1:p')
+GCC_MAJOR_VERS = $(word 1,$(subst ., ,$(GCC_VERSION)))
+ifeq ($(shell test $(GCC_MAJOR_VERS) -ge 10; echo $$?),0)
 LTO ?= 1
+else
+LTO ?= 0
+endif
+
 ifeq ($(LTO),1)
 CFLAGS += -flto
 else

From 5e80416e6d6168ec5f1ad43191d4ddac1332c641 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 5 Jun 2024 12:22:03 +1000
Subject: [PATCH 1257/3129] nrf/modules/machine/soft_pwm: Ensure duty_width is
 always valid.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/nrf/modules/machine/soft_pwm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/nrf/modules/machine/soft_pwm.c b/ports/nrf/modules/machine/soft_pwm.c
index 2fa3362658986..1891a6d6ee077 100644
--- a/ports/nrf/modules/machine/soft_pwm.c
+++ b/ports/nrf/modules/machine/soft_pwm.c
@@ -199,6 +199,8 @@ static void machine_soft_pwm_start(machine_pwm_obj_t *self) {
             duty_width = self->duty * DUTY_FULL_SCALE / 65536;
         } else if (self->duty_mode == DUTY_NS) {
             duty_width = (uint64_t)self->duty * self->freq * DUTY_FULL_SCALE / 1000000000ULL;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid duty mode"));
         }
         pwm_set_duty_cycle(self->pwm_pin, duty_width);
     }

From 4a134d212e74fa6da7cc2d91ec4026e6f5218f0e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Jun 2024 15:31:59 +0200
Subject: [PATCH 1258/3129] nrf/modules/machine/pin: Disable IRQ with
 pin.irq(handler=None).

Before, the input was still set to `pin.irq()` mode, only the handler was
disabled.  That prevented switching the pin between input and output mode.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/nrf/modules/machine/pin.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index 2191cc9521d01..f46394d769c95 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -537,19 +537,24 @@ static mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
 
     nrfx_gpiote_pin_t pin = self->pin;
 
-    nrfx_gpiote_in_config_t config = NRFX_GPIOTE_CONFIG_IN_SENSE_TOGGLE(true);
-    if (args[ARG_trigger].u_int == NRF_GPIOTE_POLARITY_LOTOHI) {
-        config.sense = NRF_GPIOTE_POLARITY_LOTOHI;
-    } else if (args[ARG_trigger].u_int == NRF_GPIOTE_POLARITY_HITOLO) {
-        config.sense = NRF_GPIOTE_POLARITY_HITOLO;
-    }
-    config.pull = NRF_GPIO_PIN_PULLUP;
+    if (args[ARG_handler].u_obj != mp_const_none) {
+        nrfx_gpiote_in_config_t config = NRFX_GPIOTE_CONFIG_IN_SENSE_TOGGLE(true);
+        if (args[ARG_trigger].u_int == NRF_GPIOTE_POLARITY_LOTOHI) {
+            config.sense = NRF_GPIOTE_POLARITY_LOTOHI;
+        } else if (args[ARG_trigger].u_int == NRF_GPIOTE_POLARITY_HITOLO) {
+            config.sense = NRF_GPIOTE_POLARITY_HITOLO;
+        }
+        config.pull = NRF_GPIO_PIN_PULLUP;
+        config.skip_gpio_setup = true;
 
-    nrfx_err_t err_code = nrfx_gpiote_in_init(pin, &config, pin_common_irq_handler);
-    if (err_code == NRFX_ERROR_INVALID_STATE) {
-        // Re-init if already configured.
+        nrfx_err_t err_code = nrfx_gpiote_in_init(pin, &config, pin_common_irq_handler);
+        if (err_code == NRFX_ERROR_INVALID_STATE) {
+            // Re-init if already configured.
+            nrfx_gpiote_in_uninit(pin);
+            nrfx_gpiote_in_init(pin, &config, pin_common_irq_handler);
+        }
+    } else {
         nrfx_gpiote_in_uninit(pin);
-        nrfx_gpiote_in_init(pin, &config, pin_common_irq_handler);
     }
 
     MP_STATE_PORT(pin_irq_handlers)[pin] = args[ARG_handler].u_obj;

From 6007f3e2062cc65fc8416f241c682e37eb956c11 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 2 Jul 2024 22:49:47 +0200
Subject: [PATCH 1259/3129] esp32/mpconfigport: Enable the RV32 emitter for
 ESP32C3 targets.

The RV32 code emitter assumed that the arch-specific NLR was used
instead of the setjmp/longjmp based NLR code.  If the latter NLR
provider was chosen, the emitter would allocate space on the stack
for the NLR buffer but would not fill it in.

This change turns off setjmp()-based NLR and GCREGS for the ESP32C3
target, in favour of more platform-tailored alternatives.  As setjmp()
NLR is now disabled by default, the RV32 emitter can be safely enabled
by default as well for the target in question.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/mpconfigport.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 558fa6b8c602c..b9e53a4fa8cd9 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -18,9 +18,8 @@
 
 // object representation and NLR handling
 #define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
+#if !CONFIG_IDF_TARGET_ESP32C3
 #define MICROPY_NLR_SETJMP                  (1)
-#if CONFIG_IDF_TARGET_ESP32C3
-#define MICROPY_GCREGS_SETJMP               (1)
 #endif
 
 // memory allocation policies
@@ -44,6 +43,8 @@
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
 #if !CONFIG_IDF_TARGET_ESP32C3
 #define MICROPY_EMIT_XTENSAWIN              (1)
+#else
+#define MICROPY_EMIT_RV32                   (1)
 #endif
 
 // workaround for xtensa-esp32-elf-gcc esp-2020r3, which can generate wrong code for loops

From 70a7e0ff2f86cc7359785ad356cecc4449f7b850 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 26 Jul 2024 15:22:53 +1000
Subject: [PATCH 1260/3129] nrf/Makefile: Fix GCC_VERSION check.

Previously it was truncating the first digit of the version if the major
number had more than one digit.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/nrf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 621f7d33c60c8..c4150c292cb7c 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -130,7 +130,7 @@ CFLAGS_MCU_m4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-s
 CFLAGS_MCU_m0 = $(CFLAGS_CORTEX_M) -fshort-enums -mtune=cortex-m0 -mcpu=cortex-m0 -mfloat-abi=soft
 
 # linker wrap does not work with lto on older gcc/binutils: https://sourceware.org/bugzilla/show_bug.cgi?id=24406
-GCC_VERSION = $(shell arm-none-eabi-gcc --version | sed -n -E 's:^arm.*([0-9]+\.[0-9]+\.[0-9]+).*$$:\1:p')
+GCC_VERSION = $(shell arm-none-eabi-gcc -dumpversion)
 GCC_MAJOR_VERS = $(word 1,$(subst ., ,$(GCC_VERSION)))
 ifeq ($(shell test $(GCC_MAJOR_VERS) -ge 10; echo $$?),0)
 LTO ?= 1

From a3100be4b226982c0c4aa162139617be23198c66 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 19 Jul 2024 18:56:36 +0300
Subject: [PATCH 1261/3129] stm32/boards: Swap FMC banks on ARDUINO_GIGA and
 ARDUINO_PORTENTA_H7.

Swap FMC banks to remap the SDRAM bank1 address to 0x60000000.  Arduino's
M4 firmware uses address 0x60000000 by default.  When the elf loader tries
to load that it will fail because by default NOR/PSRAM is mapped at that
address, not SDRAM bank1.  (Note that the region at 0xC0000000 has an XN
attribute by default, so switching the M4 firmware address will not work.)

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h        | 1 +
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index b278fa005b757..d09a074402e7b 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -226,6 +226,7 @@ extern struct _spi_bdev_t spi_bdev;
 #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)
+#define MICROPY_HW_FMC_SWAP_BANKS           (1)
 
 // Timing configuration for 200MHz/2=100MHz (10ns)
 #define MICROPY_HW_SDRAM_CLOCK_PERIOD       2
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index ace63e016b189..3a012446b465e 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -240,6 +240,7 @@ extern struct _spi_bdev_t spi_bdev;
 #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)
+#define MICROPY_HW_FMC_SWAP_BANKS           (1)
 
 // Timing configuration for 200MHz/2=100MHz (10ns)
 #define MICROPY_HW_SDRAM_CLOCK_PERIOD       2

From 6f27e1c9681de46e0c6ef859dd8be4fc6fd7cf1d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 19 Jul 2024 19:04:13 +0300
Subject: [PATCH 1262/3129] lib/arduino-lib: Update submodule to the latest.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 lib/arduino-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/arduino-lib b/lib/arduino-lib
index 89424753e18ed..0f0993582f7f8 160000
--- a/lib/arduino-lib
+++ b/lib/arduino-lib
@@ -1 +1 @@
-Subproject commit 89424753e18ed58b7d8041085c9d2e1d162f09ca
+Subproject commit 0f0993582f7f882f06371d21cd15748932795272

From 1754c587f9375f35c73d83982396b4f5232566ce Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 25 Jul 2024 11:57:09 +1000
Subject: [PATCH 1263/3129] esp32: Fix heap corruption triggered by
 bluetooth.active(0).

It seems like at some point Espressif NimBLE team changed
nimble_port_init and nimble_port_deinit to manage HCI init
internally:
https://github.com/espressif/esp-nimble/commit/f8a79b04c9743543b8959727d7

This change is included in all the IDF versions that MicroPython supports.

As a result, existing code that called esp_nimble_hci_deinit() explicitly
would trigger a use-after-free bug and heap corruption (specifically this
calls through to ble_transport_deinit() which calls os_mempool_free(). The
second time this writes out to a bunch of memory pools where the backing
buffers have already been freed.)

Symptoms were intermittent random crashes after de-activating Bluetooth
(running multi_bluetooth/ble_gatt_data_transfer.py could sometimes
reproduce). Setting Heap Poisoning to Comprehensive in menuconfig caused
the bug to be detected every time.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/mpnimbleport.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/mpnimbleport.c b/ports/esp32/mpnimbleport.c
index 669aeb746a58d..ce4b77727a190 100644
--- a/ports/esp32/mpnimbleport.c
+++ b/ports/esp32/mpnimbleport.c
@@ -32,7 +32,6 @@
 
 #define DEBUG_printf(...) // printf("nimble (esp32): " __VA_ARGS__)
 
-#include "esp_nimble_hci.h"
 #include "nimble/nimble_port.h"
 #include "nimble/nimble_port_freertos.h"
 
@@ -45,14 +44,13 @@ static void ble_host_task(void *param) {
 }
 
 void mp_bluetooth_nimble_port_hci_init(void) {
-    DEBUG_printf("mp_bluetooth_nimble_port_hci_init\n");
-    esp_nimble_hci_init();
+    // On ESP-IDF the standard nimble_port_init() function calls
+    // esp_nimble_init() which initialises the HCI
 }
 
 void mp_bluetooth_nimble_port_hci_deinit(void) {
-    DEBUG_printf("mp_bluetooth_nimble_port_hci_deinit\n");
-
-    esp_nimble_hci_deinit();
+    // As above, this is handled by ESP-IDF nimble_port_deinit()
+    // (called below)
 }
 
 void mp_bluetooth_nimble_port_start(void) {

From 066243ea74050523e807211f208e24fac08f69fc Mon Sep 17 00:00:00 2001
From: George Hopkins <george-hopkins@null.net>
Date: Sun, 21 Jul 2024 16:48:48 +0200
Subject: [PATCH 1264/3129] py/py.mk: Add SRC_USERMOD_LIB_ASM to include
 assembly files.

Introduce SRC_USERMOD_LIB_ASM to allow users to include assembly files as
part of their user modules.  It could be used to include optimized
functions or outputs of other programming languages.

Signed-off-by: George Hopkins <george-hopkins@null.net>
---
 docs/develop/cmodules.rst | 2 +-
 py/py.mk                  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 75dbc953c06f8..c5aa919b7645a 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -59,7 +59,7 @@ A MicroPython user C module is a directory with the following files:
     SRC_USERMOD_LIB_C += $(EXAMPLE_MOD_DIR)/utils/algorithm.c
 
   Similarly, use ``SRC_USERMOD_CXX`` and ``SRC_USERMOD_LIB_CXX`` for C++
-  source files.
+  source files. If you want to include assembly files use ``SRC_USERMOD_LIB_ASM``.
 
   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/py/py.mk b/py/py.mk
index cd9392edbba4c..ff3dff96a5715 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -36,9 +36,10 @@ ifneq ($(USER_C_MODULES),)
 # 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)
+# Other C/C++/Assembly files (e.g. libraries or helpers)
 SRC_USERMOD_LIB_C :=
 SRC_USERMOD_LIB_CXX :=
+SRC_USERMOD_LIB_ASM :=
 # Optionally set flags
 CFLAGS_USERMOD :=
 CXXFLAGS_USERMOD :=
@@ -60,6 +61,7 @@ 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))
+SRC_USERMOD_PATHFIX_LIB_ASM += $(patsubst $(USER_C_MODULES)/%.S,%.S,$(SRC_USERMOD_LIB_ASM))
 
 CFLAGS += $(CFLAGS_USERMOD)
 CXXFLAGS += $(CXXFLAGS_USERMOD)
@@ -70,6 +72,7 @@ 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))
+PY_O += $(addprefix $(BUILD)/, $(SRC_USERMOD_PATHFIX_LIB_ASM:.S=.o))
 endif
 
 # py object files

From d1685a3f5f81f20e9eea26f1274bf6171b287814 Mon Sep 17 00:00:00 2001
From: Tim Weber <scy@scy.name>
Date: Tue, 23 Jul 2024 23:59:29 +0200
Subject: [PATCH 1265/3129] docs/library/neopixel: Mention bitstream timing
 tuple.

Signed-off-by: Tim Weber <scy@scy.name>
---
 docs/library/neopixel.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/library/neopixel.rst b/docs/library/neopixel.rst
index edcbc9345c304..b618e6012c382 100644
--- a/docs/library/neopixel.rst
+++ b/docs/library/neopixel.rst
@@ -43,7 +43,8 @@ Constructors
         - *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).
+        - *timing* is 0 for 400KHz, and 1 for 800kHz LEDs (most are 800kHz). You
+          may also supply a timing tuple as accepted by `machine.bitstream()`.
 
 Pixel access methods
 --------------------

From 9ba04cc7563ec934ca14d66aa18ae3563c8d1aea Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 1 Aug 2024 16:26:46 +1000
Subject: [PATCH 1266/3129] tests/extmod: Skip soft machine.Timer test on esp32
 port.

Also rename the test to reflect that it's a soft timer test.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/{machine_timer.py => machine_soft_timer.py} | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
 rename tests/extmod/{machine_timer.py => machine_soft_timer.py} (82%)

diff --git a/tests/extmod/machine_timer.py b/tests/extmod/machine_soft_timer.py
similarity index 82%
rename from tests/extmod/machine_timer.py
rename to tests/extmod/machine_soft_timer.py
index 1be01d184d442..bff9af5b820f2 100644
--- a/tests/extmod/machine_timer.py
+++ b/tests/extmod/machine_soft_timer.py
@@ -1,4 +1,11 @@
-# test machine.Timer
+# test "soft" machine.Timer (no hardware ID)
+import sys
+
+
+if sys.platform == "esp32":
+    print("SKIP")  # TODO: Implement soft timers for esp32 port
+    raise SystemExit
+
 
 try:
     import time, machine as machine

From 0d00d72b76092dc62d194e5cbda8a1b00a4c3ff7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 25 Jul 2024 12:19:11 +1000
Subject: [PATCH 1267/3129] esp32/machine_i2s: Ensure 2 DMA buffers and improve
 I2S error handling.

ESP-IDF driver always requires at least two DMA buffers, so ensure that's
the case.

Failures during initialisation were being lost because ESP_ERROR_CHECK is
configured as a no-op, so the failure was deferred until read() or write()
was called on the port.  Raise an error from init, instead.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_i2s.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 6ba2f54c354c6..ba6377a76646d 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -151,7 +151,7 @@ static uint32_t get_dma_buf_count(uint8_t mode, i2s_data_bit_width_t bits, forma
 
     uint32_t dma_buf_count = ibuf / (DMA_BUF_LEN_IN_I2S_FRAMES * dma_frame_size_in_bytes);
 
-    return dma_buf_count;
+    return MAX(dma_buf_count, 2); // ESP-IDF requires at least two DMA buffers
 }
 
 static uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
@@ -363,9 +363,9 @@ static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
     chan_config.auto_clear = true;
 
     if (mode == MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
-        ESP_ERROR_CHECK(i2s_new_channel(&chan_config, &self->i2s_chan_handle, NULL));
+        check_esp_err(i2s_new_channel(&chan_config, &self->i2s_chan_handle, NULL));
     } else { // rx
-        ESP_ERROR_CHECK(i2s_new_channel(&chan_config, NULL, &self->i2s_chan_handle));
+        check_esp_err(i2s_new_channel(&chan_config, NULL, &self->i2s_chan_handle));
     }
 
     i2s_std_slot_config_t slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(get_dma_bits(mode, bits), get_dma_format(mode, format));
@@ -394,9 +394,9 @@ static void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *ar
         std_cfg.gpio_cfg.din = self->sd;
     }
 
-    ESP_ERROR_CHECK(i2s_channel_init_std_mode(self->i2s_chan_handle, &std_cfg));
-    ESP_ERROR_CHECK(i2s_channel_register_event_callback(self->i2s_chan_handle, &i2s_callbacks, self));
-    ESP_ERROR_CHECK(i2s_channel_enable(self->i2s_chan_handle));
+    check_esp_err(i2s_channel_init_std_mode(self->i2s_chan_handle, &std_cfg));
+    check_esp_err(i2s_channel_register_event_callback(self->i2s_chan_handle, &i2s_callbacks, self));
+    check_esp_err(i2s_channel_enable(self->i2s_chan_handle));
 }
 
 static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
@@ -419,9 +419,12 @@ static machine_i2s_obj_t *mp_machine_i2s_make_new_instance(mp_int_t i2s_id) {
 
 static void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     if (!self->is_deinit) {
-        ESP_ERROR_CHECK(i2s_channel_disable(self->i2s_chan_handle));
-        ESP_ERROR_CHECK(i2s_channel_register_event_callback(self->i2s_chan_handle, &i2s_callbacks_null, self));
-        ESP_ERROR_CHECK(i2s_del_channel(self->i2s_chan_handle));
+        if (self->i2s_chan_handle) {
+            i2s_channel_disable(self->i2s_chan_handle);
+            i2s_channel_register_event_callback(self->i2s_chan_handle, &i2s_callbacks_null, self);
+            i2s_del_channel(self->i2s_chan_handle);
+            self->i2s_chan_handle = NULL;
+        }
 
         if (self->non_blocking_mode_task != NULL) {
             vTaskDelete(self->non_blocking_mode_task);

From 6d054247546eb278942a407e0de7e72b5f66d54f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 25 Jul 2024 12:20:45 +1000
Subject: [PATCH 1268/3129] tests/extmod: Add esp32 support to the
 machine_i2s_rate test.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/machine_i2s_rate.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
index bf4b7235a9cdf..c8fa11514c96b 100644
--- a/tests/extmod/machine_i2s_rate.py
+++ b/tests/extmod/machine_i2s_rate.py
@@ -8,7 +8,10 @@
 
 import time, sys
 
+MAX_DELTA_MS = 4
+
 # Configure pins based on the board.
+# Tuples of (i2s_id, sck_pin, ws_pin, sd_tx_pin, sd_rx_pin)
 # A board must have at least one instance to test, both TX and RX mode.
 if "pyboard" in sys.platform:
     i2s_instances = ((2, Pin("Y6"), Pin("Y5"), Pin("Y8"), Pin("Y8")),)
@@ -22,6 +25,10 @@
         (1, Pin("D26"), Pin("D27"), Pin("D7"), Pin("D8")),
         (2, Pin("D4"), Pin("D3"), Pin("D2"), None),
     )
+elif "esp32" in sys.platform:
+    i2s_instances = ((0, Pin(18), Pin(19), Pin(21), Pin(14)),)
+    # Allow for small additional RTOS overhead
+    MAX_DELTA_MS = 8
 
 TEST_BYTES = b"01234567"
 RATE = 11025  # frames/sec
@@ -73,11 +80,12 @@ def test(i2s_id, sck_pin, ws_pin, sd_pin, mode, bits_per_sample, frame_format):
     i2s.deinit()
 
     # Time should be in range of 400ms.
-    time_in_range = abs(dt - 400) <= 4
+    time_delta = abs(dt - 400)
+    time_in_range = time_delta <= MAX_DELTA_MS
 
     # Print out test result if requested, or if time not in range.
     if print_results or not time_in_range:
-        print(mode_str, bits_per_sample, channels, time_in_range)
+        print(mode_str, bits_per_sample, channels, time_in_range or time_delta)
 
 
 print_results = True

From 11becbe22321ca1d7bd631144976f246175730ce Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 3 Jul 2024 15:15:16 +0100
Subject: [PATCH 1269/3129] rp2/CMakeLists.txt: Add MICROPY_DEF_BOARD to
 compile definitions.

Add MICROPY_DEF_BOARD as per esp32 port, allows board variants to override
the board name with:

    list(APPEND MICROPY_DEF_BOARD
        MICROPY_HW_BOARD_NAME="New Board Name"
    )

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 8fff4251487ff..904925ae3f5e5 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -493,6 +493,7 @@ set_source_files_properties(
 )
 
 target_compile_definitions(${MICROPY_TARGET} PRIVATE
+    ${MICROPY_DEF_BOARD}
     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

From cd1ab7645e6528b9de6587669ae4fe38a5f55853 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 3 Jul 2024 15:17:48 +0100
Subject: [PATCH 1270/3129] rp2/boards/PIMORONI_PICOLIPO: Refactor Pico LiPo to
 use board variants.

Combine the 4MB and 16MB "PIMORONI_PICOLIPO" variants into a single board.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 .../board.json                                |  5 ++-
 .../mpconfigboard.cmake                       |  0
 .../mpconfigboard.h                           | 12 ++-----
 .../PIMORONI_PICOLIPO/mpconfigvariant.cmake   |  6 ++++
 .../mpconfigvariant_FLASH_16M.cmake           |  6 ++++
 ports/rp2/boards/PIMORONI_PICOLIPO/pins.csv   | 31 +++++++++++++++++++
 .../mpconfigboard.cmake                       |  1 -
 .../PIMORONI_PICOLIPO_16MB/mpconfigboard.h    | 20 ------------
 .../boards/PIMORONI_PICOLIPO_16MB/pins.csv    |  1 -
 .../boards/PIMORONI_PICOLIPO_4MB/board.json   | 21 -------------
 .../rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv |  1 -
 11 files changed, 50 insertions(+), 54 deletions(-)
 rename ports/rp2/boards/{PIMORONI_PICOLIPO_16MB => PIMORONI_PICOLIPO}/board.json (81%)
 rename ports/rp2/boards/{PIMORONI_PICOLIPO_4MB => PIMORONI_PICOLIPO}/mpconfigboard.cmake (100%)
 rename ports/rp2/boards/{PIMORONI_PICOLIPO_4MB => PIMORONI_PICOLIPO}/mpconfigboard.h (71%)
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant_FLASH_16M.cmake
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO/pins.csv
 delete mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake
 delete mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
 delete mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv
 delete mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
 delete mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv

diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO/board.json
similarity index 81%
rename from ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
rename to ports/rp2/boards/PIMORONI_PICOLIPO/board.json
index c44ea555142c2..5354df1118d6d 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO/board.json
@@ -14,8 +14,11 @@
         "PimoroniPicoLipo_1of3_1024x1024.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Pico LiPo (16MiB)",
+    "product": "Pico LiPo",
     "thumbnail": "",
     "url": "https://shop.pimoroni.com/products/pimoroni-pico-lipo",
+    "variants": {
+        "FLASH_16M": "16 MiB Flash"
+    },
     "vendor": "Pimoroni"
 }
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake b/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigboard.cmake
similarity index 100%
rename from ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake
rename to ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigboard.cmake
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigboard.h
similarity index 71%
rename from ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
rename to ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigboard.h
index 53ade7291532a..857d21b26ccb6 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigboard.h
@@ -1,7 +1,9 @@
 // https://shop.pimoroni.com/products/pimoroni-pico-lipo?variant=39386149093459
 
+#ifndef MICROPY_HW_BOARD_NAME
 #define MICROPY_HW_BOARD_NAME          "Pimoroni Pico LiPo 4MB"
-#define MICROPY_HW_FLASH_STORAGE_BYTES (3 * 1024 * 1024)
+#endif
+#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (1 * 1024 * 1024))
 
 #define MICROPY_HW_USB_VID (0x2E8A)
 #define MICROPY_HW_USB_PID (0x1002)
@@ -10,11 +12,3 @@
 #define MICROPY_HW_UART1_RX  (9)
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (11)
-
-// User LED GPIO25
-
-// VBUS_SENSE GPIO24
-
-// BAT_SENSE GPIO29
-
-// Boot button GPIO23
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant.cmake b/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..84c75ad020b47
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant.cmake
@@ -0,0 +1,6 @@
+set(PICO_BOARD "pimoroni_picolipo_4mb")
+
+# Override the MicroPython board name
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Pimoroni Pico LiPo 4MB"
+)
\ No newline at end of file
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant_FLASH_16M.cmake b/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant_FLASH_16M.cmake
new file mode 100644
index 0000000000000..0cf7cbd8f9b2f
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO/mpconfigvariant_FLASH_16M.cmake
@@ -0,0 +1,6 @@
+set(PICO_BOARD "pimoroni_picolipo_16mb")
+
+# Override the MicroPython board name
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Pimoroni Pico LiPo 16MB"
+)
\ No newline at end of file
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO/pins.csv b/ports/rp2/boards/PIMORONI_PICOLIPO/pins.csv
new file mode 100644
index 0000000000000..a309163234d82
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO/pins.csv
@@ -0,0 +1,31 @@
+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
+BOOT,GPIO23
+VBUS_SENSE,GPIO24
+LED,GPIO25
+BAT_SENSE,GPIO29
\ No newline at end of file
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake
deleted file mode 100644
index b98ff4495658f..0000000000000
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake
+++ /dev/null
@@ -1 +0,0 @@
-# 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
deleted file mode 100644
index a90ef6783d669..0000000000000
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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 (15 * 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)
-
-// User LED GPIO25
-
-// VBUS_SENSE GPIO24
-
-// BAT_SENSE GPIO29
-
-// Boot button GPIO23
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv
deleted file mode 100644
index e75354485d94a..0000000000000
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv
+++ /dev/null
@@ -1 +0,0 @@
-LED,GPIO25
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
deleted file mode 100644
index cb06c746b62b0..0000000000000
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "deploy": [
-        "../deploy.md"
-    ],
-    "docs": "",
-    "features": [
-        "Battery Charging",
-        "Dual-core",
-        "External Flash",
-        "JST-SH",
-        "USB-C"
-    ],
-    "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_PICOLIPO_4MB/pins.csv b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv
deleted file mode 100644
index e75354485d94a..0000000000000
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv
+++ /dev/null
@@ -1 +0,0 @@
-LED,GPIO25

From 1557014ea4e88a1dfbef028afa393e6d2c3e6a9e Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 3 Jul 2024 15:45:52 +0100
Subject: [PATCH 1271/3129] rp2/boards/PIMORONI_TINY2040: Add an 8MB variant to
 Tiny 2040.

Add an 8MB "PIMORONI_TINY2040" variant.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/boards/PIMORONI_TINY2040/board.json    |  3 +++
 .../rp2/boards/PIMORONI_TINY2040/mpconfigboard.h | 13 ++++---------
 .../PIMORONI_TINY2040/mpconfigvariant.cmake      |  6 ++++++
 .../mpconfigvariant_FLASH_8M.cmake               |  6 ++++++
 ports/rp2/boards/PIMORONI_TINY2040/pins.csv      | 16 ++++++++++++++++
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant_FLASH_8M.cmake

diff --git a/ports/rp2/boards/PIMORONI_TINY2040/board.json b/ports/rp2/boards/PIMORONI_TINY2040/board.json
index 207647f6b28f6..19aad2d11ea76 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/board.json
+++ b/ports/rp2/boards/PIMORONI_TINY2040/board.json
@@ -16,5 +16,8 @@
     "product": "Tiny2040",
     "thumbnail": "",
     "url": "https://shop.pimoroni.com/products/tiny-2040",
+    "variants": {
+        "FLASH_8M": "8 MiB Flash"
+    },
     "vendor": "Pimoroni"
 }
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
index ea40a8071b77b..a38e09aca8de5 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
@@ -1,7 +1,9 @@
 // https://shop.pimoroni.com/products/tiny-2040
 
-#define MICROPY_HW_BOARD_NAME          "Pimoroni Tiny 2040"
-#define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
+#ifndef MICROPY_HW_BOARD_NAME
+#define MICROPY_HW_BOARD_NAME          "Pimoroni Tiny 2040 8MB"
+#endif
+#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (1 * 1024 * 1024))
 
 #define MICROPY_HW_USB_VID (0x16D0)
 #define MICROPY_HW_USB_PID (0x08C7)
@@ -9,10 +11,3 @@
 // I2C0 (non-default)
 #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
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant.cmake b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..f7e122613b7cf
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant.cmake
@@ -0,0 +1,6 @@
+set(PICO_BOARD "pimoroni_tiny2040_2mb")
+
+# Override the MicroPython board name
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Pimoroni Tiny 2040 2MB"
+)
\ No newline at end of file
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant_FLASH_8M.cmake b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant_FLASH_8M.cmake
new file mode 100644
index 0000000000000..dd35f8f0acb09
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigvariant_FLASH_8M.cmake
@@ -0,0 +1,6 @@
+set(PICO_BOARD "pimoroni_tiny2040")
+
+# Override the MicroPython board name
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Pimoroni Tiny 2040 8MB"
+)
\ No newline at end of file
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/pins.csv b/ports/rp2/boards/PIMORONI_TINY2040/pins.csv
index e4add1b0be897..4f38743071c69 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/pins.csv
+++ b/ports/rp2/boards/PIMORONI_TINY2040/pins.csv
@@ -1 +1,17 @@
+GP0,GPIO0
+GP1,GPIO1
+GP2,GPIO2
+GP3,GPIO3
+GP4,GPIO4
+GP5,GPIO5
+GP6,GPIO6
+GP7,GPIO7
+LED_RED,GPIO18
+LED_GREEN,GPIO19
+LED_BLUE,GPIO20
+BOOT,GPIO23
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+GP29,GPIO29
 LED,GPIO19

From e7ff0b8a31a7f36cc1b3dfb7e5fd7b8805ff85ce Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 4 Jul 2024 10:19:26 +0100
Subject: [PATCH 1272/3129] rp2/memmap_mp.ld: Lower the minimum GC heap to 32K.

Reduce mimimum heap requirement.  This value allows more room for large,
static buffers in user C modules (such as graphics buffers or otherwise)
which might be allocated outside of MicroPython's heap to guarantee
alignment or avoid fragmentation.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/memmap_mp.ld | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/memmap_mp.ld b/ports/rp2/memmap_mp.ld
index 0ed9509b8281d..a5799cd88be0e 100644
--- a/ports/rp2/memmap_mp.ld
+++ b/ports/rp2/memmap_mp.ld
@@ -256,9 +256,13 @@ SECTIONS
     __StackBottom = __StackTop - SIZEOF(.stack_dummy);
     PROVIDE(__stack = __StackTop);
 
-    /* Check GC heap is at least 128 KB */
-    /* On a RP2040 using all SRAM this should always be the case. */
-    ASSERT((__GcHeapEnd - __GcHeapStart) > 128*1024, "GcHeap is too small")
+    /* Check GC heap is at least 32 KB */
+    /* This is quarter the minimum RAM suggested for full-featured MicroPython.
+     * This value accounts for large static buffers included in user C or C++
+     * modules, which might significantly reduce the available heap but also
+     * lower demand for memory at runtime.
+     */
+    ASSERT((__GcHeapEnd - __GcHeapStart) > 32*1024, "GcHeap is too small")
 
     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 ad3552ae2cb5be65a8d61dc1c3bb2014d7ef4cae Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Mon, 8 Jul 2024 15:34:18 +0100
Subject: [PATCH 1273/3129] rp2/rp2_pio: Make PIO IRQ handlers have lazy
 initialisation.

This change has no impact on vanilla MicroPython builds, but is intended to
avoid RP2's PIO implementation from trampling PIO usage in USER_C_MODULES.

This is consistent with PIOs tracking of used state machines and managed
programs, and makes working with PIO in USER_C_MODULES much less of an
uphill battle.

Since PIO deinit runs before gc_sweep_all it's impossible to work around
this wrinkle otherwise.  A module finalizer does not get the opportunity to
put the PIOs back into a state which wont crash rp2_pio_deinit.

Changes are:
- init: Avoid exclusive handlers being added to all PIOs and add them only
  when needed.
- deinit: Only remove handlers we have set.
- rp2_pio_irq: Add the exlusive handler if needed.
- rp2_state_machine_irq: Add the exclusive handler if needed.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/rp2_pio.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index da62e6bec9e8d..0ca91656f84ef 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -104,6 +104,23 @@ static void pio1_irq0(void) {
     pio_irq0(pio1);
 }
 
+// Returns the correct irq0 handler wrapper for a given pio
+static inline irq_handler_t rp2_pio_get_irq_handler(PIO pio) {
+    return pio == pio0 ? pio0_irq0 : pio1_irq0;
+}
+
+// Add the irq0 handler if it's not added, and if no other handler is present
+void rp2_pio_irq_set_exclusive_handler(PIO pio, uint irq) {
+    irq_handler_t current = irq_get_exclusive_handler(irq);
+    // If the IRQ is set and isn't our handler, or a shared handler is set, then raise an error
+    if ((current && current != rp2_pio_get_irq_handler(pio)) || irq_has_shared_handler(irq)) {
+        mp_raise_ValueError("irq claimed by external resource");
+        // If the IRQ is not set, add our handler
+    } else if (!current) {
+        irq_set_exclusive_handler(irq, rp2_pio_get_irq_handler(pio));
+    }
+}
+
 // 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);
@@ -143,15 +160,18 @@ 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)));
-    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 << PIO1_IRQ_0), false);
-    irq_remove_handler(PIO0_IRQ_0, pio0_irq0);
-    irq_remove_handler(PIO1_IRQ_0, pio1_irq0);
+    if (irq_get_exclusive_handler(PIO0_IRQ_0) == pio0_irq0) {
+        irq_set_enabled(PIO0_IRQ_0, false);
+        irq_remove_handler(PIO0_IRQ_0, pio0_irq0);
+    }
+    if (irq_get_exclusive_handler(PIO1_IRQ_0) == pio1_irq0) {
+        irq_set_enabled(PIO1_IRQ_0, false);
+        irq_remove_handler(PIO1_IRQ_0, pio1_irq0);
+    }
 
     rp2_state_machine_reset_all();
 
@@ -379,6 +399,7 @@ static mp_obj_t rp2_pio_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
         // Enable IRQ if a handler is given.
         if (args[ARG_handler].u_obj != mp_const_none) {
+            rp2_pio_irq_set_exclusive_handler(self->pio, self->irq);
             self->pio->inte0 = irq->trigger;
             irq_set_enabled(self->irq, true);
         }
@@ -872,6 +893,7 @@ static mp_obj_t rp2_state_machine_irq(size_t n_args, const mp_obj_t *pos_args, m
         }
 
         if (self->pio->inte0) {
+            rp2_pio_irq_set_exclusive_handler(self->pio, self->irq);
             irq_set_enabled(self->irq, true);
         }
     }

From d2e33fe3096eec60d7017b0f17c4ddb6910a4d0b Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Fri, 2 Aug 2024 14:16:57 +0100
Subject: [PATCH 1274/3129] rp2/machine_i2s: Deinit all active I2S instances on
 soft reset.

Add `machine_i2s_deinit_all` to teardown any active I2S instances on soft
reset.  Prior to this fix, code using I2S required a try/finally in order
to avoid a hard fault on soft reset.

Fixes issue #14339.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/machine_i2s.c | 9 +++++++++
 ports/rp2/main.c        | 1 +
 ports/rp2/modmachine.h  | 1 +
 3 files changed, 11 insertions(+)

diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 47eb5350a6439..b17d38336ccf1 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -171,6 +171,15 @@ void machine_i2s_init0(void) {
     }
 }
 
+void machine_i2s_deinit_all(void) {
+    for (uint8_t i = 0; i < MAX_I2S_RP2; i++) {
+        machine_i2s_obj_t *i2s = MP_STATE_PORT(machine_i2s_obj[i]);
+        if (i2s) {
+            mp_machine_i2s_deinit(i2s);
+        }
+    }
+}
+
 static int8_t get_frame_mapping_index(int8_t bits, format_t format) {
     if (format == MONO) {
         if (bits == 16) {
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 3b4d351a78792..0f2721f174961 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -214,6 +214,7 @@ int main(int argc, char **argv) {
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
+        machine_i2s_deinit_all();
         rp2_dma_deinit();
         rp2_pio_deinit();
         #if MICROPY_PY_BLUETOOTH
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 3d0c726cd917e..e17ad67b0301d 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -6,6 +6,7 @@
 void machine_pin_init(void);
 void machine_pin_deinit(void);
 void machine_i2s_init0(void);
+void machine_i2s_deinit_all(void);
 void machine_pwm_deinit_all(void);
 
 struct _machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o);

From afba3e054041bbad961fad61df7c4797ab35d9e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 31 Jul 2024 12:33:33 +1000
Subject: [PATCH 1275/3129] py/emitnative: Fix case of clobbered REG_TEMP0 when
 loading const obj.

The `emit_load_reg_with_object()` helper function will clobber `REG_TEMP0`.
This is currently OK on architectures where `REG_RET` and `REG_TEMP0` are
the same (all architectures except RV32), because all callers of
`emit_load_reg_with_object()` use either `REG_RET` or `REG_TEMP0` as the
destination register.  But on RV32 these registers are different and so
when `REG_RET` is the destination, `REG_TEMP0` is clobbered, leading to
incorrectly generated machine code.

This commit fixes the issue simply by using `REG_TEMP0` as the destination
register for all uses of `emit_load_reg_with_object()`, and adds a comment
to make sure the caller of this function is careful.

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

diff --git a/py/emitnative.c b/py/emitnative.c
index 88ebf0bfcf3de..66c345b233d76 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -357,6 +357,7 @@ static void emit_native_mov_reg_qstr(emit_t *emit, int arg_reg, qstr qst) {
     #endif
 }
 
+// This function may clobber REG_TEMP0 (and `reg_dest` can be REG_TEMP0).
 static void emit_native_mov_reg_qstr_obj(emit_t *emit, int reg_dest, qstr qst) {
     #if MICROPY_PERSISTENT_CODE_SAVE
     emit_load_reg_with_object(emit, reg_dest, MP_OBJ_NEW_QSTR(qst));
@@ -1117,6 +1118,7 @@ static exc_stack_entry_t *emit_native_pop_exc_stack(emit_t *emit) {
     return e;
 }
 
+// This function will clobber REG_TEMP0 (and `reg` can be REG_TEMP0).
 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);
@@ -1391,9 +1393,9 @@ 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_native_pre(emit);
-    need_reg_single(emit, REG_RET, 0);
-    emit_load_reg_with_object(emit, REG_RET, obj);
-    emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
+    need_reg_single(emit, REG_TEMP0, 0);
+    emit_load_reg_with_object(emit, REG_TEMP0, obj);
+    emit_post_push_reg(emit, VTYPE_PYOBJ, REG_TEMP0);
 }
 
 static void emit_native_load_null(emit_t *emit) {

From b0c89377d0f0a4624577da8ca956f7c33d6b1882 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 6 Aug 2024 09:59:22 +1000
Subject: [PATCH 1276/3129] py/modmath: Add option to work around -inf bug in a
 port's tgamma.

This is needed for a workaround on esp32 port (in child commit),
which produces incorrect results otherwise.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/modmath.c  | 10 ++++++++++
 py/mpconfig.h |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/py/modmath.c b/py/modmath.c
index db30f0e62559c..4d51a28d0bbb0 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -196,7 +196,17 @@ MATH_FUN_1(erf, erf)
 // erfc(x): return the complementary error function of x
 MATH_FUN_1(erfc, erfc)
 // gamma(x): return the gamma function of x
+#if MICROPY_PY_MATH_GAMMA_FIX_NEGINF
+static mp_float_t MICROPY_FLOAT_C_FUN(tgamma_func)(mp_float_t x) {
+    if (isinf(x) && x < 0) {
+        math_error();
+    }
+    return MICROPY_FLOAT_C_FUN(tgamma)(x);
+}
+MATH_FUN_1(gamma, tgamma_func)
+#else
 MATH_FUN_1(gamma, tgamma)
+#endif
 // lgamma(x): return the natural logarithm of the gamma function of x
 MATH_FUN_1(lgamma, lgamma)
 #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 98893ceb6d97b..94fdca7d7a97d 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1393,6 +1393,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MATH_POW_FIX_NAN (0)
 #endif
 
+// Whether to provide fix for gamma(-inf) to raise ValueError
+#ifndef MICROPY_PY_MATH_GAMMA_FIX_NEGINF
+#define MICROPY_PY_MATH_GAMMA_FIX_NEGINF (0)
+#endif
+
 // Whether to provide "cmath" module
 #ifndef MICROPY_PY_CMATH
 #define MICROPY_PY_CMATH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)

From 6fead318322bb21e30fdcbdccf343e02dc51990f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 25 Jul 2024 12:11:32 +1000
Subject: [PATCH 1277/3129] esp32: Enable workaround for math.gamma(-inf)
 result.

Without this commit, math.gamma(-float("inf")) returns inf instead of
raising a math domain ValueError. Needed for float/math_domain_special.py
test to pass on esp32.

Root cause is an upstream libm bug, has been reported to ESP-IDF.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b9e53a4fa8cd9..3349e56e46d41 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -282,6 +282,10 @@ typedef long mp_off_t;
 #define MICROPY_PY_MACHINE_BOOTLOADER       (0)
 #endif
 
+// Workaround for upstream bug https://github.com/espressif/esp-idf/issues/14273
+// Can be removed if a fix is available in supported ESP-IDF versions.
+#define MICROPY_PY_MATH_GAMMA_FIX_NEGINF (1)
+
 #ifndef MICROPY_BOARD_STARTUP
 #define MICROPY_BOARD_STARTUP boardctrl_startup
 #endif

From 5ff6c12c65b5ab5efdbc10718caa2375ca5ab775 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 3 Aug 2024 18:04:43 +1000
Subject: [PATCH 1278/3129] esp32/main: Store native code as linked list
 instead of list on GC heap.

Finalisers that run during `gc_sweep_all()` may run native code, for
example if an open file is closed and the underlying block device is
implemented in native code, then the filesystem driver (eg FAT) may call
into the native code.

Therefore, native code must be freed after the call to `gc_sweep_all()`.
That can only be achieved if the GC heap is not used to store the list of
allocated native code blocks.  Instead, this commit makes the native code
blocks a linked list.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c | 48 ++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 62dd7ae3cccf6..ccec6c8cd81f4 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -78,6 +78,15 @@
 #define MP_TASK_STACK_LIMIT_MARGIN (1024)
 #endif
 
+typedef struct _native_code_node_t {
+    struct _native_code_node_t *next;
+    uint32_t data[];
+} native_code_node_t;
+
+static native_code_node_t *native_code_head = NULL;
+
+static void esp_native_code_free_all(void);
+
 int vprintf_null(const char *format, va_list ap) {
     // do nothing: this is used as a log target during raw repl mode
     return 0;
@@ -130,8 +139,6 @@ 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
@@ -182,18 +189,11 @@ 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();
 
+    // Free any native code pointers that point to iRAM.
+    esp_native_code_free_all();
+
     mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
 
     // deinitialise peripherals
@@ -232,21 +232,27 @@ void nlr_jump_fail(void *val) {
     esp_restart();
 }
 
+static void esp_native_code_free_all(void) {
+    while (native_code_head != NULL) {
+        native_code_node_t *next = native_code_head->next;
+        heap_caps_free(native_code_head);
+        native_code_head = next;
+    }
+}
+
 void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     len = (len + 3) & ~3;
-    uint32_t *p = heap_caps_malloc(len, MALLOC_CAP_EXEC);
-    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);
+    size_t len_node = sizeof(native_code_node_t) + len;
+    native_code_node_t *node = heap_caps_malloc(len_node, MALLOC_CAP_EXEC);
+    if (node == NULL) {
+        m_malloc_fail(len_node);
     }
-    mp_obj_list_append(MP_STATE_PORT(native_code_pointers), MP_OBJ_TO_PTR(p));
+    node->next = native_code_head;
+    native_code_head = node;
+    void *p = node->data;
     if (reloc) {
         mp_native_relocate(reloc, buf, (uintptr_t)p);
     }
     memcpy(p, buf, len);
     return p;
 }
-
-MP_REGISTER_ROOT_POINTER(mp_obj_t native_code_pointers);

From a4b3825bd4d3eee3294c9a73c9b8a2ada0909ced Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Aug 2024 16:41:17 +1000
Subject: [PATCH 1279/3129] tests/extmod: Rename machine_timer exp file to
 machine_soft_timer.

This was missed in 9ba04cc7563ec934ca14d66aa18ae3563c8d1aea

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/{machine_timer.py.exp => machine_soft_timer.py.exp} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/extmod/{machine_timer.py.exp => machine_soft_timer.py.exp} (100%)

diff --git a/tests/extmod/machine_timer.py.exp b/tests/extmod/machine_soft_timer.py.exp
similarity index 100%
rename from tests/extmod/machine_timer.py.exp
rename to tests/extmod/machine_soft_timer.py.exp

From 1e98c4cb75bf3015d816455fc46ba28d5bcd9275 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 25 Jul 2024 12:39:34 +1000
Subject: [PATCH 1280/3129] tests/extmod: Add machine_spi_rate test.

Based on machine_i2s_rate, allows testing basic SPI functionality and
timings.

Implemented and confirmed working for rp2, esp32, and pyboard.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/machine_spi_rate.py     | 152 +++++++++++++++++++++++++++
 tests/extmod/machine_spi_rate.py.exp |  39 +++++++
 2 files changed, 191 insertions(+)
 create mode 100644 tests/extmod/machine_spi_rate.py
 create mode 100644 tests/extmod/machine_spi_rate.py.exp

diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
new file mode 100644
index 0000000000000..df9e3fbd0de85
--- /dev/null
+++ b/tests/extmod/machine_spi_rate.py
@@ -0,0 +1,152 @@
+# Test machine.SPI data transfer rates
+import sys
+
+
+try:
+    import time
+    from machine import Pin, SPI
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+MAX_DELTA_MS = 8
+
+# Configure pins based on the port/board details.
+# Values are tuples of (spi_id, sck, mosi, miso)
+if "pyboard" in sys.platform:
+    spi_instances = (
+        (1, None, None, None),  # "explicit choice of sck/mosi/miso is not implemented"
+        (2, None, None, None),
+    )
+elif "rp2" in sys.platform:
+    spi_instances = ((0, Pin(18), Pin(19), Pin(16)),)
+elif "esp32" in sys.platform:
+    spi_instances = [
+        (1, Pin(18), Pin(19), Pin(21)),
+    ]
+    if "ESP32C3" not in str(sys.implementation):
+        spi_instances.append((2, Pin(18), Pin(19), Pin(21)))
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def get_real_baudrate(spi):
+    # Return the 'real' baudrate for a SPI object, from parsing 'print' output
+    # i.e.
+    # SPI(id=1, baudrate=500000, polarity=0, phase=0, bits=8, firstbit=0, sck=14, mosi=13, miso=12)
+    #
+    # Note the 'real' rate may be quite different to the requested rate, i.e.
+    # on ports where the SPI hardware only supports power of 2 clock dividers.
+    #
+    # Implementation is somewhat fiddly and inefficient to avoid dependency on
+    # 're' module,
+    s = str(spi)
+    s = s.split("baudrate=")[1].split(",")[0]
+    return int(s)
+
+
+def test_instances():
+    print_results = True
+    for spi_id, sck, mosi, miso in spi_instances:
+        for baudrate in (
+            100_000,
+            250_000,
+            800_000,
+            1_000_000,
+            2_000_000,
+            4_000_000,
+            8_000_000,
+        ):
+            test_spi(
+                spi_id,
+                sck,
+                mosi,
+                miso,
+                baudrate,
+                0,
+                0,
+                print_results,
+            )
+
+        for baudrate in (100_000, 4_000_000):
+            # Test the other polarity and phase settings
+            for polarity, phase in ((0, 1), (1, 0), (1, 1)):
+                test_spi(
+                    spi_id,
+                    sck,
+                    mosi,
+                    miso,
+                    baudrate,
+                    polarity,
+                    phase,
+                    print_results,
+                )
+
+        # Ensure the same test output regardless of how many SPI instances are tested
+        print_results = False
+
+
+wr_short = b"abcdefghijklmnop" * 10
+rd_short = bytearray(len(wr_short))
+
+wr_long = wr_short * 20
+rd_long = bytearray(len(wr_long))
+
+
+def test_spi(spi_id, sck, mosi, miso, baudrate, polarity, phase, print_results):
+    if sck:
+        s = SPI(
+            spi_id,
+            sck=sck,
+            mosi=mosi,
+            miso=miso,
+            baudrate=baudrate,
+            polarity=polarity,
+            phase=phase,
+        )
+    else:
+        s = SPI(spi_id, baudrate=baudrate, polarity=polarity, phase=phase)
+
+    # to keep the test runtime down, use shorter buffer for lower baud rate
+    wr_buf = wr_long if baudrate > 500_000 else wr_short
+    rd_buf = rd_long if baudrate > 500_000 else rd_short
+
+    real_baudrate = get_real_baudrate(s)
+    assert real_baudrate
+    transfer_time_ms = len(wr_buf) * 8 * 1000 // real_baudrate
+
+    def test_write_readinto():
+        s.write_readinto(wr_buf, rd_buf)
+
+    def test_write():
+        s.write(wr_buf)
+
+    def test_readinto():
+        s.readinto(rd_buf)
+
+    for test_func, name in (
+        (test_write_readinto, "write_readinto"),
+        (test_write, "write"),
+        (test_readinto, "readinto"),
+    ):
+        t0 = time.ticks_ms()
+        test_func()
+        transfer_time = time.ticks_diff(time.ticks_ms(), t0)
+        t_delta = abs(transfer_time - transfer_time_ms)
+        t_ok = t_delta < MAX_DELTA_MS
+
+        if print_results or not t_ok:
+            print(
+                None if print_results else spi_id,
+                baudrate,
+                polarity,
+                phase,
+                name,
+                t_ok or t_delta,
+            )
+
+    s.deinit()
+
+
+test_instances()
diff --git a/tests/extmod/machine_spi_rate.py.exp b/tests/extmod/machine_spi_rate.py.exp
new file mode 100644
index 0000000000000..6102016154d6a
--- /dev/null
+++ b/tests/extmod/machine_spi_rate.py.exp
@@ -0,0 +1,39 @@
+None 100000 0 0 write_readinto True
+None 100000 0 0 write True
+None 100000 0 0 readinto True
+None 250000 0 0 write_readinto True
+None 250000 0 0 write True
+None 250000 0 0 readinto True
+None 800000 0 0 write_readinto True
+None 800000 0 0 write True
+None 800000 0 0 readinto True
+None 1000000 0 0 write_readinto True
+None 1000000 0 0 write True
+None 1000000 0 0 readinto True
+None 2000000 0 0 write_readinto True
+None 2000000 0 0 write True
+None 2000000 0 0 readinto True
+None 4000000 0 0 write_readinto True
+None 4000000 0 0 write True
+None 4000000 0 0 readinto True
+None 8000000 0 0 write_readinto True
+None 8000000 0 0 write True
+None 8000000 0 0 readinto True
+None 100000 0 1 write_readinto True
+None 100000 0 1 write True
+None 100000 0 1 readinto True
+None 100000 1 0 write_readinto True
+None 100000 1 0 write True
+None 100000 1 0 readinto True
+None 100000 1 1 write_readinto True
+None 100000 1 1 write True
+None 100000 1 1 readinto True
+None 4000000 0 1 write_readinto True
+None 4000000 0 1 write True
+None 4000000 0 1 readinto True
+None 4000000 1 0 write_readinto True
+None 4000000 1 0 write True
+None 4000000 1 0 readinto True
+None 4000000 1 1 write_readinto True
+None 4000000 1 1 write True
+None 4000000 1 1 readinto True

From 1fe3b47c81de7b815a330b40e973fd3eb5894812 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 5 Aug 2024 12:43:10 +1000
Subject: [PATCH 1281/3129] qemu-arm: Fix tinytest test profile when updating
 set of dirs/files.

Updating a set must use `.update()` rather than `.add()`.

Also apply the same pattern to qemu-riscv to prevent the same issue when
directories/files are added to that port's `tests_profile.txt` file.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/tests_profile.txt   | 4 ++--
 ports/qemu-riscv/tests_profile.txt | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/qemu-arm/tests_profile.txt b/ports/qemu-arm/tests_profile.txt
index c55185a0eb3c5..101943b7c6ab0 100644
--- a/ports/qemu-arm/tests_profile.txt
+++ b/ports/qemu-arm/tests_profile.txt
@@ -1,10 +1,10 @@
 # Port-specific test directories.
 
-test_dirs.add(("inlineasm", "qemu-arm"))
+test_dirs.update(("inlineasm", "ports/qemu-arm"))
 
 # Port-specific tests exclusion list.
 
-exclude_tests.add(
+exclude_tests.update(
     (
         # inline asm FP tests (require Cortex-M4)
         "inlineasm/asmfpaddsub.py",
diff --git a/ports/qemu-riscv/tests_profile.txt b/ports/qemu-riscv/tests_profile.txt
index 1079ca18124dc..3d16e971be01e 100644
--- a/ports/qemu-riscv/tests_profile.txt
+++ b/ports/qemu-riscv/tests_profile.txt
@@ -1,3 +1,7 @@
+# Port-specific test directories.
+
+test_dirs.update(())
+
 # Port-specific tests exclusion list.
 
-exclude_tests = exclude_tests.union(())
+exclude_tests.update(())

From aa0b8f340d0e660cf3c1688fa1e755fdbc3ef574 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 Aug 2024 15:46:05 +1000
Subject: [PATCH 1282/3129] mpy-cross/main: Use MICROPY_BANNER_NAME_AND_VERSION
 for --version.

Gives the same output and keeps things consistent across the code base.

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

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 72b6e10fce9d2..7ab95149c720c 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -248,7 +248,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
             if (strcmp(argv[a], "-X") == 0) {
                 a += 1;
             } else if (strcmp(argv[a], "--version") == 0) {
-                printf("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
+                printf(MICROPY_BANNER_NAME_AND_VERSION
                     "; mpy-cross emitting mpy v" MP_STRINGIFY(MPY_VERSION) "." MP_STRINGIFY(MPY_SUB_VERSION) "\n");
                 return 0;
             } else if (strcmp(argv[a], "-v") == 0) {

From 55b2720687b6bcd71b8a5c9a5d87bea53c57743a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 25 Jul 2024 18:42:30 +0200
Subject: [PATCH 1283/3129] shared/runtime/gchelper: Add RISC-V RV64I native
 gchelper.

Add native gchelper support for 64 bits RISC-V RV64I targets.

Now that RV64 is under CI, this also enables platform-specific ghelper
in the Unix port.

Also changes the data type holding the register contents to something more
appropriate, so in the remote eventuality somebody wants to use this with
RV128 all they have to do is update the `__riscv_xlen` check.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/unix/mpconfigport.h         |  2 +-
 shared/runtime/gchelper.h         |  2 +-
 shared/runtime/gchelper_generic.c | 29 ++++++++---------
 shared/runtime/gchelper_rv64i.s   | 52 +++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 16 deletions(-)
 create mode 100644 shared/runtime/gchelper_rv64i.s

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 1086baea06c60..9c9d9228e760e 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -105,7 +105,7 @@ typedef long mp_off_t;
 // Always enable GC.
 #define MICROPY_ENABLE_GC           (1)
 
-#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
+#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__) || (defined(__riscv) && (__riscv_xlen == 64)))
 // Fall back to setjmp() implementation for discovery of GC pointers in registers.
 #define MICROPY_GCREGS_SETJMP (1)
 #endif
diff --git a/shared/runtime/gchelper.h b/shared/runtime/gchelper.h
index a863fb9aa880a..1e85e06f46ef9 100644
--- a/shared/runtime/gchelper.h
+++ b/shared/runtime/gchelper.h
@@ -41,7 +41,7 @@ typedef uintptr_t gc_helper_regs_t[4];
 typedef uintptr_t gc_helper_regs_t[10];
 #elif defined(__aarch64__)
 typedef uintptr_t gc_helper_regs_t[11]; // x19-x29
-#elif defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen == 32)
+#elif defined(__riscv) && (__riscv_xlen <= 64)
 typedef uintptr_t gc_helper_regs_t[12]; // S0-S11
 #endif
 
diff --git a/shared/runtime/gchelper_generic.c b/shared/runtime/gchelper_generic.c
index f1087e1990f60..0937231374057 100644
--- a/shared/runtime/gchelper_generic.c
+++ b/shared/runtime/gchelper_generic.c
@@ -150,23 +150,24 @@ static void gc_helper_get_regs(gc_helper_regs_t arr) {
     arr[10] = x29;
 }
 
-#elif defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen == 32)
+#elif defined(__riscv) && (__riscv_xlen <= 64)
 
-// Fallback implementation for RV32I, prefer gchelper_rv32i.s
+// Fallback implementation for RV32I and RV64I, prefer gchelper_rv32i.s
+// for RV32I targets or gchelper_rv64i.s for RV64I targets.
 
 static void gc_helper_get_regs(gc_helper_regs_t arr) {
-    register long s0 asm ("x8");
-    register long s1 asm ("x9");
-    register long s2 asm ("x18");
-    register long s3 asm ("x19");
-    register long s4 asm ("x20");
-    register long s5 asm ("x21");
-    register long s6 asm ("x22");
-    register long s7 asm ("x23");
-    register long s8 asm ("x24");
-    register long s9 asm ("x25");
-    register long s10 asm ("x26");
-    register long s11 asm ("x27");
+    register uintptr_t s0 asm ("x8");
+    register uintptr_t s1 asm ("x9");
+    register uintptr_t s2 asm ("x18");
+    register uintptr_t s3 asm ("x19");
+    register uintptr_t s4 asm ("x20");
+    register uintptr_t s5 asm ("x21");
+    register uintptr_t s6 asm ("x22");
+    register uintptr_t s7 asm ("x23");
+    register uintptr_t s8 asm ("x24");
+    register uintptr_t s9 asm ("x25");
+    register uintptr_t s10 asm ("x26");
+    register uintptr_t s11 asm ("x27");
     arr[0] = s0;
     arr[1] = s1;
     arr[2] = s2;
diff --git a/shared/runtime/gchelper_rv64i.s b/shared/runtime/gchelper_rv64i.s
new file mode 100644
index 0000000000000..7f3dcb8a39431
--- /dev/null
+++ b/shared/runtime/gchelper_rv64i.s
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+    .global gc_helper_get_regs_and_sp
+    .type   gc_helper_get_regs_and_sp, @function
+
+gc_helper_get_regs_and_sp:
+
+    /* Store registers into the given array. */
+
+    sw    x8,  0(x10)  /* Save S0.  */
+    sw    x9,  8(x10)  /* Save S1.  */
+    sw   x18, 16(x10)  /* Save S2.  */
+    sw   x19, 24(x10)  /* Save S3.  */
+    sw   x20, 32(x10)  /* Save S4.  */
+    sw   x21, 40(x10)  /* Save S5.  */
+    sw   x22, 48(x10)  /* Save S6.  */
+    sw   x23, 56(x10)  /* Save S7.  */
+    sw   x24, 64(x10)  /* Save S8.  */
+    sw   x25, 72(x10)  /* Save S9.  */
+    sw   x26, 80(x10)  /* Save S10. */
+    sw   x27, 88(x10)  /* Save S11. */
+
+    /* Return the stack pointer. */
+
+    add  x10, x0, x2
+    jalr  x0, x1, 0
+
+    .size gc_helper_get_regs_and_sp, .-gc_helper_get_regs_and_sp

From 1216f2c313fbf68cb7f18c4914ddf843c31d9191 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 10 Jul 2024 16:19:46 +0300
Subject: [PATCH 1284/3129] extmod/libmetal: Remove source file listed twice in
 sources.

This causes multiple definition of symbols on some builds.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/libmetal/libmetal.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extmod/libmetal/libmetal.mk b/extmod/libmetal/libmetal.mk
index 852b04289833b..7cda12a31333d 100644
--- a/extmod/libmetal/libmetal.mk
+++ b/extmod/libmetal/libmetal.mk
@@ -33,7 +33,6 @@ SRC_LIBMETAL_C := $(addprefix $(BUILD)/openamp/metal/,\
 	shmem.c \
 	softirq.c \
 	version.c \
-	device.c \
 	system/micropython/condition.c \
 	system/micropython/device.c \
 	system/micropython/io.c \

From 4350cbcb48599d29d77c8b557aa96b65ae7d6aeb Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 10 Jul 2024 22:49:29 +0300
Subject: [PATCH 1285/3129] extmod/modopenamp_remoteproc: Fix entry point
 address int overflow.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/modopenamp_remoteproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modopenamp_remoteproc.c b/extmod/modopenamp_remoteproc.c
index 20e4a47c18718..82719dca96145 100644
--- a/extmod/modopenamp_remoteproc.c
+++ b/extmod/modopenamp_remoteproc.c
@@ -137,7 +137,7 @@ mp_obj_t openamp_remoteproc_make_new(const mp_obj_type_t *type, size_t n_args, s
     }
 
     if (mp_obj_is_int(args[ARG_entry].u_obj)) {
-        self->rproc.bootaddr = mp_obj_get_int(args[ARG_entry].u_obj);
+        self->rproc.bootaddr = mp_obj_int_get_truncated(args[ARG_entry].u_obj);
     } else {
         #if MICROPY_PY_OPENAMP_REMOTEPROC_ELFLD_ENABLE
         // Load firmware.

From 7f49897adad10133cf1d55db9caed66326cd4416 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 11 Jul 2024 15:54:12 +0300
Subject: [PATCH 1286/3129] extmod/modopenamp: Add support for building
 Open-AMP on device side.

Tested with two VMs each running on a different core.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/extmod.mk                     | 12 +++++++++-
 extmod/modopenamp.c                  | 33 ++++++++++++++++++----------
 extmod/modopenamp_remoteproc.c       |  4 ++--
 extmod/modopenamp_remoteproc_store.c |  4 ++--
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 2207c21f0d8e9..c2298bc52130f 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -527,6 +527,7 @@ ifeq ($(MICROPY_PY_OPENAMP),1)
 OPENAMP_DIR = lib/open-amp
 LIBMETAL_DIR = lib/libmetal
 GIT_SUBMODULES += $(LIBMETAL_DIR) $(OPENAMP_DIR)
+MICROPY_PY_OPENAMP_MODE ?= 0
 include $(TOP)/extmod/libmetal/libmetal.mk
 
 INC += -I$(TOP)/$(OPENAMP_DIR)
@@ -536,12 +537,21 @@ ifeq ($(MICROPY_PY_OPENAMP_REMOTEPROC),1)
 CFLAGS += -DMICROPY_PY_OPENAMP_REMOTEPROC=1
 endif
 
+ifeq ($(MICROPY_PY_OPENAMP_MODE),0)
+CFLAGS += -DMICROPY_PY_OPENAMP_HOST=1
+CFLAGS_THIRDPARTY += -DVIRTIO_DRIVER_ONLY
+else ifeq ($(MICROPY_PY_OPENAMP_MODE),1)
+CFLAGS += -DMICROPY_PY_OPENAMP_DEVICE=1
+CFLAGS_THIRDPARTY += -DVIRTIO_DEVICE_ONLY
+else
+$(error Invalid Open-AMP mode specified: $(MICROPY_PY_OPENAMP_MODE))
+endif
+
 CFLAGS_THIRDPARTY += \
     -I$(BUILD)/openamp \
     -I$(TOP)/$(OPENAMP_DIR) \
     -I$(TOP)/$(OPENAMP_DIR)/lib/include/ \
     -DMETAL_INTERNAL \
-    -DVIRTIO_DRIVER_ONLY \
     -DNO_ATOMIC_64_SUPPORT \
     -DRPMSG_BUFFER_SIZE=512 \
 
diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index 29135d57a80b3..a10441d64a05a 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -52,11 +52,20 @@
 
 #if MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
 #define VIRTIO_DEV_ID           0xFF
+#if MICROPY_PY_OPENAMP_HOST
+#define VIRTIO_DEV_ROLE         RPMSG_HOST
+#else
+#define VIRTIO_DEV_ROLE         RPMSG_REMOTE
+#endif // MICROPY_PY_OPENAMP_HOST
 #define VIRTIO_DEV_FEATURES     (1 << VIRTIO_RPMSG_F_NS)
 
 #define VRING0_ID               0   // VRING0 ID (host to remote) fixed to 0 for linux compatibility
 #define VRING1_ID               1   // VRING1 ID (remote to host) fixed to 1 for linux compatibility
+#if MICROPY_PY_OPENAMP_HOST
 #define VRING_NOTIFY_ID         VRING0_ID
+#else
+#define VRING_NOTIFY_ID         VRING1_ID
+#endif // MICROPY_PY_OPENAMP_HOST
 
 #define VRING_COUNT             2
 #define VRING_ALIGNMENT         32
@@ -71,13 +80,15 @@
 #define VRING_BUFF_ADDR         (METAL_SHM_ADDR + 0x2000)
 #define VRING_BUFF_SIZE         (METAL_SHM_SIZE - 0x2000)
 
+#if MICROPY_PY_OPENAMP_HOST
 static const char openamp_trace_buf[128];
 #define MICROPY_PY_OPENAMP_TRACE_BUF       ((uint32_t)openamp_trace_buf)
 #define MICROPY_PY_OPENAMP_TRACE_BUF_LEN   sizeof(MICROPY_PY_OPENAMP_TRACE_BUF)
+#endif // MICROPY_PY_OPENAMP_HOST
 
 #endif // MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
 
-#if MICROPY_PY_OPENAMP_REMOTEPROC
+#if MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_REMOTEPROC
 extern mp_obj_type_t openamp_remoteproc_type;
 #endif
 
@@ -267,12 +278,11 @@ static void openamp_ns_callback(struct rpmsg_device *rdev, const char *name, uin
     }
 }
 
-#if MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+#if MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
 // The shared resource table must be initialized manually by the host here,
 // because it's not located in the data region, so the startup code doesn't
 // know about it.
-static void openamp_rsc_table_init(openamp_rsc_table_t **rsc_table_out) {
-    openamp_rsc_table_t *rsc_table = METAL_RSC_ADDR;
+static void openamp_rsc_table_init(openamp_rsc_table_t *rsc_table) {
     memset(rsc_table, 0, METAL_RSC_SIZE);
 
     rsc_table->version = 1;
@@ -299,9 +309,8 @@ static void openamp_rsc_table_init(openamp_rsc_table_t **rsc_table_out) {
     // Flush resource table.
     metal_cache_flush((uint32_t *)rsc_table, sizeof(openamp_rsc_table_t));
     #endif
-    *rsc_table_out = rsc_table;
 }
-#endif // MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
+#endif // MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_RSC_TABLE_ENABLE
 
 static mp_obj_t openamp_new_service_callback(mp_obj_t ns_callback) {
     if (MP_STATE_PORT(virtio_device) == NULL) {
@@ -342,8 +351,10 @@ void openamp_init(void) {
     metal_init(&metal_params);
 
     // Initialize the shared resource table.
-    openamp_rsc_table_t *rsc_table;
-    openamp_rsc_table_init(&rsc_table);
+    openamp_rsc_table_t *rsc_table = METAL_RSC_ADDR;
+    #if MICROPY_PY_OPENAMP_HOST
+    openamp_rsc_table_init(rsc_table);
+    #endif // MICROPY_PY_OPENAMP_HOST
 
     if (metal_register_generic_device(&shm_device) != 0) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to register metal device"));
@@ -368,7 +379,7 @@ void openamp_init(void) {
     }
 
     // Create virtio device.
-    struct virtio_device *vdev = rproc_virtio_create_vdev(RPMSG_HOST, VIRTIO_DEV_ID,
+    struct virtio_device *vdev = rproc_virtio_create_vdev(VIRTIO_DEV_ROLE, VIRTIO_DEV_ID,
         &rsc_table->vdev, rsc_io, NULL, metal_rproc_notify, NULL);
     if (vdev == NULL) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to create virtio device"));
@@ -389,8 +400,8 @@ void openamp_init(void) {
     // The remote processor detects that the virtio device is ready by polling
     // the status field in the resource table.
     rpmsg_virtio_init_shm_pool(&virtio_device->shm_pool, (void *)VRING_BUFF_ADDR, (size_t)VRING_BUFF_SIZE);
-    rpmsg_init_vdev(&virtio_device->rvdev, vdev, openamp_ns_callback, shm_io, &virtio_device->shm_pool);
 
+    rpmsg_init_vdev(&virtio_device->rvdev, vdev, openamp_ns_callback, shm_io, &virtio_device->shm_pool);
     MP_STATE_PORT(virtio_device) = virtio_device;
 }
 
@@ -399,7 +410,7 @@ static const mp_rom_map_elem_t globals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ENDPOINT_ADDR_ANY), MP_ROM_INT(RPMSG_ADDR_ANY) },
     { MP_ROM_QSTR(MP_QSTR_new_service_callback), MP_ROM_PTR(&openamp_new_service_callback_obj) },
     { MP_ROM_QSTR(MP_QSTR_Endpoint), MP_ROM_PTR(&endpoint_type) },
-    #if MICROPY_PY_OPENAMP_REMOTEPROC
+    #if MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_REMOTEPROC
     { MP_ROM_QSTR(MP_QSTR_RemoteProc), MP_ROM_PTR(&openamp_remoteproc_type) },
     #endif
 };
diff --git a/extmod/modopenamp_remoteproc.c b/extmod/modopenamp_remoteproc.c
index 82719dca96145..ed61cb6bd442f 100644
--- a/extmod/modopenamp_remoteproc.c
+++ b/extmod/modopenamp_remoteproc.c
@@ -26,7 +26,7 @@
  * OpenAMP's remoteproc class.
  */
 
-#if MICROPY_PY_OPENAMP_REMOTEPROC
+#if MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_REMOTEPROC
 
 #include "py/obj.h"
 #include "py/nlr.h"
@@ -170,4 +170,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &openamp_remoteproc_dict
     );
 
-#endif // MICROPY_PY_OPENAMP_REMOTEPROC
+#endif // MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_REMOTEPROC
diff --git a/extmod/modopenamp_remoteproc_store.c b/extmod/modopenamp_remoteproc_store.c
index aed652c485553..03022ebc83518 100644
--- a/extmod/modopenamp_remoteproc_store.c
+++ b/extmod/modopenamp_remoteproc_store.c
@@ -26,7 +26,7 @@
  * OpenAMP's remoteproc store.
  */
 
-#if MICROPY_PY_OPENAMP_REMOTEPROC
+#if MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_REMOTEPROC
 
 #include "py/obj.h"
 #include "py/nlr.h"
@@ -141,4 +141,4 @@ const struct image_store_ops openamp_remoteproc_store_ops = {
 
 #endif // MICROPY_PY_OPENAMP_REMOTEPROC_STORE_ENABLE
 
-#endif // MICROPY_PY_OPENAMP_REMOTEPROC
+#endif // MICROPY_PY_OPENAMP_HOST && MICROPY_PY_OPENAMP_REMOTEPROC

From bc7e39d549678e3c51fa667ad2097f6eb2da6987 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 13 Jul 2024 10:55:32 +0300
Subject: [PATCH 1287/3129] extmod/modopenamp: Fix Endpoint callback required
 arg.

The callback arg is not actually required.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/modopenamp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index a10441d64a05a..4ba8096f93a7a 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -221,7 +221,7 @@ static mp_obj_t endpoint_make_new(const mp_obj_type_t *type, size_t n_args, size
     enum { ARG_name, ARG_callback, ARG_src, ARG_dest };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_name, MP_ARG_OBJ | MP_ARG_REQUIRED,  {.u_rom_obj = MP_ROM_NONE } },
-        { MP_QSTR_callback, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE } },
+        { MP_QSTR_callback, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE } },
         { MP_QSTR_src, MP_ARG_INT | MP_ARG_KW_ONLY,  {.u_int = RPMSG_ADDR_ANY } },
         { MP_QSTR_dest, MP_ARG_INT | MP_ARG_KW_ONLY,  {.u_int = RPMSG_ADDR_ANY } },
     };

From 9a48ce3051744fac20762199d67ffc380c1de1f6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 20 Jul 2024 10:37:26 +0300
Subject: [PATCH 1288/3129] stm32/mpu: Define the last used MPU region number.

The reason for this change is that it makes allows custom code, that needs
to use an MPU region, to find a free one by using this macro or starting
from the max number and downwards, without concern that it might change in
the future.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/mpu.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index 5ef1466184aac..a87c04a58df5c 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -36,12 +36,18 @@
 #define MPU_REGION_QSPI3    (MPU_REGION_NUMBER3)
 #define MPU_REGION_SDRAM1   (MPU_REGION_NUMBER4)
 #define MPU_REGION_SDRAM2   (MPU_REGION_NUMBER5)
-#define MPU_REGION_OPENAMP  (MPU_REGION_NUMBER15)
 
 // Only relevant on CPUs with D-Cache, must be higher priority than SDRAM
 #define MPU_REGION_DMA_UNCACHED_1 (MPU_REGION_NUMBER6)
 #define MPU_REGION_DMA_UNCACHED_2 (MPU_REGION_NUMBER7)
 
+#ifdef MPU_REGION_NUMBER8
+#define MPU_REGION_OPENAMP  (MPU_REGION_NUMBER8)
+#define MPU_REGION_LAST_USED (MPU_REGION_NUMBER8)
+#else
+#define MPU_REGION_LAST_USED (MPU_REGION_NUMBER7)
+#endif
+
 // Attribute value to disable a region entirely, remove it from the MPU
 // (i.e. the MPU_REGION_ENABLE bit is unset.)
 #define MPU_CONFIG_DISABLE 0
@@ -135,6 +141,7 @@ static inline void mpu_config_end(uint32_t irq_state) {
 
 #define MPU_REGION_SIG      (MPU_REGION_NUMBER0)
 #define MPU_REGION_ETH      (MPU_REGION_NUMBER1)
+#define MPU_REGION_LAST_USED (MPU_REGION_NUMBER1)
 
 #define ST_DEVICE_SIGNATURE_BASE (0x08fff800)
 #define ST_DEVICE_SIGNATURE_LIMIT (0x08ffffff)

From 1743a7d7218646c2ebce5c36691638d2a60cc59a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 1 Aug 2024 17:02:17 +0300
Subject: [PATCH 1289/3129] extmod/modopenamp: Use mp_event_* functions for
 poll/wait.

These are the new helper functions to use for polling/waiting.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/modopenamp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index 4ba8096f93a7a..7d5841c40001d 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -192,13 +192,13 @@ static mp_obj_t endpoint_send(uint n_args, const mp_obj_t *pos_args, mp_map_t *k
     for (mp_uint_t start = mp_hal_ticks_ms(); ;) {
         bytes = rpmsg_send_offchannel_raw(&self->ep, src, dest, rbuf.buf, rbuf.len, false);
         if (bytes > 0 || timeout == 0) {
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_handle_nowait();
             break;
         }
         if (timeout > 0 && (mp_hal_ticks_ms() - start > timeout)) {
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("timeout waiting for a free buffer"));
         }
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(1);
     }
     return mp_obj_new_int(bytes);
 }

From 67ebe086a8948b083d84da1bf83ec82e1a9f1b85 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 1 Aug 2024 17:05:11 +0300
Subject: [PATCH 1290/3129] stm32/mpmetalport: Use mp_event_handle_nowait() for
 metal_poll.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/mpmetalport.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mpmetalport.h b/ports/stm32/mpmetalport.h
index 53f329d15b093..706249b6aa414 100644
--- a/ports/stm32/mpmetalport.h
+++ b/ports/stm32/mpmetalport.h
@@ -70,7 +70,8 @@ static inline int __metal_sleep_usec(unsigned int usec) {
 }
 
 static inline void metal_generic_default_poll(void) {
-    MICROPY_EVENT_POLL_HOOK
+    mp_event_handle_nowait();
+    __WFI();
 }
 
 #endif // MICROPY_INCLUDED_STM32_METAL_PORT_H

From 91f4a6b9e902c066c98bda3799e01c8c6c0783ea Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 1 Aug 2024 17:06:19 +0300
Subject: [PATCH 1291/3129] mimxrt/mpmetalport: Use mp_event_handle_nowait()
 for metal_poll.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mpmetalport.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/mpmetalport.h b/ports/mimxrt/mpmetalport.h
index 994d57cc39fb4..d197bbc029068 100644
--- a/ports/mimxrt/mpmetalport.h
+++ b/ports/mimxrt/mpmetalport.h
@@ -67,7 +67,8 @@ static inline int __metal_sleep_usec(unsigned int usec) {
 }
 
 static inline void metal_generic_default_poll(void) {
-    MICROPY_EVENT_POLL_HOOK
+    mp_event_handle_nowait();
+    __WFI();
 }
 
 #endif // MICROPY_INCLUDED_MIMXRT_METAL_PORT_H

From 868d311a2361c9125d70833b8757a859a539e8cc Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Sun, 30 Jun 2024 22:01:32 +1000
Subject: [PATCH 1292/3129] esp32/network_lan: Make LAN.active(state) succeed
 if already in state.

This PR ensures that `network.LAN.active(True/False)` will succeed if the
LAN is already in the desired state.

Currently, `lan.active(True)` will raise an `OSError` exception if the LAN
is already in the desired state.  This is inconsistent with
`network.WLAN.active(True/False)` and causes `lan.active(True)` to raise an
exception after a soft reset (causing common network startup scripts to
fail for LAN interfaces).

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp32/network_lan.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 7e7ebcc929185..b957c5f892456 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -312,13 +312,14 @@ static mp_obj_t lan_active(size_t n_args, const mp_obj_t *args) {
     lan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (n_args > 1) {
-        if (mp_obj_is_true(args[1])) {
+        bool make_active = mp_obj_is_true(args[1]);
+        if (make_active && !self->base.active) {
             esp_netif_set_hostname(self->base.netif, mod_network_hostname_data);
             self->base.active = (esp_eth_start(self->eth_handle) == ESP_OK);
             if (!self->base.active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet enable failed"));
             }
-        } else {
+        } else if (!make_active && self->base.active) {
             self->base.active = !(esp_eth_stop(self->eth_handle) == ESP_OK);
             if (self->base.active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet disable failed"));

From 288a03625327b025f81bb6d4e7fb76d56343172c Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Mon, 8 Jul 2024 17:33:53 +1000
Subject: [PATCH 1293/3129] esp32/network_lan: Ensure LAN MAC address is valid
 at LAN init.

`get_lan()`: If the ethernet MAC address is uninitialised, set it to the
address reserved by the ESP32 for the ETH interface.

SPI LAN devices may be initialised with a MAC address of 00:00:00:00:00:00.
So check that a valid unicast MAC address has been set (using
`LAN.config(mac=...)`) when initialising the LAN interface.

Fixes #15425.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp32/network_lan.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index b957c5f892456..416e02e12db85 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -36,6 +36,7 @@
 
 #include "esp_eth.h"
 #include "esp_eth_mac.h"
+#include "esp_mac.h"
 #include "esp_event.h"
 #include "esp_log.h"
 #include "esp_netif.h"
@@ -93,6 +94,17 @@ static void eth_event_handler(void *arg, esp_event_base_t event_base,
     }
 }
 
+static void set_mac_address(lan_if_obj_t *self, uint8_t *mac, size_t len) {
+    if (len != 6) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
+    }
+    if (((mac[0] & 0x01) != 0) ||
+        (esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, mac) != ESP_OK) ||
+        (esp_netif_set_mac(self->base.netif, mac) != ESP_OK)) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed setting MAC address"));
+    }
+}
+
 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;
 
@@ -302,6 +314,14 @@ static mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_netif_attach failed"));
     }
 
+    // If MAC address is unset, set it to the address reserved for the ESP32 ETH interface
+    uint8_t mac_addr[6];
+    esp_eth_ioctl(self->eth_handle, ETH_CMD_G_MAC_ADDR, mac_addr);
+    if ((mac_addr[0] | mac_addr[1] | mac_addr[2] | mac_addr[3] | mac_addr[4] | mac_addr[5]) == 0) {
+        esp_read_mac(mac_addr, ESP_MAC_ETH);  // Get ESP32 MAC address for ETH iface
+        set_mac_address(self, mac_addr, sizeof(mac_addr));
+    }
+
     eth_status = ETH_INITIALIZED;
 
     return MP_OBJ_FROM_PTR(&lan_obj);
@@ -356,15 +376,7 @@ static mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                     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) {
-                            mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
-                        }
-                        if (
-                            (esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf) != ESP_OK) ||
-                            (esp_netif_set_mac(self->base.netif, bufinfo.buf) != ESP_OK)
-                            ) {
-                            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed setting MAC address"));
-                        }
+                        set_mac_address(self, bufinfo.buf, bufinfo.len);
                         break;
                     }
                     default:

From 4d6d84983f370e48e81fb05fe31802e0a13fb369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Fri, 26 Apr 2024 17:48:57 +0200
Subject: [PATCH 1294/3129] extmod/modtls_mbedtls: Fix DER parsing and
 calculation of key/cert len.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`mbedtls_pk_parse_key()` expects `key_len` to include the NULL terminator
for PEM data but not for DER encoded data.  This also applies to
`mbedtls_x509_crt_parse()` and `cert_len`.

Since all PEM data contains "-----BEGIN" this is used to check if the data
is PEM (as per mbedtls code).

This can be done for both v2 and v3 of mbedtls since the fundamental
behaviour/expectation did not change.  What changed is that in v3 the
PKCS#8 DER parser now checks that the passed key buffer is fully utilized
and no bytes are remaining (all other DER formats still do not check this).

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 extmod/modtls_mbedtls.c | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 5a9487ab89323..d3fc26fad2a54 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -100,6 +100,12 @@ static void mbedtls_debug(void *ctx, int level, const char *file, int line, cons
 }
 #endif
 
+#if defined(MBEDTLS_PEM_PARSE_C)
+static int mbedtls_is_pem(const byte *data, size_t len) {
+    return (len >= 10) && (strstr((const char *)data, "-----BEGIN") != NULL);
+}
+#endif
+
 static NORETURN void mbedtls_raise_error(int err) {
     // Handle special cases.
     if (err == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
@@ -347,12 +353,19 @@ static MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_set_ciphers_obj, ssl_context_set_ci
 static void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
     size_t key_len;
     const byte *key = (const byte *)mp_obj_str_get_data(key_obj, &key_len);
-    // len should include terminating null
+
+    #if defined(MBEDTLS_PEM_PARSE_C)
+    // len should include terminating null if the data is PEM encoded
+    if (mbedtls_is_pem(key, key_len)) {
+        key_len += 1;
+    }
+    #endif
+
     int ret;
     #if MBEDTLS_VERSION_NUMBER >= 0x03000000
-    ret = mbedtls_pk_parse_key(&self->pkey, key, key_len + 1, NULL, 0, mbedtls_ctr_drbg_random, &self->ctr_drbg);
+    ret = mbedtls_pk_parse_key(&self->pkey, key, key_len, NULL, 0, mbedtls_ctr_drbg_random, &self->ctr_drbg);
     #else
-    ret = mbedtls_pk_parse_key(&self->pkey, key, key_len + 1, NULL, 0);
+    ret = mbedtls_pk_parse_key(&self->pkey, key, key_len, NULL, 0);
     #endif
     if (ret != 0) {
         mbedtls_raise_error(MBEDTLS_ERR_PK_BAD_INPUT_DATA); // use general error for all key errors
@@ -360,8 +373,15 @@ static void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, m
 
     size_t cert_len;
     const byte *cert = (const byte *)mp_obj_str_get_data(cert_obj, &cert_len);
-    // len should include terminating null
-    ret = mbedtls_x509_crt_parse(&self->cert, cert, cert_len + 1);
+
+    #if defined(MBEDTLS_PEM_PARSE_C)
+    // len should include terminating null if the data is PEM encoded
+    if (mbedtls_is_pem(cert, cert_len)) {
+        cert_len += 1;
+    }
+    #endif
+
+    ret = mbedtls_x509_crt_parse(&self->cert, cert, cert_len);
     if (ret != 0) {
         mbedtls_raise_error(MBEDTLS_ERR_X509_BAD_INPUT_DATA); // use general error for all cert errors
     }
@@ -383,8 +403,15 @@ static MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_lo
 static void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_obj) {
     size_t cacert_len;
     const byte *cacert = (const byte *)mp_obj_str_get_data(cadata_obj, &cacert_len);
-    // len should include terminating null
-    int ret = mbedtls_x509_crt_parse(&self->cacert, cacert, cacert_len + 1);
+
+    #if defined(MBEDTLS_PEM_PARSE_C)
+    // len should include terminating null if the data is PEM encoded
+    if (mbedtls_is_pem(cacert, cacert_len)) {
+        cacert_len += 1;
+    }
+    #endif
+
+    int ret = mbedtls_x509_crt_parse(&self->cacert, cacert, cacert_len);
     if (ret != 0) {
         mbedtls_raise_error(MBEDTLS_ERR_X509_BAD_INPUT_DATA); // use general error for all cert errors
     }

From 1473ed4c6460dd3d5df01e60eaa7db1c80baf8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Mon, 22 Jul 2024 15:23:27 +0200
Subject: [PATCH 1295/3129] tests/extmod/ssl_keycert.py: Add test for PKCS8
 formatted DER key.
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>
---
 tests/extmod/ssl_keycert.py     | 11 +++++++++++
 tests/extmod/ssl_keycert.py.exp |  1 +
 2 files changed, 12 insertions(+)

diff --git a/tests/extmod/ssl_keycert.py b/tests/extmod/ssl_keycert.py
index 53f064fdaff48..badc11e0339d5 100644
--- a/tests/extmod/ssl_keycert.py
+++ b/tests/extmod/ssl_keycert.py
@@ -9,6 +9,11 @@
 
 key = b"0\x82\x019\x02\x01\x00\x02A\x00\xf9\xe0}\xbd\xd7\x9cI\x18\x06\xc3\xcb\xb5\xec@r\xfbD\x18\x80\xaaWoZ{\xcc\xa3\xeb!\"\x0fY\x9e]-\xee\xe4\t!BY\x9f{7\xf3\xf2\x8f}}\r|.\xa8<\ta\xb2\xd7W\xb3\xc9\x19A\xc39\x02\x03\x01\x00\x01\x02@\x07:\x9fh\xa6\x9c6\xe1#\x10\xf7\x0b\xc4Q\xf9\x01\x9b\xee\xb9\x8a4\r\\\xa8\xc8:\xd5\xca\x97\x99\xaa\x16\x04)\xa8\xf9\x13\xdeq\x0ev`\xa7\x83\xc5\x8b`\xdb\xef \x9d\x93\xe8g\x84\x96\xfaV\\\xf4R\xda\xd0\xa1\x02!\x00\xfeR\xbf\n\x91Su\x87L\x98{\xeb%\xed\xfb\x06u)@\xfe\x1b\xde\xa0\xc6@\xab\xc5\xedg\x8e\x10[\x02!\x00\xfb\x86=\x85\xa4'\xde\x85\xb5L\xe0)\x99\xfaL\x8c3A\x02\xa8<\xdew\xad\x00\xe3\x1d\x05\xd8\xb4N\xfb\x02 \x08\xb0M\x04\x90hx\x88q\xcew\xd5U\xcbf\x9b\x16\xdf\x9c\xef\xd1\x85\xee\x9a7Ug\x02\xb0Z\x03'\x02 9\xa0D\xe2$|\xf9\xefz]5\x92rs\xb5+\xfd\xe6,\x1c\xadmn\xcf\xd5?3|\x0em)\x17\x02 5Z\xcc/\xa5?\n\x04%\x9b{N\x9dX\xddI\xbe\xd2\xb0\xa0\x03BQ\x02\x82\xc2\xe0u)\xbd\xb8\xaf"
 
+# This particular key was generated with:
+# $ openssl genrsa -out key.pem 512
+# $ openssl rsa -in key.pem -outform DER -out key.der
+keypkcs8 = b'0\x82\x01U\x02\x01\x000\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x04\x82\x01?0\x82\x01;\x02\x01\x00\x02A\x00\xae\x07\xbb\xbf \x8eL\\ G\x91\x1b\xc45\x89\x96\x0c\xca\x94\xa5\xc2%F\x84z\xea\xb2Y\xdd\x943\x1a\xe0\x1e\xfe%\xd3\xbc\x85\xf0\x05\x8eI\xca\x83\x8b\x86\xfd\x15P,\xa9t8\xc2s\x11\x7fk*[[w\xdd\x02\x03\x01\x00\x01\x02@?\x02-\xc7\x95Q\xef\xf3\xaa\xfc>]\x7f<\xa3\x03\xe0\xbd\xb7\xf4\x0b\xc6\xd31D\x0f\x95cT\x06D9\xed\xf0X\xa6\x18\xb4\xe7\x96\x8f\x91\xd6\xd7\xbfR\\V\xfd\x0e{\xd3\xa4e\xb4M\x01\xbb\xdf\xf1\xf0\xbcEA\x02!\x00\xd5\xd7f\xcc\x84\xf5Y&\xa7]\x00\x91\xc9\x8e\xb0\xf37\x108D\x7f&!JJ\x836\x83\x9f\n\xf2\x0f\x02!\x00\xd0W\x0ec\xa6\x86C\xf7\x8d\xbe\xf0\xbc2\xe3)|\xbb\xd6\xbb;\xb2\xafG\x05S\x0f-\x14X\n3S\x02 A\xf5\xb20\xcd\xa6<<\x8f\rA\xda\xb68<^\x99\x12x\xb8\xb0\x1b\x9b\xd3%\x8e\xb9\xa6\xf9\xcc\xcf\x83\x02!\x00\xa8.\xee\xdd\xc0\xeb8h\xda\x13^\xb0\xfe\x7fd\xd9]\xa5m\xc66k\xcap`\xe9\xaaav\xe4\xdd#\x02!\x00\xd1\xd0\x93\xe7wZ\xe0p\xd0M\x07\x9e\x13\xa7\xa7\x12\x95\x1e\x13h0O\xc0\x18\x1fa\x10")\x9f&U'
+
 # Invalid key
 try:
     ssl.wrap_socket(io.BytesIO(), key=b"!")
@@ -26,3 +31,9 @@
     ssl.wrap_socket(io.BytesIO(), key=key, cert=b"!")
 except ValueError as er:
     print(repr(er))
+
+# Valid key in PKCS8 format, invalid cert
+try:
+    ssl.wrap_socket(io.BytesIO(), key=keypkcs8, cert=b"!")
+except ValueError as er:
+    print(repr(er))
diff --git a/tests/extmod/ssl_keycert.py.exp b/tests/extmod/ssl_keycert.py.exp
index b72d319c6a807..95140cb998013 100644
--- a/tests/extmod/ssl_keycert.py.exp
+++ b/tests/extmod/ssl_keycert.py.exp
@@ -1,3 +1,4 @@
 ValueError('invalid key',)
 TypeError("can't convert 'NoneType' object to str implicitly",)
 ValueError('invalid cert',)
+ValueError('invalid cert',)

From 6c870dc5ecc048309f7fcb21324b1aed165afdb0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Aug 2024 16:32:51 +1000
Subject: [PATCH 1296/3129] py/obj: Remove the legacy object API for version 2.

These were changed in v1.11 (2019).  Prepare to remove the compatibility
macros as part of V2 changes.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/obj.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/obj.h b/py/obj.h
index 46d42baf4bfc1..81ee75aebc3aa 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -1273,6 +1273,8 @@ mp_obj_t mp_seq_extract_slice(const mp_obj_t *seq, mp_bound_slice_t *indexes);
     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));
 
+#if !MICROPY_PREVIEW_VERSION_2
+
 // Provide translation for legacy API
 #define MP_OBJ_IS_SMALL_INT mp_obj_is_small_int
 #define MP_OBJ_IS_QSTR mp_obj_is_qstr
@@ -1285,4 +1287,6 @@ mp_obj_t mp_seq_extract_slice(const mp_obj_t *seq, mp_bound_slice_t *indexes);
 #define MP_MAP_SLOT_IS_FILLED mp_map_slot_is_filled
 #define MP_SET_SLOT_IS_FILLED mp_set_slot_is_filled
 
+#endif
+
 #endif // MICROPY_INCLUDED_PY_OBJ_H

From 86f2c285eb222f30c24df187ac66d3e0c80caf61 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 6 Aug 2024 15:51:22 +1000
Subject: [PATCH 1297/3129] py: Add new cstack API for stack checking, with
 limit margin macro.

Currently the stack limit margin is hard-coded in each port's call to
`mp_stack_set_limit()`, but on threaded ports it's fiddlier and can lead to
bugs (such as incorrect thread stack margin on esp32).

This commit provides a new API to initialise the C Stack in one function
call, with a config macro to set the margin.  Where possible the new call
is inlined to reduce code size in thread-free ports.

Intended replacement for `MP_TASK_STACK_LIMIT_MARGIN` on esp32.

The previous `stackctrl.h` API is still present and unmodified apart from a
deprecation comment.  However it's not available when the
`MICROPY_PREVIEW_VERSION_2` macro is set.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 examples/natmod/re/re.c |  2 +-
 extmod/modre.c          |  4 +--
 py/cstack.c             | 57 +++++++++++++++++++++++++++++++++++++
 py/cstack.h             | 63 +++++++++++++++++++++++++++++++++++++++++
 py/modmicropython.c     |  8 +++---
 py/modthread.c          |  1 -
 py/mpconfig.h           |  7 +++++
 py/obj.c                |  4 +--
 py/objfun.c             | 10 +++----
 py/objgenerator.c       |  4 +--
 py/objlist.c            |  4 +--
 py/objstr.c             |  4 +--
 py/py.cmake             |  1 +
 py/py.mk                |  1 +
 py/runtime.c            |  4 +--
 py/runtime.h            |  5 ++--
 py/stackctrl.c          |  7 +++++
 py/stackctrl.h          |  8 +++++-
 18 files changed, 167 insertions(+), 27 deletions(-)
 create mode 100644 py/cstack.c
 create mode 100644 py/cstack.h

diff --git a/examples/natmod/re/re.c b/examples/natmod/re/re.c
index 7ae72a578f4e3..eb6d13778c387 100644
--- a/examples/natmod/re/re.c
+++ b/examples/natmod/re/re.c
@@ -11,7 +11,7 @@
 
 const char *stack_top;
 
-void mp_stack_check(void) {
+void mp_cstack_check(void) {
     // Assumes descending stack on target
     volatile char dummy;
     if (stack_top - &dummy >= STACK_LIMIT) {
diff --git a/extmod/modre.c b/extmod/modre.c
index f3d2e302a0374..1a118009cbd1f 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -31,7 +31,7 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/objstr.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 
 #if MICROPY_PY_BUILTINS_STR_UNICODE
 #include "py/unicode.h"
@@ -39,7 +39,7 @@
 
 #if MICROPY_PY_RE
 
-#define re1_5_stack_chk() MP_STACK_CHECK()
+#define re1_5_stack_chk() mp_cstack_check()
 
 #include "lib/re1.5/re1.5.h"
 
diff --git a/py/cstack.c b/py/cstack.c
new file mode 100644
index 0000000000000..fe4b16d652a50
--- /dev/null
+++ b/py/cstack.c
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Paul Sokolovsky
+ * Copryight (c) 2024 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 "py/runtime.h"
+#include "py/cstack.h"
+
+void mp_cstack_init_with_sp_here(size_t stack_size) {
+    #if __GNUC__ >= 13
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdangling-pointer"
+    #endif
+    volatile int stack_dummy;
+    mp_cstack_init_with_top((void *)&stack_dummy, stack_size);
+    #if __GNUC__ >= 13
+    #pragma GCC diagnostic pop
+    #endif
+}
+
+mp_uint_t mp_cstack_usage(void) {
+    // Assumes descending stack
+    volatile int stack_dummy;
+    return MP_STATE_THREAD(stack_top) - (char *)&stack_dummy;
+}
+
+#if MICROPY_STACK_CHECK
+
+void mp_cstack_check(void) {
+    if (mp_cstack_usage() >= MP_STATE_THREAD(stack_limit)) {
+        mp_raise_recursion_depth();
+    }
+}
+
+#endif // MICROPY_STACK_CHECK
diff --git a/py/cstack.h b/py/cstack.h
new file mode 100644
index 0000000000000..b12a18e13fcad
--- /dev/null
+++ b/py/cstack.h
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Paul Sokolovsky
+ * Copyright (c) 2024 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_PY_CSTACK_H
+#define MICROPY_INCLUDED_PY_CSTACK_H
+
+#include "py/mpstate.h"
+
+// Both init functions below accept the full stack size. Set the
+// MICROPY_STACK_CHECK_MARGIN to the number of bytes subtracted to account
+// for stack usage between checks.
+
+void mp_cstack_init_with_sp_here(size_t stack_size);
+
+inline static void mp_cstack_init_with_top(void *top, size_t stack_size) {
+    MP_STATE_THREAD(stack_top) = (char *)top;
+
+    #if MICROPY_STACK_CHECK
+    assert(stack_size > MICROPY_STACK_CHECK_MARGIN); // Should be enforced by port
+    MP_STATE_THREAD(stack_limit) = stack_size - MICROPY_STACK_CHECK_MARGIN;
+    #else
+    (void)stack_size;
+    #endif
+}
+
+mp_uint_t mp_cstack_usage(void);
+
+#if MICROPY_STACK_CHECK
+
+void mp_cstack_check(void);
+
+#else
+
+inline static void mp_cstack_check(void) {
+    // No-op when stack checking is disabled
+}
+
+#endif
+
+#endif // MICROPY_INCLUDED_PY_CSTACK_H
diff --git a/py/modmicropython.c b/py/modmicropython.c
index af6ad01795f67..daf03807c848a 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "py/builtin.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"
@@ -76,9 +76,9 @@ mp_obj_t mp_micropython_mem_info(size_t n_args, const mp_obj_t *args) {
     #endif
     #if MICROPY_STACK_CHECK
     mp_printf(&mp_plat_print, "stack: " UINT_FMT " out of " UINT_FMT "\n",
-        mp_stack_usage(), (mp_uint_t)MP_STATE_THREAD(stack_limit));
+        mp_cstack_usage(), (mp_uint_t)MP_STATE_THREAD(stack_limit));
     #else
-    mp_printf(&mp_plat_print, "stack: " UINT_FMT "\n", mp_stack_usage());
+    mp_printf(&mp_plat_print, "stack: " UINT_FMT "\n", mp_cstack_usage());
     #endif
     #if MICROPY_ENABLE_GC
     gc_dump_info(&mp_plat_print);
@@ -111,7 +111,7 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_qstr_info_obj, 0, 1, m
 
 #if MICROPY_PY_MICROPYTHON_STACK_USE
 static mp_obj_t mp_micropython_stack_use(void) {
-    return MP_OBJ_NEW_SMALL_INT(mp_stack_usage());
+    return MP_OBJ_NEW_SMALL_INT(mp_cstack_usage());
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_stack_use_obj, mp_micropython_stack_use);
 #endif
diff --git a/py/modthread.c b/py/modthread.c
index 2826fadeaa6b4..7742ff68471f1 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "py/stackctrl.h"
 
 #if MICROPY_PY_THREAD
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 94fdca7d7a97d..5c10007a194e7 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -690,6 +690,13 @@
 #define MICROPY_STACK_CHECK (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Additional margin between the places in the runtime where Python stack is
+// checked and the actual end of the C stack. Needs to be large enough to avoid
+// overflows from function calls made between checks.
+#ifndef MICROPY_STACK_CHECK_MARGIN
+#define MICROPY_STACK_CHECK_MARGIN (0)
+#endif
+
 // Whether to have an emergency exception buffer
 #ifndef MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (0)
diff --git a/py/obj.c b/py/obj.c
index e43451dadd512..1606ad5209e7b 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -34,7 +34,7 @@
 #include "py/objint.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 #include "py/stream.h" // for mp_obj_print
 
 // Allocates an object and also sets type, for mp_obj_malloc{,_var} macros.
@@ -117,7 +117,7 @@ const char *mp_obj_get_type_str(mp_const_obj_t o_in) {
 
 void mp_obj_print_helper(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     // There can be data structures nested too deep, or just recursive
-    MP_STACK_CHECK();
+    mp_cstack_check();
     #ifndef NDEBUG
     if (o_in == MP_OBJ_NULL) {
         mp_print_str(print, "(nil)");
diff --git a/py/objfun.c b/py/objfun.c
index 1ebfa3d5af217..8279605e9874a 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -32,7 +32,7 @@
 #include "py/objfun.h"
 #include "py/runtime.h"
 #include "py/bc.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
 #define DEBUG_PRINT (1)
@@ -194,7 +194,7 @@ static void dump_args(const mp_obj_t *a, size_t sz) {
 
 #if MICROPY_STACKLESS
 mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    MP_STACK_CHECK();
+    mp_cstack_check();
     mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
 
     size_t n_state, state_size;
@@ -225,7 +225,7 @@ mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t self_in, size_t n_args
 #endif
 
 static mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    MP_STACK_CHECK();
+    mp_cstack_check();
 
     DEBUG_printf("Input n_args: " UINT_FMT ", n_kw: " UINT_FMT "\n", n_args, n_kw);
     DEBUG_printf("Input pos args: ");
@@ -397,7 +397,7 @@ mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_
 #if MICROPY_EMIT_NATIVE
 
 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_cstack_check();
     mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
     mp_call_fun_t fun = mp_obj_fun_native_get_function_start(self);
     return fun(self_in, n_args, n_kw, args);
@@ -431,7 +431,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 #if MICROPY_EMIT_NATIVE
 
 static mp_obj_t fun_viper_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    MP_STACK_CHECK();
+    mp_cstack_check();
     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);
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 431cbad5a79d8..df9701094b80c 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -33,7 +33,7 @@
 #include "py/objstr.h"
 #include "py/objgenerator.h"
 #include "py/objfun.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 
 // Instance of GeneratorExit exception - needed by generator.close()
 const mp_obj_exception_t mp_const_GeneratorExit_obj = {{&mp_type_GeneratorExit}, 0, 0, NULL, (mp_obj_tuple_t *)&mp_const_empty_tuple_obj};
@@ -151,7 +151,7 @@ static void gen_instance_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
 }
 
 mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) {
-    MP_STACK_CHECK();
+    mp_cstack_check();
     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) {
diff --git a/py/objlist.c b/py/objlist.c
index 9c8cd0e86c844..9a88de3892eb3 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -29,7 +29,7 @@
 
 #include "py/objlist.h"
 #include "py/runtime.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 
 static mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf);
 static mp_obj_list_t *list_new(size_t n);
@@ -291,7 +291,7 @@ static mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) {
 }
 
 static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, mp_obj_t binop_less_result) {
-    MP_STACK_CHECK();
+    mp_cstack_check();
     while (head < tail) {
         mp_obj_t *h = head - 1;
         mp_obj_t *t = tail;
diff --git a/py/objstr.c b/py/objstr.c
index 346a6259f7423..757da827c0fa3 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -32,7 +32,7 @@
 #include "py/objstr.h"
 #include "py/objlist.h"
 #include "py/runtime.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 
 #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);
@@ -1181,7 +1181,7 @@ static vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             // type        ::=  "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
 
             // recursively call the formatter to format any nested specifiers
-            MP_STACK_CHECK();
+            mp_cstack_check();
             vstr_t format_spec_vstr = mp_obj_str_format_helper(format_spec, str, arg_i, n_args, args, kwargs);
             const char *s = vstr_null_terminated_str(&format_spec_vstr);
             const char *stop = s + format_spec_vstr.len;
diff --git a/py/py.cmake b/py/py.cmake
index ccd0577c386d6..03c559c206d8c 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -20,6 +20,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/builtinhelp.c
     ${MICROPY_PY_DIR}/builtinimport.c
     ${MICROPY_PY_DIR}/compile.c
+    ${MICROPY_PY_DIR}/cstack.c
     ${MICROPY_PY_DIR}/emitbc.c
     ${MICROPY_PY_DIR}/emitcommon.c
     ${MICROPY_PY_DIR}/emitglue.c
diff --git a/py/py.mk b/py/py.mk
index ff3dff96a5715..0d4958ccba9ca 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -131,6 +131,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	nativeglue.o \
 	pairheap.o \
 	ringbuf.o \
+	cstack.o \
 	stackctrl.o \
 	argcheck.o \
 	warning.o \
diff --git a/py/runtime.c b/py/runtime.c
index fd0a8e690135a..acb45c94b0b74 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -43,7 +43,7 @@
 #include "py/stream.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 #include "py/gc.h"
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
@@ -1374,7 +1374,7 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
 // will always return MP_OBJ_STOP_ITERATION instead of raising StopIteration() (or any subclass thereof)
 // may raise other exceptions
 mp_obj_t mp_iternext(mp_obj_t o_in) {
-    MP_STACK_CHECK(); // enumerate, filter, map and zip can recursively call mp_iternext
+    mp_cstack_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_HAS_ITERNEXT(type)) {
         MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
diff --git a/py/runtime.h b/py/runtime.h
index 5465c06d8aee9..e8e5a758f8beb 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -28,7 +28,7 @@
 
 #include "py/mpstate.h"
 #include "py/pystack.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 
 // For use with mp_call_function_1_from_nlr_jump_callback.
 #define MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, f, a) \
@@ -159,8 +159,7 @@ void mp_call_function_1_from_nlr_jump_callback(void *ctx_in);
 static inline void mp_thread_init_state(mp_state_thread_t *ts, size_t stack_size, mp_obj_dict_t *locals, mp_obj_dict_t *globals) {
     mp_thread_set_state(ts);
 
-    mp_stack_set_top(ts + 1); // need to include ts in root-pointer scan
-    mp_stack_set_limit(stack_size);
+    mp_cstack_init_with_top(ts + 1, stack_size); // need to include ts in root-pointer scan
 
     // GC starts off unlocked
     ts->gc_lock_depth = 0;
diff --git a/py/stackctrl.c b/py/stackctrl.c
index c2566ebad92b8..303e9cffff16f 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -24,7 +24,12 @@
  * THE SOFTWARE.
  */
 
+// This API is deprecated, please use py/cstack.h instead
+
 #include "py/runtime.h"
+
+#if !MICROPY_PREVIEW_VERSION_2
+
 #include "py/stackctrl.h"
 
 void mp_stack_ctrl_init(void) {
@@ -62,3 +67,5 @@ void mp_stack_check(void) {
 }
 
 #endif // MICROPY_STACK_CHECK
+
+#endif // !MICROPY_PREVIEW_VERSION_2
diff --git a/py/stackctrl.h b/py/stackctrl.h
index c21288b2b1f57..9bf7330ccc3f1 100644
--- a/py/stackctrl.h
+++ b/py/stackctrl.h
@@ -26,8 +26,12 @@
 #ifndef MICROPY_INCLUDED_PY_STACKCTRL_H
 #define MICROPY_INCLUDED_PY_STACKCTRL_H
 
+// This API is deprecated, please use py/cstack.h instead
+
 #include "py/mpconfig.h"
 
+#if !MICROPY_PREVIEW_VERSION_2
+
 void mp_stack_ctrl_init(void);
 void mp_stack_set_top(void *top);
 mp_uint_t mp_stack_usage(void);
@@ -43,6 +47,8 @@ void mp_stack_check(void);
 #define mp_stack_set_limit(limit) (void)(limit)
 #define MP_STACK_CHECK()
 
-#endif
+#endif // MICROPY_STACK_CHECK
+
+#endif // !MICROPY_PREVIEW_VERSION_2
 
 #endif // MICROPY_INCLUDED_PY_STACKCTRL_H

From e3955f421d10111271dfb6a2774e742ed01c1d7b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 6 Aug 2024 16:13:33 +1000
Subject: [PATCH 1298/3129] esp32: Fix thread stack limit margin, change to new
 cstack API.

This change moves that complexity out into the stack checker and fixes the
bug where stack margin wasn't set correctly by ESP32-C3 threads.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/main.c         | 12 ++----------
 ports/esp32/mpconfigport.h |  5 +++++
 ports/esp32/mpthreadport.c |  5 +----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index ccec6c8cd81f4..ea641e6685c35 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -41,7 +41,7 @@
 #include "esp_log.h"
 #include "esp_psram.h"
 
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 #include "py/nlr.h"
 #include "py/compile.h"
 #include "py/runtime.h"
@@ -71,13 +71,6 @@
 // MicroPython runs as a task under FreeRTOS
 #define MP_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 1)
 
-// 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
-
 typedef struct _native_code_node_t {
     struct _native_code_node_t *next;
     uint32_t data[];
@@ -132,8 +125,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(MICROPY_TASK_STACK_SIZE - MP_TASK_STACK_LIMIT_MARGIN);
+    mp_cstack_init_with_top((void *)sp, MICROPY_TASK_STACK_SIZE);
     gc_init(mp_task_heap, mp_task_heap + MICROPY_GC_INITIAL_HEAP_SIZE);
     mp_init();
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 3349e56e46d41..40b3f11b4a433 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -62,6 +62,11 @@
 // Python internal features
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
+#if CONFIG_IDF_TARGET_ARCH_RISCV                   // RISC-V SoCs use more stack than Xtensa
+#define MICROPY_STACK_CHECK_MARGIN          (2048) // This may be unnecessarily conservative
+#else
+#define MICROPY_STACK_CHECK_MARGIN          (1024)
+#endif
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_NORMAL)
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 34fef9f7beace..eac1e5ea3668d 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -38,7 +38,7 @@
 #if MICROPY_PY_THREAD
 
 #define MP_THREAD_MIN_STACK_SIZE                        (4 * 1024)
-#define MP_THREAD_DEFAULT_STACK_SIZE                    (MP_THREAD_MIN_STACK_SIZE + 1024)
+#define MP_THREAD_DEFAULT_STACK_SIZE                    (MP_THREAD_MIN_STACK_SIZE + MICROPY_STACK_CHECK_MARGIN)
 #define MP_THREAD_PRIORITY                              (ESP_TASK_PRIO_MIN + 1)
 
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0) && !CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP
@@ -160,9 +160,6 @@ mp_uint_t mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_s
     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);
 
     return (mp_uint_t)th->id;

From 80616aee71afedc3c7bfb013d87d8102981aa6b2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 6 Aug 2024 15:47:25 +1000
Subject: [PATCH 1299/3129] tests/run-tests.py: Enable stress tests on esp32
 port.

Now passing on ESP32-S3 and ESP32-C3.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 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 e7ba0de565cfe..83344714c0375 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1121,7 +1121,7 @@ def main():
             elif args.target == "rp2":
                 test_dirs += ("float", "stress", "inlineasm", "thread", "ports/rp2")
             elif args.target == "esp32":
-                test_dirs += ("float", "thread")
+                test_dirs += ("float", "stress", "thread")
             elif args.target in ("esp8266", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":

From fbc19596f052016dee10a6af56441f4fb532243c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 6 Aug 2024 15:52:54 +1000
Subject: [PATCH 1300/3129] rp2: Switch to use new cstack API for stack limit
 checks.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/main.c         | 5 ++---
 ports/rp2/mpconfigport.h | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 0f2721f174961..1ce1d2bf31d65 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -27,11 +27,11 @@
 #include <stdio.h>
 
 #include "py/compile.h"
+#include "py/cstack.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "py/stackctrl.h"
 #include "extmod/modbluetooth.h"
 #include "extmod/modnetwork.h"
 #include "shared/readline/readline.h"
@@ -114,8 +114,7 @@ int main(int argc, char **argv) {
     mp_hal_time_ns_set_from_rtc();
 
     // Initialise stack extents and GC heap.
-    mp_stack_set_top(&__StackTop);
-    mp_stack_set_limit(&__StackTop - &__StackBottom - 256);
+    mp_cstack_init_with_top(&__StackTop, &__StackTop - &__StackBottom);
     gc_init(&__GcHeapStart, &__GcHeapEnd);
 
     #if MICROPY_PY_LWIP
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 6ef994bb83272..3399212aacaa6 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -81,6 +81,7 @@
 #define MICROPY_TRACKED_ALLOC                   (MICROPY_SSL_MBEDTLS || MICROPY_BLUETOOTH_BTSTACK)
 #define MICROPY_READER_VFS                      (1)
 #define MICROPY_ENABLE_GC                       (1)
+#define MICROPY_STACK_CHECK_MARGIN              (256)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)

From a6fa85d8f96897863546423b2bbfc2c24237040f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Aug 2024 16:12:25 +1000
Subject: [PATCH 1301/3129] unix: Switch stack limit check to new cstack API.

Necessary to pass CI when testing the V2 preview APIs.

Also adds an extra coverage test for the legacy stackctrl API, to maintain
coverage and check for any regression.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/coverage.c                  | 27 ++++++++++++++++++++++++++
 ports/unix/main.c                      | 20 +++++++++----------
 tests/ports/unix/extra_coverage.py.exp |  2 ++
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 99a6d8c8c11f1..67052ea704e7c 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -7,6 +7,7 @@
 #include "py/objint.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
+#include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/repl.h"
 #include "py/mpz.h"
@@ -739,6 +740,32 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%d %d\n", mp_obj_is_int(MP_OBJ_NEW_SMALL_INT(1)), mp_obj_is_int(mp_obj_new_int_from_ll(1)));
     }
 
+    // Legacy stackctrl.h API, this has been replaced by cstack.h
+    {
+        mp_printf(&mp_plat_print, "# stackctrl\n");
+        char *old_stack_top = MP_STATE_THREAD(stack_top);
+        size_t old_stack_limit = 0;
+        size_t new_stack_limit = SIZE_MAX;
+        #if MICROPY_STACK_CHECK
+        old_stack_limit = MP_STATE_THREAD(stack_limit);
+        MP_STACK_CHECK();
+        #endif
+
+        mp_stack_ctrl_init(); // Will set stack top incorrectly
+        mp_stack_set_top(old_stack_top); // ... and restore it
+
+        #if MICROPY_STACK_CHECK
+        mp_stack_set_limit(MP_STATE_THREAD(stack_limit));
+        MP_STACK_CHECK();
+        new_stack_limit = MP_STATE_THREAD(stack_limit);
+        #endif
+
+        // Nothing should have changed
+        mp_printf(&mp_plat_print, "%d %d\n",
+            old_stack_top == MP_STATE_THREAD(stack_top),
+            MICROPY_STACK_CHECK == 0 || old_stack_limit == new_stack_limit);
+    }
+
     mp_printf(&mp_plat_print, "# end coverage.c\n");
 
     mp_obj_streamtest_t *s = mp_obj_malloc(mp_obj_streamtest_t, &mp_type_stest_fileio);
diff --git a/ports/unix/main.c b/ports/unix/main.c
index d9ee6eec447b2..e732105c792b7 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -44,7 +44,7 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/objstr.h"
-#include "py/stackctrl.h"
+#include "py/cstack.h"
 #include "py/mphal.h"
 #include "py/mpthread.h"
 #include "extmod/misc.h"
@@ -468,12 +468,20 @@ int main(int argc, char **argv) {
     #if MICROPY_PY_THREAD
     mp_thread_init();
     #endif
+
+    // Define a reasonable stack limit to detect stack overflow.
+    mp_uint_t stack_size = 40000 * (sizeof(void *) / 4);
+    #if defined(__arm__) && !defined(__thumb2__)
+    // ARM (non-Thumb) architectures require more stack.
+    stack_size *= 2;
+    #endif
+
     // We should capture stack top ASAP after start, and it should be
     // captured guaranteedly before any other stack variables are allocated.
     // For this, actual main (renamed main_) should not be inlined into
     // this function. main_() itself may have other functions inlined (with
     // their own stack variables), that's why we need this main/main_ split.
-    mp_stack_ctrl_init();
+    mp_cstack_init_with_sp_here(stack_size);
     return main_(argc, argv);
 }
 
@@ -492,14 +500,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
     signal(SIGPIPE, SIG_IGN);
     #endif
 
-    // 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);
 
     #if MICROPY_ENABLE_GC
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 5e806ebe57ccf..a2b11638a35ae 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -164,6 +164,8 @@ pop all: 1 2 4 5
 1 1
 0 0
 1 1
+# stackctrl
+1 1
 # end coverage.c
 0123456789 b'0123456789'
 7300

From fb4ae1eeec521d3d0caf09ba234df3a4e98902e2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 14 Aug 2024 14:20:36 +1000
Subject: [PATCH 1302/3129] test/extmod: Fix machine_spi_rate test on ESP32-C3.

Update to the test added in 1e98c4cb75bf3015d816455fc46ba28d5bcd9275,
changes the SPI pins for ESP32-C3 (IO 18 and 19 are the native USB pins).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/machine_spi_rate.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
index df9e3fbd0de85..6ee4619fa1193 100644
--- a/tests/extmod/machine_spi_rate.py
+++ b/tests/extmod/machine_spi_rate.py
@@ -21,11 +21,10 @@
 elif "rp2" in sys.platform:
     spi_instances = ((0, Pin(18), Pin(19), Pin(16)),)
 elif "esp32" in sys.platform:
-    spi_instances = [
-        (1, Pin(18), Pin(19), Pin(21)),
-    ]
-    if "ESP32C3" not in str(sys.implementation):
-        spi_instances.append((2, Pin(18), Pin(19), Pin(21)))
+    if "ESP32C3" in str(sys.implementation):
+        spi_instances = ((1, Pin(4), Pin(5), Pin(6)),)
+    else:
+        spi_instances = ((1, Pin(18), Pin(19), Pin(21)), (2, Pin(18), Pin(19), Pin(21)))
 else:
     print("Please add support for this test on this platform.")
     raise SystemExit

From a4f9c0cc2ac913030458a9fd11f1d49b288cce18 Mon Sep 17 00:00:00 2001
From: Andrea Milazzo <andrea@fonix.com>
Date: Tue, 12 Mar 2024 09:45:19 +0100
Subject: [PATCH 1303/3129] esp32/adc: Add support for v5.2.1 calibration api.

This new calibration routine exists for S3 in v5.1.1.  It works for all
platforms in 5.2.1.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/adc.c | 36 +++++++++++++++++++++++++++++++++---
 ports/esp32/adc.h |  5 +++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
index c5886624ecb5a..7c9e0cfad622f 100644
--- a/ports/esp32/adc.c
+++ b/ports/esp32/adc.c
@@ -28,6 +28,7 @@
 #include "py/mphal.h"
 #include "adc.h"
 #include "driver/adc.h"
+#include "esp_adc/adc_cali_scheme.h"
 
 #define DEFAULT_VREF 1100
 
@@ -63,30 +64,59 @@ void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t bits) {
         adc1_config_width(self->width);
     }
     for (adc_atten_t atten = ADC_ATTEN_DB_0; atten < ADC_ATTEN_MAX; atten++) {
+        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 1)
+        if (self->handle[atten] != NULL) {
+            adc_cali_curve_fitting_config_t cali_config = {
+                .unit_id = self->unit_id,
+                .atten = atten,
+                .bitwidth = self->width,
+            };
+            check_esp_err(adc_cali_create_scheme_curve_fitting(&cali_config, self->handle[atten]));
+        }
+        #else
         if (self->characteristics[atten] != NULL) {
             esp_adc_cal_characterize(self->unit_id, atten, self->width, DEFAULT_VREF, self->characteristics[atten]);
         }
+        #endif
     }
 }
 
 mp_int_t madcblock_read_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id) {
-    int raw;
+    int raw = 0;
     if (self->unit_id == ADC_UNIT_1) {
         raw = adc1_get_raw(channel_id);
     } else {
+        #if (SOC_ADC_PERIPH_NUM >= 2)
         check_esp_err(adc2_get_raw(channel_id, self->width, &raw));
+        #endif
     }
     return raw;
 }
 
 mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten) {
     int raw = madcblock_read_helper(self, channel_id);
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 1)
+    adc_cali_handle_t *adc_handle = self->handle[atten];
+    if (adc_handle == NULL) {
+        adc_cali_curve_fitting_config_t cali_config = {
+            .unit_id = self->unit_id,
+            .atten = atten,
+            .bitwidth = self->width,
+        };
+        adc_handle = malloc(sizeof(adc_cali_handle_t));
+        check_esp_err(adc_cali_create_scheme_curve_fitting(&cali_config, adc_handle));
+        self->handle[atten] = adc_handle;
+    }
+    int uv;
+    check_esp_err(adc_cali_raw_to_voltage(*adc_handle, raw, &uv));
+    #else
     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;
+    mp_int_t uv = esp_adc_cal_raw_to_voltage(raw, adc_chars);
+    #endif
+    return (mp_int_t)uv * 1000;
 }
diff --git a/ports/esp32/adc.h b/ports/esp32/adc.h
index ae5c0d3c378c5..61771255d3dc0 100644
--- a/ports/esp32/adc.h
+++ b/ports/esp32/adc.h
@@ -30,6 +30,7 @@
 
 #include "py/runtime.h"
 #include "esp_adc_cal.h"
+#include "esp_adc/adc_cali_scheme.h"
 
 #define ADC_ATTEN_MAX SOC_ADC_ATTEN_NUM
 
@@ -38,7 +39,11 @@ typedef struct _machine_adc_block_obj_t {
     adc_unit_t unit_id;
     mp_int_t bits;
     adc_bits_width_t width;
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 1)
+    adc_cali_handle_t *handle[ADC_ATTEN_MAX];
+    #else
     esp_adc_cal_characteristics_t *characteristics[ADC_ATTEN_MAX];
+    #endif
 } machine_adc_block_obj_t;
 
 typedef struct _machine_adc_obj_t {

From 052693e4495354daabb4d61e97121283334c6665 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 23 Jul 2024 11:09:27 +1000
Subject: [PATCH 1304/3129] esp32/boards: Reduce IRAM usage.

Disable unnecessary IRAM ISR functionality.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 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 fef25fe3087f5..ca36206d1bf31 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -99,6 +99,10 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB.csv"
 # To reduce iRAM usage
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_SPI_MASTER_ISR_IN_IRAM=n
+CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
+CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=n
+CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=n
 
 # Legacy ADC Calibration Configuration
 # Only on: ESP32

From 74d04c026220b301a1966dbb0d6064d06132999e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 23 Jul 2024 11:40:45 +1000
Subject: [PATCH 1305/3129] esp32/adc: Use new ADC calibration API in all
 cases.

Replaces the deprecated ESP32 calibration API with the "line" method
instead.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/adc.c | 64 +++++++++++++++++++----------------------------
 ports/esp32/adc.h |  6 +----
 2 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
index 7c9e0cfad622f..91db9ec525fe1 100644
--- a/ports/esp32/adc.c
+++ b/ports/esp32/adc.c
@@ -63,22 +63,6 @@ void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t 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 ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 1)
-        if (self->handle[atten] != NULL) {
-            adc_cali_curve_fitting_config_t cali_config = {
-                .unit_id = self->unit_id,
-                .atten = atten,
-                .bitwidth = self->width,
-            };
-            check_esp_err(adc_cali_create_scheme_curve_fitting(&cali_config, self->handle[atten]));
-        }
-        #else
-        if (self->characteristics[atten] != NULL) {
-            esp_adc_cal_characterize(self->unit_id, atten, self->width, DEFAULT_VREF, self->characteristics[atten]);
-        }
-        #endif
-    }
 }
 
 mp_int_t madcblock_read_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id) {
@@ -93,30 +77,34 @@ mp_int_t madcblock_read_helper(machine_adc_block_obj_t *self, adc_channel_t chan
     return raw;
 }
 
-mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten) {
-    int raw = madcblock_read_helper(self, channel_id);
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 1)
-    adc_cali_handle_t *adc_handle = self->handle[atten];
-    if (adc_handle == NULL) {
-        adc_cali_curve_fitting_config_t cali_config = {
-            .unit_id = self->unit_id,
-            .atten = atten,
-            .bitwidth = self->width,
-        };
-        adc_handle = malloc(sizeof(adc_cali_handle_t));
-        check_esp_err(adc_cali_create_scheme_curve_fitting(&cali_config, adc_handle));
-        self->handle[atten] = adc_handle;
+static esp_err_t ensure_adc_calibration(machine_adc_block_obj_t *self, adc_atten_t atten) {
+    if (self->handle[atten] != NULL) {
+        return ESP_OK;
     }
-    int uv;
-    check_esp_err(adc_cali_raw_to_voltage(*adc_handle, raw, &uv));
+
+    #if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
+    adc_cali_curve_fitting_config_t cali_config = {
+        .unit_id = self->unit_id,
+        .atten = atten,
+        .bitwidth = self->width,
+    };
+    return adc_cali_create_scheme_curve_fitting(&cali_config, &self->handle[atten]);
     #else
-    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);
+    adc_cali_line_fitting_config_t cali_config = {
+        .unit_id = self->unit_id,
+        .atten = atten,
+        .bitwidth = self->width,
+    };
+    return adc_cali_create_scheme_line_fitting(&cali_config, &self->handle[atten]);
     #endif
+}
+
+mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten) {
+    int raw = madcblock_read_helper(self, channel_id);
+    int uv;
+
+    check_esp_err(ensure_adc_calibration(self, atten));
+    check_esp_err(adc_cali_raw_to_voltage(self->handle[atten], raw, &uv));
+
     return (mp_int_t)uv * 1000;
 }
diff --git a/ports/esp32/adc.h b/ports/esp32/adc.h
index 61771255d3dc0..5688e0a29a706 100644
--- a/ports/esp32/adc.h
+++ b/ports/esp32/adc.h
@@ -39,11 +39,7 @@ typedef struct _machine_adc_block_obj_t {
     adc_unit_t unit_id;
     mp_int_t bits;
     adc_bits_width_t width;
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 1)
-    adc_cali_handle_t *handle[ADC_ATTEN_MAX];
-    #else
-    esp_adc_cal_characteristics_t *characteristics[ADC_ATTEN_MAX];
-    #endif
+    adc_cali_handle_t handle[ADC_ATTEN_MAX];
 } machine_adc_block_obj_t;
 
 typedef struct _machine_adc_obj_t {

From 10601b04eabb5619e51bdd5f04c7d77ea8e201eb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 23 Jul 2024 11:41:25 +1000
Subject: [PATCH 1306/3129] esp32/boards: Build using newlib nano formatting
 functions.

Saves code size, MicroPython doesn't appear to rely on any of the missing
formatters (64-bit integers, c99-style named arguments).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 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 ca36206d1bf31..84a423fa0ab7e 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -121,3 +121,9 @@ CONFIG_ETH_USE_SPI_ETHERNET=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
 CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL=y
 CONFIG_ETH_SPI_ETHERNET_DM9051=y
+
+# Using newlib "nano" formatting saves size on SoCs where "nano" formatting
+# functions are in ROM. Note some newer chips (c2,c6) have "full" newlib
+# formatting in ROM instead and should override this, check
+# ESP_ROM_HAS_NEWLIB_NANO_FORMAT.
+CONFIG_NEWLIB_NANO_FORMAT=y

From 35a056ad9c9374472adf3578f9d6f0bfd2734674 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 23 Jul 2024 12:06:20 +1000
Subject: [PATCH 1307/3129] esp32/tools: Add metrics_esp32 size comparison
 script.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/tools/metrics_esp32.py | 192 +++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)
 create mode 100755 ports/esp32/tools/metrics_esp32.py

diff --git a/ports/esp32/tools/metrics_esp32.py b/ports/esp32/tools/metrics_esp32.py
new file mode 100755
index 0000000000000..66a6a588ba212
--- /dev/null
+++ b/ports/esp32/tools/metrics_esp32.py
@@ -0,0 +1,192 @@
+#!/usr/bin/env python
+# MIT license; Copyright (c) 2024 Angus Gratton
+#
+# This is a utility script for MicroPython maintainers, similar to tools/metrics.py
+# but particular to this port. It's for measuring the impact of an ESP-IDF update or
+# config change at a high level.
+#
+# Specifically, it builds the esp32 MicroPython port for a collection of boards
+# and outputs a Markdown table of binary sizes, static IRAM size, and static
+# DRAM size (the latter generally inversely correlates to free heap at runtime.)
+#
+# To use:
+#
+# 1) Need to not be in an ESP-IDF venv already (i.e. don't source export.sh),
+#    but IDF_PATH has to be set.
+#
+# 2) Choose the versions you want to test and the board/variant pairs by
+#    editing the tuples below.
+#
+# 3) The IDF install script sometimes fails if it has to downgrade a package
+#    within a minor version. The "nuclear option" is to delete all the install
+#    environments and have this script recreate them as it runs:
+#    rm -rf ~/.espressif/python_env/*
+#
+# 4) Run this script from the ports/esp32 directory, i.e.:
+#    ./tools/metrics_esp32.py
+#
+# 5) If all goes well, it will run for a while and then print a Markdown
+#    formatted table of binary sizes, sorted by board+variant.
+#
+# Note that for ESP32-S3 and C3, IRAM and DRAM are exchangeable so the IRAM size
+# column of the table is really D/IRAM.
+import os
+import re
+import sys
+import subprocess
+from dataclasses import dataclass
+
+IDF_VERS = ("v5.2.2",)
+
+BUILDS = (
+    ("ESP32_GENERIC", ""),
+    ("ESP32_GENERIC", "D2WD"),
+    ("ESP32_GENERIC", "SPIRAM"),
+    ("ESP32_GENERIC_S3", ""),
+    ("ESP32_GENERIC_S3", "SPIRAM_OCT"),
+)
+
+
+@dataclass
+class BuildSizes:
+    idf_ver: str
+    board: str
+    variant: str
+    bin_size: str = ""
+    dram_size: str = ""
+    iram_size: str = ""
+
+    def print_summary(self, include_ver=False):
+        print(f"BOARD={self.board} BOARD_VARIANT={self.variant}")
+        if include_ver:
+            print(f"IDF_VER {self.idf_ver}")
+        print(f"Binary size: {self.bin_size}")
+        print(f"IRAM size: {self.iram_size}")
+        print(f"DRAM size: {self.dram_size}")
+
+    def print_table_heading():
+        print(
+            "| BOARD | BOARD_VARIANT | IDF Version | Binary Size | Static IRAM Size | Static DRAM Size |"
+        )
+        print(
+            "|-------|---------------|-------------|-------------|------------------|------------------|"
+        )
+
+    def print_table_row(self, print_board):
+        print(
+            "| "
+            + " | ".join(
+                (
+                    self.board if print_board else "",
+                    self.variant if print_board else "",
+                    self.idf_ver,
+                    self.bin_size,
+                    self.iram_size,
+                    self.dram_size,
+                )
+            )
+            + " |"
+        )
+
+    def __lt__(self, other):
+        """sort by board, then variant, then IDF version to get an easy
+        to compare table"""
+        return (self.board, self.variant, self.idf_ver) < (
+            other.board,
+            other.variant,
+            other.idf_ver,
+        )
+
+    def build_dir(self):
+        if self.variant:
+            return f"build-{self.board}_{self.variant}"
+        else:
+            return f"build-{self.board}"
+
+    def run_make(self, target):
+        env = dict(os.environ)
+        env["BOARD"] = self.board
+        env["BOARD_VARIANT"] = self.variant
+
+        try:
+            # IDF version changes as we go, so re-export the environment each time
+            cmd = f"source $IDF_PATH/export.sh; make {target}"
+            return subprocess.check_output(
+                cmd, shell=True, env=env, stderr=subprocess.STDOUT
+            ).decode()
+        except subprocess.CalledProcessError as e:
+            err_file = f"{self.build_dir()}/make-{target}-failed-{self.idf_ver}.log"
+            print(f"'make {target}' failed, writing to log to {err_file}", file=sys.stderr)
+            with open(err_file, "w") as f:
+                f.write(e.output.decode())
+            raise
+
+    def make_size(self):
+        try:
+            size_out = self.run_make("size")
+            # "Used static DRAM:" or "Used stat D/IRAM:"
+            RE_DRAM = r"Used stat(?:ic)? D.*: *(\d+) bytes"
+            RE_IRAM = r"Used static IRAM: *(\d+) bytes"
+            RE_BIN = r"Total image size: *(\d+) bytes"
+            self.dram_size = re.search(RE_DRAM, size_out).group(1)
+            self.iram_size = re.search(RE_IRAM, size_out).group(1)
+            self.bin_size = re.search(RE_BIN, size_out).group(1)
+        except subprocess.CalledProcessError:
+            self.bin_size = "build failed"
+
+
+def main(do_clean):
+    if "IDF_PATH" not in os.environ:
+        raise RuntimeError("IDF_PATH must be set")
+
+    sizes = []
+    for idf_ver in IDF_VERS:
+        switch_ver(idf_ver)
+        for board, variant in BUILDS:
+            print(f"Building '{board}'/'{variant}'...", file=sys.stderr)
+            result = BuildSizes(idf_ver, board, variant)
+            result.run_make("clean")
+            result.make_size()
+            result.print_summary()
+            sizes.append(result)
+
+    # print everything again as a table sorted by board+variant
+    last_bv = ""
+    BuildSizes.print_table_heading()
+    for build_sizes in sorted(sizes):
+        bv = (build_sizes.board, build_sizes.variant)
+        build_sizes.print_table_row(last_bv != bv)
+        last_bv = bv
+
+
+def idf_git(*commands):
+    try:
+        subprocess.check_output(
+            ["git"] + list(commands), cwd=os.environ["IDF_PATH"], stderr=subprocess.STDOUT
+        )
+    except subprocess.CalledProcessError as e:
+        print(f"git {' '.join(commands)} failed:")
+        print(e.output.decode())
+        raise
+
+
+def idf_install():
+    try:
+        subprocess.check_output(
+            ["bash", "install.sh"], cwd=os.environ["IDF_PATH"], stderr=subprocess.STDOUT
+        )
+    except subprocess.CalledProcessError as e:
+        print("IDF install.sh failed:")
+        print(e.output.decode())
+        raise
+
+
+def switch_ver(idf_ver):
+    print(f"Switching version to {idf_ver}...", file=sys.stderr)
+    idf_git("switch", "--detach", idf_ver)
+    idf_git("submodule", "update", "--init", "--recursive")
+    idf_install()
+
+
+if __name__ == "__main__":
+    main("--no-clean" not in sys.argv)

From fbb02d3aeeaa9da082f3ccd411d8e164a526046e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 23 Jul 2024 11:57:13 +1000
Subject: [PATCH 1308/3129] esp32: Add support for ESP-IDF v5.2.2.

Keeping older versions, however if the update goes well then these may be
dropped in the future.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/README.md | 8 ++++----
 tools/ci.sh           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 2e03c55d3de18..a04ad0c6eea1b 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 v5.0.4, v5.0.5, v5.1.2, v5.2.0.
+Currently MicroPython supports v5.0.4, v5.0.5, v5.1.2, v5.2.0, v5.2.2.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
@@ -46,10 +46,10 @@ The steps to take are summarised below.
 To check out a copy of the IDF use git clone:
 
 ```bash
-$ git clone -b v5.0.4 --recursive https://github.com/espressif/esp-idf.git
+$ git clone -b v5.2.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v5.0.4` with any other supported version.
+You can replace `v5.2.2` with 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.)
 
@@ -58,7 +58,7 @@ MicroPython and update the submodules using:
 
 ```bash
 $ cd esp-idf
-$ git checkout v5.0.4
+$ git checkout v5.2.2
 $ git submodule update --init --recursive
 ```
 
diff --git a/tools/ci.sh b/tools/ci.sh
index b0a1022c3b195..03b6bf59aed4a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -116,7 +116,7 @@ function ci_cc3200_build {
 # ports/esp32
 
 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
-IDF_VER=v5.0.4
+IDF_VER=v5.2.2
 
 export IDF_CCACHE_ENABLE=1
 

From 0a11832cddbeed57bf0267afa0c833584817312d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 30 Jul 2024 10:39:47 +1000
Subject: [PATCH 1309/3129] esp32: Use the ESP-IDF default esp_console config
 for ESP32-C3.

The ESP-IDF default on C3 is primary UART0, secondary USB serial/jtag.
Previously MicroPython configured the primary as USB Serial/JTAG and
manually worked with the UART0 console. However UART0 console stopped
working this way in v5.2.2.

The big change is that CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is no longer set,
as primary console is UART0. However
CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is set and IDF provides a
macro CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED which is set if either
primary or secondary esp_console is USB serial/jtag. So need to use that
macro instead.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb | 2 --
 ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board    | 2 --
 ports/esp32/machine_pin.c                           | 2 +-
 ports/esp32/machine_pin.h                           | 2 +-
 ports/esp32/main.c                                  | 2 +-
 ports/esp32/mphalport.c                             | 6 +++---
 ports/esp32/uart.h                                  | 2 +-
 ports/esp32/usb.c                                   | 4 ++--
 ports/esp32/usb_serial_jtag.c                       | 4 ++--
 9 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
index d9e7c7f61f620..9e75d07de1670 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
@@ -3,5 +3,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_SERIAL_JTAG=y
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
index d9e7c7f61f620..9e75d07de1670 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
@@ -3,5 +3,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_SERIAL_JTAG=y
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 1e7b86baeb379..17c01fc7b38e6 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -159,7 +159,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         }
     }
 
-    #if CONFIG_IDF_TARGET_ESP32C3
+    #if CONFIG_IDF_TARGET_ESP32C3 && CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
     if (index == 18 || index == 19) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
index 53f9c6bdad7cd..b46998725326c 100644
--- a/ports/esp32/machine_pin.h
+++ b/ports/esp32/machine_pin.h
@@ -87,7 +87,7 @@
 #define MICROPY_HW_ENABLE_GPIO11 (1)
 #define MICROPY_HW_ENABLE_GPIO12 (1)
 #define MICROPY_HW_ENABLE_GPIO13 (1)
-#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
 #define MICROPY_HW_ENABLE_GPIO18 (1)
 #define MICROPY_HW_ENABLE_GPIO19 (1)
 #endif
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index ea641e6685c35..330ba64b467c7 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -99,7 +99,7 @@ void mp_task(void *pvParameter) {
     #if MICROPY_PY_THREAD
     mp_thread_init(pxTaskGetStackStart(NULL), MICROPY_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
-    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
     usb_serial_jtag_init();
     #elif CONFIG_USB_OTG_SUPPORTED
     usb_init();
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index fd1cbcdb985f1..df966b3a27813 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -100,7 +100,7 @@ void check_esp_err_(esp_err_t code, const char *func, const int line, const char
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
-    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
     usb_serial_jtag_poll_rx();
     #endif
     if ((poll_flags & MP_STREAM_POLL_RD) && stdin_ringbuf.iget != stdin_ringbuf.iput) {
@@ -114,7 +114,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+        #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
         usb_serial_jtag_poll_rx();
         #endif
         int c = ringbuf_get(&stdin_ringbuf);
@@ -133,7 +133,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }
-    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
     usb_serial_jtag_tx_strn(str, len);
     did_write = true;
     #elif CONFIG_USB_OTG_SUPPORTED
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index 3d88eed8250fb..13c5e88307287 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -30,7 +30,7 @@
 
 // Whether to enable the REPL on a UART.
 #ifndef MICROPY_HW_ENABLE_UART_REPL
-#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
+#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED)
 #endif
 
 #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 2a3a2595dea0d..5a0e6b8a92091 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "usb.h"
 
-#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
 
 #include "esp_timer.h"
 #ifndef NO_QSTR
@@ -100,4 +100,4 @@ void usb_tx_strn(const char *str, size_t len) {
     }
 }
 
-#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c
index f4b4b7cb95834..f1148ab197ebb 100644
--- a/ports/esp32/usb_serial_jtag.c
+++ b/ports/esp32/usb_serial_jtag.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "usb_serial_jtag.h"
 
-#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
 
 #include "hal/usb_serial_jtag_ll.h"
 #include "esp_intr_alloc.h"
@@ -117,4 +117,4 @@ void usb_serial_jtag_tx_strn(const char *str, size_t len) {
     }
 }
 
-#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED

From e71a324c149b0b03c3ad6080aab1719916ed68af Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 7 Aug 2024 12:17:09 +1000
Subject: [PATCH 1310/3129] esp32: Restore ESP32-C3 brownout detector settings
 to IDF defaults.

Commit a66bd7a48925d318e1dd6ada756df947ffacdc12 added the
ESP32_GENERIC_C3_USB board (now merged with ESP32_GENERIC_C3) and changed
the brownout detector from the default level 7 (~2.51V) to level 4
(~2.92V).

Raising the level again seems to fix random BOD resets on some of the
cheaper ESP32-C3 dev boards (that likely skimp on power supply
capacitance).

Specifically, this change prevents random resets running multi_bluetooth
tests on ESP32-C3 "SuperMini" board.

Also removed from the LOLIN_C3_MINI board as it seems this config is a copy
of the generic one.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb | 4 ----
 ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
index 9e75d07de1670..44838c5349cc4 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
@@ -1,5 +1 @@
 CONFIG_ESP32C3_REV_MIN_3=y
-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
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
index 9e75d07de1670..44838c5349cc4 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
@@ -1,5 +1 @@
 CONFIG_ESP32C3_REV_MIN_3=y
-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

From 092078852e83811a629028b09cde2374fdfd9103 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Fri, 9 Aug 2024 14:58:48 +1000
Subject: [PATCH 1311/3129] esp32/boards: Remove BLE from list of features for
 ESP32-S2.

Fixes issue #15618.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/esp32/boards/ESP32_GENERIC_S2/board.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_S2/board.json b/ports/esp32/boards/ESP32_GENERIC_S2/board.json
index 35d06f2f7e6cc..6ebf16be1a21a 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S2/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/board.json
@@ -4,7 +4,6 @@
     ],
     "docs": "",
     "features": [
-        "BLE",
         "External Flash",
         "External RAM",
         "WiFi"

From 0b75e180a3b9fe72681fb942873102cdf2f4cae1 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 10 Aug 2024 16:37:03 +0200
Subject: [PATCH 1312/3129] esp32/mphalport: Print debug strings even before
 the GIL is ready.

If verbose debugging is enabled there is some stdout output happening
before the GIL is ready (for example, GC initialisation), and the code
assumed that no string printing occurred before the interpreter was fully
initialised.  Printing long strings would operate without holding the GIL,
which would crash if string output would happen too early in the startup
process.

This commit addresses that issue, making sure verbose debugging output will
work even before the interpreter is fully initialised (as if it is not yet
ready there's no GIL to take care of).

Also, the threshold that would indicate whether a string is "long" (and
thus requiring a GIL release/lock operation) or not was hardcoded to 20
bytes.  This commit makes that configurable, maintaining 20 bytes as a
default.

Fixes issue #15408.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/mpconfigport.h |  5 +++++
 ports/esp32/mphalport.c    | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 40b3f11b4a433..866b1bc25c5f4 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -314,3 +314,8 @@ void boardctrl_startup(void);
 #endif
 #endif
 #endif
+
+// The minimum string length threshold for string printing to stdout operations to be GIL-aware.
+#ifndef MICROPY_PY_STRING_TX_GIL_THRESHOLD
+#define MICROPY_PY_STRING_TX_GIL_THRESHOLD  (20)
+#endif
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index df966b3a27813..cc0e2ee7b4999 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -47,6 +47,10 @@
 #include "usb_serial_jtag.h"
 #include "uart.h"
 
+#if MICROPY_PY_STRING_TX_GIL_THRESHOLD < 0
+#error "MICROPY_PY_STRING_TX_GIL_THRESHOLD must be positive"
+#endif
+
 TaskHandle_t mp_main_task_handle;
 
 static uint8_t stdin_ringbuf_array[260];
@@ -129,7 +133,13 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     // Only release the GIL if many characters are being sent
     mp_uint_t ret = len;
     bool did_write = false;
-    bool release_gil = len > 20;
+    bool release_gil = len > MICROPY_PY_STRING_TX_GIL_THRESHOLD;
+    #if MICROPY_DEBUG_PRINTERS && MICROPY_DEBUG_VERBOSE && MICROPY_PY_THREAD_GIL
+    // If verbose debug output is enabled some strings are printed before the
+    // GIL mutex is set up.  When that happens, no Python code is running and
+    // therefore the interpreter doesn't care about the GIL not being ready.
+    release_gil = release_gil && (MP_STATE_VM(gil_mutex).handle != NULL);
+    #endif
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }

From 6565b3cb34954737428f98f0306b7e3cad146482 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 15 Aug 2024 16:00:08 +1000
Subject: [PATCH 1313/3129] esp32: Fix Python cstack size for bluetooth irq
 callbacks.

This value should have been adjusted when the new cstack API was adopted in
e3955f421d1, as otherwise the stack limit is too small especially on
ESP32-C3 where the stack limit was 6144 - 2048 - 2048.

Some extra margin is needed for bluetooth irq because invoke_irq_handler()
isn't a top-level task function, NimBLE calls through multiple layers
first. Measuring this overhead on IDF V5.2.2 (by putting an abort() in
invoke_irq_handler() and then measuring the stack size) yielded 672 bytes
on ESP32-S3 and 612 bytes on ESP32-C3, similar to the size reported in
cd66aa05cf.

Sticking with 1024 bytes for added safety margin. This means on Xtensa the
total margin for the BLE task stays the same (2048 bytes) as before
switching to cstack.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/mpconfigport.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 866b1bc25c5f4..723310b231b18 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -101,7 +101,10 @@
 #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 - 2048)
+// Event stack size is the RTOS stack size minus an allowance for the stack used
+// by the NimBLE functions that call into invoke_irq_handler().
+// MICROPY_STACK_CHECK_MARGIN is further subtracted from this value to set the stack limit.
+#define MICROPY_PY_BLUETOOTH_SYNC_EVENT_STACK_SIZE (CONFIG_BT_NIMBLE_TASK_STACK_SIZE - 1024)
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
 #define MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING (1)
 #define MICROPY_BLUETOOTH_NIMBLE            (1)

From b6a3aa10f5a223a43971ac22e6db7c967916d70a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 15 Aug 2024 16:06:19 +1000
Subject: [PATCH 1314/3129] esp32: Remove the increased stack limit margin for
 ESP32-C3.

The extra limit for C3 dates from 6823514 which added C3 support.
Measuring the minimum stack margins that can pass the stress tests I
measured 768 bytes for ESP32-S3 and 512 bytes for ESP32-C3 on ESP-IDF
V5.2.2 and similar on V5.0.4. i.e. The ESP32-C3 actually needs less stack
margin not more!

I think the extra margin for ESP32-C3 probably arose from:

1. Some toolchain inefficiency in the IDF V4.x RISC-V compiler codegen,
that has since been improved.

OR

2. The race condition that was fixed in e3955f42 where sometimes the limit
wasn't set correctly at all. This seems to trigger more on C3, presumably
some timing artifact, and I'd believe that some binaries might be more
susceptible than others due to random factors.

OR

3. Commit 6007f3e2062cc65fc8416f241c682e37eb956c11 which enabled custom
NLR handling for ESP32-C3.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/mpconfigport.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 723310b231b18..5051afb799ead 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -62,11 +62,7 @@
 // Python internal features
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
-#if CONFIG_IDF_TARGET_ARCH_RISCV                   // RISC-V SoCs use more stack than Xtensa
-#define MICROPY_STACK_CHECK_MARGIN          (2048) // This may be unnecessarily conservative
-#else
 #define MICROPY_STACK_CHECK_MARGIN          (1024)
-#endif
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_NORMAL)

From 43f40f797f8851e2a170d3bad5dd38c608c2fd90 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sun, 21 Jan 2024 00:32:09 +1100
Subject: [PATCH 1315/3129] esp32/boards/M5STACK_ATOMS3_LITE: Add M5Stack
 AtomS3 Lite board.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 .../boards/M5STACK_ATOMS3_LITE/board.json     | 21 ++++++++++++++++++
 .../esp32/boards/M5STACK_ATOMS3_LITE/board.md |  3 +++
 .../boards/M5STACK_ATOMS3_LITE/deploy.md      | 22 +++++++++++++++++++
 .../M5STACK_ATOMS3_LITE/mpconfigboard.cmake   |  8 +++++++
 .../M5STACK_ATOMS3_LITE/mpconfigboard.h       | 10 +++++++++
 .../esp32/boards/M5STACK_ATOMS3_LITE/pins.csv | 11 ++++++++++
 6 files changed, 75 insertions(+)
 create mode 100644 ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
 create mode 100644 ports/esp32/boards/M5STACK_ATOMS3_LITE/board.md
 create mode 100644 ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md
 create mode 100644 ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.h
 create mode 100644 ports/esp32/boards/M5STACK_ATOMS3_LITE/pins.csv

diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
new file mode 100644
index 0000000000000..d00bb673be8a8
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "https://docs.m5stack.com/en/core/AtomS3%20Lite",
+    "features": [
+        "BLE",
+        "WiFi",
+        "RGB LED",
+        "JST-PH",
+        "USB-C"
+    ],
+    "images": [
+        "atoms3lite.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "AtomS3 Lite",
+    "thumbnail": "",
+    "url": "https://shop.m5stack.com/products/atoms3-lite-esp32s3-dev-kit",
+    "vendor": "M5 Stack"
+}
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.md b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.md
new file mode 100644
index 0000000000000..8c93b5781ae50
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.md
@@ -0,0 +1,3 @@
+The [AtomS3 Lite](https://shop.m5stack.com/products/atoms3-lite-esp32s3-dev-kit)
+([docs](https://docs.m5stack.com/en/core/AtomS3%20Lite)) is an ESP32-S3 based
+development board from [M5Stack](https://m5stack.com/).
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md b/ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md
new file mode 100644
index 0000000000000..9a20a6a43dc6b
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md
@@ -0,0 +1,22 @@
+Program your board using the `esptool.py` program, found
+[here](https://github.com/espressif/esptool).
+
+To place the board in _bootloader mode_ - so `esptool`` can be used - press and
+hold the reset button for two seconds. A green LED will flash behind the reset
+button when the bootloader mode has been activated.
+
+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-20240105-v1.22.1.bin
+```
+
+After the firmware has been deployed, press the reset button to reset the device
+and start the new firmware.
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake
new file mode 100644
index 0000000000000..10608fcec7f87
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/ESP32_GENERIC_S3/sdkconfig.board
+)
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.h b/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.h
new file mode 100644
index 0000000000000..14bde8438bb24
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME               "M5Stack AtomS3 Lite"
+#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                 (39)
+#define MICROPY_HW_I2C0_SDA                 (38)
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/pins.csv b/ports/esp32/boards/M5STACK_ATOMS3_LITE/pins.csv
new file mode 100644
index 0000000000000..cd3276599cb88
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/pins.csv
@@ -0,0 +1,11 @@
+G1,GPIO1
+G2,GPIO2
+G5,GPIO5
+G6,GPIO6
+G7,GPIO7
+G8,GPIO8
+G38,GPIO38
+G39,GPIO39
+LED_RGB,GPIO35
+LED_IR,GPIO4
+BUTTON,GPIO41

From e9814e987bcc816fb67e38748a5afce466c45606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elvis=20Pf=C3=BCtzenreuter?= <epxx@epxx.co>
Date: Mon, 10 Jul 2023 22:31:36 -0300
Subject: [PATCH 1316/3129] esp32/boards/LILYGO_TTGO_LORA32: Add OLED rst seq
 for board v1.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Elvis Pfützenreuter <epxx@epxx.co>
---
 .../esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py | 7 ++++++-
 ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py    | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
index 58072ee1b51f0..bfe02c35765b8 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
@@ -4,7 +4,12 @@
 
 
 class OLED(SSD1306_I2C):
-    def __init__(self, i2c):
+    def __init__(self, i2c, rstpin):
+        # Initialize the OLED display
+        if rstpin is not None:
+            rstpin.value(0)
+            sleep_ms(50)
+            rstpin.value(1)  # must be held high after initialization
         super().__init__(128, 32, i2c)
 
     def test(self):
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py
index 067982a228592..e8aa4dbd74052 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py
@@ -28,6 +28,7 @@ def __init__(self, define_helpers=True):
         # OLED
         self.OLED_SDA = const(21)
         self.OLED_SCL = const(22)
+        self.OLED_RST = None
 
         if define_helpers:
             self.create_helpers()
@@ -35,7 +36,8 @@ def __init__(self, define_helpers=True):
     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)
+        rstpin = self.OLED_RST is not None and Pin(self.OLED_RST, Pin.OUT) or None
+        self.oled = OLED(self.i2c, rstpin)
 
 
 class Lora32v1_0(Lora32Base):

From 6367099f8365c22b42474818ce5fdb9b35591ade Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Tue, 13 Aug 2024 08:38:20 +1000
Subject: [PATCH 1317/3129] py/objstr: Skip whitespace in bytes.fromhex().

Skip whitespace characters between pairs of hex numbers.
This makes `bytes.fromhex()` compatible with cpython.

Includes simple test in `tests/basic/builtin_str_hex.py`.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 py/objstr.c                         | 24 +++++++++---------------
 tests/basics/builtin_str_hex.py     | 17 ++++++++++++++++-
 tests/basics/builtin_str_hex.py.exp | 11 +++++++++++
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/py/objstr.c b/py/objstr.c
index 757da827c0fa3..fc0623eb7af2c 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2014,27 +2014,21 @@ 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"));
+    byte *in_end = in + bufinfo.len;
+    mp_uint_t ch1, ch2;
+    while (in < in_end) {
+        if (unichar_isspace(ch1 = *in++)) {
+            continue;  // Skip whitespace between hex digit pairs
         }
-        if (i & 1) {
-            hex_byte <<= 4;
-        } else {
-            *out++ = hex_byte;
-            hex_byte = 0;
+        if (in == in_end || !unichar_isxdigit(ch1) || !unichar_isxdigit(ch2 = *in++)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("non-hex digit"));
         }
+        *out++ = (byte)((unichar_xdigit_value(ch1) << 4) | unichar_xdigit_value(ch2));
     }
+    vstr.len = out - (byte *)vstr.buf;  // Length may be shorter due to whitespace in input
     return mp_obj_new_str_type_from_vstr(MP_OBJ_TO_PTR(type_in), &vstr);
 }
 
diff --git a/tests/basics/builtin_str_hex.py b/tests/basics/builtin_str_hex.py
index 7390c8eaee17c..9455883012c0d 100644
--- a/tests/basics/builtin_str_hex.py
+++ b/tests/basics/builtin_str_hex.py
@@ -20,5 +20,20 @@
     "08090a0b0c0d0e0f",
     "7f80ff",
     "313233344142434461626364",
+    "ab\tcd\n  ef ",
+    "ab cd ef",
+    "ab cd ef ",
+    " ab cd ef ",
+    # Invalid hex strings:
+    "abcde",  # Odd number of hex digits
+    "ab cd e",
+    "a b cd ef",  # Spaces between hex pairs
+    "ab cd e f ",
+    "abga",  # Invalid hex digits
+    "ab_cd",
+    "ab:cd",
 ):
-    print(bytes.fromhex(x))
+    try:
+        print(bytes.fromhex(x))
+    except ValueError as e:
+        print("ValueError:", e)
diff --git a/tests/basics/builtin_str_hex.py.exp b/tests/basics/builtin_str_hex.py.exp
index 990dd8570767e..0309cad02d1a6 100644
--- a/tests/basics/builtin_str_hex.py.exp
+++ b/tests/basics/builtin_str_hex.py.exp
@@ -26,3 +26,14 @@ b'\x00\x01\x02\x03\x04\x05\x06\x07'
 b'\x08\t\n\x0b\x0c\r\x0e\x0f'
 b'\x7f\x80\xff'
 b'1234ABCDabcd'
+b'\xab\xcd\xef'
+b'\xab\xcd\xef'
+b'\xab\xcd\xef'
+b'\xab\xcd\xef'
+ValueError: non-hex digit
+ValueError: non-hex digit
+ValueError: non-hex digit
+ValueError: non-hex digit
+ValueError: non-hex digit
+ValueError: non-hex digit
+ValueError: non-hex digit

From 326e1149eccc2521527e62be66f1a0ae9f6600d0 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 31 Jul 2024 16:56:42 +0200
Subject: [PATCH 1318/3129] py/asmrv32: Fix short/long jumps scheduling.

The RV32 emitter always scheduled short jumps even outside the emit
compiler pass.  Running the full test suite through the native emitter
instead of just the tests that depend on the emitter at runtime (as in,
`micropython/native_*` and `micropython/viper_* tests`) uncovered more
places where the invalid behaviour was still present.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 69 ++++++++++++++++++++++++++++------------------------
 py/asmrv32.h |  4 +--
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index 7dd58becae6a6..a68401cf32fef 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -132,9 +132,9 @@ static void split_immediate(mp_int_t immediate, mp_uint_t *upper, mp_uint_t *low
 
 static void load_upper_immediate(asm_rv32_t *state, mp_uint_t rd, mp_uint_t immediate) {
     // if immediate fits in 17 bits and is ≠ 0:
-    //   c.lui  rd, HI(immediate)
+    //   c.lui rd, HI(immediate)
     // else:
-    //   lui    rd, HI(immediate)
+    //   lui   rd, HI(immediate)
     if (FIT_SIGNED(immediate, 17) && ((immediate >> 12) != 0)) {
         asm_rv32_opcode_clui(state, rd, immediate);
     } else {
@@ -270,6 +270,14 @@ static void emit_function_epilogue(asm_rv32_t *state, mp_uint_t registers) {
     state->saved_registers_mask = old_saved_registers_mask;
 }
 
+static bool calculate_displacement_for_label(asm_rv32_t *state, mp_uint_t label, ptrdiff_t *displacement) {
+    assert(displacement != NULL && "Displacement pointer is NULL");
+
+    mp_uint_t label_offset = state->base.label_offsets[label];
+    *displacement = (ptrdiff_t)(label_offset - state->base.code_offset);
+    return (label_offset != (mp_uint_t)-1) && (*displacement < 0);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 void asm_rv32_entry(asm_rv32_t *state, mp_uint_t locals) {
@@ -326,10 +334,10 @@ void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index) {
 }
 
 void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t label) {
-    ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
+    ptrdiff_t displacement = 0;
+    bool can_emit_short_jump = calculate_displacement_for_label(state, label, &displacement);
 
-    // The least significant bit is ignored anyway.
-    if (FIT_SIGNED(displacement, 13)) {
+    if (can_emit_short_jump && FIT_SIGNED(displacement, 13)) {
         // beq rs1, rs2, displacement
         asm_rv32_opcode_beq(state, rs1, rs2, displacement);
         return;
@@ -354,31 +362,24 @@ void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs
 }
 
 void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_t label) {
-    ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
+    ptrdiff_t displacement = 0;
+    bool can_emit_short_jump = calculate_displacement_for_label(state, label, &displacement);
 
-    if (FIT_SIGNED(displacement, 9) && IS_IN_C_REGISTER_WINDOW(rs)) {
+    if (can_emit_short_jump && FIT_SIGNED(displacement, 8) && IS_IN_C_REGISTER_WINDOW(rs)) {
         // c.bnez rs', displacement
         asm_rv32_opcode_cbnez(state, MAP_IN_C_REGISTER_WINDOW(rs), displacement);
         return;
     }
 
-    // The least significant bit is ignored anyway.
-    if (FIT_SIGNED(displacement, 13)) {
+    if (can_emit_short_jump && FIT_SIGNED(displacement, 13)) {
         // bne rs, zero, displacement
         asm_rv32_opcode_bne(state, rs, ASM_RV32_REG_ZERO, displacement);
         return;
     }
 
-    // Compensate for the initial C.BEQZ/BEQ opcode.
-    displacement -= IS_IN_C_REGISTER_WINDOW(rs) ? ASM_HALFWORD_SIZE : ASM_WORD_SIZE;
-
-    mp_uint_t upper = 0;
-    mp_uint_t lower = 0;
-    split_immediate(displacement, &upper, &lower);
-
     // TODO: Can this clobber REG_TEMP[0:2]?
 
-    // if rs1 in C window (the offset always fits):
+    // if rs1 in C window and displacement is negative:
     //    c.beqz rs', 10                           ; PC + 0
     //    auipc  temporary, HI(displacement)       ; PC + 2
     //    jalr   zero, temporary, LO(displacement) ; PC + 6
@@ -388,11 +389,20 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
     //    auipc  temporary, HI(displacement)       ; PC + 4
     //    jalr   zero, temporary, LO(displacement) ; PC + 8
     //    ...                                      ; PC + 12
-    if (IS_IN_C_REGISTER_WINDOW(rs)) {
+
+    if (can_emit_short_jump && IS_IN_C_REGISTER_WINDOW(rs)) {
         asm_rv32_opcode_cbeqz(state, MAP_IN_C_REGISTER_WINDOW(rs), 10);
+        // Compensate for the C.BEQZ opcode.
+        displacement -= ASM_HALFWORD_SIZE;
     } else {
         asm_rv32_opcode_beq(state, rs, ASM_RV32_REG_ZERO, 12);
+        // Compensate for the BEQ opcode.
+        displacement -= ASM_WORD_SIZE;
     }
+
+    mp_uint_t upper = 0;
+    mp_uint_t lower = 0;
+    split_immediate(displacement, &upper, &lower);
     asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
     asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
 }
@@ -502,10 +512,10 @@ void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_
 }
 
 void asm_rv32_emit_jump(asm_rv32_t *state, mp_uint_t label) {
-    ptrdiff_t displacement = (ptrdiff_t)(state->base.label_offsets[label] - state->base.code_offset);
+    ptrdiff_t displacement = 0;
+    bool can_emit_short_jump = calculate_displacement_for_label(state, label, &displacement);
 
-    // The least significant bit is ignored anyway.
-    if (FIT_SIGNED(displacement, 13)) {
+    if (can_emit_short_jump && FIT_SIGNED(displacement, 12)) {
         // c.j displacement
         asm_rv32_opcode_cj(state, displacement);
         return;
@@ -536,12 +546,12 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint
     mp_uint_t lower = 0;
     split_immediate(scaled_offset, &upper, &lower);
 
-    // lui   rd, HI(offset) ; Or c.lui if possible
-    // c.add rd, rs
-    // sw    rd, LO(offset)(rd)
-    load_upper_immediate(state, rd, upper);
-    asm_rv32_opcode_cadd(state, rd, rs);
-    asm_rv32_opcode_sw(state, rd, rd, lower);
+    // lui   temporary, HI(offset) ; Or c.lui if possible
+    // c.add temporary, rs
+    // sw    rd, LO(offset)(temporary)
+    load_upper_immediate(state, INTERNAL_TEMPORARY, upper);
+    asm_rv32_opcode_cadd(state, INTERNAL_TEMPORARY, rs);
+    asm_rv32_opcode_sw(state, rd, INTERNAL_TEMPORARY, lower);
 }
 
 void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t label) {
@@ -550,11 +560,6 @@ void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t labe
     mp_uint_t lower = 0;
     split_immediate(displacement, &upper, &lower);
 
-    // Compressed instructions are not used even if they may allow for code size
-    // savings as the code changes size between compute and emit passes
-    // otherwise.  If that happens then the assertion at asmbase.c:93 triggers
-    // when built in debug mode.
-
     // auipc rd, HI(relative)
     // addi  rd, rd, LO(relative)
     asm_rv32_opcode_auipc(state, rd, upper);
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 77a5b0ab67ac4..775cf1ffc9630 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -331,7 +331,7 @@ static inline void asm_rv32_opcode_lw(asm_rv32_t *state, mp_uint_t rd, mp_uint_t
 }
 
 // MUL RD, RS1, RS2
-static inline void asm_rv32m_opcode_mul(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+static inline void asm_rv32_opcode_mul(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000001 ..... ..... 000 ..... 0110011
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x00, 0x01, rd, rs1, rs2));
 }
@@ -479,7 +479,7 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_MOV_REG_LOCAL(state, rd, local) asm_rv32_emit_mov_reg_local(state, rd, local)
 #define ASM_MOV_REG_PCREL(state, rd, label) asm_rv32_emit_mov_reg_pcrel(state, rd, label)
 #define ASM_MOV_REG_REG(state, rd, rs) asm_rv32_opcode_cmv(state, rd, rs)
-#define ASM_MUL_REG_REG(state, rd, rs) asm_rv32m_opcode_mul(state, rd, rd, rs)
+#define ASM_MUL_REG_REG(state, rd, rs) asm_rv32_opcode_mul(state, rd, rd, rs)
 #define ASM_NEG_REG(state, rd) asm_rv32_opcode_sub(state, rd, ASM_RV32_REG_ZERO, rd)
 #define ASM_NOT_REG(state, rd) asm_rv32_opcode_xori(state, rd, rd, -1)
 #define ASM_OR_REG_REG(state, rd, rs) asm_rv32_opcode_or(state, rd, rd, rs)

From da0e027fa5699ce2676568fecba1f55a30344f7b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 1 Aug 2024 21:21:38 +0200
Subject: [PATCH 1319/3129] py/asmrv32: Emit C.LW opcodes only when necessary.

The RV32 emitter sometimes generated short load opcodes even when it
was not supposed to.  This commit fixes an off-by-one error in its
offset eligibility range calculation and corrects one case of offset
calculation, operating on the raw label index number rather than its
effective offset in the stack (C.LW assumes all loads are
word-aligned).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index a68401cf32fef..f121c1ef6b620 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -301,7 +301,7 @@ void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index) {
     mp_uint_t offset = index * ASM_WORD_SIZE;
     state->saved_registers_mask |= (1U << ASM_RV32_REG_RA);
 
-    if (IS_IN_C_REGISTER_WINDOW(REG_FUN_TABLE) && IS_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY) && FIT_SIGNED(offset, 7)) {
+    if (IS_IN_C_REGISTER_WINDOW(REG_FUN_TABLE) && IS_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY) && FIT_UNSIGNED(offset, 6)) {
         // c.lw   temporary, offset(fun_table)
         // c.jalr temporary
         asm_rv32_opcode_clw(state, MAP_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY), MAP_IN_C_REGISTER_WINDOW(REG_FUN_TABLE), offset);
@@ -487,7 +487,7 @@ void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t
 void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     mp_int_t scaled_offset = offset * sizeof(ASM_WORD_SIZE);
 
-    if (IS_IN_C_REGISTER_WINDOW(rd) && IS_IN_C_REGISTER_WINDOW(rs) && FIT_SIGNED(offset, 7)) {
+    if (scaled_offset >= 0 && IS_IN_C_REGISTER_WINDOW(rd) && IS_IN_C_REGISTER_WINDOW(rs) && FIT_UNSIGNED(scaled_offset, 6)) {
         // c.lw rd', offset(rs')
         asm_rv32_opcode_clw(state, MAP_IN_C_REGISTER_WINDOW(rd), MAP_IN_C_REGISTER_WINDOW(rs), scaled_offset);
         return;

From 7d8b2d89cc6b3734b6ecef36c49354fbf1406687 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 16 Aug 2024 13:57:02 +0200
Subject: [PATCH 1320/3129] py/asmrv32: Use REG_TEMP2 whenever possible.

The RV32 emitter used an additional temporary register, as certain code
sequences required extra storage.  This commit removes its usage in all
but one case, using REG_TEMP2 instead.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index f121c1ef6b620..3f3395842efb9 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -312,8 +312,8 @@ void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index) {
     if (FIT_UNSIGNED(offset, 11)) {
         // lw     temporary, offset(fun_table)
         // c.jalr temporary
-        asm_rv32_opcode_lw(state, INTERNAL_TEMPORARY, REG_FUN_TABLE, offset);
-        asm_rv32_opcode_cjalr(state, INTERNAL_TEMPORARY);
+        asm_rv32_opcode_lw(state, REG_TEMP2, REG_FUN_TABLE, offset);
+        asm_rv32_opcode_cjalr(state, REG_TEMP2);
         return;
     }
 
@@ -321,16 +321,14 @@ void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index) {
     mp_uint_t lower = 0;
     split_immediate(offset, &upper, &lower);
 
-    // TODO: Can this clobber REG_TEMP[0:2]?
-
     // lui    temporary, HI(index) ; Or c.lui if possible
     // c.add  temporary, fun_table
     // lw     temporary, LO(index)(temporary)
     // c.jalr temporary
-    load_upper_immediate(state, INTERNAL_TEMPORARY, upper);
-    asm_rv32_opcode_cadd(state, INTERNAL_TEMPORARY, REG_FUN_TABLE);
-    asm_rv32_opcode_lw(state, INTERNAL_TEMPORARY, INTERNAL_TEMPORARY, lower);
-    asm_rv32_opcode_cjalr(state, INTERNAL_TEMPORARY);
+    load_upper_immediate(state, REG_TEMP2, upper);
+    asm_rv32_opcode_cadd(state, REG_TEMP2, REG_FUN_TABLE);
+    asm_rv32_opcode_lw(state, REG_TEMP2, REG_TEMP2, lower);
+    asm_rv32_opcode_cjalr(state, REG_TEMP2);
 }
 
 void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t label) {
@@ -350,15 +348,13 @@ void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs
     mp_uint_t lower = 0;
     split_immediate(displacement, &upper, &lower);
 
-    // TODO: Can this clobber REG_TEMP[0:2]?
-
     // bne   rs1, rs2, 12                      ; PC + 0
     // auipc temporary, HI(displacement)       ; PC + 4
     // jalr  zero, temporary, LO(displacement) ; PC + 8
     // ...                                     ; PC + 12
     asm_rv32_opcode_bne(state, rs1, rs2, 12);
-    asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
-    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
+    asm_rv32_opcode_auipc(state, REG_TEMP2, upper);
+    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, REG_TEMP2, lower);
 }
 
 void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_t label) {
@@ -377,8 +373,6 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
         return;
     }
 
-    // TODO: Can this clobber REG_TEMP[0:2]?
-
     // if rs1 in C window and displacement is negative:
     //    c.beqz rs', 10                           ; PC + 0
     //    auipc  temporary, HI(displacement)       ; PC + 2
@@ -403,8 +397,8 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
     mp_uint_t upper = 0;
     mp_uint_t lower = 0;
     split_immediate(displacement, &upper, &lower);
-    asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
-    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
+    asm_rv32_opcode_auipc(state, REG_TEMP2, upper);
+    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, REG_TEMP2, lower);
 }
 
 void asm_rv32_emit_mov_local_reg(asm_rv32_t *state, mp_uint_t local, mp_uint_t rs) {
@@ -426,14 +420,12 @@ void asm_rv32_emit_mov_local_reg(asm_rv32_t *state, mp_uint_t local, mp_uint_t r
     mp_uint_t lower = 0;
     split_immediate(offset, &upper, &lower);
 
-    // TODO: Can this clobber REG_TEMP[0:2]?
-
     // lui   temporary, HI(offset) ; Or c.lui if possible
     // c.add temporary, sp
     // sw    rs, LO(offset)(temporary)
-    load_upper_immediate(state, INTERNAL_TEMPORARY, upper);
-    asm_rv32_opcode_cadd(state, INTERNAL_TEMPORARY, ASM_RV32_REG_SP);
-    asm_rv32_opcode_sw(state, rs, INTERNAL_TEMPORARY, lower);
+    load_upper_immediate(state, REG_TEMP2, upper);
+    asm_rv32_opcode_cadd(state, REG_TEMP2, ASM_RV32_REG_SP);
+    asm_rv32_opcode_sw(state, rs, REG_TEMP2, lower);
 }
 
 void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local) {
@@ -525,12 +517,10 @@ void asm_rv32_emit_jump(asm_rv32_t *state, mp_uint_t label) {
     mp_uint_t lower = 0;
     split_immediate(displacement, &upper, &lower);
 
-    // TODO: Can this clobber REG_TEMP[0:2]?
-
     // auipc temporary, HI(displacement)
     // jalr  zero, temporary, LO(displacement)
-    asm_rv32_opcode_auipc(state, INTERNAL_TEMPORARY, upper);
-    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, INTERNAL_TEMPORARY, lower);
+    asm_rv32_opcode_auipc(state, REG_TEMP2, upper);
+    asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, REG_TEMP2, lower);
 }
 
 void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
@@ -549,9 +539,9 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint
     // lui   temporary, HI(offset) ; Or c.lui if possible
     // c.add temporary, rs
     // sw    rd, LO(offset)(temporary)
-    load_upper_immediate(state, INTERNAL_TEMPORARY, upper);
-    asm_rv32_opcode_cadd(state, INTERNAL_TEMPORARY, rs);
-    asm_rv32_opcode_sw(state, rd, INTERNAL_TEMPORARY, lower);
+    load_upper_immediate(state, REG_TEMP2, upper);
+    asm_rv32_opcode_cadd(state, REG_TEMP2, rs);
+    asm_rv32_opcode_sw(state, rd, REG_TEMP2, lower);
 }
 
 void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t label) {

From 36108a41d0d397fdbfcda060a05f0fa8e206aa96 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 27 Dec 2023 14:47:00 +0100
Subject: [PATCH 1321/3129] mimxrt/mimxrt_sdram: Fix pin config and comments.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/mimxrt_sdram.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/mimxrt_sdram.c b/ports/mimxrt/mimxrt_sdram.c
index ea53daf5ca704..92f3aa1a5403e 100644
--- a/ports/mimxrt/mimxrt_sdram.c
+++ b/ports/mimxrt/mimxrt_sdram.c
@@ -35,10 +35,10 @@
 extern uint8_t __sdram_start;
 
 #if defined(MIMXRT117x_SERIES)
-// Pull Up, High drive strength
-#define SDRAM_PIN_CONFIG  (0x07UL)
+// No pull, normal drive strength
+#define SDRAM_PIN_CONFIG  (0x0EUL)
 #else
-// Pull up 22K, high slew rate
+// No pull, maximum speed, Drive Strength 4, fast slew rate
 #define SDRAM_PIN_CONFIG  (0xE1UL)
 #endif
 

From 87adf11dd282fb5b121427ef5bdf133c2dfdfdac Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 Jun 2024 09:22:46 +0200
Subject: [PATCH 1322/3129] mimxrt/machine_pin: Clear IRQ flag when enabling or
 disabling IRQ.

Preventing already pending IRQs to fire when not expected.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_pin.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index ad4158c6bdee9..4f623214bc728 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -407,6 +407,7 @@ static mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     if (args[ARG_handler].u_obj == mp_const_none) {
         // remove the IRQ from the table, leave it to gc to free it.
         GPIO_PortDisableInterrupts(self->gpio, 1U << self->pin);
+        GPIO_PortClearInterruptFlags(self->gpio, 1U << self->pin);
         MP_STATE_PORT(machine_pin_irq_objects[index]) = NULL;
         return mp_const_none;
     }
@@ -445,6 +446,8 @@ static mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
             GPIO_PinSetInterruptConfig(self->gpio, self->pin, irq->trigger);
             // Enable the specific Pin interrupt
             GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin);
+            // Clear previous IRQs
+            GPIO_PortClearInterruptFlags(self->gpio, 1U << self->pin);
             // Enable LEVEL1 interrupt again
             EnableIRQ(irq_num);
         }

From 76dd4facb9b1cf81e7f7a262c931adffb126b382 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 10 Jul 2024 09:44:17 +0200
Subject: [PATCH 1323/3129] docs/mimxrt/quickref: Add a note about
 machine.RTC() subseconds.

Telling that subseconds is not supported and returns always 0.  This was
changed in 913f9ad5ad9bb446c6e4310b6b5eda310098a1cf.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/mimxrt/quickref.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index 79d2a1551e4c3..cfd0605054a7b 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -438,6 +438,10 @@ The i.MXRT MCU supports battery backup of the RTC.  By connecting a battery of
 current drawn from the battery is ~20µA, which is rather high.  A CR2032 coin
 cell will last for about one year.
 
+Note: In v1.23.0 the support for subseconds was removed. When reading the RTC, 0 will
+be returned as value for subsecond, When setting the RTC time, the subsecond
+field is ignored. The RTC itself does not provide a microsecond value.
+
 SD card
 -------
 

From 26d91b897ea46a28f3d32cbe094b607124c1657d Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 13 Aug 2024 14:55:26 +0100
Subject: [PATCH 1324/3129] rp2/mphalport: Skip core1_entry if thread disabled.

If `MICROPY_PY_THREAD` is set to 0 (ie: a user C module wishes to use core1
exclusively) then the test of `core1_entry` would fail to compile with an
"undeclared identifier" error.  Fix it by wrapping in `MICROPY_PY_THREAD`.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/mphalport.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index ad51cf8e21f43..aa5415d6c842d 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -232,9 +232,11 @@ static void soft_timer_hardware_callback(unsigned int alarm_num) {
     // This ISR only runs on core0, but if core1 is running Python code then it
     // may be blocked in WFE so wake it up as well. Unfortunately this also sets
     // the event flag on core0, so a subsequent WFE on this core will not suspend
+    #if MICROPY_PY_THREAD
     if (core1_entry != NULL) {
         __sev();
     }
+    #endif
 }
 
 void soft_timer_init(void) {

From d420b4e478267cf8c6c0136982bdeeedaccf3920 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 20 Feb 2024 21:46:57 +0100
Subject: [PATCH 1325/3129] rp2/main: Set the default clock frequency at boot.

As a side effect, the peripheral clock will be set to 48Mhz and both UART
and I2C will not be affected by CPu speed changed using `machine.freq()`.

With the change the UART baud rate range is 50 to 3_000_000.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/rp2/main.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 1ce1d2bf31d65..fa5495bf4100d 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -80,6 +80,9 @@ int main(int argc, char **argv) {
     pendsv_init();
     soft_timer_init();
 
+    // Set the MCU frequency and as a side effect the peripheral clock to 48 MHz.
+    set_sys_clock_khz(125000, false);
+
     #if MICROPY_HW_ENABLE_UART_REPL
     bi_decl(bi_program_feature("UART REPL"))
     setup_default_uart();
@@ -231,6 +234,10 @@ int main(int argc, char **argv) {
 
         gc_sweep_all();
         mp_deinit();
+        #if MICROPY_HW_ENABLE_UART_REPL
+        setup_default_uart();
+        mp_uart_init();
+        #endif
     }
 
     return 0;

From 7270b871c248a4a091d310ec59eca4138a3e96e3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 22 Feb 2024 09:03:06 +0100
Subject: [PATCH 1326/3129] rp2/modmachine: Set the peripheral frequency with
 machine.freq().

By default, the peripheral clock for UART and SPI is set to 48 MHz and will
not be affected by the MCU clock change.  This can be changed by a second
argument to `machine.freq(freq, peripheral_freq)`.  The second argument
must be either 48 MHz or identical with the first argument.

Note that UART and SPI baud rates may have to be re-configured after
changing the MCU clock.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/rp2/quickref.rst    | 17 +++++++++++++++--
 ports/rp2/modmachine.c   | 14 ++++++++++++++
 ports/rp2/mpconfigport.h |  1 +
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index ecf3f31861c22..9b82ea5dc6749 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -31,12 +31,25 @@ The MicroPython REPL is accessed via the USB serial port. Tab-completion is usef
 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::
+The :mod:`machine` module:
+
+machine.freq() allows to change the MCU frequency and control the peripheral
+frequency for UART and SPI. Usage::
+
+    machine.freq(MCU_frequency[, peripheral_frequency=48_000_000])
+
+The MCU frequency can be set in a range from less than 48 MHz to about 250MHz.
+The default at boot time is 125 MHz. The peripheral frequency must be either
+48 MHz or identical to the MCU frequency, with 48 MHz as the default.
+If the peripheral frequency is changed, any already existing instance of
+UART and SPI will change it's baud rate and may have to be re-configured::
 
     import machine
 
     machine.freq()          # get the current frequency of the CPU
-    machine.freq(240000000) # set the CPU frequency to 240 MHz
+    machine.freq(240000000) # set the CPU frequency to 240 MHz and keep
+                            # the UART frequency at 48MHz
+    machine.freq(125000000, 125000000) # set the CPU and UART frequency to 125 MHz
 
 The :mod:`rp2` module::
 
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 229000cc1797c..372c17bcf9d6b 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -96,6 +96,20 @@ static void mp_machine_set_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 (n_args > 1) {
+        mp_int_t freq_peri = mp_obj_get_int(args[1]);
+        if (freq_peri != (USB_CLK_KHZ * KHZ)) {
+            if (freq_peri == freq) {
+                clock_configure(clk_peri,
+                    0,
+                    CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLKSRC_PLL_SYS,
+                    freq,
+                    freq);
+            } else {
+                mp_raise_ValueError(MP_ERROR_TEXT("peripheral freq must be 48_000_000 or the same as the MCU freq"));
+            }
+        }
+    }
     #if MICROPY_HW_ENABLE_UART_REPL
     setup_default_uart();
     mp_uart_init();
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 3399212aacaa6..abe25d7009e1e 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -148,6 +148,7 @@
 #define MICROPY_PY_MACHINE_UART_SENDBREAK       (1)
 #define MICROPY_PY_MACHINE_WDT                  (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE      "ports/rp2/machine_wdt.c"
+#define MICROPY_PY_MACHINE_FREQ_NUM_ARGS_MAX    (2)
 #define MICROPY_PY_ONEWIRE                      (1)
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)

From ad3829977967f3e2f1a3fdb5d9d71f685702fc28 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Wed, 14 Aug 2024 10:22:26 +1000
Subject: [PATCH 1327/3129] samd/boards/ADAFRUIT_METRO_M4_EXPRESS: Remove wlan
 variant.

There is no such variant.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
index f830ff223f909..4a3158d71334c 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/board.json
@@ -15,9 +15,6 @@
         "metro_m4_express_airlift.jpg"
     ],
     "mcu": "samd51",
-    "variants": {
-        "wlan": "WLAN without SSL support"
-    },
     "product": "Metro M4 Express Airlift",
     "thumbnail": "",
     "url": "https://www.adafruit.com/product/4000",

From b704ff66c3e034c36e548eb0b9874871b5f3b5d0 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sat, 17 Aug 2024 16:34:51 +1000
Subject: [PATCH 1328/3129] esp32/boards: Remove all IDF3 variants.

IDF 3 builds are very old now (it seems like the last successful builds are
from 2021), and the current IDF 5 is stable.  So remove IDF 3 variants.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/esp32/boards/ESP32_GENERIC/board.json | 1 -
 ports/esp32/boards/UM_TINYPICO/board.json   | 3 ---
 tools/autobuild/build-boards.sh             | 6 ++----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC/board.json b/ports/esp32/boards/ESP32_GENERIC/board.json
index 0db38c25d3640..130f6b88c8856 100644
--- a/ports/esp32/boards/ESP32_GENERIC/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC/board.json
@@ -16,7 +16,6 @@
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
     "variants": {
-        "IDF3": "Compiled with IDF 3.x",
         "D2WD": "ESP32 D2WD",
         "SPIRAM": "Support for SPIRAM / WROVER",
         "UNICORE": "ESP32 Unicore",
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index 6dbe762f3afd6..5ec7913c42ec6 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -22,8 +22,5 @@
     "product": "TinyPICO",
     "thumbnail": "",
     "url": "https://www.tinypico.com/",
-    "variants": {
-        "IDF3": "Compiled with IDF 3.x"
-    },
     "vendor": "Unexpected Maker"
 }
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 4b8cf315a2f9c..801e7062e5798 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -55,10 +55,8 @@ function build_board {
     $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir && copy_artefacts $dest_dir $descr $fw_tag $build_dir $@
     rm -rf $build_dir
 
-    # Query variants from board.json and build them. Ignore the special "IDF3"
-    # variant for ESP32 boards (this allows the downloads page to still have
-    # the idf3 files for older releases that used to be explicitly built).
-    for variant in `cat $board_json | python3 -c "import json,sys; print(' '.join(v for v in json.load(sys.stdin).get('variants', {}).keys() if v != 'IDF3'))"`; do
+    # Query variants from board.json and build them.
+    for variant in `cat $board_json | python3 -c "import json,sys; print(' '.join(json.load(sys.stdin).get('variants', {}).keys()))"`; do
         local variant_build_dir=$build_dir-$variant
         echo "building variant $descr $board $variant"
         $MICROPY_AUTOBUILD_MAKE BOARD=$board BOARD_VARIANT=$variant BUILD=$variant_build_dir && copy_artefacts $dest_dir $descr-$variant $fw_tag $variant_build_dir $@

From 5e8d35af08b620f1498a5135d25fe6d8f3e72337 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sat, 17 Aug 2024 22:07:21 +1000
Subject: [PATCH 1329/3129] stm32/boards: Add missing images and update product
 URLs.

There are some missing images at MicroPython Downloads.  This commit
attempts to resolve all the current issues, and add product URLs where
missing.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/stm32/boards/B_L475E_IOT01A/board.json             | 6 ++++--
 ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json | 4 +++-
 ports/stm32/boards/LEGO_HUB_NO6/board.json               | 4 +++-
 ports/stm32/boards/LEGO_HUB_NO7/board.json               | 4 +++-
 ports/stm32/boards/NUCLEO_F756ZG/board.json              | 2 +-
 ports/stm32/boards/NUCLEO_G0B1RE/board.json              | 2 +-
 ports/stm32/boards/NUCLEO_G474RE/board.json              | 2 +-
 ports/stm32/boards/NUCLEO_H723ZG/board.json              | 2 +-
 ports/stm32/boards/NUCLEO_H743ZI2/board.json             | 4 +++-
 ports/stm32/boards/NUCLEO_L152RE/board.json              | 2 +-
 ports/stm32/boards/NUCLEO_L4A6ZG/board.json              | 2 +-
 ports/stm32/boards/NUCLEO_WL55/board.json                | 2 +-
 ports/stm32/boards/STM32L496GDISC/board.json             | 6 ++++--
 13 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/boards/B_L475E_IOT01A/board.json b/ports/stm32/boards/B_L475E_IOT01A/board.json
index 91e76bc08e5ab..0841b1c6d92e7 100644
--- a/ports/stm32/boards/B_L475E_IOT01A/board.json
+++ b/ports/stm32/boards/B_L475E_IOT01A/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "b-l475e-iot01a-discovery.jpg"
+    ],
     "mcu": "stm32l4",
     "product": "B_L475E_IOT01A",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/b-l475e-iot01a.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json
index 1df9b6f6586c5..056423d669c9c 100644
--- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "pybstick26_f411.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "GARATRONIC_PYBSTICK26_F411",
     "thumbnail": "",
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board.json b/ports/stm32/boards/LEGO_HUB_NO6/board.json
index 3c602abba1379..0bb878abafff0 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board.json
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "lego_hub_6.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Hub No.6",
     "thumbnail": "",
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/board.json b/ports/stm32/boards/LEGO_HUB_NO7/board.json
index 1ef02c17a0636..7eb13f18fe12c 100644
--- a/ports/stm32/boards/LEGO_HUB_NO7/board.json
+++ b/ports/stm32/boards/LEGO_HUB_NO7/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "lego_hub_7.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Hub No.7",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/board.json b/ports/stm32/boards/NUCLEO_F756ZG/board.json
index 416c0b9154e1a..1b98d885694e7 100644
--- a/ports/stm32/boards/NUCLEO_F756ZG/board.json
+++ b/ports/stm32/boards/NUCLEO_F756ZG/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32f7",
     "product": "Nucleo F756ZG",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/nucleo-f756zg.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/board.json b/ports/stm32/boards/NUCLEO_G0B1RE/board.json
index f4c6f2f2df3ae..86977e8ee2fcb 100644
--- a/ports/stm32/boards/NUCLEO_G0B1RE/board.json
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32g0",
     "product": "Nucleo G0B1RE",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/nucleo-g0b1re.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/NUCLEO_G474RE/board.json b/ports/stm32/boards/NUCLEO_G474RE/board.json
index 3bbb749826443..cfc72e4f1d16b 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/board.json
+++ b/ports/stm32/boards/NUCLEO_G474RE/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32g4",
     "product": "Nucleo G474RE",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/nucleo-g474re.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/NUCLEO_H723ZG/board.json b/ports/stm32/boards/NUCLEO_H723ZG/board.json
index bf7dc0e2fb29e..6aa76008e0514 100644
--- a/ports/stm32/boards/NUCLEO_H723ZG/board.json
+++ b/ports/stm32/boards/NUCLEO_H723ZG/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32h7",
     "product": "Nucleo H723ZG",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/nucleo-h723zg.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/board.json b/ports/stm32/boards/NUCLEO_H743ZI2/board.json
index 65f01de56559e..74c1ed6c41e47 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI2/board.json
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_h743zi2.jpg"
+    ],
     "mcu": "stm32h7",
     "product": "Nucleo H743ZI2",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_L152RE/board.json b/ports/stm32/boards/NUCLEO_L152RE/board.json
index 7b34276937553..abc9fbe58637b 100644
--- a/ports/stm32/boards/NUCLEO_L152RE/board.json
+++ b/ports/stm32/boards/NUCLEO_L152RE/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32l1",
     "product": "Nucleo L152RE",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/nucleo-l152re.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/NUCLEO_L4A6ZG/board.json b/ports/stm32/boards/NUCLEO_L4A6ZG/board.json
index 73b134eac2b35..a3a38f24f50e4 100644
--- a/ports/stm32/boards/NUCLEO_L4A6ZG/board.json
+++ b/ports/stm32/boards/NUCLEO_L4A6ZG/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32l4",
     "product": "Nucleo L4A6ZG",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/nucleo-l4a6zg.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/NUCLEO_WL55/board.json b/ports/stm32/boards/NUCLEO_WL55/board.json
index d756a4cdbbddb..6c12e67b29bda 100644
--- a/ports/stm32/boards/NUCLEO_WL55/board.json
+++ b/ports/stm32/boards/NUCLEO_WL55/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32wl",
     "product": "Nucleo WL55",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/nucleo-wl55jc.html",
     "vendor": "ST Microelectronics"
 }
diff --git a/ports/stm32/boards/STM32L496GDISC/board.json b/ports/stm32/boards/STM32L496GDISC/board.json
index b152948c1a861..e1aff372ce4a8 100644
--- a/ports/stm32/boards/STM32L496GDISC/board.json
+++ b/ports/stm32/boards/STM32L496GDISC/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32l496discovery.jpg"
+    ],
     "mcu": "stm32l4",
     "product": "Discovery L496G",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.st.com/en/evaluation-tools/32l496gdiscovery.html",
     "vendor": "ST Microelectronics"
 }

From 185116ea4139e84e7f7afb27d52b14dc03f0c2a8 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 14 Aug 2024 12:04:11 +1000
Subject: [PATCH 1330/3129] stm32/stm32_it: Enable PVD_PVM_IRQHandler for WB
 and WL MCUs.

There is a gap in support for the PVD interrupt on STM32WBxx and STM32WLxx.
This has been tested on NUCLEO_WB55 with the example code:

    from pyb import Pin, ExtInt

    def callback(line):
        print(line)

    PVD = 16
    exti = ExtInt(PVD, ExtInt.IRQ_RISING_FALLING, Pin.PULL_DOWN, callback)

    exti.swint()

Before this commit the CPU locks up as soon as the final line is run.
After this commit it prints "16".

Fixes issue #15548.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 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 bc1feceb9c2b5..a910a624be953 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -514,7 +514,7 @@ void PVD_IRQHandler(void) {
     IRQ_EXIT(PVD_IRQn);
 }
 
-#if defined(STM32L4)
+#if defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 void PVD_PVM_IRQHandler(void) {
     IRQ_ENTER(PVD_PVM_IRQn);
     Handle_EXTI_Irq(EXTI_PVD_OUTPUT);

From e2c0e876f52d438fbdc286ab51cee92d5a24218e Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Tue, 9 Aug 2022 00:56:50 +1000
Subject: [PATCH 1331/3129] stm32/rfcore: Allow HSE to be a wakeup source for
 BLE for the WB55.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 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 05582e887eeb5..2d99a3410baaa 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -539,8 +539,12 @@ void rfcore_init(void) {
     while (LL_HSEM_1StepLock(HSEM, CFG_HW_PWR_STANDBY_SEMID)) {
     }
 
-    // Select LSE as RF wakeup source
+    // Set the wakeup source to LSE or fall back to use HSE
+    #if MICROPY_HW_RTC_USE_LSE
     RCC->CSR = (RCC->CSR & ~RCC_CSR_RFWKPSEL) | 1 << RCC_CSR_RFWKPSEL_Pos;
+    #else
+    RCC->CSR = (RCC->CSR & ~RCC_CSR_RFWKPSEL) | 3 << RCC_CSR_RFWKPSEL_Pos;
+    #endif
 
     // Initialise IPCC and shared memory structures
     ipcc_init(IRQ_PRI_SDIO);

From bd4aaa7333edf53a17c31c96ae731202fec4b0f9 Mon Sep 17 00:00:00 2001
From: nspsck <teng.jiang94@gmail.com>
Date: Tue, 26 Sep 2023 20:06:30 +0200
Subject: [PATCH 1332/3129] stm32/octospi: Add OSPI support for STM32H7 MCUs.

Added a if-statement to `octospi.c` to detect if the targeted MCU is one of
the STM32H7 series.  If that is the case, another set of variables are used
for the `mp_hal_pin_config_alt_static_speed()` function, as well as for
register `OCTOSPI1->CR`.  This allows the STM32H723 and STM32H7B3 series
MCU to use octo-spi flash like the STM32H573 series MCU.

Signed-off-by: nspsck <teng.jiang94@gmail.com>
---
 ports/stm32/octospi.c | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/ports/stm32/octospi.c b/ports/stm32/octospi.c
index 1d59e2b560eda..407f485664c6b 100644
--- a/ports/stm32/octospi.c
+++ b/ports/stm32/octospi.c
@@ -45,19 +45,24 @@
 
 void octospi_init(void) {
     // Configure OCTOSPI pins (allows 1, 2, 4 or 8 line configuration).
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_CS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_NCS);
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_SCK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_CLK);
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO0);
+    #if defined(STM32H7)
+    #define STATIC_AF_OCTOSPI(signal) STATIC_AF_OCTOSPIM_P1_##signal
+    #else
+    #define STATIC_AF_OCTOSPI(signal) STATIC_AF_OCTOSPI1_##signal
+    #endif
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_CS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(NCS));
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_SCK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(CLK));
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO0));
     #if defined(MICROPY_HW_OSPIFLASH_IO1)
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO1);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO1));
     #if defined(MICROPY_HW_OSPIFLASH_IO2)
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO2);
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO3);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO2));
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO3));
     #if defined(MICROPY_HW_OSPIFLASH_IO4)
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO4, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO4);
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO5);
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO6);
-    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI1_IO7);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO4, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO4));
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO5));
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO6));
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_IO7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(IO7));
     #endif
     #endif
     #endif
@@ -69,11 +74,19 @@ void octospi_init(void) {
 
     // Configure the OCTOSPI peripheral.
 
+    #if defined(STM32H7)
+    OCTOSPI1->CR =
+        3 << OCTOSPI_CR_FTHRES_Pos // 4 bytes must be available to read/write
+            | 0 << OCTOSPI_CR_FSEL_Pos // FLASH 0 selected
+            | 0 << OCTOSPI_CR_DQM_Pos // dual-memory mode disabled
+    ;
+    #else
     OCTOSPI1->CR =
         3 << OCTOSPI_CR_FTHRES_Pos // 4 bytes must be available to read/write
             | 0 << OCTOSPI_CR_MSEL_Pos // FLASH 0 selected
             | 0 << OCTOSPI_CR_DMM_Pos // dual-memory mode disabled
     ;
+    #endif
 
     OCTOSPI1->DCR1 =
         (MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2 - 3 - 1) << OCTOSPI_DCR1_DEVSIZE_Pos

From 20a95b249a439b4dc57da0c2beccac35ec45db76 Mon Sep 17 00:00:00 2001
From: nspsck <teng.jiang94@gmail.com>
Date: Fri, 17 Nov 2023 12:48:53 +0100
Subject: [PATCH 1333/3129] stm32/system_stm32: Allow selection of OSPI clock
 source.

Added a #if-block to `system_stm32.c` to check whether
`MICROPY_HW_RCC_OSPI_CLKSOURCE` is defined.  If that is the case, the
clock source for the OSPI will be changed to the specified source.

Signed-off-by: nspsck <teng.jiang94@gmail.com>
---
 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 2cff36c3a611c..b76a41e97bf78 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -461,6 +461,11 @@ MP_WEAK void SystemClock_Config(void) {
     PeriphClkInitStruct.QspiClockSelection = MICROPY_HW_RCC_QSPI_CLKSOURCE;
     #endif
 
+    #if defined(MICROPY_HW_RCC_OSPI_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_OSPI;
+    PeriphClkInitStruct.OspiClockSelection = MICROPY_HW_RCC_OSPI_CLKSOURCE;
+    #endif
+
     #if defined(MICROPY_HW_RCC_SPI123_CLKSOURCE)
     PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_SPI123;
     PeriphClkInitStruct.Spi123ClockSelection = MICROPY_HW_RCC_SPI123_CLKSOURCE;

From 6c3dc0c0b09701b83a957368220d9c8bfe40af0a Mon Sep 17 00:00:00 2001
From: nspsck <teng.jiang94@gmail.com>
Date: Tue, 26 Sep 2023 19:44:14 +0200
Subject: [PATCH 1334/3129] stm32/boards/STM32H7B3I_DK: Fix octo-spi pin
 configuration.

The original OSPIFLASH settings in the `mpconfigboard.h` contained some
mistakes that prevented the firmware from compiling.  These are now
corrected and the firmware can be built with support for OSPI flash.

Note: external storage in OSPI flash is not yet configured on this board.

Signed-off-by: nspsck <teng.jiang94@gmail.com>
---
 ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
index f742241f7f869..88786e66d8d12 100644
--- a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
+++ b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
@@ -39,20 +39,20 @@
 // SMPS configuration
 #define MICROPY_HW_PWR_SMPS_CONFIG  (PWR_DIRECT_SMPS_SUPPLY)
 
-#if 0
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 // 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_SCK    (pin_B2)
 #define MICROPY_HW_OSPIFLASH_DQS    (pin_C5)
-#define MICROPY_HW_OSPIFLASH_IO0    (pin_P8)
+#define MICROPY_HW_OSPIFLASH_IO0    (pin_D11)
 #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)
+#define MICROPY_HW_OSPIFLASH_IO6    (pin_G9)
+#define MICROPY_HW_OSPIFLASH_IO7    (pin_D7)
 #endif
 
 // UART buses

From 0b7f6e1d3d57036aaeb082bdc685310a42dd6cb0 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Sun, 21 Apr 2024 16:10:18 +0200
Subject: [PATCH 1335/3129] py/mkrules.mk: Fix 'make submodules' when building
 out-of-tree.

When MicroPython is used as a submodule and built from the containing
project, e.g. for the embed port, `make submodules` fails because it goes
looking for the sub-sub-module paths in the outer repository instead of in
the micropython repository. Fix this by invoking git inside the micropython
submodule.

Signed-off-by: Christian Walther <cwalther@gmx.ch>
---
 py/mkrules.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 5050935873aff..0dc1cdfe15ac4 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -251,8 +251,8 @@ 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))
+	$(Q)cd $(TOP) && git submodule sync $(GIT_SUBMODULES)
+	$(Q)cd $(TOP) && git submodule update --init $(GIT_SUBMODULES)
 endif
 .PHONY: submodules
 

From 260568e081a56488f122db41065e0059ca89c306 Mon Sep 17 00:00:00 2001
From: Rick Sorensen <rick.sorensen@gmail.com>
Date: Sun, 9 Jun 2024 21:34:01 -0500
Subject: [PATCH 1336/3129] samd/mcu/samd21: Allow user to enable additional
 options.

Currently for samd21 some features are disable because of limited memory.
With the ability to trade firmware and filesystem space, a user may wish to
selectively enable some of these features.  This change allows them to be
enabled in board `mpconfigboard.h` or on the build command line for
example.  The selectively enable functions are: MICROPY_PY_FRAMEBUF,
MICROPY_PY_SELECT, MICROPY_PY_ONEWIRE and MICROPY_PY_ASYNCIO.

Signed-off-by: Rick Sorensen <rick.sorensen@gmail.com>
---
 ports/samd/mcu/samd21/mpconfigmcu.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index fdad3fee4a71b..fbb5b28e2b95a 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -63,12 +63,20 @@ unsigned long trng_random_u32(int delay);
 #define MICROPY_PY_BUILTINS_ROUND_INT   (SAMD21_EXTRA_FEATURES)
 #define MICROPY_CAN_OVERRIDE_BUILTINS   (SAMD21_EXTRA_FEATURES)
 #define MICROPY_PY_SYS_STDIO_BUFFER     (SAMD21_EXTRA_FEATURES)
+#ifndef MICROPY_PY_FRAMEBUF
 #define MICROPY_PY_FRAMEBUF             (SAMD21_EXTRA_FEATURES)
+#endif
+#ifndef MICROPY_PY_ASYNCIO
 #define MICROPY_PY_ASYNCIO              (SAMD21_EXTRA_FEATURES)
+#endif
+#ifndef MICROPY_PY_SELECT
 #define MICROPY_PY_SELECT               (SAMD21_EXTRA_FEATURES)
+#endif
 #define MICROPY_PY_ERRNO                (SAMD21_EXTRA_FEATURES)
 #define MICROPY_PY_DEFLATE              (SAMD21_EXTRA_FEATURES)
+#ifndef MICROPY_PY_ONEWIRE
 #define MICROPY_PY_ONEWIRE              (SAMD21_EXTRA_FEATURES)
+#endif
 
 #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
 #define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1)

From 706e09dff3d1253bc8b58331b52d04f406919596 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 13 Aug 2024 11:44:57 +0300
Subject: [PATCH 1337/3129] shared/tinyusb: Allow ports to define CDC TX/RX
 buffer sizes.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 shared/tinyusb/tusb_config.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index 1f8f5e5f6dc56..d0c9f89ec600c 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -77,8 +77,12 @@
 
 // CDC Configuration
 #if CFG_TUD_CDC
+#ifndef CFG_TUD_CDC_RX_BUFSIZE
 #define CFG_TUD_CDC_RX_BUFSIZE  ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
+#endif
+#ifndef CFG_TUD_CDC_TX_BUFSIZE
 #define CFG_TUD_CDC_TX_BUFSIZE  ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
+#endif
 #define CFG_TUD_CDC_PERSISTENT_TX_BUFF (1)
 #endif
 

From b82c9ca706a675b53200d8df27ee3903ff521c2d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 24 Jul 2024 17:02:43 +1000
Subject: [PATCH 1338/3129] extmod/modtls_mbedtls: Optimise the DER certificate
 parsing fix.

Small code size and binary size optimisation for the fix merged in
4d6d84983f370e48e81fb05fe31802e0a13fb369.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/modtls_mbedtls.c | 49 +++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index d3fc26fad2a54..30118e200dee0 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -100,11 +100,22 @@ static void mbedtls_debug(void *ctx, int level, const char *file, int line, cons
 }
 #endif
 
-#if defined(MBEDTLS_PEM_PARSE_C)
-static int mbedtls_is_pem(const byte *data, size_t len) {
-    return (len >= 10) && (strstr((const char *)data, "-----BEGIN") != NULL);
+// Given a string-like object holding PEM or DER formatted ASN.1 data, return a
+// pointer to its buffer and the correct length for mbedTLS APIs.
+//
+// (mbedTLS >= 3.5 rejects DER formatted data with trailing bytes within keylen,
+// but PEM must include a terminating NUL byte in the keylen...)
+static const unsigned char *asn1_get_data(mp_obj_t obj, size_t *out_len) {
+    size_t len;
+    const char *str = mp_obj_str_get_data(obj, &len);
+    #if defined(MBEDTLS_PEM_PARSE_C)
+    if (strstr(str, "-----BEGIN ") != NULL) {
+        ++len;
+    }
+    #endif
+    *out_len = len;
+    return (const unsigned char *)str;
 }
-#endif
 
 static NORETURN void mbedtls_raise_error(int err) {
     // Handle special cases.
@@ -352,15 +363,7 @@ static MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_set_ciphers_obj, ssl_context_set_ci
 
 static void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, mp_obj_t cert_obj) {
     size_t key_len;
-    const byte *key = (const byte *)mp_obj_str_get_data(key_obj, &key_len);
-
-    #if defined(MBEDTLS_PEM_PARSE_C)
-    // len should include terminating null if the data is PEM encoded
-    if (mbedtls_is_pem(key, key_len)) {
-        key_len += 1;
-    }
-    #endif
-
+    const unsigned char *key = asn1_get_data(key_obj, &key_len);
     int ret;
     #if MBEDTLS_VERSION_NUMBER >= 0x03000000
     ret = mbedtls_pk_parse_key(&self->pkey, key, key_len, NULL, 0, mbedtls_ctr_drbg_random, &self->ctr_drbg);
@@ -372,15 +375,7 @@ static void ssl_context_load_key(mp_obj_ssl_context_t *self, mp_obj_t key_obj, m
     }
 
     size_t cert_len;
-    const byte *cert = (const byte *)mp_obj_str_get_data(cert_obj, &cert_len);
-
-    #if defined(MBEDTLS_PEM_PARSE_C)
-    // len should include terminating null if the data is PEM encoded
-    if (mbedtls_is_pem(cert, cert_len)) {
-        cert_len += 1;
-    }
-    #endif
-
+    const unsigned char *cert = asn1_get_data(cert_obj, &cert_len);
     ret = mbedtls_x509_crt_parse(&self->cert, cert, cert_len);
     if (ret != 0) {
         mbedtls_raise_error(MBEDTLS_ERR_X509_BAD_INPUT_DATA); // use general error for all cert errors
@@ -402,15 +397,7 @@ static MP_DEFINE_CONST_FUN_OBJ_3(ssl_context_load_cert_chain_obj, ssl_context_lo
 
 static void ssl_context_load_cadata(mp_obj_ssl_context_t *self, mp_obj_t cadata_obj) {
     size_t cacert_len;
-    const byte *cacert = (const byte *)mp_obj_str_get_data(cadata_obj, &cacert_len);
-
-    #if defined(MBEDTLS_PEM_PARSE_C)
-    // len should include terminating null if the data is PEM encoded
-    if (mbedtls_is_pem(cacert, cacert_len)) {
-        cacert_len += 1;
-    }
-    #endif
-
+    const unsigned char *cacert = asn1_get_data(cadata_obj, &cacert_len);
     int ret = mbedtls_x509_crt_parse(&self->cacert, cacert, cacert_len);
     if (ret != 0) {
         mbedtls_raise_error(MBEDTLS_ERR_X509_BAD_INPUT_DATA); // use general error for all cert errors

From e901ff85573d4cbec1e2656aea2e5603d6bf5bd9 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@greezybacon.me>
Date: Sat, 17 Aug 2024 23:09:52 -0500
Subject: [PATCH 1339/3129] extmod/network_wiznet5k: Add support for IPv6.

This adds support for the WIZNET5K nic to use IPv6 with the LWIP stack.
Additionally, if LWIP_IPV6 is disabled, the device is configured to drop
all IPv6 packets to reduce load on the MCU.

Signed-off-by: Jared Hancock <jared@greezybacon.me>
---
 extmod/network_wiznet5k.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 1eaabe9ebeac3..96f9b6131c4b7 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -61,6 +61,7 @@
 #include "lwip/err.h"
 #include "lwip/dns.h"
 #include "lwip/dhcp.h"
+#include "lwip/ethip6.h"
 #include "netif/etharp.h"
 
 #define TRACE_ETH_TX (0x0002)
@@ -297,13 +298,21 @@ static err_t wiznet5k_netif_init(struct netif *netif) {
     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);
+        printf("WIZNET fatal error in netif_init: %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);
 
+    #if LWIP_IPV6
+    netif->output_ip6 = ethip6_output;
+    netif->flags |= NETIF_FLAG_MLD6;
+    #else
+    // Drop IPv6 packets if firmware does not support it
+    setSn_MR(0, getSn_MR(0) | Sn_MR_MIP6B);
+    #endif
+
     return ERR_OK;
 }
 
@@ -847,6 +856,10 @@ static mp_obj_t wiznet5k_active(size_t n_args, const mp_obj_t *args) {
                     setSHAR(mac);
                 }
 
+                #if WIZNET5K_WITH_LWIP_STACK && LWIP_IPV6
+                netif_create_ip6_linklocal_address(&self->netif, 1);
+                #endif
+
                 // seems we need a small delay after init
                 mp_hal_delay_ms(250);
 

From a8d1c25a1b32759642f98e994800b39457ec6add Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 24 Apr 2024 14:17:55 +0200
Subject: [PATCH 1340/3129] unix/coveragecpp: Include all API headers in the
 C++ code.

Make the CI builds compile the public API as C++ to catch accidental
introductions of incompatible code.

Signed-off-by: stijn <stijn@ignitron.net>
---
 ports/unix/coveragecpp.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ports/unix/coveragecpp.cpp b/ports/unix/coveragecpp.cpp
index 93c1b387fe285..23c3955ae9d0b 100644
--- a/ports/unix/coveragecpp.cpp
+++ b/ports/unix/coveragecpp.cpp
@@ -1,5 +1,20 @@
 extern "C" {
-#include "py/obj.h"
+// Include the complete public API to verify everything compiles as C++.
+#include <py/gc.h>
+#include <py/obj.h>
+#include <py/objarray.h>
+#include <py/objexcept.h>
+#include <py/objfun.h>
+#include <py/objgenerator.h>
+#include <py/objint.h>
+#include <py/objlist.h>
+#include <py/objmodule.h>
+#include <py/objnamedtuple.h>
+#include <py/objstr.h>
+#include <py/objstringio.h>
+#include <py/objtuple.h>
+#include <py/objtype.h>
+#include <py/runtime.h>
 }
 
 #if defined(MICROPY_UNIX_COVERAGE)

From b095c097e6cc49de6ba51f4d2ba43258f7f69d1b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Aug 2024 13:54:33 +1000
Subject: [PATCH 1341/3129] tools/pyboard.py: Capture stdout for pts line.

The pts line printed by qemu-system-arm goes to stdout, not stderr.

Redirect stderr to stdout in case other tools do print to stderr.

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

diff --git a/tools/pyboard.py b/tools/pyboard.py
index c422b64ac5516..55cbe8384d580 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -235,9 +235,9 @@ def __init__(self, cmd):
             preexec_fn=os.setsid,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
         )
-        pty_line = self.subp.stderr.readline().decode("utf-8")
+        pty_line = self.subp.stdout.readline().decode("utf-8")
         m = re.search(r"/dev/pts/[0-9]+", pty_line)
         if not m:
             print("Error: unable to find PTY device in startup line:", pty_line)

From 86aa61918a67b626809e8d132a80a63daf380b1c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Aug 2024 12:15:17 +1000
Subject: [PATCH 1342/3129] tests/run-tests.py: Skip additional tests when
 slice unavailable.

Both of these tests require slice to be enabled.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 83344714c0375..d0c93f74b9d39 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -563,6 +563,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     # These tests don't test slice explicitly but rather use it to perform the test
     misc_slice_tests = (
         "builtin_range",
+        "bytearray1",
         "class_super",
         "containment",
         "errno1",
@@ -573,6 +574,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         "memoryview_gc",
         "object1",
         "python34",
+        "string_format_modulo",
         "struct_endian",
     )
 

From 05cad7b56f5d460db26a468a05bfdeabe4a656db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Aug 2024 10:43:43 +1000
Subject: [PATCH 1343/3129] zephyr: Remove obsolete tinytest test framework.

Commit f573e73baeddfb8fde59413e8053b538cf908f9b rewored the zephyr port to
build MicroPython as a cmake target, and since that commit the
`make-bin-testsuite` helper script no longer works (it requires a Makefile)
and hence the tinytest test framework can no longer be run.

Instead of fixing this, remove the option to use tinytest.  Boards running
zephyr can use the standard `tests/run-tests.py` script to run tests in the
usual way.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/main.c                       | 14 ----------
 ports/zephyr/make-bin-testsuite           | 20 ---------------
 ports/zephyr/mpconfigport_bin_testsuite.h | 31 -----------------------
 3 files changed, 65 deletions(-)
 delete mode 100755 ports/zephyr/make-bin-testsuite
 delete mode 100644 ports/zephyr/mpconfigport_bin_testsuite.h

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 2ae5fd22273c1..c4a135aa53e43 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -59,13 +59,6 @@
 #include "modmachine.h"
 #include "modzephyr.h"
 
-#ifdef TEST
-#include "shared/upytesthelper/upytesthelper.h"
-#include "lib/tinytest/tinytest.c"
-#include "shared/upytesthelper/upytesthelper.c"
-#include TEST
-#endif
-
 static char heap[MICROPY_HEAP_SIZE];
 
 void init_zephyr(void) {
@@ -128,13 +121,6 @@ int real_main(void) {
     init_zephyr();
     mp_hal_init();
 
-    #ifdef TEST
-    static const char *argv[] = {"test"};
-    upytest_set_heap(heap, heap + sizeof(heap));
-    int r = tinytest_main(1, argv, groups);
-    printf("status: %d\n", r);
-    #endif
-
 soft_reset:
     #if MICROPY_ENABLE_GC
     gc_init(heap, heap + sizeof(heap));
diff --git a/ports/zephyr/make-bin-testsuite b/ports/zephyr/make-bin-testsuite
deleted file mode 100755
index 9a8c329772143..0000000000000
--- a/ports/zephyr/make-bin-testsuite
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# This is a wrapper for make to build a binary with builtin testsuite.
-# It should be run just like make (i.e. extra vars can be passed on the
-# command line, etc.), e.g.:
-#
-# ./make-bin-testsuite BOARD=qemu_cortex_m3
-# ./make-bin-testsuite BOARD=qemu_cortex_m3 run
-#
-
-(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 \
-    | ../tools/tinytest-codegen.py --stdin) > bin-testsuite.c
-
-make \
-    CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_bin_testsuite.h>" -DTEST=\"bin-testsuite.c\" -DNO_FORKING' \
-    "$@"
diff --git a/ports/zephyr/mpconfigport_bin_testsuite.h b/ports/zephyr/mpconfigport_bin_testsuite.h
deleted file mode 100644
index 4367067af3eb5..0000000000000
--- a/ports/zephyr/mpconfigport_bin_testsuite.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Linaro Limited
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION 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"
-
-#ifdef TEST
-#include "shared/upytesthelper/upytesthelper.h"
-#define MP_PLAT_PRINT_STRN(str, len) upytest_output(str, len)
-#endif

From 9af333f2c62de02da2184821c3a59e4d462365ea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Aug 2024 12:15:50 +1000
Subject: [PATCH 1344/3129] zephyr: Increase CONFIG_CONSOLE_GETCHAR_BUFSIZE to
 258.

It needs to be at least this big for `tools/pyboard.py` to work, which is
used (among other things) by `tests/run-tests.py`.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 6046690197c25..d3983fcc25102 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -8,7 +8,7 @@ CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y
 
 CONFIG_CONSOLE_SUBSYS=y
 CONFIG_CONSOLE_GETCHAR=y
-CONFIG_CONSOLE_GETCHAR_BUFSIZE=128
+CONFIG_CONSOLE_GETCHAR_BUFSIZE=258
 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128
 
 CONFIG_NEWLIB_LIBC=y
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index 806e26af77841..2c89a02fae263 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -6,7 +6,7 @@ CONFIG_POLL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE_SUBSYS=y
 CONFIG_CONSOLE_GETCHAR=y
-CONFIG_CONSOLE_GETCHAR_BUFSIZE=32
+CONFIG_CONSOLE_GETCHAR_BUFSIZE=258
 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=32
 # TODO: Disable once https://github.com/zephyrproject-rtos/zephyr/pull/13731 is merged
 #CONFIG_CONSOLE=n

From c8838b5004d32351ffea89b2f224c22c65f9e375 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Aug 2024 12:17:21 +1000
Subject: [PATCH 1345/3129] github/workflows: Add CI to run tests against
 zephyr with qemu.

With this change, the zephyr port is tested against the standard test suite
via the following scheme:
- the zephyr port is built with the `qemu_cortex_m3` board and the
  `prj_minimal.conf` configuration
- `qemu-system-arm` runs `zephyr.elf`
- the zephyr console is redirected to a pts/pty
- `tests/run-tests.py` is run in bare-metal mode against the pts/pty device

This allows testing the zephyr port as though it were a physical board
attached over a serial port.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_zephyr.yml |  5 +++++
 tools/ci.sh                        | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index f6f328c9277e4..d075582f30919 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -27,3 +27,8 @@ jobs:
       run: source tools/ci.sh && ci_zephyr_install
     - name: Build
       run: source tools/ci.sh && ci_zephyr_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_zephyr_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 03b6bf59aed4a..7353a3ecdfb7f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -749,6 +749,11 @@ function ci_zephyr_setup {
       -w /micropython/ports/zephyr \
       zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
     docker ps -a
+
+    # qemu-system-arm is needed to run the test suite.
+    sudo apt-get update
+    sudo apt-get install qemu-system-arm
+    qemu-system-arm --version
 }
 
 function ci_zephyr_install {
@@ -763,3 +768,10 @@ function ci_zephyr_build {
     docker exec zephyr-ci west build -p auto -b mimxrt1050_evk
     docker exec zephyr-ci west build -p auto -b nucleo_wb55rg # for bluetooth
 }
+
+function ci_zephyr_run_tests {
+    docker exec zephyr-ci west build -p auto -b qemu_cortex_m3 -- -DCONF_FILE=prj_minimal.conf
+    # Issues with zephyr tests:
+    # - inf_nan_arith fails pow(-1, nan) test
+    (cd tests && ./run-tests.py --target minimal --device execpty:"qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -monitor null -serial pty -kernel ../ports/zephyr/build/zephyr/zephyr.elf" -d basics float --exclude inf_nan_arith)
+}

From 9f9c283ef48950487bb566e9717819e8a2a29ac6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Aug 2024 11:17:00 +1000
Subject: [PATCH 1346/3129] shared/runtime/semihosting_arm: Support semihosting
 on non-Thumb ARM.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/runtime/semihosting_arm.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/shared/runtime/semihosting_arm.c b/shared/runtime/semihosting_arm.c
index 3ca29d5d752c4..5cfaaa3c6b3c7 100644
--- a/shared/runtime/semihosting_arm.c
+++ b/shared/runtime/semihosting_arm.c
@@ -40,10 +40,6 @@
 #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) {
@@ -61,7 +57,13 @@ static uint32_t mp_semihosting_call(uint32_t num, const void *arg) {
     register uint32_t num_reg __asm__ ("r0") = num;
     register const void *args_reg __asm__ ("r1") = arg;
     __asm__ __volatile__ (
+        #if defined(__ARM_ARCH_ISA_ARM)
+        "svc 0x00123456\n"    // invoke semihosting call
+        #elif defined(__ARM_ARCH_ISA_THUMB)
         "bkpt 0xAB\n"         // invoke semihosting call
+        #else
+        #error Unknown architecture
+        #endif
         : "+r" (num_reg)      // call number and result
         : "r" (args_reg)      // arguments
         : "memory");          // make sure args aren't optimized away

From 70a6791b09f9fad55b99e5996433888cee0a7a64 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Aug 2024 13:54:14 +1000
Subject: [PATCH 1347/3129] shared/runtime/semihosting_arm: Add
 mp_semihosting_rx_chars.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/runtime/semihosting_arm.c | 15 +++++++++++++++
 shared/runtime/semihosting_arm.h |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/shared/runtime/semihosting_arm.c b/shared/runtime/semihosting_arm.c
index 5cfaaa3c6b3c7..d44124faabadf 100644
--- a/shared/runtime/semihosting_arm.c
+++ b/shared/runtime/semihosting_arm.c
@@ -34,6 +34,7 @@
 #define SYS_OPEN   0x01
 #define SYS_WRITEC 0x03
 #define SYS_WRITE  0x05
+#define SYS_READ   0x06
 #define SYS_READC  0x07
 
 // Constants:
@@ -91,6 +92,20 @@ int mp_semihosting_rx_char() {
     return mp_semihosting_call(SYS_READC, NULL);
 }
 
+// Returns 0 on success.
+int mp_semihosting_rx_chars(char *str, size_t len) {
+    struct {
+        uint32_t fd;
+        const char *str;
+        uint32_t len;
+    } args = {
+        .fd = mp_semihosting_stdout,
+        .str = str,
+        .len = len,
+    };
+    return mp_semihosting_call(SYS_READ, &args);
+}
+
 static void mp_semihosting_tx_char(char c) {
     mp_semihosting_call(SYS_WRITEC, &c);
 }
diff --git a/shared/runtime/semihosting_arm.h b/shared/runtime/semihosting_arm.h
index 7e90f25ac916c..1faaae7fec7d8 100644
--- a/shared/runtime/semihosting_arm.h
+++ b/shared/runtime/semihosting_arm.h
@@ -38,6 +38,8 @@ Then make sure the debugger is attached and enables semihosting.  In OpenOCD thi
 done with ARM semihosting enable followed by reset.  The terminal will need further
 configuration to work with MicroPython (bash: stty raw -echo).
 
+If mp_semihosting_rx_char() doesn't work then try mp_semihosting_rx_chars(str, 1).
+
 */
 
 #include <stddef.h>
@@ -45,6 +47,7 @@ configuration to work with MicroPython (bash: stty raw -echo).
 
 void mp_semihosting_init();
 int mp_semihosting_rx_char();
+int mp_semihosting_rx_chars(char *str, size_t len);
 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);
 

From 1090f1a60c730cd589f65047e105a22a0445721d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Aug 2024 11:17:26 +1000
Subject: [PATCH 1348/3129] shared/runtime/semihosting_arm: Add
 mp_semihosting_exit.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/runtime/semihosting_arm.c | 8 ++++++++
 shared/runtime/semihosting_arm.h | 1 +
 2 files changed, 9 insertions(+)

diff --git a/shared/runtime/semihosting_arm.c b/shared/runtime/semihosting_arm.c
index d44124faabadf..f4d168f79bc81 100644
--- a/shared/runtime/semihosting_arm.c
+++ b/shared/runtime/semihosting_arm.c
@@ -36,6 +36,7 @@
 #define SYS_WRITE  0x05
 #define SYS_READ   0x06
 #define SYS_READC  0x07
+#define SYS_EXIT   0x18
 
 // Constants:
 #define OPEN_MODE_READ  (0) // mode "r"
@@ -88,6 +89,13 @@ void mp_semihosting_init() {
     mp_semihosting_stdout = mp_semihosting_open_console(OPEN_MODE_WRITE);
 }
 
+void mp_semihosting_exit(int status) {
+    if (status == 0) {
+        status = 0x20026;
+    }
+    mp_semihosting_call(SYS_EXIT, (void *)(uintptr_t)status);
+}
+
 int mp_semihosting_rx_char() {
     return mp_semihosting_call(SYS_READC, NULL);
 }
diff --git a/shared/runtime/semihosting_arm.h b/shared/runtime/semihosting_arm.h
index 1faaae7fec7d8..08fb66578ac14 100644
--- a/shared/runtime/semihosting_arm.h
+++ b/shared/runtime/semihosting_arm.h
@@ -46,6 +46,7 @@ If mp_semihosting_rx_char() doesn't work then try mp_semihosting_rx_chars(str, 1
 #include <stdint.h>
 
 void mp_semihosting_init();
+void mp_semihosting_exit(int status);
 int mp_semihosting_rx_char();
 int mp_semihosting_rx_chars(char *str, size_t len);
 uint32_t mp_semihosting_tx_strn(const char *str, size_t len);

From e8863e44e51bdd22a684f88779770845f0e7245b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Aug 2024 11:16:10 +1000
Subject: [PATCH 1349/3129] qemu-arm/Makefile: Make the build directory reflect
 the board.

So multiple boards can be built at once.

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

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index f521a0c5ad82d..5ff63bf7daacd 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -1,3 +1,8 @@
+BOARD ?= mps2-an385
+
+# Make the build directory reflect the board.
+BUILD ?= build-$(BOARD)
+
 include ../../py/mkenv.mk
 -include mpconfigport.mk
 
@@ -11,8 +16,6 @@ MICROPY_ROM_TEXT_COMPRESSION ?= 1
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-BOARD ?= mps2-an385
-
 ifeq ($(BOARD),netduino2)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_STM32

From 8a3842eba7db90af2b29035c5c1ecfd5b140f493 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Aug 2024 11:20:30 +1000
Subject: [PATCH 1350/3129] qemu-arm/uart: Implement uart_rx_chr.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/uart.c | 57 +++++++++++++++++++++++++++++++++++++++----
 ports/qemu-arm/uart.h |  4 +++
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/ports/qemu-arm/uart.c b/ports/qemu-arm/uart.c
index d7338f9a24230..5ace3d465f147 100644
--- a/ports/qemu-arm/uart.c
+++ b/ports/qemu-arm/uart.c
@@ -31,14 +31,29 @@
 
 #if defined(QEMU_SOC_STM32)
 
+#define UART_SR_RXNE (1 << 5)
+#define UART_CR1_UE (1 << 13)
+#define UART_CR1_TE (1 << 3)
+#define UART_CR1_RE (1 << 2)
+
 typedef struct _UART_t {
     volatile uint32_t SR;
     volatile uint32_t DR;
+    volatile uint32_t BRR;
+    volatile uint32_t CR1;
 } UART_t;
 
 #define UART0 ((UART_t *)(0x40011000))
 
 void uart_init(void) {
+    UART0->CR1 = UART_CR1_UE | UART_CR1_TE | UART_CR1_RE;
+}
+
+int uart_rx_chr(void) {
+    if (!(UART0->SR & UART_SR_RXNE)) {
+        return UART_RX_NO_CHAR;
+    }
+    return UART0->DR;
 }
 
 void uart_tx_strn(const char *buf, size_t len) {
@@ -50,11 +65,15 @@ void uart_tx_strn(const char *buf, size_t len) {
 #elif defined(QEMU_SOC_NRF51)
 
 typedef struct _UART_t {
-    volatile uint32_t r0[2];
+    volatile uint32_t STARTRX;  // 0x000
+    volatile uint32_t STOPRX;   // 0x004
     volatile uint32_t STARTTX;  // 0x008
-    volatile uint32_t r1[(0x500 - 0x008) / 4 - 1];
+    volatile uint32_t r0[(0x108 - 0x008) / 4 - 1];
+    volatile uint32_t RXDRDY;  // 0x108
+    volatile uint32_t r1[(0x500 - 0x108) / 4 - 1];
     volatile uint32_t ENABLE;   // 0x500
-    volatile uint32_t r2[(0x51c - 0x500) / 4 - 1];
+    volatile uint32_t r2[(0x518 - 0x500) / 4 - 1];
+    volatile uint32_t RXD;      // 0x518
     volatile uint32_t TXD;      // 0x51c
 } UART_t;
 
@@ -62,9 +81,18 @@ typedef struct _UART_t {
 
 void uart_init(void) {
     UART0->ENABLE = 4;
+    UART0->STARTRX = 1;
     UART0->STARTTX = 1;
 }
 
+int uart_rx_chr(void) {
+    if (!UART0->RXDRDY) {
+        return UART_RX_NO_CHAR;
+    }
+    UART0->RXDRDY = 0;
+    return UART0->RXD;
+}
+
 void uart_tx_strn(const char *buf, size_t len) {
     for (size_t i = 0; i < len; ++i) {
         UART0->TXD = buf[i];
@@ -74,6 +102,7 @@ void uart_tx_strn(const char *buf, size_t len) {
 #elif defined(QEMU_SOC_MPS2)
 
 #define UART_STATE_TXFULL (1 << 0)
+#define UART_STATE_RXFULL (1 << 1)
 
 #define UART_CTRL_TX_EN (1 << 0)
 #define UART_CTRL_RX_EN (1 << 1)
@@ -90,7 +119,14 @@ typedef struct _UART_t {
 
 void uart_init(void) {
     UART0->BAUDDIV = 16;
-    UART0->CTRL = UART_CTRL_TX_EN;
+    UART0->CTRL = UART_CTRL_TX_EN | UART_CTRL_RX_EN;
+}
+
+int uart_rx_chr(void) {
+    if (!(UART0->STATE & UART_STATE_RXFULL)) {
+        return UART_RX_NO_CHAR;
+    }
+    return UART0->DATA;
 }
 
 void uart_tx_strn(const char *buf, size_t len) {
@@ -104,7 +140,9 @@ void uart_tx_strn(const char *buf, size_t len) {
 #elif defined(QEMU_SOC_IMX6)
 
 #define UART_UCR1_UARTEN (1 << 0)
+#define UART_UCR2_RXEN (1 << 1)
 #define UART_UCR2_TXEN (1 << 2)
+#define UART_UTS1_RXEMPTY (1 << 5)
 
 typedef struct _UART_t {
     volatile uint32_t URXD; // 0x00
@@ -113,13 +151,22 @@ typedef struct _UART_t {
     volatile uint32_t r1[15];
     volatile uint32_t UCR1; // 0x80
     volatile uint32_t UCR2; // 0x84
+    volatile uint32_t r2[11];
+    volatile uint32_t UTS1; // 0xb4
 } UART_t;
 
 #define UART1 ((UART_t *)(0x02020000))
 
 void uart_init(void) {
     UART1->UCR1 = UART_UCR1_UARTEN;
-    UART1->UCR2 = UART_UCR2_TXEN;
+    UART1->UCR2 = UART_UCR2_TXEN | UART_UCR2_RXEN;
+}
+
+int uart_rx_chr(void) {
+    if (UART1->UTS1 & UART_UTS1_RXEMPTY) {
+        return UART_RX_NO_CHAR;
+    }
+    return UART1->URXD & 0xff;
 }
 
 void uart_tx_strn(const char *buf, size_t len) {
diff --git a/ports/qemu-arm/uart.h b/ports/qemu-arm/uart.h
index 33eae05bd76dd..9c62a295d1d04 100644
--- a/ports/qemu-arm/uart.h
+++ b/ports/qemu-arm/uart.h
@@ -28,7 +28,11 @@
 
 #include <stddef.h>
 
+// Returned from uart_rx_chr when there are no chars available.
+#define UART_RX_NO_CHAR (-1)
+
 void uart_init(void);
+int uart_rx_chr(void);
 void uart_tx_strn(const char *buf, size_t len);
 
 #endif // MICROPY_INCLUDED_QEMU_ARM_UART_H

From d9a0fdda9a7b0db55c1115b55bb1b83cd5ce739c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Aug 2024 11:32:28 +1000
Subject: [PATCH 1351/3129] qemu-arm: Rework to provide a REPL and run tests
 via a pty serial port.

Currently, the qemu-arm (and qemu-riscv) port has two build modes:
- a simple test that executes a Python string; and
- a full test that uses tinytest to embed all tests within the firmware,
  then executes that and captures the output.

This is very different to all the other ports.  A difficulty with using
tinytest is that with the large number of tests the firmware overflows its
virtual flash size.  It's also hard to run tests via .mpy files and with
the native emitter.  Being different to the other ports also means an extra
burden on maintenance.

This commit reworks the qemu-arm port so that it has a single build target
that creates a standard firmware which has a REPL.  When run under
qemu-system-arm, the REPL acts like any other bare-metal port, complete
with soft reset (use machine.reset() to turn it off and exit
qemu-system-arm).

This approach gives many benefits:
- allows playing with a REPL without hardware;
- allows running the test suite as it would on a bare-metal board, by
  making qemu-system-arm redirect the UART serial of the virtual device to
  a /dev/pts/xx file, and then running run-tests.py against that serial
  device;
- skipping tests is now done via the logic in `run-tests.py` and no longer
  needs multiple places to define which tests to skip
  (`tools/tinytest-codegen.py`, `ports/qemu-arm/tests_profile.txt` and also
  `tests/run-tests.py`);
- allows testing/using mpremote with the qemu-arm port.

Eventually the qemu-riscv port would have a similar change.

Prior to this commit the test results were:

    743 tests ok.  (121 skipped)

With this commit the test results are:

    753 tests performed (22673 individual testcases)
    753 tests passed
    138 tests skipped

More tests are skipped because more are included in the run. But overall
more tests pass.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_qemu-arm.yml          |  2 +-
 ports/qemu-arm/Makefile                       | 41 +++++++++---
 ports/qemu-arm/Makefile.test                  | 33 ----------
 ports/qemu-arm/README.md                      | 59 ++++++++++++++---
 ports/qemu-arm/main.c                         | 53 ++++++++-------
 ports/qemu-arm/modmachine.c                   | 16 +++++
 ports/qemu-arm/mpconfigport.h                 | 13 +---
 ports/qemu-arm/mphalport.c                    | 66 +++++++++++++++++++
 ports/qemu-arm/mphalport.h                    |  5 +-
 ports/qemu-arm/startup.c                      | 29 ++------
 ports/qemu-arm/tests_profile.txt              | 16 -----
 ports/qemu-riscv/Makefile                     |  2 +-
 .../test_main.c => qemu-riscv/main.c}         | 38 ++++++-----
 tests/run-tests.py                            | 12 ++--
 tools/ci.sh                                   |  6 +-
 15 files changed, 237 insertions(+), 154 deletions(-)
 delete mode 100644 ports/qemu-arm/Makefile.test
 create mode 100644 ports/qemu-arm/mphalport.c
 delete mode 100644 ports/qemu-arm/tests_profile.txt
 rename ports/{qemu-arm/test_main.c => qemu-riscv/main.c} (65%)

diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
index db3cd7871d591..99750b7535657 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -29,4 +29,4 @@ jobs:
       run: source tools/ci.sh && ci_qemu_arm_build
     - name: Print failures
       if: failure()
-      run: grep --before-context=100 --text "FAIL" ports/qemu-arm/build/console.out
+      run: tests/run-tests.py --print-failures
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 5ff63bf7daacd..cdfc39580b9d8 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -11,14 +11,19 @@ QSTR_DEFS = qstrdefsport.h
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
+FROZEN_MANIFEST ?= "freeze('test-frzmpy')"
 
 # include py core make definitions
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
+CFLAGS += -DMICROPY_HW_BOARD_NAME='"$(BOARD)"'
+QEMU_ARGS += -machine $(BOARD) -nographic -monitor null -semihosting
+
 ifeq ($(BOARD),netduino2)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_STM32
+CFLAGS += -DMICROPY_HW_MCU_NAME='"STM32"'
 LDSCRIPT = stm32.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 MPY_CROSS_FLAGS += -march=armv7m
@@ -27,8 +32,9 @@ endif
 ifeq ($(BOARD),microbit)
 CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_NRF51
+CFLAGS += -DMICROPY_HW_MCU_NAME='"nRF51"'
 LDSCRIPT = nrf51.ld
-QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
+QEMU_ARGS += -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb1.o
 MPY_CROSS_FLAGS += -march=armv7m
 endif
@@ -36,6 +42,7 @@ endif
 ifeq ($(BOARD),mps2-an385)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_MPS2
+CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-M3"'
 LDSCRIPT = mps2.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 MPY_CROSS_FLAGS += -march=armv7m
@@ -44,11 +51,16 @@ endif
 ifeq ($(BOARD),sabrelite)
 CFLAGS += -mcpu=cortex-a9
 CFLAGS += -DQEMU_SOC_IMX6
+CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-A9"'
 LDSCRIPT = imx6.ld
-QEMU_EXTRA = -m 128M
+QEMU_ARGS += -m 128M
 SRC_BOARD_O = shared/runtime/gchelper_generic.o
 # It's really armv7a but closest supported value is armv6.
 MPY_CROSS_FLAGS += -march=armv6
+# Cortex-A9 should support unaligned-access, but qemu doesn't seem to.
+CFLAGS += -mno-unaligned-access
+# These don't work on Cortex-A9.
+TESTS_EXCLUDE = --exclude '(asmdiv|asmspecialregs).py'
 endif
 
 CROSS_COMPILE ?= arm-none-eabi-
@@ -81,16 +93,18 @@ LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 SRC_COMMON_C = \
 	startup.c \
 	uart.c \
+	mphalport.c \
 	shared/libc/string0.c \
+	shared/readline/readline.c \
+	shared/runtime/interrupt_char.c \
+	shared/runtime/pyexec.c \
+	shared/runtime/semihosting_arm.c \
+	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 
 SRC_RUN_C = \
 	main.c \
 
-SRC_TEST_C = \
-	test_main.c \
-	lib/tinytest/tinytest.c \
-
 LIB_SRC_C += $(SRC_LIB_LIBM_C)
 LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 
@@ -116,10 +130,21 @@ OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST)
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(LIB_SRC_C)
 
-all: run
+all: $(BUILD)/firmware.elf
 
+.PHONY: repl
+repl: $(BUILD)/firmware.elf
+	$(ECHO) "Use machine.reset() to exit"
+	qemu-system-arm $(QEMU_ARGS) -serial mon:stdio -kernel $<
+
+.PHONY: run
 run: $(BUILD)/firmware.elf
-	qemu-system-arm -machine $(BOARD) $(QEMU_EXTRA) -nographic -monitor null -semihosting -kernel $<
+	qemu-system-arm $(QEMU_ARGS) -serial pty -kernel $<
+
+.PHONY: test
+test: $(BUILD)/firmware.elf
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	cd $(TOP)/tests && ./run-tests.py --target qemu-arm --device execpty:"qemu-system-arm $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(TESTS_EXCLUDE)
 
 ## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here.
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(ALL_OBJ_RUN)
diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test
deleted file mode 100644
index cb5b0927c8c9a..0000000000000
--- a/ports/qemu-arm/Makefile.test
+++ /dev/null
@@ -1,33 +0,0 @@
-LIB_SRC_C = shared/upytesthelper/upytesthelper.c
-
-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
-
-TESTS_PROFILE = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))/tests_profile.txt
-
-$(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 --profile $(TESTS_PROFILE) $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
-
-$(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
-
-$(BUILD)/firmware-test.elf: $(LDSCRIPT) $(ALL_OBJ_TEST)
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_TEST) $(LIBS)
-	$(Q)$(SIZE) $@
-
-# Note: Using timeout(1) to handle cases where qemu hangs (e.g. this can happen with alignment errors).
-test: $(BUILD)/firmware-test.elf
-	timeout --foreground -k 5s 30s qemu-system-arm -machine $(BOARD) $(QEMU_EXTRA) -nographic -monitor null -semihosting -kernel $< > $(BUILD)/console.out
-	$(Q)tail -n2 $(BUILD)/console.out
-	$(Q)tail -n1 $(BUILD)/console.out | grep -q "status: 0"
diff --git a/ports/qemu-arm/README.md b/ports/qemu-arm/README.md
index f821c4d1e28fb..34d73fd165756 100644
--- a/ports/qemu-arm/README.md
+++ b/ports/qemu-arm/README.md
@@ -1,3 +1,6 @@
+MicroPython port to qemu-arm
+============================
+
 This is experimental, community-supported port for Cortex-M emulation as
 provided by QEMU (http://qemu.org).
 
@@ -15,14 +18,52 @@ 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 the [GNU ARM Embedded Toolchain](
-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
-ARM's version  requires `--specs=nano.specs --specs=rdimon.specs` to be
-passed to the linker.
+Build instructions
+------------------
+
+First make sure the MicroPython cross-compiler is built (run from this directory):
+
+    $ make -C ../../mpy-cross
+
+Then build using:
+
+    $ make
+
+The default qemu-supported board is `mps2-an385`, a Cortex-M3 board.  To select a
+different board pass the `BOARD` argument to `make`, for example:
+
+    $ make BOARD=sabrelite
+
+Running
+-------
+
+When the firmware is run it will provide a REPL on the emulated hardware UART.
+To access the REPL directly use:
+
+    $ make repl
+
+This will start `qemu-system-arm` with the UART redirected to stdio.  It's also
+possible to redirect the UART to a pty device using:
+
+    $ make run
+
+This will start the emulation and the name of the pty device will be printed to
+stdout.  This serial device then be accessed via a serial terminal program,
+for example `mpremote`:
+
+    $ mpremote connect /dev/pts/1
+
+You can disconnect and reconnect to the serial device multiple times.  Once you
+are finished, stop the `make run` command by pressing Ctrl-C where that command
+was started (or execute `machine.reset()` at the REPL).
+
+The test suite can be run against the firmware by using the UART redirection.
+You can either do this automatically using the single command:
+
+    $ make test
 
-To build and run image with builtin testsuite:
+Or manually by first starting the emulation with `make run` and then running the
+tests against the serial device, for example:
 
-    make -f Makefile.test test
+    $ cd ../../tests
+    $ ./run-tests.py --target qemu-arm --device /dev/pts/1
diff --git a/ports/qemu-arm/main.c b/ports/qemu-arm/main.c
index 025c1f17da04a..042106580407d 100644
--- a/ports/qemu-arm/main.c
+++ b/ports/qemu-arm/main.c
@@ -25,41 +25,50 @@
  */
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
+#include "shared/runtime/gchelper.h"
+#include "shared/runtime/pyexec.h"
 
-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, 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);
-    }
-}
+#define HEAP_SIZE (100 * 1024)
+
+static uint32_t gc_heap[HEAP_SIZE / sizeof(uint32_t)];
 
 int main(int argc, char **argv) {
     mp_stack_ctrl_init();
     mp_stack_set_limit(10240);
-    uint32_t heap[16 * 1024 / 4];
-    gc_init(heap, (char *)heap + 16 * 1024);
-    mp_init();
-    do_str("print('hello world!')", MP_PARSE_SINGLE_INPUT);
-    mp_deinit();
-    return 0;
+    gc_init(gc_heap, (char *)gc_heap + HEAP_SIZE);
+
+    for (;;) {
+        mp_init();
+
+        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_plat_print, "MPY: soft reboot\n");
+
+        gc_sweep_all();
+        mp_deinit();
+    }
 }
 
 void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    gc_collect_end();
 }
 
 mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
@@ -67,6 +76,6 @@ mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
 }
 
 void nlr_jump_fail(void *val) {
-    printf("uncaught NLR\n");
+    mp_printf(&mp_plat_print, "uncaught NLR\n");
     exit(1);
 }
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index a897c5670e49b..75872a22c1f40 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -27,6 +27,22 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
+#include <stdlib.h>
+
 static void mp_machine_idle(void) {
     // Do nothing.
 }
+
+#if MICROPY_PY_MACHINE_RESET
+
+static void mp_machine_reset(void) {
+    // Exit qemu (via semihosting call).
+    exit(0);
+}
+
+static mp_int_t mp_machine_reset_cause(void) {
+    // Not implemented.
+    return 0;
+}
+
+#endif
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index fce379e47ecf4..4059a5926d3cd 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -42,22 +42,19 @@
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
 #define MICROPY_ENABLE_GC           (1)
-#define MICROPY_KBD_EXCEPTION       (0)
-#define MICROPY_HELPER_REPL         (0)
+#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_WARNINGS            (1)
-#define MICROPY_PY_BUILTINS_INPUT   (0)
-#define MICROPY_PY_BUILTINS_HELP    (0)
 #define MICROPY_PY_IO_IOBASE        (0)
 #define MICROPY_PY_SYS_PLATFORM     "qemu-arm"
-#define MICROPY_PY_SYS_STDFILES     (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER (0)
 #define MICROPY_PY_SELECT           (0)
 #define MICROPY_PY_TIME             (0)
 #define MICROPY_PY_ASYNCIO          (0)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/qemu-arm/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_PIN_BASE (1)
 #define MICROPY_VFS                 (1)
 
@@ -78,8 +75,4 @@ typedef long mp_off_t;
 // We need an implementation of the log2 function which is not a macro.
 #define MP_NEED_LOG2 (1)
 
-#ifdef TEST
-#include "shared/upytesthelper/upytesthelper.h"
-#undef MP_PLAT_PRINT_STRN
-#define MP_PLAT_PRINT_STRN(str, len) upytest_output(str, len)
-#endif
+#define MP_STATE_PORT MP_STATE_VM
diff --git a/ports/qemu-arm/mphalport.c b/ports/qemu-arm/mphalport.c
new file mode 100644
index 0000000000000..dbb87b48b801a
--- /dev/null
+++ b/ports/qemu-arm/mphalport.c
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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 "shared/runtime/semihosting_arm.h"
+#include "uart.h"
+
+// UART is better behaved with redirection under qemu-system-arm, so prefer that for stdio.
+#define USE_UART (1)
+#define USE_SEMIHOSTING (0)
+
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    // Not implemented.
+    return 0;
+}
+
+int mp_hal_stdin_rx_chr(void) {
+    for (;;) {
+        #if USE_UART
+        int c = uart_rx_chr();
+        if (c >= 0) {
+            return c;
+        }
+        #endif
+        #if USE_SEMIHOSTING
+        char str[1];
+        int ret = mp_semihosting_rx_chars(str, 1);
+        if (ret == 0) {
+            return str[0];
+        }
+        #endif
+    }
+}
+
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
+    #if USE_UART
+    uart_tx_strn(str, len);
+    #endif
+    #if USE_SEMIHOSTING
+    mp_semihosting_tx_strn(str, len);
+    #endif
+    return len;
+}
diff --git a/ports/qemu-arm/mphalport.h b/ports/qemu-arm/mphalport.h
index 8a40505ba6b3a..348b45701b89e 100644
--- a/ports/qemu-arm/mphalport.h
+++ b/ports/qemu-arm/mphalport.h
@@ -24,7 +24,4 @@
  * THE SOFTWARE.
  */
 
-#include "uart.h"
-
-#define mp_hal_stdin_rx_chr() (0)
-#define mp_hal_stdout_tx_strn_cooked(s, l) uart_tx_strn((s), (l))
+#include "shared/runtime/interrupt_char.h"
diff --git a/ports/qemu-arm/startup.c b/ports/qemu-arm/startup.c
index a1e89d111c007..118a5b8006f15 100644
--- a/ports/qemu-arm/startup.c
+++ b/ports/qemu-arm/startup.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "shared/runtime/semihosting_arm.h"
 #include "uart.h"
 
 extern uint32_t _estack, _sidata, _sdata, _edata, _sbss, _ebss;
@@ -97,6 +98,8 @@ const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
 #endif
 
 void _start(void) {
+    mp_semihosting_init();
+
     // Enable the UART
     uart_init();
 
@@ -108,21 +111,9 @@ void _start(void) {
     exit(0);
 }
 
-__attribute__((naked)) void exit(int status) {
+void exit(int status) {
     // Force qemu to exit using ARM Semihosting
-    __asm volatile (
-        "mov r1, r0\n"
-        "cmp r1, #0\n"
-        "bne .notclean\n"
-        "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
-        );
+    mp_semihosting_exit(status);
     for (;;) {
     }
 }
@@ -134,13 +125,3 @@ void __assert_func(const char *file, int line, const char *func, const char *exp
     exit(1);
 }
 #endif
-
-// The following are needed for tinytest
-
-#include <stdio.h>
-
-int setvbuf(FILE *stream, char *buf, int mode, size_t size) {
-    return 0;
-}
-
-struct _reent *_impure_ptr;
diff --git a/ports/qemu-arm/tests_profile.txt b/ports/qemu-arm/tests_profile.txt
deleted file mode 100644
index 101943b7c6ab0..0000000000000
--- a/ports/qemu-arm/tests_profile.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Port-specific test directories.
-
-test_dirs.update(("inlineasm", "ports/qemu-arm"))
-
-# Port-specific tests exclusion list.
-
-exclude_tests.update(
-    (
-        # inline asm FP tests (require Cortex-M4)
-        "inlineasm/asmfpaddsub.py",
-        "inlineasm/asmfpcmp.py",
-        "inlineasm/asmfpldrstr.py",
-        "inlineasm/asmfpmuldiv.py",
-        "inlineasm/asmfpsqrt.py",
-    )
-)
diff --git a/ports/qemu-riscv/Makefile b/ports/qemu-riscv/Makefile
index 6f15ce52e73c7..473aec882d640 100644
--- a/ports/qemu-riscv/Makefile
+++ b/ports/qemu-riscv/Makefile
@@ -81,7 +81,7 @@ SRC_COMMON_C = \
 	shared/runtime/sys_stdio_mphal.c \
 
 SRC_RUN_C = \
-	ports/qemu-arm/main.c \
+	main.c \
 
 SRC_TEST_C = \
 	test_main.c \
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-riscv/main.c
similarity index 65%
rename from ports/qemu-arm/test_main.c
rename to ports/qemu-riscv/main.c
index 96984f7cd16ed..025c1f17da04a 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-riscv/main.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2014 Ilya Dmitrichenko
+ * Copyright (c) 2014-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
@@ -32,28 +32,34 @@
 #include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
-#include "shared/runtime/gchelper.h"
-#include "lib/tinytest/tinytest.h"
-#include "lib/tinytest/tinytest_macros.h"
 
-#define HEAP_SIZE (100 * 1024)
-
-#include "genhdr/tests.h"
+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, 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);
+    }
+}
 
-int main() {
+int main(int argc, char **argv) {
     mp_stack_ctrl_init();
     mp_stack_set_limit(10240);
-    static uint32_t heap[HEAP_SIZE / sizeof(uint32_t)];
-    upytest_set_heap(heap, (char *)heap + HEAP_SIZE);
-    int r = tinytest_main(0, NULL, groups);
-    printf("status: %d\n", r);
-    return r;
+    uint32_t heap[16 * 1024 / 4];
+    gc_init(heap, (char *)heap + 16 * 1024);
+    mp_init();
+    do_str("print('hello world!')", MP_PARSE_SINGLE_INPUT);
+    mp_deinit();
+    return 0;
 }
 
 void gc_collect(void) {
-    gc_collect_start();
-    gc_helper_collect_regs_and_stack();
-    gc_collect_end();
 }
 
 mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
diff --git a/tests/run-tests.py b/tests/run-tests.py
index d0c93f74b9d39..60bfc2599fb47 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -676,7 +676,11 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
                 "extmod/time_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
+            skip_tests.add("inlineasm/asmfpaddsub.py")  # requires Cortex-M4
+            skip_tests.add("inlineasm/asmfpcmp.py")
+            skip_tests.add("inlineasm/asmfpldrstr.py")
+            skip_tests.add("inlineasm/asmfpmuldiv.py")
+            skip_tests.add("inlineasm/asmfpsqrt.py")
         elif args.target == "qemu-riscv":
             skip_tests.add("misc/print_exception.py")  # requires sys stdfiles
         elif args.target == "webassembly":
@@ -1043,7 +1047,6 @@ def main():
 
     LOCAL_TARGETS = (
         "unix",
-        "qemu-arm",
         "qemu-riscv",
         "webassembly",
     )
@@ -1054,6 +1057,7 @@ def main():
         "esp32",
         "minimal",
         "nrf",
+        "qemu-arm",
         "renesas-ra",
         "rp2",
     )
@@ -1141,10 +1145,6 @@ def main():
                     "ports/unix",
                 )
             elif args.target == "qemu-arm":
-                if not args.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",
diff --git a/tools/ci.sh b/tools/ci.sh
index 7353a3ecdfb7f..175d7f57622fb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -258,10 +258,8 @@ function ci_qemu_arm_build {
     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
+    make ${MAKEOPTS} -C ports/qemu-arm test
+    make ${MAKEOPTS} -C ports/qemu-arm BOARD=sabrelite test
 }
 
 ########################################################################################

From c8385ef75aea929e7175173d3190dd787f37c8e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 3 Aug 2024 16:06:52 +1000
Subject: [PATCH 1352/3129] examples/network: Support IPv4 and IPv6 in HTTP
 client examples.

The main changes here are to pass the address family and socket type to
`getaddrinfo()`, and then use the result of the address lookup when
creating the socket, so it has the correct address family.

This allows both IPv4 and IPv6 to work, because the socket is created with
the correct AF_INETx type for the address.

Also add some more comments to the examples to explain what's going on.

Fixes issue #15580.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/network/http_client.py              | 32 ++++++++++++++----
 examples/network/https_client.py             | 34 ++++++++++++++++----
 examples/network/https_client_nonblocking.py |  4 +--
 3 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/examples/network/http_client.py b/examples/network/http_client.py
index 661c286b70bc4..879cddcd818b0 100644
--- a/examples/network/http_client.py
+++ b/examples/network/http_client.py
@@ -1,16 +1,35 @@
-import socket
+# Very simple HTTP client example:
+# - Connects to a server.
+# - Sends a HTTP request.
+# - Reads the result.
+#
+# This example works in both MicroPython and CPython.
+#
+# To implement an HTTP client using less code, use mip to install the requests package:
+# https://github.com/micropython/micropython-lib/tree/master/python-ecosys/requests
 
+import socket
 
-def main(use_stream=False):
-    s = socket.socket()
 
-    ai = socket.getaddrinfo("google.com", 80)
+# `addr_family` selects IPv4 vs IPv6: 0 means either, or use
+# socket.AF_INET or socket.AF_INET6 to select a particular one.
+def main(domain, addr_family=0, use_stream=False):
+    # Lookup the server address, for the given family and socket type.
+    ai = socket.getaddrinfo(domain, 80, addr_family, socket.SOCK_STREAM)
     print("Address infos:", ai)
-    addr = ai[0][-1]
 
+    # Select the first address.
+    ai = ai[0]
+
+    # Create a socket with the server's family, type and proto.
+    s = socket.socket(ai[0], ai[1], ai[2])
+
+    # Connect to the server.
+    addr = ai[-1]
     print("Connect address:", addr)
     s.connect(addr)
 
+    # Send request and read response.
     if use_stream:
         # MicroPython socket objects support stream (aka file) interface
         # directly, but the line below is needed for CPython.
@@ -21,7 +40,8 @@ def main(use_stream=False):
         s.send(b"GET / HTTP/1.0\r\n\r\n")
         print(s.recv(4096))
 
+    # Close the socket.
     s.close()
 
 
-main()
+main("google.com")
diff --git a/examples/network/https_client.py b/examples/network/https_client.py
index 323971c0ee24d..d20f283d74962 100644
--- a/examples/network/https_client.py
+++ b/examples/network/https_client.py
@@ -1,20 +1,41 @@
+# Very simple HTTPS client example:
+# - Connects to a server.
+# - Upgrades the connection to a TLS connection.
+# - Sends a HTTP request.
+# - Reads the result.
+#
+# This example works in both MicroPython and CPython.
+#
+# To implement an HTTPS client using less code, use mip to install the requests package:
+# https://github.com/micropython/micropython-lib/tree/master/python-ecosys/requests
+
 import socket
 import ssl
 
 
-def main(use_stream=True):
-    s = socket.socket()
-
-    ai = socket.getaddrinfo("google.com", 443)
+# `addr_family` selects IPv4 vs IPv6: 0 means either, or use
+# socket.AF_INET or socket.AF_INET6 to select a particular one.
+def main(domain, addr_family=0, use_stream=True):
+    # Lookup the server address, for the given family and socket type.
+    ai = socket.getaddrinfo(domain, 443, addr_family, socket.SOCK_STREAM)
     print("Address infos:", ai)
-    addr = ai[0][-1]
 
+    # Select the first address.
+    ai = ai[0]
+
+    # Create a socket with the server's family, type and proto.
+    s = socket.socket(ai[0], ai[1], ai[2])
+
+    # Connect to the server.
+    addr = ai[-1]
     print("Connect address:", addr)
     s.connect(addr)
 
+    # Upgrade the socket to a TLS connection.
     s = ssl.wrap_socket(s)
     print(s)
 
+    # Send request and read response.
     if use_stream:
         # Both CPython and MicroPython SSLSocket objects support read() and
         # write() methods.
@@ -26,7 +47,8 @@ def main(use_stream=True):
         s.send(b"GET / HTTP/1.0\r\n\r\n")
         print(s.recv(4096))
 
+    # Close the socket.
     s.close()
 
 
-main()
+main("google.com")
diff --git a/examples/network/https_client_nonblocking.py b/examples/network/https_client_nonblocking.py
index 6e6b7f37bc7b1..41447e81e701b 100644
--- a/examples/network/https_client_nonblocking.py
+++ b/examples/network/https_client_nonblocking.py
@@ -37,13 +37,13 @@ def read_nonblocking(poller, sock, n):
     return data
 
 
-def main(url):
+def main(url, addr_family=0):
     # Split the given URL into components.
     proto, _, host, path = url.split(b"/", 3)
     assert proto == b"https:"
 
     # Note: this getaddrinfo() call is blocking!
-    ai = socket.getaddrinfo(host, 443)[0]
+    ai = socket.getaddrinfo(host, 443, addr_family, socket.SOCK_STREAM)[0]
     addr = ai[-1]
     print("Connect address:", addr)
 

From d75705311ad9406bbb03ae1d510693356cd4f1e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 3 Aug 2024 16:20:25 +1000
Subject: [PATCH 1353/3129] examples/network: Use SSLContext instead of old
 ssl.wrap_socket.

`ssl.wrap_socket()` is deprecated in CPython, so use `SSLContext` instead,
so the example is a good example to copy.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/network/https_client.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/network/https_client.py b/examples/network/https_client.py
index d20f283d74962..60ceb83c74674 100644
--- a/examples/network/https_client.py
+++ b/examples/network/https_client.py
@@ -32,7 +32,10 @@ def main(domain, addr_family=0, use_stream=True):
     s.connect(addr)
 
     # Upgrade the socket to a TLS connection.
-    s = ssl.wrap_socket(s)
+    ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    ctx.check_hostname = False
+    ctx.verify_mode = ssl.CERT_NONE
+    s = ctx.wrap_socket(s)
     print(s)
 
     # Send request and read response.

From fd03a0587f7303d2b37d69c85a1e079088c3de6c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Aug 2024 11:43:22 +1000
Subject: [PATCH 1354/3129] examples/network: Support full URLs in HTTP(S)
 client examples.

Not just the domain name.  This gives better HTTP 1.0 examples if someone
wants to copy them.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/network/http_client.py  | 15 ++++++++++-----
 examples/network/https_client.py | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/examples/network/http_client.py b/examples/network/http_client.py
index 879cddcd818b0..b16f87a98187a 100644
--- a/examples/network/http_client.py
+++ b/examples/network/http_client.py
@@ -13,9 +13,13 @@
 
 # `addr_family` selects IPv4 vs IPv6: 0 means either, or use
 # socket.AF_INET or socket.AF_INET6 to select a particular one.
-def main(domain, addr_family=0, use_stream=False):
+def main(url, addr_family=0, use_stream=False):
+    # Split the given URL into components.
+    proto, _, host, path = url.split(b"/", 3)
+    assert proto == b"http:"
+
     # Lookup the server address, for the given family and socket type.
-    ai = socket.getaddrinfo(domain, 80, addr_family, socket.SOCK_STREAM)
+    ai = socket.getaddrinfo(host, 80, addr_family, socket.SOCK_STREAM)
     print("Address infos:", ai)
 
     # Select the first address.
@@ -30,18 +34,19 @@ def main(domain, addr_family=0, use_stream=False):
     s.connect(addr)
 
     # Send request and read response.
+    request = b"GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n" % (path, host)
     if use_stream:
         # MicroPython socket objects support stream (aka file) interface
         # directly, but the line below is needed for CPython.
         s = s.makefile("rwb", 0)
-        s.write(b"GET / HTTP/1.0\r\n\r\n")
+        s.write(request)
         print(s.read())
     else:
-        s.send(b"GET / HTTP/1.0\r\n\r\n")
+        s.send(request)
         print(s.recv(4096))
 
     # Close the socket.
     s.close()
 
 
-main("google.com")
+main(b"http://www.google.com/")
diff --git a/examples/network/https_client.py b/examples/network/https_client.py
index 60ceb83c74674..aaad9b657417b 100644
--- a/examples/network/https_client.py
+++ b/examples/network/https_client.py
@@ -15,9 +15,13 @@
 
 # `addr_family` selects IPv4 vs IPv6: 0 means either, or use
 # socket.AF_INET or socket.AF_INET6 to select a particular one.
-def main(domain, addr_family=0, use_stream=True):
+def main(url, addr_family=0, use_stream=True):
+    # Split the given URL into components.
+    proto, _, host, path = url.split(b"/", 3)
+    assert proto == b"https:"
+
     # Lookup the server address, for the given family and socket type.
-    ai = socket.getaddrinfo(domain, 443, addr_family, socket.SOCK_STREAM)
+    ai = socket.getaddrinfo(host, 443, addr_family, socket.SOCK_STREAM)
     print("Address infos:", ai)
 
     # Select the first address.
@@ -39,19 +43,20 @@ def main(domain, addr_family=0, use_stream=True):
     print(s)
 
     # Send request and read response.
+    request = b"GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n" % (path, host)
     if use_stream:
         # Both CPython and MicroPython SSLSocket objects support read() and
         # write() methods.
-        s.write(b"GET / HTTP/1.0\r\n\r\n")
+        s.write(request)
         print(s.read(4096))
     else:
         # MicroPython SSLSocket objects implement only stream interface, not
         # socket interface
-        s.send(b"GET / HTTP/1.0\r\n\r\n")
+        s.send(request)
         print(s.recv(4096))
 
     # Close the socket.
     s.close()
 
 
-main("google.com")
+main(b"https://www.google.com/")

From 01c046d2a803ead4d320ed533938fcc878a5959e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 20 Feb 2024 18:52:57 +0100
Subject: [PATCH 1355/3129] rp2/machine_uart: Implement a Python UART IRQ
 handler.

Supported trigger names: IRQ_RXIDLE, IRQ_TXIDLE, IRQ_BREAK

- IRQ_RXIDLE: The handler for IRQ_RXIDLE is called reliably 31 UART bit
  times after the last incoming data.

- IRQ_TXIDLE: This IRQ is triggered after at least >5 characters are sent
  at once.  It is triggered when the TX FIFO falls below 4 elements.  At
  that time, up to 5 bytes may still be in the FIFO and output shift
  register.

- IRQ_BREAK: The IRQ triggers if a BREAK state is detected at RX.
  Properties & side effects:
  - After a BREAK, a valid character must be received before another break
    can be detected.
  - Each break puts a 0xff character into the input buffer.

The irq.flags() value is cleared only with a new wanted event.  Do not
change the flags otherwise.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/rp2/machine_uart.c | 136 ++++++++++++++++++++++++++++++++++-----
 ports/rp2/main.c         |   1 +
 ports/rp2/modmachine.h   |   1 +
 ports/rp2/mpconfigport.h |   1 +
 4 files changed, 124 insertions(+), 15 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index d9e97685f1f25..689906003e7dc 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -80,6 +80,10 @@
 
 #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 (UART_UARTMIS_RTMIS_BITS | UART_UARTMIS_TXMIS_BITS | UART_UARTMIS_BEMIS_BITS)
+#define UART_FIFO_SIZE_RX           (32)
+#define UART_FIFO_TRIGGER_LEVEL_RX  (24)
 
 static mutex_t write_mutex_0;
 static mutex_t write_mutex_1;
@@ -111,12 +115,15 @@ typedef struct _machine_uart_obj_t {
     mutex_t *read_mutex;
     ringbuf_t write_buffer;
     mutex_t *write_mutex;
+    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
 } 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}, &read_mutex_0, {NULL, 1, 0, 0}, &write_mutex_0},
+     0, 0, 0, 0, {NULL, 1, 0, 0}, &read_mutex_0, {NULL, 1, 0, 0}, &write_mutex_0, 0, 0, NULL},
     {{&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}, &read_mutex_1, {NULL, 1, 0, 0}, &write_mutex_1},
@@ -144,14 +151,15 @@ 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) {
+// take at most max_items bytes from the fifo and store them in the buffer
+static void uart_drain_rx_fifo(machine_uart_obj_t *self, uint32_t max_items) {
     if (read_mutex_try_lock(self)) {
-        while (uart_is_readable(self->uart) && ringbuf_free(&self->read_buffer) > 0) {
+        while (uart_is_readable(self->uart) && ringbuf_free(&self->read_buffer) > 0 && max_items > 0) {
             // Get a byte from uart and put into the buffer. Every entry from
             // the FIFO is accompanied by 4 error bits, that may be used for
             // error handling.
             uint16_t c = uart_get_hw(self->uart)->dr;
+            max_items -= 1;
             if (c & UART_UARTDR_OE_BITS) {
                 // Overrun Error: We missed at least one byte. Not much we can do here.
             }
@@ -187,15 +195,30 @@ 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 | 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);
-        uart_drain_rx_fifo(self);
+    uint16_t mp_irq_flags = uart_get_hw(self->uart)->mis & (UART_UARTMIS_RXMIS_BITS | UART_UARTMIS_RTMIS_BITS);
+    if (mp_irq_flags) { // rx interrupt?
+        // clear all interrupt bits but tx and break
+        uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & ~(UART_UARTICR_TXIC_BITS | UART_UARTICR_BEIC_BITS);
+        uart_drain_rx_fifo(self, UART_FIFO_TRIGGER_LEVEL_RX - 1);
     }
     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 | UART_UARTICR_RTIC_BITS);
-        uart_fill_tx_fifo(self);
+        // clear all interrupt bits but rx and break
+        uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & ~(UART_UARTICR_RXIC_BITS | UART_UARTICR_RTIC_BITS | UART_UARTICR_BEIC_BITS);
+        if (ringbuf_avail(&self->write_buffer) == 0) {
+            mp_irq_flags |= UART_UARTMIS_TXMIS_BITS;
+        } else {
+            uart_fill_tx_fifo(self);
+        }
+    }
+    if (uart_get_hw(self->uart)->mis & UART_UARTMIS_BEMIS_BITS) { // break interrupt?
+        // CLear the event
+        hw_set_bits(&uart_get_hw(self->uart)->icr, UART_UARTICR_BEIC_BITS);
+        mp_irq_flags |= UART_UARTMIS_BEMIS_BITS;
+    }
+    // Check the flags to see if the user handler should be called
+    if (self->mp_irq_trigger & mp_irq_flags) {
+        self->mp_irq_flags = mp_irq_flags;
+        mp_irq_handler(self->mp_irq_obj);
     }
 }
 
@@ -215,14 +238,17 @@ static void uart1_irq_handler(void) {
     { 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) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_UARTMIS_RTMIS_BITS) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_TXIDLE), MP_ROM_INT(UART_UARTMIS_TXMIS_BITS) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_BREAK), MP_ROM_INT(UART_UARTMIS_BEMIS_BITS) }, \
 
 static void mp_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, "
-        "txbuf=%d, rxbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
+        "txbuf=%d, rxbuf=%d, timeout=%u, timeout_char=%u, invert=%s, irq=%d)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
         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]);
+        self->timeout, self->timeout_char, _invert_name[self->invert], self->mp_irq_trigger);
 }
 
 static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -441,11 +467,19 @@ static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
     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;
+    MP_STATE_PORT(rp2_uart_irq_obj)[self->uart_id] = NULL;
+    self->mp_irq_obj = NULL;
+    self->mp_irq_trigger = 0;
+}
+
+void machine_uart_deinit_all() {
+    mp_machine_uart_deinit((machine_uart_obj_t *)&machine_uart_obj[0]);
+    mp_machine_uart_deinit((machine_uart_obj_t *)&machine_uart_obj[1]);
 }
 
 static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
     // get all bytes from the fifo first
-    uart_drain_rx_fifo(self);
+    uart_drain_rx_fifo(self, UART_FIFO_SIZE_RX + 1);
     return ringbuf_avail(&self->read_buffer);
 }
 
@@ -460,6 +494,77 @@ static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     uart_set_break(self->uart, false);
 }
 
+static void uart_set_irq_level(machine_uart_obj_t *self, uint16_t trigger) {
+    if (trigger & UART_UARTMIS_BEMIS_BITS) {
+        // Enable the break Interrupt
+        hw_set_bits(&uart_get_hw(self->uart)->imsc, UART_UARTIMSC_BEIM_BITS);
+    } else {
+        // Disable the break Interrupt
+        hw_clear_bits(&uart_get_hw(self->uart)->imsc, UART_UARTIMSC_BEIM_BITS);
+    }
+    if (trigger & UART_UARTMIS_RTMIS_BITS) {
+        // Set the RX trigger level to 3/4 FIFO_size
+        hw_write_masked(&uart_get_hw(self->uart)->ifls, 0b011 << UART_UARTIFLS_RXIFLSEL_LSB,
+                UART_UARTIFLS_RXIFLSEL_BITS);
+    } else {
+        // Set the RX trigger level to 1/8 FIFO_size
+        hw_write_masked(&uart_get_hw(self->uart)->ifls, 0 << UART_UARTIFLS_RXIFLSEL_LSB,
+                UART_UARTIFLS_RXIFLSEL_BITS);
+    }
+}
+
+static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->mp_irq_trigger = new_trigger;
+    uart_set_irq_level(self, new_trigger);
+    return 0;
+}
+
+static mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    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) {
+        return self->mp_irq_trigger;
+    }
+    return 0;
+}
+
+static const mp_irq_methods_t uart_irq_methods = {
+    .trigger = uart_irq_trigger,
+    .info = uart_irq_info,
+};
+
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+    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));
+        MP_STATE_PORT(rp2_uart_irq_obj)[self->uart_id] = self->mp_irq_obj;
+    }
+
+    if (any_args) {
+        // 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%04x unsupported"), not_supported);
+        }
+
+        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_set_irq_level(self, trigger);
+    }
+
+    return self->mp_irq_obj;
+}
+
 static mp_uint_t mp_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);
     mp_uint_t start = mp_hal_ticks_ms();
@@ -471,7 +576,7 @@ static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
         while (ringbuf_avail(&self->read_buffer) == 0) {
             if (uart_is_readable(self->uart)) {
                 // Force a few incoming bytes to the buffer
-                uart_drain_rx_fifo(self);
+                uart_drain_rx_fifo(self, UART_FIFO_SIZE_RX + 1);
                 break;
             }
             mp_uint_t elapsed = mp_hal_ticks_ms() - start;
@@ -572,3 +677,4 @@ static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
 
 MP_REGISTER_ROOT_POINTER(void *rp2_uart_rx_buffer[2]);
 MP_REGISTER_ROOT_POINTER(void *rp2_uart_tx_buffer[2]);
+MP_REGISTER_ROOT_POINTER(void *rp2_uart_irq_obj[2]);
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index fa5495bf4100d..98417e8da6b0b 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -224,6 +224,7 @@ int main(int argc, char **argv) {
         #endif
         machine_pwm_deinit_all();
         machine_pin_deinit();
+        machine_uart_deinit_all();
         #if MICROPY_PY_THREAD
         mp_thread_deinit();
         #endif
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index e17ad67b0301d..1ed812afff8f5 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -8,6 +8,7 @@ void machine_pin_deinit(void);
 void machine_i2s_init0(void);
 void machine_i2s_deinit_all(void);
 void machine_pwm_deinit_all(void);
+void machine_uart_deinit_all(void);
 
 struct _machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o);
 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index abe25d7009e1e..a428721d763da 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -146,6 +146,7 @@
 #define MICROPY_PY_MACHINE_UART                 (1)
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE     "ports/rp2/machine_uart.c"
 #define MICROPY_PY_MACHINE_UART_SENDBREAK       (1)
+#define MICROPY_PY_MACHINE_UART_IRQ             (1)
 #define MICROPY_PY_MACHINE_WDT                  (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE      "ports/rp2/machine_wdt.c"
 #define MICROPY_PY_MACHINE_FREQ_NUM_ARGS_MAX    (2)

From 8e1123b25bca23a3334211546d4164c9c343ec5b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 22 Feb 2024 13:21:06 +0100
Subject: [PATCH 1356/3129] samd/machine_uart: Implement a Python UART IRQ
 handler.

Supported for all SAMD51 devices and SAMD21 with external flash.  For
interrupt events, IRQ_RX and IRQ_TXIDLE are provided.

IRQ_RX is called for every received byte.  This may not be useful for high
data rates, but can be used to build a wrapper class providing an
IRQ_RXIDLE event or to signal just the first byte of a message.

IRQ_TXIDLE is called only when messages are longer than 5 bytes and
triggers when still 5 bytes are due to be sent.

The SAMD hardware does not support implementing IRQ_RXIDLE.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_uart.c           | 123 ++++++++++++++++++++++++++--
 ports/samd/mcu/samd21/mpconfigmcu.h |   1 +
 ports/samd/mcu/samd51/mpconfigmcu.h |   1 +
 3 files changed, 118 insertions(+), 7 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index b560e0e8e6924..aa781a17073ae 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -40,7 +40,16 @@
 #define FLOW_CONTROL_RTS (1)
 #define FLOW_CONTROL_CTS (2)
 
+#define MP_UART_ALLOWED_FLAGS (SERCOM_USART_INTFLAG_RXC | SERCOM_USART_INTFLAG_TXC)
+
+#if MICROPY_PY_MACHINE_UART_IRQ
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(SERCOM_USART_INTFLAG_RXC) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_TXIDLE), MP_ROM_INT(SERCOM_USART_INTFLAG_TXC) }, \
+
+#else
 #define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
+#endif
 
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
@@ -67,6 +76,11 @@ typedef struct _machine_uart_obj_t {
     #if MICROPY_HW_UART_TXBUF
     ringbuf_t write_buffer;
     #endif
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    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
+    #endif
 } machine_uart_obj_t;
 
 static const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
@@ -93,23 +107,41 @@ void common_uart_irq_handler(int uart_id) {
     // Handle IRQ
     if (self != NULL) {
         Sercom *uart = sercom_instance[self->id];
+        #if MICROPY_PY_MACHINE_UART_IRQ
+        self->mp_irq_flags = 0;
+        #endif
         if (uart->USART.INTFLAG.bit.RXC != 0) {
             // Now handler the incoming data
             uart_drain_rx_fifo(self, uart);
+            #if MICROPY_PY_MACHINE_UART_IRQ
+            if (ringbuf_avail(&self->read_buffer) > 0) {
+                self->mp_irq_flags = SERCOM_USART_INTFLAG_RXC;
+            }
+            #endif
         } 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
+                #if MICROPY_PY_MACHINE_UART_IRQ
+                // Set the TXIDLE flag
+                self->mp_irq_flags |= SERCOM_USART_INTFLAG_TXC;
+                #endif
+                // Stop the DRE interrupt if there is no more data
                 uart->USART.INTENCLR.reg = SERCOM_USART_INTENCLR_DRE;
             }
             #endif
-        } else {
-            // Disable the other interrupts, if set by error
-            uart->USART.INTENCLR.reg = (uint8_t) ~(SERCOM_USART_INTENCLR_DRE | SERCOM_USART_INTENCLR_RXC);
         }
+        // Disable the other interrupts, if set by error
+        uart->USART.INTENCLR.reg = (uint8_t) ~(SERCOM_USART_INTENCLR_DRE | SERCOM_USART_INTENCLR_RXC);
+
+        #if MICROPY_PY_MACHINE_UART_IRQ
+        // Check the flags to see if the user handler should be called
+        if (self->mp_irq_trigger & self->mp_irq_flags) {
+            mp_irq_handler(self->mp_irq_obj);
+        }
+        #endif
     }
 }
 
@@ -202,6 +234,9 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         #if MICROPY_HW_UART_RTSCTS
         ", rts=%q, cts=%q"
         #endif
+        #if MICROPY_PY_MACHINE_UART_IRQ
+        ", irq=%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
@@ -212,6 +247,9 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         , self->rts != 0xff ? pin_find_by_id(self->rts)->name : MP_QSTR_None
         , self->cts != 0xff ? pin_find_by_id(self->cts)->name : MP_QSTR_None
         #endif
+        #if MICROPY_PY_MACHINE_UART_IRQ
+        , self->mp_irq_trigger
+        #endif
         );
 }
 
@@ -228,9 +266,7 @@ static void mp_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 MICROPY_HW_UART_TXBUF
         { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        #endif
         #if MICROPY_HW_UART_RTSCTS
         { MP_QSTR_rts, 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} },
@@ -386,6 +422,9 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->rts = 0xff;
     self->cts = 0xff;
     #endif
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    self->mp_irq_obj = NULL;
+    #endif
     self->new = true;
     MP_STATE_PORT(sercom_table[uart_id]) = self;
 
@@ -445,6 +484,59 @@ static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     mp_hal_set_pin_mux(self->tx, self->tx_pad_config.alt_fct);
 }
 
+#if MICROPY_PY_MACHINE_UART_IRQ
+
+static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->mp_irq_trigger = new_trigger;
+    return 0;
+}
+
+static mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    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) {
+        return self->mp_irq_trigger;
+    }
+    return 0;
+}
+
+static const mp_irq_methods_t uart_irq_methods = {
+    .trigger = uart_irq_trigger,
+    .info = uart_irq_info,
+};
+
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+    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 (any_args) {
+        // 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%04x unsupported"), not_supported);
+        }
+
+        self->mp_irq_obj->handler = handler;
+        self->mp_irq_obj->ishard = args[MP_IRQ_ARG_INIT_hard].u_bool;
+        self->mp_irq_trigger = trigger;
+    }
+
+    return self->mp_irq_obj;
+}
+
+#endif
+
 static mp_uint_t mp_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);
     Sercom *uart = sercom_instance[self->id];
@@ -481,9 +573,17 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     const uint8_t *src = buf_in;
     Sercom *uart = sercom_instance[self->id];
 
-    #if MICROPY_HW_UART_TXBUF
     uint64_t t = mp_hal_ticks_ms_64() + self->timeout;
+    #if MICROPY_HW_UART_TXBUF
 
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    // Prefill the FIFO to get rid of the initial IRQ_TXIDLE event
+    while (i < size && ringbuf_free(&(self->write_buffer)) > 0) {
+        ringbuf_put(&(self->write_buffer), *src++);
+        i++;
+    }
+    uart->USART.INTENSET.reg = SERCOM_USART_INTENSET_DRE; // kick off the IRQ
+    #endif
     while (i < size) {
         // Wait for the first/next character to be sent.
         while (ringbuf_free(&(self->write_buffer)) == 0) {
@@ -506,6 +606,15 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
 
     while (i < size) {
         while (!(uart->USART.INTFLAG.bit.DRE)) {
+            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++;
         i++;
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index fbb5b28e2b95a..29965f50f63a8 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -51,6 +51,7 @@ unsigned long trng_random_u32(int delay);
 #ifndef MICROPY_HW_UART_RTSCTS
 #define MICROPY_HW_UART_RTSCTS          (SAMD21_EXTRA_FEATURES)
 #endif
+#define MICROPY_PY_MACHINE_UART_IRQ     (SAMD21_EXTRA_FEATURES)
 
 // selected extensions of the extra features set
 #define MICROPY_PY_OS_URANDOM           (1)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index d567f28eb423a..9a7b8528f3573 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -15,6 +15,7 @@
 #define MICROPY_PY_ONEWIRE              (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
+#define MICROPY_PY_MACHINE_UART_IRQ     (1)
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (1)

From b7fa4e2fc87481180c7e36e80f2518856bfa0540 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 24 Sep 2023 21:42:06 +0200
Subject: [PATCH 1357/3129] mimxrt/machine_uart: Implement a Python UART IRQ
 handler.

Supported triggers are: IRQ_RXIDLE and IRQ_TXIDLE.

When IRQ_RXIDLE is set, the handler will be called 3 character times after
the data in burst stopped.

When IRQ_TXIDLE is set, the handler will be called immediately after the
data has been sent.

This commit requires a change to fsl_lpuart.c, because the existing code
does not support under-run appropriately.

The irq.flags() value is cleared only at an expected event.  Do not change
it otherwise.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/Makefile         |    2 +-
 ports/mimxrt/hal/fsl_lpuart.c | 2013 +++++++++++++++++++++++++++++++++
 ports/mimxrt/machine_uart.c   |   83 +-
 ports/mimxrt/mpconfigport.h   |    1 +
 4 files changed, 2094 insertions(+), 5 deletions(-)
 create mode 100644 ports/mimxrt/hal/fsl_lpuart.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 75cf9caec962c..e98073d33626d 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -132,7 +132,6 @@ SRC_HAL_IMX_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_pit.c \
 	$(MCU_DIR)/drivers/fsl_pwm.c \
 	$(MCU_DIR)/drivers/fsl_sai.c \
@@ -191,6 +190,7 @@ SRC_C += \
 	eth.c \
 	fatfs_port.c \
 	flash.c \
+	hal/fsl_lpuart.c \
 	hal/pwm_backport.c \
 	help.c \
 	led.c \
diff --git a/ports/mimxrt/hal/fsl_lpuart.c b/ports/mimxrt/hal/fsl_lpuart.c
new file mode 100644
index 0000000000000..54651c3efbcd4
--- /dev/null
+++ b/ports/mimxrt/hal/fsl_lpuart.c
@@ -0,0 +1,2013 @@
+/*
+ * Copyright (c) 2015-2016, Freescale Semiconductor, Inc.
+ * Copyright 2016-2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_lpuart.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.lpuart"
+#endif
+
+/* LPUART transfer state. */
+enum
+{
+    kLPUART_TxIdle, /*!< TX idle. */
+    kLPUART_TxBusy, /*!< TX busy. */
+    kLPUART_RxIdle, /*!< RX idle. */
+    kLPUART_RxBusy  /*!< RX busy. */
+};
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+/*!
+ * @brief Check whether the RX ring buffer is full.
+ *
+ * @userData handle LPUART handle pointer.
+ * @retval true  RX ring buffer is full.
+ * @retval false RX ring buffer is not full.
+ */
+static bool LPUART_TransferIsRxRingBufferFull(LPUART_Type *base, lpuart_handle_t *handle);
+
+/*!
+ * @brief Write to TX register using non-blocking method.
+ *
+ * This function writes data to the TX register directly, upper layer must make
+ * sure the TX register is empty or TX FIFO has empty room before calling this function.
+ *
+ * @note This function does not check whether all the data has been sent out to bus,
+ * so before disable TX, check kLPUART_TransmissionCompleteFlag to ensure the TX is
+ * finished.
+ *
+ * @param base LPUART peripheral base address.
+ * @param data Start address of the data to write.
+ * @param length Size of the buffer to be sent.
+ */
+static void LPUART_WriteNonBlocking(LPUART_Type *base, const uint8_t *data, size_t length);
+
+/*!
+ * @brief Read RX register using non-blocking method.
+ *
+ * This function reads data from the TX register directly, upper layer must make
+ * sure the RX register is full or TX FIFO has data before calling this function.
+ *
+ * @param base LPUART peripheral base address.
+ * @param data Start address of the buffer to store the received data.
+ * @param length Size of the buffer.
+ */
+static void LPUART_ReadNonBlocking(LPUART_Type *base, uint8_t *data, size_t length);
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* Array of LPUART peripheral base address. */
+static LPUART_Type *const s_lpuartBases[] = LPUART_BASE_PTRS;
+/* Array of LPUART handle. */
+void *s_lpuartHandle[ARRAY_SIZE(s_lpuartBases)];
+/* Array of LPUART IRQ number. */
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+static const IRQn_Type s_lpuartRxIRQ[] = LPUART_RX_IRQS;
+const IRQn_Type s_lpuartTxIRQ[] = LPUART_TX_IRQS;
+#else
+const IRQn_Type s_lpuartIRQ[] = LPUART_RX_TX_IRQS;
+#endif
+#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
+/* Array of LPUART clock name. */
+static const clock_ip_name_t s_lpuartClock[] = LPUART_CLOCKS;
+
+#if defined(LPUART_PERIPH_CLOCKS)
+/* Array of LPUART functional clock name. */
+static const clock_ip_name_t s_lpuartPeriphClocks[] = LPUART_PERIPH_CLOCKS;
+#endif
+
+#endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
+
+/* LPUART ISR for transactional APIs. */
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+lpuart_isr_t s_lpuartIsr = (lpuart_isr_t)DefaultISR;
+#else
+lpuart_isr_t s_lpuartIsr;
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+/*!
+ * brief Get the LPUART instance from peripheral base address.
+ *
+ * param base LPUART peripheral base address.
+ * return LPUART instance.
+ */
+uint32_t LPUART_GetInstance(LPUART_Type *base) {
+    uint32_t instance;
+
+    /* Find the instance index from base address mappings. */
+    for (instance = 0U; instance < ARRAY_SIZE(s_lpuartBases); instance++) {
+        if (s_lpuartBases[instance] == base) {
+            break;
+        }
+    }
+
+    assert(instance < ARRAY_SIZE(s_lpuartBases));
+
+    return instance;
+}
+
+/*!
+ * brief Get the length of received data in RX ring buffer.
+ *
+ * userData handle LPUART handle pointer.
+ * return Length of received data in RX ring buffer.
+ */
+size_t LPUART_TransferGetRxRingBufferLength(LPUART_Type *base, lpuart_handle_t *handle) {
+    assert(NULL != handle);
+
+    size_t size;
+    size_t tmpRxRingBufferSize = handle->rxRingBufferSize;
+    uint16_t tmpRxRingBufferTail = handle->rxRingBufferTail;
+    uint16_t tmpRxRingBufferHead = handle->rxRingBufferHead;
+
+    if (tmpRxRingBufferTail > tmpRxRingBufferHead) {
+        size = ((size_t)tmpRxRingBufferHead + tmpRxRingBufferSize - (size_t)tmpRxRingBufferTail);
+    } else {
+        size = ((size_t)tmpRxRingBufferHead - (size_t)tmpRxRingBufferTail);
+    }
+
+    return size;
+}
+
+static bool LPUART_TransferIsRxRingBufferFull(LPUART_Type *base, lpuart_handle_t *handle) {
+    assert(NULL != handle);
+
+    bool full;
+
+    if (LPUART_TransferGetRxRingBufferLength(base, handle) == (handle->rxRingBufferSize - 1U)) {
+        full = true;
+    } else {
+        full = false;
+    }
+    return full;
+}
+
+static void LPUART_WriteNonBlocking(LPUART_Type *base, const uint8_t *data, size_t length) {
+    assert(NULL != data);
+
+    size_t i;
+
+    /* The Non Blocking write data API assume user have ensured there is enough space in
+    peripheral to write. */
+    for (i = 0; i < length; i++) {
+        base->DATA = data[i];
+    }
+}
+
+static void LPUART_ReadNonBlocking(LPUART_Type *base, uint8_t *data, size_t length) {
+    assert(NULL != data);
+
+    size_t i;
+    #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+    uint32_t ctrl = base->CTRL;
+    bool isSevenDataBits = (((ctrl & LPUART_CTRL_M7_MASK) != 0U) ||
+        (((ctrl & LPUART_CTRL_M_MASK) == 0U) && ((ctrl & LPUART_CTRL_PE_MASK) != 0U)));
+    #endif
+
+    /* The Non Blocking read data API assume user have ensured there is enough space in
+    peripheral to write. */
+    for (i = 0; i < length; i++) {
+        #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+        if (isSevenDataBits) {
+            data[i] = (uint8_t)(base->DATA & 0x7FU);
+        } else {
+            data[i] = (uint8_t)base->DATA;
+        }
+        #else
+        data[i] = (uint8_t)(base->DATA);
+        #endif
+    }
+}
+
+/*!
+ * brief Initializes an LPUART instance with the user configuration structure and the peripheral clock.
+ *
+ * This function configures the LPUART module with user-defined settings. Call the LPUART_GetDefaultConfig() function
+ * to configure the configuration structure and get the default configuration.
+ * The example below shows how to use this API to configure the LPUART.
+ * code
+ *  lpuart_config_t lpuartConfig;
+ *  lpuartConfig.baudRate_Bps = 115200U;
+ *  lpuartConfig.parityMode = kLPUART_ParityDisabled;
+ *  lpuartConfig.dataBitsCount = kLPUART_EightDataBits;
+ *  lpuartConfig.isMsb = false;
+ *  lpuartConfig.stopBitCount = kLPUART_OneStopBit;
+ *  lpuartConfig.txFifoWatermark = 0;
+ *  lpuartConfig.rxFifoWatermark = 1;
+ *  LPUART_Init(LPUART1, &lpuartConfig, 20000000U);
+ * endcode
+ *
+ * param base LPUART peripheral base address.
+ * param config Pointer to a user-defined configuration structure.
+ * param srcClock_Hz LPUART clock source frequency in HZ.
+ * retval kStatus_LPUART_BaudrateNotSupport Baudrate is not support in current clock source.
+ * retval kStatus_Success LPUART initialize succeed
+ */
+status_t LPUART_Init(LPUART_Type *base, const lpuart_config_t *config, uint32_t srcClock_Hz) {
+    assert(NULL != config);
+    assert(0U < config->baudRate_Bps);
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    assert((uint8_t)FSL_FEATURE_LPUART_FIFO_SIZEn(base) >= config->txFifoWatermark);
+    assert((uint8_t)FSL_FEATURE_LPUART_FIFO_SIZEn(base) >= config->rxFifoWatermark);
+    #endif
+
+    status_t status = kStatus_Success;
+    uint32_t temp;
+    uint16_t sbr, sbrTemp;
+    uint8_t osr, osrTemp;
+    uint32_t tempDiff, calculatedBaud, baudDiff;
+
+    /* This LPUART instantiation uses a slightly different baud rate calculation
+     * The idea is to use the best OSR (over-sampling rate) possible
+     * Note, OSR is typically hard-set to 16 in other LPUART instantiations
+     * loop to find the best OSR value possible, one that generates minimum baudDiff
+     * iterate through the rest of the supported values of OSR */
+
+    baudDiff = config->baudRate_Bps;
+    osr = 0U;
+    sbr = 0U;
+    for (osrTemp = 4U; osrTemp <= 32U; osrTemp++) {
+        /* calculate the temporary sbr value   */
+        sbrTemp = (uint16_t)((srcClock_Hz * 10U / (config->baudRate_Bps * (uint32_t)osrTemp) + 5U) / 10U);
+        /*set sbrTemp to 1 if the sourceClockInHz can not satisfy the desired baud rate*/
+        if (sbrTemp == 0U) {
+            sbrTemp = 1U;
+        }
+        /* Calculate the baud rate based on the temporary OSR and SBR values */
+        calculatedBaud = (srcClock_Hz / ((uint32_t)osrTemp * (uint32_t)sbrTemp));
+        tempDiff = calculatedBaud > config->baudRate_Bps ? (calculatedBaud - config->baudRate_Bps) :
+            (config->baudRate_Bps - calculatedBaud);
+
+        if (tempDiff <= baudDiff) {
+            baudDiff = tempDiff;
+            osr = osrTemp;      /* update and store the best OSR value calculated */
+            sbr = sbrTemp;      /* update store the best SBR value calculated */
+        }
+    }
+
+    /* Check to see if actual baud rate is within 3% of desired baud rate
+     * based on the best calculate OSR value */
+    if (baudDiff > ((config->baudRate_Bps / 100U) * 3U)) {
+        /* Unacceptable baud rate difference of more than 3%*/
+        status = kStatus_LPUART_BaudrateNotSupport;
+    } else {
+        #if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
+
+        uint32_t instance = LPUART_GetInstance(base);
+
+        /* Enable lpuart clock */
+        (void)CLOCK_EnableClock(s_lpuartClock[instance]);
+        #if defined(LPUART_PERIPH_CLOCKS)
+        (void)CLOCK_EnableClock(s_lpuartPeriphClocks[instance]);
+        #endif
+
+        #endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
+
+        #if defined(FSL_FEATURE_LPUART_HAS_GLOBAL) && FSL_FEATURE_LPUART_HAS_GLOBAL
+        /*Reset all internal logic and registers, except the Global Register */
+        LPUART_SoftwareReset(base);
+        #else
+        /* Disable LPUART TX RX before setting. */
+        base->CTRL &= ~(LPUART_CTRL_TE_MASK | LPUART_CTRL_RE_MASK);
+        #endif
+
+        temp = base->BAUD;
+
+        /* Acceptable baud rate, check if OSR is between 4x and 7x oversampling.
+         * If so, then "BOTHEDGE" sampling must be turned on */
+        if ((osr > 3U) && (osr < 8U)) {
+            temp |= LPUART_BAUD_BOTHEDGE_MASK;
+        }
+
+        /* program the osr value (bit value is one less than actual value) */
+        temp &= ~LPUART_BAUD_OSR_MASK;
+        temp |= LPUART_BAUD_OSR((uint32_t)osr - 1UL);
+
+        /* write the sbr value to the BAUD registers */
+        temp &= ~LPUART_BAUD_SBR_MASK;
+        base->BAUD = temp | LPUART_BAUD_SBR(sbr);
+
+        /* Set bit count and parity mode. */
+        base->BAUD &= ~LPUART_BAUD_M10_MASK;
+
+        temp = base->CTRL & ~(LPUART_CTRL_PE_MASK | LPUART_CTRL_PT_MASK | LPUART_CTRL_M_MASK | LPUART_CTRL_ILT_MASK |
+            LPUART_CTRL_IDLECFG_MASK);
+
+        temp |= (uint8_t)config->parityMode | LPUART_CTRL_IDLECFG(config->rxIdleConfig) |
+            LPUART_CTRL_ILT(config->rxIdleType);
+
+        #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+        if (kLPUART_SevenDataBits == config->dataBitsCount) {
+            if (kLPUART_ParityDisabled != config->parityMode) {
+                temp &= ~LPUART_CTRL_M7_MASK; /* Seven data bits and one parity bit */
+            } else {
+                temp |= LPUART_CTRL_M7_MASK;
+            }
+        } else
+        #endif
+        {
+            if (kLPUART_ParityDisabled != config->parityMode) {
+                temp |= LPUART_CTRL_M_MASK; /* Eight data bits and one parity bit */
+            }
+        }
+
+        base->CTRL = temp;
+
+        #if defined(FSL_FEATURE_LPUART_HAS_STOP_BIT_CONFIG_SUPPORT) && FSL_FEATURE_LPUART_HAS_STOP_BIT_CONFIG_SUPPORT
+        /* set stop bit per char */
+        temp = base->BAUD & ~LPUART_BAUD_SBNS_MASK;
+        base->BAUD = temp | LPUART_BAUD_SBNS((uint8_t)config->stopBitCount);
+        #endif
+
+        #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+        /* Set tx/rx WATER watermark
+           Note:
+           Take care of the RX FIFO, RX interrupt request only assert when received bytes
+           equal or more than RX water mark, there is potential issue if RX water
+           mark larger than 1.
+           For example, if RX FIFO water mark is 2, upper layer needs 5 bytes and
+           5 bytes are received. the last byte will be saved in FIFO but not trigger
+           RX interrupt because the water mark is 2.
+         */
+        base->WATER = (((uint32_t)(config->rxFifoWatermark) << 16U) | config->txFifoWatermark);
+
+        /* Enable tx/rx FIFO */
+        base->FIFO |= (LPUART_FIFO_TXFE_MASK | LPUART_FIFO_RXFE_MASK);
+
+        /* Flush FIFO */
+        base->FIFO |= (LPUART_FIFO_TXFLUSH_MASK | LPUART_FIFO_RXFLUSH_MASK);
+        #endif
+
+        /* Clear all status flags */
+        temp = (LPUART_STAT_RXEDGIF_MASK | LPUART_STAT_IDLE_MASK | LPUART_STAT_OR_MASK | LPUART_STAT_NF_MASK |
+            LPUART_STAT_FE_MASK | LPUART_STAT_PF_MASK);
+
+        #if defined(FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT) && FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT
+        temp |= LPUART_STAT_LBKDIF_MASK;
+        #endif
+
+        #if defined(FSL_FEATURE_LPUART_HAS_ADDRESS_MATCHING) && FSL_FEATURE_LPUART_HAS_ADDRESS_MATCHING
+        temp |= (LPUART_STAT_MA1F_MASK | LPUART_STAT_MA2F_MASK);
+        #endif
+
+        #if defined(FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT) && FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT
+        /* Set the CTS configuration/TX CTS source. */
+        base->MODIR |= LPUART_MODIR_TXCTSC(config->txCtsConfig) | LPUART_MODIR_TXCTSSRC(config->txCtsSource);
+        if (true == config->enableRxRTS) {
+            /* Enable the receiver RTS(request-to-send) function. */
+            base->MODIR |= LPUART_MODIR_RXRTSE_MASK;
+        }
+        if (true == config->enableTxCTS) {
+            /* Enable the CTS(clear-to-send) function. */
+            base->MODIR |= LPUART_MODIR_TXCTSE_MASK;
+        }
+        #endif
+
+        /* Set data bits order. */
+        if (true == config->isMsb) {
+            temp |= LPUART_STAT_MSBF_MASK;
+        } else {
+            temp &= ~LPUART_STAT_MSBF_MASK;
+        }
+
+        base->STAT |= temp;
+
+        /* Enable TX/RX base on configure structure. */
+        temp = base->CTRL;
+        if (true == config->enableTx) {
+            temp |= LPUART_CTRL_TE_MASK;
+        }
+
+        if (true == config->enableRx) {
+            temp |= LPUART_CTRL_RE_MASK;
+        }
+
+        base->CTRL = temp;
+    }
+
+    return status;
+}
+/*!
+ * brief Deinitializes a LPUART instance.
+ *
+ * This function waits for transmit to complete, disables TX and RX, and disables the LPUART clock.
+ *
+ * param base LPUART peripheral base address.
+ */
+void LPUART_Deinit(LPUART_Type *base) {
+    uint32_t temp;
+
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    /* Wait tx FIFO send out*/
+    while (0U != ((base->WATER & LPUART_WATER_TXCOUNT_MASK) >> LPUART_WATER_TXWATER_SHIFT)) {
+    }
+    #endif
+    /* Wait last char shift out */
+    while (0U == (base->STAT & LPUART_STAT_TC_MASK)) {
+    }
+
+    /* Clear all status flags */
+    temp = (LPUART_STAT_RXEDGIF_MASK | LPUART_STAT_IDLE_MASK | LPUART_STAT_OR_MASK | LPUART_STAT_NF_MASK |
+        LPUART_STAT_FE_MASK | LPUART_STAT_PF_MASK);
+
+    #if defined(FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT) && FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT
+    temp |= LPUART_STAT_LBKDIF_MASK;
+    #endif
+
+    #if defined(FSL_FEATURE_LPUART_HAS_ADDRESS_MATCHING) && FSL_FEATURE_LPUART_HAS_ADDRESS_MATCHING
+    temp |= (LPUART_STAT_MA1F_MASK | LPUART_STAT_MA2F_MASK);
+    #endif
+
+    base->STAT |= temp;
+
+    /* Disable the module. */
+    base->CTRL = 0U;
+
+    #if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
+    uint32_t instance = LPUART_GetInstance(base);
+
+    /* Disable lpuart clock */
+    (void)CLOCK_DisableClock(s_lpuartClock[instance]);
+
+    #if defined(LPUART_PERIPH_CLOCKS)
+    (void)CLOCK_DisableClock(s_lpuartPeriphClocks[instance]);
+    #endif
+
+    #endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
+}
+
+/*!
+ * brief Gets the default configuration structure.
+ *
+ * This function initializes the LPUART configuration structure to a default value. The default
+ * values are:
+ *   lpuartConfig->baudRate_Bps = 115200U;
+ *   lpuartConfig->parityMode = kLPUART_ParityDisabled;
+ *   lpuartConfig->dataBitsCount = kLPUART_EightDataBits;
+ *   lpuartConfig->isMsb = false;
+ *   lpuartConfig->stopBitCount = kLPUART_OneStopBit;
+ *   lpuartConfig->txFifoWatermark = 0;
+ *   lpuartConfig->rxFifoWatermark = 1;
+ *   lpuartConfig->rxIdleType = kLPUART_IdleTypeStartBit;
+ *   lpuartConfig->rxIdleConfig = kLPUART_IdleCharacter1;
+ *   lpuartConfig->enableTx = false;
+ *   lpuartConfig->enableRx = false;
+ *
+ * param config Pointer to a configuration structure.
+ */
+void LPUART_GetDefaultConfig(lpuart_config_t *config) {
+    assert(NULL != config);
+
+    /* Initializes the configure structure to zero. */
+    (void)memset(config, 0, sizeof(*config));
+
+    config->baudRate_Bps = 115200U;
+    config->parityMode = kLPUART_ParityDisabled;
+    config->dataBitsCount = kLPUART_EightDataBits;
+    config->isMsb = false;
+    #if defined(FSL_FEATURE_LPUART_HAS_STOP_BIT_CONFIG_SUPPORT) && FSL_FEATURE_LPUART_HAS_STOP_BIT_CONFIG_SUPPORT
+    config->stopBitCount = kLPUART_OneStopBit;
+    #endif
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    config->txFifoWatermark = 0U;
+    config->rxFifoWatermark = 0U;
+    #endif
+    #if defined(FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT) && FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT
+    config->enableRxRTS = false;
+    config->enableTxCTS = false;
+    config->txCtsConfig = kLPUART_CtsSampleAtStart;
+    config->txCtsSource = kLPUART_CtsSourcePin;
+    #endif
+    config->rxIdleType = kLPUART_IdleTypeStartBit;
+    config->rxIdleConfig = kLPUART_IdleCharacter1;
+    config->enableTx = false;
+    config->enableRx = false;
+}
+
+/*!
+ * brief Sets the LPUART instance baudrate.
+ *
+ * This function configures the LPUART module baudrate. This function is used to update
+ * the LPUART module baudrate after the LPUART module is initialized by the LPUART_Init.
+ * code
+ *  LPUART_SetBaudRate(LPUART1, 115200U, 20000000U);
+ * endcode
+ *
+ * param base LPUART peripheral base address.
+ * param baudRate_Bps LPUART baudrate to be set.
+ * param srcClock_Hz LPUART clock source frequency in HZ.
+ * retval kStatus_LPUART_BaudrateNotSupport Baudrate is not supported in the current clock source.
+ * retval kStatus_Success Set baudrate succeeded.
+ */
+status_t LPUART_SetBaudRate(LPUART_Type *base, uint32_t baudRate_Bps, uint32_t srcClock_Hz) {
+    assert(0U < baudRate_Bps);
+
+    status_t status = kStatus_Success;
+    uint32_t temp, oldCtrl;
+    uint16_t sbr, sbrTemp;
+    uint8_t osr, osrTemp;
+    uint32_t tempDiff, calculatedBaud, baudDiff;
+
+    /* This LPUART instantiation uses a slightly different baud rate calculation
+     * The idea is to use the best OSR (over-sampling rate) possible
+     * Note, OSR is typically hard-set to 16 in other LPUART instantiations
+     * loop to find the best OSR value possible, one that generates minimum baudDiff
+     * iterate through the rest of the supported values of OSR */
+
+    baudDiff = baudRate_Bps;
+    osr = 0U;
+    sbr = 0U;
+    for (osrTemp = 4U; osrTemp <= 32U; osrTemp++) {
+        /* calculate the temporary sbr value   */
+        sbrTemp = (uint16_t)((srcClock_Hz * 10U / (baudRate_Bps * (uint32_t)osrTemp) + 5U) / 10U);
+        /*set sbrTemp to 1 if the sourceClockInHz can not satisfy the desired baud rate*/
+        if (sbrTemp == 0U) {
+            sbrTemp = 1U;
+        }
+        /* Calculate the baud rate based on the temporary OSR and SBR values */
+        calculatedBaud = srcClock_Hz / ((uint32_t)osrTemp * (uint32_t)sbrTemp);
+
+        tempDiff = calculatedBaud > baudRate_Bps ? (calculatedBaud - baudRate_Bps) : (baudRate_Bps - calculatedBaud);
+
+        if (tempDiff <= baudDiff) {
+            baudDiff = tempDiff;
+            osr = osrTemp;      /* update and store the best OSR value calculated */
+            sbr = sbrTemp;      /* update store the best SBR value calculated */
+        }
+    }
+
+    /* Check to see if actual baud rate is within 3% of desired baud rate
+     * based on the best calculate OSR value */
+    if (baudDiff < (uint32_t)((baudRate_Bps / 100U) * 3U)) {
+        /* Store CTRL before disable Tx and Rx */
+        oldCtrl = base->CTRL;
+
+        /* Disable LPUART TX RX before setting. */
+        base->CTRL &= ~(LPUART_CTRL_TE_MASK | LPUART_CTRL_RE_MASK);
+
+        temp = base->BAUD;
+
+        /* Acceptable baud rate, check if OSR is between 4x and 7x oversampling.
+         * If so, then "BOTHEDGE" sampling must be turned on */
+        if ((osr > 3U) && (osr < 8U)) {
+            temp |= LPUART_BAUD_BOTHEDGE_MASK;
+        }
+
+        /* program the osr value (bit value is one less than actual value) */
+        temp &= ~LPUART_BAUD_OSR_MASK;
+        temp |= LPUART_BAUD_OSR((uint32_t)osr - 1UL);
+
+        /* write the sbr value to the BAUD registers */
+        temp &= ~LPUART_BAUD_SBR_MASK;
+        base->BAUD = temp | LPUART_BAUD_SBR(sbr);
+
+        /* Restore CTRL. */
+        base->CTRL = oldCtrl;
+    } else {
+        /* Unacceptable baud rate difference of more than 3%*/
+        status = kStatus_LPUART_BaudrateNotSupport;
+    }
+
+    return status;
+}
+
+/*!
+ * brief Enable 9-bit data mode for LPUART.
+ *
+ * This function set the 9-bit mode for LPUART module. The 9th bit is not used for parity thus can be modified by user.
+ *
+ * param base LPUART peripheral base address.
+ * param enable true to enable, false to disable.
+ */
+void LPUART_Enable9bitMode(LPUART_Type *base, bool enable) {
+    assert(base != NULL);
+
+    uint32_t temp = 0U;
+
+    if (enable) {
+        /* Set LPUART_CTRL_M for 9-bit mode, clear LPUART_CTRL_PE to disable parity. */
+        temp = base->CTRL & ~((uint32_t)LPUART_CTRL_PE_MASK | (uint32_t)LPUART_CTRL_M_MASK);
+        temp |= (uint32_t)LPUART_CTRL_M_MASK;
+        base->CTRL = temp;
+    } else {
+        /* Clear LPUART_CTRL_M. */
+        base->CTRL &= ~(uint32_t)LPUART_CTRL_M_MASK;
+    }
+    #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+    /* Clear LPUART_CTRL_M7 to disable 7-bit mode. */
+    base->CTRL &= ~(uint32_t)LPUART_CTRL_M7_MASK;
+    #endif
+    #if defined(FSL_FEATURE_LPUART_HAS_10BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_10BIT_DATA_SUPPORT
+    /* Clear LPUART_BAUD_M10 to disable 10-bit mode. */
+    base->BAUD &= ~(uint32_t)LPUART_BAUD_M10_MASK;
+    #endif
+}
+
+/*!
+ * brief Transmit an address frame in 9-bit data mode.
+ *
+ * param base LPUART peripheral base address.
+ * param address LPUART slave address.
+ */
+void LPUART_SendAddress(LPUART_Type *base, uint8_t address) {
+    assert(base != NULL);
+
+    uint32_t temp = base->DATA & 0xFFFFFC00UL;
+    temp |= ((uint32_t)address | (1UL << LPUART_DATA_R8T8_SHIFT));
+    base->DATA = temp;
+}
+
+/*!
+ * brief Enables LPUART interrupts according to a provided mask.
+ *
+ * This function enables the LPUART interrupts according to a provided mask. The mask
+ * is a logical OR of enumeration members. See the ref _lpuart_interrupt_enable.
+ * This examples shows how to enable TX empty interrupt and RX full interrupt:
+ * code
+ *     LPUART_EnableInterrupts(LPUART1,kLPUART_TxDataRegEmptyInterruptEnable | kLPUART_RxDataRegFullInterruptEnable);
+ * endcode
+ *
+ * param base LPUART peripheral base address.
+ * param mask The interrupts to enable. Logical OR of ref _uart_interrupt_enable.
+ */
+void LPUART_EnableInterrupts(LPUART_Type *base, uint32_t mask) {
+    /* Only consider the real interrupt enable bits. */
+    mask &= (uint32_t)kLPUART_AllInterruptEnable;
+
+    /* Check int enable bits in base->BAUD */
+    uint32_t tempReg = base->BAUD;
+    #if defined(FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT) && FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT
+    tempReg |= ((mask << 8U) & LPUART_BAUD_LBKDIE_MASK);
+    /* Clear bit 7 from mask */
+    mask &= ~(uint32_t)kLPUART_LinBreakInterruptEnable;
+    #endif
+    tempReg |= ((mask << 8U) & LPUART_BAUD_RXEDGIE_MASK);
+    /* Clear bit 6 from mask */
+    mask &= ~(uint32_t)kLPUART_RxActiveEdgeInterruptEnable;
+    base->BAUD = tempReg;
+
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    /* Check int enable bits in base->FIFO */
+    base->FIFO = (base->FIFO & ~(LPUART_FIFO_TXOF_MASK | LPUART_FIFO_RXUF_MASK)) |
+        (mask & (LPUART_FIFO_TXOFE_MASK | LPUART_FIFO_RXUFE_MASK));
+    /* Clear bit 9 and bit 8 from mask */
+    mask &= ~((uint32_t)kLPUART_TxFifoOverflowInterruptEnable | (uint32_t)kLPUART_RxFifoUnderflowInterruptEnable);
+    #endif
+
+    /* Check int enable bits in base->CTRL */
+    base->CTRL |= mask;
+}
+
+/*!
+ * brief Disables  LPUART interrupts according to a provided mask.
+ *
+ * This function disables the LPUART interrupts according to a provided mask. The mask
+ * is a logical OR of enumeration members. See ref _lpuart_interrupt_enable.
+ * This example shows how to disable the TX empty interrupt and RX full interrupt:
+ * code
+ *     LPUART_DisableInterrupts(LPUART1,kLPUART_TxDataRegEmptyInterruptEnable | kLPUART_RxDataRegFullInterruptEnable);
+ * endcode
+ *
+ * param base LPUART peripheral base address.
+ * param mask The interrupts to disable. Logical OR of ref _lpuart_interrupt_enable.
+ */
+void LPUART_DisableInterrupts(LPUART_Type *base, uint32_t mask) {
+    /* Only consider the real interrupt enable bits. */
+    mask &= (uint32_t)kLPUART_AllInterruptEnable;
+    /* Check int enable bits in base->BAUD */
+    uint32_t tempReg = base->BAUD;
+    #if defined(FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT) && FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT
+    tempReg &= ~((mask << 8U) & LPUART_BAUD_LBKDIE_MASK);
+    /* Clear bit 7 from mask */
+    mask &= ~(uint32_t)kLPUART_LinBreakInterruptEnable;
+    #endif
+    tempReg &= ~((mask << 8U) & LPUART_BAUD_RXEDGIE_MASK);
+    /* Clear bit 6 from mask */
+    mask &= ~(uint32_t)kLPUART_RxActiveEdgeInterruptEnable;
+    base->BAUD = tempReg;
+
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    /* Check int enable bits in base->FIFO */
+    base->FIFO = (base->FIFO & ~(LPUART_FIFO_TXOF_MASK | LPUART_FIFO_RXUF_MASK)) &
+        ~(mask & (LPUART_FIFO_TXOFE_MASK | LPUART_FIFO_RXUFE_MASK));
+    /* Clear bit 9 and bit 8 from mask */
+    mask &= ~((uint32_t)kLPUART_TxFifoOverflowInterruptEnable | (uint32_t)kLPUART_RxFifoUnderflowInterruptEnable);
+    #endif
+
+    /* Check int enable bits in base->CTRL */
+    base->CTRL &= ~mask;
+}
+
+/*!
+ * brief Gets enabled LPUART interrupts.
+ *
+ * This function gets the enabled LPUART interrupts. The enabled interrupts are returned
+ * as the logical OR value of the enumerators ref _lpuart_interrupt_enable. To check
+ * a specific interrupt enable status, compare the return value with enumerators
+ * in ref _lpuart_interrupt_enable.
+ * For example, to check whether the TX empty interrupt is enabled:
+ * code
+ *     uint32_t enabledInterrupts = LPUART_GetEnabledInterrupts(LPUART1);
+ *
+ *     if (kLPUART_TxDataRegEmptyInterruptEnable & enabledInterrupts)
+ *     {
+ *         ...
+ *     }
+ * endcode
+ *
+ * param base LPUART peripheral base address.
+ * return LPUART interrupt flags which are logical OR of the enumerators in ref _lpuart_interrupt_enable.
+ */
+uint32_t LPUART_GetEnabledInterrupts(LPUART_Type *base) {
+    /* Check int enable bits in base->CTRL */
+    uint32_t temp = (uint32_t)(base->CTRL & (uint32_t)kLPUART_AllInterruptEnable);
+
+    /* Check int enable bits in base->BAUD */
+    temp = (temp & ~(uint32_t)kLPUART_RxActiveEdgeInterruptEnable) | ((base->BAUD & LPUART_BAUD_RXEDGIE_MASK) >> 8U);
+    #if defined(FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT) && FSL_FEATURE_LPUART_HAS_LIN_BREAK_DETECT
+    temp = (temp & ~(uint32_t)kLPUART_LinBreakInterruptEnable) | ((base->BAUD & LPUART_BAUD_LBKDIE_MASK) >> 8U);
+    #endif
+
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    /* Check int enable bits in base->FIFO */
+    temp =
+        (temp & ~((uint32_t)kLPUART_TxFifoOverflowInterruptEnable | (uint32_t)kLPUART_RxFifoUnderflowInterruptEnable)) |
+        (base->FIFO & (LPUART_FIFO_TXOFE_MASK | LPUART_FIFO_RXUFE_MASK));
+    #endif
+
+    return temp;
+}
+
+/*!
+ * brief Gets LPUART status flags.
+ *
+ * This function gets all LPUART status flags. The flags are returned as the logical
+ * OR value of the enumerators ref _lpuart_flags. To check for a specific status,
+ * compare the return value with enumerators in the ref _lpuart_flags.
+ * For example, to check whether the TX is empty:
+ * code
+ *     if (kLPUART_TxDataRegEmptyFlag & LPUART_GetStatusFlags(LPUART1))
+ *     {
+ *         ...
+ *     }
+ * endcode
+ *
+ * param base LPUART peripheral base address.
+ * return LPUART status flags which are ORed by the enumerators in the _lpuart_flags.
+ */
+uint32_t LPUART_GetStatusFlags(LPUART_Type *base) {
+    uint32_t temp;
+    temp = base->STAT;
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    temp |= (base->FIFO &
+        (LPUART_FIFO_TXEMPT_MASK | LPUART_FIFO_RXEMPT_MASK | LPUART_FIFO_TXOF_MASK | LPUART_FIFO_RXUF_MASK)) >>
+        16U;
+    #endif
+    /* Only keeps the status bits */
+    temp &= (uint32_t)kLPUART_AllFlags;
+    return temp;
+}
+
+/*!
+ * brief Clears status flags with a provided mask.
+ *
+ * This function clears LPUART status flags with a provided mask. Automatically cleared flags
+ * can't be cleared by this function.
+ * Flags that can only cleared or set by hardware are:
+ *    kLPUART_TxDataRegEmptyFlag, kLPUART_TransmissionCompleteFlag, kLPUART_RxDataRegFullFlag,
+ *    kLPUART_RxActiveFlag, kLPUART_NoiseErrorInRxDataRegFlag, kLPUART_ParityErrorInRxDataRegFlag,
+ *    kLPUART_TxFifoEmptyFlag,kLPUART_RxFifoEmptyFlag
+ * Note: This API should be called when the Tx/Rx is idle, otherwise it takes no effects.
+ *
+ * param base LPUART peripheral base address.
+ * param mask the status flags to be cleared. The user can use the enumerators in the
+ *  _lpuart_status_flag_t to do the OR operation and get the mask.
+ * return 0 succeed, others failed.
+ * retval kStatus_LPUART_FlagCannotClearManually The flag can't be cleared by this function but
+ *         it is cleared automatically by hardware.
+ * retval kStatus_Success Status in the mask are cleared.
+ */
+status_t LPUART_ClearStatusFlags(LPUART_Type *base, uint32_t mask) {
+    uint32_t temp;
+    status_t status;
+
+    /* Only deal with the clearable flags */
+    mask &= (uint32_t)kLPUART_AllClearFlags;
+    #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+    /* Status bits in FIFO register */
+    if ((mask & ((uint32_t)kLPUART_TxFifoOverflowFlag | (uint32_t)kLPUART_RxFifoUnderflowFlag)) != 0U) {
+        /* Get the FIFO register value and mask the rx/tx FIFO flush bits and the status bits that can be W1C in case
+           they are written 1 accidentally. */
+        temp = (uint32_t)base->FIFO;
+        temp &= (uint32_t)(
+            ~(LPUART_FIFO_TXFLUSH_MASK | LPUART_FIFO_RXFLUSH_MASK | LPUART_FIFO_TXOF_MASK | LPUART_FIFO_RXUF_MASK));
+        temp |= (mask << 16U) & (LPUART_FIFO_TXOF_MASK | LPUART_FIFO_RXUF_MASK);
+        base->FIFO = temp;
+    }
+    #endif
+    /* Status bits in STAT register */
+    /* First get the STAT register value and mask all the bits that not represent status, then OR with the status bit
+     * that is to be W1C */
+    temp = (base->STAT & 0x3E000000UL) | mask;
+    base->STAT = temp;
+    /* If some flags still pending. */
+    if (0U != (mask & LPUART_GetStatusFlags(base))) {
+        status = kStatus_LPUART_FlagCannotClearManually;
+    } else {
+        status = kStatus_Success;
+    }
+
+    return status;
+}
+
+/*!
+ * brief Writes to the transmitter register using a blocking method.
+ *
+ * This function polls the transmitter register, first waits for the register to be empty or TX FIFO to have room,
+ * and writes data to the transmitter buffer, then waits for the data to be sent out to bus.
+ *
+ * param base LPUART peripheral base address.
+ * param data Start address of the data to write.
+ * param length Size of the data to write.
+ * retval kStatus_LPUART_Timeout Transmission timed out and was aborted.
+ * retval kStatus_Success Successfully wrote all data.
+ */
+status_t LPUART_WriteBlocking(LPUART_Type *base, const uint8_t *data, size_t length) {
+    assert(NULL != data);
+
+    const uint8_t *dataAddress = data;
+    size_t transferSize = length;
+
+    #if UART_RETRY_TIMES
+    uint32_t waitTimes;
+    #endif
+
+    while (0U != transferSize) {
+        #if UART_RETRY_TIMES
+        waitTimes = UART_RETRY_TIMES;
+        while ((0U == (base->STAT & LPUART_STAT_TDRE_MASK)) && (0U != --waitTimes))
+        #else
+        while (0U == (base->STAT & LPUART_STAT_TDRE_MASK))
+        #endif
+        {
+        }
+        #if UART_RETRY_TIMES
+        if (0U == waitTimes) {
+            return kStatus_LPUART_Timeout;
+        }
+        #endif
+        base->DATA = *(dataAddress);
+        dataAddress++;
+        transferSize--;
+    }
+    /* Ensure all the data in the transmit buffer are sent out to bus. */
+    #if UART_RETRY_TIMES
+    waitTimes = UART_RETRY_TIMES;
+    while ((0U == (base->STAT & LPUART_STAT_TC_MASK)) && (0U != --waitTimes))
+    #else
+    while (0U == (base->STAT & LPUART_STAT_TC_MASK))
+    #endif
+    {
+    }
+    #if UART_RETRY_TIMES
+    if (0U == waitTimes) {
+        return kStatus_LPUART_Timeout;
+    }
+    #endif
+    return kStatus_Success;
+}
+
+/*!
+ * brief Reads the receiver data register using a blocking method.
+ *
+ * This function polls the receiver register, waits for the receiver register full or receiver FIFO
+ * has data, and reads data from the TX register.
+ *
+ * param base LPUART peripheral base address.
+ * param data Start address of the buffer to store the received data.
+ * param length Size of the buffer.
+ * retval kStatus_LPUART_RxHardwareOverrun Receiver overrun happened while receiving data.
+ * retval kStatus_LPUART_NoiseError Noise error happened while receiving data.
+ * retval kStatus_LPUART_FramingError Framing error happened while receiving data.
+ * retval kStatus_LPUART_ParityError Parity error happened while receiving data.
+ * retval kStatus_LPUART_Timeout Transmission timed out and was aborted.
+ * retval kStatus_Success Successfully received all data.
+ */
+status_t LPUART_ReadBlocking(LPUART_Type *base, uint8_t *data, size_t length) {
+    assert(NULL != data);
+
+    status_t status = kStatus_Success;
+    uint32_t statusFlag;
+    uint8_t *dataAddress = data;
+
+    #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+    uint32_t ctrl = base->CTRL;
+    bool isSevenDataBits = (((ctrl & LPUART_CTRL_M7_MASK) != 0U) ||
+        (((ctrl & LPUART_CTRL_M_MASK) == 0U) && ((ctrl & LPUART_CTRL_PE_MASK) != 0U)));
+    #endif
+
+    #if UART_RETRY_TIMES
+    uint32_t waitTimes;
+    #endif
+
+    while (0U != (length--)) {
+        #if UART_RETRY_TIMES
+        waitTimes = UART_RETRY_TIMES;
+        #endif
+        #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+        while (0U == ((base->WATER & LPUART_WATER_RXCOUNT_MASK) >> LPUART_WATER_RXCOUNT_SHIFT))
+        #else
+        while (0U == (base->STAT & LPUART_STAT_RDRF_MASK))
+        #endif
+        {
+            #if UART_RETRY_TIMES
+            if (0U == --waitTimes) {
+                status = kStatus_LPUART_Timeout;
+                break;
+            }
+            #endif
+            statusFlag = LPUART_GetStatusFlags(base);
+
+            if (0U != (statusFlag & (uint32_t)kLPUART_RxOverrunFlag)) {
+                status = ((kStatus_Success == LPUART_ClearStatusFlags(base, (uint32_t)kLPUART_RxOverrunFlag)) ?
+                    (kStatus_LPUART_RxHardwareOverrun) :
+                    (kStatus_LPUART_FlagCannotClearManually));
+                /* Other error flags(FE, NF, and PF) are prevented from setting once OR is set, no need to check other
+                 * error flags*/
+                break;
+            }
+
+            if (0U != (statusFlag & (uint32_t)kLPUART_ParityErrorFlag)) {
+                status = ((kStatus_Success == LPUART_ClearStatusFlags(base, (uint32_t)kLPUART_ParityErrorFlag)) ?
+                    (kStatus_LPUART_ParityError) :
+                    (kStatus_LPUART_FlagCannotClearManually));
+            }
+
+            if (0U != (statusFlag & (uint32_t)kLPUART_FramingErrorFlag)) {
+                status = ((kStatus_Success == LPUART_ClearStatusFlags(base, (uint32_t)kLPUART_FramingErrorFlag)) ?
+                    (kStatus_LPUART_FramingError) :
+                    (kStatus_LPUART_FlagCannotClearManually));
+            }
+
+            if (0U != (statusFlag & (uint32_t)kLPUART_NoiseErrorFlag)) {
+                status = ((kStatus_Success == LPUART_ClearStatusFlags(base, (uint32_t)kLPUART_NoiseErrorFlag)) ?
+                    (kStatus_LPUART_NoiseError) :
+                    (kStatus_LPUART_FlagCannotClearManually));
+            }
+            if (kStatus_Success != status) {
+                break;
+            }
+        }
+
+        if (kStatus_Success == status) {
+            #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+            if (isSevenDataBits) {
+                *(dataAddress) = (uint8_t)(base->DATA & 0x7FU);
+                dataAddress++;
+            } else {
+                *(dataAddress) = (uint8_t)base->DATA;
+                dataAddress++;
+            }
+            #else
+            *(dataAddress) = (uint8_t)base->DATA;
+            dataAddress++;
+            #endif
+        } else {
+            break;
+        }
+    }
+
+    return status;
+}
+
+/*!
+ * brief Initializes the LPUART handle.
+ *
+ * This function initializes the LPUART handle, which can be used for other LPUART
+ * transactional APIs. Usually, for a specified LPUART instance,
+ * call this API once to get the initialized handle.
+ *
+ * The LPUART driver supports the "background" receiving, which means that user can set up
+ * an RX ring buffer optionally. Data received is stored into the ring buffer even when the
+ * user doesn't call the LPUART_TransferReceiveNonBlocking() API. If there is already data received
+ * in the ring buffer, the user can get the received data from the ring buffer directly.
+ * The ring buffer is disabled if passing NULL as p ringBuffer.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ * param callback Callback function.
+ * param userData User data.
+ */
+void LPUART_TransferCreateHandle(LPUART_Type *base,
+    lpuart_handle_t *handle,
+    lpuart_transfer_callback_t callback,
+    void *userData) {
+    assert(NULL != handle);
+
+    uint32_t instance;
+
+    #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+    uint32_t ctrl = base->CTRL;
+    bool isSevenDataBits = (((ctrl & LPUART_CTRL_M7_MASK) != 0U) ||
+        (((ctrl & LPUART_CTRL_M_MASK) == 0U) && ((ctrl & LPUART_CTRL_PE_MASK) != 0U)));
+    #endif
+
+    /* Zero the handle. */
+    (void)memset(handle, 0, sizeof(lpuart_handle_t));
+
+    /* Set the TX/RX state. */
+    handle->rxState = (uint8_t)kLPUART_RxIdle;
+    handle->txState = (uint8_t)kLPUART_TxIdle;
+
+    /* Set the callback and user data. */
+    handle->callback = callback;
+    handle->userData = userData;
+
+    #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+    /* Initial seven data bits flag */
+    handle->isSevenDataBits = isSevenDataBits;
+    #endif
+
+    /* Get instance from peripheral base address. */
+    instance = LPUART_GetInstance(base);
+
+    /* Save the handle in global variables to support the double weak mechanism. */
+    s_lpuartHandle[instance] = handle;
+
+    s_lpuartIsr = LPUART_TransferHandleIRQ;
+
+/* Enable interrupt in NVIC. */
+    #if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+    (void)EnableIRQ(s_lpuartRxIRQ[instance]);
+    (void)EnableIRQ(s_lpuartTxIRQ[instance]);
+    #else
+    (void)EnableIRQ(s_lpuartIRQ[instance]);
+    #endif
+}
+
+/*!
+ * brief Sets up the RX ring buffer.
+ *
+ * This function sets up the RX ring buffer to a specific UART handle.
+ *
+ * When the RX ring buffer is used, data received is stored into the ring buffer even when
+ * the user doesn't call the UART_TransferReceiveNonBlocking() API. If there is already data received
+ * in the ring buffer, the user can get the received data from the ring buffer directly.
+ *
+ * note When using RX ring buffer, one byte is reserved for internal use. In other
+ * words, if p ringBufferSize is 32, then only 31 bytes are used for saving data.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ * param ringBuffer Start address of ring buffer for background receiving. Pass NULL to disable the ring buffer.
+ * param ringBufferSize size of the ring buffer.
+ */
+void LPUART_TransferStartRingBuffer(LPUART_Type *base,
+    lpuart_handle_t *handle,
+    uint8_t *ringBuffer,
+    size_t ringBufferSize) {
+    assert(NULL != handle);
+    assert(NULL != ringBuffer);
+
+    /* Setup the ring buffer address */
+    handle->rxRingBuffer = ringBuffer;
+    handle->rxRingBufferSize = ringBufferSize;
+    handle->rxRingBufferHead = 0U;
+    handle->rxRingBufferTail = 0U;
+
+    /* Disable and re-enable the global interrupt to protect the interrupt enable register during read-modify-wrte. */
+    uint32_t irqMask = DisableGlobalIRQ();
+    /* Enable the interrupt to accept the data when user need the ring buffer. */
+    base->CTRL |= (uint32_t)(LPUART_CTRL_RIE_MASK | LPUART_CTRL_ORIE_MASK);
+    EnableGlobalIRQ(irqMask);
+}
+
+/*!
+ * brief Aborts the background transfer and uninstalls the ring buffer.
+ *
+ * This function aborts the background transfer and uninstalls the ring buffer.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ */
+void LPUART_TransferStopRingBuffer(LPUART_Type *base, lpuart_handle_t *handle) {
+    assert(NULL != handle);
+
+    if (handle->rxState == (uint8_t)kLPUART_RxIdle) {
+        /* Disable and re-enable the global interrupt to protect the interrupt enable register during read-modify-wrte.
+         */
+        uint32_t irqMask = DisableGlobalIRQ();
+        base->CTRL &= ~(uint32_t)(LPUART_CTRL_RIE_MASK | LPUART_CTRL_ORIE_MASK);
+        EnableGlobalIRQ(irqMask);
+    }
+
+    handle->rxRingBuffer = NULL;
+    handle->rxRingBufferSize = 0U;
+    handle->rxRingBufferHead = 0U;
+    handle->rxRingBufferTail = 0U;
+}
+
+/*!
+ * brief Transmits a buffer of data using the interrupt method.
+ *
+ * This function send data using an interrupt method. This is a non-blocking function, which
+ * returns directly without waiting for all data written to the transmitter register. When
+ * all data is written to the TX register in the ISR, the LPUART driver calls the callback
+ * function and passes the ref kStatus_LPUART_TxIdle as status parameter.
+ *
+ * note The kStatus_LPUART_TxIdle is passed to the upper layer when all data are written
+ * to the TX register. However, there is no check to ensure that all the data sent out. Before disabling the TX,
+ * check the kLPUART_TransmissionCompleteFlag to ensure that the transmit is finished.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ * param xfer LPUART transfer structure, see #lpuart_transfer_t.
+ * retval kStatus_Success Successfully start the data transmission.
+ * retval kStatus_LPUART_TxBusy Previous transmission still not finished, data not all written to the TX register.
+ * retval kStatus_InvalidArgument Invalid argument.
+ */
+status_t LPUART_TransferSendNonBlocking(LPUART_Type *base, lpuart_handle_t *handle, lpuart_transfer_t *xfer) {
+    assert(NULL != handle);
+    assert(NULL != xfer);
+    assert(NULL != xfer->txData);
+    assert(0U != xfer->dataSize);
+
+    status_t status;
+
+    /* Return error if current TX busy. */
+    if ((uint8_t)kLPUART_TxBusy == handle->txState) {
+        status = kStatus_LPUART_TxBusy;
+    } else {
+        handle->txData = xfer->txData;
+        handle->txDataSize = xfer->dataSize;
+        handle->txDataSizeAll = xfer->dataSize;
+        handle->txState = (uint8_t)kLPUART_TxBusy;
+
+        /* Disable and re-enable the global interrupt to protect the interrupt enable register during read-modify-wrte.
+         */
+        uint32_t irqMask = DisableGlobalIRQ();
+        /* Enable transmitter interrupt. */
+        base->CTRL |= (uint32_t)LPUART_CTRL_TIE_MASK;
+        EnableGlobalIRQ(irqMask);
+
+        status = kStatus_Success;
+    }
+
+    return status;
+}
+
+/*!
+ * brief Aborts the interrupt-driven data transmit.
+ *
+ * This function aborts the interrupt driven data sending. The user can get the remainBtyes to find out
+ * how many bytes are not sent out.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ */
+void LPUART_TransferAbortSend(LPUART_Type *base, lpuart_handle_t *handle) {
+    assert(NULL != handle);
+
+    /* Disable and re-enable the global interrupt to protect the interrupt enable register during read-modify-wrte. */
+    uint32_t irqMask = DisableGlobalIRQ();
+    base->CTRL &= ~(uint32_t)(LPUART_CTRL_TIE_MASK | LPUART_CTRL_TCIE_MASK);
+    EnableGlobalIRQ(irqMask);
+
+    handle->txDataSize = 0;
+    handle->txState = (uint8_t)kLPUART_TxIdle;
+}
+
+/*!
+ * brief Gets the number of bytes that have been sent out to bus.
+ *
+ * This function gets the number of bytes that have been sent out to bus by an interrupt method.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ * param count Send bytes count.
+ * retval kStatus_NoTransferInProgress No send in progress.
+ * retval kStatus_InvalidArgument Parameter is invalid.
+ * retval kStatus_Success Get successfully through the parameter \p count;
+ */
+status_t LPUART_TransferGetSendCount(LPUART_Type *base, lpuart_handle_t *handle, uint32_t *count) {
+    assert(NULL != handle);
+    assert(NULL != count);
+
+    status_t status = kStatus_Success;
+    size_t tmptxDataSize = handle->txDataSize;
+
+    if ((uint8_t)kLPUART_TxIdle == handle->txState) {
+        status = kStatus_NoTransferInProgress;
+    } else {
+        #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+        *count = handle->txDataSizeAll - tmptxDataSize -
+            ((base->WATER & LPUART_WATER_TXCOUNT_MASK) >> LPUART_WATER_TXCOUNT_SHIFT);
+        #else
+        if ((base->STAT & (uint32_t)kLPUART_TxDataRegEmptyFlag) != 0U) {
+            *count = handle->txDataSizeAll - tmptxDataSize;
+        } else {
+            *count = handle->txDataSizeAll - tmptxDataSize - 1U;
+        }
+        #endif
+    }
+
+    return status;
+}
+
+/*!
+ * brief Receives a buffer of data using the interrupt method.
+ *
+ * This function receives data using an interrupt method. This is a non-blocking function
+ * which returns without waiting to ensure that all data are received.
+ * If the RX ring buffer is used and not empty, the data in the ring buffer is copied and
+ * the parameter p receivedBytes shows how many bytes are copied from the ring buffer.
+ * After copying, if the data in the ring buffer is not enough for read, the receive
+ * request is saved by the LPUART driver. When the new data arrives, the receive request
+ * is serviced first. When all data is received, the LPUART driver notifies the upper layer
+ * through a callback function and passes a status parameter ref kStatus_UART_RxIdle.
+ * For example, the upper layer needs 10 bytes but there are only 5 bytes in ring buffer.
+ * The 5 bytes are copied to xfer->data, which returns with the
+ * parameter p receivedBytes set to 5. For the remaining 5 bytes, the newly arrived data is
+ * saved from xfer->data[5]. When 5 bytes are received, the LPUART driver notifies the upper layer.
+ * If the RX ring buffer is not enabled, this function enables the RX and RX interrupt
+ * to receive data to xfer->data. When all data is received, the upper layer is notified.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ * param xfer LPUART transfer structure, see #uart_transfer_t.
+ * param receivedBytes Bytes received from the ring buffer directly.
+ * retval kStatus_Success Successfully queue the transfer into the transmit queue.
+ * retval kStatus_LPUART_RxBusy Previous receive request is not finished.
+ * retval kStatus_InvalidArgument Invalid argument.
+ */
+status_t LPUART_TransferReceiveNonBlocking(LPUART_Type *base,
+    lpuart_handle_t *handle,
+    lpuart_transfer_t *xfer,
+    size_t *receivedBytes) {
+    assert(NULL != handle);
+    assert(NULL != xfer);
+    assert(NULL != xfer->rxData);
+    assert(0U != xfer->dataSize);
+
+    uint32_t i;
+    status_t status;
+    uint32_t irqMask;
+    /* How many bytes to copy from ring buffer to user memory. */
+    size_t bytesToCopy = 0U;
+    /* How many bytes to receive. */
+    size_t bytesToReceive;
+    /* How many bytes currently have received. */
+    size_t bytesCurrentReceived;
+
+    /* How to get data:
+       1. If RX ring buffer is not enabled, then save xfer->data and xfer->dataSize
+          to lpuart handle, enable interrupt to store received data to xfer->data. When
+          all data received, trigger callback.
+       2. If RX ring buffer is enabled and not empty, get data from ring buffer first.
+          If there are enough data in ring buffer, copy them to xfer->data and return.
+          If there are not enough data in ring buffer, copy all of them to xfer->data,
+          save the xfer->data remained empty space to lpuart handle, receive data
+          to this empty space and trigger callback when finished. */
+
+    if ((uint8_t)kLPUART_RxBusy == handle->rxState) {
+        status = kStatus_LPUART_RxBusy;
+    } else {
+        bytesToReceive = xfer->dataSize;
+        bytesCurrentReceived = 0;
+
+        /* If RX ring buffer is used. */
+        if (NULL != handle->rxRingBuffer) {
+            /* Disable and re-enable the global interrupt to protect the interrupt enable register during
+             * read-modify-wrte. */
+            irqMask = DisableGlobalIRQ();
+            /* Disable LPUART RX IRQ, protect ring buffer. */
+            base->CTRL &= ~(uint32_t)(LPUART_CTRL_RIE_MASK | LPUART_CTRL_ORIE_MASK);
+            EnableGlobalIRQ(irqMask);
+
+            /* How many bytes in RX ring buffer currently. */
+            bytesToCopy = LPUART_TransferGetRxRingBufferLength(base, handle);
+
+            if (0U != bytesToCopy) {
+                bytesToCopy = MIN(bytesToReceive, bytesToCopy);
+
+                bytesToReceive -= bytesToCopy;
+
+                /* Copy data from ring buffer to user memory. */
+                for (i = 0U; i < bytesToCopy; i++) {
+                    xfer->rxData[bytesCurrentReceived] = handle->rxRingBuffer[handle->rxRingBufferTail];
+                    bytesCurrentReceived++;
+
+                    /* Wrap to 0. Not use modulo (%) because it might be large and slow. */
+                    if (((uint32_t)handle->rxRingBufferTail + 1U) == handle->rxRingBufferSize) {
+                        handle->rxRingBufferTail = 0U;
+                    } else {
+                        handle->rxRingBufferTail++;
+                    }
+                }
+            }
+
+            /* If ring buffer does not have enough data, still need to read more data. */
+            if (0U != bytesToReceive) {
+                /* No data in ring buffer, save the request to LPUART handle. */
+                handle->rxData = &xfer->rxData[bytesCurrentReceived];
+                handle->rxDataSize = bytesToReceive;
+                handle->rxDataSizeAll = xfer->dataSize;
+                handle->rxState = (uint8_t)kLPUART_RxBusy;
+            }
+
+            /* Disable and re-enable the global interrupt to protect the interrupt enable register during
+             * read-modify-wrte. */
+            irqMask = DisableGlobalIRQ();
+            /* Re-enable LPUART RX IRQ. */
+            base->CTRL |= (uint32_t)(LPUART_CTRL_RIE_MASK | LPUART_CTRL_ORIE_MASK);
+            EnableGlobalIRQ(irqMask);
+
+            /* Call user callback since all data are received. */
+            if (0U == bytesToReceive) {
+                if (NULL != handle->callback) {
+                    handle->callback(base, handle, kStatus_LPUART_RxIdle, handle->userData);
+                }
+            }
+        }
+        /* Ring buffer not used. */
+        else {
+            handle->rxData = &xfer->rxData[bytesCurrentReceived];
+            handle->rxDataSize = bytesToReceive;
+            handle->rxDataSizeAll = bytesToReceive;
+            handle->rxState = (uint8_t)kLPUART_RxBusy;
+
+            /* Disable and re-enable the global interrupt to protect the interrupt enable register during
+             * read-modify-wrte. */
+            irqMask = DisableGlobalIRQ();
+            /* Enable RX interrupt. */
+            base->CTRL |= (uint32_t)(LPUART_CTRL_RIE_MASK | LPUART_CTRL_ILIE_MASK | LPUART_CTRL_ORIE_MASK);
+            EnableGlobalIRQ(irqMask);
+        }
+
+        /* Return the how many bytes have read. */
+        if (NULL != receivedBytes) {
+            *receivedBytes = bytesCurrentReceived;
+        }
+
+        status = kStatus_Success;
+    }
+
+    return status;
+}
+
+/*!
+ * brief Aborts the interrupt-driven data receiving.
+ *
+ * This function aborts the interrupt-driven data receiving. The user can get the remainBytes to find out
+ * how many bytes not received yet.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ */
+void LPUART_TransferAbortReceive(LPUART_Type *base, lpuart_handle_t *handle) {
+    assert(NULL != handle);
+
+    /* Only abort the receive to handle->rxData, the RX ring buffer is still working. */
+    if (NULL == handle->rxRingBuffer) {
+        /* Disable and re-enable the global interrupt to protect the interrupt enable register during read-modify-wrte.
+         */
+        uint32_t irqMask = DisableGlobalIRQ();
+        /* Disable RX interrupt. */
+        base->CTRL &= ~(uint32_t)(LPUART_CTRL_RIE_MASK | LPUART_CTRL_ILIE_MASK | LPUART_CTRL_ORIE_MASK);
+        EnableGlobalIRQ(irqMask);
+    }
+
+    handle->rxDataSize = 0U;
+    handle->rxState = (uint8_t)kLPUART_RxIdle;
+}
+
+/*!
+ * brief Gets the number of bytes that have been received.
+ *
+ * This function gets the number of bytes that have been received.
+ *
+ * param base LPUART peripheral base address.
+ * param handle LPUART handle pointer.
+ * param count Receive bytes count.
+ * retval kStatus_NoTransferInProgress No receive in progress.
+ * retval kStatus_InvalidArgument Parameter is invalid.
+ * retval kStatus_Success Get successfully through the parameter \p count;
+ */
+status_t LPUART_TransferGetReceiveCount(LPUART_Type *base, lpuart_handle_t *handle, uint32_t *count) {
+    assert(NULL != handle);
+    assert(NULL != count);
+
+    status_t status = kStatus_Success;
+    size_t tmprxDataSize = handle->rxDataSize;
+
+    if ((uint8_t)kLPUART_RxIdle == handle->rxState) {
+        status = kStatus_NoTransferInProgress;
+    } else {
+        *count = handle->rxDataSizeAll - tmprxDataSize;
+    }
+
+    return status;
+}
+
+/*!
+ * brief LPUART IRQ handle function.
+ *
+ * This function handles the LPUART transmit and receive IRQ request.
+ *
+ * param base LPUART peripheral base address.
+ * param irqHandle LPUART handle pointer.
+ */
+void LPUART_TransferHandleIRQ(LPUART_Type *base, void *irqHandle) {
+    assert(NULL != irqHandle);
+
+    uint8_t count;
+    uint8_t tempCount;
+    uint32_t status = LPUART_GetStatusFlags(base);
+    uint32_t enabledInterrupts = LPUART_GetEnabledInterrupts(base);
+    uint16_t tpmRxRingBufferHead;
+    uint32_t tpmData;
+    uint32_t irqMask;
+    lpuart_handle_t *handle = (lpuart_handle_t *)irqHandle;
+
+    /* If RX overrun. */
+    if ((uint32_t)kLPUART_RxOverrunFlag == ((uint32_t)kLPUART_RxOverrunFlag & status)) {
+        /* Clear overrun flag, otherwise the RX does not work. */
+        base->STAT = ((base->STAT & 0x3FE00000U) | LPUART_STAT_OR_MASK);
+
+        /* Trigger callback. */
+        if (NULL != (handle->callback)) {
+            handle->callback(base, handle, kStatus_LPUART_RxHardwareOverrun, handle->userData);
+        }
+    }
+    /* Receive data register full */
+    if ((0U != ((uint32_t)kLPUART_RxDataRegFullFlag & status)) &&
+        (0U != ((uint32_t)kLPUART_RxDataRegFullInterruptEnable & enabledInterrupts))) {
+        /* Get the size that can be stored into buffer for this interrupt. */
+        #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+        count = ((uint8_t)((base->WATER & LPUART_WATER_RXCOUNT_MASK) >> LPUART_WATER_RXCOUNT_SHIFT));
+        #else
+        count = 1;
+        #endif
+
+        /* If handle->rxDataSize is not 0, first save data to handle->rxData. */
+        while ((0U != handle->rxDataSize) && (0U != count)) {
+            #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+            tempCount = (uint8_t)MIN(handle->rxDataSize, count);
+            #else
+            tempCount = 1;
+            #endif
+
+            /* Using non block API to read the data from the registers. */
+            LPUART_ReadNonBlocking(base, handle->rxData, tempCount);
+            handle->rxData = &handle->rxData[tempCount];
+            handle->rxDataSize -= tempCount;
+            count -= tempCount;
+
+            /* If all the data required for upper layer is ready, trigger callback. */
+            if (0U == handle->rxDataSize) {
+                handle->rxState = (uint8_t)kLPUART_RxIdle;
+
+                if (NULL != handle->callback) {
+                    handle->callback(base, handle, kStatus_LPUART_RxIdle, handle->userData);
+                }
+            }
+        }
+
+        /* If use RX ring buffer, receive data to ring buffer. */
+        if (NULL != handle->rxRingBuffer) {
+            while (0U != count--) {
+                /* If RX ring buffer is full, trigger callback to notify over run. */
+                if (LPUART_TransferIsRxRingBufferFull(base, handle)) {
+                    if (NULL != handle->callback) {
+                        handle->callback(base, handle, kStatus_LPUART_RxRingBufferOverrun, handle->userData);
+                    }
+                }
+
+                /* If ring buffer is still full after callback function, the oldest data is overridden. */
+                if (LPUART_TransferIsRxRingBufferFull(base, handle)) {
+                    /* Increase handle->rxRingBufferTail to make room for new data. */
+                    if (((uint32_t)handle->rxRingBufferTail + 1U) == handle->rxRingBufferSize) {
+                        handle->rxRingBufferTail = 0U;
+                    } else {
+                        handle->rxRingBufferTail++;
+                    }
+                }
+
+                /* Read data. */
+                tpmRxRingBufferHead = handle->rxRingBufferHead;
+                tpmData = base->DATA;
+                #if defined(FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT) && FSL_FEATURE_LPUART_HAS_7BIT_DATA_SUPPORT
+                if (handle->isSevenDataBits) {
+                    handle->rxRingBuffer[tpmRxRingBufferHead] = (uint8_t)(tpmData & 0x7FU);
+                } else {
+                    handle->rxRingBuffer[tpmRxRingBufferHead] = (uint8_t)tpmData;
+                }
+                #else
+                handle->rxRingBuffer[tpmRxRingBufferHead] = (uint8_t)tpmData;
+                #endif
+
+                /* Increase handle->rxRingBufferHead. */
+                if (((uint32_t)handle->rxRingBufferHead + 1U) == handle->rxRingBufferSize) {
+                    handle->rxRingBufferHead = 0U;
+                } else {
+                    handle->rxRingBufferHead++;
+                }
+            }
+        }
+        /* If no receive request pending, stop RX interrupt. */
+        else if (0U == handle->rxDataSize) {
+            /* Disable and re-enable the global interrupt to protect the interrupt enable register during
+             * read-modify-wrte. */
+            irqMask = DisableGlobalIRQ();
+            base->CTRL &= ~(uint32_t)(LPUART_CTRL_RIE_MASK | LPUART_CTRL_ORIE_MASK | LPUART_CTRL_ILIE_MASK);
+            EnableGlobalIRQ(irqMask);
+        } else {
+        }
+    }
+
+    /* Send data register empty and the interrupt is enabled. */
+    if ((0U != ((uint32_t)kLPUART_TxDataRegEmptyFlag & status)) &&
+        (0U != ((uint32_t)kLPUART_TxDataRegEmptyInterruptEnable & enabledInterrupts))) {
+/* Get the bytes that available at this moment. */
+        #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+        count = (uint8_t)FSL_FEATURE_LPUART_FIFO_SIZEn(base) -
+            (uint8_t)((base->WATER & LPUART_WATER_TXCOUNT_MASK) >> LPUART_WATER_TXCOUNT_SHIFT);
+        #else
+        count = 1;
+        #endif
+
+        while ((0U != handle->txDataSize) && (0U != count)) {
+            #if defined(FSL_FEATURE_LPUART_HAS_FIFO) && FSL_FEATURE_LPUART_HAS_FIFO
+            tempCount = (uint8_t)MIN(handle->txDataSize, count);
+            #else
+            tempCount = 1;
+            #endif
+
+            /* Using non block API to write the data to the registers. */
+            LPUART_WriteNonBlocking(base, handle->txData, tempCount);
+            handle->txData = &handle->txData[tempCount];
+            handle->txDataSize -= tempCount;
+            count -= tempCount;
+
+            /* If all the data are written to data register, notify user with the callback, then TX finished. */
+            if (0U == handle->txDataSize) {
+                /* Disable and re-enable the global interrupt to protect the interrupt enable register during
+                 * read-modify-wrte. */
+                irqMask = DisableGlobalIRQ();
+                /* Disable TX register empty interrupt and enable transmission completion interrupt. */
+                base->CTRL = (base->CTRL & ~LPUART_CTRL_TIE_MASK) | LPUART_CTRL_TCIE_MASK;
+                EnableGlobalIRQ(irqMask);
+            }
+        }
+    }
+
+    /* Transmission complete and the interrupt is enabled. */
+    if ((0U != ((uint32_t)kLPUART_TransmissionCompleteFlag & status)) &&
+        (0U != ((uint32_t)kLPUART_TransmissionCompleteInterruptEnable & enabledInterrupts))) {
+        /* Set txState to idle only when all data has been sent out to bus. */
+        handle->txState = (uint8_t)kLPUART_TxIdle;
+
+        /* Disable and re-enable the global interrupt to protect the interrupt enable register during read-modify-wrte.
+         */
+        irqMask = DisableGlobalIRQ();
+        /* Disable transmission complete interrupt. */
+        base->CTRL &= ~(uint32_t)LPUART_CTRL_TCIE_MASK;
+        EnableGlobalIRQ(irqMask);
+
+        /* Trigger callback. */
+        if (NULL != handle->callback) {
+            handle->callback(base, handle, kStatus_LPUART_TxIdle, handle->userData);
+        }
+    }
+
+    /* If IDLE flag is set and the IDLE interrupt is enabled. */
+    if ((0U != ((uint32_t)kLPUART_IdleLineFlag & status)) &&
+        (0U != ((uint32_t)kLPUART_IdleLineInterruptEnable & enabledInterrupts))) {
+        /* Clear IDLE flag.*/
+        base->STAT |= LPUART_STAT_IDLE_MASK;
+        if (NULL != handle->callback) {
+            handle->callback(base, handle, kStatus_LPUART_IdleLineDetected, handle->userData);
+        } else {
+            /* Avoid MISRA 15.7 */
+        }
+    }
+
+}
+
+/*!
+ * brief LPUART Error IRQ handle function.
+ *
+ * This function handles the LPUART error IRQ request.
+ *
+ * param base LPUART peripheral base address.
+ * param irqHandle LPUART handle pointer.
+ */
+void LPUART_TransferHandleErrorIRQ(LPUART_Type *base, void *irqHandle) {
+    /* To be implemented by User. */
+}
+#if defined(FSL_FEATURE_LPUART_HAS_SHARED_IRQ0_IRQ1) && FSL_FEATURE_LPUART_HAS_SHARED_IRQ0_IRQ1
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART0_LPUART1_RX_DriverIRQHandler(void);
+void LPUART0_LPUART1_RX_DriverIRQHandler(void) {
+    /* If handle is registered, treat the transfer function is enabled. */
+    if (NULL != s_lpuartHandle[0]) {
+        s_lpuartIsr(LPUART0, s_lpuartHandle[0]);
+    }
+    if (NULL != s_lpuartHandle[1]) {
+        s_lpuartIsr(LPUART1, s_lpuartHandle[1]);
+    }
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART0_LPUART1_TX_DriverIRQHandler(void);
+void LPUART0_LPUART1_TX_DriverIRQHandler(void) {
+    /* If handle is registered, treat the transfer function is enabled. */
+    if (NULL != s_lpuartHandle[0]) {
+        s_lpuartIsr(LPUART0, s_lpuartHandle[0]);
+    }
+    if (NULL != s_lpuartHandle[1]) {
+        s_lpuartIsr(LPUART1, s_lpuartHandle[1]);
+    }
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART0_LPUART1_DriverIRQHandler(void);
+void LPUART0_LPUART1_DriverIRQHandler(void) {
+    /* If handle is registered, treat the transfer function is enabled. */
+    if (NULL != s_lpuartHandle[0]) {
+        s_lpuartIsr(LPUART0, s_lpuartHandle[0]);
+    }
+    if (NULL != s_lpuartHandle[1]) {
+        s_lpuartIsr(LPUART1, s_lpuartHandle[1]);
+    }
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART0)
+#if !(defined(FSL_FEATURE_LPUART_HAS_SHARED_IRQ0_IRQ1) && FSL_FEATURE_LPUART_HAS_SHARED_IRQ0_IRQ1)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART0_TX_DriverIRQHandler(void);
+void LPUART0_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART0, s_lpuartHandle[0]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART0_RX_DriverIRQHandler(void);
+void LPUART0_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART0, s_lpuartHandle[0]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART0_DriverIRQHandler(void);
+void LPUART0_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART0, s_lpuartHandle[0]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+#endif
+
+#if defined(LPUART1)
+#if !(defined(FSL_FEATURE_LPUART_HAS_SHARED_IRQ0_IRQ1) && FSL_FEATURE_LPUART_HAS_SHARED_IRQ0_IRQ1)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART1_TX_DriverIRQHandler(void);
+void LPUART1_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART1, s_lpuartHandle[1]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART1_RX_DriverIRQHandler(void);
+void LPUART1_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART1, s_lpuartHandle[1]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART1_DriverIRQHandler(void);
+void LPUART1_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART1, s_lpuartHandle[1]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+#endif
+
+#if defined(LPUART2)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART2_TX_DriverIRQHandler(void);
+void LPUART2_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART2, s_lpuartHandle[2]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART2_RX_DriverIRQHandler(void);
+void LPUART2_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART2, s_lpuartHandle[2]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART2_DriverIRQHandler(void);
+void LPUART2_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART2, s_lpuartHandle[2]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART3)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART3_TX_DriverIRQHandler(void);
+void LPUART3_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART3, s_lpuartHandle[3]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART3_RX_DriverIRQHandler(void);
+void LPUART3_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART3, s_lpuartHandle[3]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART3_DriverIRQHandler(void);
+void LPUART3_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART3, s_lpuartHandle[3]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART4)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART4_TX_DriverIRQHandler(void);
+void LPUART4_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART4, s_lpuartHandle[4]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART4_RX_DriverIRQHandler(void);
+void LPUART4_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART4, s_lpuartHandle[4]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART4_DriverIRQHandler(void);
+void LPUART4_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART4, s_lpuartHandle[4]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART5)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART5_TX_DriverIRQHandler(void);
+void LPUART5_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART5, s_lpuartHandle[5]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART5_RX_DriverIRQHandler(void);
+void LPUART5_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART5, s_lpuartHandle[5]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART5_DriverIRQHandler(void);
+void LPUART5_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART5, s_lpuartHandle[5]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART6)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART6_TX_DriverIRQHandler(void);
+void LPUART6_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART6, s_lpuartHandle[6]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART6_RX_DriverIRQHandler(void);
+void LPUART6_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART6, s_lpuartHandle[6]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART6_DriverIRQHandler(void);
+void LPUART6_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART6, s_lpuartHandle[6]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART7)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART7_TX_DriverIRQHandler(void);
+void LPUART7_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART7, s_lpuartHandle[7]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART7_RX_DriverIRQHandler(void);
+void LPUART7_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART7, s_lpuartHandle[7]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART7_DriverIRQHandler(void);
+void LPUART7_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART7, s_lpuartHandle[7]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART8)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART8_TX_DriverIRQHandler(void);
+void LPUART8_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART8, s_lpuartHandle[8]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART8_RX_DriverIRQHandler(void);
+void LPUART8_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART8, s_lpuartHandle[8]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART8_DriverIRQHandler(void);
+void LPUART8_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART8, s_lpuartHandle[8]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART9)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART9_TX_DriverIRQHandler(void);
+void LPUART9_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART9, s_lpuartHandle[9]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART9_RX_DriverIRQHandler(void);
+void LPUART9_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART9, s_lpuartHandle[9]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART9_DriverIRQHandler(void);
+void LPUART9_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART9, s_lpuartHandle[9]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART10)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART10_TX_DriverIRQHandler(void);
+void LPUART10_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART10, s_lpuartHandle[10]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART10_RX_DriverIRQHandler(void);
+void LPUART10_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART10, s_lpuartHandle[10]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART10_DriverIRQHandler(void);
+void LPUART10_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART10, s_lpuartHandle[10]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(LPUART11)
+#if defined(FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ) && FSL_FEATURE_LPUART_HAS_SEPARATE_RX_TX_IRQ
+void LPUART11_TX_DriverIRQHandler(void);
+void LPUART11_TX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART11, s_lpuartHandle[11]);
+    SDK_ISR_EXIT_BARRIER;
+}
+void LPUART11_RX_DriverIRQHandler(void);
+void LPUART11_RX_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART11, s_lpuartHandle[11]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#else
+void LPUART11_DriverIRQHandler(void);
+void LPUART11_DriverIRQHandler(void) {
+    s_lpuartIsr(LPUART11, s_lpuartHandle[11]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+#endif
+
+#if defined(CM4_0__LPUART)
+void M4_0_LPUART_DriverIRQHandler(void);
+void M4_0_LPUART_DriverIRQHandler(void) {
+    s_lpuartIsr(CM4_0__LPUART, s_lpuartHandle[LPUART_GetInstance(CM4_0__LPUART)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(CM4_1__LPUART)
+void M4_1_LPUART_DriverIRQHandler(void);
+void M4_1_LPUART_DriverIRQHandler(void) {
+    s_lpuartIsr(CM4_1__LPUART, s_lpuartHandle[LPUART_GetInstance(CM4_1__LPUART)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(CM4__LPUART)
+void M4_LPUART_DriverIRQHandler(void);
+void M4_LPUART_DriverIRQHandler(void) {
+    s_lpuartIsr(CM4__LPUART, s_lpuartHandle[LPUART_GetInstance(CM4__LPUART)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(DMA__LPUART0)
+void DMA_UART0_INT_DriverIRQHandler(void);
+void DMA_UART0_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(DMA__LPUART0, s_lpuartHandle[LPUART_GetInstance(DMA__LPUART0)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(DMA__LPUART1)
+void DMA_UART1_INT_DriverIRQHandler(void);
+void DMA_UART1_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(DMA__LPUART1, s_lpuartHandle[LPUART_GetInstance(DMA__LPUART1)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(DMA__LPUART2)
+void DMA_UART2_INT_DriverIRQHandler(void);
+void DMA_UART2_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(DMA__LPUART2, s_lpuartHandle[LPUART_GetInstance(DMA__LPUART2)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(DMA__LPUART3)
+void DMA_UART3_INT_DriverIRQHandler(void);
+void DMA_UART3_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(DMA__LPUART3, s_lpuartHandle[LPUART_GetInstance(DMA__LPUART3)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(DMA__LPUART4)
+void DMA_UART4_INT_DriverIRQHandler(void);
+void DMA_UART4_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(DMA__LPUART4, s_lpuartHandle[LPUART_GetInstance(DMA__LPUART4)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(ADMA__LPUART0)
+void ADMA_UART0_INT_DriverIRQHandler(void);
+void ADMA_UART0_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(ADMA__LPUART0, s_lpuartHandle[LPUART_GetInstance(ADMA__LPUART0)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(ADMA__LPUART1)
+void ADMA_UART1_INT_DriverIRQHandler(void);
+void ADMA_UART1_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(ADMA__LPUART1, s_lpuartHandle[LPUART_GetInstance(ADMA__LPUART1)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(ADMA__LPUART2)
+void ADMA_UART2_INT_DriverIRQHandler(void);
+void ADMA_UART2_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(ADMA__LPUART2, s_lpuartHandle[LPUART_GetInstance(ADMA__LPUART2)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
+
+#if defined(ADMA__LPUART3)
+void ADMA_UART3_INT_DriverIRQHandler(void);
+void ADMA_UART3_INT_DriverIRQHandler(void) {
+    s_lpuartIsr(ADMA__LPUART3, s_lpuartHandle[LPUART_GetInstance(ADMA__LPUART3)]);
+    SDK_ISR_EXIT_BARRIER;
+}
+#endif
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 7ae584fdd7454..9f9d6c8fd256f 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -50,6 +50,10 @@
 #define UART_INVERT_RX (2)
 #define UART_INVERT_MASK (UART_INVERT_TX | UART_INVERT_RX)
 
+#define UART_IRQ_RXIDLE  (1)
+#define UART_IRQ_TXIDLE  (2)
+#define MP_UART_ALLOWED_FLAGS (UART_IRQ_RXIDLE | UART_IRQ_TXIDLE)
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     struct _lpuart_handle handle;
@@ -63,6 +67,9 @@ typedef struct _machine_uart_obj_t {
     uint8_t *txbuf;
     uint16_t txbuf_len;
     bool new;
+    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
 } machine_uart_obj_t;
 
 typedef struct _iomux_table_t {
@@ -137,11 +144,21 @@ bool lpuart_set_iomux_cts(int8_t uart) {
 
 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) {
+
+    uint16_t mp_irq_flags = 0;
+    if (status == kStatus_LPUART_TxIdle) {
         self->tx_status = kStatus_LPUART_TxIdle;
+        mp_irq_flags = UART_IRQ_TXIDLE;
+    } else if (status == kStatus_LPUART_IdleLineDetected) {
+        mp_irq_flags = UART_IRQ_RXIDLE;
+    }
+    // Check the flags to see if the user handler should be called
+    if (self->mp_irq_trigger & mp_irq_flags) {
+        self->mp_irq_flags = mp_irq_flags;
+        mp_irq_handler(self->mp_irq_obj);
     }
 
-    if (kStatus_LPUART_RxRingBufferOverrun == status) {
+    if (status == kStatus_LPUART_RxRingBufferOverrun) {
         ; // Ringbuffer full, deassert RTS if flow control is enabled
     }
 }
@@ -170,16 +187,18 @@ void machine_uart_set_baudrate(mp_obj_t uart_in, uint32_t baudrate) {
     { 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) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_IRQ_RXIDLE) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_TXIDLE), MP_ROM_INT(UART_IRQ_TXIDLE) }, \
 
 static void mp_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, flow=%s, "
-        "rxbuf=%d, txbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
+        "rxbuf=%d, txbuf=%d, timeout=%u, timeout_char=%u, invert=%s, irq=%d)",
         self->id, self->config.baudRate_Bps, 8 - self->config.dataBitsCount,
         _parity_name[self->config.parityMode], self->config.stopBitCount + 1,
         _flow_name[(self->config.enableTxCTS << 1) | self->config.enableRxRTS],
         self->handle.rxRingBufferSize, self->txbuf_len, self->timeout, self->timeout_char,
-        _invert_name[self->invert]);
+        _invert_name[self->invert], self->mp_irq_trigger);
 }
 
 static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -313,12 +332,17 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         #else
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
         #endif
+        self->config.rxIdleType = kLPUART_IdleTypeStartBit;
+        self->config.rxIdleConfig = kLPUART_IdleCharacter4;
+        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);
         self->txbuf = m_new(uint8_t, txbuf_len); // Allocate the TX buffer.
         self->txbuf_len = txbuf_len;
 
+        LPUART_EnableInterrupts(self->lpuart, kLPUART_IdleLineInterruptEnable);
+
         // 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) {
@@ -356,6 +380,8 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->timeout = 1;
     self->timeout_char = 1;
     self->new = true;
+    self->mp_irq_obj = NULL;
+
     LPUART_GetDefaultConfig(&self->config);
 
     // Configure board-specific pin MUX based on the hardware device number.
@@ -401,6 +427,55 @@ void machine_uart_deinit_all(void) {
     }
 }
 
+static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->mp_irq_trigger = new_trigger;
+    return 0;
+}
+
+static mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    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) {
+        return self->mp_irq_trigger;
+    }
+    return 0;
+}
+
+static const mp_irq_methods_t uart_irq_methods = {
+    .trigger = uart_irq_trigger,
+    .info = uart_irq_info,
+};
+
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+    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 (any_args) {
+        // 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%04x unsupported"), not_supported);
+        }
+
+        self->mp_irq_obj->handler = handler;
+        self->mp_irq_obj->ishard = args[MP_IRQ_ARG_INIT_hard].u_bool;
+        self->mp_irq_trigger = trigger;
+    }
+
+    return self->mp_irq_obj;
+}
+
 static mp_uint_t mp_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;
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index ac918ba4da8d5..5ef6695c1425c 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -114,6 +114,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_UART             (1)
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/mimxrt/machine_uart.c"
 #define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
+#define MICROPY_PY_MACHINE_UART_IRQ         (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 
 // fatfs configuration used in ffconf.h

From 324c6753479b003d00a6c78a39cb078e73165f30 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 6 Mar 2024 21:05:13 +0100
Subject: [PATCH 1358/3129] renesas-ra/machine_uart: Add the UART.IRQ_RX class
 constant.

The renesas-ra port supports calling a handler to be called on every byte
received by UART.  For consistency with other ports, the symbol IRQ_RX
is added as the trigger name.

Side change: Add the received UART data to the REPL input buffer only if it
is the REPL UART.  Otherwise, every UART would act as REPL input.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/renesas-ra/machine_uart.c |  1 +
 ports/renesas-ra/uart.c         | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 26ed625404374..4a659d107af39 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -41,6 +41,7 @@
 #define MICROPY_PY_MACHINE_UART_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) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(0x10) }, \
 
 static const char *_parity_name[] = {"None", "ODD", "EVEN"};
 
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index 30707552b3efb..83b3394f7b453 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -71,14 +71,18 @@ static void uart_rx_cb(uint32_t ch, int d) {
         // even disable the IRQ.  This should never happen.
         return;
     }
-    #if MICROPY_KBD_EXCEPTION
-    if (keyex_cb[ch]) {
-        (*keyex_cb[ch])(d);
-    }
-    #endif
+    #if defined(MICROPY_HW_UART_REPL)
+    if (ch == MICROPY_HW_UART_REPL) {
+        #if MICROPY_KBD_EXCEPTION
+        if (keyex_cb[ch]) {
+            (*keyex_cb[ch])(d);
+        }
+        #endif
 
-    #if MICROPY_HW_ENABLE_UART_REPL
-    ringbuf_put(&stdin_ringbuf, d);
+        #if MICROPY_HW_ENABLE_UART_REPL
+        ringbuf_put(&stdin_ringbuf, d);
+        #endif
+    }
     #endif
 
     // Check the flags to see if the user handler should be called

From 1027b5f0835d8fba9ccc290f0333c86f7299620a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 9 Mar 2024 18:24:20 +0100
Subject: [PATCH 1359/3129] cc3200/mods/pybuart: Add the UART.IRQ_RX class
 constant.

As alternative to RX_ANY to match the names used by the other ports.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/cc3200/mods/pybuart.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 6ab2371ba708f..eb2b3754f7473 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -590,6 +590,7 @@ static const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_RX_ANY),      MP_ROM_INT(UART_TRIGGER_RX_ANY) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX),      MP_ROM_INT(UART_TRIGGER_RX_ANY) },
 };
 
 static MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, pyb_uart_locals_dict_table);

From a04a14163b79753c4c5ee16d80468ce475fd8b23 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 10 Mar 2024 15:14:20 +0100
Subject: [PATCH 1360/3129] esp32/machine_uart: Implement Python UART IRQ with
 IRQ_RX and IRQ_BREAK.

Supported trigger events: IRQ_RX and IRQ_BREAK.  Hard IRQ is not supported.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/esp32_common.cmake |   1 +
 ports/esp32/machine_uart.c     | 108 ++++++++++++++++++++++++++++++++-
 ports/esp32/mpconfigport.h     |   1 +
 3 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index e928fb439da5e..7c5089639a5f2 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -32,6 +32,7 @@ list(APPEND MICROPY_SOURCE_SHARED
     ${MICROPY_DIR}/shared/netutils/netutils.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
     ${MICROPY_DIR}/shared/runtime/interrupt_char.c
+    ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${MICROPY_DIR}/shared/runtime/pyexec.c
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 50c9a19bef1bb..1a02594132c0c 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -29,6 +29,10 @@
 
 #include "driver/uart.h"
 #include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/queue.h"
+#include "esp_task.h"
+#include "shared/runtime/mpirq.h"
 
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -49,6 +53,9 @@
 #define UART_INV_CTS UART_SIGNAL_CTS_INV
 
 #define UART_INV_MASK (UART_INV_TX | UART_INV_RX | UART_INV_RTS | UART_INV_CTS)
+#define UART_IRQ_RX (1 << UART_DATA)
+#define UART_IRQ_BREAK (1 << UART_BREAK)
+#define MP_UART_ALLOWED_FLAGS (UART_IRQ_RX | UART_IRQ_BREAK)
 
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
@@ -66,6 +73,11 @@ 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)
     uint32_t invert;        // lines to invert
+    TaskHandle_t uart_event_task;
+    QueueHandle_t uart_queue;
+    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
 } machine_uart_obj_t;
 
 static const char *_parity_name[] = {"None", "1", "0"};
@@ -80,14 +92,43 @@ static const char *_parity_name[] = {"None", "1", "0"};
     { 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) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(UART_IRQ_RX) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_BREAK), MP_ROM_INT(UART_IRQ_BREAK) }, \
+
+static void uart_event_task(void *self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uart_event_t event;
+    for (;;) {
+        // Waiting for an UART event.
+        if (xQueueReceive(self->uart_queue, (void *)&event, (TickType_t)portMAX_DELAY)) {
+            self->mp_irq_flags = 0;
+            switch (event.type) {
+                // Event of UART receiving data
+                case UART_DATA:
+                    self->mp_irq_flags |= UART_IRQ_RX;
+                    break;
+                case UART_BREAK:
+                    self->mp_irq_flags |= UART_IRQ_BREAK;
+                    break;
+                default:
+                    break;
+            }
+            // Check the flags to see if the user handler should be called
+            if (self->mp_irq_trigger & self->mp_irq_flags) {
+                mp_irq_handler(self->mp_irq_obj);
+                mp_hal_wake_main_task_from_isr();
+            }
+        }
+    }
+}
 
 static void mp_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);
     uint32_t baudrate;
     check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
-    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, rts=%d, cts=%d, txbuf=%u, rxbuf=%u, timeout=%u, timeout_char=%u",
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, rts=%d, cts=%d, txbuf=%u, rxbuf=%u, timeout=%u, timeout_char=%u, irq=%d",
         self->uart_num, baudrate, self->bits, _parity_name[self->parity],
-        self->stop, self->tx, self->rx, self->rts, self->cts, self->txbuf, self->rxbuf, self->timeout, self->timeout_char);
+        self->stop, self->tx, self->rx, self->rts, self->cts, self->txbuf, self->rxbuf, self->timeout, self->timeout_char, self->mp_irq_trigger);
     if (self->invert) {
         mp_printf(print, ", invert=");
         uint32_t invert_mask = self->invert;
@@ -348,6 +389,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->timeout_char = 0;
     self->invert = 0;
     self->flowcontrol = 0;
+    self->uart_event_task = 0;
 
     switch (uart_num) {
         case UART_NUM_0:
@@ -378,7 +420,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
         // Setup
         check_esp_err(uart_param_config(self->uart_num, &uartcfg));
 
-        check_esp_err(uart_driver_install(uart_num, self->rxbuf, self->txbuf, 0, NULL, 0));
+        check_esp_err(uart_driver_install(uart_num, self->rxbuf, self->txbuf, 3, &self->uart_queue, 0));
     }
 
     mp_map_t kw_args;
@@ -422,6 +464,66 @@ static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     check_esp_err(uart_set_baudrate(self->uart_num, baudrate));
 }
 
+static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->mp_irq_trigger = new_trigger;
+    return 0;
+}
+
+static mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    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) {
+        return self->mp_irq_trigger;
+    }
+    return 0;
+}
+
+static const mp_irq_methods_t uart_irq_methods = {
+    .trigger = uart_irq_trigger,
+    .info = uart_irq_info,
+};
+
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+    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 (any_args) {
+        // 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%04x unsupported"), not_supported);
+        }
+
+        self->mp_irq_obj->handler = handler;
+        if (args[MP_IRQ_ARG_INIT_hard].u_bool) {
+            mp_raise_ValueError(MP_ERROR_TEXT("hard IRQ is not supported"));
+        }
+        self->mp_irq_obj->ishard = false;
+        self->mp_irq_trigger = trigger;
+        // Start a task for handling events
+        if (handler != mp_const_none && self->uart_event_task == NULL) {
+            xTaskCreatePinnedToCore(uart_event_task, "uart_event_task", 2048, self,
+                ESP_TASKD_EVENT_PRIO, (TaskHandle_t *)&self->uart_event_task, MP_TASK_COREID);
+        } else if (handler == mp_const_none && self->uart_event_task != NULL) {
+            vTaskDelete(self->uart_event_task);
+            self->uart_event_task = NULL;
+        }
+    }
+
+    return self->mp_irq_obj;
+}
+
 static mp_uint_t mp_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);
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5051afb799ead..a5c6b9c014492 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -155,6 +155,7 @@
 #define MICROPY_PY_MACHINE_UART             (1)
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/esp32/machine_uart.c"
 #define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
+#define MICROPY_PY_MACHINE_UART_IRQ         (1)
 #define MICROPY_PY_MACHINE_WDT              (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/esp32/machine_wdt.c"
 #define MICROPY_PY_NETWORK (1)

From 4da5de94bbfa675fb59917827942074307694bde Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 21 Aug 2024 17:35:25 +0200
Subject: [PATCH 1361/3129] nrf/modules/machine/uart: Allow changing the UART
 baud rate w/o reset.

This commit fixes a bug in the existing driver, that the UART baud rate
could not be changed without reset or power cycle.  It adds as well
functionality to UART.deinit().

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/nrf/modules/machine/uart.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 90a67bcbc08ad..b4fa0aff1c969 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -62,6 +62,7 @@ typedef struct _machine_uart_buf_t {
 #define nrfx_uart_tx              nrfx_uarte_tx
 #define nrfx_uart_tx_in_progress  nrfx_uarte_tx_in_progress
 #define nrfx_uart_init            nrfx_uarte_init
+#define nrfx_uart_uninit          nrfx_uarte_uninit
 #define nrfx_uart_event_t         nrfx_uarte_event_t
 #define NRFX_UART_INSTANCE        NRFX_UARTE_INSTANCE
 
@@ -255,7 +256,11 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->buf.rx_ringbuf.iput = 0;
 
     // Enable event callback and start asynchronous receive
+    if (self->initialized) {
+        nrfx_uart_uninit(self->p_uart);
+    }
     nrfx_uart_init(self->p_uart, &config, uart_event_handler);
+    self->initialized = true;
     nrfx_uart_rx(self->p_uart, &self->buf.rx_buf[0], 1);
 
     #if NRFX_UART_ENABLED
@@ -266,7 +271,10 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
-    (void)self;
+    if (self->initialized) {
+        nrfx_uart_uninit(self->p_uart);
+    }
+    self->initialized = false;
 }
 
 // Write a single character on the bus.  `data` is an integer to write.

From bae809070e0d62cda1b04e97652cf80d513fe86f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 11 Mar 2024 16:27:36 +0100
Subject: [PATCH 1362/3129] nrf/modules/machine/uart: Implement Python UART IRQ
 for nrf52840 boards.

Supported triggers: UART.IRQ_RX and UART.IRQ_TXIDLE.  It will probably work
on other boards as well, but so far untested.

The irq.flags() value is changed only when requested by a triggered event.
Do not change it otherwise.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/nrf/Makefile               |   1 +
 ports/nrf/modules/machine/uart.c | 103 ++++++++++++++++++++++++++++++-
 ports/nrf/mpconfigport.h         |   4 ++
 3 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index c4150c292cb7c..59e74dce4215a 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -191,6 +191,7 @@ endif
 SRC_SHARED_C += $(addprefix shared/,\
 	libc/string0.c \
 	readline/readline.c \
+	runtime/mpirq.c \
 	runtime/pyexec.c \
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index b4fa0aff1c969..8d5a73e095f5e 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -70,6 +70,7 @@ typedef struct _machine_uart_buf_t {
 #define NRF_UART_HWFC_DISABLED    NRF_UARTE_HWFC_DISABLED
 #define NRF_UART_PARITY_EXCLUDED  NRF_UARTE_PARITY_EXCLUDED
 #define NRFX_UART_EVT_RX_DONE     NRFX_UARTE_EVT_RX_DONE
+#define NRFX_UART_EVT_TX_DONE     NRFX_UARTE_EVT_TX_DONE
 #define NRFX_UART_EVT_ERROR       NRFX_UARTE_EVT_ERROR
 
 #define NRF_UART_BAUDRATE_1200    NRF_UARTE_BAUDRATE_1200
@@ -89,18 +90,31 @@ typedef struct _machine_uart_buf_t {
 
 #endif
 
+#if MICROPY_PY_MACHINE_UART_IRQ
+#define NRFX_UART_IRQ_RX (1 << NRFX_UART_EVT_RX_DONE)
+#define NRFX_UART_IRQ_TXIDLE (1 << NRFX_UART_EVT_TX_DONE)
+#define MP_UART_ALLOWED_FLAGS (NRFX_UART_IRQ_RX | NRFX_UART_IRQ_TXIDLE)
+#endif
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     const nrfx_uart_t *p_uart;       // Driver instance
     machine_uart_buf_t buf;
     uint16_t timeout;       // timeout waiting for first char (in ms)
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
+    uint8_t uart_id;
+    bool initialized;       // static flag. Initialized to False
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    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
+    #endif
 } machine_uart_obj_t;
 
 static const nrfx_uart_t instance0 = NRFX_UART_INSTANCE(0);
 
 static machine_uart_obj_t machine_uart_obj[] = {
-    {{&machine_uart_type}, .p_uart = &instance0}
+    {{&machine_uart_type}, .p_uart = &instance0, .uart_id = 0}
 };
 
 void uart_init0(void) {
@@ -117,6 +131,9 @@ static int uart_find(mp_obj_t id) {
 
 static void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context) {
     machine_uart_obj_t *self = p_context;
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    uint16_t mp_irq_flags = 0;
+    #endif
     if (p_event->type == NRFX_UART_EVT_RX_DONE) {
         nrfx_uart_rx(self->p_uart, &self->buf.rx_buf[0], 1);
         int chr = self->buf.rx_buf[0];
@@ -130,10 +147,24 @@ static void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context
         {
             ringbuf_put((ringbuf_t *)&self->buf.rx_ringbuf, chr);
         }
+        #if MICROPY_PY_MACHINE_UART_IRQ
+        mp_irq_flags |= NRFX_UART_IRQ_RX;
+        #endif
     } else if (p_event->type == NRFX_UART_EVT_ERROR) {
         // Perform a read to unlock UART in case of an error
         nrfx_uart_rx(self->p_uart, &self->buf.rx_buf[0], 1);
+    } else if (p_event->type == NRFX_UART_EVT_TX_DONE) {
+        #if MICROPY_PY_MACHINE_UART_IRQ
+        mp_irq_flags |= NRFX_UART_IRQ_TXIDLE;
+        #endif
+    }
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    // Check the flags to see if the user handler should be called
+    if (self->mp_irq_trigger & mp_irq_flags) {
+        self->mp_irq_flags = mp_irq_flags;
+        mp_irq_handler(self->mp_irq_obj);
     }
+    #endif
 }
 
 bool uart_rx_any(machine_uart_obj_t *self) {
@@ -171,8 +202,14 @@ void uart_tx_strn_cooked(machine_uart_obj_t *uart_obj, const char *str, uint len
 /******************************************************************************/
 /* MicroPython bindings                                                      */
 
-// The UART class doesn't have any constants for this port.
+#if MICROPY_PY_MACHINE_UART_IRQ
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(NRFX_UART_IRQ_RX) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_TXIDLE), MP_ROM_INT(NRFX_UART_IRQ_TXIDLE) }, \
+
+#else
 #define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
+#endif
 
 static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_printf(print, "UART(0)");
@@ -255,6 +292,12 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->buf.rx_ringbuf.iget = 0;
     self->buf.rx_ringbuf.iput = 0;
 
+    #if MICROPY_PY_MACHINE_UART_IRQ
+    self->mp_irq_trigger = 0;
+    self->mp_irq_obj = NULL;
+    MP_STATE_PORT(nrf_uart_irq_obj)[self->uart_id] = NULL;
+    #endif
+
     // Enable event callback and start asynchronous receive
     if (self->initialized) {
         nrfx_uart_uninit(self->p_uart);
@@ -301,6 +344,60 @@ static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
     return !nrfx_uart_tx_in_progress(self->p_uart);
 }
 
+#if MICROPY_PY_MACHINE_UART_IRQ
+
+static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->mp_irq_trigger = new_trigger;
+    return 0;
+}
+
+static mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    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) {
+        return self->mp_irq_trigger;
+    }
+    return 0;
+}
+
+static const mp_irq_methods_t uart_irq_methods = {
+    .trigger = uart_irq_trigger,
+    .info = uart_irq_info,
+};
+
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+    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));
+        MP_STATE_PORT(nrf_uart_irq_obj)[self->uart_id] = self->mp_irq_obj;
+    }
+
+    if (any_args) {
+        // 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%04x unsupported"), not_supported);
+        }
+
+        self->mp_irq_obj->handler = handler;
+        self->mp_irq_obj->ishard = args[MP_IRQ_ARG_INIT_hard].u_bool;
+        self->mp_irq_trigger = trigger;
+    }
+
+    return self->mp_irq_obj;
+}
+
+#endif
+
 static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
     machine_uart_obj_t *self = self_in;
     byte *buf = buf_in;
@@ -383,3 +480,5 @@ static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
     }
     return MP_STREAM_ERROR;
 }
+
+MP_REGISTER_ROOT_POINTER(void *nrf_uart_irq_obj[1]);
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 1c789f779b8e7..7cc8a66d9840c 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -230,6 +230,10 @@
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/nrf/modules/machine/uart.c"
 #define MICROPY_PY_MACHINE_UART_READCHAR_WRITECHAR (1)
 
+#if defined(NRF52840)
+#define MICROPY_PY_MACHINE_UART_IRQ  (1)
+#endif
+
 #ifndef MICROPY_PY_MACHINE_TIMER_NRF
 #define MICROPY_PY_MACHINE_TIMER_NRF (1)
 #endif

From a86619fb6ffb4c860f4c1cc25643f13c6db92467 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 13 Mar 2024 09:17:50 +0100
Subject: [PATCH 1363/3129] stm32/machine_uart: Add the UART.IRQ_RX event for
 UART.irq().

Just adding the event symbol.  No code change required, and no impact on
code execution time when the event is not selected.

Tested with STM32F4xx, STM32F7xx and STM32H7xx.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/stm32/machine_uart.c | 1 +
 ports/stm32/uart.h         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 0f139ae83272f..277ae67ef2c54 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -41,6 +41,7 @@
     { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(UART_HWCONTROL_RTS) }, \
     { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_FLAG_IDLE) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(UART_FLAG_RXNE) }, \
 
 static void mp_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);
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 956cbb044f6c0..de4b70cdea738 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -52,7 +52,7 @@ typedef enum {
 #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
+#define MP_UART_ALLOWED_FLAGS (UART_FLAG_IDLE | UART_FLAG_RXNE)
 
 // OR-ed IRQ flags which should not be touched by the user
 #define MP_UART_RESERVED_FLAGS UART_FLAG_RXNE

From ef69d0f2d3a795666c2bf8c7e202604fc5cd5342 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 27 Jun 2024 19:37:54 +0200
Subject: [PATCH 1364/3129] samd/machine_uart: Implement UART.IRQ_RXIDLE based
 on the softtimer.

With the softtimer the minimal delay between the end of a message and the
trigger is 2 ms.  For baud rates <= 9600 baud it's three character times.
Tested with baud rates up tp 115200 baud.  The timer used for RXIDLE is
running only during UART receive, saving execution cycles when the timer is
not needed.

The irq.flags() value is changed only with an expected event.  Do not
change it otherwise.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_uart.c | 89 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 82 insertions(+), 7 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index aa781a17073ae..b0dc4c5768d13 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -32,6 +32,7 @@
 #include "py/ringbuf.h"
 #include "samd_soc.h"
 #include "pin_af.h"
+#include "shared/runtime/softtimer.h"
 
 #define DEFAULT_UART_BAUDRATE (115200)
 #define DEFAULT_BUFFER_SIZE (256)
@@ -40,17 +41,31 @@
 #define FLOW_CONTROL_RTS (1)
 #define FLOW_CONTROL_CTS (2)
 
-#define MP_UART_ALLOWED_FLAGS (SERCOM_USART_INTFLAG_RXC | SERCOM_USART_INTFLAG_TXC)
-
 #if MICROPY_PY_MACHINE_UART_IRQ
+#define UART_IRQ_RXIDLE (4096)
+#define RXIDLE_TIMER_MIN (1)
+#define MP_UART_ALLOWED_FLAGS (SERCOM_USART_INTFLAG_RXC | SERCOM_USART_INTFLAG_TXC | UART_IRQ_RXIDLE)
+
 #define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(SERCOM_USART_INTFLAG_RXC) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_IRQ_RXIDLE) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_TXIDLE), MP_ROM_INT(SERCOM_USART_INTFLAG_TXC) }, \
 
+enum {
+    RXIDLE_INACTIVE,
+    RXIDLE_STANDBY,
+    RXIDLE_ARMED,
+    RXIDLE_ALERT,
+};
 #else
 #define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
 #endif
 
+typedef struct _soft_timer_entry_extended_t {
+    soft_timer_entry_t base;
+    void *context;
+} soft_timer_entry_extended_t;
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uint8_t id;
@@ -80,6 +95,9 @@ typedef struct _machine_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
+    soft_timer_entry_extended_t rxidle_timer;
+    uint8_t rxidle_state;
+    uint16_t rxidle_ms;
     #endif
 } machine_uart_obj_t;
 
@@ -108,14 +126,24 @@ void common_uart_irq_handler(int uart_id) {
     if (self != NULL) {
         Sercom *uart = sercom_instance[self->id];
         #if MICROPY_PY_MACHINE_UART_IRQ
-        self->mp_irq_flags = 0;
+        uint16_t mp_irq_flags = 0;
         #endif
         if (uart->USART.INTFLAG.bit.RXC != 0) {
             // Now handler the incoming data
             uart_drain_rx_fifo(self, uart);
             #if MICROPY_PY_MACHINE_UART_IRQ
             if (ringbuf_avail(&self->read_buffer) > 0) {
-                self->mp_irq_flags = SERCOM_USART_INTFLAG_RXC;
+                if (self->mp_irq_trigger & UART_IRQ_RXIDLE) {
+                    if (self->rxidle_state != RXIDLE_INACTIVE) {
+                        if (self->rxidle_state == RXIDLE_STANDBY) {
+                            self->rxidle_timer.base.mode = SOFT_TIMER_MODE_PERIODIC;
+                            soft_timer_insert(&self->rxidle_timer.base, self->rxidle_ms);
+                        }
+                        self->rxidle_state = RXIDLE_ALERT;
+                    }
+                } else {
+                    mp_irq_flags = SERCOM_USART_INTFLAG_RXC;
+                }
             }
             #endif
         } else if (uart->USART.INTFLAG.bit.DRE != 0) {
@@ -126,7 +154,7 @@ void common_uart_irq_handler(int uart_id) {
             } else {
                 #if MICROPY_PY_MACHINE_UART_IRQ
                 // Set the TXIDLE flag
-                self->mp_irq_flags |= SERCOM_USART_INTFLAG_TXC;
+                mp_irq_flags |= SERCOM_USART_INTFLAG_TXC;
                 #endif
                 // Stop the DRE interrupt if there is no more data
                 uart->USART.INTENCLR.reg = SERCOM_USART_INTENCLR_DRE;
@@ -137,14 +165,34 @@ void common_uart_irq_handler(int uart_id) {
         uart->USART.INTENCLR.reg = (uint8_t) ~(SERCOM_USART_INTENCLR_DRE | SERCOM_USART_INTENCLR_RXC);
 
         #if MICROPY_PY_MACHINE_UART_IRQ
-        // Check the flags to see if the user handler should be called
-        if (self->mp_irq_trigger & self->mp_irq_flags) {
+        // Check the flags to see if the uart user handler should be called
+        // The handler for RXIDLE is called in the timer callback
+        if (self->mp_irq_trigger & mp_irq_flags) {
+            self->mp_irq_flags = mp_irq_flags;
             mp_irq_handler(self->mp_irq_obj);
         }
         #endif
     }
 }
 
+#if MICROPY_PY_MACHINE_UART_IRQ
+static void uart_soft_timer_callback(soft_timer_entry_t *self) {
+    machine_uart_obj_t *uart = ((soft_timer_entry_extended_t *)self)->context;
+    if (uart->rxidle_state == RXIDLE_ALERT) {
+        // At the first call, just switch the state
+        uart->rxidle_state = RXIDLE_ARMED;
+    } else if (uart->rxidle_state == RXIDLE_ARMED) {
+        // At the second call, run the irq callback and stop the timer
+        // by setting the mode to SOFT_TIMER_MODE_ONE_SHOT.
+        // Calling soft_timer_remove() would fail here.
+        self->mode = SOFT_TIMER_MODE_ONE_SHOT;
+        uart->rxidle_state = RXIDLE_STANDBY;
+        uart->mp_irq_flags = UART_IRQ_RXIDLE;
+        mp_irq_handler(uart->mp_irq_obj);
+    }
+}
+#endif
+
 // Configure the Sercom device
 static void machine_sercom_configure(machine_uart_obj_t *self) {
     Sercom *uart = sercom_instance[self->id];
@@ -424,6 +472,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     #endif
     #if MICROPY_PY_MACHINE_UART_IRQ
     self->mp_irq_obj = NULL;
+    self->rxidle_state = RXIDLE_INACTIVE;
     #endif
     self->new = true;
     MP_STATE_PORT(sercom_table[uart_id]) = self;
@@ -486,8 +535,33 @@ static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
 
 #if MICROPY_PY_MACHINE_UART_IRQ
 
+// Configure the timer used for IRQ_RXIDLE
+static void uart_irq_configure_timer(machine_uart_obj_t *self, mp_uint_t trigger) {
+    self->rxidle_state = RXIDLE_INACTIVE;
+
+    if (trigger & UART_IRQ_RXIDLE) {
+        // The RXIDLE event is always a soft IRQ.
+        self->mp_irq_obj->ishard = false;
+        mp_int_t ms = 13000 / self->baudrate + 1;
+        if (ms < RXIDLE_TIMER_MIN) {
+            ms = RXIDLE_TIMER_MIN;
+        }
+        self->rxidle_ms = ms;
+        self->rxidle_timer.context = self;
+        soft_timer_static_init(
+            &self->rxidle_timer.base,
+            SOFT_TIMER_MODE_PERIODIC,
+            ms,
+            uart_soft_timer_callback
+            );
+        self->rxidle_state = RXIDLE_STANDBY;
+    }
+}
+
 static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    uart_irq_configure_timer(self, new_trigger);
     self->mp_irq_trigger = new_trigger;
     return 0;
 }
@@ -526,6 +600,7 @@ static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
         if (trigger != 0 && not_supported) {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("trigger 0x%04x unsupported"), not_supported);
         }
+        uart_irq_configure_timer(self, trigger);
 
         self->mp_irq_obj->handler = handler;
         self->mp_irq_obj->ishard = args[MP_IRQ_ARG_INIT_hard].u_bool;

From 7045975d046196e57efb79dc70e6b715155b9bca Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 3 Jul 2024 16:32:35 +0200
Subject: [PATCH 1365/3129] renesas-ra/machine_uart: Implement UART.IRQ_RXIDLE
 based on softtimer.

Allowing to define the trigger UART.IRQ_RXIDLE as well as UART.IRQ_RX.  The
delay for the IRQ_RXIDLE interrupt is about 3 character times or 1-2 ms,
whichever is larger.

The irq.flags() value is changed only with an expected event.  Do not
change it otherwise.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/renesas-ra/machine_uart.c | 29 ++++++++++++++++++++++++++++-
 ports/renesas-ra/uart.c         | 27 ++++++++++++++++++++++++++-
 ports/renesas-ra/uart.h         | 24 +++++++++++++++++++++++-
 3 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 4a659d107af39..b70978ad7a5fe 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -41,7 +41,8 @@
 #define MICROPY_PY_MACHINE_UART_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) }, \
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(0x10) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(UART_IRQ_RX) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_IRQ_RXIDLE) }, \
 
 static const char *_parity_name[] = {"None", "ODD", "EVEN"};
 
@@ -297,6 +298,8 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
         // reference existing UART object
         self = MP_STATE_PORT(machine_uart_obj_all)[uart_id];
     }
+    self->mp_irq_obj = NULL;
+    self->rxidle_state = RXIDLE_INACTIVE;
 
     // start the peripheral
     mp_map_t kw_args;
@@ -351,6 +354,29 @@ static mp_int_t mp_machine_uart_readchar(machine_uart_obj_t *self) {
     }
 }
 
+// Configure the timer used for IRQ_RXIDLE
+void uart_irq_configure_timer(machine_uart_obj_t *self, mp_uint_t trigger) {
+    self->rxidle_state = RXIDLE_INACTIVE;
+
+    if (trigger & UART_IRQ_RXIDLE) {
+        // The RXIDLE event is always a soft IRQ.
+        self->mp_irq_obj->ishard = false;
+        mp_int_t ms = 13000 / self->baudrate + 1;
+        if (ms < RXIDLE_TIMER_MIN) {
+            ms = RXIDLE_TIMER_MIN;
+        }
+        self->rxidle_ms = ms;
+        self->rxidle_timer.context = self;
+        soft_timer_static_init(
+            &self->rxidle_timer.base,
+            SOFT_TIMER_MODE_PERIODIC,
+            ms,
+            uart_soft_timer_callback
+            );
+        self->rxidle_state = RXIDLE_STANDBY;
+    }
+}
+
 static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
     if (self->mp_irq_obj == NULL) {
         self->mp_irq_trigger = 0;
@@ -376,6 +402,7 @@ static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
         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_configure_timer(self, trigger);
         uart_irq_config(self, true);
     }
 
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index 83b3394f7b453..d17a1fc913fe0 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -85,12 +85,36 @@ static void uart_rx_cb(uint32_t ch, int d) {
     }
     #endif
 
+    if ((self->mp_irq_trigger & UART_IRQ_RXIDLE) && (self->rxidle_state != RXIDLE_INACTIVE)) {
+        if (self->rxidle_state == RXIDLE_STANDBY) {
+            self->rxidle_timer.base.mode = SOFT_TIMER_MODE_PERIODIC;
+            soft_timer_insert(&self->rxidle_timer.base, self->rxidle_ms);
+        }
+        self->rxidle_state = RXIDLE_ALERT;
+    }
     // Check the flags to see if the user handler should be called
-    if (self->mp_irq_trigger) {
+    if (self->mp_irq_trigger & UART_IRQ_RX) {
+        self->mp_irq_flags = UART_IRQ_RX;
         mp_irq_handler(self->mp_irq_obj);
     }
 }
 
+void uart_soft_timer_callback(soft_timer_entry_t *self) {
+    machine_uart_obj_t *uart = ((soft_timer_entry_extended_t *)self)->context;
+    if (uart->rxidle_state == RXIDLE_ALERT) {
+        // At the first call, just switch the state
+        uart->rxidle_state = RXIDLE_ARMED;
+    } else if (uart->rxidle_state == RXIDLE_ARMED) {
+        // At the second call, run the irq callback and stop the timer
+        // by setting the mode to SOFT_TIMER_MODE_ONE_SHOT.
+        // Calling soft_timer_remove() would fail here.
+        self->mode = SOFT_TIMER_MODE_ONE_SHOT;
+        uart->rxidle_state = RXIDLE_STANDBY;
+        uart->mp_irq_flags = UART_IRQ_RXIDLE;
+        mp_irq_handler(uart->mp_irq_obj);
+    }
+}
+
 void uart_init0(void) {
 }
 
@@ -513,6 +537,7 @@ void uart_tx_strn(machine_uart_obj_t *uart_obj, const char *str, uint len) {
 static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uart_irq_config(self, false);
+    uart_irq_configure_timer(self, new_trigger);
     self->mp_irq_trigger = new_trigger;
     uart_irq_config(self, true);
     return 0;
diff --git a/ports/renesas-ra/uart.h b/ports/renesas-ra/uart.h
index ee8eb321d552c..1f74df412cb43 100644
--- a/ports/renesas-ra/uart.h
+++ b/ports/renesas-ra/uart.h
@@ -29,6 +29,7 @@
 #define MICROPY_INCLUDED_RA_UART_H
 
 #include "shared/runtime/mpirq.h"
+#include "shared/runtime/softtimer.h"
 #include "pin.h"
 
 typedef enum {
@@ -57,12 +58,28 @@ typedef enum {
 #define UART_HWCONTROL_CTS  (1)
 #define UART_HWCONTROL_RTS  (2)
 
+#define UART_IRQ_RX (0x10)
+#define UART_IRQ_RXIDLE (0x1000)
+#define RXIDLE_TIMER_MIN (1)
+
 // OR-ed IRQ flags which are allowed to be used by the user
-#define MP_UART_ALLOWED_FLAGS ((uint32_t)0x00000010)
+#define MP_UART_ALLOWED_FLAGS ((uint32_t)(UART_IRQ_RX | UART_IRQ_RXIDLE))
 
 // OR-ed IRQ flags which should not be touched by the user
 #define MP_UART_RESERVED_FLAGS ((uint16_t)0x0020)
 
+enum {
+    RXIDLE_INACTIVE,
+    RXIDLE_STANDBY,
+    RXIDLE_ARMED,
+    RXIDLE_ALERT,
+};
+
+typedef struct _soft_timer_entry_extended_t {
+    soft_timer_entry_t base;
+    void *context;
+} soft_timer_entry_extended_t;
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     machine_uart_t uart_id : 8;
@@ -87,6 +104,9 @@ typedef struct _machine_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
+    soft_timer_entry_extended_t rxidle_timer;
+    uint8_t rxidle_state;
+    uint16_t rxidle_ms;
 } machine_uart_obj_t;
 
 extern const mp_irq_methods_t uart_irq_methods;
@@ -100,6 +120,8 @@ 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_irq_configure_timer(machine_uart_obj_t *self, mp_uint_t trigger);
+void uart_soft_timer_callback(soft_timer_entry_t *self);
 
 void uart_attach_to_repl(machine_uart_obj_t *self, bool attached);
 uint32_t uart_get_baudrate(machine_uart_obj_t *self);

From a38b4f42876cf274d77752f5f8cc559deb87f9fa Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 4 Jul 2024 16:57:29 +0200
Subject: [PATCH 1366/3129] esp32/machine_uart: Implement UART.RX_IDLE based on
 machine.Timer.

The UART.IRQ_IDLE callback is called about two character times after the
last byte, or 1 ms, whichever is larger.  For the irq, timer 0 is used.

machine_timer.c had to be reworked to make it's mechanisms available for
machine_uart.c.

The irq.flags() value is change only at a requested event.  Otherwise keep
the state.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_timer.c | 49 ++++++++-----------
 ports/esp32/machine_timer.h | 66 ++++++++++++++++++++++++++
 ports/esp32/machine_uart.c  | 93 +++++++++++++++++++++++++++++++++++--
 3 files changed, 173 insertions(+), 35 deletions(-)
 create mode 100644 ports/esp32/machine_timer.h

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 011f87ba9eb30..278deb10649d4 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -38,6 +38,7 @@
 #include "hal/timer_hal.h"
 #include "hal/timer_ll.h"
 #include "soc/timer_periph.h"
+#include "machine_timer.h"
 
 #define TIMER_DIVIDER  8
 
@@ -46,27 +47,8 @@
 
 #define TIMER_FLAGS    0
 
-typedef struct _machine_timer_obj_t {
-    mp_obj_base_t base;
-
-    timer_hal_context_t hal_context;
-    mp_uint_t group;
-    mp_uint_t index;
-
-    mp_uint_t repeat;
-    // ESP32 timers are 64 or 54-bit
-    uint64_t period;
-
-    mp_obj_t callback;
-
-    intr_handle_t handle;
-
-    struct _machine_timer_obj_t *next;
-} 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) {
@@ -91,18 +73,17 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
     #endif
 }
 
-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, MP_OBJ_FUN_ARGS_MAX, true);
+machine_timer_obj_t *machine_timer_create(mp_uint_t timer) {
+
+    machine_timer_obj_t *self = NULL;
     #if CONFIG_IDF_TARGET_ESP32C3
-    mp_uint_t group = mp_obj_get_int(args[0]) & 1;
+    mp_uint_t group = timer & 1;
     mp_uint_t index = 0;
     #else
-    mp_uint_t group = (mp_obj_get_int(args[0]) >> 1) & 1;
-    mp_uint_t index = mp_obj_get_int(args[0]) & 1;
+    mp_uint_t group = (timer >> 1) & 1;
+    mp_uint_t index = timer & 1;
     #endif
 
-    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) {
@@ -120,6 +101,14 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
         self->next = MP_STATE_PORT(machine_timer_obj_head);
         MP_STATE_PORT(machine_timer_obj_head) = self;
     }
+    return self;
+}
+
+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, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Create the new timer.
+    machine_timer_obj_t *self = machine_timer_create(mp_obj_get_int(args[0]));
 
     if (n_args > 1 || n_kw > 0) {
         mp_map_t kw_args;
@@ -130,7 +119,7 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     return self;
 }
 
-static void machine_timer_disable(machine_timer_obj_t *self) {
+void machine_timer_disable(machine_timer_obj_t *self) {
     if (self->hal_context.dev != NULL) {
         // Disable the counter and alarm.
         timer_ll_enable_counter(self->hal_context.dev, self->index, false);
@@ -162,7 +151,7 @@ static void machine_timer_isr(void *self_in) {
     }
 }
 
-static void machine_timer_enable(machine_timer_obj_t *self) {
+void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr)) {
     // Initialise the timer.
     timer_hal_init(&self->hal_context, self->group, self->index);
     timer_ll_enable_counter(self->hal_context.dev, self->index, false);
@@ -176,7 +165,7 @@ static void machine_timer_enable(machine_timer_obj_t *self) {
     timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
     ESP_ERROR_CHECK(
         esp_intr_alloc(timer_group_periph_signals.groups[self->group].timer_irq_id[self->index],
-            TIMER_FLAGS, machine_timer_isr, self, &self->handle)
+            TIMER_FLAGS, timer_isr, self, &self->handle)
         );
     timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), true);
 
@@ -234,7 +223,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
     self->callback = args[ARG_callback].u_obj;
     self->handle = NULL;
 
-    machine_timer_enable(self);
+    machine_timer_enable(self, machine_timer_isr);
 
     return mp_const_none;
 }
diff --git a/ports/esp32/machine_timer.h b/ports/esp32/machine_timer.h
new file mode 100644
index 0000000000000..914bedd86baa9
--- /dev/null
+++ b/ports/esp32/machine_timer.h
@@ -0,0 +1,66 @@
+/*
+ * 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-2015 Damien P. George
+ * 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.
+ */
+
+#ifndef MICROPY_INCLUDED_ESP32_MACHINE_TIMER_H
+#define MICROPY_INCLUDED_ESP32_MACHINE_TIMER_H
+
+#include "hal/timer_hal.h"
+#include "hal/timer_ll.h"
+#include "soc/timer_periph.h"
+
+#define TIMER_DIVIDER  8
+
+// TIMER_BASE_CLK is normally 80MHz. TIMER_DIVIDER ought to divide this exactly
+#define TIMER_SCALE    (APB_CLK_FREQ / TIMER_DIVIDER)
+
+#define TIMER_FLAGS    0
+
+typedef struct _machine_timer_obj_t {
+    mp_obj_base_t base;
+
+    timer_hal_context_t hal_context;
+    mp_uint_t group;
+    mp_uint_t index;
+
+    mp_uint_t repeat;
+    // ESP32 timers are 64-bit
+    uint64_t period;
+
+    mp_obj_t callback;
+
+    intr_handle_t handle;
+
+    struct _machine_timer_obj_t *next;
+} machine_timer_obj_t;
+
+machine_timer_obj_t *machine_timer_create(mp_uint_t timer);
+void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr));
+void machine_timer_disable(machine_timer_obj_t *self);
+
+#endif // MICROPY_INCLUDED_ESP32_MACHINE_TIMER_H
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 1a02594132c0c..d260c45c48f80 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -39,6 +39,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "uart.h"
+#include "machine_timer.h"
 
 #if SOC_UART_SUPPORT_XTAL_CLK
 // Works independently of APB frequency, on ESP32C3, ESP32S3.
@@ -54,8 +55,17 @@
 
 #define UART_INV_MASK (UART_INV_TX | UART_INV_RX | UART_INV_RTS | UART_INV_CTS)
 #define UART_IRQ_RX (1 << UART_DATA)
+#define UART_IRQ_RXIDLE (0x1000)
 #define UART_IRQ_BREAK (1 << UART_BREAK)
-#define MP_UART_ALLOWED_FLAGS (UART_IRQ_RX | UART_IRQ_BREAK)
+#define MP_UART_ALLOWED_FLAGS (UART_IRQ_RX | UART_IRQ_RXIDLE | UART_IRQ_BREAK)
+#define RXIDLE_TIMER_MIN (5000)  // 500 us
+
+enum {
+    RXIDLE_INACTIVE,
+    RXIDLE_STANDBY,
+    RXIDLE_ARMED,
+    RXIDLE_ALERT,
+};
 
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
@@ -78,6 +88,9 @@ typedef struct _machine_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
+    machine_timer_obj_t *rxidle_timer;
+    uint8_t rxidle_state;
+    uint16_t rxidle_period;
 } machine_uart_obj_t;
 
 static const char *_parity_name[] = {"None", "1", "0"};
@@ -93,28 +106,67 @@ static const char *_parity_name[] = {"None", "1", "0"};
     { 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) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(UART_IRQ_RX) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_IRQ_RXIDLE) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_BREAK), MP_ROM_INT(UART_IRQ_BREAK) }, \
 
+static void uart_timer_callback(void *self_in) {
+    machine_timer_obj_t *self = self_in;
+
+    uint32_t intr_status = timer_ll_get_intr_status(self->hal_context.dev);
+
+    if (intr_status & TIMER_LL_EVENT_ALARM(self->index)) {
+        timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
+        if (self->repeat) {
+            timer_ll_enable_alarm(self->hal_context.dev, self->index, true);
+        }
+    }
+
+    // The UART object is referred here by the callback field.
+    machine_uart_obj_t *uart = (machine_uart_obj_t *)self->callback;
+    if (uart->rxidle_state == RXIDLE_ALERT) {
+        // At the first call, just switch the state
+        uart->rxidle_state = RXIDLE_ARMED;
+    } else if (uart->rxidle_state == RXIDLE_ARMED) {
+        // At the second call, run the irq callback and stop the timer
+        uart->rxidle_state = RXIDLE_STANDBY;
+        uart->mp_irq_flags = UART_IRQ_RXIDLE;
+        mp_irq_handler(uart->mp_irq_obj);
+        mp_hal_wake_main_task_from_isr();
+        machine_timer_disable(uart->rxidle_timer);
+    }
+}
+
 static void uart_event_task(void *self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uart_event_t event;
     for (;;) {
         // Waiting for an UART event.
         if (xQueueReceive(self->uart_queue, (void *)&event, (TickType_t)portMAX_DELAY)) {
-            self->mp_irq_flags = 0;
+            uint16_t mp_irq_flags = 0;
             switch (event.type) {
                 // Event of UART receiving data
                 case UART_DATA:
-                    self->mp_irq_flags |= UART_IRQ_RX;
+                    if (self->mp_irq_trigger & UART_IRQ_RXIDLE) {
+                        if (self->rxidle_state != RXIDLE_INACTIVE) {
+                            if (self->rxidle_state == RXIDLE_STANDBY) {
+                                self->rxidle_timer->repeat = true;
+                                self->rxidle_timer->handle = NULL;
+                                machine_timer_enable(self->rxidle_timer, uart_timer_callback);
+                            }
+                        }
+                        self->rxidle_state = RXIDLE_ALERT;
+                    }
+                    mp_irq_flags |= UART_IRQ_RX;
                     break;
                 case UART_BREAK:
-                    self->mp_irq_flags |= UART_IRQ_BREAK;
+                    mp_irq_flags |= UART_IRQ_BREAK;
                     break;
                 default:
                     break;
             }
             // Check the flags to see if the user handler should be called
-            if (self->mp_irq_trigger & self->mp_irq_flags) {
+            if (self->mp_irq_trigger & mp_irq_flags) {
+                self->mp_irq_flags = mp_irq_flags;
                 mp_irq_handler(self->mp_irq_obj);
                 mp_hal_wake_main_task_from_isr();
             }
@@ -390,6 +442,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->invert = 0;
     self->flowcontrol = 0;
     self->uart_event_task = 0;
+    self->rxidle_state = RXIDLE_INACTIVE;
 
     switch (uart_num) {
         case UART_NUM_0:
@@ -464,8 +517,35 @@ static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
     check_esp_err(uart_set_baudrate(self->uart_num, baudrate));
 }
 
+// Configure the timer used for IRQ_RXIDLE
+static void uart_irq_configure_timer(machine_uart_obj_t *self, mp_uint_t trigger) {
+
+    self->rxidle_state = RXIDLE_INACTIVE;
+
+    if (trigger & UART_IRQ_RXIDLE) {
+        // The RXIDLE event is always a soft IRQ.
+        self->mp_irq_obj->ishard = false;
+        uint32_t baudrate;
+        uart_get_baudrate(self->uart_num, &baudrate);
+        mp_int_t period = TIMER_SCALE * 20 / baudrate + 1;
+        if (period < RXIDLE_TIMER_MIN) {
+            period = RXIDLE_TIMER_MIN;
+        }
+        self->rxidle_period = period;
+        self->rxidle_timer->period = period;
+        // The Python callback is not used. So use this
+        // data field to hold a reference to the UART object.
+        self->rxidle_timer->callback = self;
+        self->rxidle_timer->repeat = true;
+        self->rxidle_timer->handle = NULL;
+        self->rxidle_state = RXIDLE_STANDBY;
+    }
+}
+
 static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    uart_irq_configure_timer(self, new_trigger);
     self->mp_irq_trigger = new_trigger;
     return 0;
 }
@@ -511,6 +591,9 @@ static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
         }
         self->mp_irq_obj->ishard = false;
         self->mp_irq_trigger = trigger;
+        self->rxidle_timer = machine_timer_create(0);
+        uart_irq_configure_timer(self, trigger);
+
         // Start a task for handling events
         if (handler != mp_const_none && self->uart_event_task == NULL) {
             xTaskCreatePinnedToCore(uart_event_task, "uart_event_task", 2048, self,

From 9bbe61607ac3e97d96294d588afd09d82613c6a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Mar 2024 13:51:31 +1100
Subject: [PATCH 1367/3129] docs/library/machine.UART: Fix UART.irq docs to
 match current code.

These docs now match the code in `extmod/machine_uart.c`.  IRQ trigger
support still need to be updated for each port (to be done in a follow-up
commit).

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.UART.rst | 62 +++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 072bdb7188a3d..6f47eb9abb7c4 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -152,31 +152,6 @@ Methods
    Send a break condition on the bus. This drives the bus low for a duration
    longer than required for a normal transmission of a character.
 
-.. method:: UART.irq(trigger, priority=1, handler=None, wake=machine.IDLE)
-
-   Create a callback to be triggered when data is received on the UART.
-
-       - *trigger* can only be ``UART.RX_ANY``
-       - *priority* level of the interrupt. Can take values in the range 1-7.
-         Higher values represent higher priorities.
-       - *handler* an optional function to be called when new characters arrive.
-       - *wake* can only be ``machine.IDLE``.
-
-   .. note::
-
-      The handler will be called whenever any of the following two conditions are met:
-
-          - 8 new characters have been received.
-          - At least 1 new character is waiting in the Rx buffer and the Rx line has been
-            silent for the duration of 1 complete frame.
-
-      This means that when the handler function is called there will be between 1 to 8
-      characters waiting.
-
-   Returns an irq object.
-
-   Availability: WiPy.
-
 .. method:: UART.flush()
 
    Waits until all data has been sent. In case of a timeout, an exception is raised. The timeout
@@ -203,11 +178,42 @@ Methods
 
    Availability: rp2, esp32, esp8266, mimxrt, cc3200, stm32, nrf ports, renesas-ra
 
+.. method:: UART.irq(handler=None, trigger=0, hard=False)
+
+   Configure an interrupt handler to be called when a UART event occurs.
+
+   The arguments are:
+
+     - *handler* is an optional function to be called when the interrupt event
+       triggers.  The handler must take exactly one argument which is the
+       ``UART`` instance.
+
+     - *trigger* configures the event which can generate an interrupt.
+       Possible values are:
+
+       - ``UART.IRQ_RXIDLE`` interrupt after receiving at least one character
+         and then the RX line goes idle.
+
+     - *hard* if true a hardware interrupt is used.  This reduces the delay
+       between the pin change and the handler being called.  Hard interrupt
+       handlers may not allocate memory; see :ref:`isr_rules`.
+
+   Returns an irq object.
+
+   Availability: renesas-ra, stm32.
+
 Constants
 ---------
 
-.. data:: UART.RX_ANY
+.. data:: UART.RTS
+          UART.CTS
+
+    Flow control options.
+
+    Availability: esp32, mimxrt, renesas-ra, rp2, stm32.
+
+.. data:: UART.IRQ_RXIDLE
 
-    IRQ trigger sources
+    IRQ trigger sources.
 
-    Availability: WiPy.
+    Availability: stm32.

From 03b1b6d8e6a968a2aec002466e516952c6683f53 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 11 Mar 2024 12:31:17 +0100
Subject: [PATCH 1368/3129] docs/library/machine.UART: Extend the documentation
 for UART.irq.

For more ports and trigger options, based on the current state of the code.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/library/machine.UART.rst | 53 +++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 6f47eb9abb7c4..0f3e77ec471a9 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -188,19 +188,59 @@ Methods
        triggers.  The handler must take exactly one argument which is the
        ``UART`` instance.
 
-     - *trigger* configures the event which can generate an interrupt.
-       Possible values are:
+     - *trigger* configures the event(s) which can generate an interrupt.
+       Possible values are a mask of one or more of the following:
 
        - ``UART.IRQ_RXIDLE`` interrupt after receiving at least one character
          and then the RX line goes idle.
+       - ``UART.IRQ_RX`` interrupt after each received character.
+       - ``UART.IRQ_TXIDLE`` interrupt after or while the last character(s) of
+         a message are or have been sent.
+       - ``UART.IRQ_BREAK`` interrupt when a break state is detected at RX
 
      - *hard* if true a hardware interrupt is used.  This reduces the delay
-       between the pin change and the handler being called.  Hard interrupt
+       between the pin change and the handler being called. Hard interrupt
        handlers may not allocate memory; see :ref:`isr_rules`.
 
    Returns an irq object.
 
-   Availability: renesas-ra, stm32.
+   Due to limitations of the hardware not all trigger events are available on all ports.
+
+   .. table:: Availability of triggers
+      :align: center 
+
+      ============== ========== ====== ========== =========
+      Port / Trigger IRQ_RXIDLE IRQ_RX IRQ_TXIDLE IRQ_BREAK
+      ============== ========== ====== ========== =========
+      CC3200                      yes
+      ESP32            yes        yes                yes
+      MIMXRT           yes                yes
+      NRF                         yes     yes
+      RENESAS-RA       yes        yes
+      RP2              yes                yes        yes
+      SAMD             yes        yes     yes
+      STM32            yes        yes
+      ============== ========== ====== ========== =========
+
+
+   .. note::
+     - The ESP32 port does not support the option hard=True.
+
+     - The rp2 port's UART.IRQ_TXIDLE is only triggered when the message
+       is longer than 5 characters and the trigger happens when still 5 characters
+       are to be sent.
+
+     - The rp2 port's UART.IRQ_BREAK needs receiving valid characters for triggering
+       again.
+
+     - The SAMD port's UART.IRQ_TXIDLE is triggered while the last character is sent.
+
+     - On STM32F4xx MCU's, using the trigger UART.IRQ_RXIDLE the handler will be called once
+       after the first character and then after the end of the message, when the line is
+       idle.
+
+
+   Availability: cc3200, esp32, mimxrt, nrf, renesas-ra, rp2, samd, stm32.
 
 Constants
 ---------
@@ -213,7 +253,10 @@ Constants
     Availability: esp32, mimxrt, renesas-ra, rp2, stm32.
 
 .. data:: UART.IRQ_RXIDLE
+          UART.IRQ_RX
+          UART.IRQ_TXIDLE
+          UART.IRQ_BREAK
 
     IRQ trigger sources.
 
-    Availability: stm32.
+    Availability: renesas-ra, stm32, esp32, rp2040, mimxrt, samd, cc3200.

From b8513e6137faaed4b540b0be7756b30fa06a217a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Aug 2024 23:07:12 +1000
Subject: [PATCH 1369/3129] tests/extmod: Add test for machine.UART.IRQ_TXIDLE.

The test checks whether the message created by the IRQ handler appears
about at the end of the data sent by UART.

Supported MCUs resp. boards:
- RP2040
- Teensy 4.x
- Adafruit ItsyBitsy M0
- Adafruit ItsyBitsy M4
- NRF52 (Arduino Nano Connect 33 BLE)

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_uart_irq_txidle.py     | 76 +++++++++++++++++++++
 tests/extmod/machine_uart_irq_txidle.py.exp | 12 ++++
 2 files changed, 88 insertions(+)
 create mode 100644 tests/extmod/machine_uart_irq_txidle.py
 create mode 100644 tests/extmod/machine_uart_irq_txidle.py.exp

diff --git a/tests/extmod/machine_uart_irq_txidle.py b/tests/extmod/machine_uart_irq_txidle.py
new file mode 100644
index 0000000000000..3e69bb43141aa
--- /dev/null
+++ b/tests/extmod/machine_uart_irq_txidle.py
@@ -0,0 +1,76 @@
+# Test machine.UART.IRQ_TXIDLE firing after a transmission.
+# Does not require any external connections.
+
+try:
+    from machine import UART
+
+    UART.IRQ_TXIDLE
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+import time, sys
+
+# Configure pins based on the target.
+if "rp2" in sys.platform:
+    uart_id = 0
+    tx_pin = "GPIO0"
+    rx_pin = "GPIO1"
+    min_window = 1
+elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
+    uart_id = 0
+    tx_pin = "D1"
+    rx_pin = "D0"
+    # For SAMD delay_ms has to be used for the trailing window, and the
+    # mininmal time is 11 ms to allow for scheduling.
+    min_window = 11
+elif "samd" in sys.platform and "ItsyBitsy M4" in sys.implementation._machine:
+    uart_id = 3
+    tx_pin = "D1"
+    rx_pin = "D0"
+    min_window = 11
+elif "mimxrt" in sys.platform:
+    uart_id = 1
+    tx_pin = None
+    min_window = 0
+elif "nrf" in sys.platform:
+    uart_id = 0
+    tx_pin = None
+    min_window = 0
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def irq(u):
+    print("IRQ_TXIDLE:", u.irq().flags() == u.IRQ_TXIDLE)
+
+
+text = "Hello World" * 20
+
+# Test that the IRQ is called after the write has completed.
+for bits_per_s in (2400, 9600, 115200):
+    if tx_pin is None:
+        uart = UART(uart_id, bits_per_s)
+    else:
+        uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
+
+    uart.irq(irq, uart.IRQ_TXIDLE)
+
+    # The IRQ_TXIDLE shall trigger after the message has been sent. Thus
+    # the test marks a time window close to the expected of the sending
+    # and the time at which the IRQ should have been fired.
+    # It is just a rough estimation of 10 characters before and
+    # 20 characters after the data's end, unless there is a need to
+    # wait a minimal time, like for SAMD devices.
+
+    bits_per_char = 10  # 1(startbit) + 8(bits) + 1(stopbit) + 0(parity)
+    start_time_us = (len(text) - 10) * bits_per_char * 1_000_000 // bits_per_s
+    window_ms = max(min_window, 20 * bits_per_char * 1_000 // bits_per_s + 1)
+
+    print("write", bits_per_s)
+    uart.write(text)
+    time.sleep_us(start_time_us)
+    print("ready")
+    time.sleep_ms(window_ms)
+    print("done")
diff --git a/tests/extmod/machine_uart_irq_txidle.py.exp b/tests/extmod/machine_uart_irq_txidle.py.exp
new file mode 100644
index 0000000000000..2da51d10faada
--- /dev/null
+++ b/tests/extmod/machine_uart_irq_txidle.py.exp
@@ -0,0 +1,12 @@
+write 2400
+ready
+IRQ_TXIDLE: True
+done
+write 9600
+ready
+IRQ_TXIDLE: True
+done
+write 115200
+ready
+IRQ_TXIDLE: True
+done

From 09d070aa55891587ddbd60fa2b8f926ebb1705cd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Aug 2024 23:07:34 +1000
Subject: [PATCH 1370/3129] tests/extmod_hardware: Add tests for
 machine.UART.IRQ_RX/RXIDLE/BREAK.

These all require hardware connections, so live in a different directory.

Except for the IRQ_BREAK test of ESP32 devices a single UART with loopback
is sufficient.

General:
    SAMD21: Due to the limited flash size only SAMD21 devices with external
    flash support uart.irq().

IRQ_BREAK:
    ESP32 needs different UART devices for creating and sensing a break.
    Lacking a second UART the test is skipped for ESP32S2 and ESP32C3.  RP2
    does not pass the test reliable at 115200 baud, reason to be found.
    Thus the upper limit is set to 57600 Baud.

    Coverage:
        esp32  pass when different UART devices are used.
        rp2    pass up to 57600 baud

IRQ_RX:
    SAMD21: Being a slow device it needs data to be sent byte-by-byte at
    9600 baud, since the IRQ callback is scheduled delayed and then the
    flags do not match any more.  The data matches since it is queued in
    the FIFO resp. ringbuffer.

    CC3200: The test cannot be performed since no calls are accepted in the
    IRQ handler like u.read(). Skipped.

    Coverage:
        cc3200 fail due to major differences in the implementation.
        esp32  pass
        nrf    pass
        renesas-ra pass
        samd   pass see the notes.
        stm32  pass

IRQ_RXIDLE:
    STM32: With PyBoard the IRQ is called several times, but only once with
    the flag IRQ_RXIDLE set.

    Coverage:
        esp32    pass
        mimxrt   pass
        renesas-ra pass
        rp2      pass
        samd     pass for both SAMD21 and SAMD51
        stm32    fail. see notes.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../extmod_hardware/machine_uart_irq_break.py | 62 +++++++++++++++
 .../machine_uart_irq_break.py.exp             | 15 ++++
 tests/extmod_hardware/machine_uart_irq_rx.py  | 78 +++++++++++++++++++
 .../machine_uart_irq_rx.py.exp                | 12 +++
 .../machine_uart_irq_rxidle.py                | 70 +++++++++++++++++
 .../machine_uart_irq_rxidle.py.exp            | 12 +++
 6 files changed, 249 insertions(+)
 create mode 100644 tests/extmod_hardware/machine_uart_irq_break.py
 create mode 100644 tests/extmod_hardware/machine_uart_irq_break.py.exp
 create mode 100644 tests/extmod_hardware/machine_uart_irq_rx.py
 create mode 100644 tests/extmod_hardware/machine_uart_irq_rx.py.exp
 create mode 100644 tests/extmod_hardware/machine_uart_irq_rxidle.py
 create mode 100644 tests/extmod_hardware/machine_uart_irq_rxidle.py.exp

diff --git a/tests/extmod_hardware/machine_uart_irq_break.py b/tests/extmod_hardware/machine_uart_irq_break.py
new file mode 100644
index 0000000000000..82879c1d6e4a8
--- /dev/null
+++ b/tests/extmod_hardware/machine_uart_irq_break.py
@@ -0,0 +1,62 @@
+# Test machine.UART.IRQ_BREAK firing after a break is received.
+#
+# IMPORTANT: This test requires hardware connections: the UART TX and RX
+# pins must be wired together.
+
+try:
+    from machine import UART
+
+    UART.IRQ_BREAK
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+import time, sys
+
+# Configure pins based on the target.
+if "esp32" in sys.platform:
+    if "ESP32S2" in sys.implementation._machine or "ESP32C3" in sys.implementation._machine:
+        print("SKIP")
+        raise SystemExit
+    # ESP32 needs separate UART instances for the test
+    recv_uart_id = 1
+    recv_tx_pin = 14
+    recv_rx_pin = 5
+    send_uart_id = 2
+    send_tx_pin = 4
+    send_rx_pin = 12
+elif "rp2" in sys.platform:
+    recv_uart_id = 0
+    send_uart_id = 0
+    recv_tx_pin = "GPIO0"
+    recv_rx_pin = "GPIO1"
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def irq(u):
+    print("IRQ_BREAK:", bool(u.irq().flags() & u.IRQ_BREAK), "data:", u.read(1))
+
+
+# Test that the IRQ is called for each break received.
+for bits_per_s in (2400, 9600, 57600):
+    recv_uart = UART(recv_uart_id, bits_per_s, tx=recv_tx_pin, rx=recv_rx_pin)
+    if recv_uart_id != send_uart_id:
+        send_uart = UART(send_uart_id, bits_per_s, tx=send_tx_pin, rx=send_rx_pin)
+    else:
+        send_uart = recv_uart
+
+    recv_uart.irq(irq, recv_uart.IRQ_BREAK)
+
+    print("write", bits_per_s)
+    for i in range(3):
+        send_uart.write(str(i))
+        send_uart.flush()
+        time.sleep_ms(10)
+        send_uart.sendbreak()
+        time.sleep_ms(10)
+        if "esp32" in sys.platform:
+            # On esp32 a read is needed to read in the break byte.
+            recv_uart.read()
+    print("done")
diff --git a/tests/extmod_hardware/machine_uart_irq_break.py.exp b/tests/extmod_hardware/machine_uart_irq_break.py.exp
new file mode 100644
index 0000000000000..ca8afe8f2b6bf
--- /dev/null
+++ b/tests/extmod_hardware/machine_uart_irq_break.py.exp
@@ -0,0 +1,15 @@
+write 2400
+IRQ_BREAK: True data: b'0'
+IRQ_BREAK: True data: b'1'
+IRQ_BREAK: True data: b'2'
+done
+write 9600
+IRQ_BREAK: True data: b'0'
+IRQ_BREAK: True data: b'1'
+IRQ_BREAK: True data: b'2'
+done
+write 57600
+IRQ_BREAK: True data: b'0'
+IRQ_BREAK: True data: b'1'
+IRQ_BREAK: True data: b'2'
+done
diff --git a/tests/extmod_hardware/machine_uart_irq_rx.py b/tests/extmod_hardware/machine_uart_irq_rx.py
new file mode 100644
index 0000000000000..bf34900bd0826
--- /dev/null
+++ b/tests/extmod_hardware/machine_uart_irq_rx.py
@@ -0,0 +1,78 @@
+# Test machine.UART.IRQ_RX firing for each character received.
+#
+# IMPORTANT: This test requires hardware connections: the UART TX and RX
+# pins must be wired together.
+
+try:
+    from machine import UART
+
+    UART.IRQ_RX
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+import time, sys
+
+byte_by_byte = False
+# Configure pins based on the target.
+if "esp32" in sys.platform:
+    uart_id = 1
+    tx_pin = 4
+    rx_pin = 5
+elif "pyboard" in sys.platform:
+    uart_id = 4
+    tx_pin = None  # PA0
+    rx_pin = None  # PA1
+elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
+    uart_id = 0
+    tx_pin = "D1"
+    rx_pin = "D0"
+    byte_by_byte = True
+elif "samd" in sys.platform and "ItsyBitsy M4" in sys.implementation._machine:
+    uart_id = 3
+    tx_pin = "D1"
+    rx_pin = "D0"
+elif "nrf" in sys.platform:
+    uart_id = 0
+    tx_pin = None
+    rx_pin = None
+elif "renesas-ra" in sys.platform:
+    uart_id = 9
+    tx_pin = None  # P602 @ RA6M2
+    rx_pin = None  # P601 @ RA6M2
+elif "CC3200" in sys.implementation._machine:
+    # CC3200 doesn't work because it's too slow and has an allocation error in the handler.
+    print("SKIP")
+    raise SystemExit
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def irq(u):
+    print("IRQ_RX:", bool(u.irq().flags() & u.IRQ_RX), "data:", u.read(1))
+
+
+text = "1234"
+
+# Test that the IRQ is called for each byte received.
+# Use slow baudrates so that the IRQ has time to run.
+for bits_per_s in (2400, 9600):
+    if tx_pin is None:
+        uart = UART(uart_id, bits_per_s)
+    else:
+        uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
+
+    uart.irq(irq, uart.IRQ_RX)
+
+    print("write", bits_per_s)
+    if byte_by_byte:
+        # slow devices need data to be sent slow
+        for c in text:
+            uart.write(c)
+            uart.flush()
+    else:
+        uart.write(text)
+        uart.flush()
+    time.sleep_ms(100)
+    print("done")
diff --git a/tests/extmod_hardware/machine_uart_irq_rx.py.exp b/tests/extmod_hardware/machine_uart_irq_rx.py.exp
new file mode 100644
index 0000000000000..945b1e508fa7c
--- /dev/null
+++ b/tests/extmod_hardware/machine_uart_irq_rx.py.exp
@@ -0,0 +1,12 @@
+write 2400
+IRQ_RX: True data: b'1'
+IRQ_RX: True data: b'2'
+IRQ_RX: True data: b'3'
+IRQ_RX: True data: b'4'
+done
+write 9600
+IRQ_RX: True data: b'1'
+IRQ_RX: True data: b'2'
+IRQ_RX: True data: b'3'
+IRQ_RX: True data: b'4'
+done
diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py b/tests/extmod_hardware/machine_uart_irq_rxidle.py
new file mode 100644
index 0000000000000..182ab24ebe0c4
--- /dev/null
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py
@@ -0,0 +1,70 @@
+# Test machine.UART.IRQ_RXIDLE firing after a set of characters are received.
+#
+# IMPORTANT: This test requires hardware connections: the UART TX and RX
+# pins must be wired together.
+
+try:
+    from machine import UART
+
+    UART.IRQ_RXIDLE
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+import time, sys
+
+# Configure pins based on the target.
+if "esp32" in sys.platform:
+    uart_id = 1
+    tx_pin = 4
+    rx_pin = 5
+elif "mimxrt" in sys.platform:
+    uart_id = 1
+    tx_pin = None
+elif "pyboard" in sys.platform:
+    uart_id = 4
+    tx_pin = None  # PA0
+    rx_pin = None  # PA1
+elif "renesas-ra" in sys.platform:
+    uart_id = 9
+    tx_pin = None  # P602 @ RA6M2
+    rx_pin = None  # P601 @ RA6M2
+elif "rp2" in sys.platform:
+    uart_id = 0
+    tx_pin = "GPIO0"
+    rx_pin = "GPIO1"
+elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
+    uart_id = 0
+    tx_pin = "D1"
+    rx_pin = "D0"
+    byte_by_byte = True
+elif "samd" in sys.platform and "ItsyBitsy M4" in sys.implementation._machine:
+    uart_id = 3
+    tx_pin = "D1"
+    rx_pin = "D0"
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def irq(u):
+    print("IRQ_RXIDLE:", bool(u.irq().flags() & u.IRQ_RXIDLE), "data:", u.read())
+
+
+text = "12345678"
+
+# Test that the IRQ is called for each set of byte received.
+for bits_per_s in (2400, 9600, 115200):
+    if tx_pin is None:
+        uart = UART(uart_id, bits_per_s)
+    else:
+        uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
+
+    uart.irq(irq, uart.IRQ_RXIDLE)
+
+    print("write", bits_per_s)
+    uart.write(text)
+    uart.flush()
+    print("ready")
+    time.sleep_ms(100)
+    print("done")
diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py.exp b/tests/extmod_hardware/machine_uart_irq_rxidle.py.exp
new file mode 100644
index 0000000000000..ce1890a06a4b2
--- /dev/null
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py.exp
@@ -0,0 +1,12 @@
+write 2400
+ready
+IRQ_RXIDLE: True data: b'12345678'
+done
+write 9600
+ready
+IRQ_RXIDLE: True data: b'12345678'
+done
+write 115200
+ready
+IRQ_RXIDLE: True data: b'12345678'
+done

From a89ac9e24a566e45bd3ffa7ef9e61e1d994616ea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Apr 2024 16:50:26 +1000
Subject: [PATCH 1371/3129] lib/lwip: Update lwIP to STABLE-2_2_0_RELEASE.

This updates lwIP from STABLE-2_1_3_RELEASE, which was released in November
2021.  The latest STABLE-2_2_0_RELEASE was released in September 2023.

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 6ca936f6b588c..0a0452b2c39bd 160000
--- a/lib/lwip
+++ b/lib/lwip
@@ -1 +1 @@
-Subproject commit 6ca936f6b588cee702c638eee75c2436e6cf75de
+Subproject commit 0a0452b2c39bdd91e252aef045c115f88f6ca773

From 664dd7b54a220ba6081a8a2d28103cdd1c74b034 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Apr 2024 16:50:52 +1000
Subject: [PATCH 1372/3129] extmod: Update make and cmake scripts to work with
 latest lwIP.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake | 3 +++
 extmod/extmod.mk    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 60f1a23ad6b22..69ee0e3ae460d 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -275,11 +275,14 @@ if(MICROPY_PY_LWIP)
     target_sources(micropy_lib_lwip INTERFACE
         ${MICROPY_DIR}/shared/netutils/netutils.c
         ${MICROPY_LIB_LWIP_DIR}/apps/mdns/mdns.c
+        ${MICROPY_LIB_LWIP_DIR}/apps/mdns/mdns_domain.c
+        ${MICROPY_LIB_LWIP_DIR}/apps/mdns/mdns_out.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/acd.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
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index c2298bc52130f..3bed5961f87c2 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -332,6 +332,8 @@ $(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 \
+	apps/mdns/mdns_domain.c \
+	apps/mdns/mdns_out.c \
 	core/def.c \
 	core/dns.c \
 	core/inet_chksum.c \
@@ -349,6 +351,7 @@ SRC_THIRDPARTY_C += $(addprefix $(LWIP_DIR)/,\
 	core/tcp_out.c \
 	core/timeouts.c \
 	core/udp.c \
+	core/ipv4/acd.c \
 	core/ipv4/autoip.c \
 	core/ipv4/dhcp.c \
 	core/ipv4/etharp.c \

From bc952d37fe957adf0165b3403a97d5ada7e8e1a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Mar 2024 17:09:51 +1100
Subject: [PATCH 1373/3129] extmod/network_ppp_lwip: Add network.PPP via lwIP.

This commit adds a new `network.PPP` interface which works on any port that
has bare-metal lwIP, eg rp2, stm32, mimxrt.

It has been tested on stm32.  A board needs to enable
`MICROPY_PY_NETWORK_PPP_LWIP` and then it can use it as follows:

    import network

    ppp = network.PPP(uart)
    ppp.connect()

    while not ppp.isconnected():
        pass

    # use `socket` module as usual, etc

    ppp.disconnect()

Usually the application must first configure the cellular/etc UART link to
get it connected and in to PPP mode first (eg ATD*99#), before handing over
control to `network.PPP`.

The PPP interface automatically configures the UART IRQ callback to call
PPP.poll() on incoming data.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake       |  27 ++++
 extmod/extmod.mk          |  27 ++++
 extmod/modnetwork.c       |   4 +
 extmod/modnetwork.h       |   4 +
 extmod/network_ppp_lwip.c | 326 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 388 insertions(+)
 create mode 100644 extmod/network_ppp_lwip.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 69ee0e3ae460d..98e8a84608a56 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -49,6 +49,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/network_cyw43.c
     ${MICROPY_EXTMOD_DIR}/network_lwip.c
     ${MICROPY_EXTMOD_DIR}/network_ninaw10.c
+    ${MICROPY_EXTMOD_DIR}/network_ppp_lwip.c
     ${MICROPY_EXTMOD_DIR}/network_wiznet5k.c
     ${MICROPY_EXTMOD_DIR}/os_dupterm.c
     ${MICROPY_EXTMOD_DIR}/vfs.c
@@ -313,6 +314,32 @@ if(MICROPY_PY_LWIP)
         ${MICROPY_LIB_LWIP_DIR}/core/timeouts.c
         ${MICROPY_LIB_LWIP_DIR}/core/udp.c
         ${MICROPY_LIB_LWIP_DIR}/netif/ethernet.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/auth.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/ccp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/chap-md5.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/chap_ms.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/chap-new.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/demand.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/eap.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/ecp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/eui64.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/fsm.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/ipcp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/ipv6cp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/lcp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/magic.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/mppe.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/multilink.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/polarssl/md5.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/pppapi.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/ppp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/pppcrypt.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/pppoe.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/pppol2tp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/pppos.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/upap.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/utils.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ppp/vj.c
     )
 
     list(APPEND MICROPY_INC_CORE
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 3bed5961f87c2..c132fd89ce887 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -51,6 +51,7 @@ SRC_EXTMOD_C += \
 	extmod/network_esp_hosted.c \
 	extmod/network_lwip.c \
 	extmod/network_ninaw10.c \
+	extmod/network_ppp_lwip.c \
 	extmod/network_wiznet5k.c \
 	extmod/os_dupterm.c \
 	extmod/vfs.c \
@@ -370,6 +371,32 @@ SRC_THIRDPARTY_C += $(addprefix $(LWIP_DIR)/,\
 	core/ipv6/mld6.c \
 	core/ipv6/nd6.c \
 	netif/ethernet.c \
+	netif/ppp/auth.c \
+	netif/ppp/ccp.c \
+	netif/ppp/chap-md5.c \
+	netif/ppp/chap_ms.c \
+	netif/ppp/chap-new.c \
+	netif/ppp/demand.c \
+	netif/ppp/eap.c \
+	netif/ppp/ecp.c \
+	netif/ppp/eui64.c \
+	netif/ppp/fsm.c \
+	netif/ppp/ipcp.c \
+	netif/ppp/ipv6cp.c \
+	netif/ppp/lcp.c \
+	netif/ppp/magic.c \
+	netif/ppp/mppe.c \
+	netif/ppp/multilink.c \
+	netif/ppp/polarssl/md5.c \
+	netif/ppp/pppapi.c \
+	netif/ppp/ppp.c \
+	netif/ppp/pppcrypt.c \
+	netif/ppp/pppoe.c \
+	netif/ppp/pppol2tp.c \
+	netif/ppp/pppos.c \
+	netif/ppp/upap.c \
+	netif/ppp/utils.c \
+	netif/ppp/vj.c \
 	)
 ifeq ($(MICROPY_PY_LWIP_LOOPBACK),1)
 CFLAGS_EXTMOD += -DLWIP_NETIF_LOOPBACK=1
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index f3d7d0faa8e1d..336836b6b8694 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -156,6 +156,10 @@ static const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&mod_network_ipconfig_obj) },
     #endif
 
+    #if MICROPY_PY_NETWORK_PPP_LWIP
+    { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&mp_network_ppp_lwip_type) },
+    #endif
+
     // Defined per port in mpconfigport.h
     #ifdef MICROPY_PORT_NETWORK_INTERFACES
     { MP_ROM_QSTR(MP_QSTR_route), MP_ROM_PTR(&network_route_obj) },
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 1a4aa7797e455..7e5a283353724 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -72,6 +72,10 @@ mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args);
 
 #include "lwip/init.h"
 
+#if MICROPY_PY_NETWORK_PPP_LWIP
+extern const struct _mp_obj_type_t mp_network_ppp_lwip_type;
+#endif
+
 struct netif;
 void mod_network_lwip_init(void);
 void mod_network_lwip_poll_wrapper(uint32_t ticks_ms);
diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
new file mode 100644
index 0000000000000..2b77662a24f26
--- /dev/null
+++ b/extmod/network_ppp_lwip.c
@@ -0,0 +1,326 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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/stream.h"
+#include "extmod/modnetwork.h"
+
+#if MICROPY_PY_NETWORK_PPP_LWIP
+
+#include "lwip/dns.h"
+#include "netif/ppp/ppp.h"
+#include "netif/ppp/pppapi.h"
+#include "netif/ppp/pppos.h"
+
+// Enable this to see the serial data going between the PPP layer.
+#define PPP_TRACE_IN_OUT (0)
+
+typedef enum {
+    STATE_INACTIVE,
+    STATE_ACTIVE,
+    STATE_ERROR,
+    STATE_CONNECTING,
+    STATE_CONNECTED,
+} network_ppp_state_t;
+
+typedef struct _network_ppp_obj_t {
+    mp_obj_base_t base;
+    network_ppp_state_t state;
+    int error_code;
+    mp_obj_t stream;
+    ppp_pcb *pcb;
+    struct netif netif;
+} network_ppp_obj_t;
+
+const mp_obj_type_t mp_network_ppp_lwip_type;
+
+static mp_obj_t network_ppp___del__(mp_obj_t self_in);
+
+static void network_ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
+    network_ppp_obj_t *self = ctx;
+    switch (err_code) {
+        case PPPERR_NONE:
+            self->state = STATE_CONNECTED;
+            break;
+        case PPPERR_USER:
+            if (self->state >= STATE_ERROR) {
+                // Disable UART IRQ.
+                mp_obj_t dest[3];
+                mp_load_method(self->stream, MP_QSTR_irq, dest);
+                dest[2] = mp_const_none;
+                mp_call_method_n_kw(1, 0, dest);
+                // Indicate that the IRQ is disabled.
+                self->state = STATE_ACTIVE;
+            }
+            // Clean up the PPP PCB.
+            network_ppp___del__(MP_OBJ_FROM_PTR(self));
+            break;
+        default:
+            self->state = STATE_ERROR;
+            self->error_code = err_code;
+            break;
+    }
+}
+
+static mp_obj_t network_ppp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    mp_obj_t stream = all_args[0];
+
+    mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+
+    network_ppp_obj_t *self = mp_obj_malloc_with_finaliser(network_ppp_obj_t, type);
+    self->state = STATE_INACTIVE;
+    self->stream = stream;
+    self->pcb = NULL;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static mp_obj_t network_ppp___del__(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->state >= STATE_ACTIVE) {
+        if (self->state >= STATE_ERROR) {
+            // Still connected over the UART stream.
+            // Force the connection to close, with nocarrier=1.
+            self->state = STATE_INACTIVE;
+            ppp_close(self->pcb, 1);
+        }
+        // Free PPP PCB and reset state.
+        self->state = STATE_INACTIVE;
+        ppp_free(self->pcb);
+        self->pcb = NULL;
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp___del___obj, network_ppp___del__);
+
+static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (self->state <= STATE_ERROR) {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EPERM);
+    }
+
+    mp_int_t total_len = 0;
+    for (;;) {
+        uint8_t buf[256];
+        int err;
+        mp_uint_t len = mp_stream_rw(self->stream, buf, sizeof(buf), &err, 0);
+        if (len == 0) {
+            break;
+        }
+        #if PPP_TRACE_IN_OUT
+        mp_printf(&mp_plat_print, "ppp_in(n=%u,data=", len);
+        for (size_t i = 0; i < len; ++i) {
+            mp_printf(&mp_plat_print, "%02x:", buf[i]);
+        }
+        mp_printf(&mp_plat_print, ")\n");
+        #endif
+        pppos_input(self->pcb, (u8_t *)buf, len);
+        total_len += len;
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(total_len);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ppp_poll_obj, 1, 2, network_ppp_poll);
+
+static mp_obj_t network_ppp_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"));
+    }
+    // network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (kwargs->used != 0) {
+        for (size_t i = 0; i < kwargs->alloc; i++) {
+            if (mp_map_slot_is_filled(kwargs, i)) {
+                switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    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 (mp_obj_str_get_qstr(args[1])) {
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+    }
+
+    return val;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_ppp_config_obj, 1, network_ppp_config);
+
+static mp_obj_t network_ppp_status(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->state == STATE_ERROR) {
+        return MP_OBJ_NEW_SMALL_INT(-self->error_code);
+    } else {
+        return MP_OBJ_NEW_SMALL_INT(self->state);
+    }
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp_status_obj, network_ppp_status);
+
+static u32_t network_ppp_output_callback(ppp_pcb *pcb, const void *data, u32_t len, void *ctx) {
+    network_ppp_obj_t *self = ctx;
+    #if PPP_TRACE_IN_OUT
+    mp_printf(&mp_plat_print, "ppp_out(n=%u,data=", len);
+    for (size_t i = 0; i < len; ++i) {
+        mp_printf(&mp_plat_print, "%02x:", ((const uint8_t *)data)[i]);
+    }
+    mp_printf(&mp_plat_print, ")\n");
+    #endif
+    int err;
+    // The return value from this output callback is the number of bytes written out.
+    // If it's less than the requested number of bytes then lwIP will propagate out an error.
+    return mp_stream_rw(self->stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);
+}
+
+static mp_obj_t network_ppp_connect(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    enum { ARG_security, ARG_user, ARG_key };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PPPAUTHTYPE_NONE} },
+        { MP_QSTR_user, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    mp_arg_val_t parsed_args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, parsed_args);
+
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (self->state == STATE_INACTIVE) {
+        self->pcb = pppos_create(&self->netif, network_ppp_output_callback, network_ppp_status_cb, self);
+        if (self->pcb == NULL) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("pppos_create failed"));
+        }
+        self->state = STATE_ACTIVE;
+
+        // Enable UART IRQ to call PPP.poll() when incoming data is ready.
+        mp_obj_t dest[4];
+        mp_load_method(self->stream, MP_QSTR_irq, dest);
+        dest[2] = mp_obj_new_bound_meth(MP_OBJ_FROM_PTR(&network_ppp_poll_obj), MP_OBJ_FROM_PTR(self));
+        dest[3] = mp_load_attr(self->stream, MP_QSTR_IRQ_RXIDLE);
+        mp_call_method_n_kw(2, 0, dest);
+    }
+
+    if (self->state == STATE_CONNECTING || self->state == STATE_CONNECTED) {
+        mp_raise_OSError(MP_EALREADY);
+    }
+
+    switch (parsed_args[ARG_security].u_int) {
+        case PPPAUTHTYPE_NONE:
+        case PPPAUTHTYPE_PAP:
+        case PPPAUTHTYPE_CHAP:
+            break;
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid auth"));
+    }
+
+    if (parsed_args[ARG_security].u_int != PPPAUTHTYPE_NONE) {
+        const char *user_str = mp_obj_str_get_str(parsed_args[ARG_user].u_obj);
+        const char *key_str = mp_obj_str_get_str(parsed_args[ARG_key].u_obj);
+        ppp_set_auth(self->pcb, parsed_args[ARG_security].u_int, user_str, key_str);
+    }
+
+    netif_set_default(self->pcb->netif);
+    ppp_set_usepeerdns(self->pcb, true);
+
+    if (ppp_connect(self->pcb, 0) != ERR_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ppp_connect failed"));
+    }
+
+    self->state = STATE_CONNECTING;
+
+    // Do a poll in case there is data waiting on the input stream.
+    network_ppp_poll(1, args);
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_ppp_connect_obj, 1, network_ppp_connect);
+
+static mp_obj_t network_ppp_disconnect(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->state == STATE_CONNECTING || self->state == STATE_CONNECTED) {
+        // Initiate close and wait for PPPERR_USER callback.
+        ppp_close(self->pcb, 0);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp_disconnect_obj, network_ppp_disconnect);
+
+static mp_obj_t network_ppp_isconnected(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(self->state == STATE_CONNECTED);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp_isconnected_obj, network_ppp_isconnected);
+
+static mp_obj_t network_ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
+    network_ppp_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(network_ppp_ifconfig_obj, 1, 2, network_ppp_ifconfig);
+
+static mp_obj_t network_ppp_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    return mod_network_nic_ipconfig(&self->netif, n_args - 1, args + 1, kwargs);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_ppp_ipconfig_obj, 1, network_ppp_ipconfig);
+
+static const mp_rom_map_elem_t network_ppp_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&network_ppp___del___obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&network_ppp_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&network_ppp_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&network_ppp_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&network_ppp_disconnect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&network_ppp_isconnected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&network_ppp_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&network_ppp_ipconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&network_ppp_poll_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_SEC_NONE), MP_ROM_INT(PPPAUTHTYPE_NONE) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_PAP), MP_ROM_INT(PPPAUTHTYPE_PAP) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_CHAP), MP_ROM_INT(PPPAUTHTYPE_CHAP) },
+};
+static MP_DEFINE_CONST_DICT(network_ppp_locals_dict, network_ppp_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_network_ppp_lwip_type,
+    MP_QSTR_PPP,
+    MP_TYPE_FLAG_NONE,
+    make_new, network_ppp_make_new,
+    locals_dict, &network_ppp_locals_dict
+    );
+
+#endif

From a5cc4d46237bf5c905bdddd0a117b8fea35b7f7d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Mar 2024 09:27:16 +1100
Subject: [PATCH 1374/3129] stm32: Integrate optional network.PPP.

Can be enabled by a board by enabling `MICROPY_PY_NETWORK_PPP_LWIP`.

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

diff --git a/ports/stm32/lwip_inc/lwipopts.h b/ports/stm32/lwip_inc/lwipopts.h
index f641cf515add2..b779b558c9ec7 100644
--- a/ports/stm32/lwip_inc/lwipopts.h
+++ b/ports/stm32/lwip_inc/lwipopts.h
@@ -1,7 +1,7 @@
 #ifndef MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H
 #define MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H
 
-#include <stdint.h>
+#include "py/mpconfig.h"
 
 // This protection is not needed, instead we execute all lwIP code at PendSV priority
 #define SYS_ARCH_DECL_PROTECT(lev) do { } while (0)
@@ -36,6 +36,12 @@
 #define LWIP_MDNS_RESPONDER             1
 #define LWIP_IGMP                       1
 
+#if MICROPY_PY_LWIP_PPP
+#define PPP_SUPPORT                     1
+#define PAP_SUPPORT                     1
+#define CHAP_SUPPORT                    1
+#endif
+
 #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)
@@ -77,4 +83,7 @@ extern uint32_t rng_get(void);
 
 typedef uint32_t sys_prot_t;
 
+// Needed for PPP.
+#define sys_jiffies sys_now
+
 #endif // MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 25fc9e11f9d68..c6ba83d1bd293 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -106,6 +106,7 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modtime.c"
+#define MICROPY_PY_LWIP_PPP         (MICROPY_PY_NETWORK_PPP_LWIP)
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)

From c94a3205b044fb27fa703d5c280fb02a094f12e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Aug 2024 17:47:46 +1000
Subject: [PATCH 1375/3129] stm32/machine_uart: Allow changing only the
 baudrate.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 277ae67ef2c54..9bd4c5e012527 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -154,6 +154,12 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         { MP_QSTR_read_buf_len, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} }, // legacy
     };
 
+    if (self->is_enabled && n_args == 1 && kw_args->used == 0) {
+        // Only change the baudrate if that's all that is given.
+        uart_set_baudrate(self, mp_obj_get_int(pos_args[0]));
+        return;
+    }
+
     // parse args
     struct {
         mp_arg_val_t baudrate, bits, parity, stop, flow, timeout, timeout_char, rxbuf, read_buf_len;

From d8b033776e59dad8cc32d7381e0186b7677440c0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Aug 2024 17:48:13 +1000
Subject: [PATCH 1376/3129] stm32/machine_uart: Return number of bytes written
 even with timeout.

The errcode should be cleared so the caller sees a successful write, even
if it's a short write.

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

diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 9bd4c5e012527..6be6bcdac1a12 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -533,6 +533,7 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
 
     if (*errcode == 0 || *errcode == MP_ETIMEDOUT) {
         // return number of bytes written, even if there was a timeout
+        *errcode = 0;
         return num_tx << self->char_width;
     } else {
         return MP_STREAM_ERROR;

From a1a16ffd75e1cc5ca977a3d799d5c7de0da5e585 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Aug 2024 17:48:33 +1000
Subject: [PATCH 1377/3129] stm32/uart: Use timeout_char even with CTS enabled.

When timeout=0 (non-blocking mode) the UART should still wait for each
character to go out.  Otherwise non-blocking mode with CTS enabled is
useless because it can only write one character at a time.

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

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 886cf1ab340ba..855f44f0f2345 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -1069,26 +1069,20 @@ size_t uart_tx_data(machine_uart_obj_t *self, const void *src_in, size_t num_cha
     }
 
     uint32_t timeout;
-    if (self->uartx->CR3 & USART_CR3_CTSE) {
-        // CTS can hold off transmission for an arbitrarily long time. Apply
-        // the overall timeout rather than the character timeout.
-        timeout = self->timeout;
-    } else {
-        #if defined(STM32G4)
-        // With using UART FIFO, the timeout should be long enough that FIFO becomes empty.
-        // Since previous data transfer may be ongoing, the timeout must be multiplied
-        // timeout_char by FIFO size + 1.
-        // STM32G4 has 8 words FIFO.
-        timeout = (8 + 1) * self->timeout_char;
-        #else
-        // The timeout specified here is for waiting for the TX data register to
-        // become empty (ie between chars), as well as for the final char to be
-        // completely transferred.  The default value for timeout_char is long
-        // enough for 1 char, but we need to double it to wait for the last char
-        // to be transferred to the data register, and then to be transmitted.
-        timeout = 2 * self->timeout_char;
-        #endif
-    }
+    #if defined(STM32G4)
+    // With using UART FIFO, the timeout should be long enough that FIFO becomes empty.
+    // Since previous data transfer may be ongoing, the timeout must be multiplied
+    // timeout_char by FIFO size + 1.
+    // STM32G4 has 8 words FIFO.
+    timeout = (8 + 1) * self->timeout_char;
+    #else
+    // The timeout specified here is for waiting for the TX data register to
+    // become empty (ie between chars), as well as for the final char to be
+    // completely transferred.  The default value for timeout_char is long
+    // enough for 1 char, but we need to double it to wait for the last char
+    // to be transferred to the data register, and then to be transmitted.
+    timeout = 2 * self->timeout_char;
+    #endif
 
     const uint8_t *src = (const uint8_t *)src_in;
     size_t num_tx = 0;

From aee002dd80ad8829ae247950f784b1f145fb822e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Aug 2024 15:55:07 +1000
Subject: [PATCH 1378/3129] stm32/lwip_inc: Implement LWIP_PLATFORM_DIAG macro
 in terms of printf.

This allows enabling lwIP debugging output.  For example, to enable PPP
debugging add the following to `mpconfigboard.h`:

    #define LWIP_DEBUG 1
    #define PPP_DEBUG LWIP_DBG_ON

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/lwip_inc/arch/cc.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/lwip_inc/arch/cc.h b/ports/stm32/lwip_inc/arch/cc.h
index fc5230ef723ea..a818d6d6a0b61 100644
--- a/ports/stm32/lwip_inc/arch/cc.h
+++ b/ports/stm32/lwip_inc/arch/cc.h
@@ -2,7 +2,9 @@
 #define MICROPY_INCLUDED_STM32_LWIP_ARCH_CC_H
 
 #include <assert.h>
-#define LWIP_PLATFORM_DIAG(x)
+#include <stdio.h>
+
+#define LWIP_PLATFORM_DIAG(x)    do { printf x; } while (0)
 #define LWIP_PLATFORM_ASSERT(x)  { assert(1); }
 
 #define LWIP_NO_CTYPE_H 1

From 851aa06461fb5b25e52329021ccaa11008c0f77a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Aug 2024 16:59:42 +1000
Subject: [PATCH 1379/3129] rp2: Integrate optional network.PPP.

Can be enabled by a board by enabling `MICROPY_PY_NETWORK_PPP_LWIP`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/lwip_inc/lwipopts.h | 11 ++++++++++-
 ports/rp2/mpconfigport.h      |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/lwip_inc/lwipopts.h b/ports/rp2/lwip_inc/lwipopts.h
index 5f37ecdac2e9d..f42bea528e0a4 100644
--- a/ports/rp2/lwip_inc/lwipopts.h
+++ b/ports/rp2/lwip_inc/lwipopts.h
@@ -1,7 +1,7 @@
 #ifndef MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
 #define MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
 
-#include <stdint.h>
+#include "py/mpconfig.h"
 
 // This protection is not needed, instead protect lwIP code with flags
 #define SYS_ARCH_DECL_PROTECT(lev) do { } while (0)
@@ -38,6 +38,12 @@
 #define LWIP_MDNS_RESPONDER             1
 #define LWIP_IGMP                       1
 
+#if MICROPY_PY_LWIP_PPP
+#define PPP_SUPPORT                     1
+#define PAP_SUPPORT                     1
+#define CHAP_SUPPORT                    1
+#endif
+
 #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)
@@ -57,4 +63,7 @@ extern uint32_t rosc_random_u32(void);
 
 typedef uint32_t sys_prot_t;
 
+// Needed for PPP.
+#define sys_jiffies sys_now
+
 #endif // MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index a428721d763da..49acafe239b9d 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -155,6 +155,7 @@
 #define MICROPY_VFS_LFS2                        (1)
 #define MICROPY_VFS_FAT                         (1)
 #define MICROPY_SSL_MBEDTLS                     (1)
+#define MICROPY_PY_LWIP_PPP                     (MICROPY_PY_NETWORK_PPP_LWIP)
 #define MICROPY_PY_LWIP_SOCK_RAW                (MICROPY_PY_LWIP)
 
 // Hardware timer alarm index. Available range 0-3.

From 35b6a66b0b0ea00ad6b4e83f2dcbeffc349f2b04 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Aug 2024 17:28:48 +1000
Subject: [PATCH 1380/3129] docs/library: Document the network.PPP class.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/network.PPP.rst | 98 ++++++++++++++++++++++++++++++++++++
 docs/library/network.rst     |  1 +
 2 files changed, 99 insertions(+)
 create mode 100644 docs/library/network.PPP.rst

diff --git a/docs/library/network.PPP.rst b/docs/library/network.PPP.rst
new file mode 100644
index 0000000000000..85f580ce540ed
--- /dev/null
+++ b/docs/library/network.PPP.rst
@@ -0,0 +1,98 @@
+.. currentmodule:: network
+.. _network.PPP:
+
+class PPP -- create network connections over serial PPP
+=======================================================
+
+This class allows you to create a network connection over a serial port using
+the PPP protocol.  It is only available on selected ports and boards.
+
+Example usage::
+
+    import network
+
+    ppp = network.PPP(uart)
+    ppp.connect()
+
+    while not ppp.isconnected():
+        pass
+
+    print(ppp.ipconfig("addr4"))
+
+    # use the socket module as usual, etc
+
+    ppp.disconnect()
+
+Constructors
+------------
+
+.. class:: PPP(stream)
+
+   Create a PPP driver object.
+
+   Arguments are:
+
+     - *stream* is any object that supports the stream protocol, but is most commonly a
+       :class:`machine.UART` instance.  This stream object must have an ``irq()`` method
+       and an ``IRQ_RXIDLE`` constant, for use by `PPP.connect`.
+
+Methods
+-------
+
+.. method:: PPP.connect(security=SEC_NONE, user=None, key=None)
+
+   Initiate a PPP connection with the given parameters:
+
+     - *security* is the type of security, either ``PPP.SEC_NONE``, ``PPP.SEC_PAP``,
+       or ``PPP.SEC_CHAP``.
+     - *user* is an optional user name to use with the security mode.
+     - *key* is an optional password to use with the security mode.
+
+   When this method is called the underlying stream has its interrupt configured to call
+   `PPP.poll` via ``stream.irq(ppp.poll, stream.IRQ_RXIDLE)``.  This makes sure the
+   stream is polled, and data passed up the PPP stack, wheverver data becomes available
+   on the stream.
+
+   The connection proceeds asynchronously, in the background.
+
+.. method:: PPP.disconnect()
+
+   Terminate the connection.  This must be called to cleanly close the PPP connection.
+
+.. method:: PPP.isconnected()
+
+   Returns ``True`` if the PPP link is connected and up.
+   Returns ``False`` otherwise.
+
+.. method:: PPP.status()
+
+   Returns the PPP status.
+
+.. method:: PPP.config(config_parameters)
+
+   Sets or gets parameters of the PPP interface. There are currently no parameter that
+   can be set or retrieved.
+
+.. method:: PPP.ipconfig('param')
+            PPP.ipconfig(param=value, ...)
+
+   See `AbstractNIC.ipconfig`.
+
+.. method:: PPP.ifconfig([(ip, subnet, gateway, dns)])
+
+   See `AbstractNIC.ifconfig`.
+
+.. method:: PPP.poll()
+
+   Poll the underlying stream for data, and pass it up the PPP stack.
+   This is called automatically if the stream is a UART with a RXIDLE interrupt,
+   so it's not usually necessary to call it manually.
+
+Constants
+---------
+
+.. data:: PPP.SEC_NONE
+          PPP.SEC_PAP
+          PPP.SEC_CHAP
+
+    The type of connection security.
diff --git a/docs/library/network.rst b/docs/library/network.rst
index 6a436fa85e052..d05d17132dc67 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -192,6 +192,7 @@ provide a way to control networking interfaces of various kinds.
    network.WLANWiPy.rst
    network.WIZNET5K.rst
    network.LAN.rst
+   network.PPP.rst
 
 Network functions
 =================

From 1f5cab9edbd121e2d6338fa14bb7b2572dfe7d90 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 15 Aug 2022 14:21:47 +1000
Subject: [PATCH 1381/3129] stm32: Add option to put ISR, flash and UART code
 in RAM.

This allows UART RX to function while flash erase/writes operations are
under way, preventing lost serial data so long as it fits in the UART RX
buffer.

This enables (among other things) mpremote to successfully copy files to
boards that use a UART REPL.

Enable via the following option placed in `mpconfigboard.mk`:

    MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/Makefile                          | 18 +++++++---
 ports/stm32/boards/PYBD_SF2/f722_qspi.ld      |  1 -
 ports/stm32/boards/PYBD_SF6/f767.ld           |  1 -
 ports/stm32/boards/STM32F769DISC/f769_qspi.ld |  1 +
 ports/stm32/boards/common_basic.ld            |  1 +
 ports/stm32/boards/common_bl.ld               |  1 +
 ports/stm32/boards/common_blifs.ld            |  1 +
 ports/stm32/boards/common_ifs.ld              | 28 ++-------------
 .../stm32/boards/common_isr_ram/common_isr.ld | 36 +++++++++++++++++++
 .../common_isr_ram/common_isr_extratext.ld    |  0
 .../boards/{ => common_isr_rom}/common_isr.ld |  2 +-
 .../common_isr_rom/common_isr_extratext.ld    | 24 +++++++++++++
 ports/stm32/boards/stm32f401xd.ld             |  2 +-
 ports/stm32/boards/stm32f401xe.ld             |  2 +-
 ports/stm32/boards/stm32f405.ld               |  2 +-
 ports/stm32/boards/stm32f411.ld               |  2 +-
 ports/stm32/boards/stm32f412zx.ld             |  2 +-
 ports/stm32/boards/stm32f413xg.ld             |  2 +-
 ports/stm32/boards/stm32f413xh.ld             |  2 +-
 ports/stm32/boards/stm32f427xi.ld             |  2 +-
 ports/stm32/boards/stm32f429.ld               |  2 +-
 ports/stm32/boards/stm32f439.ld               |  2 +-
 ports/stm32/boards/stm32f722.ld               |  2 +-
 ports/stm32/boards/stm32f746.ld               |  2 +-
 ports/stm32/boards/stm32f767.ld               |  2 +-
 ports/stm32/boards/stm32f769.ld               |  2 +-
 ports/stm32/boards/stm32h7b3.ld               |  2 +-
 ports/stm32/main.c                            | 13 ++++++-
 28 files changed, 109 insertions(+), 48 deletions(-)
 create mode 100644 ports/stm32/boards/common_isr_ram/common_isr.ld
 create mode 100644 ports/stm32/boards/common_isr_ram/common_isr_extratext.ld
 rename ports/stm32/boards/{ => common_isr_rom}/common_isr.ld (93%)
 create mode 100644 ports/stm32/boards/common_isr_rom/common_isr_extratext.ld

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 497e409c66563..806added49e9a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -143,7 +143,15 @@ CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
 CFLAGS += -fsingle-precision-constant
 endif
 
-LDFLAGS += -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Wl,-Map=$(@:.elf=.map) -Wl,--cref
+# Configure linker include dir for ram/rom isr support
+ifeq ($(MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM),1)
+CFLAGS += -DMICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM=1
+LD_ISR_DIR = boards/common_isr_ram
+else
+LD_ISR_DIR = boards/common_isr_rom
+endif
+
+LDFLAGS += -nostdlib -L $(LD_DIR) -L $(LD_ISR_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)"
 
@@ -465,7 +473,8 @@ OBJ += $(GEN_PINS_SRC:.c=.o)
 # 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.
+ifneq ($(MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM),1)
+# If MBOOT or RAM_IFS is not used 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.
@@ -474,6 +483,7 @@ $(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
+endif
 
 all: $(TOP)/lib/stm32lib/README.md all_main $(BUILD)/firmware.hex
 
@@ -557,7 +567,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 .ARM
+TEXT0_SECTIONS ?= .isr_vector .isr_extratext .text .data .ARM
 
 deploy-stlink: $(BUILD)/firmware.bin
 	$(call RUN_STLINK,$^,$(TEXT0_ADDR))
@@ -574,7 +584,7 @@ $(BUILD)/firmware.dfu: $(BUILD)/firmware.bin
 else
 # TEXT0_ADDR and TEXT1_ADDR are specified so split firmware between these locations
 
-TEXT0_SECTIONS ?= .isr_vector
+TEXT0_SECTIONS ?= .isr_vector .isr_extratext
 TEXT1_SECTIONS ?= .text .data .ARM
 
 deploy-stlink: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
diff --git a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
index 6ce4c74c3f34f..70d7f9cc4b8e4 100644
--- a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
+++ b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
@@ -19,7 +19,6 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 32K     /* sectors 0,1 */
     FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 480K    /* sectors 2-7 */
     FLASH_EXT (rx)  : ORIGIN = 0x90000000, LENGTH = 2048K   /* external QSPI */
     RAM (rwx)       : ORIGIN = 0x20000000, LENGTH = 256K    /* DTCM+SRAM1+SRAM2 */
diff --git a/ports/stm32/boards/PYBD_SF6/f767.ld b/ports/stm32/boards/PYBD_SF6/f767.ld
index 167d2c6a1e411..4262a48a9962c 100644
--- a/ports/stm32/boards/PYBD_SF6/f767.ld
+++ b/ports/stm32/boards/PYBD_SF6/f767.ld
@@ -17,7 +17,6 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 32K     /* sector 0, 32K */
     FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 2016K   /* sectors 1-11 3x32K 1*128K 7*256K */
     FLASH_EXT (rx)  : ORIGIN = 0x90000000, LENGTH = 2048K   /* external QSPI */
     RAM (rwx)       : ORIGIN = 0x20000000, LENGTH = 512K    /* DTCM=128k, SRAM1=368K, SRAM2=16K */
diff --git a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
index b6515b066691c..cde1ef5ca66cf 100644
--- a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
+++ b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
@@ -40,6 +40,7 @@ _heap_end = _sstack;
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_ISR", FLASH_APP);
 REGION_ALIAS("FLASH_COMMON", FLASH_APP);
 
 SECTIONS
diff --git a/ports/stm32/boards/common_basic.ld b/ports/stm32/boards/common_basic.ld
index 9916a4c2545d9..9c2afc3edca2b 100644
--- a/ports/stm32/boards/common_basic.ld
+++ b/ports/stm32/boards/common_basic.ld
@@ -12,6 +12,7 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_ISR", FLASH);
 REGION_ALIAS("FLASH_COMMON", FLASH);
 
 /* define output sections */
diff --git a/ports/stm32/boards/common_bl.ld b/ports/stm32/boards/common_bl.ld
index b17fe98743139..e2320be6f9380 100644
--- a/ports/stm32/boards/common_bl.ld
+++ b/ports/stm32/boards/common_bl.ld
@@ -12,6 +12,7 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_ISR", FLASH_APP);
 REGION_ALIAS("FLASH_COMMON", FLASH_APP);
 
 /* define output sections */
diff --git a/ports/stm32/boards/common_blifs.ld b/ports/stm32/boards/common_blifs.ld
index 51969e1f9067c..ec6caa0a61a5c 100644
--- a/ports/stm32/boards/common_blifs.ld
+++ b/ports/stm32/boards/common_blifs.ld
@@ -12,6 +12,7 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_ISR", FLASH_TEXT);
 REGION_ALIAS("FLASH_COMMON", FLASH_TEXT);
 
 /* define output sections */
diff --git a/ports/stm32/boards/common_ifs.ld b/ports/stm32/boards/common_ifs.ld
index 33fa948bb7f3d..47b0190c4ec98 100644
--- a/ports/stm32/boards/common_ifs.ld
+++ b/ports/stm32/boards/common_ifs.ld
@@ -13,36 +13,14 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_ISR", FLASH_START);
 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 */
-
-        /* This first flash block is 16K and the isr vectors only take up
-           about 400 bytes. So we pull in a couple of object files to pad it
-           out. */
-
-        . = ALIGN(4);
-
-        /* NOTE: If you update the list of files contained in .isr_vector,
-                 then be sure to also update smhal/Makefile where it forcibly
-           builds each of these files with -Os */
-
-        */ff.o(.text*)
-        */vfs_fat_*.o(.text*)
-        */py/formatfloat.o(.text*)
-        */py/parsenum.o(.text*)
-        */py/mpprint.o(.text*)
-
-        . = ALIGN(4);
-    } >FLASH_ISR
-
+    INCLUDE common_isr.ld
+    INCLUDE common_isr_extratext.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_ram/common_isr.ld b/ports/stm32/boards/common_isr_ram/common_isr.ld
new file mode 100644
index 0000000000000..7d8f9a64c28ca
--- /dev/null
+++ b/ports/stm32/boards/common_isr_ram/common_isr.ld
@@ -0,0 +1,36 @@
+/* This linker script fragment is intended to be included in SECTIONS. */
+
+/* The startup code goes first into FLASH */
+.isr_vector :
+{
+    . = ALIGN(4);
+    __isr_vector_ram_start = .;
+
+    KEEP(*(.isr_vector)) /* Startup code */
+
+    /* These functions need to run from ram to enable uart
+       reception during flash erase/write operations.
+       Defining them here ensures they're copied from
+       flash (in main.c) along with the isr_vector above.
+    */
+    . = ALIGN(4);
+    *(.text.pendsv_kbd_intr)
+    *(.text.pendsv_schedule_dispatch)
+    *(.text.storage_systick_callback)
+    *(.text.SysTick_Handler)
+    *(.text.uart_irq_handler)
+    *(.text.UART*_IRQHandler)
+    *(.text.USART*_IRQHandler)
+    *(.text.FLASH_PageErase)
+    *(.text.FLASH_SectorErase)
+    *(.text.FLASH_WaitForLastOperation)
+    *(.text.HAL_FLASHEx_Erase)
+    *(.text.HAL_GetTick)
+
+    __isr_vector_ram_end = .;
+    . = ALIGN(4);
+
+} >RAM AT >FLASH_ISR
+
+/* Used by the start-up code to initialise data */
+__isr_vector_flash_addr = LOADADDR(.isr_vector);
diff --git a/ports/stm32/boards/common_isr_ram/common_isr_extratext.ld b/ports/stm32/boards/common_isr_ram/common_isr_extratext.ld
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/stm32/boards/common_isr.ld b/ports/stm32/boards/common_isr_rom/common_isr.ld
similarity index 93%
rename from ports/stm32/boards/common_isr.ld
rename to ports/stm32/boards/common_isr_rom/common_isr.ld
index 0f9b8bcaaddfa..8d20acde78fbb 100644
--- a/ports/stm32/boards/common_isr.ld
+++ b/ports/stm32/boards/common_isr_rom/common_isr.ld
@@ -6,4 +6,4 @@
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-} >FLASH_COMMON
+} >FLASH_ISR
diff --git a/ports/stm32/boards/common_isr_rom/common_isr_extratext.ld b/ports/stm32/boards/common_isr_rom/common_isr_extratext.ld
new file mode 100644
index 0000000000000..cacd32043b70d
--- /dev/null
+++ b/ports/stm32/boards/common_isr_rom/common_isr_extratext.ld
@@ -0,0 +1,24 @@
+/* This linker script fragment is intended to be included in SECTIONS when
+   common_ifs.ld is used with common_isr.ld
+. */
+
+.isr_extratext :
+{
+    . = ALIGN(4);
+
+    /* This first flash block is 16K and the isr vectors only take up
+        about 400 bytes. So we pull in a couple of object files to pad it
+        out and save flash space in later blocks.
+
+        NOTE: If you update the list of files contained here in .isr_extratext
+        then be sure to also update stm32/Makefile where it builds each of
+        these files with -Os to keep this section as compact as possible.
+    */
+    */ff.o(.text*)
+    */vfs_fat_*.o(.text*)
+    */py/formatfloat.o(.text*)
+    */py/parsenum.o(.text*)
+    */py/mpprint.o(.text*)
+
+    . = ALIGN(4);
+} >FLASH_ISR
diff --git a/ports/stm32/boards/stm32f401xd.ld b/ports/stm32/boards/stm32f401xd.ld
index 33b2912acef72..06a62d79b33fc 100644
--- a/ports/stm32/boards/stm32f401xd.ld
+++ b/ports/stm32/boards/stm32f401xd.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 384K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     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 = 80K
diff --git a/ports/stm32/boards/stm32f401xe.ld b/ports/stm32/boards/stm32f401xe.ld
index d783cd187542c..54994ab905f56 100644
--- a/ports/stm32/boards/stm32f401xe.ld
+++ b/ports/stm32/boards/stm32f401xe.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     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 = 80K
diff --git a/ports/stm32/boards/stm32f405.ld b/ports/stm32/boards/stm32f405.ld
index 6658c1e99124d..792558b6371e0 100644
--- a/ports/stm32/boards/stm32f405.ld
+++ b/ports/stm32/boards/stm32f405.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 112K /* sectors 1,2,3,4 are for filesystem */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 896K /* sectors 5,6,7,8,9,10,11 */
     CCMRAM (xrw)    : ORIGIN = 0x10000000, LENGTH = 64K
diff --git a/ports/stm32/boards/stm32f411.ld b/ports/stm32/boards/stm32f411.ld
index 6e874f66c8cb6..ed78a7fe081b9 100644
--- a/ports/stm32/boards/stm32f411.ld
+++ b/ports/stm32/boards/stm32f411.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     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 = 112K
diff --git a/ports/stm32/boards/stm32f412zx.ld b/ports/stm32/boards/stm32f412zx.ld
index c949d827a6c59..b67f1c3e25353 100644
--- a/ports/stm32/boards/stm32f412zx.ld
+++ b/ports/stm32/boards/stm32f412zx.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     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 = 240K
diff --git a/ports/stm32/boards/stm32f413xg.ld b/ports/stm32/boards/stm32f413xg.ld
index cecfcaa881121..95c5ecb5e2f9c 100644
--- a/ports/stm32/boards/stm32f413xg.ld
+++ b/ports/stm32/boards/stm32f413xg.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (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 = 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*/
diff --git a/ports/stm32/boards/stm32f413xh.ld b/ports/stm32/boards/stm32f413xh.ld
index 0846b5c80fc09..911f496ab342f 100644
--- a/ports/stm32/boards/stm32f413xh.ld
+++ b/ports/stm32/boards/stm32f413xh.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1536K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (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 = 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*/
diff --git a/ports/stm32/boards/stm32f427xi.ld b/ports/stm32/boards/stm32f427xi.ld
index b405841609f81..d2f6967a5251f 100644
--- a/ports/stm32/boards/stm32f427xi.ld
+++ b/ports/stm32/boards/stm32f427xi.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH =   16K /* sector 0, 16 KiB */
+    FLASH_START (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
diff --git a/ports/stm32/boards/stm32f429.ld b/ports/stm32/boards/stm32f429.ld
index d081c190d318d..38458aff99836 100644
--- a/ports/stm32/boards/stm32f429.ld
+++ b/ports/stm32/boards/stm32f429.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0, 16 KiB */
+    FLASH_START (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
diff --git a/ports/stm32/boards/stm32f439.ld b/ports/stm32/boards/stm32f439.ld
index 64195368c1b1d..551f4ed18914e 100644
--- a/ports/stm32/boards/stm32f439.ld
+++ b/ports/stm32/boards/stm32f439.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
+    FLASH_START (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 = 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) */
diff --git a/ports/stm32/boards/stm32f722.ld b/ports/stm32/boards/stm32f722.ld
index 0520f2e95fb27..1e33295bc0d77 100644
--- a/ports/stm32/boards/stm32f722.ld
+++ b/ports/stm32/boards/stm32f722.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K     /* sector 0, 16K */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 16K     /* sector 0, 16K */
     FLASH_FS (r)    : ORIGIN = 0x08004000, LENGTH = 112K    /* sectors 1-4 3*16KiB 1*64KiB*/
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 384K    /* sectors 5-7 3*128KiB = 384K */
     DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K     /* Used for storage cache */
diff --git a/ports/stm32/boards/stm32f746.ld b/ports/stm32/boards/stm32f746.ld
index 854b95463aa89..f6f33ed170aa6 100644
--- a/ports/stm32/boards/stm32f746.ld
+++ b/ports/stm32/boards/stm32f746.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 32K     /* sector 0, 32K */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 32K     /* sector 0, 32K */
     FLASH_FS (r)    : ORIGIN = 0x08008000, LENGTH = 96K     /* sectors 1, 2, 3 (32K each) */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 896K    /* sectors 4-7 1*128Kib 3*256KiB = 896K */
     DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K     /* Used for storage cache */
diff --git a/ports/stm32/boards/stm32f767.ld b/ports/stm32/boards/stm32f767.ld
index 580be50dc9b42..6c027a5840726 100644
--- a/ports/stm32/boards/stm32f767.ld
+++ b/ports/stm32/boards/stm32f767.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 32K     /* sector 0, 32K */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 32K     /* sector 0, 32K */
     FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 2016K   /* sectors 1-11 3x32K 1*128K 7*256K */
     FLASH_FS (r)    : ORIGIN = 0x08008000, LENGTH = 96K     /* sectors 1, 2, 3 (32K each) */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 896K    /* sectors 4-7 1*128Kib 3*256KiB = 896K */
diff --git a/ports/stm32/boards/stm32f769.ld b/ports/stm32/boards/stm32f769.ld
index 9fc73c85969c9..35b1668b733d4 100644
--- a/ports/stm32/boards/stm32f769.ld
+++ b/ports/stm32/boards/stm32f769.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 32K     /* sector 0, 32K */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 32K     /* sector 0, 32K */
     FLASH_FS (r)    : ORIGIN = 0x08008000, LENGTH = 96K     /* sectors 1, 2, 3 (32K each) */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 896K    /* sectors 4-7 1*128Kib 3*256KiB = 896K */
     DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K    /* Used for storage cache */
diff --git a/ports/stm32/boards/stm32h7b3.ld b/ports/stm32/boards/stm32h7b3.ld
index 83a261029fb8b..d9404f3d3d517 100644
--- a/ports/stm32/boards/stm32h7b3.ld
+++ b/ports/stm32/boards/stm32h7b3.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 128K    /* sector 0, 128K */
+    FLASH_START (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 */
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 90a62c024427e..df483602dc901 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -303,10 +303,21 @@ void stm32_main(uint32_t reset_mode) {
     // Low-level MCU initialisation.
     stm32_system_init();
 
-    #if !defined(STM32F0) && defined(MICROPY_HW_VTOR)
+    #if !defined(STM32F0)
+    #if MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM
+    // Copy IRQ vector table to RAM and point VTOR there
+    extern uint32_t __isr_vector_flash_addr, __isr_vector_ram_start, __isr_vector_ram_end;
+    size_t __isr_vector_size = (&__isr_vector_ram_end - &__isr_vector_ram_start) * sizeof(uint32_t);
+    memcpy(&__isr_vector_ram_start, &__isr_vector_flash_addr, __isr_vector_size);
+    SCB->VTOR = (uint32_t)&__isr_vector_ram_start;
+    #else
+    #if defined(MICROPY_HW_VTOR)
     // Change IRQ vector table if configured differently
     SCB->VTOR = MICROPY_HW_VTOR;
     #endif
+    #endif
+    #endif
+
 
     #if __CORTEX_M != 33
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI

From 9670666623f8cb3df9378aa12329ff41724041fb Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 23 Aug 2024 12:09:33 +1000
Subject: [PATCH 1382/3129] stm32/boards: Enable RAM_ISR feature on boards with
 UART REPL.

Allows mpremote file transfer to work correctly when mpremote is used over
the ST-link USB/UART REPL port.

Fixes issue #8386.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.mk | 2 ++
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_F722ZE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk  | 1 +
 ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_L4A6ZG/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk    | 1 +
 ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk    | 1 +
 ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk    | 2 ++
 ports/stm32/boards/STM32F429DISC/mpconfigboard.mk  | 2 ++
 ports/stm32/boards/STM32F769DISC/f769_qspi.ld      | 7 +++++++
 ports/stm32/boards/STM32F7DISC/mpconfigboard.mk    | 1 +
 ports/stm32/boards/STM32L496GDISC/mpconfigboard.mk | 2 ++
 30 files changed, 52 insertions(+)

diff --git a/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.mk b/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.mk
index 137b6be23d01a..2649b09682015 100644
--- a/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.mk
+++ b/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.mk
@@ -5,3 +5,5 @@ CMSIS_MCU = STM32L475xx
 AF_FILE = boards/stm32l476_af.csv
 LD_FILES = boards/stm32l476xg.ld boards/common_basic.ld
 OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
index bb7142d1b3e20..193ed793f6fc0 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
@@ -6,6 +6,7 @@ LD_FILES = boards/stm32f091xc.ld boards/common_basic.ld
 # MicroPython settings
 MICROPY_VFS_FAT = 0
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.mk
index 4c3022f544357..a9985df302583 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f401_af.csv
 LD_FILES = boards/stm32f401xe.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.mk
index df9506522574f..d17217e6392d9 100644
--- a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f411_af.csv
 LD_FILES = boards/stm32f411.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.mk
index dd671a9f90142..2fbb4ddbe2dd9 100644
--- a/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f412_af.csv
 LD_FILES = boards/stm32f412zx.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.mk
index 7d8ea6bf6bbb0..b1cbee9a62d2b 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f413_af.csv
 LD_FILES = boards/stm32f413xh.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08060000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
index e5fc89ab47aa0..f691ad2ffc6ed 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
@@ -9,5 +9,6 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
index b8666755b0345..8a45794f0a3ea 100644
--- a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
@@ -9,5 +9,6 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk
index 3a922acebfbd7..6567f829a3458 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f446_af.csv
 LD_FILES = boards/stm32f411.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_F722ZE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F722ZE/mpconfigboard.mk
index 667c8e55da98c..1d32f0b979efc 100644
--- a/ports/stm32/boards/NUCLEO_F722ZE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F722ZE/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f722_af.csv
 LD_FILES = boards/stm32f722.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
index 20acc63f160e2..81c6b46295800 100644
--- a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
@@ -9,5 +9,6 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
index ab3eada5b0676..979df77e94375 100644
--- a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
@@ -9,5 +9,6 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
index 22c40981591c9..693429241a59d 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
@@ -10,5 +10,6 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
index abc9b43ef0364..f1c1357108317 100644
--- a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
@@ -11,3 +11,5 @@ endif
 
 # LTO reduces final binary size, may be slower to build depending on gcc version and hardware
 LTO ?= 1
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk
index 24a06e08ec436..a72c4e03d3e0e 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk
@@ -4,3 +4,5 @@ CMSIS_MCU = STM32G474xx
 MICROPY_FLOAT_IMPL = single
 AF_FILE = boards/stm32g474_af.csv
 LD_FILES = boards/stm32g474.ld boards/common_basic.ld
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk
index a55a54d1c76d1..e2ce5e3333025 100644
--- a/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H563ZI/mpconfigboard.mk
@@ -21,3 +21,4 @@ endif
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk
index 6d512ec0eda27..b05da481f65ee 100644
--- a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk
@@ -21,5 +21,6 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
index cbdf48c52a86d..35e62c470ac5e 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
@@ -21,5 +21,6 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk
index a62a775ac8ddb..c6dfeb85fd966 100644
--- a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk
@@ -2,3 +2,5 @@ MCU_SERIES = l1
 CMSIS_MCU = STM32L152xE
 AF_FILE = boards/stm32l152_af.csv
 LD_FILES = boards/stm32l152xe.ld boards/common_basic.ld
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
index c3fff81002517..8e816b395b0fe 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
@@ -7,6 +7,7 @@ OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
 # MicroPython settings
 MICROPY_VFS_FAT = 0
 MICROPY_VFS_LFS1 ?= 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.mk
index 25ccb45a9427e..3bfeda761fcf8 100644
--- a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.mk
@@ -3,3 +3,5 @@ CMSIS_MCU = STM32L452xx
 AF_FILE = boards/stm32l452_af.csv
 LD_FILES = boards/stm32l452xe.ld boards/common_basic.ld
 OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.mk
index 10c69461c9309..2a7a6f9ad10c5 100644
--- a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.mk
@@ -3,3 +3,5 @@ CMSIS_MCU = STM32L476xx
 AF_FILE = boards/stm32l476_af.csv
 LD_FILES = boards/stm32l476xg.ld boards/common_basic.ld
 OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_L4A6ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L4A6ZG/mpconfigboard.mk
index 51caeaa3a1f9e..fddf0a6c352e1 100644
--- a/ports/stm32/boards/NUCLEO_L4A6ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L4A6ZG/mpconfigboard.mk
@@ -3,3 +3,5 @@ CMSIS_MCU = STM32L4A6xx
 AF_FILE = boards/stm32l496_af.csv
 LD_FILES = boards/stm32l496xg.ld boards/common_basic.ld
 OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
index 2e6ce1fe8f77e..4beaf9cf6cbc4 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
@@ -17,3 +17,4 @@ endif
 MICROPY_PY_BLUETOOTH = 1
 MICROPY_BLUETOOTH_NIMBLE = 1
 MICROPY_VFS_LFS2 = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
index ced2e7619b954..f137fccebb80c 100644
--- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
@@ -8,6 +8,7 @@ TEXT0_ADDR = 0x08000000
 # MicroPython settings
 MICROPY_VFS_FAT = 0
 MICROPY_VFS_LFS2 = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 # Board-specific manifest (doesn't include default modules, adds LoRa driver).
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk b/ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk
index b154dcfbacdc4..5c74443c4c419 100644
--- a/ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk
+++ b/ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f405_af.csv
 LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F429DISC/mpconfigboard.mk
index d19a35c316293..0cff5fd2ada69 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.mk
@@ -4,3 +4,5 @@ AF_FILE = boards/stm32f429_af.csv
 LD_FILES = boards/stm32f429.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
index cde1ef5ca66cf..817422bee022e 100644
--- a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
+++ b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
@@ -17,6 +17,7 @@
 
 MEMORY
 {
+    FLASH_FS (r)    : ORIGIN = 0x08008000, LENGTH = 96K     /* sectors 1, 2, 3 (32K each) */
     FLASH_APP (rx)  : ORIGIN = 0x08020000, LENGTH = 1920K   /* sectors 4-11 1*128K 7*256K */
     FLASH_QSPI (rx) : ORIGIN = 0x90000000, LENGTH = 64M     /* external QSPI flash in XIP mode */
     DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K    /* Used for storage cache */
@@ -38,6 +39,12 @@ _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);
+
 ENTRY(Reset_Handler)
 
 REGION_ALIAS("FLASH_ISR", FLASH_APP);
diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
index 20acc63f160e2..81c6b46295800 100644
--- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
@@ -9,5 +9,6 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.mk b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.mk
index a85635e306d91..b64229418f9af 100644
--- a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.mk
@@ -3,3 +3,5 @@ CMSIS_MCU = STM32L496xx
 AF_FILE = boards/stm32l496_af.csv
 LD_FILES = boards/stm32l496xg.ld boards/common_basic.ld
 OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
+
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1

From 80c5e76483bd8e4d6730d04eabf1ee480ed36362 Mon Sep 17 00:00:00 2001
From: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
Date: Sun, 28 Apr 2024 15:56:57 +0330
Subject: [PATCH 1383/3129] py/objint: Make byteorder argument optional in
 int.to_bytes() method.

This was made optional in CPython 3.11.

Signed-off-by: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
---
 py/objint.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/py/objint.c b/py/objint.c
index 467a4714ef197..14de8bfee8ad2 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -422,14 +422,13 @@ static MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_
 
 static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
     // TODO: Support signed (currently behaves as if signed=(val < 0))
-    (void)n_args;
     bool overflow;
 
     mp_int_t dlen = mp_obj_get_int(args[1]);
     if (dlen < 0) {
         mp_raise_ValueError(NULL);
     }
-    bool big_endian = args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little);
+    bool big_endian = n_args < 3 || args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little);
 
     vstr_t vstr;
     vstr_init_len(&vstr, dlen);
@@ -469,7 +468,7 @@ static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
 
     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);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_to_bytes_obj, 2, 4, int_to_bytes);
 
 static const mp_rom_map_elem_t int_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_from_bytes), MP_ROM_PTR(&int_from_bytes_obj) },

From 0b432b330688647d2c6a5ecaef5e1f5ab703595d Mon Sep 17 00:00:00 2001
From: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
Date: Tue, 30 Apr 2024 19:10:25 +0330
Subject: [PATCH 1384/3129] py/objint: Make length argument optional in
 int.to_bytes() method.

This was made optional in CPython 3.11.

Signed-off-by: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
---
 py/objint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/objint.c b/py/objint.c
index 14de8bfee8ad2..a6aed8b8a40eb 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -424,7 +424,7 @@ static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
     // TODO: Support signed (currently behaves as if signed=(val < 0))
     bool overflow;
 
-    mp_int_t dlen = mp_obj_get_int(args[1]);
+    mp_int_t dlen = n_args < 2 ? 1 : mp_obj_get_int(args[1]);
     if (dlen < 0) {
         mp_raise_ValueError(NULL);
     }
@@ -468,7 +468,7 @@ static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
 
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_to_bytes_obj, 2, 4, int_to_bytes);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_to_bytes_obj, 1, 4, int_to_bytes);
 
 static const mp_rom_map_elem_t int_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_from_bytes), MP_ROM_PTR(&int_from_bytes_obj) },

From cb7e99098ee14209db264fd241776e25da6b4c7a Mon Sep 17 00:00:00 2001
From: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
Date: Sun, 28 Apr 2024 16:46:58 +0330
Subject: [PATCH 1385/3129] py/objint: Make byteorder argument optional in
 int.from_bytes() method.

This was made optional in CPython 3.11.

Signed-off-by: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
---
 py/objint.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/objint.c b/py/objint.c
index a6aed8b8a40eb..773e180343aeb 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -390,7 +390,6 @@ mp_obj_t mp_obj_int_binary_op_extra_cases(mp_binary_op_t op, mp_obj_t lhs_in, mp
 // this is a classmethod
 static mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
     // TODO: Support signed param (assumes signed=False at the moment)
-    (void)n_args;
 
     // get the buffer info
     mp_buffer_info_t bufinfo;
@@ -398,7 +397,8 @@ static mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
 
     const byte *buf = (const byte *)bufinfo.buf;
     int delta = 1;
-    if (args[2] == MP_OBJ_NEW_QSTR(MP_QSTR_little)) {
+    bool big_endian = n_args < 3 || args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little);
+    if (!big_endian) {
         buf += bufinfo.len - 1;
         delta = -1;
     }
@@ -409,7 +409,7 @@ static mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
         #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
         if (value > (MP_SMALL_INT_MAX >> 8)) {
             // Result will overflow a small-int so construct a big-int
-            return mp_obj_int_from_bytes_impl(args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little), bufinfo.len, bufinfo.buf);
+            return mp_obj_int_from_bytes_impl(big_endian, bufinfo.len, bufinfo.buf);
         }
         #endif
         value = (value << 8) | *buf;
@@ -417,7 +417,7 @@ static mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
     return mp_obj_new_int_from_uint(value);
 }
 
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 3, 4, int_from_bytes);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 2, 4, int_from_bytes);
 static MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_bytes_fun_obj));
 
 static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {

From 1897fe6227a578d351494e3db23b732b1c84584c Mon Sep 17 00:00:00 2001
From: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
Date: Tue, 30 Apr 2024 19:32:26 +0330
Subject: [PATCH 1386/3129] tests/basics: Add tests for optional args to
 int.to_bytes/from_bytes.

Signed-off-by: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
---
 tests/basics/int_bytes_optional_args_cp311.py     | 9 +++++++++
 tests/basics/int_bytes_optional_args_cp311.py.exp | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tests/basics/int_bytes_optional_args_cp311.py
 create mode 100644 tests/basics/int_bytes_optional_args_cp311.py.exp

diff --git a/tests/basics/int_bytes_optional_args_cp311.py b/tests/basics/int_bytes_optional_args_cp311.py
new file mode 100644
index 0000000000000..07fdcdd282110
--- /dev/null
+++ b/tests/basics/int_bytes_optional_args_cp311.py
@@ -0,0 +1,9 @@
+# Check optional byteorder argument (CPython 3.11+)
+print((10).to_bytes(1))
+print((100).to_bytes(10))
+print(int.from_bytes(b"\0\0\0\0\0\0\0\0\0\x01"))
+print(int.from_bytes(b"\x01\0"))
+
+# Check optional length argument (CPython 3.11+)
+print((10).to_bytes())
+print((100).to_bytes())
diff --git a/tests/basics/int_bytes_optional_args_cp311.py.exp b/tests/basics/int_bytes_optional_args_cp311.py.exp
new file mode 100644
index 0000000000000..6dffa2577fc0b
--- /dev/null
+++ b/tests/basics/int_bytes_optional_args_cp311.py.exp
@@ -0,0 +1,6 @@
+b'\n'
+b'\x00\x00\x00\x00\x00\x00\x00\x00\x00d'
+1
+256
+b'\n'
+b'd'

From 6ad6297ef7524ad74ad7618e666dd35fc5e92cfe Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 27 Aug 2024 15:49:43 +1000
Subject: [PATCH 1387/3129] esp32: Fix ESP32-C3 USB serial/jtag peripheral
 pre-IDF 5.1.

Regression in 0a11832cd in IDF 5.0.x where macro
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED is not defined.

With this patch, ESP32-S3 still USB Serial/JTAG incorrectly (now on all
ESP-IDF versions).

Closes #15701

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_pin.c     | 2 +-
 ports/esp32/machine_pin.h     | 2 +-
 ports/esp32/main.c            | 2 +-
 ports/esp32/mpconfigport.h    | 5 +++++
 ports/esp32/mphalport.c       | 6 +++---
 ports/esp32/uart.h            | 2 +-
 ports/esp32/usb.c             | 4 ++--
 ports/esp32/usb_serial_jtag.c | 4 ++--
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 17c01fc7b38e6..149715cf60138 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -159,7 +159,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         }
     }
 
-    #if CONFIG_IDF_TARGET_ESP32C3 && CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if CONFIG_IDF_TARGET_ESP32C3 && MICROPY_HW_ESP_USB_SERIAL_JTAG
     if (index == 18 || index == 19) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
index b46998725326c..1d64e7f413e4f 100644
--- a/ports/esp32/machine_pin.h
+++ b/ports/esp32/machine_pin.h
@@ -87,7 +87,7 @@
 #define MICROPY_HW_ENABLE_GPIO11 (1)
 #define MICROPY_HW_ENABLE_GPIO12 (1)
 #define MICROPY_HW_ENABLE_GPIO13 (1)
-#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+#if !MICROPY_HW_ESP_USB_SERIAL_JTAG
 #define MICROPY_HW_ENABLE_GPIO18 (1)
 #define MICROPY_HW_ENABLE_GPIO19 (1)
 #endif
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 330ba64b467c7..dedc5421e34e0 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -99,7 +99,7 @@ void mp_task(void *pvParameter) {
     #if MICROPY_PY_THREAD
     mp_thread_init(pxTaskGetStackStart(NULL), MICROPY_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
-    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_init();
     #elif CONFIG_USB_OTG_SUPPORTED
     usb_init();
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index a5c6b9c014492..25fa4706214cf 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -260,6 +260,11 @@ typedef long mp_off_t;
 // board specifics
 #define MICROPY_PY_SYS_PLATFORM "esp32"
 
+// Enable stdio over USB Serial/JTAG peripheral
+#ifndef MICROPY_HW_ESP_USB_SERIAL_JTAG
+#define MICROPY_HW_ESP_USB_SERIAL_JTAG      (SOC_USB_SERIAL_JTAG_SUPPORTED)
+#endif
+
 // ESP32-S3 extended IO for 47 & 48
 #ifndef MICROPY_HW_ESP32S3_EXTENDED_IO
 #define MICROPY_HW_ESP32S3_EXTENDED_IO      (1)
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index cc0e2ee7b4999..e85aa6260c068 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -104,7 +104,7 @@ void check_esp_err_(esp_err_t code, const char *func, const int line, const char
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
-    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_poll_rx();
     #endif
     if ((poll_flags & MP_STREAM_POLL_RD) && stdin_ringbuf.iget != stdin_ringbuf.iput) {
@@ -118,7 +118,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+        #if MICROPY_HW_ESP_USB_SERIAL_JTAG
         usb_serial_jtag_poll_rx();
         #endif
         int c = ringbuf_get(&stdin_ringbuf);
@@ -143,7 +143,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }
-    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
     did_write = true;
     #elif CONFIG_USB_OTG_SUPPORTED
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index 13c5e88307287..0a0985d1b4e28 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -30,7 +30,7 @@
 
 // Whether to enable the REPL on a UART.
 #ifndef MICROPY_HW_ENABLE_UART_REPL
-#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED)
+#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG)
 #endif
 
 #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 5a0e6b8a92091..471f2c2e0e460 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "usb.h"
 
-#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG
 
 #include "esp_timer.h"
 #ifndef NO_QSTR
@@ -100,4 +100,4 @@ void usb_tx_strn(const char *str, size_t len) {
     }
 }
 
-#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG
diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c
index f1148ab197ebb..32eb806e72959 100644
--- a/ports/esp32/usb_serial_jtag.c
+++ b/ports/esp32/usb_serial_jtag.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "usb_serial_jtag.h"
 
-#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+#if MICROPY_HW_ESP_USB_SERIAL_JTAG
 
 #include "hal/usb_serial_jtag_ll.h"
 #include "esp_intr_alloc.h"
@@ -117,4 +117,4 @@ void usb_serial_jtag_tx_strn(const char *str, size_t len) {
     }
 }
 
-#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+#endif // MICROPY_HW_ESP_USB_SERIAL_JTAG

From 5e692d0460a2af8225534bf7c70f56007641e96e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 27 Aug 2024 16:11:32 +1000
Subject: [PATCH 1388/3129] esp32: Add MICROPY_HW_USB_CDC macro for native
 USB-CDC serial.

This fixes issue of ESP32-S3 switching its config over to USB serial/JTAG
instead of native USB.

The the existing logic was hard to follow, adding this config macro makes
it easier to see which USB is in use and to have board definitions that
enable/disable different USB levels.

This commit also drops (nominal) support for manually setting
CONFIG_ESP_CONSOLE_USB_CDC in sdkconfig. No included board configs use this
and it didn't seem to work (if secondary console was set to the default USB
Serial/JTAG then there is no serial output on any port, and if secondary
console was set to None then linking fails.) Can be re-added if there's a
use case for it.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/main.c         |  2 +-
 ports/esp32/mpconfigport.h | 11 ++++++++++-
 ports/esp32/mphalport.c    |  2 +-
 ports/esp32/uart.h         |  2 +-
 ports/esp32/usb.c          |  4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index dedc5421e34e0..ca5a0e3c2097c 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -101,7 +101,7 @@ void mp_task(void *pvParameter) {
     #endif
     #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_init();
-    #elif CONFIG_USB_OTG_SUPPORTED
+    #elif MICROPY_HW_USB_CDC
     usb_init();
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 25fa4706214cf..747c55e92dcb7 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -260,9 +260,18 @@ typedef long mp_off_t;
 // board specifics
 #define MICROPY_PY_SYS_PLATFORM "esp32"
 
+// Enable stdio over native USB peripheral CDC via TinyUSB
+#ifndef MICROPY_HW_USB_CDC
+#define MICROPY_HW_USB_CDC                  (SOC_USB_OTG_SUPPORTED)
+#endif
+
 // Enable stdio over USB Serial/JTAG peripheral
 #ifndef MICROPY_HW_ESP_USB_SERIAL_JTAG
-#define MICROPY_HW_ESP_USB_SERIAL_JTAG      (SOC_USB_SERIAL_JTAG_SUPPORTED)
+#define MICROPY_HW_ESP_USB_SERIAL_JTAG      (SOC_USB_SERIAL_JTAG_SUPPORTED && !MICROPY_HW_USB_CDC)
+#endif
+
+#if MICROPY_HW_USB_CDC && MICROPY_HW_ESP_USB_SERIAL_JTAG
+#error "Invalid build config: Can't enable both native USB and USB Serial/JTAG peripheral"
 #endif
 
 // ESP32-S3 extended IO for 47 & 48
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index e85aa6260c068..7d0154cc05315 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -146,7 +146,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
     did_write = true;
-    #elif CONFIG_USB_OTG_SUPPORTED
+    #elif MICROPY_HW_USB_CDC
     usb_tx_strn(str, len);
     did_write = true;
     #endif
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index 0a0985d1b4e28..fe08e26899aaa 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -30,7 +30,7 @@
 
 // Whether to enable the REPL on a UART.
 #ifndef MICROPY_HW_ENABLE_UART_REPL
-#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG)
+#define MICROPY_HW_ENABLE_UART_REPL (!MICROPY_HW_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG)
 #endif
 
 #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 471f2c2e0e460..4207e77df210b 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "usb.h"
 
-#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG
+#if MICROPY_HW_USB_CDC
 
 #include "esp_timer.h"
 #ifndef NO_QSTR
@@ -100,4 +100,4 @@ void usb_tx_strn(const char *str, size_t len) {
     }
 }
 
-#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG
+#endif // MICROPY_HW_USB_CDC

From a6c35aeee873953bd9016cf63feb1a6772bdd6af Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 4 Sep 2024 11:06:21 +1000
Subject: [PATCH 1389/3129] esp32: Fix ARDUINO_NANO_ESP32 build configuration.

Regression introduced by 5e692d04 now at MICROPY_HW_USB_CDC is set.

The ARDUINO_NANO_ESP32 specifically builds shared/tinyusb/mp_usb_cdc.c
for the 1200bps reset behaviour. However MicroPython esp32 doesn't yet
use the rest of the shared/tinyusb functionality.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
index 873838352e198..8c2aa88e9f2ec 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
@@ -19,6 +19,7 @@
 #define MICROPY_HW_SPI2_SCK                 (18)
 
 #define MICROPY_HW_ENABLE_USBDEV            (1)
+#define MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC (1)
 #define MICROPY_HW_USB_EXTERNAL_TINYUSB     (1)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 #define MICROPY_SCHEDULER_STATIC_NODES      (1)

From fee9d66e3a7308bd9edffb2624b52f4e04ecc4f3 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 3 Sep 2024 15:39:36 +1000
Subject: [PATCH 1390/3129] esp32: Disable hardware stack protection on
 ESP32-C3.

Workaround for what appears to be an upstream issue:
https://github.com/espressif/esp-idf/issues/14456

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb | 3 +++
 ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
index 44838c5349cc4..70e5f1f0d195a 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb
@@ -1 +1,4 @@
 CONFIG_ESP32C3_REV_MIN_3=y
+
+# Workaround for https://github.com/espressif/esp-idf/issues/14456
+CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
index 44838c5349cc4..70e5f1f0d195a 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
+++ b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
@@ -1 +1,4 @@
 CONFIG_ESP32C3_REV_MIN_3=y
+
+# Workaround for https://github.com/espressif/esp-idf/issues/14456
+CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n

From 838c490eb4403885e96cbe3ded6f73a082c9399f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Aug 2024 14:27:15 +1000
Subject: [PATCH 1391/3129] tests/net_inet: Update micropython.org certificate
 for SSL tests.

The Let's Encrypt root certificate has changed so needs updating in this
test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/mpycert.der               | Bin 1306 -> 1290 bytes
 tests/net_inet/ssl_cert.py               |  71 +++++++++++------------
 tests/net_inet/test_sslcontext_client.py |   9 ++-
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/tests/net_inet/mpycert.der b/tests/net_inet/mpycert.der
index 2d66ea723ea4f983874b3ffacdf612bd90e150d7..0b0eabc9bc8135de25785cb8574ab78e03947aa9 100644
GIT binary patch
delta 950
zcmV;n14;av3W^FKFoFdJFoFW^paTK{0s;{LihVv4)-N#cBZj>x2WvF=ksxIqG%zzU
zGcYhPFfcG$7Y#BuFf%bSGBY(fH91-^Gm)Yu4Gb^}1_M<D0}}&MF)@+UA%D7uyj&Xq
zIm^ll&D3WQ`2jqoPNiYXCdyL#6#=)oDD@~F?I*J&7&&JN3<&JtI<Px;4!!f`IaEOm
zPOd@LnRMP!+wXh-SiPvX6ZYOQ)$(%5a%u~Mbd{V&0Av)I^Rd|?+0CeusvIVIKmPAn
z1$zjUf!lEpj{D;=3A+itP=8HdkCApgTAiMQ^6A88v*8A2Lr55aWuP}0nwx|&m$9<F
z#P}5eohOL<;$s(<Y?~)%OT^nKUTMO4@JU?YBv9eRyrBiGdq8afw8B9@r&zcz#ax@E
zy9u80{_C)XIsK>#??uFT>t!m!&tE*=<6KP}_X{U0stZDQQ%`wn9Sw)s0s{d60i%KV
zFoE@x0s>AH#m`2h>h#0FdTf=%EwEmaFDB!;lVk!`6cYvmRUIG%3@{2X2nGgcfeZlx
z0h74`Dt`?I2`Yw2hW8Bt0Sg5H1A+np08ZkGT?zvnkT}rwANg@y_`{E~H;8&~uq7Yu
zzPH$h29D_ogw1llf%E*z&r?Y4z4mEB)TI$VHOLdPk{tzK>MqpS_({X9^_iBO?<Uyc
zv?L2iAWi(!RJ5taA;{r28~=A?DHpl$OYdFk&3}2&zmUJaBeIa%N~uUObg4uO;o|l!
zgK?yFd(xD_1sO&hxsUV2bVwyC4dwOQL*m<$o4FaZA1~i(4v#U@V-LG2+}&m@Kd>8T
zQTRbT<W0G(xTKtBWA&?rBOT0BwySZj+{FQL+BWVA7%DRT2{C++_H*Z)oV7|7YIlNK
z&wtvDMgAWuWCbujbHc_9xz;;lN~=Z#{+Yl=Kqp{h-%vUSN7xlgpXx^+nOX>947O}D
z2u;^G?MN*y1!%5-UGGfX*dRe)Xz{yR&EpQR3^9kBL*7Y4;m8C((L5W6MKEcosd5f^
z5*#tuJ|kD%r%#~p9D&hyA8*#uxu~-P7Jq>`OP^J)(rV<hzv`vcpG%|3);n_ZO7>K%
z4E#9vV1VClHOh6NROBzbZWqZKr8l*rn!4=tz;#AXcc|!DR*_~cZr&+@)~1&QUSvhS
zEY9j=LPW5`Pp$B@+yly)n+bxIf(>JeX89R%_|>_I5aNlL2{rkm9KMosBXsGV9~aj<
YN}7aN5W@4P;x+7kJ4MbgMpA3Qz)StIBme*a

delta 966
zcmV;%13CPP3YrQaFoFdZFoFX9paTK{0s;{Lkt+yF&kPu+Q})&_C8u9nksxIqFfchV
zG%zqQFfcG$7Y#BsFgY<bF*YzTFfdv$GLfPt3=1#`1_M<D0}}#LGm+IHf4c$|D9rYt
zl+zCq?2T2D!}x;nnWlO|h^Jj9s<kV*#Z0lUj%)dK$fMT}N0by*HCK$DsG>O;^@2P?
zsZMV7JHsy9jli&6^I16O?ayiOS_>P#z?38<hx#{hvlHhWtl^vQ+vGb%Qbm@j!BfsO
z$WrdLuI-QBU~uB4RI9dae-4+WKs0MB)4XQuW;A^IYm1LpDVg{%7hSq?Z~KA8t<r{A
zJr~F43A^zt_lDfT+HqafM&rz_CBcZiU}tq^v+)@BqFm-v|2l}aN2UK080we_cR!s|
z`Og96^`>wa6t82X|CzIso!nEW2L4Ee9ieHiC3U+K%u)mO?NOnN58D+20|5X5qk;hl
zFoFRDlK}!w6cjGA7q?he%dSufK;|E>or@I0#*<?LR+G*GDSsjc163U$1RF3JFbD<)
zXMqd>0s$}$1`8_&0R#bp-xC1=0Wb{)2`Yw2hW8Bt0Sg5H1A+np0ENm<M?RzXg+ztC
z)n|CJm}9MVO&*p#Gi7pAErFow!|nJWzhBI^Z~(V%JN90b-sB*krtgcg1LvZ(7Ce#8
zwCy<p=X@oKM}OvJZa+r!+3?PkEACXz61<EjOSr+9FQTu_agj<0x5&67dju^A`3P4&
zgV_W#3P&M$34$lXD#)9;&Rp_j$iTjNz)y~CL=0Y%yDs;O5aH+@L@C=@AnjwhA@~v|
zl#^GW9c2W;3L>r$4MUfq7$1J%;D$G~TCu$_zlUxsDu4eWP8$Wo^%$4%UaZ5VxN7h&
zygM_w?n~ax{N%5M3x+?yRYNxRXyG;&YL1!F|D`~uG`GOeV>vZBb#C&ycF2<g>8VR>
z7tRa<*}Z}LpSNh#24%B?J$F<1j(G#E3NZ(DDnr;+mvY1@4)?@ePROoCgfQ3gg<lw<
zdAsLcaDR&j;f9mLxsTjoaV09R-|Zz(QfP~k+~wA_<Jx`Dhirr)F|LC3`?;&gi5ETL
zOyxKZ_Pr~;mVp%O)!RKFr+!(};`mtkTewKg{#;KMDgGW+Bd^F2u#M_`laLoL{j8!1
zM@B#J>9Du|C{1WG)@NQGX`_?4^_`0^3(`_UraNykS7l8yf!{b&g<XDKW-02p-Q<<E
o&9zn%Le0cZ#w9pJP;Kna096?N=}BbNPRf^@v|GS)sH?a~!hh+!`2YX_

diff --git a/tests/net_inet/ssl_cert.py b/tests/net_inet/ssl_cert.py
index d6e0aec889732..3597b7855db4f 100644
--- a/tests/net_inet/ssl_cert.py
+++ b/tests/net_inet/ssl_cert.py
@@ -6,49 +6,48 @@
 # 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
+# 1 s:C=US, O=Let's Encrypt, CN=R11
+#   i:C=US, O=Internet Security Research Group, CN=ISRG Root X1
+#   a:PKEY: rsaEncryption, 2048 (bit); sigalg: RSA-SHA256
+#   v:NotBefore: Mar 13 00:00:00 2024 GMT; NotAfter: Mar 12 23:59:59 2027 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"30820506308202eea0030201020211008a7d3e13d62f30ef2386bd29076b34f8300d06092a864886"
     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"
+    b"20526f6f74205831301e170d3234303331333030303030305a170d3237303331323233353935395a"
+    b"3033310b300906035504061302555331163014060355040a130d4c6574277320456e637279707431"
+    b"0c300a0603550403130352313130820122300d06092a864886f70d01010105000382010f00308201"
+    b"0a0282010100ba87bc5c1b0039cbca0acdd46710f9013ca54ea561cb26ca52fb1501b7b928f5281e"
+    b"ed27b324183967090c08ece03ab03b770ebdf3e53954410c4eae41d69974de51dbef7bff58bda8b7"
+    b"13f6de31d5f272c9726a0b8374959c4600641499f3b1d922d9cda892aa1c267a3ffeef58057b0895"
+    b"81db710f8efbe33109bb09be504d5f8f91763d5a9d9e83f2e9c466b3e106664348188065a037189a"
+    b"9b843297b1b2bdc4f815009d2788fbe26317966c9b27674bc4db285e69c279f0495ce02450e1c4bc"
+    b"a105ac7b406d00b4c2413fa758b82fc55c9ba5bb099ef1feebb08539fda80aef45c478eb652ac2cf"
+    b"5f3cdee35c4d1bf70b272baa0b4277534f796a1d87d90203010001a381f83081f5300e0603551d0f"
+    b"0101ff040403020186301d0603551d250416301406082b0601050507030206082b06010505070301"
+    b"30120603551d130101ff040830060101ff020100301d0603551d0e04160414c5cf46a4eaf4c3c07a"
+    b"6c95c42db05e922f26e3b9301f0603551d2304183016801479b459e67bb6e5e40173800888c81a58"
+    b"f6e99b6e303206082b0601050507010104263024302206082b060105050730028616687474703a2f"
+    b"2f78312e692e6c656e63722e6f72672f30130603551d20040c300a3008060667810c010201302706"
+    b"03551d1f0420301e301ca01aa0188616687474703a2f2f78312e632e6c656e63722e6f72672f300d"
+    b"06092a864886f70d01010b050003820201004ee2895d0a031c9038d0f51ff9715cf8c38fb237887a"
+    b"6fb0251fedbeb7d886068ee90984cd72bf81f3fccacf5348edbdf66942d4a5113e35c813b2921d05"
+    b"5fea2ed4d8f849c3adf599969cef26d8e1b4240b48204dfcd354b4a9c621c8e1361bff77642917b9"
+    b"f04bef5deacd79d0bf90bfbe23b290da4aa9483174a9440be1e2f62d8371a4757bd294c10519461c"
+    b"b98ff3c47448252a0de5f5db43e2db939bb919b41f2fdf6a0e8f31d3630fbb29dcdd662c3fb01b67"
+    b"51f8413ce44db9acb8a49c6663f5ab85231dcc53b6ab71aedcc50171da36ee0a182a32fd09317c8f"
+    b"f673e79c9cb54a156a77825acfda8d45fe1f2a6405303e73c2c60cb9d63b634aab4603fe99c04640"
+    b"276063df503a0747d8154a9fea471f995a08620cb66c33084dd738ed482d2e0568ae805def4cdcd8"
+    b"20415f68f1bb5acde30eb00c31879b43de4943e1c8043fd13c1b87453069a8a9720e79121c31d83e"
+    b"2357dda74fa0f01c81d1771f6fd6d2b9a8b3031681394b9f55aed26ae4b3bfeaa5d59f4ba3c9d63b"
+    b"72f34af654ab0cfc38f76080df6e35ca75a154e42fbc6e17c91aa537b5a29abaecf4c075464f77a8"
+    b"e8595691662d6ede2981d6a697055e6445be2cceea644244b0c34fadf0b4dc03ca999b098295820d"
+    b"638a66f91972f8d5b98910e289980935f9a21cbe92732374e99d1fd73b4a9a845810c2f3a7e235ec"
+    b"7e3b45ce3046526bc0c0"
 )
 
 
diff --git a/tests/net_inet/test_sslcontext_client.py b/tests/net_inet/test_sslcontext_client.py
index 860b053d5b481..30ec0ac7c83fc 100644
--- a/tests/net_inet/test_sslcontext_client.py
+++ b/tests/net_inet/test_sslcontext_client.py
@@ -5,11 +5,10 @@
 # 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
+# 1 s:C=US, O=Let's Encrypt, CN=R11
+#   i:C=US, O=Internet Security Research Group, CN=ISRG Root X1
+#   a:PKEY: rsaEncryption, 2048 (bit); sigalg: RSA-SHA256
+#   v:NotBefore: Mar 13 00:00:00 2024 GMT; NotAfter: Mar 12 23:59:59 2027 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).

From 6be1dbc784ba1f845a4f7525bb2ecd6b61a79405 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 17 Aug 2024 00:10:40 +1000
Subject: [PATCH 1392/3129] tests/run-tests.py: Automatically detect native
 arch and mpy-cross flag.

Now that some ports support multiple architectures (eg esp32 has both
Xtensa and RISC-V CPUs) it's no longer possible to set mpy-cross flags
based on the target, eg `./run-tests.py --target esp32`.  Instead this
commit makes it so the `-march=xxx` argument to mpy-cross is detected
automatically via evaluation of `sys.implementation._mpy`.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/feature_check/target_info.py     | 22 ++++++++++++++++++++++
 tests/feature_check/target_info.py.exp |  0
 tests/run-tests.py                     | 24 +++++++-----------------
 3 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 tests/feature_check/target_info.py
 create mode 100644 tests/feature_check/target_info.py.exp

diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
new file mode 100644
index 0000000000000..df89496708aa9
--- /dev/null
+++ b/tests/feature_check/target_info.py
@@ -0,0 +1,22 @@
+# Retrieve the native architecture of the target.
+# See https://docs.micropython.org/en/latest/reference/mpyfiles.html#versioning-and-compatibility-of-mpy-files
+# for more details.
+
+import sys
+
+sys_mpy = getattr(sys.implementation, "_mpy", 0)
+arch = [
+    None,
+    "x86",
+    "x64",
+    "armv6",
+    "armv6m",
+    "armv7m",
+    "armv7em",
+    "armv7emsp",
+    "armv7emdp",
+    "xtensa",
+    "xtensawin",
+    "rv32imc",
+][sys_mpy >> 10]
+print(arch)
diff --git a/tests/feature_check/target_info.py.exp b/tests/feature_check/target_info.py.exp
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 60bfc2599fb47..999812bd5db9f 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1065,11 +1065,6 @@ def main():
         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"
         if args.target == "webassembly":
             pyb = PyboardNodeRunner()
     elif args.target in EXTERNAL_TARGETS:
@@ -1077,24 +1072,19 @@ 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"
-            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"
-
         pyb = pyboard.Pyboard(args.device, args.baudrate, args.user, args.password)
         pyboard.Pyboard.run_script_on_remote_target = run_script_on_remote_target
         pyb.enter_raw_repl()
     else:
         raise ValueError("target must be one of %s" % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
 
+    # Automatically detect the native architecture for mpy-cross if not given.
+    if not (args.list_tests or args.write_exp) and not args.mpy_cross_flags:
+        output = run_feature_check(pyb, args, "target_info.py")
+        arch = str(output, "ascii").strip()
+        if arch != "None":
+            args.mpy_cross_flags = "-march=" + arch
+
     if args.run_failures and (any(args.files) or args.test_dirs is not None):
         raise ValueError(
             "--run-failures cannot be used together with files or --test-dirs arguments"

From 9396572eee25c40f2e9b641c9aa9563fd1f1c1b4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Aug 2024 13:51:12 +1000
Subject: [PATCH 1393/3129] tools/mpy-tool.py: Support freezing rv32imc native
 code.

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 5007bbbaca013..cdceae3746638 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1080,6 +1080,7 @@ def __init__(
             MP_NATIVE_ARCH_X64,
             MP_NATIVE_ARCH_XTENSA,
             MP_NATIVE_ARCH_XTENSAWIN,
+            MP_NATIVE_ARCH_RV32IMC,
         ):
             self.fun_data_attributes = '__attribute__((section(".text,\\"ax\\",@progbits # ")))'
         else:

From dc9ecd58601b2b716399cde2b24de6c4786ed77e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Aug 2024 19:42:31 +1000
Subject: [PATCH 1394/3129] qemu-arm: Factor board config to mk fragments.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/Makefile             | 61 ++++++-----------------------
 ports/qemu-arm/README.md            | 19 ++++++++-
 ports/qemu-arm/boards/MICROBIT.mk   | 13 ++++++
 ports/qemu-arm/boards/MPS2_AN385.mk | 12 ++++++
 ports/qemu-arm/boards/NETDUINO2.mk  | 12 ++++++
 ports/qemu-arm/boards/SABRELITE.mk  | 19 +++++++++
 tools/ci.sh                         |  2 +-
 7 files changed, 86 insertions(+), 52 deletions(-)
 create mode 100644 ports/qemu-arm/boards/MICROBIT.mk
 create mode 100644 ports/qemu-arm/boards/MPS2_AN385.mk
 create mode 100644 ports/qemu-arm/boards/NETDUINO2.mk
 create mode 100644 ports/qemu-arm/boards/SABRELITE.mk

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index cdfc39580b9d8..db9cdc015a4ac 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -1,4 +1,4 @@
-BOARD ?= mps2-an385
+BOARD ?= MPS2_AN385
 
 # Make the build directory reflect the board.
 BUILD ?= build-$(BOARD)
@@ -6,6 +6,9 @@ BUILD ?= build-$(BOARD)
 include ../../py/mkenv.mk
 -include mpconfigport.mk
 
+# Include board specific .mk file.
+include boards/$(BOARD).mk
+
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
 
@@ -17,58 +20,16 @@ FROZEN_MANIFEST ?= "freeze('test-frzmpy')"
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-CFLAGS += -DMICROPY_HW_BOARD_NAME='"$(BOARD)"'
-QEMU_ARGS += -machine $(BOARD) -nographic -monitor null -semihosting
-
-ifeq ($(BOARD),netduino2)
-CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
-CFLAGS += -DQEMU_SOC_STM32
-CFLAGS += -DMICROPY_HW_MCU_NAME='"STM32"'
-LDSCRIPT = stm32.ld
-SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
-MPY_CROSS_FLAGS += -march=armv7m
-endif
-
-ifeq ($(BOARD),microbit)
-CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
-CFLAGS += -DQEMU_SOC_NRF51
-CFLAGS += -DMICROPY_HW_MCU_NAME='"nRF51"'
-LDSCRIPT = nrf51.ld
-QEMU_ARGS += -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
-SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb1.o
-MPY_CROSS_FLAGS += -march=armv7m
-endif
-
-ifeq ($(BOARD),mps2-an385)
-CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
-CFLAGS += -DQEMU_SOC_MPS2
-CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-M3"'
-LDSCRIPT = mps2.ld
-SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
-MPY_CROSS_FLAGS += -march=armv7m
-endif
-
-ifeq ($(BOARD),sabrelite)
-CFLAGS += -mcpu=cortex-a9
-CFLAGS += -DQEMU_SOC_IMX6
-CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-A9"'
-LDSCRIPT = imx6.ld
-QEMU_ARGS += -m 128M
-SRC_BOARD_O = shared/runtime/gchelper_generic.o
-# It's really armv7a but closest supported value is armv6.
-MPY_CROSS_FLAGS += -march=armv6
-# Cortex-A9 should support unaligned-access, but qemu doesn't seem to.
-CFLAGS += -mno-unaligned-access
-# These don't work on Cortex-A9.
-TESTS_EXCLUDE = --exclude '(asmdiv|asmspecialregs).py'
-endif
-
 CROSS_COMPILE ?= arm-none-eabi-
 
+QEMU_SYSTEM = qemu-system-$(QEMU_ARCH)
+QEMU_ARGS += -machine $(QEMU_MACHINE) -nographic -monitor null -semihosting
+
 INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
 
+CFLAGS += -DMICROPY_HW_BOARD_NAME='"$(QEMU_MACHINE)"'
 CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 $(COPT) \
 	 -ffunction-sections -fdata-sections
 CFLAGS += $(CFLAGS_EXTRA)
@@ -135,16 +96,16 @@ all: $(BUILD)/firmware.elf
 .PHONY: repl
 repl: $(BUILD)/firmware.elf
 	$(ECHO) "Use machine.reset() to exit"
-	qemu-system-arm $(QEMU_ARGS) -serial mon:stdio -kernel $<
+	$(QEMU_SYSTEM) $(QEMU_ARGS) -serial mon:stdio -kernel $<
 
 .PHONY: run
 run: $(BUILD)/firmware.elf
-	qemu-system-arm $(QEMU_ARGS) -serial pty -kernel $<
+	$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel $<
 
 .PHONY: test
 test: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && ./run-tests.py --target qemu-arm --device execpty:"qemu-system-arm $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(TESTS_EXCLUDE)
+	cd $(TOP)/tests && ./run-tests.py --target qemu-arm --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
 
 ## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here.
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(ALL_OBJ_RUN)
diff --git a/ports/qemu-arm/README.md b/ports/qemu-arm/README.md
index 34d73fd165756..bb49571df4179 100644
--- a/ports/qemu-arm/README.md
+++ b/ports/qemu-arm/README.md
@@ -32,7 +32,16 @@ Then build using:
 The default qemu-supported board is `mps2-an385`, a Cortex-M3 board.  To select a
 different board pass the `BOARD` argument to `make`, for example:
 
-    $ make BOARD=sabrelite
+    $ make BOARD=SABRELITE
+
+Available boards are:
+
+| Name for `BOARD=` | Corresponding qemu board |
+| ----------------- | ------------------------ |
+| `MICROBIT`        | `microbit`               |
+| `MPS2_AN385`      | `mps2-an385`             |
+| `NETDUINO2`       | `netduino2`              |
+| `SABRELITE`       | `sabrelite`              |
 
 Running
 -------
@@ -67,3 +76,11 @@ tests against the serial device, for example:
 
     $ cd ../../tests
     $ ./run-tests.py --target qemu-arm --device /dev/pts/1
+
+Extra make options
+------------------
+
+The following options can be specified on the `make` command line:
+- `CFLAGS_EXTRA`: pass in extra flags for the compiler.
+- `RUN_TESTS_EXTRA`: pass in extra flags for `run-tests.py` when invoked via
+  `make test`.
diff --git a/ports/qemu-arm/boards/MICROBIT.mk b/ports/qemu-arm/boards/MICROBIT.mk
new file mode 100644
index 0000000000000..90edb11aff1a8
--- /dev/null
+++ b/ports/qemu-arm/boards/MICROBIT.mk
@@ -0,0 +1,13 @@
+QEMU_ARCH = arm
+QEMU_MACHINE = microbit
+QEMU_ARGS += -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
+
+CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
+CFLAGS += -DQEMU_SOC_NRF51
+CFLAGS += -DMICROPY_HW_MCU_NAME='"nRF51"'
+
+LDSCRIPT = nrf51.ld
+
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb1.o
+
+MPY_CROSS_FLAGS += -march=armv7m
diff --git a/ports/qemu-arm/boards/MPS2_AN385.mk b/ports/qemu-arm/boards/MPS2_AN385.mk
new file mode 100644
index 0000000000000..f155be03d29ed
--- /dev/null
+++ b/ports/qemu-arm/boards/MPS2_AN385.mk
@@ -0,0 +1,12 @@
+QEMU_ARCH = arm
+QEMU_MACHINE = mps2-an385
+
+CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
+CFLAGS += -DQEMU_SOC_MPS2
+CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-M3"'
+
+LDSCRIPT = mps2.ld
+
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
+
+MPY_CROSS_FLAGS += -march=armv7m
diff --git a/ports/qemu-arm/boards/NETDUINO2.mk b/ports/qemu-arm/boards/NETDUINO2.mk
new file mode 100644
index 0000000000000..3067f094c60f9
--- /dev/null
+++ b/ports/qemu-arm/boards/NETDUINO2.mk
@@ -0,0 +1,12 @@
+QEMU_ARCH = arm
+QEMU_MACHINE = netduino2
+
+CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
+CFLAGS += -DQEMU_SOC_STM32
+CFLAGS += -DMICROPY_HW_MCU_NAME='"STM32"'
+
+LDSCRIPT = stm32.ld
+
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
+
+MPY_CROSS_FLAGS += -march=armv7m
diff --git a/ports/qemu-arm/boards/SABRELITE.mk b/ports/qemu-arm/boards/SABRELITE.mk
new file mode 100644
index 0000000000000..aef96f552744b
--- /dev/null
+++ b/ports/qemu-arm/boards/SABRELITE.mk
@@ -0,0 +1,19 @@
+QEMU_ARCH = arm
+QEMU_MACHINE = sabrelite
+QEMU_ARGS += -m 128M
+
+CFLAGS += -mcpu=cortex-a9
+CFLAGS += -DQEMU_SOC_IMX6
+CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-A9"'
+# Cortex-A9 should support unaligned-access, but qemu doesn't seem to.
+CFLAGS += -mno-unaligned-access
+
+LDSCRIPT = imx6.ld
+
+SRC_BOARD_O = shared/runtime/gchelper_generic.o
+
+# It's really armv7a but closest supported value is armv6.
+MPY_CROSS_FLAGS += -march=armv6
+
+# These tests don't work on Cortex-A9, so exclude them.
+RUN_TESTS_ARGS = --exclude '(asmdiv|asmspecialregs).py'
diff --git a/tools/ci.sh b/tools/ci.sh
index 175d7f57622fb..abfb965b543aa 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -259,7 +259,7 @@ 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 test
-    make ${MAKEOPTS} -C ports/qemu-arm BOARD=sabrelite test
+    make ${MAKEOPTS} -C ports/qemu-arm BOARD=SABRELITE test
 }
 
 ########################################################################################

From f769b4329b979b49dfe755b059969794a931d0d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Aug 2024 11:36:59 +1000
Subject: [PATCH 1395/3129] qemu-arm/Makefile: Clean up SRC and OBJ variables.

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

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index db9cdc015a4ac..d748aa049bbb9 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -51,7 +51,8 @@ endif
 LDFLAGS= -T $(LDSCRIPT) --gc-sections -Map=$(@:.elf=.map)
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
-SRC_COMMON_C = \
+SRC_C = \
+	main.c \
 	startup.c \
 	uart.c \
 	mphalport.c \
@@ -63,33 +64,16 @@ SRC_COMMON_C = \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 
-SRC_RUN_C = \
-	main.c \
-
 LIB_SRC_C += $(SRC_LIB_LIBM_C)
 LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
 
-OBJ_COMMON =
-OBJ_COMMON += $(PY_O)
-OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_COMMON_C:.c=.o))
-OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_BOARD_O))
-OBJ_COMMON += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-
-OBJ_RUN =
-OBJ_RUN += $(addprefix $(BUILD)/, $(SRC_RUN_C:.c=.o))
-
-ALL_OBJ_RUN = $(OBJ_COMMON) $(OBJ_RUN)
-
-OBJ_TEST =
-OBJ_TEST += $(addprefix $(BUILD)/, $(SRC_TEST_C:.c=.o))
-
-ALL_OBJ_TEST = $(OBJ_COMMON) $(OBJ_TEST)
-
-# All object files, needed to get dependencies correct
-OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST)
+OBJ += $(PY_O)
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_BOARD_O))
+OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(LIB_SRC_C)
+SRC_QSTR += $(SRC_C) $(LIB_SRC_C)
 
 all: $(BUILD)/firmware.elf
 
@@ -108,8 +92,8 @@ test: $(BUILD)/firmware.elf
 	cd $(TOP)/tests && ./run-tests.py --target qemu-arm --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
 
 ## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here.
-$(BUILD)/firmware.elf: $(LDSCRIPT) $(ALL_OBJ_RUN)
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_RUN) $(LIBS)
+$(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
+	$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 	$(Q)$(SIZE) $@
 
 include $(TOP)/py/mkrules.mk

From 0426934969d06aa649ba903f5408cb331b5b9c2d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Aug 2024 13:51:39 +1000
Subject: [PATCH 1396/3129] qemu-arm: Merge RISC-V 32-bit support into qemu-arm
 port.

Currently both the qemu-arm and qemu-riscv ports share a lot of code and
functionality.  This commit merges the qemu-riscv port into the qemu-arm
port.  The only real differences between the two are the toolchains used to
build the code, and the initialisation/startup framework.  Everything else
is pretty much the same, so this brings the following benefits:
- less code duplication
- less burden on maintenance
- generalised qemu port, could in the future support other architectures

A new board `VIRT_RV32` has been added to the qemu-arm port which is the
existing RISC-V board from the qemu-riscv port.  To build it:

    $ make BOARD=VIRT_RV32 repl

To cleanly separate the code for the different architectures, startup code
has been moved to ports/qemu-arm/mcu/<arch>/.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_qemu-arm.yml          |  18 ++-
 .github/workflows/ports_qemu-riscv.yml        |  33 -----
 ports/qemu-arm/Makefile                       | 105 ++++++++++++--
 ports/qemu-arm/README.md                      |  42 ++++--
 ports/qemu-arm/boards/MICROBIT.mk             |   2 +-
 ports/qemu-arm/boards/MPS2_AN385.mk           |   2 +-
 ports/qemu-arm/boards/NETDUINO2.mk            |   2 +-
 ports/qemu-arm/boards/SABRELITE.mk            |   2 +-
 ports/qemu-arm/boards/VIRT_RV32.mk            |  14 ++
 ports/qemu-arm/{ => mcu/arm}/imx6.ld          |   0
 ports/qemu-arm/{ => mcu/arm}/mps2.ld          |   0
 ports/qemu-arm/{ => mcu/arm}/nrf51.ld         |   0
 ports/qemu-arm/{ => mcu/arm}/startup.c        |   0
 ports/qemu-arm/{ => mcu/arm}/stm32.ld         |   0
 .../mcu/rv32}/entrypoint.s                    |   0
 .../mcu/rv32}/interrupts.c                    |   0
 .../mcu/rv32}/startup.c                       |   0
 .../{qemu-riscv => qemu-arm/mcu/rv32}/virt.ld |   0
 ports/qemu-arm/mpconfigport.h                 |   6 +
 ports/qemu-arm/mphalport.h                    |   1 +
 ports/qemu-arm/uart.c                         |  35 ++++-
 ports/qemu-riscv/Makefile                     | 128 ------------------
 ports/qemu-riscv/Makefile.test                |  31 -----
 ports/qemu-riscv/README.md                    |  29 ----
 ports/qemu-riscv/main.c                       |  72 ----------
 ports/qemu-riscv/mpconfigport.h               |  77 -----------
 ports/qemu-riscv/mphalport.h                  |  32 -----
 ports/qemu-riscv/qstrdefsport.h               |   2 -
 ports/qemu-riscv/test_main.c                  |  66 ---------
 ports/qemu-riscv/tests_profile.txt            |   7 -
 ports/qemu-riscv/uart.c                       |  45 ------
 ports/qemu-riscv/uart.h                       |  33 -----
 tools/ci.sh                                   |  30 ++--
 33 files changed, 212 insertions(+), 602 deletions(-)
 delete mode 100644 .github/workflows/ports_qemu-riscv.yml
 create mode 100644 ports/qemu-arm/boards/VIRT_RV32.mk
 rename ports/qemu-arm/{ => mcu/arm}/imx6.ld (100%)
 rename ports/qemu-arm/{ => mcu/arm}/mps2.ld (100%)
 rename ports/qemu-arm/{ => mcu/arm}/nrf51.ld (100%)
 rename ports/qemu-arm/{ => mcu/arm}/startup.c (100%)
 rename ports/qemu-arm/{ => mcu/arm}/stm32.ld (100%)
 rename ports/{qemu-riscv => qemu-arm/mcu/rv32}/entrypoint.s (100%)
 rename ports/{qemu-riscv => qemu-arm/mcu/rv32}/interrupts.c (100%)
 rename ports/{qemu-riscv => qemu-arm/mcu/rv32}/startup.c (100%)
 rename ports/{qemu-riscv => qemu-arm/mcu/rv32}/virt.ld (100%)
 delete mode 100644 ports/qemu-riscv/Makefile
 delete mode 100644 ports/qemu-riscv/Makefile.test
 delete mode 100644 ports/qemu-riscv/README.md
 delete mode 100644 ports/qemu-riscv/main.c
 delete mode 100644 ports/qemu-riscv/mpconfigport.h
 delete mode 100644 ports/qemu-riscv/mphalport.h
 delete mode 100644 ports/qemu-riscv/qstrdefsport.h
 delete mode 100644 ports/qemu-riscv/test_main.c
 delete mode 100644 ports/qemu-riscv/tests_profile.txt
 delete mode 100644 ports/qemu-riscv/uart.c
 delete mode 100644 ports/qemu-riscv/uart.h

diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
index 99750b7535657..147d1b4b94231 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -19,14 +19,26 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_and_test:
+  build_and_test_arm:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
-      run: source tools/ci.sh && ci_qemu_arm_setup
+      run: source tools/ci.sh && ci_qemu_setup_arm
     - name: Build and run test suite
-      run: source tools/ci.sh && ci_qemu_arm_build
+      run: source tools/ci.sh && ci_qemu_build_arm
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
+  build_and_test_rv32:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_qemu_setup_rv32
+    - name: Build and run test suite
+      run: source tools/ci.sh && ci_qemu_build_rv32
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
diff --git a/.github/workflows/ports_qemu-riscv.yml b/.github/workflows/ports_qemu-riscv.yml
deleted file mode 100644
index 39ba06adb6cbd..0000000000000
--- a/.github/workflows/ports_qemu-riscv.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: qemu-riscv port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'shared/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/qemu-arm/main.c'
-      - 'ports/qemu-riscv/**'
-      - 'tests/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install packages
-      run: source tools/ci.sh && ci_qemu_riscv_setup
-    - name: Build and run test suite
-      run: source tools/ci.sh && ci_qemu_riscv_build
-    - name: Print failures
-      if: failure()
-      run: grep --before-context=100 --text "FAIL" ports/qemu-riscv/build/console.out
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index d748aa049bbb9..605b6b572c411 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -1,3 +1,6 @@
+################################################################################
+# Initial setup of Makefile environment
+
 BOARD ?= MPS2_AN385
 
 # Make the build directory reflect the board.
@@ -14,16 +17,79 @@ QSTR_DEFS = qstrdefsport.h
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
+
+ifeq ($(QEMU_ARCH),arm)
 FROZEN_MANIFEST ?= "freeze('test-frzmpy')"
+endif
+ifeq ($(QEMU_ARCH),riscv32)
+FROZEN_MANIFEST ?= "freeze('test-frzmpy', ('frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
+endif
 
 # include py core make definitions
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
+################################################################################
+# ARM specific settings
+
+ifeq ($(QEMU_ARCH),arm)
+
 CROSS_COMPILE ?= arm-none-eabi-
 
+LDFLAGS += -nostdlib
+LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+
+SRC_C += \
+	mcu/arm/startup.c \
+	shared/runtime/semihosting_arm.c \
+
+endif
+
+################################################################################
+# RISC-V 32-bit specific settings
+
+ifeq ($(QEMU_ARCH),riscv32)
+
+CROSS_COMPILE ?= riscv64-unknown-elf-
+
+GCC_VERSION = $(word 1, $(subst ., , $(shell $(CC) -dumpversion)))
+
+RV32_ABI = ilp32
+
+QEMU_ARGS += -bios none
+
+# GCC 10 and lower do not recognise the Zicsr extension in the architecture name.
+ifeq ($(shell test $(GCC_VERSION) -le 10; echo $$?),0)
+RV32_ARCH ?= rv32imac
+else
+# Recent GCC versions explicitly require to declare extensions.
+RV32_ARCH ?= rv32imac_zicsr
+endif
+
+AFLAGS += -mabi=$(RV32_ABI) -march=$(RV32_ARCH)
+CFLAGS += $(AFLAGS)
+LDFLAGS += -mabi=$(RV32_ABI) -march=$(RV32_ARCH) -Wl,-EL
+
+SRC_C += \
+	mcu/rv32/interrupts.c \
+	mcu/rv32/startup.c \
+
+SRC_BOARD_O += mcu/rv32/entrypoint.o
+
+endif
+
+################################################################################
+# Project specific settings and compiler/linker flags
+
 QEMU_SYSTEM = qemu-system-$(QEMU_ARCH)
 QEMU_ARGS += -machine $(QEMU_MACHINE) -nographic -monitor null -semihosting
+QEMU_ARGS += $(QEMU_EXTRA)
+
+# Specifying QEMU_DEBUG=1 will block qemu until a debugger is connected.
+ifeq ($(QEMU_DEBUG),1)
+QEMU_DEBUG_ARGS ?= -s
+QEMU_ARGS += -S $(QEMU_DEBUG_ARGS) $(QEMU_DEBUG_EXTRA)
+endif
 
 INC += -I.
 INC += -I$(TOP)
@@ -34,6 +100,8 @@ CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -We
 	 -ffunction-sections -fdata-sections
 CFLAGS += $(CFLAGS_EXTRA)
 
+LDFLAGS += -T $(LDSCRIPT) -Wl,--gc-sections -Wl,-Map=$(@:.elf=.map)
+
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
 CFLAGS += -g
@@ -42,25 +110,31 @@ else
 COPT += -Os -DNDEBUG
 endif
 
-## With CoudeSourcery it's actually a little different, you just need `-T generic-m-hosted.ld`.
-## Although for some reason `$(LD)` will not find that linker script, it works with `$(CC)`.
-## It turns out that this is specific to CoudeSourcery, and ARM version of GCC ships something
-## else instead and according to the following files, this is what we need to pass to `$(CC).
-## - gcc-arm-none-eabi-4_8-2014q1/share/gcc-arm-none-eabi/samples/src/makefile.conf
-## - gcc-arm-none-eabi-4_8-2014q1/share/gcc-arm-none-eabi/samples/src/qemu/Makefile
-LDFLAGS= -T $(LDSCRIPT) --gc-sections -Map=$(@:.elf=.map)
-LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+# If Picolibc is available then select it explicitly.  Ubuntu 22.04 ships its
+# bare metal RISC-V toolchain with Picolibc rather than Newlib, and the default
+# is "nosys" so a value must be provided.  To avoid having per-distro
+# workarounds, always select Picolibc if available.
+PICOLIBC_SPECS = $(shell $(CC) --print-file-name=picolibc.specs)
+ifeq ($(PICOLIBC_SPECS),picolibc.specs)
+# Picolibc was not found.
+else
+$(info picolibc used $(PICOLIBC_SPECS))
+SPECS_FRAGMENT = --specs=$(PICOLIBC_SPECS)
+CFLAGS += $(SPECS_FRAGMENT)
+LDFLAGS += $(SPECS_FRAGMENT)
+endif
 
-SRC_C = \
+################################################################################
+# Source files and libraries
+
+SRC_C += \
 	main.c \
-	startup.c \
 	uart.c \
 	mphalport.c \
 	shared/libc/string0.c \
 	shared/readline/readline.c \
 	shared/runtime/interrupt_char.c \
 	shared/runtime/pyexec.c \
-	shared/runtime/semihosting_arm.c \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 
@@ -75,6 +149,9 @@ OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(LIB_SRC_C)
 
+################################################################################
+# Main targets
+
 all: $(BUILD)/firmware.elf
 
 .PHONY: repl
@@ -91,9 +168,11 @@ test: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && ./run-tests.py --target qemu-arm --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
 
-## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here.
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 	$(Q)$(SIZE) $@
 
+################################################################################
+# Remaining make rules
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/qemu-arm/README.md b/ports/qemu-arm/README.md
index bb49571df4179..2e543e77ecc19 100644
--- a/ports/qemu-arm/README.md
+++ b/ports/qemu-arm/README.md
@@ -1,8 +1,8 @@
 MicroPython port to qemu-arm
 ============================
 
-This is experimental, community-supported port for Cortex-M emulation as
-provided by QEMU (http://qemu.org).
+This is experimental, community-supported port for Cortex-M and RISC-V RV32IMC
+emulation as provided by QEMU (http://qemu.org).
 
 The purposes of this port are to enable:
 
@@ -18,6 +18,25 @@ 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.
 
+Dependencies
+------------
+
+### ARM
+
+For ARM-based boards the build requires a bare-metal ARM toolchain, such as
+`arm-none-eabi-gcc`.
+
+### RISC-V
+
+For RISC-V-based boards the build requires a bare metal RISC-V toolchain with GCC 10
+or later, either with multilib support or 32 bits specific (M, C, and Zicsr
+extensions must be supported, along with ilp32 ABI).  Both newlib and picolibc are
+supported, with the latter having precedence if found.
+
+Most pre-built toolchains should work out of the box, either coming from your
+Linux distribution's package manager, or independently packaged ones like
+[xPack](https://xpack.github.io/dev-tools/riscv-none-elf-gcc/).
+
 Build instructions
 ------------------
 
@@ -36,12 +55,13 @@ different board pass the `BOARD` argument to `make`, for example:
 
 Available boards are:
 
-| Name for `BOARD=` | Corresponding qemu board |
-| ----------------- | ------------------------ |
-| `MICROBIT`        | `microbit`               |
-| `MPS2_AN385`      | `mps2-an385`             |
-| `NETDUINO2`       | `netduino2`              |
-| `SABRELITE`       | `sabrelite`              |
+| Name for `BOARD=` | Architecture | Corresponding qemu board |
+| ----------------- | ------------ | ------------------------ |
+| `MICROBIT`        | `arm`        | `microbit`               |
+| `MPS2_AN385`      | `arm`        | `mps2-an385`             |
+| `NETDUINO2`       | `arm`        | `netduino2`              |
+| `SABRELITE`       | `arm`        | `sabrelite`              |
+| `VIRT_RV32`       | `riscv32`    | `virt`                   |
 
 Running
 -------
@@ -84,3 +104,9 @@ The following options can be specified on the `make` command line:
 - `CFLAGS_EXTRA`: pass in extra flags for the compiler.
 - `RUN_TESTS_EXTRA`: pass in extra flags for `run-tests.py` when invoked via
   `make test`.
+- `QEMU_DEBUG=1`: when running qemu (via `repl`, `run` or `test` target), qemu
+  will block until a debugger is connected.  By default it waits for a gdb connection
+  on TCP port 1234.
+- `QEMU_DEBUG_ARGS`: defaults to `-s` (gdb on TCP port 1234), but can be overridden
+  with different qemu gdb arguments.
+- `QEMU_DEBUG_EXTRA`: extra options to pass to qemu when `QEMU_DEBUG=1` is used.
diff --git a/ports/qemu-arm/boards/MICROBIT.mk b/ports/qemu-arm/boards/MICROBIT.mk
index 90edb11aff1a8..02eb0576c3438 100644
--- a/ports/qemu-arm/boards/MICROBIT.mk
+++ b/ports/qemu-arm/boards/MICROBIT.mk
@@ -6,7 +6,7 @@ CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_NRF51
 CFLAGS += -DMICROPY_HW_MCU_NAME='"nRF51"'
 
-LDSCRIPT = nrf51.ld
+LDSCRIPT = mcu/arm/nrf51.ld
 
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb1.o
 
diff --git a/ports/qemu-arm/boards/MPS2_AN385.mk b/ports/qemu-arm/boards/MPS2_AN385.mk
index f155be03d29ed..182d076eb35d4 100644
--- a/ports/qemu-arm/boards/MPS2_AN385.mk
+++ b/ports/qemu-arm/boards/MPS2_AN385.mk
@@ -5,7 +5,7 @@ CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_MPS2
 CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-M3"'
 
-LDSCRIPT = mps2.ld
+LDSCRIPT = mcu/arm/mps2.ld
 
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 
diff --git a/ports/qemu-arm/boards/NETDUINO2.mk b/ports/qemu-arm/boards/NETDUINO2.mk
index 3067f094c60f9..ffa781f339977 100644
--- a/ports/qemu-arm/boards/NETDUINO2.mk
+++ b/ports/qemu-arm/boards/NETDUINO2.mk
@@ -5,7 +5,7 @@ CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_STM32
 CFLAGS += -DMICROPY_HW_MCU_NAME='"STM32"'
 
-LDSCRIPT = stm32.ld
+LDSCRIPT = mcu/arm/stm32.ld
 
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 
diff --git a/ports/qemu-arm/boards/SABRELITE.mk b/ports/qemu-arm/boards/SABRELITE.mk
index aef96f552744b..f1945c10fc2aa 100644
--- a/ports/qemu-arm/boards/SABRELITE.mk
+++ b/ports/qemu-arm/boards/SABRELITE.mk
@@ -8,7 +8,7 @@ CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-A9"'
 # Cortex-A9 should support unaligned-access, but qemu doesn't seem to.
 CFLAGS += -mno-unaligned-access
 
-LDSCRIPT = imx6.ld
+LDSCRIPT = mcu/arm/imx6.ld
 
 SRC_BOARD_O = shared/runtime/gchelper_generic.o
 
diff --git a/ports/qemu-arm/boards/VIRT_RV32.mk b/ports/qemu-arm/boards/VIRT_RV32.mk
new file mode 100644
index 0000000000000..ec3535eed3b06
--- /dev/null
+++ b/ports/qemu-arm/boards/VIRT_RV32.mk
@@ -0,0 +1,14 @@
+QEMU_ARCH = riscv32
+QEMU_MACHINE = virt
+
+CFLAGS += -DQEMU_SOC_VIRT
+CFLAGS += -DMICROPY_HW_MCU_NAME='"$(RV32_ARCH)"'
+
+LDSCRIPT = mcu/rv32/virt.ld
+
+SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
+
+MPY_CROSS_FLAGS += -march=rv32imc
+
+# These Thumb tests don't run on RV32, so exclude them.
+RUN_TESTS_ARGS = --exclude 'inlineasm|qemu-arm/asm_test'
diff --git a/ports/qemu-arm/imx6.ld b/ports/qemu-arm/mcu/arm/imx6.ld
similarity index 100%
rename from ports/qemu-arm/imx6.ld
rename to ports/qemu-arm/mcu/arm/imx6.ld
diff --git a/ports/qemu-arm/mps2.ld b/ports/qemu-arm/mcu/arm/mps2.ld
similarity index 100%
rename from ports/qemu-arm/mps2.ld
rename to ports/qemu-arm/mcu/arm/mps2.ld
diff --git a/ports/qemu-arm/nrf51.ld b/ports/qemu-arm/mcu/arm/nrf51.ld
similarity index 100%
rename from ports/qemu-arm/nrf51.ld
rename to ports/qemu-arm/mcu/arm/nrf51.ld
diff --git a/ports/qemu-arm/startup.c b/ports/qemu-arm/mcu/arm/startup.c
similarity index 100%
rename from ports/qemu-arm/startup.c
rename to ports/qemu-arm/mcu/arm/startup.c
diff --git a/ports/qemu-arm/stm32.ld b/ports/qemu-arm/mcu/arm/stm32.ld
similarity index 100%
rename from ports/qemu-arm/stm32.ld
rename to ports/qemu-arm/mcu/arm/stm32.ld
diff --git a/ports/qemu-riscv/entrypoint.s b/ports/qemu-arm/mcu/rv32/entrypoint.s
similarity index 100%
rename from ports/qemu-riscv/entrypoint.s
rename to ports/qemu-arm/mcu/rv32/entrypoint.s
diff --git a/ports/qemu-riscv/interrupts.c b/ports/qemu-arm/mcu/rv32/interrupts.c
similarity index 100%
rename from ports/qemu-riscv/interrupts.c
rename to ports/qemu-arm/mcu/rv32/interrupts.c
diff --git a/ports/qemu-riscv/startup.c b/ports/qemu-arm/mcu/rv32/startup.c
similarity index 100%
rename from ports/qemu-riscv/startup.c
rename to ports/qemu-arm/mcu/rv32/startup.c
diff --git a/ports/qemu-riscv/virt.ld b/ports/qemu-arm/mcu/rv32/virt.ld
similarity index 100%
rename from ports/qemu-riscv/virt.ld
rename to ports/qemu-arm/mcu/rv32/virt.ld
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 4059a5926d3cd..fe12fa57801d5 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -37,6 +37,8 @@
 #define MICROPY_EMIT_THUMB          (1)
 #define MICROPY_EMIT_INLINE_THUMB   (1)
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
+#elif defined(__riscv)
+#define MICROPY_EMIT_RV32           (1)
 #endif
 
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
@@ -47,7 +49,11 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_WARNINGS            (1)
 #define MICROPY_PY_IO_IOBASE        (0)
+#if defined(__ARM_ARCH)
 #define MICROPY_PY_SYS_PLATFORM     "qemu-arm"
+#elif defined(__riscv)
+#define MICROPY_PY_SYS_PLATFORM     "qemu-riscv32"
+#endif
 #define MICROPY_PY_SYS_STDIO_BUFFER (0)
 #define MICROPY_PY_SELECT           (0)
 #define MICROPY_PY_TIME             (0)
diff --git a/ports/qemu-arm/mphalport.h b/ports/qemu-arm/mphalport.h
index 348b45701b89e..9355107495373 100644
--- a/ports/qemu-arm/mphalport.h
+++ b/ports/qemu-arm/mphalport.h
@@ -24,4 +24,5 @@
  * THE SOFTWARE.
  */
 
+#include <stddef.h>
 #include "shared/runtime/interrupt_char.h"
diff --git a/ports/qemu-arm/uart.c b/ports/qemu-arm/uart.c
index 5ace3d465f147..fb9376d1fb71d 100644
--- a/ports/qemu-arm/uart.c
+++ b/ports/qemu-arm/uart.c
@@ -3,7 +3,8 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018-2021 Damien P. George
+ * Copyright (c) 2018-2024 Damien P. George
+ * Copyright (c) 2023 Alessandro Gatti
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -175,4 +176,36 @@ void uart_tx_strn(const char *buf, size_t len) {
     }
 }
 
+#elif defined(QEMU_SOC_VIRT)
+
+// Line status register bits.
+#define UART_LSR_THRE (0x20)
+#define UART_LSR_DR (0x01)
+
+typedef struct _UART_t {
+    volatile uint8_t DR;
+    volatile uint8_t r0[4];
+    volatile uint8_t LSR;
+} UART_t;
+
+#define UART0 ((UART_t *)(0x10000000))
+
+void uart_init(void) {
+}
+
+int uart_rx_chr(void) {
+    if (UART0->LSR & UART_LSR_DR) {
+        return UART0->DR;
+    }
+    return UART_RX_NO_CHAR;
+}
+
+void uart_tx_strn(const char *buffer, size_t length) {
+    for (size_t index = 0; index < length; index++) {
+        while (!(UART0->LSR & UART_LSR_THRE)) {
+        }
+        UART0->DR = buffer[index];
+    }
+}
+
 #endif
diff --git a/ports/qemu-riscv/Makefile b/ports/qemu-riscv/Makefile
deleted file mode 100644
index 473aec882d640..0000000000000
--- a/ports/qemu-riscv/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-include ../../py/mkenv.mk
--include mpconfigport.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# MicroPython feature configurations
-MICROPY_ROM_TEXT_COMPRESSION ?= 1
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-include $(TOP)/extmod/extmod.mk
-
-BOARD ?= virt
-
-CROSS_COMPILE ?= riscv64-unknown-elf-
-
-GCC_VERSION = $(word 1, $(subst ., , $(shell $(CC) -dumpversion)))
-
-# If Picolibc is available then select it explicitly.  Ubuntu 22.04 ships its
-# bare metal RISC-V toolchain with Picolibc rather than Newlib, and the default
-# is "nosys" so a value must be provided.  To avoid having per-distro
-# workarounds, always select Picolibc if available.
-PICOLIBC_SPECS = $(shell $(CC) --print-file-name=picolibc.specs)
-ifeq ($(PICOLIBC_SPECS),picolibc.specs)
-# Picolibc was not found.
-SPECS_FRAGMENT =
-else
-SPECS_FRAGMENT = --specs=$(PICOLIBC_SPECS)
-CFLAGS += $(SPECS_FRAGMENT)
-endif
-
-ifeq ($(BOARD),virt)
-ABI = ilp32
-# GCC 10 and lower do not recognise the Zicsr extension in the
-# architecture name.  "Make" unfortunately does not provide any simple way
-# to perform numeric comparisons, so to keep things simple we assume that
-# GCC is at least version 10 for the time being.
-ifeq ($(GCC_VERSION),10)
-ARCH ?= rv32imac
-else
-# Recent GCC versions explicitly require to declare extensions.
-ARCH ?= rv32imac_zicsr
-ARCH_LD ?= rv32imac_zicsr
-endif
-AFLAGS = -mabi=$(ABI) -march=$(ARCH)
-CFLAGS += $(AFLAGS)
-CFLAGS += -DQEMU_SOC_VIRT
-ARCH_LD ?= $(ARCH)
-LDSCRIPT = virt.ld
-LDFLAGS += -mabi=$(ABI) -march=$(ARCH_LD) -T $(LDSCRIPT) -Wl,-EL
-SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
-SRC_BOARD_O += entrypoint.o
-endif
-
-INC += -I.
-INC += -I$(TOP)
-INC += -I$(BUILD)
-
-CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 $(COPT) \
-	 -ffunction-sections -fdata-sections
-CFLAGS += $(CFLAGS_EXTRA)
-
-LD = $(CC)
-
-# Debugging/Optimization
-ifeq ($(DEBUG), 1)
-CFLAGS += -g
-COPT = -O0
-else
-COPT += -Os -DNDEBUG
-endif
-
-LDFLAGS += $(SPECS_FRAGMENT) -Wl,--gc-sections -Wl,-Map=$(@:.elf=.map)
-
-SRC_COMMON_C = \
-	interrupts.c \
-	startup.c \
-	uart.c \
-	shared/libc/string0.c \
-	shared/runtime/sys_stdio_mphal.c \
-
-SRC_RUN_C = \
-	main.c \
-
-SRC_TEST_C = \
-	test_main.c \
-	lib/tinytest/tinytest.c \
-
-LIB_SRC_C += $(SRC_LIB_LIBM_C)
-LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
-
-OBJ_COMMON =
-OBJ_COMMON += $(PY_O)
-OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_COMMON_C:.c=.o))
-OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_BOARD_O))
-OBJ_COMMON += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-
-OBJ_RUN =
-OBJ_RUN += $(addprefix $(BUILD)/, $(SRC_RUN_C:.c=.o))
-
-ALL_OBJ_RUN = $(OBJ_COMMON) $(OBJ_RUN)
-
-OBJ_TEST =
-OBJ_TEST += $(addprefix $(BUILD)/, $(SRC_TEST_C:.c=.o))
-
-ALL_OBJ_TEST = $(OBJ_COMMON) $(OBJ_TEST)
-
-# All object files, needed to get dependencies correct
-OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST)
-
-# List of sources for qstr extraction
-SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(LIB_SRC_C)
-
-all: run
-
-# `make debug` will block QEMU until a debugger is connected to port 1234.
-debug: $(BUILD)/firmware.elf
-	qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -serial mon:stdio -S -s -kernel $<
-
-run: $(BUILD)/firmware.elf
-	qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -kernel $<
-
-$(BUILD)/firmware.elf: $(LDSCRIPT) $(ALL_OBJ_RUN)
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_RUN) $(LIBS)
-	$(Q)$(SIZE) $@
-
-include $(TOP)/py/mkrules.mk
diff --git a/ports/qemu-riscv/Makefile.test b/ports/qemu-riscv/Makefile.test
deleted file mode 100644
index df64a8d7cc920..0000000000000
--- a/ports/qemu-riscv/Makefile.test
+++ /dev/null
@@ -1,31 +0,0 @@
-LIB_SRC_C = shared/upytesthelper/upytesthelper.c
-
-include Makefile
-
-CFLAGS += -DTEST
-
-.PHONY: $(BUILD)/genhdr/tests.h
-
-TESTS_PROFILE = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))/tests_profile.txt
-
-$(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
-$(BUILD)/genhdr/tests.h:
-	(cd $(TOP)/tests; ./run-tests.py --target=qemu-riscv --write-exp)
-	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py --profile $(TESTS_PROFILE) $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
-
-$(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
-
-$(BUILD)/firmware-test.elf: $(LDSCRIPT) $(ALL_OBJ_TEST)
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_TEST) $(LIBS)
-	$(Q)$(SIZE) $@
-
-# Note: Using timeout(1) to handle cases where qemu hangs (e.g. this can happen with alignment errors).
-test: $(BUILD)/firmware-test.elf
-	timeout --foreground -k 5s 60s qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -kernel $< > $(BUILD)/console.out
-	$(Q)tail -n2 $(BUILD)/console.out
-	$(Q)tail -n1 $(BUILD)/console.out | grep -q "status: 0"
-
-# `make debugtest` will block QEMU until a debugger is connected to port 1234.
-
-debugtest: $(BUILD)/firmware-test.elf
-	qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -serial mon:stdio -S -s -kernel $<
diff --git a/ports/qemu-riscv/README.md b/ports/qemu-riscv/README.md
deleted file mode 100644
index 50b1a65374d2b..0000000000000
--- a/ports/qemu-riscv/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-This is an experimental, community-supported port for RISC-V RV32IMC emulation
-as provided by QEMU (http://qemu.org).
-
-The purposes of this port are to enable:
-
-1. Continuous integration
-    - run tests against architecture-specific parts of code base
-2. Experimentation
-    - simulation & prototyping of anything that has architecture-specific
-      code
-    - exploring instruction set in terms of optimising some part of
-      MicroPython or a module
-3. Streamlined debugging
-    - no need for JTAG or even an MCU chip itself
-    - 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 requires a bare metal RISC-V toolchain with GCC 10 or later, either
-with multilib support or 32 bits specific (M, C, and Zicsr extensions must be
-supported, along with ilp32 ABI).  Both newlib and picolibc are supported,
-with the latter having precedence if found.
-
-Most pre-built toolchains should work out of the box, either coming from your
-Linux distribution's package manager, or independently packaged ones like
-[xPack](https://xpack.github.io/dev-tools/riscv-none-elf-gcc/).
-
-To build and run the image with builtin testsuite:
-
-    make -f Makefile.test test
diff --git a/ports/qemu-riscv/main.c b/ports/qemu-riscv/main.c
deleted file mode 100644
index 025c1f17da04a..0000000000000
--- a/ports/qemu-riscv/main.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-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 <stdlib.h>
-#include <stdio.h>
-
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/stackctrl.h"
-#include "py/gc.h"
-#include "py/mperrno.h"
-
-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, 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);
-    }
-}
-
-int main(int argc, char **argv) {
-    mp_stack_ctrl_init();
-    mp_stack_set_limit(10240);
-    uint32_t heap[16 * 1024 / 4];
-    gc_init(heap, (char *)heap + 16 * 1024);
-    mp_init();
-    do_str("print('hello world!')", MP_PARSE_SINGLE_INPUT);
-    mp_deinit();
-    return 0;
-}
-
-void gc_collect(void) {
-}
-
-mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-
-void nlr_jump_fail(void *val) {
-    printf("uncaught NLR\n");
-    exit(1);
-}
diff --git a/ports/qemu-riscv/mpconfigport.h b/ports/qemu-riscv/mpconfigport.h
deleted file mode 100644
index 38bc70e986adb..0000000000000
--- a/ports/qemu-riscv/mpconfigport.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2024 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
-
-#define MICROPY_CONFIG_ROM_LEVEL           (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
-
-#define MICROPY_EMIT_RV32                  (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_MEM_STATS                  (1)
-#define MICROPY_ENABLE_GC                  (1)
-#define MICROPY_KBD_EXCEPTION              (0)
-#define MICROPY_HELPER_REPL                (0)
-#define MICROPY_LONGINT_IMPL               (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_FLOAT_IMPL                 (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_WARNINGS                   (1)
-#define MICROPY_PY_BUILTINS_INPUT          (0)
-#define MICROPY_PY_BUILTINS_HELP           (0)
-#define MICROPY_PY_IO_IOBASE               (0)
-#define MICROPY_PY_SYS_PLATFORM            "qemu-riscv32"
-#define MICROPY_PY_SYS_STDFILES            (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER        (0)
-#define MICROPY_PY_SELECT                  (0)
-#define MICROPY_PY_TIME                    (0)
-#define MICROPY_PY_ASYNCIO                 (0)
-#define MICROPY_PY_MACHINE                 (1)
-#define MICROPY_PY_MACHINE_INCLUDEFILE     "ports/qemu-arm/modmachine.c"
-#define MICROPY_PY_MACHINE_PIN_BASE        (1)
-#define MICROPY_VFS                        (1)
-
-// type definitions for the specific machine
-
-#define MP_SSIZE_MAX (0x7fffffff)
-
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-
-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;
-
-// 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>
-
-#ifdef TEST
-#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-riscv/mphalport.h b/ports/qemu-riscv/mphalport.h
deleted file mode 100644
index 0cbdfc039144b..0000000000000
--- a/ports/qemu-riscv/mphalport.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016-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 <stddef.h>
-
-#include "uart.h"
-
-#define mp_hal_stdin_rx_chr() (0)
-#define mp_hal_stdout_tx_strn_cooked(s, l) uart_tx_strn((s), (l))
diff --git a/ports/qemu-riscv/qstrdefsport.h b/ports/qemu-riscv/qstrdefsport.h
deleted file mode 100644
index 00d3e2ae3c555..0000000000000
--- a/ports/qemu-riscv/qstrdefsport.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// qstrs specific to this port
-// *FORMAT-OFF*
diff --git a/ports/qemu-riscv/test_main.c b/ports/qemu-riscv/test_main.c
deleted file mode 100644
index ca796766aca5a..0000000000000
--- a/ports/qemu-riscv/test_main.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Ilya Dmitrichenko
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION 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 <stdio.h>
-
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/stackctrl.h"
-#include "py/gc.h"
-#include "py/mperrno.h"
-#include "shared/runtime/gchelper.h"
-#include "lib/tinytest/tinytest.h"
-#include "lib/tinytest/tinytest_macros.h"
-
-#define HEAP_SIZE (200 * 1024)
-
-#include "genhdr/tests.h"
-
-int main() {
-    mp_stack_ctrl_init();
-    mp_stack_set_limit(10240);
-    static uint32_t heap[HEAP_SIZE / sizeof(uint32_t)];
-    upytest_set_heap(heap, (char *)heap + HEAP_SIZE);
-    int r = tinytest_main(0, NULL, groups);
-    printf("status: %d\n", r);
-    return r;
-}
-
-void gc_collect(void) {
-    gc_collect_start();
-    gc_helper_collect_regs_and_stack();
-    gc_collect_end();
-}
-
-mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-
-void nlr_jump_fail(void *val) {
-    printf("uncaught NLR\n");
-    exit(1);
-}
diff --git a/ports/qemu-riscv/tests_profile.txt b/ports/qemu-riscv/tests_profile.txt
deleted file mode 100644
index 3d16e971be01e..0000000000000
--- a/ports/qemu-riscv/tests_profile.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Port-specific test directories.
-
-test_dirs.update(())
-
-# Port-specific tests exclusion list.
-
-exclude_tests.update(())
diff --git a/ports/qemu-riscv/uart.c b/ports/qemu-riscv/uart.c
deleted file mode 100644
index a266d6e6fdc8b..0000000000000
--- a/ports/qemu-riscv/uart.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2023 Alessandro Gatti
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION 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 "uart.h"
-
-#if defined(QEMU_SOC_VIRT)
-
-volatile unsigned char *uart_buffer = (volatile unsigned char *)0x10000000;
-
-void uart_init(void) {
-}
-
-void uart_tx_strn(const char *buffer, size_t length) {
-    for (size_t index = 0; index < length; index++) {
-        *uart_buffer = buffer[index];
-    }
-}
-
-#endif // QEMU_SOC_VIRT
diff --git a/ports/qemu-riscv/uart.h b/ports/qemu-riscv/uart.h
deleted file mode 100644
index fdaae424e19d1..0000000000000
--- a/ports/qemu-riscv/uart.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef MICROPY_INCLUDED_QEMU_RISCV_UART_H
-#define MICROPY_INCLUDED_QEMU_RISCV_UART_H
-
-void uart_init(void);
-void uart_tx_strn(const char *buf, size_t len);
-
-#endif // MICROPY_INCLUDED_QEMU_RISCV_UART_H
diff --git a/tools/ci.sh b/tools/ci.sh
index abfb965b543aa..70fdb487eeba2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -246,14 +246,21 @@ function ci_powerpc_build {
 ########################################################################################
 # ports/qemu-arm
 
-function ci_qemu_arm_setup {
+function ci_qemu_setup_arm {
     ci_gcc_arm_setup
     sudo apt-get update
     sudo apt-get install qemu-system
     qemu-system-arm --version
 }
 
-function ci_qemu_arm_build {
+function ci_qemu_setup_rv32 {
+    ci_gcc_riscv_setup
+    sudo apt-get update
+    sudo apt-get install qemu-system
+    qemu-system-riscv32 --version
+}
+
+function ci_qemu_build_arm {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/qemu-arm submodules
     make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
@@ -262,23 +269,10 @@ function ci_qemu_arm_build {
     make ${MAKEOPTS} -C ports/qemu-arm BOARD=SABRELITE test
 }
 
-########################################################################################
-# ports/qemu-riscv
-
-function ci_qemu_riscv_setup {
-    ci_gcc_riscv_setup
-    sudo apt-get update
-    sudo apt-get install qemu-system
-    qemu-system-riscv32 --version
-}
-
-function ci_qemu_riscv_build {
+function ci_qemu_build_rv32 {
     make ${MAKEOPTS} -C mpy-cross
-    make ${MAKEOPTS} -C ports/qemu-riscv submodules
-    make ${MAKEOPTS} -C ports/qemu-riscv
-    make ${MAKEOPTS} -C ports/qemu-riscv clean
-    make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test submodules
-    make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test test
+    make ${MAKEOPTS} -C ports/qemu-arm BOARD=VIRT_RV32 submodules
+    make ${MAKEOPTS} -C ports/qemu-arm BOARD=VIRT_RV32 test
 }
 
 ########################################################################################

From 3ea1ce63da9bd17c7d395682387e58b4a7759167 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 6 Sep 2024 11:04:13 +1000
Subject: [PATCH 1397/3129] all: Remove remaining qemu-riscv references.

Signed-off-by: Damien George <damien@micropython.org>
---
 README.md          | 1 -
 tests/run-tests.py | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/README.md b/README.md
index 02e0b3abb357b..a4086c68a6e9c 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,6 @@ In addition, the following ports are provided in this repository:
  - [pic16bit](ports/pic16bit) -- Microchip PIC 16-bit.
  - [powerpc](ports/powerpc) -- IBM PowerPC (including Microwatt)
  - [qemu-arm](ports/qemu-arm) -- QEMU-based Arm emulated target (for testing)
- - [qemu-riscv](ports/qemu-riscv) -- QEMU-based RISC-V 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.
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 999812bd5db9f..b80a78ed6a059 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -681,8 +681,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             skip_tests.add("inlineasm/asmfpldrstr.py")
             skip_tests.add("inlineasm/asmfpmuldiv.py")
             skip_tests.add("inlineasm/asmfpsqrt.py")
-        elif args.target == "qemu-riscv":
-            skip_tests.add("misc/print_exception.py")  # requires sys stdfiles
         elif args.target == "webassembly":
             skip_tests.add("basics/string_format_modulo.py")  # can't print nulls to stdout
             skip_tests.add("basics/string_strip.py")  # can't print nulls to stdout
@@ -1047,7 +1045,6 @@ def main():
 
     LOCAL_TARGETS = (
         "unix",
-        "qemu-riscv",
         "webassembly",
     )
     EXTERNAL_TARGETS = (
@@ -1140,12 +1137,6 @@ def main():
                     "inlineasm",
                     "ports/qemu-arm",
                 )
-            elif args.target == "qemu-riscv":
-                if not args.write_exp:
-                    raise ValueError("--target=qemu-riscv 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",)
             elif args.target == "webassembly":
                 test_dirs += ("float", "ports/webassembly")
         else:

From 659113825d10bf2ae71dd215a8597451e505982d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 4 Sep 2024 17:06:25 +1000
Subject: [PATCH 1398/3129] qemu: Rename qemu-arm port to qemu.

Because this port now supports multiple architectures.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../{ports_qemu-arm.yml => ports_qemu.yml}       |  4 ++--
 README.md                                        |  2 +-
 ports/{qemu-arm => qemu}/Makefile                |  2 +-
 ports/{qemu-arm => qemu}/README.md               |  6 +++---
 ports/{qemu-arm => qemu}/boards/MICROBIT.mk      |  0
 ports/{qemu-arm => qemu}/boards/MPS2_AN385.mk    |  0
 ports/{qemu-arm => qemu}/boards/NETDUINO2.mk     |  0
 ports/{qemu-arm => qemu}/boards/SABRELITE.mk     |  0
 ports/{qemu-arm => qemu}/boards/VIRT_RV32.mk     |  2 +-
 ports/{qemu-arm => qemu}/main.c                  |  0
 ports/{qemu-arm => qemu}/mcu/arm/imx6.ld         |  0
 ports/{qemu-arm => qemu}/mcu/arm/mps2.ld         |  0
 ports/{qemu-arm => qemu}/mcu/arm/nrf51.ld        |  0
 ports/{qemu-arm => qemu}/mcu/arm/startup.c       |  0
 ports/{qemu-arm => qemu}/mcu/arm/stm32.ld        |  0
 ports/{qemu-arm => qemu}/mcu/rv32/entrypoint.s   |  0
 ports/{qemu-arm => qemu}/mcu/rv32/interrupts.c   |  0
 ports/{qemu-arm => qemu}/mcu/rv32/startup.c      |  0
 ports/{qemu-arm => qemu}/mcu/rv32/virt.ld        |  0
 ports/{qemu-arm => qemu}/modmachine.c            |  0
 ports/{qemu-arm => qemu}/mpconfigport.h          |  8 ++------
 ports/{qemu-arm => qemu}/mphalport.c             |  0
 ports/{qemu-arm => qemu}/mphalport.h             |  0
 ports/{qemu-arm => qemu}/qstrdefsport.h          |  0
 .../{qemu-arm => qemu}/test-frzmpy/frozen_asm.py |  0
 .../test-frzmpy/frozen_const.py                  |  0
 .../test-frzmpy/frozen_viper.py                  |  0
 .../test-frzmpy/native_frozen_align.py           |  0
 ports/{qemu-arm => qemu}/uart.c                  |  0
 ports/{qemu-arm => qemu}/uart.h                  |  0
 tests/float/float_format_ints_power10.py         |  2 +-
 tests/ports/{qemu-arm => qemu}/asm_test.py       |  0
 tests/ports/{qemu-arm => qemu}/asm_test.py.exp   |  0
 tests/ports/{qemu-arm => qemu}/native_test.py    |  0
 .../ports/{qemu-arm => qemu}/native_test.py.exp  |  0
 tests/ports/{qemu-arm => qemu}/viper_test.py     |  0
 tests/ports/{qemu-arm => qemu}/viper_test.py.exp |  0
 tests/run-tests.py                               |  8 ++++----
 tools/ci.sh                                      | 16 ++++++++--------
 39 files changed, 23 insertions(+), 27 deletions(-)
 rename .github/workflows/{ports_qemu-arm.yml => ports_qemu.yml} (95%)
 rename ports/{qemu-arm => qemu}/Makefile (96%)
 rename ports/{qemu-arm => qemu}/README.md (97%)
 rename ports/{qemu-arm => qemu}/boards/MICROBIT.mk (100%)
 rename ports/{qemu-arm => qemu}/boards/MPS2_AN385.mk (100%)
 rename ports/{qemu-arm => qemu}/boards/NETDUINO2.mk (100%)
 rename ports/{qemu-arm => qemu}/boards/SABRELITE.mk (100%)
 rename ports/{qemu-arm => qemu}/boards/VIRT_RV32.mk (84%)
 rename ports/{qemu-arm => qemu}/main.c (100%)
 rename ports/{qemu-arm => qemu}/mcu/arm/imx6.ld (100%)
 rename ports/{qemu-arm => qemu}/mcu/arm/mps2.ld (100%)
 rename ports/{qemu-arm => qemu}/mcu/arm/nrf51.ld (100%)
 rename ports/{qemu-arm => qemu}/mcu/arm/startup.c (100%)
 rename ports/{qemu-arm => qemu}/mcu/arm/stm32.ld (100%)
 rename ports/{qemu-arm => qemu}/mcu/rv32/entrypoint.s (100%)
 rename ports/{qemu-arm => qemu}/mcu/rv32/interrupts.c (100%)
 rename ports/{qemu-arm => qemu}/mcu/rv32/startup.c (100%)
 rename ports/{qemu-arm => qemu}/mcu/rv32/virt.ld (100%)
 rename ports/{qemu-arm => qemu}/modmachine.c (100%)
 rename ports/{qemu-arm => qemu}/mpconfigport.h (92%)
 rename ports/{qemu-arm => qemu}/mphalport.c (100%)
 rename ports/{qemu-arm => qemu}/mphalport.h (100%)
 rename ports/{qemu-arm => qemu}/qstrdefsport.h (100%)
 rename ports/{qemu-arm => qemu}/test-frzmpy/frozen_asm.py (100%)
 rename ports/{qemu-arm => qemu}/test-frzmpy/frozen_const.py (100%)
 rename ports/{qemu-arm => qemu}/test-frzmpy/frozen_viper.py (100%)
 rename ports/{qemu-arm => qemu}/test-frzmpy/native_frozen_align.py (100%)
 rename ports/{qemu-arm => qemu}/uart.c (100%)
 rename ports/{qemu-arm => qemu}/uart.h (100%)
 rename tests/ports/{qemu-arm => qemu}/asm_test.py (100%)
 rename tests/ports/{qemu-arm => qemu}/asm_test.py.exp (100%)
 rename tests/ports/{qemu-arm => qemu}/native_test.py (100%)
 rename tests/ports/{qemu-arm => qemu}/native_test.py.exp (100%)
 rename tests/ports/{qemu-arm => qemu}/viper_test.py (100%)
 rename tests/ports/{qemu-arm => qemu}/viper_test.py.exp (100%)

diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu.yml
similarity index 95%
rename from .github/workflows/ports_qemu-arm.yml
rename to .github/workflows/ports_qemu.yml
index 147d1b4b94231..57192c43936e5 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -1,4 +1,4 @@
-name: qemu-arm port
+name: qemu port
 
 on:
   push:
@@ -11,7 +11,7 @@ on:
       - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
-      - 'ports/qemu-arm/**'
+      - 'ports/qemu/**'
       - 'tests/**'
 
 concurrency:
diff --git a/README.md b/README.md
index a4086c68a6e9c..c71fa4b1ddf48 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ In addition, the following ports are provided in this repository:
  - [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 Arm emulated target (for testing)
+ - [qemu](ports/qemu) -- 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.
diff --git a/ports/qemu-arm/Makefile b/ports/qemu/Makefile
similarity index 96%
rename from ports/qemu-arm/Makefile
rename to ports/qemu/Makefile
index 605b6b572c411..4d73c025d7dc9 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu/Makefile
@@ -166,7 +166,7 @@ run: $(BUILD)/firmware.elf
 .PHONY: test
 test: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && ./run-tests.py --target qemu-arm --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
+	cd $(TOP)/tests && ./run-tests.py --target qemu --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
 
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
 	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
diff --git a/ports/qemu-arm/README.md b/ports/qemu/README.md
similarity index 97%
rename from ports/qemu-arm/README.md
rename to ports/qemu/README.md
index 2e543e77ecc19..d9108311bef92 100644
--- a/ports/qemu-arm/README.md
+++ b/ports/qemu/README.md
@@ -1,5 +1,5 @@
-MicroPython port to qemu-arm
-============================
+MicroPython port to qemu
+========================
 
 This is experimental, community-supported port for Cortex-M and RISC-V RV32IMC
 emulation as provided by QEMU (http://qemu.org).
@@ -95,7 +95,7 @@ Or manually by first starting the emulation with `make run` and then running the
 tests against the serial device, for example:
 
     $ cd ../../tests
-    $ ./run-tests.py --target qemu-arm --device /dev/pts/1
+    $ ./run-tests.py --target qemu --device /dev/pts/1
 
 Extra make options
 ------------------
diff --git a/ports/qemu-arm/boards/MICROBIT.mk b/ports/qemu/boards/MICROBIT.mk
similarity index 100%
rename from ports/qemu-arm/boards/MICROBIT.mk
rename to ports/qemu/boards/MICROBIT.mk
diff --git a/ports/qemu-arm/boards/MPS2_AN385.mk b/ports/qemu/boards/MPS2_AN385.mk
similarity index 100%
rename from ports/qemu-arm/boards/MPS2_AN385.mk
rename to ports/qemu/boards/MPS2_AN385.mk
diff --git a/ports/qemu-arm/boards/NETDUINO2.mk b/ports/qemu/boards/NETDUINO2.mk
similarity index 100%
rename from ports/qemu-arm/boards/NETDUINO2.mk
rename to ports/qemu/boards/NETDUINO2.mk
diff --git a/ports/qemu-arm/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE.mk
similarity index 100%
rename from ports/qemu-arm/boards/SABRELITE.mk
rename to ports/qemu/boards/SABRELITE.mk
diff --git a/ports/qemu-arm/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32.mk
similarity index 84%
rename from ports/qemu-arm/boards/VIRT_RV32.mk
rename to ports/qemu/boards/VIRT_RV32.mk
index ec3535eed3b06..a61b659fa6d40 100644
--- a/ports/qemu-arm/boards/VIRT_RV32.mk
+++ b/ports/qemu/boards/VIRT_RV32.mk
@@ -11,4 +11,4 @@ SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
 MPY_CROSS_FLAGS += -march=rv32imc
 
 # These Thumb tests don't run on RV32, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm|qemu-arm/asm_test'
+RUN_TESTS_ARGS = --exclude 'inlineasm|qemu/asm_test'
diff --git a/ports/qemu-arm/main.c b/ports/qemu/main.c
similarity index 100%
rename from ports/qemu-arm/main.c
rename to ports/qemu/main.c
diff --git a/ports/qemu-arm/mcu/arm/imx6.ld b/ports/qemu/mcu/arm/imx6.ld
similarity index 100%
rename from ports/qemu-arm/mcu/arm/imx6.ld
rename to ports/qemu/mcu/arm/imx6.ld
diff --git a/ports/qemu-arm/mcu/arm/mps2.ld b/ports/qemu/mcu/arm/mps2.ld
similarity index 100%
rename from ports/qemu-arm/mcu/arm/mps2.ld
rename to ports/qemu/mcu/arm/mps2.ld
diff --git a/ports/qemu-arm/mcu/arm/nrf51.ld b/ports/qemu/mcu/arm/nrf51.ld
similarity index 100%
rename from ports/qemu-arm/mcu/arm/nrf51.ld
rename to ports/qemu/mcu/arm/nrf51.ld
diff --git a/ports/qemu-arm/mcu/arm/startup.c b/ports/qemu/mcu/arm/startup.c
similarity index 100%
rename from ports/qemu-arm/mcu/arm/startup.c
rename to ports/qemu/mcu/arm/startup.c
diff --git a/ports/qemu-arm/mcu/arm/stm32.ld b/ports/qemu/mcu/arm/stm32.ld
similarity index 100%
rename from ports/qemu-arm/mcu/arm/stm32.ld
rename to ports/qemu/mcu/arm/stm32.ld
diff --git a/ports/qemu-arm/mcu/rv32/entrypoint.s b/ports/qemu/mcu/rv32/entrypoint.s
similarity index 100%
rename from ports/qemu-arm/mcu/rv32/entrypoint.s
rename to ports/qemu/mcu/rv32/entrypoint.s
diff --git a/ports/qemu-arm/mcu/rv32/interrupts.c b/ports/qemu/mcu/rv32/interrupts.c
similarity index 100%
rename from ports/qemu-arm/mcu/rv32/interrupts.c
rename to ports/qemu/mcu/rv32/interrupts.c
diff --git a/ports/qemu-arm/mcu/rv32/startup.c b/ports/qemu/mcu/rv32/startup.c
similarity index 100%
rename from ports/qemu-arm/mcu/rv32/startup.c
rename to ports/qemu/mcu/rv32/startup.c
diff --git a/ports/qemu-arm/mcu/rv32/virt.ld b/ports/qemu/mcu/rv32/virt.ld
similarity index 100%
rename from ports/qemu-arm/mcu/rv32/virt.ld
rename to ports/qemu/mcu/rv32/virt.ld
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu/modmachine.c
similarity index 100%
rename from ports/qemu-arm/modmachine.c
rename to ports/qemu/modmachine.c
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu/mpconfigport.h
similarity index 92%
rename from ports/qemu-arm/mpconfigport.h
rename to ports/qemu/mpconfigport.h
index fe12fa57801d5..f3dd8c37508d3 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -49,17 +49,13 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_WARNINGS            (1)
 #define MICROPY_PY_IO_IOBASE        (0)
-#if defined(__ARM_ARCH)
-#define MICROPY_PY_SYS_PLATFORM     "qemu-arm"
-#elif defined(__riscv)
-#define MICROPY_PY_SYS_PLATFORM     "qemu-riscv32"
-#endif
+#define MICROPY_PY_SYS_PLATFORM     "qemu"
 #define MICROPY_PY_SYS_STDIO_BUFFER (0)
 #define MICROPY_PY_SELECT           (0)
 #define MICROPY_PY_TIME             (0)
 #define MICROPY_PY_ASYNCIO          (0)
 #define MICROPY_PY_MACHINE          (1)
-#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/qemu-arm/modmachine.c"
+#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/qemu/modmachine.c"
 #define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_PIN_BASE (1)
 #define MICROPY_VFS                 (1)
diff --git a/ports/qemu-arm/mphalport.c b/ports/qemu/mphalport.c
similarity index 100%
rename from ports/qemu-arm/mphalport.c
rename to ports/qemu/mphalport.c
diff --git a/ports/qemu-arm/mphalport.h b/ports/qemu/mphalport.h
similarity index 100%
rename from ports/qemu-arm/mphalport.h
rename to ports/qemu/mphalport.h
diff --git a/ports/qemu-arm/qstrdefsport.h b/ports/qemu/qstrdefsport.h
similarity index 100%
rename from ports/qemu-arm/qstrdefsport.h
rename to ports/qemu/qstrdefsport.h
diff --git a/ports/qemu-arm/test-frzmpy/frozen_asm.py b/ports/qemu/test-frzmpy/frozen_asm.py
similarity index 100%
rename from ports/qemu-arm/test-frzmpy/frozen_asm.py
rename to ports/qemu/test-frzmpy/frozen_asm.py
diff --git a/ports/qemu-arm/test-frzmpy/frozen_const.py b/ports/qemu/test-frzmpy/frozen_const.py
similarity index 100%
rename from ports/qemu-arm/test-frzmpy/frozen_const.py
rename to ports/qemu/test-frzmpy/frozen_const.py
diff --git a/ports/qemu-arm/test-frzmpy/frozen_viper.py b/ports/qemu/test-frzmpy/frozen_viper.py
similarity index 100%
rename from ports/qemu-arm/test-frzmpy/frozen_viper.py
rename to ports/qemu/test-frzmpy/frozen_viper.py
diff --git a/ports/qemu-arm/test-frzmpy/native_frozen_align.py b/ports/qemu/test-frzmpy/native_frozen_align.py
similarity index 100%
rename from ports/qemu-arm/test-frzmpy/native_frozen_align.py
rename to ports/qemu/test-frzmpy/native_frozen_align.py
diff --git a/ports/qemu-arm/uart.c b/ports/qemu/uart.c
similarity index 100%
rename from ports/qemu-arm/uart.c
rename to ports/qemu/uart.c
diff --git a/ports/qemu-arm/uart.h b/ports/qemu/uart.h
similarity index 100%
rename from ports/qemu-arm/uart.h
rename to ports/qemu/uart.h
diff --git a/tests/float/float_format_ints_power10.py b/tests/float/float_format_ints_power10.py
index 98900c135b2e4..7ea200f18ef06 100644
--- a/tests/float/float_format_ints_power10.py
+++ b/tests/float/float_format_ints_power10.py
@@ -3,6 +3,6 @@
 
 # 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
+    # It works to 12 digits on all platforms *except* qemu, where
     # 10^11 comes out as 10000000820 or something.
     print(i, "{:.7g}".format(float("1e" + str(i))))
diff --git a/tests/ports/qemu-arm/asm_test.py b/tests/ports/qemu/asm_test.py
similarity index 100%
rename from tests/ports/qemu-arm/asm_test.py
rename to tests/ports/qemu/asm_test.py
diff --git a/tests/ports/qemu-arm/asm_test.py.exp b/tests/ports/qemu/asm_test.py.exp
similarity index 100%
rename from tests/ports/qemu-arm/asm_test.py.exp
rename to tests/ports/qemu/asm_test.py.exp
diff --git a/tests/ports/qemu-arm/native_test.py b/tests/ports/qemu/native_test.py
similarity index 100%
rename from tests/ports/qemu-arm/native_test.py
rename to tests/ports/qemu/native_test.py
diff --git a/tests/ports/qemu-arm/native_test.py.exp b/tests/ports/qemu/native_test.py.exp
similarity index 100%
rename from tests/ports/qemu-arm/native_test.py.exp
rename to tests/ports/qemu/native_test.py.exp
diff --git a/tests/ports/qemu-arm/viper_test.py b/tests/ports/qemu/viper_test.py
similarity index 100%
rename from tests/ports/qemu-arm/viper_test.py
rename to tests/ports/qemu/viper_test.py
diff --git a/tests/ports/qemu-arm/viper_test.py.exp b/tests/ports/qemu/viper_test.py.exp
similarity index 100%
rename from tests/ports/qemu-arm/viper_test.py.exp
rename to tests/ports/qemu/viper_test.py.exp
diff --git a/tests/run-tests.py b/tests/run-tests.py
index b80a78ed6a059..43a9e38d327ab 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -675,7 +675,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             skip_tests.add(
                 "extmod/time_time_ns.py"
             )  # RA fsp rtc function doesn't support nano sec info
-        elif args.target == "qemu-arm":
+        elif args.target == "qemu":
             skip_tests.add("inlineasm/asmfpaddsub.py")  # requires Cortex-M4
             skip_tests.add("inlineasm/asmfpcmp.py")
             skip_tests.add("inlineasm/asmfpldrstr.py")
@@ -1054,7 +1054,7 @@ def main():
         "esp32",
         "minimal",
         "nrf",
-        "qemu-arm",
+        "qemu",
         "renesas-ra",
         "rp2",
     )
@@ -1131,11 +1131,11 @@ def main():
                     "cmdline",
                     "ports/unix",
                 )
-            elif args.target == "qemu-arm":
+            elif args.target == "qemu":
                 test_dirs += (
                     "float",
                     "inlineasm",
-                    "ports/qemu-arm",
+                    "ports/qemu",
                 )
             elif args.target == "webassembly":
                 test_dirs += ("float", "ports/webassembly")
diff --git a/tools/ci.sh b/tools/ci.sh
index 70fdb487eeba2..46aee1a3a274b 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -244,7 +244,7 @@ function ci_powerpc_build {
 }
 
 ########################################################################################
-# ports/qemu-arm
+# ports/qemu
 
 function ci_qemu_setup_arm {
     ci_gcc_arm_setup
@@ -262,17 +262,17 @@ function ci_qemu_setup_rv32 {
 
 function ci_qemu_build_arm {
     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 test
-    make ${MAKEOPTS} -C ports/qemu-arm BOARD=SABRELITE test
+    make ${MAKEOPTS} -C ports/qemu submodules
+    make ${MAKEOPTS} -C ports/qemu CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
+    make ${MAKEOPTS} -C ports/qemu clean
+    make ${MAKEOPTS} -C ports/qemu test
+    make ${MAKEOPTS} -C ports/qemu BOARD=SABRELITE test
 }
 
 function ci_qemu_build_rv32 {
     make ${MAKEOPTS} -C mpy-cross
-    make ${MAKEOPTS} -C ports/qemu-arm BOARD=VIRT_RV32 submodules
-    make ${MAKEOPTS} -C ports/qemu-arm BOARD=VIRT_RV32 test
+    make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 submodules
+    make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 test
 }
 
 ########################################################################################

From 455415b1e1199c4364e84cc31905452f7c4ec399 Mon Sep 17 00:00:00 2001
From: timdechant <timdechant.git@gmail.com>
Date: Mon, 26 Aug 2024 10:34:42 -0400
Subject: [PATCH 1399/3129] shared/runtime/sys_stdio_mphal: Fix printed type
 for stdio streams.

The printed type for stdio streams indicates "FileIO", which is a binary IO
stream.  Stdio is not binary by design, and its printed type should
indicate a text stream.  "TextIOWrapper" suits that purpose, and is used
by VfsPosix files.

Signed-off-by: timdechant <timdechant.git@gmail.com>
---
 shared/runtime/sys_stdio_mphal.c     |  4 ++--
 tests/basics/sys_stdio.py            | 21 +++++++++++++++++++++
 tests/basics/sys_stdio_buffer.py     | 21 +++++++++++++++++++++
 tests/basics/sys_stdio_buffer.py.exp |  6 ++++++
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 tests/basics/sys_stdio.py
 create mode 100644 tests/basics/sys_stdio_buffer.py
 create mode 100644 tests/basics/sys_stdio_buffer.py.exp

diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index ad045fb3a9537..b82725bfa7bf8 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -54,7 +54,7 @@ static const sys_stdio_obj_t stdio_buffer_obj;
 
 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);
+    mp_printf(print, "<io.%s %d>", mp_obj_get_type_str(self_in), self->fd);
 }
 
 static mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
@@ -122,7 +122,7 @@ static const mp_stream_p_t stdio_obj_stream_p = {
 
 MP_DEFINE_CONST_OBJ_TYPE(
     stdio_obj_type,
-    MP_QSTR_FileIO,
+    MP_QSTR_TextIOWrapper,
     MP_TYPE_FLAG_ITER_IS_STREAM,
     print, stdio_obj_print,
     protocol, &stdio_obj_stream_p,
diff --git a/tests/basics/sys_stdio.py b/tests/basics/sys_stdio.py
new file mode 100644
index 0000000000000..8d746b8b4b257
--- /dev/null
+++ b/tests/basics/sys_stdio.py
@@ -0,0 +1,21 @@
+# Test sys.std* objects.
+
+import sys
+
+try:
+    sys.stdout
+    sys.stdin
+    sys.stderr
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+# CPython is more verbose; no need to match exactly
+
+print('TextIOWrapper' in str(sys.stdout))
+print('TextIOWrapper' in str(sys.stderr))
+print('TextIOWrapper' in str(sys.stdin))
+
+print('TextIOWrapper' in str(type(sys.stdout)))
+print('TextIOWrapper' in str(type(sys.stderr)))
+print('TextIOWrapper' in str(type(sys.stdin)))
diff --git a/tests/basics/sys_stdio_buffer.py b/tests/basics/sys_stdio_buffer.py
new file mode 100644
index 0000000000000..ae354ec7fbec1
--- /dev/null
+++ b/tests/basics/sys_stdio_buffer.py
@@ -0,0 +1,21 @@
+# Test sys.std*.buffer objects.
+
+import sys
+
+try:
+    sys.stdout.buffer
+    sys.stdin.buffer
+    sys.stderr.buffer
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+# CPython is more verbose; no need to match exactly
+
+print('FileIO' in str(sys.stdout.buffer))
+print('FileIO' in str(sys.stderr.buffer))
+print('FileIO' in str(sys.stdin.buffer))
+
+print('FileIO' in str(type(sys.stdout.buffer)))
+print('FileIO' in str(type(sys.stderr.buffer)))
+print('FileIO' in str(type(sys.stdin.buffer)))
diff --git a/tests/basics/sys_stdio_buffer.py.exp b/tests/basics/sys_stdio_buffer.py.exp
new file mode 100644
index 0000000000000..681c7ec9e8402
--- /dev/null
+++ b/tests/basics/sys_stdio_buffer.py.exp
@@ -0,0 +1,6 @@
+True
+True
+True
+True
+True
+True

From d04974d8d0531f2f868c2d698ec8c44016a0c115 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 27 Aug 2024 11:21:27 +1000
Subject: [PATCH 1400/3129] unix: Expand the build steps in the README.

- Present the default build dependencies in one place at the top, and make
  a separate section about building standalone.

- Add steps for the "minimal" variant as well.

- Document that building standalone requires autoconf and libtool.

- Allow MICROPY_STANDALONE to be set as an environment variable.

Fixes issue #11313.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/README.md       | 117 ++++++++++++++++++++++++++++---------
 ports/unix/mpconfigport.mk |   2 +-
 2 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/ports/unix/README.md b/ports/unix/README.md
index e15fd93b2312d..6481522639c3a 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -1,17 +1,59 @@
-The Unix version
-----------------
+MicroPython Unix port
+=====================
 
-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
+The "unix" port runs in standard Unix-like environments including 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. Extending the unix 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):
+Building
+--------
+
+### Dependencies
+
+To build the unix port locally then you will need:
+
+* git command line executable, unless you downloaded a source .tar.xz file from
+  https://micropython.org/download/
+* gcc (or clang for macOS) toolchain
+* GNU Make
+* Python 3.x
+
+To build the default "standard" variant and configuration, then you will also
+need:
+
+* `pkg-config` tool
+* `libffi` library and headers
+
+On Debian/Ubuntu/Mint and related Linux distros, you can install all these
+dependencies with a command like:
+
+```
+# apt install build-essential git python3 pkg-config libbfi-dev
+```
+
+(See below for steps to build either a standalone or minimal MicroPython
+executable that doesn't require system `libffi` or `pkg-config`.)
+
+### Default build steps
+
+To set up the environment for building (not needed every time), starting from
+the top-level MicroPython directory:
 
     $ cd ports/unix
+    $ make -C ../../mpy-cross
     $ make submodules
+
+The `mpy-cross` step builds the [MicroPython
+cross-compiler](https://github.com/micropython/micropython/?tab=readme-ov-file#the-micropython-cross-compiler-mpy-cross).
+The `make submodules` step can be skipped if you didn't clone the MicroPython
+source from git.
+
+Next, to build the actual executable (still in the `ports/unix` directory):
+
     $ make
 
 Then to give it a try:
@@ -45,40 +87,59 @@ Browse available modules at
 [Package management](https://docs.micropython.org/en/latest/reference/packages.html)
 for more information about `mip`.
 
-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.
+### Minimal Variant
 
-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:
+The "standard" variant of MicroPython is the default. It enables most features,
+including external modules interfaced using `libffi`. To instead build the
+"minimal" variant, which disables almost all optional features and modules:
 
+    $ cd ports/unix
     $ make submodules
+    $ make VARIANT=minimal
+
+The executable will be built at `build-minimal/micropython`.
+
+Additional variants can be found in the `variants` sub-directory of the port,
+although these are mostly of interest to MicroPython maintainers.
+
+### Standalone build
+
+By default, the "standard" variant uses `pkg-config` to link to the system's
+shared `libffi` library.
+
+It is possible to instead build a standalone MicroPython where `libffi` is built
+from source and linked statically into the `micropython` executable. This is
+mostly useful for embedded or cross-compiled applications.
+
+Building standalone requires `autoconf` and `libtool` to also be installed.
+
+To build standalone:
+
+    $ export MICROPY_STANDALONE=1
+    $ make submodules                # fetches libffi submodule
+    $ make deplibs                   # build just the external libraries
+    $ make                           # build MicroPython itself
+
+`make deplibs` causes all supported external libraries (currently only `libffi`)
+to be built inside the build directory, so it needs to run again only after
+`make clean`.
 
-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:
+If you intend to build MicroPython with additional options (like
+cross-compiling), the same set of options should be passed to both `make
+deplibs` and `make`.
 
-    $ make deplibs
+### Other dependencies
 
-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
+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 the SSL module, `MICROPY_PY_SSL` should be
 set to 1.
 
-Debug Symbols
--------------
+### Debug Symbols
 
 By default, builds are stripped of symbols and debug information to save size.
 
-To build a debuggable version of the Unix port, there are two options
+To build a debuggable version of the Unix port, there are two options:
 
 1. Run `make [other arguments] DEBUG=1`. Note setting `DEBUG` also reduces the
    optimisation level, so it's not a good option for builds that also want the
diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk
index c8ade0b7e277c..1557c5461f6ed 100644
--- a/ports/unix/mpconfigport.mk
+++ b/ports/unix/mpconfigport.mk
@@ -37,7 +37,7 @@ MICROPY_PY_JNI = 0
 
 # Avoid using system libraries, use copies bundled with MicroPython
 # as submodules (currently affects only libffi).
-MICROPY_STANDALONE = 0
+MICROPY_STANDALONE ?= 0
 
 MICROPY_ROM_TEXT_COMPRESSION = 1
 

From e370999e378bf5040ef6348e2a0720bc3ec4f773 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 28 Aug 2024 15:39:38 +1000
Subject: [PATCH 1401/3129] unix: Add a description of COPT in the README.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/unix/README.md b/ports/unix/README.md
index 6481522639c3a..953c83ef73d4c 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -142,8 +142,16 @@ By default, builds are stripped of symbols and debug information to save size.
 To build a debuggable version of the Unix port, there are two options:
 
 1. Run `make [other arguments] DEBUG=1`. Note setting `DEBUG` also reduces the
-   optimisation level, so it's not a good option for builds that also want the
-   best performance.
+   optimisation level and enables assertions, so it's not a good option for
+   builds that also want the best performance.
 2. Run `make [other arguments] STRIP=`. Note that the value of `STRIP` is
    empty. This will skip the build step that strips symbols and debug
    information, but changes nothing else in the build configuration.
+
+### Optimisation Level
+
+The default compiler optimisation level is -Os, or -Og if `DEBUG=1` is set.
+
+Setting the variable `COPT` will explicitly set the optimisation level. For
+example `make [other arguments] COPT=-O0 DEBUG=1` will build a binary with no
+optimisations, assertions enabled, and debug symbols.

From a831c788f76c0742f85b8a35a5860255229b98dc Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 28 Aug 2024 15:05:47 +0200
Subject: [PATCH 1402/3129] tools/mpy_ld.py: Ignore R_XTENSA_ASM_EXPAND
 relocation entries.

As reported in #14430 the Xtensa compiler can add R_XTENSA_ASM_EXPAND
relocation relaxation entries in object files, and they were not
supported by mpy_ld.

This commit adds handling for that entry, doing nothing with it, as it
is only of real use for an optimising linker.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/mpy_ld.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 7046b6a8556f0..45aadadd51314 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -69,6 +69,7 @@
 R_386_GOTOFF = 9
 R_386_GOTPC = 10
 R_ARM_THM_CALL = 10
+R_XTENSA_ASM_EXPAND = 11
 R_XTENSA_DIFF32 = 19
 R_XTENSA_SLOT0_OP = 20
 R_ARM_BASE_PREL = 25  # aka R_ARM_GOTPC
@@ -562,9 +563,14 @@ 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 in (R_XTENSA_DIFF32, R_XTENSA_PDIFF32):
+    elif env.arch.name == "EM_XTENSA" and r_info_type in (
+        R_XTENSA_DIFF32,
+        R_XTENSA_PDIFF32,
+        R_XTENSA_ASM_EXPAND,
+    ):
         if s.section.name.startswith(".text"):
-            # it looks like R_XTENSA_[P]DIFF32 into .text is already correctly relocated
+            # it looks like R_XTENSA_[P]DIFF32 into .text is already correctly relocated,
+            # and expand relaxations cannot occur in non-executable sections.
             return
         assert 0
 

From 65244d291acda865aef60ec3cd7291c2211caeb2 Mon Sep 17 00:00:00 2001
From: cajt <cjt@users.sf.net>
Date: Wed, 28 Aug 2024 22:19:21 +0200
Subject: [PATCH 1403/3129] extmod/modlwip: Fix compile error for lwIP with
 SLIP support.

Fixes a compile error if STM32 port is compiled with:

    make BOARD=(..) MICROPY_PY_LWIP=1 MICROPY_PY_LWIP_SLIP=1

`sio_send()` and `sio_tryread()` now use `mp_get_stream`.

Signed-off-by: Carl Treudler <cjt@users.sf.net>
---
 extmod/modlwip.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index b07c1d8159c2f..21c6f7264befa 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -127,15 +127,15 @@ sio_fd_t sio_open(u8_t dvnum) {
 }
 
 void sio_send(u8_t c, sio_fd_t fd) {
-    mp_obj_type_t *type = mp_obj_get_type(MP_STATE_VM(lwip_slip_stream));
+    const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(lwip_slip_stream));
     int error;
-    type->stream_p->write(MP_STATE_VM(lwip_slip_stream), &c, 1, &error);
+    stream_p->write(MP_STATE_VM(lwip_slip_stream), &c, 1, &error);
 }
 
 u32_t sio_tryread(sio_fd_t fd, u8_t *data, u32_t len) {
-    mp_obj_type_t *type = mp_obj_get_type(MP_STATE_VM(lwip_slip_stream));
+    const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(lwip_slip_stream));
     int error;
-    mp_uint_t out_sz = type->stream_p->read(MP_STATE_VM(lwip_slip_stream), data, len, &error);
+    mp_uint_t out_sz = stream_p->read(MP_STATE_VM(lwip_slip_stream), data, len, &error);
     if (out_sz == MP_STREAM_ERROR) {
         if (mp_is_nonblocking_error(error)) {
             return 0;

From 3294606e2319dd64226434f20acc15b8869ddf55 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 29 Aug 2024 20:53:23 +0200
Subject: [PATCH 1404/3129] extmod/libmetal: Fix libmetal rules for mkdir
 dependencies.

Dependency on auto-generated libmetal should be an order only prerequisite.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/libmetal/libmetal.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/libmetal/libmetal.mk b/extmod/libmetal/libmetal.mk
index 7cda12a31333d..5475654aded76 100644
--- a/extmod/libmetal/libmetal.mk
+++ b/extmod/libmetal/libmetal.mk
@@ -4,13 +4,13 @@
 # This replicates the basic functionality of the pre-processor, including adding a "micropython"
 # platform that is almost identical to the built-in "generic" platform with a few small changes
 # provided by the files in extmod/libmetal.
-$(BUILD)/openamp: $(BUILD)
+$(BUILD)/openamp: | $(BUILD)
 	$(MKDIR) -p $@
 
-$(BUILD)/openamp/metal: $(BUILD)/openamp
+$(BUILD)/openamp/metal: | $(BUILD)/openamp
 	$(MKDIR) -p $@
 
-$(BUILD)/openamp/metal/config.h: $(BUILD)/openamp/metal $(TOP)/$(LIBMETAL_DIR)/lib/config.h
+$(BUILD)/openamp/metal/config.h: $(TOP)/$(LIBMETAL_DIR)/lib/config.h | $(BUILD)/openamp/metal
 	@$(ECHO) "GEN $@"
 	@for file in $(TOP)/$(LIBMETAL_DIR)/lib/*.c $(TOP)/$(LIBMETAL_DIR)/lib/*.h; do $(SED) -e "s/@PROJECT_SYSTEM@/micropython/g" -e "s/@PROJECT_PROCESSOR@/arm/g" $$file > $(BUILD)/openamp/metal/$$(basename $$file); done
 	$(MKDIR) -p $(BUILD)/openamp/metal/processor/arm

From ed86fdbdf6e2d3eb9a118d3476ce4c370ec48b06 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 21 Apr 2024 12:45:36 +0200
Subject: [PATCH 1405/3129] samd/mphalport: Fix an execution order bug in
 mp_hal_ticks_us_64().

The upper 32 bit of the 64 bit ticks register was taken before disabling
the interrupts.  That may have caused a wrong return values.  Besides that,
the function may cause trouble when called in an IRQ context, because it
unconditionally enables IRQ.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/mphalport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 80904804c9980..3a33fdd6b56b7 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -94,10 +94,10 @@ void mp_hal_delay_us(mp_uint_t us) {
 }
 
 uint64_t mp_hal_ticks_us_64(void) {
-    uint32_t us64_upper = ticks_us64_upper;
     uint32_t us64_lower;
     uint8_t intflag;
     __disable_irq();
+    uint32_t us64_upper = ticks_us64_upper;
     #if defined(MCU_SAMD21)
     us64_lower = REG_TC4_COUNT32_COUNT;
     intflag = TC4->COUNT32.INTFLAG.reg;

From 1a6279ba37678893db9f2756fceaa5c817cae888 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 17 Aug 2024 17:07:44 +0200
Subject: [PATCH 1406/3129] samd/mphalport: Simplify mp_hal_delay_ms().

Do NOT use `mp_hal_delay_us()` for short delays.  This was initially done
to make short delays precise, but it does not allow for scheduling.  Leave
using `mp_hal_delay_us()` to user code if needed.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/quickref.rst |  2 ++
 ports/samd/mphalport.c | 10 +++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/samd/quickref.rst b/docs/samd/quickref.rst
index 60c57b3a47a31..25b5a8fc8ab2b 100644
--- a/docs/samd/quickref.rst
+++ b/docs/samd/quickref.rst
@@ -65,6 +65,8 @@ Use the :mod:`time <time>` module::
     start = time.ticks_ms() # get millisecond counter
     delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
 
+Note that :func:`time.sleep_us()` delays by busy waiting. During that time, other tasks are
+not scheduled.
 
 Clock and time
 --------------
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 3a33fdd6b56b7..84d05b9185afe 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -69,13 +69,9 @@ void mp_hal_clr_pin_mux(mp_hal_pin_obj_t pin) {
 }
 
 void mp_hal_delay_ms(mp_uint_t ms) {
-    if (ms > 10) {
-        uint32_t t0 = systick_ms;
-        while (systick_ms - t0 < ms) {
-            MICROPY_EVENT_POLL_HOOK
-        }
-    } else {
-        mp_hal_delay_us(ms * 1000);
+    uint32_t t0 = systick_ms;
+    while (systick_ms - t0 < ms) {
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 

From e23fdb1f7714bc1707ae9c5936a6c219ffb3044c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 29 Aug 2024 12:10:32 +0200
Subject: [PATCH 1407/3129] tests/extmod/machine_uart_irq_txidle.py: Simplify
 the test script.

Now that no minimal delay time is required for SAMD devices.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 tests/extmod/machine_uart_irq_txidle.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/extmod/machine_uart_irq_txidle.py b/tests/extmod/machine_uart_irq_txidle.py
index 3e69bb43141aa..feb95fabaa44f 100644
--- a/tests/extmod/machine_uart_irq_txidle.py
+++ b/tests/extmod/machine_uart_irq_txidle.py
@@ -16,27 +16,20 @@
     uart_id = 0
     tx_pin = "GPIO0"
     rx_pin = "GPIO1"
-    min_window = 1
 elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
     uart_id = 0
     tx_pin = "D1"
     rx_pin = "D0"
-    # For SAMD delay_ms has to be used for the trailing window, and the
-    # mininmal time is 11 ms to allow for scheduling.
-    min_window = 11
 elif "samd" in sys.platform and "ItsyBitsy M4" in sys.implementation._machine:
     uart_id = 3
     tx_pin = "D1"
     rx_pin = "D0"
-    min_window = 11
 elif "mimxrt" in sys.platform:
     uart_id = 1
     tx_pin = None
-    min_window = 0
 elif "nrf" in sys.platform:
     uart_id = 0
     tx_pin = None
-    min_window = 0
 else:
     print("Please add support for this test on this platform.")
     raise SystemExit
@@ -61,12 +54,11 @@ def irq(u):
     # the test marks a time window close to the expected of the sending
     # and the time at which the IRQ should have been fired.
     # It is just a rough estimation of 10 characters before and
-    # 20 characters after the data's end, unless there is a need to
-    # wait a minimal time, like for SAMD devices.
+    # 20 characters after the data's end.
 
     bits_per_char = 10  # 1(startbit) + 8(bits) + 1(stopbit) + 0(parity)
     start_time_us = (len(text) - 10) * bits_per_char * 1_000_000 // bits_per_s
-    window_ms = max(min_window, 20 * bits_per_char * 1_000 // bits_per_s + 1)
+    window_ms = 20 * bits_per_char * 1_000 // bits_per_s + 1
 
     print("write", bits_per_s)
     uart.write(text)

From aefd48b80118c45e43e591e73aea1cda778e3676 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Tue, 3 Sep 2024 10:58:07 +0200
Subject: [PATCH 1408/3129] samd/Makefile: Specify UF2 family in firmware.uf2.

Set the UF2 firmware images family to Microchip SAMD21 or SAMD51.  This
helps tools such as file to identify built firmware.

Signed-off-by: Alexandre Iooss <erdnaxe@crans.org>
---
 ports/samd/Makefile                  | 2 +-
 ports/samd/mcu/samd21/mpconfigmcu.mk | 2 ++
 ports/samd/mcu/samd51/mpconfigmcu.mk | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 487a9cb38bbce..75a4d9b1de355 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -183,7 +183,7 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data $^ $(BUILD)/firmware.bin
 
 $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
-	$(Q)$(PYTHON) $(UF2CONV) -b $(TEXT0) -c -o $@ $<
+	$(Q)$(PYTHON) $(UF2CONV) $(UF2CONV_FLAGS) -b $(TEXT0) -c -o $@ $<
 
 # pin_af.c: $(BUILD)/$(GEN_PIN_AF) | $(HEADER_BUILD)
 
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index 89e63c3aaf2b4..34209775c2565 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -13,3 +13,5 @@ endif
 MICROPY_VFS_LFS1 ?= 1
 
 SRC_S += shared/runtime/gchelper_thumb1.s
+
+UF2CONV_FLAGS += -f 0x68ed2b88
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 0201bacffeef1..9bef5eca166ab 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -14,3 +14,5 @@ SRC_S += shared/runtime/gchelper_thumb2.s
 
 SRC_C += \
 	fatfs_port.c \
+
+UF2CONV_FLAGS += -f 0x55114460

From 6833f3dda9a1557789d4675a05811cc9a1d2c1a6 Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Fri, 28 Jun 2024 09:34:59 +0200
Subject: [PATCH 1409/3129] zephyr: Add threading support.

This commit implements the `_thread` module on the zephyr port.

Due to the fact that we are still using a rather old version of Zephyr,
`CONFIG_DYNAMIC_THREAD` is not available and therefore the stack for
threads cannot be allocated dynamically, only at compile time.  So for the
time being and for the purpose of this commit, a maximum of 4 Zephyr
threads (besides the main thread) can be created.  Once we manage to update
to the latest version of Zephyr this won't be a problem anymore.

Configuration for the nrf52840dk is added as part of this change, because
this board was used to test the threading support.

The Zephyr option `CONFIG_THREAD_CUSTOM_DATA` is used to enable threading
on a per board basis.  The `thread.conf` file is added as a convenient way
to enable threading.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/CMakeLists.txt                  |   1 +
 ports/zephyr/README.md                       |   5 +
 ports/zephyr/boards/nrf52840dk_nrf52840.conf |  13 +
 ports/zephyr/main.c                          |  23 +-
 ports/zephyr/mpconfigport.h                  |  25 ++
 ports/zephyr/mpconfigport_minimal.h          |   2 +
 ports/zephyr/mpthreadport.c                  | 307 +++++++++++++++++++
 ports/zephyr/mpthreadport.h                  |  42 +++
 ports/zephyr/thread.conf                     |   4 +
 9 files changed, 419 insertions(+), 3 deletions(-)
 create mode 100644 ports/zephyr/boards/nrf52840dk_nrf52840.conf
 create mode 100644 ports/zephyr/mpthreadport.c
 create mode 100644 ports/zephyr/mpthreadport.h
 create mode 100644 ports/zephyr/thread.conf

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index c048d92d2ae24..c8bb1fc456fbc 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -47,6 +47,7 @@ set(MICROPY_SOURCE_PORT
     mphalport.c
     uart_core.c
     zephyr_storage.c
+    mpthreadport.c
 )
 list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 3de793b2fece0..c463b37d1f4a2 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -63,6 +63,11 @@ To build for QEMU instead:
 
     $ west build -b qemu_x86 ~/micropython/ports/zephyr
 
+To build any board with the `_thread` module enabled,
+add `-DOVERLAY_CONFIG=thread.conf`, for instance:
+
+    $ west build -b frdm_k64f ~/micropython/ports/zephyr -DOVERLAY_CONFIG=thread.conf
+
 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
diff --git a/ports/zephyr/boards/nrf52840dk_nrf52840.conf b/ports/zephyr/boards/nrf52840dk_nrf52840.conf
new file mode 100644
index 0000000000000..e9ec78b64ffae
--- /dev/null
+++ b/ports/zephyr/boards/nrf52840dk_nrf52840.conf
@@ -0,0 +1,13 @@
+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
+CONFIG_MAIN_STACK_SIZE=8192
+
+# CONFIG_DYNAMIC_THREAD=y
+CONFIG_THREAD_CUSTOM_DATA=y
+CONFIG_THREAD_MONITOR=y
+CONFIG_THREAD_STACK_INFO=y
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index c4a135aa53e43..47c95462211a6 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -114,14 +114,20 @@ static void vfs_init(void) {
 #endif // MICROPY_VFS
 
 int real_main(void) {
-    mp_stack_ctrl_init();
-    // Make MicroPython's stack limit somewhat smaller than full stack available
-    mp_stack_set_limit(CONFIG_MAIN_STACK_SIZE - 512);
+    volatile int stack_dummy = 0;
+
+    #if MICROPY_PY_THREAD
+    struct k_thread *z_thread = (struct k_thread *)k_current_get();
+    mp_thread_init((void *)z_thread->stack_info.start, z_thread->stack_info.size / sizeof(uintptr_t));
+    #endif
 
     init_zephyr();
     mp_hal_init();
 
 soft_reset:
+    mp_stack_set_top((void *)&stack_dummy);
+    // Make MicroPython's stack limit somewhat smaller than full stack available
+    mp_stack_set_limit(CONFIG_MAIN_STACK_SIZE - 512);
     #if MICROPY_ENABLE_GC
     gc_init(heap, heap + sizeof(heap));
     #endif
@@ -160,6 +166,14 @@ int real_main(void) {
     machine_pin_deinit();
     #endif
 
+    #if MICROPY_PY_THREAD
+    mp_thread_deinit();
+    gc_collect();
+    #endif
+
+    gc_sweep_all();
+    mp_deinit();
+
     goto soft_reset;
 
     return 0;
@@ -171,6 +185,9 @@ void gc_collect(void) {
     void *dummy;
     gc_collect_start();
     gc_collect_root(&dummy, ((mp_uint_t)MP_STATE_THREAD(stack_top) - (mp_uint_t)&dummy) / sizeof(mp_uint_t));
+    #if MICROPY_PY_THREAD
+    mp_thread_gc_others();
+    #endif
     gc_collect_end();
 }
 
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 94f4cc33d65d1..0247310255aa6 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -113,6 +113,13 @@
 #define MICROPY_COMP_CONST (0)
 #define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
 
+// When CONFIG_THREAD_CUSTOM_DATA is enabled, MICROPY_PY_THREAD is enabled automatically
+#ifdef CONFIG_THREAD_CUSTOM_DATA
+#define MICROPY_PY_THREAD                   (1)
+#define MICROPY_PY_THREAD_GIL               (1)
+#define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
+#endif
+
 void mp_hal_signal_event(void);
 #define MICROPY_SCHED_HOOK_SCHEDULED mp_hal_signal_event()
 
@@ -139,3 +146,21 @@ 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) },
+
+#if MICROPY_PY_THREAD
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        MP_THREAD_GIL_EXIT(); \
+        k_msleep(1); \
+        MP_THREAD_GIL_ENTER(); \
+    } while (0);
+#else
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        k_msleep(1); \
+    } while (0);
+#endif
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index e819d5cf41ca0..6c7a4c6b8198c 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -83,3 +83,5 @@ typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
+
+#define MICROPY_EVENT_POLL_HOOK
diff --git a/ports/zephyr/mpthreadport.c b/ports/zephyr/mpthreadport.c
new file mode 100644
index 0000000000000..0edfdee1ed1e6
--- /dev/null
+++ b/ports/zephyr/mpthreadport.c
@@ -0,0 +1,307 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
+ * Copyright (c) 2017 Pycom Limited
+ * Copyright (c) 2024 Daniel Campora on behalf of REMOTE TECH LTD
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/mphal.h"
+
+#if MICROPY_PY_THREAD
+
+#define DEBUG_printf(...) // printk("_thread: " __VA_ARGS__)
+
+#define MP_THREAD_MIN_STACK_SIZE                        (4 * 1024)
+#define MP_THREAD_DEFAULT_STACK_SIZE                    (MP_THREAD_MIN_STACK_SIZE + 1024)
+#define MP_THREAD_PRIORITY                              (k_thread_priority_get(k_current_get()))    // same priority as the main thread
+#define MP_THREAD_MAXIMUM_USER_THREADS                  (4)
+
+typedef enum {
+    MP_THREAD_STATUS_CREATED = 0,
+    MP_THREAD_STATUS_READY,
+    MP_THREAD_STATUS_FINISHED,
+} mp_thread_status_t;
+
+typedef struct _mp_thread_slot_t {
+    bool used;
+} mp_thread_stack_slot_t;
+
+// this structure forms a linked list, one node per active thread
+typedef struct _mp_thread_t {
+    k_tid_t id;                 // system id of thread (this is actually a pointer to z_thread below)
+    struct k_thread z_thread;   // the zephyr thread object
+    mp_thread_status_t status;  // whether the thread is created, ready, or finished
+    int16_t alive;              // whether the thread is still visible by the kernel
+    int16_t slot;               // slot index in the stack pool
+    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 _mp_thread_t *next;
+} mp_thread_t;
+
+// the mutex controls access to the linked list
+static mp_thread_mutex_t thread_mutex;
+static mp_thread_t thread_entry0;
+static mp_thread_t *thread = NULL; // root pointer, handled by mp_thread_gc_others
+static uint8_t mp_thread_counter;
+static mp_thread_stack_slot_t stack_slot[MP_THREAD_MAXIMUM_USER_THREADS];
+
+K_THREAD_STACK_ARRAY_DEFINE(mp_thread_stack_array, MP_THREAD_MAXIMUM_USER_THREADS, MP_THREAD_DEFAULT_STACK_SIZE);
+
+static void mp_thread_iterate_threads_cb(const struct k_thread *thread, void *user_data);
+static int32_t mp_thread_find_stack_slot(void);
+
+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_entry0.id = k_current_get();
+    thread_entry0.status = MP_THREAD_STATUS_READY;
+    thread_entry0.alive = 1;
+    thread_entry0.arg = NULL;
+    thread_entry0.stack = stack;
+    thread_entry0.stack_len = stack_len;
+    thread_entry0.next = NULL;
+    k_thread_name_set(thread_entry0.id, "mp_main");
+    mp_thread_counter = 0;
+    mp_thread_mutex_init(&thread_mutex);
+
+    // memory barrier to ensure above data is committed
+    __sync_synchronize();
+
+    thread = &thread_entry0;
+}
+
+void mp_thread_gc_others(void) {
+    mp_thread_t *prev = NULL;
+
+    if (thread == NULL) {
+        // threading not yet initialised
+        return;
+    }
+
+    mp_thread_mutex_lock(&thread_mutex, 1);
+
+    // get the kernel to iterate over all the existing threads
+    DEBUG_printf("Iterating...\n");
+    k_thread_foreach(mp_thread_iterate_threads_cb, NULL);
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
+        // unlink non-alive thread nodes from the list
+        if ((th->status == MP_THREAD_STATUS_FINISHED) && !th->alive) {
+            if (prev != NULL) {
+                prev->next = th->next;
+            } else {
+                // move the start pointer
+                thread = th->next;
+            }
+            stack_slot[th->slot].used = false;
+            mp_thread_counter--;
+            DEBUG_printf("Collecting thread %s\n", k_thread_name_get(th->id));
+            // The "th" memory will eventually be reclaimed by the GC
+        } else {
+            th->alive = 0;
+            prev = th;
+        }
+    }
+
+    DEBUG_printf("mp_thread_gc_others from %s\n", k_thread_name_get(k_current_get()));
+
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
+        DEBUG_printf("%s\n", k_thread_name_get(th->id));
+        gc_collect_root((void **)&th, 1);
+        gc_collect_root(&th->arg, 1);
+        // gc_collect_root(&th->stack, 1);  // will be needed later when the stack is allocated from the gc heap
+        if (th->id == k_current_get()) {
+            continue;
+        }
+        if (th->status != MP_THREAD_STATUS_READY) {
+            continue;
+        }
+        gc_collect_root(th->stack, th->stack_len);
+    }
+    mp_thread_mutex_unlock(&thread_mutex);
+}
+
+mp_state_thread_t *mp_thread_get_state(void) {
+    return (mp_state_thread_t *)k_thread_custom_data_get();
+}
+
+void mp_thread_set_state(mp_state_thread_t *state) {
+    k_thread_custom_data_set((void *)state);
+}
+
+mp_uint_t mp_thread_get_id(void) {
+    return (mp_uint_t)k_current_get();
+}
+
+void mp_thread_start(void) {
+    mp_thread_mutex_lock(&thread_mutex, 1);
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
+        if (th->id == k_current_get()) {
+            th->status = MP_THREAD_STATUS_READY;
+            break;
+        }
+    }
+    mp_thread_mutex_unlock(&thread_mutex);
+}
+
+static void zephyr_entry(void *arg1, void *arg2, void *arg3) {
+    (void)arg3;
+
+    // arg1 contains the python thread entry point
+    if (arg1) {
+        void *(*entry)(void *) = arg1;
+        entry(arg2);
+    }
+    k_thread_abort(k_current_get());
+    for (;;) {;
+    }
+}
+
+mp_uint_t mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size, int priority, char *name) {
+    // TODO: we need to support for CONFIG_DYNAMIC_THREAD in order to dynamically create allocate the stack of a thread
+    // if (*stack_size == 0) {
+    //     *stack_size = MP_THREAD_DEFAULT_STACK_SIZE; // default stack size
+    // } else if (*stack_size < MP_THREAD_MIN_STACK_SIZE) {
+    //     *stack_size = MP_THREAD_MIN_STACK_SIZE; // minimum stack size
+    // }
+
+    // in case some threads have finished but their stack has not been collected yet
+    gc_collect();
+
+    // Allocate linked-list node (must be outside thread_mutex lock)
+    mp_thread_t *th = m_new_obj(mp_thread_t);
+
+    mp_thread_mutex_lock(&thread_mutex, 1);
+
+    int32_t _slot = mp_thread_find_stack_slot();
+    if (_slot >= 0) {
+        // create thread
+        th->id = k_thread_create(&th->z_thread, mp_thread_stack_array[_slot], K_THREAD_STACK_SIZEOF(mp_thread_stack_array[_slot]),
+            zephyr_entry, entry, arg, NULL, priority, 0, K_NO_WAIT);
+
+        if (th->id == NULL) {
+            mp_thread_mutex_unlock(&thread_mutex);
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("can't create thread"));
+        }
+
+        k_thread_name_set(th->id, (const char *)name);
+
+    } else {
+        mp_thread_mutex_unlock(&thread_mutex);
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("maximum number of threads reached"));
+    }
+
+    // add thread to linked list of all threads
+    th->status = MP_THREAD_STATUS_CREATED;
+    th->alive = 0;
+    th->slot = _slot;
+    th->arg = arg;
+    th->stack = (void *)th->z_thread.stack_info.start;
+    th->stack_len = th->z_thread.stack_info.size / sizeof(uintptr_t);
+    th->next = thread;
+    thread = th;
+
+    stack_slot[_slot].used = true;
+    mp_thread_counter++;
+
+    // adjust the stack_size to provide room to recover from hitting the limit
+    *stack_size = th->z_thread.stack_info.size - 1024;
+
+    mp_thread_mutex_unlock(&thread_mutex);
+
+    return (mp_uint_t)th->id;
+}
+
+mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+    char _name[16];
+    snprintf(_name, sizeof(_name), "mp_thread_%d", mp_thread_counter);
+    return mp_thread_create_ex(entry, arg, stack_size, MP_THREAD_PRIORITY, _name);
+}
+
+void mp_thread_finish(void) {
+    mp_thread_mutex_lock(&thread_mutex, 1);
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
+        if (th->id == k_current_get()) {
+            th->status = MP_THREAD_STATUS_FINISHED;
+            DEBUG_printf("Finishing thread %s\n", k_thread_name_get(th->id));
+            break;
+        }
+    }
+    mp_thread_mutex_unlock(&thread_mutex);
+}
+
+void mp_thread_mutex_init(mp_thread_mutex_t *mutex) {
+    // Need a binary semaphore so a lock can be acquired on one Python thread
+    // and then released on another.
+    k_sem_init(&mutex->handle, 0, 1);
+    k_sem_give(&mutex->handle);
+}
+
+int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
+    return k_sem_take(&mutex->handle, wait ? K_FOREVER : K_NO_WAIT) == 0;
+}
+
+void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
+    k_sem_give(&mutex->handle);
+}
+
+void mp_thread_deinit(void) {
+    // abort all threads except for the main thread
+    mp_thread_mutex_lock(&thread_mutex, 1);
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
+        // don't delete the current task
+        if ((th->id != k_current_get()) && (th->status != MP_THREAD_STATUS_FINISHED)) {
+            th->status = MP_THREAD_STATUS_FINISHED;
+            DEBUG_printf("De-initializing thread %s\n", k_thread_name_get(th->id));
+            k_thread_abort(th->id);
+        }
+    }
+    mp_thread_mutex_unlock(&thread_mutex);
+}
+
+static void mp_thread_iterate_threads_cb(const struct k_thread *z_thread, void *user_data) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
+        if (th->id == (struct k_thread *)z_thread) {
+            th->alive = 1;
+            DEBUG_printf("Found thread %s\n", k_thread_name_get(th->id));
+        }
+    }
+}
+
+static int32_t mp_thread_find_stack_slot(void) {
+    for (int i = 0; i < MP_THREAD_MAXIMUM_USER_THREADS; i++) {
+        if (!stack_slot[i].used) {
+            DEBUG_printf("Allocating stack slot %d\n", i);
+            return i;
+        }
+    }
+    return -1;
+}
+
+#endif // MICROPY_PY_THREAD
diff --git a/ports/zephyr/mpthreadport.h b/ports/zephyr/mpthreadport.h
new file mode 100644
index 0000000000000..37dd725321354
--- /dev/null
+++ b/ports/zephyr/mpthreadport.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
+ * Copyright (c) 2017 Pycom Limited
+ * Copyright (c) 2024 Daniel Campora on behalf of REMOTE TECH LTD
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ZEPHYR_MPTHREADPORT_H
+#define MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
+
+#include <zephyr/zephyr.h>
+
+typedef struct _mp_thread_mutex_t {
+    struct k_sem handle;
+} mp_thread_mutex_t;
+
+void mp_thread_init(void *stack, uint32_t stack_len);
+void mp_thread_gc_others(void);
+void mp_thread_deinit(void);
+
+#endif // MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
diff --git a/ports/zephyr/thread.conf b/ports/zephyr/thread.conf
new file mode 100644
index 0000000000000..af5af58ddab78
--- /dev/null
+++ b/ports/zephyr/thread.conf
@@ -0,0 +1,4 @@
+# CONFIG_DYNAMIC_THREAD=y
+CONFIG_THREAD_CUSTOM_DATA=y
+CONFIG_THREAD_MONITOR=y
+CONFIG_THREAD_STACK_INFO=y

From d68d8fcf9089373a7edd6f743645b0f3ce24d0ad Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Tue, 16 Jul 2024 17:38:01 +0200
Subject: [PATCH 1410/3129] zephyr: Re-implement the Zephyr console in
 non-blocking mode.

The standard Zephyr console implementation doesn't make use of
`tty_set_rx_timeout()` and therefore all the functions to receive
characters block indefinitely until data is received (including
`console_read()`).

This commit also releases the GIL where it applies, e.g. the REPL and the
time sleep functions.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/mphalport.c          |  5 +-
 ports/zephyr/mpthreadport.c       |  1 +
 ports/zephyr/src/zephyr_getchar.c | 18 +++---
 ports/zephyr/src/zephyr_getchar.h |  2 +-
 ports/zephyr/src/zephyr_start.c   |  4 +-
 ports/zephyr/uart_core.c          | 96 ++++++++++++++++++++++++++++---
 6 files changed, 106 insertions(+), 20 deletions(-)

diff --git a/ports/zephyr/mphalport.c b/ports/zephyr/mphalport.c
index 4f00cbd26ca67..fa64c4afc96e1 100644
--- a/ports/zephyr/mphalport.c
+++ b/ports/zephyr/mphalport.c
@@ -51,12 +51,15 @@ void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
         k_poll_event_init(&wait_events[1], K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, sem);
     }
     for (;;) {
+        mp_handle_pending(true);
+        MP_THREAD_GIL_EXIT();
         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) {
+                MP_THREAD_GIL_ENTER();
                 return;
             }
             wait = K_MSEC(timeout_ms - dt);
@@ -65,9 +68,9 @@ void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
         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;
+            MP_THREAD_GIL_ENTER();
             return;
         }
     }
diff --git a/ports/zephyr/mpthreadport.c b/ports/zephyr/mpthreadport.c
index 0edfdee1ed1e6..0b304cfd509df 100644
--- a/ports/zephyr/mpthreadport.c
+++ b/ports/zephyr/mpthreadport.c
@@ -269,6 +269,7 @@ int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
 
 void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
     k_sem_give(&mutex->handle);
+    k_yield();
 }
 
 void mp_thread_deinit(void) {
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 5bbf1a9f68e7d..0dc8a15bdddc7 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -50,14 +50,16 @@ static int console_irq_input_hook(uint8_t ch) {
     return 1;
 }
 
-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++];
-    i_get &= UART_BUFSIZE - 1;
-    irq_unlock(key);
-    return c;
+int zephyr_getchar(void) {
+    mp_hal_wait_sem(&uart_sem, 0);
+    if (k_sem_take(&uart_sem, K_MSEC(0)) == 0) {
+        unsigned int key = irq_lock();
+        int c = (int)uart_ringbuf[i_get++];
+        i_get &= UART_BUFSIZE - 1;
+        irq_unlock(key);
+        return c;
+    }
+    return -1;
 }
 
 void zephyr_getchar_init(void) {
diff --git a/ports/zephyr/src/zephyr_getchar.h b/ports/zephyr/src/zephyr_getchar.h
index fb5f19a7b4195..fee899e1b4349 100644
--- a/ports/zephyr/src/zephyr_getchar.h
+++ b/ports/zephyr/src/zephyr_getchar.h
@@ -17,4 +17,4 @@
 #include <stdint.h>
 
 void zephyr_getchar_init(void);
-uint8_t zephyr_getchar(void);
+int zephyr_getchar(void);
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index bcd68f92ce052..3b00bac121865 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -24,14 +24,14 @@
  * THE SOFTWARE.
  */
 #include <zephyr/zephyr.h>
-#include <zephyr/console/console.h>
 #include "zephyr_getchar.h"
 
 int real_main(void);
+int mp_console_init(void);
 
 void main(void) {
     #ifdef CONFIG_CONSOLE_SUBSYS
-    console_init();
+    mp_console_init();
     #else
     zephyr_getchar_init();
     #endif
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 3f70cc0a172eb..7e2db3653b24a 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -25,10 +25,28 @@
  */
 #include <unistd.h>
 #include "py/mpconfig.h"
+#include "py/runtime.h"
 #include "src/zephyr_getchar.h"
 // Zephyr headers
-#include <zephyr/drivers/uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <zephyr/console/console.h>
+#include <zephyr/console/tty.h>
+#include <zephyr/drivers/uart.h>
+
+
+#ifdef CONFIG_CONSOLE_SUBSYS
+
+static int mp_console_putchar(char c);
+static int mp_console_getchar(void);
+
+
+static struct tty_serial mp_console_serial;
+
+static uint8_t mp_console_rxbuf[CONFIG_CONSOLE_GETCHAR_BUFSIZE];
+static uint8_t mp_console_txbuf[CONFIG_CONSOLE_PUTCHAR_BUFSIZE];
+
+#endif  // CONFIG_CONSOLE_SUBSYS
 
 /*
  * Core UART functions to implement for a port
@@ -36,11 +54,18 @@
 
 // Receive single character
 int mp_hal_stdin_rx_chr(void) {
-    #ifdef CONFIG_CONSOLE_SUBSYS
-    return console_getchar();
-    #else
-    return zephyr_getchar();
-    #endif
+    for (;;) {
+        int _chr;
+        #ifdef CONFIG_CONSOLE_SUBSYS
+        _chr = mp_console_getchar();
+        #else
+        _chr = zephyr_getchar();
+        #endif
+        if (_chr >= 0) {
+            return _chr;
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
 }
 
 // Send string of given length
@@ -49,8 +74,8 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     #ifdef CONFIG_CONSOLE_SUBSYS
     while (len--) {
         char c = *str++;
-        while (console_putchar(c) == -1) {
-            k_msleep(1);
+        while (mp_console_putchar(c) == -1) {
+            MICROPY_EVENT_POLL_HOOK
         }
     }
     #else
@@ -63,3 +88,58 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     #endif
     return ret;
 }
+
+
+#ifdef CONFIG_CONSOLE_SUBSYS
+
+int mp_console_init(void) {
+
+    const struct device *uart_dev;
+    int ret;
+
+    uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+    if (!device_is_ready(uart_dev)) {
+        return -ENODEV;
+    }
+
+    ret = tty_init(&mp_console_serial, uart_dev);
+
+    if (ret) {
+        return ret;
+    }
+
+    /* Checks device driver supports for interrupt driven data transfers. */
+    if (CONFIG_CONSOLE_GETCHAR_BUFSIZE + CONFIG_CONSOLE_PUTCHAR_BUFSIZE) {
+        const struct uart_driver_api *api =
+            (const struct uart_driver_api *)uart_dev->api;
+        if (!api->irq_callback_set) {
+            return -ENOTSUP;
+        }
+    }
+
+    tty_set_tx_buf(&mp_console_serial, mp_console_txbuf, sizeof(mp_console_txbuf));
+    tty_set_rx_buf(&mp_console_serial, mp_console_rxbuf, sizeof(mp_console_rxbuf));
+
+    tty_set_rx_timeout(&mp_console_serial, 0);
+    tty_set_tx_timeout(&mp_console_serial, 1);
+
+    return 0;
+}
+
+static int mp_console_putchar(char c) {
+    return tty_write(&mp_console_serial, &c, 1);
+}
+
+static int mp_console_getchar(void) {
+    uint8_t c;
+    int res;
+
+    res = tty_read(&mp_console_serial, &c, 1);
+    if (res < 0) {
+        return res;
+    }
+
+    return c;
+}
+
+#endif  // CONFIG_CONSOLE_SUBSYS

From 7009c75f237ad0397ac2009c9ff89a30a23b286c Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Mon, 12 Aug 2024 12:46:12 +0100
Subject: [PATCH 1411/3129] zephyr: Enable some core features to get more
 thread tests passing.

All these features are enabled at the
`MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES` level, and are required to get
more of the thread tests passing.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/mpconfigport.h | 4 ----
 ports/zephyr/mphalport.h    | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 0247310255aa6..e963e0d858975 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -43,17 +43,13 @@
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_KBD_EXCEPTION       (1)
-#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)
 #define MICROPY_PY_BUILTINS_PROPERTY (0)
 #define MICROPY_PY_BUILTINS_RANGE_ATTRS (0)
 #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)
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index 0d086ac299e99..e1f402cb3f4eb 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -31,8 +31,7 @@ static inline void mp_hal_delay_ms(mp_uint_t delay) {
 }
 
 static inline uint64_t mp_hal_time_ns(void) {
-    // Not currently implemented.
-    return 0;
+    return k_ticks_to_ns_near64(k_uptime_ticks());
 }
 
 #define mp_hal_delay_us_fast(us)   (mp_hal_delay_us(us))

From fc630e70c4d5fdf067a167e50e016d506463f943 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Aug 2024 14:38:59 +1000
Subject: [PATCH 1412/3129] zephyr/main: Collect registers during a MicroPython
 GC scan.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt | 1 +
 ports/zephyr/main.c         | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index c8bb1fc456fbc..a2c2120319a4c 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -54,6 +54,7 @@ list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
 set(MICROPY_SOURCE_SHARED
     libc/printf.c
     readline/readline.c
+    runtime/gchelper_generic.c
     runtime/interrupt_char.c
     runtime/mpirq.c
     runtime/pyexec.c
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 47c95462211a6..a2af609ed389a 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -48,6 +48,7 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/stackctrl.h"
+#include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/readline/readline.h"
 #include "extmod/modbluetooth.h"
@@ -180,11 +181,8 @@ int real_main(void) {
 }
 
 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)MP_STATE_THREAD(stack_top) - (mp_uint_t)&dummy) / sizeof(mp_uint_t));
+    gc_helper_collect_regs_and_stack();
     #if MICROPY_PY_THREAD
     mp_thread_gc_others();
     #endif

From e7974a28f7d023c14f253a888330c40e51f40054 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Aug 2024 14:39:37 +1000
Subject: [PATCH 1413/3129] zephyr/mpconfigport: Enable mpz big integers.

These are needed to be on par with other ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 e963e0d858975..26465cbb59b84 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -90,7 +90,7 @@
 #define MICROPY_PY_ZEPHYR           (1)
 #define MICROPY_PY_ZSENSOR          (1)
 #define MICROPY_PY_SYS_MODULES      (0)
-#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)
+#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_ENABLE_SCHEDULER    (1)

From 935fcd1329e39749a6a67bbb2e17bad39b263c09 Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Tue, 20 Aug 2024 14:41:24 +0200
Subject: [PATCH 1414/3129] tests/thread: Adapt stress_aes.py to run on zephyr.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 tests/thread/stress_aes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index 9f4a4e6aebad5..d8d0acd568a7a 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -273,7 +273,7 @@ def thread_entry(n_loop):
     elif sys.platform == "rp2":
         n_thread = 1
         n_loop = 2
-    elif sys.platform in ("esp32", "pyboard"):
+    elif sys.platform in ("esp32", "pyboard", "zephyr"):
         n_thread = 2
         n_loop = 2
     else:

From 0afec3974caf49ce0c2c5f42cb3ac430d98650b4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Sep 2024 12:54:14 +1000
Subject: [PATCH 1415/3129] zephyr/Kconfig: Increase default GC heap size to
 48k.

So that more tests can run successfully, and so users by default have more
heap for applications.  Thin minimal configuration still has a 16k GC heap.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/Kconfig          | 2 +-
 ports/zephyr/prj_minimal.conf | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig
index 5545cf3b15b07..227e943bcd13c 100644
--- a/ports/zephyr/Kconfig
+++ b/ports/zephyr/Kconfig
@@ -30,7 +30,7 @@ config MICROPY_CONFIGFILE
 
 config MICROPY_HEAP_SIZE
 	int "Heap size"
-	default 16384
+	default 49152
 
 config MICROPY_VFS_FAT
 	bool "FatFS file system"
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index 2c89a02fae263..6c850751d7233 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -11,3 +11,5 @@ CONFIG_CONSOLE_PUTCHAR_BUFSIZE=32
 # TODO: Disable once https://github.com/zephyrproject-rtos/zephyr/pull/13731 is merged
 #CONFIG_CONSOLE=n
 #CONFIG_UART_CONSOLE=n
+
+CONFIG_MICROPY_HEAP_SIZE=16384

From 74d6dba29423ab92846bb3f1b071d1f500b89efa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Sep 2024 12:55:20 +1000
Subject: [PATCH 1416/3129] tests/run-tests.py: Add a zephyr test target.

So that certain tests can be skipped when running on this target.  These
thread tests do not pass because the zephyr port cannot create more than 4
threads at once.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 43a9e38d327ab..7190d3bc31b70 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -637,6 +637,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("thread/thread_lock2.py")
         skip_tests.add("thread/thread_lock3.py")
         skip_tests.add("thread/thread_shared2.py")
+    elif args.target == "zephyr":
+        skip_tests.add("thread/stress_heap.py")
+        skip_tests.add("thread/thread_lock3.py")
 
     # Some tests shouldn't be run on pyboard
     if args.target != "unix":
@@ -1057,6 +1060,7 @@ def main():
         "qemu",
         "renesas-ra",
         "rp2",
+        "zephyr",
     )
     if args.list_tests:
         pyb = None

From 1c0dc2ac3e35d6afe8099af121065c307bf6defd Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Thu, 5 Sep 2024 17:53:07 +0200
Subject: [PATCH 1417/3129] zephyr/src: Remove k_yield() at the end of
 console_irq_input_hook().

Some boards like the nrf52840dk crash immediatelly after boot when
k_yield() is executed in this function.  It also makes the REPL randomly
lock up on other boards like the nucleo_wb55rg.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/src/zephyr_getchar.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 0dc8a15bdddc7..3dd87137733c7 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -46,7 +46,6 @@ static int console_irq_input_hook(uint8_t ch) {
     }
     // printk("%x\n", ch);
     k_sem_give(&uart_sem);
-    k_yield();
     return 1;
 }
 

From 3ca01eccae528a74fec8b1731f472d41018e5225 Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Thu, 5 Sep 2024 22:47:38 +0200
Subject: [PATCH 1418/3129] zephyr/mphalport: Make mp_hal_wait_sem() always
 call k_poll().

Also even in the case of a zero timeout given.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/mphalport.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/zephyr/mphalport.c b/ports/zephyr/mphalport.c
index fa64c4afc96e1..2c95032843276 100644
--- a/ports/zephyr/mphalport.c
+++ b/ports/zephyr/mphalport.c
@@ -54,15 +54,11 @@ void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
         mp_handle_pending(true);
         MP_THREAD_GIL_EXIT();
         k_timeout_t wait;
+        uint32_t dt = mp_hal_ticks_ms() - t0;
         if (timeout_ms == (uint32_t)-1) {
             wait = K_FOREVER;
         } else {
-            uint32_t dt = mp_hal_ticks_ms() - t0;
-            if (dt >= timeout_ms) {
-                MP_THREAD_GIL_ENTER();
-                return;
-            }
-            wait = K_MSEC(timeout_ms - dt);
+            wait = K_MSEC((timeout_ms > dt) ? (timeout_ms - dt) : 0);
         }
         k_poll(wait_events, sem ? 2 : 1, wait);
         if (wait_events[0].state == K_POLL_STATE_SIGNALED) {
@@ -73,5 +69,9 @@ void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
             MP_THREAD_GIL_ENTER();
             return;
         }
+        if (dt >= timeout_ms) {
+            MP_THREAD_GIL_ENTER();
+            return;
+        }
     }
 }

From f1bdac375240941edfc0aa04b646dc3c53d6b371 Mon Sep 17 00:00:00 2001
From: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
Date: Mon, 9 Sep 2024 18:53:15 +0330
Subject: [PATCH 1419/3129] unix/README: Fix typo in build dependencies.

Signed-off-by: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
---
 ports/unix/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/README.md b/ports/unix/README.md
index 953c83ef73d4c..b7aa6e3fef76d 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -32,7 +32,7 @@ On Debian/Ubuntu/Mint and related Linux distros, you can install all these
 dependencies with a command like:
 
 ```
-# apt install build-essential git python3 pkg-config libbfi-dev
+# apt install build-essential git python3 pkg-config libffi-dev
 ```
 
 (See below for steps to build either a standalone or minimal MicroPython

From 39ddfed9a0360af147193a6eb09228fd6afa0c41 Mon Sep 17 00:00:00 2001
From: Adrian Higgins <adrian@higstar.com>
Date: Thu, 5 Sep 2024 14:50:20 +1000
Subject: [PATCH 1420/3129] stm32: Update STM32L452xx Multi OTG handling.

Added custom Multi OTG handling for STM32L452xx, based on STM32L432xx
handling.

Fixes issue #15795.

Signed-off-by: Adrian Higgins <adrian@higstar.com>
---
 ports/stm32/mpconfigboard_common.h | 2 +-
 ports/stm32/stm32_it.c             | 2 +-
 ports/stm32/usbd_conf.c            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 67a6ee990e399..c158419483345 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -619,7 +619,7 @@
 // Whether the USB peripheral is device-only, or multiple OTG
 // For STM32G0 and STM32H5 the USB peripheral supports device and host mode,
 // but otherwise acts like a non-multi-OTG peripheral.
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L432xx) || defined(STM32WB)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L432xx) || defined(STM32L452xx) || defined(STM32WB)
 #define MICROPY_HW_USB_IS_MULTI_OTG (0)
 #else
 #define MICROPY_HW_USB_IS_MULTI_OTG (1)
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index a910a624be953..e05dbe91bc108 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -312,7 +312,7 @@ void USB_DRD_FS_IRQHandler(void) {
 }
 #endif
 
-#elif defined(STM32L0) || defined(STM32L432xx)
+#elif defined(STM32L0) || defined(STM32L432xx) || defined(STM32L452xx)
 
 #if MICROPY_HW_USB_FS
 void USB_IRQHandler(void) {
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 5d9e7177de564..829037ba935f6 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -93,7 +93,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         const uint32_t otg_alt = GPIO_AF10_OTG1_FS;
         #elif defined(STM32L0)
         const uint32_t otg_alt = GPIO_AF0_USB;
-        #elif defined(STM32L432xx)
+        #elif defined(STM32L432xx) || defined(STM32L452xx)
         const uint32_t otg_alt = GPIO_AF10_USB_FS;
         #elif defined(STM32H5) || defined(STM32WB)
         const uint32_t otg_alt = GPIO_AF10_USB;
@@ -156,7 +156,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         #elif defined(STM32L0)
         NVIC_SetPriority(USB_IRQn, IRQ_PRI_OTG_FS);
         HAL_NVIC_EnableIRQ(USB_IRQn);
-        #elif defined(STM32L432xx)
+        #elif defined(STM32L432xx) || defined(STM32L452xx)
         NVIC_SetPriority(USB_FS_IRQn, IRQ_PRI_OTG_FS);
         HAL_NVIC_EnableIRQ(USB_FS_IRQn);
         #elif defined(STM32G4) || defined(STM32L1) || defined(STM32WB)

From 976d9d148f7b6269e3fb164cf8b154217fb0dd67 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Tue, 10 Sep 2024 15:52:49 +1000
Subject: [PATCH 1421/3129] stm32/boards/STM32F429DISC: Add DAC support to the
 STM32F429DISC.

The STM32F429DISC board definition did not have DAC enabled, however the
micro/board supports it so this commit enables the feature.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/stm32/boards/STM32F429DISC/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
index 8754d3e46f31b..5d9287242b74c 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
@@ -5,6 +5,7 @@
 #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_SERVO     (1)
 

From 7953089a2515123f0bce49aa65efb4e3d2205d15 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Mon, 9 Sep 2024 11:29:28 +1000
Subject: [PATCH 1422/3129] examples/natmod: Fix URL links in README.md.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 examples/natmod/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/natmod/README.md b/examples/natmod/README.md
index 0cc4010ef42f3..f72d1c049a011 100644
--- a/examples/natmod/README.md
+++ b/examples/natmod/README.md
@@ -1,12 +1,12 @@
 # Dynamic Native Modules
 
 Dynamic Native Modules are .mpy files that contain native machine code from a
-language other than Python. For more info see [the documentation]
-(https://docs.micropython.org/en/latest/develop/natmod.html).
+language other than Python. For more info see [the
+documentation](https://docs.micropython.org/en/latest/develop/natmod.html).
 
-This should not be confused with [User C Modules]
-(https://docs.micropython.org/en/latest/develop/cmodules.html) which are a
-mechanism to add additional out-of-tree modules into the firmware build.
+This should not be confused with [User C
+Modules](https://docs.micropython.org/en/latest/develop/cmodules.html) which are
+a mechanism to add additional out-of-tree modules into the firmware build.
 
 ## Examples
 

From 0d8388673e8456f6b0e92e6f5941e0e804513204 Mon Sep 17 00:00:00 2001
From: Paul Grayson <pdg@alum.mit.edu>
Date: Wed, 11 Oct 2023 04:39:15 -0700
Subject: [PATCH 1423/3129] docs/esp32: Update pin access example with
 addresses for ESP32-S3.

Signed-off-by: Paul Grayson <pdg@alum.mit.edu>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/tutorial/peripheral_access.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/esp32/tutorial/peripheral_access.rst b/docs/esp32/tutorial/peripheral_access.rst
index ecdec101f7ef7..f7c32c367ca09 100644
--- a/docs/esp32/tutorial/peripheral_access.rst
+++ b/docs/esp32/tutorial/peripheral_access.rst
@@ -32,6 +32,18 @@ the prescaler of the MCPWM0 peripheral.
     mem32[MCPWM0] = 0x55      # change PWM_CLK_PRESCALE
     print(hex(mem32[MCPWM0])) # read PWM_CLK_CFG_REG
 
+The specific addresses will be different on different ESP32
+models. For example, ESP32-S3 uses these values:
+
+.. code-block:: python3
+
+    DR_REG_DPORT_BASE = const(0x600C_0000)
+    DPORT_PERIP_CLK_EN0_REG = const(DR_REG_DPORT_BASE + 0x0018)
+    DPORT_PERIP_RST_EN0_REG = const(DR_REG_DPORT_BASE + 0x0020)
+    DPORT_PWM0_CLK_EN = const(1 << 17)
+    MCPWM0 = const(0x6001_E000 + 0x0004)
+    ...
+
 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:

From 3d53b39a2a8b0d49f93a6c5915b22caa9ddae6d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 2 Sep 2024 14:49:49 +1000
Subject: [PATCH 1424/3129] docs/reference: Fix pyboard.py filesystem cp
 example with three files.

Fix documentation to match behaviour (directories are not preserved).

Fixes issue #11101.

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

diff --git a/docs/reference/pyboard.py.rst b/docs/reference/pyboard.py.rst
index a06ffdcd8fa96..13fc6b7a7a49d 100644
--- a/docs/reference/pyboard.py.rst
+++ b/docs/reference/pyboard.py.rst
@@ -120,9 +120,8 @@ Some more examples::
     # Same, but using . instead.
     $ pyboard.py --device /dev/ttyACM0 -f cp :main.py .
 
-    # Copy three files to the device, keeping their names
-    # and paths (note: `lib` must exist on the device)
-    $ pyboard.py --device /dev/ttyACM0 -f cp main.py app.py lib/foo.py :
+    # Copy three files to the device, keeping their names.
+    $ pyboard.py --device /dev/ttyACM0 -f cp main.py app.py foo.py :
 
     # Remove a file from the device.
     $ pyboard.py --device /dev/ttyACM0 -f rm util.py

From 8feb714b4d6bc29af3221c0abd47c4adb754f904 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Sep 2024 10:44:14 +1000
Subject: [PATCH 1425/3129] docs/library: Document math.log with two arguments.

The functionality is there but was not documented.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/math.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/library/math.rst b/docs/library/math.rst
index a6f13d48c1892..335bd80781cfc 100644
--- a/docs/library/math.rst
+++ b/docs/library/math.rst
@@ -125,8 +125,11 @@ Functions
    Return the natural logarithm of the gamma function of ``x``.
 
 .. function:: log(x)
+              log(x, base)
 
-   Return the natural logarithm of ``x``.
+   With one argument, return the natural logarithm of *x*.
+
+   With two arguments, return the logarithm of *x* to the given *base*.
 
 .. function:: log10(x)
 

From fb069f9d0623e0794eb1da30148cbc9ca32d3d50 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 10 Sep 2024 12:28:09 +1000
Subject: [PATCH 1426/3129] docs/library: Document machine.Pin.toggle() method.

Original commit was by @millosolomillo from 2022, but CI no longer accepts
their auto-generated GitHub commit email...

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/machine.Pin.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/library/machine.Pin.rst b/docs/library/machine.Pin.rst
index 49fb66beb38ea..68070133b8fb6 100644
--- a/docs/library/machine.Pin.rst
+++ b/docs/library/machine.Pin.rst
@@ -238,6 +238,12 @@ The following methods are not part of the core Pin API and only implemented on c
 
    Availability: cc3200 port.
 
+.. method:: Pin.toggle()
+
+   Toggle output pin from "0" to "1" or vice-versa.
+
+   Availability: mimxrt, samd, rp2 ports.
+
 Constants
 ---------
 

From 5dfd3ecd8b1c99ae08ce082102606739bde57852 Mon Sep 17 00:00:00 2001
From: ZodiusInfuser <christopher.parrott2@gmail.com>
Date: Thu, 5 Sep 2024 12:53:16 +0100
Subject: [PATCH 1427/3129] rp2: Add board-level hooks to main, and
 MICROPY_SOURCE_BOARD cmake var.

Signed-off-by: Christopher Parrott <chris@pimoroni.com>
---
 ports/rp2/CMakeLists.txt |  2 ++
 ports/rp2/main.c         | 13 +++++++++++++
 ports/rp2/mpconfigport.h | 16 ++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 904925ae3f5e5..19c7178fc7266 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -425,6 +425,7 @@ endif()
 list(APPEND MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_EXTMOD}
     ${MICROPY_SOURCE_USERMOD}
+    ${MICROPY_SOURCE_BOARD}
 )
 
 # Define mpy-cross flags
@@ -443,6 +444,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_DRIVERS}
     ${MICROPY_SOURCE_PORT}
+    ${MICROPY_SOURCE_BOARD}
 )
 
 target_link_libraries(${MICROPY_TARGET} micropy_lib_mbedtls)
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 98417e8da6b0b..7fb4a648679e7 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -83,6 +83,9 @@ int main(int argc, char **argv) {
     // Set the MCU frequency and as a side effect the peripheral clock to 48 MHz.
     set_sys_clock_khz(125000, false);
 
+    // Hook for setting up anything that needs to be super early in the bootup process.
+    MICROPY_BOARD_STARTUP();
+
     #if MICROPY_HW_ENABLE_UART_REPL
     bi_decl(bi_program_feature("UART REPL"))
     setup_default_uart();
@@ -152,6 +155,9 @@ int main(int argc, char **argv) {
     }
     #endif
 
+    // Hook for setting up anything that can wait until after other hardware features are initialised.
+    MICROPY_BOARD_EARLY_INIT();
+
     for (;;) {
 
         // Initialise MicroPython runtime.
@@ -213,6 +219,10 @@ int main(int argc, char **argv) {
 
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+
+        // Hook for resetting anything immediately following a soft reset command.
+        MICROPY_BOARD_START_SOFT_RESET();
+
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
@@ -233,6 +243,9 @@ int main(int argc, char **argv) {
         mp_usbd_deinit();
         #endif
 
+        // Hook for resetting anything right at the end of a soft reset command.
+        MICROPY_BOARD_END_SOFT_RESET();
+
         gc_sweep_all();
         mp_deinit();
         #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 49acafe239b9d..b34b4fc09c72d 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -283,3 +283,19 @@ extern void lwip_lock_release(void);
 #define MICROPY_PY_BLUETOOTH_ENTER uint32_t atomic_state = 0;
 #define MICROPY_PY_BLUETOOTH_EXIT (void)atomic_state;
 #endif
+
+#ifndef MICROPY_BOARD_STARTUP
+#define MICROPY_BOARD_STARTUP()
+#endif
+
+#ifndef MICROPY_BOARD_EARLY_INIT
+#define MICROPY_BOARD_EARLY_INIT()
+#endif
+
+#ifndef MICROPY_BOARD_START_SOFT_RESET
+#define MICROPY_BOARD_START_SOFT_RESET()
+#endif
+
+#ifndef MICROPY_BOARD_END_SOFT_RESET
+#define MICROPY_BOARD_END_SOFT_RESET()
+#endif

From 79ba6d8ce7f322baa8d606e52672c1bd4b245bb0 Mon Sep 17 00:00:00 2001
From: ZodiusInfuser <christopher.parrott2@gmail.com>
Date: Thu, 5 Sep 2024 12:54:15 +0100
Subject: [PATCH 1428/3129] rp2: Increase ext pins from 10 to 32.

To allow more pins when other ways are used to provide external GPIO (ie
not via cyw43).

Signed-off-by: Christopher Parrott <chris@pimoroni.com>
---
 ports/rp2/boards/make-pins.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index cbc3424705def..3acf5b9516997 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -10,8 +10,8 @@
 
 # This is NUM_BANK0_GPIOS. Pin indices are 0 to 29 (inclusive).
 NUM_GPIOS = 30
-# Up to 10 additional extended pins (e.g. via the wifi chip).
-NUM_EXT_GPIOS = 10
+# Up to 32 additional extended pins (e.g. via the wifi chip or io expanders).
+NUM_EXT_GPIOS = 32
 
 
 class Rp2Pin(boardgen.Pin):

From ded8bbdd5efc50d2b86e3020462ced8bbcf4d25c Mon Sep 17 00:00:00 2001
From: ZodiusInfuser <christopher.parrott2@gmail.com>
Date: Mon, 16 Sep 2024 13:39:13 +0100
Subject: [PATCH 1429/3129] rp2/machine_pin_cyw43: Include check for
 CYW43_GPIO.

The `#if` check only checks that `MICROPY_PY_NETWORK_CYW43` and
`MICROPY_HW_PIN_EXT_COUNT` are defined.  This is a reasonable assumption
for the Pico W, but causes conflicts if someone wants to attach an external
IO expander to their Pico W and have its pins appear as Pin objects.

This commit addresses this by adding the additional checks, letting board
builds include wireless but separately choose whether the external IO pins
come from the cyw43 or not.

Signed-off-by: Christopher Parrott <chris@pimoroni.com>
---
 ports/rp2/machine_pin_cyw43.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_pin_cyw43.c b/ports/rp2/machine_pin_cyw43.c
index c09561461f18a..9fc262454f86c 100644
--- a/ports/rp2/machine_pin_cyw43.c
+++ b/ports/rp2/machine_pin_cyw43.c
@@ -30,7 +30,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-#if defined(MICROPY_PY_NETWORK_CYW43) && defined(MICROPY_HW_PIN_EXT_COUNT)
+#if defined(MICROPY_PY_NETWORK_CYW43) && defined(MICROPY_HW_PIN_EXT_COUNT) && defined(CYW43_GPIO) && CYW43_GPIO == 1
 
 #include "modmachine.h"
 #include "machine_pin.h"
@@ -83,4 +83,4 @@ void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value) {
     }
 }
 
-#endif // defined(MICROPY_PY_NETWORK_CYW43) && defined(MICROPY_HW_PIN_EXT_COUNT)
+#endif // defined(MICROPY_PY_NETWORK_CYW43) && defined(MICROPY_HW_PIN_EXT_COUNT) && defined(CYW43_GPIO) && CYW43_GPIO == 1

From 451ba1cf386a2a0874ea20ea593dd6a009ede011 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 4 Sep 2024 12:14:01 +0200
Subject: [PATCH 1430/3129] rp2/modules: Fix FatFS boot script to detect
 invalid FAT filesystem.

This change helps detect if the filesystem is invalid, by also including
the first mount attempt within the try-except.  Then the FAT is reformatted
if needed.

Fixes issue #15779.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/modules/_boot_fat.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/modules/_boot_fat.py b/ports/rp2/modules/_boot_fat.py
index 5220584455dca..02d1f99f0daf3 100644
--- a/ports/rp2/modules/_boot_fat.py
+++ b/ports/rp2/modules/_boot_fat.py
@@ -5,10 +5,9 @@
 # Try to mount the filesystem, and format the flash if it doesn't exist.
 bdev = rp2.Flash()
 try:
-    fs = vfs.VfsFat(bdev)
+    vfs.mount(vfs.VfsFat(bdev), "/")
 except:
     vfs.VfsFat.mkfs(bdev)
-    fs = vfs.VfsFat(bdev)
-vfs.mount(fs, "/")
+    vfs.mount(vfs.VfsFat(bdev), "/")
 
-del vfs, bdev, fs
+del vfs, bdev

From 52a593cdb14ed732b5580bbed39c0325815adedf Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 4 Sep 2024 17:17:38 +1000
Subject: [PATCH 1431/3129] py/scheduler: Only run callbacks on the main thread
 if GIL is disabled.

Otherwise it's very difficult to reason about thread safety in a
scheduler callback, as it can run at any time on any thread - including
racing against any bytecode operation on any thread.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/micropython.rst | 8 ++++++++
 py/scheduler.c               | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/library/micropython.rst b/docs/library/micropython.rst
index b17dfa9a75a48..31b24903f1ca9 100644
--- a/docs/library/micropython.rst
+++ b/docs/library/micropython.rst
@@ -136,6 +136,14 @@ Functions
    the heap may be locked) and scheduling a function to call later will lift
    those restrictions.
 
+   On multi-threaded ports, the scheduled function's behaviour depends on
+   whether the Global Interpreter Lock (GIL) is enabled for the specific port:
+
+   - If GIL is enabled, the function can preempt any thread and run in its
+     context.
+   - If GIL is disabled, the function will only preempt the main thread and run
+     in its context.
+
    Note: If `schedule()` is called from a preempting IRQ, when memory
    allocation is not allowed and the callback to be passed to `schedule()` is
    a bound method, passing this directly will fail. This is because creating a
diff --git a/py/scheduler.c b/py/scheduler.c
index 3eae8b4fa366c..2170b9577e124 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -236,7 +236,13 @@ void mp_handle_pending(bool raise_exc) {
 
     // Handle any pending callbacks.
     #if MICROPY_ENABLE_SCHEDULER
-    if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
+    bool run_scheduler = (MP_STATE_VM(sched_state) == MP_SCHED_PENDING);
+    #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
+    // Avoid races by running the scheduler on the main thread, only.
+    // (Not needed if GIL enabled, as GIL ensures thread safety here.)
+    run_scheduler = run_scheduler && mp_thread_is_main_thread();
+    #endif
+    if (run_scheduler) {
         mp_sched_run_pending();
     }
     #endif

From 5d8878b582b8b68d19ab02adfe32d683d5ea512f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 4 Sep 2024 17:18:38 +1000
Subject: [PATCH 1432/3129] shared/tinyusb: Only run TinyUSB on the main thread
 if GIL is disabled.

If GIL is disabled then there's threat of a race condition if some other
code specifically requests USB processing (i.e. to unblock stdio), while
a scheduled TinyUSB callback is already running on another thread.

Relies on the change in the parent commit, where scheduler is restricted
to main thread if GIL is disabled.

Fixes #15390 - "TinyUSB callback can't recurse" exceptions on rp2 when
using _thread module and USB serial I/O.

Adds a unit test for stdin functioning correctly in threads (fails on rp2
port without this fix).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd_runtime.c |  9 +++++++
 tests/thread/thread_stdin.py     | 44 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 tests/thread/thread_stdin.py

diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index fe28a4a727791..49553825776a7 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -501,6 +501,15 @@ void mp_usbd_task_callback(mp_sched_node_t *node) {
 // Task function can be called manually to force processing of USB events
 // (mostly from USB-CDC serial port when blocking.)
 void mp_usbd_task(void) {
+    #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
+    if (!mp_thread_is_main_thread()) {
+        // Avoid race with the scheduler callback by scheduling TinyUSB to run
+        // on the main thread.
+        mp_usbd_schedule_task();
+        return;
+    }
+    #endif
+
     if (in_usbd_task) {
         // If this exception triggers, it means a USB callback tried to do
         // something that itself became blocked on TinyUSB (most likely: read or
diff --git a/tests/thread/thread_stdin.py b/tests/thread/thread_stdin.py
new file mode 100644
index 0000000000000..a469933f19b55
--- /dev/null
+++ b/tests/thread/thread_stdin.py
@@ -0,0 +1,44 @@
+# Test that having multiple threads block on stdin doesn't cause any issues.
+#
+# The test doesn't expect any input on stdin.
+#
+# This is a regression test for https://github.com/micropython/micropython/issues/15230
+# on rp2, but doubles as a general property to test across all ports.
+import sys
+import _thread
+
+try:
+    import select
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+class StdinWaiter:
+    def __init__(self):
+        self._done = False
+
+    def wait_stdin(self, timeout_ms):
+        poller = select.poll()
+        poller.register(sys.stdin, select.POLLIN)
+        poller.poll(timeout_ms)
+        # Ignoring the poll result as we don't expect any input
+        self._done = True
+
+    def is_done(self):
+        return self._done
+
+
+thread_waiter = StdinWaiter()
+_thread.start_new_thread(thread_waiter.wait_stdin, (1000,))
+StdinWaiter().wait_stdin(1000)
+
+# Spinning here is mostly not necessary but there is some inconsistency waking
+# the two threads, especially on CPython CI runners where the thread may not
+# have run yet. The actual delay is <20ms but spinning here instead of
+# sleep(0.1) means the test can run on MP builds without float support.
+while not thread_waiter.is_done():
+    pass
+
+# The background thread should have completed its wait by now.
+print(thread_waiter.is_done())

From 067ef81cd0a59aac9027e26e0f8220e5074ec033 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 4 Sep 2024 17:11:45 +1000
Subject: [PATCH 1433/3129] all: Remove tinytest component.

With the recent qemu (d9a0fdda9a7b0db55c1115b55bb1b83cd5ce739c and
0426934969d06aa649ba903f5408cb331b5b9c2d) and zephyr
(05cad7b56f5d460db26a468a05bfdeabe4a656db) changes to how their tests are
run, two things became unused:

- The tinytest framework, which embedded a set of tests and their expected
  output within firmware, so these tests could be run stand-alone.

- The `--write-exp` and `--list-tests` options to `tests/run-tests.py`,
  which were needed primarily to generated the expected test output for
  tinytest (also the associated `tests/run-tests-exp.py/.sh` scripts are
  now unused).

This commit removes the tinytest component and all its helper code.  This
eliminates a maintenance burden.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE                              |   1 -
 lib/tinytest/README                  |  18 -
 lib/tinytest/tinytest.c              | 474 ---------------------------
 lib/tinytest/tinytest.h              |  98 ------
 lib/tinytest/tinytest_macros.h       | 184 -----------
 shared/upytesthelper/upytesthelper.c | 137 --------
 shared/upytesthelper/upytesthelper.h |  37 ---
 tools/.gitignore                     |   8 -
 tools/tinytest-codegen.py            | 146 ---------
 9 files changed, 1103 deletions(-)
 delete mode 100644 lib/tinytest/README
 delete mode 100644 lib/tinytest/tinytest.c
 delete mode 100644 lib/tinytest/tinytest.h
 delete mode 100644 lib/tinytest/tinytest_macros.h
 delete mode 100644 shared/upytesthelper/upytesthelper.c
 delete mode 100644 shared/upytesthelper/upytesthelper.h
 delete mode 100644 tools/.gitignore
 delete mode 100755 tools/tinytest-codegen.py

diff --git a/LICENSE b/LICENSE
index 341698fa49a42..550ed9574d06a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -59,7 +59,6 @@ used during the build process and is not part of the compiled source code.
         /pico-sdk (BSD-3-clause)
         /re15 (BSD-3-clause)
         /stm32lib (BSD-3-clause)
-        /tinytest (BSD-3-clause)
         /tinyusb (MIT)
         /uzlib (Zlib)
         /wiznet5k (MIT)
diff --git a/lib/tinytest/README b/lib/tinytest/README
deleted file mode 100644
index 902c4a2e0f586..0000000000000
--- a/lib/tinytest/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Tinytest is a tiny little test framework written in C by Nick Mathewson.
-
-It is distributed under the 3-clause BSD license.  You can use it in
-your own programs so long as you follow the license's conditions.
-
-It's been tested on Windows, Mac, and many of the free Unixes.
-
-It knows how to fork before running certain tests, and it makes
-text-mode output in a format I like.
-
-For info on how to use it, check out tinytest_demo.c.
-
-You can get the latest version using Git, by pulling from
-   git://github.com/nmathewson/tinytest.git
-
-Patches are welcome. Patches that turn this from tinytest to hugetest
-will not be applied.  If you want a huge test framework, use CUnit.
-
diff --git a/lib/tinytest/tinytest.c b/lib/tinytest/tinytest.c
deleted file mode 100644
index 1ef957d31bdb4..0000000000000
--- a/lib/tinytest/tinytest.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/* tinytest.c -- Copyright 2009-2012 Nick Mathewson
- *
- * 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.
- */
-#ifdef TINYTEST_LOCAL
-#include "tinytest_local.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#ifndef NO_FORKING
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#endif
-
-#if defined(__APPLE__) && defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
-#if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060 && \
-    __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-/* Workaround for a stupid bug in OSX 10.6 */
-#define FORK_BREAKS_GCOV
-#include <vproc.h>
-#endif
-#endif
-
-#endif /* !NO_FORKING */
-
-#ifndef __GNUC__
-#define __attribute__(x)
-#endif
-
-#include "tinytest.h"
-#include "tinytest_macros.h"
-
-#define LONGEST_TEST_NAME 16384
-
-static int in_tinytest_main = 0; /**< true if we're in tinytest_main().*/
-static int n_ok = 0; /**< Number of tests that have passed */
-static int n_bad = 0; /**< Number of tests that have failed. */
-static int n_skipped = 0; /**< Number of tests that have been skipped. */
-
-static int opt_forked = 0; /**< True iff we're called from inside a win32 fork*/
-static int opt_nofork = 0; /**< Suppress calls to fork() for debugging. */
-static int opt_verbosity = 1; /**< -==quiet,0==terse,1==normal,2==verbose */
-const char *verbosity_flag = "";
-
-const struct testlist_alias_t *cfg_aliases=NULL;
-
-enum outcome { SKIP=2, OK=1, FAIL=0 };
-static enum outcome cur_test_outcome = 0;
-const char *cur_test_prefix = NULL; /**< prefix of the current test group */
-/** Name of the current test, if we haven't logged is yet. Used for --quiet */
-const char *cur_test_name = NULL;
-
-#ifdef _WIN32
-/* Copy of argv[0] for win32. */
-static char commandname[MAX_PATH+1];
-#endif
-
-static void usage(struct testgroup_t *groups, int list_groups)
-  __attribute__((noreturn));
-static int process_test_option(struct testgroup_t *groups, const char *test);
-
-static enum outcome
-testcase_run_bare_(const struct testcase_t *testcase)
-{
-	void *env = NULL;
-	int outcome;
-	if (testcase->setup) {
-		env = testcase->setup->setup_fn(testcase);
-		if (!env)
-			return FAIL;
-		else if (env == (void*)TT_SKIP)
-			return SKIP;
-	}
-
-	cur_test_outcome = OK;
-	testcase->fn(env);
-	outcome = cur_test_outcome;
-
-	if (testcase->setup) {
-		if (testcase->setup->cleanup_fn(testcase, env) == 0)
-			outcome = FAIL;
-	}
-
-	return outcome;
-}
-
-#define MAGIC_EXITCODE 42
-
-#ifndef NO_FORKING
-
-static enum outcome
-testcase_run_forked_(const struct testgroup_t *group,
-		     const struct testcase_t *testcase)
-{
-#ifdef _WIN32
-	/* Fork? On Win32?  How primitive!  We'll do what the smart kids do:
-	   we'll invoke our own exe (whose name we recall from the command
-	   line) with a command line that tells it to run just the test we
-	   want, and this time without forking.
-
-	   (No, threads aren't an option.  The whole point of forking is to
-	   share no state between tests.)
-	 */
-	int ok;
-	char buffer[LONGEST_TEST_NAME+256];
-	STARTUPINFOA si;
-	PROCESS_INFORMATION info;
-	DWORD exitcode;
-
-	if (!in_tinytest_main) {
-		printf("\nERROR.  On Windows, testcase_run_forked_ must be"
-		       " called from within tinytest_main.\n");
-		abort();
-	}
-	if (opt_verbosity>0)
-		printf("[forking] ");
-
-	snprintf(buffer, sizeof(buffer), "%s --RUNNING-FORKED %s %s%s",
-		 commandname, verbosity_flag, group->prefix, testcase->name);
-
-	memset(&si, 0, sizeof(si));
-	memset(&info, 0, sizeof(info));
-	si.cb = sizeof(si);
-
-	ok = CreateProcessA(commandname, buffer, NULL, NULL, 0,
-			   0, NULL, NULL, &si, &info);
-	if (!ok) {
-		printf("CreateProcess failed!\n");
-		return 0;
-	}
-	WaitForSingleObject(info.hProcess, INFINITE);
-	GetExitCodeProcess(info.hProcess, &exitcode);
-	CloseHandle(info.hProcess);
-	CloseHandle(info.hThread);
-	if (exitcode == 0)
-		return OK;
-	else if (exitcode == MAGIC_EXITCODE)
-		return SKIP;
-	else
-		return FAIL;
-#else
-	int outcome_pipe[2];
-	pid_t pid;
-	(void)group;
-
-	if (pipe(outcome_pipe))
-		perror("opening pipe");
-
-	if (opt_verbosity>0)
-		printf("[forking] ");
-	pid = fork();
-#ifdef FORK_BREAKS_GCOV
-	vproc_transaction_begin(0);
-#endif
-	if (!pid) {
-		/* child. */
-		int test_r, write_r;
-		char b[1];
-		close(outcome_pipe[0]);
-		test_r = testcase_run_bare_(testcase);
-		assert(0<=(int)test_r && (int)test_r<=2);
-		b[0] = "NYS"[test_r];
-		write_r = (int)write(outcome_pipe[1], b, 1);
-		if (write_r != 1) {
-			perror("write outcome to pipe");
-			exit(1);
-		}
-		exit(0);
-		return FAIL; /* unreachable */
-	} else {
-		/* parent */
-		int status, r;
-		char b[1];
-		/* Close this now, so that if the other side closes it,
-		 * our read fails. */
-		close(outcome_pipe[1]);
-		r = (int)read(outcome_pipe[0], b, 1);
-		if (r == 0) {
-			printf("[Lost connection!] ");
-			return 0;
-		} else if (r != 1) {
-			perror("read outcome from pipe");
-		}
-		waitpid(pid, &status, 0);
-		close(outcome_pipe[0]);
-		return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
-	}
-#endif
-}
-
-#endif /* !NO_FORKING */
-
-int
-testcase_run_one(const struct testgroup_t *group,
-		 const struct testcase_t *testcase)
-{
-	enum outcome outcome;
-
-	if (testcase->flags & (TT_SKIP|TT_OFF_BY_DEFAULT)) {
-		if (opt_verbosity>0)
-			printf("%s%s: %s\n",
-			   group->prefix, testcase->name,
-			   (testcase->flags & TT_SKIP) ? "SKIPPED" : "DISABLED");
-		++n_skipped;
-		return SKIP;
-	}
-
-	if (opt_verbosity>0 && !opt_forked) {
-		printf("%s%s: ", group->prefix, testcase->name);
-	} else {
-		if (opt_verbosity==0) printf(".");
-		cur_test_prefix = group->prefix;
-		cur_test_name = testcase->name;
-	}
-
-#ifndef NO_FORKING
-	if ((testcase->flags & TT_FORK) && !(opt_forked||opt_nofork)) {
-		outcome = testcase_run_forked_(group, testcase);
-	} else {
-#else
-	{
-#endif
-		outcome = testcase_run_bare_(testcase);
-	}
-
-	if (outcome == OK) {
-		++n_ok;
-		if (opt_verbosity>0 && !opt_forked)
-			puts(opt_verbosity==1?"OK":"");
-	} else if (outcome == SKIP) {
-		++n_skipped;
-		if (opt_verbosity>0 && !opt_forked)
-			puts("SKIPPED");
-	} else {
-		++n_bad;
-		if (!opt_forked)
-			printf("\n  [%s FAILED]\n", testcase->name);
-	}
-
-	if (opt_forked) {
-		exit(outcome==OK ? 0 : (outcome==SKIP?MAGIC_EXITCODE : 1));
-		return 1; /* unreachable */
-	} else {
-		return (int)outcome;
-	}
-}
-
-int
-tinytest_set_flag_(struct testgroup_t *groups, const char *arg, int set, unsigned long flag)
-{
-	int i, j;
-	size_t length = LONGEST_TEST_NAME;
-	char fullname[LONGEST_TEST_NAME];
-	int found=0;
-	if (strstr(arg, ".."))
-		length = strstr(arg,"..")-arg;
-	for (i=0; groups[i].prefix; ++i) {
-		for (j=0; groups[i].cases[j].name; ++j) {
-			struct testcase_t *testcase = &groups[i].cases[j];
-			snprintf(fullname, sizeof(fullname), "%s%s",
-				 groups[i].prefix, testcase->name);
-			if (!flag) { /* Hack! */
-				printf("    %s", fullname);
-				if (testcase->flags & TT_OFF_BY_DEFAULT)
-					puts("   (Off by default)");
-				else if (testcase->flags & TT_SKIP)
-					puts("  (DISABLED)");
-				else
-					puts("");
-			}
-			if (!strncmp(fullname, arg, length)) {
-				if (set)
-					testcase->flags |= flag;
-				else
-					testcase->flags &= ~flag;
-				++found;
-			}
-		}
-	}
-	return found;
-}
-
-static void
-usage(struct testgroup_t *groups, int list_groups)
-{
-	puts("Options are: [--verbose|--quiet|--terse] [--no-fork]");
-	puts("  Specify tests by name, or using a prefix ending with '..'");
-	puts("  To skip a test, prefix its name with a colon.");
-	puts("  To enable a disabled test, prefix its name with a plus.");
-	puts("  Use --list-tests for a list of tests.");
-	if (list_groups) {
-		puts("Known tests are:");
-		tinytest_set_flag_(groups, "..", 1, 0);
-	}
-	exit(0);
-}
-
-static int
-process_test_alias(struct testgroup_t *groups, const char *test)
-{
-	int i, j, n, r;
-	for (i=0; cfg_aliases && cfg_aliases[i].name; ++i) {
-		if (!strcmp(cfg_aliases[i].name, test)) {
-			n = 0;
-			for (j = 0; cfg_aliases[i].tests[j]; ++j) {
-				r = process_test_option(groups, cfg_aliases[i].tests[j]);
-				if (r<0)
-					return -1;
-				n += r;
-			}
-			return n;
-		}
-	}
-	printf("No such test alias as @%s!",test);
-	return -1;
-}
-
-static int
-process_test_option(struct testgroup_t *groups, const char *test)
-{
-	int flag = TT_ENABLED_;
-	int n = 0;
-	if (test[0] == '@') {
-		return process_test_alias(groups, test + 1);
-	} else if (test[0] == ':') {
-		++test;
-		flag = TT_SKIP;
-	} else if (test[0] == '+') {
-		++test;
-		++n;
-		if (!tinytest_set_flag_(groups, test, 0, TT_OFF_BY_DEFAULT)) {
-			printf("No such test as %s!\n", test);
-			return -1;
-		}
-	} else {
-		++n;
-	}
-	if (!tinytest_set_flag_(groups, test, 1, flag)) {
-		printf("No such test as %s!\n", test);
-		return -1;
-	}
-	return n;
-}
-
-void
-tinytest_set_aliases(const struct testlist_alias_t *aliases)
-{
-	cfg_aliases = aliases;
-}
-
-int
-tinytest_main(int c, const char **v, struct testgroup_t *groups)
-{
-	int i, j, n=0;
-
-#ifdef _WIN32
-	const char *sp = strrchr(v[0], '.');
-	const char *extension = "";
-	if (!sp || stricmp(sp, ".exe"))
-		extension = ".exe"; /* Add an exe so CreateProcess will work */
-	snprintf(commandname, sizeof(commandname), "%s%s", v[0], extension);
-	commandname[MAX_PATH]='\0';
-#endif
-	for (i=1; i<c; ++i) {
-		if (v[i][0] == '-') {
-			if (!strcmp(v[i], "--RUNNING-FORKED")) {
-				opt_forked = 1;
-			} else if (!strcmp(v[i], "--no-fork")) {
-				opt_nofork = 1;
-			} else if (!strcmp(v[i], "--quiet")) {
-				opt_verbosity = -1;
-				verbosity_flag = "--quiet";
-			} else if (!strcmp(v[i], "--verbose")) {
-				opt_verbosity = 2;
-				verbosity_flag = "--verbose";
-			} else if (!strcmp(v[i], "--terse")) {
-				opt_verbosity = 0;
-				verbosity_flag = "--terse";
-			} else if (!strcmp(v[i], "--help")) {
-				usage(groups, 0);
-			} else if (!strcmp(v[i], "--list-tests")) {
-				usage(groups, 1);
-			} else {
-				printf("Unknown option %s.  Try --help\n",v[i]);
-				return -1;
-			}
-		} else {
-			int r = process_test_option(groups, v[i]);
-			if (r<0)
-				return -1;
-			n += r;
-		}
-	}
-	if (!n)
-		tinytest_set_flag_(groups, "..", 1, TT_ENABLED_);
-
-#ifdef _IONBF
-	setvbuf(stdout, NULL, _IONBF, 0);
-#endif
-
-	++in_tinytest_main;
-	for (i=0; groups[i].prefix; ++i)
-		for (j=0; groups[i].cases[j].name; ++j)
-			if (groups[i].cases[j].flags & TT_ENABLED_)
-				testcase_run_one(&groups[i],
-						 &groups[i].cases[j]);
-
-	--in_tinytest_main;
-
-	if (opt_verbosity==0)
-		puts("");
-
-	if (n_bad)
-		printf("%d/%d TESTS FAILED. (%d skipped)\n", n_bad,
-		       n_bad+n_ok,n_skipped);
-	else if (opt_verbosity >= 1)
-		printf("%d tests ok.  (%d skipped)\n", n_ok, n_skipped);
-
-	return (n_bad == 0) ? 0 : 1;
-}
-
-int
-tinytest_get_verbosity_(void)
-{
-	return opt_verbosity;
-}
-
-void
-tinytest_set_test_failed_(void)
-{
-	if (opt_verbosity <= 0 && cur_test_name) {
-		if (opt_verbosity==0) puts("");
-		printf("%s%s: ", cur_test_prefix, cur_test_name);
-		cur_test_name = NULL;
-	}
-	cur_test_outcome = 0;
-}
-
-void
-tinytest_set_test_skipped_(void)
-{
-	if (cur_test_outcome==OK)
-		cur_test_outcome = SKIP;
-}
-
diff --git a/lib/tinytest/tinytest.h b/lib/tinytest/tinytest.h
deleted file mode 100644
index dff440e3190ed..0000000000000
--- a/lib/tinytest/tinytest.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* tinytest.h -- Copyright 2009-2012 Nick Mathewson
- *
- * 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.
- */
-
-#ifndef TINYTEST_H_INCLUDED_
-#define TINYTEST_H_INCLUDED_
-
-/** Flag for a test that needs to run in a subprocess. */
-#define TT_FORK  (1<<0)
-/** Runtime flag for a test we've decided to skip. */
-#define TT_SKIP  (1<<1)
-/** Internal runtime flag for a test we've decided to run. */
-#define TT_ENABLED_  (1<<2)
-/** Flag for a test that's off by default. */
-#define TT_OFF_BY_DEFAULT  (1<<3)
-/** If you add your own flags, make them start at this point. */
-#define TT_FIRST_USER_FLAG (1<<4)
-
-typedef void (*testcase_fn)(void *);
-
-struct testcase_t;
-
-/** Functions to initialize/teardown a structure for a testcase. */
-struct testcase_setup_t {
-	/** Return a new structure for use by a given testcase. */
-	void *(*setup_fn)(const struct testcase_t *);
-	/** Clean/free a structure from setup_fn. Return 1 if ok, 0 on err. */
-	int (*cleanup_fn)(const struct testcase_t *, void *);
-};
-
-/** A single test-case that you can run. */
-struct testcase_t {
-	const char *name; /**< An identifier for this case. */
-	testcase_fn fn; /**< The function to run to implement this case. */
-	unsigned long flags; /**< Bitfield of TT_* flags. */
-	const struct testcase_setup_t *setup; /**< Optional setup/cleanup fns*/
-	void *setup_data; /**< Extra data usable by setup function */
-};
-#define END_OF_TESTCASES { NULL, NULL, 0, NULL, NULL }
-
-/** A group of tests that are selectable together. */
-struct testgroup_t {
-	const char *prefix; /**< Prefix to prepend to testnames. */
-	struct testcase_t *cases; /** Array, ending with END_OF_TESTCASES */
-};
-#define END_OF_GROUPS { NULL, NULL}
-
-struct testlist_alias_t {
-	const char *name;
-	const char **tests;
-};
-#define END_OF_ALIASES { NULL, NULL }
-
-/** Implementation: called from a test to indicate failure, before logging. */
-void tinytest_set_test_failed_(void);
-/** Implementation: called from a test to indicate that we're skipping. */
-void tinytest_set_test_skipped_(void);
-/** Implementation: return 0 for quiet, 1 for normal, 2 for loud. */
-int tinytest_get_verbosity_(void);
-/** Implementation: Set a flag on tests matching a name; returns number
- * of tests that matched. */
-int tinytest_set_flag_(struct testgroup_t *, const char *, int set, unsigned long);
-
-/** Set all tests in 'groups' matching the name 'named' to be skipped. */
-#define tinytest_skip(groups, named) \
-	tinytest_set_flag_(groups, named, 1, TT_SKIP)
-
-/** Run a single testcase in a single group. */
-int testcase_run_one(const struct testgroup_t *,const struct testcase_t *);
-
-void tinytest_set_aliases(const struct testlist_alias_t *aliases);
-
-/** Run a set of testcases from an END_OF_GROUPS-terminated array of groups,
-    as selected from the command line. */
-int tinytest_main(int argc, const char **argv, struct testgroup_t *groups);
-
-#endif
diff --git a/lib/tinytest/tinytest_macros.h b/lib/tinytest/tinytest_macros.h
deleted file mode 100644
index 9ff69b1d506da..0000000000000
--- a/lib/tinytest/tinytest_macros.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* tinytest_macros.h -- Copyright 2009-2012 Nick Mathewson
- *
- * 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.
- */
-
-#ifndef TINYTEST_MACROS_H_INCLUDED_
-#define TINYTEST_MACROS_H_INCLUDED_
-
-/* Helpers for defining statement-like macros */
-#define TT_STMT_BEGIN do {
-#define TT_STMT_END } while (0)
-
-/* Redefine this if your test functions want to abort with something besides
- * "goto end;" */
-#ifndef TT_EXIT_TEST_FUNCTION
-#define TT_EXIT_TEST_FUNCTION TT_STMT_BEGIN goto end; TT_STMT_END
-#endif
-
-/* Redefine this if you want to note success/failure in some different way. */
-#ifndef TT_DECLARE
-#define TT_DECLARE(prefix, args)				\
-	TT_STMT_BEGIN						\
-	printf("\n  %s %s:%d: ",prefix,__FILE__,__LINE__);	\
-	printf args ;						\
-	TT_STMT_END
-#endif
-
-/* Announce a failure. Args are parenthesized printf args. */
-#define TT_GRIPE(args) TT_DECLARE("FAIL", args)
-
-/* Announce a non-failure if we're verbose. */
-#define TT_BLATHER(args)						\
-	TT_STMT_BEGIN							\
-	if (tinytest_get_verbosity_()>1) TT_DECLARE("  OK", args);	\
-	TT_STMT_END
-
-#define TT_DIE(args)						\
-	TT_STMT_BEGIN						\
-	tinytest_set_test_failed_();				\
-	TT_GRIPE(args);						\
-	TT_EXIT_TEST_FUNCTION;					\
-	TT_STMT_END
-
-#define TT_FAIL(args)				\
-	TT_STMT_BEGIN						\
-	tinytest_set_test_failed_();				\
-	TT_GRIPE(args);						\
-	TT_STMT_END
-
-/* Fail and abort the current test for the reason in msg */
-#define tt_abort_printf(msg) TT_DIE(msg)
-#define tt_abort_perror(op) TT_DIE(("%s: %s [%d]",(op),strerror(errno), errno))
-#define tt_abort_msg(msg) TT_DIE(("%s", msg))
-#define tt_abort() TT_DIE(("%s", "(Failed.)"))
-
-/* Fail but do not abort the current test for the reason in msg. */
-#define tt_failprint_f(msg) TT_FAIL(msg)
-#define tt_fail_perror(op) TT_FAIL(("%s: %s [%d]",(op),strerror(errno), errno))
-#define tt_fail_msg(msg) TT_FAIL(("%s", msg))
-#define tt_fail() TT_FAIL(("%s", "(Failed.)"))
-
-/* End the current test, and indicate we are skipping it. */
-#define tt_skip()						\
-	TT_STMT_BEGIN						\
-	tinytest_set_test_skipped_();				\
-	TT_EXIT_TEST_FUNCTION;					\
-	TT_STMT_END
-
-#define tt_want_(b, msg, fail)				\
-	TT_STMT_BEGIN					\
-	if (!(b)) {					\
-		tinytest_set_test_failed_();		\
-		TT_GRIPE(("%s",msg));			\
-		fail;					\
-	} else {					\
-		TT_BLATHER(("%s",msg));			\
-	}						\
-	TT_STMT_END
-
-/* Assert b, but do not stop the test if b fails.  Log msg on failure. */
-#define tt_want_msg(b, msg)			\
-	tt_want_(b, msg, );
-
-/* Assert b and stop the test if b fails.  Log msg on failure. */
-#define tt_assert_msg(b, msg)			\
-	tt_want_(b, msg, TT_EXIT_TEST_FUNCTION);
-
-/* Assert b, but do not stop the test if b fails. */
-#define tt_want(b)   tt_want_msg( (b), "want("#b")")
-/* Assert b, and stop the test if b fails. */
-#define tt_assert(b) tt_assert_msg((b), "assert("#b")")
-
-#define tt_assert_test_fmt_type(a,b,str_test,type,test,printf_type,printf_fmt, \
-    setup_block,cleanup_block,die_on_fail)				\
-	TT_STMT_BEGIN							\
-	type val1_ = (type)(a);						\
-	type val2_ = (type)(b);						\
-	int tt_status_ = (test);					\
-	if (!tt_status_ || tinytest_get_verbosity_()>1)	{		\
-		printf_type print_;					\
-		printf_type print1_;					\
-		printf_type print2_;					\
-		type value_ = val1_;					\
-		setup_block;						\
-		print1_ = print_;					\
-		value_ = val2_;						\
-		setup_block;						\
-		print2_ = print_;					\
-		TT_DECLARE(tt_status_?"	 OK":"FAIL",			\
-			   ("assert(%s): "printf_fmt" vs "printf_fmt,	\
-			    str_test, print1_, print2_));		\
-		print_ = print1_;					\
-		cleanup_block;						\
-		print_ = print2_;					\
-		cleanup_block;						\
-		if (!tt_status_) {					\
-			tinytest_set_test_failed_();			\
-			die_on_fail ;					\
-		}							\
-	}								\
-	TT_STMT_END
-
-#define tt_assert_test_type(a,b,str_test,type,test,fmt,die_on_fail)	\
-	tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt,	\
-	    {print_=value_;},{},die_on_fail)
-
-/* Helper: assert that a op b, when cast to type.  Format the values with
- * printf format fmt on failure. */
-#define tt_assert_op_type(a,op,b,type,fmt)				\
-	tt_assert_test_type(a,b,#a" "#op" "#b,type,(val1_ op val2_),fmt, \
-	    TT_EXIT_TEST_FUNCTION)
-
-#define tt_int_op(a,op,b)			\
-	tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_), \
-	    "%ld",TT_EXIT_TEST_FUNCTION)
-
-#define tt_uint_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long,		\
-	    (val1_ op val2_),"%lu",TT_EXIT_TEST_FUNCTION)
-
-#define tt_ptr_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,void*,			\
-	    (val1_ op val2_),"%p",TT_EXIT_TEST_FUNCTION)
-
-#define tt_str_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,const char *,		\
-	    (strcmp(val1_,val2_) op 0),"<%s>",TT_EXIT_TEST_FUNCTION)
-
-#define tt_want_int_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_),"%ld",(void)0)
-
-#define tt_want_uint_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long,		\
-	    (val1_ op val2_),"%lu",(void)0)
-
-#define tt_want_ptr_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,void*,			\
-	    (val1_ op val2_),"%p",(void)0)
-
-#define tt_want_str_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,const char *,		\
-	    (strcmp(val1_,val2_) op 0),"<%s>",(void)0)
-
-#endif
diff --git a/shared/upytesthelper/upytesthelper.c b/shared/upytesthelper/upytesthelper.c
deleted file mode 100644
index ba20037f7ac04..0000000000000
--- a/shared/upytesthelper/upytesthelper.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Linaro Limited
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION 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 "py/gc.h"
-#include "py/runtime.h"
-#include "py/compile.h"
-#include "upytesthelper.h"
-
-#if !MICROPY_PY_SYS_PATH
-#error "upytesthelper requires MICROPY_PY_SYS_PATH=1"
-#endif
-
-#if !MICROPY_PY_SYS_ARGV
-#error "upytesthelper requires MICROPY_PY_SYS_ARGV=1"
-#endif
-
-static const char *test_exp_output;
-static int test_exp_output_len, test_rem_output_len;
-static int test_failed;
-static void *heap_start, *heap_end;
-
-void upytest_set_heap(void *start, void *end) {
-    heap_start = start;
-    heap_end = end;
-}
-
-void upytest_set_expected_output(const char *output, unsigned len) {
-    test_exp_output = output;
-    test_exp_output_len = test_rem_output_len = len;
-    test_failed = false;
-}
-
-bool upytest_is_failed(void) {
-    if (test_failed) {
-        return true;
-    }
-    #if 0
-    if (test_rem_output_len != 0) {
-        printf("remaining len: %d\n", test_rem_output_len);
-    }
-    #endif
-    return test_rem_output_len != 0;
-}
-
-// MP_PLAT_PRINT_STRN() should be redirected to this function.
-// It will pass-through any content to mp_hal_stdout_tx_strn_cooked()
-// (the default value of MP_PLAT_PRINT_STRN), but will also match
-// it to the expected output as set by upytest_set_expected_output().
-// If mismatch happens, upytest_is_failed() returns true.
-void upytest_output(const char *str, mp_uint_t len) {
-    if (!test_failed) {
-        if (len > test_rem_output_len) {
-            test_failed = true;
-        } else {
-            test_failed = memcmp(test_exp_output, str, len);
-            #if 0
-            if (test_failed) {
-                printf("failed after char %u, within %d chars, res: %d\n",
-                    test_exp_output_len - test_rem_output_len, (int)len, test_failed);
-                for (int i = 0; i < len; i++) {
-                    if (str[i] != test_exp_output[i]) {
-                        printf("%d %02x %02x\n", i, str[i], test_exp_output[i]);
-                    }
-                }
-            }
-            #endif
-            test_exp_output += len;
-            test_rem_output_len -= len;
-        }
-    }
-    mp_hal_stdout_tx_strn_cooked(str, len);
-}
-
-void upytest_execute_test(const char *src) {
-    // To provide clean room for each test, interpreter and heap are
-    // reinitialized before running each.
-    gc_init(heap_start, heap_end);
-    mp_init();
-    mp_sys_path = mp_obj_new_list(0, NULL);
-    #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;
-    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, MP_PARSE_FILE_INPUT);
-        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, false);
-        mp_call_function_0(module_fun);
-        nlr_pop();
-    } else {
-        mp_obj_t exc = (mp_obj_t)nlr.ret_val;
-        if (mp_obj_is_subclass_fast(mp_obj_get_type(exc), &mp_type_SystemExit)) {
-            // Assume that sys.exit() is called to skip the test.
-            // TODO: That can be always true, we should set up convention to
-            // use specific exit code as skip indicator.
-            tinytest_set_test_skipped_();
-            goto end;
-        }
-        mp_obj_print_exception(&mp_plat_print, exc);
-        tt_abort_msg("Uncaught exception\n");
-    }
-
-    if (upytest_is_failed()) {
-        tinytest_set_test_failed_();
-    }
-
-end:
-    mp_deinit();
-}
diff --git a/shared/upytesthelper/upytesthelper.h b/shared/upytesthelper/upytesthelper.h
deleted file mode 100644
index 3a292befd7757..0000000000000
--- a/shared/upytesthelper/upytesthelper.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Linaro Limited
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION 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 <stdio.h>
-#include "py/mpconfig.h"
-#include "lib/tinytest/tinytest.h"
-#include "lib/tinytest/tinytest_macros.h"
-
-void upytest_set_heap(void *start, void *end);
-void upytest_set_expected_output(const char *output, unsigned len);
-void upytest_execute_test(const char *src);
-void upytest_output(const char *str, mp_uint_t len);
-bool upytest_is_failed(void);
diff --git a/tools/.gitignore b/tools/.gitignore
deleted file mode 100644
index 9f65f493bc655..0000000000000
--- a/tools/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-tinytest/.gitignore
-tinytest/.travis.yml
-tinytest/Makefile
-tinytest/Makefile.arm-cortex-m3-qemu
-tinytest/Makefile.avr
-tinytest/TODO
-tinytest/portable_demo.c
-tinytest/tinytest_demo.c
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
deleted file mode 100755
index 8178b5602058b..0000000000000
--- a/tools/tinytest-codegen.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python3
-
-import os, sys
-from glob import glob
-from re import sub
-import argparse
-
-
-def escape(s):
-    s = s.decode()
-    lookup = {
-        "\0": "\\0",
-        "\t": "\\t",
-        "\n": '\\n"\n"',
-        "\r": "\\r",
-        "\\": "\\\\",
-        '"': '\\"',
-    }
-    return '""\n"{}"'.format("".join([lookup[x] if x in lookup else x for x in s]))
-
-
-def chew_filename(t):
-    return {"func": "test_{}_fn".format(sub(r"/|\.|-", "_", t)), "desc": t}
-
-
-def script_to_map(test_file):
-    r = {"name": chew_filename(test_file)["func"]}
-    with open(test_file, "rb") as f:
-        r["script"] = escape(f.read())
-    with open(test_file + ".exp", "rb") as f:
-        r["output"] = escape(f.read())
-    return r
-
-
-def load_profile(profile_file, test_dirs, exclude_tests):
-    profile_globals = {"test_dirs": test_dirs, "exclude_tests": exclude_tests}
-    exec(profile_file.read(), profile_globals)
-    return profile_globals["test_dirs"], profile_globals["exclude_tests"]
-
-
-test_function = (
-    "void {name}(void* data) {{\n"
-    "  static const char pystr[] = {script};\n"
-    "  static const char exp[] = {output};\n"
-    '  printf("\\n");\n'
-    "  upytest_set_expected_output(exp, sizeof(exp) - 1);\n"
-    "  upytest_execute_test(pystr);\n"
-    '  printf("result: ");\n'
-    "}}"
-)
-
-testcase_struct = "struct testcase_t {name}_tests[] = {{\n{body}\n  END_OF_TESTCASES\n}};"
-testcase_member = '  {{ "{desc}", {func}, TT_ENABLED_, 0, 0 }},'
-
-testgroup_struct = "struct testgroup_t groups[] = {{\n{body}\n  END_OF_GROUPS\n}};"
-testgroup_member = '  {{ "{name}", {name}_tests }},'
-
-## XXX: may be we could have `--without <groups>` argument...
-
-test_dirs = set(
-    (
-        "basics",
-        "extmod",
-        "float",
-        "micropython",
-        "misc",
-    )
-)
-
-exclude_tests = set(
-    (
-        # pattern matching in .exp
-        "basics/bytes_compare3.py",
-        "extmod/ticks_diff.py",
-        "extmod/time_ms_us.py",
-        # unicode char issue
-        "extmod/json_loads.py",
-        # doesn't output to python stdout
-        "extmod/re_debug.py",
-        "extmod/vfs_basic.py",
-        "extmod/vfs_fat_ramdisk.py",
-        "extmod/vfs_fat_fileio.py",
-        "extmod/vfs_fat_fsusermount.py",
-        "extmod/vfs_fat_oldproto.py",
-        # rounding issues
-        "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",
-        # different filename in output
-        "micropython/emg_exc.py",
-        "micropython/heapalloc_traceback.py",
-        # don't have emergency exception buffer
-        "micropython/heapalloc_exc_compressed_emg_exc.py",
-        # pattern matching in .exp
-        "micropython/meminfo.py",
-        # needs sys stdfiles
-        "misc/print_exception.py",
-        # settrace .exp files are too large
-        "misc/sys_settrace_loop.py",
-        "misc/sys_settrace_generator.py",
-        "misc/sys_settrace_features.py",
-        # don't have f-string
-        "basics/string_fstring.py",
-        "basics/string_fstring_debug.py",
-    )
-)
-
-output = []
-tests = []
-
-argparser = argparse.ArgumentParser(
-    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")
-argparser.add_argument(
-    "--profile",
-    type=argparse.FileType("rt", encoding="utf-8"),
-    help="optional profile file providing test directories and exclusion list",
-)
-args = argparser.parse_args()
-
-if not args.stdin:
-    if args.profile:
-        test_dirs, exclude_tests = load_profile(args.profile, test_dirs, exclude_tests)
-    if args.exclude:
-        exclude_tests = exclude_tests.union(args.exclude)
-    for group in test_dirs:
-        tests += [test for test in glob("{}/*.py".format(group)) if test not in exclude_tests]
-else:
-    for l in sys.stdin:
-        tests.append(l.rstrip())
-
-output.extend([test_function.format(**script_to_map(test)) for test in tests])
-testcase_members = [testcase_member.format(**chew_filename(test)) for test in tests]
-output.append(testcase_struct.format(name="", body="\n".join(testcase_members)))
-
-testgroup_members = [testgroup_member.format(name=group) for group in [""]]
-
-output.append(testgroup_struct.format(body="\n".join(testgroup_members)))
-
-## XXX: may be we could have `--output <filename>` argument...
-# Don't depend on what system locale is set, use utf8 encoding.
-sys.stdout.buffer.write("\n\n".join(output).encode("utf8"))

From 1be38e8077cd83f289d5c43d3735790735d2bae4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 4 Sep 2024 17:13:55 +1000
Subject: [PATCH 1434/3129] tests/run-tests.py: Remove --write-exp and
 --list-tests options.

Removing the now-unused (see previous commit for details) `--write-exp` and
`--list-tests` options helps to simplify the rather complex logic in
`run-tests.py`.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests-exp.py | 94 ------------------------------------------
 tests/run-tests-exp.sh | 73 --------------------------------
 tests/run-tests.py     | 35 ++--------------
 3 files changed, 4 insertions(+), 198 deletions(-)
 delete mode 100644 tests/run-tests-exp.py
 delete mode 100755 tests/run-tests-exp.sh

diff --git a/tests/run-tests-exp.py b/tests/run-tests-exp.py
deleted file mode 100644
index bbb057f4cede9..0000000000000
--- a/tests/run-tests-exp.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# 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.
-#
-import sys
-import os
-
-
-tests = ["basics", "micropython", "float", "import", "io", " misc", "unicode", "extmod", "unix"]
-
-if sys.platform == "win32":
-    MICROPYTHON = "micropython.exe"
-else:
-    MICROPYTHON = "micropython"
-
-
-def should_skip(test):
-    if test.startswith("native"):
-        return True
-    if test.startswith("viper"):
-        return True
-
-
-test_count = 0
-passed_count = 0
-skip_count = 0
-
-for suite in tests:
-    # print("Running in: %s" % suite)
-    if sys.platform == "win32":
-        # dir /b prints only contained filenames, one on a line
-        # http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/dir.mspx
-        r = os.system("dir /b %s/*.py >tests.lst" % suite)
-    else:
-        r = os.system("ls %s/*.py | xargs -n1 basename >tests.lst" % suite)
-    assert r == 0
-
-    with open("tests.lst") as f:
-        testcases = f.readlines()
-        testcases = [l[:-1] for l in testcases]
-    assert testcases, "No tests found in dir '%s', which is implausible" % suite
-    # print(testcases)
-    for t in testcases:
-        if t == "native_check.py":
-            continue
-
-        qtest = "%s/%s" % (suite, t)
-
-        if should_skip(t):
-            print("skip " + qtest)
-            skip_count += 1
-            continue
-
-        exp = None
-        try:
-            f = open(qtest + ".exp")
-            exp = f.read()
-            f.close()
-        except OSError:
-            pass
-
-        if exp is not None:
-            # print("run " + qtest)
-            r = os.system(MICROPYTHON + " %s >.tst.out" % qtest)
-            if r == 0:
-                f = open(".tst.out")
-                out = f.read()
-                f.close()
-            else:
-                out = "CRASH"
-
-            if out == "SKIP\n":
-                print("skip " + qtest)
-                skip_count += 1
-            else:
-                if out == exp:
-                    print("pass " + qtest)
-                    passed_count += 1
-                else:
-                    print("FAIL " + qtest)
-
-                test_count += 1
-        else:
-            skip_count += 1
-
-print("%s tests performed" % test_count)
-print("%s tests passed" % passed_count)
-if test_count != passed_count:
-    print("%s tests failed" % (test_count - passed_count))
-if skip_count:
-    print("%s tests skipped" % skip_count)
diff --git a/tests/run-tests-exp.sh b/tests/run-tests-exp.sh
deleted file mode 100755
index 177090cd8db93..0000000000000
--- a/tests/run-tests-exp.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-RM="rm -f"
-MP_PY=micropython
-
-numtests=0
-numtestcases=0
-numpassed=0
-numskipped=0
-numfailed=0
-nameskipped=
-namefailed=
-
-if [ $# -eq 0 ]
-then
-    tests="basics/*.py micropython/*.py float/*.py import/*.py io/*.py misc/*.py unicode/*.py extmod/*.py unix/*.py"
-else
-    tests="$@"
-fi
-
-for infile in $tests
-do
-    basename=`basename $infile .py`
-    outfile=${basename}.py.out
-    expfile=$infile.exp
-
-    $MP_PY $infile > $outfile
-    numtestcases=$(expr $numtestcases + $(cat $expfile | wc -l))
-
-    if grep -q "SKIP\|SyntaxError: invalid micropython decorator" $outfile
-    then
-        # we don't count tests that explicitly ask to be skipped
-        # we don't count tests that fail due to unsupported decorator
-        echo "skip  $infile"
-        $RM $outfile
-        numskipped=$(expr $numskipped + 1)
-        nameskipped="$nameskipped $basename"
-    else
-        diff --brief $expfile $outfile > /dev/null
-
-        if [ $? -eq 0 ]
-        then
-            echo "pass  $infile"
-            $RM $outfile
-            numpassed=$(expr $numpassed + 1)
-        else
-            echo "FAIL  $infile"
-            numfailed=$(expr $numfailed + 1)
-            namefailed="$namefailed $basename"
-        fi
-    fi
-
-    numtests=$(expr $numtests + 1)
-done
-
-echo "$numtests tests performed ($numtestcases individual testcases)"
-echo "$numpassed tests passed"
-if [ $numskipped != 0 ]
-then
-    echo "$numskipped tests skipped -$nameskipped"
-fi
-if [ $numfailed != 0 ]
-then
-    echo "$numfailed tests failed -$namefailed"
-    exit 1
-else
-    exit 0
-fi
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 7190d3bc31b70..07280666dc8c2 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -465,9 +465,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
 
     upy_float_precision = 32
 
-    # 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):
+    if True:
         # 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.py script itself so use base_path.
@@ -797,11 +795,6 @@ def run_one_test(test_file):
         skip_it |= skip_io_module and is_io_module
         skip_it |= skip_fstring and is_fstring
 
-        if args.list_tests:
-            if not skip_it:
-                print(test_file)
-            return
-
         if skip_it:
             print("skip ", test_file)
             skipped_tests.append(test_name)
@@ -821,18 +814,12 @@ def run_one_test(test_file):
                     cwd=os.path.dirname(test_file),
                     stderr=subprocess.STDOUT,
                 )
-                if args.write_exp:
-                    with open(test_file_expected, "wb") as f:
-                        f.write(output_expected)
             except subprocess.CalledProcessError:
                 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")
 
-        if args.write_exp:
-            return
-
         # run MicroPython
         output_mupy = run_micropython(pyb, args, test_file, test_file_abspath)
 
@@ -861,7 +848,7 @@ def run_one_test(test_file):
 
         test_count.increment()
 
-    if pyb or args.list_tests:
+    if pyb:
         num_threads = 1
 
     if num_threads > 1:
@@ -871,10 +858,6 @@ def run_one_test(test_file):
         for test in tests:
             run_one_test(test)
 
-    # Leave RESULTS_FILE untouched here for future runs.
-    if args.list_tests:
-        return True
-
     print(
         "{} tests performed ({} individual testcases)".format(
             test_count.value, testcase_count.value
@@ -983,14 +966,6 @@ def main():
         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)"
     )
@@ -1062,9 +1037,7 @@ def main():
         "rp2",
         "zephyr",
     )
-    if args.list_tests:
-        pyb = None
-    elif args.target in LOCAL_TARGETS:
+    if args.target in LOCAL_TARGETS:
         pyb = None
         if args.target == "webassembly":
             pyb = PyboardNodeRunner()
@@ -1080,7 +1053,7 @@ def main():
         raise ValueError("target must be one of %s" % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
 
     # Automatically detect the native architecture for mpy-cross if not given.
-    if not (args.list_tests or args.write_exp) and not args.mpy_cross_flags:
+    if not args.mpy_cross_flags:
         output = run_feature_check(pyb, args, "target_info.py")
         arch = str(output, "ascii").strip()
         if arch != "None":

From 7b5738ad86f11eef682c5a649754777d2935a156 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 25 Jul 2024 13:55:01 +0200
Subject: [PATCH 1435/3129] tools/ci.sh: Clean up the Unix port's MIPS target.

The Unix port's MIPS target CI steps have been updated to be more in
line with the other targets (the MicroPython binary now runs as a
dynamic executable), and the test exceptions for ffi have been lifted.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 46aee1a3a274b..ad30d9e4db25e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -410,7 +410,6 @@ CI_UNIX_OPTS_QEMU_MIPS=(
     CROSS_COMPILE=mips-linux-gnu-
     VARIANT=coverage
     MICROPY_STANDALONE=1
-    LDFLAGS_EXTRA="-static"
 )
 
 CI_UNIX_OPTS_QEMU_ARM=(
@@ -651,22 +650,23 @@ function ci_unix_macos_run_tests {
 
 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 gcc-mips-linux-gnu g++-mips-linux-gnu libc6-mips-cross
     sudo apt-get install qemu-user
     qemu-mips --version
+    sudo mkdir /etc/qemu-binfmt
+    sudo ln -s /usr/mips-linux-gnu/ /etc/qemu-binfmt/mips
 }
 
 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[@]}"
+    ci_unix_build_ffi_lib_helper mips-linux-gnu-gcc
 }
 
 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/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')
 }
 
 function ci_unix_qemu_arm_setup {

From 52d5f3988182e3fe181b88f9b64f6dc02655a898 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 5 Sep 2024 20:56:30 +0200
Subject: [PATCH 1436/3129] tools/ci.sh: Add missing FFI helper for CI RV64
 Unix builds.

The FFI helper definition was accidentally omitted when committing the
necessary shell code for building RV64 Unix builds in the CI
environment.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index ad30d9e4db25e..c6decb5aa0ad1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -704,6 +704,7 @@ function ci_unix_qemu_riscv64_setup {
 
 function ci_unix_qemu_riscv64_build {
     ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_RISCV64[@]}"
+    ci_unix_build_ffi_lib_helper riscv64-linux-gnu-gcc
 }
 
 function ci_unix_qemu_riscv64_run_tests {

From 46d8db81d33e6da383ebf0fd0a063ea1f1948ce1 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 5 Sep 2024 21:11:11 +0200
Subject: [PATCH 1437/3129] tools/ci.sh: Clean up the Unix port's Arm target.

The Unix port's Arm target CI steps have been updated to be more in
line with the other targets (the MicroPython binary doesn't need an
environment variable to be set in order to run now).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index c6decb5aa0ad1..c25979d3b74a3 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -674,6 +674,8 @@ function ci_unix_qemu_arm_setup {
     sudo apt-get install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
     sudo apt-get install qemu-user
     qemu-arm --version
+    sudo mkdir /etc/qemu-binfmt
+    sudo ln -s /usr/arm-linux-gnueabi/ /etc/qemu-binfmt/arm
 }
 
 function ci_unix_qemu_arm_build {
@@ -684,7 +686,6 @@ function ci_unix_qemu_arm_build {
 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/build-coverage/micropython
     (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.*\.py')
 }

From 8b35f2c7fad87198c4ccab243cb3e8a61c7d0f3c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 9 Sep 2024 10:09:15 +1000
Subject: [PATCH 1438/3129] tools/mpy_ld.py: Support jumping more than 2k on
 armv6m architectures.

Native .mpy files targetting armv6m (eg RP2040) cannot currently have more
than about 2kiB of native code (between the start of the file and the init
function).

This commit fixes that by using bigger jumps to jump to the init function.

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

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 45aadadd51314..c77c46d44e0e6 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -89,10 +89,26 @@ def asm_jump_x86(entry):
 
 
 def asm_jump_thumb(entry):
-    # Only signed values that fit in 12 bits are supported
+    # This function must return the same number of bytes for the encoding of the jump
+    # regardless of the value of `entry`.
     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))
+    if b_off >> 11 == 0 or b_off >> 11 == -1:
+        # Signed value fits in 12 bits.
+        b0 = 0xE000 | (b_off >> 1 & 0x07FF)
+        b1 = 0
+        b2 = 0
+        b3 = 0
+    else:
+        # Use bl to do a large jump/call:
+        #   push {r0, lr}
+        #   bl <dest>
+        #   pop {r0, pc}
+        b_off -= 2  # skip "push {r0, lr}"
+        b0 = 0xB400 | 0x0100 | 0x0001  # push, lr, r0
+        b1 = 0xF000 | (((b_off) >> 12) & 0x07FF)
+        b2 = 0xF800 | (((b_off) >> 1) & 0x07FF)
+        b3 = 0xBC00 | 0x0100 | 0x0001  # pop, pc, r0
+    return struct.pack("<HHHH", b0, b1, b2, b3)
 
 
 def asm_jump_thumb2(entry):

From b05983ff6d684561c8db6257ff816ef2e8114db5 Mon Sep 17 00:00:00 2001
From: Michael Sawyer <mjfsawyer@gmail.com>
Date: Fri, 6 Sep 2024 19:28:35 -0400
Subject: [PATCH 1439/3129] unix/modffi: Fix signed integer cast in
 return_ffi_value.

Casting an ffi_arg to a signed int may truncate the value. E.g., when the
ffi_arg is 64-bit and the signed int is 32-bit. Also, casting an ffi_arg
to a larger signed type will not sign extend the value. E.g., when the
ffi_arg is 32-bit and the larger signed type is int64_t. If the value is
signed, it should be cast to ffi_sarg, which is the same size as ffi_arg.

Signed-off-by: Michael Sawyer <mjfsawyer@gmail.com>
---
 ports/unix/modffi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index b3cd3380ccab9..51beb355fea75 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -190,7 +190,7 @@ static mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
         case 'h':
         case 'i':
         case 'l':
-            return mp_obj_new_int((signed)val->ffi);
+            return mp_obj_new_int((ffi_sarg)val->ffi);
         case 'B':
         case 'H':
         case 'I':

From 230e521515d357816b925f13df4c5100a0e720d9 Mon Sep 17 00:00:00 2001
From: Michael Sawyer <mjfsawyer@gmail.com>
Date: Fri, 6 Sep 2024 19:42:30 -0400
Subject: [PATCH 1440/3129] tests/ports/unix: Update and extend the modffi
 integer tests.

Added the "long" modffi tests. The tests could not be added to the existing
ffi_types test because two .exp files were required for the 32-bit and
64-bit results. Code common to both the ffi_types and type "long" tests was
factored into ffi_int_base. ffi_types was renamed to ffi_int_types to group
the related tests under the "ffi_int" prefix.

Signed-off-by: Michael Sawyer <mjfsawyer@gmail.com>
---
 tests/ports/unix/ffi_int_base.py              | 49 ++++++++++++++++++
 tests/ports/unix/ffi_int_long32.py            | 16 ++++++
 tests/ports/unix/ffi_int_long32.py.exp        | 34 +++++++++++++
 tests/ports/unix/ffi_int_long64.py            | 16 ++++++
 tests/ports/unix/ffi_int_long64.py.exp        | 34 +++++++++++++
 tests/ports/unix/ffi_int_types.py             | 16 ++++++
 ...{ffi_types.py.exp => ffi_int_types.py.exp} |  0
 tests/ports/unix/ffi_lib.c                    |  8 +++
 tests/ports/unix/ffi_types.py                 | 51 -------------------
 9 files changed, 173 insertions(+), 51 deletions(-)
 create mode 100644 tests/ports/unix/ffi_int_base.py
 create mode 100644 tests/ports/unix/ffi_int_long32.py
 create mode 100644 tests/ports/unix/ffi_int_long32.py.exp
 create mode 100644 tests/ports/unix/ffi_int_long64.py
 create mode 100644 tests/ports/unix/ffi_int_long64.py.exp
 create mode 100644 tests/ports/unix/ffi_int_types.py
 rename tests/ports/unix/{ffi_types.py.exp => ffi_int_types.py.exp} (100%)
 delete mode 100644 tests/ports/unix/ffi_types.py

diff --git a/tests/ports/unix/ffi_int_base.py b/tests/ports/unix/ffi_int_base.py
new file mode 100644
index 0000000000000..906bc3c1e1467
--- /dev/null
+++ b/tests/ports/unix/ffi_int_base.py
@@ -0,0 +1,49 @@
+# common tests for ffi_int_types/long32/long64
+# requires ffi_lib.c to be compiled as: $(CC) -shared -o ffi_lib.so ffi_lib.c
+
+import os, sys
+
+try:
+    import ffi
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+ffi_lib_filename = sys.argv[0].rsplit("/", 1)[0] + "/ffi_lib.so"
+try:
+    os.stat(ffi_lib_filename)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+ffi_lib = ffi.open(ffi_lib_filename)
+
+
+def test(funcs):
+    for type, name in funcs:
+        func = ffi_lib.func(type, name, type)
+        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(name, val, func(val)))
+
+
+if __name__ == "__main__":
+    print("SKIP")
+    raise SystemExit
diff --git a/tests/ports/unix/ffi_int_long32.py b/tests/ports/unix/ffi_int_long32.py
new file mode 100644
index 0000000000000..32fdb8e0ec7df
--- /dev/null
+++ b/tests/ports/unix/ffi_int_long32.py
@@ -0,0 +1,16 @@
+# test 32-bit long arguments and return types for ffi functions
+
+import struct
+
+import ffi_int_base
+
+if struct.calcsize("l") != 4:
+    print("SKIP")
+    raise SystemExit
+
+ffi_int_base.test(
+    [
+        ("l", "fli"),
+        ("L", "flu"),
+    ]
+)
diff --git a/tests/ports/unix/ffi_int_long32.py.exp b/tests/ports/unix/ffi_int_long32.py.exp
new file mode 100644
index 0000000000000..e0f1338a48ed2
--- /dev/null
+++ b/tests/ports/unix/ffi_int_long32.py.exp
@@ -0,0 +1,34 @@
+fli(0) = 1
+fli(7f) = 7e
+fli(80) = 81
+fli(ff) = fe
+fli(100) = 101
+fli(7fff) = 7ffe
+fli(8000) = 8001
+fli(ffff) = fffe
+fli(10000) = 10001
+fli(7fffffff) = 7ffffffe
+fli(80000000) = -7fffffff
+fli(ffffffff) = -2
+fli(100000000) = 1
+fli(7fffffffffffffff) = -2
+fli(8000000000000000) = 1
+fli(ffffffffffffffff) = -2
+fli(10000000000000000) = 1
+flu(0) = 1
+flu(7f) = 7e
+flu(80) = 81
+flu(ff) = fe
+flu(100) = 101
+flu(7fff) = 7ffe
+flu(8000) = 8001
+flu(ffff) = fffe
+flu(10000) = 10001
+flu(7fffffff) = 7ffffffe
+flu(80000000) = 80000001
+flu(ffffffff) = fffffffe
+flu(100000000) = 1
+flu(7fffffffffffffff) = fffffffe
+flu(8000000000000000) = 1
+flu(ffffffffffffffff) = fffffffe
+flu(10000000000000000) = 1
diff --git a/tests/ports/unix/ffi_int_long64.py b/tests/ports/unix/ffi_int_long64.py
new file mode 100644
index 0000000000000..55bf6605232f0
--- /dev/null
+++ b/tests/ports/unix/ffi_int_long64.py
@@ -0,0 +1,16 @@
+# test 64-bit long arguments and return types for ffi functions
+
+import struct
+
+import ffi_int_base
+
+if struct.calcsize("l") != 8:
+    print("SKIP")
+    raise SystemExit
+
+ffi_int_base.test(
+    [
+        ("l", "fli"),
+        ("L", "flu"),
+    ]
+)
diff --git a/tests/ports/unix/ffi_int_long64.py.exp b/tests/ports/unix/ffi_int_long64.py.exp
new file mode 100644
index 0000000000000..904e6c3ed445e
--- /dev/null
+++ b/tests/ports/unix/ffi_int_long64.py.exp
@@ -0,0 +1,34 @@
+fli(0) = 1
+fli(7f) = 7e
+fli(80) = 81
+fli(ff) = fe
+fli(100) = 101
+fli(7fff) = 7ffe
+fli(8000) = 8001
+fli(ffff) = fffe
+fli(10000) = 10001
+fli(7fffffff) = 7ffffffe
+fli(80000000) = 80000001
+fli(ffffffff) = fffffffe
+fli(100000000) = 100000001
+fli(7fffffffffffffff) = 7ffffffffffffffe
+fli(8000000000000000) = -7fffffffffffffff
+fli(ffffffffffffffff) = -2
+fli(10000000000000000) = 1
+flu(0) = 1
+flu(7f) = 7e
+flu(80) = 81
+flu(ff) = fe
+flu(100) = 101
+flu(7fff) = 7ffe
+flu(8000) = 8001
+flu(ffff) = fffe
+flu(10000) = 10001
+flu(7fffffff) = 7ffffffe
+flu(80000000) = 80000001
+flu(ffffffff) = fffffffe
+flu(100000000) = 100000001
+flu(7fffffffffffffff) = 7ffffffffffffffe
+flu(8000000000000000) = 8000000000000001
+flu(ffffffffffffffff) = fffffffffffffffe
+flu(10000000000000000) = 1
diff --git a/tests/ports/unix/ffi_int_types.py b/tests/ports/unix/ffi_int_types.py
new file mode 100644
index 0000000000000..24fa2a721b210
--- /dev/null
+++ b/tests/ports/unix/ffi_int_types.py
@@ -0,0 +1,16 @@
+# test 8/16/32/64 bit signed/unsigned integer arguments and return types for ffi functions
+
+import ffi_int_base
+
+ffi_int_base.test(
+    [
+        ("b", "f8i"),
+        ("B", "f8u"),
+        ("h", "f16i"),
+        ("H", "f16u"),
+        ("i", "f32i"),
+        ("I", "f32u"),
+        ("q", "f64i"),
+        ("Q", "f64u"),
+    ]
+)
diff --git a/tests/ports/unix/ffi_types.py.exp b/tests/ports/unix/ffi_int_types.py.exp
similarity index 100%
rename from tests/ports/unix/ffi_types.py.exp
rename to tests/ports/unix/ffi_int_types.py.exp
diff --git a/tests/ports/unix/ffi_lib.c b/tests/ports/unix/ffi_lib.c
index 35340536aeede..dae4e04bc4463 100644
--- a/tests/ports/unix/ffi_lib.c
+++ b/tests/ports/unix/ffi_lib.c
@@ -31,3 +31,11 @@ int64_t f64i(int64_t x) {
 uint64_t f64u(uint64_t x) {
     return x ^ 1;
 }
+
+long fli(long x) {
+    return x ^ 1;
+}
+
+unsigned long flu(unsigned long x) {
+    return x ^ 1;
+}
diff --git a/tests/ports/unix/ffi_types.py b/tests/ports/unix/ffi_types.py
deleted file mode 100644
index 06e9b89d3fe23..0000000000000
--- a/tests/ports/unix/ffi_types.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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 os, sys
-
-try:
-    import ffi
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-ffi_lib_filename = "./" + sys.argv[0].rsplit("/", 1)[0] + "/ffi_lib.so"
-try:
-    os.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)))

From d775db72b9bf01d2f40f6cf4d4d98941f30b7bd2 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 7 Jun 2024 18:57:07 +1000
Subject: [PATCH 1441/3129] esp32/boards/UM_FEATHERS3NEO: Add FeatherS3 Neo
 board definition.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_FEATHERS3NEO/board.json |  26 +++++
 ports/esp32/boards/UM_FEATHERS3NEO/board.md   |   1 +
 ports/esp32/boards/UM_FEATHERS3NEO/deploy.md  |  52 +++++++++
 .../esp32/boards/UM_FEATHERS3NEO/manifest.py  |   2 +
 .../UM_FEATHERS3NEO/modules/feathers3neo.py   | 104 ++++++++++++++++++
 .../UM_FEATHERS3NEO/mpconfigboard.cmake       |  13 +++
 .../boards/UM_FEATHERS3NEO/mpconfigboard.h    |  10 ++
 ports/esp32/boards/UM_FEATHERS3NEO/pins.csv   |  16 +++
 .../boards/UM_FEATHERS3NEO/sdkconfig.board    |  21 ++++
 9 files changed, 245 insertions(+)
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/board.json
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/board.md
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/deploy.md
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/manifest.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/modules/feathers3neo.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/pins.csv
 create mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board

diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/board.json b/ports/esp32/boards/UM_FEATHERS3NEO/board.json
new file mode 100644
index 0000000000000..0531582007250
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/board.json
@@ -0,0 +1,26 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "Feather",
+        "JST-SH",
+        "RGB LED",
+        "USB-C",
+        "WiFi"
+    ],
+    "features_non_filterable": [],
+    "images": [
+        "unexpectedmaker_feathers3_neo.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "FeatherS3 Neo",
+    "thumbnail": "",
+    "url": "https://esp32s3.com/feathers3neo.html",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/board.md b/ports/esp32/boards/UM_FEATHERS3NEO/board.md
new file mode 100644
index 0000000000000..7e8d4bac847a6
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/board.md
@@ -0,0 +1 @@
+The following files are firmware for the FeatherS3 Neo.
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/deploy.md b/ports/esp32/boards/UM_FEATHERS3NEO/deploy.md
new file mode 100644
index 0000000000000..ea9bb56dbfeb5
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/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 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 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 `feathers3neo-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 feathers3neo-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 feathers3neo-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 feathers3neo-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/manifest.py b/ports/esp32/boards/UM_FEATHERS3NEO/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/modules/feathers3neo.py b/ports/esp32/boards/UM_FEATHERS3NEO/modules/feathers3neo.py
new file mode 100644
index 0000000000000..30307ab5b75db
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/modules/feathers3neo.py
@@ -0,0 +1,104 @@
+# FeatherS3 Neo MicroPython Helper Library
+# MIT license; Copyright (c) 2024 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+# http://esp32s3.com
+
+# Import required libraries
+from micropython import const
+from machine import Pin, ADC
+import time
+
+# FeatherS3 Hardware Pin Assignments
+
+# Sense Pins
+VBUS_SENSE = const(15)
+VBAT_SENSE = const(2)
+
+# LDO2 & Other Pins
+LDO2 = const(39)
+LED = const(13)
+AMB_LIGHT = const(4)
+
+# RGB LED Pins
+RGB_DATA = const(40)
+RGB_PWR = const(39)
+
+# RGB MATRIX LED Pins
+RGB_MATRIX_DATA = const(16)
+RGB_MATRIX_PWR = const(39)
+
+# 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, which is the LDO that powers the following items
+    RGB Matrix, RGB status LED, Ambient light Sensor.
+    This is ON by default and will automatically shut down when the ESP32 going into deep sleep.
+    """
+    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
+    # Max voltage on ADC input will be 4.2V divided by R2 (442K) & R5 (160K), 4.2 / (160+442) * 160 = 1.1163V
+    adc.atten(ADC.ATTN_2_5DB)  # Needs 2.5DB attenuation to read a max voltage of 1.1163V
+    # Use read_uv() to get ADC reading as this will use the on-chip calibration data
+    measuredvbat = adc.read_uv() / 1000000  # Read micovolts and convert to volts
+    measuredvbat *= 3.7624  # Multiply by ratio of battery voltage to ADC pin voltage: 4.2/1.1163
+    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_FEATHERS3NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..2114b321b2e73
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
@@ -0,0 +1,13 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_sx
+    boards/UM_FEATHERS3NEO/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h
new file mode 100644
index 0000000000000..c08206f7b52fa
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME               "FeatherS3 Neo"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S3"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "FeatherS3 Neo"
+
+#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_FEATHERS3NEO/pins.csv b/ports/esp32/boards/UM_FEATHERS3NEO/pins.csv
new file mode 100644
index 0000000000000..b0b5bb4ab4944
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/pins.csv
@@ -0,0 +1,16 @@
+AMB_LIGHT,GPIO4
+I2C_SCL,GPIO9
+I2C_SDA,GPIO8
+LDO2_PWR,GPIO39
+LED_BLUE,GPIO13
+SPI_MOSI,GPIO35
+SPI_SCK,GPIO36
+SPI_MISO,GPIO37
+RGB_DATA,GPIO40
+RGB_PWR,GPIO39
+RGB_MATRIX_DATA,GPIO16
+RGB_MATRIX_PWR,GPIO39
+UART0_TX,GPIO43
+UART0_RX,GPIO44
+VBAT_SENSE,GPIO2
+VBUS_SENSE,GPIO15
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
new file mode 100644
index 0000000000000..d0355a94dccef
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
@@ -0,0 +1,21 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=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="UMFeatherS3Neo"
+
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x81FC
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="FeatherS3 Neo"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_fs3neo_"

From 9b5f99eb591aeb6aa3ea06e34ab9a9aebd744005 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Sun, 15 Sep 2024 16:11:59 +1000
Subject: [PATCH 1442/3129] esp32/boards: Add UM_OMGS3 and UM_RGBTOUCH_MINI
 board definitions.

This adds two new UM boards: OMGS3 and RGB Touch Mini.  Also fixed the
NanoS3 deploy info.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_NANOS3/deploy.md        |  5 +-
 ports/esp32/boards/UM_OMGS3/board.json        | 25 +++++++
 ports/esp32/boards/UM_OMGS3/board.md          |  1 +
 ports/esp32/boards/UM_OMGS3/deploy.md         | 53 ++++++++++++++
 ports/esp32/boards/UM_OMGS3/manifest.py       |  2 +
 .../esp32/boards/UM_OMGS3/modules/max17048.py | 72 +++++++++++++++++++
 ports/esp32/boards/UM_OMGS3/modules/omgs3.py  | 57 +++++++++++++++
 .../esp32/boards/UM_OMGS3/mpconfigboard.cmake | 13 ++++
 ports/esp32/boards/UM_OMGS3/mpconfigboard.h   | 10 +++
 ports/esp32/boards/UM_OMGS3/pins.csv          |  8 +++
 ports/esp32/boards/UM_OMGS3/sdkconfig.board   | 21 ++++++
 .../esp32/boards/UM_RGBTOUCH_MINI/board.json  | 29 ++++++++
 ports/esp32/boards/UM_RGBTOUCH_MINI/board.md  |  1 +
 ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md | 52 ++++++++++++++
 .../esp32/boards/UM_RGBTOUCH_MINI/manifest.py |  2 +
 .../UM_RGBTOUCH_MINI/mpconfigboard.cmake      | 13 ++++
 .../boards/UM_RGBTOUCH_MINI/mpconfigboard.h   | 10 +++
 ports/esp32/boards/UM_RGBTOUCH_MINI/pins.csv  | 17 +++++
 .../boards/UM_RGBTOUCH_MINI/sdkconfig.board   | 21 ++++++
 19 files changed, 410 insertions(+), 2 deletions(-)
 create mode 100644 ports/esp32/boards/UM_OMGS3/board.json
 create mode 100644 ports/esp32/boards/UM_OMGS3/board.md
 create mode 100644 ports/esp32/boards/UM_OMGS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_OMGS3/manifest.py
 create mode 100644 ports/esp32/boards/UM_OMGS3/modules/max17048.py
 create mode 100644 ports/esp32/boards/UM_OMGS3/modules/omgs3.py
 create mode 100644 ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_OMGS3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_OMGS3/pins.csv
 create mode 100644 ports/esp32/boards/UM_OMGS3/sdkconfig.board
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/board.json
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/board.md
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/pins.csv
 create mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board

diff --git a/ports/esp32/boards/UM_NANOS3/deploy.md b/ports/esp32/boards/UM_NANOS3/deploy.md
index 725cff4946804..4285b02753893 100644
--- a/ports/esp32/boards/UM_NANOS3/deploy.md
+++ b/ports/esp32/boards/UM_NANOS3/deploy.md
@@ -1,7 +1,8 @@
 Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
 
-To flash or erase your NanoS3, you have to first put it into download mode.
-To do this, follow these steps:
+To flash or erase your NANOS3, you have to first put it into download mode.
+NANOS3 doesn't include buttons for RESET and IO0, which should be provided by adding external buttons via a carrier board or other method.
+To put the NANOS3 into download, follow these steps:
 
 - Press and hold the [BOOT] button
 - Press and release the [RESET] button
diff --git a/ports/esp32/boards/UM_OMGS3/board.json b/ports/esp32/boards/UM_OMGS3/board.json
new file mode 100644
index 0000000000000..e4cb873914885
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "RGB LED",
+        "External RAM",
+        "WiFi",
+        "BLE"
+    ],
+    "features_non_filterable": [
+        "I2C BAT Fuel Gauge"
+    ],
+    "id": "omgs3",
+    "images": [
+        "unexpectedmaker_omgs3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "OMGS3",
+    "thumbnail": "",
+    "url": "https://omgs3.io",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_OMGS3/board.md b/ports/esp32/boards/UM_OMGS3/board.md
new file mode 100644
index 0000000000000..aa52d5206f486
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/board.md
@@ -0,0 +1 @@
+The following files are firmware for the OMGS3.
diff --git a/ports/esp32/boards/UM_OMGS3/deploy.md b/ports/esp32/boards/UM_OMGS3/deploy.md
new file mode 100644
index 0000000000000..09f2ef8c2326e
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/deploy.md
@@ -0,0 +1,53 @@
+Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+To flash or erase your OMGS3, you have to first put it into download mode.
+OMGS3 doesn't include buttons for RESET and IO0, which should be provided by adding external buttons via a carrier board or other method.
+To put the OMGS3 into download, 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 `omgs3-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 omgs3-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 omgs3-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 omgs3-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_OMGS3/manifest.py b/ports/esp32/boards/UM_OMGS3/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_OMGS3/modules/max17048.py b/ports/esp32/boards/UM_OMGS3/modules/max17048.py
new file mode 100644
index 0000000000000..538e55593a177
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/modules/max17048.py
@@ -0,0 +1,72 @@
+# Basic MAX17048 library for OMGS3 and other Unexpected Maker products
+# MIT license; Copyright (c) 2024 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://unexpectedmaker.com
+
+from machine import I2C
+
+
+class MAX17048:
+    _MAX17048_ADDRESS = 0x36
+
+    _VCELL_REGISTER = 0x02
+    _SOC_REGISTER = 0x04
+    _MODE_REGISTER = 0x06
+    _VERSION_REGISTER = 0x08
+    _HIBRT_REGISTER = 0x0A
+    _CONFIG_REGISTER = 0x0C
+    _COMMAND_REGISTER = 0xFE
+
+    def __init__(self, i2c, address=_MAX17048_ADDRESS):
+        self.i2c = i2c
+        self.address = address
+
+    def _read_register(self, register, num_bytes):
+        result = self.i2c.readfrom_mem(self.address, register, num_bytes)
+        return int.from_bytes(result, "big")
+
+    def _write_register(self, register, value, num_bytes):
+        data = value.to_bytes(num_bytes, "big")
+        self.i2c.writeto_mem(self.address, register, data)
+
+    @property
+    def cell_voltage(self):
+        """The voltage of the connected cell in Volts."""
+        raw_voltage = self._read_register(self._VCELL_REGISTER, 2)
+        voltage = (raw_voltage >> 4) * 0.00125
+        return voltage
+
+    @property
+    def state_of_charge(self):
+        """The state of charge of the battery in percentage."""
+        raw_soc = self._read_register(self._SOC_REGISTER, 2)
+        return raw_soc / 256
+
+    @property
+    def version(self):
+        """The chip version."""
+        return self._read_register(self._VERSION_REGISTER, 2)
+
+    @property
+    def hibernate(self):
+        """True if the chip is in hibernate mode, False otherwise."""
+        hib = self._read_register(self._HIBRT_REGISTER, 2)
+        return (hib & 0x4000) != 0
+
+    @hibernate.setter
+    def hibernate(self, value):
+        config = self._read_register(self._CONFIG_REGISTER, 2)
+        if value:
+            config |= 0x8000  # Set the sleep bit
+        else:
+            config &= ~0x8000  # Clear the sleep bit
+        self._write_register(self._CONFIG_REGISTER, config, 2)
+
+    def quick_start(self):
+        """Perform a quick start to reset the SOC calculation in the chip."""
+        self._write_register(self._MODE_REGISTER, 0x4000, 2)
+
+    def reset(self):
+        """Reset the chip."""
+        self._write_register(self._COMMAND_REGISTER, 0x5400, 2)
diff --git a/ports/esp32/boards/UM_OMGS3/modules/omgs3.py b/ports/esp32/boards/UM_OMGS3/modules/omgs3.py
new file mode 100644
index 0000000000000..80b1d157126ff
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/modules/omgs3.py
@@ -0,0 +1,57 @@
+# OMGS3 Helper Library
+# MIT license; Copyright (c) 2024 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://omgs3.io
+
+# Import required libraries
+from micropython import const
+from machine import Pin, I2C
+from max17048 import MAX17048
+import time
+
+# Initialize I2C bus
+fg_i2c = I2C(0, scl=Pin.board.I2C_SCL, sda=Pin.board.I2C_SDA)
+
+# Create an instance of the MAX17048 class
+max17048 = MAX17048(fg_i2c)
+
+
+# Helper functions
+def get_bat_voltage():
+    """Read the battery voltage from the fuel gauge"""
+    voltage = max17048.cell_voltage
+    print(f"Bat Voltage: {voltage}V")
+    return voltage
+
+
+def get_state_of_charge():
+    """Read the battery state of charge from the fuel gauge"""
+    soc = max17048.state_of_charge
+    print(f"State of Charge: {soc}%")
+    return soc
+
+
+def get_vbus_present():
+    """Detect if VBUS (5V) power source is present"""
+    return Pin(Pin.board.VBUS_SENSE, Pin.IN).value() == 1
+
+
+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(Pin.board.RGB_PWR, Pin.OUT).value(state)
+
+
+# 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_OMGS3/mpconfigboard.cmake b/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..a6a42a262e056
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
@@ -0,0 +1,13 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_sx
+    boards/UM_OMGS3/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_OMGS3/mpconfigboard.h b/ports/esp32/boards/UM_OMGS3/mpconfigboard.h
new file mode 100644
index 0000000000000..e3955a6b807da
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "OMGS3"
+#define MICROPY_HW_MCU_NAME "ESP32-S3-PICO-1-N8R2"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "OMGS3"
+
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
+#define MICROPY_HW_SPI1_MOSI (6)
+#define MICROPY_HW_SPI1_MISO (5)
+#define MICROPY_HW_SPI1_SCK (4)
diff --git a/ports/esp32/boards/UM_OMGS3/pins.csv b/ports/esp32/boards/UM_OMGS3/pins.csv
new file mode 100644
index 0000000000000..5ca2a2c0950c2
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/pins.csv
@@ -0,0 +1,8 @@
+I2C_SCL,GPIO9
+I2C_SDA,GPIO8
+FG_INT,GPIO21
+RGB_DATA,GPIO35
+RGB_PWR,GPIO34
+UART0_TX,GPIO43
+UART0_RX,GPIO44
+VBUS_SENSE,GPIO33
diff --git a/ports/esp32/boards/UM_OMGS3/sdkconfig.board b/ports/esp32/boards/UM_OMGS3/sdkconfig.board
new file mode 100644
index 0000000000000..84a8ce449ef3a
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/sdkconfig.board
@@ -0,0 +1,21 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="UMOMGS3"
+
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x8225
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="OMGS3"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_omgs3_"
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/board.json b/ports/esp32/boards/UM_RGBTOUCH_MINI/board.json
new file mode 100644
index 0000000000000..6b3ec0f06733d
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/board.json
@@ -0,0 +1,29 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Battery Charging",
+        "External Flash",
+        "External RAM",
+        "RGB LED",
+        "USB-C",
+        "WiFi"
+    ],
+    "features_non_filterable": [
+		"3 Axis IMU",
+		"12x12 RGB LED Matrix",
+		"Capacitive Touch",
+		"I2S Audio Amplifier + Speaker"
+    ],
+    "images": [
+        "unexpectedmaker_rgbtouch_mini.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "RGB Touch Mini",
+    "thumbnail": "",
+    "url": "https://rgbtouch.com",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/board.md b/ports/esp32/boards/UM_RGBTOUCH_MINI/board.md
new file mode 100644
index 0000000000000..9319ac8c061c8
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/board.md
@@ -0,0 +1 @@
+The following files are firmware for the RGB Touch Mini.
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md b/ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md
new file mode 100644
index 0000000000000..afe1ff1de874d
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/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 RGB Touch Mini, 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 `rgbtouch_mini-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 rgbtouch_mini-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 rgbtouch_mini-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 rgbtouch_mini-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py b/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
new file mode 100644
index 0000000000000..f734411616bdb
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
@@ -0,0 +1,13 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_sx
+    boards/UM_RGBTOUCH_MINI/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h
new file mode 100644
index 0000000000000..1184124799318
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "RGB Touch Mini"
+#define MICROPY_HW_MCU_NAME "ESP32-S3-PICO-1-N8R2"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "RGBTouchMini"
+
+#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_RGBTOUCH_MINI/pins.csv b/ports/esp32/boards/UM_RGBTOUCH_MINI/pins.csv
new file mode 100644
index 0000000000000..e2bc9d29d086c
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/pins.csv
@@ -0,0 +1,17 @@
+INT_IMU,GPIO7
+INT_ROWS, GPIO15
+INT_COLS, GPIO16
+I2C_SDA,GPIO8
+I2C_SCL,GPIO9
+VBAT_SENSE,GPIO18
+VBUS_SENSE,GPIO48
+
+MATRIX_PWR,GPIO38
+MATRIX_DATA,GPIO39
+
+AMP_LRCLK,GPIO37
+AMP_BCLK,GPIO36
+AMP_DATA,GPIO35
+AMP_SD,GPIO34
+PWR_SHUTDOWN,GPIO21
+
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board b/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
new file mode 100644
index 0000000000000..ef3f38af47e27
--- /dev/null
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
@@ -0,0 +1,21 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="UMRGBTouchMini"
+
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x81FF
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="RGBTouchMini"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_rgbtouch_mini_"

From 6c73573b34c3fbd3d4da8d56767db03a8e5dd540 Mon Sep 17 00:00:00 2001
From: shiggy <mail@shiggytech.de>
Date: Mon, 2 Sep 2024 23:24:43 +0200
Subject: [PATCH 1443/3129] esp32/boards/OLIMEX_ESP32_EVB: Add Olimex ESP32 EVB
 board definition.

This is for boards not covered by the Olimex ESP32 PoE implementation.  The
major setting is about the PHY interface configuration.

Tested with esp-idf v5.0.4 and Olimex ESP32 EVB boards.

Signed-off-by: shiggy <mail@shiggytech.de>
---
 .../esp32/boards/OLIMEX_ESP32_EVB/board.json  | 22 +++++++++++++++++++
 ports/esp32/boards/OLIMEX_ESP32_EVB/board.md  |  2 ++
 .../OLIMEX_ESP32_EVB/mpconfigboard.cmake      |  6 +++++
 .../boards/OLIMEX_ESP32_EVB/mpconfigboard.h   |  2 ++
 .../boards/OLIMEX_ESP32_EVB/sdkconfig.board   |  3 +++
 5 files changed, 35 insertions(+)
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_EVB/board.md
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.h
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_EVB/sdkconfig.board

diff --git a/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
new file mode 100644
index 0000000000000..de7a74d8a8faa
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Battery Charging",
+        "Ethernet",
+        "External Flash",
+        "WiFi",
+        "microSD"
+    ],
+    "images": [
+        "ESP32-EVB_Rev_K1.png"
+    ],
+    "mcu": "esp32",
+    "product": "Olimex ESP32 EVB",
+    "thumbnail": "",
+    "url": "https://www.olimex.com/Products/IoT/ESP32/ESP32-EVB/open-source-hardware",
+    "vendor": "OLIMEX"
+}
diff --git a/ports/esp32/boards/OLIMEX_ESP32_EVB/board.md b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.md
new file mode 100644
index 0000000000000..994917bd18cc8
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.md
@@ -0,0 +1,2 @@
+The following files are firmware for Olimex ESP32 boards with Ethernet.
+They match the boards ESP32 EVB.
diff --git a/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake b/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
new file mode 100644
index 0000000000000..d6369d9ef18a4
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
@@ -0,0 +1,6 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.ble
+    boards/OLIMEX_ESP32_EVB/sdkconfig.board
+)
diff --git a/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.h b/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.h
new file mode 100644
index 0000000000000..c8458e35fa0d7
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/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_EVB/sdkconfig.board b/ports/esp32/boards/OLIMEX_ESP32_EVB/sdkconfig.board
new file mode 100644
index 0000000000000..cdb7734c2c556
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/sdkconfig.board
@@ -0,0 +1,3 @@
+CONFIG_ETH_PHY_INTERFACE_RMII=y
+CONFIG_ETH_RMII_CLK_OUT_GPIO=0
+CONFIG_LWIP_LOCAL_HOSTNAME="ESP32_EVB"

From 7e14680a83525bf0822ef9cab899a5625496d662 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 26 Sep 2022 11:02:31 +1000
Subject: [PATCH 1444/3129] py/objringio: Add micropython.RingIO() interface
 for general use.

This commit adds a new `RingIO` type which exposes the internal ring-buffer
code for general use in Python programs.  It has the stream interface
making it similar to `StringIO` and `BytesIO`, except `RingIO` has a fixed
buffer size and is automatically safe when reads and writes are in
different threads or an IRQ.

This new type is enabled at the "extra features" ROM level.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 docs/library/micropython.rst           |  68 +++++++++++++
 ports/unix/coverage.c                  |  18 ++++
 py/modmicropython.c                    |   3 +
 py/mpconfig.h                          |   5 +
 py/obj.h                               |   1 +
 py/objringio.c                         | 130 +++++++++++++++++++++++++
 py/py.cmake                            |   1 +
 py/py.mk                               |   1 +
 py/ringbuf.c                           |  26 +----
 py/ringbuf.h                           |  37 ++++++-
 tests/micropython/ringio.py            |  48 +++++++++
 tests/micropython/ringio.py.exp        |  16 +++
 tests/micropython/ringio_async.py      |  36 +++++++
 tests/micropython/ringio_async.py.exp  |   4 +
 tests/ports/unix/extra_coverage.py.exp |   5 +
 15 files changed, 372 insertions(+), 27 deletions(-)
 create mode 100644 py/objringio.c
 create mode 100644 tests/micropython/ringio.py
 create mode 100644 tests/micropython/ringio.py.exp
 create mode 100644 tests/micropython/ringio_async.py
 create mode 100644 tests/micropython/ringio_async.py.exp

diff --git a/docs/library/micropython.rst b/docs/library/micropython.rst
index 31b24903f1ca9..4d5a064a7a70e 100644
--- a/docs/library/micropython.rst
+++ b/docs/library/micropython.rst
@@ -155,3 +155,71 @@ Functions
 
    There is a finite queue to hold the scheduled functions and `schedule()`
    will raise a `RuntimeError` if the queue is full.
+
+Classes
+-------
+
+.. class:: RingIO(size)
+.. class:: RingIO(buffer)
+   :noindex:
+
+   Provides a fixed-size ringbuffer for bytes with a stream interface. Can be
+   considered like a fifo queue variant of `io.BytesIO`.
+
+   When created with integer size a suitable buffer will be allocated.
+   Alternatively a `bytearray` or similar buffer protocol object can be provided
+   to the constructor for in-place use.
+
+   The classic ringbuffer algorithm is used which allows for any size buffer
+   to be used however one byte will be consumed for tracking. If initialised
+   with an integer size this will be accounted for, for example ``RingIO(16)``
+   will allocate a 17 byte buffer internally so it can hold 16 bytes of data.
+   When passing in a pre-allocated buffer however one byte less than its
+   original length will be available for storage, eg. ``RingIO(bytearray(16))``
+   will only hold 15 bytes of data.
+
+   A RingIO instance can be IRQ / thread safe when used to pass data in a single
+   direction eg. when written to in an IRQ and read from in a non-IRQ function
+   (or vice versa). This does not hold if you try to eg. write to a single instance
+   from both IRQ and non-IRQ code, this would often cause data corruption.
+
+    .. method:: RingIO.any()
+
+        Returns an integer counting the number of characters that can be read.
+
+    .. method:: RingIO.read([nbytes])
+
+        Read available characters. This is a non-blocking function. If ``nbytes``
+        is specified then read at most that many bytes, otherwise read as much
+        data as possible.
+
+        Return value: a bytes object containing the bytes read. Will be
+        zero-length bytes object if no data is available.
+
+    .. method:: RingIO.readline([nbytes])
+
+        Read a line, ending in a newline character or return if one exists in
+        the buffer, else return available bytes in buffer. If ``nbytes`` is
+        specified then read at most that many bytes.
+
+        Return value: a bytes object containing the line read.
+
+    .. method:: RingIO.readinto(buf[, nbytes])
+
+        Read available bytes into the provided ``buf``.  If ``nbytes`` is
+        specified then read at most that many bytes.  Otherwise, read at
+        most ``len(buf)`` bytes.
+
+        Return value: Integer count of the number of bytes read into ``buf``.
+
+    .. method:: RingIO.write(buf)
+
+        Non-blocking write of bytes from ``buf`` into the ringbuffer, limited
+        by the available space in the ringbuffer.
+
+        Return value: Integer count of bytes written.
+
+    .. method:: RingIO.close()
+
+        No-op provided as part of standard `stream` interface. Has no effect
+        on data in the ringbuffer.
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 67052ea704e7c..2b65b47fc5bc9 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -692,6 +692,24 @@ static mp_obj_t extra_coverage(void) {
         ringbuf.iget = 0;
         ringbuf_put(&ringbuf, 0xaa);
         mp_printf(&mp_plat_print, "%d\n", ringbuf_get16(&ringbuf));
+
+        // ringbuf_put_bytes() / ringbuf_get_bytes() functions.
+        ringbuf.iput = 0;
+        ringbuf.iget = 0;
+        uint8_t *put = (uint8_t *)"abc123";
+        uint8_t get[7] = {0};
+        mp_printf(&mp_plat_print, "%d\n", ringbuf_put_bytes(&ringbuf, put, 7));
+        mp_printf(&mp_plat_print, "%d\n", ringbuf_get_bytes(&ringbuf, get, 7));
+        mp_printf(&mp_plat_print, "%s\n", get);
+        // Prefill ringbuffer.
+        for (size_t i = 0; i < sizeof(buf) - 3; ++i) {
+            ringbuf_put(&ringbuf, i);
+        }
+        // Should fail - too full.
+        mp_printf(&mp_plat_print, "%d\n", ringbuf_put_bytes(&ringbuf, put, 7));
+        // Should fail - buffer too big.
+        uint8_t large[sizeof(buf) + 5] = {0};
+        mp_printf(&mp_plat_print, "%d\n", ringbuf_put_bytes(&ringbuf, large, sizeof(large)));
     }
 
     // pairheap
diff --git a/py/modmicropython.c b/py/modmicropython.c
index daf03807c848a..1bf0a000c2026 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -200,6 +200,9 @@ static const mp_rom_map_elem_t mp_module_micropython_globals_table[] = {
     #if MICROPY_KBD_EXCEPTION
     { MP_ROM_QSTR(MP_QSTR_kbd_intr), MP_ROM_PTR(&mp_micropython_kbd_intr_obj) },
     #endif
+    #if MICROPY_PY_MICROPYTHON_RINGIO
+    { MP_ROM_QSTR(MP_QSTR_RingIO), MP_ROM_PTR(&mp_type_ringio) },
+    #endif
     #if MICROPY_ENABLE_SCHEDULER
     { MP_ROM_QSTR(MP_QSTR_schedule), MP_ROM_PTR(&mp_micropython_schedule_obj) },
     #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 5c10007a194e7..b5414312c7caf 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1306,6 +1306,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
+// Support for micropython.RingIO()
+#ifndef MICROPY_PY_MICROPYTHON_RINGIO
+#define MICROPY_PY_MICROPYTHON_RINGIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 // Whether to provide "array" module. Note that large chunk of the
 // underlying code is shared with "bytearray" builtin type, so to
 // get real savings, it should be disabled too.
diff --git a/py/obj.h b/py/obj.h
index 81ee75aebc3aa..eac2b89ea810d 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -843,6 +843,7 @@ extern const mp_obj_type_t mp_type_bound_meth;
 extern const mp_obj_type_t mp_type_property;
 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_ringio;
 extern const mp_obj_type_t mp_type_reversed;
 extern const mp_obj_type_t mp_type_polymorph_iter;
 #if MICROPY_ENABLE_FINALISER
diff --git a/py/objringio.c b/py/objringio.c
new file mode 100644
index 0000000000000..ba1ec25307ea4
--- /dev/null
+++ b/py/objringio.c
@@ -0,0 +1,130 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Andrew Leech
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "ringbuf.h"
+#include "py/mpconfig.h"
+
+#if MICROPY_PY_MICROPYTHON_RINGIO
+
+#include "py/runtime.h"
+#include "py/stream.h"
+
+typedef struct _micropython_ringio_obj_t {
+    mp_obj_base_t base;
+    ringbuf_t ringbuffer;
+} micropython_ringio_obj_t;
+
+static mp_obj_t micropython_ringio_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_int_t buff_size = -1;
+    mp_buffer_info_t bufinfo = {NULL, 0, 0};
+
+    if (!mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) {
+        buff_size = mp_obj_get_int(args[0]);
+    }
+    micropython_ringio_obj_t *self = mp_obj_malloc(micropython_ringio_obj_t, type);
+    if (bufinfo.buf != NULL) {
+        // buffer passed in, use it directly for ringbuffer.
+        self->ringbuffer.buf = bufinfo.buf;
+        self->ringbuffer.size = bufinfo.len;
+        self->ringbuffer.iget = self->ringbuffer.iput = 0;
+    } else {
+        // Allocate new buffer, add one extra to buff_size as ringbuf consumes one byte for tracking.
+        ringbuf_alloc(&(self->ringbuffer), buff_size + 1);
+    }
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static mp_uint_t micropython_ringio_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    micropython_ringio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size = MIN(size, ringbuf_avail(&self->ringbuffer));
+    ringbuf_memcpy_get_internal(&(self->ringbuffer), buf_in, size);
+    *errcode = 0;
+    return size;
+}
+
+static mp_uint_t micropython_ringio_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    micropython_ringio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size = MIN(size, ringbuf_free(&self->ringbuffer));
+    ringbuf_memcpy_put_internal(&(self->ringbuffer), buf_in, size);
+    *errcode = 0;
+    return size;
+}
+
+static mp_uint_t micropython_ringio_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    micropython_ringio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    switch (request) {
+        case MP_STREAM_POLL: {
+            mp_uint_t ret = 0;
+            if ((arg & MP_STREAM_POLL_RD) && ringbuf_avail(&self->ringbuffer) > 0) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+            if ((arg & MP_STREAM_POLL_WR) && ringbuf_free(&self->ringbuffer) > 0) {
+                ret |= MP_STREAM_POLL_WR;
+            }
+            return ret;
+        }
+        case MP_STREAM_CLOSE:
+            return 0;
+    }
+    *errcode = MP_EINVAL;
+    return MP_STREAM_ERROR;
+}
+
+static mp_obj_t micropython_ringio_any(mp_obj_t self_in) {
+    micropython_ringio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->ringbuffer));
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(micropython_ringio_any_obj, micropython_ringio_any);
+
+static const mp_rom_map_elem_t micropython_ringio_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&micropython_ringio_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) },
+
+};
+static MP_DEFINE_CONST_DICT(micropython_ringio_locals_dict, micropython_ringio_locals_dict_table);
+
+static const mp_stream_p_t ringio_stream_p = {
+    .read = micropython_ringio_read,
+    .write = micropython_ringio_write,
+    .ioctl = micropython_ringio_ioctl,
+    .is_text = false,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_ringio,
+    MP_QSTR_RingIO,
+    MP_TYPE_FLAG_NONE,
+    make_new, micropython_ringio_make_new,
+    protocol, &ringio_stream_p,
+    locals_dict, &micropython_ringio_locals_dict
+    );
+
+#endif // MICROPY_PY_MICROPYTHON_RINGIO
diff --git a/py/py.cmake b/py/py.cmake
index 03c559c206d8c..d7e2b0a05d3ba 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -95,6 +95,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/objproperty.c
     ${MICROPY_PY_DIR}/objrange.c
     ${MICROPY_PY_DIR}/objreversed.c
+    ${MICROPY_PY_DIR}/objringio.c
     ${MICROPY_PY_DIR}/objset.c
     ${MICROPY_PY_DIR}/objsingleton.c
     ${MICROPY_PY_DIR}/objslice.c
diff --git a/py/py.mk b/py/py.mk
index 0d4958ccba9ca..16240a5b9c00f 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -167,6 +167,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	objnamedtuple.o \
 	objrange.o \
 	objreversed.o \
+	objringio.o \
 	objset.o \
 	objsingleton.o \
 	objslice.o \
diff --git a/py/ringbuf.c b/py/ringbuf.c
index 10dca62081e8c..5f77271a06ab5 100644
--- a/py/ringbuf.c
+++ b/py/ringbuf.c
@@ -24,8 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
-
 #include "ringbuf.h"
 
 int ringbuf_get16(ringbuf_t *r) {
@@ -83,17 +81,7 @@ int ringbuf_get_bytes(ringbuf_t *r, uint8_t *data, size_t data_len) {
     if (ringbuf_avail(r) < data_len) {
         return (r->size <= data_len) ? -2 : -1;
     }
-    uint32_t iget = r->iget;
-    uint32_t iget_a = (iget + data_len) % r->size;
-    uint8_t *datap = data;
-    if (iget_a < iget) {
-        // Copy part of the data from the space left at the end of the buffer
-        memcpy(datap, r->buf + iget, r->size - iget);
-        datap += (r->size - iget);
-        iget = 0;
-    }
-    memcpy(datap, r->buf + iget, iget_a - iget);
-    r->iget = iget_a;
+    ringbuf_memcpy_get_internal(r, data, data_len);
     return 0;
 }
 
@@ -105,16 +93,6 @@ int ringbuf_put_bytes(ringbuf_t *r, const uint8_t *data, size_t data_len) {
     if (ringbuf_free(r) < data_len) {
         return (r->size <= data_len) ? -2 : -1;
     }
-    uint32_t iput = r->iput;
-    uint32_t iput_a = (iput + data_len) % r->size;
-    const uint8_t *datap = data;
-    if (iput_a < iput) {
-        // Copy part of the data to the end of the buffer
-        memcpy(r->buf + iput, datap, r->size - iput);
-        datap += (r->size - iput);
-        iput = 0;
-    }
-    memcpy(r->buf + iput, datap, iput_a - iput);
-    r->iput = iput_a;
+    ringbuf_memcpy_put_internal(r, data, data_len);
     return 0;
 }
diff --git a/py/ringbuf.h b/py/ringbuf.h
index c8508c07edfa7..d5aed429c5620 100644
--- a/py/ringbuf.h
+++ b/py/ringbuf.h
@@ -28,10 +28,9 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
-#ifdef _MSC_VER
-#include "py/mpconfig.h" // For inline.
-#endif
+#include "py/mpconfig.h"
 
 typedef struct _ringbuf_t {
     uint8_t *buf;
@@ -91,6 +90,38 @@ static inline size_t ringbuf_avail(ringbuf_t *r) {
     return (r->size + r->iput - r->iget) % r->size;
 }
 
+static inline void ringbuf_memcpy_get_internal(ringbuf_t *r, uint8_t *data, size_t data_len) {
+    // No bounds / space checking is performed here so ensure available size is checked before running this
+    // otherwise data loss or buffer overflow can occur.
+    uint32_t iget = r->iget;
+    uint32_t iget_a = (iget + data_len) % r->size;
+    uint8_t *datap = data;
+    if (iget_a < iget) {
+        // Copy part of the data from the space left at the end of the buffer
+        memcpy(datap, r->buf + iget, r->size - iget);
+        datap += (r->size - iget);
+        iget = 0;
+    }
+    memcpy(datap, r->buf + iget, iget_a - iget);
+    r->iget = iget_a;
+}
+
+static inline void ringbuf_memcpy_put_internal(ringbuf_t *r, const uint8_t *data, size_t data_len) {
+    // No bounds / space checking is performed here so ensure free size is checked before running this
+    // otherwise data loss or buffer overflow can occur.
+    uint32_t iput = r->iput;
+    uint32_t iput_a = (iput + data_len) % r->size;
+    const uint8_t *datap = data;
+    if (iput_a < iput) {
+        // Copy part of the data to the end of the buffer
+        memcpy(r->buf + iput, datap, r->size - iput);
+        datap += (r->size - iput);
+        iput = 0;
+    }
+    memcpy(r->buf + iput, datap, iput_a - iput);
+    r->iput = iput_a;
+}
+
 // Note: big-endian. No-op if not enough room available for both bytes.
 int ringbuf_get16(ringbuf_t *r);
 int ringbuf_peek16(ringbuf_t *r);
diff --git a/tests/micropython/ringio.py b/tests/micropython/ringio.py
new file mode 100644
index 0000000000000..45774bc2ee497
--- /dev/null
+++ b/tests/micropython/ringio.py
@@ -0,0 +1,48 @@
+# Check that micropython.RingIO works correctly.
+
+import micropython
+
+try:
+    micropython.RingIO
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+rb = micropython.RingIO(16)
+print(rb)
+
+print(rb.any())
+
+rb.write(b"\x00")
+print(rb.any())
+
+rb.write(b"\x00")
+print(rb.any())
+
+print(rb.read(2))
+print(rb.any())
+
+
+rb.write(b"\x00\x01")
+print(rb.read())
+
+print(rb.read(1))
+
+# Try to write more data than can fit at one go.
+print(rb.write(b"\x00\x01" * 10))
+print(rb.write(b"\x00"))
+print(rb.read())
+
+
+ba = bytearray(17)
+rb = micropython.RingIO(ba)
+print(rb)
+print(rb.write(b"\x00\x01" * 10))
+print(rb.write(b"\x00"))
+print(rb.read())
+
+try:
+    # Size must be int.
+    micropython.RingIO(None)
+except TypeError as ex:
+    print(ex)
diff --git a/tests/micropython/ringio.py.exp b/tests/micropython/ringio.py.exp
new file mode 100644
index 0000000000000..b27ea472c7d89
--- /dev/null
+++ b/tests/micropython/ringio.py.exp
@@ -0,0 +1,16 @@
+<RingIO>
+0
+1
+2
+b'\x00\x00'
+0
+b'\x00\x01'
+b''
+16
+0
+b'\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01'
+<RingIO>
+16
+0
+b'\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01'
+can't convert NoneType to int
diff --git a/tests/micropython/ringio_async.py b/tests/micropython/ringio_async.py
new file mode 100644
index 0000000000000..2a4befc352766
--- /dev/null
+++ b/tests/micropython/ringio_async.py
@@ -0,0 +1,36 @@
+# Check that micropython.RingIO works correctly with asyncio.Stream.
+
+import micropython
+
+try:
+    import asyncio
+
+    asyncio.StreamWriter
+    micropython.RingIO
+except (AttributeError, ImportError):
+    print("SKIP")
+    raise SystemExit
+
+rb = micropython.RingIO(16)
+rba = asyncio.StreamWriter(rb)
+
+data = b"ABC123" * 20
+print("w", len(data))
+
+
+async def data_writer():
+    global data
+    rba.write(data)
+    await rba.drain()
+
+
+async def main():
+    task = asyncio.create_task(data_writer())
+    await asyncio.sleep_ms(10)
+    read = await rba.readexactly(len(data))
+    print(read)
+    print("r", len(read))
+    print(read == data)
+
+
+asyncio.run(main())
diff --git a/tests/micropython/ringio_async.py.exp b/tests/micropython/ringio_async.py.exp
new file mode 100644
index 0000000000000..dfeb71d890fe0
--- /dev/null
+++ b/tests/micropython/ringio_async.py.exp
@@ -0,0 +1,4 @@
+w 120
+b'ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123ABC123'
+r 120
+True
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index a2b11638a35ae..176db8e9f8479 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -144,6 +144,11 @@ cc99
 22ff
 -1
 -1
+0
+0
+abc123
+-1
+-2
 # pairheap
 create: 0 0 0 0
 pop all: 0 1 2 3

From b08ddbba59b97d3546881038b60d2186b00a8e8d Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 20 Sep 2024 12:00:54 +1000
Subject: [PATCH 1445/3129] esp32/boards/UM_RGBTOUCH_MINI: Fix compile error
 with missing modules.

Signed-off-by: Seon Rozenblum <seon@unexpectedmaker.com>
---
 ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py b/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py
index 7ae2ed15d9169..0768f643079f6 100644
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py
@@ -1,2 +1,2 @@
 include("$(PORT_DIR)/boards/manifest.py")
-freeze("modules")
+# freeze("modules") - to re-enable at a later stage when there are modules

From 2b5feb9121a2fd6679c1ec0c6f4f2cb00b6e3616 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 22 Sep 2024 12:51:18 +0200
Subject: [PATCH 1446/3129] lib/libffi: Update libffi to 3.4.6.

Libffi is updated to the latest stable version (v3.4.6) as the version
of libffi that was linked by the repository predates the introduction of
RISC-V processors (both 32 and 64 bits).

This is necessary as the packaged version of libffi used by the CI for
RISC-V 64 turned out to simply not work correctly, whilst a source-built
version of libffi worked just fine.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .gitmodules         | 2 +-
 lib/libffi          | 2 +-
 ports/unix/Makefile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e6712c1f9f40e..6338f0e66d63d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/micropython/axtls.git
 [submodule "lib/libffi"]
 	path = lib/libffi
-	url = https://github.com/atgreen/libffi
+	url = https://github.com/libffi/libffi
 [submodule "lib/lwip"]
 	path = lib/lwip
 	url = https://github.com/lwip-tcpip/lwip.git
diff --git a/lib/libffi b/lib/libffi
index e9de7e35f2339..3d0ce1e6fcf19 160000
--- a/lib/libffi
+++ b/lib/libffi
@@ -1 +1 @@
-Subproject commit e9de7e35f2339598b16cbb375f9992643ed81209
+Subproject commit 3d0ce1e6fcf19f853894862abcbac0ae78a7be60
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index d5bd6d4098add..f02e6c6355ab6 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -168,7 +168,7 @@ ifeq ($(MICROPY_STANDALONE),1)
 # Build libffi from source.
 GIT_SUBMODULES += lib/libffi
 DEPLIBS += libffi
-LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
+LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/include)
  ifeq ($(MICROPY_FORCE_32BIT),1)
   LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib32/libffi.a
  else

From 97966254577167f4c50200af1af89109a275da1c Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 22 Sep 2024 15:39:24 +0200
Subject: [PATCH 1447/3129] unix/modffi: Clean up FFI closures memory
 management.

This commit removes custom FFI closures alloc/free functions, in favour
of using the tracked allocation facility to allocate memory for FFI
callback objects.

This stems from linking issues in the Arm port when updating LibFFI to
the latest stable version, as the overridden alloc/free functions didn't
replace LibFFI's (unlike in other ports).  The original code did no
effective cleanup for allocated callback objects, so there is no real
impact when switching allocation strategy.

The tracked allocation feature used to be enabled only if the Bluetooth
stack integration was enabled.  This commit also enables tracked
allocation support if FFI support is enabled.

Co-authored-by: Damien George <damien@micropython.org>
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/unix/alloc.c        | 19 -------------------
 ports/unix/modffi.c       |  3 ++-
 ports/unix/mpconfigport.h |  4 ++--
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/ports/unix/alloc.c b/ports/unix/alloc.c
index e9cf521583d99..c508139a8284d 100644
--- a/ports/unix/alloc.c
+++ b/ports/unix/alloc.c
@@ -85,25 +85,6 @@ void mp_unix_mark_exec(void) {
     }
 }
 
-#if MICROPY_FORCE_PLAT_ALLOC_EXEC
-// Provide implementation of libffi ffi_closure_* functions in terms
-// of the functions above. On a normal Linux system, this save a lot
-// of code size.
-void *ffi_closure_alloc(size_t size, void **code);
-void ffi_closure_free(void *ptr);
-
-void *ffi_closure_alloc(size_t size, void **code) {
-    size_t dummy;
-    mp_unix_alloc_exec(size, code, &dummy);
-    return *code;
-}
-
-void ffi_closure_free(void *ptr) {
-    (void)ptr;
-    // TODO
-}
-#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/modffi.c b/ports/unix/modffi.c
index 51beb355fea75..dc3ed4dc7c63c 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -334,7 +334,8 @@ 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 = mp_obj_malloc_var(mp_obj_fficallback_t, params, ffi_type *, nparams, &fficallback_type);
+    mp_obj_fficallback_t *o = (mp_obj_fficallback_t *)m_tracked_calloc(offsetof(mp_obj_fficallback_t, params) + sizeof(ffi_type *) * nparams, sizeof(uint8_t));
+    o->base.type = &fficallback_type;
 
     o->clo = ffi_closure_alloc(sizeof(ffi_closure), &o->func);
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 9c9d9228e760e..41275471129cb 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -117,8 +117,8 @@ typedef long mp_off_t;
 #define MICROPY_HELPER_LEXER_UNIX   (1)
 #define MICROPY_VFS_POSIX           (1)
 #define MICROPY_READER_POSIX        (1)
-#ifndef MICROPY_TRACKED_ALLOC
-#define MICROPY_TRACKED_ALLOC       (MICROPY_BLUETOOTH_BTSTACK)
+#if MICROPY_PY_FFI || MICROPY_BLUETOOTH_BTSTACK
+#define MICROPY_TRACKED_ALLOC       (1)
 #endif
 
 // VFS stat functions should return time values relative to 1970/1/1

From bb3c711c04518bf926f85e05d29e8fbfc9dd1b93 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 19 Sep 2024 20:27:04 +0200
Subject: [PATCH 1448/3129] tools/ci.sh: Let RV64 use a source-built version of
 libffi.

This commit lets the RV64 port use the version of libffi that is bundled
as a submodule in the MicroPython source tree, as the packaged libffi
library coming from Ubuntu's RISC-V repository trashes foreign function
call results on exit.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index c25979d3b74a3..4e860a7913bb5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -421,6 +421,7 @@ CI_UNIX_OPTS_QEMU_ARM=(
 CI_UNIX_OPTS_QEMU_RISCV64=(
     CROSS_COMPILE=riscv64-linux-gnu-
     VARIANT=coverage
+    MICROPY_STANDALONE=1
 )
 
 function ci_unix_build_helper {
@@ -691,16 +692,12 @@ function ci_unix_qemu_arm_run_tests {
 }
 
 function ci_unix_qemu_riscv64_setup {
-    . /etc/os-release
-    for repository in "${VERSION_CODENAME}" "${VERSION_CODENAME}-updates" "${VERSION_CODENAME}-security"
-    do
-        sudo add-apt-repository -y -n "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports ${repository} main"
-    done
     sudo apt-get update
-    sudo dpkg --add-architecture riscv64
-    sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu libffi-dev:riscv64
+    sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu
     sudo apt-get install qemu-user
     qemu-riscv64 --version
+    sudo mkdir /etc/qemu-binfmt
+    sudo ln -s /usr/riscv64-linux-gnu/ /etc/qemu-binfmt/riscv64
 }
 
 function ci_unix_qemu_riscv64_build {

From 8f465dfd10f8186873be0c38e226bcf380be16ba Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 19 Sep 2024 20:29:00 +0200
Subject: [PATCH 1449/3129] unix/modffi: Restrict uint32_t values to 32 bits.

This commit clears the upper 32 bits of returned `uint32_t` values,
which are handled as `unsigned int`s by the MicroPython runtime and
thus could be extended to 64 bits on some platforms.

RV64 holds 32-bit values as signed integers when held in registers, but
the code handling the FFI unsigned int case did not take this into
account.  That introduced test failures when a 32-bit value had its most
significant bit set, as when performing the value extension from 32 to
64 bits, the upper half of the value would be filled with ones.

On 32 bit platforms this change should be converted to a no-op, and
on other 64 bit platforms that aren't RISC-V it shouldn't hurt as the
value being manipulated is expected to only hold valid bits in its lower
half.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/unix/modffi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index dc3ed4dc7c63c..b469e932e0d5a 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -191,9 +191,12 @@ static mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
         case 'i':
         case 'l':
             return mp_obj_new_int((ffi_sarg)val->ffi);
+        case 'I':
+            // On RV64, 32-bit values are stored as signed integers inside the
+            // holding register.
+            return mp_obj_new_int_from_uint(val->ffi & 0xFFFFFFFF);
         case 'B':
         case 'H':
-        case 'I':
         case 'L':
             return mp_obj_new_int_from_uint(val->ffi);
         case 'q':

From f1b88e0d597c8117167d4eacf8bdce6518f115c3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 22 Sep 2024 15:35:59 +0200
Subject: [PATCH 1450/3129] gitignore: Add ffi_lib.so to the gitignore list.

When testing the Unix port with FFI tests enabled, the FFI helper
library that's built as part of the testing process is not removed after
the tests session end.

This commit adds the built library to the gitignore list, so it doesn't
mark the sourcetree as dirty if a test run for the Unix port was started
in the past.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2d20cb18970e8..b5010dfd14db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,9 @@ build/
 build-*/
 docs/genrst/
 
-# Test failure outputs
+# Test failure outputs and intermediate artefacts
 tests/results/*
+tests/ports/unix/ffi_lib.so
 
 # Python cache files
 __pycache__/

From 8a9042a72bbfed7dcea56026ae42ee12f716f708 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 20 Sep 2024 12:13:00 +0200
Subject: [PATCH 1451/3129] github/workflows: Update Ubuntu images for code
 size CI tasks.

This updates the Ubuntu OS image the code size CI tasks run on, from
20.04-LTS to 22.04-LTS.  This is needed because 20.04 didn't have
packages that are needed to build RISC-V 32 code.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .github/workflows/code_size.yml         | 2 +-
 .github/workflows/code_size_comment.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 1ef43d1fd396c..163d4455cffec 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -24,7 +24,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/code_size_comment.yml b/.github/workflows/code_size_comment.yml
index a394f7a14b054..521afad709d17 100644
--- a/.github/workflows/code_size_comment.yml
+++ b/.github/workflows/code_size_comment.yml
@@ -11,7 +11,7 @@ concurrency:
 
 jobs:
   comment:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: 'Download artifact'
         id: download-artifact

From 58e768914266dbe07eb1a9a2894e92957e6322eb Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 12 Sep 2024 23:26:40 +0200
Subject: [PATCH 1452/3129] tools/metrics.py: Add VIRT_RV32 to the code size
 metrics.

This commit adds the Qemu-based RISC-V 32 bits `VIRT_RV32` board to the
list of ports/boards to be built for measuring code size changes.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/metrics.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/metrics.py b/tools/metrics.py
index 2064675be9f5c..f6189e65abb4d 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -71,6 +71,7 @@ def __init__(self, name, dir, output, make_flags=None):
     "r": PortData("nrf", "nrf", "build-PCA10040/firmware.elf"),
     "p": PortData("rp2", "rp2", "build-RPI_PICO_W/firmware.elf", "BOARD=RPI_PICO_W"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),
+    "v": PortData("qemu rv32", "qemu", "build-VIRT_RV32/firmware.elf", "BOARD=VIRT_RV32"),
 }
 
 

From 3e085c3aa67c8517678440d4b37754ee555bb809 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 13 Sep 2024 15:48:58 +0200
Subject: [PATCH 1453/3129] tools/ci.sh: Report code size for `VIRT_RV32` as
 well.

This commit adds the `VIRT_RV32` board to the list of targets for
calculating code size changes as part of the CI pipeline.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 4e860a7913bb5..946ef86a3285d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -55,11 +55,12 @@ function ci_code_size_setup {
     sudo apt-get install gcc-multilib
     gcc --version
     ci_gcc_arm_setup
+    ci_gcc_riscv_setup
 }
 
 function ci_code_size_build {
     # check the following ports for the change in their code size
-    PORTS_TO_CHECK=bmusxpd
+    PORTS_TO_CHECK=bmusxpdv
     SUBMODULES="lib/asf4 lib/berkeley-db-1.xx lib/btstack lib/cyw43-driver lib/lwip lib/mbedtls lib/micropython-lib lib/nxp_driver lib/pico-sdk lib/stm32lib lib/tinyusb"
 
     # starts off at either the ref/pull/N/merge FETCH_HEAD, or the current branch HEAD

From eec5eb4260ebc76694f751f0966f4c8236da9609 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Sep 2024 09:37:50 +0200
Subject: [PATCH 1454/3129] stm32/uart: Add UART RX/CTS pin pull config
 options.

The UART driver enables a pull-up on RX/CTS pins by default.  This can
cause UART to fail to receive in certain situations, eg with RS485
transceivers.

This commit adds compile-time configuration options to set the pull mode on
the RX and CTS pins of each UART.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/uart.c | 74 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 855f44f0f2345..65ecd9913d5db 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -252,6 +252,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
 
     const machine_pin_obj_t *pins[4] = {0};
 
+    // Default pull is pull-up on RX and CTS (the input pins).
+    uint32_t pins_pull[4] = { GPIO_NOPULL, GPIO_PULLUP, GPIO_NOPULL, GPIO_PULLUP };
+
     switch (uart_obj->uart_id) {
         #if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)
         case PYB_UART_1:
@@ -270,6 +273,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART1_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART1_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART1_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART1_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART1_CTS_PULL;
+            #endif
             __HAL_RCC_USART1_CLK_ENABLE();
             break;
         #endif
@@ -295,6 +304,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART2_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART2_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART2_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART2_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART2_CTS_PULL;
+            #endif
             __HAL_RCC_USART2_CLK_ENABLE();
             break;
         #endif
@@ -322,6 +337,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART3_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART3_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART3_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART3_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART3_CTS_PULL;
+            #endif
             __HAL_RCC_USART3_CLK_ENABLE();
             break;
         #endif
@@ -358,6 +379,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART4_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART4_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART4_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART4_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART4_CTS_PULL;
+            #endif
             break;
         #endif
 
@@ -393,6 +420,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART5_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART5_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART5_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART5_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART5_CTS_PULL;
+            #endif
             break;
         #endif
 
@@ -419,6 +452,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART6_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART6_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART6_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART6_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART6_CTS_PULL;
+            #endif
             __HAL_RCC_USART6_CLK_ENABLE();
             break;
         #endif
@@ -447,6 +486,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART7_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART7_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART7_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART7_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART7_CTS_PULL;
+            #endif
             break;
         #endif
 
@@ -474,6 +519,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_UART8_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_UART8_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART8_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_UART8_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_UART8_CTS_PULL;
+            #endif
             break;
         #endif
 
@@ -485,6 +536,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
             __HAL_RCC_UART9_CLK_ENABLE();
             pins[0] = MICROPY_HW_UART9_TX;
             pins[1] = MICROPY_HW_UART9_RX;
+            #if defined(MICROPY_HW_UART9_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART9_RX_PULL;
+            #endif
             break;
         #endif
 
@@ -502,6 +556,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
             #endif
             pins[0] = MICROPY_HW_UART10_TX;
             pins[1] = MICROPY_HW_UART10_RX;
+            #if defined(MICROPY_HW_UART10_RX_PULL)
+            pins_pull[1] = MICROPY_HW_UART10_RX_PULL;
+            #endif
             break;
         #endif
 
@@ -527,6 +584,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_LPUART1_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_LPUART1_RX_PULL)
+            pins_pull[1] = MICROPY_HW_LPUART1_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_LPUART1_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_LPUART1_CTS_PULL;
+            #endif
             __HAL_RCC_LPUART1_CLK_ENABLE();
             break;
         #endif
@@ -551,6 +614,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
                 pins[3] = MICROPY_HW_LPUART2_CTS;
             }
             #endif
+            #if defined(MICROPY_HW_LPUART2_RX_PULL)
+            pins_pull[1] = MICROPY_HW_LPUART2_RX_PULL;
+            #endif
+            #if defined(MICROPY_HW_LPUART2_CTS_PULL)
+            pins_pull[3] = MICROPY_HW_LPUART2_CTS_PULL;
+            #endif
             __HAL_RCC_LPUART2_CLK_ENABLE();
             break;
         #endif
@@ -564,10 +633,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
 
     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) {
+            if (!mp_hal_pin_config_alt(pins[i], mode, pins_pull[i], uart_fn, uart_unit)) {
                 return false;
             }
         }

From 3a2252b4c286ff998b650e0133b9cd6635b0c4b1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Sep 2024 13:54:39 +0200
Subject: [PATCH 1455/3129] stm32/powerctrl: Add pre/post stop mode entry
 macros.

These allow a board to perform actions before/after stop mode.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/powerctrl.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 7755149227216..9d3f374f93757 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -827,12 +827,20 @@ void powerctrl_enter_stop_mode(void) {
     powerctrl_low_power_prep_wb55();
     #endif
 
+    #if defined(MICROPY_BOARD_PRE_STOP)
+    MICROPY_BOARD_PRE_STOP
+    #endif
+
     #if defined(STM32F7)
     HAL_PWR_EnterSTOPMode((PWR_CR1_LPDS | PWR_CR1_LPUDS | PWR_CR1_FPDS | PWR_CR1_UDEN), PWR_STOPENTRY_WFI);
     #else
     HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
     #endif
 
+    #if defined(MICROPY_BOARD_POST_STOP)
+    MICROPY_BOARD_POST_STOP
+    #endif
+
     // reconfigure the system clock after waking up
 
     #if defined(STM32F0)

From fc006a04120fa9eefa700d03a4111b09170c5679 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 2 Sep 2024 11:40:29 +0200
Subject: [PATCH 1456/3129] stm32/boards/ARDUINO_OPTA: Add support for the
 Arduino Opta board.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_OPTA/bdev.c        |  45 ++++
 ports/stm32/boards/ARDUINO_OPTA/board.json    |  21 ++
 ports/stm32/boards/ARDUINO_OPTA/board_init.c  |  96 +++++++
 ports/stm32/boards/ARDUINO_OPTA/deploy.md     |  18 ++
 ports/stm32/boards/ARDUINO_OPTA/manifest.py   |  18 ++
 .../ARDUINO_OPTA/mbedtls_config_board.h       |   8 +
 .../stm32/boards/ARDUINO_OPTA/mpconfigboard.h | 236 ++++++++++++++++++
 .../boards/ARDUINO_OPTA/mpconfigboard.mk      |  33 +++
 ports/stm32/boards/ARDUINO_OPTA/pins.csv      |  95 +++++++
 ports/stm32/boards/ARDUINO_OPTA/stm32h747.ld  |  51 ++++
 .../boards/ARDUINO_OPTA/stm32h7xx_hal_conf.h  |  49 ++++
 .../boards/ARDUINO_OPTA/wifi_nvram_1dx.h      |  49 ++++
 12 files changed, 719 insertions(+)
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/bdev.c
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/board.json
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/board_init.c
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/deploy.md
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/manifest.py
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/mbedtls_config_board.h
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/pins.csv
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/stm32h747.ld
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/stm32h7xx_hal_conf.h
 create mode 100644 ports/stm32/boards/ARDUINO_OPTA/wifi_nvram_1dx.h

diff --git a/ports/stm32/boards/ARDUINO_OPTA/bdev.c b/ports/stm32/boards/ARDUINO_OPTA/bdev.c
new file mode 100644
index 0000000000000..a821ffd6fb23c
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/bdev.c
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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_OPTA/board.json b/ports/stm32/boards/ARDUINO_OPTA/board.json
new file mode 100644
index 0000000000000..3955d7df3182d
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "./deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "USB",
+        "WiFi"
+    ],
+    "images": [
+        "AFX00002_01.iso_1000x750.jpg"
+    ],
+    "mcu": "stm32h7",
+    "product": "Arduino Opta WiFi",
+    "thumbnail": "",
+    "url": "https://store.arduino.cc/products/opta-wifi",
+    "vendor": "Arduino"
+}
diff --git a/ports/stm32/boards/ARDUINO_OPTA/board_init.c b/ports/stm32/boards/ARDUINO_OPTA/board_init.c
new file mode 100644
index 0000000000000..c0907f5d31d7b
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/board_init.c
@@ -0,0 +1,96 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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"
+
+#define BOOTLOADER_MAGIC    (0xDF59)
+
+void OPTA_board_startup(void) {
+}
+
+void OPTA_board_early_init(void) {
+    HAL_InitTick(TICK_INT_PRIORITY);
+
+    // Enable oscillator pin
+    // This is enabled in the bootloader anyway.
+    OPTA_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
+}
+
+void OPTA_board_enter_bootloader(void) {
+    RTC_HandleTypeDef RTCHandle;
+    RTCHandle.Instance = RTC;
+    HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR0, BOOTLOADER_MAGIC);
+    NVIC_SystemReset();
+}
+
+void OPTA_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 OPTA_board_low_power(int mode) {
+
+    #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_OPTA/deploy.md b/ports/stm32/boards/ARDUINO_OPTA/deploy.md
new file mode 100644
index 0000000000000..4e0571dea5e1b
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/deploy.md
@@ -0,0 +1,18 @@
+### Via dfu-util
+
+This board can be programmed via DFU bootloader, using e.g. [dfu-util](http://dfu-util.sourceforge.net/).
+To enter the DFU bootloader, double tap the recessed reset button, or you can use `machine.bootloader()` from the MicroPython REPL.
+
+The Arduino Opta indicates its DFU state by blinking the green LED above the RESET button.
+
+**NOTE**: The board might remain in DFU mode after the upload, a simple reset will bring the board back to Run-Time.
+
+```bash
+dfu-util -w -a 0 -d 2341:0364 -D build-ARDUINO_OPTA/firmware.dfu
+```
+
+Or from MicroPython source repository, making sure the current directory is `ports/stm32`:
+
+```bash
+make BOARD=ARDUINO_OPTA deploy
+```
diff --git a/ports/stm32/boards/ARDUINO_OPTA/manifest.py b/ports/stm32/boards/ARDUINO_OPTA/manifest.py
new file mode 100644
index 0000000000000..b7b9a2b470d02
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/manifest.py
@@ -0,0 +1,18 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+# Networking
+require("bundle-networking")
+
+# Utils
+require("time")
+require("senml")
+require("logging")
+
+# Bluetooth
+require("aioble")
+
+# Register external library
+add_library("arduino-lib", "$(ARDUINO_LIB_DIR)")
+
+# RPC
+require("msgpackrpc", library="arduino-lib")
diff --git a/ports/stm32/boards/ARDUINO_OPTA/mbedtls_config_board.h b/ports/stm32/boards/ARDUINO_OPTA/mbedtls_config_board.h
new file mode 100644
index 0000000000000..07aef794692ec
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/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_port.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H */
diff --git a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
new file mode 100644
index 0000000000000..869522e1ee70f
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
@@ -0,0 +1,236 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2024 Arduino SA
+ */
+
+#define MICROPY_HW_BOARD_NAME       "Arduino OPTA"
+#define MICROPY_HW_MCU_NAME         "STM32H747"
+#define MICROPY_HW_FLASH_FS_LABEL   "OPTA"
+
+// Network config
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-opta"
+
+#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_USB       (1)
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_TIMER     (1)
+
+// Flash storage config
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (0)
+
+#define MICROPY_BOARD_STARTUP       OPTA_board_startup
+void OPTA_board_startup(void);
+
+#define MICROPY_BOARD_EARLY_INIT    OPTA_board_early_init
+void OPTA_board_early_init(void);
+
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) OPTA_board_enter_bootloader()
+void OPTA_board_enter_bootloader(void);
+
+void OPTA_board_low_power(int mode);
+#define MICROPY_BOARD_LEAVE_STOP    OPTA_board_low_power(0);
+#define MICROPY_BOARD_ENTER_STOP    OPTA_board_low_power(1);
+#define MICROPY_BOARD_ENTER_STANDBY OPTA_board_low_power(2);
+
+void OPTA_board_osc_enable(int enable);
+#define MICROPY_BOARD_PRE_STOP      OPTA_board_osc_enable(0);
+#define MICROPY_BOARD_POST_STOP     OPTA_board_osc_enable(1);
+
+// 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 SPI123 100MHz for ADC
+#define MICROPY_HW_CLK_PLL3M            (5)
+#define MICROPY_HW_CLK_PLL3N            (160)
+#define MICROPY_HW_CLK_PLL3P            (5)
+#define MICROPY_HW_CLK_PLL3Q            (5)
+#define MICROPY_HW_CLK_PLL3R            (8)
+#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_LDO_SUPPLY)
+
+// Configure the analog switches for dual-pad pins.
+#define MICROPY_HW_ANALOG_SWITCH_PA0    (SYSCFG_SWITCH_PA0_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PA1    (SYSCFG_SWITCH_PA1_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PC2    (SYSCFG_SWITCH_PC2_OPEN)
+#define MICROPY_HW_ANALOG_SWITCH_PC3    (SYSCFG_SWITCH_PC3_OPEN)
+
+// 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
+// QSPI flash #1 for storage
+#define MICROPY_HW_QSPI_PRESCALER           (2) // 100MHz
+#define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (27)
+// Reserve 1MiB at the end for compatibility with alternate firmware that places WiFi blob here.
+#define MICROPY_HW_SPIFLASH_SIZE_BITS       (120 * 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_SPIFLASH    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev)
+#endif
+
+// 3 wait states
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_2
+
+// UART config
+#define MICROPY_HW_UART3_TX         (pyb_pin_UART3_TX)
+#define MICROPY_HW_UART3_RX         (pyb_pin_UART3_RX)
+#define MICROPY_HW_UART3_RTS        (pyb_pin_UART3_RTS)
+#define MICROPY_HW_UART3_CTS        (pyb_pin_UART3_CTS)
+#define MICROPY_HW_UART3_RX_PULL    (GPIO_NOPULL)
+
+#define MICROPY_HW_UART4_TX         (pyb_pin_BT_TXD)
+#define MICROPY_HW_UART4_RX         (pyb_pin_BT_RXD)
+#define MICROPY_HW_UART4_RTS        (pyb_pin_BT_RTS)
+#define MICROPY_HW_UART4_CTS        (pyb_pin_BT_CTS)
+
+#define MICROPY_HW_UART6_TX         (pyb_pin_UART6_TX)
+#define MICROPY_HW_UART6_RX         (pyb_pin_UART6_RX)
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pyb_pin_I2C1_SCL)
+#define MICROPY_HW_I2C1_SDA         (pyb_pin_I2C1_SDA)
+
+#define MICROPY_HW_I2C3_SCL         (pyb_pin_I2C3_SCL)
+#define MICROPY_HW_I2C3_SDA         (pyb_pin_I2C3_SDA)
+
+// USRSW is pulled high. Pressing the button makes the input go low.
+#define MICROPY_HW_USRSW_PIN        (pyb_pin_USER_BUTTON)
+#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             (pyb_pin_LED_SYS_1) // user 1
+#define MICROPY_HW_LED2             (pyb_pin_LED_SYS_2) // user 2
+#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          (pyb_pin_WL_SDIO_CLK)
+#define MICROPY_HW_SDIO_CMD         (pyb_pin_WL_SDIO_CMD)
+#define MICROPY_HW_SDIO_D0          (pyb_pin_WL_SDIO_0)
+#define MICROPY_HW_SDIO_D1          (pyb_pin_WL_SDIO_1)
+#define MICROPY_HW_SDIO_D2          (pyb_pin_WL_SDIO_2)
+#define MICROPY_HW_SDIO_D3          (pyb_pin_WL_SDIO_3)
+
+// CYW43 config
+// A custom NVRAM file is needed to disable the LPO.
+#define CYW43_WIFI_NVRAM_INCLUDE_FILE "wifi_nvram_1dx.h"
+
+#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)
+
+// Bluetooth config
+#define MICROPY_HW_BLE_UART_ID              (PYB_UART_4)
+#define MICROPY_HW_BLE_UART_BAUDRATE        (115200)
+#define MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY (3000000)
+
+// 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)
+
+// USB config
+#define MICROPY_HW_USB_FS                       (1)
+#define MICROPY_HW_USB_VID                      0x2341
+#define MICROPY_HW_USB_PID                      0x0564
+#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        "Opta Virtual Comm Port in FS Mode"
+#define MICROPY_HW_USB_PRODUCT_HS_STRING        "Opta Virtual Comm Port in HS Mode"
+#define MICROPY_HW_USB_INTERFACE_FS_STRING      "Opta Interface"
+#define MICROPY_HW_USB_INTERFACE_HS_STRING      "Opta Interface"
+#define MICROPY_HW_USB_CONFIGURATION_FS_STRING  "Opta Config"
+#define MICROPY_HW_USB_CONFIGURATION_HS_STRING  "Opta Config"
diff --git a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.mk
new file mode 100644
index 0000000000000..a4f6043c77b78
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.mk
@@ -0,0 +1,33 @@
+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 = 0x0364
+
+# MCU settings
+MCU_SERIES = h7
+CMSIS_MCU = STM32H747xx
+MICROPY_FLOAT_IMPL = single
+AF_FILE = boards/stm32h743_af.csv
+LD_FILES = boards/ARDUINO_OPTA/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_SSL = 1
+MICROPY_SSL_MBEDTLS = 1
+MICROPY_PY_OPENAMP = 1
+MICROPY_PY_OPENAMP_REMOTEPROC = 1
+
+ARDUINO_LIB_DIR = lib/arduino-lib
+GIT_SUBMODULES += $(ARDUINO_LIB_DIR)
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+MICROPY_MANIFEST_ARDUINO_LIB_DIR = $(TOP)/$(ARDUINO_LIB_DIR)
+MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'
diff --git a/ports/stm32/boards/ARDUINO_OPTA/pins.csv b/ports/stm32/boards/ARDUINO_OPTA/pins.csv
new file mode 100644
index 0000000000000..ef05f616a53e8
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/pins.csv
@@ -0,0 +1,95 @@
+# Inputs
+IN_1,PA0_C
+IN_2,PC2_C
+IN_3,PF12
+IN_4,PB0
+IN_5,PF10
+IN_6,PF8
+IN_7,PF6
+IN_8,PF4
+
+# Outputs
+OUT_1,PI6
+OUT_2,PI5
+OUT_3,PI7
+OUT_4,PI4
+RELAY_1,PI6
+RELAY_2,PI5
+RELAY_3,PI7
+RELAY_4,PI4
+
+# Modbus
+UART3_TX,PB10
+UART3_RX,PB11
+UART3_CTS,PB13
+UART3_RTS,PB14
+UART3_RE,PB13
+UART3_DE,PB14
+
+# Expansion port
+UART6_TX,PG14
+UART6_RX,PC7
+I2C3_SDA,PH8
+I2C3_SCL,PH7
+BUS_DETECT,PG8
+
+# Crypto/USB C controller
+I2C1_SDA,PB7
+I2C1_SCL,PB6
+USB_PCON_DETECT,PJ4
+USB_PCON_FAULT,PE7
+USB_PCON_ENABLE,PG1
+
+-USB_DM,PA11
+-USB_DP,PA12
+
+# LEDs
+LED_BUILTIN,PH11
+LED_SYS_1,PH11
+LED_SYS_2,PH12
+LED_SYS_3,PE5
+LEDR,PH11
+LEDG,PH12
+LEDB,PE5
+USER_BUTTON,PE4
+LED_D0,PI0
+LED_D1,PI1
+LED_D2,PI3
+LED_D3,PH15
+LED_RELAY1,PI0
+LED_RELAY2,PI1
+LED_RELAY3,PI3
+LED_RELAY4,PH15
+
+OSCEN,PH1
+-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,-PH14
+-BT_TXD,PB9
+-BT_CTS,-PB15
+-BT_RTS,-PA15
+-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,PE2
+-QSPI2_D3,PF6
+-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
diff --git a/ports/stm32/boards/ARDUINO_OPTA/stm32h747.ld b/ports/stm32/boards/ARDUINO_OPTA/stm32h747.ld
new file mode 100644
index 0000000000000..793a76b970292
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/stm32h747.ld
@@ -0,0 +1,51 @@
+/*
+    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_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
+    FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
+    FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1280K   /* CM7 firmware */
+    FLASH_CM4 (rx)  : ORIGIN = 0x08180000, LENGTH = 512K    /* CM4 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);
+
+/* OpenAMP shared memory region */
+_openamp_shm_region_start = ORIGIN(SRAM4);
+_openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);
+
+INCLUDE common_blifs.ld
diff --git a/ports/stm32/boards/ARDUINO_OPTA/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_OPTA/stm32h7xx_hal_conf.h
new file mode 100644
index 0000000000000..0175f66b706f0
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/stm32h7xx_hal_conf.h
@@ -0,0 +1,49 @@
+/* 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
+
+// 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 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
+
+#include "boards/stm32h7xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/ARDUINO_OPTA/wifi_nvram_1dx.h b/ports/stm32/boards/ARDUINO_OPTA/wifi_nvram_1dx.h
new file mode 100644
index 0000000000000..7b98edad1157c
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_OPTA/wifi_nvram_1dx.h
@@ -0,0 +1,49 @@
+static const uint8_t wifi_nvram_4343[] CYW43_RESOURCE_ATTRIBUTE =
+    // Type1DX_Final_nvram2.txt
+    // 2.4 GHz, 20 MHz BW mode
+    "manfid=0x2d0\x00"
+    "prodid=0x0726\x00"
+    "vendid=0x14e4\x00"
+    "devid=0x43e2\x00"
+    "boardtype=0x0726\x00"
+    "boardrev=0x1202\x00"
+    "boardnum=22\x00"
+    "macaddr=00:90:4c:c5:12:38\x00"
+    "sromrev=11\x00"
+    "boardflags=0x00404201\x00"
+    "boardflags3=0x04000000\x00"
+    "xtalfreq=37400\x00"
+    "nocrc=1\x00"
+    "ag0=0\x00"
+    "aa2g=1\x00"
+    "ccode=ALL\x00"
+    // "pa0itssit=0x20\x00"
+    "extpagain2g=0\x00"
+    "pa2ga0=-145,6667,-751\x00"
+    "AvVmid_c0=0x0,0xc8\x00"
+    "cckpwroffset0=2\x00"
+    "maxp2ga0=74\x00"
+    // "txpwrbckof=6\x00"
+    "cckbw202gpo=0\x00"
+    "legofdmbw202gpo=0x88888888\x00"
+    "mcsbw202gpo=0xaaaaaaaa\x00"
+    "propbw202gpo=0xdd\x00"
+    "ofdmdigfilttype=18\x00"
+    "ofdmdigfilttypebe=18\x00"
+    "papdmode=1\x00"
+    "papdvalidtest=1\x00"
+    "pacalidx2g=48\x00"
+    "papdepsoffset=-22\x00"
+    "papdendidx=58\x00"
+    "il0macaddr=00:90:4c:c5:12:38\x00"
+    "wl0id=0x431b\x00"
+    "muxenab=0x10\x00"
+    // BT COEX deferral limit setting
+    // "btc_params 8 45000\x00"
+    // "btc_params 10 20000\x00"
+    // "spurconfig=0x3\x00"
+    // Antenna diversity
+    "swdiv_en=1\x00"
+    "swdiv_gpio=1\x00"
+    "\x00\x00"
+;

From a4e3830d3924624018bf90daeab0b9b5b3a683ad Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Sep 2024 13:59:51 +0200
Subject: [PATCH 1457/3129] stm32/boards/ARDUINO_PORTENTA_H7: Update board
 config files.

Changes are:
- Add pre/post stop mode entry macros.
- Make SE05X pin accessible.
- Remove duplicate HAL macros.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h      | 4 ++--
 ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv             | 2 +-
 ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 3a012446b465e..860a0f688b2d9 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -49,8 +49,8 @@ void PORTENTA_board_low_power(int mode);
 #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);
+#define MICROPY_BOARD_PRE_STOP      PORTENTA_board_osc_enable(0);
+#define MICROPY_BOARD_POST_STOP     PORTENTA_board_osc_enable(1);
 
 // PLL1 400MHz/50MHz for SDMMC and FDCAN
 // USB and RNG are clocked from the HSI48
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
index 64082d87b3d0e..da2bed78c69a8 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -265,4 +265,4 @@ I2C3_SCL,PH7
 -QSPI2_D1,PD12
 -QSPI2_D2,-PF7
 -QSPI2_D3,PD13
--SE05X_EN,-PI12
+SE05X_EN,-PI12
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
index dd71ad71b90e2..0175f66b706f0 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
@@ -14,8 +14,6 @@
 #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

From e5984fb6daa6dec97993e8999d19ec55ce24ecb7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Sep 2024 14:01:30 +0200
Subject: [PATCH 1458/3129] stm32/boards/ARDUINO_NICLA_VISION: Update board
 config files.

Changes are:
- Add pre/post stop mode entry macros.
- Make SE05X pin accessible.
- Remove duplicate HAL macros.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h      | 4 ++--
 ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv             | 2 +-
 ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 3a2def4d4044f..796a9fae923b1 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -49,8 +49,8 @@ void NICLAV_board_low_power(int mode);
 #define MICROPY_BOARD_ENTER_STANDBY NICLAV_board_low_power(2);
 
 void NICLAV_board_osc_enable(int enable);
-#define MICROPY_BOARD_OSC_ENABLE    NICLAV_board_osc_enable(1);
-#define MICROPY_BOARD_OSC_DISABLE   NICLAV_board_osc_enable(0);
+#define MICROPY_BOARD_PRE_STOP      NICLAV_board_osc_enable(0);
+#define MICROPY_BOARD_POST_STOP     NICLAV_board_osc_enable(1);
 
 // PLL1 400MHz/50MHz for SDMMC and FDCAN
 // USB and RNG are clocked from the HSI48
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
index 7996e75496eda..02859ef3137cb 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
@@ -237,4 +237,4 @@ I2C3_SDA,PC9
 -QSPI2_D1,-PF9
 -QSPI2_D2,PE2
 -QSPI2_D3,PD13
--SE05X_EN,-PG0
+SE05X_EN,-PG0
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h
index dd71ad71b90e2..0175f66b706f0 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h
@@ -14,8 +14,6 @@
 #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

From 51974f20e1ff77110c3caef83719f9411e00c637 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Sep 2024 14:02:14 +0200
Subject: [PATCH 1459/3129] stm32/boards/ARDUINO_GIGA: Update board config
 files.

To remove duplicate HAL macros.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h
index 71cbac4765d37..708e5432e4b31 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h
@@ -14,8 +14,6 @@
 #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

From 188ca7d08a75d84c2378a9c81cc3687697f77f83 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 29 May 2024 15:22:13 +1000
Subject: [PATCH 1460/3129] renesas-ra/README: Add basic details about board
 autogen files.

The renesas-ra port board definitions contain auto-generated files which
are not easy to understand for someone unfamiliar with the port.  This
commit adds some notes to the README to assist other developers who want to
work on these.

The configuration.xml file for the `ARDUINO_PORTENTA_C33` was provided by
@iabdalkader.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/renesas-ra/README.md                    |  20 +
 .../ARDUINO_PORTENTA_C33/configuration.xml    | 653 ++++++++++++++++++
 2 files changed, 673 insertions(+)
 create mode 100755 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/configuration.xml

diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
index 4b3a7696faeb3..ed5a155e7f3db 100644
--- a/ports/renesas-ra/README.md
+++ b/ports/renesas-ra/README.md
@@ -63,6 +63,26 @@ passed as the argument to `BOARD=`; for example `RA4M1_CLICKER`, `EK_RA4M1`,
 The above command should produce binary images `firmware.hex` in the
 build-EK_RA6M2/` subdirectory (or the equivalent directory for the board specified).
 
+## Board definition auto-generated code
+
+The supported board definitions contain auto-generated configuration files in
+the `boards/<BOARD_NAME>/ra_cfg` and `boards/<BOARD_NAME>/ra_gen` folders.
+
+These are generated with the [RA Smart Configurator](https://www.renesas.com/us/en/software-tool/ra-smart-configurator)
+tool which is used to define peripheral configuration, pinouts, interrupts etc. for each board.
+
+This tool can be installed either as part of the "Renesas e² studio", or separately with
+the fsp driver package from https://github.com/renesas/fsp/releases eg.
+* [setup_fsp_v4_4_0_rasc_v2023-04.exe](https://github.com/renesas/fsp/releases/download/v4.4.0/setup_fsp_v4_4_0_rasc_v2023-04.exe)
+* [setup_fsp_v4_4_0_rasc_v2023-04.exe](https://github.com/renesas/fsp/releases/download/v4.4.0/setup_fsp_v4_4_0_rasc_v2023-04.AppImage)
+
+This tool can be used to create new board definitions or modify existing ones
+by opening one of the `configuration.xml` files in the board folders.
+
+Once the `configuration.xml` file is opened in RA Smart Configurator and modified as
+needed, the "Generate Project Content" button can be pressed to export new copies
+of the `ra_cfg` and `ra_gen` folders.
+
 ## Supported/Unsupported functions
 Please refer to the `renesas-ra` quick reference.
 
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/configuration.xml b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/configuration.xml
new file mode 100755
index 0000000000000..714a1c716eb25
--- /dev/null
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/configuration.xml
@@ -0,0 +1,653 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<raConfiguration version="7">
+  <generalSettings>
+    <option key="#Board#" value="board.custom"/>
+    <option key="CPU" value="RA6M5"/>
+    <option key="Core" value="CM33"/>
+    <option key="#TargetName#" value="R7FA6M5BH2CBG"/>
+    <option key="#TargetARCHITECTURE#" value="cortex-m33"/>
+    <option key="#DeviceCommand#" value="R7FA6M5BH"/>
+    <option key="#RTOS#" value="_none"/>
+    <option key="#pinconfiguration#" value="R7FA6M5AG2CBG.pincfg"/>
+    <option key="#FSPVersion#" value="4.4.0"/>
+    <option key="#SELECTED_TOOLCHAIN#" value="gcc-arm-embedded"/>
+    <option key="#ToolchainVersion#" value="10.3.1.20210824"/>
+  </generalSettings>
+  <raBspConfiguration>
+    <config id="config.bsp.ra6m5.R7FA6M5BH2CBG">
+      <property id="config.bsp.part_number" value="config.bsp.part_number.value"/>
+      <property id="config.bsp.rom_size_bytes" value="config.bsp.rom_size_bytes.value"/>
+      <property id="config.bsp.rom_size_bytes_hidden" value="2097152"/>
+      <property id="config.bsp.ram_size_bytes" value="config.bsp.ram_size_bytes.value"/>
+      <property id="config.bsp.data_flash_size_bytes" value="config.bsp.data_flash_size_bytes.value"/>
+      <property id="config.bsp.package_style" value="config.bsp.package_style.value"/>
+      <property id="config.bsp.package_pins" value="config.bsp.package_pins.value"/>
+      <property id="config.bsp.irq_count_hidden" value="96"/>
+    </config>
+    <config id="config.bsp.ra6m5">
+      <property id="config.bsp.series" value="config.bsp.series.value"/>
+    </config>
+    <config id="config.bsp.ra6m5.fsp">
+      <property id="config.bsp.fsp.tz.exception_response" value="config.bsp.fsp.tz.exception_response.nmi"/>
+      <property id="config.bsp.fsp.tz.cmsis.bfhfnmins" value="config.bsp.fsp.tz.cmsis.bfhfnmins.secure"/>
+      <property id="config.bsp.fsp.tz.cmsis.sysresetreqs" value="config.bsp.fsp.tz.cmsis.sysresetreqs.secure_only"/>
+      <property id="config.bsp.fsp.tz.cmsis.s_priority_boost" value="config.bsp.fsp.tz.cmsis.s_priority_boost.disabled"/>
+      <property id="config.bsp.fsp.tz.csar" value="config.bsp.fsp.tz.csar.both"/>
+      <property id="config.bsp.fsp.tz.rstsar" value="config.bsp.fsp.tz.rstsar.both"/>
+      <property id="config.bsp.fsp.tz.bbfsar" value="config.bsp.fsp.tz.bbfsar.both"/>
+      <property id="config.bsp.fsp.tz.sramsar.sramprcr" value="config.bsp.fsp.tz.sramsar.sramprcr.both"/>
+      <property id="config.bsp.fsp.tz.sramsar.sramecc" value="config.bsp.fsp.tz.sramsar.sramecc.both"/>
+      <property id="config.bsp.fsp.tz.stbramsar" value="config.bsp.fsp.tz.stbramsar.both"/>
+      <property id="config.bsp.fsp.tz.bussara" value="config.bsp.fsp.tz.bussara.both"/>
+      <property id="config.bsp.fsp.tz.bussarb" value="config.bsp.fsp.tz.bussarb.both"/>
+      <property id="config.bsp.fsp.tz.uninitialized_ns_application_fallback" value="config.bsp.fsp.tz.uninitialized_ns_application_fallback.enabled"/>
+      <property id="config.bsp.fsp.cache_line_size" value="config.bsp.fsp.cache_line_size.32"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_start_mode" value="config.bsp.fsp.OFS0.iwdt_start_mode.disabled"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_timeout" value="config.bsp.fsp.OFS0.iwdt_timeout.2048"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_divisor" value="config.bsp.fsp.OFS0.iwdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_end" value="config.bsp.fsp.OFS0.iwdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_start" value="config.bsp.fsp.OFS0.iwdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_reset_interrupt" value="config.bsp.fsp.OFS0.iwdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_stop_control" value="config.bsp.fsp.OFS0.iwdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS0.wdt_start_mode" value="config.bsp.fsp.OFS0.wdt_start_mode.register"/>
+      <property id="config.bsp.fsp.OFS0.wdt_timeout" value="config.bsp.fsp.OFS0.wdt_timeout.16384"/>
+      <property id="config.bsp.fsp.OFS0.wdt_divisor" value="config.bsp.fsp.OFS0.wdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_end" value="config.bsp.fsp.OFS0.wdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_start" value="config.bsp.fsp.OFS0.wdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.wdt_reset_interrupt" value="config.bsp.fsp.OFS0.wdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.wdt_stop_control" value="config.bsp.fsp.OFS0.wdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0.start" value="config.bsp.fsp.OFS1.voltage_detection0.start.disabled"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0_level" value="config.bsp.fsp.OFS1.voltage_detection0_level.280"/>
+      <property id="config.bsp.fsp.OFS1.hoco_osc" value="config.bsp.fsp.OFS1.hoco_osc.disabled"/>
+      <property id="config.bsp.fsp.BPS.BPS0" value=""/>
+      <property id="config.bsp.fsp.BPS.BPS1" value=""/>
+      <property id="config.bsp.fsp.BPS.BPS2" value=""/>
+      <property id="config.bsp.fsp.PBPS.PBPS0" value=""/>
+      <property id="config.bsp.fsp.PBPS.PBPS1" value=""/>
+      <property id="config.bsp.fsp.PBPS.PBPS2" value=""/>
+      <property id="config.bsp.fsp.dual_bank" value="config.bsp.fsp.dual_bank.disabled"/>
+      <property id="config.bsp.fsp.hoco_fll" value="config.bsp.fsp.hoco_fll.disabled"/>
+      <property id="config.bsp.common.main_osc_wait" value="config.bsp.common.main_osc_wait.wait_8163"/>
+      <property id="config.bsp.fsp.mcu.adc.max_freq_hz" value="50000000"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.max_baud" value="20000000"/>
+      <property id="config.bsp.fsp.mcu.adc.sample_and_hold" value="0"/>
+      <property id="config.bsp.fsp.mcu.sci_spi.max_bitrate" value="25000000"/>
+      <property id="config.bsp.fsp.mcu.spi.max_bitrate" value="50000000"/>
+      <property id="config.bsp.fsp.mcu.iic_master.rate.rate_fastplus" value="1"/>
+      <property id="config.bsp.fsp.mcu.iic_master.fastplus_channels" value="0x3"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.rate.rate_fastplus" value="1"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.fastplus_channels" value="0x3"/>
+      <property id="config.bsp.fsp.mcu.canfd.num_channels" value="2"/>
+      <property id="config.bsp.fsp.mcu.canfd.rx_fifos" value="8"/>
+      <property id="config.bsp.fsp.mcu.canfd.buffer_ram" value="4864"/>
+      <property id="config.bsp.fsp.mcu.canfd.afl_rules" value="128"/>
+      <property id="config.bsp.fsp.mcu.canfd.afl_rules_independent" value="0"/>
+      <property id="config.bsp.fsp.mcu.canfd.max_data_rate_hz" value="8"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.cstpen_channels" value="0x03F9"/>
+      <property id="config.bsp.fsp.mcu.gpt.pin_count_source_channels" value="0xFFFF"/>
+      <property id="config.bsp.fsp.mcu.adc_dmac.samples_per_channel" value="65535"/>
+    </config>
+    <config id="config.bsp.ra">
+      <property id="config.bsp.common.main" value="0x4000"/>
+      <property id="config.bsp.common.heap" value="0x4d000"/>
+      <property id="config.bsp.common.vcc" value="3300"/>
+      <property id="config.bsp.common.checking" value="config.bsp.common.checking.disabled"/>
+      <property id="config.bsp.common.assert" value="config.bsp.common.assert.none"/>
+      <property id="config.bsp.common.error_log" value="config.bsp.common.error_log.none"/>
+      <property id="config.bsp.common.soft_reset" value="config.bsp.common.soft_reset.disabled"/>
+      <property id="config.bsp.common.main_osc_populated" value="config.bsp.common.main_osc_populated.enabled"/>
+      <property id="config.bsp.common.pfs_protect" value="config.bsp.common.pfs_protect.enabled"/>
+      <property id="config.bsp.common.c_runtime_init" value="config.bsp.common.c_runtime_init.enabled"/>
+      <property id="config.bsp.common.early_init" value="config.bsp.common.early_init.disabled"/>
+      <property id="config.bsp.common.main_osc_clock_source" value="config.bsp.common.main_osc_clock_source.crystal"/>
+      <property id="config.bsp.common.subclock_populated" value="config.bsp.common.subclock_populated.enabled"/>
+      <property id="config.bsp.common.subclock_drive" value="config.bsp.common.subclock_drive.standard"/>
+      <property id="config.bsp.common.subclock_stabilization_ms" value="1000"/>
+    </config>
+  </raBspConfiguration>
+  <raClockConfiguration>
+    <node id="board.clock.xtal.freq" mul="24000000" option="_edit"/>
+    <node id="board.clock.hoco.freq" option="board.clock.hoco.freq.20m"/>
+    <node id="board.clock.loco.freq" option="board.clock.loco.freq.32768"/>
+    <node id="board.clock.moco.freq" option="board.clock.moco.freq.8m"/>
+    <node id="board.clock.subclk.freq" option="board.clock.subclk.freq.32768"/>
+    <node id="board.clock.pll.source" option="board.clock.pll.source.xtal"/>
+    <node id="board.clock.pll.div" option="board.clock.pll.div.3"/>
+    <node id="board.clock.pll.mul" option="board.clock.pll.mul.250"/>
+    <node id="board.clock.pll.display" option="board.clock.pll.display.value"/>
+    <node id="board.clock.pll2.source" option="board.clock.pll2.source.xtal"/>
+    <node id="board.clock.pll2.div" option="board.clock.pll2.div.2"/>
+    <node id="board.clock.pll2.mul" option="board.clock.pll2.mul.200"/>
+    <node id="board.clock.pll2.display" option="board.clock.pll2.display.value"/>
+    <node id="board.clock.clock.source" option="board.clock.clock.source.pll"/>
+    <node id="board.clock.clkout.source" option="board.clock.clkout.source.disabled"/>
+    <node id="board.clock.uclk.source" option="board.clock.uclk.source.pll2"/>
+    <node id="board.clock.u60ck.source" option="board.clock.u60ck.source.disabled"/>
+    <node id="board.clock.octaspiclk.source" option="board.clock.octaspiclk.source.disabled"/>
+    <node id="board.clock.canfdclk.source" option="board.clock.canfdclk.source.disabled"/>
+    <node id="board.clock.cecclk.source" option="board.clock.cecclk.source.disabled"/>
+    <node id="board.clock.iclk.div" option="board.clock.iclk.div.1"/>
+    <node id="board.clock.pclka.div" option="board.clock.pclka.div.2"/>
+    <node id="board.clock.pclkb.div" option="board.clock.pclkb.div.4"/>
+    <node id="board.clock.pclkc.div" option="board.clock.pclkc.div.4"/>
+    <node id="board.clock.pclkd.div" option="board.clock.pclkd.div.2"/>
+    <node id="board.clock.bclk.div" option="board.clock.bclk.div.2"/>
+    <node id="board.clock.bclkout.div" option="board.clock.bclkout.div.2"/>
+    <node id="board.clock.fclk.div" option="board.clock.fclk.div.4"/>
+    <node id="board.clock.clkout.div" option="board.clock.clkout.div.1"/>
+    <node id="board.clock.uclk.div" option="board.clock.uclk.div.5"/>
+    <node id="board.clock.u60ck.div" option="board.clock.u60ck.div.1"/>
+    <node id="board.clock.octaspiclk.div" option="board.clock.octaspiclk.div.1"/>
+    <node id="board.clock.canfdclk.div" option="board.clock.canfdclk.div.6"/>
+    <node id="board.clock.cecclk.div" option="board.clock.cecclk.div.1"/>
+    <node id="board.clock.iclk.display" option="board.clock.iclk.display.value"/>
+    <node id="board.clock.pclka.display" option="board.clock.pclka.display.value"/>
+    <node id="board.clock.pclkb.display" option="board.clock.pclkb.display.value"/>
+    <node id="board.clock.pclkc.display" option="board.clock.pclkc.display.value"/>
+    <node id="board.clock.pclkd.display" option="board.clock.pclkd.display.value"/>
+    <node id="board.clock.bclk.display" option="board.clock.bclk.display.value"/>
+    <node id="board.clock.bclkout.display" option="board.clock.bclkout.display.value"/>
+    <node id="board.clock.fclk.display" option="board.clock.fclk.display.value"/>
+    <node id="board.clock.clkout.display" option="board.clock.clkout.display.value"/>
+    <node id="board.clock.uclk.display" option="board.clock.uclk.display.value"/>
+    <node id="board.clock.u60ck.display" option="board.clock.u60ck.display.value"/>
+    <node id="board.clock.octaspiclk.display" option="board.clock.octaspiclk.display.value"/>
+    <node id="board.clock.canfdclk.display" option="board.clock.canfdclk.display.value"/>
+    <node id="board.clock.cecclk.display" option="board.clock.cecclk.display.value"/>
+  </raClockConfiguration>
+  <raComponentSelection>
+    <component apiversion="" class="BSP" condition="" group="Board" subgroup="custom" variant="" vendor="Renesas" version="4.4.0">
+      <description>Custom Board Support Files</description>
+      <originalPack>Renesas.RA_board_custom.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m5" subgroup="device" variant="R7FA6M5BH2CBG" vendor="Renesas" version="4.4.0">
+      <description>Board support package for R7FA6M5BH2CBG</description>
+      <originalPack>Renesas.RA_mcu_ra6m5.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m5" subgroup="device" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA6M5</description>
+      <originalPack>Renesas.RA_mcu_ra6m5.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m5" subgroup="fsp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA6M5 - FSP Data</description>
+      <originalPack>Renesas.RA_mcu_ra6m5.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.9.0+renesas.0.fsp.4.4.0">
+      <description>Arm CMSIS Version 5 - Core (M)</description>
+      <originalPack>Arm.CMSIS5.5.9.0+renesas.0.fsp.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board Support Package Common Files</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_adc" variant="" vendor="Renesas" version="4.4.0">
+      <description>A/D Converter</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_agt" variant="" vendor="Renesas" version="4.4.0">
+      <description>Asynchronous General Purpose Timer</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dac" variant="" vendor="Renesas" version="4.4.0">
+      <description>12-bit D/A Converter</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_flash_hp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Flash Memory High Performance</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="4.4.0">
+      <description>External Interrupt</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_iic_master" variant="" vendor="Renesas" version="4.4.0">
+      <description>I2C Master Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="4.4.0">
+      <description>I/O Port</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_lpm" variant="" vendor="Renesas" version="4.4.0">
+      <description>Low Power Modes</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_rtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Real Time Clock</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="4.4.0">
+      <description>SCI UART</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_usb_basic" variant="" vendor="Renesas" version="4.4.0">
+      <description>USB Basic</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_usb_pcdc" variant="" vendor="Renesas" version="4.4.0">
+      <description>USB Peripheral Communications Device Class</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_usb_composite" variant="" vendor="Renesas" version="4.4.0">
+      <description>USB Composite</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+  </raComponentSelection>
+  <raElcConfiguration/>
+  <raIcuConfiguration/>
+  <raModuleConfiguration>
+    <module id="module.driver.ioport_on_ioport.0">
+      <property id="module.driver.ioport.name" value="g_ioport"/>
+      <property id="module.driver.ioport.elc_trigger_ioport1" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport2" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport3" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport4" value="_disabled"/>
+      <property id="module.driver.ioport.pincfg" value="g_bsp_pin_cfg"/>
+    </module>
+    <module id="module.driver.lpm.434931641">
+      <property id="module.driver.lpm.name" value="g_lpm0"/>
+      <property id="module.driver.lpm.mode" value="module.driver.lpm.mode.sleep"/>
+      <property id="module.driver.lpm.output_port_enable_standby" value="module.driver.lpm.output_port_enable_standby.no_change"/>
+      <property id="module.driver.lpm.standby_wake_sources" value="module.driver.lpm.standby_wake_rtcalm"/>
+      <property id="module.driver.lpm.snooze_request" value="module.driver.lpm.snooze_request_rxd0_falling"/>
+      <property id="module.driver.lpm.snooze_end_sources" value=""/>
+      <property id="module.driver.lpm.snooze_dtc" value="module.driver.lpm.snooze_dtc.lpm_snooze_dtc_disable"/>
+      <property id="module.driver.lpm.snooze_cancel_source" value="enum.mcu.lpm.snooze_cancel_source.none"/>
+      <property id="module.driver.lpm.ram_power_enable" value=""/>
+      <property id="module.driver.lpm.tcm_power_enable" value="enum.mcu.lpm.tcm_power_enable.disable"/>
+      <property id="module.driver.lpm.standby_ram_power_enable" value="enum.mcu.lpm.standby_ram_power_enable.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll1" value="enum.mcu.lpm.oscillator_ldo_state.pll1.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll2" value="enum.mcu.lpm.oscillator_ldo_state.pll2.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.hoco" value="enum.mcu.lpm.oscillator_ldo_state.hoco.disable"/>
+      <property id="module.driver.lpm.io_port_deep_standby_exit" value="module.driver.lpm.io_port_deep_standby_exit.no_change"/>
+      <property id="module.driver.lpm.power_supply_deep_standby" value="module.driver.lpm.power_supply_deep_standby.deepcut0"/>
+      <property id="module.driver.lpm.deep_standby_cancel_sources" value=""/>
+      <property id="module.driver.lpm.deep_standby_cancel_edges" value=""/>
+    </module>
+    <module id="module.driver.flash_on_flash_hp.609385472">
+      <property id="module.driver.flash.name" value="g_flash0"/>
+      <property id="module.driver.flash.data_flash_bgo" value="module.driver.flash.data_flash_bgo.disabled"/>
+      <property id="module.driver.flash.p_callback" value="NULL"/>
+      <property id="module.driver.flash.ipl" value="_disabled"/>
+      <property id="module.driver.flash.err_ipl" value="_disabled"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.1594546810">
+      <property id="module.driver.uart.name" value="g_uart0"/>
+      <property id="module.driver.uart.channel" value="0"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="NULL"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.1710274925">
+      <property id="module.driver.uart.name" value="g_uart9"/>
+      <property id="module.driver.uart.channel" value="9"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.rtc_on_rtc.911991849">
+      <property id="module.driver.rtc.name" value="g_rtc0"/>
+      <property id="module.driver.rtc.clock_source" value="module.driver.rtc.clock_source.clock_source_loco"/>
+      <property id="module.driver.rtc.freq_cmpr_value_loco" value="255"/>
+      <property id="module.driver.rtc.err_adjustment_mode" value="module.driver.rtc.err_adjustment_mode.m1"/>
+      <property id="module.driver.rtc.err_adjustment_period" value="module.driver.rtc.err_adjustment_period.p1"/>
+      <property id="module.driver.rtc.err_adjustment_type" value="module.driver.rtc.err_adjustment_type.t1"/>
+      <property id="module.driver.rtc.err_adjustment_value" value="0"/>
+      <property id="module.driver.rtc.p_callback" value="NULL"/>
+      <property id="module.driver.rtc.alarm_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.periodic_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.carry_ipl" value="board.icu.common.irq.priority14"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.263966385">
+      <property id="module.driver.external_irq.name" value="g_external_irq0"/>
+      <property id="module.driver.external_irq.channel" value="0"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="NULL"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.usb_composite.869973318">
+      <property id="module.driver.r_usb_composite.name" value="g_r_usb_composite0"/>
+    </module>
+    <module id="module.driver.pcdc_on_usb.461648652">
+      <property id="module.driver.pcdc.name" value="g_pcdc0"/>
+    </module>
+    <module id="module.driver.basic_on_usb.621892406">
+      <property id="module.driver.basic.name" value="g_basic0"/>
+      <property id="module.driver.usb_basic.usb_mode" value="module.driver.usb_basic.usb_mode.host"/>
+      <property id="module.driver.usb_basic.usb_speed" value="module.driver.usb_basic.usb_speed.fs"/>
+      <property id="module.driver.usb_basic.usb_modulenumber" value="module.driver.usb_basic.usb_modulenumber.0"/>
+      <property id="module.driver.usb_basic.usb_classtype" value="module.driver.usb_basic.usb_classtype.pcdc"/>
+      <property id="module.driver.usb_basic.p_usb_reg" value="g_usb_descriptor"/>
+      <property id="module.driver.usb_basic.complience_cb" value="NULL"/>
+      <property id="module.driver.usb_basic.ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.usb_basic.ipl_r" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.usb_basic.ipl_d0" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.usb_basic.ipl_d1" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.usb_basic.hsipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.usb_basic.hsipl_d0" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.usb_basic.hsipl_d1" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.usb_basic.rtos_callback" value="NULL"/>
+      <property id="module.driver.usb_basic.other_context" value="NULL"/>
+    </module>
+    <module id="module.driver.i2c_on_iic_master.1893658172">
+      <property id="module.driver.i2c_master.name" value="g_i2c_master0"/>
+      <property id="module.driver.i2c_master.channel" value="0"/>
+      <property id="module.driver.i2c_master.rate" value="module.driver.i2c_master.rate.rate_standard"/>
+      <property id="module.driver.i2c_master.rise_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.fall_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.duty" value="50"/>
+      <property id="module.driver.i2c_master.slave" value="0x00"/>
+      <property id="module.driver.i2c_master.addr_mode" value="module.driver.i2c_master.addr_mode.addr_mode_7bit"/>
+      <property id="module.driver.i2c_master.timeout_mode" value="module.driver.i2c_master.timeout_mode.short_mode"/>
+      <property id="module.driver.i2c_master.timeout_scl_low" value="module.driver.i2c_master.timeout_scl_low.enabled"/>
+      <property id="module.driver.i2c_master.p_callback" value="NULL"/>
+      <property id="module.driver.i2c_master.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.adc_on_adc.813040664">
+      <property id="module.driver.adc.name" value="g_adc0"/>
+      <property id="module.driver.adc.unit" value="0"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_12_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.vrefh"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <module id="module.driver.dac_on_dac.132879586">
+      <property id="module.driver.dac.name" value="g_dac0"/>
+      <property id="module.driver.dac.channel_id" value="0"/>
+      <property id="module.driver.dac.ad_da_synchronized" value="module.driver.dac.ad_da_synchronized.disabled"/>
+      <property id="module.driver.dac.data_format" value="module.driver.dac.data_format.data_format_flush_right"/>
+      <property id="module.driver.dac.output_amplifier_enabled" value="module.driver.dac.output_amplifier.disabled"/>
+      <property id="module.driver.dac.charge_pump_enabled" value="enum.mcu.dac.charge_pump.disabled"/>
+      <property id="module.driver.dac.internal_output" value="enum.mcu.dac.internal_output.disabled"/>
+      <property id="module.driver.dac.elc_trigger" value="_disabled"/>
+    </module>
+    <module id="module.driver.dac_on_dac.1869403515">
+      <property id="module.driver.dac.name" value="g_dac1"/>
+      <property id="module.driver.dac.channel_id" value="1"/>
+      <property id="module.driver.dac.ad_da_synchronized" value="module.driver.dac.ad_da_synchronized.disabled"/>
+      <property id="module.driver.dac.data_format" value="module.driver.dac.data_format.data_format_flush_right"/>
+      <property id="module.driver.dac.output_amplifier_enabled" value="module.driver.dac.output_amplifier.disabled"/>
+      <property id="module.driver.dac.charge_pump_enabled" value="enum.mcu.dac.charge_pump.disabled"/>
+      <property id="module.driver.dac.internal_output" value="enum.mcu.dac.internal_output.disabled"/>
+      <property id="module.driver.dac.elc_trigger" value="_disabled"/>
+    </module>
+    <module id="module.driver.timer_on_agt.1701657275">
+      <property id="module.driver.timer.name" value="g_timer0"/>
+      <property id="module.driver.timer.channel" value="0"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="NULL"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.timer_on_agt.1593122049">
+      <property id="module.driver.timer.name" value="g_timer1"/>
+      <property id="module.driver.timer.channel" value="1"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="NULL"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.943350430">
+      <property id="module.driver.uart.name" value="g_uart8"/>
+      <property id="module.driver.uart.channel" value="8"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.hardware.ctsrts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <context id="_hal.0">
+      <stack module="module.driver.ioport_on_ioport.0"/>
+      <stack module="module.driver.lpm.434931641"/>
+      <stack module="module.driver.flash_on_flash_hp.609385472"/>
+      <stack module="module.driver.uart_on_sci_uart.1710274925"/>
+      <stack module="module.driver.rtc_on_rtc.911991849"/>
+      <stack module="module.driver.external_irq_on_icu.263966385"/>
+      <stack module="module.driver.usb_composite.869973318">
+        <stack module="module.driver.pcdc_on_usb.461648652" requires="module.driver.r_usb_composite_pmsc_phid.requires.class1">
+          <stack module="module.driver.basic_on_usb.621892406" requires="module.driver.basic_on_usb.requires.basic"/>
+        </stack>
+      </stack>
+      <stack module="module.driver.i2c_on_iic_master.1893658172"/>
+      <stack module="module.driver.adc_on_adc.813040664"/>
+      <stack module="module.driver.dac_on_dac.132879586"/>
+      <stack module="module.driver.dac_on_dac.1869403515"/>
+      <stack module="module.driver.timer_on_agt.1701657275"/>
+      <stack module="module.driver.timer_on_agt.1593122049"/>
+      <stack module="module.driver.uart_on_sci_uart.943350430"/>
+    </context>
+    <config id="config.driver.flash_hp">
+      <property id="config.driver.flash_hp.param_checking_enable" value="config.flash_hp.param_checking_enable.bsp"/>
+      <property id="config.driver.flash_hp.param_code_flash_programming_enable" value="config.driver.flash_hp.param_code_flash_programming_enable.enabled"/>
+      <property id="config.driver.flash_hp.param_data_flash_programming_enable" value="config.driver.flash_hp.param_data_flash_programming_enable.enabled"/>
+    </config>
+    <config id="config.driver.lpm">
+      <property id="config.driver.lpm.param_checking_enable" value="config.driver.lpm.param_checking_enable.bsp"/>
+      <property id="config.driver.lpm.standby_limit" value="config.driver.lpm.standby_limit.disabled"/>
+    </config>
+    <config id="config.driver.usb_pcdc">
+      <property id="config.driver.usb_pcdc.bulk_in" value="config.driver.usb_pcdc.bulk_in.pipe1"/>
+      <property id="config.driver.usb_pcdc.bulk_out" value="config.driver.usb_pcdc.bulk_out.pipe2"/>
+      <property id="config.driver.usb_pcdc.int_in" value="config.driver.usb_pcdc.int_in.pipe6"/>
+    </config>
+    <config id="config.driver.usb_pcdc_class"/>
+    <config id="config.driver.ioport">
+      <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
+    </config>
+    <config id="config.driver.adc">
+      <property id="config.driver.adc.param_checking_enable" value="config.driver.adc.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.icu">
+      <property id="config.driver.icu.param_checking_enable" value="config.driver.icu.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.usb_basic">
+      <property id="config.driver.usb_basic.param_checking_enable" value="config.driver.usb_basic.param_checking_enable.bsp"/>
+      <property id="config.driver.usb_basic.pll_clock_frequency" value="config.driver.usb_basic.pll_clock_frequency.24mhz"/>
+      <property id="config.driver.usb_basic.buswait" value="config.driver.usb_basic.buswait.7"/>
+      <property id="config.driver.usb_basic.bc_function" value="config.driver.usb_basic.bc_function.enable"/>
+      <property id="config.driver.usb_basic.power_source" value="config.driver.usb_basic.power_source.high"/>
+      <property id="config.driver.usb_basic.dcp_function" value="config.driver.usb_basic.dcp_function.disable"/>
+      <property id="config.driver.usb_basic.request" value="config.driver.usb_basic.request.enable"/>
+      <property id="config.driver.usb_basic.dblb" value="config.driver.usb_basic.dblb.enable"/>
+      <property id="config.driver.usb_basic.cntmd" value="config.driver.usb_basic.cntmd.disable"/>
+      <property id="config.driver.usb_basic.ldo_regulator" value="config.driver.usb_basic.ldo_regulator.disable"/>
+      <property id="config.driver.usb_basic.dma" value="config.driver.usb_basic.dma.disable"/>
+      <property id="config.driver.usb_basic.source_address" value="config.driver.usb_basic.source_address.none"/>
+      <property id="config.driver.usb_basic.dest_address" value="config.driver.usb_basic.dest_address.none"/>
+      <property id="config.driver.usb_basic.compliance_mode" value="config.driver.usb_basic.compliance_mode.disable"/>
+      <property id="config.driver.usb_basic.tpl_table" value="NULL"/>
+    </config>
+    <config id="config.driver.agt">
+      <property id="config.driver.agt.param_checking_enable" value="config.driver.agt.param_checking_enable.bsp"/>
+      <property id="config.driver.agt.output_support_enable" value="config.driver.agt.output_support_enable.disabled"/>
+      <property id="config.driver.agt.input_support_enable" value="config.driver.agt.input_support_enable.disabled"/>
+    </config>
+    <config id="config.driver.dac">
+      <property id="config.driver.dac.param_checking_enable" value="config.driver.dac.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.iic_master">
+      <property id="config.driver.iic_master.param_checking_enable" value="config.driver.iic_master.param_checking_enable.bsp"/>
+      <property id="config.driver.iic_master.dtc_enable" value="config.driver.iic_master.dtc_enable.disabled"/>
+      <property id="config.driver.iic_master.addr_mode_10_bit_enable" value="config.driver.iic_master.addr_mode_10_bit_enable.disabled"/>
+    </config>
+    <config id="config.driver.sci_uart">
+      <property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
+      <property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>
+      <property id="config.driver.sci_uart.dtc_support" value="config.driver.sci_uart.dtc_support.disabled"/>
+      <property id="config.driver.sci_uart.flow_control" value="config.driver.sci_uart.flow_control.disabled"/>
+      <property id="config.driver.sci_uart.rs485" value="config.driver.sci_uart.rs485.disabled"/>
+    </config>
+    <config id="config.driver.rtc">
+      <property id="config.driver.rtc.param_checking_enable" value="config.driver.rtc.param_checking_enable.bsp"/>
+      <property id="config.driver.rtc.open_set_source_clock" value="config.driver.rtc.open_set_source_clock.enabled"/>
+    </config>
+  </raModuleConfiguration>
+  <raPinConfiguration>
+    <pincfg active="true" name="R7FA6M5BH2CBG.pincfg" selected="true" symbol="g_bsp_pin_cfg">
+      <configSetting altId="adc0.an00.p000" configurationId="adc0.an00"/>
+      <configSetting altId="adc0.an01.p001" configurationId="adc0.an01"/>
+      <configSetting altId="adc0.an02.p002" configurationId="adc0.an02"/>
+      <configSetting altId="adc0.an04.p004" configurationId="adc0.an04"/>
+      <configSetting altId="adc0.an05.p005" configurationId="adc0.an05"/>
+      <configSetting altId="adc0.an06.p006" configurationId="adc0.an06"/>
+      <configSetting altId="adc0.mode.custom" configurationId="adc0.mode"/>
+      <configSetting altId="dac0.da.p014" configurationId="dac0.da"/>
+      <configSetting altId="dac0.mode.enabled" configurationId="dac0.mode"/>
+      <configSetting altId="dac1.da.p015" configurationId="dac1.da"/>
+      <configSetting altId="dac1.mode.enabled" configurationId="dac1.mode"/>
+      <configSetting altId="debug0.mode.swd" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.swclk.p300" configurationId="debug0.swclk"/>
+      <configSetting altId="debug0.swdio.p108" configurationId="debug0.swdio"/>
+      <configSetting altId="iic0.mode.enabled.b" configurationId="iic0.mode"/>
+      <configSetting altId="iic0.pairing.b" configurationId="iic0.pairing"/>
+      <configSetting altId="iic0.scl.p408" configurationId="iic0.scl"/>
+      <configSetting altId="iic0.sda.p407" configurationId="iic0.sda"/>
+      <configSetting altId="p000.asel" configurationId="p000"/>
+      <configSetting altId="p000.gpio_mode.gpio_mode_an" configurationId="p000.gpio_mode"/>
+      <configSetting altId="p001.asel" configurationId="p001"/>
+      <configSetting altId="p001.gpio_mode.gpio_mode_an" configurationId="p001.gpio_mode"/>
+      <configSetting altId="p002.asel" configurationId="p002"/>
+      <configSetting altId="p002.gpio_mode.gpio_mode_an" configurationId="p002.gpio_mode"/>
+      <configSetting altId="p004.asel" configurationId="p004"/>
+      <configSetting altId="p004.gpio_mode.gpio_mode_an" configurationId="p004.gpio_mode"/>
+      <configSetting altId="p005.asel" configurationId="p005"/>
+      <configSetting altId="p005.gpio_mode.gpio_mode_an" configurationId="p005.gpio_mode"/>
+      <configSetting altId="p006.asel" configurationId="p006"/>
+      <configSetting altId="p006.gpio_mode.gpio_mode_an" configurationId="p006.gpio_mode"/>
+      <configSetting altId="p014.dac0.da" configurationId="p014"/>
+      <configSetting altId="p014.gpio_mode.gpio_mode_an" configurationId="p014.gpio_mode"/>
+      <configSetting altId="p015.dac1.da" configurationId="p015"/>
+      <configSetting altId="p015.gpio_mode.gpio_mode_an" configurationId="p015.gpio_mode"/>
+      <configSetting altId="p108.debug0.swdio" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p110.sci9.rxd" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p300.debug0.swclk" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+      <configSetting altId="p407.iic0.sda" configurationId="p407"/>
+      <configSetting altId="p407.gpio_speed.gpio_speed_medium" configurationId="p407.gpio_drivecapacity"/>
+      <configSetting altId="p407.gpio_mode.gpio_mode_peripheral" configurationId="p407.gpio_mode"/>
+      <configSetting altId="p408.iic0.scl" configurationId="p408"/>
+      <configSetting altId="p408.gpio_speed.gpio_speed_medium" configurationId="p408.gpio_drivecapacity"/>
+      <configSetting altId="p408.gpio_mode.gpio_mode_peripheral" configurationId="p408.gpio_mode"/>
+      <configSetting altId="p602.sci9.txd" configurationId="p602"/>
+      <configSetting altId="p602.gpio_mode.gpio_mode_peripheral" configurationId="p602.gpio_mode"/>
+      <configSetting altId="p607.sci8.rxd" configurationId="p607"/>
+      <configSetting altId="p607.gpio_mode.gpio_mode_peripheral" configurationId="p607.gpio_mode"/>
+      <configSetting altId="pa00.sci8.txd" configurationId="pa00"/>
+      <configSetting altId="pa00.gpio_mode.gpio_mode_peripheral" configurationId="pa00.gpio_mode"/>
+      <configSetting altId="sci8.mode.asynchronous.free" configurationId="sci8.mode"/>
+      <configSetting altId="sci8.rxd.p607" configurationId="sci8.rxd"/>
+      <configSetting altId="sci8.txd.pa00" configurationId="sci8.txd"/>
+      <configSetting altId="sci9.mode.asynchronous.free" configurationId="sci9.mode"/>
+      <configSetting altId="sci9.rxd.p110" configurationId="sci9.rxd"/>
+      <configSetting altId="sci9.txd.p602" configurationId="sci9.txd"/>
+    </pincfg>
+  </raPinConfiguration>
+</raConfiguration>

From 57f76f4c62617b9ef19f3aa0b41f276e90c525e0 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 31 May 2024 11:11:33 +0900
Subject: [PATCH 1461/3129] renesas-ra/boards: Add configuration.xml for
 auto-generated files.

* configuration.xml: Generated by RA Smart Configurator for FSP 4.4.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 .../boards/EK_RA4M1/configuration.xml         | 606 ++++++++++++
 .../boards/EK_RA4W1/configuration.xml         | 662 +++++++++++++
 .../boards/EK_RA6M1/configuration.xml         | 826 ++++++++++++++++
 .../boards/EK_RA6M2/configuration.xml         | 915 ++++++++++++++++++
 .../boards/RA4M1_CLICKER/configuration.xml    | 579 +++++++++++
 5 files changed, 3588 insertions(+)
 create mode 100644 ports/renesas-ra/boards/EK_RA4M1/configuration.xml
 create mode 100644 ports/renesas-ra/boards/EK_RA4W1/configuration.xml
 create mode 100644 ports/renesas-ra/boards/EK_RA6M1/configuration.xml
 create mode 100644 ports/renesas-ra/boards/EK_RA6M2/configuration.xml
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/configuration.xml

diff --git a/ports/renesas-ra/boards/EK_RA4M1/configuration.xml b/ports/renesas-ra/boards/EK_RA4M1/configuration.xml
new file mode 100644
index 0000000000000..ca5a3e52f0720
--- /dev/null
+++ b/ports/renesas-ra/boards/EK_RA4M1/configuration.xml
@@ -0,0 +1,606 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<raConfiguration version="7">
+  <generalSettings>
+    <option key="#Board#" value="board.ra4m1ek"/>
+    <option key="CPU" value="RA4M1"/>
+    <option key="Core" value="CM4"/>
+    <option key="#TargetName#" value="R7FA4M1AB3CFP"/>
+    <option key="#TargetARCHITECTURE#" value="cortex-m4"/>
+    <option key="#DeviceCommand#" value="R7FA4M1AB"/>
+    <option key="#RTOS#" value="_none"/>
+    <option key="#pinconfiguration#" value="RA4M1-EK.pincfg"/>
+    <option key="#FSPVersion#" value="4.4.0"/>
+    <option key="#ConfigurationFragments#" value="Renesas##BSP##Board##ra4m1_ek##"/>
+    <option key="#SELECTED_TOOLCHAIN#" value="gcc-arm-embedded"/>
+    <option key="#ToolchainVersion#" value="9.2.1.20191025"/>
+  </generalSettings>
+  <raBspConfiguration>
+    <config id="config.bsp.ra4m1.R7FA4M1AB3CFP">
+      <property id="config.bsp.part_number" value="config.bsp.part_number.value"/>
+      <property id="config.bsp.rom_size_bytes" value="config.bsp.rom_size_bytes.value"/>
+      <property id="config.bsp.rom_size_bytes_hidden" value="262144"/>
+      <property id="config.bsp.ram_size_bytes" value="config.bsp.ram_size_bytes.value"/>
+      <property id="config.bsp.data_flash_size_bytes" value="config.bsp.data_flash_size_bytes.value"/>
+      <property id="config.bsp.package_style" value="config.bsp.package_style.value"/>
+      <property id="config.bsp.package_pins" value="config.bsp.package_pins.value"/>
+      <property id="config.bsp.irq_count_hidden" value="32"/>
+    </config>
+    <config id="config.bsp.ra4m1">
+      <property id="config.bsp.series" value="config.bsp.series.value"/>
+    </config>
+    <config id="config.bsp.ra4m1.fsp">
+      <property id="config.bsp.fsp.OFS0.iwdt_start_mode" value="config.bsp.fsp.OFS0.iwdt_start_mode.disabled"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_timeout" value="config.bsp.fsp.OFS0.iwdt_timeout.2048"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_divisor" value="config.bsp.fsp.OFS0.iwdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_end" value="config.bsp.fsp.OFS0.iwdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_start" value="config.bsp.fsp.OFS0.iwdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_reset_interrupt" value="config.bsp.fsp.OFS0.iwdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_stop_control" value="config.bsp.fsp.OFS0.iwdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS0.wdt_start_mode" value="config.bsp.fsp.OFS0.wdt_start_mode.register"/>
+      <property id="config.bsp.fsp.OFS0.wdt_timeout" value="config.bsp.fsp.OFS0.wdt_timeout.16384"/>
+      <property id="config.bsp.fsp.OFS0.wdt_divisor" value="config.bsp.fsp.OFS0.wdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_end" value="config.bsp.fsp.OFS0.wdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_start" value="config.bsp.fsp.OFS0.wdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.wdt_reset_interrupt" value="config.bsp.fsp.OFS0.wdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.wdt_stop_control" value="config.bsp.fsp.OFS0.wdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0.start" value="config.bsp.fsp.OFS1.voltage_detection0.start.disabled"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0_level" value="config.bsp.fsp.OFS1.voltage_detection0_level.190"/>
+      <property id="config.bsp.fsp.OFS1.hoco_osc" value="config.bsp.fsp.OFS1.hoco_osc.enabled"/>
+      <property id="config.bsp.low_voltage_mode" value="config.bsp.low_voltage_mode.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_enable" value="config.bsp.fsp.mpu_pc0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_pc1_enable" value="config.bsp.fsp.mpu_pc1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc1_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc1_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg0_enable" value="config.bsp.fsp.mpu_reg0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg1_enable" value="config.bsp.fsp.mpu_reg1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg1_start" value="0x200FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg1_end" value="0x200FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg2_enable" value="config.bsp.fsp.mpu_reg2_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg2_start" value="0x407FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg2_end" value="0x407FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg3_enable" value="config.bsp.fsp.mpu_reg3_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg3_start" value="0x400DFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg3_end" value="0x400DFFFF"/>
+      <property id="config.bsp.common.main_osc_wait" value="config.bsp.common.main_osc_wait.wait_8163"/>
+      <property id="config.bsp.fsp.mcu.adc.max_freq_hz" value="64000000"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.max_baud" value="6666666"/>
+      <property id="config.bsp.fsp.mcu.adc.sample_and_hold" value="0"/>
+      <property id="config.bsp.fsp.mcu.sci_spi.max_bitrate" value="12000000"/>
+      <property id="config.bsp.fsp.mcu.spi.max_bitrate" value="24000000"/>
+      <property id="config.bsp.fsp.mcu.iic_master.rate.rate_fastplus" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_master.fastplus_channels" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.rate.rate_fastplus" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.fastplus_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.cstpen_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.gpt.pin_count_source_channels" value="0xFFFF"/>
+      <property id="config.bsp.fsp.mcu.slcdc.1_4_bias_method" value="1"/>
+      <property id="config.bsp.common.id_mode" value="config.bsp.common.id_mode.unlocked"/>
+      <property id="config.bsp.common.id_code" value="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/>
+      <property id="config.bsp.common.id1" value=""/>
+      <property id="config.bsp.common.id2" value=""/>
+      <property id="config.bsp.common.id3" value=""/>
+      <property id="config.bsp.common.id4" value=""/>
+      <property id="config.bsp.common.id_fixed" value=""/>
+    </config>
+    <config id="config.bsp.ra">
+      <property id="config.bsp.common.main" value="0x1000"/>
+      <property id="config.bsp.common.heap" value="0x4980"/>
+      <property id="config.bsp.common.vcc" value="3300"/>
+      <property id="config.bsp.common.checking" value="config.bsp.common.checking.disabled"/>
+      <property id="config.bsp.common.assert" value="config.bsp.common.assert.none"/>
+      <property id="config.bsp.common.error_log" value="config.bsp.common.error_log.none"/>
+      <property id="config.bsp.common.soft_reset" value="config.bsp.common.soft_reset.disabled"/>
+      <property id="config.bsp.common.main_osc_populated" value="config.bsp.common.main_osc_populated.enabled"/>
+      <property id="config.bsp.common.pfs_protect" value="config.bsp.common.pfs_protect.enabled"/>
+      <property id="config.bsp.common.c_runtime_init" value="config.bsp.common.c_runtime_init.enabled"/>
+      <property id="config.bsp.common.early_init" value="config.bsp.common.early_init.disabled"/>
+      <property id="config.bsp.common.main_osc_clock_source" value="config.bsp.common.main_osc_clock_source.crystal"/>
+      <property id="config.bsp.common.subclock_populated" value="config.bsp.common.subclock_populated.enabled"/>
+      <property id="config.bsp.common.subclock_drive" value="config.bsp.common.subclock_drive.standard"/>
+      <property id="config.bsp.common.subclock_stabilization_ms" value="1000"/>
+    </config>
+  </raBspConfiguration>
+  <raClockConfiguration>
+    <node id="board.clock.xtal.freq" mul="12000000" option="_edit"/>
+    <node id="board.clock.pll.source" option="board.clock.pll.source.xtal"/>
+    <node id="board.clock.hoco.freq" option="board.clock.hoco.freq.24m"/>
+    <node id="board.clock.loco.freq" option="board.clock.loco.freq.32768"/>
+    <node id="board.clock.moco.freq" option="board.clock.moco.freq.8m"/>
+    <node id="board.clock.subclk.freq" option="board.clock.subclk.freq.32768"/>
+    <node id="board.clock.pll.div" option="board.clock.pll.div.2"/>
+    <node id="board.clock.pll.mul" option="board.clock.pll.mul.8"/>
+    <node id="board.clock.pll.display" option="board.clock.pll.display.value"/>
+    <node id="board.clock.clock.source" option="board.clock.clock.source.pll"/>
+    <node id="board.clock.iclk.div" option="board.clock.iclk.div.1"/>
+    <node id="board.clock.iclk.display" option="board.clock.iclk.display.value"/>
+    <node id="board.clock.pclka.div" option="board.clock.pclka.div.1"/>
+    <node id="board.clock.pclka.display" option="board.clock.pclka.display.value"/>
+    <node id="board.clock.pclkb.div" option="board.clock.pclkb.div.2"/>
+    <node id="board.clock.pclkb.display" option="board.clock.pclkb.display.value"/>
+    <node id="board.clock.pclkc.div" option="board.clock.pclkc.div.1"/>
+    <node id="board.clock.pclkc.display" option="board.clock.pclkc.display.value"/>
+    <node id="board.clock.pclkd.div" option="board.clock.pclkd.div.1"/>
+    <node id="board.clock.pclkd.display" option="board.clock.pclkd.display.value"/>
+    <node id="board.clock.fclk.div" option="board.clock.fclk.div.2"/>
+    <node id="board.clock.fclk.display" option="board.clock.fclk.display.value"/>
+    <node id="board.clock.clkout.source" option="board.clock.clkout.source.disabled"/>
+    <node id="board.clock.clkout.div" option="board.clock.clkout.div.1"/>
+    <node id="board.clock.clkout.display" option="board.clock.clkout.display.value"/>
+    <node id="board.clock.uclk.source" option="board.clock.uclk.source.pll"/>
+    <node id="board.clock.uclk.display" option="board.clock.clkout.display.value"/>
+  </raClockConfiguration>
+  <raComponentSelection>
+    <component apiversion="" class="BSP" condition="" group="Board" subgroup="ra4m1_ek" variant="" vendor="Renesas" version="4.4.0">
+      <description>RA4M1-EK Board Support Files</description>
+      <originalPack>Renesas.RA_board_ra4m1_ek.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.9.0+renesas.0.fsp.4.4.0">
+      <description>Arm CMSIS Version 5 - Core (M)</description>
+      <originalPack>Arm.CMSIS5.5.9.0+renesas.0.fsp.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board Support Package Common Files</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_adc" variant="" vendor="Renesas" version="4.4.0">
+      <description>A/D Converter</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_agt" variant="" vendor="Renesas" version="4.4.0">
+      <description>Asynchronous General Purpose Timer</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Data Transfer Controller</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_flash_lp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Flash Memory Low Power</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="4.4.0">
+      <description>External Interrupt</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="4.4.0">
+      <description>I/O Port</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_lpm" variant="" vendor="Renesas" version="4.4.0">
+      <description>Low Power Modes</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_rtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Real Time Clock</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="4.4.0">
+      <description>SCI UART</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_spi" variant="" vendor="Renesas" version="4.4.0">
+      <description>Serial Peripheral Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4m1" subgroup="device" variant="R7FA4M1AB3CFP" vendor="Renesas" version="4.4.0">
+      <description>Board support package for R7FA4M1AB3CFP</description>
+      <originalPack>Renesas.RA_mcu_ra4m1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4m1" subgroup="device" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA4M1</description>
+      <originalPack>Renesas.RA_mcu_ra4m1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4m1" subgroup="fsp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA4M1 - FSP Data</description>
+      <originalPack>Renesas.RA_mcu_ra4m1.4.4.0.pack</originalPack>
+    </component>
+  </raComponentSelection>
+  <raElcConfiguration/>
+  <raIcuConfiguration/>
+  <raModuleConfiguration>
+    <module id="module.driver.ioport_on_ioport.0">
+      <property id="module.driver.ioport.name" value="g_ioport"/>
+      <property id="module.driver.ioport.elc_trigger_ioport1" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport2" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport3" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport4" value="_disabled"/>
+      <property id="module.driver.ioport.pincfg" value="g_bsp_pin_cfg"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.521925851">
+      <property id="module.driver.uart.name" value="g_uart0"/>
+      <property id="module.driver.uart.channel" value="0"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.880324389">
+      <property id="module.driver.uart.name" value="g_uart1"/>
+      <property id="module.driver.uart.channel" value="1"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.667490168">
+      <property id="module.driver.uart.name" value="g_uart2"/>
+      <property id="module.driver.uart.channel" value="2"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.rtc_on_rtc.873204757">
+      <property id="module.driver.rtc.name" value="g_rtc0"/>
+      <property id="module.driver.rtc.clock_source" value="module.driver.rtc.clock_source.clock_source_loco"/>
+      <property id="module.driver.rtc.freq_cmpr_value_loco" value="255"/>
+      <property id="module.driver.rtc.err_adjustment_mode" value="module.driver.rtc.err_adjustment_mode.m1"/>
+      <property id="module.driver.rtc.err_adjustment_period" value="module.driver.rtc.err_adjustment_period.p1"/>
+      <property id="module.driver.rtc.err_adjustment_type" value="module.driver.rtc.err_adjustment_type.t1"/>
+      <property id="module.driver.rtc.err_adjustment_value" value="0"/>
+      <property id="module.driver.rtc.p_callback" value="NULL"/>
+      <property id="module.driver.rtc.alarm_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.periodic_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.carry_ipl" value="board.icu.common.irq.priority14"/>
+    </module>
+    <module id="module.driver.flash_on_flash_lp.1878448133">
+      <property id="module.driver.flash.name" value="g_flash0"/>
+      <property id="module.driver.flash.data_flash_bgo" value="module.driver.flash.data_flash_bgo.disabled"/>
+      <property id="module.driver.flash.p_callback" value="NULL"/>
+      <property id="module.driver.flash.ipl" value="_disabled"/>
+    </module>
+    <module id="module.driver.timer_on_agt.1010487232">
+      <property id="module.driver.timer.name" value="g_timer0"/>
+      <property id="module.driver.timer.channel" value="0"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.810309037">
+      <property id="module.driver.external_irq.name" value="g_external_irq0"/>
+      <property id="module.driver.external_irq.channel" value="0"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.spi_on_spi.1190513544">
+      <property id="module.driver.spi.name" value="g_spi0"/>
+      <property id="module.driver.spi.channel" value="0"/>
+      <property id="module.driver.spi.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.eri_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.operating_mode" value="module.driver.spi.operating_mode.mode_master"/>
+      <property id="module.driver.spi.clk_phase" value="module.driver.spi.clk_phase.clk_phase_edge_odd"/>
+      <property id="module.driver.spi.clk_polarity" value="module.driver.spi.clk_polarity.clk_polarity_low"/>
+      <property id="module.driver.spi.mode_fault" value="module.driver.spi.mode_fault.mode_fault_error_disable"/>
+      <property id="module.driver.spi.bit_order" value="module.driver.spi.bit_order.bit_order_msb_first"/>
+      <property id="module.driver.spi.p_callback" value="spi_callback"/>
+      <property id="module.driver.spi.spi_clksyn" value="module.driver.spi.spi_clksyn.spi_clksyn"/>
+      <property id="module.driver.spi.spi_comm" value="module.driver.spi.spi_comm.full_duplex"/>
+      <property id="module.driver.spi.ssl_polarity" value="module.driver.spi.ssl_polarity.low"/>
+      <property id="module.driver.spi.ssl_select" value="module.driver.spi.ssl_select.zero"/>
+      <property id="module.driver.spi.mosi_idle_value_fixing" value="module.driver.spi.mosi_idle_value_fixing.disable"/>
+      <property id="module.driver.spi.parity" value="module.driver.spi.parity_mode.disable"/>
+      <property id="module.driver.spi.byte_swap" value="module.driver.spi.byte_swap.disable"/>
+      <property id="module.driver.spi.bitrate" value="16000000"/>
+      <property id="module.driver.spi.spck_delay" value="module.driver.spi.spck_delay.one"/>
+      <property id="module.driver.spi.ssl_negation_delay" value="module.driver.spi.ssl_negation_delay.one"/>
+      <property id="module.driver.spi.next_access_delay" value="module.driver.spi.next_access_delay.one"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1732781369">
+      <property id="module.driver.transfer.name" value="g_transfer0"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1712398753">
+      <property id="module.driver.transfer.name" value="g_transfer1"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.lpm.743498026">
+      <property id="module.driver.lpm.name" value="g_lpm0"/>
+      <property id="module.driver.lpm.mode" value="module.driver.lpm.mode.sleep"/>
+      <property id="module.driver.lpm.output_port_enable_standby" value="module.driver.lpm.output_port_enable_standby.no_change"/>
+      <property id="module.driver.lpm.standby_wake_sources" value="module.driver.lpm.standby_wake_rtcalm"/>
+      <property id="module.driver.lpm.snooze_request" value="module.driver.lpm.snooze_request_rxd0_falling"/>
+      <property id="module.driver.lpm.snooze_end_sources" value=""/>
+      <property id="module.driver.lpm.snooze_dtc" value="module.driver.lpm.snooze_dtc.lpm_snooze_dtc_disable"/>
+      <property id="module.driver.lpm.snooze_cancel_source" value="enum.mcu.lpm.snooze_cancel_source.none"/>
+      <property id="module.driver.lpm.ram_power_enable" value=""/>
+      <property id="module.driver.lpm.tcm_power_enable" value="enum.mcu.lpm.tcm_power_enable.disable"/>
+      <property id="module.driver.lpm.standby_ram_power_enable" value="enum.mcu.lpm.standby_ram_power_enable.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll1" value="enum.mcu.lpm.oscillator_ldo_state.pll1.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll2" value="enum.mcu.lpm.oscillator_ldo_state.pll2.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.hoco" value="enum.mcu.lpm.oscillator_ldo_state.hoco.disable"/>
+      <property id="module.driver.lpm.io_port_deep_standby_exit" value="module.driver.lpm.io_port_deep_standby_exit.no_change"/>
+      <property id="module.driver.lpm.power_supply_deep_standby" value="module.driver.lpm.power_supply_deep_standby.deepcut0"/>
+      <property id="module.driver.lpm.deep_standby_cancel_sources" value=""/>
+      <property id="module.driver.lpm.deep_standby_cancel_edges" value=""/>
+    </module>
+    <module id="module.driver.adc_on_adc.1788240324">
+      <property id="module.driver.adc.name" value="g_adc0"/>
+      <property id="module.driver.adc.unit" value="0"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_14_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.avcc0_avss0"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <context id="_hal.0">
+      <stack module="module.driver.ioport_on_ioport.0"/>
+      <stack module="module.driver.uart_on_sci_uart.521925851"/>
+      <stack module="module.driver.uart_on_sci_uart.880324389"/>
+      <stack module="module.driver.uart_on_sci_uart.667490168"/>
+      <stack module="module.driver.rtc_on_rtc.873204757"/>
+      <stack module="module.driver.flash_on_flash_lp.1878448133"/>
+      <stack module="module.driver.timer_on_agt.1010487232"/>
+      <stack module="module.driver.external_irq_on_icu.810309037"/>
+      <stack module="module.driver.spi_on_spi.1190513544">
+        <stack module="module.driver.transfer_on_dtc.1732781369" requires="module.driver.spi_on_spi.requires.transfer_tx"/>
+        <stack module="module.driver.transfer_on_dtc.1712398753" requires="module.driver.spi_on_spi.requires.transfer_rx"/>
+      </stack>
+      <stack module="module.driver.lpm.743498026"/>
+      <stack module="module.driver.adc_on_adc.1788240324"/>
+    </context>
+    <config id="config.driver.lpm">
+      <property id="config.driver.lpm.param_checking_enable" value="config.driver.lpm.param_checking_enable.bsp"/>
+      <property id="config.driver.lpm.standby_limit" value="config.driver.lpm.standby_limit.disabled"/>
+    </config>
+    <config id="config.driver.ioport">
+      <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
+    </config>
+    <config id="config.driver.adc">
+      <property id="config.driver.adc.param_checking_enable" value="config.driver.adc.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.icu">
+      <property id="config.driver.icu.param_checking_enable" value="config.driver.icu.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.agt">
+      <property id="config.driver.agt.param_checking_enable" value="config.driver.agt.param_checking_enable.bsp"/>
+      <property id="config.driver.agt.output_support_enable" value="config.driver.agt.output_support_enable.disabled"/>
+      <property id="config.driver.agt.input_support_enable" value="config.driver.agt.input_support_enable.disabled"/>
+    </config>
+    <config id="config.driver.dtc">
+      <property id="config.driver.dtc.param_checking_enable" value="config.driver.dtc.param_checking_enable.bsp"/>
+      <property id="config.driver.dtc.vector_table" value=".fsp_dtc_vector_table"/>
+    </config>
+    <config id="config.driver.flash_lp">
+      <property id="config.driver.flash_lp.param_checking_enable" value="config.flash_lp.param_checking_enable.bsp"/>
+      <property id="config.driver.flash_lp.param_code_flash_programming_enable" value="config.driver.flash_lp.param_code_flash_programming_enable.enabled"/>
+      <property id="config.driver.flash_lp.param_data_flash_programming_enable" value="config.driver.flash_lp.param_data_flash_programming_enable.disabled"/>
+    </config>
+    <config id="config.driver.sci_uart">
+      <property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
+      <property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>
+      <property id="config.driver.sci_uart.dtc_support" value="config.driver.sci_uart.dtc_support.disabled"/>
+      <property id="config.driver.sci_uart.flow_control" value="config.driver.sci_uart.flow_control.disabled"/>
+      <property id="config.driver.sci_uart.rs485" value="config.driver.sci_uart.rs485.disabled"/>
+    </config>
+    <config id="config.driver.rtc">
+      <property id="config.driver.rtc.param_checking_enable" value="config.driver.rtc.param_checking_enable.bsp"/>
+      <property id="config.driver.rtc.open_set_source_clock" value="config.driver.rtc.open_set_source_clock.enabled"/>
+    </config>
+    <config id="config.driver.spi">
+      <property id="config.driver.spi.param_checking_enable" value="config.driver.spi.param_checking_enable.bsp"/>
+      <property id="config.driver.spi.dtc_enable" value="config.driver.spi.dtc_enable.enabled"/>
+      <property id="config.driver.spi.rxi_transmit" value="config.driver.spi.rxi_transmit.disabled"/>
+    </config>
+  </raModuleConfiguration>
+  <raPinConfiguration>
+    <pincfg active="true" name="RA4M1-EK.pincfg" selected="true" symbol="g_bsp_pin_cfg">
+      <configSetting altId="adc0.an00.p000" configurationId="adc0.an00"/>
+      <configSetting altId="adc0.mode.custom" configurationId="adc0.mode"/>
+      <configSetting altId="ctsu0.mode.enabled" configurationId="ctsu0.mode"/>
+      <configSetting altId="ctsu0.ts35.p115" configurationId="ctsu0.ts35"/>
+      <configSetting altId="ctsu0.tscap.p205" configurationId="ctsu0.tscap"/>
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="p000.adc0.an00" configurationId="p000"/>
+      <configSetting altId="p000.gpio_mode.gpio_mode_an" configurationId="p000.gpio_mode"/>
+      <configSetting altId="p100.spi0.miso" configurationId="p100"/>
+      <configSetting altId="p100.gpio_mode.gpio_mode_peripheral" configurationId="p100.gpio_mode"/>
+      <configSetting altId="p101.spi0.mosi" configurationId="p101"/>
+      <configSetting altId="p101.gpio_mode.gpio_mode_peripheral" configurationId="p101.gpio_mode"/>
+      <configSetting altId="p102.spi0.rspck" configurationId="p102"/>
+      <configSetting altId="p102.gpio_mode.gpio_mode_peripheral" configurationId="p102.gpio_mode"/>
+      <configSetting altId="p103.spi0.ssl0" configurationId="p103"/>
+      <configSetting altId="p103.gpio_mode.gpio_mode_peripheral" configurationId="p103.gpio_mode"/>
+      <configSetting altId="p105.input" configurationId="p105"/>
+      <configSetting altId="p105.gpio_irq.gpio_irq_enabled" configurationId="p105.gpio_irq"/>
+      <configSetting altId="p105.gpio_mode.gpio_mode_in" configurationId="p105.gpio_mode"/>
+      <configSetting altId="p106.output.low" configurationId="p106"/>
+      <configSetting altId="p106.gpio_mode.gpio_mode_out.low" configurationId="p106.gpio_mode"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p115.ctsu0.ts35" configurationId="p115"/>
+      <configSetting altId="p115.gpio_mode.gpio_mode_peripheral" configurationId="p115.gpio_mode"/>
+      <configSetting altId="p205.ctsu0.tscap" configurationId="p205"/>
+      <configSetting altId="p205.gpio_mode.gpio_mode_peripheral" configurationId="p205.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+      <configSetting altId="p301.sci2.rxd" configurationId="p301"/>
+      <configSetting altId="p301.gpio_mode.gpio_mode_peripheral" configurationId="p301.gpio_mode"/>
+      <configSetting altId="p302.sci2.txd" configurationId="p302"/>
+      <configSetting altId="p302.gpio_mode.gpio_mode_peripheral" configurationId="p302.gpio_mode"/>
+      <configSetting altId="p400.output.low" configurationId="p400"/>
+      <configSetting altId="p400.gpio_mode.gpio_mode_out.low" configurationId="p400.gpio_mode"/>
+      <configSetting altId="p401.sci1.txd" configurationId="p401"/>
+      <configSetting altId="p401.gpio_mode.gpio_mode_peripheral" configurationId="p401.gpio_mode"/>
+      <configSetting altId="p402.sci1.rxd" configurationId="p402"/>
+      <configSetting altId="p402.gpio_mode.gpio_mode_peripheral" configurationId="p402.gpio_mode"/>
+      <configSetting altId="p403.output.low" configurationId="p403"/>
+      <configSetting altId="p403.gpio_mode.gpio_mode_out.low" configurationId="p403.gpio_mode"/>
+      <configSetting altId="p407.usbfs0.vbus" configurationId="p407"/>
+      <configSetting altId="p407.gpio_mode.gpio_mode_peripheral" configurationId="p407.gpio_mode"/>
+      <configSetting altId="p410.sci0.rxd" configurationId="p410"/>
+      <configSetting altId="p410.gpio_mode.gpio_mode_peripheral" configurationId="p410.gpio_mode"/>
+      <configSetting altId="p411.sci0.txd" configurationId="p411"/>
+      <configSetting altId="p411.gpio_mode.gpio_mode_peripheral" configurationId="p411.gpio_mode"/>
+      <configSetting altId="p914.usbfs0.usbdp" configurationId="p914"/>
+      <configSetting altId="p914.gpio_mode.gpio_mode_peripheral" configurationId="p914.gpio_mode"/>
+      <configSetting altId="p915.usbfs0.usbdm" configurationId="p915"/>
+      <configSetting altId="p915.gpio_mode.gpio_mode_peripheral" configurationId="p915.gpio_mode"/>
+      <configSetting altId="sci0.mode.asynchronous.b" configurationId="sci0.mode"/>
+      <configSetting altId="sci0.pairing.b" configurationId="sci0.pairing"/>
+      <configSetting altId="sci0.rxd.p410" configurationId="sci0.rxd"/>
+      <configSetting altId="sci0.txd.p411" configurationId="sci0.txd"/>
+      <configSetting altId="sci1.mode.asynchronous.b" configurationId="sci1.mode"/>
+      <configSetting altId="sci1.pairing.b" configurationId="sci1.pairing"/>
+      <configSetting altId="sci1.rxd.p402" configurationId="sci1.rxd"/>
+      <configSetting altId="sci1.txd.p401" configurationId="sci1.txd"/>
+      <configSetting altId="sci2.mode.asynchronous.a" configurationId="sci2.mode"/>
+      <configSetting altId="sci2.pairing.a" configurationId="sci2.pairing"/>
+      <configSetting altId="sci2.rxd.p301" configurationId="sci2.rxd"/>
+      <configSetting altId="sci2.txd.p302" configurationId="sci2.txd"/>
+      <configSetting altId="spi0.miso.p100" configurationId="spi0.miso"/>
+      <configSetting altId="spi0.mode.enabled.a" configurationId="spi0.mode"/>
+      <configSetting altId="spi0.mosi.p101" configurationId="spi0.mosi"/>
+      <configSetting altId="spi0.rspck.p102" configurationId="spi0.rspck"/>
+      <configSetting altId="spi0.ssl0.p103" configurationId="spi0.ssl0"/>
+      <configSetting altId="usbfs0.mode.device" configurationId="usbfs0.mode"/>
+      <configSetting altId="usbfs0.usbdm.p915" configurationId="usbfs0.usbdm"/>
+      <configSetting altId="usbfs0.usbdp.p914" configurationId="usbfs0.usbdp"/>
+      <configSetting altId="usbfs0.vbus.p407" configurationId="usbfs0.vbus"/>
+    </pincfg>
+    <pincfg active="false" name="R7FA4M1AB3CFP.pincfg" selected="false" symbol="">
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+    </pincfg>
+  </raPinConfiguration>
+</raConfiguration>
diff --git a/ports/renesas-ra/boards/EK_RA4W1/configuration.xml b/ports/renesas-ra/boards/EK_RA4W1/configuration.xml
new file mode 100644
index 0000000000000..e99da13bcb3ee
--- /dev/null
+++ b/ports/renesas-ra/boards/EK_RA4W1/configuration.xml
@@ -0,0 +1,662 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<raConfiguration version="7">
+  <generalSettings>
+    <option key="#Board#" value="board.ra4w1ek"/>
+    <option key="CPU" value="RA4W1"/>
+    <option key="Core" value="CM4"/>
+    <option key="#TargetName#" value="R7FA4W1AD2CNG"/>
+    <option key="#TargetARCHITECTURE#" value="cortex-m4"/>
+    <option key="#DeviceCommand#" value="R7FA4W1AD"/>
+    <option key="#RTOS#" value="_none"/>
+    <option key="#pinconfiguration#" value="RA4W1-EK.pincfg"/>
+    <option key="#FSPVersion#" value="4.4.0"/>
+    <option key="#ConfigurationFragments#" value="Renesas##BSP##Board##ra4w1_ek##"/>
+    <option key="#SELECTED_TOOLCHAIN#" value="gcc-arm-embedded"/>
+    <option key="#ToolchainVersion#" value="9.2.1.20191025"/>
+  </generalSettings>
+  <raBspConfiguration>
+    <config id="config.bsp.ra4w1.R7FA4W1AD2CNG">
+      <property id="config.bsp.part_number" value="config.bsp.part_number.value"/>
+      <property id="config.bsp.rom_size_bytes" value="config.bsp.rom_size_bytes.value"/>
+      <property id="config.bsp.rom_size_bytes_hidden" value="524288"/>
+      <property id="config.bsp.ram_size_bytes" value="config.bsp.ram_size_bytes.value"/>
+      <property id="config.bsp.data_flash_size_bytes" value="config.bsp.data_flash_size_bytes.value"/>
+      <property id="config.bsp.package_style" value="config.bsp.package_style.value"/>
+      <property id="config.bsp.package_pins" value="config.bsp.package_pins.value"/>
+      <property id="config.bsp.irq_count_hidden" value="32"/>
+    </config>
+    <config id="config.bsp.ra4w1">
+      <property id="config.bsp.series" value="config.bsp.series.value"/>
+    </config>
+    <config id="config.bsp.ra4w1.fsp">
+      <property id="config.bsp.fsp.OFS0.iwdt_start_mode" value="config.bsp.fsp.OFS0.iwdt_start_mode.disabled"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_timeout" value="config.bsp.fsp.OFS0.iwdt_timeout.2048"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_divisor" value="config.bsp.fsp.OFS0.iwdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_end" value="config.bsp.fsp.OFS0.iwdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_start" value="config.bsp.fsp.OFS0.iwdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_reset_interrupt" value="config.bsp.fsp.OFS0.iwdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_stop_control" value="config.bsp.fsp.OFS0.iwdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS0.wdt_start_mode" value="config.bsp.fsp.OFS0.wdt_start_mode.register"/>
+      <property id="config.bsp.fsp.OFS0.wdt_timeout" value="config.bsp.fsp.OFS0.wdt_timeout.16384"/>
+      <property id="config.bsp.fsp.OFS0.wdt_divisor" value="config.bsp.fsp.OFS0.wdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_end" value="config.bsp.fsp.OFS0.wdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_start" value="config.bsp.fsp.OFS0.wdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.wdt_reset_interrupt" value="config.bsp.fsp.OFS0.wdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.wdt_stop_control" value="config.bsp.fsp.OFS0.wdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0.start" value="config.bsp.fsp.OFS1.voltage_detection0.start.disabled"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0_level" value="config.bsp.fsp.OFS1.voltage_detection0_level.190"/>
+      <property id="config.bsp.fsp.OFS1.hoco_osc" value="config.bsp.fsp.OFS1.hoco_osc.disabled"/>
+      <property id="config.bsp.low_voltage_mode" value="config.bsp.low_voltage_mode.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_enable" value="config.bsp.fsp.mpu_pc0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_pc1_enable" value="config.bsp.fsp.mpu_pc1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc1_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc1_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg0_enable" value="config.bsp.fsp.mpu_reg0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg1_enable" value="config.bsp.fsp.mpu_reg1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg1_start" value="0x200FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg1_end" value="0x200FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg2_enable" value="config.bsp.fsp.mpu_reg2_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg2_start" value="0x407FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg2_end" value="0x407FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg3_enable" value="config.bsp.fsp.mpu_reg3_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg3_start" value="0x400DFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg3_end" value="0x400DFFFF"/>
+      <property id="config.bsp.common.main_osc_wait" value="config.bsp.common.main_osc_wait.wait_8163"/>
+      <property id="config.bsp.fsp.mcu.adc.max_freq_hz" value="64000000"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.max_baud" value="6666666"/>
+      <property id="config.bsp.fsp.mcu.adc.sample_and_hold" value="0"/>
+      <property id="config.bsp.fsp.mcu.sci_spi.max_bitrate" value="12000000"/>
+      <property id="config.bsp.fsp.mcu.spi.max_bitrate" value="16000000"/>
+      <property id="config.bsp.fsp.mcu.iic_master.rate.rate_fastplus" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_master.fastplus_channels" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.rate.rate_fastplus" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.fastplus_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.cstpen_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.gpt.pin_count_source_channels" value="0xFFFF"/>
+      <property id="config.bsp.fsp.mcu.slcdc.1_4_bias_method" value="0"/>
+      <property id="config.bsp.common.id_mode" value="config.bsp.common.id_mode.unlocked"/>
+      <property id="config.bsp.common.id_code" value="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/>
+      <property id="config.bsp.common.id1" value=""/>
+      <property id="config.bsp.common.id2" value=""/>
+      <property id="config.bsp.common.id3" value=""/>
+      <property id="config.bsp.common.id4" value=""/>
+      <property id="config.bsp.common.id_fixed" value=""/>
+    </config>
+    <config id="config.bsp.ra">
+      <property id="config.bsp.common.main" value="0x4000"/>
+      <property id="config.bsp.common.heap" value="0xf000"/>
+      <property id="config.bsp.common.vcc" value="3300"/>
+      <property id="config.bsp.common.checking" value="config.bsp.common.checking.disabled"/>
+      <property id="config.bsp.common.assert" value="config.bsp.common.assert.none"/>
+      <property id="config.bsp.common.error_log" value="config.bsp.common.error_log.none"/>
+      <property id="config.bsp.common.soft_reset" value="config.bsp.common.soft_reset.disabled"/>
+      <property id="config.bsp.common.main_osc_populated" value="config.bsp.common.main_osc_populated.disabled"/>
+      <property id="config.bsp.common.pfs_protect" value="config.bsp.common.pfs_protect.enabled"/>
+      <property id="config.bsp.common.c_runtime_init" value="config.bsp.common.c_runtime_init.enabled"/>
+      <property id="config.bsp.common.early_init" value="config.bsp.common.early_init.disabled"/>
+      <property id="config.bsp.common.main_osc_clock_source" value="config.bsp.common.main_osc_clock_source.crystal"/>
+      <property id="config.bsp.common.subclock_populated" value="config.bsp.common.subclock_populated.disabled"/>
+      <property id="config.bsp.common.subclock_drive" value="config.bsp.common.subclock_drive.standard"/>
+      <property id="config.bsp.common.subclock_stabilization_ms" value="1000"/>
+    </config>
+  </raBspConfiguration>
+  <raClockConfiguration>
+    <node id="board.clock.xtal.freq" mul="8000000" option="_edit"/>
+    <node id="board.clock.pll.source" option="board.clock.pll.source.xtal"/>
+    <node id="board.clock.hoco.freq" option="board.clock.hoco.freq.48m"/>
+    <node id="board.clock.loco.freq" option="board.clock.loco.freq.32768"/>
+    <node id="board.clock.moco.freq" option="board.clock.moco.freq.8m"/>
+    <node id="board.clock.subclk.freq" option="board.clock.subclk.freq.32768"/>
+    <node id="board.clock.pll.div" option="board.clock.pll.div.2"/>
+    <node id="board.clock.pll.mul" option="board.clock.pll.mul.12"/>
+    <node id="board.clock.pll.display" option="board.clock.pll.display.value"/>
+    <node id="board.clock.clock.source" option="board.clock.clock.source.hoco"/>
+    <node id="board.clock.iclk.div" option="board.clock.iclk.div.1"/>
+    <node id="board.clock.iclk.display" option="board.clock.iclk.display.value"/>
+    <node id="board.clock.pclka.div" option="board.clock.pclka.div.1"/>
+    <node id="board.clock.pclka.display" option="board.clock.pclka.display.value"/>
+    <node id="board.clock.pclkb.div" option="board.clock.pclkb.div.2"/>
+    <node id="board.clock.pclkb.display" option="board.clock.pclkb.display.value"/>
+    <node id="board.clock.pclkc.div" option="board.clock.pclkc.div.1"/>
+    <node id="board.clock.pclkc.display" option="board.clock.pclkc.display.value"/>
+    <node id="board.clock.pclkd.div" option="board.clock.pclkd.div.1"/>
+    <node id="board.clock.pclkd.display" option="board.clock.pclkd.display.value"/>
+    <node id="board.clock.fclk.div" option="board.clock.fclk.div.2"/>
+    <node id="board.clock.fclk.display" option="board.clock.fclk.display.value"/>
+    <node id="board.clock.clkout.source" option="board.clock.clkout.source.disabled"/>
+    <node id="board.clock.clkout.div" option="board.clock.clkout.div.1"/>
+    <node id="board.clock.clkout.display" option="board.clock.clkout.display.value"/>
+    <node id="board.clock.uclk.source" option="board.clock.uclk.source.hoco"/>
+    <node id="board.clock.uclk.display" option="board.clock.clkout.display.value"/>
+  </raClockConfiguration>
+  <raComponentSelection>
+    <component apiversion="" class="BSP" condition="" group="Board" subgroup="ra4w1_ek" variant="" vendor="Renesas" version="4.4.0">
+      <description>EK-RA4W1 Board Support Files</description>
+      <originalPack>Renesas.RA_board_ra4w1_ek.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.9.0+renesas.0.fsp.4.4.0">
+      <description>Arm CMSIS Version 5 - Core (M)</description>
+      <originalPack>Arm.CMSIS5.5.9.0+renesas.0.fsp.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4w1" subgroup="device" variant="R7FA4W1AD2CNG" vendor="Renesas" version="4.4.0">
+      <description>Board support package for R7FA4W1AD2CNG</description>
+      <originalPack>Renesas.RA_mcu_ra4w1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4w1" subgroup="device" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA4W1</description>
+      <originalPack>Renesas.RA_mcu_ra4w1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4w1" subgroup="fsp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA4W1 - FSP Data</description>
+      <originalPack>Renesas.RA_mcu_ra4w1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board Support Package Common Files</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_adc" variant="" vendor="Renesas" version="4.4.0">
+      <description>A/D Converter</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_agt" variant="" vendor="Renesas" version="4.4.0">
+      <description>Asynchronous General Purpose Timer</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Data Transfer Controller</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_flash_lp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Flash Memory Low Power</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="4.4.0">
+      <description>External Interrupt</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_iic_master" variant="" vendor="Renesas" version="4.4.0">
+      <description>I2C Master Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="4.4.0">
+      <description>I/O Port</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_lpm" variant="" vendor="Renesas" version="4.4.0">
+      <description>Low Power Modes</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_rtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Real Time Clock</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="4.4.0">
+      <description>SCI UART</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_spi" variant="" vendor="Renesas" version="4.4.0">
+      <description>Serial Peripheral Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+  </raComponentSelection>
+  <raElcConfiguration/>
+  <raIcuConfiguration/>
+  <raModuleConfiguration>
+    <module id="module.driver.uart_on_sci_uart.478805511">
+      <property id="module.driver.uart.name" value="g_uart1"/>
+      <property id="module.driver.uart.channel" value="1"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.1434355459">
+      <property id="module.driver.uart.name" value="g_uart4"/>
+      <property id="module.driver.uart.channel" value="4"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.1187363630">
+      <property id="module.driver.uart.name" value="g_uart9"/>
+      <property id="module.driver.uart.channel" value="9"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.rtc_on_rtc.289676162">
+      <property id="module.driver.rtc.name" value="g_rtc0"/>
+      <property id="module.driver.rtc.clock_source" value="module.driver.rtc.clock_source.clock_source_loco"/>
+      <property id="module.driver.rtc.freq_cmpr_value_loco" value="255"/>
+      <property id="module.driver.rtc.err_adjustment_mode" value="module.driver.rtc.err_adjustment_mode.m1"/>
+      <property id="module.driver.rtc.err_adjustment_period" value="module.driver.rtc.err_adjustment_period.p1"/>
+      <property id="module.driver.rtc.err_adjustment_type" value="module.driver.rtc.err_adjustment_type.t1"/>
+      <property id="module.driver.rtc.err_adjustment_value" value="0"/>
+      <property id="module.driver.rtc.p_callback" value="NULL"/>
+      <property id="module.driver.rtc.alarm_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.periodic_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.carry_ipl" value="board.icu.common.irq.priority14"/>
+    </module>
+    <module id="module.driver.flash_on_flash_lp.2070605517">
+      <property id="module.driver.flash.name" value="g_flash0"/>
+      <property id="module.driver.flash.data_flash_bgo" value="module.driver.flash.data_flash_bgo.disabled"/>
+      <property id="module.driver.flash.p_callback" value="NULL"/>
+      <property id="module.driver.flash.ipl" value="_disabled"/>
+    </module>
+    <module id="module.driver.timer_on_agt.592596926">
+      <property id="module.driver.timer.name" value="g_timer0"/>
+      <property id="module.driver.timer.channel" value="0"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.timer_on_agt.1904324942">
+      <property id="module.driver.timer.name" value="g_timer1"/>
+      <property id="module.driver.timer.channel" value="1"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1932697469">
+      <property id="module.driver.external_irq.name" value="g_external_irq0"/>
+      <property id="module.driver.external_irq.channel" value="0"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1196100031">
+      <property id="module.driver.external_irq.name" value="g_external_irq1"/>
+      <property id="module.driver.external_irq.channel" value="1"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1912376141">
+      <property id="module.driver.external_irq.name" value="g_external_irq2"/>
+      <property id="module.driver.external_irq.channel" value="2"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1829500244">
+      <property id="module.driver.external_irq.name" value="g_external_irq3"/>
+      <property id="module.driver.external_irq.channel" value="3"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.504633486">
+      <property id="module.driver.external_irq.name" value="g_external_irq4"/>
+      <property id="module.driver.external_irq.channel" value="4"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.spi_on_spi.1103409052">
+      <property id="module.driver.spi.name" value="g_spi0"/>
+      <property id="module.driver.spi.channel" value="0"/>
+      <property id="module.driver.spi.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.eri_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.operating_mode" value="module.driver.spi.operating_mode.mode_master"/>
+      <property id="module.driver.spi.clk_phase" value="module.driver.spi.clk_phase.clk_phase_edge_odd"/>
+      <property id="module.driver.spi.clk_polarity" value="module.driver.spi.clk_polarity.clk_polarity_low"/>
+      <property id="module.driver.spi.mode_fault" value="module.driver.spi.mode_fault.mode_fault_error_disable"/>
+      <property id="module.driver.spi.bit_order" value="module.driver.spi.bit_order.bit_order_msb_first"/>
+      <property id="module.driver.spi.p_callback" value="spi_callback"/>
+      <property id="module.driver.spi.spi_clksyn" value="module.driver.spi.spi_clksyn.spi_clksyn"/>
+      <property id="module.driver.spi.spi_comm" value="module.driver.spi.spi_comm.full_duplex"/>
+      <property id="module.driver.spi.ssl_polarity" value="module.driver.spi.ssl_polarity.low"/>
+      <property id="module.driver.spi.ssl_select" value="module.driver.spi.ssl_select.zero"/>
+      <property id="module.driver.spi.mosi_idle_value_fixing" value="module.driver.spi.mosi_idle_value_fixing.disable"/>
+      <property id="module.driver.spi.parity" value="module.driver.spi.parity_mode.disable"/>
+      <property id="module.driver.spi.byte_swap" value="module.driver.spi.byte_swap.disable"/>
+      <property id="module.driver.spi.bitrate" value="16000000"/>
+      <property id="module.driver.spi.spck_delay" value="module.driver.spi.spck_delay.one"/>
+      <property id="module.driver.spi.ssl_negation_delay" value="module.driver.spi.ssl_negation_delay.one"/>
+      <property id="module.driver.spi.next_access_delay" value="module.driver.spi.next_access_delay.one"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.2121966274">
+      <property id="module.driver.transfer.name" value="g_transfer0"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1472549702">
+      <property id="module.driver.transfer.name" value="g_transfer1"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.lpm.440627083">
+      <property id="module.driver.lpm.name" value="g_lpm0"/>
+      <property id="module.driver.lpm.mode" value="module.driver.lpm.mode.sleep"/>
+      <property id="module.driver.lpm.output_port_enable_standby" value="module.driver.lpm.output_port_enable_standby.no_change"/>
+      <property id="module.driver.lpm.standby_wake_sources" value="module.driver.lpm.standby_wake_rtcalm"/>
+      <property id="module.driver.lpm.snooze_request" value="module.driver.lpm.snooze_request_rxd0_falling"/>
+      <property id="module.driver.lpm.snooze_end_sources" value=""/>
+      <property id="module.driver.lpm.snooze_dtc" value="module.driver.lpm.snooze_dtc.lpm_snooze_dtc_disable"/>
+      <property id="module.driver.lpm.snooze_cancel_source" value="enum.mcu.lpm.snooze_cancel_source.none"/>
+      <property id="module.driver.lpm.ram_power_enable" value=""/>
+      <property id="module.driver.lpm.tcm_power_enable" value="enum.mcu.lpm.tcm_power_enable.disable"/>
+      <property id="module.driver.lpm.standby_ram_power_enable" value="enum.mcu.lpm.standby_ram_power_enable.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll1" value="enum.mcu.lpm.oscillator_ldo_state.pll1.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll2" value="enum.mcu.lpm.oscillator_ldo_state.pll2.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.hoco" value="enum.mcu.lpm.oscillator_ldo_state.hoco.disable"/>
+      <property id="module.driver.lpm.io_port_deep_standby_exit" value="module.driver.lpm.io_port_deep_standby_exit.no_change"/>
+      <property id="module.driver.lpm.power_supply_deep_standby" value="module.driver.lpm.power_supply_deep_standby.deepcut0"/>
+      <property id="module.driver.lpm.deep_standby_cancel_sources" value=""/>
+      <property id="module.driver.lpm.deep_standby_cancel_edges" value=""/>
+    </module>
+    <module id="module.driver.ioport_on_ioport.2025140089">
+      <property id="module.driver.ioport.name" value="g_ioport"/>
+      <property id="module.driver.ioport.elc_trigger_ioport1" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport2" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport3" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport4" value="_disabled"/>
+      <property id="module.driver.ioport.pincfg" value="g_bsp_pin_cfg"/>
+    </module>
+    <module id="module.driver.i2c_on_iic_master.995390009">
+      <property id="module.driver.i2c_master.name" value="g_i2c_master0"/>
+      <property id="module.driver.i2c_master.channel" value="0"/>
+      <property id="module.driver.i2c_master.rate" value="module.driver.i2c_master.rate.rate_standard"/>
+      <property id="module.driver.i2c_master.rise_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.fall_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.duty" value="50"/>
+      <property id="module.driver.i2c_master.slave" value="0x00"/>
+      <property id="module.driver.i2c_master.addr_mode" value="module.driver.i2c_master.addr_mode.addr_mode_7bit"/>
+      <property id="module.driver.i2c_master.timeout_mode" value="module.driver.i2c_master.timeout_mode.short_mode"/>
+      <property id="module.driver.i2c_master.timeout_scl_low" value="module.driver.i2c_master.timeout_scl_low.enabled"/>
+      <property id="module.driver.i2c_master.p_callback" value="callback_iic"/>
+      <property id="module.driver.i2c_master.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.adc_on_adc.1349669379">
+      <property id="module.driver.adc.name" value="g_adc0"/>
+      <property id="module.driver.adc.unit" value="0"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_14_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.avcc0_avss0"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <context id="_hal.0">
+      <stack module="module.driver.uart_on_sci_uart.478805511"/>
+      <stack module="module.driver.uart_on_sci_uart.1434355459"/>
+      <stack module="module.driver.uart_on_sci_uart.1187363630"/>
+      <stack module="module.driver.rtc_on_rtc.289676162"/>
+      <stack module="module.driver.flash_on_flash_lp.2070605517"/>
+      <stack module="module.driver.timer_on_agt.592596926"/>
+      <stack module="module.driver.timer_on_agt.1904324942"/>
+      <stack module="module.driver.external_irq_on_icu.1932697469"/>
+      <stack module="module.driver.external_irq_on_icu.1196100031"/>
+      <stack module="module.driver.external_irq_on_icu.1912376141"/>
+      <stack module="module.driver.external_irq_on_icu.1829500244"/>
+      <stack module="module.driver.external_irq_on_icu.504633486"/>
+      <stack module="module.driver.spi_on_spi.1103409052">
+        <stack module="module.driver.transfer_on_dtc.2121966274" requires="module.driver.spi_on_spi.requires.transfer_tx"/>
+        <stack module="module.driver.transfer_on_dtc.1472549702" requires="module.driver.spi_on_spi.requires.transfer_rx"/>
+      </stack>
+      <stack module="module.driver.lpm.440627083"/>
+      <stack module="module.driver.ioport_on_ioport.2025140089"/>
+      <stack module="module.driver.i2c_on_iic_master.995390009"/>
+      <stack module="module.driver.adc_on_adc.1349669379"/>
+    </context>
+    <config id="config.driver.lpm">
+      <property id="config.driver.lpm.param_checking_enable" value="config.driver.lpm.param_checking_enable.bsp"/>
+      <property id="config.driver.lpm.standby_limit" value="config.driver.lpm.standby_limit.disabled"/>
+    </config>
+    <config id="config.driver.ioport">
+      <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
+    </config>
+    <config id="config.driver.adc">
+      <property id="config.driver.adc.param_checking_enable" value="config.driver.adc.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.icu">
+      <property id="config.driver.icu.param_checking_enable" value="config.driver.icu.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.agt">
+      <property id="config.driver.agt.param_checking_enable" value="config.driver.agt.param_checking_enable.bsp"/>
+      <property id="config.driver.agt.output_support_enable" value="config.driver.agt.output_support_enable.disabled"/>
+      <property id="config.driver.agt.input_support_enable" value="config.driver.agt.input_support_enable.disabled"/>
+    </config>
+    <config id="config.driver.dtc">
+      <property id="config.driver.dtc.param_checking_enable" value="config.driver.dtc.param_checking_enable.bsp"/>
+      <property id="config.driver.dtc.vector_table" value=".fsp_dtc_vector_table"/>
+    </config>
+    <config id="config.driver.iic_master">
+      <property id="config.driver.iic_master.param_checking_enable" value="config.driver.iic_master.param_checking_enable.bsp"/>
+      <property id="config.driver.iic_master.dtc_enable" value="config.driver.iic_master.dtc_enable.disabled"/>
+      <property id="config.driver.iic_master.addr_mode_10_bit_enable" value="config.driver.iic_master.addr_mode_10_bit_enable.disabled"/>
+    </config>
+    <config id="config.driver.flash_lp">
+      <property id="config.driver.flash_lp.param_checking_enable" value="config.flash_lp.param_checking_enable.bsp"/>
+      <property id="config.driver.flash_lp.param_code_flash_programming_enable" value="config.driver.flash_lp.param_code_flash_programming_enable.enabled"/>
+      <property id="config.driver.flash_lp.param_data_flash_programming_enable" value="config.driver.flash_lp.param_data_flash_programming_enable.disabled"/>
+    </config>
+    <config id="config.driver.sci_uart">
+      <property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
+      <property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>
+      <property id="config.driver.sci_uart.dtc_support" value="config.driver.sci_uart.dtc_support.disabled"/>
+      <property id="config.driver.sci_uart.flow_control" value="config.driver.sci_uart.flow_control.disabled"/>
+      <property id="config.driver.sci_uart.rs485" value="config.driver.sci_uart.rs485.disabled"/>
+    </config>
+    <config id="config.driver.rtc">
+      <property id="config.driver.rtc.param_checking_enable" value="config.driver.rtc.param_checking_enable.bsp"/>
+      <property id="config.driver.rtc.open_set_source_clock" value="config.driver.rtc.open_set_source_clock.enabled"/>
+    </config>
+    <config id="config.driver.spi">
+      <property id="config.driver.spi.param_checking_enable" value="config.driver.spi.param_checking_enable.bsp"/>
+      <property id="config.driver.spi.dtc_enable" value="config.driver.spi.dtc_enable.enabled"/>
+      <property id="config.driver.spi.rxi_transmit" value="config.driver.spi.rxi_transmit.disabled"/>
+    </config>
+  </raModuleConfiguration>
+  <raPinConfiguration>
+    <pincfg active="true" name="RA4W1-EK.pincfg" selected="true" symbol="g_bsp_pin_cfg">
+      <configSetting altId="gpt0.pairing.a" configurationId="gpt0.pairing"/>
+      <configSetting altId="iic0.pairing.free" configurationId="iic0.pairing"/>
+      <configSetting altId="irq0.irq04.p402" configurationId="irq0.irq04"/>
+      <configSetting altId="irq0.mode.enabled" configurationId="irq0.mode"/>
+      <configSetting altId="p100.spi0.miso" configurationId="p100"/>
+      <configSetting altId="p100.gpio_mode.gpio_mode_peripheral" configurationId="p100.gpio_mode"/>
+      <configSetting altId="p101.spi0.mosi" configurationId="p101"/>
+      <configSetting altId="p101.gpio_mode.gpio_mode_peripheral" configurationId="p101.gpio_mode"/>
+      <configSetting altId="p102.spi0.rspck" configurationId="p102"/>
+      <configSetting altId="p102.gpio_mode.gpio_mode_peripheral" configurationId="p102.gpio_mode"/>
+      <configSetting altId="p103.output.high" configurationId="p103"/>
+      <configSetting altId="p103.gpio_mode.gpio_mode_out.high" configurationId="p103.gpio_mode"/>
+      <configSetting altId="p106.output.high" configurationId="p106"/>
+      <configSetting altId="p106.gpio_mode.gpio_mode_out.high" configurationId="p106.gpio_mode"/>
+      <configSetting altId="p109.sci9.txd" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.sci9.rxd" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p111.output.high" configurationId="p111"/>
+      <configSetting altId="p111.gpio_mode.gpio_mode_out.high" configurationId="p111.gpio_mode"/>
+      <configSetting altId="p204.output.high" configurationId="p204"/>
+      <configSetting altId="p204.gpio_mode.gpio_mode_out.high" configurationId="p204.gpio_mode"/>
+      <configSetting altId="p205.sci4.txd" configurationId="p205"/>
+      <configSetting altId="p205.gpio_mode.gpio_mode_peripheral" configurationId="p205.gpio_mode"/>
+      <configSetting altId="p206.sci4.rxd" configurationId="p206"/>
+      <configSetting altId="p206.gpio_mode.gpio_mode_peripheral" configurationId="p206.gpio_mode"/>
+      <configSetting altId="p212.sci1.rxd" configurationId="p212"/>
+      <configSetting altId="p212.gpio_mode.gpio_mode_peripheral" configurationId="p212.gpio_mode"/>
+      <configSetting altId="p213.sci1.txd" configurationId="p213"/>
+      <configSetting altId="p213.gpio_mode.gpio_mode_peripheral" configurationId="p213.gpio_mode"/>
+      <configSetting altId="p402.irq0.irq04" configurationId="p402"/>
+      <configSetting altId="p402.gpio_irq.gpio_irq_enabled" configurationId="p402.gpio_irq"/>
+      <configSetting altId="p402.gpio_mode.gpio_mode_irq" configurationId="p402.gpio_mode"/>
+      <configSetting altId="p404.output.high" configurationId="p404"/>
+      <configSetting altId="p404.gpio_mode.gpio_mode_out.high" configurationId="p404.gpio_mode"/>
+      <configSetting altId="rtc0.mode.enabled" configurationId="rtc0.mode"/>
+      <configSetting altId="sci0.pairing.a" configurationId="sci0.pairing"/>
+      <configSetting altId="sci1.mode.asynchronous.a" configurationId="sci1.mode"/>
+      <configSetting altId="sci1.pairing.a" configurationId="sci1.pairing"/>
+      <configSetting altId="sci1.rxd.p212" configurationId="sci1.rxd"/>
+      <configSetting altId="sci1.txd.p213" configurationId="sci1.txd"/>
+      <configSetting altId="sci4.mode.asynchronous.a" configurationId="sci4.mode"/>
+      <configSetting altId="sci4.pairing.a" configurationId="sci4.pairing"/>
+      <configSetting altId="sci4.rxd.p206" configurationId="sci4.rxd"/>
+      <configSetting altId="sci4.txd.p205" configurationId="sci4.txd"/>
+      <configSetting altId="sci9.mode.asynchronous.b" configurationId="sci9.mode"/>
+      <configSetting altId="sci9.pairing.b" configurationId="sci9.pairing"/>
+      <configSetting altId="sci9.rxd.p110" configurationId="sci9.rxd"/>
+      <configSetting altId="sci9.txd.p109" configurationId="sci9.txd"/>
+      <configSetting altId="spi0.miso.p100" configurationId="spi0.miso"/>
+      <configSetting altId="spi0.mode.enabled.a" configurationId="spi0.mode"/>
+      <configSetting altId="spi0.mosi.p101" configurationId="spi0.mosi"/>
+      <configSetting altId="spi0.rspck.p102" configurationId="spi0.rspck"/>
+    </pincfg>
+    <pincfg active="false" name="R7FA4W1AD2CNG.pincfg" selected="false" symbol="">
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+    </pincfg>
+  </raPinConfiguration>
+</raConfiguration>
diff --git a/ports/renesas-ra/boards/EK_RA6M1/configuration.xml b/ports/renesas-ra/boards/EK_RA6M1/configuration.xml
new file mode 100644
index 0000000000000..e797c4e809975
--- /dev/null
+++ b/ports/renesas-ra/boards/EK_RA6M1/configuration.xml
@@ -0,0 +1,826 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<raConfiguration version="7">
+  <generalSettings>
+    <option key="#Board#" value="board.ra6m1ek"/>
+    <option key="CPU" value="RA6M1"/>
+    <option key="Core" value="CM4"/>
+    <option key="#TargetName#" value="R7FA6M1AD3CFP"/>
+    <option key="#TargetARCHITECTURE#" value="cortex-m4"/>
+    <option key="#DeviceCommand#" value="R7FA6M1AD"/>
+    <option key="#RTOS#" value="_none"/>
+    <option key="#pinconfiguration#" value="RA6M1-EK.pincfg"/>
+    <option key="#FSPVersion#" value="4.4.0"/>
+    <option key="#ConfigurationFragments#" value="Renesas##BSP##Board##ra6m1_ek##"/>
+    <option key="#SELECTED_TOOLCHAIN#" value="gcc-arm-embedded"/>
+    <option key="#ToolchainVersion#" value="9.2.1.20191025"/>
+  </generalSettings>
+  <raBspConfiguration>
+    <config id="config.bsp.ra6m1.R7FA6M1AD3CFP">
+      <property id="config.bsp.part_number" value="config.bsp.part_number.value"/>
+      <property id="config.bsp.rom_size_bytes" value="config.bsp.rom_size_bytes.value"/>
+      <property id="config.bsp.rom_size_bytes_hidden" value="524288"/>
+      <property id="config.bsp.ram_size_bytes" value="config.bsp.ram_size_bytes.value"/>
+      <property id="config.bsp.data_flash_size_bytes" value="config.bsp.data_flash_size_bytes.value"/>
+      <property id="config.bsp.package_style" value="config.bsp.package_style.value"/>
+      <property id="config.bsp.package_pins" value="config.bsp.package_pins.value"/>
+      <property id="config.bsp.irq_count_hidden" value="96"/>
+    </config>
+    <config id="config.bsp.ra6m1">
+      <property id="config.bsp.series" value="config.bsp.series.value"/>
+    </config>
+    <config id="config.bsp.ra6m1.fsp">
+      <property id="config.bsp.fsp.OFS0.iwdt_start_mode" value="config.bsp.fsp.OFS0.iwdt_start_mode.disabled"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_timeout" value="config.bsp.fsp.OFS0.iwdt_timeout.2048"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_divisor" value="config.bsp.fsp.OFS0.iwdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_end" value="config.bsp.fsp.OFS0.iwdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_start" value="config.bsp.fsp.OFS0.iwdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_reset_interrupt" value="config.bsp.fsp.OFS0.iwdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_stop_control" value="config.bsp.fsp.OFS0.iwdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS0.wdt_start_mode" value="config.bsp.fsp.OFS0.wdt_start_mode.register"/>
+      <property id="config.bsp.fsp.OFS0.wdt_timeout" value="config.bsp.fsp.OFS0.wdt_timeout.16384"/>
+      <property id="config.bsp.fsp.OFS0.wdt_divisor" value="config.bsp.fsp.OFS0.wdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_end" value="config.bsp.fsp.OFS0.wdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_start" value="config.bsp.fsp.OFS0.wdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.wdt_reset_interrupt" value="config.bsp.fsp.OFS0.wdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.wdt_stop_control" value="config.bsp.fsp.OFS0.wdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0.start" value="config.bsp.fsp.OFS1.voltage_detection0.start.disabled"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0_level" value="config.bsp.fsp.OFS1.voltage_detection0_level.280"/>
+      <property id="config.bsp.fsp.OFS1.hoco_osc" value="config.bsp.fsp.OFS1.hoco_osc.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_enable" value="config.bsp.fsp.mpu_pc0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_start" value="0xFFFFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc0_end" value="0xFFFFFFFF"/>
+      <property id="config.bsp.fsp.mpu_pc1_enable" value="config.bsp.fsp.mpu_pc1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc1_start" value="0xFFFFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc1_end" value="0xFFFFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg0_enable" value="config.bsp.fsp.mpu_reg0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg1_enable" value="config.bsp.fsp.mpu_reg1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg1_start" value="0x200FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg1_end" value="0x200FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg2_enable" value="config.bsp.fsp.mpu_reg2_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg2_start" value="0x407FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg2_end" value="0x407FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg3_enable" value="config.bsp.fsp.mpu_reg3_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg3_start" value="0x400DFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg3_end" value="0x400DFFFF"/>
+      <property id="config.bsp.fsp.hoco_fll" value="config.bsp.fsp.hoco_fll.disabled"/>
+      <property id="config.bsp.common.main_osc_wait" value="config.bsp.common.main_osc_wait.wait_8163"/>
+      <property id="config.bsp.fsp.mcu.adc.max_freq_hz" value="60000000"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.max_baud" value="20000000"/>
+      <property id="config.bsp.fsp.mcu.adc.sample_and_hold" value="1"/>
+      <property id="config.bsp.fsp.mcu.sci_spi.max_bitrate" value="30000000"/>
+      <property id="config.bsp.fsp.mcu.spi.max_bitrate" value="30000000"/>
+      <property id="config.bsp.fsp.mcu.iic_master.rate.rate_fastplus" value="1"/>
+      <property id="config.bsp.fsp.mcu.iic_master.fastplus_channels" value="0x1"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.rate.rate_fastplus" value="1"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.fastplus_channels" value="0x1"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.cstpen_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.gpt.pin_count_source_channels" value="0xFFFF"/>
+      <property id="config.bsp.common.id_mode" value="config.bsp.common.id_mode.unlocked"/>
+      <property id="config.bsp.common.id_code" value="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/>
+      <property id="config.bsp.common.id1" value=""/>
+      <property id="config.bsp.common.id2" value=""/>
+      <property id="config.bsp.common.id3" value=""/>
+      <property id="config.bsp.common.id4" value=""/>
+      <property id="config.bsp.common.id_fixed" value=""/>
+    </config>
+    <config id="config.bsp.ra">
+      <property id="config.bsp.common.main" value="0x4000"/>
+      <property id="config.bsp.common.heap" value="0x2d000"/>
+      <property id="config.bsp.common.vcc" value="3300"/>
+      <property id="config.bsp.common.checking" value="config.bsp.common.checking.disabled"/>
+      <property id="config.bsp.common.assert" value="config.bsp.common.assert.none"/>
+      <property id="config.bsp.common.error_log" value="config.bsp.common.error_log.none"/>
+      <property id="config.bsp.common.soft_reset" value="config.bsp.common.soft_reset.disabled"/>
+      <property id="config.bsp.common.main_osc_populated" value="config.bsp.common.main_osc_populated.enabled"/>
+      <property id="config.bsp.common.pfs_protect" value="config.bsp.common.pfs_protect.enabled"/>
+      <property id="config.bsp.common.c_runtime_init" value="config.bsp.common.c_runtime_init.enabled"/>
+      <property id="config.bsp.common.early_init" value="config.bsp.common.early_init.disabled"/>
+      <property id="config.bsp.common.main_osc_clock_source" value="config.bsp.common.main_osc_clock_source.crystal"/>
+      <property id="config.bsp.common.subclock_populated" value="config.bsp.common.subclock_populated.enabled"/>
+      <property id="config.bsp.common.subclock_drive" value="config.bsp.common.subclock_drive.standard"/>
+      <property id="config.bsp.common.subclock_stabilization_ms" value="1000"/>
+    </config>
+  </raBspConfiguration>
+  <raClockConfiguration>
+    <node id="board.clock.xtal.freq" mul="12000000" option="_edit"/>
+    <node id="board.clock.pll.source" option="board.clock.pll.source.xtal"/>
+    <node id="board.clock.hoco.freq" option="board.clock.hoco.freq.20m"/>
+    <node id="board.clock.loco.freq" option="board.clock.loco.freq.32768"/>
+    <node id="board.clock.moco.freq" option="board.clock.moco.freq.8m"/>
+    <node id="board.clock.subclk.freq" option="board.clock.subclk.freq.32768"/>
+    <node id="board.clock.pll.div" option="board.clock.pll.div.1"/>
+    <node id="board.clock.pll.mul" option="board.clock.pll.mul.200"/>
+    <node id="board.clock.pll.display" option="board.clock.pll.display.value"/>
+    <node id="board.clock.clock.source" option="board.clock.clock.source.pll"/>
+    <node id="board.clock.iclk.div" option="board.clock.iclk.div.2"/>
+    <node id="board.clock.iclk.display" option="board.clock.iclk.display.value"/>
+    <node id="board.clock.pclka.div" option="board.clock.pclka.div.2"/>
+    <node id="board.clock.pclka.display" option="board.clock.pclka.display.value"/>
+    <node id="board.clock.pclkb.div" option="board.clock.pclkb.div.4"/>
+    <node id="board.clock.pclkb.display" option="board.clock.pclkb.display.value"/>
+    <node id="board.clock.pclkc.div" option="board.clock.pclkc.div.4"/>
+    <node id="board.clock.pclkc.display" option="board.clock.pclkc.display.value"/>
+    <node id="board.clock.pclkd.div" option="board.clock.pclkd.div.2"/>
+    <node id="board.clock.pclkd.display" option="board.clock.pclkd.display.value"/>
+    <node id="board.clock.bclk.div" option="board.clock.bclk.div.2"/>
+    <node id="board.clock.bclk.display" option="board.clock.bclk.display.value"/>
+    <node id="board.clock.bclkout.div" option="board.clock.bclkout.div.2"/>
+    <node id="board.clock.bclkout.display" option="board.clock.bclkout.display.value"/>
+    <node id="board.clock.uclk.div" option="board.clock.uclk.div.5"/>
+    <node id="board.clock.uclk.display" option="board.clock.uclk.display.value"/>
+    <node id="board.clock.fclk.div" option="board.clock.fclk.div.4"/>
+    <node id="board.clock.fclk.display" option="board.clock.fclk.display.value"/>
+    <node id="board.clock.clkout.source" option="board.clock.clkout.source.disabled"/>
+    <node id="board.clock.clkout.div" option="board.clock.clkout.div.1"/>
+    <node id="board.clock.clkout.display" option="board.clock.clkout.display.value"/>
+  </raClockConfiguration>
+  <raComponentSelection>
+    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.9.0+renesas.0.fsp.4.4.0">
+      <description>Arm CMSIS Version 5 - Core (M)</description>
+      <originalPack>Arm.CMSIS5.5.9.0+renesas.0.fsp.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="Board" subgroup="ra6m1_ek" variant="" vendor="Renesas" version="4.4.0">
+      <description>RA6M1-EK Board Support Files</description>
+      <originalPack>Renesas.RA_board_ra6m1_ek.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board Support Package Common Files</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_adc" variant="" vendor="Renesas" version="4.4.0">
+      <description>A/D Converter</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_agt" variant="" vendor="Renesas" version="4.4.0">
+      <description>Asynchronous General Purpose Timer</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Data Transfer Controller</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_flash_hp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Flash Memory High Performance</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="4.4.0">
+      <description>External Interrupt</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_iic_master" variant="" vendor="Renesas" version="4.4.0">
+      <description>I2C Master Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="4.4.0">
+      <description>I/O Port</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_lpm" variant="" vendor="Renesas" version="4.4.0">
+      <description>Low Power Modes</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_rtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Real Time Clock</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="4.4.0">
+      <description>SCI UART</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_spi" variant="" vendor="Renesas" version="4.4.0">
+      <description>Serial Peripheral Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m1" subgroup="device" variant="R7FA6M1AD3CFP" vendor="Renesas" version="4.4.0">
+      <description>Board support package for R7FA6M1AD3CFP</description>
+      <originalPack>Renesas.RA_mcu_ra6m1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m1" subgroup="device" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA6M1</description>
+      <originalPack>Renesas.RA_mcu_ra6m1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m1" subgroup="fsp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA6M1 - FSP Data</description>
+      <originalPack>Renesas.RA_mcu_ra6m1.4.4.0.pack</originalPack>
+    </component>
+  </raComponentSelection>
+  <raElcConfiguration/>
+  <raIcuConfiguration/>
+  <raModuleConfiguration>
+    <module id="module.driver.ioport_on_ioport.0">
+      <property id="module.driver.ioport.name" value="g_ioport"/>
+      <property id="module.driver.ioport.elc_trigger_ioport1" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport2" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport3" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport4" value="_disabled"/>
+      <property id="module.driver.ioport.pincfg" value="g_bsp_pin_cfg"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.1925794573">
+      <property id="module.driver.uart.name" value="g_uart0"/>
+      <property id="module.driver.uart.channel" value="0"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.891833893">
+      <property id="module.driver.uart.name" value="g_uart2"/>
+      <property id="module.driver.uart.channel" value="2"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.867410103">
+      <property id="module.driver.uart.name" value="g_uart8"/>
+      <property id="module.driver.uart.channel" value="8"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.rtc_on_rtc.924498946">
+      <property id="module.driver.rtc.name" value="g_rtc0"/>
+      <property id="module.driver.rtc.clock_source" value="module.driver.rtc.clock_source.clock_source_loco"/>
+      <property id="module.driver.rtc.freq_cmpr_value_loco" value="255"/>
+      <property id="module.driver.rtc.err_adjustment_mode" value="module.driver.rtc.err_adjustment_mode.m1"/>
+      <property id="module.driver.rtc.err_adjustment_period" value="module.driver.rtc.err_adjustment_period.p1"/>
+      <property id="module.driver.rtc.err_adjustment_type" value="module.driver.rtc.err_adjustment_type.t1"/>
+      <property id="module.driver.rtc.err_adjustment_value" value="0"/>
+      <property id="module.driver.rtc.p_callback" value="NULL"/>
+      <property id="module.driver.rtc.alarm_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.periodic_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.carry_ipl" value="board.icu.common.irq.priority14"/>
+    </module>
+    <module id="module.driver.flash_on_flash_hp.1545866241">
+      <property id="module.driver.flash.name" value="g_flash0"/>
+      <property id="module.driver.flash.data_flash_bgo" value="module.driver.flash.data_flash_bgo.disabled"/>
+      <property id="module.driver.flash.p_callback" value="NULL"/>
+      <property id="module.driver.flash.ipl" value="_disabled"/>
+      <property id="module.driver.flash.err_ipl" value="_disabled"/>
+    </module>
+    <module id="module.driver.timer_on_agt.1117025865">
+      <property id="module.driver.timer.name" value="g_timer0"/>
+      <property id="module.driver.timer.channel" value="0"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.timer_on_agt.2079179806">
+      <property id="module.driver.timer.name" value="g_timer1"/>
+      <property id="module.driver.timer.channel" value="1"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1100411657">
+      <property id="module.driver.external_irq.name" value="g_external_irq0"/>
+      <property id="module.driver.external_irq.channel" value="0"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1533668222">
+      <property id="module.driver.external_irq.name" value="g_external_irq1"/>
+      <property id="module.driver.external_irq.channel" value="1"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1111380634">
+      <property id="module.driver.external_irq.name" value="g_external_irq2"/>
+      <property id="module.driver.external_irq.channel" value="2"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.302521910">
+      <property id="module.driver.external_irq.name" value="g_external_irq3"/>
+      <property id="module.driver.external_irq.channel" value="3"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.648487044">
+      <property id="module.driver.external_irq.name" value="g_external_irq4"/>
+      <property id="module.driver.external_irq.channel" value="4"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.699876975">
+      <property id="module.driver.external_irq.name" value="g_external_irq5"/>
+      <property id="module.driver.external_irq.channel" value="5"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.539592836">
+      <property id="module.driver.external_irq.name" value="g_external_irq6"/>
+      <property id="module.driver.external_irq.channel" value="6"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.527347469">
+      <property id="module.driver.external_irq.name" value="g_external_irq7"/>
+      <property id="module.driver.external_irq.channel" value="7"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.320484206">
+      <property id="module.driver.external_irq.name" value="g_external_irq8"/>
+      <property id="module.driver.external_irq.channel" value="8"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.764376860">
+      <property id="module.driver.external_irq.name" value="g_external_irq9"/>
+      <property id="module.driver.external_irq.channel" value="9"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.2002497356">
+      <property id="module.driver.external_irq.name" value="g_external_irq10"/>
+      <property id="module.driver.external_irq.channel" value="10"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.612175756">
+      <property id="module.driver.external_irq.name" value="g_external_irq11"/>
+      <property id="module.driver.external_irq.channel" value="11"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.182030031">
+      <property id="module.driver.external_irq.name" value="g_external_irq12"/>
+      <property id="module.driver.external_irq.channel" value="12"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.912267502">
+      <property id="module.driver.external_irq.name" value="g_external_irq13"/>
+      <property id="module.driver.external_irq.channel" value="13"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.spi_on_spi.175666593">
+      <property id="module.driver.spi.name" value="g_spi0"/>
+      <property id="module.driver.spi.channel" value="0"/>
+      <property id="module.driver.spi.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.eri_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.operating_mode" value="module.driver.spi.operating_mode.mode_master"/>
+      <property id="module.driver.spi.clk_phase" value="module.driver.spi.clk_phase.clk_phase_edge_odd"/>
+      <property id="module.driver.spi.clk_polarity" value="module.driver.spi.clk_polarity.clk_polarity_low"/>
+      <property id="module.driver.spi.mode_fault" value="module.driver.spi.mode_fault.mode_fault_error_disable"/>
+      <property id="module.driver.spi.bit_order" value="module.driver.spi.bit_order.bit_order_msb_first"/>
+      <property id="module.driver.spi.p_callback" value="spi_callback"/>
+      <property id="module.driver.spi.spi_clksyn" value="module.driver.spi.spi_clksyn.spi_clksyn"/>
+      <property id="module.driver.spi.spi_comm" value="module.driver.spi.spi_comm.full_duplex"/>
+      <property id="module.driver.spi.ssl_polarity" value="module.driver.spi.ssl_polarity.low"/>
+      <property id="module.driver.spi.ssl_select" value="module.driver.spi.ssl_select.zero"/>
+      <property id="module.driver.spi.mosi_idle_value_fixing" value="module.driver.spi.mosi_idle_value_fixing.disable"/>
+      <property id="module.driver.spi.parity" value="module.driver.spi.parity_mode.disable"/>
+      <property id="module.driver.spi.byte_swap" value="module.driver.spi.byte_swap.disable"/>
+      <property id="module.driver.spi.bitrate" value="16000000"/>
+      <property id="module.driver.spi.spck_delay" value="module.driver.spi.spck_delay.one"/>
+      <property id="module.driver.spi.ssl_negation_delay" value="module.driver.spi.ssl_negation_delay.one"/>
+      <property id="module.driver.spi.next_access_delay" value="module.driver.spi.next_access_delay.one"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1387974668">
+      <property id="module.driver.transfer.name" value="g_transfer0"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1546418663">
+      <property id="module.driver.transfer.name" value="g_transfer1"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.lpm.2041939534">
+      <property id="module.driver.lpm.name" value="g_lpm0"/>
+      <property id="module.driver.lpm.mode" value="module.driver.lpm.mode.sleep"/>
+      <property id="module.driver.lpm.output_port_enable_standby" value="module.driver.lpm.output_port_enable_standby.no_change"/>
+      <property id="module.driver.lpm.standby_wake_sources" value="module.driver.lpm.standby_wake_rtcalm"/>
+      <property id="module.driver.lpm.snooze_request" value="module.driver.lpm.snooze_request_rxd0_falling"/>
+      <property id="module.driver.lpm.snooze_end_sources" value=""/>
+      <property id="module.driver.lpm.snooze_dtc" value="module.driver.lpm.snooze_dtc.lpm_snooze_dtc_disable"/>
+      <property id="module.driver.lpm.snooze_cancel_source" value="enum.mcu.lpm.snooze_cancel_source.none"/>
+      <property id="module.driver.lpm.ram_power_enable" value=""/>
+      <property id="module.driver.lpm.tcm_power_enable" value="enum.mcu.lpm.tcm_power_enable.disable"/>
+      <property id="module.driver.lpm.standby_ram_power_enable" value="enum.mcu.lpm.standby_ram_power_enable.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll1" value="enum.mcu.lpm.oscillator_ldo_state.pll1.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll2" value="enum.mcu.lpm.oscillator_ldo_state.pll2.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.hoco" value="enum.mcu.lpm.oscillator_ldo_state.hoco.disable"/>
+      <property id="module.driver.lpm.io_port_deep_standby_exit" value="module.driver.lpm.io_port_deep_standby_exit.no_change"/>
+      <property id="module.driver.lpm.power_supply_deep_standby" value="module.driver.lpm.power_supply_deep_standby.deepcut0"/>
+      <property id="module.driver.lpm.deep_standby_cancel_sources" value=""/>
+      <property id="module.driver.lpm.deep_standby_cancel_edges" value=""/>
+    </module>
+    <module id="module.driver.adc_on_adc.1150043867">
+      <property id="module.driver.adc.name" value="g_adc0"/>
+      <property id="module.driver.adc.unit" value="0"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_12_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.vrefh"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <module id="module.driver.i2c_on_iic_master.286125569">
+      <property id="module.driver.i2c_master.name" value="g_i2c_master0"/>
+      <property id="module.driver.i2c_master.channel" value="0"/>
+      <property id="module.driver.i2c_master.rate" value="module.driver.i2c_master.rate.rate_standard"/>
+      <property id="module.driver.i2c_master.rise_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.fall_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.duty" value="50"/>
+      <property id="module.driver.i2c_master.slave" value="0x00"/>
+      <property id="module.driver.i2c_master.addr_mode" value="module.driver.i2c_master.addr_mode.addr_mode_7bit"/>
+      <property id="module.driver.i2c_master.timeout_mode" value="module.driver.i2c_master.timeout_mode.short_mode"/>
+      <property id="module.driver.i2c_master.timeout_scl_low" value="module.driver.i2c_master.timeout_scl_low.enabled"/>
+      <property id="module.driver.i2c_master.p_callback" value="callback_iic"/>
+      <property id="module.driver.i2c_master.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.adc_on_adc.1577359623">
+      <property id="module.driver.adc.name" value="g_adc1"/>
+      <property id="module.driver.adc.unit" value="1"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_12_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.vrefh"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <context id="_hal.0">
+      <stack module="module.driver.ioport_on_ioport.0"/>
+      <stack module="module.driver.uart_on_sci_uart.1925794573"/>
+      <stack module="module.driver.uart_on_sci_uart.891833893"/>
+      <stack module="module.driver.uart_on_sci_uart.867410103"/>
+      <stack module="module.driver.rtc_on_rtc.924498946"/>
+      <stack module="module.driver.flash_on_flash_hp.1545866241"/>
+      <stack module="module.driver.timer_on_agt.1117025865"/>
+      <stack module="module.driver.timer_on_agt.2079179806"/>
+      <stack module="module.driver.external_irq_on_icu.1100411657"/>
+      <stack module="module.driver.external_irq_on_icu.1533668222"/>
+      <stack module="module.driver.external_irq_on_icu.1111380634"/>
+      <stack module="module.driver.external_irq_on_icu.302521910"/>
+      <stack module="module.driver.external_irq_on_icu.648487044"/>
+      <stack module="module.driver.external_irq_on_icu.699876975"/>
+      <stack module="module.driver.external_irq_on_icu.539592836"/>
+      <stack module="module.driver.external_irq_on_icu.527347469"/>
+      <stack module="module.driver.external_irq_on_icu.320484206"/>
+      <stack module="module.driver.external_irq_on_icu.764376860"/>
+      <stack module="module.driver.external_irq_on_icu.2002497356"/>
+      <stack module="module.driver.external_irq_on_icu.612175756"/>
+      <stack module="module.driver.external_irq_on_icu.182030031"/>
+      <stack module="module.driver.external_irq_on_icu.912267502"/>
+      <stack module="module.driver.spi_on_spi.175666593">
+        <stack module="module.driver.transfer_on_dtc.1387974668" requires="module.driver.spi_on_spi.requires.transfer_tx"/>
+        <stack module="module.driver.transfer_on_dtc.1546418663" requires="module.driver.spi_on_spi.requires.transfer_rx"/>
+      </stack>
+      <stack module="module.driver.lpm.2041939534"/>
+      <stack module="module.driver.adc_on_adc.1150043867"/>
+      <stack module="module.driver.i2c_on_iic_master.286125569"/>
+      <stack module="module.driver.adc_on_adc.1577359623"/>
+    </context>
+    <config id="config.driver.flash_hp">
+      <property id="config.driver.flash_hp.param_checking_enable" value="config.flash_hp.param_checking_enable.bsp"/>
+      <property id="config.driver.flash_hp.param_code_flash_programming_enable" value="config.driver.flash_hp.param_code_flash_programming_enable.enabled"/>
+      <property id="config.driver.flash_hp.param_data_flash_programming_enable" value="config.driver.flash_hp.param_data_flash_programming_enable.disabled"/>
+    </config>
+    <config id="config.driver.lpm">
+      <property id="config.driver.lpm.param_checking_enable" value="config.driver.lpm.param_checking_enable.bsp"/>
+      <property id="config.driver.lpm.standby_limit" value="config.driver.lpm.standby_limit.disabled"/>
+    </config>
+    <config id="config.driver.ioport">
+      <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
+    </config>
+    <config id="config.driver.adc">
+      <property id="config.driver.adc.param_checking_enable" value="config.driver.adc.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.icu">
+      <property id="config.driver.icu.param_checking_enable" value="config.driver.icu.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.agt">
+      <property id="config.driver.agt.param_checking_enable" value="config.driver.agt.param_checking_enable.bsp"/>
+      <property id="config.driver.agt.output_support_enable" value="config.driver.agt.output_support_enable.disabled"/>
+      <property id="config.driver.agt.input_support_enable" value="config.driver.agt.input_support_enable.disabled"/>
+    </config>
+    <config id="config.driver.dtc">
+      <property id="config.driver.dtc.param_checking_enable" value="config.driver.dtc.param_checking_enable.bsp"/>
+      <property id="config.driver.dtc.vector_table" value=".fsp_dtc_vector_table"/>
+    </config>
+    <config id="config.driver.iic_master">
+      <property id="config.driver.iic_master.param_checking_enable" value="config.driver.iic_master.param_checking_enable.bsp"/>
+      <property id="config.driver.iic_master.dtc_enable" value="config.driver.iic_master.dtc_enable.disabled"/>
+      <property id="config.driver.iic_master.addr_mode_10_bit_enable" value="config.driver.iic_master.addr_mode_10_bit_enable.disabled"/>
+    </config>
+    <config id="config.driver.sci_uart">
+      <property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
+      <property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>
+      <property id="config.driver.sci_uart.dtc_support" value="config.driver.sci_uart.dtc_support.disabled"/>
+      <property id="config.driver.sci_uart.flow_control" value="config.driver.sci_uart.flow_control.disabled"/>
+      <property id="config.driver.sci_uart.rs485" value="config.driver.sci_uart.rs485.disabled"/>
+    </config>
+    <config id="config.driver.rtc">
+      <property id="config.driver.rtc.param_checking_enable" value="config.driver.rtc.param_checking_enable.bsp"/>
+      <property id="config.driver.rtc.open_set_source_clock" value="config.driver.rtc.open_set_source_clock.enabled"/>
+    </config>
+    <config id="config.driver.spi">
+      <property id="config.driver.spi.param_checking_enable" value="config.driver.spi.param_checking_enable.bsp"/>
+      <property id="config.driver.spi.dtc_enable" value="config.driver.spi.dtc_enable.enabled"/>
+      <property id="config.driver.spi.rxi_transmit" value="config.driver.spi.rxi_transmit.disabled"/>
+    </config>
+  </raModuleConfiguration>
+  <raPinConfiguration>
+    <pincfg active="true" name="RA6M1-EK.pincfg" selected="true" symbol="g_bsp_pin_cfg">
+      <configSetting altId="adc1.an00.p004" configurationId="adc1.an00"/>
+      <configSetting altId="adc1.mode.custom" configurationId="adc1.mode"/>
+      <configSetting altId="ctsu0.mode.enabled" configurationId="ctsu0.mode"/>
+      <configSetting altId="ctsu0.ts02.p207" configurationId="ctsu0.ts02"/>
+      <configSetting altId="ctsu0.tscap.p205" configurationId="ctsu0.tscap"/>
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="iic0.mode.enabled.a" configurationId="iic0.mode"/>
+      <configSetting altId="iic0.scl.p400" configurationId="iic0.scl"/>
+      <configSetting altId="iic0.sda.p401" configurationId="iic0.sda"/>
+      <configSetting altId="p004.asel" configurationId="p004"/>
+      <configSetting altId="p004.gpio_mode.gpio_mode_an" configurationId="p004.gpio_mode"/>
+      <configSetting altId="p100.spi0.miso" configurationId="p100"/>
+      <configSetting altId="p100.gpio_mode.gpio_mode_peripheral" configurationId="p100.gpio_mode"/>
+      <configSetting altId="p101.spi0.mosi" configurationId="p101"/>
+      <configSetting altId="p101.gpio_mode.gpio_mode_peripheral" configurationId="p101.gpio_mode"/>
+      <configSetting altId="p102.spi0.rspck" configurationId="p102"/>
+      <configSetting altId="p102.gpio_mode.gpio_mode_peripheral" configurationId="p102.gpio_mode"/>
+      <configSetting altId="p103.spi0.ssl0" configurationId="p103"/>
+      <configSetting altId="p103.gpio_mode.gpio_mode_peripheral" configurationId="p103.gpio_mode"/>
+      <configSetting altId="p104.sci8.rxd" configurationId="p104"/>
+      <configSetting altId="p104.gpio_mode.gpio_mode_peripheral" configurationId="p104.gpio_mode"/>
+      <configSetting altId="p105.sci8.txd" configurationId="p105"/>
+      <configSetting altId="p105.gpio_mode.gpio_mode_peripheral" configurationId="p105.gpio_mode"/>
+      <configSetting altId="p106.output.low" configurationId="p106"/>
+      <configSetting altId="p106.gpio_mode.gpio_mode_out.low" configurationId="p106.gpio_mode"/>
+      <configSetting altId="p107.output.low" configurationId="p107"/>
+      <configSetting altId="p107.gpio_mode.gpio_mode_out.low" configurationId="p107.gpio_mode"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p112.output.low" configurationId="p112"/>
+      <configSetting altId="p112.gpio_mode.gpio_mode_out.low" configurationId="p112.gpio_mode"/>
+      <configSetting altId="p201.input" configurationId="p201"/>
+      <configSetting altId="p201.gpio_mode.gpio_mode_in" configurationId="p201.gpio_mode"/>
+      <configSetting altId="p205.ctsu0.tscap" configurationId="p205"/>
+      <configSetting altId="p205.gpio_mode.gpio_mode_peripheral" configurationId="p205.gpio_mode"/>
+      <configSetting altId="p207.ctsu0.ts02" configurationId="p207"/>
+      <configSetting altId="p207.gpio_mode.gpio_mode_peripheral" configurationId="p207.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+      <configSetting altId="p301.sci2.rxd" configurationId="p301"/>
+      <configSetting altId="p301.gpio_mode.gpio_mode_peripheral" configurationId="p301.gpio_mode"/>
+      <configSetting altId="p302.sci2.txd" configurationId="p302"/>
+      <configSetting altId="p302.gpio_mode.gpio_mode_peripheral" configurationId="p302.gpio_mode"/>
+      <configSetting altId="p400.iic0.scl" configurationId="p400"/>
+      <configSetting altId="p400.gpio_speed.gpio_speed_medium" configurationId="p400.gpio_drivecapacity"/>
+      <configSetting altId="p400.gpio_mode.gpio_mode_peripheral" configurationId="p400.gpio_mode"/>
+      <configSetting altId="p401.iic0.sda" configurationId="p401"/>
+      <configSetting altId="p401.gpio_speed.gpio_speed_medium" configurationId="p401.gpio_drivecapacity"/>
+      <configSetting altId="p401.gpio_mode.gpio_mode_peripheral" configurationId="p401.gpio_mode"/>
+      <configSetting altId="p407.usbfs0.vbus" configurationId="p407"/>
+      <configSetting altId="p407.gpio_mode.gpio_mode_peripheral" configurationId="p407.gpio_mode"/>
+      <configSetting altId="p410.sci0.rxd" configurationId="p410"/>
+      <configSetting altId="p410.gpio_mode.gpio_mode_peripheral" configurationId="p410.gpio_mode"/>
+      <configSetting altId="p411.sci0.txd" configurationId="p411"/>
+      <configSetting altId="p411.gpio_mode.gpio_mode_peripheral" configurationId="p411.gpio_mode"/>
+      <configSetting altId="p415.input" configurationId="p415"/>
+      <configSetting altId="p415.gpio_irq.gpio_irq_enabled" configurationId="p415.gpio_irq"/>
+      <configSetting altId="p415.gpio_mode.gpio_mode_in" configurationId="p415.gpio_mode"/>
+      <configSetting altId="sci0.mode.asynchronous.b" configurationId="sci0.mode"/>
+      <configSetting altId="sci0.pairing.b" configurationId="sci0.pairing"/>
+      <configSetting altId="sci0.rxd.p410" configurationId="sci0.rxd"/>
+      <configSetting altId="sci0.txd.p411" configurationId="sci0.txd"/>
+      <configSetting altId="sci2.mode.asynchronous.a" configurationId="sci2.mode"/>
+      <configSetting altId="sci2.pairing.a" configurationId="sci2.pairing"/>
+      <configSetting altId="sci2.rxd.p301" configurationId="sci2.rxd"/>
+      <configSetting altId="sci2.txd.p302" configurationId="sci2.txd"/>
+      <configSetting altId="sci8.mode.asynchronous.a" configurationId="sci8.mode"/>
+      <configSetting altId="sci8.pairing.a" configurationId="sci8.pairing"/>
+      <configSetting altId="sci8.rxd.p104" configurationId="sci8.rxd"/>
+      <configSetting altId="sci8.txd.p105" configurationId="sci8.txd"/>
+      <configSetting altId="spi0.miso.p100" configurationId="spi0.miso"/>
+      <configSetting altId="spi0.mode.enabled.a" configurationId="spi0.mode"/>
+      <configSetting altId="spi0.mosi.p101" configurationId="spi0.mosi"/>
+      <configSetting altId="spi0.rspck.p102" configurationId="spi0.rspck"/>
+      <configSetting altId="spi0.ssl0.p103" configurationId="spi0.ssl0"/>
+      <configSetting altId="usbfs0.mode.device" configurationId="usbfs0.mode"/>
+      <configSetting altId="usbfs0.vbus.p407" configurationId="usbfs0.vbus"/>
+    </pincfg>
+    <pincfg active="false" name="R7FA6M1AD3CFP.pincfg" selected="false" symbol="">
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+    </pincfg>
+  </raPinConfiguration>
+</raConfiguration>
diff --git a/ports/renesas-ra/boards/EK_RA6M2/configuration.xml b/ports/renesas-ra/boards/EK_RA6M2/configuration.xml
new file mode 100644
index 0000000000000..384e55e3e9ea9
--- /dev/null
+++ b/ports/renesas-ra/boards/EK_RA6M2/configuration.xml
@@ -0,0 +1,915 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<raConfiguration version="7">
+  <generalSettings>
+    <option key="#Board#" value="board.ra6m2ek"/>
+    <option key="CPU" value="RA6M2"/>
+    <option key="Core" value="CM4"/>
+    <option key="#TargetName#" value="R7FA6M2AF3CFB"/>
+    <option key="#TargetARCHITECTURE#" value="cortex-m4"/>
+    <option key="#DeviceCommand#" value="R7FA6M2AF"/>
+    <option key="#RTOS#" value="_none"/>
+    <option key="#pinconfiguration#" value="RA6M2-EK.pincfg"/>
+    <option key="#FSPVersion#" value="4.4.0"/>
+    <option key="#ConfigurationFragments#" value="Renesas##BSP##Board##ra6m2_ek##"/>
+    <option key="#SELECTED_TOOLCHAIN#" value="gcc-arm-embedded"/>
+    <option key="#ToolchainVersion#" value="9.2.1.20191025"/>
+  </generalSettings>
+  <raBspConfiguration>
+    <config id="config.bsp.ra6m2.R7FA6M2AF3CFB">
+      <property id="config.bsp.part_number" value="config.bsp.part_number.value"/>
+      <property id="config.bsp.rom_size_bytes" value="config.bsp.rom_size_bytes.value"/>
+      <property id="config.bsp.rom_size_bytes_hidden" value="1048576"/>
+      <property id="config.bsp.ram_size_bytes" value="config.bsp.ram_size_bytes.value"/>
+      <property id="config.bsp.data_flash_size_bytes" value="config.bsp.data_flash_size_bytes.value"/>
+      <property id="config.bsp.package_style" value="config.bsp.package_style.value"/>
+      <property id="config.bsp.package_pins" value="config.bsp.package_pins.value"/>
+      <property id="config.bsp.irq_count_hidden" value="96"/>
+    </config>
+    <config id="config.bsp.ra6m2">
+      <property id="config.bsp.series" value="config.bsp.series.value"/>
+    </config>
+    <config id="config.bsp.ra6m2.fsp">
+      <property id="config.bsp.fsp.OFS0.iwdt_start_mode" value="config.bsp.fsp.OFS0.iwdt_start_mode.disabled"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_timeout" value="config.bsp.fsp.OFS0.iwdt_timeout.2048"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_divisor" value="config.bsp.fsp.OFS0.iwdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_end" value="config.bsp.fsp.OFS0.iwdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_start" value="config.bsp.fsp.OFS0.iwdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_reset_interrupt" value="config.bsp.fsp.OFS0.iwdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_stop_control" value="config.bsp.fsp.OFS0.iwdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS0.wdt_start_mode" value="config.bsp.fsp.OFS0.wdt_start_mode.register"/>
+      <property id="config.bsp.fsp.OFS0.wdt_timeout" value="config.bsp.fsp.OFS0.wdt_timeout.16384"/>
+      <property id="config.bsp.fsp.OFS0.wdt_divisor" value="config.bsp.fsp.OFS0.wdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_end" value="config.bsp.fsp.OFS0.wdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_start" value="config.bsp.fsp.OFS0.wdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.wdt_reset_interrupt" value="config.bsp.fsp.OFS0.wdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.wdt_stop_control" value="config.bsp.fsp.OFS0.wdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0.start" value="config.bsp.fsp.OFS1.voltage_detection0.start.disabled"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0_level" value="config.bsp.fsp.OFS1.voltage_detection0_level.280"/>
+      <property id="config.bsp.fsp.OFS1.hoco_osc" value="config.bsp.fsp.OFS1.hoco_osc.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_enable" value="config.bsp.fsp.mpu_pc0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_start" value="0xFFFFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc0_end" value="0xFFFFFFFF"/>
+      <property id="config.bsp.fsp.mpu_pc1_enable" value="config.bsp.fsp.mpu_pc1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc1_start" value="0xFFFFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc1_end" value="0xFFFFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg0_enable" value="config.bsp.fsp.mpu_reg0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg1_enable" value="config.bsp.fsp.mpu_reg1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg1_start" value="0x200FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg1_end" value="0x200FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg2_enable" value="config.bsp.fsp.mpu_reg2_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg2_start" value="0x407FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg2_end" value="0x407FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg3_enable" value="config.bsp.fsp.mpu_reg3_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg3_start" value="0x400DFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg3_end" value="0x400DFFFF"/>
+      <property id="config.bsp.fsp.hoco_fll" value="config.bsp.fsp.hoco_fll.disabled"/>
+      <property id="config.bsp.common.main_osc_wait" value="config.bsp.common.main_osc_wait.wait_8163"/>
+      <property id="config.bsp.fsp.mcu.adc.max_freq_hz" value="60000000"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.max_baud" value="20000000"/>
+      <property id="config.bsp.fsp.mcu.adc.sample_and_hold" value="1"/>
+      <property id="config.bsp.fsp.mcu.sci_spi.max_bitrate" value="30000000"/>
+      <property id="config.bsp.fsp.mcu.spi.max_bitrate" value="30000000"/>
+      <property id="config.bsp.fsp.mcu.iic_master.rate.rate_fastplus" value="1"/>
+      <property id="config.bsp.fsp.mcu.iic_master.fastplus_channels" value="0x1"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.rate.rate_fastplus" value="1"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.fastplus_channels" value="0x1"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.cstpen_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.gpt.pin_count_source_channels" value="0xFFFF"/>
+      <property id="config.bsp.common.id_mode" value="config.bsp.common.id_mode.unlocked"/>
+      <property id="config.bsp.common.id_code" value="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/>
+      <property id="config.bsp.common.id1" value=""/>
+      <property id="config.bsp.common.id2" value=""/>
+      <property id="config.bsp.common.id3" value=""/>
+      <property id="config.bsp.common.id4" value=""/>
+      <property id="config.bsp.common.id_fixed" value=""/>
+    </config>
+    <config id="config.bsp.ra">
+      <property id="config.bsp.common.main" value="0x4000"/>
+      <property id="config.bsp.common.heap" value="0x4d000"/>
+      <property id="config.bsp.common.vcc" value="3300"/>
+      <property id="config.bsp.common.checking" value="config.bsp.common.checking.disabled"/>
+      <property id="config.bsp.common.assert" value="config.bsp.common.assert.none"/>
+      <property id="config.bsp.common.error_log" value="config.bsp.common.error_log.none"/>
+      <property id="config.bsp.common.soft_reset" value="config.bsp.common.soft_reset.disabled"/>
+      <property id="config.bsp.common.main_osc_populated" value="config.bsp.common.main_osc_populated.enabled"/>
+      <property id="config.bsp.common.pfs_protect" value="config.bsp.common.pfs_protect.enabled"/>
+      <property id="config.bsp.common.c_runtime_init" value="config.bsp.common.c_runtime_init.enabled"/>
+      <property id="config.bsp.common.early_init" value="config.bsp.common.early_init.disabled"/>
+      <property id="config.bsp.common.main_osc_clock_source" value="config.bsp.common.main_osc_clock_source.crystal"/>
+      <property id="config.bsp.common.subclock_populated" value="config.bsp.common.subclock_populated.enabled"/>
+      <property id="config.bsp.common.subclock_drive" value="config.bsp.common.subclock_drive.standard"/>
+      <property id="config.bsp.common.subclock_stabilization_ms" value="1000"/>
+    </config>
+  </raBspConfiguration>
+  <raClockConfiguration>
+    <node id="board.clock.xtal.freq" mul="12000000" option="_edit"/>
+    <node id="board.clock.pll.source" option="board.clock.pll.source.xtal"/>
+    <node id="board.clock.hoco.freq" option="board.clock.hoco.freq.20m"/>
+    <node id="board.clock.loco.freq" option="board.clock.loco.freq.32768"/>
+    <node id="board.clock.moco.freq" option="board.clock.moco.freq.8m"/>
+    <node id="board.clock.subclk.freq" option="board.clock.subclk.freq.32768"/>
+    <node id="board.clock.pll.div" option="board.clock.pll.div.1"/>
+    <node id="board.clock.pll.mul" option="board.clock.pll.mul.200"/>
+    <node id="board.clock.pll.display" option="board.clock.pll.display.value"/>
+    <node id="board.clock.clock.source" option="board.clock.clock.source.pll"/>
+    <node id="board.clock.iclk.div" option="board.clock.iclk.div.2"/>
+    <node id="board.clock.iclk.display" option="board.clock.iclk.display.value"/>
+    <node id="board.clock.pclka.div" option="board.clock.pclka.div.2"/>
+    <node id="board.clock.pclka.display" option="board.clock.pclka.display.value"/>
+    <node id="board.clock.pclkb.div" option="board.clock.pclkb.div.4"/>
+    <node id="board.clock.pclkb.display" option="board.clock.pclkb.display.value"/>
+    <node id="board.clock.pclkc.div" option="board.clock.pclkc.div.4"/>
+    <node id="board.clock.pclkc.display" option="board.clock.pclkc.display.value"/>
+    <node id="board.clock.pclkd.div" option="board.clock.pclkd.div.2"/>
+    <node id="board.clock.pclkd.display" option="board.clock.pclkd.display.value"/>
+    <node id="board.clock.sdclkout.enable" option="board.clock.sdclkout.enable.enabled"/>
+    <node id="board.clock.sdclkout.display" option="board.clock.sdclkout.display.value"/>
+    <node id="board.clock.bclk.div" option="board.clock.bclk.div.2"/>
+    <node id="board.clock.bclk.display" option="board.clock.bclk.display.value"/>
+    <node id="board.clock.bclkout.div" option="board.clock.bclkout.div.2"/>
+    <node id="board.clock.bclkout.display" option="board.clock.bclkout.display.value"/>
+    <node id="board.clock.uclk.div" option="board.clock.uclk.div.5"/>
+    <node id="board.clock.uclk.display" option="board.clock.uclk.display.value"/>
+    <node id="board.clock.fclk.div" option="board.clock.fclk.div.4"/>
+    <node id="board.clock.fclk.display" option="board.clock.fclk.display.value"/>
+    <node id="board.clock.clkout.source" option="board.clock.clkout.source.disabled"/>
+    <node id="board.clock.clkout.div" option="board.clock.clkout.div.1"/>
+    <node id="board.clock.clkout.display" option="board.clock.clkout.display.value"/>
+  </raClockConfiguration>
+  <raComponentSelection>
+    <component apiversion="" class="BSP" condition="" group="Board" subgroup="ra6m2_ek" variant="" vendor="Renesas" version="4.4.0">
+      <description>RA6M2-EK Board Support Files</description>
+      <originalPack>Renesas.RA_board_ra6m2_ek.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m2" subgroup="device" variant="R7FA6M2AF3CFB" vendor="Renesas" version="4.4.0">
+      <description>Board support package for R7FA6M2AF3CFB</description>
+      <originalPack>Renesas.RA_mcu_ra6m2.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m2" subgroup="device" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA6M2</description>
+      <originalPack>Renesas.RA_mcu_ra6m2.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra6m2" subgroup="fsp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA6M2 - FSP Data</description>
+      <originalPack>Renesas.RA_mcu_ra6m2.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.9.0+renesas.0.fsp.4.4.0">
+      <description>Arm CMSIS Version 5 - Core (M)</description>
+      <originalPack>Arm.CMSIS5.5.9.0+renesas.0.fsp.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board Support Package Common Files</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_adc" variant="" vendor="Renesas" version="4.4.0">
+      <description>A/D Converter</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_agt" variant="" vendor="Renesas" version="4.4.0">
+      <description>Asynchronous General Purpose Timer</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Data Transfer Controller</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_flash_hp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Flash Memory High Performance</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="4.4.0">
+      <description>External Interrupt</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_iic_master" variant="" vendor="Renesas" version="4.4.0">
+      <description>I2C Master Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="4.4.0">
+      <description>I/O Port</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_lpm" variant="" vendor="Renesas" version="4.4.0">
+      <description>Low Power Modes</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_rtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Real Time Clock</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="4.4.0">
+      <description>SCI UART</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_spi" variant="" vendor="Renesas" version="4.4.0">
+      <description>Serial Peripheral Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+  </raComponentSelection>
+  <raElcConfiguration/>
+  <raIcuConfiguration/>
+  <raModuleConfiguration>
+    <module id="module.driver.ioport_on_ioport.0">
+      <property id="module.driver.ioport.name" value="g_ioport"/>
+      <property id="module.driver.ioport.elc_trigger_ioport1" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport2" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport3" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport4" value="_disabled"/>
+      <property id="module.driver.ioport.pincfg" value="g_bsp_pin_cfg"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.453650676">
+      <property id="module.driver.uart.name" value="g_uart0"/>
+      <property id="module.driver.uart.channel" value="0"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.256250540">
+      <property id="module.driver.uart.name" value="g_uart7"/>
+      <property id="module.driver.uart.channel" value="7"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.1439287763">
+      <property id="module.driver.uart.name" value="g_uart9"/>
+      <property id="module.driver.uart.channel" value="9"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.rtc_on_rtc.1968812756">
+      <property id="module.driver.rtc.name" value="g_rtc0"/>
+      <property id="module.driver.rtc.clock_source" value="module.driver.rtc.clock_source.clock_source_loco"/>
+      <property id="module.driver.rtc.freq_cmpr_value_loco" value="255"/>
+      <property id="module.driver.rtc.err_adjustment_mode" value="module.driver.rtc.err_adjustment_mode.m1"/>
+      <property id="module.driver.rtc.err_adjustment_period" value="module.driver.rtc.err_adjustment_period.p1"/>
+      <property id="module.driver.rtc.err_adjustment_type" value="module.driver.rtc.err_adjustment_type.t1"/>
+      <property id="module.driver.rtc.err_adjustment_value" value="0"/>
+      <property id="module.driver.rtc.p_callback" value="NULL"/>
+      <property id="module.driver.rtc.alarm_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.periodic_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.carry_ipl" value="board.icu.common.irq.priority14"/>
+    </module>
+    <module id="module.driver.flash_on_flash_hp.730286241">
+      <property id="module.driver.flash.name" value="g_flash0"/>
+      <property id="module.driver.flash.data_flash_bgo" value="module.driver.flash.data_flash_bgo.disabled"/>
+      <property id="module.driver.flash.p_callback" value="NULL"/>
+      <property id="module.driver.flash.ipl" value="_disabled"/>
+      <property id="module.driver.flash.err_ipl" value="_disabled"/>
+    </module>
+    <module id="module.driver.timer_on_agt.1049600668">
+      <property id="module.driver.timer.name" value="g_timer0"/>
+      <property id="module.driver.timer.channel" value="0"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.timer_on_agt.296366941">
+      <property id="module.driver.timer.name" value="g_timer1"/>
+      <property id="module.driver.timer.channel" value="0"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.919825871">
+      <property id="module.driver.external_irq.name" value="g_external_irq0"/>
+      <property id="module.driver.external_irq.channel" value="0"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1443927563">
+      <property id="module.driver.external_irq.name" value="g_external_irq1"/>
+      <property id="module.driver.external_irq.channel" value="1"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.362505242">
+      <property id="module.driver.external_irq.name" value="g_external_irq2"/>
+      <property id="module.driver.external_irq.channel" value="2"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.279316070">
+      <property id="module.driver.external_irq.name" value="g_external_irq3"/>
+      <property id="module.driver.external_irq.channel" value="3"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.708549426">
+      <property id="module.driver.external_irq.name" value="g_external_irq4"/>
+      <property id="module.driver.external_irq.channel" value="4"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.628272496">
+      <property id="module.driver.external_irq.name" value="g_external_irq5"/>
+      <property id="module.driver.external_irq.channel" value="5"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1723173102">
+      <property id="module.driver.external_irq.name" value="g_external_irq6"/>
+      <property id="module.driver.external_irq.channel" value="6"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.389774247">
+      <property id="module.driver.external_irq.name" value="g_external_irq7"/>
+      <property id="module.driver.external_irq.channel" value="7"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1279339106">
+      <property id="module.driver.external_irq.name" value="g_external_irq8"/>
+      <property id="module.driver.external_irq.channel" value="8"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.373807478">
+      <property id="module.driver.external_irq.name" value="g_external_irq9"/>
+      <property id="module.driver.external_irq.channel" value="9"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1721959722">
+      <property id="module.driver.external_irq.name" value="g_external_irq10"/>
+      <property id="module.driver.external_irq.channel" value="10"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.399600387">
+      <property id="module.driver.external_irq.name" value="g_external_irq11"/>
+      <property id="module.driver.external_irq.channel" value="11"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.398308673">
+      <property id="module.driver.external_irq.name" value="g_external_irq12"/>
+      <property id="module.driver.external_irq.channel" value="12"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.65490198">
+      <property id="module.driver.external_irq.name" value="g_external_irq13"/>
+      <property id="module.driver.external_irq.channel" value="13"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1279095761">
+      <property id="module.driver.external_irq.name" value="g_external_irq14"/>
+      <property id="module.driver.external_irq.channel" value="14"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.2027499651">
+      <property id="module.driver.external_irq.name" value="g_external_irq15"/>
+      <property id="module.driver.external_irq.channel" value="15"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.spi_on_spi.945068697">
+      <property id="module.driver.spi.name" value="g_spi0"/>
+      <property id="module.driver.spi.channel" value="0"/>
+      <property id="module.driver.spi.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.eri_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.operating_mode" value="module.driver.spi.operating_mode.mode_master"/>
+      <property id="module.driver.spi.clk_phase" value="module.driver.spi.clk_phase.clk_phase_edge_odd"/>
+      <property id="module.driver.spi.clk_polarity" value="module.driver.spi.clk_polarity.clk_polarity_low"/>
+      <property id="module.driver.spi.mode_fault" value="module.driver.spi.mode_fault.mode_fault_error_disable"/>
+      <property id="module.driver.spi.bit_order" value="module.driver.spi.bit_order.bit_order_msb_first"/>
+      <property id="module.driver.spi.p_callback" value="spi_callback"/>
+      <property id="module.driver.spi.spi_clksyn" value="module.driver.spi.spi_clksyn.spi_clksyn"/>
+      <property id="module.driver.spi.spi_comm" value="module.driver.spi.spi_comm.full_duplex"/>
+      <property id="module.driver.spi.ssl_polarity" value="module.driver.spi.ssl_polarity.low"/>
+      <property id="module.driver.spi.ssl_select" value="module.driver.spi.ssl_select.zero"/>
+      <property id="module.driver.spi.mosi_idle_value_fixing" value="module.driver.spi.mosi_idle_value_fixing.disable"/>
+      <property id="module.driver.spi.parity" value="module.driver.spi.parity_mode.disable"/>
+      <property id="module.driver.spi.byte_swap" value="module.driver.spi.byte_swap.disable"/>
+      <property id="module.driver.spi.bitrate" value="16000000"/>
+      <property id="module.driver.spi.spck_delay" value="module.driver.spi.spck_delay.one"/>
+      <property id="module.driver.spi.ssl_negation_delay" value="module.driver.spi.ssl_negation_delay.one"/>
+      <property id="module.driver.spi.next_access_delay" value="module.driver.spi.next_access_delay.one"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1694356003">
+      <property id="module.driver.transfer.name" value="g_transfer0"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1568498578">
+      <property id="module.driver.transfer.name" value="g_transfer1"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.spi_on_spi.1644144363">
+      <property id="module.driver.spi.name" value="g_spi1"/>
+      <property id="module.driver.spi.channel" value="1"/>
+      <property id="module.driver.spi.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.eri_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.operating_mode" value="module.driver.spi.operating_mode.mode_master"/>
+      <property id="module.driver.spi.clk_phase" value="module.driver.spi.clk_phase.clk_phase_edge_odd"/>
+      <property id="module.driver.spi.clk_polarity" value="module.driver.spi.clk_polarity.clk_polarity_low"/>
+      <property id="module.driver.spi.mode_fault" value="module.driver.spi.mode_fault.mode_fault_error_disable"/>
+      <property id="module.driver.spi.bit_order" value="module.driver.spi.bit_order.bit_order_msb_first"/>
+      <property id="module.driver.spi.p_callback" value="spi_callback"/>
+      <property id="module.driver.spi.spi_clksyn" value="module.driver.spi.spi_clksyn.spi_clksyn"/>
+      <property id="module.driver.spi.spi_comm" value="module.driver.spi.spi_comm.full_duplex"/>
+      <property id="module.driver.spi.ssl_polarity" value="module.driver.spi.ssl_polarity.low"/>
+      <property id="module.driver.spi.ssl_select" value="module.driver.spi.ssl_select.zero"/>
+      <property id="module.driver.spi.mosi_idle_value_fixing" value="module.driver.spi.mosi_idle_value_fixing.disable"/>
+      <property id="module.driver.spi.parity" value="module.driver.spi.parity_mode.disable"/>
+      <property id="module.driver.spi.byte_swap" value="module.driver.spi.byte_swap.disable"/>
+      <property id="module.driver.spi.bitrate" value="16000000"/>
+      <property id="module.driver.spi.spck_delay" value="module.driver.spi.spck_delay.one"/>
+      <property id="module.driver.spi.ssl_negation_delay" value="module.driver.spi.ssl_negation_delay.one"/>
+      <property id="module.driver.spi.next_access_delay" value="module.driver.spi.next_access_delay.one"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.2070678961">
+      <property id="module.driver.transfer.name" value="g_transfer2"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.539924091">
+      <property id="module.driver.transfer.name" value="g_transfer3"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.lpm.2130537905">
+      <property id="module.driver.lpm.name" value="g_lpm0"/>
+      <property id="module.driver.lpm.mode" value="module.driver.lpm.mode.sleep"/>
+      <property id="module.driver.lpm.output_port_enable_standby" value="module.driver.lpm.output_port_enable_standby.no_change"/>
+      <property id="module.driver.lpm.standby_wake_sources" value="module.driver.lpm.standby_wake_rtcalm"/>
+      <property id="module.driver.lpm.snooze_request" value="module.driver.lpm.snooze_request_rxd0_falling"/>
+      <property id="module.driver.lpm.snooze_end_sources" value=""/>
+      <property id="module.driver.lpm.snooze_dtc" value="module.driver.lpm.snooze_dtc.lpm_snooze_dtc_disable"/>
+      <property id="module.driver.lpm.snooze_cancel_source" value="enum.mcu.lpm.snooze_cancel_source.none"/>
+      <property id="module.driver.lpm.ram_power_enable" value=""/>
+      <property id="module.driver.lpm.tcm_power_enable" value="enum.mcu.lpm.tcm_power_enable.disable"/>
+      <property id="module.driver.lpm.standby_ram_power_enable" value="enum.mcu.lpm.standby_ram_power_enable.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll1" value="enum.mcu.lpm.oscillator_ldo_state.pll1.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll2" value="enum.mcu.lpm.oscillator_ldo_state.pll2.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.hoco" value="enum.mcu.lpm.oscillator_ldo_state.hoco.disable"/>
+      <property id="module.driver.lpm.io_port_deep_standby_exit" value="module.driver.lpm.io_port_deep_standby_exit.no_change"/>
+      <property id="module.driver.lpm.power_supply_deep_standby" value="module.driver.lpm.power_supply_deep_standby.deepcut0"/>
+      <property id="module.driver.lpm.deep_standby_cancel_sources" value=""/>
+      <property id="module.driver.lpm.deep_standby_cancel_edges" value=""/>
+    </module>
+    <module id="module.driver.adc_on_adc.837087737">
+      <property id="module.driver.adc.name" value="g_adc0"/>
+      <property id="module.driver.adc.unit" value="0"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_12_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.vrefh"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <module id="module.driver.adc_on_adc.1217809666">
+      <property id="module.driver.adc.name" value="g_adc1"/>
+      <property id="module.driver.adc.unit" value="1"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_12_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.vrefh"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <module id="module.driver.i2c_on_iic_master.538665417">
+      <property id="module.driver.i2c_master.name" value="g_i2c_master2"/>
+      <property id="module.driver.i2c_master.channel" value="2"/>
+      <property id="module.driver.i2c_master.rate" value="module.driver.i2c_master.rate.rate_standard"/>
+      <property id="module.driver.i2c_master.rise_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.fall_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.duty" value="50"/>
+      <property id="module.driver.i2c_master.slave" value="0x00"/>
+      <property id="module.driver.i2c_master.addr_mode" value="module.driver.i2c_master.addr_mode.addr_mode_7bit"/>
+      <property id="module.driver.i2c_master.timeout_mode" value="module.driver.i2c_master.timeout_mode.short_mode"/>
+      <property id="module.driver.i2c_master.timeout_scl_low" value="module.driver.i2c_master.timeout_scl_low.enabled"/>
+      <property id="module.driver.i2c_master.p_callback" value="callback_iic"/>
+      <property id="module.driver.i2c_master.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <context id="_hal.0">
+      <stack module="module.driver.ioport_on_ioport.0"/>
+      <stack module="module.driver.uart_on_sci_uart.453650676"/>
+      <stack module="module.driver.uart_on_sci_uart.256250540"/>
+      <stack module="module.driver.uart_on_sci_uart.1439287763"/>
+      <stack module="module.driver.rtc_on_rtc.1968812756"/>
+      <stack module="module.driver.flash_on_flash_hp.730286241"/>
+      <stack module="module.driver.timer_on_agt.1049600668"/>
+      <stack module="module.driver.timer_on_agt.296366941"/>
+      <stack module="module.driver.external_irq_on_icu.919825871"/>
+      <stack module="module.driver.external_irq_on_icu.1443927563"/>
+      <stack module="module.driver.external_irq_on_icu.362505242"/>
+      <stack module="module.driver.external_irq_on_icu.279316070"/>
+      <stack module="module.driver.external_irq_on_icu.708549426"/>
+      <stack module="module.driver.external_irq_on_icu.628272496"/>
+      <stack module="module.driver.external_irq_on_icu.1723173102"/>
+      <stack module="module.driver.external_irq_on_icu.389774247"/>
+      <stack module="module.driver.external_irq_on_icu.1279339106"/>
+      <stack module="module.driver.external_irq_on_icu.373807478"/>
+      <stack module="module.driver.external_irq_on_icu.1721959722"/>
+      <stack module="module.driver.external_irq_on_icu.399600387"/>
+      <stack module="module.driver.external_irq_on_icu.398308673"/>
+      <stack module="module.driver.external_irq_on_icu.65490198"/>
+      <stack module="module.driver.external_irq_on_icu.1279095761"/>
+      <stack module="module.driver.external_irq_on_icu.2027499651"/>
+      <stack module="module.driver.spi_on_spi.945068697">
+        <stack module="module.driver.transfer_on_dtc.1694356003" requires="module.driver.spi_on_spi.requires.transfer_tx"/>
+        <stack module="module.driver.transfer_on_dtc.1568498578" requires="module.driver.spi_on_spi.requires.transfer_rx"/>
+      </stack>
+      <stack module="module.driver.spi_on_spi.1644144363">
+        <stack module="module.driver.transfer_on_dtc.2070678961" requires="module.driver.spi_on_spi.requires.transfer_tx"/>
+        <stack module="module.driver.transfer_on_dtc.539924091" requires="module.driver.spi_on_spi.requires.transfer_rx"/>
+      </stack>
+      <stack module="module.driver.lpm.2130537905"/>
+      <stack module="module.driver.adc_on_adc.837087737"/>
+      <stack module="module.driver.adc_on_adc.1217809666"/>
+      <stack module="module.driver.i2c_on_iic_master.538665417"/>
+    </context>
+    <config id="config.driver.flash_hp">
+      <property id="config.driver.flash_hp.param_checking_enable" value="config.flash_hp.param_checking_enable.bsp"/>
+      <property id="config.driver.flash_hp.param_code_flash_programming_enable" value="config.driver.flash_hp.param_code_flash_programming_enable.enabled"/>
+      <property id="config.driver.flash_hp.param_data_flash_programming_enable" value="config.driver.flash_hp.param_data_flash_programming_enable.disabled"/>
+    </config>
+    <config id="config.driver.lpm">
+      <property id="config.driver.lpm.param_checking_enable" value="config.driver.lpm.param_checking_enable.bsp"/>
+      <property id="config.driver.lpm.standby_limit" value="config.driver.lpm.standby_limit.disabled"/>
+    </config>
+    <config id="config.driver.ioport">
+      <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
+    </config>
+    <config id="config.driver.adc">
+      <property id="config.driver.adc.param_checking_enable" value="config.driver.adc.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.icu">
+      <property id="config.driver.icu.param_checking_enable" value="config.driver.icu.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.agt">
+      <property id="config.driver.agt.param_checking_enable" value="config.driver.agt.param_checking_enable.bsp"/>
+      <property id="config.driver.agt.output_support_enable" value="config.driver.agt.output_support_enable.disabled"/>
+      <property id="config.driver.agt.input_support_enable" value="config.driver.agt.input_support_enable.disabled"/>
+    </config>
+    <config id="config.driver.dtc">
+      <property id="config.driver.dtc.param_checking_enable" value="config.driver.dtc.param_checking_enable.bsp"/>
+      <property id="config.driver.dtc.vector_table" value=".fsp_dtc_vector_table"/>
+    </config>
+    <config id="config.driver.iic_master">
+      <property id="config.driver.iic_master.param_checking_enable" value="config.driver.iic_master.param_checking_enable.bsp"/>
+      <property id="config.driver.iic_master.dtc_enable" value="config.driver.iic_master.dtc_enable.disabled"/>
+      <property id="config.driver.iic_master.addr_mode_10_bit_enable" value="config.driver.iic_master.addr_mode_10_bit_enable.disabled"/>
+    </config>
+    <config id="config.driver.sci_uart">
+      <property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
+      <property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>
+      <property id="config.driver.sci_uart.dtc_support" value="config.driver.sci_uart.dtc_support.disabled"/>
+      <property id="config.driver.sci_uart.flow_control" value="config.driver.sci_uart.flow_control.disabled"/>
+      <property id="config.driver.sci_uart.rs485" value="config.driver.sci_uart.rs485.disabled"/>
+    </config>
+    <config id="config.driver.rtc">
+      <property id="config.driver.rtc.param_checking_enable" value="config.driver.rtc.param_checking_enable.bsp"/>
+      <property id="config.driver.rtc.open_set_source_clock" value="config.driver.rtc.open_set_source_clock.enabled"/>
+    </config>
+    <config id="config.driver.spi">
+      <property id="config.driver.spi.param_checking_enable" value="config.driver.spi.param_checking_enable.bsp"/>
+      <property id="config.driver.spi.dtc_enable" value="config.driver.spi.dtc_enable.enabled"/>
+      <property id="config.driver.spi.rxi_transmit" value="config.driver.spi.rxi_transmit.disabled"/>
+    </config>
+  </raModuleConfiguration>
+  <raPinConfiguration>
+    <pincfg active="true" name="RA6M2-EK.pincfg" selected="true" symbol="g_bsp_pin_cfg">
+      <configSetting altId="adc1.an00.p004" configurationId="adc1.an00"/>
+      <configSetting altId="adc1.mode.custom" configurationId="adc1.mode"/>
+      <configSetting altId="ctsu0.mode.enabled" configurationId="ctsu0.mode"/>
+      <configSetting altId="ctsu0.ts02.p207" configurationId="ctsu0.ts02"/>
+      <configSetting altId="ctsu0.tscap.p205" configurationId="ctsu0.tscap"/>
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="iic2.mode.enabled.a" configurationId="iic2.mode"/>
+      <configSetting altId="iic2.scl.p512" configurationId="iic2.scl"/>
+      <configSetting altId="iic2.sda.p511" configurationId="iic2.sda"/>
+      <configSetting altId="p004.asel" configurationId="p004"/>
+      <configSetting altId="p004.gpio_mode.gpio_mode_an" configurationId="p004.gpio_mode"/>
+      <configSetting altId="p100.spi0.miso" configurationId="p100"/>
+      <configSetting altId="p100.gpio_mode.gpio_mode_peripheral" configurationId="p100.gpio_mode"/>
+      <configSetting altId="p101.spi0.mosi" configurationId="p101"/>
+      <configSetting altId="p101.gpio_mode.gpio_mode_peripheral" configurationId="p101.gpio_mode"/>
+      <configSetting altId="p102.spi0.rspck" configurationId="p102"/>
+      <configSetting altId="p102.gpio_mode.gpio_mode_peripheral" configurationId="p102.gpio_mode"/>
+      <configSetting altId="p103.spi0.ssl0" configurationId="p103"/>
+      <configSetting altId="p103.gpio_mode.gpio_mode_peripheral" configurationId="p103.gpio_mode"/>
+      <configSetting altId="p105.input" configurationId="p105"/>
+      <configSetting altId="p105.gpio_irq.gpio_irq_enabled" configurationId="p105.gpio_irq"/>
+      <configSetting altId="p105.gpio_mode.gpio_mode_in" configurationId="p105.gpio_mode"/>
+      <configSetting altId="p106.output.low" configurationId="p106"/>
+      <configSetting altId="p106.gpio_mode.gpio_mode_out.low" configurationId="p106.gpio_mode"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p205.ctsu0.tscap" configurationId="p205"/>
+      <configSetting altId="p205.gpio_mode.gpio_mode_peripheral" configurationId="p205.gpio_mode"/>
+      <configSetting altId="p207.ctsu0.ts02" configurationId="p207"/>
+      <configSetting altId="p207.gpio_mode.gpio_mode_peripheral" configurationId="p207.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+      <configSetting altId="p400.output.low" configurationId="p400"/>
+      <configSetting altId="p400.gpio_mode.gpio_mode_out.low" configurationId="p400.gpio_mode"/>
+      <configSetting altId="p401.sci7.txd" configurationId="p401"/>
+      <configSetting altId="p401.gpio_mode.gpio_mode_peripheral" configurationId="p401.gpio_mode"/>
+      <configSetting altId="p402.sci7.rxd" configurationId="p402"/>
+      <configSetting altId="p402.gpio_mode.gpio_mode_peripheral" configurationId="p402.gpio_mode"/>
+      <configSetting altId="p407.usbfs0.vbus" configurationId="p407"/>
+      <configSetting altId="p407.gpio_mode.gpio_mode_peripheral" configurationId="p407.gpio_mode"/>
+      <configSetting altId="p410.sci0.rxd" configurationId="p410"/>
+      <configSetting altId="p410.gpio_mode.gpio_mode_peripheral" configurationId="p410.gpio_mode"/>
+      <configSetting altId="p411.sci0.txd" configurationId="p411"/>
+      <configSetting altId="p411.gpio_mode.gpio_mode_peripheral" configurationId="p411.gpio_mode"/>
+      <configSetting altId="p511.iic2.sda" configurationId="p511"/>
+      <configSetting altId="p511.gpio_speed.gpio_speed_medium" configurationId="p511.gpio_drivecapacity"/>
+      <configSetting altId="p511.gpio_mode.gpio_mode_peripheral" configurationId="p511.gpio_mode"/>
+      <configSetting altId="p512.iic2.scl" configurationId="p512"/>
+      <configSetting altId="p512.gpio_speed.gpio_speed_medium" configurationId="p512.gpio_drivecapacity"/>
+      <configSetting altId="p512.gpio_mode.gpio_mode_peripheral" configurationId="p512.gpio_mode"/>
+      <configSetting altId="p601.sci9.rxd" configurationId="p601"/>
+      <configSetting altId="p601.gpio_mode.gpio_mode_peripheral" configurationId="p601.gpio_mode"/>
+      <configSetting altId="p602.sci9.txd" configurationId="p602"/>
+      <configSetting altId="p602.gpio_mode.gpio_mode_peripheral" configurationId="p602.gpio_mode"/>
+      <configSetting altId="p700.spi1.miso" configurationId="p700"/>
+      <configSetting altId="p700.gpio_mode.gpio_mode_peripheral" configurationId="p700.gpio_mode"/>
+      <configSetting altId="p701.spi1.mosi" configurationId="p701"/>
+      <configSetting altId="p701.gpio_mode.gpio_mode_peripheral" configurationId="p701.gpio_mode"/>
+      <configSetting altId="p702.spi1.rspck" configurationId="p702"/>
+      <configSetting altId="p702.gpio_mode.gpio_mode_peripheral" configurationId="p702.gpio_mode"/>
+      <configSetting altId="p703.spi1.ssl0" configurationId="p703"/>
+      <configSetting altId="p703.gpio_mode.gpio_mode_peripheral" configurationId="p703.gpio_mode"/>
+      <configSetting altId="sci0.mode.asynchronous.b" configurationId="sci0.mode"/>
+      <configSetting altId="sci0.pairing.b" configurationId="sci0.pairing"/>
+      <configSetting altId="sci0.rxd.p410" configurationId="sci0.rxd"/>
+      <configSetting altId="sci0.txd.p411" configurationId="sci0.txd"/>
+      <configSetting altId="sci7.mode.asynchronous.a" configurationId="sci7.mode"/>
+      <configSetting altId="sci7.pairing.a" configurationId="sci7.pairing"/>
+      <configSetting altId="sci7.rxd.p402" configurationId="sci7.rxd"/>
+      <configSetting altId="sci7.txd.p401" configurationId="sci7.txd"/>
+      <configSetting altId="sci9.mode.asynchronous.c" configurationId="sci9.mode"/>
+      <configSetting altId="sci9.pairing.c" configurationId="sci9.pairing"/>
+      <configSetting altId="sci9.rxd.p601" configurationId="sci9.rxd"/>
+      <configSetting altId="sci9.txd.p602" configurationId="sci9.txd"/>
+      <configSetting altId="spi0.miso.p100" configurationId="spi0.miso"/>
+      <configSetting altId="spi0.mode.enabled.a" configurationId="spi0.mode"/>
+      <configSetting altId="spi0.mosi.p101" configurationId="spi0.mosi"/>
+      <configSetting altId="spi0.rspck.p102" configurationId="spi0.rspck"/>
+      <configSetting altId="spi0.ssl0.p103" configurationId="spi0.ssl0"/>
+      <configSetting altId="spi1.miso.p700" configurationId="spi1.miso"/>
+      <configSetting altId="spi1.mode.enabled.c" configurationId="spi1.mode"/>
+      <configSetting altId="spi1.mosi.p701" configurationId="spi1.mosi"/>
+      <configSetting altId="spi1.pairing.c" configurationId="spi1.pairing"/>
+      <configSetting altId="spi1.rspck.p702" configurationId="spi1.rspck"/>
+      <configSetting altId="spi1.ssl0.p703" configurationId="spi1.ssl0"/>
+      <configSetting altId="usbfs0.mode.device" configurationId="usbfs0.mode"/>
+      <configSetting altId="usbfs0.vbus.p407" configurationId="usbfs0.vbus"/>
+    </pincfg>
+    <pincfg active="false" name="R7FA6M2AF3CFB.pincfg" selected="false" symbol="">
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+    </pincfg>
+  </raPinConfiguration>
+</raConfiguration>
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/configuration.xml b/ports/renesas-ra/boards/RA4M1_CLICKER/configuration.xml
new file mode 100644
index 0000000000000..28b47e93fdef7
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/configuration.xml
@@ -0,0 +1,579 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<raConfiguration version="7">
+  <generalSettings>
+    <option key="#Board#" value="board.custom"/>
+    <option key="CPU" value="RA4M1"/>
+    <option key="Core" value="CM4"/>
+    <option key="#TargetName#" value="R7FA4M1AB3CFM"/>
+    <option key="#TargetARCHITECTURE#" value="cortex-m4"/>
+    <option key="#DeviceCommand#" value="R7FA4M1AB"/>
+    <option key="#RTOS#" value="_none"/>
+    <option key="#pinconfiguration#" value="R7FA4M1AB3CFM.pincfg"/>
+    <option key="#FSPVersion#" value="4.4.0"/>
+    <option key="#SELECTED_TOOLCHAIN#" value="gcc-arm-embedded"/>
+    <option key="#ToolchainVersion#" value="9.2.1.20191025"/>
+  </generalSettings>
+  <raBspConfiguration>
+    <config id="config.bsp.ra4m1.R7FA4M1AB3CFM">
+      <property id="config.bsp.part_number" value="config.bsp.part_number.value"/>
+      <property id="config.bsp.rom_size_bytes" value="config.bsp.rom_size_bytes.value"/>
+      <property id="config.bsp.rom_size_bytes_hidden" value="262144"/>
+      <property id="config.bsp.ram_size_bytes" value="config.bsp.ram_size_bytes.value"/>
+      <property id="config.bsp.data_flash_size_bytes" value="config.bsp.data_flash_size_bytes.value"/>
+      <property id="config.bsp.package_style" value="config.bsp.package_style.value"/>
+      <property id="config.bsp.package_pins" value="config.bsp.package_pins.value"/>
+      <property id="config.bsp.irq_count_hidden" value="32"/>
+    </config>
+    <config id="config.bsp.ra4m1">
+      <property id="config.bsp.series" value="config.bsp.series.value"/>
+    </config>
+    <config id="config.bsp.ra4m1.fsp">
+      <property id="config.bsp.fsp.OFS0.iwdt_start_mode" value="config.bsp.fsp.OFS0.iwdt_start_mode.disabled"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_timeout" value="config.bsp.fsp.OFS0.iwdt_timeout.2048"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_divisor" value="config.bsp.fsp.OFS0.iwdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_end" value="config.bsp.fsp.OFS0.iwdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_window_start" value="config.bsp.fsp.OFS0.iwdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_reset_interrupt" value="config.bsp.fsp.OFS0.iwdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.iwdt_stop_control" value="config.bsp.fsp.OFS0.iwdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS0.wdt_start_mode" value="config.bsp.fsp.OFS0.wdt_start_mode.register"/>
+      <property id="config.bsp.fsp.OFS0.wdt_timeout" value="config.bsp.fsp.OFS0.wdt_timeout.16384"/>
+      <property id="config.bsp.fsp.OFS0.wdt_divisor" value="config.bsp.fsp.OFS0.wdt_divisor.128"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_end" value="config.bsp.fsp.OFS0.wdt_window_end.0"/>
+      <property id="config.bsp.fsp.OFS0.wdt_window_start" value="config.bsp.fsp.OFS0.wdt_window_start.100"/>
+      <property id="config.bsp.fsp.OFS0.wdt_reset_interrupt" value="config.bsp.fsp.OFS0.wdt_reset_interrupt.Reset"/>
+      <property id="config.bsp.fsp.OFS0.wdt_stop_control" value="config.bsp.fsp.OFS0.wdt_stop_control.stops"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0.start" value="config.bsp.fsp.OFS1.voltage_detection0.start.disabled"/>
+      <property id="config.bsp.fsp.OFS1.voltage_detection0_level" value="config.bsp.fsp.OFS1.voltage_detection0_level.190"/>
+      <property id="config.bsp.fsp.OFS1.hoco_osc" value="config.bsp.fsp.OFS1.hoco_osc.enabled"/>
+      <property id="config.bsp.low_voltage_mode" value="config.bsp.low_voltage_mode.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_enable" value="config.bsp.fsp.mpu_pc0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_pc1_enable" value="config.bsp.fsp.mpu_pc1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_pc1_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_pc1_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg0_enable" value="config.bsp.fsp.mpu_reg0_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg0_start" value="0x00FFFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg0_end" value="0x00FFFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg1_enable" value="config.bsp.fsp.mpu_reg1_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg1_start" value="0x200FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg1_end" value="0x200FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg2_enable" value="config.bsp.fsp.mpu_reg2_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg2_start" value="0x407FFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg2_end" value="0x407FFFFF"/>
+      <property id="config.bsp.fsp.mpu_reg3_enable" value="config.bsp.fsp.mpu_reg3_enable.disabled"/>
+      <property id="config.bsp.fsp.mpu_reg3_start" value="0x400DFFFC"/>
+      <property id="config.bsp.fsp.mpu_reg3_end" value="0x400DFFFF"/>
+      <property id="config.bsp.common.main_osc_wait" value="config.bsp.common.main_osc_wait.wait_8163"/>
+      <property id="config.bsp.fsp.mcu.adc.max_freq_hz" value="64000000"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.max_baud" value="6666666"/>
+      <property id="config.bsp.fsp.mcu.adc.sample_and_hold" value="0"/>
+      <property id="config.bsp.fsp.mcu.sci_spi.max_bitrate" value="12000000"/>
+      <property id="config.bsp.fsp.mcu.spi.max_bitrate" value="24000000"/>
+      <property id="config.bsp.fsp.mcu.iic_master.rate.rate_fastplus" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_master.fastplus_channels" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.rate.rate_fastplus" value="0"/>
+      <property id="config.bsp.fsp.mcu.iic_slave.fastplus_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.cstpen_channels" value="0x0"/>
+      <property id="config.bsp.fsp.mcu.gpt.pin_count_source_channels" value="0xFFFF"/>
+      <property id="config.bsp.fsp.mcu.slcdc.1_4_bias_method" value="1"/>
+      <property id="config.bsp.common.id_mode" value="config.bsp.common.id_mode.unlocked"/>
+      <property id="config.bsp.common.id_code" value="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/>
+      <property id="config.bsp.common.id1" value=""/>
+      <property id="config.bsp.common.id2" value=""/>
+      <property id="config.bsp.common.id3" value=""/>
+      <property id="config.bsp.common.id4" value=""/>
+      <property id="config.bsp.common.id_fixed" value=""/>
+    </config>
+    <config id="config.bsp.ra">
+      <property id="config.bsp.common.main" value="0x1000"/>
+      <property id="config.bsp.common.heap" value="0x4980"/>
+      <property id="config.bsp.common.vcc" value="3300"/>
+      <property id="config.bsp.common.checking" value="config.bsp.common.checking.disabled"/>
+      <property id="config.bsp.common.assert" value="config.bsp.common.assert.none"/>
+      <property id="config.bsp.common.error_log" value="config.bsp.common.error_log.none"/>
+      <property id="config.bsp.common.soft_reset" value="config.bsp.common.soft_reset.disabled"/>
+      <property id="config.bsp.common.main_osc_populated" value="config.bsp.common.main_osc_populated.enabled"/>
+      <property id="config.bsp.common.pfs_protect" value="config.bsp.common.pfs_protect.enabled"/>
+      <property id="config.bsp.common.c_runtime_init" value="config.bsp.common.c_runtime_init.enabled"/>
+      <property id="config.bsp.common.early_init" value="config.bsp.common.early_init.disabled"/>
+      <property id="config.bsp.common.main_osc_clock_source" value="config.bsp.common.main_osc_clock_source.crystal"/>
+      <property id="config.bsp.common.subclock_populated" value="config.bsp.common.subclock_populated.enabled"/>
+      <property id="config.bsp.common.subclock_drive" value="config.bsp.common.subclock_drive.standard"/>
+      <property id="config.bsp.common.subclock_stabilization_ms" value="1000"/>
+    </config>
+  </raBspConfiguration>
+  <raClockConfiguration>
+    <node id="board.clock.xtal.freq" mul="12000000" option="_edit"/>
+    <node id="board.clock.pll.source" option="board.clock.pll.source.xtal"/>
+    <node id="board.clock.hoco.freq" option="board.clock.hoco.freq.24m"/>
+    <node id="board.clock.loco.freq" option="board.clock.loco.freq.32768"/>
+    <node id="board.clock.moco.freq" option="board.clock.moco.freq.8m"/>
+    <node id="board.clock.subclk.freq" option="board.clock.subclk.freq.32768"/>
+    <node id="board.clock.pll.div" option="board.clock.pll.div.2"/>
+    <node id="board.clock.pll.mul" option="board.clock.pll.mul.8"/>
+    <node id="board.clock.pll.display" option="board.clock.pll.display.value"/>
+    <node id="board.clock.clock.source" option="board.clock.clock.source.pll"/>
+    <node id="board.clock.iclk.div" option="board.clock.iclk.div.1"/>
+    <node id="board.clock.iclk.display" option="board.clock.iclk.display.value"/>
+    <node id="board.clock.pclka.div" option="board.clock.pclka.div.1"/>
+    <node id="board.clock.pclka.display" option="board.clock.pclka.display.value"/>
+    <node id="board.clock.pclkb.div" option="board.clock.pclkb.div.2"/>
+    <node id="board.clock.pclkb.display" option="board.clock.pclkb.display.value"/>
+    <node id="board.clock.pclkc.div" option="board.clock.pclkc.div.1"/>
+    <node id="board.clock.pclkc.display" option="board.clock.pclkc.display.value"/>
+    <node id="board.clock.pclkd.div" option="board.clock.pclkd.div.1"/>
+    <node id="board.clock.pclkd.display" option="board.clock.pclkd.display.value"/>
+    <node id="board.clock.fclk.div" option="board.clock.fclk.div.2"/>
+    <node id="board.clock.fclk.display" option="board.clock.fclk.display.value"/>
+    <node id="board.clock.clkout.source" option="board.clock.clkout.source.disabled"/>
+    <node id="board.clock.clkout.div" option="board.clock.clkout.div.1"/>
+    <node id="board.clock.clkout.display" option="board.clock.clkout.display.value"/>
+    <node id="board.clock.uclk.source" option="board.clock.uclk.source.pll"/>
+    <node id="board.clock.uclk.display" option="board.clock.clkout.display.value"/>
+  </raClockConfiguration>
+  <raComponentSelection>
+    <component apiversion="" class="BSP" condition="" group="Board" subgroup="custom" variant="" vendor="Renesas" version="4.4.0">
+      <description>Custom Board Support Files</description>
+      <originalPack>Renesas.RA_board_custom.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.9.0+renesas.0.fsp.4.4.0">
+      <description>Arm CMSIS Version 5 - Core (M)</description>
+      <originalPack>Arm.CMSIS5.5.9.0+renesas.0.fsp.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board Support Package Common Files</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_adc" variant="" vendor="Renesas" version="4.4.0">
+      <description>A/D Converter</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_agt" variant="" vendor="Renesas" version="4.4.0">
+      <description>Asynchronous General Purpose Timer</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Data Transfer Controller</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_flash_lp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Flash Memory Low Power</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="4.4.0">
+      <description>External Interrupt</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_iic_master" variant="" vendor="Renesas" version="4.4.0">
+      <description>I2C Master Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="4.4.0">
+      <description>I/O Port</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_lpm" variant="" vendor="Renesas" version="4.4.0">
+      <description>Low Power Modes</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_rtc" variant="" vendor="Renesas" version="4.4.0">
+      <description>Real Time Clock</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="4.4.0">
+      <description>SCI UART</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_spi" variant="" vendor="Renesas" version="4.4.0">
+      <description>Serial Peripheral Interface</description>
+      <originalPack>Renesas.RA.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4m1" subgroup="device" variant="R7FA4M1AB3CFM" vendor="Renesas" version="4.4.0">
+      <description>Board support package for R7FA4M1AB3CFM</description>
+      <originalPack>Renesas.RA_mcu_ra4m1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4m1" subgroup="device" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA4M1</description>
+      <originalPack>Renesas.RA_mcu_ra4m1.4.4.0.pack</originalPack>
+    </component>
+    <component apiversion="" class="BSP" condition="" group="ra4m1" subgroup="fsp" variant="" vendor="Renesas" version="4.4.0">
+      <description>Board support package for RA4M1 - FSP Data</description>
+      <originalPack>Renesas.RA_mcu_ra4m1.4.4.0.pack</originalPack>
+    </component>
+  </raComponentSelection>
+  <raElcConfiguration/>
+  <raIcuConfiguration/>
+  <raModuleConfiguration>
+    <module id="module.driver.ioport_on_ioport.0">
+      <property id="module.driver.ioport.name" value="g_ioport"/>
+      <property id="module.driver.ioport.elc_trigger_ioport1" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport2" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport3" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioport4" value="_disabled"/>
+      <property id="module.driver.ioport.pincfg" value="g_bsp_pin_cfg"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.678052306">
+      <property id="module.driver.uart.name" value="g_uart0"/>
+      <property id="module.driver.uart.channel" value="0"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.uart_on_sci_uart.1149083487">
+      <property id="module.driver.uart.name" value="g_uart1"/>
+      <property id="module.driver.uart.channel" value="1"/>
+      <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
+      <property id="module.driver.uart.parity" value="module.driver.uart.parity.parity_off"/>
+      <property id="module.driver.uart.stop_bits" value="module.driver.uart.stop_bits.stop_bits_1"/>
+      <property id="module.driver.uart.baud" value="115200"/>
+      <property id="module.driver.uart.baudrate_modulation" value="module.driver.uart.baudrate_modulation.disabled"/>
+      <property id="module.driver.uart.baudrate_max_err" value="5"/>
+      <property id="module.driver.uart.flow_control" value="module.driver.uart.flow_control.rts"/>
+      <property id="module.driver.uart.pin_control_port" value="module.driver.uart.pin_control_port.PORT_DISABLE"/>
+      <property id="module.driver.uart.pin_control_pin" value="module.driver.uart.pin_control_pin.PIN_DISABLE"/>
+      <property id="module.driver.uart.clk_src" value="module.driver.uart.clk_src.int_clk"/>
+      <property id="module.driver.uart.rx_edge_start" value="module.driver.uart.rx_edge_start.falling_edge"/>
+      <property id="module.driver.uart.noisecancel_en" value="module.driver.uart.noisecancel_en.disabled"/>
+      <property id="module.driver.uart.rx_fifo_trigger" value="module.driver.uart.rx_fifo_trigger.max"/>
+      <property id="module.driver.uart.rs485.de_enable" value="module.driver.uart.rs485.de_enable.disabled"/>
+      <property id="module.driver.uart.rs485.de_polarity" value="module.driver.uart.rs485.de_polarity.high"/>
+      <property id="module.driver.uart.rs485.de_port_number" value="module.driver.uart.rs485.de_port_number.PORT_DISABLE"/>
+      <property id="module.driver.uart.rs485.de_pin_number" value="module.driver.uart.rs485.de_pin_number.PIN_DISABLE"/>
+      <property id="module.driver.uart.callback" value="user_uart_callback"/>
+      <property id="module.driver.uart.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.rtc_on_rtc.1203767670">
+      <property id="module.driver.rtc.name" value="g_rtc0"/>
+      <property id="module.driver.rtc.clock_source" value="module.driver.rtc.clock_source.clock_source_subclk"/>
+      <property id="module.driver.rtc.freq_cmpr_value_loco" value="255"/>
+      <property id="module.driver.rtc.err_adjustment_mode" value="module.driver.rtc.err_adjustment_mode.m1"/>
+      <property id="module.driver.rtc.err_adjustment_period" value="module.driver.rtc.err_adjustment_period.p1"/>
+      <property id="module.driver.rtc.err_adjustment_type" value="module.driver.rtc.err_adjustment_type.t1"/>
+      <property id="module.driver.rtc.err_adjustment_value" value="0"/>
+      <property id="module.driver.rtc.p_callback" value="NULL"/>
+      <property id="module.driver.rtc.alarm_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.periodic_ipl" value="board.icu.common.irq.priority14"/>
+      <property id="module.driver.rtc.carry_ipl" value="board.icu.common.irq.priority14"/>
+    </module>
+    <module id="module.driver.flash_on_flash_lp.715110742">
+      <property id="module.driver.flash.name" value="g_flash0"/>
+      <property id="module.driver.flash.data_flash_bgo" value="module.driver.flash.data_flash_bgo.disabled"/>
+      <property id="module.driver.flash.p_callback" value="NULL"/>
+      <property id="module.driver.flash.ipl" value="_disabled"/>
+    </module>
+    <module id="module.driver.timer_on_agt.1414155212">
+      <property id="module.driver.timer.name" value="g_timer0"/>
+      <property id="module.driver.timer.channel" value="0"/>
+      <property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
+      <property id="module.driver.timer.period" value="0x10000"/>
+      <property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_raw_counts"/>
+      <property id="module.driver.timer.duty_cycle" value="50"/>
+      <property id="module.driver.timer.count_source" value="module.driver.timer.count_source.clock_pclkb"/>
+      <property id="module.driver.timer.agtoa_output_enable" value="module.driver.timer.agtoa_output_enable.false"/>
+      <property id="module.driver.timer.agtob_output_enable" value="module.driver.timer.agtob_output_enable.false"/>
+      <property id="module.driver.timer.agto_output_enable" value="module.driver.timer.agto_output_enable.false"/>
+      <property id="module.driver.timer.measurement_mode" value="module.driver.timer.measurement_mode.measure_disabled"/>
+      <property id="module.driver.timer.agtio_filter" value="module.driver.timer.agtio_filter.agtio_filter_none"/>
+      <property id="module.driver.timer.enable_pin" value="module.driver.timer.enable_pin.enable_pin_not_used"/>
+      <property id="module.driver.timer.trigger_edge" value="module.driver.timer.trigger_edge.trigger_edge_rising"/>
+      <property id="module.driver.timer.p_callback" value="callback_agt"/>
+      <property id="module.driver.timer.ipl" value="board.icu.common.irq.priority5"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.1528389712">
+      <property id="module.driver.external_irq.name" value="g_external_irq5"/>
+      <property id="module.driver.external_irq.channel" value="5"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.spi_on_spi.2082979723">
+      <property id="module.driver.spi.name" value="g_spi0"/>
+      <property id="module.driver.spi.channel" value="0"/>
+      <property id="module.driver.spi.rxi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.txi_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.tei_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.eri_ipl" value="board.icu.common.irq.priority12"/>
+      <property id="module.driver.spi.operating_mode" value="module.driver.spi.operating_mode.mode_master"/>
+      <property id="module.driver.spi.clk_phase" value="module.driver.spi.clk_phase.clk_phase_edge_odd"/>
+      <property id="module.driver.spi.clk_polarity" value="module.driver.spi.clk_polarity.clk_polarity_low"/>
+      <property id="module.driver.spi.mode_fault" value="module.driver.spi.mode_fault.mode_fault_error_disable"/>
+      <property id="module.driver.spi.bit_order" value="module.driver.spi.bit_order.bit_order_msb_first"/>
+      <property id="module.driver.spi.p_callback" value="spi_callback"/>
+      <property id="module.driver.spi.spi_clksyn" value="module.driver.spi.spi_clksyn.spi_clksyn"/>
+      <property id="module.driver.spi.spi_comm" value="module.driver.spi.spi_comm.full_duplex"/>
+      <property id="module.driver.spi.ssl_polarity" value="module.driver.spi.ssl_polarity.low"/>
+      <property id="module.driver.spi.ssl_select" value="module.driver.spi.ssl_select.zero"/>
+      <property id="module.driver.spi.mosi_idle_value_fixing" value="module.driver.spi.mosi_idle_value_fixing.disable"/>
+      <property id="module.driver.spi.parity" value="module.driver.spi.parity_mode.disable"/>
+      <property id="module.driver.spi.byte_swap" value="module.driver.spi.byte_swap.disable"/>
+      <property id="module.driver.spi.bitrate" value="16000000"/>
+      <property id="module.driver.spi.spck_delay" value="module.driver.spi.spck_delay.one"/>
+      <property id="module.driver.spi.ssl_negation_delay" value="module.driver.spi.ssl_negation_delay.one"/>
+      <property id="module.driver.spi.next_access_delay" value="module.driver.spi.next_access_delay.one"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.1606262611">
+      <property id="module.driver.transfer.name" value="g_transfer0"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.transfer_on_dtc.817277973">
+      <property id="module.driver.transfer.name" value="g_transfer1"/>
+      <property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
+      <property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
+      <property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
+      <property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
+      <property id="module.driver.transfer.p_dest" value="NULL"/>
+      <property id="module.driver.transfer.p_src" value="NULL"/>
+      <property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
+      <property id="module.driver.transfer.length" value="0"/>
+      <property id="module.driver.transfer.num_blocks" value="0"/>
+      <property id="module.driver.transfer.activation_source" value="_disabled"/>
+    </module>
+    <module id="module.driver.lpm.2028736825">
+      <property id="module.driver.lpm.name" value="g_lpm0"/>
+      <property id="module.driver.lpm.mode" value="module.driver.lpm.mode.sleep"/>
+      <property id="module.driver.lpm.output_port_enable_standby" value="module.driver.lpm.output_port_enable_standby.no_change"/>
+      <property id="module.driver.lpm.standby_wake_sources" value="module.driver.lpm.standby_wake_rtcalm"/>
+      <property id="module.driver.lpm.snooze_request" value="module.driver.lpm.snooze_request_rxd0_falling"/>
+      <property id="module.driver.lpm.snooze_end_sources" value=""/>
+      <property id="module.driver.lpm.snooze_dtc" value="module.driver.lpm.snooze_dtc.lpm_snooze_dtc_disable"/>
+      <property id="module.driver.lpm.snooze_cancel_source" value="enum.mcu.lpm.snooze_cancel_source.none"/>
+      <property id="module.driver.lpm.ram_power_enable" value=""/>
+      <property id="module.driver.lpm.tcm_power_enable" value="enum.mcu.lpm.tcm_power_enable.disable"/>
+      <property id="module.driver.lpm.standby_ram_power_enable" value="enum.mcu.lpm.standby_ram_power_enable.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll1" value="enum.mcu.lpm.oscillator_ldo_state.pll1.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.pll2" value="enum.mcu.lpm.oscillator_ldo_state.pll2.disable"/>
+      <property id="module.driver.lpm.oscillator_ldo_state.hoco" value="enum.mcu.lpm.oscillator_ldo_state.hoco.disable"/>
+      <property id="module.driver.lpm.io_port_deep_standby_exit" value="module.driver.lpm.io_port_deep_standby_exit.no_change"/>
+      <property id="module.driver.lpm.power_supply_deep_standby" value="module.driver.lpm.power_supply_deep_standby.deepcut0"/>
+      <property id="module.driver.lpm.deep_standby_cancel_sources" value=""/>
+      <property id="module.driver.lpm.deep_standby_cancel_edges" value=""/>
+    </module>
+    <module id="module.driver.adc_on_adc.1143285113">
+      <property id="module.driver.adc.name" value="g_adc0"/>
+      <property id="module.driver.adc.unit" value="0"/>
+      <property id="module.driver.adc.resolution" value="module.driver.adc.resolution.resolution_14_bit"/>
+      <property id="module.driver.adc.alignment" value="module.driver.adc.alignment.alignment_right"/>
+      <property id="module.driver.adc.clearing" value="module.driver.adc.clearing.clear_after_read_on"/>
+      <property id="module.driver.adc.mode" value="module.driver.adc.mode.mode_single_scan"/>
+      <property id="module.driver.adc.mode.dt" value="module.driver.adc.mode.dt.disabled"/>
+      <property id="module.driver.adc.scan_mask" value=""/>
+      <property id="module.driver.adc.scan_mask_group_b" value=""/>
+      <property id="module.driver.adc.trigger" value="enum.driver.adc.trigger.trigger_software"/>
+      <property id="module.driver.adc.trigger_group_b" value="_disabled"/>
+      <property id="module.driver.adc.priority_group_a" value="module.driver.adc.priority_group_a.group_a_priority_off"/>
+      <property id="module.driver.adc.add_average_count" value="module.driver.adc.add_average_count.add_off"/>
+      <property id="module.driver.adc.adc_vref_control" value="module.driver.adc.adc_vref_control.avcc0_avss0"/>
+      <property id="module.driver.adc.add_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_mask" value=""/>
+      <property id="module.driver.adc.sample_hold_states" value="24"/>
+      <property id="module.driver.adc.compare.window_mode" value="module.driver.adc.compare.window_mode.disabled"/>
+      <property id="module.driver.adc.compare.event_mode" value="module.driver.adc.compare.event_mode.or"/>
+      <property id="module.driver.adc.compare.window_a.enable" value="module.driver.adc.compare.window_a.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_a.channels" value=""/>
+      <property id="module.driver.adc.compare.window_a.channel_mode" value=""/>
+      <property id="module.driver.adc.compare.window_a.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_a.ref_upper" value="0"/>
+      <property id="module.driver.adc.compare.window_b.enable" value="module.driver.adc.compare.window_b.enable.disabled"/>
+      <property id="module.driver.adc.compare.window_b.channel" value="module.driver.adc.compare.window_b.channel.channel_0"/>
+      <property id="module.driver.adc.compare.window_b.mode" value="module.driver.adc.compare.window_b.mode"/>
+      <property id="module.driver.adc.compare.window_b.ref_lower" value="0"/>
+      <property id="module.driver.adc.compare.window_b.ref_upper" value="0"/>
+      <property id="module.driver.adc.p_callback" value="NULL"/>
+      <property id="module.driver.adc.scan_end_ipl" value="_disabled"/>
+      <property id="module.driver.adc.scan_end_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_a_ipl" value="_disabled"/>
+      <property id="module.driver.adc.window_b_ipl" value="_disabled"/>
+      <property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
+    </module>
+    <module id="module.driver.i2c_on_iic_master.1316576032">
+      <property id="module.driver.i2c_master.name" value="g_i2c_master1"/>
+      <property id="module.driver.i2c_master.channel" value="1"/>
+      <property id="module.driver.i2c_master.rate" value="module.driver.i2c_master.rate.rate_standard"/>
+      <property id="module.driver.i2c_master.rise_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.fall_time_ns" value="120"/>
+      <property id="module.driver.i2c_master.duty" value="50"/>
+      <property id="module.driver.i2c_master.slave" value="0x00"/>
+      <property id="module.driver.i2c_master.addr_mode" value="module.driver.i2c_master.addr_mode.addr_mode_7bit"/>
+      <property id="module.driver.i2c_master.timeout_mode" value="module.driver.i2c_master.timeout_mode.short_mode"/>
+      <property id="module.driver.i2c_master.timeout_scl_low" value="module.driver.i2c_master.timeout_scl_low.enabled"/>
+      <property id="module.driver.i2c_master.p_callback" value="callback_iic"/>
+      <property id="module.driver.i2c_master.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.414168606">
+      <property id="module.driver.external_irq.name" value="g_external_irq6"/>
+      <property id="module.driver.external_irq.channel" value="6"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <module id="module.driver.external_irq_on_icu.347585176">
+      <property id="module.driver.external_irq.name" value="g_external_irq9"/>
+      <property id="module.driver.external_irq.channel" value="9"/>
+      <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
+      <property id="module.driver.external_irq.filter_enable" value="module.driver.external_irq.filter_enable.false"/>
+      <property id="module.driver.external_irq.pclk_div" value="module.driver.external_irq.pclk_div.pclk_div_by_64"/>
+      <property id="module.driver.external_irq.p_callback" value="callback_icu"/>
+      <property id="module.driver.external_irq.ipl" value="board.icu.common.irq.priority12"/>
+    </module>
+    <context id="_hal.0">
+      <stack module="module.driver.ioport_on_ioport.0"/>
+      <stack module="module.driver.uart_on_sci_uart.678052306"/>
+      <stack module="module.driver.uart_on_sci_uart.1149083487"/>
+      <stack module="module.driver.rtc_on_rtc.1203767670"/>
+      <stack module="module.driver.flash_on_flash_lp.715110742"/>
+      <stack module="module.driver.timer_on_agt.1414155212"/>
+      <stack module="module.driver.external_irq_on_icu.1528389712"/>
+      <stack module="module.driver.spi_on_spi.2082979723">
+        <stack module="module.driver.transfer_on_dtc.1606262611" requires="module.driver.spi_on_spi.requires.transfer_tx"/>
+        <stack module="module.driver.transfer_on_dtc.817277973" requires="module.driver.spi_on_spi.requires.transfer_rx"/>
+      </stack>
+      <stack module="module.driver.lpm.2028736825"/>
+      <stack module="module.driver.adc_on_adc.1143285113"/>
+      <stack module="module.driver.i2c_on_iic_master.1316576032"/>
+      <stack module="module.driver.external_irq_on_icu.414168606"/>
+      <stack module="module.driver.external_irq_on_icu.347585176"/>
+    </context>
+    <config id="config.driver.lpm">
+      <property id="config.driver.lpm.param_checking_enable" value="config.driver.lpm.param_checking_enable.bsp"/>
+      <property id="config.driver.lpm.standby_limit" value="config.driver.lpm.standby_limit.disabled"/>
+    </config>
+    <config id="config.driver.ioport">
+      <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
+    </config>
+    <config id="config.driver.adc">
+      <property id="config.driver.adc.param_checking_enable" value="config.driver.adc.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.icu">
+      <property id="config.driver.icu.param_checking_enable" value="config.driver.icu.param_checking_enable.bsp"/>
+    </config>
+    <config id="config.driver.agt">
+      <property id="config.driver.agt.param_checking_enable" value="config.driver.agt.param_checking_enable.bsp"/>
+      <property id="config.driver.agt.output_support_enable" value="config.driver.agt.output_support_enable.disabled"/>
+      <property id="config.driver.agt.input_support_enable" value="config.driver.agt.input_support_enable.disabled"/>
+    </config>
+    <config id="config.driver.dtc">
+      <property id="config.driver.dtc.param_checking_enable" value="config.driver.dtc.param_checking_enable.bsp"/>
+      <property id="config.driver.dtc.vector_table" value=".fsp_dtc_vector_table"/>
+    </config>
+    <config id="config.driver.iic_master">
+      <property id="config.driver.iic_master.param_checking_enable" value="config.driver.iic_master.param_checking_enable.bsp"/>
+      <property id="config.driver.iic_master.dtc_enable" value="config.driver.iic_master.dtc_enable.disabled"/>
+      <property id="config.driver.iic_master.addr_mode_10_bit_enable" value="config.driver.iic_master.addr_mode_10_bit_enable.disabled"/>
+    </config>
+    <config id="config.driver.flash_lp">
+      <property id="config.driver.flash_lp.param_checking_enable" value="config.flash_lp.param_checking_enable.bsp"/>
+      <property id="config.driver.flash_lp.param_code_flash_programming_enable" value="config.driver.flash_lp.param_code_flash_programming_enable.enabled"/>
+      <property id="config.driver.flash_lp.param_data_flash_programming_enable" value="config.driver.flash_lp.param_data_flash_programming_enable.disabled"/>
+    </config>
+    <config id="config.driver.sci_uart">
+      <property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
+      <property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>
+      <property id="config.driver.sci_uart.dtc_support" value="config.driver.sci_uart.dtc_support.disabled"/>
+      <property id="config.driver.sci_uart.flow_control" value="config.driver.sci_uart.flow_control.disabled"/>
+      <property id="config.driver.sci_uart.rs485" value="config.driver.sci_uart.rs485.disabled"/>
+    </config>
+    <config id="config.driver.rtc">
+      <property id="config.driver.rtc.param_checking_enable" value="config.driver.rtc.param_checking_enable.bsp"/>
+      <property id="config.driver.rtc.open_set_source_clock" value="config.driver.rtc.open_set_source_clock.enabled"/>
+    </config>
+    <config id="config.driver.spi">
+      <property id="config.driver.spi.param_checking_enable" value="config.driver.spi.param_checking_enable.bsp"/>
+      <property id="config.driver.spi.dtc_enable" value="config.driver.spi.dtc_enable.enabled"/>
+      <property id="config.driver.spi.rxi_transmit" value="config.driver.spi.rxi_transmit.disabled"/>
+    </config>
+  </raModuleConfiguration>
+  <raPinConfiguration>
+    <pincfg active="true" name="R7FA4M1AB3CFM.pincfg" selected="true" symbol="g_bsp_pin_cfg">
+      <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
+      <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
+      <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
+      <configSetting altId="debug0.tdo.p109" configurationId="debug0.tdo"/>
+      <configSetting altId="debug0.tms.p108" configurationId="debug0.tms"/>
+      <configSetting altId="p100.spi0.miso" configurationId="p100"/>
+      <configSetting altId="p100.gpio_mode.gpio_mode_peripheral" configurationId="p100.gpio_mode"/>
+      <configSetting altId="p101.spi0.mosi" configurationId="p101"/>
+      <configSetting altId="p101.gpio_mode.gpio_mode_peripheral" configurationId="p101.gpio_mode"/>
+      <configSetting altId="p102.spi0.rspck" configurationId="p102"/>
+      <configSetting altId="p102.gpio_mode.gpio_mode_peripheral" configurationId="p102.gpio_mode"/>
+      <configSetting altId="p108.debug0.tms" configurationId="p108"/>
+      <configSetting altId="p108.gpio_mode.gpio_mode_peripheral" configurationId="p108.gpio_mode"/>
+      <configSetting altId="p109.debug0.tdo" configurationId="p109"/>
+      <configSetting altId="p109.gpio_mode.gpio_mode_peripheral" configurationId="p109.gpio_mode"/>
+      <configSetting altId="p110.debug0.tdi" configurationId="p110"/>
+      <configSetting altId="p110.gpio_mode.gpio_mode_peripheral" configurationId="p110.gpio_mode"/>
+      <configSetting altId="p300.debug0.tck" configurationId="p300"/>
+      <configSetting altId="p300.gpio_mode.gpio_mode_peripheral" configurationId="p300.gpio_mode"/>
+      <configSetting altId="p301.input" configurationId="p301"/>
+      <configSetting altId="p301.gpio_irq.gpio_irq_enabled" configurationId="p301.gpio_irq"/>
+      <configSetting altId="p301.gpio_mode.gpio_mode_in" configurationId="p301.gpio_mode"/>
+      <configSetting altId="p302.input" configurationId="p302"/>
+      <configSetting altId="p302.gpio_irq.gpio_irq_enabled" configurationId="p302.gpio_irq"/>
+      <configSetting altId="p302.gpio_mode.gpio_mode_in" configurationId="p302.gpio_mode"/>
+      <configSetting altId="p304.input" configurationId="p304"/>
+      <configSetting altId="p304.gpio_irq.gpio_irq_enabled" configurationId="p304.gpio_irq"/>
+      <configSetting altId="p304.gpio_mode.gpio_mode_in" configurationId="p304.gpio_mode"/>
+      <configSetting altId="p401.sci1.txd" configurationId="p401"/>
+      <configSetting altId="p401.gpio_mode.gpio_mode_peripheral" configurationId="p401.gpio_mode"/>
+      <configSetting altId="p402.sci1.rxd" configurationId="p402"/>
+      <configSetting altId="p402.gpio_mode.gpio_mode_peripheral" configurationId="p402.gpio_mode"/>
+      <configSetting altId="p408.output.low" configurationId="p408"/>
+      <configSetting altId="p408.gpio_mode.gpio_mode_out.low" configurationId="p408.gpio_mode"/>
+      <configSetting altId="p409.output.low" configurationId="p409"/>
+      <configSetting altId="p409.gpio_mode.gpio_mode_out.low" configurationId="p409.gpio_mode"/>
+      <configSetting altId="p410.sci0.rxd" configurationId="p410"/>
+      <configSetting altId="p410.gpio_mode.gpio_mode_peripheral" configurationId="p410.gpio_mode"/>
+      <configSetting altId="p411.sci0.txd" configurationId="p411"/>
+      <configSetting altId="p411.gpio_mode.gpio_mode_peripheral" configurationId="p411.gpio_mode"/>
+      <configSetting altId="sci0.mode.asynchronous.b" configurationId="sci0.mode"/>
+      <configSetting altId="sci0.pairing.b" configurationId="sci0.pairing"/>
+      <configSetting altId="sci0.rxd.p410" configurationId="sci0.rxd"/>
+      <configSetting altId="sci0.txd.p411" configurationId="sci0.txd"/>
+      <configSetting altId="sci1.mode.asynchronous.b" configurationId="sci1.mode"/>
+      <configSetting altId="sci1.pairing.b" configurationId="sci1.pairing"/>
+      <configSetting altId="sci1.rxd.p402" configurationId="sci1.rxd"/>
+      <configSetting altId="sci1.txd.p401" configurationId="sci1.txd"/>
+      <configSetting altId="spi0.miso.p100" configurationId="spi0.miso"/>
+      <configSetting altId="spi0.mode.enabled.a" configurationId="spi0.mode"/>
+      <configSetting altId="spi0.mosi.p101" configurationId="spi0.mosi"/>
+      <configSetting altId="spi0.rspck.p102" configurationId="spi0.rspck"/>
+    </pincfg>
+  </raPinConfiguration>
+</raConfiguration>

From 6381ad5d0c4c594dbb8feea3bebf6222fd78f3a1 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 14 Jun 2024 19:16:20 +0900
Subject: [PATCH 1462/3129] renesas-ra/extint: Fix issue with Pin.irq not
 triggering.

Fixes issue #15272.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/extint.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
index f1d445346d56e..62e559d10015c 100644
--- a/ports/renesas-ra/extint.c
+++ b/ports/renesas-ra/extint.c
@@ -213,6 +213,8 @@ void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_
         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]);
+        ra_icu_set_pin(pin->pin, true, true);
+        ra_icu_enable_pin(pin->pin);
 
         // Enable the interrupt
         extint_enable(line);

From a2475ee9de1f16def61f4c3f3fdd0751f07c654e Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 26 Jul 2024 10:03:32 +1000
Subject: [PATCH 1463/3129] renesas-ra/usb: Use interrupt rather than polling
 for USB task.

Most ports using TinyUSB now schedule the USB tasks from the USB interrupt.
This commit updates the renesas-ra port to use this new pattern.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/renesas-ra/Makefile       |  3 +++
 ports/renesas-ra/mpconfigport.h | 16 ----------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 3a9abf7246516..dd70f56d7ca63 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -157,6 +157,9 @@ LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
+# Hook tinyusb USB interrupt if used to service usb task.
+LDFLAGS += --wrap=dcd_event_handler
+
 # Options for mpy-cross
 MPY_CROSS_FLAGS += -march=armv7m
 
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index a23a2c1065fa2..307dac24ce583 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -250,25 +250,10 @@ typedef unsigned int mp_uint_t; // must be pointer size
 
 typedef long mp_off_t;
 
-#if MICROPY_HW_ENABLE_USBDEV
-#define MICROPY_HW_USBDEV_TASK_HOOK extern void mp_usbd_task(void); mp_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 (--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
-
 #if MICROPY_PY_THREAD
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
-        MICROPY_HW_USBDEV_TASK_HOOK \
         mp_handle_pending(true); \
         if (pyb_thread_enabled) { \
             MP_THREAD_GIL_EXIT(); \
@@ -284,7 +269,6 @@ typedef long mp_off_t;
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
-        MICROPY_HW_USBDEV_TASK_HOOK \
         mp_handle_pending(true); \
         __WFI(); \
     } while (0);

From 4f6d4b2b498b0555c3b27eba2fa4e212468e1450 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 31 Jan 2024 18:18:14 +1100
Subject: [PATCH 1464/3129] extmod/vfs_blockdev: Check block device function
 positive results.

A positive result here can result in eventual memory corruption
as littlefs expects the result of a cache read/write function to be
0 or a negative integer for an error.

Closes #13046

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/vfs_blockdev.c                    |  25 +++--
 tests/extmod/vfs_blockdev_invalid.py     |  87 ++++++++++++++++
 tests/extmod/vfs_blockdev_invalid.py.exp | 126 +++++++++++++++++++++++
 3 files changed, 228 insertions(+), 10 deletions(-)
 create mode 100644 tests/extmod/vfs_blockdev_invalid.py
 create mode 100644 tests/extmod/vfs_blockdev_invalid.py.exp

diff --git a/extmod/vfs_blockdev.c b/extmod/vfs_blockdev.c
index 57c83b42899a6..05b71ea1da6de 100644
--- a/extmod/vfs_blockdev.c
+++ b/extmod/vfs_blockdev.c
@@ -32,6 +32,19 @@
 
 #if MICROPY_VFS
 
+// Block device functions are expected to return 0 on success
+// and negative integer on errors. Check for positive integer
+// results as some callers (i.e. littlefs) will produce corrupt
+// results from these.
+static int mp_vfs_check_result(mp_obj_t ret) {
+    if (ret == mp_const_none) {
+        return 0;
+    } else {
+        int i = MP_OBJ_SMALL_INT_VALUE(ret);
+        return i > 0 ? (-MP_EINVAL) : i;
+    }
+}
+
 void mp_vfs_blockdev_init(mp_vfs_blockdev_t *self, mp_obj_t bdev) {
     mp_load_method(bdev, MP_QSTR_readblocks, self->readblocks);
     mp_load_method_maybe(bdev, MP_QSTR_writeblocks, self->writeblocks);
@@ -66,11 +79,7 @@ int mp_vfs_blockdev_read_ext(mp_vfs_blockdev_t *self, size_t block_num, size_t b
     self->readblocks[3] = MP_OBJ_FROM_PTR(&ar);
     self->readblocks[4] = MP_OBJ_NEW_SMALL_INT(block_off);
     mp_obj_t ret = mp_call_method_n_kw(3, 0, self->readblocks);
-    if (ret == mp_const_none) {
-        return 0;
-    } else {
-        return MP_OBJ_SMALL_INT_VALUE(ret);
-    }
+    return mp_vfs_check_result(ret);
 }
 
 int mp_vfs_blockdev_write(mp_vfs_blockdev_t *self, size_t block_num, size_t num_blocks, const uint8_t *buf) {
@@ -103,11 +112,7 @@ int mp_vfs_blockdev_write_ext(mp_vfs_blockdev_t *self, size_t block_num, size_t
     self->writeblocks[3] = MP_OBJ_FROM_PTR(&ar);
     self->writeblocks[4] = MP_OBJ_NEW_SMALL_INT(block_off);
     mp_obj_t ret = mp_call_method_n_kw(3, 0, self->writeblocks);
-    if (ret == mp_const_none) {
-        return 0;
-    } else {
-        return MP_OBJ_SMALL_INT_VALUE(ret);
-    }
+    return mp_vfs_check_result(ret);
 }
 
 mp_obj_t mp_vfs_blockdev_ioctl(mp_vfs_blockdev_t *self, uintptr_t cmd, uintptr_t arg) {
diff --git a/tests/extmod/vfs_blockdev_invalid.py b/tests/extmod/vfs_blockdev_invalid.py
new file mode 100644
index 0000000000000..80afc6414df30
--- /dev/null
+++ b/tests/extmod/vfs_blockdev_invalid.py
@@ -0,0 +1,87 @@
+# Tests where the block device returns invalid values
+
+try:
+    import vfs
+
+    vfs.VfsFat
+    vfs.VfsLfs2
+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)
+        self.read_res = 0
+        self.write_res = 0
+
+    def readblocks(self, block, buf, off=0):
+        print("readblocks")
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            buf[i] = self.data[addr + i]
+        return self.read_res
+
+    def writeblocks(self, block, buf, off=None):
+        if off is None:
+            # erase, then write
+            off = 0
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            self.data[addr + i] = buf[i]
+        return self.write_res
+
+    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
+
+
+try:
+    bdev = RAMBlockDevice(50)
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
+
+def test(vfs_class):
+    print(vfs_class)
+
+    vfs_class.mkfs(bdev)
+    fs = vfs_class(bdev)
+
+    with fs.open("test", "w") as f:
+        f.write("a" * 64)
+
+    for res in (0, -5, 5, 33, "invalid"):
+        # -5 is a legitimate negative failure (EIO), positive integer
+        # is not
+
+        # This variant will fail on open
+        bdev.read_res = res
+        try:
+            with fs.open("test", "r") as f:
+                print("opened")
+        except OSError as e:
+            print("OSError", e)
+
+        # This variant should succeed on open, may fail on read
+        # unless the filesystem cached the contents already
+        bdev.read_res = 0
+        try:
+            with fs.open("test", "r") as f:
+                bdev.read_res = res
+                print("read 1", f.read(1))
+                print("read rest", f.read())
+        except OSError as e:
+            print("OSError", e)
+
+
+test(vfs.VfsLfs2)
+test(vfs.VfsFat)  # Looks like most failures of underlying device are ignored by VFAT currently
diff --git a/tests/extmod/vfs_blockdev_invalid.py.exp b/tests/extmod/vfs_blockdev_invalid.py.exp
new file mode 100644
index 0000000000000..992111719e7f0
--- /dev/null
+++ b/tests/extmod/vfs_blockdev_invalid.py.exp
@@ -0,0 +1,126 @@
+<class 'VfsLfs2'>
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+opened
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+OSError [Errno 5] EIO
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+OSError [Errno 22] EINVAL
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+OSError [Errno 22] EINVAL
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+OSError [Errno 22] EINVAL
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+<class 'VfsFat'>
+readblocks
+readblocks
+readblocks
+readblocks
+readblocks
+opened
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+opened
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+opened
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+opened
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+opened
+readblocks
+read 1 a
+read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

From f4ab9d924790581989f2398fe30bbac5d680577f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 4 Sep 2024 15:19:20 +1000
Subject: [PATCH 1465/3129] extmod/vfs_blockdev: Implement common helper for
 read and write.

- Code size saving as all of these functions are very similar.
- Resolves the "TODO" of the plain read and write functions not propagating
  errors. An error in the underlying block device now causes VFatFs to
  return EIO, for example.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/vfs_blockdev.c                    | 63 ++++++++++--------------
 tests/extmod/vfs_blockdev_invalid.py     |  4 +-
 tests/extmod/vfs_blockdev_invalid.py.exp | 24 ++++-----
 3 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/extmod/vfs_blockdev.c b/extmod/vfs_blockdev.c
index 05b71ea1da6de..a7c14b76ee368 100644
--- a/extmod/vfs_blockdev.c
+++ b/extmod/vfs_blockdev.c
@@ -32,19 +32,6 @@
 
 #if MICROPY_VFS
 
-// Block device functions are expected to return 0 on success
-// and negative integer on errors. Check for positive integer
-// results as some callers (i.e. littlefs) will produce corrupt
-// results from these.
-static int mp_vfs_check_result(mp_obj_t ret) {
-    if (ret == mp_const_none) {
-        return 0;
-    } else {
-        int i = MP_OBJ_SMALL_INT_VALUE(ret);
-        return i > 0 ? (-MP_EINVAL) : i;
-    }
-}
-
 void mp_vfs_blockdev_init(mp_vfs_blockdev_t *self, mp_obj_t bdev) {
     mp_load_method(bdev, MP_QSTR_readblocks, self->readblocks);
     mp_load_method_maybe(bdev, MP_QSTR_writeblocks, self->writeblocks);
@@ -59,27 +46,38 @@ void mp_vfs_blockdev_init(mp_vfs_blockdev_t *self, mp_obj_t bdev) {
     }
 }
 
+// Helper function to minimise code size of read/write functions
+// note the n_args argument is moved to the end for further code size reduction (args keep same position in caller and callee).
+static int mp_vfs_blockdev_call_rw(mp_obj_t *args, size_t block_num, size_t block_off, size_t len, void *buf, size_t n_args) {
+    mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, len, buf};
+    args[2] = MP_OBJ_NEW_SMALL_INT(block_num);
+    args[3] = MP_OBJ_FROM_PTR(&ar);
+    args[4] = MP_OBJ_NEW_SMALL_INT(block_off); // ignored for n_args == 2
+    mp_obj_t ret = mp_call_method_n_kw(n_args, 0, args);
+
+    if (ret == mp_const_none) {
+        return 0;
+    } else {
+        // Block device functions are expected to return 0 on success
+        // and negative integer on errors. Check for positive integer
+        // results as some callers (i.e. littlefs) will produce corrupt
+        // results from these.
+        int i = MP_OBJ_SMALL_INT_VALUE(ret);
+        return i > 0 ? (-MP_EINVAL) : i;
+    }
+}
+
 int mp_vfs_blockdev_read(mp_vfs_blockdev_t *self, size_t block_num, size_t num_blocks, uint8_t *buf) {
     if (self->flags & MP_BLOCKDEV_FLAG_NATIVE) {
         mp_uint_t (*f)(uint8_t *, uint32_t, uint32_t) = (void *)(uintptr_t)self->readblocks[2];
         return f(buf, block_num, num_blocks);
     } else {
-        mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, num_blocks *self->block_size, buf};
-        self->readblocks[2] = MP_OBJ_NEW_SMALL_INT(block_num);
-        self->readblocks[3] = MP_OBJ_FROM_PTR(&ar);
-        mp_call_method_n_kw(2, 0, self->readblocks);
-        // TODO handle error return
-        return 0;
+        return mp_vfs_blockdev_call_rw(self->readblocks, block_num, 0, num_blocks * self->block_size, buf, 2);
     }
 }
 
 int mp_vfs_blockdev_read_ext(mp_vfs_blockdev_t *self, size_t block_num, size_t block_off, size_t len, uint8_t *buf) {
-    mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, len, buf};
-    self->readblocks[2] = MP_OBJ_NEW_SMALL_INT(block_num);
-    self->readblocks[3] = MP_OBJ_FROM_PTR(&ar);
-    self->readblocks[4] = MP_OBJ_NEW_SMALL_INT(block_off);
-    mp_obj_t ret = mp_call_method_n_kw(3, 0, self->readblocks);
-    return mp_vfs_check_result(ret);
+    return mp_vfs_blockdev_call_rw(self->readblocks, block_num, block_off, len, buf, 3);
 }
 
 int mp_vfs_blockdev_write(mp_vfs_blockdev_t *self, size_t block_num, size_t num_blocks, const uint8_t *buf) {
@@ -92,12 +90,7 @@ int mp_vfs_blockdev_write(mp_vfs_blockdev_t *self, size_t block_num, size_t num_
         mp_uint_t (*f)(const uint8_t *, uint32_t, uint32_t) = (void *)(uintptr_t)self->writeblocks[2];
         return f(buf, block_num, num_blocks);
     } else {
-        mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, num_blocks *self->block_size, (void *)buf};
-        self->writeblocks[2] = MP_OBJ_NEW_SMALL_INT(block_num);
-        self->writeblocks[3] = MP_OBJ_FROM_PTR(&ar);
-        mp_call_method_n_kw(2, 0, self->writeblocks);
-        // TODO handle error return
-        return 0;
+        return mp_vfs_blockdev_call_rw(self->writeblocks, block_num, 0, num_blocks * self->block_size, (void *)buf, 2);
     }
 }
 
@@ -106,13 +99,7 @@ int mp_vfs_blockdev_write_ext(mp_vfs_blockdev_t *self, size_t block_num, size_t
         // read-only block device
         return -MP_EROFS;
     }
-
-    mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, len, (void *)buf};
-    self->writeblocks[2] = MP_OBJ_NEW_SMALL_INT(block_num);
-    self->writeblocks[3] = MP_OBJ_FROM_PTR(&ar);
-    self->writeblocks[4] = MP_OBJ_NEW_SMALL_INT(block_off);
-    mp_obj_t ret = mp_call_method_n_kw(3, 0, self->writeblocks);
-    return mp_vfs_check_result(ret);
+    return mp_vfs_blockdev_call_rw(self->writeblocks, block_num, block_off, len, (void *)buf, 3);
 }
 
 mp_obj_t mp_vfs_blockdev_ioctl(mp_vfs_blockdev_t *self, uintptr_t cmd, uintptr_t arg) {
diff --git a/tests/extmod/vfs_blockdev_invalid.py b/tests/extmod/vfs_blockdev_invalid.py
index 80afc6414df30..9b12746b269c6 100644
--- a/tests/extmod/vfs_blockdev_invalid.py
+++ b/tests/extmod/vfs_blockdev_invalid.py
@@ -52,6 +52,8 @@ def ioctl(self, op, arg):
 
 def test(vfs_class):
     print(vfs_class)
+    bdev.read_res = 0  # reset function results
+    bdev.write_res = 0
 
     vfs_class.mkfs(bdev)
     fs = vfs_class(bdev)
@@ -84,4 +86,4 @@ def test(vfs_class):
 
 
 test(vfs.VfsLfs2)
-test(vfs.VfsFat)  # Looks like most failures of underlying device are ignored by VFAT currently
+test(vfs.VfsFat)
diff --git a/tests/extmod/vfs_blockdev_invalid.py.exp b/tests/extmod/vfs_blockdev_invalid.py.exp
index 992111719e7f0..64749da112fb3 100644
--- a/tests/extmod/vfs_blockdev_invalid.py.exp
+++ b/tests/extmod/vfs_blockdev_invalid.py.exp
@@ -105,22 +105,22 @@ readblocks
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 readblocks
-opened
+OSError [Errno 5] EIO
 readblocks
-read 1 a
-read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 readblocks
-opened
+OSError [Errno 5] EIO
 readblocks
-read 1 a
-read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+OSError [Errno 5] EIO
 readblocks
-opened
 readblocks
-read 1 a
-read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+OSError [Errno 5] EIO
 readblocks
-opened
+OSError [Errno 5] EIO
 readblocks
-read 1 a
-read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+readblocks
+OSError [Errno 5] EIO
+readblocks
+OSError [Errno 5] EIO
+readblocks
+readblocks
+OSError [Errno 5] EIO

From 5b22bde044b27aaf82cde8d7609ba37015b37b4c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Sep 2024 14:06:00 +1000
Subject: [PATCH 1466/3129] py/persistentcode: Explicitly track native
 BSS/rodata when needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h                                 | 58 +++++++++++++------
 py/persistentcode.c                           | 41 ++++++-------
 py/runtime.c                                  |  4 +-
 tests/micropython/import_mpy_native_gc.py     | 39 +++++++++----
 tests/micropython/import_mpy_native_gc.py.exp |  5 +-
 .../import_mpy_native_gc_module/Makefile      | 11 ++++
 .../import_mpy_native_gc_module/test.c        | 38 ++++++++++++
 7 files changed, 144 insertions(+), 52 deletions(-)
 create mode 100644 tests/micropython/import_mpy_native_gc_module/Makefile
 create mode 100644 tests/micropython/import_mpy_native_gc_module/test.c

diff --git a/py/mpconfig.h b/py/mpconfig.h
index b5414312c7caf..34eafa9e5debb 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -425,18 +425,6 @@
 // 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                                                    */
 
@@ -1992,14 +1980,48 @@ typedef double mp_float_t;
 #define MICROPY_MAKE_POINTER_CALLABLE(p) (p)
 #endif
 
-// If these MP_PLAT_*_EXEC macros are overridden then the memory allocated by them
-// must be somehow reachable for marking by the GC, since the native code
-// generators store pointers to GC managed memory in the code.
+// Whether native text/BSS/rodata memory loaded from .mpy files is explicitly tracked
+// so that the GC cannot reclaim it.
+//
+// In general a port should let these options have their defaults, but the defaults here
+// can be overridden if needed by defining both MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA
+// and MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA.
+#ifndef MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA
+#if MICROPY_EMIT_MACHINE_CODE && MICROPY_PERSISTENT_CODE_LOAD
+// Pointer tracking is required when loading native code is enabled.
+#if defined(MP_PLAT_ALLOC_EXEC) || defined(MP_PLAT_COMMIT_EXEC)
+// If a port defined a custom allocator or commit function for native text, then the
+// text does not need to be tracked (its allocation is managed by the port).  But the
+// BSS/rodata must be tracked (if there is any) because if there are any pointers to it
+// in the function data, they aren't traced by the GC.
+#define MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA (0)
+#define MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA (1)
+#else
+// If a port uses the default allocator (the GC heap) then all native text is allocated
+// on the GC heap.  But it's not guaranteed that a pointer to the head of the block of
+// native text (which may contain multiple native functions) will be retained for the GC
+// to trace.  This is because native functions can start inside the big block of text
+// and so it's possible that the only GC-reachable pointers are pointers inside.
+// Therefore the big block is explicitly tracked. If there is any BSS/rodata memory,
+// then it does not need to be explicitly tracked because a pointer to it is stored into
+// the function text via `mp_native_relocate()`.
+#define MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA (1)
+#define MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA (0)
+#endif
+#else // MICROPY_EMIT_MACHINE_CODE && MICROPY_PERSISTENT_CODE_LOAD
+// Pointer tracking not needed when loading native code is disabled.
+#define MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA (0)
+#define MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA (0)
+#endif
+#endif
+
+// If these macros are defined then the memory allocated by them does not need to be
+// traced by the GC.  But if they are left undefined then the GC heap will be used as
+// the allocator and the memory must be traced by the GC.  See also above logic for
+// enabling MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA and
+// MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA.
 #ifndef MP_PLAT_ALLOC_EXEC
 #define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) do { *ptr = m_new(byte, min_size); *size = min_size; } while (0)
-#endif
-
-#ifndef MP_PLAT_FREE_EXEC
 #define MP_PLAT_FREE_EXEC(ptr, size) m_del(byte, ptr, size)
 #endif
 
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 5088c05f03c2b..be93eaa5b4564 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -72,6 +72,20 @@ typedef struct _bytecode_prelude_t {
 static int read_byte(mp_reader_t *reader);
 static size_t read_uint(mp_reader_t *reader);
 
+#if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA
+
+// An mp_obj_list_t that tracks native text/BSS/rodata to prevent the GC from reclaiming them.
+MP_REGISTER_ROOT_POINTER(mp_obj_t persistent_code_root_pointers);
+
+static void track_root_pointer(void *ptr) {
+    if (MP_STATE_PORT(persistent_code_root_pointers) == MP_OBJ_NULL) {
+        MP_STATE_PORT(persistent_code_root_pointers) = mp_obj_new_list(0, NULL);
+    }
+    mp_obj_list_append(MP_STATE_PORT(persistent_code_root_pointers), MP_OBJ_FROM_PTR(ptr));
+}
+
+#endif
+
 #if MICROPY_EMIT_MACHINE_CODE
 
 typedef struct _reloc_info_t {
@@ -299,11 +313,10 @@ static mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
                 read_bytes(reader, rodata, rodata_size);
             }
 
-            // 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;
+            #if MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA
+            // Track the BSS/rodata memory so it's not reclaimed by the GC.
+            track_root_pointer(data);
+            #endif
         }
     }
     #endif
@@ -351,16 +364,9 @@ static mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
         fun_data = MP_PLAT_COMMIT_EXEC(fun_data, fun_data_len, opt_ri);
         #else
         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
-            // 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));
+            #if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA
+            // Track the function data memory so it's not reclaimed by the GC.
+            track_root_pointer(fun_data);
             #endif
             // Do the relocations.
             mp_native_relocate(&ri, fun_data, (uintptr_t)fun_data);
@@ -662,8 +668,3 @@ void mp_raw_code_save_file(mp_compiled_module_t *cm, qstr 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
diff --git a/py/runtime.c b/py/runtime.c
index acb45c94b0b74..deb55bf283abc 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -119,8 +119,8 @@ 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;
+    #if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA
+    MP_STATE_VM(persistent_code_root_pointers) = MP_OBJ_NULL;
     #endif
 
     #if MICROPY_PY_OS_DUPTERM
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 4b7acd9c652e0..bdeb612b4928e 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -1,4 +1,4 @@
-# Test that native code loaded from a .mpy file is retained after a GC.
+# Test that native text/BSS/rodata loaded from a .mpy file is retained after a GC.
 
 try:
     import gc, sys, io, vfs
@@ -44,17 +44,20 @@ def open(self, path, mode):
         return UserFile(self.files[path])
 
 
-# Pre-compiled examples/natmod/features0 example for various architectures, keyed
+# Pre-compiled import_mpy_native_gc_module example for various architectures, keyed
 # by the required value of sys.implementation._mpy (without sub-version).
-# cd examples/natmod/features0
-# make clean
-# make ARCH=x64 # or ARCH=armv6m
-# cat features0.mpy | python -c 'import sys; print(sys.stdin.buffer.read())'
+# To rebuild:
+#   $ cd import_mpy_native_gc_module
+#   $ make clean
+#   $ make ARCH=x64 # or ARCH=armv6m or ARCH=xtensawin
+# Then copy the bytes object printed on the last line.
 features0_file_contents = {
     # -march=x64
-    0x806: b'M\x06\x0b\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&\xaf \x01"\xff',
+    0x806: b"M\x06\x0b\x1f\x03\x002build/test_x64.native.mpy\x00\x08add1\x00\x0cunused\x00\x91B\xe9I\x00\x00\x00H\x8b\x05\xf4\x00\x00\x00H\x8b\x00\xc3H\x8b\x05\xf9\x00\x00\x00\xbe\x02\x00\x00\x00\x8b8H\x8b\x05\xdb\x00\x00\x00H\x8b@ \xff\xe0H\x8b\x05\xce\x00\x00\x00S\xbe\x02\x00\x00\x00H\x8bX \xffP\x18\xbe\x02\x00\x00\x00H\x8dx\x01H\x89\xd8[\xff\xe0AVAUATUSH\x8b\x1d\xa3\x00\x00\x00H\x8bG\x08L\x8bk(H\x8bx\x08A\xff\xd5L\x8b5\x95\x00\x00\x00L\x8bchH\x8d5r\x00\x00\x00H\x89\xc5H\x8b\x05\x88\x00\x00\x00A\x0f\xb7~\x04\xc7\x00@\xe2\x01\x00A\xff\xd4H\x8d5C\x00\x00\x00\xbfV\x00\x00\x00A\xff\xd4A\x0f\xb7~\x02H\x8d5\x1f\x00\x00\x00A\xff\xd4H\x89\xefA\xff\xd5H\x8b\x03[]A\\A]A^\xc3\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\x10\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\x00\x00\x00\x00\x00\x00\x00\x00P\x04\x11@\rB\tD\xaf4\x016\xad8\x01:\xaf<\x01>\xff",
     # -march=armv6m
-    0x1006: b"M\x06\x13\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>\xaf8\x01:\xff",
+    0x1006: b"M\x06\x13\x1f\x03\x008build/test_armv6m.native.mpy\x00\x08add1\x00\x0cunused\x00\x8eb0\xe0\x00\x00\x00\x00\x00\x00\x02K\x03J{D\x9bX\x18hpG\xd0\x00\x00\x00\x00\x00\x00\x00\x10\xb5\x05K\x05I\x06J{D\x9aX[X\x10h\x02!\x1bi\x98G\x10\xbd\xb8\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x10\xb5\x06K\x06J{D\x9bX\x02!\x1ci\xdbh\x98G\x02!\x010\xa0G\x10\xbd\xc0F\x96\x00\x00\x00\x00\x00\x00\x00\xf7\xb5\x12O\x12K\x7fD\xfdX\x12Lki|D\x00\x93ChXh\x00\x9b\x98G\x0fK\x01\x90\x0fJ\xfbXnk\x1a`\x0eK!\x00\xffX\xb8\x88\xb0G!\x00V \x081\xb0G!\x00x\x88\x101\xb0G\x01\x98\x00\x9b\x98G(h\xfe\xbd\xc0Fr\x00\x00\x00\x00\x00\x00\x00R\x00\x00\x00\x08\x00\x00\x00@\xe2\x01\x00\x04\x00\x00\x00\x00\x00\x00\x00\t\x00\x00\x00\x00\x00\x00\x00\x1d\x00\x00\x00\x00\x00\x00\x00A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00P\x04\x11p\rr\tt\xafd\x01f\xadh\x01j\xafl\x01n\xff",
+    # -march=xtensawin
+    0x2806: b"M\x06+\x1f\x03\x00>build/test_xtensawin.native.mpy\x00\x08add1\x00\x0cunused\x00\x8a\x12\x06\x16\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x006A\x00\x81\xf9\xff(\x08\x1d\xf0\x00\x006A\x00\x91\xfb\xff\x81\xf5\xff\xa8\t\x88H\x0c+\xe0\x08\x00-\n\x1d\xf0\x00\x006A\x00\x81\xf0\xff\xad\x02xH\x888\x0c+\xe0\x08\x00\x0c+\x1b\xaa\xe0\x07\x00-\n\x1d\xf06A\x00a\xe9\xff\x88\x122&\x05\xa2(\x01\xe0\x03\x00q\xe6\xff\x81\xea\xff\x92\xa7\x89\xa0\x99\x11H\xd6]\n\xb1\xe3\xff\xa2\x17\x02\x99\x08\xe0\x04\x00\xb1\xe2\xff\\j\xe0\x04\x00\xb1\xe1\xff\xa2\x17\x01\xe0\x04\x00\xad\x05\xe0\x03\x00(\x06\x1d\xf0p\x18\x04\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00(\x00\x00\x00\x00\x00\x00\x00\x1c\x00\x00\x00\x11\x02\r\x04\x07\x06\x03\t\x0c\xaf\x01\x01\x03\xad\x05\x01\x07\xaf\t\x01\x0b\xff",
 }
 
 # Populate armv7m-derived archs based on armv6m.
@@ -76,11 +79,24 @@ def open(self, path, mode):
 
 # Import the native function.
 gc.collect()
-from features0 import factorial
+from features0 import get, add1
+
+# Test that the native functions work to begin with.
+print(get())
+print(add1(12))
 
 # Free the module that contained the function.
 del sys.modules["features0"]
 
+
+# Sweep the stack to remove any stray pointers that we are aiming to reclaim.
+def recurse(n):
+    if n:
+        recurse(n - 1)
+
+
+recurse(10)
+
 # Run a GC cycle which should reclaim the module but not the function.
 gc.collect()
 
@@ -88,8 +104,9 @@ def open(self, path, mode):
 for i in range(1000):
     []
 
-# Run the native function, it should not have been freed or overwritten.
-print(factorial(10))
+# Run the native function, its text/BSS/rodata should not have been freed or overwritten.
+print(get())
+print(add1(12))
 
 # Unmount and undo path addition.
 vfs.umount("/userfs")
diff --git a/tests/micropython/import_mpy_native_gc.py.exp b/tests/micropython/import_mpy_native_gc.py.exp
index 3fbd4a8698fa3..4250a13c72693 100644
--- a/tests/micropython/import_mpy_native_gc.py.exp
+++ b/tests/micropython/import_mpy_native_gc.py.exp
@@ -1 +1,4 @@
-3628800
+123456
+13
+123456
+13
diff --git a/tests/micropython/import_mpy_native_gc_module/Makefile b/tests/micropython/import_mpy_native_gc_module/Makefile
new file mode 100644
index 0000000000000..935ba6b59fa74
--- /dev/null
+++ b/tests/micropython/import_mpy_native_gc_module/Makefile
@@ -0,0 +1,11 @@
+MPY_DIR = ../../..
+
+MOD = test_$(ARCH)
+SRC = test.c
+ARCH = x64
+
+.PHONY: main
+main: all
+	$(Q)cat $(MOD).mpy | python -c 'import sys; print(sys.stdin.buffer.read())'
+
+include $(MPY_DIR)/py/dynruntime.mk
diff --git a/tests/micropython/import_mpy_native_gc_module/test.c b/tests/micropython/import_mpy_native_gc_module/test.c
new file mode 100644
index 0000000000000..7ec7db42daed3
--- /dev/null
+++ b/tests/micropython/import_mpy_native_gc_module/test.c
@@ -0,0 +1,38 @@
+// This test native module is used by import_mpy_native_gc.py.
+// It has:
+//  - A variable in the BSS, to check that the BSS is not reclaimed by the GC.
+//  - An unused native function at the start so that subsequent native functions
+//    don't start at the beginning of the native function data.  This tests that the
+//    GC doesn't reclaim the native function data even when the only pointer to that
+//    data is pointing inside the allocated memory.
+
+#include "py/dynruntime.h"
+
+uint32_t bss_variable;
+
+static mp_obj_t unused(mp_obj_t x_obj) {
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(unused_obj, unused);
+
+static mp_obj_t get(void) {
+    return mp_obj_new_int(bss_variable);
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(get_obj, get);
+
+static mp_obj_t add1(mp_obj_t x_obj) {
+    return mp_obj_new_int(mp_obj_get_int(x_obj) + 1);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(add1_obj, add1);
+
+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
+
+    bss_variable = 123456;
+
+    mp_store_global(MP_QSTR_unused, MP_OBJ_FROM_PTR(&unused_obj));
+    mp_store_global(MP_QSTR_get, MP_OBJ_FROM_PTR(&get_obj));
+    mp_store_global(MP_QSTR_add1, MP_OBJ_FROM_PTR(&add1_obj));
+
+    MP_DYNRUNTIME_INIT_EXIT
+}

From 36fe9bbf0001fda887fdc85b6eac8e926d2cf3f0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Sep 2024 14:07:24 +1000
Subject: [PATCH 1467/3129] unix/alloc: Don't trace executable memory for GC
 pointers.

This tracing was originally needed for three reasons:

1. To trace object/raw-code pointers embedded in native code, eg from
   @micropython.native functions.

2. To trace pointers to BSS/rodata from relocated viper code.

3. For libffi tracing.

The tracing in point 1 was made unnecessary long ago in commit
7d4b6cc868ebf0e1cc5dfe5276b22e1b857c411b (see also commit
bbccb0f630dc9b2769a891c2c28fbbe810284225 which removed scanning of native
code on the esp8266 port).

Since the previous commit, point 2 is no longer needed.

For point 3, this was made unnecessary in the recent commit
97966254577167f4c50200af1af89109a275da1c.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/alloc.c        | 7 -------
 ports/unix/gccollect.c    | 3 ---
 ports/unix/mpconfigport.h | 1 -
 3 files changed, 11 deletions(-)

diff --git a/ports/unix/alloc.c b/ports/unix/alloc.c
index c508139a8284d..9ef19cb43dedb 100644
--- a/ports/unix/alloc.c
+++ b/ports/unix/alloc.c
@@ -31,7 +31,6 @@
 #include <sys/mman.h>
 
 #include "py/mpstate.h"
-#include "py/gc.h"
 
 #if MICROPY_EMIT_NATIVE || (MICROPY_PY_FFI && MICROPY_FORCE_PLAT_ALLOC_EXEC)
 
@@ -79,12 +78,6 @@ void mp_unix_free_exec(void *ptr, size_t size) {
     }
 }
 
-void mp_unix_mark_exec(void) {
-    for (mmap_region_t *rg = MP_STATE_VM(mmap_region_head); rg != NULL; rg = rg->next) {
-        gc_collect_root(rg->ptr, rg->len / sizeof(mp_uint_t));
-    }
-}
-
 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/gccollect.c b/ports/unix/gccollect.c
index 94c9c61ea4d6a..8f0f5a6769d3d 100644
--- a/ports/unix/gccollect.c
+++ b/ports/unix/gccollect.c
@@ -39,9 +39,6 @@ void gc_collect(void) {
     #if MICROPY_PY_THREAD
     mp_thread_gc_others();
     #endif
-    #if MICROPY_EMIT_NATIVE
-    mp_unix_mark_exec();
-    #endif
     gc_collect_end();
 }
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 41275471129cb..c12c0c9d9af59 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -168,7 +168,6 @@ extern const struct _mp_print_t 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);
 #define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) mp_unix_alloc_exec(min_size, ptr, size)
 #define MP_PLAT_FREE_EXEC(ptr, size) mp_unix_free_exec(ptr, size)
 #ifndef MICROPY_FORCE_PLAT_ALLOC_EXEC

From 40048f0f25a903ad8433762a56387edd8c528e19 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 2 Sep 2024 13:25:53 +1000
Subject: [PATCH 1468/3129] ports: Fix lwIP config setting to disable DHCP ARP
 check.

lwIP was recently updated in a89ac9e24a566e45bd3ffa7ef9e61e1d994616ea
to STABLE-2_2_0_RELEASE, and this introduced a change in the configuration
variable `DHCP_DOES_ARP_CHECK`, renaming it to `LWIP_DHCP_DOES_ACD_CHECK`.

This commit fixes the ports lwIP settings to use the new configuration
option.

Without this option, connecting to a WiFi access-point takes about 12.5
seconds.  With this option (ie disabling DHCP ARP checks) connecting takes
about 4 seconds.

Tested on an RPI_PICO_W and PYBD_SF2.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/lwip_inc/lwipopts.h     | 2 +-
 ports/renesas-ra/lwip_inc/lwipopts.h | 2 +-
 ports/rp2/lwip_inc/lwipopts.h        | 2 +-
 ports/stm32/lwip_inc/lwipopts.h      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/lwip_inc/lwipopts.h b/ports/mimxrt/lwip_inc/lwipopts.h
index 2401c05f95a39..411ca4b60f342 100644
--- a/ports/mimxrt/lwip_inc/lwipopts.h
+++ b/ports/mimxrt/lwip_inc/lwipopts.h
@@ -28,7 +28,7 @@
 #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_DHCP_DOES_ACD_CHECK        0 // to speed DHCP up
 #define LWIP_DNS                        1
 #define LWIP_DNS_SUPPORT_MDNS_QUERIES   1
 #define LWIP_MDNS_RESPONDER             1
diff --git a/ports/renesas-ra/lwip_inc/lwipopts.h b/ports/renesas-ra/lwip_inc/lwipopts.h
index f7dc80cc38637..74e39022a6a85 100644
--- a/ports/renesas-ra/lwip_inc/lwipopts.h
+++ b/ports/renesas-ra/lwip_inc/lwipopts.h
@@ -26,7 +26,7 @@
 #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_DHCP_DOES_ACD_CHECK        0 // to speed DHCP up
 #define LWIP_DNS                        1
 #define LWIP_DNS_SUPPORT_MDNS_QUERIES   1
 #define LWIP_MDNS_RESPONDER             1
diff --git a/ports/rp2/lwip_inc/lwipopts.h b/ports/rp2/lwip_inc/lwipopts.h
index f42bea528e0a4..15679e0cf018d 100644
--- a/ports/rp2/lwip_inc/lwipopts.h
+++ b/ports/rp2/lwip_inc/lwipopts.h
@@ -32,7 +32,7 @@
 #define LWIP_ND6_QUEUEING               0
 #define LWIP_DHCP                       1
 #define LWIP_DHCP_CHECK_LINK_UP         1
-#define DHCP_DOES_ARP_CHECK             0 // to speed DHCP up
+#define LWIP_DHCP_DOES_ACD_CHECK        0 // to speed DHCP up
 #define LWIP_DNS                        1
 #define LWIP_DNS_SUPPORT_MDNS_QUERIES   1
 #define LWIP_MDNS_RESPONDER             1
diff --git a/ports/stm32/lwip_inc/lwipopts.h b/ports/stm32/lwip_inc/lwipopts.h
index b779b558c9ec7..9e1aa8d0f14c0 100644
--- a/ports/stm32/lwip_inc/lwipopts.h
+++ b/ports/stm32/lwip_inc/lwipopts.h
@@ -30,7 +30,7 @@
 #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_DHCP_DOES_ACD_CHECK        0 // to speed DHCP up
 #define LWIP_DNS                        1
 #define LWIP_DNS_SUPPORT_MDNS_QUERIES   1
 #define LWIP_MDNS_RESPONDER             1

From 09fa90ed4718367eb9d7a2340d4f3e65da775e6b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Sep 2024 12:22:50 +1000
Subject: [PATCH 1469/3129] lib/tinyusb: Update to version 0.17.0.

Includes support for RP2350, and improvements for ESP32.

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 d10b65ada4be7..5217cee5de4cd 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit d10b65ada4be7d5754b3128e80a9b4db72bdb23f
+Subproject commit 5217cee5de4cd555018da90f9f1bcc87fb1c1d3a

From b0ba151102a6c1b2e0e4c419c6482a64677c9b40 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Aug 2024 14:20:35 +1000
Subject: [PATCH 1470/3129] shared/tinyusb: Use new persistent-tx-fifo
 configure interface.

The old configuration option has been removed from TinyUSB.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/tinyusb/mp_usbd.h         | 10 +++++++++-
 shared/tinyusb/mp_usbd_runtime.c |  6 ++++--
 shared/tinyusb/tusb_config.h     |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 31234566b6ca4..5c8f2a6095f30 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -40,6 +40,13 @@
 #include "device/dcd.h"
 #endif
 
+// Initialise TinyUSB device.
+static inline void mp_usbd_init_tud(void) {
+    tusb_init();
+    tud_cdc_configure_fifo_t cfg = { .rx_persistent = 0, .tx_persistent = 1 };
+    tud_cdc_configure_fifo(&cfg);
+}
+
 // Run the TinyUSB device task
 void mp_usbd_task(void);
 
@@ -125,7 +132,8 @@ inline static bool mp_usb_device_builtin_enabled(const mp_obj_usb_device_t *usbd
 
 static inline void mp_usbd_init(void) {
     // Without runtime USB support, this can be a thin wrapper wrapper around tusb_init()
-    tusb_init();
+    // which is called in the below helper function.
+    mp_usbd_init_tud();
 }
 
 #endif
diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index 49553825776a7..a1eebeebd2fcd 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -428,8 +428,10 @@ void mp_usbd_init(void) {
     }
 
     if (need_usb) {
-        tusb_init(); // Safe to call redundantly
-        tud_connect(); // Reconnect if mp_usbd_deinit() has disconnected
+        // The following will call tusb_init(), which is safe to call redundantly.
+        mp_usbd_init_tud();
+        // Reconnect if mp_usbd_deinit() has disconnected.
+        tud_connect();
     }
 }
 
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index d0c9f89ec600c..0cc5ef03985ef 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -83,7 +83,6 @@
 #ifndef CFG_TUD_CDC_TX_BUFSIZE
 #define CFG_TUD_CDC_TX_BUFSIZE  ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
 #endif
-#define CFG_TUD_CDC_PERSISTENT_TX_BUFF (1)
 #endif
 
 // MSC Configuration

From 43b05afdf51d19caadafd27562dafc4a85f0b67d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 23 Sep 2024 18:07:47 +0200
Subject: [PATCH 1471/3129] py/mpz: Skip separators when running out of digits
 to print.

This commit fixes the addition of a stray separator before the number
when printing an MPZ-backed integer and the first group is three digits
long.

This fixes #8984.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/mpz.c                             |  2 +-
 tests/basics/string_format_intbig.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/basics/string_format_intbig.py

diff --git a/py/mpz.c b/py/mpz.c
index 750664ad9aaf8..084aebda9ecaa 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -1717,7 +1717,7 @@ size_t mpz_as_str_inpl(const mpz_t *i, unsigned int base, const char *prefix, ch
                 break;
             }
         }
-        if (comma && (s - last_comma) == 3) {
+        if (!done && comma && (s - last_comma) == 3) {
             *s++ = comma;
             last_comma = s;
         }
diff --git a/tests/basics/string_format_intbig.py b/tests/basics/string_format_intbig.py
new file mode 100644
index 0000000000000..a36c36752e705
--- /dev/null
+++ b/tests/basics/string_format_intbig.py
@@ -0,0 +1,15 @@
+# basic functionality test for {} format string using large integers
+
+
+def test(fmt, *args):
+    print("{:8s}".format(fmt) + ">" + fmt.format(*args) + "<")
+
+
+# Separator formatter
+
+test("{:,}", 123_456_789_012_345_678_901_234_567)
+test("{:,}", 23_456_789_012_345_678_901_234_567)
+test("{:,}", 3_456_789_012_345_678_901_234_567)
+test("{:,}", -123_456_789_012_345_678_901_234_567)
+test("{:,}", -23_456_789_012_345_678_901_234_567)
+test("{:,}", -3_456_789_012_345_678_901_234_567)

From 73feaaf931682288b9da4b241575e28a508cbcf8 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 26 Sep 2024 10:32:04 +1000
Subject: [PATCH 1472/3129] rp2/machine_uart: Fix dropped UART REPL bytes on
 soft reset.

Necessary to fix "mpremote run" over hardware UART.

Bisect shows bug was introduced by d420b4e4, but looks like made more
complex by 01c046d2. Specifically: resetting and re-initialising the REPL
UART during soft reset clears the FIFO before it's done printing the "MPY:
soft reboot" line.

Fixed by adding a UART TX flush in the deinit path.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/machine_uart.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 689906003e7dc..955e4a8479913 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -458,6 +458,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+    uart_tx_wait_blocking(self->uart); // Flush TX FIFO if necessary
     uart_deinit(self->uart);
     if (self->uart_id == 0) {
         irq_set_enabled(UART0_IRQ, false);

From 17d82344581ad3a76033fae54c5d3304e17f185f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 25 Sep 2024 00:02:57 +0200
Subject: [PATCH 1473/3129] py/parse: Remove old esp32 compiler workaround.

The ESP32 port contains a workaround to avoid having a certain function
in `py/parse.c` being generated incorrectly.  The compiler in question
is not part of any currently supported version of ESP-IDF anymore, and the
problem inside the compiler (well, assembler in this case) has been
corrected a few years ago.

This commit removes all traces of that workaround from the source tree.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/mpconfigport.h | 7 -------
 py/parse.c                 | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 747c55e92dcb7..5dfb16447dec0 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -47,13 +47,6 @@
 #define MICROPY_EMIT_RV32                   (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
 #ifndef MICROPY_OPT_COMPUTED_GOTO
 #define MICROPY_OPT_COMPUTED_GOTO           (1)
diff --git a/py/parse.c b/py/parse.c
index 4ba9560734f04..db89fb58450e3 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -648,11 +648,6 @@ static const mp_rom_map_elem_t mp_constants_table[] = {
 static MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
 #endif
 
-#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 3a3dbf524b4248832c025d5f988a8216d7d79014 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 16 Sep 2022 14:10:53 -0500
Subject: [PATCH 1474/3129] zephyr: Update include paths to use the zephyr
 namespace.

Zephyr v3.1.0 moved all public headers to include/zephyr. Updates a few
Zephyr include paths that were missed in
4fd54a475661953946e9e3c3f962b20619c82240.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/modbluetooth_zephyr.c  | 4 ++--
 ports/zephyr/mpconfigport_minimal.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index b427a6cd98b9f..8947bdf53567d 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -31,8 +31,8 @@
 
 #if MICROPY_PY_BLUETOOTH
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 #include "extmod/modbluetooth.h"
 
 #define DEBUG_printf(...) // printk("BLE: " __VA_ARGS__)
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index 6c7a4c6b8198c..d81e007e03a35 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -28,7 +28,7 @@
 // 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 <zephyr/zephyr.h>
 
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE

From 4e59a5190296cabd1be8de158d18d22444381958 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 16 Sep 2022 12:31:06 -0500
Subject: [PATCH 1475/3129] zephyr: Replace zephyr.h with kernel.h.

Zephyr v3.2.0 deprecated include/zephyr/zephyr.h in favor of
include/zephyr/kernel.h since it only included that header.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 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                 | 2 +-
 ports/zephyr/modsocket.c            | 2 +-
 ports/zephyr/modtime.c              | 2 +-
 ports/zephyr/modzephyr.c            | 2 +-
 ports/zephyr/modzsensor.c           | 2 +-
 ports/zephyr/mpconfigport.h         | 2 +-
 ports/zephyr/mpconfigport_minimal.h | 2 +-
 ports/zephyr/mphalport.h            | 2 +-
 ports/zephyr/mpthreadport.h         | 2 +-
 ports/zephyr/src/zephyr_getchar.c   | 2 +-
 ports/zephyr/src/zephyr_start.c     | 2 +-
 ports/zephyr/uart_core.c            | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 27c0a63a0ef9c..342ebafe7a127 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 97a852be8abca..8a62ea1d260ef 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 5c090e15cfa27..2474f2bb875f9 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index bd40137a3e7d6..ae5ac4a1918e1 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -28,7 +28,7 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 
 #include "py/mperrno.h"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index a2af609ed389a..7a18f48165793 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #ifdef CONFIG_NETWORKING
 #include <zephyr/net/net_context.h>
 #endif
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index cef9933b28fa7..1ca84edcac897 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -31,7 +31,7 @@
 #include "py/stream.h"
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 // Zephyr's generated version header
 #include <version.h>
 #include <zephyr/net/net_context.h>
diff --git a/ports/zephyr/modtime.c b/ports/zephyr/modtime.c
index f1181232ae2df..b042095ed9cc9 100644
--- a/ports/zephyr/modtime.c
+++ b/ports/zephyr/modtime.c
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "py/obj.h"
 
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 2e3fc2fecf533..c059c7e395796 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -29,7 +29,7 @@
 #if MICROPY_PY_ZEPHYR
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/debug/thread_analyzer.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/shell/shell_uart.h>
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 58775b980ad3f..de7fe7f527023 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -28,7 +28,7 @@
 
 #include "py/runtime.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 
 #if MICROPY_PY_ZSENSOR
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 26465cbb59b84..a2e74e6928984 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -28,7 +28,7 @@
 // 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/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
 // Usually passed from Makefile
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index d81e007e03a35..9aae20c72c681 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -28,7 +28,7 @@
 // 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/zephyr.h>
+#include <zephyr/kernel.h>
 
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index e1f402cb3f4eb..e5414c27059ad 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,4 +1,4 @@
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "shared/runtime/interrupt_char.h"
 
 #define MICROPY_BEGIN_ATOMIC_SECTION irq_lock
diff --git a/ports/zephyr/mpthreadport.h b/ports/zephyr/mpthreadport.h
index 37dd725321354..b0165bad1c898 100644
--- a/ports/zephyr/mpthreadport.h
+++ b/ports/zephyr/mpthreadport.h
@@ -29,7 +29,7 @@
 #ifndef MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
 #define MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 typedef struct _mp_thread_mutex_t {
     struct k_sem handle;
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 3dd87137733c7..94e35e2e84ee0 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/console/uart_console.h>
 #include <zephyr/sys/printk.h>
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index 3b00bac121865..e15f874b1630e 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "zephyr_getchar.h"
 
 int real_main(void);
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 7e2db3653b24a..ee525c33f7266 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -28,7 +28,7 @@
 #include "py/runtime.h"
 #include "src/zephyr_getchar.h"
 // Zephyr headers
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/console/console.h>
 #include <zephyr/console/tty.h>

From 2407c46dac4ce75a64bc167478fab45c79c3396b Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 16 Sep 2022 12:46:51 -0500
Subject: [PATCH 1476/3129] docs/zephyr: Update docs to reflect device name
 changes.

Zephyr v3.2.0 deprecated the devicetree label property as a base
property, which had been used as the device name string for
device_get_binding(). The device name string is now the devicetree node
name appended with its unit-address. Update Zephyr port documentation
to reflect this change.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 docs/zephyr/quickref.rst | 23 +++++++++++++----------
 ports/zephyr/README.md   | 10 +++++-----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index d8b1f8768d028..31a4ac46c250e 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -36,7 +36,10 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
 
     from machine import Pin
 
-    pin = Pin(("GPIO_1", 21), Pin.IN)   # create input pin on GPIO1
+    gpio1 = "gpio@400ff040"             # GPIO1 device name
+    gpio2 = "gpio@400ff080"             # GPIO2 device name
+
+    pin = Pin((gpio1, 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
@@ -47,14 +50,14 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
     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((gpio1, 21), Pin.IN)              # create input pin on GPIO1
 
-    pin = Pin(("GPIO_1", 21), Pin.OUT, value=1)         # set pin high on creation
+    pin = Pin((gpio1, 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
+    pin = Pin((gpio1, 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
+    switch = Pin((gpio2, 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
 ----------------
@@ -63,7 +66,7 @@ Hardware I2C is accessed via the :ref:`machine.I2C <machine.I2C>` class::
 
     from machine import I2C
 
-    i2c = I2C("I2C_0")          # construct an i2c bus
+    i2c = I2C("i2c@40066000")   # construct an i2c bus
     print(i2c)                  # print device name
 
     i2c.scan()                  # scan the device for available I2C slaves
@@ -84,11 +87,11 @@ 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 = SPI("spi@4002c000")   # 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)
+    spi = SPI("spi@4002c000", 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
@@ -146,7 +149,7 @@ 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 = Sensor("fxos8700@1d") # create sensor object for the accelerometer
 
     accel.measure()               # obtain a measurement reading from the accelerometer
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index c463b37d1f4a2..11cd0acfa277e 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -107,7 +107,7 @@ To blink an LED:
     import time
     from machine import Pin
 
-    LED = Pin(("GPIO_1", 21), Pin.OUT)
+    LED = Pin(("gpio@400ff040", 21), Pin.OUT)
     while True:
         LED.value(1)
         time.sleep(0.5)
@@ -125,8 +125,8 @@ 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 = Pin(("gpio@400ff080", 6), Pin.IN)
+    SW3 = Pin(("gpio@400ff000", 4), Pin.IN)
 
     SW2.irq(lambda t: print("SW2 changed"))
     SW3.irq(lambda t: print("SW3 changed"))
@@ -138,14 +138,14 @@ Example of using I2C to scan for I2C slaves:
 
     from machine import I2C
 
-    i2c = I2C("I2C_0")
+    i2c = I2C("i2c@40066000")
     i2c.scan()
 
 Example of using SPI to write a buffer to the MOSI pin:
 
     from machine import SPI
 
-    spi = SPI("SPI_0")
+    spi = SPI("spi@4002c000")
     spi.init(baudrate=500000, polarity=1, phase=1, bits=8, firstbit=SPI.MSB)
     spi.write(b'abcd')
 

From 90c5b04a97846cf63bfb15e48bc1d7cca6557a0c Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Tue, 4 Oct 2022 16:06:55 -0500
Subject: [PATCH 1477/3129] zephyr: Replace deprecated FLASH_AREA macros with
 FIXED_PARTITION.

Zephyr v3.2.0 deprecated FLASH_AREA macros in favor of FIXED_PARTITION
macros, using node labels instead of node label properties to reference
flash storage partitions.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/main.c           | 4 ++--
 ports/zephyr/zephyr_storage.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 7a18f48165793..9fae2b3a873e5 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -100,8 +100,8 @@ static void vfs_init(void) {
     mp_obj_t args[] = { mp_obj_new_str_from_cstr(CONFIG_SDMMC_VOLUME_NAME) };
     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) };
+    #elif defined(CONFIG_FLASH_MAP) && FIXED_PARTITION_EXISTS(storage_partition)
+    mp_obj_t args[] = { MP_OBJ_NEW_SMALL_INT(FIXED_PARTITION_ID(storage_partition)), MP_OBJ_NEW_SMALL_INT(4096) };
     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/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index af1772205e06c..484feb113017a 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -244,8 +244,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) },
-    #if FLASH_AREA_LABEL_EXISTS(storage)
-    { MP_ROM_QSTR(MP_QSTR_STORAGE), MP_ROM_INT(FLASH_AREA_ID(storage)) },
+    #if FIXED_PARTITION_EXISTS(storage_partition)
+    { MP_ROM_QSTR(MP_QSTR_STORAGE), MP_ROM_INT(FIXED_PARTITION_ID(storage_partition)) },
     #endif
 };
 static MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);

From a7ae3a385e0c394445d109bd967b0d90a4fe92e7 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@analog.com>
Date: Wed, 30 Aug 2023 16:41:08 -0500
Subject: [PATCH 1478/3129] zephyr: Change main function to return an int.

Zephyr v3.4.0 changed the declaration of the main function to return an
int to allow building Zephyr without the -ffreestanding compiler flag.

Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 ports/zephyr/src/zephyr_start.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index e15f874b1630e..c37af8e5b3a87 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -29,11 +29,13 @@
 int real_main(void);
 int mp_console_init(void);
 
-void main(void) {
+int main(void) {
     #ifdef CONFIG_CONSOLE_SUBSYS
     mp_console_init();
     #else
     zephyr_getchar_init();
     #endif
     real_main();
+
+    return 0;
 }

From e191265f7f71862ccc5634797c60f443511752f1 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@analog.com>
Date: Wed, 30 Aug 2023 16:49:40 -0500
Subject: [PATCH 1479/3129] zephyr: Change SPI chip select from a pointer to a
 struct member.

Zephyr v3.4.0 changed the SPI chip select from a pointer to a struct
member to allow using the existing SPI dt-spec macros in C++.

Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 ports/zephyr/machine_spi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 2474f2bb875f9..80bfa2e548e99 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -102,7 +102,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
                 args[ARG_bits].u_int << 5 |
                 SPI_LINES_SINGLE),
         .slave = 0,
-        .cs = NULL
+        .cs = {},
     };
 
     machine_hard_spi_obj_t *self = mp_obj_malloc(machine_hard_spi_obj_t, &machine_spi_type);
@@ -157,7 +157,7 @@ static void machine_hard_spi_init(mp_obj_base_t *obj, size_t n_args, const mp_ob
         .frequency = baudrate,
         .operation = operation,
         .slave = 0,
-        .cs = NULL
+        .cs = {},
     };
 
     self->config = cfg;

From fa7b4c48bcb45dae9009f73c3e3eae6d92f3e456 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 16 Sep 2022 13:12:29 -0500
Subject: [PATCH 1480/3129] tools/ci.sh: Upgrade Zephyr docker image 0.26.13
 and SDK 0.16.8.

Upgrades CI to use the latest versions of the Zephyr docker image and
Zephyr SDK.

Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 tools/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 946ef86a3285d..1fd2ebc703ab1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -727,8 +727,8 @@ function ci_windows_build {
 ########################################################################################
 # ports/zephyr
 
-ZEPHYR_DOCKER_VERSION=v0.21.0
-ZEPHYR_SDK_VERSION=0.13.2
+ZEPHYR_DOCKER_VERSION=v0.26.13
+ZEPHYR_SDK_VERSION=0.16.8
 ZEPHYR_VERSION=v3.1.0
 
 function ci_zephyr_setup {

From 545d4efb5590b0144e1f29e437d816a7b58aa40d Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 16 Sep 2022 13:17:05 -0500
Subject: [PATCH 1481/3129] zephyr: Upgrade to Zephyr v3.7.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@analog.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 2c091f7ee94fe..db7b7333d2416 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.1.0  ***
-        MicroPython v1.19.1-9-g4fd54a475 on 2022-06-17; zephyr-frdm_k64f with mk64f12
+        *** Booting Zephyr OS build v3.7.0 ***
+        MicroPython v1.24.0-preview.179.g5b85b24bd on 2024-08-05; zephyr-frdm_k64f with mk64f12
         Type "help()" for more information.
         >>>
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 11cd0acfa277e..39010b2ac96e6 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.1.0, and may also work on higher
+This port requires Zephyr version v3.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 v3.1.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.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 v3.1.0
+    $ git checkout v3.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 1fd2ebc703ab1..feb40cc4ff34a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -729,7 +729,7 @@ function ci_windows_build {
 
 ZEPHYR_DOCKER_VERSION=v0.26.13
 ZEPHYR_SDK_VERSION=0.16.8
-ZEPHYR_VERSION=v3.1.0
+ZEPHYR_VERSION=v3.7.0
 
 function ci_zephyr_setup {
     docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}

From f33df7197e30db1e0ede3632a0baebf8f711d7d2 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@analog.com>
Date: Sun, 8 Sep 2024 15:09:57 -0500
Subject: [PATCH 1482/3129] zephyr: Refactor device lookup into a common helper
 function.

Refactors Zephyr device lookup operations into a common helper function
to reduce boilerplate code that was repeated in multiple modules.

Suggested-by: Damien George <damien@micropython.org>
Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 ports/zephyr/CMakeLists.txt  |  1 +
 ports/zephyr/machine_i2c.c   |  8 ++-----
 ports/zephyr/machine_pin.c   |  7 ++----
 ports/zephyr/machine_spi.c   |  8 ++-----
 ports/zephyr/machine_uart.c  |  6 ++---
 ports/zephyr/modzsensor.c    |  6 ++---
 ports/zephyr/zephyr_device.c | 43 ++++++++++++++++++++++++++++++++++++
 ports/zephyr/zephyr_device.h | 30 +++++++++++++++++++++++++
 8 files changed, 84 insertions(+), 25 deletions(-)
 create mode 100644 ports/zephyr/zephyr_device.c
 create mode 100644 ports/zephyr/zephyr_device.h

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index a2c2120319a4c..68b6c0700b546 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -46,6 +46,7 @@ set(MICROPY_SOURCE_PORT
     modzsensor.c
     mphalport.c
     uart_core.c
+    zephyr_device.c
     zephyr_storage.c
     mpthreadport.c
 )
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 342ebafe7a127..ee8edfa34b9c6 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -37,6 +37,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/modmachine.h"
+#include "zephyr_device.h"
 
 #if MICROPY_PY_MACHINE_I2C
 
@@ -64,12 +65,7 @@ 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);
 
-    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"));
-    }
+    const struct device *dev = zephyr_device_find(args[ARG_id].u_obj);
 
     if ((args[ARG_scl].u_obj != MP_OBJ_NULL) || (args[ARG_sda].u_obj != MP_OBJ_NULL)) {
         mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of scl/sda is not implemented"));
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 8a62ea1d260ef..2240196690071 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -38,6 +38,7 @@
 #include "extmod/modmachine.h"
 #include "shared/runtime/mpirq.h"
 #include "modmachine.h"
+#include "zephyr_device.h"
 
 #if MICROPY_PY_MACHINE
 
@@ -131,12 +132,8 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     }
     mp_obj_t *items;
     mp_obj_get_array_fixed_n(args[0], 2, &items);
-    const char *drv_name = mp_obj_str_get_str(items[0]);
+    const struct device *wanted_port = zephyr_device_find(items[0]);
     int wanted_pin = mp_obj_get_int(items[1]);
-    const struct device *wanted_port = device_get_binding(drv_name);
-    if (!wanted_port) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid port"));
-    }
 
     machine_pin_obj_t *pin = m_new_obj(machine_pin_obj_t);
     pin->base = machine_pin_obj_template;
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 80bfa2e548e99..23e44caf3751c 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -36,6 +36,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/modmachine.h"
+#include "zephyr_device.h"
 
 #if MICROPY_PY_MACHINE_SPI
 
@@ -81,12 +82,7 @@ mp_obj_t machine_hard_spi_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);
 
-    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"));
-    }
+    const struct device *dev = zephyr_device_find(args[ARG_id].u_obj);
 
     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"));
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index ae5ac4a1918e1..1927335ddf1c1 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -32,6 +32,7 @@
 #include <zephyr/drivers/uart.h>
 
 #include "py/mperrno.h"
+#include "zephyr_device.h"
 
 // The UART class doesn't have any constants for this port.
 #define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
@@ -75,10 +76,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
-    self->dev = device_get_binding(mp_obj_str_get_str(args[0]));
-    if (!self->dev) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Bad device name"));
-    }
+    self->dev = zephyr_device_find(args[0]);
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index de7fe7f527023..51b7b2dbf53f3 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -30,6 +30,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
+#include "zephyr_device.h"
 
 #if MICROPY_PY_ZSENSOR
 
@@ -41,10 +42,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 = 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"));
-    }
+    o->dev = zephyr_device_find(args[0]);
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/ports/zephyr/zephyr_device.c b/ports/zephyr/zephyr_device.c
new file mode 100644
index 0000000000000..2ef3317427600
--- /dev/null
+++ b/ports/zephyr/zephyr_device.c
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Analog Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "zephyr_device.h"
+#include "py/runtime.h"
+
+const struct device *zephyr_device_find(mp_obj_t name) {
+    const char *dev_name = mp_obj_str_get_str(name);
+    const struct device *dev = device_get_binding(dev_name);
+
+    if (dev == NULL) {
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
+        mp_raise_ValueError(MP_ERROR_TEXT("device not found"));
+        #else
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("device %s not found"), dev_name);
+        #endif
+    }
+
+    return dev;
+}
diff --git a/ports/zephyr/zephyr_device.h b/ports/zephyr/zephyr_device.h
new file mode 100644
index 0000000000000..ef82eba93bb5a
--- /dev/null
+++ b/ports/zephyr/zephyr_device.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Analog Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <zephyr/device.h>
+#include "py/obj.h"
+
+const struct device *zephyr_device_find(mp_obj_t name);

From a9803f47115ff2319232e89b6c4c5b380bad5c2b Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@analog.com>
Date: Mon, 5 Aug 2024 12:58:36 -0500
Subject: [PATCH 1483/3129] zephyr: Allow using devicetree node labels to
 construct machine objects.

Zephyr v3.7.0 added a new feature to allow getting devices by their
devicetree node labels. Use this feature in the MicroPython Zephyr port
to simplify constructing machine module objects, including Pin, SPI,
I2C, and UART. It's still possible to use the more verbose device names
(e.g., gpio@400ff040, i2c@40066000, spi@4002c000), but now we can also
use their devicetree node labels (e.g., gpiob, i2c0, spi0).

Node labels aren't standardized across all SoC families because they
generally try to follow their respective SoC hardware user manual naming
convention, however many boards define common labels for devices routed
to Arduino headers (e.g., arduino_i2c, arduino_serial, and arduino_spi).
That means I2C("arduino_i2c") will work on quite a few boards (>100 in
the main Zephyr tree).

Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 docs/zephyr/quickref.rst     | 23 ++++++++++-------------
 ports/zephyr/README.md       | 20 ++++++++++----------
 ports/zephyr/prj.conf        |  2 ++
 ports/zephyr/zephyr_device.c |  6 ++++++
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 31a4ac46c250e..63d4bced039fb 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -36,10 +36,7 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
 
     from machine import Pin
 
-    gpio1 = "gpio@400ff040"             # GPIO1 device name
-    gpio2 = "gpio@400ff080"             # GPIO2 device name
-
-    pin = Pin((gpio1, 21), Pin.IN)      # create input pin on GPIO1
+    pin = Pin(("gpiob", 21), Pin.IN)    # create input pin on GPIO port B
     print(pin)                          # print pin port and number
 
     pin.init(Pin.OUT, Pin.PULL_UP, value=1)     # reinitialize pin
@@ -50,14 +47,14 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
     pin.on()                            # set pin to high
     pin.off()                           # set pin to low
 
-    pin = Pin((gpio1, 21), Pin.IN)              # create input pin on GPIO1
+    pin = Pin(("gpiob", 21), Pin.IN)              # create input pin on GPIO port B
 
-    pin = Pin((gpio1, 21), Pin.OUT, value=1)    # set pin high on creation
+    pin = Pin(("gpiob", 21), Pin.OUT, value=1)    # set pin high on creation
 
-    pin = Pin((gpio1, 21), Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
+    pin = Pin(("gpiob", 21), Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
 
-    switch = Pin((gpio2, 6), Pin.IN)            # create input pin for a switch
-    switch.irq(lambda t: print("SW2 changed"))  # enable an interrupt when switch state is changed
+    switch = Pin(("gpioc", 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
 ----------------
@@ -66,7 +63,7 @@ Hardware I2C is accessed via the :ref:`machine.I2C <machine.I2C>` class::
 
     from machine import I2C
 
-    i2c = I2C("i2c@40066000")   # construct an i2c bus
+    i2c = I2C("i2c0")           # construct an i2c bus
     print(i2c)                  # print device name
 
     i2c.scan()                  # scan the device for available I2C slaves
@@ -87,11 +84,11 @@ Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class::
 
     from machine import SPI
 
-    spi = SPI("spi@4002c000")   # construct a spi bus with default configuration
+    spi = SPI("spi0")           # 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@4002c000", baudrate=100000, polarity=0, phase=0, bits=8, firstbit=SPI.MSB)
+    spi = SPI("spi0", 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
@@ -149,7 +146,7 @@ Use the :ref:`zsensor.Sensor <zsensor.Sensor>` class to access sensor data::
     import zsensor
     from zsensor import Sensor
 
-    accel = Sensor("fxos8700@1d") # create sensor object for the accelerometer
+    accel = Sensor("fxos8700")    # create sensor object for the accelerometer
 
     accel.measure()               # obtain a measurement reading from the accelerometer
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 39010b2ac96e6..4590eb7199c25 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -107,7 +107,7 @@ To blink an LED:
     import time
     from machine import Pin
 
-    LED = Pin(("gpio@400ff040", 21), Pin.OUT)
+    LED = Pin(("gpiob", 21), Pin.OUT)
     while True:
         LED.value(1)
         time.sleep(0.5)
@@ -115,18 +115,18 @@ To blink an LED:
         time.sleep(0.5)
 
 The above code uses an LED location for a FRDM-K64F board (port B, pin 21;
-following Zephyr conventions port are identified by "GPIO_x", where *x*
-starts from 0). You will need to adjust it for another board (using board's
-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.
+following Zephyr conventions port are identified by their devicetree node
+label. You will need to adjust it for another board (using board's 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@400ff080", 6), Pin.IN)
-    SW3 = Pin(("gpio@400ff000", 4), Pin.IN)
+    SW2 = Pin(("gpioc", 6), Pin.IN)
+    SW3 = Pin(("gpioa", 4), Pin.IN)
 
     SW2.irq(lambda t: print("SW2 changed"))
     SW3.irq(lambda t: print("SW3 changed"))
@@ -138,14 +138,14 @@ Example of using I2C to scan for I2C slaves:
 
     from machine import I2C
 
-    i2c = I2C("i2c@40066000")
+    i2c = I2C("i2c0")
     i2c.scan()
 
 Example of using SPI to write a buffer to the MOSI pin:
 
     from machine import SPI
 
-    spi = SPI("spi@4002c000")
+    spi = SPI("spi0")
     spi.init(baudrate=500000, polarity=1, phase=1, bits=8, firstbit=SPI.MSB)
     spi.write(b'abcd')
 
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index d3983fcc25102..eac04216c7fac 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -16,6 +16,8 @@ CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4736
 CONFIG_POLL=y
 
+CONFIG_DEVICE_DT_METADATA=y
+
 # Enable sensor subsystem (doesn't add code if not used).
 # Specific sensors should be enabled per-board.
 CONFIG_SENSOR=y
diff --git a/ports/zephyr/zephyr_device.c b/ports/zephyr/zephyr_device.c
index 2ef3317427600..51784bc7866c9 100644
--- a/ports/zephyr/zephyr_device.c
+++ b/ports/zephyr/zephyr_device.c
@@ -31,6 +31,12 @@ const struct device *zephyr_device_find(mp_obj_t name) {
     const char *dev_name = mp_obj_str_get_str(name);
     const struct device *dev = device_get_binding(dev_name);
 
+    #ifdef CONFIG_DEVICE_DT_METADATA
+    if (dev == NULL) {
+        dev = device_get_by_dt_nodelabel(dev_name);
+    }
+    #endif
+
     if (dev == NULL) {
         #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_ValueError(MP_ERROR_TEXT("device not found"));

From 1291718916d023624be2b66d7396aa111eb8cbd5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Oct 2024 07:35:40 +1000
Subject: [PATCH 1484/3129] github/workflows: Free up disk space on zephyr
 workflow.

The zephyr builds take up quite a lot of space.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_zephyr.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index d075582f30919..444b0973daff5 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -20,6 +20,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    - uses: jlumbroso/free-disk-space@main
+      with:
+        # Only free up a few things so this step runs quickly.
+        android: false
+        dotnet: true
+        haskell: true
+        large-packages: false
+        docker-images: false
+        swap-storage: false
     - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_zephyr_setup

From 70a01550c9630b6bc1f0e66b54898286e8b49c0d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Sep 2024 22:35:48 +1000
Subject: [PATCH 1485/3129] unix/alloc: Remove unused
 MICROPY_FORCE_PLAT_ALLOC_EXEC option.

The `MICROPY_FORCE_PLAT_ALLOC_EXEC` config option was made obsolete by
commit 97966254577167f4c50200af1af89109a275da1c, so remove it.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/alloc.c        | 4 ++--
 ports/unix/mpconfigport.h | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ports/unix/alloc.c b/ports/unix/alloc.c
index 9ef19cb43dedb..9ab2ca04ebc97 100644
--- a/ports/unix/alloc.c
+++ b/ports/unix/alloc.c
@@ -32,7 +32,7 @@
 
 #include "py/mpstate.h"
 
-#if MICROPY_EMIT_NATIVE || (MICROPY_PY_FFI && MICROPY_FORCE_PLAT_ALLOC_EXEC)
+#if MICROPY_EMIT_NATIVE
 
 #if defined(__OpenBSD__) || defined(__MACH__)
 #define MAP_ANONYMOUS MAP_ANON
@@ -80,4 +80,4 @@ void mp_unix_free_exec(void *ptr, size_t size) {
 
 MP_REGISTER_ROOT_POINTER(void *mmap_region_head);
 
-#endif // MICROPY_EMIT_NATIVE || (MICROPY_PY_FFI && MICROPY_FORCE_PLAT_ALLOC_EXEC)
+#endif // MICROPY_EMIT_NATIVE
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index c12c0c9d9af59..21ce75a351e98 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -170,11 +170,6 @@ void mp_unix_alloc_exec(size_t min_size, void **ptr, size_t *size);
 void mp_unix_free_exec(void *ptr, size_t size);
 #define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) mp_unix_alloc_exec(min_size, ptr, size)
 #define MP_PLAT_FREE_EXEC(ptr, size) mp_unix_free_exec(ptr, size)
-#ifndef MICROPY_FORCE_PLAT_ALLOC_EXEC
-// Use MP_PLAT_ALLOC_EXEC for any executable memory allocation, including for FFI
-// (overriding libffi own implementation)
-#define MICROPY_FORCE_PLAT_ALLOC_EXEC (1)
-#endif
 
 // If enabled, configure how to seed random on init.
 #ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC

From e39bd3ae9d4a8f6fbd8bfad2402c67b52c634c88 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 28 Sep 2024 22:34:36 +0200
Subject: [PATCH 1486/3129] shared/runtime/gchelper_rv64i: Fix opcode sw/sd
 typo.

The version of the assembly code for the GC helper that was committed
ended up being a version that had an opcode typo in.

The code was tested and working, but an undo operation too many when
cleaning up the file before committing checked in the wrong version.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 shared/runtime/gchelper_rv64i.s | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/shared/runtime/gchelper_rv64i.s b/shared/runtime/gchelper_rv64i.s
index 7f3dcb8a39431..147a0e2bf5b5d 100644
--- a/shared/runtime/gchelper_rv64i.s
+++ b/shared/runtime/gchelper_rv64i.s
@@ -31,18 +31,18 @@ gc_helper_get_regs_and_sp:
 
     /* Store registers into the given array. */
 
-    sw    x8,  0(x10)  /* Save S0.  */
-    sw    x9,  8(x10)  /* Save S1.  */
-    sw   x18, 16(x10)  /* Save S2.  */
-    sw   x19, 24(x10)  /* Save S3.  */
-    sw   x20, 32(x10)  /* Save S4.  */
-    sw   x21, 40(x10)  /* Save S5.  */
-    sw   x22, 48(x10)  /* Save S6.  */
-    sw   x23, 56(x10)  /* Save S7.  */
-    sw   x24, 64(x10)  /* Save S8.  */
-    sw   x25, 72(x10)  /* Save S9.  */
-    sw   x26, 80(x10)  /* Save S10. */
-    sw   x27, 88(x10)  /* Save S11. */
+    sd    x8,  0(x10)  /* Save S0.  */
+    sd    x9,  8(x10)  /* Save S1.  */
+    sd   x18, 16(x10)  /* Save S2.  */
+    sd   x19, 24(x10)  /* Save S3.  */
+    sd   x20, 32(x10)  /* Save S4.  */
+    sd   x21, 40(x10)  /* Save S5.  */
+    sd   x22, 48(x10)  /* Save S6.  */
+    sd   x23, 56(x10)  /* Save S7.  */
+    sd   x24, 64(x10)  /* Save S8.  */
+    sd   x25, 72(x10)  /* Save S9.  */
+    sd   x26, 80(x10)  /* Save S10. */
+    sd   x27, 88(x10)  /* Save S11. */
 
     /* Return the stack pointer. */
 

From ca220b5fc57860f3c5e584230c9d9b684b8847a3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 27 Sep 2024 23:36:13 +0200
Subject: [PATCH 1487/3129] py/nlrrv64: Add RISC-V RV64I NLR implementation.

Add custom NLR support for 64 bits RISC-V RV64I targets.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/nlr.h     | 14 +++++++--
 py/nlrrv64.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 py/py.cmake  |  1 +
 py/py.mk     |  1 +
 4 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 py/nlrrv64.c

diff --git a/py/nlr.h b/py/nlr.h
index 80f6d7cc11493..ce30bc91d67ae 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -45,6 +45,7 @@
 #define MICROPY_NLR_NUM_REGS_XTENSA         (10)
 #define MICROPY_NLR_NUM_REGS_XTENSAWIN      (17)
 #define MICROPY_NLR_NUM_REGS_RV32I          (14)
+#define MICROPY_NLR_NUM_REGS_RV64I          (14)
 
 // *FORMAT-OFF*
 
@@ -89,9 +90,16 @@
 #elif defined(__mips__)
     #define MICROPY_NLR_MIPS (1)
     #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_MIPS)
-#elif defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen == 32)
-    #define MICROPY_NLR_RV32I (1)
-    #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_RV32I)
+#elif defined(__riscv)
+    #if __riscv_xlen == 32
+        #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_RV32I)
+        #define MICROPY_NLR_RV32I (1)
+    #elif __riscv_xlen == 64
+        #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_RV64I)
+        #define MICROPY_NLR_RV64I (1)
+    #else
+        #error Unsupported RISC-V variant.
+    #endif
 #else
     #define MICROPY_NLR_SETJMP (1)
     //#warning "No native NLR support for this arch, using setjmp implementation"
diff --git a/py/nlrrv64.c b/py/nlrrv64.c
new file mode 100644
index 0000000000000..e7ba79797b857
--- /dev/null
+++ b/py/nlrrv64.c
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_RV64I
+
+#undef nlr_push
+
+__attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
+    __asm volatile (
+        "sd   x1, 16(x10)       \n" // Store RA.
+        "sd   x8, 24(x10)       \n" // Store S0.
+        "sd   x9, 32(x10)       \n" // Store S1.
+        "sd  x18, 40(x10)       \n" // Store S2.
+        "sd  x19, 48(x10)       \n" // Store S3.
+        "sd  x20, 56(x10)       \n" // Store S4.
+        "sd  x21, 64(x10)       \n" // Store S5.
+        "sd  x22, 72(x10)       \n" // Store S6.
+        "sd  x23, 80(x10)       \n" // Store S7.
+        "sd  x24, 88(x10)       \n" // Store S8.
+        "sd  x25, 96(x10)       \n" // Store S9.
+        "sd  x26, 104(x10)      \n" // Store S10.
+        "sd  x27, 112(x10)      \n" // Store S11.
+        "sd   x2, 120(x10)      \n" // Store SP.
+        "jal  x0, nlr_push_tail \n" // Jump to the C part.
+        );
+}
+
+NORETURN void nlr_jump(void *val) {
+    MP_NLR_JUMP_HEAD(val, top)
+    __asm volatile (
+        "add  x10, x0, %0  \n" // Load nlr_buf address.
+        "ld   x1, 16(x10)  \n" // Retrieve RA.
+        "ld   x8, 24(x10)  \n" // Retrieve S0.
+        "ld   x9, 32(x10)  \n" // Retrieve S1.
+        "ld  x18, 40(x10)  \n" // Retrieve S2.
+        "ld  x19, 48(x10)  \n" // Retrieve S3.
+        "ld  x20, 56(x10)  \n" // Retrieve S4.
+        "ld  x21, 64(x10)  \n" // Retrieve S5.
+        "ld  x22, 72(x10)  \n" // Retrieve S6.
+        "ld  x23, 80(x10)  \n" // Retrieve S7.
+        "ld  x24, 88(x10)  \n" // Retrieve S8.
+        "ld  x25, 96(x10)  \n" // Retrieve S9.
+        "ld  x26, 104(x10) \n" // Retrieve S10.
+        "ld  x27, 112(x10) \n" // Retrieve S11.
+        "ld   x2, 120(x10) \n" // Retrieve SP.
+        "addi x10, x0, 1   \n" // Return 1 for a non-local return.
+        "jalr  x0, x1, 0   \n" // Return.
+        :                      // Outputs.
+        : "r" (top)            // Inputs.
+        : "memory"             // Clobbered.
+        );
+
+    MP_UNREACHABLE
+}
+
+#endif // MICROPY_NLR_RV64I
diff --git a/py/py.cmake b/py/py.cmake
index d7e2b0a05d3ba..dd94f6a59e31d 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -60,6 +60,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/nlrmips.c
     ${MICROPY_PY_DIR}/nlrpowerpc.c
     ${MICROPY_PY_DIR}/nlrrv32.c
+    ${MICROPY_PY_DIR}/nlrrv64.c
     ${MICROPY_PY_DIR}/nlrsetjmp.c
     ${MICROPY_PY_DIR}/nlrthumb.c
     ${MICROPY_PY_DIR}/nlrx64.c
diff --git a/py/py.mk b/py/py.mk
index 16240a5b9c00f..2e7ffe9905e0c 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -87,6 +87,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	nlrpowerpc.o \
 	nlrxtensa.o \
 	nlrrv32.o \
+	nlrrv64.o \
 	nlrsetjmp.o \
 	malloc.o \
 	gc.o \

From ca6723b144501d3ea96a5a79bb18f0947a63fc87 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Sep 2024 12:10:22 +1000
Subject: [PATCH 1488/3129] rp2/cyw43_configport: Define CYW43_PRINTF to
 mp_printf to get messages.

The cyw43-driver uses `printf` by default for `CYW43_PRINTF`, but on the
rp2 port `printf` only goes to a UART output and not to USB CDC.

By defining `CYW43_PRINTF` to `mp_printf`, all the messages from the
cyw43-driver are seen on USB CDC.

For example this allows `network.WLAN().config(trace=1)` to show async
WALN events.

Signed-off-by: Damien George <damien@micropython.org>
---
 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 7b1a1ae3d4f02..4b012ce17e994 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H
 
 // The board-level config will be included here, so it can set some CYW43 values.
+#include <stdio.h>
 #include "py/mpconfig.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
@@ -39,6 +40,7 @@
 #define CYW43_SLEEP_MAX                 (10)
 #define CYW43_NETUTILS                  (1)
 #define CYW43_USE_OTP_MAC               (1)
+#define CYW43_PRINTF(...)               mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
 
 #define CYW43_EPERM                     MP_EPERM // Operation not permitted
 #define CYW43_EIO                       MP_EIO // I/O error

From 4247921c4ebfced79aa7ccfbb835c9f60ad6f0fc Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 23 May 2024 17:23:41 +1000
Subject: [PATCH 1489/3129] esp32: Use shared/tinyusb integration for S2 and S3
 USB.

Uses newer TinyUSB synopsys/dwc2 driver for esp32s2 and esp32s3 rather than
the IDF tinyusb component.  This allows re-use of other tinyusb integration
code and features shared between ports.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/esp32_common.cmake          | 40 ++++++++++++
 ports/esp32/main.c                      |  3 +-
 ports/esp32/main_esp32s2/CMakeLists.txt |  2 +
 ports/esp32/main_esp32s3/CMakeLists.txt |  2 +
 ports/esp32/mpconfigport.h              | 77 ++++++++++++++++++-----
 ports/esp32/mphalport.c                 | 27 ++++++--
 ports/esp32/usb.c                       | 83 +++++++------------------
 ports/esp32/usb.h                       |  1 -
 pyproject.toml                          |  2 +-
 9 files changed, 156 insertions(+), 81 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 7c5089639a5f2..e59e2dcd7a444 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -53,6 +53,37 @@ list(APPEND MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
+string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
+if(MICROPY_PY_TINYUSB)
+    set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
+    string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
+
+    list(APPEND MICROPY_DEF_TINYUSB
+        CFG_TUSB_MCU=${tusb_mcu}
+    )
+
+    list(APPEND MICROPY_SOURCE_TINYUSB
+        ${TINYUSB_SRC}/tusb.c
+        ${TINYUSB_SRC}/common/tusb_fifo.c
+        ${TINYUSB_SRC}/device/usbd.c
+        ${TINYUSB_SRC}/device/usbd_control.c
+        ${TINYUSB_SRC}/class/cdc/cdc_device.c
+        ${TINYUSB_SRC}/portable/synopsys/dwc2/dcd_dwc2.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
+    )
+
+    list(APPEND MICROPY_INC_TINYUSB
+        ${TINYUSB_SRC}
+        ${MICROPY_DIR}/shared/tinyusb/
+    )
+
+    list(APPEND MICROPY_LINK_TINYUSB
+        -Wl,--wrap=dcd_event_handler
+    )
+endif()
+
 list(APPEND MICROPY_SOURCE_PORT
     panichandler.c
     adc.c
@@ -100,6 +131,7 @@ list(APPEND MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
     ${MICROPY_SOURCE_BOARD}
+    ${MICROPY_SOURCE_TINYUSB}
 )
 
 list(APPEND IDF_COMPONENTS
@@ -134,6 +166,7 @@ list(APPEND IDF_COMPONENTS
     soc
     spi_flash
     ulp
+    usb
     vfs
 )
 
@@ -147,9 +180,11 @@ idf_component_register(
         ${MICROPY_SOURCE_DRIVERS}
         ${MICROPY_SOURCE_PORT}
         ${MICROPY_SOURCE_BOARD}
+        ${MICROPY_SOURCE_TINYUSB}
     INCLUDE_DIRS
         ${MICROPY_INC_CORE}
         ${MICROPY_INC_USERMOD}
+        ${MICROPY_INC_TINYUSB}
         ${MICROPY_PORT_DIR}
         ${MICROPY_BOARD_DIR}
         ${CMAKE_BINARY_DIR}
@@ -171,6 +206,7 @@ endif()
 target_compile_definitions(${MICROPY_TARGET} PUBLIC
     ${MICROPY_DEF_CORE}
     ${MICROPY_DEF_BOARD}
+    ${MICROPY_DEF_TINYUSB}
     MICROPY_ESP_IDF_4=1
     MICROPY_VFS_FAT=1
     MICROPY_VFS_LFS2=1
@@ -186,6 +222,10 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
     -Wno-missing-field-initializers
 )
 
+target_link_options(${MICROPY_TARGET} PUBLIC
+     ${MICROPY_LINK_TINYUSB}
+)
+
 # Additional include directories needed for private NimBLE headers.
 target_include_directories(${MICROPY_TARGET} PUBLIC
     ${IDF_PATH}/components/bt/host/nimble/nimble
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index ca5a0e3c2097c..03dc0807a025c 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -52,6 +52,7 @@
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/timeutils/timeutils.h"
+#include "shared/tinyusb/mp_usbd.h"
 #include "mbedtls/platform_time.h"
 
 #include "uart.h"
@@ -101,7 +102,7 @@ void mp_task(void *pvParameter) {
     #endif
     #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_init();
-    #elif MICROPY_HW_USB_CDC
+    #elif MICROPY_HW_ENABLE_USBDEV
     usb_init();
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/esp32/main_esp32s2/CMakeLists.txt b/ports/esp32/main_esp32s2/CMakeLists.txt
index 40188abff8e57..bc5ab939c3ce3 100644
--- a/ports/esp32/main_esp32s2/CMakeLists.txt
+++ b/ports/esp32/main_esp32s2/CMakeLists.txt
@@ -8,4 +8,6 @@ if(NOT MICROPY_PORT_DIR)
     get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
 endif()
 
+set(MICROPY_PY_TINYUSB ON)
+
 include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32s3/CMakeLists.txt b/ports/esp32/main_esp32s3/CMakeLists.txt
index 40188abff8e57..bc5ab939c3ce3 100644
--- a/ports/esp32/main_esp32s3/CMakeLists.txt
+++ b/ports/esp32/main_esp32s3/CMakeLists.txt
@@ -8,4 +8,6 @@ if(NOT MICROPY_PORT_DIR)
     get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
 endif()
 
+set(MICROPY_PY_TINYUSB ON)
+
 include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5dfb16447dec0..f1687cf168ff6 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -194,6 +194,69 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
+#ifndef MICROPY_HW_ENABLE_USBDEV
+#define MICROPY_HW_ENABLE_USBDEV            (SOC_USB_OTG_SUPPORTED)
+#endif
+
+#if MICROPY_HW_ENABLE_USBDEV
+#define MICROPY_SCHEDULER_STATIC_NODES      (1)
+
+#ifndef MICROPY_HW_USB_VID
+#define USB_ESPRESSIF_VID 0x303A
+#if CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID
+#define MICROPY_HW_USB_VID  (USB_ESPRESSIF_VID)
+#else
+#define MICROPY_HW_USB_VID  (CONFIG_TINYUSB_DESC_CUSTOM_VID)
+#endif
+#endif
+
+#ifndef MICROPY_HW_USB_PID
+#if CONFIG_TINYUSB_DESC_USE_DEFAULT_PID
+#define _PID_MAP(itf, n) ((CFG_TUD_##itf) << (n))
+// A combination of interfaces must have a unique product id, since PC will save device driver after the first plug.
+// Same VID/PID with different interface e.g MSC (first), then CDC (later) will possibly cause system error on PC.
+// Auto ProductID layout's Bitmap:
+//   [MSB]         HID | MSC | CDC          [LSB]
+#define USB_TUSB_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \
+    _PID_MAP(MIDI, 3))  // | _PID_MAP(AUDIO, 4) | _PID_MAP(VENDOR, 5) )
+#define MICROPY_HW_USB_PID  (USB_TUSB_PID)
+#else
+#define MICROPY_HW_USB_PID  (CONFIG_TINYUSB_DESC_CUSTOM_PID)
+#endif
+#endif
+
+#ifndef MICROPY_HW_USB_MANUFACTURER_STRING
+#ifdef CONFIG_TINYUSB_DESC_MANUFACTURER_STRING
+#define MICROPY_HW_USB_MANUFACTURER_STRING CONFIG_TINYUSB_DESC_MANUFACTURER_STRING
+#else
+#define MICROPY_HW_USB_MANUFACTURER_STRING "MicroPython"
+#endif
+#endif
+
+#ifndef MICROPY_HW_USB_PRODUCT_FS_STRING
+#ifdef CONFIG_TINYUSB_DESC_PRODUCT_STRING
+#define MICROPY_HW_USB_PRODUCT_FS_STRING CONFIG_TINYUSB_DESC_PRODUCT_STRING
+#else
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "Board in FS mode"
+#endif
+#endif
+
+#endif // MICROPY_HW_ENABLE_USBDEV
+
+// Enable stdio over native USB peripheral CDC via TinyUSB
+#ifndef MICROPY_HW_USB_CDC
+#define MICROPY_HW_USB_CDC                  (MICROPY_HW_ENABLE_USBDEV)
+#endif
+
+// Enable stdio over USB Serial/JTAG peripheral
+#ifndef MICROPY_HW_ESP_USB_SERIAL_JTAG
+#define MICROPY_HW_ESP_USB_SERIAL_JTAG      (SOC_USB_SERIAL_JTAG_SUPPORTED && !MICROPY_HW_USB_CDC)
+#endif
+
+#if MICROPY_HW_USB_CDC && MICROPY_HW_ESP_USB_SERIAL_JTAG
+#error "Invalid build config: Can't enable both native USB and USB Serial/JTAG peripheral"
+#endif
+
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
@@ -253,20 +316,6 @@ typedef long mp_off_t;
 // board specifics
 #define MICROPY_PY_SYS_PLATFORM "esp32"
 
-// Enable stdio over native USB peripheral CDC via TinyUSB
-#ifndef MICROPY_HW_USB_CDC
-#define MICROPY_HW_USB_CDC                  (SOC_USB_OTG_SUPPORTED)
-#endif
-
-// Enable stdio over USB Serial/JTAG peripheral
-#ifndef MICROPY_HW_ESP_USB_SERIAL_JTAG
-#define MICROPY_HW_ESP_USB_SERIAL_JTAG      (SOC_USB_SERIAL_JTAG_SUPPORTED && !MICROPY_HW_USB_CDC)
-#endif
-
-#if MICROPY_HW_USB_CDC && MICROPY_HW_ESP_USB_SERIAL_JTAG
-#error "Invalid build config: Can't enable both native USB and USB Serial/JTAG peripheral"
-#endif
-
 // ESP32-S3 extended IO for 47 & 48
 #ifndef MICROPY_HW_ESP32S3_EXTENDED_IO
 #define MICROPY_HW_ESP32S3_EXTENDED_IO      (1)
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 7d0154cc05315..3f267401366cb 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -42,6 +42,8 @@
 #include "extmod/misc.h"
 #include "shared/timeutils/timeutils.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/tinyusb/mp_usbd.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
 #include "mphalport.h"
 #include "usb.h"
 #include "usb_serial_jtag.h"
@@ -106,13 +108,19 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
     #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_poll_rx();
-    #endif
-    if ((poll_flags & MP_STREAM_POLL_RD) && stdin_ringbuf.iget != stdin_ringbuf.iput) {
+    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
         ret |= MP_STREAM_POLL_RD;
     }
     if (poll_flags & MP_STREAM_POLL_WR) {
         ret |= MP_STREAM_POLL_WR;
     }
+    #endif
+    #if MICROPY_HW_USB_CDC
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
+    #endif
+    #if MICROPY_PY_OS_DUPTERM
+    ret |= mp_os_dupterm_poll(poll_flags);
+    #endif
     return ret;
 }
 
@@ -121,6 +129,9 @@ int mp_hal_stdin_rx_chr(void) {
         #if MICROPY_HW_ESP_USB_SERIAL_JTAG
         usb_serial_jtag_poll_rx();
         #endif
+        #if MICROPY_HW_USB_CDC
+        mp_usbd_cdc_poll_interfaces(0);
+        #endif
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
@@ -133,6 +144,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     // Only release the GIL if many characters are being sent
     mp_uint_t ret = len;
     bool did_write = false;
+    #if MICROPY_HW_ENABLE_UART_REPL || CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
     bool release_gil = len > MICROPY_PY_STRING_TX_GIL_THRESHOLD;
     #if MICROPY_DEBUG_PRINTERS && MICROPY_DEBUG_VERBOSE && MICROPY_PY_THREAD_GIL
     // If verbose debug output is enabled some strings are printed before the
@@ -146,9 +158,6 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
     did_write = true;
-    #elif MICROPY_HW_USB_CDC
-    usb_tx_strn(str, len);
-    did_write = true;
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
     uart_stdout_tx_strn(str, len);
@@ -157,6 +166,14 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (release_gil) {
         MP_THREAD_GIL_ENTER();
     }
+    #endif // MICROPY_HW_ENABLE_UART_REPL || CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if MICROPY_HW_USB_CDC
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
+        did_write = true;
+        ret = MIN(cdc_res, ret);
+    }
+    #endif
     int dupterm_res = mp_os_dupterm_tx_strn(str, len);
     if (dupterm_res >= 0) {
         did_write = true;
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 4207e77df210b..d643a7bc77410 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -29,75 +29,40 @@
 #include "usb.h"
 
 #if MICROPY_HW_USB_CDC
+#include "esp_rom_gpio.h"
+#include "esp_mac.h"
+#include "esp_private/usb_phy.h"
 
-#include "esp_timer.h"
-#ifndef NO_QSTR
-#include "tinyusb.h"
-#include "tusb_cdc_acm.h"
-#endif
+#include "shared/tinyusb/mp_usbd.h"
 
-#define CDC_ITF TINYUSB_CDC_ACM_0
+static usb_phy_handle_t phy_hdl;
 
-static uint8_t usb_rx_buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE];
-
-// This is called from FreeRTOS task "tusb_tsk" in espressif__esp_tinyusb (not an ISR).
-static void usb_callback_rx(int itf, cdcacm_event_t *event) {
-    // espressif__esp_tinyusb places tinyusb rx data onto freertos ringbuffer which
-    // this function forwards onto our stdin_ringbuf.
-    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_sched_keyboard_interrupt();
-            } else {
-                ringbuf_put(&stdin_ringbuf, usb_rx_buf[i]);
-            }
-        }
-        mp_hal_wake_main_task();
-    }
-}
 
 void usb_init(void) {
-    // Initialise the USB with defaults.
-    tinyusb_config_t tusb_cfg = {0};
-    ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
+    // ref: https://github.com/espressif/esp-usb/blob/4b6a798d0bed444fff48147c8dcdbbd038e92892/device/esp_tinyusb/tinyusb.c
 
-    // Initialise the USB serial interface.
-    tinyusb_config_cdcacm_t acm_cfg = {
-        .usb_dev = TINYUSB_USBDEV_0,
-        .cdc_port = CDC_ITF,
-        .rx_unread_buf_sz = 256,
-        .callback_rx = &usb_callback_rx,
-        #ifdef MICROPY_HW_USB_CUSTOM_RX_WANTED_CHAR_CB
-        .callback_rx_wanted_char = &MICROPY_HW_USB_CUSTOM_RX_WANTED_CHAR_CB,
-        #endif
-        #ifdef MICROPY_HW_USB_CUSTOM_LINE_STATE_CB
-        .callback_line_state_changed = (tusb_cdcacm_callback_t)&MICROPY_HW_USB_CUSTOM_LINE_STATE_CB,
-        #endif
-        #ifdef MICROPY_HW_USB_CUSTOM_LINE_CODING_CB
-        .callback_line_coding_changed = &MICROPY_HW_USB_CUSTOM_LINE_CODING_CB,
-        #endif
+    // Configure USB PHY
+    usb_phy_config_t phy_conf = {
+        .controller = USB_PHY_CTRL_OTG,
+        .otg_mode = USB_OTG_MODE_DEVICE,
     };
-    ESP_ERROR_CHECK(tusb_cdc_acm_init(&acm_cfg));
+    // Internal USB PHY
+    phy_conf.target = USB_PHY_TARGET_INT;
+
+    // Init ESP USB Phy
+    usb_new_phy(&phy_conf, &phy_hdl);
+
+    // Init MicroPython / TinyUSB
+    mp_usbd_init();
 
 }
 
-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_MS * 1000);
-    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;
-        tud_cdc_n_write_flush(CDC_ITF);
-    }
+void mp_usbd_port_get_serial_number(char *serial_buf) {
+    // use factory default MAC as serial ID
+    uint8_t mac[8];
+    esp_efuse_mac_get_default(mac);
+    MP_STATIC_ASSERT(sizeof(mac) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
+    mp_usbd_hex_str(serial_buf, mac, sizeof(mac));
 }
 
 #endif // MICROPY_HW_USB_CDC
diff --git a/ports/esp32/usb.h b/ports/esp32/usb.h
index a4c7d40701dfc..5e5eea34e5694 100644
--- a/ports/esp32/usb.h
+++ b/ports/esp32/usb.h
@@ -29,6 +29,5 @@
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT_MS (500)
 
 void usb_init(void);
-void usb_tx_strn(const char *str, size_t len);
 
 #endif // MICROPY_INCLUDED_ESP32_USB_H
diff --git a/pyproject.toml b/pyproject.toml
index e44afe37e0ebb..1650bd088ea22 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.codespell]
 count = ""
 ignore-regex = '\b[A-Z]{3}\b'
-ignore-words-list = "ans,asend,deques,dout,extint,hsi,iput,mis,numer,shft,technic,ure"
+ignore-words-list = "ans,asend,deques,dout,extint,hsi,iput,mis,numer,shft,synopsys,technic,ure"
 quiet-level = 3
 skip = """
 */build*,\

From 641f60045f8014ad480e4297b982753edcb5b5c6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 23 May 2024 17:23:41 +1000
Subject: [PATCH 1490/3129] shared/tinyusb: Remove
 MICROPY_HW_USB_EXTERNAL_TINYUSB.

No longer needed as shared tinyusb is now used by the esp32 port.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 shared/tinyusb/mp_usbd_cdc.c | 8 +-------
 shared/tinyusb/mp_usbd_cdc.h | 4 ----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index c6a88e467d398..0fbecb0a8657f 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -149,13 +149,7 @@ static void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
 }
 #endif
 
-void
-#if MICROPY_HW_USB_EXTERNAL_TINYUSB
-mp_usbd_line_state_cb
-#else
-tud_cdc_line_state_cb
-#endif
-    (uint8_t itf, bool dtr, bool rts) {
+void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
     #if MICROPY_HW_USB_CDC && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC
     if (dtr) {
         // A host application has started to open the cdc serial port.
diff --git a/shared/tinyusb/mp_usbd_cdc.h b/shared/tinyusb/mp_usbd_cdc.h
index 1abe0fa0a41b3..648cf12881e31 100644
--- a/shared/tinyusb/mp_usbd_cdc.h
+++ b/shared/tinyusb/mp_usbd_cdc.h
@@ -35,8 +35,4 @@ uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags);
 void tud_cdc_rx_cb(uint8_t itf);
 mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len);
 
-#if MICROPY_HW_USB_EXTERNAL_TINYUSB
-void mp_usbd_line_state_cb(uint8_t itf, bool dtr, bool rts);
-#endif
-
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H

From 5ae622ef7b31881cb38b56baa66d8aec3d132cf9 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 23 May 2024 22:08:12 +1000
Subject: [PATCH 1491/3129] esp32: Add automatic bootloader handling for S2 and
 S3.

Enables support for the ESP standard DTR/RTS based reboot to bootloader.

Switches from OTG to Serial/Jtag mode to workaround issue discussed
in: https://github.com/espressif/arduino-esp32/issues/6762

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 .../boards/ESP32_GENERIC_S3/sdkconfig.board   |  1 -
 .../esp32/boards/UM_FEATHERS2/sdkconfig.board |  1 -
 .../boards/UM_FEATHERS2NEO/sdkconfig.board    |  1 -
 .../esp32/boards/UM_FEATHERS3/sdkconfig.board |  1 -
 ports/esp32/boards/UM_NANOS3/sdkconfig.board  |  1 -
 ports/esp32/boards/UM_PROS3/sdkconfig.board   |  1 -
 ports/esp32/boards/UM_TINYS2/sdkconfig.board  |  1 -
 ports/esp32/boards/UM_TINYS3/sdkconfig.board  |  1 -
 .../boards/UM_TINYWATCHS3/sdkconfig.board     |  1 -
 ports/esp32/modmachine.c                      | 12 ++++++++++
 ports/esp32/mpconfigport.h                    |  3 ++-
 ports/esp32/usb.c                             | 12 ++++++++++
 ports/esp32/usb.h                             |  1 +
 shared/tinyusb/mp_usbd_cdc.c                  | 23 +++++++++++++++++--
 shared/tinyusb/mp_usbd_cdc.h                  |  6 +++++
 15 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
index a36b971162850..9839b0d300510 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
diff --git a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
index c2e1c2b3d3b7c..9ab58f215f2e6 100644
--- a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
 
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
index a624f7fd97fb1..6ef737212f23a 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2Neo"
diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
index c557141ebfc9b..3ca0c4b243e28 100644
--- a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
diff --git a/ports/esp32/boards/UM_NANOS3/sdkconfig.board b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
index 31d7528317a1d..2a39c64337b20 100644
--- a/ports/esp32/boards/UM_NANOS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
index 0de84d57d01d9..5752e03e60013 100644
--- a/ports/esp32/boards/UM_PROS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
index 0a2097e242141..c09731431b9e0 100644
--- a/ports/esp32/boards/UM_TINYS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS2"
diff --git a/ports/esp32/boards/UM_TINYS3/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
index d1689aaf394c8..d1d19761a0666 100644
--- a/ports/esp32/boards/UM_TINYS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
index d73f4fe0bc012..1380e15ce8481 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 759455a59a5d6..5e05a261b70c7 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -222,7 +222,19 @@ static mp_int_t mp_machine_reset_cause(void) {
 
 #if MICROPY_ESP32_USE_BOOTLOADER_RTC
 #include "soc/rtc_cntl_reg.h"
+#include "usb.h"
+#if CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/rom/usb/usb_dc.h"
+#include "esp32s3/rom/usb/usb_persist.h"
+#include "esp32s3/rom/usb/chip_usb_dw_wrapper.h"
+#endif
+
 NORETURN static void machine_bootloader_rtc(void) {
+    #if CONFIG_IDF_TARGET_ESP32S3
+    usb_usj_mode();
+    usb_dc_prepare_persist();
+    chip_usb_set_persist_flags(USBDC_BOOT_DFU);
+    #endif
     REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT);
     esp_restart();
 }
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index f1687cf168ff6..4c94fd16e2c58 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -199,7 +199,8 @@
 #endif
 
 #if MICROPY_HW_ENABLE_USBDEV
-#define MICROPY_SCHEDULER_STATIC_NODES      (1)
+#define MICROPY_SCHEDULER_STATIC_NODES        (1)
+#define MICROPY_HW_USB_CDC_DTR_RTS_BOOTLOADER (1)
 
 #ifndef MICROPY_HW_USB_VID
 #define USB_ESPRESSIF_VID 0x303A
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index d643a7bc77410..3ce3d045810af 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -57,6 +57,18 @@ void usb_init(void) {
 
 }
 
+#if CONFIG_IDF_TARGET_ESP32S3
+void usb_usj_mode(void) {
+    // Switch the USB PHY back to Serial/Jtag mode, disabling OTG support
+    // This should be run before jumping to bootloader.
+    usb_del_phy(phy_hdl);
+    usb_phy_config_t phy_conf = {
+        .controller = USB_PHY_CTRL_SERIAL_JTAG,
+    };
+    usb_new_phy(&phy_conf, &phy_hdl);
+}
+#endif
+
 void mp_usbd_port_get_serial_number(char *serial_buf) {
     // use factory default MAC as serial ID
     uint8_t mac[8];
diff --git a/ports/esp32/usb.h b/ports/esp32/usb.h
index 5e5eea34e5694..2bfa3d31aff8b 100644
--- a/ports/esp32/usb.h
+++ b/ports/esp32/usb.h
@@ -29,5 +29,6 @@
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT_MS (500)
 
 void usb_init(void);
+void usb_usj_mode(void);
 
 #endif // MICROPY_INCLUDED_ESP32_USB_H
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index 0fbecb0a8657f..b4151f685c41e 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -138,9 +138,12 @@ void tud_sof_cb(uint32_t frame_count) {
 
 #endif
 
-#if MICROPY_HW_ENABLE_USBDEV && (MICROPY_HW_USB_CDC_1200BPS_TOUCH || MICROPY_HW_USB_CDC)
+#if MICROPY_HW_ENABLE_USBDEV && ( \
+    MICROPY_HW_USB_CDC_1200BPS_TOUCH || \
+    MICROPY_HW_USB_CDC || \
+    MICROPY_HW_USB_CDC_DTR_RTS_BOOTLOADER)
 
-#if MICROPY_HW_USB_CDC_1200BPS_TOUCH
+#if MICROPY_HW_USB_CDC_1200BPS_TOUCH || MICROPY_HW_USB_CDC_DTR_RTS_BOOTLOADER
 static mp_sched_node_t mp_bootloader_sched_node;
 
 static void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
@@ -149,6 +152,13 @@ static void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
 }
 #endif
 
+#if MICROPY_HW_USB_CDC_DTR_RTS_BOOTLOADER
+static struct {
+    bool dtr : 1;
+    bool rts : 1;
+} prev_line_state = {0};
+#endif
+
 void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
     #if MICROPY_HW_USB_CDC && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC
     if (dtr) {
@@ -159,6 +169,15 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
         tud_sof_cb_enable(true);
     }
     #endif
+    #if MICROPY_HW_USB_CDC_DTR_RTS_BOOTLOADER
+    if (dtr && !rts) {
+        if (prev_line_state.rts && !prev_line_state.dtr) {
+            mp_sched_schedule_node(&mp_bootloader_sched_node, usbd_cdc_run_bootloader_task);
+        }
+    }
+    prev_line_state.rts = rts;
+    prev_line_state.dtr = dtr;
+    #endif
     #if MICROPY_HW_USB_CDC_1200BPS_TOUCH
     if (dtr == false && rts == false) {
         // Device is disconnected.
diff --git a/shared/tinyusb/mp_usbd_cdc.h b/shared/tinyusb/mp_usbd_cdc.h
index 648cf12881e31..8d37a77315dcc 100644
--- a/shared/tinyusb/mp_usbd_cdc.h
+++ b/shared/tinyusb/mp_usbd_cdc.h
@@ -31,6 +31,12 @@
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 #endif
 
+// This is typically only enabled on esp32
+// parts which have an internal usb peripheral.
+#ifndef MICROPY_HW_USB_CDC_DTR_RTS_BOOTLOADER
+#define MICROPY_HW_USB_CDC_DTR_RTS_BOOTLOADER (0)
+#endif
+
 uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags);
 void tud_cdc_rx_cb(uint8_t itf);
 mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len);

From 386771e052cd0396031705f22bd2ecab5cc30ea5 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 4 Jun 2024 13:46:00 +1000
Subject: [PATCH 1492/3129] esp32/Makefile: Allow auto-port selection if not
 passed on cmdline.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 3df2af4716fd9..62b1faa571931 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -29,8 +29,12 @@ BUILD ?= build-$(BOARD)
 endif
 
 # Device serial settings.
-PORT ?= /dev/ttyUSB0
-BAUD ?= 460800
+ifneq ($(PORT),)
+PORT_ARG := -p $(PORT)
+endif
+ifneq ($(BAUD),)
+BAUD_ARG := -b $(BAUD)
+endif
 
 PYTHON ?= python3
 
@@ -59,7 +63,7 @@ endif
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 define RUN_IDF_PY
-	idf.py $(IDFPY_FLAGS) -B $(BUILD) -p $(PORT) -b $(BAUD) $(1)
+	idf.py $(IDFPY_FLAGS) -B $(BUILD) $(PORT_ARG) $(BAUD_ARG) $(1)
 endef
 
 all:

From 11bc7d0fc1074b01aaddc325209a281ee9acbba4 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 24 Sep 2024 11:35:53 +1000
Subject: [PATCH 1493/3129] esp32/boards: Update ARDUINO_NANO_ESP32 USB
 configuration.

The custom line state handling is no longer needed as MicroPython runs it
directly now.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c    | 8 --------
 ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c b/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
index 69a414cd5d9e3..3394bb1e2e219 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
@@ -35,9 +35,6 @@
 #include "double_tap.h"
 #include "usb.h"
 
-#include "tinyusb.h"
-#include "tusb_cdc_acm.h"
-
 #define LED_RED     GPIO_NUM_46
 #define LED_GREEN   GPIO_NUM_0
 #define LED_BLUE    GPIO_NUM_45
@@ -87,11 +84,6 @@ void NANO_ESP32_enter_bootloader(void) {
     esp_restart();
 }
 
-void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event_in) {
-    cdcacm_event_t *event = event_in;
-    mp_usbd_line_state_cb(itf, event->line_state_changed_data.dtr, event->line_state_changed_data.rts);
-}
-
 void NANO_ESP32_board_startup(void) {
     boardctrl_startup();
 
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
index 8c2aa88e9f2ec..31b2a49bf8c31 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
@@ -19,14 +19,9 @@
 #define MICROPY_HW_SPI2_SCK                 (18)
 
 #define MICROPY_HW_ENABLE_USBDEV            (1)
-#define MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC (1)
-#define MICROPY_HW_USB_EXTERNAL_TINYUSB     (1)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 #define MICROPY_SCHEDULER_STATIC_NODES      (1)
 
-#define MICROPY_HW_USB_CUSTOM_LINE_STATE_CB             NANO_ESP32_usb_callback_line_state_changed
-void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event);
-
 #define MICROPY_BOARD_STARTUP                           NANO_ESP32_board_startup
 void NANO_ESP32_board_startup(void);
 

From 548f88d2bd254f1328014a303f8bf602a0646421 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 31 Jul 2024 21:40:05 +1000
Subject: [PATCH 1494/3129] shared/tinyusb: Wake main task if needed at end of
 USB ISR.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/mimxrt/mphalport.h     | 4 ++++
 ports/nrf/mphalport.h        | 4 ++++
 ports/renesas-ra/mphalport.h | 4 ++++
 ports/rp2/mphalport.h        | 4 ++++
 ports/samd/mphalport.h       | 4 ++++
 shared/tinyusb/mp_usbd.c     | 3 ++-
 6 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index c69ebf58106b2..a0e4575024420 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -109,6 +109,10 @@ __attribute__((always_inline)) static inline uint32_t disable_irq(void) {
 
 void mp_hal_set_interrupt_char(int c);
 
+static inline void mp_hal_wake_main_task_from_isr(void) {
+    // Defined for tinyusb support, nothing needs to be done here.
+}
+
 static inline mp_uint_t mp_hal_ticks_ms(void) {
     return ticks_ms32();
 }
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 50c61aefcdd59..a0bca58a625ba 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -53,6 +53,10 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable
 int mp_hal_stdin_rx_chr(void);
 void mp_hal_stdout_tx_str(const char *str);
 
+static inline void mp_hal_wake_main_task_from_isr(void) {
+    // Defined for tinyusb support, nothing needs to be done here.
+}
+
 void mp_hal_delay_ms(mp_uint_t ms);
 void mp_hal_delay_us(mp_uint_t us);
 
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index 14e6ee0c3eea6..0819abeaf617e 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -52,6 +52,10 @@ static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 
+static inline void mp_hal_wake_main_task_from_isr(void) {
+    // Defined for tinyusb support, nothing needs to be done here.
+}
+
 // timing functions
 
 #include "irq.h"
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 16ac4259a6feb..09ad54dd1eb78 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -77,6 +77,10 @@ void mp_thread_end_atomic_section(uint32_t);
 void mp_hal_set_interrupt_char(int c);
 void mp_hal_time_ns_set_from_rtc(void);
 
+static inline void mp_hal_wake_main_task_from_isr(void) {
+    // Defined for tinyusb support, nothing needs to be done here.
+}
+
 static inline void mp_hal_delay_us_fast(mp_uint_t us) {
     busy_wait_us(us);
 }
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index ee1ebf7aea2b0..6c9e525bb9162 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -50,6 +50,10 @@ uint64_t mp_hal_ticks_us_64(void);
 
 void mp_hal_set_interrupt_char(int c);
 
+static inline void mp_hal_wake_main_task_from_isr(void) {
+    // Defined for tinyusb support, nothing needs to be done here.
+}
+
 __attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
     __set_PRIMASK(state);
 }
diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
index 436314dcde5c8..7ccfa7018d4bc 100644
--- a/shared/tinyusb/mp_usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpconfig.h"
+#include "py/mphal.h"
 
 #if MICROPY_HW_ENABLE_USBDEV
 
@@ -55,6 +55,7 @@ extern void __real_dcd_event_handler(dcd_event_t const *event, bool in_isr);
 TU_ATTR_FAST_FUNC void __wrap_dcd_event_handler(dcd_event_t const *event, bool in_isr) {
     __real_dcd_event_handler(event, in_isr);
     mp_usbd_schedule_task();
+    mp_hal_wake_main_task_from_isr();
 }
 
 TU_ATTR_FAST_FUNC void mp_usbd_schedule_task(void) {

From 338df1ae357eefe987df4429b88d3094f9c7b8c2 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 21 Aug 2024 16:22:01 +0200
Subject: [PATCH 1495/3129] py/objtype: Allow passing keyword arguments to
 native base __init__.

Allowing passing keyword arguments to a native base's __init__, i.e.
`make_new` in the C code.  Previously only positional arguments were
allowed.

The main trade-off in this commit is that every call to the native base's
`make_new` is now going to be preceded by a call to
`mp_map_init_fixed_table` even though most of what that does is unused and
instead it merely serves as a way to pass the number of keyword arguments.

Fixes issue #15465.

Signed-off-by: stijn <stijn@ignitron.net>
---
 py/obj.h                             |  3 +++
 py/objfun.c                          |  4 +++-
 py/objtype.c                         |  6 +++---
 tests/basics/subclass_native_init.py | 29 ++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index eac2b89ea810d..d942e1bbf7b28 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -516,6 +516,9 @@ typedef mp_obj_t (*mp_fun_3_t)(mp_obj_t, mp_obj_t, mp_obj_t);
 typedef mp_obj_t (*mp_fun_var_t)(size_t n, const mp_obj_t *);
 // mp_fun_kw_t takes mp_map_t* (and not const mp_map_t*) to ease passing
 // this arg to mp_map_lookup().
+// Note that the mp_obj_t* array will contain all arguments, positional and keyword, with the keyword
+// ones starting at offset n, like: arg0 arg1 ... arg<n> key0 value0 key1 value1 ..., and the mp_map_t*
+// gets those same keyword arguments but as a map for convenience; see fun_builtin_var_call.
 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)
diff --git a/py/objfun.c b/py/objfun.c
index 8279605e9874a..0b1b8c115f236 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -107,7 +107,9 @@ static mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_k
     if (self->sig & 1) {
         // function allows keywords
 
-        // we create a map directly from the given args array
+        // we create a map directly from the given args array; self->fun.kw does still
+        // expect args to have both positional and keyword arguments, ordered as:
+        // arg0 arg1 ... arg<n_args> key0 value0 key1 value1 ... key<n_kw> value<n_kw>
         mp_map_t kw_args;
         mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
 
diff --git a/py/objtype.c b/py/objtype.c
index 16ff5310dac6f..847216982a469 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -85,14 +85,14 @@ static int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_t
 
 // This wrapper function allows a subclass of a native type to call the
 // __init__() method (corresponding to type->make_new) of the native type.
-static mp_obj_t native_base_init_wrapper(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t native_base_init_wrapper(size_t n_args, const mp_obj_t *args, mp_map_t *kw_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] = MP_OBJ_TYPE_GET_SLOT(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, kw_args->used, 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);
+static MP_DEFINE_CONST_FUN_OBJ_KW(native_base_init_wrapper_obj, 1, native_base_init_wrapper);
 
 #if !MICROPY_CPYTHON_COMPAT
 static
diff --git a/tests/basics/subclass_native_init.py b/tests/basics/subclass_native_init.py
index 38d2f23ac3814..64167fa037e0c 100644
--- a/tests/basics/subclass_native_init.py
+++ b/tests/basics/subclass_native_init.py
@@ -6,6 +6,35 @@ def __init__(self, a, b):
         super().__init__([a, b])
 print(L(2, 3))
 
+# with keyword arguments, with star arguments and without because those use different C calls
+class D(dict):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+print(D())
+print(D([('a', 1)]))
+print(D([('a', 1)], a=2, b=3))
+print(D(a=2, b=3))
+
+class D(dict):
+    def __init__(self):
+        super().__init__()
+print(D())
+
+class D(dict):
+    def __init__(self):
+        super().__init__([])
+print(D())
+
+class D(dict):
+    def __init__(self):
+        super().__init__(a=1)
+print(D())
+
+class D(dict):
+    def __init__(self):
+        super().__init__([], a=1)
+print(D())
+
 # inherits implicitly from object
 class A:
     def __init__(self):

From c2eebe060983e949d6042ef5cb57c1b9d9c9963c Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 25 Jul 2024 16:20:05 +1000
Subject: [PATCH 1496/3129] tests/README: Update instructions for key/cert pair
 usage on device.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 tests/README.md | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 54dd078053ef0..7bd7eb587177b 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -177,11 +177,21 @@ internal_bench/bytebuf:
 
 ## Test key/certificates
 
-SSL/TLS tests in `multi_net` and `net_inet` use a
-self-signed key/cert pair that is randomly generated and to be used for
-testing/demonstration only. You should always generate your own key/cert.
+SSL/TLS tests in `multi_net` and `net_inet` use self-signed key/cert pairs
+that are randomly generated to be used for testing/demonstration only.
 
-To generate a new self-signed RSA key/cert pair with openssl do:
+To run tests on-device the `.der` files should be copied and the current time
+set to ensure certs validity. This can be done with:
+```
+$ mpremote rtc --set cp multi_net/*.der net_inet/*.der :
+```
+
+### Generating new test key/certificates
+
+The keys used for the unit tests are included in the tests folders so don't generally
+need to be re-created by end users. This section is included here for reference only.
+
+A new self-signed RSA key/cert pair can be created with openssl:
 ```
 $ openssl req -x509 -newkey rsa:2048 -keyout rsa_key.pem -out rsa_cert.pem -days 365 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
 ```
@@ -193,8 +203,9 @@ $ openssl pkey -in rsa_key.pem -out rsa_key.der -outform DER
 $ openssl x509 -in rsa_cert.pem -out rsa_cert.der -outform DER
 ```
 
-To test elliptic curve key/cert pairs, create a key then a certificate using:
+For elliptic curve tests using key/cert pairs, create a key then a certificate using:
 ```
-$ openssl ecparam -name prime256v1 -genkey -noout -out ec_key.der -outform DER
-$ openssl req -new -x509 -key ec_key.der -out ec_cert.der -outform DER -days 365 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
+$ openssl ecparam -name prime256v1 -genkey -noout -out ec_key.pem
+$ openssl x509 -in ec_key.pem -out ec_key.der -outform DER
+$ openssl req -new -x509 -key ec_key.pem -out ec_cert.der -outform DER -days 365 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
 ```

From d50e36e7e4b53789ceb6bafcfaa7f4a2ea5c0e29 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Oct 2024 12:03:53 +1100
Subject: [PATCH 1497/3129] ports: Include py/mphal.h instead of mphalport.h.

The `mphalport.h` header should not be included directly, rather
`py/mphal.h` should be used.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/esp32_nvs.c                     | 2 +-
 ports/esp32/esp32_partition.c               | 2 +-
 ports/esp32/esp32_rmt.c                     | 2 +-
 ports/esp32/machine_pin.c                   | 1 -
 ports/esp32/machine_timer.c                 | 2 +-
 ports/esp32/modespnow.c                     | 1 -
 ports/esp32/mphalport.c                     | 1 -
 ports/mimxrt/tusb_port.c                    | 2 +-
 ports/nrf/drivers/bluetooth/ble_drv.c       | 2 +-
 ports/nrf/drivers/bluetooth/ble_uart.c      | 2 +-
 ports/nrf/main.c                            | 2 +-
 ports/nrf/modules/board/led.c               | 2 +-
 ports/nrf/modules/machine/rtcounter.c       | 3 +--
 ports/nrf/modules/ubluepy/ubluepy_scanner.c | 3 +--
 ports/nrf/nrfx_log.h                        | 2 +-
 ports/samd/fatfs_port.c                     | 2 +-
 ports/samd/samd_soc.c                       | 2 +-
 ports/webassembly/mphalport.c               | 2 +-
 18 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
index daeec4c26913b..7136a08c6e3b3 100644
--- a/ports/esp32/esp32_nvs.c
+++ b/ports/esp32/esp32_nvs.c
@@ -28,7 +28,7 @@
 
 #include "py/runtime.h"
 #include "py/mperrno.h"
-#include "mphalport.h"
+#include "py/mphal.h"
 #include "modesp32.h"
 #include "nvs_flash.h"
 #include "nvs.h"
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index cad707dfc0d23..55830a285b0b6 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -28,8 +28,8 @@
 
 #include "py/runtime.h"
 #include "py/mperrno.h"
+#include "py/mphal.h"
 #include "extmod/vfs.h"
-#include "mphalport.h"
 #include "modesp32.h"
 #include "esp_ota_ops.h"
 
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index c765a9741bcaa..6890e16bf79f7 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "modmachine.h"
-#include "mphalport.h"
 #include "modesp32.h"
 
 #include "esp_task.h"
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 149715cf60138..e48546ec08de1 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -37,7 +37,6 @@
 #include "py/mphal.h"
 #include "extmod/modmachine.h"
 #include "extmod/virtpin.h"
-#include "mphalport.h"
 #include "modmachine.h"
 #include "machine_pin.h"
 #include "machine_rtc.h"
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 278deb10649d4..7758584a85c0c 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -30,10 +30,10 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include "py/mphal.h"
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "modmachine.h"
-#include "mphalport.h"
 
 #include "hal/timer_hal.h"
 #include "hal/timer_ll.h"
diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index e7e51ee57ec0f..7873ff8977876 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -50,7 +50,6 @@
 
 #if MICROPY_PY_ESPNOW
 
-#include "mphalport.h"
 #include "modnetwork.h"
 #include "modespnow.h"
 
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 3f267401366cb..999d77dad5737 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -44,7 +44,6 @@
 #include "shared/runtime/pyexec.h"
 #include "shared/tinyusb/mp_usbd.h"
 #include "shared/tinyusb/mp_usbd_cdc.h"
-#include "mphalport.h"
 #include "usb.h"
 #include "usb_serial_jtag.h"
 #include "uart.h"
diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index f359d44e4d276..f81200e2caa87 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -25,7 +25,7 @@
  */
 
 #include "tusb.h"
-#include "mphalport.h"
+#include "py/mphal.h"
 
 #ifndef MICROPY_HW_USB_VID
 #define MICROPY_HW_USB_VID (0xf055)
diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index 4bede3852a637..1eb0fef52ffc2 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -30,13 +30,13 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "ble_drv.h"
 #include "nrf_sdm.h"
 #include "ble_gap.h"
 #include "ble.h" // sd_ble_uuid_encode
 #include "drivers/flash.h"
-#include "mphalport.h"
 
 
 #if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_USB_CDC
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 69f86b489f313..6c585b34c0355 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -29,8 +29,8 @@
 #include <string.h>
 #include "ble_uart.h"
 #include "ringbuffer.h"
-#include "mphalport.h"
 #include "shared/runtime/interrupt_char.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_SYS_STDFILES
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 62848ba8d6e27..29550bd77a748 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -31,6 +31,7 @@
 
 #include "py/nlr.h"
 #include "py/mperrno.h"
+#include "py/mphal.h"
 #include "py/lexer.h"
 #include "py/parse.h"
 #include "py/obj.h"
@@ -53,7 +54,6 @@
 #include "i2c.h"
 #include "adc.h"
 #include "rtcounter.h"
-#include "mphalport.h"
 
 #if MICROPY_PY_MACHINE_HW_PWM
 #include "pwm.h"
diff --git a/ports/nrf/modules/board/led.c b/ports/nrf/modules/board/led.c
index 6c0df5652633b..f58d1a28c961e 100644
--- a/ports/nrf/modules/board/led.c
+++ b/ports/nrf/modules/board/led.c
@@ -25,9 +25,9 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
 #include "py/runtime.h"
 
-#include "mphalport.h"
 #include "led.h"
 #include "mpconfigboard.h"
 
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index c1ef1b4dd977d..a66a635a05d98 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -25,9 +25,8 @@
  * THE SOFTWARE.
  */
 
-#include "py/nlr.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
-#include "mphalport.h"
 #include "rtcounter.h"
 #include "nrfx_rtc.h"
 #include "nrf_clock.h"
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index 17d697b86e3ba..3f20af264ec92 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -25,7 +25,7 @@
  */
 
 #include <string.h>
-#include "py/obj.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/objstr.h"
 #include "py/objlist.h"
@@ -33,7 +33,6 @@
 #if MICROPY_PY_UBLUEPY_CENTRAL
 
 #include "ble_drv.h"
-#include "mphalport.h"
 
 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);
diff --git a/ports/nrf/nrfx_log.h b/ports/nrf/nrfx_log.h
index 8710d3fc22d88..46f80f302a6f8 100644
--- a/ports/nrf/nrfx_log.h
+++ b/ports/nrf/nrfx_log.h
@@ -28,7 +28,7 @@
 #define NRFX_LOG_H
 
 #include <stdio.h>
-#include "mphalport.h"
+#include "py/mphal.h"
 #include "nrfx_config.h"
 
 #define LOG_TEST_UART 1
diff --git a/ports/samd/fatfs_port.c b/ports/samd/fatfs_port.c
index 91912d97d8e01..40b64111cb6d3 100644
--- a/ports/samd/fatfs_port.c
+++ b/ports/samd/fatfs_port.c
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include "mphalport.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "shared/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 1c8d49d1573db..e78032513c216 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -31,12 +31,12 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "modmachine.h"
 #include "samd_soc.h"
 #include "sam.h"
 #include "tusb.h"
-#include "mphalport.h"
 
 extern void machine_rtc_start(bool force);
 
diff --git a/ports/webassembly/mphalport.c b/ports/webassembly/mphalport.c
index 9ab47762e3e97..3935068b96b4a 100644
--- a/ports/webassembly/mphalport.c
+++ b/ports/webassembly/mphalport.c
@@ -25,8 +25,8 @@
  */
 
 #include <unistd.h>
+#include "py/mphal.h"
 #include "library.h"
-#include "mphalport.h"
 
 static void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;

From 6835743dccf0e8d0a677e8500af0c5a4b19fe645 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 10 Oct 2023 12:48:46 +0200
Subject: [PATCH 1498/3129] extmod/vfs_posix_file: Skip flush of tty handles in
 msvc debug builds.

In MSVC debug builds with debug error reporting set to showing a dialog (to
allow attaching the debugger), any application which imports the logging
module and leaves the default handlers would result in this dialog because
logging.shutdown is called at exit and that flushes the default handler
which has stderr as its stream.

This commit fixes that by not fsync'ing stdin/out/err.

Also adds a comment related to checking whether a file is stdin/out/err,
which is difficult to fix properly.

Signed-off-by: stijn <stijn@ignitron.net>
---
 extmod/vfs_posix_file.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index bc06bc74db1cb..501550cb502c5 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -160,12 +160,27 @@ static mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_
             #if defined(__APPLE__)
             #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL || err == ENOTSUP)
             #elif defined(_MSC_VER)
+            // In debug builds fsync (i.e. _commit on windows) will generate a debug report via _ASSERTE when
+            // called with non-redirected stdin/stdout/stderr (i.e. _isatty) handles because FlushFileBuffers,
+            // which it calls internally, will fail since console output is not buffered.
+            // In release builds it also fails, but merely returns an error which is handled appropriately below.
+            // The check for the handle being stdin/stdout/stderr is added explicitly because according to
+            // the documentation _isatty is also true for serial ports for instance.
+            #ifdef _DEBUG
+            if ((o->fd == STDIN_FILENO || o->fd == STDOUT_FILENO || o->fd == STDERR_FILENO) && _isatty(o->fd)) {
+                return 0;
+            }
+            #endif
             #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL || err == EBADF)
             #else
             #define VFS_POSIX_STREAM_STDIO_ERR_CATCH (err == EINVAL)
             #endif
             MP_HAL_RETRY_SYSCALL(ret, fsync(o->fd), {
                 if (VFS_POSIX_STREAM_STDIO_ERR_CATCH
+                    // Note: comparing fd against the standard FILENOs is technically not correct, for example:
+                    // sys.stderr.close() in Python code results in close(STDERR_FILENO) here, but because
+                    // open() uses the next available file descriptor, opening an arbitrary file with
+                    // fd = open('/some/file') means that fd becomes STDERR_FILENO.
                     && (o->fd == STDIN_FILENO || o->fd == STDOUT_FILENO || o->fd == STDERR_FILENO)) {
                     return 0;
                 }

From 10910219958a6b122de908beb1d5bd32b37972a2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 9 Jun 2023 14:14:06 +1000
Subject: [PATCH 1499/3129] tools/mpremote: Make eval parse by default.

This is a step towards making the transport expose a Python API rather than
functions that mostly print to stdout.

Most use cases of `transport.eval()` are to get some state back from the
device, so have it return as a value directly by default.

Updates uses of `transport.eval()` to remove the parse argument where it
now isn't needed, make the `rtc` command use eval/exec, and update the
`mip` command to use eval's parsing.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/commands.py         |  9 +++++++--
 tools/mpremote/mpremote/mip.py              | 11 ++---------
 tools/mpremote/mpremote/transport_serial.py |  6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index aae612765b011..fcda62ad26e29 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -242,6 +242,11 @@ def do_soft_reset(state, _args=None):
 
 
 def do_rtc(state, args):
+    state.ensure_raw_repl()
+    state.did_action()
+
+    state.transport.exec("import machine")
+
     if args.set:
         import datetime
 
@@ -256,6 +261,6 @@ def do_rtc(state, args):
             now.second,
             now.microsecond,
         )
-        _do_execbuffer(state, "import machine; machine.RTC().datetime({})".format(timetuple), True)
+        state.transport.exec("machine.RTC().datetime({})".format(timetuple))
     else:
-        _do_execbuffer(state, "import machine; print(machine.RTC().datetime())", True)
+        print(state.transport.eval("machine.RTC().datetime()"))
diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index c86bf01f4f9d8..04f5042524ee1 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -150,10 +150,7 @@ def _install_package(transport, package, index, target, version, mpy):
         mpy_version = "py"
         if mpy:
             transport.exec("import sys")
-            mpy_version = (
-                int(transport.eval("getattr(sys.implementation, '_mpy', 0) & 0xFF").decode())
-                or "py"
-            )
+            mpy_version = transport.eval("getattr(sys.implementation, '_mpy', 0) & 0xFF") or "py"
 
         package = f"{index}/package/{mpy_version}/{package}/{version}.json"
 
@@ -178,11 +175,7 @@ def do_mip(state, args):
 
             if args.target is None:
                 state.transport.exec("import sys")
-                lib_paths = (
-                    state.transport.eval("'|'.join(p for p in sys.path if p.endswith('/lib'))")
-                    .decode()
-                    .split("|")
-                )
+                lib_paths = [p for p in state.transport.eval("sys.path") if p.endswith("/lib")]
                 if lib_paths and lib_paths[0]:
                     args.target = lib_paths[0]
                 else:
diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index a97b7e0a08264..69ebf916a2889 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -271,7 +271,7 @@ 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, parse=False):
+    def eval(self, expression, parse=True):
         if parse:
             ret = self.exec("print(repr({}))".format(expression))
             ret = ret.strip()
@@ -331,7 +331,7 @@ def repr_consumer(b):
     def fs_stat(self, src):
         try:
             self.exec("import os")
-            return os.stat_result(self.eval("os.stat(%s)" % ("'%s'" % src), parse=True))
+            return os.stat_result(self.eval("os.stat(%s)" % ("'%s'" % src)))
         except TransportError as e:
             reraise_filesystem_error(e, src)
 
@@ -503,7 +503,7 @@ def fname_cp_dest(src, dest):
 
     def mount_local(self, path, unsafe_links=False):
         fout = self.serial
-        if self.eval('"RemoteFS" in globals()') == b"False":
+        if not self.eval('"RemoteFS" in globals()'):
             self.exec(fs_hook_code)
         self.exec("__mount()")
         self.mounted = True

From db59e55fe7a0b67d3af868990468e7b8056afe42 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 9 Jun 2023 14:05:44 +1000
Subject: [PATCH 1500/3129] tools/mpremote: Make filesystem commands use
 transport API.

This introduces a Python filesystem API on `Transport` that is implemented
entirely with eval/exec provided by the underlying transport subclass.

Updates existing mpremote filesystem commands (and `edit) to use this API.

Also re-implements recursive `cp` to allow arbitrary source / destination.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/commands.py         | 277 ++++++++++++++++----
 tools/mpremote/mpremote/main.py             |   2 +-
 tools/mpremote/mpremote/mip.py              |  32 +--
 tools/mpremote/mpremote/transport.py        | 145 +++++++++-
 tools/mpremote/mpremote/transport_serial.py | 228 +---------------
 5 files changed, 379 insertions(+), 305 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index fcda62ad26e29..db2be3b131824 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -4,8 +4,8 @@
 
 import serial.tools.list_ports
 
-from .transport import TransportError
-from .transport_serial import SerialTransport, stdout_write_bytes
+from .transport import TransportError, stdout_write_bytes
+from .transport_serial import SerialTransport
 
 
 class CommandError(Exception):
@@ -106,61 +106,238 @@ def show_progress_bar(size, total_size, op="copying"):
         )
 
 
+def _remote_path_join(a, *b):
+    if not a:
+        a = "./"
+    result = a.rstrip("/")
+    for x in b:
+        result += "/" + x.strip("/")
+    return result
+
+
+def _remote_path_dirname(a):
+    a = a.rsplit("/", 1)
+    if len(a) == 1:
+        return ""
+    else:
+        return a[0]
+
+
+def _remote_path_basename(a):
+    return a.rsplit("/", 1)[-1]
+
+
+def do_filesystem_cp(state, src, dest, multiple):
+    if dest.startswith(":"):
+        dest_exists = state.transport.fs_exists(dest[1:])
+        dest_isdir = dest_exists and state.transport.fs_isdir(dest[1:])
+    else:
+        dest_exists = os.path.exists(dest)
+        dest_isdir = dest_exists and os.path.isdir(dest)
+
+    if multiple:
+        if not dest_exists:
+            raise CommandError("cp: destination does not exist")
+        if not dest_isdir:
+            raise CommandError("cp: destination is not a directory")
+
+    # Download the contents of source.
+    try:
+        if src.startswith(":"):
+            data = state.transport.fs_readfile(src[1:], progress_callback=show_progress_bar)
+            filename = _remote_path_basename(src[1:])
+        else:
+            with open(src, "rb") as f:
+                data = f.read()
+            filename = os.path.basename(src)
+    except IsADirectoryError:
+        raise CommandError("cp: -r not specified; omitting directory")
+
+    # Write back to dest.
+    if dest.startswith(":"):
+        # If the destination path is just the directory, then add the source filename.
+        if dest_isdir:
+            dest = ":" + _remote_path_join(dest[1:], filename)
+
+        # Write to remote.
+        state.transport.fs_writefile(dest[1:], data, progress_callback=show_progress_bar)
+    else:
+        # If the destination path is just the directory, then add the source filename.
+        if dest_isdir:
+            dest = os.path.join(dest, filename)
+
+        # Write to local file.
+        with open(dest, "wb") as f:
+            f.write(data)
+
+
+def do_filesystem_recursive_cp(state, src, dest, multiple):
+    # Ignore trailing / on both src and dest. (Unix cp ignores them too)
+    src = src.rstrip("/" + os.path.sep + (os.path.altsep if os.path.altsep else ""))
+    dest = dest.rstrip("/" + os.path.sep + (os.path.altsep if os.path.altsep else ""))
+
+    # If the destination directory exists, then we copy into it. Otherwise we
+    # use the destination as the target.
+    if dest.startswith(":"):
+        dest_exists = state.transport.fs_exists(dest[1:])
+    else:
+        dest_exists = os.path.exists(dest)
+
+    # Recursively find all files to copy from a directory.
+    # `dirs` will be a list of dest split paths.
+    # `files` will be a list of `(dest split path, src joined path)`.
+    dirs = []
+    files = []
+
+    # For example, if src=/tmp/foo, with /tmp/foo/x.py and /tmp/foo/a/b/c.py,
+    # and if the destination directory exists, then we will have:
+    #   dirs = [['foo'], ['foo', 'a'], ['foo', 'a', 'b']]
+    #   files = [(['foo', 'x.py'], '/tmp/foo/x.py'), (['foo', 'a', 'b', 'c.py'], '/tmp/foo/a/b/c.py')]
+    # If the destination doesn't exist, then we will have:
+    #   dirs = [['a'], ['a', 'b']]
+    #   files = [(['x.py'], '/tmp/foo/x.py'), (['a', 'b', 'c.py'], '/tmp/foo/a/b/c.py')]
+
+    def _list_recursive(base, src_path, dest_path, src_join_fun, src_isdir_fun, src_listdir_fun):
+        src_path_joined = src_join_fun(base, *src_path)
+        if src_isdir_fun(src_path_joined):
+            if dest_path:
+                dirs.append(dest_path)
+            for entry in src_listdir_fun(src_path_joined):
+                _list_recursive(
+                    base,
+                    src_path + [entry],
+                    dest_path + [entry],
+                    src_join_fun,
+                    src_isdir_fun,
+                    src_listdir_fun,
+                )
+        else:
+            files.append(
+                (
+                    dest_path,
+                    src_path_joined,
+                )
+            )
+
+    if src.startswith(":"):
+        src_dirname = [_remote_path_basename(src[1:])]
+        dest_dirname = src_dirname if dest_exists else []
+        _list_recursive(
+            _remote_path_dirname(src[1:]),
+            src_dirname,
+            dest_dirname,
+            src_join_fun=_remote_path_join,
+            src_isdir_fun=state.transport.fs_isdir,
+            src_listdir_fun=lambda p: [x.name for x in state.transport.fs_listdir(p)],
+        )
+    else:
+        src_dirname = [os.path.basename(src)]
+        dest_dirname = src_dirname if dest_exists else []
+        _list_recursive(
+            os.path.dirname(src),
+            src_dirname,
+            dest_dirname,
+            src_join_fun=os.path.join,
+            src_isdir_fun=os.path.isdir,
+            src_listdir_fun=os.listdir,
+        )
+
+    # If no directories were encountered then we must have just had a file.
+    if not dirs:
+        return do_filesystem_cp(state, src, dest, multiple)
+
+    def _mkdir(a, *b):
+        try:
+            if a.startswith(":"):
+                state.transport.fs_mkdir(_remote_path_join(a[1:], *b))
+            else:
+                os.mkdir(os.path.join(a, *b))
+        except FileExistsError:
+            pass
+
+    # Create the destination if necessary.
+    if not dest_exists:
+        _mkdir(dest)
+
+    # Create all sub-directories relative to the destination.
+    for d in dirs:
+        _mkdir(dest, *d)
+
+    # Copy all files, in sorted order to help it be deterministic.
+    files.sort()
+    for dest_path_split, src_path_joined in files:
+        if src.startswith(":"):
+            src_path_joined = ":" + src_path_joined
+
+        if dest.startswith(":"):
+            dest_path_joined = ":" + _remote_path_join(dest[1:], *dest_path_split)
+        else:
+            dest_path_joined = os.path.join(dest, *dest_path_split)
+
+        do_filesystem_cp(state, src_path_joined, dest_path_joined, multiple=False)
+
+
 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))
-
     command = args.command[0]
     paths = args.path
 
     if command == "cat":
-        # Don't be verbose by default when using cat, so output can be
-        # redirected to something.
+        # Don't do verbose output for `cat` unless explicitly requested.
         verbose = args.verbose is True
     else:
         verbose = args.verbose is not False
 
-    if command == "cp" and args.recursive:
-        if paths[-1] != ":":
-            raise CommandError("'cp -r' destination must be ':'")
-        paths.pop()
-        src_files = []
-        for path in paths:
-            if path.startswith(":"):
-                raise CommandError("'cp -r' source files must be local")
-            _list_recursive(src_files, path)
-        known_dirs = {""}
-        state.transport.exec("import os")
-        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.transport.exec(
-                        "try:\n os.mkdir('%s')\nexcept OSError as e:\n print(e)" % d
-                    )
-                    known_dirs.add(d)
-            state.transport.filesystem_command(
-                ["cp", "/".join((dir, file)), ":" + dir + "/"],
-                progress_callback=show_progress_bar,
-                verbose=verbose,
-            )
+    if command == "cp":
+        # Note: cp requires the user to specify local/remote explicitly via
+        # leading ':'.
+
+        # The last argument must be the destination.
+        if len(paths) <= 1:
+            raise CommandError("cp: missing destination path")
+        cp_dest = paths[-1]
+        paths = paths[:-1]
     else:
-        if args.recursive:
-            raise CommandError("'-r' only supported for 'cp'")
-        try:
-            state.transport.filesystem_command(
-                [command] + paths, progress_callback=show_progress_bar, verbose=verbose
-            )
-        except OSError as er:
-            raise CommandError(er)
+        # All other commands implicitly use remote paths. Strip the
+        # leading ':' if the user included them.
+        paths = [path[1:] if path.startswith(":") else path for path in paths]
+
+    # ls implicitly lists the cwd.
+    if command == "ls" and not paths:
+        paths = [""]
+
+    # Handle each path sequentially.
+    for path in paths:
+        if verbose:
+            if command == "cp":
+                print("{} {} {}".format(command, path, cp_dest))
+            else:
+                print("{} :{}".format(command, path))
+
+        if command == "cat":
+            state.transport.fs_printfile(path)
+        elif command == "ls":
+            for result in state.transport.fs_listdir(path):
+                print(
+                    "{:12} {}{}".format(
+                        result.st_size, result.name, "/" if result.st_mode & 0x4000 else ""
+                    )
+                )
+        elif command == "mkdir":
+            state.transport.fs_mkdir(path)
+        elif command == "rm":
+            state.transport.fs_rmfile(path)
+        elif command == "rmdir":
+            state.transport.fs_rmdir(path)
+        elif command == "touch":
+            state.transport.fs_touchfile(path)
+        elif command == "cp":
+            if args.recursive:
+                do_filesystem_recursive_cp(state, path, cp_dest, len(paths) > 1)
+            else:
+                do_filesystem_cp(state, path, cp_dest, len(paths) > 1)
 
 
 def do_edit(state, args):
@@ -174,11 +351,15 @@ def do_edit(state, args):
         dest_fd, dest = tempfile.mkstemp(suffix=os.path.basename(src))
         try:
             print("edit :%s" % (src,))
-            os.close(dest_fd)
-            state.transport.fs_touch(src)
-            state.transport.fs_get(src, dest, progress_callback=show_progress_bar)
+            state.transport.fs_touchfile(src)
+            data = state.transport.fs_readfile(src, progress_callback=show_progress_bar)
+            with open(dest_fd, "wb") as f:
+                f.write(data)
             if os.system('%s "%s"' % (os.getenv("EDITOR"), dest)) == 0:
-                state.transport.fs_put(dest, src, progress_callback=show_progress_bar)
+                with open(dest, "rb") as f:
+                    state.transport.fs_writefile(
+                        src, f.read(), progress_callback=show_progress_bar
+                    )
         finally:
             os.unlink(dest)
 
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index e4d15fb47c69b..427e11c744b04 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -190,7 +190,7 @@ def argparse_filesystem():
         "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)"
+        "command", nargs=1, help="filesystem command (e.g. cat, cp, ls, rm, rmdir, touch)"
     )
     cmd_parser.add_argument("path", nargs="+", help="local and remote paths")
     return cmd_parser
diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index 04f5042524ee1..d23a0e2cbcb4f 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -12,13 +12,10 @@
 
 
 _PACKAGE_INDEX = "https://micropython.org/pi/v2"
-_CHUNK_SIZE = 128
 
 
 # This implements os.makedirs(os.dirname(path))
 def _ensure_path_exists(transport, path):
-    import os
-
     split = path.split("/")
 
     # Handle paths starting with "/".
@@ -34,22 +31,6 @@ def _ensure_path_exists(transport, path):
         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"
@@ -83,15 +64,10 @@ def _rewrite_url(url, branch=None):
 def _download_file(transport, 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(transport, dest)
-                transport.fs_put(path, dest, progress_callback=show_progress_bar)
-            finally:
-                os.unlink(path)
+            data = src.read()
+            print("Installing:", dest)
+            _ensure_path_exists(transport, dest)
+            transport.fs_writefile(dest, data, progress_callback=show_progress_bar)
     except urllib.error.HTTPError as e:
         if e.status == 404:
             raise CommandError(f"File not found: {url}")
diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index 6e9a77b2bb6c5..2acc8c3b2b85b 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -24,10 +24,153 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+import ast, os, sys
+from collections import namedtuple
+
+
+def stdout_write_bytes(b):
+    b = b.replace(b"\x04", b"")
+    if hasattr(sys.stdout, "buffer"):
+        sys.stdout.buffer.write(b)
+        sys.stdout.buffer.flush()
+    else:
+        text = b.decode(sys.stdout.encoding, "strict")
+        sys.stdout.write(text)
+
 
 class TransportError(Exception):
     pass
 
 
+listdir_result = namedtuple("dir_result", ["name", "st_mode", "st_ino", "st_size"])
+
+
+# Takes a Transport error (containing the text of an OSError traceback) and
+# raises it as the corresponding OSError-derived exception.
+def _convert_filesystem_error(e, info):
+    if len(e.args) >= 3:
+        if b"OSError" in e.args[2] and b"ENOENT" in e.args[2]:
+            return FileNotFoundError(info)
+        if b"OSError" in e.args[2] and b"EISDIR" in e.args[2]:
+            return IsADirectoryError(info)
+        if b"OSError" in e.args[2] and b"EEXIST" in e.args[2]:
+            return FileExistsError(info)
+    return e
+
+
 class Transport:
-    pass
+    def fs_listdir(self, src=""):
+        buf = bytearray()
+
+        def repr_consumer(b):
+            buf.extend(b.replace(b"\x04", b""))
+
+        cmd = "import os\nfor f in os.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 TransportError as e:
+            raise _convert_filesystem_error(e, src) from None
+
+        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 os")
+            return os.stat_result(self.eval("os.stat(%s)" % ("'%s'" % src)))
+        except TransportError as e:
+            raise _convert_filesystem_error(e, src) from None
+
+    def fs_exists(self, src):
+        try:
+            self.fs_stat(src)
+            return True
+        except OSError:
+            return False
+
+    def fs_isdir(self, src):
+        try:
+            mode = self.fs_stat(src).st_mode
+            return (mode & 0x4000) != 0
+        except OSError:
+            # Match CPython, a non-existent path is not a directory.
+            return False
+
+    def fs_printfile(self, src, chunk_size=256):
+        cmd = (
+            "with open('%s') 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=stdout_write_bytes)
+        except TransportError as e:
+            raise _convert_filesystem_error(e, src) from None
+
+    def fs_readfile(self, src, chunk_size=256, progress_callback=None):
+        if progress_callback:
+            src_size = self.fs_stat(src).st_size
+
+        contents = bytearray()
+
+        try:
+            self.exec("f=open('%s','rb')\nr=f.read" % src)
+            while True:
+                chunk = self.eval("r({})".format(chunk_size))
+                if not chunk:
+                    break
+                contents.extend(chunk)
+                if progress_callback:
+                    progress_callback(len(contents), src_size)
+            self.exec("f.close()")
+        except TransportError as e:
+            raise _convert_filesystem_error(e, src) from None
+
+        return contents
+
+    def fs_writefile(self, dest, data, chunk_size=256, progress_callback=None):
+        if progress_callback:
+            src_size = len(data)
+            written = 0
+
+        try:
+            self.exec("f=open('%s','wb')\nw=f.write" % dest)
+            while data:
+                chunk = data[:chunk_size]
+                self.exec("w(" + repr(chunk) + ")")
+                written += len(chunk)
+                data = data[len(chunk) :]
+                if progress_callback:
+                    progress_callback(written, src_size)
+            self.exec("f.close()")
+        except TransportError as e:
+            raise _convert_filesystem_error(e, dest) from None
+
+    def fs_mkdir(self, path):
+        try:
+            self.exec("import os\nos.mkdir('%s')" % path)
+        except TransportError as e:
+            raise _convert_filesystem_error(e, path) from None
+
+    def fs_rmdir(self, path):
+        try:
+            self.exec("import os\nos.rmdir('%s')" % path)
+        except TransportError as e:
+            raise _convert_filesystem_error(e, path) from None
+
+    def fs_rmfile(self, path):
+        try:
+            self.exec("import os\nos.remove('%s')" % path)
+        except TransportError as e:
+            raise _convert_filesystem_error(e, path) from None
+
+    def fs_touchfile(self, path):
+        try:
+            self.exec("f=open('%s','a')\nf.close()" % path)
+        except TransportError as e:
+            raise _convert_filesystem_error(e, path) from None
diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 69ebf916a2889..e6a41e1ffaf4b 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -35,29 +35,12 @@
 # Once the API is stabilised, the idea is that mpremote can be used both
 # as a command line tool and a library for interacting with devices.
 
-import ast, io, errno, os, re, struct, sys, time
-from collections import namedtuple
+import ast, io, os, re, struct, sys, time
 from errno import EPERM
 from .console import VT_ENABLED
 from .transport import TransportError, Transport
 
 
-def stdout_write_bytes(b):
-    b = b.replace(b"\x04", b"")
-    sys.stdout.buffer.write(b)
-    sys.stdout.buffer.flush()
-
-
-listdir_result = namedtuple("dir_result", ["name", "st_mode", "st_ino", "st_size"])
-
-
-def reraise_filesystem_error(e, info):
-    if len(e.args) >= 3:
-        if b"OSError" in e.args[2] and b"ENOENT" in e.args[2]:
-            raise FileNotFoundError(info)
-    raise
-
-
 class SerialTransport(Transport):
     def __init__(self, device, baudrate=115200, wait=0, exclusive=True):
         self.in_raw_repl = False
@@ -292,215 +275,6 @@ def execfile(self, filename):
             pyfile = f.read()
         return self.exec(pyfile)
 
-    def fs_exists(self, src):
-        try:
-            self.exec("import os\nos.stat(%s)" % (("'%s'" % src) if src else ""))
-            return True
-        except TransportError:
-            return False
-
-    def fs_ls(self, src):
-        cmd = (
-            "import os\nfor f in os.ilistdir(%s):\n"
-            " print('{:12} {}{}'.format(f[3]if len(f)>3 else 0,f[0],'/'if f[1]&0x4000 else ''))"
-            % (("'%s'" % src) if src else "")
-        )
-        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 os\nfor f in os.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 TransportError as e:
-            reraise_filesystem_error(e, 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 os")
-            return os.stat_result(self.eval("os.stat(%s)" % ("'%s'" % src)))
-        except TransportError as e:
-            reraise_filesystem_error(e, src)
-
-    def fs_cat(self, src, chunk_size=256):
-        cmd = (
-            "with open('%s') as f:\n while 1:\n"
-            "  b=f.read(%u)\n  if not b:break\n  print(b,end='')" % (src, chunk_size)
-        )
-        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 TransportError as e:
-            reraise_filesystem_error(e, 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 = 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:
-            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 = self.fs_stat(src).st_size
-            written = 0
-        self.exec("f=open('%s','rb')\nr=f.read" % src)
-        with open(dest, "wb") as f:
-            while True:
-                data = bytearray()
-                self.exec("print(r(%u))" % chunk_size, data_consumer=lambda d: data.extend(d))
-                assert data.endswith(b"\r\n\x04")
-                try:
-                    data = ast.literal_eval(str(data[:-3], "ascii"))
-                    if not isinstance(data, bytes):
-                        raise ValueError("Not bytes")
-                except (UnicodeError, ValueError) as e:
-                    raise TransportError("fs_get: Could not interpret received data: %s" % str(e))
-                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, 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:
-                data = f.read(chunk_size)
-                if not data:
-                    break
-                if sys.version_info < (3,):
-                    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):
-        self.exec("import os\nos.mkdir('%s')" % dir)
-
-    def fs_rmdir(self, dir):
-        self.exec("import os\nos.rmdir('%s')" % dir)
-
-    def fs_rm(self, src):
-        self.exec("import os\nos.remove('%s')" % src)
-
-    def fs_touch(self, src):
-        self.exec("f=open('%s','a')\nf.close()" % src)
-
-    def filesystem_command(self, args, progress_callback=None, verbose=False):
-        def fname_remote(src):
-            if src.startswith(":"):
-                src = src[1:]
-            # 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 = "./" + src
-            elif dest.endswith("/"):
-                dest += src
-            return dest
-
-        cmd = args[0]
-        args = args[1:]
-        try:
-            if cmd == "cp":
-                srcs = args[:-1]
-                dest = args[-1]
-                if dest.startswith(":"):
-                    op_remote_src = self.fs_cp
-                    op_local_src = self.fs_put
-                else:
-                    op_remote_src = self.fs_get
-                    op_local_src = lambda src, dest, **_: __import__("shutil").copy(src, dest)
-                for src in srcs:
-                    if verbose:
-                        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:
-                ops = {
-                    "cat": self.fs_cat,
-                    "ls": self.fs_ls,
-                    "mkdir": self.fs_mkdir,
-                    "rm": self.fs_rm,
-                    "rmdir": self.fs_rmdir,
-                    "touch": self.fs_touch,
-                }
-                if cmd not in ops:
-                    raise TransportError("'{}' 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))
-                    ops[cmd](src)
-        except TransportError as er:
-            if len(er.args) > 1:
-                print(str(er.args[2], "ascii"))
-            else:
-                print(er)
-            self.exit_raw_repl()
-            self.close()
-            sys.exit(1)
-
     def mount_local(self, path, unsafe_links=False):
         fout = self.serial
         if not self.eval('"RemoteFS" in globals()'):

From 6f8157d880d2ff2146df854eb19786afefe6dab7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 10 Jun 2023 00:46:08 +1000
Subject: [PATCH 1501/3129] tools/mpremote: Add hashing ability and use for
 recursive copy.

Changes in this commit:
- Adds transport API `fs_hashfile` to compute the hash of a file with given
  algorithm.
- Adds commands `mpremote <...>sum file` to compute and print hashes of
  various algorithms.
- Adds shortcut `mpremote sha256sum file`.
- Uses the hash computation to improve speed of recursive file copy to
  avoid copying a file where the target is identical.

For recursive copy, if possible it will use the board's support (e.g.
built-in hashlib or hashlib from micropython-lib), but will fall back to
downloading the file and using the local implementation.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/README.md             |  3 ++-
 tools/mpremote/mpremote/commands.py  | 21 +++++++++++++++++++--
 tools/mpremote/mpremote/main.py      | 11 +++++++----
 tools/mpremote/mpremote/transport.py | 19 ++++++++++++++++++-
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
index 3d428f12874d8..2bf784be291a7 100644
--- a/tools/mpremote/README.md
+++ b/tools/mpremote/README.md
@@ -20,7 +20,7 @@ The full list of supported commands are:
     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
+                                         command may be: cat, ls, cp, rm, mkdir, rmdir, sha256sum
                                          use ":" as a prefix to specify a file on the device
     mpremote repl                     -- enter REPL
                                          options:
@@ -78,6 +78,7 @@ Examples:
     mpremote cp :main.py .
     mpremote cp main.py :
     mpremote cp -r dir/ :
+    mpremote sha256sum :main.py
     mpremote mip install aioble
     mpremote mip install github:org/repo@branch
     mpremote mip install gitlab:org/repo@branch
diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index db2be3b131824..d9466864bdd71 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -1,3 +1,4 @@
+import hashlib
 import os
 import sys
 import tempfile
@@ -127,7 +128,7 @@ def _remote_path_basename(a):
     return a.rsplit("/", 1)[-1]
 
 
-def do_filesystem_cp(state, src, dest, multiple):
+def do_filesystem_cp(state, src, dest, multiple, check_hash=False):
     if dest.startswith(":"):
         dest_exists = state.transport.fs_exists(dest[1:])
         dest_isdir = dest_exists and state.transport.fs_isdir(dest[1:])
@@ -159,6 +160,19 @@ def do_filesystem_cp(state, src, dest, multiple):
         if dest_isdir:
             dest = ":" + _remote_path_join(dest[1:], filename)
 
+        # Skip copy if the destination file is identical.
+        if check_hash:
+            try:
+                remote_hash = state.transport.fs_hashfile(dest[1:], "sha256")
+                source_hash = hashlib.sha256(data).digest()
+                # remote_hash will be None if the device doesn't support
+                # hashlib.sha256 (and therefore won't match).
+                if remote_hash == source_hash:
+                    print("Up to date:", dest[1:])
+                    return
+            except OSError:
+                pass
+
         # Write to remote.
         state.transport.fs_writefile(dest[1:], data, progress_callback=show_progress_bar)
     else:
@@ -274,7 +288,7 @@ def _mkdir(a, *b):
         else:
             dest_path_joined = os.path.join(dest, *dest_path_split)
 
-        do_filesystem_cp(state, src_path_joined, dest_path_joined, multiple=False)
+        do_filesystem_cp(state, src_path_joined, dest_path_joined, multiple=False, check_hash=True)
 
 
 def do_filesystem(state, args):
@@ -333,6 +347,9 @@ def do_filesystem(state, args):
             state.transport.fs_rmdir(path)
         elif command == "touch":
             state.transport.fs_touchfile(path)
+        elif command.endswith("sum") and command[-4].isdigit():
+            digest = state.transport.fs_hashfile(path, command[:-3])
+            print(digest.hex())
         elif command == "cp":
             if args.recursive:
                 do_filesystem_recursive_cp(state, path, cp_dest, len(paths) > 1)
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 427e11c744b04..c5e73b1cc03ac 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -190,7 +190,9 @@ def argparse_filesystem():
         "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, rmdir, touch)"
+        "command",
+        nargs=1,
+        help="filesystem command (e.g. cat, cp, sha256sum, ls, rm, rmdir, touch)",
     )
     cmd_parser.add_argument("path", nargs="+", help="local and remote paths")
     return cmd_parser
@@ -308,12 +310,13 @@ def argparse_none(description):
     },
     # Filesystem shortcuts (use `cp` instead of `fs cp`).
     "cat": "fs cat",
-    "ls": "fs ls",
     "cp": "fs cp",
-    "rm": "fs rm",
-    "touch": "fs touch",
+    "ls": "fs ls",
     "mkdir": "fs mkdir",
+    "rm": "fs rm",
     "rmdir": "fs rmdir",
+    "sha256sum": "fs sha256sum",
+    "touch": "fs touch",
     # Disk used/free.
     "df": [
         "exec",
diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index 2acc8c3b2b85b..cb4cd102d9e08 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -24,7 +24,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import ast, os, sys
+import ast, hashlib, os, sys
 from collections import namedtuple
 
 
@@ -174,3 +174,20 @@ def fs_touchfile(self, path):
             self.exec("f=open('%s','a')\nf.close()" % path)
         except TransportError as e:
             raise _convert_filesystem_error(e, path) from None
+
+    def fs_hashfile(self, path, algo, chunk_size=256):
+        try:
+            self.exec("import hashlib\nh = hashlib.{algo}()".format(algo=algo))
+        except TransportError:
+            # hashlib (or hashlib.{algo}) not available on device. Do the hash locally.
+            data = self.fs_readfile(path, chunk_size=chunk_size)
+            return getattr(hashlib, algo)(data).digest()
+        try:
+            self.exec(
+                "buf = memoryview(bytearray({chunk_size}))\nwith open('{path}', 'rb') as f:\n while True:\n  n = f.readinto(buf)\n  if n == 0:\n   break\n  h.update(buf if n == {chunk_size} else buf[:n])\n".format(
+                    chunk_size=chunk_size, path=path
+                )
+            )
+            return self.eval("h.digest()")
+        except TransportExecError as e:
+            raise _convert_filesystem_error(e, path) from None

From dd6f78f0142a0567ed21a7b29aa6d810c85e1bdb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 15 Jun 2023 18:09:39 +1000
Subject: [PATCH 1502/3129] tools/mpremote: Improve error output.

Makes the filesystem command give standard error messages rather than
just printing the exception from the device.

Makes the distinction between CommandError and TransportError clearer.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/commands.py         | 81 +++++++++++----------
 tools/mpremote/mpremote/transport.py        | 42 ++++++-----
 tools/mpremote/mpremote/transport_serial.py |  4 +-
 3 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index d9466864bdd71..1f3a89a845f72 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -63,8 +63,7 @@ def do_connect(state, args=None):
         msg = er.args[0]
         if msg.startswith("failed to access"):
             msg += " (it may be in use by another program)"
-        print(msg)
-        sys.exit(1)
+        raise CommandError(msg)
 
 
 def do_disconnect(state, _args=None):
@@ -322,39 +321,48 @@ def do_filesystem(state, args):
     if command == "ls" and not paths:
         paths = [""]
 
-    # Handle each path sequentially.
-    for path in paths:
-        if verbose:
-            if command == "cp":
-                print("{} {} {}".format(command, path, cp_dest))
-            else:
-                print("{} :{}".format(command, path))
-
-        if command == "cat":
-            state.transport.fs_printfile(path)
-        elif command == "ls":
-            for result in state.transport.fs_listdir(path):
-                print(
-                    "{:12} {}{}".format(
-                        result.st_size, result.name, "/" if result.st_mode & 0x4000 else ""
+    try:
+        # Handle each path sequentially.
+        for path in paths:
+            if verbose:
+                if command == "cp":
+                    print("{} {} {}".format(command, path, cp_dest))
+                else:
+                    print("{} :{}".format(command, path))
+
+            if command == "cat":
+                state.transport.fs_printfile(path)
+            elif command == "ls":
+                for result in state.transport.fs_listdir(path):
+                    print(
+                        "{:12} {}{}".format(
+                            result.st_size, result.name, "/" if result.st_mode & 0x4000 else ""
+                        )
                     )
-                )
-        elif command == "mkdir":
-            state.transport.fs_mkdir(path)
-        elif command == "rm":
-            state.transport.fs_rmfile(path)
-        elif command == "rmdir":
-            state.transport.fs_rmdir(path)
-        elif command == "touch":
-            state.transport.fs_touchfile(path)
-        elif command.endswith("sum") and command[-4].isdigit():
-            digest = state.transport.fs_hashfile(path, command[:-3])
-            print(digest.hex())
-        elif command == "cp":
-            if args.recursive:
-                do_filesystem_recursive_cp(state, path, cp_dest, len(paths) > 1)
-            else:
-                do_filesystem_cp(state, path, cp_dest, len(paths) > 1)
+            elif command == "mkdir":
+                state.transport.fs_mkdir(path)
+            elif command == "rm":
+                state.transport.fs_rmfile(path)
+            elif command == "rmdir":
+                state.transport.fs_rmdir(path)
+            elif command == "touch":
+                state.transport.fs_touchfile(path)
+            elif command.endswith("sum") and command[-4].isdigit():
+                digest = state.transport.fs_hashfile(path, command[:-3])
+                print(digest.hex())
+            elif command == "cp":
+                if args.recursive:
+                    do_filesystem_recursive_cp(state, path, cp_dest, len(paths) > 1)
+                else:
+                    do_filesystem_cp(state, path, cp_dest, len(paths) > 1)
+    except FileNotFoundError as er:
+        raise CommandError("{}: {}: No such file or directory.".format(command, er.args[0]))
+    except IsADirectoryError as er:
+        raise CommandError("{}: {}: Is a directory.".format(command, er.args[0]))
+    except FileExistsError as er:
+        raise CommandError("{}: {}: File exists.".format(command, er.args[0]))
+    except TransportError as er:
+        raise CommandError("Error with transport:\n{}".format(er.args[0]))
 
 
 def do_edit(state, args):
@@ -362,7 +370,7 @@ def do_edit(state, args):
     state.did_action()
 
     if not os.getenv("EDITOR"):
-        raise TransportError("edit: $EDITOR not set")
+        raise CommandError("edit: $EDITOR not set")
     for src in args.files:
         src = src.lstrip(":")
         dest_fd, dest = tempfile.mkstemp(suffix=os.path.basename(src))
@@ -393,8 +401,7 @@ def _do_execbuffer(state, buf, follow):
                 stdout_write_bytes(ret_err)
                 sys.exit(1)
     except TransportError as er:
-        print(er)
-        sys.exit(1)
+        raise CommandError(er.args[0])
     except KeyboardInterrupt:
         sys.exit(1)
 
diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index cb4cd102d9e08..0b22a61580a03 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -42,19 +42,27 @@ class TransportError(Exception):
     pass
 
 
+class TransportExecError(TransportError):
+    def __init__(self, status_code, error_output):
+        self.status_code = status_code
+        self.error_output = error_output
+        super().__init__(error_output)
+
+
 listdir_result = namedtuple("dir_result", ["name", "st_mode", "st_ino", "st_size"])
 
 
 # Takes a Transport error (containing the text of an OSError traceback) and
 # raises it as the corresponding OSError-derived exception.
 def _convert_filesystem_error(e, info):
-    if len(e.args) >= 3:
-        if b"OSError" in e.args[2] and b"ENOENT" in e.args[2]:
-            return FileNotFoundError(info)
-        if b"OSError" in e.args[2] and b"EISDIR" in e.args[2]:
-            return IsADirectoryError(info)
-        if b"OSError" in e.args[2] and b"EEXIST" in e.args[2]:
-            return FileExistsError(info)
+    if "OSError" in e.error_output and "ENOENT" in e.error_output:
+        return FileNotFoundError(info)
+    if "OSError" in e.error_output and "EISDIR" in e.error_output:
+        return IsADirectoryError(info)
+    if "OSError" in e.error_output and "EEXIST" in e.error_output:
+        return FileExistsError(info)
+    if "OSError" in e.error_output and "ENODEV" in e.error_output:
+        return FileNotFoundError(info)
     return e
 
 
@@ -72,7 +80,7 @@ def repr_consumer(b):
             buf.extend(b"[")
             self.exec(cmd, data_consumer=repr_consumer)
             buf.extend(b"]")
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, src) from None
 
         return [
@@ -84,7 +92,7 @@ def fs_stat(self, src):
         try:
             self.exec("import os")
             return os.stat_result(self.eval("os.stat(%s)" % ("'%s'" % src)))
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, src) from None
 
     def fs_exists(self, src):
@@ -109,7 +117,7 @@ def fs_printfile(self, src, chunk_size=256):
         )
         try:
             self.exec(cmd, data_consumer=stdout_write_bytes)
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, src) from None
 
     def fs_readfile(self, src, chunk_size=256, progress_callback=None):
@@ -128,7 +136,7 @@ def fs_readfile(self, src, chunk_size=256, progress_callback=None):
                 if progress_callback:
                     progress_callback(len(contents), src_size)
             self.exec("f.close()")
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, src) from None
 
         return contents
@@ -148,37 +156,37 @@ def fs_writefile(self, dest, data, chunk_size=256, progress_callback=None):
                 if progress_callback:
                     progress_callback(written, src_size)
             self.exec("f.close()")
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, dest) from None
 
     def fs_mkdir(self, path):
         try:
             self.exec("import os\nos.mkdir('%s')" % path)
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, path) from None
 
     def fs_rmdir(self, path):
         try:
             self.exec("import os\nos.rmdir('%s')" % path)
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, path) from None
 
     def fs_rmfile(self, path):
         try:
             self.exec("import os\nos.remove('%s')" % path)
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, path) from None
 
     def fs_touchfile(self, path):
         try:
             self.exec("f=open('%s','a')\nf.close()" % path)
-        except TransportError as e:
+        except TransportExecError as e:
             raise _convert_filesystem_error(e, path) from None
 
     def fs_hashfile(self, path, algo, chunk_size=256):
         try:
             self.exec("import hashlib\nh = hashlib.{algo}()".format(algo=algo))
-        except TransportError:
+        except TransportExecError:
             # hashlib (or hashlib.{algo}) not available on device. Do the hash locally.
             data = self.fs_readfile(path, chunk_size=chunk_size)
             return getattr(hashlib, algo)(data).digest()
diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index e6a41e1ffaf4b..6f43e2c41fdfa 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -38,7 +38,7 @@
 import ast, io, os, re, struct, sys, time
 from errno import EPERM
 from .console import VT_ENABLED
-from .transport import TransportError, Transport
+from .transport import TransportError, TransportExecError, Transport
 
 
 class SerialTransport(Transport):
@@ -267,7 +267,7 @@ def eval(self, expression, parse=True):
     def exec(self, command, data_consumer=None):
         ret, ret_err = self.exec_raw(command, data_consumer=data_consumer)
         if ret_err:
-            raise TransportError("exception", ret, ret_err)
+            raise TransportExecError(ret, ret_err.decode())
         return ret
 
     def execfile(self, filename):

From 6461ffd9d174fdf799c8de27f92e4505ec731c7e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Jun 2023 15:38:01 +1000
Subject: [PATCH 1503/3129] tools/mpremote: Add initial regression tests for
 mpremote.

These tests are specifically for the command-line interface and cover:
 - resume/soft-reset/connect/disconnect
 - mount
 - fs cp,touch,mkdir,cat,sha256sum,rm,rmdir
 - eval/exec/run

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/tests/README.md                |  14 ++
 tools/mpremote/tests/run-mpremote-tests.sh    |  30 +++
 tools/mpremote/tests/test_eval_exec_run.sh    |  26 +++
 .../mpremote/tests/test_eval_exec_run.sh.exp  |   6 +
 tools/mpremote/tests/test_filesystem.sh       | 162 ++++++++++++++++
 tools/mpremote/tests/test_filesystem.sh.exp   | 183 ++++++++++++++++++
 tools/mpremote/tests/test_mount.sh            |  28 +++
 tools/mpremote/tests/test_mount.sh.exp        |   7 +
 tools/mpremote/tests/test_recursive_cp.sh     |  60 ++++++
 tools/mpremote/tests/test_recursive_cp.sh.exp |  98 ++++++++++
 tools/mpremote/tests/test_resume.sh           |  23 +++
 tools/mpremote/tests/test_resume.sh.exp       |  17 ++
 12 files changed, 654 insertions(+)
 create mode 100644 tools/mpremote/tests/README.md
 create mode 100755 tools/mpremote/tests/run-mpremote-tests.sh
 create mode 100755 tools/mpremote/tests/test_eval_exec_run.sh
 create mode 100644 tools/mpremote/tests/test_eval_exec_run.sh.exp
 create mode 100755 tools/mpremote/tests/test_filesystem.sh
 create mode 100644 tools/mpremote/tests/test_filesystem.sh.exp
 create mode 100755 tools/mpremote/tests/test_mount.sh
 create mode 100644 tools/mpremote/tests/test_mount.sh.exp
 create mode 100755 tools/mpremote/tests/test_recursive_cp.sh
 create mode 100644 tools/mpremote/tests/test_recursive_cp.sh.exp
 create mode 100755 tools/mpremote/tests/test_resume.sh
 create mode 100644 tools/mpremote/tests/test_resume.sh.exp

diff --git a/tools/mpremote/tests/README.md b/tools/mpremote/tests/README.md
new file mode 100644
index 0000000000000..5b924d2fb8701
--- /dev/null
+++ b/tools/mpremote/tests/README.md
@@ -0,0 +1,14 @@
+# Tests for mpremote
+
+This directory contains a set of tests for `mpremote`.
+
+Requirements:
+- A device running MicroPython connected to a serial port on the host.
+- Python 3.x, `bash` and various Unix tools such as `find`, `mktemp`, `sed`, `sort`, `tr`.
+
+To run the tests do:
+
+    $ ./run-mpremote-tests.sh
+
+Each test should print "OK" if it passed.  Otherwise it will print "CRASH", or "FAIL"
+and a diff of the expected and actual test output.
diff --git a/tools/mpremote/tests/run-mpremote-tests.sh b/tools/mpremote/tests/run-mpremote-tests.sh
new file mode 100755
index 0000000000000..11d82c9bb3801
--- /dev/null
+++ b/tools/mpremote/tests/run-mpremote-tests.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+TEST_DIR=$(dirname $0)
+MPREMOTE=${TEST_DIR}/../mpremote.py
+
+if [ -z "$1" ]; then
+    # Find tests matching test_*.sh
+    TESTS=${TEST_DIR}/test_*.sh
+else
+    # Specific test path from the command line.
+    TESTS="$1"
+fi
+
+for t in $TESTS; do
+    TMP=$(mktemp -d)
+    echo -n "${t}: "
+    # Strip CR and replace the random temp dir with a token.
+    if env MPREMOTE=${MPREMOTE} TMP="${TMP}" "${t}" | tr -d '\r' | sed "s,${TMP},"'${TMP},g' > "${t}.out"; then
+        if diff "${t}.out" "${t}.exp" > /dev/null; then
+            echo "OK"
+        else
+            echo "FAIL"
+            diff "${t}.out" "${t}.exp" || true
+        fi
+    else
+        echo "CRASH"
+    fi
+    rm -r "${TMP}"
+done
diff --git a/tools/mpremote/tests/test_eval_exec_run.sh b/tools/mpremote/tests/test_eval_exec_run.sh
new file mode 100755
index 0000000000000..dd30b2594db5b
--- /dev/null
+++ b/tools/mpremote/tests/test_eval_exec_run.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+
+$MPREMOTE exec "print('mpremote')"
+
+$MPREMOTE exec "print('before sleep'); import time; time.sleep(0.1); print('after sleep')"
+$MPREMOTE exec --no-follow "print('before sleep'); import time; time.sleep(0.1); print('after sleep')"
+sleep 0.3
+
+$MPREMOTE eval "1+2"
+$MPREMOTE eval "[{'a': 'b'}, (1,2,3,), True]"
+
+cat << EOF > /tmp/run.py
+print("run")
+EOF
+
+$MPREMOTE run /tmp/run.py
+
+cat << EOF > /tmp/run.py
+import time
+for i in range(3):
+    time.sleep(0.1)
+    print("run")
+EOF
+$MPREMOTE run --no-follow /tmp/run.py
+sleep 0.5
diff --git a/tools/mpremote/tests/test_eval_exec_run.sh.exp b/tools/mpremote/tests/test_eval_exec_run.sh.exp
new file mode 100644
index 0000000000000..3ea7a9d7c00a1
--- /dev/null
+++ b/tools/mpremote/tests/test_eval_exec_run.sh.exp
@@ -0,0 +1,6 @@
+mpremote
+before sleep
+after sleep
+3
+[{'a': 'b'}, (1, 2, 3), True]
+run
diff --git a/tools/mpremote/tests/test_filesystem.sh b/tools/mpremote/tests/test_filesystem.sh
new file mode 100755
index 0000000000000..b6d5a7febcb84
--- /dev/null
+++ b/tools/mpremote/tests/test_filesystem.sh
@@ -0,0 +1,162 @@
+#!/bin/bash
+set -e
+
+# Creates a RAM disk big enough to hold two copies of the test directory
+# structure.
+cat << EOF > "${TMP}/ramdisk.py"
+class RAMBlockDev:
+    def __init__(self, block_size, num_blocks):
+        self.block_size = block_size
+        self.data = bytearray(block_size * num_blocks)
+
+    def readblocks(self, block_num, buf):
+        for i in range(len(buf)):
+            buf[i] = self.data[block_num * self.block_size + i]
+
+    def writeblocks(self, block_num, buf):
+        for i in range(len(buf)):
+            self.data[block_num * self.block_size + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4: # get number of blocks
+            return len(self.data) // self.block_size
+        if op == 5: # get block size
+            return self.block_size
+
+import os
+
+bdev = RAMBlockDev(512, 50)
+os.VfsFat.mkfs(bdev)
+os.mount(bdev, '/ramdisk')
+os.chdir('/ramdisk')
+EOF
+
+
+echo -----
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume ls
+
+echo -----
+$MPREMOTE resume touch a.py
+$MPREMOTE resume touch :b.py
+$MPREMOTE resume ls :
+$MPREMOTE resume cat a.py
+$MPREMOTE resume cat :b.py
+$MPREMOTE resume sha256sum a.py
+echo -n "" | sha256sum
+
+echo -----
+cat << EOF > "${TMP}/a.py"
+print("Hello")
+print("World")
+EOF
+$MPREMOTE resume cp "${TMP}/a.py" :
+$MPREMOTE resume cp "${TMP}/a.py" :b.py
+$MPREMOTE resume cp "${TMP}/a.py" :c.py
+$MPREMOTE resume cp :a.py :d.py
+$MPREMOTE resume ls
+$MPREMOTE resume exec "import a; import b; import c"
+$MPREMOTE resume sha256sum a.py
+cat "${TMP}/a.py" | sha256sum
+
+echo -----
+$MPREMOTE resume mkdir aaa
+$MPREMOTE resume mkdir :bbb
+$MPREMOTE resume cp "${TMP}/a.py" :aaa
+$MPREMOTE resume cp "${TMP}/a.py" :bbb/b.py
+$MPREMOTE resume cat :aaa/a.py bbb/b.py
+
+echo -----
+$MPREMOTE resume rm :b.py c.py
+$MPREMOTE resume ls
+$MPREMOTE resume rm :aaa/a.py bbb/b.py
+$MPREMOTE resume rmdir aaa :bbb
+$MPREMOTE resume ls
+
+echo -----
+env EDITOR="sed -i s/Hello/Goodbye/" $MPREMOTE resume edit d.py
+$MPREMOTE resume sha256sum :d.py
+$MPREMOTE resume exec "import d"
+
+
+# Create a local directory structure and copy it to `:` on the device.
+echo -----
+mkdir -p "${TMP}/package"
+mkdir -p "${TMP}/package/subpackage"
+cat << EOF > "${TMP}/package/__init__.py"
+from .x import x
+from .subpackage import y
+EOF
+cat << EOF > "${TMP}/package/x.py"
+def x():
+  print("x")
+EOF
+cat << EOF > "${TMP}/package/subpackage/__init__.py"
+from .y import y
+EOF
+cat << EOF > "${TMP}/package/subpackage/y.py"
+def y():
+  print("y")
+EOF
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume ls : :package :package/subpackage
+$MPREMOTE resume exec "import package; package.x(); package.y()"
+
+
+# Same thing except with a destination directory name.
+echo -----
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume cp -r "${TMP}/package" :package2
+$MPREMOTE resume ls : :package2 :package2/subpackage
+$MPREMOTE resume exec "import package2; package2.x(); package2.y()"
+
+
+# Copy to an existing directory, it will be copied inside.
+echo -----
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume mkdir :test
+$MPREMOTE resume cp -r "${TMP}/package" :test
+$MPREMOTE resume ls :test :test/package :test/package/subpackage
+
+# Copy to non-existing sub-directory.
+echo -----
+$MPREMOTE resume cp -r "${TMP}/package" :test/package2
+$MPREMOTE resume ls :test :test/package2 :test/package2/subpackage
+
+# Copy from the device back to local.
+echo -----
+mkdir "${TMP}/copy"
+$MPREMOTE resume cp -r :test/package "${TMP}/copy"
+ls "${TMP}/copy" "${TMP}/copy/package" "${TMP}/copy/package/subpackage"
+
+# Copy from the device back to local with destination directory name.
+echo -----
+$MPREMOTE resume cp -r :test/package "${TMP}/copy/package2"
+ls "${TMP}/copy" "${TMP}/copy/package2" "${TMP}/copy/package2/subpackage"
+
+
+# Copy from device to another location on the device with destination directory name.
+echo -----
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume cp -r :package :package3
+$MPREMOTE resume ls : :package3 :package3/subpackage
+
+# Copy from device to another location on the device into an existing directory.
+echo -----
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume mkdir :package4
+$MPREMOTE resume cp -r :package :package4
+$MPREMOTE resume ls : :package4 :package4/package :package4/package/subpackage
+
+# Repeat an existing copy with one file modified.
+echo -----
+cat << EOF > "${TMP}/package/subpackage/y.py"
+def y():
+  print("y2")
+EOF
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume ls : :package :package/subpackage
+$MPREMOTE resume exec "import package; package.x(); package.y()"
diff --git a/tools/mpremote/tests/test_filesystem.sh.exp b/tools/mpremote/tests/test_filesystem.sh.exp
new file mode 100644
index 0000000000000..7220dc41e472c
--- /dev/null
+++ b/tools/mpremote/tests/test_filesystem.sh.exp
@@ -0,0 +1,183 @@
+-----
+ls :
+-----
+touch :a.py
+touch :b.py
+ls :
+           0 a.py
+           0 b.py
+sha256sum :a.py
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  -
+-----
+cp ${TMP}/a.py :
+cp ${TMP}/a.py :b.py
+cp ${TMP}/a.py :c.py
+cp :a.py :d.py
+ls :
+          30 a.py
+          30 b.py
+          30 c.py
+          30 d.py
+Hello
+World
+Hello
+World
+Hello
+World
+sha256sum :a.py
+50f0a701dd6cd6125387b96515300c9d5294c006518f8e62fa9eea3b66587f21
+50f0a701dd6cd6125387b96515300c9d5294c006518f8e62fa9eea3b66587f21  -
+-----
+mkdir :aaa
+mkdir :bbb
+cp ${TMP}/a.py :aaa
+cp ${TMP}/a.py :bbb/b.py
+print("Hello")
+print("World")
+print("Hello")
+print("World")
+-----
+rm :b.py
+rm :c.py
+ls :
+          30 a.py
+          30 d.py
+           0 aaa/
+           0 bbb/
+rm :aaa/a.py
+rm :bbb/b.py
+rmdir :aaa
+rmdir :bbb
+ls :
+          30 a.py
+          30 d.py
+-----
+edit :d.py
+sha256sum :d.py
+612c7ddb88390ac86b4174b26a6e5b52fc2f2838b234efd8f6f7c41631a49d04
+Goodbye
+World
+-----
+cp ${TMP}/package :
+ls :
+           0 package/
+ls :package
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+ls :package/subpackage
+          17 __init__.py
+          22 y.py
+x
+y
+-----
+cp ${TMP}/package :package2
+ls :
+           0 package2/
+ls :package2
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+ls :package2/subpackage
+          17 __init__.py
+          22 y.py
+x
+y
+-----
+mkdir :test
+cp ${TMP}/package :test
+ls :test
+           0 package/
+ls :test/package
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+ls :test/package/subpackage
+          17 __init__.py
+          22 y.py
+-----
+cp ${TMP}/package :test/package2
+ls :test
+           0 package/
+           0 package2/
+ls :test/package2
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+ls :test/package2/subpackage
+          17 __init__.py
+          22 y.py
+-----
+cp :test/package ${TMP}/copy
+${TMP}/copy:
+package
+
+${TMP}/copy/package:
+__init__.py
+subpackage
+x.py
+
+${TMP}/copy/package/subpackage:
+__init__.py
+y.py
+-----
+cp :test/package ${TMP}/copy/package2
+${TMP}/copy:
+package
+package2
+
+${TMP}/copy/package2:
+__init__.py
+subpackage
+x.py
+
+${TMP}/copy/package2/subpackage:
+__init__.py
+y.py
+-----
+cp ${TMP}/package :
+cp :package :package3
+ls :
+           0 package/
+           0 package3/
+ls :package3
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+ls :package3/subpackage
+          17 __init__.py
+          22 y.py
+-----
+cp ${TMP}/package :
+mkdir :package4
+cp :package :package4
+ls :
+           0 package/
+           0 package4/
+ls :package4
+           0 package/
+ls :package4/package
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+ls :package4/package/subpackage
+          17 __init__.py
+          22 y.py
+-----
+cp ${TMP}/package :
+Up to date: ./package/__init__.py
+Up to date: ./package/subpackage/__init__.py
+Up to date: ./package/x.py
+ls :
+           0 package/
+           0 package4/
+ls :package
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+ls :package/subpackage
+          17 __init__.py
+          23 y.py
+x
+y2
diff --git a/tools/mpremote/tests/test_mount.sh b/tools/mpremote/tests/test_mount.sh
new file mode 100755
index 0000000000000..9eab0b0d6e8c5
--- /dev/null
+++ b/tools/mpremote/tests/test_mount.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+
+# Create a local directory structure and mount the parent directory on the device.
+echo -----
+mkdir -p "${TMP}/mount_package"
+mkdir -p "${TMP}/mount_package/subpackage"
+cat << EOF > "${TMP}/mount_package/__init__.py"
+from .x import x
+from .subpackage import y
+EOF
+cat << EOF > "${TMP}/mount_package/x.py"
+def x():
+  print("x")
+EOF
+cat << EOF > "${TMP}/mount_package/subpackage/__init__.py"
+from .y import y
+EOF
+cat << EOF > "${TMP}/mount_package/subpackage/y.py"
+def y():
+  print("y")
+EOF
+$MPREMOTE mount ${TMP} exec "import mount_package; mount_package.x(); mount_package.y()"
+
+# Write to a file on the device and see that it's written locally.
+echo -----
+$MPREMOTE mount ${TMP} exec "open('test.txt', 'w').write('hello world\n')"
+cat "${TMP}/test.txt"
diff --git a/tools/mpremote/tests/test_mount.sh.exp b/tools/mpremote/tests/test_mount.sh.exp
new file mode 100644
index 0000000000000..560f5e4f10a9b
--- /dev/null
+++ b/tools/mpremote/tests/test_mount.sh.exp
@@ -0,0 +1,7 @@
+-----
+x
+y
+Local directory ${TMP} is mounted at /remote
+-----
+Local directory ${TMP} is mounted at /remote
+hello world
diff --git a/tools/mpremote/tests/test_recursive_cp.sh b/tools/mpremote/tests/test_recursive_cp.sh
new file mode 100755
index 0000000000000..397b5fd576717
--- /dev/null
+++ b/tools/mpremote/tests/test_recursive_cp.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+
+echo -----
+mkdir -p $TMP/a $TMP/a/b
+touch $TMP/a/x.py $TMP/a/b/y.py
+ls $TMP/a | sort
+ls $TMP/a/b | sort
+
+# TODO
+echo -----
+touch $TMP/y.py
+ls $TMP | sort
+
+# Recursive copy to a directory that doesn't exist. The source directory will
+# be copied to the destination (i.e. bX will the same as a).
+echo -----
+cp -r $TMP/a $TMP/b1
+cp -r $TMP/a/ $TMP/b2
+cp -r $TMP/a $TMP/b3/
+cp -r $TMP/a/ $TMP/b4/
+
+# Recursive copy to a directory that does exist. The source directory will be
+# copied into the destination (i.e. bX will contain a copy of a).
+echo -----
+mkdir $TMP/c{1,2,3,4}
+cp -r $TMP/a $TMP/c1
+cp -r $TMP/a/ $TMP/c2
+cp -r $TMP/a $TMP/c3/
+cp -r $TMP/a/ $TMP/c4/
+
+echo -----
+find $TMP | sort
+
+echo -----
+rm -rf $TMP/b{1,2,3,4} $TMP/c{1,2,3,4}
+
+
+
+# Now replicate the same thing using `mpremote cp`.
+
+# Recursive copy to a directory that doesn't exist. The source directory will
+# be copied to the destination (i.e. bX will the same as a).
+echo -----
+$MPREMOTE cp --no-verbose -r $TMP/a $TMP/b1
+$MPREMOTE cp --no-verbose -r $TMP/a/ $TMP/b2
+$MPREMOTE cp --no-verbose -r $TMP/a $TMP/b3/
+$MPREMOTE cp --no-verbose -r $TMP/a/ $TMP/b4/
+
+# Recursive copy to a directory that does exist. The source directory will be
+# copied into the destination (i.e. bX will contain a copy of a).
+echo -----
+mkdir $TMP/c{1,2,3,4}
+$MPREMOTE cp --no-verbose -r $TMP/a $TMP/c1
+$MPREMOTE cp --no-verbose -r $TMP/a/ $TMP/c2
+$MPREMOTE cp --no-verbose -r $TMP/a $TMP/c3/
+$MPREMOTE cp --no-verbose -r $TMP/a/ $TMP/c4/
+
+echo -----
+find $TMP | sort
diff --git a/tools/mpremote/tests/test_recursive_cp.sh.exp b/tools/mpremote/tests/test_recursive_cp.sh.exp
new file mode 100644
index 0000000000000..3b787dfe7b36e
--- /dev/null
+++ b/tools/mpremote/tests/test_recursive_cp.sh.exp
@@ -0,0 +1,98 @@
+-----
+b
+x.py
+y.py
+-----
+a
+y.py
+-----
+-----
+-----
+${TMP}
+${TMP}/a
+${TMP}/a/b
+${TMP}/a/b/y.py
+${TMP}/a/x.py
+${TMP}/b1
+${TMP}/b1/b
+${TMP}/b1/b/y.py
+${TMP}/b1/x.py
+${TMP}/b2
+${TMP}/b2/b
+${TMP}/b2/b/y.py
+${TMP}/b2/x.py
+${TMP}/b3
+${TMP}/b3/b
+${TMP}/b3/b/y.py
+${TMP}/b3/x.py
+${TMP}/b4
+${TMP}/b4/b
+${TMP}/b4/b/y.py
+${TMP}/b4/x.py
+${TMP}/c1
+${TMP}/c1/a
+${TMP}/c1/a/b
+${TMP}/c1/a/b/y.py
+${TMP}/c1/a/x.py
+${TMP}/c2
+${TMP}/c2/a
+${TMP}/c2/a/b
+${TMP}/c2/a/b/y.py
+${TMP}/c2/a/x.py
+${TMP}/c3
+${TMP}/c3/a
+${TMP}/c3/a/b
+${TMP}/c3/a/b/y.py
+${TMP}/c3/a/x.py
+${TMP}/c4
+${TMP}/c4/a
+${TMP}/c4/a/b
+${TMP}/c4/a/b/y.py
+${TMP}/c4/a/x.py
+${TMP}/y.py
+-----
+-----
+-----
+-----
+${TMP}
+${TMP}/a
+${TMP}/a/b
+${TMP}/a/b/y.py
+${TMP}/a/x.py
+${TMP}/b1
+${TMP}/b1/b
+${TMP}/b1/b/y.py
+${TMP}/b1/x.py
+${TMP}/b2
+${TMP}/b2/b
+${TMP}/b2/b/y.py
+${TMP}/b2/x.py
+${TMP}/b3
+${TMP}/b3/b
+${TMP}/b3/b/y.py
+${TMP}/b3/x.py
+${TMP}/b4
+${TMP}/b4/b
+${TMP}/b4/b/y.py
+${TMP}/b4/x.py
+${TMP}/c1
+${TMP}/c1/a
+${TMP}/c1/a/b
+${TMP}/c1/a/b/y.py
+${TMP}/c1/a/x.py
+${TMP}/c2
+${TMP}/c2/a
+${TMP}/c2/a/b
+${TMP}/c2/a/b/y.py
+${TMP}/c2/a/x.py
+${TMP}/c3
+${TMP}/c3/a
+${TMP}/c3/a/b
+${TMP}/c3/a/b/y.py
+${TMP}/c3/a/x.py
+${TMP}/c4
+${TMP}/c4/a
+${TMP}/c4/a/b
+${TMP}/c4/a/b/y.py
+${TMP}/c4/a/x.py
+${TMP}/y.py
diff --git a/tools/mpremote/tests/test_resume.sh b/tools/mpremote/tests/test_resume.sh
new file mode 100755
index 0000000000000..dfc351c83b753
--- /dev/null
+++ b/tools/mpremote/tests/test_resume.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# The eval command will continue the state of the exec.
+echo -----
+$MPREMOTE exec "a = 'hello'" eval "a"
+
+# Automatic soft reset. `a` will trigger NameError.
+echo -----
+$MPREMOTE eval "a" || true
+
+# Resume will skip soft reset.
+echo -----
+$MPREMOTE exec "a = 'resume'"
+$MPREMOTE resume eval "a"
+
+# The eval command will continue the state of the exec.
+echo -----
+$MPREMOTE exec "a = 'soft-reset'" eval "a" soft-reset eval "1+1" eval "a" || true
+
+# A disconnect will trigger auto-reconnect.
+echo -----
+$MPREMOTE eval "1+2" disconnect eval "2+3"
diff --git a/tools/mpremote/tests/test_resume.sh.exp b/tools/mpremote/tests/test_resume.sh.exp
new file mode 100644
index 0000000000000..20c75928a07f9
--- /dev/null
+++ b/tools/mpremote/tests/test_resume.sh.exp
@@ -0,0 +1,17 @@
+-----
+hello
+-----
+Traceback (most recent call last):
+  File "<stdin>", line 1, in <module>
+NameError: name 'a' isn't defined
+-----
+resume
+-----
+soft-reset
+2
+Traceback (most recent call last):
+  File "<stdin>", line 1, in <module>
+NameError: name 'a' isn't defined
+-----
+3
+5

From a25b6b9c65a587f534f802f821b30972de29e2af Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 27 Sep 2024 12:37:18 +1000
Subject: [PATCH 1504/3129] tools/mpremote: Add option to force copy.

This adds a -f/--force option to the "cp" command, which forces
unconditional copies, in particular does not check the hash.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/commands.py | 12 +++++++-----
 tools/mpremote/mpremote/main.py     |  7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 1f3a89a845f72..2b1acea438084 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -184,7 +184,7 @@ def do_filesystem_cp(state, src, dest, multiple, check_hash=False):
             f.write(data)
 
 
-def do_filesystem_recursive_cp(state, src, dest, multiple):
+def do_filesystem_recursive_cp(state, src, dest, multiple, check_hash):
     # Ignore trailing / on both src and dest. (Unix cp ignores them too)
     src = src.rstrip("/" + os.path.sep + (os.path.altsep if os.path.altsep else ""))
     dest = dest.rstrip("/" + os.path.sep + (os.path.altsep if os.path.altsep else ""))
@@ -257,7 +257,7 @@ def _list_recursive(base, src_path, dest_path, src_join_fun, src_isdir_fun, src_
 
     # If no directories were encountered then we must have just had a file.
     if not dirs:
-        return do_filesystem_cp(state, src, dest, multiple)
+        return do_filesystem_cp(state, src, dest, multiple, check_hash)
 
     def _mkdir(a, *b):
         try:
@@ -287,7 +287,7 @@ def _mkdir(a, *b):
         else:
             dest_path_joined = os.path.join(dest, *dest_path_split)
 
-        do_filesystem_cp(state, src_path_joined, dest_path_joined, multiple=False, check_hash=True)
+        do_filesystem_cp(state, src_path_joined, dest_path_joined, False, check_hash)
 
 
 def do_filesystem(state, args):
@@ -352,9 +352,11 @@ def do_filesystem(state, args):
                 print(digest.hex())
             elif command == "cp":
                 if args.recursive:
-                    do_filesystem_recursive_cp(state, path, cp_dest, len(paths) > 1)
+                    do_filesystem_recursive_cp(
+                        state, path, cp_dest, len(paths) > 1, not args.force
+                    )
                 else:
-                    do_filesystem_cp(state, path, cp_dest, len(paths) > 1)
+                    do_filesystem_cp(state, path, cp_dest, len(paths) > 1, not args.force)
     except FileNotFoundError as er:
         raise CommandError("{}: {}: No such file or directory.".format(command, er.args[0]))
     except IsADirectoryError as er:
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index c5e73b1cc03ac..8c0a6cd224c32 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -182,6 +182,13 @@ def argparse_rtc():
 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,
+        "force",
+        "f",
+        False,
+        "force copy even if file is unchanged (for cp command only)",
+    )
     _bool_flag(
         cmd_parser,
         "verbose",

From e5eeaa7df894b5062c189f5d8da44c67550cf43a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 27 Sep 2024 13:10:32 +1000
Subject: [PATCH 1505/3129] docs/reference/mpremote: Update docs to mention new
 features.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpremote.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 3ed8a3dbc3be5..4d86f0080b117 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -227,11 +227,12 @@ The full list of supported commands are:
   - ``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
+  - ``cp [-rf] <src...> <dest>`` to copy files
   - ``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)
+  - ``sha256sum <file..>`` to calculate the SHA256 sum of files
 
   The ``cp`` command uses a convention where a leading ``:`` represents a remote
   path. Without a leading ``:`` means a local path. This is based on the
@@ -256,6 +257,11 @@ The full list of supported commands are:
   This will copy the file to the device then enter the REPL. The ``+`` prevents
   ``"repl"`` being interpreted as a path.
 
+  The ``cp`` command supports the ``-r`` option to make a recursive copy.  By
+  default ``cp`` will skip copying files to the remote device if the SHA256 hash
+  of the source and destination file matches.  To force a copy regardless of the
+  hash use the ``-f`` option.
+
   **Note:** For convenience, all of the filesystem sub-commands are also
   :ref:`aliased as regular commands <mpremote_shortcuts>`, i.e. you can write
   ``mpremote cp ...`` instead of ``mpremote fs cp ...``.

From 6d799378bad4474e77ddb2fa2187ecd6e290e0ba Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 26 Jun 2023 11:53:28 +1000
Subject: [PATCH 1506/3129] esp32: Add support for esp32c6.

This commit adds general support for ESP32-C6 SoCs.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 README.md                                  |  2 +-
 docs/esp32/quickref.rst                    |  6 ++---
 ports/esp32/boards/deploy_c6.md            | 14 ++++++++++
 ports/esp32/esp32_common.cmake             |  2 +-
 ports/esp32/gccollect.c                    |  7 ++---
 ports/esp32/machine_adc.c                  |  4 +--
 ports/esp32/machine_adc_block.c            |  2 +-
 ports/esp32/machine_bitstream.c            |  2 +-
 ports/esp32/machine_hw_spi.c               | 14 +++++-----
 ports/esp32/machine_i2c.c                  |  2 +-
 ports/esp32/machine_pin.c                  |  9 +++++--
 ports/esp32/machine_pin.h                  | 30 ++++++++++++++++++++++
 ports/esp32/machine_pwm.c                  |  4 +++
 ports/esp32/main_esp32c3/CMakeLists.txt    |  1 +
 ports/esp32/main_esp32c6/CMakeLists.txt    | 14 ++++++++++
 ports/esp32/main_esp32c6/idf_component.yml |  5 ++++
 ports/esp32/main_esp32c6/linker.lf         |  1 +
 ports/esp32/modesp32.c                     |  1 -
 ports/esp32/modmachine.c                   | 13 +++++-----
 ports/esp32/mpconfigport.h                 | 16 +++++-------
 ports/esp32/mphalport.h                    |  2 +-
 21 files changed, 112 insertions(+), 39 deletions(-)
 create mode 100644 ports/esp32/boards/deploy_c6.md
 mode change 100755 => 100644 ports/esp32/machine_i2c.c
 create mode 100644 ports/esp32/main_esp32c6/CMakeLists.txt
 create mode 100644 ports/esp32/main_esp32c6/idf_component.yml
 create mode 100644 ports/esp32/main_esp32c6/linker.lf

diff --git a/README.md b/README.md
index c71fa4b1ddf48..c78a2384604fe 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ 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).
+ - [esp32](ports/esp32) -- Espressif ESP32 SoC (including ESP32S2, ESP32S3, ESP32C3, ESP32C6).
  - [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.
diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 3d3fbe0b1ab34..3ab4e8f5ecd96 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -18,7 +18,7 @@ working with this board it may be useful to get an overview of the microcontroll
    general.rst
    tutorial/index.rst
 
-Note that there are several varieties of ESP32 -- ESP32, ESP32C3, ESP32S2, ESP32S3 --
+Note that there are several varieties of ESP32 -- ESP32, ESP32C3, ESP32C6, ESP32S2, ESP32S3 --
 supported by MicroPython, with some differences in functionality between them.
 
 Installing MicroPython
@@ -61,13 +61,13 @@ The :mod:`esp32` module::
     import esp32
 
     esp32.raw_temperature() # read the internal temperature of the MCU, in Fahrenheit
-    esp32.ULP()             # access to the Ultra-Low-Power Co-processor, not on ESP32C3
+    esp32.ULP()             # access to the Ultra-Low-Power Co-processor, not on ESP32C3/C6
 
 Note that the temperature sensor in the ESP32 will typically read higher than
 ambient due to the IC getting warm while it runs.  This effect can be minimised
 by reading the temperature sensor immediately after waking up from sleep.
 
-ESP32C3, ESP32S2, and ESP32S3 also have an internal temperature sensor available.
+ESP32C3, ESP32C6, ESP32S2, and ESP32S3 also have an internal temperature sensor available.
 It is implemented a bit differently to the ESP32 and returns the temperature in
 Celsius::
 
diff --git a/ports/esp32/boards/deploy_c6.md b/ports/esp32/boards/deploy_c6.md
new file mode 100644
index 0000000000000..941c69cdefb34
--- /dev/null
+++ b/ports/esp32/boards/deploy_c6.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 esp32c6 --port /dev/ttyUSB0 erase_flash
+```
+
+From then on program the firmware starting at address 0x0:
+
+```bash
+esptool.py --chip esp32c6 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x0 ESP32_GENERIC_C6-20240602-v1.24.0.bin
+```
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index e59e2dcd7a444..2c81e8c2b3a50 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -198,7 +198,7 @@ idf_component_register(
 set(MICROPY_TARGET ${COMPONENT_TARGET})
 
 # Define mpy-cross flags, for use with frozen code.
-if(NOT IDF_TARGET STREQUAL "esp32c3")
+if(CONFIG_IDF_TARGET_ARCH STREQUAL "xtensa")
 set(MICROPY_CROSS_FLAGS -march=xtensawin)
 endif()
 
diff --git a/ports/esp32/gccollect.c b/ports/esp32/gccollect.c
index 4b6dd8ab61d83..e6c17fda602c3 100644
--- a/ports/esp32/gccollect.c
+++ b/ports/esp32/gccollect.c
@@ -35,7 +35,7 @@
 #include "py/mpthread.h"
 #include "gccollect.h"
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ARCH_XTENSA
 
 #include "xtensa/hal.h"
 
@@ -61,8 +61,7 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-#elif CONFIG_IDF_TARGET_ESP32C3
-
+#elif CONFIG_IDF_TARGET_ARCH_RISCV
 #include "shared/runtime/gchelper.h"
 
 void gc_collect(void) {
@@ -74,6 +73,8 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
+#else
+#error unknown CONFIG_IDF_TARGET_ARCH
 #endif
 
 #if MICROPY_GC_SPLIT_HEAP_AUTO
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 0ac9f5d266d9c..2f276836fe093 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -44,7 +44,7 @@
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_9_10_11
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_12 \
     { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(12) },
 #else
@@ -87,7 +87,7 @@ static const machine_adc_obj_t madc_obj[] = {
     {{&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
+    #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
     {{&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},
diff --git a/ports/esp32/machine_adc_block.c b/ports/esp32/machine_adc_block.c
index c610233900569..6afdd6f87f337 100644
--- a/ports/esp32/machine_adc_block.c
+++ b/ports/esp32/machine_adc_block.c
@@ -35,7 +35,7 @@ machine_adc_block_obj_t madcblock_obj[] = {
     #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
     {{&machine_adc_block_type}, ADC_UNIT_1, 12, -1, {0}},
     {{&machine_adc_block_type}, ADC_UNIT_2, 12, -1, {0}},
-    #elif CONFIG_IDF_TARGET_ESP32S2
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C6
     {{&machine_adc_block_type}, ADC_UNIT_1, 13, -1, {0}},
     {{&machine_adc_block_type}, ADC_UNIT_2, 13, -1, {0}},
     #endif
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index ceb1e6ad14291..b4e58c51f4d19 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -42,7 +42,7 @@
 // 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 !CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
     if (pin >= 32) {
         pin_mask = 1 << (pin - 32);
         gpio_reg_set = GPIO_OUT1_W1TS_REG;
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index a0531b95f8eaa..4b3d392cbdae2 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -38,10 +38,10 @@
 #include "soc/spi_pins.h"
 
 // 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
+// upython   | ESP32     | ESP32S2   | ESP32S3 | ESP32C3 | ESP32C6
+// ----------+-----------+-----------+---------+---------+---------
+// SPI(id=1) | HSPI/SPI2 | FSPI/SPI2 | SPI2    | SPI2    | SPI2
+// SPI(id=2) | VSPI/SPI3 | HSPI/SPI3 | SPI3    | err     | err
 
 // Number of available hardware SPI peripherals.
 #if SOC_SPI_PERIPH_NUM > 2
@@ -251,14 +251,14 @@ static void machine_hw_spi_init_internal(machine_hw_spi_obj_t *self, mp_arg_val_
 
     // 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 CONFIG_IDF_TARGET_ESP32
     if (self->host == SPI2_HOST) {
         dma_chan = 1;
     } else {
         dma_chan = 2;
     }
+    #else
+    dma_chan = SPI_DMA_CH_AUTO;
     #endif
 
     ret = spi_bus_initialize(self->host, &buscfg, dma_chan);
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
old mode 100755
new mode 100644
index fe42d2e8c27cc..e1e1850da57cd
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -49,7 +49,7 @@
 #endif
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
 #define I2C_SCLK_FREQ XTAL_CLK_FREQ
 #elif CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
 #define I2C_SCLK_FREQ APB_CLK_FREQ
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index e48546ec08de1..687dfe1938dae 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -43,7 +43,7 @@
 #include "modesp32.h"
 #include "genhdr/pins.h"
 
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
 #include "soc/usb_serial_jtag_reg.h"
 #endif
 
@@ -152,7 +152,7 @@ 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(index)) {
-            #if !CONFIG_IDF_TARGET_ESP32C3
+            #if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
             rtc_gpio_deinit(index);
             #endif
         }
@@ -163,6 +163,11 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
+    #if CONFIG_IDF_TARGET_ESP32C6 && CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    if (index == 12 || index == 13) {
+        CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
+    }
+    #endif
 
     // configure the pin for gpio
     esp_rom_gpio_pad_select_gpio(index);
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
index 1d64e7f413e4f..3f94508e015f8 100644
--- a/ports/esp32/machine_pin.h
+++ b/ports/esp32/machine_pin.h
@@ -94,6 +94,36 @@
 #define MICROPY_HW_ENABLE_GPIO20 (1)
 #define MICROPY_HW_ENABLE_GPIO21 (1)
 
+#elif CONFIG_IDF_TARGET_ESP32C6
+
+#define MICROPY_HW_ENABLE_GPIO0 (1)
+#define MICROPY_HW_ENABLE_GPIO1 (1)
+#define MICROPY_HW_ENABLE_GPIO2 (1)
+#define MICROPY_HW_ENABLE_GPIO3 (1)
+#define MICROPY_HW_ENABLE_GPIO4 (1)
+#define MICROPY_HW_ENABLE_GPIO5 (1)
+#define MICROPY_HW_ENABLE_GPIO6 (1)
+#define MICROPY_HW_ENABLE_GPIO7 (1)
+#define MICROPY_HW_ENABLE_GPIO8 (1)
+#define MICROPY_HW_ENABLE_GPIO9 (1)
+#define MICROPY_HW_ENABLE_GPIO10 (1)
+#define MICROPY_HW_ENABLE_GPIO11 (1)
+#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#define MICROPY_HW_ENABLE_GPIO12 (1)
+#define MICROPY_HW_ENABLE_GPIO13 (1)
+#endif
+#define MICROPY_HW_ENABLE_GPIO14 (1)
+#define MICROPY_HW_ENABLE_GPIO15 (1)
+#define MICROPY_HW_ENABLE_GPIO16 (1)
+#define MICROPY_HW_ENABLE_GPIO17 (1)
+#define MICROPY_HW_ENABLE_GPIO18 (1)
+#define MICROPY_HW_ENABLE_GPIO19 (1)
+#define MICROPY_HW_ENABLE_GPIO20 (1)
+#define MICROPY_HW_ENABLE_GPIO21 (1)
+#define MICROPY_HW_ENABLE_GPIO22 (1)
+#define MICROPY_HW_ENABLE_GPIO23 (1)
+// GPIO 24-30 are used for spi/sip flash.
+
 #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 
 #define MICROPY_HW_ENABLE_GPIO0 (1)
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index e5d8986c8a839..71402e1c49e44 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -241,7 +241,11 @@ static void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         // Configure the new resolution and frequency
         timer->duty_resolution = res;
         timer->freq_hz = freq;
+        #if SOC_LEDC_SUPPORT_XTAL_CLOCK
+        timer->clk_cfg = LEDC_USE_XTAL_CLK;
+        #else
         timer->clk_cfg = LEDC_USE_APB_CLK;
+        #endif
         #if SOC_LEDC_SUPPORT_REF_TICK
         if (freq < EMPIRIC_FREQ) {
             timer->clk_cfg = LEDC_USE_REF_TICK;
diff --git a/ports/esp32/main_esp32c3/CMakeLists.txt b/ports/esp32/main_esp32c3/CMakeLists.txt
index c9f1e5bcb49cd..307c0f32183a9 100644
--- a/ports/esp32/main_esp32c3/CMakeLists.txt
+++ b/ports/esp32/main_esp32c3/CMakeLists.txt
@@ -9,5 +9,6 @@ if(NOT MICROPY_PORT_DIR)
 endif()
 
 list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
+list(APPEND IDF_COMPONENTS riscv)
 
 include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32c6/CMakeLists.txt b/ports/esp32/main_esp32c6/CMakeLists.txt
new file mode 100644
index 0000000000000..307c0f32183a9
--- /dev/null
+++ b/ports/esp32/main_esp32c6/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Set location of base MicroPython directory.
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
+endif()
+
+# Set location of the ESP32 port directory.
+if(NOT MICROPY_PORT_DIR)
+    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
+endif()
+
+list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
+list(APPEND IDF_COMPONENTS riscv)
+
+include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32c6/idf_component.yml b/ports/esp32/main_esp32c6/idf_component.yml
new file mode 100644
index 0000000000000..5bbab6d8c3bd8
--- /dev/null
+++ b/ports/esp32/main_esp32c6/idf_component.yml
@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns: "~1.1.0"
+  idf:
+    version: ">=5.1.0"
diff --git a/ports/esp32/main_esp32c6/linker.lf b/ports/esp32/main_esp32c6/linker.lf
new file mode 100644
index 0000000000000..cedabcf979350
--- /dev/null
+++ b/ports/esp32/main_esp32c6/linker.lf
@@ -0,0 +1 @@
+# Empty linker fragment (no workaround required for C6, see main_esp32/linker.lf).
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 1ee9153d7d620..e6e6779d8d625 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -29,7 +29,6 @@
 
 #include <time.h>
 #include <sys/time.h>
-#include "soc/rtc_cntl_reg.h"
 #include "driver/gpio.h"
 #include "driver/adc.h"
 #include "esp_heap_caps.h"
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 5e05a261b70c7..d77b83192738f 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -90,9 +90,8 @@ typedef enum {
 
 static bool is_soft_reset = 0;
 
-#if CONFIG_IDF_TARGET_ESP32C3
-int esp_clk_cpu_freq(void);
-#endif
+// Note: this is from a private IDF header
+extern int esp_clk_cpu_freq(void);
 
 static mp_obj_t mp_machine_get_freq(void) {
     return mp_obj_new_int(esp_rom_get_cpu_ticks_per_us() * 1000000);
@@ -101,11 +100,11 @@ static mp_obj_t mp_machine_get_freq(void) {
 static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
     if (freq != 20 && freq != 40 && freq != 80 && freq != 160
-        #if !CONFIG_IDF_TARGET_ESP32C3
+        #if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
         && freq != 240
         #endif
         ) {
-        #if CONFIG_IDF_TARGET_ESP32C3
+        #if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
         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"));
@@ -118,6 +117,8 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     esp_pm_config_esp32_t pm;
     #elif CONFIG_IDF_TARGET_ESP32C3
     esp_pm_config_esp32c3_t pm;
+    #elif CONFIG_IDF_TARGET_ESP32C6
+    esp_pm_config_esp32c6_t pm;
     #elif CONFIG_IDF_TARGET_ESP32S2
     esp_pm_config_esp32s2_t pm;
     #elif CONFIG_IDF_TARGET_ESP32S3
@@ -146,7 +147,7 @@ static void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_
         esp_sleep_enable_timer_wakeup(((uint64_t)expiry) * 1000);
     }
 
-    #if !CONFIG_IDF_TARGET_ESP32C3
+    #if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
 
     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);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 4c94fd16e2c58..1c5789d0bd895 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -18,7 +18,7 @@
 
 // object representation and NLR handling
 #define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
-#if !CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ARCH_XTENSA
 #define MICROPY_NLR_SETJMP                  (1)
 #endif
 
@@ -41,10 +41,10 @@
 
 // emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
-#if !CONFIG_IDF_TARGET_ESP32C3
-#define MICROPY_EMIT_XTENSAWIN              (1)
-#else
+#if CONFIG_IDF_TARGET_ARCH_RISCV
 #define MICROPY_EMIT_RV32                   (1)
+#else
+#define MICROPY_EMIT_XTENSAWIN              (1)
 #endif
 
 // optimisations
@@ -161,6 +161,8 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32s3"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c3"
+#elif CONFIG_IDF_TARGET_ESP32C6
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c6"
 #endif
 #endif
 #define MICROPY_PY_NETWORK_INCLUDEFILE      "ports/esp32/modnetwork.h"
@@ -364,11 +366,7 @@ void boardctrl_startup(void);
 
 #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
+#define MICROPY_PY_NETWORK_LAN_SPI_CLOCK_SPEED_MZ       (20)
 #endif
 #endif
 
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 9a7c39487d808..f95cf210de454 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -73,7 +73,7 @@ void check_esp_err_(esp_err_t code, const char *func, const int line, const char
 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
+    #if CONFIG_IDF_TARGET_ARCH_RISCV
     __asm__ __volatile__ ("csrr %0, 0x7E2" : "=r" (ccount)); // Machine Performance Counter Value
     #else
     __asm__ __volatile__ ("rsr %0,ccount" : "=a" (ccount));

From 32a2c87813b52d3a33629e4bfae297807761d149 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Wed, 27 Dec 2023 17:06:02 +0200
Subject: [PATCH 1507/3129] esp32/machine_adc: Make ADC 2 optional.

Signed-off-by: IhorNehrutsa <IhorNehrutsa@gmail.com>
---
 ports/esp32/machine_adc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 2f276836fe093..dc21b69083c61 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -148,11 +148,13 @@ static void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 }
 
 static void madc_atten_helper(const machine_adc_obj_t *self, mp_int_t atten) {
-    esp_err_t err;
+    esp_err_t err = ESP_FAIL;
     if (self->block->unit_id == ADC_UNIT_1) {
         err = adc1_config_channel_atten(self->channel_id, atten);
     } else {
+        #if SOC_ADC_PERIPH_NUM >= 2
         err = adc2_config_channel_atten(self->channel_id, atten);
+        #endif
     }
     if (err != ESP_OK) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid atten"));

From 958d20f3c0dbecdaf447df6dad6fd864ffabbb77 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Wed, 27 Dec 2023 17:07:38 +0200
Subject: [PATCH 1508/3129] esp32/machine_timer: Generalise timer clock
 configuration.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/machine_timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 7758584a85c0c..30e64eb334d37 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -155,7 +155,7 @@ void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr)) {
     // Initialise the timer.
     timer_hal_init(&self->hal_context, self->group, self->index);
     timer_ll_enable_counter(self->hal_context.dev, self->index, false);
-    timer_ll_set_clock_source(self->hal_context.dev, self->index, GPTIMER_CLK_SRC_APB);
+    timer_ll_set_clock_source(self->hal_context.dev, self->index, GPTIMER_CLK_SRC_DEFAULT);
     timer_ll_set_clock_prescale(self->hal_context.dev, self->index, TIMER_DIVIDER);
     timer_hal_set_counter_value(&self->hal_context, 0);
     timer_ll_set_count_direction(self->hal_context.dev, self->index, GPTIMER_COUNT_UP);

From a0f82a5f391e2e3ec15e61926e7babda3a3ef42a Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Wed, 27 Dec 2023 17:09:30 +0200
Subject: [PATCH 1509/3129] esp32/modesp32: Make gpio_deep_sleep_hold optional.

Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/modesp32.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index e6e6779d8d625..0a73a0faf06ef 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -137,6 +137,7 @@ static mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_ulp_obj, esp32_wake_on_ulp);
 
+#if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
 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();
@@ -146,6 +147,7 @@ static mp_obj_t esp32_gpio_deep_sleep_hold(const mp_obj_t enable) {
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_gpio_deep_sleep_hold_obj, esp32_gpio_deep_sleep_hold);
+#endif
 
 #if CONFIG_IDF_TARGET_ESP32
 
@@ -218,7 +220,9 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { 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) },
+    #if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
     { MP_ROM_QSTR(MP_QSTR_gpio_deep_sleep_hold), MP_ROM_PTR(&esp32_gpio_deep_sleep_hold_obj) },
+    #endif
     #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_raw_temperature), MP_ROM_PTR(&esp32_raw_temperature_obj) },
     #else

From 68e95c73d32b1a3c6ebd283c13882582907f58ef Mon Sep 17 00:00:00 2001
From: Andrea Milazzo <andrea@fonix.com>
Date: Tue, 12 Mar 2024 09:46:12 +0100
Subject: [PATCH 1510/3129] esp32/machine_uart: Add support for LP_UART.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/machine_uart.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index d260c45c48f80..cff942f39e723 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -453,12 +453,18 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
             self->rx = 9;
             self->tx = 10;
             break;
-        #if SOC_UART_NUM > 2
+        #if SOC_UART_HP_NUM > 2
         case UART_NUM_2:
             self->rx = 16;
             self->tx = 17;
             break;
         #endif
+        #if SOC_UART_LP_NUM >= 1
+        case LP_UART_NUM_0:
+            self->rx = 4;
+            self->tx = 5;
+        #endif
+
     }
 
     #if MICROPY_HW_ENABLE_UART_REPL

From 5aa115a4bc54a637c2357854e3e01ce7995e6ce8 Mon Sep 17 00:00:00 2001
From: dmfaria <dmfaria@gmail.com>
Date: Fri, 14 Jun 2024 15:43:26 -0300
Subject: [PATCH 1511/3129] esp32/adc: Set ADC to 12bit by default on esp32c6.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/adc.c               | 2 +-
 ports/esp32/machine_adc_block.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
index 91db9ec525fe1..ccf264e5c2ae3 100644
--- a/ports/esp32/adc.c
+++ b/ports/esp32/adc.c
@@ -45,7 +45,7 @@ void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t bits) {
             self->width = ADC_WIDTH_BIT_11;
             break;
         #endif
-        #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+        #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
         case 12:
             self->width = ADC_WIDTH_BIT_12;
             break;
diff --git a/ports/esp32/machine_adc_block.c b/ports/esp32/machine_adc_block.c
index 6afdd6f87f337..78c5b2491b8bf 100644
--- a/ports/esp32/machine_adc_block.c
+++ b/ports/esp32/machine_adc_block.c
@@ -32,10 +32,10 @@
 #include "driver/adc.h"
 
 machine_adc_block_obj_t madcblock_obj[] = {
-    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
     {{&machine_adc_block_type}, ADC_UNIT_1, 12, -1, {0}},
     {{&machine_adc_block_type}, ADC_UNIT_2, 12, -1, {0}},
-    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C6
+    #elif CONFIG_IDF_TARGET_ESP32S2
     {{&machine_adc_block_type}, ADC_UNIT_1, 13, -1, {0}},
     {{&machine_adc_block_type}, ADC_UNIT_2, 13, -1, {0}},
     #endif

From 2f798543376b7496e79d3e527d7682b7a9e88217 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 29 Mar 2024 06:35:05 +1100
Subject: [PATCH 1512/3129] esp32/Makefile: Only set port & baud for jobs that
 access hardware.

In idf v5.2.1 if the port flag is set it's validated even on jobs that
don't access hardware like clean.  This causes the job to fail if device
isn't connected.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 62b1faa571931..4ad3cf0267cda 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -35,6 +35,7 @@ endif
 ifneq ($(BAUD),)
 BAUD_ARG := -b $(BAUD)
 endif
+DEVICE += $(PORT_ARG) $(BAUD_ARG)
 
 PYTHON ?= python3
 
@@ -63,7 +64,7 @@ endif
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 define RUN_IDF_PY
-	idf.py $(IDFPY_FLAGS) -B $(BUILD) $(PORT_ARG) $(BAUD_ARG) $(1)
+	idf.py $(IDFPY_FLAGS) -B $(BUILD) $(1)
 endef
 
 all:
@@ -82,13 +83,13 @@ clean:
 	$(call RUN_IDF_PY,fullclean)
 
 deploy:
-	$(call RUN_IDF_PY,flash)
+	$(call RUN_IDF_PY,$(DEVICE) flash)
 
 erase:
-	$(call RUN_IDF_PY,erase-flash)
+	$(call RUN_IDF_PY,$(DEVICE) erase-flash)
 
 monitor:
-	$(call RUN_IDF_PY,monitor)
+	$(call RUN_IDF_PY,$(DEVICE) monitor)
 
 size:
 	$(call RUN_IDF_PY,size)

From 1bd312d73717ee3383128ba743d963caf6383652 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 24 Jan 2024 14:03:17 +1100
Subject: [PATCH 1513/3129] esp32/boards/ESP32_GENERIC_C6: Add new generic
 esp32c6 board.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 .../esp32/boards/ESP32_GENERIC_C6/board.json  | 19 +++++++++++++++++++
 .../ESP32_GENERIC_C6/mpconfigboard.cmake      |  7 +++++++
 .../boards/ESP32_GENERIC_C6/mpconfigboard.h   | 10 ++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C6/board.json
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h

diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/board.json b/ports/esp32/boards/ESP32_GENERIC_C6/board.json
new file mode 100644
index 0000000000000..963d9515be859
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/board.json
@@ -0,0 +1,19 @@
+{
+    "deploy": [
+        "../deploy_c6.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
+    "id": "esp32c6",
+    "images": [
+        "esp32c6_devkitmini.jpg"
+    ],
+    "mcu": "esp32c6",
+    "product": "ESP32-C6",
+    "thumbnail": "",
+    "url": "https://www.espressif.com/en/products/modules",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
new file mode 100644
index 0000000000000..4393130b61a43
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
@@ -0,0 +1,7 @@
+set(IDF_TARGET esp32c6)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.ble
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
new file mode 100644
index 0000000000000..be530ad3a87ba
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
@@ -0,0 +1,10 @@
+// This configuration is for a generic ESP32C6 board with 4MiB (or more) of flash.
+
+#define MICROPY_HW_BOARD_NAME               "ESP32C6 module"
+#define MICROPY_HW_MCU_NAME                 "ESP32C6"
+
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+#define MICROPY_PY_MACHINE_I2S              (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)

From ee92198c8aa7c58c0adfb0a0a54f285a61bf6167 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Wed, 1 May 2024 10:29:07 +1000
Subject: [PATCH 1514/3129] esp32/boards/M5STACK_NANOC6: Add new M5Stack C6
 board definition.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/esp32/boards/M5STACK_NANOC6/board.json  | 21 +++++++++++++++++++
 .../boards/M5STACK_NANOC6/deploy_nanoc6.md    | 18 ++++++++++++++++
 .../boards/M5STACK_NANOC6/mpconfigboard.cmake |  7 +++++++
 .../boards/M5STACK_NANOC6/mpconfigboard.h     |  8 +++++++
 ports/esp32/boards/M5STACK_NANOC6/pins.csv    |  7 +++++++
 5 files changed, 61 insertions(+)
 create mode 100644 ports/esp32/boards/M5STACK_NANOC6/board.json
 create mode 100644 ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md
 create mode 100644 ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
 create mode 100644 ports/esp32/boards/M5STACK_NANOC6/pins.csv

diff --git a/ports/esp32/boards/M5STACK_NANOC6/board.json b/ports/esp32/boards/M5STACK_NANOC6/board.json
new file mode 100644
index 0000000000000..15654341b44dc
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_NANOC6/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "deploy_nanoc6.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi",
+        "RGB LED",
+        "USB",
+        "USB-C",
+        "JST-PH"
+    ],
+    "images": [
+        "m5stack_nanoc6.jpg"
+    ],
+    "mcu": "esp32c6",
+    "product": "M5Stack NanoC6",
+    "url": "https://shop.m5stack.com/products/m5stack-nanoc6-dev-kit",
+    "vendor": "M5Stack"
+}
diff --git a/ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md b/ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md
new file mode 100644
index 0000000000000..d8c212c5d2980
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md
@@ -0,0 +1,18 @@
+Program your board using the esptool.py program, found
+[here](https://github.com/espressif/esptool).
+
+To put the NanoC6 into 'update mode', hold the button while connecting the USB
+cable. It can be released after the connection is made.
+
+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 esp32c6 --port /dev/ttyUSB0 erase_flash
+```
+
+From then on program the firmware starting at address 0x0:
+
+```bash
+esptool.py --chip esp32c6 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x0 M5STACK_NANOC6-20240602-v1.24.0.bin
+```
diff --git a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
new file mode 100644
index 0000000000000..4393130b61a43
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
@@ -0,0 +1,7 @@
+set(IDF_TARGET esp32c6)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.ble
+)
diff --git a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
new file mode 100644
index 0000000000000..9acab7096853b
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
@@ -0,0 +1,8 @@
+#define MICROPY_HW_BOARD_NAME    "M5Stack NanoC6"
+#define MICROPY_HW_MCU_NAME      "ESP32C6"
+
+#define MICROPY_HW_ENABLE_SDCARD (0)
+#define MICROPY_PY_MACHINE_I2S   (0)
+
+#define MICROPY_HW_I2C0_SCL      (1)
+#define MICROPY_HW_I2C0_SDA      (2)
diff --git a/ports/esp32/boards/M5STACK_NANOC6/pins.csv b/ports/esp32/boards/M5STACK_NANOC6/pins.csv
new file mode 100644
index 0000000000000..f04cfb4dbf053
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_NANOC6/pins.csv
@@ -0,0 +1,7 @@
+G1,GPIO1
+G2,GPIO2
+IR_LED,GPIO3
+LED_BLUE,GPIO7
+BUTTON,GPIO9
+NEOPIXEL_POWER,GPIO19
+NEOPIXEL,GPIO20

From ce397d85af2dc94e7136ee96b35f7678d1a52f0d Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Wed, 15 May 2024 00:09:31 +1000
Subject: [PATCH 1515/3129] esp32/boards/UM_TINYC6: Add new UM C6 board
 definition.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/esp32/boards/UM_TINYC6/board.json       | 22 ++++++++++++++++
 ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md | 18 +++++++++++++
 .../boards/UM_TINYC6/mpconfigboard.cmake      |  8 ++++++
 ports/esp32/boards/UM_TINYC6/mpconfigboard.h  | 12 +++++++++
 ports/esp32/boards/UM_TINYC6/pins.csv         | 26 +++++++++++++++++++
 ports/esp32/boards/UM_TINYC6/sdkconfig.board  | 10 +++++++
 6 files changed, 96 insertions(+)
 create mode 100644 ports/esp32/boards/UM_TINYC6/board.json
 create mode 100644 ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md
 create mode 100644 ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_TINYC6/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_TINYC6/pins.csv
 create mode 100644 ports/esp32/boards/UM_TINYC6/sdkconfig.board

diff --git a/ports/esp32/boards/UM_TINYC6/board.json b/ports/esp32/boards/UM_TINYC6/board.json
new file mode 100644
index 0000000000000..122b411a30487
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYC6/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "deploy_tinyc6.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "BLE",
+        "External Flash",
+        "WiFi",
+        "RGB LED",
+        "USB",
+        "USB-C"
+    ],
+    "images": [
+        "unexpectedmaker_tinyc6.jpg"
+    ],
+    "mcu": "esp32c6",
+    "product": "TinyC6",
+    "url": "https://tinyc6.io",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md b/ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md
new file mode 100644
index 0000000000000..4e0603a10772a
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md
@@ -0,0 +1,18 @@
+Program your board using the esptool.py program, found
+[here](https://github.com/espressif/esptool).
+
+To put the TinyC6 into 'download mode', hold the _BOOT_ button while connecting
+the USB cable. It can be released after the connection is made.
+
+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 esp32c6 --port /dev/ttyUSB0 erase_flash
+```
+
+From then on program the firmware starting at address 0x0:
+
+```bash
+esptool.py --chip esp32c6 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x0 UM_TINYC6-20240602-v1.24.0.bin
+```
diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
new file mode 100644
index 0000000000000..dab33d13f0bdb
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+set(IDF_TARGET esp32c6)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.ble
+    boards/UM_TINYC6/sdkconfig.board
+)
diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.h b/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
new file mode 100644
index 0000000000000..1a3f1c904a799
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME    "Unexpected Maker TinyC6"
+#define MICROPY_HW_MCU_NAME      "ESP32C6"
+
+#define MICROPY_HW_ENABLE_SDCARD (0)
+#define MICROPY_PY_MACHINE_I2S   (0)
+
+#define MICROPY_HW_I2C0_SCL      (7)
+#define MICROPY_HW_I2C0_SDA      (6)
+
+#define MICROPY_HW_SPI1_MOSI     (21)
+#define MICROPY_HW_SPI1_MISO     (20)
+#define MICROPY_HW_SPI1_SCK      (19)
diff --git a/ports/esp32/boards/UM_TINYC6/pins.csv b/ports/esp32/boards/UM_TINYC6/pins.csv
new file mode 100644
index 0000000000000..1eab19bc84f6a
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYC6/pins.csv
@@ -0,0 +1,26 @@
+IO0,GPIO0
+IO1,GPIO1
+IO2,GPIO2
+IO3,GPIO3
+IO4,GPIO4
+VBAT_SENSE,GPIO4
+IO5,GPIO5
+IO6,GPIO6
+SDA,GPIO6
+IO7,GPIO7
+SCL,GPIO7
+IO8,GPIO8
+IO9,GPIO9
+VBUS_SENSE,GPIO10
+IO11,GPIO11
+IO15,GPIO15
+IO16,GPIO16
+TX,GPIO16
+IO17,GPIO17
+RX,GPIO17
+IO18,GPIO18
+IO19,GPIO19
+IO20,GPIO20
+IO21,GPIO21
+NEOPIXEL_PWR,GPIO22
+NEOPIXEL_DATA,GPIO23
diff --git a/ports/esp32/boards/UM_TINYC6/sdkconfig.board b/ports/esp32/boards/UM_TINYC6/sdkconfig.board
new file mode 100644
index 0000000000000..7917467b12ea1
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYC6/sdkconfig.board
@@ -0,0 +1,10 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"

From 55dc482d3e439885bd38072bc602c3e0828f2406 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 8 Oct 2024 17:19:34 +1100
Subject: [PATCH 1516/3129] esp32/sdkconfig: Disable PMP_IDRAM_SPLIT to fix
 native emit support.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/boards/sdkconfig.base | 6 ++++++
 ports/esp32/mpconfigport.h        | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 84a423fa0ab7e..c7d326c89e8ae 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -127,3 +127,9 @@ CONFIG_ETH_SPI_ETHERNET_DM9051=y
 # formatting in ROM instead and should override this, check
 # ESP_ROM_HAS_NEWLIB_NANO_FORMAT.
 CONFIG_NEWLIB_NANO_FORMAT=y
+
+# IRAM/DRAM split protection is a memory protection feature on some parts
+# that support SOC_CPU_IDRAM_SPLIT_USING_PMP, eg. C2, C5, C6, H2
+# Due to limitations in the PMP system this feature breaks native emitters
+# so is disabled by default.
+CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT=n
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 1c5789d0bd895..e36d12bc056ac 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -42,7 +42,11 @@
 // emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
 #if CONFIG_IDF_TARGET_ARCH_RISCV
+#if CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT
+#define MICROPY_EMIT_RV32                   (0)
+#else
 #define MICROPY_EMIT_RV32                   (1)
+#endif
 #else
 #define MICROPY_EMIT_XTENSAWIN              (1)
 #endif
@@ -263,8 +267,12 @@
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
+#if SOC_CPU_IDRAM_SPLIT_USING_PMP && !CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT
+// On targets with this configuration all RAM is executable so no need for a custom commit function.
+#else
 void *esp_native_code_commit(void *, size_t, void *);
 #define MP_PLAT_COMMIT_EXEC(buf, len, reloc) esp_native_code_commit(buf, len, reloc)
+#endif
 #define MP_SSIZE_MAX (0x7fffffff)
 
 #if MICROPY_PY_SOCKET_EVENTS

From 197becbdcc0f8e6fd03ddaa921c32193a4a409db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Sep 2024 17:51:49 +1000
Subject: [PATCH 1517/3129] tests: Tweak machine SPI and UART tests to work
 with esp32c6.

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

diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
index 6ee4619fa1193..19371d3bd7f54 100644
--- a/tests/extmod/machine_spi_rate.py
+++ b/tests/extmod/machine_spi_rate.py
@@ -21,7 +21,8 @@
 elif "rp2" in sys.platform:
     spi_instances = ((0, Pin(18), Pin(19), Pin(16)),)
 elif "esp32" in sys.platform:
-    if "ESP32C3" in str(sys.implementation):
+    impl = str(sys.implementation)
+    if "ESP32C3" in impl or "ESP32C6" in impl:
         spi_instances = ((1, Pin(4), Pin(5), Pin(6)),)
     else:
         spi_instances = ((1, Pin(18), Pin(19), Pin(21)), (2, Pin(18), Pin(19), Pin(21)))
diff --git a/tests/extmod_hardware/machine_uart_irq_break.py b/tests/extmod_hardware/machine_uart_irq_break.py
index 82879c1d6e4a8..f255e0f0e6725 100644
--- a/tests/extmod_hardware/machine_uart_irq_break.py
+++ b/tests/extmod_hardware/machine_uart_irq_break.py
@@ -15,7 +15,8 @@
 
 # Configure pins based on the target.
 if "esp32" in sys.platform:
-    if "ESP32S2" in sys.implementation._machine or "ESP32C3" in sys.implementation._machine:
+    _machine = sys.implementation._machine
+    if "ESP32S2" in _machine or "ESP32C3" in _machine or "ESP32C6" in _machine:
         print("SKIP")
         raise SystemExit
     # ESP32 needs separate UART instances for the test

From 05ac69329d259b3853c2d3a89d669eba7f6eef46 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 25 Sep 2024 18:18:22 +1000
Subject: [PATCH 1518/3129] esp32: Fix hang in taskYIELD() on riscv CPUs when
 IRQs disabled.

Regression introduced in 337742f.

The hang occurs because the esp32 port was calling "from ISR" port-layer
functions to set/clear the interrupt mask. FreeRTOS kernel therefore
doesn't know the CPU is in a critical section. In taskYIELD() the riscv
port layer blocks after yielding until it knows the yield has happened, and
would block indefinitely if IRQs are disabled (until INT WDT triggers).

Moving to the "public" portENTER_CRITICAL/portEXIT_CRITICAL API means that
FreeRTOS knows we're in a critical section and can react accordingly.

Adds a regression test for this case (should be safe to run on all ports).

On single core CPUs, this should result in almost exactly the same
behaviour apart from fixing this case.

On dual core CPUs, we now have cross-CPU mutual exclusion for atomic
sections. This also shouldn't change anything, mostly because all the code
which enters an atomic section runs on the same CPU. If it does change
something, it will be to fix a thread safety bug.

There is some risk that this change triggers a FreeRTOS crash where there
is a call to a blocking FreeRTOS API with interrupts disabled. Previously
this code might have worked, but was probably thread unsafe and would have
hung in some circumstances.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/mphalport.c                 |  2 ++
 ports/esp32/mphalport.h                 | 23 ++++++++++++++++------
 tests/extmod/machine_disable_irq.py     | 26 +++++++++++++++++++++++++
 tests/extmod/machine_disable_irq.py.exp |  3 +++
 4 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 tests/extmod/machine_disable_irq.py
 create mode 100644 tests/extmod/machine_disable_irq.py.exp

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 999d77dad5737..59ec6d6b19133 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -57,6 +57,8 @@ TaskHandle_t mp_main_task_handle;
 static uint8_t stdin_ringbuf_array[260];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
+portMUX_TYPE mp_atomic_mux = portMUX_INITIALIZER_UNLOCKED;
+
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
 #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_NORMAL
 void check_esp_err_(esp_err_t code)
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index f95cf210de454..a908d784d7f61 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -54,6 +54,8 @@ extern TaskHandle_t mp_main_task_handle;
 
 extern ringbuf_t stdin_ringbuf;
 
+extern portMUX_TYPE mp_atomic_mux;
+
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
 #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_NORMAL
 #define check_esp_err(code) check_esp_err_(code)
@@ -63,12 +65,21 @@ void check_esp_err_(esp_err_t code);
 void check_esp_err_(esp_err_t code, const char *func, const int line, const char *file);
 #endif
 
-// Note: these "critical nested" macros do not ensure cross-CPU exclusion,
-// the only disable interrupts on the current CPU.  To full manage exclusion
-// one should use portENTER_CRITICAL/portEXIT_CRITICAL instead.
-#include "freertos/FreeRTOS.h"
-#define MICROPY_BEGIN_ATOMIC_SECTION() portSET_INTERRUPT_MASK_FROM_ISR()
-#define MICROPY_END_ATOMIC_SECTION(state) portCLEAR_INTERRUPT_MASK_FROM_ISR(state)
+static inline mp_uint_t mp_begin_atomic_section(void) {
+    portENTER_CRITICAL(&mp_atomic_mux);
+    return 0;
+}
+
+static inline void mp_end_atomic_section(mp_uint_t state) {
+    (void)state;
+    portEXIT_CRITICAL(&mp_atomic_mux);
+}
+
+// Note: These atomic macros disable interrupts on the calling CPU, and on SMP
+// systems also protect against concurrent access to an atomic section on the
+// other CPU.
+#define MICROPY_BEGIN_ATOMIC_SECTION() mp_begin_atomic_section()
+#define MICROPY_END_ATOMIC_SECTION(state) mp_end_atomic_section(state)
 
 uint32_t mp_hal_ticks_us(void);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
diff --git a/tests/extmod/machine_disable_irq.py b/tests/extmod/machine_disable_irq.py
new file mode 100644
index 0000000000000..3132128722277
--- /dev/null
+++ b/tests/extmod/machine_disable_irq.py
@@ -0,0 +1,26 @@
+# Test executing Python code while IRQs disabled.
+try:
+    from machine import disable_irq, enable_irq
+    from time import ticks_us
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+# Structured to also nest disable_irq() calls
+def f(n):
+    st_irq = disable_irq()
+    if n:
+        f(n - 1)
+    else:
+        # busy-wait in a tight loop for 1ms, to simulate doing some work in a critical section
+        # (can't wait for time_us() to increment as not all ports will "tick" with interrupts off.)
+        for _ in range(100):
+            ticks_us()
+    enable_irq(st_irq)
+
+
+for nest in range(3):
+    print(nest)
+    for _ in range(5):
+        f(nest)
diff --git a/tests/extmod/machine_disable_irq.py.exp b/tests/extmod/machine_disable_irq.py.exp
new file mode 100644
index 0000000000000..4539bbf2d22d5
--- /dev/null
+++ b/tests/extmod/machine_disable_irq.py.exp
@@ -0,0 +1,3 @@
+0
+1
+2

From 82e69df33e379bf491bea647e217d6d56c5b8090 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 2 Oct 2024 14:49:49 +1000
Subject: [PATCH 1519/3129] esp32: Apply the LWIP active TCP socket limit.

This is a workaround for a bug in ESP-IDF where the configuration setting
for maximum active TCP sockets (PCBs) is not applied.

Fixes cases where a lot of short-lived TCP connections can cause:

- Excessive memory usage (unbounded number of sockets in TIME-WAIT).
- Much higher risk of stalled connections due to repeated port numbers. The
  maximum number of active TCP PCBs is reduced from 16 to 12 to further
  reduce this risk (trade-off against possibility of TIME-WAIT
  Assassination as described in RFC1337).

This is not a watertight fix for the second point: a peer can still reuse a
port number while a previous socket is in TIME-WAIT, and LWIP will reject
that connection (in an RFC compliant way) causing the peer to stall.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/CMakeLists.txt        |  4 ++
 ports/esp32/boards/sdkconfig.base |  4 ++
 ports/esp32/esp32_common.cmake    |  1 +
 ports/esp32/lwip_patch.c          | 64 +++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 ports/esp32/lwip_patch.c

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index d3927cd48d82a..83fca88b6972b 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -74,5 +74,9 @@ list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
 # Enable the panic handler wrapper
 idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
 
+# Patch LWIP memory pool allocators (see lwip_patch.c)
+idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_malloc" APPEND)
+idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_free" APPEND)
+
 # Define the project.
 project(micropython)
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index c7d326c89e8ae..c7179b6125a1e 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -133,3 +133,7 @@ CONFIG_NEWLIB_NANO_FORMAT=y
 # Due to limitations in the PMP system this feature breaks native emitters
 # so is disabled by default.
 CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT=n
+
+# Further limit total sockets in TIME-WAIT when there are many short-lived
+# connections.
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 2c81e8c2b3a50..565f6feec2324 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -108,6 +108,7 @@ list(APPEND MICROPY_SOURCE_PORT
     network_wlan.c
     mpnimbleport.c
     modsocket.c
+    lwip_patch.c
     modesp.c
     esp32_nvs.c
     esp32_partition.c
diff --git a/ports/esp32/lwip_patch.c b/ports/esp32/lwip_patch.c
new file mode 100644
index 0000000000000..9c5e10fcbb404
--- /dev/null
+++ b/ports/esp32/lwip_patch.c
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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 "lwip/memp.h"
+
+// This is a link-time patch to enforce the limit of max active TCP PCBs. A
+// workaround for upstream issue https://github.com/espressif/esp-idf/issues/9670
+//
+// Without this limit the number of TCP PCBs in TIME-WAIT is unbounded, which can
+// have two problems on systems with a lot of short-lived TCP connections:
+//
+// - Higher memory usage.
+// - Increased chance of stalled TCP connections due to port reuse.
+
+static unsigned active_tcp_pcbs;
+
+void *__real_memp_malloc(memp_t type);
+void __real_memp_free(memp_t type, void *mem);
+
+void *__wrap_memp_malloc(memp_t type) {
+    if (type != MEMP_TCP_PCB) {
+        return __real_memp_malloc(type);
+    }
+
+    if (active_tcp_pcbs >= MEMP_NUM_TCP_PCB) {
+        return NULL;
+    }
+
+    void *res = __real_memp_malloc(MEMP_TCP_PCB);
+    if (res != NULL) {
+        ++active_tcp_pcbs;
+    }
+    return res;
+}
+
+void __wrap_memp_free(memp_t type, void *mem) {
+    __real_memp_free(type, mem);
+    if (type == MEMP_TCP_PCB && mem != NULL) {
+        assert(active_tcp_pcbs);
+        --active_tcp_pcbs;
+    }
+}

From 44ed1c20ce070538068d9f708c8181e0be68fe55 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Oct 2024 12:53:10 +1100
Subject: [PATCH 1520/3129] esp32: Disable hardware stack protection on
 ESP32-C6.

The same as fee9d66e3a7308bd9edffb2624b52f4e04ecc4f3 but for C6.

Fixes issue #15667.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake | 1 +
 ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake   | 1 +
 ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake        | 1 +
 ports/esp32/boards/sdkconfig.c6                         | 2 ++
 4 files changed, 5 insertions(+)
 create mode 100644 ports/esp32/boards/sdkconfig.c6

diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
index 4393130b61a43..3ab98e9da1af7 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
@@ -3,5 +3,6 @@ set(IDF_TARGET esp32c6)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.c6
     boards/sdkconfig.ble
 )
diff --git a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
index 4393130b61a43..3ab98e9da1af7 100644
--- a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
@@ -3,5 +3,6 @@ set(IDF_TARGET esp32c6)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.c6
     boards/sdkconfig.ble
 )
diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
index dab33d13f0bdb..e2df716a16b1f 100644
--- a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
@@ -3,6 +3,7 @@ set(IDF_TARGET esp32c6)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.c6
     boards/sdkconfig.ble
     boards/UM_TINYC6/sdkconfig.board
 )
diff --git a/ports/esp32/boards/sdkconfig.c6 b/ports/esp32/boards/sdkconfig.c6
new file mode 100644
index 0000000000000..18e8b75eb4e19
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.c6
@@ -0,0 +1,2 @@
+# Workaround for https://github.com/espressif/esp-idf/issues/14456
+CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n

From ece950d9bed18554e945188c5a31908c8bfa9a7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Oct 2024 11:42:45 +1100
Subject: [PATCH 1521/3129] stm32/pendsv: Remove preemptive keyboard interrupt
 via PendSV.

Since the very beginning, the stm32 port (first called stm, then stmhal now
stm32) has had a special keyboard interrupt feature which works by using
PendSV to break out of any running code.  This preemptive ctrl-C was added
long ago in commit 01156d510c728408be4fd3100bcee18e8985ac00.

The stm32 port still uses that code, and current does this:

- If ctrl-C is received on UART or USB then `mp_sched_keyboard_interrupt()`
  is called (like all other ports) to set a flag for the VM to see, and
  then the VM (or any loop calling `mp_handle_pending(true)`) will
  eventually handle the `KeyboardInterrupt` exception, raising it via NLR.

- If another ctrl-C is received while the existing scheduled keyboard
  interrupt is still pending (ie the VM has not yet processed it) then a
  special hard NLR jump will activate, that preempts the calling code.
  Within the PendSV interrupt the stack is adjusted and an NLR jump is made
  to the most recent `nlr_push()` location.  This is like a normal NLR
  except it is called from an interrupt context and completely annihilates
  the code that was interrupted by the IRQ.

The reason for the preemptive interrupt was to handle ctrl-C before the VM
was able to handle it.  Eventually a mechanism (that's in use today by all
ports) was added to the VM and runtime to be able to check for pending
interrupts.  Then the stm32 port was updated to use this mechanism, with a
fallback to the old preemptive way if a second ctrl-C was received (without
the first one being processed).

This preemptive NLR jump is problematic because it can interrupt
long-running instructions (eg store multiple, usually used at the end of a
function to restore registers and return).  If such an instruction is
interrupted the CPU remembers that with some flags, and can resume the
long-running instruction when the interrupt finishes.  But the preemptive
NLR does a long jump to different code at thread level and so the
long-running interrupt is never resumed.  This leads to a CPU fault.

This fault has been previously reported in issues #3807 and #3842 (see also
issue #294).  It's now possible to easily reproduce this problem, since
commit 69c25ea8653566ec97690b5121bd10b753c89426.  Running the test suite
over and over again on any stm32 board will eventually crash the board (it
can happen on a PYBv1.x, but it happens more regularly on PYBD-SF2/6).

The point is, a skipped test now soft resets the board and so the board
must run `boot.py` again.  The test runner may then interrupt the execution
of `boot.py` with the double-ctrl-C that it sends (in `tools/pyboard.py`,
`enter_raw_repl()`) in order to get the board into a known good state for
the next test.  If the timing is right, this can trigger the preemptive
PendSV in an unfortunate location and hard fault the board.

The fix in this commit is to just remove the preemptive NLR jump feature.
No other port has this feature and it's not needed, ctrl-C works very well
on those ports.  Preemptive NLR jump is a very dangerous thing (eg it may
interrupt and break out of an external SPI flash operation when reading
code from a filesystem) and is obviously buggy.

With this commit, stm32 borads no longer hard fault when running the test
suite (but it does leave an issue, the tests can still interrupt `boot.py`
with a single ctrl-C; that will be fixed separately).

An alternative to this commit would be to clear the CPU state for the
long-running instruction as suggested in issue #3842.  But it's much
simpler to just remove this code, which is now unnecessary and can have
other problems as per issue #294.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../stm32/boards/common_isr_ram/common_isr.ld |  2 +-
 ports/stm32/pendsv.c                          | 53 +------------------
 ports/stm32/pendsv.h                          |  1 -
 ports/stm32/uart.c                            |  2 +-
 ports/stm32/usbd_cdc_interface.c              |  2 +-
 5 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/ports/stm32/boards/common_isr_ram/common_isr.ld b/ports/stm32/boards/common_isr_ram/common_isr.ld
index 7d8f9a64c28ca..2fcaf0e663993 100644
--- a/ports/stm32/boards/common_isr_ram/common_isr.ld
+++ b/ports/stm32/boards/common_isr_ram/common_isr.ld
@@ -14,7 +14,7 @@
        flash (in main.c) along with the isr_vector above.
     */
     . = ALIGN(4);
-    *(.text.pendsv_kbd_intr)
+    *(.text.mp_sched_keyboard_interrupt)
     *(.text.pendsv_schedule_dispatch)
     *(.text.storage_systick_callback)
     *(.text.SysTick_Handler)
diff --git a/ports/stm32/pendsv.c b/ports/stm32/pendsv.c
index 9c908addb58cb..f71c21814da71 100644
--- a/ports/stm32/pendsv.c
+++ b/ports/stm32/pendsv.c
@@ -31,13 +31,6 @@
 #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];
@@ -51,24 +44,6 @@ void pendsv_init(void) {
     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;
@@ -90,10 +65,7 @@ void pendsv_dispatch_handler(void) {
 __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
+    // Calls any pending functions in pendsv_dispatch_table.
     //
     // For the case of a thread switch, swap stacks.
     //
@@ -132,27 +104,6 @@ __attribute__((naked)) void PendSV_Handler(void) {
         ".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"
@@ -178,7 +129,5 @@ __attribute__((naked)) void PendSV_Handler(void) {
         #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/stm32/pendsv.h b/ports/stm32/pendsv.h
index f97581e99a308..b90d2227ee4d4 100644
--- a/ports/stm32/pendsv.h
+++ b/ports/stm32/pendsv.h
@@ -51,7 +51,6 @@ enum {
 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_STM32_PENDSV_H
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 65ecd9913d5db..91db91395eac1 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -1229,7 +1229,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
                 data &= self->char_mask;
                 if (self->attached_to_repl && data == mp_interrupt_char) {
                     // Handle interrupt coming in on a UART REPL
-                    pendsv_kbd_intr();
+                    mp_sched_keyboard_interrupt();
                 } else {
                     if (self->char_width == CHAR_WIDTH_9BIT) {
                         ((uint16_t *)self->read_buf)[self->read_buf_head] = data;
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index 88a9cafe0c495..c0198d1bb49a6 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -315,7 +315,7 @@ int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
     // copy the incoming data into the circular buffer
     for (const uint8_t *src = cdc->rx_packet_buf, *top = cdc->rx_packet_buf + len; src < top; ++src) {
         if (cdc->attached_to_repl && *src == mp_interrupt_char) {
-            pendsv_kbd_intr();
+            mp_sched_keyboard_interrupt();
         } else {
             uint16_t next_put = (cdc->rx_buf_put + 1) & (MICROPY_HW_USB_CDC_RX_DATA_SIZE - 1);
             if (next_put == cdc->rx_buf_get) {

From 1223fa92f1cc6190e683b9b8fca66d436c657fdb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Oct 2024 11:44:59 +1100
Subject: [PATCH 1522/3129] renesas-ra/pendsv: Remove preemptive keyboard
 interrupt via PendSV.

Following the same change to the stm32 port.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/pendsv.c | 53 +--------------------------------------
 ports/renesas-ra/pendsv.h |  1 -
 ports/renesas-ra/uart.c   |  2 +-
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/ports/renesas-ra/pendsv.c b/ports/renesas-ra/pendsv.c
index 9c908addb58cb..f71c21814da71 100644
--- a/ports/renesas-ra/pendsv.c
+++ b/ports/renesas-ra/pendsv.c
@@ -31,13 +31,6 @@
 #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];
@@ -51,24 +44,6 @@ void pendsv_init(void) {
     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;
@@ -90,10 +65,7 @@ void pendsv_dispatch_handler(void) {
 __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
+    // Calls any pending functions in pendsv_dispatch_table.
     //
     // For the case of a thread switch, swap stacks.
     //
@@ -132,27 +104,6 @@ __attribute__((naked)) void PendSV_Handler(void) {
         ".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"
@@ -178,7 +129,5 @@ __attribute__((naked)) void PendSV_Handler(void) {
         #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
index 9d7c3d94135d6..827692b8cf2d9 100644
--- a/ports/renesas-ra/pendsv.h
+++ b/ports/renesas-ra/pendsv.h
@@ -48,7 +48,6 @@ enum {
 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/uart.c b/ports/renesas-ra/uart.c
index d17a1fc913fe0..c319b4c0a8dca 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -49,7 +49,7 @@ 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();
+        mp_sched_keyboard_interrupt();
         return 1;
     } else {
         return 0;

From 7746785035f7003e33f9b101c8bbb4d7a74f216f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Oct 2024 16:24:28 +1100
Subject: [PATCH 1523/3129] tests/run-tests.py: Wait for soft reset if a target
 skips a test.

Commit 69c25ea8653566ec97690b5121bd10b753c89426 made raising `SystemExit`
do a soft reset (on bare-metal targets).  This means that any test which is
skipped by a target (by raising `SystemExit`) will trigger a soft reset on
that target, and then it must execute its startup code, such as `boot.py`.

If the timing is right, this startup code can be unintentionally
interrupted by the test runner when preparing the next test, because the
test runner enters the raw REPL again via a Ctrl-C Ctrl-A ctrl-D sequence
(in `Pyboard.enter_raw_repl()`).

When this happens (`boot.py` is interrupted) the target may not be set up
correctly, and it may (in the case of stm32 boards) flash LEDs and take
extra time, slowing down the test run.

Fix this by explicitly waiting for the target to finish its soft reset when
it skips a test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 07280666dc8c2..a9fb458f2cde4 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -824,6 +824,12 @@ def run_one_test(test_file):
         output_mupy = run_micropython(pyb, args, test_file, test_file_abspath)
 
         if output_mupy == b"SKIP\n":
+            if pyb is not None and hasattr(pyb, "read_until"):
+                # Running on a target over a serial connection, and the target requested
+                # to skip the test.  It does this via a SystemExit which triggers a soft
+                # reset.  Wait for the soft reset to finish, so we don't interrupt the
+                # start-up code (eg boot.py) when preparing to run the next test.
+                pyb.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
             print("skip ", test_file)
             skipped_tests.append(test_name)
             return

From d92694c3e80c369a22d92b65d875e2d27dc47eaf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Oct 2024 16:38:39 +1100
Subject: [PATCH 1524/3129] tools: Only issue a single Ctrl-C when entering raw
 REPL.

A long time ago when there was only the `stm` port, Ctrl-C would trigger a
preemptive NLR jump to break out of running code.  Then in commit
124df6f8d07b53542b6960dbeea9b63bff469a67 a more general approach to
asynchronous `KeyboardInterrupt` exceptions was implemented, and `stmhal`
supported both approaches, with the general (soft) interrupt taking
priority.

Then in commit bc1488a05f509cd5be8bfab9574babfcb993806f `pyboard.py` was
updated with a corresponding change to make it issue a double Ctrl-C to
break out of any existing code when entering the raw REPL (two Ctrl-C
characters were sent in order to more reliably trigger the preemptive NLR
jump).

No other port has preemptive NLR jumps and so a double Ctrl-C doesn't
really behave any differently to a single Ctrl-C: with USB CDC the double
Ctrl-C would most likely be in the same USB packet and so processed in the
same low-level USB callback, so it's just setting the keyboard interrupt
flag twice in a row.  The VM/runtime then just sees one keyboard interrupt
and acts as though only one Ctrl-C was sent.

This commit changes the double Ctrl-C to a single Ctrl-C in `pyboard.py`
and `mpremote`.  That keeps things as simple as they need to be.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/transport_serial.py | 2 +-
 tools/pyboard.py                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 6f43e2c41fdfa..28ccaf6d8c907 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -121,7 +121,7 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
         return data
 
     def enter_raw_repl(self, soft_reset=True):
-        self.serial.write(b"\r\x03\x03")  # ctrl-C twice: interrupt any running program
+        self.serial.write(b"\r\x03")  # ctrl-C: interrupt any running program
 
         # flush input (without relying on serial.flushInput())
         n = self.serial.inWaiting()
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 55cbe8384d580..8459bcf655683 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -348,7 +348,7 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
         return data
 
     def enter_raw_repl(self, soft_reset=True):
-        self.serial.write(b"\r\x03\x03")  # ctrl-C twice: interrupt any running program
+        self.serial.write(b"\r\x03")  # ctrl-C: interrupt any running program
 
         # flush input (without relying on serial.flushInput())
         n = self.serial.inWaiting()

From fa942d532f326b3b8c5d4cb68439ad6669beb1e4 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Mon, 23 Sep 2024 22:16:29 +0530
Subject: [PATCH 1525/3129] zephyr/boards: Add support for BeagleConnect
 Freedom.

Enable the following capabilities: I2C, SPI, FLASH.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 ports/zephyr/boards/beagleconnect_freedom.conf | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 ports/zephyr/boards/beagleconnect_freedom.conf

diff --git a/ports/zephyr/boards/beagleconnect_freedom.conf b/ports/zephyr/boards/beagleconnect_freedom.conf
new file mode 100644
index 0000000000000..14ce9c526e059
--- /dev/null
+++ b/ports/zephyr/boards/beagleconnect_freedom.conf
@@ -0,0 +1,7 @@
+# Hardware features
+CONFIG_I2C=y
+CONFIG_SPI=y
+
+# Flash drivers
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y

From 525fce717030e0be98adcd983c1df663717a74a5 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Fri, 28 Jun 2024 16:01:12 +0100
Subject: [PATCH 1526/3129] py/usermod.cmake: Check target exists in
 usermod_gather_sources.

Check a target exists before accessing properties.  Otherwise
usermod_gather_sources would recurse into garbage property names and break.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 py/usermod.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/usermod.cmake b/py/usermod.cmake
index 853276283746d..c814369a4865e 100644
--- a/py/usermod.cmake
+++ b/py/usermod.cmake
@@ -5,6 +5,10 @@ function(usermod_gather_sources SOURCES_VARNAME INCLUDE_DIRECTORIES_VARNAME INCL
     if (NOT ${LIB} IN_LIST ${INCLUDED_VARNAME})
         list(APPEND ${INCLUDED_VARNAME} ${LIB})
 
+        if (NOT TARGET ${LIB})
+            return()
+        endif()
+
         # Gather library sources
         get_target_property(lib_sources ${LIB} INTERFACE_SOURCES)
         if (lib_sources)

From 70a884d6ec7dfec4ef4f18aa1871db4d70a06129 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Aug 2024 14:26:27 +1000
Subject: [PATCH 1527/3129] lib/pico-sdk: Update to version 2.0.0.

Adds support for the new RP2350 MCU.

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 6a7db34ff6334..efe2103f9b284 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 6a7db34ff63345a7badec79ebea3aaef1712f374
+Subproject commit efe2103f9b28458a1615ff096054479743ade236

From 815d6a131d81eded59d17aa854eb006ff8c19e2b Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 22 May 2024 15:34:32 +0100
Subject: [PATCH 1528/3129] rp2/mpconfigport: Set MCU name for RP2350.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index b34b4fc09c72d..80fe9f37c10ce 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -35,7 +35,16 @@
 #include "mpconfigboard.h"
 
 // Board and hardware specific configuration
+#if PICO_RP2040
 #define MICROPY_HW_MCU_NAME                     "RP2040"
+#elif PICO_RP2350 && PICO_ARM
+#define MICROPY_HW_MCU_NAME                     "RP2350"
+#elif PICO_RP2350 && PICO_RISCV
+#define MICROPY_HW_MCU_NAME                     "RP2350-RISCV"
+#else
+#error Unknown MCU
+#endif
+
 #ifndef MICROPY_HW_ENABLE_UART_REPL
 #define MICROPY_HW_ENABLE_UART_REPL             (0) // useful if there is no USB
 #endif

From c90d996c9da51103a6be1b41b2c2664a730b0d8e Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 22 May 2024 15:49:46 +0100
Subject: [PATCH 1529/3129] rp2: Update custom linker scripts for new pico-sdk.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt                      |   2 +-
 .../rp2/{memmap_mp.ld => memmap_mp_rp2040.ld} |   0
 ports/rp2/memmap_mp_rp2350.ld                 | 312 ++++++++++++++++++
 3 files changed, 313 insertions(+), 1 deletion(-)
 rename ports/rp2/{memmap_mp.ld => memmap_mp_rp2040.ld} (100%)
 create mode 100644 ports/rp2/memmap_mp_rp2350.ld

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 19c7178fc7266..54b7e84bc9804 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -525,7 +525,7 @@ endif()
 #  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(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp.ld)
+    pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_${PICO_PLATFORM}.ld)
 endif()
 
 pico_add_extra_outputs(${MICROPY_TARGET})
diff --git a/ports/rp2/memmap_mp.ld b/ports/rp2/memmap_mp_rp2040.ld
similarity index 100%
rename from ports/rp2/memmap_mp.ld
rename to ports/rp2/memmap_mp_rp2040.ld
diff --git a/ports/rp2/memmap_mp_rp2350.ld b/ports/rp2/memmap_mp_rp2350.ld
new file mode 100644
index 0000000000000..1e1cbbfd70296
--- /dev/null
+++ b/ports/rp2/memmap_mp_rp2350.ld
@@ -0,0 +1,312 @@
+/* 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 = 4096k
+    RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 512k
+    SCRATCH_X(rwx) : ORIGIN = 0x20080000, LENGTH = 4k
+    SCRATCH_Y(rwx) : ORIGIN = 0x20081000, LENGTH = 4k
+}
+
+ENTRY(_entry_point)
+
+SECTIONS
+{
+    .flash_begin : {
+        __flash_binary_start = .;
+    } > FLASH
+
+    /* The bootrom will enter the image at the point indicated in your
+       IMAGE_DEF, which is usually the reset handler of your vector table.
+
+       The debugger will use the ELF entry point, which is the _entry_point
+       symbol, and in our case is *different from the bootrom's entry point.*
+       This is used to go back through the bootrom on debugger launches only,
+       to perform the same initial flash setup that would be performed on a
+       cold boot.
+    */
+
+    .text : {
+        __logical_binary_start = .;
+        KEEP (*(.vectors))
+        KEEP (*(.binary_info_header))
+        __binary_info_header_end = .;
+        KEEP (*(.embedded_block))
+        __embedded_block_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 */
+        *(.init)
+        *libgcc.a:cmse_nonsecure_call.o
+        /* Change for MicroPython... exclude 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)
+
+        . = 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 = .);
+        *(.eh_frame*)
+        . = ALIGN(4);
+    } > FLASH
+
+    /* Note the boot2 section is optional, and should be discarded if there is
+       no reference to it *inside* the binary, as it is not called by the
+       bootrom. (The bootrom performs a simple best-effort XIP setup and
+       leaves it to the binary to do anything more sophisticated.) However
+       there is still a size limit of 256 bytes, to ensure the boot2 can be
+       stored in boot RAM.
+
+       Really this is a "XIP setup function" -- the name boot2 is historic and
+       refers to its dual-purpose on RP2040, where it also handled vectoring
+       from the bootrom into the user image.
+    */
+
+    .boot2 : {
+        __boot2_start__ = .;
+        *(.boot2)
+        __boot2_end__ = .;
+    } > FLASH
+
+    ASSERT(__boot2_end__ - __boot2_start__ <= 256,
+        "ERROR: Pico second stage bootloader must be no more than 256 bytes in size")
+
+    .rodata : {
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
+        *(.srodata*)
+        . = 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);
+
+    .ram_vector_table (NOLOAD): {
+        *(.ram_vector_table)
+    } > RAM
+
+    .uninitialized_data (NOLOAD): {
+        . = ALIGN(4);
+        *(.uninitialized_data*)
+    } > 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*)
+        *(.sdata*)
+
+        . = 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 = .);
+
+        *(.jcr)
+        . = ALIGN(4);
+    } > RAM AT> FLASH
+
+    .tdata : {
+        . = ALIGN(4);
+        *(.tdata .tdata.* .gnu.linkonce.td.*)
+        /* All data end */
+        __tdata_end = .;
+    } > RAM AT> FLASH
+    PROVIDE(__data_end__ = .);
+
+    /* __etext is (for backwards compatibility) the name of the .data init source pointer (...) */
+    __etext = LOADADDR(.data);
+
+    .tbss (NOLOAD) : {
+        . = ALIGN(4);
+        __bss_start__ = .;
+        __tls_base = .;
+        *(.tbss .tbss.* .gnu.linkonce.tb.*)
+        *(.tcommon)
+
+        __tls_end = .;
+    } > RAM
+
+    .bss (NOLOAD) : {
+        . = ALIGN(4);
+        __tbss_end = .;
+
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
+        *(COMMON)
+        PROVIDE(__global_pointer$ = . + 2K);
+        *(.sbss*)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    } > RAM
+
+    .heap (NOLOAD):
+    {
+        __end__ = .;
+        end = __end__;
+        KEEP(*(.heap*))
+        /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
+           to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
+        /* Change for MicroPython: don't include this, it increases reported firmware size.
+        /* . = ORIGIN(RAM) + LENGTH(RAM); */
+        __HeapLimit = .;
+    } > 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);
+
+    /* .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 (NOLOAD):
+    {
+        *(.stack1*)
+    } > SCRATCH_X
+    .stack_dummy (NOLOAD):
+    {
+        KEEP(*(.stack*))
+    } > SCRATCH_Y
+
+    .flash_end : {
+        KEEP(*(.embedded_end_block*))
+        PROVIDE(__flash_binary_end = .);
+    } > FLASH =0xaa
+
+    /* stack limit is poorly named, but historically is maximum heap ptr */
+    __StackLimit = __bss_end__ + __micropy_c_heap_size__;
+
+    /* Define start and end of GC heap */
+    __GcHeapStart = __StackLimit; /* after the C heap (sbrk limit) */
+    __GcHeapEnd = ORIGIN(RAM) + LENGTH(RAM) - __micropy_extra_stack__;
+
+    /* Define start and end of C stack */
+    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
+    __StackBottom = __GcHeapEnd;
+    PROVIDE(__stack = __StackTop);
+
+    /* picolibc and LLVM */
+    PROVIDE (__heap_start = __end__);
+    PROVIDE (__heap_end = __HeapLimit);
+    PROVIDE( __tls_align = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)) );
+    PROVIDE( __tls_size_align = (__tls_size + __tls_align - 1) & ~(__tls_align - 1));
+    PROVIDE( __arm32_tls_tcb_offset = MAX(8, __tls_align) );
+
+    /* llvm-libc */
+    PROVIDE (_end = __end__);
+    PROVIDE (__llvm_libc_heap_limit = __HeapLimit);
+
+    /* Check GC heap is at least 64 KB */
+    /* This is half the minimum RAM suggested for full-featured MicroPython.
+     * This value accounts for large static buffers included in user C or C++
+     * modules, which might significantly reduce the available heap but also
+     * lower demand for memory at runtime.
+     */
+    ASSERT((__GcHeapEnd - __GcHeapStart) > 64*1024, "GcHeap is too small")
+
+    ASSERT( __binary_info_header_end - __logical_binary_start <= 1024, "Binary info must be in first 1024 bytes of the binary")
+    ASSERT( __embedded_block_end - __logical_binary_start <= 4096, "Embedded block must be in first 4096 bytes of the binary")
+
+    /* todo assert on extra code */
+}

From d1423ef7a23793de3777e84d985f9902241e788e Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 22 May 2024 15:24:24 +0100
Subject: [PATCH 1530/3129] rp2/modmachine: Implement lightsleep for RP2350.

This isn't fully working, the CPU often wakes up early.  That will be fixed
when a newer version of pico-sdk is released.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/modmachine.c | 52 +++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 372c17bcf9d6b..0acae25499996 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -162,6 +162,9 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     }
 
     clock_stop(clk_adc);
+    #if PICO_RP2350
+    clock_stop(clk_hstx);
+    #endif
 
     // CLK_REF = XOSC
     clock_configure(clk_ref, CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC, 0, xosc_hz, xosc_hz);
@@ -170,7 +173,9 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     clock_configure(clk_sys, CLOCKS_CLK_SYS_CTRL_SRC_VALUE_CLK_REF, 0, xosc_hz, xosc_hz);
 
     // CLK_RTC = XOSC / 256
+    #if PICO_RP2040
     clock_configure(clk_rtc, 0, CLOCKS_CLK_RTC_CTRL_AUXSRC_VALUE_XOSC_CLKSRC, xosc_hz, xosc_hz / 256);
+    #endif
 
     // CLK_PERI = CLK_SYS
     clock_configure(clk_peri, 0, CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS, xosc_hz, xosc_hz);
@@ -190,38 +195,63 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         #endif
         xosc_dormant();
     } else {
-        uint32_t sleep_en0 = clocks_hw->sleep_en0;
-        uint32_t sleep_en1 = clocks_hw->sleep_en1;
         bool timer3_enabled = irq_is_enabled(3);
 
-        clocks_hw->sleep_en0 = CLOCKS_SLEEP_EN0_CLK_RTC_RTC_BITS;
+        const uint32_t alarm_num = 3;
+        const uint32_t irq_num = TIMER_ALARM_IRQ_NUM(timer_hw, alarm_num);
         if (use_timer_alarm) {
             // Make sure ALARM3/IRQ3 is enabled on _this_ core
-            timer_hw->inte |= 1 << 3;
             if (!timer3_enabled) {
-                irq_set_enabled(3, true);
+                irq_set_enabled(irq_num, true);
             }
+            hw_set_bits(&timer_hw->inte, 1u << alarm_num);
             // Use timer alarm to wake.
+            clocks_hw->sleep_en0 = 0x0;
+            #if PICO_RP2040
             clocks_hw->sleep_en1 = CLOCKS_SLEEP_EN1_CLK_SYS_TIMER_BITS;
-            timer_hw->alarm[3] = timer_hw->timerawl + delay_ms * 1000;
+            #elif PICO_RP2350
+            clocks_hw->sleep_en1 = CLOCKS_SLEEP_EN1_CLK_REF_TICKS_BITS | CLOCKS_SLEEP_EN1_CLK_SYS_TIMER0_BITS;
+            #else
+            #error Unknown processor
+            #endif
+            timer_hw->intr = 1u << alarm_num; // clear any IRQ
+            timer_hw->alarm[alarm_num] = timer_hw->timerawl + delay_ms * 1000;
         } else {
             // TODO: Use RTC alarm to wake.
-            clocks_hw->sleep_en1 = 0;
+            clocks_hw->sleep_en0 = 0x0;
+            clocks_hw->sleep_en1 = 0x0;
         }
 
         if (!disable_usb) {
             clocks_hw->sleep_en0 |= CLOCKS_SLEEP_EN0_CLK_SYS_PLL_USB_BITS;
+            #if PICO_RP2040
             clocks_hw->sleep_en1 |= CLOCKS_SLEEP_EN1_CLK_USB_USBCTRL_BITS;
+            #elif PICO_RP2350
+            clocks_hw->sleep_en1 |= CLOCKS_SLEEP_EN1_CLK_SYS_USBCTRL_BITS;
+            #else
+            #error Unknown processor
+            #endif
         }
 
+        #if PICO_ARM
+        // Configure SLEEPDEEP bits on Cortex-M CPUs.
+        #if PICO_RP2040
         scb_hw->scr |= M0PLUS_SCR_SLEEPDEEP_BITS;
+        #elif PICO_RP2350
+        scb_hw->scr |= M33_SCR_SLEEPDEEP_BITS;
+        #else
+        #error Unknown processor
+        #endif
+        #endif
+
+        // Go into low-power mode.
         __wfi();
-        scb_hw->scr &= ~M0PLUS_SCR_SLEEPDEEP_BITS;
+
         if (!timer3_enabled) {
-            irq_set_enabled(3, false);
+            irq_set_enabled(irq_num, false);
         }
-        clocks_hw->sleep_en0 = sleep_en0;
-        clocks_hw->sleep_en1 = sleep_en1;
+        clocks_hw->sleep_en0 |= ~(0u);
+        clocks_hw->sleep_en1 |= ~(0u);
     }
 
     // Enable ROSC.

From 27aeade832665c434b0150c6fd32a455e6865eef Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Mon, 3 Jun 2024 16:14:43 +0100
Subject: [PATCH 1531/3129] rp2/rp2_dma: Generalise DMA for RP2350.

Two new bits were added to the ctrl register, and existing bits were
shifted, so use DMA_CH0_CTRL_TRIG_xxx constants to generalise the code.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/rp2_dma.c | 46 +++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
index 3afcf8b5d63af..78f69e6452758 100644
--- a/ports/rp2/rp2_dma.c
+++ b/ports/rp2/rp2_dma.c
@@ -57,23 +57,28 @@ typedef struct _rp2_dma_ctrl_field_t {
 } rp2_dma_ctrl_field_t;
 
 static rp2_dma_ctrl_field_t rp2_dma_ctrl_fields_table[] = {
-    { MP_QSTR_enable,        0, 1, 0 },
-    { MP_QSTR_high_pri,      1, 1, 0 },
-    { MP_QSTR_size,          2, 2, 0 },
-    { MP_QSTR_inc_read,      4, 1, 0 },
-    { MP_QSTR_inc_write,     5, 1, 0 },
-    { MP_QSTR_ring_size,     6, 4, 0 },
-    { MP_QSTR_ring_sel,     10, 1, 0 },
-    { MP_QSTR_chain_to,     11, 4, 0 },
-    { MP_QSTR_treq_sel,     15, 6, 0 },
-    { MP_QSTR_irq_quiet,    21, 1, 0 },
-    { MP_QSTR_bswap,        22, 1, 0 },
-    { MP_QSTR_sniff_en,     23, 1, 0 },
-    { MP_QSTR_busy,         24, 1, 1 },
-    // bits 25 through 28 are reserved
-    { MP_QSTR_write_err,    29, 1, 0 },
-    { MP_QSTR_read_err,     30, 1, 0 },
-    { MP_QSTR_ahb_err,      31, 1, 1 },
+    { MP_QSTR_enable, DMA_CH0_CTRL_TRIG_EN_LSB, 1, 0 },
+    { MP_QSTR_high_pri, DMA_CH0_CTRL_TRIG_HIGH_PRIORITY_LSB, 1, 0 },
+    { MP_QSTR_size, DMA_CH0_CTRL_TRIG_DATA_SIZE_LSB, 2, 0 },
+    { MP_QSTR_inc_read,     DMA_CH0_CTRL_TRIG_INCR_READ_LSB, 1, 0 },
+    #if PICO_RP2350
+    { MP_QSTR_inc_read_rev,  DMA_CH0_CTRL_TRIG_INCR_READ_REV_LSB, 1, 0 },
+    #endif
+    { MP_QSTR_inc_write,    DMA_CH0_CTRL_TRIG_INCR_WRITE_LSB, 1, 0 },
+    #if PICO_RP2350
+    { MP_QSTR_inc_write_rev, DMA_CH0_CTRL_TRIG_INCR_WRITE_REV_LSB, 1, 0 },
+    #endif
+    { MP_QSTR_ring_size,    DMA_CH0_CTRL_TRIG_RING_SIZE_LSB, 4, 0 },
+    { MP_QSTR_ring_sel,     DMA_CH0_CTRL_TRIG_RING_SEL_LSB, 1, 0 },
+    { MP_QSTR_chain_to,     DMA_CH0_CTRL_TRIG_CHAIN_TO_LSB, 4, 0 },
+    { MP_QSTR_treq_sel,     DMA_CH0_CTRL_TRIG_TREQ_SEL_LSB, 6, 0 },
+    { MP_QSTR_irq_quiet,    DMA_CH0_CTRL_TRIG_IRQ_QUIET_LSB, 1, 0 },
+    { MP_QSTR_bswap,        DMA_CH0_CTRL_TRIG_BSWAP_LSB, 1, 0 },
+    { MP_QSTR_sniff_en,     DMA_CH0_CTRL_TRIG_SNIFF_EN_LSB, 1, 0 },
+    { MP_QSTR_busy,         DMA_CH0_CTRL_TRIG_BUSY_LSB, 1, 1 },
+    { MP_QSTR_write_err,    DMA_CH0_CTRL_TRIG_WRITE_ERROR_LSB, 1, 0 },
+    { MP_QSTR_read_err,     DMA_CH0_CTRL_TRIG_READ_ERROR_LSB, 1, 0 },
+    { MP_QSTR_ahb_err,      DMA_CH0_CTRL_TRIG_AHB_ERROR_LSB, 1, 1 },
 };
 
 static const uint32_t rp2_dma_ctrl_field_count = MP_ARRAY_SIZE(rp2_dma_ctrl_fields_table);
@@ -298,7 +303,12 @@ static mp_obj_t rp2_dma_active(size_t n_args, const mp_obj_t *args) {
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_dma_active_obj, 1, 2, rp2_dma_active);
 
 // Default is quiet, unpaced, read and write incrementing, word transfers, enabled
-#define DEFAULT_DMA_CONFIG (1 << 21) | (0x3f << 15) | (1 << 5) | (1 << 4) | (2 << 2) | (1 << 0)
+#define DEFAULT_DMA_CONFIG (1 << DMA_CH0_CTRL_TRIG_IRQ_QUIET_LSB) | \
+    (DMA_CH0_CTRL_TRIG_TREQ_SEL_VALUE_PERMANENT << DMA_CH0_CTRL_TRIG_TREQ_SEL_LSB) | \
+    (1 << DMA_CH0_CTRL_TRIG_INCR_WRITE_LSB) | \
+    (1 << DMA_CH0_CTRL_TRIG_INCR_READ_LSB) | \
+    (2 << DMA_CH0_CTRL_TRIG_DATA_SIZE_LSB) | \
+    (1 << DMA_CH0_CTRL_TRIG_EN_LSB)
 
 // DMA.pack_ctrl(...)
 static mp_obj_t rp2_dma_pack_ctrl(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {

From d2c85c74dabc33a4574422d8970d2b25bcc22b7a Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Thu, 23 May 2024 10:57:14 +0100
Subject: [PATCH 1532/3129] rp2: Integrate RP2350 and use aon_timer instead of
 rtc API.

This commit separates various build settings and include files that are
specific to RP2040 and RP2350, and uses the aon_timer interface instead of
rtc, to work across both MCU variants.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/CMakeLists.txt                      | 49 +++++++++++--
 ports/rp2/boards/RPI_PICO/mpconfigboard.cmake |  1 +
 ports/rp2/fatfs_port.c                        | 11 +--
 ports/rp2/machine_rtc.c                       | 69 ++++++++-----------
 ports/rp2/main.c                              | 25 ++++---
 ports/rp2/mbedtls/mbedtls_port.c              |  8 +--
 ports/rp2/modmachine.c                        |  1 +
 ports/rp2/modtime.c                           | 30 ++++----
 ports/rp2/mphalport.c                         | 24 +++++--
 ports/rp2/mpnetworkport.c                     |  7 ++
 ports/rp2/pendsv.c                            |  7 ++
 11 files changed, 142 insertions(+), 90 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 54b7e84bc9804..6f66181546271 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -191,19 +191,26 @@ set(PICO_SDK_COMPONENTS
     hardware_pll
     hardware_pwm
     hardware_regs
-    hardware_rtc
+    hardware_resets
     hardware_spi
     hardware_structs
     hardware_sync
+    hardware_sync_spin_lock
     hardware_timer
     hardware_uart
     hardware_watchdog
     hardware_xosc
+    pico_aon_timer
     pico_base_headers
     pico_binary_info
     pico_bootrom
     pico_multicore
     pico_platform
+    pico_platform_compiler
+    pico_platform_panic
+    pico_platform_sections
+    pico_runtime
+    pico_runtime_init
     pico_stdio
     pico_stdlib
     pico_sync
@@ -224,14 +231,24 @@ pico_add_library(pico_float_micropython)
 
 # pico_float_micropython: add pico-sdk float and our libm source files.
 target_sources(pico_float_micropython INTERFACE
-    ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_aeabi.S
-    ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_init_rom.c
-    ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_v1_rom_shim.S
     ${MICROPY_SOURCE_LIB_LIBM}
     ${MICROPY_SOURCE_LIB_LIBM_SQRT_SW}
     ${MICROPY_PORT_DIR}/libm_extra.c
 )
 
+if(PICO_RP2040)
+    target_sources(pico_float_micropython INTERFACE
+        ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_aeabi_rp2040.S
+        ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_init_rom_rp2040.c
+        ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_v1_rom_shim_rp2040.S
+    )
+elseif(PICO_RP2350)
+    target_sources(pico_float_micropython INTERFACE
+        ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_aeabi_dcp.S
+        ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_conv_m33.S
+    )
+endif()
+
 # pico_float_micropython: wrap low-level floating-point ops, to call the pico-sdk versions.
 pico_wrap_function(pico_float_micropython __aeabi_fdiv)
 pico_wrap_function(pico_float_micropython __aeabi_fmul)
@@ -253,7 +270,9 @@ pico_wrap_function(pico_float_micropython __aeabi_ul2f)
 pico_wrap_function(pico_float_micropython __aeabi_f2iz)
 pico_wrap_function(pico_float_micropython __aeabi_f2lz)
 pico_wrap_function(pico_float_micropython __aeabi_f2uiz)
-pico_wrap_function(pico_float_micropython __aeabi_f2ulz)
+if(PICO_RP2040)
+    pico_wrap_function(pico_float_micropython __aeabi_f2ulz)
+endif()
 pico_wrap_function(pico_float_micropython __aeabi_f2d)
 
 if (MICROPY_PY_LWIP)
@@ -507,9 +526,18 @@ 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
 )
 
+if(PICO_RP2040)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        PICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1
+    )
+elseif(PICO_RP2350)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        PICO_EMBED_XIP_SETUP=1 # to put flash into continuous read mode
+    )
+endif()
+
 target_link_libraries(${MICROPY_TARGET}
     ${PICO_SDK_COMPONENTS}
 )
@@ -525,7 +553,11 @@ endif()
 #  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(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_${PICO_PLATFORM}.ld)
+    if(PICO_RP2040)
+        pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2040.ld)
+    elseif(PICO_RP2350)
+        pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2350.ld)
+    endif()
 endif()
 
 pico_add_extra_outputs(${MICROPY_TARGET})
@@ -544,6 +576,9 @@ foreach(comp ${PICO_SDK_COMPONENTS})
     micropy_gather_target_properties(${comp}_headers)
 endforeach()
 
+set(MICROPY_CPP_FLAGS_EXTRA ${PICO_COMMON_LANG_FLAGS})
+separate_arguments(MICROPY_CPP_FLAGS_EXTRA)
+
 # Include the main MicroPython cmake rules.
 include(${MICROPY_DIR}/py/mkrules.cmake)
 
diff --git a/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
index 13269e81e52e5..386bd33285890 100644
--- a/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/RPI_PICO/mpconfigboard.cmake
@@ -1,2 +1,3 @@
 # cmake file for Raspberry Pi Pico
 set(PICO_BOARD "pico")
+set(PICO_PLATFORM "rp2040")
diff --git a/ports/rp2/fatfs_port.c b/ports/rp2/fatfs_port.c
index 9706b6fe7dc70..1ce505dd69e3f 100644
--- a/ports/rp2/fatfs_port.c
+++ b/ports/rp2/fatfs_port.c
@@ -25,10 +25,13 @@
  */
 
 #include "lib/oofatfs/ff.h"
-#include "hardware/rtc.h"
+#include "pico/aon_timer.h"
+#include "shared/timeutils/timeutils.h"
 
 MP_WEAK DWORD get_fattime(void) {
-    datetime_t t;
-    rtc_get_datetime(&t);
-    return ((t.year - 1980) << 25) | ((t.month) << 21) | ((t.day) << 16) | ((t.hour) << 11) | ((t.min) << 5) | (t.sec / 2);
+    struct timespec ts;
+    timeutils_struct_time_t tm;
+    aon_timer_get_time(&ts);
+    timeutils_seconds_since_epoch_to_struct_time(ts.tv_sec, &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/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index ce224be711b89..0d8fdef30f322 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -30,6 +30,8 @@
 #include <time.h>
 #include <sys/time.h>
 
+#include "pico/aon_timer.h"
+
 #include "py/nlr.h"
 #include "py/obj.h"
 #include "py/runtime.h"
@@ -37,8 +39,6 @@
 #include "py/mperrno.h"
 #include "extmod/modmachine.h"
 #include "shared/timeutils/timeutils.h"
-#include "hardware/rtc.h"
-#include "pico/util/datetime.h"
 
 typedef struct _machine_rtc_obj_t {
     mp_obj_base_t base;
@@ -50,14 +50,12 @@ 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();
+    bool r = aon_timer_is_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);
+        // This shouldn't happen. it's here just in case
+        struct timespec ts = { 0, 0 };
+        aon_timer_start(&ts);
         mp_hal_time_ns_set_from_rtc();
     }
     // return constant object
@@ -66,47 +64,36 @@ static mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
 
 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);
-        }
-
+        struct timespec ts;
+        timeutils_struct_time_t tm;
+        aon_timer_get_time(&ts);
+        timeutils_seconds_since_epoch_to_struct_time(ts.tv_sec, &tm);
         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)
+            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(tm.tm_wday),
+            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 {
         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]),
-            .hour = mp_obj_get_int(items[4]),
-            .min = mp_obj_get_int(items[5]),
-            .sec = mp_obj_get_int(items[6]),
+        timeutils_struct_time_t tm = {
+            .tm_year = mp_obj_get_int(items[0]),
+            .tm_mon = mp_obj_get_int(items[1]),
+            .tm_mday = mp_obj_get_int(items[2]),
+            .tm_hour = mp_obj_get_int(items[4]),
+            .tm_min = mp_obj_get_int(items[5]),
+            .tm_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);
-        }
+        struct timespec ts = { 0, 0 };
+        ts.tv_sec = timeutils_seconds_since_epoch(tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+        aon_timer_set_time(&ts);
         mp_hal_time_ns_set_from_rtc();
-
     }
     return mp_const_none;
 }
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 7fb4a648679e7..012e26f484fde 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -47,11 +47,9 @@
 #include "genhdr/mpversion.h"
 #include "mp_usbd.h"
 
-#include "RP2040.h" // cmsis, for PendSV_IRQn and SCB/SCB_SCR_SEVONPEND_Msk
 #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"
@@ -60,6 +58,15 @@
 #if MICROPY_PY_NETWORK_CYW43
 #include "lib/cyw43-driver/src/cyw43.h"
 #endif
+#if PICO_RP2040
+#include "RP2040.h" // cmsis, for PendSV_IRQn and SCB/SCB_SCR_SEVONPEND_Msk
+#elif PICO_RP2350
+#include "RP2350.h" // cmsis, for PendSV_IRQn and SCB/SCB_SCR_SEVONPEND_Msk
+#else
+#error Unknown processor
+#endif
+#include "pico/aon_timer.h"
+#include "shared/timeutils/timeutils.h"
 
 extern uint8_t __StackTop, __StackBottom;
 extern uint8_t __GcHeapStart, __GcHeapEnd;
@@ -106,17 +113,9 @@ int main(int argc, char **argv) {
     #endif
 
     // Start and initialise the RTC
-    datetime_t t = {
-        .year = 2021,
-        .month = 1,
-        .day = 1,
-        .dotw = 4, // 0 is Monday, so 4 is Friday
-        .hour = 0,
-        .min = 0,
-        .sec = 0,
-    };
-    rtc_init();
-    rtc_set_datetime(&t);
+    struct timespec ts = { 0, 0 };
+    ts.tv_sec = timeutils_seconds_since_epoch(2021, 1, 1, 0, 0, 0);
+    aon_timer_start(&ts);
     mp_hal_time_ns_set_from_rtc();
 
     // Initialise stack extents and GC heap.
diff --git a/ports/rp2/mbedtls/mbedtls_port.c b/ports/rp2/mbedtls/mbedtls_port.c
index 9b1e0d20e1700..521d815d2bedd 100644
--- a/ports/rp2/mbedtls/mbedtls_port.c
+++ b/ports/rp2/mbedtls/mbedtls_port.c
@@ -29,9 +29,9 @@
 
 #include "mbedtls_config_port.h"
 
-#include "hardware/rtc.h"
 #include "shared/timeutils/timeutils.h"
 #include "mbedtls/platform_time.h"
+#include "pico/aon_timer.h"
 
 extern uint8_t rosc_random_u8(size_t cycles);
 
@@ -44,9 +44,9 @@ int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t
 }
 
 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);
+    struct timespec ts;
+    aon_timer_get_time(&ts);
+    return ts.tv_sec;
 }
 
 mbedtls_ms_time_t mbedtls_ms_time(void) {
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 0acae25499996..798078faf6527 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -41,6 +41,7 @@
 #include "pico/bootrom.h"
 #include "pico/stdlib.h"
 #include "pico/unique_id.h"
+#include "pico/runtime_init.h"
 #if MICROPY_PY_NETWORK_CYW43
 #include "lib/cyw43-driver/src/cyw43.h"
 #endif
diff --git a/ports/rp2/modtime.c b/ports/rp2/modtime.c
index 21e5cb459b283..7d6dd8fd97112 100644
--- a/ports/rp2/modtime.c
+++ b/ports/rp2/modtime.c
@@ -26,28 +26,30 @@
 
 #include "py/obj.h"
 #include "shared/timeutils/timeutils.h"
-#include "hardware/rtc.h"
+#include "pico/aon_timer.h"
 
 // Return the localtime as an 8-tuple.
 static mp_obj_t mp_time_localtime_get(void) {
-    datetime_t t;
-    rtc_get_datetime(&t);
+    struct timespec ts;
+    aon_timer_get_time(&ts);
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_epoch_to_struct_time(ts.tv_sec, &tm);
     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),
-        mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
+        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(tm.tm_hour),
+        mp_obj_new_int(tm.tm_min),
+        mp_obj_new_int(tm.tm_sec),
+        mp_obj_new_int(tm.tm_wday),
+        mp_obj_new_int(tm.tm_yday),
     };
     return mp_obj_new_tuple(8, tuple);
 }
 
 // Return the number of seconds since the Epoch.
 static mp_obj_t mp_time_time_get(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));
+    struct timespec ts;
+    aon_timer_get_time(&ts);
+    return mp_obj_new_int_from_ull(ts.tv_sec);
 }
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index aa5415d6c842d..3fcc011b62676 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -37,16 +37,18 @@
 #include "tusb.h"
 #include "uart.h"
 #include "hardware/irq.h"
-#include "hardware/rtc.h"
 #include "pico/unique_id.h"
+#include "pico/aon_timer.h"
 
 #if MICROPY_PY_NETWORK_CYW43
 #include "lib/cyw43-driver/src/cyw43.h"
 #endif
 
+#if PICO_RP2040
 // This needs to be added to the result of time_us_64() to get the number of
 // microseconds since the Epoch.
 static uint64_t time_us_64_offset_from_epoch;
+#endif
 
 #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
 
@@ -145,27 +147,35 @@ void mp_hal_delay_ms(mp_uint_t ms) {
 }
 
 void mp_hal_time_ns_set_from_rtc(void) {
+    #if PICO_RP2040
     // Outstanding RTC register writes need at least two RTC clock cycles to
     // update. (See RP2040 datasheet section 4.8.4 "Reference clock").
     mp_hal_delay_us(44);
 
     // Sample RTC and time_us_64() as close together as possible, so the offset
     // calculated for the latter can be as accurate as possible.
-    datetime_t t;
-    rtc_get_datetime(&t);
+    struct timespec ts;
+    aon_timer_get_time(&ts);
     uint64_t us = time_us_64();
 
-    // Calculate the difference between the RTC Epoch seconds and time_us_64().
-    uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
-    time_us_64_offset_from_epoch = (uint64_t)s * 1000000ULL - us;
+    // Calculate the difference between the RTC Epoch and time_us_64().
+    time_us_64_offset_from_epoch = ((uint64_t)ts.tv_sec * 1000000ULL) + ((uint64_t)ts.tv_nsec / 1000ULL) - us;
+    #endif
 }
 
 uint64_t mp_hal_time_ns(void) {
-    // The RTC only has seconds resolution, so instead use time_us_64() to get a more
+    #if PICO_RP2040
+    // The RTC probably has limited resolution, so instead use time_us_64() to get a more
     // precise measure of Epoch time.  Both these "clocks" are clocked from the same
     // source so they remain synchronised, and only differ by a fixed offset (calculated
     // in mp_hal_time_ns_set_from_rtc).
     return (time_us_64_offset_from_epoch + time_us_64()) * 1000ULL;
+    #else
+    // aon timer has ms resolution
+    struct timespec ts;
+    aon_timer_get_time(&ts);
+    return ((uint64_t)ts.tv_sec * 1000000000ULL) + (uint64_t)ts.tv_nsec;
+    #endif
 }
 
 // Generate a random locally administered MAC address (LAA)
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index e58adb3ba3595..fcc60b3fe5796 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -43,7 +43,14 @@ static soft_timer_entry_t mp_network_soft_timer;
 #include "lib/cyw43-driver/src/cyw43.h"
 #include "lib/cyw43-driver/src/cyw43_stats.h"
 #include "hardware/irq.h"
+
+#if PICO_RP2040
 #include "RP2040.h" // cmsis, for NVIC_SetPriority and PendSV_IRQn
+#elif PICO_RP2350
+#include "RP2350.h" // cmsis, for NVIC_SetPriority and PendSV_IRQn
+#else
+#error Unknown processor
+#endif
 
 #define CYW43_IRQ_LEVEL GPIO_IRQ_LEVEL_HIGH
 #define CYW43_SHARED_IRQ_HANDLER_PRIORITY PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 6cfe624c3037f..2f06871b3ac5b 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -28,7 +28,14 @@
 #include "py/mpconfig.h"
 #include "mutex_extra.h"
 #include "pendsv.h"
+
+#if PICO_RP2040
 #include "RP2040.h"
+#elif PICO_RP2350
+#include "RP2350.h"
+#else
+#error Unknown chip
+#endif
 
 #if MICROPY_PY_NETWORK_CYW43
 #include "lib/cyw43-driver/src/cyw43_stats.h"

From 6d39418f699edc6532d84bf1be53fe8d00d92752 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Mon, 1 Jul 2024 15:29:57 +0100
Subject: [PATCH 1533/3129] rp2: Add support for 48-pin RP2350 variant.

Update NUM_GPIOS to match NUM_BANK0_GPIOS, and increase bit-width of
variables that store pin numbers.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/boards/make-pins.py | 2 +-
 ports/rp2/machine_pin.c       | 2 +-
 ports/rp2/machine_pin.h       | 2 +-
 ports/rp2/mphalport.h         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index 3acf5b9516997..f4ce74e5a42b3 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -9,7 +9,7 @@
 import boardgen
 
 # This is NUM_BANK0_GPIOS. Pin indices are 0 to 29 (inclusive).
-NUM_GPIOS = 30
+NUM_GPIOS = 48
 # Up to 32 additional extended pins (e.g. via the wifi chip or io expanders).
 NUM_EXT_GPIOS = 32
 
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index de217785690c2..e1a545a09234c 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -89,7 +89,7 @@ static const mp_irq_methods_t machine_pin_irq_methods;
 extern const machine_pin_obj_t machine_pin_obj_table[NUM_BANK0_GPIOS];
 
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
-uint32_t machine_pin_open_drain_mask;
+uint64_t machine_pin_open_drain_mask;
 
 #if MICROPY_HW_PIN_EXT_COUNT
 static inline bool is_ext_pin(__unused const machine_pin_obj_t *self) {
diff --git a/ports/rp2/machine_pin.h b/ports/rp2/machine_pin.h
index b3349188e8ba1..196132019e609 100644
--- a/ports/rp2/machine_pin.h
+++ b/ports/rp2/machine_pin.h
@@ -49,7 +49,7 @@ typedef struct _machine_pin_af_obj_t {
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     qstr name;
-    uint8_t id                  : 5;
+    uint8_t id                  : 6;
     #if MICROPY_HW_PIN_EXT_COUNT
     uint8_t is_ext              : 1;
     uint8_t is_output           : 1;
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 09ad54dd1eb78..1d260c8bd8b61 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -119,7 +119,7 @@ static inline mp_uint_t mp_hal_get_cpu_freq(void) {
 #define MP_HAL_PIN_PULL_UP              (1)
 #define MP_HAL_PIN_PULL_DOWN            (2)
 
-extern uint32_t machine_pin_open_drain_mask;
+extern uint64_t machine_pin_open_drain_mask;
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
 

From a3d1c59ca3db93278624055074af081f8cf747e1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 2 Sep 2024 16:29:49 +1000
Subject: [PATCH 1534/3129] rp2/machine_pin: Move decl of machine_pin_obj_table
 to public header.

So other code can include `machine_pin.h` and use the pin name macros such
as `pin_GPIO0`.

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

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index e1a545a09234c..79f91232f77a6 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -86,7 +86,6 @@ typedef struct _machine_pin_irq_obj_t {
 } machine_pin_irq_obj_t;
 
 static const mp_irq_methods_t machine_pin_irq_methods;
-extern const machine_pin_obj_t machine_pin_obj_table[NUM_BANK0_GPIOS];
 
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
 uint64_t machine_pin_open_drain_mask;
diff --git a/ports/rp2/machine_pin.h b/ports/rp2/machine_pin.h
index 196132019e609..2d85bdcadc165 100644
--- a/ports/rp2/machine_pin.h
+++ b/ports/rp2/machine_pin.h
@@ -64,6 +64,8 @@ extern const mp_obj_type_t machine_pin_af_type;
 // Include all of the individual pin objects
 #include "genhdr/pins.h"
 
+extern const machine_pin_obj_t machine_pin_obj_table[NUM_BANK0_GPIOS];
+
 extern const mp_obj_type_t pin_cpu_pins_obj_type;
 extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;
 

From e6093c0fbdc7e9da5e044aaa4442bb125939aef9 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 2 Jul 2024 17:39:02 +0100
Subject: [PATCH 1535/3129] rp2/rp2_pio: Add support for RP2350A/B variants in
 PIO interface.

Add support for 32 and 48 pin variants of RP2350.

Add new `PIO.gpio_base()` method, mirroring the Pico SDK.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/rp2.PIO.rst | 11 +++++
 ports/rp2/rp2_pio.c      | 92 ++++++++++++++++++++++++++++++++++------
 2 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/docs/library/rp2.PIO.rst b/docs/library/rp2.PIO.rst
index e0675af1e9a2c..f922456c8c483 100644
--- a/docs/library/rp2.PIO.rst
+++ b/docs/library/rp2.PIO.rst
@@ -27,6 +27,17 @@ Constructors
 Methods
 -------
 
+.. method:: PIO.gpio_base([base])
+
+    Query and optionally set the current GPIO base for this PIO instance.
+
+    If an argument is given then it must be a pin (or integer corresponding to a pin
+    number), restricted to either GPIO0 or GPIO16.  The GPIO base will then be set to
+    that pin.  Setting the GPIO base must be done before any programs are added or state
+    machines created.
+
+    Returns the current GPIO base pin.
+
 .. method:: PIO.add_program(program)
 
     Add the *program* to the instruction memory of this PIO instance.
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 0ca91656f84ef..56c576581e0df 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -31,6 +31,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "shared/runtime/mpirq.h"
+#include "machine_pin.h"
 #include "modrp2.h"
 
 #include "hardware/clocks.h"
@@ -54,7 +55,7 @@ typedef struct _rp2_state_machine_obj_t {
     PIO pio;
     uint8_t irq;
     uint8_t sm; // 0-3
-    uint8_t id; // 0-7
+    uint8_t id; // 0-7 on RP2040, or 0-11 on RP2350
 } rp2_state_machine_obj_t;
 
 typedef struct _rp2_state_machine_irq_obj_t {
@@ -63,11 +64,11 @@ typedef struct _rp2_state_machine_irq_obj_t {
     uint8_t trigger;
 } 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 const rp2_state_machine_obj_t rp2_state_machine_obj[NUM_PIOS * 4];
+static uint8_t rp2_state_machine_initial_pc[NUM_PIOS * 4];
 
 // These masks keep track of PIO instruction memory used by this module.
-static uint32_t rp2_pio_instruction_memory_usage_mask[2];
+static uint32_t rp2_pio_instruction_memory_usage_mask[NUM_PIOS];
 
 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);
@@ -104,8 +105,19 @@ static void pio1_irq0(void) {
     pio_irq0(pio1);
 }
 
+#if NUM_PIOS >= 3
+static void pio2_irq0(void) {
+    pio_irq0(pio2);
+}
+#endif
+
 // Returns the correct irq0 handler wrapper for a given pio
 static inline irq_handler_t rp2_pio_get_irq_handler(PIO pio) {
+    #if NUM_PIOS >= 3
+    if (pio == pio2) {
+        return pio2_irq0;
+    }
+    #endif
     return pio == pio0 ? pio0_irq0 : pio1_irq0;
 }
 
@@ -172,6 +184,12 @@ void rp2_pio_deinit(void) {
         irq_set_enabled(PIO1_IRQ_0, false);
         irq_remove_handler(PIO1_IRQ_0, pio1_irq0);
     }
+    #if NUM_PIOS >= 3
+    if (irq_get_exclusive_handler(PIO2_IRQ_0) == pio2_irq0) {
+        irq_set_enabled(PIO2_IRQ_0, false);
+        irq_remove_handler(PIO2_IRQ_0, pio2_irq0);
+    }
+    #endif
 
     rp2_state_machine_reset_all();
 
@@ -180,6 +198,9 @@ void rp2_pio_deinit(void) {
     // and their PIO programs should remain intact.
     rp2_pio_remove_all_managed_programs(pio0);
     rp2_pio_remove_all_managed_programs(pio1);
+    #if NUM_PIOS >= 3
+    rp2_pio_remove_all_managed_programs(pio2);
+    #endif
 }
 
 /******************************************************************************/
@@ -212,7 +233,7 @@ static void asm_pio_override_shiftctrl(mp_obj_t arg, uint32_t bits, uint32_t 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) {
+static void asm_pio_get_pins(PIO pio, 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)) {
@@ -238,13 +259,21 @@ static void asm_pio_get_pins(const char *type, mp_obj_t prog_pins, mp_obj_t arg_
     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);
+
+        #if PICO_PIO_USE_GPIO_BASE
+        // Check the base is within range of the configured gpio_base.
+        uint gpio_base = pio_get_gpio_base(pio);
+        if ((gpio_base == 0 && config->base >= 32) || (gpio_base == 16 && config->base < 16)) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%s_base not within gpio_base range"), type);
+        }
+        #endif
     }
 }
 
 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);
+    uint32_t pinmask = ((1 << config->count) - 1) << (config->base - pio_get_gpio_base(pio));
+    pio_sm_set_pins_with_mask(pio, sm, config->pinvals << (config->base - pio_get_gpio_base(pio)), pinmask);
+    pio_sm_set_pindirs_with_mask(pio, sm, config->pindirs << (config->base - pio_get_gpio_base(pio)), pinmask);
     for (size_t i = 0; i < config->count; ++i) {
         gpio_set_function(config->base + i, GPIO_FUNC_PIO0 + pio_get_index(pio));
     }
@@ -258,6 +287,9 @@ 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 },
+    #if NUM_PIOS >= 3
+    { { &rp2_pio_type }, pio2, PIO2_IRQ_0 },
+    #endif
 };
 
 static void rp2_pio_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -357,6 +389,31 @@ static mp_obj_t rp2_pio_state_machine(size_t n_args, const mp_obj_t *pos_args, m
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(rp2_pio_state_machine_obj, 2, rp2_pio_state_machine);
 
+#if PICO_PIO_USE_GPIO_BASE
+// PIO.gpio_base([base])
+static mp_obj_t rp2_pio_gpio_base(size_t n_args, const mp_obj_t *args) {
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (n_args > 1) {
+        // Set gpio_base value.
+        uint gpio_base = mp_hal_get_pin_obj(args[1]);
+
+        // Must be 0 for GPIOs 0 to 31 inclusive, or 16 for GPIOs 16 to 48 inclusive.
+        if (!(gpio_base == 0 || gpio_base == 16)) {
+            mp_raise_ValueError("invalid GPIO base");
+        }
+
+        if (pio_set_gpio_base(self->pio, gpio_base) != PICO_OK) {
+            mp_raise_OSError(MP_EINVAL);
+        }
+    }
+
+    // Return current gpio_base value.
+    return pio_get_gpio_base(self->pio) == 0 ? (mp_obj_t)pin_GPIO0 : (mp_obj_t)pin_GPIO16;
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_pio_gpio_base_obj, 1, 2, rp2_pio_gpio_base);
+#endif
+
 // 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 };
@@ -410,6 +467,9 @@ static mp_obj_t rp2_pio_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 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[] = {
+    #if PICO_PIO_USE_GPIO_BASE
+    { MP_ROM_QSTR(MP_QSTR_gpio_base), MP_ROM_PTR(&rp2_pio_gpio_base_obj) },
+    #endif
     { 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) },
@@ -486,6 +546,12 @@ static const rp2_state_machine_obj_t rp2_state_machine_obj[] = {
     { { &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 },
+    #if NUM_PIOS >= 3
+    { { &rp2_state_machine_type }, pio2, PIO2_IRQ_0, 0, 8 },
+    { { &rp2_state_machine_type }, pio2, PIO2_IRQ_0, 1, 9 },
+    { { &rp2_state_machine_type }, pio2, PIO2_IRQ_0, 2, 10 },
+    { { &rp2_state_machine_type }, pio2, PIO2_IRQ_0, 3, 11 },
+    #endif
 };
 
 static const rp2_state_machine_obj_t *rp2_state_machine_get_object(mp_int_t sm_id) {
@@ -604,14 +670,14 @@ static mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
 
     // 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);
+    asm_pio_get_pins(self->pio, "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);
+    asm_pio_get_pins(self->pio, "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);
     }
@@ -623,7 +689,7 @@ static mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
 
     // 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);
+    asm_pio_get_pins(self->pio, "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)) {
@@ -951,5 +1017,5 @@ static const mp_irq_methods_t rp2_state_machine_irq_methods = {
     .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]);
+MP_REGISTER_ROOT_POINTER(void *rp2_pio_irq_obj[NUM_PIOS]);
+MP_REGISTER_ROOT_POINTER(void *rp2_state_machine_irq_obj[NUM_PIOS * 4]);

From 4af09de19cbcf8acef549d094eab846b87ea46ba Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Mon, 8 Jul 2024 15:57:13 +0100
Subject: [PATCH 1536/3129] rp2/boards/make-pins.py: Pass
 num-gpios/num-ext-gpios into make-pins.

NUM_GPIOS amd NUM_EXT_GPIOS are currently hardcoded in make-pins.py, which
makes it difficult to support SoCs with different pin count.

This commit generalises make-pins.py by passing in the pin count in via the
new arguments `--num-gpios` and `--num-ext-gpios`.  These default to the
current values supported by Pico, namely 30/10.  This can be changed with
PICO_NUM_GPIOS and PICO_NUM_EXT_GPIOS in `mpconfigboard.cmake`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt      | 10 +++++++++-
 ports/rp2/boards/make-pins.py | 35 +++++++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 6f66181546271..0d5b10f337380 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -588,6 +588,14 @@ set(GEN_PINS_MKPINS "${MICROPY_PORT_DIR}/boards/make-pins.py")
 set(GEN_PINS_SRC "${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c")
 set(GEN_PINS_HDR "${MICROPY_GENHDR_DIR}/pins.h")
 
+if(NOT PICO_NUM_GPIOS)
+    set(PICO_NUM_GPIOS 30)
+endif()
+
+if(NOT PICO_NUM_EXT_GPIOS)
+    set(PICO_NUM_EXT_GPIOS 10)
+endif()
+
 if(EXISTS "${MICROPY_BOARD_DIR}/pins.csv")
     set(GEN_PINS_BOARD_CSV "${MICROPY_BOARD_DIR}/pins.csv")
     set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
@@ -600,7 +608,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
 # Generate pins
 add_custom_command(
     OUTPUT ${GEN_PINS_HDR} ${GEN_PINS_SRC}
-    COMMAND ${Python3_EXECUTABLE} ${GEN_PINS_MKPINS} ${GEN_PINS_CSV_ARG} --af-csv ${GEN_PINS_AF_CSV} --prefix ${GEN_PINS_PREFIX} --output-source ${GEN_PINS_SRC} --output-header ${GEN_PINS_HDR}
+    COMMAND ${Python3_EXECUTABLE} ${GEN_PINS_MKPINS} ${GEN_PINS_CSV_ARG} --af-csv ${GEN_PINS_AF_CSV} --prefix ${GEN_PINS_PREFIX} --output-source ${GEN_PINS_SRC} --num-gpios ${PICO_NUM_GPIOS} --num-ext-gpios ${PICO_NUM_EXT_GPIOS} --output-header ${GEN_PINS_HDR}
     DEPENDS
         ${GEN_PINS_AF_CSV}
         ${GEN_PINS_BOARD_CSV}
diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index f4ce74e5a42b3..1da2edb7cacd6 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -9,9 +9,9 @@
 import boardgen
 
 # This is NUM_BANK0_GPIOS. Pin indices are 0 to 29 (inclusive).
-NUM_GPIOS = 48
+NUM_GPIOS = None
 # Up to 32 additional extended pins (e.g. via the wifi chip or io expanders).
-NUM_EXT_GPIOS = 32
+NUM_EXT_GPIOS = None
 
 
 class Rp2Pin(boardgen.Pin):
@@ -108,12 +108,6 @@ def __init__(self):
             enable_af=True,
         )
 
-        # Pre-define the pins (i.e. don't require them to be listed in pins.csv).
-        for i in range(NUM_GPIOS):
-            self.add_cpu_pin("GPIO{}".format(i))
-        for i in range(NUM_EXT_GPIOS):
-            self.add_cpu_pin("EXT_GPIO{}".format(i))
-
     # Provided by pico-sdk.
     def cpu_table_size(self):
         return "NUM_BANK0_GPIOS"
@@ -128,6 +122,31 @@ def print_source(self, out_source):
         super().print_source(out_source)
         self.print_cpu_locals_dict(out_source)
 
+    def extra_args(self, parser):
+        parser.add_argument("--num-gpios", type=int)
+        parser.add_argument("--num-ext-gpios", type=int)
+
+    def load_inputs(self, out_source):
+        global NUM_GPIOS
+        global NUM_EXT_GPIOS
+
+        # Needed by validate_cpu_pin_name
+        NUM_GPIOS = self.args.num_gpios
+        NUM_EXT_GPIOS = self.args.num_ext_gpios
+
+        if NUM_GPIOS is None:
+            raise boardgen.PinGeneratorError("Please pass num-gpios")
+
+        if NUM_EXT_GPIOS is None:
+            NUM_EXT_GPIOS = 0
+        # Pre-define the pins (i.e. don't require them to be listed in pins.csv).
+        for i in range(NUM_GPIOS):
+            self.add_cpu_pin("GPIO{}".format(i))
+        for i in range(NUM_EXT_GPIOS):
+            self.add_cpu_pin("EXT_GPIO{}".format(i))
+
+        super().load_inputs(out_source)
+
 
 if __name__ == "__main__":
     Rp2PinGenerator().main()

From 733052f6b9a5d3e470ede99c04a4f440e789ebac Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 10 Jul 2024 12:44:59 +0100
Subject: [PATCH 1537/3129] rp2/machine_pin: Use 64-bit gpio functions to allow
 gpios >=32 to work.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_pin.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 79f91232f77a6..8fdde114bd311 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -297,7 +297,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
                 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);
+            machine_pin_open_drain_mask &= ~(1ULL << self->id);
         }
     }
 
@@ -379,7 +379,7 @@ static mp_obj_t machine_pin_low(mp_obj_t self_in) {
     } else if (GPIO_IS_OPEN_DRAIN(self->id)) {
         gpio_set_dir(self->id, GPIO_OUT);
     } else {
-        gpio_clr_mask(1u << self->id);
+        gpio_clr_mask64(1ULL << self->id);
     }
     return mp_const_none;
 }
@@ -395,7 +395,7 @@ static mp_obj_t machine_pin_high(mp_obj_t self_in) {
     } else if (GPIO_IS_OPEN_DRAIN(self->id)) {
         gpio_set_dir(self->id, GPIO_IN);
     } else {
-        gpio_set_mask(1u << self->id);
+        gpio_set_mask64(1ULL << self->id);
     }
     return mp_const_none;
 }
@@ -416,7 +416,7 @@ static mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
             gpio_set_dir(self->id, GPIO_OUT);
         }
     } else {
-        gpio_xor_mask(1u << self->id);
+        gpio_xor_mask64(1ULL << self->id);
     }
     return mp_const_none;
 }

From 57f4cabff93a11e27c61ecb181664e0d70c7ced1 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Mon, 8 Jul 2024 16:22:56 +0100
Subject: [PATCH 1538/3129] rp2/machine_pin: Generalise gpio_irq handler for
 pins >32.

Fix the gpio_irq function so that it looks at all six iobank0_hw->intr[n]
registers, for up to 48 IOs.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/machine_pin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 8fdde114bd311..8ba0b44a684f7 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -86,6 +86,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 int num_intr_regs = sizeof(iobank0_hw->intr) / sizeof(iobank0_hw->intr[0]);
 
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
 uint64_t machine_pin_open_drain_mask;
@@ -99,7 +100,7 @@ static inline bool is_ext_pin(__unused const machine_pin_obj_t *self) {
 #endif
 
 static void gpio_irq(void) {
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < num_intr_regs; ++i) {
         uint32_t intr = iobank0_hw->intr[i];
         if (intr) {
             for (int j = 0; j < 8; ++j) {

From d0bc42796b1fce183f2bb5ddfdde05bd7c9f6b18 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 10 Jul 2024 16:01:16 +0100
Subject: [PATCH 1539/3129] rp2/clocks_extra: Update runtime_clocks_init based
 on new pico-sdk.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt |  3 +-
 ports/rp2/clocks_extra.c | 68 +++++++++++++++++++++++++++++++---------
 ports/rp2/clocks_extra.h |  2 +-
 ports/rp2/modmachine.c   |  2 +-
 4 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 0d5b10f337380..40672a8b31655 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -181,6 +181,7 @@ set(PICO_SDK_COMPONENTS
     cmsis_core
     hardware_adc
     hardware_base
+    hardware_boot_lock
     hardware_clocks
     hardware_dma
     hardware_flash
@@ -487,7 +488,7 @@ target_compile_options(${MICROPY_TARGET} PRIVATE
 target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}
     -Wl,--wrap=dcd_event_handler
-    -Wl,--wrap=clocks_init
+    -Wl,--wrap=runtime_init_clocks
 )
 
 # Apply optimisations to performance-critical source code.
diff --git a/ports/rp2/clocks_extra.c b/ports/rp2/clocks_extra.c
index e2c97962cb43d..73def24b80455 100644
--- a/ports/rp2/clocks_extra.c
+++ b/ports/rp2/clocks_extra.c
@@ -13,22 +13,36 @@
 #include "hardware/xosc.h"
 #include "hardware/irq.h"
 #include "hardware/gpio.h"
+#include "hardware/ticks.h"
 
+#if PICO_RP2040
+// The RTC clock frequency is 48MHz divided by power of 2 (to ensure an integer
+// division ratio will be used in the clocks block).  A divisor of 1024 generates
+// an RTC clock tick of 46875Hz.  This frequency is relatively close to the
+// customary 32 or 32.768kHz 'slow clock' crystals and provides good timing resolution.
 #define RTC_CLOCK_FREQ_HZ       (USB_CLK_KHZ * KHZ / 1024)
+#endif
+
+static void start_all_ticks(void) {
+    uint32_t cycles = clock_get_hz(clk_ref) / MHZ;
+    // Note RP2040 has a single tick generator in the watchdog which serves
+    // watchdog, system timer and M0+ SysTick; The tick generator is clocked from clk_ref
+    // but is now adapted by the hardware_ticks library for compatibility with RP2350
+    // npte: hardware_ticks library now provides an adapter for RP2040
+
+    for (int i = 0; i < (int)TICK_COUNT; ++i) {
+        tick_start((tick_gen_num_t)i, cycles);
+    }
+}
 
 // Wrap the SDK's clocks_init() function to save code size
-void __wrap_clocks_init(void) {
-    clocks_init_optional_usb(true);
+void __wrap_runtime_init_clocks(void) {
+    runtime_init_clocks_optional_usb(true);
 }
 
-// Copy of clocks_init() from pico-sdk, with USB
+// Copy of runtime_init_clocks() from pico-sdk, with USB
 // PLL and clock init made optional (for light sleep wakeup).
-void clocks_init_optional_usb(bool init_usb) {
-    // Start tick in watchdog, the argument is in 'cycles per microsecond' i.e. MHz
-    watchdog_start_tick(XOSC_KHZ / KHZ);
-
-    // Modification: removed FPGA check here
-
+void runtime_init_clocks_optional_usb(bool init_usb) {
     // Disable resus that may be enabled from previous software
     clocks_hw->resus.ctrl = 0;
 
@@ -46,14 +60,26 @@ void clocks_init_optional_usb(bool init_usb) {
     }
 
     /// \tag::pll_init[]
-    pll_init(pll_sys, PLL_COMMON_REFDIV, PLL_SYS_VCO_FREQ_KHZ * KHZ, PLL_SYS_POSTDIV1, PLL_SYS_POSTDIV2);
+    pll_init(pll_sys, PLL_COMMON_REFDIV, PLL_SYS_VCO_FREQ_HZ, PLL_SYS_POSTDIV1, PLL_SYS_POSTDIV2);
     if (init_usb) {
-        pll_init(pll_usb, PLL_COMMON_REFDIV, PLL_USB_VCO_FREQ_KHZ * KHZ, PLL_USB_POSTDIV1, PLL_USB_POSTDIV2);
+        pll_init(pll_usb, PLL_COMMON_REFDIV, PLL_USB_VCO_FREQ_HZ, PLL_USB_POSTDIV1, PLL_USB_POSTDIV2);
     }
     /// \end::pll_init[]
 
     // Configure clocks
-    // CLK_REF = XOSC (usually) 12MHz / 1 = 12MHz
+
+    // todo amy, what is this N1,2,4 meant to mean?
+    // RP2040 CLK_REF = XOSC (usually) 12MHz / 1 = 12MHz
+    // RP2350 CLK_REF = XOSC (XOSC_MHZ) / N (1,2,4) = 12MHz
+
+    // clk_ref aux select is 0 because:
+    //
+    // - RP2040: no aux mux on clk_ref, so this field is don't-care.
+    //
+    // - RP2350: there is an aux mux, but we are selecting one of the
+    //   non-aux inputs to the glitchless mux, so the aux select doesn't
+    //   matter. The value of 0 here happens to be the sys PLL.
+
     clock_configure(clk_ref,
         CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC,
         0,             // No aux mux
@@ -85,18 +111,32 @@ void clocks_init_optional_usb(bool init_usb) {
         USB_CLK_KHZ * KHZ,
         USB_CLK_KHZ * KHZ);
 
+    #if HAS_RP2040_RTC
     // CLK RTC = PLL USB 48MHz / 1024 = 46875Hz
     clock_configure(clk_rtc,
         0,             // No GLMUX
         CLOCKS_CLK_RTC_CTRL_AUXSRC_VALUE_CLKSRC_PLL_USB,
         USB_CLK_KHZ * KHZ,
         RTC_CLOCK_FREQ_HZ);
+    #endif
 
-    // CLK PERI = clk_sys. Used as reference clock for Peripherals. No dividers so just select and enable
-    // Normally choose clk_sys or clk_usb
+    // CLK PERI = clk_sys. Used as reference clock for UART and SPI serial.
     clock_configure(clk_peri,
         0,
         CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS,
         SYS_CLK_KHZ * KHZ,
         SYS_CLK_KHZ * KHZ);
+
+    #if PICO_RP2350
+    // CLK_HSTX = clk_sys. Transmit bit clock for the HSTX peripheral.
+    clock_configure(clk_hstx,
+        0,
+        CLOCKS_CLK_HSTX_CTRL_AUXSRC_VALUE_CLK_SYS,
+        SYS_CLK_KHZ * KHZ,
+        SYS_CLK_KHZ * KHZ);
+    #endif
+
+    // Finally, all clocks are configured so start the ticks
+    // The ticks use clk_ref so now that is configured we can start them
+    start_all_ticks();
 }
diff --git a/ports/rp2/clocks_extra.h b/ports/rp2/clocks_extra.h
index 40f77f53bd850..7d630e5088f5c 100644
--- a/ports/rp2/clocks_extra.h
+++ b/ports/rp2/clocks_extra.h
@@ -28,6 +28,6 @@
 
 #include "hardware/clocks.h"
 
-void clocks_init_optional_usb(bool init_usb);
+void runtime_init_clocks_optional_usb(bool init_usb);
 
 #endif // MICROPY_INCLUDED_RP2_CLOCKS_EXTRA_H
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 798078faf6527..2faf0bc6f8713 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -259,7 +259,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_ENABLE << ROSC_CTRL_ENABLE_LSB;
 
     // Bring back all clocks.
-    clocks_init_optional_usb(disable_usb);
+    runtime_init_clocks_optional_usb(disable_usb);
     MICROPY_END_ATOMIC_SECTION(my_interrupts);
 }
 

From 34e463d861c5ebb33ec317749a008d461616cfbc Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Mon, 5 Aug 2024 22:02:13 +0100
Subject: [PATCH 1540/3129] rp2/machine_adc: Add ADC support for RP2350B.

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

diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 3594f4b124022..40c216d59bc8d 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -31,9 +31,8 @@
 #include "hardware/adc.h"
 #include "machine_pin.h"
 
-#define ADC_IS_VALID_GPIO(gpio) ((gpio) >= 26 && (gpio) <= 29)
-#define ADC_CHANNEL_FROM_GPIO(gpio) ((gpio) - 26)
-#define ADC_CHANNEL_TEMPSENSOR (4)
+#define ADC_IS_VALID_GPIO(gpio) ((gpio) >= ADC_BASE_PIN && (gpio) < (ADC_BASE_PIN + NUM_ADC_CHANNELS))
+#define ADC_CHANNEL_FROM_GPIO(gpio) ((gpio) - ADC_BASE_PIN)
 
 static uint16_t adc_config_and_read_u16(uint32_t channel) {
     adc_select_input(channel);
@@ -47,7 +46,7 @@ static uint16_t adc_config_and_read_u16(uint32_t channel) {
 // MicroPython bindings for machine.ADC
 
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS \
-    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_CHANNEL_TEMPSENSOR) }, \
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_TEMPERATURE_CHANNEL_NUM) }, \
 
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
@@ -75,7 +74,7 @@ static mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
 
     if (mp_obj_is_int(source)) {
         channel = mp_obj_get_int(source);
-        if (!(channel >= 0 && channel <= ADC_CHANNEL_TEMPSENSOR)) {
+        if (!(channel >= 0 && channel < NUM_ADC_CHANNELS)) {
             // Not a valid ADC channel, fallback to searching for a pin.
             channel = -1;
         }
@@ -116,7 +115,7 @@ static mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
             adc_gpio_init(pin->id);
             channel = ADC_CHANNEL_FROM_GPIO(pin->id);
         }
-    } else if (channel == ADC_CHANNEL_TEMPSENSOR) {
+    } else if (channel == ADC_TEMPERATURE_CHANNEL_NUM) {
         // Enable temperature sensor.
         adc_set_temp_sensor_enabled(1);
     }

From 4fc6cf914187f7cf6b03d943dea50b457331beab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Aug 2024 14:34:22 +1000
Subject: [PATCH 1541/3129] rp2: Add support for RP2350 in RISCV mode.

As part of this change, the RV32I native emitter is enabled on RISCV
board variants.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 41 ++++++++++++++++++++++++++++++++++++----
 ports/rp2/main.c         |  6 +++---
 ports/rp2/mpconfigport.h |  8 +++++++-
 ports/rp2/pendsv.c       | 14 +++++++++++---
 4 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 40672a8b31655..13a370c633b85 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -93,6 +93,14 @@ include(${MICROPY_DIR}/py/usermod.cmake)
 
 add_executable(${MICROPY_TARGET})
 
+# Provide a C-level definitions of PICO_ARM.
+# (The pico-sdk already defines PICO_RISCV when it's enabled.)
+if(PICO_ARM)
+    target_compile_definitions(pico_platform_headers INTERFACE
+        PICO_ARM=1
+    )
+endif()
+
 set(MICROPY_QSTRDEFS_PORT
     ${MICROPY_PORT_DIR}/qstrdefsport.h
 )
@@ -108,7 +116,6 @@ 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_thumb1.s
     ${MICROPY_DIR}/shared/runtime/gchelper_native.c
     ${MICROPY_DIR}/shared/runtime/interrupt_char.c
     ${MICROPY_DIR}/shared/runtime/mpirq.c
@@ -123,6 +130,16 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c
 )
 
+if(PICO_ARM)
+    list(APPEND MICROPY_SOURCE_LIB
+        ${MICROPY_DIR}/shared/runtime/gchelper_thumb1.s
+    )
+elseif(PICO_RISCV)
+    list(APPEND MICROPY_SOURCE_LIB
+        ${MICROPY_DIR}/shared/runtime/gchelper_rv32i.s
+    )
+endif()
+
 set(MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/bus/softspi.c
     ${MICROPY_DIR}/drivers/dht/dht.c
@@ -178,7 +195,6 @@ set(MICROPY_SOURCE_QSTR
 )
 
 set(PICO_SDK_COMPONENTS
-    cmsis_core
     hardware_adc
     hardware_base
     hardware_boot_lock
@@ -222,6 +238,17 @@ set(PICO_SDK_COMPONENTS
     tinyusb_device
 )
 
+if(PICO_ARM)
+    list(APPEND PICO_SDK_COMPONENTS
+        cmsis_core
+    )
+elseif(PICO_RISCV)
+    list(APPEND PICO_SDK_COMPONENTS
+        hardware_hazard3
+        hardware_riscv
+    )
+endif()
+
 # Use our custom pico_float_micropython float implementation.  This is needed for two reasons:
 # - to fix inf handling in pico-sdk's __wrap___aeabi_fadd();
 # - so we can use our own libm functions, to fix inaccuracies in the pico-sdk versions.
@@ -243,7 +270,7 @@ if(PICO_RP2040)
         ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_init_rom_rp2040.c
         ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_v1_rom_shim_rp2040.S
     )
-elseif(PICO_RP2350)
+elseif(PICO_RP2350 AND PICO_ARM)
     target_sources(pico_float_micropython INTERFACE
         ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_aeabi_dcp.S
         ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_conv_m33.S
@@ -491,6 +518,12 @@ target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--wrap=runtime_init_clocks
 )
 
+if(PICO_RP2350)
+    target_link_options(${MICROPY_TARGET} PRIVATE
+        -Wl,--defsym=__micropy_extra_stack__=4096
+    )
+endif()
+
 # Apply optimisations to performance-critical source code.
 set_source_files_properties(
     ${MICROPY_PY_DIR}/map.c
@@ -563,7 +596,7 @@ endif()
 
 pico_add_extra_outputs(${MICROPY_TARGET})
 
-pico_find_compiler(PICO_COMPILER_SIZE ${PICO_GCC_TRIPLE}-size)
+pico_find_compiler_with_triples(PICO_COMPILER_SIZE "${PICO_GCC_TRIPLE}" size)
 
 add_custom_command(TARGET ${MICROPY_TARGET}
     POST_BUILD
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 012e26f484fde..8d7b353731a1f 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -60,10 +60,8 @@
 #endif
 #if PICO_RP2040
 #include "RP2040.h" // cmsis, for PendSV_IRQn and SCB/SCB_SCR_SEVONPEND_Msk
-#elif PICO_RP2350
+#elif PICO_RP2350 && PICO_ARM
 #include "RP2350.h" // cmsis, for PendSV_IRQn and SCB/SCB_SCR_SEVONPEND_Msk
-#else
-#error Unknown processor
 #endif
 #include "pico/aon_timer.h"
 #include "shared/timeutils/timeutils.h"
@@ -82,7 +80,9 @@ bi_decl(bi_program_feature_group_with_flags(BINARY_INFO_TAG_MICROPYTHON,
 
 int main(int argc, char **argv) {
     // This is a tickless port, interrupts should always trigger SEV.
+    #if PICO_ARM
     SCB->SCR |= SCB_SCR_SEVONPEND_Msk;
+    #endif
 
     pendsv_init();
     soft_timer_init();
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 80fe9f37c10ce..9a11e6048c6b4 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -78,10 +78,16 @@
 
 // MicroPython emitters
 #define MICROPY_PERSISTENT_CODE_LOAD            (1)
+#if PICO_ARM
 #define MICROPY_EMIT_THUMB                      (1)
-#define MICROPY_EMIT_THUMB_ARMV7M               (0)
 #define MICROPY_EMIT_INLINE_THUMB               (1)
+#if PICO_RP2040
+#define MICROPY_EMIT_THUMB_ARMV7M               (0)
 #define MICROPY_EMIT_INLINE_THUMB_FLOAT         (0)
+#endif
+#elif PICO_RISCV
+#define MICROPY_EMIT_RV32                       (1)
+#endif
 
 // Optimisations
 #define MICROPY_OPT_COMPUTED_GOTO               (1)
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 2f06871b3ac5b..905a5aa162ec5 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -31,10 +31,10 @@
 
 #if PICO_RP2040
 #include "RP2040.h"
-#elif PICO_RP2350
+#elif PICO_RP2350 && PICO_ARM
 #include "RP2350.h"
-#else
-#error Unknown chip
+#elif PICO_RISCV
+#include "pico/aon_timer.h"
 #endif
 
 #if MICROPY_PY_NETWORK_CYW43
@@ -43,6 +43,8 @@
 
 static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
 
+void PendSV_Handler(void);
+
 // Using the nowait variant here as softtimer updates PendSV from the loop of mp_wfe_or_timeout(),
 // where we don't want the CPU event bit to be set.
 static recursive_mutex_nowait_t pendsv_mutex;
@@ -75,10 +77,16 @@ void pendsv_resume(void) {
 void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
     pendsv_dispatch_table[slot] = f;
     if (pendsv_mutex.mutex.enter_count == 0) {
+        #if PICO_ARM
         // There is a race here where other core calls pendsv_suspend() before
         // ISR can execute, but dispatch will happen later when other core
         // calls pendsv_resume().
         SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+        #elif PICO_RISCV
+        struct timespec ts;
+        aon_timer_get_time(&ts);
+        aon_timer_enable_alarm(&ts, PendSV_Handler, false);
+        #endif
     } else {
         #if MICROPY_PY_NETWORK_CYW43
         CYW43_STAT_INC(PENDSV_DISABLED_COUNT);

From f2f08ef2d9ebf29d1c01dfe5720a46d49b6e5125 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Aug 2024 14:35:23 +1000
Subject: [PATCH 1542/3129] rp2/Makefile: Allow CMAKE_ARGS to be set by user.

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

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index b6e8852169217..f950bc7b90898 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -30,7 +30,7 @@ endif
 
 $(VERBOSE)MAKESILENT = -s
 
-CMAKE_ARGS = -DMICROPY_BOARD=$(BOARD) -DMICROPY_BOARD_DIR="$(abspath $(BOARD_DIR))"
+CMAKE_ARGS += -DMICROPY_BOARD=$(BOARD) -DMICROPY_BOARD_DIR="$(abspath $(BOARD_DIR))"
 
 ifdef USER_C_MODULES
 CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}

From 7a78e5ae7c89077efdc6d4e18b55c8ea52b3d30c Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Mon, 5 Aug 2024 13:47:25 -0600
Subject: [PATCH 1543/3129] rp2/machine_bitstream: Set SysTick reset value.

In case it doesn't have the correct value.

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

diff --git a/ports/rp2/machine_bitstream.c b/ports/rp2/machine_bitstream.c
index b65ec02147b40..8240fdad60636 100644
--- a/ports/rp2/machine_bitstream.c
+++ b/ports/rp2/machine_bitstream.c
@@ -48,6 +48,10 @@ void __time_critical_func(machine_bitstream_high_low)(mp_hal_pin_obj_t pin, uint
         }
     }
     mp_hal_pin_output(pin);
+
+    // Set systick reset value.
+    systick_hw->rvr = 0x00FFFFFF;
+
     // Enable the systick counter, source CPU clock.
     systick_hw->csr = 5;
 

From 957cea23d53ca3f9e912ad04570c813020828eb2 Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Tue, 6 Aug 2024 16:13:57 -0600
Subject: [PATCH 1544/3129] rp2/machine_uart: Allow new TX/RX pins on RP2350.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_uart.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 955e4a8479913..5fe6e31fde2ef 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -69,8 +69,13 @@
 #define MAX_BUFFER_SIZE  (32766)
 
 #define IS_VALID_PERIPH(uart, pin)  (((((pin) + 4) & 8) >> 3) == (uart))
+#if PICO_RP2350
+#define IS_VALID_TX(uart, pin)      (((pin) & 1) == 0 && IS_VALID_PERIPH(uart, pin))
+#define IS_VALID_RX(uart, pin)      (((pin) & 1) == 1 && IS_VALID_PERIPH(uart, pin))
+#else
 #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))
+#endif
 #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))
 
@@ -398,8 +403,8 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         __dsb(); // make sure UARTLCR_H register is written to
         uart_set_fifo_enabled(self->uart, true);
         __dsb(); // make sure UARTLCR_H register is written to
-        gpio_set_function(self->tx, GPIO_FUNC_UART);
-        gpio_set_function(self->rx, GPIO_FUNC_UART);
+        gpio_set_function(self->tx, UART_FUNCSEL_NUM(self->uart, self->tx));
+        gpio_set_function(self->rx, UART_FUNCSEL_NUM(self->uart, self->rx));
         if (self->invert & UART_INVERT_RX) {
             gpio_set_inover(self->rx, GPIO_OVERRIDE_INVERT);
         }

From ea2eed1b2307ae561e27997be86d7fc4494ed8e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Aug 2024 22:26:14 +1000
Subject: [PATCH 1545/3129] rp2/mphalport: Implement mp_hal_ticks_cpu for RISCV
 using mcycle.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mphalport.c | 11 +++++++++++
 ports/rp2/mphalport.h |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 3fcc011b62676..3f50151620a02 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -125,6 +125,17 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     return did_write ? ret : 0;
 }
 
+#if PICO_RISCV
+__attribute__((naked)) mp_uint_t mp_hal_ticks_cpu(void) {
+    __asm volatile (
+        "li a0, 4\n" // mask value to uninhibit mcycle counter
+        "csrw mcountinhibit, a0\n" // uninhibit mcycle counter
+        "csrr a0, mcycle\n" // get mcycle counter
+        "ret\n"
+        );
+}
+#endif
+
 void mp_hal_delay_us(mp_uint_t us) {
     // Avoid calling sleep_us() and invoking the alarm pool by splitting long
     // sleeps into an optional longer sleep and a shorter busy-wait
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 1d260c8bd8b61..da865fb7e85ea 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -96,11 +96,15 @@ static inline mp_uint_t mp_hal_ticks_ms(void) {
     return to_ms_since_boot(get_absolute_time());
 }
 
+#if PICO_ARM
 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();
 }
+#elif PICO_RISCV
+mp_uint_t mp_hal_ticks_cpu(void);
+#endif
 
 static inline mp_uint_t mp_hal_get_cpu_freq(void) {
     return clock_get_hz(clk_sys);

From fa15ae4503d87933c619a32110f8bd5e8817aece Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Aug 2024 22:26:37 +1000
Subject: [PATCH 1546/3129] rp2/machine_bitstream: Implement bitstream for
 RISC-V using mcycle.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_bitstream.c | 46 +++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_bitstream.c b/ports/rp2/machine_bitstream.c
index 8240fdad60636..4ef97f0c86839 100644
--- a/ports/rp2/machine_bitstream.c
+++ b/ports/rp2/machine_bitstream.c
@@ -34,6 +34,25 @@
 
 #define MP_HAL_BITSTREAM_NS_OVERHEAD  (9)
 
+#if PICO_RISCV
+
+__attribute__((naked)) void mcycle_init(void) {
+    __asm volatile (
+        "li a0, 4\n"
+        "csrw mcountinhibit, a0\n"
+        "ret\n"
+        );
+}
+
+__attribute__((naked)) uint32_t mcycle_get(void) {
+    __asm volatile (
+        "csrr a0, mcycle\n"
+        "ret\n"
+        );
+}
+
+#endif
+
 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].
@@ -49,14 +68,16 @@ void __time_critical_func(machine_bitstream_high_low)(mp_hal_pin_obj_t pin, uint
     }
     mp_hal_pin_output(pin);
 
+    uint32_t irq_state = mp_hal_quiet_timing_enter();
+
+    #if PICO_ARM
+
     // Set systick reset value.
     systick_hw->rvr = 0x00FFFFFF;
 
     // 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) {
@@ -72,6 +93,27 @@ void __time_critical_func(machine_bitstream_high_low)(mp_hal_pin_obj_t pin, uint
         }
     }
 
+    #elif PICO_RISCV
+
+    mcycle_init();
+
+    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 = mcycle_get();
+            mp_hal_pin_high(pin);
+            while ((mcycle_get() - start_ticks) < t[0]) {
+            }
+            b <<= 1;
+            mp_hal_pin_low(pin);
+            while ((mcycle_get() - start_ticks) < t[1]) {
+            }
+        }
+    }
+
+    #endif
+
     mp_hal_quiet_timing_exit(irq_state);
 }
 

From 8cc7c64d01a597da8190873432fcb6b267e6a1bb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Aug 2024 10:34:23 +1000
Subject: [PATCH 1547/3129] rp2: Workaround pico_aon_timer timezone binary size
 increase.

Provide stub implementations of localtime_r() and mktime() to avoid
code size increase.

Reported upstream at https://github.com/raspberrypi/pico-sdk/issues/1810

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/CMakeLists.txt   |  1 +
 ports/rp2/datetime_patch.c | 42 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 ports/rp2/datetime_patch.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 13a370c633b85..4baaf7debf6c5 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -147,6 +147,7 @@ set(MICROPY_SOURCE_DRIVERS
 
 set(MICROPY_SOURCE_PORT
     clocks_extra.c
+    datetime_patch.c
     fatfs_port.c
     help.c
     machine_bitstream.c
diff --git a/ports/rp2/datetime_patch.c b/ports/rp2/datetime_patch.c
new file mode 100644
index 0000000000000..810af4cf1650d
--- /dev/null
+++ b/ports/rp2/datetime_patch.c
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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 <time.h>
+#include "py/mpconfig.h"
+#include "shared/timeutils/timeutils.h"
+
+// This is a workaround for the issue that pico-sdk datetime.c will otherwise
+// pull in a lot of libc code for time zone support.
+//
+// Upstream issue is https://github.com/raspberrypi/pico-sdk/issues/1810
+
+struct tm *localtime_r(const time_t *__restrict time, struct tm *__restrict local_time) {
+    return gmtime_r(time, local_time);
+}
+
+time_t mktime(struct tm *__restrict tm) {
+    return timeutils_mktime(tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
+}

From 27904ae4b9003eac743d031499325f7680699990 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 15 Aug 2024 16:18:09 +0100
Subject: [PATCH 1548/3129] rp2/machine_pwm: Add RP2350 slices to machine.PWM.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/machine_pwm.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index 4c0bc2c103243..fd20be5ec2f6f 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -67,10 +67,20 @@ static machine_pwm_obj_t machine_pwm_obj[] = {
     {{&machine_pwm_type}, 6, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
     {{&machine_pwm_type}, 7, PWM_CHAN_A, 0, DUTY_NOT_SET, 0 },
     {{&machine_pwm_type}, 7, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
+    #if NUM_PWM_SLICES == 12
+    {{&machine_pwm_type}, 8, PWM_CHAN_A, 0, DUTY_NOT_SET, 0 },
+    {{&machine_pwm_type}, 8, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
+    {{&machine_pwm_type}, 9, PWM_CHAN_A, 0, DUTY_NOT_SET, 0 },
+    {{&machine_pwm_type}, 9, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
+    {{&machine_pwm_type}, 10, PWM_CHAN_A, 0, DUTY_NOT_SET, 0 },
+    {{&machine_pwm_type}, 10, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
+    {{&machine_pwm_type}, 11, PWM_CHAN_A, 0, DUTY_NOT_SET, 0 },
+    {{&machine_pwm_type}, 11, PWM_CHAN_B, 0, DUTY_NOT_SET, 0 },
+    #endif
 };
 
 static bool defer_start;
-static bool slice_freq_set[8];
+static bool slice_freq_set[NUM_PWM_SLICES];
 
 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);
@@ -155,7 +165,7 @@ static mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
 
 // Stop all active slices.
 void machine_pwm_deinit_all(void) {
-    for (int i = 0; i < 8; i++) {
+    for (int i = 0; i < NUM_PWM_SLICES; i++) {
         slice_freq_set[i] = false;
         pwm_set_enabled(machine_pwm_obj[i].slice, false);
     }

From 137e9e8c799f05a4a5190441d9b3bb2a503337c9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Sep 2024 13:11:42 +1000
Subject: [PATCH 1549/3129] rp2/main: Set CPU frequency to default for the MCU.

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 8d7b353731a1f..d6bf448267152 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
     soft_timer_init();
 
     // Set the MCU frequency and as a side effect the peripheral clock to 48 MHz.
-    set_sys_clock_khz(125000, false);
+    set_sys_clock_khz(SYS_CLK_KHZ, false);
 
     // Hook for setting up anything that needs to be super early in the bootup process.
     MICROPY_BOARD_STARTUP();

From e32e13f7e4ece573235c67db725b1874a7c89ac6 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 22 May 2024 15:21:56 +0100
Subject: [PATCH 1550/3129] rp2/boards/RPI_PICO2: Add new RPI_PICO2 board
 definition.

This is the same form-factor as the Pico but with an RP2350.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/boards/RPI_PICO2/board.json         | 22 +++++++++++++++
 .../rp2/boards/RPI_PICO2/mpconfigboard.cmake  |  5 ++++
 ports/rp2/boards/RPI_PICO2/mpconfigboard.h    |  3 ++
 .../boards/RPI_PICO2/mpconfigvariant.cmake    |  1 +
 .../RPI_PICO2/mpconfigvariant_RISCV.cmake     |  1 +
 ports/rp2/boards/RPI_PICO2/pins.csv           | 28 +++++++++++++++++++
 6 files changed, 60 insertions(+)
 create mode 100644 ports/rp2/boards/RPI_PICO2/board.json
 create mode 100644 ports/rp2/boards/RPI_PICO2/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/RPI_PICO2/mpconfigboard.h
 create mode 100644 ports/rp2/boards/RPI_PICO2/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/RPI_PICO2/mpconfigvariant_RISCV.cmake
 create mode 100644 ports/rp2/boards/RPI_PICO2/pins.csv

diff --git a/ports/rp2/boards/RPI_PICO2/board.json b/ports/rp2/boards/RPI_PICO2/board.json
new file mode 100644
index 0000000000000..8f3e4bde71a2e
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Dual-core",
+        "External Flash",
+        "USB"
+    ],
+    "images": [
+        "rp2-pico2.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "Pico 2",
+    "thumbnail": "",
+    "url": "https://www.raspberrypi.com/products/raspberry-pi-pico-2/",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
+    "vendor": "Raspberry Pi"
+}
diff --git a/ports/rp2/boards/RPI_PICO2/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO2/mpconfigboard.cmake
new file mode 100644
index 0000000000000..48b6545aa3428
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+# cmake file for Raspberry Pi Pico2
+set(PICO_BOARD "pico2")
+
+# To change the gpio count for QFN-80
+# set(PICO_NUM_GPIOS 48)
diff --git a/ports/rp2/boards/RPI_PICO2/mpconfigboard.h b/ports/rp2/boards/RPI_PICO2/mpconfigboard.h
new file mode 100644
index 0000000000000..4b5eac6eb3ae3
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico2"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - 1024 * 1024)
diff --git a/ports/rp2/boards/RPI_PICO2/mpconfigvariant.cmake b/ports/rp2/boards/RPI_PICO2/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/RPI_PICO2/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/RPI_PICO2/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/boards/RPI_PICO2/pins.csv b/ports/rp2/boards/RPI_PICO2/pins.csv
new file mode 100644
index 0000000000000..16e334026424f
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2/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

From f9cebe676e156e8568cf272837917187cc3743a8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Aug 2024 12:32:48 +1000
Subject: [PATCH 1551/3129] tools/ci.sh: Add RPI_PICO2 to 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 feb40cc4ff34a..6f0f23a1c4810 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -309,6 +309,8 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C ports/rp2
     make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W submodules
     make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W USER_C_MODULES=../../examples/usercmodule/micropython.cmake
+    make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO2 submodules
+    make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO2
     make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO submodules
     make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO
 

From fda7ae83a879c6be878febea70b604093e2de3b2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Aug 2024 17:03:22 +1000
Subject: [PATCH 1552/3129] tests/ports/rp2: Update DMA test to work on RP2350.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_dma.py     | 22 +++++++++++++++++++---
 tests/ports/rp2/rp2_dma.py.exp | 19 +++++++++++++++++--
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/tests/ports/rp2/rp2_dma.py b/tests/ports/rp2/rp2_dma.py
index 2459213f4c014..62ec1dcf24d14 100644
--- a/tests/ports/rp2/rp2_dma.py
+++ b/tests/ports/rp2/rp2_dma.py
@@ -1,21 +1,36 @@
 # Test rp2.DMA functionality.
 
+import sys
 import time
 import machine
 import rp2
 
+is_rp2350 = "RP2350" in sys.implementation._machine
+
 src = bytes(i & 0xFF for i in range(16 * 1024))
 
 print("# test basic usage")
 
 dma = rp2.DMA()
+
+# Test printing.
 print(dma)
-print(rp2.DMA.unpack_ctrl(dma.pack_ctrl()))
+
+# Test pack_ctrl/unpack_ctrl.
+ctrl_dict = rp2.DMA.unpack_ctrl(dma.pack_ctrl())
+if is_rp2350:
+    for entry in ("inc_read_rev", "inc_write_rev"):
+        assert entry in ctrl_dict
+        del ctrl_dict[entry]
+for key, value in sorted(ctrl_dict.items()):
+    print(key, value)
+
+# Test register access.
 dma.read = 0
 dma.write = 0
 dma.count = 0
 dma.ctrl = dma.pack_ctrl()
-print(dma.read, dma.write, dma.count, dma.ctrl & 0x01FFFFFF, dma.channel, dma.registers)
+print(dma.read, dma.write, dma.count, dma.ctrl & 0x01F, dma.channel, dma.registers)
 dma.close()
 
 # Test closing when already closed.
@@ -62,7 +77,8 @@ def run_and_time_dma(dma):
 dma.count = len(dest) // 4
 dma.ctrl = dma.pack_ctrl()
 dt = run_and_time_dma(dma)
-print(70 <= dt <= 110)
+expected_dt_range = range(40, 70) if is_rp2350 else range(70, 125)
+print(dt in expected_dt_range)
 print(dest[:8], dest[-8:])
 dma.close()
 
diff --git a/tests/ports/rp2/rp2_dma.py.exp b/tests/ports/rp2/rp2_dma.py.exp
index 79f17626ace2a..6fad5429b291d 100644
--- a/tests/ports/rp2/rp2_dma.py.exp
+++ b/tests/ports/rp2/rp2_dma.py.exp
@@ -1,7 +1,22 @@
 # test basic usage
 DMA(0)
-{'inc_read': 1, 'high_pri': 0, 'write_err': 0, 'ring_sel': 0, 'enable': 1, 'treq_sel': 63, 'sniff_en': 0, 'irq_quiet': 1, 'read_err': 0, 'chain_to': 0, 'busy': 0, 'inc_write': 1, 'ring_size': 0, 'bswap': 0, 'size': 2, 'ahb_err': 0}
-0 0 0 4161593 0 <memoryview>
+ahb_err 0
+bswap 0
+busy 0
+chain_to 0
+enable 1
+high_pri 0
+inc_read 1
+inc_write 1
+irq_quiet 1
+read_err 0
+ring_sel 0
+ring_size 0
+size 2
+sniff_en 0
+treq_sel 63
+write_err 0
+0 0 0 25 0 <memoryview>
 ValueError
 # test memory copy
 True

From 651b63cd79229e9c8073885f926e26ef1a7f081a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Aug 2024 11:25:01 +1000
Subject: [PATCH 1553/3129] tests/ports/rp2: Add simple rp2-specific UART test.

To test construction of UART instances.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_uart.py     | 10 ++++++++++
 tests/ports/rp2/rp2_uart.py.exp |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 tests/ports/rp2/rp2_uart.py
 create mode 100644 tests/ports/rp2/rp2_uart.py.exp

diff --git a/tests/ports/rp2/rp2_uart.py b/tests/ports/rp2/rp2_uart.py
new file mode 100644
index 0000000000000..da88599344795
--- /dev/null
+++ b/tests/ports/rp2/rp2_uart.py
@@ -0,0 +1,10 @@
+# Test construction of machine.UART objects.
+
+import sys
+from machine import UART
+
+print(UART(0, tx=0, rx=1))
+
+if "RP2350" in sys.implementation._machine:
+    # Test that UART can be constructed using other tx/rx pins.
+    UART(0, tx=2, rx=3)
diff --git a/tests/ports/rp2/rp2_uart.py.exp b/tests/ports/rp2/rp2_uart.py.exp
new file mode 100644
index 0000000000000..72cd5fb00f6c4
--- /dev/null
+++ b/tests/ports/rp2/rp2_uart.py.exp
@@ -0,0 +1 @@
+UART(0, baudrate=115200, bits=8, parity=None, stop=1, tx=0, rx=1, txbuf=256, rxbuf=256, timeout=0, timeout_char=1, invert=None, irq=0)

From b42bb911c663dc90575d6a7fe3ea4760b6559372 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Oct 2024 13:40:35 +1100
Subject: [PATCH 1554/3129] tests/ports/rp2: Update lightsleep/machine_idle to
 skip on RP2350.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_lightsleep.py   | 9 +++++++--
 tests/ports/rp2/rp2_machine_idle.py | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/ports/rp2/rp2_lightsleep.py b/tests/ports/rp2/rp2_lightsleep.py
index 3587def68fcd8..5ce5696e0e18c 100644
--- a/tests/ports/rp2/rp2_lightsleep.py
+++ b/tests/ports/rp2/rp2_lightsleep.py
@@ -9,13 +9,18 @@
 # A range of sleep periods (1 to 512ms) are tested. The total nominal sleep time
 # is 10.23 seconds, but on most ports this will finish much earlier as interrupts
 # happen before each timeout expires.
+import sys
+
 try:
     from machine import lightsleep, Pin
 except ImportError:
     print("SKIP")
     raise SystemExit
 
-from sys import stdout, platform
+# RP2350 currently fails this test, needs further investigation.
+if "RP2350" in sys.implementation._machine:
+    print("SKIP")
+    raise SystemExit
 
 try:
     led = Pin(Pin.board.LED, Pin.OUT)
@@ -25,7 +30,7 @@
 for n in range(100):
     if led:
         led.toggle()
-    stdout.write(chr(ord("a") + (n % 26)))
+    sys.stdout.write(chr(ord("a") + (n % 26)))
     lightsleep(2 ** (n % 10))
 
 print("\nDONE")
diff --git a/tests/ports/rp2/rp2_machine_idle.py b/tests/ports/rp2/rp2_machine_idle.py
index f9c28284782f8..3135110b82000 100644
--- a/tests/ports/rp2/rp2_machine_idle.py
+++ b/tests/ports/rp2/rp2_machine_idle.py
@@ -1,3 +1,4 @@
+import sys
 import machine
 import time
 
@@ -17,6 +18,11 @@
 # Verification uses the average idle time, as individual iterations will always
 # have outliers due to interrupts, scheduler, etc.
 
+# RP2350 currently fails this test because machine.idle() resumes immediately.
+if "RP2350" in sys.implementation._machine:
+    print("SKIP")
+    raise SystemExit
+
 ITERATIONS = 500
 total = 0
 

From b33f64792f6cff9a14f935ac568e82ec385bf54d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Oct 2024 13:41:28 +1100
Subject: [PATCH 1555/3129] tests/run-tests.py: Only run inlineasm tests on rp2
 ARM targets.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index a9fb458f2cde4..f9f8413077abf 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1095,7 +1095,9 @@ def main():
             elif args.target in ("renesas-ra"):
                 test_dirs += ("float", "inlineasm", "ports/renesas-ra")
             elif args.target == "rp2":
-                test_dirs += ("float", "stress", "inlineasm", "thread", "ports/rp2")
+                test_dirs += ("float", "stress", "thread", "ports/rp2")
+                if "arm" in args.mpy_cross_flags:
+                    test_dirs += ("inlineasm",)
             elif args.target == "esp32":
                 test_dirs += ("float", "stress", "thread")
             elif args.target in ("esp8266", "minimal", "nrf"):

From 51663b9aa71e40bbb3e82bde4918f03adb35ff62 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Oct 2024 13:41:48 +1100
Subject: [PATCH 1556/3129] rp2/machine_uart: Clear timeout_char when UART is
 first constructed.

Otherwise a previous value of `timeout_char` may be left over after a soft
reset.

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

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 5fe6e31fde2ef..54791cdc59436 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -390,6 +390,7 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     if (n_args > 0 || kw_args->used > 0 || self->baudrate == 0) {
         if (self->baudrate == 0) {
             self->baudrate = DEFAULT_UART_BAUDRATE;
+            self->timeout_char = 0;
         }
 
         // Make sure timeout_char is at least as long as a whole character (13 bits to be safe).

From 838f21298ac5a6515d77ce4e4a1b627c8574125f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Sep 2024 18:03:10 +1000
Subject: [PATCH 1557/3129] unix/main: Add --version command-line option.

CPython also has this option.

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

diff --git a/ports/unix/main.c b/ports/unix/main.c
index e732105c792b7..58fa3ff589a55 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -318,6 +318,7 @@ static void print_help(char **argv) {
     printf(
         "usage: %s [<opts>] [-X <implopt>] [-c <command> | -m <module> | <filename>]\n"
         "Options:\n"
+        "--version : show version information\n"
         "-h : print this help message\n"
         "-i : enable inspection via REPL after running command/module/file\n"
         #if MICROPY_DEBUG_PRINTERS
@@ -369,6 +370,10 @@ static void pre_process_options(int argc, char **argv) {
                 print_help(argv);
                 exit(0);
             }
+            if (strcmp(argv[a], "--version") == 0) {
+                printf(MICROPY_BANNER_NAME_AND_VERSION "; " MICROPY_BANNER_MACHINE "\n");
+                exit(0);
+            }
             if (strcmp(argv[a], "-X") == 0) {
                 if (a + 1 >= argc) {
                     exit(invalid_args());

From 3fecab58a0bab6db736d24c0be7e78e04c651cb0 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Mon, 14 Oct 2024 05:32:41 +1100
Subject: [PATCH 1558/3129] esp32/mphalport: Always poll stdin ring-buffer to
 include UART use.

This fixes a regression introduced in commit
4247921c4ebfced79aa7ccfbb835c9f60ad6f0fc, where this ring-buffer polling
was accidentally put inside the `#if MICROPY_HW_ESP_USB_SERIAL_JTAG`.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/mphalport.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 59ec6d6b19133..1cd99f4ae287b 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -109,12 +109,6 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
     #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_poll_rx();
-    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
-        ret |= MP_STREAM_POLL_RD;
-    }
-    if (poll_flags & MP_STREAM_POLL_WR) {
-        ret |= MP_STREAM_POLL_WR;
-    }
     #endif
     #if MICROPY_HW_USB_CDC
     ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
@@ -122,6 +116,13 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     #if MICROPY_PY_OS_DUPTERM
     ret |= mp_os_dupterm_poll(poll_flags);
     #endif
+    // Check ringbuffer directly for uart and usj.
+    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    if (poll_flags & MP_STREAM_POLL_WR) {
+        ret |= MP_STREAM_POLL_WR;
+    }
     return ret;
 }
 

From 1b89c503db690967d50699abe0bfa942f6f6b15e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Oct 2024 10:26:27 +1000
Subject: [PATCH 1559/3129] py/objtype: Don't delegate lookup of descriptor
 methods to __getattr__.

When descriptors are enabled, lookup of the `__get__`, `__set__` and
`__delete__` descriptor methods should not be delegated to `__getattr__`.
That follows CPython behaviour.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objtype.c                     |  7 +++++++
 tests/basics/class_descriptor.py | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/py/objtype.c b/py/objtype.c
index 847216982a469..b9af1008995ef 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -660,6 +660,13 @@ static void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
 
     // try __getattr__
     if (attr != MP_QSTR___getattr__) {
+        #if MICROPY_PY_DESCRIPTORS
+        // With descriptors enabled, don't delegate lookups of __get__/__set__/__delete__.
+        if (attr == MP_QSTR___get__ || attr == MP_QSTR___set__ || attr == MP_QSTR___delete__) {
+            return;
+        }
+        #endif
+
         #if MICROPY_PY_DELATTR_SETATTR
         // If the requested attr is __setattr__/__delattr__ then don't delegate the lookup
         // to __getattr__.  If we followed CPython's behaviour then __setattr__/__delattr__
diff --git a/tests/basics/class_descriptor.py b/tests/basics/class_descriptor.py
index 54f386230fec1..83d31674301d5 100644
--- a/tests/basics/class_descriptor.py
+++ b/tests/basics/class_descriptor.py
@@ -21,14 +21,41 @@ class Main:
 try:
     m.__class__
 except AttributeError:
+    # Target doesn't support __class__.
     print("SKIP")
     raise SystemExit
 
 r = m.Forward
 if 'Descriptor' in repr(r.__class__):
+    # Target doesn't support descriptors.
     print('SKIP')
     raise SystemExit
 
+# Test assignment and deletion.
+
 print(r)
 m.Forward = 'a'
 del m.Forward
+
+# Test that lookup of descriptors like __get__ are not passed into __getattr__.
+
+
+class NonDescriptor:
+    def __getattr__(self, attr):
+        print("getattr", attr)
+
+
+class TestClass:
+    non_descriptor = NonDescriptor()
+
+
+print(isinstance(TestClass().non_descriptor, NonDescriptor))
+
+t = TestClass()
+t.non_descriptor = 123
+print(t.non_descriptor)
+
+try:
+    del TestClass().non_descriptor
+except AttributeError:
+    print("AttributeError")

From 97af1001ae07c573bf432b9923dcdf78055a508c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Oct 2024 16:32:24 +1100
Subject: [PATCH 1560/3129] rp2/machine_uart: Make it so TX is done only when
 no longer busy.

Prior to this commit, when flushing a UART on the rp2 port, it returns just
before the last character is sent out the wire.

Fix this by waiting until the BUSY flag is cleared.

This also fixes the behaviour of `UART.txdone()` to return `True` only when
the last byte has gone out.

Updated docs and tests to match.  The test now checks that UART TX time is
very close to the expected time (prior, it was just testing that the TX
time was less than the expected time).

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.UART.rst   | 4 ++--
 ports/rp2/machine_uart.c        | 3 ++-
 tests/extmod/machine_uart_tx.py | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 0f3e77ec471a9..4dcb4a1e7c4a6 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -160,7 +160,7 @@ Methods
 
    .. note::
 
-       For the rp2, esp8266 and nrf ports the call returns while the last byte is sent.
+       For the 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, renesas-ra
@@ -172,7 +172,7 @@ Methods
 
    .. note::
 
-       For the rp2, esp8266 and nrf ports the call may return ``True`` even if the last byte
+       For the 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.
 
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 54791cdc59436..334c6fda328f3 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -491,8 +491,9 @@ static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
 }
 
 static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    // TX is done when: nothing in the ringbuf, TX FIFO is empty, TX output is not busy.
     return ringbuf_avail(&self->write_buffer) == 0
-           && (uart_get_hw(self->uart)->fr & UART_UARTFR_TXFE_BITS);
+           && (uart_get_hw(self->uart)->fr & (UART_UARTFR_TXFE_BITS | UART_UARTFR_BUSY_BITS)) == UART_UARTFR_TXFE_BITS;
 }
 
 static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
diff --git a/tests/extmod/machine_uart_tx.py b/tests/extmod/machine_uart_tx.py
index 54c0af2b2314e..25bb834929d1a 100644
--- a/tests/extmod/machine_uart_tx.py
+++ b/tests/extmod/machine_uart_tx.py
@@ -14,6 +14,7 @@
     uart_id = 0
     tx_pin = "GPIO0"
     rx_pin = "GPIO1"
+    timing_margin_us = 180
 else:
     print("SKIP")
     raise SystemExit
@@ -31,4 +32,5 @@
     # 1(startbit) + 8(bits) + 1(stopbit) + 0(parity)
     bits_per_char = 10
     expect_us = (len(text)) * bits_per_char * 1_000_000 // bits_per_s
-    print(bits_per_s, duration_us <= expect_us)
+    delta_us = abs(duration_us - expect_us)
+    print(bits_per_s, delta_us <= timing_margin_us or delta_us)

From 7ed480fc6fa6f8d273ba5bcae7c575985684d665 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 20 Oct 2024 23:12:47 +1100
Subject: [PATCH 1561/3129] Revert "stm32/machine_uart: Allow changing only the
 baudrate."

This reverts commit c94a3205b044fb27fa703d5c280fb02a094f12e3.

The idea behind this reverted commit was that it allowed to reconfigure the
UART to change only the baudrate, which is important in the context of a
PPP connection where the baudrate may be changed as part of the protocol.
Also, other ports like the rp2 port have this behaviour, where individual
parameters of the UART can be changed with the `.init()` method.

But this commit was no good for a few reasons:

1. It's a subtle breaking change to the UART API, because existing code
   that constructs or initialises a UART with just the baudrate would
   expect all other parameters to be reset to their defaults.  But with
   this commit those parameters would remain unchanged.

2. Constructing a UART like `UART(1, 9600)` also hits this code path of
   only changing the baudrate and does not reset other parameters, which is
   unexpected.

3. It doesn't support setting the baudrate via keyword, eg
   `UART.init(baudrate=9600)`.

4. The `timeout_char` field is not updated when changing only the baudrate,
   which can lead to unexpected timeouts when reading/writing.

Due to point (4), this commit broke the `tests/ports/stm32/uart.py` test,
the `uart.writechar(1)` has a timeout because the `uart.init(2400)` does
not set the `timeout_char` for the new baudrate.

Points (2)-(4) could be fixed, but point (1) (being a breaking change)
would remain as an issue.  So the commit is reverted.

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

diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 6be6bcdac1a12..8444b2998971e 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -154,12 +154,6 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         { MP_QSTR_read_buf_len, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} }, // legacy
     };
 
-    if (self->is_enabled && n_args == 1 && kw_args->used == 0) {
-        // Only change the baudrate if that's all that is given.
-        uart_set_baudrate(self, mp_obj_get_int(pos_args[0]));
-        return;
-    }
-
     // parse args
     struct {
         mp_arg_val_t baudrate, bits, parity, stop, flow, timeout, timeout_char, rxbuf, read_buf_len;

From d1574de3b6a050ef07c39a131203305f731d39d8 Mon Sep 17 00:00:00 2001
From: Corran Webster <cwebster@unital.dev>
Date: Wed, 2 Oct 2024 17:54:13 +0100
Subject: [PATCH 1562/3129] extmod/modframebuf: Fix FrameBuffer size check for
 stride corner-cases.

This is a fix for issue #15944, and handles corner cases in the FrameBuffer
code when using stride values where the last line's stride may extend past
the end of the underlying buffer.  This commit includes extra tests for
these corner cases.

For example a GS8 format FrameBuffer with a width of 8, height of 2 and
stride of 10 should be able to fit into a buffer of size 18 (10 bytes for
the first horizontal line, and 8 bytes for the second -- the full 10 bytes
are not needed).

Similarly a 1 by 9 FrameBuffer in MONO_VLSB format with a stride of 10
should be able to fit into a buffer of length 11 (10 bytes for the first
8 lines, and then one byte for the 9th line.

Being able to do this is particularly important when cropping the corner of
an existing FrameBuffer, either to copy a sprite or to clip drawing.

Signed-off-by: Corran Webster <cwebster@unital.dev>
---
 extmod/modframebuf.c                | 10 ++++++++--
 tests/extmod/framebuf_bounds.py     | 30 +++++++++++++++++++++++++++++
 tests/extmod/framebuf_bounds.py.exp | 30 +++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index f3ce5b5ef0ec6..cd0f50d104427 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -282,23 +282,29 @@ static mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size
         mp_raise_ValueError(NULL);
     }
 
-    size_t height_required = height;
     size_t bpp = 1;
+    size_t height_required = height;
+    size_t width_required = width;
+    size_t strides_required = height - 1;
 
     switch (format) {
         case FRAMEBUF_MVLSB:
             height_required = (height + 7) & ~7;
+            strides_required = height_required - 8;
             break;
         case FRAMEBUF_MHLSB:
         case FRAMEBUF_MHMSB:
             stride = (stride + 7) & ~7;
+            width_required = (width + 7) & ~7;
             break;
         case FRAMEBUF_GS2_HMSB:
             stride = (stride + 3) & ~3;
+            width_required = (width + 3) & ~3;
             bpp = 2;
             break;
         case FRAMEBUF_GS4_HMSB:
             stride = (stride + 1) & ~1;
+            width_required = (width + 1) & ~1;
             bpp = 4;
             break;
         case FRAMEBUF_GS8:
@@ -314,7 +320,7 @@ static mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
 
-    if (height_required * stride * bpp / 8 > bufinfo.len) {
+    if ((strides_required * stride + (height_required - strides_required) * width_required) * bpp / 8 > bufinfo.len) {
         mp_raise_ValueError(NULL);
     }
 
diff --git a/tests/extmod/framebuf_bounds.py b/tests/extmod/framebuf_bounds.py
index 3035b365bbae7..2a7647cfba41f 100644
--- a/tests/extmod/framebuf_bounds.py
+++ b/tests/extmod/framebuf_bounds.py
@@ -21,11 +21,25 @@ def test_constructor(*args):
 test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, 10)
 test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, 9)
 test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, -1)
+test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, 16)
+test_constructor(bytearray(20), 10, 10, framebuf.MONO_HLSB, 17)
+test_constructor(bytearray(19), 8, 10, framebuf.MONO_HLSB, 16)
+test_constructor(bytearray(18), 8, 10, framebuf.MONO_HLSB, 9)
+test_constructor(bytearray(19), 8, 10, framebuf.MONO_HLSB, 16)
 
 print(framebuf.MONO_VLSB)
 test_constructor(bytearray(8), 8, 1, framebuf.MONO_VLSB)
 test_constructor(bytearray(7), 8, 1, framebuf.MONO_VLSB)
 test_constructor(bytearray(8), 8, 8, framebuf.MONO_VLSB)
+test_constructor(bytearray(1), 1, 8, framebuf.MONO_VLSB)
+test_constructor(bytearray(1), 1, 9, framebuf.MONO_VLSB)
+test_constructor(bytearray(2), 1, 9, framebuf.MONO_VLSB)
+test_constructor(bytearray(1), 1, 8, framebuf.MONO_VLSB, 10)
+test_constructor(bytearray(8), 8, 8, framebuf.MONO_VLSB, 10)
+test_constructor(bytearray(8), 8, 8, framebuf.MONO_VLSB, 7)
+test_constructor(bytearray(11), 1, 9, framebuf.MONO_VLSB, 10)
+test_constructor(bytearray(10), 1, 9, framebuf.MONO_VLSB, 10)
+test_constructor(bytearray(11), 1, 16, framebuf.MONO_VLSB, 10)
 
 for f in (framebuf.MONO_HLSB, framebuf.MONO_HMSB):
     print(f)
@@ -40,21 +54,37 @@ def test_constructor(*args):
 test_constructor(bytearray(15), 5, 8, framebuf.GS2_HMSB)
 test_constructor(bytearray(16), 5, 8, framebuf.GS2_HMSB)
 test_constructor(bytearray(9), 4, 9, framebuf.GS2_HMSB)
+test_constructor(bytearray(2), 7, 1, framebuf.GS2_HMSB, 9)
+test_constructor(bytearray(4), 7, 2, framebuf.GS2_HMSB, 9)
+test_constructor(bytearray(5), 7, 2, framebuf.GS2_HMSB, 9)
 
 print(framebuf.GS4_HMSB)
 test_constructor(bytearray(8), 2, 8, framebuf.GS4_HMSB)
 test_constructor(bytearray(15), 3, 8, framebuf.GS4_HMSB)
 test_constructor(bytearray(16), 3, 8, framebuf.GS4_HMSB)
 test_constructor(bytearray(9), 2, 9, framebuf.GS4_HMSB)
+test_constructor(bytearray(4), 7, 1, framebuf.GS4_HMSB, 9)
+test_constructor(bytearray(8), 7, 2, framebuf.GS4_HMSB, 9)
+test_constructor(bytearray(9), 7, 2, framebuf.GS4_HMSB, 9)
 
 print(framebuf.GS8)
 test_constructor(bytearray(63), 8, 8, framebuf.GS8)
 test_constructor(bytearray(64), 8, 8, framebuf.GS8)
 test_constructor(bytearray(64), 9, 8, framebuf.GS8)
 test_constructor(bytearray(64), 8, 9, framebuf.GS8)
+test_constructor(bytearray(64), 4, 8, framebuf.GS8, 8)
+test_constructor(bytearray(64), 4, 8, framebuf.GS8, 9)
+test_constructor(bytearray(8), 8, 1, framebuf.GS8, 10)
+test_constructor(bytearray(17), 8, 2, framebuf.GS8, 10)
+test_constructor(bytearray(18), 8, 2, framebuf.GS8, 10)
 
 print(framebuf.RGB565)
 test_constructor(bytearray(127), 8, 8, framebuf.RGB565)
 test_constructor(bytearray(128), 8, 8, framebuf.RGB565)
 test_constructor(bytearray(128), 9, 8, framebuf.RGB565)
 test_constructor(bytearray(128), 8, 9, framebuf.RGB565)
+test_constructor(bytearray(128), 4, 8, framebuf.RGB565, 8)
+test_constructor(bytearray(128), 4, 8, framebuf.RGB565, 9)
+test_constructor(bytearray(16), 8, 1, framebuf.RGB565, 10)
+test_constructor(bytearray(34), 8, 2, framebuf.RGB565, 10)
+test_constructor(bytearray(36), 8, 2, framebuf.RGB565, 10)
diff --git a/tests/extmod/framebuf_bounds.py.exp b/tests/extmod/framebuf_bounds.py.exp
index 3125013bc9880..b9c221b42f82f 100644
--- a/tests/extmod/framebuf_bounds.py.exp
+++ b/tests/extmod/framebuf_bounds.py.exp
@@ -6,10 +6,24 @@ Valid
 Valid
 ValueError
 ValueError
+Valid
+ValueError
+Valid
+ValueError
+Valid
 0
 Valid
 ValueError
 Valid
+Valid
+ValueError
+Valid
+Valid
+Valid
+ValueError
+Valid
+ValueError
+Valid
 3
 Valid
 ValueError
@@ -27,18 +41,34 @@ Valid
 ValueError
 Valid
 Valid
+Valid
+ValueError
+Valid
 2
 Valid
 ValueError
 Valid
 Valid
+Valid
+ValueError
+Valid
 6
 ValueError
 Valid
 ValueError
 ValueError
+Valid
+ValueError
+Valid
+ValueError
+Valid
 1
 ValueError
 Valid
 ValueError
 ValueError
+Valid
+ValueError
+Valid
+ValueError
+Valid

From 7d442373afbc685d7becfda68df375a65c6b63f2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Oct 2024 23:11:47 +1100
Subject: [PATCH 1563/3129] tests/extmod: Config SPI test for esp8266 and skip
 SoftTimer test.

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

diff --git a/tests/extmod/machine_soft_timer.py b/tests/extmod/machine_soft_timer.py
index bff9af5b820f2..1e9c66aa225e1 100644
--- a/tests/extmod/machine_soft_timer.py
+++ b/tests/extmod/machine_soft_timer.py
@@ -2,8 +2,8 @@
 import sys
 
 
-if sys.platform == "esp32":
-    print("SKIP")  # TODO: Implement soft timers for esp32 port
+if sys.platform in ("esp32", "esp8266"):
+    print("SKIP")  # TODO: Implement soft timers for esp32/esp8266 ports
     raise SystemExit
 
 
diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
index 19371d3bd7f54..7022955a3da75 100644
--- a/tests/extmod/machine_spi_rate.py
+++ b/tests/extmod/machine_spi_rate.py
@@ -26,6 +26,9 @@
         spi_instances = ((1, Pin(4), Pin(5), Pin(6)),)
     else:
         spi_instances = ((1, Pin(18), Pin(19), Pin(21)), (2, Pin(18), Pin(19), Pin(21)))
+elif "esp8266" in sys.platform:
+    MAX_DELTA_MS = 50  # port requires much looser timing requirements
+    spi_instances = ((1, None, None, None),)  # explicit pin choice not allowed
 else:
     print("Please add support for this test on this platform.")
     raise SystemExit

From 1e3b24238ee35d16e1aee8244423fb7cec91f618 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Oct 2024 23:12:47 +1100
Subject: [PATCH 1564/3129] tests/extmod: Adjust ssl/tls tests to run on
 targets with axTLS.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/ssl_cadata.py                  |  2 +-
 tests/extmod/ssl_keycert.py                 | 11 ----------
 tests/extmod/ssl_keycert.py.exp             |  1 -
 tests/extmod/ssl_keycert_pkcs8.py           | 24 +++++++++++++++++++++
 tests/extmod/ssl_keycert_pkcs8.py.exp       |  1 +
 tests/extmod/ssl_sslcontext_verify_mode.py  |  9 --------
 tests/extmod/ssl_sslcontext_verify_mode2.py | 20 +++++++++++++++++
 tests/extmod/tls_sslcontext_ciphers.py      |  4 +++-
 8 files changed, 49 insertions(+), 23 deletions(-)
 create mode 100644 tests/extmod/ssl_keycert_pkcs8.py
 create mode 100644 tests/extmod/ssl_keycert_pkcs8.py.exp
 create mode 100644 tests/extmod/ssl_sslcontext_verify_mode2.py

diff --git a/tests/extmod/ssl_cadata.py b/tests/extmod/ssl_cadata.py
index e66f6ca825baf..21d86b13fb0cf 100644
--- a/tests/extmod/ssl_cadata.py
+++ b/tests/extmod/ssl_cadata.py
@@ -10,7 +10,7 @@
 # Invalid cadata.
 try:
     ssl.wrap_socket(io.BytesIO(), cadata=b"!")
-except TypeError:
+except AttributeError:
     # "cadata" keyword argument is not supported by axtls.
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/ssl_keycert.py b/tests/extmod/ssl_keycert.py
index badc11e0339d5..53f064fdaff48 100644
--- a/tests/extmod/ssl_keycert.py
+++ b/tests/extmod/ssl_keycert.py
@@ -9,11 +9,6 @@
 
 key = b"0\x82\x019\x02\x01\x00\x02A\x00\xf9\xe0}\xbd\xd7\x9cI\x18\x06\xc3\xcb\xb5\xec@r\xfbD\x18\x80\xaaWoZ{\xcc\xa3\xeb!\"\x0fY\x9e]-\xee\xe4\t!BY\x9f{7\xf3\xf2\x8f}}\r|.\xa8<\ta\xb2\xd7W\xb3\xc9\x19A\xc39\x02\x03\x01\x00\x01\x02@\x07:\x9fh\xa6\x9c6\xe1#\x10\xf7\x0b\xc4Q\xf9\x01\x9b\xee\xb9\x8a4\r\\\xa8\xc8:\xd5\xca\x97\x99\xaa\x16\x04)\xa8\xf9\x13\xdeq\x0ev`\xa7\x83\xc5\x8b`\xdb\xef \x9d\x93\xe8g\x84\x96\xfaV\\\xf4R\xda\xd0\xa1\x02!\x00\xfeR\xbf\n\x91Su\x87L\x98{\xeb%\xed\xfb\x06u)@\xfe\x1b\xde\xa0\xc6@\xab\xc5\xedg\x8e\x10[\x02!\x00\xfb\x86=\x85\xa4'\xde\x85\xb5L\xe0)\x99\xfaL\x8c3A\x02\xa8<\xdew\xad\x00\xe3\x1d\x05\xd8\xb4N\xfb\x02 \x08\xb0M\x04\x90hx\x88q\xcew\xd5U\xcbf\x9b\x16\xdf\x9c\xef\xd1\x85\xee\x9a7Ug\x02\xb0Z\x03'\x02 9\xa0D\xe2$|\xf9\xefz]5\x92rs\xb5+\xfd\xe6,\x1c\xadmn\xcf\xd5?3|\x0em)\x17\x02 5Z\xcc/\xa5?\n\x04%\x9b{N\x9dX\xddI\xbe\xd2\xb0\xa0\x03BQ\x02\x82\xc2\xe0u)\xbd\xb8\xaf"
 
-# This particular key was generated with:
-# $ openssl genrsa -out key.pem 512
-# $ openssl rsa -in key.pem -outform DER -out key.der
-keypkcs8 = b'0\x82\x01U\x02\x01\x000\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x04\x82\x01?0\x82\x01;\x02\x01\x00\x02A\x00\xae\x07\xbb\xbf \x8eL\\ G\x91\x1b\xc45\x89\x96\x0c\xca\x94\xa5\xc2%F\x84z\xea\xb2Y\xdd\x943\x1a\xe0\x1e\xfe%\xd3\xbc\x85\xf0\x05\x8eI\xca\x83\x8b\x86\xfd\x15P,\xa9t8\xc2s\x11\x7fk*[[w\xdd\x02\x03\x01\x00\x01\x02@?\x02-\xc7\x95Q\xef\xf3\xaa\xfc>]\x7f<\xa3\x03\xe0\xbd\xb7\xf4\x0b\xc6\xd31D\x0f\x95cT\x06D9\xed\xf0X\xa6\x18\xb4\xe7\x96\x8f\x91\xd6\xd7\xbfR\\V\xfd\x0e{\xd3\xa4e\xb4M\x01\xbb\xdf\xf1\xf0\xbcEA\x02!\x00\xd5\xd7f\xcc\x84\xf5Y&\xa7]\x00\x91\xc9\x8e\xb0\xf37\x108D\x7f&!JJ\x836\x83\x9f\n\xf2\x0f\x02!\x00\xd0W\x0ec\xa6\x86C\xf7\x8d\xbe\xf0\xbc2\xe3)|\xbb\xd6\xbb;\xb2\xafG\x05S\x0f-\x14X\n3S\x02 A\xf5\xb20\xcd\xa6<<\x8f\rA\xda\xb68<^\x99\x12x\xb8\xb0\x1b\x9b\xd3%\x8e\xb9\xa6\xf9\xcc\xcf\x83\x02!\x00\xa8.\xee\xdd\xc0\xeb8h\xda\x13^\xb0\xfe\x7fd\xd9]\xa5m\xc66k\xcap`\xe9\xaaav\xe4\xdd#\x02!\x00\xd1\xd0\x93\xe7wZ\xe0p\xd0M\x07\x9e\x13\xa7\xa7\x12\x95\x1e\x13h0O\xc0\x18\x1fa\x10")\x9f&U'
-
 # Invalid key
 try:
     ssl.wrap_socket(io.BytesIO(), key=b"!")
@@ -31,9 +26,3 @@
     ssl.wrap_socket(io.BytesIO(), key=key, cert=b"!")
 except ValueError as er:
     print(repr(er))
-
-# Valid key in PKCS8 format, invalid cert
-try:
-    ssl.wrap_socket(io.BytesIO(), key=keypkcs8, cert=b"!")
-except ValueError as er:
-    print(repr(er))
diff --git a/tests/extmod/ssl_keycert.py.exp b/tests/extmod/ssl_keycert.py.exp
index 95140cb998013..b72d319c6a807 100644
--- a/tests/extmod/ssl_keycert.py.exp
+++ b/tests/extmod/ssl_keycert.py.exp
@@ -1,4 +1,3 @@
 ValueError('invalid key',)
 TypeError("can't convert 'NoneType' object to str implicitly",)
 ValueError('invalid cert',)
-ValueError('invalid cert',)
diff --git a/tests/extmod/ssl_keycert_pkcs8.py b/tests/extmod/ssl_keycert_pkcs8.py
new file mode 100644
index 0000000000000..beef7275d8167
--- /dev/null
+++ b/tests/extmod/ssl_keycert_pkcs8.py
@@ -0,0 +1,24 @@
+# Test ssl with key/cert passed in
+
+try:
+    import io
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Only mbedTLS supports PKCS8 keys.
+if not hasattr(ssl, "MBEDTLS_VERSION"):
+    print("SKIP")
+    raise SystemExit
+
+# This particular key was generated with:
+# $ openssl genrsa -out key.pem 512
+# $ openssl rsa -in key.pem -outform DER -out key.der
+keypkcs8 = b'0\x82\x01U\x02\x01\x000\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x04\x82\x01?0\x82\x01;\x02\x01\x00\x02A\x00\xae\x07\xbb\xbf \x8eL\\ G\x91\x1b\xc45\x89\x96\x0c\xca\x94\xa5\xc2%F\x84z\xea\xb2Y\xdd\x943\x1a\xe0\x1e\xfe%\xd3\xbc\x85\xf0\x05\x8eI\xca\x83\x8b\x86\xfd\x15P,\xa9t8\xc2s\x11\x7fk*[[w\xdd\x02\x03\x01\x00\x01\x02@?\x02-\xc7\x95Q\xef\xf3\xaa\xfc>]\x7f<\xa3\x03\xe0\xbd\xb7\xf4\x0b\xc6\xd31D\x0f\x95cT\x06D9\xed\xf0X\xa6\x18\xb4\xe7\x96\x8f\x91\xd6\xd7\xbfR\\V\xfd\x0e{\xd3\xa4e\xb4M\x01\xbb\xdf\xf1\xf0\xbcEA\x02!\x00\xd5\xd7f\xcc\x84\xf5Y&\xa7]\x00\x91\xc9\x8e\xb0\xf37\x108D\x7f&!JJ\x836\x83\x9f\n\xf2\x0f\x02!\x00\xd0W\x0ec\xa6\x86C\xf7\x8d\xbe\xf0\xbc2\xe3)|\xbb\xd6\xbb;\xb2\xafG\x05S\x0f-\x14X\n3S\x02 A\xf5\xb20\xcd\xa6<<\x8f\rA\xda\xb68<^\x99\x12x\xb8\xb0\x1b\x9b\xd3%\x8e\xb9\xa6\xf9\xcc\xcf\x83\x02!\x00\xa8.\xee\xdd\xc0\xeb8h\xda\x13^\xb0\xfe\x7fd\xd9]\xa5m\xc66k\xcap`\xe9\xaaav\xe4\xdd#\x02!\x00\xd1\xd0\x93\xe7wZ\xe0p\xd0M\x07\x9e\x13\xa7\xa7\x12\x95\x1e\x13h0O\xc0\x18\x1fa\x10")\x9f&U'
+
+# Valid key in PKCS8 format, invalid cert
+try:
+    ssl.wrap_socket(io.BytesIO(), key=keypkcs8, cert=b"!")
+except ValueError as er:
+    print(repr(er))
diff --git a/tests/extmod/ssl_keycert_pkcs8.py.exp b/tests/extmod/ssl_keycert_pkcs8.py.exp
new file mode 100644
index 0000000000000..9f1cf732e33ff
--- /dev/null
+++ b/tests/extmod/ssl_keycert_pkcs8.py.exp
@@ -0,0 +1 @@
+ValueError('invalid cert',)
diff --git a/tests/extmod/ssl_sslcontext_verify_mode.py b/tests/extmod/ssl_sslcontext_verify_mode.py
index daccc2f4a956b..698ff65a8976c 100644
--- a/tests/extmod/ssl_sslcontext_verify_mode.py
+++ b/tests/extmod/ssl_sslcontext_verify_mode.py
@@ -1,5 +1,4 @@
 # Test ssl.SSLContext.verify_mode attribute.
-# It's not available in the axtls implementation, so has an independent test.
 
 try:
     import ssl
@@ -7,10 +6,6 @@
     print("SKIP")
     raise SystemExit
 
-if not hasattr(ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT), "verify_mode"):
-    print("SKIP")
-    raise SystemExit
-
 # Test default verify_mode for server (client default is different in MicroPython).
 ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
 print(ctx.verify_mode == ssl.CERT_NONE)
@@ -18,7 +13,3 @@
 # Test setting and getting verify_mode.
 ctx.verify_mode = ssl.CERT_NONE
 print(ctx.verify_mode == ssl.CERT_NONE)
-ctx.verify_mode = ssl.CERT_OPTIONAL
-print(ctx.verify_mode == ssl.CERT_OPTIONAL)
-ctx.verify_mode = ssl.CERT_REQUIRED
-print(ctx.verify_mode == ssl.CERT_REQUIRED)
diff --git a/tests/extmod/ssl_sslcontext_verify_mode2.py b/tests/extmod/ssl_sslcontext_verify_mode2.py
new file mode 100644
index 0000000000000..1b33e6e8670ae
--- /dev/null
+++ b/tests/extmod/ssl_sslcontext_verify_mode2.py
@@ -0,0 +1,20 @@
+# Test ssl.SSLContext.verify_mode attribute, with additional CERT_xxx constants.
+# These aren't available in the axtls implementation.
+
+try:
+    import ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+if not hasattr(ssl, "OPENSSL_VERSION") and not hasattr(ssl, "MBEDTLS_VERSION"):
+    print("SKIP")
+    raise SystemExit
+
+ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+
+# Test setting and getting verify_mode.
+ctx.verify_mode = ssl.CERT_OPTIONAL
+print(ctx.verify_mode == ssl.CERT_OPTIONAL)
+ctx.verify_mode = ssl.CERT_REQUIRED
+print(ctx.verify_mode == ssl.CERT_REQUIRED)
diff --git a/tests/extmod/tls_sslcontext_ciphers.py b/tests/extmod/tls_sslcontext_ciphers.py
index 43f94fb19a559..824aadd021e77 100644
--- a/tests/extmod/tls_sslcontext_ciphers.py
+++ b/tests/extmod/tls_sslcontext_ciphers.py
@@ -2,7 +2,9 @@
 
 try:
     import tls
-except ImportError:
+
+    tls.SSLContext.get_ciphers
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 

From 52f2ba5677cb56b0622ac0d615f0c13916cd24c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Oct 2024 23:13:06 +1100
Subject: [PATCH 1565/3129] tests/micropython: Tweak ringio test for targets
 with terse errors.

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

diff --git a/tests/micropython/ringio.py b/tests/micropython/ringio.py
index 45774bc2ee497..a0102ef63dafa 100644
--- a/tests/micropython/ringio.py
+++ b/tests/micropython/ringio.py
@@ -45,4 +45,4 @@
     # Size must be int.
     micropython.RingIO(None)
 except TypeError as ex:
-    print(ex)
+    print(type(ex))
diff --git a/tests/micropython/ringio.py.exp b/tests/micropython/ringio.py.exp
index b27ea472c7d89..65bae06472f8d 100644
--- a/tests/micropython/ringio.py.exp
+++ b/tests/micropython/ringio.py.exp
@@ -13,4 +13,4 @@ b'\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01'
 16
 0
 b'\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01'
-can't convert NoneType to int
+<class 'TypeError'>

From f7abb52847415d535a2acc22decbff16e73f2dc3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Oct 2024 23:13:40 +1100
Subject: [PATCH 1566/3129] tests/run-tests.py: Skip large viper test on
 esp8266.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index f9f8413077abf..cd1d681af1ee5 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -656,6 +656,8 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             skip_tests.add("extmod/random_basic.py")  # requires random
             skip_tests.add("extmod/random_extra.py")  # requires random
         elif args.target == "esp8266":
+            skip_tests.add("micropython/viper_args.py")  # too large
+            skip_tests.add("micropython/viper_binop_arith.py")  # too large
             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

From 0646177997b018326ba07cbd2ff1868bc9906881 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Oct 2024 12:13:00 +1100
Subject: [PATCH 1567/3129] tests/extmod: Make invalid-blockdev test work
 consistently on all ports.

Some ports (eg stm32) configure the FAT driver differently (eg with
multi-partition support) and that leads to a slightly different sequence of
block reads, compared to other configurations (eg rp2).

Comment out the printing in `readblocks()` so the tests are deterministic
(the printing is still useful for debugging).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_blockdev_invalid.py     |  2 +-
 tests/extmod/vfs_blockdev_invalid.py.exp | 98 ------------------------
 2 files changed, 1 insertion(+), 99 deletions(-)

diff --git a/tests/extmod/vfs_blockdev_invalid.py b/tests/extmod/vfs_blockdev_invalid.py
index 9b12746b269c6..4d00f4b00273a 100644
--- a/tests/extmod/vfs_blockdev_invalid.py
+++ b/tests/extmod/vfs_blockdev_invalid.py
@@ -19,7 +19,7 @@ def __init__(self, blocks):
         self.write_res = 0
 
     def readblocks(self, block, buf, off=0):
-        print("readblocks")
+        # print("readblocks", block, len(buf), off)
         addr = block * self.ERASE_BLOCK_SIZE + off
         for i in range(len(buf)):
             buf[i] = self.data[addr + i]
diff --git a/tests/extmod/vfs_blockdev_invalid.py.exp b/tests/extmod/vfs_blockdev_invalid.py.exp
index 64749da112fb3..13695e0d88916 100644
--- a/tests/extmod/vfs_blockdev_invalid.py.exp
+++ b/tests/extmod/vfs_blockdev_invalid.py.exp
@@ -1,126 +1,28 @@
 <class 'VfsLfs2'>
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
 opened
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-readblocks
 OSError [Errno 5] EIO
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-readblocks
 OSError [Errno 22] EINVAL
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-readblocks
 OSError [Errno 22] EINVAL
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-readblocks
 OSError [Errno 22] EINVAL
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 <class 'VfsFat'>
-readblocks
-readblocks
-readblocks
-readblocks
-readblocks
 opened
-readblocks
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-readblocks
 OSError [Errno 5] EIO
-readblocks
-readblocks
 OSError [Errno 5] EIO
-readblocks
 OSError [Errno 5] EIO
-readblocks
-readblocks
 OSError [Errno 5] EIO
-readblocks
 OSError [Errno 5] EIO
-readblocks
-readblocks
 OSError [Errno 5] EIO
-readblocks
 OSError [Errno 5] EIO
-readblocks
-readblocks
 OSError [Errno 5] EIO

From 8fef67bda577118426995fee77a601d1f55602eb Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Thu, 17 Oct 2024 22:06:59 +0300
Subject: [PATCH 1568/3129] esp32/modmachine: Allow building with USB CDC
 disabled.

Signed-off-by: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
---
 ports/esp32/modmachine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index d77b83192738f..9b58d77529be2 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -231,7 +231,7 @@ static mp_int_t mp_machine_reset_cause(void) {
 #endif
 
 NORETURN static void machine_bootloader_rtc(void) {
-    #if CONFIG_IDF_TARGET_ESP32S3
+    #if CONFIG_IDF_TARGET_ESP32S3 && MICROPY_HW_USB_CDC
     usb_usj_mode();
     usb_dc_prepare_persist();
     chip_usb_set_persist_flags(USBDC_BOOT_DFU);

From 324871f3803a7b2f9be264ee998e46ac0a7c4698 Mon Sep 17 00:00:00 2001
From: Plaque FCC <plaque-fcc@github>
Date: Fri, 18 Oct 2024 04:46:52 +0300
Subject: [PATCH 1569/3129] qemu/mcu/rv32: Fix test of mcause value in
 lookup_cause.

Signed-off-by: Plaque FCC <plaque-fcc@github>
---
 ports/qemu/mcu/rv32/interrupts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/qemu/mcu/rv32/interrupts.c b/ports/qemu/mcu/rv32/interrupts.c
index ccb4644f9d5b9..804cebcd77bb0 100644
--- a/ports/qemu/mcu/rv32/interrupts.c
+++ b/ports/qemu/mcu/rv32/interrupts.c
@@ -144,7 +144,7 @@ const char *lookup_cause(uint32_t mcause) {
             case 11:
                 return exception_causes[6];
             default:
-                return (mcause >= 16) ?
+                return ((mcause & 0x7FFFFFFF) >= 16) ?
                        exception_causes[7] :
                        exception_causes[0];
         }

From 6328958a3993b689372df1b66d46e3c426192ffe Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 16 Oct 2024 20:21:48 +0200
Subject: [PATCH 1570/3129] rp2/mpconfigport: Leave callable pointers alone on
 RV32.

The port configuration file tagged callable pointers' LSB on both Arm
and RISC-V variants.  This is needed on Arm due to Thumb/Thumb2
code addresses having their LSB set, but on RISC-V this is not required.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/rp2/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 9a11e6048c6b4..15eeab4f34b07 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -275,7 +275,9 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_BOOTSEL_DELAY_US 8
 #endif
 
+#if PICO_ARM
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
+#endif
 
 #define MP_SSIZE_MAX (0x7fffffff)
 typedef intptr_t mp_int_t; // must be pointer size

From 3f54e5dff27a135dff8a53a0483e5bb3a8b9a522 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Oct 2024 11:19:03 +1100
Subject: [PATCH 1571/3129] tests/extmod: Support esp32,mimxrt,stm32,samd ports
 in UART TX test.

Getting this test running on stm32- and mimxrt-based boards requires adding
a small delay after constructing the UART so that the initial idle frame
has time to be transmitted before the test starts.

Also, the timing margin needs to account for an additional 1-bit worth of
time on some MCUs.

Thanks to @robert-hh for the esp32, mimxrt and samd settings.

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

diff --git a/tests/extmod/machine_uart_tx.py b/tests/extmod/machine_uart_tx.py
index 25bb834929d1a..e9652f3c7ac21 100644
--- a/tests/extmod/machine_uart_tx.py
+++ b/tests/extmod/machine_uart_tx.py
@@ -9,12 +9,34 @@
 
 import time, sys
 
+initial_delay_ms = 0
+bit_margin = 0
+timing_margin_us = 100
+
 # Configure pins based on the target.
-if "rp2" in sys.platform:
+if "esp32" in sys.platform:
+    uart_id = 1
+    pins = {}
+    timing_margin_us = 400
+elif "mimxrt" in sys.platform:
+    uart_id = 1
+    pins = {}
+    initial_delay_ms = 20  # UART sends idle frame after init, so wait for that
+    bit_margin = 1
+elif "pyboard" in sys.platform:
+    uart_id = 4
+    pins = {}
+    initial_delay_ms = 50  # UART sends idle frame after init, so wait for that
+    bit_margin = 1  # first start-bit must wait to sync with the UART clock
+elif "rp2" in sys.platform:
     uart_id = 0
-    tx_pin = "GPIO0"
-    rx_pin = "GPIO1"
+    pins = {"tx": "GPIO0", "rx": "GPIO1"}
     timing_margin_us = 180
+elif "samd" in sys.platform:
+    uart_id = 2
+    pins = {"tx": "D1", "rx": "D0"}
+    timing_margin_us = 300
+    bit_margin = 1
 else:
     print("SKIP")
     raise SystemExit
@@ -22,7 +44,8 @@
 # Test that write+flush takes the expected amount of time to execute.
 for bits_per_s in (2400, 9600, 115200):
     text = "Hello World"
-    uart = UART(uart_id, bits_per_s, bits=8, parity=None, stop=1, tx=tx_pin, rx=rx_pin)
+    uart = UART(uart_id, bits_per_s, bits=8, parity=None, stop=1, **pins)
+    time.sleep_ms(initial_delay_ms)
 
     start_us = time.ticks_us()
     uart.write(text)
@@ -33,4 +56,5 @@
     bits_per_char = 10
     expect_us = (len(text)) * bits_per_char * 1_000_000 // bits_per_s
     delta_us = abs(duration_us - expect_us)
-    print(bits_per_s, delta_us <= timing_margin_us or delta_us)
+    margin_us = timing_margin_us + bit_margin * 1_000_000 // bits_per_s
+    print(bits_per_s, delta_us <= margin_us or delta_us)

From 078ead24f392deedaad2f391baac4aaefe96f49b Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 14 Oct 2024 09:19:10 -0500
Subject: [PATCH 1572/3129] extmod/network_wiznet5k: Reset mDNS when interface
 is brought up.

The LwIP interface is removed in wiznet5k_deinit() which is called as part
of the init sequence.  Therefore, if using mDNS, then the interface will
need to be re-added when bringing the interface up.

Additionally, this allows to set the hostname from MicroPython code prior
to bringing the interface up and mDNS responding to the (new) hostname.
This allows the hostname to be configured and saved on the flash or be
based on dynamic information such as the MAC or unique_id().

Signed-off-by: Jared Hancock <jared.hancock@centeredsolutions.com>
---
 extmod/network_wiznet5k.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 96f9b6131c4b7..533d39a18719f 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -58,6 +58,7 @@
 #include "shared/netutils/netutils.h"
 #include "lib/wiznet5k/Ethernet/wizchip_conf.h"
 #include "lib/wiznet5k/Ethernet/socket.h"
+#include "lwip/apps/mdns.h"
 #include "lwip/err.h"
 #include "lwip/dns.h"
 #include "lwip/dhcp.h"
@@ -201,6 +202,9 @@ 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) {
+            #if LWIP_MDNS_RESPONDER
+            mdns_resp_remove_netif(&wiznet5k_obj.netif);
+            #endif
             netif_remove(netif);
             netif->flags = 0;
             break;
@@ -334,6 +338,12 @@ static void wiznet5k_lwip_init(wiznet5k_obj_t *self) {
     self->netif.flags |= NETIF_FLAG_UP;
     dhcp_start(&self->netif);
     self->netif.flags &= ~NETIF_FLAG_UP;
+
+    #if LWIP_MDNS_RESPONDER
+    // NOTE: interface is removed in ::wiznet5k_deinit(), which is called as
+    // part of the init sequence.
+    mdns_resp_add_netif(&self->netif, mod_network_hostname_data);
+    #endif
 }
 
 void wiznet5k_poll(void) {

From 43bd57f94bb3a3ef06638105cebefac9611b7329 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Oct 2024 11:22:22 +1100
Subject: [PATCH 1573/3129] shared/timeutils: Document the range of
 year/month/day etc input values.

These differ to, eg, the standard `mktime()` function.

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

diff --git a/shared/timeutils/timeutils.h b/shared/timeutils/timeutils.h
index 69cbd95df53a6..82032600f3a9b 100644
--- a/shared/timeutils/timeutils.h
+++ b/shared/timeutils/timeutils.h
@@ -49,9 +49,11 @@ mp_uint_t timeutils_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date);
 void timeutils_seconds_since_2000_to_struct_time(mp_uint_t t,
     timeutils_struct_time_t *tm);
 
+// Year is absolute, month/date are 1-based, hour/minute/second are 0-based.
 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);
 
+// Year is absolute, month/mday are 1-based, hours/minutes/seconds are 0-based.
 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);
 
@@ -63,10 +65,12 @@ static inline void timeutils_seconds_since_epoch_to_struct_time(uint64_t t, time
     timeutils_seconds_since_2000_to_struct_time(t - TIMEUTILS_SECONDS_1970_TO_2000, tm);
 }
 
+// Year is absolute, month/mday are 1-based, hours/minutes/seconds are 0-based.
 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;
 }
 
+// Year is absolute, month/date are 1-based, hour/minute/second are 0-based.
 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

From 47741e2757db616de2b1f6f05e47ae52f336b3fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Oct 2024 11:22:59 +1100
Subject: [PATCH 1574/3129] rp2/datetime_patch: Fix year and month offset for
 mktime wrapper.

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

diff --git a/ports/rp2/datetime_patch.c b/ports/rp2/datetime_patch.c
index 810af4cf1650d..73bea74291f40 100644
--- a/ports/rp2/datetime_patch.c
+++ b/ports/rp2/datetime_patch.c
@@ -38,5 +38,5 @@ struct tm *localtime_r(const time_t *__restrict time, struct tm *__restrict loca
 }
 
 time_t mktime(struct tm *__restrict tm) {
-    return timeutils_mktime(tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
+    return timeutils_mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
 }

From 6d98280fdaeb271353f7b0a85349ede309a8ad63 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Oct 2024 11:23:47 +1100
Subject: [PATCH 1575/3129] tests/extmod: Add a simple test for machine.RTC.

Tests at least that the datetime can be set and get correctly.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_rtc.py     | 24 ++++++++++++++++++++++++
 tests/extmod/machine_rtc.py.exp |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 tests/extmod/machine_rtc.py
 create mode 100644 tests/extmod/machine_rtc.py.exp

diff --git a/tests/extmod/machine_rtc.py b/tests/extmod/machine_rtc.py
new file mode 100644
index 0000000000000..008453b56de2b
--- /dev/null
+++ b/tests/extmod/machine_rtc.py
@@ -0,0 +1,24 @@
+# Test basic behaviour of machine.RTC.
+
+try:
+    from machine import RTC
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+rtc = machine.RTC()
+
+# Save datetime.
+orig_datetime = rtc.datetime()
+
+# Set datetime to a known value.
+rtc.datetime((2020, 1, 1, 0, 0, 0, 0, 0))
+
+# Check that getting and setting the datetime give expected values.
+for i in range(4):
+    now = rtc.datetime()
+    print(now[0], now[1], now[2], now[4], now[5])
+    rtc.datetime(now)
+
+# Restore datetime.
+rtc.datetime(orig_datetime)
diff --git a/tests/extmod/machine_rtc.py.exp b/tests/extmod/machine_rtc.py.exp
new file mode 100644
index 0000000000000..8debc44693ae9
--- /dev/null
+++ b/tests/extmod/machine_rtc.py.exp
@@ -0,0 +1,4 @@
+2020 1 1 0 0
+2020 1 1 0 0
+2020 1 1 0 0
+2020 1 1 0 0

From ca6aed7649adcc25445e3da73a65bfbbca209728 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Oct 2024 16:28:28 +1100
Subject: [PATCH 1576/3129] tests/extmod: Fix access of RTC class in
 machine.RTC test.

This previously passed on some targets that automatically import the
`machine` module in `boot.py`.

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

diff --git a/tests/extmod/machine_rtc.py b/tests/extmod/machine_rtc.py
index 008453b56de2b..17518c23305b5 100644
--- a/tests/extmod/machine_rtc.py
+++ b/tests/extmod/machine_rtc.py
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-rtc = machine.RTC()
+rtc = RTC()
 
 # Save datetime.
 orig_datetime = rtc.datetime()

From 120ac0f8d25fe6ee6269c31b11690373c5b55653 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Oct 2024 17:22:27 +1100
Subject: [PATCH 1577/3129] rp2/modmachine: Re-sync time_ns offset when coming
 out of lightsleep.

Prior to this fix, `tests/extmod/vfs_lfs_mtime.py` would fail when run
after the `tests/ports/rp2/rp2_lightsleep.py` test, because
`time.time_ns()` would have a large and constant offset from `time.time()`.

Fix this by re-syncing the time-ns offset when coming out of lightsleep.

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

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 2faf0bc6f8713..cd73552dd9874 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -261,6 +261,9 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     // Bring back all clocks.
     runtime_init_clocks_optional_usb(disable_usb);
     MICROPY_END_ATOMIC_SECTION(my_interrupts);
+
+    // Re-sync mp_hal_time_ns() counter with aon timer.
+    mp_hal_time_ns_set_from_rtc();
 }
 
 NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {

From 1ec0c9b886450e0f4d9f88817a8553e7177fb27f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Oct 2024 17:54:30 +1100
Subject: [PATCH 1578/3129] tests/extmod: Use time_ns instead of time in lfs
 mtime test.

Because VfsLfs2 uses time_ns to create timestamps for files, and for the
test to give consistent results it also needs to use this same function.

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

diff --git a/tests/extmod/vfs_lfs_mtime.py b/tests/extmod/vfs_lfs_mtime.py
index 3d163dc2687f0..d4404de4dcb88 100644
--- a/tests/extmod/vfs_lfs_mtime.py
+++ b/tests/extmod/vfs_lfs_mtime.py
@@ -3,7 +3,7 @@
 try:
     import time, vfs
 
-    time.time
+    time.time_ns
     time.sleep
     vfs.VfsLfs2
 except (ImportError, AttributeError):
@@ -47,7 +47,8 @@ def test(bdev, vfs_class):
     fs = vfs_class(bdev, mtime=True)
 
     # Create an empty file, should have a timestamp.
-    current_time = int(time.time())
+    # Use time_ns() for current time because that's what's used for VfsLfs2 time.
+    current_time = time.time_ns() // 1_000_000_000
     fs.open("test1", "wt").close()
 
     # Wait 1 second so mtime will increase by at least 1.
@@ -61,7 +62,7 @@ def test(bdev, vfs_class):
     stat2 = fs.stat("test2")
     print(stat1[8] != 0, stat2[8] != 0)
 
-    # Check that test1 has mtime which matches time.time() at point of creation.
+    # Check that test1 has mtime which matches time.time_ns() at point of creation.
     print(current_time <= stat1[8] <= current_time + 1)
 
     # Check that test1 is older than test2.

From 09ea901317810e9e8fbd564cdbf8d50b3569d07f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Oct 2024 17:56:50 +1100
Subject: [PATCH 1579/3129] tests/extmod: Add test to compare time_ns with
 time.

They should be close together.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/time_time_ns.py     |  7 +++++++
 tests/extmod/time_time_ns.py.exp | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/tests/extmod/time_time_ns.py b/tests/extmod/time_time_ns.py
index 3ef58e56a9459..eab7b3a5d925b 100644
--- a/tests/extmod/time_time_ns.py
+++ b/tests/extmod/time_time_ns.py
@@ -22,3 +22,10 @@
     print(True)
 else:
     print(t0, t1, t1 - t0)
+
+# Check that time.time() and time.time_ns() are within a second of each other.
+# Note that time.time() may return an int or float.
+for _ in range(10):
+    t_s, t_ns = time.time(), time.time_ns()
+    print(abs(t_s * 1_000 - t_ns // 1_000_000) <= 1_000)
+    time.sleep_us(100_000)
diff --git a/tests/extmod/time_time_ns.py.exp b/tests/extmod/time_time_ns.py.exp
index dbde422651c9a..e5307f2e4ed2b 100644
--- a/tests/extmod/time_time_ns.py.exp
+++ b/tests/extmod/time_time_ns.py.exp
@@ -1,2 +1,12 @@
 True
 True
+True
+True
+True
+True
+True
+True
+True
+True
+True
+True

From 2644f577f1562a641c62d223dfb1fd80dd541ac9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 16 Oct 2024 14:08:43 +0200
Subject: [PATCH 1580/3129] extmod/modtls_mbedtls: Add a thread-global ptr for
 current SSL context.

This is necessary for mbedTLS callbacks that do not carry any user state,
so those callbacks can be customised per SSL context.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/modtls_mbedtls.c | 19 +++++++++++++++++++
 py/mpconfig.h           |  5 +++++
 py/mpstate.h            |  4 ++++
 3 files changed, 28 insertions(+)

diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 30118e200dee0..b261e7a70cc86 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -166,6 +166,13 @@ static NORETURN void mbedtls_raise_error(int err) {
     #endif
 }
 
+// Stores the current SSLContext for use in mbedtls callbacks where the current state is not passed.
+static inline void store_active_context(mp_obj_ssl_context_t *ssl_context) {
+    #if MICROPY_PY_SSL_MBEDTLS_NEED_ACTIVE_CONTEXT
+    MP_STATE_THREAD(tls_ssl_context) = ssl_context;
+    #endif
+}
+
 static void ssl_check_async_handshake_failure(mp_obj_ssl_socket_t *sslsock, int *errcode) {
     if (
         #if MBEDTLS_VERSION_NUMBER >= 0x03000000
@@ -497,6 +504,9 @@ static int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
 static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
 
+    // Store the current SSL context.
+    store_active_context(ssl_context);
+
     // Verify the socket object has the full stream protocol
     mp_get_stream_raise(sock, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
 
@@ -602,6 +612,9 @@ static mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
         return MP_STREAM_ERROR;
     }
 
+    // Store the current SSL context.
+    store_active_context(o->ssl_context);
+
     int ret = mbedtls_ssl_read(&o->ssl, buf, size);
     if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
         // end of stream
@@ -643,6 +656,9 @@ static mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, in
         return MP_STREAM_ERROR;
     }
 
+    // Store the current SSL context.
+    store_active_context(o->ssl_context);
+
     int ret = mbedtls_ssl_write(&o->ssl, buf, size);
     if (ret >= 0) {
         return ret;
@@ -680,6 +696,9 @@ static mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
     mp_obj_t sock = self->sock;
 
     if (request == MP_STREAM_CLOSE) {
+        // Clear the SSL context.
+        store_active_context(NULL);
+
         if (sock == MP_OBJ_NULL) {
             // Already closed socket, do nothing.
             return 0;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 34eafa9e5debb..7aa22d52e06c7 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1814,6 +1814,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_SSL_FINALISER (MICROPY_ENABLE_FINALISER)
 #endif
 
+// Whether to add a root pointer for the current ssl object
+#ifndef MICROPY_PY_SSL_MBEDTLS_NEED_ACTIVE_CONTEXT
+#define MICROPY_PY_SSL_MBEDTLS_NEED_ACTIVE_CONTEXT (MICROPY_PY_SSL_ECDSA_SIGN_ALT)
+#endif
+
 // Whether to provide the "vfs" module
 #ifndef MICROPY_PY_VFS
 #define MICROPY_PY_VFS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES && MICROPY_VFS)
diff --git a/py/mpstate.h b/py/mpstate.h
index af55e764f6cdc..54eca596daa28 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -293,6 +293,10 @@ typedef struct _mp_state_thread_t {
     bool prof_callback_is_executing;
     struct _mp_code_state_t *current_code_state;
     #endif
+
+    #if MICROPY_PY_SSL_MBEDTLS_NEED_ACTIVE_CONTEXT
+    struct _mp_obj_ssl_context_t *tls_ssl_context;
+    #endif
 } mp_state_thread_t;
 
 // This structure combines the above 3 structures.

From 68f1c2014514191415cda46f7c5264dce4799b9b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 24 Sep 2024 09:37:59 +0200
Subject: [PATCH 1581/3129] extmod/modtls_mbedtls: Support alternate sign
 callbacks in Python.

This commit enables the implementation of alternative mbedTLS cryptography
functions, such as ECDSA sign and verify, in pure Python.  Alternative
functions are implemented in Python callbacks, that get invoked from
wrapper functions when needed.  The callback can return None to fall back
to the default mbedTLS function.

A common use case for this feature is with secure elements that have
drivers implemented in Python.  Currently, only the ECDSA alternate sign
function wrapper is implemented.

Tested signing with a private EC key stored on an NXP SE05x secure element.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/extmod.mk             |  5 ++
 extmod/mbedtls/mbedtls_alt.c | 88 ++++++++++++++++++++++++++++++++++++
 extmod/modtls_mbedtls.c      | 70 ++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+)
 create mode 100644 extmod/mbedtls/mbedtls_alt.c

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index c132fd89ce887..514197d6b9a88 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -42,6 +42,7 @@ SRC_EXTMOD_C += \
 	extmod/modsocket.c \
 	extmod/modtls_axtls.c \
 	extmod/modtls_mbedtls.c \
+	extmod/mbedtls/mbedtls_alt.c \
 	extmod/modtime.c \
 	extmod/moductypes.c \
 	extmod/modvfs.c \
@@ -242,6 +243,10 @@ MBEDTLS_CONFIG_FILE ?= \"mbedtls/mbedtls_config_port.h\"
 GIT_SUBMODULES += $(MBEDTLS_DIR)
 CFLAGS_EXTMOD += -DMBEDTLS_CONFIG_FILE=$(MBEDTLS_CONFIG_FILE)
 CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
+ifeq ($(MICROPY_PY_SSL_ECDSA_SIGN_ALT),1)
+CFLAGS_EXTMOD += -DMICROPY_PY_SSL_ECDSA_SIGN_ALT=1
+LDFLAGS_EXTMOD += -Wl,--wrap=mbedtls_ecdsa_write_signature
+endif
 SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c
 SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
 	aes.c \
diff --git a/extmod/mbedtls/mbedtls_alt.c b/extmod/mbedtls/mbedtls_alt.c
new file mode 100644
index 0000000000000..ccfb373488709
--- /dev/null
+++ b/extmod/mbedtls/mbedtls_alt.c
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright The Mbed TLS Contributors
+ * Copyright (c) 2024 Damien P. George
+ *
+ * This file provides default fallback functions for use with alternate
+ * cryptography functions implemented in Python.
+ */
+#if MICROPY_PY_SSL_ECDSA_SIGN_ALT
+#if defined(MBEDTLS_ECP_RESTARTABLE) || defined(MBEDTLS_ECDSA_DETERMINISTIC)
+#error "MICROPY_PY_SSL_ECDSA_SIGN_ALT cannot be used with MBEDTLS_ECP_RESTARTABLE or MBEDTLS_ECDSA_DETERMINISTIC"
+#endif
+
+#include <string.h>
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+#include "mbedtls/platform.h"
+#include "mbedtls/ssl.h"
+#include "mbedtls/error.h"
+#include "mbedtls/ecdsa.h"
+#include "mbedtls/asn1write.h"
+
+extern int micropy_mbedtls_ecdsa_sign_alt(const mbedtls_mpi *d, const unsigned char *hash, size_t hlen,
+    unsigned char *sig, size_t sig_size, size_t *slen);
+
+
+// Compute and write signature
+// See lib/mbedtls/library/ecdsa.c:688
+//
+// Note: To avoid duplicating a lot of code, MBEDTLS_ECDSA_SIGN_ALT is not defined,
+// which allows the default mbedtls_ecdsa_sign to be used as a fallback function.
+// However, mbedtls_ecdsa_sign cannot be wrapped because it is called internally
+// within its object file, so we wrap mbedtls_ecdsa_read/write_signature instead.
+int __wrap_mbedtls_ecdsa_write_signature(mbedtls_ecdsa_context *ctx,
+    mbedtls_md_type_t md_alg,
+    const unsigned char *hash, size_t hlen,
+    unsigned char *sig, size_t sig_size, size_t *slen,
+    int (*f_rng)(void *, unsigned char *, size_t),
+    void *p_rng) {
+
+    (void)md_alg;
+
+    if (f_rng == NULL) {
+        return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+    }
+
+    // Check if curve is supported for ECDSA.
+    if (!mbedtls_ecdsa_can_do(ctx->grp.id) || ctx->grp.N.p == NULL) {
+        return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+    }
+
+    // Try signing with the alternative function first.
+    int ret = micropy_mbedtls_ecdsa_sign_alt(&ctx->d, hash, hlen, sig, sig_size, slen);
+
+    // Fallback to the default mbedtls implementation if needed.
+    if (ret == MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED) {
+        mbedtls_mpi r, s;
+        mbedtls_mpi_init(&r);
+        mbedtls_mpi_init(&s);
+
+        size_t len = 0;
+        unsigned char buf[MBEDTLS_ECDSA_MAX_LEN] = { 0 };
+        unsigned char *p = buf + sizeof(buf);
+
+        MBEDTLS_MPI_CHK(mbedtls_ecdsa_sign(&ctx->grp, &r, &s, &ctx->d, hash, hlen, f_rng, p_rng));
+        MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_mpi(&p, buf, &s));
+        MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_mpi(&p, buf, &r));
+        MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_len(&p, buf, len));
+        MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_tag(&p, buf, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE));
+
+        if (len > sig_size) {
+            ret = MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL;
+        } else {
+            ret = 0;
+            *slen = len;
+            memcpy(sig, p, len);
+        }
+
+    cleanup:
+        mbedtls_mpi_free(&r);
+        mbedtls_mpi_free(&s);
+    }
+
+    return ret;
+}
+#endif
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index b261e7a70cc86..0a1b8828af5ca 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -53,6 +53,10 @@
 #else
 #include "mbedtls/version.h"
 #endif
+#if MICROPY_PY_SSL_ECDSA_SIGN_ALT
+#include "mbedtls/ecdsa.h"
+#include "mbedtls/asn1.h"
+#endif
 
 #define MP_STREAM_POLL_RDWR (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)
 
@@ -68,6 +72,9 @@ typedef struct _mp_obj_ssl_context_t {
     int authmode;
     int *ciphersuites;
     mp_obj_t handler;
+    #if MICROPY_PY_SSL_ECDSA_SIGN_ALT
+    mp_obj_t ecdsa_sign_callback;
+    #endif
 } mp_obj_ssl_context_t;
 
 // This corresponds to an SSLSocket object.
@@ -248,6 +255,9 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     mbedtls_pk_init(&self->pkey);
     self->ciphersuites = NULL;
     self->handler = mp_const_none;
+    #if MICROPY_PY_SSL_ECDSA_SIGN_ALT
+    self->ecdsa_sign_callback = mp_const_none;
+    #endif
 
     #ifdef MBEDTLS_DEBUG_C
     // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
@@ -295,6 +305,10 @@ static void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             dest[0] = MP_OBJ_NEW_SMALL_INT(self->authmode);
         } else if (attr == MP_QSTR_verify_callback) {
             dest[0] = self->handler;
+        #if MICROPY_PY_SSL_ECDSA_SIGN_ALT
+        } else if (attr == MP_QSTR_ecdsa_sign_callback) {
+            dest[0] = self->ecdsa_sign_callback;
+        #endif
         } else {
             // Continue lookup in locals_dict.
             dest[1] = MP_OBJ_SENTINEL;
@@ -305,6 +319,11 @@ static void ssl_context_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             self->authmode = mp_obj_get_int(dest[1]);
             dest[0] = MP_OBJ_NULL;
             mbedtls_ssl_conf_authmode(&self->conf, self->authmode);
+        #if MICROPY_PY_SSL_ECDSA_SIGN_ALT
+        } else if (attr == MP_QSTR_ecdsa_sign_callback) {
+            dest[0] = MP_OBJ_NULL;
+            self->ecdsa_sign_callback = dest[1];
+        #endif
         } else if (attr == MP_QSTR_verify_callback) {
             dest[0] = MP_OBJ_NULL;
             self->handler = dest[1];
@@ -786,6 +805,57 @@ static MP_DEFINE_CONST_OBJ_TYPE(
 /******************************************************************************/
 // ssl module.
 
+#if MICROPY_PY_SSL_ECDSA_SIGN_ALT
+int micropy_mbedtls_ecdsa_sign_alt(const mbedtls_mpi *d, const unsigned char *hash, size_t hlen, unsigned char *sig, size_t sig_size, size_t *slen) {
+    uint8_t key[256];
+
+    // Check if the current context has an alternative sign function.
+    mp_obj_ssl_context_t *ssl_ctx = MP_STATE_THREAD(tls_ssl_context);
+    if (ssl_ctx == NULL || ssl_ctx->ecdsa_sign_callback == mp_const_none) {
+        return MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED;
+    }
+
+    size_t klen = mbedtls_mpi_size(d);
+    if (klen > sizeof(key)) {
+        return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+    }
+
+    // Convert the MPI private key (d) to a binary array
+    if (mbedtls_mpi_write_binary(d, key, klen) != 0) {
+        return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+    }
+
+    nlr_buf_t nlr;
+    mp_buffer_info_t sig_buf;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t ret = mp_call_function_2(ssl_ctx->ecdsa_sign_callback,
+            mp_obj_new_bytearray_by_ref(klen, (void *)key),
+            mp_obj_new_bytearray_by_ref(hlen, (void *)hash));
+        if (ret == mp_const_none) {
+            // key couldn't be used by the alternative implementation.
+            nlr_pop();
+            return MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED;
+        }
+        mp_get_buffer_raise(ret, &sig_buf, MP_BUFFER_READ);
+        nlr_pop();
+    } else {
+        // The alternative implementation failed to sign.
+        mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+    }
+
+    // Check if the buffer fits.
+    if (sig_buf.len > sig_size) {
+        return MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL;
+    }
+
+    // Copy ASN.1 signature to buffer.
+    *slen = sig_buf.len;
+    memcpy(sig, sig_buf.buf, sig_buf.len);
+    return 0;
+}
+#endif
+
 static const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_tls) },
 

From bab6a016b3e719d8e96d2c88cd25e53f779e6b62 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 26 Sep 2024 11:53:34 +0200
Subject: [PATCH 1582/3129] lib/arduino-lib: Update submodule.

Changes:
- Add ISO7816, APDU and SE05x package.
- Add support for Opta Expansion protocol.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 lib/arduino-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/arduino-lib b/lib/arduino-lib
index 0f0993582f7f8..8312406d6cd1a 160000
--- a/lib/arduino-lib
+++ b/lib/arduino-lib
@@ -1 +1 @@
-Subproject commit 0f0993582f7f882f06371d21cd15748932795272
+Subproject commit 8312406d6cd1a19683500f153b33fba7a8414127

From 28009a78cf5060e6e6b2dd9c35751994e8bde645 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 24 Sep 2024 15:00:04 +0200
Subject: [PATCH 1583/3129] stm32/boards/ARDUINO_PORTENTA_H7: Add SE05x driver.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py      | 7 ++++++-
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index eb53df0fbdeb2..3eeba76459864 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -15,5 +15,10 @@
 add_library("arduino-lib", "$(ARDUINO_LIB_DIR)")
 
 # RPC
-require("cmwx1", library="arduino-lib")
 require("msgpackrpc", library="arduino-lib")
+
+# Lora/CMWX1 driver
+require("cmwx1", library="arduino-lib")
+
+# SE05x driver
+require("se05x", library="arduino-lib")
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
index 3b173b3acdb92..50c6706dc9e17 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
@@ -22,6 +22,7 @@ MICROPY_BLUETOOTH_BTSTACK = 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
 MICROPY_PY_SSL = 1
+MICROPY_PY_SSL_ECDSA_SIGN_ALT=1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_PY_OPENAMP = 1
 MICROPY_PY_OPENAMP_REMOTEPROC = 1

From 57bc98f499572237fa97bad5dbc5eebb1063ebda Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 24 Sep 2024 15:01:06 +0200
Subject: [PATCH 1584/3129] stm32/boards/ARDUINO_NICLA_VISION: Add SE05x
 driver.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py      | 3 +++
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py b/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py
index b7b9a2b470d02..10958c3a3971d 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/manifest.py
@@ -16,3 +16,6 @@
 
 # RPC
 require("msgpackrpc", library="arduino-lib")
+
+# SE05x driver
+require("se05x", library="arduino-lib")
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
index 0e8ff0e82d388..75096ccc90941 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk
@@ -22,6 +22,7 @@ MICROPY_BLUETOOTH_BTSTACK = 0
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
 MICROPY_PY_SSL = 1
+MICROPY_PY_SSL_ECDSA_SIGN_ALT=1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_PY_OPENAMP = 1
 MICROPY_PY_OPENAMP_REMOTEPROC = 1

From 4c54335195d1c0f21cc6936365dba6b595097f52 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 16 Oct 2024 10:16:16 +0200
Subject: [PATCH 1585/3129] stm32/boards/ARDUINO_OPTA: Add Opta expansion
 module.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_OPTA/manifest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_OPTA/manifest.py b/ports/stm32/boards/ARDUINO_OPTA/manifest.py
index b7b9a2b470d02..375f4c3333b0a 100644
--- a/ports/stm32/boards/ARDUINO_OPTA/manifest.py
+++ b/ports/stm32/boards/ARDUINO_OPTA/manifest.py
@@ -14,5 +14,8 @@
 # Register external library
 add_library("arduino-lib", "$(ARDUINO_LIB_DIR)")
 
+# Opta modules.
+require("opta", library="arduino-lib")
+
 # RPC
 require("msgpackrpc", library="arduino-lib")

From 18c9abc32930728d0403d8c13994adc3cabba8db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Oct 2024 16:38:44 +1100
Subject: [PATCH 1586/3129] lib/micropython-lib: Update submodule to latest.

This brings in:
- requests improvements with overriding headers
- use non-u versions of built-in modules, including asyncio
- fix to logging so StreamHandler calls parent constructor
- various fixes to usb-device packages
- fixes to lora sx126x and sx127x drivers
- improvements to unix-ffi/sqlite3
- support additional gap_connect arguments in aioble

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 50ed36fbeb919..68e3e07bc7ab6 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 50ed36fbeb919753bcc26ce13a8cffd7691d06ef
+Subproject commit 68e3e07bc7ab63931cead3854b2a114e9a084248

From f212bbe837489f297c9d25d608bdb7b8c3da988d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 26 Oct 2024 01:43:23 +1100
Subject: [PATCH 1587/3129] all: Bump version to 1.24.0.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 7aa22d52e06c7..caea0f4f7a3b8 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -32,7 +32,7 @@
 #define MICROPY_VERSION_MAJOR 1
 #define MICROPY_VERSION_MINOR 24
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 1
+#define MICROPY_VERSION_PRERELEASE 0
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 44dc6eb30d9a47cc2f7c0c04f012b0dbdae1acae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Oct 2024 11:08:24 +1100
Subject: [PATCH 1588/3129] all: Bump version to 1.25.0-preview.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index caea0f4f7a3b8..b31da2a37c050 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -30,9 +30,9 @@
 // as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
 // are unavailable.
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 24
+#define MICROPY_VERSION_MINOR 25
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 0
+#define MICROPY_VERSION_PRERELEASE 1
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 4601dcb8a1e88e1cb2d644cc8b0c36378d5966b7 Mon Sep 17 00:00:00 2001
From: Steve Holden <steve@holdenweb.com>
Date: Thu, 24 Oct 2024 01:35:02 +0100
Subject: [PATCH 1589/3129] rp2/README: Remove redundant `global` statement
 from example code.

Since `led` is not being rebound inside the `tick` function the standard
Python name resolution method will find it.

Signed-off-by: Steve Holden <steve@holdenweb.com>
---
 ports/rp2/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/rp2/README.md b/ports/rp2/README.md
index c2f3771cd313f..911d797fe01a2 100644
--- a/ports/rp2/README.md
+++ b/ports/rp2/README.md
@@ -69,7 +69,6 @@ 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)

From ff70a91581448983d9bdf1251f659ed7bc8189fb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 22 Oct 2024 15:02:32 +1100
Subject: [PATCH 1590/3129] esp32: Move the linker wrap options out of the
 project CMakeLists.

For in-tree builds, these are effectively equivalent. However for
out-of-tree builds it's preferable to have as little as possible in the
top-level CMakeLists.txt file (as the out-of-tree build needs its own
copy).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/CMakeLists.txt     | 7 -------
 ports/esp32/esp32_common.cmake | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 83fca88b6972b..9ca9065afd0d4 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -71,12 +71,5 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 # Set the location of the main component for the project (one per target).
 list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
 
-# Enable the panic handler wrapper
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
-
-# Patch LWIP memory pool allocators (see lwip_patch.c)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_malloc" APPEND)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_free" APPEND)
-
 # Define the project.
 project(micropython)
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 565f6feec2324..48f067debb76d 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -236,6 +236,13 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
 target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
 target_link_libraries(${MICROPY_TARGET} usermod)
 
+# Enable the panic handler wrapper
+idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
+
+# Patch LWIP memory pool allocators (see lwip_patch.c)
+idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_malloc" APPEND)
+idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_free" APPEND)
+
 # Collect all of the include directories and compile definitions for the IDF components,
 # including those added by the IDF Component Manager via idf_components.yaml.
 foreach(comp ${__COMPONENT_NAMES_RESOLVED})

From 043ba45bc36a4bb19e732ae3f68181a05137906b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 22 Oct 2024 16:01:01 +1100
Subject: [PATCH 1591/3129] esp32: Add some notes about the different CMake
 files.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/CMakeLists.txt     | 5 ++++-
 ports/esp32/esp32_common.cmake | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 9ca9065afd0d4..d695170fa2b5d 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -1,5 +1,8 @@
 # Top-level cmake file for building MicroPython on ESP32.
-
+#
+# Note for maintainers: Where possible, functionality should be put into
+# esp32_common.cmake not this file. This is because this CMakeLists.txt file
+# needs to be duplicated for out-of-tree builds, and can easily get out of date.
 cmake_minimum_required(VERSION 3.12)
 
 # Retrieve IDF version
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 48f067debb76d..9d51a03aa856e 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -1,3 +1,9 @@
+# This is the common ESP-IDF "main component" CMakeLists.txt contents for MicroPython.
+#
+# This file is included directly from a main_${IDF_TARGET}/CMakeLists.txt file
+# (or included from an out-of-tree main component CMakeLists.txt for out-of-tree
+# builds.)
+
 # Set location of base MicroPython directory.
 if(NOT MICROPY_DIR)
     get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)

From 9ea8d2a03181681feebaede3add82ec4970e30d7 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Sat, 26 Oct 2024 15:19:54 +1100
Subject: [PATCH 1592/3129] tools/mpremote: Fix UnboundLocalError in
 Transport.fs_writefile().

The variable `written` was being used before it was defined in the
`fs_writefile()` method of the Transport class.  This was causing an
`UnboundLocalError` to be raised when the `progress_callback` was not
provided.

Fixes issue #16084.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 tools/mpremote/mpremote/transport.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index 0b22a61580a03..d845796953a29 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -151,9 +151,9 @@ def fs_writefile(self, dest, data, chunk_size=256, progress_callback=None):
             while data:
                 chunk = data[:chunk_size]
                 self.exec("w(" + repr(chunk) + ")")
-                written += len(chunk)
                 data = data[len(chunk) :]
                 if progress_callback:
+                    written += len(chunk)
                     progress_callback(written, src_size)
             self.exec("f.close()")
         except TransportExecError as e:

From 86c71a0307a509b6c47fbb7ce1ab2d827ff92653 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 1 Oct 2024 21:40:06 +0200
Subject: [PATCH 1593/3129] esp32/machine_hw_spi: Reject invalid number of bits
 in constructor.

This commit adds an extra bit of parameters validation to the SPI bus
constructor on ESP32.  Passing 0 as the number of bits would trigger a
division by zero error when performing read/write operations on an SPI
bus created in such a fashion.

Fixes issue #5910.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 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 4b3d392cbdae2..6eb83fc09c37a 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -196,6 +196,10 @@ static void machine_hw_spi_init_internal(machine_hw_spi_obj_t *self, mp_arg_val_
         changed = true;
     }
 
+    if (args[ARG_bits].u_int != -1 && args[ARG_bits].u_int <= 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+    }
+
     if (args[ARG_bits].u_int != -1 && args[ARG_bits].u_int != self->bits) {
         self->bits = args[ARG_bits].u_int;
         changed = true;

From 548babf8a04510d99a49b2d129a9579afc33e182 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 27 Oct 2024 14:51:37 +1100
Subject: [PATCH 1594/3129] esp32/machine_pwm: Use IDF functions to calculate
 resolution correctly.

This commit fixes PWM configuration across C3, C6, S2 and S3 chips, which
was broken by 6d799378bad4474e77ddb2fa2187ecd6e290e0ba.  Without this fix
the PWM frequency is limited to a maximum of 2446Hz (on S2 at least).

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/machine_pwm.c | 50 +++++++++++++--------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 71402e1c49e44..61efdfa18548b 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -34,6 +34,7 @@
 #include "py/mphal.h"
 #include "driver/ledc.h"
 #include "esp_err.h"
+#include "esp_clk_tree.h"
 #include "soc/gpio_sig_map.h"
 
 #define PWM_DBG(...)
@@ -209,51 +210,32 @@ 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) {
     if (freq != timer->freq_hz) {
-        // Find the highest bit resolution for the requested frequency
-        unsigned int i = APB_CLK_FREQ; // 80 MHz
-        #if SOC_LEDC_SUPPORT_REF_TICK
-        if (freq < EMPIRIC_FREQ) {
-            i = REF_CLK_FREQ; // 1 MHz
-        }
-        #endif
-
-        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);
-
-        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;
+        // Configure the new frequency and resolution
         timer->freq_hz = freq;
-        #if SOC_LEDC_SUPPORT_XTAL_CLOCK
+
+        #if SOC_LEDC_SUPPORT_PLL_DIV_CLOCK
+        timer->clk_cfg = LEDC_USE_PLL_DIV_CLK;
+        #elif SOC_LEDC_SUPPORT_APB_CLOCK
+        timer->clk_cfg = LEDC_USE_APB_CLK;
+        #elif SOC_LEDC_SUPPORT_XTAL_CLOCK
         timer->clk_cfg = LEDC_USE_XTAL_CLK;
         #else
-        timer->clk_cfg = LEDC_USE_APB_CLK;
+        #error No supported PWM / LEDC clocks.
         #endif
         #if SOC_LEDC_SUPPORT_REF_TICK
         if (freq < EMPIRIC_FREQ) {
             timer->clk_cfg = LEDC_USE_REF_TICK;
         }
         #endif
+        uint32_t src_clk_freq = 0;
+        esp_err_t err = esp_clk_tree_src_get_freq_hz(timer->clk_cfg, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &src_clk_freq);
+        if (err != ESP_OK) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unable to query source clock frequency %d"), (int)timer->clk_cfg);
+        }
+        timer->duty_resolution = ledc_find_suitable_duty_resolution(src_clk_freq, timer->freq_hz);
 
         // Set frequency
-        esp_err_t err = ledc_timer_config(timer);
+        err = ledc_timer_config(timer);
         if (err != ESP_OK) {
             if (err == ESP_FAIL) {
                 mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unreachable frequency %d"), freq);

From d34b15ac6f03ecad224d02aec9491d6a04605f72 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 12 Sep 2024 13:08:32 +0200
Subject: [PATCH 1595/3129] pic16bit: Make it build with recent XC16 versions.

The PIC16 port didn't catch up with the other ports, so it required a bit
of work to make it build with the latest version of XC16.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/pic16bit/Makefile       |  4 ++--
 ports/pic16bit/mpconfigport.h |  4 ----
 py/misc.h                     | 13 +++++++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile
index 6d061514f9583..dda48fa3ce5f1 100644
--- a/ports/pic16bit/Makefile
+++ b/ports/pic16bit/Makefile
@@ -7,7 +7,7 @@ QSTR_DEFS = qstrdefsport.h
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-XCVERSION ?= 1.35
+XCVERSION ?= 2.10
 XC16 ?= /opt/microchip/xc16/v$(XCVERSION)
 CROSS_COMPILE ?= $(XC16)/bin/xc16-
 
@@ -31,7 +31,7 @@ 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
+LIBS += -L$(XC16)/lib -L$(XC16)/lib/$(PARTFAMILY) -lc99-elf -lm-elf -lc99-pic30-elf
 
 SRC_C = \
 	main.c \
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index a2d607fb29325..d80f7edb9e546 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -93,7 +93,3 @@ typedef int mp_off_t;
 #define MICROPY_MPHALPORT_H "pic16bit_mphal.h"
 #define MICROPY_HW_BOARD_NAME "dsPICSK"
 #define MICROPY_HW_MCU_NAME "dsPIC33"
-
-// XC16 toolchain doesn't seem to define these
-typedef int intptr_t;
-typedef unsigned int uintptr_t;
diff --git a/py/misc.h b/py/misc.h
index 96b13c151a6b9..8ac80bb7b3e34 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -380,6 +380,18 @@ static inline bool mp_check(bool value) {
 
 // mp_int_t can be larger than long, i.e. Windows 64-bit, nan-box variants
 static inline uint32_t mp_clz_mpi(mp_int_t x) {
+    #ifdef __XC16__
+    mp_uint_t mask = MP_OBJ_WORD_MSBIT_HIGH;
+    mp_uint_t zeroes = 0;
+    while (mask != 0) {
+        if (mask & (mp_uint_t)x) {
+            break;
+        }
+        zeroes++;
+        mask >>= 1;
+    }
+    return zeroes;
+    #else
     MP_STATIC_ASSERT(sizeof(mp_int_t) == sizeof(long long)
         || sizeof(mp_int_t) == sizeof(long));
 
@@ -389,6 +401,7 @@ static inline uint32_t mp_clz_mpi(mp_int_t x) {
     } else {
         return mp_clzll((unsigned long long)x);
     }
+    #endif
 }
 
 #endif // MICROPY_INCLUDED_PY_MISC_H

From 9591b0a53c599baac79e1e895153d6b6944ebef0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 30 Oct 2024 11:18:59 +1100
Subject: [PATCH 1596/3129] tools/ci.sh: Fix commit msg checking when PR branch
 HEAD behind master.

Fixes the problem noted at
https://github.com/micropython/micropython/pull/15547#issuecomment-2434479702
which is that, because default CI HEAD for a PR is a (generated) merge
commit into the master branch's current HEAD, then if the PR branch isn't
fully rebased then the commit check runs against commits from master as
well!

Also drops running this check on push, the pull_request event is triggered
by default on open and update ("synchronized" event), which probably covers
the cases where this check should run.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/commit_formatting.yml |  4 ++--
 tools/ci.sh                             | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index 3fdcabc4ca73f..fcbcaa7092ee2 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -1,6 +1,6 @@
 name: Check commit message formatting
 
-on: [push, pull_request]
+on: [pull_request]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: '100'
+        fetch-depth: 100
     - uses: actions/setup-python@v5
     - 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 6f0f23a1c4810..0b4b4e11cde42 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -39,12 +39,18 @@ function ci_c_code_formatting_run {
 # commit formatting
 
 function ci_commit_formatting_run {
-    git remote add upstream https://github.com/micropython/micropython.git
-    git fetch --depth=100 upstream master
+    # Default GitHub Actions checkout for a PR is a generated merge commit where
+    # the parents are the head of base branch (i.e. master) and the head of the
+    # PR branch, respectively. Use these parents to find the merge-base (i.e.
+    # where the PR branch head was branched)
+
     # If the common ancestor commit hasn't been found, fetch more.
-    git merge-base upstream/master HEAD || git fetch --unshallow upstream master
-    # For a PR, upstream/master..HEAD ends with a merge commit into master, exclude that one.
-    tools/verifygitlog.py -v upstream/master..HEAD --no-merges
+    git merge-base HEAD^1 HEAD^2 || git fetch --unshallow origin
+
+    MERGE_BASE=$(git merge-base HEAD^1 HEAD^2)
+    HEAD=$(git rev-parse HEAD^2)
+    echo "Checking commits between merge base ${MERGE_BASE} and PR head ${HEAD}..."
+    tools/verifygitlog.py -v "${MERGE_BASE}..${HEAD}"
 }
 
 ########################################################################################

From 787c424cfc1e07c8881713ee5c1a6e26f6d6bf07 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 31 Oct 2024 10:47:47 +1100
Subject: [PATCH 1597/3129] tools/ci.sh: Fix reference commit for code size
 comparison.

Previously the code size comparison was between the merge base (i.e. where
the PR branched), and the generated merge commit into master.  If the PR
branch was older than current master, this meant the size comparison could
incorrectly include changes already merged on master but missing from the
PR branch.

This commit changes it to compare the generated merge commit against
current master, i.e. the size impact if this PR was to be merged.

This commit also disables running the code size check on "push", it now
only runs on pull_request events.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/code_size.yml |  1 -
 tools/ci.sh                     | 44 +++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 163d4455cffec..67261933798cb 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -1,7 +1,6 @@
 name: Check code size
 
 on:
-  push:
   pull_request:
     paths:
       - '.github/workflows/*.yml'
diff --git a/tools/ci.sh b/tools/ci.sh
index 0b4b4e11cde42..db6f1cce0110f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -69,25 +69,37 @@ function ci_code_size_build {
     PORTS_TO_CHECK=bmusxpdv
     SUBMODULES="lib/asf4 lib/berkeley-db-1.xx lib/btstack lib/cyw43-driver lib/lwip lib/mbedtls lib/micropython-lib lib/nxp_driver 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
-    git fetch --depth=100 upstream master
-    # If the common ancestor commit hasn't been found, fetch more.
-    git merge-base upstream/master HEAD || git fetch --unshallow upstream master
+    # Default GitHub pull request sets HEAD to a generated merge commit
+    # between PR branch (HEAD^2) and base branch (i.e. master) (HEAD^1).
+    #
+    # We want to compare this generated commit with the base branch, to see what
+    # the code size impact would be if we merged this PR.
+    REFERENCE=$(git rev-parse --short HEAD^1)
+    COMPARISON=$(git rev-parse --short HEAD)
+
+    echo "Comparing sizes of reference ${REFERENCE} to ${COMPARISON}..."
+    git log --oneline $REFERENCE..$COMPARISON
+
+    function code_size_build_step {
+        COMMIT=$1
+        OUTFILE=$2
+        IGNORE_ERRORS=$3
+
+        echo "Building ${COMMIT}..."
+        git checkout --detach $COMMIT
+        git submodule update --init $SUBMODULES
+        git show -s
+        tools/metrics.py clean $PORTS_TO_CHECK
+        tools/metrics.py build $PORTS_TO_CHECK | tee $OUTFILE || $IGNORE_ERRORS
+    }
+
     # 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 $PORTS_TO_CHECK
-    tools/metrics.py build $PORTS_TO_CHECK | tee ~/size0 || true
+    code_size_build_step $REFERENCE ~/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 $PORTS_TO_CHECK
-    tools/metrics.py build $PORTS_TO_CHECK | tee ~/size1
+    code_size_build_step $COMPARISON ~/size1 false
+
+    unset -f code_size_build_step
 }
 
 ########################################################################################

From 0e490b7c8f32bb72c516985abe67147b9385dc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Klus=C3=A1=C4=8Dek?= <honza.klu@gmail.com>
Date: Tue, 29 Oct 2024 22:38:24 +0100
Subject: [PATCH 1598/3129] docs/reference/packages: Fix description of
 --target option in mip.

Descripton of mip usage with micropython port suggest using it like this:

    ./micropython -m mip install --target=third-party pkgname

But it should be called without equal sign:

    ./micropython -m mip install --target third-party pkgname

Signed-off-by: honza.klu@gmail.com
---
 docs/reference/packages.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index e47c226b24187..86b8efaa1953d 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -69,9 +69,9 @@ On the Unix port, ``mip`` can be used at the REPL as above, and also by using ``
     $ ./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::
+The ``--target path``, ``--no-mpy``, and ``--index`` arguments can be set::
 
-    $ ./micropython -m mip install --target=third-party pkgname
+    $ ./micropython -m mip install --target third-party pkgname
     $ ./micropython -m mip install --no-mpy pkgname
     $ ./micropython -m mip install --index https://host/pi pkgname
 

From 7e1098befe178e4b93657a4d49e6a354037beec4 Mon Sep 17 00:00:00 2001
From: Jan Sturm <jansturm92@googlemail.com>
Date: Tue, 29 Oct 2024 19:26:19 +0100
Subject: [PATCH 1599/3129] py/objdeque: Fix buffer overflow in deque_subscr.

In `deque_subscr()`, if `index_val` equals `self->alloc`, the index
correction `index_val -= self->alloc` does not execute, leading to an
out-of-bounds access in `self->items[index_val]`.

The fix in this commit ensures that the index correction is applied
whenever `index_val >= self->alloc`, preventing access beyond the allocated
buffer size.

Signed-off-by: Jan Sturm <jansturm92@googlemail.com>
---
 py/objdeque.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objdeque.c b/py/objdeque.c
index 2ad771284df53..22c380a05a926 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -208,7 +208,7 @@ static mp_obj_t deque_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 
     size_t offset = mp_get_index(self->base.type, deque_len(self), index, false);
     size_t index_val = self->i_get + offset;
-    if (index_val > self->alloc) {
+    if (index_val >= self->alloc) {
         index_val -= self->alloc;
     }
 

From c88a9d60a17594bfd72d57b073eeb9150019b52c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Oct 2024 15:07:58 +1100
Subject: [PATCH 1600/3129] tests/basics/deque2.py: Add tests for deque
 subscript-from-end.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/deque2.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py
index 3552d5be37abe..ebc0872c7b4e0 100644
--- a/tests/basics/deque2.py
+++ b/tests/basics/deque2.py
@@ -31,6 +31,16 @@
 d[3] = 5
 print(d[3])
 
+# Access the last element via index, when the last element is at various locations
+d = deque((), 2)
+for i in range(4):
+    d.append(i)
+    print(i, d[-1])
+
+# Write the last element then access all elements from the end
+d[-1] = 4
+print(d[-2], d[-1])
+
 # Accessing indices out of bounds raises IndexError
 try:
     d[4]

From f2ac4719891af9d50520828ae5d68ffa0d9f19c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Oct 2024 12:04:07 +1100
Subject: [PATCH 1601/3129] tests/run-tests.py: Simplify the way
 target-specific tests are given.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 158 ++++++++++++++++++++++++---------------------
 1 file changed, 84 insertions(+), 74 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index cd1d681af1ee5..f144a763c95f5 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -89,6 +89,88 @@ def open(self, path, mode):
 __import__('__injected_test')
 """
 
+# Tests to skip on specific targets.
+# These are tests that are difficult to detect that they should not be run on the given target.
+target_tests_to_skip = {
+    "esp8266": (
+        "micropython/viper_args.py",  # too large
+        "micropython/viper_binop_arith.py",  # too large
+        "misc/rge_sm.py",  # too large
+    ),
+    "minimal": (
+        "basics/class_inplace_op.py",  # all special methods not supported
+        "basics/subclass_native_init.py",  # native subclassing corner cases not support
+        "misc/rge_sm.py",  # too large
+        "micropython/opt_level.py",  # don't assume line numbers are stored
+    ),
+    "nrf": (
+        "basics/io_buffered_writer.py",
+        "basics/io_bytesio_cow.py",
+        "basics/io_bytesio_ext.py",
+        "basics/io_bytesio_ext2.py",
+        "basics/io_iobase.py",
+        "basics/io_stringio1.py",
+        "basics/io_stringio_base.py",
+        "basics/io_stringio_with.py",
+        "basics/io_write_ext.py",
+        "basics/memoryview1.py",  # no item assignment for memoryview
+        "extmod/random_basic.py",  # unimplemented: random.seed
+        "micropython/opt_level.py",  # no support for line numbers
+        "misc/non_compliant.py",  # no item assignment for bytearray
+    ),
+    "renesas-ra": (
+        "extmod/time_time_ns.py",  # RA fsp rtc function doesn't support nano sec info
+    ),
+    "rp2": (
+        # Skip thread tests that require more that 2 threads.
+        "thread/stress_heap.py",
+        "thread/thread_lock2.py",
+        "thread/thread_lock3.py",
+        "thread/thread_shared2.py",
+    ),
+    "qemu": (
+        # Skip tests that require Cortex-M4.
+        "inlineasm/asmfpaddsub.py",
+        "inlineasm/asmfpcmp.py",
+        "inlineasm/asmfpldrstr.py",
+        "inlineasm/asmfpmuldiv.py",
+        "inlineasm/asmfpsqrt.py",
+    ),
+    "webassembly": (
+        "basics/string_format_modulo.py",  # can't print nulls to stdout
+        "basics/string_strip.py",  # can't print nulls to stdout
+        "extmod/asyncio_basic2.py",
+        "extmod/asyncio_cancel_self.py",
+        "extmod/asyncio_current_task.py",
+        "extmod/asyncio_exception.py",
+        "extmod/asyncio_gather_finished_early.py",
+        "extmod/asyncio_get_event_loop.py",
+        "extmod/asyncio_heaplock.py",
+        "extmod/asyncio_loop_stop.py",
+        "extmod/asyncio_new_event_loop.py",
+        "extmod/asyncio_threadsafeflag.py",
+        "extmod/asyncio_wait_for_fwd.py",
+        "extmod/binascii_a2b_base64.py",
+        "extmod/re_stack_overflow.py",
+        "extmod/time_res.py",
+        "extmod/vfs_posix.py",
+        "extmod/vfs_posix_enoent.py",
+        "extmod/vfs_posix_paths.py",
+        "extmod/vfs_userfs.py",
+        "micropython/emg_exc.py",
+        "micropython/extreme_exc.py",
+        "micropython/heapalloc_exc_compressed_emg_exc.py",
+    ),
+    "wipy": (
+        "misc/print_exception.py",  # requires error reporting full
+    ),
+    "zephyr": (
+        # Skip thread tests that require more than 4 threads.
+        "thread/stress_heap.py",
+        "thread/thread_lock3.py",
+    ),
+}
+
 
 def rm_f(fname):
     if os.path.exists(fname):
@@ -629,85 +711,13 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             if t.startswith("thread/mutate_"):
                 skip_tests.add(t)
 
-    # Skip thread tests that require many threads on targets that don't support multiple threads.
-    if args.target == "rp2":
-        skip_tests.add("thread/stress_heap.py")
-        skip_tests.add("thread/thread_lock2.py")
-        skip_tests.add("thread/thread_lock3.py")
-        skip_tests.add("thread/thread_shared2.py")
-    elif args.target == "zephyr":
-        skip_tests.add("thread/stress_heap.py")
-        skip_tests.add("thread/thread_lock3.py")
-
     # 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
 
-        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/heapq1.py")  # heapq not supported by WiPy
-            skip_tests.add("extmod/random_basic.py")  # requires random
-            skip_tests.add("extmod/random_extra.py")  # requires random
-        elif args.target == "esp8266":
-            skip_tests.add("micropython/viper_args.py")  # too large
-            skip_tests.add("micropython/viper_binop_arith.py")  # too large
-            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/random_basic.py")  # unimplemented: random.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_"):
-                    skip_tests.add(t)
-        elif args.target == "renesas-ra":
-            skip_tests.add(
-                "extmod/time_time_ns.py"
-            )  # RA fsp rtc function doesn't support nano sec info
-        elif args.target == "qemu":
-            skip_tests.add("inlineasm/asmfpaddsub.py")  # requires Cortex-M4
-            skip_tests.add("inlineasm/asmfpcmp.py")
-            skip_tests.add("inlineasm/asmfpldrstr.py")
-            skip_tests.add("inlineasm/asmfpmuldiv.py")
-            skip_tests.add("inlineasm/asmfpsqrt.py")
-        elif args.target == "webassembly":
-            skip_tests.add("basics/string_format_modulo.py")  # can't print nulls to stdout
-            skip_tests.add("basics/string_strip.py")  # can't print nulls to stdout
-            skip_tests.add("extmod/asyncio_basic2.py")
-            skip_tests.add("extmod/asyncio_cancel_self.py")
-            skip_tests.add("extmod/asyncio_current_task.py")
-            skip_tests.add("extmod/asyncio_exception.py")
-            skip_tests.add("extmod/asyncio_gather_finished_early.py")
-            skip_tests.add("extmod/asyncio_get_event_loop.py")
-            skip_tests.add("extmod/asyncio_heaplock.py")
-            skip_tests.add("extmod/asyncio_loop_stop.py")
-            skip_tests.add("extmod/asyncio_new_event_loop.py")
-            skip_tests.add("extmod/asyncio_threadsafeflag.py")
-            skip_tests.add("extmod/asyncio_wait_for_fwd.py")
-            skip_tests.add("extmod/binascii_a2b_base64.py")
-            skip_tests.add("extmod/re_stack_overflow.py")
-            skip_tests.add("extmod/time_res.py")
-            skip_tests.add("extmod/vfs_posix.py")
-            skip_tests.add("extmod/vfs_posix_enoent.py")
-            skip_tests.add("extmod/vfs_posix_paths.py")
-            skip_tests.add("extmod/vfs_userfs.py")
-            skip_tests.add("micropython/emg_exc.py")
-            skip_tests.add("micropython/extreme_exc.py")
-            skip_tests.add("micropython/heapalloc_exc_compressed_emg_exc.py")
+    # Skip target-specific tests.
+    skip_tests.update(target_tests_to_skip.get(args.target, ()))
 
     # Some tests are known to fail on 64-bit machines
     if pyb is None and platform.architecture()[0] == "64bit":

From 8978102f3595ae321484a6be44c1dcf25c8909a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Aug 2024 16:21:39 +1000
Subject: [PATCH 1602/3129] tests/run-tests.py: Change --target/--device
 options to --test-instance.

Previously to this commit, running the test suite on a bare-metal board
required specifying the target (really platform) and device, eg:

    $ ./run-tests.py --target pyboard --device /dev/ttyACM1

That's quite a lot to type, and you also need to know what the target
platform is, when a lot of the time you either don't care or it doesn't
matter.

This commit makes it easier to run the tests by replacing both of these
options with a single `--test-instance` (`-t` for short) option.  That
option specifies the executable/port/device to test.  Then the target
platform is automatically detected.

The `--test-instance` can be passed:
- "unix" (the default) to use the unix version of MicroPython
- "webassembly" to test the webassembly port
- anything else is considered a port/device to pass to Pyboard

There are also some shortcuts to specify a port/device, following
`mpremote`:
- a<n> is short for /dev/ttyACM<n>
- u<n> is short for /dev/ttyUSB<n>
- c<n> is short for COM<n>

For example:

    $ ./run-tests.py -t a1

Note that the default test instance is "unix" and so this commit does not
change the standard way to run tests on the unix port, by just doing
`./run-tests.py`.

As part of this change, the platform (and it's native architecture if it
supports importing native .mpy files) is show at the start of the test run.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/gettingstarted.rst    |   2 +-
 docs/develop/writingtests.rst      |   2 +-
 ports/cc3200/tools/smoke.py        |   2 +-
 ports/qemu/Makefile                |   2 +-
 ports/qemu/README.md               |   2 +-
 ports/webassembly/Makefile         |   4 +-
 tests/README.md                    |  16 +++-
 tests/feature_check/target_info.py |   3 +-
 tests/run-tests.py                 | 148 ++++++++++++++++++-----------
 tools/ci.sh                        |   2 +-
 10 files changed, 116 insertions(+), 67 deletions(-)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index c1fd338c54cc0..fed632ea1ac15 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -278,7 +278,7 @@ To run a selection of tests on a board/device connected over USB use:
 .. code-block:: bash
 
    $ cd tests
-   $ ./run-tests.py --target minimal --device /dev/ttyACM0
+   $ ./run-tests.py -t /dev/ttyACM0
 
 See also :ref:`writingtests`.
 
diff --git a/docs/develop/writingtests.rst b/docs/develop/writingtests.rst
index 9bb5178f55f22..a7d033f17e9b9 100644
--- a/docs/develop/writingtests.rst
+++ b/docs/develop/writingtests.rst
@@ -60,7 +60,7 @@ Then to run on a board:
 
 .. code-block:: bash
 
-   $ ./run-tests.py --target minimal --device /dev/ttyACM0
+   $ ./run-tests.py -t /dev/ttyACM0
 
 And to run only a certain set of tests (eg a directory):
 
diff --git a/ports/cc3200/tools/smoke.py b/ports/cc3200/tools/smoke.py
index 463a485c4d4c8..f7105411b4d7e 100644
--- a/ports/cc3200/tools/smoke.py
+++ b/ports/cc3200/tools/smoke.py
@@ -6,7 +6,7 @@
 """
 Execute it like this:
 
-python3 run-tests.py --target wipy --device 192.168.1.1 ../cc3200/tools/smoke.py
+python3 run-tests.py -t 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/qemu/Makefile b/ports/qemu/Makefile
index 4d73c025d7dc9..62601324d6a92 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -166,7 +166,7 @@ run: $(BUILD)/firmware.elf
 .PHONY: test
 test: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && ./run-tests.py --target qemu --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
+	cd $(TOP)/tests && ./run-tests.py -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
 
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
 	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
diff --git a/ports/qemu/README.md b/ports/qemu/README.md
index d9108311bef92..984faf8704794 100644
--- a/ports/qemu/README.md
+++ b/ports/qemu/README.md
@@ -95,7 +95,7 @@ Or manually by first starting the emulation with `make run` and then running the
 tests against the serial device, for example:
 
     $ cd ../../tests
-    $ ./run-tests.py --target qemu --device /dev/pts/1
+    $ ./run-tests.py -t /dev/pts/1
 
 Extra make options
 ------------------
diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index 435636531cc26..9a673b757b29c 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -148,10 +148,10 @@ repl: $(BUILD)/micropython.mjs
 min: $(BUILD)/micropython.min.mjs
 
 test: $(BUILD)/micropython.mjs $(TOP)/tests/run-tests.py
-	cd $(TOP)/tests && MICROPY_MICROPYTHON_MJS=../ports/webassembly/$< ./run-tests.py --target webassembly
+	cd $(TOP)/tests && MICROPY_MICROPYTHON_MJS=../ports/webassembly/$< ./run-tests.py -t webassembly
 
 test_min: $(BUILD)/micropython.min.mjs $(TOP)/tests/run-tests.py
-	cd $(TOP)/tests && MICROPY_MICROPYTHON_MJS=../ports/webassembly/$< ./run-tests.py --target webassembly
+	cd $(TOP)/tests && MICROPY_MICROPYTHON_MJS=../ports/webassembly/$< ./run-tests.py -t webassembly
 
 ################################################################################
 # Remaining make rules.
diff --git a/tests/README.md b/tests/README.md
index 7bd7eb587177b..b39833aa096f4 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,7 +1,19 @@
 # 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.
+This directory contains tests for most parts of MicroPython.
+
+To run all stable tests, run the "run-tests.py" script in this directory.  By default
+that will run the test suite against the unix port of MicroPython.
+
+To run the test suite against a bare-metal target (a board running MicroPython firmware)
+use the `-t` option to specify the serial port.  This will automatically detect the
+target platform and run the appropriate set of tests for that platform.  For example:
+
+    $ ./run-tests.py -t /dev/ttyACM0
+
+That will run tests on the `/dev/ttyACM0` serial port.  You can also use shortcut
+device names like `a<n>` for `/dev/ttyACM<n>` and `c<n>` for `COM<n>`.  Use
+`./run-tests.py --help` to see all of the device possibilites, and other options.
 
 Tests of capabilities not supported on all platforms should be written
 to check for the capability being present. If it is not, the test
diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
index df89496708aa9..f60f3b319192e 100644
--- a/tests/feature_check/target_info.py
+++ b/tests/feature_check/target_info.py
@@ -4,6 +4,7 @@
 
 import sys
 
+platform = getattr(sys, "platform", "minimal")
 sys_mpy = getattr(sys.implementation, "_mpy", 0)
 arch = [
     None,
@@ -19,4 +20,4 @@
     "xtensawin",
     "rv32imc",
 ][sys_mpy >> 10]
-print(arch)
+print(platform, arch)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index f144a763c95f5..3db058a3a1d88 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -89,9 +89,12 @@ def open(self, path, mode):
 __import__('__injected_test')
 """
 
+# Platforms associated with the unix port, values of `sys.platform`.
+PC_PLATFORMS = ("darwin", "linux", "win32")
+
 # Tests to skip on specific targets.
 # These are tests that are difficult to detect that they should not be run on the given target.
-target_tests_to_skip = {
+platform_tests_to_skip = {
     "esp8266": (
         "micropython/viper_args.py",  # too large
         "micropython/viper_binop_arith.py",  # too large
@@ -161,7 +164,7 @@ def open(self, path, mode):
         "micropython/extreme_exc.py",
         "micropython/heapalloc_exc_compressed_emg_exc.py",
     ),
-    "wipy": (
+    "WiPy": (
         "misc/print_exception.py",  # requires error reporting full
     ),
     "zephyr": (
@@ -197,6 +200,53 @@ def convert_regex_escapes(line):
     return bytes("".join(cs), "utf8")
 
 
+def get_test_instance(test_instance, baudrate, user, password):
+    if test_instance.startswith("port:"):
+        _, port = test_instance.split(":", 1)
+    elif test_instance == "unix":
+        return None
+    elif test_instance == "webassembly":
+        return PyboardNodeRunner()
+    elif test_instance.startswith("a") and test_instance[1:].isdigit():
+        port = "/dev/ttyACM" + test_instance[1:]
+    elif test_instance.startswith("u") and test_instance[1:].isdigit():
+        port = "/dev/ttyUSB" + test_instance[1:]
+    elif test_instance.startswith("c") and test_instance[1:].isdigit():
+        port = "COM" + test_instance[1:]
+    else:
+        # Assume it's a device path.
+        port = test_instance
+
+    global pyboard
+    sys.path.append(base_path("../tools"))
+    import pyboard
+
+    pyb = pyboard.Pyboard(port, baudrate, user, password)
+    pyboard.Pyboard.run_script_on_remote_target = run_script_on_remote_target
+    pyb.enter_raw_repl()
+    return pyb
+
+
+def detect_test_platform(pyb, args):
+    # Run a script to detect various bits of information about the target test instance.
+    output = run_feature_check(pyb, args, "target_info.py")
+    if output.endswith(b"CRASH"):
+        raise ValueError("cannot detect platform: {}".format(output))
+    platform, arch = str(output, "ascii").strip().split()
+    if arch == "None":
+        arch = None
+
+    args.platform = platform
+    args.arch = arch
+    if arch and not args.mpy_cross_flags:
+        args.mpy_cross_flags = "-march=" + arch
+
+    print("platform={}".format(platform), end="")
+    if arch:
+        print(" arch={}".format(arch), end="")
+    print()
+
+
 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:
@@ -706,18 +756,18 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("extmod/ssl_poll.py")
 
     # Skip thread mutation tests on targets that don't have the GIL.
-    if args.target in ("rp2", "unix"):
+    if args.platform in PC_PLATFORMS + ("rp2",):
         for t in tests:
             if t.startswith("thread/mutate_"):
                 skip_tests.add(t)
 
     # Some tests shouldn't be run on pyboard
-    if args.target != "unix":
+    if args.platform not in PC_PLATFORMS:
         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 target-specific tests.
-    skip_tests.update(target_tests_to_skip.get(args.target, ()))
+    # Skip platform-specific tests.
+    skip_tests.update(platform_tests_to_skip.get(args.platform, ()))
 
     # Some tests are known to fail on 64-bit machines
     if pyb is None and platform.architecture()[0] == "64bit":
@@ -932,17 +982,38 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description="""Run and manage tests for MicroPython.
 
+By default the tests are run against the unix port of MicroPython. To run it
+against something else, use the -t option.  See below for details.
+
 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.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.py produces a pair of <test>.out and <test>.exp files in the result
 directory with the MicroPython output and the expectations, respectively.
 """,
         epilog="""\
+The -t option accepts the following for the test instance:
+- unix - use the unix port of MicroPython, specified by the MICROPY_MICROPYTHON
+  environment variable (which defaults to the standard variant of either the unix
+  or windows ports, depending on the host platform)
+- webassembly - use the webassembly port of MicroPython, specified by the
+  MICROPY_MICROPYTHON_MJS environment variable (which defaults to the standard
+  variant of the webassembly port)
+- port:<device> - connect to and use the given serial port device
+- a<n> - connect to and use /dev/ttyACM<n>
+- u<n> - connect to and use /dev/ttyUSB<n>
+- c<n> - connect to and use COM<n>
+- exec:<command> - execute a command and attach to its stdin/stdout
+- execpty:<command> - execute a command and attach to the printed /dev/pts/<n> device
+- <a>.<b>.<c>.<d> - connect to the given IPv4 address
+- anything else specifies a serial port
+
 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:
@@ -951,11 +1022,8 @@ def main():
   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",
+        "-t", "--test-instance", default="unix", help="the MicroPython instance to test"
     )
     cmd_parser.add_argument(
         "-b", "--baudrate", default=115200, help="the baud rate of the serial device"
@@ -1039,43 +1107,11 @@ def main():
 
         sys.exit(0)
 
-    LOCAL_TARGETS = (
-        "unix",
-        "webassembly",
-    )
-    EXTERNAL_TARGETS = (
-        "pyboard",
-        "wipy",
-        "esp8266",
-        "esp32",
-        "minimal",
-        "nrf",
-        "qemu",
-        "renesas-ra",
-        "rp2",
-        "zephyr",
-    )
-    if args.target in LOCAL_TARGETS:
-        pyb = None
-        if args.target == "webassembly":
-            pyb = PyboardNodeRunner()
-    elif args.target in EXTERNAL_TARGETS:
-        global pyboard
-        sys.path.append(base_path("../tools"))
-        import pyboard
-
-        pyb = pyboard.Pyboard(args.device, args.baudrate, args.user, args.password)
-        pyboard.Pyboard.run_script_on_remote_target = run_script_on_remote_target
-        pyb.enter_raw_repl()
-    else:
-        raise ValueError("target must be one of %s" % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
+    # Get the test instance to run on.
+    pyb = get_test_instance(args.test_instance, args.baudrate, args.user, args.password)
 
-    # Automatically detect the native architecture for mpy-cross if not given.
-    if not args.mpy_cross_flags:
-        output = run_feature_check(pyb, args, "target_info.py")
-        arch = str(output, "ascii").strip()
-        if arch != "None":
-            args.mpy_cross_flags = "-march=" + arch
+    # Automatically detect the platform.
+    detect_test_platform(pyb, args)
 
     if args.run_failures and (any(args.files) or args.test_dirs is not None):
         raise ValueError(
@@ -1091,7 +1127,7 @@ def main():
             tests = []
     elif len(args.files) == 0:
         test_extensions = ("*.py",)
-        if args.target == "webassembly":
+        if args.platform == "webassembly":
             test_extensions += ("*.js", "*.mjs")
 
         if args.test_dirs is None:
@@ -1101,23 +1137,23 @@ def main():
                 "misc",
                 "extmod",
             )
-            if args.target == "pyboard":
+            if args.platform == "pyboard":
                 # run pyboard tests
                 test_dirs += ("float", "stress", "inlineasm", "ports/stm32")
-            elif args.target in ("renesas-ra"):
+            elif args.platform == "renesas-ra":
                 test_dirs += ("float", "inlineasm", "ports/renesas-ra")
-            elif args.target == "rp2":
+            elif args.platform == "rp2":
                 test_dirs += ("float", "stress", "thread", "ports/rp2")
                 if "arm" in args.mpy_cross_flags:
                     test_dirs += ("inlineasm",)
-            elif args.target == "esp32":
+            elif args.platform == "esp32":
                 test_dirs += ("float", "stress", "thread")
-            elif args.target in ("esp8266", "minimal", "nrf"):
+            elif args.platform in ("esp8266", "minimal", "nrf"):
                 test_dirs += ("float",)
-            elif args.target == "wipy":
+            elif args.platform == "WiPy":
                 # run WiPy tests
                 test_dirs += ("ports/cc3200",)
-            elif args.target == "unix":
+            elif args.platform in PC_PLATFORMS:
                 # run PC tests
                 test_dirs += (
                     "float",
@@ -1128,13 +1164,13 @@ def main():
                     "cmdline",
                     "ports/unix",
                 )
-            elif args.target == "qemu":
+            elif args.platform == "qemu":
                 test_dirs += (
                     "float",
                     "inlineasm",
                     "ports/qemu",
                 )
-            elif args.target == "webassembly":
+            elif args.platform == "webassembly":
                 test_dirs += ("float", "ports/webassembly")
         else:
             # run tests from these directories
diff --git a/tools/ci.sh b/tools/ci.sh
index db6f1cce0110f..4e6f09b0bb853 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -785,5 +785,5 @@ function ci_zephyr_run_tests {
     docker exec zephyr-ci west build -p auto -b qemu_cortex_m3 -- -DCONF_FILE=prj_minimal.conf
     # Issues with zephyr tests:
     # - inf_nan_arith fails pow(-1, nan) test
-    (cd tests && ./run-tests.py --target minimal --device execpty:"qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -monitor null -serial pty -kernel ../ports/zephyr/build/zephyr/zephyr.elf" -d basics float --exclude inf_nan_arith)
+    (cd tests && ./run-tests.py -t execpty:"qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -monitor null -serial pty -kernel ../ports/zephyr/build/zephyr/zephyr.elf" -d basics float --exclude inf_nan_arith)
 }

From 85053adb243800e7168e5736853bea5364770191 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Oct 2024 13:59:31 +1100
Subject: [PATCH 1603/3129] tests/run-tests.py: Add mimxrt and samd platforms.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 3db058a3a1d88..d0feb4bcd6635 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1140,6 +1140,8 @@ def main():
             if args.platform == "pyboard":
                 # run pyboard tests
                 test_dirs += ("float", "stress", "inlineasm", "ports/stm32")
+            elif args.platform == "mimxrt":
+                test_dirs += ("float", "stress", "inlineasm")
             elif args.platform == "renesas-ra":
                 test_dirs += ("float", "inlineasm", "ports/renesas-ra")
             elif args.platform == "rp2":
@@ -1148,7 +1150,7 @@ def main():
                     test_dirs += ("inlineasm",)
             elif args.platform == "esp32":
                 test_dirs += ("float", "stress", "thread")
-            elif args.platform in ("esp8266", "minimal", "nrf"):
+            elif args.platform in ("esp8266", "minimal", "samd", "nrf"):
                 test_dirs += ("float",)
             elif args.platform == "WiPy":
                 # run WiPy tests

From 919756cea4da30ab98cfa00016ed5b3847003219 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Oct 2024 12:41:17 +1100
Subject: [PATCH 1604/3129] extmod/modlwip: Fix IGMP address type when IPv6 is
 enabled.

This was missed in 628abf8f25a7705a2810fffe2ca6ae652c532896.  The the bug
was that, when IPv6 is enabled, the `sizeof(ip_addr_t)` is much larger than
IPv4 size, which is what's needed for IGMP addressing.

Fixes issue #16100.

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

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 21c6f7264befa..0d38bf41b2051 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1432,7 +1432,7 @@ static mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
         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) {
+            if (bufinfo.len != sizeof(MP_IGMP_IP_ADDR_TYPE) * 2) {
                 mp_raise_ValueError(NULL);
             }
 

From d278ba5cc53491037a80e5c4fbd3f94d00ebe3d7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Oct 2024 11:32:59 +1100
Subject: [PATCH 1605/3129] extmod/nimble: Remove asserts of ediv_rand_present
 and adjust comments.

Recent versions of NimBLE (since release 1.6.0) removed this variable; see
https://github.com/apache/mynewt-nimble/commit/7cc8c08d67d52b373eeeec6b33b113192cf2e996.

We never used it except in an assert, so remove those asserts to make the
code compatible with newer NimBLE versions (eg for the esp32 port).

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

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 8d555f1124f9a..6ca0c172677c7 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1911,24 +1911,21 @@ static int ble_secret_store_read(int obj_type, const union ble_store_key *key, u
                 // <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.
+            // <type=our,addr,*>
+            // Find our secret for this remote device.
             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;
@@ -1958,10 +1955,6 @@ static int ble_secret_store_read(int obj_type, const union ble_store_key *key, u
 
     DEBUG_printf("ble_secret_store_read: found secret\n");
 
-    if (obj_type == BLE_STORE_OBJ_TYPE_OUR_SEC) {
-        // TODO: Verify ediv_rand matches.
-    }
-
     return 0;
 }
 
@@ -1970,14 +1963,13 @@ static int ble_secret_store_write(int obj_type, const union ble_store_value *val
     switch (obj_type) {
         case BLE_STORE_OBJ_TYPE_PEER_SEC:
         case BLE_STORE_OBJ_TYPE_OUR_SEC: {
-            // <type=peer,addr,edivrand>
+            // <type=peer,addr,*>
 
             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);
@@ -2005,9 +1997,7 @@ static int ble_secret_store_delete(int obj_type, const union ble_store_key *key)
         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);

From 275b3afae70ef71c4c17801d4bf56c0921481b6c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Oct 2024 11:10:46 +1100
Subject: [PATCH 1606/3129] esp32/network_wlan: Add missing WLAN security
 constants.

These were added to the `network` module but not the `network.WLAN` class,
which is the new home for such constants.

Also:
- Mark the WLAN constants in the `network` module as deprecated, to be
  removed in MicroPython 2.0.
- Move the static assert to the WLAN source code, to be close to where it
  relates to.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modnetwork_globals.h |  3 ++-
 ports/esp32/network_common.c     |  8 --------
 ports/esp32/network_wlan.c       | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index c0cf229421daf..c6092bd142178 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -13,7 +13,8 @@
 { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_network_phy_mode_obj) },
 { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&esp_network_ipconfig_obj) },
 
-#if MICROPY_PY_NETWORK_WLAN
+// These WLAN constants are now in the WLAN class and remain here only for backwards compatibility.
+#if !MICROPY_PREVIEW_VERSION_2 && 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)},
 
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index d6bba32146c5c..fce8a0304c8be 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -337,11 +337,3 @@ static mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj, 0, 1, esp_phy_mode);
-
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
-_Static_assert(WIFI_AUTH_MAX == 13, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
-#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
-_Static_assert(WIFI_AUTH_MAX == 11, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
-#else
-_Static_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
-#endif
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 7e802166c116c..d415c56d32175 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -744,6 +744,13 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA2_WPA3), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
     { MP_ROM_QSTR(MP_QSTR_SEC_WAPI), MP_ROM_INT(WIFI_AUTH_WAPI_PSK) },
     { MP_ROM_QSTR(MP_QSTR_SEC_OWE), MP_ROM_INT(WIFI_AUTH_OWE) },
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_ENT_192), MP_ROM_INT(WIFI_AUTH_WPA3_ENT_192) },
+    #endif
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_EXT_PSK), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_EXT_PSK_MIXED_MODE), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(WIFI_PS_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(WIFI_PS_MIN_MODEM) },
@@ -751,6 +758,14 @@ 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);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+_Static_assert(WIFI_AUTH_MAX == 13, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
+_Static_assert(WIFI_AUTH_MAX == 11, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+#else
+_Static_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     esp_network_wlan_type,
     MP_QSTR_WLAN,

From 594670e44623e0635ecf45eb34b0a43f27e04101 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 1 Nov 2024 15:57:40 +1100
Subject: [PATCH 1607/3129] esp32/machine_pwm: Restore PWM support for ESP-IDF
 v5.0.x and v5.1.x.

The cleanup in 548babf8 relies on some functions not available in older
ESP-IDF. Temporarily restore them, until we drop support for ESP-IDF <5.2.

PWM functionality should end up the same regardless of ESP-IDF version, and
also no different from MicroPython V1.23.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_pwm.c | 52 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 61efdfa18548b..0134fa2cc8c89 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -34,9 +34,12 @@
 #include "py/mphal.h"
 #include "driver/ledc.h"
 #include "esp_err.h"
-#include "esp_clk_tree.h"
 #include "soc/gpio_sig_map.h"
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+#include "esp_clk_tree.h"
+#endif
+
 #define PWM_DBG(...)
 // #define PWM_DBG(...) mp_printf(&mp_plat_print, __VA_ARGS__); mp_printf(&mp_plat_print, "\n");
 
@@ -208,7 +211,41 @@ static void configure_channel(machine_pwm_obj_t *self) {
     }
 }
 
+// Temporary workaround for ledc_find_suitable_duty_resolution function only being added in IDF V5.2
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
+static uint32_t ledc_find_suitable_duty_resolution(uint32_t src_clk_freq, uint32_t timer_freq) {
+    // This implementation is based on the one used in Micropython v1.23
+
+    // Find the highest bit resolution for the requested frequency
+    unsigned int freq = src_clk_freq;
+
+    int divider = (freq + timer_freq / 2) / timer_freq; // rounded
+    if (divider == 0) {
+        divider = 1;
+    }
+    float f = (float)freq / divider; // actual frequency
+    if (f <= 1.0) {
+        f = 1.0;
+    }
+    freq = (unsigned int)roundf((float)freq / f);
+
+    unsigned int res = 0;
+    for (; freq > 1; freq >>= 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;
+    }
+
+    return res;
+}
+#endif
+
 static void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_config_t *timer) {
+    esp_err_t err;
     if (freq != timer->freq_hz) {
         // Configure the new frequency and resolution
         timer->freq_hz = freq;
@@ -228,10 +265,21 @@ static void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         }
         #endif
         uint32_t src_clk_freq = 0;
-        esp_err_t err = esp_clk_tree_src_get_freq_hz(timer->clk_cfg, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &src_clk_freq);
+        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
+        err = esp_clk_tree_src_get_freq_hz(timer->clk_cfg, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &src_clk_freq);
         if (err != ESP_OK) {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unable to query source clock frequency %d"), (int)timer->clk_cfg);
         }
+        #else
+        // Simplified fallback logic for IDF V5.0.x, for targets with APB only.
+        src_clk_freq = APB_CLK_FREQ; // 80 MHz
+        #if SOC_LEDC_SUPPORT_REF_TICK
+        if (timer->clk_cfg == LEDC_USE_REF_TICK) {
+            src_clk_freq = REF_CLK_FREQ; // 1 MHz
+        }
+        #endif // SOC_LEDC_SUPPORT_REF_TICK
+        #endif // ESP_IDF_VERSION
+
         timer->duty_resolution = ledc_find_suitable_duty_resolution(src_clk_freq, timer->freq_hz);
 
         // Set frequency

From df6b40a87fe3ddcb37cde488ba1a2060625ab737 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Nov 2024 14:27:01 +1100
Subject: [PATCH 1608/3129] esp32: Workaround native code execution crash on
 ESP32-S2.

Seemingly ESP-IDF incorrectly marks RTC FAST memory region
as MALLOC_CAP_EXEC on ESP32-S2 when it isn't. This memory is
the lowest priority, so it only is returned if D/IRAM is exhausted.

Apply this workaround to treat the allocation as failed if it gives us
non-executable RAM back, rather than crashing.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/main.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 03dc0807a025c..18ef9d7354798 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -39,6 +39,7 @@
 #include "esp_task.h"
 #include "esp_event.h"
 #include "esp_log.h"
+#include "esp_memory_utils.h"
 #include "esp_psram.h"
 
 #include "py/cstack.h"
@@ -237,6 +238,13 @@ void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     len = (len + 3) & ~3;
     size_t len_node = sizeof(native_code_node_t) + len;
     native_code_node_t *node = heap_caps_malloc(len_node, MALLOC_CAP_EXEC);
+    #if CONFIG_IDF_TARGET_ESP32S2
+    // Workaround for ESP-IDF bug https://github.com/espressif/esp-idf/issues/14835
+    if (node != NULL && !esp_ptr_executable(node)) {
+        free(node);
+        node = NULL;
+    }
+    #endif // CONFIG_IDF_TARGET_ESP32S2
     if (node == NULL) {
         m_malloc_fail(len_node);
     }

From 48f96e96605c020a646adfc2d06ee0db9b87fbe8 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Nov 2024 11:17:32 +1100
Subject: [PATCH 1609/3129] docs: Specify the recommended
 network.WLAN.IF_[AP|STA] constants.

Removes the deprecated network.[AP|STA]_IF form from the docs.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/quickref.rst                  | 11 ++++++-----
 docs/esp8266/quickref.rst                |  8 ++++----
 docs/esp8266/tutorial/network_basics.rst | 13 +++++++------
 docs/library/espnow.rst                  | 24 ++++++++++++------------
 docs/library/network.WLAN.rst            |  8 ++++----
 docs/reference/mpremote.rst              |  2 +-
 6 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 3ab4e8f5ecd96..b9ca0f8225f8f 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -79,11 +79,11 @@ Networking
 WLAN
 ^^^^
 
-The :mod:`network` module::
+The :class:`network.WLAN` class in the :mod:`network` module::
 
     import network
 
-    wlan = network.WLAN(network.STA_IF) # create station interface
+    wlan = network.WLAN(network.WLAN.IF_STA) # create station interface
     wlan.active(True)       # activate the interface
     wlan.scan()             # scan for access points
     wlan.isconnected()      # check if the station is connected to an AP
@@ -91,7 +91,7 @@ The :mod:`network` module::
     wlan.config('mac')      # get the interface's MAC address
     wlan.ipconfig('addr4')  # get the interface's IPv4 addresses
 
-    ap = network.WLAN(network.AP_IF) # create access-point interface
+    ap = network.WLAN(network.WLAN.IF_AP) # create access-point interface
     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
@@ -100,7 +100,7 @@ A useful function for connecting to your local WiFi network is::
 
     def do_connect():
         import network
-        wlan = network.WLAN(network.STA_IF)
+        wlan = network.WLAN(network.WLAN.IF_STA)
         wlan.active(True)
         if not wlan.isconnected():
             print('connecting to network...')
@@ -124,7 +124,8 @@ to reconnect forever).
 LAN
 ^^^
 
-To use the wired interfaces one has to specify the pins and mode ::
+To use the wired interfaces via :class:`network.LAN` one has to specify the pins
+and mode ::
 
     import network
 
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index b130ce65db2b7..6f02da95d89d2 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -49,11 +49,11 @@ The :mod:`esp` module::
 Networking
 ----------
 
-The :mod:`network` module::
+The :class:`network.WLAN` class in the :mod:`network` module::
 
     import network
 
-    wlan = network.WLAN(network.STA_IF) # create station interface
+    wlan = network.WLAN(network.WLAN.IF_STA) # create station interface
     wlan.active(True)       # activate the interface
     wlan.scan()             # scan for access points
     wlan.isconnected()      # check if the station is connected to an AP
@@ -61,7 +61,7 @@ The :mod:`network` module::
     wlan.config('mac')      # get the interface's MAC address
     wlan.ipconfig('addr4')  # get the interface's IPv4 addresses
 
-    ap = network.WLAN(network.AP_IF) # create access-point interface
+    ap = network.WLAN(network.WLAN.IF_AP) # create access-point interface
     ap.active(True)         # activate the interface
     ap.config(ssid='ESP-AP') # set the SSID of the access point
 
@@ -69,7 +69,7 @@ A useful function for connecting to your local WiFi network is::
 
     def do_connect():
         import network
-        wlan = network.WLAN(network.STA_IF)
+        wlan = network.WLAN(network.WLAN.IF_STA)
         wlan.active(True)
         if not wlan.isconnected():
             print('connecting to network...')
diff --git a/docs/esp8266/tutorial/network_basics.rst b/docs/esp8266/tutorial/network_basics.rst
index 9d74a6283ac47..e383c00c6ceed 100644
--- a/docs/esp8266/tutorial/network_basics.rst
+++ b/docs/esp8266/tutorial/network_basics.rst
@@ -1,14 +1,15 @@
 Network basics
 ==============
 
-The network module is used to configure the WiFi connection.  There are two WiFi
-interfaces, one for the station (when the ESP8266 connects to a router) and one
-for the access point (for other devices to connect to the ESP8266).  Create
+The :class:`network.WLAN` class in the :mod:`network` module is used to
+configure the WiFi connection.  There are two WiFi interfaces, one for
+the station (when the ESP8266 connects to a router) and one for the
+access point (for other devices to connect to the ESP8266).  Create
 instances of these objects using::
 
     >>> import network
-    >>> sta_if = network.WLAN(network.STA_IF)
-    >>> ap_if = network.WLAN(network.AP_IF)
+    >>> sta_if = network.WLAN(network.WLAN.IF_STA)
+    >>> ap_if = network.WLAN(network.WLAN.IF_AP)
 
 You can check if the interfaces are active by::
 
@@ -57,7 +58,7 @@ connect to your WiFi network::
 
     def do_connect():
         import network
-        sta_if = network.WLAN(network.STA_IF)
+        sta_if = network.WLAN(network.WLAN.IF_STA)
         if not sta_if.isconnected():
             print('connecting to network...')
             sta_if.active(True)
diff --git a/docs/library/espnow.rst b/docs/library/espnow.rst
index f0b592dffc8ab..1bcc9d7623d14 100644
--- a/docs/library/espnow.rst
+++ b/docs/library/espnow.rst
@@ -56,7 +56,7 @@ A simple example would be:
     import espnow
 
     # A WLAN interface must be active to send()/recv()
-    sta = network.WLAN(network.STA_IF)  # Or network.AP_IF
+    sta = network.WLAN(network.WLAN.IF_STA)  # Or network.WLAN.IF_AP
     sta.active(True)
     sta.disconnect()      # For ESP8266
 
@@ -76,7 +76,7 @@ A simple example would be:
     import espnow
 
     # A WLAN interface must be active to send()/recv()
-    sta = network.WLAN(network.STA_IF)
+    sta = network.WLAN(network.WLAN.IF_STA)
     sta.active(True)
     sta.disconnect()   # Because ESP8266 auto-connects to last Access Point
 
@@ -182,14 +182,14 @@ Configuration
 Sending and Receiving Data
 --------------------------
 
-A wifi interface (``network.STA_IF`` or ``network.AP_IF``) must be
+A wifi interface (``network.WLAN.IF_STA`` or ``network.WLAN.IF_AP``) must be
 `active()<network.WLAN.active>` before messages can be sent or received,
 but it is not necessary to connect or configure the WLAN interface.
 For example::
 
     import network
 
-    sta = network.WLAN(network.STA_IF)
+    sta = network.WLAN(network.WLAN.IF_STA)
     sta.active(True)
     sta.disconnect()    # For ESP8266
 
@@ -445,8 +445,8 @@ must first register the sender and use the same encryption keys as the sender
 
         - *ifidx*: (ESP32 only) Index of the wifi interface which will be
           used to send data to this peer. Must be an integer set to
-          ``network.STA_IF`` (=0) or ``network.AP_IF`` (=1).
-          (default=0/``network.STA_IF``). See `ESPNow and Wifi Operation`_
+          ``network.WLAN.IF_STA`` (=0) or ``network.WLAN.IF_AP`` (=1).
+          (default=0/``network.WLAN.IF_STA``). See `ESPNow and Wifi Operation`_
           below for more information.
 
         - *encrypt*: (ESP32 only) If set to ``True`` data exchanged with
@@ -588,7 +588,7 @@ api-reference/network/esp_now.html#api-reference>`_. For example::
         elif err.args[1] == 'ESP_ERR_ESPNOW_NOT_FOUND':
             e.add_peer(peer)
         elif err.args[1] == 'ESP_ERR_ESPNOW_IF':
-            network.WLAN(network.STA_IF).active(True)
+            network.WLAN(network.WLAN.IF_STA).active(True)
         else:
             raise err
 
@@ -645,7 +645,7 @@ A small async server example::
     import asyncio
 
     # A WLAN interface must be active to send()/recv()
-    network.WLAN(network.STA_IF).active(True)
+    network.WLAN(network.WLAN.IF_STA).active(True)
 
     e = aioespnow.AIOESPNow()  # Returns AIOESPNow enhanced with async support
     e.active(True)
@@ -747,8 +747,8 @@ ESPNow and Wifi Operation
 -------------------------
 
 ESPNow messages may be sent and received on any `active()<network.WLAN.active>`
-`WLAN<network.WLAN()>` interface (``network.STA_IF`` or ``network.AP_IF``), even
-if that interface is also connected to a wifi network or configured as an access
+`WLAN<network.WLAN()>` interface (``network.WLAN.IF_STA`` or ``network.WLAN.IF_AP``),
+even if that interface is also connected to a wifi network or configured as an access
 point. When an ESP32 or ESP8266 device connects to a Wifi Access Point (see
 `ESP32 Quickref <../esp32/quickref.html#networking>`__) the following things
 happen which affect ESPNow communications:
@@ -832,8 +832,8 @@ Other issues to take care with when using ESPNow with wifi are:
     import network, time
 
     def wifi_reset():   # Reset wifi to AP_IF off, STA_IF on and disconnected
-      sta = network.WLAN(network.STA_IF); sta.active(False)
-      ap = network.WLAN(network.AP_IF); ap.active(False)
+      sta = network.WLAN(network.WLAN.IF_STA); sta.active(False)
+      ap = network.WLAN(network.WLAN.IF_AP); ap.active(False)
       sta.active(True)
       while not sta.active():
           time.sleep(0.1)
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index c1eb520961fcb..3c401acb420bf 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -8,7 +8,7 @@ This class provides a driver for WiFi network processors.  Example usage::
 
     import network
     # enable station interface and connect to WiFi access point
-    nic = network.WLAN(network.STA_IF)
+    nic = network.WLAN(network.WLAN.IF_STA)
     nic.active(True)
     nic.connect('your-ssid', 'your-key')
     # now use sockets as usual
@@ -18,8 +18,8 @@ Constructors
 .. class:: WLAN(interface_id)
 
 Create a WLAN network interface object. Supported interfaces are
-``network.STA_IF`` (station aka client, connects to upstream WiFi access
-points) and ``network.AP_IF`` (access point, allows other WiFi clients to
+``network.WLAN.IF_STA`` (station aka client, connects to upstream WiFi access
+points) and ``network.WLAN.IF_AP`` (access point, allows other WiFi clients to
 connect). Availability of the methods below depends on interface type.
 For example, only STA interface may `WLAN.connect()` to an access point.
 
@@ -75,7 +75,7 @@ Methods
     Return the current status of the wireless connection.
 
     When called with no argument the return value describes the network link status.
-    The possible statuses are defined as constants:
+    The possible statuses are defined as constants in the :mod:`network` module:
 
         * ``STAT_IDLE`` -- no connection and no activity,
         * ``STAT_CONNECTING`` -- connecting in progress,
diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 4d86f0080b117..b47ec76c98efe 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -477,7 +477,7 @@ An example ``config.py`` might look like:
     """,], # Print out nearby WiFi networks.
         "wl_ipconfig": [
     "exec",
-    "import network; sta_if = network.WLAN(network.STA_IF); print(sta_if.ipconfig('addr4'))",
+    "import network; sta_if = network.WLAN(network.WLAN.IF_STA); print(sta_if.ipconfig('addr4'))",
     """,], # Print ip address of station interface.
         "test": ["mount", ".", "exec", "import test"], # Mount current directory and run test.py.
         "demo": ["run", "path/to/demo.py"], # Execute demo.py on the device.

From 285e1d0b80d821ba910249e8804697ec1739bac7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Nov 2024 11:18:37 +1100
Subject: [PATCH 1610/3129] esp32: Use the recommended network.WLAN.IF_[AP|STA]
 constants.

Removes the deprecated network.[AP|STA]_IF form from the esp32 port

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/README.md                                        | 2 +-
 ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py | 2 +-
 ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py      | 2 +-
 ports/esp32/help.c                                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index a04ad0c6eea1b..4eb791389380c 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -195,7 +195,7 @@ quickly call `wlan_connect()` and it just works):
 ```python
 def wlan_connect(ssid='MYSSID', password='MYPASS'):
     import network
-    wlan = network.WLAN(network.STA_IF)
+    wlan = network.WLAN(network.WLAN.IF_STA)
     if not wlan.active() or not wlan.isconnected():
         wlan.active(True)
         print('connecting to:', ssid)
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
index bfe02c35765b8..98ea0adcbf86c 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
@@ -30,7 +30,7 @@ def display_wifi(self):
         self.text("Scan...", 0, 0, 1)
         self.show()
 
-        sta_if = network.WLAN(network.STA_IF)
+        sta_if = network.WLAN(network.WLAN.IF_STA)
         sta_if.active(True)
         _wifi = sta_if.scan()
 
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py b/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py
index 37dc5a340fe46..58120d44adf7e 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py
+++ b/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py
@@ -37,7 +37,7 @@ def display_wifi(self):
         self.text("Scan...", 0, 0, 1)
         self.show()
 
-        sta_if = network.WLAN(network.STA_IF)
+        sta_if = network.WLAN(network.WLAN.IF_STA)
         sta_if.active(True)
         _wifi = sta_if.scan()
 
diff --git a/ports/esp32/help.c b/ports/esp32/help.c
index 2351d7dc73943..62639a0b408ce 100644
--- a/ports/esp32/help.c
+++ b/ports/esp32/help.c
@@ -48,7 +48,7 @@ const char esp32_help_text[] =
     "Basic WiFi configuration:\n"
     "\n"
     "import network\n"
-    "sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
+    "sta_if = network.WLAN(network.WLAN.IF_STA); 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"

From f5b81bee6141f925ed32d2d7968b0c90d7b41b61 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Nov 2024 11:19:00 +1100
Subject: [PATCH 1611/3129] esp8266: Use the recommended
 network.WLAN.IF_[AP|STA] constants.

Removes the deprecated network.[AP|STA]_IF form from the esp8266 port

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp8266/help.c               | 4 ++--
 ports/esp8266/modules/inisetup.py  | 2 +-
 ports/esp8266/modules/port_diag.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/esp8266/help.c b/ports/esp8266/help.c
index a9cb27bad51c8..694cd90b951d2 100644
--- a/ports/esp8266/help.c
+++ b/ports/esp8266/help.c
@@ -36,12 +36,12 @@ const char esp_help_text[] =
     "Basic WiFi configuration:\n"
     "\n"
     "import network\n"
-    "sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
+    "sta_if = network.WLAN(network.WLAN.IF_STA); sta_if.active(True)\n"
     "sta_if.scan()                             # Scan for available access points\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 = network.WLAN(network.WLAN.IF_AP)\n"
     "ap_if.config(ssid=\"<AP_NAME>\", security=network.AUTH_WPA_WPA2_PSK, key=\"<key>\")\n"
     "\n"
     "Control commands:\n"
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index 20bb28e80b064..f97c238520026 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -6,7 +6,7 @@
 def wifi():
     import binascii
 
-    ap_if = network.WLAN(network.AP_IF)
+    ap_if = network.WLAN(network.WLAN.IF_AP)
     ssid = b"MicroPython-%s" % binascii.hexlify(ap_if.config("mac")[-3:])
     ap_if.config(ssid=ssid, security=network.AUTH_WPA_WPA2_PSK, key=b"micropythoN")
 
diff --git a/ports/esp8266/modules/port_diag.py b/ports/esp8266/modules/port_diag.py
index 4eea6a6d90d36..bbd6225a616f8 100644
--- a/ports/esp8266/modules/port_diag.py
+++ b/ports/esp8266/modules/port_diag.py
@@ -23,8 +23,8 @@ def main():
     print(esp.check_fw())
 
     print("\nNetworking:")
-    print("STA ifconfig:", network.WLAN(network.STA_IF).ifconfig())
-    print("AP ifconfig:", network.WLAN(network.AP_IF).ifconfig())
+    print("STA ifconfig:", network.WLAN(network.WLAN.IF_STA).ifconfig())
+    print("AP ifconfig:", network.WLAN(network.WLAN.IF_AP).ifconfig())
     print("Free WiFi driver buffers of type:")
     for i, comm in enumerate(
         ("1,2 TX", "4 Mngmt TX(len: 0x41-0x100)", "5 Mngmt TX (len: 0-0x40)", "7", "8 RX")

From 5dfbd4371480c175e6f54e57e4e5eb5d579cbd00 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Nov 2024 11:19:19 +1100
Subject: [PATCH 1612/3129] tests: Use the recommended network.WLAN.IF_[AP|STA]
 constants.

Removes the deprecated network.[AP|STA]_IF form from unit tests.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_espnow/10_simple_data.py     | 2 +-
 tests/multi_espnow/20_send_echo.py       | 2 +-
 tests/multi_espnow/30_lmk_echo.py        | 2 +-
 tests/multi_espnow/40_recv_test.py       | 2 +-
 tests/multi_espnow/50_esp32_rssi_test.py | 2 +-
 tests/multi_espnow/60_irq_test.py        | 2 +-
 tests/multi_espnow/80_asyncio_client.py  | 2 +-
 tests/multi_espnow/81_asyncio_server.py  | 2 +-
 tests/multi_espnow/90_memory_test.py     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/multi_espnow/10_simple_data.py b/tests/multi_espnow/10_simple_data.py
index 1d218fe98130a..00d69f30d9158 100644
--- a/tests/multi_espnow/10_simple_data.py
+++ b/tests/multi_espnow/10_simple_data.py
@@ -14,7 +14,7 @@
 
 
 def init(sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e = espnow.ESPNow()
     e.active(True)
     e.set_pmk(default_pmk)
diff --git a/tests/multi_espnow/20_send_echo.py b/tests/multi_espnow/20_send_echo.py
index 4a1d1624d8430..4c325bf68c513 100644
--- a/tests/multi_espnow/20_send_echo.py
+++ b/tests/multi_espnow/20_send_echo.py
@@ -61,7 +61,7 @@ def echo_client(e, peer, msglens):
 
 
 def init(sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e = espnow.ESPNow()
     e.active(True)
     e.set_pmk(default_pmk)
diff --git a/tests/multi_espnow/30_lmk_echo.py b/tests/multi_espnow/30_lmk_echo.py
index ac8908049250d..2a6c77c6331db 100644
--- a/tests/multi_espnow/30_lmk_echo.py
+++ b/tests/multi_espnow/30_lmk_echo.py
@@ -92,7 +92,7 @@ def echo_client(e, peer, msglens):
 
 # Initialise the wifi and espnow hardware and software
 def init(sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e = espnow.ESPNow()
     e.active(True)
     e.set_pmk(default_pmk)
diff --git a/tests/multi_espnow/40_recv_test.py b/tests/multi_espnow/40_recv_test.py
index 46f4f78df4894..554db16ac1713 100644
--- a/tests/multi_espnow/40_recv_test.py
+++ b/tests/multi_espnow/40_recv_test.py
@@ -48,7 +48,7 @@ def client_send(e, peer, msg, sync):
 
 
 def init(sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e = espnow.ESPNow()
     e.active(True)
     e.set_pmk(default_pmk)
diff --git a/tests/multi_espnow/50_esp32_rssi_test.py b/tests/multi_espnow/50_esp32_rssi_test.py
index 6a47b540d35ec..8aded1c099400 100644
--- a/tests/multi_espnow/50_esp32_rssi_test.py
+++ b/tests/multi_espnow/50_esp32_rssi_test.py
@@ -49,7 +49,7 @@ def client_send(e, peer, msg, sync):
 
 
 def init(sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e = espnow.ESPNow()
     e.active(True)
     e.set_pmk(default_pmk)
diff --git a/tests/multi_espnow/60_irq_test.py b/tests/multi_espnow/60_irq_test.py
index 37fc57ce4ae73..db8b8168690e7 100644
--- a/tests/multi_espnow/60_irq_test.py
+++ b/tests/multi_espnow/60_irq_test.py
@@ -49,7 +49,7 @@ def client_send(e, peer, msg, sync):
 
 
 def init(sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e = espnow.ESPNow()
     e.active(True)
     e.set_pmk(default_pmk)
diff --git a/tests/multi_espnow/80_asyncio_client.py b/tests/multi_espnow/80_asyncio_client.py
index 4d58a451c1c01..8c34b98a3c4a6 100644
--- a/tests/multi_espnow/80_asyncio_client.py
+++ b/tests/multi_espnow/80_asyncio_client.py
@@ -50,7 +50,7 @@ def client_send(e, peer, msg, sync):
 
 
 def init(e, sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e.active(True)
     e.set_pmk(default_pmk)
     wlans[0].active(sta_active)
diff --git a/tests/multi_espnow/81_asyncio_server.py b/tests/multi_espnow/81_asyncio_server.py
index df1dbb2ac8aa1..e6002582c085d 100644
--- a/tests/multi_espnow/81_asyncio_server.py
+++ b/tests/multi_espnow/81_asyncio_server.py
@@ -30,7 +30,7 @@ def client_send(e, peer, msg, sync):
 
 
 def init(e, sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e.active(True)
     e.set_pmk(default_pmk)
     wlans[0].active(sta_active)
diff --git a/tests/multi_espnow/90_memory_test.py b/tests/multi_espnow/90_memory_test.py
index 5e80eb0fdf669..b59ff61b594a8 100644
--- a/tests/multi_espnow/90_memory_test.py
+++ b/tests/multi_espnow/90_memory_test.py
@@ -65,7 +65,7 @@ def echo_client(e, peer, msglens):
 
 
 def init(sta_active=True, ap_active=False):
-    wlans = [network.WLAN(i) for i in [network.STA_IF, network.AP_IF]]
+    wlans = [network.WLAN(i) for i in [network.WLAN.IF_STA, network.WLAN.IF_AP]]
     e = espnow.ESPNow()
     e.active(True)
     e.set_pmk(default_pmk)

From 3844733d604d83fbfec5592cee20aab065ebff48 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 2 Nov 2024 13:43:35 -0500
Subject: [PATCH 1613/3129] tests/cpydiff: Fix test case for
 modules_json_nonserializable.

The test case was producing the following error:

    Traceback (most recent call last):
      File "<stdin>", line 12, in <module>
    UnicodeError:

which did not demonstrate the intended difference (this particular
non-json-serializable object DID throw an exception! just not TypeError).

The updated test uses a byte string with all ASCII bytes inside, which
better illustrates the diference.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cpydiff/modules_json_nonserializable.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/cpydiff/modules_json_nonserializable.py b/tests/cpydiff/modules_json_nonserializable.py
index ffe523786f501..d6a5660cadfdb 100644
--- a/tests/cpydiff/modules_json_nonserializable.py
+++ b/tests/cpydiff/modules_json_nonserializable.py
@@ -6,10 +6,7 @@
 """
 import json
 
-a = bytes(x for x in range(256))
 try:
-    z = json.dumps(a)
-    x = json.loads(z)
-    print("Should not get here")
+    print(json.dumps(b"shouldn't be able to serialise bytes"))
 except TypeError:
     print("TypeError")

From eab2869990b83dc6baa451f8c4983a312539a0be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Nov 2024 11:18:42 +1100
Subject: [PATCH 1614/3129] extmod/modlwip: Don't allow writing to a TCP socket
 that is connecting.

This follows the behaviour of unix MicroPython (POSIX sockets) and the
esp32 port.

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

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 0d38bf41b2051..ce70627c31c60 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -701,7 +701,12 @@ static mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
 
     MICROPY_PY_LWIP_ENTER
 
-    u16_t available = tcp_sndbuf(socket->pcb.tcp);
+    // If the socket is still connecting then don't let data be written to it.
+    // Otherwise, get the number of available bytes in the output buffer.
+    u16_t available = 0;
+    if (socket->state != STATE_CONNECTING) {
+        available = tcp_sndbuf(socket->pcb.tcp);
+    }
 
     if (available == 0) {
         // Non-blocking socket
@@ -718,7 +723,8 @@ static mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
         // If peer fully closed socket, we would have socket->state set to ERR_RST (connection
         // reset) by error callback.
         // Avoid sending too small packets, so wait until at least 16 bytes available
-        while (socket->state >= STATE_CONNECTED && (available = tcp_sndbuf(socket->pcb.tcp)) < 16) {
+        while (socket->state == STATE_CONNECTING
+               || (socket->state >= STATE_CONNECTED && (available = tcp_sndbuf(socket->pcb.tcp)) < 16)) {
             MICROPY_PY_LWIP_EXIT
             if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
                 *_errno = MP_ETIMEDOUT;
@@ -1548,7 +1554,7 @@ static mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
                 // raw socket is writable
                 ret |= MP_STREAM_POLL_WR;
             #endif
-            } else if (socket->pcb.tcp != NULL && tcp_sndbuf(socket->pcb.tcp) > 0) {
+            } else if (socket->state != STATE_CONNECTING && socket->pcb.tcp != NULL && tcp_sndbuf(socket->pcb.tcp) > 0) {
                 // TCP socket is writable
                 // Note: pcb.tcp==NULL if state<0, and in this case we can't call tcp_sndbuf
                 ret |= MP_STREAM_POLL_WR;

From 69023622ee837df051ef7e606c2f0511015d01f7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Nov 2024 11:19:45 +1100
Subject: [PATCH 1615/3129] tests/net_hosted: Improve and simplify
 non-block-xfer test.

CPython changed its non-blocking socket behaviour recently and this test
would not run under CPython anymore.  So the following steps were taken to
get the test working again and then simplify it:

- Run the test against CPython 3.10.10 and capture the output into the .exp
  file for the test.

- Run this test on unix port of MicroPython and verify that the output
  matches the CPython 3.10.10 output in the new .exp file (it did).  From
  now on take unix MicroPython as the source of truth for this test when
  modifying it.

- Remove all code that was there for CPython compatibility.

- Make it print out more useful information during the test run, including
  names of the OSError errno values.

- Add polling of the socket before the send/write/recv/read to verify that
  the poll gives the correct result in non-blocking mode.

Tested on unix MicroPython, ESP32_GENERIC, PYBD_SF2 and RPI_PICO_W boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_hosted/connect_nonblock_xfer.py     | 130 +++++++-----------
 tests/net_hosted/connect_nonblock_xfer.py.exp |  44 ++++++
 2 files changed, 94 insertions(+), 80 deletions(-)
 create mode 100644 tests/net_hosted/connect_nonblock_xfer.py.exp

diff --git a/tests/net_hosted/connect_nonblock_xfer.py b/tests/net_hosted/connect_nonblock_xfer.py
index dc4693cea6a8c..23620908afbc6 100644
--- a/tests/net_hosted/connect_nonblock_xfer.py
+++ b/tests/net_hosted/connect_nonblock_xfer.py
@@ -1,15 +1,24 @@
 # 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, time, socket, errno, ssl
+import errno
+import select
+import socket
+import ssl
 
-isMP = sys.implementation.name == "micropython"
+# only mbedTLS supports non-blocking mode
+if not hasattr(ssl, "MBEDTLS_VERSION"):
+    print("SKIP")
+    raise SystemExit
 
 
-def dp(e):
-    # uncomment next line for development and testing, to print the actual exceptions
-    # print(repr(e))
-    pass
+# get the name of an errno error code
+def errno_name(er):
+    if er == errno.EAGAIN:
+        return "EAGAIN"
+    if er == errno.EINPROGRESS:
+        return "EINPROGRESS"
+    return er
 
 
 # do_connect establishes the socket and wraps it if tls is True.
@@ -22,112 +31,75 @@ def do_connect(peer_addr, tls, handshake):
         # print("Connecting to", peer_addr)
         s.connect(peer_addr)
     except OSError as er:
-        print("connect:", er.errno == errno.EINPROGRESS)
-        if er.errno != errno.EINPROGRESS:
-            print("  got", er.errno)
+        print("connect:", errno_name(er.errno))
     # wrap with ssl/tls if desired
     if tls:
         ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        if hasattr(ssl_context, "check_hostname"):
-            ssl_context.check_hostname = False
-
         try:
             s = ssl_context.wrap_socket(s, do_handshake_on_connect=handshake)
-            print("wrap: True")
+            print("wrap ok: 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)
+            print("wrap er:", e)
     return s
 
 
+# poll a socket and print out the result
+def poll(s):
+    poller = select.poll()
+    poller.register(s)
+    print("poll:   ", poller.poll(0))
+
+
 # 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
+def test(peer_addr, tls, handshake):
+    # MicroPython plain and TLS sockets have read/write
+    hasRW = True
 
-    # 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)
+    # MicroPython plain sockets have send/recv
+    # MicroPython TLS sockets don't have send/recv
+    hasSR = not tls
 
     # connect + send
+    # non-blocking send should raise EAGAIN
     if hasSR:
         s = do_connect(peer_addr, tls, handshake)
-        # send -> 4 or EAGAIN
+        poll(s)
         try:
             ret = s.send(b"1234")
-            print("send:", handshake and ret == 4)
+            print("send ok:", ret)  # shouldn't get here
         except OSError as er:
-            #
-            dp(er)
-            print("send:", er.errno in (errno.EAGAIN, errno.EINPROGRESS))
+            print("send er:", errno_name(er.errno))
         s.close()
-    else:  # fake it...
-        print("connect:", True)
-        if tls:
-            print("wrap:", True)
-        print("send:", True)
 
     # connect + write
+    # non-blocking write should return None
     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.")
+        poll(s)
+        ret = s.write(b"1234")
+        print("write:  ", ret)
         s.close()
-    else:  # fake it...
-        print("connect:", True)
-        if tls:
-            print("wrap:", True)
-        print("write:", True)
 
+    # connect + recv
+    # non-blocking recv should raise EAGAIN
     if hasSR:
-        # connect + recv
         s = do_connect(peer_addr, tls, handshake)
-        # recv -> EAGAIN
+        poll(s)
         try:
-            print("recv:", s.recv(10))
+            ret = s.recv(10)
+            print("recv ok:", ret)  # shouldn't get here
         except OSError as er:
-            dp(er)
-            print("recv:", er.errno == errno.EAGAIN)
+            print("recv er:", errno_name(er.errno))
         s.close()
-    else:  # fake it...
-        print("connect:", True)
-        if tls:
-            print("wrap:", True)
-        print("recv:", True)
 
     # connect + read
+    # non-blocking read should return None
     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.")
+        poll(s)
+        ret = s.read(10)
+        print("read:   ", ret)
         s.close()
-    else:  # fake it...
-        print("connect:", True)
-        if tls:
-            print("wrap:", True)
-        print("read:", True)
 
 
 if __name__ == "__main__":
@@ -136,10 +108,8 @@ def test(peer_addr, tls=False, handshake=False):
     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)
+    test(socket.getaddrinfo("micropython.org", 80)[0][-1], False, False)
     print("--- SSL sockets ---")
     test(socket.getaddrinfo("micropython.org", 443)[0][-1], True, True)
diff --git a/tests/net_hosted/connect_nonblock_xfer.py.exp b/tests/net_hosted/connect_nonblock_xfer.py.exp
new file mode 100644
index 0000000000000..c5498a03873a0
--- /dev/null
+++ b/tests/net_hosted/connect_nonblock_xfer.py.exp
@@ -0,0 +1,44 @@
+--- Plain sockets to nowhere ---
+connect: EINPROGRESS
+poll:    []
+send er: EAGAIN
+connect: EINPROGRESS
+poll:    []
+write:   None
+connect: EINPROGRESS
+poll:    []
+recv er: EAGAIN
+connect: EINPROGRESS
+poll:    []
+read:    None
+--- SSL sockets to nowhere ---
+connect: EINPROGRESS
+wrap ok: True
+poll:    []
+write:   None
+connect: EINPROGRESS
+wrap ok: True
+poll:    []
+read:    None
+--- Plain sockets ---
+connect: EINPROGRESS
+poll:    []
+send er: EAGAIN
+connect: EINPROGRESS
+poll:    []
+write:   None
+connect: EINPROGRESS
+poll:    []
+recv er: EAGAIN
+connect: EINPROGRESS
+poll:    []
+read:    None
+--- SSL sockets ---
+connect: EINPROGRESS
+wrap ok: True
+poll:    [(<SSLSocket>, 4)]
+write:   4
+connect: EINPROGRESS
+wrap ok: True
+poll:    [(<SSLSocket>, 4)]
+read:    None

From 76e6c6345cbaa694ac8f33cfc8b8daaa11fd58ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Nov 2024 12:43:04 +1100
Subject: [PATCH 1616/3129] tools/mpremote: Make sure stdout and stderr output
 appear in order.

mpremote error messages now go to stderr, so make sure stdout is flushed
before printing them.

Also update the test runner to capture error messages.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py            | 3 +++
 tools/mpremote/tests/run-mpremote-tests.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 8c0a6cd224c32..e6e397020fe85 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -547,7 +547,10 @@ def main():
 
         return 0
     except CommandError as e:
+        # Make sure existing stdout appears before the error message on stderr.
+        sys.stdout.flush()
         print(f"{_PROG}: {e}", file=sys.stderr)
+        sys.stderr.flush()
         return 1
     finally:
         do_disconnect(state)
diff --git a/tools/mpremote/tests/run-mpremote-tests.sh b/tools/mpremote/tests/run-mpremote-tests.sh
index 11d82c9bb3801..b25b5fd7d2966 100755
--- a/tools/mpremote/tests/run-mpremote-tests.sh
+++ b/tools/mpremote/tests/run-mpremote-tests.sh
@@ -16,7 +16,7 @@ for t in $TESTS; do
     TMP=$(mktemp -d)
     echo -n "${t}: "
     # Strip CR and replace the random temp dir with a token.
-    if env MPREMOTE=${MPREMOTE} TMP="${TMP}" "${t}" | tr -d '\r' | sed "s,${TMP},"'${TMP},g' > "${t}.out"; then
+    if env MPREMOTE=${MPREMOTE} TMP="${TMP}" "${t}" 2>&1 | tr -d '\r' | sed "s,${TMP},"'${TMP},g' > "${t}.out"; then
         if diff "${t}.out" "${t}.exp" > /dev/null; then
             echo "OK"
         else

From 3b6024a699491720ac0ba48b8534d6e540e828a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Nov 2024 12:44:50 +1100
Subject: [PATCH 1617/3129] tools/mpremote: Add test for forced copy.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/tests/test_filesystem.sh     | 5 +++++
 tools/mpremote/tests/test_filesystem.sh.exp | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/tools/mpremote/tests/test_filesystem.sh b/tools/mpremote/tests/test_filesystem.sh
index b6d5a7febcb84..727efea90eb67 100755
--- a/tools/mpremote/tests/test_filesystem.sh
+++ b/tools/mpremote/tests/test_filesystem.sh
@@ -66,6 +66,11 @@ $MPREMOTE resume cp "${TMP}/a.py" :aaa
 $MPREMOTE resume cp "${TMP}/a.py" :bbb/b.py
 $MPREMOTE resume cat :aaa/a.py bbb/b.py
 
+# Test cp -f (force copy).
+echo -----
+$MPREMOTE resume cp -f "${TMP}/a.py" :aaa
+$MPREMOTE resume cat :aaa/a.py
+
 echo -----
 $MPREMOTE resume rm :b.py c.py
 $MPREMOTE resume ls
diff --git a/tools/mpremote/tests/test_filesystem.sh.exp b/tools/mpremote/tests/test_filesystem.sh.exp
index 7220dc41e472c..b252bc7eb0d03 100644
--- a/tools/mpremote/tests/test_filesystem.sh.exp
+++ b/tools/mpremote/tests/test_filesystem.sh.exp
@@ -38,6 +38,10 @@ print("World")
 print("Hello")
 print("World")
 -----
+cp ${TMP}/a.py :aaa
+print("Hello")
+print("World")
+-----
 rm :b.py
 rm :c.py
 ls :

From 4fd5b72a8b71c6b3a074bcc3b9f6385b049c3dcb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Nov 2024 12:45:06 +1100
Subject: [PATCH 1618/3129] tools/mpremote: Support trailing slash on dest for
 non-recursive copy.

This fixes a regression in db59e55fe7a0b67d3af868990468e7b8056afe42: prior
to that commit `mpremote` supported trailing slashes on the destination of
a normal (non-recursive) copy.

Add back support for that, with the semantics that a trailing slash
requires the destination to be an existing directory.

Also add a test for this.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/commands.py         | 11 +++++++++--
 tools/mpremote/tests/test_filesystem.sh     |  5 +++++
 tools/mpremote/tests/test_filesystem.sh.exp |  6 ++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 2b1acea438084..f86befd080349 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -129,8 +129,15 @@ def _remote_path_basename(a):
 
 def do_filesystem_cp(state, src, dest, multiple, check_hash=False):
     if dest.startswith(":"):
-        dest_exists = state.transport.fs_exists(dest[1:])
-        dest_isdir = dest_exists and state.transport.fs_isdir(dest[1:])
+        dest_no_slash = dest.rstrip("/" + os.path.sep + (os.path.altsep or ""))
+        dest_exists = state.transport.fs_exists(dest_no_slash[1:])
+        dest_isdir = dest_exists and state.transport.fs_isdir(dest_no_slash[1:])
+
+        # A trailing / on dest forces it to be a directory.
+        if dest != dest_no_slash:
+            if not dest_isdir:
+                raise CommandError("cp: destination is not a directory")
+            dest = dest_no_slash
     else:
         dest_exists = os.path.exists(dest)
         dest_isdir = dest_exists and os.path.isdir(dest)
diff --git a/tools/mpremote/tests/test_filesystem.sh b/tools/mpremote/tests/test_filesystem.sh
index 727efea90eb67..afeb7c91da8d6 100755
--- a/tools/mpremote/tests/test_filesystem.sh
+++ b/tools/mpremote/tests/test_filesystem.sh
@@ -71,6 +71,11 @@ echo -----
 $MPREMOTE resume cp -f "${TMP}/a.py" :aaa
 $MPREMOTE resume cat :aaa/a.py
 
+# Test cp where the destination has a trailing /.
+echo -----
+$MPREMOTE resume cp "${TMP}/a.py" :aaa/
+$MPREMOTE resume cp "${TMP}/a.py" :aaa/a.py/ || echo "expect error"
+
 echo -----
 $MPREMOTE resume rm :b.py c.py
 $MPREMOTE resume ls
diff --git a/tools/mpremote/tests/test_filesystem.sh.exp b/tools/mpremote/tests/test_filesystem.sh.exp
index b252bc7eb0d03..82fe7d6bf78c5 100644
--- a/tools/mpremote/tests/test_filesystem.sh.exp
+++ b/tools/mpremote/tests/test_filesystem.sh.exp
@@ -42,6 +42,12 @@ cp ${TMP}/a.py :aaa
 print("Hello")
 print("World")
 -----
+cp ${TMP}/a.py :aaa/
+Up to date: aaa/a.py
+cp ${TMP}/a.py :aaa/a.py/
+mpremote: cp: destination is not a directory
+expect error
+-----
 rm :b.py
 rm :c.py
 ls :

From 161e2bd37df70556ef2a276c53af2c0cdc79af5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 9 Aug 2023 10:31:29 +0200
Subject: [PATCH 1619/3129] extmod/network_ppp: Add stream config parameter.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the stream that the PPP object wraps, which is normally only set
once via the constructor, accessible and configurable via the
`ppp.config()` method.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 docs/library/network.PPP.rst |  7 +++++--
 extmod/network_ppp_lwip.c    | 11 ++++++++++-
 ports/esp32/network_ppp.c    |  9 +++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/docs/library/network.PPP.rst b/docs/library/network.PPP.rst
index 85f580ce540ed..17a8d1c1cd89d 100644
--- a/docs/library/network.PPP.rst
+++ b/docs/library/network.PPP.rst
@@ -70,8 +70,11 @@ Methods
 
 .. method:: PPP.config(config_parameters)
 
-   Sets or gets parameters of the PPP interface. There are currently no parameter that
-   can be set or retrieved.
+   Sets or gets parameters of the PPP interface. The only parameter that can be
+   retrieved and set is the underlying stream, using::
+
+      stream = PPP.config("stream")
+      PPP.config(stream=stream)
 
 .. method:: PPP.ipconfig('param')
             PPP.ipconfig(param=value, ...)
diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
index 2b77662a24f26..72d02602c0cc9 100644
--- a/extmod/network_ppp_lwip.c
+++ b/extmod/network_ppp_lwip.c
@@ -153,12 +153,17 @@ static mp_obj_t network_ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t
     if (n_args != 1 && kwargs->used != 0) {
         mp_raise_TypeError(MP_ERROR_TEXT("either pos or kw args are allowed"));
     }
-    // network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (kwargs->used != 0) {
         for (size_t i = 0; i < kwargs->alloc; i++) {
             if (mp_map_slot_is_filled(kwargs, i)) {
                 switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    case MP_QSTR_stream: {
+                        mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+                        self->stream = kwargs->table[i].value;
+                        break;
+                    }
                     default:
                         break;
                 }
@@ -174,6 +179,10 @@ static mp_obj_t network_ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t
     mp_obj_t val = mp_const_none;
 
     switch (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_stream: {
+            val = self->stream;
+            break;
+        }
         default:
             mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
     }
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index f2813f430d482..4f49efaf060a6 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -323,6 +323,11 @@ static mp_obj_t ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
         for (size_t i = 0; i < kwargs->alloc; i++) {
             if (mp_map_slot_is_filled(kwargs, i)) {
                 switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    case MP_QSTR_stream: {
+                        mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+                        self->stream = kwargs->table[i].value;
+                        break;
+                    }
                     default:
                         break;
                 }
@@ -338,6 +343,10 @@ static mp_obj_t ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
     mp_obj_t val = mp_const_none;
 
     switch (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_stream: {
+            val = self->stream;
+            break;
+        }
         case MP_QSTR_ifname: {
             if (self->pcb != NULL) {
                 struct netif *pppif = ppp_netif(self->pcb);

From 77406b4240b0489963782a7f18920ba3c5d11263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 28 Feb 2024 12:35:37 +0100
Subject: [PATCH 1620/3129] extmod/network_ppp: Allow stream=None to suspend
 PPP.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows the stream to be set to `None`, which essentially stops all PPP
communication without disconnecting the session.

This allows replacing the stream on-the-fly to suspend it, for example to
send AT commands to a modem without completely disconnecting and
re-establishing the PPP connection:

    uart = ppp.config('stream')
    ppp.config(stream=None)
    uart.write(b'+++')
    # do some AT commands
    uart.write(b'ATO\r\n')
    ppp.config(stream=uart)

Any attempted communication by PPP while the stream is not connected will
register as simple packet loss to the LwIP stack because we return 0 for
any write calls, and protocols like TCP will then automatically handle
retrying.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/network_ppp_lwip.c | 68 ++++++++++++++++++++++++++++-----------
 ports/esp32/network_ppp.c | 29 +++++++++++++----
 2 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
index 72d02602c0cc9..8eb90ea4a6529 100644
--- a/extmod/network_ppp_lwip.c
+++ b/extmod/network_ppp_lwip.c
@@ -60,6 +60,18 @@ const mp_obj_type_t mp_network_ppp_lwip_type;
 
 static mp_obj_t network_ppp___del__(mp_obj_t self_in);
 
+static void network_ppp_stream_uart_irq_disable(network_ppp_obj_t *self) {
+    if (self->stream == mp_const_none) {
+        return;
+    }
+
+    // Disable UART IRQ.
+    mp_obj_t dest[3];
+    mp_load_method(self->stream, MP_QSTR_irq, dest);
+    dest[2] = mp_const_none;
+    mp_call_method_n_kw(1, 0, dest);
+}
+
 static void network_ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
     network_ppp_obj_t *self = ctx;
     switch (err_code) {
@@ -68,12 +80,9 @@ static void network_ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
             break;
         case PPPERR_USER:
             if (self->state >= STATE_ERROR) {
-                // Disable UART IRQ.
-                mp_obj_t dest[3];
-                mp_load_method(self->stream, MP_QSTR_irq, dest);
-                dest[2] = mp_const_none;
-                mp_call_method_n_kw(1, 0, dest);
-                // Indicate that the IRQ is disabled.
+                network_ppp_stream_uart_irq_disable(self);
+                // Indicate that we are no longer connected and thus
+                // only need to free the PPP PCB, not close it.
                 self->state = STATE_ACTIVE;
             }
             // Clean up the PPP PCB.
@@ -91,7 +100,9 @@ static mp_obj_t network_ppp_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     mp_obj_t stream = all_args[0];
 
-    mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+    if (stream != mp_const_none) {
+        mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+    }
 
     network_ppp_obj_t *self = mp_obj_malloc_with_finaliser(network_ppp_obj_t, type);
     self->state = STATE_INACTIVE;
@@ -105,7 +116,7 @@ static mp_obj_t network_ppp___del__(mp_obj_t self_in) {
     network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->state >= STATE_ACTIVE) {
         if (self->state >= STATE_ERROR) {
-            // Still connected over the UART stream.
+            // Still connected over the stream.
             // Force the connection to close, with nocarrier=1.
             self->state = STATE_INACTIVE;
             ppp_close(self->pcb, 1);
@@ -127,10 +138,11 @@ static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
     }
 
     mp_int_t total_len = 0;
-    for (;;) {
+    mp_obj_t stream = self->stream;
+    while (stream != mp_const_none) {
         uint8_t buf[256];
         int err;
-        mp_uint_t len = mp_stream_rw(self->stream, buf, sizeof(buf), &err, 0);
+        mp_uint_t len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);
         if (len == 0) {
             break;
         }
@@ -149,6 +161,19 @@ static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ppp_poll_obj, 1, 2, network_ppp_poll);
 
+static void network_ppp_stream_uart_irq_enable(network_ppp_obj_t *self) {
+    if (self->stream == mp_const_none) {
+        return;
+    }
+
+    // Enable UART IRQ to call PPP.poll() when incoming data is ready.
+    mp_obj_t dest[4];
+    mp_load_method(self->stream, MP_QSTR_irq, dest);
+    dest[2] = mp_obj_new_bound_meth(MP_OBJ_FROM_PTR(&network_ppp_poll_obj), MP_OBJ_FROM_PTR(self));
+    dest[3] = mp_load_attr(self->stream, MP_QSTR_IRQ_RXIDLE);
+    mp_call_method_n_kw(2, 0, dest);
+}
+
 static mp_obj_t network_ppp_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"));
@@ -160,8 +185,16 @@ static mp_obj_t network_ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t
             if (mp_map_slot_is_filled(kwargs, i)) {
                 switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
                     case MP_QSTR_stream: {
-                        mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+                        if (kwargs->table[i].value != mp_const_none) {
+                            mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+                        }
+                        if (self->state >= STATE_ACTIVE) {
+                            network_ppp_stream_uart_irq_disable(self);
+                        }
                         self->stream = kwargs->table[i].value;
+                        if (self->state >= STATE_ACTIVE) {
+                            network_ppp_stream_uart_irq_enable(self);
+                        }
                         break;
                     }
                     default:
@@ -210,10 +243,14 @@ static u32_t network_ppp_output_callback(ppp_pcb *pcb, const void *data, u32_t l
     }
     mp_printf(&mp_plat_print, ")\n");
     #endif
+    mp_obj_t stream = self->stream;
+    if (stream == mp_const_none) {
+        return 0;
+    }
     int err;
     // The return value from this output callback is the number of bytes written out.
     // If it's less than the requested number of bytes then lwIP will propagate out an error.
-    return mp_stream_rw(self->stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);
+    return mp_stream_rw(stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);
 }
 
 static mp_obj_t network_ppp_connect(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
@@ -236,12 +273,7 @@ static mp_obj_t network_ppp_connect(size_t n_args, const mp_obj_t *args, mp_map_
         }
         self->state = STATE_ACTIVE;
 
-        // Enable UART IRQ to call PPP.poll() when incoming data is ready.
-        mp_obj_t dest[4];
-        mp_load_method(self->stream, MP_QSTR_irq, dest);
-        dest[2] = mp_obj_new_bound_meth(MP_OBJ_FROM_PTR(&network_ppp_poll_obj), MP_OBJ_FROM_PTR(self));
-        dest[3] = mp_load_attr(self->stream, MP_QSTR_IRQ_RXIDLE);
-        mp_call_method_n_kw(2, 0, dest);
+        network_ppp_stream_uart_irq_enable(self);
     }
 
     if (self->state == STATE_CONNECTING || self->state == STATE_CONNECTED) {
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 4f49efaf060a6..5c41cf948c1ed 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -85,7 +85,9 @@ static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
 }
 
 static mp_obj_t ppp_make_new(mp_obj_t stream) {
-    mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+    if (stream != mp_const_none) {
+        mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+    }
 
     ppp_if_obj_t *self = mp_obj_malloc_with_finaliser(ppp_if_obj_t, &ppp_if_type);
     self->stream = stream;
@@ -100,8 +102,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(esp_network_ppp_make_new_obj, ppp_make_new);
 
 static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx) {
     ppp_if_obj_t *self = ctx;
+
+    mp_obj_t stream = self->stream;
+    if (stream == mp_const_none) {
+        return 0;
+    }
+
     int err;
-    return mp_stream_rw(self->stream, data, len, &err, MP_STREAM_RW_WRITE);
+    return mp_stream_rw(stream, data, len, &err, MP_STREAM_RW_WRITE);
 }
 
 static void pppos_client_task(void *self_in) {
@@ -110,10 +118,15 @@ static void pppos_client_task(void *self_in) {
 
     int len = 0;
     while (ulTaskNotifyTake(pdTRUE, len <= 0) == 0) {
-        int err;
-        len = mp_stream_rw(self->stream, buf, sizeof(buf), &err, 0);
-        if (len > 0) {
-            pppos_input_tcpip(self->pcb, (u8_t *)buf, len);
+        mp_obj_t stream = self->stream;
+        if (stream == mp_const_none) {
+            len = 0;
+        } else {
+            int err;
+            len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);
+            if (len > 0) {
+                pppos_input_tcpip(self->pcb, (u8_t *)buf, len);
+            }
         }
     }
 
@@ -324,7 +337,9 @@ static mp_obj_t ppp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             if (mp_map_slot_is_filled(kwargs, i)) {
                 switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
                     case MP_QSTR_stream: {
-                        mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+                        if (kwargs->table[i].value != mp_const_none) {
+                            mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+                        }
                         self->stream = kwargs->table[i].value;
                         break;
                     }

From 611d8f9ce82ab5e04fb86ab6cfc28d5ed98f33bf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Nov 2024 12:04:57 +1100
Subject: [PATCH 1621/3129] esp32/modsocket: Fix getaddrinfo hints to set
 AI_CANONNAME.

Because the `ai_canonname` field is subsequently used.

ESP32_GENERIC_S3 (at least) crashes with IDF 5.2.3 without this set.

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

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 916eb79bd9265..7ea5e855d325e 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -213,7 +213,7 @@ static int mdns_getaddrinfo(const char *host_str, const char *port_str,
 #endif // MICROPY_HW_ENABLE_MDNS_QUERIES
 
 static void _getaddrinfo_inner(const mp_obj_t host, const mp_obj_t portx,
-    const struct addrinfo *hints, struct addrinfo **res) {
+    struct addrinfo *hints, struct addrinfo **res) {
     int retval = 0;
 
     *res = NULL;
@@ -235,6 +235,9 @@ static void _getaddrinfo_inner(const mp_obj_t host, const mp_obj_t portx,
 
     MP_THREAD_GIL_EXIT();
 
+    // The ai_canonname field is used below, so set the hint.
+    hints->ai_flags |= AI_CANONNAME;
+
     #if MICROPY_HW_ENABLE_MDNS_QUERIES
     retval = mdns_getaddrinfo(host_str, port_str, hints, res);
     #endif
@@ -264,7 +267,8 @@ static void _getaddrinfo_inner(const mp_obj_t host, const mp_obj_t portx,
 static void _socket_getaddrinfo(const mp_obj_t addrtuple, struct addrinfo **resp) {
     mp_obj_t *elem;
     mp_obj_get_array_fixed_n(addrtuple, 2, &elem);
-    _getaddrinfo_inner(elem[0], elem[1], NULL, resp);
+    struct addrinfo hints = { 0 };
+    _getaddrinfo_inner(elem[0], elem[1], &hints, resp);
 }
 
 static mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {

From 5dc9eda1953668eb6861be01ca85f147dcf8d406 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Nov 2024 14:21:29 +1100
Subject: [PATCH 1622/3129] extmod/vfs_blockdev: Support bool return from
 Python read/write blocks.

Commit f4ab9d924790581989f2398fe30bbac5d680577f inadvertently broke some
Python block devices, for example esp32 and stm32 SDCard classes.  Those
classes return a bool from their `readblocks` and `writeblocks` methods
instead of an integer errno code.  With that change, both `False` and
`True` return values are now be interpreted as non-zero and hence the block
device call fails.

The fix in this commit is to allow a bool and explicitly convert `True` to
0 and `False` to `-MP_EIO`.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_blockdev.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/extmod/vfs_blockdev.c b/extmod/vfs_blockdev.c
index a7c14b76ee368..d43c96b08f326 100644
--- a/extmod/vfs_blockdev.c
+++ b/extmod/vfs_blockdev.c
@@ -58,6 +58,13 @@ static int mp_vfs_blockdev_call_rw(mp_obj_t *args, size_t block_num, size_t bloc
     if (ret == mp_const_none) {
         return 0;
     } else {
+        // Some block devices return a bool indicating success, so
+        // convert those to an errno integer code.
+        if (ret == mp_const_true) {
+            return 0;
+        } else if (ret == mp_const_false) {
+            return -MP_EIO;
+        }
         // Block device functions are expected to return 0 on success
         // and negative integer on errors. Check for positive integer
         // results as some callers (i.e. littlefs) will produce corrupt

From 898407defbb6327fde379304846999033bf349c5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 4 Nov 2024 16:04:56 +0100
Subject: [PATCH 1623/3129] ports: Make PWM duty_u16 have an upper value of
 65535 across all ports.

The following ports used 65536 as the upper value (100% duty cycle) and are
changed in this commit to use 65535: esp8266, mimxrt, nrf, samd.

Tested that output is high at `duty_u16(65535)` and low at `duty_u16(0)`.
Also verified that at `duty_u16(32768)` the high and low pulse have the
same length.

Partially reverts #10850, commits 9c7ad68165bcd224c94ca6d8f172362cf8000d99
and 2ac643c15bec8c88ece0e944ce58f36d02dfd2dd.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/mimxrt/quickref.rst        | 6 +++---
 docs/samd/quickref.rst          | 4 ++--
 ports/esp8266/machine_pwm.c     | 6 +++---
 ports/mimxrt/hal/pwm_backport.c | 6 +++---
 ports/mimxrt/hal/pwm_backport.h | 2 +-
 ports/nrf/modules/machine/pwm.c | 6 +++---
 ports/samd/machine_pwm.c        | 2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index cfd0605054a7b..34e0aa79f139f 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -193,7 +193,7 @@ PWM Constructor
 
       - *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``.
+      - *duty_u16* sets the duty cycle as a ratio ``duty_u16 / 65535``.
         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%).
@@ -231,7 +231,7 @@ is created by dividing the pwm_clk signal by an integral factor, according to th
 
     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
+with n being in the range of 0..7, and m in the range of 2..65535. 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
@@ -255,7 +255,7 @@ Use the :ref:`machine.ADC <machine.ADC>` class::
     from machine import ADC
 
     adc = ADC(Pin('A2'))        # create ADC object on ADC pin
-    adc.read_u16()              # read value, 0-65536 across voltage range 0.0v - 3.3v
+    adc.read_u16()              # read value, 0-65535 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
diff --git a/docs/samd/quickref.rst b/docs/samd/quickref.rst
index 25b5a8fc8ab2b..d57dc67908398 100644
--- a/docs/samd/quickref.rst
+++ b/docs/samd/quickref.rst
@@ -215,7 +215,7 @@ PWM Constructor
 
       - *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``.
+      - *duty_u16* sets the duty cycle as a ratio ``duty_u16 / 65535``.
       - *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.
@@ -246,7 +246,7 @@ 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
+    adc0.read_u16()                  # read value, 0-65535 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
diff --git a/ports/esp8266/machine_pwm.c b/ports/esp8266/machine_pwm.c
index 25a2d6898f7c7..0d5ed595428e3 100644
--- a/ports/esp8266/machine_pwm.c
+++ b/ports/esp8266/machine_pwm.c
@@ -80,7 +80,7 @@ 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 (args[ARG_duty_u16].u_int != -1) {
-        pwm_set_duty(args[ARG_duty_u16].u_int * 1000 / 65536, self->channel);
+        pwm_set_duty(args[ARG_duty_u16].u_int * 1000 / 65535, self->channel);
     }
     if (args[ARG_duty_ns].u_int != -1) {
         uint32_t freq = pwm_get_freq(0);
@@ -164,13 +164,13 @@ static void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
 
 static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     set_active(self, true);
-    return MP_OBJ_NEW_SMALL_INT(pwm_get_duty(self->channel) * 65536 / 1024);
+    return MP_OBJ_NEW_SMALL_INT(pwm_get_duty(self->channel) * 65535 / 1024);
 }
 
 static void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
     set_active(self, false);
     self->duty_ns = -1;
-    pwm_set_duty(duty * 1024 / 65536, self->channel);
+    pwm_set_duty(duty * 1024 / 65535, self->channel);
     pwm_start();
 }
 
diff --git a/ports/mimxrt/hal/pwm_backport.c b/ports/mimxrt/hal/pwm_backport.c
index 7732e0e8167c8..3df826496392d 100644
--- a/ports/mimxrt/hal/pwm_backport.c
+++ b/ports/mimxrt/hal/pwm_backport.c
@@ -36,7 +36,7 @@ void PWM_UpdatePwmDutycycle_u16(
 
     // Setup the PWM dutycycle of channel A or B
     if (pwmSignal == kPWM_PwmA) {
-        if (dutyCycle >= 65536) {
+        if (dutyCycle >= PWM_FULL_SCALE) {
             base->SM[subModule].VAL2 = 0;
             base->SM[subModule].VAL3 = pulseCnt;
         } else {
@@ -44,7 +44,7 @@ void PWM_UpdatePwmDutycycle_u16(
             base->SM[subModule].VAL3 = base->SM[subModule].VAL2 + pwmHighPulse;
         }
     } else {
-        if (dutyCycle >= 65536) {
+        if (dutyCycle >= PWM_FULL_SCALE) {
             base->SM[subModule].VAL4 = 0;
             base->SM[subModule].VAL5 = pulseCnt;
         } else {
@@ -160,7 +160,7 @@ status_t QTMR_SetupPwm_u16(TMR_Type *base, qtmr_channel_selection_t channel, uin
     if (dutyCycleU16 == 0) {
         // Clear the output at the next compare
         reg |= (TMR_CTRL_LENGTH_MASK | TMR_CTRL_OUTMODE(kQTMR_ClearOnCompare));
-    } else if (dutyCycleU16 >= 65536) {
+    } else if (dutyCycleU16 >= PWM_FULL_SCALE) {
         // Set the output at the next compare
         reg |= (TMR_CTRL_LENGTH_MASK | TMR_CTRL_OUTMODE(kQTMR_SetOnCompare));
     } else {
diff --git a/ports/mimxrt/hal/pwm_backport.h b/ports/mimxrt/hal/pwm_backport.h
index 04899173e20b3..9c9f6811add28 100644
--- a/ports/mimxrt/hal/pwm_backport.h
+++ b/ports/mimxrt/hal/pwm_backport.h
@@ -24,7 +24,7 @@ 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;
 
-#define PWM_FULL_SCALE  (65536UL)
+#define PWM_FULL_SCALE  (65535UL)
 
 void PWM_UpdatePwmDutycycle_u16(PWM_Type *base, pwm_submodule_t subModule,
     pwm_channels_t pwmSignal, uint32_t dutyCycle, uint16_t center);
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index 8145509c76284..13d824e86674f 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -285,7 +285,7 @@ static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_PERCENT) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else if (self->p_config->duty_mode[self->channel] == DUTY_U16) {
-        return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel] * 100 / 65536);
+        return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel] * 100 / 65535);
     } else {
         return MP_OBJ_NEW_SMALL_INT(-1);
     }
@@ -301,7 +301,7 @@ static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     if (self->p_config->duty_mode[self->channel] == DUTY_U16) {
         return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel]);
     } else if (self->p_config->duty_mode[self->channel] == DUTY_PERCENT) {
-        return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel] * 65536 / 100);
+        return MP_OBJ_NEW_SMALL_INT(self->p_config->duty[self->channel] * 65535 / 100);
     } else {
         return MP_OBJ_NEW_SMALL_INT(-1);
     }
@@ -365,7 +365,7 @@ static void machine_hard_pwm_start(const machine_pwm_obj_t *self) {
         if (self->p_config->duty_mode[i] == DUTY_PERCENT) {
             pulse_width = ((period * self->p_config->duty[i]) / 100);
         } else if (self->p_config->duty_mode[i] == DUTY_U16) {
-            pulse_width = ((period * self->p_config->duty[i]) / 65536);
+            pulse_width = ((period * self->p_config->duty[i]) / 65535);
         } else if (self->p_config->duty_mode[i] == DUTY_NS) {
             pulse_width = (uint64_t)self->p_config->duty[i] * tick_freq / 1000000000ULL;
         }
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index b2a383c21cba1..468e34a1653dd 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -54,7 +54,7 @@ typedef struct _machine_pwm_obj_t {
 #define PWM_CLK_READY   (1)
 #define PWM_TCC_ENABLED (2)
 #define PWM_MASTER_CLK  (get_peripheral_freq())
-#define PWM_FULL_SCALE  (65536)
+#define PWM_FULL_SCALE  (65535)
 #define PWM_UPDATE_TIMEOUT (2000)
 
 #define VALUE_NOT_SET    (-1)

From e2532e0f725107becea3cf7e6d14727ab3abec7c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 6 Nov 2024 20:26:27 +0100
Subject: [PATCH 1624/3129] mimxrt/machine_pwm: Fix a few inconsistencies with
 PWM output.

Changes in this commit:
- When setting PWM parameters of a FLEXPWM AB channel twice within a PWM
  cycle, the second setting was ignored. Now the second setting persists.
- With `duty_u16(0)` a FLEXPWM X channel was set to high impedance.  Now it
  is set to low impedance with value 0 for `invert=False`, and 1 for
  `invert=True`.
- The align parameter requires a duty rate and frequency to be set.  Align
  will now be ignored if freq or duty are missing.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/hal/pwm_backport.c |  8 ++------
 ports/mimxrt/machine_pwm.c      | 29 ++++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ports/mimxrt/hal/pwm_backport.c b/ports/mimxrt/hal/pwm_backport.c
index 3df826496392d..7815fd1dff57d 100644
--- a/ports/mimxrt/hal/pwm_backport.c
+++ b/ports/mimxrt/hal/pwm_backport.c
@@ -110,12 +110,8 @@ void PWM_SetupPwmx_u16(PWM_Type *base, pwm_submodule_t subModule,
 
     base->SM[subModule].OCTRL = (base->SM[subModule].OCTRL & ~PWM_OCTRL_POLX_MASK) | PWM_OCTRL_POLX(!invert);
 
-    // Switch the output on or off.
-    if (duty_cycle == 0) {
-        base->OUTEN &= ~(1U << subModule);
-    } else {
-        base->OUTEN |= (1U << subModule);
-    }
+    // Enable PWM output
+    base->OUTEN |= (1U << subModule);
 }
 
 #ifdef FSL_FEATURE_SOC_TMR_COUNT
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index f9ae5e22edcc3..b68521281ae6c 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -45,6 +45,8 @@
 typedef struct _machine_pwm_obj_t {
     mp_obj_base_t base;
     PWM_Type *instance;
+    const machine_pin_obj_t *pwm_pin;
+    const machine_pin_af_obj_t *pwm_pin_af_obj;
     bool is_flexpwm;
     uint8_t complementary;
     uint8_t module;
@@ -255,6 +257,8 @@ static void configure_flexpwm(machine_pwm_obj_t *self) {
         PWM_SetupFaultDisableMap(self->instance, self->submodule, self->channel2, kPWM_faultchannel_1, 0);
     }
 
+    // clear the load okay bit for the submodules in case there is a pending load
+    PWM_SetPwmLdok(self->instance, 1 << self->submodule, false);
     if (self->channel1 != kPWM_PwmX) {  // Only for A/B channels
         // Initialize the channel parameters
         pwmSignal.pwmChannel = self->channel1;
@@ -283,6 +287,17 @@ static void configure_flexpwm(machine_pwm_obj_t *self) {
             self->instance->SM[self->submodule].CTRL &= ~(PWM_CTRL_DBLEN_MASK | PWM_CTRL_SPLIT_MASK);
         }
     } else {
+        if (self->duty_u16 == 0) {
+            // For duty_u16 == 0 just set the output to GPIO mode
+            if (self->invert) {
+                mp_hal_pin_high(self->pwm_pin);
+            } else {
+                mp_hal_pin_low(self->pwm_pin);
+            }
+            IOMUXC_SetPinMux(self->pwm_pin->muxRegister, PIN_AF_MODE_ALT5, 0, 0, 0, 0U);
+        } else {
+            IOMUXC_SetPinMux(self->pwm_pin->muxRegister, self->pwm_pin_af_obj->af_mode, 0, 0, 0, 0U);
+        }
         PWM_SetupPwmx_u16(self->instance, self->submodule, self->freq, self->duty_u16,
             self->invert, pwmSourceClockInHz);
         if (self->xor) {
@@ -408,12 +423,16 @@ static void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
             }
             self->center = center;
         } else {  // Use alignment setting shortcut
-            if (args[ARG_align].u_int >= 0) {
+            uint32_t duty = self->duty_u16;
+            if (duty == VALUE_NOT_SET && self->duty_ns != VALUE_NOT_SET) {
+                duty = duty_ns_to_duty_u16(self->freq, self->duty_ns);
+            }
+            if (args[ARG_align].u_int >= 0 && duty != VALUE_NOT_SET && self->freq != VALUE_NOT_SET) {
                 uint8_t align = args[ARG_align].u_int & 3; // limit to 0..3
                 if (align == PWM_BEGIN) {
-                    self->center = self->duty_u16 / 2;
+                    self->center = duty / 2;
                 } else if (align == PWM_END) {
-                    self->center = PWM_FULL_SCALE - self->duty_u16 / 2;
+                    self->center = PWM_FULL_SCALE - duty / 2;
                 } else {
                     self->center = 32768; // Default value: mid.
                 }
@@ -515,6 +534,8 @@ 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 = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
+    self->pwm_pin = pin1;
+    self->pwm_pin_af_obj = af_obj1;
     self->is_flexpwm = is_flexpwm;
     self->instance = af_obj1->instance;
     self->module = module;
@@ -534,6 +555,8 @@ static mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
 
     // Initialize the Pin(s).
     CLOCK_EnableClock(kCLOCK_Iomuxc); // just in case it was not set yet
+    // Configure PWMX channels to pin output mode to be prepared for duty_u16 == 0.
+    mp_hal_pin_output(pin1);
     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,

From 5a70850b30e457ee9c6ab12fa735246bc3a1f8aa Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 2 Sep 2024 16:24:46 +0200
Subject: [PATCH 1625/3129] samd/machine_uart: Add full support for 9-bit data.

Prior to this commit, 9-bit UART data could be specified in the constructor
and was transmitted, but the 9th bit was set to 0 when sending, and ignored
when receiving.  This commit completes 9-bit support in that the 9th bit is
taken from the data.

9-bit data has to be provided with `uart.write()` and and read with
`uart.read()` as two bytes for each transmitted item, low order byte first.
The data length supplied with `uart.write()` and requested by `uart.read()`
has to be even, which is checked.  The size of the UART buffers will be
transparently doubled to cater for 9-bit data.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_uart.c | 84 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 11 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index b0dc4c5768d13..6e9a5538647bc 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -107,10 +107,17 @@ static const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0,
 
 // 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) {
+    uint8_t bits = self->bits;
     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);
+        if (ringbuf_free(&self->read_buffer) >= (bits <= 8 ? 1 : 2)) {
+            // get a word from uart and put into the buffer
+            if (bits <= 8) {
+                ringbuf_put(&(self->read_buffer), uart->USART.DATA.bit.DATA);
+            } else {
+                uint16_t data = uart->USART.DATA.bit.DATA;
+                ringbuf_put(&(self->read_buffer), data);
+                ringbuf_put(&(self->read_buffer), data >> 8);
+            }
         } else {
             // if the buffer is full, disable the RX interrupt
             // allowing RTS to come up. It will be re-enabled by the next read
@@ -150,7 +157,12 @@ void common_uart_irq_handler(int uart_id) {
             #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);
+                if (self->bits <= 8) {
+                    uart->USART.DATA.bit.DATA = ringbuf_get(&self->write_buffer);
+                } else {
+                    uart->USART.DATA.bit.DATA =
+                        ringbuf_get(&self->write_buffer) | (ringbuf_get(&self->write_buffer) << 8);
+                }
             } else {
                 #if MICROPY_PY_MACHINE_UART_IRQ
                 // Set the TXIDLE flag
@@ -274,6 +286,17 @@ void machine_uart_set_baudrate(mp_obj_t self_in, uint32_t baudrate) {
 
 static void mp_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);
+    size_t rxbuf_len = self->read_buffer.size - 1;
+    #if MICROPY_HW_UART_TXBUF
+    size_t txbuf_len = self->write_buffer.size - 1;
+    #endif
+    if (self->bits > 8) {
+        rxbuf_len /= 2;
+        #if MICROPY_HW_UART_TXBUF
+        txbuf_len /= 2;
+        #endif
+    }
+
     mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
         "timeout=%u, timeout_char=%u, rxbuf=%d"
         #if MICROPY_HW_UART_TXBUF
@@ -287,9 +310,9 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         #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, rxbuf_len
         #if MICROPY_HW_UART_TXBUF
-        , self->write_buffer.size - 1
+        , txbuf_len
         #endif
         #if MICROPY_HW_UART_RTSCTS
         , self->rts != 0xff ? pin_find_by_id(self->rts)->name : MP_QSTR_None
@@ -411,6 +434,14 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         }
     }
     #endif
+
+    // Double the buffer lengths for 9 bit transfer
+    if (self->bits > 8) {
+        rxbuf_len *= 2;
+        #if MICROPY_HW_UART_TXBUF
+        txbuf_len *= 2;
+        #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;
@@ -619,7 +650,12 @@ static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
     uint64_t timeout_char = self->timeout_char;
     uint8_t *dest = buf_in;
 
-    for (size_t i = 0; i < size; i++) {
+    // Check that size is even for 9 bit transfers.
+    if ((self->bits >= 9) && (size & 1)) {
+        *errcode = MP_EIO;
+        return MP_STREAM_ERROR;
+    }
+    for (size_t i = 0; i < size;) {
         // Wait for the first/next character
         while (ringbuf_avail(&self->read_buffer) == 0) {
             if (mp_hal_ticks_ms_64() > t) {  // timed out
@@ -633,6 +669,11 @@ static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
             MICROPY_EVENT_POLL_HOOK
         }
         *dest++ = ringbuf_get(&(self->read_buffer));
+        i++;
+        if (self->bits >= 9 && i < size) {
+            *dest++ = ringbuf_get(&(self->read_buffer));
+            i++;
+        }
         t = mp_hal_ticks_ms_64() + timeout_char;
         // (Re-)Enable RXC interrupt
         if ((uart->USART.INTENSET.reg & SERCOM_USART_INTENSET_RXC) == 0) {
@@ -647,12 +688,19 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     size_t i = 0;
     const uint8_t *src = buf_in;
     Sercom *uart = sercom_instance[self->id];
-
     uint64_t t = mp_hal_ticks_ms_64() + self->timeout;
+    uint8_t bits = self->bits;
+    // Check that size is even for 9 bit transfers.
+    if ((bits >= 9) && (size & 1)) {
+        *errcode = MP_EIO;
+        return MP_STREAM_ERROR;
+    }
+
     #if MICROPY_HW_UART_TXBUF
 
     #if MICROPY_PY_MACHINE_UART_IRQ
     // Prefill the FIFO to get rid of the initial IRQ_TXIDLE event
+    // Do not care for 9 Bit transfer here since the UART is not yet started.
     while (i < size && ringbuf_free(&(self->write_buffer)) > 0) {
         ringbuf_put(&(self->write_buffer), *src++);
         i++;
@@ -672,8 +720,16 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
             }
             MICROPY_EVENT_POLL_HOOK
         }
-        ringbuf_put(&(self->write_buffer), *src++);
-        i++;
+        if (bits >= 9) {
+            mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+            ringbuf_put(&(self->write_buffer), *src++);
+            ringbuf_put(&(self->write_buffer), *src++);
+            i += 2;
+            MICROPY_END_ATOMIC_SECTION(atomic_state);
+        } else {
+            ringbuf_put(&(self->write_buffer), *src++);
+            i += 1;
+        }
         uart->USART.INTENSET.reg = SERCOM_USART_INTENSET_DRE; // kick off the IRQ
     }
 
@@ -691,7 +747,13 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
             }
             MICROPY_EVENT_POLL_HOOK
         }
-        uart->USART.DATA.bit.DATA = *src++;
+        if (self->bits > 8 && i < (size - 1)) {
+            uart->USART.DATA.bit.DATA = *(uint16_t *)src;
+            i++;
+            src += 2;
+        } else {
+            uart->USART.DATA.bit.DATA = *src++;
+        }
         i++;
     }
     #endif

From 4d36ecf8a882e919b27c953c963e3577d9ae46aa Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 27 Sep 2024 09:03:53 +0200
Subject: [PATCH 1626/3129] samd/boards/SAMD21_XPLAINED_PRO: Add specific
 deploy instructions.

Add instructions to install a bootloader to the board.  The SAMD21 XPLAINED
PRO board is shipped without a bootloader, which therefore has to be
installed once before it can be used with MicroPython.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../boards/SAMD21_XPLAINED_PRO/board.json     |  2 +-
 .../deploy_xplained_pro.md                    | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 ports/samd/boards/SAMD21_XPLAINED_PRO/deploy_xplained_pro.md

diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
index c59ebc1b7b7be..899e56e905a68 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "deploy_xplained_pro.md"
     ],
     "docs": "",
     "features": [
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/deploy_xplained_pro.md b/ports/samd/boards/SAMD21_XPLAINED_PRO/deploy_xplained_pro.md
new file mode 100644
index 0000000000000..d95ab5061a30f
--- /dev/null
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/deploy_xplained_pro.md
@@ -0,0 +1,24 @@
+The SAMD21 Xplained Pro board is shipped without a bootloader. For use
+with MicroPyhton a suitable bootloader has be be installed first. The
+following procedure has been found to work and be simple:
+
+1. Get the bootloader from https://micropython.org/resources/firmware/bootloader-xplained-pro-v3.16.0-15-gaa52b22.hex.
+2. Connect your board to the debug port. A drive with the name XPLAINED
+shall appear.
+3. Copy the Intel hex file of the bootloader to that drive.
+4. Connect your board to the target port. A drive with the name SAMD21XPL should
+appear. If not, push reset twice. Then it should appear. If that does not
+happen, the bootloader was not properly installed or is not compatible.
+5. Copy the MicroPython firmware, a .uf2 file, to the SAMD21 drive. When the SAMD21
+drive disappears, MicroPython is installed.
+
+From now on only steps 4 and 5 are needed to update MicroPython. You can use the
+usual methods to invoke the bootloader, namely:
+
+- Push Reset twice.
+- Call machine.bootloader().
+- Use the touch 1200 procedure by switching the USB baud rate to 1200 baud and back.
+
+At the above link above there are as well .uf2 versions of the bootloader
+which one can install using steps 5. and 6. above once a .uf2 capable
+bootloader is installed.

From 85de67f55d2afb5c75388d639e51e3df7640b4a7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 30 Sep 2024 09:37:13 +0200
Subject: [PATCH 1627/3129] samd/mboot: Provide a UF2 bootloader for SAMD21
 Xplained Pro.

A bootloader labelled for the SAMD21 XPLAINED PRO board.  The only
difference to a generic bootloader are the names and ID of the USB port and
the label of the drive that is opened.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ...oader-xplained-pro-v3.16.0-15-gaa52b22.hex | 513 ++++++++++++++++++
 1 file changed, 513 insertions(+)
 create mode 100644 ports/samd/mboot/bootloader-xplained-pro-v3.16.0-15-gaa52b22.hex

diff --git a/ports/samd/mboot/bootloader-xplained-pro-v3.16.0-15-gaa52b22.hex b/ports/samd/mboot/bootloader-xplained-pro-v3.16.0-15-gaa52b22.hex
new file mode 100644
index 0000000000000..df8d5afd19c2b
--- /dev/null
+++ b/ports/samd/mboot/bootloader-xplained-pro-v3.16.0-15-gaa52b22.hex
@@ -0,0 +1,513 @@
+:10000000E02D002069020000650200006702000088
+:1000100000000000000000000000000000000000E0
+:100020000000000000000000000000006502000069
+:100030000000000000000000650200005D020000FA
+:100040006502000065020000650200006502000014
+:100050006502000065020000650200006502000004
+:1000600065020000650200006502000065020000F4
+:1000700065020000650200006502000065020000E4
+:1000800065020000650200006502000065020000D4
+:1000900065020000650200006502000065020000C4
+:1000A00065020000650200006502000065020000B4
+:1000B00000000000074B1A7DD207FCD52022FF323A
+:1000C0001A83054A4008D8611A801A7DD207FCD5E8
+:1000D0007047C0460040004102A5FFFF70B5802573
+:1000E0000400ED02AC4200D370BD20000134FFF7E4
+:1000F000E1FFFF34F6E7002330B59A4200D130BD6E
+:100100009C000D5901330551F7E70000F0B580253B
+:10011000104C114E6368114FAB436360002A00D14D
+:10012000F0BD1300102A00D91023D21A2680257D95
+:10013000ED07FCD59B009C460023CD58C5500433E9
+:100140006345FAD1C018C9182780237DDB07FCD589
+:10015000E4E7C0460040004144A5FFFF04A5FFFFBF
+:10016000802270B5002304000D005200E958E058C9
+:10017000814203D104339342F8D170BD2000FFF7D0
+:1001800099FF402229002000FFF7C0FFF5E700009B
+:1001900010230249CA681A42FCD070470008004088
+:1001A0001E2270B52149224C4B6893431C3A1343DD
+:1001B0004B60A284FFF7ECFF1E4B1B689B0E3F2B8E
+:1001C00000D1203B00251C4A9B0213431B4AE262DC
+:1001D000A362A584FFF7DCFF194BA384FFF7D8FFC8
+:1001E0000223A28C1343A384FFF7D2FF154B9D601B
+:1001F0005A7852B2002AFBDB134A5A605A7852B23C
+:10020000002AFBDBC021114A114B12485360036ADC
+:1002100009061B021B0A0B4303620023936007338A
+:10022000136030220C4B1A6070BDC0460040004184
+:100230000008004024608000FF01000080BB0A1C11
+:1002400024050000000C00400007030010E000E05F
+:10025000E703000000ED00E00000002010B500F012
+:1002600007F910BDFEE7FEE72449254870B5814235
+:100270000AD0244BC41E0022A34203D303331A1A0C
+:100280009208920001F058FC1F48204BC11E00222A
+:10029000994203D803331A1A92089200002101F000
+:1002A00054FCFF221A4B032193431A4A0C259360F6
+:1002B000022208243026184B18485A62C3788B4310
+:1002C0001343C370C378AB432343C370144B987B71
+:1002D000B0430600202030439873987BA843044322
+:1002E0009C73987B884302439A7380230D4A51681C
+:1002F0000B43536000F07AFEFEE7C0466C1D000021
+:1003000000000020D0010020D0010020DC0D0020E2
+:100310000000000000ED00E0FC70004100500041D2
+:100320000048004100400041F7B5134D01906B8833
+:10033000002B18D1082738001A0292B214B2A44632
+:1003400066465400A2B2002E02DA0C4A5440A2B211
+:10035000013880B20028F1D158002A52802201339E
+:1003600052009342E7D1019A0B0A53405800285A91
+:100370000902484080B2FEBDD001002021100000DB
+:10038000074B1B685843074B1A789523002A00D166
+:100390001233012243439A4200D370470132FAE7F5
+:1003A00000000020D003002070B505001C240020B0
+:1003B0000F260B00E3403340002A09D1002B07D160
+:1003C000002C0BD0002809D1043C231DF1D170BDB5
+:1003D000092B03DD37332B540130F5E73033FAE7CF
+:1003E000054B064A1A60BFF34F8F054B054ADA608A
+:1003F000BFF34F8FFEE7C046FC7F0020EF6926F079
+:1004000000ED00E00400FA0510B50B4A1368002B5C
+:100410000ED10A4911600A490A6801320A60094985
+:100420000868002806D0824204D30B60FFF7D8FF8B
+:10043000013B136010BDC046E4030020DC05000052
+:10044000E0030020D8030020054B064A1A60BFF3E2
+:100450004F8F054B054ADA60BFF34F8FFEE7C0466A
+:10046000FC7F0020EF6916F000ED00E00400FA05C3
+:10047000012210B5194B1A491A701A4A1368013330
+:1004800013600A68002A0CD017481018834203D161
+:1004900080241648E4050460934201D100230B60D8
+:1004A00010BD1348DBB20278002B10D180210F4B16
+:1004B000C905196011000A39C9B20E4BF02902D9D9
+:1004C0001978494219701B78D2180270E8E79342F4
+:1004D000E6D18022084BD2051A60E1E7D003002064
+:1004E000DC030020D403002018FCFFFF98440041E7
+:1004F000050000200400002094440041074B084AF6
+:100500001B681168994207D2FA21C9005B18136071
+:100510008022044BD2051A607047C046D4030020E5
+:10052000DC03002094440041044B80221900D205D2
+:10053000883198330A601A607047C0460044004111
+:1005400070470000202370B5354A0F20D1690B4356
+:10055000D361012233490B7813430B70324B197866
+:100560008143197006211C78214319702F490C789A
+:1005700022430A701A7802401A70602219780A43DE
+:100580001A702B4A2B4B53805378DB09FCD1012284
+:10059000294B19780A431A709A78D207FCD41F2085
+:1005A00026490A68520B0240824200D105221C8D66
+:1005B000234D024092012C4022431A850A68920C76
+:1005C00002401F2A00D1023A1F24188D2240A04366
+:1005D000024307201A850A68D20D0240824200D1E8
+:1005E0000322198D02401748120301400A437F215C
+:1005F0001A851A7814480A401A70042219780A4396
+:100600000C211A7058621A898A431A811A890B3987
+:100610008A431A8180220021520001F096FA70BDAF
+:1006200000040040584400413C440041594400410A
+:10063000000C004006400000005000412460800093
+:100640003FF8FFFFFF8FFFFF74060020F7B51C0087
+:10065000314B06005B6A0F0015000193002C05D199
+:10066000443454432D4BE418FFF7CEFE63782278D0
+:10067000934210D2D51ABD4200D93D00002E08D0B9
+:10068000211DC9182A00300001F056FA63785B1961
+:1006900063702800FEBD019BA1786A01D318002970
+:1006A00011D1211D196059681D48890B89035960B2
+:1006B0005968014059601B49551840212879014368
+:1006C00029710121A1701449002551180191164981
+:1006D0005218127AD207DCD55D68A278EDB2257087
+:1006E000022A04D12A001968201D01F025FABD4212
+:1006F00000D93D00002E0CD02A0030006570211D6D
+:1007000001F01AFA0122019BFF331A720023A37031
+:10071000BFE76670F6E7C046005000413004002095
+:10072000FF3F00F000510041FF50004110B5002391
+:10073000FFF78CFF10BDF8B505000C0016001F0078
+:10074000002C00D1F8BD210028003B003200FFF74B
+:100750007DFF241A2D18F3E7F8B50D001F49560147
+:100760004C6A3419002B1BD063695B005B08636122
+:1007700020616369AA049B0B920C9B031343636182
+:100780006369174A174813406361321802238021B6
+:10079000160013729171327A1A42FCD02800F8BD0B
+:1007A000012163695B005B0F03339940A94209D8BB
+:1007B000043A531E9A416369D1075B005A080A4301
+:1007C0006261D5E744275743074A0437BF18010041
+:1007D0002A00380001F0B0F93800C9E700500041A4
+:1007E000FF3F00F0FF5000413004002010B500230F
+:1007F000FFF7B2FF10BD000010B5054A0B001188CD
+:10080000994200D919000022FFF7F0FF10BDC04641
+:100810007407002007B500216B460A00D81D01703F
+:10082000FFF7E4FF07BD0000F0B5B94C9BB0FFF740
+:10083000EBFDA38B08211A000A400392B54A0B4234
+:100840002ED080234020A183A372C024093151708F
+:1008500090715371B04BB14D5968A40529402143A3
+:100860005960596929400C43AD495C6104311960F4
+:10087000AC49AD4C196159680C4080218902214373
+:1008800059605968890B8903596050710022A74B40
+:100890001A70A64B1878431E9841C0B21BB0F0BD29
+:1008A0001020137A0342F4D09D4D10726D899C483C
+:1008B000AC46664680799E4D02909948984BC78811
+:1008C000C0792E80402501909B889548994E0089DB
+:1008D0005571B34200D1B0E136DC81246400A342FB
+:1008E00000D1BFE115DC822B00D190E106DC803B1A
+:1008F000012B00D886E120239371CAE780214900AB
+:100900008B42F8D00221FF318B42F4D1FFF782FFF6
+:10091000BFE7B02189008B4200D16DE10EDC0139C7
+:10092000FF398B42E7D0A23B8349FF3B0B42E2D128
+:10093000002308210893099308A8C4E0C021890076
+:100940008B42D8D07D49DFE77D488342DED000DD91
+:1009500096E07C498B4212DC01398B4200DBACE033
+:1009600079498B42E4D06031FF318B42C3D1FFF72C
+:1009700051FF80235B423B43DBB2A37289E78821AE
+:100980006A4809018B4200D195E080318B42B2D197
+:100990000770FFF73FFFA02303225B00E254C02251
+:1009A0005D4B5E49586C92050840104358644620E0
+:1009B000FF302554654830271864902040002754A4
+:1009C000586B8026084010435863922040002654FC
+:1009D0005F481863B02040002554586F084058679E
+:1009E000B220400026543C307D3E2654FC388446DC
+:1009F0009C44604606680E4016430660A626FF36F5
+:100A0000A5551E005348A0363060C0267600A75575
+:100A10001F0094373E6880200E4016433E60C22679
+:100A20007600A0551E004C4F90363760E0264427D4
+:100A30007600A7550436A555A055C01984469C4498
+:100A4000604606680E4016430660D42084469C44E7
+:100A5000604606680E4016430660F0268020760049
+:100A6000A7550436A555A0551C00E4342068F4337E
+:100A7000084010432060186801400A431A6008E7E4
+:100A80003648834200D122E10ADC35498B4200D14D
+:100A90003CE7344934480B40834200D136E72AE72B
+:100AA00032498B4200D131E731498B4200D022E7F5
+:100AB000002308A80380012105E080235B009F42FA
+:100AC00004D112212B48FFF797FEE2E680239B001A
+:100AD0009F4202D199212848F5E7019B032B78D149
+:100AE000029B032B00D906E708AC48220021200016
+:100AF00001F02BF8019B6370029B002B3ED1092271
+:100B000004332370A270E37020002178DBE7C04635
+:100B100000500041FF50004174060020FFFFFF8F8E
+:100B2000E803002034040020FF3F00F02C040020E4
+:100B30007407002002030000FFFE00000103000014
+:100B40002109000081060000A1030000BC04002070
+:100B5000780400208805002044050020A121000021
+:100B600021200000FFFEFFFF210A000021220000DB
+:100B7000A1FE0000981B00004400002004AE3200DB
+:100B8000544B23CB23C200252F001B681360AB00FE
+:100B9000514AF358D01919680122FFF705FC0135B5
+:100BA0003F18042DF3D100234B4AD3554B4B4C4AED
+:100BB0009B799B009D58280000F0CFFF2300013057
+:100BC000400020702A7802330135002A9CD01A7028
+:100BD000F8E7019B0F2B02D13921424873E7019BB3
+:100BE000212B02D1092140486DE7019B222B00D027
+:100BF00081E621213D4866E7072800D07BE6AA214F
+:100C00003B4860E7039B08A8022103805BE708429A
+:100C100000D070E60F235022034008335B011042DE
+:100C200006D0344A9B189B799B06DB0F08A8EBE79C
+:100C3000304A9B189B79DB06F7E70F24030023401B
+:100C4000204200D157E60140394300D053E6294AFB
+:100C500008335B019B18020602D520225A7155E623
+:100C60001022FBE70F2403002340204200D142E67C
+:100C70000140394300D03EE65B01020613D51E4910
+:100C80001C4A9A185B182021D879084200D13DE609
+:100C900059711B7A2B4200D138E613004022FF33F2
+:100CA0001A723E3ADAE710201349124A9A185B1872
+:100CB000D979014200D129E658711B7A01180B42FB
+:100CC00000D123E61300FF3301221972C6E70B4857
+:100CD000F9E6C046881B000050060020E80300200B
+:100CE000D01B000008000020E0000020AC1B00002A
+:100CF000F400002000500041FF500041EC000020B3
+:100D000010B5FFF71FFC0022034B1A700223034AA1
+:100D100011780B43137010BD2C04002000500041CB
+:100D200010B50C000122FFF761FD200010BD10B5C9
+:100D30000C000122FFF75AFD200010BD70B5040021
+:100D40000D00FFF771FD03000020834204D0022252
+:100D500029002000FFF7EAFC70BD70B505000C000B
+:100D6000FFF762FD002807D000230222210028009F
+:100D7000FFF7E1FC200070BD0400FBE730B5002365
+:100D80002025934200DB30BD0C78002C03D00131CC
+:100D9000C4540133F5E72C00FAE70000F8B58022CF
+:100DA0000C00050000212000920000F0CEFE002D76
+:100DB0000CD13E2220004A4900F0BEFEFF235522FE
+:100DC0005B00E254474B9218E254F8BD7E2D23D8C5
+:100DD0006E1E3E2E01D9403D2E00002E12D08025E1
+:100DE0003302581C404EFF30ED001A1F591CAA4216
+:100DF00003D2B3420ED08BB223800B000234814267
+:100E0000F3D1E2E7F0230922FF212370601C00F0F8
+:100E10009CFEE4E7354BEFE7822D31D87F2DD4D10E
+:100E20002F490B2220002B31FFF7A8FF8027282312
+:100E30002F4EE3727D3D3F03F0683B0020340028D5
+:100E400002D000F08AFE03001A0A237762771A0C98
+:100E50001B0EE3772B0A3100A277A5760B22E376EF
+:100E60002000FFF78BFF67224D2301355242ADB2C0
+:100E700022746374227663761036052DDCD1A4E7E4
+:100E80002B00833B012B0CD8194A1B01D318DD68BA
+:100E9000280000F062FE29000200200000F04CFE55
+:100EA00093E78023853D2902DB02994200D38CE73A
+:100EB000104B114A2360114B20006360FE235B003E
+:100EC000E2508023DB00A361802380229B01A3608A
+:100ED0000B4B52006561E1602261E3612030DDE788
+:100EE000E01B0000FF01000003040000FFFF000002
+:100EF000881C00005546320A306FB10A57515D9E7A
+:100F0000882BED6870B516001D000A682F4B0C0089
+:100F10009A4252D12E4B4A689A424ED1FE2252003A
+:100F20002C4B8A589A4248D18B689A0403D52A4A96
+:100F3000C969914241D1DB0712D4802322695B0049
+:100F40009A420DD1E068C3B2002B09D1F822234B9D
+:100F50009202C318934203D221002031FFF700F917
+:100F6000002D2BD0A369002B28D029681C4A8B4266
+:100F700006D0934201D8002901D001235B422B60A7
+:100F80006369934219D8072201211A409140DB0876
+:100F9000EB181A7AC8B2114204D1696802430131D0
+:100FA0001A7269606A682B689A4206D3002E04D1CF
+:100FB0000C4B1B681E330C4A136070BD002EFCD115
+:100FC000084B1B682D33FF33F5E7C0465546320A00
+:100FD00057515D9E306FB10A882BED6800E0FFFF2E
+:100FE00063040000E0030020D8030020F8B5624D40
+:100FF000AB68002B00D0FEE70221604B5A6B8A439E
+:101000005A63DA681205FCD55D4A5A630222596BAD
+:101010000A435A63DA689205FCD5DA685205FCD4B3
+:1010200002215A6B8A435A63DA681205FCD50822FA
+:10103000596B0A435A630222596B0A4351495A6356
+:101040000B68013321D120224F4BFF32188B024312
+:101050001A8358684D4A02435A604D4ADA614D4A34
+:101060001A801A7DD207FCD54B4A1A801A7DD20706
+:10107000FCD54A4A0A604A4A4A4911604A4A1A80DB
+:101080001A7DD207FCD5FFF7DFF90023474A13701A
+:10109000D379DB09FCD1FFF747FA454B1E68454B76
+:1010A000F218F8239B029A4213D8434B434A19681B
+:1010B000434C444B914232D11978434AC90702D478
+:1010C000216891422BD0414B22601B68404A323349
+:1010D0001360FFF765F8BFF35F8F62B6FFF710FE8E
+:1010E0004020FFF72DFA80270A230126394DFF0102
+:1010F0002B70FFF799FB384C00280AD02378DAB21E
+:10110000002B05D1324B38001A60FFF719FA2E7008
+:1011100026702378002B25D000F0D6FAFCE71B7848
+:10112000DB07DA0F002B0DD00023802223602B4B2E
+:10113000D2051A6080239B011A6882F30888AB608D
+:101140003047C6E72168264B994201D12260C0E7AB
+:1011500021681D4A9142E7D0FA2023604000FFF742
+:101160000FF9E1E72378002BC3D1FF33C046013BE1
+:10117000002BFBD1BDE7C04600ED00E000080040B9
+:10118000040027000040800000400041800004006F
+:101190000020400005A5FFFF44A5FFFFFAC7E0D8E7
+:1011A000044080005DFCFFFF06A5FFFF001000402B
+:1011B0000420000000E0FFFFB42000007CB0EE87B8
+:1011C000FC7F002038040040EF6926F0E003002097
+:1011D000D80300200400002076070020944400413A
+:1011E000EF6916F010B5054C12220021200000F026
+:1011F000ACFCF0232370E63BE37110BDB309002083
+:1012000010B5FFF7EFFF0022014B1A7310BDC04667
+:101210009E010020F7B580270400160000250191EB
+:10122000BF00A368AB4200D8F7BD3900A278019B8C
+:10123000E068FFF780FA80235B01E81801223300A1
+:10124000E168FFF75FFE0135EBE770B513000600BC
+:101250000C00150000200A000121FFF7F7F9002318
+:10126000984206D02B0022001F213000FFF7EEF934
+:101270000123180070BD000010B504220D210248A2
+:10128000FFF7B4FA10BDC0469E01002010B50B4C0C
+:101290000B4861792379A27909021943E379120491
+:1012A00011431B060B431A0A037142711A0C1B0EE1
+:1012B0008271C371FFF7E0FF10BDC04694090020A2
+:1012C0009E01002070B504220D00FFF78FFA154C27
+:1012D00085420FD0FFF786FF012304222373124BB0
+:1012E0009A700022DA701A715A719A711A735A73CD
+:1012F000FFF7CCFFFFF784FF637A217A1B020B43D1
+:10130000A17AE27A0904120619431143491B0B0A18
+:10131000217263720B0C090EA372E172FFF7B6FF24
+:1013200070BDC0469E010020B309002070B5184C66
+:10133000142205000021200000F007FC154A002DB2
+:101340001FD021000823D07D08313F26527C324037
+:101350001C2A01D0B24205D10F4A0C330A80052263
+:10136000DBB2CA70191C834200D9011CC9B2002D1E
+:101370000BD0023B9BB21B0223802000FFF7A2FF91
+:1013800070BD0423D07C211DDFE7013B2370F4E70F
+:1013900078090020940900201C0A0000F0B5040020
+:1013A00000252A4B85B0597C03AAD170997C917095
+:1013B000D97C5170197D1170997D02AAD170DB7DA5
+:1013C000937053880193019BAB4205D8FFF718FF38
+:1013D000FFF75CFF05B0F0BDFFF726FA0028F9D053
+:1013E000039B1B4FEE18002C1FD039003000FFF775
+:1013F000D5FC8021042238008900FFF7F7F9154A4F
+:101400000135507A137A917A00021843D37A09048D
+:1014100008431B06104903435B18190A13725172E3
+:10142000190C1B0E9172D372CDE780212300380076
+:1014300005228900FFF77FF9220039003000074BB1
+:10144000FFF760FDFFF75AF8D9E7C046940900207E
+:10145000780700209E01002000FEFFFFC809002041
+:101460007FB500F02FFB444E002205213000FFF72E
+:10147000ECFE002849D0737A327AB57A1B021A43FF
+:10148000F37A2D041B0615433C4C1D432B0A637253
+:101490002B0CA3722B0E2572E372F07B2F2827D81A
+:1014A000192815D8032827D012282FD0002840D07B
+:1014B000FFF798FE012305222373314B9A70002217
+:1014C000DA701A715A719A711A7320325A7332E0B3
+:1014D0001A381528ECD800F01BFB282CEBEB2CEB72
+:1014E000EBEBEB3FEB31EBEB39EB3DEBEBEBEB2CD1
+:1014F0005A28DDD1012019E0F37C191C122B00D9E8
+:1015000012211F48C9B2FFF7DDFE7FBD1D4C1E49E9
+:10151000200018220830FFF731FCF37C191C242B23
+:1015200000D924212000C9B2EDE70020FFF7FEFE1C
+:10153000EBE7FFF765FEFFF7A9FEE6E78023134818
+:101540009B024360124B08210360DCE70120FFF798
+:1015500025FFDAE70020FAE70C260E49320001A841
+:1015600000F0EAFAB54204D9002326726372A3722E
+:10157000E3720C2101A8C6E7940900209E01002017
+:10158000B3090020AC010020721B00008C09002070
+:1015900000003E7F231D000072B6BFF35F8F044B37
+:1015A000044A9A829A830022034B9A607047C0468D
+:1015B00000500041FF03000000ED00E0F0B5C5B0B1
+:1015C0000DAF0400FFF7E8FF44220021380000F0CF
+:1015D000BCFA982200211EA800F0B7FA02230F21BE
+:1015E000BB70A37862780B40A370264B0A4005932A
+:1015F000636805AD06930023E16807932248627093
+:101600002B7301221EABFFF77DFC390020001EAAC0
+:10161000FFF700FE280001230D216278FFF79CF8F8
+:10162000002505AE3A003000A178FFF70EFE002835
+:101630001ED0144B01AD0193069B6B60079BAB6002
+:1016400000232B73F37B002BE4D02A2B17D16B469E
+:10165000B27D3900DA70F27D20009A705E881EAA91
+:10166000A660FFF7D7FDAB6876029E1BAE60D1E7A0
+:10167000064B9D4201D9FEF7B3FE0135D1E7FEF7D7
+:10168000E3FEC7E753425355FF0F0000F824010063
+:1016900030B5EFF30883054C2360036883F30888B3
+:1016A0004568A847236883F3088830BDC00A002036
+:1016B00007B5010001226846FEF776FE082168465C
+:1016C000FFF72EFB07BD0000F8B500237A227F4C00
+:1016D00023607F4B1A70FFF7C3FE7E4D4021280028
+:1016E000FFF72CFB7C4B186000232B54984201D051
+:1016F000FEF704FF0022794B1D60794B1A60784891
+:10170000754B02681F68BA42E5D2744E31680B7897
+:10171000FF2B37D0734D232B00D0B4E06C4B1B78DC
+:10172000532B34D12B680132013102603160BA1A77
+:101730009A4200D91A006C4D20682A6000F0FCF92A
+:10174000674829680368654ACB18013B0360106845
+:101750004B1EC3181360FF23644D29701940614B61
+:101760001B688B4203D92068591AFFF7F6FAC04666
+:101770007A22574B1A7000225A4B1A60574A136844
+:1017800001331360564A136801331360B7E7522BD5
+:1017900004D129682068FFF7CAFAE9E74F2B03D183
+:1017A0002B6822681370E3E7482B03D12B6822686B
+:1017B0001380DDE7572B0AD14D4B22689A4202D1A4
+:1017C0000020FEF7BDFE23682A681A60D0E76F2B61
+:1017D00004D101212068FFF7A3FAC9E7682B05D1DE
+:1017E000022123681B882B602800F4E7772B04D1A3
+:1017F000236804211B682B60F6E7472B09D1286872
+:10180000FFF746FF3B4B1B78002BB1D001213A4834
+:10181000E1E7542BACD04E2BAAD0562B02D12A2173
+:101820003648D8E7582B05D12868FEF757FC032126
+:101830003348D0E7592B0DD12A682068314B002A54
+:1018400003D1186003213048C5E719689208FEF7F4
+:101850005DFCF7E75A2B8BD12F6800252668F71916
+:10186000B74209D101212948FFF75AFA2800FFF7AA
+:101870001FFF03212648AEE729003078FEF754FD0C
+:1018800001360500ECE71A00303AD1B2092904D834
+:101890002B681B0113432B6070E71A00413A052A9D
+:1018A00003D82A68373B1201F4E71A00613A052A87
+:1018B00003D82A68573B1201ECE72C2B03D12B6885
+:1018C00023600023E7E7024A1370FAE7BC0A00200E
+:1018D000610A0020680A0020B40A0020B80A00202B
+:1018E000AC0A0020640A0020C80A0020B00A0020C8
+:1018F0000CED00E0600A00202F1D00003F1D0000DD
+:10190000311D0000C40A0020351D0000391D0000F3
+:101910003B1D00000300F7B5473304001A7840214F
+:1019200003000020FEF792FE002801D10020FEBD3A
+:1019300000232370237901930423E356002BF5DB66
+:101940003F262000019FA51DEB8F37404830C0186F
+:101950003A00611D00F0F0F8E88F019BC01980B2D9
+:10196000B34301D1E887E1E70023EB87DFE7F0B578
+:1019700006000C001F0093B001923F25AC4203DC2F
+:101980002500002F00D140373B0002AA2B431370E3
+:1019900002AB31002A00581C00F0CEF86B46402103
+:1019A0001A7902A80123FEF7D7FE7619641BE4D149
+:1019B00013B0F0BD030010B547331A78043100238B
+:1019C0004830FFF7D4FF10BDF7B50400FFF7A2FFC2
+:1019D000002842D0230048339A88A06C1A80002245
+:1019E00001385A80082865D800F09CF8150523278F
+:1019F000252A483F3800314E300000F0AEF805008F
+:101A0000200031002A004C3000F096F82900200018
+:101A1000FFF7D0FF21E00123E364FF332365802338
+:101A2000DB006365A0235B00A365254B1421E36500
+:101A3000EDE7FEF7D5FC0021E9E7FEF705FDFAE743
+:101A400020000021FFF7B6FF8023206D9B01984204
+:101A500003D321005431FEF783FBF7BD2100626DF3
+:101A6000206D5831FEF747FBE5E72000656D216DDD
+:101A70002A004C30FEF73FFBA900C8E70026636D43
+:101A8000276D0193019BB34201DC5900BFE73D0084
+:101A900000212B001878FEF747FC7B1C0135FF3333
+:101AA00001009D42F5D1230072004C332F00985263
+:101AB0000136E7E701225A80BDE7C046B81C0000A6
+:101AC000882BED6807480622030010B547331A70CB
+:101AD000FFF77AFF04480722030047331A70FFF725
+:101AE00073FF10BDCC0A0020540C002010B5E2B0EA
+:101AF0000400FFF751FDC42200216846520000F0A7
+:101B000024F847236B441C706846FFF75DFFFBE732
+:101B100002B4714649084900095649008E4402BC86
+:101B20007047C04602B4714649084900095C490043
+:101B30008E4402BC7047C046002310B59A4200D1C3
+:101B400010BDCC5CC4540133F8E703008218934203
+:101B500000D1704719700133F9E70023C25C0133EB
+:101B6000002AFBD1581E70474D6963726F63686924
+:101B7000700053414D4432312058706C61696E657C
+:101B8000642050726F0000000CA0800040A0800014
+:101B900044A0800048A0800012011002EF02014022
+:101BA000D804022401420102030100000697FF0944
+:101BB00001A101150026FF00750895400901810269
+:101BC00095400901910295010901B102C000000090
+:101BD00000000000681B0000721B0000500600207F
+:101BE000EB3C905546322055463220000201010060
+:101BF0000240007E3EF83F000100010000000000AE
+:101C0000000000008000294200420053414D443250
+:101C10003158504C000046415431362020203C21A0
+:101C2000646F63747970652068746D6C3E0A3C68FB
+:101C3000746D6C3E3C626F64793E3C736372697094
+:101C4000743E0A6C6F636174696F6E2E7265706C9E
+:101C5000616365282268747470733A2F2F777777E1
+:101C60002E7078742E696F2F22293B0A3C2F7363E4
+:101C7000726970743E3C2F626F64793E3C2F6874C9
+:101C80006D6C3E0A00000000494E464F5F554632DB
+:101C900054585400B81C0000494E44455820202098
+:101CA00048544D001E1C000043555252454E5420CE
+:101CB000554632000000000055463220426F6F74D6
+:101CC0006C6F616465722076332E31362E302D3183
+:101CD000352D6761613532623232205346485752A2
+:101CE0004F0D0A4D6F64656C3A2053414D443231BB
+:101CF0002058706C61696E65642050726F0D0A42E5
+:101D00006F6172642D49443A2053414D4432314A47
+:101D10003138412D58706C61696E65642D50726F59
+:101D20000D0A000000000800003E800200020006CC
+:101D300000580A0D00590A0D005A00230A0D0076BA
+:101D4000312E31205B41726475696E6F3A58595A71
+:101D50005D205365702032382032303234203135E6
+:101D60003A35353A34340A0D000000000100000015
+:101D700001C80000050F3900021810050038B60828
+:101D800034A909A0478BFDA0768815B6650001012E
+:101D9000001C100500DF60DDD88945C74C9CD2656A
+:101DA0009D9E648A9F00000306AA000200000000B6
+:101DB000090299000501008032080B0002020201AD
+:101DC00000090400000102020100052400100104C2
+:101DD00024020605240600010524010301070583EA
+:101DE000030800FF09040100020A00000007058142
+:101DF0000240000007050202400000090402000240
+:101E0000080650000705840240000007050502404F
+:101E10000000090403000203000000092100010082
+:101E20000122210007058603400001070506034043
+:101E300000010904040002FF2A010007058703408E
+:101E4000000107050703400001000000090403002A
+:101E5000020300000300000000C2010000000800AF
+:101E60000A00000000000306AA00080002000400A7
+:101E7000A0001400030057494E55534200000000D3
+:101E80000000000000008400040007002A00440055
+:101E90006500760069006300650049006E0074000B
+:101EA0006500720066006100630065004700550030
+:101EB000490044007300000050007B0039003200EC
+:101EC0004300450036003400360032002D00390052
+:101ED0004300370037002D0034003600460045002F
+:101EE0002D0039003300330042002D003300310053
+:101EF00043004200390043003500420042003300F5
+:101F0000420039007D00000000005342535500009C
+:101F1000000000000000000000800202200000001D
+:101F200000000000000000000000000000000000B1
+:101F30000000000000000000312E303000000000E2
+:101F40000000000000000000000000000000000091
+:101F50000000000000000000000000000000000081
+:101F60000000000000000000000000000000000071
+:101F70000000000000000000000000000000000061
+:101F80000000000000000000000000000000000051
+:101F90000000000000000000000000000000000041
+:101FA0000000000000000000000000000000000031
+:101FB0000000000000000000000000000000000021
+:101FC0000000000000000000000000000000000011
+:101FD0000000000000000000000000000000000001
+:101FE00000000000000000000000000000000000F1
+:101FF00000000000ED1A0000BD150000B81C000034
+:00000001FF

From 4a159d16febeba65b2de52cb05657b9515a9bcae Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 24 Sep 2024 17:09:06 +0200
Subject: [PATCH 1628/3129] samd/boards/SAMD21_XPLAINED_PRO: Use the SPI flash
 for the file system.

The initial settings did not support it.  The change required to add a
dedicated handling of the Adesto 1MByte flash of the XPLAINED PRO board,
which does not support the sfdp feature.

Fixes the ID check of the Adesto/Renesas 1MByte flash.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../SAMD21_XPLAINED_PRO/mpconfigboard.h       |  4 ++
 .../SAMD21_XPLAINED_PRO/mpconfigboard.mk      |  2 +
 .../samd/boards/SAMD21_XPLAINED_PRO/pins.csv  |  4 ++
 ports/samd/samd_spiflash.c                    | 43 ++++++++++++++-----
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
index 064d1ecc0d030..09bad81bb79aa 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
@@ -2,3 +2,7 @@
 #define MICROPY_HW_MCU_NAME   "SAMD21J18A"
 
 #define MICROPY_HW_XOSC32K  (1)
+
+#define MICROPY_HW_SPIFLASH (1)
+#define MICROPY_HW_SPIFLASH_ID (5)
+#define MICROPY_HW_SPIFLASH_BAUDRATE (12000000)
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
index f95c6549381ba..cc43c22cea588 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
@@ -2,3 +2,5 @@ MCU_SERIES = SAMD21
 CMSIS_MCU = SAMD21J18A
 LD_FILES = boards/samd21x18a.ld sections.ld
 TEXT0 = 0x2000
+
+MICROPY_HW_CODESIZE ?= 248K
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
index 69d0c136d08ef..e5327e7916bf0 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
@@ -53,3 +53,7 @@ USB_DP,PA25
 SWCLK,PA30
 SWDIO,PA31
 
+FLASH_MOSI,PB22
+FLASH_MISO,PB16
+FLASH_SCK,PB23
+FLASH_CS,PA13
diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
index cd4f10640dbf1..8ada7e96092c2 100644
--- a/ports/samd/samd_spiflash.c
+++ b/ports/samd/samd_spiflash.c
@@ -45,6 +45,7 @@ const uint8_t _COMMANDS_32BIT[] = {0x13, 0x12, 0x21};  // READ, PROGRAM_PAGE, ER
 
 #define COMMAND_JEDEC_ID (0x9F)
 #define COMMAND_READ_STATUS (0x05)
+#define COMMAND_WRITE_SR1 (0x01)
 #define COMMAND_WRITE_ENABLE (0x06)
 #define COMMAND_READ_SFDP (0x5A)
 #define PAGE_SIZE (256)
@@ -88,7 +89,7 @@ static void wait(spiflash_obj_t *self) {
         mp_hal_pin_write(self->cs, 0);
         spi_transfer((mp_obj_base_t *)self->spi, 2, msg, msg);
         mp_hal_pin_write(self->cs, 1);
-    } while (msg[1] != 0 && timeout-- > 0);
+    } while ((msg[1] & 1) != 0 && timeout-- > 0);
 }
 
 static void get_id(spiflash_obj_t *self, uint8_t id[3]) {
@@ -123,6 +124,17 @@ static void write_enable(spiflash_obj_t *self) {
     mp_hal_pin_write(self->cs, 1);
 }
 
+// Write status register 1
+static void write_sr1(spiflash_obj_t *self, uint8_t value) {
+    uint8_t msg[2];
+    msg[0] = COMMAND_WRITE_SR1;
+    msg[1] = value;
+
+    mp_hal_pin_write(self->cs, 0);
+    spi_transfer(self->spi, 2, msg, NULL);
+    mp_hal_pin_write(self->cs, 1);
+}
+
 static void get_sfdp(spiflash_obj_t *self, uint32_t addr, uint8_t *buffer, int size) {
     uint8_t dummy[1];
     write_addr(self, COMMAND_READ_SFDP, addr);
@@ -155,27 +167,36 @@ static mp_obj_t spiflash_make_new(const mp_obj_type_t *type, size_t n_args, size
     mp_hal_pin_write(self->cs, 1);
 
     wait(self);
-
     // Get the flash size from the device ID (default)
     uint8_t id[3];
     get_id(self, id);
+    bool read_sfdp = true;
+
     if (id[1] == 0x84 && id[2] == 1) {  // Adesto
         self->size = 512 * 1024;
-    } else if (id[1] == 0x1f && id[2] == 1) {  // Atmel / Renesas
+    } else if (id[0] == 0x1f && id[1] == 0x45 && id[2] == 1) {  // Adesto/Renesas 8 MBit
         self->size = 1024 * 1024;
+        read_sfdp = false;
+        self->sectorsize = 4096;
+        self->addr_is_32bit = false;
+        // Globally unlock the sectors, which are locked after power on.
+        write_enable(self);
+        write_sr1(self, 0);
     } else {
         self->size = 1 << id[2];
     }
 
     // Get the addr_is_32bit flag and the sector size
-    uint8_t buffer[128];
-    get_sfdp(self, 0, buffer, 16);  // get the header
-    int len = MIN(buffer[11] * 4, sizeof(buffer));
-    if (len >= 29) {
-        int addr = buffer[12] + (buffer[13] << 8) + (buffer[14] << 16);
-        get_sfdp(self, addr, buffer, len);  // Get the JEDEC mandatory table
-        self->sectorsize = 1 << buffer[28];
-        self->addr_is_32bit = ((buffer[2] >> 1) & 0x03) != 0;
+    if (read_sfdp) {
+        uint8_t buffer[128];
+        get_sfdp(self, 0, buffer, 16);  // get the header
+        int len = MIN(buffer[11] * 4, sizeof(buffer));
+        if (len >= 29) {
+            int addr = buffer[12] + (buffer[13] << 8) + (buffer[14] << 16);
+            get_sfdp(self, addr, buffer, len);  // Get the JEDEC mandatory table
+            self->sectorsize = 1 << buffer[28];
+            self->addr_is_32bit = ((buffer[2] >> 1) & 0x03) != 0;
+        }
     }
     self->commands = self->addr_is_32bit ? _COMMANDS_32BIT : _COMMANDS_24BIT;
 

From ceae0e14946b48f0e4b01669f241e66467bedddc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Nov 2024 10:56:07 +0100
Subject: [PATCH 1629/3129] samd/samd_flash: Make flash read/write methods
 access self parameters.

Use `self` (the first argument) instead of the global `samd_flash_obj` when
accessing the `flash_base` parameter.  This allows there to be multiple
flash objects for various types of filesystem.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/samd_flash.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index ef0de7b6fb585..f68bdf140f490 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -103,7 +103,8 @@ static mp_obj_t samd_flash_version(void) {
 static MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_version_obj, samd_flash_version);
 
 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;
+    samd_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = (mp_obj_get_int(args[1]) * BLOCK_SIZE) + self->flash_base;
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
     if (n_args == 4) {
@@ -118,7 +119,8 @@ static mp_obj_t samd_flash_readblocks(size_t n_args, const mp_obj_t *args) {
 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;
+    samd_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = (mp_obj_get_int(args[1]) * BLOCK_SIZE) + self->flash_base;
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
     if (n_args == 3) {

From cbffe61f96d060ed4af2bde7e3043a3664dc147a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Nov 2024 16:50:03 +0100
Subject: [PATCH 1630/3129] samd/mboot/README.md: Add information about the
 bootloader source.

Includes the LICENSE file of the source and the specific board files
for the Xplained Pro board.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/mboot/LICENSE   | 60 ++++++++++++++++++++++++++++++++++++++
 ports/samd/mboot/README.md |  5 ++++
 2 files changed, 65 insertions(+)
 create mode 100644 ports/samd/mboot/LICENSE
 create mode 100644 ports/samd/mboot/README.md

diff --git a/ports/samd/mboot/LICENSE b/ports/samd/mboot/LICENSE
new file mode 100644
index 0000000000000..7fffbab21e0e6
--- /dev/null
+++ b/ports/samd/mboot/LICENSE
@@ -0,0 +1,60 @@
+The MIT License (MIT)
+
+Copyright (c) Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Third Party Programs: The software may include third party programs that
+Microsoft, not the third party, licenses to you under this agreement.
+Notices, if any, for the third party programs are included for your
+information only.
+
+
+
+Otherwise, where noted:
+
+/* ----------------------------------------------------------------------------
+ *         SAM Software Package License
+ * ----------------------------------------------------------------------------
+ * Copyright (c) 2011-2014, Atmel Corporation
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following condition is met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the disclaimer below.
+ *
+ * Atmel's name may not be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL ATMEL 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.
+ * ----------------------------------------------------------------------------
+ */
+
diff --git a/ports/samd/mboot/README.md b/ports/samd/mboot/README.md
new file mode 100644
index 0000000000000..1695f0a891126
--- /dev/null
+++ b/ports/samd/mboot/README.md
@@ -0,0 +1,5 @@
+The SAMD Xplained Pro bootloader is built using the files from the
+repository https://github.com/adafruit/uf2-samdx1. The repository
+includes the LICENSE file https://github.com/adafruit/uf2-samdx1/LICENSE
+and a README https://github.com/adafruit/uf2-samdx1/README.md with
+build instructions.

From 0e7c3901b897a1edd53b56b6119f2d4119e88842 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 2 Oct 2024 19:16:39 +1000
Subject: [PATCH 1631/3129] docs: Add a "Reset and Boot Sequence" reference
 page.

Previously individual ports documented these aspects to varying degrees,
but most of the information is common to all ports.

In particular, this adds a canonical explanation of `boot.py` and
`main.py`.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp8266/general.rst                      |  35 +--
 docs/esp8266/quickref.rst                     |   8 +-
 docs/library/builtins.rst                     |   4 +
 docs/library/machine.RTC.rst                  |   2 +-
 docs/library/machine.USBDevice.rst            |  12 +-
 docs/library/machine.rst                      |   9 +-
 docs/library/pyb.rst                          |  13 +-
 docs/pyboard/tutorial/reset.rst               |   2 +
 docs/reference/index.rst                      |   1 +
 docs/reference/mpremote.rst                   |   6 +-
 docs/reference/repl.rst                       |   9 +-
 docs/reference/reset_boot.rst                 | 260 ++++++++++++++++++
 docs/renesas-ra/tutorial/program_in_flash.rst |   2 +
 docs/renesas-ra/tutorial/reset.rst            |  20 +-
 docs/wipy/tutorial/reset.rst                  |   2 +
 15 files changed, 311 insertions(+), 74 deletions(-)
 create mode 100644 docs/reference/reset_boot.rst

diff --git a/docs/esp8266/general.rst b/docs/esp8266/general.rst
index be0437e752eed..d7211aa5ab745 100644
--- a/docs/esp8266/general.rst
+++ b/docs/esp8266/general.rst
@@ -74,40 +74,7 @@ as possible after use.
 Boot process
 ------------
 
-On boot, MicroPython EPS8266 port executes ``_boot.py`` script from internal
-frozen modules. It mounts filesystem in FlashROM, or if it's not available,
-performs first-time setup of the module and creates the filesystem. This
-part of the boot process is considered fixed, and not available for customization
-for end users (even if you build from source, please refrain from changes to
-it; customization of early boot process is available only to advanced users
-and developers, who can diagnose themselves any issues arising from
-modifying the standard process).
-
-Once the filesystem is mounted, ``boot.py`` is executed from it. The standard
-version of this file is created during first-time module set up and has
-commands to start a WebREPL daemon (disabled by default, configurable
-with ``webrepl_setup`` module), etc. This
-file is customizable by end users (for example, you may want to set some
-parameters or add other services which should be run on
-a module start-up). But keep in mind that incorrect modifications to boot.py
-may still lead to boot loops or lock ups, requiring to reflash a module
-from scratch. (In particular, it's recommended that you use either
-``webrepl_setup`` module or manual editing to configure WebREPL, but not
-both).
-
-As a final step of boot procedure, ``main.py`` is executed from filesystem,
-if exists. This file is a hook to start up a user application each time
-on boot (instead of going to REPL). For small test applications, you may
-name them directly as ``main.py``, and upload to module, but instead it's
-recommended to keep your application(s) in separate files, and have just
-the following in ``main.py``::
-
-    import my_app
-    my_app.main()
-
-This will allow to keep the structure of your application clear, as well as
-allow to install multiple applications on a board, and switch among them.
-
+See :doc:`/reference/reset_boot`.
 
 Known Issues
 ------------
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 6f02da95d89d2..635f1f834bb60 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -163,10 +163,10 @@ 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
+If there are no objects in any of the dupterm slots when the REPL is started (on
+:doc:`hard or soft reset </reference/reset_boot>`) 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::
diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index e489375b1f917..88b1fbcfe4a41 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -170,6 +170,10 @@ Exceptions
 
 .. exception:: KeyboardInterrupt
 
+   |see_cpython| `python:KeyboardInterrupt`.
+
+   See also in the context of :ref:`soft_bricking`.
+
 .. exception:: KeyError
 
 .. exception:: MemoryError
diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index fcd78f1c39863..ad0b0759efe5e 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -83,7 +83,7 @@ Methods
    a `bytes` object.
 
    Data written to RTC user memory is persistent across restarts, including
-   `machine.soft_reset()` and `machine.deepsleep()`.
+   :ref:`soft_reset` and `machine.deepsleep()`.
 
    The maximum length of RTC user memory is 2048 bytes by default on esp32,
    and 492 bytes on esp8266.
diff --git a/docs/library/machine.USBDevice.rst b/docs/library/machine.USBDevice.rst
index a47fda2a28d35..5c18c49a75bb5 100644
--- a/docs/library/machine.USBDevice.rst
+++ b/docs/library/machine.USBDevice.rst
@@ -32,10 +32,10 @@ Managing a runtime USB interface can be tricky, especially if you are communicat
 with MicroPython over a built-in USB-CDC serial port that's part of the same USB
 device.
 
-- A MicroPython soft reset will always clear all runtime USB interfaces, which
-  results in the entire USB device disconnecting from the host. If MicroPython
-  is also providing a built-in USB-CDC serial port then this will re-appear
-  after the soft reset.
+- A MicroPython :ref:`soft reset <soft_reset>` will always clear all runtime USB
+  interfaces, which results in the entire USB device disconnecting from the
+  host. If MicroPython is also providing a built-in USB-CDC serial port then
+  this will re-appear after the soft reset.
 
   This means some functions (like ``mpremote run``) that target the USB-CDC
   serial port will immediately fail if a runtime USB interface is active,
@@ -44,9 +44,9 @@ device.
   no more runtime USB interface.
 
 - To configure a runtime USB device on every boot, it's recommended to place the
-  configuration code in the ``boot.py`` file on the :ref:`device VFS
+  configuration code in the :ref:`boot.py` file on the :ref:`device VFS
   <filesystem>`. On each reset this file is executed before the USB subsystem is
-  initialised (and before ``main.py``), so it allows the board to come up with the runtime
+  initialised (and before :ref:`main.py`), so it allows the board to come up with the runtime
   USB device immediately.
 
 - For development or debugging, it may be convenient to connect a hardware
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 7d2eb26a7ea34..76d111f11ef3d 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -62,14 +62,13 @@ Reset related functions
 
 .. function:: reset()
 
-   Resets the device in a manner similar to pushing the external RESET
-   button.
+   :ref:`Hard resets <hard_reset>` the device in a manner similar to pushing the
+   external RESET button.
 
 .. function:: soft_reset()
 
-   Performs a soft reset of the interpreter, deleting all Python objects and
-   resetting the Python heap.  It tries to retain the method by which the user
-   is connected to the MicroPython REPL (eg serial, USB, Wifi).
+   Performs a :ref:`soft reset <soft_reset>` of the interpreter, deleting all
+   Python objects and resetting the Python heap.
 
 .. function:: reset_cause()
 
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index f169a77f3a6ca..5eb75c22b608d 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -147,10 +147,10 @@ Power related functions
    (internal oscillator) directly.  The higher frequencies use the HSE to
    drive the PLL (phase locked loop), and then use the output of the PLL.
 
-   Note that if you change the frequency while the USB is enabled then
-   the USB may become unreliable.  It is best to change the frequency
-   in boot.py, before the USB peripheral is started.  Also note that sysclk
-   frequencies below 36MHz do not allow the USB to function correctly.
+   Note that if you change the frequency while the USB is enabled then the USB
+   may become unreliable. It is best to change the frequency in :ref:`boot.py`,
+   before the USB peripheral is started. Also note that sysclk frequencies below
+   36MHz do not allow the USB to function correctly.
 
 .. function:: wfi()
 
@@ -205,8 +205,9 @@ Miscellaneous functions
 
 .. function:: main(filename)
 
-   Set the filename of the main script to run after boot.py is finished.  If
-   this function is not called then the default file main.py will be executed.
+   Set the filename of the main script to run after :ref:`boot.py` is finished.
+   If this function is not called then the default file :ref:`main.py` will be
+   executed.
 
    It only makes sense to call this function from within boot.py.
 
diff --git a/docs/pyboard/tutorial/reset.rst b/docs/pyboard/tutorial/reset.rst
index 59a3cd82ae1a7..ad56995c60dd7 100644
--- a/docs/pyboard/tutorial/reset.rst
+++ b/docs/pyboard/tutorial/reset.rst
@@ -10,6 +10,8 @@ execution of ``boot.py`` and ``main.py`` and gives default USB settings.
 If you have problems with the filesystem you can do a factory reset,
 which restores the filesystem to its original state.
 
+For more information, see :doc:`/reference/reset_boot`.
+
 Safe mode
 ---------
 
diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 98f6b65737699..1558c0fdfa9b6 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
+   reset_boot.rst
    mpremote.rst
    mpyfiles.rst
    isr_rules.rst
diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index b47ec76c98efe..d4c6983595fec 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -547,9 +547,9 @@ device at ``/dev/ttyACM1``, printing each result.
 
   mpremote resume exec "print_state_info()" soft-reset
 
-Connect to the device without triggering a soft reset and execute the
-``print_state_info()`` function (e.g. to find out information about the current
-program state), then trigger a soft reset.
+Connect to the device without triggering a :ref:`soft reset <soft_reset>` and
+execute the ``print_state_info()`` function (e.g. to find out information about
+the current program state), then trigger a soft reset.
 
 .. code-block:: bash
 
diff --git a/docs/reference/repl.rst b/docs/reference/repl.rst
index 55f76ee1a03b9..be02ddebde8e2 100644
--- a/docs/reference/repl.rst
+++ b/docs/reference/repl.rst
@@ -143,10 +143,12 @@ the auto-indent feature, and changes the prompt from ``>>>`` to ``===``. For exa
 Paste Mode allows blank lines to be pasted. The pasted text is compiled as if
 it were a file. Pressing Ctrl-D exits paste mode and initiates the compilation.
 
+.. _repl_soft_reset:
+
 Soft reset
 ----------
 
-A soft reset will reset the python interpreter, but tries not to reset the
+A :ref:`soft_reset` will reset the python interpreter, but tries not to reset the
 method by which you're connected to the MicroPython board (USB-serial, or Wifi).
 
 You can perform a soft reset from the REPL by pressing Ctrl-D, or from your python
@@ -182,6 +184,9 @@ variables no longer exist:
     ['__name__', 'pyb']
     >>>
 
+For more information about reset types and the startup process, see
+:doc:`/reference/reset_boot`.
+
 The special variable _ (underscore)
 -----------------------------------
 
@@ -196,6 +201,8 @@ So you can use the underscore to save the result in a variable. For example:
     15
     >>>
 
+.. _raw_repl:
+
 Raw mode and raw-paste mode
 ---------------------------
 
diff --git a/docs/reference/reset_boot.rst b/docs/reference/reset_boot.rst
new file mode 100644
index 0000000000000..7c0d5f334a6e8
--- /dev/null
+++ b/docs/reference/reset_boot.rst
@@ -0,0 +1,260 @@
+Reset and Boot Sequence
+=======================
+
+A device running MicroPython follows a particular boot sequence to start up and
+initialise itself after a reset.
+
+.. _hard_reset:
+
+Hard reset
+----------
+
+Booting from hard reset is what happens when a board is first powered up, a cold
+boot. This is a complete reset of the MCU hardware.
+
+The MicroPython port code initialises all essential hardware (including embedded
+clocks and power regulators, internal serial UART, etc), and then starts the
+MicroPython environment. Existing :doc:`RTC </library/machine.RTC>`
+configuration may be retained after a hard reset, but all other hardware state
+is cleared.
+
+The same hard reset boot sequence can be triggered by a number of events such as:
+
+- Python code executing :func:`machine.reset()`.
+- User presses a physical Reset button on the board (where applicable).
+- Waking from deep sleep (on most ports).
+- MCU hardware watchdog reset.
+- MCU hardware brown out detector.
+
+The details of hardware-specific reset triggers depend on the port and
+associated hardware. The :func:`machine.reset_cause()` function can be used to
+further determine the cause of a reset.
+
+.. _soft_reset:
+
+Soft Reset
+----------
+
+When MicroPython is already running, it's possible to trigger a soft reset by
+:ref:`typing Ctrl-D in the REPL <repl_soft_reset>` or executing
+:func:`machine.soft_reset()`.
+
+A soft reset clears the Python interpreter, frees all Python memory, and starts
+the MicroPython environment again.
+
+State which is cleared by a soft reset includes:
+
+- All Python variables, objects, imported modules, etc.
+- Most peripherals configured using the :doc:`machine module
+  </library/machine>`. There are very limited exceptions, for example
+  :doc:`machine.Pin </library/machine.Pin>` modes (i.e. if a pin is input or
+  output, high or low) are not reset on most ports. More advanced configuration
+  such as :func:`Pin.irq()` is always reset.
+- Bluetooth.
+- Network sockets. Open TCP sockets are closed cleanly with respect to the other party.
+- Open files. The filesystem is left in a valid state.
+
+Some system state remains the same after a soft reset, including:
+
+- Any existing network connections (Ethernet, Wi-Fi, etc) remain active at the
+  IP Network layer. Querying the :doc:`network interface from code
+  </library/network>` may indicate the network interface is still active with a
+  configured IP address, etc.
+- An active :doc:`REPL <repl>` appears continuous before and after soft reset,
+  except in some unusual cases:
+
+  * If the :ref:`machine.USBDevice <machine.USBDevice>` class has been used to
+    create a custom USB interface then any built-in USB serial device will
+    appear to disconnect and reconnect as the custom USB interface must be
+    cleared during reset.
+  * A serial UART REPL will restore its default hardware configuration (baud
+    rate, etc).
+
+- CPU clock speed is usually not changed by a soft reset.
+- :doc:`RTC </library/machine.RTC>` configuration (i.e. setting of the current
+  time) is not changed by soft reset.
+
+.. _boot_sequence:
+
+Boot Sequence
+-------------
+
+When MicroPython boots following either a hard or soft reset, it follows this
+boot sequence in order:
+
+_boot.py
+^^^^^^^^
+
+This is an internal script :doc:`frozen into the MicroPython firmware
+<manifest>`. It is provided by MicroPython on many ports to do essential
+initialisation.
+
+For example, on most ports ``_boot.py`` will detect the first boot of a new
+device and format the :doc:`internal flash filesystem <filesystem>` ready for
+use.
+
+Unless you're creating a custom MicroPython build or adding a new port then you
+probably don't need to worry about ``_boot.py``. It's best not to change the
+contents unless you really know what you're doing.
+
+.. _boot.py:
+
+boot.py
+^^^^^^^
+
+A file named ``boot.py`` can be copied to the board's internal :ref:`filesystem
+<filesystem>` using :doc:`mpremote <mpremote>`.
+
+If ``boot.py`` is found then it is executed. You can add code in ``boot.py`` to
+perform custom one-off initialisation (for example, to configure the board's
+hardware).
+
+A common practice is to configure a board's network connection in ``boot.py`` so
+that it's always available after reset for use with the :doc:`REPL <repl>`,
+:doc:`mpremote <mpremote>`, etc.
+
+.. warning:: boot.py should always exit and not run indefinitely.
+
+   Depending on the port, some hardware initialisation is delayed until after
+   ``boot.py`` exits. This includes initialising USB on the stm32 port and all
+   ports which support :ref:`machine.USBDevice <machine.USBDevice>`. On these
+   ports, output printed from ``boot.py`` may not be visible on the built-in USB
+   serial port until after ``boot.py`` finishes running.
+
+   The purpose of this late initialisation is so that it's possible to
+   pre-configure particular hardware in ``boot.py``, and then have it start with
+   the correct configuration.
+
+.. note:: It is sometimes simpler to not have a ``boot.py`` file and place any
+          initialisation code at the top of ``main.py`` instead.
+
+.. _main.py:
+
+main.py
+^^^^^^^
+
+Similar to ``boot.py``, a file named ``main.py`` can be copied to the board's
+internal :ref:`filesystem <filesystem>`. If found then it is executed next in the
+startup process.
+
+``main.py`` is for any Python code that you want to run each time your device
+starts.
+
+Some tips for ``main.py`` usage:
+
+- ``main.py`` doesn't have to exit, feel free to put an infinite ``while
+  True`` loop in there.
+- For complex Python applications then you don't need to put all your
+  code in ``main.py``. ``main.py`` can be a simple entry point that
+  imports your application and starts execution::
+
+        import my_app
+        my_app.main()
+
+  This can help keep the structure of your application clear. It also makes
+  it easy to install multiple applications on a board and switch among them.
+- It's good practice when writing robust apps to wrap code in ``main.py`` with an
+  exception handler to take appropriate action if the code crashes. For example::
+
+        import machine, sys
+        import my_app
+        try:
+            my_app.main()
+        except Exception as e:
+            print("Fatal error in main:")
+            sys.print_exception(e)
+
+        # Following a normal Exception or main() exiting, reset the board.
+        # Following a non-Exception error such as KeyboardInterrupt (Ctrl-C),
+        # this code will drop to a REPL. Place machine.reset() in a finally
+        # block to always reset, instead.
+        machine.reset()
+
+  Otherwise MicroPython will drop to the REPL following any crash or if main
+  exits (see below).
+
+- Any global variables that were set in ``boot.py`` will still be set in the
+  global context of ``main.py``.
+
+- To fully optimise flash usage and memory consumption, you can copy
+  :doc:`pre-compiled <mpyfiles>` ``main.mpy`` and/or ``boot.mpy`` files to the
+  filesystem, or even :doc:`freeze <manifest>` them into the firmware build
+  instead.
+- ``main.py`` execution is skipped when a soft reset is initiated from :ref:`raw
+  REPL mode <raw_repl>` (for example, when :doc:`mpremote <mpremote>` or another
+  program is interacting directly with MicroPython).
+
+Interactive Interpreter (REPL)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If ``main.py`` is not found, or if ``main.py`` exits, then :doc:`repl`
+will start immediately.
+
+.. note:: Even if ``main.py`` contains an infinite loop, typing Ctrl-C on the
+          REPL serial port will inject a `KeyboardInterrupt`. If no exception
+          handler catches it then ``main.py`` will exit and the REPL will start.
+
+Any global variables that were set in ``boot.py`` and ``main.py`` will still be
+set in the global context of the REPL.
+
+The REPL continues executing until Python code triggers a hard or soft reset.
+
+.. _soft_bricking:
+
+Soft Bricking (failure to boot)
+---------------------------------
+
+It is rare but possible for MicroPython to become unresponsive during startup, a
+state sometimes called "soft bricked". For example:
+
+- If ``boot.py`` execution gets stuck and the native USB serial port
+  never initialises.
+- If Python code reconfigures the REPL interface, making it inaccessible.
+
+Rest assured, recovery is possible!
+
+KeyboardInterrupt
+^^^^^^^^^^^^^^^^^
+
+In many cases, opening the REPL serial port and typing ``Ctrl-C`` will inject
+`KeyboardInterrupt` and may cause the running script to exit and a REPL to
+start. From the REPL, you can use :func:`os.remove()` to remove the misbehaving
+Python file::
+
+    import os
+    os.remove('main.py')
+
+To confirm which files are still present in the internal filesystem::
+
+    import os
+    os.listdir()
+
+Safe Mode and Factory Reset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you're unable to easily access the REPL then you may need to perform one of
+two processes:
+
+1. "Safe mode" boot, which skips ``boot.py`` and ``main.py`` and immediately
+   starts a REPL, allowing you to clean up. This is only supported on some ports.
+2. Factory Reset to erase the entire contents of the flash filesystem. This may
+   also be necessary if the internal flash filesystem has become corrupted
+   somehow.
+
+The specific process(es) are different on each port:
+
+- :doc:`pyboard and stm32 port instructions </pyboard/tutorial/reset>`
+- :doc:`renesas-ra port instructions </renesas-ra/tutorial/reset>`
+- :doc:`wipy port instructions </wipy/tutorial/reset>`
+
+For ports without specific instructions linked above, the factory reset process
+involves erasing the board's entire flash and then flashing MicroPython again
+from scratch. Usually this will involve the same tool(s) that were originally
+used to install MicroPython. Consult the installation docs for your board, or
+ask on the `GitHub Discussions`_ if you're not sure.
+
+.. warning:: Re-flashing the MicroPython firmware without erasing the entire
+             flash first will usually not recover from soft bricking, as a
+             firmware update usually preserves the contents of the filesystem.
+
+.. _GitHub Discussions: https://github.com/orgs/micropython/discussions
diff --git a/docs/renesas-ra/tutorial/program_in_flash.rst b/docs/renesas-ra/tutorial/program_in_flash.rst
index 99a7a3839dd46..985ce6c7fe661 100644
--- a/docs/renesas-ra/tutorial/program_in_flash.rst
+++ b/docs/renesas-ra/tutorial/program_in_flash.rst
@@ -28,6 +28,8 @@ 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
 
+See :doc:`/reference/reset_boot` for more information.
+
 Write a program in the internal file system
 -------------------------------------------
 
diff --git a/docs/renesas-ra/tutorial/reset.rst b/docs/renesas-ra/tutorial/reset.rst
index de5f4db91b3e0..8799796479560 100644
--- a/docs/renesas-ra/tutorial/reset.rst
+++ b/docs/renesas-ra/tutorial/reset.rst
@@ -20,6 +20,8 @@ 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.
 
+For more details, see :doc:`/reference/reset_boot`.
+
 boot mode
 ---------
 
@@ -29,7 +31,9 @@ There are 3 boot modes:
   * safe boot mode
   * factory filesystem boot mode
 
-boot.py and main.py are executed on "normal boot mode".
+boot.py and main.py are executed on "normal boot mode". See :ref:`boot_sequence`.
+
+The other modes can be used to recover from :ref:`soft_bricking`:
 
 boot.py and main.py are *NOT* executed on "safe boot mode".
 
@@ -46,16 +50,4 @@ on the board:
 
 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()
-
+the execution of main.py.
diff --git a/docs/wipy/tutorial/reset.rst b/docs/wipy/tutorial/reset.rst
index 1715d3e29788d..fc56429b81a3f 100644
--- a/docs/wipy/tutorial/reset.rst
+++ b/docs/wipy/tutorial/reset.rst
@@ -16,6 +16,8 @@ There are soft resets and hard resets.
         import machine
         machine.reset()
 
+For more information, see :doc:`/reference/reset_boot`.
+
 Safe boot
 ---------
 

From 9361a9f50af1e0b657eed270df6556ec253ddaeb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 3 Oct 2024 09:28:53 +1000
Subject: [PATCH 1632/3129] docs/rp2: Add a small factory reset page.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/reference/reset_boot.rst |  1 +
 docs/rp2/tutorial/intro.rst   |  1 +
 docs/rp2/tutorial/reset.rst   | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 docs/rp2/tutorial/reset.rst

diff --git a/docs/reference/reset_boot.rst b/docs/reference/reset_boot.rst
index 7c0d5f334a6e8..f6307c08cdfb3 100644
--- a/docs/reference/reset_boot.rst
+++ b/docs/reference/reset_boot.rst
@@ -245,6 +245,7 @@ The specific process(es) are different on each port:
 
 - :doc:`pyboard and stm32 port instructions </pyboard/tutorial/reset>`
 - :doc:`renesas-ra port instructions </renesas-ra/tutorial/reset>`
+- :doc:`rp2 port instructions </rp2/tutorial/reset>`
 - :doc:`wipy port instructions </wipy/tutorial/reset>`
 
 For ports without specific instructions linked above, the factory reset process
diff --git a/docs/rp2/tutorial/intro.rst b/docs/rp2/tutorial/intro.rst
index 69c3e6b0a54ae..2d2990105dba0 100644
--- a/docs/rp2/tutorial/intro.rst
+++ b/docs/rp2/tutorial/intro.rst
@@ -8,4 +8,5 @@ Let's get started!
 .. toctree::
     :maxdepth: 1
 
+    reset.rst
     pio.rst
diff --git a/docs/rp2/tutorial/reset.rst b/docs/rp2/tutorial/reset.rst
new file mode 100644
index 0000000000000..3c296ec46ee18
--- /dev/null
+++ b/docs/rp2/tutorial/reset.rst
@@ -0,0 +1,18 @@
+Factory reset
+=============
+
+If something unexpected happens and your RP2xxx-based board no longer boots
+MicroPython, then you may have to factory reset it. For more details, see
+:ref:`soft_bricking`.
+
+Factory resetting the MicroPython rp2 port involves fully erasing the flash and
+resetting the flash memory, so you will need to re-flash the MicroPython
+firmware afterwards and copy any Python files to the filesystem again.
+
+1. Follow the instructions on the Raspberry Pi website for `resetting flash
+   memory`_.
+2. Copy the MicroPython .uf2 firmware file to your board. If needed, this file
+   can be found on the `MicroPython downloads page`_.
+
+.. _resetting flash memory: https://www.raspberrypi.com/documentation/microcontrollers/pico-series.html#resetting-flash-memory
+.. _MicroPython downloads page: https://micropython.org/download/?port=rp2

From a23277e3b0400b6b5ca6ce3d88e3a38859754a4e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 3 Oct 2024 09:42:13 +1000
Subject: [PATCH 1633/3129] docs/esp32: Add a factory reset page.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/tutorial/index.rst |  1 +
 docs/esp32/tutorial/intro.rst |  2 ++
 docs/esp32/tutorial/reset.rst | 25 +++++++++++++++++++++++++
 docs/reference/reset_boot.rst |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 docs/esp32/tutorial/reset.rst

diff --git a/docs/esp32/tutorial/index.rst b/docs/esp32/tutorial/index.rst
index c6242d731f180..2435f2ecd2f59 100644
--- a/docs/esp32/tutorial/index.rst
+++ b/docs/esp32/tutorial/index.rst
@@ -21,3 +21,4 @@ to `<https://www.python.org>`__.
    intro.rst
    pwm.rst
    peripheral_access.rst
+   reset.rst
diff --git a/docs/esp32/tutorial/intro.rst b/docs/esp32/tutorial/intro.rst
index be09599871ce6..cf4d0bcbd2f55 100644
--- a/docs/esp32/tutorial/intro.rst
+++ b/docs/esp32/tutorial/intro.rst
@@ -50,6 +50,8 @@ features, there are daily builds.  If your board has SPIRAM support you can
 use either the standard firmware or the firmware with SPIRAM support, and in
 the latter case you will have access to more RAM for Python objects.
 
+.. _esp32_flashing:
+
 Deploying the firmware
 ----------------------
 
diff --git a/docs/esp32/tutorial/reset.rst b/docs/esp32/tutorial/reset.rst
new file mode 100644
index 0000000000000..b3fc6a85bd436
--- /dev/null
+++ b/docs/esp32/tutorial/reset.rst
@@ -0,0 +1,25 @@
+Factory reset
+=============
+
+If something unexpected happens and your ESP32-based board no longer boots
+MicroPython, then you may have to factory reset it. For more details, see
+:ref:`soft_bricking`.
+
+Factory resetting the MicroPython esp32 port involves fully erasing the flash
+and resetting the flash memory, so you will need to re-flash the MicroPython
+firmware afterwards and copy any Python files to the filesystem again.
+
+1. You will need the Espressif `esptool`_ installed on your system. This is the
+   same tool that you may have used to initially install MicroPython on your
+   board (see :ref:`installation instructions <esp32_flashing>`).
+2. Find the serial port name of your board, and then use esptool to erase the
+   entire flash contents::
+
+       esptool.py -p PORTNAME erase_flash
+
+3. Use esptool to flash the MicroPython file to your board again. If needed,
+   this file and flashing instructions can be found on the `MicroPython
+   downloads page`_.
+
+.. _esptool: https://github.com/espressif/esptool
+.. _MicroPython downloads page: https://micropython.org/download/?port=esp32
diff --git a/docs/reference/reset_boot.rst b/docs/reference/reset_boot.rst
index f6307c08cdfb3..4772d02dd1e32 100644
--- a/docs/reference/reset_boot.rst
+++ b/docs/reference/reset_boot.rst
@@ -244,6 +244,7 @@ two processes:
 The specific process(es) are different on each port:
 
 - :doc:`pyboard and stm32 port instructions </pyboard/tutorial/reset>`
+- :doc:`esp32 port instructions </esp32/tutorial/reset>`
 - :doc:`renesas-ra port instructions </renesas-ra/tutorial/reset>`
 - :doc:`rp2 port instructions </rp2/tutorial/reset>`
 - :doc:`wipy port instructions </wipy/tutorial/reset>`

From c5d74fe46876767cc43d7d23d949d0f7c3dcd6bd Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 8 Oct 2024 14:41:44 +1100
Subject: [PATCH 1634/3129] docs/library: Note link between
 machine.soft_reset() and sys.exit().

This is currently an implementation detail of MicroPython rather than by
design.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/builtins.rst | 6 ++++++
 docs/library/sys.rst      | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 88b1fbcfe4a41..5956aea7ab20f 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -194,6 +194,12 @@ Exceptions
 
     |see_cpython| `python:SystemExit`.
 
+    On non-embedded ports (i.e. Windows and Unix), an unhandled ``SystemExit``
+    exits the MicroPython process in a similar way to CPython.
+
+    On embedded ports, an unhandled ``SystemExit`` currently causes a
+    :ref:`soft_reset` of MicroPython.
+
 .. exception:: TypeError
 
     |see_cpython| `python:TypeError`.
diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index 7b34a0e31c6bf..c72214c13108e 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -12,9 +12,12 @@ Functions
 .. function:: exit(retval=0, /)
 
    Terminate current program with a given exit code. Underlyingly, this
-   function raise as `SystemExit` exception. If an argument is given, its
+   function raises a `SystemExit` exception. If an argument is given, its
    value given as an argument to `SystemExit`.
 
+   On embedded ports (i.e. all ports but Windows and Unix), an unhandled
+   `SystemExit` currently causes a :ref:`soft_reset` of MicroPython.
+
 .. function:: atexit(func)
 
    Register *func* to be called upon termination.  *func* must be a callable

From c1b8e65c8e216ce2e90933aef6772de46ad54407 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Nov 2024 12:24:21 +1100
Subject: [PATCH 1635/3129] docs: Change copyright line to mention "authors and
 contributors".

The docs have been authored by many people now.  Instead of singling out
individuals in the copyright line, prefer to mention all "MicroPython
authors and contributors".

Individual contributions can still be discovered via the git history.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 32cc2be10e343..e5c6ba98090af 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,6 +36,9 @@
     "is_release": micropy_version != "latest",
 }
 
+# Authors used in various parts of the documentation.
+micropy_authors = "MicroPython authors and contributors"
+
 
 # -- General configuration ------------------------------------------------
 
@@ -68,7 +71,7 @@
 
 # General information about the project.
 project = "MicroPython"
-copyright = "- The MicroPython Documentation is Copyright © 2014-2024, Damien P. George, Paul Sokolovsky, and contributors"
+copyright = "- The MicroPython Documentation is Copyright © 2014-2024, " + micropy_authors
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -244,7 +247,7 @@
         master_doc,
         "MicroPython.tex",
         "MicroPython Documentation",
-        "Damien P. George, Paul Sokolovsky, and contributors",
+        micropy_authors,
         "manual",
     ),
 ]
@@ -281,7 +284,7 @@
         "index",
         "micropython",
         "MicroPython Documentation",
-        ["Damien P. George, Paul Sokolovsky, and contributors"],
+        [micropy_authors],
         1,
     ),
 ]
@@ -300,7 +303,7 @@
         master_doc,
         "MicroPython",
         "MicroPython Documentation",
-        "Damien P. George, Paul Sokolovsky, and contributors",
+        micropy_authors,
         "MicroPython",
         "One line description of project.",
         "Miscellaneous",

From f562aa1291ad44605f6b5be75b325a40a208ec41 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Nov 2024 18:14:47 +1100
Subject: [PATCH 1636/3129] extmod/network_cyw43: Fix isconnected() result on
 AP interface.

This function is documented to return True if any stations are connected to
the AP. Without this fix it returns True whenever the driver has brought
the AP interface up.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/network_cyw43.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 3066cac75d3b7..891e945de5118 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -311,7 +311,17 @@ static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_disconnect_obj, network_cyw43_dis
 
 static mp_obj_t network_cyw43_isconnected(mp_obj_t self_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf) == 3);
+    bool result = (cyw43_tcpip_link_status(self->cyw, self->itf) == CYW43_LINK_UP);
+
+    if (result && self->itf == CYW43_ITF_AP) {
+        // For AP we need to not only know if the link is up, but also if any stations
+        // have associated.
+        uint8_t mac_buf[6];
+        int num_stas = 1;
+        cyw43_wifi_ap_get_stas(self->cyw, &num_stas, mac_buf);
+        result = num_stas > 0;
+    }
+    return mp_obj_new_bool(result);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_isconnected_obj, network_cyw43_isconnected);
 

From af743eaf59196e9133bd3c6de53cae1bb6c9a59a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Nov 2024 11:26:34 +1100
Subject: [PATCH 1637/3129] extmod/network_cyw43: Fix uninitialised variable in
 status('stations').

The `num_stas` was uninitialised and if it happened to take the value 0
then no results were returned.  It now has the correct maximum value.

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

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 891e945de5118..cebc8deb0da91 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -361,13 +361,15 @@ static mp_obj_t network_cyw43_status(size_t n_args, const mp_obj_t *args) {
             if (self->itf != CYW43_ITF_AP) {
                 mp_raise_ValueError(MP_ERROR_TEXT("AP required"));
             }
-            int num_stas;
-            uint8_t macs[32 * 6];
+            static const unsigned mac_len = 6;
+            static const unsigned max_stas = 32;
+            int num_stas = max_stas;
+            uint8_t macs[max_stas * mac_len];
             cyw43_wifi_ap_get_stas(self->cyw, &num_stas, macs);
             mp_obj_t list = mp_obj_new_list(num_stas, NULL);
             for (int i = 0; i < num_stas; ++i) {
                 mp_obj_t tuple[1] = {
-                    mp_obj_new_bytes(&macs[i * 6], 6),
+                    mp_obj_new_bytes(&macs[i * mac_len], mac_len),
                 };
                 ((mp_obj_list_t *)MP_OBJ_TO_PTR(list))->items[i] = mp_obj_new_tuple(1, tuple);
             }

From 181800eebde2f3dbda2862c175150d884eef728d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Nov 2024 18:04:59 +1100
Subject: [PATCH 1638/3129] extmod/network_cyw43: Allow configuring active AP
 interface.

Configuring the AP for cyw43 writes to some buffers that are only sent to
the modem when the interface is brought up. This means you can't configure
the AP after calling active(True), the new settings seem to be accepted but
the radio doesn't change.

This is different to the WLAN behaviour on other ports. The esp8266 port
requires calling active(True) on the AP before configuring, even.

Fix this by bouncing the AP interface after a config change, if it's
active. Configuring with active(False) still works the same as before.

Adds a static variable to track interface active state, rather than relying
on the LWIP interface state. This is because the interface state is updated
by a driver callback and there's a race: if code calls active(True) and
then config(a=b) then the driver doesn't know it's active yet and the
changes aren't correctly applied.

It is possible this pattern will cause the AP to come up briefly with the
default "PICOabcd" SSID before being reconfigured, however (due to the
aforementioned race condition) it seems like this may not happen at all
before the new config is applied.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/network_cyw43.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index cebc8deb0da91..02b022cb81327 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -60,6 +60,10 @@ typedef struct _network_cyw43_obj_t {
 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 };
 
+// Avoid race conditions with callbacks by tracking the last up or down request
+// we have made for each interface.
+static bool if_active[2];
+
 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);
     struct netif *netif = &self->cyw->netif[self->itf];
@@ -122,6 +126,10 @@ static MP_DEFINE_CONST_FUN_OBJ_3(network_cyw43_ioctl_obj, network_cyw43_ioctl);
 /*******************************************************************************/
 // network API
 
+static uint32_t get_country_code(void) {
+    return CYW43_COUNTRY(mod_network_country_code[0], mod_network_country_code[1], 0);
+}
+
 static mp_obj_t network_cyw43_deinit(mp_obj_t self_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
     cyw43_deinit(self->cyw);
@@ -132,10 +140,11 @@ static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_deinit_obj, network_cyw43_deinit)
 static mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
-        return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf));
+        return mp_obj_new_bool(if_active[self->itf]);
     } else {
-        uint32_t country = CYW43_COUNTRY(mod_network_country_code[0], mod_network_country_code[1], 0);
-        cyw43_wifi_set_up(self->cyw, self->itf, mp_obj_is_true(args[1]), country);
+        bool value = mp_obj_is_true(args[1]);
+        cyw43_wifi_set_up(self->cyw, self->itf, value, get_country_code());
+        if_active[self->itf] = value;
         return mp_const_none;
     }
 }
@@ -457,6 +466,10 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
             mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
         }
 
+        // A number of these options only update buffers in memory, and
+        // won't do anything until the interface is cycled down and back up
+        bool cycle_active = false;
+
         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];
@@ -469,6 +482,7 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                     }
                     case MP_QSTR_channel: {
                         cyw43_wifi_ap_set_channel(self->cyw, mp_obj_get_int(e->value));
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_ssid:
@@ -476,6 +490,7 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                         size_t len;
                         const char *str = mp_obj_str_get_data(e->value, &len);
                         cyw43_wifi_ap_set_ssid(self->cyw, len, (const uint8_t *)str);
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_monitor: {
@@ -495,6 +510,7 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                     }
                     case MP_QSTR_security: {
                         cyw43_wifi_ap_set_auth(self->cyw, mp_obj_get_int(e->value));
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_key:
@@ -502,6 +518,7 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                         size_t len;
                         const char *str = mp_obj_str_get_data(e->value, &len);
                         cyw43_wifi_ap_set_password(self->cyw, len, (const uint8_t *)str);
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_pm: {
@@ -531,6 +548,13 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
             }
         }
 
+        // If the interface is already active, cycle it down and up
+        if (cycle_active && if_active[self->itf]) {
+            uint32_t country = get_country_code();
+            cyw43_wifi_set_up(self->cyw, self->itf, false, country);
+            cyw43_wifi_set_up(self->cyw, self->itf, true, country);
+        }
+
         return mp_const_none;
     }
 }

From b65e89107c0194bfdaf92720786341a2047f36b6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 16 Oct 2024 12:03:39 +1100
Subject: [PATCH 1639/3129] py/py.mk: Add check that any specified
 USER_C_MODULES folder exists.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 py/py.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/py.mk b/py/py.mk
index 2e7ffe9905e0c..9592fbb9170ef 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -33,6 +33,9 @@ ifneq ($(USER_C_MODULES),)
 # pre-define USERMOD variables as expanded so that variables are immediate
 # expanded as they're added to them
 
+# Confirm the provided path exists, show abspath if not to make it clearer to fix.
+$(if $(wildcard $(USER_C_MODULES)/.),,$(error USER_C_MODULES doesn't exist: $(abspath $(USER_C_MODULES))))
+
 # C/C++ files that are included in the QSTR/module build
 SRC_USERMOD_C :=
 SRC_USERMOD_CXX :=

From dccd206f4cbbf7c15e1a5721ec5ab830d92ffa8e Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 16 Oct 2024 13:12:19 +1100
Subject: [PATCH 1640/3129] py/usermod.cmake: Add check that any specified
 USER_C_MODULES exists.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 py/usermod.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/usermod.cmake b/py/usermod.cmake
index c814369a4865e..93fce13b3007b 100644
--- a/py/usermod.cmake
+++ b/py/usermod.cmake
@@ -42,6 +42,12 @@ endfunction()
 # Include CMake files for user modules.
 if (USER_C_MODULES)
     foreach(USER_C_MODULE_PATH ${USER_C_MODULES})
+        # Confirm the provided path exists, show abspath if not to make it clearer to fix.
+        if (NOT EXISTS ${USER_C_MODULE_PATH})
+            get_filename_component(USER_C_MODULES_ABS "${USER_C_MODULE_PATH}" ABSOLUTE)
+            message(FATAL_ERROR "USER_C_MODULES doesn't exist: ${USER_C_MODULES_ABS}")
+        endif()
+
         message("Including User C Module(s) from ${USER_C_MODULE_PATH}")
         include(${USER_C_MODULE_PATH})
     endforeach()

From 78d017fc4e70bf21b7c53f193550d220f8959e38 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 16 Oct 2024 13:12:56 +1100
Subject: [PATCH 1641/3129] py/usermod.cmake: If USER_C_MODULES is a folder add
 micropython.cmake.

This mirrors how it works when using a Makefile.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 py/usermod.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/usermod.cmake b/py/usermod.cmake
index 93fce13b3007b..4a8b99ff31b46 100644
--- a/py/usermod.cmake
+++ b/py/usermod.cmake
@@ -42,6 +42,10 @@ endfunction()
 # Include CMake files for user modules.
 if (USER_C_MODULES)
     foreach(USER_C_MODULE_PATH ${USER_C_MODULES})
+        # If a directory is given, append the micropython.cmake to it.
+        if (IS_DIRECTORY ${USER_C_MODULE_PATH})
+            set(USER_C_MODULE_PATH "${USER_C_MODULE_PATH}/micropython.cmake")
+        endif()
         # Confirm the provided path exists, show abspath if not to make it clearer to fix.
         if (NOT EXISTS ${USER_C_MODULE_PATH})
             get_filename_component(USER_C_MODULES_ABS "${USER_C_MODULE_PATH}" ABSOLUTE)

From 7647c828de4ffb9877163909017bbe909e79aacb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Nov 2024 11:20:03 +1100
Subject: [PATCH 1642/3129] tests/multi_espnow: Add channel setting test, add
 some docs.

Test currently passes. It was added so it can be used to check for
regressions when fixing channel selection for AP mode in a follow-up
commit.

Also add some docs about how channel setting is observed to work for
ESP-NOW.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/espnow.rst              |  7 ++-
 docs/library/network.WLAN.rst        |  2 +-
 tests/multi_espnow/70_channel.py     | 89 ++++++++++++++++++++++++++++
 tests/multi_espnow/70_channel.py.exp | 13 ++++
 4 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 tests/multi_espnow/70_channel.py
 create mode 100644 tests/multi_espnow/70_channel.py.exp

diff --git a/docs/library/espnow.rst b/docs/library/espnow.rst
index 1bcc9d7623d14..379e60486f224 100644
--- a/docs/library/espnow.rst
+++ b/docs/library/espnow.rst
@@ -441,7 +441,9 @@ must first register the sender and use the same encryption keys as the sender
 
         - *channel*: The wifi channel (2.4GHz) to communicate with this peer.
           Must be an integer from 0 to 14. If channel is set to 0 the current
-          channel of the wifi device will be used. (default=0)
+          channel of the wifi device will be used, if channel is set to another
+          value then this must match the channel currently configured on the
+          interface (see :func:`WLAN.config`). (default=0)
 
         - *ifidx*: (ESP32 only) Index of the wifi interface which will be
           used to send data to this peer. Must be an integer set to
@@ -470,6 +472,9 @@ must first register the sender and use the same encryption keys as the sender
           registered.
         - ``OSError(num, "ESP_ERR_ESPNOW_FULL")`` if too many peers are
           already registered.
+        - ``OSError(num, "ESP_ERR_ESPNOW_CHAN")`` if a channel value was
+          set that doesn't match the channel currently configured for this
+          interface.
         - ``ValueError()`` on invalid keyword args or values.
 
 .. method:: ESPNow.del_peer(mac)
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 3c401acb420bf..09fefc5929f07 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -126,7 +126,7 @@ Methods
    =============  ===========
    mac            MAC address (bytes)
    ssid           WiFi access point name (string)
-   channel        WiFi channel (integer)
+   channel        WiFi channel (integer). Depending on the port this may only be supported on the AP interface.
    hidden         Whether SSID is hidden (boolean)
    security       Security protocol supported (enumeration, see module constants)
    key            Access key (string)
diff --git a/tests/multi_espnow/70_channel.py b/tests/multi_espnow/70_channel.py
new file mode 100644
index 0000000000000..f3e8b947b123c
--- /dev/null
+++ b/tests/multi_espnow/70_channel.py
@@ -0,0 +1,89 @@
+# Test that ESP-NOW picks up the channel configuration for STA
+# mode on ESP32.
+#
+# Note that setting the channel on a peer in ESP-NOW on modern ESP-IDF only
+# checks it against the configured channel, it doesn't ever change the radio
+# channel
+import sys
+import time
+
+try:
+    import network
+    import espnow
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# ESP8266 doesn't support config('channel') on the STA interface,
+# and the channel parameter to add_peer doesn't appear to set the
+# channel either.
+if sys.platform == "esp8266":
+    print("SKIP")
+    raise SystemExit
+
+
+timeout_ms = 1000
+default_pmk = b"MicroPyth0nRules"
+
+CHANNEL = 3
+WRONG_CHANNEL = 8
+
+
+def init_sta():
+    sta = network.WLAN(network.WLAN.IF_STA)
+    e = espnow.ESPNow()
+    e.active(True)
+    sta.active(True)
+    sta.disconnect()  # Force AP disconnect for any saved config, important so the channel doesn't change
+    sta.config(channel=CHANNEL)
+    e.set_pmk(default_pmk)
+    return sta, e
+
+
+# Receiver
+def instance0():
+    sta, e = init_sta()
+    multitest.globals(PEER=sta.config("mac"))
+    multitest.next()
+    print(sta.config("channel"))
+    while True:
+        peer, msg = e.recv(timeout_ms)
+        if peer is None:
+            print("Timeout")
+            break
+        print(msg)
+    e.active(False)
+
+
+# Sender
+def instance1():
+    sta, e = init_sta()
+    multitest.next()
+    peer = PEER
+
+    # both instances set channel via sta.config(), above
+    msg = b"sent to right channel 1"
+    e.add_peer(peer, channel=CHANNEL)
+    for _ in range(3):
+        e.send(peer, msg)
+    e.del_peer(peer)
+    print(sta.config("channel"))
+
+    sta.config(channel=WRONG_CHANNEL)
+    msg = b"sent to wrong channel"
+    e.add_peer(peer, channel=WRONG_CHANNEL)
+    for _ in range(3):
+        e.send(peer, msg)
+    e.del_peer(peer)
+    print(sta.config("channel"))
+
+    # switching back to the correct channel should also work
+    sta.config(channel=CHANNEL)
+    msg = b"sent to right channel 2"
+    e.add_peer(peer, channel=CHANNEL)
+    for _ in range(3):
+        e.send(peer, msg)
+    e.del_peer(peer)
+    print(sta.config("channel"))
+
+    e.active(False)
diff --git a/tests/multi_espnow/70_channel.py.exp b/tests/multi_espnow/70_channel.py.exp
new file mode 100644
index 0000000000000..d8553966032ce
--- /dev/null
+++ b/tests/multi_espnow/70_channel.py.exp
@@ -0,0 +1,13 @@
+--- instance0 ---
+3
+b'sent to right channel 1'
+b'sent to right channel 1'
+b'sent to right channel 1'
+b'sent to right channel 2'
+b'sent to right channel 2'
+b'sent to right channel 2'
+Timeout
+--- instance1 ---
+3
+8
+3

From 951a10e7078413d2dee2758fc2b7cb292e2b50b7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Nov 2024 10:16:25 +1100
Subject: [PATCH 1643/3129] esp32: Fix setting WLAN channel in AP mode.

- Previously the call to esp_wifi_set_channel() would be immediately
  overridden by calling esp_wifi_config(...) with the previous channel set.

- AP interface doesn't seem to need more than esp_wifi_config(...) to work.
  It will automatically configure 40MHz bandwidth and place the secondary
  channel using similar logic to what was being explicitly calculated here.

- However, calling esp_wifi_set_channel() on the STA interface is necessary
  if using this interface with ESP-NOW (without connecting to an AP). So
  the esp_wifi_set_channel() call is kept in for this purpose. Without
  this, tests/multi_espnow/70_channel.py fails.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/network_wlan.c | 43 ++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index d415c56d32175..6509b4fc6aaed 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -549,21 +549,38 @@ static mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         break;
                     }
                     case MP_QSTR_channel: {
-                        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)
+                        uint8_t channel = mp_obj_get_int(kwargs->table[i].value);
+                        if (self->if_id == ESP_IF_WIFI_AP) {
+                            cfg.ap.channel = channel;
+                        } else {
+                            // This setting is only used to determine the
+                            // starting channel for a scan, so it can result in
+                            // slightly faster connection times.
+                            cfg.sta.channel = channel;
+
+                            // This additional code to directly set the channel
+                            // on the STA interface is only relevant for ESP-NOW
+                            // (when there is no STA connection attempt.)
+                            uint8_t old_primary;
+                            wifi_second_chan_t secondary;
+                            // Get the current value of secondary
+                            esp_exceptions(esp_wifi_get_channel(&old_primary, &secondary));
+                            esp_err_t err = esp_wifi_set_channel(channel, 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));
+                                err = esp_wifi_set_channel(channel, secondary);
+                            }
+                            esp_exceptions(err);
+                            if (channel != old_primary) {
+                                // Workaround the ESP-IDF Wi-Fi stack sometimes taking a moment to change channels
+                                mp_hal_delay_ms(1);
+                            }
                         }
                         break;
                     }

From 0e383a31b9560334b0c8d26b378deccc1c6af961 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 13 Nov 2024 17:40:02 +1100
Subject: [PATCH 1644/3129] tests: Add basic wlan test.

Includes adding some ESP8266 port output to the ignored output list for the
multitest runner.

This test passes on ESP8266 and various ESP32s (including talking to each
other). Without the fix in the parent commit, ESP32 AP will fail if the
station can report its channel (i.e. channel is wrong).

Testing with a CYW43 (RPI_PICO_W) currently fails but I have some fixes
to submit so it can pass as well.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_wlan/01_ap_sta.py     | 117 ++++++++++++++++++++++++++++++
 tests/multi_wlan/01_ap_sta.py.exp |  13 ++++
 tests/run-multitests.py           |  11 ++-
 3 files changed, 135 insertions(+), 6 deletions(-)
 create mode 100644 tests/multi_wlan/01_ap_sta.py
 create mode 100644 tests/multi_wlan/01_ap_sta.py.exp

diff --git a/tests/multi_wlan/01_ap_sta.py b/tests/multi_wlan/01_ap_sta.py
new file mode 100644
index 0000000000000..1a8e80cd33aa3
--- /dev/null
+++ b/tests/multi_wlan/01_ap_sta.py
@@ -0,0 +1,117 @@
+# Basic Wi-Fi MAC layer test where one device creates an Access Point and the
+# other device connects to it as a Station. Also tests channel assignment (where
+# possible) and disconnection.
+
+try:
+    import network
+
+    network.WLAN
+except (ImportError, NameError):
+    print("SKIP")
+    raise SystemExit
+
+import os
+import sys
+import time
+
+CHANNEL = 8
+
+# Note that on slower Wi-Fi stacks this bumps up against the run-multitests.py
+# timeout which expects <10s between lines of output. We work around this by
+# logging something half way through the wait_for loop...
+CONNECT_TIMEOUT = 15000
+
+
+def wait_for(test_func):
+    has_printed = False
+    start = time.ticks_ms()
+    while not test_func():
+        time.sleep(0.1)
+        delta = time.ticks_diff(time.ticks_ms(), start)
+        if not has_printed and delta > CONNECT_TIMEOUT / 2:
+            print("...")
+            has_printed = True
+        elif delta > CONNECT_TIMEOUT:
+            break
+
+    if not has_printed:
+        print("...")  # keep the output consistent
+
+    return test_func()
+
+
+# AP
+def instance0():
+    ap = network.WLAN(network.WLAN.IF_AP)
+    ssid = "MP-test-" + os.urandom(6).hex()
+    psk = "Secret-" + os.urandom(6).hex()
+
+    # stop any previous activity
+    network.WLAN(network.WLAN.IF_STA).active(False)
+    ap.active(False)
+
+    ap.active(True)
+    ap.config(ssid=ssid, key=psk, channel=CHANNEL, security=network.WLAN.SEC_WPA_WPA2)
+
+    # print("AP setup", ssid, psk)
+    print("AP started")
+
+    multitest.globals(SSID=ssid, PSK=psk)
+    multitest.next()
+
+    # Wait for station
+    if not wait_for(ap.isconnected):
+        raise RuntimeError("Timed out waiting for station, status ", ap.status())
+
+    print("AP got station")
+    time.sleep(
+        3
+    )  # depending on port, may still need to negotiate DHCP lease for STA to see connection
+
+    print("AP disabling...")
+    ap.active(False)
+
+
+# STA
+def instance1():
+    sta = network.WLAN(network.WLAN.IF_STA)
+
+    # stop any previous activity
+    network.WLAN(network.WLAN.IF_AP).active(False)
+    sta.active(False)
+
+    multitest.next()
+    ssid = SSID
+    psk = PSK
+
+    # print("STA setup", ssid, psk)
+
+    sta.active(True)
+    sta.connect(ssid, psk)
+
+    print("STA connecting...")
+
+    if not wait_for(sta.isconnected):
+        raise RuntimeError("Timed out waiting to connect, status ", sta.status())
+
+    print("STA connected")
+
+    # Print the current channel, if the port support this
+    try:
+        print("channel", sta.config("channel"))
+    except OSError as e:
+        if "AP" in str(e):
+            # ESP8266 only supports reading channel on the AP interface, so fake this result
+            print("channel", CHANNEL)
+        else:
+            raise
+
+    print("STA waiting for disconnect...")
+
+    # Expect the AP to disconnect us immediately
+    if not wait_for(lambda: not sta.isconnected()):
+        raise RuntimeError("Timed out waiting for AP to disconnect us, status ", sta.status())
+
+    print("STA disconnected")
+
+    sta.active(False)
diff --git a/tests/multi_wlan/01_ap_sta.py.exp b/tests/multi_wlan/01_ap_sta.py.exp
new file mode 100644
index 0000000000000..8fc023a39805b
--- /dev/null
+++ b/tests/multi_wlan/01_ap_sta.py.exp
@@ -0,0 +1,13 @@
+--- instance0 ---
+AP started
+...
+AP got station
+AP disabling...
+--- instance1 ---
+STA connecting...
+...
+STA connected
+channel 8
+STA waiting for disconnect...
+...
+STA disconnected
diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 93a6d3844d235..387eec7018bb3 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -105,15 +105,14 @@ def output_metric(data):
 multitest.flush()
 """
 
-# The btstack implementation on Unix generates some spurious output that we
-# can't control.  Also other platforms may output certain warnings/errors that
-# can be safely ignored.
+# Some ports generate output we can't control, and 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).
+    "libusb: error ",  # unix btstack 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.
+    "USB Path: ",  # Hardcoded in unix btstack's libusb transport.
+    "hci_number_completed_packet",  # Warning from unix btstack.
     "lld_pdu_get_tx_flush_nb HCI packet count mismatch (",  # From ESP-IDF, see https://github.com/espressif/esp-idf/issues/5105
+    " ets_task(",  # ESP8266 port debug output
 )
 
 

From ed3c75a3af16405508f7bfa66257abd7b53b4a9d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Nov 2024 16:48:56 +1100
Subject: [PATCH 1645/3129] esp32: Use hardware version for touchpad macro
 defines.

ESP32 has hardware V1 and S2/S3 has V2, and future chips
may have different versions.

This should still compile to the same binary before and after.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_touchpad.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index 7612063e51d4a..a35e7fccda215 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -29,12 +29,14 @@
 #include "modmachine.h"
 #include "driver/gpio.h"
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#if SOC_TOUCH_SENSOR_SUPPORTED
 
-#if CONFIG_IDF_TARGET_ESP32
+#if SOC_TOUCH_VERSION_1 // ESP32 only
 #include "driver/touch_pad.h"
-#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#elif SOC_TOUCH_VERSION_2 // All other SoCs with touch, to date
 #include "driver/touch_sensor.h"
+#else
+#error "Unknown touch hardware version"
 #endif
 
 typedef struct _mtp_obj_t {
@@ -70,6 +72,8 @@ 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},
+    #else
+    #error "Please add GPIO mapping for this SoC"
     #endif
 };
 
@@ -92,14 +96,14 @@ 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
+        #if TOUCH_HW_VER == 2
         touch_pad_fsm_start();
         #endif
         initialized = 1;
     }
-    #if CONFIG_IDF_TARGET_ESP32
+    #if SOC_TOUCH_VERSION_1
     esp_err_t err = touch_pad_config(self->touchpad_id, 0);
-    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    #elif SOC_TOUCH_VERSION_2
     esp_err_t err = touch_pad_config(self->touchpad_id);
     #endif
     if (err == ESP_OK) {
@@ -110,10 +114,10 @@ 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
+    #if SOC_TOUCH_VERSION_1
     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
+    #elif SOC_TOUCH_VERSION_2
     esp_err_t err = touch_pad_config(self->touchpad_id);
     #endif
     if (err == ESP_OK) {
@@ -125,10 +129,10 @@ 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
+    #if SOC_TOUCH_VERSION_1
     uint16_t value;
     esp_err_t err = touch_pad_read(self->touchpad_id, &value);
-    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    #elif SOC_TOUCH_VERSION_2
     uint32_t value;
     esp_err_t err = touch_pad_read_raw_data(self->touchpad_id, &value);
     #endif
@@ -155,4 +159,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &mtp_locals_dict
     );
 
-#endif
+#endif // SOC_TOUCH_SENSOR_SUPPORTED

From 66e699e8a538ed7c1dc2d65035e5d93643e56667 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Nov 2024 17:14:09 +1100
Subject: [PATCH 1646/3129] esp32: Fix machine.TouchPad startup on ESP32-S2 and
 S3.

Closes #13178.

TouchPad confirmed working on both chips, and fixes the the ESP32-S3
reading constant max value. Was unable to reproduce the bug on ESP32-S2 but
this may be due to my test setup, and it still works with the fix.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_touchpad.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index a35e7fccda215..48250280badaf 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -96,9 +96,6 @@ 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 TOUCH_HW_VER == 2
-        touch_pad_fsm_start();
-        #endif
         initialized = 1;
     }
     #if SOC_TOUCH_VERSION_1
@@ -107,6 +104,10 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     esp_err_t err = touch_pad_config(self->touchpad_id);
     #endif
     if (err == ESP_OK) {
+        #if SOC_TOUCH_VERSION_2
+        touch_pad_fsm_start();
+        #endif
+
         return MP_OBJ_FROM_PTR(self);
     }
     mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));

From 154d1419659795aa6785778e4ddd6f23f09f2861 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Nov 2024 18:06:48 +1100
Subject: [PATCH 1647/3129] docs,esp32: Update machine.TouchPad docs for
 ESP32-S2 and ESP32-S3.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/quickref.rst | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index b9ca0f8225f8f..5cce96d687875 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -751,20 +751,33 @@ APA102 (DotStar) uses a different driver as it has an additional clock pin.
 Capacitive touch
 ----------------
 
-Use the ``TouchPad`` class in the ``machine`` module::
+ESP32, ESP32-S2 and ESP32-S3 support capacitive touch via the ``TouchPad`` class
+in the ``machine`` module::
 
     from machine import TouchPad, Pin
 
     t = TouchPad(Pin(14))
     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
-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
-14, 15, 27, 32, 33. Trying to assign to any other pins will result in a ``ValueError``.
+``TouchPad.read`` returns a value proportional to the capacitance between the
+pin and the board's Ground connection. On ESP32 the number becomes smaller when
+the pin (or connected touch pad) is touched, on ESP32-S2 and ESP32-S3 the number
+becomes larger when the pin is touched.
+
+In all cases, a touch causes a significant change in the return value. Note the
+returned values are *relative* and can vary depending on the board and
+surrounding environment so some calibration (i.e. comparison to a baseline or
+rolling average) may be required.
+
+========= ==============================================
+Chip      Touch-enabled pins
+--------- ----------------------------------------------
+ESP32     0, 2, 4, 12, 13, 14, 15, 27, 32, 33
+ESP32-S2  1 to 14 inclusive
+ESP32-S3  1 to 14 inclusive
+========= ==============================================
+
+Trying to assign to any other pins will result in a ``ValueError``.
 
 Note that TouchPads can be used to wake an ESP32 from sleep::
 

From e70048cf5934bf3db65ec7a1b6490635716282f5 Mon Sep 17 00:00:00 2001
From: Corran Webster <cwebster@unital.dev>
Date: Thu, 14 Nov 2024 10:15:10 +0000
Subject: [PATCH 1648/3129] extmod/modframebuf: Fix 0 radius bug in
 FrameBuffer.ellipse.

This fixes a bug in FrameBuffer.ellipse where it goes into an infinite loop
if both radii are 0.

This fixes the bug with a simple pre-check to see if both radii are 0, and
in that case sets a single pixel at the center. This is consistent with the
behaviour of the method when called with just one of the radii set to 0,
where it will draw a horizontal or vertical line of 1 pixel width.

The pixel is set with setpixel_checked so it should handle out-of-bounds
drawing correctly.

This fix also includes three new tests: one for the default behaviour, one
for drawing out-of-bounds, and one for when the sector mask is 0.

Fixes issue #16053.

Signed-off-by: Corran Webster <cwebster@unital.dev>
---
 extmod/modframebuf.c                 |  4 ++
 tests/extmod/framebuf_ellipse.py     | 15 +++++
 tests/extmod/framebuf_ellipse.py.exp | 96 ++++++++++++++++++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index cd0f50d104427..b718a66cc62fe 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -536,6 +536,10 @@ static mp_obj_t framebuf_ellipse(size_t n_args, const mp_obj_t *args_in) {
     } else {
         mask |= ELLIPSE_MASK_ALL;
     }
+    if (args[2] == 0 && args[3] == 0) {
+        setpixel_checked(self, args[0], args[1], args[4], mask & ELLIPSE_MASK_ALL);
+        return mp_const_none;
+    }
     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];
diff --git a/tests/extmod/framebuf_ellipse.py b/tests/extmod/framebuf_ellipse.py
index a4c784aff8762..ec0461e66ca03 100644
--- a/tests/extmod/framebuf_ellipse.py
+++ b/tests/extmod/framebuf_ellipse.py
@@ -63,3 +63,18 @@ def printbuf():
     fbuf.fill(0)
     fbuf.ellipse(x, y, 6, 12, 0xAA, True)
     printbuf()
+
+# Draw an ellipse with both radius 0
+fbuf.fill(0)
+fbuf.ellipse(15, 15, 0, 0, 0xFF, True)
+printbuf()
+
+# Draw an ellipse with both radius 0 out of bounds
+fbuf.fill(0)
+fbuf.ellipse(45, 45, 0, 0, 0xFF, True)
+printbuf()
+
+# Draw an ellipse with radius 0 and all sectors masked out
+fbuf.fill(0)
+fbuf.ellipse(15, 15, 0, 0, 0xFF, True, 0)
+printbuf()
diff --git a/tests/extmod/framebuf_ellipse.py.exp b/tests/extmod/framebuf_ellipse.py.exp
index ae6ad1ee7e487..96a60c24da1f1 100644
--- a/tests/extmod/framebuf_ellipse.py.exp
+++ b/tests/extmod/framebuf_ellipse.py.exp
@@ -702,3 +702,99 @@ aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
 aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
 aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
 -->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000ff0000000000000000000000000000
+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
+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--

From da692d01ac6c09286ee682c0d4a3780777c67a8f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 27 Nov 2024 16:57:02 +0100
Subject: [PATCH 1649/3129] nrf/drivers/ticker: Reset slow ticker callback
 count on soft reboot.

The micro:bit board (and probably other boards using the music or display
module) locked up on soft reboot.  Reason was a buffer overflow caused by
an index counter, which was not reset on soft_reboot.

That's fixed in this commit.  Tested with a micro:bit board, performing a
series of soft reboots.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/nrf/drivers/ticker.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/drivers/ticker.c b/ports/nrf/drivers/ticker.c
index c2fa31e7c207b..e9c07c842ecd5 100644
--- a/ports/nrf/drivers/ticker.c
+++ b/ports/nrf/drivers/ticker.c
@@ -62,6 +62,7 @@ void ticker_init0(void) {
 #else
     NRFX_IRQ_PRIORITY_SET(FastTicker_IRQn, 2);
 #endif
+    m_num_of_slow_tickers = 0;
 
     NRFX_IRQ_PRIORITY_SET(SlowTicker_IRQn, 3);
 

From 3b3b48892f96e2c81e7887f996fd7ff457acbb5d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Nov 2024 16:15:20 +1100
Subject: [PATCH 1650/3129] py/objfloat: Workaround non-constant NAN definition
 on Windows MSVC.

Recent MSVC versions have changed the definition of NAN to a non-constant
expression!  This is a bug, C standard says it should be a constant.

Good explanation and workaround at: https://stackoverflow.com/a/79199887

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/objfloat.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/py/objfloat.c b/py/objfloat.c
index 5c90b1491cebf..0728fce3151fe 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -47,6 +47,13 @@
 #define M_PI (3.14159265358979323846)
 #endif
 
+// Workaround a bug in recent MSVC where NAN is no longer constant.
+// (By redefining back to the previous MSVC definition of NAN)
+#if defined(_MSC_VER) && _MSC_VER >= 1942
+#undef NAN
+#define NAN (-(float)(((float)(1e+300 * 1e+300)) * 0.0F))
+#endif
+
 typedef struct _mp_obj_float_t {
     mp_obj_base_t base;
     mp_float_t value;

From 8e11e5f1a14ca3395afaab2e42edebe41221eba1 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Nov 2024 16:46:21 +1100
Subject: [PATCH 1651/3129] tests/misc/sys_settrace_features.py: Add note about
 CPython 3.12 issue.

CPython 3.12 has a documented issue with settrace for opcodes, apparently
due to PEP 669.  "This behavior will be changed back in 3.13 to be
consistent with previous versions."

No easy way to make the test pass on CPython 3.12, but at least this helps
signal what the problem is to anyone who runs into a failure.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/misc/sys_settrace_features.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/misc/sys_settrace_features.py b/tests/misc/sys_settrace_features.py
index 8ca6b382e3c64..6eeb2b900f18c 100644
--- a/tests/misc/sys_settrace_features.py
+++ b/tests/misc/sys_settrace_features.py
@@ -6,6 +6,10 @@
     print("SKIP")
     raise SystemExit
 
+if sys.version.startswith("3.12"):
+    # There is a CPython change in settrace that is reverted in 3.13!
+    print("WARNING: this test will fail when compared to CPython 3.12.x behaviour")
+
 
 def print_stacktrace(frame, level=0):
     # Ignore CPython specific helpers.

From 8ec067272a2b03c182f4723026e1d94dd6a44835 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Nov 2024 16:28:33 +1100
Subject: [PATCH 1652/3129] github/workflows: Workaround using CPython 3.12 in
 MSYS2 builds.

Once MSYS2 repository updates past Python 3.12, this commit can be
reverted.

Explanation:

CPython 3.12 can't pass sys_settrace_features test (see parent commit for
explanation). MSYS2 mingw-w64-ARCH-python package is currently 3.12.7.

MSYS2 doesn't recommend installing old packages from their archive (due to
library dependencies), so switch to the GitHub CI setup-python action for
now.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_windows.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 91a3192a10a48..84e018ba15d16 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -110,6 +110,11 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
+    - uses: actions/setup-python@v5
+      # note: can go back to installing mingw-w64-${{ matrix.env }}-python after
+      # MSYS2 updates to Python >3.12 (due to settrace compatibility issue)
+      with:
+        python-version: '3.11'
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.sys }}
@@ -118,9 +123,9 @@ jobs:
           make
           mingw-w64-${{ matrix.env }}-gcc
           pkg-config
-          mingw-w64-${{ matrix.env }}-python3
           git
           diffutils
+        path-type: inherit  # Remove when setup-python is removed
     - uses: actions/checkout@v4
     - name: Build mpy-cross.exe
       run: make -C mpy-cross -j2

From eb80b04944e01d437efc2fa29189ad1e2bdd997f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Nov 2024 16:22:56 +1100
Subject: [PATCH 1653/3129] tests/extmod: Workaround CPython warning in
 asyncio_new_event_loop test.

This started failing in CI on the mingw build, after CPython updated to
3.12.7. The test prints two warnings during interpreter shutdown of
"Task was destroyed but it is pending!".

This didn't happen on other CPython builds, and I think that's because of
finalizer order in CPython interpreter shutdown but not certain (the loop
finalizer calls loop.close() if not already closed).

Adding explicit calls to loop.close() causes the warning to be printed on
every run with CPython 3.12.7 on Linux.

Next, added the workaround exception handler to swallow this exception
as MicroPython doesn't produce an equivalent.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/asyncio_new_event_loop.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/asyncio_new_event_loop.py b/tests/extmod/asyncio_new_event_loop.py
index bebc3bf70cc57..3f05ffdd551d7 100644
--- a/tests/extmod/asyncio_new_event_loop.py
+++ b/tests/extmod/asyncio_new_event_loop.py
@@ -12,6 +12,16 @@
     asyncio.set_event_loop(asyncio.new_event_loop())
 
 
+def exception_handler(loop, context):
+    # This is a workaround for a difference between CPython and MicroPython: if
+    # a CPython event loop is closed while there are tasks pending (i.e. not finished)
+    # on it, then the task will log an error. MicroPython does not log this error.
+    if context.get("message", "") == "Task was destroyed but it is pending!":
+        pass
+    else:
+        loop.default_exception_handler(context)
+
+
 async def task():
     for i in range(4):
         print("task", i)
@@ -22,17 +32,21 @@ async def task():
 async def main():
     print("start")
     loop.create_task(task())
-    await asyncio.sleep(0)
+    await asyncio.sleep(0)  # yields, meaning new task will run once
     print("stop")
     loop.stop()
 
 
 # Use default event loop to run some tasks
 loop = asyncio.get_event_loop()
+loop.set_exception_handler(exception_handler)
 loop.create_task(main())
 loop.run_forever()
+loop.close()
 
 # Create new event loop, old one should not keep running
 loop = asyncio.new_event_loop()
+loop.set_exception_handler(exception_handler)
 loop.create_task(main())
 loop.run_forever()
+loop.close()

From d49c1e836cc7497f4bd5385491214173af6410ed Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 26 Nov 2024 15:50:13 +1100
Subject: [PATCH 1654/3129] tools/ci.sh: Remove explicit macOS pkg-config
 install.

Reasons to remove this:

- GitHub's macOS runners install this package by default nowadays.

- Brew renamed this package to 'pkgconf' so installing the old name on top
  of the new package name has started failing.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/ci.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 4e6f09b0bb853..b9f9dec8bc26e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -651,9 +651,6 @@ 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 6dd976cc5c42ebed8fec50e4e6aec1fb37347080 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 19:34:09 +0000
Subject: [PATCH 1655/3129] github/workflows: Bump codecov/codecov-action from
 4 to 5.

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5.
- [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/v4...v5)

---
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 1707fdc9fb37d..64fd5c902a053 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -88,7 +88,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@v4
+      uses: codecov/codecov-action@v5
       with:
         fail_ci_if_error: true
         verbose: true

From beabef5aac2c578f6b2f87d42bfccfa4ff074416 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Nov 2024 14:32:25 +1100
Subject: [PATCH 1656/3129] esp32: Add missing network.STAT_CONNECT_FAIL
 constant.

The esp32 port had network.STAT_ASSOC_FAIL for the same purpose,
but this is undocumented and different to all other ports. That
constant is now deprecated.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/modnetwork_globals.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index c6092bd142178..2bfc2393d666f 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -82,5 +82,9 @@
 #endif
 { MP_ROM_QSTR(MP_QSTR_STAT_WRONG_PASSWORD), MP_ROM_INT(WIFI_REASON_AUTH_FAIL)},
 { MP_ROM_QSTR(MP_QSTR_STAT_BEACON_TIMEOUT), MP_ROM_INT(WIFI_REASON_BEACON_TIMEOUT)},
+#if !MICROPY_PREVIEW_VERSION_2
+// Deprecated, use STAT_CONNECT_FAIL same as other ports
 { MP_ROM_QSTR(MP_QSTR_STAT_ASSOC_FAIL), MP_ROM_INT(WIFI_REASON_ASSOC_FAIL)},
+#endif
+{ MP_ROM_QSTR(MP_QSTR_STAT_CONNECT_FAIL), MP_ROM_INT(WIFI_REASON_ASSOC_FAIL)},
 { MP_ROM_QSTR(MP_QSTR_STAT_HANDSHAKE_TIMEOUT), MP_ROM_INT(WIFI_REASON_HANDSHAKE_TIMEOUT)},

From 579e840de6d71503658f3c427c1e210c7cb85e9e Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 20 Nov 2024 19:07:17 +0100
Subject: [PATCH 1657/3129] extmod/modplatform: Distinguish AArch64 from
 AArch32.

This commit adds a new platform architecture name for Arm CPUs running
in 64 bits mode ("aarch64").  The 32 bits name is left as "arm" to
maintain compatibility with existing code.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 extmod/modplatform.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extmod/modplatform.h b/extmod/modplatform.h
index b932551c7ccb2..0c83d7b8c5d11 100644
--- a/extmod/modplatform.h
+++ b/extmod/modplatform.h
@@ -36,7 +36,11 @@
 // See: https://sourceforge.net/p/predef/wiki/Home/
 
 #if defined(__ARM_ARCH)
+#if defined(__ARM_ARCH_ISA_A64)
+#define MICROPY_PLATFORM_ARCH   "aarch64"
+#else
 #define MICROPY_PLATFORM_ARCH   "arm"
+#endif
 #elif defined(__x86_64__) || defined(_M_X64)
 #define MICROPY_PLATFORM_ARCH   "x86_64"
 #elif defined(__i386__) || defined(_M_IX86)

From 09cf01d7c1f564fd018bd8fb3e6382fbe8cd1e35 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 20 Nov 2024 19:11:30 +0100
Subject: [PATCH 1658/3129] extmod/modplatform: Add Clang to the known
 compilers list.

This commit adds support to distinguish between GCC and Clang to report
the appropriate compiler version.  Usually Clang also disguises itself
as GCC for compatibility reasons, but these changes look for
Clang-specific definitions first to avoid that problem.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 extmod/modplatform.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extmod/modplatform.h b/extmod/modplatform.h
index 0c83d7b8c5d11..19246c0fda1cd 100644
--- a/extmod/modplatform.h
+++ b/extmod/modplatform.h
@@ -53,7 +53,13 @@
 #define MICROPY_PLATFORM_ARCH   ""
 #endif
 
-#if defined(__GNUC__)
+#if defined(__clang__)
+#define MICROPY_PLATFORM_COMPILER \
+    "Clang " \
+    MP_STRINGIFY(__clang_major__) "." \
+    MP_STRINGIFY(__clang_minor__) "." \
+    MP_STRINGIFY(__clang_patchlevel__)
+#elif defined(__GNUC__)
 #define MICROPY_PLATFORM_COMPILER \
     "GCC " \
     MP_STRINGIFY(__GNUC__) "." \

From 3de3821abf7e245566be227c9799b74d6b80aae3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 20 Nov 2024 19:13:48 +0100
Subject: [PATCH 1659/3129] extmod/modplatform: Add Android to the recognised
 platforms list.

This commit adds code to distinguish between regular Linux and Android,
also adding a specific entry for the platform libc.  The reported libc
is marked as "bionic" and its version matches the Android platform API
version (there are no definitions for a specific bionic version).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 extmod/modplatform.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extmod/modplatform.h b/extmod/modplatform.h
index 19246c0fda1cd..5c9cbffb2a486 100644
--- a/extmod/modplatform.h
+++ b/extmod/modplatform.h
@@ -96,12 +96,17 @@
 #elif defined(_PICOLIBC__)
 #define MICROPY_PLATFORM_LIBC_LIB       "picolibc"
 #define MICROPY_PLATFORM_LIBC_VER       _PICOLIBC_VERSION
+#elif defined(__ANDROID__)
+#define MICROPY_PLATFORM_LIBC_LIB       "bionic"
+#define MICROPY_PLATFORM_LIBC_VER       MP_STRINGIFY(__ANDROID_API__)
 #else
 #define MICROPY_PLATFORM_LIBC_LIB       ""
 #define MICROPY_PLATFORM_LIBC_VER       ""
 #endif
 
-#if defined(__linux)
+#if defined(__ANDROID__)
+#define MICROPY_PLATFORM_SYSTEM         "Android"
+#elif defined(__linux)
 #define MICROPY_PLATFORM_SYSTEM         "Linux"
 #elif defined(__unix__)
 #define MICROPY_PLATFORM_SYSTEM         "Unix"

From 2e796d6c3e33e2d3b1936cd05aa926400ad1d5b7 Mon Sep 17 00:00:00 2001
From: chuangjinglu <chuangjinglu@outlook.com>
Date: Mon, 25 Nov 2024 11:06:15 +0800
Subject: [PATCH 1660/3129] docs,ports: Fix some comments and error messages
 with doubled-up words.

Signed-off-by: chuangjinglu <chuangjinglu@outlook.com>
---
 docs/library/bluetooth.rst           | 2 +-
 docs/library/machine.TimerWiPy.rst   | 2 +-
 docs/library/pyb.Timer.rst           | 2 +-
 docs/reference/manifest.rst          | 2 +-
 ports/cc3200/FreeRTOS/Source/tasks.c | 2 +-
 ports/stm32/timer.c                  | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index f8b154dd11448..b09c370abd46d 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -665,7 +665,7 @@ L2CAP connection-oriented-channels
 
     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
+    On successful connection, 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
diff --git a/docs/library/machine.TimerWiPy.rst b/docs/library/machine.TimerWiPy.rst
index f8c8bb29da7fb..54280a5994ad5 100644
--- a/docs/library/machine.TimerWiPy.rst
+++ b/docs/library/machine.TimerWiPy.rst
@@ -71,7 +71,7 @@ Methods
 
    Otherwise, a TimerChannel object is initialized and returned.
 
-   The operating mode is is the one configured to the Timer object that was used to
+   The operating mode 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``.
diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index 1749efce2d508..c644e38d78624 100644
--- a/docs/library/pyb.Timer.rst
+++ b/docs/library/pyb.Timer.rst
@@ -163,7 +163,7 @@ Methods
      - ``callback`` - as per TimerChannel.callback()
 
      - ``pin`` None (the default) or a Pin object. If specified (and not None)
-       this will cause the alternate function of the the indicated pin
+       this will cause the alternate function of the indicated pin
        to be configured for this timer channel. An error will be raised if
        the pin doesn't support any alternate functions for this timer channel.
 
diff --git a/docs/reference/manifest.rst b/docs/reference/manifest.rst
index 1a80b1259e39f..dc9d6dd75b2b8 100644
--- a/docs/reference/manifest.rst
+++ b/docs/reference/manifest.rst
@@ -26,7 +26,7 @@ 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
+The way to list the Python files to 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
diff --git a/ports/cc3200/FreeRTOS/Source/tasks.c b/ports/cc3200/FreeRTOS/Source/tasks.c
index 6c261a65101dc..3d35c667274ca 100644
--- a/ports/cc3200/FreeRTOS/Source/tasks.c
+++ b/ports/cc3200/FreeRTOS/Source/tasks.c
@@ -1671,7 +1671,7 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB )
 			if( listIS_CONTAINED_WITHIN( &xPendingReadyList, &( pxTCB->xEventListItem ) ) == pdFALSE )
 			{
 				/* Is it in the suspended list because it is in the	Suspended
-				state, or because is is blocked with no timeout? */
+				state, or because it is blocked with no timeout? */
 				if( listIS_CONTAINED_WITHIN( NULL, &( pxTCB->xEventListItem ) ) != pdFALSE )
 				{
 					xReturn = pdTRUE;
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index d999e57462edb..acfdbd84eb2b6 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1089,7 +1089,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
 ///   - `callback` - as per TimerChannel.callback()
 ///
 ///   - `pin` None (the default) or a Pin object. If specified (and not None)
-///           this will cause the alternate function of the the indicated pin
+///           this will cause the alternate function of the indicated pin
 ///      to be configured for this timer channel. An error will be raised if
 ///      the pin doesn't support any alternate functions for this timer channel.
 ///
@@ -1197,7 +1197,7 @@ static mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
     mp_obj_t pin_obj = args[2].u_obj;
     if (pin_obj != mp_const_none) {
         if (!mp_obj_is_type(pin_obj, &pin_type)) {
-            mp_raise_ValueError(MP_ERROR_TEXT("pin argument needs to be be a Pin type"));
+            mp_raise_ValueError(MP_ERROR_TEXT("pin argument needs to be a Pin type"));
         }
         const machine_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);

From 406bccc75307bd09fbf20150a29c587e9f12771b Mon Sep 17 00:00:00 2001
From: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
Date: Thu, 23 Nov 2023 21:43:47 +0330
Subject: [PATCH 1661/3129] docs/library/binascii: Add docs for binascii.crc32
 method.

Signed-off-by: Amirreza Hamzavi <amirrezahamzavi2000@gmail.com>
---
 docs/library/binascii.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/library/binascii.rst b/docs/library/binascii.rst
index 6c02f019aaa58..c728c5a8a574c 100644
--- a/docs/library/binascii.rst
+++ b/docs/library/binascii.rst
@@ -36,3 +36,9 @@ Functions
    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 if newline is true, as a bytes object.
+
+.. function:: crc32(data, [value])
+
+   Compute CRC-32, the 32-bit checksum of *data*, starting with an initial CRC
+   of *value*. The default initial CRC is zero. The algorithm is consistent
+   with the ZIP file checksum.

From a2554f09573e0a856d9abf9e718bac9977a510db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Nov 2024 16:26:15 +1100
Subject: [PATCH 1662/3129] tests/run-tests.py: Add support for tests to use
 unittest.

All the existing tests require a .exp file (either manually specified or
generated running the test first under CPython) that is used to check the
output of running the test under MicroPython.  The test passes if the
output matches the expected output exactly.

This has worked very well for a long time now.  But some of the newer
hardware tests (eg UART, SPI, PWM) don't really fit this model, for the
following main reasons:

- Some but not all parts of the test should be skipped on certain hardware
  targets.  With the expected-output approach, skipping tests is either all
  or nothing.

- It's often useful to output diagnostics as part of the test, which should
  not affect the result of the test (eg the diagnostics change from run to
  run, like timing values, or from target to target).

- Sometimes a test will do a complex check and then print False/True if it
  passed or not, which obscures the actual test result.

To improve upon this, this commit adds support to `run-tests.py` for a test
to use `unittest`.  It detects this by looking at the end of the output
after running the test, looking for the test summary printed by `unittest`
(or an error message saying `unittest` was not found).  If the test uses
`unittest` then it should not have a .exp file, and it's not run under
CPython.  A `unittest` based test passes or fails based on the summary
printed by `unittest`.

Note that (as long as `unittest` is installed on the target) the tests are
still fully independent and you can still run them without `run-tests.py`:
you just run it as usual, eg `mpremote run <test.py>`.  This is very useful
when creating and debugging tests.

Note also that the standard test suite testing Python semantics (eg
everything in `tests/basics/`) will probably never use unittest.  Only more
advanced tests will, and ones that are not runnable under CPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/README.md    |  35 ++++++++---
 tests/run-tests.py | 141 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 132 insertions(+), 44 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index b39833aa096f4..28c1b3a0852cc 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -15,6 +15,32 @@ That will run tests on the `/dev/ttyACM0` serial port.  You can also use shortcu
 device names like `a<n>` for `/dev/ttyACM<n>` and `c<n>` for `COM<n>`.  Use
 `./run-tests.py --help` to see all of the device possibilites, and other options.
 
+There are three kinds of tests:
+
+* Tests that use `unittest`: these tests require `unittest` to be installed on the
+  target (eg via `mpremote mip install unittest`), and are used to test things that are
+  MicroPython-specific, such as behaviour that is different to CPython, modules that
+  aren't available in CPython, and hardware tests.  These tests are run only under
+  MicroPython and the test passes if the `unittest` runner prints "OK" at the end of the
+  run.  Other output may be printed, eg for use as diagnostics, and this output does not
+  affect the result of the test.
+
+* Tests with a corresponding `.exp` file: similar to the `unittest` tests, these tests
+  are for features that generally cannot be run under CPython.  In this case the test is
+  run under MicroPython only and the output from MicroPython is compared against the
+  provided `.exp` file.  The test passes if the output matches exactly.
+
+* Tests without a corresponding `.exp` file (and don't use `unittest`): these tests are
+  used to test MicroPython behaviour that should precisely match CPython.  These tests
+  are first run under CPython and the output captured, and then run under MicroPython
+  and the output compared to the CPython output.  The test passes if the output matches
+  exactly.  If the output differs then the test fails and the outputs are saved in a
+  `.exp` and a `.out` file respectively.
+
+In all three cases above, the test can usually be run directly on the target MicroPython
+instance, either using the unix port with `micropython <test.py>`, or on a board with
+`mpremote run <test.py>`.  This is useful for creating and debugging tests.
+
 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
@@ -27,15 +53,6 @@ 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/run-tests.py b/tests/run-tests.py
index d0feb4bcd6635..0e491ccd62bf2 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -508,6 +508,10 @@ def run_feature_check(pyb, args, test_file):
     return run_micropython(pyb, args, test_file_path, test_file_path, is_special=True)
 
 
+class TestError(Exception):
+    pass
+
+
 class ThreadSafeCounter:
     def __init__(self, start=0):
         self._value = start
@@ -862,29 +866,10 @@ def run_one_test(test_file):
             skipped_tests.append(test_name)
             return
 
-        # get expected output
-        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:
-                output_expected = f.read()
-        else:
-            # run CPython to work out expected output
-            try:
-                output_expected = subprocess.check_output(
-                    CPYTHON3_CMD + [test_file_abspath],
-                    cwd=os.path.dirname(test_file),
-                    stderr=subprocess.STDOUT,
-                )
-            except subprocess.CalledProcessError:
-                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")
-
-        # run MicroPython
+        # Run the test on the MicroPython target.
         output_mupy = run_micropython(pyb, args, test_file, test_file_abspath)
 
+        # Check if the target requested to skip this test.
         if output_mupy == b"SKIP\n":
             if pyb is not None and hasattr(pyb, "read_until"):
                 # Running on a target over a serial connection, and the target requested
@@ -896,22 +881,96 @@ def run_one_test(test_file):
             skipped_tests.append(test_name)
             return
 
-        testcase_count.add(len(output_expected.splitlines()))
+        # Look at the output of the test to see if unittest was used.
+        uses_unittest = False
+        output_mupy_lines = output_mupy.splitlines()
+        if any(
+            line == b"ImportError: no module named 'unittest'" for line in output_mupy_lines[-3:]
+        ):
+            raise TestError(
+                (
+                    "error: test {} requires unittest".format(test_file),
+                    "(eg run `mpremote mip install unittest` to install it)",
+                )
+            )
+        elif (
+            len(output_mupy_lines) > 4
+            and output_mupy_lines[-4] == b"-" * 70
+            and output_mupy_lines[-2] == b""
+        ):
+            # look for unittest summary
+            unittest_ran_match = re.match(rb"Ran (\d+) tests$", output_mupy_lines[-3])
+            unittest_result_match = re.match(
+                b"("
+                rb"(OK)( \(skipped=(\d+)\))?"
+                b"|"
+                rb"(FAILED) \(failures=(\d+), errors=(\d+)\)"
+                b")$",
+                output_mupy_lines[-1],
+            )
+            uses_unittest = unittest_ran_match and unittest_result_match
+
+        # Determine the expected output.
+        if uses_unittest:
+            # Expected output is result of running unittest.
+            output_expected = None
+        else:
+            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:
+                    output_expected = f.read()
+            else:
+                # Run CPython to work out expected output.
+                try:
+                    output_expected = subprocess.check_output(
+                        CPYTHON3_CMD + [test_file_abspath],
+                        cwd=os.path.dirname(test_file),
+                        stderr=subprocess.STDOUT,
+                    )
+                except subprocess.CalledProcessError:
+                    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")
+
+        # Work out if test passed or not.
+        test_passed = False
+        extra_info = ""
+        if uses_unittest:
+            test_passed = unittest_result_match.group(2) == b"OK"
+            num_test_cases = int(unittest_ran_match.group(1))
+            extra_info = "unittest: {} ran".format(num_test_cases)
+            if test_passed and unittest_result_match.group(4) is not None:
+                num_skipped = int(unittest_result_match.group(4))
+                num_test_cases -= num_skipped
+                extra_info += ", {} skipped".format(num_skipped)
+            elif not test_passed:
+                num_failures = int(unittest_result_match.group(6))
+                num_errors = int(unittest_result_match.group(7))
+                extra_info += ", {} failures, {} errors".format(num_failures, num_errors)
+            extra_info = "(" + extra_info + ")"
+            testcase_count.add(num_test_cases)
+        else:
+            testcase_count.add(len(output_expected.splitlines()))
+            test_passed = output_expected == output_mupy
 
         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)
+        # Print test summary, update counters, and save .exp/.out files if needed.
+        if test_passed:
+            print("pass ", test_file, extra_info)
             passed_count.increment()
             rm_f(filename_expected)
             rm_f(filename_mupy)
         else:
-            with open(filename_expected, "wb") as f:
-                f.write(output_expected)
+            print("FAIL ", test_file, extra_info)
+            if output_expected is not None:
+                with open(filename_expected, "wb") as f:
+                    f.write(output_expected)
             with open(filename_mupy, "wb") as f:
                 f.write(output_mupy)
-            print("FAIL ", test_file)
             failed_tests.append((test_name, test_file))
 
         test_count.increment()
@@ -919,12 +978,17 @@ def run_one_test(test_file):
     if pyb:
         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)
+    try:
+        if num_threads > 1:
+            pool = ThreadPool(num_threads)
+            pool.map(run_one_test, tests)
+        else:
+            for test in tests:
+                run_one_test(test)
+    except TestError as er:
+        for line in er.args[0]:
+            print(line)
+        sys.exit(1)
 
     print(
         "{} tests performed ({} individual testcases)".format(
@@ -1189,8 +1253,15 @@ def main():
         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"] = ".frozen" + os.pathsep + base_path("../extmod")
+        # Clear search path to make sure tests use only builtin modules, those in
+        # extmod, and a path to unittest in case it's needed.
+        os.environ["MICROPYPATH"] = (
+            ".frozen"
+            + os.pathsep
+            + base_path("../extmod")
+            + os.pathsep
+            + base_path("../lib/micropython-lib/python-stdlib/unittest")
+        )
 
     try:
         os.makedirs(args.result_dir, exist_ok=True)

From a8422439ab5e86eeaceae09c4655101225fe5fce Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Dec 2024 12:31:50 +1100
Subject: [PATCH 1663/3129] tests/run-tests.py: Print .out file when there is
 no .exp file.

So that a failing unittest-based test has its entire log printed when using
`run-tests.py --print-failures`.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 0e491ccd62bf2..6fe45707bb6cd 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1154,11 +1154,18 @@ def main():
     args = cmd_parser.parse_args()
 
     if args.print_failures:
-        for exp in glob(os.path.join(args.result_dir, "*.exp")):
-            testbase = exp[:-4]
+        for out in glob(os.path.join(args.result_dir, "*.out")):
+            testbase = out[:-4]
             print()
             print("FAILURE {0}".format(testbase))
-            os.system("{0} {1}.exp {1}.out".format(DIFF, testbase))
+            if os.path.exists(testbase + ".exp"):
+                # Show diff of expected and actual output.
+                os.system("{0} {1}.exp {1}.out".format(DIFF, testbase))
+            else:
+                # No expected output, just show the actual output (eg from a unittest).
+                with open(out) as f:
+                    for line in f:
+                        print(line, end="")
 
         sys.exit(0)
 

From 6dcbdec4de2975a08a50828a0b25e9b3844e04d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Nov 2024 22:23:48 +1100
Subject: [PATCH 1664/3129] lib/micropython-lib: Update submodule to latest.

This brings in:
- umqtt.simple: add optional socket timeout to connect method
- aioespnow,webrepl: use recommended network.WLAN.IF_[AP|STA] constants
- unittest: allow SkipTest to work within a subTest
- unittest: always use "raise" with an argument

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 68e3e07bc7ab6..e4cf09527bce7 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 68e3e07bc7ab63931cead3854b2a114e9a084248
+Subproject commit e4cf09527bce7569f5db742cf6ae9db68d50c6a9

From 42f37e951b8990576e16bb7f5449fddeee0c0664 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Nov 2024 15:54:26 +1100
Subject: [PATCH 1665/3129] esp8266/mpconfigport: Enable function attributes.

This allows `unittest` to work on esp8266 boards.

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 6504127755e85..83d80a7c963f6 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -23,7 +23,6 @@
 #define MICROPY_OPT_MATH_FACTORIAL              (0)
 #define MICROPY_REPL_EMACS_KEYS                 (0)
 #define MICROPY_PY_BUILTINS_COMPLEX             (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)

From d3d29765863e7b9ed7ea9c68413b80405a75d0e9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Nov 2024 23:57:27 +1100
Subject: [PATCH 1666/3129] qemu/Makefile: Include unittest in firmware.

So that this port can run unittest-based tests.

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

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 62601324d6a92..237e1e9514c60 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -19,10 +19,10 @@ QSTR_DEFS = qstrdefsport.h
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 ifeq ($(QEMU_ARCH),arm)
-FROZEN_MANIFEST ?= "freeze('test-frzmpy')"
+FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy')"
 endif
 ifeq ($(QEMU_ARCH),riscv32)
-FROZEN_MANIFEST ?= "freeze('test-frzmpy', ('frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
+FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 
 # include py core make definitions

From f62df1a2c2d27d602be29474843a19284d807358 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Nov 2024 16:26:39 +1100
Subject: [PATCH 1667/3129] tests/ports/stm32_hardware: Convert DMA test to use
 unittest.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/stm32_hardware/dma_alignment.py   | 88 +++++++++++--------
 .../ports/stm32_hardware/dma_alignment.py.exp |  2 -
 2 files changed, 52 insertions(+), 38 deletions(-)
 delete mode 100644 tests/ports/stm32_hardware/dma_alignment.py.exp

diff --git a/tests/ports/stm32_hardware/dma_alignment.py b/tests/ports/stm32_hardware/dma_alignment.py
index 1836b25d86d53..1c271d48e725b 100644
--- a/tests/ports/stm32_hardware/dma_alignment.py
+++ b/tests/ports/stm32_hardware/dma_alignment.py
@@ -1,43 +1,59 @@
-from machine import SPI
 # Regression test for DMA for DCache coherency bugs with cache line
 # written originally for https://github.com/micropython/micropython/issues/13471
 
 # IMPORTANT: This test requires SPI2 MISO (pin Y8 on Pyboard D) to be connected to GND
 
+import unittest
+from machine import SPI
+
 SPI_NUM = 2
+BAUDRATE = 5_000_000
+
+
+class Test(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.spi = SPI(SPI_NUM, baudrate=BAUDRATE)
+        cls.skip_slow_test = False
+
+    def test_variable_offset_fixed_length(self):
+        buf = bytearray(1024)
+        for offs in range(0, len(buf)):
+            v = memoryview(buf)[offs : offs + 128]
+            self.spi.readinto(v, 0xFF)
+            ok = all(b == 0x00 for b in v)
+            if not ok:
+                print(offs, v.hex())
+                self.skip_slow_test = True
+            self.assertTrue(ok)
+
+    def test_variable_offset_and_lengths(self):
+        # this takes around 30s to run, so skipped if already failing
+        if self.skip_slow_test:
+            self.skipTest("already failing")
+
+        buf = bytearray(1024)
+        for op_len in range(1, 66):
+            print(op_len)
+            wr = b"\xff" * op_len
+            for offs in range(1, len(buf) - op_len - 1):
+                # Place some "sentinel" values before and after the DMA buffer
+                before = offs & 0xFF
+                after = (~offs) & 0xFF
+                buf[offs - 1] = before
+                buf[offs + op_len] = after
+                v = memoryview(buf)[offs : offs + op_len]
+                self.spi.write_readinto(wr, v)
+                ok = (
+                    all(b == 0x00 for b in v)
+                    and buf[offs - 1] == before
+                    and buf[offs + op_len] == after
+                )
+                if not ok:
+                    print(v.hex())
+                    print(hex(op_len), hex(offs), hex(buf[offs - 1]), hex(buf[offs + op_len]))
+                self.assertTrue(ok)
+
 
-spi = SPI(SPI_NUM, baudrate=5_000_000)
-buf = bytearray(1024)
-ok = True
-
-for offs in range(0, len(buf)):
-    v = memoryview(buf)[offs : offs + 128]
-    spi.readinto(v, 0xFF)
-    if not all(b == 0x00 for b in v):
-        print(offs, v.hex())
-        ok = False
-
-print("Variable offset fixed length " + ("OK" if ok else "FAIL"))
-
-# this takes around 30s to run, so skipped if already failing
-if ok:
-    for op_len in range(1, 66):
-        wr = b"\xFF" * op_len
-        for offs in range(1, len(buf) - op_len - 1):
-            # Place some "sentinel" values before and after the DMA buffer
-            before = offs & 0xFF
-            after = (~offs) & 0xFF
-            buf[offs - 1] = before
-            buf[offs + op_len] = after
-            v = memoryview(buf)[offs : offs + op_len]
-            spi.write_readinto(wr, v)
-            if (
-                not all(b == 0x00 for b in v)
-                or buf[offs - 1] != before
-                or buf[offs + op_len] != after
-            ):
-                print(v.hex())
-                print(hex(op_len), hex(offs), hex(buf[offs - 1]), hex(buf[offs + op_len]))
-                ok = False
-
-    print("Variable offset and lengths " + ("OK" if ok else "FAIL"))
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/ports/stm32_hardware/dma_alignment.py.exp b/tests/ports/stm32_hardware/dma_alignment.py.exp
deleted file mode 100644
index e890e0081c4b7..0000000000000
--- a/tests/ports/stm32_hardware/dma_alignment.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable offset fixed length OK
-Variable offset and lengths OK

From c7c3ffa45f5cc3463f0b8983c360d950d210f320 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Nov 2024 12:44:10 +1100
Subject: [PATCH 1668/3129] tests/net_hosted: Convert connect-nonblock-xfer
 test to use unittest.

This allows it to run parts of the test on esp8266 (or any target using
axTLS).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_hosted/connect_nonblock_xfer.py     | 104 +++++++++++-------
 tests/net_hosted/connect_nonblock_xfer.py.exp |  44 --------
 2 files changed, 62 insertions(+), 86 deletions(-)
 delete mode 100644 tests/net_hosted/connect_nonblock_xfer.py.exp

diff --git a/tests/net_hosted/connect_nonblock_xfer.py b/tests/net_hosted/connect_nonblock_xfer.py
index 23620908afbc6..2c8e12473fe54 100644
--- a/tests/net_hosted/connect_nonblock_xfer.py
+++ b/tests/net_hosted/connect_nonblock_xfer.py
@@ -1,15 +1,14 @@
 # test that socket.connect() on a non-blocking socket raises EINPROGRESS
 # and that an immediate write/send/read/recv does the right thing
 
+import unittest
 import errno
 import select
 import socket
 import ssl
 
 # only mbedTLS supports non-blocking mode
-if not hasattr(ssl, "MBEDTLS_VERSION"):
-    print("SKIP")
-    raise SystemExit
+ssl_supports_nonblocking = hasattr(ssl, "MBEDTLS_VERSION")
 
 
 # get the name of an errno error code
@@ -24,34 +23,43 @@ def errno_name(er):
 # 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):
+def do_connect(self, peer_addr, tls, handshake):
     s = socket.socket()
     s.setblocking(False)
     try:
-        # print("Connecting to", peer_addr)
+        print("Connecting to", peer_addr)
         s.connect(peer_addr)
+        self.fail()
     except OSError as er:
         print("connect:", errno_name(er.errno))
+        self.assertEqual(er.errno, errno.EINPROGRESS)
+
     # wrap with ssl/tls if desired
     if tls:
+        print("wrap socket")
         ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        try:
-            s = ssl_context.wrap_socket(s, do_handshake_on_connect=handshake)
-            print("wrap ok: True")
-        except Exception as e:
-            print("wrap er:", e)
+        s = ssl_context.wrap_socket(s, do_handshake_on_connect=handshake)
+
     return s
 
 
-# poll a socket and print out the result
-def poll(s):
+# poll a socket and check the result
+def poll(self, s, expect_writable):
     poller = select.poll()
     poller.register(s)
-    print("poll:   ", poller.poll(0))
+    result = poller.poll(0)
+    print("poll:", result)
+    if expect_writable:
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0][1], select.POLLOUT)
+    else:
+        self.assertEqual(result, [])
+
 
+# do_test runs the test against a specific peer address.
+def do_test(self, peer_addr, tls, handshake):
+    print()
 
-# test runs the test against a specific peer address.
-def test(peer_addr, tls, handshake):
     # MicroPython plain and TLS sockets have read/write
     hasRW = True
 
@@ -62,54 +70,66 @@ def test(peer_addr, tls, handshake):
     # connect + send
     # non-blocking send should raise EAGAIN
     if hasSR:
-        s = do_connect(peer_addr, tls, handshake)
-        poll(s)
-        try:
+        s = do_connect(self, peer_addr, tls, handshake)
+        poll(self, s, False)
+        with self.assertRaises(OSError) as ctx:
             ret = s.send(b"1234")
-            print("send ok:", ret)  # shouldn't get here
-        except OSError as er:
-            print("send er:", errno_name(er.errno))
+        print("send error:", errno_name(ctx.exception.errno))
+        self.assertEqual(ctx.exception.errno, errno.EAGAIN)
         s.close()
 
     # connect + write
     # non-blocking write should return None
     if hasRW:
-        s = do_connect(peer_addr, tls, handshake)
-        poll(s)
+        s = do_connect(self, peer_addr, tls, handshake)
+        poll(self, s, tls and handshake)
         ret = s.write(b"1234")
-        print("write:  ", ret)
+        print("write:", ret)
+        if tls and handshake:
+            self.assertEqual(ret, 4)
+        else:
+            self.assertIsNone(ret)
         s.close()
 
     # connect + recv
     # non-blocking recv should raise EAGAIN
     if hasSR:
-        s = do_connect(peer_addr, tls, handshake)
-        poll(s)
-        try:
+        s = do_connect(self, peer_addr, tls, handshake)
+        poll(self, s, False)
+        with self.assertRaises(OSError) as ctx:
             ret = s.recv(10)
-            print("recv ok:", ret)  # shouldn't get here
-        except OSError as er:
-            print("recv er:", errno_name(er.errno))
+        print("recv error:", errno_name(ctx.exception.errno))
+        self.assertEqual(ctx.exception.errno, errno.EAGAIN)
         s.close()
 
     # connect + read
     # non-blocking read should return None
     if hasRW:
-        s = do_connect(peer_addr, tls, handshake)
-        poll(s)
+        s = do_connect(self, peer_addr, tls, handshake)
+        poll(self, s, tls and handshake)
         ret = s.read(10)
-        print("read:   ", ret)
+        print("read:", ret)
+        self.assertIsNone(ret)
         s.close()
 
 
-if __name__ == "__main__":
+class Test(unittest.TestCase):
     # 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 ---")
-    test(socket.getaddrinfo("192.0.2.1", 443)[0][-1], True, False)
-    print("--- Plain sockets ---")
-    test(socket.getaddrinfo("micropython.org", 80)[0][-1], False, False)
-    print("--- SSL sockets ---")
-    test(socket.getaddrinfo("micropython.org", 443)[0][-1], True, True)
+    def test_plain_sockets_to_nowhere(self):
+        do_test(self, socket.getaddrinfo("192.0.2.1", 80)[0][-1], False, False)
+
+    @unittest.skipIf(not ssl_supports_nonblocking, "SSL doesn't support non-blocking")
+    def test_ssl_sockets_to_nowhere(self):
+        do_test(self, socket.getaddrinfo("192.0.2.1", 443)[0][-1], True, False)
+
+    def test_plain_sockets(self):
+        do_test(self, socket.getaddrinfo("micropython.org", 80)[0][-1], False, False)
+
+    @unittest.skipIf(not ssl_supports_nonblocking, "SSL doesn't support non-blocking")
+    def test_ssl_sockets(self):
+        do_test(self, socket.getaddrinfo("micropython.org", 443)[0][-1], True, True)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/net_hosted/connect_nonblock_xfer.py.exp b/tests/net_hosted/connect_nonblock_xfer.py.exp
deleted file mode 100644
index c5498a03873a0..0000000000000
--- a/tests/net_hosted/connect_nonblock_xfer.py.exp
+++ /dev/null
@@ -1,44 +0,0 @@
---- Plain sockets to nowhere ---
-connect: EINPROGRESS
-poll:    []
-send er: EAGAIN
-connect: EINPROGRESS
-poll:    []
-write:   None
-connect: EINPROGRESS
-poll:    []
-recv er: EAGAIN
-connect: EINPROGRESS
-poll:    []
-read:    None
---- SSL sockets to nowhere ---
-connect: EINPROGRESS
-wrap ok: True
-poll:    []
-write:   None
-connect: EINPROGRESS
-wrap ok: True
-poll:    []
-read:    None
---- Plain sockets ---
-connect: EINPROGRESS
-poll:    []
-send er: EAGAIN
-connect: EINPROGRESS
-poll:    []
-write:   None
-connect: EINPROGRESS
-poll:    []
-recv er: EAGAIN
-connect: EINPROGRESS
-poll:    []
-read:    None
---- SSL sockets ---
-connect: EINPROGRESS
-wrap ok: True
-poll:    [(<SSLSocket>, 4)]
-write:   4
-connect: EINPROGRESS
-wrap ok: True
-poll:    [(<SSLSocket>, 4)]
-read:    None

From 2c80d369988a84d85efe0483f9cf469ff27b70f9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Dec 2024 15:12:34 +1100
Subject: [PATCH 1669/3129] tests/extmod: Convert machine1.py test to use
 unittest.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine1.py     | 55 +++++++++++++++++-------------------
 tests/extmod/machine1.py.exp |  8 ------
 2 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 tests/extmod/machine1.py.exp

diff --git a/tests/extmod/machine1.py b/tests/extmod/machine1.py
index 90e6d17174fb3..2f1c0681f64d5 100644
--- a/tests/extmod/machine1.py
+++ b/tests/extmod/machine1.py
@@ -8,39 +8,36 @@
     print("SKIP")
     raise SystemExit
 
-print(machine.mem8)
+import unittest
 
-try:
-    machine.mem16[1]
-except ValueError:
-    print("ValueError")
 
-try:
-    machine.mem16[1] = 1
-except ValueError:
-    print("ValueError")
+class Test(unittest.TestCase):
+    def test_mem8_print(self):
+        self.assertEqual(repr(machine.mem8), "<8-bit memory>")
 
-try:
-    del machine.mem8[0]
-except TypeError:
-    print("TypeError")
+    def test_alignment(self):
+        with self.assertRaises(ValueError):
+            machine.mem16[1]
 
-try:
-    machine.mem8[0:1]
-except TypeError:
-    print("TypeError")
+        with self.assertRaises(ValueError):
+            machine.mem16[1] = 1
 
-try:
-    machine.mem8[0:1] = 10
-except TypeError:
-    print("TypeError")
+    def test_operations(self):
+        with self.assertRaises(TypeError):
+            del machine.mem8[0]
 
-try:
-    machine.mem8["hello"]
-except TypeError:
-    print("TypeError")
+        with self.assertRaises(TypeError):
+            machine.mem8[0:1]
 
-try:
-    machine.mem8["hello"] = 10
-except TypeError:
-    print("TypeError")
+        with self.assertRaises(TypeError):
+            machine.mem8[0:1] = 10
+
+        with self.assertRaises(TypeError):
+            machine.mem8["hello"]
+
+        with self.assertRaises(TypeError):
+            machine.mem8["hello"] = 10
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/extmod/machine1.py.exp b/tests/extmod/machine1.py.exp
deleted file mode 100644
index 250485969086e..0000000000000
--- a/tests/extmod/machine1.py.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-<8-bit memory>
-ValueError
-ValueError
-TypeError
-TypeError
-TypeError
-TypeError
-TypeError

From a118cf9ab0d44a69b4af23e2f42a49c2abafca41 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 30 Nov 2024 08:31:36 +0100
Subject: [PATCH 1670/3129] extmod/extmod.mk: Fix libmetal build prefix.

libmetal source files already have the build directory prefix, because
they're auto-generated inside the build directory. When they're added
to `SRC_THIRDPARTY_C`, another build directory prefix is added resulting
in the object files being generated in a nested build directory.
This patch strips the build directory prefix before adding libmetal's
source files.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 extmod/extmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 514197d6b9a88..f2ae3ad6923fb 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -616,6 +616,6 @@ $(BUILD)/$(OPENAMP_DIR)/lib/virtio_mmio/virtio_mmio_drv.o: CFLAGS += -Wno-unused
 # We need to have generated libmetal before compiling OpenAMP.
 $(addprefix $(BUILD)/, $(SRC_OPENAMP_C:.c=.o)): $(BUILD)/openamp/metal/config.h
 
-SRC_THIRDPARTY_C += $(SRC_LIBMETAL_C) $(SRC_OPENAMP_C)
+SRC_THIRDPARTY_C += $(SRC_OPENAMP_C) $(SRC_LIBMETAL_C:$(BUILD)/%=%)
 
 endif # MICROPY_PY_OPENAMP

From c55202dd6390d13f77f5bd10c504300eadcfd1a7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 29 Nov 2024 14:31:18 +0100
Subject: [PATCH 1671/3129] shared/tinyusb: Set MSC max endpoint size based on
 device speed.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 shared/tinyusb/mp_usbd_descriptor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared/tinyusb/mp_usbd_descriptor.c b/shared/tinyusb/mp_usbd_descriptor.c
index be3473b6b9142..d0c8845b68087 100644
--- a/shared/tinyusb/mp_usbd_descriptor.c
+++ b/shared/tinyusb/mp_usbd_descriptor.c
@@ -34,6 +34,7 @@
 
 #define USBD_CDC_CMD_MAX_SIZE (8)
 #define USBD_CDC_IN_OUT_MAX_SIZE ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 64)
+#define USBD_MSC_IN_OUT_MAX_SIZE ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 64)
 
 const tusb_desc_device_t mp_usbd_builtin_desc_dev = {
     .bLength = sizeof(tusb_desc_device_t),
@@ -61,7 +62,7 @@ const uint8_t mp_usbd_builtin_desc_cfg[MP_USBD_BUILTIN_DESC_CFG_LEN] = {
         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),
+    TUD_MSC_DESCRIPTOR(USBD_ITF_MSC, USBD_STR_MSC, EPNUM_MSC_OUT, EPNUM_MSC_IN, USBD_MSC_IN_OUT_MAX_SIZE),
     #endif
 };
 

From 67b4e6236bb769d74cf5c625da9baad13806c9e5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 29 Nov 2024 16:15:21 +0100
Subject: [PATCH 1672/3129] mimxrt: Switch to shared TinyUSB descriptor.

This removes duplicated TinyUSB configuration and port-specific code.

Tested on RT1062, CDC+MSC still working.  @robert-hh tested CDC with 1011,
1015, 1020 and 1176.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile                  |   5 +-
 ports/mimxrt/mpconfigport.h            |   8 ++
 ports/mimxrt/tusb_port.c               | 138 -------------------------
 ports/mimxrt/{tusb_config.h => usbd.c} |  27 +++--
 4 files changed, 28 insertions(+), 150 deletions(-)
 delete mode 100644 ports/mimxrt/tusb_port.c
 rename ports/mimxrt/{tusb_config.h => usbd.c} (71%)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index e98073d33626d..3a9550cc974d8 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -78,6 +78,7 @@ 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
+INC += -I$(TOP)/shared/tinyusb
 INC += -I.
 INC += -Ihal
 
@@ -215,7 +216,7 @@ SRC_C += \
 	sdio.c \
 	systick.c \
 	ticks.c \
-	tusb_port.c \
+	usbd.c \
 
 SHARED_SRC_C += \
 	shared/libc/printf.c \
@@ -234,6 +235,7 @@ SHARED_SRC_C += \
 	shared/timeutils/timeutils.c \
 	shared/tinyusb/mp_usbd.c \
 	shared/tinyusb/mp_usbd_cdc.c \
+	shared/tinyusb/mp_usbd_descriptor.c \
 
 # Set flash driver name, base address and internal flash flag, based on the flash type.
 ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash))
@@ -343,6 +345,7 @@ CFLAGS += \
 	-DBOARD_$(BOARD) \
 	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT1XXX \
+	-DCFG_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED \
 	-DCLOCK_CONFIG_H='<boards/$(MCU_SERIES)_clock_config.h>' \
 	-DCPU_$(MCU_SERIES)$(MCU_CORE) \
 	-DCPU_$(MCU_VARIANT) \
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 5ef6695c1425c..31444e4980be5 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -188,6 +188,14 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
+#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_EVENT_POLL_HOOK
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
deleted file mode 100644
index f81200e2caa87..0000000000000
--- a/ports/mimxrt/tusb_port.c
+++ /dev/null
@@ -1,138 +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 "tusb.h"
-#include "py/mphal.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_MANUFACTURER_STRING
-#define MICROPY_HW_USB_MANUFACTURER_STRING ("MicroPython")
-#endif
-
-#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 (512)
-
-#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 = 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,
-        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] = MICROPY_HW_USB_MANUFACTURER_STRING,
-    [USBD_STR_PRODUCT] = MICROPY_HW_BOARD_NAME,
-    [USBD_STR_SERIAL] = "00000000000000000000",
-    [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];
-    static const char hexchr[16] = "0123456789ABCDEF";
-
-    memset(desc_str, 0, sizeof(desc_str));
-
-    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;
-        }
-        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];
-            }
-        }
-    }
-
-    // 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/mimxrt/tusb_config.h b/ports/mimxrt/usbd.c
similarity index 71%
rename from ports/mimxrt/tusb_config.h
rename to ports/mimxrt/usbd.c
index 607f36446f858..47126ddc017a2 100644
--- a/ports/mimxrt/tusb_config.h
+++ b/ports/mimxrt/usbd.c
@@ -1,7 +1,9 @@
 /*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
  * The MIT License (MIT)
  *
- * Copyright (c) 2020 Jim Mussared
+ * Copyright (c) 2024 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
@@ -20,18 +22,21 @@
  * LIABILITY, WHETHER IN AN ACTION 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_TUSB_CONFIG_H
-#define MICROPY_INCLUDED_MIMXRT_TUSB_CONFIG_H
 
-#define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED)
+#include "py/mpconfig.h"
+
+#if MICROPY_HW_ENABLE_USBDEV
 
-#define CFG_TUSB_OS             (OPT_OS_NONE)
+#include "py/mphal.h"
+#include "mp_usbd.h"
+#include "string.h"
+#include "tusb.h"
 
-#define CFG_TUD_CDC             (1)
-#define CFG_TUD_CDC_RX_BUFSIZE  (512)
-#define CFG_TUD_CDC_TX_BUFSIZE  (512)
-#define CFG_TUD_CDC_PERSISTENT_TX_BUFF (1)
+void mp_usbd_port_get_serial_number(char *serial_buf) {
+    uint8_t uid[8];
+    mp_hal_get_unique_id(uid);
+    mp_usbd_hex_str(serial_buf, uid, sizeof(uid));
+}
 
-#endif // MICROPY_INCLUDED_MIMXRT_TUSB_CONFIG_H
+#endif

From d5d366beef8d0331ee533b28d2e3024e34123ef1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 29 Nov 2024 14:51:58 +0100
Subject: [PATCH 1673/3129] nrf/boards/ARDUINO_NANO_33_BLE_SENSE: Update LED
 and timer config.

Changes:
- Enable hardware timer.
- Define LED pins.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h | 1 +
 ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv        | 4 ++++
 2 files changed, 5 insertions(+)

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 a4bb1d899e067..65642bf234226 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
@@ -13,6 +13,7 @@
 
 #define MICROPY_PY_MACHINE_UART         (1)
 #define MICROPY_PY_MACHINE_HW_PWM       (1)
+#define MICROPY_PY_MACHINE_TIMER_NRF    (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_NANO_33_BLE_SENSE/pins.csv b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
index 972dd9d3bdcb8..52e3df400e0b5 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
@@ -80,3 +80,7 @@ TX,P35
 RX,P42
 I2C_SCL,P2
 I2C_SDA,P31
+LED_RED,P24
+LED_GREEN,P16
+LED_BLUE,P6
+LED_YELLOW,P13

From b5e80fafb2d5ef69fd80dbc6d7e839ffaa5a0f98 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 29 Nov 2024 16:56:20 +0100
Subject: [PATCH 1674/3129] drivers/memory/spiflash: Add a config option to
 soft-reset SPI flash.

Add a compile-time config option to soft-reset SPI flash on init.  This
puts the flash in a known state on reset.  Note this option is
disabled by default.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/memory/spiflash.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index e66153636b1fd..773334e167ae3 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -44,6 +44,8 @@
 #define CMD_RD_DEVID    (0x9f)
 #define CMD_CHIP_ERASE  (0xc7)
 #define CMD_C4READ      (0xeb)
+#define CMD_RSTEN       (0x66)
+#define CMD_RESET       (0x99)
 
 // 32 bit addressing commands
 #define CMD_WRITE_32    (0x12)
@@ -180,6 +182,14 @@ void mp_spiflash_init(mp_spiflash_t *self) {
     // Ensure SPI flash is out of sleep mode
     mp_spiflash_deepsleep_internal(self, 0);
 
+    // Software reset.
+    #if MICROPY_HW_SPIFLASH_SOFT_RESET
+    mp_spiflash_write_cmd(self, CMD_RSTEN);
+    mp_spiflash_write_cmd(self, CMD_RESET);
+    mp_spiflash_wait_wip0(self);
+    mp_hal_delay_ms(1);
+    #endif
+
     #if defined(CHECK_DEVID)
     // Validate device id
     uint32_t devid;

From 46ca78e23fdf86d9f7d101142d5448529b0ef7be Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 29 Nov 2024 16:57:38 +0100
Subject: [PATCH 1675/3129] stm32/boards: Update Arduino board configs for SPI
 reset and bootloader.

Update ARDUINO_GIGA, ARDUINO_OPTA, ARDUINO_NICLA_VISION and
ARDUINO_PORTENTA_H7 to:
- Enable SPI flash soft-reset.
- Disable enter bootloader via reset.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h         | 2 ++
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h | 2 ++
 ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h         | 2 ++
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h  | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index d09a074402e7b..2b86ce528e266 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -29,9 +29,11 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_ENABLE_SDCARD    (0)
 #define MICROPY_HW_ENABLE_MMCARD    (0)
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
+#define MICROPY_HW_SPIFLASH_SOFT_RESET              (1)
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (0)
 
 #define MICROPY_BOARD_STARTUP       GIGA_board_startup
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 796a9fae923b1..7bb75091e8bdf 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -29,9 +29,11 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_ENABLE_SDCARD    (0)
 #define MICROPY_HW_ENABLE_MMCARD    (0)
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
+#define MICROPY_HW_SPIFLASH_SOFT_RESET              (1)
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (0)
 
 #define MICROPY_BOARD_STARTUP       NICLAV_board_startup
diff --git a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
index 869522e1ee70f..f52c8a26a81d0 100644
--- a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
@@ -25,9 +25,11 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_TIMER     (1)
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
+#define MICROPY_HW_SPIFLASH_SOFT_RESET              (1)
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (0)
 
 #define MICROPY_BOARD_STARTUP       OPTA_board_startup
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 860a0f688b2d9..5442f74276178 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -29,9 +29,11 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_HW_ENABLE_MMCARD    (0)
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
+#define MICROPY_HW_SPIFLASH_SOFT_RESET              (1)
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (0)
 
 #define MICROPY_BOARD_STARTUP       PORTENTA_board_startup

From 47d9988df2c7c6a4603f631b02a3f3a5c7e997f4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 4 Dec 2024 09:54:13 +0100
Subject: [PATCH 1676/3129] stm32/boards: Rename SDRAM frequency config option
 to make units clear.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h        | 2 +-
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index 2b86ce528e266..99b92a3793f03 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -233,7 +233,7 @@ extern struct _spi_bdev_t spi_bdev;
 // 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_FREQUENCY_KHZ      (100000) // 100 MHz
 #define MICROPY_HW_SDRAM_TIMING_TMRD        (2)
 #define MICROPY_HW_SDRAM_TIMING_TXSR        (7)
 #define MICROPY_HW_SDRAM_TIMING_TRAS        (5)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 5442f74276178..6b77b16093fb4 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -247,7 +247,7 @@ extern struct _spi_bdev_t spi_bdev;
 // 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_FREQUENCY_KHZ      (100000) // 100 MHz
 #define MICROPY_HW_SDRAM_TIMING_TMRD        (2)
 #define MICROPY_HW_SDRAM_TIMING_TXSR        (7)
 #define MICROPY_HW_SDRAM_TIMING_TRAS        (5)

From 17808e7b749b269b58dcee67df599a0c61d455bd Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 30 Nov 2024 09:56:23 +0100
Subject: [PATCH 1677/3129] stm32/sdram: Make SDRAM refresh count configurable
 by a board.

Refresh count calculations were using a hard-coded SDRAM frequency and
refresh cycles, so change them to values that can be set by a board.

And set these options to their existing values on STM32F769DISC and
STM32F7DISC boards.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h | 2 ++
 ports/stm32/boards/STM32F7DISC/mpconfigboard.h   | 2 ++
 ports/stm32/sdram.c                              | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index f899091d201c0..017de9c068395 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -141,6 +141,7 @@ extern struct _spi_bdev_t spi_bdev;
 
 #define MICROPY_HW_SDRAM_BURST_LENGTH       1
 #define MICROPY_HW_SDRAM_CAS_LATENCY        2
+#define MICROPY_HW_SDRAM_FREQUENCY_KHZ      (90000) // 90 MHz
 #define MICROPY_HW_SDRAM_COLUMN_BITS_NUM    8
 #define MICROPY_HW_SDRAM_ROW_BITS_NUM       12
 #define MICROPY_HW_SDRAM_MEM_BUS_WIDTH      32
@@ -150,6 +151,7 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_SDRAM_RBURST             (1)
 #define MICROPY_HW_SDRAM_WRITE_PROTECTION   (0)
 #define MICROPY_HW_SDRAM_AUTOREFRESH_NUM    (8)
+#define MICROPY_HW_SDRAM_REFRESH_CYCLES     8192
 
 // See pins.csv for CPU pin mapping
 #define MICROPY_HW_FMC_SDCKE0  (pyb_pin_FMC_SDCKE0)
diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.h b/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
index cf7061902ee75..d4b21484ad4ba 100644
--- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
@@ -111,6 +111,7 @@ void STM32F7DISC_board_early_init(void);
 
 #define MICROPY_HW_SDRAM_BURST_LENGTH       1
 #define MICROPY_HW_SDRAM_CAS_LATENCY        2
+#define MICROPY_HW_SDRAM_FREQUENCY_KHZ      (90000) // 90 MHz
 #define MICROPY_HW_SDRAM_COLUMN_BITS_NUM    8
 #define MICROPY_HW_SDRAM_ROW_BITS_NUM       12
 #define MICROPY_HW_SDRAM_MEM_BUS_WIDTH      16
@@ -120,6 +121,7 @@ void STM32F7DISC_board_early_init(void);
 #define MICROPY_HW_SDRAM_RBURST             (1)
 #define MICROPY_HW_SDRAM_WRITE_PROTECTION   (0)
 #define MICROPY_HW_SDRAM_AUTOREFRESH_NUM    (8)
+#define MICROPY_HW_SDRAM_REFRESH_CYCLES     8192
 
 #define MICROPY_HW_FMC_SDCKE0   (pin_C3)
 #define MICROPY_HW_FMC_SDNE0    (pin_H3)
diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index e99f34d2262a8..7104eb68e8ff3 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -245,15 +245,15 @@ static void sdram_init_seq(SDRAM_HandleTypeDef
     /* Send the command */
     HAL_SDRAM_SendCommand(hsdram, command, 0x1000);
 
-    /* Step 8: Set the refresh rate counter
+    /* Step 8: Set the refresh rate counter.
+       Assuming 90MHz frequency, 8192 refresh cycles and 64ms refresh rate:
        RefreshRate = 64 ms / 8192 cyc = 7.8125 us/cyc
-
        RefreshCycles = 7.8125 us * 90 MHz = 703
        According to the formula on p.1665 of the reference manual,
        we also need to subtract 20 from the value, so the target
        refresh rate is 703 - 20 = 683.
      */
-    #define REFRESH_COUNT (MICROPY_HW_SDRAM_REFRESH_RATE * 90000 / 8192 - 20)
+    #define REFRESH_COUNT (MICROPY_HW_SDRAM_REFRESH_RATE * MICROPY_HW_SDRAM_FREQUENCY_KHZ / MICROPY_HW_SDRAM_REFRESH_CYCLES - 20)
     HAL_SDRAM_ProgramRefreshRate(hsdram, REFRESH_COUNT);
 
     #if defined(STM32F7) || defined(STM32H7)

From d42e39d87d37f20d74456222e603d0b6b409a556 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 2 Dec 2024 08:09:25 +0100
Subject: [PATCH 1678/3129] stm32/spi: Add spi_deinit_all function.

SPI objects can remain active after a soft-reboot because they are
statically allocated and lack a finalizer to collect and deinitialize them.
This commit adds a `spi_deinit_all()` functions for SPI, similar to other
peripherals such as UART, DAC, etc.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/spi.c | 9 +++++++++
 ports/stm32/spi.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 607b3fe685a4c..aa459119c146c 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -545,6 +545,15 @@ void spi_deinit(const spi_t *spi_obj) {
     }
 }
 
+void spi_deinit_all(void) {
+    for (int i = 0; i < MP_ARRAY_SIZE(spi_obj); i++) {
+        const spi_t *spi = &spi_obj[i];
+        if (spi->spi != NULL) {
+            spi_deinit(spi);
+        }
+    }
+}
+
 static HAL_StatusTypeDef spi_wait_dma_finished(const spi_t *spi, uint32_t t_start, uint32_t timeout) {
     volatile HAL_SPI_StateTypeDef *state = &spi->spi->State;
     for (;;) {
diff --git a/ports/stm32/spi.h b/ports/stm32/spi.h
index a8bc9d2cfdbe3..204038a92f351 100644
--- a/ports/stm32/spi.h
+++ b/ports/stm32/spi.h
@@ -67,6 +67,7 @@ extern const mp_obj_type_t pyb_spi_type;
 void spi_init0(void);
 int spi_init(const spi_t *spi, bool enable_nss_pin);
 void spi_deinit(const spi_t *spi_obj);
+void spi_deinit_all(void);
 int spi_find_index(mp_obj_t id);
 void spi_set_params(const spi_t *spi_obj, uint32_t prescale, int32_t baudrate,
     int32_t polarity, int32_t phase, int32_t bits, int32_t firstbit);

From 405aa69887558d561a993d5e9aa47b2ec7e76d9a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 2 Dec 2024 08:09:47 +0100
Subject: [PATCH 1679/3129] stm32/pyb_i2c: Add pyb_i2c_deinit_all function.

I2C objects can remain active after a soft-reboot because they are
statically allocated and lack a finalizer to collect and deinitialize them.
This commit adds a `pyb_i2c_deinit_all()` function for I2C, similar to
other peripherals such as UART, DAC, etc.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/i2c.h     | 1 +
 ports/stm32/pyb_i2c.c | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/ports/stm32/i2c.h b/ports/stm32/i2c.h
index 04a7e928bdbdf..a48076842cbbf 100644
--- a/ports/stm32/i2c.h
+++ b/ports/stm32/i2c.h
@@ -50,6 +50,7 @@ void i2c_init0(void);
 int pyb_i2c_init(I2C_HandleTypeDef *i2c);
 int pyb_i2c_init_freq(const pyb_i2c_obj_t *self, mp_int_t freq);
 uint32_t pyb_i2c_get_baudrate(I2C_HandleTypeDef *i2c);
+void pyb_i2c_deinit_all(void);
 void i2c_ev_irq_handler(mp_uint_t i2c_id);
 void i2c_er_irq_handler(mp_uint_t i2c_id);
 
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 0529d3bd56e40..7e1489010d097 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -428,6 +428,15 @@ int pyb_i2c_init_freq(const pyb_i2c_obj_t *self, mp_int_t freq) {
     return pyb_i2c_init(self->i2c);
 }
 
+void pyb_i2c_deinit_all(void) {
+    for (int i = 0; i < MP_ARRAY_SIZE(pyb_i2c_obj); i++) {
+        const pyb_i2c_obj_t *pyb_i2c = &pyb_i2c_obj[i];
+        if (pyb_i2c->i2c != NULL) {
+            i2c_deinit(pyb_i2c->i2c);
+        }
+    }
+}
+
 static void i2c_reset_after_error(I2C_HandleTypeDef *i2c) {
     // wait for bus-busy flag to be cleared, with a timeout
     for (int timeout = 50; timeout > 0; --timeout) {

From 89191b00eae258642cd3d6458bc5440341bbc8d1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 2 Dec 2024 08:18:28 +0100
Subject: [PATCH 1680/3129] stm32/main: Deinitialize SPI and I2C on soft-reset.

Following UART, CAN, Timer, etc.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index df483602dc901..ea870ef0da7ca 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -678,6 +678,10 @@ void stm32_main(uint32_t reset_mode) {
     soft_timer_deinit();
     timer_deinit();
     uart_deinit_all();
+    spi_deinit_all();
+    #if MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
+    pyb_i2c_deinit_all();
+    #endif
     #if MICROPY_HW_ENABLE_CAN
     can_deinit_all();
     #endif

From fd01cdd203b1049fec35a82ba3ddd89c4bd62a67 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 1 Dec 2024 08:55:34 +0100
Subject: [PATCH 1681/3129] stm32/mpconfigport: Switch FATFS LFN to type 2.

LFN type 2 uses the stack to allocate the internal working buffer for LFN,
which is thread-safe and saves about 512 bytes of BSS memory (at the
expense of needing that much memory on the stack).

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index c6ba83d1bd293..dc0a767fb07ee 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -157,7 +157,7 @@
 #endif
 
 // fatfs configuration used in ffconf.h
-#define MICROPY_FATFS_ENABLE_LFN       (1)
+#define MICROPY_FATFS_ENABLE_LFN       (2)
 #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)

From 309aa268113bd1779433bb36f3a55f81fd129979 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 1 Dec 2024 08:58:02 +0100
Subject: [PATCH 1682/3129] rp2/mpconfigport: Switch FATFS LFN to type 2.

LFN type 2 uses the stack to allocate the internal working buffer for LFN,
which is thread-safe and saves about 512 bytes of BSS memory (at the
expense of needing that much memory on the stack).

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/rp2/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 15eeab4f34b07..8f4e846ba13bb 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -178,7 +178,7 @@
 #define MICROPY_HW_SOFT_TIMER_ALARM_NUM         (2)
 
 // fatfs configuration
-#define MICROPY_FATFS_ENABLE_LFN                (1)
+#define MICROPY_FATFS_ENABLE_LFN                (2)
 #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

From a2cdf9a95fea33ade5c608885424d6aae21773f5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 1 Dec 2024 08:58:24 +0100
Subject: [PATCH 1683/3129] renesas-ra/mpconfigport: Switch FATFS LFN to type
 2.

LFN type 2 uses the stack to allocate the internal working buffer for LFN,
which is thread-safe and saves about 512 bytes of BSS memory (at the
expense of needing that much memory on the stack).

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 307dac24ce583..bd936061fa406 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -167,7 +167,7 @@
 #endif
 
 // fatfs configuration used in ffconf.h
-#define MICROPY_FATFS_ENABLE_LFN       (1)
+#define MICROPY_FATFS_ENABLE_LFN       (2)
 #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)

From 2bee8e1b8cdaae0ac387c03e88a573e35256b092 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 1 Dec 2024 08:59:32 +0100
Subject: [PATCH 1684/3129] mimxrt/mpconfigport: Update FATFS config to align
 with other ports.

Make this port use the same FATFS config as stm32, rp2, renesas-ra.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mpconfigport.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 31444e4980be5..146c86015afd2 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -118,10 +118,12 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_ONEWIRE                  (1)
 
 // fatfs configuration used in ffconf.h
-#define MICROPY_FATFS_ENABLE_LFN            (1)
+#define MICROPY_FATFS_ENABLE_LFN            (2)
+#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_MAX_SS                (4096)
-#define MICROPY_FATFS_LFN_CODE_PAGE         437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 
 #ifndef MICROPY_PY_NETWORK
 #define MICROPY_PY_NETWORK                  (1)

From b20687d0e71360bf76eccedbb9d2c1f73697693a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 3 Dec 2024 10:02:46 +1100
Subject: [PATCH 1685/3129] esp32: Fix link failure due to link library order.

When a wrapped symbol is provided in its own file, it's possible for the
linker to skip that file entirely and not return to it depending on the
order of libraries passed on the linker command line.

This is because these wrapped symbols create linker cycles (libmain_espXX
depends on liblwip but liblwip now also depends on libmain for the wrapped
functions in lwip_patch.c, for example.)

Linker failure for symbols in lwip_patch.c was reproducible if mDNS was
disabled in the board configuration.

This commit adds an explicit undefined symbol for each file, to ensure
the linker will add the wrapped objects on its first pass.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/esp32_common.cmake | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 9d51a03aa856e..0a6b29983c2f5 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -242,12 +242,19 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
 target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
 target_link_libraries(${MICROPY_TARGET} usermod)
 
-# Enable the panic handler wrapper
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
-
-# Patch LWIP memory pool allocators (see lwip_patch.c)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_malloc" APPEND)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_free" APPEND)
+# Extra linker options
+# (when wrap symbols are in standalone files, --undefined ensures
+# the linker doesn't skip that file.)
+target_link_options(${MICROPY_TARGET} PUBLIC
+  # Patch LWIP memory pool allocators (see lwip_patch.c)
+  -Wl,--undefined=memp_malloc
+  -Wl,--wrap=memp_malloc
+  -Wl,--wrap=memp_free
+
+  # Enable the panic handler wrapper
+  -Wl,--undefined=esp_panic_handler
+  -Wl,--wrap=esp_panic_handler
+)
 
 # Collect all of the include directories and compile definitions for the IDF components,
 # including those added by the IDF Component Manager via idf_components.yaml.

From 5564f3042ca850e363e6644b3df0b006785fcf2d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 28 Aug 2024 09:21:34 +1000
Subject: [PATCH 1686/3129] esp32: Add basic espressif IDF v5.3 compatibility.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md         |  2 +-
 ports/esp32/network_wlan.c    |  7 ++++++-
 ports/esp32/usb_serial_jtag.c | 11 +++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 4eb791389380c..9f842a5a52cd6 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 v5.0.4, v5.0.5, v5.1.2, v5.2.0, v5.2.2.
+Currently MicroPython supports v5.0.4, v5.0.5, v5.1.2, v5.2.0, v5.2.2, v5.3.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 6509b4fc6aaed..d52123ee0a3a2 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -768,6 +768,9 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_EXT_PSK), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK) },
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_EXT_PSK_MIXED_MODE), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE) },
     #endif
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+    { MP_ROM_QSTR(MP_QSTR_SEC_DPP), MP_ROM_INT(WIFI_AUTH_DPP) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(WIFI_PS_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(WIFI_PS_MIN_MODEM) },
@@ -775,7 +778,9 @@ 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);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+_Static_assert(WIFI_AUTH_MAX == 14, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types_generic.h");
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
 _Static_assert(WIFI_AUTH_MAX == 13, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
 #elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
 _Static_assert(WIFI_AUTH_MAX == 11, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c
index 32eb806e72959..c4834e56f962d 100644
--- a/ports/esp32/usb_serial_jtag.c
+++ b/ports/esp32/usb_serial_jtag.c
@@ -35,10 +35,13 @@
 #include "soc/periph_defs.h"
 #include "freertos/portmacro.h"
 
-#define USB_SERIAL_JTAG_BUF_SIZE (64)
+// Number of bytes in the input buffer, and number of bytes for output chunking.
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+#define USB_SERIAL_JTAG_PACKET_SZ_BYTES (64)
+#endif
 
 static DRAM_ATTR portMUX_TYPE rx_mux = portMUX_INITIALIZER_UNLOCKED;
-static uint8_t rx_buf[USB_SERIAL_JTAG_BUF_SIZE];
+static uint8_t rx_buf[USB_SERIAL_JTAG_PACKET_SZ_BYTES];
 static volatile bool terminal_connected = false;
 
 static void usb_serial_jtag_handle_rx(void) {
@@ -48,8 +51,8 @@ static void usb_serial_jtag_handle_rx(void) {
         portENTER_CRITICAL(&rx_mux);
     }
     size_t req_len = ringbuf_free(&stdin_ringbuf);
-    if (req_len > USB_SERIAL_JTAG_BUF_SIZE) {
-        req_len = USB_SERIAL_JTAG_BUF_SIZE;
+    if (req_len > USB_SERIAL_JTAG_PACKET_SZ_BYTES) {
+        req_len = USB_SERIAL_JTAG_PACKET_SZ_BYTES;
     }
     size_t len = usb_serial_jtag_ll_read_rxfifo(rx_buf, req_len);
     for (size_t i = 0; i < len; ++i) {

From 5fb846df67189363904dcbb9c2bc93d0f287ccd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 3 Dec 2024 11:08:13 +0100
Subject: [PATCH 1687/3129] esp32: Fix machine_touchpad compiling on IDFv5.3.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_touchpad.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index 48250280badaf..299c489f5a831 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -31,9 +31,17 @@
 
 #if SOC_TOUCH_SENSOR_SUPPORTED
 
-#if SOC_TOUCH_VERSION_1 // ESP32 only
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
+#if SOC_TOUCH_VERSION_1
+#define SOC_TOUCH_SENSOR_VERSION (1)
+#elif SOC_TOUCH_VERSION_2
+#define SOC_TOUCH_SENSOR_VERSION (2)
+#endif
+#endif
+
+#if SOC_TOUCH_SENSOR_VERSION == 1 // ESP32 only
 #include "driver/touch_pad.h"
-#elif SOC_TOUCH_VERSION_2 // All other SoCs with touch, to date
+#elif SOC_TOUCH_SENSOR_VERSION == 2 // All other SoCs with touch, to date
 #include "driver/touch_sensor.h"
 #else
 #error "Unknown touch hardware version"
@@ -98,13 +106,13 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
         touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
         initialized = 1;
     }
-    #if SOC_TOUCH_VERSION_1
+    #if SOC_TOUCH_SENSOR_VERSION == 1
     esp_err_t err = touch_pad_config(self->touchpad_id, 0);
-    #elif SOC_TOUCH_VERSION_2
+    #elif SOC_TOUCH_SENSOR_VERSION == 2
     esp_err_t err = touch_pad_config(self->touchpad_id);
     #endif
     if (err == ESP_OK) {
-        #if SOC_TOUCH_VERSION_2
+        #if SOC_TOUCH_SENSOR_VERSION == 2
         touch_pad_fsm_start();
         #endif
 
@@ -115,10 +123,10 @@ 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 SOC_TOUCH_VERSION_1
+    #if SOC_TOUCH_SENSOR_VERSION == 1
     uint16_t value = mp_obj_get_int(value_in);
     esp_err_t err = touch_pad_config(self->touchpad_id, value);
-    #elif SOC_TOUCH_VERSION_2
+    #elif SOC_TOUCH_SENSOR_VERSION == 2
     esp_err_t err = touch_pad_config(self->touchpad_id);
     #endif
     if (err == ESP_OK) {
@@ -130,10 +138,10 @@ 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 SOC_TOUCH_VERSION_1
+    #if SOC_TOUCH_SENSOR_VERSION == 1
     uint16_t value;
     esp_err_t err = touch_pad_read(self->touchpad_id, &value);
-    #elif SOC_TOUCH_VERSION_2
+    #elif SOC_TOUCH_SENSOR_VERSION == 2
     uint32_t value;
     esp_err_t err = touch_pad_read_raw_data(self->touchpad_id, &value);
     #endif

From 160a4812cdd846f82f1f0bfb3798ada760d84d22 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 3 Dec 2024 11:00:24 +1100
Subject: [PATCH 1688/3129] esp32: Pass V=1 or BUILD_VERBOSE through to idf.py
 when building.

Allows verbose build to work the same on esp32 port as other ports.

To minimise copy/paste, split the BUILD_VERBOSE section of mkenv.mk
out to its own verbose.mk and include this in the port Makefile.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/Makefile |  6 ++++++
 py/mkenv.mk          | 17 +----------------
 py/verbose.mk        | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 py/verbose.mk

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 4ad3cf0267cda..8888180766b79 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -2,6 +2,8 @@
 #
 # This is a simple, convenience wrapper around idf.py (which uses cmake).
 
+include ../../py/verbose.mk
+
 # Select the board to build for:
 ifdef BOARD_DIR
 # Custom board path - remove trailing slash and get the final component of
@@ -61,6 +63,10 @@ ifdef MICROPY_PREVIEW_VERSION_2
 	IDFPY_FLAGS += -D MICROPY_PREVIEW_VERSION_2=1
 endif
 
+ifeq ($(BUILD_VERBOSE),1)
+	IDFPY_FLAGS += --verbose
+endif
+
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 define RUN_IDF_PY
diff --git a/py/mkenv.mk b/py/mkenv.mk
index b52dafbc9d0f6..4656d11366583 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -12,22 +12,7 @@ endif
 THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 TOP := $(patsubst %/py/mkenv.mk,%,$(THIS_MAKEFILE))
 
-# Turn on increased build verbosity by defining BUILD_VERBOSE in your main
-# Makefile or in your environment. You can also use V=1 on the make command
-# line.
-
-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)
-Q = @
-else
-Q =
-endif
+include $(TOP)/py/verbose.mk
 
 # default settings; can be overridden in main Makefile
 
diff --git a/py/verbose.mk b/py/verbose.mk
new file mode 100644
index 0000000000000..734623a21e80f
--- /dev/null
+++ b/py/verbose.mk
@@ -0,0 +1,16 @@
+# Turn on increased build verbosity by defining BUILD_VERBOSE in your main
+# Makefile or in your environment. You can also use V=1 on the make command
+# line.
+
+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)
+Q = @
+else
+Q =
+endif

From 31a1e2b96decb9b5945461d808f725d40720d3c4 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 3 Dec 2024 11:22:49 +1100
Subject: [PATCH 1689/3129] rp2: Pass V=1 or BUILD_VERBOSE to rp2 build.

Similar to esp32. Previously rp2 could build verbose by passing VERBOSE=1,
which is picked up by Makefiles generated from CMake.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index f950bc7b90898..afa21cc7a4383 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -2,6 +2,8 @@
 #
 # This is a simple wrapper around cmake
 
+include ../../py/verbose.mk
+
 # Select the board to build for:
 ifdef BOARD_DIR
 # Custom board path - remove trailing slash and get the final component of
@@ -28,7 +30,9 @@ else
 BUILD ?= build-$(BOARD)
 endif
 
-$(VERBOSE)MAKESILENT = -s
+ifeq ($(BUILD_VERBOSE),1)
+MAKE_ARGS += VERBOSE=1  # Picked up in Makefile generated by CMake
+endif
 
 CMAKE_ARGS += -DMICROPY_BOARD=$(BOARD) -DMICROPY_BOARD_DIR="$(abspath $(BOARD_DIR))"
 
@@ -56,7 +60,7 @@ HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wi
 
 all:
 	[ -e $(BUILD)/Makefile ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
-	$(MAKE) $(MAKESILENT) -C $(BUILD) || (echo -e $(HELP_BUILD_ERROR); false)
+	$(MAKE) $(MAKE_ARGS) -C $(BUILD) || (echo -e $(HELP_BUILD_ERROR); false)
 
 clean:
 	$(RM) -rf $(BUILD)

From 0f7d68043fce3c305ad68cba06e4126628048f3e Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 3 Dec 2024 13:24:47 +0100
Subject: [PATCH 1690/3129] py/misc: Fix msvc and C++ compatibility.

Use an explicit cast to suppress the implicit conversion which started
popping up in recent compiler versions (and wasn't there yet in 07bf3179).

Signed-off-by: stijn <stijn@ignitron.net>
---
 py/misc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/misc.h b/py/misc.h
index 8ac80bb7b3e34..2629d0c46cc53 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -357,7 +357,7 @@ static inline uint32_t mp_clzll(unsigned long long x) {
 // Microsoft don't ship _BitScanReverse64 on Win32, so emulate it
 static inline uint32_t mp_clzll(unsigned long long x) {
     unsigned long h = x >> 32;
-    return h ? mp_clzl(h) : (mp_clzl(x) + 32);
+    return h ? mp_clzl(h) : (mp_clzl((unsigned long)x) + 32);
 }
 #endif
 

From 5784714f734caf3713ff880ffe100bbbec59216e Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 18 Nov 2024 22:00:31 +0100
Subject: [PATCH 1691/3129] shared/runtime/gchelper_generic: Fix AArch32 build
 on Clang.

This commit fixes a compile error happening on Clang when building the
generic gchelper code for AArch32.

Clang would raise a warning regarding undefined variable access when
aliasing a variable to an existing CPU register.  The fix is pretty
crude but it works - it simply disables the warning in question for the
AArch32 gchelper collection function.  Care was taken to make sure the
code would also compile on GCC without warnings of sorts.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 shared/runtime/gchelper_generic.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/shared/runtime/gchelper_generic.c b/shared/runtime/gchelper_generic.c
index 0937231374057..45b2e4f7d848a 100644
--- a/shared/runtime/gchelper_generic.c
+++ b/shared/runtime/gchelper_generic.c
@@ -101,6 +101,10 @@ static void gc_helper_get_regs(gc_helper_regs_t arr) {
 // Fallback implementation, prefer gchelper_thumb1.s or gchelper_thumb2.s
 
 static void gc_helper_get_regs(gc_helper_regs_t arr) {
+    #ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wuninitialized"
+    #endif
     register long r4 asm ("r4");
     register long r5 asm ("r5");
     register long r6 asm ("r6");
@@ -121,6 +125,9 @@ static void gc_helper_get_regs(gc_helper_regs_t arr) {
     arr[7] = r11;
     arr[8] = r12;
     arr[9] = r13;
+    #ifdef __clang__
+    #pragma clang diagnostic pop
+    #endif
 }
 
 #elif defined(__aarch64__)

From 2a8f6047ff5c94bba7ace738a14b572cc8553251 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 18 Nov 2024 22:04:14 +0100
Subject: [PATCH 1692/3129] py/emitglue: Fix clear cache builtin warning on
 Clang for AArch32.

This commit fixes a warning occurring on Clang when calling
`__builtin___clear_cache` with non-void pointers for its start and end
memory area locations.  The code now uses a char pointer for the end
location, and it still builds without warnings on GCC.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitglue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/emitglue.c b/py/emitglue.c
index 444e480477e54..27cbb349ef602 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -115,7 +115,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, cons
     #endif
     #elif MICROPY_EMIT_ARM
     #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
-    __builtin___clear_cache((void *)fun_data, (uint8_t *)fun_data + fun_len);
+    __builtin___clear_cache((void *)fun_data, (char *)fun_data + fun_len);
     #elif defined(__arm__)
     // Flush I-cache and D-cache.
     asm volatile (

From 28b52446669b72f9863902510430bdeeaaa39fa6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 4 Dec 2024 22:45:28 +0100
Subject: [PATCH 1693/3129] extmod/modplatform: Distinguish RISC-V 64 from
 RISC-V 32.

This commit lets the platform module report a more accurate architecture
name when running on a RISC-V 64 bits platform.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 extmod/modplatform.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extmod/modplatform.h b/extmod/modplatform.h
index 5c9cbffb2a486..a155f071cba1b 100644
--- a/extmod/modplatform.h
+++ b/extmod/modplatform.h
@@ -48,7 +48,11 @@
 #elif defined(__xtensa__)
 #define MICROPY_PLATFORM_ARCH   "xtensa"
 #elif defined(__riscv)
+#if __riscv_xlen == 64
+#define MICROPY_PLATFORM_ARCH   "riscv64"
+#else
 #define MICROPY_PLATFORM_ARCH   "riscv"
+#endif
 #else
 #define MICROPY_PLATFORM_ARCH   ""
 #endif

From e8c3f31ba2e5f004dfb972131d5f7d7a961974c2 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 12 Nov 2024 07:16:38 +0100
Subject: [PATCH 1694/3129] mimxrt/machine_rtc: Deprecate RTC.cancel in
 MicroPython v2.

The current documentation for the `machine.RTC` class contains information
about the `RTC.cancel` method for cancelling pending alarms.

However only two ports (cc3200 and mimxrt) implement this functionality
but under a different name: `RTC.alarm_cancel`.  The mimxrt port also
implements `RTC.cancel` but it is aliased to `RTC.alarm_cancel` anyway.

To maintain naming consistency, this commit updates the documentation to
officially define `RTC.alarm_cancel` as the method to call to cancel
pending alarms and deprecates mimxrt's `RTC.cancel` implementation.
`RTC.cancel` in the mimxrt port is thus scheduled for removal in
MicroPython v2.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/library/machine.RTC.rst | 5 ++++-
 ports/mimxrt/machine_rtc.c   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index ad0b0759efe5e..a457189037b51 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -62,10 +62,13 @@ Methods
 
    Get the number of milliseconds left before the alarm expires.
 
-.. method:: RTC.cancel(alarm_id=0)
+.. method:: RTC.alarm_cancel(alarm_id=0)
 
    Cancel a running alarm.
 
+   The mimxrt port also exposes this function as ``RTC.cancel(alarm_id=0)``, but this is
+   scheduled to be removed in MicroPython 2.0.
+
 .. method:: RTC.irq(*, trigger, handler=None, wake=machine.IDLE)
 
    Create an irq object triggered by a real time clock alarm.
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 294942cf5a03f..0d6fc54c8b67c 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -394,7 +394,9 @@ static const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_alarm), MP_ROM_PTR(&machine_rtc_alarm_obj) },
     { MP_ROM_QSTR(MP_QSTR_alarm_left), MP_ROM_PTR(&machine_rtc_alarm_left_obj) },
     { MP_ROM_QSTR(MP_QSTR_alarm_cancel), MP_ROM_PTR(&machine_rtc_alarm_cancel_obj) },
+    #if !MICROPY_PREVIEW_VERSION_2
     { MP_ROM_QSTR(MP_QSTR_cancel), MP_ROM_PTR(&machine_rtc_alarm_cancel_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_rtc_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_ALARM0), MP_ROM_INT(0) },
 };

From fdd606dd5395d9c474775945fa4458a27199653b Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 6 Nov 2024 10:31:28 +1100
Subject: [PATCH 1695/3129] py/mkrules.mk: Use partial clone for submodules if
 available.

MicroPython relies on a number of submodules for third party and chip
vendor libraries.  Users need to check these out before building their
desired ports and Github Actions CI here needs to clone them all multiple
times for every build.  Many of these are getting significantly larger over
time, slowing down usage and consuming more disk space.

Newer versions of git have features to avoid pulling all historic / blob
data which can have a significant impact of total data use.  This commit
uses a standard feature of git to do a partial clone, with automatic
fallback to previous behavior on error.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 py/mkrules.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 0dc1cdfe15ac4..875ddee8523b8 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -252,7 +252,11 @@ submodules:
 	$(ECHO) "Updating submodules: $(GIT_SUBMODULES)"
 ifneq ($(GIT_SUBMODULES),)
 	$(Q)cd $(TOP) && git submodule sync $(GIT_SUBMODULES)
-	$(Q)cd $(TOP) && git submodule update --init $(GIT_SUBMODULES)
+	# If available, do blobless partial clones of submodules to save time and space.
+	# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.).
+	# Fallback to standard submodule update if blobless isn't available (earlier than 2.36.0)
+	$(Q)cd $(TOP) && git submodule update --init --filter=blob:none $(GIT_SUBMODULES) || \
+	  git submodule update --init $(GIT_SUBMODULES)
 endif
 .PHONY: submodules
 

From 9441ce6e3c8296ca8e6a5e0ddbd94ee5c9f4d7d6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 5 Sep 2024 02:59:45 +1000
Subject: [PATCH 1696/3129] esp32: Use capability defines to configure
 features.

This updates esp32 code where appropriate to replace ifdef's based on a
list of specific chips with a feature SOC_* definition.  This should
simplify adding new esp32-* chips in future, deferring chip feature support
to the IDF.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/esp32/adc.c               | 20 +++++++++-----------
 ports/esp32/machine_adc.c       | 16 ++++++++++++----
 ports/esp32/machine_adc_block.c |  9 +++------
 ports/esp32/machine_bitstream.c |  2 +-
 ports/esp32/machine_i2c.c       |  4 ++--
 ports/esp32/machine_pin.c       |  2 +-
 ports/esp32/modmachine.c        | 12 ++++++++----
 7 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
index ccf264e5c2ae3..83af6dce0b2a5 100644
--- a/ports/esp32/adc.c
+++ b/ports/esp32/adc.c
@@ -33,28 +33,26 @@
 #define DEFAULT_VREF 1100
 
 void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t bits) {
+    if (bits < SOC_ADC_RTC_MIN_BITWIDTH && bits > SOC_ADC_RTC_MAX_BITWIDTH) {
+        // Invalid value for the current chip, raise exception in the switch below.
+        bits = -1;
+    }
     switch (bits) {
-        #if CONFIG_IDF_TARGET_ESP32
         case 9:
-            self->width = ADC_WIDTH_BIT_9;
+            self->width = ADC_BITWIDTH_9;
             break;
         case 10:
-            self->width = ADC_WIDTH_BIT_10;
+            self->width = ADC_BITWIDTH_10;
             break;
         case 11:
-            self->width = ADC_WIDTH_BIT_11;
+            self->width = ADC_BITWIDTH_11;
             break;
-        #endif
-        #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
         case 12:
-            self->width = ADC_WIDTH_BIT_12;
+            self->width = ADC_BITWIDTH_12;
             break;
-        #endif
-        #if CONFIG_IDF_TARGET_ESP32S2
         case 13:
-            self->width = ADC_WIDTH_BIT_13;
+            self->width = ADC_BITWIDTH_13;
             break;
-        #endif
         default:
             mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
     }
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index dc21b69083c61..be1725c3709a6 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -35,7 +35,7 @@
 #define ADCBLOCK1 (&madcblock_obj[0])
 #define ADCBLOCK2 (&madcblock_obj[1])
 
-#if CONFIG_IDF_TARGET_ESP32
+#if SOC_ADC_RTC_MIN_BITWIDTH <= 9 && SOC_ADC_RTC_MAX_BITWIDTH >= 11
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_9_10_11 \
     { MP_ROM_QSTR(MP_QSTR_WIDTH_9BIT), MP_ROM_INT(9) }, \
     { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(10) }, \
@@ -44,14 +44,14 @@
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_9_10_11
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
+#if SOC_ADC_RTC_MIN_BITWIDTH <= 12 && SOC_ADC_RTC_MAX_BITWIDTH >= 12
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_12 \
     { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(12) },
 #else
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_12
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32S2
+#if SOC_ADC_RTC_MIN_BITWIDTH <= 13 && SOC_ADC_RTC_MAX_BITWIDTH >= 13
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS_WIDTH_13 \
     { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(13) },
 #else
@@ -87,13 +87,21 @@ static const machine_adc_obj_t madc_obj[] = {
     {{&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 || CONFIG_IDF_TARGET_ESP32C6
+    #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},
     {{&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_ESP32C6
+    {{&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}, ADCBLOCK1, ADC_CHANNEL_5, GPIO_NUM_5},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_6, GPIO_NUM_6},
     #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_1},
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_2},
diff --git a/ports/esp32/machine_adc_block.c b/ports/esp32/machine_adc_block.c
index 78c5b2491b8bf..a373603b7e396 100644
--- a/ports/esp32/machine_adc_block.c
+++ b/ports/esp32/machine_adc_block.c
@@ -32,12 +32,9 @@
 #include "driver/adc.h"
 
 machine_adc_block_obj_t madcblock_obj[] = {
-    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
-    {{&machine_adc_block_type}, ADC_UNIT_1, 12, -1, {0}},
-    {{&machine_adc_block_type}, ADC_UNIT_2, 12, -1, {0}},
-    #elif CONFIG_IDF_TARGET_ESP32S2
-    {{&machine_adc_block_type}, ADC_UNIT_1, 13, -1, {0}},
-    {{&machine_adc_block_type}, ADC_UNIT_2, 13, -1, {0}},
+    {{&machine_adc_block_type}, ADC_UNIT_1, SOC_ADC_RTC_MAX_BITWIDTH, -1, {0}},
+    #if SOC_ADC_PERIPH_NUM > 1
+    {{&machine_adc_block_type}, ADC_UNIT_2, SOC_ADC_RTC_MAX_BITWIDTH, -1, {0}},
     #endif
 };
 
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index b4e58c51f4d19..6296ff06708c1 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -42,7 +42,7 @@
 // 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 || CONFIG_IDF_TARGET_ESP32C6
+    #if SOC_GPIO_PIN_COUNT > 32
     if (pin >= 32) {
         pin_mask = 1 << (pin - 32);
         gpio_reg_set = GPIO_OUT1_W1TS_REG;
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index e1e1850da57cd..732a62f47f193 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -49,9 +49,9 @@
 #endif
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3
+#if SOC_I2C_SUPPORT_XTAL
 #define I2C_SCLK_FREQ XTAL_CLK_FREQ
-#elif CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
+#elif SOC_I2C_SUPPORT_APB
 #define I2C_SCLK_FREQ APB_CLK_FREQ
 #else
 #error "unsupported I2C for ESP32 SoC variant"
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 687dfe1938dae..74202d6f758cd 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -43,7 +43,7 @@
 #include "modesp32.h"
 #include "genhdr/pins.h"
 
-#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
+#if SOC_USB_SERIAL_JTAG_SUPPORTED
 #include "soc/usb_serial_jtag_reg.h"
 #endif
 
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 9b58d77529be2..e775b1d146906 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -45,7 +45,7 @@
 #define MICROPY_PY_MACHINE_SDCARD_ENTRY
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#if SOC_TOUCH_SENSOR_SUPPORTED
 #define MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
 #else
 #define MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY
@@ -147,30 +147,34 @@ static void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_
         esp_sleep_enable_timer_wakeup(((uint64_t)expiry) * 1000);
     }
 
-    #if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
-
+    #if SOC_PM_SUPPORT_EXT0_WAKEUP
     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);
     }
+    #endif
 
+    #if SOC_PM_SUPPORT_EXT1_WAKEUP
     if (machine_rtc_config.ext1_pins != 0) {
         esp_sleep_enable_ext1_wakeup(
             machine_rtc_config.ext1_pins,
             machine_rtc_config.ext1_level ? ESP_EXT1_WAKEUP_ANY_HIGH : ESP_EXT1_WAKEUP_ALL_LOW);
     }
+    #endif
 
+    #if SOC_TOUCH_SENSOR_SUPPORTED
     if (machine_rtc_config.wake_on_touch) {
         if (esp_sleep_enable_touchpad_wakeup() != ESP_OK) {
             mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("esp_sleep_enable_touchpad_wakeup() failed"));
         }
     }
+    #endif
 
+    #if SOC_ULP_SUPPORTED
     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 82e382a399b07e0af64516749c12882fc0804a6d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 4 Dec 2024 12:30:25 +0100
Subject: [PATCH 1697/3129] esp32/mpconfigport: Use the appropriate
 wait-for-interrupt opcode.

When threading is disabled, the pending events handling code would wait
for an incoming interrupt once there's no more work to do.  This bit of
code was Xtensa-specific and wouldn't compile on a RISC-V based MCU.

This commit provides the RISC-V equivalent to that part of the code,
allowing to make threadless MicroPython builds on RISC-V based MCUs.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/mpconfigport.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index e36d12bc056ac..bf1f5a18641db 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -292,12 +292,17 @@ void *esp_native_code_commit(void *, size_t, void *);
         MP_THREAD_GIL_ENTER(); \
     } while (0);
 #else
+#if CONFIG_IDF_TARGET_ARCH_RISCV
+#define MICROPY_PY_WAIT_FOR_INTERRUPT asm volatile ("wfi\n")
+#else
+#define MICROPY_PY_WAIT_FOR_INTERRUPT asm volatile ("waiti 0\n")
+#endif
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
         MICROPY_PY_SOCKET_EVENTS_HANDLER \
-        asm ("waiti 0"); \
+            MICROPY_PY_WAIT_FOR_INTERRUPT; \
     } while (0);
 #endif
 

From 6e5d8d009349a7d7932ab0c93a739a576a3594d3 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 1 Nov 2024 16:32:48 +1100
Subject: [PATCH 1698/3129] esp32: Drop support for ESP-IDF below V5.2.0.

Specifically, remove all conditional compilation for these earlier versions
and change the idf_component.yml specifiers to require >=5.2.0.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/README.md                      |  2 +-
 ports/esp32/machine_dac.c                  | 27 --------------
 ports/esp32/machine_pwm.c                  | 43 ----------------------
 ports/esp32/machine_uart.c                 |  4 --
 ports/esp32/main_esp32/idf_component.yml   |  2 +-
 ports/esp32/main_esp32c3/idf_component.yml |  2 +-
 ports/esp32/main_esp32c6/idf_component.yml |  2 +-
 ports/esp32/main_esp32s2/idf_component.yml |  2 +-
 ports/esp32/main_esp32s3/idf_component.yml |  2 +-
 ports/esp32/modesp32.c                     |  1 -
 ports/esp32/modmachine.c                   | 23 +++---------
 ports/esp32/modnetwork_globals.h           |  6 ---
 ports/esp32/mpthreadport.c                 |  2 +-
 ports/esp32/network_lan.c                  |  2 -
 ports/esp32/network_wlan.c                 | 12 +-----
 ports/esp32/uart.c                         |  4 --
 16 files changed, 13 insertions(+), 123 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 9f842a5a52cd6..a8bada7510f4e 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 v5.0.4, v5.0.5, v5.1.2, v5.2.0, v5.2.2, v5.3.
+Currently MicroPython supports v5.2, v5.2.2, and v5.3.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index 3d1d2df80818a..1c5b7c914cafc 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -34,21 +34,13 @@
 #if MICROPY_PY_MACHINE_DAC
 
 #include "driver/gpio.h"
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
 #include "driver/dac_oneshot.h"
-#else
-#include "driver/dac.h"
-#define DAC_CHAN_0 DAC_CHANNEL_1
-#define DAC_CHAN_1 DAC_CHANNEL_2
-#endif
 
 typedef struct _mdac_obj_t {
     mp_obj_base_t base;
     gpio_num_t gpio_id;
     dac_channel_t dac_id;
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
     dac_oneshot_handle_t dac_oneshot_handle;
-    #endif
 } mdac_obj_t;
 
 static mdac_obj_t mdac_obj[] = {
@@ -77,21 +69,10 @@ static mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for DAC"));
     }
 
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
     dac_oneshot_config_t dac_oneshot_config = {.chan_id = self->dac_id};
     check_esp_err(dac_oneshot_new_channel(&dac_oneshot_config, (dac_oneshot_handle_t *)&self->dac_oneshot_handle));
     check_esp_err(dac_oneshot_output_voltage(self->dac_oneshot_handle, 0));
     return MP_OBJ_FROM_PTR(self);
-    #else
-    esp_err_t err = dac_output_enable(self->dac_id);
-    if (err == ESP_OK) {
-        err = dac_output_voltage(self->dac_id, 0);
-    }
-    if (err == ESP_OK) {
-        return MP_OBJ_FROM_PTR(self);
-    }
-    mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
-    #endif
 }
 
 static void mdac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -106,16 +87,8 @@ static mp_obj_t mdac_write(mp_obj_t self_in, mp_obj_t value_in) {
         mp_raise_ValueError(MP_ERROR_TEXT("value out of range"));
     }
 
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
     check_esp_err(dac_oneshot_output_voltage(self->dac_oneshot_handle, value));
     return mp_const_none;
-    #else
-    esp_err_t err = dac_output_voltage(self->dac_id, value);
-    if (err == ESP_OK) {
-        return mp_const_none;
-    }
-    mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
-    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mdac_write_obj, mdac_write);
 
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 0134fa2cc8c89..6e3610b156679 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -211,39 +211,6 @@ static void configure_channel(machine_pwm_obj_t *self) {
     }
 }
 
-// Temporary workaround for ledc_find_suitable_duty_resolution function only being added in IDF V5.2
-#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
-static uint32_t ledc_find_suitable_duty_resolution(uint32_t src_clk_freq, uint32_t timer_freq) {
-    // This implementation is based on the one used in Micropython v1.23
-
-    // Find the highest bit resolution for the requested frequency
-    unsigned int freq = src_clk_freq;
-
-    int divider = (freq + timer_freq / 2) / timer_freq; // rounded
-    if (divider == 0) {
-        divider = 1;
-    }
-    float f = (float)freq / divider; // actual frequency
-    if (f <= 1.0) {
-        f = 1.0;
-    }
-    freq = (unsigned int)roundf((float)freq / f);
-
-    unsigned int res = 0;
-    for (; freq > 1; freq >>= 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;
-    }
-
-    return res;
-}
-#endif
-
 static void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_config_t *timer) {
     esp_err_t err;
     if (freq != timer->freq_hz) {
@@ -265,20 +232,10 @@ static void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         }
         #endif
         uint32_t src_clk_freq = 0;
-        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
         err = esp_clk_tree_src_get_freq_hz(timer->clk_cfg, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &src_clk_freq);
         if (err != ESP_OK) {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unable to query source clock frequency %d"), (int)timer->clk_cfg);
         }
-        #else
-        // Simplified fallback logic for IDF V5.0.x, for targets with APB only.
-        src_clk_freq = APB_CLK_FREQ; // 80 MHz
-        #if SOC_LEDC_SUPPORT_REF_TICK
-        if (timer->clk_cfg == LEDC_USE_REF_TICK) {
-            src_clk_freq = REF_CLK_FREQ; // 1 MHz
-        }
-        #endif // SOC_LEDC_SUPPORT_REF_TICK
-        #endif // ESP_IDF_VERSION
 
         timer->duty_resolution = ledc_find_suitable_duty_resolution(src_clk_freq, timer->freq_hz);
 
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index cff942f39e723..73089ef463681 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -399,11 +399,7 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         }
         self->flowcontrol = args[ARG_flow].u_int;
     }
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
     uint8_t uart_fifo_len = UART_HW_FIFO_LEN(self->uart_num);
-    #else
-    uint8_t uart_fifo_len = UART_FIFO_LEN;
-    #endif
     check_esp_err(uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, uart_fifo_len - uart_fifo_len / 4));
 }
 
diff --git a/ports/esp32/main_esp32/idf_component.yml b/ports/esp32/main_esp32/idf_component.yml
index 5dabbc00ba735..11f078f69f761 100644
--- a/ports/esp32/main_esp32/idf_component.yml
+++ b/ports/esp32/main_esp32/idf_component.yml
@@ -2,4 +2,4 @@
 dependencies:
   espressif/mdns: "~1.1.0"
   idf:
-    version: ">=5.0.4"
+    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32c3/idf_component.yml b/ports/esp32/main_esp32c3/idf_component.yml
index 5dabbc00ba735..11f078f69f761 100644
--- a/ports/esp32/main_esp32c3/idf_component.yml
+++ b/ports/esp32/main_esp32c3/idf_component.yml
@@ -2,4 +2,4 @@
 dependencies:
   espressif/mdns: "~1.1.0"
   idf:
-    version: ">=5.0.4"
+    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32c6/idf_component.yml b/ports/esp32/main_esp32c6/idf_component.yml
index 5bbab6d8c3bd8..11f078f69f761 100644
--- a/ports/esp32/main_esp32c6/idf_component.yml
+++ b/ports/esp32/main_esp32c6/idf_component.yml
@@ -2,4 +2,4 @@
 dependencies:
   espressif/mdns: "~1.1.0"
   idf:
-    version: ">=5.1.0"
+    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml
index 05ab2f29a8d31..2ee00b287786b 100644
--- a/ports/esp32/main_esp32s2/idf_component.yml
+++ b/ports/esp32/main_esp32s2/idf_component.yml
@@ -3,4 +3,4 @@ dependencies:
   espressif/mdns: "~1.1.0"
   espressif/esp_tinyusb: "~1.0.0"
   idf:
-    version: ">=5.0.4"
+    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml
index 05ab2f29a8d31..2ee00b287786b 100644
--- a/ports/esp32/main_esp32s3/idf_component.yml
+++ b/ports/esp32/main_esp32s3/idf_component.yml
@@ -3,4 +3,4 @@ dependencies:
   espressif/mdns: "~1.1.0"
   espressif/esp_tinyusb: "~1.0.0"
   idf:
-    version: ">=5.0.4"
+    version: ">=5.2.0"
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 0a73a0faf06ef..164b1918261f4 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -53,7 +53,6 @@ static mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
     if (machine_rtc_config.ext0_pin != -1) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
     }
-    // mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("touchpad wakeup not available for this version of ESP-IDF"));
 
     machine_rtc_config.wake_on_touch = mp_obj_is_true(wake);
     return mp_const_none;
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index e775b1d146906..0c1b94d02d940 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -110,24 +110,11 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
         mp_raise_ValueError(MP_ERROR_TEXT("frequency must be 20MHz, 40MHz, 80Mhz, 160MHz or 240MHz"));
         #endif
     }
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
-    esp_pm_config_t pm;
-    #else
-    #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_ESP32C6
-    esp_pm_config_esp32c6_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
-    #endif
-    pm.max_freq_mhz = freq;
-    pm.min_freq_mhz = freq;
-    pm.light_sleep_enable = false;
+    esp_pm_config_t pm = {
+        .max_freq_mhz = freq,
+        .min_freq_mhz = freq,
+        .light_sleep_enable = false,
+    };
     esp_err_t ret = esp_pm_configure(&pm);
     if (ret != ESP_OK) {
         mp_raise_ValueError(NULL);
diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 2bfc2393d666f..1aad785ee3d9c 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -33,13 +33,9 @@
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_WAPI_PSK), MP_ROM_INT(WIFI_AUTH_WAPI_PSK) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_OWE), MP_ROM_INT(WIFI_AUTH_OWE) },
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_ENT_192), MP_ROM_INT(WIFI_AUTH_WPA3_ENT_192) },
-#endif
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_EXT_PSK), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK) },
 { MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_EXT_PSK_MIXED_MODE), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE) },
-#endif
 { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
 #endif
 
@@ -75,11 +71,9 @@
 { MP_ROM_QSTR(MP_QSTR_STAT_GOT_IP), MP_ROM_INT(STAT_GOT_IP)},
 // Errors from the ESP-IDF
 { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND)},
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
 { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND_IN_RSSI_THRESHOLD), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD)},
 { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD)},
 { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND_W_COMPATIBLE_SECURITY), MP_ROM_INT(WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY)},
-#endif
 { MP_ROM_QSTR(MP_QSTR_STAT_WRONG_PASSWORD), MP_ROM_INT(WIFI_REASON_AUTH_FAIL)},
 { MP_ROM_QSTR(MP_QSTR_STAT_BEACON_TIMEOUT), MP_ROM_INT(WIFI_REASON_BEACON_TIMEOUT)},
 #if !MICROPY_PREVIEW_VERSION_2
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index eac1e5ea3668d..daed1bdd0edf2 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -41,7 +41,7 @@
 #define MP_THREAD_DEFAULT_STACK_SIZE                    (MP_THREAD_MIN_STACK_SIZE + MICROPY_STACK_CHECK_MARGIN)
 #define MP_THREAD_PRIORITY                              (ESP_TASK_PRIO_MIN + 1)
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0) && !CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP
+#if !CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP
 #define FREERTOS_TASK_DELETE_HOOK                       vTaskPreDeletionHook
 #else
 #define FREERTOS_TASK_DELETE_HOOK                       vPortCleanUpTCB
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 416e02e12db85..e1a8c957857c4 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -30,8 +30,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-#include "esp_idf_version.h"
-
 #if MICROPY_PY_NETWORK_LAN
 
 #include "esp_eth.h"
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index d52123ee0a3a2..fed81d28cb6a6 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -113,7 +113,6 @@ static void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_b
                     // AP may not exist, or it may have momentarily dropped out; try to reconnect.
                     message = "no AP found";
                     break;
-                #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
                 case WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD:
                     // No AP with RSSI within given threshold exists, or it may have momentarily dropped out; try to reconnect.
                     message = "no AP with RSSI within threshold found";
@@ -126,7 +125,6 @@ static void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_b
                     // No AP with compatible security exists, or it may have momentarily dropped out; try to reconnect.
                     message = "no AP with compatible security found";
                     break;
-                #endif
                 case WIFI_REASON_AUTH_FAIL:
                     // Password may be wrong, or it just failed to connect; try to reconnect.
                     message = "authentication failed";
@@ -367,14 +365,12 @@ static mp_obj_t network_wlan_status(size_t n_args, const mp_obj_t *args) {
                 return MP_OBJ_NEW_SMALL_INT(STAT_GOT_IP);
             } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND) {
                 return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND);
-            #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
             } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD) {
                 return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND_IN_RSSI_THRESHOLD);
             } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD) {
                 return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD);
             } else if (wifi_sta_disconn_reason == WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY) {
                 return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY);
-            #endif
             } else if ((wifi_sta_disconn_reason == WIFI_REASON_AUTH_FAIL) || (wifi_sta_disconn_reason == WIFI_REASON_CONNECTION_FAIL)) {
                 // wrong password
                 return MP_OBJ_NEW_SMALL_INT(WIFI_REASON_AUTH_FAIL);
@@ -761,13 +757,9 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA2_WPA3), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
     { MP_ROM_QSTR(MP_QSTR_SEC_WAPI), MP_ROM_INT(WIFI_AUTH_WAPI_PSK) },
     { MP_ROM_QSTR(MP_QSTR_SEC_OWE), MP_ROM_INT(WIFI_AUTH_OWE) },
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_ENT_192), MP_ROM_INT(WIFI_AUTH_WPA3_ENT_192) },
-    #endif
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_EXT_PSK), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK) },
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_EXT_PSK_MIXED_MODE), MP_ROM_INT(WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE) },
-    #endif
     #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
     { MP_ROM_QSTR(MP_QSTR_SEC_DPP), MP_ROM_INT(WIFI_AUTH_DPP) },
     #endif
@@ -782,10 +774,8 @@ static MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
 _Static_assert(WIFI_AUTH_MAX == 14, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types_generic.h");
 #elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
 _Static_assert(WIFI_AUTH_MAX == 13, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
-#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 5) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2)
-_Static_assert(WIFI_AUTH_MAX == 11, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
 #else
-_Static_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+#error "Error in macro logic, all supported versions should be covered."
 #endif
 
 MP_DEFINE_CONST_OBJ_TYPE(
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index 8336268509ecf..491314e04d106 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -51,11 +51,7 @@ static void uart_irq_handler(void *arg);
 
 void uart_stdout_init(void) {
     uart_hal_context_t repl_hal = REPL_HAL_DEFN();
-    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
-    uart_sclk_t sclk;
-    #else
     soc_module_clk_t sclk;
-    #endif
     uint32_t sclk_freq;
 
     uart_hal_get_sclk(&repl_hal, &sclk); // To restore SCLK after uart_hal_init() resets it

From d90aff5e13ff208728ac49f88e723abb8fbff044 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 1 Nov 2024 16:29:50 +1100
Subject: [PATCH 1699/3129] esp32: Remove IDF-version-specific sdkconfig.

This reverts commit 27279e69b4d74b255bd8d8c5dd6668c97c942776
(plus removes some additional references to the
SDKCONFIG_IDF_VERSION_SPECIFIC CMake variable.)

Relevant sdkconfig options are added into sdkconfig.base now
that IDF >=5.2.0 is required.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/CMakeLists.txt                             | 10 ----------
 .../boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake      |  1 -
 ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake   |  1 -
 .../esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake  |  1 -
 .../esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake  |  1 -
 .../esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake  |  1 -
 .../esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake  |  1 -
 .../boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake      |  1 -
 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake   |  1 -
 ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake   |  1 -
 ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake   |  1 -
 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake    |  1 -
 ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake  |  1 -
 .../esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake  |  1 -
 .../esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake  |  1 -
 ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake      |  1 -
 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake    |  1 -
 ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake |  1 -
 ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake    |  1 -
 ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake |  1 -
 ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake       |  1 -
 ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake        |  1 -
 ports/esp32/boards/UM_PROS3/mpconfigboard.cmake        |  1 -
 .../esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake  |  1 -
 ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake       |  1 -
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake     |  1 -
 ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake       |  1 -
 ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake       |  1 -
 ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake  |  1 -
 ports/esp32/boards/sdkconfig.base                      |  3 ++-
 ports/esp32/boards/sdkconfig.idf52                     |  2 --
 31 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 ports/esp32/boards/sdkconfig.idf52

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index d695170fa2b5d..c3a675eb2b78f 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -5,10 +5,6 @@
 # needs to be duplicated for out-of-tree builds, and can easily get out of date.
 cmake_minimum_required(VERSION 3.12)
 
-# Retrieve IDF version
-include($ENV{IDF_PATH}/tools/cmake/version.cmake)
-set(IDF_VERSION "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
-
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
     set(MICROPY_BOARD ESP32_GENERIC)
@@ -35,12 +31,6 @@ set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 # Save the manifest file set from the cmake command line.
 set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
 
-# Specific options for IDF v5.2 and later
-set(SDKCONFIG_IDF_VERSION_SPECIFIC "")
-if (IDF_VERSION VERSION_GREATER_EQUAL "5.2.0")
-    set(SDKCONFIG_IDF_VERSION_SPECIFIC boards/sdkconfig.idf52)
-endif()
-
 # Include board config; this is expected to set (among other options):
 # - SDKCONFIG_DEFAULTS
 # - IDF_TARGET
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
index d7db192ca43f5..a3888823421d2 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
@@ -6,7 +6,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
index 9d0077a15e8d2..ac60dc8630929 100644
--- a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
@@ -1,5 +1,4 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
index 8c9d7c27a1174..429366afac979 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/ESP32_GENERIC_C3/sdkconfig.c3usb
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
index 3ab98e9da1af7..3060c1cfd978a 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c6)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.c6
     boards/sdkconfig.ble
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
index c9bc60d4cb57b..76d185d90d5fc 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.spiram_sx
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
index 2bfdad21df495..9b0df3b3771ef 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
index 42c431681ef11..5bbac10e22f10 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
 )
 
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
index 7767e3b8497fb..0ce7f85e5d580 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/LOLIN_C3_MINI/sdkconfig.board
 )
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
index 8be4a69d72e75..dc9abd7478bca 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
 )
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
index 8be4a69d72e75..dc9abd7478bca 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
 )
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
index 19b55d1659786..f0355e2b0388b 100644
--- a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/M5STACK_ATOM/sdkconfig.board
diff --git a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
index 3ab98e9da1af7..3060c1cfd978a 100644
--- a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c6)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.c6
     boards/sdkconfig.ble
 )
diff --git a/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake b/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
index d6369d9ef18a4..3a6323d126d93 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/OLIMEX_ESP32_EVB/sdkconfig.board
 )
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
index 59d2831b3e0d9..c460b07d5efac 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/OLIMEX_ESP32_POE/sdkconfig.board
 )
diff --git a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
index 9caef1123ccd6..a1460397b818b 100644
--- a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/SIL_WESP32/sdkconfig.board
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
index e3bcba9f509e7..5e570d513bb47 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
@@ -1,7 +1,6 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
     boards/UM_FEATHERS2/sdkconfig.board
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
index fc7f246a7ee0f..c98ef691769b5 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
@@ -1,7 +1,6 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
     boards/UM_FEATHERS2NEO/sdkconfig.board
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
index d7fcc34694853..63d1af1da76ca 100644
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
index 2114b321b2e73..1d2b887d2ce4e 100644
--- a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
index 9030d837289c3..6c7f34009e432 100644
--- a/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake b/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
index a6a42a262e056..aa82111d75888 100644
--- a/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
index 8bd67567ffdad..41a96f26e34c4 100644
--- a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
index f734411616bdb..8b29cb344e777 100644
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
index e2df716a16b1f..024b1299fa3e5 100644
--- a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c6)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.c6
     boards/sdkconfig.ble
     boards/UM_TINYC6/sdkconfig.board
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
index c85fb9d723b06..58b42b55eb7fb 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
index 1c794baeed6a3..70cb4a814ff24 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -1,7 +1,6 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
     boards/UM_TINYS2/sdkconfig.board
diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
index 9030d837289c3..6c7f34009e432 100644
--- a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
index e788dc965d150..089149c44c54d 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index c7179b6125a1e..e20835c70c42d 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -49,7 +49,8 @@ CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
 # FreeRTOS
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
-CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=y
+CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
+CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y
 
 # UDP
 CONFIG_LWIP_PPP_SUPPORT=y
diff --git a/ports/esp32/boards/sdkconfig.idf52 b/ports/esp32/boards/sdkconfig.idf52
deleted file mode 100644
index 49b7317d4d69f..0000000000000
--- a/ports/esp32/boards/sdkconfig.idf52
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
-CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y

From d4d1d4798ccdc7077f459005727ff32208cf1c5f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 4 Dec 2024 17:11:15 +1100
Subject: [PATCH 1700/3129] esp32: Simplify thread cleanup.

Now we only support the case of
!CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP, can simplify
the cleanup code.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/mpthreadport.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index daed1bdd0edf2..f436ebb80a7ad 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -41,12 +41,6 @@
 #define MP_THREAD_DEFAULT_STACK_SIZE                    (MP_THREAD_MIN_STACK_SIZE + MICROPY_STACK_CHECK_MARGIN)
 #define MP_THREAD_PRIORITY                              (ESP_TASK_PRIO_MIN + 1)
 
-#if !CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP
-#define FREERTOS_TASK_DELETE_HOOK                       vTaskPreDeletionHook
-#else
-#define FREERTOS_TASK_DELETE_HOOK                       vPortCleanUpTCB
-#endif
-
 // this structure forms a linked list, one node per active thread
 typedef struct _mp_thread_t {
     TaskHandle_t id;        // system id of thread
@@ -76,7 +70,7 @@ void mp_thread_init(void *stack, uint32_t stack_len) {
     // memory barrier to ensure above data is committed
     __sync_synchronize();
 
-    // FREERTOS_TASK_DELETE_HOOK needs the thread ready after thread_mutex is ready
+    // vTaskPreDeletionHook needs the thread ready after thread_mutex is ready
     thread = &thread_entry0;
 }
 
@@ -180,9 +174,10 @@ 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 FREERTOS_TASK_DELETE_HOOK(void *tcb) {
+// This is called either from vTaskDelete() or from the FreeRTOS idle task, so
+// may not be within Python context. Therefore MP_STATE_THREAD may not be valid
+// and it does not have the GIL.
+void vTaskPreDeletionHook(void *tcb) {
     if (thread == NULL) {
         // threading not yet initialised
         return;
@@ -243,7 +238,7 @@ void mp_thread_deinit(void) {
             // No tasks left to delete
             break;
         } else {
-            // Call FreeRTOS to delete the task (it will call FREERTOS_TASK_DELETE_HOOK)
+            // Call FreeRTOS to delete the task (it will call vTaskPreDeletionHook)
             vTaskDelete(id);
         }
     }
@@ -251,7 +246,7 @@ void mp_thread_deinit(void) {
 
 #else
 
-void FREERTOS_TASK_DELETE_HOOK(void *tcb) {
+void vTaskPreDeletionHook(void *tcb) {
 }
 
 #endif // MICROPY_PY_THREAD

From 94343e20e590473ff1e31bd31c654befa42307a7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 10 Dec 2024 14:07:29 +0100
Subject: [PATCH 1701/3129] stm32/boards/STM32F429DISC: Fix SDRAM
 configuration.

Define SDRAM frequency and refresh cycles.  This was missed in commit
17808e7b749b269b58dcee67df599a0c61d455bd.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/STM32F429DISC/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
index 5d9287242b74c..92e8ca411b456 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
@@ -100,6 +100,7 @@
 
 #define MICROPY_HW_SDRAM_BURST_LENGTH       2
 #define MICROPY_HW_SDRAM_CAS_LATENCY        3
+#define MICROPY_HW_SDRAM_FREQUENCY_KHZ      (90000) // 90 MHz
 #define MICROPY_HW_SDRAM_COLUMN_BITS_NUM    8
 #define MICROPY_HW_SDRAM_ROW_BITS_NUM       12
 #define MICROPY_HW_SDRAM_MEM_BUS_WIDTH      16
@@ -109,6 +110,7 @@
 #define MICROPY_HW_SDRAM_RBURST             (0)
 #define MICROPY_HW_SDRAM_WRITE_PROTECTION   (0)
 #define MICROPY_HW_SDRAM_AUTOREFRESH_NUM    (4)
+#define MICROPY_HW_SDRAM_REFRESH_CYCLES     8192
 
 #define MICROPY_HW_FMC_SDCKE1   (pin_B5)
 #define MICROPY_HW_FMC_SDNE1    (pin_B6)

From bdda91fe7414b2ff8d5259a176cc8da8b72a803f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Nov 2024 16:55:16 +1100
Subject: [PATCH 1702/3129] tests/extmod_hardware: Add a test for machine.PWM
 freq and duty.

This adds a hardware test for `machine.PWM`.  It requires a jumper wire
between two pins, uses `machine.PWM` to output on one of them, and
`machine.time_pulse_us()` to time the PWM on the other pin (some boards
test more than one pair of pins).

It times both the high and low duty cycle (and hence the frequency) for a
range of PWM frequencies and duty cycles (including full on and full off).

Currently supported on:
- esp32 (needs a minor hack for initialisation, and some tests still fail)
- esp8266 (passes for frequencies 1kHz and less)
- mimxrt / Teensy 4.0 (passes)
- rp2 (passes)
- samd21 (passes for frequencies 2kHz and less)

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod_hardware/machine_pwm.py | 166 +++++++++++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 tests/extmod_hardware/machine_pwm.py

diff --git a/tests/extmod_hardware/machine_pwm.py b/tests/extmod_hardware/machine_pwm.py
new file mode 100644
index 0000000000000..014030be5c601
--- /dev/null
+++ b/tests/extmod_hardware/machine_pwm.py
@@ -0,0 +1,166 @@
+# Test machine.PWM, frequncy and duty cycle (using machine.time_pulse_us).
+#
+# IMPORTANT: This test requires hardware connections: the PWM-output and pulse-input
+# pins must be wired together (see the variable `pwm_pulse_pins`).
+
+import sys
+import time
+
+try:
+    from machine import time_pulse_us, Pin, PWM
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import unittest
+
+pwm_freq_limit = 1000000
+freq_margin_per_thousand = 0
+duty_margin_per_thousand = 0
+timing_margin_us = 5
+
+# Configure pins based on the target.
+if "esp32" in sys.platform:
+    pwm_pulse_pins = ((4, 5),)
+    freq_margin_per_thousand = 2
+    duty_margin_per_thousand = 1
+    timing_margin_us = 20
+elif "esp8266" in sys.platform:
+    pwm_pulse_pins = ((4, 5),)
+    pwm_freq_limit = 1_000
+    duty_margin_per_thousand = 3
+    timing_margin_us = 50
+elif "mimxrt" in sys.platform:
+    if "Teensy" in sys.implementation._machine:
+        # Teensy 4.x
+        pwm_pulse_pins = (
+            ("D0", "D1"),  # FLEXPWM X and UART 1
+            ("D2", "D3"),  # FLEXPWM A/B
+            ("D11", "D12"),  # QTMR and MOSI/MISO of SPI 0
+        )
+    else:
+        pwm_pulse_pins = (("D0", "D1"),)
+elif "rp2" in sys.platform:
+    pwm_pulse_pins = (("GPIO0", "GPIO1"),)
+elif "samd" in sys.platform:
+    pwm_pulse_pins = (("D0", "D1"),)
+    if "SAMD21" in sys.implementation._machine:
+        # MCU is too slow to capture short pulses.
+        pwm_freq_limit = 2_000
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+# Test a specific frequency and duty cycle.
+def _test_freq_duty(self, pulse_in, pwm, freq, duty_u16):
+    print("freq={:<5} duty_u16={:<5} :".format(freq, duty_u16), end="")
+
+    # Check configured freq/duty_u16 is within error bound.
+    freq_error = abs(pwm.freq() - freq) * 1000 // freq
+    duty_error = abs(pwm.duty_u16() - duty_u16) * 1000 // (duty_u16 or 1)
+    print(" freq={} freq_er={}".format(pwm.freq(), freq_error), end="")
+    print(" duty={} duty_er={}".format(pwm.duty_u16(), duty_error), end="")
+    print(" :", end="")
+    self.assertLessEqual(freq_error, freq_margin_per_thousand)
+    self.assertLessEqual(duty_error, duty_margin_per_thousand)
+
+    # Calculate expected timing.
+    expected_total_us = 1_000_000 // freq
+    expected_high_us = expected_total_us * duty_u16 // 65535
+    expected_low_us = expected_total_us - expected_high_us
+    expected_us = (expected_low_us, expected_high_us)
+    timeout = 2 * expected_total_us
+
+    # Wait for output to settle.
+    time_pulse_us(pulse_in, 0, timeout)
+    time_pulse_us(pulse_in, 1, timeout)
+
+    if duty_u16 == 0 or duty_u16 == 65535:
+        # Expect a constant output level.
+        no_pulse = (
+            time_pulse_us(pulse_in, 0, timeout) < 0 and time_pulse_us(pulse_in, 1, timeout) < 0
+        )
+        self.assertTrue(no_pulse)
+        if expected_high_us == 0:
+            # Expect a constant low level.
+            self.assertEqual(pulse_in(), 0)
+        else:
+            # Expect a constant high level.
+            self.assertEqual(pulse_in(), 1)
+    else:
+        # Test timing of low and high pulse.
+        n_averaging = 10
+        for level in (0, 1):
+            t = 0
+            time_pulse_us(pulse_in, level, timeout)
+            for _ in range(n_averaging):
+                t += time_pulse_us(pulse_in, level, timeout)
+            t //= n_averaging
+            expected = expected_us[level]
+            print(" level={} timing_er={}".format(level, abs(t - expected)), end="")
+            self.assertLessEqual(abs(t - expected), timing_margin_us)
+
+    print()
+
+
+# Test a specific frequency with multiple duty cycles.
+def _test_freq(self, freq):
+    print()
+    self.pwm.freq(freq)
+    for duty in (0, 10, 25, 50, 75, 90, 100):
+        duty_u16 = duty * 65535 // 100
+        if sys.platform == "esp32":
+            # TODO why is this bit needed to get it working on esp32?
+            self.pwm.init(freq=freq, duty_u16=duty_u16)
+            time.sleep(0.1)
+        self.pwm.duty_u16(duty_u16)
+        _test_freq_duty(self, self.pulse_in, self.pwm, freq, duty_u16)
+
+
+# Given a set of pins, this test class will test multiple frequencies and duty cycles.
+class TestBase:
+    @classmethod
+    def setUpClass(cls):
+        print("set up pins:", cls.pwm_pin, cls.pulse_pin)
+        cls.pwm = PWM(cls.pwm_pin)
+        cls.pulse_in = Pin(cls.pulse_pin, Pin.IN)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.pwm.deinit()
+
+    def test_freq_50(self):
+        _test_freq(self, 50)
+
+    def test_freq_100(self):
+        _test_freq(self, 100)
+
+    def test_freq_500(self):
+        _test_freq(self, 500)
+
+    def test_freq_1000(self):
+        _test_freq(self, 1000)
+
+    @unittest.skipIf(pwm_freq_limit < 2000, "frequency too high")
+    def test_freq_2000(self):
+        _test_freq(self, 2000)
+
+    @unittest.skipIf(pwm_freq_limit < 5000, "frequency too high")
+    def test_freq_5000(self):
+        _test_freq(self, 5000)
+
+    @unittest.skipIf(pwm_freq_limit < 10000, "frequency too high")
+    def test_freq_10000(self):
+        _test_freq(self, 10000)
+
+
+# Generate test classes, one for each set of pins to test.
+for pwm, pulse in pwm_pulse_pins:
+    cls_name = "Test_{}_{}".format(pwm, pulse)
+    globals()[cls_name] = type(
+        cls_name, (TestBase, unittest.TestCase), {"pwm_pin": pwm, "pulse_pin": pulse}
+    )
+
+if __name__ == "__main__":
+    unittest.main()

From 5f2d05d41755990c1e14223475e19c7d204d9db2 Mon Sep 17 00:00:00 2001
From: Sebastian Romero <s.romero@arduino.cc>
Date: Wed, 4 Dec 2024 16:30:56 +0100
Subject: [PATCH 1703/3129] esp32: Enable machine.USBDevice to configure USB at
 runtime.

This adds support for `machine.USBDevice` to S2 and S3 boards.

Signed-off-by: Sebastian Romero <s.romero@arduino.cc>
---
 ports/esp32/esp32_common.cmake | 1 +
 ports/esp32/main.c             | 4 ++++
 ports/esp32/mpconfigport.h     | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 0a6b29983c2f5..b6bfcdacc3cb4 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -78,6 +78,7 @@ if(MICROPY_PY_TINYUSB)
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c
     )
 
     list(APPEND MICROPY_INC_TINYUSB
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 18ef9d7354798..4f0c27ee078f8 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -183,6 +183,10 @@ void mp_task(void *pvParameter) {
     mp_thread_deinit();
     #endif
 
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    mp_usbd_deinit();
+    #endif
+
     gc_sweep_all();
 
     // Free any native code pointers that point to iRAM.
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index bf1f5a18641db..b5b7d63a56333 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -215,6 +215,10 @@
 #else
 #define MICROPY_HW_USB_VID  (CONFIG_TINYUSB_DESC_CUSTOM_VID)
 #endif
+
+#ifndef MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE    (1) // Support machine.USBDevice
+#endif
 #endif
 
 #ifndef MICROPY_HW_USB_PID

From 8e4c8096940c83c49c3ac07acc96b0133f65ec8e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 Dec 2024 11:56:03 +1100
Subject: [PATCH 1704/3129] unix,windows: Force _FILE_OFFSET_BITS=64 to fix
 32-bit file ABI.

On 64-bit systems this should have no effect.

On 32-bit systems it will force 64-bit file sizes and fixes directory
listing on certain 32-bit ports.  This option should work on pretty much
all 32-bit systems these days.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile    | 4 ++++
 ports/windows/Makefile | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index f02e6c6355ab6..88fa1af045454 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -48,6 +48,10 @@ CWARN = -Wall -Werror
 CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
 CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
 
+# Force the use of 64-bits for file sizes in C library functions on 32-bit platforms.
+# This option has no effect on 64-bit builds.
+CFLAGS += -D_FILE_OFFSET_BITS=64
+
 # Debugging/Optimization
 ifdef DEBUG
 COPT ?= -Og
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index cf0a927014b1a..115d1a61ef51e 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -42,6 +42,10 @@ INC += -I$(VARIANT_DIR)
 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)
 
+# Force the use of 64-bits for file sizes in C library functions on 32-bit platforms.
+# This option has no effect on 64-bit builds.
+CFLAGS += -D_FILE_OFFSET_BITS=64
+
 # Debugging/Optimization
 ifdef DEBUG
 CFLAGS += -g

From ee8d8b3448f26abafbfe1ed7f8970e02f4f8d232 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 Dec 2024 11:58:43 +1100
Subject: [PATCH 1705/3129] tools/ci.sh: Re-enable vfs_posix tests on unix qemu
 MIPS CI.

These work now that _FILE_OFFSET_BITS=64.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index b9f9dec8bc26e..33559d339160a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -682,10 +682,8 @@ function ci_unix_qemu_mips_build {
 }
 
 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)
     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)
 }
 
 function ci_unix_qemu_arm_setup {

From 46a37a09fdf469958c14a64ebdab974a4ca87a21 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Nov 2024 23:57:50 +1100
Subject: [PATCH 1706/3129] qemu/mpconfigport: Enable VFS reader, loading .mpy
 files and io.IOBase.

This allows importing from the VFS, and enables the following 7 additional
tests: builtin_execfile, io_iobase, json_dump_iobase, import_mpy_invalid,
import_mpy_native, import_mpy_native_gc, vfs_userfs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/main.c         | 4 ----
 ports/qemu/mpconfigport.h | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/qemu/main.c b/ports/qemu/main.c
index 042106580407d..dff55058e16d1 100644
--- a/ports/qemu/main.c
+++ b/ports/qemu/main.c
@@ -71,10 +71,6 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-
 void nlr_jump_fail(void *val) {
     mp_printf(&mp_plat_print, "uncaught NLR\n");
     exit(1);
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index f3dd8c37508d3..f95b58ba4d465 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -42,13 +42,14 @@
 #endif
 
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
+#define MICROPY_PERSISTENT_CODE_LOAD (1)
 #define MICROPY_MEM_STATS           (1)
+#define MICROPY_READER_VFS          (1)
 #define MICROPY_ENABLE_GC           (1)
 #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_WARNINGS            (1)
-#define MICROPY_PY_IO_IOBASE        (0)
 #define MICROPY_PY_SYS_PLATFORM     "qemu"
 #define MICROPY_PY_SYS_STDIO_BUFFER (0)
 #define MICROPY_PY_SELECT           (0)

From bd6edf00bba5dd5f64f54946cce4e396ed841209 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Dec 2024 23:29:30 +1100
Subject: [PATCH 1707/3129] stm32/pin: Add option to exclude legacy Pin methods
 and constants.

This is enabled by default, but disabled when MICROPY_PREVIEW_VERSION_2 is
enabled.  The intention is that these methods and constants are deprecated
in MicroPython 2.x.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h |  5 ++++
 ports/stm32/pin.c                  | 42 ++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index c158419483345..f9fe1396a370d 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -52,6 +52,11 @@
 #define MICROPY_PY_PYB_LEGACY (1)
 #endif
 
+// Whether to include legacy methods and constants in machine.Pin (which is also pyb.Pin).
+#ifndef MICROPY_PY_MACHINE_PIN_LEGACY
+#define MICROPY_PY_MACHINE_PIN_LEGACY (!MICROPY_PREVIEW_VERSION_2)
+#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)
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 117a8366dbffe..0859715465130 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -280,6 +280,8 @@ static mp_obj_t pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_
     }
 }
 
+#if MICROPY_PY_MACHINE_PIN_LEGACY
+
 /// \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) {
@@ -304,20 +306,6 @@ static mp_obj_t pin_map_dict(size_t n_args, const mp_obj_t *args) {
 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));
 
-/// \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);
-
 /// \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) {
@@ -330,6 +318,8 @@ 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));
 
+#endif // MICROPY_PY_MACHINE_PIN_LEGACY
+
 // init(mode, pull=None, alt=-1, *, value, alt)
 static mp_obj_t 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[] = {
@@ -442,6 +432,8 @@ static mp_obj_t pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(pin_irq_obj, 1, pin_irq);
 
+#if MICROPY_PY_MACHINE_PIN_LEGACY
+
 /// \method name()
 /// Get the pin name.
 static mp_obj_t pin_name(mp_obj_t self_in) {
@@ -469,6 +461,20 @@ static mp_obj_t pin_names(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(pin_names_obj, pin_names);
 
+/// \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);
+
 /// \method port()
 /// Get the pin port.
 static mp_obj_t pin_port(mp_obj_t self_in) {
@@ -520,6 +526,8 @@ static mp_obj_t pin_af(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(pin_af_obj, pin_af);
 
+#endif // MICROPY_PY_MACHINE_PIN_LEGACY
+
 static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&pin_init_obj) },
@@ -531,6 +539,7 @@ static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     // Legacy names as used by pyb.Pin
     { MP_ROM_QSTR(MP_QSTR_low),     MP_ROM_PTR(&pin_off_obj) },
     { MP_ROM_QSTR(MP_QSTR_high),    MP_ROM_PTR(&pin_on_obj) },
+    #if MICROPY_PY_MACHINE_PIN_LEGACY
     { MP_ROM_QSTR(MP_QSTR_name),    MP_ROM_PTR(&pin_name_obj) },
     { MP_ROM_QSTR(MP_QSTR_names),   MP_ROM_PTR(&pin_names_obj) },
     { MP_ROM_QSTR(MP_QSTR_af_list), MP_ROM_PTR(&pin_af_list_obj) },
@@ -540,11 +549,14 @@ static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mode),    MP_ROM_PTR(&pin_mode_obj) },
     { MP_ROM_QSTR(MP_QSTR_pull),    MP_ROM_PTR(&pin_pull_obj) },
     { MP_ROM_QSTR(MP_QSTR_af),      MP_ROM_PTR(&pin_af_obj) },
+    #endif
 
+    #if MICROPY_PY_MACHINE_PIN_LEGACY
     // 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) },
+    #endif
 
     // class attributes
     { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&pin_board_pins_obj_type) },
@@ -562,12 +574,14 @@ static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     { 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) },
 
+    #if MICROPY_PY_MACHINE_PIN_LEGACY
     // legacy class constants
     { MP_ROM_QSTR(MP_QSTR_OUT_PP),    MP_ROM_INT(GPIO_MODE_OUTPUT_PP) },
     { MP_ROM_QSTR(MP_QSTR_OUT_OD),    MP_ROM_INT(GPIO_MODE_OUTPUT_OD) },
     { MP_ROM_QSTR(MP_QSTR_AF_PP),     MP_ROM_INT(GPIO_MODE_AF_PP) },
     { MP_ROM_QSTR(MP_QSTR_AF_OD),     MP_ROM_INT(GPIO_MODE_AF_OD) },
     { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
+    #endif
 
     #include "genhdr/pins_af_const.h"
 };

From 1c2cdf9f6dc649280ecfcc114100b3c2443c9402 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Dec 2024 23:38:38 +1100
Subject: [PATCH 1708/3129] stm32/pin: Add config option to exclude Pin
 alternate function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h |  5 ++++
 ports/stm32/pin.c                  | 40 ++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index f9fe1396a370d..5c66b804b2f58 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -57,6 +57,11 @@
 #define MICROPY_PY_MACHINE_PIN_LEGACY (!MICROPY_PREVIEW_VERSION_2)
 #endif
 
+// Whether to include support for alternate function selection in machine.Pin (and pyb.Pin).
+#ifndef MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
+#define MICROPY_PY_MACHINE_PIN_ALT_SUPPORT (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)
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 0859715465130..1430c7c64a3e4 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -320,14 +320,29 @@ static MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_debug_obj, MP_ROM_PTR(&pin_debug_fun_
 
 #endif // MICROPY_PY_MACHINE_PIN_LEGACY
 
-// init(mode, pull=None, alt=-1, *, value, alt)
+// init(mode, pull=None, af=-1, *, value, alt)
 static mp_obj_t 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,
+        #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
+        ARG_af,
+        #endif
+        ARG_value,
+        #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
+        ARG_alt,
+        #endif
+    };
     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}},
+        #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
         { MP_QSTR_af, MP_ARG_INT, {.u_int = -1}}, // legacy
+        #endif
         { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
         { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
+        #endif
     };
 
     // parse args
@@ -335,35 +350,38 @@ static mp_obj_t pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_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;
+    uint mode = args[ARG_mode].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 = GPIO_NOPULL;
-    if (args[1].u_obj != mp_const_none) {
-        pull = mp_obj_get_int(args[1].u_obj);
+    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 pin pull: %d"), pull);
     }
 
+    mp_int_t af = -1;
+    #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
     // get af (alternate function); alt-arg overrides af-arg
-    mp_int_t af = args[4].u_int;
+    af = args[ARG_alt].u_int;
     if (af == -1) {
-        af = args[2].u_int;
+        af = args[ARG_af].u_int;
     }
     if ((mode == GPIO_MODE_AF_PP || mode == GPIO_MODE_AF_OD) && !IS_GPIO_AF(af)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin af: %d"), af);
     }
+    #endif
 
     // enable the peripheral clock for the port of this pin
     mp_hal_gpio_clock_enable(self->gpio);
 
     // 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_OBJ_NULL) {
+        mp_hal_pin_write(self, mp_obj_is_true(args[ARG_value].u_obj));
     }
 
     // configure the GPIO as requested
@@ -566,8 +584,10 @@ static const mp_rom_map_elem_t 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_PP) },
     { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_OUTPUT_OD) },
+    #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
     { 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) },
+    #endif
     { 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) },
@@ -578,12 +598,16 @@ static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     // legacy class constants
     { MP_ROM_QSTR(MP_QSTR_OUT_PP),    MP_ROM_INT(GPIO_MODE_OUTPUT_PP) },
     { MP_ROM_QSTR(MP_QSTR_OUT_OD),    MP_ROM_INT(GPIO_MODE_OUTPUT_OD) },
+    #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
     { MP_ROM_QSTR(MP_QSTR_AF_PP),     MP_ROM_INT(GPIO_MODE_AF_PP) },
     { MP_ROM_QSTR(MP_QSTR_AF_OD),     MP_ROM_INT(GPIO_MODE_AF_OD) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
     #endif
 
+    #if MICROPY_PY_MACHINE_PIN_ALT_SUPPORT
     #include "genhdr/pins_af_const.h"
+    #endif
 };
 
 static MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);

From 3203e950fc23b31f8a702babe4c220a248763804 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Dec 2024 00:04:34 +1100
Subject: [PATCH 1709/3129] tools/boardgen.py: Provide macro defns for number
 of cpu/board pins.

So a port can use them if needed to exclude the Pin.cpu/Pin.board objects.

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

diff --git a/tools/boardgen.py b/tools/boardgen.py
index 41a8e9f2e597b..39bedf71cd0c8 100644
--- a/tools/boardgen.py
+++ b/tools/boardgen.py
@@ -172,6 +172,8 @@ def __init__(self, pin_type, enable_af=False):
         self._pins = []
         self._pin_type = pin_type
         self._enable_af = enable_af
+        self._pin_cpu_num_entries = 0
+        self._pin_board_num_entries = 0
 
     # Allows a port to define a known cpu pin (without relying on it being in the
     # csv file).
@@ -298,6 +300,9 @@ def print_board_locals_dict(self, out_source):
                     # Don't include hidden pins in Pins.board.
                     continue
 
+                # Keep track of the total number of Pin.board entries.
+                self._pin_board_num_entries += 1
+
                 # We don't use the enable macro for board pins, because they
                 # shouldn't be referenced in pins.csv unless they're
                 # available.
@@ -322,6 +327,9 @@ def print_cpu_locals_dict(self, out_source):
             file=out_source,
         )
         for pin in self.available_pins(exclude_hidden=True):
+            # Keep track of the total number of Pin.cpu entries.
+            self._pin_cpu_num_entries += 1
+
             m = pin.enable_macro()
             if m:
                 print("    #if {}".format(m), file=out_source)
@@ -351,6 +359,20 @@ def board_name_define_prefix(self):
 
     # Print the pin_CPUNAME and pin_BOARDNAME macros.
     def print_defines(self, out_header, cpu=True, board=True):
+        # Provide #defines for the number of cpu and board pins.
+        print(
+            "#define MICROPY_PY_MACHINE_PIN_CPU_NUM_ENTRIES ({})".format(
+                self._pin_cpu_num_entries
+            ),
+            file=out_header,
+        )
+        print(
+            "#define MICROPY_PY_MACHINE_PIN_BOARD_NUM_ENTRIES ({})".format(
+                self._pin_board_num_entries
+            ),
+            file=out_header,
+        )
+
         # Provide #defines for each cpu pin.
         for pin in self.available_pins():
             print(file=out_header)

From a2efafcce3a03e2fd972e2521cae2c2bec2e88ff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Dec 2024 00:05:19 +1100
Subject: [PATCH 1710/3129] stm32/pin: Exclude Pin.cpu/Pin.board if they
 contain no entries.

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

diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 1430c7c64a3e4..7de87f2c7be2f 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -577,8 +577,12 @@ static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     #endif
 
     // class attributes
+    #if MICROPY_PY_MACHINE_PIN_BOARD_NUM_ENTRIES > 0
     { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&pin_board_pins_obj_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_PIN_CPU_NUM_ENTRIES > 0
     { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&pin_cpu_pins_obj_type) },
+    #endif
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN),        MP_ROM_INT(GPIO_MODE_INPUT) },

From 23bfa95d34e9b6f836ee67a1564e04f7b86eaa36 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 2 Sep 2024 13:06:30 +1000
Subject: [PATCH 1711/3129] stm32/extint: Fix EXTI IRQ handlers for H5 MCUs.

The existing EXTI IRQ handlers are moved from `stm32_it.c` to `extint.c` to
keep them with related code.  A macro is defined to make it easier to
define the handler function that handles one line, and correct handlers
added for STM32H5xx MCUs.

Also, to prevent errors in the future, `MP_STATIC_ASSERT(<irqn> > 0)` is
added to each handler function to check that the correct `IRQn` constant is
used, which corresponds to the handler function name.

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

diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 2a08810125572..5b5658809bc84 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -241,6 +241,97 @@ static const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     #endif
 };
 
+#define DEFINE_EXTI_IRQ_HANDLER(line) \
+    void EXTI##line##_IRQHandler(void) { \
+        MP_STATIC_ASSERT(EXTI##line##_IRQn > 0); \
+        IRQ_ENTER(EXTI##line##_IRQn); \
+        Handle_EXTI_Irq(line); \
+        IRQ_EXIT(EXTI##line##_IRQn); \
+    }
+
+#if defined(STM32F0) || defined(STM32L0) || defined(STM32G0)
+
+void EXTI0_1_IRQHandler(void) {
+    MP_STATIC_ASSERT(EXTI0_1_IRQn > 0);
+    IRQ_ENTER(EXTI0_1_IRQn);
+    Handle_EXTI_Irq(0);
+    Handle_EXTI_Irq(1);
+    IRQ_EXIT(EXTI0_1_IRQn);
+}
+
+void EXTI2_3_IRQHandler(void) {
+    MP_STATIC_ASSERT(EXTI2_3_IRQn > 0);
+    IRQ_ENTER(EXTI2_3_IRQn);
+    Handle_EXTI_Irq(2);
+    Handle_EXTI_Irq(3);
+    IRQ_EXIT(EXTI2_3_IRQn);
+}
+
+void EXTI4_15_IRQHandler(void) {
+    MP_STATIC_ASSERT(EXTI4_15_IRQn > 0);
+    IRQ_ENTER(EXTI4_15_IRQn);
+    for (int i = 4; i <= 15; ++i) {
+        Handle_EXTI_Irq(i);
+    }
+    IRQ_EXIT(EXTI4_15_IRQn);
+}
+
+#elif defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+
+DEFINE_EXTI_IRQ_HANDLER(0)
+DEFINE_EXTI_IRQ_HANDLER(1)
+DEFINE_EXTI_IRQ_HANDLER(2)
+DEFINE_EXTI_IRQ_HANDLER(3)
+DEFINE_EXTI_IRQ_HANDLER(4)
+
+void EXTI9_5_IRQHandler(void) {
+    MP_STATIC_ASSERT(EXTI9_5_IRQn > 0);
+    IRQ_ENTER(EXTI9_5_IRQn);
+    Handle_EXTI_Irq(5);
+    Handle_EXTI_Irq(6);
+    Handle_EXTI_Irq(7);
+    Handle_EXTI_Irq(8);
+    Handle_EXTI_Irq(9);
+    IRQ_EXIT(EXTI9_5_IRQn);
+}
+
+void EXTI15_10_IRQHandler(void) {
+    MP_STATIC_ASSERT(EXTI15_10_IRQn > 0);
+    IRQ_ENTER(EXTI15_10_IRQn);
+    Handle_EXTI_Irq(10);
+    Handle_EXTI_Irq(11);
+    Handle_EXTI_Irq(12);
+    Handle_EXTI_Irq(13);
+    Handle_EXTI_Irq(14);
+    Handle_EXTI_Irq(15);
+    IRQ_EXIT(EXTI15_10_IRQn);
+}
+
+#elif defined(STM32H5)
+
+DEFINE_EXTI_IRQ_HANDLER(0)
+DEFINE_EXTI_IRQ_HANDLER(1)
+DEFINE_EXTI_IRQ_HANDLER(2)
+DEFINE_EXTI_IRQ_HANDLER(3)
+DEFINE_EXTI_IRQ_HANDLER(4)
+DEFINE_EXTI_IRQ_HANDLER(5)
+DEFINE_EXTI_IRQ_HANDLER(6)
+DEFINE_EXTI_IRQ_HANDLER(7)
+DEFINE_EXTI_IRQ_HANDLER(8)
+DEFINE_EXTI_IRQ_HANDLER(9)
+DEFINE_EXTI_IRQ_HANDLER(10)
+DEFINE_EXTI_IRQ_HANDLER(11)
+DEFINE_EXTI_IRQ_HANDLER(12)
+DEFINE_EXTI_IRQ_HANDLER(13)
+DEFINE_EXTI_IRQ_HANDLER(14)
+DEFINE_EXTI_IRQ_HANDLER(15)
+
+#else
+
+#error Unsupported processor
+
+#endif
+
 // 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) {
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index e05dbe91bc108..2e625a5894dd9 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -452,62 +452,6 @@ void OTG_HS_WKUP_IRQHandler(void) {
 {
 }*/
 
-/**
-  * @brief  These functions handle the EXTI interrupt requests.
-  * @param  None
-  * @retval None
-  */
-void EXTI0_IRQHandler(void) {
-    IRQ_ENTER(EXTI0_IRQn);
-    Handle_EXTI_Irq(0);
-    IRQ_EXIT(EXTI0_IRQn);
-}
-
-void EXTI1_IRQHandler(void) {
-    IRQ_ENTER(EXTI1_IRQn);
-    Handle_EXTI_Irq(1);
-    IRQ_EXIT(EXTI1_IRQn);
-}
-
-void EXTI2_IRQHandler(void) {
-    IRQ_ENTER(EXTI2_IRQn);
-    Handle_EXTI_Irq(2);
-    IRQ_EXIT(EXTI2_IRQn);
-}
-
-void EXTI3_IRQHandler(void) {
-    IRQ_ENTER(EXTI3_IRQn);
-    Handle_EXTI_Irq(3);
-    IRQ_EXIT(EXTI3_IRQn);
-}
-
-void EXTI4_IRQHandler(void) {
-    IRQ_ENTER(EXTI4_IRQn);
-    Handle_EXTI_Irq(4);
-    IRQ_EXIT(EXTI4_IRQn);
-}
-
-void EXTI9_5_IRQHandler(void) {
-    IRQ_ENTER(EXTI9_5_IRQn);
-    Handle_EXTI_Irq(5);
-    Handle_EXTI_Irq(6);
-    Handle_EXTI_Irq(7);
-    Handle_EXTI_Irq(8);
-    Handle_EXTI_Irq(9);
-    IRQ_EXIT(EXTI9_5_IRQn);
-}
-
-void EXTI15_10_IRQHandler(void) {
-    IRQ_ENTER(EXTI15_10_IRQn);
-    Handle_EXTI_Irq(10);
-    Handle_EXTI_Irq(11);
-    Handle_EXTI_Irq(12);
-    Handle_EXTI_Irq(13);
-    Handle_EXTI_Irq(14);
-    Handle_EXTI_Irq(15);
-    IRQ_EXIT(EXTI15_10_IRQn);
-}
-
 void PVD_IRQHandler(void) {
     IRQ_ENTER(PVD_IRQn);
     Handle_EXTI_Irq(EXTI_PVD_OUTPUT);
@@ -605,28 +549,6 @@ void RTC_IRQHandler(void) {
 }
 #endif
 
-void EXTI0_1_IRQHandler(void) {
-    IRQ_ENTER(EXTI0_1_IRQn);
-    Handle_EXTI_Irq(0);
-    Handle_EXTI_Irq(1);
-    IRQ_EXIT(EXTI0_1_IRQn);
-}
-
-void EXTI2_3_IRQHandler(void) {
-    IRQ_ENTER(EXTI2_3_IRQn);
-    Handle_EXTI_Irq(2);
-    Handle_EXTI_Irq(3);
-    IRQ_EXIT(EXTI2_3_IRQn);
-}
-
-void EXTI4_15_IRQHandler(void) {
-    IRQ_ENTER(EXTI4_15_IRQn);
-    for (int i = 4; i <= 15; ++i) {
-        Handle_EXTI_Irq(i);
-    }
-    IRQ_EXIT(EXTI4_15_IRQn);
-}
-
 void TIM1_BRK_UP_TRG_COM_IRQHandler(void) {
     IRQ_ENTER(TIM1_BRK_UP_TRG_COM_IRQn);
     timer_irq_handler(1);

From 8970ede7cccee57032b547b8a97539b64e61102a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 24 Nov 2024 15:06:30 +1100
Subject: [PATCH 1712/3129] extmod/moductypes: Fix large return values of
 addressof and INT_MAYBE.

So they don't return a negative number for an address (prior to this fix
they would return negative addresses for values that were larger than the
maximum small-int value).

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

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 00a69a275a0ee..bf45797658fa0 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -602,7 +602,7 @@ static mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
                 uint agg_type = GET_TYPE(offset, AGG_TYPE_BITS);
                 if (agg_type == PTR) {
                     byte *p = *(void **)self->addr;
-                    return mp_obj_new_int((mp_int_t)(uintptr_t)p);
+                    return mp_obj_new_int_from_uint((uintptr_t)p);
                 }
             }
             MP_FALLTHROUGH
@@ -629,7 +629,7 @@ static mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
 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);
-    return mp_obj_new_int((mp_int_t)(uintptr_t)bufinfo.buf);
+    return mp_obj_new_int_from_uint((uintptr_t)bufinfo.buf);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_addressof_obj, uctypes_struct_addressof);
 

From d10cda66dcff1b760ebc550c7f9352220fe4163f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Dec 2024 10:15:01 +1100
Subject: [PATCH 1713/3129] tests/extmod: Add test for uctypes.addressof
 function.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uctypes_addressof.py     | 16 ++++++++++++++++
 tests/extmod/uctypes_addressof.py.exp |  9 +++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 tests/extmod/uctypes_addressof.py
 create mode 100644 tests/extmod/uctypes_addressof.py.exp

diff --git a/tests/extmod/uctypes_addressof.py b/tests/extmod/uctypes_addressof.py
new file mode 100644
index 0000000000000..c83089d0f72af
--- /dev/null
+++ b/tests/extmod/uctypes_addressof.py
@@ -0,0 +1,16 @@
+# Test uctypes.addressof().
+
+try:
+    from sys import maxsize
+    import uctypes
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Test small addresses.
+for i in range(8):
+    print(uctypes.addressof(uctypes.bytearray_at(1 << i, 8)))
+
+# Test address that is bigger than the greatest small-int but still within the address range.
+large_addr = maxsize + 1
+print(uctypes.addressof(uctypes.bytearray_at(large_addr, 8)) == large_addr)
diff --git a/tests/extmod/uctypes_addressof.py.exp b/tests/extmod/uctypes_addressof.py.exp
new file mode 100644
index 0000000000000..5b48569d0185d
--- /dev/null
+++ b/tests/extmod/uctypes_addressof.py.exp
@@ -0,0 +1,9 @@
+1
+2
+4
+8
+16
+32
+64
+128
+True

From 92a5ea51b456e96332f703aded4be2fbc22982fc Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 10 Dec 2024 15:34:12 +1100
Subject: [PATCH 1714/3129] ci: Cache Zephyr workspace installation.

Can save several minutes downloading the Zephyr docker image and/or cloning
repo from GitHub. Cache keyed on the Zephyr version, which AFAIK is the
only determinant for the workspace contents.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_zephyr.yml | 13 +++++++++++++
 tools/ci.sh                        | 14 ++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index 444b0973daff5..ff3e19c7ea136 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -30,9 +30,22 @@ jobs:
         docker-images: false
         swap-storage: false
     - uses: actions/checkout@v4
+    - id: versions
+      name: Read Zephyr version
+      run: source tools/ci.sh && echo "ZEPHYR=$ZEPHYR_VERSION" | tee "$GITHUB_OUTPUT"
+    - name: Cached Zephyr Workspace
+      id: cache_workspace
+      uses: actions/cache@v4
+      with:
+        # note that the Zephyr CI docker image is 15GB. At time of writing
+        # GitHub caches are limited to 10GB total for a project. So we only
+        # cache the "workspace"
+        path: ./zephyrproject
+        key: zephyr-workspace-${{ steps.versions.outputs.ZEPHYR }}
     - name: Install packages
       run: source tools/ci.sh && ci_zephyr_setup
     - name: Install Zephyr
+      if: steps.cache_workspace.outputs.cache-hit != 'true'
       run: source tools/ci.sh && ci_zephyr_install
     - name: Build
       run: source tools/ci.sh && ci_zephyr_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 33559d339160a..bc013f5324111 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -747,14 +747,24 @@ ZEPHYR_SDK_VERSION=0.16.8
 ZEPHYR_VERSION=v3.7.0
 
 function ci_zephyr_setup {
-    docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
+    IMAGE=zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
+
+    docker pull ${IMAGE}
+
+    # Directories cached by GitHub Actions, mounted
+    # into the container
+    ZEPHYRPROJECT_DIR="$(pwd)/zephyrproject"
+
+    mkdir -p "${ZEPHYRPROJECT_DIR}"
+
     docker run --name zephyr-ci -d -it \
       -v "$(pwd)":/micropython \
+      -v "${ZEPHYRPROJECT_DIR}":/zephyrproject \
       -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:${ZEPHYR_DOCKER_VERSION}
+      ${IMAGE}
     docker ps -a
 
     # qemu-system-arm is needed to run the test suite.

From db4b095644e646f0a700076e4d2c51512eed4d30 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 10 Dec 2024 16:54:35 +1100
Subject: [PATCH 1715/3129] ci: Pull the Zephyr CI docker image from GitHub
 container reg.

This image is 15GB so in theory this may be faster, although
in testing the improvement is either non-existent or marginal.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index bc013f5324111..d4bfe4933690b 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -747,7 +747,7 @@ ZEPHYR_SDK_VERSION=0.16.8
 ZEPHYR_VERSION=v3.7.0
 
 function ci_zephyr_setup {
-    IMAGE=zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
+    IMAGE=ghcr.io/zephyrproject-rtos/ci:${ZEPHYR_DOCKER_VERSION}
 
     docker pull ${IMAGE}
 

From a9945fc528c950659793b6fb4979586297ea1497 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 11 Dec 2024 14:59:39 +1100
Subject: [PATCH 1716/3129] ci: Add caching of ccache for Zephyr.

Similar to the ESP32 builds, but needs additional step to pass the
ccache directory through to the Zephyr container.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_zephyr.yml | 4 ++++
 tools/ci.sh                        | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index ff3e19c7ea136..eb85af6a36154 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -42,6 +42,10 @@ jobs:
         # cache the "workspace"
         path: ./zephyrproject
         key: zephyr-workspace-${{ steps.versions.outputs.ZEPHYR }}
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        key: zephyr
     - name: Install packages
       run: source tools/ci.sh && ci_zephyr_setup
     - name: Install Zephyr
diff --git a/tools/ci.sh b/tools/ci.sh
index d4bfe4933690b..c67aeed0cecdf 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -754,12 +754,15 @@ function ci_zephyr_setup {
     # Directories cached by GitHub Actions, mounted
     # into the container
     ZEPHYRPROJECT_DIR="$(pwd)/zephyrproject"
+    CCACHE_DIR="$(pwd)/.ccache"
 
     mkdir -p "${ZEPHYRPROJECT_DIR}"
+    mkdir -p "${CCACHE_DIR}"
 
     docker run --name zephyr-ci -d -it \
       -v "$(pwd)":/micropython \
       -v "${ZEPHYRPROJECT_DIR}":/zephyrproject \
+      -v "${CCACHE_DIR}":/root/.cache/ccache \
       -e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION} \
       -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
       -e ZEPHYR_BASE=/zephyrproject/zephyr \

From 22804fccf312030104adf48f836dd8667411cad1 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Tue, 13 Aug 2024 10:54:36 +1000
Subject: [PATCH 1717/3129] stm32/boards/WEACT_F411_BLACKPILL: Add WeAct F411
 'blackpill' boards.

Adds board profile for the WeAct F411 'blackpill' which is a quite popular
low cost ST dev board.  This board also has optional spiflash so can be
purchased in a few different configurations.

Builds for v3.1 with no SPI Flash by default.  Includes variants for
different board versions and spi flash sizes.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 .../boards/WEACT_F411_BLACKPILL/README.md     |  55 +++++++++
 .../stm32/boards/WEACT_F411_BLACKPILL/bdev.c  |  45 +++++++
 .../boards/WEACT_F411_BLACKPILL/board.json    |  22 ++++
 .../WEACT_F411_BLACKPILL/mpconfigboard.h      | 112 ++++++++++++++++++
 .../WEACT_F411_BLACKPILL/mpconfigboard.mk     |  38 ++++++
 .../mpconfigvariant_V13.mk                    |   1 +
 .../mpconfigvariant_V13_FLASH_4M.mk           |   2 +
 .../mpconfigvariant_V20_FLASH_4M.mk           |   2 +
 .../mpconfigvariant_V31_FLASH_8M.mk           |   2 +
 .../mpconfigvariant_V31_XTAL_8M.mk            |   2 +
 .../boards/WEACT_F411_BLACKPILL/pins.csv      |  45 +++++++
 .../WEACT_F411_BLACKPILL/stm32f4xx_hal_conf.h |  19 +++
 12 files changed, 345 insertions(+)
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/README.md
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/bdev.c
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/board.json
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13.mk
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13_FLASH_4M.mk
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V20_FLASH_4M.mk
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_FLASH_8M.mk
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_XTAL_8M.mk
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/pins.csv
 create mode 100644 ports/stm32/boards/WEACT_F411_BLACKPILL/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/README.md b/ports/stm32/boards/WEACT_F411_BLACKPILL/README.md
new file mode 100644
index 0000000000000..9af29e6b1e4ad
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/README.md
@@ -0,0 +1,55 @@
+WeAct F411 'blackpill'
+======================
+
+The WeAct F411 blackpill board comes in a number of versions and variants.
+All have a footprint for a SPI flash chip on the back, though the board is
+often sold without any flash chip loaded.
+
+At the time of writing (Sep 2024) v3.1 is the current version.
+This version is sold with both 25Mhz HSE crystal (same as previous versions) and also
+with a 8Mhz crystal. The end user should be careful to confirm which variant is
+purchased and/or read the markings on the crystal to know which variant build to load.
+
+The previous v2.0 boards had changed the MCU pinout for the spi flash chip so requires
+soft-spi support enabled in the variant settings, unlike v3.1 or v1.3 which is
+compatible with the hardware spi peripheral.
+
+The original v1.3 boards did not include a user switch on the top, it only has
+"BOOT0" and "NRST" switches to load bootloader and reset the board respectively.
+
+For more information see: https://github.com/WeActStudio/WeActStudio.MiniSTM32F4x1
+
+Note: The pins used by features like spiflash and USB are also broken out to the
+gpio headers on the sides of the board.
+If these peripherals / features are enabled then these external pins must be avoided to ensure
+there are no conflicts. [pins.csv](pins.csv) should be consulted to check all pins assigned
+to alternate functions on the board.
+
+Customising the build
+---------------------
+
+After purchasing a board without any spiflash chip loaded the user can solder on
+their own of any desired size. Most brands of spiflash in SO8 pinout are compatible
+however some do have a slightly different protocol so may not work out of the box
+with micropython. Brand compatibility is outide the scope of this doc.
+
+Once a custom spiflash chip has been loaded onto the board micropython should
+be built with the flash size specified. After doing so the spiflash chip will
+be used for the FAT/LFS main filesystem.
+
+Examples:
+
+For a v3.1 / 25Mhz (default version) board with 16MiB flash chip loaded:
+``` bash
+make -C ports/stm32 BOARD=WEACT_F411_BLACKPILL SPI_FLASH_SIZE_MB=16
+```
+
+For a v3.1 / 8Mhz board with 4MiB flash chip loaded:
+``` bash
+make -C ports/stm32 BOARD=WEACT_F411_BLACKPILL BOARD_VARIANT=V31_XTAL_8M SPI_FLASH_SIZE_MB=4
+```
+
+For a v1.3 board with 2MiB flash chip loaded and XTAL manually replaced with 8Mhz:
+``` bash
+make -C ports/stm32 BOARD=WEACT_F411_BLACKPILL BOARD_VARIANT=V13 SPI_FLASH_SIZE_MB=2 XTAL_FREQ_MHZ=8
+```
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/bdev.c b/ports/stm32/boards/WEACT_F411_BLACKPILL/bdev.c
new file mode 100644
index 0000000000000..fe349e0c8a4ed
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/bdev.c
@@ -0,0 +1,45 @@
+#include "storage.h"
+#include "spi.h"
+#include "py/mpconfig.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+#if WEACT_F411_V20
+// External SPI flash uses SPI interface, but not on all HW spi pins.
+static const mp_soft_spi_obj_t 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,
+};
+
+#else // WEACT_F411_V1.3 or WEACT_F411_V3.1
+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,
+};
+#endif
+
+#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_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void *)&spi_bus,
+    .bus.u_spi.proto = &spi_proto,
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+    .cache = &spi_bdev_cache,
+    #endif
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/board.json b/ports/stm32/boards/WEACT_F411_BLACKPILL/board.json
new file mode 100644
index 0000000000000..5b10787216995
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../PYBV10/deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "WEACTV20_F411.jpg"
+    ],
+    "mcu": "stm32f411",
+    "product": "WeAct F411 'blackpill'. Default variant is v3.1 with no SPI Flash.",
+    "thumbnail": "",
+    "url": "https://github.com/WeActStudio/WeActStudio.MiniSTM32F4x1",
+    "variants": {
+        "V13": "v1.3 board with no SPI Flash",
+        "V13_FLASH_4M": "v1.3 board with 4MB SPI Flash",
+        "V20_FLASH_4M": "v2.0 board with 4MB SPI Flash",
+        "V31_FLASH_8M": "v3.1 board with 8MB SPI Flash",
+        "V31_XTAL_8M": "v3.1 board with 8MHz crystal"
+    },
+    "vendor": "WeAct Studio"
+}
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h
new file mode 100644
index 0000000000000..561c1a9f1516e
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h
@@ -0,0 +1,112 @@
+// based off the following two repositories:
+// * https://github.com/mcauser/WEACT_F411CEU6
+// * https://github.com/YXZhu/micropython
+
+#define MICROPY_HW_BOARD_NAME       "WEACT_F411_BLACKPILL"
+#define MICROPY_HW_MCU_NAME         "STM32F411CE"
+#define MICROPY_HW_FLASH_FS_LABEL   "WEACT_F411_BLACKPILL"
+
+// some users having issues with FLASH_LATENCY_2, so set to 3
+// from https://forum.micropython.org/viewtopic.php?t=7154
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_3
+
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_USB_FS           (1)
+
+// Switch
+#if WEACT_F411_V13
+#define MICROPY_HW_HAS_SWITCH       (0)
+#else
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_USRSW_PIN        (pyb_pin_SW)
+#define MICROPY_HW_USRSW_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+#endif
+
+// LEDs
+#define MICROPY_HW_LED1             (pyb_pin_LED_BLUE)
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
+
+// RTC
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (0)
+#define MICROPY_HW_RTC_USE_CALOUT   (1)
+
+// Set PLLM same as HSE in MHZ.
+#define MICROPY_HW_CLK_PLLM (MICROPY_HW_HSE_SPEED_MHZ)
+// Configure PLL for final CPU freq of 96MHz
+#define MICROPY_HW_CLK_PLLN (192)
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ (4)
+
+// 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_UART_REPL        (PYB_UART_1)
+#define MICROPY_HW_UART_REPL_BAUD   (115200)
+
+// I2C bus
+#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_B9)
+#define MICROPY_HW_I2C3_SCL (pin_A8)
+#define MICROPY_HW_I2C3_SDA (pin_B8)
+
+// SPI bus
+// SPI 1 is generally used for the SPI flash if enabled below.
+#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)
+
+// SPI 3 is not accessible if SPI flash module is used on V2.0 (PB4 conflict)
+#define MICROPY_HW_SPI3_NSS     (pin_A15)
+#define MICROPY_HW_SPI3_SCK     (pin_B3)
+#define MICROPY_HW_SPI3_MISO    (pin_B4)
+#define MICROPY_HW_SPI3_MOSI    (pin_B5)
+
+// External SPI Flash configuration
+
+#if !MICROPY_HW_SPIFLASH_SIZE_BYTES
+// Use internal filesystem if spiflash not enabled.
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+#else
+// Disable internal filesystem to use spiflash.
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+// SPI flash pins
+#define MICROPY_HW_SPIFLASH_CS          (pyb_pin_FLASH_CS)
+#define MICROPY_HW_SPIFLASH_SCK         (pyb_pin_FLASH_SCK)
+#define MICROPY_HW_SPIFLASH_MOSI        (pyb_pin_FLASH_MOSI)
+#if WEACT_F411_V13
+#define MICROPY_HW_SPIFLASH_MISO        (pyb_pin_FLASH_MISO_V13)
+#elif WEACT_F411_V20
+#define MICROPY_HW_SPIFLASH_MISO        (pyb_pin_FLASH_MISO_V20)
+#else
+#define MICROPY_HW_SPIFLASH_MISO        (pyb_pin_FLASH_MISO_V31)
+#endif
+
+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_SPIFLASH    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (MICROPY_HW_SPIFLASH_SIZE_BYTES * 8)
+#endif
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.mk b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.mk
new file mode 100644
index 0000000000000..3ae152294d27c
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.mk
@@ -0,0 +1,38 @@
+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
+
+MICROPY_VFS_LFS2 = 1
+
+# Settings for version, spi flash and HSE xtal.
+# These are used in variant configs and/or on make command line.
+# If provided on make command line the build folder name will be updated to match
+# When set in variant they're included after this file so the following ifdef blocks are ignored.
+
+ifdef BOARD_VERSION
+BUILD := $(BUILD)_V$(BOARD_VERSION)
+endif
+
+ifdef SPI_FLASH_SIZE_MB
+BUILD := $(BUILD)_FLASH_$(SPI_FLASH_SIZE_MB)M
+endif
+
+ifdef XTAL_FREQ_MHZ
+BUILD := $(BUILD)_XTAL_$(XTAL_FREQ_MHZ)M
+endif
+
+# Blackpill v3.1 board by default
+BOARD_VERSION ?= 31
+
+# No flash chip in default build - use internal flash
+SPI_FLASH_SIZE_MB ?= 0
+
+# 25Mhz HSE crystal by default.
+XTAL_FREQ_MHZ ?= 25
+
+CFLAGS += -DWEACT_F411_V$(BOARD_VERSION)=1
+CFLAGS += -DMICROPY_HW_SPIFLASH_SIZE_BYTES="($(SPI_FLASH_SIZE_MB) * 1024 * 1024)"
+CFLAGS += -DMICROPY_HW_HSE_SPEED_MHZ="($(XTAL_FREQ_MHZ))"
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13.mk b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13.mk
new file mode 100644
index 0000000000000..47c94faee4012
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13.mk
@@ -0,0 +1 @@
+BOARD_VERSION = 13
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13_FLASH_4M.mk b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13_FLASH_4M.mk
new file mode 100644
index 0000000000000..ae7aeaaf52d13
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V13_FLASH_4M.mk
@@ -0,0 +1,2 @@
+BOARD_VERSION = 13
+SPI_FLASH_SIZE_MB = 4
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V20_FLASH_4M.mk b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V20_FLASH_4M.mk
new file mode 100644
index 0000000000000..21ce84ceaff85
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V20_FLASH_4M.mk
@@ -0,0 +1,2 @@
+BOARD_VERSION = 20
+SPI_FLASH_SIZE_MB = 4
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_FLASH_8M.mk b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_FLASH_8M.mk
new file mode 100644
index 0000000000000..87867b1fedf45
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_FLASH_8M.mk
@@ -0,0 +1,2 @@
+BOARD_VERSION = 31
+SPI_FLASH_SIZE_MB = 8
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_XTAL_8M.mk b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_XTAL_8M.mk
new file mode 100644
index 0000000000000..5eb05e49fe926
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigvariant_V31_XTAL_8M.mk
@@ -0,0 +1,2 @@
+BOARD_VERSION = 31
+XTAL_FREQ_MHZ = 8
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/pins.csv b/ports/stm32/boards/WEACT_F411_BLACKPILL/pins.csv
new file mode 100644
index 0000000000000..eabf753de852b
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/pins.csv
@@ -0,0 +1,45 @@
+,PA0
+,PA1
+,PA2
+,PA3
+,PA4
+,PA5
+,PA6
+,PA7
+,PA8
+,PA9
+,PA10
+,PA11
+,PA12
+,PA15
+,PB0
+,PB1
+,PB2
+,PB3
+,PB4
+,PB5
+,PB6
+,PB7
+,PB8
+,PB9
+,PB10
+,PB12
+,PB13
+,PB14
+,PB15
+,PC14
+,PC15
+LED_BLUE,PC13
+SW,PA0
+-SWDIO,PA13
+-SWCLK,PA14
+-OSC32_IN,PH0
+-OSC32_OUT,PH1
+-USB_DM,PA11
+-USB_DP,PA12
+-FLASH_CS,PA4
+-FLASH_SCK,PA5
+-FLASH_MOSI,PA7
+-FLASH_MISO_V13,PA6
+-FLASH_MISO_V20,PB4
+-FLASH_MISO_V31,PA6
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/stm32f4xx_hal_conf.h b/ports/stm32/boards/WEACT_F411_BLACKPILL/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..c11d72a213ff6
--- /dev/null
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/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) 2024 Andrew Leech
+ */
+#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 (MICROPY_HW_HSE_SPEED_MHZ * 1000000)
+#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 7924b31050271c76ff6cf26c6fda5fe3ba615d08 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 3 Sep 2024 10:41:25 +1000
Subject: [PATCH 1718/3129] stm32: Generate PLL tables from pre-processed
 headers.

Allows boards to configure their HSE and PLL values in variants.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/stm32/Makefile               | 12 +++----
 ports/stm32/boards/plli2svalues.py | 55 +++++++++++++++---------------
 ports/stm32/boards/pllvalues.py    | 30 ++++++++--------
 ports/stm32/machine_i2s.c          |  2 ++
 ports/stm32/powerctrl.c            | 17 ++++++++-
 5 files changed, 67 insertions(+), 49 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 806added49e9a..a9612f1a5792e 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -640,15 +640,15 @@ $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_
 	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) \
 		--output-af-const $(GEN_PINS_AF_CONST) --output-af-defs $(GEN_PINS_AF_DEFS)
 
-powerctrl.c: $(GEN_PLLFREQTABLE_HDR)
-$(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
+$(BUILD)/powerctrl.o: $(GEN_PLLFREQTABLE_HDR)
+$(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)/qstr.i.last
 	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(PLLVALUES) -c -m $(CMSIS_MCU_LOWER) file:$(BOARD_DIR)/stm32$(MCU_SERIES)xx_hal_conf.h > $@
+	$(Q)$(PYTHON) $(PLLVALUES) -c -m $(CMSIS_MCU_LOWER) file:$(HEADER_BUILD)/qstr.i.last > $@
 
-$(TOP)/extmod/machine_i2s.c: $(GEN_PLLI2STABLE_HDR)
-$(GEN_PLLI2STABLE_HDR): $(PLLI2SVALUES) | $(HEADER_BUILD)
+$(BUILD)/extmod/machine_i2s.o: $(GEN_PLLI2STABLE_HDR)
+$(GEN_PLLI2STABLE_HDR): $(PLLI2SVALUES) | $(HEADER_BUILD)/qstr.i.last
 	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(PLLI2SVALUES) -c -m $(CMSIS_MCU_LOWER) hse:$(BOARD_DIR)/stm32$(MCU_SERIES)xx_hal_conf.h pllm:$(BOARD_DIR)/mpconfigboard.h > $@
+	$(Q)$(PYTHON) $(PLLI2SVALUES) -c -m $(CMSIS_MCU_LOWER) file:$(HEADER_BUILD)/qstr.i.last > $@
 
 $(BUILD)/modstm.o: $(GEN_STMCONST_HDR)
 $(HEADER_BUILD)/modstm_const.h: $(CMSIS_MCU_HDR) make-stmconst.py | $(HEADER_BUILD)
diff --git a/ports/stm32/boards/plli2svalues.py b/ports/stm32/boards/plli2svalues.py
index 8ff7f0ff8fcdf..436dcee7444a7 100644
--- a/ports/stm32/boards/plli2svalues.py
+++ b/ports/stm32/boards/plli2svalues.py
@@ -123,22 +123,21 @@ def generate_c_table(plli2s_table, hse, pllm):
     print("}")
 
 
-def search_header(filename, re_include, re_define, lookup, val):
-    regex_include = re.compile(re_include)
+def search_header(filename, re_define, lookup):
     regex_define = re.compile(re_define)
+    val = None
     with open(filename) as f:
         for line in f:
             line = line.strip()
-            m = regex_include.match(line)
-            if m:
-                # Search included file
-                search_header(m.group(1), re_include, re_define, lookup, val)
-                continue
             m = regex_define.match(line)
             if m:
                 # found lookup value
+                found = m.group(3)
+                if "*" in found or "/" in found:
+                    # process define using multiply or divide to calculate value
+                    found = eval(found)
                 if m.group(1) == lookup:
-                    val[0] = int(m.group(3))
+                    val = int(found)
     return val
 
 
@@ -166,35 +165,37 @@ def main():
             break
 
     if mcu_series in mcu_support_plli2s:
-        if len(argv) != 2:
+        if len(argv) not in (1, 2):
             print("usage: pllvalues.py [-c] [-m <mcu_series>] <hse in MHz> <pllm in MHz>")
             sys.exit(1)
 
         if argv[0].startswith("hse:"):
-            # extract HSE_VALUE from header file
-            (hse,) = search_header(
-                argv[0][len("hse:") :],
-                r'#include "(boards/[A-Za-z0-9_./]+)"',
-                r"#define +(HSE_VALUE) +\((\(uint32_t\))?([0-9]+)\)",
-                "HSE_VALUE",
-                [None],
+            hse = int(argv[0][len("hse:") :])
+
+        if argv[0].startswith("pllm:"):
+            pllm = int(argv[0][len("pllm:") :])
+
+        if argv[0].startswith("file:"):
+            # extract hse value from processed header files
+            hse = search_header(
+                argv[0][len("file:") :],
+                r"static.* (micropy_hw_hse_value) = +\(*(\(uint32_t\))?([0-9 +-/\*]+)\)*;",
+                "micropy_hw_hse_value",
             )
             if hse is None:
-                raise ValueError("%s does not contain a definition of HSE_VALUE" % argv[0])
-            argv.pop(0)
+                raise ValueError(
+                    "%s does not contain a definition of micropy_hw_hse_value" % argv[0]
+                )
 
-        if argv[0].startswith("pllm:"):
-            # extract MICROPY_HW_CLK_PLLM from header file
-            (pllm,) = search_header(
-                argv[0][len("pllm:") :],
-                r'#include "(boards/[A-Za-z0-9_./]+)"',
-                r"#define +(MICROPY_HW_CLK_PLLM) +\((\(uint32_t\))?([0-9]+)\)",
-                "MICROPY_HW_CLK_PLLM",
-                [None],
+            # extract pllm value from processed header files
+            pllm = search_header(
+                argv[0][len("file:") :],
+                r"static.* (micropy_hw_clk_pllm) = +\(*(\(uint32_t\))?([0-9 +-/\*]+)\)*;",
+                "micropy_hw_clk_pllm",
             )
             if pllm is None:
                 raise ValueError(
-                    "%s does not contain a definition of MICROPY_HW_CLK_PLLM" % argv[0]
+                    "%s does not contain a definition of micropy_hw_clk_pllm" % argv[0]
                 )
             argv.pop(0)
 
diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 2db6b5f257044..5edc1d51fd6bc 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -228,26 +228,26 @@ def print_table(hse, valid_plls):
     print("found %u valid configurations" % len(valid_plls))
 
 
-def search_header_for_hsx_values(filename, vals):
-    regex_inc = re.compile(r'#include "(boards/[A-Za-z0-9_./]+)"')
-    regex_def = re.compile(r"#define +(HSE_VALUE|HSI_VALUE) +\((\(uint32_t\))?([0-9]+)\)")
+def search_header_for_hsx_values(filename):
+    hse = hsi = None
+    regex_def = re.compile(
+        r"static.* +(micropy_hw_hs[ei]_value) = +\(*(\(uint32_t\))?([0-9 +-/\*]+)\)*;",
+    )
     with open(filename) as f:
         for line in f:
             line = line.strip()
-            m = regex_inc.match(line)
-            if m:
-                # Search included file
-                search_header_for_hsx_values(m.group(1), vals)
-                continue
             m = regex_def.match(line)
             if m:
                 # Found HSE_VALUE or HSI_VALUE
-                val = int(m.group(3)) // 1000000
-                if m.group(1) == "HSE_VALUE":
-                    vals[0] = val
+                found = m.group(3)
+                if "*" in found or "/" in found:
+                    found = eval(found)
+                val = int(found) // 1000000
+                if m.group(1) == "micropy_hw_hse_value":
+                    hse = val
                 else:
-                    vals[1] = val
-    return vals
+                    hsi = val
+    return hse, hsi
 
 
 def main():
@@ -280,9 +280,9 @@ def main():
 
     if argv[0].startswith("file:"):
         # extract HSE_VALUE, and optionally HSI_VALUE, from header file
-        hse, hsi = search_header_for_hsx_values(argv[0][5:], [None, None])
+        hse, hsi = search_header_for_hsx_values(argv[0][5:])
         if hse is None:
-            raise ValueError("%s does not contain a definition of HSE_VALUE" % argv[0])
+            raise ValueError("%s does not contain a definition of micropy_hw_hse_value" % argv[0])
     else:
         # HSE given directly as an integer
         hse = int(argv[0])
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index a2a0a8291008c..d7d4dc14b988b 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -33,7 +33,9 @@
 #include "py/mphal.h"
 #include "pin.h"
 #include "dma.h"
+#ifndef NO_QSTR
 #include "genhdr/plli2stable.h"
+#endif
 
 // Notes on this port's specific implementation of I2S:
 // - the DMA callbacks (1/2 complete and complete) are used to implement the asynchronous background operations
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 9d3f374f93757..eea009e2d782b 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -28,8 +28,23 @@
 #include "py/mphal.h"
 #include "powerctrl.h"
 #include "rtc.h"
-#include "genhdr/pllfreqtable.h"
 #include "extmod/modbluetooth.h"
+#include "py/mpconfig.h"
+#ifndef NO_QSTR
+#include "genhdr/pllfreqtable.h"
+#endif
+
+// These will be defined / expanded in pre-processor output for use in the
+// boards/pllvalues.py script, then generally stripped from final firmware.
+#ifdef HSI_VALUE
+static uint32_t __attribute__((unused)) micropy_hw_hsi_value = HSI_VALUE;
+#endif
+#ifdef HSE_VALUE
+static uint32_t __attribute__((unused)) micropy_hw_hse_value = HSE_VALUE;
+#endif
+#ifdef MICROPY_HW_CLK_PLLM
+static uint32_t __attribute__((unused)) micropy_hw_clk_pllm = MICROPY_HW_CLK_PLLM;
+#endif
 
 #if defined(STM32H5) || defined(STM32H7)
 #define RCC_SR          RSR

From 3c1722e705002b2182f138a114f4408ae7ebac38 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 Dec 2024 00:55:31 +1100
Subject: [PATCH 1719/3129] stm32: Fix extraction of hse/hsi/pllm values from
 preprocessed source.

The expressions for the `micropy_hw_hse_value` etc variables may contain
parenthesis, eg `micropy_hw_hse_value = ((25) * 1000000)`.  To handle such
a case, simplify the regex and always use `eval(found)` to evaluate the
expression.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/plli2svalues.py | 11 ++++-------
 ports/stm32/boards/pllvalues.py    |  8 +++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/boards/plli2svalues.py b/ports/stm32/boards/plli2svalues.py
index 436dcee7444a7..e5ea4e8dfd49b 100644
--- a/ports/stm32/boards/plli2svalues.py
+++ b/ports/stm32/boards/plli2svalues.py
@@ -132,12 +132,9 @@ def search_header(filename, re_define, lookup):
             m = regex_define.match(line)
             if m:
                 # found lookup value
-                found = m.group(3)
-                if "*" in found or "/" in found:
-                    # process define using multiply or divide to calculate value
-                    found = eval(found)
+                found = m.group(2)
                 if m.group(1) == lookup:
-                    val = int(found)
+                    val = eval(found)
     return val
 
 
@@ -179,7 +176,7 @@ def main():
             # extract hse value from processed header files
             hse = search_header(
                 argv[0][len("file:") :],
-                r"static.* (micropy_hw_hse_value) = +\(*(\(uint32_t\))?([0-9 +-/\*]+)\)*;",
+                r"static.* (micropy_hw_hse_value) = +([0-9 +-/\*()]+);",
                 "micropy_hw_hse_value",
             )
             if hse is None:
@@ -190,7 +187,7 @@ def main():
             # extract pllm value from processed header files
             pllm = search_header(
                 argv[0][len("file:") :],
-                r"static.* (micropy_hw_clk_pllm) = +\(*(\(uint32_t\))?([0-9 +-/\*]+)\)*;",
+                r"static.* (micropy_hw_clk_pllm) = +([0-9 +-/\*()]+);",
                 "micropy_hw_clk_pllm",
             )
             if pllm is None:
diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 5edc1d51fd6bc..d8856bfecdbd4 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -231,7 +231,7 @@ def print_table(hse, valid_plls):
 def search_header_for_hsx_values(filename):
     hse = hsi = None
     regex_def = re.compile(
-        r"static.* +(micropy_hw_hs[ei]_value) = +\(*(\(uint32_t\))?([0-9 +-/\*]+)\)*;",
+        r"static.* +(micropy_hw_hs[ei]_value) = +([0-9 +-/\*()]+);",
     )
     with open(filename) as f:
         for line in f:
@@ -239,10 +239,8 @@ def search_header_for_hsx_values(filename):
             m = regex_def.match(line)
             if m:
                 # Found HSE_VALUE or HSI_VALUE
-                found = m.group(3)
-                if "*" in found or "/" in found:
-                    found = eval(found)
-                val = int(found) // 1000000
+                found = m.group(2)
+                val = eval(found) // 1000000
                 if m.group(1) == "micropy_hw_hse_value":
                     hse = val
                 else:

From e323da729101c9fe626b5b08cafef2dbdbb70441 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 Dec 2024 15:15:59 +1100
Subject: [PATCH 1720/3129] tests/run-tests.py: Set name of injected test
 module to '__main__'.

Running unittest-based tests with --via-mpy is currently broken, because
the unittest test needs the module to be named `__main__`, whereas it's
actually called `__injected_test`.

Fix this by changing the name when the file is opened.

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 6fe45707bb6cd..c72178cd760c2 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -59,10 +59,13 @@ def base_path(*p):
 os.environ["PYTHONIOENCODING"] = "utf-8"
 
 # Code to allow a target MicroPython to import an .mpy from RAM
+# Note: the module is named `__injected_test` but it needs to have `__name__` set to
+# `__main__` so that the test sees itself as the main module, eg so unittest works.
 injected_import_hook_code = """\
 import sys, os, io, vfs
 class __File(io.IOBase):
   def __init__(self):
+    sys.modules['__injected_test'].__name__ = '__main__'
     self.off = 0
   def ioctl(self, request, arg):
     return 0

From b5de529ffc17dd02e24c3f2b14e230eefe42dc7a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 28 Jan 2023 10:12:49 +0100
Subject: [PATCH 1721/3129] docs: Fix the quickref documentation of
 rtc.datetime().

Such that it matches the implementation and the documentation of the
`machine.RTC` class.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/esp32/quickref.rst      | 4 +++-
 docs/esp8266/quickref.rst    | 4 +++-
 docs/mimxrt/quickref.rst     | 4 +++-
 docs/pyboard/quickref.rst    | 4 +++-
 docs/renesas-ra/quickref.rst | 5 +++--
 docs/rp2/quickref.rst        | 3 ++-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 5cce96d687875..c5c2dfb38e570 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -577,7 +577,9 @@ 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, 0, 1, 12, 48, 0)) # set a specific date and
+                                                 # time, eg. 2017/8/23 1:12:48
+                                                 # the day-of-week value is ignored
     rtc.datetime() # get date and time
 
 WDT (Watchdog timer)
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 635f1f834bb60..e17b60f676105 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -284,7 +284,9 @@ 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, 0, 1, 12, 48, 0)) # set a specific date and
+                                                 # time, eg. 2017/8/23 1:12:48
+                                                 # the day-of-week value is ignored
     rtc.datetime() # get date and time
 
     # synchronize with ntp
diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index 34e0aa79f139f..49d7befc7452b 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -429,7 +429,9 @@ 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, 0, 1, 12, 48, 0)) # set a specific date and
+                                                 # time, eg. 2017/8/23 1:12:48
+                                                 # the day-of-week value is ignored
     rtc.datetime() # get date and time
     rtc.now() # return date and time in CPython format.
 
diff --git a/docs/pyboard/quickref.rst b/docs/pyboard/quickref.rst
index 62157bff0a472..52ddc29b19340 100644
--- a/docs/pyboard/quickref.rst
+++ b/docs/pyboard/quickref.rst
@@ -138,7 +138,9 @@ See :ref:`pyb.RTC <pyb.RTC>` ::
     from pyb 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, 0, 1, 12, 48, 0)) # set a specific date and
+                                                 # time, eg. 2017/8/23 1:12:48
+                                                 # the day-of-week value is ignored
     rtc.datetime() # get date and time
 
 PWM (pulse width modulation)
diff --git a/docs/renesas-ra/quickref.rst b/docs/renesas-ra/quickref.rst
index ea9a38db15fcb..b5283707fc8f0 100644
--- a/docs/renesas-ra/quickref.rst
+++ b/docs/renesas-ra/quickref.rst
@@ -206,8 +206,9 @@ 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((2017, 8, 23, 0, 1, 12, 48, 0)) # set a specific date and
+                                                 # time, eg. 2017/8/23 1:12:48
+                                                 # the day-of-week value is ignored
     rtc.datetime() # get date and time
 
 Following functions are not supported at the present::
diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 9b82ea5dc6749..6be3180500746 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -310,8 +310,9 @@ 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
+    rtc.datetime((2017, 8, 23, 0, 1, 12, 48, 0)) # set a specific date and
                                                  # time, eg. 2017/8/23 1:12:48
+                                                 # the day-of-week value is ignored
     rtc.datetime() # get date and time
 
 WDT (Watchdog timer)

From 0302cd65e85cb255670cf6eb32d9e6cee241128c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 28 Jan 2023 14:57:22 +0100
Subject: [PATCH 1722/3129] mimxrt/machine_rtc: Drop machine.RTC.now() method.

This is not part of the common machine API.  It's dropped on the mimxrt
port and kept only on the cc3200 port for legacy.

Also show the port availability of `RTC.now()` in the documentation.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/library/machine.RTC.rst |  2 ++
 ports/mimxrt/machine_rtc.c   | 20 --------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index a457189037b51..ed93c5fff85f1 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -48,6 +48,8 @@ Methods
 
    Get get the current datetime tuple.
 
+   Availability: WiPy.
+
 .. method:: RTC.deinit()
 
    Resets the RTC to the time of January 1, 2015 and starts running it again.
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 0d6fc54c8b67c..91769ea33416b 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -230,25 +230,6 @@ 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) {
-    // 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(0),
-        mp_const_none,
-    };
-    return mp_obj_new_tuple(8, tuple);
-}
-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);
@@ -389,7 +370,6 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_irq_obj, 1, machine_rtc_irq);
 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_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
     { MP_ROM_QSTR(MP_QSTR_alarm), MP_ROM_PTR(&machine_rtc_alarm_obj) },
     { MP_ROM_QSTR(MP_QSTR_alarm_left), MP_ROM_PTR(&machine_rtc_alarm_left_obj) },

From f4e45995232ad52aeb4da270e6ca7571695e339b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 28 Jan 2023 15:19:37 +0100
Subject: [PATCH 1723/3129] ports: Fix machine.RTC.init() method so argument
 order matches the docs.

This commit makes the argument ordering of `machine.RTC.init()` the same
for all the ports that implement arguments to this method: cc3200, esp32,
mimxrt and samd.  The cc3200 argument ordering is used, which matches the
documentation.

Also document the availability and the differing semantics for the stm32
and renesas-ra port.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/library/machine.RTC.rst |  9 ++++++++-
 ports/esp32/machine_rtc.c    | 15 +++++++++++----
 ports/mimxrt/machine_rtc.c   | 12 ++++++------
 ports/samd/machine_rtc.c     | 12 ++++++------
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index ed93c5fff85f1..e2ddd728bde4c 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -42,7 +42,14 @@ Methods
 
    Initialise the RTC. Datetime is a tuple of the form:
 
-      ``(year, month, day[, hour[, minute[, second[, microsecond[, tzinfo]]]]])``
+      ``(year, month, day, hour, minute, second, microsecond, tzinfo)``
+
+   All eight arguments must be present. The ``microsecond`` and ``tzinfo``
+   values are currently ignored but might be used in the future.
+
+   Availability: CC3200, ESP32, MIMXRT, SAMD. The rtc.init() method on
+   the stm32 and renesas-ra ports just (re-)starts the RTC and does not
+   accept arguments.
 
 .. method:: RTC.now()
 
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 087ba9d69efe7..a2f4bb132d4ea 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -101,7 +101,7 @@ static mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     return (mp_obj_t)&machine_rtc_obj;
 }
 
-static mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *args, int hour_index) {
     if (n_args == 1) {
         // Get time
 
@@ -131,7 +131,14 @@ 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_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_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[hour_index]),
+            mp_obj_get_int(items[hour_index + 1]),
+            mp_obj_get_int(items[hour_index + 2])
+            );
         tv.tv_usec = mp_obj_get_int(items[7]);
         settimeofday(&tv, NULL);
 
@@ -139,13 +146,13 @@ static mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *ar
     }
 }
 static mp_obj_t machine_rtc_datetime(size_t n_args, const mp_obj_t *args) {
-    return machine_rtc_datetime_helper(n_args, args);
+    return machine_rtc_datetime_helper(n_args, args, 4);
 }
 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);
+    machine_rtc_datetime_helper(2, args, 3);
 
     return mp_const_none;
 }
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 91769ea33416b..5feeb0da096ae 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -185,7 +185,7 @@ static mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     return (mp_obj_t)&machine_rtc_obj;
 }
 
-static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args, int hour_index) {
     if (n_args == 1) {
         // Get date and time.
         snvs_lp_srtc_datetime_t srtc_date;
@@ -214,9 +214,9 @@ static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
         srtc_date.month = mp_obj_get_int(items[1]);
         srtc_date.day = mp_obj_get_int(items[2]);
         // 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]);
+        srtc_date.hour = mp_obj_get_int(items[hour_index]);
+        srtc_date.minute = mp_obj_get_int(items[hour_index + 1]);
+        srtc_date.second = mp_obj_get_int(items[hour_index + 2]);
         if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
             mp_raise_ValueError(NULL);
         }
@@ -226,13 +226,13 @@ static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
 }
 
 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);
+    return machine_rtc_datetime_helper(n_args, args, 4);
 }
 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);
+    machine_rtc_datetime_helper(2, args, 3);
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);
diff --git a/ports/samd/machine_rtc.c b/ports/samd/machine_rtc.c
index a906f9176f9fe..74c2266d60926 100644
--- a/ports/samd/machine_rtc.c
+++ b/ports/samd/machine_rtc.c
@@ -93,7 +93,7 @@ static mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
     return (mp_obj_t)&machine_rtc_obj;
 }
 
-static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args, int hour_index) {
     // Rtc *rtc = RTC;
     if (n_args == 1) {
         // Get date and time.
@@ -120,9 +120,9 @@ static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
             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_HOUR(mp_obj_get_int(items[hour_index])) |
+            RTC_MODE2_CLOCK_MINUTE(mp_obj_get_int(items[hour_index + 1])) |
+            RTC_MODE2_CLOCK_SECOND(mp_obj_get_int(items[hour_index + 2]));
 
         RTC->MODE2.CLOCK.reg = date;
         #if defined(MCU_SAMD21)
@@ -138,13 +138,13 @@ static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
 }
 
 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);
+    return machine_rtc_datetime_helper(n_args, args, 4);
 }
 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);
+    machine_rtc_datetime_helper(2, args, 3);
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);

From 32b98d3e66c46b83dc0030e1fa679923557748bd Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Mon, 21 Oct 2024 15:32:06 +0100
Subject: [PATCH 1724/3129] lib/pico-sdk: Update to version 2.1.0.

Brings in support for Pico 2 W, among other things.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index efe2103f9b284..95ea6acad1311 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit efe2103f9b28458a1615ff096054479743ade236
+Subproject commit 95ea6acad131124694cda1c162c52cd30e0aece0

From a93762a7623c235d24a3fe806774078c50067555 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Tue, 1 Oct 2024 15:35:43 +0100
Subject: [PATCH 1725/3129] rp2/modmachine: Fix USB sleep on RP2350 MCUs.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/modmachine.c            | 2 +-
 tests/ports/rp2/rp2_lightsleep.py | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index cd73552dd9874..3229aed277b35 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -228,7 +228,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
             #if PICO_RP2040
             clocks_hw->sleep_en1 |= CLOCKS_SLEEP_EN1_CLK_USB_USBCTRL_BITS;
             #elif PICO_RP2350
-            clocks_hw->sleep_en1 |= CLOCKS_SLEEP_EN1_CLK_SYS_USBCTRL_BITS;
+            clocks_hw->sleep_en1 |= CLOCKS_SLEEP_EN1_CLK_USB_BITS;
             #else
             #error Unknown processor
             #endif
diff --git a/tests/ports/rp2/rp2_lightsleep.py b/tests/ports/rp2/rp2_lightsleep.py
index 5ce5696e0e18c..63f31940ad054 100644
--- a/tests/ports/rp2/rp2_lightsleep.py
+++ b/tests/ports/rp2/rp2_lightsleep.py
@@ -16,12 +16,6 @@
 except ImportError:
     print("SKIP")
     raise SystemExit
-
-# RP2350 currently fails this test, needs further investigation.
-if "RP2350" in sys.implementation._machine:
-    print("SKIP")
-    raise SystemExit
-
 try:
     led = Pin(Pin.board.LED, Pin.OUT)
 except AttributeError:

From 929d7a75265e7f5ed898560b065fd33af5a18264 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Wed, 25 Sep 2024 09:58:07 +0100
Subject: [PATCH 1726/3129] rp2/CMakeLists.txt: Add components required by
 bootrom.h.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 4baaf7debf6c5..4c85b83440ebe 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -196,6 +196,7 @@ set(MICROPY_SOURCE_QSTR
 )
 
 set(PICO_SDK_COMPONENTS
+    boot_bootrom_headers
     hardware_adc
     hardware_base
     hardware_boot_lock
@@ -222,6 +223,7 @@ set(PICO_SDK_COMPONENTS
     pico_base_headers
     pico_binary_info
     pico_bootrom
+    pico_flash
     pico_multicore
     pico_platform
     pico_platform_compiler

From 30163e0ae483a3c04e57f8346e903a6bc2e0e2cd Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 23 Oct 2024 16:41:54 +0100
Subject: [PATCH 1727/3129] rp2/cyw43_configport: Define cyw43 pins.

The cyw43 pins used to be hardcoded and `CYW43_PIN_WL_HOST_WAKE` and
`CYW43_PIN_WL_REG_ON` were in the `pico_w.h` board header.

This has been changed so the board header just defines the "default
version of the pins, e.g. `CYW43_DEFAULT_PIN_WL_HOST_WAKE`,
`CYW43_DEFAULT_PIN_WL_REG_ON` etc.

Set the pin values in `cyw43_configport.`h so `cyw43-driver` sees them and
allow them to be changed at runtime (dynamic) if required.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/cyw43_configport.h | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 4b012ce17e994..4294691c66657 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -53,6 +53,41 @@
 
 #define CYW43_HOST_NAME                 mod_network_hostname_data
 
+#if CYW43_PIN_WL_DYNAMIC
+
+// Dynamic pins can be changed at runtime before initialising the CYW43
+
+typedef enum cyw43_pin_index_t {
+    CYW43_PIN_INDEX_WL_REG_ON,
+    CYW43_PIN_INDEX_WL_DATA_OUT,
+    CYW43_PIN_INDEX_WL_DATA_IN,
+    CYW43_PIN_INDEX_WL_HOST_WAKE,
+    CYW43_PIN_INDEX_WL_CLOCK,
+    CYW43_PIN_INDEX_WL_CS,
+    CYW43_PIN_INDEX_WL_COUNT // last
+} cyw43_pin_index_t;
+
+// Function to retrieve a cyw43 dynamic pin
+uint cyw43_get_pin_wl(cyw43_pin_index_t pin_id);
+
+#define CYW43_PIN_WL_REG_ON cyw43_get_pin_wl(CYW43_PIN_INDEX_WL_REG_ON)
+#define CYW43_PIN_WL_DATA_OUT cyw43_get_pin_wl(CYW43_PIN_INDEX_WL_DATA_OUT)
+#define CYW43_PIN_WL_DATA_IN cyw43_get_pin_wl(CYW43_PIN_INDEX_WL_DATA_IN)
+#define CYW43_PIN_WL_HOST_WAKE cyw43_get_pin_wl(CYW43_PIN_INDEX_WL_HOST_WAKE)
+#define CYW43_PIN_WL_CLOCK cyw43_get_pin_wl(CYW43_PIN_INDEX_WL_CLOCK)
+#define CYW43_PIN_WL_CS cyw43_get_pin_wl(CYW43_PIN_INDEX_WL_CS)
+
+#else
+
+#define CYW43_PIN_WL_REG_ON             CYW43_DEFAULT_PIN_WL_REG_ON
+#define CYW43_PIN_WL_DATA_OUT           CYW43_DEFAULT_PIN_WL_DATA_OUT
+#define CYW43_PIN_WL_DATA_IN            CYW43_DEFAULT_PIN_WL_DATA_IN
+#define CYW43_PIN_WL_HOST_WAKE          CYW43_DEFAULT_PIN_WL_HOST_WAKE
+#define CYW43_PIN_WL_CLOCK              CYW43_DEFAULT_PIN_WL_CLOCK
+#define CYW43_PIN_WL_CS                 CYW43_DEFAULT_PIN_WL_CS
+
+#endif
+
 #define CYW43_SDPCM_SEND_COMMON_WAIT \
     if (get_core_num() == 0) { \
         cyw43_yield(); \

From 4a6c2460083607ba05ab8af13a31889767c2ce98 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 9 Oct 2024 18:03:55 +0100
Subject: [PATCH 1728/3129] rp2/mphalport: Add mp_hal_is_pin_reserved()
 function.

As cyw43 pins might be dynamic, add a function that returns if a pin is
reserved.  This is used by `MICROPY_HW_PIN_RESERVED` to prevent the pin IRQ
from being reset across a soft-reset.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/boards/RPI_PICO_W/mpconfigboard.h | 4 +++-
 ports/rp2/mphalport.c                       | 8 ++++++++
 ports/rp2/mphalport.h                       | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
index ef812b6301356..45ad6107ba14e 100644
--- a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
+++ b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.h
@@ -20,4 +20,6 @@
 
 #define MICROPY_HW_PIN_EXT_COUNT    CYW43_WL_GPIO_COUNT
 
-#define MICROPY_HW_PIN_RESERVED(i) ((i) == CYW43_PIN_WL_HOST_WAKE || (i) == CYW43_PIN_WL_REG_ON)
+// If this returns true for a pin then its irq will not be disabled on a soft reboot
+int mp_hal_is_pin_reserved(int n);
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 3f50151620a02..caecb695099d5 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -278,3 +278,11 @@ void mp_wfe_or_timeout(uint32_t timeout_ms) {
     // Clean up the timer node if it's not already
     soft_timer_remove(&timer);
 }
+
+int mp_hal_is_pin_reserved(int n) {
+    #if MICROPY_PY_NETWORK_CYW43
+    return n == CYW43_PIN_WL_HOST_WAKE;
+    #else
+    return false;
+    #endif
+}
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index da865fb7e85ea..33a1073e1df81 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -210,5 +210,6 @@ 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]);
+int mp_hal_is_pin_reserved(int n);
 
 #endif // MICROPY_INCLUDED_RP2_MPHALPORT_H

From 1b611dab039c063165fe58c476c2ab9e97804010 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 9 Oct 2024 18:05:11 +0100
Subject: [PATCH 1729/3129] rp2/boards/RPI_PICO2_W: Add new Pico 2 W board
 definition.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/boards/RPI_PICO2_W/board.json       | 21 +++++++++++++
 ports/rp2/boards/RPI_PICO2_W/manifest.py      |  6 ++++
 .../boards/RPI_PICO2_W/mpconfigboard.cmake    | 17 +++++++++++
 ports/rp2/boards/RPI_PICO2_W/mpconfigboard.h  | 22 ++++++++++++++
 .../boards/RPI_PICO2_W/mpconfigvariant.cmake  |  1 +
 ports/rp2/boards/RPI_PICO2_W/pins.csv         | 30 +++++++++++++++++++
 6 files changed, 97 insertions(+)
 create mode 100644 ports/rp2/boards/RPI_PICO2_W/board.json
 create mode 100644 ports/rp2/boards/RPI_PICO2_W/manifest.py
 create mode 100644 ports/rp2/boards/RPI_PICO2_W/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/RPI_PICO2_W/mpconfigboard.h
 create mode 100644 ports/rp2/boards/RPI_PICO2_W/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/RPI_PICO2_W/pins.csv

diff --git a/ports/rp2/boards/RPI_PICO2_W/board.json b/ports/rp2/boards/RPI_PICO2_W/board.json
new file mode 100644
index 0000000000000..f35ea940a2663
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2_W/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "USB",
+        "WiFi"
+    ],
+    "images": [
+        "rp2-pico2-w.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "Pico 2 W",
+    "thumbnail": "",
+    "url": "https://www.raspberrypi.com/products/raspberry-pi-pico-2/",
+    "vendor": "Raspberry Pi"
+}
diff --git a/ports/rp2/boards/RPI_PICO2_W/manifest.py b/ports/rp2/boards/RPI_PICO2_W/manifest.py
new file mode 100644
index 0000000000000..4e38f09cdee4f
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2_W/manifest.py
@@ -0,0 +1,6 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
+
+# Bluetooth
+require("aioble")
diff --git a/ports/rp2/boards/RPI_PICO2_W/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO2_W/mpconfigboard.cmake
new file mode 100644
index 0000000000000..1d9b7fc448a0c
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2_W/mpconfigboard.cmake
@@ -0,0 +1,17 @@
+# cmake file for Raspberry Pi Pico 2 W
+
+set(PICO_BOARD "pico2_w")
+
+# To change the gpio count for QFN-80
+# set(PICO_NUM_GPIOS 48)
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/RPI_PICO2_W/mpconfigboard.h b/ports/rp2/boards/RPI_PICO2_W/mpconfigboard.h
new file mode 100644
index 0000000000000..fe688c2803192
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2_W/mpconfigboard.h
@@ -0,0 +1,22 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico 2 W"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - 1536 * 1024)
+
+// Enable networking.
+#define MICROPY_PY_NETWORK 1
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "Pico2W"
+
+// 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_EXT_COUNT    CYW43_WL_GPIO_COUNT
+
+int mp_hal_is_pin_reserved(int n);
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
diff --git a/ports/rp2/boards/RPI_PICO2_W/mpconfigvariant.cmake b/ports/rp2/boards/RPI_PICO2_W/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2_W/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/RPI_PICO2_W/pins.csv b/ports/rp2/boards/RPI_PICO2_W/pins.csv
new file mode 100644
index 0000000000000..8debb6326e070
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2_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

From a70a90ccfc6584f51f39a7c6bf43f19695f7da51 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Fri, 22 Nov 2024 17:19:26 +0000
Subject: [PATCH 1730/3129] rp2/boards/RPI_PICO2_W: Add RISCV variant for Pico
 2 W.

Build with:

    make BOARD=RPI_PICO2_W BOARD_VARIANT=RISCV

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/CMakeLists.txt                                 | 1 -
 ports/rp2/boards/RPI_PICO2_W/mpconfigvariant_RISCV.cmake | 1 +
 ports/rp2/mpnetworkport.c                                | 4 ++++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 ports/rp2/boards/RPI_PICO2_W/mpconfigvariant_RISCV.cmake

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 4c85b83440ebe..8a4092529b1f2 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -407,7 +407,6 @@ if (MICROPY_PY_NETWORK_CYW43)
 
     target_link_libraries(${MICROPY_TARGET}
         cyw43_driver_picow
-        cmsis_core
     )
     target_include_directories(${MICROPY_TARGET} PRIVATE
         ${MICROPY_DIR}/lib/cyw43-driver/
diff --git a/ports/rp2/boards/RPI_PICO2_W/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/RPI_PICO2_W/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/RPI_PICO2_W/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index fcc60b3fe5796..af2cabb3bff0f 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -44,6 +44,7 @@ static soft_timer_entry_t mp_network_soft_timer;
 #include "lib/cyw43-driver/src/cyw43_stats.h"
 #include "hardware/irq.h"
 
+#if !defined(__riscv)
 #if PICO_RP2040
 #include "RP2040.h" // cmsis, for NVIC_SetPriority and PendSV_IRQn
 #elif PICO_RP2350
@@ -51,6 +52,7 @@ static soft_timer_entry_t mp_network_soft_timer;
 #else
 #error Unknown processor
 #endif
+#endif
 
 #define CYW43_IRQ_LEVEL GPIO_IRQ_LEVEL_HIGH
 #define CYW43_SHARED_IRQ_HANDLER_PRIORITY PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY
@@ -74,7 +76,9 @@ static void gpio_irq_handler(void) {
 void cyw43_irq_init(void) {
     gpio_add_raw_irq_handler_with_order_priority(CYW43_PIN_WL_HOST_WAKE, gpio_irq_handler, CYW43_SHARED_IRQ_HANDLER_PRIORITY);
     irq_set_enabled(IO_IRQ_BANK0, true);
+    #if !defined(__riscv)
     NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
+    #endif
 }
 
 void cyw43_post_poll_hook(void) {

From 39538e4c9a54e44ea27bcc374e17774ac2b9796d Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Fri, 15 Nov 2024 13:21:04 -0700
Subject: [PATCH 1731/3129] rp2/boards/SPARKFUN_PROMICRO: Fix SparkFun Pro
 Micro RP2040 image.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 ports/rp2/boards/SPARKFUN_PROMICRO/board.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
index 46878a29cd889..b8c8afc914eac 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
@@ -11,7 +11,7 @@
         "USB-C"
     ],
     "images": [
-        "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
+        "18288-SparkFun_Pro_Micro_-_RP2040-01.jpg"
     ],
     "mcu": "rp2040",
     "product": "Pro Micro RP2040",

From 4e76acc88d8673ce4f43698fbb4c2913e63b0135 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 18 Dec 2024 17:23:45 +1100
Subject: [PATCH 1732/3129] doc: Note that machine.USBDevice is now available
 on esp32 port.

Support was added in commit 5f2d05d, this updates the docs to match.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/machine.USBDevice.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.USBDevice.rst b/docs/library/machine.USBDevice.rst
index 5c18c49a75bb5..5291679ac1258 100644
--- a/docs/library/machine.USBDevice.rst
+++ b/docs/library/machine.USBDevice.rst
@@ -4,8 +4,9 @@
 class USBDevice -- USB Device driver
 ====================================
 
-.. note:: ``machine.USBDevice`` is currently only supported on the rp2 and samd
-          ports.
+.. note:: ``machine.USBDevice`` is currently only supported for esp32, rp2 and
+          samd ports. Native USB support is also required, and not every board
+          supports native USB.
 
 USBDevice provides a low-level Python API for implementing USB device functions using
 Python code.

From a3128f89ccb1d24d0ddaec7164d2fa8a101b8ac3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Nov 2024 13:52:04 +1100
Subject: [PATCH 1733/3129] tests: Fix all file ioctl's to support only
 MP_STREAM_CLOSE.

A return value of 0 from Python-level `ioctl()` means success, but if
that's returned unconditionally it means that the method supports all
ioctl calls, which is not true.  Returning 0 without doing anything can
potentially lead to a crash, eg for MP_STREAM_SEEK which requires returning
a value in the passed-in struct pointer.

This commit makes it so that all `ioctl()` methods respond only to
MP_STREAM_CLOSE, ie they return -1 (indicating error) for all other ioctl
calls.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/builtin_execfile.py      | 4 +++-
 tests/micropython/import_mpy_invalid.py    | 4 +++-
 tests/micropython/import_mpy_native.py     | 4 +++-
 tests/micropython/import_mpy_native_gc.py  | 4 +++-
 tests/perf_bench/core_import_mpy_multi.py  | 4 +++-
 tests/perf_bench/core_import_mpy_single.py | 4 +++-
 tests/run-natmodtests.py                   | 4 +++-
 tests/run-tests.py                         | 4 +++-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/tests/micropython/builtin_execfile.py b/tests/micropython/builtin_execfile.py
index a905521c662d3..75a867bb94023 100644
--- a/tests/micropython/builtin_execfile.py
+++ b/tests/micropython/builtin_execfile.py
@@ -16,7 +16,9 @@ def __init__(self, data):
         self.off = 0
 
     def ioctl(self, request, arg):
-        return 0
+        if request == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
 
     def readinto(self, buf):
         buf[:] = memoryview(self.data)[self.off : self.off + len(buf)]
diff --git a/tests/micropython/import_mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
index 89fdf44839bb1..f928d45c79150 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -22,7 +22,9 @@ def readinto(self, buf):
         return n
 
     def ioctl(self, req, arg):
-        return 0
+        if req == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
 
 
 class UserFS:
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index 8f5de25a0b2c1..ac5e724e8d468 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -28,7 +28,9 @@ def readinto(self, buf):
         return n
 
     def ioctl(self, req, arg):
-        return 0
+        if req == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
 
 
 class UserFS:
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index bdeb612b4928e..851eb3922953b 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -22,7 +22,9 @@ def readinto(self, buf):
         return n
 
     def ioctl(self, req, arg):
-        return 0
+        if req == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
 
 
 class UserFS:
diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index 33437f9da801e..8affa157fa0c5 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -31,7 +31,9 @@ def __init__(self):
         self.off = 0
 
     def ioctl(self, request, arg):
-        return 0
+        if request == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
 
     def readinto(self, buf):
         buf[:] = memoryview(file_data)[self.off : self.off + len(buf)]
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index 18454b8fd5eb2..4d9aa67bf2f0e 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -86,7 +86,9 @@ def __init__(self):
         self.off = 0
 
     def ioctl(self, request, arg):
-        return 0
+        if request == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
 
     def readinto(self, buf):
         buf[:] = memoryview(file_data)[self.off : self.off + len(buf)]
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index f1a2a974690ee..1fe44bec1615a 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -35,7 +35,9 @@ class __File(io.IOBase):
   def __init__(self):
     self.off = 0
   def ioctl(self, request, arg):
-    return 0
+    if request == 4: # MP_STREAM_CLOSE
+      return 0
+    return -1
   def readinto(self, buf):
     buf[:] = memoryview(__buf)[self.off:self.off + len(buf)]
     self.off += len(buf)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index c72178cd760c2..a609a1fcbbebd 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -68,7 +68,9 @@ def __init__(self):
     sys.modules['__injected_test'].__name__ = '__main__'
     self.off = 0
   def ioctl(self, request, arg):
-    return 0
+    if request == 4: # MP_STREAM_CLOSE
+      return 0
+    return -1
   def readinto(self, buf):
     buf[:] = memoryview(__buf)[self.off:self.off + len(buf)]
     self.off += len(buf)

From 8b6bd43eaba005c24d277fa581c945b40213059d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Nov 2024 11:16:04 +1100
Subject: [PATCH 1734/3129] extmod/vfs: Guard mutating fs functions with
 MICROPY_VFS_WRITABLE.

Enabled by default.  Useful for ports that need the VFS but don't have any
writable filesystems.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modos.c | 4 +++-
 extmod/vfs.c   | 4 ++++
 extmod/vfs.h   | 4 ++++
 py/mpconfig.h  | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/extmod/modos.c b/extmod/modos.c
index e7f7fc818cf08..69fdc3fac0a06 100644
--- a/extmod/modos.c
+++ b/extmod/modos.c
@@ -171,13 +171,15 @@ static const mp_rom_map_elem_t os_module_globals_table[] = {
     { 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) },
+    #if MICROPY_VFS_WRITABLE
     { 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_unlink), MP_ROM_PTR(&mp_vfs_remove_obj) }, // unlink aliases to remove
+    #endif
     { 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/extmod/vfs.c b/extmod/vfs.c
index e545c9af93657..b9c5ab0fc3a8c 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -443,6 +443,8 @@ mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj, 0, 1, mp_vfs_listdir);
 
+#if MICROPY_VFS_WRITABLE
+
 mp_obj_t mp_vfs_mkdir(mp_obj_t path_in) {
     mp_obj_t path_out;
     mp_vfs_mount_t *vfs = lookup_path(path_in, &path_out);
@@ -479,6 +481,8 @@ mp_obj_t mp_vfs_rmdir(mp_obj_t path_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj, mp_vfs_rmdir);
 
+#endif // MICROPY_VFS_WRITABLE
+
 mp_obj_t mp_vfs_stat(mp_obj_t path_in) {
     mp_obj_t path_out;
     mp_vfs_mount_t *vfs = lookup_path(path_in, &path_out);
diff --git a/extmod/vfs.h b/extmod/vfs.h
index f577d3e337c87..626e25a351123 100644
--- a/extmod/vfs.h
+++ b/extmod/vfs.h
@@ -95,10 +95,12 @@ mp_obj_t mp_vfs_chdir(mp_obj_t path_in);
 mp_obj_t mp_vfs_getcwd(void);
 mp_obj_t mp_vfs_ilistdir(size_t n_args, const mp_obj_t *args);
 mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args);
+#if MICROPY_VFS_WRITABLE
 mp_obj_t mp_vfs_mkdir(mp_obj_t path_in);
 mp_obj_t mp_vfs_remove(mp_obj_t path_in);
 mp_obj_t mp_vfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in);
 mp_obj_t mp_vfs_rmdir(mp_obj_t path_in);
+#endif
 mp_obj_t mp_vfs_stat(mp_obj_t path_in);
 mp_obj_t mp_vfs_statvfs(mp_obj_t path_in);
 
@@ -111,10 +113,12 @@ MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_chdir_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_ilistdir_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj);
+#if MICROPY_VFS_WRITABLE
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_mkdir_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_remove_obj);
 MP_DECLARE_CONST_FUN_OBJ_2(mp_vfs_rename_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj);
+#endif
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_stat_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj);
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index b31da2a37c050..a330cadc4ef3a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -991,6 +991,11 @@ typedef double mp_float_t;
 #define MICROPY_VFS (0)
 #endif
 
+// Whether to include support for writable filesystems.
+#ifndef MICROPY_VFS_WRITABLE
+#define MICROPY_VFS_WRITABLE (1)
+#endif
+
 // Support for VFS POSIX component, to mount a POSIX filesystem within VFS
 #ifndef MICROPY_VFS_POSIX
 #define MICROPY_VFS_POSIX (0)

From 136058496f05b4b2ab5e63829b301671dc8b9a59 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 17 Dec 2024 20:06:02 +0100
Subject: [PATCH 1735/3129] esp32/machine_timer: Restrict timer numbers for
 ESP32C6 to 0 and 1.

The ESP32C6 has only one timer in each of the two groups.  Also add a check
for valid timer numbers.

Addresses issue #16438.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_timer.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 30e64eb334d37..82b432bbacddd 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -66,7 +66,7 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
     machine_timer_obj_t *self = self_in;
     qstr mode = self->repeat ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
     uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms
-    #if CONFIG_IDF_TARGET_ESP32C3
+    #if SOC_TIMER_GROUP_TIMERS_PER_GROUP == 1
     mp_printf(print, "Timer(%u, mode=%q, period=%lu)", self->group, mode, period);
     #else
     mp_printf(print, "Timer(%u, mode=%q, period=%lu)", (self->group << 1) | self->index, mode, period);
@@ -76,7 +76,7 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
 machine_timer_obj_t *machine_timer_create(mp_uint_t timer) {
 
     machine_timer_obj_t *self = NULL;
-    #if CONFIG_IDF_TARGET_ESP32C3
+    #if SOC_TIMER_GROUP_TIMERS_PER_GROUP == 1
     mp_uint_t group = timer & 1;
     mp_uint_t index = 0;
     #else
@@ -108,7 +108,11 @@ static mp_obj_t machine_timer_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);
 
     // Create the new timer.
-    machine_timer_obj_t *self = machine_timer_create(mp_obj_get_int(args[0]));
+    uint32_t timer_number = mp_obj_get_int(args[0]);
+    if (timer_number >= SOC_TIMER_GROUP_TOTAL_TIMERS) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid Timer number"));
+    }
+    machine_timer_obj_t *self = machine_timer_create(timer_number);
 
     if (n_args > 1 || n_kw > 0) {
         mp_map_t kw_args;

From 6760e00817ff6cb449134418411850fc577d0f9c Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 23 Jun 2024 08:18:04 +0200
Subject: [PATCH 1736/3129] tools/mpy_ld.py: Add native modules support for
 RV32 code.

This commit adds support for RV32IMC native modules, as in embedding native
code into a self-contained MPY module and and make its exported functions
available to the MicroPython environment.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/develop/natmod.rst            |   5 +-
 examples/natmod/README.md          |   2 +-
 examples/natmod/btree/Makefile     |   2 +-
 examples/natmod/deflate/Makefile   |   2 +-
 examples/natmod/features0/Makefile |   3 +-
 examples/natmod/features1/Makefile |   2 +-
 examples/natmod/features3/Makefile |   2 +-
 examples/natmod/features4/Makefile |   2 +-
 examples/natmod/heapq/Makefile     |   2 +-
 examples/natmod/random/Makefile    |   2 +-
 examples/natmod/re/Makefile        |   2 +-
 py/dynruntime.mk                   |  16 ++
 tools/mpy_ld.py                    | 399 ++++++++++++++++++++++++++++-
 13 files changed, 425 insertions(+), 16 deletions(-)

diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index 502ea1c4c6873..ba45e4305c66d 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -39,7 +39,8 @@ options for the ``ARCH`` variable, see below):
 * ``armv7emsp`` (ARM Thumb 2, single precision float, eg Cortex-M4F, Cortex-M7)
 * ``armv7emdp`` (ARM Thumb 2, double precision float, eg Cortex-M7)
 * ``xtensa`` (non-windowed, eg ESP8266)
-* ``xtensawin`` (windowed with window size 8, eg ESP32)
+* ``xtensawin`` (windowed with window size 8, eg ESP32, ESP32S3)
+* ``rv32imc`` (RISC-V 32 bits with compressed instructions, eg ESP32C3, ESP32C6)
 
 When compiling and linking the native .mpy file the architecture must be chosen
 and the corresponding file can only be imported on that architecture.  For more
@@ -172,7 +173,7 @@ The file ``Makefile`` contains:
     # Source files (.c or .py)
     SRC = factorial.c
 
-    # Architecture to build for (x86, x64, armv6m, armv7m, xtensa, xtensawin)
+    # Architecture to build for (x86, x64, armv6m, armv7m, xtensa, xtensawin, rv32imc)
     ARCH = x64
 
     # Include to get the rules for compiling and linking the module
diff --git a/examples/natmod/README.md b/examples/natmod/README.md
index f72d1c049a011..ca6b887d034d4 100644
--- a/examples/natmod/README.md
+++ b/examples/natmod/README.md
@@ -65,7 +65,7 @@ your system package manager or installed from PyPI in a virtual environment
 with `pip`.
 
 Each example provides a Makefile. You should specify the `ARCH` argument to
-make (one of x86, x64, armv6m, armv7m, xtensa, xtensawin):
+make (one of x86, x64, armv6m, armv7m, xtensa, xtensawin, rv32imc):
 
 ```
 $ cd features0
diff --git a/examples/natmod/btree/Makefile b/examples/natmod/btree/Makefile
index b5846f90065ee..ff130d61b3793 100644
--- a/examples/natmod/btree/Makefile
+++ b/examples/natmod/btree/Makefile
@@ -7,7 +7,7 @@ MOD = btree_$(ARCH)
 # Source files (.c or .py)
 SRC = btree_c.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 BTREE_DIR = $(MPY_DIR)/lib/berkeley-db-1.xx
diff --git a/examples/natmod/deflate/Makefile b/examples/natmod/deflate/Makefile
index 86ef29b6324b3..504130d5723b3 100644
--- a/examples/natmod/deflate/Makefile
+++ b/examples/natmod/deflate/Makefile
@@ -7,7 +7,7 @@ MOD = deflate_$(ARCH)
 # Source files (.c or .py)
 SRC = deflate.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 include $(MPY_DIR)/py/dynruntime.mk
diff --git a/examples/natmod/features0/Makefile b/examples/natmod/features0/Makefile
index 57490df90abe7..fb01b8d031aaa 100644
--- a/examples/natmod/features0/Makefile
+++ b/examples/natmod/features0/Makefile
@@ -7,8 +7,9 @@ MOD = features0
 # Source files (.c or .py)
 SRC = features0.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 # Include to get the rules for compiling and linking the module
 include $(MPY_DIR)/py/dynruntime.mk
+
diff --git a/examples/natmod/features1/Makefile b/examples/natmod/features1/Makefile
index 010640daf9746..49040511020eb 100644
--- a/examples/natmod/features1/Makefile
+++ b/examples/natmod/features1/Makefile
@@ -7,7 +7,7 @@ MOD = features1
 # Source files (.c or .py)
 SRC = features1.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 # Include to get the rules for compiling and linking the module
diff --git a/examples/natmod/features3/Makefile b/examples/natmod/features3/Makefile
index 4a5f71b8f255b..3573f41caca82 100644
--- a/examples/natmod/features3/Makefile
+++ b/examples/natmod/features3/Makefile
@@ -7,7 +7,7 @@ MOD = features3
 # Source files (.c or .py)
 SRC = features3.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 # Include to get the rules for compiling and linking the module
diff --git a/examples/natmod/features4/Makefile b/examples/natmod/features4/Makefile
index f76a31a7cc141..34fc3a7ef7bf4 100644
--- a/examples/natmod/features4/Makefile
+++ b/examples/natmod/features4/Makefile
@@ -7,7 +7,7 @@ MOD = features4
 # Source files (.c or .py)
 SRC = features4.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 # Include to get the rules for compiling and linking the module
diff --git a/examples/natmod/heapq/Makefile b/examples/natmod/heapq/Makefile
index af45b472da1ae..61e2fc8fcc0e0 100644
--- a/examples/natmod/heapq/Makefile
+++ b/examples/natmod/heapq/Makefile
@@ -7,7 +7,7 @@ MOD = heapq_$(ARCH)
 # Source files (.c or .py)
 SRC = heapq.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 include $(MPY_DIR)/py/dynruntime.mk
diff --git a/examples/natmod/random/Makefile b/examples/natmod/random/Makefile
index 5c50227b15f9d..8abdb66dc8724 100644
--- a/examples/natmod/random/Makefile
+++ b/examples/natmod/random/Makefile
@@ -7,7 +7,7 @@ MOD = random_$(ARCH)
 # Source files (.c or .py)
 SRC = random.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 include $(MPY_DIR)/py/dynruntime.mk
diff --git a/examples/natmod/re/Makefile b/examples/natmod/re/Makefile
index 1ba540110650d..56b08b9886878 100644
--- a/examples/natmod/re/Makefile
+++ b/examples/natmod/re/Makefile
@@ -7,7 +7,7 @@ MOD = re_$(ARCH)
 # Source files (.c or .py)
 SRC = re.c
 
-# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
 include $(MPY_DIR)/py/dynruntime.mk
diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 62db43ad149ca..71679954eab01 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -99,6 +99,22 @@ CROSS = xtensa-esp32-elf-
 CFLAGS +=
 MICROPY_FLOAT_IMPL ?= float
 
+else ifeq ($(ARCH),rv32imc)
+
+# rv32imc
+CROSS = riscv64-unknown-elf-
+CFLAGS += -march=rv32imac -mabi=ilp32 -mno-relax
+# If Picolibc is available then select it explicitly.  Ubuntu 22.04 ships its
+# bare metal RISC-V toolchain with Picolibc rather than Newlib, and the default
+# is "nosys" so a value must be provided.  To avoid having per-distro
+# workarounds, always select Picolibc if available.
+PICOLIBC_SPECS = $(shell $(CROSS)gcc --print-file-name=picolibc.specs)
+ifneq ($(PICOLIBC_SPECS),picolibc.specs)
+CFLAGS += --specs=$(PICOLIBC_SPECS)
+endif
+
+MICROPY_FLOAT_IMPL ?= none
+
 else
 $(error architecture '$(ARCH)' not supported)
 endif
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index c77c46d44e0e6..54295208f1a29 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -47,6 +47,7 @@
 MP_NATIVE_ARCH_ARMV7EMDP = 8
 MP_NATIVE_ARCH_XTENSA = 9
 MP_NATIVE_ARCH_XTENSAWIN = 10
+MP_NATIVE_ARCH_RV32IMC = 11
 MP_PERSISTENT_OBJ_STR = 5
 MP_SCOPE_FLAG_VIPERRELOC = 0x10
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
@@ -56,6 +57,7 @@
 
 # ELF constants
 R_386_32 = 1
+R_RISCV_32 = 1
 R_X86_64_64 = 1
 R_XTENSA_32 = 1
 R_386_PC32 = 2
@@ -70,15 +72,57 @@
 R_386_GOTPC = 10
 R_ARM_THM_CALL = 10
 R_XTENSA_ASM_EXPAND = 11
+R_RISCV_BRANCH = 16
+R_RISCV_JAL = 17
+R_RISCV_CALL = 18
+R_RISCV_CALL_PLT = 19
 R_XTENSA_DIFF32 = 19
 R_XTENSA_SLOT0_OP = 20
+R_RISCV_GOT_HI20 = 20
+R_RISCV_TLS_GD_HI20 = 22
+R_RISCV_PCREL_HI20 = 23
+R_RISCV_PCREL_LO12_I = 24
+R_RISCV_PCREL_LO12_S = 25
 R_ARM_BASE_PREL = 25  # aka R_ARM_GOTPC
 R_ARM_GOT_BREL = 26  # aka R_ARM_GOT32
 R_ARM_THM_JUMP24 = 30
+R_RISCV_HI20 = 26
+R_RISCV_LO12_I = 27
+R_RISCV_LO12_S = 28
+R_RISCV_TPREL_HI20 = 29
+R_RISCV_TPREL_LO12_I = 30
+R_RISCV_TPREL_LO12_S = 31
+R_RISCV_TPREL_ADD = 32
+R_RISCV_ADD8 = 33
+R_RISCV_ADD16 = 34
+R_RISCV_ADD32 = 35
+R_RISCV_ADD64 = 36
+R_RISCV_SUB8 = 37
+R_RISCV_SUB16 = 38
+R_RISCV_SUB32 = 39
+R_RISCV_SUB64 = 40
+R_RISCV_GOT32_PCREL = 41
 R_X86_64_GOTPCREL = 9
 R_X86_64_REX_GOTPCRELX = 42
 R_386_GOT32X = 43
+R_RISCV_ALIGN = 43
+R_RISCV_RVC_BRANCH = 44
+R_RISCV_RVC_JUMP = 45
+R_RISCV_RELAX = 51
+R_RISCV_SUB6 = 52
+R_RISCV_SET6 = 53
+R_RISCV_SET8 = 54
+R_RISCV_SET16 = 55
+R_RISCV_SET32 = 56
+R_RISCV_32_PCREL = 57
+R_RISCV_PLT32 = 59
 R_XTENSA_PDIFF32 = 59
+R_RISCV_SET_ULEB128 = 60
+R_RISCV_SUB_ULEB128 = 61
+R_RISCV_TLSDESC_HI20 = 62
+R_RISCC_TLSDESC_LOAD_LO12 = 63
+R_RISCV_TLSDESC_ADD_LO12 = 64
+R_RISCV_TLSDESC_CALL = 65
 
 ################################################################################
 # Architecture configuration
@@ -130,6 +174,18 @@ def asm_jump_xtensa(entry):
     return struct.pack("<BH", jump_op & 0xFF, jump_op >> 8)
 
 
+def asm_jump_rv32(entry):
+    # This could be 6 bytes shorter, but the code currently cannot
+    # support a trampoline with varying length depending on the offset.
+
+    # auipc t6, HI(entry)
+    # jalr  zero, t6, LO(entry)
+    upper, lower = split_riscv_address(entry)
+    return struct.pack(
+        "<II", (upper | 0x00000F97) & 0xFFFFFFFF, ((lower << 20) | 0x000F8067) & 0xFFFFFFFF
+    )
+
+
 class ArchData:
     def __init__(self, name, mpy_feature, word_size, arch_got, asm_jump, *, separate_rodata=False):
         self.name = name
@@ -199,6 +255,13 @@ def __init__(self, name, mpy_feature, word_size, arch_got, asm_jump, *, separate
         asm_jump_xtensa,
         separate_rodata=True,
     ),
+    "rv32imc": ArchData(
+        "EM_RISCV",
+        MP_NATIVE_ARCH_RV32IMC << 2,
+        4,
+        (R_RISCV_32, R_RISCV_GOT_HI20, R_RISCV_GOT32_PCREL),
+        asm_jump_rv32,
+    ),
 }
 
 ################################################################################
@@ -219,6 +282,21 @@ def pack_u24le(data, offset, value):
     data[offset + 2] = value >> 16 & 0xFF
 
 
+def split_riscv_address(value):
+    # The address can be represented with just the lowest 12 bits
+    if value < 0 and value > -2048:
+        value = 4096 + value
+        return 0, value
+    # 2s complement
+    if value < 0:
+        value = 0x100000000 + value
+    upper, lower = (value & 0xFFFFF000), (value & 0xFFF)
+    if lower & 0x800 != 0:
+        # Reverse lower part sign extension
+        upper += 0x1000
+    return upper & 0xFFFFFFFF, lower & 0xFFFFFFFF
+
+
 def xxd(text):
     for i in range(0, len(text), 16):
         print("{:08x}:".format(i), end="")
@@ -346,7 +424,7 @@ def build_got_generic(env):
         for r in sec.reloc:
             s = r.sym
             if not (
-                s.entry["st_info"]["bind"] == "STB_GLOBAL"
+                s.entry["st_info"]["bind"] in ("STB_GLOBAL", "STB_WEAK")
                 and r["r_info_type"] in env.arch.arch_got
             ):
                 continue
@@ -487,6 +565,8 @@ def do_relocation_text(env, text_addr, r):
     # Default relocation type and name for logging
     reloc_type = "le32"
     log_name = None
+    addr = None
+    value = None
 
     if (
         env.arch.name == "EM_386"
@@ -590,12 +670,46 @@ def do_relocation_text(env, text_addr, r):
             return
         assert 0
 
+    elif env.arch.name == "EM_RISCV" and r_info_type in (
+        R_RISCV_TLS_GD_HI20,
+        R_RISCV_TLSDESC_HI20,
+        R_RISCV_TLSDESC_ADD_LO12,
+        R_RISCV_TLSDESC_CALL,
+    ):
+        # TLS relocations are not supported.
+        raise LinkError("{}: RISC-V TLS relocation: {}".format(s.filename, s.name))
+
+    elif env.arch.name == "EM_RISCV" and r_info_type in (
+        R_RISCV_TPREL_HI20,
+        R_RISCV_TPREL_LO12_I,
+        R_RISCV_TPREL_LO12_S,
+        R_RISCV_TPREL_ADD,
+    ):
+        # ThreadPointer-relative relocations are not supported.
+        raise LinkError("{}: RISC-V TP-relative relocation: {}".format(s.filename, s.name))
+
+    elif env.arch.name == "EM_RISCV" and r_info_type in (R_RISCV_SET_ULEB128, R_RISCV_SUB_ULEB128):
+        # 128-bit value relocations are not supported
+        raise LinkError("{}: RISC-V ULEB128 relocation: {}".format(s.filename, s.name))
+
+    elif env.arch.name == "EM_RISCV" and r_info_type in (R_RISCV_RELAX, R_RISCV_ALIGN):
+        # To keep things simple, no relocations are relaxed and thus no
+        # size optimisation is performed even if there is the chance, along
+        # with no offsets to fix up.
+        return
+
+    elif env.arch.name == "EM_RISCV":
+        (addr, value) = process_riscv32_relocation(env, text_addr, r)
+
     else:
         # Unknown/unsupported relocation
         assert 0, r_info_type
 
     # Write relocation
-    if reloc_type == "le32":
+    if env.arch.name == "EM_RISCV":
+        # This case is already handled by `process_riscv_relocation`.
+        pass
+    elif reloc_type == "le32":
         (existing,) = struct.unpack_from("<I", env.full_text, r_offset)
         struct.pack_into("<I", env.full_text, r_offset, (existing + reloc) & 0xFFFFFFFF)
     elif reloc_type == "thumb_b":
@@ -623,7 +737,10 @@ def do_relocation_text(env, text_addr, r):
             log_name = s.section.name
         else:
             log_name = s.name
-    log(LOG_LEVEL_3, "  {:08x} {} -> {:08x}".format(r_offset, log_name, addr))
+    if addr is not None:
+        log(LOG_LEVEL_3, "  {:08x} {} -> {:08x}".format(r_offset, log_name, addr))
+    else:
+        log(LOG_LEVEL_3, "  {:08x} {} == {:08x}".format(r_offset, log_name, value))
 
 
 def do_relocation_data(env, text_addr, r):
@@ -646,12 +763,16 @@ def do_relocation_data(env, text_addr, r):
         and r_info_type == R_ARM_ABS32
         or env.arch.name == "EM_XTENSA"
         and r_info_type == R_XTENSA_32
+        or env.arch.name == "EM_RISCV"
+        and r_info_type == R_RISCV_32
     ):
         # Relocation in data.rel.ro to internal/external symbol
         if env.arch.word_size == 4:
             struct_type = "<I"
         elif env.arch.word_size == 8:
             struct_type = "<Q"
+        if hasattr(s, "resolved"):
+            s = s.resolved
         sec = s.section
         assert r_offset % env.arch.word_size == 0
         addr = sec.addr + s["st_value"] + r_addend
@@ -684,6 +805,276 @@ def do_relocation_data(env, text_addr, r):
         assert 0, r_info_type
 
 
+RISCV_RELOCATIONS_TYPE_MAP = {
+    R_RISCV_ADD8: ("riscv_addsub", "B", 8, 1),
+    R_RISCV_ADD16: ("riscv_addsub", "<H", 16, 1),
+    R_RISCV_ADD32: ("riscv_addsub", "<I", 32, 1),
+    R_RISCV_ADD64: ("riscv_addsub", "<Q", 64, 1),
+    R_RISCV_SUB6: ("riscv_addsub", "B", 6, -1),
+    R_RISCV_SUB8: ("riscv_addsub", "B", 8, -1),
+    R_RISCV_SUB16: ("riscv_addsub", "<H", 16, -1),
+    R_RISCV_SUB32: ("riscv_addsub", "<I", 32, -1),
+    R_RISCV_SUB64: ("riscv_addsub", "<Q", 64, -1),
+    R_RISCV_SET6: ("riscv_set6", "B", 6),
+    R_RISCV_SET8: ("riscv_set8", "B", 8),
+    R_RISCV_SET16: ("riscv_set16", "<H", 16),
+    R_RISCV_SET32: ("riscv_set32", "<I", 32),
+    R_RISCV_JAL: "riscv_j",
+    R_RISCV_BRANCH: "riscv_b",
+    R_RISCV_RVC_BRANCH: "riscv_cb",
+    R_RISCV_RVC_JUMP: "riscv_cj",
+    R_RISCV_CALL: "riscv_call",
+    R_RISCV_CALL_PLT: "riscv_call",
+    R_RISCV_PCREL_LO12_I: "riscv_lo12i",
+    R_RISCV_PCREL_LO12_S: "riscv_lo12s",
+    R_RISCV_LO12_I: "riscv_lo12i",
+    R_RISCV_LO12_S: "riscv_lo12s",
+    R_RISCV_32_PCREL: "riscv_32pcrel",
+    R_RISCV_PLT32: "riscv_32pcrel",
+}
+
+
+def process_riscv32_relocation(env, text_addr, r):
+    assert env.arch.name == "EM_RISCV"
+
+    addr = None
+    value = None
+    s = r.sym
+
+    if hasattr(s, "resolved"):
+        s = s.resolved
+
+    r_offset = r["r_offset"] + text_addr
+    r_info_type = r["r_info_type"]
+    try:
+        r_addend = r["r_addend"]
+    except KeyError:
+        r_addend = 0
+
+    if r_info_type == R_RISCV_GOT_HI20:
+        got_entry = env.got_entries[s.name]
+        addr = env.got_section.addr + got_entry.offset
+        reloc = addr + r_addend - r_offset
+        r.computed_reloc = reloc
+        reloc_type = "riscv_hi20"
+
+    elif r_info_type == R_RISCV_GOT32_PCREL:
+        got_entry = env.got_entries[s.name]
+        addr = env.got_section.addr + got_entry.offset
+        value = addr + r_addend - r_offset
+        reloc_type = "riscv_set32"
+
+    elif r_info_type == R_RISCV_PCREL_HI20:
+        addr = s.section.addr + s["st_value"]
+        reloc = addr + r_addend - r_offset
+        r.computed_reloc = reloc
+        reloc_type = "riscv_hi20"
+
+    elif r_info_type == R_RISCV_HI20:
+        addr = s.section.addr + s["st_value"]
+        reloc = addr + r_addend
+        r.computed_reloc = reloc
+        reloc_type = "riscv_hi20"
+
+    elif r_info_type in (
+        R_RISCV_PCREL_LO12_I,
+        R_RISCV_PCREL_LO12_S,
+        R_RISCV_LO12_I,
+        R_RISCV_LO12_S,
+    ):
+        parent = None
+        for potential_parent in s.section.reloc:
+            if potential_parent["r_offset"] != s["st_value"]:
+                continue
+            if potential_parent["r_info_type"] not in (
+                R_RISCV_GOT_HI20,
+                R_RISCV_PCREL_HI20,
+                R_RISCV_HI20,
+            ):
+                continue
+            parent = potential_parent
+            break
+        if parent is None:
+            assert 0, r
+        addr = s.section.addr + s["st_value"]
+        reloc = parent.computed_reloc
+        reloc_type = RISCV_RELOCATIONS_TYPE_MAP[r_info_type]
+
+    elif r_info_type in (
+        R_RISCV_JAL,
+        R_RISCV_RVC_BRANCH,
+        R_RISCV_RVC_JUMP,
+        R_RISCV_CALL,
+        R_RISCV_CALL_PLT,
+        R_RISCV_BRANCH,
+        R_RISCV_32_PCREL,
+        R_RISCV_PLT32,
+    ):
+        addr = s.section.addr + s["st_value"]
+        reloc = addr + r_addend - r_offset
+        reloc_type = RISCV_RELOCATIONS_TYPE_MAP[r_info_type]
+
+    elif r_info_type in (
+        R_RISCV_ADD8,
+        R_RISCV_ADD16,
+        R_RISCV_ADD32,
+        R_RISCV_ADD64,
+        R_RISCV_SUB6,
+        R_RISCV_SUB8,
+        R_RISCV_SUB16,
+        R_RISCV_SUB32,
+        R_RISCV_SUB64,
+        R_RISCV_SET6,
+        R_RISCV_SET8,
+        R_RISCV_SET16,
+        R_RISCV_SET32,
+    ):
+        value = s.section.addr + s["st_value"] + r_addend
+        reloc_type, *reloc_args = RISCV_RELOCATIONS_TYPE_MAP[r_info_type]
+
+    else:
+        # Unknown/unsupported relocation
+        assert 0, r_info_type
+
+    # Write relocation
+    if reloc_type == "riscv_hi20":
+        # Patch the upper 20 bits of the opcode
+        upper, _ = split_riscv_address(reloc)
+        (existing,) = struct.unpack_from("<I", env.full_text, r_offset)
+        struct.pack_into(
+            "<I",
+            env.full_text,
+            r_offset,
+            ((existing & 0xFFF) | upper) & 0xFFFFFFFF,
+        )
+    elif reloc_type == "riscv_lo12i":
+        # Patch the lower 12 bits of an I-opcode immediate.
+        _, lower = split_riscv_address(reloc)
+        (existing,) = struct.unpack_from("<I", env.full_text, r_offset)
+        struct.pack_into(
+            "<I",
+            env.full_text,
+            r_offset,
+            ((existing & 0xFFFFF) | ((lower & 0xFFF) << 20)) & 0xFFFFFFFF,
+        )
+    elif reloc_type == "riscv_lo12s":
+        # Patch the lower 12 bits of an S-opcode immediate.
+        _, lower = split_riscv_address(reloc)
+        (existing,) = struct.unpack_from("<I", env.full_text, r_offset)
+        struct.pack_into(
+            "<I",
+            env.full_text,
+            r_offset,
+            ((existing & 0xFE000F80) | ((lower & 0xFE0) << 20) | ((lower & 0x1F) << 7))
+            & 0xFFFFFFFF,
+        )
+    elif reloc_type == "riscv_cb":
+        # Patch the target of a compressed branch opcode
+        (existing,) = struct.unpack_from("<H", env.full_text, r_offset)
+        struct.pack_into(
+            "<H",
+            env.full_text,
+            r_offset,
+            (
+                (existing & 0xE383)
+                | ((reloc & 0x100) << 4)
+                | ((reloc & 0xC0) >> 1)
+                | ((reloc & 0x20) >> 3)
+                | ((reloc & 0x18) << 7)
+                | ((reloc & 0x06) << 2)
+            )
+            & 0xFFFF,
+        )
+    elif reloc_type == "riscv_cj":
+        # Patch the target of a compressed jump opcode
+        (existing,) = struct.unpack_from("<H", env.full_text, r_offset)
+        struct.pack_into(
+            "<H",
+            env.full_text,
+            r_offset,
+            (
+                (existing & 0xE003)
+                | ((reloc & 0x800) << 1)
+                | ((reloc & 0x400) >> 2)
+                | ((reloc & 0x300) << 1)
+                | ((reloc & 0x80) >> 1)
+                | ((reloc & 0x40) << 1)
+                | ((reloc & 0x20) >> 3)
+                | ((reloc & 0x10) << 7)
+                | ((reloc & 0x0E) << 2)
+            )
+            & 0xFFFF,
+        )
+    elif reloc_type == "riscv_call":
+        # Patch a pair of opcodes forming a call operation
+        upper, lower = split_riscv_address(reloc)
+        (existing,) = struct.unpack_from("<I", env.full_text, r_offset)
+        struct.pack_into(
+            "<I",
+            env.full_text,
+            r_offset,
+            ((existing & 0xFFF) | upper) & 0xFFFFFFFF,
+        )
+        (existing,) = struct.unpack_from("<I", env.full_text, r_offset + 4)
+        struct.pack_into(
+            "<I",
+            env.full_text,
+            r_offset + 4,
+            ((existing & 0xFFFFF) | (lower << 20)) & 0xFFFFFFFF,
+        )
+    elif reloc_type == "riscv_b":
+        # Patch a conditional opcode
+        (existing,) = struct.unpack_from("<I", env.full_text, r_offset)
+        struct.pack_into(
+            "<I",
+            env.full_text,
+            r_offset,
+            (
+                (existing & 0x01FFF07F)
+                | ((reloc & 0x1000) << 19)
+                | ((reloc & 0x800) >> 4)
+                | ((reloc & 0x7E0) << 20)
+                | ((reloc & 0x1E) << 7)
+            )
+            & 0xFFFFFFFF,
+        )
+    elif reloc_type == "riscv_j":
+        # Patch a jump/jump with link opcode
+        (existing,) = struct.unpack_from("<I", env.full_text, r_offset)
+        struct.pack_into(
+            "<I",
+            env.full_text,
+            r_offset,
+            (
+                (existing & 0xFFF)
+                | ((reloc & 0x100000) << 11)
+                | (reloc & 0xFF000)
+                | ((reloc & 0x800) << 9)
+                | ((reloc & 0x7FE) << 20)
+            ),
+        )
+    elif reloc_type == "riscv_addsub":
+        (fmt, bits, multiplier) = reloc_args
+        (existing,) = struct.unpack_from(fmt, env.full_text, r_offset)
+        mask = (1 << bits) - 1
+        value = (existing & mask) + (value * multiplier)
+        if value < 0:
+            value = (1 << bits) + value
+        struct.pack_into(fmt, env.full_text, r_offset, (existing & ~mask) | (value & mask))
+    elif reloc_type == "riscv_set":
+        (fmt, bits) = reloc_args
+        (existing,) = struct.unpack_from(fmt, env.full_text, r_offset)
+        mask = (1 << bits) - 1
+        struct.pack_into(fmt, env.full_text, r_offset, (existing & ~mask) | (value & mask))
+    elif reloc_type == "riscv_32pcrel":
+        # Write the distance from the current PC
+        struct.pack_into("<I", env.full_text, r_offset, reloc & 0xFFFFFFFF)
+    else:
+        assert 0, reloc_type
+
+    return addr, value
+
+
 def load_object_file(env, felf):
     with open(felf, "rb") as f:
         elf = elffile.ELFFile(f)
@@ -727,7 +1118,7 @@ def load_object_file(env, felf):
             if shndx in sections_shndx:
                 # Symbol with associated section
                 sym.section = sections_shndx[shndx]
-                if sym["st_info"]["bind"] == "STB_GLOBAL":
+                if sym["st_info"]["bind"] in ("STB_GLOBAL", "STB_WEAK"):
                     # Defined global symbol
                     if sym.name in env.known_syms and not sym.name.startswith(
                         "__x86.get_pc_thunk."

From 1857e62fdcb9a9fb0df987b2502ed98346457a6f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 2 Oct 2024 23:46:14 +0200
Subject: [PATCH 1737/3129] examples/natmod/re: Fix build on RV32 with alloca.

This fixes compilation of the `re` natmod example when built with Picolibc
in the CI environment.  Ubuntu 22.04's combination of its bare metal RISC-V
toolchain and its version of Picolibc makes the `alloca` symbol more
elusive than it should be.

This commit makes the `re` natmod try harder to get an `alloca`
implementation.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 examples/natmod/re/re.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/examples/natmod/re/re.c b/examples/natmod/re/re.c
index eb6d13778c387..c0279ee7e816d 100644
--- a/examples/natmod/re/re.c
+++ b/examples/natmod/re/re.c
@@ -4,7 +4,20 @@
 #define MICROPY_PY_RE_MATCH_SPAN_START_END (1)
 #define MICROPY_PY_RE_SUB (0) // requires vstr interface
 
+#if defined __has_builtin
+#if __has_builtin(__builtin_alloca)
+#define alloca __builtin_alloca
+#endif
+#endif
+
+#if !defined(alloca)
+#if defined(_PICOLIBC__) && !defined(HAVE_BUILTIN_ALLOCA)
+#define alloca(n) m_malloc(n)
+#else
 #include <alloca.h>
+#endif
+#endif
+
 #include "py/dynruntime.h"
 
 #define STACK_LIMIT (2048)

From 4bf087b272856482c055a6df66ec008f2ca846d0 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 11 Dec 2024 13:36:32 +0100
Subject: [PATCH 1738/3129] py/dynruntime.mk: Delete compiled module file on
 clean.

This commit adds the compiled native module file to the list of files to
remove when `make clean` is issued in a native module source directory.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/dynruntime.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 71679954eab01..68d5e2e268f5b 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -38,6 +38,8 @@ MPY_CROSS_FLAGS += -march=$(ARCH)
 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))))
 
+CLEAN_EXTRA += $(MOD).mpy
+
 ################################################################################
 # Architecture configuration
 

From 7ca6e5eb6815de6f7c2792969b0f66cf306f5b91 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 22 Dec 2024 00:27:03 +0100
Subject: [PATCH 1739/3129] qemu: Add test_natmod target for RV32 and use as
 part of CI pipeline.

This commit brings the natmod tests in the CI build process for the RV32
platform.  Not all example natmods are tested at the moment, as
`features` requires soft-float support, and `btree` needs thread-local
storage support in `mpy_ld.py` when built with the CI's toolchain.

Co-authored-by: Damien George <damien@micropython.org>
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile            |  6 ++++++
 ports/qemu/README.md           | 18 +++++++++++++++---
 ports/qemu/boards/VIRT_RV32.mk |  2 ++
 tools/ci.sh                    | 13 +++++++++++--
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 237e1e9514c60..b85ff2896a16e 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -168,6 +168,12 @@ test: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && ./run-tests.py -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
 
+.PHONY: test_natmod
+test_natmod: $(BUILD)/firmware.elf
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	# "btree" cannot build against Picolibc right now.
+	cd $(TOP)/tests && ./run-natmodtests.py -p -d execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_NATMODTESTS_ARGS) extmod/{deflate,framebuf,heapq,random_basic,re}*.py
+
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
 	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 	$(Q)$(SIZE) $@
diff --git a/ports/qemu/README.md b/ports/qemu/README.md
index 984faf8704794..9274bcc4e7566 100644
--- a/ports/qemu/README.md
+++ b/ports/qemu/README.md
@@ -71,8 +71,9 @@ To access the REPL directly use:
 
     $ make repl
 
-This will start `qemu-system-arm` with the UART redirected to stdio.  It's also
-possible to redirect the UART to a pty device using:
+This will start `qemu-system-arm` (or `qemu-system-riscv32`) with the UART
+redirected to stdio.  It's also possible to redirect the UART to a pty device
+using:
 
     $ make run
 
@@ -84,7 +85,7 @@ for example `mpremote`:
 
 You can disconnect and reconnect to the serial device multiple times.  Once you
 are finished, stop the `make run` command by pressing Ctrl-C where that command
-was started (or execute `machine.reset()` at the REPL).
+was started (or execute `import machine; machine.reset()` at the REPL).
 
 The test suite can be run against the firmware by using the UART redirection.
 You can either do this automatically using the single command:
@@ -97,6 +98,17 @@ tests against the serial device, for example:
     $ cd ../../tests
     $ ./run-tests.py -t /dev/pts/1
 
+Selected native modules that come as examples with the MicroPython source tree
+can also be tested with this command (this is currently supported only for the
+`VIRT_RV32` board):
+
+    $ make test_natmod
+
+The same remarks about manually running the tests apply for native modules, but
+`run-natmodtests.py` should be run instead of `run-tests.py`.  In this case you
+also have to explicitly pass the architecture you are running native modules to
+`run-natmodtests.py` ("--arch rv32imc" for the `VIRT_RV32` board).
+
 Extra make options
 ------------------
 
diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32.mk
index a61b659fa6d40..355a09c3d520e 100644
--- a/ports/qemu/boards/VIRT_RV32.mk
+++ b/ports/qemu/boards/VIRT_RV32.mk
@@ -12,3 +12,5 @@ MPY_CROSS_FLAGS += -march=rv32imc
 
 # These Thumb tests don't run on RV32, so exclude them.
 RUN_TESTS_ARGS = --exclude 'inlineasm|qemu/asm_test'
+
+RUN_NATMODTESTS_ARGS = --arch rv32imc
diff --git a/tools/ci.sh b/tools/ci.sh
index c67aeed0cecdf..8d75d7cecf425 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -273,6 +273,7 @@ function ci_qemu_setup_arm {
 }
 
 function ci_qemu_setup_rv32 {
+    ci_mpy_format_setup
     ci_gcc_riscv_setup
     sudo apt-get update
     sudo apt-get install qemu-system
@@ -292,6 +293,10 @@ function ci_qemu_build_rv32 {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 submodules
     make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 test
+
+    # Test building and running native .mpy with rv32imc architecture.
+    ci_native_mpy_modules_build rv32imc
+    make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 test_natmod
 }
 
 ########################################################################################
@@ -476,10 +481,14 @@ function ci_native_mpy_modules_build {
         arch=$1
     fi
     make -C examples/natmod/features1 ARCH=$arch
-    make -C examples/natmod/features2 ARCH=$arch
+    if [ $arch != rv32imc ]; then
+        # This requires soft-float support on rv32imc.
+        make -C examples/natmod/features2 ARCH=$arch
+        # This requires thread local storage support on rv32imc.
+        make -C examples/natmod/btree ARCH=$arch
+    fi
     make -C examples/natmod/features3 ARCH=$arch
     make -C examples/natmod/features4 ARCH=$arch
-    make -C examples/natmod/btree ARCH=$arch
     make -C examples/natmod/deflate ARCH=$arch
     make -C examples/natmod/framebuf ARCH=$arch
     make -C examples/natmod/heapq ARCH=$arch

From 4729a895046908414b239f02256ac3334d1b2c15 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 20 Dec 2024 22:43:14 +0100
Subject: [PATCH 1740/3129] tools/verifygitlog.py: Show invalid commit subjects
 in quotes.

If a commit subject line has any trailing whitespace it won't match the
repository validation rules, and the line will show up as part of the
relevant error message.  However, since there's no quotation marks
around the offending text, the trailing whitespace may go unnoticed, and
given that the commit message is then discarded when the commit
operation is retried this can get fairly annoying.

This commit simply modifies the error output for invalid subject lines
to add quotation marks around the offending text, so trailing whitespace
is much easier to see.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/verifygitlog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index ad9385e7ac540..67215d5c5d066 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -47,7 +47,7 @@ def git_log(pretty_format, *args):
 
 
 def diagnose_subject_line(subject_line, subject_line_format, err):
-    err.error("Subject line: " + subject_line)
+    err.error('Subject line: "' + subject_line + '"')
     if not subject_line.endswith("."):
         err.error('* must end with "."')
     if not re.match(r"^[^!]+: ", subject_line):

From 50637ff239cb6a09294f49fe2d2534c2d7ae8b76 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:52:35 +1100
Subject: [PATCH 1741/3129] extmod/vfs_rom: Add VfsRom filesystem object.

This commit defines a new ROMFS filesystem for storing read-only files that
can be memory mapped, and a new VfsRom driver.  Files opened from this
filesystem support the buffer protocol.  This allows naturally getting the
memory-mapped address of the file using:
- memoryview(file)
- uctypes.addressof(file)

Furthermore, if these files are .mpy files then their content can be
referenced in-place when importing.  Such imports take up a lot less RAM
than importing from a normal filesystem.  This is essentially dynamically
frozen .mpy files, building on the revamped v6 .mpy file format.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake   |   2 +
 extmod/extmod.mk      |   2 +
 extmod/modvfs.c       |   4 +
 extmod/vfs_rom.c      | 399 ++++++++++++++++++++++++++++++++++++++++++
 extmod/vfs_rom.h      |  47 +++++
 extmod/vfs_rom_file.c | 180 +++++++++++++++++++
 py/mpconfig.h         |   5 +
 7 files changed, 639 insertions(+)
 create mode 100644 extmod/vfs_rom.c
 create mode 100644 extmod/vfs_rom.h
 create mode 100644 extmod/vfs_rom_file.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 98e8a84608a56..154931a664477 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -58,6 +58,8 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/vfs_fat_diskio.c
     ${MICROPY_EXTMOD_DIR}/vfs_fat_file.c
     ${MICROPY_EXTMOD_DIR}/vfs_lfs.c
+    ${MICROPY_EXTMOD_DIR}/vfs_rom.c
+    ${MICROPY_EXTMOD_DIR}/vfs_rom_file.c
     ${MICROPY_EXTMOD_DIR}/vfs_posix.c
     ${MICROPY_EXTMOD_DIR}/vfs_posix_file.c
     ${MICROPY_EXTMOD_DIR}/vfs_reader.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index f2ae3ad6923fb..c8bc74d268e77 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -61,6 +61,8 @@ SRC_EXTMOD_C += \
 	extmod/vfs_fat_diskio.c \
 	extmod/vfs_fat_file.c \
 	extmod/vfs_lfs.c \
+	extmod/vfs_rom.c \
+	extmod/vfs_rom_file.c \
 	extmod/vfs_posix.c \
 	extmod/vfs_posix_file.c \
 	extmod/vfs_reader.c \
diff --git a/extmod/modvfs.c b/extmod/modvfs.c
index 32dc0e5d08b0d..df422365b75ef 100644
--- a/extmod/modvfs.c
+++ b/extmod/modvfs.c
@@ -32,6 +32,7 @@
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
 #include "extmod/vfs_posix.h"
+#include "extmod/vfs_rom.h"
 
 #if !MICROPY_VFS
 #error "MICROPY_PY_VFS requires MICROPY_VFS"
@@ -51,6 +52,9 @@ static const mp_rom_map_elem_t vfs_module_globals_table[] = {
     #if MICROPY_VFS_LFS2
     { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
     #endif
+    #if MICROPY_VFS_ROM
+    { MP_ROM_QSTR(MP_QSTR_VfsRom), MP_ROM_PTR(&mp_type_vfs_rom) },
+    #endif
     #if MICROPY_VFS_POSIX
     { MP_ROM_QSTR(MP_QSTR_VfsPosix), MP_ROM_PTR(&mp_type_vfs_posix) },
     #endif
diff --git a/extmod/vfs_rom.c b/extmod/vfs_rom.c
new file mode 100644
index 0000000000000..b8b6f8e40d12b
--- /dev/null
+++ b/extmod/vfs_rom.c
@@ -0,0 +1,399 @@
+/*
+ * 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.
+ */
+
+// ROMFS filesystem format
+// =======================
+//
+// ROMFS is a flexible and extensible filesystem format designed to represent a
+// directory hierarchy with files, where those files are read-only and their data
+// can be memory mapped.
+//
+// Concepts:
+// - varuint: An unsigned integer that is encoded in a variable number of bytes. It is
+//   stored big-endian with the high bit of the byte set if there are following bytes.
+// - record: A variable sized element with a type.  It is stored as two varuint's and then
+//   a payload.  The first varuint is the record kind and the second varuint is the
+//   payload length (which may be zero bytes long).
+//
+// A ROMFS filesystem is a record with record kind 0x14a6b1, chosen so the encoded value
+// is 0xd2-0xcd-0x31 which is "RM1" with the first two bytes having their high bit set.
+// If the ROMFS record's payload is non-empty then it contains records.
+//
+// Record types:
+// - 0 = unused, can be used to detect corruption of the filesystem.
+// - 1 = padding/comments, can contain any data in their payload.
+// - 2 = verbatim data, used to store file data.
+// - 3 = indirect data, pointer to offset within the ROMFS payload.
+// - 4 = a directory: payload contains a varuint which is the length of the directory
+//       name in bytes, then the name, then optional nested records for the contents
+//       of the directory (including optional metadata).
+// - 5 = a file: payload contains a varuint which is the length of the filename in bytes
+//       then the name, then optional nested records.
+//
+// Remarks:
+// - A varuint can be padded if needed by prepending with one or more 0x80 bytes.  This
+//   padding does not change any semantics.
+// - The size of the ROMFS record (including kind and length and payload) must be a
+//   multiple of 2 (because it's not possible to add a padding record of one byte).
+// - File data can be optionally aligned using padding records and/or indirect data
+//   records.
+// - There is no limit to the size of directory/file names or file data.
+//
+// Unknown record types must be skipped over.  They may in the future add optional
+// features, while still retaining backwards compatibility.  Such features may be:
+// - Alignment requirements of the ROMFS record.
+// - Timestamps on directories/files.
+// - A precomputed hash of a file, or other metadata.
+// - An optimised lookup table indexing the directory hierarchy.
+
+#include <string.h>
+
+#include "py/bc.h"
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_rom.h"
+
+#if MICROPY_VFS_ROM
+
+#define ROMFS_SIZE_MIN (4)
+#define ROMFS_HEADER_BYTE0 (0x80 | 'R')
+#define ROMFS_HEADER_BYTE1 (0x80 | 'M')
+#define ROMFS_HEADER_BYTE2 (0x00 | '1')
+
+// Values for `record_kind_t`.
+#define ROMFS_RECORD_KIND_UNUSED (0)
+#define ROMFS_RECORD_KIND_PADDING (1)
+#define ROMFS_RECORD_KIND_DATA_VERBATIM (2)
+#define ROMFS_RECORD_KIND_DATA_POINTER (3)
+#define ROMFS_RECORD_KIND_DIRECTORY (4)
+#define ROMFS_RECORD_KIND_FILE (5)
+
+typedef mp_uint_t record_kind_t;
+
+struct _mp_obj_vfs_rom_t {
+    mp_obj_base_t base;
+    mp_obj_t memory;
+    const uint8_t *filesystem;
+    const uint8_t *filesystem_end;
+};
+
+static record_kind_t extract_record(const uint8_t **fs, const uint8_t **fs_next) {
+    record_kind_t record_kind = mp_decode_uint(fs);
+    mp_uint_t record_len = mp_decode_uint(fs);
+    *fs_next = *fs + record_len;
+    return record_kind;
+}
+
+static void extract_data(mp_obj_vfs_rom_t *self, const uint8_t *fs, const uint8_t *fs_top, size_t *size_out, const uint8_t **data_out) {
+    *size_out = 0;
+    *data_out = NULL;
+    while (fs < fs_top) {
+        const uint8_t *fs_next;
+        record_kind_t record_kind = extract_record(&fs, &fs_next);
+        if (record_kind == ROMFS_RECORD_KIND_DATA_VERBATIM) {
+            // Verbatim data.
+            *size_out = fs_next - fs;
+            *data_out = fs;
+            break;
+        } else if (record_kind == ROMFS_RECORD_KIND_DATA_POINTER) {
+            // Pointer to data.
+            *size_out = mp_decode_uint(&fs);
+            *data_out = self->filesystem + mp_decode_uint(&fs);
+            break;
+        } else {
+            // Skip this record.
+            fs = fs_next;
+        }
+    }
+}
+
+// Searches for `path` in the filesystem.
+// `path` must be null-terminated.
+mp_import_stat_t mp_vfs_rom_search_filesystem(mp_obj_vfs_rom_t *self, const char *path, size_t *size_out, const uint8_t **data_out) {
+    const uint8_t *fs = self->filesystem;
+    const uint8_t *fs_top = self->filesystem_end;
+    size_t path_len = strlen(path);
+    if (*path == '/') {
+        // An optional slash at the start of the path enters the top-level filesystem.
+        ++path;
+        --path_len;
+    }
+    while (path_len > 0 && fs < fs_top) {
+        const uint8_t *fs_next;
+        record_kind_t record_kind = extract_record(&fs, &fs_next);
+        if (record_kind == ROMFS_RECORD_KIND_DIRECTORY || record_kind == ROMFS_RECORD_KIND_FILE) {
+            // A directory or file record.
+            mp_uint_t name_len = mp_decode_uint(&fs);
+            if ((name_len == path_len
+                 || (name_len < path_len && path[name_len] == '/'))
+                && memcmp(path, fs, name_len) == 0) {
+                // Name matches, so enter this record.
+                fs += name_len;
+                fs_top = fs_next;
+                path += name_len;
+                path_len -= name_len;
+                if (record_kind == ROMFS_RECORD_KIND_DIRECTORY) {
+                    // Continue searching in this directory.
+                    if (*path == '/') {
+                        ++path;
+                        --path_len;
+                    }
+                } else {
+                    // Return this file.
+                    if (path_len != 0) {
+                        return MP_IMPORT_STAT_NO_EXIST;
+                    }
+                    if (size_out != NULL) {
+                        extract_data(self, fs, fs_top, size_out, data_out);
+                    }
+                    return MP_IMPORT_STAT_FILE;
+                }
+            } else {
+                // Skip this directory/file record.
+                fs = fs_next;
+            }
+        } else {
+            // Skip this record.
+            fs = fs_next;
+        }
+    }
+    if (path_len == 0) {
+        if (size_out != NULL) {
+            *size_out = fs_top - fs;
+            *data_out = fs;
+        }
+        return MP_IMPORT_STAT_DIR;
+    }
+    return MP_IMPORT_STAT_NO_EXIST;
+}
+
+static mp_obj_t vfs_rom_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_vfs_rom_t *self = m_new_obj(mp_obj_vfs_rom_t);
+    self->base.type = type;
+    self->memory = args[0];
+
+    mp_buffer_info_t bufinfo;
+    if (mp_get_buffer(self->memory, &bufinfo, MP_BUFFER_READ)) {
+        if (bufinfo.len < ROMFS_SIZE_MIN) {
+            mp_raise_OSError(MP_ENODEV);
+        }
+        self->filesystem = bufinfo.buf;
+    } else {
+        self->filesystem = (const uint8_t *)(uintptr_t)mp_obj_get_int_truncated(self->memory);
+    }
+
+    // Verify it is a ROMFS.
+    if (!(self->filesystem[0] == ROMFS_HEADER_BYTE0
+          && self->filesystem[1] == ROMFS_HEADER_BYTE1
+          && self->filesystem[2] == ROMFS_HEADER_BYTE2)) {
+        mp_raise_OSError(MP_ENODEV);
+    }
+
+    // The ROMFS is a record itself, so enter into it and compute its limit.
+    extract_record(&self->filesystem, &self->filesystem_end);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static mp_obj_t vfs_rom_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
+    (void)self_in;
+    (void)readonly;
+    if (mp_obj_is_true(mkfs)) {
+        mp_raise_OSError(MP_EPERM);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_3(vfs_rom_mount_obj, vfs_rom_mount);
+
+// mp_vfs_rom_file_open is implemented in vfs_rom_file.c.
+static MP_DEFINE_CONST_FUN_OBJ_3(vfs_rom_open_obj, mp_vfs_rom_file_open);
+
+static mp_obj_t vfs_rom_chdir(mp_obj_t self_in, mp_obj_t path_in) {
+    mp_obj_vfs_rom_t *self = MP_OBJ_TO_PTR(self_in);
+    const char *path = mp_vfs_rom_get_path_str(self, path_in);
+    if (path[0] == '/' && path[1] == '\0') {
+        // Allow chdir to the root of the filesystem.
+    } else {
+        // Don't allow chdir to any subdirectory (not currently implemented).
+        mp_raise_OSError(MP_EOPNOTSUPP);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_rom_chdir_obj, vfs_rom_chdir);
+
+typedef struct _vfs_rom_ilistdir_it_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    mp_obj_vfs_rom_t *vfs_rom;
+    bool is_str;
+    const uint8_t *index;
+    const uint8_t *index_top;
+} vfs_rom_ilistdir_it_t;
+
+static mp_obj_t vfs_rom_ilistdir_it_iternext(mp_obj_t self_in) {
+    vfs_rom_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
+
+    while (self->index < self->index_top) {
+        const uint8_t *index_next;
+        record_kind_t record_kind = extract_record(&self->index, &index_next);
+        uint32_t type;
+        mp_uint_t name_len;
+        size_t data_len;
+        if (record_kind == ROMFS_RECORD_KIND_DIRECTORY || record_kind == ROMFS_RECORD_KIND_FILE) {
+            // A directory or file record.
+            name_len = mp_decode_uint(&self->index);
+            if (record_kind == ROMFS_RECORD_KIND_DIRECTORY) {
+                // A directory.
+                type = MP_S_IFDIR;
+                data_len = index_next - self->index - name_len;
+            } else {
+                // A file.
+                type = MP_S_IFREG;
+                const uint8_t *data_value;
+                extract_data(self->vfs_rom, self->index + name_len, index_next, &data_len, &data_value);
+            }
+        } else {
+            // Skip this record.
+            self->index = index_next;
+            continue;
+        }
+
+        const uint8_t *name_str = self->index;
+        self->index = index_next;
+
+        // Make 4-tuple with info about this entry: (name, attr, inode, size)
+        mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(4, NULL));
+
+        if (self->is_str) {
+            t->items[0] = mp_obj_new_str((const char *)name_str, name_len);
+        } else {
+            t->items[0] = mp_obj_new_bytes(name_str, name_len);
+        }
+
+        t->items[1] = MP_OBJ_NEW_SMALL_INT(type);
+        t->items[2] = MP_OBJ_NEW_SMALL_INT(0);
+        t->items[3] = mp_obj_new_int(data_len);
+
+        return MP_OBJ_FROM_PTR(t);
+    }
+
+    return MP_OBJ_STOP_ITERATION;
+}
+
+static mp_obj_t vfs_rom_ilistdir(mp_obj_t self_in, mp_obj_t path_in) {
+    mp_obj_vfs_rom_t *self = MP_OBJ_TO_PTR(self_in);
+    vfs_rom_ilistdir_it_t *iter = m_new_obj(vfs_rom_ilistdir_it_t);
+    iter->base.type = &mp_type_polymorph_iter;
+    iter->iternext = vfs_rom_ilistdir_it_iternext;
+    iter->vfs_rom = self;
+    iter->is_str = mp_obj_get_type(path_in) == &mp_type_str;
+    const char *path = mp_vfs_rom_get_path_str(self, path_in);
+    size_t size;
+    if (mp_vfs_rom_search_filesystem(self, path, &size, &iter->index) != MP_IMPORT_STAT_DIR) {
+        mp_raise_OSError(MP_ENOENT);
+    }
+    iter->index_top = iter->index + size;
+    return MP_OBJ_FROM_PTR(iter);
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_rom_ilistdir_obj, vfs_rom_ilistdir);
+
+static mp_obj_t vfs_rom_stat(mp_obj_t self_in, mp_obj_t path_in) {
+    mp_obj_vfs_rom_t *self = MP_OBJ_TO_PTR(self_in);
+    const char *path = mp_vfs_rom_get_path_str(self, path_in);
+    size_t file_size;
+    const uint8_t *file_data;
+    mp_import_stat_t stat = mp_vfs_rom_search_filesystem(self, path, &file_size, &file_data);
+    if (stat == MP_IMPORT_STAT_NO_EXIST) {
+        mp_raise_OSError(MP_ENOENT);
+    }
+    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
+    t->items[0] = MP_OBJ_NEW_SMALL_INT(stat == MP_IMPORT_STAT_FILE ? MP_S_IFREG : MP_S_IFDIR); // st_mode
+    t->items[1] = MP_OBJ_NEW_SMALL_INT(0); // st_ino
+    t->items[2] = MP_OBJ_NEW_SMALL_INT(0); // st_dev
+    t->items[3] = MP_OBJ_NEW_SMALL_INT(0); // st_nlink
+    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_SMALL_INT(file_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
+    return MP_OBJ_FROM_PTR(t);
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_rom_stat_obj, vfs_rom_stat);
+
+static mp_obj_t vfs_rom_statvfs(mp_obj_t self_in, mp_obj_t path_in) {
+    mp_obj_vfs_rom_t *self = MP_OBJ_TO_PTR(self_in);
+    (void)path_in;
+    size_t filesystem_len = self->filesystem_end - self->filesystem;
+    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
+    t->items[0] = MP_OBJ_NEW_SMALL_INT(1); // f_bsize
+    t->items[1] = MP_OBJ_NEW_SMALL_INT(0); // f_frsize
+    t->items[2] = mp_obj_new_int_from_uint(filesystem_len); // f_blocks
+    t->items[3] = MP_OBJ_NEW_SMALL_INT(0); // f_bfree
+    t->items[4] = MP_OBJ_NEW_SMALL_INT(0); // f_bavail
+    t->items[5] = MP_OBJ_NEW_SMALL_INT(0); // f_files
+    t->items[6] = MP_OBJ_NEW_SMALL_INT(0); // f_ffree
+    t->items[7] = MP_OBJ_NEW_SMALL_INT(0); // f_favail
+    t->items[8] = MP_OBJ_NEW_SMALL_INT(0); // f_flags
+    t->items[9] = MP_OBJ_NEW_SMALL_INT(32767); // f_namemax
+    return MP_OBJ_FROM_PTR(t);
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(vfs_rom_statvfs_obj, vfs_rom_statvfs);
+
+static const mp_rom_map_elem_t vfs_rom_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&vfs_rom_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&vfs_rom_open_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&vfs_rom_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&vfs_rom_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&vfs_rom_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&vfs_rom_statvfs_obj) },
+};
+static MP_DEFINE_CONST_DICT(vfs_rom_locals_dict, vfs_rom_locals_dict_table);
+
+static mp_import_stat_t mp_vfs_rom_import_stat(void *self_in, const char *path) {
+    mp_obj_vfs_rom_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_vfs_rom_search_filesystem(self, path, NULL, NULL);
+}
+
+static const mp_vfs_proto_t vfs_rom_proto = {
+    .import_stat = mp_vfs_rom_import_stat,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_rom,
+    MP_QSTR_VfsRom,
+    MP_TYPE_FLAG_NONE,
+    make_new, vfs_rom_make_new,
+    protocol, &vfs_rom_proto,
+    locals_dict, &vfs_rom_locals_dict
+    );
+
+#endif // MICROPY_VFS_ROM
diff --git a/extmod/vfs_rom.h b/extmod/vfs_rom.h
new file mode 100644
index 0000000000000..d8e2b911ba0ca
--- /dev/null
+++ b/extmod/vfs_rom.h
@@ -0,0 +1,47 @@
+/*
+ * 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_EXTMOD_VFS_ROM_H
+#define MICROPY_INCLUDED_EXTMOD_VFS_ROM_H
+
+#include "py/builtin.h"
+#include "py/obj.h"
+
+#if MICROPY_VFS_ROM
+
+typedef struct _mp_obj_vfs_rom_t mp_obj_vfs_rom_t;
+
+extern const mp_obj_type_t mp_type_vfs_rom;
+
+static inline const char *mp_vfs_rom_get_path_str(mp_obj_vfs_rom_t *self, mp_obj_t path) {
+    return mp_obj_str_get_str(path);
+}
+
+mp_import_stat_t mp_vfs_rom_search_filesystem(mp_obj_vfs_rom_t *self, const char *path, size_t *size_out, const uint8_t **data_out);
+mp_obj_t mp_vfs_rom_file_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in);
+
+#endif // MICROPY_VFS_ROM
+
+#endif // MICROPY_INCLUDED_EXTMOD_VFS_ROM_H
diff --git a/extmod/vfs_rom_file.c b/extmod/vfs_rom_file.c
new file mode 100644
index 0000000000000..57aca8c5dc7d3
--- /dev/null
+++ b/extmod/vfs_rom_file.c
@@ -0,0 +1,180 @@
+/*
+ * 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 <string.h>
+
+#include "py/reader.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "extmod/vfs_rom.h"
+
+#if MICROPY_VFS_ROM
+
+typedef struct _mp_obj_vfs_rom_file_t {
+    mp_obj_base_t base;
+    size_t file_size;
+    size_t file_offset;
+    const uint8_t *file_data;
+} mp_obj_vfs_rom_file_t;
+
+static const mp_obj_type_t mp_type_vfs_rom_fileio;
+static const mp_obj_type_t mp_type_vfs_rom_textio;
+
+mp_obj_t mp_vfs_rom_file_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
+    mp_obj_vfs_rom_t *self = MP_OBJ_TO_PTR(self_in);
+
+    const char *mode_s = mp_obj_str_get_str(mode_in);
+    const mp_obj_type_t *type = &mp_type_vfs_rom_textio;
+    while (*mode_s) {
+        switch (*mode_s++) {
+            case 'r':
+                break;
+            case 'w':
+            case 'a':
+            case '+':
+                mp_raise_OSError(MP_EROFS);
+            case 'b':
+                type = &mp_type_vfs_rom_fileio;
+                break;
+            case 't':
+                type = &mp_type_vfs_rom_textio;
+                break;
+        }
+    }
+
+    mp_obj_vfs_rom_file_t *o = m_new_obj(mp_obj_vfs_rom_file_t);
+    o->base.type = type;
+    o->file_offset = 0;
+
+    const char *path = mp_vfs_rom_get_path_str(self, path_in);
+    mp_import_stat_t stat = mp_vfs_rom_search_filesystem(self, path, &o->file_size, &o->file_data);
+    if (stat == MP_IMPORT_STAT_NO_EXIST) {
+        mp_raise_OSError(MP_ENOENT);
+    } else if (stat == MP_IMPORT_STAT_DIR) {
+        mp_raise_OSError(MP_EISDIR);
+    }
+
+    return MP_OBJ_FROM_PTR(o);
+}
+
+static mp_int_t vfs_rom_file_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    mp_obj_vfs_rom_file_t *self = MP_OBJ_TO_PTR(self_in);
+    if (flags == MP_BUFFER_READ) {
+        bufinfo->buf = (void *)self->file_data;
+        bufinfo->len = self->file_size;
+        bufinfo->typecode = 'B';
+        return 0;
+    } else {
+        // Can't write to a ROM file.
+        return 1;
+    }
+}
+
+static mp_uint_t vfs_rom_file_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
+    mp_obj_vfs_rom_file_t *self = MP_OBJ_TO_PTR(o_in);
+    size_t remain = self->file_size - self->file_offset;
+    if (size > remain) {
+        size = remain;
+    }
+    memcpy(buf, self->file_data + self->file_offset, size);
+    self->file_offset += size;
+    return size;
+}
+
+static mp_uint_t vfs_rom_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    mp_obj_vfs_rom_file_t *self = MP_OBJ_TO_PTR(o_in);
+
+    switch (request) {
+        case MP_STREAM_SEEK: {
+            struct mp_stream_seek_t *s = (struct mp_stream_seek_t *)arg;
+            if (s->whence == 0) { // SEEK_SET
+                self->file_offset = (size_t)s->offset;
+            } else if (s->whence == 1) { // SEEK_CUR
+                self->file_offset += s->offset;
+            } else { // SEEK_END
+                self->file_offset = self->file_size + s->offset;
+            }
+            if (self->file_offset > self->file_size) {
+                if (s->offset < 0) {
+                    // Seek to before the start of the file.
+                    *errcode = MP_EINVAL;
+                    return MP_STREAM_ERROR;
+                }
+                self->file_offset = self->file_size;
+            }
+            s->offset = self->file_offset;
+            return 0;
+        }
+        case MP_STREAM_CLOSE:
+            return 0;
+        default:
+            *errcode = MP_EINVAL;
+            return MP_STREAM_ERROR;
+    }
+}
+
+static const mp_rom_map_elem_t vfs_rom_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_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_close), 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(&mp_stream___exit___obj) },
+};
+static MP_DEFINE_CONST_DICT(vfs_rom_rawfile_locals_dict, vfs_rom_rawfile_locals_dict_table);
+
+static const mp_stream_p_t vfs_rom_fileio_stream_p = {
+    .read = vfs_rom_file_read,
+    .ioctl = vfs_rom_file_ioctl,
+};
+
+static MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_rom_fileio,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
+    buffer, vfs_rom_file_get_buffer,
+    protocol, &vfs_rom_fileio_stream_p,
+    locals_dict, &vfs_rom_rawfile_locals_dict
+    );
+
+static const mp_stream_p_t vfs_rom_textio_stream_p = {
+    .read = vfs_rom_file_read,
+    .ioctl = vfs_rom_file_ioctl,
+    .is_text = true,
+};
+
+static MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_rom_textio,
+    MP_QSTR_TextIOWrapper,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
+    protocol, &vfs_rom_textio_stream_p,
+    locals_dict, &vfs_rom_rawfile_locals_dict
+    );
+
+#endif // MICROPY_VFS_ROM
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a330cadc4ef3a..8598eaa5bb639 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1016,6 +1016,11 @@ typedef double mp_float_t;
 #define MICROPY_VFS_LFS2 (0)
 #endif
 
+// Support for ROMFS.
+#ifndef MICROPY_VFS_ROM
+#define MICROPY_VFS_ROM (0)
+#endif
+
 /*****************************************************************************/
 /* Fine control over Python builtins, classes, modules, etc                  */
 

From a1c32101ac3bc70ed2774f461c69548ce8dae23d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:40:15 +1100
Subject: [PATCH 1742/3129] py/qstr: Add qstr_from_strn_static() helper
 function.

Allows an interned string to reference static/ROM data, instead of
allocating it on the GC heap.

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

diff --git a/py/qstr.c b/py/qstr.c
index fea7f44fe13bf..7902646a92dc5 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -309,7 +309,7 @@ qstr qstr_from_str(const char *str) {
     return qstr_from_strn(str, strlen(str));
 }
 
-qstr qstr_from_strn(const char *str, size_t len) {
+static qstr qstr_from_strn_helper(const char *str, size_t len, bool data_is_static) {
     QSTR_ENTER();
     qstr q = qstr_find_strn(str, len);
     if (q == 0) {
@@ -321,6 +321,12 @@ qstr qstr_from_strn(const char *str, size_t len) {
             mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("name too long"));
         }
 
+        if (data_is_static) {
+            // Given string data will be forever available so use it directly.
+            assert(str[len] == '\0');
+            goto add;
+        }
+
         // compute number of bytes needed to intern this string
         size_t n_bytes = len + 1;
 
@@ -364,12 +370,26 @@ qstr qstr_from_strn(const char *str, size_t len) {
         // store the interned strings' data
         memcpy(q_ptr, str, len);
         q_ptr[len] = '\0';
-        q = qstr_add(len, q_ptr);
+        str = q_ptr;
+
+    add:
+        q = qstr_add(len, str);
     }
     QSTR_EXIT();
     return q;
 }
 
+qstr qstr_from_strn(const char *str, size_t len) {
+    return qstr_from_strn_helper(str, len, false);
+}
+
+#if MICROPY_VFS_ROM
+// Create a new qstr that can forever reference the given string data.
+qstr qstr_from_strn_static(const char *str, size_t len) {
+    return qstr_from_strn_helper(str, len, true);
+}
+#endif
+
 mp_uint_t qstr_hash(qstr q) {
     const qstr_pool_t *pool = find_qstr(&q);
     #if MICROPY_QSTR_BYTES_IN_HASH
diff --git a/py/qstr.h b/py/qstr.h
index 58ce285fd2c8a..0cde6062eb1a5 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -101,6 +101,9 @@ qstr qstr_find_strn(const char *str, size_t str_len); // returns MP_QSTRnull if
 
 qstr qstr_from_str(const char *str);
 qstr qstr_from_strn(const char *str, size_t len);
+#if MICROPY_VFS_ROM
+qstr qstr_from_strn_static(const char *str, size_t len);
+#endif
 
 mp_uint_t qstr_hash(qstr q);
 const char *qstr_str(qstr q);

From f870e8d2d406e809b4494e6d029fee0269b1ea05 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:54:05 +1100
Subject: [PATCH 1743/3129] py/reader: Provide mp_reader_try_read_rom()
 function.

This allows accessing data directly in ROM if the reader supports it.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/reader.c | 15 ++++++++++++++-
 py/reader.h |  9 +++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/py/reader.c b/py/reader.c
index 151e04cac2c71..8feb6d75275f1 100644
--- a/py/reader.c
+++ b/py/reader.c
@@ -50,7 +50,7 @@ static mp_uint_t mp_reader_mem_readbyte(void *data) {
 
 static void mp_reader_mem_close(void *data) {
     mp_reader_mem_t *reader = (mp_reader_mem_t *)data;
-    if (reader->free_len > 0) {
+    if (reader->free_len > 0 && reader->free_len != MP_READER_IS_ROM) {
         m_del(char, (char *)reader->beg, reader->free_len);
     }
     m_del_obj(mp_reader_mem_t, reader);
@@ -67,6 +67,19 @@ void mp_reader_new_mem(mp_reader_t *reader, const byte *buf, size_t len, size_t
     reader->close = mp_reader_mem_close;
 }
 
+const uint8_t *mp_reader_try_read_rom(mp_reader_t *reader, size_t len) {
+    if (reader->readbyte != mp_reader_mem_readbyte) {
+        return NULL;
+    }
+    mp_reader_mem_t *m = reader->data;
+    if (m->free_len != MP_READER_IS_ROM) {
+        return NULL;
+    }
+    const uint8_t *data = m->cur;
+    m->cur += len;
+    return data;
+}
+
 #if MICROPY_READER_POSIX
 
 #include <sys/stat.h>
diff --git a/py/reader.h b/py/reader.h
index 5cb1e67966c61..301c70ab3f0d4 100644
--- a/py/reader.h
+++ b/py/reader.h
@@ -28,6 +28,10 @@
 
 #include "py/obj.h"
 
+// Pass to the `free_len` argument to `mp_reader_new_mem` to indicate that the data is in ROM.
+// This means that the data is addressable and will remain valid at least until a soft reset.
+#define MP_READER_IS_ROM ((size_t)-1)
+
 // the readbyte function must return the next byte in the input stream
 // it must return MP_READER_EOF if end of stream
 // it can be called again after returning MP_READER_EOF, and in that case must return MP_READER_EOF
@@ -43,4 +47,9 @@ void mp_reader_new_mem(mp_reader_t *reader, const byte *buf, size_t len, size_t
 void mp_reader_new_file(mp_reader_t *reader, qstr filename);
 void mp_reader_new_file_from_fd(mp_reader_t *reader, int fd, bool close_fd);
 
+// Try to efficiently read the given number of bytes from a ROM-based reader.
+// Returns a valid, non-NULL pointer to the requseted data if the reader points to ROM.
+// Returns NULL if the reader does not point to ROM.
+const uint8_t *mp_reader_try_read_rom(mp_reader_t *reader, size_t len);
+
 #endif // MICROPY_INCLUDED_PY_READER_H

From 5e9dd4b6a2ba58bc61ffc0d0a34a03c0382fcc72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Dec 2024 11:30:33 +1100
Subject: [PATCH 1744/3129] extmod/vfs_reader: Add support for opening a
 memory-mappable file.

If the file can be memory mapped (because it responds to the buffer
protocol) then return a memory-reader that directly references the ROM data
of the file.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_reader.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extmod/vfs_reader.c b/extmod/vfs_reader.c
index 80d0fa6344aa1..de5c4e03d3c13 100644
--- a/extmod/vfs_reader.c
+++ b/extmod/vfs_reader.c
@@ -85,6 +85,17 @@ void mp_reader_new_file(mp_reader_t *reader, qstr filename) {
 
     const mp_stream_p_t *stream_p = mp_get_stream(file);
     int errcode = 0;
+
+    #if MICROPY_VFS_ROM
+    // Check if the stream can be memory mapped.
+    mp_buffer_info_t bufinfo;
+    if (mp_get_buffer(file, &bufinfo, MP_BUFFER_READ)) {
+        mp_reader_new_mem(reader, bufinfo.buf, bufinfo.len, MP_READER_IS_ROM);
+        return;
+    }
+    #endif
+
+    // Determine how big the input buffer should be, if the stream requests a certain size or not.
     mp_uint_t bufsize = stream_p->ioctl(file, MP_STREAM_GET_BUFFER_SIZE, 0, &errcode);
     if (bufsize == MP_STREAM_ERROR || bufsize == 0) {
         // bufsize == 0 is included here to support mpremote v1.21 and older where mount file ioctl
@@ -94,6 +105,7 @@ void mp_reader_new_file(mp_reader_t *reader, qstr filename) {
         bufsize = MIN(MICROPY_READER_VFS_MAX_BUFFER_SIZE, MAX(MICROPY_READER_VFS_MIN_BUFFER_SIZE, bufsize));
     }
 
+    // Create the reader.
     mp_reader_vfs_t *rf = m_new_obj_var(mp_reader_vfs_t, buf, byte, bufsize);
     rf->file = file;
     rf->bufsize = bufsize;

From 97518064cd5fadf6e57e9b989958c9f36fe94e47 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:54:05 +1100
Subject: [PATCH 1745/3129] py/persistentcode: Add support for loading .mpy
 files from a ROM reader.

This adds an optimisation for loading .mpy files from a reader that points
to ROM.  In such a case qstr, str and bytes data, along with bytecode, are
all referenced in-place in ROM.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c | 70 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index be93eaa5b4564..0843d1a2c52e6 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -181,6 +181,15 @@ static qstr load_qstr(mp_reader_t *reader) {
         return len >> 1;
     }
     len >>= 1;
+
+    #if MICROPY_VFS_ROM
+    // If possible, create the qstr from the memory-mapped string data.
+    const uint8_t *memmap = mp_reader_try_read_rom(reader, len + 1);
+    if (memmap != NULL) {
+        return qstr_from_strn_static((const char *)memmap, len);
+    }
+    #endif
+
     char *str = m_new(char, len);
     read_bytes(reader, (byte *)str, len);
     read_byte(reader); // read and discard null terminator
@@ -189,6 +198,24 @@ static qstr load_qstr(mp_reader_t *reader) {
     return qst;
 }
 
+#if MICROPY_VFS_ROM
+// Create a str/bytes object that can forever reference the given data.
+static mp_obj_t mp_obj_new_str_static(const mp_obj_type_t *type, const byte *data, size_t len) {
+    if (type == &mp_type_str) {
+        qstr q = qstr_find_strn((const char *)data, len);
+        if (q != MP_QSTRnull) {
+            return MP_OBJ_NEW_QSTR(q);
+        }
+    }
+    assert(data[len] == '\0');
+    mp_obj_str_t *o = mp_obj_malloc(mp_obj_str_t, type);
+    o->len = len;
+    o->hash = qstr_compute_hash(data, len);
+    o->data = data;
+    return MP_OBJ_FROM_PTR(o);
+}
+#endif
+
 static mp_obj_t load_obj(mp_reader_t *reader) {
     byte obj_type = read_byte(reader);
     #if MICROPY_EMIT_MACHINE_CODE
@@ -206,6 +233,8 @@ static mp_obj_t load_obj(mp_reader_t *reader) {
         return MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj);
     } else {
         size_t len = read_uint(reader);
+
+        // Handle empty bytes object, and tuple objects.
         if (len == 0 && obj_type == MP_PERSISTENT_OBJ_BYTES) {
             read_byte(reader); // skip null terminator
             return mp_const_empty_bytes;
@@ -216,11 +245,31 @@ static mp_obj_t load_obj(mp_reader_t *reader) {
             }
             return MP_OBJ_FROM_PTR(tuple);
         }
+
+        // Read in the object's data, either from ROM or into RAM.
+        const uint8_t *memmap = NULL;
         vstr_t vstr;
-        vstr_init_len(&vstr, len);
-        read_bytes(reader, (byte *)vstr.buf, len);
+        #if MICROPY_VFS_ROM
+        memmap = mp_reader_try_read_rom(reader, len);
+        vstr.buf = (void *)memmap;
+        vstr.len = len;
+        #endif
+        if (memmap == NULL) {
+            // Data could not be memory-mapped, so allocate it in RAM and read it in.
+            vstr_init_len(&vstr, len);
+            read_bytes(reader, (byte *)vstr.buf, len);
+        }
+
+        // Create and return the object.
         if (obj_type == MP_PERSISTENT_OBJ_STR || obj_type == MP_PERSISTENT_OBJ_BYTES) {
-            read_byte(reader); // skip null terminator
+            read_byte(reader); // skip null terminator (it needs to be there for ROM str objects)
+            #if MICROPY_VFS_ROM
+            if (memmap != NULL) {
+                // Create a str/bytes that references the memory-mapped data.
+                const mp_obj_type_t *t = obj_type == MP_PERSISTENT_OBJ_STR ? &mp_type_str : &mp_type_bytes;
+                return mp_obj_new_str_static(t, memmap, len);
+            }
+            #endif
             if (obj_type == MP_PERSISTENT_OBJ_STR) {
                 return mp_obj_new_str_from_utf8_vstr(&vstr);
             } else {
@@ -257,10 +306,17 @@ static mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
     #endif
 
     if (kind == MP_CODE_BYTECODE) {
-        // Allocate memory for the bytecode
-        fun_data = m_new(uint8_t, fun_data_len);
-        // Load bytecode
-        read_bytes(reader, fun_data, fun_data_len);
+        #if MICROPY_VFS_ROM
+        // Try to reference memory-mapped data for the bytecode.
+        fun_data = (uint8_t *)mp_reader_try_read_rom(reader, fun_data_len);
+        #endif
+
+        if (fun_data == NULL) {
+            // Allocate memory for the bytecode.
+            fun_data = m_new(uint8_t, fun_data_len);
+            // Load bytecode.
+            read_bytes(reader, fun_data, fun_data_len);
+        }
 
     #if MICROPY_EMIT_MACHINE_CODE
     } else {

From d9378c9287f87c0214dc4a33206dfd047f798240 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:56:27 +1100
Subject: [PATCH 1746/3129] unix: Enable VfsRom on standard and coverage
 variants.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/mpconfigvariant_common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index cea0397414325..093477af0aded 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -121,3 +121,5 @@
 #define MICROPY_PY_MACHINE             (1)
 #define MICROPY_PY_MACHINE_PULSE       (1)
 #define MICROPY_PY_MACHINE_PIN_BASE    (1)
+
+#define MICROPY_VFS_ROM                (1)

From def9a37994897341ee9250b39851f9cf53a748de Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Nov 2024 23:58:01 +1100
Subject: [PATCH 1747/3129] qemu/mpconfigport: Enable VfsRom.

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

diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index f95b58ba4d465..d3e3c0a3f37ac 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -60,6 +60,7 @@
 #define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_PIN_BASE (1)
 #define MICROPY_VFS                 (1)
+#define MICROPY_VFS_ROM             (1)
 
 // type definitions for the specific machine
 

From c73204128e16cfa62abd42b07981bd8e5adeb321 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Nov 2024 10:35:31 +1100
Subject: [PATCH 1748/3129] tests/extmod: Add VfsRom test.

Provides full coverage of the VfsRom driver.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_rom.py | 412 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 412 insertions(+)
 create mode 100644 tests/extmod/vfs_rom.py

diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py
new file mode 100644
index 0000000000000..0382c84c55894
--- /dev/null
+++ b/tests/extmod/vfs_rom.py
@@ -0,0 +1,412 @@
+# Test VfsRom filesystem.
+
+try:
+    import sys, struct, os, uctypes, vfs
+
+    vfs.VfsRom
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+try:
+    import select
+except ImportError:
+    select = None
+
+import unittest
+
+IFDIR = 0x4000
+IFREG = 0x8000
+
+SEEK_SET = 0
+SEEK_CUR = 1
+SEEK_END = 2
+
+# An mpy file with four constant objects: str, bytes, long-int, float.
+test_mpy = (
+    # header
+    b"M\x06\x00\x1f"  # mpy file header
+    b"\x06"  # n_qstr
+    b"\x05"  # n_obj
+    # qstrs
+    b"\x0etest.py\x00"  # qstr0 = "test.py"
+    b"\x0f"  # qstr1 = "<module>"
+    b"\x0estr_obj\x00"  # qstr2 = "str_obj"
+    b"\x12bytes_obj\x00"  # qstr3 = "bytes_obj"
+    b"\x0eint_obj\x00"  # qstr4 = "int_obj"
+    b"\x12float_obj\x00"  # qstr5 = "float_obj"
+    # objects
+    b"\x05\x14this is a str object\x00"
+    b"\x06\x16this is a bytes object\x00"
+    b"\x07\x0a1234567890"  # long-int object
+    b"\x08\x041.23"  # float object
+    b"\x05\x07str_obj\x00"  # str object of existing qstr
+    # bytecode
+    b"\x81\x28"  # 21 bytes, no children, bytecode
+    b"\x00\x02"  # prelude
+    b"\x01"  # simple name (<module>)
+    b"\x23\x00"  # LOAD_CONST_OBJ(0)
+    b"\x16\x02"  # STORE_NAME(str_obj)
+    b"\x23\x01"  # LOAD_CONST_OBJ(1)
+    b"\x16\x03"  # STORE_NAME(bytes_obj)
+    b"\x23\x02"  # LOAD_CONST_OBJ(2)
+    b"\x16\x04"  # STORE_NAME(int_obj)
+    b"\x23\x03"  # LOAD_CONST_OBJ(3)
+    b"\x16\x05"  # STORE_NAME(float_obj)
+    b"\x51"  # LOAD_CONST_NONE
+    b"\x63"  # RETURN_VALUE
+)
+
+
+class VfsRomWriter:
+    ROMFS_HEADER = b"\xd2\xcd\x31"
+
+    ROMFS_RECORD_KIND_UNUSED = 0
+    ROMFS_RECORD_KIND_PADDING = 1
+    ROMFS_RECORD_KIND_DATA_VERBATIM = 2
+    ROMFS_RECORD_KIND_DATA_POINTER = 3
+    ROMFS_RECORD_KIND_DIRECTORY = 4
+    ROMFS_RECORD_KIND_FILE = 5
+
+    def __init__(self):
+        self._dir_stack = [(None, bytearray())]
+
+    def _encode_uint(self, value):
+        encoded = [value & 0x7F]
+        value >>= 7
+        while value != 0:
+            encoded.insert(0, 0x80 | (value & 0x7F))
+            value >>= 7
+        return bytes(encoded)
+
+    def _pack(self, kind, payload):
+        return self._encode_uint(kind) + self._encode_uint(len(payload)) + payload
+
+    def _extend(self, data):
+        buf = self._dir_stack[-1][1]
+        buf.extend(data)
+        return len(buf)
+
+    def finalise(self):
+        _, data = self._dir_stack.pop()
+        encoded_kind = VfsRomWriter.ROMFS_HEADER
+        encoded_len = self._encode_uint(len(data))
+        if (len(encoded_kind) + len(encoded_len) + len(data)) % 2 == 1:
+            encoded_len = b"\x80" + encoded_len
+        data = encoded_kind + encoded_len + data
+        return data
+
+    def opendir(self, dirname):
+        self._dir_stack.append((dirname, bytearray()))
+
+    def closedir(self):
+        dirname, dirdata = self._dir_stack.pop()
+        dirdata = self._encode_uint(len(dirname)) + bytes(dirname, "ascii") + dirdata
+        self._extend(self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DIRECTORY, dirdata))
+
+    def mkdata(self, data):
+        assert len(self._dir_stack) == 1
+        return self._extend(self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DATA_VERBATIM, data)) - len(
+            data
+        )
+
+    def mkfile(self, filename, filedata, extra_payload=b""):
+        filename = bytes(filename, "ascii")
+        payload = self._encode_uint(len(filename))
+        payload += filename
+        payload += extra_payload
+        if isinstance(filedata, tuple):
+            sub_payload = self._encode_uint(filedata[0])
+            sub_payload += self._encode_uint(filedata[1])
+            payload += self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DATA_POINTER, sub_payload)
+        else:
+            payload += self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DATA_VERBATIM, filedata)
+        self._dir_stack[-1][1].extend(self._pack(VfsRomWriter.ROMFS_RECORD_KIND_FILE, payload))
+
+
+def _make_romfs(fs, files, data_map):
+    for filename, contents in files:
+        if isinstance(contents, tuple):
+            fs.opendir(filename)
+            _make_romfs(fs, contents, data_map)
+            fs.closedir()
+        elif isinstance(contents, int):
+            fs.mkfile(filename, data_map[contents])
+        else:
+            fs.mkfile(filename, contents)
+
+
+def make_romfs(files, data=None):
+    fs = VfsRomWriter()
+    data_map = {}
+    if data:
+        for k, v in data.items():
+            data_map[k] = len(v), fs.mkdata(v)
+    _make_romfs(fs, files, data_map)
+    return fs.finalise()
+
+
+# A class to test if a value is within a range, needed because MicroPython's range
+# doesn't support arbitrary objects.
+class Range:
+    def __init__(self, lower, upper):
+        self._lower = lower
+        self._upper = upper
+
+    def __repr__(self):
+        return "Range({}, {})".format(self._lower, self._upper)
+
+    def __contains__(self, value):
+        return self._lower <= value < self._upper
+
+
+class TestBase(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        fs_inner = make_romfs((("test_inner.txt", b"contents_inner"), ("c.py", b"")))
+        cls.romfs = make_romfs(
+            (
+                ("fs.romfs", 0),
+                ("test.txt", b"contents"),
+                (
+                    "dir",
+                    (
+                        ("a.py", b"x = 1"),
+                        ("b.py", b"x = 2"),
+                        ("test.mpy", test_mpy),
+                    ),
+                ),
+            ),
+            {0: fs_inner},
+        )
+        cls.romfs_ilistdir = [
+            ("fs.romfs", IFREG, 0, 46),
+            ("test.txt", IFREG, 0, 8),
+            ("dir", IFDIR, 0, 198),
+        ]
+        cls.romfs_listdir = [x[0] for x in cls.romfs_ilistdir]
+        cls.romfs_listdir_dir = ["a.py", "b.py", "test.mpy"]
+        cls.romfs_listdir_bytes = [bytes(x, "ascii") for x in cls.romfs_listdir]
+        cls.romfs_addr = uctypes.addressof(cls.romfs)
+        cls.romfs_addr_range = Range(cls.romfs_addr, cls.romfs_addr + len(cls.romfs))
+
+
+class TestEdgeCases(unittest.TestCase):
+    def test_empty_romfs(self):
+        empty_romfs = make_romfs(())
+        self.assertEqual(empty_romfs, bytes([0x80 | ord("R"), 0x80 | ord("M"), ord("1"), 0]))
+        fs = vfs.VfsRom(empty_romfs)
+        self.assertIsInstance(fs, vfs.VfsRom)
+        fs.mount(True, False)
+        self.assertEqual(list(fs.ilistdir("")), [])
+        self.assertEqual(fs.stat(""), (IFDIR, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+        self.assertEqual(fs.statvfs(""), (1, 0, 0, 0, 0, 0, 0, 0, 0, 32767))
+
+    def test_error(self):
+        for bad_romfs in (b"", b"xxx", b"not a romfs"):
+            with self.assertRaises(OSError) as ctx:
+                vfs.VfsRom(bad_romfs)
+            self.assertEqual(ctx.exception.errno, errno.ENODEV)
+
+    def test_unknown_record(self):
+        fs = VfsRomWriter()
+        fs._extend(fs._pack(VfsRomWriter.ROMFS_RECORD_KIND_PADDING, b"payload"))
+        fs.mkfile(
+            "test",
+            b"contents",
+            extra_payload=fs._pack(VfsRomWriter.ROMFS_RECORD_KIND_PADDING, b"pad"),
+        )
+        romfs = fs.finalise()
+        fs = vfs.VfsRom(romfs)
+        self.assertEqual(list(fs.ilistdir("")), [("test", IFREG, 0, 8)])
+        with fs.open("test", "rb") as f:
+            self.assertEqual(f.read(), b"contents")
+
+
+class TestStandalone(TestBase):
+    def test_constructor(self):
+        self.assertIsInstance(vfs.VfsRom(self.romfs), vfs.VfsRom)
+        self.assertIsInstance(vfs.VfsRom(self.romfs_addr), vfs.VfsRom)
+
+    def test_mount(self):
+        vfs.VfsRom(self.romfs).mount(True, False)
+        with self.assertRaises(OSError):
+            vfs.VfsRom(self.romfs).mount(True, True)
+
+    def test_ilistdir(self):
+        fs = vfs.VfsRom(self.romfs)
+        self.assertEqual(list(fs.ilistdir("")), self.romfs_ilistdir)
+        self.assertEqual(list(fs.ilistdir("/")), self.romfs_ilistdir)
+        with self.assertRaises(OSError):
+            fs.ilistdir("does not exist")
+
+    def test_stat(self):
+        fs = vfs.VfsRom(self.romfs)
+        self.assertEqual(fs.stat(""), (IFDIR, 0, 0, 0, 0, 0, 289, 0, 0, 0))
+        self.assertEqual(fs.stat("/"), (IFDIR, 0, 0, 0, 0, 0, 289, 0, 0, 0))
+        self.assertEqual(fs.stat("/test.txt"), (IFREG, 0, 0, 0, 0, 0, 8, 0, 0, 0))
+        self.assertEqual(fs.stat("/dir"), (IFDIR, 0, 0, 0, 0, 0, 198, 0, 0, 0))
+        with self.assertRaises(OSError):
+            fs.stat("/does-not-exist")
+
+    def test_statvfs(self):
+        fs = vfs.VfsRom(self.romfs)
+        self.assertEqual(fs.statvfs(""), (1, 0, 289, 0, 0, 0, 0, 0, 0, 32767))
+
+    def test_open(self):
+        fs = vfs.VfsRom(self.romfs)
+
+        with fs.open("/test.txt", "") as f:
+            self.assertEqual(f.read(), "contents")
+        with fs.open("/test.txt", "rt") as f:
+            self.assertEqual(f.read(), "contents")
+        with fs.open("/test.txt", "rb") as f:
+            self.assertEqual(f.read(), b"contents")
+
+        with self.assertRaises(OSError) as ctx:
+            fs.open("/file-does-not-exist", "")
+        self.assertEqual(ctx.exception.errno, errno.ENOENT)
+
+        with self.assertRaises(OSError) as ctx:
+            fs.open("/dir", "rb")
+        self.assertEqual(ctx.exception.errno, errno.EISDIR)
+
+        with self.assertRaises(OSError):
+            fs.open("/test.txt", "w")
+        with self.assertRaises(OSError):
+            fs.open("/test.txt", "a")
+        with self.assertRaises(OSError):
+            fs.open("/test.txt", "+")
+
+    def test_file_seek(self):
+        fs = vfs.VfsRom(self.romfs)
+        with fs.open("/test.txt", "") as f:
+            self.assertEqual(f.seek(0, SEEK_SET), 0)
+            self.assertEqual(f.seek(3, SEEK_SET), 3)
+            self.assertEqual(f.read(), "tents")
+            self.assertEqual(f.seek(0, SEEK_SET), 0)
+            self.assertEqual(f.seek(100, SEEK_CUR), 8)
+            self.assertEqual(f.seek(-1, SEEK_END), 7)
+            self.assertEqual(f.read(), "s")
+            self.assertEqual(f.seek(1, SEEK_END), 8)
+            with self.assertRaises(OSError):
+                f.seek(-1, SEEK_SET)
+            f.seek(0, SEEK_SET)
+            with self.assertRaises(OSError):
+                f.seek(-1, SEEK_CUR)
+            with self.assertRaises(OSError):
+                f.seek(-100, SEEK_END)
+
+    @unittest.skipIf(select is None, "no select module")
+    def test_file_ioctl_invalid(self):
+        fs = vfs.VfsRom(self.romfs)
+        with fs.open("/test.txt", "") as f:
+            p = select.poll()
+            p.register(f)
+            with self.assertRaises(OSError):
+                p.poll(0)
+
+    def test_memory_mapping(self):
+        fs = vfs.VfsRom(self.romfs)
+        with fs.open("/test.txt", "rb") as f:
+            addr = uctypes.addressof(f)
+            data = memoryview(f)
+            self.assertIn(addr, self.romfs_addr_range)
+            self.assertIn(addr + len(data), self.romfs_addr_range)
+            self.assertEqual(bytes(data), b"contents")
+
+
+class TestMounted(TestBase):
+    def setUp(self):
+        self.orig_sys_path = list(sys.path)
+        self.orig_cwd = os.getcwd()
+        vfs.mount(vfs.VfsRom(self.romfs), "/test_rom")
+
+    def tearDown(self):
+        vfs.umount("/test_rom")
+        os.chdir(self.orig_cwd)
+        sys.path = self.orig_sys_path
+
+    def test_listdir(self):
+        self.assertEqual(os.listdir("/test_rom"), self.romfs_listdir)
+        self.assertEqual(os.listdir("/test_rom/dir"), self.romfs_listdir_dir)
+        self.assertEqual(os.listdir(b"/test_rom"), self.romfs_listdir_bytes)
+
+    def test_chdir(self):
+        os.chdir("/test_rom")
+        self.assertEqual(os.listdir(), self.romfs_listdir)
+
+        os.chdir("/test_rom/")
+        self.assertEqual(os.listdir(), self.romfs_listdir)
+
+        # chdir within the romfs is not implemented.
+        with self.assertRaises(OSError):
+            os.chdir("/test_rom/dir")
+
+    def test_stat(self):
+        self.assertEqual(os.stat("/test_rom"), (IFDIR, 0, 0, 0, 0, 0, 289, 0, 0, 0))
+        self.assertEqual(os.stat("/test_rom/"), (IFDIR, 0, 0, 0, 0, 0, 289, 0, 0, 0))
+        self.assertEqual(os.stat("/test_rom/test.txt"), (IFREG, 0, 0, 0, 0, 0, 8, 0, 0, 0))
+        self.assertEqual(os.stat("/test_rom/dir"), (IFDIR, 0, 0, 0, 0, 0, 198, 0, 0, 0))
+        with self.assertRaises(OSError):
+            os.stat("/test_rom/does-not-exist")
+
+    def test_open(self):
+        with open("/test_rom/test.txt") as f:
+            self.assertEqual(f.read(), "contents")
+        with open("/test_rom/test.txt", "b") as f:
+            self.assertEqual(f.read(), b"contents")
+
+        with self.assertRaises(OSError) as ctx:
+            open("/test_rom/file-does-not-exist")
+        self.assertEqual(ctx.exception.errno, errno.ENOENT)
+
+        with self.assertRaises(OSError) as ctx:
+            open("/test_rom/dir")
+        self.assertEqual(ctx.exception.errno, errno.EISDIR)
+
+    def test_import_py(self):
+        sys.path.append("/test_rom/dir")
+        a = __import__("a")
+        b = __import__("b")
+        self.assertEqual(a.__file__, "/test_rom/dir/a.py")
+        self.assertEqual(a.x, 1)
+        self.assertEqual(b.__file__, "/test_rom/dir/b.py")
+        self.assertEqual(b.x, 2)
+
+    def test_import_mpy(self):
+        sys.path.append("/test_rom/dir")
+        test = __import__("test")
+        self.assertEqual(test.__file__, "/test_rom/dir/test.mpy")
+        self.assertEqual(test.str_obj, "this is a str object")
+        self.assertEqual(test.bytes_obj, b"this is a bytes object")
+        self.assertEqual(test.int_obj, 1234567890)
+        self.assertEqual(test.float_obj, 1.23)
+        self.assertIn(uctypes.addressof(test.str_obj), self.romfs_addr_range)
+        self.assertIn(uctypes.addressof(test.bytes_obj), self.romfs_addr_range)
+
+    def test_romfs_inner(self):
+        with open("/test_rom/fs.romfs", "rb") as f:
+            romfs_inner = vfs.VfsRom(memoryview(f))
+
+        vfs.mount(romfs_inner, "/test_rom2")
+
+        self.assertEqual(os.listdir("/test_rom2"), ["test_inner.txt", "c.py"])
+
+        sys.path.append("/test_rom2")
+        self.assertEqual(__import__("c").__file__, "/test_rom2/c.py")
+
+        with open("/test_rom2/test_inner.txt") as f:
+            self.assertEqual(f.read(), "contents_inner")
+
+        with open("/test_rom2/test_inner.txt", "rb") as f:
+            addr = uctypes.addressof(f)
+            data = memoryview(f)
+            self.assertIn(addr, self.romfs_addr_range)
+            self.assertIn(addr + len(data), self.romfs_addr_range)
+
+        vfs.umount("/test_rom2")
+
+
+if __name__ == "__main__":
+    unittest.main()

From a5270c84cfdab6136d0dd4e63d41007f9a37b108 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 20 Aug 2024 07:21:55 +0200
Subject: [PATCH 1749/3129] tests/inlineasm: Make room for RV32IMC inline asm
 tests.

Thumb/Thumb2 tests are now into their own subdirectory, as
RV32IMC-specific tests will be added as part of the RV32 inline
assembler support.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/boards/SABRELITE.mk                |  2 +-
 ports/qemu/boards/VIRT_RV32.mk                |  2 +-
 .../{frozen_asm.py => frozen_asm_thumb.py}    |  0
 tests/inlineasm/{ => thumb}/asmargs.py        |  0
 tests/inlineasm/{ => thumb}/asmargs.py.exp    |  0
 tests/inlineasm/{ => thumb}/asmbcc.py         |  0
 tests/inlineasm/{ => thumb}/asmbcc.py.exp     |  0
 tests/inlineasm/{ => thumb}/asmbitops.py      |  0
 tests/inlineasm/{ => thumb}/asmbitops.py.exp  |  0
 tests/inlineasm/{ => thumb}/asmblbx.py        |  0
 tests/inlineasm/{ => thumb}/asmblbx.py.exp    |  0
 tests/inlineasm/{ => thumb}/asmconst.py       |  0
 tests/inlineasm/{ => thumb}/asmconst.py.exp   |  0
 tests/inlineasm/{ => thumb}/asmdata.py        |  0
 tests/inlineasm/{ => thumb}/asmdata.py.exp    |  0
 tests/inlineasm/{ => thumb}/asmdiv.py         |  0
 tests/inlineasm/{ => thumb}/asmdiv.py.exp     |  0
 tests/inlineasm/{ => thumb}/asmfpaddsub.py    |  0
 .../inlineasm/{ => thumb}/asmfpaddsub.py.exp  |  0
 tests/inlineasm/{ => thumb}/asmfpcmp.py       |  0
 tests/inlineasm/{ => thumb}/asmfpcmp.py.exp   |  0
 tests/inlineasm/{ => thumb}/asmfpldrstr.py    |  0
 .../inlineasm/{ => thumb}/asmfpldrstr.py.exp  |  0
 tests/inlineasm/{ => thumb}/asmfpmuldiv.py    |  0
 .../inlineasm/{ => thumb}/asmfpmuldiv.py.exp  |  0
 tests/inlineasm/{ => thumb}/asmfpsqrt.py      |  0
 tests/inlineasm/{ => thumb}/asmfpsqrt.py.exp  |  0
 tests/inlineasm/{ => thumb}/asmit.py          |  0
 tests/inlineasm/{ => thumb}/asmit.py.exp      |  0
 tests/inlineasm/{ => thumb}/asmpushpop.py     |  0
 tests/inlineasm/{ => thumb}/asmpushpop.py.exp |  0
 tests/inlineasm/{ => thumb}/asmrettype.py     |  0
 tests/inlineasm/{ => thumb}/asmrettype.py.exp |  0
 tests/inlineasm/{ => thumb}/asmshift.py       |  0
 tests/inlineasm/{ => thumb}/asmshift.py.exp   |  0
 tests/inlineasm/{ => thumb}/asmspecialregs.py |  0
 .../{ => thumb}/asmspecialregs.py.exp         |  0
 tests/inlineasm/{ => thumb}/asmsum.py         |  0
 tests/inlineasm/{ => thumb}/asmsum.py.exp     |  0
 tests/ports/qemu/asm_test.py                  |  2 +-
 tests/run-tests.py                            | 42 +++++++++----------
 41 files changed, 24 insertions(+), 24 deletions(-)
 rename ports/qemu/test-frzmpy/{frozen_asm.py => frozen_asm_thumb.py} (100%)
 rename tests/inlineasm/{ => thumb}/asmargs.py (100%)
 rename tests/inlineasm/{ => thumb}/asmargs.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmbcc.py (100%)
 rename tests/inlineasm/{ => thumb}/asmbcc.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmbitops.py (100%)
 rename tests/inlineasm/{ => thumb}/asmbitops.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmblbx.py (100%)
 rename tests/inlineasm/{ => thumb}/asmblbx.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmconst.py (100%)
 rename tests/inlineasm/{ => thumb}/asmconst.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmdata.py (100%)
 rename tests/inlineasm/{ => thumb}/asmdata.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmdiv.py (100%)
 rename tests/inlineasm/{ => thumb}/asmdiv.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmfpaddsub.py (100%)
 rename tests/inlineasm/{ => thumb}/asmfpaddsub.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmfpcmp.py (100%)
 rename tests/inlineasm/{ => thumb}/asmfpcmp.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmfpldrstr.py (100%)
 rename tests/inlineasm/{ => thumb}/asmfpldrstr.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmfpmuldiv.py (100%)
 rename tests/inlineasm/{ => thumb}/asmfpmuldiv.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmfpsqrt.py (100%)
 rename tests/inlineasm/{ => thumb}/asmfpsqrt.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmit.py (100%)
 rename tests/inlineasm/{ => thumb}/asmit.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmpushpop.py (100%)
 rename tests/inlineasm/{ => thumb}/asmpushpop.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmrettype.py (100%)
 rename tests/inlineasm/{ => thumb}/asmrettype.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmshift.py (100%)
 rename tests/inlineasm/{ => thumb}/asmshift.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmspecialregs.py (100%)
 rename tests/inlineasm/{ => thumb}/asmspecialregs.py.exp (100%)
 rename tests/inlineasm/{ => thumb}/asmsum.py (100%)
 rename tests/inlineasm/{ => thumb}/asmsum.py.exp (100%)

diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE.mk
index f1945c10fc2aa..839b3d6ac4fcf 100644
--- a/ports/qemu/boards/SABRELITE.mk
+++ b/ports/qemu/boards/SABRELITE.mk
@@ -16,4 +16,4 @@ SRC_BOARD_O = shared/runtime/gchelper_generic.o
 MPY_CROSS_FLAGS += -march=armv6
 
 # These tests don't work on Cortex-A9, so exclude them.
-RUN_TESTS_ARGS = --exclude '(asmdiv|asmspecialregs).py'
+RUN_TESTS_ARGS = --exclude 'inlineasm/thumb/(asmdiv|asmspecialregs).py'
diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32.mk
index 355a09c3d520e..e166165a1994f 100644
--- a/ports/qemu/boards/VIRT_RV32.mk
+++ b/ports/qemu/boards/VIRT_RV32.mk
@@ -11,6 +11,6 @@ SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
 MPY_CROSS_FLAGS += -march=rv32imc
 
 # These Thumb tests don't run on RV32, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm|qemu/asm_test'
+RUN_TESTS_ARGS = --exclude 'inlineasm/thumb|qemu/asm_test'
 
 RUN_NATMODTESTS_ARGS = --arch rv32imc
diff --git a/ports/qemu/test-frzmpy/frozen_asm.py b/ports/qemu/test-frzmpy/frozen_asm_thumb.py
similarity index 100%
rename from ports/qemu/test-frzmpy/frozen_asm.py
rename to ports/qemu/test-frzmpy/frozen_asm_thumb.py
diff --git a/tests/inlineasm/asmargs.py b/tests/inlineasm/thumb/asmargs.py
similarity index 100%
rename from tests/inlineasm/asmargs.py
rename to tests/inlineasm/thumb/asmargs.py
diff --git a/tests/inlineasm/asmargs.py.exp b/tests/inlineasm/thumb/asmargs.py.exp
similarity index 100%
rename from tests/inlineasm/asmargs.py.exp
rename to tests/inlineasm/thumb/asmargs.py.exp
diff --git a/tests/inlineasm/asmbcc.py b/tests/inlineasm/thumb/asmbcc.py
similarity index 100%
rename from tests/inlineasm/asmbcc.py
rename to tests/inlineasm/thumb/asmbcc.py
diff --git a/tests/inlineasm/asmbcc.py.exp b/tests/inlineasm/thumb/asmbcc.py.exp
similarity index 100%
rename from tests/inlineasm/asmbcc.py.exp
rename to tests/inlineasm/thumb/asmbcc.py.exp
diff --git a/tests/inlineasm/asmbitops.py b/tests/inlineasm/thumb/asmbitops.py
similarity index 100%
rename from tests/inlineasm/asmbitops.py
rename to tests/inlineasm/thumb/asmbitops.py
diff --git a/tests/inlineasm/asmbitops.py.exp b/tests/inlineasm/thumb/asmbitops.py.exp
similarity index 100%
rename from tests/inlineasm/asmbitops.py.exp
rename to tests/inlineasm/thumb/asmbitops.py.exp
diff --git a/tests/inlineasm/asmblbx.py b/tests/inlineasm/thumb/asmblbx.py
similarity index 100%
rename from tests/inlineasm/asmblbx.py
rename to tests/inlineasm/thumb/asmblbx.py
diff --git a/tests/inlineasm/asmblbx.py.exp b/tests/inlineasm/thumb/asmblbx.py.exp
similarity index 100%
rename from tests/inlineasm/asmblbx.py.exp
rename to tests/inlineasm/thumb/asmblbx.py.exp
diff --git a/tests/inlineasm/asmconst.py b/tests/inlineasm/thumb/asmconst.py
similarity index 100%
rename from tests/inlineasm/asmconst.py
rename to tests/inlineasm/thumb/asmconst.py
diff --git a/tests/inlineasm/asmconst.py.exp b/tests/inlineasm/thumb/asmconst.py.exp
similarity index 100%
rename from tests/inlineasm/asmconst.py.exp
rename to tests/inlineasm/thumb/asmconst.py.exp
diff --git a/tests/inlineasm/asmdata.py b/tests/inlineasm/thumb/asmdata.py
similarity index 100%
rename from tests/inlineasm/asmdata.py
rename to tests/inlineasm/thumb/asmdata.py
diff --git a/tests/inlineasm/asmdata.py.exp b/tests/inlineasm/thumb/asmdata.py.exp
similarity index 100%
rename from tests/inlineasm/asmdata.py.exp
rename to tests/inlineasm/thumb/asmdata.py.exp
diff --git a/tests/inlineasm/asmdiv.py b/tests/inlineasm/thumb/asmdiv.py
similarity index 100%
rename from tests/inlineasm/asmdiv.py
rename to tests/inlineasm/thumb/asmdiv.py
diff --git a/tests/inlineasm/asmdiv.py.exp b/tests/inlineasm/thumb/asmdiv.py.exp
similarity index 100%
rename from tests/inlineasm/asmdiv.py.exp
rename to tests/inlineasm/thumb/asmdiv.py.exp
diff --git a/tests/inlineasm/asmfpaddsub.py b/tests/inlineasm/thumb/asmfpaddsub.py
similarity index 100%
rename from tests/inlineasm/asmfpaddsub.py
rename to tests/inlineasm/thumb/asmfpaddsub.py
diff --git a/tests/inlineasm/asmfpaddsub.py.exp b/tests/inlineasm/thumb/asmfpaddsub.py.exp
similarity index 100%
rename from tests/inlineasm/asmfpaddsub.py.exp
rename to tests/inlineasm/thumb/asmfpaddsub.py.exp
diff --git a/tests/inlineasm/asmfpcmp.py b/tests/inlineasm/thumb/asmfpcmp.py
similarity index 100%
rename from tests/inlineasm/asmfpcmp.py
rename to tests/inlineasm/thumb/asmfpcmp.py
diff --git a/tests/inlineasm/asmfpcmp.py.exp b/tests/inlineasm/thumb/asmfpcmp.py.exp
similarity index 100%
rename from tests/inlineasm/asmfpcmp.py.exp
rename to tests/inlineasm/thumb/asmfpcmp.py.exp
diff --git a/tests/inlineasm/asmfpldrstr.py b/tests/inlineasm/thumb/asmfpldrstr.py
similarity index 100%
rename from tests/inlineasm/asmfpldrstr.py
rename to tests/inlineasm/thumb/asmfpldrstr.py
diff --git a/tests/inlineasm/asmfpldrstr.py.exp b/tests/inlineasm/thumb/asmfpldrstr.py.exp
similarity index 100%
rename from tests/inlineasm/asmfpldrstr.py.exp
rename to tests/inlineasm/thumb/asmfpldrstr.py.exp
diff --git a/tests/inlineasm/asmfpmuldiv.py b/tests/inlineasm/thumb/asmfpmuldiv.py
similarity index 100%
rename from tests/inlineasm/asmfpmuldiv.py
rename to tests/inlineasm/thumb/asmfpmuldiv.py
diff --git a/tests/inlineasm/asmfpmuldiv.py.exp b/tests/inlineasm/thumb/asmfpmuldiv.py.exp
similarity index 100%
rename from tests/inlineasm/asmfpmuldiv.py.exp
rename to tests/inlineasm/thumb/asmfpmuldiv.py.exp
diff --git a/tests/inlineasm/asmfpsqrt.py b/tests/inlineasm/thumb/asmfpsqrt.py
similarity index 100%
rename from tests/inlineasm/asmfpsqrt.py
rename to tests/inlineasm/thumb/asmfpsqrt.py
diff --git a/tests/inlineasm/asmfpsqrt.py.exp b/tests/inlineasm/thumb/asmfpsqrt.py.exp
similarity index 100%
rename from tests/inlineasm/asmfpsqrt.py.exp
rename to tests/inlineasm/thumb/asmfpsqrt.py.exp
diff --git a/tests/inlineasm/asmit.py b/tests/inlineasm/thumb/asmit.py
similarity index 100%
rename from tests/inlineasm/asmit.py
rename to tests/inlineasm/thumb/asmit.py
diff --git a/tests/inlineasm/asmit.py.exp b/tests/inlineasm/thumb/asmit.py.exp
similarity index 100%
rename from tests/inlineasm/asmit.py.exp
rename to tests/inlineasm/thumb/asmit.py.exp
diff --git a/tests/inlineasm/asmpushpop.py b/tests/inlineasm/thumb/asmpushpop.py
similarity index 100%
rename from tests/inlineasm/asmpushpop.py
rename to tests/inlineasm/thumb/asmpushpop.py
diff --git a/tests/inlineasm/asmpushpop.py.exp b/tests/inlineasm/thumb/asmpushpop.py.exp
similarity index 100%
rename from tests/inlineasm/asmpushpop.py.exp
rename to tests/inlineasm/thumb/asmpushpop.py.exp
diff --git a/tests/inlineasm/asmrettype.py b/tests/inlineasm/thumb/asmrettype.py
similarity index 100%
rename from tests/inlineasm/asmrettype.py
rename to tests/inlineasm/thumb/asmrettype.py
diff --git a/tests/inlineasm/asmrettype.py.exp b/tests/inlineasm/thumb/asmrettype.py.exp
similarity index 100%
rename from tests/inlineasm/asmrettype.py.exp
rename to tests/inlineasm/thumb/asmrettype.py.exp
diff --git a/tests/inlineasm/asmshift.py b/tests/inlineasm/thumb/asmshift.py
similarity index 100%
rename from tests/inlineasm/asmshift.py
rename to tests/inlineasm/thumb/asmshift.py
diff --git a/tests/inlineasm/asmshift.py.exp b/tests/inlineasm/thumb/asmshift.py.exp
similarity index 100%
rename from tests/inlineasm/asmshift.py.exp
rename to tests/inlineasm/thumb/asmshift.py.exp
diff --git a/tests/inlineasm/asmspecialregs.py b/tests/inlineasm/thumb/asmspecialregs.py
similarity index 100%
rename from tests/inlineasm/asmspecialregs.py
rename to tests/inlineasm/thumb/asmspecialregs.py
diff --git a/tests/inlineasm/asmspecialregs.py.exp b/tests/inlineasm/thumb/asmspecialregs.py.exp
similarity index 100%
rename from tests/inlineasm/asmspecialregs.py.exp
rename to tests/inlineasm/thumb/asmspecialregs.py.exp
diff --git a/tests/inlineasm/asmsum.py b/tests/inlineasm/thumb/asmsum.py
similarity index 100%
rename from tests/inlineasm/asmsum.py
rename to tests/inlineasm/thumb/asmsum.py
diff --git a/tests/inlineasm/asmsum.py.exp b/tests/inlineasm/thumb/asmsum.py.exp
similarity index 100%
rename from tests/inlineasm/asmsum.py.exp
rename to tests/inlineasm/thumb/asmsum.py.exp
diff --git a/tests/ports/qemu/asm_test.py b/tests/ports/qemu/asm_test.py
index 26c7efe4273d5..57238c62945b8 100644
--- a/tests/ports/qemu/asm_test.py
+++ b/tests/ports/qemu/asm_test.py
@@ -1,4 +1,4 @@
-import frozen_asm
+import frozen_asm_thumb as frozen_asm
 
 print(frozen_asm.asm_add(1, 2))
 print(frozen_asm.asm_add1(3))
diff --git a/tests/run-tests.py b/tests/run-tests.py
index a609a1fcbbebd..f00510f2da2d7 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -138,11 +138,11 @@ def open(self, path, mode):
     ),
     "qemu": (
         # Skip tests that require Cortex-M4.
-        "inlineasm/asmfpaddsub.py",
-        "inlineasm/asmfpcmp.py",
-        "inlineasm/asmfpldrstr.py",
-        "inlineasm/asmfpmuldiv.py",
-        "inlineasm/asmfpsqrt.py",
+        "inlineasm/thumb/asmfpaddsub.py",
+        "inlineasm/thumb/asmfpcmp.py",
+        "inlineasm/thumb/asmfpldrstr.py",
+        "inlineasm/thumb/asmfpmuldiv.py",
+        "inlineasm/thumb/asmfpsqrt.py",
     ),
     "webassembly": (
         "basics/string_format_modulo.py",  # can't print nulls to stdout
@@ -664,17 +664,17 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         # Check if @micropython.asm_thumb supports Thumb2 instructions, and skip such tests if it doesn't
         output = run_feature_check(pyb, args, "inlineasm_thumb2.py")
         if output != b"thumb2\n":
-            skip_tests.add("inlineasm/asmbcc.py")
-            skip_tests.add("inlineasm/asmbitops.py")
-            skip_tests.add("inlineasm/asmconst.py")
-            skip_tests.add("inlineasm/asmdiv.py")
-            skip_tests.add("inlineasm/asmfpaddsub.py")
-            skip_tests.add("inlineasm/asmfpcmp.py")
-            skip_tests.add("inlineasm/asmfpldrstr.py")
-            skip_tests.add("inlineasm/asmfpmuldiv.py")
-            skip_tests.add("inlineasm/asmfpsqrt.py")
-            skip_tests.add("inlineasm/asmit.py")
-            skip_tests.add("inlineasm/asmspecialregs.py")
+            skip_tests.add("inlineasm/thumb/asmbcc.py")
+            skip_tests.add("inlineasm/thumb/asmbitops.py")
+            skip_tests.add("inlineasm/thumb/asmconst.py")
+            skip_tests.add("inlineasm/thumb/asmdiv.py")
+            skip_tests.add("inlineasm/thumb/asmfpaddsub.py")
+            skip_tests.add("inlineasm/thumb/asmfpcmp.py")
+            skip_tests.add("inlineasm/thumb/asmfpldrstr.py")
+            skip_tests.add("inlineasm/thumb/asmfpmuldiv.py")
+            skip_tests.add("inlineasm/thumb/asmfpsqrt.py")
+            skip_tests.add("inlineasm/thumb/asmit.py")
+            skip_tests.add("inlineasm/thumb/asmspecialregs.py")
 
         # Check if emacs repl is supported, and skip such tests if it's not
         t = run_feature_check(pyb, args, "repl_emacs_check.py")
@@ -1215,15 +1215,15 @@ def main():
             )
             if args.platform == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "inlineasm", "ports/stm32")
+                test_dirs += ("float", "stress", "inlineasm/thumb", "ports/stm32")
             elif args.platform == "mimxrt":
-                test_dirs += ("float", "stress", "inlineasm")
+                test_dirs += ("float", "stress", "inlineasm/thumb")
             elif args.platform == "renesas-ra":
-                test_dirs += ("float", "inlineasm", "ports/renesas-ra")
+                test_dirs += ("float", "inlineasm/thumb", "ports/renesas-ra")
             elif args.platform == "rp2":
                 test_dirs += ("float", "stress", "thread", "ports/rp2")
                 if "arm" in args.mpy_cross_flags:
-                    test_dirs += ("inlineasm",)
+                    test_dirs += ("inlineasm/thumb",)
             elif args.platform == "esp32":
                 test_dirs += ("float", "stress", "thread")
             elif args.platform in ("esp8266", "minimal", "samd", "nrf"):
@@ -1245,7 +1245,7 @@ def main():
             elif args.platform == "qemu":
                 test_dirs += (
                     "float",
-                    "inlineasm",
+                    "inlineasm/thumb",
                     "ports/qemu",
                 )
             elif args.platform == "webassembly":

From 3044233ea3726e9d8727d8f6a76f32c48e6fae5e Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 22 Aug 2024 00:48:55 +0200
Subject: [PATCH 1750/3129] py/misc: Add a popcount(uint32_t) implementation.

This makes the existing popcount(uint32_t) implementation found in the
RV32 emitter available to the rest of the codebase.  This version of
popcount will use intrinsic or builtin implementations if they are
available, falling back to a generic implementation if that is not the
case.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 24 ++----------------------
 py/misc.h    | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index 3f3395842efb9..6aa3ec16541f0 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include "py/emit.h"
+#include "py/misc.h"
 #include "py/mpconfig.h"
 
 // wrapper around everything in this file
@@ -43,27 +44,6 @@
 #define DEBUG_printf(...) (void)0
 #endif
 
-#ifndef MP_POPCOUNT
-#ifdef _MSC_VER
-#include <intrin.h>
-#define MP_POPCOUNT __popcnt
-#else
-#if defined __has_builtin
-#if __has_builtin(__builtin_popcount)
-#define MP_POPCOUNT __builtin_popcount
-#endif
-#else
-static uint32_t fallback_popcount(uint32_t value) {
-    value = value - ((value >> 1) & 0x55555555);
-    value = (value & 0x33333333) + ((value >> 2) & 0x33333333);
-    value = (value + (value >> 4)) & 0x0F0F0F0F;
-    return value * 0x01010101;
-}
-#define MP_POPCOUNT fallback_popcount
-#endif
-#endif
-#endif
-
 #define INTERNAL_TEMPORARY ASM_RV32_REG_S0
 #define AVAILABLE_REGISTERS_COUNT 32
 
@@ -249,7 +229,7 @@ static void adjust_stack(asm_rv32_t *state, mp_int_t stack_size) {
 // stack to hold all the tainted registers and an arbitrary amount of space
 // for locals.
 static void emit_function_prologue(asm_rv32_t *state, mp_uint_t registers) {
-    mp_uint_t registers_count = MP_POPCOUNT(registers);
+    mp_uint_t registers_count = mp_popcount(registers);
     state->stack_size = (registers_count + state->locals_count) * sizeof(uint32_t);
     mp_uint_t old_saved_registers_mask = state->saved_registers_mask;
     // Move stack pointer up.
diff --git a/py/misc.h b/py/misc.h
index 2629d0c46cc53..e05fbe61a9d6d 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -370,12 +370,29 @@ static inline uint32_t mp_ctz(uint32_t x) {
 static inline bool mp_check(bool value) {
     return value;
 }
+
+static inline uint32_t mp_popcount(uint32_t x) {
+    return __popcnt(x);
+}
 #else
 #define mp_clz(x) __builtin_clz(x)
 #define mp_clzl(x) __builtin_clzl(x)
 #define mp_clzll(x) __builtin_clzll(x)
 #define mp_ctz(x) __builtin_ctz(x)
 #define mp_check(x) (x)
+#if defined __has_builtin
+#if __has_builtin(__builtin_popcount)
+#define mp_popcount(x) __builtin_popcount(x)
+#endif
+#endif
+#if !defined(mp_popcount)
+static inline uint32_t mp_popcount(uint32_t x) {
+    x = x - ((x >> 1) & 0x55555555);
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0F0F0F0F;
+    return x * 0x01010101;
+}
+#endif
 #endif
 
 // mp_int_t can be larger than long, i.e. Windows 64-bit, nan-box variants

From 268acb714dd79fa5eeeb82c1fca022bc4ea126b7 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 25 Aug 2024 16:28:35 +0200
Subject: [PATCH 1751/3129] py/emitinlinerv32: Add inline assembler support for
 RV32.

This commit adds support for writing inline assembler functions when
targeting a RV32IMC processor.

Given that this takes up a bit of rodata space due to its large
instruction decoding table and its extensive error messages, it is
enabled by default only on offline targets such as mpy-cross and the
qemu port.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 mpy-cross/mpconfigport.h                  |   1 +
 ports/qemu/Makefile                       |   4 +-
 ports/qemu/boards/MICROBIT.mk             |   3 +
 ports/qemu/boards/MPS2_AN385.mk           |   3 +
 ports/qemu/boards/NETDUINO2.mk            |   3 +
 ports/qemu/boards/SABRELITE.mk            |   2 +-
 ports/qemu/boards/VIRT_RV32.mk            |   2 +-
 ports/qemu/mpconfigport.h                 |   1 +
 ports/qemu/test-frzmpy/frozen_asm_rv32.py |  31 +
 py/asmrv32.c                              |  34 +-
 py/asmrv32.h                              | 302 +++++++-
 py/compile.c                              |   6 +
 py/emit.h                                 |   3 +
 py/emitinlinerv32.c                       | 818 ++++++++++++++++++++++
 py/mpconfig.h                             |   7 +-
 py/py.cmake                               |   1 +
 py/py.mk                                  |   1 +
 tests/inlineasm/rv32/asmargs.py           |  44 ++
 tests/inlineasm/rv32/asmargs.py.exp       |   5 +
 tests/inlineasm/rv32/asmarith.py          |  79 +++
 tests/inlineasm/rv32/asmarith.py.exp      |  14 +
 tests/inlineasm/rv32/asmbranch.py         | 161 +++++
 tests/inlineasm/rv32/asmbranch.py.exp     |  32 +
 tests/inlineasm/rv32/asmconst.py          |  49 ++
 tests/inlineasm/rv32/asmconst.py.exp      |   5 +
 tests/inlineasm/rv32/asmcsr.py            |  65 ++
 tests/inlineasm/rv32/asmcsr.py.exp        |   2 +
 tests/inlineasm/rv32/asmdata.py           |  33 +
 tests/inlineasm/rv32/asmdata.py.exp       |  10 +
 tests/inlineasm/rv32/asmdivmul.py         |  63 ++
 tests/inlineasm/rv32/asmdivmul.py.exp     |  18 +
 tests/inlineasm/rv32/asmjump.py           | 115 +++
 tests/inlineasm/rv32/asmjump.py.exp       |   6 +
 tests/inlineasm/rv32/asmloadstore.py      |  86 +++
 tests/inlineasm/rv32/asmloadstore.py.exp  |   3 +
 tests/inlineasm/rv32/asmrettype.py        |  33 +
 tests/inlineasm/rv32/asmrettype.py.exp    |   4 +
 tests/inlineasm/rv32/asmsanity.py         | 204 ++++++
 tests/inlineasm/rv32/asmsanity.py.exp     | 162 +++++
 tests/inlineasm/rv32/asmshift.py          | 121 ++++
 tests/inlineasm/rv32/asmshift.py.exp      |  15 +
 tests/inlineasm/rv32/asmstack.py          |  65 ++
 tests/inlineasm/rv32/asmstack.py.exp      |   3 +
 tests/inlineasm/rv32/asmsum.py            |  59 ++
 tests/inlineasm/rv32/asmsum.py.exp        |   3 +
 tests/ports/qemu/asm_test.py              |   8 +-
 tests/run-tests.py                        |   5 +-
 47 files changed, 2649 insertions(+), 45 deletions(-)
 create mode 100644 ports/qemu/test-frzmpy/frozen_asm_rv32.py
 create mode 100644 py/emitinlinerv32.c
 create mode 100644 tests/inlineasm/rv32/asmargs.py
 create mode 100644 tests/inlineasm/rv32/asmargs.py.exp
 create mode 100644 tests/inlineasm/rv32/asmarith.py
 create mode 100644 tests/inlineasm/rv32/asmarith.py.exp
 create mode 100644 tests/inlineasm/rv32/asmbranch.py
 create mode 100644 tests/inlineasm/rv32/asmbranch.py.exp
 create mode 100644 tests/inlineasm/rv32/asmconst.py
 create mode 100644 tests/inlineasm/rv32/asmconst.py.exp
 create mode 100644 tests/inlineasm/rv32/asmcsr.py
 create mode 100644 tests/inlineasm/rv32/asmcsr.py.exp
 create mode 100644 tests/inlineasm/rv32/asmdata.py
 create mode 100644 tests/inlineasm/rv32/asmdata.py.exp
 create mode 100644 tests/inlineasm/rv32/asmdivmul.py
 create mode 100644 tests/inlineasm/rv32/asmdivmul.py.exp
 create mode 100644 tests/inlineasm/rv32/asmjump.py
 create mode 100644 tests/inlineasm/rv32/asmjump.py.exp
 create mode 100644 tests/inlineasm/rv32/asmloadstore.py
 create mode 100644 tests/inlineasm/rv32/asmloadstore.py.exp
 create mode 100644 tests/inlineasm/rv32/asmrettype.py
 create mode 100644 tests/inlineasm/rv32/asmrettype.py.exp
 create mode 100644 tests/inlineasm/rv32/asmsanity.py
 create mode 100644 tests/inlineasm/rv32/asmsanity.py.exp
 create mode 100644 tests/inlineasm/rv32/asmshift.py
 create mode 100644 tests/inlineasm/rv32/asmshift.py.exp
 create mode 100644 tests/inlineasm/rv32/asmstack.py
 create mode 100644 tests/inlineasm/rv32/asmstack.py.exp
 create mode 100644 tests/inlineasm/rv32/asmsum.py
 create mode 100644 tests/inlineasm/rv32/asmsum.py.exp

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 8723472eb710c..d3805f0307356 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -47,6 +47,7 @@
 #define MICROPY_EMIT_INLINE_XTENSA  (1)
 #define MICROPY_EMIT_XTENSAWIN      (1)
 #define MICROPY_EMIT_RV32           (1)
+#define MICROPY_EMIT_INLINE_RV32    (1)
 #define MICROPY_EMIT_NATIVE_DEBUG   (1)
 #define MICROPY_EMIT_NATIVE_DEBUG_PRINTER (&mp_stdout_print)
 
diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index b85ff2896a16e..ea0bef814866d 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -19,10 +19,10 @@ QSTR_DEFS = qstrdefsport.h
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 ifeq ($(QEMU_ARCH),arm)
-FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy')"
+FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_thumb.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 ifeq ($(QEMU_ARCH),riscv32)
-FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
+FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 
 # include py core make definitions
diff --git a/ports/qemu/boards/MICROBIT.mk b/ports/qemu/boards/MICROBIT.mk
index 02eb0576c3438..d6cfd7e2243d8 100644
--- a/ports/qemu/boards/MICROBIT.mk
+++ b/ports/qemu/boards/MICROBIT.mk
@@ -11,3 +11,6 @@ LDSCRIPT = mcu/arm/nrf51.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb1.o
 
 MPY_CROSS_FLAGS += -march=armv7m
+
+# These RV32 tests don't run on Thumb, so exclude them.
+RUN_TESTS_ARGS = --exclude 'inlineasm/rv32'
diff --git a/ports/qemu/boards/MPS2_AN385.mk b/ports/qemu/boards/MPS2_AN385.mk
index 182d076eb35d4..8d5c27df57c23 100644
--- a/ports/qemu/boards/MPS2_AN385.mk
+++ b/ports/qemu/boards/MPS2_AN385.mk
@@ -10,3 +10,6 @@ LDSCRIPT = mcu/arm/mps2.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 
 MPY_CROSS_FLAGS += -march=armv7m
+
+# These RV32 tests don't run on Thumb, so exclude them.
+RUN_TESTS_ARGS = --exclude 'inlineasm/rv32'
diff --git a/ports/qemu/boards/NETDUINO2.mk b/ports/qemu/boards/NETDUINO2.mk
index ffa781f339977..f88ea32e7e58f 100644
--- a/ports/qemu/boards/NETDUINO2.mk
+++ b/ports/qemu/boards/NETDUINO2.mk
@@ -10,3 +10,6 @@ LDSCRIPT = mcu/arm/stm32.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 
 MPY_CROSS_FLAGS += -march=armv7m
+
+# These RV32 tests don't run on Thumb, so exclude them.
+RUN_TESTS_ARGS = --exclude 'inlineasm/rv32'
diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE.mk
index 839b3d6ac4fcf..d3f4e14d48022 100644
--- a/ports/qemu/boards/SABRELITE.mk
+++ b/ports/qemu/boards/SABRELITE.mk
@@ -16,4 +16,4 @@ SRC_BOARD_O = shared/runtime/gchelper_generic.o
 MPY_CROSS_FLAGS += -march=armv6
 
 # These tests don't work on Cortex-A9, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/thumb/(asmdiv|asmspecialregs).py'
+RUN_TESTS_ARGS = --exclude 'inlineasm/rv32|inlineasm/thumb/(asmdiv|asmspecialregs).py'
diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32.mk
index e166165a1994f..80dd5d56fdc58 100644
--- a/ports/qemu/boards/VIRT_RV32.mk
+++ b/ports/qemu/boards/VIRT_RV32.mk
@@ -11,6 +11,6 @@ SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
 MPY_CROSS_FLAGS += -march=rv32imc
 
 # These Thumb tests don't run on RV32, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/thumb|qemu/asm_test'
+RUN_TESTS_ARGS = --exclude 'inlineasm/thumb'
 
 RUN_NATMODTESTS_ARGS = --arch rv32imc
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index d3e3c0a3f37ac..8f55d284f93da 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -39,6 +39,7 @@
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 #elif defined(__riscv)
 #define MICROPY_EMIT_RV32           (1)
+#define MICROPY_EMIT_INLINE_RV32    (1)
 #endif
 
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
diff --git a/ports/qemu/test-frzmpy/frozen_asm_rv32.py b/ports/qemu/test-frzmpy/frozen_asm_rv32.py
new file mode 100644
index 0000000000000..ce1bd428c0376
--- /dev/null
+++ b/ports/qemu/test-frzmpy/frozen_asm_rv32.py
@@ -0,0 +1,31 @@
+# Test freezing inline-asm code.
+
+# ruff: noqa: F821 - @asm_rv32 decorator adds names to function scope
+
+import micropython
+
+
+@micropython.asm_rv32
+def asm_add(a0, a1):
+    add(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def asm_add1(a0) -> object:
+    slli(a0, a0, 1)
+    addi(a0, a0, 3)
+
+
+@micropython.asm_rv32
+def asm_cast_bool(a0) -> bool:
+    pass
+
+
+@micropython.asm_rv32
+def asm_shift_int(a0) -> int:
+    slli(a0, a0, 29)
+
+
+@micropython.asm_rv32
+def asm_shift_uint(a0) -> uint:
+    slli(a0, a0, 29)
diff --git a/py/asmrv32.c b/py/asmrv32.c
index 6aa3ec16541f0..c24d05a1384d4 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -45,12 +45,6 @@
 #endif
 
 #define INTERNAL_TEMPORARY ASM_RV32_REG_S0
-#define AVAILABLE_REGISTERS_COUNT 32
-
-#define IS_IN_C_REGISTER_WINDOW(register_number) \
-    (((register_number) >= ASM_RV32_REG_X8) && ((register_number) <= ASM_RV32_REG_X15))
-#define MAP_IN_C_REGISTER_WINDOW(register_number) \
-    ((register_number) - ASM_RV32_REG_X8)
 
 #define FIT_UNSIGNED(value, bits) (((value) & ~((1U << (bits)) - 1)) == 0)
 #define FIT_SIGNED(value, bits) \
@@ -106,7 +100,6 @@ static void split_immediate(mp_int_t immediate, mp_uint_t *upper, mp_uint_t *low
     // Turn the lower half from unsigned to signed.
     if ((*lower & 0x800) != 0) {
         *upper += 0x1000;
-        *lower -= 0x1000;
     }
 }
 
@@ -180,7 +173,7 @@ void asm_rv32_emit_optimised_load_immediate(asm_rv32_t *state, mp_uint_t rd, mp_
 
 static void emit_registers_store(asm_rv32_t *state, mp_uint_t registers_mask) {
     mp_uint_t offset = 0;
-    for (mp_uint_t register_index = 0; register_index < AVAILABLE_REGISTERS_COUNT; register_index++) {
+    for (mp_uint_t register_index = 0; register_index < RV32_AVAILABLE_REGISTERS_COUNT; register_index++) {
         if (registers_mask & (1U << register_index)) {
             assert(FIT_UNSIGNED(offset >> 2, 6) && "Registers save stack offset out of range.");
             // c.swsp register, offset
@@ -192,7 +185,7 @@ static void emit_registers_store(asm_rv32_t *state, mp_uint_t registers_mask) {
 
 static void emit_registers_load(asm_rv32_t *state, mp_uint_t registers_mask) {
     mp_uint_t offset = 0;
-    for (mp_uint_t register_index = 0; register_index < AVAILABLE_REGISTERS_COUNT; register_index++) {
+    for (mp_uint_t register_index = 0; register_index < RV32_AVAILABLE_REGISTERS_COUNT; register_index++) {
         if (registers_mask & (1U << register_index)) {
             assert(FIT_UNSIGNED(offset >> 2, 6) && "Registers load stack offset out of range.");
             // c.lwsp register, offset
@@ -262,7 +255,7 @@ static bool calculate_displacement_for_label(asm_rv32_t *state, mp_uint_t label,
 
 void asm_rv32_entry(asm_rv32_t *state, mp_uint_t locals) {
     state->saved_registers_mask |= (1U << REG_FUN_TABLE) | (1U << REG_LOCAL_1) | \
-        (1U << REG_LOCAL_2) | (1U << REG_LOCAL_3) | (1U << INTERNAL_TEMPORARY);
+        (1U << REG_LOCAL_2) | (1U << REG_LOCAL_3);
     state->locals_count = locals;
     emit_function_prologue(state, state->saved_registers_mask);
 }
@@ -281,10 +274,11 @@ void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index) {
     mp_uint_t offset = index * ASM_WORD_SIZE;
     state->saved_registers_mask |= (1U << ASM_RV32_REG_RA);
 
-    if (IS_IN_C_REGISTER_WINDOW(REG_FUN_TABLE) && IS_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY) && FIT_UNSIGNED(offset, 6)) {
+    if (RV32_IS_IN_C_REGISTER_WINDOW(REG_FUN_TABLE) && RV32_IS_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY) && FIT_UNSIGNED(offset, 6)) {
+        state->saved_registers_mask |= (1U << INTERNAL_TEMPORARY);
         // c.lw   temporary, offset(fun_table)
         // c.jalr temporary
-        asm_rv32_opcode_clw(state, MAP_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY), MAP_IN_C_REGISTER_WINDOW(REG_FUN_TABLE), offset);
+        asm_rv32_opcode_clw(state, RV32_MAP_IN_C_REGISTER_WINDOW(INTERNAL_TEMPORARY), RV32_MAP_IN_C_REGISTER_WINDOW(REG_FUN_TABLE), offset);
         asm_rv32_opcode_cjalr(state, INTERNAL_TEMPORARY);
         return;
     }
@@ -341,9 +335,9 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
     ptrdiff_t displacement = 0;
     bool can_emit_short_jump = calculate_displacement_for_label(state, label, &displacement);
 
-    if (can_emit_short_jump && FIT_SIGNED(displacement, 8) && IS_IN_C_REGISTER_WINDOW(rs)) {
+    if (can_emit_short_jump && FIT_SIGNED(displacement, 8) && RV32_IS_IN_C_REGISTER_WINDOW(rs)) {
         // c.bnez rs', displacement
-        asm_rv32_opcode_cbnez(state, MAP_IN_C_REGISTER_WINDOW(rs), displacement);
+        asm_rv32_opcode_cbnez(state, RV32_MAP_IN_C_REGISTER_WINDOW(rs), displacement);
         return;
     }
 
@@ -364,8 +358,8 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
     //    jalr   zero, temporary, LO(displacement) ; PC + 8
     //    ...                                      ; PC + 12
 
-    if (can_emit_short_jump && IS_IN_C_REGISTER_WINDOW(rs)) {
-        asm_rv32_opcode_cbeqz(state, MAP_IN_C_REGISTER_WINDOW(rs), 10);
+    if (can_emit_short_jump && RV32_IS_IN_C_REGISTER_WINDOW(rs)) {
+        asm_rv32_opcode_cbeqz(state, RV32_MAP_IN_C_REGISTER_WINDOW(rs), 10);
         // Compensate for the C.BEQZ opcode.
         displacement -= ASM_HALFWORD_SIZE;
     } else {
@@ -438,9 +432,9 @@ void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t loca
 void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local) {
     mp_uint_t offset = state->locals_stack_offset + (local * ASM_WORD_SIZE);
 
-    if (FIT_UNSIGNED(offset, 10) && offset != 0 && IS_IN_C_REGISTER_WINDOW(rd)) {
+    if (FIT_UNSIGNED(offset, 10) && offset != 0 && RV32_IS_IN_C_REGISTER_WINDOW(rd)) {
         // c.addi4spn rd', offset
-        asm_rv32_opcode_caddi4spn(state, MAP_IN_C_REGISTER_WINDOW(rd), offset);
+        asm_rv32_opcode_caddi4spn(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), offset);
         return;
     }
 
@@ -459,9 +453,9 @@ void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t
 void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     mp_int_t scaled_offset = offset * sizeof(ASM_WORD_SIZE);
 
-    if (scaled_offset >= 0 && IS_IN_C_REGISTER_WINDOW(rd) && IS_IN_C_REGISTER_WINDOW(rs) && FIT_UNSIGNED(scaled_offset, 6)) {
+    if (scaled_offset >= 0 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs) && FIT_UNSIGNED(scaled_offset, 6)) {
         // c.lw rd', offset(rs')
-        asm_rv32_opcode_clw(state, MAP_IN_C_REGISTER_WINDOW(rd), MAP_IN_C_REGISTER_WINDOW(rs), scaled_offset);
+        asm_rv32_opcode_clw(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), RV32_MAP_IN_C_REGISTER_WINDOW(rs), scaled_offset);
         return;
     }
 
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 775cf1ffc9630..584e3ffd22436 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -74,9 +74,6 @@
 #define ASM_RV32_REG_SP (ASM_RV32_REG_X2)
 #define ASM_RV32_REG_GP (ASM_RV32_REG_X3)
 #define ASM_RV32_REG_TP (ASM_RV32_REG_X4)
-#define ASM_RV32_REG_T0 (ASM_RV32_REG_X5)
-#define ASM_RV32_REG_T1 (ASM_RV32_REG_X6)
-#define ASM_RV32_REG_T2 (ASM_RV32_REG_X7)
 #define ASM_RV32_REG_A0 (ASM_RV32_REG_X10)
 #define ASM_RV32_REG_A1 (ASM_RV32_REG_X11)
 #define ASM_RV32_REG_A2 (ASM_RV32_REG_X12)
@@ -85,6 +82,9 @@
 #define ASM_RV32_REG_A5 (ASM_RV32_REG_X15)
 #define ASM_RV32_REG_A6 (ASM_RV32_REG_X16)
 #define ASM_RV32_REG_A7 (ASM_RV32_REG_X17)
+#define ASM_RV32_REG_T0 (ASM_RV32_REG_X5)
+#define ASM_RV32_REG_T1 (ASM_RV32_REG_X6)
+#define ASM_RV32_REG_T2 (ASM_RV32_REG_X7)
 #define ASM_RV32_REG_T3 (ASM_RV32_REG_X28)
 #define ASM_RV32_REG_T4 (ASM_RV32_REG_X29)
 #define ASM_RV32_REG_T5 (ASM_RV32_REG_X30)
@@ -103,6 +103,12 @@
 #define ASM_RV32_REG_S10 (ASM_RV32_REG_X26)
 #define ASM_RV32_REG_S11 (ASM_RV32_REG_X27)
 
+#define RV32_AVAILABLE_REGISTERS_COUNT 32
+#define RV32_MAP_IN_C_REGISTER_WINDOW(register_number) \
+    ((register_number) - ASM_RV32_REG_X8)
+#define RV32_IS_IN_C_REGISTER_WINDOW(register_number) \
+    (((register_number) >= ASM_RV32_REG_X8) && ((register_number) <= ASM_RV32_REG_X15))
+
 typedef struct _asm_rv32_t {
     // Opaque emitter state.
     mp_asm_base_t base;
@@ -127,6 +133,10 @@ void asm_rv32_end_pass(asm_rv32_t *state);
     ((imm & 0x1E) << 7) | ((rs1 & 0x1F) << 15) | ((rs2 & 0x1F) << 20) | \
     ((imm & 0x7E0) << 20) | ((imm & 0x1000) << 19))
 
+#define RV32_ENCODE_TYPE_CSRI(op, ft3, rd, csr, imm) \
+    ((op & 0x7F) | ((rd & 0x1F) << 7) | ((ft3 & 0x07) << 12) | \
+    ((csr & 0xFFF) << 20) | ((imm & 0x1F) << 15))
+
 #define RV32_ENCODE_TYPE_I(op, ft3, rd, rs, imm) \
     ((op & 0x7F) | ((rd & 0x1F) << 7) | ((ft3 & 0x07) << 12) | \
     ((rs & 0x1F) << 15) | ((imm & 0xFFF) << 20))
@@ -143,13 +153,16 @@ void asm_rv32_end_pass(asm_rv32_t *state);
     ((op & 0x7F) | ((imm & 0x1F) << 7) | ((ft3 & 0x07) << 12) | \
     ((rs1 & 0x1F) << 15) | ((rs2 & 0x1F) << 20) | ((imm & 0xFE0) << 20))
 
+#define RV32_ENCODE_TYPE_CA(op, ft6, ft2, rd, rs) \
+    ((op & 0x03) | ((ft6 & 0x3F) << 10) | ((ft2 & 0x03) << 5) | \
+    ((rd & 0x03) << 7) | ((rs & 0x03) << 2))
+
 #define RV32_ENCODE_TYPE_U(op, rd, imm) \
     ((op & 0x7F) | ((rd & 0x1F) << 7) | (imm & 0xFFFFF000))
 
 #define RV32_ENCODE_TYPE_CB(op, ft3, rs, imm) \
     ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rs & 0x07) << 7) | \
-    (((imm) & 0x100) << 4) | (((imm) & 0xC0) >> 1) | (((imm) & 0x20) >> 3) | \
-    (((imm) & 0x18) << 7) | (((imm) & 0x06) << 2))
+    (((imm) & 0xE0) << 5) | (((imm) & 0x1F) << 2))
 
 #define RV32_ENCODE_TYPE_CI(op, ft3, rd, imm) \
     ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rd & 0x1F) << 7) | \
@@ -174,6 +187,11 @@ void asm_rv32_end_pass(asm_rv32_t *state);
 #define RV32_ENCODE_TYPE_CR(op, ft4, rs1, rs2) \
     ((op & 0x03) | ((rs2 & 0x1F) << 2) | ((rs1 & 0x1F) << 7) | ((ft4 & 0x0F) << 12))
 
+#define RV32_ENCODE_TYPE_CS(op, ft3, rd, rs, imm) \
+    ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rd & 0x07) << 2) | \
+    ((rs & 0x07) << 7) | ((imm & 0x40) >> 1) | ((imm & 0x38) << 7) | \
+    ((imm & 0x04) << 4))
+
 #define RV32_ENCODE_TYPE_CSS(op, ft3, rs, imm) \
     ((op & 0x03) | ((ft3 & 0x07) << 13) | ((rs & 0x1F) << 2) | ((imm) & 0x3F) << 7)
 
@@ -198,6 +216,12 @@ static inline void asm_rv32_opcode_and(asm_rv32_t *state, mp_uint_t rd, mp_uint_
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x07, 0x00, rd, rs1, rs2));
 }
 
+// ANDI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_andi(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 111 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x07, rd, rs, immediate));
+}
+
 // AUIPC RD, offset
 static inline void asm_rv32_opcode_auipc(asm_rv32_t *state, mp_uint_t rd, mp_int_t offset) {
     // U: .................... ..... 0010111
@@ -210,6 +234,30 @@ static inline void asm_rv32_opcode_beq(asm_rv32_t *state, mp_uint_t rs1, mp_uint
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0x63, 0x00, rs1, rs2, offset));
 }
 
+// BGE RS1, RS2, OFFSET
+static inline void asm_rv32_opcode_bge(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
+    // B: . ...... ..... ..... 101 .... . 1100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0x63, 0x05, rs1, rs2, offset));
+}
+
+// BGEU RS1, RS2, OFFSET
+static inline void asm_rv32_opcode_bgeu(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
+    // B: . ...... ..... ..... 111 .... . 1100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0x63, 0x07, rs1, rs2, offset));
+}
+
+// BLT RS1, RS2, OFFSET
+static inline void asm_rv32_opcode_blt(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
+    // B: . ...... ..... ..... 100 .... . 1100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0x63, 0x04, rs1, rs2, offset));
+}
+
+// BLTU RS1, RS2, OFFSET
+static inline void asm_rv32_opcode_bltu(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
+    // B: . ...... ..... ..... 110 .... . 1100011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_B(0x63, 0x06, rs1, rs2, offset));
+}
+
 // BNE RS1, RS2, OFFSET
 static inline void asm_rv32_opcode_bne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
     // B: . ...... ..... ..... 001 .... . 1100011
@@ -234,16 +282,39 @@ static inline void asm_rv32_opcode_caddi4spn(asm_rv32_t *state, mp_uint_t rd, mp
     asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CIW(0x00, 0x00, rd, immediate));
 }
 
+// C.AND RD', RS'
+static inline void asm_rv32_opcode_cand(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
+    // CA: 100011 ... 11 ... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CA(0x01, 0x23, 0x03, rd, rs));
+}
+
+// C.ANDI RD', IMMEDIATE
+static inline void asm_rv32_opcode_candi(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // CB: 100 . 10 ... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x04, rd,
+        (((immediate & 0x20) << 2) | (immediate & 0x1F) | 0x40)));
+}
+
 // C.BEQZ RS', IMMEDIATE
 static inline void asm_rv32_opcode_cbeqz(asm_rv32_t *state, mp_uint_t rs, mp_int_t offset) {
     // CB: 110 ... ... ..... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x06, rs, offset));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x06, rs,
+        (((offset & 0x100) >> 1) | ((offset & 0xC0) >> 3) | ((offset & 0x20) >> 5) |
+            ((offset & 0x18) << 2) | (offset & 0x06))));
 }
 
 // C.BNEZ RS', IMMEDIATE
 static inline void asm_rv32_opcode_cbnez(asm_rv32_t *state, mp_uint_t rs, mp_int_t offset) {
     // CB: 111 ... ... ..... 01
-    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x07, rs, offset));
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x07, rs,
+        (((offset & 0x100) >> 1) | ((offset & 0xC0) >> 3) | ((offset & 0x20) >> 5) |
+            ((offset & 0x18) << 2) | (offset & 0x06))));
+}
+
+// C.EBREAK
+static inline void asm_rv32_opcode_cebreak(asm_rv32_t *state) {
+    // CA: 100 1 00000 00000 10
+    asm_rv32_emit_halfword_opcode(state, 0x9002);
 }
 
 // C.J OFFSET
@@ -252,6 +323,12 @@ static inline void asm_rv32_opcode_cj(asm_rv32_t *state, mp_int_t offset) {
     asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CJ(0x01, 0x05, offset));
 }
 
+// C.JAL OFFSET
+static inline void asm_rv32_opcode_cjal(asm_rv32_t *state, mp_int_t offset) {
+    // CJ: 001 ........... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CJ(0x01, 0x01, offset));
+}
+
 // C.JALR RS
 static inline void asm_rv32_opcode_cjalr(asm_rv32_t *state, mp_uint_t rs) {
     // CR: 1001 ..... 00000 10
@@ -294,31 +371,159 @@ static inline void asm_rv32_opcode_cmv(asm_rv32_t *state, mp_uint_t rd, mp_uint_
     asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CR(0x02, 0x08, rd, rs));
 }
 
+// C.NOP
+static inline void asm_rv32_opcode_cnop(asm_rv32_t *state) {
+    // CI: 000 . 00000 ..... 01
+    asm_rv32_emit_halfword_opcode(state, 0x0001);
+}
+
+// C.OR RD', RS'
+static inline void asm_rv32_opcode_cor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
+    // CA: 100011 ... 10 ... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CA(0x01, 0x23, 0x02, rd, rs));
+}
+
+// C.SLLI RD, IMMEDIATE
+static inline void asm_rv32_opcode_cslli(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // CI: 000 . ..... ..... 10
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CI(0x02, 0x00, rd, immediate));
+}
+
+// C.SRAI RD, IMMEDIATE
+static inline void asm_rv32_opcode_csrai(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // CB: 100 . 01 ... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x04, rd,
+        (((immediate & 0x20) << 2) | (immediate & 0x1F) | 0x20)));
+}
+
+// C.SRLI RD, IMMEDIATE
+static inline void asm_rv32_opcode_csrli(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
+    // CB: 100 . 00 ... ..... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CB(0x01, 0x04, rd,
+        (((immediate & 0x20) << 2) | (immediate & 0x1F))));
+}
+
+// C.SUB RD', RS'
+static inline void asm_rv32_opcode_csub(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
+    // CA: 100011 ... 00 ... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CA(0x01, 0x23, 0x00, rd, rs));
+}
+
+// C.SW RS1', OFFSET(RS2')
+static inline void asm_rv32_opcode_csw(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_int_t offset) {
+    // CS: 110 ... ... .. ... 00
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CL(0x00, 0x06, rs1, rs2, offset));
+}
+
 // C.SWSP RS, OFFSET
 static inline void asm_rv32_opcode_cswsp(asm_rv32_t *state, mp_uint_t rs, mp_uint_t offset) {
     // CSS: 010 ...... ..... 10
     asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CSS(0x02, 0x06, rs, ((offset & 0xC0) >> 6) | (offset & 0x3C)));
 }
 
-// JALR RD, RS, offset
+// C.XOR RD', RS'
+static inline void asm_rv32_opcode_cxor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
+    // CA: 100011 ... 01 ... 01
+    asm_rv32_emit_halfword_opcode(state, RV32_ENCODE_TYPE_CA(0x01, 0x23, 0x01, rd, rs));
+}
+
+// CSRRC RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_csrrc(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 011 ..... 1110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x73, 0x03, rd, rs, immediate));
+}
+
+// CSRRS RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_csrrs(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 010 ..... 1110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x73, 0x02, rd, rs, immediate));
+}
+
+// CSRRW RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_csrrw(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 001 ..... 1110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x73, 0x01, rd, rs, immediate));
+}
+
+// CSRRCI RD, CSR, IMMEDIATE
+static inline void asm_rv32_opcode_csrrci(asm_rv32_t *state, mp_uint_t rd, mp_uint_t csr, mp_int_t immediate) {
+    // CSRI: ............ ..... 111 ..... 1110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_CSRI(0x73, 0x07, rd, csr, immediate));
+}
+
+// CSRRSI RD, CSR, IMMEDIATE
+static inline void asm_rv32_opcode_csrrsi(asm_rv32_t *state, mp_uint_t rd, mp_uint_t csr, mp_int_t immediate) {
+    // CSRI: ............ ..... 110 ..... 1110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_CSRI(0x73, 0x06, rd, csr, immediate));
+}
+
+// CSRRWI RD, CSR, IMMEDIATE
+static inline void asm_rv32_opcode_csrrwi(asm_rv32_t *state, mp_uint_t rd, mp_uint_t csr, mp_int_t immediate) {
+    // CSRI: ............ ..... 101 ..... 1110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_CSRI(0x73, 0x05, rd, csr, immediate));
+}
+
+// DIV RD, RS1, RS2
+static inline void asm_rv32_opcode_div(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 100 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x04, 0x01, rd, rs1, rs2));
+}
+
+// DIVU RD, RS1, RS2
+static inline void asm_rv32_opcode_divu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 101 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x05, 0x01, rd, rs1, rs2));
+}
+
+// EBREAK
+static inline void asm_rv32_opcode_ebreak(asm_rv32_t *state) {
+    // I: 000000000001 00000 000 00000 1110011
+    asm_rv32_emit_word_opcode(state, 0x100073);
+}
+
+// ECALL
+static inline void asm_rv32_opcode_ecall(asm_rv32_t *state) {
+    // I: 000000000000 00000 000 00000 1110011
+    asm_rv32_emit_word_opcode(state, 0x73);
+}
+
+// JAL RD, OFFSET
+static inline void asm_rv32_opcode_jal(asm_rv32_t *state, mp_uint_t rd, mp_int_t offset) {
+    // J: ......................... 1101111
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_J(0x6F, rd, offset));
+}
+
+// JALR RD, RS, OFFSET
 static inline void asm_rv32_opcode_jalr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // I: ............ ..... 000 ..... 1100111
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x67, 0x00, rd, rs, offset));
 }
 
+// LB RD, OFFSET(RS)
+static inline void asm_rv32_opcode_lb(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    // I: ............ ..... 000 ..... 0000011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, 0x00, rd, rs, offset));
+}
+
 // LBU RD, OFFSET(RS)
 static inline void asm_rv32_opcode_lbu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // I: ............ ..... 100 ..... 0000011
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, 0x04, rd, rs, offset));
 }
 
+// LH RD, OFFSET(RS)
+static inline void asm_rv32_opcode_lh(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
+    // I: ............ ..... 001 ..... 0000011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, 0x01, rd, rs, offset));
+}
+
 // LHU RD, OFFSET(RS)
 static inline void asm_rv32_opcode_lhu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
     // I: ............ ..... 101 ..... 0000011
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, 0x05, rd, rs, offset));
 }
 
-// LUI RD, immediate
+// LUI RD, IMMEDIATE
 static inline void asm_rv32_opcode_lui(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate) {
     // U: .................... ..... 0110111
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_U(0x37, rd, immediate));
@@ -336,12 +541,48 @@ static inline void asm_rv32_opcode_mul(asm_rv32_t *state, mp_uint_t rd, mp_uint_
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x00, 0x01, rd, rs1, rs2));
 }
 
+// MULH RD, RS1, RS2
+static inline void asm_rv32_opcode_mulh(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 001 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x01, 0x01, rd, rs1, rs2));
+}
+
+// MULHSU RD, RS1, RS2
+static inline void asm_rv32_opcode_mulhsu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 010 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x02, 0x01, rd, rs1, rs2));
+}
+
+// MULHU RD, RS1, RS2
+static inline void asm_rv32_opcode_mulhu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 011 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x03, 0x01, rd, rs1, rs2));
+}
+
 // OR RD, RS1, RS2
 static inline void asm_rv32_opcode_or(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 110 ..... 0110011
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x06, 0x00, rd, rs1, rs2));
 }
 
+// ORI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_ori(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 110 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x06, rd, rs, immediate));
+}
+
+// REM RD, RS1, RS2
+static inline void asm_rv32_opcode_rem(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 110 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x06, 0x01, rd, rs1, rs2));
+}
+
+// REMU RD, RS1, RS2
+static inline void asm_rv32_opcode_remu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000001 ..... ..... 111 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x07, 0x01, rd, rs1, rs2));
+}
+
 // SLL RD, RS1, RS2
 static inline void asm_rv32_opcode_sll(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 001 ..... 0110011
@@ -349,23 +590,29 @@ static inline void asm_rv32_opcode_sll(asm_rv32_t *state, mp_uint_t rd, mp_uint_
 }
 
 // SLLI RD, RS, IMMEDIATE
-static inline void asm_rv32_opcode_slli(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_uint_t immediate) {
+static inline void asm_rv32_opcode_slli(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
     // I: 0000000..... ..... 001 ..... 0010011
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x01, rd, rs, immediate & 0x1F));
 }
 
-// SRL RD, RS1, RS2
-static inline void asm_rv32_opcode_srl(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
-    // R: 0000000 ..... ..... 101 ..... 0110011
-    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x05, 0x00, rd, rs1, rs2));
-}
-
 // SLT RD, RS1, RS2
 static inline void asm_rv32_opcode_slt(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 010 ..... 0110011
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x02, 0x00, rd, rs1, rs2));
 }
 
+// SLTI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_slti(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 010 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x02, rd, rs, immediate));
+}
+
+// SLTIU RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_sltiu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: ............ ..... 011 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x03, rd, rs, immediate));
+}
+
 // SLTU RD, RS1, RS2
 static inline void asm_rv32_opcode_sltu(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 011 ..... 0110011
@@ -378,6 +625,24 @@ static inline void asm_rv32_opcode_sra(asm_rv32_t *state, mp_uint_t rd, mp_uint_
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x05, 0x20, rd, rs1, rs2));
 }
 
+// SRAI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_srai(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: 0100000..... ..... 101 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x05, rd, rs, ((immediate & 0x1F) | 0x400)));
+}
+
+// SRL RD, RS1, RS2
+static inline void asm_rv32_opcode_srl(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0000000 ..... ..... 101 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x05, 0x00, rd, rs1, rs2));
+}
+
+// SRLI RD, RS, IMMEDIATE
+static inline void asm_rv32_opcode_srli(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t immediate) {
+    // I: 0000000..... ..... 101 ..... 0010011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x05, rd, rs, immediate & 0x1F));
+}
+
 // SUB RD, RS1, RS2
 static inline void asm_rv32_opcode_sub(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0100000 ..... ..... 000 ..... 0110011
@@ -435,6 +700,8 @@ void asm_rv32_meta_comparison_ne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2
 void asm_rv32_meta_comparison_lt(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison);
 void asm_rv32_meta_comparison_le(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison);
 
+void asm_rv32_emit_optimised_load_immediate(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate);
+
 #ifdef GENERIC_ASM_API
 
 void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index);
@@ -444,10 +711,9 @@ void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_
 void asm_rv32_emit_load16_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset);
 void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset);
 void asm_rv32_emit_mov_local_reg(asm_rv32_t *state, mp_uint_t local, mp_uint_t rs);
-void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local);
 void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local);
+void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local);
 void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t label);
-void asm_rv32_emit_optimised_load_immediate(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate);
 void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs);
 void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_uint_t base, mp_int_t offset);
 
diff --git a/py/compile.c b/py/compile.c
index d2af6aaf2cb6b..60f06d7773e34 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -147,6 +147,7 @@ static const emit_inline_asm_method_table_t *emit_asm_table[] = {
     &emit_inline_thumb_method_table,
     &emit_inline_xtensa_method_table,
     NULL,
+    &emit_inline_rv32_method_table,
 };
 
 #elif MICROPY_EMIT_INLINE_ASM
@@ -157,6 +158,9 @@ static const emit_inline_asm_method_table_t *emit_asm_table[] = {
 #elif MICROPY_EMIT_INLINE_XTENSA
 #define ASM_DECORATOR_QSTR MP_QSTR_asm_xtensa
 #define ASM_EMITTER(f) emit_inline_xtensa_##f
+#elif MICROPY_EMIT_INLINE_RV32
+#define ASM_DECORATOR_QSTR MP_QSTR_asm_rv32
+#define ASM_EMITTER(f) emit_inline_rv32_##f
 #else
 #error "unknown asm emitter"
 #endif
@@ -855,6 +859,8 @@ static bool compile_built_in_decorator(compiler_t *comp, size_t name_len, mp_par
         *emit_options = MP_EMIT_OPT_ASM;
     } else if (attr == MP_QSTR_asm_xtensa) {
         *emit_options = MP_EMIT_OPT_ASM;
+    } else if (attr == MP_QSTR_asm_rv32) {
+        *emit_options = MP_EMIT_OPT_ASM;
     #else
     } else if (attr == ASM_DECORATOR_QSTR) {
         *emit_options = MP_EMIT_OPT_ASM;
diff --git a/py/emit.h b/py/emit.h
index 623b163490164..033ac9c763b07 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -307,12 +307,15 @@ typedef struct _emit_inline_asm_method_table_t {
     void (*op)(emit_inline_asm_t *emit, qstr op, mp_uint_t n_args, mp_parse_node_t *pn_args);
 } emit_inline_asm_method_table_t;
 
+extern const emit_inline_asm_method_table_t emit_inline_rv32_method_table;
 extern const emit_inline_asm_method_table_t emit_inline_thumb_method_table;
 extern const emit_inline_asm_method_table_t emit_inline_xtensa_method_table;
 
+emit_inline_asm_t *emit_inline_rv32_new(mp_uint_t max_num_labels);
 emit_inline_asm_t *emit_inline_thumb_new(mp_uint_t max_num_labels);
 emit_inline_asm_t *emit_inline_xtensa_new(mp_uint_t max_num_labels);
 
+void emit_inline_rv32_free(emit_inline_asm_t *emit);
 void emit_inline_thumb_free(emit_inline_asm_t *emit);
 void emit_inline_xtensa_free(emit_inline_asm_t *emit);
 
diff --git a/py/emitinlinerv32.c b/py/emitinlinerv32.c
new file mode 100644
index 0000000000000..179e289c67b05
--- /dev/null
+++ b/py/emitinlinerv32.c
@@ -0,0 +1,818 @@
+/*
+ * This file is part of the MicroPython project, https://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "py/asmrv32.h"
+#include "py/emit.h"
+#include "py/misc.h"
+
+#if MICROPY_EMIT_INLINE_RV32
+
+typedef enum {
+// define rules with a compile function
+#define DEF_RULE(rule, comp, kind, ...) PN_##rule,
+#define DEF_RULE_NC(rule, kind, ...)
+    #include "py/grammar.h"
+#undef DEF_RULE
+#undef DEF_RULE_NC
+    PN_const_object, // special node for a constant, generic Python object
+// define rules without a compile function
+#define DEF_RULE(rule, comp, kind, ...)
+#define DEF_RULE_NC(rule, kind, ...) PN_##rule,
+    #include "py/grammar.h"
+#undef DEF_RULE
+#undef DEF_RULE_NC
+} pn_kind_t;
+
+struct _emit_inline_asm_t {
+    asm_rv32_t as;
+    uint16_t pass;
+    mp_obj_t *error_slot;
+    mp_uint_t max_num_labels;
+    qstr *label_lookup;
+};
+
+static const qstr REGISTERS_QSTR_TABLE[] = {
+    MP_QSTR_zero, MP_QSTR_ra,  MP_QSTR_sp,  MP_QSTR_gp,  MP_QSTR_tp,  MP_QSTR_t0,  MP_QSTR_t1,  MP_QSTR_t2,
+    MP_QSTR_s0,   MP_QSTR_s1,  MP_QSTR_a0,  MP_QSTR_a1,  MP_QSTR_a2,  MP_QSTR_a3,  MP_QSTR_a4,  MP_QSTR_a5,
+    MP_QSTR_a6,   MP_QSTR_a7,  MP_QSTR_s2,  MP_QSTR_s3,  MP_QSTR_s4,  MP_QSTR_s5,  MP_QSTR_s6,  MP_QSTR_s7,
+    MP_QSTR_s8,   MP_QSTR_s9,  MP_QSTR_s10, MP_QSTR_s11, MP_QSTR_t3,  MP_QSTR_t4,  MP_QSTR_t5,  MP_QSTR_t6,
+    MP_QSTR_x0,   MP_QSTR_x1,  MP_QSTR_x2,  MP_QSTR_x3,  MP_QSTR_x4,  MP_QSTR_x5,  MP_QSTR_x6,  MP_QSTR_x7,
+    MP_QSTR_x8,   MP_QSTR_x9,  MP_QSTR_x10, MP_QSTR_x11, MP_QSTR_x12, MP_QSTR_x13, MP_QSTR_x14, MP_QSTR_x15,
+    MP_QSTR_x16,  MP_QSTR_x17, MP_QSTR_x18, MP_QSTR_x19, MP_QSTR_x20, MP_QSTR_x21, MP_QSTR_x22, MP_QSTR_x23,
+    MP_QSTR_x24,  MP_QSTR_x25, MP_QSTR_x26, MP_QSTR_x27, MP_QSTR_x28, MP_QSTR_x29, MP_QSTR_x30, MP_QSTR_x31,
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+static inline void emit_inline_rv32_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);
+}
+
+static inline void emit_inline_rv32_error_exc(emit_inline_asm_t *emit, mp_obj_t exc) {
+    *emit->error_slot = exc;
+}
+
+emit_inline_asm_t *emit_inline_rv32_new(mp_uint_t max_num_labels) {
+    emit_inline_asm_t *emit = m_new_obj(emit_inline_asm_t);
+    memset(&emit->as, 0, sizeof(emit->as));
+    mp_asm_base_init(&emit->as.base, max_num_labels);
+    emit->max_num_labels = max_num_labels;
+    emit->label_lookup = m_new(qstr, max_num_labels);
+    return emit;
+}
+
+void emit_inline_rv32_free(emit_inline_asm_t *emit) {
+    m_del(qstr, emit->label_lookup, emit->max_num_labels);
+    mp_asm_base_deinit(&emit->as.base, false);
+    m_del_obj(emit_inline_asm_t, emit);
+}
+
+static void emit_inline_rv32_start_pass(emit_inline_asm_t *emit, pass_kind_t pass, mp_obj_t *error_slot) {
+    emit->pass = pass;
+    emit->error_slot = error_slot;
+    if (emit->pass == MP_PASS_CODE_SIZE) {
+        memset(emit->label_lookup, 0, emit->max_num_labels * sizeof(qstr));
+    }
+    mp_asm_base_start_pass(&emit->as.base, pass == MP_PASS_EMIT ? MP_ASM_PASS_EMIT : MP_ASM_PASS_COMPUTE);
+}
+
+static void emit_inline_rv32_end_pass(emit_inline_asm_t *emit, mp_uint_t type_sig) {
+    // c.jr ra
+    asm_rv32_opcode_cjr(&emit->as, ASM_RV32_REG_RA);
+    asm_rv32_end_pass(&emit->as);
+}
+
+static bool parse_register_node(mp_parse_node_t node, mp_uint_t *register_number, bool compressed) {
+    assert(register_number != NULL && "Register number pointer is NULL.");
+
+    if (!MP_PARSE_NODE_IS_ID(node)) {
+        return false;
+    }
+
+    qstr node_qstr = MP_PARSE_NODE_LEAF_ARG(node);
+    for (mp_uint_t index = 0; index < MP_ARRAY_SIZE(REGISTERS_QSTR_TABLE); index++) {
+        if (node_qstr == REGISTERS_QSTR_TABLE[index]) {
+            mp_uint_t number = index % RV32_AVAILABLE_REGISTERS_COUNT;
+            if (!compressed || (compressed && RV32_IS_IN_C_REGISTER_WINDOW(number))) {
+                *register_number = compressed ? RV32_MAP_IN_C_REGISTER_WINDOW(number) : number;
+                return true;
+            }
+            break;
+        }
+    }
+
+    return false;
+}
+
+static mp_uint_t lookup_label(emit_inline_asm_t *emit, mp_parse_node_t node, qstr *qstring) {
+    assert(qstring && "qstring pointer is NULL");
+
+    *qstring = MP_PARSE_NODE_LEAF_ARG(node);
+    for (mp_uint_t label = 0; label < emit->max_num_labels; label++) {
+        if (emit->label_lookup[label] == *qstring) {
+            return label;
+        }
+    }
+
+    return emit->max_num_labels;
+}
+
+static inline ptrdiff_t label_code_offset(emit_inline_asm_t *emit, mp_uint_t label_index) {
+    return emit->as.base.label_offsets[label_index] - emit->as.base.code_offset;
+}
+
+static mp_uint_t emit_inline_rv32_count_params(emit_inline_asm_t *emit, mp_uint_t parameters_count, mp_parse_node_t *parameter_nodes) {
+    // TODO: Raise this up to 8?  RV32I has 8 A-registers that are meant to
+    //       be used for passing arguments.
+
+    if (parameters_count > 4) {
+        emit_inline_rv32_error_msg(emit, MP_ERROR_TEXT("can only have up to 4 parameters for RV32 assembly"));
+        return 0;
+    }
+
+    mp_uint_t register_index = 0;
+    for (mp_uint_t index = 0; index < parameters_count; index++) {
+        bool valid_register = parse_register_node(parameter_nodes[index], &register_index, false);
+        if (!valid_register || (register_index != (ASM_RV32_REG_A0 + index))) {
+            emit_inline_rv32_error_msg(emit, MP_ERROR_TEXT("parameters must be registers in sequence a0 to a3"));
+            return 0;
+        }
+    }
+
+    return parameters_count;
+}
+
+static bool emit_inline_rv32_label(emit_inline_asm_t *emit, mp_uint_t label_num, qstr label_id) {
+    assert(label_num < emit->max_num_labels);
+    if (emit->pass == MP_PASS_CODE_SIZE) {
+        for (mp_uint_t index = 0; index < emit->max_num_labels; index++) {
+            if (emit->label_lookup[index] == label_id) {
+                return false;
+            }
+        }
+    }
+    emit->label_lookup[label_num] = label_id;
+    mp_asm_base_label_assign(&emit->as.base, label_num);
+    return true;
+}
+
+#define CALL_RRR 0 // Register, Register, Register
+#define CALL_RR  1 // Register, Register
+#define CALL_RRI 2 // Register, Register, Immediate
+#define CALL_RRL 3 // Register, Register, Label
+#define CALL_RI  4 // Register, Immediate
+#define CALL_L   5 // Label
+#define CALL_R   6 // Register
+#define CALL_RL  7 // Register, Label
+#define CALL_N   8 // No arguments
+#define CALL_I   9 // Immediate
+#define CALL_RII 10 // Register, Immediate, Immediate
+#define CALL_RIR 11 // Register, Immediate(Register)
+
+#define N 0 // No argument
+#define R 1 // Register
+#define I 2 // Immediate
+#define L 3 // Label
+#define C (1 << 2) // Compressed register
+#define U (1 << 2) // Unsigned immediate
+#define Z (1 << 3) // Non-zero
+
+typedef void (*call_l_t)(asm_rv32_t *state, mp_uint_t label_index);
+typedef void (*call_ri_t)(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate);
+typedef void (*call_rri_t)(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_int_t immediate);
+typedef void (*call_rii_t)(asm_rv32_t *state, mp_uint_t rd, mp_uint_t immediate1, mp_int_t immediate2);
+typedef void (*call_rrr_t)(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2);
+typedef void (*call_rr_t)(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs);
+typedef void (*call_i_t)(asm_rv32_t *state, mp_int_t immediate);
+typedef void (*call_r_t)(asm_rv32_t *state, mp_uint_t rd);
+typedef void (*call_n_t)(asm_rv32_t *state);
+
+typedef struct _opcode_t {
+    qstr qstring;
+    void *emitter;
+    uint32_t calling_convention : 4;
+    uint32_t argument1_kind : 4;
+    uint32_t argument1_shift : 5;
+    uint32_t argument2_kind : 4;
+    uint32_t argument2_shift : 5;
+    uint32_t argument3_kind : 4;
+    uint32_t argument3_shift : 5;
+    uint32_t argument1_mask;
+    uint32_t argument2_mask;
+    uint32_t argument3_mask;
+} opcode_t;
+
+#define opcode_li asm_rv32_emit_optimised_load_immediate
+
+static void opcode_la(asm_rv32_t *state, mp_uint_t rd, mp_int_t displacement) {
+    // This cannot be optimised for size, otherwise label addresses would move around.
+    mp_uint_t upper = (mp_uint_t)displacement & 0xFFFFF000;
+    mp_uint_t lower = (mp_uint_t)displacement & 0x00000FFF;
+    if ((lower & 0x800) != 0) {
+        upper += 0x1000;
+    }
+    asm_rv32_opcode_auipc(state, rd, upper);
+    asm_rv32_opcode_addi(state, rd, rd, lower);
+}
+
+#define RC  (R | C)
+#define IU  (I | U)
+#define IZ  (I | Z)
+#define IUZ (I | U | Z)
+
+static const opcode_t OPCODES[] = {
+    { MP_QSTR_add,        asm_rv32_opcode_add,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_addi,       asm_rv32_opcode_addi,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_and_,       asm_rv32_opcode_and,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_andi,       asm_rv32_opcode_andi,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_auipc,      asm_rv32_opcode_auipc,     CALL_RI,  R,   0, I,   12, N,  0, 0xFFFFFFFF, 0xFFFFF000, 0x00000000 },
+    { MP_QSTR_beq,        asm_rv32_opcode_beq,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
+    { MP_QSTR_bge,        asm_rv32_opcode_bge,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
+    { MP_QSTR_bgeu,       asm_rv32_opcode_bgeu,      CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
+    { MP_QSTR_blt,        asm_rv32_opcode_blt,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
+    { MP_QSTR_bltu,       asm_rv32_opcode_bltu,      CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
+    { MP_QSTR_bne,        asm_rv32_opcode_bne,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
+    { MP_QSTR_csrrc,      asm_rv32_opcode_csrrc,     CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_csrrs,      asm_rv32_opcode_csrrs,     CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_csrrw,      asm_rv32_opcode_csrrw,     CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_csrrci,     asm_rv32_opcode_csrrci,    CALL_RII, R,   0, IU,  0,  IU, 0, 0xFFFFFFFF, 0x00000FFF, 0x0000001F },
+    { MP_QSTR_csrrsi,     asm_rv32_opcode_csrrsi,    CALL_RII, R,   0, IU,  0,  IU, 0, 0xFFFFFFFF, 0x00000FFF, 0x0000001F },
+    { MP_QSTR_csrrwi,     asm_rv32_opcode_csrrwi,    CALL_RII, R,   0, IU,  0,  IU, 0, 0xFFFFFFFF, 0x00000FFF, 0x0000001F },
+    { MP_QSTR_c_add,      asm_rv32_opcode_cadd,      CALL_RR,  R,   0, R,   0,  N,  0, 0xFFFFFFFE, 0xFFFFFFFE, 0x00000000 },
+    { MP_QSTR_c_addi,     asm_rv32_opcode_caddi,     CALL_RI,  R,   0, IZ,  0,  N,  0, 0xFFFFFFFE, 0x0000003F, 0x00000000 },
+    { MP_QSTR_c_addi4spn, asm_rv32_opcode_caddi4spn, CALL_RI,  R,   0, IUZ, 0,  N,  0, 0x0000FF00, 0x000003FC, 0x00000000 },
+    { MP_QSTR_c_and,      asm_rv32_opcode_cand,      CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
+    { MP_QSTR_c_andi,     asm_rv32_opcode_candi,     CALL_RI,  RC,  0, I,   0,  N,  0, 0x0000FF00, 0x0000003F, 0x00000000 },
+    { MP_QSTR_c_beqz,     asm_rv32_opcode_cbeqz,     CALL_RL,  RC,  0, L,   0,  N,  0, 0x0000FF00, 0x000001FE, 0x00000000 },
+    { MP_QSTR_c_bnez,     asm_rv32_opcode_cbnez,     CALL_RL,  RC,  0, L,   0,  N,  0, 0x0000FF00, 0x000001FE, 0x00000000 },
+    { MP_QSTR_c_ebreak,   asm_rv32_opcode_cebreak,   CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
+    { MP_QSTR_c_j,        asm_rv32_opcode_cj,        CALL_L,   L,   0, N,   0,  N,  0, 0x00000FFE, 0x00000000, 0x00000000 },
+    { MP_QSTR_c_jal,      asm_rv32_opcode_cjal,      CALL_L,   L,   0, N,   0,  N,  0, 0x00000FFE, 0x00000000, 0x00000000 },
+    { MP_QSTR_c_jalr,     asm_rv32_opcode_cjalr,     CALL_R,   R,   0, N,   0,  N,  0, 0xFFFFFFFE, 0x00000000, 0x00000000 },
+    { MP_QSTR_c_jr,       asm_rv32_opcode_cjr,       CALL_R,   R,   0, N,   0,  N,  0, 0xFFFFFFFE, 0x00000000, 0x00000000 },
+    { MP_QSTR_c_li,       asm_rv32_opcode_cli,       CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFE, 0x0000003F, 0x00000000 },
+    { MP_QSTR_c_lui,      asm_rv32_opcode_clui,      CALL_RI,  R,   0, IUZ, 12, N,  0, 0xFFFFFFFA, 0x0001F800, 0x00000000 },
+    { MP_QSTR_c_lw,       asm_rv32_opcode_clw,       CALL_RIR, RC,  0, I,   0,  RC, 0, 0x0000FF00, 0x0000007C, 0x0000FF00 },
+    { MP_QSTR_c_lwsp,     asm_rv32_opcode_clwsp,     CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFE, 0x000000FC, 0x00000000 },
+    { MP_QSTR_c_mv,       asm_rv32_opcode_cmv,       CALL_RR,  R,   0, R,   0,  N,  0, 0xFFFFFFFE, 0xFFFFFFFE, 0x00000000 },
+    { MP_QSTR_c_nop,      asm_rv32_opcode_cnop,      CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
+    { MP_QSTR_c_or,       asm_rv32_opcode_cor,       CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
+    { MP_QSTR_c_slli,     asm_rv32_opcode_cslli,     CALL_RI,  R,   0, IU,  0,  N,  0, 0xFFFFFFFE, 0x0000001F, 0x00000000 },
+    { MP_QSTR_c_srai,     asm_rv32_opcode_csrai,     CALL_RI,  RC,  0, IU,  0,  N,  0, 0x0000FF00, 0x0000001F, 0x00000000 },
+    { MP_QSTR_c_srli,     asm_rv32_opcode_csrli,     CALL_RI,  RC,  0, IU,  0,  N,  0, 0x0000FF00, 0x0000001F, 0x00000000 },
+    { MP_QSTR_c_sub,      asm_rv32_opcode_csub,      CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
+    { MP_QSTR_c_sw,       asm_rv32_opcode_csw,       CALL_RIR, RC,  0, I,   0,  RC, 0, 0x0000FF00, 0x0000007C, 0x0000FF00 },
+    { MP_QSTR_c_swsp,     asm_rv32_opcode_cswsp,     CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFF, 0x000000FC, 0x00000000 },
+    { MP_QSTR_c_xor,      asm_rv32_opcode_cxor,      CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
+    { MP_QSTR_div,        asm_rv32_opcode_div,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_divu,       asm_rv32_opcode_divu,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_ebreak,     asm_rv32_opcode_ebreak,    CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
+    { MP_QSTR_ecall,      asm_rv32_opcode_ecall,     CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
+    { MP_QSTR_jal,        asm_rv32_opcode_jal,       CALL_RL,  R,   0, L,   0,  N,  0, 0xFFFFFFFF, 0x001FFFFE, 0x00000000 },
+    { MP_QSTR_jalr,       asm_rv32_opcode_jalr,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_la,         opcode_la,                 CALL_RL,  R,   0, L,   0,  N,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000 },
+    { MP_QSTR_lb,         asm_rv32_opcode_lb,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_lbu,        asm_rv32_opcode_lbu,       CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_lh,         asm_rv32_opcode_lh,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_lhu,        asm_rv32_opcode_lhu,       CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_li,         opcode_li,                 CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000 },
+    { MP_QSTR_lui,        asm_rv32_opcode_lui,       CALL_RI,  R,   0, I,   12, N,  0, 0xFFFFFFFF, 0xFFFFF000, 0x00000000 },
+    { MP_QSTR_lw,         asm_rv32_opcode_lw,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_mv,         asm_rv32_opcode_cmv,       CALL_RR,  R,   0, R,   0,  N,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000 },
+    { MP_QSTR_mul,        asm_rv32_opcode_mul,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_mulh,       asm_rv32_opcode_mulh,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_mulhsu,     asm_rv32_opcode_mulhsu,    CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_mulhu,      asm_rv32_opcode_mulhu,     CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_or_,        asm_rv32_opcode_or,        CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_ori,        asm_rv32_opcode_ori,       CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_rem,        asm_rv32_opcode_rem,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_remu,       asm_rv32_opcode_remu,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_sb,         asm_rv32_opcode_sb,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_sh,         asm_rv32_opcode_sh,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_sll,        asm_rv32_opcode_sll,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_slli,       asm_rv32_opcode_slli,      CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000001F },
+    { MP_QSTR_slt,        asm_rv32_opcode_slt,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_slti,       asm_rv32_opcode_slti,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_sltiu,      asm_rv32_opcode_sltiu,     CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_sltu,       asm_rv32_opcode_sltu,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_sra,        asm_rv32_opcode_sra,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_srai,       asm_rv32_opcode_srai,      CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000001F },
+    { MP_QSTR_srl,        asm_rv32_opcode_srl,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_srli,       asm_rv32_opcode_srli,      CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000001F },
+    { MP_QSTR_sub,        asm_rv32_opcode_sub,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_sw,         asm_rv32_opcode_sw,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
+    { MP_QSTR_xor,        asm_rv32_opcode_xor,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { MP_QSTR_xori,       asm_rv32_opcode_xori,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+};
+
+#undef RC
+#undef IU
+#undef IZ
+#undef IUZ
+
+// These two checks assume the bitmasks are contiguous.
+
+static bool is_in_signed_mask(mp_uint_t mask, mp_uint_t value) {
+    mp_uint_t leading_zeroes = mp_clz(mask);
+    if (leading_zeroes == 0 || leading_zeroes > 32) {
+        return true;
+    }
+    mp_uint_t positive_mask = ~(mask & ~(1U << (31 - leading_zeroes)));
+    if ((value & positive_mask) == 0) {
+        return true;
+    }
+    mp_uint_t negative_mask = ~(mask >> 1);
+    mp_uint_t trailing_zeroes = mp_ctz(mask);
+    if (trailing_zeroes > 0) {
+        mp_uint_t trailing_mask = (1U << trailing_zeroes) - 1;
+        if ((value & trailing_mask) != 0) {
+            return false;
+        }
+        negative_mask &= ~trailing_mask;
+    }
+    return (value & negative_mask) == negative_mask;
+}
+
+static inline bool is_in_unsigned_mask(mp_uint_t mask, mp_uint_t value) {
+    return (value & ~mask) == 0;
+}
+
+static bool validate_integer(mp_uint_t value, mp_uint_t mask, mp_uint_t flags) {
+    if (flags & U) {
+        if (!is_in_unsigned_mask(mask, value)) {
+            return false;
+        }
+    } else {
+        if (!is_in_signed_mask(mask, value)) {
+            return false;
+        }
+    }
+
+    if ((flags & Z) && (value == 0)) {
+        return false;
+    }
+
+    return true;
+}
+
+static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
+    const opcode_t *opcode, mp_parse_node_t node, mp_uint_t node_index) {
+    assert((node_index < 3) && "Invalid argument node number.");
+
+    uint32_t kind = 0;
+    uint32_t shift = 0;
+    uint32_t mask = 0;
+
+    switch (node_index) {
+        case 0:
+            kind = opcode->argument1_kind;
+            shift = opcode->argument1_shift;
+            mask = opcode->argument1_mask;
+            break;
+
+        case 1:
+            kind = opcode->argument2_kind;
+            shift = opcode->argument2_shift;
+            mask = opcode->argument2_mask;
+            break;
+
+        case 2:
+            kind = opcode->argument3_kind;
+            shift = opcode->argument3_shift;
+            mask = opcode->argument3_mask;
+            break;
+
+        default:
+            break;
+    }
+
+    switch (kind & 0x03) {
+        case N:
+            return true;
+
+        case R: {
+            mp_uint_t register_index;
+            if (!parse_register_node(node, &register_index, false)) {
+                emit_inline_rv32_error_exc(emit,
+                    mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                        MP_ERROR_TEXT("opcode '%q' argument %d must be a register"),
+                        opcode_qstr, node_index + 1));
+                return false;
+            }
+
+            if ((mask & (1U << register_index)) == 0) {
+                emit_inline_rv32_error_exc(emit,
+                    mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                        MP_ERROR_TEXT("opcode '%q' argument %d is an invalid register"),
+                        opcode_qstr, node_index + 1));
+                return false;
+            }
+
+            return true;
+        }
+        break;
+
+        case I: {
+            mp_obj_t object;
+            if (!mp_parse_node_get_int_maybe(node, &object)) {
+                emit_inline_rv32_error_exc(emit,
+                    mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                        MP_ERROR_TEXT("opcode '%q' argument %d must be an integer"),
+                        opcode_qstr, node_index + 1));
+                return false;
+            }
+
+            mp_uint_t immediate = mp_obj_get_int_truncated(object) << shift;
+            if (kind & U) {
+                if (!is_in_unsigned_mask(mask, immediate)) {
+                    goto out_of_range;
+                }
+            } else {
+                if (!is_in_signed_mask(mask, immediate)) {
+                    goto out_of_range;
+                }
+            }
+
+            if ((kind & Z) && (immediate == 0)) {
+                goto zero_immediate;
+            }
+
+            return true;
+        }
+        break;
+
+        case L: {
+            if (!MP_PARSE_NODE_IS_ID(node)) {
+                emit_inline_rv32_error_exc(emit,
+                    mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                        MP_ERROR_TEXT("opcode '%q' argument %d must be a label"),
+                        opcode_qstr, node_index + 1));
+                return false;
+            }
+
+            qstr qstring;
+            mp_uint_t label_index = lookup_label(emit, node, &qstring);
+            if (label_index >= emit->max_num_labels && emit->pass == MP_PASS_EMIT) {
+                emit_inline_rv32_error_exc(emit,
+                    mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                        MP_ERROR_TEXT("opcode '%q' argument %d label '%q' is undefined"),
+                        opcode_qstr, node_index + 1, qstring));
+                return false;
+            }
+
+            mp_uint_t displacement = (mp_uint_t)(label_code_offset(emit, label_index));
+            if (kind & U) {
+                if (!is_in_unsigned_mask(mask, displacement)) {
+                    goto out_of_range;
+                }
+            } else {
+                if (!is_in_signed_mask(mask, displacement)) {
+                    goto out_of_range;
+                }
+            }
+            return true;
+        }
+        break;
+
+        default:
+            assert(!"Unknown argument kind");
+            break;
+    }
+
+    return false;
+
+out_of_range:
+    emit_inline_rv32_error_exc(emit,
+        mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+            MP_ERROR_TEXT("opcode '%q' argument %d is out of range"),
+            opcode_qstr, node_index + 1));
+    return false;
+
+zero_immediate:
+    emit_inline_rv32_error_exc(emit,
+        mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+            MP_ERROR_TEXT("opcode '%q' argument %d must not be zero"),
+            opcode_qstr, node_index + 1));
+    return false;
+}
+
+static bool parse_register_offset_node(emit_inline_asm_t *emit, qstr opcode_qstr, const opcode_t *opcode_data, mp_parse_node_t node, mp_uint_t node_index, mp_parse_node_t *register_node, mp_parse_node_t *offset_node, bool *negative) {
+    assert(register_node != NULL && "Register node pointer is NULL.");
+    assert(offset_node != NULL && "Offset node pointer is NULL.");
+    assert(negative != NULL && "Negative pointer is NULL.");
+
+    if (!MP_PARSE_NODE_IS_STRUCT_KIND(node, PN_atom_expr_normal) && !MP_PARSE_NODE_IS_STRUCT_KIND(node, PN_factor_2)) {
+        goto invalid_structure;
+    }
+    mp_parse_node_struct_t *node_struct = (mp_parse_node_struct_t *)node;
+    *negative = false;
+    if (MP_PARSE_NODE_IS_STRUCT_KIND(node, PN_factor_2)) {
+        if (MP_PARSE_NODE_IS_TOKEN_KIND(node_struct->nodes[0], MP_TOKEN_OP_MINUS)) {
+            *negative = true;
+        } else {
+            if (!MP_PARSE_NODE_IS_TOKEN_KIND(node_struct->nodes[0], MP_TOKEN_OP_PLUS)) {
+                goto invalid_structure;
+            }
+        }
+        if (!MP_PARSE_NODE_IS_STRUCT_KIND(node_struct->nodes[1], PN_atom_expr_normal)) {
+            goto invalid_structure;
+        }
+        node_struct = (mp_parse_node_struct_t *)node_struct->nodes[1];
+    }
+
+    if (*negative) {
+        // If the value is negative, RULE_atom_expr_normal's first token will be the
+        // offset stripped of its negative marker; range check will then fail if the
+        // default method is used, so a custom check is used instead.
+        mp_obj_t object;
+        if (!mp_parse_node_get_int_maybe(node_struct->nodes[0], &object)) {
+            emit_inline_rv32_error_exc(emit,
+                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                    MP_ERROR_TEXT("opcode '%q' argument %d must be an integer"),
+                    opcode_qstr, 2));
+            return false;
+        }
+        mp_uint_t value = mp_obj_get_int_truncated(object);
+        value = (~value + 1) & (mp_uint_t)-1;
+        if (!validate_integer(value << opcode_data->argument2_shift, opcode_data->argument2_mask, opcode_data->argument2_kind)) {
+            emit_inline_rv32_error_exc(emit,
+                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                    MP_ERROR_TEXT("opcode '%q' argument %d is out of range"),
+                    opcode_qstr, 2));
+            return false;
+        }
+    } else {
+        if (!validate_argument(emit, opcode_qstr, opcode_data, node_struct->nodes[0], 1)) {
+            return false;
+        }
+    }
+
+    *offset_node = node_struct->nodes[0];
+    node_struct = (mp_parse_node_struct_t *)node_struct->nodes[1];
+    if (!validate_argument(emit, opcode_qstr, opcode_data, node_struct->nodes[0], 2)) {
+        return false;
+    }
+    *register_node = node_struct->nodes[0];
+    return true;
+
+invalid_structure:
+    emit_inline_rv32_error_exc(emit,
+        mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+            MP_ERROR_TEXT("opcode '%q' argument %d must be an integer offset to a register"),
+            opcode_qstr, node_index + 1));
+    return false;
+}
+
+static void handle_opcode(emit_inline_asm_t *emit, qstr opcode, const opcode_t *opcode_data, mp_parse_node_t *arguments) {
+    mp_uint_t rd = 0;
+    mp_uint_t rs1 = 0;
+    mp_uint_t rs2 = 0;
+
+    switch (opcode_data->calling_convention) {
+        case CALL_RRR: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
+            parse_register_node(arguments[2], &rs2, opcode_data->argument3_kind & C);
+            ((call_rrr_t)opcode_data->emitter)(&emit->as, rd, rs1, rs2);
+            break;
+        }
+
+        case CALL_RR: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
+            ((call_rr_t)opcode_data->emitter)(&emit->as, rd, rs1);
+            break;
+        }
+
+        case CALL_RRI: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
+            mp_obj_t object;
+            mp_parse_node_get_int_maybe(arguments[2], &object);
+            mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument3_shift;
+            ((call_rri_t)opcode_data->emitter)(&emit->as, rd, rs1, immediate);
+            break;
+        }
+
+        case CALL_RI: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            mp_obj_t object;
+            mp_parse_node_get_int_maybe(arguments[1], &object);
+            mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument2_shift;
+            ((call_ri_t)opcode_data->emitter)(&emit->as, rd, immediate);
+            break;
+        }
+
+        case CALL_R: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            ((call_r_t)opcode_data->emitter)(&emit->as, rd);
+            break;
+        }
+
+        case CALL_RRL: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
+            qstr qstring;
+            mp_uint_t label_index = lookup_label(emit, arguments[2], &qstring);
+            ptrdiff_t displacement = label_code_offset(emit, label_index);
+            ((call_rri_t)opcode_data->emitter)(&emit->as, rd, rs1, displacement);
+            break;
+        }
+
+        case CALL_RL: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            qstr qstring;
+            mp_uint_t label_index = lookup_label(emit, arguments[1], &qstring);
+            ptrdiff_t displacement = label_code_offset(emit, label_index);
+            ((call_ri_t)opcode_data->emitter)(&emit->as, rd, displacement);
+            break;
+        }
+
+        case CALL_L: {
+            qstr qstring;
+            mp_uint_t label_index = lookup_label(emit, arguments[0], &qstring);
+            ptrdiff_t displacement = label_code_offset(emit, label_index);
+            ((call_i_t)opcode_data->emitter)(&emit->as, displacement);
+            break;
+        }
+
+        case CALL_N:
+            ((call_n_t)opcode_data->emitter)(&emit->as);
+            break;
+
+        case CALL_I: {
+            mp_obj_t object;
+            mp_parse_node_get_int_maybe(arguments[0], &object);
+            mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument1_shift;
+            ((call_i_t)opcode_data->emitter)(&emit->as, immediate);
+            break;
+        }
+
+        case CALL_RII: {
+            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
+            mp_obj_t object;
+            mp_parse_node_get_int_maybe(arguments[1], &object);
+            mp_uint_t immediate1 = mp_obj_get_int_truncated(object) << opcode_data->argument2_shift;
+            mp_parse_node_get_int_maybe(arguments[2], &object);
+            mp_uint_t immediate2 = mp_obj_get_int_truncated(object) << opcode_data->argument3_shift;
+            ((call_rii_t)opcode_data->emitter)(&emit->as, rd, immediate1, immediate2);
+            break;
+        }
+
+        case CALL_RIR:
+            assert(!"Should not get here.");
+            break;
+
+        default:
+            assert(!"Unhandled call convention.");
+            break;
+    }
+}
+
+static bool handle_load_store_opcode_with_offset(emit_inline_asm_t *emit, qstr opcode, const opcode_t *opcode_data, mp_parse_node_t *argument_nodes) {
+    mp_parse_node_t nodes[3] = {0};
+    if (!validate_argument(emit, opcode, opcode_data, argument_nodes[0], 0)) {
+        return false;
+    }
+    nodes[0] = argument_nodes[0];
+    bool negative = false;
+    if (!parse_register_offset_node(emit, opcode, opcode_data, argument_nodes[1], 1, &nodes[1], &nodes[2], &negative)) {
+        return false;
+    }
+
+    mp_uint_t rd;
+    mp_uint_t rs1;
+    parse_register_node(nodes[0], &rd, opcode_data->argument1_kind & C);
+    if (!parse_register_node(nodes[1], &rs1, opcode_data->argument3_kind & C)) {
+        return false;
+    }
+
+    mp_obj_t object;
+    mp_parse_node_get_int_maybe(nodes[2], &object);
+    mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument2_shift;
+    if (negative) {
+        immediate = (~immediate + 1) & (mp_uint_t)-1;
+    }
+    if (!is_in_signed_mask(opcode_data->argument2_mask, immediate)) {
+        emit_inline_rv32_error_exc(emit,
+            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                MP_ERROR_TEXT("opcode '%q' argument %d is out of range"),
+                opcode, 2));
+        return false;
+    }
+
+    ((call_rri_t)opcode_data->emitter)(&emit->as, rd, rs1, immediate);
+    return true;
+}
+
+static void emit_inline_rv32_opcode(emit_inline_asm_t *emit, qstr opcode, mp_uint_t arguments_count, mp_parse_node_t *argument_nodes) {
+    const opcode_t *opcode_data = NULL;
+    for (mp_uint_t index = 0; index < MP_ARRAY_SIZE(OPCODES); index++) {
+        if (OPCODES[index].qstring == opcode) {
+            opcode_data = &OPCODES[index];
+            break;
+        }
+    }
+
+    if (!opcode_data) {
+        emit_inline_rv32_error_exc(emit,
+            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                MP_ERROR_TEXT("unsupported or unknown RV32 instruction '%q'."), opcode));
+        return;
+    }
+
+    size_t required_arguments = 0;
+    if (opcode_data->argument1_kind != N) {
+        required_arguments++;
+    }
+    if (opcode_data->argument2_kind != N) {
+        required_arguments++;
+    }
+    if (opcode_data->argument3_kind != N) {
+        required_arguments++;
+    }
+
+    if (opcode_data->calling_convention != CALL_RIR) {
+        if (required_arguments != arguments_count) {
+            emit_inline_rv32_error_exc(emit,
+                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                    MP_ERROR_TEXT("RV32 instruction '%q' requires %d arguments."), opcode, required_arguments));
+            return;
+        }
+        if (required_arguments >= 1 && !validate_argument(emit, opcode, opcode_data, argument_nodes[0], 0)) {
+            return;
+        }
+        if (required_arguments >= 2 && !validate_argument(emit, opcode, opcode_data, argument_nodes[1], 1)) {
+            return;
+        }
+        if (required_arguments >= 3 && !validate_argument(emit, opcode, opcode_data, argument_nodes[2], 2)) {
+            return;
+        }
+        handle_opcode(emit, opcode, opcode_data, argument_nodes);
+        return;
+    }
+
+    assert(required_arguments == 3 && "Invalid arguments count for calling convention.");
+    assert((opcode_data->argument2_kind & U) == 0 && "Offset must not be unsigned.");
+    assert((opcode_data->argument2_kind & Z) == 0 && "Offset can be zero.");
+
+    if (arguments_count != 2) {
+        emit_inline_rv32_error_exc(emit,
+            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                MP_ERROR_TEXT("RV32 instruction '%q' requires %d arguments."), opcode, 2));
+        return;
+    }
+
+    handle_load_store_opcode_with_offset(emit, opcode, opcode_data, argument_nodes);
+}
+
+#undef N
+#undef R
+#undef I
+#undef L
+#undef C
+#undef U
+
+const emit_inline_asm_method_table_t emit_inline_rv32_method_table = {
+    #if MICROPY_DYNAMIC_COMPILER
+    emit_inline_rv32_new,
+    emit_inline_rv32_free,
+    #endif
+
+    emit_inline_rv32_start_pass,
+    emit_inline_rv32_end_pass,
+    emit_inline_rv32_count_params,
+    emit_inline_rv32_label,
+    emit_inline_rv32_opcode,
+};
+
+#endif // MICROPY_EMIT_INLINE_RV32
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 8598eaa5bb639..e84d258a1220a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -411,6 +411,11 @@
 #define MICROPY_EMIT_RV32 (0)
 #endif
 
+// Whether to enable the RISC-V RV32 inline assembler
+#ifndef MICROPY_EMIT_INLINE_RV32
+#define MICROPY_EMIT_INLINE_RV32 (0)
+#endif
+
 // 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 || MICROPY_EMIT_RV32 || MICROPY_EMIT_NATIVE_DEBUG)
 
@@ -420,7 +425,7 @@
 #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)
+#define MICROPY_EMIT_INLINE_ASM (MICROPY_EMIT_INLINE_THUMB || MICROPY_EMIT_INLINE_XTENSA || MICROPY_EMIT_INLINE_RV32)
 
 // Convenience definition for whether any native or inline assembler emitter is enabled
 #define MICROPY_EMIT_MACHINE_CODE (MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM)
diff --git a/py/py.cmake b/py/py.cmake
index dd94f6a59e31d..0fee74ddcb489 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -24,6 +24,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/emitbc.c
     ${MICROPY_PY_DIR}/emitcommon.c
     ${MICROPY_PY_DIR}/emitglue.c
+    ${MICROPY_PY_DIR}/emitinlinerv32.c
     ${MICROPY_PY_DIR}/emitinlinethumb.c
     ${MICROPY_PY_DIR}/emitinlinextensa.c
     ${MICROPY_PY_DIR}/emitnarm.c
diff --git a/py/py.mk b/py/py.mk
index 9592fbb9170ef..c0b7e1ac8b90e 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -123,6 +123,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	emitnxtensawin.o \
 	asmrv32.o \
 	emitnrv32.o \
+	emitinlinerv32.o \
 	emitndebug.o \
 	formatfloat.o \
 	parsenumbase.o \
diff --git a/tests/inlineasm/rv32/asmargs.py b/tests/inlineasm/rv32/asmargs.py
new file mode 100644
index 0000000000000..78afd511150d6
--- /dev/null
+++ b/tests/inlineasm/rv32/asmargs.py
@@ -0,0 +1,44 @@
+# test passing arguments
+
+
+@micropython.asm_rv32
+def arg0():
+    c_li(a0, 1)
+
+
+print(arg0())
+
+
+@micropython.asm_rv32
+def arg1(a0):
+    addi(a0, a0, 1)
+
+
+print(arg1(1))
+
+
+@micropython.asm_rv32
+def arg2(a0, a1):
+    add(a0, a0, a1)
+
+
+print(arg2(1, 2))
+
+
+@micropython.asm_rv32
+def arg3(a0, a1, a2):
+    add(a0, a0, a1)
+    add(a0, a0, a2)
+
+
+print(arg3(1, 2, 3))
+
+
+@micropython.asm_rv32
+def arg4(a0, a1, a2, a3):
+    add(a0, a0, a1)
+    add(a0, a0, a2)
+    add(a0, a0, a3)
+
+
+print(arg4(1, 2, 3, 4))
diff --git a/tests/inlineasm/rv32/asmargs.py.exp b/tests/inlineasm/rv32/asmargs.py.exp
new file mode 100644
index 0000000000000..e33a6964f46e8
--- /dev/null
+++ b/tests/inlineasm/rv32/asmargs.py.exp
@@ -0,0 +1,5 @@
+1
+2
+3
+6
+10
diff --git a/tests/inlineasm/rv32/asmarith.py b/tests/inlineasm/rv32/asmarith.py
new file mode 100644
index 0000000000000..8b864c0b3b289
--- /dev/null
+++ b/tests/inlineasm/rv32/asmarith.py
@@ -0,0 +1,79 @@
+# test arithmetic opcodes
+
+
+@micropython.asm_rv32
+def f1():
+    li(a0, 0x100)
+    li(a1, 1)
+    add(a0, a0, a1)
+    addi(a0, a0, 1)
+    addi(a0, a0, -2)
+    sub(a0, a0, a1)
+    c_add(a0, a1)
+    c_addi(a0, -1)
+    c_sub(a0, a1)
+
+
+print(hex(f1()))
+
+
+@micropython.asm_rv32
+def f2():
+    li(a0, 0x10FF)
+    li(a1, 1)
+    and_(a2, a0, a1)
+    andi(a3, a0, 0x10)
+    or_(a2, a2, a3)
+    ori(a2, a2, 8)
+    li(a1, 0x200)
+    c_or(a2, a1)
+    li(a1, 0xF0)
+    mv(a0, a2)
+    c_and(a0, a1)
+    li(a1, 0x101)
+    xor(a0, a0, a1)
+    xori(a0, a0, 0x101)
+    c_xor(a0, a1)
+
+
+print(hex(f2()))
+
+
+@micropython.asm_rv32
+def f3(a0, a1):
+    slt(a0, a0, a1)
+
+
+print(f3(0xFFFFFFF0, 0xFFFFFFF1))
+print(f3(0x0, 0xFFFFFFF1))
+print(f3(0xFFFFFFF1, 0xFFFFFFF1))
+print(f3(0xFFFFFFF1, 0xFFFFFFF0))
+
+
+@micropython.asm_rv32
+def f4(a0, a1):
+    sltu(a0, a0, a1)
+
+
+print(f3(0xFFFFFFF0, 0xFFFFFFF1))
+print(f3(0x0, 0xFFFFFFF1))
+print(f3(0xFFFFFFF1, 0xFFFFFFF1))
+print(f3(0xFFFFFFF1, 0xFFFFFFF0))
+
+
+@micropython.asm_rv32
+def f5(a0):
+    slti(a0, a0, -2)
+
+
+print(f5(-1))
+print(f5(-3))
+
+
+@micropython.asm_rv32
+def f6(a0):
+    sltiu(a0, a0, -2)
+
+
+print(f6(-1))
+print(f6(-3))
diff --git a/tests/inlineasm/rv32/asmarith.py.exp b/tests/inlineasm/rv32/asmarith.py.exp
new file mode 100644
index 0000000000000..7da4dd5c93c40
--- /dev/null
+++ b/tests/inlineasm/rv32/asmarith.py.exp
@@ -0,0 +1,14 @@
+0xfe
+0x111
+1
+0
+0
+0
+1
+0
+0
+0
+0
+1
+0
+1
diff --git a/tests/inlineasm/rv32/asmbranch.py b/tests/inlineasm/rv32/asmbranch.py
new file mode 100644
index 0000000000000..d7d059d4067c6
--- /dev/null
+++ b/tests/inlineasm/rv32/asmbranch.py
@@ -0,0 +1,161 @@
+# test branch instructions
+
+
+@micropython.asm_rv32
+def tbeq(a0):
+    mv(a1, a0)
+
+    li(a0, 10)
+    li(a2, 1)
+    beq(a1, a2, end)
+
+    li(a0, 20)
+    li(a2, 2)
+    beq(a1, a2, end)
+
+    li(a0, 30)
+    li(a2, 3)
+    beq(a1, a2, end)
+
+    li(a0, 0)
+
+    label(end)
+
+
+print(tbeq(0))
+print(tbeq(1))
+print(tbeq(2))
+print(tbeq(3))
+
+
+@micropython.asm_rv32
+def tbne(a0):
+    mv(a1, a0)
+
+    li(a0, 10)
+    li(a2, 1)
+    bne(a1, a2, end)
+
+    li(a0, 20)
+    li(a2, 2)
+    bne(a1, a2, end)
+
+    li(a0, 30)
+    li(a2, 3)
+    bne(a1, a2, end)
+
+    li(a0, 0)
+
+    label(end)
+
+
+print(tbne(0))
+print(tbne(1))
+print(tbne(2))
+print(tbne(3))
+
+
+@micropython.asm_rv32
+def tbgeu(a0):
+    mv(a1, a0)
+
+    li(a0, 1)
+    li(a2, 2)
+    bgeu(a1, a2, end)
+    li(a0, 0)
+
+    label(end)
+
+
+print(tbgeu(0))
+print(tbgeu(1))
+print(tbgeu(2))
+print(tbgeu(3))
+
+
+@micropython.asm_rv32
+def tbltu(a0):
+    mv(a1, a0)
+
+    li(a0, 1)
+    li(a2, 2)
+    bltu(a1, a2, end)
+    li(a0, 0)
+
+    label(end)
+
+
+print(tbltu(0))
+print(tbltu(1))
+print(tbltu(2))
+print(tbltu(3))
+
+
+@micropython.asm_rv32
+def tbge(a0):
+    mv(a1, a0)
+
+    li(a0, 1)
+    li(a2, -2)
+    bge(a1, a2, end)
+    li(a0, 0)
+
+    label(end)
+
+
+print(tbge(-3))
+print(tbge(-2))
+print(tbge(-1))
+print(tbge(0))
+
+
+@micropython.asm_rv32
+def tblt(a0):
+    mv(a1, a0)
+
+    li(a0, 1)
+    li(a2, -2)
+    blt(a1, a2, end)
+    li(a0, 0)
+
+    label(end)
+
+
+print(tblt(-3))
+print(tblt(-2))
+print(tblt(-1))
+print(tblt(0))
+
+
+@micropython.asm_rv32
+def tcbeqz(a0):
+    mv(a1, a0)
+
+    li(a0, 1)
+    c_beqz(a1, end)
+    li(a0, 0)
+
+    label(end)
+
+
+print(tcbeqz(0))
+print(tcbeqz(1))
+print(tcbeqz(2))
+print(tcbeqz(3))
+
+
+@micropython.asm_rv32
+def tcbnez(a0):
+    mv(a1, a0)
+
+    li(a0, 1)
+    c_bnez(a1, end)
+    li(a0, 0)
+
+    label(end)
+
+
+print(tcbnez(0))
+print(tcbnez(1))
+print(tcbnez(2))
+print(tcbnez(3))
diff --git a/tests/inlineasm/rv32/asmbranch.py.exp b/tests/inlineasm/rv32/asmbranch.py.exp
new file mode 100644
index 0000000000000..baae69149538e
--- /dev/null
+++ b/tests/inlineasm/rv32/asmbranch.py.exp
@@ -0,0 +1,32 @@
+0
+10
+20
+30
+10
+20
+10
+10
+0
+0
+1
+1
+1
+1
+0
+0
+0
+1
+1
+1
+1
+0
+0
+0
+1
+0
+0
+0
+0
+1
+1
+1
diff --git a/tests/inlineasm/rv32/asmconst.py b/tests/inlineasm/rv32/asmconst.py
new file mode 100644
index 0000000000000..2b6363a43db95
--- /dev/null
+++ b/tests/inlineasm/rv32/asmconst.py
@@ -0,0 +1,49 @@
+# test constants in assembler
+
+
+@micropython.asm_rv32
+def c1():
+    li(a0, 0xFFFFFFFF)
+    li(a1, 0xF0000000)
+    sub(a0, a0, a1)
+
+
+print(hex(c1()))
+
+
+@micropython.asm_rv32
+def c2():
+    lui(a0, 0x12345)
+    li(a1, 0x678)
+    add(a0, a0, a1)
+
+
+print(hex(c2()))
+
+
+@micropython.asm_rv32
+def c3() -> uint:
+    lui(a0, 0)
+    addi(a0, a0, 0x7FF)
+
+
+print(hex(c3()))
+
+
+@micropython.asm_rv32
+def c4() -> uint:
+    lui(a0, 0)
+    addi(a0, a0, -1)
+
+
+print(hex(c4()))
+
+
+@micropython.asm_rv32
+def c5():
+    c_lui(a0, 1)
+    c_li(a1, 1)
+    c_add(a0, a1)
+
+
+print(hex(c5()))
diff --git a/tests/inlineasm/rv32/asmconst.py.exp b/tests/inlineasm/rv32/asmconst.py.exp
new file mode 100644
index 0000000000000..0c713a841486b
--- /dev/null
+++ b/tests/inlineasm/rv32/asmconst.py.exp
@@ -0,0 +1,5 @@
+0xfffffff
+0x12345678
+0x7ff
+0xffffffff
+0x1001
diff --git a/tests/inlineasm/rv32/asmcsr.py b/tests/inlineasm/rv32/asmcsr.py
new file mode 100644
index 0000000000000..f27e2aa5e34ec
--- /dev/null
+++ b/tests/inlineasm/rv32/asmcsr.py
@@ -0,0 +1,65 @@
+# test csr instructions
+
+# CSR 0x340 is `mscratch`.  This test suite is only safe to run on a system
+# where it is known that there is no other code that can read from or write
+# to that register.  The qemu port is one such system, as the CSR is only
+# accessed when a machine exception occurs, and at that point it doesn't matter
+# anymore whether these tests are running or not.
+
+
+@micropython.asm_rv32
+def csr():
+    li(a0, 0)
+    csrrw(zero, zero, 0x340)  # All zeroes
+    csrrs(a1, zero, 0x340)  # Read zeroes
+    c_bnez(a1, end)
+    addi(a0, a0, 1)
+    li(a1, 0xA5A5A5A5)
+    li(a2, 0x5A5A5A5A)
+    csrrs(a2, a1, 0x340)  # Read zeroes, set 0xA5A5A5A5
+    c_bnez(a2, end)
+    addi(a0, a0, 1)
+    csrrs(a3, zero, 0x340)  # Read 0xA5A5A5A5
+    bne(a3, a1, end)
+    addi(a0, a0, 1)
+    li(a2, 0xF0F0F0F0)
+    csrrc(zero, a2, 0x340)  # Clear upper half
+    csrrs(a3, zero, 0x340)  # Read 0x05050505
+    xori(a2, a2, -1)
+    and_(a2, a1, a2)
+    bne(a2, a3, end)
+    addi(a0, a0, 1)
+    label(end)
+
+
+print(csr())
+
+
+@micropython.asm_rv32
+def csri():
+    li(a0, 0)
+    csrrwi(zero, 0x340, 15)  # Write 0xF
+    csrrs(a1, zero, 0x340)  # Read 0xF
+    csrrsi(a2, 0x340, 0)  # Read
+    bne(a1, a2, end)
+    addi(a0, a0, 1)
+    csrrci(a2, 0x340, 0)  # Read
+    bne(a1, a2, end)
+    addi(a0, a0, 1)
+    li(a2, 15)
+    bne(a1, a2, end)
+    addi(a0, a0, 1)
+    csrrci(zero, 0x340, 1)  # Clear bit 1
+    csrrs(a1, zero, 0x340)  # Read 0xE
+    li(a2, 14)
+    bne(a1, a2, end)
+    addi(a0, a0, 1)
+    csrrsi(zero, 0x340, 1)  # Set bit 1
+    csrrs(a1, zero, 0x340)  # Read 0xF
+    li(a2, 15)
+    bne(a1, a2, end)
+    addi(a0, a0, 1)
+    label(end)
+
+
+print(csri())
diff --git a/tests/inlineasm/rv32/asmcsr.py.exp b/tests/inlineasm/rv32/asmcsr.py.exp
new file mode 100644
index 0000000000000..61c83cba41ce3
--- /dev/null
+++ b/tests/inlineasm/rv32/asmcsr.py.exp
@@ -0,0 +1,2 @@
+4
+5
diff --git a/tests/inlineasm/rv32/asmdata.py b/tests/inlineasm/rv32/asmdata.py
new file mode 100644
index 0000000000000..5e555ef4bf465
--- /dev/null
+++ b/tests/inlineasm/rv32/asmdata.py
@@ -0,0 +1,33 @@
+# test the "data" directive
+
+
+@micropython.asm_rv32
+def ret_num(a0) -> uint:
+    slli(a0, a0, 2)
+    addi(a0, a0, 16)
+    auipc(a1, 0)
+    add(a1, a1, a0)
+    lw(a0, 0(a1))
+    jal(zero, HERE)
+    data(4, 0x12345678, 0x20000000, 0x40000000, 0x7FFFFFFF + 1, (1 << 32) - 2)
+    label(HERE)
+
+
+for i in range(5):
+    print(hex(ret_num(i)))
+
+
+@micropython.asm_rv32
+def ret_num_la(a0) -> uint:
+    slli(a0, a0, 2)
+    la(a1, DATA)
+    add(a1, a1, a0)
+    lw(a0, 0(a1))
+    jal(zero, HERE)
+    label(DATA)
+    data(4, 0x12345678, 0x20000000, 0x40000000, 0x7FFFFFFF + 1, (1 << 32) - 2)
+    label(HERE)
+
+
+for i in range(5):
+    print(hex(ret_num_la(i)))
diff --git a/tests/inlineasm/rv32/asmdata.py.exp b/tests/inlineasm/rv32/asmdata.py.exp
new file mode 100644
index 0000000000000..79e92bdfa5de5
--- /dev/null
+++ b/tests/inlineasm/rv32/asmdata.py.exp
@@ -0,0 +1,10 @@
+0x12345678
+0x20000000
+0x40000000
+0x80000000
+0xfffffffe
+0x12345678
+0x20000000
+0x40000000
+0x80000000
+0xfffffffe
diff --git a/tests/inlineasm/rv32/asmdivmul.py b/tests/inlineasm/rv32/asmdivmul.py
new file mode 100644
index 0000000000000..e1120c6f63cef
--- /dev/null
+++ b/tests/inlineasm/rv32/asmdivmul.py
@@ -0,0 +1,63 @@
+@micropython.asm_rv32
+def sdiv(a0, a1):
+    div(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def udiv(a0, a1):
+    divu(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def srem(a0, a1):
+    rem(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def urem(a0, a1):
+    remu(a0, a0, a1)
+
+
+print(sdiv(1234, 3))
+print(sdiv(-1234, 3))
+print(sdiv(1234, -3))
+print(sdiv(-1234, -3))
+
+print(udiv(1234, 3))
+print(udiv(0xFFFFFFFF, 0x7FFFFFFF))
+print(udiv(0xFFFFFFFF, 0xFFFFFFFF))
+
+print(srem(1234, 3))
+print(srem(-1234, 3))
+print(srem(1234, -3))
+print(srem(-1234, -3))
+
+print(urem(1234, 3))
+print(urem(0xFFFFFFFF, 0x7FFFFFFF))
+print(urem(0xFFFFFFFF, 0xFFFFFFFF))
+
+
+@micropython.asm_rv32
+def m1(a0, a1):
+    mul(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def m2(a0, a1):
+    mulh(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def m3(a0, a1):
+    mulhu(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def m4(a0, a1):
+    mulhsu(a0, a0, a1)
+
+
+print(m1(0xFFFFFFFF, 2))
+print(m2(0xFFFFFFFF, 0xFFFFFFF0))
+print(m3(0xFFFFFFFF, 0xFFFFFFF0))
+print(m4(0xFFFFFFFF, 0xFFFFFFF0))
diff --git a/tests/inlineasm/rv32/asmdivmul.py.exp b/tests/inlineasm/rv32/asmdivmul.py.exp
new file mode 100644
index 0000000000000..60d28635f792b
--- /dev/null
+++ b/tests/inlineasm/rv32/asmdivmul.py.exp
@@ -0,0 +1,18 @@
+411
+-411
+-411
+411
+411
+2
+1
+1
+-1
+1
+-1
+1
+1
+0
+-2
+0
+-17
+-1
diff --git a/tests/inlineasm/rv32/asmjump.py b/tests/inlineasm/rv32/asmjump.py
new file mode 100644
index 0000000000000..fe87d3f968b37
--- /dev/null
+++ b/tests/inlineasm/rv32/asmjump.py
@@ -0,0 +1,115 @@
+@micropython.asm_rv32
+def f1():
+    li(a0, 0)
+    la(a1, END)
+    c_jr(a1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    label(END)
+
+
+print(f1())
+
+
+@micropython.asm_rv32
+def f2():
+    addi(sp, sp, -4)
+    c_swsp(ra, 0)
+    li(ra, 0)
+    li(a0, 0)
+    c_jal(END)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    label(END)
+    bne(ra, zero, SUCCESS)
+    c_addi(a0, 2)
+    label(SUCCESS)
+    c_lwsp(ra, 0)
+    addi(sp, sp, 4)
+
+
+print(f2())
+
+
+@micropython.asm_rv32
+def f3():
+    li(a0, 0)
+    c_j(END)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    label(END)
+
+
+print(f3())
+
+
+@micropython.asm_rv32
+def f4():
+    addi(sp, sp, -4)
+    c_swsp(ra, 0)
+    li(ra, 0)
+    li(a0, 0)
+    la(a1, END)
+    c_jalr(a1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    label(END)
+    bne(ra, zero, SUCCESS)
+    c_addi(a0, 2)
+    label(SUCCESS)
+    c_lwsp(ra, 0)
+    addi(sp, sp, 4)
+
+
+print(f4())
+
+
+@micropython.asm_rv32
+def f5():
+    li(a0, 0)
+    li(a1, 0)
+    jal(a1, END)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    label(END)
+    bne(a1, zero, SUCCESS)
+    c_addi(a0, 2)
+    label(SUCCESS)
+
+
+print(f5())
+
+
+@micropython.asm_rv32
+def f6():
+    li(a0, 0)
+    la(a1, JUMP)
+    li(a2, 0)
+    jalr(a2, a1, 10)
+    label(JUMP)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    c_addi(a0, 1)
+    bne(a2, zero, SUCCESS)
+    c_addi(a0, 2)
+    label(SUCCESS)
+
+
+print(f6())
diff --git a/tests/inlineasm/rv32/asmjump.py.exp b/tests/inlineasm/rv32/asmjump.py.exp
new file mode 100644
index 0000000000000..f7eb44d66e0b1
--- /dev/null
+++ b/tests/inlineasm/rv32/asmjump.py.exp
@@ -0,0 +1,6 @@
+0
+0
+0
+0
+0
+0
diff --git a/tests/inlineasm/rv32/asmloadstore.py b/tests/inlineasm/rv32/asmloadstore.py
new file mode 100644
index 0000000000000..2c49e07b41a5c
--- /dev/null
+++ b/tests/inlineasm/rv32/asmloadstore.py
@@ -0,0 +1,86 @@
+# test load/store opcodes
+
+
+@micropython.asm_rv32
+def l():
+    li(a5, 4)
+    addi(sp, sp, -12)
+    li(a0, 0x123)
+    c_swsp(a0, 0)
+    addi(a1, a0, 0x111)
+    c_swsp(a1, 4)
+    addi(a2, a1, 0x111)
+    c_swsp(a2, 8)
+    mv(a4, sp)
+    c_lw(a3, 0(a4))
+    bne(a3, a0, END)
+    addi(a5, a5, -1)
+    lw(a3, 4(a4))
+    bne(a3, a1, END)
+    addi(a5, a5, -1)
+    lhu(a3, 8(a4))
+    bne(a3, a2, END)
+    addi(a5, a5, -1)
+    lbu(a0, 8(a4))
+    addi(a0, a0, 0x300)
+    bne(a0, a2, END)
+    addi(a5, a5, -1)
+    label(END)
+    addi(sp, sp, 12)
+    mv(a0, a5)
+
+
+print(l())
+
+
+@micropython.asm_rv32
+def s():
+    li(a5, 4)
+    addi(sp, sp, -12)
+    c_swsp(zero, 0)
+    c_swsp(zero, 4)
+    c_swsp(zero, 8)
+    li(a0, 0x12345)
+    mv(a4, sp)
+    c_sw(a0, 0(a4))
+    sh(a0, 4(a4))
+    sb(a0, 8(a4))
+    li(a1, 0xFFFF)
+    and_(a1, a0, a1)
+    andi(a2, a0, 0xFF)
+    lw(a3, 0(sp))
+    bne(a3, a0, END)
+    addi(a5, a5, -1)
+    lw(a3, 4(sp))
+    bne(a3, a1, END)
+    addi(a5, a5, -1)
+    lw(a3, 8(sp))
+    bne(a3, a2, END)
+    addi(a5, a5, -1)
+    label(END)
+    addi(sp, sp, 12)
+    mv(a0, a5)
+
+
+print(s())
+
+
+@micropython.asm_rv32
+def lu():
+    li(a5, 4)
+    addi(sp, sp, -8)
+    li(a0, 0xF1234567)
+    c_swsp(a0, 0)
+    c_swsp(a0, 4)
+    lh(a1, 0(sp))
+    blt(a1, zero, END)
+    addi(a5, a5, -1)
+    lb(a2, 4(sp))
+    blt(a2, zero, END)
+    addi(a5, a5, -1)
+    label(END)
+    addi(sp, sp, 8)
+    mv(a0, a5)
+
+
+print(lu())
diff --git a/tests/inlineasm/rv32/asmloadstore.py.exp b/tests/inlineasm/rv32/asmloadstore.py.exp
new file mode 100644
index 0000000000000..4539bbf2d22d5
--- /dev/null
+++ b/tests/inlineasm/rv32/asmloadstore.py.exp
@@ -0,0 +1,3 @@
+0
+1
+2
diff --git a/tests/inlineasm/rv32/asmrettype.py b/tests/inlineasm/rv32/asmrettype.py
new file mode 100644
index 0000000000000..fc7ae61d15225
--- /dev/null
+++ b/tests/inlineasm/rv32/asmrettype.py
@@ -0,0 +1,33 @@
+# test return type of inline asm
+
+
+@micropython.asm_rv32
+def ret_obj(a0) -> object:
+    pass
+
+
+ret_obj(print)(1)
+
+
+@micropython.asm_rv32
+def ret_bool(a0) -> bool:
+    pass
+
+
+print(ret_bool(0), ret_bool(1))
+
+
+@micropython.asm_rv32
+def ret_int(a0) -> int:
+    slli(a0, a0, 29)
+
+
+print(ret_int(0), hex(ret_int(1)), hex(ret_int(2)), hex(ret_int(4)))
+
+
+@micropython.asm_rv32
+def ret_uint(a0) -> uint:
+    slli(a0, a0, 29)
+
+
+print(ret_uint(0), hex(ret_uint(1)), hex(ret_uint(2)), hex(ret_uint(4)))
diff --git a/tests/inlineasm/rv32/asmrettype.py.exp b/tests/inlineasm/rv32/asmrettype.py.exp
new file mode 100644
index 0000000000000..cbb49d24724ec
--- /dev/null
+++ b/tests/inlineasm/rv32/asmrettype.py.exp
@@ -0,0 +1,4 @@
+1
+False True
+0 0x20000000 0x40000000 -0x80000000
+0 0x20000000 0x40000000 0x80000000
diff --git a/tests/inlineasm/rv32/asmsanity.py b/tests/inlineasm/rv32/asmsanity.py
new file mode 100644
index 0000000000000..1a16d3504dbfe
--- /dev/null
+++ b/tests/inlineasm/rv32/asmsanity.py
@@ -0,0 +1,204 @@
+TEMPLATE3 = """
+@micropython.asm_rv32
+def f():
+    {}({}, {}, {})
+"""
+
+TEMPLATE2 = """
+@micropython.asm_rv32
+def f():
+    {}({}, {})
+"""
+
+TEMPLATE1 = """
+@micropython.asm_rv32
+def f():
+    {}({})
+"""
+
+
+REGISTERS = [
+    "zero",
+    "s0",
+    "s1",
+    "s2",
+    "s3",
+    "s4",
+    "s5",
+    "s6",
+    "s7",
+    "s8",
+    "s9",
+    "s10",
+    "s11",
+    "a0",
+    "a1",
+    "a2",
+    "a3",
+    "a4",
+    "a5",
+    "a6",
+    "a7",
+    "tp",
+    "gp",
+    "sp",
+    "ra",
+    "t0",
+    "t1",
+    "t2",
+    "t3",
+    "t4",
+    "t5",
+    "t6",
+    "x0",
+    "x1",
+    "x2",
+    "x3",
+    "x4",
+    "x5",
+    "x6",
+    "x7",
+    "x8",
+    "x9",
+    "x10",
+    "x11",
+    "x12",
+    "x13",
+    "x14",
+    "x15",
+    "x16",
+    "x17",
+    "x18",
+    "x19",
+    "x20",
+    "x21",
+    "x22",
+    "x23",
+    "x24",
+    "x25",
+    "x26",
+    "x27",
+    "x28",
+    "x29",
+    "x30",
+    "x31",
+]
+
+
+def harness(opcode, fragment, tag):
+    try:
+        exec(fragment)
+    except SyntaxError:
+        print(tag, opcode)
+
+
+for opcode in ("slli", "srli", "srai"):
+    harness(opcode, TEMPLATE3.format(opcode, "a0", "a0", -1), "-")
+    harness(opcode, TEMPLATE3.format(opcode, "a0", "a0", 33), "+")
+
+for opcode in ("c_slli", "c_srli", "c_srai"):
+    harness(opcode, TEMPLATE2.format(opcode, "a0", -1), "-")
+    harness(opcode, TEMPLATE2.format(opcode, "a0", 33), "+")
+
+harness("c_slli", TEMPLATE2.format("c_slli", "zero", 0), "0")
+harness("c_slli", TEMPLATE2.format("c_slli", "x0", 0), "0")
+
+for opcode in ("c_srli", "c_srai"):
+    for register in REGISTERS:
+        harness(opcode, TEMPLATE2.format(opcode, register, 0), register)
+
+for opcode in ("c_mv", "c_add"):
+    harness(opcode, TEMPLATE2.format(opcode, "a0", "zero"), "0l")
+    harness(opcode, TEMPLATE2.format(opcode, "zero", "a0"), "0r")
+    harness(opcode, TEMPLATE2.format(opcode, "zero", "zero"), "0b")
+
+harness("c_jr", TEMPLATE1.format("c_jr", "zero"), "0")
+
+for opcode in ("addi", "andi", "ori", "slti", "sltiu", "xori"):
+    harness(opcode, TEMPLATE3.format(opcode, "a0", "a0", 0x7FF), ">=s")
+    harness(opcode, TEMPLATE3.format(opcode, "a0", "a0", 0x800), ">s")
+    harness(opcode, TEMPLATE3.format(opcode, "a0", "a0", -2048), "<=s")
+    harness(opcode, TEMPLATE3.format(opcode, "a0", "a0", -2049), "<s")
+
+for opcode in ("lb", "lbu", "lh", "lhu", "lw", "sb", "sh", "sw"):
+    TEMPLATE = """
+@micropython.asm_rv32
+def f():
+    {}(a0, {}(a0))
+"""
+    harness(opcode, TEMPLATE.format(opcode, 0x7FF), ">=s")
+    harness(opcode, TEMPLATE.format(opcode, 0x800), ">s")
+    harness(opcode, TEMPLATE.format(opcode, -2048), "<=s")
+    harness(opcode, TEMPLATE.format(opcode, -2049), "<s")
+
+harness("c_addi", TEMPLATE2.format("c_andi", "zero", 0), "00")
+harness("c_addi", TEMPLATE2.format("c_andi", "zero", 512), ">0")
+harness("c_addi", TEMPLATE2.format("c_andi", "zero", -512), "<0")
+harness("c_addi", TEMPLATE2.format("c_andi", "s0", 0), "s0")
+harness("c_addi", TEMPLATE2.format("c_andi", "s0", -100), "<s")
+harness("c_addi", TEMPLATE2.format("c_andi", "s0", 100), ">s")
+
+harness("c_andi", TEMPLATE2.format("c_andi", "zero", 0), "00")
+harness("c_andi", TEMPLATE2.format("c_andi", "zero", 512), ">0")
+harness("c_andi", TEMPLATE2.format("c_andi", "zero", -512), "<0")
+harness("c_andi", TEMPLATE2.format("c_andi", "s0", 0), "s0")
+harness("c_andi", TEMPLATE2.format("c_andi", "s0", -100), "<s")
+harness("c_andi", TEMPLATE2.format("c_andi", "s0", 100), ">s")
+
+C_REGISTERS = (
+    "a0",
+    "a1",
+    "a2",
+    "a3",
+    "a4",
+    "a5",
+    "s0",
+    "s1",
+    "x8",
+    "x9",
+    "x10",
+    "x11",
+    "x12",
+    "x13",
+    "x14",
+    "x15",
+)
+
+for opcode in ("c_and", "c_or", "c_xor"):
+    for source in REGISTERS:
+        for destination in REGISTERS:
+            if source in C_REGISTERS and destination in C_REGISTERS:
+                try:
+                    exec(
+                        """
+@micropython.asm_rv32
+def f():
+    {}({}, {})
+""".format(opcode, source, destination)
+                    )
+                except SyntaxError:
+                    print(source, destination, opcode)
+            else:
+                try:
+                    exec(
+                        """
+@micropython.asm_rv32
+def f():
+    {}({}, {})
+""".format(opcode, source, destination)
+                    )
+                    print(source, destination, opcode)
+                except SyntaxError:
+                    pass
+    print(opcode)
+
+for opcode in ("c_lw", "c_sw"):
+    TEMPLATE = """
+@micropython.asm_rv32
+def f():
+    {}(a0, {}(a0))
+"""
+    harness(opcode, TEMPLATE.format(opcode, 60), ">=s")
+    harness(opcode, TEMPLATE.format(opcode, 61), ">s")
+    harness(opcode, TEMPLATE.format(opcode, -60), "<=s")
+    harness(opcode, TEMPLATE.format(opcode, -61), "<s")
diff --git a/tests/inlineasm/rv32/asmsanity.py.exp b/tests/inlineasm/rv32/asmsanity.py.exp
new file mode 100644
index 0000000000000..c9d9b69d2479a
--- /dev/null
+++ b/tests/inlineasm/rv32/asmsanity.py.exp
@@ -0,0 +1,162 @@
+- slli
++ slli
+- srli
++ srli
+- srai
++ srai
+- c_slli
++ c_slli
+- c_srli
++ c_srli
+- c_srai
++ c_srai
+0 c_slli
+0 c_slli
+zero c_srli
+s2 c_srli
+s3 c_srli
+s4 c_srli
+s5 c_srli
+s6 c_srli
+s7 c_srli
+s8 c_srli
+s9 c_srli
+s10 c_srli
+s11 c_srli
+a6 c_srli
+a7 c_srli
+tp c_srli
+gp c_srli
+sp c_srli
+ra c_srli
+t0 c_srli
+t1 c_srli
+t2 c_srli
+t3 c_srli
+t4 c_srli
+t5 c_srli
+t6 c_srli
+x0 c_srli
+x1 c_srli
+x2 c_srli
+x3 c_srli
+x4 c_srli
+x5 c_srli
+x6 c_srli
+x7 c_srli
+x16 c_srli
+x17 c_srli
+x18 c_srli
+x19 c_srli
+x20 c_srli
+x21 c_srli
+x22 c_srli
+x23 c_srli
+x24 c_srli
+x25 c_srli
+x26 c_srli
+x27 c_srli
+x28 c_srli
+x29 c_srli
+x30 c_srli
+x31 c_srli
+zero c_srai
+s2 c_srai
+s3 c_srai
+s4 c_srai
+s5 c_srai
+s6 c_srai
+s7 c_srai
+s8 c_srai
+s9 c_srai
+s10 c_srai
+s11 c_srai
+a6 c_srai
+a7 c_srai
+tp c_srai
+gp c_srai
+sp c_srai
+ra c_srai
+t0 c_srai
+t1 c_srai
+t2 c_srai
+t3 c_srai
+t4 c_srai
+t5 c_srai
+t6 c_srai
+x0 c_srai
+x1 c_srai
+x2 c_srai
+x3 c_srai
+x4 c_srai
+x5 c_srai
+x6 c_srai
+x7 c_srai
+x16 c_srai
+x17 c_srai
+x18 c_srai
+x19 c_srai
+x20 c_srai
+x21 c_srai
+x22 c_srai
+x23 c_srai
+x24 c_srai
+x25 c_srai
+x26 c_srai
+x27 c_srai
+x28 c_srai
+x29 c_srai
+x30 c_srai
+x31 c_srai
+0l c_mv
+0r c_mv
+0b c_mv
+0l c_add
+0r c_add
+0b c_add
+0 c_jr
+>s addi
+<s addi
+>s andi
+<s andi
+>s ori
+<s ori
+>s slti
+<s slti
+>s sltiu
+<s sltiu
+>s xori
+<s xori
+>s lb
+<s lb
+>s lbu
+<s lbu
+>s lh
+<s lh
+>s lhu
+<s lhu
+>s lw
+<s lw
+>s sb
+<s sb
+>s sh
+<s sh
+>s sw
+<s sw
+00 c_addi
+>0 c_addi
+<0 c_addi
+<s c_addi
+>s c_addi
+00 c_andi
+>0 c_andi
+<0 c_andi
+<s c_andi
+>s c_andi
+c_and
+c_or
+c_xor
+>s c_lw
+<s c_lw
+>s c_sw
+<s c_sw
diff --git a/tests/inlineasm/rv32/asmshift.py b/tests/inlineasm/rv32/asmshift.py
new file mode 100644
index 0000000000000..89a231f4dcdcf
--- /dev/null
+++ b/tests/inlineasm/rv32/asmshift.py
@@ -0,0 +1,121 @@
+@micropython.asm_rv32
+def lsl1(a0):
+    slli(a0, a0, 1)
+
+
+print(hex(lsl1(0x123)))
+
+
+@micropython.asm_rv32
+def lsl23(a0):
+    slli(a0, a0, 23)
+
+
+print(hex(lsl23(1)))
+
+
+@micropython.asm_rv32
+def lsr1(a0):
+    srli(a0, a0, 1)
+
+
+print(hex(lsr1(0x123)))
+
+
+@micropython.asm_rv32
+def lsr31(a0):
+    srli(a0, a0, 31)
+
+
+print(hex(lsr31(0x80000000)))
+
+
+@micropython.asm_rv32
+def asr1(a0):
+    srai(a0, a0, 1)
+
+
+print(hex(asr1(0x123)))
+
+
+@micropython.asm_rv32
+def asr31(a0):
+    srai(a0, a0, 31)
+
+
+print(hex(asr31(0x80000000)))
+
+
+@micropython.asm_rv32
+def clsl1(a0):
+    c_slli(a0, 1)
+
+
+print(hex(clsl1(0x123)))
+
+
+@micropython.asm_rv32
+def clsl23(a0):
+    c_slli(a0, 23)
+
+
+print(hex(clsl23(1)))
+
+
+@micropython.asm_rv32
+def clsr1(a0):
+    c_srli(a0, 1)
+
+
+print(hex(clsr1(0x123)))
+
+
+@micropython.asm_rv32
+def clsr31(a0):
+    c_srli(a0, 31)
+
+
+print(hex(clsr31(0x80000000)))
+
+
+@micropython.asm_rv32
+def casr1(a0):
+    c_srai(a0, 1)
+
+
+print(hex(casr1(0x123)))
+
+
+@micropython.asm_rv32
+def casr31(a0):
+    c_srai(a0, 31)
+
+
+print(hex(casr31(0x80000000)))
+
+
+@micropython.asm_rv32
+def lsl1r(a0):
+    li(a1, 1)
+    sll(a0, a0, a1)
+
+
+print(hex(lsl1r(0x123)))
+
+
+@micropython.asm_rv32
+def lsr1r(a0):
+    li(a1, 1)
+    srl(a0, a0, a1)
+
+
+print(hex(lsr1r(0x123)))
+
+
+@micropython.asm_rv32
+def asr1r(a0):
+    li(a1, 1)
+    sra(a0, a0, a1)
+
+
+print(hex(asr1r(0x123)))
diff --git a/tests/inlineasm/rv32/asmshift.py.exp b/tests/inlineasm/rv32/asmshift.py.exp
new file mode 100644
index 0000000000000..feb4cc707a984
--- /dev/null
+++ b/tests/inlineasm/rv32/asmshift.py.exp
@@ -0,0 +1,15 @@
+0x246
+0x800000
+0x91
+0x1
+0x91
+-0x1
+0x246
+0x800000
+0x91
+0x1
+0x91
+-0x1
+0x246
+0x91
+0x91
diff --git a/tests/inlineasm/rv32/asmstack.py b/tests/inlineasm/rv32/asmstack.py
new file mode 100644
index 0000000000000..9035f87284b39
--- /dev/null
+++ b/tests/inlineasm/rv32/asmstack.py
@@ -0,0 +1,65 @@
+# test stack manipulation
+
+
+@micropython.asm_rv32
+def l():
+    li(a2, 3)
+    addi(sp, sp, -8)
+    li(a0, 0x123)
+    sw(a0, 0(sp))
+    addi(a1, a0, 0x111)
+    sw(a1, 4(sp))
+    c_lwsp(a3, 0)
+    bne(a3, a0, END)
+    addi(a2, a2, -1)
+    c_lwsp(a3, 4)
+    bne(a3, a1, END)
+    addi(a2, a2, -1)
+    label(END)
+    addi(sp, sp, 8)
+    mv(a0, a2)
+
+
+print(l())
+
+
+@micropython.asm_rv32
+def s():
+    li(a2, 3)
+    addi(sp, sp, -8)
+    li(a0, 0x123)
+    c_swsp(a0, 0)
+    addi(a1, a0, 0x111)
+    c_swsp(a1, 4)
+    lw(a3, 0(sp))
+    bne(a3, a0, END)
+    addi(a2, a2, -1)
+    lw(a3, 4(sp))
+    bne(a3, a1, END)
+    addi(a2, a2, -1)
+    label(END)
+    addi(sp, sp, 8)
+    mv(a0, a2)
+
+
+print(s())
+
+
+@micropython.asm_rv32
+def a():
+    li(a2, 3)
+    addi(sp, sp, -8)
+    li(a0, 0x123)
+    sw(a0, 0(sp))
+    addi(a1, a0, 0x111)
+    sw(a1, 4(sp))
+    c_addi4spn(a3, 4)
+    lw(a3, -4(a3))
+    bne(a3, a0, END)
+    addi(a2, a2, -1)
+    label(END)
+    addi(sp, sp, 8)
+    mv(a0, a2)
+
+
+print(a())
diff --git a/tests/inlineasm/rv32/asmstack.py.exp b/tests/inlineasm/rv32/asmstack.py.exp
new file mode 100644
index 0000000000000..33280629d45d4
--- /dev/null
+++ b/tests/inlineasm/rv32/asmstack.py.exp
@@ -0,0 +1,3 @@
+1
+1
+2
diff --git a/tests/inlineasm/rv32/asmsum.py b/tests/inlineasm/rv32/asmsum.py
new file mode 100644
index 0000000000000..5d805553b97cf
--- /dev/null
+++ b/tests/inlineasm/rv32/asmsum.py
@@ -0,0 +1,59 @@
+@micropython.asm_rv32
+def asm_sum_words(a0, a1):
+    # a0 = len
+    # a1 = ptr
+    # a2 = sum
+    # a3 = dummy
+    li(a2, 0)
+
+    jal(zero, loop_entry)
+
+    label(loop1)
+    lw(a3, 0(a1))
+    add(a2, a2, a3)
+
+    addi(a1, a1, 4)
+    addi(a0, a0, -1)
+
+    label(loop_entry)
+    bne(a0, zero, loop1)
+
+    mv(a0, a2)
+
+
+@micropython.asm_rv32
+def asm_sum_bytes(a0, a1):
+    # a0 = len
+    # a1 = ptr
+    # a2 = sum
+    # a3 = dummy
+    li(a2, 0)
+
+    jal(zero, loop_entry)
+
+    label(loop1)
+    lbu(a3, 0(a1))
+    add(a2, a2, a3)
+
+    addi(a1, a1, 1)
+    addi(a0, a0, -1)
+
+    label(loop_entry)
+    bne(a0, zero, loop1)
+
+    mv(a0, a2)
+
+
+import array
+
+b = array.array("l", (100, 200, 300, 400))
+n = asm_sum_words(len(b), b)
+print(b, n)
+
+b = array.array("b", (10, 20, 30, 40, 50, 60, 70, 80))
+n = asm_sum_bytes(len(b), b)
+print(b, n)
+
+b = b"\x01\x02\x03\x04"
+n = asm_sum_bytes(len(b), b)
+print(b, n)
diff --git a/tests/inlineasm/rv32/asmsum.py.exp b/tests/inlineasm/rv32/asmsum.py.exp
new file mode 100644
index 0000000000000..3c83da367ae7b
--- /dev/null
+++ b/tests/inlineasm/rv32/asmsum.py.exp
@@ -0,0 +1,3 @@
+array('l', [100, 200, 300, 400]) 1000
+array('b', [10, 20, 30, 40, 50, 60, 70, 80]) 360
+b'\x01\x02\x03\x04' 10
diff --git a/tests/ports/qemu/asm_test.py b/tests/ports/qemu/asm_test.py
index 57238c62945b8..ab5ce6905fd91 100644
--- a/tests/ports/qemu/asm_test.py
+++ b/tests/ports/qemu/asm_test.py
@@ -1,4 +1,10 @@
-import frozen_asm_thumb as frozen_asm
+try:
+    import frozen_asm_thumb as frozen_asm
+except ImportError:
+    try:
+        import frozen_asm_rv32 as frozen_asm
+    except ImportError:
+        raise ImportError
 
 print(frozen_asm.asm_add(1, 2))
 print(frozen_asm.asm_add1(3))
diff --git a/tests/run-tests.py b/tests/run-tests.py
index f00510f2da2d7..db5ebe34cc3d5 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1245,9 +1245,12 @@ def main():
             elif args.platform == "qemu":
                 test_dirs += (
                     "float",
-                    "inlineasm/thumb",
                     "ports/qemu",
                 )
+                if args.arch == "rv32imc":
+                    test_dirs += ("inlineasm/rv32",)
+                else:
+                    test_dirs += ("inlineasm/thumb",)
             elif args.platform == "webassembly":
                 test_dirs += ("float", "ports/webassembly")
         else:

From 36aa7545b0764b6304af7d8dee1b5536eda33f77 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 6 Sep 2024 12:43:54 +0200
Subject: [PATCH 1752/3129] qemu/main: Make GC heap size configurable on a
 per-arch basis.

In certain circumstances depending on the code size, the
`deflate_decompress` test fails on both ARM and RV32 with a memory
allocation failure error.  The issue is mitigated by having a larger GC
heap, in this case around 20 KBytes more than the original 100 KBytes
default.

This commit makes the GC heap size configurable on a per-arch basis, with
both ARM and RV32 using the enlarged 120 KBytes heap.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile  | 4 ++++
 ports/qemu/README.md | 2 ++
 ports/qemu/main.c    | 8 +++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index ea0bef814866d..c8c07965f9cd3 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -19,9 +19,11 @@ QSTR_DEFS = qstrdefsport.h
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 ifeq ($(QEMU_ARCH),arm)
+MICROPY_HEAP_SIZE ?= 122880
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_thumb.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 ifeq ($(QEMU_ARCH),riscv32)
+MICROPY_HEAP_SIZE ?= 122880
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 
@@ -29,6 +31,8 @@ endif
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
+CFLAGS += -DMICROPY_HEAP_SIZE=$(MICROPY_HEAP_SIZE)
+
 ################################################################################
 # ARM specific settings
 
diff --git a/ports/qemu/README.md b/ports/qemu/README.md
index 9274bcc4e7566..70edf97f58e37 100644
--- a/ports/qemu/README.md
+++ b/ports/qemu/README.md
@@ -122,3 +122,5 @@ The following options can be specified on the `make` command line:
 - `QEMU_DEBUG_ARGS`: defaults to `-s` (gdb on TCP port 1234), but can be overridden
   with different qemu gdb arguments.
 - `QEMU_DEBUG_EXTRA`: extra options to pass to qemu when `QEMU_DEBUG=1` is used.
+- `MICROPY_HEAP_SIZE`: pass in an optional value (in bytes) for overriding the GC
+  heap size used by the port.
diff --git a/ports/qemu/main.c b/ports/qemu/main.c
index dff55058e16d1..75c6fe4cdc0d8 100644
--- a/ports/qemu/main.c
+++ b/ports/qemu/main.c
@@ -34,14 +34,16 @@
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 
-#define HEAP_SIZE (100 * 1024)
+#if MICROPY_HEAP_SIZE <= 0
+#error MICROPY_HEAP_SIZE must be a positive integer.
+#endif
 
-static uint32_t gc_heap[HEAP_SIZE / sizeof(uint32_t)];
+static uint32_t gc_heap[MICROPY_HEAP_SIZE / sizeof(uint32_t)];
 
 int main(int argc, char **argv) {
     mp_stack_ctrl_init();
     mp_stack_set_limit(10240);
-    gc_init(gc_heap, (char *)gc_heap + HEAP_SIZE);
+    gc_init(gc_heap, (char *)gc_heap + MICROPY_HEAP_SIZE);
 
     for (;;) {
         mp_init();

From 24482a93ef50dc0df1a704922f465d9c23e143c6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 20 Nov 2024 10:16:53 +0100
Subject: [PATCH 1753/3129] rp2/mpconfigport: Enable RV32 inline assembly
 support.

This commit enables by default inline assembly support for the RP2 target
when it is operating in RISC-V mode.  This brings the feature set when in
RISC-V mode to parity with what's available in ARM mode.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/rp2/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 8f4e846ba13bb..bc289bcbf97cf 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -87,6 +87,7 @@
 #endif
 #elif PICO_RISCV
 #define MICROPY_EMIT_RV32                       (1)
+#define MICROPY_EMIT_INLINE_RV32                (1)
 #endif
 
 // Optimisations

From 931a768f5529649c43a65e999ab28f2820002c38 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 20 Nov 2024 11:55:54 +0100
Subject: [PATCH 1754/3129] tests/run-tests.py: Detect inlineasm support and
 add tests if needed.

This commit implements a method to detect at runtime if inline assembler
support is enabled, and if so which platform it targets.

This allows clean test runs even on modified version of ARM-based ports
where inline assembler support is disabled, running inline assembler tests
on ports that have such feature not enabled by default and manually
enabled, and allows to always run the correct inlineasm tests for ports
that support more than one architecture (esp32, qemu, rp2).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/boards/MICROBIT.mk               |  3 --
 ports/qemu/boards/MPS2_AN385.mk             |  3 --
 ports/qemu/boards/NETDUINO2.mk              |  3 --
 ports/qemu/boards/SABRELITE.mk              |  2 +-
 ports/qemu/boards/VIRT_RV32.mk              |  3 --
 tests/feature_check/inlineasm_rv32.py       |  9 ++++
 tests/feature_check/inlineasm_rv32.py.exp   |  1 +
 tests/feature_check/inlineasm_thumb.py      |  9 ++++
 tests/feature_check/inlineasm_thumb.py.exp  |  1 +
 tests/feature_check/inlineasm_xtensa.py     |  9 ++++
 tests/feature_check/inlineasm_xtensa.py.exp |  1 +
 tests/run-tests.py                          | 60 +++++++++++++--------
 12 files changed, 68 insertions(+), 36 deletions(-)
 create mode 100644 tests/feature_check/inlineasm_rv32.py
 create mode 100644 tests/feature_check/inlineasm_rv32.py.exp
 create mode 100644 tests/feature_check/inlineasm_thumb.py
 create mode 100644 tests/feature_check/inlineasm_thumb.py.exp
 create mode 100644 tests/feature_check/inlineasm_xtensa.py
 create mode 100644 tests/feature_check/inlineasm_xtensa.py.exp

diff --git a/ports/qemu/boards/MICROBIT.mk b/ports/qemu/boards/MICROBIT.mk
index d6cfd7e2243d8..02eb0576c3438 100644
--- a/ports/qemu/boards/MICROBIT.mk
+++ b/ports/qemu/boards/MICROBIT.mk
@@ -11,6 +11,3 @@ LDSCRIPT = mcu/arm/nrf51.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb1.o
 
 MPY_CROSS_FLAGS += -march=armv7m
-
-# These RV32 tests don't run on Thumb, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/rv32'
diff --git a/ports/qemu/boards/MPS2_AN385.mk b/ports/qemu/boards/MPS2_AN385.mk
index 8d5c27df57c23..182d076eb35d4 100644
--- a/ports/qemu/boards/MPS2_AN385.mk
+++ b/ports/qemu/boards/MPS2_AN385.mk
@@ -10,6 +10,3 @@ LDSCRIPT = mcu/arm/mps2.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 
 MPY_CROSS_FLAGS += -march=armv7m
-
-# These RV32 tests don't run on Thumb, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/rv32'
diff --git a/ports/qemu/boards/NETDUINO2.mk b/ports/qemu/boards/NETDUINO2.mk
index f88ea32e7e58f..ffa781f339977 100644
--- a/ports/qemu/boards/NETDUINO2.mk
+++ b/ports/qemu/boards/NETDUINO2.mk
@@ -10,6 +10,3 @@ LDSCRIPT = mcu/arm/stm32.ld
 SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 
 MPY_CROSS_FLAGS += -march=armv7m
-
-# These RV32 tests don't run on Thumb, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/rv32'
diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE.mk
index d3f4e14d48022..839b3d6ac4fcf 100644
--- a/ports/qemu/boards/SABRELITE.mk
+++ b/ports/qemu/boards/SABRELITE.mk
@@ -16,4 +16,4 @@ SRC_BOARD_O = shared/runtime/gchelper_generic.o
 MPY_CROSS_FLAGS += -march=armv6
 
 # These tests don't work on Cortex-A9, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/rv32|inlineasm/thumb/(asmdiv|asmspecialregs).py'
+RUN_TESTS_ARGS = --exclude 'inlineasm/thumb/(asmdiv|asmspecialregs).py'
diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32.mk
index 80dd5d56fdc58..dd926480052e1 100644
--- a/ports/qemu/boards/VIRT_RV32.mk
+++ b/ports/qemu/boards/VIRT_RV32.mk
@@ -10,7 +10,4 @@ SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
 
 MPY_CROSS_FLAGS += -march=rv32imc
 
-# These Thumb tests don't run on RV32, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/thumb'
-
 RUN_NATMODTESTS_ARGS = --arch rv32imc
diff --git a/tests/feature_check/inlineasm_rv32.py b/tests/feature_check/inlineasm_rv32.py
new file mode 100644
index 0000000000000..21dd103b6c3fe
--- /dev/null
+++ b/tests/feature_check/inlineasm_rv32.py
@@ -0,0 +1,9 @@
+# check if RISC-V 32 inline asm is supported
+
+
+@micropython.asm_rv32
+def f():
+    add(a0, a0, a0)
+
+
+print("rv32")
diff --git a/tests/feature_check/inlineasm_rv32.py.exp b/tests/feature_check/inlineasm_rv32.py.exp
new file mode 100644
index 0000000000000..5eecf09c22403
--- /dev/null
+++ b/tests/feature_check/inlineasm_rv32.py.exp
@@ -0,0 +1 @@
+rv32
diff --git a/tests/feature_check/inlineasm_thumb.py b/tests/feature_check/inlineasm_thumb.py
new file mode 100644
index 0000000000000..321eab0e2f87a
--- /dev/null
+++ b/tests/feature_check/inlineasm_thumb.py
@@ -0,0 +1,9 @@
+# check if Thumb inline asm is supported
+
+
+@micropython.asm_thumb
+def f():
+    nop()
+
+
+print("thumb")
diff --git a/tests/feature_check/inlineasm_thumb.py.exp b/tests/feature_check/inlineasm_thumb.py.exp
new file mode 100644
index 0000000000000..bb48e1a2f03c2
--- /dev/null
+++ b/tests/feature_check/inlineasm_thumb.py.exp
@@ -0,0 +1 @@
+thumb
diff --git a/tests/feature_check/inlineasm_xtensa.py b/tests/feature_check/inlineasm_xtensa.py
new file mode 100644
index 0000000000000..2a24d39973c8c
--- /dev/null
+++ b/tests/feature_check/inlineasm_xtensa.py
@@ -0,0 +1,9 @@
+# check if Xtensa inline asm is supported
+
+
+@micropython.asm_xtensa
+def f():
+    ret_n()
+
+
+print("xtensa")
diff --git a/tests/feature_check/inlineasm_xtensa.py.exp b/tests/feature_check/inlineasm_xtensa.py.exp
new file mode 100644
index 0000000000000..036142c5097b5
--- /dev/null
+++ b/tests/feature_check/inlineasm_xtensa.py.exp
@@ -0,0 +1 @@
+xtensa
diff --git a/tests/run-tests.py b/tests/run-tests.py
index db5ebe34cc3d5..3dc0df029e74a 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -232,6 +232,14 @@ def get_test_instance(test_instance, baudrate, user, password):
     return pyb
 
 
+def detect_inline_asm_arch(pyb, args):
+    for arch in ("rv32", "thumb", "xtensa"):
+        output = run_feature_check(pyb, args, "inlineasm_{}.py".format(arch))
+        if output.strip() == arch.encode():
+            return arch
+    return None
+
+
 def detect_test_platform(pyb, args):
     # Run a script to detect various bits of information about the target test instance.
     output = run_feature_check(pyb, args, "target_info.py")
@@ -240,15 +248,19 @@ def detect_test_platform(pyb, args):
     platform, arch = str(output, "ascii").strip().split()
     if arch == "None":
         arch = None
+    inlineasm_arch = detect_inline_asm_arch(pyb, args)
 
     args.platform = platform
     args.arch = arch
     if arch and not args.mpy_cross_flags:
         args.mpy_cross_flags = "-march=" + arch
+    args.inlineasm_arch = inlineasm_arch
 
     print("platform={}".format(platform), end="")
     if arch:
         print(" arch={}".format(arch), end="")
+    if inlineasm_arch:
+        print(" inlineasm={}".format(inlineasm_arch), end="")
     print()
 
 
@@ -601,6 +613,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     skip_io_module = False
     skip_fstring = False
     skip_endian = False
+    skip_inlineasm = False
     has_complex = True
     has_coverage = False
 
@@ -661,20 +674,21 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         if output != b"a=1\n":
             skip_fstring = True
 
-        # Check if @micropython.asm_thumb supports Thumb2 instructions, and skip such tests if it doesn't
-        output = run_feature_check(pyb, args, "inlineasm_thumb2.py")
-        if output != b"thumb2\n":
-            skip_tests.add("inlineasm/thumb/asmbcc.py")
-            skip_tests.add("inlineasm/thumb/asmbitops.py")
-            skip_tests.add("inlineasm/thumb/asmconst.py")
-            skip_tests.add("inlineasm/thumb/asmdiv.py")
-            skip_tests.add("inlineasm/thumb/asmfpaddsub.py")
-            skip_tests.add("inlineasm/thumb/asmfpcmp.py")
-            skip_tests.add("inlineasm/thumb/asmfpldrstr.py")
-            skip_tests.add("inlineasm/thumb/asmfpmuldiv.py")
-            skip_tests.add("inlineasm/thumb/asmfpsqrt.py")
-            skip_tests.add("inlineasm/thumb/asmit.py")
-            skip_tests.add("inlineasm/thumb/asmspecialregs.py")
+        if args.inlineasm_arch == "thumb":
+            # Check if @micropython.asm_thumb supports Thumb2 instructions, and skip such tests if it doesn't
+            output = run_feature_check(pyb, args, "inlineasm_thumb2.py")
+            if output != b"thumb2\n":
+                skip_tests.add("inlineasm/thumb/asmbcc.py")
+                skip_tests.add("inlineasm/thumb/asmbitops.py")
+                skip_tests.add("inlineasm/thumb/asmconst.py")
+                skip_tests.add("inlineasm/thumb/asmdiv.py")
+                skip_tests.add("inlineasm/thumb/asmfpaddsub.py")
+                skip_tests.add("inlineasm/thumb/asmfpcmp.py")
+                skip_tests.add("inlineasm/thumb/asmfpldrstr.py")
+                skip_tests.add("inlineasm/thumb/asmfpmuldiv.py")
+                skip_tests.add("inlineasm/thumb/asmfpsqrt.py")
+                skip_tests.add("inlineasm/thumb/asmit.py")
+                skip_tests.add("inlineasm/thumb/asmspecialregs.py")
 
         # Check if emacs repl is supported, and skip such tests if it's not
         t = run_feature_check(pyb, args, "repl_emacs_check.py")
@@ -699,6 +713,8 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         )
         skip_endian = upy_byteorder != cpy_byteorder
 
+        skip_inlineasm = args.inlineasm_arch is None
+
     # These tests don't test slice explicitly but rather use it to perform the test
     misc_slice_tests = (
         "builtin_range",
@@ -852,6 +868,7 @@ def run_one_test(test_file):
         is_const = test_name.startswith("const")
         is_io_module = test_name.startswith("io_")
         is_fstring = test_name.startswith("string_fstring")
+        is_inlineasm = test_name.startswith("asm")
 
         skip_it = test_file in skip_tests
         skip_it |= skip_native and is_native
@@ -865,6 +882,7 @@ def run_one_test(test_file):
         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
+        skip_it |= skip_inlineasm and is_inlineasm
 
         if skip_it:
             print("skip ", test_file)
@@ -1213,17 +1231,17 @@ def main():
                 "misc",
                 "extmod",
             )
+            if args.inlineasm_arch is not None:
+                test_dirs += ("inlineasm/{}".format(args.inlineasm_arch),)
             if args.platform == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "inlineasm/thumb", "ports/stm32")
+                test_dirs += ("float", "stress", "ports/stm32")
             elif args.platform == "mimxrt":
-                test_dirs += ("float", "stress", "inlineasm/thumb")
+                test_dirs += ("float", "stress")
             elif args.platform == "renesas-ra":
-                test_dirs += ("float", "inlineasm/thumb", "ports/renesas-ra")
+                test_dirs += ("float", "ports/renesas-ra")
             elif args.platform == "rp2":
                 test_dirs += ("float", "stress", "thread", "ports/rp2")
-                if "arm" in args.mpy_cross_flags:
-                    test_dirs += ("inlineasm/thumb",)
             elif args.platform == "esp32":
                 test_dirs += ("float", "stress", "thread")
             elif args.platform in ("esp8266", "minimal", "samd", "nrf"):
@@ -1247,10 +1265,6 @@ def main():
                     "float",
                     "ports/qemu",
                 )
-                if args.arch == "rv32imc":
-                    test_dirs += ("inlineasm/rv32",)
-                else:
-                    test_dirs += ("inlineasm/thumb",)
             elif args.platform == "webassembly":
                 test_dirs += ("float", "ports/webassembly")
         else:

From 61e2931f864129524e0707c7487f804cfe59e84e Mon Sep 17 00:00:00 2001
From: Victor Rajewski <victor@allumeenergy.com.au>
Date: Wed, 4 Dec 2024 10:48:29 +1100
Subject: [PATCH 1755/3129] stm32/mboot: Add mboot version string.

Adds a configurable version string to a known location at the end of mboot
flash section.  Also stores the options mboot was built with, eg usb and
which filesystems are supported.

A board can override the defaults, or disable the version string entirely
by setting MBOOT_VERSION_ALLOCATED_BYTES=0.

Signed-off-by: Victor Rajewski <victor@allumeenergy.com.au>
---
 ports/stm32/mboot/Makefile          | 20 +++++++++-
 ports/stm32/mboot/README.md         | 16 ++++++++
 ports/stm32/mboot/fwupdate.py       | 22 ++++++++++
 ports/stm32/mboot/stm32_sections.ld |  6 +++
 ports/stm32/mboot/version.c         | 62 +++++++++++++++++++++++++++++
 5 files changed, 124 insertions(+), 2 deletions(-)
 create mode 100644 ports/stm32/mboot/version.c

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 07053b3293907..87bced1aee7ce 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -36,6 +36,12 @@ include $(BOARD_DIR)/mpconfigboard.mk
 # A board can set MBOOT_TEXT0_ADDR to a custom location where mboot should reside.
 MBOOT_TEXT0_ADDR ?= 0x08000000
 
+# The string in MBOOT_VERSION (default defined in version.c if not defined by a
+# board) will be stored in the final MBOOT_VERSION_ALLOCATED_BYTES bytes of mboot flash.
+# A board can change the size of this region by defining MBOOT_VERSION_ALLOCATED_BYTES.
+MBOOT_VERSION_ALLOCATED_BYTES ?= 64
+MBOOT_VERSION_INCLUDE_OPTIONS ?= 1  # if set to 1, this will append build options to version string (see version.c)
+
 USBDEV_DIR=usbdev
 DFU=$(TOP)/tools/dfu.py
 PYDFU ?= $(TOP)/tools/pydfu.py
@@ -78,9 +84,14 @@ CFLAGS += -DBUILDING_MBOOT=$(BUILDING_MBOOT)
 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DUSBD_ENABLE_VENDOR_DEVICE_REQUESTS=1
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
+ifdef MBOOT_VERSION
+CFLAGS += -DMBOOT_VERSION=\"$(MBOOT_VERSION)\"
+endif
+CFLAGS += -DMBOOT_VERSION_ALLOCATED_BYTES=$(MBOOT_VERSION_ALLOCATED_BYTES) -DMBOOT_VERSION_INCLUDE_OPTIONS=$(MBOOT_VERSION_INCLUDE_OPTIONS)
 
 MBOOT_LD_FILES ?= stm32_memory.ld stm32_sections.ld
 LDFLAGS += -nostdlib -L . $(addprefix -T,$(MBOOT_LD_FILES)) -Map=$(@:.elf=.map) --cref
+LDFLAGS += --defsym mboot_version_len=$(MBOOT_VERSION_ALLOCATED_BYTES)
 LIBS += $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Remove uncalled code from the final image.
@@ -121,6 +132,7 @@ SRC_C += \
 	vfs_fat.c \
 	vfs_lfs.c \
 	vfs_raw.c \
+	version.c \
 	drivers/bus/softspi.c \
 	drivers/bus/softqspi.c \
 	drivers/memory/spiflash.c \
@@ -206,7 +218,7 @@ deploy-stlink: $(BUILD)/firmware.dfu
 
 $(BUILD)/firmware.dfu: $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
-	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data $^ $(BUILD)/firmware.bin
+	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data -j .mboot_version_text $^ $(BUILD)/firmware.bin
 	$(Q)$(PYTHON) $(DFU) -b $(MBOOT_TEXT0_ADDR):$(BUILD)/firmware.bin $@
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
@@ -231,8 +243,9 @@ GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_DEFS = $(HEADER_BUILD)/pins_af_defs.h
+GEN_MPVERSION = $(HEADER_BUILD)/mpversion.h
 
-$(OBJ): $(GEN_QSTRDEFS_GENERATED) $(GEN_ROOT_POINTERS) $(GEN_PINS_AF_DEFS)
+$(OBJ): $(GEN_QSTRDEFS_GENERATED) $(GEN_ROOT_POINTERS) $(GEN_PINS_AF_DEFS) $(GEN_MPVERSION)
 
 $(HEADER_BUILD):
 	$(MKDIR) -p $(BUILD)/genhdr
@@ -250,6 +263,9 @@ $(GEN_PINS_AF_DEFS): $(BOARD_PINS) $(MAKE_PINS) ../$(AF_FILE) $(PREFIX_FILE) | $
 		--output-af-const $(GEN_PINS_AF_CONST) --output-af-defs $(GEN_PINS_AF_DEFS) \
 		--mboot-mode
 
+$(GEN_MPVERSION): | $(HEADER_BUILD)
+	$(PYTHON) ../../../py/makeversionhdr.py $@
+
 #########################################
 
 vpath %.S . $(TOP)
diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index 221e3a7c3acad..c294041a5194d 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -89,6 +89,17 @@ How to use
    the beginning of the chunk when the end is reached.  Then use a split
    raw filesystem to inform mboot of this wrapping.
 
+   The version and config options that mboot was built with are stored in a
+   small, fixed section of bytes at the end of the flash region allocated
+   for mboot. The length of the fixed section defaults to 64 bytes, but can
+   be overridden by setting MBOOT_VERSION_ALLOCATED_BYTES. If running
+   low on flash for the mboot build, this can be reduced or even set to 0.
+   The version string stored defaults to the micropython git version as
+   generated by makeversionhdr.py. The default version string can be
+   overridden by setting MBOOT_VERSION in a board's build files. The version
+   string is appended with options mboot was built with - see version.c for
+   details. This can be prevented by setting MBOOT_VERSION_INCLUDE_OPTIONS to 0.
+
 2. Build the board's main application firmware as usual.
 
 3. Build mboot via:
@@ -209,6 +220,11 @@ and signed firmware, and can be deployed via USB DFU, or by copying it to the de
 internal filesystem (if `MBOOT_FSLOAD` is enabled). `firmware.dfu` is still unencrypted
 and can be directly flashed with jtag etc.
 
+Retrieving the mboot version in micropython
+-------------------------------------------
+The function `get_mboot_version` in `fwupdate.py` returns the version mboot was built with,
+optionally with build options.
+
 Example: Mboot on PYBv1.x
 -------------------------
 
diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 8578ff4fc9032..b28ba2a782112 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -281,3 +281,25 @@ def update_mpy(*args, **kwargs):
     elems = update_app_elements(*args, **kwargs)
     if elems:
         machine.bootloader(elems)
+
+
+def get_mboot_version(
+    mboot_base=0x0800_0000,  # address of start of mboot flash section
+    mboot_len=0x8000,  # length of mboot flash section
+    mboot_ver_len=64,  # length of mboot version section (defined in mboot/Makefile or in board dir)
+    valid_prefix="mboot-",  # prefix that the version string was defined with
+    include_opts=True,  # return the options mboot was built with (set False for just the version)
+):
+    s = ""
+    for i in range(mboot_ver_len):
+        c = stm.mem8[mboot_base + mboot_len - mboot_ver_len + i]
+        if c == 0x00 or c == 0xFF:  # have hit padding or empty flash
+            break
+        s += chr(c)
+    if s.startswith(valid_prefix):
+        if include_opts:
+            return s
+        else:
+            return s.split("+")[0]  # optional mboot config info stored after "+"
+    else:  # version hasn't been set, so on the original mboot (i.e. mboot-v1.0.0)
+        return None
diff --git a/ports/stm32/mboot/stm32_sections.ld b/ports/stm32/mboot/stm32_sections.ld
index 3302c5f97291d..43511f083971d 100644
--- a/ports/stm32/mboot/stm32_sections.ld
+++ b/ports/stm32/mboot/stm32_sections.ld
@@ -47,6 +47,12 @@ SECTIONS
         _edata = .;
     } >RAM AT> FLASH_BL
 
+    /* Final section of mboot flash reserved for mboot version */
+    .mboot_version_text (ORIGIN(FLASH_BL) + LENGTH(FLASH_BL) - mboot_version_len) :
+    {
+        KEEP(*(.mboot_version));
+    } >FLASH_BL
+
     /* Zeroed-out data section */
     .bss :
     {
diff --git a/ports/stm32/mboot/version.c b/ports/stm32/mboot/version.c
new file mode 100644
index 0000000000000..b9912f61fcb65
--- /dev/null
+++ b/ports/stm32/mboot/version.c
@@ -0,0 +1,62 @@
+#include "mboot.h"
+#include "genhdr/mpversion.h"
+
+#if defined(MBOOT_VERSION_ALLOCATED_BYTES) && MBOOT_VERSION_ALLOCATED_BYTES > 0
+
+#ifndef MBOOT_VERSION
+#define MBOOT_VERSION "mboot-" MICROPY_GIT_TAG
+#endif
+
+#if MBOOT_VERSION_INCLUDE_OPTIONS  // if this is defined, append a list of build options e.g. fat.lfs2
+#define MBOOT_VERSION_USB MBOOT_VERSION "+usb"  // USB is always included
+
+#if defined(MBOOT_I2C_SCL)
+#define MBOOT_VERSION_I2C MBOOT_VERSION_USB ".i2c"
+#else
+#define MBOOT_VERSION_I2C MBOOT_VERSION_USB
+#endif
+
+#if MBOOT_ADDRESS_SPACE_64BIT
+#define MBOOT_VERSION_64BIT MBOOT_VERSION_I2C ".64"
+#else
+#define MBOOT_VERSION_64BIT MBOOT_VERSION_I2C
+#endif
+
+#if MBOOT_VFS_FAT
+#define MBOOT_VERSION_FAT MBOOT_VERSION_64BIT ".fat"
+#else
+#define MBOOT_VERSION_FAT MBOOT_VERSION_64BIT
+#endif
+
+#if MBOOT_VFS_LFS1
+#define MBOOT_VERSION_LFS1 MBOOT_VERSION_FAT ".lfs1"
+#else
+#define MBOOT_VERSION_LFS1 MBOOT_VERSION_FAT
+#endif
+
+#if MBOOT_VFS_LFS2
+#define MBOOT_VERSION_LFS2 MBOOT_VERSION_LFS1 ".lfs2"
+#else
+#define MBOOT_VERSION_LFS2 MBOOT_VERSION_LFS1
+#endif
+
+#if MBOOT_VFS_RAW
+#define MBOOT_VERSION_RAW MBOOT_VERSION_LFS2 ".raw"
+#else
+#define MBOOT_VERSION_RAW MBOOT_VERSION_LFS2
+#endif
+
+#define MBOOT_VERSION_FINAL MBOOT_VERSION_RAW
+
+#else // MBOOT_VERSION_INCLUDE_OPTIONS
+
+#define MBOOT_VERSION_FINAL MBOOT_VERSION
+
+#endif // MBOOT_VERSION_INCLUDE_OPTIONS
+
+// Ensure we don't overrun the allocated space
+_Static_assert(sizeof(MBOOT_VERSION_FINAL) <= MBOOT_VERSION_ALLOCATED_BYTES + 1, "mboot version string is too long");
+// Cuts off the null terminator
+const char mboot_version[sizeof(MBOOT_VERSION_FINAL) - 1] __attribute__((section(".mboot_version"))) __attribute__ ((__used__)) = MBOOT_VERSION_FINAL;
+
+#endif

From 3dd605e7de0dc8a04aac77c49709e8acf2ea2dd2 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Mon, 13 May 2024 12:00:08 +0200
Subject: [PATCH 1756/3129] shared/timeutils: Add missing mp_uint_t casts.

To prevent compiler warnings.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 shared/timeutils/timeutils.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/timeutils/timeutils.h b/shared/timeutils/timeutils.h
index 82032600f3a9b..874d16e97646d 100644
--- a/shared/timeutils/timeutils.h
+++ b/shared/timeutils/timeutils.h
@@ -62,7 +62,7 @@ mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
 
 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
-    timeutils_seconds_since_2000_to_struct_time(t - TIMEUTILS_SECONDS_1970_TO_2000, tm);
+    timeutils_seconds_since_2000_to_struct_time((mp_uint_t)(t - TIMEUTILS_SECONDS_1970_TO_2000), tm);
 }
 
 // Year is absolute, month/mday are 1-based, hours/minutes/seconds are 0-based.
@@ -78,7 +78,7 @@ static inline uint64_t timeutils_seconds_since_epoch(mp_uint_t year, mp_uint_t m
 }
 
 static inline mp_uint_t timeutils_seconds_since_epoch_from_nanoseconds_since_1970(uint64_t ns) {
-    return ns / 1000000000ULL;
+    return (mp_uint_t)(ns / 1000000000ULL);
 }
 
 static inline uint64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970(uint64_t ns) {

From b323b427702a26b655183c00e20ef49e3612f9a2 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Mon, 13 May 2024 12:04:16 +0200
Subject: [PATCH 1757/3129] extmod/modsocket: Add missing static in private
 function definitions.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 extmod/modsocket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/modsocket.c b/extmod/modsocket.c
index eedc17b2ffcb6..dd288b641a0cf 100644
--- a/extmod/modsocket.c
+++ b/extmod/modsocket.c
@@ -470,7 +470,7 @@ static const mp_rom_map_elem_t socket_locals_dict_table[] = {
 
 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) {
+static 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;
@@ -482,7 +482,7 @@ mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode)
     return ret;
 }
 
-mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+static 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;
@@ -494,7 +494,7 @@ mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *e
     return ret;
 }
 
-mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+static 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) {
         if (self->nic != MP_OBJ_NULL) {

From 61995b53c349d7ac3f3be08a5d6440de6614e0a8 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Mon, 13 May 2024 12:11:31 +0200
Subject: [PATCH 1758/3129] extmod/moddeflate: Add missing size_t cast.

To prevent compiler warnings.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 extmod/moddeflate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/moddeflate.c b/extmod/moddeflate.c
index c0c3bb26a8b12..4afad01618c4d 100644
--- a/extmod/moddeflate.c
+++ b/extmod/moddeflate.c
@@ -142,7 +142,7 @@ static bool deflateio_init_read(mp_obj_deflateio_t *self) {
         }
     }
 
-    size_t window_len = 1 << wbits;
+    size_t window_len = (size_t)1 << wbits;
     self->read->window = m_new(uint8_t, window_len);
 
     uzlib_uncompress_init(&self->read->decomp, self->read->window, window_len);

From 9bb6b50693fe9d813e95af01f1af4d850ebb0b07 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Mon, 13 May 2024 12:01:31 +0200
Subject: [PATCH 1759/3129] py/obj: Cast float literals to 64-bit to prevent
 overflow warning.

Fixes compilation warning C4307: '+': integral constant overflow.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 py/obj.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index d942e1bbf7b28..8a32bfcf0f1e4 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -184,12 +184,13 @@ static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
 #define MP_OBJ_NEW_SMALL_INT(small_int) ((mp_obj_t)((((mp_uint_t)(small_int)) << 1) | 1))
 
 #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))
+#define MP_OBJ_NEW_CONST_FLOAT(f) MP_ROM_PTR((mp_obj_t)((((((uint64_t)f) & ~3) | 2) + 0x80800000) & 0xffffffff))
+#define mp_const_float_e  MP_OBJ_NEW_CONST_FLOAT(0x402df854)
+#define mp_const_float_pi MP_OBJ_NEW_CONST_FLOAT(0x40490fdb)
 #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))
+#define mp_const_float_tau MP_OBJ_NEW_CONST_FLOAT(0x40c90fdb)
+#define mp_const_float_inf MP_OBJ_NEW_CONST_FLOAT(0x7f800000)
+#define mp_const_float_nan MP_OBJ_NEW_CONST_FLOAT(0xffc00000)
 #endif
 
 static inline bool mp_obj_is_float(mp_const_obj_t o) {

From 5d12df51fc431ecb159112bf4a40983c2ccba165 Mon Sep 17 00:00:00 2001
From: Yoctopuce <dev@yoctopuce.com>
Date: Fri, 24 May 2024 11:56:40 +0200
Subject: [PATCH 1760/3129] py/obj: Make literals unsigned in float get/new
 functions.

Fixes gcc warning when -Wsign-conversion is on.

Signed-off-by: Yoctopuce <dev@yoctopuce.com>
---
 py/obj.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 8a32bfcf0f1e4..bd31ef11d0928 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -203,7 +203,7 @@ static inline mp_float_t mp_obj_float_get(mp_const_obj_t o) {
     union {
         mp_float_t f;
         mp_uint_t u;
-    } num = {.u = ((mp_uint_t)o - 0x80800000) & ~3};
+    } num = {.u = ((mp_uint_t)o - 0x80800000u) & ~3u};
     return num.f;
 }
 static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
@@ -211,7 +211,7 @@ static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
         mp_float_t f;
         mp_uint_t u;
     } num = {.f = f};
-    return (mp_obj_t)(((num.u & ~0x3) | 2) + 0x80800000);
+    return (mp_obj_t)(((num.u & ~0x3u) | 2u) + 0x80800000u);
 }
 #endif
 

From 91e30df5f2c9e8c2c84277363a3266d09bc7ae49 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 20 Dec 2024 22:34:42 +1100
Subject: [PATCH 1761/3129] tests/run-tests.py: Set __main__ module to
 __injected_test.

When using unittest (for example) with injected mpy files, not only does
the name of the main test module need to be `__main__`, but also the
`__main__` module should correspond to this injected module.  Otherwise the
unittest test won't be detected.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 3dc0df029e74a..6af70cb836873 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -65,7 +65,9 @@ def base_path(*p):
 import sys, os, io, vfs
 class __File(io.IOBase):
   def __init__(self):
-    sys.modules['__injected_test'].__name__ = '__main__'
+    module = sys.modules['__injected_test']
+    module.__name__ = '__main__'
+    sys.modules['__main__'] = module
     self.off = 0
   def ioctl(self, request, arg):
     if request == 4: # MP_STREAM_CLOSE

From 6a90e513dea2267372d8e94f1b83f9260141907d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 27 Dec 2024 16:13:59 +1100
Subject: [PATCH 1762/3129] py/asmarm: Fix asm_arm_ldrh_reg_reg_offset to emit
 correct machine code.

Prior to this fix, the assembler generated `LDRH Rd, [Rn, #imm]!`, so the
second `LDRH` from the same origin would load from the wrong base.

Co-authored-by: Alessandro Gatti <a.gatti@frob.it>
Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index 6006490701251..634f2db4f6ab7 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -328,7 +328,7 @@ 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) {
     // ldrh rd, [rn, #off]
-    emit_al(as, 0x1f000b0 | (rn << 16) | (rd << 12) | ((byte_offset & 0xf0) << 4) | (byte_offset & 0xf));
+    emit_al(as, 0x1d000b0 | (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) {

From 510e055c71afd60be1aaae4594ec8f97cf8b9fa9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jan 2025 13:31:18 +1100
Subject: [PATCH 1763/3129] py/asmarm: Allow function state to be larger than
 255.

Co-authored-by: Alessandro Gatti <a.gatti@frob.it>
Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index 634f2db4f6ab7..b20bdebde5b1a 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -168,13 +168,23 @@ void asm_arm_entry(asm_arm_t *as, int num_locals) {
 
     emit_al(as, asm_arm_op_push(as->push_reglist | 1 << ASM_ARM_REG_LR));
     if (as->stack_adjust > 0) {
-        emit_al(as, asm_arm_op_sub_imm(ASM_ARM_REG_SP, ASM_ARM_REG_SP, as->stack_adjust));
+        if (as->stack_adjust < 0x100) {
+            emit_al(as, asm_arm_op_sub_imm(ASM_ARM_REG_SP, ASM_ARM_REG_SP, as->stack_adjust));
+        } else {
+            asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, as->stack_adjust);
+            emit_al(as, asm_arm_op_sub_reg(ASM_ARM_REG_SP, ASM_ARM_REG_SP, ASM_ARM_REG_R8));
+        }
     }
 }
 
 void asm_arm_exit(asm_arm_t *as) {
     if (as->stack_adjust > 0) {
-        emit_al(as, asm_arm_op_add_imm(ASM_ARM_REG_SP, ASM_ARM_REG_SP, as->stack_adjust));
+        if (as->stack_adjust < 0x100) {
+            emit_al(as, asm_arm_op_add_imm(ASM_ARM_REG_SP, ASM_ARM_REG_SP, as->stack_adjust));
+        } else {
+            asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, as->stack_adjust);
+            emit_al(as, asm_arm_op_add_reg(ASM_ARM_REG_SP, ASM_ARM_REG_SP, ASM_ARM_REG_R8));
+        }
     }
 
     emit_al(as, asm_arm_op_pop(as->push_reglist | (1 << ASM_ARM_REG_PC)));

From 966eb003946cdddb0e9236a70c432890117f70ab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jan 2025 14:11:28 +1100
Subject: [PATCH 1764/3129] tests/run-tests.py: Implement getcwd on __FS hook
 filesystem.

This method is needed by tests like `extmod/vfs_rom.py`.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 6af70cb836873..1df1b35d23b83 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -84,6 +84,8 @@ def umount(self):
     pass
   def chdir(self, path):
     pass
+  def getcwd(self):
+    return ""
   def stat(self, path):
     if path == '__injected_test.mpy':
       return tuple(0 for _ in range(10))

From fca8ea6c3994c5d9ffe088a678d01ec5279d5b6c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jan 2025 14:11:57 +1100
Subject: [PATCH 1765/3129] tests/extmod/vfs_rom.py: Import errno for test.

It's needed by the test.  This previously passed because the compiler
(actually parser) optimises away errno constants.

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

diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py
index 0382c84c55894..d416d83870558 100644
--- a/tests/extmod/vfs_rom.py
+++ b/tests/extmod/vfs_rom.py
@@ -1,7 +1,7 @@
 # Test VfsRom filesystem.
 
 try:
-    import sys, struct, os, uctypes, vfs
+    import errno, sys, struct, os, uctypes, vfs
 
     vfs.VfsRom
 except (ImportError, AttributeError):

From bb1e7de5c625e32d10a25fe594ece73f3daadd28 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jan 2025 15:47:06 +1100
Subject: [PATCH 1766/3129] qemu/boards: Exclude Thumb2 tests and tests failing
 with native emitter.

The `asmbcc`, `asmbitops`, `asmconst` and `asmit` tests fail to compile
with mpy-cross on armv6 architecture (used by SABRELITE), so explicitly
exclude them.

The `math_domain` and `vfs_rom` tests fail when compiled to native machine
code, so also exclude those unconditionally.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/boards/SABRELITE.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE.mk
index 839b3d6ac4fcf..9875667830294 100644
--- a/ports/qemu/boards/SABRELITE.mk
+++ b/ports/qemu/boards/SABRELITE.mk
@@ -16,4 +16,7 @@ SRC_BOARD_O = shared/runtime/gchelper_generic.o
 MPY_CROSS_FLAGS += -march=armv6
 
 # These tests don't work on Cortex-A9, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm/thumb/(asmdiv|asmspecialregs).py'
+RUN_TESTS_ARGS += --exclude 'inlineasm/thumb/(asmbcc|asmbitops|asmconst|asmdiv|asmit|asmspecialregs).py'
+
+# These tests fail with via-mpy and the native (armv6) emitter, so exclude them.
+RUN_TESTS_ARGS += --exclude 'extmod/vfs_rom.py|float/math_domain.py'

From b2a45014612beb0f1a79342d1921d5ea0fb2af2d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Sep 2024 11:55:23 +1000
Subject: [PATCH 1767/3129] qemu/Makefile: Add test_full target to run a
 comprehensive test suite.

The tests now include `--via-mpy` and `--via-mpy --emit native`, which will
test more cases of the native emitter under both ARM and RISC-V.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index c8c07965f9cd3..b792ee8ca9c5b 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -128,6 +128,8 @@ CFLAGS += $(SPECS_FRAGMENT)
 LDFLAGS += $(SPECS_FRAGMENT)
 endif
 
+RUN_TESTS_FULL_ARGS = -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../ports/qemu/$<" $(RUN_TESTS_ARGS)
+
 ################################################################################
 # Source files and libraries
 
@@ -169,8 +171,13 @@ run: $(BUILD)/firmware.elf
 
 .PHONY: test
 test: $(BUILD)/firmware.elf
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && ./run-tests.py -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
+	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS) $(RUN_TESTS_EXTRA)
+
+.PHONY: test_full
+test_full: $(BUILD)/firmware.elf
+	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS)
+	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS) --via-mpy
+	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS) --via-mpy --emit native
 
 .PHONY: test_natmod
 test_natmod: $(BUILD)/firmware.elf

From 495ce91caefda4623b026520e2b8d8709e274843 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Sep 2024 11:56:40 +1000
Subject: [PATCH 1768/3129] tools/ci.sh: Run test_full for qemu port CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 8d75d7cecf425..374395abd2ca5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -285,14 +285,14 @@ function ci_qemu_build_arm {
     make ${MAKEOPTS} -C ports/qemu submodules
     make ${MAKEOPTS} -C ports/qemu CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
     make ${MAKEOPTS} -C ports/qemu clean
-    make ${MAKEOPTS} -C ports/qemu test
-    make ${MAKEOPTS} -C ports/qemu BOARD=SABRELITE test
+    make ${MAKEOPTS} -C ports/qemu test_full
+    make ${MAKEOPTS} -C ports/qemu BOARD=SABRELITE test_full
 }
 
 function ci_qemu_build_rv32 {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 submodules
-    make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 test
+    make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 test_full
 
     # Test building and running native .mpy with rv32imc architecture.
     ci_native_mpy_modules_build rv32imc

From 065d45f9ec7d5597bfcfe075d45abb76197c1319 Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Fri, 8 Nov 2024 12:35:03 -0700
Subject: [PATCH 1769/3129] rp2/mphalport: Fix mp_hal_pin_low/high() for
 pin>=32.

Fixes issue #16190.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 ports/rp2/mphalport.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 33a1073e1df81..956db3ec702fb 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -182,11 +182,11 @@ static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
 }
 
 static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) {
-    gpio_clr_mask(1 << pin);
+    gpio_clr_mask64(UINT64_C(1) << pin);
 }
 
 static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {
-    gpio_set_mask(1 << pin);
+    gpio_set_mask64(UINT64_C(1) << pin);
 }
 
 enum mp_hal_pin_interrupt_trigger {

From 7964a435ea8cafed185e41eeb6dc24b269773650 Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Sat, 9 Nov 2024 15:04:35 -0700
Subject: [PATCH 1770/3129] rp2/machine_bitstream: Tweak
 MP_HAL_BITSTREAM_NS_OVERHEAD for RP2350.

See https://github.com/micropython/micropython/issues/16190#issuecomment-2466155919

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 ports/rp2/machine_bitstream.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/rp2/machine_bitstream.c b/ports/rp2/machine_bitstream.c
index 4ef97f0c86839..8411179f1ae57 100644
--- a/ports/rp2/machine_bitstream.c
+++ b/ports/rp2/machine_bitstream.c
@@ -32,7 +32,11 @@
 
 #if MICROPY_PY_MACHINE_BITSTREAM
 
+#if PICO_RP2350
+#define MP_HAL_BITSTREAM_NS_OVERHEAD  (5)
+#else
 #define MP_HAL_BITSTREAM_NS_OVERHEAD  (9)
+#endif
 
 #if PICO_RISCV
 

From 99ac8193ea299e6d836b076149f561e58226ede6 Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Thu, 14 Nov 2024 15:02:16 -0700
Subject: [PATCH 1771/3129] rp2/boards/SPARKFUN_PROMICRO_RP2350: Add SparkFun
 Pro Micro RP2350.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 .../SPARKFUN_PROMICRO_RP2350/board.json       | 22 +++++++++++++
 .../mpconfigboard.cmake                       |  4 +++
 .../SPARKFUN_PROMICRO_RP2350/mpconfigboard.h  | 26 ++++++++++++++++
 .../boards/SPARKFUN_PROMICRO_RP2350/pins.csv  | 31 +++++++++++++++++++
 4 files changed, 83 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/pins.csv

diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
new file mode 100644
index 0000000000000..d2bfa80a348d7
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Dual-core",
+        "External Flash",
+        "External RAM",
+        "JST-SH",
+        "RGB LED",
+        "USB-C"
+    ],
+    "images": [
+        "DEV-24870-Pro-Micro-RP2350-Feature.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "Pro Micro RP2350",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/24870",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.cmake
new file mode 100644
index 0000000000000..16f34c68027d7
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.cmake
@@ -0,0 +1,4 @@
+# cmake file for SparkFun Pro Micro RP2350
+
+set(PICO_BOARD "sparkfun_promicro_rp2350")
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.h
new file mode 100644
index 0000000000000..e01467d71ab05
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigboard.h
@@ -0,0 +1,26 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME "SparkFun Pro Micro RP2350"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (14 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x1B4F)
+#define MICROPY_HW_USB_PID (0x0039)
+
+#define MICROPY_HW_UART0_TX (0)
+#define MICROPY_HW_UART0_RX (1)
+#define MICROPY_HW_UART0_CTS (2)
+#define MICROPY_HW_UART0_RTS (3)
+
+#define MICROPY_HW_UART1_TX (8)
+#define MICROPY_HW_UART1_RX (9)
+#define MICROPY_HW_UART1_CTS (6)
+#define MICROPY_HW_UART1_RTS (7)
+
+#define MICROPY_HW_I2C0_SDA  (16)
+#define MICROPY_HW_I2C0_SCL  (17)
+
+#define MICROPY_HW_SPI0_SCK  (22)
+#define MICROPY_HW_SPI0_MOSI (23)
+#define MICROPY_HW_SPI0_MISO (20)
+
+#define MICROPY_HW_PSRAM_CS_PIN (19)
+#define MICROPY_HW_ENABLE_PSRAM (1)
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/pins.csv b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/pins.csv
new file mode 100644
index 0000000000000..07e1b094e9152
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/pins.csv
@@ -0,0 +1,31 @@
+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
+LED_RGB,GPIO25
+RGB_LED,GPIO25
+NEOPIXEL,GPIO25

From 5a5f0cb462e643a6ca4d5811f803ffad0c2e28d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jan 2025 17:11:51 +1100
Subject: [PATCH 1772/3129] github/workflows: Use Python 3.11 for unix settrace
 jobs.

GitHub Actions has updated ubuntu-latest to 24.04, which now defaults
CPython to 3.12, which has a known regression with settrace.  Fix that by
explicitly using CPython 3.11.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 64fd5c902a053..cb7abf06aac04 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -173,6 +173,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
+      # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
+      with:
+        python-version: '3.11'
     - name: Build
       run: source tools/ci.sh && ci_unix_settrace_build
     - name: Run main test suite
@@ -185,6 +190,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
+      # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
+      with:
+        python-version: '3.11'
     - name: Build
       run: source tools/ci.sh && ci_unix_settrace_stackless_build
     - name: Run main test suite

From 790986b3eda7702fb48502270d90a9dfc164832f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jan 2025 22:27:12 +1100
Subject: [PATCH 1773/3129] github/workflows: Use ubuntu-22.04 for unix qemu
 CI.

To use an older version of libffi.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index cb7abf06aac04..a095136b4a65e 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -219,7 +219,8 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   qemu_mips:
-    runs-on: ubuntu-latest
+    # ubuntu-22.04 is needed for older libffi.
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
@@ -233,7 +234,8 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   qemu_arm:
-    runs-on: ubuntu-latest
+    # ubuntu-22.04 is needed for older libffi.
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
@@ -247,7 +249,8 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   qemu_riscv64:
-    runs-on: ubuntu-latest
+    # ubuntu-22.04 is needed for older libffi.
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Install packages

From 6dbb7ab18f4b4c39baf2028e927177c5b2e1b14e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Jan 2025 14:34:13 +1100
Subject: [PATCH 1774/3129] tests/README: Update TLS certificate generation
 instructions.

Fix the command that converts `ec_key.pem` to `ec_key.der`, and increase
the certificate validity to 10 years.

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

diff --git a/tests/README.md b/tests/README.md
index 28c1b3a0852cc..891668c8b8737 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -222,7 +222,7 @@ need to be re-created by end users. This section is included here for reference
 
 A new self-signed RSA key/cert pair can be created with openssl:
 ```
-$ openssl req -x509 -newkey rsa:2048 -keyout rsa_key.pem -out rsa_cert.pem -days 365 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
+$ openssl req -x509 -newkey rsa:2048 -keyout rsa_key.pem -out rsa_cert.pem -days 3650 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
 ```
 In this case CN is: micropython.local
 
@@ -235,6 +235,6 @@ $ openssl x509 -in rsa_cert.pem -out rsa_cert.der -outform DER
 For elliptic curve tests using key/cert pairs, create a key then a certificate using:
 ```
 $ openssl ecparam -name prime256v1 -genkey -noout -out ec_key.pem
-$ openssl x509 -in ec_key.pem -out ec_key.der -outform DER
-$ openssl req -new -x509 -key ec_key.pem -out ec_cert.der -outform DER -days 365 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
+$ openssl pkey -in ec_key.pem -out ec_key.der -outform DER
+$ openssl req -new -x509 -key ec_key.pem -out ec_cert.der -outform DER -days 3650 -nodes -subj '/CN=micropython.local/O=MicroPython/C=AU'
 ```

From 1b4c969ce0c2ed83bcf366e1b6d977df3d72a9d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Jan 2025 14:35:54 +1100
Subject: [PATCH 1775/3129] tests/multi_net: Update TLS test certificates and
 keys.

They expired in early January 2025.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/ec_cert.der                   | Bin 471 -> 470 bytes
 tests/multi_net/ec_key.der                    | Bin 121 -> 121 bytes
 tests/multi_net/rsa_cert.der                  | Bin 867 -> 867 bytes
 tests/multi_net/rsa_key.der                   | Bin 1193 -> 1191 bytes
 tests/multi_net/sslcontext_getpeercert.py.exp |   2 +-
 .../sslcontext_verify_callback.py.exp         |   2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/multi_net/ec_cert.der b/tests/multi_net/ec_cert.der
index a503a39dfe49443dfdecfd79af0eab9f7cc2337d..a13f1c984a6400b7f6c9aef3b23c7f17c5a9c425 100644
GIT binary patch
delta 300
zcmcc4e2rP(po#Gk5LYf>W@2Pw5@BBbK`mP-zVF1Xtu-dsLSK44xw+ebi;Y98&EuRc
z3p3Ni2~Kiy;=D$t28M<v2FAvwhUQV?yv87|5rjLjKek?@>2*TrSBJarXUseP>V{LJ
zn}}IStn|c^MaBHu$9;av$vo5bx|J?8uTyF}U-4q^6mJIJUO69UiCM-I6!~2WGZzON
z1RBV)F^9_Xv52vV2%NhzeV+xx^NkZY0{s4R-Lc&NK+8ZLB(2OMVIbCku7DM+VsZha
zoQFGufeVv@x2UZ~;PaN`Knv?v2d{3PKCzK8Y{SoV1&7O?^F&xAGno{GAL~D2zr5#k
d{fx-XB7DW{{;4_4Zk57ufz@(zHbgz$1OTp$Y*YXM

delta 301
zcmcb{e4Sa}po#G^5LYf>W@2Pw5^)w?ezrgJ-##@5L%*8o*SJ)b*NPf&v2kd%d7QIl
zVP={*!AVX|oY%<2z|hddz{J$p)Hn*rH3f2wA>4`mvGtzYzy8Xo*%UP;<?!@?M$ei0
zE-`J~=L?vo_H8jPGds4vh3CqN^VZWoS$HJeSZDY6mvHPZR=GCTXWBOkGv;J{u~{5!
z5NIIF#vCfk$0Eie;<$O8xa`Eo29C0=&bwS6e7d@6s<eSTNLrai!a%G6T>&dt#pD7;
zIZqD;16L-6i2B6C?v~enZEes>_dOHhV)gPw?cx&l9>0fYo4>3To5G~XaQ;Z_c{PuY
fW4m<Bo_AlW-c}KIy?qv|?)6o5=Zi$Y@0<hx`ZRSS

diff --git a/tests/multi_net/ec_key.der b/tests/multi_net/ec_key.der
index 7d50fe3bcda1afbbc7d941be66a673c5fbb541b2..f136665755c7762da129d0739476b42aaca34afe 100644
GIT binary patch
literal 121
zcmV-<0EYiCcLD(c1Rxj!yI;=}RXCGNzmC}f0iLHKvrbt+KMtMXdaRw7+8dw>1_&yK
zNX|V20SBQ(13~}<D1z%?RrNsK@0gy)>exboMie%5T^o^fqH_-`$4vPi9Of-b+Gi4;
bi5j;KbE8XSO8^ax9!x_Rnlq3g4@7ZknF}pC

literal 121
zcmV-<0EYiCcLD(c1R$DG+%@_9vL<@B;!Ue6N^g&V-V~d-iN0|&7;OcczVo081_&yK
zNX|V20SBQ(13~}<Nw@X-Xne9-lw`w~P=QIAFGO613(s%@m5#JCb~eVZgbdWk&pVd#
bI7ndFu0G@X6J5Fm9)<<xE7);poNDwuB2_g{

diff --git a/tests/multi_net/rsa_cert.der b/tests/multi_net/rsa_cert.der
index d0ea34bf4d63e2b84bbf19da64d0a98f4af8a9f5..fc15ef9dae90d1027a3c8683f970e7f3f7f0bb0b 100644
GIT binary patch
delta 668
zcmV;N0%QH-2IB@JFoFYLFoFU{paTK{0s<6Zab*u37<i|>);(-;eB7fZ5nWl4BUKtT
zFflPSFf%hXFfdvd4Kp<`F)=bQGcz?XFp-jDf9?^F=O21pd|LuZnZODyu6IibE#z1s
z`nKde31!0ty&(xnjABv~E<uwig77prRCi>!X`aBVtlk`>Sx#b)96LjDoRlnt<m&{g
z#xVF)^mJp!js_f4KUX<ag63V;CQ$+#sNFv3c!q{@p|bT2tjNjODaZ6~2FaAEW4Ujq
zf2@JLH@W4|c@~Ljpyr52t~In<Kaa}m<<)o&v&T@P>v(%?Sq{w4Zf*z=*wE1swL@^;
zh0YR31aN#aDagXg2%@)*E{1|3v#$CXf#jCH&W}x7)#_wNS%Xa5GmeYNZ;w@u{w{tc
z<?*I%80gPXLAZoy>MO=!epbp6=tf;bOa4Cs0|5X5qf;<ZFdYU1RUHll76cTa<@Qz-
zQdcPA33wn+@+iyhaO!g~9|i+e9U}x7FcyFmpyl>f6jE0x;t6;lPx2_s?r`dJlRg3^
ze;C_TRaP5zU5RLB0>NjJ0tey0aV+F`0t<P^6eGAbI7D@!T5A`>AIkhC?2`3ZYY#fe
zwMflD>q4+n_w{#Z68VRuQ;d7*kG1^4nhD4<|F1G;?NQt-5Whm}VYT0<e;(2!!V0IK
z1<Az)wRSOqBl?VY>w|}Q9`flSr0q)yf2c89O<pML{yRTrcG=Hj$-c4ynEarvW?Y?`
zn4iTf=P*8LoloCqV~y`#%j0nXi7#whM#Aa|p}4~vev{WvxI%*QSaHc}--3cx7VIe&
zWdRP<{1p6$WZbgyMww~56@`>(is_hBDxF3G;ylM`7gy=8ct78jZarEM&*7270%N!+
C-Y=*C

delta 668
zcmV;N0%QH-2IB@JFoFYLFoFU{paTK{0s<5wuk(~YwW*=sF0&t&g6?5ev6!}zBUKtS
zFflPTFf=nUGBa8i4Kg(_F)=hSG&3<WGm(;Gf6g^YdFd+1KGZ!GWuuUn-x1p{)7b}^
za@>nNd82vUF~b`nsyBcwx1)S%*tF7fz+r5gcg?}?-0W=JLh^VS{n_}5ndgbkjNM#E
zeXkTsSPqik{X%6K!NaalOsVJMLA%K#gCLq;Hp8#t=#c(J6S7)!7Q>8tU=dSEbe|0X
ze^eMH;6&(TV<LQ)M9+~r#EP(`srK+0Z;r7A?foQ6d%kUcs=c|_2BQ9}t(efeT6CX;
z&5!b1^aifXRR#rr+faT#et@sma1%;UMN4~IMQWn*deHx|W{ogC2|EN0I;k2y!z|+2
zSK8q|Y(yHK)NFM7o}_XItb21d%X^WiOPf^!0|5X5qf;<ZFdYU1RUHll76cR+ahl+~
zcZ=wtjJhuxGKdUuIeXAB9|i+e9U}x7FcyFm7;&25ymyP}pp3dN8Zw9saXEX?lRg3^
zf21fH5|%Z}o$5W46!WcnChc-QPO*)lHo5;_PZs+^T%>$iJnzUEGqV6Ytn_D@&do~I
zzBDFGklJ|6Hup)hOX8p@CS_01=pxLJV+ZQaTrW_#nJR;9r%0PtlU%ypTOwWppeb1<
zX!=G4>wV2{pEqi7s3}RHZsYR$G49>Se_n3zc#@ICJ&P}bGJ_E2Tym)z2%A>9MdM@-
zrAVWpJC~*qJq!RvTt*gC42pRvA6fPq?cCpoJYn-VOI<DCNw62xgO{pAsYK1)gQG`H
z>m*oMb&h*Zx(Nl4^JbrF;z%P1i=L|5k_i(Ld+c4i{H3Lx8ZCjZR6!qR_Efg@0-J``
CrZBkx

diff --git a/tests/multi_net/rsa_key.der b/tests/multi_net/rsa_key.der
index c9c535ae639557e4e0023490a8f491a8ebf8985d..658af9bd89923af4381500f78b87cdb212c88301 100644
GIT binary patch
literal 1191
zcmV;Y1X%kpf&`-i0RRGm0RaH+5s&8|dR%;40!f*`3N5a8O9?IHSRwkh<U9#w!v(z|
z2}z7%QWGvglPQAmG&oduWVmUbz^km@9HUuIVvig<LvoyyEQI9i1ggd`_*C?CW5$jK
z98*76IaGq?UDhU10vo8^KInLchH{~@^$o1Z$=E5!^lk>pl&NF6Z>Ow*yf?Y!(0LY#
zX`tqaN3J!rTR)G=>*dvW4ztHlqU(5jY*`M>&u(rA5ZKVs5Vb>a-i6K*M+9(uGbzZz
z$_S#jjV^|QA+xUf8G+=MzRr(LTh;1hM_GeR+cS=f$#0KUj{YuwCFSv^Z5Zg!P(iqa
zXzDA*VSZN15$Hx;L;gPk0|5X50)hbmLBpst_=Oy|U5u<aM9hl;{{lm9;r&*nqmVe|
zf3Elr-sx%I)#*l4DB3nfZH0eo74byiC~~0s2mx_EVqoW&tmj<m)Fjw3M4Ih#0%aFc
z&@>;-Yx1`&a5L^4n)aay#HR>t1#vT0*b<xP|39LiaCi~6xc$_}8#rz9mTx(!?P726
z($c2o?8=0hh#zhLj8rqb9h<=`EF_vZeX${dbik8}WBimHMC^riNwDQ0<Zs#3D3!ch
zku;}Zs0Tj^@K6E?$$r>Ma8NW%yG^KctSGgn0LjRpWj<od7r67k2BUh^7I&Gf_uG@9
za5v_=$TWndK+C3ve)WHiz|>0t0)c@5`$h#`7Dyp&r1oHuim%&fz9TwH_cGOBQ>apf
zCXy9~qMYr&Py9+PYug<fJ^wruDD-?-xh0mY`5jh>>3Glk3EJ59f&^ayJllI%_dnRr
zQKQmg<Kat0zdSp@ViD1%Vd$n{kLpbtn}}r(f4z8dGt(JH(SufrHzDU%m2pq80)c@5
z@{9CR3jCZGdBl-of2<j2k<%RO<a;yWaHbcE=Z2g85+bapfj~|esi_tc<yFxuhLaJf
z<_>q3OZ}U^RD#H7sLEx0)gDsWylK5i#j>}#l|$@4atQA?uE?0*jB4JV2csvRpjqjQ
z%N1zj#^!@i)eNK(clSqCm9>f-JE9ox0)c@5!;F){%syycha&>EVWUWLw0?i^HGfAH
z$0b<HEZ{|kSm_=SWHTt6KC|#^D$<6t{l|YgAtb`3Y~9N#li?(y?%{PdDyuRusb=~R
zo1+1p9-#`WQA1TLbX0Kv;F6Pp6Z2L85+FLyIXR`ou^I?4xi3*2j}g*$$pc2ASbi;$
z0)c=jFz<^;W@9t)a2lw&x(1GVOL{BqpQg?5jiim}hzZfo)Tpt+*Q4vWREYH`k&Je6
z;$$mi_N)YuUq7YsKuo-z1JQhg%_NZN*rQg;jB$HO2towV<p+yXS*h&3G9e&=cZu-)
zmWX{nJ|UDHVPuEH#^cUsB~7joK*e>+0^4l@fq-v~=HD69Ml_;!lV1a9?}K@Iiv_OU
zTRu=@TQcg>%5A~x;2hY*W9gTuMfjFmPYh|s$*?s1&q0~VaE^=nR!$$2KC8=pHHPo$
zF&LbnnnK3<6+A-LCp=!}1lwt@`DNpN1!WHJdT=b2pllYMi{hlwxoiV9gft`Mzgl+m
FrDD&ROFsYr

literal 1193
zcmV;a1XlYnf&`@k0RRGm0RaHcHA#8tD#$+6Jr!l6keA;P+b`4E2bpr*i#&OwdE7C>
z8zHJUfGxM9d}-LU(sRIJY@2t@!SCGcY}`Wfcp3fK_=%b4iOr1NTt|Jc6iQeQlHdJ8
zWf{T4u24*==i))T$s>axnqM}<uj1&C{zVhAT5}e|jC)`aQ%Q864FFUaCE!HpWMd+H
zmqgEzI>d^wrK$Gt8E=lU1?~MLOMAX;eyY8>*9M~gtF4&OyIORggw2ogTl5C5%vA;j
zf7?)gKYoC()^HO_P(@37TSaQ3@_Nw!v1W}hJqbGm4LYeBKEo{H*;m@(K5Rr9p44n~
z`<|q72dsN@Hp_dFsGC&+0|5X50)hbmJHn%_st#2IC|n<eS~tL3%zyevY5`KtKkha&
zhE@Heib$oS|NE@OD5My~&HAImAUNuQc;@(x%@XTwmw1T>(U88#6q^z+{lg8A_8DqM
zM9TUR8ky8G9CW)L%&Nd1j=qNlEP$|)U3%`uxu%BvV^-xowxm+&4}4UxaGS#U7Uimh
z3Qj$y>E+E`?pGOWI19{1fg*x~LZsS-li6Vjd!SOf$?%fxLE*Ur4}R;11W>?`_D&Wm
zR1{Gf)N1K#^D#3p^RU`kI*3;Xt)j&8;P8I(Td0h#3R;SeIhat1+Q=%?RQnRwDTn%C
z&W>s?JM{}k2Z!{{b=YJKF!R7o0)c@5>hgq)q8a96ry81^*EVOYrOU6BaXowMHDP@n
zUdk|WHe<T9&Hqn&3Nz>LHi+ENYyvaob_#M4-My~dV5W!@VZf)t5i#E;s;uq5tSZJI
zjPERM%2Q*UQwB;t!VjUk_LQ-sM1Qi#cJb6qThdD#7+()3p_k@;6g-;tb&5M@0)c@5
z;ID+9HImxTl$yoIaK;Vb&<?Or!~L;}+WD<}R!bG79W$-`>W-<oTC^nj6h9@L`jF$K
z0S+_JqWXUNZ$?+QDr&hoY~E^nYXW{?yl+BkJe6^IbR3aw;LZpb!&&zGVs9a|iG?e6
z;Y{GY>^p_&mUT--XY)t2;BBI}dc-;70)c@5(+c;WulSwl1M#%dkINDRmWD}qh~w7H
zC=DYj-@COL?B-UF6u)w>$UJH3iOv+WuVJSqMhgl49CgQiv){ux&BPV05N`nKCB))q
z8w%|n=p^fY&yZ?Zz=u@l+`rf2E}qbqJn)P%;0;JiGV98PQ#J@u>?oUL-D$Tq4bB#y
z0)c@5ti=jD1%n9^Ie5{)Ol@A;k>S~%AvXZPe<dPI2F>xb=Rt?|ME<gGzS(Nr#J<tf
zWw7V^f_+0qnJf8Q<rug2HhrEn6b$O%Kqkn#<?6q!B`n<b!CU@M`Cl|freKv+G#a#4
zII!3KFTID$Ld|+<WwM9RwBQplc&U{~boEko0)c@5xj2ZU_Pm*)ca-Rw-~#LDGH<H|
z8hQ{Xh<&p`d9I7LjS0oDd*{L<sB$R&SD;6^MF=B`p$7OYVQifubcm;Q^|39LlP!Zz
zpY+Tto;IOEA<(#X%5HB*pzfTrwfG?N4&ufcQuOEI!fA&_UO)v0G%<@!NK==yOmv^i
HjY4VnT+>^e

diff --git a/tests/multi_net/sslcontext_getpeercert.py.exp b/tests/multi_net/sslcontext_getpeercert.py.exp
index e7a0ab0b4622c..a0dfaa4f567e5 100644
--- a/tests/multi_net/sslcontext_getpeercert.py.exp
+++ b/tests/multi_net/sslcontext_getpeercert.py.exp
@@ -1,5 +1,5 @@
 --- instance0 ---
 b'client to server'
 --- instance1 ---
-308201d330820179a00302010202144315a7cd8f69febe2640314e7c97d60a2523ad15300a06082a8648ce3d040302303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b3009060355040613024155301e170d3234303131343034353335335a170d3235303131333034353335335a303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b30090603550406130241553059301306072a8648ce3d020106082a8648ce3d0301070342000449b7f5fa687cb25a9464c397508149992f445c860bcf7002958eb4337636c6af840cd4c8cf3b96f2384860d8ae3ee3fa135dba051e8605e62bd871689c6af43ca3533051301d0603551d0e0416041441b3ae171d91e330411d8543ba45e0f2d5b2951b301f0603551d2304183016801441b3ae171d91e330411d8543ba45e0f2d5b2951b300f0603551d130101ff040530030101ff300a06082a8648ce3d04030203480030450220587f61c34739d6fab5802a674dcc54443ae9c87da374078c4ee1cd83f4ad1694022100cfc45dcf264888c6ba2c36e78bd27bb67856d7879a052dd7aa7ecf7215f7b992
+308201d230820179a003020102021403abf0266b125f8ec8dab57c34d655e94ae4d9bb300a06082a8648ce3d040302303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b3009060355040613024155301e170d3235303131343033333531375a170d3335303131323033333531375a303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b30090603550406130241553059301306072a8648ce3d020106082a8648ce3d030107034200042882eb6055f540ddef989ec7ead84281461436745d1b9174a2730f2bc74cf91e1ce62d4ada67129e891ab70e73a34b644b000d8d1e4c43189a3390210f447169a3533051301d0603551d0e0416041410ced497be3800e7b19008504efd0adc39bfe02a301f0603551d2304183016801410ced497be3800e7b19008504efd0adc39bfe02a300f0603551d130101ff040530030101ff300a06082a8648ce3d040302034700304402204b153d2851e7846351383beac1d5b39791810156b0f9672040d3499e14041969022013e32fe207d3bccb7f9859b3140e73074f656c034679135e517b1e9cb05ae5b2
 b'server to client'
diff --git a/tests/multi_net/sslcontext_verify_callback.py.exp b/tests/multi_net/sslcontext_verify_callback.py.exp
index e7a0ab0b4622c..a0dfaa4f567e5 100644
--- a/tests/multi_net/sslcontext_verify_callback.py.exp
+++ b/tests/multi_net/sslcontext_verify_callback.py.exp
@@ -1,5 +1,5 @@
 --- instance0 ---
 b'client to server'
 --- instance1 ---
-308201d330820179a00302010202144315a7cd8f69febe2640314e7c97d60a2523ad15300a06082a8648ce3d040302303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b3009060355040613024155301e170d3234303131343034353335335a170d3235303131333034353335335a303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b30090603550406130241553059301306072a8648ce3d020106082a8648ce3d0301070342000449b7f5fa687cb25a9464c397508149992f445c860bcf7002958eb4337636c6af840cd4c8cf3b96f2384860d8ae3ee3fa135dba051e8605e62bd871689c6af43ca3533051301d0603551d0e0416041441b3ae171d91e330411d8543ba45e0f2d5b2951b301f0603551d2304183016801441b3ae171d91e330411d8543ba45e0f2d5b2951b300f0603551d130101ff040530030101ff300a06082a8648ce3d04030203480030450220587f61c34739d6fab5802a674dcc54443ae9c87da374078c4ee1cd83f4ad1694022100cfc45dcf264888c6ba2c36e78bd27bb67856d7879a052dd7aa7ecf7215f7b992
+308201d230820179a003020102021403abf0266b125f8ec8dab57c34d655e94ae4d9bb300a06082a8648ce3d040302303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b3009060355040613024155301e170d3235303131343033333531375a170d3335303131323033333531375a303f311a301806035504030c116d6963726f707974686f6e2e6c6f63616c31143012060355040a0c0b4d6963726f507974686f6e310b30090603550406130241553059301306072a8648ce3d020106082a8648ce3d030107034200042882eb6055f540ddef989ec7ead84281461436745d1b9174a2730f2bc74cf91e1ce62d4ada67129e891ab70e73a34b644b000d8d1e4c43189a3390210f447169a3533051301d0603551d0e0416041410ced497be3800e7b19008504efd0adc39bfe02a301f0603551d2304183016801410ced497be3800e7b19008504efd0adc39bfe02a300f0603551d130101ff040530030101ff300a06082a8648ce3d040302034700304402204b153d2851e7846351383beac1d5b39791810156b0f9672040d3499e14041969022013e32fe207d3bccb7f9859b3140e73074f656c034679135e517b1e9cb05ae5b2
 b'server to client'

From e73cf71a246ee456aac0f4d16167e0856846db6b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 4 Jan 2025 15:00:28 +0100
Subject: [PATCH 1776/3129] tests/extmod/re_sub.py: Fix test execution on
 Python 3.13.

This commit fixes a test failure for `extmod/re_sub.py` where the code,
whilst being correct, would not make the test pass due to a newer
Python version than expected.

On Python 3.13, running `tests/extmod/re_sub.py` would yield a
deprecation warning about `re.sub` not providing the match count as a
keyword parameter.  This warning would be embedded in the expected test
result and thus the test would always fail.

Co-authored-by: stijn <stijn@ignitron.net>
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/extmod/re_sub.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/re_sub.py b/tests/extmod/re_sub.py
index 2c7c6c10f1a49..ecaa66d83d8a7 100644
--- a/tests/extmod/re_sub.py
+++ b/tests/extmod/re_sub.py
@@ -10,6 +10,8 @@
     print("SKIP")
     raise SystemExit
 
+import sys
+
 
 def multiply(m):
     return str(int(m.group(0)) * 2)
@@ -47,7 +49,11 @@ def A():
 print(re.sub("a", "b", "c"))
 
 # with maximum substitution count specified
-print(re.sub("a", "b", "1a2a3a", 2))
+if sys.implementation.name != "micropython":
+    # On CPython 3.13 and later the substitution count must be a keyword argument.
+    print(re.sub("a", "b", "1a2a3a", count=2))
+else:
+    print(re.sub("a", "b", "1a2a3a", 2))
 
 # invalid group
 try:

From 0a9cc9014ac228e5c51a067b7d83a97a539899da Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Wed, 13 Nov 2024 16:42:30 -0700
Subject: [PATCH 1777/3129] rp2/boards/SPARKFUN_THINGPLUS_RP2350: Add SparkFun
 Thing Plus RP2350.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 .../SPARKFUN_THINGPLUS_RP2350/board.json      | 27 +++++++++++
 .../SPARKFUN_THINGPLUS_RP2350/manifest.py     |  6 +++
 .../mpconfigboard.cmake                       | 15 ++++++
 .../SPARKFUN_THINGPLUS_RP2350/mpconfigboard.h | 48 +++++++++++++++++++
 .../boards/SPARKFUN_THINGPLUS_RP2350/pins.csv | 33 +++++++++++++
 5 files changed, 129 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/manifest.py
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/pins.csv

diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
new file mode 100644
index 0000000000000..09bbefe04dc1e
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
@@ -0,0 +1,27 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Battery Charging",
+        "Dual-core",
+        "External Flash",
+        "External RAM",
+        "Feather",
+        "JST-SH",
+        "RGB LED",
+        "USB-C",
+        "WiFi",
+        "microSD"
+    ],
+    "images": [
+        "25134-Thing-Plus-RP2350-Feature.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "Thing Plus RP2350",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/25134",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/manifest.py b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/manifest.py
new file mode 100644
index 0000000000000..4e38f09cdee4f
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/manifest.py
@@ -0,0 +1,6 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
+
+# Bluetooth
+require("aioble")
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.cmake
new file mode 100644
index 0000000000000..12b51f32a213f
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.cmake
@@ -0,0 +1,15 @@
+# cmake file for SparkFun Thing Plus RP2350
+
+set(PICO_BOARD "sparkfun_thingplus_rp2350")
+set(PICO_PLATFORM "rp2350")
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.h
new file mode 100644
index 0000000000000..f86faa761987b
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigboard.h
@@ -0,0 +1,48 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME          "SparkFun Thing Plus RP2350"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (14 * 1024 * 1024)
+
+// Enable networking.
+#define MICROPY_PY_NETWORK 1
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "ThingPlusRP2350"
+
+// CYW43 driver configuration.
+#define CYW43_USE_SPI (1)
+#define CYW43_LWIP (1)
+#define CYW43_GPIO (1)
+#define CYW43_SPI_PIO (1)
+
+#define MICROPY_HW_PIN_EXT_COUNT    CYW43_WL_GPIO_COUNT
+
+int mp_hal_is_pin_reserved(int n);
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
+
+#define MICROPY_HW_USB_VID (0x1B4F)
+#define MICROPY_HW_USB_PID (0x0038)
+
+#define MICROPY_HW_I2C0_SDA  (20)
+#define MICROPY_HW_I2C0_SCL  (21)
+
+#define MICROPY_HW_I2C1_SDA  (6)
+#define MICROPY_HW_I2C1_SCL  (7)
+
+#define MICROPY_HW_SPI0_SCK  (2)
+#define MICROPY_HW_SPI0_MOSI (3)
+#define MICROPY_HW_SPI0_MISO (4)
+
+#define MICROPY_HW_SPI1_SCK  (26)
+#define MICROPY_HW_SPI1_MOSI (27)
+#define MICROPY_HW_SPI1_MISO (28)
+
+#define MICROPY_HW_UART0_TX (0)
+#define MICROPY_HW_UART0_RX (1)
+#define MICROPY_HW_UART0_CTS (18)
+#define MICROPY_HW_UART0_RTS (19)
+
+#define MICROPY_HW_UART1_TX (4)
+#define MICROPY_HW_UART1_RX (5)
+#define MICROPY_HW_UART1_CTS (6)
+#define MICROPY_HW_UART1_RTS (7)
+
+#define MICROPY_HW_PSRAM_CS_PIN (8)
+#define MICROPY_HW_ENABLE_PSRAM (1)
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/pins.csv b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/pins.csv
new file mode 100644
index 0000000000000..d11ab42cd5063
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/pins.csv
@@ -0,0 +1,33 @@
+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
+LED_RGB,GPIO14
+RGB_LED,GPIO14
+NEOPIXEL,GPIO14

From ca71df0081ea634105beebaea063cdca8ef6a9a3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Jan 2025 16:44:23 +1100
Subject: [PATCH 1778/3129] esp32/boards: Remove remaining "id" entries from
 board.json.

This entry was originally used to override the firmware filenames generated
by the build server, but these days all filenames should match the board
directory name.  So, remove the "id" entry and let the default be used.

This is a follow-up to 1a99f74063569df0927e1ada0256059fcdef128c (these
three boards were added after that change).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_GENERIC_C6/board.json | 1 -
 ports/esp32/boards/UM_NANOS3/board.json        | 1 -
 ports/esp32/boards/UM_OMGS3/board.json         | 1 -
 3 files changed, 3 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/board.json b/ports/esp32/boards/ESP32_GENERIC_C6/board.json
index 963d9515be859..cf644f9038a6b 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C6/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/board.json
@@ -7,7 +7,6 @@
         "BLE",
         "WiFi"
     ],
-    "id": "esp32c6",
     "images": [
         "esp32c6_devkitmini.jpg"
     ],
diff --git a/ports/esp32/boards/UM_NANOS3/board.json b/ports/esp32/boards/UM_NANOS3/board.json
index b213a8ad6bd43..958f9adf514d7 100644
--- a/ports/esp32/boards/UM_NANOS3/board.json
+++ b/ports/esp32/boards/UM_NANOS3/board.json
@@ -13,7 +13,6 @@
     "features_non_filterable": [
         "TinyPICO Nano Compatible"
     ],
-    "id": "nanos3",
     "images": [
         "unexpectedmaker_nanos3.jpg"
     ],
diff --git a/ports/esp32/boards/UM_OMGS3/board.json b/ports/esp32/boards/UM_OMGS3/board.json
index e4cb873914885..7e976ad63034e 100644
--- a/ports/esp32/boards/UM_OMGS3/board.json
+++ b/ports/esp32/boards/UM_OMGS3/board.json
@@ -13,7 +13,6 @@
     "features_non_filterable": [
         "I2C BAT Fuel Gauge"
     ],
-    "id": "omgs3",
     "images": [
         "unexpectedmaker_omgs3.jpg"
     ],

From d533c9067a3a2709d56304944e5142ff71830c8d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Jan 2025 17:17:22 +1100
Subject: [PATCH 1779/3129] tools/autobuild: Don't allow a board to change its
 ID.

All board IDs are now the board directory name.

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

diff --git a/tools/autobuild/build-downloads.py b/tools/autobuild/build-downloads.py
index c03d98aa5dea4..d6f6d0324691c 100755
--- a/tools/autobuild/build-downloads.py
+++ b/tools/autobuild/build-downloads.py
@@ -65,9 +65,8 @@ def main(repo_path, output_path):
                 )
                 sys.exit(1)
 
-            # 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))
+            # The ID of a board is the board directory (e.g. "PYBV11").
+            blob["id"] = os.path.basename(board_dir)
 
             # Check for duplicate board IDs.
             if blob["id"] in board_ids:

From 0950f65ac48bb8315a9ae51be0d4099432cad548 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 6 Sep 2024 15:50:35 +0200
Subject: [PATCH 1780/3129] tools/pyboard.py: Wait a bit before accessing the
 PTY serial port.

Some PTY targets, namely `NETDUINO2` and `MICROBIT` under Qemu, take a bit
more time to present a REPL than usual.  The pyboard tool is a bit too
impatient and would bail out before any of those targets had a chance to
respond to the raw REPL request.

Co-authored-by: Damien George <damien@micropython.org>
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/pyboard.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 8459bcf655683..dac51e7d6b896 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -244,6 +244,8 @@ def __init__(self, cmd):
             self.close()
             sys.exit(1)
         pty = m.group()
+        # Compensate for some boards taking a bit longer to start
+        time.sleep(0.1)
         # rtscts, dsrdtr params are to workaround pyserial bug:
         # http://stackoverflow.com/questions/34831131/pyserial-does-not-play-well-with-virtual-port
         self.serial = serial.Serial(pty, interCharTimeout=1, rtscts=True, dsrdtr=True)

From 1232a83555968e04ec8e2ceb0d49435aa18de9f0 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 6 Sep 2024 18:40:34 +0200
Subject: [PATCH 1781/3129] qemu/mcu/arm: Dump exception cause and registers on
 machine error.

When a CPU exception is raised when emulating a Thumb-capable processor,
the default exception handler would simply enter in an endless loop without
providing any further information.

This commit adds a more complete exception handler that dumps to STDOUT the
exception cause and the status of the registers at the moment of the
exception.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile               |   1 +
 ports/qemu/mcu/arm/errorhandler.c | 176 ++++++++++++++++++++++++++++++
 ports/qemu/mcu/arm/startup.c      |  32 ++++--
 3 files changed, 199 insertions(+), 10 deletions(-)
 create mode 100644 ports/qemu/mcu/arm/errorhandler.c

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index b792ee8ca9c5b..f555ca50deaf5 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -44,6 +44,7 @@ LDFLAGS += -nostdlib
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 SRC_C += \
+	mcu/arm/errorhandler.c \
 	mcu/arm/startup.c \
 	shared/runtime/semihosting_arm.c \
 
diff --git a/ports/qemu/mcu/arm/errorhandler.c b/ports/qemu/mcu/arm/errorhandler.c
new file mode 100644
index 0000000000000..a0e7ef930f0b8
--- /dev/null
+++ b/ports/qemu/mcu/arm/errorhandler.c
@@ -0,0 +1,176 @@
+/*
+ * This file is part of the MicroPython project, https://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
+
+#include "py/runtime.h"
+
+#if defined(__ARM_ARCH_ISA_THUMB)
+
+typedef enum _exception_kind_t {
+    RESET = 1,
+    NMI = 2,
+    HARD_FAULT = 3,
+    MEM_MANAGE = 4,
+    BUS_FAULT = 5,
+    USAGE_FAULT = 6,
+    SV_CALL = 11,
+    DEBUG_MONITOR = 12,
+    PENDING_SV = 13,
+    SYSTEM_TICK = 14,
+} exception_kind_t;
+
+static const char *EXCEPTION_NAMES_TABLE[] = {
+    "Reserved",
+    "Reset",
+    "NMI",
+    "HardFault",
+    "MemManage",
+    "BusFault",
+    "UsageFault",
+    "SVCall",
+    "DebugMonitor",
+    "PendSV",
+    "SysTick",
+    "External interrupt"
+};
+
+// R0-R15, PSR, Kind
+uintptr_t registers_copy[18] = { 0 };
+
+__attribute__((naked)) NORETURN void exception_handler(uintptr_t kind) {
+    // Save registers
+    __asm volatile (
+        "ldr r1, =registers_copy \n"
+        "str r0, [r1, #68]       \n" // Kind
+        "ldr r0, [sp, #0]        \n" // R0
+        "str r0, [r1, #0]        \n"
+        "ldr r0, [sp, #4]        \n" // R1
+        "str r0, [r1, #4]        \n"
+        "ldr r0, [sp, #8]        \n" // R2
+        "str r0, [r1, #8]        \n"
+        "ldr r0, [sp, #12]       \n" // R3
+        "str r0, [r1, #12]       \n"
+        "str r4, [r1, #16]       \n"
+        "str r5, [r1, #20]       \n"
+        "str r6, [r1, #24]       \n"
+        "str r7, [r1, #28]       \n"
+        "mov r0, r8              \n"
+        "str r0, [r1, #32]       \n"
+        "mov r0, r9              \n"
+        "str r0, [r1, #36]       \n"
+        "mov r0, r10             \n"
+        "str r0, [r1, #40]       \n"
+        "mov r0, r11             \n"
+        "str r0, [r1, #44]       \n"
+        "ldr r0, [sp, #16]       \n" // R12
+        "str r0, [r1, #48]       \n"
+        "mov r0, sp              \n"
+        "sub r0, #32             \n"
+        "str r0, [r1, #52]       \n"
+        "ldr r0, [sp, #20]       \n" // R14
+        "str r0, [r1, #56]       \n"
+        "ldr r0, [sp, #24]       \n" // R15
+        "str r0, [r1, #60]       \n"
+        "ldr r0, [sp, #28]       \n" // xPSR
+        "str r0, [r1, #64]       \n"
+        :
+        :
+        : "memory"
+        );
+
+    uintptr_t saved_kind = registers_copy[17];
+
+    switch (saved_kind) {
+        case RESET:
+        case NMI:
+        case HARD_FAULT:
+        case MEM_MANAGE:
+        case BUS_FAULT:
+        case USAGE_FAULT:
+        case SV_CALL:
+        case DEBUG_MONITOR:
+        case PENDING_SV:
+        case SYSTEM_TICK:
+            printf(EXCEPTION_NAMES_TABLE[saved_kind]);
+            break;
+        default:
+            if (saved_kind >= 16) {
+                printf("%s %d", EXCEPTION_NAMES_TABLE[11], saved_kind - 16);
+            } else {
+                printf(EXCEPTION_NAMES_TABLE[0]);
+            }
+            break;
+    }
+    printf(" exception caught:\n");
+    printf("R0:   %08X R1:   %08X R2:   %08X R3:   %08X\n", registers_copy[0], registers_copy[1], registers_copy[2], registers_copy[3]);
+    printf("R4:   %08X R5:   %08X R6:   %08X R7:   %08X\n", registers_copy[4], registers_copy[5], registers_copy[6], registers_copy[7]);
+    printf("R8:   %08X R9:   %08X R10:  %08X R11:  %08X\n", registers_copy[8], registers_copy[9], registers_copy[10], registers_copy[11]);
+    printf("R12:  %08X R13:  %08X R14:  %08X R15:  %08X\n", registers_copy[12], registers_copy[13], registers_copy[14], registers_copy[15]);
+    printf("xPSR: %08X\n", registers_copy[16]);
+
+    for (;;) {}
+}
+
+__attribute__((naked)) NORETURN void NMI_Handler(void) {
+    exception_handler(NMI);
+}
+
+__attribute__((naked)) NORETURN void HardFault_Handler(void) {
+    exception_handler(HARD_FAULT);
+}
+
+__attribute__((naked)) NORETURN void MemManage_Handler(void) {
+    exception_handler(MEM_MANAGE);
+}
+
+__attribute__((naked)) NORETURN void BusFault_Handler(void) {
+    exception_handler(BUS_FAULT);
+}
+
+__attribute__((naked)) NORETURN void UsageFault_Handler(void) {
+    exception_handler(USAGE_FAULT);
+}
+
+__attribute__((naked)) NORETURN void SVC_Handler(void) {
+    exception_handler(SV_CALL);
+}
+
+__attribute__((naked)) NORETURN void DebugMon_Handler(void) {
+    exception_handler(DEBUG_MONITOR);
+}
+
+__attribute__((naked)) NORETURN void PendSV_Handler(void) {
+    exception_handler(PENDING_SV);
+}
+
+__attribute__((naked)) NORETURN void SysTick_Handler(void) {
+    exception_handler(SYSTEM_TICK);
+}
+
+#endif
diff --git a/ports/qemu/mcu/arm/startup.c b/ports/qemu/mcu/arm/startup.c
index 118a5b8006f15..dbb75e3392287 100644
--- a/ports/qemu/mcu/arm/startup.c
+++ b/ports/qemu/mcu/arm/startup.c
@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "py/runtime.h"
+
 #include "shared/runtime/semihosting_arm.h"
 #include "uart.h"
 
@@ -50,7 +52,7 @@ __attribute__((naked)) void Reset_Handler(void) {
     _start();
 }
 
-void Default_Handler(void) {
+NORETURN void Default_Handler(void) {
     for (;;) {
     }
 }
@@ -74,25 +76,35 @@ __attribute__((naked, section(".isr_vector"))) void isr_vector(void) {
 
 #elif defined(__ARM_ARCH_ISA_THUMB)
 
+extern void NMI_Handler(void);
+extern void HardFault_Handler(void);
+extern void MemManage_Handler(void);
+extern void BusFault_Handler(void);
+extern void UsageFault_Handler(void);
+extern void SVC_Handler(void);
+extern void DebugMon_Handler(void);
+extern void PendSV_Handler(void);
+extern void SysTick_Handler(void);
+
 // ARM architecture with Thumb-only ISA.
 
 const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
     (uint32_t)&_estack,
     (uint32_t)&Reset_Handler,
-    (uint32_t)&Default_Handler, // NMI_Handler
-    (uint32_t)&Default_Handler, // HardFault_Handler
-    (uint32_t)&Default_Handler, // MemManage_Handler
-    (uint32_t)&Default_Handler, // BusFault_Handler
-    (uint32_t)&Default_Handler, // UsageFault_Handler
+    (uint32_t)&NMI_Handler,
+    (uint32_t)&HardFault_Handler,
+    (uint32_t)&MemManage_Handler,
+    (uint32_t)&BusFault_Handler,
+    (uint32_t)&UsageFault_Handler,
     0,
     0,
     0,
     0,
-    (uint32_t)&Default_Handler, // SVC_Handler
-    (uint32_t)&Default_Handler, // DebugMon_Handler
+    (uint32_t)&SVC_Handler,
+    (uint32_t)&DebugMon_Handler,
     0,
-    (uint32_t)&Default_Handler, // PendSV_Handler
-    (uint32_t)&Default_Handler, // SysTick_Handler
+    (uint32_t)&PendSV_Handler,
+    (uint32_t)&SysTick_Handler,
 };
 
 #endif

From 3225c1bc66a3cf21c3fc48917123c24131bdbf8b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 6 Sep 2024 20:32:04 +0200
Subject: [PATCH 1782/3129] qemu: Disable native emitter for the MICROBIT
 board.

The Micro:Bit machine definition in Qemu has soft MMU support enabled,
which is currently not compatible with the way MicroPython generates code
that needs to call back into non-emitted code.

As a stop-gap solution, the native code emitter for the MICROBIT board is
turned off.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile       | 4 ++++
 ports/qemu/mpconfigport.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index f555ca50deaf5..1b77b1790598a 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -20,8 +20,12 @@ MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 ifeq ($(QEMU_ARCH),arm)
 MICROPY_HEAP_SIZE ?= 122880
+ifeq ($(BOARD),MICROBIT)
+FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_const.py'))"
+else
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_thumb.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
+endif
 ifeq ($(QEMU_ARCH),riscv32)
 MICROPY_HEAP_SIZE ?= 122880
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 8f55d284f93da..0a25df4d0ac10 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -34,8 +34,10 @@
 #define MICROPY_EMIT_ARM            (1)
 #define MICROPY_EMIT_INLINE_THUMB   (1)
 #elif defined(__ARM_ARCH_ISA_THUMB)
+#if !defined(QEMU_SOC_NRF51)
 #define MICROPY_EMIT_THUMB          (1)
 #define MICROPY_EMIT_INLINE_THUMB   (1)
+#endif
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 #elif defined(__riscv)
 #define MICROPY_EMIT_RV32           (1)

From e84c9abfc21f57fe93b4d9a05c1d123e3f333880 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 14 Jan 2025 02:26:16 +0100
Subject: [PATCH 1783/3129] qemu/Makefile: Increase GC heap size to 140KiB.

This commit increases the GC heap size from 120KiB to 140KiB, as it is
needed to make the full test suite pass on SABRELITE when ran through the
armv6 native emitter.

This is needed as the code output by the armv6 native emitter is limited to
4-bytes opcodes and thus takes more space than other ARM emitters.

To keep things aligned, the RV32 port also got its heap size increased even
though it is not needed on that platform right now.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 1b77b1790598a..bf9addc6f3256 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -19,7 +19,7 @@ QSTR_DEFS = qstrdefsport.h
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 ifeq ($(QEMU_ARCH),arm)
-MICROPY_HEAP_SIZE ?= 122880
+MICROPY_HEAP_SIZE ?= 143360
 ifeq ($(BOARD),MICROBIT)
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_const.py'))"
 else
@@ -27,7 +27,7 @@ FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_thum
 endif
 endif
 ifeq ($(QEMU_ARCH),riscv32)
-MICROPY_HEAP_SIZE ?= 122880
+MICROPY_HEAP_SIZE ?= 143360
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 

From 928c71638cf13eb0b47aebb917913820b889403f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 14 Jan 2025 01:09:40 +0100
Subject: [PATCH 1784/3129] py/asmarm: Fix locals address loading code
 generation with large imm.

This commit fixes code generation for loading a local's address if its
index is greater than 63.

The old code blindly encoded the offset into an `ADD Rd, Rn, #imm` opcode,
but only the lowest 8 bits would be put into the opcode itself.  This
commit instead generates a two-opcodes sequence, a constant load into R8,
and then an `ADD Rd, Rn, R8` opcode.

This fixes `tests/float/math_domain.py` for the qemu/SABRELITE board.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index b20bdebde5b1a..a1c15d0fa602a 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -292,8 +292,15 @@ 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) {
-    // add rd, sp, #local_num*4
-    emit_al(as, asm_arm_op_add_imm(rd, ASM_ARM_REG_SP, local_num << 2));
+    if (local_num >= 0x40) {
+        // mov r8, #local_num*4
+        // add rd, sp, r8
+        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, local_num << 2);
+        emit_al(as, asm_arm_op_add_reg(rd, ASM_ARM_REG_SP, ASM_ARM_REG_R8));
+    } else {
+        // add rd, sp, #local_num*4
+        emit_al(as, asm_arm_op_add_imm(rd, ASM_ARM_REG_SP, local_num << 2));
+    }
 }
 
 void asm_arm_mov_reg_pcrel(asm_arm_t *as, uint reg_dest, uint label) {

From c610199f2d679ae0c8860d149edfece4fc8d49e5 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 14 Jan 2025 01:28:20 +0100
Subject: [PATCH 1785/3129] py/asmarm: Fix halfword loads with larger offsets.

This commit fixes code generation for loading halfwords using an offset
greater than 255.

The old code blindly encoded the offset into a `LDRH Rd, [Rn, #imm]`
opcode, but only the lowest 8 bits would be put into the opcode itself.
This commit instead generates a two-opcodes sequence, a constant load into
R8, and then `LDRH Rd, [Rn, R8]`.

This fixes `tests/extmod/vfs_rom.py` for the qemu/SABRELITE board.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index a1c15d0fa602a..6fa751b32eb7c 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -344,8 +344,15 @@ 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) {
-    // ldrh rd, [rn, #off]
-    emit_al(as, 0x1d000b0 | (rn << 16) | (rd << 12) | ((byte_offset & 0xf0) << 4) | (byte_offset & 0xf));
+    if (byte_offset < 0x100) {
+        // ldrh rd, [rn, #off]
+        emit_al(as, 0x1d000b0 | (rn << 16) | (rd << 12) | ((byte_offset & 0xf0) << 4) | (byte_offset & 0xf));
+    } else {
+        // mov r8, #off
+        // ldrh rd, [rn, r8]
+        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, byte_offset);
+        emit_al(as, 0x19000b0 | (rn << 16) | (rd << 12) | ASM_ARM_REG_R8);
+    }
 }
 
 void asm_arm_ldrb_reg_reg(asm_arm_t *as, uint rd, uint rn) {

From a46e84280774a358eb7419de2c07a1ab2868d853 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 14 Jan 2025 01:30:00 +0100
Subject: [PATCH 1786/3129] qemu/boards/SABRELITE.mk: Remove exception for
 omitted tests.

This commit re-introduces `tests/extmod/vfs_rom.py` and
`tests/float/math_domain.py` to the test suite, as the issues that made
them fail have now been addressed.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/boards/SABRELITE.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE.mk
index 9875667830294..80ea08f12cf76 100644
--- a/ports/qemu/boards/SABRELITE.mk
+++ b/ports/qemu/boards/SABRELITE.mk
@@ -17,6 +17,3 @@ MPY_CROSS_FLAGS += -march=armv6
 
 # These tests don't work on Cortex-A9, so exclude them.
 RUN_TESTS_ARGS += --exclude 'inlineasm/thumb/(asmbcc|asmbitops|asmconst|asmdiv|asmit|asmspecialregs).py'
-
-# These tests fail with via-mpy and the native (armv6) emitter, so exclude them.
-RUN_TESTS_ARGS += --exclude 'extmod/vfs_rom.py|float/math_domain.py'

From a82fc718a74a75d778e485548330414bad85f070 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Jan 2025 09:40:16 +0100
Subject: [PATCH 1787/3129] stm32/mpconfigboard_common: Add
 MICROPY_HW_SPI_IS_STATIC macro.

A board should make this return true if the specified SPI instances should
not be deinitialized on soft-reboot.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/mpconfigboard_common.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 5c66b804b2f58..e1c9c159ecf6f 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -187,6 +187,12 @@
 #define MICROPY_HW_SPI_IS_RESERVED(spi_id) (false)
 #endif
 
+// Function to determine if the given spi_id is static or not.
+// Static SPI instances can be accessed by the user but are not deinit'd on soft reset.
+#ifndef MICROPY_HW_SPI_IS_STATIC
+#define MICROPY_HW_SPI_IS_STATIC(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)

From 5fa960c71912b0c5dace6ccd60a8dba48dc9e2da Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Dec 2024 10:58:21 +0100
Subject: [PATCH 1788/3129] stm32/spi: Retain the state of special SPI buses on
 soft reboot.

Reserved and static SPI buses must remain initialized during a soft reboot
as they may be used for SPI flash storage or XIP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/spi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index aa459119c146c..96dd170652e1e 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -548,7 +548,7 @@ void spi_deinit(const spi_t *spi_obj) {
 void spi_deinit_all(void) {
     for (int i = 0; i < MP_ARRAY_SIZE(spi_obj); i++) {
         const spi_t *spi = &spi_obj[i];
-        if (spi->spi != NULL) {
+        if (spi->spi != NULL && !MICROPY_HW_SPI_IS_RESERVED(i + 1) && !MICROPY_HW_SPI_IS_STATIC(i + 1)) {
             spi_deinit(spi);
         }
     }

From b79ceeca8fc006c14fb1be5c9be3962f09269a85 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Dec 2024 11:22:01 +0100
Subject: [PATCH 1789/3129] stm32/boards: Reserve SPI bus when it's used for
 external flash storage.

Reserve SPI flash bus used for storage or XIP.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h | 1 +
 ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h          | 1 +
 ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h          | 1 +
 ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h  | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
index a7bfc37df2994..c573f942a0a13 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
@@ -28,6 +28,7 @@
 // External SPI Flash config
 #if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 
+#define MICROPY_HW_SPI_IS_RESERVED(id)  (id == 1) // Reserve SPI flash bus.
 #define MICROPY_HW_SPIFLASH_SIZE_BITS (16 * 1024 * 1024) // 16 Mbit (2 MByte)
 
 #define MICROPY_HW_SPIFLASH_CS      (MICROPY_HW_SPI1_NSS)
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index ffc53fa6fc5ec..9878b1533eedb 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -65,6 +65,7 @@
 #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)
+#define MICROPY_HW_SPI_IS_RESERVED(id)           (id == 2)  // Reserve SPI flash bus.
 
 // USB config
 #define MICROPY_HW_USB_VBUS_DETECT_PIN           (pyb_pin_USB_VBUS)
diff --git a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
index 4c3fbba052176..d7b21d801f8d0 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
+++ b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
@@ -71,6 +71,7 @@
 // External SPI Flash config (Cypress S25FL164K)
 #if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 
+#define MICROPY_HW_SPI_IS_STATIC(id)  (id == 3) // Shared with SPIFLASH.
 #define MICROPY_HW_SPIFLASH_SIZE_BITS (64 * 1024 * 1024) // 64 Mbit (8 MByte)
 
 #define MICROPY_HW_SPIFLASH_CS (pin_A13)
diff --git a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h
index 561c1a9f1516e..98d6dc6a0b83d 100644
--- a/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h
+++ b/ports/stm32/boards/WEACT_F411_BLACKPILL/mpconfigboard.h
@@ -86,6 +86,9 @@
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
 
 #else
+// Reserve SPI flash bus.
+#define MICROPY_HW_SPI_IS_RESERVED(id)  (id == 1)
+
 // Disable internal filesystem to use spiflash.
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 

From 624bd48d2fd90fd9e6cd95b82b8caef4121cb1c7 Mon Sep 17 00:00:00 2001
From: peterhinch <peter@hinch.me.uk>
Date: Sun, 29 Jan 2023 18:09:51 +0000
Subject: [PATCH 1790/3129] docs/reference/isr_rules: Describe issue with hard
 ISRs and globals.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/isr_rules.rst | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/reference/isr_rules.rst b/docs/reference/isr_rules.rst
index ea330acad3aaa..14010fb207fdd 100644
--- a/docs/reference/isr_rules.rst
+++ b/docs/reference/isr_rules.rst
@@ -170,11 +170,17 @@ is partially updated. When the ISR tries to read the object, a crash results. Be
 on rare, random occasions they can be hard to diagnose. There are ways to circumvent this issue, described in
 :ref:`Critical Sections <Critical>` below.
 
-It is important to be clear about what constitutes the modification of an object. An alteration to a built-in type
-such as a dictionary is problematic. Altering the contents of an array or bytearray is not. This is because bytes
-or words are written as a single machine code instruction which is not interruptible: in the parlance of real time
-programming the write is atomic. A user defined object might instantiate an integer, array or bytearray. It is valid
-for both the main loop and the ISR to alter the contents of these.
+It is important to be clear about what constitutes the modification of an object. Altering the contents of an array
+or bytearray is safe. This is because bytes or words are written as a single machine code instruction which is not
+interruptible: in the parlance of real time programming the write is atomic. The same is true of updating a
+dictionary item because items are machine words, being integers or pointers to objects. A user defined object might
+instantiate an array or bytearray. It is valid for both the main loop and the ISR to alter the contents of these.
+
+The hazard arises when the structure of an object is altered, notably in the case of dictionaries. Adding or deleting
+keys can trigger a rehash. If a hard ISR runs while a rehash is in progress and attempts to access an item, a crash
+may occur. Internally globals are implemented as a dictionary. Consequently the main program should create all
+necessary globals before starting a process that generates hard interrupts. Application code should also avoid
+deleting globals.
 
 MicroPython supports integers of arbitrary precision. Values between 2**30 -1 and -2**30 will be stored in
 a single machine word. Larger values are stored as Python objects. Consequently changes to long integers cannot

From f2cd1a3db6d0e9f3cd0025a3167822356f8c1614 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Thu, 25 Jul 2024 03:45:09 -0400
Subject: [PATCH 1791/3129] lib/mbedtls: Update to mbedtls v3.6.2.

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
---
 extmod/extmod.cmake                    | 1 +
 extmod/extmod.mk                       | 1 +
 extmod/mbedtls/mbedtls_config_common.h | 1 +
 lib/mbedtls                            | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 154931a664477..532ce83f9075f 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -219,6 +219,7 @@ if(MICROPY_SSL_MBEDTLS)
         ${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_ecc.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/pk_wrap.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/pkwrite.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/platform.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index c8bc74d268e77..6d54ae2222e74 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -294,6 +294,7 @@ SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
 	pkcs12.c \
 	pkcs5.c \
 	pkparse.c \
+	pk_ecc.c \
 	pk_wrap.c \
 	pkwrite.c \
 	platform.c \
diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 4028bdf56d29b..6ea8540af9925 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -79,6 +79,7 @@
 #define MBEDTLS_OID_C
 #define MBEDTLS_PKCS5_C
 #define MBEDTLS_PK_C
+#define MBEDTLS_PK_HAVE_ECC_KEYS
 #define MBEDTLS_PK_PARSE_C
 #define MBEDTLS_PLATFORM_C
 #define MBEDTLS_RSA_C
diff --git a/lib/mbedtls b/lib/mbedtls
index edb8fec988208..107ea89daaefb 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit edb8fec9882084344a314368ac7fd957a187519c
+Subproject commit 107ea89daaefb9867ea9121002fbbdf926780e98

From 8e2da5a519c3c68f0e9a04613e9d3e2a48ec44bb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Oct 2024 14:53:37 +1100
Subject: [PATCH 1792/3129] stm32/boards: Support 'FDCAN' in board pin CSVs.

Previously micros with the 'FDCAN' peripheral (as opposed to the older
'CAN' peripheral) needed to rename these pins in the CSVs for the CAN
driver to work.

The following CSVs in MicroPython still had FDCAN in them:

    $ rg -t csv -l FDCAN boards
    boards/stm32h7b3_af.csv
    boards/stm32h743_af.csv
    boards/stm32h573_af.csv
    boards/stm32h723_af.csv
    boards/stm32g0b1_af.csv

Confirmed that this allows CAN to work on NUCLEO_H723ZG board, and that at
least one board based on each of the other chips can still compile. Some of
these boards could possibly have MICROPY_HW_ENABLE_CAN set and work, now.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/boards/make-pins.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 8fb442153fad9..1b89fd641542a 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -122,6 +122,9 @@ def add_af(self, af_idx, af_name, af):
                 if af_ext:
                     af_pin = "EXT" + af_pin
 
+                # Special case: FDCAN peripheral is named CAN in MicroPython, same as bxCAN
+                af_fn = af_fn.replace("FDCAN", "CAN")
+
                 af_supported = af_fn in SUPPORTED_AF and af_pin in SUPPORTED_AF[af_fn]
 
                 self._afs.append(PinAf(af_idx, af_fn, af_unit, af_pin, af_supported, af_name))

From 1d8943ac7b57b89efa5400d966957e6613a7604d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Jan 2025 12:05:45 +1100
Subject: [PATCH 1793/3129] stm32/pyb_can: Fix CAN-FD BRS baud initialisation.

Was initialising using the Classic CAN bs1/bs2 value, incorrectly.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/pyb_can.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 563758831cc5e..dc05f965d81a8 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -269,8 +269,8 @@ static mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
     // 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;
+    self->can.Init.DataTimeSeg1 = args[ARG_brs_bs1].u_int; // DataTimeSeg1 = Propagation_segment + Phase_segment_1
+    self->can.Init.DataTimeSeg2 = args[ARG_brs_bs2].u_int;
     #else
     // Init filter banks for classic CAN.
     can2_start_bank = args[ARG_num_filter_banks].u_int;

From e8d3df51dc036337803fbe047fff77266b3b69f4 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Jan 2025 12:07:41 +1100
Subject: [PATCH 1794/3129] stm32/pyb_can: Make pyb.CAN baud calculation a
 little more forgiving.

Not every baudrate or sample point combination has an exact match,
but getting within 1% on sample point and .1% on baud rate should
always be good enough.

Because the search goes from shorter bit periods (lowest brp) and
increases, the first match which meets this criteria should still mostly be
the best available.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/pyb.CAN.rst | 21 ++++++++++++++-------
 ports/stm32/pyb_can.c    | 12 ++++++++++--
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index 57a85d54b7714..eb21d8223f26e 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -67,11 +67,17 @@ Methods
        :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 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%.
+       both the *baudrate* (within .1%) and the desired *sample_point* (to the nearest 1%). For more precise
+       control over the CAN timing, set the *prescaler*, *bs1* and *bs2* parameters directly.
+     - *sample_point* specifies the position of the bit sample with respect to the whole nominal bit time,
+       expressed as an integer percentage of the nominal bit time. The default *sample_point* is 75%.
+       This parameter is ignored unless *baudrate* is set.
      - *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).
+
+  The remaining parameters are only present on boards with CAN FD support, and configure the optional CAN FD
+  Bit Rate Switch (BRS) feature:
+
      - *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;
@@ -82,10 +88,11 @@ Methods
        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%.
-
+       both the *brs_baudrate* (within .1%) and the desired *brs_sample_point* (to the nearest 1%). For more
+       precise control over the BRS timing, set the *brs_prescaler*, *brs_bs1* and *brs_bs2* parameters directly.
+     - *brs_sample_point* specifies the position of the bit sample with respect to the whole nominal bit time,
+       expressed as an integer percentage of the nominal bit time. The default *brs_sample_point* is 75%.
+       This parameter is ignored unless *brs_baudrate* is set.
 
    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 dc05f965d81a8..723ff6f9dfa3c 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -25,6 +25,7 @@
  */
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "py/objarray.h"
 #include "py/runtime.h"
@@ -199,12 +200,19 @@ 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();
+    mp_uint_t max_baud_error = baudrate / 1000; // Allow .1% deviation
+    const mp_uint_t MAX_SAMPLE_ERROR = 5; // round to nearest 1%, which is the param resolution
+    sample_point *= 10;
     // 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)))) {
+                mp_int_t calc_baud = can_kern_clk / (brp * (1 + bs1 + bs2));
+                mp_int_t calc_sample = ((1 + bs1) * 1000) / (1 + bs1 + bs2);
+                mp_int_t baud_err = baudrate - calc_baud;
+                mp_int_t sample_err = sample_point - calc_sample;
+                if (abs(baud_err) < max_baud_error &&
+                    abs(sample_err) < MAX_SAMPLE_ERROR) {
                     *bs1_out = bs1;
                     *bs2_out = bs2;
                     *prescaler_out = brp;

From 221a4ecf300d903d6043418a9980aa239dcd2879 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Jan 2025 12:11:34 +1100
Subject: [PATCH 1795/3129] stm32/pyb_can: Include requested CAN baudrate in
 matching error.

This is redundant for bxCAN, but for CAN-FD with BRS it's otherwise unclear
which set of parameters (baudrate & sample_point or brs_baudrate &
brs_sample_point) failed to match. This makes finding a valid combination
extra annoying.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/pyb_can.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 723ff6f9dfa3c..181b3173866c3 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -222,7 +222,7 @@ 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"));
+    mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("couldn't match baudrate %u and sample point %u"), baudrate, sample_point / 10);
 }
 
 // init(mode, prescaler=100, *, sjw=1, bs1=6, bs2=8)

From 3a60f32c9db15060a95db69a3d2ca5df33a36f1b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Oct 2024 15:50:39 +1100
Subject: [PATCH 1796/3129] stm32/can: Fix clearing filters on CAN3 (bxCAN).

HAL argument is ignored for CAN1, CAN2 but needed for CAN3.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/can.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/can.c b/ports/stm32/can.c
index 27d29207227ba..490faeba709a2 100644
--- a/ports/stm32/can.c
+++ b/ports/stm32/can.c
@@ -174,7 +174,7 @@ void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank) {
     filter.FilterActivation = DISABLE;
     filter.BankNumber = bank;
 
-    HAL_CAN_ConfigFilter(NULL, &filter);
+    HAL_CAN_ConfigFilter(&self->can, &filter);
 }
 
 int can_receive(CAN_HandleTypeDef *can, int fifo, CanRxMsgTypeDef *msg, uint8_t *data, uint32_t timeout_ms) {

From 21b7bd9f44a1e9dff2881b8aa1c72f400d3c7c39 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 23 May 2024 17:46:47 +1000
Subject: [PATCH 1797/3129] stm32/fdcan: Fix extended CAN ID filtering for
 stm32g4.

The memory bank addresses used for these are independent, can (and must)
enable both.

Also looks like no need to shrink these if FDCAN2 is added, the Reference
Manual is a bit unclear but looks like the peripheral's RAM multiplies out
for each additional controller.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/fdcan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 26a8860988418..04d8135c081b3 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -86,8 +86,8 @@ 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;
-    init->StdFiltersNbr = 28; // /2  ? if FDCAN2 is used !!?
-    init->ExtFiltersNbr = 0; // Not used
+    init->StdFiltersNbr = 28;
+    init->ExtFiltersNbr = 8;
     init->TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION;
     #elif defined(STM32H7)
     // The dedicated FDCAN RAM is 2560 32-bit words and shared between the FDCAN instances.

From 05eb1d8e1535b310712a532c254e28161694a9b9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Aug 2024 09:48:11 +1000
Subject: [PATCH 1798/3129] stm32/boards/ARDUINO_NICLA_VISION: Fix CAN pin
 assignment.

The only STM32H747 pins with CAN function that are also broken out on the
board are PB8 and PB9.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 7bb75091e8bdf..c845bc91f9712 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -186,8 +186,8 @@ extern struct _spi_bdev_t spi_bdev;
 
 // FDCAN bus
 #define MICROPY_HW_CAN1_NAME        "FDCAN1"
-#define MICROPY_HW_CAN1_TX          (pin_A10)
-#define MICROPY_HW_CAN1_RX          (pin_A9)
+#define MICROPY_HW_CAN1_TX          (pin_B9)
+#define MICROPY_HW_CAN1_RX          (pin_B8)
 #define MICROPY_HW_CAN_IS_RESERVED(id) (id != PYB_CAN_1)
 
 // LEDs

From b6649b922e0ff7fa263b05d560f4c11a3910d1d9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 16 Jan 2025 13:47:50 +0100
Subject: [PATCH 1799/3129] stm32/boards: Update Arduino boards to reserve
 timers and fix USB PID.

Reserve timers used for the camera, and fix USB PID because 0x055F is
reserved for MicroPython.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h         | 2 +-
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h | 3 ++-
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index 99b92a3793f03..fdf3128a3606d 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -30,6 +30,7 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_SDCARD    (0)
 #define MICROPY_HW_ENABLE_MMCARD    (0)
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
+#define MICROPY_HW_TIM_IS_RESERVED(id) (id == 1)
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
@@ -42,7 +43,6 @@ void GIGA_board_startup(void);
 #define MICROPY_BOARD_EARLY_INIT    GIGA_board_early_init
 void GIGA_board_early_init(void);
 
-#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) GIGA_board_enter_bootloader()
 void GIGA_board_enter_bootloader(void);
 
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index c845bc91f9712..505f8b6890169 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -30,6 +30,7 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_SDCARD    (0)
 #define MICROPY_HW_ENABLE_MMCARD    (0)
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
+#define MICROPY_HW_TIM_IS_RESERVED(id) (id == 3)
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
@@ -225,7 +226,7 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE (3000000)
 
 #define MICROPY_HW_USB_VID                      0x2341
-#define MICROPY_HW_USB_PID                      0x045F
+#define MICROPY_HW_USB_PID                      0x055F
 #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)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 6b77b16093fb4..900bf18673728 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -30,6 +30,7 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_HW_ENABLE_MMCARD    (0)
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
+#define MICROPY_HW_TIM_IS_RESERVED(id) (id == 1)
 
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)

From d89e71e6c08b7dff21967868887f4503fc8ac5aa Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 7 Jan 2025 14:19:11 +1100
Subject: [PATCH 1800/3129] tools/autobuild,esp32: Template the generation of
 esp32 port deploy.md.

Allows two source files (ports/esp32/boards/deploy.md and
deploy_nativeusb.md for boards with only native USB) for all esp32
installation steps, with templated chip name and flash offset inserted via
string formatting.

The new files add more text to explain the esptool.py port auto-detection,
remove the unnecessary -z feature (already enabled by default), and add
a bit of troubleshooting and port detection info.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/README.md                         |  9 ++++
 .../boards/ARDUINO_NANO_ESP32/board.json      |  3 ++
 .../esp32/boards/ARDUINO_NANO_ESP32/deploy.md |  2 +
 ports/esp32/boards/ESP32_GENERIC/board.json   |  3 ++
 .../esp32/boards/ESP32_GENERIC_C3/board.json  |  5 +-
 .../esp32/boards/ESP32_GENERIC_C6/board.json  |  5 +-
 .../esp32/boards/ESP32_GENERIC_S2/board.json  |  5 +-
 .../esp32/boards/ESP32_GENERIC_S3/board.json  |  5 +-
 .../boards/LILYGO_TTGO_LORA32/board.json      |  3 ++
 ports/esp32/boards/LOLIN_C3_MINI/board.json   |  5 +-
 ports/esp32/boards/LOLIN_S2_MINI/board.json   |  5 +-
 ports/esp32/boards/LOLIN_S2_PICO/board.json   |  5 +-
 ports/esp32/boards/M5STACK_ATOM/board.json    |  3 ++
 .../boards/M5STACK_ATOMS3_LITE/board.json     |  5 +-
 .../boards/M5STACK_ATOMS3_LITE/deploy.md      | 22 --------
 ports/esp32/boards/M5STACK_NANOC6/board.json  |  5 +-
 .../boards/M5STACK_NANOC6/deploy_nanoc6.md    | 18 -------
 .../esp32/boards/OLIMEX_ESP32_EVB/board.json  |  3 ++
 .../esp32/boards/OLIMEX_ESP32_POE/board.json  |  3 ++
 ports/esp32/boards/SIL_WESP32/board.json      |  3 ++
 ports/esp32/boards/UM_FEATHERS2/board.json    |  6 ++-
 ports/esp32/boards/UM_FEATHERS2/deploy.md     | 50 -----------------
 ports/esp32/boards/UM_FEATHERS2NEO/board.json |  6 ++-
 ports/esp32/boards/UM_FEATHERS2NEO/deploy.md  | 50 -----------------
 ports/esp32/boards/UM_FEATHERS3/board.json    |  6 ++-
 ports/esp32/boards/UM_FEATHERS3/deploy.md     | 52 ------------------
 ports/esp32/boards/UM_FEATHERS3NEO/board.json |  6 ++-
 ports/esp32/boards/UM_FEATHERS3NEO/deploy.md  | 52 ------------------
 ports/esp32/boards/UM_NANOS3/board.json       |  6 ++-
 ports/esp32/boards/UM_NANOS3/deploy.md        | 53 -------------------
 .../boards/UM_NANOS3/deploy_flashmode.md      |  9 ++++
 ports/esp32/boards/UM_OMGS3/board.json        |  6 ++-
 ports/esp32/boards/UM_OMGS3/deploy.md         | 53 -------------------
 .../esp32/boards/UM_OMGS3/deploy_flashmode.md |  8 +++
 ports/esp32/boards/UM_PROS3/board.json        |  6 ++-
 ports/esp32/boards/UM_PROS3/deploy.md         | 52 ------------------
 .../esp32/boards/UM_RGBTOUCH_MINI/board.json  |  6 ++-
 ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md | 52 ------------------
 ports/esp32/boards/UM_TINYC6/board.json       |  6 ++-
 .../boards/UM_TINYC6/deploy_flashmode.md      |  2 +
 ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md | 18 -------
 ports/esp32/boards/UM_TINYPICO/board.json     |  5 +-
 ports/esp32/boards/UM_TINYPICO/deploy.md      | 46 ----------------
 ports/esp32/boards/UM_TINYS2/board.json       |  6 ++-
 ports/esp32/boards/UM_TINYS2/deploy.md        | 50 -----------------
 ports/esp32/boards/UM_TINYS3/board.json       |  6 ++-
 ports/esp32/boards/UM_TINYS3/deploy.md        | 52 ------------------
 ports/esp32/boards/UM_TINYWATCHS3/board.json  |  6 ++-
 ports/esp32/boards/UM_TINYWATCHS3/deploy.md   | 52 ------------------
 ports/esp32/boards/deploy.md                  | 48 +++++++++++++++--
 ports/esp32/boards/deploy_c3.md               | 14 -----
 ports/esp32/boards/deploy_c6.md               | 14 -----
 ports/esp32/boards/deploy_flashmode.md        |  9 ++++
 ports/esp32/boards/deploy_nativeusb.md        | 51 ++++++++++++++++++
 ports/esp32/boards/deploy_s2.md               | 14 -----
 ports/esp32/boards/deploy_s3.md               | 14 -----
 tools/autobuild/build-downloads.py            | 13 ++++-
 57 files changed, 267 insertions(+), 755 deletions(-)
 delete mode 100644 ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md
 delete mode 100644 ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md
 delete mode 100644 ports/esp32/boards/UM_FEATHERS2/deploy.md
 delete mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/deploy.md
 delete mode 100644 ports/esp32/boards/UM_FEATHERS3/deploy.md
 delete mode 100644 ports/esp32/boards/UM_FEATHERS3NEO/deploy.md
 delete mode 100644 ports/esp32/boards/UM_NANOS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_NANOS3/deploy_flashmode.md
 delete mode 100644 ports/esp32/boards/UM_OMGS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_OMGS3/deploy_flashmode.md
 delete mode 100644 ports/esp32/boards/UM_PROS3/deploy.md
 delete mode 100644 ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md
 create mode 100644 ports/esp32/boards/UM_TINYC6/deploy_flashmode.md
 delete mode 100644 ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md
 delete mode 100644 ports/esp32/boards/UM_TINYPICO/deploy.md
 delete mode 100644 ports/esp32/boards/UM_TINYS2/deploy.md
 delete mode 100644 ports/esp32/boards/UM_TINYS3/deploy.md
 delete mode 100644 ports/esp32/boards/UM_TINYWATCHS3/deploy.md
 delete mode 100644 ports/esp32/boards/deploy_c3.md
 delete mode 100644 ports/esp32/boards/deploy_c6.md
 create mode 100644 ports/esp32/boards/deploy_flashmode.md
 create mode 100644 ports/esp32/boards/deploy_nativeusb.md
 delete mode 100644 ports/esp32/boards/deploy_s2.md
 delete mode 100644 ports/esp32/boards/deploy_s3.md

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index a8bada7510f4e..bc24e5cd71ad6 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -229,6 +229,15 @@ 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.
 
+Deployment instructions usually invoke the `boards/deploy.md` file (for boards
+with a USB/Serial converter connection), or the `boards/deploy_nativeusb.md`
+file (for boards with only a native USB port connection). These files are
+formatted for each board using template strings found in the `boards.json`
+files. You can also include the common `boards/deploy_flashmode.md` file if you
+have a board which requires manual resetting via the RESET and BOOT buttons.
+Boards with unique flashing steps can include custom `deploy.md` file(s).
+Existing `board.json` files contain examples of all of these combinations.
+
 See existing board definitions for further examples of configuration.
 
 Configuration
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
index 77aa192959954..9d0016017fc6c 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
@@ -2,6 +2,9 @@
     "deploy": [
         "deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md b/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
index bb32ba755932a..36836da9199f7 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/deploy.md
@@ -11,3 +11,5 @@ Please note that the DFU bootloader comes factory flashed. Should you for any re
 entire flash, the DFU bootloader will have to be re-installed. Please follow the instructions
 [here](https://support.arduino.cc/hc/en-us/articles/9810414060188-Reset-the-Arduino-bootloader-on-the-Nano-ESP32)
 to do so.
+
+**Important** From the options below, download the `.app-bin` file for your board.
diff --git a/ports/esp32/boards/ESP32_GENERIC/board.json b/ports/esp32/boards/ESP32_GENERIC/board.json
index 130f6b88c8856..81c38a6ad48a7 100644
--- a/ports/esp32/boards/ESP32_GENERIC/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC/board.json
@@ -2,6 +2,9 @@
     "deploy": [
         "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/board.json b/ports/esp32/boards/ESP32_GENERIC_C3/board.json
index 4a81d227a0224..fd20cb51bcb9d 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "../deploy_c3.md"
+        "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/board.json b/ports/esp32/boards/ESP32_GENERIC_C6/board.json
index cf644f9038a6b..7363333f86eb8 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C6/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "../deploy_c6.md"
+        "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/ESP32_GENERIC_S2/board.json b/ports/esp32/boards/ESP32_GENERIC_S2/board.json
index 6ebf16be1a21a..fde04d9c4b908 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S2/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "../deploy_s2.md"
+        "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "External Flash",
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/board.json b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
index c9794dba86131..fd0c9edce09ec 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "../deploy_s3.md"
+        "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
index 525551df3b174..d68a9baaddaa6 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
@@ -2,6 +2,9 @@
     "deploy": [
         "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/board.json b/ports/esp32/boards/LOLIN_C3_MINI/board.json
index c9b91641e5288..dd47862d9f74f 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_C3_MINI/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "../deploy_c3.md"
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
index a45d0434d995d..a7098c9afa302 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "../deploy_s2.md"
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "External Flash",
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/board.json b/ports/esp32/boards/LOLIN_S2_PICO/board.json
index 6c72e60f80546..724f47e1a9d08 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/board.json
+++ b/ports/esp32/boards/LOLIN_S2_PICO/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "../deploy_s2.md"
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "Display",
diff --git a/ports/esp32/boards/M5STACK_ATOM/board.json b/ports/esp32/boards/M5STACK_ATOM/board.json
index 4b6c09db3a7e8..3a1e7ce359c50 100644
--- a/ports/esp32/boards/M5STACK_ATOM/board.json
+++ b/ports/esp32/boards/M5STACK_ATOM/board.json
@@ -2,6 +2,9 @@
     "deploy": [
         "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "External Flash",
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
index d00bb673be8a8..fe0e97f9f9ce6 100644
--- a/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "https://docs.m5stack.com/en/core/AtomS3%20Lite",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md b/ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md
deleted file mode 100644
index 9a20a6a43dc6b..0000000000000
--- a/ports/esp32/boards/M5STACK_ATOMS3_LITE/deploy.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Program your board using the `esptool.py` program, found
-[here](https://github.com/espressif/esptool).
-
-To place the board in _bootloader mode_ - so `esptool`` can be used - press and
-hold the reset button for two seconds. A green LED will flash behind the reset
-button when the bootloader mode has been activated.
-
-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-20240105-v1.22.1.bin
-```
-
-After the firmware has been deployed, press the reset button to reset the device
-and start the new firmware.
diff --git a/ports/esp32/boards/M5STACK_NANOC6/board.json b/ports/esp32/boards/M5STACK_NANOC6/board.json
index 15654341b44dc..087851ae5ee0b 100644
--- a/ports/esp32/boards/M5STACK_NANOC6/board.json
+++ b/ports/esp32/boards/M5STACK_NANOC6/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "deploy_nanoc6.md"
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md b/ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md
deleted file mode 100644
index d8c212c5d2980..0000000000000
--- a/ports/esp32/boards/M5STACK_NANOC6/deploy_nanoc6.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Program your board using the esptool.py program, found
-[here](https://github.com/espressif/esptool).
-
-To put the NanoC6 into 'update mode', hold the button while connecting the USB
-cable. It can be released after the connection is made.
-
-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 esp32c6 --port /dev/ttyUSB0 erase_flash
-```
-
-From then on program the firmware starting at address 0x0:
-
-```bash
-esptool.py --chip esp32c6 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x0 M5STACK_NANOC6-20240602-v1.24.0.bin
-```
diff --git a/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
index de7a74d8a8faa..3eb9a5e0a71e5 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
@@ -2,6 +2,9 @@
     "deploy": [
         "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
index e62b960ccd681..cda26178d75f2 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
@@ -2,6 +2,9 @@
     "deploy": [
         "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 50dd2cc660d48..53a50f3286d23 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -2,6 +2,9 @@
     "deploy": [
         "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index 4de9a7d4f71c2..b6cacf8c5c784 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_FEATHERS2/deploy.md b/ports/esp32/boards/UM_FEATHERS2/deploy.md
deleted file mode 100644
index 24bced3cda9b1..0000000000000
--- a/ports/esp32/boards/UM_FEATHERS2/deploy.md
+++ /dev/null
@@ -1,50 +0,0 @@
-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 5b79d3195a763..5b9a1935c9760 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/deploy.md b/ports/esp32/boards/UM_FEATHERS2NEO/deploy.md
deleted file mode 100644
index b1a116e8074c5..0000000000000
--- a/ports/esp32/boards/UM_FEATHERS2NEO/deploy.md
+++ /dev/null
@@ -1,50 +0,0 @@
-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_FEATHERS3/board.json b/ports/esp32/boards/UM_FEATHERS3/board.json
index 235d52a12d4fd..19d2eb105f3f9 100644
--- a/ports/esp32/boards/UM_FEATHERS3/board.json
+++ b/ports/esp32/boards/UM_FEATHERS3/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_FEATHERS3/deploy.md b/ports/esp32/boards/UM_FEATHERS3/deploy.md
deleted file mode 100644
index 3a6a21a522807..0000000000000
--- a/ports/esp32/boards/UM_FEATHERS3/deploy.md
+++ /dev/null
@@ -1,52 +0,0 @@
-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_FEATHERS3NEO/board.json b/ports/esp32/boards/UM_FEATHERS3NEO/board.json
index 0531582007250..178219ce251ed 100644
--- a/ports/esp32/boards/UM_FEATHERS3NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/deploy.md b/ports/esp32/boards/UM_FEATHERS3NEO/deploy.md
deleted file mode 100644
index ea9bb56dbfeb5..0000000000000
--- a/ports/esp32/boards/UM_FEATHERS3NEO/deploy.md
+++ /dev/null
@@ -1,52 +0,0 @@
-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 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 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 `feathers3neo-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 feathers3neo-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 feathers3neo-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 feathers3neo-micropython-firmware-version.bin
-```
diff --git a/ports/esp32/boards/UM_NANOS3/board.json b/ports/esp32/boards/UM_NANOS3/board.json
index 958f9adf514d7..3da4b33c12e06 100644
--- a/ports/esp32/boards/UM_NANOS3/board.json
+++ b/ports/esp32/boards/UM_NANOS3/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "./deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_NANOS3/deploy.md b/ports/esp32/boards/UM_NANOS3/deploy.md
deleted file mode 100644
index 4285b02753893..0000000000000
--- a/ports/esp32/boards/UM_NANOS3/deploy.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
-
-To flash or erase your NANOS3, you have to first put it into download mode.
-NANOS3 doesn't include buttons for RESET and IO0, which should be provided by adding external buttons via a carrier board or other method.
-To put the NANOS3 into download, 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 `nanos3-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 nanos3-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 nanos3-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 nanos3-micropython-firmware-version.bin
-```
diff --git a/ports/esp32/boards/UM_NANOS3/deploy_flashmode.md b/ports/esp32/boards/UM_NANOS3/deploy_flashmode.md
new file mode 100644
index 0000000000000..b200970409f43
--- /dev/null
+++ b/ports/esp32/boards/UM_NANOS3/deploy_flashmode.md
@@ -0,0 +1,9 @@
+To flash or erase your NANOS3, you have to first put it into download mode.
+NANOS3 doesn't include buttons for RESET and IO0, which should be provided by adding external buttons via a carrier board or other method.
+To put the NANOS3 into download, 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.
diff --git a/ports/esp32/boards/UM_OMGS3/board.json b/ports/esp32/boards/UM_OMGS3/board.json
index 7e976ad63034e..4b3cd9b8faf34 100644
--- a/ports/esp32/boards/UM_OMGS3/board.json
+++ b/ports/esp32/boards/UM_OMGS3/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "./deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_OMGS3/deploy.md b/ports/esp32/boards/UM_OMGS3/deploy.md
deleted file mode 100644
index 09f2ef8c2326e..0000000000000
--- a/ports/esp32/boards/UM_OMGS3/deploy.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
-
-To flash or erase your OMGS3, you have to first put it into download mode.
-OMGS3 doesn't include buttons for RESET and IO0, which should be provided by adding external buttons via a carrier board or other method.
-To put the OMGS3 into download, 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 `omgs3-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 omgs3-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 omgs3-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 omgs3-micropython-firmware-version.bin
-```
diff --git a/ports/esp32/boards/UM_OMGS3/deploy_flashmode.md b/ports/esp32/boards/UM_OMGS3/deploy_flashmode.md
new file mode 100644
index 0000000000000..93e28d2275b55
--- /dev/null
+++ b/ports/esp32/boards/UM_OMGS3/deploy_flashmode.md
@@ -0,0 +1,8 @@
+To flash or erase your OMGS3, you have to first put it into download mode.
+
+OMGS3 doesn't include buttons for RESET and IO0, which should be provided by adding external buttons via a carrier board or other method.
+To put the OMGS3 into download, follow these steps:
+
+- Press and hold the [BOOT] button
+- Press and release the [RESET] button
+- Release the [BOOT] button
diff --git a/ports/esp32/boards/UM_PROS3/board.json b/ports/esp32/boards/UM_PROS3/board.json
index 8efc4e5ab55a7..3d168b2505ace 100644
--- a/ports/esp32/boards/UM_PROS3/board.json
+++ b/ports/esp32/boards/UM_PROS3/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_PROS3/deploy.md b/ports/esp32/boards/UM_PROS3/deploy.md
deleted file mode 100644
index d35d7a02fe376..0000000000000
--- a/ports/esp32/boards/UM_PROS3/deploy.md
+++ /dev/null
@@ -1,52 +0,0 @@
-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_RGBTOUCH_MINI/board.json b/ports/esp32/boards/UM_RGBTOUCH_MINI/board.json
index 6b3ec0f06733d..4e3940005ef59 100644
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/board.json
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md b/ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md
deleted file mode 100644
index afe1ff1de874d..0000000000000
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/deploy.md
+++ /dev/null
@@ -1,52 +0,0 @@
-Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
-
-To flash or erase your RGB Touch Mini, 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 `rgbtouch_mini-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 rgbtouch_mini-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 rgbtouch_mini-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 rgbtouch_mini-micropython-firmware-version.bin
-```
diff --git a/ports/esp32/boards/UM_TINYC6/board.json b/ports/esp32/boards/UM_TINYC6/board.json
index 122b411a30487..7bf920d64c15f 100644
--- a/ports/esp32/boards/UM_TINYC6/board.json
+++ b/ports/esp32/boards/UM_TINYC6/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy_tinyc6.md"
+        "deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_TINYC6/deploy_flashmode.md b/ports/esp32/boards/UM_TINYC6/deploy_flashmode.md
new file mode 100644
index 0000000000000..5dc696a24f983
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYC6/deploy_flashmode.md
@@ -0,0 +1,2 @@
+To put the TinyC6 into 'download mode', hold the _BOOT_ button while connecting
+the USB cable. It can be released after the connection is made.
diff --git a/ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md b/ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md
deleted file mode 100644
index 4e0603a10772a..0000000000000
--- a/ports/esp32/boards/UM_TINYC6/deploy_tinyc6.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Program your board using the esptool.py program, found
-[here](https://github.com/espressif/esptool).
-
-To put the TinyC6 into 'download mode', hold the _BOOT_ button while connecting
-the USB cable. It can be released after the connection is made.
-
-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 esp32c6 --port /dev/ttyUSB0 erase_flash
-```
-
-From then on program the firmware starting at address 0x0:
-
-```bash
-esptool.py --chip esp32c6 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x0 UM_TINYC6-20240602-v1.24.0.bin
-```
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index 5ec7913c42ec6..06584832bb013 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -1,7 +1,10 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_TINYPICO/deploy.md b/ports/esp32/boards/UM_TINYPICO/deploy.md
deleted file mode 100644
index 8c15d4d41359d..0000000000000
--- a/ports/esp32/boards/UM_TINYPICO/deploy.md
+++ /dev/null
@@ -1,46 +0,0 @@
-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 921600 write_flash -z 0x1000 tinypico-micropython-firmware-version.bin
-```
-
-### Mac
-```bash
-esptool.py --chip esp32 --port /dev/tty.SLAB_USBtoUART --baud 921600 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 921600 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 9bbf9058bb8cf..9077ca6bb4b85 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
     "docs": "",
     "features": [
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_TINYS2/deploy.md b/ports/esp32/boards/UM_TINYS2/deploy.md
deleted file mode 100644
index a46bc9bd1aee9..0000000000000
--- a/ports/esp32/boards/UM_TINYS2/deploy.md
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-```
diff --git a/ports/esp32/boards/UM_TINYS3/board.json b/ports/esp32/boards/UM_TINYS3/board.json
index 27ae46a249a81..5fea9e3a46279 100644
--- a/ports/esp32/boards/UM_TINYS3/board.json
+++ b/ports/esp32/boards/UM_TINYS3/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_TINYS3/deploy.md b/ports/esp32/boards/UM_TINYS3/deploy.md
deleted file mode 100644
index d65014e012480..0000000000000
--- a/ports/esp32/boards/UM_TINYS3/deploy.md
+++ /dev/null
@@ -1,52 +0,0 @@
-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_TINYWATCHS3/board.json b/ports/esp32/boards/UM_TINYWATCHS3/board.json
index 61dadcfb64b46..d1330239f1af8 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/board.json
+++ b/ports/esp32/boards/UM_TINYWATCHS3/board.json
@@ -1,7 +1,11 @@
 {
     "deploy": [
-        "deploy.md"
+        "../deploy_flashmode.md",
+        "../deploy_nativeusb.md"
     ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
     "docs": "",
     "features": [
         "BLE",
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/deploy.md b/ports/esp32/boards/UM_TINYWATCHS3/deploy.md
deleted file mode 100644
index bad7d7c7d897b..0000000000000
--- a/ports/esp32/boards/UM_TINYWATCHS3/deploy.md
+++ /dev/null
@@ -1,52 +0,0 @@
-Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
-
-To flash or erase your TinyWATCH S3, 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 `tinywatchs3-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 tinywatchs3-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 tinywatchs3-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 tinywatchs3-micropython-firmware-version.bin
-```
diff --git a/ports/esp32/boards/deploy.md b/ports/esp32/boards/deploy.md
index 64e683edfc6f9..aa86a37215947 100644
--- a/ports/esp32/boards/deploy.md
+++ b/ports/esp32/boards/deploy.md
@@ -1,14 +1,54 @@
-Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+Program your board using the esptool.py program, found [here](https://docs.espressif.com/projects/esptool/en/latest/{mcu}/).
+
+*Windows users:* You may find the installed program is called `esptool` instead of `esptool.py`.
+
+### Erasing
 
 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
+esptool.py erase_flash
 ```
 
-From then on program the firmware starting at address 0x1000:
+`esptool.py` will try to detect the serial port with the ESP32 automatically,
+but if this fails or there might be more than one Espressif-based device
+attached to your computer then pass the `--port` option with the name of the
+target serial port. For example:
 
 ```bash
-esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x1000 esp32-20190125-v1.10.bin
+esptool.py --port PORTNAME erase_flash
 ```
+
+* On Linux, the port name is usually similar to `/dev/ttyUSB` or `/dev/ttyACM0`.
+* On Mac, the port name is usually similar to `/dev/cu.usbmodem01`.
+* On Windows, the port name is usually similar to `COM4`.
+
+### Flashing
+
+Then deploy the firmware to the board, starting at address {deploy_options[flash_offset]}:
+
+```bash
+esptool.py --baud 460800 write_flash {deploy_options[flash_offset]} ESP32_BOARD_NAME-DATE-VERSION.bin
+```
+
+Replace `ESP32_BOARD_NAME-DATE-VERSION.bin` with the `.bin` file downloaded from this page.
+
+As above, if `esptool.py` can't automatically detect the serial port
+then you can pass it explicitly on the command line instead. For example:
+
+```bash
+esptool.py --port PORTNAME --baud 460800 write_flash {deploy_options[flash_offset]} ESP32_BOARD_NAME-DATE-VERSION.bin
+```
+
+### Troubleshooting
+
+If flashing starts and then fails partway through, try removing the `--baud
+460800` option to flash at the slower default speed.
+
+If these steps don't work, consult the [MicroPython ESP32 Troubleshooting
+steps](https://docs.micropython.org/en/latest/esp32/tutorial/intro.html#troubleshooting-installation-problems)
+and the [esptool
+documentation](https://docs.espressif.com/projects/esptool/en/latest/{mcu}/esptool/basic-options.html).
+
+**Important**: From the options below, download the ``.bin`` file for your board.
diff --git a/ports/esp32/boards/deploy_c3.md b/ports/esp32/boards/deploy_c3.md
deleted file mode 100644
index 016ba7cabb3ad..0000000000000
--- a/ports/esp32/boards/deploy_c3.md
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-```
diff --git a/ports/esp32/boards/deploy_c6.md b/ports/esp32/boards/deploy_c6.md
deleted file mode 100644
index 941c69cdefb34..0000000000000
--- a/ports/esp32/boards/deploy_c6.md
+++ /dev/null
@@ -1,14 +0,0 @@
-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 esp32c6 --port /dev/ttyUSB0 erase_flash
-```
-
-From then on program the firmware starting at address 0x0:
-
-```bash
-esptool.py --chip esp32c6 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x0 ESP32_GENERIC_C6-20240602-v1.24.0.bin
-```
diff --git a/ports/esp32/boards/deploy_flashmode.md b/ports/esp32/boards/deploy_flashmode.md
new file mode 100644
index 0000000000000..ff7cbf9a46308
--- /dev/null
+++ b/ports/esp32/boards/deploy_flashmode.md
@@ -0,0 +1,9 @@
+To flash or erase your {product}, you have to first put it into download mode.
+
+To put the {product} into download, 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.
diff --git a/ports/esp32/boards/deploy_nativeusb.md b/ports/esp32/boards/deploy_nativeusb.md
new file mode 100644
index 0000000000000..c653330ca8df4
--- /dev/null
+++ b/ports/esp32/boards/deploy_nativeusb.md
@@ -0,0 +1,51 @@
+Program your board using the esptool.py program, found [here](https://docs.espressif.com/projects/esptool/en/latest/{mcu}/).
+
+*Windows users:* You may find the installed program is called `esptool` instead of `esptool.py`.
+
+### Erasing
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+```bash
+esptool.py erase_flash
+```
+
+`esptool.py` will try to detect the serial port with the ESP32 automatically,
+but if this fails or there might be more than one Espressif-based device
+attached to your computer then pass the `--port` option with the name of the
+target serial port. For example:
+
+```bash
+esptool.py --port PORTNAME erase_flash
+```
+
+* On Linux, the port name is usually similar to `/dev/ttyACM0`.
+* On Mac, the port name is usually similar to `/dev/cu.usbmodem01`.
+* On Windows, the port name is usually similar to `COM4`.
+
+### Flashing
+
+Then deploy the firmware to the board, starting at address {deploy_options[flash_offset]}:
+
+```bash
+esptool.py write_flash {deploy_options[flash_offset]} ESP32_BOARD_NAME-DATE-VERSION.bin
+```
+
+Replace `ESP32_BOARD_NAME-DATE-VERSION.bin` with the `.bin` file downloaded from this page.
+
+As above, if `esptool.py` can't automatically detect the serial port
+then you can pass it explicitly on the command line instead. For example:
+
+```bash
+esptool.py --port PORTNAME write_flash {deploy_options[flash_offset]} ESP32_BOARD_NAME-DATE-VERSION.bin
+```
+
+### Troubleshooting
+
+If these steps don't work, consult the [MicroPython ESP32 Troubleshooting
+steps](https://docs.micropython.org/en/latest/esp32/tutorial/intro.html#troubleshooting-installation-problems)
+and the [esptool
+documentation](https://docs.espressif.com/projects/esptool/en/latest/{mcu}/esptool/basic-options.html).
+
+**Important**: From the options below, download the ``.bin`` file for your board.
diff --git a/ports/esp32/boards/deploy_s2.md b/ports/esp32/boards/deploy_s2.md
deleted file mode 100644
index 5b3057087d1e2..0000000000000
--- a/ports/esp32/boards/deploy_s2.md
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-```
diff --git a/ports/esp32/boards/deploy_s3.md b/ports/esp32/boards/deploy_s3.md
deleted file mode 100644
index 7f564a95e310a..0000000000000
--- a/ports/esp32/boards/deploy_s3.md
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-```
diff --git a/tools/autobuild/build-downloads.py b/tools/autobuild/build-downloads.py
index d6f6d0324691c..f7411f5980ffe 100755
--- a/tools/autobuild/build-downloads.py
+++ b/tools/autobuild/build-downloads.py
@@ -91,7 +91,18 @@ def main(repo_path, output_path):
                 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())
+                    body = fin.read()
+                    # any key in the board.json file can be substituted via Python str.format()
+                    try:
+                        body = body.format(**blob)
+                    except Exception as e:
+                        raise RuntimeError(
+                            "Failed to format deploy file {} according to {}: {}".format(
+                                fin.name, board_json, e
+                            )
+                        )
+                    f.write(body)
+                    f.write("\n")
 
     # Write the full index for the website to load.
     with open(os.path.join(output_path, "index.json"), "w") as f:

From 600e46800d9f2f7ec27df6e6851a408b9860c7f4 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 7 Jan 2025 12:14:30 +1100
Subject: [PATCH 1801/3129] docs/esp32: Update tutorial flashing steps to match
 deploy.md.

Includes fixing the flashing address for newer SoCs, as reported in
discussion https://github.com/orgs/micropython/discussions/16417

Also removes some redundant or out of date information, and adds links to
the Espressif esptool docs which are quite comprehensive.

Information about ESP32_GENERIC variants is moved to the board page, as it
only applies to that board.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/tutorial/intro.rst             | 125 +++++++++++++---------
 ports/esp32/boards/ESP32_GENERIC/board.md |  19 +++-
 2 files changed, 86 insertions(+), 58 deletions(-)

diff --git a/docs/esp32/tutorial/intro.rst b/docs/esp32/tutorial/intro.rst
index cf4d0bcbd2f55..660af87448aca 100644
--- a/docs/esp32/tutorial/intro.rst
+++ b/docs/esp32/tutorial/intro.rst
@@ -36,19 +36,26 @@ 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
-`MicroPython downloads page <https://micropython.org/download#esp32>`_.
-From here, you have 3 main choices:
+`MicroPython download page`_. Search for your particular board on this page.
 
-* Stable firmware builds
-* Daily firmware builds
-* Daily firmware builds with SPIRAM support
+.. note:: If you don't see your specific board on the download page, then it's
+          very likely that one of the generic firmwares will work. These are
+          listed at the top of the download page and have names matching the
+          onboard Espressif chip (i.e. `ESP32 / WROOM`_, `ESP32-C3`_,
+          `ESP32-S3`_, etc).
 
-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 ESP32 user
-who would like to follow development closely and help with testing new
-features, there are daily builds.  If your board has SPIRAM support you can
-use either the standard firmware or the firmware with SPIRAM support, and in
-the latter case you will have access to more RAM for Python objects.
+          However, you may need to double check with the vendor you purchased
+          the board from.
+
+From here, you have a choice to make:
+
+* Download a stable firmware release.
+* Download a daily firmware "Preview" build.
+
+If you are just starting with MicroPython, the best bet is to go for the stable
+Release firmware builds. If you are an advanced, experienced MicroPython ESP32
+user who would like to follow development closely and help with testing new
+features, then you may find the Preview builds useful.
 
 .. _esp32_flashing:
 
@@ -71,71 +78,83 @@ For best results it is recommended to first erase the entire flash of your
 device before putting on new MicroPython firmware.
 
 Currently we only support esptool.py to copy across the firmware.  You can find
-this tool here: `<https://github.com/espressif/esptool/>`__, or install it
+this tool here: `<https://docs.espressif.com/projects/esptool/>`__, or install it
 using pip::
 
     pip install esptool
 
-Versions starting with 1.3 support both Python 2.7 and Python 3.4 (or newer).
-An older version (at least 1.2.1 is needed) works fine but will require Python
-2.7.
-
 Using esptool.py you can erase the flash with the command::
 
-    esptool.py --port /dev/ttyUSB0 erase_flash
+    esptool.py erase_flash
+
+.. note:: On Windows, the command may be named ``esptool`` not ``esptool.py``
+
+Then deploy the new firmware. Use this command for original ESP32 and ESP32-S2 SoCs::
+
+    esptool.py --baud 460800 write_flash 0x1000 ESP32_BOARD_NAME-DATE-VERSION.bin
 
-And then deploy the new firmware using::
+Use this command for all other SoCs (including ESP32-S3, ESP32-C3, and all newer chips)::
 
-    esptool.py --chip esp32 --port /dev/ttyUSB0 write_flash -z 0x1000 esp32-20180511-v1.9.4.bin
+    esptool.py --baud 460800 write_flash 0 ESP32_BOARD_NAME-DATE-VERSION.bin
 
-Notes:
+Replace ``ESP32_BOARD_NAME-DATE-VERSION.bin`` with the name of your firmware .bin file.
 
-* You might need to change the "port" setting to something else relevant for your
-  PC
-* You may need to reduce the baudrate if you get errors when flashing
-  (eg down to 115200 by adding ``--baud 115200`` into the command)
-* For some boards with a particular FlashROM configuration you may need to
-  change the flash mode (eg by adding ``-fm dio`` into the command)
-* The filename of the firmware should match the file that you have
+.. note:: If you're unsure which command line to use, check the `MicroPython
+  download page`_ for your board. Each download page shows an accurate command
+  line example for that board and its SoC.
 
 If the above commands run without error then MicroPython should be installed on
-your board!
+your board! If the command fails, see :ref:`esp32_troubleshooting_install` below.
 
 Serial prompt
 -------------
 
 Once you have the firmware on the device you can access the REPL (Python prompt)
-over UART0 (GPIO1=TX, GPIO3=RX), which might be connected to a USB-serial
-converter, depending on your board.  The baudrate is 115200.
+over either UART0, which might be connected to a USB-serial converter depending
+on your board, or the chip's built-in USB device. The baudrate is 115200.
 
 From here you can now follow the ESP8266 tutorial, because these two Espressif chips
 are very similar when it comes to using MicroPython on them.  The ESP8266 tutorial
 is found at :ref:`esp8266_tutorial` (but skip the Introduction section).
 
+.. _esp32_troubleshooting_install:
+
 Troubleshooting installation problems
 -------------------------------------
 
 If you experience problems during flashing or with running firmware immediately
-after it, here are troubleshooting recommendations:
-
-* Be aware of and try to exclude hardware problems.  There are 2 common
-  problems: bad power source quality, and worn-out/defective FlashROM.
-  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.
-
-* The flashing instructions above use flashing speed of 460800 baud, which is
-  good compromise between speed and stability. However, depending on your
-  module/board, USB-UART converter, cables, host OS, etc., the above baud
-  rate may be too high and lead to errors. Try a more common 115200 baud
-  rate instead in such cases.
-
-* To catch incorrect flash content (e.g. from a defective sector on a chip),
-  add ``--verify`` switch to the commands above.
-
-* If you still experience problems with flashing the firmware please
-  refer to esptool.py project page, https://github.com/espressif/esptool
-  for additional documentation and a bug tracker where you can report problems.
-
-* If you are able to flash the firmware but the ``--verify`` option returns
-  errors even after multiple retries the you may have a defective FlashROM chip.
+after flashing, here are some troubleshooting recommendations:
+
+* Esptool will try to detect the serial port where your ESP32 is connected. If
+  this doesn't work, or you have multiple serial ports, then you may need to
+  manually specify the port by adding the ``--port`` option to the start of the
+  ``esptool.py`` command line. For example, ``esptool.py --port /dev/ttyUSB0
+  <rest of line>`` for Linux or ``esptool --port COM4 <rest of line>`` for
+  Windows.
+* If the board isn't responding to esptool at all, it may need to be manually
+  reset into the bootloader download mode. Look for a button marked "BOOT" or
+  "IO0" on your board and a second button marked "RESET" or "RST". If you have
+  both buttons, try these steps:
+
+  1. Press "BOOT" (or "IO0") and hold it down.
+  2. Press "RESET" (or "RST") and immediately release it.
+  3. Release "BOOT" (or "IO0").
+  4. Re-run the flashing steps from the download page.
+
+  If your board doesn't have these buttons, consult the board manufacturer's
+  documentation about entering bootloader download mode.
+* If you get errors part-way through the flashing process then try reducing the
+  speed of data transfer by removing the ``--baud 460800`` argument.
+* Hardware problems can cause flashing to fail. There are two common problems:
+  bad power source quality, and defective hardware (especially very low cost
+  unbranded development boards). 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.
+* If you still experience problems with flashing the firmware then please also
+  refer to the `esptool Troubleshooting documentation`_.
+
+.. _esptool Troubleshooting documentation: https://docs.espressif.com/projects/esptool/en/latest/esp32/troubleshooting.html
+.. _MicroPython download page: https://micropython.org/download/?port=esp32
+.. _ESP32 / WROOM: https://micropython.org/download/ESP32_GENERIC
+.. _ESP32-C3: https://micropython.org/download/ESP32_GENERIC_C3
+.. _ESP32-S3: https://micropython.org/download/ESP32_GENERIC_S3
diff --git a/ports/esp32/boards/ESP32_GENERIC/board.md b/ports/esp32/boards/ESP32_GENERIC/board.md
index 8a669411d06a1..9346d18d84a3c 100644
--- a/ports/esp32/boards/ESP32_GENERIC/board.md
+++ b/ports/esp32/boards/ESP32_GENERIC/board.md
@@ -1,9 +1,18 @@
 The following files are firmware that should work on most ESP32-based boards
 with 4MiB of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
 
-If your board is based on a WROVER module, or otherwise has SPIRAM (also known
-as PSRAM), then use the "spiram" variant.
+This board has multiple variants available:
 
-The "d2wd" variant is for ESP32-D2WD chips (with 2MiB flash), and "unicore" is
-for single-core ESP32 chips (e.g. the "SOLO" modules). The "ota" variant sets
-up the partition table to allow for Over-the-Air updates.
+* If your board is based on a WROVER module, or otherwise has SPIRAM (also known
+  as PSRAM) then it's recommended to use the "spiram" variant. Look for heading
+  **Support for SPIRAM / WROVER)**.
+* If your board has a ESP32-D2WD chip (with only 2MiB flash) then use the "d2wd"
+  variant. Look for heading **ESP32 D2WD**.
+* If your board has a single-core ESP32 (e.g. the "SOLO" modules) then choose
+  the "unicore" variant. Look for heading **ESP32 Unicore**.
+* If you'd like to perform Over-the-Air updates of the MicroPython firmware,
+  then choose the "ota" variant. This variant has less room in the flash for
+  Python files as a result of supporting OTA. Look for heading **Support for
+  OTA**.
+
+Otherwise, download the generic variant (under the first heading below).

From 6fc18ec647c6c9f399b433aa53b07ee04132d4a8 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 7 Jan 2025 17:29:56 +1100
Subject: [PATCH 1802/3129] esp32/boards: Update the product name for some UM
 boards.

The previous deploy.md refactors revealed that these boards had a different
"product" entry in boards.json compared to the name given in the board.md
file.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/UM_FEATHERS2/board.json    | 2 +-
 ports/esp32/boards/UM_FEATHERS2NEO/board.json | 2 +-
 ports/esp32/boards/UM_TINYS2/board.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index b6cacf8c5c784..4a59fbe70c27d 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -24,7 +24,7 @@
         "unexpectedmaker_feathers2.jpg"
     ],
     "mcu": "esp32s2",
-    "product": "Feather S2",
+    "product": "FeatherS2",
     "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
index 5b9a1935c9760..a8271dfd3dfb0 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -24,7 +24,7 @@
         "unexpectedmaker_feathers2neo.jpg"
     ],
     "mcu": "esp32s2",
-    "product": "Feather S2 Neo",
+    "product": "FeatherS2 Neo",
     "thumbnail": "",
     "url": "https://unexpectedmaker.com/feathers2-neo",
     "vendor": "Unexpected Maker"
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index 9077ca6bb4b85..dc788a4bc04da 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -23,7 +23,7 @@
         "unexpectedmaker_tinys2.jpg"
     ],
     "mcu": "esp32s2",
-    "product": "Tiny S2",
+    "product": "TinyS2",
     "thumbnail": "",
     "url": "https://unexpectedmaker.com/tinys2",
     "vendor": "Unexpected Maker"

From 84e0aca0fb3b95a4f6c3a46e1a40894b488ba655 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 15 Jan 2025 11:17:07 +1100
Subject: [PATCH 1803/3129] docs/esp32: Defer to the download page for flashing
 steps.

The user already has it open, and its customised for their
particular board.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/tutorial/intro.rst | 72 ++++++++++-------------------------
 1 file changed, 21 insertions(+), 51 deletions(-)

diff --git a/docs/esp32/tutorial/intro.rst b/docs/esp32/tutorial/intro.rst
index 660af87448aca..599731ad755af 100644
--- a/docs/esp32/tutorial/intro.rst
+++ b/docs/esp32/tutorial/intro.rst
@@ -62,60 +62,17 @@ features, then you may find the Preview builds useful.
 Deploying the firmware
 ----------------------
 
-Once you have the MicroPython firmware you need to load it onto your ESP32 device.
-There are two main steps to do this: first you need to put your device in
-bootloader mode, and second you need to copy across the firmware.  The exact
-procedure for these steps is highly dependent on the particular board and you will
-need to refer to its documentation for details.
+Once you have the MicroPython firmware you need to load it onto your ESP32
+device. There are two main steps to do this: first you need to put your device
+in bootloader mode, and second you need to copy across the firmware. The exact
+procedure for these steps is highly dependent on the particular board.
 
-Fortunately, most boards have a USB connector, a USB-serial converter, and 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 HUZZAH32, M5Stack, Wemos LOLIN32, and TinyPICO
-boards, along with the Espressif DevKitC, PICO-KIT, WROVER-KIT dev-kits.
-
-For best results it is recommended to first erase the entire flash of your
-device before putting on new MicroPython firmware.
-
-Currently we only support esptool.py to copy across the firmware.  You can find
-this tool here: `<https://docs.espressif.com/projects/esptool/>`__, or install it
-using pip::
-
-    pip install esptool
-
-Using esptool.py you can erase the flash with the command::
-
-    esptool.py erase_flash
-
-.. note:: On Windows, the command may be named ``esptool`` not ``esptool.py``
-
-Then deploy the new firmware. Use this command for original ESP32 and ESP32-S2 SoCs::
-
-    esptool.py --baud 460800 write_flash 0x1000 ESP32_BOARD_NAME-DATE-VERSION.bin
-
-Use this command for all other SoCs (including ESP32-S3, ESP32-C3, and all newer chips)::
-
-    esptool.py --baud 460800 write_flash 0 ESP32_BOARD_NAME-DATE-VERSION.bin
-
-Replace ``ESP32_BOARD_NAME-DATE-VERSION.bin`` with the name of your firmware .bin file.
-
-.. note:: If you're unsure which command line to use, check the `MicroPython
-  download page`_ for your board. Each download page shows an accurate command
-  line example for that board and its SoC.
+Detailed steps can be found on the same `MicroPython download page`_ for your
+board. It's recommended that you follow the steps on the download page, as they
+are customised for your particular board.
 
 If the above commands run without error then MicroPython should be installed on
-your board! If the command fails, see :ref:`esp32_troubleshooting_install` below.
-
-Serial prompt
--------------
-
-Once you have the firmware on the device you can access the REPL (Python prompt)
-over either UART0, which might be connected to a USB-serial converter depending
-on your board, or the chip's built-in USB device. The baudrate is 115200.
-
-From here you can now follow the ESP8266 tutorial, because these two Espressif chips
-are very similar when it comes to using MicroPython on them.  The ESP8266 tutorial
-is found at :ref:`esp8266_tutorial` (but skip the Introduction section).
+your board! Skip ahead to :ref:`esp32_serial_prompt`.
 
 .. _esp32_troubleshooting_install:
 
@@ -153,6 +110,19 @@ after flashing, here are some troubleshooting recommendations:
 * If you still experience problems with flashing the firmware then please also
   refer to the `esptool Troubleshooting documentation`_.
 
+.. _esp32_serial_prompt:
+
+Serial prompt
+-------------
+
+Once you have the firmware on the device you can access the REPL (Python prompt)
+over either UART0, which might be connected to a USB-serial converter depending
+on your board, or the chip's built-in USB device. The baudrate is 115200.
+
+From here you can now follow the ESP8266 tutorial, because these two Espressif chips
+are very similar when it comes to using MicroPython on them.  The ESP8266 tutorial
+is found at :ref:`esp8266_tutorial` (but skip the Introduction section).
+
 .. _esptool Troubleshooting documentation: https://docs.espressif.com/projects/esptool/en/latest/esp32/troubleshooting.html
 .. _MicroPython download page: https://micropython.org/download/?port=esp32
 .. _ESP32 / WROOM: https://micropython.org/download/ESP32_GENERIC

From 6db29978ac8954f3686f9eb59dd71b55c3495456 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Jan 2025 15:54:47 +1100
Subject: [PATCH 1804/3129] py/mkrules.mk: Move comment about partial clones
 outside make rule.

Otherwise the comment is printed each time the rule is run.

Follow up to fdd606dd5395d9c474775945fa4458a27199653b.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 875ddee8523b8..74978b0d15bf2 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -248,13 +248,13 @@ clean-prog:
 .PHONY: clean-prog
 endif
 
+# If available, do blobless partial clones of submodules to save time and space.
+# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.).
+# Fallback to standard submodule update if blobless isn't available (earlier than 2.36.0)
 submodules:
 	$(ECHO) "Updating submodules: $(GIT_SUBMODULES)"
 ifneq ($(GIT_SUBMODULES),)
 	$(Q)cd $(TOP) && git submodule sync $(GIT_SUBMODULES)
-	# If available, do blobless partial clones of submodules to save time and space.
-	# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.).
-	# Fallback to standard submodule update if blobless isn't available (earlier than 2.36.0)
 	$(Q)cd $(TOP) && git submodule update --init --filter=blob:none $(GIT_SUBMODULES) || \
 	  git submodule update --init $(GIT_SUBMODULES)
 endif

From b4f53a0e51a7bb098f67a747fb1c62c21492a1dd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Jan 2025 15:16:36 +1100
Subject: [PATCH 1805/3129] qemu/boards: Change boards to use a subdirectory
 like other ports.

This commit moves `<board>.mk` to `<board>/mpconfigboard.mk` for all qemu
boards, making it the same as other bare-metal ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/Makefile                                        | 7 ++++++-
 .../qemu/boards/{MICROBIT.mk => MICROBIT/mpconfigboard.mk} | 0
 .../boards/{MPS2_AN385.mk => MPS2_AN385/mpconfigboard.mk}  | 0
 .../boards/{NETDUINO2.mk => NETDUINO2/mpconfigboard.mk}    | 0
 .../boards/{SABRELITE.mk => SABRELITE/mpconfigboard.mk}    | 0
 .../boards/{VIRT_RV32.mk => VIRT_RV32/mpconfigboard.mk}    | 0
 6 files changed, 6 insertions(+), 1 deletion(-)
 rename ports/qemu/boards/{MICROBIT.mk => MICROBIT/mpconfigboard.mk} (100%)
 rename ports/qemu/boards/{MPS2_AN385.mk => MPS2_AN385/mpconfigboard.mk} (100%)
 rename ports/qemu/boards/{NETDUINO2.mk => NETDUINO2/mpconfigboard.mk} (100%)
 rename ports/qemu/boards/{SABRELITE.mk => SABRELITE/mpconfigboard.mk} (100%)
 rename ports/qemu/boards/{VIRT_RV32.mk => VIRT_RV32/mpconfigboard.mk} (100%)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index bf9addc6f3256..d2550cf883b7d 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -2,6 +2,11 @@
 # Initial setup of Makefile environment
 
 BOARD ?= MPS2_AN385
+BOARD_DIR ?= boards/$(BOARD)
+
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
 
 # Make the build directory reflect the board.
 BUILD ?= build-$(BOARD)
@@ -10,7 +15,7 @@ include ../../py/mkenv.mk
 -include mpconfigport.mk
 
 # Include board specific .mk file.
-include boards/$(BOARD).mk
+include $(BOARD_DIR)/mpconfigboard.mk
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
diff --git a/ports/qemu/boards/MICROBIT.mk b/ports/qemu/boards/MICROBIT/mpconfigboard.mk
similarity index 100%
rename from ports/qemu/boards/MICROBIT.mk
rename to ports/qemu/boards/MICROBIT/mpconfigboard.mk
diff --git a/ports/qemu/boards/MPS2_AN385.mk b/ports/qemu/boards/MPS2_AN385/mpconfigboard.mk
similarity index 100%
rename from ports/qemu/boards/MPS2_AN385.mk
rename to ports/qemu/boards/MPS2_AN385/mpconfigboard.mk
diff --git a/ports/qemu/boards/NETDUINO2.mk b/ports/qemu/boards/NETDUINO2/mpconfigboard.mk
similarity index 100%
rename from ports/qemu/boards/NETDUINO2.mk
rename to ports/qemu/boards/NETDUINO2/mpconfigboard.mk
diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE/mpconfigboard.mk
similarity index 100%
rename from ports/qemu/boards/SABRELITE.mk
rename to ports/qemu/boards/SABRELITE/mpconfigboard.mk
diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
similarity index 100%
rename from ports/qemu/boards/VIRT_RV32.mk
rename to ports/qemu/boards/VIRT_RV32/mpconfigboard.mk

From 87f04d5935ef4e190873f4f31afdc25a58647976 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 18 Jan 2025 12:06:33 +0100
Subject: [PATCH 1806/3129] esp8266/Makefile: Fix local toolchain builds on
 recent Linux systems.

This commit fixes compilation for the ESP8266 port when using a local
toolchain on relatively recent Linux systems.

The documentation asks the user to delete the esptool instance that
comes with the toolchain, in favour of using the one provided by the
system.  On Linux systems that are at least two years old (looking at
the CI Ubuntu image as an example), the version of esptool installed
with the package manager isn't called `esptool.py` but just `esptool`.
The Makefile didn't take that into account and used `esptool.py` without
checking if such a command exists, making builds fail.

Now preference is given to the `esptool` command, falling back to
`esptool.py` only if the former command does not exist or it is not
available to the current user, to maintain compatibility with old
setups.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp8266/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index cd94a38a726e3..1721075eae172 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -185,6 +185,11 @@ else ifneq ($(shell cat $(CONFVARS_FILE)), $(FROZEN_MANIFEST) $(UART_OS))
 $(shell echo $(FROZEN_MANIFEST) $(UART_OS) > $(CONFVARS_FILE))
 endif
 
+ESPTOOL := $(shell command -v esptool 2> /dev/null)
+ifndef ESPTOOL
+ESPTOOL = esptool.py
+endif
+
 $(BUILD)/uart.o: $(CONFVARS_FILE)
 
 FROZEN_EXTRA_DEPS = $(CONFVARS_FILE)
@@ -193,11 +198,11 @@ FROZEN_EXTRA_DEPS = $(CONFVARS_FILE)
 
 deploy: $(FWBIN)
 	$(ECHO) "Writing $< to the board"
-	$(Q)esptool.py --port $(PORT) --baud $(BAUD) write_flash --verify --flash_size=$(FLASH_SIZE) --flash_mode=$(FLASH_MODE) 0 $<
+	$(Q)$(ESPTOOL) --port $(PORT) --baud $(BAUD) write_flash --verify --flash_size=$(FLASH_SIZE) --flash_mode=$(FLASH_MODE) 0 $<
 
 erase:
 	$(ECHO) "Erase flash"
-	$(Q)esptool.py --port $(PORT) --baud $(BAUD) erase_flash
+	$(Q)$(ESPTOOL) --port $(PORT) --baud $(BAUD) erase_flash
 
 reset:
 	echo -e "\r\nimport machine; machine.reset()\r\n" >$(PORT)
@@ -205,7 +210,7 @@ reset:
 ifeq ($(BOARD_VARIANT),OTA)
 $(FWBIN): $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
-	$(Q)esptool.py elf2image $^
+	$(Q)$(ESPTOOL) elf2image $^
 	$(Q)$(PYTHON) makeimg.py $(BUILD)/firmware.elf-0x00000.bin $(BUILD)/firmware.elf-0x[0-5][1-f]000.bin $(BUILD)/firmware-ota.bin
 
 	$(Q)cat $(YAOTA8266)/yaota8266.bin $(BUILD)/firmware-ota.bin > $@
@@ -213,7 +218,7 @@ $(FWBIN): $(BUILD)/firmware.elf
 else
 $(FWBIN): $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
-	$(Q)esptool.py elf2image $^
+	$(Q)$(ESPTOOL) elf2image $^
 	$(Q)$(PYTHON) makeimg.py $(BUILD)/firmware.elf-0x00000.bin $(BUILD)/firmware.elf-0x[0-5][1-f]000.bin $@
 endif
 

From 1100aa63c908f60d03fa5b1d1b3abae3a53050f8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Jan 2025 17:09:43 +1100
Subject: [PATCH 1807/3129] LICENSE,docs: Update copyright year range to
 include 2025.

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 550ed9574d06a..929a2e97de7bf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2024 Damien P. George
+Copyright (c) 2013-2025 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 e5c6ba98090af..eb61487582024 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -71,7 +71,7 @@
 
 # General information about the project.
 project = "MicroPython"
-copyright = "- The MicroPython Documentation is Copyright © 2014-2024, " + micropy_authors
+copyright = "- The MicroPython Documentation is Copyright © 2014-2025, " + micropy_authors
 
 # 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 70b95d8f9314ebcddee15e5ac2f4bdb03143846d Mon Sep 17 00:00:00 2001
From: Graeme Winter <graeme.winter@gmail.com>
Date: Thu, 23 Mar 2023 05:20:46 +0000
Subject: [PATCH 1808/3129] samd/machine_dac: Fix SAMD51 DAC for two channels.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improvements to DAC support for SAMD51:
- properly validate DAC id
- correctly use dac_init flag, as a 2-ple for A0, A1 channels
- disable DAC before adjusting settings, see SAMD5x data sheet §47.6.2.3

Co-authored-by: robert-hh <robert@hammelrath.com>
Signed-off-by: Graeme Winter <graeme.winter@gmail.com>
---
 ports/samd/machine_dac.c | 52 +++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/ports/samd/machine_dac.c b/ports/samd/machine_dac.c
index c611f95e653d0..7dcc654644d79 100644
--- a/ports/samd/machine_dac.c
+++ b/ports/samd/machine_dac.c
@@ -72,7 +72,8 @@ static uint8_t dac_vref_table[] = {
 #define MAX_DAC_VALUE       (4095)
 #define DEFAULT_DAC_VREF    (2)
 #define MAX_DAC_VREF        (3)
-static bool dac_init = false;
+static bool dac_init[2] = {false, false};
+
 #endif
 
 
@@ -91,10 +92,10 @@ static mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 
     uint8_t id = args[ARG_id].u_int;
     dac_obj_t *self = NULL;
-    if (0 <= id && id <= MP_ARRAY_SIZE(dac_obj)) {
+    if (0 <= id && id < MP_ARRAY_SIZE(dac_obj)) {
         self = &dac_obj[id];
     } else {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for DAC"));
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid id for DAC"));
     }
 
     uint8_t vref = args[ARG_vref].u_int;
@@ -102,9 +103,10 @@ static mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
         self->vref = vref;
     }
 
-    Dac *dac = dac_bases[0]; // Just one DAC
+    Dac *dac = dac_bases[0]; // Just one DAC register block
+
+    // initialize DAC
 
-    // Init DAC
     #if defined(MCU_SAMD21)
 
     // Configuration SAMD21
@@ -127,21 +129,39 @@ 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
-    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) {
+    if (!(dac_init[0] | dac_init[1])) {
+        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->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
-    dac->CTRLA.bit.ENABLE = 1;
-    while (dac->SYNCBUSY.bit.ENABLE) {
+    // Modify DAC config - requires disabling see Section 47.6.2.3 of data sheet
+    if (!dac_init[self->id]) {
+        // Disable DAC and wait
+        dac->CTRLA.bit.ENABLE = 0;
+        while (dac->SYNCBUSY.bit.ENABLE) {
+        }
+
+        // Modify configuration
+        dac->DACCTRL[self->id].reg = DAC_DACCTRL_ENABLE | \
+            DAC_DACCTRL_REFRESH(2) | DAC_DACCTRL_CCTRL_CC12M;
+        dac->DATA[self->id].reg = 0;
+        dac_init[self->id] = true;
+
+        // Enable DAC and wait
+        dac->CTRLA.bit.ENABLE = 1;
+        while (dac->SYNCBUSY.bit.ENABLE) {
+        }
     }
+
     #endif
 
     // Set the port as given in self->gpio_id as DAC

From c69f0e4eeeb1058ac4a4b1b5b5d1896371e0ecd2 Mon Sep 17 00:00:00 2001
From: "I. Tomita" <ziceva@me.com>
Date: Thu, 19 Oct 2023 12:54:37 +0300
Subject: [PATCH 1809/3129] samd/samd_qspiflash: Correct QSPI baud calculation.

The QSPI baud is derived from the AHB clock, not from the APB (peripheral)
clock.

Datasheet: The QSPI Baud rate clock is generated by dividing the module
clock (CLK_QSPI_AHB) by a value between 1 and 255.

As previously implemented, all baudrates are 2.5 times greater than
expected.

Signed-off-by: I. Tomita <ziceva@me.com>
---
 ports/samd/samd_qspiflash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
index d027a0495f3c0..e25ddf21efe8f 100644
--- a/ports/samd/samd_qspiflash.c
+++ b/ports/samd/samd_qspiflash.c
@@ -238,7 +238,7 @@ static void wait_for_flash_ready(void) {
 }
 
 static uint8_t get_baud(int32_t freq_mhz) {
-    int baud = get_peripheral_freq() / (freq_mhz * 1000000) - 1;
+    int baud = get_cpu_freq() / (freq_mhz * 1000000) - 1;
     if (baud < 1) {
         baud = 1;
     }

From 865a4c8bf6868ce488347a76f5f3db8e0dabd11d Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 21 Jan 2025 08:48:25 +0200
Subject: [PATCH 1810/3129] esp32: Add support for IDF v5.4.

Add WIFI_AUTH_WPA3_ENTERPRISE and WIFI_AUTH_WPA2_WPA3_ENTERPRISE, and
update PPP callback signature for latest lwIP.

Co-authored-by: Daniel van de Giessen <daniel@dvdgiessen.nl>
Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/README.md      | 2 +-
 ports/esp32/network_ppp.c  | 9 +++++++--
 ports/esp32/network_wlan.c | 8 +++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index bc24e5cd71ad6..8597c85ec3103 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 v5.2, v5.2.2, and v5.3.
+Currently MicroPython supports v5.2, v5.2.2, v5.3 and v5.4.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 5c41cf948c1ed..4dd5a3718c295 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -100,7 +100,12 @@ static mp_obj_t ppp_make_new(mp_obj_t stream) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(esp_network_ppp_make_new_obj, ppp_make_new);
 
-static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx) {
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+static u32_t ppp_output_callback(ppp_pcb *pcb, const void *data, u32_t len, void *ctx)
+#else
+static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx)
+#endif
+{
     ppp_if_obj_t *self = ctx;
 
     mp_obj_t stream = self->stream;
@@ -109,7 +114,7 @@ static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx)
     }
 
     int err;
-    return mp_stream_rw(stream, data, len, &err, MP_STREAM_RW_WRITE);
+    return mp_stream_rw(stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);
 }
 
 static void pppos_client_task(void *self_in) {
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index fed81d28cb6a6..e85d1328fdc2b 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -763,6 +763,10 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
     { MP_ROM_QSTR(MP_QSTR_SEC_DPP), MP_ROM_INT(WIFI_AUTH_DPP) },
     #endif
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_ENT), MP_ROM_INT(WIFI_AUTH_WPA3_ENTERPRISE) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA2_WPA3_ENT), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_ENTERPRISE) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(WIFI_PS_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(WIFI_PS_MIN_MODEM) },
@@ -770,7 +774,9 @@ 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);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+_Static_assert(WIFI_AUTH_MAX == 16, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types_generic.h");
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
 _Static_assert(WIFI_AUTH_MAX == 14, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types_generic.h");
 #elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
 _Static_assert(WIFI_AUTH_MAX == 13, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");

From a4ab847688406bb31eb531e07155bf173a8785aa Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 21 Jan 2025 09:55:55 +0200
Subject: [PATCH 1811/3129] py/persistentcode: Initialize prelude_ptr to
 prevent compiler warning.

The esp32 IDF toolchain can give a "may be used uninitialized" warning, at
least for ESP32-S3 with gcc 14.2.0.  Silence that warning by initializing
the variable with NULL.

Co-authored-by: Daniel van de Giessen <daniel@dvdgiessen.nl>
Signed-off-by: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
---
 py/persistentcode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index 0843d1a2c52e6..840ee49d3e4eb 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -402,7 +402,7 @@ static mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
 
     #if MICROPY_EMIT_MACHINE_CODE
     } else {
-        const uint8_t *prelude_ptr;
+        const uint8_t *prelude_ptr = NULL;
         #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

From 7b3f189b1723fe642f122a3b7826d16fe32f801a Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 8 Feb 2024 16:56:52 -0800
Subject: [PATCH 1812/3129] tests/basics/nanbox_smallint.py: Fix incorrect use
 of int() in test.

The literal is in base 16 but int()'s default radix in CPython is 10, not
0.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/basics/nanbox_smallint.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/basics/nanbox_smallint.py b/tests/basics/nanbox_smallint.py
index b3a502e447e3a..9451ab3284661 100644
--- a/tests/basics/nanbox_smallint.py
+++ b/tests/basics/nanbox_smallint.py
@@ -23,17 +23,17 @@
     raise SystemExit
 
 micropython.heap_lock()
-print(int("0x80000000"))
+print(int("0x80000000", 16))
 micropython.heap_unlock()
 
 # This is the most positive small integer.
 micropython.heap_lock()
-print(int("0x3fffffffffff"))
+print(int("0x3fffffffffff", 16))
 micropython.heap_unlock()
 
 # This is the most negative small integer.
 micropython.heap_lock()
-print(int("-0x3fffffffffff") - 1)
+print(int("-0x3fffffffffff", 16) - 1)
 micropython.heap_unlock()
 
 x = 1

From 13b13d1fdd05549d504eeded0b5aa8871d5e5dcf Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Jan 2024 19:31:35 -0600
Subject: [PATCH 1813/3129] py/parsenum: Throw an exception for invalid int
 literals like "01".

This includes making int("01") parse in base 10 like standard Python.
When a base of 0 is specified it means auto-detect based on the prefix, and
literals begining with 0 (except when the literal is all 0's) like "01" are
then invalid and now throw an exception.

The new error message is different from CPython. It says e.g.,
`SyntaxError: invalid syntax for integer with base 0: '09'`

Additional test cases were added to cover the changed & added code.

Co-authored-by: Damien George <damien@micropython.org>
Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objint.c           |  2 +-
 py/parsenum.c         |  4 ++--
 py/parsenumbase.c     | 29 +++++++++++------------------
 tests/basics/int1.py  | 15 +++++++++++++++
 tests/basics/lexer.py |  8 ++++++++
 5 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/py/objint.c b/py/objint.c
index 773e180343aeb..4be6009a440e4 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -55,7 +55,7 @@ static mp_obj_t mp_obj_int_make_new(const mp_obj_type_t *type_in, size_t n_args,
                 return o;
             } else if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_READ)) {
                 // a textual representation, parse it
-                return mp_parse_num_integer(bufinfo.buf, bufinfo.len, 0, NULL);
+                return mp_parse_num_integer(bufinfo.buf, bufinfo.len, 10, NULL);
             #if MICROPY_PY_BUILTINS_FLOAT
             } else if (mp_obj_is_float(args[0])) {
                 return mp_obj_new_int_from_float(mp_obj_float_get(args[0]));
diff --git a/py/parsenum.c b/py/parsenum.c
index b33ffb6ff23e0..27d6641198730 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -151,13 +151,13 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
         raise_exc(exc, lex);
         #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
         mp_obj_t exc = mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-            MP_ERROR_TEXT("invalid syntax for integer with base %d"), base);
+            MP_ERROR_TEXT("invalid syntax for integer with base %d"), base == 1 ? 0 : base);
         raise_exc(exc, lex);
         #else
         vstr_t vstr;
         mp_print_t print;
         vstr_init_print(&vstr, 50, &print);
-        mp_printf(&print, "invalid syntax for integer with base %d: ", base);
+        mp_printf(&print, "invalid syntax for integer with base %d: ", base == 1 ? 0 : 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_utf8_vstr(&vstr));
diff --git a/py/parsenumbase.c b/py/parsenumbase.c
index 94523a666d325..cc3275c456e40 100644
--- a/py/parsenumbase.c
+++ b/py/parsenumbase.c
@@ -30,35 +30,28 @@
 
 // find real radix base, and strip preceding '0x', '0o' and '0b'
 // puts base in *base, and returns number of bytes to skip the prefix
+// in base-0, puts 1 in *base to indicate a number that starts with 0, to provoke a
+// ValueError if it's not all-digits-zero.
 size_t mp_parse_num_base(const char *str, size_t len, int *base) {
     const byte *p = (const byte *)str;
     if (len <= 1) {
         goto no_prefix;
     }
     unichar c = *(p++);
-    if ((*base == 0 || *base == 16) && c == '0') {
-        c = *(p++);
-        if ((c | 32) == 'x') {
+    if (c == '0') {
+        c = *(p++) | 32;
+        int b = *base;
+        if (c == 'x' && !(b & ~16)) {
             *base = 16;
-        } else if (*base == 0 && (c | 32) == 'o') {
+        } else if (c == 'o' && !(b & ~8)) {
             *base = 8;
-        } else if (*base == 0 && (c | 32) == 'b') {
+        } else if (c == 'b' && !(b & ~2)) {
             *base = 2;
         } else {
-            if (*base == 0) {
-                *base = 10;
-            }
-            p -= 2;
-        }
-    } else if (*base == 8 && c == '0') {
-        c = *(p++);
-        if ((c | 32) != 'o') {
-            p -= 2;
-        }
-    } else if (*base == 2 && c == '0') {
-        c = *(p++);
-        if ((c | 32) != 'b') {
             p -= 2;
+            if (b == 0) {
+                *base = 1;
+            }
         }
     } else {
         p--;
diff --git a/tests/basics/int1.py b/tests/basics/int1.py
index 2d92105c73e88..94723af4d00b4 100644
--- a/tests/basics/int1.py
+++ b/tests/basics/int1.py
@@ -13,6 +13,7 @@
 print(int('+1'))
 print(int('-1'))
 print(int('01'))
+print(int('00'))
 print(int('9'))
 print(int('10'))
 print(int('+10'))
@@ -31,6 +32,7 @@
 print(int('0', 10))
 print(int('1', 10))
 print(int(' \t 1 \t ', 10))
+print(int(' \t 00 \t ', 10))
 print(int('11', 10))
 print(int('11', 16))
 print(int('11', 8))
@@ -52,6 +54,17 @@
 print(int('0o12  \t  ', 8))
 print(int(b"12", 10))
 print(int(b"12"))
+print(int('000 ', 0))
+print(int('000 ', 2))
+print(int('000 ', 8))
+print(int('000 ', 10))
+print(int('000 ', 16))
+print(int('000 ', 36))
+print(int('010 ', 2))
+print(int('010 ', 8))
+print(int('010 ', 10))
+print(int('010 ', 16))
+print(int('010 ', 36))
 
 
 def test(value, base):
@@ -79,6 +92,8 @@ def test(value, base):
 test('0xg', 16)
 test('1 1', 16)
 test('123', 37)
+test('01', 0)
+test('01 ', 0)
 
 # check that we don't parse this as a floating point number
 print(0x1e+1)
diff --git a/tests/basics/lexer.py b/tests/basics/lexer.py
index 181d62db1aadb..addb8a13df36a 100644
--- a/tests/basics/lexer.py
+++ b/tests/basics/lexer.py
@@ -83,3 +83,11 @@ def a(x):
     exec(r"'\U0000000'")
 except SyntaxError:
     print("SyntaxError")
+
+# Properly formed integer literals
+print(eval("00"))
+# badly formed integer literals
+try:
+    eval("01")
+except SyntaxError:
+    print("SyntaxError")

From bfc0d7b0b97cbf52db892775b0f371dd06d2ba08 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 23 Jan 2025 23:55:57 +0100
Subject: [PATCH 1814/3129] py/emitnative: Optimise Viper register offset
 load/stores on Xtensa.

This commit improves the emitted code sequences for address generation
in the Viper subsystem when loading/storing 16 and 32 bit values via a
register offset.

The Xtensa opcodes ADDX2 and ADDX4 are used to avoid performing the
extra shifts to align the final operation offset.  Those opcodes are
available on both xtensa and xtensawin MicroPython architectures.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.h  |  8 ++++++++
 py/emitnative.c | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index f226624a82631..d2f37bf828e86 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -143,6 +143,14 @@ static inline void asm_xtensa_op_addi(asm_xtensa_t *as, uint reg_dest, uint reg_
     asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRI8(2, 12, reg_src, reg_dest, imm8 & 0xff));
 }
 
+static inline void asm_xtensa_op_addx2(asm_xtensa_t *as, uint reg_dest, uint reg_src_a, uint reg_src_b) {
+    asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 0, 9, reg_dest, reg_src_a, reg_src_b));
+}
+
+static inline void asm_xtensa_op_addx4(asm_xtensa_t *as, uint reg_dest, uint reg_src_a, uint reg_src_b) {
+    asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 0, 10, reg_dest, reg_src_a, reg_src_b));
+}
+
 static inline void asm_xtensa_op_and(asm_xtensa_t *as, uint reg_dest, uint reg_src_a, uint reg_src_b) {
     asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 0, 1, reg_dest, reg_src_a, reg_src_b));
 }
diff --git a/py/emitnative.c b/py/emitnative.c
index 66c345b233d76..7d856e13f753a 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1625,6 +1625,11 @@ static void emit_native_load_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
+                    #if N_XTENSA || N_XTENSAWIN
+                    asm_xtensa_op_addx2(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
+                    asm_xtensa_op_l16ui(emit->as, REG_RET, REG_ARG_1, 0);
+                    break;
+                    #endif
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_LOAD16_REG_REG(emit->as, REG_RET, REG_ARG_1); // load from (base+2*index)
@@ -1637,6 +1642,10 @@ static void emit_native_load_subscr(emit_t *emit) {
                     asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
                     asm_rv32_opcode_lw(emit->as, REG_RET, REG_ARG_1, 0);
                     break;
+                    #elif N_XTENSA || N_XTENSAWIN
+                    asm_xtensa_op_addx4(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
+                    asm_xtensa_op_l32i_n(emit->as, REG_RET, REG_ARG_1, 0);
+                    break;
                     #endif
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
@@ -1900,6 +1909,10 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_strh_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
                     break;
+                    #elif N_XTENSA || N_XTENSAWIN
+                    asm_xtensa_op_addx2(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
+                    asm_xtensa_op_s16i(emit->as, reg_value, REG_ARG_1, 0);
+                    break;
                     #endif
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
@@ -1916,6 +1929,10 @@ static void emit_native_store_subscr(emit_t *emit) {
                     asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
                     asm_rv32_opcode_sw(emit->as, reg_value, REG_ARG_1, 0);
                     break;
+                    #elif N_XTENSA || N_XTENSAWIN
+                    asm_xtensa_op_addx4(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
+                    asm_xtensa_op_s32i_n(emit->as, reg_value, REG_ARG_1, 0);
+                    break;
                     #endif
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base

From 40585eaa8f1b603f0094b73764e8ce5623812ecf Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 24 Jan 2025 00:20:39 +0100
Subject: [PATCH 1815/3129] py/emitnative: Emit shorter exception handler entry
 code on RV32.

This commit improves the RV32 code sequence that is emitted if a
function needs to set up an exception handler as its prologue.

The old code would clear a temporary register and then copy that value
to places that needed to be initialised with zero values.  On RV32
there's a dedicated register that's hardwired to be equal to zero, which
allows us to bypass the extra register clear and use the zero register
to initialise values.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.h    |  2 ++
 py/emitnative.c | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/py/asmrv32.h b/py/asmrv32.h
index 584e3ffd22436..b09f48eb12f66 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -694,6 +694,7 @@ static inline void asm_rv32_opcode_xori(asm_rv32_t *state, mp_uint_t rd, mp_uint
 #define REG_LOCAL_1 ASM_RV32_REG_S3
 #define REG_LOCAL_2 ASM_RV32_REG_S4
 #define REG_LOCAL_3 ASM_RV32_REG_S5
+#define REG_ZERO ASM_RV32_REG_ZERO
 
 void asm_rv32_meta_comparison_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd);
 void asm_rv32_meta_comparison_ne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd);
@@ -756,6 +757,7 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_STORE_REG_REG(state, rs1, rs2) ASM_STORE32_REG_REG(state, rs1, rs2)
 #define ASM_SUB_REG_REG(state, rd, rs) asm_rv32_opcode_sub(state, rd, rd, rs)
 #define ASM_XOR_REG_REG(state, rd, rs) asm_rv32_emit_optimised_xor(state, rd, rs)
+#define ASM_CLR_REG(state, rd)
 
 #endif
 
diff --git a/py/emitnative.c b/py/emitnative.c
index 7d856e13f753a..f846e8bb4e2cb 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -288,6 +288,11 @@ struct _emit_t {
     ASM_T *as;
 };
 
+#ifndef REG_ZERO
+#define REG_ZERO REG_TEMP0
+#define ASM_CLR_REG(state, rd) ASM_XOR_REG_REG(state, rd, rd)
+#endif
+
 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);
@@ -1200,12 +1205,12 @@ static void emit_native_global_exc_entry(emit_t *emit) {
             ASM_JUMP_IF_REG_ZERO(emit->as, REG_RET, start_label, true);
         } else {
             // Clear the unwind state
-            ASM_XOR_REG_REG(emit->as, REG_TEMP0, REG_TEMP0);
-            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_UNWIND(emit), REG_TEMP0);
+            ASM_CLR_REG(emit->as, REG_ZERO);
+            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_UNWIND(emit), REG_ZERO);
 
             // clear nlr.ret_val, because it's passed to mp_native_raise regardless
             // of whether there was an exception or not
-            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_TEMP0);
+            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_ZERO);
 
             // Put PC of start code block into REG_LOCAL_1
             ASM_MOV_REG_PCREL(emit->as, REG_LOCAL_1, start_label);
@@ -1221,8 +1226,8 @@ static void emit_native_global_exc_entry(emit_t *emit) {
             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
-            ASM_XOR_REG_REG(emit->as, REG_TEMP0, REG_TEMP0);
-            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_PC(emit), REG_TEMP0);
+            ASM_CLR_REG(emit->as, REG_ZERO);
+            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_PC(emit), REG_ZERO);
             ASM_JUMP_REG(emit->as, REG_LOCAL_1);
 
             // Global exception handler: check for valid exception handler

From 55ca3fd67512555707304c6b68b836eb89f09d1c Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 24 Jan 2025 09:22:36 +0100
Subject: [PATCH 1816/3129] py/emitnative: Optimise Viper immediate offset
 load/stores on Xtensa.

This commit introduces the ability to emit optimised code paths on
Xtensa for load/store operations indexed via an immediate offset.

If an immediate offset for a load/store operation is within a certain
range that allows it to be embedded into an available opcode then said
opcode is emitted instead of the generic code sequence.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitnative.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/py/emitnative.c b/py/emitnative.c
index f846e8bb4e2cb..82ee729d3d50f 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1550,6 +1550,11 @@ static void emit_native_load_subscr(emit_t *emit) {
                             asm_rv32_opcode_lbu(emit->as, REG_RET, reg_base, index_value);
                             break;
                         }
+                        #elif N_XTENSA || N_XTENSAWIN
+                        if (index_value > 0 && index_value < 256) {
+                            asm_xtensa_op_l8ui(emit->as, REG_RET, reg_base, index_value);
+                            break;
+                        }
                         #endif
                         need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
@@ -1573,6 +1578,11 @@ static void emit_native_load_subscr(emit_t *emit) {
                             asm_rv32_opcode_lhu(emit->as, REG_RET, reg_base, index_value << 1);
                             break;
                         }
+                        #elif N_XTENSA || N_XTENSAWIN
+                        if (index_value > 0 && index_value < 256) {
+                            asm_xtensa_op_l16ui(emit->as, REG_RET, reg_base, index_value);
+                            break;
+                        }
                         #endif
                         need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value << 1);
@@ -1596,6 +1606,10 @@ static void emit_native_load_subscr(emit_t *emit) {
                             asm_rv32_opcode_lw(emit->as, REG_RET, reg_base, index_value << 2);
                             break;
                         }
+                        #elif N_XTENSA || N_XTENSAWIN
+                        if (index_value > 0 && index_value < 256) {
+                            asm_xtensa_l32i_optimised(emit->as, REG_RET, reg_base, index_value);
+                        }
                         #endif
                         need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value << 2);
@@ -1812,6 +1826,11 @@ static void emit_native_store_subscr(emit_t *emit) {
                             asm_rv32_opcode_sb(emit->as, reg_value, reg_base, index_value);
                             break;
                         }
+                        #elif N_XTENSA || N_XTENSAWIN
+                        if (index_value > 0 && index_value < 256) {
+                            asm_xtensa_op_s8i(emit->as, REG_RET, reg_base, index_value);
+                            break;
+                        }
                         #endif
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
                         #if N_ARM
@@ -1838,6 +1857,11 @@ static void emit_native_store_subscr(emit_t *emit) {
                             asm_rv32_opcode_sh(emit->as, reg_value, reg_base, index_value << 1);
                             break;
                         }
+                        #elif N_XTENSA || N_XTENSAWIN
+                        if (index_value > 0 && index_value < 256) {
+                            asm_xtensa_op_s16i(emit->as, REG_RET, reg_base, index_value);
+                            break;
+                        }
                         #endif
                         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
@@ -1860,6 +1884,10 @@ static void emit_native_store_subscr(emit_t *emit) {
                             asm_rv32_opcode_sw(emit->as, reg_value, reg_base, index_value << 2);
                             break;
                         }
+                        #elif N_XTENSA || N_XTENSAWIN
+                        if (index_value > 0 && index_value < 256) {
+                            asm_xtensa_s32i_optimised(emit->as, REG_RET, reg_base, index_value);
+                        }
                         #elif N_ARM
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
                         asm_arm_str_reg_reg_reg(emit->as, reg_value, reg_base, reg_index);

From 0d46e45a1f72ee61a153c41aaaf6c63818ccffb0 Mon Sep 17 00:00:00 2001
From: Hans Maerki <buhtig.hans.maerki@ergoinfo.ch>
Date: Sun, 26 Jan 2025 18:00:38 +0100
Subject: [PATCH 1817/3129] tools/mpremote: Avoid initial blocking read in
 read_until().

If the target does not return any data then `read_until()` will block
indefinitely.  Fix this by making the initial read part of the general read
look, which always checks `inWaiting() > 0` before reading from the serial
device.

Also added the UART timeout to the constructor.  This is not currently used
but may be used as an additional safeguard.

Signed-off-by: Hans Maerki <buhtig.hans.maerki@ergoinfo.ch>
---
 tools/mpremote/mpremote/transport_serial.py | 30 ++++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 28ccaf6d8c907..449708a5ee43d 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -42,7 +42,7 @@
 
 
 class SerialTransport(Transport):
-    def __init__(self, device, baudrate=115200, wait=0, exclusive=True):
+    def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None):
         self.in_raw_repl = False
         self.use_raw_paste = True
         self.device_name = device
@@ -52,7 +52,11 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True):
         import serial.tools.list_ports
 
         # Set options, and exclusive if pyserial supports it
-        serial_kwargs = {"baudrate": baudrate, "interCharTimeout": 1}
+        serial_kwargs = {
+            "baudrate": baudrate,
+            "timeout": timeout,
+            "interCharTimeout": 1,
+        }
         if serial.__version__ >= "3.3":
             serial_kwargs["exclusive"] = exclusive
 
@@ -95,13 +99,20 @@ def close(self):
         self.serial.close()
 
     def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
-        # if data_consumer is used then data is not accumulated and the ending must be 1 byte long
+        """
+        min_num_bytes: Obsolete.
+        ending: Return if 'ending' matches.
+        timeout [s]: Return if timeout between characters. None: Infinite timeout.
+        data_consumer: Use callback for incoming characters.
+            If data_consumer is used then data is not accumulated and the ending must be 1 byte long
+
+        It is not visible to the caller why the function returned. It could be ending or timeout.
+        """
         assert data_consumer is None or len(ending) == 1
+        assert isinstance(timeout, (type(None), int, float))
 
-        data = self.serial.read(min_num_bytes)
-        if data_consumer:
-            data_consumer(data)
-        timeout_count = 0
+        data = b""
+        begin_char_s = time.monotonic()
         while True:
             if data.endswith(ending):
                 break
@@ -112,10 +123,9 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
                     data = new_data
                 else:
                     data = data + new_data
-                timeout_count = 0
+                begin_char_s = time.monotonic()
             else:
-                timeout_count += 1
-                if timeout is not None and timeout_count >= 100 * timeout:
+                if timeout is not None and time.monotonic() >= begin_char_s + timeout:
                     break
                 time.sleep(0.01)
         return data

From 03fe9c55ea8a3ef8bede5547476f37d7fca20119 Mon Sep 17 00:00:00 2001
From: Hans Maerki <buhtig.hans.maerki@ergoinfo.ch>
Date: Mon, 27 Jan 2025 07:29:44 +0100
Subject: [PATCH 1818/3129] tools/mpremote: Introduce timeout_overall for
 read_until().

And use it in `enter_raw_repl()`.  This prevents waiting forever for a
serial device that does not respond to the Ctrl-C/Ctrl-D/etc commands and
is constantly outputting data.

Signed-off-by: Hans Maerki <buhtig.hans.maerki@ergoinfo.ch>
---
 tools/mpremote/mpremote/transport_serial.py | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 449708a5ee43d..d3148f9ace318 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -98,11 +98,14 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None
     def close(self):
         self.serial.close()
 
-    def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
+    def read_until(
+        self, min_num_bytes, ending, timeout=10, data_consumer=None, timeout_overall=None
+    ):
         """
         min_num_bytes: Obsolete.
         ending: Return if 'ending' matches.
         timeout [s]: Return if timeout between characters. None: Infinite timeout.
+        timeout_overall [s]: Return not later than timeout_overall. None: Infinite timeout.
         data_consumer: Use callback for incoming characters.
             If data_consumer is used then data is not accumulated and the ending must be 1 byte long
 
@@ -110,9 +113,10 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
         """
         assert data_consumer is None or len(ending) == 1
         assert isinstance(timeout, (type(None), int, float))
+        assert isinstance(timeout_overall, (type(None), int, float))
 
         data = b""
-        begin_char_s = time.monotonic()
+        begin_overall_s = begin_char_s = time.monotonic()
         while True:
             if data.endswith(ending):
                 break
@@ -127,10 +131,15 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
             else:
                 if timeout is not None and time.monotonic() >= begin_char_s + timeout:
                     break
+                if (
+                    timeout_overall is not None
+                    and time.monotonic() >= begin_overall_s + timeout_overall
+                ):
+                    break
                 time.sleep(0.01)
         return data
 
-    def enter_raw_repl(self, soft_reset=True):
+    def enter_raw_repl(self, soft_reset=True, timeout_overall=10):
         self.serial.write(b"\r\x03")  # ctrl-C: interrupt any running program
 
         # flush input (without relying on serial.flushInput())
@@ -142,7 +151,9 @@ def enter_raw_repl(self, soft_reset=True):
         self.serial.write(b"\r\x01")  # ctrl-A: enter raw REPL
 
         if soft_reset:
-            data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
+            data = self.read_until(
+                1, b"raw REPL; CTRL-B to exit\r\n>", timeout_overall=timeout_overall
+            )
             if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
                 print(data)
                 raise TransportError("could not enter raw repl")
@@ -152,12 +163,12 @@ def enter_raw_repl(self, soft_reset=True):
             # 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")
+            data = self.read_until(1, b"soft reboot\r\n", timeout_overall=timeout_overall)
             if not data.endswith(b"soft reboot\r\n"):
                 print(data)
                 raise TransportError("could not enter raw repl")
 
-        data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
+        data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n", timeout_overall=timeout_overall)
         if not data.endswith(b"raw REPL; CTRL-B to exit\r\n"):
             print(data)
             raise TransportError("could not enter raw repl")

From f29bd5a65e9688222474e54b4f5d0fb127a23db3 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Sun, 19 Jan 2025 15:37:55 -0600
Subject: [PATCH 1819/3129] extmod/modlwip: Fix incorrect peer address for
 IPv6.

For IPv6 connections, the peer address was previously defined as only the
first four bytes of the IP address. For IPv6 addresses, this resulted in an
incorrect IPv4 address. For instance, receiving a packet via `::recvfrom`
from `'fe80::87:e7ff:fe48:629a'` is returned as having a peer address of
`'254.128.0.0'`

Signed-off-by: Jared Hancock <jared.hancock@centeredsolutions.com>
---
 extmod/modlwip.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index ce70627c31c60..bcccd363e673c 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -37,7 +37,6 @@
 
 #if MICROPY_PY_LWIP
 
-#include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 
 #include "lwip/init.h"
@@ -308,7 +307,7 @@ typedef struct _lwip_socket_obj_t {
         } connection;
     } incoming;
     mp_obj_t callback;
-    byte peer[4];
+    ip_addr_t peer;
     mp_uint_t peer_port;
     mp_uint_t timeout;
     uint16_t recv_offset;
@@ -638,7 +637,7 @@ static mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, m
 }
 
 // Helper function for recv/recvfrom to handle raw/UDP packets
-static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
+static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, ip_addr_t *ip, mp_uint_t *port, int *_errno) {
 
     if (socket->incoming.pbuf == NULL) {
         if (socket->timeout == 0) {
@@ -1132,7 +1131,7 @@ static mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
                 mp_raise_OSError(error_lookup_table[-err]);
             }
             socket->peer_port = (mp_uint_t)port;
-            memcpy(socket->peer, &dest, sizeof(socket->peer));
+            memcpy(&socket->peer, &dest, sizeof(socket->peer));
             MICROPY_PY_LWIP_EXIT
 
             // And now we wait...
@@ -1294,13 +1293,13 @@ static mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     mp_int_t len = mp_obj_get_int(len_in);
     vstr_t vstr;
     vstr_init_len(&vstr, len);
-    byte ip[4];
+    ip_addr_t ip;
     mp_uint_t port;
 
     mp_uint_t ret = 0;
     switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM: {
-            memcpy(ip, &socket->peer, sizeof(socket->peer));
+            memcpy(&ip, &socket->peer, sizeof(socket->peer));
             port = (mp_uint_t)socket->peer_port;
             ret = lwip_tcp_receive(socket, (byte *)vstr.buf, len, &_errno);
             break;
@@ -1309,7 +1308,7 @@ static mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
         #if MICROPY_PY_LWIP_SOCK_RAW
         case MOD_NETWORK_SOCK_RAW:
         #endif
-            ret = lwip_raw_udp_receive(socket, (byte *)vstr.buf, len, ip, &port, &_errno);
+            ret = lwip_raw_udp_receive(socket, (byte *)vstr.buf, len, &ip, &port, &_errno);
             break;
     }
     if (ret == -1) {
@@ -1323,7 +1322,8 @@ static mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
         vstr.len = ret;
         tuple[0] = mp_obj_new_bytes_from_vstr(&vstr);
     }
-    tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
+    tuple[1] = lwip_format_inet_addr(&ip, port);
+
     return mp_obj_new_tuple(2, tuple);
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recvfrom_obj, lwip_socket_recvfrom);

From ec527a11136e1c83ddf51099a418ea785215284f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 Jan 2025 11:38:43 +1100
Subject: [PATCH 1820/3129] esp32: Disable component manager when running 'make
 submodules'.

- ECHO_SUBMODULES=1 exits CMake early. With idf_component_manager 1.x this
  seems to leave the managed_components directory in a state that causes
  later builds to fail.

- Looks like the component manager isn't needed for this step, so disable
  it. This invocation logs a warning (not visible in normal output) but
  completes successfully and returns the correct list of submodules.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 8888180766b79..1c2fa82ce1265 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -112,6 +112,6 @@ size-files:
 # output and passes the list of submodules to py/mkrules.mk which does the
 # `git submodule init` on each.
 submodules:
-	@GIT_SUBMODULES=$$(idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \
+	@GIT_SUBMODULES=$$(IDF_COMPONENT_MANAGER=0 idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \
 	                  grep '^GIT_SUBMODULES=' | cut -d= -f2); \
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules

From 43e3ab6131b11d7fb7409a35fe5127317ba27397 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 Jan 2025 11:39:32 +1100
Subject: [PATCH 1821/3129] esp32: Don't add TinyUSB files to an
 ECHO_SUBMODULES build.

Similar to other places, CMake will error out if this file
doesn't exist yet but we don't want this if we're only getting
the list of submodules.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/esp32_common.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index b6bfcdacc3cb4..e03d2ff11aada 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -60,7 +60,7 @@ list(APPEND MICROPY_SOURCE_DRIVERS
 )
 
 string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
-if(MICROPY_PY_TINYUSB)
+if(MICROPY_PY_TINYUSB AND NOT ECHO_SUBMODULES)
     set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
     string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
 

From 22353e9e1ed5bf8bc5bad179896ca2877f7511e2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 Jan 2025 11:50:27 +1100
Subject: [PATCH 1822/3129] py/mkrules: Add GIT_SUBMODULES_FAIL_IF_EMPTY flag
 for CMake ports.

The way CMake gathers the submodule list, it can quietly be empty
if the previous step fails. This makes it an explicit error.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/Makefile | 2 +-
 ports/rp2/Makefile   | 2 +-
 py/mkrules.mk        | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 1c2fa82ce1265..1ce4d97208da7 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -114,4 +114,4 @@ size-files:
 submodules:
 	@GIT_SUBMODULES=$$(IDF_COMPONENT_MANAGER=0 idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \
 	                  grep '^GIT_SUBMODULES=' | cut -d= -f2); \
-	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules
+	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" GIT_SUBMODULES_FAIL_IF_EMPTY=1 submodules
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index afa21cc7a4383..200899d338e6a 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -76,4 +76,4 @@ submodules:
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="lib/pico-sdk" 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
+	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" GIT_SUBMODULES_FAIL_IF_EMPTY=1 submodules
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 74978b0d15bf2..373bda8996f19 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -257,6 +257,13 @@ ifneq ($(GIT_SUBMODULES),)
 	$(Q)cd $(TOP) && git submodule sync $(GIT_SUBMODULES)
 	$(Q)cd $(TOP) && git submodule update --init --filter=blob:none $(GIT_SUBMODULES) || \
 	  git submodule update --init $(GIT_SUBMODULES)
+else
+ifeq ($(GIT_SUBMODULES_FAIL_IF_EMPTY),1)
+	# If you see this error, it may mean the internal step run by the port's build
+	# system to find git submodules has failed. Double-check dependencies are set correctly.
+	$(ECHO) "Internal build error: The submodule list should not be empty."
+	exit 1
+endif
 endif
 .PHONY: submodules
 

From abb13b1e1e37c42876f69c83b96c9ead3285a9a7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 Jan 2025 17:45:40 +1100
Subject: [PATCH 1823/3129] extmod/lwip-include: Factor common lwIP config into
 lwipopts_common.h.

This lwIP configuration file has options that are common to all ports, and
the ports are updated to use this file.  This change is a no-op, the lwIP
configuration remains the same for the four ports using this common file.

This reduces code duplication, keeps the ports in sync, and makes it easier
to update the configuration for all ports at once.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/lwip-include/lwipopts_common.h | 109 ++++++++++++++++++++++++++
 ports/mimxrt/lwip_inc/lwipopts.h      |  47 +----------
 ports/renesas-ra/lwip_inc/lwipopts.h  |  42 +---------
 ports/rp2/lwip_inc/lwipopts.h         |  56 +------------
 ports/stm32/lwip_inc/lwipopts.h       |  77 +-----------------
 5 files changed, 122 insertions(+), 209 deletions(-)
 create mode 100644 extmod/lwip-include/lwipopts_common.h

diff --git a/extmod/lwip-include/lwipopts_common.h b/extmod/lwip-include/lwipopts_common.h
new file mode 100644
index 0000000000000..8688db064ef6f
--- /dev/null
+++ b/extmod/lwip-include/lwipopts_common.h
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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_LWIPOPTS_COMMON_H
+#define MICROPY_INCLUDED_LWIPOPTS_COMMON_H
+
+#include "py/mpconfig.h"
+
+// This sys-arch protection is not needed.
+// Ports either protect lwIP code with flags, or run it 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
+#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_DHCP                       1
+#define LWIP_DHCP_CHECK_LINK_UP         1
+#define LWIP_DHCP_DOES_ACD_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
+
+#if MICROPY_PY_LWIP_PPP
+#define PPP_SUPPORT                     1
+#define PAP_SUPPORT                     1
+#define CHAP_SUPPORT                    1
+#endif
+
+#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
+
+// TCP memory settings.
+// Default lwIP settings takes 15800 bytes; TCP d/l: 380k/s local, 7.2k/s remote; TCP u/l is very slow.
+#ifndef MEM_SIZE
+
+#if 0
+// lwIP takes 19159 bytes; TCP d/l and u/l are around 320k/s on local network.
+#define MEM_SIZE (5000)
+#define TCP_WND (4 * TCP_MSS)
+#define TCP_SND_BUF (4 * TCP_MSS)
+#endif
+
+#if 1
+// lwIP takes 26700 bytes; TCP dl/ul are around 750/600 k/s on local network.
+#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)
+#endif
+
+#if 0
+// lwIP takes 45600 bytes; TCP dl/ul are around 1200/1000 k/s on local network.
+#define MEM_SIZE (16000)
+#define TCP_MSS (1460)
+#define TCP_WND (8 * TCP_MSS)
+#define TCP_SND_BUF (8 * TCP_MSS)
+#define MEMP_NUM_TCP_SEG (32)
+#endif
+
+#endif // MEM_SIZE
+
+// Needed for PPP.
+#define sys_jiffies sys_now
+
+typedef uint32_t sys_prot_t;
+
+#endif // MICROPY_INCLUDED_LWIPOPTS_COMMON_H
diff --git a/ports/mimxrt/lwip_inc/lwipopts.h b/ports/mimxrt/lwip_inc/lwipopts.h
index 411ca4b60f342..cf25597f95c1f 100644
--- a/ports/mimxrt/lwip_inc/lwipopts.h
+++ b/ports/mimxrt/lwip_inc/lwipopts.h
@@ -1,56 +1,15 @@
 #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
-// 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 LWIP_DHCP_DOES_ACD_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)
+// Include common lwIP configuration.
+#include "extmod/lwip-include/lwipopts_common.h"
 
-typedef uint32_t sys_prot_t;
+extern uint32_t trng_random_u32(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_LWIP_LWIPOPTS_H
diff --git a/ports/renesas-ra/lwip_inc/lwipopts.h b/ports/renesas-ra/lwip_inc/lwipopts.h
index 74e39022a6a85..77645ae6c3c3d 100644
--- a/ports/renesas-ra/lwip_inc/lwipopts.h
+++ b/ports/renesas-ra/lwip_inc/lwipopts.h
@@ -1,45 +1,8 @@
 #ifndef MICROPY_INCLUDED_RA_LWIP_LWIPOPTS_H
 #define MICROPY_INCLUDED_RA_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
-#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_IPV6                       0
-#define LWIP_DHCP                       1
-#define LWIP_DHCP_CHECK_LINK_UP         1
-#define LWIP_DHCP_DOES_ACD_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 rng_read(void);
 #define LWIP_RAND() rng_read()
 
 #define MEM_SIZE                        (16 * 1024)
@@ -51,6 +14,9 @@ extern uint32_t rng_read(void);
 #define TCP_QUEUE_OOSEQ                 (1)
 #define MEMP_NUM_TCP_SEG                (2 * TCP_SND_QUEUELEN)
 
-typedef uint32_t sys_prot_t;
+// Include common lwIP configuration.
+#include "extmod/lwip-include/lwipopts_common.h"
+
+extern uint32_t rng_read(void);
 
 #endif // MICROPY_INCLUDED_RA_LWIP_LWIPOPTS_H
diff --git a/ports/rp2/lwip_inc/lwipopts.h b/ports/rp2/lwip_inc/lwipopts.h
index 15679e0cf018d..da45a5735b28c 100644
--- a/ports/rp2/lwip_inc/lwipopts.h
+++ b/ports/rp2/lwip_inc/lwipopts.h
@@ -1,28 +1,6 @@
 #ifndef MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
 #define MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
 
-#include "py/mpconfig.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_NETIF_STATUS_CALLBACK      1
 
@@ -30,40 +8,12 @@
 #define LWIP_IPV6                       1
 #define LWIP_ND6_NUM_DESTINATIONS       4
 #define LWIP_ND6_QUEUEING               0
-#define LWIP_DHCP                       1
-#define LWIP_DHCP_CHECK_LINK_UP         1
-#define LWIP_DHCP_DOES_ACD_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
-
-#if MICROPY_PY_LWIP_PPP
-#define PPP_SUPPORT                     1
-#define PAP_SUPPORT                     1
-#define CHAP_SUPPORT                    1
-#endif
 
-#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)
+// Include common lwIP configuration.
+#include "extmod/lwip-include/lwipopts_common.h"
 
-typedef uint32_t sys_prot_t;
-
-// Needed for PPP.
-#define sys_jiffies sys_now
+extern uint32_t rosc_random_u32(void);
 
 #endif // MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
diff --git a/ports/stm32/lwip_inc/lwipopts.h b/ports/stm32/lwip_inc/lwipopts.h
index 9e1aa8d0f14c0..9e2402c8dc5dc 100644
--- a/ports/stm32/lwip_inc/lwipopts.h
+++ b/ports/stm32/lwip_inc/lwipopts.h
@@ -1,89 +1,18 @@
 #ifndef MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H
 #define MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H
 
-#include "py/mpconfig.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
-#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_LOOPIF_MULTICAST           1
 #define LWIP_LOOPBACK_MAX_PBUFS         8
 
 #define LWIP_IPV6                       0
-#define LWIP_DHCP                       1
-#define LWIP_DHCP_CHECK_LINK_UP         1
-#define LWIP_DHCP_DOES_ACD_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
-
-#if MICROPY_PY_LWIP_PPP
-#define PPP_SUPPORT                     1
-#define PAP_SUPPORT                     1
-#define CHAP_SUPPORT                    1
-#endif
-
-#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 rng_get(void);
 #define LWIP_RAND() rng_get()
 
-// default
-// lwip takes 15800 bytes; TCP d/l: 380k/s local, 7.2k/s remote
-// TCP u/l is very slow
-
-#if 0
-// lwip takes 19159 bytes; TCP d/l and u/l are around 320k/s on local network
-#define MEM_SIZE (5000)
-#define TCP_WND (4 * TCP_MSS)
-#define TCP_SND_BUF (4 * TCP_MSS)
-#endif
-
-#if 1
-// lwip takes 26700 bytes; TCP dl/ul are around 750/600 k/s on local network
-#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)
-#endif
+// Include common lwIP configuration.
+#include "extmod/lwip-include/lwipopts_common.h"
 
-#if 0
-// lwip takes 45600 bytes; TCP dl/ul are around 1200/1000 k/s on local network
-#define MEM_SIZE (16000)
-#define TCP_MSS (1460)
-#define TCP_WND (8 * TCP_MSS)
-#define TCP_SND_BUF (8 * TCP_MSS)
-#define MEMP_NUM_TCP_SEG (32)
-#endif
-
-typedef uint32_t sys_prot_t;
-
-// Needed for PPP.
-#define sys_jiffies sys_now
+extern uint32_t rng_get(void);
 
 #endif // MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H

From bfb1bee6feba9f06452a0e4b572ec4d15df325cf Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 26 Jan 2025 20:54:14 -0600
Subject: [PATCH 1824/3129] py/parsenumbase: Favor clarity of code over manual
 optimisation.

Follow up to 13b13d1fdd05549d504eeded0b5aa8871d5e5dcf, based on some
testing on godbolt, the manual code optimisation seems unnecessary for code
size, at least on gcc x86_64 and ARM, and it's definitely not good for
clarity.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/parsenumbase.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/parsenumbase.c b/py/parsenumbase.c
index cc3275c456e40..fbf07a119584f 100644
--- a/py/parsenumbase.c
+++ b/py/parsenumbase.c
@@ -41,11 +41,11 @@ size_t mp_parse_num_base(const char *str, size_t len, int *base) {
     if (c == '0') {
         c = *(p++) | 32;
         int b = *base;
-        if (c == 'x' && !(b & ~16)) {
+        if (c == 'x' && (b == 0 || b == 16)) {
             *base = 16;
-        } else if (c == 'o' && !(b & ~8)) {
+        } else if (c == 'o' && (b == 0 || b == 8)) {
             *base = 8;
-        } else if (c == 'b' && !(b & ~2)) {
+        } else if (c == 'b' && (b == 0 || b == 2)) {
             *base = 2;
         } else {
             p -= 2;

From 195bf051153cff1d49b3645c51099e9ff6e1d80d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 15 Oct 2024 12:23:28 +1100
Subject: [PATCH 1825/3129] tests: Add a test for SSL socket memory leaks.

Test is for an issue reported on the micropython-lib Discord as
effecting the rp2 port umqtt.simple interface when reconnecting with TLS,
however it's a more generic problem.

Currently this test fails on RPI_PICO_W and ESP32_GENERIC_C3 (and no doubt
others). Fixes are in the subsequent commits.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/ssl_noleak.py | 50 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/extmod/ssl_noleak.py

diff --git a/tests/extmod/ssl_noleak.py b/tests/extmod/ssl_noleak.py
new file mode 100644
index 0000000000000..870032d58e63e
--- /dev/null
+++ b/tests/extmod/ssl_noleak.py
@@ -0,0 +1,50 @@
+# Ensure that SSLSockets can be allocated sequentially
+# without running out of available memory.
+try:
+    import io
+    import tls
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import unittest
+
+
+class TestSocket(io.IOBase):
+    def write(self, buf):
+        return len(buf)
+
+    def readinto(self, buf):
+        return 0
+
+    def ioctl(self, cmd, arg):
+        return 0
+
+    def setblocking(self, value):
+        pass
+
+
+ITERS = 128
+
+
+class TLSNoLeaks(unittest.TestCase):
+    def test_unique_context(self):
+        for n in range(ITERS):
+            print(n)
+            s = TestSocket()
+            ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+            ctx.verify_mode = tls.CERT_NONE
+            s = ctx.wrap_socket(s, do_handshake_on_connect=False)
+
+    def test_shared_context(self):
+        # Single SSLContext, multiple sockets
+        ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+        ctx.verify_mode = tls.CERT_NONE
+        for n in range(ITERS):
+            print(n)
+            s = TestSocket()
+            s = ctx.wrap_socket(s, do_handshake_on_connect=False)
+
+
+if __name__ == "__main__":
+    unittest.main()

From 97f444bfa04408dd510f118baaea5760b93bd892 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 28 Jan 2025 15:31:18 +1100
Subject: [PATCH 1826/3129] extmod/mbedtls: Try GC before failing to setup
 socket on esp32, unix.

On mbedTLS ports with non-baremetal configs (mostly esp32, technically also
unix port), mbedTLS memory is allocated from the libc heap. This means an
old SSL socket may be holding large SSL buffers and preventing a new SSL
socket from being allocated.

As a workaround, trigger a GC pass and retry before failing outright.

This was originally implemented as a global mbedTLS calloc function, but
there is complexity around the possibility of C user modules calling into
mbedTLS without holding the GIL. It would be interesting to try making a
generic version for any malloc which fails, but this would require checking
for a Python thread and probably making the GIL recursive.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/modtls_mbedtls.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 0a1b8828af5ca..3fd416d72f5ef 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -37,6 +37,7 @@
 #include "py/stream.h"
 #include "py/objstr.h"
 #include "py/reader.h"
+#include "py/gc.h"
 #include "extmod/vfs.h"
 
 // mbedtls_time_t
@@ -58,6 +59,10 @@
 #include "mbedtls/asn1.h"
 #endif
 
+#ifndef MICROPY_MBEDTLS_CONFIG_BARE_METAL
+#define MICROPY_MBEDTLS_CONFIG_BARE_METAL (0)
+#endif
+
 #define MP_STREAM_POLL_RDWR (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)
 
 // This corresponds to an SSLContext object.
@@ -545,6 +550,16 @@ static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     mbedtls_ssl_init(&o->ssl);
 
     ret = mbedtls_ssl_setup(&o->ssl, &ssl_context->conf);
+    #if !MICROPY_MBEDTLS_CONFIG_BARE_METAL
+    if (ret == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
+        // If mbedTLS relies on platform libc heap for buffers (i.e. esp32
+        // port), then run a GC pass and then try again. This is useful because
+        // it may free a Python object (like an old SSL socket) whose finaliser
+        // frees some platform-level heap.
+        gc_collect();
+        ret = mbedtls_ssl_setup(&o->ssl, &ssl_context->conf);
+    }
+    #endif
     if (ret != 0) {
         goto cleanup;
     }

From d642cce27a9a07e043211f099c31fca390f96f1a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 16 Oct 2024 16:43:13 +1100
Subject: [PATCH 1827/3129] unix: Use the bare metal mbedTLS config in the
 coverage buiid.

This allows coverage to test MicroPython-specific features such as
the tracked alloc cleanups added in the parent commit.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/mbedtls/mbedtls_config_port.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/unix/mbedtls/mbedtls_config_port.h b/ports/unix/mbedtls/mbedtls_config_port.h
index c619de9b8b1b9..aec65e6581e73 100644
--- a/ports/unix/mbedtls/mbedtls_config_port.h
+++ b/ports/unix/mbedtls/mbedtls_config_port.h
@@ -32,7 +32,18 @@
 // Enable mbedtls modules
 #define MBEDTLS_TIMING_C
 
+#if defined(MICROPY_UNIX_COVERAGE)
+// Test the "bare metal" memory management in the coverage build
+#define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
+#endif
+
 // Include common mbedtls configuration.
 #include "extmod/mbedtls/mbedtls_config_common.h"
 
+#if defined(MICROPY_UNIX_COVERAGE)
+// See comment above, but fall back to the default platform entropy functions
+#undef MBEDTLS_ENTROPY_HARDWARE_ALT
+#undef MBEDTLS_NO_PLATFORM_ENTROPY
+#endif
+
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */

From 8a2ff2ca7366f605dd55c93f6b393552b365cd10 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 4 Dec 2024 10:53:08 +1100
Subject: [PATCH 1828/3129] py/gc: Split out running finalizers to a separate
 pass.

Currently a finalizer may run and access memory which has already been
freed. (This happens mostly during gc_sweep_all() but could happen during
any garbage collection pass.)

Includes some speed improvement tweaks to skip empty FTB blocks. These help
compensate for the inherent slowdown of having to walk the heap twice.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/gc.c | 67 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index bee44925076f0..297f4f85d3f6a 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -477,29 +477,20 @@ static void gc_deal_with_stack_overflow(void) {
     }
 }
 
-static void gc_sweep(void) {
-    #if MICROPY_PY_GC_COLLECT_RETVAL
-    MP_STATE_MEM(gc_collected) = 0;
-    #endif
-    // free unmarked heads and their tails
-    int free_tail = 0;
-    #if MICROPY_GC_SPLIT_HEAP_AUTO
-    mp_state_mem_area_t *prev_area = NULL;
-    #endif
-    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
-        size_t end_block = area->gc_alloc_table_byte_len * BLOCKS_PER_ATB;
-        if (area->gc_last_used_block < end_block) {
-            end_block = area->gc_last_used_block + 1;
-        }
-
-        size_t last_used_block = 0;
-
-        for (size_t block = 0; block < end_block; block++) {
-            MICROPY_GC_HOOK_LOOP(block);
-            switch (ATB_GET_KIND(area, block)) {
-                case AT_HEAD:
-                    #if MICROPY_ENABLE_FINALISER
-                    if (FTB_GET(area, block)) {
+// Run finalisers for all to-be-freed blocks
+static void gc_sweep_run_finalisers(void) {
+    #if MICROPY_ENABLE_FINALISER
+    for (const mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+        assert(area->gc_last_used_block <= area->gc_alloc_table_byte_len * BLOCKS_PER_ATB);
+        // Small speed optimisation: skip over empty FTB blocks
+        size_t ftb_end = area->gc_last_used_block / BLOCKS_PER_FTB; // index is inclusive
+        for (size_t ftb_idx = 0; ftb_idx <= ftb_end; ftb_idx++) {
+            byte ftb = area->gc_finaliser_table_start[ftb_idx];
+            size_t block = ftb_idx * BLOCKS_PER_FTB;
+            while (ftb) {
+                MICROPY_GC_HOOK_LOOP(block);
+                if (ftb & 1) { // FTB_GET(area, block) shortcut
+                    if (ATB_GET_KIND(area, block) == AT_HEAD) {
                         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
@@ -519,7 +510,35 @@ static void gc_sweep(void) {
                         // clear finaliser flag
                         FTB_CLEAR(area, block);
                     }
-                    #endif
+                }
+                ftb >>= 1;
+                block++;
+            }
+        }
+    }
+    #endif // MICROPY_ENABLE_FINALISER
+}
+
+static void gc_sweep(void) {
+    #if MICROPY_PY_GC_COLLECT_RETVAL
+    MP_STATE_MEM(gc_collected) = 0;
+    #endif
+    // free unmarked heads and their tails
+    int free_tail = 0;
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    mp_state_mem_area_t *prev_area = NULL;
+    #endif
+
+    gc_sweep_run_finalisers();
+
+    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+        size_t last_used_block = 0;
+        assert(area->gc_last_used_block <= area->gc_alloc_table_byte_len * BLOCKS_PER_ATB);
+
+        for (size_t block = 0; block <= area->gc_last_used_block; block++) {
+            MICROPY_GC_HOOK_LOOP(block);
+            switch (ATB_GET_KIND(area, block)) {
+                case AT_HEAD:
                     free_tail = 1;
                     DEBUG_printf("gc_sweep(%p)\n", (void *)PTR_FROM_BLOCK(area, block));
                     #if MICROPY_PY_GC_COLLECT_RETVAL

From 40e1c111e17864044190596dff6d32955d11280c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 4 Dec 2024 10:58:06 +1100
Subject: [PATCH 1829/3129] py/gc: Allow gc_free from inside a gc_sweep
 finalizer.

Do this by tracking being inside gc collection with a
separate flag, GC_COLLECT_FLAG. In gc_free(),
ignore this flag when determining if the heap is locked.

* For finalisers calling gc_free() when heap is otherwise unlocked,
  this allows memory to be immediately freed (potentially
  avoiding a MemoryError).

* Hard IRQs still can't call gc_free(), as heap will be locked via
  gc_lock().

* If finalisers are disabled then all of this code can be compiled
  out to save some code size.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/gc.c             | 35 +++++++++++++++++++++--------------
 py/modmicropython.c |  4 ++--
 py/mpstate.h        | 13 +++++++++++++
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 297f4f85d3f6a..3d48e062494a8 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -334,12 +334,12 @@ void gc_lock(void) {
     // - 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)++;
+    MP_STATE_THREAD(gc_lock_depth) += (1 << GC_LOCK_DEPTH_SHIFT);
 }
 
 void gc_unlock(void) {
     // This does not need to be atomic, See comment above in gc_lock.
-    MP_STATE_THREAD(gc_lock_depth)--;
+    MP_STATE_THREAD(gc_lock_depth) -= (1 << GC_LOCK_DEPTH_SHIFT);
 }
 
 bool gc_is_locked(void) {
@@ -581,13 +581,18 @@ static void gc_sweep(void) {
     }
 }
 
-void gc_collect_start(void) {
+static void gc_collect_start_common(void) {
     GC_ENTER();
-    MP_STATE_THREAD(gc_lock_depth)++;
+    assert((MP_STATE_THREAD(gc_lock_depth) & GC_COLLECT_FLAG) == 0);
+    MP_STATE_THREAD(gc_lock_depth) |= GC_COLLECT_FLAG;
+    MP_STATE_MEM(gc_stack_overflow) = 0;
+}
+
+void gc_collect_start(void) {
+    gc_collect_start_common();
     #if MICROPY_GC_ALLOC_THRESHOLD
     MP_STATE_MEM(gc_alloc_amount) = 0;
     #endif
-    MP_STATE_MEM(gc_stack_overflow) = 0;
 
     // Trace root pointers.  This relies on the root pointers being organised
     // correctly in the mp_state_ctx structure.  We scan nlr_top, dict_locals,
@@ -658,14 +663,12 @@ void gc_collect_end(void) {
     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)--;
+    MP_STATE_THREAD(gc_lock_depth) &= ~GC_COLLECT_FLAG;
     GC_EXIT();
 }
 
 void gc_sweep_all(void) {
-    GC_ENTER();
-    MP_STATE_THREAD(gc_lock_depth)++;
-    MP_STATE_MEM(gc_stack_overflow) = 0;
+    gc_collect_start_common();
     gc_collect_end();
 }
 
@@ -902,10 +905,13 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
 // force the freeing of a piece of memory
 // TODO: freeing here does not call finaliser
 void gc_free(void *ptr) {
-    if (MP_STATE_THREAD(gc_lock_depth) > 0) {
-        // Cannot free while the GC is locked. However free is an optimisation
-        // to reclaim the memory immediately, this means it will now be left
-        // until the next collection.
+    // Cannot free while the GC is locked, unless we're only doing a gc sweep.
+    // However free is an optimisation to reclaim the memory immediately, this
+    // means it will now be left until the next collection.
+    //
+    // (We have the optimisation to free immediately from inside a gc sweep so
+    // that finalisers can free more memory when trying to avoid MemoryError.)
+    if (MP_STATE_THREAD(gc_lock_depth) & ~GC_COLLECT_FLAG) {
         return;
     }
 
@@ -930,7 +936,8 @@ void gc_free(void *ptr) {
     #endif
 
     size_t block = BLOCK_FROM_PTR(area, ptr);
-    assert(ATB_GET_KIND(area, block) == AT_HEAD);
+    assert(ATB_GET_KIND(area, block) == AT_HEAD
+        || (ATB_GET_KIND(area, block) == AT_MARK && (MP_STATE_THREAD(gc_lock_depth) & GC_COLLECT_FLAG)));
 
     #if MICROPY_ENABLE_FINALISER
     FTB_CLEAR(area, block);
diff --git a/py/modmicropython.c b/py/modmicropython.c
index 1bf0a000c2026..d1a687f10e14e 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -132,13 +132,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_THREAD(gc_lock_depth));
+    return MP_OBJ_NEW_SMALL_INT(MP_STATE_THREAD(gc_lock_depth) >> GC_LOCK_DEPTH_SHIFT);
 }
 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_THREAD(gc_lock_depth));
+    return MP_OBJ_NEW_SMALL_INT(MP_STATE_THREAD(gc_lock_depth) >> GC_LOCK_DEPTH_SHIFT);
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_locked_obj, mp_micropython_heap_locked);
 #endif
diff --git a/py/mpstate.h b/py/mpstate.h
index 54eca596daa28..51f290b55b5ed 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -77,6 +77,18 @@ typedef struct _mp_sched_item_t {
     mp_obj_t arg;
 } mp_sched_item_t;
 
+// gc_lock_depth field is a combination of the GC_COLLECT_FLAG
+// bit and a lock depth shifted GC_LOCK_DEPTH_SHIFT bits left.
+#if MICROPY_ENABLE_FINALISER
+#define GC_COLLECT_FLAG 1
+#define GC_LOCK_DEPTH_SHIFT 1
+#else
+// If finalisers are disabled then this check doesn't matter, as gc_lock()
+// is called anywhere else that heap can't be changed. So save some code size.
+#define GC_COLLECT_FLAG 0
+#define GC_LOCK_DEPTH_SHIFT 0
+#endif
+
 // This structure holds information about a single contiguous area of
 // memory reserved for the memory manager.
 typedef struct _mp_state_mem_area_t {
@@ -268,6 +280,7 @@ typedef struct _mp_state_thread_t {
     #endif
 
     // Locking of the GC is done per thread.
+    // See GC_LOCK_DEPTH_SHIFT for an explanation of this field.
     uint16_t gc_lock_depth;
 
     ////////////////////////////////////////////////////////////

From 4bcbe88e74de245fdee029b6a0746e3485d82a7e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 10 Dec 2024 14:50:42 +1100
Subject: [PATCH 1830/3129] py: Add optional support for recursive mutexes, use
 for gc mutex.

Enabled by default if using threading and no GIL

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/gc.c       | 11 ++++++-----
 py/mpconfig.h |  5 +++++
 py/mpstate.h  |  2 +-
 py/mpthread.h |  6 ++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 3d48e062494a8..6a3f48ac3c0ce 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -113,9 +113,12 @@
 #endif
 
 #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
-#define GC_ENTER() mp_thread_mutex_lock(&MP_STATE_MEM(gc_mutex), 1)
-#define GC_EXIT() mp_thread_mutex_unlock(&MP_STATE_MEM(gc_mutex))
+#define GC_MUTEX_INIT() mp_thread_recursive_mutex_init(&MP_STATE_MEM(gc_mutex))
+#define GC_ENTER() mp_thread_recursive_mutex_lock(&MP_STATE_MEM(gc_mutex), 1)
+#define GC_EXIT() mp_thread_recursive_mutex_unlock(&MP_STATE_MEM(gc_mutex))
 #else
+// Either no threading, or assume callers to gc_collect() hold the GIL
+#define GC_MUTEX_INIT()
 #define GC_ENTER()
 #define GC_EXIT()
 #endif
@@ -210,9 +213,7 @@ void gc_init(void *start, void *end) {
     MP_STATE_MEM(gc_alloc_amount) = 0;
     #endif
 
-    #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
-    mp_thread_mutex_init(&MP_STATE_MEM(gc_mutex));
-    #endif
+    GC_MUTEX_INIT();
 }
 
 #if MICROPY_GC_SPLIT_HEAP
diff --git a/py/mpconfig.h b/py/mpconfig.h
index e84d258a1220a..64138a9ea7acc 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1629,6 +1629,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32)
 #endif
 
+// Is a recursive mutex type in use?
+#ifndef MICROPY_PY_THREAD_RECURSIVE_MUTEX
+#define MICROPY_PY_THREAD_RECURSIVE_MUTEX (MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL)
+#endif
+
 // Extended modules
 
 #ifndef MICROPY_PY_ASYNCIO
diff --git a/py/mpstate.h b/py/mpstate.h
index 51f290b55b5ed..138c5617300e8 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -145,7 +145,7 @@ typedef struct _mp_state_mem_t {
 
     #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
     // This is a global mutex used to make the GC thread-safe.
-    mp_thread_mutex_t gc_mutex;
+    mp_thread_recursive_mutex_t gc_mutex;
     #endif
 } mp_state_mem_t;
 
diff --git a/py/mpthread.h b/py/mpthread.h
index f335cc02911fc..795f230bb4a0c 100644
--- a/py/mpthread.h
+++ b/py/mpthread.h
@@ -48,6 +48,12 @@ void mp_thread_mutex_init(mp_thread_mutex_t *mutex);
 int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait);
 void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex);
 
+#if MICROPY_PY_THREAD_RECURSIVE_MUTEX
+void mp_thread_recursive_mutex_init(mp_thread_recursive_mutex_t *mutex);
+int mp_thread_recursive_mutex_lock(mp_thread_recursive_mutex_t *mutex, int wait);
+void mp_thread_recursive_mutex_unlock(mp_thread_recursive_mutex_t *mutex);
+#endif
+
 #endif // MICROPY_PY_THREAD
 
 #if MICROPY_PY_THREAD && MICROPY_PY_THREAD_GIL

From 3bfedd0f4a9e8b11ff97851615ec4761663b0e94 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 10 Dec 2024 14:51:10 +1100
Subject: [PATCH 1831/3129] rp2: Migrate to the new
 mp_thread_recursive_mutex_t.

Necessary for GC support, also refactored pendsv usage.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mpthreadport.c |  4 ++--
 ports/rp2/mpthreadport.h | 20 +++++++++++++++++++-
 ports/rp2/pendsv.c       | 14 +++++++-------
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 0d3b343cab067..8fd5e5d790277 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -84,10 +84,10 @@ 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);
+    mp_thread_recursive_mutex_lock(&MP_STATE_MEM(gc_mutex), 1);
     multicore_reset_core1();
     core1_entry = NULL;
-    mp_thread_mutex_unlock(&MP_STATE_MEM(gc_mutex));
+    mp_thread_recursive_mutex_unlock(&MP_STATE_MEM(gc_mutex));
 }
 
 void mp_thread_gc_others(void) {
diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
index 67a0da0e9373a..f2f2e17bb079d 100644
--- a/ports/rp2/mpthreadport.h
+++ b/ports/rp2/mpthreadport.h
@@ -26,9 +26,10 @@
 #ifndef MICROPY_INCLUDED_RP2_MPTHREADPORT_H
 #define MICROPY_INCLUDED_RP2_MPTHREADPORT_H
 
-#include "pico/mutex.h"
+#include "mutex_extra.h"
 
 typedef struct mutex mp_thread_mutex_t;
+typedef recursive_mutex_nowait_t mp_thread_recursive_mutex_t;
 
 extern void *core_state[2];
 
@@ -65,4 +66,21 @@ static inline void mp_thread_mutex_unlock(mp_thread_mutex_t *m) {
     mutex_exit(m);
 }
 
+static inline void mp_thread_recursive_mutex_init(mp_thread_recursive_mutex_t *m) {
+    recursive_mutex_nowait_init(m);
+}
+
+static inline int mp_thread_recursive_mutex_lock(mp_thread_recursive_mutex_t *m, int wait) {
+    if (wait) {
+        recursive_mutex_nowait_enter_blocking(m);
+        return 1;
+    } else {
+        return recursive_mutex_nowait_try_enter(m, NULL);
+    }
+}
+
+static inline void mp_thread_recursive_mutex_unlock(mp_thread_recursive_mutex_t *m) {
+    recursive_mutex_nowait_exit(m);
+}
+
 #endif // MICROPY_INCLUDED_RP2_MPTHREADPORT_H
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 905a5aa162ec5..4ba1e81604b0f 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -26,7 +26,7 @@
 
 #include <assert.h>
 #include "py/mpconfig.h"
-#include "mutex_extra.h"
+#include "py/mpthread.h"
 #include "pendsv.h"
 
 #if PICO_RP2040
@@ -47,21 +47,21 @@ void PendSV_Handler(void);
 
 // Using the nowait variant here as softtimer updates PendSV from the loop of mp_wfe_or_timeout(),
 // where we don't want the CPU event bit to be set.
-static recursive_mutex_nowait_t pendsv_mutex;
+static mp_thread_recursive_mutex_t pendsv_mutex;
 
 void pendsv_init(void) {
-    recursive_mutex_nowait_init(&pendsv_mutex);
+    mp_thread_recursive_mutex_init(&pendsv_mutex);
 }
 
 void pendsv_suspend(void) {
     // Recursive Mutex here as either core may call pendsv_suspend() and expect
     // both mutual exclusion (other core can't enter pendsv_suspend() at the
     // same time), and that no PendSV handler will run.
-    recursive_mutex_nowait_enter_blocking(&pendsv_mutex);
+    mp_thread_recursive_mutex_lock(&pendsv_mutex, 1);
 }
 
 void pendsv_resume(void) {
-    recursive_mutex_nowait_exit(&pendsv_mutex);
+    mp_thread_recursive_mutex_unlock(&pendsv_mutex);
 
     // Run pendsv if needed.  Find an entry with a dispatch and call pendsv dispatch
     // with it.  If pendsv runs it will service all slots.
@@ -97,7 +97,7 @@ void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
 // PendSV interrupt handler to perform background processing.
 void PendSV_Handler(void) {
 
-    if (!recursive_mutex_nowait_try_enter(&pendsv_mutex, NULL)) {
+    if (!mp_thread_recursive_mutex_lock(&pendsv_mutex, 0)) {
         // Failure here means core 1 holds pendsv_mutex. ISR will
         // run again after core 1 calls pendsv_resume().
         return;
@@ -117,5 +117,5 @@ void PendSV_Handler(void) {
         }
     }
 
-    recursive_mutex_nowait_exit(&pendsv_mutex);
+    mp_thread_recursive_mutex_unlock(&pendsv_mutex);
 }

From fd0e529a476650a070046a38b7ba7e253b65a77a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 9 Jan 2025 14:38:31 +1100
Subject: [PATCH 1832/3129] unix: Add recursive mutex support.

Allows refactoring the existing thread_mutex atomic section support to use
the new recursive mutex type.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/mpthreadport.c | 31 ++++++++++++++++++++++++-------
 ports/unix/mpthreadport.h |  1 +
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 16ac4da8bf56f..5172645bc147a 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;
+static mp_thread_recursive_mutex_t thread_mutex;
 static mp_thread_t *thread;
 
 // this is used to synchronise the signal handler of the thread
@@ -78,11 +78,11 @@ static sem_t thread_signal_done;
 #endif
 
 void mp_thread_unix_begin_atomic_section(void) {
-    pthread_mutex_lock(&thread_mutex);
+    mp_thread_recursive_mutex_lock(&thread_mutex, true);
 }
 
 void mp_thread_unix_end_atomic_section(void) {
-    pthread_mutex_unlock(&thread_mutex);
+    mp_thread_recursive_mutex_unlock(&thread_mutex);
 }
 
 // this signal handler is used to scan the regs and stack of a thread
@@ -113,10 +113,7 @@ void mp_thread_init(void) {
 
     // 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);
+    mp_thread_recursive_mutex_init(&thread_mutex);
 
     // create first entry in linked list of all threads
     thread = malloc(sizeof(mp_thread_t));
@@ -321,6 +318,26 @@ void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
     // TODO check return value
 }
 
+#if MICROPY_PY_THREAD_RECURSIVE_MUTEX
+
+void mp_thread_recursive_mutex_init(mp_thread_recursive_mutex_t *mutex) {
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_init(&attr);
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+    pthread_mutex_init(mutex, &attr);
+    pthread_mutexattr_destroy(&attr);
+}
+
+int mp_thread_recursive_mutex_lock(mp_thread_recursive_mutex_t *mutex, int wait) {
+    return mp_thread_mutex_lock(mutex, wait);
+}
+
+void mp_thread_recursive_mutex_unlock(mp_thread_recursive_mutex_t *mutex) {
+    mp_thread_mutex_unlock(mutex);
+}
+
+#endif // MICROPY_PY_THREAD_RECURSIVE_MUTEX
+
 #endif // MICROPY_PY_THREAD
 
 // this is used even when MICROPY_PY_THREAD is disabled
diff --git a/ports/unix/mpthreadport.h b/ports/unix/mpthreadport.h
index b365f200edf97..a38223e720b45 100644
--- a/ports/unix/mpthreadport.h
+++ b/ports/unix/mpthreadport.h
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 
 typedef pthread_mutex_t mp_thread_mutex_t;
+typedef pthread_mutex_t mp_thread_recursive_mutex_t;
 
 void mp_thread_init(void);
 void mp_thread_deinit(void);

From 990f50fbb829e41ce275d942c056bcd3f4b857df Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 29 Jan 2025 10:10:10 +1100
Subject: [PATCH 1833/3129] py/gc: Reorder static functions for clarity.

- Renamed gc_sweep to gc_sweep_free_blocks.
- Call gc_sweep_run_finalisers from top level.
- Reordered the gc static functions to be in approximate
  runtime sequence (with forward declarations) rather than
  in declaration order.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/gc.c | 175 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 93 insertions(+), 82 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 6a3f48ac3c0ce..eda63187b20a3 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -123,6 +123,18 @@
 #define GC_EXIT()
 #endif
 
+// Static functions for individual steps of the GC mark/sweep sequence
+static void gc_collect_start_common(void);
+static void *gc_get_ptr(void **ptrs, int i);
+#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
+static void gc_deal_with_stack_overflow(void);
+static void gc_sweep_run_finalisers(void);
+static void gc_sweep_free_blocks(void);
+
 // TODO waste less memory; currently requires that all entries in alloc_table have a corresponding block in pool
 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):
@@ -379,6 +391,64 @@ static inline mp_state_mem_area_t *gc_get_ptr_area(const void *ptr) {
 #endif
 #endif
 
+void gc_collect_start(void) {
+    gc_collect_start_common();
+    #if MICROPY_GC_ALLOC_THRESHOLD
+    MP_STATE_MEM(gc_alloc_amount) = 0;
+    #endif
+
+    // Trace root pointers.  This relies on the root pointers being organised
+    // correctly in the mp_state_ctx structure.  We scan nlr_top, dict_locals,
+    // dict_globals, then the root pointer section of mp_state_vm.
+    void **ptrs = (void **)(void *)&mp_state_ctx;
+    size_t root_start = offsetof(mp_state_ctx_t, thread.dict_locals);
+    size_t root_end = offsetof(mp_state_ctx_t, vm.qstr_last_chunk);
+    gc_collect_root(ptrs + root_start / sizeof(void *), (root_end - root_start) / sizeof(void *));
+
+    #if MICROPY_ENABLE_PYSTACK
+    // Trace root pointers from the Python stack.
+    ptrs = (void **)(void *)MP_STATE_THREAD(pystack_start);
+    gc_collect_root(ptrs, (MP_STATE_THREAD(pystack_cur) - MP_STATE_THREAD(pystack_start)) / sizeof(void *));
+    #endif
+}
+
+static void gc_collect_start_common(void) {
+    GC_ENTER();
+    assert((MP_STATE_THREAD(gc_lock_depth) & GC_COLLECT_FLAG) == 0);
+    MP_STATE_THREAD(gc_lock_depth) |= GC_COLLECT_FLAG;
+    MP_STATE_MEM(gc_stack_overflow) = 0;
+}
+
+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(i);
+        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) {
+            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
+        }
+    }
+}
+
 // Take the given block as the topmost block on the stack. Check all it's
 // children: mark the unmarked child blocks and put those newly marked
 // blocks on the stack. When all children have been checked, pop off the
@@ -457,6 +527,25 @@ static void gc_mark_subtree(size_t block)
     }
 }
 
+void gc_sweep_all(void) {
+    gc_collect_start_common();
+    gc_collect_end();
+}
+
+void gc_collect_end(void) {
+    gc_deal_with_stack_overflow();
+    gc_sweep_run_finalisers();
+    gc_sweep_free_blocks();
+    #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_COLLECT_FLAG;
+    GC_EXIT();
+}
+
 static void gc_deal_with_stack_overflow(void) {
     while (MP_STATE_MEM(gc_stack_overflow)) {
         MP_STATE_MEM(gc_stack_overflow) = 0;
@@ -520,18 +609,16 @@ static void gc_sweep_run_finalisers(void) {
     #endif // MICROPY_ENABLE_FINALISER
 }
 
-static void gc_sweep(void) {
+// Free unmarked heads and their tails
+static void gc_sweep_free_blocks(void) {
     #if MICROPY_PY_GC_COLLECT_RETVAL
     MP_STATE_MEM(gc_collected) = 0;
     #endif
-    // free unmarked heads and their tails
     int free_tail = 0;
     #if MICROPY_GC_SPLIT_HEAP_AUTO
     mp_state_mem_area_t *prev_area = NULL;
     #endif
 
-    gc_sweep_run_finalisers();
-
     for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
         size_t last_used_block = 0;
         assert(area->gc_last_used_block <= area->gc_alloc_table_byte_len * BLOCKS_PER_ATB);
@@ -541,7 +628,7 @@ static void gc_sweep(void) {
             switch (ATB_GET_KIND(area, block)) {
                 case AT_HEAD:
                     free_tail = 1;
-                    DEBUG_printf("gc_sweep(%p)\n", (void *)PTR_FROM_BLOCK(area, block));
+                    DEBUG_printf("gc_sweep_free_blocks(%p)\n", (void *)PTR_FROM_BLOCK(area, block));
                     #if MICROPY_PY_GC_COLLECT_RETVAL
                     MP_STATE_MEM(gc_collected)++;
                     #endif
@@ -572,7 +659,7 @@ static void gc_sweep(void) {
         #if MICROPY_GC_SPLIT_HEAP_AUTO
         // Free any empty area, aside from the first one
         if (last_used_block == 0 && prev_area != NULL) {
-            DEBUG_printf("gc_sweep free empty area %p\n", area);
+            DEBUG_printf("gc_sweep_free_blocks free empty area %p\n", area);
             NEXT_AREA(prev_area) = NEXT_AREA(area);
             MP_PLAT_FREE_HEAP(area);
             area = prev_area;
@@ -582,34 +669,6 @@ static void gc_sweep(void) {
     }
 }
 
-static void gc_collect_start_common(void) {
-    GC_ENTER();
-    assert((MP_STATE_THREAD(gc_lock_depth) & GC_COLLECT_FLAG) == 0);
-    MP_STATE_THREAD(gc_lock_depth) |= GC_COLLECT_FLAG;
-    MP_STATE_MEM(gc_stack_overflow) = 0;
-}
-
-void gc_collect_start(void) {
-    gc_collect_start_common();
-    #if MICROPY_GC_ALLOC_THRESHOLD
-    MP_STATE_MEM(gc_alloc_amount) = 0;
-    #endif
-
-    // Trace root pointers.  This relies on the root pointers being organised
-    // correctly in the mp_state_ctx structure.  We scan nlr_top, dict_locals,
-    // dict_globals, then the root pointer section of mp_state_vm.
-    void **ptrs = (void **)(void *)&mp_state_ctx;
-    size_t root_start = offsetof(mp_state_ctx_t, thread.dict_locals);
-    size_t root_end = offsetof(mp_state_ctx_t, vm.qstr_last_chunk);
-    gc_collect_root(ptrs + root_start / sizeof(void *), (root_end - root_start) / sizeof(void *));
-
-    #if MICROPY_ENABLE_PYSTACK
-    // Trace root pointers from the Python stack.
-    ptrs = (void **)(void *)MP_STATE_THREAD(pystack_start);
-    gc_collect_root(ptrs, (MP_STATE_THREAD(pystack_cur) - MP_STATE_THREAD(pystack_start)) / sizeof(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).
@@ -625,54 +684,6 @@ static void *gc_get_ptr(void **ptrs, int i) {
     return ptrs[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(i);
-        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) {
-            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
-        }
-    }
-}
-
-void gc_collect_end(void) {
-    gc_deal_with_stack_overflow();
-    gc_sweep();
-    #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_COLLECT_FLAG;
-    GC_EXIT();
-}
-
-void gc_sweep_all(void) {
-    gc_collect_start_common();
-    gc_collect_end();
-}
-
 void gc_info(gc_info_t *info) {
     GC_ENTER();
     info->total = 0;

From 112f65776588ef0cc3307f8bef208a480037d7d0 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Thu, 23 Jan 2025 23:17:00 -0800
Subject: [PATCH 1834/3129] stm32/eth: Make ETH DMA buffer attributes
 configurable.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 ports/stm32/eth.c                  | 2 +-
 ports/stm32/mpconfigboard_common.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index fd46bde23cb3f..9f655306816d9 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -121,7 +121,7 @@ typedef struct _eth_t {
     int16_t (*phy_get_link_status)(uint32_t phy_addr);
 } eth_t;
 
-static eth_dma_t eth_dma __attribute__((aligned(16384)));
+static eth_dma_t eth_dma MICROPY_HW_ETH_DMA_ATTRIBUTE;
 
 eth_t eth_instance;
 
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index e1c9c159ecf6f..4ce0a75b87e2b 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -669,3 +669,7 @@
 #endif
 
 #define MICROPY_HW_USES_BOOTLOADER (MICROPY_HW_VTOR != 0x08000000)
+
+#ifndef MICROPY_HW_ETH_DMA_ATTRIBUTE
+#define MICROPY_HW_ETH_DMA_ATTRIBUTE __attribute__((aligned(16384)));
+#endif

From 55ae597bb6044c392e9264f1af09ddcc19901f44 Mon Sep 17 00:00:00 2001
From: Carl Pottle <cpottle9@outlook.com>
Date: Sun, 29 Dec 2024 15:20:37 -0800
Subject: [PATCH 1835/3129] rp2/modmachine: Make lightsleep preserve SLEEP_EN0
 and SLEEP_EN1.

The problem was introduced in d1423ef7a23793de3777e84d985f9902241e788e,
calling `machine.lightsleep()` overwrites RP2xxx registers `SLEEP_EN0` and
`SLEEP_EN1` with their power on default values.

Prior to that commit the register values were saved on entry to lightsleep
and restored before returning.

These changes restores the earlier behavior.

Fixes issue #16502.

Signed-off-by: Carl Pottle <cpottle9@outlook.com>
---
 ports/rp2/modmachine.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 3229aed277b35..954ea216497fe 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -196,6 +196,8 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         #endif
         xosc_dormant();
     } else {
+        uint32_t save_sleep_en0 = clocks_hw->sleep_en0;
+        uint32_t save_sleep_en1 = clocks_hw->sleep_en1;
         bool timer3_enabled = irq_is_enabled(3);
 
         const uint32_t alarm_num = 3;
@@ -251,8 +253,8 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         if (!timer3_enabled) {
             irq_set_enabled(irq_num, false);
         }
-        clocks_hw->sleep_en0 |= ~(0u);
-        clocks_hw->sleep_en1 |= ~(0u);
+        clocks_hw->sleep_en0 = save_sleep_en0;
+        clocks_hw->sleep_en1 = save_sleep_en1;
     }
 
     // Enable ROSC.

From 81ab49a60759376271ad1e1fbf05bae0ffe9e7b1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Jan 2025 16:37:33 +1100
Subject: [PATCH 1836/3129] tests/ports/rp2: Add test for SLEEP_ENx registers
 over lightsleep.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_lightsleep_regs.py | 58 ++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 tests/ports/rp2/rp2_lightsleep_regs.py

diff --git a/tests/ports/rp2/rp2_lightsleep_regs.py b/tests/ports/rp2/rp2_lightsleep_regs.py
new file mode 100644
index 0000000000000..4a833d0a9c339
--- /dev/null
+++ b/tests/ports/rp2/rp2_lightsleep_regs.py
@@ -0,0 +1,58 @@
+# Test that SLEEP_ENx registers are preserved over a call to machine.lightsleep().
+
+import sys
+from machine import mem32, lightsleep
+import unittest
+
+is_rp2350 = "RP2350" in sys.implementation._machine
+
+if is_rp2350:
+    CLOCK_BASE = 0x40010000
+    SLEEP_EN0 = CLOCK_BASE + 0xB4
+    SLEEP_EN1 = CLOCK_BASE + 0xB8
+    TO_DISABLE_EN0 = 1 << 30  # SHA256
+    TO_DISABLE_EN1 = 1 << 4  # SRAM0
+else:
+    CLOCK_BASE = 0x40008000
+    SLEEP_EN0 = CLOCK_BASE + 0xA8
+    SLEEP_EN1 = CLOCK_BASE + 0xAC
+    TO_DISABLE_EN0 = 1 << 28  # SRAM0
+    TO_DISABLE_EN1 = 1 << 0  # SRAM4
+
+
+class Test(unittest.TestCase):
+    def setUp(self):
+        self.orig_sleep_en0 = mem32[SLEEP_EN0]
+        self.orig_sleep_en1 = mem32[SLEEP_EN1]
+
+    def tearDown(self):
+        mem32[SLEEP_EN0] = self.orig_sleep_en0
+        mem32[SLEEP_EN1] = self.orig_sleep_en1
+
+    def test_sleep_en_regs(self):
+        print()
+
+        # Disable some bits so the registers aren't just 0xffff.
+        mem32[SLEEP_EN0] &= ~TO_DISABLE_EN0
+        mem32[SLEEP_EN1] &= ~TO_DISABLE_EN1
+
+        # Get the registers before the lightsleep.
+        sleep_en0_before = mem32[SLEEP_EN0] & 0xFFFFFFFF
+        sleep_en1_before = mem32[SLEEP_EN1] & 0xFFFFFFFF
+        print(hex(sleep_en0_before), hex(sleep_en1_before))
+
+        # Do a lightsleep.
+        lightsleep(100)
+
+        # Get the registers after a lightsleep.
+        sleep_en0_after = mem32[SLEEP_EN0] & 0xFFFFFFFF
+        sleep_en1_after = mem32[SLEEP_EN1] & 0xFFFFFFFF
+        print(hex(sleep_en0_after), hex(sleep_en1_after))
+
+        # Check the registers have not changed.
+        self.assertEqual(sleep_en0_before, sleep_en0_after)
+        self.assertEqual(sleep_en1_before, sleep_en1_after)
+
+
+if __name__ == "__main__":
+    unittest.main()

From 3699cf5f38736b670a26786af4025584dcb5aef2 Mon Sep 17 00:00:00 2001
From: Mike Bell <mdb036@gmail.com>
Date: Tue, 21 Jan 2025 21:35:08 +0000
Subject: [PATCH 1837/3129] rp2/rp2_flash: Workaround multicore lockout not
 being reset.

With regression test.

See upstream bug https://github.com/raspberrypi/pico-sdk/issues/2201

Tested-by: Angus Gratton <angus@redyak.com.au>
Signed-off-by: Mike Bell <mdb036@gmail.com>
---
 ports/rp2/rp2_flash.c                         | 14 ++++++++++++--
 tests/ports/rp2/rp2_thread_reset_part1.py     | 18 ++++++++++++++++++
 tests/ports/rp2/rp2_thread_reset_part1.py.exp |  1 +
 tests/ports/rp2/rp2_thread_reset_part2.py     | 12 ++++++++++++
 tests/ports/rp2/rp2_thread_reset_part2.py.exp |  3 +++
 5 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 tests/ports/rp2/rp2_thread_reset_part1.py
 create mode 100644 tests/ports/rp2/rp2_thread_reset_part1.py.exp
 create mode 100644 tests/ports/rp2/rp2_thread_reset_part2.py
 create mode 100644 tests/ports/rp2/rp2_thread_reset_part2.py.exp

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index c1acb54e75748..a487fb1633b21 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -70,10 +70,20 @@ bi_decl(bi_block_device(
     BINARY_INFO_BLOCK_DEV_FLAG_WRITE |
     BINARY_INFO_BLOCK_DEV_FLAG_PT_UNKNOWN));
 
+// This is a workaround to pico-sdk #2201: https://github.com/raspberrypi/pico-sdk/issues/2201
+// which means the multicore_lockout_victim_is_initialized returns true even after core1 is reset.
+static bool use_multicore_lockout(void) {
+    return multicore_lockout_victim_is_initialized(1 - get_core_num())
+           #if MICROPY_PY_THREAD
+           && core1_entry != NULL
+           #endif
+    ;
+}
+
 // Flash erase and write must run with interrupts disabled and the other core suspended,
 // because the XIP bit gets disabled.
 static uint32_t begin_critical_flash_section(void) {
-    if (multicore_lockout_victim_is_initialized(1 - get_core_num())) {
+    if (use_multicore_lockout()) {
         multicore_lockout_start_blocking();
     }
     return save_and_disable_interrupts();
@@ -81,7 +91,7 @@ static uint32_t begin_critical_flash_section(void) {
 
 static void end_critical_flash_section(uint32_t state) {
     restore_interrupts(state);
-    if (multicore_lockout_victim_is_initialized(1 - get_core_num())) {
+    if (use_multicore_lockout()) {
         multicore_lockout_end_blocking();
     }
 }
diff --git a/tests/ports/rp2/rp2_thread_reset_part1.py b/tests/ports/rp2/rp2_thread_reset_part1.py
new file mode 100644
index 0000000000000..d43868113f5eb
--- /dev/null
+++ b/tests/ports/rp2/rp2_thread_reset_part1.py
@@ -0,0 +1,18 @@
+# This is a regression test for https://github.com/micropython/micropython/issues/16619
+# it runs in two parts by necessity:
+#
+# - This "part1" creates a non-terminating thread.
+# - The test runner issues a soft reset, which will terminate that thread.
+# - "part2" is the actual test, which is whether flash access works correctly
+#   after the thread was terminated by soft reset.
+
+import _thread
+
+
+def infinite():
+    while True:
+        pass
+
+
+_thread.start_new_thread(infinite, ())
+print("Part 1 complete...")
diff --git a/tests/ports/rp2/rp2_thread_reset_part1.py.exp b/tests/ports/rp2/rp2_thread_reset_part1.py.exp
new file mode 100644
index 0000000000000..48ea7efad97ae
--- /dev/null
+++ b/tests/ports/rp2/rp2_thread_reset_part1.py.exp
@@ -0,0 +1 @@
+Part 1 complete...
diff --git a/tests/ports/rp2/rp2_thread_reset_part2.py b/tests/ports/rp2/rp2_thread_reset_part2.py
new file mode 100644
index 0000000000000..15f0eaab8f857
--- /dev/null
+++ b/tests/ports/rp2/rp2_thread_reset_part2.py
@@ -0,0 +1,12 @@
+# This is part2 of a two-part regression test, see part1
+# for details of what's expected.
+import os
+
+FILENAME = "/rp2_thread_reset_test.txt"
+
+print("Starting")
+with open(FILENAME, "w") as f:
+    f.write("test")
+print("Written")
+os.unlink(FILENAME)
+print("Removed")
diff --git a/tests/ports/rp2/rp2_thread_reset_part2.py.exp b/tests/ports/rp2/rp2_thread_reset_part2.py.exp
new file mode 100644
index 0000000000000..d7581c7d2601e
--- /dev/null
+++ b/tests/ports/rp2/rp2_thread_reset_part2.py.exp
@@ -0,0 +1,3 @@
+Starting
+Written
+Removed

From 4bed77cc233a84846a0c47347b520ce5b816758b Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Fri, 19 May 2023 17:51:52 +1000
Subject: [PATCH 1838/3129] esp8266/network_wlan: Make WLAN.config('channel')
 use wifi_get_channel.

Prior to this fix, `WLAN.config('channel')` would return an incorrect
channel for AP_IF if STA has connected to an external AP running on a
different channel.

The esp8266 now has the same behaviour as for esp32 per commit
98d1c50159fe9427d72ec358ba0219eaebb1d991.

Fixes issue #11463.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp8266/network_wlan.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index 44154ff6d8e54..2e43ebfb2b7b1 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -641,8 +641,7 @@ 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.authmode);
             break;
         case MP_QSTR_channel:
-            req_if = SOFTAP_IF;
-            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
+            val = MP_OBJ_NEW_SMALL_INT(wifi_get_channel());
             break;
         case MP_QSTR_hostname:
         case MP_QSTR_dhcp_hostname: {

From b1e6c2b655209022fb1dd1e7b3271af010fcccb5 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Mon, 26 Jun 2023 18:05:37 +1000
Subject: [PATCH 1839/3129] esp8266/network_wlan: Make WLAN.config(channel=x)
 use wifi_set_channel.

Also permits channel option to be used for STA_IF interface.  This
provides compatibility with esp32 code, especially for espnow users.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 ports/esp8266/network_wlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index 2e43ebfb2b7b1..7131b88bac9ab 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -565,8 +565,8 @@ static mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         break;
                     }
                     case MP_QSTR_channel: {
-                        req_if = SOFTAP_IF;
                         cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
+                        error_check(wifi_set_channel(cfg.ap.channel), "can't set channel");
                         break;
                     }
                     case MP_QSTR_hostname:

From 921f19fc9d697488f4f86bf8db73d43b04b781a6 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 4 Feb 2025 15:14:51 +1100
Subject: [PATCH 1840/3129] tests/multi_wlan: Remove esp8266 port workaround.

Not needed due to parent commit.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_wlan/01_ap_sta.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tests/multi_wlan/01_ap_sta.py b/tests/multi_wlan/01_ap_sta.py
index 1a8e80cd33aa3..368addf1393e2 100644
--- a/tests/multi_wlan/01_ap_sta.py
+++ b/tests/multi_wlan/01_ap_sta.py
@@ -96,15 +96,7 @@ def instance1():
 
     print("STA connected")
 
-    # Print the current channel, if the port support this
-    try:
-        print("channel", sta.config("channel"))
-    except OSError as e:
-        if "AP" in str(e):
-            # ESP8266 only supports reading channel on the AP interface, so fake this result
-            print("channel", CHANNEL)
-        else:
-            raise
+    print("channel", sta.config("channel"))
 
     print("STA waiting for disconnect...")
 

From 71e8b27b26f46f11f642381d4f6699ee1fc073f6 Mon Sep 17 00:00:00 2001
From: eggfly <lihaohua90@gmail.com>
Date: Mon, 23 Dec 2024 19:40:06 +0800
Subject: [PATCH 1841/3129] esp32/README: Fix board in octal-SPIRAM example
 make command.

Signed-off-by: eggfly <lihaohua90@gmail.com>
---
 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 8597c85ec3103..6ed7eddb8b80f 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -152,7 +152,7 @@ $ make BOARD=ESP32_GENERIC BOARD_VARIANT=OTA
 or to enable octal-SPIRAM support for the `ESP32_GENERIC_S3` board:
 
 ```bash
-$ make BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM_OCT
+$ make BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT
 ```
 
 

From b603fa38b25c5136d36cdbfff91b69f96efacd69 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 3 Feb 2025 16:03:22 +1100
Subject: [PATCH 1842/3129] py/mkrules.mk: Reset USER_C_MODULES when building
 mpy-cross dependency.

When a port automatically compiles `mpy-cross`, if `USER_C_MODULES` is
provided by the user on the command line then it is also applied to the
`mpy-cross` build.  That can lead to build errors if the path is relative
and not found when building `mpy-cross`.

Fix that by explicitly resetting `USER_C_MODULES` when invoking the
`mpy-cross` build.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 py/mkrules.cmake | 2 +-
 py/mkrules.mk    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index bfc56abfe80b7..3ee4c4c31aa57 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -211,7 +211,7 @@ if(MICROPY_FROZEN_MANIFEST)
         endif()
         add_custom_command(
             OUTPUT ${MICROPY_MPYCROSS_DEPENDENCY}
-            COMMAND ${MICROPY_MAKE_EXECUTABLE} -C ${MICROPY_DIR}/mpy-cross
+            COMMAND ${MICROPY_MAKE_EXECUTABLE} -C ${MICROPY_DIR}/mpy-cross USER_C_MODULES=
         )
     endif()
 
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 373bda8996f19..e9504ce39f839 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -176,7 +176,7 @@ $(HEADER_BUILD):
 ifneq ($(MICROPY_MPYCROSS_DEPENDENCY),)
 # to automatically build mpy-cross, if needed
 $(MICROPY_MPYCROSS_DEPENDENCY):
-	$(MAKE) -C "$(abspath $(dir $@)..)"
+	$(MAKE) -C "$(abspath $(dir $@)..)" USER_C_MODULES=
 endif
 
 ifneq ($(FROZEN_DIR),)

From dfd1d69a72956e650af5cb071e4d9be61b5d322a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 24 Jan 2025 16:26:55 +0100
Subject: [PATCH 1843/3129] tests/run-natmodtests.py: Autodetect the test
 target architecture.

This commit lets the natmod tests runner to automatically detect the
architecture of the test target.  This allows to avoid to explicitly
pass the architecture name to the runner in test scripts.

However, the ability to manually specify a target was not removed but it
was made optional.  This way the user is able to override the
architecture name if needed (like if one wants to test an armv6 MPY on
an armv7 board).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/README.md                         |  4 +-
 ports/qemu/boards/VIRT_RV32/mpconfigboard.mk |  2 -
 tests/run-natmodtests.py                     | 58 ++++++++++++++++++--
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/ports/qemu/README.md b/ports/qemu/README.md
index 70edf97f58e37..c7d0dc1f4ea70 100644
--- a/ports/qemu/README.md
+++ b/ports/qemu/README.md
@@ -105,9 +105,7 @@ can also be tested with this command (this is currently supported only for the
     $ make test_natmod
 
 The same remarks about manually running the tests apply for native modules, but
-`run-natmodtests.py` should be run instead of `run-tests.py`.  In this case you
-also have to explicitly pass the architecture you are running native modules to
-`run-natmodtests.py` ("--arch rv32imc" for the `VIRT_RV32` board).
+`run-natmodtests.py` should be run instead of `run-tests.py`.
 
 Extra make options
 ------------------
diff --git a/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
index dd926480052e1..ce12720928e32 100644
--- a/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
+++ b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
@@ -9,5 +9,3 @@ LDSCRIPT = mcu/rv32/virt.ld
 SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
 
 MPY_CROSS_FLAGS += -march=rv32imc
-
-RUN_NATMODTESTS_ARGS = --arch rv32imc
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 1fe44bec1615a..b858989daa434 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -28,6 +28,23 @@
     "re": "re/re_$(ARCH).mpy",
 }
 
+# Supported architectures for native mpy modules
+AVAILABLE_ARCHS = (
+    "x86",
+    "x64",
+    "armv6",
+    "armv6m",
+    "armv7m",
+    "armv7em",
+    "armv7emsp",
+    "armv7emdp",
+    "xtensa",
+    "xtensawin",
+    "rv32imc",
+)
+
+ARCH_MAPPINGS = {"armv7em": "armv7m"}
+
 # Code to allow a target MicroPython to import an .mpy from RAM
 injected_import_hook_code = """\
 import sys, io, vfs
@@ -96,14 +113,33 @@ def run_script(self, script):
             return b"", er
 
 
-def run_tests(target_truth, target, args, stats):
+def detect_architecture(target):
+    with open("./feature_check/target_info.py", "rb") as f:
+        target_info_data = f.read()
+        result_out, error = target.run_script(target_info_data)
+        if error is not None:
+            return None, None, error
+        info = result_out.split(b" ")
+        if len(info) < 2:
+            return None, None, "unexpected target info: {}".format(info)
+        platform = info[0].strip().decode()
+        arch = info[1].strip().decode()
+        if arch not in AVAILABLE_ARCHS:
+            if arch == "None":
+                return None, None, "the target does not support dynamic modules"
+            else:
+                return None, None, "{} is not a supported architecture".format(arch)
+        return platform, arch, None
+
+
+def run_tests(target_truth, target, args, stats, resolved_arch):
     for test_file in args.files:
         # Find supported test
         test_file_basename = os.path.basename(test_file)
         for k, v in TEST_MAPPINGS.items():
             if test_file_basename.startswith(k):
                 test_module = k
-                test_mpy = v.replace("$(ARCH)", args.arch)
+                test_mpy = v.replace("$(ARCH)", resolved_arch)
                 break
         else:
             print("----  {} - no matching mpy".format(test_file))
@@ -174,7 +210,7 @@ def main():
         "-d", "--device", default="/dev/ttyACM0", help="the device for pyboard.py"
     )
     cmd_parser.add_argument(
-        "-a", "--arch", default="x64", help="native architecture of the target"
+        "-a", "--arch", choices=AVAILABLE_ARCHS, help="override native architecture of the target"
     )
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     args = cmd_parser.parse_args()
@@ -186,8 +222,22 @@ def main():
     else:
         target = TargetSubprocess([MICROPYTHON])
 
+    if hasattr(args, "arch") and args.arch is not None:
+        target_arch = args.arch
+        target_platform = None
+    else:
+        target_platform, target_arch, error = detect_architecture(target)
+        if error:
+            print("Cannot run tests: {}".format(error))
+            sys.exit(1)
+    target_arch = ARCH_MAPPINGS.get(target_arch, target_arch)
+
+    if target_platform:
+        print("platform={} ".format(target_platform), end="")
+    print("arch={}".format(target_arch))
+
     stats = {"total": 0, "pass": 0, "fail": 0, "skip": 0}
-    run_tests(target_truth, target, args, stats)
+    run_tests(target_truth, target, args, stats, target_arch)
 
     target.close()
     target_truth.close()

From ca3090a33f06da57221827ad506d80cb1f826b99 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 24 Jan 2025 11:18:39 +0100
Subject: [PATCH 1844/3129] qemu/Makefile: Fix shell interpolation for
 automated natmod tests.

This commit fixes the command used to run natmod tests, as it relied on
a string interpolation feature of the POSIX shell that was not working
as expected inside a makefile.

The interpolation was not performed from inside the makefile and the raw
command string was sent to the operating system for execution.  Now the
command is run by using a different type of string substitution, which
explicitly performs the interpolation using a POSIX shell for-loop.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index d2550cf883b7d..befef5d520061 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -189,11 +189,14 @@ test_full: $(BUILD)/firmware.elf
 	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS) --via-mpy
 	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS) --via-mpy --emit native
 
+# "btree" currently does not build for rv32imc (Picolibc TLS incompatibility).
 .PHONY: test_natmod
 test_natmod: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	# "btree" cannot build against Picolibc right now.
-	cd $(TOP)/tests && ./run-natmodtests.py -p -d execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_NATMODTESTS_ARGS) extmod/{deflate,framebuf,heapq,random_basic,re}*.py
+	cd $(TOP)/tests && \
+		for natmod in deflate framebuf heapq random_basic re; do \
+		./run-natmodtests.py -p -d execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" extmod/$$natmod*.py; \
+		done
 
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
 	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)

From f594c6f66ec49e02ba06165d1f1db202d82575ec Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 24 Jan 2025 18:00:05 +0100
Subject: [PATCH 1845/3129] tools/ci.sh: Add natmod tests for QEMU/Arm.

This commit adds the natmod tests for the MPS2_AN385 board running
inside QEMU to the CI pipeline.  Now natmod tests capabilities are equal
between the Arm and RV32 platforms for the QEMU port.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile |  2 ++
 tools/ci.sh         | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index befef5d520061..e9e1e0f957e2b 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -40,6 +40,8 @@ endif
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
+GIT_SUBMODULES += lib/berkeley-db-1.xx
+
 CFLAGS += -DMICROPY_HEAP_SIZE=$(MICROPY_HEAP_SIZE)
 
 ################################################################################
diff --git a/tools/ci.sh b/tools/ci.sh
index 374395abd2ca5..2c647012f144d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -266,6 +266,7 @@ function ci_powerpc_build {
 # ports/qemu
 
 function ci_qemu_setup_arm {
+    ci_mpy_format_setup
     ci_gcc_arm_setup
     sudo apt-get update
     sudo apt-get install qemu-system
@@ -287,6 +288,10 @@ function ci_qemu_build_arm {
     make ${MAKEOPTS} -C ports/qemu clean
     make ${MAKEOPTS} -C ports/qemu test_full
     make ${MAKEOPTS} -C ports/qemu BOARD=SABRELITE test_full
+
+    # Test building and running native .mpy with armv7m architecture.
+    ci_native_mpy_modules_build armv7m
+    make ${MAKEOPTS} -C ports/qemu test_natmod
 }
 
 function ci_qemu_build_rv32 {
@@ -480,20 +485,18 @@ function ci_native_mpy_modules_build {
     else
         arch=$1
     fi
-    make -C examples/natmod/features1 ARCH=$arch
+    for natmod in features1 features3 features4 deflate framebuf heapq random re
+    do
+        make -C examples/natmod/$natmod ARCH=$arch
+    done
+    # btree requires thread local storage support on rv32imc.
     if [ $arch != rv32imc ]; then
-        # This requires soft-float support on rv32imc.
-        make -C examples/natmod/features2 ARCH=$arch
-        # This requires thread local storage support on rv32imc.
         make -C examples/natmod/btree ARCH=$arch
     fi
-    make -C examples/natmod/features3 ARCH=$arch
-    make -C examples/natmod/features4 ARCH=$arch
-    make -C examples/natmod/deflate ARCH=$arch
-    make -C examples/natmod/framebuf ARCH=$arch
-    make -C examples/natmod/heapq ARCH=$arch
-    make -C examples/natmod/random ARCH=$arch
-    make -C examples/natmod/re ARCH=$arch
+    # features2 requires soft-float on armv7m and rv32imc.
+    if [ $arch != rv32imc ] && [ $arch != armv7m ]; then
+        make -C examples/natmod/features2 ARCH=$arch
+    fi
 }
 
 function ci_native_mpy_modules_32bit_build {

From e37d498cc0891b67ea6b782fc1e9b1b7dab3c740 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 4 Feb 2025 00:02:49 +0100
Subject: [PATCH 1846/3129] py/emitnative: Mark condition code tables as const.

This commit marks as const the condition code tables used when figuring
out which opcode sequence must be emitted depending on the requested
comparison type.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitnative.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 82ee729d3d50f..dd0644793231c 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -2541,7 +2541,7 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             #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 + 6] = {
+            static const byte ops[6 + 6] = {
                 // unsigned
                 ASM_X64_CC_JB,
                 ASM_X64_CC_JA,
@@ -2561,7 +2561,7 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             #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 + 6] = {
+            static const byte ops[6 + 6] = {
                 // unsigned
                 ASM_X86_CC_JB,
                 ASM_X86_CC_JA,
@@ -2581,7 +2581,7 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             #elif N_THUMB
             asm_thumb_cmp_rlo_rlo(emit->as, REG_ARG_2, reg_rhs);
             if (asm_thumb_allow_armv7m(emit->as)) {
-                static uint16_t ops[6 + 6] = {
+                static const uint16_t ops[6 + 6] = {
                     // unsigned
                     ASM_THUMB_OP_ITE_CC,
                     ASM_THUMB_OP_ITE_HI,
@@ -2601,7 +2601,7 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
                 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] = {
+                static const uint16_t ops[6 + 6] = {
                     // unsigned
                     ASM_THUMB_CC_CC,
                     ASM_THUMB_CC_HI,
@@ -2624,7 +2624,7 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             }
             #elif N_ARM
             asm_arm_cmp_reg_reg(emit->as, REG_ARG_2, reg_rhs);
-            static uint ccs[6 + 6] = {
+            static const uint ccs[6 + 6] = {
                 // unsigned
                 ASM_ARM_CC_CC,
                 ASM_ARM_CC_HI,
@@ -2642,7 +2642,7 @@ static void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             };
             asm_arm_setcc_reg(emit->as, REG_RET, ccs[op_idx]);
             #elif N_XTENSA || N_XTENSAWIN
-            static uint8_t ccs[6 + 6] = {
+            static const uint8_t ccs[6 + 6] = {
                 // unsigned
                 ASM_XTENSA_CC_LTU,
                 0x80 | ASM_XTENSA_CC_LTU, // for GTU we'll swap args

From 44a7731669f1c8429bb61b790a7e8bf8a86b045d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 4 Feb 2025 00:05:44 +0100
Subject: [PATCH 1847/3129] py/emitnative: Load and store words just once for
 Viper code.

This commit fixes two Xtensa sequences in order to terminate early when
loading and storing word values via an immediate index.

This was meant to be part of 55ca3fd67512555707304c6b68b836eb89f09d1c
but whilst it was part of the code being tested, it didn't end up in the
commit.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitnative.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/emitnative.c b/py/emitnative.c
index dd0644793231c..1aab0a9eb7865 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1609,6 +1609,7 @@ static void emit_native_load_subscr(emit_t *emit) {
                         #elif N_XTENSA || N_XTENSAWIN
                         if (index_value > 0 && index_value < 256) {
                             asm_xtensa_l32i_optimised(emit->as, REG_RET, reg_base, index_value);
+                            break;
                         }
                         #endif
                         need_reg_single(emit, reg_index, 0);
@@ -1887,6 +1888,7 @@ static void emit_native_store_subscr(emit_t *emit) {
                         #elif N_XTENSA || N_XTENSAWIN
                         if (index_value > 0 && index_value < 256) {
                             asm_xtensa_s32i_optimised(emit->as, REG_RET, reg_base, index_value);
+                            break;
                         }
                         #elif N_ARM
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);

From 304467518fbe9fc679dbba087fba7931c51655fb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 13:34:47 +0100
Subject: [PATCH 1848/3129] samd/boards: Add generic SAMD21x18 board
 definitions.

The definition uses the internal oscillator for clock and only internal
flash for the file system.

It works at SAMD21G18 and SAMD21E18 devices as well, only that fewer pins
are accessible.

Tested with a SAMD21E18, SAM21G18 and SAMD21J18 board.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/SAMD_GENERIC_D21X18/board.json | 16 ++++++++++++++++
 ports/samd/boards/SAMD_GENERIC_D21X18/board.md   |  4 ++++
 .../boards/SAMD_GENERIC_D21X18/mpconfigboard.h   |  4 ++++
 .../boards/SAMD_GENERIC_D21X18/mpconfigboard.mk  |  4 ++++
 ports/samd/boards/SAMD_GENERIC_D21X18/pins.csv   | 10 ++++++++++
 5 files changed, 38 insertions(+)
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D21X18/board.json
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D21X18/board.md
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.h
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D21X18/pins.csv

diff --git a/ports/samd/boards/SAMD_GENERIC_D21X18/board.json b/ports/samd/boards/SAMD_GENERIC_D21X18/board.json
new file mode 100644
index 0000000000000..a14730bd1bf49
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D21X18/board.json
@@ -0,0 +1,16 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB"
+    ],
+    "images": [
+        "generic_board.jpg"
+    ],
+    "mcu": "samd21",
+    "vendor": "Microchip",
+    "product": "Generic SAMD21J18",
+    "thumbnail": ""
+}
diff --git a/ports/samd/boards/SAMD_GENERIC_D21X18/board.md b/ports/samd/boards/SAMD_GENERIC_D21X18/board.md
new file mode 100644
index 0000000000000..a10b08f2f1cd7
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D21X18/board.md
@@ -0,0 +1,4 @@
+The following firmware should work on most boards with a SAMD21E18,
+SAMD21G18 and SAMD21J18 MCU. It uses only the features built into
+the MCU. Additional devices at the board like external flash
+are not supported.
diff --git a/ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.h b/ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.h
new file mode 100644
index 0000000000000..945975ab2384d
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.h
@@ -0,0 +1,4 @@
+#define MICROPY_HW_BOARD_NAME "Generic SAMD21J18"
+#define MICROPY_HW_MCU_NAME   "SAMD21J18A"
+
+#define MICROPY_HW_DFLL_USB_SYNC    (1)
diff --git a/ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.mk b/ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.mk
new file mode 100644
index 0000000000000..f95c6549381ba
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D21X18/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = SAMD21
+CMSIS_MCU = SAMD21J18A
+LD_FILES = boards/samd21x18a.ld sections.ld
+TEXT0 = 0x2000
diff --git a/ports/samd/boards/SAMD_GENERIC_D21X18/pins.csv b/ports/samd/boards/SAMD_GENERIC_D21X18/pins.csv
new file mode 100644
index 0000000000000..d35bc9d8ea4a9
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D21X18/pins.csv
@@ -0,0 +1,10 @@
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
+
+USB_DM,PA24
+USB_DP,PA25
+
+SWCLK,PA30
+SWDIO,PA31

From 9ced693ade1a1aca1e76d1eb6f11094e8aa3bfc9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 13:42:18 +0100
Subject: [PATCH 1849/3129] samd/boards: Add generic SAMD51x19 board
 definitions.

The definition uses the internal oscillator for clock and only internal
flash for the file system.

It works at SAMD51G19 and SAMD51J19 devices as well, only that fewer pins
are accessible.

Tested with a SAMD51G19 and SAMD51J9 board.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../samd/boards/SAMD_GENERIC_D51X19/board.json | 16 ++++++++++++++++
 ports/samd/boards/SAMD_GENERIC_D51X19/board.md |  4 ++++
 .../boards/SAMD_GENERIC_D51X19/mpconfigboard.h |  2 ++
 .../SAMD_GENERIC_D51X19/mpconfigboard.mk       | 11 +++++++++++
 ports/samd/boards/SAMD_GENERIC_D51X19/pins.csv | 18 ++++++++++++++++++
 5 files changed, 51 insertions(+)
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X19/board.json
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X19/board.md
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.h
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X19/pins.csv

diff --git a/ports/samd/boards/SAMD_GENERIC_D51X19/board.json b/ports/samd/boards/SAMD_GENERIC_D51X19/board.json
new file mode 100644
index 0000000000000..21cb114bf65fb
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X19/board.json
@@ -0,0 +1,16 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB"
+    ],
+    "images": [
+        "generic_board.jpg"
+    ],
+    "mcu": "samd51",
+    "vendor": "Microchip",
+    "product": "Generic SAMD51P19",
+    "thumbnail": ""
+}
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X19/board.md b/ports/samd/boards/SAMD_GENERIC_D51X19/board.md
new file mode 100644
index 0000000000000..b4694cc2857d5
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X19/board.md
@@ -0,0 +1,4 @@
+The following firmware should work on most boards with a SAMD51G19,
+SAMD51J19 and SAMD51P19 MCU. It uses only the features built into
+the MCU. Additional devices at the board like external flash
+are not supported.
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.h b/ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.h
new file mode 100644
index 0000000000000..cce157f9e0ffc
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "Generic SAMD51P19"
+#define MICROPY_HW_MCU_NAME   "SAMD51P19A"
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.mk b/ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.mk
new file mode 100644
index 0000000000000..1a20643214f1a
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X19/mpconfigboard.mk
@@ -0,0 +1,11 @@
+MCU_SERIES = SAMD51
+CMSIS_MCU = SAMD51P19A
+LD_FILES = boards/samd51x19a.ld sections.ld
+TEXT0 = 0x4000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+# The size of a MCU flash filesystem will be
+# 496k - MICROPY_HW_CODESIZE - MICROPY_HW_VFSROMSIZE
+# The default for MICROPY_HW_VFSROMSIZE is 64K
+MICROPY_HW_CODESIZE ?= 368K
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X19/pins.csv b/ports/samd/boards/SAMD_GENERIC_D51X19/pins.csv
new file mode 100644
index 0000000000000..76e38a98467dc
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X19/pins.csv
@@ -0,0 +1,18 @@
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
+
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
+
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
+
+SWCLK,PA30
+SWDIO,PA31

From 6b2e359076ea394d8a20f2d17b1cd2c68e3b5c74 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 13:54:28 +0100
Subject: [PATCH 1850/3129] samd/boards: Add generic SAMD51x20 board
 definitions.

The definition uses the internal oscillator for clock and only internal
flash for the file system.

It works at SAMD51J20 device as well, only that fewer pins are accessible.

Tested with a SAMD51J20 board.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../samd/boards/SAMD_GENERIC_D51X20/board.json  | 16 ++++++++++++++++
 ports/samd/boards/SAMD_GENERIC_D51X20/board.md  |  4 ++++
 .../boards/SAMD_GENERIC_D51X20/mpconfigboard.h  |  2 ++
 .../boards/SAMD_GENERIC_D51X20/mpconfigboard.mk | 13 +++++++++++++
 ports/samd/boards/SAMD_GENERIC_D51X20/pins.csv  | 17 +++++++++++++++++
 5 files changed, 52 insertions(+)
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X20/board.json
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X20/board.md
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.h
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SAMD_GENERIC_D51X20/pins.csv

diff --git a/ports/samd/boards/SAMD_GENERIC_D51X20/board.json b/ports/samd/boards/SAMD_GENERIC_D51X20/board.json
new file mode 100644
index 0000000000000..ae4f83472ecd4
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X20/board.json
@@ -0,0 +1,16 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB"
+    ],
+    "images": [
+        "generic_board.jpg"
+    ],
+    "mcu": "samd51",
+    "vendor": "Microchip",
+    "product": "Generic SAMD51P20",
+    "thumbnail": ""
+}
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X20/board.md b/ports/samd/boards/SAMD_GENERIC_D51X20/board.md
new file mode 100644
index 0000000000000..4e75f901e3ca5
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X20/board.md
@@ -0,0 +1,4 @@
+The following firmware should work on most boards with a
+SAMD51J20 and SAMD51P20 MCU. It uses only the features built into
+the MCU. Additional devices at the board like external flash
+are not supported.
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.h b/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.h
new file mode 100644
index 0000000000000..30e5fa9e6ebb3
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "Generic SAMD51P20"
+#define MICROPY_HW_MCU_NAME   "SAMD51P20A"
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk b/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk
new file mode 100644
index 0000000000000..ddba3dcbbade9
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk
@@ -0,0 +1,13 @@
+MCU_SERIES = SAMD51
+CMSIS_MCU = SAMD51P20A
+LD_FILES = boards/samd51x19a.ld sections.ld
+TEXT0 = 0x4000
+
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+# The size of a MCU flash filesystem will be
+# 1008k - MICROPY_HW_CODESIZE - MICROPY_HW_VFSROMSIZE
+# The default for MICROPY_HW_VFSROMSIZE is 64K
+MICROPY_HW_CODESIZE ?= 752K
+MICROPY_HW_VFSROMSIZE ?= 128K
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X20/pins.csv b/ports/samd/boards/SAMD_GENERIC_D51X20/pins.csv
new file mode 100644
index 0000000000000..24820c25bbdc9
--- /dev/null
+++ b/ports/samd/boards/SAMD_GENERIC_D51X20/pins.csv
@@ -0,0 +1,17 @@
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
+
+USB_DM,PA24
+USB_DP,PA25
+
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
+
+SWCLK,PA30
+SWDIO,PA31

From ff9c6da88c82e8423e577e131d91c5708b788f26 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 14:16:13 +0100
Subject: [PATCH 1851/3129] samd/Makefile: Add support for board variants.

Tested with a Adafruit SAMD QT board, which may optionally be equipped with
SPIFLASH memory.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/Makefile | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 75a4d9b1de355..005664f178d3c 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -13,7 +13,19 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+ifneq ($(BOARD_VARIANT),)
+ifeq ($(wildcard $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk),)
+$(error Invalid BOARD_VARIANT specified: $(BOARD_VARIANT))
+endif
+endif
+
+# If the build directory is not given, make it reflect the board name (and
+# optionally the board variant).
+ifneq ($(BOARD_VARIANT),)
+BUILD ?= build-$(BOARD)-$(BOARD_VARIANT)
+else
 BUILD ?= build-$(BOARD)
+endif
 
 CROSS_COMPILE ?= arm-none-eabi-
 UF2CONV ?= $(TOP)/tools/uf2conv.py
@@ -21,7 +33,13 @@ UF2CONV ?= $(TOP)/tools/uf2conv.py
 MCU_SERIES_LOWER = $(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')
 
 include ../../py/mkenv.mk
+# Include board specific .mk file, and optional board variant .mk file.
 include $(BOARD_DIR)/mpconfigboard.mk
+ifeq ($(BOARD_VARIANT),)
+-include $(BOARD_DIR)/mpconfigvariant.mk
+else
+include $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk
+endif
 include mcu/$(MCU_SERIES_LOWER)/mpconfigmcu.mk
 
 # Qstr definitions (must come before including py.mk)

From 6cbe145ca8b46857cd2ba5289021022bb92cb02e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 14:19:07 +0100
Subject: [PATCH 1852/3129] samd/boards: Add support for the Adafruit QT Py
 board.

Supporting a variant with an optional SPIFLASH device as well.  Tested both
variants with a QT Py board.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../boards/ADAFRUIT_QTPY_SAMD21/board.json    | 20 +++++++++++++++
 .../ADAFRUIT_QTPY_SAMD21/mpconfigboard.h      |  6 +++++
 .../ADAFRUIT_QTPY_SAMD21/mpconfigboard.mk     |  4 +++
 .../mpconfigvariant_SPIFLASH.mk               |  2 ++
 .../samd/boards/ADAFRUIT_QTPY_SAMD21/pins.csv | 25 +++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 ports/samd/boards/ADAFRUIT_QTPY_SAMD21/board.json
 create mode 100644 ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h
 create mode 100644 ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.mk
 create mode 100644 ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigvariant_SPIFLASH.mk
 create mode 100644 ports/samd/boards/ADAFRUIT_QTPY_SAMD21/pins.csv

diff --git a/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/board.json b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/board.json
new file mode 100644
index 0000000000000..f48416dd02ab2
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB-C"
+    ],
+    "images": [
+        "qt_py_samd21.jpg"
+    ],
+    "mcu": "samd21",
+    "product": "QT Py - SAMD21",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/4600",
+    "variants": {
+        "SPIFLASH": "Support for an external Flash chip"
+    },
+    "vendor": "Adafruit"
+}
diff --git a/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h
new file mode 100644
index 0000000000000..0acf28afbfe15
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h
@@ -0,0 +1,6 @@
+#define MICROPY_HW_BOARD_NAME "QT Py"
+#define MICROPY_HW_MCU_NAME   "SAMD21E18A"
+
+#define MICROPY_HW_DFLL_USB_SYNC    (1)
+
+#define MICROPY_HW_SPIFLASH_ID (3)
diff --git a/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.mk
new file mode 100644
index 0000000000000..5b4d0b63e7e5a
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = SAMD21
+CMSIS_MCU = SAMD21E18A
+LD_FILES = boards/samd21x18a.ld sections.ld
+TEXT0 = 0x2000
diff --git a/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigvariant_SPIFLASH.mk b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigvariant_SPIFLASH.mk
new file mode 100644
index 0000000000000..69537d5bf3c51
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigvariant_SPIFLASH.mk
@@ -0,0 +1,2 @@
+CFLAGS += -DMICROPY_HW_SPIFLASH=1
+MICROPY_HW_CODESIZE ?= 232K
diff --git a/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/pins.csv b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/pins.csv
new file mode 100644
index 0000000000000..c3ada219f16b2
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/pins.csv
@@ -0,0 +1,25 @@
+A0,PA02
+A1,PA03
+A2,PA04
+A3,PA05
+SDA,PA16
+SCL,PA17
+TX,PA06
+RX,PA07
+SCK,PA11
+MISO,PA09
+MOSI,PA10
+
+NEO_PWR,PA15
+NEOPIX,PA18
+
+FLASH_MOSI,PA22
+FLASH_MISO,PA19
+FLASH_SCK,PA23
+FLASH_CS,PA08
+
+USB_DM,PA24
+USB_DP,PA25
+
+SWCLK,PA30
+SWDIO,PA31

From 36a0a839974c6e49723794421f46f6282e60e56f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 14:21:52 +0100
Subject: [PATCH 1853/3129] samd/boards: Add support for the Adafruit NeoKey
 Trinkey board.

Tested with that board.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../boards/ADAFRUIT_NEOKEY_TRINKEY/board.json  | 18 ++++++++++++++++++
 .../ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h    | 14 ++++++++++++++
 .../ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.mk   |  4 ++++
 .../boards/ADAFRUIT_NEOKEY_TRINKEY/pins.csv    | 14 ++++++++++++++
 4 files changed, 50 insertions(+)
 create mode 100644 ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/board.json
 create mode 100644 ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h
 create mode 100644 ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.mk
 create mode 100644 ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/pins.csv

diff --git a/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/board.json b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/board.json
new file mode 100644
index 0000000000000..9b0c307d679c3
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/board.json
@@ -0,0 +1,18 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "RGB LED",
+        "USB"
+    ],
+    "images": [
+        "neokey_trinkey.jpg"
+    ],
+    "mcu": "samd21",
+    "product": "NeoKey Trinkey",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/5020",
+    "vendor": "Adafruit"
+}
diff --git a/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h
new file mode 100644
index 0000000000000..eb4704ff8cb97
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h
@@ -0,0 +1,14 @@
+#define MICROPY_HW_BOARD_NAME "NeoKey Trinkey"
+#define MICROPY_HW_MCU_NAME   "SAMD21E18A"
+
+#define MICROPY_HW_DFLL_USB_SYNC    (1)
+
+// The NEOKEY board has just two accessible GPIO pins.
+// So many classes and modules are useless.
+#define MICROPY_PY_MACHINE_SOFTI2C  (0)
+#define MICROPY_PY_MACHINE_SOFTSPI  (0)
+#define MICROPY_PY_MACHINE_I2C      (0)
+#define MICROPY_PY_MACHINE_SPI      (0)
+#define MICROPY_PY_MACHINE_UART     (0)
+#define MICROPY_PY_MACHINE_ADC      (0)
+#define MICROPY_PY_MACHINE_DAC      (0)
diff --git a/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.mk
new file mode 100644
index 0000000000000..5b4d0b63e7e5a
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = SAMD21
+CMSIS_MCU = SAMD21E18A
+LD_FILES = boards/samd21x18a.ld sections.ld
+TEXT0 = 0x2000
diff --git a/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/pins.csv b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/pins.csv
new file mode 100644
index 0000000000000..c979f5b9bc147
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/pins.csv
@@ -0,0 +1,14 @@
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
+
+NEOPIXEL,PA15
+SWITCH,PA18
+TOUCH,PA07
+
+USB_DM,PA24
+USB_DP,PA25
+
+SWCLK,PA30
+SWDIO,PA31

From a84143d2230daa3843f00dd1f09474441810f08d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 17:38:40 +0100
Subject: [PATCH 1854/3129] docs/samd/pinout: Add pinout for Adafruit NeoKey
 Trinkey and QT Py.

Only pins accessible at the board are shown.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/pinout.rst | 60 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 5da4ae78d45b5..f6473e5495f5a 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -567,6 +567,66 @@ The default devices at the board are:
 - SPI 0 at pins PA06/PA09/PA08, labelled D4, D2 and D0
 - DAC output on pin PA02, labelled D1
 
+Adafruit QT PY pin assignment table
+-----------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+  2 PA02           A0   2    0     -      -      -      -
+  3 PA03           A1   3    1     -      -      -      -
+  4 PA04           A2   4    4     -     0/0    0/0     -
+  5 PA05           A3   5    5     -     0/1    0/1     -
+  7 PA07           RX   7    7     -     0/3    1/1     -
+  6 PA06           TX   6    6     -     0/2    1/0     -
+  8 PA08     FLASH_CS   -   16    0/0    2/0    0/0    1/2
+ 19 PA19   FLASH_MISO   3    -    1/3    3/3    3/1    0/3
+ 22 PA22   FLASH_MOSI   6    -    3/0    5/0    4/0    0/4
+ 23 PA23    FLASH_SCK   7    -    3/1    5/1    4/1    0/5
+  9 PA09         MISO   9   17    0/1    2/1    0/1    1/3
+ 10 PA10         MOSI  10   18    0/2    2/2    1/0    0/2
+ 18 PA18       NEOPIX   2    -    1/2    3/2    3/0    0/2
+ 15 PA15      NEO_PWR  15    -    2/3    4/3    3/1    0/5
+ 11 PA11          SCK  11   19    0/3    2/3    1/1    0/3
+ 17 PA17          SCL   1    -    1/1    3/1    2/1    0/7
+ 16 PA16          SDA   0    -    1/0    3/0    2/0    0/6
+ 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
+=== ==== ============ ==== ==== ====== ====== ====== ======
+
+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 PA07/PA06, labelled RX/TX
+- I2C 1 at pins PA16/PA17, labelled SDA/SCL
+- SPI 0 at pins PA09/PA10/PA11, labelled MISO, MOSI and SCK
+- DAC output on pin PA02, labelled A0
+
+Adafruit NeoKey Trinkey pin assignment table
+--------------------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+ 15 PA15     NEOPIXEL  15    -    2/3    4/3    3/1    0/5
+ 30 PA30        SWCLK  10    -     -     1/2    1/0     -
+ 31 PA31        SWDIO  11    -     -     1/3    1/1     -
+ 18 PA18       SWITCH   2    -    1/2    3/2    3/0    0/2
+  7 PA07        TOUCH   7    7     -     0/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
+=== ==== ============ ==== ==== ====== ====== ====== ======
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
+
+The board does not provide access to UART, I2C, SPI or DAC.
+
+
 SAMD21 Xplained PRO pin assignment table
 ----------------------------------------
 

From e44a2c6921919d0d19356a70a23bf21cd301856c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 23 Jan 2025 20:14:27 +0100
Subject: [PATCH 1855/3129] docs/samd/pinout: Add pinout for the Generic SAMD
 board types.

The table shows the devices available at the pin and the respective package
letter.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/pinout.rst | 182 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index f6473e5495f5a..776ab74bcdb22 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -935,6 +935,188 @@ The default devices at the board are:
 - SPI 4 at pins PB12/PB11/PB13, labelled MOSI, MISO and SCK
 - DAC output on pins PA02 and PA05, labelled A0 and A4
 
+Generic SAMD21x18 pin assignment table
+--------------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Name/Package IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+  0 PA00     EGJ        0    -     -     1/0    2/0     -
+  1 PA01     EGJ        1    -     -     1/1    2/1     -
+  2 PA02     EGJ        2    0     -      -      -      -
+  3 PA03     EGJ        3    1     -      -      -      -
+  4 PA04     EGJ        4    4     -     0/0    0/0     -
+  5 PA05     EGJ        5    5     -     0/1    0/1     -
+  6 PA06     EGJ        6    6     -     0/2    1/0     -
+  7 PA07     EGJ        7    7     -     0/3    1/1     -
+  8 PA08     EGJ        -   16    0/0    2/0    0/0    1/2
+  9 PA09     EGJ        9   17    0/1    2/1    0/1    1/3
+ 10 PA10     EGJ       10   18    0/2    2/2    1/0    0/2
+ 11 PA11     EGJ       11   19    0/3    2/3    1/1    0/3
+ 12 PA12      GJ       12    -    2/0    4/0    2/0    0/6
+ 13 PA13      GJ       13    -    2/1    4/1    2/0    0/7
+ 14 PA14     EGJ       14    -    2/2    4/2    3/0    0/4
+ 15 PA15     EGJ       15    -    2/3    4/3    3/1    0/5
+ 16 PA16     EGJ        0    -    1/0    3/0    2/0    0/6
+ 17 PA17     EGJ        1    -    1/1    3/1    2/1    0/7
+ 18 PA18     EGJ        2    -    1/2    3/2    3/0    0/2
+ 19 PA19     EGJ        3    -    1/3    3/3    3/1    0/3
+ 20 PA20      GJ        4    -    5/2    3/2    7/0    0/4
+ 21 PA21      GJ        5    -    5/3    3/3    7/1    0/7
+ 22 PA22     EGJ        6    -    3/0    5/0    4/0    0/4
+ 23 PA23     EGJ        7    -    3/1    5/1    4/1    0/5
+ 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
+ 27 PA27     EGJ       15    -     -      -      -      -
+ 28 PA28     EGJ        8    -     -      -      -      -
+ 30 PA30   SWCLK       10    -     -     1/2    1/0     -
+ 31 PA31   SWDIO       11    -     -     1/3    1/1     -
+ 32 PB00       J        0    8     -     5/2    7/0     -
+ 33 PB01       J        1    9     -     5/3    7/1     -
+ 34 PB02      GJ        2   10     -     5/0    6/0     -
+ 35 PB03      GJ        3   11     -     5/1    6/1     -
+ 36 PB04       J        4   12     -      -      -      -
+ 37 PB05       J        5   13     -      -      -      -
+ 38 PB06       J        6   14     -      -      -      -
+ 39 PB07       J        7   15     -      -      -      -
+ 40 PB08      GJ        8    2     -     4/0    4/0     -
+ 41 PB09      GJ        9    3     -     4/1    4/1     -
+ 42 PB10      GJ       10    -     -     4/2    5/0    0/4
+ 43 PB11      GJ       11    -     -     4/3    5/1    0/5
+ 44 PB12       J       12    -    4/0     -     4/0    0/6
+ 45 PB13       J       13    -    4/1     -     4/1    0/7
+ 46 PB14       J       14    -    4/2     -     5/0     -
+ 47 PB15       J       15    -    4/3     -     5/1     -
+ 48 PB16       J        0    -    5/0     -     6/0    0/4
+ 49 PB17       J        1    -    5/1     -     6/1    0/5
+ 54 PB22      GJ        6    -     -     5/2    7/0     -
+ 55 PB23      GJ        7    -     -     5/3    7/1     -
+ 62 PB30       J       14    -     -     5/0    0/0    1/2
+ 63 PB31       J       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`.
+
+The Package column indicates the package letter providing this pin. An entry
+EGJ tells for instance, that the pin is available for SAMD21E18, SAMD21G18 and
+SAMD21J18.
+
+
+Generic SAMD51x19 and SAM51x20 pin assignment table
+---------------------------------------------------
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
+
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+Pin GPIO Name/Package IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+  8 PA08    QSPI_D0     -    8    2    0/0    2/1   0/0   0/0   1/4
+  9 PA09    QSPI_D1     9    9    3    0/1    2/0   0/1   0/1   1/5
+ 10 PA10    QSPI_D2    10   10    -    0/2    2/2   1/0   0/2   1/6
+ 11 PA11    QSPI_D3    11   11    -    0/3    2/3   1/1   0/3   1/7
+ 42 PB10   QSPI_SCK    10    -    -     -     4/2   5/0   0/4   1/0
+ 23 PA23    USB_SOF     7    -    -    3/1    5/0   4/1   1/7   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      GJP       0    -    -     -     1/0   2/0    -     -
+  1 PA01      GJP       1    -    -     -     1/1   2/1    -     -
+  2 PA02      GJP       2    0    -     -      -     -     -     -
+  3 PA03      GJP       3   10    -     -      -     -     -     -
+  4 PA04      GJP       4    4    -     -     0/0   0/0    -     -
+  5 PA05      GJP       5    5    -     -     0/1   0/1    -     -
+  6 PA06      GJP       6    6    -     -     0/2   1/0    -     -
+  7 PA07      GJP       7    7    -     -     0/3   1/1    -     -
+ 12 PA12      GJP      12    -    -    2/0    4/1   2/0   0/6   1/2
+ 13 PA13      GJP      13    -    -    2/1    4/0   2/1   0/7   1/3
+ 14 PA14      GJP      14    -    -    2/2    4/2   3/0   2/0   1/2
+ 15 PA15      GJP      15    -    -    2/3    4/3   3/1   2/1   1/3
+ 16 PA16      GJP       0    -    -    1/0    3/1   2/0   1/0   0/4
+ 17 PA17      GJP       1    -    -    1/1    3/0   2/1   1/1   0/5
+ 18 PA18      GJP       2    -    -    1/2    3/2   3/0   1/2   0/6
+ 19 PA19      GJP       3    -    -    1/3    3/3   3/1   1/3   0/7
+ 20 PA20      GJP       4    -    -    5/2    3/2   7/0   1/4   0/0
+ 21 PA21      GJP       5    -    -    5/3    3/3   7/1   1/5   0/1
+ 22 PA22      GJP       6    -    -    3/0    5/1   4/0   1/6   0/2
+ 27 PA27      GJP      11    -    -     -      -     -     -     -
+ 30 PA30      SWCLK    14    -    -    7/2    1/2   6/0   2/0    -
+ 31 PA31      SWDIO    15    -    -    7/3    1/3   6/1   2/1    -
+ 32 PB00       JP       0   12    -     -     5/2   7/0    -     -
+ 33 PB01       JP       1   13    -     -     5/3   7/1    -     -
+ 34 PB02      GJP       2   14    -     -     5/0   6/0   2/2    -
+ 35 PB03      GJP       3   15    -     -     5/1   6/1    -     -
+ 36 PB04       JP       4    -    6     -      -     -     -     -
+ 37 PB05       JP       5    -    7     -      -     -     -     -
+ 38 PB06       JP       6    -    8     -      -     -     -     -
+ 39 PB07       JP       7    -    9     -      -     -     -     -
+ 40 PB08      GJP       8    2    0     -     4/0   4/0    -     -
+ 41 PB09      GJP       9    3    1     -     4/1   4/1    -     -
+ 44 PB12       JP      12    -    -    4/0     -    4/0   3/0   0/0
+ 45 PB13       JP      13    -    -    4/1     -    4/1   3/1   0/1
+ 46 PB14       JP      14    -    -    4/2     -    5/0   4/0   0/2
+ 47 PB15       JP      15    -    -    4/3     -    5/1   4/1   0/3
+ 48 PB16       JP       0    -    -    5/0     -    6/0   3/0   0/4
+ 49 PB17       JP       1    -    -    5/1     -    6/1   3/1   0/5
+ 50 PB18        P       2    -    -    5/2    7/2    -    1/0    -
+ 51 PB19        P       3    -    -    5/3    7/3    -    1/1    -
+ 52 PB20        P       4    -    -    3/0    7/1    -    1/2    -
+ 53 PB21        P       5    -    -    3/1    7/0    -    1/3    -
+ 54 PB22      GJP       6    -    -    1/2    5/2   7/0    -     -
+ 55 PB23      GJP       7    -    -    1/3    5/3   7/1    -     -
+ 56 PB24        P       8    -    -    0/0    2/1    -     -     -
+ 57 PB25        P       9    -    -    0/1    2/0    -     -     -
+ 58 PB26        P      12    -    -    2/0    4/1    -    1/2    -
+ 59 PB27        P      13    -    -    2/1    4/0    -    1/3    -
+ 60 PB28        P      14    -    -    2/2    4/2    -    1/4    -
+ 61 PB29        P      15    -    -    2/3    4/3    -    1/5    -
+ 62 PB30       JP      14    -    -    7/0    5/1   0/0   4/0   0/6
+ 63 PB31       JP      15    -    -    7/1    5/0   0/1   4/1   0/7
+ 64 PC00        P       0    -   10     -      -     -     -     -
+ 65 PC01        P       1    -   11     -      -     -     -     -
+ 66 PC02        P       2    -    4     -      -     -     -     -
+ 67 PC03        P       3    -    5     -      -     -     -     -
+ 68 PC04        P       4    -    -    6/0     -     -    0/0    -
+ 69 PC05        P       5    -    -    6/1     -     -     -     -
+ 70 PC06        P       6    -    -    6/2     -     -     -     -
+ 71 PC07        P       9    -    -    6/3     -     -     -     -
+ 74 PC10        P      10    -    -    6/2    7/2    -    0/0   1/4
+ 75 PC11        P      11    -    -    6/3    7/3    -    0/1   1/5
+ 76 PC12        P      12    -    -    7/0    6/1    -    0/2   1/6
+ 77 PC13        P      13    -    -    7/1    6/0    -    0/3   1/7
+ 78 PC14        P      14    -    -    7/2    6/2    -    0/4   1/0
+ 79 PC15        P      15    -    -    7/3    6/3    -    0/5   1/1
+ 80 PC16        P       0    -    -    6/0    0/1    -    0/0    -
+ 81 PC17        P       1    -    -    6/1    0/0    -    0/1    -
+ 82 PC18        P       2    -    -    6/2    0/2    -    0/2    -
+ 83 PC19        P       3    -    -    6/3    0/3    -    0/3    -
+ 84 PC20        P       4    -    -     -      -     -    0/4    -
+ 85 PC21        P       5    -    -     -      -     -    0/5    -
+ 86 PC22        P       6    -    -    1/0    3/1    -    0/5    -
+ 87 PC23        P       7    -    -    1/1    3/0    -    0/7    -
+ 88 PC24        P       8    -    -    0/2    2/2    -     -     -
+ 89 PC25        P       9    -    -    0/3    2/3    -     -     -
+ 90 PC26        P      10    -    -     -      -     -     -     -
+ 91 PC27        P      11    -    -    1/0     -     -     -     -
+ 92 PC28        P      12    -    -    1/1     -     -     -     -
+ 94 PC30        P      14    -   12     -      -     -     -     -
+ 95 PC31        P      15    -   13     -      -     -     -     -
+ 96 PD00        P       0    -   14     -      -     -     -     -
+ 97 PD01        P       1    -   15     -      -     -     -     -
+104 PD08        P       3    -    -    7/0    6/1    -    0/1    -
+105 PD09        P       4    -    -    7/1    6/0    -    0/2    -
+106 PD10        P       5    -    -    7/2    6/2    -    0/3    -
+107 PD11        P       6    -    -    7/3    6/3    -    0/4    -
+108 PD12        P       7    -    -     -      -     -    0/5    -
+116 PD20        P      10    -    -    1/2    3/2    -    1/0    -
+117 PD21        P      11    -    -    1/3    3/3    -    1/1    -
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+
+
+The Package column indicates the package letter providing this pin. An entry
+GJP tells for instance, that the pin is available for SAMD51G19, SAMD51J19/-J20 and
+SAMD51P19/-P20.
+
 Scripts for creating the pin assignment tables
 ----------------------------------------------
 

From e176fea95cda017cf351e779d1aa323da52f1151 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 25 Jan 2025 08:50:45 +0100
Subject: [PATCH 1856/3129] mimxrt/irq: Add CSI IRQ.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/irq.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/mimxrt/irq.h b/ports/mimxrt/irq.h
index b83eb49ffabfa..8202a98e8748c 100644
--- a/ports/mimxrt/irq.h
+++ b/ports/mimxrt/irq.h
@@ -69,6 +69,8 @@ static inline void restore_irq_pri(uint32_t basepri) {
 
 #define IRQ_PRI_SYSTICK         NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 0, 0)
 
+#define IRQ_PRI_CSI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 3, 0)
+
 #define IRQ_PRI_OTG_HS          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 6, 0)
 
 #define IRQ_PRI_EXTINT          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 14, 0)

From 67ebc537c3d0095d3b6a0ef8a7160ba06ea95dff Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 25 Jan 2025 08:59:47 +0100
Subject: [PATCH 1857/3129] mimxrt/machine_rtc: Fix build with new SDKs.

In more recent SDKs, this feature is actually disabled for the MIMXRT1062.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/machine_rtc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 5feeb0da096ae..e6c519991983b 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -156,8 +156,10 @@ void machine_rtc_start(void) {
     SNVS->HPCOMR |= SNVS_HPCOMR_NPSWA_EN_MASK;
     // Do a basic init.
     SNVS_LP_Init(SNVS);
+    #if FSL_FEATURE_SNVS_HAS_MULTIPLE_TAMPER
     // Disable all external Tamper
     SNVS_LP_DisableAllExternalTamper(SNVS);
+    #endif
 
     SNVS_LP_SRTC_StartTimer(SNVS);
     // If the date is not set, set it to a more recent start date,

From d76733d05856d389f216d60c71d1a7043d78c510 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 25 Jan 2025 13:42:24 +0100
Subject: [PATCH 1858/3129] mimxrt/mpconfigport: Remove hard-coded CMSIS
 header.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 146c86015afd2..923eff4dc7064 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -29,7 +29,6 @@
 // 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);
 

From 9d0a5ac7e9ac8b90d1bbea402fd16a410aa4008f Mon Sep 17 00:00:00 2001
From: StrayCat <marcin.eu@gmail.com>
Date: Thu, 2 Jan 2025 23:46:44 +1300
Subject: [PATCH 1859/3129] esp32/boards: Enable I2S on ESP32C3 boards.

Signed-off-by: StrayCat <marcin.eu@gmail.com>
---
 ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h | 1 -
 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
index 0dbfae03a367c..a6cebdf6ee64f 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
@@ -4,7 +4,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32C3"
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_I2S              (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/LOLIN_C3_MINI/mpconfigboard.h b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
index 9b304b69f6fba..46d720edc758f 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-c3-mini"
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_I2S              (0)
 
 #define MICROPY_HW_I2C0_SCL                 (10)
 #define MICROPY_HW_I2C0_SDA                 (8)

From 0662c551216db1a3ab40dafbeffcc3ee929d7690 Mon Sep 17 00:00:00 2001
From: Markus Gyger <markus@gyger.org>
Date: Tue, 31 Dec 2024 15:34:17 +0700
Subject: [PATCH 1860/3129] rp2/rp2_pio: Add side_pindir support for PIO.

Side-setting can also be used to change pin directions instead of pin
values.  This adds a parameter `side_pindir` to decorator `asm_pio()` to
configure it.

Also replaces a few close-by 0s with corresponding PIO.* constants.

Addresses issue #10027.

Signed-off-by: Markus Gyger <markus@gyger.org>
---
 docs/library/rp2.rst     | 8 +++++---
 ports/rp2/modules/rp2.py | 9 +++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index f0189327dfb77..a215e98b51e55 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -23,7 +23,7 @@ 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)
+.. function:: asm_pio(*, out_init=None, set_init=None, sideset_init=None, side_pindir=False, in_shiftdir=PIO.SHIFT_LEFT, out_shiftdir=PIO.SHIFT_LEFT, autopush=False, autopull=False, push_thresh=32, pull_thresh=32, fifo_join=PIO.JOIN_NONE)
 
     Assemble a PIO program.
 
@@ -35,8 +35,10 @@ For running PIO programs, see :class:`rp2.StateMachine`.
     - *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.
+    - *sideset_init* configures the pins used for ``.side()`` modifiers. There
+      can be at most 5.
+    - *side_pindir* when set to ``True`` configures ``.side()`` modifiers to be
+      used for pin directions, instead of pin values (the default, when ``False``).
 
     The following parameters are used by default, but can be overridden in
     `StateMachine.init()`:
diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index 9d13bf1b52cd5..e9be7dac8d58e 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -26,20 +26,21 @@ def __init__(
         out_init=None,
         set_init=None,
         sideset_init=None,
-        in_shiftdir=0,
-        out_shiftdir=0,
+        side_pindir=False,
+        in_shiftdir=PIO.SHIFT_LEFT,
+        out_shiftdir=PIO.SHIFT_LEFT,
         autopush=False,
         autopull=False,
         push_thresh=32,
         pull_thresh=32,
-        fifo_join=0,
+        fifo_join=PIO.JOIN_NONE,
     ):
         # array is a built-in module so importing it here won't require
         # scanning the filesystem.
         from array import array
 
         self.labels = {}
-        execctrl = 0
+        execctrl = side_pindir << 29
         shiftctrl = (
             fifo_join << 30
             | (pull_thresh & 0x1F) << 25

From b2ce9b6fb03ed27943733235eac2f3f5e0d5b97d Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Wed, 4 Dec 2024 16:32:42 -0700
Subject: [PATCH 1861/3129] rp2/boards: Add SparkFun IoT Node LoRaWAN board.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 .../board.json                                | 25 ++++++
 .../mpconfigboard.cmake                       |  7 ++
 .../mpconfigboard.h                           | 33 +++++++
 .../SPARKFUN_IOTNODE_LORAWAN_RP2350/pins.csv  | 34 +++++++
 .../sparkfun_iotnode_lorawan_rp2350.h         | 88 +++++++++++++++++++
 5 files changed, 187 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/pins.csv
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/sparkfun_iotnode_lorawan_rp2350.h

diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
new file mode 100644
index 0000000000000..4ddcd999fe5f8
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "Dual-core",
+        "External Flash",
+        "External RAM",
+        "JST-SH",
+        "LoRa",
+        "RGB LED",
+        "USB-C",
+        "microSD"
+    ],
+    "images": [
+        "26060-IoT-Node-LoRaWAN-Feature-new.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "IoT Node LoRaWAN RP2350",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/26060",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake
new file mode 100644
index 0000000000000..11fe1ee28fce2
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake
@@ -0,0 +1,7 @@
+# cmake file for SparkFun IoT Node LoRaWAN RP2350
+
+# TODO: DELETE THIS LINE ONCE PICO SDK 2.1.1 IS RELEASED
+set(PICO_BOARD_HEADER_DIRS ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
+
+set(PICO_BOARD "sparkfun_iotnode_lorawan_rp2350")
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.h
new file mode 100644
index 0000000000000..106ec95aa255a
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.h
@@ -0,0 +1,33 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME          "SparkFun IoT Node LoRaWAN"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (14 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x1B4F)
+#define MICROPY_HW_USB_PID (0x0044)
+
+#define MICROPY_HW_I2C0_SDA  (20)
+#define MICROPY_HW_I2C0_SCL  (21)
+
+#define MICROPY_HW_I2C1_SDA  (6)
+#define MICROPY_HW_I2C1_SCL  (7)
+
+#define MICROPY_HW_SPI0_SCK  (2)
+#define MICROPY_HW_SPI0_MOSI (3)
+#define MICROPY_HW_SPI0_MISO (4)
+
+#define MICROPY_HW_SPI1_SCK  (14)
+#define MICROPY_HW_SPI1_MOSI (15)
+#define MICROPY_HW_SPI1_MISO (12)
+
+#define MICROPY_HW_UART0_TX (18)
+#define MICROPY_HW_UART0_RX (19)
+#define MICROPY_HW_UART0_CTS (2)
+#define MICROPY_HW_UART0_RTS (3)
+
+#define MICROPY_HW_UART1_TX (4)
+#define MICROPY_HW_UART1_RX (5)
+#define MICROPY_HW_UART1_CTS (6)
+#define MICROPY_HW_UART1_RTS (7)
+
+#define MICROPY_HW_PSRAM_CS_PIN (0)
+#define MICROPY_HW_ENABLE_PSRAM (1)
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/pins.csv b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/pins.csv
new file mode 100644
index 0000000000000..2526b36d10ea2
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/pins.csv
@@ -0,0 +1,34 @@
+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
+GP23,GPIO23
+GP24,GPIO24
+GP25,GPIO25
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+GP29,GPIO29
+LED,GPIO25
+LED_RGB,GPIO25
+RGB_LED,GPIO25
+NEOPIXEL,GPIO25
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/sparkfun_iotnode_lorawan_rp2350.h b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/sparkfun_iotnode_lorawan_rp2350.h
new file mode 100644
index 0000000000000..5bea33cc4c219
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/sparkfun_iotnode_lorawan_rp2350.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2024 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+// Board definition for the SparkFun IoT Node LoRaWAN
+//
+// This header may be included by other board headers as "boards/sparkfun_iotnode_lorawan_rp2350.h"
+
+// pico_cmake_set PICO_PLATFORM=rp2350
+
+#ifndef _BOARDS_SPARKFUN_IOTNODE_LORAWAN_RP2350_H
+#define _BOARDS_SPARKFUN_IOTNODE_LORAWAN_RP2350_H
+
+// For board detection
+#define SPARKFUN_IOTNODE_LORAWAN_RP2350
+
+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 1
+
+// --- UART ---
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 18
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 19
+#endif
+
+// --- LED ---
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_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 20
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN 21
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 1
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 14
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 15
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 12
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 13
+#endif
+
+// --- FLASH ---
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#endif
+
+// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+#ifndef PICO_RP2350_A2_SUPPORTED
+#define PICO_RP2350_A2_SUPPORTED 1
+#endif
+
+#endif

From e574f6882082058b868b2f81955d8204fa1c852d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 3 Oct 2024 09:07:48 +0200
Subject: [PATCH 1862/3129] mimxrt: Add support for a UF2 bootloader.

Allowing to use e.g. the Adafruit bootloaders with MicroPython.  The .uf2
file is created in addition to the .bin and .hex files allowing to use the
latter ones without the bootloader for debugging and testing.

Changes:

- Set the location of the ISR Vector and .text segment to 0x6000C000 and
  0x6000C400.
- Reserve an area at the start of ITCM for a copy of the interrupt vector
  table and copy the table on reset to this place.
- Extend `machine.bootloader()` by setting the magic number to enable the
  bootloader on reset.
- Create a .uf2 file which skips the segments below 0x6000C000.

The bootloader has to be installed as a preparation step using the board
specific methods, but then the firmware's .uf2 file version can be
installed using the bootloader.  The bootloader can be invoked with:

- double reset
- calling machine.bootloader()
- Using the touch1200 method

Double reset is hard to achieve on MIMXRT boards, since there is no clean
reset pin.  Some MIMXRT boards provide it by switching the power.

Some boards are excluded from the .uf2 build:

- MIMXRT1050_EVK: The uf2 bootloader is built for the QSPI version of the
  board.  MicroPython supports the Hyperflash version.
- MIMXRT1176_EVK: No support for this board yet, but it should be possible.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/Makefile                         | 21 +++++++++++++++++++
 .../boards/ADAFRUIT_METRO_M7/mpconfigboard.mk |  2 ++
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |  2 ++
 ports/mimxrt/boards/MIMXRT1011.ld             |  4 ++--
 ports/mimxrt/boards/MIMXRT1015.ld             |  4 ++--
 .../boards/MIMXRT1015_EVK/mpconfigboard.mk    |  2 ++
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |  2 ++
 ports/mimxrt/boards/MIMXRT1021.ld             |  4 ++--
 ports/mimxrt/boards/MIMXRT1052.ld             |  4 ++--
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |  2 ++
 ports/mimxrt/boards/MIMXRT1062.ld             |  4 ++--
 ports/mimxrt/boards/MIMXRT1064.ld             |  4 ++--
 .../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 ++
 ports/mimxrt/boards/common.ld                 | 11 +++++-----
 ports/mimxrt/hal/resethandler_MIMXRT10xx.S    | 13 ++++++++++++
 ports/mimxrt/modmachine.c                     | 14 +++++++++++--
 ports/mimxrt/mpconfigport.h                   |  2 ++
 tools/autobuild/build-boards.sh               |  2 +-
 22 files changed, 87 insertions(+), 20 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 3a9550cc974d8..ad7d853b677a5 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -21,6 +21,7 @@ BUILD ?= build-$(BOARD)
 PORT ?= /dev/ttyACM0
 CROSS_COMPILE ?= arm-none-eabi-
 GIT_SUBMODULES += lib/tinyusb lib/nxp_driver
+UF2CONV ?= $(TOP)/tools/uf2conv.py
 
 # MicroPython feature configurations
 MICROPY_VFS_LFS2 ?= 1
@@ -162,6 +163,13 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_romapi.c
 endif
 
+# If not empty, then it is 10xx.
+ifneq ($(findstring MIMXRT10, $(MCU_SERIES)),)
+APPLICATION_ADDR := 0x6000C000
+else
+APPLICATION_ADDR := 0x3000C000
+endif
+
 ifeq ($(MCU_SERIES), MIMXRT1176)
 INC += -I$(TOP)/$(MCU_DIR)/drivers/cm7
 
@@ -253,6 +261,11 @@ else
     $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
 
+# Set a flag if the UF2 bootloader is used
+ifeq ($(USE_UF2_BOOTLOADER),1)
+	CFLAGS += -DMICROPY_MACHINE_UF2_BOOTLOADER=1
+endif
+
 # Add sources for respective board flash type
 # Add hal/flexspi_nor_flash.c or hal/flashspi_hyper_flash.c respectively
 SRC_HAL_C += hal/flexspi_$(subst qspi_,,$(FLEXSPI_FLASH_TYPE)).c
@@ -470,7 +483,11 @@ $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
 # Build targets
 # =============================================================================
 
+ifeq ($(USE_UF2_BOOTLOADER),1)
+all: $(BUILD)/firmware.hex $(BUILD)/firmware.bin $(BUILD)/firmware.uf2
+else
 all: $(BUILD)/firmware.hex $(BUILD)/firmware.bin
+endif
 
 # Process linker scripts with C preprocessor to exchange LDDEFINES and
 #	aggregate output of preprocessor in a single linker script `link.ld`
@@ -487,6 +504,10 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(Q)$(OBJCOPY) -O ihex -R .eeprom $< $@
 
+$(BUILD)/firmware.uf2: $(BUILD)/firmware.elf
+	$(Q)$(OBJCOPY) -O binary -R .stack -R .ivt -R .flash_config $^ $@-binpart
+	$(Q)$(PYTHON) $(UF2CONV) -b $(APPLICATION_ADDR) -f MIMXRT10XX -c -o $@ $@-binpart
+
 # 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
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
index a8f7add6d26ae..74d3a6f0f10e3 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
@@ -8,3 +8,5 @@ MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 MICROPY_PY_NETWORK_NINAW10 ?= 1
 MICROPY_PY_SSL ?= 1
 MICROPY_SSL_MBEDTLS ?= 1
+
+USE_UF2_BOOTLOADER = 1
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index dd525859063d9..1aef451e2a6a5 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -5,6 +5,8 @@ MICROPY_FLOAT_IMPL = single
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x1000000  # 16MB
 
+USE_UF2_BOOTLOADER = 1
+
 JLINK_PATH ?= /media/RT1010-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 908eefffd643f..ab363bd56a025 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -14,9 +14,9 @@ flash_config_start  = flash_start + 0x00000400;
 flash_config_size   = 0x00000C00;
 ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = flash_start + 0x00002000;
+interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
-text_start          = flash_start + 0x00002400;
+text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
diff --git a/ports/mimxrt/boards/MIMXRT1015.ld b/ports/mimxrt/boards/MIMXRT1015.ld
index 90336a2437127..0237d348c2498 100644
--- a/ports/mimxrt/boards/MIMXRT1015.ld
+++ b/ports/mimxrt/boards/MIMXRT1015.ld
@@ -14,9 +14,9 @@ flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
 ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = flash_start + 0x00002000;
+interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
-text_start          = flash_start + 0x00002400;
+text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
index 34e5cdee51134..0f719ac0a9753 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
@@ -6,3 +6,5 @@ MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x1000000  # 16MB
 
 MICROPY_BOOT_BUFFER_SIZE = (32 * 1024)
+
+USE_UF2_BOOTLOADER = 1
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index c98843a1a3c3d..7715e669f8d09 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -12,6 +12,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+USE_UF2_BOOTLOADER = 1
+
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
 
 JLINK_PATH ?= /media/RT1020-EVK/
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index bef0c13df5505..78add04c0c26c 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -14,9 +14,9 @@ flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
 ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = flash_start + 0x00002000;
+interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
-text_start          = flash_start + 0x00002400;
+text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index ca656711a5a77..ea034d713e2f6 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -16,9 +16,9 @@ flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
 ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = flash_start + 0x00002000;
+interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
-text_start          = flash_start + 0x00002400;
+text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00200000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 3af7cd231a2ab..f57aaff3b8b17 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -12,6 +12,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+USE_UF2_BOOTLOADER = 1
+
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
 
 JLINK_PATH ?= /media/RT1060-EVK/
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index 5b91550d97d60..3d7e6d0634196 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -16,9 +16,9 @@ flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
 ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = flash_start + 0x00002000;
+interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
-text_start          = flash_start + 0x00002400;
+text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index 708dac4d515c4..7c35cb60c750b 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -10,9 +10,9 @@ flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
 ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = flash_start + 0x00002000;
+interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
-text_start          = flash_start + 0x00002400;
+text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 95cfb4585acc1..f175d26377abc 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -12,6 +12,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+USE_UF2_BOOTLOADER = 1
+
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
 
 JLINK_PATH ?= /media/RT1064-EVK/
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
index 58429d298118e..1de497d74e3f0 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -6,6 +6,8 @@ MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
+USE_UF2_BOOTLOADER = 1
+
 CFLAGS += -DMICROPY_HW_FLASH_DQS=kFlexSPIReadSampleClk_LoopbackInternally
 
 SRC_C += \
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 63e68e1e57994..c691e2dcb55c4 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -12,6 +12,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+USE_UF2_BOOTLOADER = 1
+
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
 
 CFLAGS += -DSPI_RETRY_TIMES=1000000
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 07f174944b79c..87c122da9d49d 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -6,5 +6,7 @@ MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
+USE_UF2_BOOTLOADER = 1
+
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index b297448a307e7..e28310d091ad2 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -10,6 +10,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+USE_UF2_BOOTLOADER = 1
+
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
 
 deploy: $(BUILD)/firmware.hex
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index 587fc82a1953d..477ba38bc89a3 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -42,7 +42,8 @@ MEMORY
   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_isr          (RX) : ORIGIN = itcm_start,            LENGTH = 0x400
+  m_itcm         (RX) : ORIGIN = itcm_start + 0x400,    LENGTH = itcm_size - 0x400
   m_dtcm         (RW) : ORIGIN = dtcm_start,            LENGTH = dtcm_size
   m_ocrm         (RW) : ORIGIN = ocrm_start,            LENGTH = ocrm_size
 
@@ -80,7 +81,8 @@ SECTIONS
     . = ALIGN(4);
   } > m_ivt
 
-  /* The startup code goes first into internal RAM */
+  /* ISR Vector table in flash. Copied to ITCM by ResetHandler(). */
+
   .interrupts :
   {
     __Vectors = .;
@@ -90,10 +92,9 @@ SECTIONS
     . = ALIGN(4);
   } > m_interrupts
 
-  __VECTOR_RAM = __Vectors;
-  __RAM_VECTOR_TABLE_SIZE_BYTES = 0x0;
+  __Vectors_RAM = ORIGIN(m_isr);
 
-  /* The program code and other data goes into internal RAM */
+  /* Some program code and other data goes into internal RAM */
   .text :
   {
     . = ALIGN(4);
diff --git a/ports/mimxrt/hal/resethandler_MIMXRT10xx.S b/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
index fe933c6d6002b..2fb8772850b6a 100644
--- a/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
+++ b/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
@@ -64,6 +64,19 @@ Reset_Handler:
  *      __ram_function_start__/__ram_function_end__ : ramfunction region
  *      copied to. Both must be aligned to 4 bytes boundary.  */
 
+/* Copy the ISR Vector table to the start of ITCM to be available when the
+   .uf2 bootloader is used */
+
+    ldr    r1, = __Vectors
+    ldr    r2, = __Vectors_RAM
+    movs   r3, 1024
+
+.LC_ISR:
+    subs    r3, #4
+    ldr    r0, [r1, r3]
+    str    r0, [r2, r3]
+    bgt    .LC_ISR
+
     ldr    r1, =__etext
     ldr    r2, =__data_start__
     ldr    r3, =__data_end__
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 1212914d3b452..204699bcc4263 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -76,6 +76,11 @@ typedef enum {
     MP_SOFT_RESET
 } reset_reason_t;
 
+// Copied from inc/uf2.h in https://github.com/Microsoft/uf2-samd21
+#define DBL_TAP_REG   SNVS->LPGPR[3]
+#define DBL_TAP_MAGIC 0xf01669ef // Randomly selected, adjusted to have first and last bit set
+#define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef
+
 static mp_obj_t mp_machine_unique_id(void) {
     unsigned char id[8];
     mp_hal_get_unique_id(id);
@@ -158,12 +163,17 @@ NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if defined(MICROPY_BOARD_ENTER_BOOTLOADER)
     // If a board has a custom bootloader, call it first.
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
-    #elif FSL_ROM_HAS_RUNBOOTLOADER_API
+    #elif FSL_ROM_HAS_RUNBOOTLOADER_API && !MICROPY_MACHINE_UF2_BOOTLOADER
     // If not, enter ROM bootloader in serial downloader / USB mode.
+    // Skip that in case of the UF2 bootloader being available.
     uint32_t arg = 0xEB110000;
     ROM_RunBootloader(&arg);
     #else
-    // No custom bootloader, or run bootloader API, then just reset.
+    // No custom bootloader, or run bootloader API, the set
+    // the flag for the UF2 bootloader
+    // Pretend to be the first of the two reset presses needed to enter the
+    // bootloader. That way one reset will end in the bootloader.
+    DBL_TAP_REG = DBL_TAP_MAGIC;
     WDOG_TriggerSystemSoftwareReset(WDOG1);
     #endif
     while (1) {
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 923eff4dc7064..b45f8408e6415 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -115,6 +115,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
 #define MICROPY_PY_MACHINE_UART_IRQ         (1)
 #define MICROPY_PY_ONEWIRE                  (1)
+#define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (2)
@@ -151,6 +152,7 @@ uint32_t trng_random_u32(void);
 
 #define MICROPY_HW_ENABLE_USBDEV            (1)
 #define MICROPY_HW_USB_CDC                  (1)
+#define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 
 // Hooks to add builtins
 
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 801e7062e5798..bd6828cb40f50 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -99,7 +99,7 @@ function build_esp8266_boards {
 }
 
 function build_mimxrt_boards {
-    build_boards modmimxrt.c $1 $2 bin hex
+    build_boards modmimxrt.c $1 $2 bin hex uf2
 }
 
 function build_nrf_boards {

From b251aec0fcfef75b43b69c329b9a34c3703a6b90 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 5 Oct 2024 12:57:47 +0200
Subject: [PATCH 1863/3129] mimxrt/hal: Update the LUT and re-enable
 PAGEPROGRAM_QUAD.

Changes:
- Change the LUT table ordering to be similar to the order of the
  UF2-Bootloader and fsl_romapi.h.
- Rewrite the LUT entry for PAGEPROGRAM_QUAD and update the LUT.  That
  enabled QUAD program again.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/flash.c                     |  6 +--
 ports/mimxrt/hal/flexspi_flash_config.h  | 24 ++++++----
 ports/mimxrt/hal/flexspi_hyper_flash.c   |  3 ++
 ports/mimxrt/hal/flexspi_nor_flash.c     | 40 ++++++++--------
 ports/mimxrt/hal/qspi_nor_flash_config.c | 60 +++++++++++-------------
 5 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/ports/mimxrt/flash.c b/ports/mimxrt/flash.c
index 3a18f8f51b930..7df799884e9e7 100644
--- a/ports/mimxrt/flash.c
+++ b/ports/mimxrt/flash.c
@@ -28,10 +28,8 @@
 
 void flash_init(void) {
     // Upload the custom flash configuration
-    // This should be performed by the boot ROM but for some reason it is not.
-    FLEXSPI_UpdateLUT(BOARD_FLEX_SPI, 0,
-        qspiflash_config.memConfig.lookupTable,
-        ARRAY_SIZE(qspiflash_config.memConfig.lookupTable));
+    // And fix the entry for PAGEPROGRAM_QUAD
+    flexspi_nor_update_lut();
 
     // Configure FLEXSPI IP FIFO access.
     BOARD_FLEX_SPI->MCR0 &= ~(FLEXSPI_MCR0_ARDFEN_MASK);
diff --git a/ports/mimxrt/hal/flexspi_flash_config.h b/ports/mimxrt/hal/flexspi_flash_config.h
index 5320231a1495c..7538537aeae5b 100644
--- a/ports/mimxrt/hal/flexspi_flash_config.h
+++ b/ports/mimxrt/hal/flexspi_flash_config.h
@@ -75,6 +75,12 @@
     (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))
 
+#define EMPTY_LUT \
+    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), \
+    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), \
+    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), \
+    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), \
+
 // !@brief Definitions for FlexSPI Serial Clock Frequency
 typedef enum _FlexSpiSerialClockFreq
 {
@@ -209,20 +215,20 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READ 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_READSTATUS_XPI 2
 #define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 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_READQUAD 6
+#define NOR_CMD_LUT_SEQ_IDX_READID 7
+#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8
 #define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 10
 #define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 13
+// Index 12 is left empty
+#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13
 
 #define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
 #define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.c b/ports/mimxrt/hal/flexspi_hyper_flash.c
index 5e5d87166d850..c0cd63ca0be8e 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.c
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.c
@@ -9,6 +9,9 @@
 #include "fsl_clock.h"
 #include "flexspi_hyper_flash.h"
 
+void flexspi_nor_update_lut(void) {
+}
+
 // 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.
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.c b/ports/mimxrt/hal/flexspi_nor_flash.c
index 956fb657db6dd..a890533a69661 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.c
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -36,6 +36,23 @@
 #include <assert.h>
 #include "fsl_common.h"
 #include "flexspi_nor_flash.h"
+#include "flexspi_flash_config.h"
+
+uint32_t LUT_pageprogram_quad[4] = {
+    // 10 Page Program - quad mode
+    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 24),
+    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
+};
+
+void flexspi_nor_update_lut(void) {
+    uint32_t lookuptable_copy[64];
+    memcpy(lookuptable_copy, (const uint32_t *)&qspiflash_config.memConfig.lookupTable, 64 * sizeof(uint32_t));
+    // write PAGEPROGRAM_QUAD code to entry 10
+    memcpy(&lookuptable_copy[10 * 4], LUT_pageprogram_quad, 4 * sizeof(uint32_t));
+    FLEXSPI_UpdateLUT(BOARD_FLEX_SPI, 0, lookuptable_copy, 64);
+}
 
 void flexspi_nor_reset(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
 void flexspi_nor_reset(FLEXSPI_Type *base) {
@@ -106,9 +123,9 @@ status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) __attribute__((section
 status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) {
     flexspi_transfer_t flashXfer;
     status_t status;
-    uint32_t writeValue = 0x40;
+    uint32_t writeValue = qspiflash_config.memConfig.deviceModeArg;
 
-    /* Write neable */
+    /* Write enable */
     status = flexspi_nor_write_enable(base, 0);
 
     if (status != kStatus_Success) {
@@ -228,22 +245,3 @@ 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) {
-    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/qspi_nor_flash_config.c b/ports/mimxrt/hal/qspi_nor_flash_config.c
index a8040737e51b0..9edf44fc64c84 100644
--- a/ports/mimxrt/hal/qspi_nor_flash_config.c
+++ b/ports/mimxrt/hal/qspi_nor_flash_config.c
@@ -49,76 +49,75 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqNum = 1u,
         },
         .deviceModeArg = 0x40,
-        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
         .deviceType = kFlexSpiDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
         .serialClkFreq = MICROPY_HW_FLASH_CLK,
         .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .lookupTable =
         {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            // 0 Read LUTs 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 24),
             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
+            // 1 Read status register
             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),
+            // 2 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
 
-            // 3 Write Enable -> 3
+            // 3 Write Enable
             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),
+            // 4 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_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
 
-            // 5 Erase Sector -> 5
+            // 5 Erase Sector
             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
+            // 6 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 24),
+            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
 
-            // 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),
+            // 7 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
 
-            // 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),
+            // 8 Erase Block (32k)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x52, 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
 
-            // 9 Page Program - single mode -> 9
+            // 9 Page Program - single mode
             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
+            // 10 Page Program - quad mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 24),
+            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
 
@@ -128,15 +127,12 @@ const flexspi_nor_config_t qspiflash_config = {
             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
+            // 12 Empty LUT
+            EMPTY_LUT
 
-            // 13 Erase Block (32k) -> 13
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x52, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            // 13 READ SDFP
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x5A, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8, 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
         },

From 2a80d5c68b5e03570784d18985d5388995ba0e40 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 26 Jan 2025 21:39:58 +0100
Subject: [PATCH 1864/3129] mimxrt/flash: Swap the order of disabling IRQ and
 disabling the cache.

This change stopped problems with USB IRQ happening during flash writes.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/flash.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/ports/mimxrt/flash.c b/ports/mimxrt/flash.c
index 7df799884e9e7..cdcdc7483d833 100644
--- a/ports/mimxrt/flash.c
+++ b/ports/mimxrt/flash.c
@@ -43,14 +43,13 @@ void flash_init(void) {
 __attribute__((section(".ram_functions"))) status_t flash_erase_block(uint32_t erase_addr) {
     status_t status = kStatus_Fail;
 
-    SCB_CleanInvalidateDCache();
-    SCB_DisableDCache();
     __disable_irq();
+    SCB_DisableDCache();
 
     status = flexspi_nor_flash_erase_block(BOARD_FLEX_SPI, erase_addr);
 
-    __enable_irq();
     SCB_EnableDCache();
+    __enable_irq();
 
     return status;
 }
@@ -60,14 +59,13 @@ __attribute__((section(".ram_functions"))) status_t flash_erase_block(uint32_t e
 __attribute__((section(".ram_functions"))) status_t flash_erase_sector(uint32_t erase_addr) {
     status_t status = kStatus_Fail;
 
-    SCB_CleanInvalidateDCache();
-    SCB_DisableDCache();
     __disable_irq();
+    SCB_DisableDCache();
 
     status = flexspi_nor_flash_erase_sector(BOARD_FLEX_SPI, erase_addr);
 
-    __enable_irq();
     SCB_EnableDCache();
+    __enable_irq();
 
     return status;
 }
@@ -83,10 +81,6 @@ __attribute__((section(".ram_functions"))) status_t flash_write_block(uint32_t d
     if (length == 0) {
         status = kStatus_Success;  // Nothing to do
     } else {
-
-        SCB_CleanInvalidateDCache();
-        SCB_DisableDCache();
-
         // write data in chunks not crossing a page boundary
         do {
             next_addr = dest_addr - (dest_addr % PAGE_SIZE_BYTES) + PAGE_SIZE_BYTES; // next page boundary
@@ -96,7 +90,11 @@ __attribute__((section(".ram_functions"))) status_t flash_write_block(uint32_t d
             }
 
             __disable_irq();
+            SCB_DisableDCache();
+
             status = flexspi_nor_flash_page_program(BOARD_FLEX_SPI, dest_addr, (uint32_t *)src, write_length);
+
+            SCB_EnableDCache();
             __enable_irq();
 
             // Update remaining data length
@@ -106,9 +104,6 @@ __attribute__((section(".ram_functions"))) status_t flash_write_block(uint32_t d
             src += write_length;
             dest_addr += write_length;
         } while ((length > 0) && (status == kStatus_Success));
-
-        SCB_EnableDCache();
-
     }
     return status;
 }

From 9eb9451d8377c2adc5187cfb51ef68de843b680f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 7 Oct 2024 08:45:54 +0200
Subject: [PATCH 1865/3129] mimxrt/boards: Update the deploy instructions for
 the UF2 bootloader.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../ADAFRUIT_METRO_M7/deploy_metro_m7.md      | 148 ++----------------
 .../boards/OLIMEX_RT1010/deploy_olimex.md     |  42 ++---
 ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md  |  58 ++++++-
 ports/mimxrt/boards/deploy_mimxrt.md          |  44 +++++-
 4 files changed, 123 insertions(+), 169 deletions(-)

diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md
index bc92016b71751..c5bfd1a28a79f 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md
@@ -1,141 +1,11 @@
 ## 1. Deploy the MicroPython firmware to  the Metro M7 board.
 
-### 1.1 Deploy the firmware using the serial bootloader.
-
-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. Set the two BOOTSEL DIP switches to the 1/0 position, which is the opposite position of the normal use mode.
-
-3. Push the reset button.
-
-4. 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.
-
-5. Once the upload is finished, set the BOOTSEL DIP switches back to the 0/1 position and push reset.
-
-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.
-
-### 1.2 Deploy the firmware using a JTAG adapter.
-
-With a JTAG adapter the firmware can be easily installed. Appropriate tools are Segger JFlash Lite and
-the Segger Edu Mini adapter. Just use the firmware.hex file for loading, which will be loaded at the
-proper address.
-
-
-## 2. Deploy the WiFi firmware.
-
-The NINA firmware in the NINA module has to be updated for use with MicroPython. That can be done
-using MicroPython and two small Python scripts.
-
-The firmware binaries are available at
-https://github.com/micropython/micropython-lib/tree/master/micropython/espflash
-or https://github.com/robert-hh/Shared-Stuff. For the Metro M7 board, the
-NINA_FW_v1.5.0_Airlift.bin file is needed.
-
-For firmware upload, the following connections to the WiFi module are required:
-
-- Pin Reset (as above)
-- Pin GPIO0
-- UART RX
-- UART TX
-
-The GPIO pins and UART device id varies between boards. At the Adafruit Metro M7 board,
-the UART is UART(1), and the Pin names for reset and GPIO0 are ESP_RESET and ESP_GPIO0.
-The firmware can be uploaded, using the espflash.py module, a short script
-using espflash.py and mpremote. espflash.py is available at
-https://github.com/micropython/micropython-lib/tree/master/micropython/espflash.
-This place also holds the example script.
-
-```
-import espflash
-from machine import Pin
-from machine import UART
-import sys
-sys.path.append("/flash")
-
-reset = Pin("ESP_RESET", Pin.OUT)
-gpio0 = Pin("ESP_GPIO0", Pin.OUT)
-uart = UART(0, 115200, timeout=350)
-
-md5sum = b"b0b9ab23da820a469e597c41364acb3a"
-path = "/remote/NINA_FW_v1.5.0_Airlift.bin"
-
-esp = espflash.ESPFlash(reset, gpio0, uart)
-# Enter bootloader download mode, at 115200
-esp.bootloader()
-# Can now change to higher/lower baud rate
-esp.set_baudrate(921600)
-# Must call this first before any flash functions.
-esp.flash_attach()
-# Read flash size
-size = esp.flash_read_size()
-# Configure flash parameters.
-esp.flash_config(size)
-# Write firmware image from internal storage.
-esp.flash_write_file(path)
-# Compares file and flash MD5 checksum.
-esp.flash_verify_file(path, md5sum)
-# Resets the ESP32 chip.
-esp.reboot()
-```
-
-The script shows the set-up for the Metro M7 board.
-The md5sum is the one of the WiFi firmware. It may change and
-can be recalculated using e.g. the Linux `md5sum` command. It is used to
-verify the firmware upload. To upload the firmware, place the firmware
-and the above script (let's call it ninaflash.py) into the same directory
-on your PC, and run the command:
-```
-mpremote connect <port> mount . run ninaflash.py
-```
-After a while, the upload will start. A typical start sequence looks like:
-```
-Local directory . is mounted at /remote
-Failed to read response to command 8.
-Failed to read response to command 8.
-Changing baudrate => 921600
-Flash attached
-Flash size 2.0 MBytes
-Flash write size: 1310720 total_blocks: 320 block size: 4096
-Writing sequence number 0/320...
-Writing sequence number 1/320...
-Writing sequence number 2/320...
-Writing sequence number 3/320...
-Writing sequence number 4/320...
-....
-....
-Writing sequence number 317/320...
-Writing sequence number 318/320...
-Writing sequence number 319/320...
-Flash write finished
-Flash verify: File  MD5 b'b0b9ab23da820a469e597c41364acb3a'
-Flash verify: Flash MD5 b'b0b9ab23da820a469e597c41364acb3a'
-Firmware verified.
-```
-The initial messages `Failed to read response to command 8.`
-can be ignored.
+The Metro M7 board comes pre-installed with a UF2 bootloader. It can
+be started by pushing reset twice. Then the bootloader drive will
+appear. If that does not happen or the bootloader was lost, you can
+reinstall the bootloader using the instructions by Adafruit
+here: https://learn.adafruit.com/adafruit-metro-m7-microsd/installing-the-bootloader
+
+Once the bootloader is installed and started, you can install MicroPython
+by copying the .uf2 version of the firmware file to the bootloader
+drive. When the firmware is installed, the drive will disappear.
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
index 92f3df57c9b84..7abba784b940b 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
@@ -1,39 +1,43 @@
-For initial deployment of the firmware a few preparation steps are required, which
-have to be done once.
+The Olimex RT1011 board is delivered without firmware. The best option to
+install MicroPython is installing a UF2 bootstrap loader first, which then can be
+used to install and update MicroPython. The bootloader has to be installed
+only 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.
+For initial deployment of the bootloader a few preparation steps are required, which
+have to be done once.
 
-2. Get the NXP program sdphost for your operating system, e.g. from
+1. 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.
+2. Get the UF2 boot-loader package https://github.com/adafruit/tinyuf2/releases/tag/0.21.0/tinyuf2-imxrt1010_evk-0.20.1.zip and extract the files `tinyuf2-imxrt1010_evk-0.21.0.bin`
+. You may as well go for a newer release.
 
 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.
+1. Get the firmware file you want to upload  with the .uf2 extension 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 -- write-file 0x20206400 tinyuf2-imxrt1010_evk-0.21.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.
+Wait until a drive icon appears on the computer (or mount it explicitly). Then the UF2 bootloader
+is permanently installed.
 
 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.
+4. Once the upload of the bootloader is finished, push Reset twice.
+
+The bootloader should start and show a drive icon. Copy the .uf2 version of MicroPython
+to this drive to install or update MicroPython.
+
+Once the UF2 bootloader is installed, only step 4 is required to deploy MicroPython. If
+MicroPython is already installed, the bootloader can as well be invoked by calling
+`machine.bootloader()`.
+
+If at any time the flash content is corrupted you can always start over from the beginning.
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md b/ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md
index e91c48d46cafd..9178c717e36e6 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md
@@ -1,6 +1,52 @@
-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.
+The Seeed Arch Mix board is delivered without firmware. The best option to
+install MicroPython is installing a UF2 bootstrap loader first, which then can be
+used to install and update MicroPython. The bootloader has to be installed
+only once.
+
+For initial deployment of the bootloader a few preparation steps are required, which
+have to be done once.
+
+1. 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.
+
+2. Get the UF2 boot-loader package https://github.com/adafruit/tinyuf2/releases/tag/0.20.1/tinyuf2-imxrt1050_evkb-0.21.0.zip and extract the files `tinyuf2-imxrt1050_evkb-0.21.0.bin`.
+You may as well go for a newer release.
+
+Now you have all files at hand that you will need for updating.
+
+1. Get the firmware file you want to upload  with the .uf2 extension from the MicroPython download page.
+
+2. At the Seeed Arch Mix board, connect the RX pin (J3-19) with 3.3V, and change the DIP switches
+3 an 4 at SW1 from 1-0 to 0-1.
+
+3. Push Reset.
+
+4. Run the commands:
+
+```
+sudo ./sdphost -u 0x1fc9,0x0130 -- write-file 0x1000 tinyuf2-imxrt1050_evkb-0.21.0.bin
+sudo ./sdphost -u 0x1fc9,0x0130 -- jump-address 0x2000
+```
+Wait until a drive icon appears on the computer (or mount it explicitly). When using the above
+mentioned bootloader, it has the label `RT1050BOOT`. Then the UF2 bootloader
+is permanently installed.
+
+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.
+
+5. At the Seeed Arch Mix board, disconnect the RX pin (J3-19) with 3.3V, and change the DIP switches
+3 an 4 at SW1 back to 1-0.
+
+6. Once the upload of the bootloader is finished or when it is already installed, push Reset twice.
+
+The bootloader should start and show a drive icon. Do not push too fast. The i.MX RT MCU
+have no dedicated Reset Pin and are reset through power cycling, which may be slow.
+Copy the .uf2 version of MicroPython to this drive to install or update MicroPython.
+If after steps 1-4 the bootloader drive is already shown, you do not have to reset again.
+
+Once the UF2 bootloader is installed, only step 6 is required to deploy MicroPython. If
+MicroPython is already installed, the bootloader can as well be invoked by calling
+`machine.bootloader()` or switching the USB baud rate at the PC to 1200 baud and back.
+
+If at any time the flash content is corrupted you can always start over from the beginning.
diff --git a/ports/mimxrt/boards/deploy_mimxrt.md b/ports/mimxrt/boards/deploy_mimxrt.md
index 35752a8362cef..7ad21fe64ca17 100644
--- a/ports/mimxrt/boards/deploy_mimxrt.md
+++ b/ports/mimxrt/boards/deploy_mimxrt.md
@@ -1,11 +1,45 @@
-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.
+## Firmware installation options
+
+There are two ways to load the MicroPython firmware to the device:
+
+1. Load the MicroPython firmware directly to the device. The MicroPython
+firmware files for that method have the extension .bin or .hex and are available
+at the MicroPython download site.
+2. Install a resident UF2 bootstrap loader to the device first and use that later for loading
+MicroPython. The MicroPython firmware files for that method have the extension .uf2
+and are available at the MicroPython download site. The UF2 bootstrap loader can be obtained
+from the site https://github.com/adafruit/tinyuf2. Open the recent release page and
+get the version of the bootloader for your board. If there is no specific bootloader
+for a specific board, get versions for the respective imxrt10xx-evk board. The file
+with the .bin or .hex extension is the one to be installed first.
+
+## Direct loading of MicroPython or installation of the UF2 bootloader
+
+The MicroPython firmware or the UF2 bootstrap loader 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.
+
+## Installing the MicroPython firmware using the UF2 bootloader
+
+When using the UF2 bootloader, the OTG USB port will be used.
+Once the UF2 bootloader is installed, it has to be started to upload MicroPython.The
+methods to start the bootloader are:
+
+- Push reset twice.
+- Call machine.bootloader() e.g. from REPL.
+- Switch the USB port shortly to 1200 baud and back. That requires MicroPython to be
+installed.
+
+If there is no valid Firmware on the device, the bootloader will start automatically.
+Once it's started, a drive ICON will appear. The MicroPython firmware file with .uf2
+extension must then be copied to that drive. When the file is copied and MicroPython
+is installed, the drive disappears and MicroPython starts.

From d40849d07d2523fa16070bfcae34b51b7b14942b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 3 Feb 2025 21:12:35 +0100
Subject: [PATCH 1866/3129] mimxrt/boards: Add flash configuration constants to
 mpconfigboard.mk.

And use these to initialize the LUT table properly for the various flash
types.  The different flash types differ by 3 parameters.  Thus it is
easier to just keep one copy of the qspiflash_config structure with the LUT
table and update it during flash initialisation as needed.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/Makefile                         |  6 ++++
 .../boards/ADAFRUIT_METRO_M7/mpconfigboard.mk |  3 ++
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |  3 ++
 .../boards/MIMXRT1015_EVK/mpconfigboard.mk    |  3 ++
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |  3 ++
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |  3 ++
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |  3 ++
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |  3 ++
 .../boards/MIMXRT1170_EVK/mpconfigboard.mk    |  3 ++
 .../boards/OLIMEX_RT1010/mpconfigboard.mk     |  3 ++
 .../boards/SEEED_ARCH_MIX/mpconfigboard.mk    |  3 ++
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |  3 ++
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |  3 ++
 ports/mimxrt/hal/flexspi_flash_config.h       |  2 +-
 ports/mimxrt/hal/flexspi_nor_flash.c          | 16 +++++++--
 ports/mimxrt/hal/flexspi_nor_flash.h          |  1 +
 ports/mimxrt/hal/qspi_nor_flash_config.c      | 34 ++++++++-----------
 17 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index ad7d853b677a5..224b38384f718 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -425,6 +425,12 @@ endif
 ifdef MICROPY_HW_FLASH_CLK
 	CFLAGS += -DMICROPY_HW_FLASH_CLK=$(MICROPY_HW_FLASH_CLK)
 endif
+ifdef MICROPY_HW_FLASH_QE_CMD
+	CFLAGS += -DMICROPY_HW_FLASH_QE_CMD=$(MICROPY_HW_FLASH_QE_CMD)
+endif
+ifdef MICROPY_HW_FLASH_QE_ARG
+	CFLAGS += -DMICROPY_HW_FLASH_QE_ARG=$(MICROPY_HW_FLASH_QE_ARG)
+endif
 
 CFLAGS += $(CFLAGS_EXTRA)
 
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
index 74d3a6f0f10e3..b9c1716a7f60c 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
@@ -4,6 +4,9 @@ MCU_VARIANT = MIMXRT1011DAE5A
 MICROPY_FLOAT_IMPL = single
 MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
 
 MICROPY_PY_NETWORK_NINAW10 ?= 1
 MICROPY_PY_SSL ?= 1
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index 1aef451e2a6a5..592b89c68ecf7 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -4,6 +4,9 @@ MCU_VARIANT = MIMXRT1011DAE5A
 MICROPY_FLOAT_IMPL = single
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x1000000  # 16MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_100MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
 
 USE_UF2_BOOTLOADER = 1
 
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
index 0f719ac0a9753..c5d02294bc3df 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
@@ -4,6 +4,9 @@ MCU_VARIANT = MIMXRT1015DAF5A
 MICROPY_FLOAT_IMPL = single
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x1000000  # 16MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_100MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
 
 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 7715e669f8d09..5ef078210a2a2 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -4,6 +4,9 @@ MCU_VARIANT = MIMXRT1021DAG5A
 MICROPY_FLOAT_IMPL = double
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x01
+MICROPY_HW_FLASH_QE_ARG = 0x40
 
 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 ef7bbc8f56cb9..8b048c85eaa98 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -7,6 +7,9 @@ MICROPY_HW_FLASH_SIZE = 0x4000000  # 64MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x01
+MICROPY_HW_FLASH_QE_ARG = 0x40
 
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index f57aaff3b8b17..54539952fb4f9 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -4,6 +4,9 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 MICROPY_FLOAT_IMPL = double
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x01
+MICROPY_HW_FLASH_QE_ARG = 0x40
 
 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 f175d26377abc..b393d7ed9f2c6 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -4,6 +4,9 @@ MCU_VARIANT = MIMXRT1064DVL6A
 MICROPY_FLOAT_IMPL = double
 MICROPY_HW_FLASH_TYPE = internal
 MICROPY_HW_FLASH_SIZE = 0x400000  # 4MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_100MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
 
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
index 6e5ee56aa1081..ef4ab683a215c 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
@@ -6,6 +6,9 @@ MICROPY_FLOAT_IMPL = double
 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_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
 
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x4000000  # 64MB
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
index 1de497d74e3f0..7e9987de0cfe3 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -5,6 +5,9 @@ MICROPY_FLOAT_IMPL = single
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_100MHz
+MICROPY_HW_FLASH_QE_CMD = 0x01
+MICROPY_HW_FLASH_QE_ARG = 0x40
 
 USE_UF2_BOOTLOADER = 1
 
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index c691e2dcb55c4..7ea107b00df86 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -4,6 +4,9 @@ MCU_VARIANT = MIMXRT1052DVL6B
 MICROPY_FLOAT_IMPL = double
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x01
+MICROPY_HW_FLASH_QE_ARG = 0x40
 
 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 87c122da9d49d..9393252d1a863 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -5,6 +5,9 @@ MICROPY_FLOAT_IMPL = double
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
 
 USE_UF2_BOOTLOADER = 1
 
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index e28310d091ad2..6bb9e607f6522 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -5,6 +5,9 @@ MICROPY_FLOAT_IMPL = double
 MICROPY_HW_FLASH_TYPE = qspi_nor_flash
 MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
 
 MICROPY_PY_LWIP = 1
 MICROPY_PY_SSL = 1
diff --git a/ports/mimxrt/hal/flexspi_flash_config.h b/ports/mimxrt/hal/flexspi_flash_config.h
index 7538537aeae5b..d9aa5ed5eab69 100644
--- a/ports/mimxrt/hal/flexspi_flash_config.h
+++ b/ports/mimxrt/hal/flexspi_flash_config.h
@@ -75,7 +75,7 @@
     (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))
 
-#define EMPTY_LUT \
+#define EMPTY_LUT_SEQ \
     FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), \
     FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), \
     FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), \
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.c b/ports/mimxrt/hal/flexspi_nor_flash.c
index a890533a69661..6d5b830383f68 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.c
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -46,11 +46,23 @@ uint32_t LUT_pageprogram_quad[4] = {
     FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
 };
 
+uint32_t LUT_write_status[4] = {
+    // 4 Write status word for Quad mode
+    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, MICROPY_HW_FLASH_QE_CMD, WRITE_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
+};
+
 void flexspi_nor_update_lut(void) {
     uint32_t lookuptable_copy[64];
     memcpy(lookuptable_copy, (const uint32_t *)&qspiflash_config.memConfig.lookupTable, 64 * sizeof(uint32_t));
+    // write WRITESTATUSREG code to entry 10
+    memcpy(&lookuptable_copy[NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG * 4],
+        LUT_write_status, 4 * sizeof(uint32_t));
     // write PAGEPROGRAM_QUAD code to entry 10
-    memcpy(&lookuptable_copy[10 * 4], LUT_pageprogram_quad, 4 * sizeof(uint32_t));
+    memcpy(&lookuptable_copy[NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD * 4],
+        LUT_pageprogram_quad, 4 * sizeof(uint32_t));
     FLEXSPI_UpdateLUT(BOARD_FLEX_SPI, 0, lookuptable_copy, 64);
 }
 
@@ -123,7 +135,7 @@ status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) __attribute__((section
 status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) {
     flexspi_transfer_t flashXfer;
     status_t status;
-    uint32_t writeValue = qspiflash_config.memConfig.deviceModeArg;
+    uint32_t writeValue = MICROPY_HW_FLASH_QE_ARG;
 
     /* Write enable */
     status = flexspi_nor_write_enable(base, 0);
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index 6526142af22f1..2e61effc2b7d8 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -47,6 +47,7 @@ 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_enable_quad_mode(FLEXSPI_Type *base);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_erase_block(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/qspi_nor_flash_config.c b/ports/mimxrt/hal/qspi_nor_flash_config.c
index 9edf44fc64c84..36ccc30fc1922 100644
--- a/ports/mimxrt/hal/qspi_nor_flash_config.c
+++ b/ports/mimxrt/hal/qspi_nor_flash_config.c
@@ -48,7 +48,7 @@ const flexspi_nor_config_t qspiflash_config = {
             .seqId = 4u,
             .seqNum = 1u,
         },
-        .deviceModeArg = 0x40,
+        .deviceModeArg = MICROPY_HW_FLASH_QE_ARG,
         .deviceType = kFlexSpiDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
         .serialClkFreq = MICROPY_HW_FLASH_CLK,
@@ -68,10 +68,7 @@ const flexspi_nor_config_t qspiflash_config = {
             FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
 
             // 2 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
+            EMPTY_LUT_SEQ
 
             // 3 Write Enable
             FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
@@ -80,7 +77,7 @@ const flexspi_nor_config_t qspiflash_config = {
             FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
 
             // 4 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, MICROPY_HW_FLASH_QE_CMD, WRITE_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
@@ -92,16 +89,10 @@ const flexspi_nor_config_t qspiflash_config = {
             FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
 
             // 6 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 24),
-            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
+            EMPTY_LUT_SEQ
 
             // 7 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
+            EMPTY_LUT_SEQ
 
             // 8 Erase Block (32k)
             FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x52, RADDR_SDR, FLEXSPI_1PAD, 24),
@@ -127,14 +118,17 @@ const flexspi_nor_config_t qspiflash_config = {
             FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
             FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
 
-            // 12 Empty LUT
-            EMPTY_LUT
+            // 12 Not used
+            EMPTY_LUT_SEQ
 
             // 13 READ SDFP
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x5A, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_1PAD, 8, 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
+            EMPTY_LUT_SEQ
+
+            // 14 Not used
+            EMPTY_LUT_SEQ
+
+            // 15 Not used
+            EMPTY_LUT_SEQ
         },
     },
     .pageSize = 256u,

From 0a433a02e1eab1c95e57129a1e828780c871be42 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 4 Feb 2025 18:17:47 +0100
Subject: [PATCH 1867/3129] mimxrt/hal: Set the flexspi flash CLK frequency on
 boot.

The flash clock frequency may have been set to a different value by a
bootloader.  Set the frequency according to the configured value.  Use a
table of pre-calculated dividers to get the closest value for the flash
frequency, achieving for MIMXRT10xx:

  30 -> 30.85 MHz
  50 -> 49.65 MHz
  60 -> 60 MHz
  75 -> 75.13 MHz
  80 -> 80 MHz
  100 -> 99.31 Mhz
  133 -> 132.92 MHz
  166  -> 166.15 MHz

for MIMXRT1176:

  30 -> 31 MHz
  50 -> 52.8 MJz
  60 -> 58.7 MHz
  75 -> 75.4 MHz
  80 -> 75.4 MHz
  100 -> 105.6 MHz
  133 -> 132 MHz
  166 -> 176 MHz

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/flash.c                   |  3 +-
 ports/mimxrt/hal/flexspi_hyper_flash.c |  2 +-
 ports/mimxrt/hal/flexspi_hyper_flash.h |  2 +-
 ports/mimxrt/hal/flexspi_nor_flash.c   | 93 +++++++++++++++++++++++++-
 ports/mimxrt/hal/flexspi_nor_flash.h   |  3 +-
 5 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/ports/mimxrt/flash.c b/ports/mimxrt/flash.c
index cdcdc7483d833..57091b36ddcfd 100644
--- a/ports/mimxrt/flash.c
+++ b/ports/mimxrt/flash.c
@@ -29,7 +29,8 @@
 void flash_init(void) {
     // Upload the custom flash configuration
     // And fix the entry for PAGEPROGRAM_QUAD
-    flexspi_nor_update_lut();
+    // Update the flash CLK
+    flexspi_nor_update_lut_clk(MICROPY_HW_FLASH_CLK);
 
     // Configure FLEXSPI IP FIFO access.
     BOARD_FLEX_SPI->MCR0 &= ~(FLEXSPI_MCR0_ARDFEN_MASK);
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.c b/ports/mimxrt/hal/flexspi_hyper_flash.c
index c0cd63ca0be8e..9171640a9ed83 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.c
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.c
@@ -9,7 +9,7 @@
 #include "fsl_clock.h"
 #include "flexspi_hyper_flash.h"
 
-void flexspi_nor_update_lut(void) {
+void flexspi_nor_update_lut_clk(uint32_t freq_index) {
 }
 
 // Copy of a few (pseudo-)functions from fsl_clock.h, which were nor reliably
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.h b/ports/mimxrt/hal/flexspi_hyper_flash.h
index a6454a1c9a234..40416d6e21d7f 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.h
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.h
@@ -47,7 +47,7 @@ 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);
+void flexspi_nor_update_lut_clk(uint32_t freq_index);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_erase_block(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 6d5b830383f68..7fdb6b7c13df6 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.c
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -38,6 +38,9 @@
 #include "flexspi_nor_flash.h"
 #include "flexspi_flash_config.h"
 
+bool flash_busy_status_pol = 0;
+bool flash_busy_status_offset = 0;
+
 uint32_t LUT_pageprogram_quad[4] = {
     // 10 Page Program - quad mode
     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 24),
@@ -54,16 +57,100 @@ uint32_t LUT_write_status[4] = {
     FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
 };
 
-void flexspi_nor_update_lut(void) {
+#if defined(MIMXRT117x_SERIES)
+static uint8_t div_table_mhz[] = {
+    17, // Entry 0 is out of range
+    17, // 30 -> 31 MHz
+    10, // 50 -> 52.8 MHz
+    9, // 60 -> 58.7 MHz
+    7, // 75 -> 75.4 MHz
+    7, // 80 -> 75.4 MHz
+    5, // 100 -> 105.6 Mhz
+    4, // 133 -> 132 MHz
+    3  // 166 -> 176 MHz
+};
+
+#else
+typedef struct _ps_div_t {
+    uint8_t pfd480_div;
+    uint8_t podf_div;
+} ps_div_t;
+
+static ps_div_t div_table_mhz[] = {
+    { 35, 8 }, // Entry 0 is out of range
+    { 35, 8 }, // 30 -> 30.85 MHz
+    { 29, 6 }, // 50 -> 49.65 MHz
+    { 18, 8 }, // 60 -> 60 MHz
+    { 23, 5 }, // 75 -> 75.13 MHz
+    { 18, 6 }, // 80 -> 80 MHz
+    { 17, 5 }, // 100 -> 191 Mhz
+    { 13, 5 }, // 133 -> 132.92 MHz
+    { 13, 4 }  // 166  -> 166.15 MHz
+};
+#endif
+
+__attribute__((section(".ram_functions"))) void flexspi_nor_update_lut_clk(uint32_t freq_index) {
+    // Create a local copy of the LookupTable. Modify the entry for WRITESTATUSREG
+    // Add an entry for PAGEPROGRAM_QUAD.
     uint32_t lookuptable_copy[64];
     memcpy(lookuptable_copy, (const uint32_t *)&qspiflash_config.memConfig.lookupTable, 64 * sizeof(uint32_t));
-    // write WRITESTATUSREG code to entry 10
+    // write local WRITESTATUSREG code to index 4
     memcpy(&lookuptable_copy[NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG * 4],
         LUT_write_status, 4 * sizeof(uint32_t));
-    // write PAGEPROGRAM_QUAD code to entry 10
+    // write local PAGEPROGRAM_QUAD code to index 10
     memcpy(&lookuptable_copy[NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD * 4],
         LUT_pageprogram_quad, 4 * sizeof(uint32_t));
+    // Update the LookupTable.
     FLEXSPI_UpdateLUT(BOARD_FLEX_SPI, 0, lookuptable_copy, 64);
+
+    __DSB();
+    __ISB();
+    __disable_irq();
+    SCB_DisableDCache();
+
+    #if defined(MIMXRT117x_SERIES)
+    volatile uint8_t pll2_div = div_table_mhz[freq_index] - 1;
+
+    while (!FLEXSPI_GetBusIdleStatus(BOARD_FLEX_SPI)) {
+    }
+    FLEXSPI_Enable(BOARD_FLEX_SPI, false);
+
+    // Disable FlexSPI clock
+    // Flexspi is clocked by PLL2. Only the divider can be changed.
+    CCM->LPCG[kCLOCK_Flexspi1].DIRECT = ((uint32_t)kCLOCK_Off & CCM_LPCG_DIRECT_ON_MASK);
+    // Change the PLL divider
+    CCM->CLOCK_ROOT[kCLOCK_Root_Flexspi1].CONTROL = (CCM->CLOCK_ROOT[kCLOCK_Root_Flexspi1].CONTROL & ~CCM_CLOCK_ROOT_CONTROL_DIV_MASK) |
+        CCM_CLOCK_ROOT_CONTROL_DIV(pll2_div);
+    // Re-enable FlexSPI clock
+    CCM->LPCG[kCLOCK_Flexspi1].DIRECT = ((uint32_t)kCLOCK_On & CCM_LPCG_DIRECT_ON_MASK);
+
+    #else
+
+    volatile uint8_t pfd480_div = div_table_mhz[freq_index].pfd480_div;
+    volatile uint8_t podf_div = div_table_mhz[freq_index].podf_div - 1;
+
+    while (!FLEXSPI_GetBusIdleStatus(BOARD_FLEX_SPI)) {
+    }
+    FLEXSPI_Enable(BOARD_FLEX_SPI, false);
+
+    // Disable FlexSPI clock
+    CCM->CCGR6 &= ~CCM_CCGR6_CG5_MASK;
+    // Changing the clock is OK now.
+    // Change the PFD
+    CCM_ANALOG->PFD_480 = (CCM_ANALOG->PFD_480 & ~CCM_ANALOG_PFD_480_TOG_PFD0_FRAC_MASK) | CCM_ANALOG_PFD_480_TOG_PFD0_FRAC(pfd480_div);
+    // Change the flexspi divider
+    CCM->CSCMR1 = (CCM->CSCMR1 & ~CCM_CSCMR1_FLEXSPI_PODF_MASK) | CCM_CSCMR1_FLEXSPI_PODF(podf_div);
+    // Re-enable FlexSPI
+    CCM->CCGR6 |= CCM_CCGR6_CG5_MASK;
+    #endif
+
+    FLEXSPI_Enable(BOARD_FLEX_SPI, true);
+    FLEXSPI_SoftwareReset(BOARD_FLEX_SPI);
+    while (!FLEXSPI_GetBusIdleStatus(BOARD_FLEX_SPI)) {
+    }
+
+    SCB_EnableDCache();
+    __enable_irq();
 }
 
 void flexspi_nor_reset(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index 2e61effc2b7d8..dc5798d97f409 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -45,8 +45,7 @@
 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);
+void flexspi_nor_update_lut_clk(uint32_t freq_index);
 status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_erase_block(FLEXSPI_Type *base, uint32_t address);

From 2f646f93d375577d7bc5b500e6fe50c9381875c2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 29 Nov 2024 16:22:51 +0100
Subject: [PATCH 1868/3129] mimxrt: Add optional MSC support.

Add MSC support using internal flash storage or SD card.

Note this is disabled by default, and can be enabled by boards if needed.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile       |   1 +
 ports/mimxrt/main.c         |  15 ++++
 ports/mimxrt/modmimxrt.c    |   3 +
 ports/mimxrt/modmimxrt.h    |   1 +
 ports/mimxrt/mpconfigport.h |   7 ++
 ports/mimxrt/msc_disk.c     | 153 ++++++++++++++++++++++++++++++++++++
 6 files changed, 180 insertions(+)
 create mode 100644 ports/mimxrt/msc_disk.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 224b38384f718..8106ab4f3ff03 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -217,6 +217,7 @@ SRC_C += \
 	modmimxrt.c \
 	mphalport.c \
 	mpnetworkport.c \
+	msc_disk.c \
 	network_lan.c \
 	pendsv.c \
 	pin.c \
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index adb071a7fee8f..6b9d4fa17afe4 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -39,6 +39,7 @@
 #include "led.h"
 #include "pendsv.h"
 #include "modmachine.h"
+#include "modmimxrt.h"
 
 #if MICROPY_PY_LWIP
 #include "lwip/init.h"
@@ -55,6 +56,7 @@
 
 #include "systick.h"
 #include "extmod/modnetwork.h"
+#include "extmod/vfs.h"
 
 extern uint8_t _sstack, _estack, _gc_heap_start, _gc_heap_end;
 
@@ -113,6 +115,19 @@ int main(void) {
         // Execute _boot.py to set up the filesystem.
         pyexec_frozen_module("_boot.py", false);
 
+        #if MICROPY_HW_USB_MSC
+        // Set the USB medium to flash block device.
+        mimxrt_msc_medium = &mimxrt_flash_type;
+
+        #if MICROPY_PY_MACHINE_SDCARD
+        const char *path = "/sdcard";
+        // If SD is mounted, set the USB medium to SD.
+        if (mp_vfs_lookup_path(path, &path) != MP_VFS_NONE) {
+            mimxrt_msc_medium = &machine_sdcard_type;
+        }
+        #endif
+        #endif
+
         // Execute user scripts.
         int ret = pyexec_file_if_exists("boot.py");
 
diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
index 0f67538ce0d21..d699027388521 100644
--- a/ports/mimxrt/modmimxrt.c
+++ b/ports/mimxrt/modmimxrt.c
@@ -31,6 +31,9 @@
 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) },
+    #if MICROPY_HW_USB_MSC
+    { MP_ROM_QSTR(MP_QSTR_MSC),                 MP_ROM_TRUE },
+    #endif
 };
 static MP_DEFINE_CONST_DICT(mimxrt_module_globals, mimxrt_module_globals_table);
 
diff --git a/ports/mimxrt/modmimxrt.h b/ports/mimxrt/modmimxrt.h
index e047716691807..19cf799f88771 100644
--- a/ports/mimxrt/modmimxrt.h
+++ b/ports/mimxrt/modmimxrt.h
@@ -30,5 +30,6 @@
 
 extern const mp_obj_type_t mimxrt_flash_type;
 extern const mp_obj_module_t mp_module_mimxrt;
+extern const mp_obj_type_t *mimxrt_msc_medium;
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMIMXRT_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index b45f8408e6415..7da85f1aee579 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -151,8 +151,15 @@ uint32_t trng_random_u32(void);
 #endif
 
 #define MICROPY_HW_ENABLE_USBDEV            (1)
+// Enable USB-CDC serial port
+#ifndef MICROPY_HW_USB_CDC
 #define MICROPY_HW_USB_CDC                  (1)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
+#endif
+// Enable USB Mass Storage with FatFS filesystem.
+#ifndef MICROPY_HW_USB_MSC
+#define MICROPY_HW_USB_MSC                  (0)
+#endif
 
 // Hooks to add builtins
 
diff --git a/ports/mimxrt/msc_disk.c b/ports/mimxrt/msc_disk.c
new file mode 100644
index 0000000000000..c3801f481e618
--- /dev/null
+++ b/ports/mimxrt/msc_disk.c
@@ -0,0 +1,153 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2024-2025 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 "tusb.h"
+#if CFG_TUD_MSC
+#include "flash.h"
+#include BOARD_FLASH_OPS_HEADER_H
+#include "stdlib.h"
+#include "modmimxrt.h"
+#if MICROPY_PY_MACHINE_SDCARD
+#include "sdcard.h"
+
+#ifndef MICROPY_HW_SDCARD_SDMMC
+#define MICROPY_HW_SDCARD_SDMMC (1)
+#endif
+
+#define MSC_SDCARD_INDEX    (MICROPY_HW_SDCARD_SDMMC - 1)
+#endif
+
+// This implementation does Not support Flash sector caching.
+// MICROPY_FATFS_MAX_SS  must be identical to SECTOR_SIZE_BYTES
+#define BLOCK_SIZE          (SECTOR_SIZE_BYTES)
+#define BLOCK_COUNT         (MICROPY_HW_FLASH_STORAGE_BYTES / BLOCK_SIZE)
+#define FLASH_BASE_ADDR     (MICROPY_HW_FLASH_STORAGE_BASE)
+
+static bool msc_ejected = false;
+
+const mp_obj_type_t *mimxrt_msc_medium = NULL;
+
+// 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]) {
+    memcpy(vendor_id, MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING), 8));
+    memcpy(product_id, MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING), 16));
+    memcpy(product_rev, MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING), 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 (msc_ejected || mimxrt_msc_medium == NULL) {
+        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) {
+    if (mimxrt_msc_medium == &mimxrt_flash_type) {
+        *block_size = BLOCK_SIZE;
+        *block_count = BLOCK_COUNT;
+    #if MICROPY_PY_MACHINE_SDCARD
+    } else if (mimxrt_msc_medium == &machine_sdcard_type) {
+        mimxrt_sdcard_obj_t *card = &mimxrt_sdcard_objs[MSC_SDCARD_INDEX];
+        *block_size = card->block_len;
+        *block_count = card->block_count;
+    #endif
+    }
+}
+
+// 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
+            msc_ejected = false;
+        } else {
+            // unload disk storage
+            msc_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) {
+    if (mimxrt_msc_medium == &mimxrt_flash_type) {
+        flash_read_block(FLASH_BASE_ADDR + lba * BLOCK_SIZE, buffer, bufsize);
+    #if MICROPY_PY_MACHINE_SDCARD
+    } else if (mimxrt_msc_medium == &machine_sdcard_type) {
+        mimxrt_sdcard_obj_t *card = &mimxrt_sdcard_objs[MSC_SDCARD_INDEX];
+        sdcard_read(card, buffer, lba, bufsize / card->block_len);
+    #endif
+    }
+    return bufsize;
+}
+
+// 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) {
+    if (mimxrt_msc_medium == &mimxrt_flash_type) {
+        // Erase count sectors starting at lba
+        for (int n = 0; n < (bufsize / BLOCK_SIZE); n++) {
+            flash_erase_sector(FLASH_BASE_ADDR + (lba + n) * BLOCK_SIZE);
+        }
+        flash_write_block(FLASH_BASE_ADDR + lba * BLOCK_SIZE, buffer, bufsize);
+    #if MICROPY_PY_MACHINE_SDCARD
+    } else if (mimxrt_msc_medium == &machine_sdcard_type) {
+        mimxrt_sdcard_obj_t *card = &mimxrt_sdcard_objs[MSC_SDCARD_INDEX];
+        sdcard_write(card, buffer, lba, bufsize / card->block_len);
+
+    #endif
+    }
+    return bufsize;
+}
+
+// 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

From cb417505f3c39a526162fe8db9365035ea415c98 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 7 Feb 2025 13:39:02 +0100
Subject: [PATCH 1869/3129] mimxrt/boards: Reduce stack size for 1011 and 1015
 MCUs.

Reduced to 16KBs to allow enabling MSC.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/boards/MIMXRT1011.ld | 4 ++--
 ports/mimxrt/boards/MIMXRT1015.ld | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index ab363bd56a025..0e961a49433f2 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -27,8 +27,8 @@ dtcm_size           = 0x00008000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x00010000;
 
-/* 20kiB stack. */
-__stack_size__ = 0x5000;
+/* 16kiB stack. */
+__stack_size__ = 0x4000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
diff --git a/ports/mimxrt/boards/MIMXRT1015.ld b/ports/mimxrt/boards/MIMXRT1015.ld
index 0237d348c2498..58b88e0fe3084 100644
--- a/ports/mimxrt/boards/MIMXRT1015.ld
+++ b/ports/mimxrt/boards/MIMXRT1015.ld
@@ -27,8 +27,8 @@ dtcm_size           = 0x00008000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x00010000;
 
-/* 24kiB stack. */
-__stack_size__ = 0x5000;
+/* 16kiB stack. */
+__stack_size__ = 0x4000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 

From 752c1672af7f516922416e8afe7f4cb42e151cae Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 7 Feb 2025 13:45:44 +0100
Subject: [PATCH 1870/3129] tools/ci.sh: Build MIMXRT1060_EVK with MSC enabled
 as part of mimxrt CI.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 2c647012f144d..ff362efd29e2d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -230,6 +230,8 @@ function ci_mimxrt_build {
     make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK
     make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40 submodules
     make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1060_EVK submodules
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1060_EVK CFLAGS_EXTRA=-DMICROPY_HW_USB_MSC=1
 }
 
 ########################################################################################

From 11c9656fad716d42a33e9f5bc65596300d141daa Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Tue, 19 Sep 2023 11:41:46 +1000
Subject: [PATCH 1871/3129] tools/mpremote: Support mip install from
 package.json on local fs.

Add support for `mpremote mip install package.json` where `package.json` is
a json file on the local filesystem.

Without this, package json files can only be loaded from http, https,
github or gitlab URLs.

This is useful for testing `package.json` files for pacages in development
and for constructing one's own `package.json` files for Python packages
which are not yet available for installation using mip.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 tools/mpremote/mpremote/mip.py | 40 ++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index d23a0e2cbcb4f..4ce62b7f77bbb 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -13,6 +13,8 @@
 
 _PACKAGE_INDEX = "https://micropython.org/pi/v2"
 
+allowed_mip_url_prefixes = ("http://", "https://", "github:", "gitlab:")
+
 
 # This implements os.makedirs(os.dirname(path))
 def _ensure_path_exists(transport, path):
@@ -78,16 +80,25 @@ def _download_file(transport, url, dest):
 
 
 def _install_json(transport, 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}")
+    if package_json_url.startswith(allowed_mip_url_prefixes):
+        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}")
+    elif package_json_url.endswith(".json"):
+        try:
+            with open(package_json_url, "r") as f:
+                package_json = json.load(f)
+        except OSError:
+            raise CommandError(f"Error opening {package_json_url}")
+    else:
+        raise CommandError(f"Invalid url for package: {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}"
@@ -100,12 +111,7 @@ def _install_json(transport, package_json_url, index, target, version, mpy):
 
 
 def _install_package(transport, package, index, target, version, mpy):
-    if (
-        package.startswith("http://")
-        or package.startswith("https://")
-        or package.startswith("github:")
-        or package.startswith("gitlab:")
-    ):
+    if package.startswith(allowed_mip_url_prefixes):
         if package.endswith(".py") or package.endswith(".mpy"):
             print(f"Downloading {package} to {target}")
             _download_file(
@@ -118,6 +124,8 @@ def _install_package(transport, package, index, target, version, mpy):
                     package += "/"
                 package += "package.json"
             print(f"Installing {package} to {target}")
+    elif package.endswith(".json"):
+        pass
     else:
         if not version:
             version = "latest"

From b11ba39c57ef6dd4d5a865464229a2aede9c825e Mon Sep 17 00:00:00 2001
From: Neil Ludban <neil.ludban@mantiumai.com>
Date: Sat, 25 Jan 2025 16:00:24 -0500
Subject: [PATCH 1872/3129] rp2/modules: Fix memory leak and logic bug in
 handling of _pio_funcs.

The `rp2` package use a global dict `_pio_funcs` to populate a namespace
for `@asm_pio` functions to be executed in.  That dict is not cleaned up
after use, keeping references to bound methods of a `PIOASMEmit`.  By not
setting/clearing all the functions, `asm_pio_encode` unintentionally allows
the use of the old directives (harmless) as well as `jmp` (in general,
produces the wrong output).

Fix that by making sure `_pio_funcs` is returned to its original state
after using it:

- For `@asm_pio` update the target dict from `_pio_funcs` and then set
  additional functions as needed, leaving `_pio_funcs` unchanged.

- For `asm_pio_encode`, borrow `_pio_funcs` to use as globals (avoiding a
  bunch of memory alloc/free) but delete the instruction entries after use.

Signed-off-by: Neil Ludban <neil.ludban@gmail.com>
---
 ports/rp2/modules/rp2.py | 91 +++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 49 deletions(-)

diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index e9be7dac8d58e..6068926036baf 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -215,49 +215,46 @@ def set(self, dest, data):
     # "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,
 }
 
 
+_pio_directives = (
+    "wrap_target",
+    "wrap",
+    "label",
+)
+
+
+_pio_instructions = (
+    "word",
+    "nop",
+    "jmp",
+    "wait",
+    "in_",
+    "out",
+    "push",
+    "pull",
+    "mov",
+    "irq",
+    "set",
+)
+
+
 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)
+        gl = f.__globals__
+        old_gl = gl.copy()
+        gl.clear()
+
+        gl.update(_pio_funcs)
+        for name in _pio_directives:
+            gl[name] = getattr(emit, name)
+        for name in _pio_instructions:
+            gl[name] = getattr(emit, name)
 
         emit.start_pass(0)
         f()
@@ -265,8 +262,8 @@ def dec(f):
         emit.start_pass(1)
         f()
 
-        f.__globals__.clear()
-        f.__globals__.update(old_gl)
+        gl.clear()
+        gl.update(old_gl)
 
         return emit.prog
 
@@ -284,19 +281,15 @@ def asm_pio_encode(instr, sideset_count, sideset_opt=False):
     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
-    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)
+    for name in _pio_instructions:
+        gl[name] = getattr(emit, name)
+    gl["jmp"] = None  # emit.jmp currently not supported
+
+    try:
+        exec(instr, gl)
+    finally:
+        for name in _pio_instructions:
+            del gl[name]
 
     if len(emit.prog[_PROG_DATA]) != 1:
         raise PIOASMError("expecting exactly 1 instruction")

From 12dd9cb74598bb0144cb7ac7dcbc5f5631372afa Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 29 Jan 2025 15:18:31 +1100
Subject: [PATCH 1873/3129] docs/esp32: Add documentation for SPI Ethernet
 devices on esp32 port.

Also cross-link with the other WIZNET5K driver, to avoid confusion.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/quickref.rst           | 110 ++++++++++++++++++++++++++----
 docs/library/network.LAN.rst      |   7 +-
 docs/library/network.WIZNET5K.rst |   3 +
 3 files changed, 104 insertions(+), 16 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index c5c2dfb38e570..0780e01300801 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -121,11 +121,20 @@ 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).
 
+.. _esp32_network_lan:
+
 LAN
 ^^^
 
-To use the wired interfaces via :class:`network.LAN` one has to specify the pins
-and mode ::
+Built-in MAC (original ESP32)
+"""""""""""""""""""""""""""""
+
+The original ESP32 SoC has a built-in Ethernet MAC. Using this MAC requires an
+external Ethernet PHY to be wired to the chip's EMAC pins. Most of the EMAC pin
+assignments are fixed, consult the ESP32 datasheet for details.
+
+If the PHY is connected, the internal Ethernet MAC can be configured via
+the :class:`network.LAN` constructor::
 
     import network
 
@@ -134,20 +143,33 @@ and mode ::
     lan.ipconfig('addr4')                 # get the interface's IPv4 addresses
 
 
-The keyword arguments for the constructor defining the PHY type and interface are:
+Required keyword arguments for the constructor:
+
+- ``mdc`` and ``mdio`` - :class:`machine.Pin` objects (or integers) specifying
+  the MDC and MDIO pins.
+- ``phy_type`` - Select the PHY device type. Supported devices are
+  ``PHY_LAN8710``, ``PHY_LAN8720``, ``PHY_IP101``, ``PHY_RTL8201``,
+  ``PHY_DP83848``, ``PHY_KSZ8041`` and ``PHY_KSZ8081``. These values are all
+  constants defined in the ``network`` module.
+- ``phy_addr`` - The address number of the PHY device. Must be an integer in the
+  range 0x00 to 0x1f, inclusive. Common values are ``0`` and ``1``.
+
+All of the above keyword arguments must be present to configure the interface.
+
+Optional keyword arguments:
 
-- mdc=pin-object    # set the mdc and mdio pins.
-- mdio=pin-object
-- reset=pin-object  # set the reset pin of the PHY device.
-- 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.
+- ``reset`` - :class:`machine.Pin` object (or integer) specifying the PHY reset pin.
+- ``power`` - :class:`machine.Pin` object (or integer) specifying a pin which
+  switches the power of the PHY device.
+- ``ref_clk`` - :class:`machine.Pin` object (or integer) specifying the pin used
+  for the EMAC ``ref_clk`` signal. If not specified, the board default is used
+  (typically GPIO 0, but may be different if a particular board has Ethernet.)
+- ``ref_clk_mode`` - Defines whether the EMAC ``ref_clk`` pin of the ESP32
+  should be an input or an output. Suitable values are ``machine.Pin.IN`` and
+  ``machine.Pin.OUT``. If not specified, the board default is used
+  (typically input, but may be different if a particular board has Ethernet.)
 
-These are working configurations for LAN interfaces of popular boards::
+These are working configurations for LAN interfaces of some popular ESP32 boards::
 
     # Olimex ESP32-GATEWAY: power controlled by Pin(5)
     # Olimex ESP32 PoE and ESP32-PoE ISO: power controlled by Pin(12)
@@ -172,6 +194,66 @@ These are working configurations for LAN interfaces of popular boards::
     lan = network.LAN(id=0, mdc=Pin(23), mdio=Pin(18), power=Pin(5),
                       phy_type=network.PHY_IP101, phy_addr=1)
 
+
+.. _esp32_spi_ethernet:
+
+SPI Ethernet Interface
+""""""""""""""""""""""
+
+All ESP32 SoCs support external SPI Ethernet interface chips. These are Ethernet
+interfaces that connect via a SPI bus, rather than an Ethernet RMII interface.
+
+.. note:: The only exception is the ESP32 ``d2wd`` variant, where this feature is disabled
+     to save code size.
+
+SPI Ethernet uses the same :class:`network.LAN` constructor, with a different
+set of keyword arguments::
+
+    import machine, network
+
+    spi = machine.SPI(1, sck=SCK_PIN, mosi=MOSI_PIN, miso=MISO_PIN)
+    lan = network.LAN(spi=spi, cs=CS_PIN, ...)   # Set the pin and mode configuration
+    lan.active(True)                             # activate the interface
+    lan.ipconfig('addr4')                        # get the interface's IPv4 addresses
+
+Required keyword arguments for the constructor:
+
+- ``spi`` - Should be a :class:`machine.SPI` object configured for this
+  connection. Note that any clock speed configured on the SPI object is ignored,
+  the SPI Ethernet clock speed is configured at compile time.
+- ``cs`` - :class:`machine.Pin` object (or integer) specifying the CS pin
+  connected to the interface.
+- ``int`` - :class:`machine.Pin` object (or integer) specifying the INT pin
+  connected to the interface.
+- ``phy_type`` - Select the SPI Ethernet interface type. Supported devices are
+  ``PHY_KSZ8851SNL``, ``PHY_DM9051``, ``PHY_W5500``. These values are all
+  constants defined in the ``network`` module.
+- ``phy_addr`` - The address number of the PHY device. Must be an integer in the
+  range 0x00 to 0x1f, inclusive. This is usually ``0`` for SPI Ethernet devices.
+
+All of the above keyword arguments must be present to configure the interface.
+
+Optional keyword arguments for the constructor:
+
+- ``reset`` - :class:`machine.Pin` object (or integer) specifying the SPI Ethernet
+  interface reset pin.
+- ``power`` - :class:`machine.Pin` object (or integer) specifying a pin which
+  switches the power of the SPI Ethernet interface.
+
+Here is a sample configuration for a WIZNet W5500 chip connected to pins on
+an ESP32-S3 development board::
+
+    import machine, network
+    from machine import Pin, SPI
+
+    spi = SPI(1, sck=Pin(12), mosi=Pin(13), miso=Pin(14))
+    lan = network.LAN(spi=spi, phy_type=network.PHY_W5500, phy_addr=0,
+                      cs=Pin(10), int=Pin(11))
+
+.. note:: WIZnet W5500 Ethernet is also supported on some other MicroPython
+          ports, but using a :ref:`different software interface
+          <network.WIZNET5K>`.
+
 Delay and timing
 ----------------
 
diff --git a/docs/library/network.LAN.rst b/docs/library/network.LAN.rst
index 31ce8e98411c2..1b3c19c560b36 100644
--- a/docs/library/network.LAN.rst
+++ b/docs/library/network.LAN.rst
@@ -6,7 +6,7 @@ class LAN -- control an Ethernet module
 
 This class allows you to control the Ethernet interface. The PHY hardware type is board-specific.
 
-Example usage::
+Example usage, for a board with built-in LAN support::
 
     import network
     nic = network.LAN(0)
@@ -32,7 +32,7 @@ Constructors
      - *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.
      - *ref_clk_mode* specifies, whether the data clock is provided by the Ethernet controller or
-       the PYH interface.
+       the PHY 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.
@@ -41,6 +41,9 @@ Constructors
 
      nic = LAN(0, phy_type=LAN.PHY_LAN8720, phy_addr=1, ref_clk_mode=Pin.IN)
 
+   .. note:: On esp32 port the constructor requires different arguments. See
+             :ref:`esp32 port reference <esp32_network_lan>`.
+
 Methods
 -------
 
diff --git a/docs/library/network.WIZNET5K.rst b/docs/library/network.WIZNET5K.rst
index a19bd45282399..d0778a7a37ce8 100644
--- a/docs/library/network.WIZNET5K.rst
+++ b/docs/library/network.WIZNET5K.rst
@@ -9,6 +9,9 @@ the W5200 and W5500 chipsets.  The particular chipset that is supported
 by the firmware is selected at compile-time via the MICROPY_PY_NETWORK_WIZNET5K
 option.
 
+.. note:: The esp32 port also supports WIZnet W5500 chipsets, but this port
+          uses the :ref:`network.LAN interface <esp32_spi_ethernet>`.
+
 Example usage::
 
     import network

From bab099826e956bcc000b8a3c45b144c97d870fe2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 28 Jan 2025 11:54:57 +1100
Subject: [PATCH 1874/3129] docs: Note which ports have default or optional
 network.PPP support.

Also add the default values of these macros to the respective
`mpconfigport.h` files, to improve discoverability.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/network.PPP.rst |  7 ++++++-
 ports/rp2/mpconfigport.h     |  4 ++++
 ports/stm32/mpconfigport.h   | 14 +++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/docs/library/network.PPP.rst b/docs/library/network.PPP.rst
index 17a8d1c1cd89d..15ab1da193448 100644
--- a/docs/library/network.PPP.rst
+++ b/docs/library/network.PPP.rst
@@ -5,7 +5,12 @@ class PPP -- create network connections over serial PPP
 =======================================================
 
 This class allows you to create a network connection over a serial port using
-the PPP protocol.  It is only available on selected ports and boards.
+the PPP protocol.
+
+.. note:: Currently only the esp32 port has PPP support enabled in the default
+          firmware build. PPP support can be enabled in custom builds of the
+          stm32 and rp2 ports by enabling networking support and setting
+          ``MICROPY_PY_NETWORK_PPP_LWIP`` to 1.
 
 Example usage::
 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index bc289bcbf97cf..fe8287ba1d6e5 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -212,6 +212,10 @@
 #ifndef MICROPY_PY_WEBREPL
 #define MICROPY_PY_WEBREPL              (1)
 #endif
+
+#ifndef MICROPY_PY_NETWORK_PPP_LWIP
+#define MICROPY_PY_NETWORK_PPP_LWIP     (0)
+#endif
 #endif
 
 #if MICROPY_PY_NETWORK_CYW43
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index dc0a767fb07ee..2b57446ee8233 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -146,9 +146,6 @@
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)
 #define MICROPY_PY_WEBSOCKET        (MICROPY_PY_LWIP)
 #define MICROPY_PY_WEBREPL          (MICROPY_PY_LWIP)
-#ifndef MICROPY_PY_SOCKET
-#define MICROPY_PY_SOCKET           (1)
-#endif
 #ifndef MICROPY_PY_NETWORK
 #define MICROPY_PY_NETWORK          (1)
 #endif
@@ -156,6 +153,17 @@
 #define MICROPY_PY_ONEWIRE          (1)
 #endif
 
+// optional network features
+#if MICROPY_PY_NETWORK
+#ifndef MICROPY_PY_SOCKET
+#define MICROPY_PY_SOCKET           (1)
+#endif
+
+#ifndef MICROPY_PY_NETWORK_PPP_LWIP
+#define MICROPY_PY_NETWORK_PPP_LWIP     (0)
+#endif
+#endif
+
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN       (2)
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */

From 0a55f1f40c8a0a69f34f550d45138d9ba7a1d467 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 4 Feb 2025 12:20:38 +1100
Subject: [PATCH 1875/3129] docs/reference: Add strings vs bytes to speed
 optimisation tips.

Also add some additional context links, suggestions for alternative
classes, etc.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/array.rst          |  4 ++++
 docs/library/builtins.rst       |  4 ++++
 docs/reference/speed_python.rst | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/docs/library/array.rst b/docs/library/array.rst
index f417a7046e2ff..957260c2c7f92 100644
--- a/docs/library/array.rst
+++ b/docs/library/array.rst
@@ -19,6 +19,10 @@ Classes
     array are given by *iterable*. If it is not provided, an empty
     array is created.
 
+    In addition to the methods below, array objects also implement the buffer
+    protocol. This means the contents of the entire array can be accessed as raw
+    bytes via a `memoryview` or other interfaces which use this protocol.
+
     .. method:: append(val)
 
         Append new element *val* to the end of array, growing it.
diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 5956aea7ab20f..b5d08ba7fed50 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -19,6 +19,8 @@ Functions and types
 
 .. class:: bytearray()
 
+    |see_cpython| `python:bytearray`.
+
 .. class:: bytes()
 
     |see_cpython| `python:bytes`.
@@ -104,6 +106,8 @@ Functions and types
 
 .. class:: memoryview()
 
+    |see_cpython| `python:memoryview`.
+
 .. function:: min()
 
 .. function:: next()
diff --git a/docs/reference/speed_python.rst b/docs/reference/speed_python.rst
index 0c68dd60bdedc..a660432f6da37 100644
--- a/docs/reference/speed_python.rst
+++ b/docs/reference/speed_python.rst
@@ -57,6 +57,8 @@ and used in various methods.
 
 This is covered in further detail :ref:`Controlling garbage collection <controlling_gc>` below.
 
+.. _speed_buffers:
+
 Buffers
 ~~~~~~~
 
@@ -69,6 +71,13 @@ example, objects which support stream interface (e.g., file or UART) provide ``r
 method which allocates new buffer for read data, but also a ``readinto()`` method
 to read data into an existing buffer.
 
+Some useful classes for creating reusable buffer objects:
+
+- :class:`bytearray`
+- :mod:`array` (:ref:`discussed below<speed_arrays>`)
+- :class:`io.StringIO` and :class:`io.BytesIO`
+- :class:`micropython.RingIO`
+
 Floating point
 ~~~~~~~~~~~~~~
 
@@ -80,15 +89,20 @@ point to sections of the code where performance is not paramount. For example,
 capture ADC readings as integers values to an array in one quick go, and only then
 convert them to floating-point numbers for signal processing.
 
+.. _speed_arrays:
+
 Arrays
 ~~~~~~
 
 Consider the use of the various types of array classes as an alternative to lists.
-The `array` module supports various element types with 8-bit elements supported
+The :mod:`array` module supports various element types with 8-bit elements supported
 by Python's built in `bytes` and `bytearray` classes. These data structures all store
 elements in contiguous memory locations. Once again to avoid memory allocation in critical
 code these should be pre-allocated and passed as arguments or as bound objects.
 
+Memoryviews
+~~~~~~~~~~~
+
 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. The `memoryview` itself
@@ -118,6 +132,23 @@ of buffer and fills in entire buffer. What if you need to put data in the
 middle of existing buffer? Just create a memoryview into the needed section
 of buffer and pass it to ``readinto()``.
 
+Strings vs Bytes
+~~~~~~~~~~~~~~~~
+
+MicroPython uses :ref:`string interning <qstr>` to save space when there are
+multiple identical strings. Each time a new string is allocated at runtime (for
+example, when two other strings are concatenated), MicroPython checks whether
+the new string can be interned to save RAM.
+
+If you have code which performs performance-critical string operations then
+consider using :class:`bytes` objects and literals (i.e. ``b"abc"``). This skips
+the interning check, and can be several times faster than performing the same
+operations with string objects.
+
+.. note:: The fastest performance will always be achieved by avoiding new object
+          creation entirely, for example with a reusable :ref:`buffer as described
+          above<speed_buffers>`.
+
 Identifying the slowest section of code
 ---------------------------------------
 

From 3b6252466139d5dfc7458eeea5d759b6c9850146 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 10 Feb 2025 17:20:29 +0100
Subject: [PATCH 1876/3129] docs/library/espnow: Clarify usage of the "rate"
 configuration key.

This commit adds a clarification for the ESPNow module's documentation
regarding its "config" method.

The original documentation for that method could be interpreted as having
all its configuration keys being able to be queried, but the "rate"
configuration key is actually write-only due to ESP-IDF's lack of a way to
retrieve that bit of information from the radio's configuration.  The
documentation changes highlight the fact that said configuration key is
actually write-only.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/library/espnow.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/library/espnow.rst b/docs/library/espnow.rst
index 379e60486f224..84e9e9465de96 100644
--- a/docs/library/espnow.rst
+++ b/docs/library/espnow.rst
@@ -164,11 +164,13 @@ Configuration
         wait forever. The timeout can also be provided as arg to
         `recv()`/`irecv()`/`recvinto()`.
 
-        *rate*: (ESP32 only, IDF>=4.3.0 only) Set the transmission speed for
+        *rate*: (ESP32 only) Set the transmission speed for
         ESPNow packets. Must be set to a number from the allowed numeric values
         in `enum wifi_phy_rate_t
-        <https://docs.espressif.com/projects/esp-idf/en/v4.4.1/esp32/
-        api-reference/network/esp_wifi.html#_CPPv415wifi_phy_rate_t>`_.
+        <https://docs.espressif.com/projects/esp-idf/en/v5.2.3/esp32/
+        api-reference/network/esp_wifi.html#_CPPv415wifi_phy_rate_t>`_. This
+        parameter is actually *write-only* due to ESP-IDF not providing any
+        means for querying the radio interface's rate parameter.
 
     .. data:: Returns:
 

From 372ecfef02eccc4e52a5d0abef068c7d25fc4315 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Jan 2025 00:56:59 +1100
Subject: [PATCH 1877/3129] tests/run-tests.py: Give more information when
 CPython crashes.

To make it easier to diagnose why CPython crashed.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 1df1b35d23b83..b108b16395074 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -955,8 +955,8 @@ def run_one_test(test_file):
                         cwd=os.path.dirname(test_file),
                         stderr=subprocess.STDOUT,
                     )
-                except subprocess.CalledProcessError:
-                    output_expected = b"CPYTHON3 CRASH"
+                except subprocess.CalledProcessError as er:
+                    output_expected = b"CPYTHON3 CRASH:\n" + er.output
 
             # Canonical form for all host platforms is to use \n for end-of-line.
             output_expected = output_expected.replace(b"\r\n", b"\n")

From 62e821ccb82fd8362a8198ad59ccb51b8a5c441e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 19 Jan 2025 23:30:59 +1100
Subject: [PATCH 1878/3129] py/objcode: Factor code object out into its own
 file.

The `mp_obj_code_t` and `mp_type_code` code object was defined internally
in both `py/builtinevex.c` and `py/profile.c`, with completely different
implementations (the former very minimal, the latter quite complete).

This commit factors these implementations into a new, separate source file,
and allows the code object to have four different modes, selected at
compile-time:

- MICROPY_PY_BUILTINS_CODE_NONE: code object not included in the build.

- MICROPY_PY_BUILTINS_CODE_MINIMUM: very simple code object that just holds
  a reference to the function that it represents.  This level is used when
  MICROPY_PY_BUILTINS_COMPILE is enabled.

- MICROPY_PY_BUILTINS_CODE_BASIC: simple code object that holds a reference
  to the proto-function and its constants.

- MICROPY_PY_BUILTINS_CODE_FULL: almost complete implementation of the code
  object.  This level is used when MICROPY_PY_SYS_SETTRACE is enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtinevex.c |  51 +++++++++-----
 py/compile.c     |   2 +-
 py/compile.h     |   5 +-
 py/mpconfig.h    |   9 +++
 py/obj.h         |   1 +
 py/objcode.c     | 175 +++++++++++++++++++++++++++++++++++++++++++++++
 py/objcode.h     |  99 +++++++++++++++++++++++++++
 py/profile.c     | 140 ++-----------------------------------
 py/profile.h     |  12 +---
 py/py.cmake      |   1 +
 py/py.mk         |   1 +
 py/runtime.c     |   7 +-
 12 files changed, 337 insertions(+), 166 deletions(-)
 create mode 100644 py/objcode.c
 create mode 100644 py/objcode.h

diff --git a/py/builtinevex.c b/py/builtinevex.c
index e25cbd4d08502..74a4640492674 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 
+#include "py/objcode.h"
 #include "py/objfun.h"
 #include "py/compile.h"
 #include "py/runtime.h"
@@ -33,17 +34,6 @@
 
 #if MICROPY_PY_BUILTINS_COMPILE
 
-typedef struct _mp_obj_code_t {
-    mp_obj_base_t base;
-    mp_obj_t module_fun;
-} mp_obj_code_t;
-
-static MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_code,
-    MP_QSTR_code,
-    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) {
     // save context
     nlr_jump_callback_node_globals_locals_t ctx;
@@ -57,19 +47,28 @@ static mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj
     // set exception handler to restore context if an exception is raised
     nlr_push_jump_callback(&ctx.callback, mp_globals_locals_set_from_nlr_jump_callback);
 
+    #if MICROPY_PY_BUILTINS_CODE >= MICROPY_PY_BUILTINS_CODE_BASIC
+    mp_module_context_t *module_context = m_new_obj(mp_module_context_t);
+    module_context->module.base.type = &mp_type_module;
+    module_context->module.globals = globals;
+    module_context->constants = *mp_code_get_constants(self);
+    mp_obj_t module_fun = mp_make_function_from_proto_fun(mp_code_get_proto_fun(self), module_context, NULL);
+    #else
     // The call to mp_parse_compile_execute() in mp_builtin_compile() below passes
     // NULL for the globals, so repopulate that entry now with the correct globals.
+    mp_obj_t module_fun = self->module_fun;
     if (mp_obj_is_type(self->module_fun, &mp_type_fun_bc)
         #if MICROPY_EMIT_NATIVE
         || mp_obj_is_type(self->module_fun, &mp_type_fun_native)
         #endif
         ) {
-        mp_obj_fun_bc_t *fun_bc = MP_OBJ_TO_PTR(self->module_fun);
+        mp_obj_fun_bc_t *fun_bc = MP_OBJ_TO_PTR(module_fun);
         ((mp_module_context_t *)fun_bc->context)->module.globals = globals;
     }
+    #endif
 
     // execute code
-    mp_obj_t ret = mp_call_function_0(self->module_fun);
+    mp_obj_t ret = mp_call_function_0(module_fun);
 
     // deregister exception handler and restore context
     nlr_pop_jump_callback(true);
@@ -108,9 +107,29 @@ 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 = 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);
+    #if MICROPY_PY_BUILTINS_CODE >= MICROPY_PY_BUILTINS_CODE_BASIC
+
+    mp_parse_tree_t parse_tree = mp_parse(lex, parse_input_kind);
+    mp_module_context_t ctx;
+    ctx.module.globals = NULL;
+    mp_compiled_module_t cm;
+    cm.context = &ctx;
+    mp_compile_to_raw_code(&parse_tree, lex->source_name, parse_input_kind == MP_PARSE_SINGLE_INPUT, &cm);
+
+    #if MICROPY_PY_BUILTINS_CODE >= MICROPY_PY_BUILTINS_CODE_FULL
+    mp_module_context_t *ctx_ptr = m_new_obj(mp_module_context_t);
+    *ctx_ptr = ctx;
+    return mp_obj_new_code(ctx_ptr, cm.rc, true);
+    #else
+    return mp_obj_new_code(ctx.constants, cm.rc);
+    #endif
+
+    #else
+
+    mp_obj_t module_fun = mp_parse_compile_execute(lex, parse_input_kind, NULL, NULL);
+    return mp_obj_new_code(module_fun);
+
+    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_compile_obj, 3, 6, mp_builtin_compile);
 
diff --git a/py/compile.c b/py/compile.c
index 60f06d7773e34..7a1151bcd66f0 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3467,7 +3467,7 @@ static void scope_compute_things(scope_t *scope) {
     }
 }
 
-#if !MICROPY_PERSISTENT_CODE_SAVE
+#if !MICROPY_EXPOSE_MP_COMPILE_TO_RAW_CODE
 static
 #endif
 void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_compiled_module_t *cm) {
diff --git a/py/compile.h b/py/compile.h
index f9970a521d644..64afc487d7c3d 100644
--- a/py/compile.h
+++ b/py/compile.h
@@ -30,6 +30,9 @@
 #include "py/parse.h"
 #include "py/emitglue.h"
 
+// Whether mp_compile_to_raw_code is exposed as a public function.
+#define MICROPY_EXPOSE_MP_COMPILE_TO_RAW_CODE (MICROPY_PY_BUILTINS_CODE >= MICROPY_PY_BUILTINS_CODE_BASIC || MICROPY_PERSISTENT_CODE_SAVE)
+
 #if MICROPY_COMP_ALLOW_TOP_LEVEL_AWAIT
 // set to `true` to allow top-level await expressions
 extern bool mp_compile_allow_top_level_await;
@@ -40,7 +43,7 @@ extern bool mp_compile_allow_top_level_await;
 // 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
+#if MICROPY_EXPOSE_MP_COMPILE_TO_RAW_CODE
 // this has the same semantics as mp_compile
 void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_compiled_module_t *cm);
 #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 64138a9ea7acc..76aff4681d32a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1129,6 +1129,15 @@ typedef double mp_float_t;
 #define MICROPY_PY_BUILTINS_BYTEARRAY (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Whether to support code objects, and how many features they have
+#define MICROPY_PY_BUILTINS_CODE_NONE       (0)
+#define MICROPY_PY_BUILTINS_CODE_MINIMUM    (1)
+#define MICROPY_PY_BUILTINS_CODE_BASIC      (2)
+#define MICROPY_PY_BUILTINS_CODE_FULL       (3)
+#ifndef MICROPY_PY_BUILTINS_CODE
+#define MICROPY_PY_BUILTINS_CODE            (MICROPY_PY_SYS_SETTRACE ? MICROPY_PY_BUILTINS_CODE_FULL : (MICROPY_PY_BUILTINS_COMPILE ? MICROPY_PY_BUILTINS_CODE_MINIMUM : MICROPY_PY_BUILTINS_CODE_NONE))
+#endif
+
 // Whether to support dict.fromkeys() class method
 #ifndef MICROPY_PY_BUILTINS_DICT_FROMKEYS
 #define MICROPY_PY_BUILTINS_DICT_FROMKEYS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
diff --git a/py/obj.h b/py/obj.h
index bd31ef11d0928..93d1e0ee34349 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -840,6 +840,7 @@ extern const mp_obj_type_t mp_type_fun_bc;
 extern const mp_obj_type_t mp_type_fun_native;
 extern const mp_obj_type_t mp_type_fun_viper;
 extern const mp_obj_type_t mp_type_fun_asm;
+extern const mp_obj_type_t mp_type_code;
 extern const mp_obj_type_t mp_type_module;
 extern const mp_obj_type_t mp_type_staticmethod;
 extern const mp_obj_type_t mp_type_classmethod;
diff --git a/py/objcode.c b/py/objcode.c
new file mode 100644
index 0000000000000..9b98a696798d4
--- /dev/null
+++ b/py/objcode.c
@@ -0,0 +1,175 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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/objcode.h"
+
+#if MICROPY_PY_BUILTINS_CODE == MICROPY_PY_BUILTINS_CODE_NONE
+
+// Code object not implemented at this configuration level.
+
+#elif MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_BASIC
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_code,
+    MP_QSTR_code,
+    MP_TYPE_FLAG_NONE
+    );
+
+#elif MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_FULL
+
+#include "py/profile.h"
+
+static void code_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
+    (void)kind;
+    mp_obj_code_t *o = MP_OBJ_TO_PTR(o_in);
+    const mp_raw_code_t *rc = o->rc;
+    const mp_bytecode_prelude_t *prelude = &rc->prelude;
+    mp_printf(print,
+        "<code object %q at 0x%p, file \"%q\", line %d>",
+        MP_CODE_QSTR_MAP(o->context, prelude->qstr_block_name_idx),
+        o,
+        MP_CODE_QSTR_MAP(o->context, 0),
+        rc->line_of_definition
+        );
+}
+
+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 (size_t i = 0; i < rc->n_children; ++i) {
+        mp_obj_t code = mp_obj_new_code(context, rc->children[i], true);
+        consts->items[const_no++] = code;
+    }
+    consts->items[const_no++] = mp_const_none;
+
+    return consts;
+}
+
+static mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
+    // const mp_bytecode_prelude_t *prelude = &rc->prelude;
+    uint start = 0;
+    uint stop = rc->fun_data_len - start;
+
+    uint last_lineno = mp_prof_bytecode_lineno(rc, start);
+    uint lasti = 0;
+
+    const uint buffer_chunk_size = (stop - start) >> 2; // heuristic magic
+    uint buffer_size = buffer_chunk_size;
+    byte *buffer = m_new(byte, buffer_size);
+    uint buffer_index = 0;
+
+    for (uint i = start; i < stop; ++i) {
+        uint lineno = mp_prof_bytecode_lineno(rc, i);
+        size_t line_diff = lineno - last_lineno;
+        if (line_diff > 0) {
+            uint instr_diff = (i - start) - lasti;
+
+            assert(instr_diff < 256);
+            assert(line_diff < 256);
+
+            if (buffer_index + 2 > buffer_size) {
+                buffer = m_renew(byte, buffer, buffer_size, buffer_size + buffer_chunk_size);
+                buffer_size = buffer_size + buffer_chunk_size;
+            }
+            last_lineno = lineno;
+            lasti = i - start;
+            buffer[buffer_index++] = instr_diff;
+            buffer[buffer_index++] = line_diff;
+        }
+    }
+
+    mp_obj_t o = mp_obj_new_bytes(buffer, buffer_index);
+    m_del(byte, buffer, buffer_size);
+    return o;
+}
+
+static void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    if (dest[0] != MP_OBJ_NULL) {
+        // not load attribute
+        return;
+    }
+    mp_obj_code_t *o = MP_OBJ_TO_PTR(self_in);
+    const mp_raw_code_t *rc = o->rc;
+    const mp_bytecode_prelude_t *prelude = &rc->prelude;
+    switch (attr) {
+        case MP_QSTR_co_code:
+            dest[0] = mp_obj_new_bytes(
+                (void *)prelude->opcodes,
+                rc->fun_data_len - (prelude->opcodes - (const byte *)rc->fun_data)
+                );
+            break;
+        case MP_QSTR_co_consts:
+            dest[0] = MP_OBJ_FROM_PTR(code_consts(o->context, rc));
+            break;
+        case MP_QSTR_co_filename:
+            dest[0] = MP_OBJ_NEW_QSTR(MP_CODE_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(MP_CODE_QSTR_MAP(o->context, prelude->qstr_block_name_idx));
+            break;
+        case MP_QSTR_co_names:
+            dest[0] = MP_OBJ_FROM_PTR(o->dict_locals);
+            break;
+        case MP_QSTR_co_lnotab:
+            if (!o->lnotab) {
+                o->lnotab = raw_code_lnotab(rc);
+            }
+            dest[0] = o->lnotab;
+            break;
+    }
+}
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_code,
+    MP_QSTR_code,
+    MP_TYPE_FLAG_NONE,
+    print, code_print,
+    attr, code_attr
+    );
+
+mp_obj_t mp_obj_new_code(const mp_module_context_t *context, const mp_raw_code_t *rc, bool result_required) {
+    mp_obj_code_t *o;
+    if (result_required) {
+        o = m_new_obj(mp_obj_code_t);
+    } else {
+        o = m_new_obj_maybe(mp_obj_code_t);
+        if (o == NULL) {
+            return MP_OBJ_NULL;
+        }
+    }
+    o->base.type = &mp_type_code;
+    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;
+    return MP_OBJ_FROM_PTR(o);
+}
+
+#endif
diff --git a/py/objcode.h b/py/objcode.h
new file mode 100644
index 0000000000000..8db9a34b6e1c9
--- /dev/null
+++ b/py/objcode.h
@@ -0,0 +1,99 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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_PY_OBJCODE_H
+#define MICROPY_INCLUDED_PY_OBJCODE_H
+
+#include "py/bc.h"
+
+#if MICROPY_PY_BUILTINS_CODE == MICROPY_PY_BUILTINS_CODE_NONE
+
+// Code object not implemented at this configuration level.
+
+#elif MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_MINIMUM
+
+typedef struct _mp_obj_code_t {
+    mp_obj_base_t base;
+    mp_obj_t module_fun;
+} mp_obj_code_t;
+
+static inline mp_obj_t mp_obj_new_code(mp_obj_t module_fun) {
+    mp_obj_code_t *code = mp_obj_malloc(mp_obj_code_t, &mp_type_code);
+    code->module_fun = module_fun;
+    return MP_OBJ_FROM_PTR(code);
+}
+
+#elif MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_BASIC
+
+typedef struct _mp_obj_code_t {
+    mp_obj_base_t base;
+    mp_module_constants_t constants;
+    const void *proto_fun;
+} mp_obj_code_t;
+
+static inline mp_obj_t mp_obj_new_code(const mp_module_constants_t constants, const void *proto_fun) {
+    mp_obj_code_t *code = mp_obj_malloc(mp_obj_code_t, &mp_type_code);
+    code->constants = constants;
+    code->proto_fun = proto_fun;
+    return MP_OBJ_FROM_PTR(code);
+}
+
+static inline const mp_module_constants_t *mp_code_get_constants(mp_obj_code_t *self) {
+    return &self->constants;
+}
+
+static inline const void *mp_code_get_proto_fun(mp_obj_code_t *self) {
+    return self->proto_fun;
+}
+
+#elif MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_FULL
+
+#include "py/emitglue.h"
+
+#define MP_CODE_QSTR_MAP(context, idx) (context->constants.qstr_table[idx])
+
+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;
+} mp_obj_code_t;
+
+mp_obj_t mp_obj_new_code(const mp_module_context_t *context, const mp_raw_code_t *rc, bool result_required);
+
+static inline const mp_module_constants_t *mp_code_get_constants(mp_obj_code_t *self) {
+    return &self->context->constants;
+}
+
+static inline const void *mp_code_get_proto_fun(mp_obj_code_t *self) {
+    // A mp_raw_code_t is always a proto_fun (but not the other way around).
+    return self->rc;
+}
+
+#endif
+
+#endif // MICROPY_INCLUDED_PY_OBJCODE_H
diff --git a/py/profile.c b/py/profile.c
index 92f414ace7c92..397d0291f9fad 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -38,9 +38,8 @@
 #endif
 
 #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) {
+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, prelude->line_info_top, bc);
 }
@@ -68,137 +67,6 @@ void mp_prof_extract_prelude(const byte *bytecode, mp_bytecode_prelude_t *prelud
     prelude->line_info = ip;
 }
 
-/******************************************************************************/
-// code object
-
-static void code_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_code_t *o = MP_OBJ_TO_PTR(o_in);
-    const mp_raw_code_t *rc = o->rc;
-    const mp_bytecode_prelude_t *prelude = &rc->prelude;
-    mp_printf(print,
-        "<code object %q at 0x%p, file \"%q\", line %d>",
-        QSTR_MAP(o->context, prelude->qstr_block_name_idx),
-        o,
-        QSTR_MAP(o->context, 0),
-        rc->line_of_definition
-        );
-}
-
-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 (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));
-        }
-        consts->items[const_no++] = code;
-    }
-    consts->items[const_no++] = mp_const_none;
-
-    return consts;
-}
-
-static mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
-    // const mp_bytecode_prelude_t *prelude = &rc->prelude;
-    uint start = 0;
-    uint stop = rc->fun_data_len - start;
-
-    uint last_lineno = mp_prof_bytecode_lineno(rc, start);
-    uint lasti = 0;
-
-    const uint buffer_chunk_size = (stop - start) >> 2; // heuristic magic
-    uint buffer_size = buffer_chunk_size;
-    byte *buffer = m_new(byte, buffer_size);
-    uint buffer_index = 0;
-
-    for (uint i = start; i < stop; ++i) {
-        uint lineno = mp_prof_bytecode_lineno(rc, i);
-        size_t line_diff = lineno - last_lineno;
-        if (line_diff > 0) {
-            uint instr_diff = (i - start) - lasti;
-
-            assert(instr_diff < 256);
-            assert(line_diff < 256);
-
-            if (buffer_index + 2 > buffer_size) {
-                buffer = m_renew(byte, buffer, buffer_size, buffer_size + buffer_chunk_size);
-                buffer_size = buffer_size + buffer_chunk_size;
-            }
-            last_lineno = lineno;
-            lasti = i - start;
-            buffer[buffer_index++] = instr_diff;
-            buffer[buffer_index++] = line_diff;
-        }
-    }
-
-    mp_obj_t o = mp_obj_new_bytes(buffer, buffer_index);
-    m_del(byte, buffer, buffer_size);
-    return o;
-}
-
-static void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    if (dest[0] != MP_OBJ_NULL) {
-        // not load attribute
-        return;
-    }
-    mp_obj_code_t *o = MP_OBJ_TO_PTR(self_in);
-    const mp_raw_code_t *rc = o->rc;
-    const mp_bytecode_prelude_t *prelude = &rc->prelude;
-    switch (attr) {
-        case MP_QSTR_co_code:
-            dest[0] = mp_obj_new_bytes(
-                (void *)prelude->opcodes,
-                rc->fun_data_len - (prelude->opcodes - (const byte *)rc->fun_data)
-                );
-            break;
-        case MP_QSTR_co_consts:
-            dest[0] = MP_OBJ_FROM_PTR(code_consts(o->context, rc));
-            break;
-        case MP_QSTR_co_filename:
-            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(QSTR_MAP(o->context, prelude->qstr_block_name_idx));
-            break;
-        case MP_QSTR_co_names:
-            dest[0] = MP_OBJ_FROM_PTR(o->dict_locals);
-            break;
-        case MP_QSTR_co_lnotab:
-            if (!o->lnotab) {
-                o->lnotab = raw_code_lnotab(rc);
-            }
-            dest[0] = o->lnotab;
-            break;
-    }
-}
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_settrace_codeobj,
-    MP_QSTR_code,
-    MP_TYPE_FLAG_NONE,
-    print, code_print,
-    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);
-    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;
-    return MP_OBJ_FROM_PTR(o);
-}
-
 /******************************************************************************/
 // frame object
 
@@ -211,9 +79,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,
-        QSTR_MAP(code->context, 0),
+        MP_CODE_QSTR_MAP(code->context, 0),
         frame->lineno,
-        QSTR_MAP(code->context, prelude->qstr_block_name_idx)
+        MP_CODE_QSTR_MAP(code->context, prelude->qstr_block_name_idx)
         );
 }
 
@@ -265,7 +133,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->context, 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, false));
     if (code == NULL) {
         return MP_OBJ_NULL;
     }
diff --git a/py/profile.h b/py/profile.h
index 7f3f914034623..db72b9f076818 100644
--- a/py/profile.h
+++ b/py/profile.h
@@ -28,20 +28,12 @@
 #define MICROPY_INCLUDED_PY_PROFILING_H
 
 #include "py/emitglue.h"
+#include "py/objcode.h"
 
 #if MICROPY_PY_SYS_SETTRACE
 
 #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;
-} mp_obj_code_t;
-
 typedef struct _mp_obj_frame_t {
     mp_obj_base_t base;
     const mp_code_state_t *code_state;
@@ -53,9 +45,9 @@ typedef struct _mp_obj_frame_t {
     bool trace_opcodes;
 } mp_obj_frame_t;
 
+uint mp_prof_bytecode_lineno(const mp_raw_code_t *rc, size_t bc);
 void mp_prof_extract_prelude(const byte *bytecode, mp_bytecode_prelude_t *prelude);
 
-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/py.cmake b/py/py.cmake
index 0fee74ddcb489..1c81ed4c58f32 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -72,6 +72,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/objattrtuple.c
     ${MICROPY_PY_DIR}/objbool.c
     ${MICROPY_PY_DIR}/objboundmeth.c
+    ${MICROPY_PY_DIR}/objcode.c
     ${MICROPY_PY_DIR}/objcell.c
     ${MICROPY_PY_DIR}/objclosure.c
     ${MICROPY_PY_DIR}/objcomplex.c
diff --git a/py/py.mk b/py/py.mk
index c0b7e1ac8b90e..e352d89792bfd 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -149,6 +149,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	objboundmeth.o \
 	objcell.o \
 	objclosure.o \
+	objcode.o \
 	objcomplex.o \
 	objdeque.o \
 	objdict.o \
diff --git a/py/runtime.c b/py/runtime.c
index deb55bf283abc..bf26921f9ab9f 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1620,10 +1620,13 @@ mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_i
     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) {
+    #if MICROPY_PY_BUILTINS_COMPILE && MICROPY_PY_BUILTINS_CODE == MICROPY_PY_BUILTINS_CODE_MINIMUM
+    if (globals == NULL) {
         // for compile only, return value is the module function
         ret = module_fun;
-    } else {
+    } else
+    #endif
+    {
         // execute module function and get return value
         ret = mp_call_function_0(module_fun);
     }

From ceb8ba60b4fea0c32e4977d0e45d5c0203b27b34 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 20 Jan 2025 22:23:48 +1100
Subject: [PATCH 1879/3129] py/objfun: Implement function.__code__ and function
 constructor.

This allows retrieving the code object of a function using
`function.__code__`, and then reconstructing a function from a code object
using `FunctionType(code_object)`.

This feature is controlled by `MICROPY_PY_FUNCTION_ATTRS_CODE` and is
enabled at the full-features level.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h                                 |  7 ++-
 py/objfun.c                                   | 47 +++++++++++++++++++
 tests/basics/fun_code.py                      | 36 ++++++++++++++
 tests/basics/fun_code_micropython.py          | 19 ++++++++
 tests/basics/fun_code_micropython.py.exp      |  1 +
 tests/basics/subclass_native1.py              |  6 +--
 tests/micropython/native_fun_attrs_code.py    | 21 +++++++++
 .../micropython/native_fun_attrs_code.py.exp  |  1 +
 8 files changed, 133 insertions(+), 5 deletions(-)
 create mode 100644 tests/basics/fun_code.py
 create mode 100644 tests/basics/fun_code_micropython.py
 create mode 100644 tests/basics/fun_code_micropython.py.exp
 create mode 100644 tests/micropython/native_fun_attrs_code.py
 create mode 100644 tests/micropython/native_fun_attrs_code.py.exp

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 76aff4681d32a..5c4d19bb56f11 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1041,6 +1041,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_FUNCTION_ATTRS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether to implement the __code__ attribute on functions, and function constructor
+#ifndef MICROPY_PY_FUNCTION_ATTRS_CODE
+#define MICROPY_PY_FUNCTION_ATTRS_CODE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_FULL_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
@@ -1135,7 +1140,7 @@ typedef double mp_float_t;
 #define MICROPY_PY_BUILTINS_CODE_BASIC      (2)
 #define MICROPY_PY_BUILTINS_CODE_FULL       (3)
 #ifndef MICROPY_PY_BUILTINS_CODE
-#define MICROPY_PY_BUILTINS_CODE            (MICROPY_PY_SYS_SETTRACE ? MICROPY_PY_BUILTINS_CODE_FULL : (MICROPY_PY_BUILTINS_COMPILE ? MICROPY_PY_BUILTINS_CODE_MINIMUM : MICROPY_PY_BUILTINS_CODE_NONE))
+#define MICROPY_PY_BUILTINS_CODE            (MICROPY_PY_SYS_SETTRACE ? MICROPY_PY_BUILTINS_CODE_FULL : (MICROPY_PY_FUNCTION_ATTRS_CODE ? MICROPY_PY_BUILTINS_CODE_BASIC : (MICROPY_PY_BUILTINS_COMPILE ? MICROPY_PY_BUILTINS_CODE_MINIMUM : MICROPY_PY_BUILTINS_CODE_NONE)))
 #endif
 
 // Whether to support dict.fromkeys() class method
diff --git a/py/objfun.c b/py/objfun.c
index 0b1b8c115f236..a742c5267254c 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <assert.h>
 
+#include "py/emitglue.h"
+#include "py/objcode.h"
 #include "py/objtuple.h"
 #include "py/objfun.h"
 #include "py/runtime.h"
@@ -151,6 +153,30 @@ qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
     return name;
 }
 
+#if MICROPY_PY_FUNCTION_ATTRS_CODE
+static mp_obj_t fun_bc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    (void)type;
+    mp_arg_check_num(n_args, n_kw, 2, 2, false);
+
+    if (!mp_obj_is_type(args[0], &mp_type_code)) {
+        mp_raise_TypeError(NULL);
+    }
+    if (!mp_obj_is_type(args[1], &mp_type_dict)) {
+        mp_raise_TypeError(NULL);
+    }
+
+    mp_obj_code_t *code = MP_OBJ_TO_PTR(args[0]);
+    mp_obj_t globals = args[1];
+
+    mp_module_context_t *module_context = m_new_obj(mp_module_context_t);
+    module_context->module.base.type = &mp_type_module;
+    module_context->module.globals = MP_OBJ_TO_PTR(globals);
+    module_context->constants = *mp_code_get_constants(code);
+
+    return mp_make_function_from_proto_fun(mp_code_get_proto_fun(code), module_context, NULL);
+}
+#endif
+
 #if MICROPY_CPYTHON_COMPAT
 static void fun_bc_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
@@ -340,9 +366,29 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
         dest[0] = MP_OBJ_FROM_PTR(self->context->module.globals);
     }
+    #if MICROPY_PY_FUNCTION_ATTRS_CODE
+    if (attr == MP_QSTR___code__) {
+        const mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
+        if ((self->base.type == &mp_type_fun_bc
+             || self->base.type == &mp_type_gen_wrap)
+            && self->child_table == NULL) {
+            #if MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_BASIC
+            dest[0] = mp_obj_new_code(self->context->constants, self->bytecode);
+            #else
+            dest[0] = mp_obj_new_code(self->context, self->rc, true);
+            #endif
+        }
+    }
+    #endif
 }
 #endif
 
+#if MICROPY_PY_FUNCTION_ATTRS_CODE
+#define FUN_BC_MAKE_NEW make_new, fun_bc_make_new,
+#else
+#define FUN_BC_MAKE_NEW
+#endif
+
 #if MICROPY_CPYTHON_COMPAT
 #define FUN_BC_TYPE_PRINT print, fun_bc_print,
 #else
@@ -359,6 +405,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_bc,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
+    FUN_BC_MAKE_NEW
     FUN_BC_TYPE_PRINT
     FUN_BC_TYPE_ATTR
     call, fun_bc_call
diff --git a/tests/basics/fun_code.py b/tests/basics/fun_code.py
new file mode 100644
index 0000000000000..59e1f7ec0483d
--- /dev/null
+++ b/tests/basics/fun_code.py
@@ -0,0 +1,36 @@
+# Test function.__code__ attribute.
+
+try:
+    (lambda: 0).__code__
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+def f():
+    return a
+
+
+ftype = type(f)
+
+# Test __code__ access and function constructor.
+code = f.__code__
+print(type(ftype(code, {})) is ftype)
+
+# Test instantiating multiple code's with different globals dicts.
+code = f.__code__
+f1 = ftype(code, {"a": 1})
+f2 = ftype(code, {"a": 2})
+print(f1(), f2())
+
+# Test bad first argument type.
+try:
+    ftype(None, {})
+except TypeError:
+    print("TypeError")
+
+# Test bad second argument type.
+try:
+    ftype(f.__code__, None)
+except TypeError:
+    print("TypeError")
diff --git a/tests/basics/fun_code_micropython.py b/tests/basics/fun_code_micropython.py
new file mode 100644
index 0000000000000..2c319a2db8c75
--- /dev/null
+++ b/tests/basics/fun_code_micropython.py
@@ -0,0 +1,19 @@
+# Test MicroPython-specific restrictions of function.__code__ attribute.
+
+try:
+    (lambda: 0).__code__
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+def f_with_children():
+    def g():
+        pass
+
+
+# Can't access __code__ when function has children.
+try:
+    f_with_children.__code__
+except AttributeError:
+    print("AttributeError")
diff --git a/tests/basics/fun_code_micropython.py.exp b/tests/basics/fun_code_micropython.py.exp
new file mode 100644
index 0000000000000..d169edffb4cfb
--- /dev/null
+++ b/tests/basics/fun_code_micropython.py.exp
@@ -0,0 +1 @@
+AttributeError
diff --git a/tests/basics/subclass_native1.py b/tests/basics/subclass_native1.py
index 288a686d1a756..74b377eac91b9 100644
--- a/tests/basics/subclass_native1.py
+++ b/tests/basics/subclass_native1.py
@@ -21,11 +21,9 @@ class mylist(list):
 # TODO: Faults
 #print(a + a)
 
-def foo():
-    print("hello from foo")
-
+# subclassing a type that doesn't have make_new at the C level (not allowed)
 try:
-    class myfunc(type(foo)):
+    class myfunc(type([].append)):
         pass
 except TypeError:
     print("TypeError")
diff --git a/tests/micropython/native_fun_attrs_code.py b/tests/micropython/native_fun_attrs_code.py
new file mode 100644
index 0000000000000..d277a7b9b2670
--- /dev/null
+++ b/tests/micropython/native_fun_attrs_code.py
@@ -0,0 +1,21 @@
+# Test MicroPython-specific restrictions of function.__code__ attribute.
+
+try:
+    (lambda: 0).__code__
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+import micropython
+
+
+@micropython.native
+def f_native():
+    pass
+
+
+# Can't access __code__ when function is native code.
+try:
+    f_native.__code__
+except AttributeError:
+    print("AttributeError")
diff --git a/tests/micropython/native_fun_attrs_code.py.exp b/tests/micropython/native_fun_attrs_code.py.exp
new file mode 100644
index 0000000000000..d169edffb4cfb
--- /dev/null
+++ b/tests/micropython/native_fun_attrs_code.py.exp
@@ -0,0 +1 @@
+AttributeError

From a11ba7775e600b45c0e93443ca05dffb09a49389 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Jul 2024 16:06:12 +1000
Subject: [PATCH 1880/3129] py/persistentcode: Add
 mp_raw_code_save_fun_to_bytes.

Serialises a bytecode function/generator to a valid .mpy as bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h       |   5 ++
 py/persistentcode.c | 190 +++++++++++++++++++++++++++++++++++++++++++-
 py/persistentcode.h |   1 +
 3 files changed, 194 insertions(+), 2 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 5c4d19bb56f11..a25d8cd32a2ba 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -342,6 +342,11 @@
 #define MICROPY_PERSISTENT_CODE_SAVE_FILE (0)
 #endif
 
+// Whether to support converting functions to persistent code (bytes)
+#ifndef MICROPY_PERSISTENT_CODE_SAVE_FUN
+#define MICROPY_PERSISTENT_CODE_SAVE_FUN (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#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 840ee49d3e4eb..2a42b904bc138 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -526,7 +526,7 @@ void mp_raw_code_load_file(qstr filename, mp_compiled_module_t *context) {
 
 #endif // MICROPY_PERSISTENT_CODE_LOAD
 
-#if MICROPY_PERSISTENT_CODE_SAVE
+#if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_PERSISTENT_CODE_SAVE_FUN
 
 #include "py/objstr.h"
 
@@ -624,6 +624,10 @@ static void save_obj(mp_print_t *print, mp_obj_t o) {
     }
 }
 
+#endif // MICROPY_PERSISTENT_CODE_SAVE || MICROPY_PERSISTENT_CODE_SAVE_FUN
+
+#if MICROPY_PERSISTENT_CODE_SAVE
+
 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 << 3) | ((rc->n_children != 0) << 2) | (rc->kind - MP_CODE_BYTECODE));
@@ -693,6 +697,8 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
     save_raw_code(print, cm->rc);
 }
 
+#endif // MICROPY_PERSISTENT_CODE_SAVE
+
 #if MICROPY_PERSISTENT_CODE_SAVE_FILE
 
 #include <unistd.h>
@@ -723,4 +729,184 @@ void mp_raw_code_save_file(mp_compiled_module_t *cm, qstr filename) {
 
 #endif // MICROPY_PERSISTENT_CODE_SAVE_FILE
 
-#endif // MICROPY_PERSISTENT_CODE_SAVE
+#if MICROPY_PERSISTENT_CODE_SAVE_FUN
+
+#include "py/bc0.h"
+#include "py/objfun.h"
+#include "py/smallint.h"
+#include "py/gc.h"
+
+#define MP_BC_OPCODE_HAS_SIGNED_OFFSET(opcode) (MP_BC_UNWIND_JUMP <= (opcode) && (opcode) <= MP_BC_POP_JUMP_IF_FALSE)
+
+typedef struct _bit_vector_t {
+    size_t max_bit_set;
+    size_t alloc;
+    uintptr_t *bits;
+} bit_vector_t;
+
+static void bit_vector_init(bit_vector_t *self) {
+    self->max_bit_set = 0;
+    self->alloc = 1;
+    self->bits = m_new(uintptr_t, self->alloc);
+}
+
+static void bit_vector_clear(bit_vector_t *self) {
+    m_del(uintptr_t, self->bits, self->alloc);
+}
+
+static bool bit_vector_is_set(bit_vector_t *self, size_t index) {
+    const size_t bits_size = sizeof(*self->bits) * MP_BITS_PER_BYTE;
+    return index / bits_size < self->alloc
+           && (self->bits[index / bits_size] & (1 << (index % bits_size))) != 0;
+}
+
+static void bit_vector_set(bit_vector_t *self, size_t index) {
+    const size_t bits_size = sizeof(*self->bits) * MP_BITS_PER_BYTE;
+    self->max_bit_set = MAX(self->max_bit_set, index);
+    if (index / bits_size >= self->alloc) {
+        size_t new_alloc = self->alloc * 2;
+        self->bits = m_renew(uintptr_t, self->bits, self->alloc, new_alloc);
+        self->alloc = new_alloc;
+    }
+    self->bits[index / bits_size] |= 1 << (index % bits_size);
+}
+
+typedef struct _mp_opcode_t {
+    uint8_t opcode;
+    uint8_t format;
+    uint8_t size;
+    mp_int_t arg;
+    uint8_t extra_arg;
+} mp_opcode_t;
+
+static mp_opcode_t mp_opcode_decode(const uint8_t *ip) {
+    const uint8_t *ip_start = ip;
+    uint8_t opcode = *ip++;
+    uint8_t opcode_format = MP_BC_FORMAT(opcode);
+    mp_uint_t arg = 0;
+    uint8_t extra_arg = 0;
+    if (opcode_format == MP_BC_FORMAT_QSTR || opcode_format == MP_BC_FORMAT_VAR_UINT) {
+        arg = *ip & 0x7f;
+        if (opcode == MP_BC_LOAD_CONST_SMALL_INT && (arg & 0x40) != 0) {
+            arg |= (mp_uint_t)(-1) << 7;
+        }
+        while ((*ip & 0x80) != 0) {
+            arg = (arg << 7) | (*++ip & 0x7f);
+        }
+        ++ip;
+    } else if (opcode_format == MP_BC_FORMAT_OFFSET) {
+        if ((*ip & 0x80) == 0) {
+            arg = *ip++;
+            if (MP_BC_OPCODE_HAS_SIGNED_OFFSET(opcode)) {
+                arg -= 0x40;
+            }
+        } else {
+            arg = (ip[0] & 0x7f) | (ip[1] << 7);
+            ip += 2;
+            if (MP_BC_OPCODE_HAS_SIGNED_OFFSET(opcode)) {
+                arg -= 0x4000;
+            }
+        }
+    }
+    if ((opcode & MP_BC_MASK_EXTRA_BYTE) == 0) {
+        extra_arg = *ip++;
+    }
+
+    mp_opcode_t op = { opcode, opcode_format, ip - ip_start, arg, extra_arg };
+    return op;
+}
+
+mp_obj_t mp_raw_code_save_fun_to_bytes(const mp_module_constants_t *consts, const uint8_t *bytecode) {
+    const uint8_t *fun_data = bytecode;
+    const uint8_t *fun_data_top = fun_data + gc_nbytes(fun_data);
+
+    // Extract function information.
+    const byte *ip = fun_data;
+    MP_BC_PRELUDE_SIG_DECODE(ip);
+    MP_BC_PRELUDE_SIZE_DECODE(ip);
+
+    // Track the qstrs used by the function.
+    bit_vector_t qstr_table_used;
+    bit_vector_init(&qstr_table_used);
+
+    // Track the objects used by the function.
+    bit_vector_t obj_table_used;
+    bit_vector_init(&obj_table_used);
+
+    const byte *ip_names = ip;
+    mp_uint_t simple_name = mp_decode_uint(&ip_names);
+    bit_vector_set(&qstr_table_used, simple_name);
+    for (size_t i = 0; i < n_pos_args + n_kwonly_args; ++i) {
+        mp_uint_t arg_name = mp_decode_uint(&ip_names);
+        bit_vector_set(&qstr_table_used, arg_name);
+    }
+
+    // Skip pass source code info and cell info.
+    // Then ip points to the start of the opcodes.
+    ip += n_info + n_cell;
+
+    // Decode bytecode.
+    while (ip < fun_data_top) {
+        mp_opcode_t op = mp_opcode_decode(ip);
+        if (op.opcode == MP_BC_BASE_RESERVED) {
+            // End of opcodes.
+            fun_data_top = ip;
+        } else if (op.opcode == MP_BC_LOAD_CONST_OBJ) {
+            bit_vector_set(&obj_table_used, op.arg);
+        } else if (op.format == MP_BC_FORMAT_QSTR) {
+            bit_vector_set(&qstr_table_used, op.arg);
+        }
+        ip += op.size;
+    }
+
+    mp_uint_t fun_data_len = fun_data_top - fun_data;
+
+    mp_print_t print;
+    vstr_t vstr;
+    vstr_init_print(&vstr, 64, &print);
+
+    // Start with .mpy header.
+    const uint8_t header[4] = { 'M', MPY_VERSION, 0, MP_SMALL_INT_BITS };
+    mp_print_bytes(&print, header, sizeof(header));
+
+    // Number of entries in constant table.
+    mp_print_uint(&print, qstr_table_used.max_bit_set + 1);
+    mp_print_uint(&print, obj_table_used.max_bit_set + 1);
+
+    // Save qstrs.
+    for (size_t i = 0; i <= qstr_table_used.max_bit_set; ++i) {
+        if (bit_vector_is_set(&qstr_table_used, i)) {
+            save_qstr(&print, consts->qstr_table[i]);
+        } else {
+            save_qstr(&print, MP_QSTR_);
+        }
+    }
+
+    // Save constant objects.
+    for (size_t i = 0; i <= obj_table_used.max_bit_set; ++i) {
+        if (bit_vector_is_set(&obj_table_used, i)) {
+            save_obj(&print, consts->obj_table[i]);
+        } else {
+            save_obj(&print, mp_const_none);
+        }
+    }
+
+    bit_vector_clear(&qstr_table_used);
+    bit_vector_clear(&obj_table_used);
+
+    // Save function kind and data length.
+    mp_print_uint(&print, fun_data_len << 3);
+
+    // Save function code.
+    mp_print_bytes(&print, fun_data, fun_data_len);
+
+    // Create and return bytes representing the .mpy data.
+    return mp_obj_new_bytes_from_vstr(&vstr);
+}
+
+#endif // MICROPY_PERSISTENT_CODE_SAVE_FUN
+
+#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
diff --git a/py/persistentcode.h b/py/persistentcode.h
index f0b7f70f7d7fa..cf257a7ab1fb6 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -121,6 +121,7 @@ void mp_raw_code_load_file(qstr 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, qstr filename);
+mp_obj_t mp_raw_code_save_fun_to_bytes(const mp_module_constants_t *consts, const uint8_t *bytecode);
 
 void mp_native_relocate(void *reloc, uint8_t *text, uintptr_t reloc_text);
 

From c3a18d74ebebe1c68955c3dce3c782af949aa4c7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 20 Jan 2025 22:24:10 +1100
Subject: [PATCH 1881/3129] extmod/modmarshal: Add new marshal module.

This commit implements a small subset of the CPython `marshal` module.  It
implements `marshal.dumps()` and `marshal.loads()`, but only supports
(un)marshalling code objects at this stage.  The semantics match CPython,
except that the actual marshalled bytes is not compatible with CPython's
marshalled bytes.

The module is enabled at the everything level (only on the unix coverage
build at this stage).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake                    |   1 +
 extmod/extmod.mk                       |   1 +
 extmod/modmarshal.c                    |  88 ++++++++++++++++++
 ports/windows/msvc/sources.props       |   1 +
 py/mpconfig.h                          |   7 +-
 tests/extmod/marshal_basic.py          |  38 ++++++++
 tests/extmod/marshal_micropython.py    |  21 +++++
 tests/extmod/marshal_stress.py         | 122 +++++++++++++++++++++++++
 tests/ports/unix/extra_coverage.py.exp |  10 +-
 9 files changed, 283 insertions(+), 6 deletions(-)
 create mode 100644 extmod/modmarshal.c
 create mode 100644 tests/extmod/marshal_basic.py
 create mode 100644 tests/extmod/marshal_micropython.py
 create mode 100644 tests/extmod/marshal_stress.py

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 532ce83f9075f..3643f1aee7bf5 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -24,6 +24,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
     ${MICROPY_EXTMOD_DIR}/modlwip.c
     ${MICROPY_EXTMOD_DIR}/modmachine.c
+    ${MICROPY_EXTMOD_DIR}/modmarshal.c
     ${MICROPY_EXTMOD_DIR}/modnetwork.c
     ${MICROPY_EXTMOD_DIR}/modonewire.c
     ${MICROPY_EXTMOD_DIR}/modasyncio.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 6d54ae2222e74..a510f3c54c25c 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -29,6 +29,7 @@ SRC_EXTMOD_C += \
 	extmod/modjson.c \
 	extmod/modlwip.c \
 	extmod/modmachine.c \
+	extmod/modmarshal.c \
 	extmod/modnetwork.c \
 	extmod/modonewire.c \
 	extmod/modopenamp.c \
diff --git a/extmod/modmarshal.c b/extmod/modmarshal.c
new file mode 100644
index 0000000000000..93d2bcf115065
--- /dev/null
+++ b/extmod/modmarshal.c
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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/objcode.h"
+#include "py/objfun.h"
+#include "py/persistentcode.h"
+#include "py/runtime.h"
+
+#if MICROPY_PY_MARSHAL
+
+static mp_obj_t marshal_dumps(mp_obj_t value_in) {
+    if (mp_obj_is_type(value_in, &mp_type_code)) {
+        mp_obj_code_t *code = MP_OBJ_TO_PTR(value_in);
+        const void *proto_fun = mp_code_get_proto_fun(code);
+        const uint8_t *bytecode;
+        if (mp_proto_fun_is_bytecode(proto_fun)) {
+            bytecode = proto_fun;
+        } else {
+            const mp_raw_code_t *rc = proto_fun;
+            if (!(rc->kind == MP_CODE_BYTECODE && rc->children == NULL)) {
+                mp_raise_ValueError(MP_ERROR_TEXT("function must be bytecode with no children"));
+            }
+            bytecode = rc->fun_data;
+        }
+        return mp_raw_code_save_fun_to_bytes(mp_code_get_constants(code), bytecode);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("unmarshallable object"));
+    }
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(marshal_dumps_obj, marshal_dumps);
+
+static mp_obj_t marshal_loads(mp_obj_t data_in) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
+    mp_module_context_t ctx;
+    ctx.module.globals = mp_globals_get();
+    mp_compiled_module_t cm = { .context = &ctx };
+    mp_raw_code_load_mem(bufinfo.buf, bufinfo.len, &cm);
+    #if MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_BASIC
+    return mp_obj_new_code(ctx.constants, cm.rc);
+    #else
+    mp_module_context_t *ctx_ptr = m_new_obj(mp_module_context_t);
+    *ctx_ptr = ctx;
+    return mp_obj_new_code(ctx_ptr, cm.rc, true);
+    #endif
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(marshal_loads_obj, marshal_loads);
+
+static const mp_rom_map_elem_t mod_marshal_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_marshal) },
+    { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&marshal_dumps_obj) },
+    { MP_ROM_QSTR(MP_QSTR_loads), MP_ROM_PTR(&marshal_loads_obj) },
+};
+
+static MP_DEFINE_CONST_DICT(mod_marshal_globals, mod_marshal_globals_table);
+
+const mp_obj_module_t mp_module_marshal = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&mod_marshal_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_marshal, mp_module_marshal);
+
+#endif // MICROPY_PY_MARSHAL
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index f7c4c6bcac01b..dcd10ddee913c 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -15,6 +15,7 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modmachine.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modmarshal.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modos.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modrandom.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a25d8cd32a2ba..66b3d125e78de 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -344,7 +344,7 @@
 
 // Whether to support converting functions to persistent code (bytes)
 #ifndef MICROPY_PERSISTENT_CODE_SAVE_FUN
-#define MICROPY_PERSISTENT_CODE_SAVE_FUN (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#define MICROPY_PERSISTENT_CODE_SAVE_FUN (MICROPY_PY_MARSHAL)
 #endif
 
 // Whether generated code can persist independently of the VM/runtime instance
@@ -1382,6 +1382,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
+// Whether to provide "marshal" module
+#ifndef MICROPY_PY_MARSHAL
+#define MICROPY_PY_MARSHAL (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#endif
+
 // Whether to provide "math" module
 #ifndef MICROPY_PY_MATH
 #define MICROPY_PY_MATH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
diff --git a/tests/extmod/marshal_basic.py b/tests/extmod/marshal_basic.py
new file mode 100644
index 0000000000000..9e7b70be4829d
--- /dev/null
+++ b/tests/extmod/marshal_basic.py
@@ -0,0 +1,38 @@
+# Test the marshal module, basic functionality.
+
+try:
+    import marshal
+
+    (lambda: 0).__code__
+except (AttributeError, ImportError):
+    print("SKIP")
+    raise SystemExit
+
+ftype = type(lambda: 0)
+
+# Test basic dumps and loads.
+print(ftype(marshal.loads(marshal.dumps((lambda: a).__code__)), {"a": 4})())
+
+# Test dumps of a result from compile().
+ftype(marshal.loads(marshal.dumps(compile("print(a)", "", "exec"))), {"print": print, "a": 5})()
+
+# Test marshalling a function with arguments.
+print(ftype(marshal.loads(marshal.dumps((lambda x, y: x + y).__code__)), {})(1, 2))
+
+# Test marshalling a function with default arguments.
+print(ftype(marshal.loads(marshal.dumps((lambda x=0: x).__code__)), {})("arg"))
+
+# Test marshalling a function containing constant objects (a tuple).
+print(ftype(marshal.loads(marshal.dumps((lambda: (None, ...)).__code__)), {})())
+
+# Test instantiating multiple code's with different globals dicts.
+code = marshal.loads(marshal.dumps((lambda: a).__code__))
+f1 = ftype(code, {"a": 1})
+f2 = ftype(code, {"a": 2})
+print(f1(), f2())
+
+# Test unmarshallable object.
+try:
+    marshal.dumps(type)
+except ValueError:
+    print("ValueError")
diff --git a/tests/extmod/marshal_micropython.py b/tests/extmod/marshal_micropython.py
new file mode 100644
index 0000000000000..213b3bf31895d
--- /dev/null
+++ b/tests/extmod/marshal_micropython.py
@@ -0,0 +1,21 @@
+# Test the marshal module, MicroPython-specific functionality.
+
+try:
+    import marshal
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import unittest
+
+
+class Test(unittest.TestCase):
+    def test_function_with_children(self):
+        # Can't marshal a function with children (in this case the module has a child function f).
+        code = compile("def f(): pass", "", "exec")
+        with self.assertRaises(ValueError):
+            marshal.dumps(code)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/extmod/marshal_stress.py b/tests/extmod/marshal_stress.py
new file mode 100644
index 0000000000000..b52475c0361dc
--- /dev/null
+++ b/tests/extmod/marshal_stress.py
@@ -0,0 +1,122 @@
+# Test the marshal module, stressing edge cases.
+
+try:
+    import marshal
+
+    (lambda: 0).__code__
+except (AttributeError, ImportError):
+    print("SKIP")
+    raise SystemExit
+
+ftype = type(lambda: 0)
+
+# Test a large function.
+
+
+def large_function(arg0, arg1, arg2, arg3):
+    # Arguments.
+    print(arg0, arg1, arg2, arg3)
+
+    # Positive medium-sized integer (still a small-int though).
+    print(1234)
+
+    # Negative small-ish integer.
+    print(-20)
+
+    # More than 64 constant objects.
+    x = (0,)
+    x = (1,)
+    x = (2,)
+    x = (3,)
+    x = (4,)
+    x = (5,)
+    x = (6,)
+    x = (7,)
+    x = (8,)
+    x = (9,)
+    x = (10,)
+    x = (11,)
+    x = (12,)
+    x = (13,)
+    x = (14,)
+    x = (15,)
+    x = (16,)
+    x = (17,)
+    x = (18,)
+    x = (19,)
+    x = (20,)
+    x = (21,)
+    x = (22,)
+    x = (23,)
+    x = (24,)
+    x = (25,)
+    x = (26,)
+    x = (27,)
+    x = (28,)
+    x = (29,)
+    x = (30,)
+    x = (31,)
+    x = (32,)
+    x = (33,)
+    x = (34,)
+    x = (35,)
+    x = (36,)
+    x = (37,)
+    x = (38,)
+    x = (39,)
+    x = (40,)
+    x = (41,)
+    x = (42,)
+    x = (43,)
+    x = (44,)
+    x = (45,)
+    x = (46,)
+    x = (47,)
+    x = (48,)
+    x = (49,)
+    x = (50,)
+    x = (51,)
+    x = (52,)
+    x = (53,)
+    x = (54,)
+    x = (55,)
+    x = (56,)
+    x = (57,)
+    x = (58,)
+    x = (59,)
+    x = (60,)
+    x = (61,)
+    x = (62,)
+    x = (63,)
+    x = (64,)
+
+    # Small jump.
+    x = 0
+    while x < 2:
+        print("loop", x)
+        x += 1
+
+    # Large jump.
+    x = 0
+    while x < 2:
+        try:
+            try:
+                try:
+                    print
+                except Exception as e:
+                    print
+                finally:
+                    print
+            except Exception as e:
+                print
+            finally:
+                print
+        except Exception as e:
+            print
+        finally:
+            print("loop", x)
+        x += 1
+
+
+code = marshal.dumps(large_function.__code__)
+ftype(marshal.loads(code), {"print": print})(0, 1, 2, 3)
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 176db8e9f8479..5ff947e883d37 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -56,13 +56,13 @@ cmath           collections     cppexample      cryptolib
 deflate         errno           example_package
 ffi             framebuf        gc              hashlib
 heapq           io              json            machine
-math            os              platform        random
-re              select          socket          struct
-sys             termios         time            tls
-uctypes         vfs             websocket
+marshal         math            os              platform
+random          re              select          socket
+struct          sys             termios         time
+tls             uctypes         vfs             websocket
 me
 
-micropython     machine         math
+micropython     machine         marshal         math
 
 argv            atexit          byteorder       exc_info
 executable      exit            getsizeof       implementation

From e40a3fdb81fc7184e945754c06d42e169a296ab8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Jan 2025 15:13:13 +1100
Subject: [PATCH 1882/3129] docs/library/marshal: Document the marshal module.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/index.rst   |  1 +
 docs/library/marshal.rst | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 docs/library/marshal.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 4209a0781a60e..2919378ce13b2 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -69,6 +69,7 @@ library.
    heapq.rst
    io.rst
    json.rst
+   marshal.rst
    math.rst
    os.rst
    platform.rst
diff --git a/docs/library/marshal.rst b/docs/library/marshal.rst
new file mode 100644
index 0000000000000..6d3213e0a6ec8
--- /dev/null
+++ b/docs/library/marshal.rst
@@ -0,0 +1,28 @@
+:mod:`marshal` -- Python object serialization
+=============================================
+
+.. module:: marshal
+   :synopsis: Convert Python objects to and from a binary format
+
+|see_cpython_module| :mod:`python:marshal`.
+
+This module implements conversion between Python objects and a binary format.
+The format is specific to MicroPython but does not depend on the machine
+architecture, so the data can be transferred and used on a different MicroPython
+instance, as long as the version of the binary data matches (it's currently
+versioned as the mpy file version, see :ref:`mpy_files`).
+
+Functions
+---------
+
+.. function:: dumps(value, /)
+
+   Convert the given *value* to binary format and return a corresponding ``bytes``
+   object.
+
+   Currently, code objects are the only supported values that can be converted.
+
+.. function:: loads(data, /)
+
+   Convert the given bytes-like *data* to its corresponding Python object, and
+   return it.

From 30acb16ad34babf25d126a7b471616421167cb35 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Jan 2025 12:02:12 +1100
Subject: [PATCH 1883/3129] extmod/vfs_rom: Remove ability to create VfsRom
 from an address.

It's not necessary to support this, which allows an arbitrary memory
address to be specified and potentially allows invalid memory accesses.

Requiring an object with the buffer protocol is safer, and also means that
the length of the region is always specified.

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

diff --git a/extmod/vfs_rom.c b/extmod/vfs_rom.c
index b8b6f8e40d12b..99ddaba95ed79 100644
--- a/extmod/vfs_rom.c
+++ b/extmod/vfs_rom.c
@@ -198,15 +198,13 @@ static mp_obj_t vfs_rom_make_new(const mp_obj_type_t *type, size_t n_args, size_
     self->base.type = type;
     self->memory = args[0];
 
+    // Get the ROMFS memory region.
     mp_buffer_info_t bufinfo;
-    if (mp_get_buffer(self->memory, &bufinfo, MP_BUFFER_READ)) {
-        if (bufinfo.len < ROMFS_SIZE_MIN) {
-            mp_raise_OSError(MP_ENODEV);
-        }
-        self->filesystem = bufinfo.buf;
-    } else {
-        self->filesystem = (const uint8_t *)(uintptr_t)mp_obj_get_int_truncated(self->memory);
+    mp_get_buffer_raise(self->memory, &bufinfo, MP_BUFFER_READ);
+    if (bufinfo.len < ROMFS_SIZE_MIN) {
+        mp_raise_OSError(MP_ENODEV);
     }
+    self->filesystem = bufinfo.buf;
 
     // Verify it is a ROMFS.
     if (!(self->filesystem[0] == ROMFS_HEADER_BYTE0
diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py
index d416d83870558..f7958a93962d0 100644
--- a/tests/extmod/vfs_rom.py
+++ b/tests/extmod/vfs_rom.py
@@ -226,7 +226,8 @@ def test_unknown_record(self):
 class TestStandalone(TestBase):
     def test_constructor(self):
         self.assertIsInstance(vfs.VfsRom(self.romfs), vfs.VfsRom)
-        self.assertIsInstance(vfs.VfsRom(self.romfs_addr), vfs.VfsRom)
+        with self.assertRaises(TypeError):
+            vfs.VfsRom(self.romfs_addr)
 
     def test_mount(self):
         vfs.VfsRom(self.romfs).mount(True, False)

From 1a67d720c786fd85c848ffba4b792048d262095f Mon Sep 17 00:00:00 2001
From: rufusclark <50201718+rufusclark@users.noreply.github.com>
Date: Tue, 6 Aug 2024 00:32:35 +0100
Subject: [PATCH 1884/3129] tools/pyboard.py: Make get_time use machine.RTC
 instead of pyb.RTC.

The current code evaluates `pyb.RTC().datetime()` resulting in a remote
side exception, as `pyb` is not defined on most ports (only stm32).

The code should evaluate `machine.RTC().datetime()` and hence return the
current time.

Signed-off-by: rufusclark <50201718+rufusclark@users.noreply.github.com>
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 dac51e7d6b896..0cf5b3d46596a 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -506,7 +506,7 @@ def execfile(self, filename):
         return self.exec_(pyfile)
 
     def get_time(self):
-        t = str(self.eval("pyb.RTC().datetime()"), encoding="utf8")[1:-1].split(", ")
+        t = str(self.eval("machine.RTC().datetime()"), encoding="utf8")[1:-1].split(", ")
         return int(t[4]) * 3600 + int(t[5]) * 60 + int(t[6])
 
     def fs_exists(self, src):

From b675c87992b8b62ca8b18a05862e9c7b9427b9de Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 5 Feb 2025 15:08:25 +1100
Subject: [PATCH 1885/3129] esp32/machine_sdcard: Fix invalid result of
 SDCard.read/writeblocks.

Functions would return NULL instead of `mp_const_false` if failed to init.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_sdcard.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 92c6e64698c33..da6b0df282caf 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -364,7 +364,7 @@ static mp_obj_t machine_sdcard_readblocks(mp_obj_t self_in, mp_obj_t block_num,
 
     err = sdcard_ensure_card_init((sdcard_card_obj_t *)self, false);
     if (err != ESP_OK) {
-        return false;
+        return mp_const_false;
     }
 
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
@@ -381,7 +381,7 @@ static mp_obj_t machine_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t block_num,
 
     err = sdcard_ensure_card_init((sdcard_card_obj_t *)self, false);
     if (err != ESP_OK) {
-        return false;
+        return mp_const_false;
     }
 
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);

From 842e3617a0f152f837b2e8cc4e9d4efae6cb52a4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 11 Dec 2024 13:17:47 +0100
Subject: [PATCH 1886/3129] renesas-ra/Makefile: Remove id_code section from
 binary file generation.

The linker scripts for most of these microcontrollers contain a
non-contiguous flash section for the ID code that results in big binary
files, which exceed the flash size.  This commit removes the ID code
section from the main firmware binary, and outputs it to a separate binary,
which can be deployed manually if ID code is enabled.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/renesas-ra/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index dd70f56d7ca63..03eb9b52b41b8 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -442,7 +442,8 @@ endef
 
 define GENERATE_BIN
 	$(ECHO) "GEN $(1)"
-	$(Q)$(OBJCOPY) -I ihex -O binary $(2) $(1)
+	$(Q)$(OBJCOPY) -O binary -j .id_code $(2) $(BUILD)/id_code.bin
+	$(Q)$(OBJCOPY) -O binary --remove-section=.id_code $(2) $(1)
 endef
 
 define GENERATE_HEX
@@ -452,7 +453,7 @@ endef
 
 .PHONY:
 
-$(BUILD)/firmware.bin: $(BUILD)/firmware.hex
+$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(call GENERATE_BIN,$@,$^)
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf

From aef6705a321fbefb06288b5be1f5931bf8c42fe3 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Wed, 22 Jan 2025 17:17:03 -0600
Subject: [PATCH 1887/3129] extmod/lwip-include: Increase number of lwIP timers
 when mDNS enabled.

Despite the code comments claiming one is sufficient, the mDNS application
is capable of using up to twelve timers.  Three per IP protocol are started
at once in `mdns_start_multicast_timeouts_ipvX`, then another two per
protocol can be started in `mdns_handle_question`.  Further timers can be
started for two additional callbacks.

Having certain timers, such as `MDNS_MULTICAST_TIMEOUT`, fail to start due
to none being free will break mDNS forever as the app will never realize
it's safe to transmit a packet.  Therefore, this commit goes somewhat
overkill and allocates the maximal amount of timers; it's uncertain if all
can run simultaneously, or how many callback timers are needed.

Each timer struct is 16 bytes on standard 32 bit builds.  Plus, say, 8
bytes of allocater overhead, that's 288 more bytes of RAM used which
shouldn't be too horrible.  Users who don't need mDNS can manually disable
it to recover the RAM if necessary.

This fixes mDNS on W5500_EVB_PICO (among other boards).  Before, mDNS would
work for a bit after connection until the host's cache expired a minute or
two later.  Then the board would never respond to further queries.  With
this patch, all works well.

Signed-off-by: Thomas Watson <twatson52@icloud.com>
---
 extmod/lwip-include/lwipopts_common.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extmod/lwip-include/lwipopts_common.h b/extmod/lwip-include/lwipopts_common.h
index 8688db064ef6f..3e4230909499e 100644
--- a/extmod/lwip-include/lwipopts_common.h
+++ b/extmod/lwip-include/lwipopts_common.h
@@ -65,7 +65,9 @@
 
 #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)
+
+// The mDNS responder requires 5 timers per IP version plus 2 others. Not having enough silently breaks it.
+#define MEMP_NUM_SYS_TIMEOUT            (LWIP_NUM_SYS_TIMEOUT_INTERNAL + (LWIP_MDNS_RESPONDER * (2 + (5 * (LWIP_IPV4 + LWIP_IPV6)))))
 
 #define SO_REUSE                        1
 #define TCP_LISTEN_BACKLOG              1

From 321b30ca564bb33c625292247d00f7dd29dc9559 Mon Sep 17 00:00:00 2001
From: Keenan Johnson <keenan.johnson@gmail.com>
Date: Thu, 13 Feb 2025 13:11:38 -0800
Subject: [PATCH 1888/3129] extmod/modtls_mbedtls: Wire in support for DTLS.

This commit enables support for DTLS, i.e. TLS over datagram transport
protocols like UDP.  While support for DTLS is absent in CPython, it is
worth supporting it in MicroPython because it is the basis of the
ubiquitous CoAP protocol, used in many IoT projects.

To select DTLS, a new set of "protocols" are added to SSLContext:
- ssl.PROTOCOL_DTLS_CLIENT
- ssl.PROTOCOL_DTLS_SERVER

If one of these is set, the library assumes that the underlying socket is a
datagram-like socket (i.e. UDP or similar).

Our own timer callbacks are implemented because the out of the box
implementation relies on `gettimeofday()`.

This new DTLS feature is enabled on all ports that use mbedTLS.

This commit is an update to a previous PR #10062.

Addresses issue #5270 which requested DTLS support.

Signed-off-by: Keenan Johnson <keenan.johnson@gmail.com>
---
 docs/library/ssl.rst                   | 21 +++++++
 extmod/mbedtls/mbedtls_config_common.h |  1 +
 extmod/modtls_mbedtls.c                | 76 ++++++++++++++++++++++++--
 ports/esp32/boards/sdkconfig.base      |  3 +
 tests/extmod/tls_dtls.py               | 51 +++++++++++++++++
 tests/extmod/tls_dtls.py.exp           |  3 +
 6 files changed, 151 insertions(+), 4 deletions(-)
 create mode 100644 tests/extmod/tls_dtls.py
 create mode 100644 tests/extmod/tls_dtls.py.exp

diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index dff90b8da58b9..4327c74bad6c8 100644
--- a/docs/library/ssl.rst
+++ b/docs/library/ssl.rst
@@ -117,11 +117,32 @@ Exceptions
 
    This exception does NOT exist. Instead its base class, OSError, is used.
 
+DTLS support
+------------
+
+.. admonition:: Difference to CPython
+   :class: attention
+
+   This is a MicroPython extension.
+
+This module supports DTLS in client and server mode via the `PROTOCOL_DTLS_CLIENT`
+and `PROTOCOL_DTLS_SERVER` constants that can be used as the ``protocol`` argument
+of `SSLContext`.
+
+In this case the underlying socket is expected to behave as a datagram socket (i.e.
+like the socket opened with ``socket.socket`` with ``socket.AF_INET`` as ``af`` and
+``socket.SOCK_DGRAM`` as ``type``).
+
+DTLS is only supported on ports that use mbed TLS, and it is not enabled by default:
+it requires enabling ``MBEDTLS_SSL_PROTO_DTLS`` in the specific port configuration.
+
 Constants
 ---------
 
 .. data:: ssl.PROTOCOL_TLS_CLIENT
           ssl.PROTOCOL_TLS_SERVER
+          ssl.PROTOCOL_DTLS_CLIENT (when DTLS support is enabled)
+          ssl.PROTOCOL_DTLS_SERVER (when DTLS support is enabled)
 
     Supported values for the *protocol* parameter.
 
diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 6ea8540af9925..6cd14befc3196 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -89,6 +89,7 @@
 #define MBEDTLS_SHA384_C
 #define MBEDTLS_SHA512_C
 #define MBEDTLS_SSL_CLI_C
+#define MBEDTLS_SSL_PROTO_DTLS
 #define MBEDTLS_SSL_SRV_C
 #define MBEDTLS_SSL_TLS_C
 #define MBEDTLS_X509_CRT_PARSE_C
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 3fd416d72f5ef..6c34805da42cb 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -37,6 +37,7 @@
 #include "py/stream.h"
 #include "py/objstr.h"
 #include "py/reader.h"
+#include "py/mphal.h"
 #include "py/gc.h"
 #include "extmod/vfs.h"
 
@@ -47,6 +48,9 @@
 #include "mbedtls/pk.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
+#ifdef MBEDTLS_SSL_PROTO_DTLS
+#include "mbedtls/timing.h"
+#endif
 #include "mbedtls/debug.h"
 #include "mbedtls/error.h"
 #if MBEDTLS_VERSION_NUMBER >= 0x03000000
@@ -65,6 +69,14 @@
 
 #define MP_STREAM_POLL_RDWR (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)
 
+#define MP_ENDPOINT_IS_SERVER (1 << 0)
+#define MP_TRANSPORT_IS_DTLS  (1 << 1)
+
+#define MP_PROTOCOL_TLS_CLIENT  0
+#define MP_PROTOCOL_TLS_SERVER  MP_ENDPOINT_IS_SERVER
+#define MP_PROTOCOL_DTLS_CLIENT MP_TRANSPORT_IS_DTLS
+#define MP_PROTOCOL_DTLS_SERVER MP_ENDPOINT_IS_SERVER | MP_TRANSPORT_IS_DTLS
+
 // This corresponds to an SSLContext object.
 typedef struct _mp_obj_ssl_context_t {
     mp_obj_base_t base;
@@ -91,6 +103,12 @@ typedef struct _mp_obj_ssl_socket_t {
 
     uintptr_t poll_mask; // Indicates which read or write operations the protocol needs next
     int last_error; // The last error code, if any
+
+    #ifdef MBEDTLS_SSL_PROTO_DTLS
+    mp_uint_t timer_start_ms;
+    mp_uint_t timer_fin_ms;
+    mp_uint_t timer_int_ms;
+    #endif
 } mp_obj_ssl_socket_t;
 
 static const mp_obj_type_t ssl_context_type;
@@ -242,7 +260,10 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
     // This is the "protocol" argument.
-    mp_int_t endpoint = mp_obj_get_int(args[0]);
+    mp_int_t protocol = mp_obj_get_int(args[0]);
+
+    int endpoint = (protocol & MP_ENDPOINT_IS_SERVER) ? MBEDTLS_SSL_IS_SERVER : MBEDTLS_SSL_IS_CLIENT;
+    int transport = (protocol & MP_TRANSPORT_IS_DTLS) ? MBEDTLS_SSL_TRANSPORT_DATAGRAM : MBEDTLS_SSL_TRANSPORT_STREAM;
 
     // Create SSLContext object.
     #if MICROPY_PY_SSL_FINALISER
@@ -282,7 +303,7 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     }
 
     ret = mbedtls_ssl_config_defaults(&self->conf, endpoint,
-        MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT);
+        transport, MBEDTLS_SSL_PRESET_DEFAULT);
     if (ret != 0) {
         mbedtls_raise_error(ret);
     }
@@ -525,6 +546,39 @@ static int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
     }
 }
 
+#ifdef MBEDTLS_SSL_PROTO_DTLS
+static void _mbedtls_timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fin_ms) {
+    mp_obj_ssl_socket_t *o = (mp_obj_ssl_socket_t *)ctx;
+
+    o->timer_int_ms = int_ms;
+    o->timer_fin_ms = fin_ms;
+
+    if (fin_ms != 0) {
+        o->timer_start_ms = mp_hal_ticks_ms();
+    }
+}
+
+static int _mbedtls_timing_get_delay(void *ctx) {
+    mp_obj_ssl_socket_t *o = (mp_obj_ssl_socket_t *)ctx;
+
+    if (o->timer_fin_ms == 0) {
+        return -1;
+    }
+
+    mp_uint_t elapsed_ms = mp_hal_ticks_ms() - o->timer_start_ms;
+
+    if (elapsed_ms >= o->timer_fin_ms) {
+        return 2;
+    }
+
+    if (elapsed_ms >= o->timer_int_ms) {
+        return 1;
+    }
+
+    return 0;
+}
+#endif
+
 static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
     bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
 
@@ -577,6 +631,10 @@ static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
         mp_raise_ValueError(MP_ERROR_TEXT("CERT_REQUIRED requires server_hostname"));
     }
 
+    #ifdef MBEDTLS_SSL_PROTO_DTLS
+    mbedtls_ssl_set_timer_cb(&o->ssl, o, _mbedtls_timing_set_delay, _mbedtls_timing_get_delay);
+    #endif
+
     mbedtls_ssl_set_bio(&o->ssl, &o->sock, _mbedtls_ssl_send, _mbedtls_ssl_recv, NULL);
 
     if (do_handshake_on_connect) {
@@ -788,6 +846,12 @@ static const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = {
     { 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) },
+    #ifdef MBEDTLS_SSL_PROTO_DTLS
+    { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&mp_stream_read1_obj) },
+    { MP_ROM_QSTR(MP_QSTR_recv_into), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&mp_stream_write1_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendall), MP_ROM_PTR(&mp_stream_write_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
     #if MICROPY_PY_SSL_FINALISER
@@ -879,8 +943,12 @@ static const mp_rom_map_elem_t mp_module_tls_globals_table[] = {
 
     // Constants.
     { MP_ROM_QSTR(MP_QSTR_MBEDTLS_VERSION), MP_ROM_PTR(&mbedtls_version_obj)},
-    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(MBEDTLS_SSL_IS_CLIENT) },
-    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(MBEDTLS_SSL_IS_SERVER) },
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_CLIENT), MP_ROM_INT(MP_PROTOCOL_TLS_CLIENT) },
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_TLS_SERVER), MP_ROM_INT(MP_PROTOCOL_TLS_SERVER) },
+    #ifdef MBEDTLS_SSL_PROTO_DTLS
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_DTLS_CLIENT), MP_ROM_INT(MP_PROTOCOL_DTLS_CLIENT) },
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_DTLS_SERVER), MP_ROM_INT(MP_PROTOCOL_DTLS_SERVER) },
+    #endif
     { 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) },
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index e20835c70c42d..530db427119ca 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -64,6 +64,9 @@ CONFIG_MBEDTLS_HAVE_TIME_DATE=y
 CONFIG_MBEDTLS_PLATFORM_TIME_ALT=y
 CONFIG_MBEDTLS_HAVE_TIME=y
 
+# Enable DTLS
+CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+
 # Disable ALPN support as it's not implemented in MicroPython
 CONFIG_MBEDTLS_SSL_ALPN=n
 
diff --git a/tests/extmod/tls_dtls.py b/tests/extmod/tls_dtls.py
new file mode 100644
index 0000000000000..b2d716769d3f7
--- /dev/null
+++ b/tests/extmod/tls_dtls.py
@@ -0,0 +1,51 @@
+# Test DTLS functionality including timeout handling
+
+try:
+    from tls import PROTOCOL_DTLS_CLIENT, PROTOCOL_DTLS_SERVER, SSLContext, CERT_NONE
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+class DummySocket(io.IOBase):
+    def __init__(self):
+        self.write_buffer = bytearray()
+        self.read_buffer = bytearray()
+
+    def write(self, data):
+        return len(data)
+
+    def readinto(self, buf):
+        # This is a placeholder socket that doesn't actually read anything
+        # so the read buffer is always empty.
+        return None
+
+    def ioctl(self, req, arg):
+        if req == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
+
+
+# Create dummy sockets for testing
+server_socket = DummySocket()
+client_socket = DummySocket()
+
+# Wrap the DTLS Server
+dtls_server_ctx = SSLContext(PROTOCOL_DTLS_SERVER)
+dtls_server_ctx.verify_mode = CERT_NONE
+dtls_server = dtls_server_ctx.wrap_socket(server_socket, do_handshake_on_connect=False)
+print("Wrapped DTLS Server")
+
+# Wrap the DTLS Client
+dtls_client_ctx = SSLContext(PROTOCOL_DTLS_CLIENT)
+dtls_client_ctx.verify_mode = CERT_NONE
+dtls_client = dtls_client_ctx.wrap_socket(client_socket, do_handshake_on_connect=False)
+print("Wrapped DTLS Client")
+
+# Trigger the timing check multiple times with different elapsed times
+for i in range(10):  # Try multiple iterations to hit the timing window
+    dtls_client.write(b"test")
+    data = dtls_server.read(1024)  # This should eventually hit the timing condition
+
+print("OK")
diff --git a/tests/extmod/tls_dtls.py.exp b/tests/extmod/tls_dtls.py.exp
new file mode 100644
index 0000000000000..78d72bff18816
--- /dev/null
+++ b/tests/extmod/tls_dtls.py.exp
@@ -0,0 +1,3 @@
+Wrapped DTLS Server
+Wrapped DTLS Client
+OK

From 8987b39e0b772d22539022f0961c8ea0f7162751 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 Feb 2025 09:54:56 +1100
Subject: [PATCH 1889/3129] tests/multi_net: Add test for DTLS server and
 client.

This adds a multi-test for DTLS server and client behaviour.  It works on
all ports that enable this feature (eg unix, esp32, rp2, stm32), but
bare-metal ports that use lwIP are not reliable as the DTLS server because
the lwIP bindings only support queuing one UDP packet at a time (that needs
to be fixed).

Also, to properly implement a DTLS server sockets need to support
`socket.recvfrom(n, MSG_PEEK)`.  That can be implemented in the future.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/tls_dtls_server_client.py     | 89 +++++++++++++++++++
 tests/multi_net/tls_dtls_server_client.py.exp | 14 +++
 2 files changed, 103 insertions(+)
 create mode 100644 tests/multi_net/tls_dtls_server_client.py
 create mode 100644 tests/multi_net/tls_dtls_server_client.py.exp

diff --git a/tests/multi_net/tls_dtls_server_client.py b/tests/multi_net/tls_dtls_server_client.py
new file mode 100644
index 0000000000000..d50deb354ed4d
--- /dev/null
+++ b/tests/multi_net/tls_dtls_server_client.py
@@ -0,0 +1,89 @@
+# Test DTLS server and client, sending a small amount of data between them.
+
+try:
+    import socket
+    import tls
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+# These are test certificates. See tests/README.md for details.
+certfile = "ec_cert.der"
+keyfile = "ec_key.der"
+
+try:
+    with open(certfile, "rb") as cf:
+        cert = cadata = cf.read()
+    with open(keyfile, "rb") as kf:
+        key = kf.read()
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+
+# DTLS server.
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+
+    # Create a UDP socket and bind it to accept incoming connections.
+    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.next()
+
+    # Wait for the client to connect.
+    data, client_addr = s.recvfrom(1)
+    print("incoming connection", data)
+
+    # Connect back to the client, so the UDP socket can be used like a stream.
+    s.connect(client_addr)
+
+    # Create the DTLS context and load the certificate.
+    ctx = tls.SSLContext(tls.PROTOCOL_DTLS_SERVER)
+    ctx.load_cert_chain(cert, key)
+
+    # Wrap the UDP socket in server mode.
+    print("wrap socket")
+    s = ctx.wrap_socket(s, server_side=1)
+
+    # Transfer some data.
+    for _ in range(4):
+        print(s.recv(16))
+        s.send(b"server to client")
+
+    # Close the DTLS and UDP connection.
+    s.close()
+
+
+# DTLS client.
+def instance1():
+    multitest.next()
+
+    # Create a UDP socket and connect to the server.
+    addr = socket.getaddrinfo(IP, PORT)[0][-1]
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    print("connect")
+    s.connect(addr)
+
+    # Send one byte to indicate a connection, and so the server can obtain our address.
+    s.write("X")
+
+    # Create a DTLS context and load the certificate.
+    ctx = tls.SSLContext(tls.PROTOCOL_DTLS_CLIENT)
+    ctx.verify_mode = tls.CERT_REQUIRED
+    ctx.load_verify_locations(cadata)
+
+    # Wrap the UDP socket.
+    print("wrap socket")
+    s = ctx.wrap_socket(s, server_hostname="micropython.local")
+
+    # Transfer some data.
+    for _ in range(4):
+        s.send(b"client to server")
+        print(s.recv(16))
+
+    # Close the DTLS and UDP connection.
+    s.close()
diff --git a/tests/multi_net/tls_dtls_server_client.py.exp b/tests/multi_net/tls_dtls_server_client.py.exp
new file mode 100644
index 0000000000000..f2ff396e181df
--- /dev/null
+++ b/tests/multi_net/tls_dtls_server_client.py.exp
@@ -0,0 +1,14 @@
+--- instance0 ---
+incoming connection b'X'
+wrap socket
+b'client to server'
+b'client to server'
+b'client to server'
+b'client to server'
+--- instance1 ---
+connect
+wrap socket
+b'server to client'
+b'server to client'
+b'server to client'
+b'server to client'

From 71df9d0636c8b0b95ab009f82bde7d5b970835ec Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 11 Feb 2025 16:42:03 +1100
Subject: [PATCH 1890/3129] rp2: Fix build failure if threads are disabled.

Regression in 3af006ef meant that pendsv.c no longer compiled if threads
were disabled in the build config. Add an implementation based on the
earlier one (simple counter) for the non-threads case.

It seems like with the current usage patterns there's no need for the
counter to be incremented/decremented atomically on a single core config.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/pendsv.c | 49 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 4ba1e81604b0f..2c086f89429be 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -43,10 +43,14 @@
 
 static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
 
+static inline void pendsv_resume_run_dispatch(void);
+
 void PendSV_Handler(void);
 
-// Using the nowait variant here as softtimer updates PendSV from the loop of mp_wfe_or_timeout(),
-// where we don't want the CPU event bit to be set.
+#if MICROPY_PY_THREAD
+
+// Important to use a 'nowait' mutex here as softtimer updates PendSV from the
+// loop of mp_wfe_or_timeout(), where we don't want the CPU event bit to be set.
 static mp_thread_recursive_mutex_t pendsv_mutex;
 
 void pendsv_init(void) {
@@ -62,7 +66,40 @@ void pendsv_suspend(void) {
 
 void pendsv_resume(void) {
     mp_thread_recursive_mutex_unlock(&pendsv_mutex);
+    pendsv_resume_run_dispatch();
+}
+
+static inline int pendsv_suspend_count(void) {
+    return pendsv_mutex.mutex.enter_count;
+}
+
+#else
+
+// Without threads we don't include any pico-sdk mutex in the build,
+// but also we don't need to worry about cross-thread contention (or
+// races with interrupts that update this counter).
+static int pendsv_lock;
+
+void pendsv_init(void) {
+}
+
+void pendsv_suspend(void) {
+    pendsv_lock++;
+}
+
+void pendsv_resume(void) {
+    assert(pendsv_lock > 0);
+    pendsv_lock--;
+    pendsv_resume_run_dispatch();
+}
 
+static inline int pendsv_suspend_count(void) {
+    return pendsv_lock;
+}
+
+#endif
+
+static inline void pendsv_resume_run_dispatch(void) {
     // 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;
@@ -76,7 +113,7 @@ void pendsv_resume(void) {
 
 void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
     pendsv_dispatch_table[slot] = f;
-    if (pendsv_mutex.mutex.enter_count == 0) {
+    if (pendsv_suspend_count() == 0) {
         #if PICO_ARM
         // There is a race here where other core calls pendsv_suspend() before
         // ISR can execute, but dispatch will happen later when other core
@@ -97,6 +134,7 @@ void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
 // PendSV interrupt handler to perform background processing.
 void PendSV_Handler(void) {
 
+    #if MICROPY_PY_THREAD
     if (!mp_thread_recursive_mutex_lock(&pendsv_mutex, 0)) {
         // Failure here means core 1 holds pendsv_mutex. ISR will
         // run again after core 1 calls pendsv_resume().
@@ -104,6 +142,9 @@ void PendSV_Handler(void) {
     }
     // Core 0 should not already have locked pendsv_mutex
     assert(pendsv_mutex.mutex.enter_count == 1);
+    #else
+    assert(pendsv_suspend_count() == 0);
+    #endif
 
     #if MICROPY_PY_NETWORK_CYW43
     CYW43_STAT_INC(PENDSV_RUN_COUNT);
@@ -117,5 +158,7 @@ void PendSV_Handler(void) {
         }
     }
 
+    #if MICROPY_PY_THREAD
     mp_thread_recursive_mutex_unlock(&pendsv_mutex);
+    #endif
 }

From 516709be88571da0195125c840e772a3ec70fa66 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 11 Feb 2025 17:44:19 +1100
Subject: [PATCH 1891/3129] py/mkrules.cmake: Support passing CFLAGS_EXTRA in
 environment variable.

This works similarly to the existing support in "bare metal" make ports,
with the caveat that CMake will only set this value on a clean build and
will reuse the previous value otherwise.

This is slightly different to the CMake built-in support for CFLAGS,
as this variable is used when evaluating source files for qstr
generation, etc.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/mkrules.cmake | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 3ee4c4c31aa57..907500dd67534 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -53,6 +53,15 @@ foreach(_arg ${MICROPY_CPP_DEF})
 endforeach()
 list(APPEND MICROPY_CPP_FLAGS ${MICROPY_CPP_FLAGS_EXTRA})
 
+# Include anything passed in via CFLAGS_EXTRA
+# in both MICROPY_CPP_FLAGS and CMAKE_C_FLAGS
+if(DEFINED ENV{CFLAGS_EXTRA})
+  set(CFLAGS_EXTRA $ENV{CFLAGS_EXTRA})
+  string(APPEND CMAKE_C_FLAGS " ${CFLAGS_EXTRA}")  # ... not a list
+  separate_arguments(CFLAGS_EXTRA)
+  list(APPEND MICROPY_CPP_FLAGS ${CFLAGS_EXTRA})  # ... a list
+endif()
+
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
 target_sources(${MICROPY_TARGET} PRIVATE

From 1034b17558b108b65aca480d3b5b8f933e128369 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 11 Feb 2025 17:46:33 +1100
Subject: [PATCH 1892/3129] tools/ci.sh: Build the W5100S_EVB_PICO board with
 no threads.

Serves as a build test for a config we don't otherwise support.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/ci.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index ff362efd29e2d..d50af4a0ae2ee 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -342,7 +342,8 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO2 submodules
     make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO2
     make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO submodules
-    make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO
+    # This build doubles as a build test for disabling threads in the config
+    make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO CFLAGS_EXTRA=-DMICROPY_PY_THREAD=0
 
     # Test building ninaw10 driver and NIC interface.
     make ${MAKEOPTS} -C ports/rp2 BOARD=ARDUINO_NANO_RP2040_CONNECT submodules

From 6425c9ecc746eec797f7ba9a37d803244f7d2192 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 14 Feb 2025 00:40:22 +0100
Subject: [PATCH 1893/3129] esp32: Remove unneeded "memory.h" header file.

This commit removes "memory.h" from the ESP32 port tree, as it is no
longer needed with recent ESP-IDF versions.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/memory.h | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 ports/esp32/memory.h

diff --git a/ports/esp32/memory.h b/ports/esp32/memory.h
deleted file mode 100644
index 1f07fe409d7eb..0000000000000
--- a/ports/esp32/memory.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// this is needed for lib/crypto-algorithms/sha256.c
-#include <string.h>

From 1e3cce1397c76f7714a5c4940b5021965944d268 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 20 Feb 2025 09:19:33 +0100
Subject: [PATCH 1894/3129] mimxrt/boards/ADAFRUIT_METRO_M7: Reduce flash freq
 to 100MHz.

It was set to 133Mhz, but that is not stable.  Reduce to 100MHz.

The UF2 bootloader runs at 100MHz, so no need for a change of the
bootloader.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
index b9c1716a7f60c..520cea063fb7e 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
@@ -4,7 +4,7 @@ MCU_VARIANT = MIMXRT1011DAE5A
 MICROPY_FLOAT_IMPL = single
 MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
-MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_133MHz
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_100MHz
 MICROPY_HW_FLASH_QE_CMD = 0x31
 MICROPY_HW_FLASH_QE_ARG = 0x02
 

From 4364d9411ad4c71bbf6de9bcc82683d6ee671cf5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 20 Feb 2025 09:19:33 +0100
Subject: [PATCH 1895/3129] mimxrt/hal/flexspi_nor_flash: Fix typo in comment
 about frequency.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/hal/flexspi_nor_flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/hal/flexspi_nor_flash.c b/ports/mimxrt/hal/flexspi_nor_flash.c
index 7fdb6b7c13df6..1476c1ec3a5db 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.c
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -83,7 +83,7 @@ static ps_div_t div_table_mhz[] = {
     { 18, 8 }, // 60 -> 60 MHz
     { 23, 5 }, // 75 -> 75.13 MHz
     { 18, 6 }, // 80 -> 80 MHz
-    { 17, 5 }, // 100 -> 191 Mhz
+    { 17, 5 }, // 100 -> 101 Mhz
     { 13, 5 }, // 133 -> 132.92 MHz
     { 13, 4 }  // 166  -> 166.15 MHz
 };

From 2992e3495630a8b83683db28241d638dbc53c911 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Tue, 19 Sep 2023 13:04:46 +1000
Subject: [PATCH 1896/3129] tools/mpremote: Add support for relative urls in
 package.json files.

URLs in `package.json` may now be specified relative to the base URL of the
`package.json` file.

Relative URLs wil work for `package.json` files installed from the web as
well as local file paths.

Docs: update `docs/reference/packages.rst` to add documentation for:

- Installing packages from local filesystems (PR #12476); and
- Using relative URLs in the `package.json` file (PR #12477);
- Update the packaging example to encourage relative URLs as the default
  in `package.json`.

Add `tools/mpremote/tests/test_mip_local_install.sh` to test the
installation of a package from local files using relative URLs in the
`package.json`.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 docs/reference/packages.rst                   | 48 +++++++++++--
 tools/mpremote/mpremote/mip.py                | 42 ++++++++----
 .../mpremote/tests/test_mip_local_install.sh  | 67 +++++++++++++++++++
 .../tests/test_mip_local_install.sh.exp       | 11 +++
 4 files changed, 149 insertions(+), 19 deletions(-)
 create mode 100755 tools/mpremote/tests/test_mip_local_install.sh
 create mode 100644 tools/mpremote/tests/test_mip_local_install.sh.exp

diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index 86b8efaa1953d..5b5f626d45232 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -96,6 +96,18 @@ The ``--target=path``, ``--no-mpy``, and ``--index`` arguments can be set::
     $ mpremote mip install --no-mpy pkgname
     $ mpremote mip install --index https://host/pi pkgname
 
+:term:`mpremote` can also install packages from files stored on the host's local
+filesystem::
+
+    $ mpremote mip install path/to/pkg.py
+    $ mpremote mip install path/to/app/package.json
+    $ mpremote mip install \\path\\to\\pkg.py
+
+This is especially useful for testing packages during development and for
+installing packages from local clones of GitHub repositories. Note that URLs in
+``package.json`` files must use forward slashes ("/") as directory separators,
+even on Windows, so that they are compatible with installing from the web.
+
 Installing packages manually
 ----------------------------
 
@@ -116,12 +128,25 @@ 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::
+An example ``mlx90640`` library hosted on GitHub could be installed with::
+
+    $ mpremote mip install github:org/micropython-mlx90640
+
+The layout for the package on GitHub might look like::
+
+    https://github.com/org/micropython-mlx90640/
+        package.json
+        mlx90640/
+            __init__.py
+            utils.py
+
+The ``package.json`` specifies the location of files to be installed and other
+dependencies::
 
     {
       "urls": [
-        ["mlx90640/__init__.py", "github:org/micropython-mlx90640/mlx90640/__init__.py"],
-        ["mlx90640/utils.py", "github:org/micropython-mlx90640/mlx90640/utils.py"]
+        ["mlx90640/__init__.py", "mlx90640/__init__.py"],
+        ["mlx90640/utils.py", "mlx90640/utils.py"]
       ],
       "deps": [
         ["collections-defaultdict", "latest"],
@@ -132,9 +157,20 @@ A typical ``package.json`` for an example ``mlx90640`` library looks like::
       "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
+The ``urls`` list specifies the files to be installed according to::
+
+    "urls": [
+        [destination_path, source_url]
+        ...
+
+where ``destination_path`` is the location and name of the file to be installed
+on the device and ``source_url`` is the URL of the file to be installed. The
+source URL would usually be specified relative to the directory containing the
+``package.json`` file, but can also be an absolute URL, eg::
+
+    ["mlx90640/utils.py", "github:org/micropython-mlx90640/mlx90640/utils.py"]
+
+The package depends on ``collections-defaultdict`` and ``os-path`` which will
 be installed automatically from the :term:`micropython-lib`. The third
 dependency installs the content as defined by the ``package.json`` file of the
 ``main`` branch of the GitHub repo ``org/micropython-additions``.
diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index 4ce62b7f77bbb..858b7933d11d8 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -7,6 +7,7 @@
 import json
 import tempfile
 import os
+import os.path
 
 from .commands import CommandError, show_progress_bar
 
@@ -64,22 +65,33 @@ def _rewrite_url(url, branch=None):
 
 
 def _download_file(transport, url, dest):
-    try:
-        with urllib.request.urlopen(url) as src:
-            data = src.read()
-            print("Installing:", dest)
-            _ensure_path_exists(transport, dest)
-            transport.fs_writefile(dest, data, progress_callback=show_progress_bar)
-    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}")
+    if url.startswith(allowed_mip_url_prefixes):
+        try:
+            with urllib.request.urlopen(url) as src:
+                data = src.read()
+        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}")
+    else:
+        if "\\" in url:
+            raise CommandError(f'Use "/" instead of "\\" in file URLs: {url!r}\n')
+        try:
+            with open(url, "rb") as f:
+                data = f.read()
+        except OSError as e:
+            raise CommandError(f"{e.strerror} opening {url}")
+
+    print("Installing:", dest)
+    _ensure_path_exists(transport, dest)
+    transport.fs_writefile(dest, data, progress_callback=show_progress_bar)
 
 
 def _install_json(transport, package_json_url, index, target, version, mpy):
+    base_url = ""
     if package_json_url.startswith(allowed_mip_url_prefixes):
         try:
             with urllib.request.urlopen(_rewrite_url(package_json_url, version)) as response:
@@ -91,12 +103,14 @@ def _install_json(transport, package_json_url, index, target, version, mpy):
                 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}")
+        base_url = package_json_url.rpartition("/")[0]
     elif package_json_url.endswith(".json"):
         try:
             with open(package_json_url, "r") as f:
                 package_json = json.load(f)
         except OSError:
             raise CommandError(f"Error opening {package_json_url}")
+        base_url = os.path.dirname(package_json_url)
     else:
         raise CommandError(f"Invalid url for package: {package_json_url}")
     for target_path, short_hash in package_json.get("hashes", ()):
@@ -105,6 +119,8 @@ def _install_json(transport, package_json_url, index, target, version, mpy):
         _download_file(transport, file_url, fs_target_path)
     for target_path, url in package_json.get("urls", ()):
         fs_target_path = target + "/" + target_path
+        if base_url and not url.startswith(allowed_mip_url_prefixes):
+            url = f"{base_url}/{url}"  # Relative URLs
         _download_file(transport, _rewrite_url(url, version), fs_target_path)
     for dep, dep_version in package_json.get("deps", ()):
         _install_package(transport, dep, index, target, dep_version, mpy)
diff --git a/tools/mpremote/tests/test_mip_local_install.sh b/tools/mpremote/tests/test_mip_local_install.sh
new file mode 100755
index 0000000000000..fb8c597bd1484
--- /dev/null
+++ b/tools/mpremote/tests/test_mip_local_install.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# This test the "mpremote mip install" from local files. It creates a package
+# and "mip installs" it into a ramdisk. The package is then imported and
+# executed. The package is a simple "Hello, world!" example.
+
+set -e
+
+PACKAGE=mip_example
+PACKAGE_DIR=${TMP}/example
+MODULE_DIR=${PACKAGE_DIR}/${PACKAGE}
+
+target=/__ramdisk
+block_size=512
+num_blocks=50
+
+# Create the smallest permissible ramdisk.
+cat << EOF > "${TMP}/ramdisk.py"
+class RAMBlockDev:
+    def __init__(self, block_size, num_blocks):
+        self.block_size = block_size
+        self.data = bytearray(block_size * num_blocks)
+
+    def readblocks(self, block_num, buf):
+        for i in range(len(buf)):
+            buf[i] = self.data[block_num * self.block_size + i]
+
+    def writeblocks(self, block_num, buf):
+        for i in range(len(buf)):
+            self.data[block_num * self.block_size + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4: # get number of blocks
+            return len(self.data) // self.block_size
+        if op == 5: # get block size
+            return self.block_size
+
+import os
+
+bdev = RAMBlockDev(${block_size}, ${num_blocks})
+os.VfsFat.mkfs(bdev)
+os.mount(bdev, '${target}')
+EOF
+
+echo ----- Setup
+mkdir -p ${MODULE_DIR}
+echo "def hello(): print('Hello, world!')" > ${MODULE_DIR}/hello.py
+echo "from .hello import hello" > ${MODULE_DIR}/__init__.py
+cat > ${PACKAGE_DIR}/package.json <<EOF
+{
+    "urls": [
+        ["${PACKAGE}/__init__.py", "${PACKAGE}/__init__.py"],
+        ["${PACKAGE}/hello.py", "${PACKAGE}/hello.py"]
+    ],
+    "version": "0.2"
+}
+EOF
+
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume mkdir ${target}/lib
+echo
+echo ---- Install package
+$MPREMOTE resume mip install --target=${target}/lib ${PACKAGE_DIR}/package.json
+echo
+echo ---- Test package
+$MPREMOTE resume exec "import sys; sys.path.append(\"${target}/lib\")"
+$MPREMOTE resume exec "import ${PACKAGE}; ${PACKAGE}.hello()"
diff --git a/tools/mpremote/tests/test_mip_local_install.sh.exp b/tools/mpremote/tests/test_mip_local_install.sh.exp
new file mode 100644
index 0000000000000..81cd06c6055fd
--- /dev/null
+++ b/tools/mpremote/tests/test_mip_local_install.sh.exp
@@ -0,0 +1,11 @@
+----- Setup
+mkdir :/__ramdisk/lib
+
+---- Install package
+Install ${TMP}/example/package.json
+Installing: /__ramdisk/lib/mip_example/__init__.py
+Installing: /__ramdisk/lib/mip_example/hello.py
+Done
+
+---- Test package
+Hello, world!

From 7e9d19e06b9ee1c4023a0d24f06afe30d82148ea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Feb 2025 14:03:31 +1100
Subject: [PATCH 1897/3129] github/workflows: Stop using ubuntu-20.04.

For GitHub Actions, ubuntu-20.04 is deprecated and will be removed by 1st
April 2025.  See announcement at
https://github.com/actions/runner-images/issues/11101

This commit changes actions that use ubuntu-20.04 to a newer image.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/mpy_format.yml       |  2 +-
 .github/workflows/ports_esp32.yml      |  2 +-
 .github/workflows/ports_mimxrt.yml     |  2 +-
 .github/workflows/ports_nrf.yml        |  2 +-
 .github/workflows/ports_renesas-ra.yml |  2 +-
 .github/workflows/ports_stm32.yml      |  2 +-
 .github/workflows/ports_unix.yml       |  8 ++++----
 tools/ci.sh                            | 17 +++++++++++------
 8 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index baa02ce08d507..b6768a46c3cdc 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04 # use 20.04 to get python2
+    runs-on: ubuntu-22.04 # use 22.04 to get python2
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 45808b659add7..0d76974f01946 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -25,7 +25,7 @@ jobs:
         ci_func:  # names are functions in ci.sh
           - esp32_build_cmod_spiram_s2
           - esp32_build_s3_c3
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
 
diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
index 9e782bf63b31c..7743e036ab377 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: 'micropython repo'  # test build with space in path
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
index d9cffb9778cba..76727c9d1f6bd 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
index b1a30c2f11798..b9fa74331dc0b 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   build_renesas_ra_board:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index f5e01dc1f620e..8800f145189b8 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -26,7 +26,7 @@ jobs:
           - stm32_pyb_build
           - stm32_nucleo_build
           - stm32_misc_build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index a095136b4a65e..2547015038e4d 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
 
   coverage_32bit:
-    runs-on: ubuntu-20.04 # use 20.04 to get libffi-dev:i386
+    runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
@@ -116,7 +116,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   nanbox:
-    runs-on: ubuntu-20.04 # use 20.04 to get python2, and libffi-dev:i386
+    runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
@@ -142,7 +142,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   stackless_clang:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
@@ -156,7 +156,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   float_clang:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
diff --git a/tools/ci.sh b/tools/ci.sh
index d50af4a0ae2ee..9125b5bc9f135 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -106,12 +106,16 @@ function ci_code_size_build {
 # .mpy file format
 
 function ci_mpy_format_setup {
+    sudo apt-get update
+    sudo apt-get install python2.7
     sudo pip3 install pyelftools
+    python2.7 --version
+    python3 --version
 }
 
 function ci_mpy_format_test {
     # Test mpy-tool.py dump feature on bytecode
-    python2 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
+    python2.7 ./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
@@ -268,18 +272,18 @@ function ci_powerpc_build {
 # ports/qemu
 
 function ci_qemu_setup_arm {
-    ci_mpy_format_setup
     ci_gcc_arm_setup
     sudo apt-get update
     sudo apt-get install qemu-system
+    sudo pip3 install pyelftools
     qemu-system-arm --version
 }
 
 function ci_qemu_setup_rv32 {
-    ci_mpy_format_setup
     ci_gcc_riscv_setup
     sudo apt-get update
     sudo apt-get install qemu-system
+    sudo pip3 install pyelftools
     qemu-system-riscv32 --version
 }
 
@@ -580,10 +584,11 @@ function ci_unix_coverage_run_native_mpy_tests {
 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 apt-get install gcc-multilib g++-multilib libffi-dev:i386 python2.7
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
     gcc --version
+    python2.7 --version
     python3 --version
 }
 
@@ -602,12 +607,12 @@ 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 CFLAGS_EXTRA="-DMICROPY_PY_MATH_CONSTANTS=1"
+    ci_unix_build_helper PYTHON=python2.7 VARIANT=nanbox CFLAGS_EXTRA="-DMICROPY_PY_MATH_CONSTANTS=1"
     ci_unix_build_ffi_lib_helper gcc -m32
 }
 
 function ci_unix_nanbox_run_tests {
-    ci_unix_run_tests_full_helper nanbox PYTHON=python2
+    ci_unix_run_tests_full_helper nanbox PYTHON=python2.7
 }
 
 function ci_unix_float_build {

From 8b1ed4473dd215d564498f577cb6f3339c3c2e57 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Feb 2025 16:46:43 +1100
Subject: [PATCH 1898/3129] github/workflows: Include the Python version in the
 ESP-IDF cache key.

Changing runner OS can change Python version, and ESP-IDF installs are
keyed on ESP-IDF and Python version together.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_esp32.yml | 4 ++--
 tools/ci.sh                       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 0d76974f01946..4c07f89437757 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -30,8 +30,8 @@ jobs:
     - uses: actions/checkout@v4
 
     - id: idf_ver
-      name: Read the ESP-IDF version
-      run: source tools/ci.sh && echo "IDF_VER=$IDF_VER" | tee "$GITHUB_OUTPUT"
+      name: Read the ESP-IDF version (including Python version)
+      run: source tools/ci.sh && echo "IDF_VER=${IDF_VER}-py${PYTHON_VER}" | tee "$GITHUB_OUTPUT"
 
     - name: Cached ESP-IDF install
       id: cache_esp_idf
diff --git a/tools/ci.sh b/tools/ci.sh
index 9125b5bc9f135..5b108d620258c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -140,6 +140,7 @@ function ci_cc3200_build {
 
 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
 IDF_VER=v5.2.2
+PYTHON_VER=$(python --version | cut -d' ' -f2)
 
 export IDF_CCACHE_ENABLE=1
 

From 5e206fdeb5225ce24efb9411cc879bafaa04b86f Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 18 Feb 2025 13:24:11 +0100
Subject: [PATCH 1899/3129] all: Upgrade codespell to v2.4.1.

This commit upgrades from codespell==2.2.6 to the current codespell==2.4.1,
adding emac to the ignore-words-list.

Signed-off-by: Christian Clauss <cclauss@me.com>
---
 .github/workflows/codespell.yml                       | 2 +-
 .pre-commit-config.yaml                               | 2 +-
 docs/reference/isr_rules.rst                          | 2 +-
 docs/reference/speed_python.rst                       | 2 +-
 examples/usercmodule/cexample/examplemodule.c         | 2 +-
 extmod/modlwip.c                                      | 2 +-
 ports/esp32/mpthreadport.c                            | 2 +-
 ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h | 2 +-
 ports/mimxrt/eth.c                                    | 2 +-
 ports/mimxrt/hal/flexspi_flash_config.h               | 2 +-
 ports/mimxrt/sdcard.c                                 | 2 +-
 ports/nrf/boards/MICROBIT/modules/microbitfont.h      | 2 +-
 ports/rp2/main.c                                      | 2 +-
 ports/samd/mcu/samd21/mpconfigmcu.h                   | 2 +-
 ports/samd/mcu/samd51/mpconfigmcu.h                   | 2 +-
 ports/windows/windows_mphal.c                         | 2 +-
 py/reader.h                                           | 2 +-
 pyproject.toml                                        | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 2d8b4627aac2d..1d6b1dc9d2b27 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     # codespell version should be kept in sync with .pre-commit-config.yml
-    - run: pip install --user codespell==2.2.6 tomli
+    - run: pip install --user codespell==2.4.1 tomli
     - run: codespell
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a1c811339adcc..193b2c6e83559 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
     # Version should be kept in sync with .github/workflows/codespell.yml
-    rev: v2.2.6
+    rev: v2.4.1
     hooks:
       - id: codespell
         name: Spellcheck for changed files (codespell)
diff --git a/docs/reference/isr_rules.rst b/docs/reference/isr_rules.rst
index 14010fb207fdd..5e8d6ad61201a 100644
--- a/docs/reference/isr_rules.rst
+++ b/docs/reference/isr_rules.rst
@@ -209,7 +209,7 @@ issue a further interrupt. It then schedules a callback to process the data.
 
 Scheduled callbacks should comply with the principles of interrupt handler design outlined below. This is to
 avoid problems resulting from I/O activity and the modification of shared data which can arise in any code
-which pre-empts the main program loop.
+which preempts the main program loop.
 
 Execution time needs to be considered in relation to the frequency with which interrupts can occur. If an
 interrupt occurs while the previous callback is executing, a further instance of the callback will be queued
diff --git a/docs/reference/speed_python.rst b/docs/reference/speed_python.rst
index a660432f6da37..64fd9df6c058a 100644
--- a/docs/reference/speed_python.rst
+++ b/docs/reference/speed_python.rst
@@ -219,7 +219,7 @@ process known as garbage collection reclaims the memory used by these redundant
 objects and the allocation is then tried again - a process which can take several
 milliseconds.
 
-There may be benefits in pre-empting this by periodically issuing `gc.collect()`.
+There may be benefits in preempting this by periodically issuing `gc.collect()`.
 Firstly doing a collection before it is actually required is quicker - typically on the
 order of 1ms if done frequently. Secondly you can determine the point in code
 where this time is used rather than have a longer delay occur at random points,
diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
index d13515e72cdd5..83cc3b27c058e 100644
--- a/examples/usercmodule/cexample/examplemodule.c
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -74,7 +74,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 // - A custom representation for __repr__ and __str__.
 // - Custom attribute handling to create a read/write "property".
 //
-// It re-uses some of the elements of the basic Timer class. This is allowed
+// It reuses some of the elements of the basic Timer class. This is allowed
 // because they both use example_Timer_obj_t as the instance structure.
 
 // Handles AdvancedTimer.__repr__, AdvancedTimer.__str__.
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index bcccd363e673c..f109e0029bb0f 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -476,7 +476,7 @@ static void _lwip_tcp_err_unaccepted(void *arg, err_t err) {
     // because it's only ever used by lwIP if tcp_connect is called on the TCP PCB.
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)pcb->connected;
 
-    // Array is not volatile because thiss callback is executed within the lwIP context
+    // Array is not volatile because this callback is executed within the lwIP context
     uint8_t alloc = socket->incoming.connection.alloc;
     struct tcp_pcb **tcp_array = (struct tcp_pcb **)lwip_socket_incoming_array(socket);
 
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index f436ebb80a7ad..962b5780d08dd 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -213,7 +213,7 @@ int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
 
 void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
     xSemaphoreGive(mutex->handle);
-    // Python threads run at equal priority, so pre-emptively yield here to
+    // Python threads run at equal priority, so preemptively yield here to
     // prevent pathological imbalances where a thread unlocks and then
     // immediately re-locks a mutex before a context switch can occur, leaving
     // another thread waiting for an unbounded period of time.
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
index 784373c939478..1ce06e7f408d7 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
@@ -52,7 +52,7 @@
     { IOMUXC_GPIO_02_LPI2C1_SCL }, { IOMUXC_GPIO_01_LPI2C1_SDA }, \
     { IOMUXC_GPIO_10_LPI2C2_SCL }, { IOMUXC_GPIO_09_LPI2C2_SDA },
 
-// Wifi Deinitions
+// Wifi Definitions
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-metro-m7"
 
 #define MICROPY_HW_WIFI_SPI_ID       (0)
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 3eb1a0cc35202..1ac19b83d6d44 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -327,7 +327,7 @@ static void eth_gpio_init(const iomux_table_t iomux_table[], size_t iomux_table_
     }
 }
 
-// eth_phy_init: Initilaize the PHY interface
+// eth_phy_init: Initialize 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) {
 
diff --git a/ports/mimxrt/hal/flexspi_flash_config.h b/ports/mimxrt/hal/flexspi_flash_config.h
index d9aa5ed5eab69..239d7b3b4f868 100644
--- a/ports/mimxrt/hal/flexspi_flash_config.h
+++ b/ports/mimxrt/hal/flexspi_flash_config.h
@@ -119,7 +119,7 @@ enum
     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.
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock configuration indication.
 };
 
 // !@brief Flash Type Definition
diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index ae52ed5d2cd09..84e2c98949d22 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -980,7 +980,7 @@ bool sdcard_power_on(mimxrt_sdcard_obj_t *card) {
         return false;
     }
 
-    // Finialize initialization
+    // Finalize initialization
     card->state->initialized = true;
     return true;
 }
diff --git a/ports/nrf/boards/MICROBIT/modules/microbitfont.h b/ports/nrf/boards/MICROBIT/modules/microbitfont.h
index 2ae0c8fab86ba..6e80acfe07214 100644
--- a/ports/nrf/boards/MICROBIT/modules/microbitfont.h
+++ b/ports/nrf/boards/MICROBIT/modules/microbitfont.h
@@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE.
   *
   * Example: { 0x08, 0x08, 0x08, 0x0, 0x08 }
   *
-  * The above will produce an exclaimation mark on the second column in form the left.
+  * The above will produce an exclamation mark on the second column in form the left.
   *
   * We could compress further, but the complexity of decode would likely outweigh the gains.
   */
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index d6bf448267152..58da63c06f12d 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -90,7 +90,7 @@ int main(int argc, char **argv) {
     // Set the MCU frequency and as a side effect the peripheral clock to 48 MHz.
     set_sys_clock_khz(SYS_CLK_KHZ, false);
 
-    // Hook for setting up anything that needs to be super early in the bootup process.
+    // Hook for setting up anything that needs to be super early in the boot-up process.
     MICROPY_BOARD_STARTUP();
 
     #if MICROPY_HW_ENABLE_UART_REPL
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 29965f50f63a8..f0a7a73e0c027 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -1,4 +1,4 @@
-// Deinitions common to all SAMD21 boards
+// Definitions common to all SAMD21 boards
 #include "samd21.h"
 
 #define MICROPY_CONFIG_ROM_LEVEL        (MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 9a7b8528f3573..831949bab56a0 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -1,4 +1,4 @@
-// Deinitions common to all SAMD51 boards
+// Definitions common to all SAMD51 boards
 #include "samd51.h"
 
 #define MICROPY_CONFIG_ROM_LEVEL        (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index b636393f5401c..5a65b2fd2aeae 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -70,7 +70,7 @@ void mp_hal_stdio_mode_orig(void) {
 }
 
 // Handler to be installed by SetConsoleCtrlHandler, currently used only to handle Ctrl-C.
-// This handler has to be installed just once (this has to be done elswhere in init code).
+// This handler has to be installed just once (this has to be done elsewhere in init code).
 // Previous versions of the mp_hal code would install a handler whenever Ctrl-C input is
 // allowed and remove the handler again when it is not. That is not necessary though (1),
 // and it might introduce problems (2) because console notifications are delivered to the
diff --git a/py/reader.h b/py/reader.h
index 301c70ab3f0d4..6378457007cb3 100644
--- a/py/reader.h
+++ b/py/reader.h
@@ -48,7 +48,7 @@ void mp_reader_new_file(mp_reader_t *reader, qstr filename);
 void mp_reader_new_file_from_fd(mp_reader_t *reader, int fd, bool close_fd);
 
 // Try to efficiently read the given number of bytes from a ROM-based reader.
-// Returns a valid, non-NULL pointer to the requseted data if the reader points to ROM.
+// Returns a valid, non-NULL pointer to the requested data if the reader points to ROM.
 // Returns NULL if the reader does not point to ROM.
 const uint8_t *mp_reader_try_read_rom(mp_reader_t *reader, size_t len);
 
diff --git a/pyproject.toml b/pyproject.toml
index 1650bd088ea22..aeb25c8a03a2b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.codespell]
 count = ""
 ignore-regex = '\b[A-Z]{3}\b'
-ignore-words-list = "ans,asend,deques,dout,extint,hsi,iput,mis,numer,shft,synopsys,technic,ure"
+ignore-words-list = "ans,asend,deques,dout,emac,extint,hsi,iput,mis,numer,shft,synopsys,technic,ure"
 quiet-level = 3
 skip = """
 */build*,\

From 3f0dd13d931c88a759a779853dfeaee566f0e79a Mon Sep 17 00:00:00 2001
From: Ronald Weber <ronaldxweber@gmail.com>
Date: Mon, 24 Feb 2025 17:34:29 +0100
Subject: [PATCH 1900/3129] docs: Fix double 'the' in documentation.

Signed-off-by: Ronald Weber <ronaldxweber@gmail.com>
---
 docs/esp8266/tutorial/repl.rst | 2 +-
 docs/library/framebuf.rst      | 2 +-
 docs/library/machine.UART.rst  | 2 +-
 docs/reference/repl.rst        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/esp8266/tutorial/repl.rst b/docs/esp8266/tutorial/repl.rst
index bc0142aaef5f9..db55d45facde8 100644
--- a/docs/esp8266/tutorial/repl.rst
+++ b/docs/esp8266/tutorial/repl.rst
@@ -38,7 +38,7 @@ 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
-locally from the the GitHub repository
+locally from the GitHub repository
 `<https://github.com/micropython/webrepl>`__.
 
 Before connecting to WebREPL, you should set a password and enable it via
diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index 149f4d6609be9..f22a3613bdbcb 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -114,7 +114,7 @@ Drawing text
 
 .. method:: FrameBuffer.text(s, x, y[, c])
 
-    Write text to the FrameBuffer using the the coordinates as the upper-left
+    Write text to the FrameBuffer using the coordinates as the upper-left
     corner of the text. The color of the text can be defined by the optional
     argument but is otherwise a default value of 1. All characters have
     dimensions of 8x8 pixels and there is currently no way to change the font.
diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 4dcb4a1e7c4a6..5be79cccce884 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -83,7 +83,7 @@ Methods
 
      - *pins* is a 4 or 2 item list indicating the TX, RX, RTS and CTS pins (in that order).
        Any of the pins can be None if one wants the UART to operate with limited functionality.
-       If the RTS pin is given the the RX pin must be given as well. The same applies to CTS.
+       If the RTS pin is given the RX pin must be given as well. The same applies to CTS.
        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.
 
diff --git a/docs/reference/repl.rst b/docs/reference/repl.rst
index be02ddebde8e2..2c019350f7e2a 100644
--- a/docs/reference/repl.rst
+++ b/docs/reference/repl.rst
@@ -213,7 +213,7 @@ 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.
+Ctrl-B will leave raw mode and return the regular (aka friendly) REPL.
 
 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

From dc2fcfcc5511a371ff684f7d7772e7a7b479246d Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 18 Feb 2025 10:01:09 +0100
Subject: [PATCH 1901/3129] all: Upgrade to ruff v0.9.6.

Signed-off-by: Christian Clauss <cclauss@me.com>
---
 .github/workflows/ruff.yml                    |  2 +-
 .pre-commit-config.yaml                       |  2 +-
 ports/nrf/examples/seeed_tft.py               |  1 +
 pyproject.toml                                | 22 ++++++++++++++-----
 tests/cpydiff/builtin_next_arg2.py            |  1 +
 tests/cpydiff/core_class_delnotimpl.py        |  1 +
 tests/cpydiff/core_fstring_concat.py          |  2 ++
 tests/cpydiff/core_function_argcount.py       |  1 +
 tests/cpydiff/core_import_all.py              |  1 +
 tests/cpydiff/core_import_path.py             |  1 +
 tests/cpydiff/core_import_split_ns_pkgs.py    |  1 +
 tests/cpydiff/core_locals_eval.py             |  1 +
 tests/cpydiff/module_array_comparison.py      |  1 +
 tests/cpydiff/module_array_constructor.py     |  1 +
 tests/cpydiff/modules_array_containment.py    |  1 +
 tests/cpydiff/modules_array_deletion.py       |  1 +
 tests/cpydiff/modules_array_subscrstep.py     |  1 +
 tests/cpydiff/modules_json_nonserializable.py |  1 +
 tests/cpydiff/modules_os_environ.py           |  1 +
 tests/cpydiff/modules_os_getenv.py            |  1 +
 tests/cpydiff/modules_struct_fewargs.py       |  1 +
 tests/cpydiff/modules_struct_manyargs.py      |  1 +
 .../modules_struct_whitespace_in_format.py    |  1 +
 tests/cpydiff/modules_sys_stdassign.py        |  1 +
 tests/cpydiff/syntax_assign_expr.py           |  1 +
 tests/cpydiff/syntax_spaces.py                |  1 +
 tests/cpydiff/syntax_unicode_nameesc.py       |  1 +
 tests/cpydiff/types_bytearray_sliceassign.py  |  1 +
 tests/cpydiff/types_bytes_format.py           |  1 +
 tests/cpydiff/types_bytes_keywords.py         |  1 +
 tests/cpydiff/types_bytes_subscrstep.py       |  1 +
 tests/cpydiff/types_dict_keys_set.py          |  1 +
 tests/cpydiff/types_exception_attrs.py        |  1 +
 tests/cpydiff/types_exception_chaining.py     |  1 +
 tests/cpydiff/types_exception_instancevar.py  |  1 +
 tests/cpydiff/types_exception_loops.py        |  1 +
 tests/cpydiff/types_float_rounding.py         |  1 +
 tests/cpydiff/types_list_delete_subscrstep.py |  1 +
 tests/cpydiff/types_list_store_noniter.py     |  1 +
 tests/cpydiff/types_list_store_subscrstep.py  |  1 +
 tests/cpydiff/types_memoryview_invalid.py     |  1 +
 tests/cpydiff/types_str_endswith.py           |  1 +
 tests/cpydiff/types_str_formatsubscr.py       |  1 +
 tests/cpydiff/types_str_keywords.py           |  1 +
 tests/cpydiff/types_str_ljust_rjust.py        |  1 +
 tests/cpydiff/types_str_rsplitnone.py         |  1 +
 tests/cpydiff/types_str_subscrstep.py         |  1 +
 tests/cpydiff/types_tuple_subscrstep.py       |  1 +
 tests/ports/cc3200/pin.py                     |  1 +
 tests/unicode/unicode.py                      |  2 +-
 tools/gen-cpydiff.py                          |  6 ++---
 tools/mpremote/mpremote/transport.py          |  2 +-
 tools/pyboard.py                              |  2 +-
 tools/pydfu.py                                |  5 ++---
 54 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 29e9ddbf8b61a..9265c25bcba13 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     # ruff version should be kept in sync with .pre-commit-config.yaml
-    - run: pip install --user ruff==0.1.3
+    - run: pipx install ruff==0.9.6
     - run: ruff check --output-format=github .
     - run: ruff format --diff .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 193b2c6e83559..d07f9b0fda2a9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     # Version should be kept in sync with .github/workflows/ruff.yml
-    rev: v0.1.3
+    rev: v0.9.6
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/ports/nrf/examples/seeed_tft.py b/ports/nrf/examples/seeed_tft.py
index f53b560226363..263da7ae0be7f 100644
--- a/ports/nrf/examples/seeed_tft.py
+++ b/ports/nrf/examples/seeed_tft.py
@@ -44,6 +44,7 @@
     tf = mount_tf()
     os.listdir()
 """
+
 import vfs
 import time
 import framebuf
diff --git a/pyproject.toml b/pyproject.toml
index aeb25c8a03a2b..d5e3d0e847464 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,6 +27,17 @@ line-length = 99
 target-version = "py37"
 
 [tool.ruff.lint]
+exclude = [  # Ruff finds Python SyntaxError in these files
+  "tests/cmdline/repl_autocomplete.py",
+  "tests/cmdline/repl_autoindent.py",
+  "tests/cmdline/repl_basic.py",
+  "tests/cmdline/repl_cont.py",
+  "tests/cmdline/repl_emacs_keys.py",
+  "tests/cmdline/repl_words_move.py",
+  "tests/feature_check/repl_emacs_check.py",
+  "tests/feature_check/repl_words_move_check.py",
+  "tests/micropython/viper_args.py",
+]
 extend-select = ["C9", "PLC"]
 ignore = [
   "E401",
@@ -37,14 +48,12 @@ ignore = [
   "F401",
   "F403",
   "F405",
-  "PLC1901",
+  "PLC0206",
 ]
+mccabe.max-complexity = 40
 
-[tool.ruff.mccabe]
-max-complexity = 40
-
-[tool.ruff.per-file-ignores]
-# Exclude all tests from linting (does not apply to formatting).
+[tool.ruff.lint.per-file-ignores]
+# Exclude all tests from linting.
 "tests/**/*.py" = ["ALL"]
 "ports/cc3200/tools/uniflash.py" = ["E711"]
 # manifest.py files are evaluated with some global names pre-defined
@@ -57,3 +66,4 @@ max-complexity = 40
 #   repl_: not real python files
 #   viper_args: uses f(*)
 exclude = ["tests/basics/*.py", "tests/*/repl_*.py", "tests/micropython/viper_args.py"]
+quote-style = "preserve"
diff --git a/tests/cpydiff/builtin_next_arg2.py b/tests/cpydiff/builtin_next_arg2.py
index 5df2d6e70f837..ed9565fe0fe77 100644
--- a/tests/cpydiff/builtin_next_arg2.py
+++ b/tests/cpydiff/builtin_next_arg2.py
@@ -9,4 +9,5 @@
     except StopIteration:
         val = deflt
 """
+
 print(next(iter(range(0)), 42))
diff --git a/tests/cpydiff/core_class_delnotimpl.py b/tests/cpydiff/core_class_delnotimpl.py
index 18c176e9bb1f7..6fac764ac9828 100644
--- a/tests/cpydiff/core_class_delnotimpl.py
+++ b/tests/cpydiff/core_class_delnotimpl.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 import gc
 
 
diff --git a/tests/cpydiff/core_fstring_concat.py b/tests/cpydiff/core_fstring_concat.py
index 83bf18820ece1..3daa13d75360e 100644
--- a/tests/cpydiff/core_fstring_concat.py
+++ b/tests/cpydiff/core_fstring_concat.py
@@ -6,7 +6,9 @@
 """
 
 x, y = 1, 2
+# fmt: off
 print("aa" f"{x}")  # works
 print(f"{x}" "ab")  # works
 print("a{}a" f"{x}")  # fails
 print(f"{x}" "a{}b")  # fails
+# fmt: on
diff --git a/tests/cpydiff/core_function_argcount.py b/tests/cpydiff/core_function_argcount.py
index 5f3dca4dcdbe4..c257def726aca 100644
--- a/tests/cpydiff/core_function_argcount.py
+++ b/tests/cpydiff/core_function_argcount.py
@@ -4,6 +4,7 @@
 cause: MicroPython counts "self" as an argument.
 workaround: Interpret error messages with the information above in mind.
 """
+
 try:
     [].append()
 except Exception as e:
diff --git a/tests/cpydiff/core_import_all.py b/tests/cpydiff/core_import_all.py
index 5adf9ae3eb1e6..0fbe9d4d4ecd6 100644
--- a/tests/cpydiff/core_import_all.py
+++ b/tests/cpydiff/core_import_all.py
@@ -4,6 +4,7 @@
 cause: Not implemented.
 workaround: Manually import the sub-modules directly in __init__.py using ``from . import foo, bar``.
 """
+
 from modules3 import *
 
 foo.hello()
diff --git a/tests/cpydiff/core_import_path.py b/tests/cpydiff/core_import_path.py
index 959fd571f57ab..2028386be84b0 100644
--- a/tests/cpydiff/core_import_path.py
+++ b/tests/cpydiff/core_import_path.py
@@ -4,6 +4,7 @@
 cause: MicroPython doesn't support namespace packages split across filesystem. Beyond that, MicroPython's import system is highly optimized for minimal memory usage.
 workaround: Details of import handling is inherently implementation dependent. Don't rely on such details in portable applications.
 """
+
 import modules
 
 print(modules.__path__)
diff --git a/tests/cpydiff/core_import_split_ns_pkgs.py b/tests/cpydiff/core_import_split_ns_pkgs.py
index 5c92b63124a50..a1cfd84893d4e 100644
--- a/tests/cpydiff/core_import_split_ns_pkgs.py
+++ b/tests/cpydiff/core_import_split_ns_pkgs.py
@@ -4,6 +4,7 @@
 cause: MicroPython's import system is highly optimized for simplicity, minimal memory usage, and minimal filesystem search overhead.
 workaround: Don't install modules belonging to the same namespace package in different directories. For MicroPython, it's recommended to have at most 3-component module search paths: for your current application, per-user (writable), system-wide (non-writable).
 """
+
 import sys
 
 sys.path.append(sys.path[1] + "/modules")
diff --git a/tests/cpydiff/core_locals_eval.py b/tests/cpydiff/core_locals_eval.py
index 025d226372986..3f6ad2a1dbbc6 100644
--- a/tests/cpydiff/core_locals_eval.py
+++ b/tests/cpydiff/core_locals_eval.py
@@ -4,6 +4,7 @@
 cause: MicroPython doesn't maintain symbolic local environment, it is optimized to an array of slots. Thus, local variables can't be accessed by a name. Effectively, ``eval(expr)`` in MicroPython is equivalent to ``eval(expr, globals(), globals())``.
 workaround: Unknown
 """
+
 val = 1
 
 
diff --git a/tests/cpydiff/module_array_comparison.py b/tests/cpydiff/module_array_comparison.py
index a442af3f5bc96..4929b1e590dac 100644
--- a/tests/cpydiff/module_array_comparison.py
+++ b/tests/cpydiff/module_array_comparison.py
@@ -4,6 +4,7 @@
 cause: Code size
 workaround: Compare individual elements
 """
+
 import array
 
 array.array("b", [1, 2]) == array.array("i", [1, 2])
diff --git a/tests/cpydiff/module_array_constructor.py b/tests/cpydiff/module_array_constructor.py
index 08cf2ef2d1c3c..a53589d22ae76 100644
--- a/tests/cpydiff/module_array_constructor.py
+++ b/tests/cpydiff/module_array_constructor.py
@@ -4,6 +4,7 @@
 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])
diff --git a/tests/cpydiff/modules_array_containment.py b/tests/cpydiff/modules_array_containment.py
index 8f25b0d49149d..b29895aa75892 100644
--- a/tests/cpydiff/modules_array_containment.py
+++ b/tests/cpydiff/modules_array_containment.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 import array
 
 print(1 in array.array("B", b"12"))
diff --git a/tests/cpydiff/modules_array_deletion.py b/tests/cpydiff/modules_array_deletion.py
index 3376527373edf..2e7c31124b2da 100644
--- a/tests/cpydiff/modules_array_deletion.py
+++ b/tests/cpydiff/modules_array_deletion.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 import array
 
 a = array.array("b", (1, 2, 3))
diff --git a/tests/cpydiff/modules_array_subscrstep.py b/tests/cpydiff/modules_array_subscrstep.py
index 24308bd9042d1..65b12332f54cd 100644
--- a/tests/cpydiff/modules_array_subscrstep.py
+++ b/tests/cpydiff/modules_array_subscrstep.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 import array
 
 a = array.array("b", (1, 2, 3))
diff --git a/tests/cpydiff/modules_json_nonserializable.py b/tests/cpydiff/modules_json_nonserializable.py
index d6a5660cadfdb..d83e7beca2d5a 100644
--- a/tests/cpydiff/modules_json_nonserializable.py
+++ b/tests/cpydiff/modules_json_nonserializable.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 import json
 
 try:
diff --git a/tests/cpydiff/modules_os_environ.py b/tests/cpydiff/modules_os_environ.py
index 491d8a3101636..4edde16656781 100644
--- a/tests/cpydiff/modules_os_environ.py
+++ b/tests/cpydiff/modules_os_environ.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Use ``getenv``, ``putenv`` and ``unsetenv``
 """
+
 import os
 
 try:
diff --git a/tests/cpydiff/modules_os_getenv.py b/tests/cpydiff/modules_os_getenv.py
index d1e828438e456..d5acd414eb3da 100644
--- a/tests/cpydiff/modules_os_getenv.py
+++ b/tests/cpydiff/modules_os_getenv.py
@@ -4,6 +4,7 @@
 cause: The ``environ`` attribute is not implemented
 workaround: Unknown
 """
+
 import os
 
 print(os.getenv("NEW_VARIABLE"))
diff --git a/tests/cpydiff/modules_struct_fewargs.py b/tests/cpydiff/modules_struct_fewargs.py
index cb6b0fd874ec4..49b2a3213c898 100644
--- a/tests/cpydiff/modules_struct_fewargs.py
+++ b/tests/cpydiff/modules_struct_fewargs.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 import struct
 
 try:
diff --git a/tests/cpydiff/modules_struct_manyargs.py b/tests/cpydiff/modules_struct_manyargs.py
index 03395baad3b59..e3b78930f219f 100644
--- a/tests/cpydiff/modules_struct_manyargs.py
+++ b/tests/cpydiff/modules_struct_manyargs.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 import struct
 
 try:
diff --git a/tests/cpydiff/modules_struct_whitespace_in_format.py b/tests/cpydiff/modules_struct_whitespace_in_format.py
index a882b38569a95..a7a1d2facdfff 100644
--- a/tests/cpydiff/modules_struct_whitespace_in_format.py
+++ b/tests/cpydiff/modules_struct_whitespace_in_format.py
@@ -4,6 +4,7 @@
 cause: MicroPython is optimised for code size.
 workaround: Don't use spaces in format strings.
 """
+
 import struct
 
 try:
diff --git a/tests/cpydiff/modules_sys_stdassign.py b/tests/cpydiff/modules_sys_stdassign.py
index 7d086078a93d6..29afe1b1203c9 100644
--- a/tests/cpydiff/modules_sys_stdassign.py
+++ b/tests/cpydiff/modules_sys_stdassign.py
@@ -4,6 +4,7 @@
 cause: They are stored in read-only memory.
 workaround: Unknown
 """
+
 import sys
 
 sys.stdin = None
diff --git a/tests/cpydiff/syntax_assign_expr.py b/tests/cpydiff/syntax_assign_expr.py
index d4ed063b39ae7..58f57ca1fbe02 100644
--- a/tests/cpydiff/syntax_assign_expr.py
+++ b/tests/cpydiff/syntax_assign_expr.py
@@ -4,4 +4,5 @@
 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)])
diff --git a/tests/cpydiff/syntax_spaces.py b/tests/cpydiff/syntax_spaces.py
index c308240a78da5..03d25d56199d1 100644
--- a/tests/cpydiff/syntax_spaces.py
+++ b/tests/cpydiff/syntax_spaces.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 try:
     print(eval("1and 0"))
 except SyntaxError:
diff --git a/tests/cpydiff/syntax_unicode_nameesc.py b/tests/cpydiff/syntax_unicode_nameesc.py
index 21628c974d80f..838394b6ebd09 100644
--- a/tests/cpydiff/syntax_unicode_nameesc.py
+++ b/tests/cpydiff/syntax_unicode_nameesc.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Unknown
 """
+
 print("\N{LATIN SMALL LETTER A}")
diff --git a/tests/cpydiff/types_bytearray_sliceassign.py b/tests/cpydiff/types_bytearray_sliceassign.py
index e4068b04b988b..353f61988fa04 100644
--- a/tests/cpydiff/types_bytearray_sliceassign.py
+++ b/tests/cpydiff/types_bytearray_sliceassign.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 b = bytearray(4)
 b[0:1] = [1, 2]
 print(b)
diff --git a/tests/cpydiff/types_bytes_format.py b/tests/cpydiff/types_bytes_format.py
index ad0498771165c..1a15e572c8ade 100644
--- a/tests/cpydiff/types_bytes_format.py
+++ b/tests/cpydiff/types_bytes_format.py
@@ -4,4 +4,5 @@
 cause: MicroPython strives to be a more regular implementation, so if both `str` and `bytes` support ``__mod__()`` (the % operator), it makes sense to support ``format()`` for both too. Support for ``__mod__`` can also be compiled out, which leaves only ``format()`` for bytes formatting.
 workaround: If you are interested in CPython compatibility, don't use ``.format()`` on bytes objects.
 """
+
 print(b"{}".format(1))
diff --git a/tests/cpydiff/types_bytes_keywords.py b/tests/cpydiff/types_bytes_keywords.py
index ade83d0a709eb..a459c94b41ed9 100644
--- a/tests/cpydiff/types_bytes_keywords.py
+++ b/tests/cpydiff/types_bytes_keywords.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Pass the encoding as a positional parameter, e.g. ``print(bytes('abc', 'utf-8'))``
 """
+
 print(bytes("abc", encoding="utf8"))
diff --git a/tests/cpydiff/types_bytes_subscrstep.py b/tests/cpydiff/types_bytes_subscrstep.py
index 51b94cb710f1c..c566cbdb630aa 100644
--- a/tests/cpydiff/types_bytes_subscrstep.py
+++ b/tests/cpydiff/types_bytes_subscrstep.py
@@ -4,4 +4,5 @@
 cause: MicroPython is highly optimized for memory usage.
 workaround: Use explicit loop for this very rare operation.
 """
+
 print(b"123"[0:3:2])
diff --git a/tests/cpydiff/types_dict_keys_set.py b/tests/cpydiff/types_dict_keys_set.py
index 3a0849a35564c..a5f127962e6c2 100644
--- a/tests/cpydiff/types_dict_keys_set.py
+++ b/tests/cpydiff/types_dict_keys_set.py
@@ -4,4 +4,5 @@
 cause: Not implemented.
 workaround: Explicitly convert keys to a set before using set operations.
 """
+
 print({1: 2, 3: 4}.keys() & {1})
diff --git a/tests/cpydiff/types_exception_attrs.py b/tests/cpydiff/types_exception_attrs.py
index ad72b62a61a5d..5fed45451d2d9 100644
--- a/tests/cpydiff/types_exception_attrs.py
+++ b/tests/cpydiff/types_exception_attrs.py
@@ -4,6 +4,7 @@
 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)
diff --git a/tests/cpydiff/types_exception_chaining.py b/tests/cpydiff/types_exception_chaining.py
index 836c4eb3e73f5..cff68d4124aec 100644
--- a/tests/cpydiff/types_exception_chaining.py
+++ b/tests/cpydiff/types_exception_chaining.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Unknown
 """
+
 try:
     raise TypeError
 except TypeError:
diff --git a/tests/cpydiff/types_exception_instancevar.py b/tests/cpydiff/types_exception_instancevar.py
index adc353361f015..fb67771baf33e 100644
--- a/tests/cpydiff/types_exception_instancevar.py
+++ b/tests/cpydiff/types_exception_instancevar.py
@@ -4,6 +4,7 @@
 cause: MicroPython is highly optimized for memory usage.
 workaround: Use user-defined exception subclasses.
 """
+
 e = Exception()
 e.x = 0
 print(e.x)
diff --git a/tests/cpydiff/types_exception_loops.py b/tests/cpydiff/types_exception_loops.py
index 8d326cbbbb000..549f1dd0a5bf0 100644
--- a/tests/cpydiff/types_exception_loops.py
+++ b/tests/cpydiff/types_exception_loops.py
@@ -4,6 +4,7 @@
 cause: Condition checks are optimized to happen at the end of loop body, and that line number is reported.
 workaround: Unknown
 """
+
 l = ["-foo", "-bar"]
 
 i = 0
diff --git a/tests/cpydiff/types_float_rounding.py b/tests/cpydiff/types_float_rounding.py
index a5b591966b0de..206e359ed9be7 100644
--- a/tests/cpydiff/types_float_rounding.py
+++ b/tests/cpydiff/types_float_rounding.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Unknown
 """
+
 print("%.1g" % -9.9)
diff --git a/tests/cpydiff/types_list_delete_subscrstep.py b/tests/cpydiff/types_list_delete_subscrstep.py
index 36e6f526b3d23..3c801d84949e0 100644
--- a/tests/cpydiff/types_list_delete_subscrstep.py
+++ b/tests/cpydiff/types_list_delete_subscrstep.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Use explicit loop for this rare operation.
 """
+
 l = [1, 2, 3, 4]
 del l[0:4:2]
 print(l)
diff --git a/tests/cpydiff/types_list_store_noniter.py b/tests/cpydiff/types_list_store_noniter.py
index 1d69b4a823188..581b1369801ac 100644
--- a/tests/cpydiff/types_list_store_noniter.py
+++ b/tests/cpydiff/types_list_store_noniter.py
@@ -4,6 +4,7 @@
 cause: RHS is restricted to be a tuple or list
 workaround: Use ``list(<iter>)`` on RHS to convert the iterable to a list
 """
+
 l = [10, 20]
 l[0:1] = range(4)
 print(l)
diff --git a/tests/cpydiff/types_list_store_subscrstep.py b/tests/cpydiff/types_list_store_subscrstep.py
index 1460372bb1754..97590267f4a64 100644
--- a/tests/cpydiff/types_list_store_subscrstep.py
+++ b/tests/cpydiff/types_list_store_subscrstep.py
@@ -4,6 +4,7 @@
 cause: Unknown
 workaround: Use explicit loop for this rare operation.
 """
+
 l = [1, 2, 3, 4]
 l[0:4:2] = [5, 6]
 print(l)
diff --git a/tests/cpydiff/types_memoryview_invalid.py b/tests/cpydiff/types_memoryview_invalid.py
index c995a2e8991c6..f288c50ab57b7 100644
--- a/tests/cpydiff/types_memoryview_invalid.py
+++ b/tests/cpydiff/types_memoryview_invalid.py
@@ -6,6 +6,7 @@
 In the worst case scenario, resizing an object which is the target of a memoryview can cause the memoryview(s) to reference invalid freed memory (a use-after-free bug) and corrupt the MicroPython runtime.
 workaround: Do not change the size of any ``bytearray`` or ``io.bytesIO`` object that has a ``memoryview`` assigned to it.
 """
+
 b = bytearray(b"abcdefg")
 m = memoryview(b)
 b.extend(b"hijklmnop")
diff --git a/tests/cpydiff/types_str_endswith.py b/tests/cpydiff/types_str_endswith.py
index f222ac1cd3ad3..890c7ba5ef47f 100644
--- a/tests/cpydiff/types_str_endswith.py
+++ b/tests/cpydiff/types_str_endswith.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Unknown
 """
+
 print("abc".endswith("c", 1))
diff --git a/tests/cpydiff/types_str_formatsubscr.py b/tests/cpydiff/types_str_formatsubscr.py
index 1b83cfff6cd34..5c59a1d200a9b 100644
--- a/tests/cpydiff/types_str_formatsubscr.py
+++ b/tests/cpydiff/types_str_formatsubscr.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Unknown
 """
+
 print("{a[0]}".format(a=[1, 2]))
diff --git a/tests/cpydiff/types_str_keywords.py b/tests/cpydiff/types_str_keywords.py
index 77a4eac1c1db2..640dfa6c39132 100644
--- a/tests/cpydiff/types_str_keywords.py
+++ b/tests/cpydiff/types_str_keywords.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Input the encoding format directly. eg ``print(bytes('abc', 'utf-8'))``
 """
+
 print(str(b"abc", encoding="utf8"))
diff --git a/tests/cpydiff/types_str_ljust_rjust.py b/tests/cpydiff/types_str_ljust_rjust.py
index 72e5105e025b2..7f91c137e905f 100644
--- a/tests/cpydiff/types_str_ljust_rjust.py
+++ b/tests/cpydiff/types_str_ljust_rjust.py
@@ -4,4 +4,5 @@
 cause: MicroPython is highly optimized for memory usage. Easy workarounds available.
 workaround: Instead of ``s.ljust(10)`` use ``"%-10s" % s``, instead of ``s.rjust(10)`` use ``"% 10s" % s``. Alternatively, ``"{:<10}".format(s)`` or ``"{:>10}".format(s)``.
 """
+
 print("abc".ljust(10))
diff --git a/tests/cpydiff/types_str_rsplitnone.py b/tests/cpydiff/types_str_rsplitnone.py
index 5d334fea2f846..ae524620a08a8 100644
--- a/tests/cpydiff/types_str_rsplitnone.py
+++ b/tests/cpydiff/types_str_rsplitnone.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Unknown
 """
+
 print("a a a".rsplit(None, 1))
diff --git a/tests/cpydiff/types_str_subscrstep.py b/tests/cpydiff/types_str_subscrstep.py
index 2d3245e5582f5..cd57f18ccb345 100644
--- a/tests/cpydiff/types_str_subscrstep.py
+++ b/tests/cpydiff/types_str_subscrstep.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Unknown
 """
+
 print("abcdefghi"[0:9:2])
diff --git a/tests/cpydiff/types_tuple_subscrstep.py b/tests/cpydiff/types_tuple_subscrstep.py
index f90f3c5bf4d16..60ba31af4cf74 100644
--- a/tests/cpydiff/types_tuple_subscrstep.py
+++ b/tests/cpydiff/types_tuple_subscrstep.py
@@ -4,4 +4,5 @@
 cause: Unknown
 workaround: Unknown
 """
+
 print((1, 2, 3, 4)[0:4:2])
diff --git a/tests/ports/cc3200/pin.py b/tests/ports/cc3200/pin.py
index 43537bba5ce07..d7b0fa976cd2a 100644
--- a/tests/ports/cc3200/pin.py
+++ b/tests/ports/cc3200/pin.py
@@ -3,6 +3,7 @@
 pull up or pull down connected.
 GP12 and GP17 must be connected together
 """
+
 from machine import Pin
 import os
 
diff --git a/tests/unicode/unicode.py b/tests/unicode/unicode.py
index 072e049fde416..58d406e63eb2a 100644
--- a/tests/unicode/unicode.py
+++ b/tests/unicode/unicode.py
@@ -5,7 +5,7 @@
 
 # Test all three forms of Unicode escape, and
 # all blocks of UTF-8 byte patterns
-s = "a\xA9\xFF\u0123\u0800\uFFEE\U0001F44C"
+s = "a\xa9\xff\u0123\u0800\uffee\U0001f44c"
 for i in range(-len(s), len(s)):
     print("s[%d]: %s   %X" % (i, s[i], ord(s[i])))
     print("s[:%d]: %d chars, '%s'" % (i, len(s[:i]), s[:i]))
diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 578b6c136f568..c0b5734389cdf 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -22,9 +22,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-""" gen-cpydiff generates documentation which outlines operations that differ between MicroPython
-    and CPython. This script is called by the docs Makefile for html and Latex and may be run
-    manually using the command make gen-cpydiff. """
+"""gen-cpydiff generates documentation which outlines operations that differ between MicroPython
+and CPython. This script is called by the docs Makefile for html and Latex and may be run
+manually using the command make gen-cpydiff."""
 
 import os
 import subprocess
diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index d845796953a29..c8fdc54a8891a 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -73,7 +73,7 @@ def fs_listdir(self, src=""):
         def repr_consumer(b):
             buf.extend(b.replace(b"\x04", b""))
 
-        cmd = "import os\nfor f in os.ilistdir(%s):\n" " print(repr(f), end=',')" % (
+        cmd = "import os\nfor f in os.ilistdir(%s):\n print(repr(f), end=',')" % (
             ("'%s'" % src) if src else ""
         )
         try:
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 0cf5b3d46596a..d49365f617efd 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -530,7 +530,7 @@ def fs_listdir(self, src=""):
         def repr_consumer(b):
             buf.extend(b.replace(b"\x04", b""))
 
-        cmd = "import os\nfor f in os.ilistdir(%s):\n" " print(repr(f), end=',')" % (
+        cmd = "import os\nfor f in os.ilistdir(%s):\n print(repr(f), end=',')" % (
             ("'%s'" % src) if src else ""
         )
         try:
diff --git a/tools/pydfu.py b/tools/pydfu.py
index e1e4074a6baff..cd7354818cdea 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -344,8 +344,7 @@ def read_dfu_file(filename):
     #   B   uint8_t     targets     Number of targets
     dfu_prefix, data = consume("<5sBIB", data, "signature version size targets")
     print(
-        "    %(signature)s v%(version)d, image size: %(size)d, "
-        "targets: %(targets)d" % dfu_prefix
+        "    %(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d" % dfu_prefix
     )
     for target_idx in range(dfu_prefix["targets"]):
         # Decode the Image Prefix
@@ -359,7 +358,7 @@ def read_dfu_file(filename):
         #   I       uint32_t    size        Size of image (without prefix)
         #   I       uint32_t    elements    Number of elements in the image
         img_prefix, data = consume(
-            "<6sBI255s2I", data, "signature altsetting named name " "size elements"
+            "<6sBI255s2I", data, "signature altsetting named name size elements"
         )
         img_prefix["num"] = target_idx
         if img_prefix["named"]:

From 8ce7a58be21eb77532b109594abcc4e47aa8d887 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 25 Feb 2025 10:43:01 +0100
Subject: [PATCH 1902/3129] tests: Four typos in tests directory.

Found by codespell.

Signed-off-by: Christian Clauss <cclauss@me.com>
---
 tests/README.md                      | 2 +-
 tests/extmod_hardware/machine_pwm.py | 2 +-
 tests/ports/esp32/esp32_nvs.py       | 2 +-
 tests/run-tests.py                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 891668c8b8737..21e14eee5e128 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -13,7 +13,7 @@ target platform and run the appropriate set of tests for that platform.  For exa
 
 That will run tests on the `/dev/ttyACM0` serial port.  You can also use shortcut
 device names like `a<n>` for `/dev/ttyACM<n>` and `c<n>` for `COM<n>`.  Use
-`./run-tests.py --help` to see all of the device possibilites, and other options.
+`./run-tests.py --help` to see all of the device possibilities, and other options.
 
 There are three kinds of tests:
 
diff --git a/tests/extmod_hardware/machine_pwm.py b/tests/extmod_hardware/machine_pwm.py
index 014030be5c601..e27da32548659 100644
--- a/tests/extmod_hardware/machine_pwm.py
+++ b/tests/extmod_hardware/machine_pwm.py
@@ -1,4 +1,4 @@
-# Test machine.PWM, frequncy and duty cycle (using machine.time_pulse_us).
+# Test machine.PWM, frequency and duty cycle (using machine.time_pulse_us).
 #
 # IMPORTANT: This test requires hardware connections: the PWM-output and pulse-input
 # pins must be wired together (see the variable `pwm_pulse_pins`).
diff --git a/tests/ports/esp32/esp32_nvs.py b/tests/ports/esp32/esp32_nvs.py
index fd8b152ca71d8..e6c308cde2f30 100644
--- a/tests/ports/esp32/esp32_nvs.py
+++ b/tests/ports/esp32/esp32_nvs.py
@@ -4,7 +4,7 @@
 
 nvs = NVS("mp-test")
 
-# test setting and gettin an integer kv
+# test setting and getting an integer kv
 nvs.set_i32("key1", 1234)
 print(nvs.get_i32("key1"))
 nvs.set_i32("key2", -503)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index b108b16395074..1af3dfc2973fc 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -848,7 +848,7 @@ def run_one_test(test_file):
         test_file_abspath = os.path.abspath(test_file).replace("\\", "/")
 
         if args.filters:
-            # Default verdict is the opposit of the first action
+            # Default verdict is the opposite of the first action
             verdict = "include" if args.filters[0][0] == "exclude" else "exclude"
             for action, pat in args.filters:
                 if pat.search(test_file):

From 731f7adf4f4541a36b32d59087148f78b39d7a27 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 18 Feb 2025 16:11:13 +1100
Subject: [PATCH 1903/3129] stm32/sdcard: Fix unchecked uint32_t overflow in SD
 card driver.

Manifests as `readblocks(-1, buf)` failing.  The ST HAL does a bounds
check, but it checks `(block_num + num_blocks)` is within bounds, so if
these values overflow then it allows the read which seems to hang some SD
Cards (but not all).

Fix by explicitly testing for overflow in our layer of the driver.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/sdcard.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index a7d0629399651..eef6548ddf4ed 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -498,13 +498,27 @@ static HAL_StatusTypeDef sdcard_wait_finished(uint32_t timeout) {
     return HAL_OK;
 }
 
-mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
+static HAL_StatusTypeDef sdcard_common_checks(uint32_t block_num, uint32_t num_blocks) {
     // check that SD card is initialised
     if (!(pyb_sdmmc_flags & PYB_SDMMC_FLAG_ACTIVE)) {
         return HAL_ERROR;
     }
 
-    HAL_StatusTypeDef err = HAL_OK;
+    // check that adding block_num & num_blocks don't overflow
+    // (the ST HAL does a bounds check, but only after adding them...)
+    uint32_t end_block;
+    if (__builtin_add_overflow(block_num, num_blocks, &end_block)) {
+        return HAL_ERROR;
+    }
+
+    return HAL_OK;
+}
+
+mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
+    HAL_StatusTypeDef err = sdcard_common_checks(block_num, num_blocks);
+    if (err != HAL_OK) {
+        return err;
+    }
 
     // check that dest pointer is aligned on a 4-byte boundary
     uint8_t *orig_dest = NULL;
@@ -595,13 +609,11 @@ mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blo
 }
 
 mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {
-    // check that SD card is initialised
-    if (!(pyb_sdmmc_flags & PYB_SDMMC_FLAG_ACTIVE)) {
-        return HAL_ERROR;
+    HAL_StatusTypeDef err = sdcard_common_checks(block_num, num_blocks);
+    if (err != HAL_OK) {
+        return err;
     }
 
-    HAL_StatusTypeDef err = HAL_OK;
-
     // check that src pointer is aligned on a 4-byte boundary
     if (((uint32_t)src & 3) != 0) {
         // pointer is not aligned, so allocate a temporary block to do the write

From 78728dc94abf9482d07efb3056d03ff6d41d7b1a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 18 Feb 2025 16:43:58 +1100
Subject: [PATCH 1904/3129] stm32/sdcard: Drop the pyb.SDCard timeout from 60
 to 30 seconds.

60 seconds is long enough that the USB serial connection drops out before
it times out (at least on my computer).

Also refactor out the timeout argument from sdcard_wait_finished, to try
and save a little code size.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/sdcard.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index eef6548ddf4ed..706d6315c44d4 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -158,6 +158,8 @@
 
 static uint8_t pyb_sdmmc_flags;
 
+#define TIMEOUT_MS 30000
+
 // TODO: I think that as an optimization, we can allocate these dynamically
 //       if an sd card is detected. This will save approx 260 bytes of RAM
 //       when no sdcard was being used.
@@ -441,7 +443,7 @@ static void sdcard_reset_periph(void) {
     SDIO->ICR = SDMMC_STATIC_FLAGS;
 }
 
-static HAL_StatusTypeDef sdcard_wait_finished(uint32_t timeout) {
+static HAL_StatusTypeDef sdcard_wait_finished(void) {
     // Wait for HAL driver to be ready (eg for DMA to finish)
     uint32_t start = HAL_GetTick();
     for (;;) {
@@ -463,7 +465,7 @@ static HAL_StatusTypeDef sdcard_wait_finished(uint32_t timeout) {
         }
         __WFI();
         enable_irq(irq_state);
-        if (HAL_GetTick() - start >= timeout) {
+        if (HAL_GetTick() - start >= TIMEOUT_MS) {
             return HAL_TIMEOUT;
         }
     }
@@ -490,7 +492,7 @@ static HAL_StatusTypeDef sdcard_wait_finished(uint32_t timeout) {
         if (!(state == HAL_SD_CARD_SENDING || state == HAL_SD_CARD_RECEIVING || state == HAL_SD_CARD_PROGRAMMING)) {
             return HAL_ERROR;
         }
-        if (HAL_GetTick() - start >= timeout) {
+        if (HAL_GetTick() - start >= TIMEOUT_MS) {
             return HAL_TIMEOUT;
         }
         __WFI();
@@ -569,7 +571,7 @@ mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blo
             err = HAL_SD_ReadBlocks_DMA(&sdmmc_handle.sd, dest, block_num, num_blocks);
         }
         if (err == HAL_OK) {
-            err = sdcard_wait_finished(60000);
+            err = sdcard_wait_finished();
         }
 
         #if SDIO_USE_GPDMA
@@ -588,14 +590,14 @@ mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blo
     } else {
         #if MICROPY_HW_ENABLE_MMCARD
         if (pyb_sdmmc_flags & PYB_SDMMC_FLAG_MMC) {
-            err = HAL_MMC_ReadBlocks(&sdmmc_handle.mmc, dest, block_num, num_blocks, 60000);
+            err = HAL_MMC_ReadBlocks(&sdmmc_handle.mmc, dest, block_num, num_blocks, TIMEOUT_MS);
         } else
         #endif
         {
-            err = HAL_SD_ReadBlocks(&sdmmc_handle.sd, dest, block_num, num_blocks, 60000);
+            err = HAL_SD_ReadBlocks(&sdmmc_handle.sd, dest, block_num, num_blocks, TIMEOUT_MS);
         }
         if (err == HAL_OK) {
-            err = sdcard_wait_finished(60000);
+            err = sdcard_wait_finished();
         }
     }
 
@@ -662,7 +664,7 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
             err = HAL_SD_WriteBlocks_DMA(&sdmmc_handle.sd, (uint8_t *)src, block_num, num_blocks);
         }
         if (err == HAL_OK) {
-            err = sdcard_wait_finished(60000);
+            err = sdcard_wait_finished();
         }
 
         #if SDIO_USE_GPDMA
@@ -681,14 +683,14 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
     } else {
         #if MICROPY_HW_ENABLE_MMCARD
         if (pyb_sdmmc_flags & PYB_SDMMC_FLAG_MMC) {
-            err = HAL_MMC_WriteBlocks(&sdmmc_handle.mmc, (uint8_t *)src, block_num, num_blocks, 60000);
+            err = HAL_MMC_WriteBlocks(&sdmmc_handle.mmc, (uint8_t *)src, block_num, num_blocks, TIMEOUT_MS);
         } else
         #endif
         {
-            err = HAL_SD_WriteBlocks(&sdmmc_handle.sd, (uint8_t *)src, block_num, num_blocks, 60000);
+            err = HAL_SD_WriteBlocks(&sdmmc_handle.sd, (uint8_t *)src, block_num, num_blocks, TIMEOUT_MS);
         }
         if (err == HAL_OK) {
-            err = sdcard_wait_finished(60000);
+            err = sdcard_wait_finished();
         }
     }
 

From e3101ce1b3782955ea2d103922f0dc19bc0331f6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 Feb 2025 15:14:08 +1100
Subject: [PATCH 1905/3129] qemu/boards/SABRELITE: Increase MicroPython heap to
 160k.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/boards/SABRELITE/mpconfigboard.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/qemu/boards/SABRELITE/mpconfigboard.mk b/ports/qemu/boards/SABRELITE/mpconfigboard.mk
index 80ea08f12cf76..e56dba712ff44 100644
--- a/ports/qemu/boards/SABRELITE/mpconfigboard.mk
+++ b/ports/qemu/boards/SABRELITE/mpconfigboard.mk
@@ -12,6 +12,10 @@ LDSCRIPT = mcu/arm/imx6.ld
 
 SRC_BOARD_O = shared/runtime/gchelper_generic.o
 
+# Use a larger heap than the default so tests run with the native emitter have
+# enough memory (because emitted ARM machine code is larger than Thumb2 code).
+MICROPY_HEAP_SIZE ?= 163840
+
 # It's really armv7a but closest supported value is armv6.
 MPY_CROSS_FLAGS += -march=armv6
 

From 14ba32bb205fa1f7d6ac456879b08aadb4e1aaf7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 24 Feb 2025 23:14:48 +1100
Subject: [PATCH 1906/3129] extmod/vfs_rom: Add bounds checking for all
 filesystem accesses.

Testing with ROMFS shows that it is relatively easy to end up with a
corrupt filesystem on the device -- eg due to the ROMFS deploy process
stopping half way through -- which could lead to hard crashes.  Notably,
there can be boot loops trying to mount a corrupt filesystem, crashes when
importing modules like `os` that first scan the filesystem for `os.py`, and
crashing when deploying a new ROMFS in certain cases because the old one is
removed while still mounted.

The main problem is that `mp_decode_uint()` has an loop that keeps going as
long as it reads 0xff byte values, which can happen in the case of erased
and unwritten flash.

This commit adds full bounds checking in the new `mp_decode_uint_checked()`
function, and that makes all ROMFS filesystem accesses robust.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_rom.c        | 114 +++++++++++++++++++++++++++++++---------
 tests/extmod/vfs_rom.py |  73 +++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 24 deletions(-)

diff --git a/extmod/vfs_rom.c b/extmod/vfs_rom.c
index 99ddaba95ed79..ff3652d2ce3a2 100644
--- a/extmod/vfs_rom.c
+++ b/extmod/vfs_rom.c
@@ -91,6 +91,7 @@
 #define ROMFS_RECORD_KIND_DATA_POINTER (3)
 #define ROMFS_RECORD_KIND_DIRECTORY (4)
 #define ROMFS_RECORD_KIND_FILE (5)
+#define ROMFS_RECORD_KIND_FILESYSTEM (0x14a6b1)
 
 typedef mp_uint_t record_kind_t;
 
@@ -101,34 +102,72 @@ struct _mp_obj_vfs_rom_t {
     const uint8_t *filesystem_end;
 };
 
-static record_kind_t extract_record(const uint8_t **fs, const uint8_t **fs_next) {
-    record_kind_t record_kind = mp_decode_uint(fs);
-    mp_uint_t record_len = mp_decode_uint(fs);
+// Returns 0 for success, -1 for failure.
+static int mp_decode_uint_checked(const uint8_t **ptr, const uint8_t *ptr_max, mp_uint_t *value_out) {
+    mp_uint_t unum = 0;
+    byte val;
+    const uint8_t *p = *ptr;
+    do {
+        if (p >= ptr_max) {
+            return -1;
+        }
+        val = *p++;
+        unum = (unum << 7) | (val & 0x7f);
+    } while ((val & 0x80) != 0);
+    *ptr = p;
+    *value_out = unum;
+    return 0;
+}
+
+static record_kind_t extract_record(const uint8_t **fs, const uint8_t **fs_next, const uint8_t *fs_max) {
+    mp_uint_t record_kind;
+    if (mp_decode_uint_checked(fs, fs_max, &record_kind) != 0) {
+        return ROMFS_RECORD_KIND_UNUSED;
+    }
+    mp_uint_t record_len;
+    if (mp_decode_uint_checked(fs, fs_max, &record_len) != 0) {
+        return ROMFS_RECORD_KIND_UNUSED;
+    }
     *fs_next = *fs + record_len;
     return record_kind;
 }
 
-static void extract_data(mp_obj_vfs_rom_t *self, const uint8_t *fs, const uint8_t *fs_top, size_t *size_out, const uint8_t **data_out) {
-    *size_out = 0;
-    *data_out = NULL;
+// Returns 0 for success, a negative integer for failure.
+static int extract_data(mp_obj_vfs_rom_t *self, const uint8_t *fs, const uint8_t *fs_top, size_t *size_out, const uint8_t **data_out) {
     while (fs < fs_top) {
         const uint8_t *fs_next;
-        record_kind_t record_kind = extract_record(&fs, &fs_next);
-        if (record_kind == ROMFS_RECORD_KIND_DATA_VERBATIM) {
-            // Verbatim data.
-            *size_out = fs_next - fs;
-            *data_out = fs;
+        record_kind_t record_kind = extract_record(&fs, &fs_next, fs_top);
+        if (record_kind == ROMFS_RECORD_KIND_UNUSED) {
+            // Corrupt filesystem.
             break;
+        } else if (record_kind == ROMFS_RECORD_KIND_DATA_VERBATIM) {
+            // Verbatim data.
+            if (size_out != NULL) {
+                *size_out = fs_next - fs;
+                *data_out = fs;
+            }
+            return 0;
         } else if (record_kind == ROMFS_RECORD_KIND_DATA_POINTER) {
             // Pointer to data.
-            *size_out = mp_decode_uint(&fs);
-            *data_out = self->filesystem + mp_decode_uint(&fs);
-            break;
+            mp_uint_t size;
+            if (mp_decode_uint_checked(&fs, fs_next, &size) != 0) {
+                break;
+            }
+            mp_uint_t offset;
+            if (mp_decode_uint_checked(&fs, fs_next, &offset) != 0) {
+                break;
+            }
+            if (size_out != NULL) {
+                *size_out = size;
+                *data_out = self->filesystem + offset;
+            }
+            return 0;
         } else {
             // Skip this record.
             fs = fs_next;
         }
     }
+    return -MP_EIO;
 }
 
 // Searches for `path` in the filesystem.
@@ -144,10 +183,17 @@ mp_import_stat_t mp_vfs_rom_search_filesystem(mp_obj_vfs_rom_t *self, const char
     }
     while (path_len > 0 && fs < fs_top) {
         const uint8_t *fs_next;
-        record_kind_t record_kind = extract_record(&fs, &fs_next);
-        if (record_kind == ROMFS_RECORD_KIND_DIRECTORY || record_kind == ROMFS_RECORD_KIND_FILE) {
+        record_kind_t record_kind = extract_record(&fs, &fs_next, fs_top);
+        if (record_kind == ROMFS_RECORD_KIND_UNUSED) {
+            // Corrupt filesystem.
+            return MP_IMPORT_STAT_NO_EXIST;
+        } else if (record_kind == ROMFS_RECORD_KIND_DIRECTORY || record_kind == ROMFS_RECORD_KIND_FILE) {
             // A directory or file record.
-            mp_uint_t name_len = mp_decode_uint(&fs);
+            mp_uint_t name_len;
+            if (mp_decode_uint_checked(&fs, fs_next, &name_len) != 0) {
+                // Corrupt filesystem.
+                return MP_IMPORT_STAT_NO_EXIST;
+            }
             if ((name_len == path_len
                  || (name_len < path_len && path[name_len] == '/'))
                 && memcmp(path, fs, name_len) == 0) {
@@ -167,8 +213,9 @@ mp_import_stat_t mp_vfs_rom_search_filesystem(mp_obj_vfs_rom_t *self, const char
                     if (path_len != 0) {
                         return MP_IMPORT_STAT_NO_EXIST;
                     }
-                    if (size_out != NULL) {
-                        extract_data(self, fs, fs_top, size_out, data_out);
+                    if (extract_data(self, fs, fs_top, size_out, data_out) != 0) {
+                        // Corrupt filesystem.
+                        return MP_IMPORT_STAT_NO_EXIST;
                     }
                     return MP_IMPORT_STAT_FILE;
                 }
@@ -214,7 +261,15 @@ static mp_obj_t vfs_rom_make_new(const mp_obj_type_t *type, size_t n_args, size_
     }
 
     // The ROMFS is a record itself, so enter into it and compute its limit.
-    extract_record(&self->filesystem, &self->filesystem_end);
+    record_kind_t record_kind = extract_record(&self->filesystem, &self->filesystem_end, self->filesystem + bufinfo.len);
+    if (record_kind != ROMFS_RECORD_KIND_FILESYSTEM) {
+        mp_raise_OSError(MP_ENODEV);
+    }
+
+    // Check the filesystem is within the limits of the input buffer.
+    if (self->filesystem_end > (const uint8_t *)bufinfo.buf + bufinfo.len) {
+        mp_raise_OSError(MP_ENODEV);
+    }
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -259,13 +314,21 @@ static mp_obj_t vfs_rom_ilistdir_it_iternext(mp_obj_t self_in) {
 
     while (self->index < self->index_top) {
         const uint8_t *index_next;
-        record_kind_t record_kind = extract_record(&self->index, &index_next);
+        record_kind_t record_kind = extract_record(&self->index, &index_next, self->index_top);
         uint32_t type;
         mp_uint_t name_len;
         size_t data_len;
-        if (record_kind == ROMFS_RECORD_KIND_DIRECTORY || record_kind == ROMFS_RECORD_KIND_FILE) {
+        if (record_kind == ROMFS_RECORD_KIND_UNUSED) {
+            // Corrupt filesystem.
+            self->index = self->index_top;
+            break;
+        } else if (record_kind == ROMFS_RECORD_KIND_DIRECTORY || record_kind == ROMFS_RECORD_KIND_FILE) {
             // A directory or file record.
-            name_len = mp_decode_uint(&self->index);
+            if (mp_decode_uint_checked(&self->index, index_next, &name_len) != 0) {
+                // Corrupt filesystem.
+                self->index = self->index_top;
+                break;
+            }
             if (record_kind == ROMFS_RECORD_KIND_DIRECTORY) {
                 // A directory.
                 type = MP_S_IFDIR;
@@ -274,7 +337,10 @@ static mp_obj_t vfs_rom_ilistdir_it_iternext(mp_obj_t self_in) {
                 // A file.
                 type = MP_S_IFREG;
                 const uint8_t *data_value;
-                extract_data(self->vfs_rom, self->index + name_len, index_next, &data_len, &data_value);
+                if (extract_data(self->vfs_rom, self->index + name_len, index_next, &data_len, &data_value) != 0) {
+                    // Corrupt filesystem.
+                    break;
+                }
             }
         } else {
             // Skip this record.
diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py
index f7958a93962d0..dc88481c028ac 100644
--- a/tests/extmod/vfs_rom.py
+++ b/tests/extmod/vfs_rom.py
@@ -223,6 +223,79 @@ def test_unknown_record(self):
             self.assertEqual(f.read(), b"contents")
 
 
+class TestCorrupt(unittest.TestCase):
+    def test_corrupt_filesystem(self):
+        # Make the filesystem length bigger than the buffer.
+        romfs = bytearray(make_romfs(()))
+        romfs[3] = 0x01
+        with self.assertRaises(OSError):
+            vfs.VfsRom(romfs)
+
+        # Corrupt the filesystem length.
+        romfs = bytearray(make_romfs(()))
+        romfs[3] = 0xFF
+        with self.assertRaises(OSError):
+            vfs.VfsRom(romfs)
+
+        # Corrupt the contents of the filesystem.
+        romfs = bytearray(make_romfs(()))
+        romfs[3] = 0x01
+        romfs.extend(b"\xff\xff")
+        fs = vfs.VfsRom(romfs)
+        with self.assertRaises(OSError):
+            fs.stat("a")
+        self.assertEqual(list(fs.ilistdir("")), [])
+
+    def test_corrupt_file_entry(self):
+        romfs = make_romfs((("file", b"data"),))
+
+        # Corrupt the length of filename.
+        romfs_corrupt = bytearray(romfs)
+        romfs_corrupt[7:] = b"\xff" * (len(romfs) - 7)
+        fs = vfs.VfsRom(romfs_corrupt)
+        with self.assertRaises(OSError):
+            fs.stat("file")
+        self.assertEqual(list(fs.ilistdir("")), [])
+
+        # Erase the data record (change it to a padding record).
+        romfs_corrupt = bytearray(romfs)
+        romfs_corrupt[12] = VfsRomWriter.ROMFS_RECORD_KIND_PADDING
+        fs = vfs.VfsRom(romfs_corrupt)
+        with self.assertRaises(OSError):
+            fs.stat("file")
+        self.assertEqual(list(fs.ilistdir("")), [])
+
+        # Corrupt the header of the data record.
+        romfs_corrupt = bytearray(romfs)
+        romfs_corrupt[12:] = b"\xff" * (len(romfs) - 12)
+        fs = vfs.VfsRom(romfs_corrupt)
+        with self.assertRaises(OSError):
+            fs.stat("file")
+
+        # Corrupt the interior of the data record.
+        romfs_corrupt = bytearray(romfs)
+        romfs_corrupt[13:] = b"\xff" * (len(romfs) - 13)
+        fs = vfs.VfsRom(romfs_corrupt)
+        with self.assertRaises(OSError):
+            fs.stat("file")
+
+        # Change the data record to an indirect pointer and corrupt the length.
+        romfs_corrupt = bytearray(romfs)
+        romfs_corrupt[12] = VfsRomWriter.ROMFS_RECORD_KIND_DATA_POINTER
+        romfs_corrupt[14:18] = b"\xff\xff\xff\xff"
+        fs = vfs.VfsRom(romfs_corrupt)
+        with self.assertRaises(OSError):
+            fs.stat("file")
+
+        # Change the data record to an indirect pointer and corrupt the offset.
+        romfs_corrupt = bytearray(romfs)
+        romfs_corrupt[12] = VfsRomWriter.ROMFS_RECORD_KIND_DATA_POINTER
+        romfs_corrupt[14:18] = b"\x00\xff\xff\xff"
+        fs = vfs.VfsRom(romfs_corrupt)
+        with self.assertRaises(OSError):
+            fs.stat("file")
+
+
 class TestStandalone(TestBase):
     def test_constructor(self):
         self.assertIsInstance(vfs.VfsRom(self.romfs), vfs.VfsRom)

From dc2c33b07f83ac4fcbcbcbb294e5726a95507490 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 4 Jan 2025 12:51:18 +0100
Subject: [PATCH 1907/3129] py/emitinlinerv32: Fix compilation with ESP-IDF
 v5.2 and later.

This commit fixes a compilation warning (turned error) about a
potentially uninitialised variable being used.  The warning can be
ignored as the variable in question is always written to, but the code
has been changed to silence that warning.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitinlinerv32.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/py/emitinlinerv32.c b/py/emitinlinerv32.c
index 179e289c67b05..ba171b4e6fae0 100644
--- a/py/emitinlinerv32.c
+++ b/py/emitinlinerv32.c
@@ -709,9 +709,11 @@ static bool handle_load_store_opcode_with_offset(emit_inline_asm_t *emit, qstr o
         return false;
     }
 
-    mp_uint_t rd;
-    mp_uint_t rs1;
-    parse_register_node(nodes[0], &rd, opcode_data->argument1_kind & C);
+    mp_uint_t rd = 0;
+    mp_uint_t rs1 = 0;
+    if (!parse_register_node(nodes[0], &rd, opcode_data->argument1_kind & C)) {
+        return false;
+    }
     if (!parse_register_node(nodes[1], &rs1, opcode_data->argument3_kind & C)) {
         return false;
     }

From 8633abc08291d98035c65904dc4dab9983ddada3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 4 Jan 2025 12:54:44 +0100
Subject: [PATCH 1908/3129] py/emitinlinerv32: Reduce the footprint of compiled
 code.

This commit introduces a few changes aimed at reducing the amount of
space taken by the inline assembler once compiled:

* The register string table uses 2 bytes for each qstr rather than the
  usual 4
* The opcode table uses 2 bytes for each qstr rather than the usual 4
* Opcode masks are not embedded in each opcode entry but looked up via
  an additional smaller table, reducing the number of bytes taken by
  an opcode's masks from 12 to 2 (with a fixed overhead of 24 bytes for
  the the masks themselves stored elsewhere)
* Some error messages had a trailing period, now removed
* Error messages have been parameterised when possible, and the overall
  text length is smaller.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitinlinerv32.c | 332 ++++++++++++++++++++++++--------------------
 1 file changed, 181 insertions(+), 151 deletions(-)

diff --git a/py/emitinlinerv32.c b/py/emitinlinerv32.c
index ba171b4e6fae0..a9a81ddf16c4c 100644
--- a/py/emitinlinerv32.c
+++ b/py/emitinlinerv32.c
@@ -60,7 +60,7 @@ struct _emit_inline_asm_t {
     qstr *label_lookup;
 };
 
-static const qstr REGISTERS_QSTR_TABLE[] = {
+static const qstr_short_t REGISTERS_QSTR_TABLE[] = {
     MP_QSTR_zero, MP_QSTR_ra,  MP_QSTR_sp,  MP_QSTR_gp,  MP_QSTR_tp,  MP_QSTR_t0,  MP_QSTR_t1,  MP_QSTR_t2,
     MP_QSTR_s0,   MP_QSTR_s1,  MP_QSTR_a0,  MP_QSTR_a1,  MP_QSTR_a2,  MP_QSTR_a3,  MP_QSTR_a4,  MP_QSTR_a5,
     MP_QSTR_a6,   MP_QSTR_a7,  MP_QSTR_s2,  MP_QSTR_s3,  MP_QSTR_s4,  MP_QSTR_s5,  MP_QSTR_s6,  MP_QSTR_s7,
@@ -185,18 +185,21 @@ static bool emit_inline_rv32_label(emit_inline_asm_t *emit, mp_uint_t label_num,
     return true;
 }
 
-#define CALL_RRR 0 // Register, Register, Register
-#define CALL_RR  1 // Register, Register
-#define CALL_RRI 2 // Register, Register, Immediate
-#define CALL_RRL 3 // Register, Register, Label
-#define CALL_RI  4 // Register, Immediate
-#define CALL_L   5 // Label
-#define CALL_R   6 // Register
-#define CALL_RL  7 // Register, Label
-#define CALL_N   8 // No arguments
-#define CALL_I   9 // Immediate
-#define CALL_RII 10 // Register, Immediate, Immediate
-#define CALL_RIR 11 // Register, Immediate(Register)
+typedef enum {
+    CALL_RRR, // Opcode Register, Register, Register
+    CALL_RR,  // Opcode Register, Register
+    CALL_RRI, // Opcode Register, Register, Immediate
+    CALL_RRL, // Opcode Register, Register, Label
+    CALL_RI,  // Opcode Register, Immediate
+    CALL_L,   // Opcode Label
+    CALL_R,   // Opcode Register
+    CALL_RL,  // Opcode Register, Label
+    CALL_N,   // Opcode
+    CALL_I,   // Opcode Immediate
+    CALL_RII, // Opcode Register, Register, Immediate
+    CALL_RIR, // Opcode Register, Immediate(Register)
+    CALL_COUNT
+} call_convention_t;
 
 #define N 0 // No argument
 #define R 1 // Register
@@ -217,18 +220,21 @@ typedef void (*call_r_t)(asm_rv32_t *state, mp_uint_t rd);
 typedef void (*call_n_t)(asm_rv32_t *state);
 
 typedef struct _opcode_t {
-    qstr qstring;
-    void *emitter;
+    qstr_short_t qstring;
+    uint16_t argument1_mask : 4;
+    uint16_t argument2_mask : 4;
+    uint16_t argument3_mask : 4;
+    uint16_t arguments_count : 2;
+    // 2 bits available here
     uint32_t calling_convention : 4;
     uint32_t argument1_kind : 4;
-    uint32_t argument1_shift : 5;
+    uint32_t argument1_shift : 4;
     uint32_t argument2_kind : 4;
-    uint32_t argument2_shift : 5;
+    uint32_t argument2_shift : 4;
     uint32_t argument3_kind : 4;
-    uint32_t argument3_shift : 5;
-    uint32_t argument1_mask;
-    uint32_t argument2_mask;
-    uint32_t argument3_mask;
+    uint32_t argument3_shift : 4;
+    // 4 bits available here
+    void *emitter;
 } opcode_t;
 
 #define opcode_li asm_rv32_emit_optimised_load_immediate
@@ -249,89 +255,129 @@ static void opcode_la(asm_rv32_t *state, mp_uint_t rd, mp_int_t displacement) {
 #define IZ  (I | Z)
 #define IUZ (I | U | Z)
 
+#define MASK_NOT_USED 0
+
+enum {
+    MASK_FFFFFFFF,
+    MASK_00000FFF,
+    MASK_FFFFF000,
+    MASK_00001FFE,
+    MASK_0000001F,
+    MASK_FFFFFFFE,
+    MASK_0000003F,
+    MASK_0000FF00,
+    MASK_000003FC,
+    MASK_000001FE,
+    MASK_00000FFE,
+    MASK_FFFFFFFA,
+    MASK_0001F800,
+    MASK_0000007C,
+    MASK_000000FC,
+    MASK_001FFFFE,
+};
+
+static const uint32_t OPCODE_MASKS[] = {
+    [MASK_FFFFFFFF] = 0xFFFFFFFF,
+    [MASK_00000FFF] = 0x00000FFF,
+    [MASK_FFFFF000] = 0xFFFFF000,
+    [MASK_00001FFE] = 0x00001FFE,
+    [MASK_0000001F] = 0x0000001F,
+    [MASK_FFFFFFFE] = 0xFFFFFFFE,
+    [MASK_0000003F] = 0x0000003F,
+    [MASK_0000FF00] = 0x0000FF00,
+    [MASK_000003FC] = 0x000003FC,
+    [MASK_000001FE] = 0x000001FE,
+    [MASK_00000FFE] = 0x00000FFE,
+    [MASK_FFFFFFFA] = 0xFFFFFFFA,
+    [MASK_0001F800] = 0x0001F800,
+    [MASK_0000007C] = 0x0000007C,
+    [MASK_000000FC] = 0x000000FC,
+    [MASK_001FFFFE] = 0x001FFFFE,
+};
+
 static const opcode_t OPCODES[] = {
-    { MP_QSTR_add,        asm_rv32_opcode_add,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_addi,       asm_rv32_opcode_addi,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_and_,       asm_rv32_opcode_and,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_andi,       asm_rv32_opcode_andi,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_auipc,      asm_rv32_opcode_auipc,     CALL_RI,  R,   0, I,   12, N,  0, 0xFFFFFFFF, 0xFFFFF000, 0x00000000 },
-    { MP_QSTR_beq,        asm_rv32_opcode_beq,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
-    { MP_QSTR_bge,        asm_rv32_opcode_bge,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
-    { MP_QSTR_bgeu,       asm_rv32_opcode_bgeu,      CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
-    { MP_QSTR_blt,        asm_rv32_opcode_blt,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
-    { MP_QSTR_bltu,       asm_rv32_opcode_bltu,      CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
-    { MP_QSTR_bne,        asm_rv32_opcode_bne,       CALL_RRL, R,   0, R,   0,  L,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00001FFE },
-    { MP_QSTR_csrrc,      asm_rv32_opcode_csrrc,     CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_csrrs,      asm_rv32_opcode_csrrs,     CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_csrrw,      asm_rv32_opcode_csrrw,     CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_csrrci,     asm_rv32_opcode_csrrci,    CALL_RII, R,   0, IU,  0,  IU, 0, 0xFFFFFFFF, 0x00000FFF, 0x0000001F },
-    { MP_QSTR_csrrsi,     asm_rv32_opcode_csrrsi,    CALL_RII, R,   0, IU,  0,  IU, 0, 0xFFFFFFFF, 0x00000FFF, 0x0000001F },
-    { MP_QSTR_csrrwi,     asm_rv32_opcode_csrrwi,    CALL_RII, R,   0, IU,  0,  IU, 0, 0xFFFFFFFF, 0x00000FFF, 0x0000001F },
-    { MP_QSTR_c_add,      asm_rv32_opcode_cadd,      CALL_RR,  R,   0, R,   0,  N,  0, 0xFFFFFFFE, 0xFFFFFFFE, 0x00000000 },
-    { MP_QSTR_c_addi,     asm_rv32_opcode_caddi,     CALL_RI,  R,   0, IZ,  0,  N,  0, 0xFFFFFFFE, 0x0000003F, 0x00000000 },
-    { MP_QSTR_c_addi4spn, asm_rv32_opcode_caddi4spn, CALL_RI,  R,   0, IUZ, 0,  N,  0, 0x0000FF00, 0x000003FC, 0x00000000 },
-    { MP_QSTR_c_and,      asm_rv32_opcode_cand,      CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
-    { MP_QSTR_c_andi,     asm_rv32_opcode_candi,     CALL_RI,  RC,  0, I,   0,  N,  0, 0x0000FF00, 0x0000003F, 0x00000000 },
-    { MP_QSTR_c_beqz,     asm_rv32_opcode_cbeqz,     CALL_RL,  RC,  0, L,   0,  N,  0, 0x0000FF00, 0x000001FE, 0x00000000 },
-    { MP_QSTR_c_bnez,     asm_rv32_opcode_cbnez,     CALL_RL,  RC,  0, L,   0,  N,  0, 0x0000FF00, 0x000001FE, 0x00000000 },
-    { MP_QSTR_c_ebreak,   asm_rv32_opcode_cebreak,   CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
-    { MP_QSTR_c_j,        asm_rv32_opcode_cj,        CALL_L,   L,   0, N,   0,  N,  0, 0x00000FFE, 0x00000000, 0x00000000 },
-    { MP_QSTR_c_jal,      asm_rv32_opcode_cjal,      CALL_L,   L,   0, N,   0,  N,  0, 0x00000FFE, 0x00000000, 0x00000000 },
-    { MP_QSTR_c_jalr,     asm_rv32_opcode_cjalr,     CALL_R,   R,   0, N,   0,  N,  0, 0xFFFFFFFE, 0x00000000, 0x00000000 },
-    { MP_QSTR_c_jr,       asm_rv32_opcode_cjr,       CALL_R,   R,   0, N,   0,  N,  0, 0xFFFFFFFE, 0x00000000, 0x00000000 },
-    { MP_QSTR_c_li,       asm_rv32_opcode_cli,       CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFE, 0x0000003F, 0x00000000 },
-    { MP_QSTR_c_lui,      asm_rv32_opcode_clui,      CALL_RI,  R,   0, IUZ, 12, N,  0, 0xFFFFFFFA, 0x0001F800, 0x00000000 },
-    { MP_QSTR_c_lw,       asm_rv32_opcode_clw,       CALL_RIR, RC,  0, I,   0,  RC, 0, 0x0000FF00, 0x0000007C, 0x0000FF00 },
-    { MP_QSTR_c_lwsp,     asm_rv32_opcode_clwsp,     CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFE, 0x000000FC, 0x00000000 },
-    { MP_QSTR_c_mv,       asm_rv32_opcode_cmv,       CALL_RR,  R,   0, R,   0,  N,  0, 0xFFFFFFFE, 0xFFFFFFFE, 0x00000000 },
-    { MP_QSTR_c_nop,      asm_rv32_opcode_cnop,      CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
-    { MP_QSTR_c_or,       asm_rv32_opcode_cor,       CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
-    { MP_QSTR_c_slli,     asm_rv32_opcode_cslli,     CALL_RI,  R,   0, IU,  0,  N,  0, 0xFFFFFFFE, 0x0000001F, 0x00000000 },
-    { MP_QSTR_c_srai,     asm_rv32_opcode_csrai,     CALL_RI,  RC,  0, IU,  0,  N,  0, 0x0000FF00, 0x0000001F, 0x00000000 },
-    { MP_QSTR_c_srli,     asm_rv32_opcode_csrli,     CALL_RI,  RC,  0, IU,  0,  N,  0, 0x0000FF00, 0x0000001F, 0x00000000 },
-    { MP_QSTR_c_sub,      asm_rv32_opcode_csub,      CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
-    { MP_QSTR_c_sw,       asm_rv32_opcode_csw,       CALL_RIR, RC,  0, I,   0,  RC, 0, 0x0000FF00, 0x0000007C, 0x0000FF00 },
-    { MP_QSTR_c_swsp,     asm_rv32_opcode_cswsp,     CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFF, 0x000000FC, 0x00000000 },
-    { MP_QSTR_c_xor,      asm_rv32_opcode_cxor,      CALL_RR,  RC,  0, RC,  0,  N,  0, 0x0000FF00, 0x0000FF00, 0x00000000 },
-    { MP_QSTR_div,        asm_rv32_opcode_div,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_divu,       asm_rv32_opcode_divu,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_ebreak,     asm_rv32_opcode_ebreak,    CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
-    { MP_QSTR_ecall,      asm_rv32_opcode_ecall,     CALL_N,   N,   0, N,   0,  N,  0, 0x00000000, 0x00000000, 0x00000000 },
-    { MP_QSTR_jal,        asm_rv32_opcode_jal,       CALL_RL,  R,   0, L,   0,  N,  0, 0xFFFFFFFF, 0x001FFFFE, 0x00000000 },
-    { MP_QSTR_jalr,       asm_rv32_opcode_jalr,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_la,         opcode_la,                 CALL_RL,  R,   0, L,   0,  N,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000 },
-    { MP_QSTR_lb,         asm_rv32_opcode_lb,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_lbu,        asm_rv32_opcode_lbu,       CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_lh,         asm_rv32_opcode_lh,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_lhu,        asm_rv32_opcode_lhu,       CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_li,         opcode_li,                 CALL_RI,  R,   0, I,   0,  N,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000 },
-    { MP_QSTR_lui,        asm_rv32_opcode_lui,       CALL_RI,  R,   0, I,   12, N,  0, 0xFFFFFFFF, 0xFFFFF000, 0x00000000 },
-    { MP_QSTR_lw,         asm_rv32_opcode_lw,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_mv,         asm_rv32_opcode_cmv,       CALL_RR,  R,   0, R,   0,  N,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000 },
-    { MP_QSTR_mul,        asm_rv32_opcode_mul,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_mulh,       asm_rv32_opcode_mulh,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_mulhsu,     asm_rv32_opcode_mulhsu,    CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_mulhu,      asm_rv32_opcode_mulhu,     CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_or_,        asm_rv32_opcode_or,        CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_ori,        asm_rv32_opcode_ori,       CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_rem,        asm_rv32_opcode_rem,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_remu,       asm_rv32_opcode_remu,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_sb,         asm_rv32_opcode_sb,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_sh,         asm_rv32_opcode_sh,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_sll,        asm_rv32_opcode_sll,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_slli,       asm_rv32_opcode_slli,      CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000001F },
-    { MP_QSTR_slt,        asm_rv32_opcode_slt,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_slti,       asm_rv32_opcode_slti,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_sltiu,      asm_rv32_opcode_sltiu,     CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
-    { MP_QSTR_sltu,       asm_rv32_opcode_sltu,      CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_sra,        asm_rv32_opcode_sra,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_srai,       asm_rv32_opcode_srai,      CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000001F },
-    { MP_QSTR_srl,        asm_rv32_opcode_srl,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_srli,       asm_rv32_opcode_srli,      CALL_RRI, R,   0, R,   0,  IU, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000001F },
-    { MP_QSTR_sub,        asm_rv32_opcode_sub,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_sw,         asm_rv32_opcode_sw,        CALL_RIR, R,   0, I,   0,  R,  0, 0xFFFFFFFF, 0x00000FFF, 0xFFFFFFFF },
-    { MP_QSTR_xor,        asm_rv32_opcode_xor,       CALL_RRR, R,   0, R,   0,  R,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
-    { MP_QSTR_xori,       asm_rv32_opcode_xori,      CALL_RRI, R,   0, R,   0,  I,  0, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000FFF },
+    { MP_QSTR_add,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_add       },
+    { MP_QSTR_addi,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_addi      },
+    { MP_QSTR_and_,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_and       },
+    { MP_QSTR_andi,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_andi      },
+    { MP_QSTR_auipc,      MASK_FFFFFFFF, MASK_FFFFF000, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   12, N,  0, asm_rv32_opcode_auipc     },
+    { MP_QSTR_beq,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_beq       },
+    { MP_QSTR_bge,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bge       },
+    { MP_QSTR_bgeu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bgeu      },
+    { MP_QSTR_blt,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_blt       },
+    { MP_QSTR_bltu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bltu      },
+    { MP_QSTR_bne,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bne       },
+    { MP_QSTR_csrrc,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_csrrc     },
+    { MP_QSTR_csrrs,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_csrrs     },
+    { MP_QSTR_csrrw,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_csrrw     },
+    { MP_QSTR_csrrci,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, asm_rv32_opcode_csrrci    },
+    { MP_QSTR_csrrsi,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, asm_rv32_opcode_csrrsi    },
+    { MP_QSTR_csrrwi,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, asm_rv32_opcode_csrrwi    },
+    { MP_QSTR_c_add,      MASK_FFFFFFFE, MASK_FFFFFFFE, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, asm_rv32_opcode_cadd      },
+    { MP_QSTR_c_addi,     MASK_FFFFFFFE, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  R,  0, IZ,  0,  N,  0, asm_rv32_opcode_caddi     },
+    { MP_QSTR_c_addi4spn, MASK_0000FF00, MASK_000003FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, IUZ, 0,  N,  0, asm_rv32_opcode_caddi4spn },
+    { MP_QSTR_c_and,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_cand      },
+    { MP_QSTR_c_andi,     MASK_0000FF00, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, I,   0,  N,  0, asm_rv32_opcode_candi     },
+    { MP_QSTR_c_beqz,     MASK_0000FF00, MASK_000001FE, MASK_NOT_USED, 2, CALL_RL,  RC, 0, L,   0,  N,  0, asm_rv32_opcode_cbeqz     },
+    { MP_QSTR_c_bnez,     MASK_0000FF00, MASK_000001FE, MASK_NOT_USED, 2, CALL_RL,  RC, 0, L,   0,  N,  0, asm_rv32_opcode_cbnez     },
+    { MP_QSTR_c_ebreak,   MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_cebreak   },
+    { MP_QSTR_c_j,        MASK_00000FFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_L,   L,  0, N,   0,  N,  0, asm_rv32_opcode_cj        },
+    { MP_QSTR_c_jal,      MASK_00000FFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_L,   L,  0, N,   0,  N,  0, asm_rv32_opcode_cjal      },
+    { MP_QSTR_c_jalr,     MASK_FFFFFFFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_R,   R,  0, N,   0,  N,  0, asm_rv32_opcode_cjalr     },
+    { MP_QSTR_c_jr,       MASK_FFFFFFFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_R,   R,  0, N,   0,  N,  0, asm_rv32_opcode_cjr       },
+    { MP_QSTR_c_li,       MASK_FFFFFFFE, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, asm_rv32_opcode_cli       },
+    { MP_QSTR_c_lui,      MASK_FFFFFFFA, MASK_0001F800, MASK_NOT_USED, 2, CALL_RI,  R,  0, IUZ, 12, N,  0, asm_rv32_opcode_clui      },
+    { MP_QSTR_c_lw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, asm_rv32_opcode_clw       },
+    { MP_QSTR_c_lwsp,     MASK_FFFFFFFE, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, asm_rv32_opcode_clwsp     },
+    { MP_QSTR_c_mv,       MASK_FFFFFFFE, MASK_FFFFFFFE, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, asm_rv32_opcode_cmv       },
+    { MP_QSTR_c_nop,      MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_cnop      },
+    { MP_QSTR_c_or,       MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_cor       },
+    { MP_QSTR_c_slli,     MASK_FFFFFFFE, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  R,  0, IU,  0,  N,  0, asm_rv32_opcode_cslli     },
+    { MP_QSTR_c_srai,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, asm_rv32_opcode_csrai     },
+    { MP_QSTR_c_srli,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, asm_rv32_opcode_csrli     },
+    { MP_QSTR_c_sub,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_csub      },
+    { MP_QSTR_c_sw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, asm_rv32_opcode_csw       },
+    { MP_QSTR_c_swsp,     MASK_FFFFFFFF, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, asm_rv32_opcode_cswsp     },
+    { MP_QSTR_c_xor,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_cxor      },
+    { MP_QSTR_div,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_div       },
+    { MP_QSTR_divu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_divu      },
+    { MP_QSTR_ebreak,     MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_ebreak    },
+    { MP_QSTR_ecall,      MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_ecall     },
+    { MP_QSTR_jal,        MASK_FFFFFFFF, MASK_001FFFFE, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, asm_rv32_opcode_jal       },
+    { MP_QSTR_jalr,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_jalr      },
+    { MP_QSTR_la,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, opcode_la                 },
+    { MP_QSTR_lb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lb        },
+    { MP_QSTR_lbu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lbu       },
+    { MP_QSTR_lh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lh        },
+    { MP_QSTR_lhu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lhu       },
+    { MP_QSTR_li,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, opcode_li                 },
+    { MP_QSTR_lui,        MASK_FFFFFFFF, MASK_FFFFF000, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   12, N,  0, asm_rv32_opcode_lui       },
+    { MP_QSTR_lw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lw        },
+    { MP_QSTR_mv,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, asm_rv32_opcode_cmv       },
+    { MP_QSTR_mul,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mul       },
+    { MP_QSTR_mulh,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mulh      },
+    { MP_QSTR_mulhsu,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mulhsu    },
+    { MP_QSTR_mulhu,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mulhu     },
+    { MP_QSTR_or_,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_or        },
+    { MP_QSTR_ori,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_ori       },
+    { MP_QSTR_rem,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_rem       },
+    { MP_QSTR_remu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_remu      },
+    { MP_QSTR_sb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_sb        },
+    { MP_QSTR_sh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_sh        },
+    { MP_QSTR_sll,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sll       },
+    { MP_QSTR_slli,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_slli      },
+    { MP_QSTR_slt,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_slt       },
+    { MP_QSTR_slti,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_slti      },
+    { MP_QSTR_sltiu,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_sltiu     },
+    { MP_QSTR_sltu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sltu      },
+    { MP_QSTR_sra,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sra       },
+    { MP_QSTR_srai,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_srai      },
+    { MP_QSTR_srl,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_srl       },
+    { MP_QSTR_srli,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_srli      },
+    { MP_QSTR_sub,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sub       },
+    { MP_QSTR_sw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_sw        },
+    { MP_QSTR_xor,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_xor       },
+    { MP_QSTR_xori,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_xori      },
 };
 
 #undef RC
@@ -384,6 +430,10 @@ static bool validate_integer(mp_uint_t value, mp_uint_t mask, mp_uint_t flags) {
     return true;
 }
 
+#define ET_WRONG_ARGUMENT_KIND   MP_ERROR_TEXT("opcode '%q' argument %d: expecting %q")
+#define ET_WRONG_ARGUMENTS_COUNT MP_ERROR_TEXT("opcode '%q': expecting %d arguments")
+#define ET_OUT_OF_RANGE          MP_ERROR_TEXT("opcode '%q' argument %d: out of range")
+
 static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
     const opcode_t *opcode, mp_parse_node_t node, mp_uint_t node_index) {
     assert((node_index < 3) && "Invalid argument node number.");
@@ -396,19 +446,19 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
         case 0:
             kind = opcode->argument1_kind;
             shift = opcode->argument1_shift;
-            mask = opcode->argument1_mask;
+            mask = OPCODE_MASKS[opcode->argument1_mask];
             break;
 
         case 1:
             kind = opcode->argument2_kind;
             shift = opcode->argument2_shift;
-            mask = opcode->argument2_mask;
+            mask = OPCODE_MASKS[opcode->argument2_mask];
             break;
 
         case 2:
             kind = opcode->argument3_kind;
             shift = opcode->argument3_shift;
-            mask = opcode->argument3_mask;
+            mask = OPCODE_MASKS[opcode->argument3_mask];
             break;
 
         default:
@@ -417,6 +467,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
 
     switch (kind & 0x03) {
         case N:
+            assert(mask == OPCODE_MASKS[MASK_NOT_USED] && "Invalid mask index for missing operand.");
             return true;
 
         case R: {
@@ -424,15 +475,14 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
             if (!parse_register_node(node, &register_index, false)) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        MP_ERROR_TEXT("opcode '%q' argument %d must be a register"),
-                        opcode_qstr, node_index + 1));
+                        ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_register));
                 return false;
             }
 
             if ((mask & (1U << register_index)) == 0) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        MP_ERROR_TEXT("opcode '%q' argument %d is an invalid register"),
+                        MP_ERROR_TEXT("opcode '%q' argument %d: unknown register"),
                         opcode_qstr, node_index + 1));
                 return false;
             }
@@ -446,8 +496,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
             if (!mp_parse_node_get_int_maybe(node, &object)) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        MP_ERROR_TEXT("opcode '%q' argument %d must be an integer"),
-                        opcode_qstr, node_index + 1));
+                        ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_integer));
                 return false;
             }
 
@@ -474,8 +523,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
             if (!MP_PARSE_NODE_IS_ID(node)) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        MP_ERROR_TEXT("opcode '%q' argument %d must be a label"),
-                        opcode_qstr, node_index + 1));
+                        ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_label));
                 return false;
             }
 
@@ -484,7 +532,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
             if (label_index >= emit->max_num_labels && emit->pass == MP_PASS_EMIT) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        MP_ERROR_TEXT("opcode '%q' argument %d label '%q' is undefined"),
+                        MP_ERROR_TEXT("opcode '%q' argument %d: undefined label '%q'"),
                         opcode_qstr, node_index + 1, qstring));
                 return false;
             }
@@ -512,15 +560,13 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
 
 out_of_range:
     emit_inline_rv32_error_exc(emit,
-        mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-            MP_ERROR_TEXT("opcode '%q' argument %d is out of range"),
-            opcode_qstr, node_index + 1));
+        mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode_qstr, node_index + 1));
     return false;
 
 zero_immediate:
     emit_inline_rv32_error_exc(emit,
         mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-            MP_ERROR_TEXT("opcode '%q' argument %d must not be zero"),
+            MP_ERROR_TEXT("opcode '%q' argument %d: must not be zero"),
             opcode_qstr, node_index + 1));
     return false;
 }
@@ -556,18 +602,14 @@ static bool parse_register_offset_node(emit_inline_asm_t *emit, qstr opcode_qstr
         mp_obj_t object;
         if (!mp_parse_node_get_int_maybe(node_struct->nodes[0], &object)) {
             emit_inline_rv32_error_exc(emit,
-                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                    MP_ERROR_TEXT("opcode '%q' argument %d must be an integer"),
-                    opcode_qstr, 2));
+                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_WRONG_ARGUMENT_KIND, opcode_qstr, 2, MP_QSTR_integer));
             return false;
         }
         mp_uint_t value = mp_obj_get_int_truncated(object);
         value = (~value + 1) & (mp_uint_t)-1;
-        if (!validate_integer(value << opcode_data->argument2_shift, opcode_data->argument2_mask, opcode_data->argument2_kind)) {
+        if (!validate_integer(value << opcode_data->argument2_shift, OPCODE_MASKS[opcode_data->argument2_mask], opcode_data->argument2_kind)) {
             emit_inline_rv32_error_exc(emit,
-                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                    MP_ERROR_TEXT("opcode '%q' argument %d is out of range"),
-                    opcode_qstr, 2));
+                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode_qstr, 2));
             return false;
         }
     } else {
@@ -587,8 +629,7 @@ static bool parse_register_offset_node(emit_inline_asm_t *emit, qstr opcode_qstr
 invalid_structure:
     emit_inline_rv32_error_exc(emit,
         mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-            MP_ERROR_TEXT("opcode '%q' argument %d must be an integer offset to a register"),
-            opcode_qstr, node_index + 1));
+            ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_offset));
     return false;
 }
 
@@ -724,11 +765,9 @@ static bool handle_load_store_opcode_with_offset(emit_inline_asm_t *emit, qstr o
     if (negative) {
         immediate = (~immediate + 1) & (mp_uint_t)-1;
     }
-    if (!is_in_signed_mask(opcode_data->argument2_mask, immediate)) {
+    if (!is_in_signed_mask(OPCODE_MASKS[opcode_data->argument2_mask], immediate)) {
         emit_inline_rv32_error_exc(emit,
-            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                MP_ERROR_TEXT("opcode '%q' argument %d is out of range"),
-                opcode, 2));
+            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode, 2));
         return false;
     }
 
@@ -748,49 +787,40 @@ static void emit_inline_rv32_opcode(emit_inline_asm_t *emit, qstr opcode, mp_uin
     if (!opcode_data) {
         emit_inline_rv32_error_exc(emit,
             mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                MP_ERROR_TEXT("unsupported or unknown RV32 instruction '%q'."), opcode));
+                MP_ERROR_TEXT("unknown RV32 instruction '%q'"), opcode));
         return;
     }
 
-    size_t required_arguments = 0;
-    if (opcode_data->argument1_kind != N) {
-        required_arguments++;
-    }
-    if (opcode_data->argument2_kind != N) {
-        required_arguments++;
-    }
-    if (opcode_data->argument3_kind != N) {
-        required_arguments++;
-    }
-
+    assert((opcode_data->argument1_mask < MP_ARRAY_SIZE(OPCODE_MASKS)) && "Argument #1 opcode mask index out of bounds.");
+    assert((opcode_data->argument2_mask < MP_ARRAY_SIZE(OPCODE_MASKS)) && "Argument #2 opcode mask index out of bounds.");
+    assert((opcode_data->argument3_mask < MP_ARRAY_SIZE(OPCODE_MASKS)) && "Argument #3 opcode mask index out of bounds.");
+    assert((opcode_data->calling_convention < CALL_COUNT) && "Calling convention index out of bounds.");
     if (opcode_data->calling_convention != CALL_RIR) {
-        if (required_arguments != arguments_count) {
+        if (opcode_data->arguments_count != arguments_count) {
             emit_inline_rv32_error_exc(emit,
                 mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                    MP_ERROR_TEXT("RV32 instruction '%q' requires %d arguments."), opcode, required_arguments));
+                    ET_WRONG_ARGUMENTS_COUNT, opcode, opcode_data->arguments_count));
             return;
         }
-        if (required_arguments >= 1 && !validate_argument(emit, opcode, opcode_data, argument_nodes[0], 0)) {
+        if (opcode_data->arguments_count >= 1 && !validate_argument(emit, opcode, opcode_data, argument_nodes[0], 0)) {
             return;
         }
-        if (required_arguments >= 2 && !validate_argument(emit, opcode, opcode_data, argument_nodes[1], 1)) {
+        if (opcode_data->arguments_count >= 2 && !validate_argument(emit, opcode, opcode_data, argument_nodes[1], 1)) {
             return;
         }
-        if (required_arguments >= 3 && !validate_argument(emit, opcode, opcode_data, argument_nodes[2], 2)) {
+        if (opcode_data->arguments_count >= 3 && !validate_argument(emit, opcode, opcode_data, argument_nodes[2], 2)) {
             return;
         }
         handle_opcode(emit, opcode, opcode_data, argument_nodes);
         return;
     }
 
-    assert(required_arguments == 3 && "Invalid arguments count for calling convention.");
     assert((opcode_data->argument2_kind & U) == 0 && "Offset must not be unsigned.");
     assert((opcode_data->argument2_kind & Z) == 0 && "Offset can be zero.");
 
     if (arguments_count != 2) {
         emit_inline_rv32_error_exc(emit,
-            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                MP_ERROR_TEXT("RV32 instruction '%q' requires %d arguments."), opcode, 2));
+            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_WRONG_ARGUMENTS_COUNT, opcode, 2));
         return;
     }
 

From 50fab08e6b861adf65905d6adacd74201c87ddb9 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 28 Jan 2025 14:58:29 +0100
Subject: [PATCH 1909/3129] py/emitinlinextensa: Simplify register name lookup.

This commit changes the Xtensa inline assembly parser to use a slightly
simpler (and probably a tiny bit more efficient) way to look up register
names when decoding instruction parameters.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitinlinextensa.c | 49 +++++++++----------------------------------
 1 file changed, 10 insertions(+), 39 deletions(-)

diff --git a/py/emitinlinextensa.c b/py/emitinlinextensa.c
index 57056d597aab7..fed259cfc6b20 100644
--- a/py/emitinlinextensa.c
+++ b/py/emitinlinextensa.c
@@ -115,50 +115,21 @@ static bool emit_inline_xtensa_label(emit_inline_asm_t *emit, mp_uint_t label_nu
     return true;
 }
 
-typedef struct _reg_name_t { byte reg;
-                             byte name[3];
-} reg_name_t;
-static const reg_name_t reg_name_table[] = {
-    {0, "a0\0"},
-    {1, "a1\0"},
-    {2, "a2\0"},
-    {3, "a3\0"},
-    {4, "a4\0"},
-    {5, "a5\0"},
-    {6, "a6\0"},
-    {7, "a7\0"},
-    {8, "a8\0"},
-    {9, "a9\0"},
-    {10, "a10"},
-    {11, "a11"},
-    {12, "a12"},
-    {13, "a13"},
-    {14, "a14"},
-    {15, "a15"},
+static const qstr_short_t REGISTERS[16] = {
+    MP_QSTR_a0, MP_QSTR_a1, MP_QSTR_a2, MP_QSTR_a3, MP_QSTR_a4, MP_QSTR_a5, MP_QSTR_a6, MP_QSTR_a7,
+    MP_QSTR_a8, MP_QSTR_a9, MP_QSTR_a10, MP_QSTR_a11, MP_QSTR_a12, MP_QSTR_a13, MP_QSTR_a14, MP_QSTR_a15
 };
 
-// return empty string in case of error, so we can attempt to parse the string
-// without a special check if it was in fact a string
-static const char *get_arg_str(mp_parse_node_t pn) {
-    if (MP_PARSE_NODE_IS_ID(pn)) {
-        qstr qst = MP_PARSE_NODE_LEAF_ARG(pn);
-        return qstr_str(qst);
-    } else {
-        return "";
-    }
-}
-
 static mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
-    const char *reg_str = get_arg_str(pn);
-    for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(reg_name_table); i++) {
-        const reg_name_t *r = &reg_name_table[i];
-        if (reg_str[0] == r->name[0]
-            && reg_str[1] == r->name[1]
-            && reg_str[2] == r->name[2]
-            && (reg_str[2] == '\0' || reg_str[3] == '\0')) {
-            return r->reg;
+    if (MP_PARSE_NODE_IS_ID(pn)) {
+        qstr node_qstr = MP_PARSE_NODE_LEAF_ARG(pn);
+        for (size_t i = 0; i < MP_ARRAY_SIZE(REGISTERS); i++) {
+            if (node_qstr == REGISTERS[i]) {
+                return i;
+            }
         }
     }
+
     emit_inline_xtensa_error_exc(emit,
         mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
             MP_ERROR_TEXT("'%s' expects a register"), op));

From 5fdd249c55d44ed0513e931c9b7364dd8b3454d9 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Thu, 30 Jan 2025 10:23:06 +0100
Subject: [PATCH 1910/3129] py/parsenum: Reduce code footprint of
 mp_parse_num_float.

The mantissa parsing code uses a floating point variable to accumulate
digits.  Using an `mp_float_uint_t` variable instead and casting to
`mp_float_t` at the very end reduces code size.  In some cases, it also
improves the rounding behaviour as extra digits are taken into account
by the int-to-float conversion code.

An extra test case handles the special case where mantissa overflow occurs
while processing deferred trailing zeros.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 py/parsenum.c              | 25 ++++++++++++++-----------
 tests/float/float_parse.py |  3 +++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index 27d6641198730..3281eb4b8511a 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -179,39 +179,40 @@ typedef enum {
 } parse_dec_in_t;
 
 #if MICROPY_PY_BUILTINS_FLOAT
-// DEC_VAL_MAX only needs to be rough and is used to retain precision while not overflowing
+// MANTISSA_MAX is used to retain precision while not overflowing mantissa
 // 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
-#define DEC_VAL_MAX 1e20F
+#define MANTISSA_MAX 0x19999998U
 #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
-#define DEC_VAL_MAX 1e200
+#define MANTISSA_MAX 0x1999999999999998ULL
 #define SMALL_NORMAL_VAL (1e-307)
 #define SMALL_NORMAL_EXP (-307)
 #define EXACT_POWER_OF_10 (22)
 #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) {
+static mp_float_uint_t accept_digit(mp_float_uint_t p_mantissa, unsigned int dig, int *p_exp_extra, int in) {
     // Core routine to ingest an additional digit.
-    if (*p_dec_val < DEC_VAL_MAX) {
+    if (p_mantissa < MANTISSA_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);
         }
+        return 10u * p_mantissa + dig;
     } 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);
         }
+        return p_mantissa;
     }
 }
 #endif // MICROPY_PY_BUILTINS_FLOAT
@@ -273,6 +274,7 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
         // string should be a decimal number
         parse_dec_in_t in = PARSE_DEC_IN_INTG;
         bool exp_neg = false;
+        mp_float_uint_t mantissa = 0;
         int exp_val = 0;
         int exp_extra = 0;
         int trailing_zeros_intg = 0, trailing_zeros_frac = 0;
@@ -288,9 +290,9 @@ 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 (dig == 0 || dec_val >= DEC_VAL_MAX) {
+                    if (dig == 0 || mantissa >= MANTISSA_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.
+                        // Also, once we reach MANTISSA_MAX, treat every additional digit as a trailing zero.
                         if (in == PARSE_DEC_IN_INTG) {
                             ++trailing_zeros_intg;
                         } else {
@@ -299,14 +301,14 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
                     } else {
                         // 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);
+                            mantissa = accept_digit(mantissa, 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);
+                            mantissa = accept_digit(mantissa, 0, &exp_extra, PARSE_DEC_IN_FRAC);
                             --trailing_zeros_frac;
                         }
-                        accept_digit(&dec_val, dig, &exp_extra, in);
+                        mantissa = accept_digit(mantissa, dig, &exp_extra, in);
                     }
                 }
             } else if (in == PARSE_DEC_IN_INTG && dig == '.') {
@@ -340,6 +342,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 + trailing_zeros_intg;
+        dec_val = (mp_float_t)mantissa;
         if (exp_val < SMALL_NORMAL_EXP) {
             exp_val -= SMALL_NORMAL_EXP;
             dec_val *= SMALL_NORMAL_VAL;
diff --git a/tests/float/float_parse.py b/tests/float/float_parse.py
index de27c33e7be57..6131da0a63ab9 100644
--- a/tests/float/float_parse.py
+++ b/tests/float/float_parse.py
@@ -31,6 +31,9 @@
 print(float("1e18446744073709551621"))
 print(float("1e-18446744073709551621"))
 
+# mantissa overflow while processing deferred trailing zeros
+print(float("10000000000000000000001"))
+
 # check small decimals are as close to their true value as possible
 for n in range(1, 10):
     print(float("0.%u" % n) == n / 10)

From 86526e9c2b5fcde2ecdee3817cc002920078b07b Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 26 Feb 2025 14:37:55 +1100
Subject: [PATCH 1911/3129] tools/mpremote: Optimise readline support in mount.

This significantly speeds up readline on files opened directly from an
mpremote mount.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 tools/mpremote/mpremote/transport_serial.py | 41 ++++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index d3148f9ace318..6aed0bb496b93 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -404,12 +404,13 @@ def umount_local(self):
     "CMD_OPEN": 4,
     "CMD_CLOSE": 5,
     "CMD_READ": 6,
-    "CMD_WRITE": 7,
-    "CMD_SEEK": 8,
-    "CMD_REMOVE": 9,
-    "CMD_RENAME": 10,
-    "CMD_MKDIR": 11,
-    "CMD_RMDIR": 12,
+    "CMD_READLINE": 7,
+    "CMD_WRITE": 8,
+    "CMD_SEEK": 9,
+    "CMD_REMOVE": 10,
+    "CMD_RENAME": 11,
+    "CMD_MKDIR": 12,
+    "CMD_RMDIR": 13,
 }
 
 fs_hook_code = """\
@@ -592,12 +593,16 @@ def readinto(self, buf):
         return n
 
     def readline(self):
-        l = ''
-        while 1:
-            c = self.read(1)
-            l += c
-            if c == '\\n' or c == '':
-                return l
+        c = self.cmd
+        c.begin(CMD_READLINE)
+        c.wr_s8(self.fd)
+        data = c.rd_bytes(None)
+        c.end()
+        if self.is_text:
+            data = str(data, 'utf8')
+        else:
+            data = bytes(data)
+        return data
 
     def readlines(self):
         ls = []
@@ -746,8 +751,7 @@ def __mount():
 """
 
 # 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(r"CMD_[A-Z_]+", lambda m: str(fs_hook_cmds[m.group(0)]), 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)
@@ -887,6 +891,14 @@ def do_read(self):
         self.wr_bytes(buf)
         # self.log_cmd(f"read {fd} {n} -> {len(buf)}")
 
+    def do_readline(self):
+        fd = self.rd_s8()
+        buf = self.data_files[fd][0].readline()
+        if self.data_files[fd][1]:
+            buf = bytes(buf, "utf8")
+        self.wr_bytes(buf)
+        # self.log_cmd(f"readline {fd} -> {len(buf)}")
+
     def do_seek(self):
         fd = self.rd_s8()
         n = self.rd_s32()
@@ -960,6 +972,7 @@ def do_rmdir(self):
         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_READLINE"]: do_readline,
         fs_hook_cmds["CMD_WRITE"]: do_write,
         fs_hook_cmds["CMD_SEEK"]: do_seek,
         fs_hook_cmds["CMD_REMOVE"]: do_remove,

From 71c7c03e411121b0193590bb683961e83c787ab1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 26 Feb 2025 17:12:45 +1100
Subject: [PATCH 1912/3129] tools/mpremote/tests: Add test for
 RemoteFile.readline.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/tests/test_mount.sh     | 4 ++++
 tools/mpremote/tests/test_mount.sh.exp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/tools/mpremote/tests/test_mount.sh b/tools/mpremote/tests/test_mount.sh
index 9eab0b0d6e8c5..724ae1417fccc 100755
--- a/tools/mpremote/tests/test_mount.sh
+++ b/tools/mpremote/tests/test_mount.sh
@@ -26,3 +26,7 @@ $MPREMOTE mount ${TMP} exec "import mount_package; mount_package.x(); mount_pack
 echo -----
 $MPREMOTE mount ${TMP} exec "open('test.txt', 'w').write('hello world\n')"
 cat "${TMP}/test.txt"
+
+# Test RemoteFile.readline and RemoteFile.readlines methods.
+echo -----
+$MPREMOTE mount ${TMP} exec "print(open('test.txt').readlines())"
diff --git a/tools/mpremote/tests/test_mount.sh.exp b/tools/mpremote/tests/test_mount.sh.exp
index 560f5e4f10a9b..616cb75bcf5f1 100644
--- a/tools/mpremote/tests/test_mount.sh.exp
+++ b/tools/mpremote/tests/test_mount.sh.exp
@@ -5,3 +5,6 @@ Local directory ${TMP} is mounted at /remote
 -----
 Local directory ${TMP} is mounted at /remote
 hello world
+-----
+['hello world\n']
+Local directory ${TMP} is mounted at /remote

From 13b02376af4e9d4b76bf053935b51ddc7c87df03 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Feb 2025 12:44:19 +1100
Subject: [PATCH 1913/3129] lib/pico-sdk: Update to version 2.1.1.

Release notes: https://github.com/raspberrypi/pico-sdk/releases/tag/2.1.1

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/pico-sdk             | 2 +-
 ports/rp2/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index 95ea6acad1311..bddd20f928ce7 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 95ea6acad131124694cda1c162c52cd30e0aece0
+Subproject commit bddd20f928ce76142793bef434d4f75f4af6e433
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 8a4092529b1f2..7002ad8769ea9 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -276,7 +276,7 @@ if(PICO_RP2040)
 elseif(PICO_RP2350 AND PICO_ARM)
     target_sources(pico_float_micropython INTERFACE
         ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_aeabi_dcp.S
-        ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_conv_m33.S
+        ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_common_m33.S
     )
 endif()
 

From 9939b6c6b906cec702e825a7b58f5647c70c178e Mon Sep 17 00:00:00 2001
From: machdyne <philip@machdyne.com>
Date: Fri, 20 Dec 2024 23:39:02 +0100
Subject: [PATCH 1914/3129] rp2/boards/MACHDYNE_WERKZEUG: Add support for
 Machdyne Werkzeug.

Signed-off-by: machdyne <philip@machdyne.com>
---
 ports/rp2/boards/MACHDYNE_WERKZEUG/board.json | 19 ++++++++++++
 .../MACHDYNE_WERKZEUG/mpconfigboard.cmake     |  3 ++
 .../boards/MACHDYNE_WERKZEUG/mpconfigboard.h  |  3 ++
 ports/rp2/boards/MACHDYNE_WERKZEUG/pins.csv   | 30 +++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 ports/rp2/boards/MACHDYNE_WERKZEUG/board.json
 create mode 100644 ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.h
 create mode 100644 ports/rp2/boards/MACHDYNE_WERKZEUG/pins.csv

diff --git a/ports/rp2/boards/MACHDYNE_WERKZEUG/board.json b/ports/rp2/boards/MACHDYNE_WERKZEUG/board.json
new file mode 100644
index 0000000000000..c657f18b21de6
--- /dev/null
+++ b/ports/rp2/boards/MACHDYNE_WERKZEUG/board.json
@@ -0,0 +1,19 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Dual-core",
+        "External Flash",
+        "USB-C"
+    ],
+    "images": [
+        "werkzeug.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Werkzeug",
+    "thumbnail": "",
+    "url": "https://machdyne.com/product/werkzeug-multi-tool/",
+    "vendor": "Machdyne"
+}
diff --git a/ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.cmake b/ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.cmake
new file mode 100644
index 0000000000000..281c4e6f1b45f
--- /dev/null
+++ b/ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.cmake
@@ -0,0 +1,3 @@
+# cmake file for Machdyne Werkzeug
+set(PICO_BOARD "machdyne_werkzeug")
+set(PICO_PLATFORM "rp2040")
diff --git a/ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.h b/ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.h
new file mode 100644
index 0000000000000..476ea23b9c86b
--- /dev/null
+++ b/ports/rp2/boards/MACHDYNE_WERKZEUG/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Machdyne Werkzeug"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (384 * 1024)
diff --git a/ports/rp2/boards/MACHDYNE_WERKZEUG/pins.csv b/ports/rp2/boards/MACHDYNE_WERKZEUG/pins.csv
new file mode 100644
index 0000000000000..c3c578132069c
--- /dev/null
+++ b/ports/rp2/boards/MACHDYNE_WERKZEUG/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
+PMOD10,GPIO12
+PMOD4,GPIO13
+PMOD9,GPIO14
+PMOD3,GPIO15
+PMOD8,GPIO16
+PMOD2,GPIO17
+PMOD7,GPIO18
+PMOD1,GPIO19
+LED_GREEN,GPIO20
+LED_RED,GPIO21
+USBA_POWER,GPIO22
+USBA_DN,GPIO23
+USBA_DP,GPIO24
+USBA_DP_PU,GPIO25
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+GP29,GPIO29

From cad62c20f2971b1248f55f27ab9f6d9bf8ccdafa Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Tue, 18 Feb 2025 14:57:53 -0700
Subject: [PATCH 1915/3129] rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA: Add
 SparkFun XRP Controller.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 .../SPARKFUN_XRP_CONTROLLER_BETA/board.json   | 23 +++++++
 .../SPARKFUN_XRP_CONTROLLER_BETA/manifest.py  |  6 ++
 .../mpconfigboard.cmake                       | 14 ++++
 .../mpconfigboard.h                           | 28 ++++++++
 .../SPARKFUN_XRP_CONTROLLER_BETA/pins.csv     | 65 +++++++++++++++++++
 5 files changed, 136 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/manifest.py
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/pins.csv

diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
new file mode 100644
index 0000000000000..cece574326503
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "IMU",
+        "JST-SH",
+        "USB",
+        "WiFi"
+    ],
+    "images": [
+        "22727-_01.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "XRP Controller (Beta)",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/sparkfun-experiential-robotics-platform-xrp-controller.html",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/manifest.py b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/manifest.py
new file mode 100644
index 0000000000000..4e38f09cdee4f
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/manifest.py
@@ -0,0 +1,6 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
+
+# Bluetooth
+require("aioble")
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.cmake
new file mode 100644
index 0000000000000..6c06efefb6479
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.cmake
@@ -0,0 +1,14 @@
+# cmake file for SparkFun XRP Controller (Beta)
+
+set(PICO_BOARD "pico_w")
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h
new file mode 100644
index 0000000000000..56071e1873341
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h
@@ -0,0 +1,28 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "SparkFun XRP Controller (Beta)"
+
+// 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_NETWORK_HOSTNAME_DEFAULT "XRP"
+
+// 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_EXT_COUNT    CYW43_WL_GPIO_COUNT
+
+// If this returns true for a pin then its irq will not be disabled on a soft reboot
+int mp_hal_is_pin_reserved(int n);
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
+
+#define MICROPY_HW_I2C1_SDA (18)
+#define MICROPY_HW_I2C1_SCL (19)
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/pins.csv b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/pins.csv
new file mode 100644
index 0000000000000..dd047063b5c02
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/pins.csv
@@ -0,0 +1,65 @@
+# XRP default pin names
+MOTOR_L_IN_1,GPIO6
+MOTOR_L_IN_2,GPIO7
+MOTOR_R_IN_1,GPIO14
+MOTOR_R_IN_2,GPIO15
+MOTOR_3_IN_1,GPIO2
+MOTOR_3_IN_2,GPIO3
+MOTOR_4_IN_1,GPIO10
+MOTOR_4_IN_2,GPIO11
+MOTOR_L_ENCODER_A,GPIO4
+MOTOR_L_ENCODER_B,GPIO5
+MOTOR_R_ENCODER_A,GPIO12
+MOTOR_R_ENCODER_B,GPIO13
+MOTOR_3_ENCODER_A,GPIO0
+MOTOR_3_ENCODER_B,GPIO1
+MOTOR_4_ENCODER_A,GPIO8
+MOTOR_4_ENCODER_B,GPIO9
+SERVO_1,GPIO16
+SERVO_2,GPIO17
+I2C_SDA_1,GPIO18
+I2C_SCL_1,GPIO19
+DISTANCE_TRIGGER,GPIO20
+DISTANCE_ECHO,GPIO21
+LINE_L,GPIO26
+LINE_R,GPIO27
+BOARD_VIN_MEASURE,GPIO28
+BOARD_USER_BUTTON,GPIO22
+BOARD_LED,EXT_GPIO0
+
+# XRP alternate pin names
+ML_IN_1,GPIO6
+ML_IN_2,GPIO7
+MR_IN_1,GPIO14
+MR_IN_2,GPIO15
+M3_IN_1,GPIO2
+M3_IN_2,GPIO3
+M4_IN_1,GPIO10
+M4_IN_2,GPIO11
+ML_ENC_A,GPIO4
+ML_ENC_B,GPIO5
+MR_ENC_A,GPIO12
+MR_ENC_B,GPIO13
+M3_ENC_A,GPIO0
+M3_ENC_B,GPIO1
+M4_ENC_A,GPIO8
+M4_ENC_B,GPIO9
+S1,GPIO16
+S2,GPIO17
+SDA_1,GPIO18
+SCL_1,GPIO19
+RANGE_TRIGGER,GPIO20
+RANGE_ECHO,GPIO21
+REFLECTANCE_L,GPIO26
+REFLECTANCE_R,GPIO27
+BRD_VIN,GPIO28
+BRD_USR_BTN,GPIO22
+BRD_LED,EXT_GPIO0
+
+# LED default names
+LED,EXT_GPIO0
+
+# Radio GPIO pins
+WL_GPIO0,EXT_GPIO0
+WL_GPIO1,EXT_GPIO1
+WL_GPIO2,EXT_GPIO2

From bb4ec886f8994ad7b2db6f80c7b46e6eedbc40e7 Mon Sep 17 00:00:00 2001
From: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
Date: Fri, 24 Jan 2025 09:36:02 -0700
Subject: [PATCH 1916/3129] rp2/machine_i2c: Make I2C bus ID arg optional with
 default.

This commit gives the option to not pass an I2C Bus ID when creating a
machine I2C object.  If the ID is not provided, the default bus ID (which
is `PICO_DEFAULT_I2C`) is used.

This allows users to simply declare an I2C object with `machine.I2C()`
without passing any arguments, thus creating an object with the default I2C
ID, SCL, and SDA.

Signed-off-by: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
---
 ports/rp2/machine_i2c.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 28032e8085c24..e97a852b24305 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -97,7 +97,11 @@ static void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 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, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        #ifdef PICO_DEFAULT_I2C
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = PICO_DEFAULT_I2C} },
+        #else
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = -1} },
+        #endif
         { MP_QSTR_freq, MP_ARG_INT, {.u_int = DEFAULT_I2C_FREQ} },
         { MP_QSTR_scl, MICROPY_I2C_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_sda, MICROPY_I2C_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -108,8 +112,9 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, 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);
 
-    // Get I2C bus.
-    int i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
+    int i2c_id = args[ARG_id].u_int;
+
+    // Check if the I2C bus is valid
     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);
     }

From c143eb50248b3a3f521775f09f5073675095e48a Mon Sep 17 00:00:00 2001
From: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
Date: Fri, 24 Jan 2025 13:05:07 -0700
Subject: [PATCH 1917/3129] esp32/machine_i2c: Make I2C bus ID arg optional
 with default.

Similar to the previous commit, this allows constructing an I2C instance
without specifying an ID.  The default ID is I2C_NUM_0.

Signed-off-by: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
---
 ports/esp32/machine_i2c.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 732a62f47f193..12b86e4aa0294 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -146,12 +146,15 @@ 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);
+    // Create a SoftI2C instance if no id is specified (or is -1) but other arguments are given
+    if (n_args != 0) {
+        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[] = {
-        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = I2C_NUM_0} },
         { 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} },
@@ -161,7 +164,9 @@ mp_obj_t machine_hw_i2c_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);
 
     // Get I2C bus
-    mp_int_t i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
+    mp_int_t i2c_id = args[ARG_id].u_int;
+
+    // Check if the I2C bus is valid
     if (!(I2C_NUM_0 <= i2c_id && i2c_id < I2C_NUM_MAX)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
     }

From ec876a5e27163299ff60ee70e4ef21073dd67704 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 22 Dec 2024 13:35:21 +0800
Subject: [PATCH 1918/3129] esp32/README: Make some minor improvements to the
 README.

Changes:
- To add user to Linux dialout group, usermod is the universal Linux way.
  adduser is Debian-based way.
- When installing IDF, we don't have to install all toolchains for all
  chips.
- List currently supported chip models.
- Other minor typo and gramma corrections.

Signed-off-by: garywill <garywill@disroot.org>
---
 ports/esp32/README.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 6ed7eddb8b80f..d9115072a45c3 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -5,6 +5,9 @@ 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.
 
+Currently supports ESP32, ESP32-C3, ESP32-C6, ESP32-S2 and ESP32-S3
+(ESP8266 is supported by a separate MicroPython port).
+
 Supported features include:
 - REPL (Python prompt) over UART0.
 - 16k stack for the MicroPython task and approximately 100k Python heap.
@@ -67,12 +70,16 @@ After you've cloned and checked out the IDF to the correct version, run the
 
 ```bash
 $ cd esp-idf
-$ ./install.sh       # (or install.bat on Windows)
+$ ./install.sh esp32 # (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.
+The `install.sh` step only needs to be done once. Change `esp32` if you are
+targeting other chip. Use comma-separated list like `esp32,esp32s2` to
+install for multiple chips. Or omit the chip to install for all Espressif
+chips (which is slower).
+
+You will need to source `export.sh` for every new session.
 
 Building the firmware
 ---------------------
@@ -85,7 +92,7 @@ this repository):
 $ make -C mpy-cross
 ```
 
-Then to build MicroPython for the ESP32 run:
+Then to build MicroPython for ESP32 run:
 
 ```bash
 $ cd ports/esp32
@@ -106,7 +113,7 @@ rebooting or logging out and in again. (Note: on some distributions this may
 be the `uucp` group, run `ls -la /dev/ttyUSB0` to check.)
 
 ```bash
-$ sudo adduser <username> dialout
+$ sudo usermod -aG dialout <username>
 ```
 
 If you are installing MicroPython to your module for the first time, or
@@ -141,7 +148,7 @@ $ idf.py -D MICROPY_BOARD=ESP32_GENERIC build
 $ idf.py flash
 ```
 
-Some boards also support "variants", which are allow for small variations of
+Some boards also support "variants", which allow for small variations of
 an otherwise similar board. For example different flash sizes or features. For
 example to build the `OTA` variant of `ESP32_GENERIC`.
 
@@ -173,7 +180,7 @@ or
 $ miniterm.py /dev/ttyUSB0 115200
 ```
 
-You can also use `idf.py monitor`.
+You can also use `idf.py monitor` or `mpremote`.
 
 Configuring the WiFi and using the board
 ----------------------------------------

From cbd21b39778d3f7b808d0c631a193625035b2190 Mon Sep 17 00:00:00 2001
From: Karl Palsson <karlp@tweak.au>
Date: Mon, 27 Jan 2025 16:05:07 +0000
Subject: [PATCH 1919/3129] esp32/esp32_common.cmake: Allow overriding
 linker.lf.

Particularly for out of tree builds, one may need to provide alternative or
extra linker fragment files, or specify an absolute path to the default
`linker.lf` file.

In the default case, do nothing, provide a plain `linker.lf`, as before.

Signed-off-by: Karl Palsson <karl.palsson@marel.com>
---
 ports/esp32/esp32_common.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index e03d2ff11aada..059989c10a4db 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -178,6 +178,13 @@ list(APPEND IDF_COMPONENTS
     vfs
 )
 
+# Provide the default LD fragment if not set
+if (MICROPY_USER_LDFRAGMENTS)
+    set(MICROPY_LDFRAGMENTS ${MICROPY_USER_LDFRAGMENTS})
+else()
+    set(MICROPY_LDFRAGMENTS linker.lf)
+endif()
+
 # Register the main IDF component.
 idf_component_register(
     SRCS
@@ -197,7 +204,7 @@ idf_component_register(
         ${MICROPY_BOARD_DIR}
         ${CMAKE_BINARY_DIR}
     LDFRAGMENTS
-        linker.lf
+        ${MICROPY_LDFRAGMENTS}
     REQUIRES
         ${IDF_COMPONENTS}
 )

From 61cb293b761d22de9ece8d7cfdb38555fc0a410a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 17 Jan 2025 21:12:19 +0100
Subject: [PATCH 1920/3129] esp32/machine_pin: Implement Pin.toggle() method.

The actual output pin value is taken from the OUT register, not from the
pad.

Tested with:
- ESP32   low and high Pin numbers
- ESP32C3 low Pin numbers
- ESP32C6 low Pin numbers
- ESP32S2 low and high Pin numbers
- ESP32S3 low and high Pin numbers

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_pin.c | 10 ++++++++++
 ports/esp32/mphalport.h   | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 74202d6f758cd..b821abf1fc18a 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -287,6 +287,15 @@ 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 = MP_OBJ_TO_PTR(self_in);
+    gpio_num_t index = PIN_OBJ_PTR_INDEX(self);
+    gpio_set_level(index, 1 - mp_hal_pin_read_output(index));
+    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)
 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 };
@@ -366,6 +375,7 @@ 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_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
 
     // class attributes
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index a908d784d7f61..a919a859a4279 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -36,6 +36,7 @@
 #include "freertos/task.h"
 
 #include "driver/spi_master.h"
+#include "soc/gpio_reg.h"
 
 #define MICROPY_PLATFORM_VERSION "IDF" IDF_VER
 
@@ -133,6 +134,15 @@ static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
 static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {
     return gpio_get_level(pin);
 }
+static inline int mp_hal_pin_read_output(mp_hal_pin_obj_t pin) {
+    #if defined(GPIO_OUT1_REG)
+    return pin < 32
+        ? (*(uint32_t *)GPIO_OUT_REG >> pin) & 1
+        : (*(uint32_t *)GPIO_OUT1_REG >> (pin - 32)) & 1;
+    #else
+    return (*(uint32_t *)GPIO_OUT_REG >> pin) & 1;
+    #endif
+}
 static inline void mp_hal_pin_write(mp_hal_pin_obj_t pin, int v) {
     gpio_set_level(pin, v);
 }

From e009ab06c581cf2e8b6dbf8d2002105c97131a1f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 19 Jan 2025 10:31:56 +0100
Subject: [PATCH 1921/3129] esp8266/machine_pin: Implement Pin.toggle() method.

Tested with a generic ESP8266 device.  The actual output value is taken
from the output register, not by reading the pad level.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp8266/esp_mphal.h   | 7 +++++++
 ports/esp8266/machine_pin.c | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index e677fa450d339..0a4f92ac0bf29 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -100,6 +100,13 @@ void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin);
         else { gpio_output_set(1 << (p), 0, 1 << (p), 0); } \
 } while (0)
 #define mp_hal_pin_read(p) pin_get(p)
+static inline int mp_hal_pin_read_output(mp_hal_pin_obj_t pin) {
+    if (pin >= 16) {
+        return READ_PERI_REG(RTC_GPIO_OUT) & 1;
+    } else {
+        return (GPIO_REG_READ(GPIO_OUT_ADDRESS) >> pin) & 1;
+    }
+}
 #define mp_hal_pin_write(p, v) pin_set((p), (v))
 
 void *ets_get_esf_buf_ctlblk(void);
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index ec22c7c588c4e..658966679d1ae 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -373,6 +373,14 @@ static mp_obj_t pyb_pin_on(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(pyb_pin_on_obj, pyb_pin_on);
 
+// pin.toggle()
+static mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
+    pyb_pin_obj_t *self = self_in;
+    pin_set(self->phys_port, 1 - mp_hal_pin_read_output(self->phys_port));
+    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 pyb_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_handler, ARG_trigger, ARG_hard };
@@ -435,6 +443,7 @@ static const mp_rom_map_elem_t pyb_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&pyb_pin_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_off),     MP_ROM_PTR(&pyb_pin_off_obj) },
     { MP_ROM_QSTR(MP_QSTR_on),      MP_ROM_PTR(&pyb_pin_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq),     MP_ROM_PTR(&pyb_pin_irq_obj) },
 
     // class constants

From 22310ae27aea56377b31bdcc2d7c2ba712316c4f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 19 Jan 2025 11:06:26 +0100
Subject: [PATCH 1922/3129] cc3200/mods/pybpin: Implement Pin.toggle() method.

Tested with a WiPy 1 board.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/cc3200/mods/pybpin.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ports/cc3200/mods/pybpin.c b/ports/cc3200/mods/pybpin.c
index 037c78a32cbf2..ea40aa9df8d20 100644
--- a/ports/cc3200/mods/pybpin.c
+++ b/ports/cc3200/mods/pybpin.c
@@ -680,6 +680,20 @@ static mp_obj_t pin_value(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_value_obj, 1, 2, pin_value);
 
+// pin.toggle()
+static mp_obj_t pin_toggle(mp_obj_t self_in) {
+    pin_obj_t *self = self_in;
+    if (self->value) {
+        self->value = 0;
+        MAP_GPIOPinWrite(self->port, self->bit, 0);
+    } else {
+        self->value = 1;
+        MAP_GPIOPinWrite(self->port, self->bit, self->bit);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(pin_toggle_obj, pin_toggle);
+
 static mp_obj_t pin_id(mp_obj_t self_in) {
     pin_obj_t *self = self_in;
     return MP_OBJ_NEW_QSTR(self->name);
@@ -902,6 +916,7 @@ static const mp_rom_map_elem_t pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),                    MP_ROM_PTR(&pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),                   MP_ROM_PTR(&pin_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle),                  MP_ROM_PTR(&pin_toggle_obj) },
     { MP_ROM_QSTR(MP_QSTR_id),                      MP_ROM_PTR(&pin_id_obj) },
     { MP_ROM_QSTR(MP_QSTR_mode),                    MP_ROM_PTR(&pin_mode_obj) },
     { MP_ROM_QSTR(MP_QSTR_pull),                    MP_ROM_PTR(&pin_pull_obj) },

From 48925fd7932c9d27f7248bc3308a77c172702878 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 22 Jan 2025 18:03:52 +0100
Subject: [PATCH 1923/3129] docs/library/machine.Pin: Show availability of low,
 high and toggle.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/library/machine.Pin.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/library/machine.Pin.rst b/docs/library/machine.Pin.rst
index 68070133b8fb6..4aac0f4b94be2 100644
--- a/docs/library/machine.Pin.rst
+++ b/docs/library/machine.Pin.rst
@@ -209,13 +209,13 @@ The following methods are not part of the core Pin API and only implemented on c
 
    Set pin to "0" output level.
 
-   Availability: nrf, rp2, stm32 ports.
+   Availability: mimxrt, nrf, renesas-ra, rp2, samd, stm32 ports.
 
 .. method:: Pin.high()
 
    Set pin to "1" output level.
 
-   Availability: nrf, rp2, stm32 ports.
+   Availability: mimxrt, nrf, renesas-ra, rp2, samd, stm32 ports.
 
 .. method:: Pin.mode([mode])
 
@@ -242,7 +242,7 @@ The following methods are not part of the core Pin API and only implemented on c
 
    Toggle output pin from "0" to "1" or vice-versa.
 
-   Availability: mimxrt, samd, rp2 ports.
+   Availability: cc3200, esp32, esp8266, mimxrt, rp2, samd ports.
 
 Constants
 ---------

From 69ffd2aaf09e35b68ea045872a63af6403fc1c8f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 8 Dec 2024 21:37:18 +0100
Subject: [PATCH 1924/3129] renesas-ra/modrenesas: Expose the Flash block
 device to Python code.

A new module called renesas is added, like in other ports.  The accessible
block device allows to use Python methods for creating and modifying the
file system.  The Flash block device for the file system can be accessed
with:

    from renesas import Flash
    bdev = Flash(start=0)

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/renesas-ra/Makefile     |  1 +
 ports/renesas-ra/modrenesas.c | 41 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 ports/renesas-ra/modrenesas.c

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 03eb9b52b41b8..ec47510d981ad 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -250,6 +250,7 @@ SRC_C += \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_sdcard.c \
+	modrenesas.c \
 	extint.c \
 	usrsw.c \
 	flash.c \
diff --git a/ports/renesas-ra/modrenesas.c b/ports/renesas-ra/modrenesas.c
new file mode 100644
index 0000000000000..2524bbe6d7d0c
--- /dev/null
+++ b/ports/renesas-ra/modrenesas.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 "storage.h"
+
+static const mp_rom_map_elem_t renesas_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_renesas) },
+    { MP_ROM_QSTR(MP_QSTR_Flash),    MP_ROM_PTR(&pyb_flash_type) },
+};
+static MP_DEFINE_CONST_DICT(renesas_module_globals, renesas_module_globals_table);
+
+const mp_obj_module_t mp_module_renesas = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&renesas_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_renesas, mp_module_renesas);

From eb45d97898abd9aae93d0c953634cabb5ea327e3 Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Tue, 25 Feb 2025 14:36:29 +1100
Subject: [PATCH 1925/3129] py/objstr: Support tuples and start/end args in
 startswith and endswith.

This change allows tuples to be passed as the prefix/suffix argument to the
`str.startswith()` and `str.endswith()` methods.  The methods will return
`True` if the string starts/ends with any of the prefixes/suffixes in the
tuple.

Also adds full support for the `start` and `end` arguments to both methods
for compatibility with CPython.

Tests have been updated for the new behaviour.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 py/objstr.c                               | 67 ++++++++++++++---------
 tests/basics/string_endswith.py           | 27 +++++++--
 tests/basics/string_endswith_upy.py       |  6 --
 tests/basics/string_endswith_upy.py.exp   |  1 -
 tests/basics/string_startswith.py         | 19 +++++++
 tests/basics/string_startswith_upy.py     |  6 --
 tests/basics/string_startswith_upy.py.exp |  1 -
 tests/misc/non_compliant.py               |  6 --
 tests/misc/non_compliant.py.exp           |  1 -
 9 files changed, 83 insertions(+), 51 deletions(-)
 delete mode 100644 tests/basics/string_endswith_upy.py
 delete mode 100644 tests/basics/string_endswith_upy.py.exp
 delete mode 100644 tests/basics/string_startswith_upy.py
 delete mode 100644 tests/basics/string_startswith_upy.py.exp

diff --git a/py/objstr.c b/py/objstr.c
index fc0623eb7af2c..307e956a15236 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -67,6 +67,26 @@ static void check_is_str_or_bytes(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_str_or_bytes(self_in));
 }
 
+static const byte *get_substring_data(const mp_obj_t obj, size_t n_args, const mp_obj_t *args, size_t *len) {
+    // Get substring data from obj, using args[0,1] to specify start and end indices.
+    GET_STR_DATA_LEN(obj, str, str_len);
+    if (n_args > 0) {
+        const mp_obj_type_t *self_type = mp_obj_get_type(obj);
+        const byte *end = str + str_len;
+        if (n_args > 1 && args[1] != mp_const_none) {
+            end = str_index_to_ptr(self_type, str, str_len, args[1], true);
+        }
+        if (args[0] != mp_const_none) {
+            str = str_index_to_ptr(self_type, str, str_len, args[0], true);
+        }
+        str_len = MAX(end - str, 0);
+    }
+    if (len) {
+        *len = str_len;
+    }
+    return str;
+}
+
 /******************************************************************************/
 /* str                                                                        */
 
@@ -802,37 +822,34 @@ static mp_obj_t str_rindex(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
 
-// TODO: (Much) more variety in args
-static mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) {
-    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
-    GET_STR_DATA_LEN(args[0], str, str_len);
-    size_t prefix_len;
-    const char *prefix = mp_obj_str_get_data(args[1], &prefix_len);
-    const byte *start = str;
-    if (n_args > 2) {
-        start = str_index_to_ptr(self_type, str, str_len, args[2], true);
+static mp_obj_t str_startendswith(size_t n_args, const mp_obj_t *args, bool ends_with) {
+    size_t str_len;
+    const byte *str = get_substring_data(args[0], n_args - 2, args + 2, &str_len);
+    mp_obj_t *prefixes = (mp_obj_t *)&args[1];
+    size_t n_prefixes = 1;
+    if (mp_obj_is_type(args[1], &mp_type_tuple)) {
+        mp_obj_tuple_get(args[1], &n_prefixes, &prefixes);
     }
-    if (prefix_len + (start - str) > str_len) {
-        return mp_const_false;
+    size_t prefix_len;
+    for (size_t i = 0; i < n_prefixes; i++) {
+        const char *prefix = mp_obj_str_get_data(prefixes[i], &prefix_len);
+        const byte *s = str + (ends_with ? str_len - prefix_len : 0);
+        if (prefix_len <= str_len && memcmp(s, prefix, prefix_len) == 0) {
+            return mp_const_true;
+        }
     }
-    return mp_obj_new_bool(memcmp(start, prefix, prefix_len) == 0);
+    return mp_const_false;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
 
-static mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) {
-    GET_STR_DATA_LEN(args[0], str, str_len);
-    size_t suffix_len;
-    const char *suffix = mp_obj_str_get_data(args[1], &suffix_len);
-    if (n_args > 2) {
-        mp_raise_NotImplementedError(MP_ERROR_TEXT("start/end indices"));
-    }
+static mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) {
+    return str_startendswith(n_args, args, false);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 4, str_startswith);
 
-    if (suffix_len > str_len) {
-        return mp_const_false;
-    }
-    return mp_obj_new_bool(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
+static mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) {
+    return str_startendswith(n_args, args, true);
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 4, str_endswith);
 
 enum { LSTRIP, RSTRIP, STRIP };
 
diff --git a/tests/basics/string_endswith.py b/tests/basics/string_endswith.py
index 683562d10c32e..2b0a063988b45 100644
--- a/tests/basics/string_endswith.py
+++ b/tests/basics/string_endswith.py
@@ -5,11 +5,28 @@
 print("foobar".endswith(""))
 print("foobar".endswith("foobarbaz"))
 
-#print("1foobar".startswith("foo", 1))
-#print("1foo".startswith("foo", 1))
-#print("1foo".startswith("1foo", 1))
-#print("1fo".startswith("foo", 1))
-#print("1fo".startswith("foo", 10))
+print("foobar".endswith("bar", 3))
+print("foobar".endswith("bar", 4))
+print("foobar".endswith("foo", 0, 3))
+print("foobar".endswith("foo", 0, 4))
+print("foobar".endswith("foo", 1, 3))
+print("foobar".endswith("foo", 1, 3))
+print("foobar".endswith("oo", 1, 3))
+print("foobar".endswith("o", 2, 3))
+print("foobar".endswith("o", 3, 3))
+print("foobar".endswith("o", 4, 3))
+
+print("foobar".endswith("bar", None, None))
+print("foobar".endswith("bar", None, 3))
+print("foobar".endswith("bar", 3, None))
+print("foobar".endswith("bar", 2, None))
+print("foobar".endswith("foo", None, 3))
+
+print("foobar".endswith(("bar", "foo")))
+print("foobar".endswith(("foo", "bar")))
+print("foobar".endswith(("foo", "bar1")))
+print("foobar".endswith(("bar", )))
+print("foobar".endswith(("foo", )))
 
 try:
     "foobar".endswith(1)
diff --git a/tests/basics/string_endswith_upy.py b/tests/basics/string_endswith_upy.py
deleted file mode 100644
index 06a4e71d2c927..0000000000000
--- a/tests/basics/string_endswith_upy.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# MicroPython doesn't support tuple argument
-
-try:
-    "foobar".endswith(("bar", "sth"))
-except TypeError:
-    print("TypeError")
diff --git a/tests/basics/string_endswith_upy.py.exp b/tests/basics/string_endswith_upy.py.exp
deleted file mode 100644
index 6002b71c56ea0..0000000000000
--- a/tests/basics/string_endswith_upy.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-TypeError
diff --git a/tests/basics/string_startswith.py b/tests/basics/string_startswith.py
index e63ae3c1866df..eefdea82198f1 100644
--- a/tests/basics/string_startswith.py
+++ b/tests/basics/string_startswith.py
@@ -10,6 +10,25 @@
 print("1fo".startswith("foo", 1))
 print("1fo".startswith("foo", 10))
 
+print("1foobar".startswith("foo", 1, 5))
+print("1foobar".startswith("foo", 1, 4))
+print("1foobar".startswith("foo", 1, 3))
+print("1foobar".startswith("oo", 2, 4))
+print("1foobar".startswith("o", 3, 4))
+print("1foobar".startswith("o", 4, 4))
+print("1foobar".startswith("o", 5, 4))
+
+print("foobar".startswith("foo", None, None))
+print("foobar".startswith("foo", None, 3))
+print("foobar".startswith("foo", None, 2))
+print("foobar".startswith("bar", 3, None))
+
+
+print("foobar".startswith(("foo", "sth")))
+print("foobar".startswith(("sth", "foo")))
+print("foobar".startswith(("sth", "foo2")))
+print("foobar".startswith(("foo", )))
+
 try:
     "foobar".startswith(1)
 except TypeError:
diff --git a/tests/basics/string_startswith_upy.py b/tests/basics/string_startswith_upy.py
deleted file mode 100644
index 9ea1796c218fd..0000000000000
--- a/tests/basics/string_startswith_upy.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# MicroPython doesn't support tuple argument
-
-try:
-    "foobar".startswith(("foo", "sth"))
-except TypeError:
-    print("TypeError")
diff --git a/tests/basics/string_startswith_upy.py.exp b/tests/basics/string_startswith_upy.py.exp
deleted file mode 100644
index 6002b71c56ea0..0000000000000
--- a/tests/basics/string_startswith_upy.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-TypeError
diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index da90f90ac3ed7..dd62f63255c72 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -63,12 +63,6 @@
 except NotImplementedError:
     print("NotImplementedError")
 
-# str.endswith(s, start) not implemented
-try:
-    "abc".endswith("c", 1)
-except NotImplementedError:
-    print("NotImplementedError")
-
 # str subscr with step!=1 not implemented
 try:
     print("abc"[1:2:3])
diff --git a/tests/misc/non_compliant.py.exp b/tests/misc/non_compliant.py.exp
index 3f15a14406092..deefe78a712d0 100644
--- a/tests/misc/non_compliant.py.exp
+++ b/tests/misc/non_compliant.py.exp
@@ -13,7 +13,6 @@ NotImplementedError
 NotImplementedError
 NotImplementedError
 NotImplementedError
-NotImplementedError
 b'\x01\x02'
 b'\x01\x00'
 NotImplementedError

From 213f1c1ee07016c1a4d21cc3b1ea4ea85ba33c98 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 Feb 2025 21:40:09 +0100
Subject: [PATCH 1926/3129] samd/machine_i2c: Support default instance and
 SCL/SDA pin values.

If a board configures a default I2C instance and/or SCL/SDA pins, then
these no longer need to be given in the constructor.  This allows the user
to easily construct the default I2C instance via `machine.I2C()` and that
will work on the default pins as designated on the board silkscreen.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_i2c.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index a7b728ddaf362..03af3d29ed614 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -34,6 +34,7 @@
 #include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
+#include "genhdr/pins.h"
 #include "clock_config.h"
 
 #define DEFAULT_I2C_FREQ  (400000)
@@ -119,17 +120,26 @@ void common_i2c_irq_handler(int i2c_id) {
 
 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_printf(print, "I2C(%u, freq=%u, scl=\"%q\", sda=\"%q\")",
+        self->id, self->freq, pin_find_by_id(self->scl)->name, pin_find_by_id(self->sda)->name);
 }
 
 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 },
+        #if MICROPY_HW_DEFAULT_I2C_ID < 0
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
+        #else
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = MICROPY_HW_DEFAULT_I2C_ID} },
+        #endif
         { MP_QSTR_freq, MP_ARG_INT, {.u_int = DEFAULT_I2C_FREQ} },
+        #if defined(pin_SCL) && defined(pin_SDA)
+        { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = pin_SCL} },
+        { MP_QSTR_sda, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = pin_SDA} },
+        #else
         { 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} },
+        #endif
     };
 
     // Parse args.
@@ -137,7 +147,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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);
+    int id = args[ARG_id].u_int;
     if (id < 0 || id >= SERCOM_INST_NUM) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), id);
     }
@@ -148,15 +158,13 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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);
+
+    sercom_pad_config_t scl_pad_config = get_sercom_config(self->scl, self->id);
+    sercom_pad_config_t 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"));
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid sda/scl pin"));
     }
     MP_STATE_PORT(sercom_table[self->id]) = self;
     self->freq = args[ARG_freq].u_int;

From 62ed69b016d98167db01c5283758bfde95c6aec9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 Feb 2025 21:43:36 +0100
Subject: [PATCH 1927/3129] samd/machine_spi: Support default instance and
 SCK/MOSI/MISO pin values.

If a board configures a default SPI instance and/or SCK/MOSI/MISO pins,
then the user can create a default SPI object using `machine.SPI()`.

Also, if MISO is not going to be used, then MISO can be set to `None` with
`miso=None`.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_spi.c | 43 ++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 9c31cc2778dba..744de2000b00a 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -33,6 +33,7 @@
 #include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
+#include "genhdr/pins.h"
 #include "clock_config.h"
 
 #define DEFAULT_SPI_BAUDRATE    (1000000)
@@ -82,8 +83,15 @@ 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)",
-        self->id, self->baudrate, self->firstbit, self->polarity, self->phase);
+    mp_printf(print, "SPI(%u, baudrate=%u, firstbit=%u, polarity=%u, phase=%u, bits=8,"
+        " sck=\"%q\", mosi=\"%q\", miso=",
+        self->id, self->baudrate, self->firstbit, self->polarity, self->phase,
+        pin_find_by_id(self->sck)->name, pin_find_by_id(self->mosi)->name);
+    if (self->miso == 0xff) {
+        mp_printf(print, "None)");
+    } else {
+        mp_printf(print, "\"%q\")", pin_find_by_id(self->miso)->name);
+    }
 }
 
 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) {
@@ -96,7 +104,7 @@ static void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
         { 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} },
+        { MP_QSTR_miso, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(-1)} },
     };
 
     machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -132,14 +140,16 @@ static void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_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);
+    if (args[ARG_miso].u_obj != MP_ROM_INT(-1)) {
+        self->miso = args[ARG_miso].u_obj == mp_const_none ? 0xff : 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;
 
+        if (self->sck == 0xff || self->mosi == 0xff) {
+            mp_raise_ValueError(MP_ERROR_TEXT("missing sck/mosi"));
+        }
         // 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);
@@ -155,7 +165,7 @@ static void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
         } 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"));
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid sck/mosi pin"));
         }
         #elif defined(MCU_SAMD51)
         if (self->mosi_pad_config.pad_nr == 0 && self->sck_pad_config.pad_nr == 1) {
@@ -232,10 +242,16 @@ static void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
 }
 
 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);
+    mp_arg_check_num(n_args, n_kw, MICROPY_HW_DEFAULT_SPI_ID < 0 ? 1 : 0, MP_OBJ_FUN_ARGS_MAX, true);
 
     // Get SPI bus.
-    int spi_id = mp_obj_get_int(args[0]);
+    int spi_id = MICROPY_HW_DEFAULT_SPI_ID;
+
+    if (n_args > 0) {
+        spi_id = mp_obj_get_int(args[0]);
+        n_args--;
+        args++;
+    }
     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);
     }
@@ -247,16 +263,23 @@ static mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, s
     self->polarity = DEFAULT_SPI_POLARITY;
     self->phase = DEFAULT_SPI_PHASE;
     self->firstbit = DEFAULT_SPI_FIRSTBIT;
+    #if defined(pin_SCK) && defined(pin_MOSI) && defined(pin_MISO)
+    // Initialize with the default pins
+    self->sck = mp_hal_get_pin_obj((mp_obj_t)pin_SCK);
+    self->mosi = mp_hal_get_pin_obj((mp_obj_t)pin_MOSI);
+    self->miso = mp_hal_get_pin_obj((mp_obj_t)pin_MISO);
+    #else
     self->mosi = 0xff; // 0xff: pin not defined (yet)
     self->miso = 0xff;
     self->sck = 0xff;
+    #endif
 
     self->new = true;
     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);
-    machine_spi_init((mp_obj_base_t *)self, n_args - 1, args + 1, &kw_args);
+    machine_spi_init((mp_obj_base_t *)self, n_args, args, &kw_args);
     return self;
 }
 

From daef1c1d146207e6a42219a7d6717df337a11377 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 Feb 2025 22:08:17 +0100
Subject: [PATCH 1928/3129] samd/machine_uart: Support default instance and
 TX/RX pin values.

If a board configures a default UART instance and/or TX/RX pins then the
user can create a default UART object using `machine.UART()`.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_uart.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 6e9a5538647bc..45bfc3ddd5002 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -32,6 +32,7 @@
 #include "py/ringbuf.h"
 #include "samd_soc.h"
 #include "pin_af.h"
+#include "genhdr/pins.h"
 #include "shared/runtime/softtimer.h"
 
 #define DEFAULT_UART_BAUDRATE (115200)
@@ -298,7 +299,7 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
     }
 
     mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
-        "timeout=%u, timeout_char=%u, rxbuf=%d"
+        "tx=\"%q\", rx=\"%q\", timeout=%u, timeout_char=%u, rxbuf=%d"
         #if MICROPY_HW_UART_TXBUF
         ", txbuf=%d"
         #endif
@@ -310,7 +311,8 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         #endif
         ")",
         self->id, self->baudrate, self->bits, _parity_name[self->parity],
-        self->stop + 1, self->timeout, self->timeout_char, rxbuf_len
+        self->stop + 1, pin_find_by_id(self->tx)->name, pin_find_by_id(self->rx)->name,
+        self->timeout, self->timeout_char, rxbuf_len
         #if MICROPY_HW_UART_TXBUF
         , txbuf_len
         #endif
@@ -448,7 +450,7 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
 
         // 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"));
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid 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);
@@ -479,10 +481,16 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
 }
 
 static mp_obj_t mp_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);
+    mp_arg_check_num(n_args, n_kw, MICROPY_HW_DEFAULT_UART_ID < 0 ? 1 : 0, MP_OBJ_FUN_ARGS_MAX, true);
 
     // Get UART bus.
-    int uart_id = mp_obj_get_int(args[0]);
+    int uart_id = MICROPY_HW_DEFAULT_UART_ID;
+
+    if (n_args > 0) {
+        uart_id = mp_obj_get_int(args[0]);
+        n_args--;
+        args++;
+    }
     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);
     }
@@ -495,8 +503,15 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->stop = 0;
     self->timeout = 1;
     self->timeout_char = 1;
+    #if defined(pin_TX) && defined(pin_RX)
+    // Initialize with the default pins
+    self->tx = mp_hal_get_pin_obj((mp_obj_t)pin_TX);
+    self->rx = mp_hal_get_pin_obj((mp_obj_t)pin_RX);
+    #else
+    // Have to be defined
     self->tx = 0xff;
     self->rx = 0xff;
+    #endif
     #if MICROPY_HW_UART_RTSCTS
     self->rts = 0xff;
     self->cts = 0xff;
@@ -510,7 +525,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    mp_machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+    mp_machine_uart_init_helper(self, n_args, args, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }

From 4cbaab17669b54ddfe8c509eb0f7653706120211 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 8 Feb 2025 09:23:11 +0100
Subject: [PATCH 1929/3129] samd/boards: Add missing TX/RX, SCL/SDA and
 SCK/MOSI/MISO pin names.

These were missing and are needed to support UART/I2C/SPI default pins.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv   | 4 ++--
 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv   | 2 ++
 ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv | 2 ++
 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv | 3 +++
 ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv     | 3 +++
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv           | 8 +++++++-
 ports/samd/boards/MINISAM_M4/pins.csv                    | 6 ++++--
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv            | 2 ++
 ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv             | 9 ++++++++-
 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv    | 3 ++-
 10 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
index 8993419a268c5..f2676693ec41d 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -21,8 +21,8 @@ A2,PB09
 A3,PA04
 A4,PA05
 A5,PB02
-TX,PB22
-RX,PB23
+RX,PA11
+TX,PA10
 SCL,PA23
 SDA,PA22
 MOSI,PB10
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
index ec7a8bc1638da..056339de1335f 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -15,6 +15,8 @@ A2,PB08
 A3,PB09
 A4,PA04
 A5,PB06
+RX,PB17
+TX,PB16
 SCL,PA13
 SDA,PA12
 MOSI,PB23
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
index 845cefb8a972b..250e42d9d04bc 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -16,6 +16,8 @@ A2,PB09
 A3,PA04
 A4,PA05
 A5,PB02
+RX,PA11
+TX,PA10
 SDA,PA22
 SCL,PA23
 MOSI,PB10
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
index c82beccfa2be3..8597815a124d9 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -16,6 +16,9 @@ A2,PB08
 A3,PB09
 A4,PA04
 A5,PA06
+
+RX,PA16
+TX,PA17
 SDA,PA12
 SCL,PA13
 MOSI,PA00
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv
index cee4bf02b7a39..aef7391d12d3b 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/pins.csv
@@ -21,6 +21,9 @@ D11,PA19
 D12,PA17
 D13,PA16
 
+RX,PA23
+TX,PA22
+
 SDA,PB02
 SCL,PB03
 
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
index 47306f8de1ce0..fb1e645cf4ddc 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
@@ -1,3 +1,10 @@
+RX,PA07
+TX,PA06
+SDA,PA08
+SCL,PA09
+MOSI,PA06
+MISO,PA09
+SCK,PA07
 D0,PA08
 D1,PA02
 D2,PA09
@@ -5,7 +12,6 @@ D3,PA07
 D4,PA06
 DOTSTAR_DATA,PA00
 DOTSTAR_CLK,PA01
-
 LED,PA10
 
 USB_DM,PA24
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
index 3c1ab4c6038d3..d6a3ef803200b 100644
--- a/ports/samd/boards/MINISAM_M4/pins.csv
+++ b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -7,6 +7,8 @@ A5,PA06
 A6,PA07
 RX,PA16
 TX,PA17
+D0,PA16
+D1,PA17
 D3,PA19
 D4,PA20
 D5,PA21
@@ -15,8 +17,8 @@ BUTTON,PA00
 AREF,PA03
 SDA,PA12
 SCL,PA13
-MOSI,PB22
-MISO,PB23
+MOSI,PB23
+MISO,PB22
 SCK,PA01
 DOTSTAR_DATA,PB03
 DOTSTAR_CLK,PB02
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
index f263253cbaae4..c335ba2baff18 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -19,6 +19,8 @@ ENABLE_5V,PC14
 ENABLE_3V3,PC15
 TX,PB26
 RX,PB27
+SDA,PA13
+SCL,PA12
 SDA0,PA13
 SCL0,PA12
 SDA1,PA17
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv b/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
index 969c60028b41b..6f70f3308e703 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
@@ -1,3 +1,11 @@
+RX,PB09
+TX,PB08
+SCL,PA09
+SDA,PA08
+MOSI,PA06
+MISO,PA05
+SCK,PA07
+
 A0_D0,PA02
 A1_D1,PA04
 A2_D2,PA10
@@ -9,7 +17,6 @@ A7_D7,PB09
 A8_D8,PA07
 A9_D9,PA05
 A10_D10,PA06
-
 USER_LED,PA17
 RX_LED,PA18
 TX_LED,PA19
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
index 0ae269724da85..fe47fef27f29c 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
@@ -15,6 +15,8 @@ A2,PB09
 A3,PA04
 A4,PA05
 A5,PB02
+RX,PA13
+TX,PA12
 SDA,PA22
 SCL,PA23
 MOSI,PB12
@@ -30,7 +32,6 @@ TXLED,PA27
 
 USB_DM,PA24
 USB_DP,PA25
-USB_SOF,PA23
 
 SWCLK,PA30
 SWDIO,PA31

From b9b4f1b40b9f97a5b8893afe9cb139a09fb76fd9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 11 Feb 2025 10:07:07 +0100
Subject: [PATCH 1930/3129] samd/boards: Provide default IDs for UART, I2C and
 SPI.

In combination with the defautl Pins the default device can now be
instantiated e.g. as: uart = UART().  Similar for I2C and SPI.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h   | 4 ++++
 .../boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h   | 4 ++++
 .../boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h | 4 ++++
 .../boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h | 4 ++++
 .../boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.h     | 4 ++++
 ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h   | 4 ++++
 ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h    | 4 ++++
 ports/samd/boards/MINISAM_M4/mpconfigboard.h             | 4 ++++
 ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h     | 4 ++++
 ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.h      | 4 ++++
 .../boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h    | 4 ++++
 ports/samd/mpconfigport.h                                | 9 +++++++++
 12 files changed, 53 insertions(+)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
index 880df8d200390..a2df633765443 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -3,5 +3,9 @@
 
 #define MICROPY_HW_XOSC32K  (1)
 
+#define MICROPY_HW_DEFAULT_UART_ID  (2)
+#define MICROPY_HW_DEFAULT_I2C_ID   (3)
+#define MICROPY_HW_DEFAULT_SPI_ID   (4)
+
 #define MICROPY_HW_SPIFLASH (1)
 #define MICROPY_HW_SPIFLASH_ID (2)
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
index a9f7d518e2364..f68a26303197c 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
@@ -4,4 +4,8 @@
 #define MICROPY_HW_XOSC32K          (1)
 #define MICROPY_HW_MCU_OSC32KULP    (1)
 
+#define MICROPY_HW_DEFAULT_UART_ID  (5)
+#define MICROPY_HW_DEFAULT_I2C_ID   (2)
+#define MICROPY_HW_DEFAULT_SPI_ID   (1)
+
 #define MICROPY_HW_QSPIFLASH        GD25Q16C
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
index 16018fdc56356..84b75414f5e32 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
@@ -3,5 +3,9 @@
 
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
 
+#define MICROPY_HW_DEFAULT_SPI_ID   (4)
+#define MICROPY_HW_DEFAULT_I2C_ID   (3)
+#define MICROPY_HW_DEFAULT_UART_ID  (0)
+
 #define MICROPY_HW_SPIFLASH         (1)
 #define MICROPY_HW_SPIFLASH_ID      (5)
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
index 2f246c60b188c..47eabbd8787b6 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
@@ -3,4 +3,8 @@
 
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
 
+#define MICROPY_HW_DEFAULT_SPI_ID   (1)
+#define MICROPY_HW_DEFAULT_I2C_ID   (2)
+#define MICROPY_HW_DEFAULT_UART_ID  (3)
+
 #define MICROPY_HW_QSPIFLASH        GD25Q16C
diff --git a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.h
index 7893cd706ac1a..0a2a1c2debe0b 100644
--- a/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_METRO_M4_EXPRESS/mpconfigboard.h
@@ -4,6 +4,10 @@
 #define MICROPY_HW_XOSC32K                  (1)
 #define MICROPY_HW_QSPIFLASH                GD25Q16C
 
+#define MICROPY_HW_DEFAULT_UART_ID          (3)
+#define MICROPY_HW_DEFAULT_I2C_ID           (5)
+#define MICROPY_HW_DEFAULT_SPI_ID           (2)
+
 // defines for WLAN
 #define MICROPY_HW_WIFI_SPI_ID              (2)
 #define MICROPY_HW_WIFI_SPI_BAUDRATE        (8000000)
diff --git a/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h
index 0acf28afbfe15..78b03ce7fbdb8 100644
--- a/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_QTPY_SAMD21/mpconfigboard.h
@@ -3,4 +3,8 @@
 
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
 
+#define MICROPY_HW_DEFAULT_UART_ID  (0)
+#define MICROPY_HW_DEFAULT_I2C_ID   (1)
+#define MICROPY_HW_DEFAULT_SPI_ID   (0)
+
 #define MICROPY_HW_SPIFLASH_ID (3)
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
index 5732a20e3adc4..1edff009859c1 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
@@ -2,3 +2,7 @@
 #define MICROPY_HW_MCU_NAME   "SAMD21E18A"
 
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
+
+#define MICROPY_HW_DEFAULT_UART_ID  (0)
+#define MICROPY_HW_DEFAULT_I2C_ID   (2)
+#define MICROPY_HW_DEFAULT_SPI_ID   (0)
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.h b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
index 87acf301e36b5..6d908bdcb81d2 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.h
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
@@ -3,4 +3,8 @@
 
 #define MICROPY_HW_DFLL_USB_SYNC    (1)
 
+#define MICROPY_HW_DEFAULT_UART_ID  (3)
+#define MICROPY_HW_DEFAULT_I2C_ID   (2)
+#define MICROPY_HW_DEFAULT_SPI_ID   (1)
+
 #define MICROPY_HW_QSPIFLASH   GD25Q16C
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
index 062f69ae4e773..7f6d42345776a 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
@@ -3,4 +3,8 @@
 
 #define MICROPY_HW_XOSC32K          (1)
 
+#define MICROPY_HW_DEFAULT_UART_ID  (2)
+#define MICROPY_HW_DEFAULT_I2C_ID   (4)
+#define MICROPY_HW_DEFAULT_SPI_ID   (5)
+
 #define MICROPY_HW_QSPIFLASH        W25Q32JV_IQ
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.h b/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.h
index 7447c5c3acf70..f0213a88e2990 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.h
@@ -3,3 +3,7 @@
 
 #define MICROPY_HW_XOSC32K  (1)
 #define MICROPY_HW_ADC_VREF (2)
+
+#define MICROPY_HW_DEFAULT_UART_ID  (4)
+#define MICROPY_HW_DEFAULT_I2C_ID   (2)
+#define MICROPY_HW_DEFAULT_SPI_ID   (0)
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
index 706fc3c64c37b..fe2226a59eb58 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
@@ -3,6 +3,10 @@
 
 #define MICROPY_HW_XOSC32K          (1)
 
+#define MICROPY_HW_DEFAULT_UART_ID  (2)
+#define MICROPY_HW_DEFAULT_I2C_ID   (3)
+#define MICROPY_HW_DEFAULT_SPI_ID   (4)
+
 // 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
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 0b47500bf7e7c..514f383948838 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -138,6 +138,15 @@
 #ifndef MICROPY_HW_USB_PID
 #define MICROPY_HW_USB_PID (0x9802)
 #endif
+#ifndef MICROPY_HW_DEFAULT_UART_ID
+#define MICROPY_HW_DEFAULT_UART_ID          (-1)
+#endif
+#ifndef MICROPY_HW_DEFAULT_I2C_ID
+#define MICROPY_HW_DEFAULT_I2C_ID           (-1)
+#endif
+#ifndef MICROPY_HW_DEFAULT_SPI_ID
+#define MICROPY_HW_DEFAULT_SPI_ID           (-1)
+#endif
 
 // Additional entries for use with pendsv_schedule_dispatch.
 #ifndef MICROPY_BOARD_PENDSV_ENTRIES

From 016ae19cf0e148ba7b33c2c80312b6f3641217dc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Feb 2025 10:24:49 +0100
Subject: [PATCH 1931/3129] docs/samd: Update the SAMD documentation describing
 default IDs/pins.

Changes are:
- Add the RX/TX pins to the table.  In most cases these are the D0/D1 pins.
- Document the ability for the instantiation of the default devices without
  submitting ID or pins.
- Improve the example script creating the pin list to show multiple name
  assigments to the same pin.
- Fix errors in the pinout document.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/pinout.rst   | 78 ++++++++++++++++++++++++++++--------------
 docs/samd/quickref.rst | 29 ++++++++++++++--
 2 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 776ab74bcdb22..3945e2bf2ff1c 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -41,9 +41,11 @@ Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
  35 PB03   FLASH_MISO   3  11     -      5/1   6/1     -
  54 PB22   FLASH_MOSI   6   -     -      5/2   7/0     -
  55 PB23    FLASH_SCK   7   -     -      5/3   7/1     -
+ 11 PA11           RX  11  19    0/3     2/3   1/1    0/3
+ 10 PA10           TX  10  18    0/2     2/2   1/0    0/2
  12 PA12         MISO  12   -    2/0     4/0   2/0    0/6
- 42 PB10         MOSI  10   -     -      4/2   5/0    0/4
- 43 PB11          SCK  11   -     -      4/3   5/1    0/5
+ 42 PA12         MOSI  10   -     -      4/2   5/0    0/4
+ 43 PA13          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     -
@@ -127,7 +129,7 @@ Examples for Adafruit ItsyBitsy M0 Express:
 - 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.
+- SPI 2 at Pin MOSI/MISO/SCK This is the default SPI device at the MOSI/MISO/SCK labelled pins.
 
 or other combinations.
 
@@ -169,6 +171,8 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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    -     -
+ 16 PA16           RX   0    -    -    1/0    3/1   2/0   1/0   0/4
+ 17 PA17           TX   1    -    -    1/1    3/0   2/1   1/1   0/5
  55 PB23         MISO   7    -    -    1/3    5/3   7/1    -     -
   0 PA00         MOSI   0    -    -     -     1/0   2/0    -     -
  43 PB11      QSPI_CS  12    -    -     -     4/3   5/1   0/5   1/1
@@ -235,7 +239,7 @@ 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:
+Examples for Adafruit ItsyBitsy M4 Express:
 
 - I2C 0 at pins A3/A4
 - I2C 1 at pins D0/D1
@@ -253,7 +257,7 @@ 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:
+Examples for Adafruit ItsyBitsy M4 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 D13/D11/D12
@@ -296,6 +300,8 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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
+ 49 PB17           RX   1    -    -    5/1     -    6/1   3/1    0/5
+ 48 PB16           TX   0    -    -    5/0     -    6/0   3/0    0/4
  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    -      -
@@ -381,6 +387,8 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
   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
+ 23 PA23           RX  7     -    -    3/1    5/0   4/1   1/7   0/3
+ 22 PA22           TX  6     -    -    3/0    5/1   4/0   1/6   0/2
  14 PA14         MISO 14     -    -    2/2    4/2   3/0   2/0   1/2
  12 PA12         MOSI 12     -    -    2/0    4/1   2/0   0/6   1/2
  54 PB22     NEOPIXEL 22     -    -    1/2    5/2   7/0    -     -
@@ -429,6 +437,13 @@ Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
   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
+ 41 PB09           RX   9    3     -     4/1   4/1     -
+ 40 PB08           TX   8    2     -     4/0   4/0     -
+  8 PA08          SDA   -   16    0/0    2/0   0/0    1/2
+  9 PA09          SCL   9   17    0/1    2/1   0/1    1/3
+  6 PA06         MOSI   6    6     -     0/2   1/0     -
+  5 PA05         MISO   5    5     -     0/1   0/1     -
+  7 PA07          SCK   7    7     -     0/3   1/1     -
  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
@@ -503,6 +518,8 @@ Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
  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
+ 11 PA11           RX  11   19    0/3    2/3   1/1    0/3
+ 10 PA10           TX  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
@@ -518,9 +535,9 @@ Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
 
 The default devices at the board are:
 
-- UART 5 at pins PB23/PB22, labelled RX/TX
+- UART 2 at pins PA11/PA10, labelled RX/TX
 - I2C 3 at pins PA22/PA23, labelled SDA/SCL
-- SPI 4 at pins PA10/PA12/PA11, labelled MOSI, MISO and SCK
+- SPI 4 at pins PB10/PA12/PB11, labelled MOSI, MISO and SCK
 - DAC output on pin PA02, labelled A0
 
 Adafruit Trinket M0 pin assignment table
@@ -536,6 +553,13 @@ Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
   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     -
+  7 PA07           RX   7    7     -     0/3   1/1     -
+  6 PA06           TX   6    6     -     0/2   1/0     -
+  8 PA08          SDA   -   16    0/0    2/0   0/0    1/2
+  9 PA09          SCL   9   17    0/1    2/1   0/1    1/3
+  6 PA06         MOSI   6    6     -     0/2   1/0     -
+  9 PA09         MISO   9   17    0/1    2/1   0/1    1/3
+  7 PA07          SCK   7    7     -     0/3   1/1     -
  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     -
@@ -716,8 +740,10 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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    -     -
+ 16 PA16           RX   0    -    -    1/0    3/1   2/0   1/0   0/4
+ 17 PA17           TX   1    -    -    1/1    3/0   2/1   1/1   0/5
+ 55 PB23         MOSI   7    -    -    1/3    5/3   7/1    -     -
+ 54 PB22         MISO  22    -    -    1/2    5/2   7/0    -     -
  43 PB11      QSPI_CS  12    -    -     -     4/3   5/1   0/5   1/1
   8 PA08      QSPI_D0   -    8    2    0/0    2/1   0/0   0/0   1/4
   9 PA09      QSPI_D1   9    9    3    0/1    2/0   0/1   0/1   1/5
@@ -893,6 +919,8 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
  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
+ 13 PA13           RX  13    -    -    2/1    4/0   2/1   0/7   1/3
+ 12 PA12           TX  12    -    -    2/0    4/1   2/0   0/6   1/2
  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    -     -
@@ -931,7 +959,7 @@ Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
 The default devices at the board are:
 
 - UART 2 at pins PA13/PA12, labelled RXD/TXD
-- I2C 5 at pins PA22/PA23, labelled SDA/SCL
+- I2C 3 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
 
@@ -1163,22 +1191,22 @@ The tables shown above were created with small a Python script running on the ta
       else:
           return "zzzzzzz%03d" % i[0]
 
-  def table(num=127, sort=True):
-      pintbl = []
-      inv_bd = {v: k for k, v in Pin.board.__dict__.items()}
-      for i in range(num):
-          try:
-              p = Pin(i)
-              pi = pininfo(p)
-              if p in inv_bd.keys():
-                  name = inv_bd[p]
-              else:
-                  name = ""
-              pintbl.append((i, name, pininfo(i)))
-          except:
-              pass
-              # print("not defined")
+  def pinnum(p):
+      return (ord(p[1]) - ord("A")) * 32 + int(p[2:])
 
+  def table(num = 127, sort=True):
+      pintbl = []
+      pinlist = []
+      for name in Pin.board.__dict__.keys():
+          p = Pin(name)
+          pi = pininfo(p)
+          pintbl.append((pinnum(pi[0]), name, pi))
+          pinlist.append(p)
+      for pc in Pin.cpu.__dict__.keys():
+          p = Pin(pc)
+          pi = pininfo(p)
+          if not p in pinlist:
+             pintbl.append((pinnum(pi[0]), "", pi))
       if sort:
           pintbl.sort(key=tblkey)
       for item in pintbl:
diff --git a/docs/samd/quickref.rst b/docs/samd/quickref.rst
index d57dc67908398..781686d2f60e6 100644
--- a/docs/samd/quickref.rst
+++ b/docs/samd/quickref.rst
@@ -163,10 +163,15 @@ See :ref:`machine.UART <machine.UART>`. ::
     uart3.write('hello')  # write 5 bytes
     uart3.read(5)         # read up to 5 bytes
 
+    uart = UART()         # Use the default values for id, rx and tx.
+    uart = UART(baudrate=9600) # Use the default UART and set the baudrate
+
 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>`.
+refer to the :ref:`SAMD pinout <samd_pinout>`. If the id, rx or tx pins are not specified,
+the default values are used. The first positional argument (if given) is assumed to be the UART id.
+If the baudrate is changed and the UART id is omitted, it must be set using the baudrate keyword.
 
 PWM (pulse width modulation)
 ----------------------------
@@ -373,8 +378,18 @@ signal pins for users.  Hardware SPI is accessed via the
     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>`.
+For the assignment of Pins to SPI devices and signals, refer to
+:ref:`SAMD pinout <samd_pinout>`. If the id, miso, mosi or sck pins are not specified,
+the default values are used. So it is possible to create the SPI object as::
+
+    from machine import SPI
+    spi = SPI()  # Use the default device and default baudrate
+    spi = SPI(baudrate=12_000_000)  # Use the default device and change the baudrate
+
+If the MISO signal shall be omitted, it must be defined as miso=None.
+The first positional argument (if given) is assumed to be the SPI id.
+If the baudrate is changed while the SPI id is omitted, it must be
+set using the baudrate keyword.
 
 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
@@ -407,6 +422,7 @@ 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>`.
+If the id, scl or sda pins are not specified, the default values are used.
 
 Hardware I2C is accessed via the :ref:`machine.I2C <machine.I2C>` class and
 has the same methods as software SPI above::
@@ -416,6 +432,13 @@ has the same methods as software SPI above::
     i2c = I2C(2, scl=Pin("SCL"), sda=Pin("SDA"), freq=400_000)
     i2c.writeto(0x76, b"Hello World")
 
+    i2c2 = I2C()   # Use the default values for id, scl and sda.
+    i2c2 = I2C(freq=100_000) # Use the default device and set freq.
+
+The first positional argument (if given) is assumed to be the I2C id.
+If the freq is changed and the I2C id is omitted, it must be set using
+the freq keyword.
+
 OneWire driver
 --------------
 

From 5f01232dd7c0a211e8beff24dc88efa48598ef36 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 26 Feb 2025 10:58:37 +1100
Subject: [PATCH 1932/3129] tests/run-tests: Remove any 'expected' file from a
 unittest run.

This won't be generated normally, but a failed run (for example, from a
unittest with an error or which doesn't call unittest.main()) will
generate one.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/run-tests.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 1af3dfc2973fc..38f1161360272 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -996,6 +996,8 @@ def run_one_test(test_file):
             if output_expected is not None:
                 with open(filename_expected, "wb") as f:
                     f.write(output_expected)
+            else:
+                rm_f(filename_expected)  # in case left over from previous failed run
             with open(filename_mupy, "wb") as f:
                 f.write(output_mupy)
             failed_tests.append((test_name, test_file))

From b4cf82b2d62c60c5e6e10d8d23c6b099b96c6f75 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 26 Feb 2025 11:00:53 +1100
Subject: [PATCH 1933/3129] test/run-tests: Print a note if it looks like
 unittest.main() missing.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/run-tests.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 38f1161360272..50adb6b4d3bea 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1004,6 +1004,16 @@ def run_one_test(test_file):
 
         test_count.increment()
 
+        # Print a note if this looks like it might have been a misfired unittest
+        if not uses_unittest and not test_passed:
+            with open(test_file, "r") as f:
+                if any(re.match("^import.+unittest", l) for l in f.readlines()):
+                    print(
+                        "NOTE: {} may be a unittest that doesn't run unittest.main()".format(
+                            test_file
+                        )
+                    )
+
     if pyb:
         num_threads = 1
 

From f5b4545761dbbce0c00dec6d90d180663a61eaa4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 2 Mar 2025 23:52:13 +1100
Subject: [PATCH 1934/3129] py/modsys: Add sys.implementation._build entry.

For a given MicroPython firmware/executable it can be sometimes important
to know how it was built, which variant/board configuration it came from.

This commit adds a new field `sys.implementation._build` that can help
identify the configuration that MicroPython was built with.

For now it's either:
* <VARIANT> for unix, webassembly and windows ports
* <BOARD>-<VARIANT> for microcontroller ports (the variant is optional)

In the future additional elements may be added to this string, separated by
a hyphen.

Resolves issue #16498.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/sys.rst | 12 ++++++++++++
 py/mkrules.cmake     | 13 +++++++++++++
 py/mkrules.mk        | 11 +++++++++++
 py/modsys.c          | 23 +++++++++++++++++++----
 tests/basics/sys1.py |  6 ++++++
 5 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index c72214c13108e..baefd927051d2 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -75,6 +75,8 @@ Constants
    * *version* - tuple (major, minor, micro, releaselevel), e.g. (1, 22, 0, '')
    * *_machine* - string describing the underlying machine
    * *_mpy* - supported mpy file-format version (optional attribute)
+   * *_build* - string that can help identify the configuration that
+     MicroPython was built with
 
    This object is the recommended way to distinguish MicroPython from other
    Python implementations (note that it still may not exist in the very
@@ -83,6 +85,16 @@ Constants
    Starting with version 1.22.0-preview, the fourth node *releaselevel* in
    *implementation.version* is either an empty string or ``"preview"``.
 
+   The *_build* entry was added in version 1.25.0 and is a hyphen-separated
+   set of elements.  New elements may be appended in the future so it's best to
+   access this field using ``sys.implementation._build.split("-")``.  The
+   elements that are currently used are:
+
+   * On the unix, webassembly and windows ports the first element is the variant
+     name, for example ``'standard'``.
+   * On microcontroller targets, the first element is the board name and the second
+     element (if present) is the board variant, for example ``'RPI_PICO2-RISCV'``
+
    .. admonition:: Difference to CPython
       :class: attention
 
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 907500dd67534..cafcbce5681d8 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -19,6 +19,19 @@ if(NOT MICROPY_PREVIEW_VERSION_2)
     set(MICROPY_PREVIEW_VERSION_2 0)
 endif()
 
+# Set the board name.
+if(MICROPY_BOARD)
+    if(MICROPY_BOARD_VARIANT)
+        set(MICROPY_BOARD_BUILD_NAME ${MICROPY_BOARD}-${MICROPY_BOARD_VARIANT})
+    else()
+        set(MICROPY_BOARD_BUILD_NAME ${MICROPY_BOARD})
+    endif()
+
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_BOARD_BUILD_NAME="${MICROPY_BOARD_BUILD_NAME}"
+    )
+endif()
+
 # 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)
diff --git a/py/mkrules.mk b/py/mkrules.mk
index e9504ce39f839..ad855c0d7fc45 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -27,6 +27,17 @@ OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD)/compressed.data.h
 CFLAGS += -DMICROPY_ROM_TEXT_COMPRESSION=1
 endif
 
+# Set the variant or board name.
+ifneq ($(VARIANT),)
+CFLAGS += -DMICROPY_BOARD_BUILD_NAME=\"$(VARIANT)\"
+else ifneq ($(BOARD),)
+ifeq ($(BOARD_VARIANT),)
+CFLAGS += -DMICROPY_BOARD_BUILD_NAME=\"$(BOARD)\"
+else
+CFLAGS += -DMICROPY_BOARD_BUILD_NAME=\"$(BOARD)-$(BOARD_VARIANT)\"
+endif
+endif
+
 # QSTR generation uses the same CFLAGS, with these modifications.
 QSTR_GEN_FLAGS = -DNO_QSTR
 # Note: := to force evaluation immediately.
diff --git a/py/modsys.c b/py/modsys.c
index e90ea2233a732..9ab02293b9063 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -92,6 +92,17 @@ static const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER
 #endif
 
 #if MICROPY_PY_ATTRTUPLE
+
+#if defined(MICROPY_BOARD_BUILD_NAME)
+static const MP_DEFINE_STR_OBJ(mp_sys_implementation__build_obj, MICROPY_BOARD_BUILD_NAME);
+#define MICROPY_BOARD_BUILD (1)
+#define SYS_IMPLEMENTATION_ELEMS__BUILD \
+    , MP_ROM_PTR(&mp_sys_implementation__build_obj)
+#else
+#define MICROPY_BOARD_BUILD (0)
+#define SYS_IMPLEMENTATION_ELEMS__BUILD
+#endif
+
 #if MICROPY_PREVIEW_VERSION_2
 #define SYS_IMPLEMENTATION_ELEMS__V2 \
     , MP_ROM_TRUE
@@ -106,6 +117,9 @@ static const qstr impl_fields[] = {
     #if MICROPY_PERSISTENT_CODE_LOAD
     MP_QSTR__mpy,
     #endif
+    #if defined(MICROPY_BOARD_BUILD_NAME)
+    MP_QSTR__build,
+    #endif
     #if MICROPY_PREVIEW_VERSION_2
     MP_QSTR__v2,
     #endif
@@ -113,19 +127,20 @@ static const qstr impl_fields[] = {
 static MP_DEFINE_ATTRTUPLE(
     mp_sys_implementation_obj,
     impl_fields,
-    3 + MICROPY_PERSISTENT_CODE_LOAD + MICROPY_PREVIEW_VERSION_2,
+    3 + MICROPY_PERSISTENT_CODE_LOAD + MICROPY_BOARD_BUILD + MICROPY_PREVIEW_VERSION_2,
     SYS_IMPLEMENTATION_ELEMS_BASE
     SYS_IMPLEMENTATION_ELEMS__MPY
+    SYS_IMPLEMENTATION_ELEMS__BUILD
     SYS_IMPLEMENTATION_ELEMS__V2
     );
 #else
 static const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
     {&mp_type_tuple},
     3 + MICROPY_PERSISTENT_CODE_LOAD,
-    // Do not include SYS_IMPLEMENTATION_ELEMS__V2 because
-    // SYS_IMPLEMENTATION_ELEMS__MPY may be empty if
+    // Do not include SYS_IMPLEMENTATION_ELEMS__BUILD or SYS_IMPLEMENTATION_ELEMS__V2
+    // because SYS_IMPLEMENTATION_ELEMS__MPY may be empty if
     // MICROPY_PERSISTENT_CODE_LOAD is disabled, which means they'll share
-    // the same index. Cannot query _v2 if MICROPY_PY_ATTRTUPLE is
+    // the same index. Cannot query _build or _v2 if MICROPY_PY_ATTRTUPLE is
     // disabled.
     {
         SYS_IMPLEMENTATION_ELEMS_BASE
diff --git a/tests/basics/sys1.py b/tests/basics/sys1.py
index 95d8905d135c7..94220fe4a60c6 100644
--- a/tests/basics/sys1.py
+++ b/tests/basics/sys1.py
@@ -24,6 +24,12 @@
     # Effectively skip subtests
     print(int)
 
+if hasattr(sys.implementation, '_build'):
+    print(type(sys.implementation._build))
+else:
+    # Effectively skip subtests
+    print(str)
+
 try:
     print(sys.intern('micropython') == 'micropython')
     has_intern = True

From 859b6efce52b0ca605681e3b10e2304577942a9a Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Fri, 21 Feb 2025 14:41:03 +0100
Subject: [PATCH 1935/3129] zephyr/machine_wdt: Add watchdog timer
 implementation.

Simple implementation in-line with the rest of the MicroPython ports

Tested on the nRF52832 and the nRF5340.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/machine_wdt.c  | 92 +++++++++++++++++++++++++++++++++++++
 ports/zephyr/mpconfigport.h |  4 ++
 ports/zephyr/prj.conf       |  3 ++
 3 files changed, 99 insertions(+)
 create mode 100644 ports/zephyr/machine_wdt.c

diff --git a/ports/zephyr/machine_wdt.c b/ports/zephyr/machine_wdt.c
new file mode 100644
index 0000000000000..7c5e6337ca33a
--- /dev/null
+++ b/ports/zephyr/machine_wdt.c
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Daniel Campora on behalf of REMOTE TECH LTD
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 never compiled standalone, it's included directly from
+// extmod/machine_wdt.c via MICROPY_PY_MACHINE_WDT_INCLUDEFILE.
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/sys/printk.h>
+#include <stdbool.h>
+
+#include "py/mperrno.h"
+
+typedef struct _machine_wdt_obj_t {
+    mp_obj_base_t base;
+    struct device *wdt;
+    int32_t channel_id;
+} machine_wdt_obj_t;
+
+static machine_wdt_obj_t wdt_default = {
+    {&machine_wdt_type}, NULL, -1
+};
+
+static machine_wdt_obj_t *mp_machine_wdt_make_new_instance(mp_int_t id, mp_int_t timeout_ms) {
+    if (id != 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid WDT id"));
+    }
+
+    if (timeout_ms <= 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("watchdog timeout too short"));
+    }
+
+    wdt_default.wdt = (struct device *)DEVICE_DT_GET(DT_ALIAS(watchdog0));
+
+    if (!device_is_ready(wdt_default.wdt)) {
+        mp_raise_OSError(MP_ENODEV);
+    }
+
+    struct wdt_timeout_cfg wdt_config = {
+        /* Reset SoC when watchdog timer expires. */
+        .flags = WDT_FLAG_RESET_SOC,
+
+        /* Expire watchdog after max window */
+        .window.min = 0,
+        .window.max = timeout_ms,
+    };
+
+    wdt_default.channel_id = wdt_install_timeout(wdt_default.wdt, &wdt_config);
+
+    if (wdt_default.channel_id < 0) {
+        mp_raise_OSError(-wdt_default.channel_id);
+    }
+
+    mp_int_t rs_code = wdt_setup(wdt_default.wdt, WDT_OPT_PAUSE_IN_SLEEP | WDT_OPT_PAUSE_HALTED_BY_DBG);
+
+    if (rs_code < 0) {
+        mp_raise_OSError(-rs_code);
+    }
+
+    return &wdt_default;
+}
+
+static void mp_machine_wdt_feed(machine_wdt_obj_t *self) {
+    mp_int_t rs_code = wdt_feed(self->wdt, self->channel_id);
+    if (rs_code < 0) {
+        mp_raise_OSError(-rs_code);
+    }
+}
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index a2e74e6928984..c4fa6c5b95439 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -68,6 +68,10 @@
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/zephyr/machine_uart.c"
+#ifdef CONFIG_WATCHDOG
+#define MICROPY_PY_MACHINE_WDT      (1)
+#define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/zephyr/machine_wdt.c"
+#endif
 #define MICROPY_PY_STRUCT           (0)
 #ifdef CONFIG_NETWORKING
 // If we have networking, we likely want errno comfort
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index eac04216c7fac..ae37c3ff07614 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -79,3 +79,6 @@ CONFIG_NET_BUF_POOL_USAGE=y
 CONFIG_MICROPY_CONFIGFILE="mpconfigport.h"
 CONFIG_MICROPY_VFS_FAT=y
 CONFIG_MICROPY_VFS_LFS2=y
+
+CONFIG_WATCHDOG=y
+CONFIG_WDT_DISABLE_AT_BOOT=y

From fc71f7832f202acf8ab45ab36ebffd706cb0ab59 Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Fri, 18 Oct 2024 12:08:11 +0300
Subject: [PATCH 1936/3129] py/makeqstrdata.py: Implement MicroPython
 compatibility.

This allows running `py/makeqstrdata.py` with MicroPython itself.

Signed-off-by: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/makeqstrdata.py | 64 ++++++++++++++++++++++++++++++++++++++--------
 pyproject.toml     |  2 +-
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 480344180a88a..3a9c7aff52536 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -9,17 +9,54 @@
 import re
 import sys
 
-# Python 2/3 compatibility:
+# Python 2/3/MicroPython compatibility:
 #   - iterating through bytes is different
-#   - codepoint2name lives in a different module
-import platform
-
-if platform.python_version_tuple()[0] == "2":
+#   - codepoint2name from html.entities is hard-coded
+if sys.version_info[0] == 2:
     bytes_cons = lambda val, enc=None: bytearray(val)
-    from htmlentitydefs import codepoint2name
-elif platform.python_version_tuple()[0] == "3":
+elif sys.version_info[0] == 3:  # Also handles MicroPython
     bytes_cons = bytes
-    from html.entities import codepoint2name
+
+# fmt: off
+codepoint2name = {
+    198: "AElig", 193: "Aacute", 194: "Acirc", 192: "Agrave", 913: "Alpha", 197: "Aring", 195: "Atilde",
+    196: "Auml", 914: "Beta", 199: "Ccedil", 935: "Chi", 8225: "Dagger", 916: "Delta", 208: "ETH",
+    201: "Eacute", 202: "Ecirc", 200: "Egrave", 917: "Epsilon", 919: "Eta", 203: "Euml", 915: "Gamma",
+    205: "Iacute", 206: "Icirc", 204: "Igrave", 921: "Iota", 207: "Iuml", 922: "Kappa", 923: "Lambda",
+    924: "Mu", 209: "Ntilde", 925: "Nu", 338: "OElig", 211: "Oacute", 212: "Ocirc", 210: "Ograve",
+    937: "Omega", 927: "Omicron", 216: "Oslash", 213: "Otilde", 214: "Ouml", 934: "Phi", 928: "Pi",
+    8243: "Prime", 936: "Psi", 929: "Rho", 352: "Scaron", 931: "Sigma", 222: "THORN", 932: "Tau",
+    920: "Theta", 218: "Uacute", 219: "Ucirc", 217: "Ugrave", 933: "Upsilon", 220: "Uuml", 926: "Xi",
+    221: "Yacute", 376: "Yuml", 918: "Zeta", 225: "aacute", 226: "acirc", 180: "acute", 230: "aelig",
+    224: "agrave", 8501: "alefsym", 945: "alpha", 38: "amp", 8743: "and", 8736: "ang", 229: "aring",
+    8776: "asymp", 227: "atilde", 228: "auml", 8222: "bdquo", 946: "beta", 166: "brvbar", 8226: "bull",
+    8745: "cap", 231: "ccedil", 184: "cedil", 162: "cent", 967: "chi", 710: "circ", 9827: "clubs",
+    8773: "cong", 169: "copy", 8629: "crarr", 8746: "cup", 164: "curren", 8659: "dArr", 8224: "dagger",
+    8595: "darr", 176: "deg", 948: "delta", 9830: "diams", 247: "divide", 233: "eacute", 234: "ecirc",
+    232: "egrave", 8709: "empty", 8195: "emsp", 8194: "ensp", 949: "epsilon", 8801: "equiv", 951: "eta",
+    240: "eth", 235: "euml", 8364: "euro", 8707: "exist", 402: "fnof", 8704: "forall", 189: "frac12",
+    188: "frac14", 190: "frac34", 8260: "frasl", 947: "gamma", 8805: "ge", 62: "gt", 8660: "hArr",
+    8596: "harr", 9829: "hearts", 8230: "hellip", 237: "iacute", 238: "icirc", 161: "iexcl", 236: "igrave",
+    8465: "image", 8734: "infin", 8747: "int", 953: "iota", 191: "iquest", 8712: "isin", 239: "iuml",
+    954: "kappa", 8656: "lArr", 955: "lambda", 9001: "lang", 171: "laquo", 8592: "larr", 8968: "lceil",
+    8220: "ldquo", 8804: "le", 8970: "lfloor", 8727: "lowast", 9674: "loz", 8206: "lrm", 8249: "lsaquo",
+    8216: "lsquo", 60: "lt", 175: "macr", 8212: "mdash", 181: "micro", 183: "middot", 8722: "minus",
+    956: "mu", 8711: "nabla", 160: "nbsp", 8211: "ndash", 8800: "ne", 8715: "ni", 172: "not", 8713: "notin",
+    8836: "nsub", 241: "ntilde", 957: "nu", 243: "oacute", 244: "ocirc", 339: "oelig", 242: "ograve",
+    8254: "oline", 969: "omega", 959: "omicron", 8853: "oplus", 8744: "or", 170: "ordf", 186: "ordm",
+    248: "oslash", 245: "otilde", 8855: "otimes", 246: "ouml", 182: "para", 8706: "part", 8240: "permil",
+    8869: "perp", 966: "phi", 960: "pi", 982: "piv", 177: "plusmn", 163: "pound", 8242: "prime",
+    8719: "prod", 8733: "prop", 968: "psi", 34: "quot", 8658: "rArr", 8730: "radic", 9002: "rang",
+    187: "raquo", 8594: "rarr", 8969: "rceil", 8221: "rdquo", 8476: "real", 174: "reg", 8971: "rfloor",
+    961: "rho", 8207: "rlm", 8250: "rsaquo", 8217: "rsquo", 8218: "sbquo", 353: "scaron", 8901: "sdot",
+    167: "sect", 173: "shy", 963: "sigma", 962: "sigmaf", 8764: "sim", 9824: "spades", 8834: "sub",
+    8838: "sube", 8721: "sum", 8835: "sup", 185: "sup1", 178: "sup2", 179: "sup3", 8839: "supe",
+    223: "szlig", 964: "tau", 8756: "there4", 952: "theta", 977: "thetasym", 8201: "thinsp", 254: "thorn",
+    732: "tilde", 215: "times", 8482: "trade", 8657: "uArr", 250: "uacute", 8593: "uarr", 251: "ucirc",
+    249: "ugrave", 168: "uml", 978: "upsih", 965: "upsilon", 252: "uuml", 8472: "weierp", 958: "xi",
+    253: "yacute", 165: "yen", 255: "yuml", 950: "zeta", 8205: "zwj", 8204: "zwnj"
+}
+# fmt: on
 # end compatibility code
 
 codepoint2name[ord("-")] = "hyphen"
@@ -295,6 +332,9 @@
     "<genexpr>",
 }
 
+# Matches any string that needs no escaping (alphanum + _ only)
+RE_NO_ESCAPE = re.compile(r"^[a-zA-Z0-9_]$")
+
 
 # this must match the equivalent function in qstr.c
 def compute_hash(qstr, bytes_hash):
@@ -307,15 +347,17 @@ def compute_hash(qstr, bytes_hash):
 
 
 def qstr_escape(qst):
-    def esc_char(m):
-        c = ord(m.group(0))
+    def esc_char(c):
+        if RE_NO_ESCAPE.match(c):
+            return c
+        c = ord(c)
         try:
             name = codepoint2name[c]
         except KeyError:
             name = "0x%02x" % c
         return "_" + name + "_"
 
-    return re.sub(r"[^A-Za-z0-9_]", esc_char, qst)
+    return "".join(map(esc_char, qst))
 
 
 static_qstr_list_ident = list(map(qstr_escape, static_qstr_list))
diff --git a/pyproject.toml b/pyproject.toml
index d5e3d0e847464..8053df24dd797 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.codespell]
 count = ""
 ignore-regex = '\b[A-Z]{3}\b'
-ignore-words-list = "ans,asend,deques,dout,emac,extint,hsi,iput,mis,numer,shft,synopsys,technic,ure"
+ignore-words-list = "ans,asend,deques,dout,emac,extint,hsi,iput,mis,notin,numer,shft,synopsys,technic,ure,curren"
 quiet-level = 3
 skip = """
 */build*,\

From e1b2f2e078727999148a71ab969c1685173d25c0 Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Fri, 18 Oct 2024 12:08:11 +0300
Subject: [PATCH 1937/3129] tools/mpy-tool.py: Add support for self-hosting of
 mpy-tool.

This allows running mpy-tool using MicroPython itself.

An appropriate test is added to CI to make sure it continues to work.

Signed-off-by: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/ci.sh       | 10 ++++++++++
 tools/mpy-tool.py |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 5b108d620258c..682c3ae507a6d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -118,9 +118,19 @@ function ci_mpy_format_test {
     python2.7 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
     python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
 
+    # Build MicroPython
+    ci_unix_standard_build
+    micropython=./ports/unix/build-standard/micropython
+    $micropython -m mip install --target . argparse __future__
+    export MICROPYPATH=.
+
+    # Test mpy-tool.py running under MicroPython
+    $micropython ./tools/mpy-tool.py -x -d tests/frozen/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
+    $micropython ./tools/mpy-tool.py -x -d examples/natmod/features1/features1.mpy
 }
 
 ########################################################################################
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index cdceae3746638..0094c12177d78 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -24,11 +24,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Python 2/3 compatibility code
+# Python 2/3/MicroPython compatibility code
 from __future__ import print_function
-import platform
+import sys
 
-if platform.python_version_tuple()[0] == "2":
+if sys.version_info[0] == 2:
     from binascii import hexlify as hexlify_py2
 
     str_cons = lambda val, enc=None: str(val)
@@ -41,7 +41,7 @@ def hexlify_to_str(b):
         x = hexlify_py2(b)
         return ":".join(x[i : i + 2] for i in range(0, len(x), 2))
 
-else:
+elif sys.version_info[0] == 3:  # Also handles MicroPython
     from binascii import hexlify
 
     str_cons = str

From 6fba1e406bde7ddf00f7cf52bd8c44764c8a1a97 Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Fri, 18 Oct 2024 12:08:11 +0300
Subject: [PATCH 1938/3129] tools/mpy-tool.py: Support calling main() from an
 external script.

Signed-off-by: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 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 0094c12177d78..69d3a6c06f6b3 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1765,7 +1765,7 @@ def copy_section(file, offset, offset2):
             f.write(merged_mpy)
 
 
-def main():
+def main(args=None):
     global global_qstrs
 
     import argparse
@@ -1797,7 +1797,7 @@ def main():
     )
     cmd_parser.add_argument("-o", "--output", default=None, help="output file")
     cmd_parser.add_argument("files", nargs="+", help="input .mpy files")
-    args = cmd_parser.parse_args()
+    args = cmd_parser.parse_args(args)
 
     # set config values relevant to target machine
     config.MICROPY_LONGINT_IMPL = {

From 4d034f817c861b90cbe7ab0cb59d85036031750f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 15 Feb 2025 00:58:01 +0100
Subject: [PATCH 1939/3129] esp8266/network_wlan: Allow enumerating connected
 stations in AP mode.

This commit introduces the ability to obtain a list of stations
connected to the device when in soft-AP mode.

A new parameter ("stations") to pass to WLAN.status is supported,
returning a tuple of (bssid, ipv4) entries, one per connected station.
An empty tuple is returned if no stations are connected, and an
exception is raised if an error occurred whilst building the python
objects to return to the interpreter.

Documentation is also updated to cover the new parameter.

This fixes #5395.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/library/network.WLAN.rst | 13 ++++++++++++-
 ports/esp8266/network_wlan.c  | 29 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 09fefc5929f07..ee0ef490fda84 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -85,7 +85,18 @@ Methods
         * ``STAT_GOT_IP`` -- connection successful.
 
     When called with one argument *param* should be a string naming the status
-    parameter to retrieve.  Supported parameters in WiFI STA mode are: ``'rssi'``.
+    parameter to retrieve, and different parameters are supported depending on the
+    mode the WiFi is in.
+
+    In STA mode, passing ``'rssi'`` returns a signal strength indicator value, whose
+    format varies depending on the port (this is available on all ports that support
+    WiFi network interfaces, except for CC3200).
+
+    In AP mode, passing ``'stations'`` returns a list of connected WiFi stations
+    (this is available on all ports that support WiFi network interfaces, except for
+    CC3200).  The format of the station information entries varies across ports,
+    providing either the raw BSSID of the connected station, the IP address of the
+    connected station, or both.
 
 .. method:: WLAN.isconnected()
 
diff --git a/ports/esp8266/network_wlan.c b/ports/esp8266/network_wlan.c
index 7131b88bac9ab..9084f246feaae 100644
--- a/ports/esp8266/network_wlan.c
+++ b/ports/esp8266/network_wlan.c
@@ -170,6 +170,29 @@ static mp_obj_t esp_disconnect(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp_disconnect_obj, esp_disconnect);
 
+static void build_stations_list_cleanup_callback(void *station_info) {
+    if (station_info != NULL) {
+        wifi_softap_free_station_info();
+    }
+}
+
+static mp_obj_t build_stations_list(void) {
+    struct station_info *info = wifi_softap_get_station_info();
+    MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, build_stations_list_cleanup_callback, (void *)info);
+    nlr_push_jump_callback(&ctx.callback, mp_call_function_1_from_nlr_jump_callback);
+    mp_obj_list_t *stations = MP_OBJ_TO_PTR(mp_obj_new_list(0, NULL));
+    struct station_info *current = info;
+    mp_obj_t entry[2] = { 0 };
+    while (current != NULL) {
+        entry[0] = mp_obj_new_bytes(current->bssid, sizeof(current->bssid));
+        entry[1] = netutils_format_ipv4_addr((uint8_t *)&current->ip.addr, NETUTILS_BIG);
+        mp_obj_list_append(stations, mp_obj_new_tuple(2, entry));
+        current = STAILQ_NEXT(current, next);
+    }
+    nlr_pop_jump_callback(true);
+    return MP_OBJ_FROM_PTR(stations);
+}
+
 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) {
@@ -185,6 +208,12 @@ static mp_obj_t esp_status(size_t n_args, const mp_obj_t *args) {
                 if (self->if_id == STATION_IF) {
                     return MP_OBJ_NEW_SMALL_INT(wifi_station_get_rssi());
                 }
+                break;
+            case MP_QSTR_stations:
+                if (self->if_id == SOFTAP_IF) {
+                    return build_stations_list();
+                }
+                break;
         }
         mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
     }

From 6be7570219c05f5dd4a5e0bc10be3cff851da8c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 Mar 2025 10:48:55 +1100
Subject: [PATCH 1940/3129] nrf/modules: Fix access of read-only buffer in
 Flash.writeblocks.

When writing to flash, the source buffer only needs to be read-only, not
writable.  This fix allows passing in `bytes` and other read-only buffer
objects.

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

diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
index e490dc53dd677..41833b228e2ff 100644
--- a/ports/nrf/modules/nrf/flashbdev.c
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -80,7 +80,7 @@ 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_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
 
     mp_int_t address = self->start + (block_num * FLASH_PAGESIZE);
 

From 9dd4cef81416711ad05d3ee874f2813b42926541 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Jan 2025 11:53:00 +1100
Subject: [PATCH 1941/3129] py/objarray: Add MP_DEFINE_MEMORYVIEW_OBJ
 convenience macro.

This allows defining a `memoryview` instance, either statically or on the
C stack.

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

diff --git a/py/objarray.h b/py/objarray.h
index 4a0e8a983fe77..bb7a514b97913 100644
--- a/py/objarray.h
+++ b/py/objarray.h
@@ -53,6 +53,10 @@ typedef struct _mp_obj_array_t {
 } mp_obj_array_t;
 
 #if MICROPY_PY_BUILTINS_MEMORYVIEW
+
+#define MP_DEFINE_MEMORYVIEW_OBJ(obj_name, typecode, offset, len, ptr) \
+    mp_obj_array_t obj_name = {{&mp_type_memoryview}, (typecode), (offset), (len), (ptr)}
+
 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;
@@ -60,6 +64,7 @@ static inline void mp_obj_memoryview_init(mp_obj_array_t *self, size_t typecode,
     self->len = len;
     self->items = items;
 }
+
 #endif
 
 #if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY

From 89e6c58c8007e2628741e73c32866c23e8478ae1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Nov 2024 12:57:34 +1100
Subject: [PATCH 1942/3129] extmod/modvfs: Add vfs.rom_ioctl function and its
 ioctl constants.

This is a generic interface to allow querying and modifying the read-only
memory area of a device, if it has such an area.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modvfs.c                              |  7 +++++++
 extmod/vfs.h                                 | 15 +++++++++++++++
 ports/qemu/mpconfigport.h                    |  1 +
 ports/unix/variants/mpconfigvariant_common.h |  1 +
 py/mpconfig.h                                |  5 +++++
 5 files changed, 29 insertions(+)

diff --git a/extmod/modvfs.c b/extmod/modvfs.c
index df422365b75ef..41841f05569a2 100644
--- a/extmod/modvfs.c
+++ b/extmod/modvfs.c
@@ -38,11 +38,18 @@
 #error "MICROPY_PY_VFS requires MICROPY_VFS"
 #endif
 
+#if MICROPY_VFS_ROM_IOCTL
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_rom_ioctl_obj, 1, 4, mp_vfs_rom_ioctl);
+#endif
+
 static const mp_rom_map_elem_t vfs_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_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_ROM_IOCTL
+    { MP_ROM_QSTR(MP_QSTR_rom_ioctl), MP_ROM_PTR(&mp_vfs_rom_ioctl_obj) },
+    #endif
     #if MICROPY_VFS_FAT
     { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
     #endif
diff --git a/extmod/vfs.h b/extmod/vfs.h
index 626e25a351123..cc9c50d290051 100644
--- a/extmod/vfs.h
+++ b/extmod/vfs.h
@@ -52,6 +52,13 @@
 #define MP_BLOCKDEV_IOCTL_BLOCK_SIZE    (5)
 #define MP_BLOCKDEV_IOCTL_BLOCK_ERASE   (6)
 
+// Constants for vfs.rom_ioctl() function.
+#define MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS     (1) // rom_ioctl(1)
+#define MP_VFS_ROM_IOCTL_GET_SEGMENT                (2) // rom_ioctl(2, <id>)
+#define MP_VFS_ROM_IOCTL_WRITE_PREPARE              (3) // rom_ioctl(3, <id>, <len>)
+#define MP_VFS_ROM_IOCTL_WRITE                      (4) // rom_ioctl(4, <id>, <offset>, <buf>)
+#define MP_VFS_ROM_IOCTL_WRITE_COMPLETE             (5) // rom_ioctl(5, <id>)
+
 // At the moment the VFS protocol just has import_stat, but could be extended to other methods
 typedef struct _mp_vfs_proto_t {
     mp_import_stat_t (*import_stat)(void *self, const char *path);
@@ -122,4 +129,12 @@ MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_stat_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj);
 
+#if MICROPY_VFS_ROM_IOCTL
+// When MICROPY_VFS_ROM_IOCTL is enabled a port must define the following function.
+// This is a generic interface to allow querying and modifying the user-accessible,
+// read-only memory area of a device, if it is configured with such an area.
+// Supported ioctl commands are given by MP_VFS_ROM_IOCTL_xxx.
+mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args);
+#endif
+
 #endif // MICROPY_INCLUDED_EXTMOD_VFS_H
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 0a25df4d0ac10..b02507277323e 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -64,6 +64,7 @@
 #define MICROPY_PY_MACHINE_PIN_BASE (1)
 #define MICROPY_VFS                 (1)
 #define MICROPY_VFS_ROM             (1)
+#define MICROPY_VFS_ROM_IOCTL       (0)
 
 // type definitions for the specific machine
 
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 093477af0aded..9eeed8797366c 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -123,3 +123,4 @@
 #define MICROPY_PY_MACHINE_PIN_BASE    (1)
 
 #define MICROPY_VFS_ROM                (1)
+#define MICROPY_VFS_ROM_IOCTL          (0)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 66b3d125e78de..05f39b3605bf3 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1006,6 +1006,11 @@ typedef double mp_float_t;
 #define MICROPY_VFS_WRITABLE (1)
 #endif
 
+// Whether to enable the mp_vfs_rom_ioctl C function, and vfs.rom_ioctl Python function
+#ifndef MICROPY_VFS_ROM_IOCTL
+#define MICROPY_VFS_ROM_IOCTL (MICROPY_VFS_ROM)
+#endif
+
 // Support for VFS POSIX component, to mount a POSIX filesystem within VFS
 #ifndef MICROPY_VFS_POSIX
 #define MICROPY_VFS_POSIX (0)

From d4b8ca2ffc3967007297d17e995d955ca39b1d6d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Feb 2025 00:37:49 +1100
Subject: [PATCH 1943/3129] extmod/vfs: Add mp_vfs_mount_romfs_protected()
 helper.

This function will attempt to create a `VfsRom` instance and mount it at
location "/rom" in the filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs.c  | 30 ++++++++++++++++++++++++++++++
 extmod/vfs.h  |  3 +++
 py/qstrdefs.h |  5 +++++
 3 files changed, 38 insertions(+)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index b9c5ab0fc3a8c..c83b8ce7d563e 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -46,6 +46,10 @@
 #include "extmod/vfs_posix.h"
 #endif
 
+#if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
+#include "extmod/vfs_rom.h"
+#endif
+
 // For mp_vfs_proxy_call, the maximum number of additional args that can be passed.
 // A fixed maximum size is used to avoid the need for a costly variable array.
 #define PROXY_MAX_ARGS (2)
@@ -552,6 +556,32 @@ int mp_vfs_mount_and_chdir_protected(mp_obj_t bdev, mp_obj_t mount_point) {
     return ret;
 }
 
+#if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
+
+int mp_vfs_mount_romfs_protected(void) {
+    int ret;
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(MP_VFS_ROM_IOCTL_GET_SEGMENT), MP_OBJ_NEW_SMALL_INT(0) };
+        mp_obj_t rom = mp_vfs_rom_ioctl(2, args);
+        mp_obj_t romfs = mp_call_function_1(MP_OBJ_FROM_PTR(&mp_type_vfs_rom), rom);
+        mp_obj_t mount_point = MP_OBJ_NEW_QSTR(MP_QSTR__slash_rom);
+        mp_call_function_2(MP_OBJ_FROM_PTR(&mp_vfs_mount_obj), romfs, mount_point);
+        #if MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
+        // Add "/rom" and "/rom/lib" to `sys.path`.
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_rom));
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_rom_slash_lib));
+        #endif
+        ret = 0; // success
+        nlr_pop();
+    } else {
+        ret = -MP_EIO;
+    }
+    return ret;
+}
+
+#endif
+
 MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_cur);
 MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_mount_table);
 
diff --git a/extmod/vfs.h b/extmod/vfs.h
index cc9c50d290051..3acc09db12283 100644
--- a/extmod/vfs.h
+++ b/extmod/vfs.h
@@ -112,6 +112,9 @@ mp_obj_t mp_vfs_stat(mp_obj_t path_in);
 mp_obj_t mp_vfs_statvfs(mp_obj_t path_in);
 
 int mp_vfs_mount_and_chdir_protected(mp_obj_t bdev, mp_obj_t mount_point);
+#if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
+int mp_vfs_mount_romfs_protected(void);
+#endif
 
 MP_DECLARE_CONST_FUN_OBJ_KW(mp_vfs_mount_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_vfs_umount_obj);
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 5003636df3d4b..0b50d279f9dbf 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -68,6 +68,11 @@ Q(utf-8)
 Q(.frozen)
 #endif
 
+#if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
+Q(/rom)
+Q(/rom/lib)
+#endif
+
 #if MICROPY_ENABLE_PYSTACK
 Q(pystack exhausted)
 #endif

From 840b641024cffd0b4e3f941e53c699c699c21811 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Feb 2025 11:34:09 +1100
Subject: [PATCH 1944/3129] py/runtime: Automatically mount ROMFS as part of
 mp_init.

This is put in `mp_init()` to make it consistent across all ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/py/runtime.c b/py/runtime.c
index bf26921f9ab9f..58819819ad025 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -46,6 +46,10 @@
 #include "py/cstack.h"
 #include "py/gc.h"
 
+#if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
+#include "extmod/vfs.h"
+#endif
+
 #if MICROPY_DEBUG_VERBOSE // print debugging info
 #define DEBUG_PRINT (1)
 #define DEBUG_printf DEBUG_printf
@@ -185,6 +189,11 @@ void mp_init(void) {
     #endif
 
     MP_THREAD_GIL_ENTER();
+
+    #if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
+    // Mount ROMFS if it exists.
+    mp_vfs_mount_romfs_protected();
+    #endif
 }
 
 void mp_deinit(void) {

From 0c98c60b68bf338c695d43e41b15def59949eb39 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:57:46 +1100
Subject: [PATCH 1945/3129] tools/mpremote: Add romfs query, build and deploy
 commands.

These commands use the `vfs.rom_ioctl()` function to manage the ROM
partitions on a device, and create and deploy ROMFS images.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpremote.rst         |  24 ++++
 tools/mpremote/mpremote/commands.py | 183 +++++++++++++++++++++++++++-
 tools/mpremote/mpremote/main.py     |  31 +++++
 tools/mpremote/mpremote/romfs.py    | 148 ++++++++++++++++++++++
 4 files changed, 385 insertions(+), 1 deletion(-)
 create mode 100644 tools/mpremote/mpremote/romfs.py

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index d4c6983595fec..ef23cd85c21a3 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -78,6 +78,7 @@ The full list of supported commands are:
 - `mip <mpremote_command_mip>`
 - `mount <mpremote_command_mount>`
 - `unmount <mpremote_command_unmount>`
+- `romfs <mpremote_command_romfs>`
 - `rtc <mpremote_command_rtc>`
 - `sleep <mpremote_command_sleep>`
 - `reset <mpremote_command_reset>`
@@ -347,6 +348,29 @@ The full list of supported commands are:
   This happens automatically when ``mpremote`` terminates, but it can be used
   in a sequence to unmount an earlier mount before subsequent command are run.
 
+.. _mpremote_command_romfs:
+
+- **romfs** -- manage ROMFS partitions on the device:
+
+  .. code-block:: bash
+
+      $ mpremote romfs <sub-command>
+
+  ``<sub-command>`` may be:
+
+  - ``romfs query`` to list all the available ROMFS partitions and their size
+  - ``romfs [-o <output>] build <source>`` to create a ROMFS image from the given
+    source directory; the default output file is the source appended by ``.romfs``
+  - ``romfs [-p <partition>] deploy <source>`` to deploy a ROMFS image to the device;
+    will also create a temporary ROMFS image if the source is a directory
+
+  The ``build`` and ``deploy`` sub-commands both support the ``-m``/``--mpy`` option
+  to automatically compile ``.py`` files to ``.mpy`` when creating the ROMFS image.
+  This option is enabled by default, but only works if the ``mpy_cross`` Python
+  package has been installed (eg via ``pip install mpy_cross``).  If the package is
+  not installed then a warning is printed and ``.py`` files remain as is.  Compiling
+  of ``.py`` files can be disabled with the ``--no-mpy`` option.
+
 .. _mpremote_command_rtc:
 
 - **rtc** -- set/get the device clock (RTC):
diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index f86befd080349..7dd448c8b771c 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -1,12 +1,15 @@
+import binascii
 import hashlib
 import os
 import sys
 import tempfile
+import zlib
 
 import serial.tools.list_ports
 
-from .transport import TransportError, stdout_write_bytes
+from .transport import TransportError, TransportExecError, stdout_write_bytes
 from .transport_serial import SerialTransport
+from .romfs import make_romfs
 
 
 class CommandError(Exception):
@@ -478,3 +481,181 @@ def do_rtc(state, args):
         state.transport.exec("machine.RTC().datetime({})".format(timetuple))
     else:
         print(state.transport.eval("machine.RTC().datetime()"))
+
+
+def _do_romfs_query(state, args):
+    state.ensure_raw_repl()
+    state.did_action()
+
+    # Detect the romfs and get its associated device.
+    state.transport.exec("import vfs")
+    if not state.transport.eval("hasattr(vfs,'rom_ioctl')"):
+        print("ROMFS is not enabled on this device")
+        return
+    num_rom_partitions = state.transport.eval("vfs.rom_ioctl(1)")
+    if num_rom_partitions <= 0:
+        print("No ROMFS partitions available")
+        return
+
+    for rom_id in range(num_rom_partitions):
+        state.transport.exec(f"dev=vfs.rom_ioctl(2,{rom_id})")
+        has_object = state.transport.eval("hasattr(dev,'ioctl')")
+        if has_object:
+            rom_block_count = state.transport.eval("dev.ioctl(4,0)")
+            rom_block_size = state.transport.eval("dev.ioctl(5,0)")
+            rom_size = rom_block_count * rom_block_size
+            print(
+                f"ROMFS{rom_id} partition has size {rom_size} bytes ({rom_block_count} blocks of {rom_block_size} bytes each)"
+            )
+        else:
+            rom_size = state.transport.eval("len(dev)")
+            print(f"ROMFS{rom_id} partition has size {rom_size} bytes")
+        romfs = state.transport.eval("bytes(memoryview(dev)[:12])")
+        print(f"  Raw contents: {romfs.hex(':')} ...")
+        if not romfs.startswith(b"\xd2\xcd\x31"):
+            print("  Not a valid ROMFS")
+        else:
+            size = 0
+            for value in romfs[3:]:
+                size = (size << 7) | (value & 0x7F)
+                if not value & 0x80:
+                    break
+            print(f"  ROMFS image size: {size}")
+
+
+def _do_romfs_build(state, args):
+    state.did_action()
+
+    if args.path is None:
+        raise CommandError("romfs build: source path not given")
+
+    input_directory = args.path
+
+    if args.output is None:
+        output_file = input_directory + ".romfs"
+    else:
+        output_file = args.output
+
+    romfs = make_romfs(input_directory, mpy_cross=args.mpy)
+
+    print(f"Writing {len(romfs)} bytes to output file {output_file}")
+    with open(output_file, "wb") as f:
+        f.write(romfs)
+
+
+def _do_romfs_deploy(state, args):
+    state.ensure_raw_repl()
+    state.did_action()
+    transport = state.transport
+
+    if args.path is None:
+        raise CommandError("romfs deploy: source path not given")
+
+    rom_id = args.partition
+    romfs_filename = args.path
+
+    # Read in or create the ROMFS filesystem image.
+    if romfs_filename.endswith(".romfs"):
+        with open(romfs_filename, "rb") as f:
+            romfs = f.read()
+    else:
+        romfs = make_romfs(romfs_filename, mpy_cross=args.mpy)
+    print(f"Image size is {len(romfs)} bytes")
+
+    # Detect the ROMFS partition and get its associated device.
+    state.transport.exec("import vfs")
+    if not state.transport.eval("hasattr(vfs,'rom_ioctl')"):
+        raise CommandError("ROMFS is not enabled on this device")
+    transport.exec(f"dev=vfs.rom_ioctl(2,{rom_id})")
+    if transport.eval("isinstance(dev,int) and dev<0"):
+        raise CommandError(f"ROMFS{rom_id} partition not found on device")
+    has_object = transport.eval("hasattr(dev,'ioctl')")
+    if has_object:
+        rom_block_count = transport.eval("dev.ioctl(4,0)")
+        rom_block_size = transport.eval("dev.ioctl(5,0)")
+        rom_size = rom_block_count * rom_block_size
+        print(
+            f"ROMFS{rom_id} partition has size {rom_size} bytes ({rom_block_count} blocks of {rom_block_size} bytes each)"
+        )
+    else:
+        rom_size = transport.eval("len(dev)")
+        print(f"ROMFS{rom_id} partition has size {rom_size} bytes")
+
+    # Check if ROMFS filesystem image will fit in the target partition.
+    if len(romfs) > rom_size:
+        print("ROMFS image is too big for the target partition")
+        sys.exit(1)
+
+    # Prepare ROMFS partition for writing.
+    print(f"Preparing ROMFS{rom_id} partition for writing")
+    transport.exec("import vfs\ntry:\n vfs.umount('/rom')\nexcept:\n pass")
+    chunk_size = 4096
+    if has_object:
+        for offset in range(0, len(romfs), rom_block_size):
+            transport.exec(f"dev.ioctl(6,{offset // rom_block_size})")
+        chunk_size = min(chunk_size, rom_block_size)
+    else:
+        rom_min_write = transport.eval(f"vfs.rom_ioctl(3,{rom_id},{len(romfs)})")
+        chunk_size = max(chunk_size, rom_min_write)
+
+    # Detect capabilities of the device to use the fastest method of transfer.
+    has_bytes_fromhex = transport.eval("hasattr(bytes,'fromhex')")
+    try:
+        transport.exec("from binascii import a2b_base64")
+        has_a2b_base64 = True
+    except TransportExecError:
+        has_a2b_base64 = False
+    try:
+        transport.exec("from io import BytesIO")
+        transport.exec("from deflate import DeflateIO,RAW")
+        has_deflate_io = True
+    except TransportExecError:
+        has_deflate_io = False
+
+    # Deploy the ROMFS filesystem image to the device.
+    for offset in range(0, len(romfs), chunk_size):
+        romfs_chunk = romfs[offset : offset + chunk_size]
+        romfs_chunk += bytes(chunk_size - len(romfs_chunk))
+        if has_deflate_io:
+            # Needs: binascii.a2b_base64, io.BytesIO, deflate.DeflateIO.
+            romfs_chunk_compressed = zlib.compress(romfs_chunk, wbits=-9)
+            buf = binascii.b2a_base64(romfs_chunk_compressed).strip()
+            transport.exec(f"buf=DeflateIO(BytesIO(a2b_base64({buf})),RAW,9).read()")
+        elif has_a2b_base64:
+            # Needs: binascii.a2b_base64.
+            buf = binascii.b2a_base64(romfs_chunk)
+            transport.exec(f"buf=a2b_base64({buf})")
+        elif has_bytes_fromhex:
+            # Needs: bytes.fromhex.
+            buf = romfs_chunk.hex()
+            transport.exec(f"buf=bytes.fromhex('{buf}')")
+        else:
+            # Needs nothing special.
+            transport.exec("buf=" + repr(romfs_chunk))
+        print(f"\rWriting at offset {offset}", end="")
+        if has_object:
+            transport.exec(
+                f"dev.writeblocks({offset // rom_block_size},buf,{offset % rom_block_size})"
+            )
+        else:
+            transport.exec(f"vfs.rom_ioctl(4,{rom_id},{offset},buf)")
+
+    # Complete writing.
+    if not has_object:
+        transport.eval(f"vfs.rom_ioctl(5,{rom_id})")
+
+    print()
+    print("ROMFS image deployed")
+
+
+def do_romfs(state, args):
+    if args.command[0] == "query":
+        _do_romfs_query(state, args)
+    elif args.command[0] == "build":
+        _do_romfs_build(state, args)
+    elif args.command[0] == "deploy":
+        _do_romfs_deploy(state, args)
+    else:
+        raise CommandError(
+            f"romfs: '{args.command[0]}' is not a command; pass romfs --help for a list"
+        )
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index e6e397020fe85..bdae8f163656b 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -36,6 +36,7 @@
     do_resume,
     do_rtc,
     do_soft_reset,
+    do_romfs,
 )
 from .mip import do_mip
 from .repl import do_repl
@@ -228,6 +229,32 @@ def argparse_mip():
     return cmd_parser
 
 
+def argparse_romfs():
+    cmd_parser = argparse.ArgumentParser(description="manage ROM partitions")
+    _bool_flag(
+        cmd_parser,
+        "mpy",
+        "m",
+        True,
+        "automatically compile .py files to .mpy when building the ROMFS image (default)",
+    )
+    cmd_parser.add_argument(
+        "--partition",
+        "-p",
+        type=int,
+        default=0,
+        help="ROMFS partition to use",
+    )
+    cmd_parser.add_argument(
+        "--output",
+        "-o",
+        help="output file",
+    )
+    cmd_parser.add_argument("command", nargs=1, help="romfs command, one of: query, build, deploy")
+    cmd_parser.add_argument("path", nargs="?", help="path to directory to deploy")
+    return cmd_parser
+
+
 def argparse_none(description):
     return lambda: argparse.ArgumentParser(description=description)
 
@@ -302,6 +329,10 @@ def argparse_none(description):
         do_version,
         argparse_none("print version and exit"),
     ),
+    "romfs": (
+        do_romfs,
+        argparse_romfs,
+    ),
 }
 
 # Additional commands aliases.
diff --git a/tools/mpremote/mpremote/romfs.py b/tools/mpremote/mpremote/romfs.py
new file mode 100644
index 0000000000000..ae781a36dfe62
--- /dev/null
+++ b/tools/mpremote/mpremote/romfs.py
@@ -0,0 +1,148 @@
+# MIT license; Copyright (c) 2022 Damien P. George
+
+import struct, sys, os
+
+try:
+    from mpy_cross import run as mpy_cross_run
+except ImportError:
+    mpy_cross_run = None
+
+
+class VfsRomWriter:
+    ROMFS_HEADER = b"\xd2\xcd\x31"
+
+    ROMFS_RECORD_KIND_UNUSED = 0
+    ROMFS_RECORD_KIND_PADDING = 1
+    ROMFS_RECORD_KIND_DATA_VERBATIM = 2
+    ROMFS_RECORD_KIND_DATA_POINTER = 3
+    ROMFS_RECORD_KIND_DIRECTORY = 4
+    ROMFS_RECORD_KIND_FILE = 5
+
+    def __init__(self):
+        self._dir_stack = [(None, bytearray())]
+
+    def _encode_uint(self, value):
+        encoded = [value & 0x7F]
+        value >>= 7
+        while value != 0:
+            encoded.insert(0, 0x80 | (value & 0x7F))
+            value >>= 7
+        return bytes(encoded)
+
+    def _pack(self, kind, payload):
+        return self._encode_uint(kind) + self._encode_uint(len(payload)) + payload
+
+    def _extend(self, data):
+        buf = self._dir_stack[-1][1]
+        buf.extend(data)
+        return len(buf)
+
+    def finalise(self):
+        _, data = self._dir_stack.pop()
+        encoded_kind = VfsRomWriter.ROMFS_HEADER
+        encoded_len = self._encode_uint(len(data))
+        if (len(encoded_kind) + len(encoded_len) + len(data)) % 2 == 1:
+            encoded_len = b"\x80" + encoded_len
+        data = encoded_kind + encoded_len + data
+        return data
+
+    def opendir(self, dirname):
+        self._dir_stack.append((dirname, bytearray()))
+
+    def closedir(self):
+        dirname, dirdata = self._dir_stack.pop()
+        dirdata = self._encode_uint(len(dirname)) + bytes(dirname, "ascii") + dirdata
+        self._extend(self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DIRECTORY, dirdata))
+
+    def mkdata(self, data):
+        assert len(self._dir_stack) == 1
+        return self._extend(self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DATA_VERBATIM, data)) - len(
+            data
+        )
+
+    def mkfile(self, filename, filedata):
+        filename = bytes(filename, "ascii")
+        payload = self._encode_uint(len(filename))
+        payload += filename
+        if isinstance(filedata, tuple):
+            sub_payload = self._encode_uint(filedata[0])
+            sub_payload += self._encode_uint(filedata[1])
+            payload += self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DATA_POINTER, sub_payload)
+        else:
+            payload += self._pack(VfsRomWriter.ROMFS_RECORD_KIND_DATA_VERBATIM, filedata)
+        self._dir_stack[-1][1].extend(self._pack(VfsRomWriter.ROMFS_RECORD_KIND_FILE, payload))
+
+
+def copy_recursively(vfs, src_dir, print_prefix, mpy_cross):
+    assert src_dir.endswith("/")
+    DIR = 1 << 14
+    mpy_cross_missed = 0
+    dir_contents = sorted(os.listdir(src_dir))
+    for name in dir_contents:
+        src_name = src_dir + name
+        st = os.stat(src_name)
+
+        if name == dir_contents[-1]:
+            # Last entry in the directory listing.
+            print_entry = "\\--"
+            print_recurse = "    "
+        else:
+            # Not the last entry in the directory listing.
+            print_entry = "|--"
+            print_recurse = "|   "
+
+        if st[0] & DIR:
+            # A directory, enter it and copy its contents recursively.
+            print(print_prefix + print_entry, name + "/")
+            vfs.opendir(name)
+            mpy_cross_missed += copy_recursively(
+                vfs, src_name + "/", print_prefix + print_recurse, mpy_cross
+            )
+            vfs.closedir()
+        else:
+            # A file.
+            did_mpy = False
+            name_extra = ""
+            if mpy_cross and name.endswith(".py"):
+                name_mpy = name[:-3] + ".mpy"
+                src_name_mpy = src_dir + name_mpy
+                if not os.path.isfile(src_name_mpy):
+                    if mpy_cross_run is not None:
+                        did_mpy = True
+                        proc = mpy_cross_run(src_name)
+                        proc.wait()
+                    else:
+                        mpy_cross_missed += 1
+            if did_mpy:
+                name_extra = " -> .mpy"
+            print(print_prefix + print_entry, name + name_extra)
+            if did_mpy:
+                name = name_mpy
+                src_name = src_name_mpy
+            with open(src_name, "rb") as src:
+                vfs.mkfile(name, src.read())
+            if did_mpy:
+                os.remove(src_name_mpy)
+    return mpy_cross_missed
+
+
+def make_romfs(src_dir, *, mpy_cross):
+    if not src_dir.endswith("/"):
+        src_dir += "/"
+
+    vfs = VfsRomWriter()
+
+    # Build the filesystem recursively.
+    print("Building romfs filesystem, source directory: {}".format(src_dir))
+    print("/")
+    try:
+        mpy_cross_missed = copy_recursively(vfs, src_dir, "", mpy_cross)
+    except OSError as er:
+        print("Error: OSError {}".format(er), file=sys.stderr)
+        sys.exit(1)
+
+    if mpy_cross_missed:
+        print("Warning: `mpy_cross` module not found, .py files were not precompiled")
+        mpy_cross = False
+
+    return vfs.finalise()

From bea7645b2e55881c4f42e6cfbe2a6433c5986794 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:56:50 +1100
Subject: [PATCH 1946/3129] stm32: Implement vfs.rom_ioctl with support for
 internal/external flash.

This commit implements `vfs.rom_ioctl()` to query, erase and write both
internal and external flash, depending on how the board configures its
flash memory.

A board can configure ROM as follows.

To use internal flash memory:

    #define MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH (1)

To use external flash memory (QSPI memory mapped):

    #define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (1)
    #define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ (&spi_obj)

Then the partition must be defined as symbols in the linker script:

    _micropy_hw_romfs_part1_start
    _micropy_hw_romfs_part1_size

And finally the partition needs to be enabled:

    #define MICROPY_HW_ROMFS_ENABLE_PART1 (1)

There's support for a second, optional partition via:

    _micropy_hw_romfs_part2_start
    _micropy_hw_romfs_part2_size

    #define MICROPY_HW_ROMFS_ENABLE_PART1 (1)

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile               |   1 +
 ports/stm32/mpconfigboard_common.h |  20 ++++
 ports/stm32/mpconfigport.h         |   3 +
 ports/stm32/qspi.c                 |   2 -
 ports/stm32/qspi.h                 |   7 ++
 ports/stm32/vfs_rom_ioctl.c        | 161 +++++++++++++++++++++++++++++
 6 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 ports/stm32/vfs_rom_ioctl.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index a9612f1a5792e..8ac9a8af03d1a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -291,6 +291,7 @@ SRC_C += \
 	storage.c \
 	sdcard.c \
 	sdram.c \
+	vfs_rom_ioctl.c \
 	fatfs_port.c \
 	lcd.c \
 	accel.c \
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 4ce0a75b87e2b..2a650077f3a45 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -67,6 +67,26 @@
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET (1)
 #endif
 
+// Whether to enable ROMFS on the internal flash.
+#ifndef MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH
+#define MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH (0)
+#endif
+
+// Whether to enable ROMFS on external QSPI flash.
+#ifndef MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (0)
+#endif
+
+// Whether to enable ROMFS partition 1.
+#ifndef MICROPY_HW_ROMFS_ENABLE_PART1
+#define MICROPY_HW_ROMFS_ENABLE_PART1 (0)
+#endif
+
+// Whether to enable ROMFS partition 2.
+#ifndef MICROPY_HW_ROMFS_ENABLE_PART2
+#define MICROPY_HW_ROMFS_ENABLE_PART2 (0)
+#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/mpconfigport.h b/ports/stm32/mpconfigport.h
index 2b57446ee8233..da86fa641623a 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -79,6 +79,9 @@
 #define MICROPY_SCHEDULER_STATIC_NODES (1)
 #define MICROPY_SCHEDULER_DEPTH     (8)
 #define MICROPY_VFS                 (1)
+#ifndef MICROPY_VFS_ROM
+#define MICROPY_VFS_ROM (MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH || MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI)
+#endif
 
 // control over Python builtins
 #ifndef MICROPY_PY_BUILTINS_HELP_TEXT
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 98364db41d4fb..34359a1ccf838 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -34,8 +34,6 @@
 
 #if defined(MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2)
 
-#define QSPI_MAP_ADDR (0x90000000)
-
 #ifndef MICROPY_HW_QSPI_PRESCALER
 #define MICROPY_HW_QSPI_PRESCALER       3  // F_CLK = F_AHB/3 (72MHz when CPU is 216MHz)
 #endif
diff --git a/ports/stm32/qspi.h b/ports/stm32/qspi.h
index c774b12582be6..6fe91168cfdba 100644
--- a/ports/stm32/qspi.h
+++ b/ports/stm32/qspi.h
@@ -28,9 +28,16 @@
 
 #include "drivers/bus/qspi.h"
 
+#define QSPI_MAP_ADDR (0x90000000)
+#define QSPI_MAP_ADDR_MAX (0xa0000000)
+
 extern const mp_qspi_proto_t qspi_proto;
 
 void qspi_init(void);
 void qspi_memory_map(void);
 
+static inline bool qspi_is_valid_addr(uint32_t addr) {
+    return QSPI_MAP_ADDR <= addr && addr < QSPI_MAP_ADDR_MAX;
+}
+
 #endif // MICROPY_INCLUDED_STM32_QSPI_H
diff --git a/ports/stm32/vfs_rom_ioctl.c b/ports/stm32/vfs_rom_ioctl.c
new file mode 100644
index 0000000000000..5024d44e5adc8
--- /dev/null
+++ b/ports/stm32/vfs_rom_ioctl.c
@@ -0,0 +1,161 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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/objarray.h"
+#include "py/mperrno.h"
+#include "extmod/vfs.h"
+#include "drivers/memory/spiflash.h"
+
+#include "flash.h"
+#include "qspi.h"
+#include "storage.h"
+
+#if MICROPY_VFS_ROM_IOCTL
+
+#if MICROPY_HW_ROMFS_ENABLE_PART1 && !defined(MICROPY_HW_ROMFS_PART1_START)
+#define MICROPY_HW_ROMFS_PART1_START (uintptr_t)(&_micropy_hw_romfs_part1_start)
+#define MICROPY_HW_ROMFS_PART1_SIZE (uintptr_t)(&_micropy_hw_romfs_part1_size)
+extern uint8_t _micropy_hw_romfs_part1_start;
+extern uint8_t _micropy_hw_romfs_part1_size;
+#endif
+
+#if MICROPY_HW_ROMFS_ENABLE_PART2 && !defined(MICROPY_HW_ROMFS_PART2_START)
+#define MICROPY_HW_ROMFS_PART2_START (uintptr_t)(&_micropy_hw_romfs_part2_start)
+#define MICROPY_HW_ROMFS_PART2_SIZE (uintptr_t)(&_micropy_hw_romfs_part2_size)
+extern uint8_t _micropy_hw_romfs_part2_start;
+extern uint8_t _micropy_hw_romfs_part2_size;
+#endif
+
+#define ROMFS_MEMORYVIEW(base, size) {{&mp_type_memoryview}, 'B', 0, (size), (void *)(base)}
+
+static const mp_obj_array_t romfs_obj_table[] = {
+    #if MICROPY_HW_ROMFS_ENABLE_PART1
+    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART1_START, MICROPY_HW_ROMFS_PART1_SIZE),
+    #endif
+    #if MICROPY_HW_ROMFS_ENABLE_PART2
+    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART2_START, MICROPY_HW_ROMFS_PART2_SIZE),
+    #endif
+};
+
+mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
+    mp_int_t cmd = mp_obj_get_int(args[0]);
+    if (cmd == MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS) {
+        return MP_OBJ_NEW_SMALL_INT(MP_ARRAY_SIZE(romfs_obj_table));
+    }
+
+    if (n_args < 2) {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+    }
+
+    mp_int_t romfs_id = mp_obj_get_int(args[1]);
+    if (!(0 <= romfs_id && romfs_id < MP_ARRAY_SIZE(romfs_obj_table))) {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+    }
+
+    const mp_obj_array_t *romfs_obj = &romfs_obj_table[romfs_id];
+    uintptr_t romfs_base = (uintptr_t)romfs_obj->items;
+    uintptr_t romfs_len = romfs_obj->len;
+
+    if (cmd == MP_VFS_ROM_IOCTL_GET_SEGMENT) {
+        // Return the ROMFS memoryview object.
+        return MP_OBJ_FROM_PTR(romfs_obj);
+    }
+
+    if (cmd == MP_VFS_ROM_IOCTL_WRITE_PREPARE) {
+        // Erase sectors in given range.
+        if (n_args < 3) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+        uint32_t dest = romfs_base;
+        uint32_t dest_max = dest + mp_obj_get_int(args[2]);
+        if (dest_max > romfs_base + romfs_len) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+
+        #if MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH
+        if (flash_is_valid_addr(dest)) {
+            while (dest < dest_max) {
+                int ret = flash_erase(dest);
+                if (ret < 0) {
+                    return MP_OBJ_NEW_SMALL_INT(ret);
+                }
+                uint32_t sector_size = 0;
+                flash_get_sector_info(dest, NULL, &sector_size);
+                dest += sector_size;
+            }
+            return MP_OBJ_NEW_SMALL_INT(16);
+        }
+        #endif
+
+        #if MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI
+        if (qspi_is_valid_addr(dest)) {
+            dest -= QSPI_MAP_ADDR;
+            dest_max -= QSPI_MAP_ADDR;
+            while (dest < dest_max) {
+                int ret = mp_spiflash_erase_block(MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ, dest);
+                if (ret < 0) {
+                    return MP_OBJ_NEW_SMALL_INT(ret);
+                }
+                dest += MP_SPIFLASH_ERASE_BLOCK_SIZE;
+            }
+            return MP_OBJ_NEW_SMALL_INT(4);
+        }
+        #endif
+    }
+
+    if (cmd == MP_VFS_ROM_IOCTL_WRITE) {
+        // Write data to flash.
+        if (n_args < 4) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+        uint32_t dest = romfs_base + mp_obj_get_int(args[2]);
+        mp_buffer_info_t bufinfo;
+        mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
+        if (dest + bufinfo.len > romfs_base + romfs_len) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+
+        #if MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH
+        if (flash_is_valid_addr(dest)) {
+            int ret = flash_write(dest, bufinfo.buf, bufinfo.len / 4);
+            return MP_OBJ_NEW_SMALL_INT(ret);
+        }
+        #endif
+
+        #if MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI
+        if (qspi_is_valid_addr(dest)) {
+            dest -= QSPI_MAP_ADDR;
+            int ret = mp_spiflash_write(MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ, dest, bufinfo.len, bufinfo.buf);
+            return MP_OBJ_NEW_SMALL_INT(ret);
+        }
+        #endif
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+}
+
+#endif // MICROPY_VFS_ROM_IOCTL

From 45c36f87ea025386c7d2f9b3c5d8916e54b70318 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Feb 2025 00:45:13 +1100
Subject: [PATCH 1947/3129] stm32/boards: Enable ROMFS partitions on PYBD_SFx
 boards.

Using unused and previously inaccessible external QSPI flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/f722_qspi.ld    | 7 ++++++-
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h | 5 +++++
 ports/stm32/boards/PYBD_SF6/f767.ld         | 6 +++++-
 ports/stm32/boards/PYBD_SF6/mpconfigboard.h | 5 +++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
index 70d7f9cc4b8e4..05126233ec7ca 100644
--- a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
+++ b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
@@ -20,7 +20,8 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K
     FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 480K    /* sectors 2-7 */
-    FLASH_EXT (rx)  : ORIGIN = 0x90000000, LENGTH = 2048K   /* external QSPI */
+    FLASH_EXT (rx)  : ORIGIN = 0x90000000, LENGTH = 1024K   /* external QSPI */
+    FLASH_ROMFS (rx): ORIGIN = 0x90100000, LENGTH = 1024K   /* external QSPI */
     RAM (rwx)       : ORIGIN = 0x20000000, LENGTH = 256K    /* DTCM+SRAM1+SRAM2 */
 }
 
@@ -39,6 +40,10 @@ _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
+/* ROMFS location */
+_micropy_hw_romfs_part1_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part1_size = LENGTH(FLASH_ROMFS);
+
 /* Define output sections */
 SECTIONS
 {
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index f0ef67e77e604..e8923bf9b66e5 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -64,6 +64,11 @@ void board_sleep(int value);
 #define MICROPY_HW_RTC_USE_US       (1)
 #define MICROPY_HW_RTC_USE_CALOUT   (1)
 
+// ROMFS config
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (1)
+#define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ (&spi_bdev2.spiflash)
+#define MICROPY_HW_ROMFS_ENABLE_PART1 (1)
+
 // SPI flash #1, for R/W storage
 #define MICROPY_HW_SOFTQSPI_SCK_LOW(self) (GPIOE->BSRR = (0x10000 << 11))
 #define MICROPY_HW_SOFTQSPI_SCK_HIGH(self) (GPIOE->BSRR = (1 << 11))
diff --git a/ports/stm32/boards/PYBD_SF6/f767.ld b/ports/stm32/boards/PYBD_SF6/f767.ld
index 4262a48a9962c..68da1f19d40dc 100644
--- a/ports/stm32/boards/PYBD_SF6/f767.ld
+++ b/ports/stm32/boards/PYBD_SF6/f767.ld
@@ -18,7 +18,7 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
     FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 2016K   /* sectors 1-11 3x32K 1*128K 7*256K */
-    FLASH_EXT (rx)  : ORIGIN = 0x90000000, LENGTH = 2048K   /* external QSPI */
+    FLASH_ROMFS (rx): ORIGIN = 0x90000000, LENGTH = 2048K   /* external QSPI */
     RAM (rwx)       : ORIGIN = 0x20000000, LENGTH = 512K    /* DTCM=128k, SRAM1=368K, SRAM2=16K */
 }
 
@@ -37,4 +37,8 @@ _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
+/* ROMFS location */
+_micropy_hw_romfs_part1_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part1_size = LENGTH(FLASH_ROMFS);
+
 INCLUDE common_bl.ld
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
index 8c11d7b2eec96..526a111177987 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
@@ -45,6 +45,11 @@
 #define MICROPY_HW_CLK_PLLQ         (6)
 #define MICROPY_HW_FLASH_LATENCY    (FLASH_LATENCY_4)
 
+// ROMFS config
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (1)
+#define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ (&spi_bdev2.spiflash)
+#define MICROPY_HW_ROMFS_ENABLE_PART1 (1)
+
 // Extra UART config
 #define MICROPY_HW_UART7_TX         (pyb_pin_W16)
 #define MICROPY_HW_UART7_RX         (pyb_pin_W22B)

From 50a7362b3eff211a5051eeaecc88bdde045c90d1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Mar 2022 10:57:38 +1100
Subject: [PATCH 1948/3129] rp2: Implement vfs.rom_ioctl with support for
 external flash.

Not enabled by default on any board.  A board can enable a ROMFS partition
by defining `MICROPY_HW_ROMFS_BYTES` in its `mpconfigboard.h` file.  For
example:

    #define MICROPY_HW_ROMFS_BYTES (128 * 1024)

The ROMFS partition is placed at the end of the flash allocated for the
firmware, giving less space for the firmware.  It then lives between the
firmware and the read/write filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h | 11 ++++++++++
 ports/rp2/rp2_flash.c    | 45 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index fe8287ba1d6e5..38dcad1dae6e1 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -67,6 +67,16 @@
 #endif
 #endif
 
+// Number of bytes of flash to allocate to the ROMFS partition.
+#ifndef MICROPY_HW_ROMFS_BYTES
+#define MICROPY_HW_ROMFS_BYTES (0)
+#endif
+
+// Number of bytes of flash to allocate to read/write filesystem storage.
+#ifndef MICROPY_HW_FLASH_STORAGE_BYTES
+#define MICROPY_HW_FLASH_STORAGE_BYTES (1408 * 1024)
+#endif
+
 #ifndef MICROPY_CONFIG_ROM_LEVEL
 #define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 #endif
@@ -170,6 +180,7 @@
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)
 #define MICROPY_VFS_FAT                         (1)
+#define MICROPY_VFS_ROM                         (MICROPY_HW_ROMFS_BYTES > 0)
 #define MICROPY_SSL_MBEDTLS                     (1)
 #define MICROPY_PY_LWIP_PPP                     (MICROPY_PY_NETWORK_PPP_LWIP)
 #define MICROPY_PY_LWIP_SOCK_RAW                (MICROPY_PY_LWIP)
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index a487fb1633b21..f3f154a1402d9 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -28,6 +28,7 @@
 
 #include "py/mphal.h"
 #include "py/runtime.h"
+#include "py/mperrno.h"
 #include "extmod/vfs.h"
 #include "modrp2.h"
 #include "hardware/flash.h"
@@ -35,15 +36,16 @@
 
 #define BLOCK_SIZE_BYTES (FLASH_SECTOR_SIZE)
 
-#ifndef MICROPY_HW_FLASH_STORAGE_BYTES
-#define MICROPY_HW_FLASH_STORAGE_BYTES (1408 * 1024)
-#endif
+static_assert(MICROPY_HW_ROMFS_BYTES % 4096 == 0, "ROMFS size must be a multiple of 4K");
 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)
 #endif
 
+// Put ROMFS at the upper end of the code space.
+#define MICROPY_HW_ROMFS_BASE (MICROPY_HW_FLASH_STORAGE_BASE - MICROPY_HW_ROMFS_BYTES)
+
 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");
 
@@ -53,6 +55,14 @@ typedef struct _rp2_flash_obj_t {
     uint32_t flash_size;
 } rp2_flash_obj_t;
 
+#if MICROPY_HW_ROMFS_BYTES > 0
+static rp2_flash_obj_t rp2_flash_romfs_obj = {
+    .base = { &rp2_flash_type },
+    .flash_base = MICROPY_HW_ROMFS_BASE,
+    .flash_size = MICROPY_HW_ROMFS_BYTES,
+};
+#endif
+
 static rp2_flash_obj_t rp2_flash_obj = {
     .base = { &rp2_flash_type },
     .flash_base = MICROPY_HW_FLASH_STORAGE_BASE,
@@ -138,6 +148,19 @@ static mp_obj_t rp2_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(self);
 }
 
+static mp_int_t rp2_flash_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    rp2_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (flags == MP_BUFFER_READ) {
+        bufinfo->buf = (void *)(XIP_BASE + self->flash_base);
+        bufinfo->len = self->flash_size;
+        bufinfo->typecode = 'B';
+        return 0;
+    } else {
+        // Write unsupported.
+        return 1;
+    }
+}
+
 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;
@@ -218,5 +241,21 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     make_new, rp2_flash_make_new,
+    buffer, rp2_flash_get_buffer,
     locals_dict, &rp2_flash_locals_dict
     );
+
+#if MICROPY_VFS_ROM_IOCTL
+mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
+    switch (mp_obj_get_int(args[0])) {
+        #if MICROPY_HW_ROMFS_BYTES > 0
+        case MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS:
+            return MP_OBJ_NEW_SMALL_INT(1);
+        case MP_VFS_ROM_IOCTL_GET_SEGMENT:
+            return MP_OBJ_FROM_PTR(&rp2_flash_romfs_obj);
+        #endif
+        default:
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+    }
+}
+#endif

From 0255cb77ccbdf09894e59523aecff24f2caa6352 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 18:05:06 +1100
Subject: [PATCH 1949/3129] esp32: Implement vfs.rom_ioctl with support for
 external flash.

Not enabled by default on any board.  For a board to enable ROMFS it must:

- Add `#define MICROPY_VFS_ROM (1)` to its `mpconfigboard.h` file.

- Use `partitions-4MiB-romfs.csv` as its partitions file (or a similar
  partitions definition that has an entry labelled "romfs").

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/esp32_partition.c         | 76 +++++++++++++++++++++++++++
 ports/esp32/partitions-4MiB-romfs.csv |  8 +++
 2 files changed, 84 insertions(+)
 create mode 100644 ports/esp32/partitions-4MiB-romfs.csv

diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 55830a285b0b6..f33e9da671b8c 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -53,6 +53,20 @@ typedef struct _esp32_partition_obj_t {
     uint16_t block_size;
 } esp32_partition_obj_t;
 
+#if MICROPY_VFS_ROM_IOCTL
+
+static esp32_partition_obj_t esp32_partition_romfs_obj = {
+    .base = { .type = NULL },
+    .part = NULL,
+    .cache = NULL,
+    .block_size = NATIVE_BLOCK_SIZE_BYTES,
+};
+
+static const void *esp32_partition_romfs_ptr = NULL;
+static esp_partition_mmap_handle_t esp32_partition_romfs_handle;
+
+#endif
+
 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);
@@ -114,6 +128,24 @@ static mp_obj_t esp32_partition_make_new(const mp_obj_type_t *type, size_t n_arg
     return MP_OBJ_FROM_PTR(esp32_partition_new(part, block_size));
 }
 
+#if MICROPY_VFS_ROM_IOCTL
+static mp_int_t esp32_partition_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self == &esp32_partition_romfs_obj && flags == MP_BUFFER_READ) {
+        if (esp32_partition_romfs_ptr == NULL) {
+            check_esp_err(esp_partition_mmap(self->part, 0, self->part->size, ESP_PARTITION_MMAP_DATA, &esp32_partition_romfs_ptr, &esp32_partition_romfs_handle));
+        }
+        bufinfo->buf = (void *)esp32_partition_romfs_ptr;
+        bufinfo->len = self->part->size;
+        bufinfo->typecode = 'B';
+        return 0;
+    } else {
+        // Unsupported.
+        return 1;
+    }
+}
+#endif
+
 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, ARG_block_size };
@@ -284,11 +316,55 @@ 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);
 
+#if MICROPY_VFS_ROM_IOCTL
+#define ESP32_PARTITION_GET_BUFFER buffer, esp32_partition_get_buffer,
+#else
+#define ESP32_PARTITION_GET_BUFFER
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     esp32_partition_type,
     MP_QSTR_Partition,
     MP_TYPE_FLAG_NONE,
     make_new, esp32_partition_make_new,
     print, esp32_partition_print,
+    ESP32_PARTITION_GET_BUFFER
     locals_dict, &esp32_partition_locals_dict
     );
+
+/******************************************************************************/
+// romfs partition
+
+#if MICROPY_VFS_ROM_IOCTL
+
+mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
+    if (esp32_partition_romfs_obj.base.type == NULL) {
+        esp32_partition_romfs_obj.base.type = &esp32_partition_type;
+        // Get the romfs partition.
+        // TODO: number of segments ioctl can be used if there is more than one romfs.
+        esp_partition_iterator_t iter = esp_partition_find(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_ANY, "romfs");
+        if (iter != NULL) {
+            esp32_partition_romfs_obj.part = esp_partition_get(iter);
+        }
+        esp_partition_iterator_release(iter);
+    }
+
+    switch (mp_obj_get_int(args[0])) {
+        case MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS:
+            if (esp32_partition_romfs_obj.part == NULL) {
+                return MP_OBJ_NEW_SMALL_INT(0);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(1);
+            }
+        case MP_VFS_ROM_IOCTL_GET_SEGMENT:
+            if (esp32_partition_romfs_obj.part == NULL) {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+            } else {
+                return MP_OBJ_FROM_PTR(&esp32_partition_romfs_obj);
+            }
+        default:
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+    }
+}
+
+#endif // MICROPY_VFS_ROM_IOCTL
diff --git a/ports/esp32/partitions-4MiB-romfs.csv b/ports/esp32/partitions-4MiB-romfs.csv
new file mode 100644
index 0000000000000..dd02506e54684
--- /dev/null
+++ b/ports/esp32/partitions-4MiB-romfs.csv
@@ -0,0 +1,8 @@
+# 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, 0x1D0000,
+romfs,    data, 0x8f,    0x1E0000, 0x20000,
+vfs,      data, fat,     0x200000, 0x200000,

From 75ff8e5465c766bad0c79d1a5d98170f27f7070b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Nov 2024 11:18:09 +1100
Subject: [PATCH 1950/3129] esp8266: Implement vfs.rom_ioctl with support for
 external flash.

Not enabled by default on any board.  For a board to enable ROMFS it must:

- Add `#define MICROPY_VFS_ROM (1)` to its `mpconfigboard.h` file.

- Add a FLASH_ROMFS partition to the linker script and expose the partition
  with:

    _micropy_hw_romfs_start = ORIGIN(FLASH_ROMFS);
    _micropy_hw_romfs_size = LENGTH(FLASH_ROMFS);

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/Makefile                 |  1 +
 ports/esp8266/boards/esp8266_common.ld |  1 +
 ports/esp8266/modesp.c                 |  9 ++-
 ports/esp8266/vfs_rom_ioctl.c          | 89 ++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp8266/vfs_rom_ioctl.c

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 1721075eae172..1c9de01503abd 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -134,6 +134,7 @@ SRC_C = \
 	fatfs_port.c \
 	posix_helpers.c \
 	hspi.c \
+	vfs_rom_ioctl.c \
 	$(wildcard $(BOARD_DIR)/*.c) \
 
 ifeq ($(MICROPY_PY_ESPNOW),1)
diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index cf4883acc9d20..206c3f14b430e 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -170,6 +170,7 @@ SECTIONS
         *modonewire.o(.literal* .text*)
         *network_wlan.o(.literal* .text*)
         *esp_mphal.o(.literal* .text*)
+        *vfs_rom_ioctl.o(.literal* .text*)
 
         /* we put as much rodata as possible in this section */
         /* note that only rodata accessed as a machine word is allowed here */
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index f303da1a33289..c88022945cfe6 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -164,9 +164,16 @@ static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
 #define IS_OTA_FIRMWARE() ((*(uint32_t *)0x40200000 & 0xff00) == 0x100)
 
 extern byte _firmware_size[];
+#if MICROPY_VFS_ROM_IOCTL
+extern uint8_t _micropy_hw_romfs_size;
+#endif
 
 static mp_obj_t esp_flash_user_start(void) {
-    return MP_OBJ_NEW_SMALL_INT((uint32_t)_firmware_size);
+    uint32_t flash_user_start = (uint32_t)_firmware_size;
+    #if MICROPY_VFS_ROM_IOCTL
+    flash_user_start += (uint32_t)&_micropy_hw_romfs_size;
+    #endif
+    return MP_OBJ_NEW_SMALL_INT(flash_user_start);
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_user_start_obj, esp_flash_user_start);
 
diff --git a/ports/esp8266/vfs_rom_ioctl.c b/ports/esp8266/vfs_rom_ioctl.c
new file mode 100644
index 0000000000000..c7528375becd0
--- /dev/null
+++ b/ports/esp8266/vfs_rom_ioctl.c
@@ -0,0 +1,89 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 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/mperrno.h"
+#include "py/objarray.h"
+#include "extmod/vfs.h"
+#include "ets_alt_task.h"
+#include "user_interface.h"
+
+#if MICROPY_VFS_ROM_IOCTL
+
+#define FLASH_MEM_BASE (0x40200000)
+#define FLASH_PAGE_SIZE (4096)
+
+#define MICROPY_HW_ROMFS_BASE (uintptr_t)(&_micropy_hw_romfs_start)
+#define MICROPY_HW_ROMFS_BYTES (uintptr_t)(&_micropy_hw_romfs_size)
+
+#define ROMFS_SPI_FLASH_OFFSET (MICROPY_HW_ROMFS_BASE - FLASH_MEM_BASE)
+
+extern uint8_t _micropy_hw_romfs_start;
+extern uint8_t _micropy_hw_romfs_size;
+
+static const MP_DEFINE_MEMORYVIEW_OBJ(romfs_obj, 'B', 0, MICROPY_HW_ROMFS_BYTES, (void *)MICROPY_HW_ROMFS_BASE);
+
+mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
+    switch (mp_obj_get_int(args[0])) {
+        case MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS:
+            return MP_OBJ_NEW_SMALL_INT(1);
+
+        case MP_VFS_ROM_IOCTL_GET_SEGMENT:
+            return MP_OBJ_FROM_PTR(&romfs_obj);
+
+        case MP_VFS_ROM_IOCTL_WRITE_PREPARE: {
+            uint32_t dest = ROMFS_SPI_FLASH_OFFSET;
+            uint32_t dest_max = dest + mp_obj_get_int(args[2]);
+            while (dest < dest_max) {
+                ets_loop_iter(); // flash access takes time so run any pending tasks
+                SpiFlashOpResult res = spi_flash_erase_sector(dest / FLASH_PAGE_SIZE);
+                ets_loop_iter();
+                if (res != SPI_FLASH_RESULT_OK) {
+                    return MP_OBJ_NEW_SMALL_INT(res == SPI_FLASH_RESULT_TIMEOUT ? -MP_ETIMEDOUT : -MP_EIO);
+                }
+                dest += FLASH_PAGE_SIZE;
+            }
+            return MP_OBJ_NEW_SMALL_INT(4); // minimum write size
+        }
+
+        case MP_VFS_ROM_IOCTL_WRITE: {
+            mp_int_t offset = ROMFS_SPI_FLASH_OFFSET + mp_obj_get_int(args[2]);
+            mp_buffer_info_t bufinfo;
+            mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
+            ets_loop_iter(); // flash access takes time so run any pending tasks
+            SpiFlashOpResult res = spi_flash_write(offset, bufinfo.buf, (bufinfo.len + 3) & ~3);
+            ets_loop_iter();
+            if (res == SPI_FLASH_RESULT_OK) {
+                return MP_OBJ_NEW_SMALL_INT(0);
+            }
+            return MP_OBJ_NEW_SMALL_INT(res == SPI_FLASH_RESULT_TIMEOUT ? -MP_ETIMEDOUT : -MP_EIO);
+        }
+
+        default:
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+    }
+}
+
+#endif // MICROPY_VFS_ROM_IOCTL

From 6bec36a4eec999eccc6aadf0de782ebf69454ced Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 1 Mar 2025 17:22:03 +1100
Subject: [PATCH 1951/3129] esp8266/boards: Add FLASH_2M_ROMFS variant with
 320k ROM partition.

The same as the 2M flash variant but with a 320KiB ROM partition.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../esp8266/boards/ESP8266_GENERIC/board.json |  3 ++-
 .../mpconfigvariant_FLASH_2M_ROMFS.mk         | 12 ++++++++++
 ports/esp8266/boards/esp8266_2MiB_ROMFS.ld    | 24 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_2M_ROMFS.mk
 create mode 100644 ports/esp8266/boards/esp8266_2MiB_ROMFS.ld

diff --git a/ports/esp8266/boards/ESP8266_GENERIC/board.json b/ports/esp8266/boards/ESP8266_GENERIC/board.json
index 2b3a6b5507db8..8f2aa1240f280 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/board.json
+++ b/ports/esp8266/boards/ESP8266_GENERIC/board.json
@@ -17,7 +17,8 @@
     "variants": {
         "OTA": "OTA compatible",
         "FLASH_1M": "1MiB flash",
-        "FLASH_512K": "512kiB flash"
+        "FLASH_512K": "512kiB flash",
+        "FLASH_2M_ROMFS": "2MiB flash with ROMFS"
     },
     "vendor": "Espressif"
 }
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_2M_ROMFS.mk b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_2M_ROMFS.mk
new file mode 100644
index 0000000000000..9ee3566d8bf35
--- /dev/null
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigvariant_FLASH_2M_ROMFS.mk
@@ -0,0 +1,12 @@
+LD_FILES = boards/esp8266_2MiB_ROMFS.ld
+
+MICROPY_PY_ESPNOW ?= 1
+MICROPY_PY_BTREE ?= 1
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Add asyncio and extra micropython-lib packages (in addition to the port manifest).
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest_2MiB.py
+
+# Configure mpconfigboard.h.
+CFLAGS += -DMICROPY_ESP8266_2M -DMICROPY_VFS_ROM=1
diff --git a/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld b/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld
new file mode 100644
index 0000000000000..6020c3d485da6
--- /dev/null
+++ b/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld
@@ -0,0 +1,24 @@
+/* GNU linker script for ESP8266 with 2M or more flash, and includes a ROMFS partition
+
+   Flash layout:
+    0x40200000 36k  header + iram/dram init
+    0x40209000 668k firmware (irom0)
+    0x402c0000 320k ROMFS
+    0x40300000 1M+  filesystem (not memory mapped)
+*/
+
+MEMORY
+{
+    dport0_0_seg : org = 0x3ff00000, len = 16
+    dram0_0_seg :  org = 0x3ffe8000, len = 80K
+    iram1_0_seg :  org = 0x40100000, len = 32K
+    irom0_0_seg :  org = 0x40209000, len = 1M - 36K - 320K
+    FLASH_ROMFS :  org = 0x402b0000, len = 320K
+}
+
+/* define ROMFS extents */
+_micropy_hw_romfs_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_size = LENGTH(FLASH_ROMFS);
+
+/* define common sections and symbols */
+INCLUDE boards/esp8266_common.ld

From be0fce942996af576acd2ac639a4be92f6c4eeb7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 Mar 2025 22:46:33 +1100
Subject: [PATCH 1952/3129] unix/main: Add coverage test for mounting ROMFS
 filesystem at startup.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c                             | 27 +++++++++++++++++++
 .../unix/variants/coverage/mpconfigvariant.h  |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 58fa3ff589a55..0d137fe1b58ea 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -45,6 +45,7 @@
 #include "py/gc.h"
 #include "py/objstr.h"
 #include "py/cstack.h"
+#include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/mpthread.h"
 #include "extmod/misc.h"
@@ -548,7 +549,14 @@ MP_NOINLINE int main_(int argc, char **argv) {
             MP_OBJ_NEW_QSTR(MP_QSTR__slash_),
         };
         mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
+
+        // Make sure the root that was just mounted is the current VFS (it's always at
+        // the end of the linked list).  Can't use chdir('/') because that will change
+        // the current path within the VfsPosix object.
         MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_mount_table);
+        while (MP_STATE_VM(vfs_cur)->next != NULL) {
+            MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_cur)->next;
+        }
     }
     #endif
 
@@ -803,3 +811,22 @@ void nlr_jump_fail(void *val) {
     fprintf(stderr, "FATAL: uncaught NLR %p\n", val);
     exit(1);
 }
+
+#if MICROPY_VFS_ROM_IOCTL
+
+static uint8_t romfs_buf[4] = { 0xd2, 0xcd, 0x31, 0x00 }; // empty ROMFS
+static const MP_DEFINE_MEMORYVIEW_OBJ(romfs_obj, 'B', 0, sizeof(romfs_buf), romfs_buf);
+
+mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
+    switch (mp_obj_get_int(args[0])) {
+        case MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS:
+            return MP_OBJ_NEW_SMALL_INT(1);
+
+        case MP_VFS_ROM_IOCTL_GET_SEGMENT:
+            return MP_OBJ_FROM_PTR(&romfs_obj);
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+}
+
+#endif
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index e24e0f1b14ade..a72e533e74c4a 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -41,4 +41,6 @@
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_TRACKED_ALLOC          (1)
 #define MICROPY_WARNINGS_CATEGORY      (1)
+#undef MICROPY_VFS_ROM_IOCTL
+#define MICROPY_VFS_ROM_IOCTL          (1)
 #define MICROPY_PY_CRYPTOLIB_CTR       (1)

From 3823aeb0f14c04084eba6566164d9b7dbd9e7ced Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Fri, 21 Feb 2025 14:51:45 +0100
Subject: [PATCH 1953/3129] zephyr/machine_timer: Add machine.Timer class
 implementation.

Simple `machine.Timer` implementation in-line with the rest of the
MicroPython ports.

Note: Only virtual timers are supported (not linked to any particular
hardware peripheral).

Tested with the nRF5340 and the nRF52840.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/CMakeLists.txt  |   1 +
 ports/zephyr/machine_timer.c | 201 +++++++++++++++++++++++++++++++++++
 ports/zephyr/modmachine.c    |   1 +
 3 files changed, 203 insertions(+)
 create mode 100644 ports/zephyr/machine_timer.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 68b6c0700b546..b955089066749 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -40,6 +40,7 @@ set(MICROPY_SOURCE_PORT
     machine_i2c.c
     machine_spi.c
     machine_pin.c
+    machine_timer.c
     modbluetooth_zephyr.c
     modsocket.c
     modzephyr.c
diff --git a/ports/zephyr/machine_timer.c b/ports/zephyr/machine_timer.c
new file mode 100644
index 0000000000000..8ab2f629131c0
--- /dev/null
+++ b/ports/zephyr/machine_timer.c
@@ -0,0 +1,201 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Daniel Campora on behalf of REMOTE TECH LTD
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/mperrno.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "modmachine.h"
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/printk.h>
+
+#define TIMER_MS_PER_TICK (1000)
+
+typedef enum _machine_timer_mode_t {
+    TIMER_MODE_ONE_SHOT = 0,
+    TIMER_MODE_PERIODIC
+} machine_timer_mode_t;
+
+typedef struct _machine_timer_obj_t {
+    mp_obj_base_t base;
+
+    struct k_timer my_timer;
+
+    machine_timer_mode_t mode;
+    uint32_t period_ms;
+
+    mp_obj_t callback;
+
+    struct _machine_timer_obj_t *next;
+} machine_timer_obj_t;
+
+const mp_obj_type_t machine_timer_type;
+
+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);
+static mp_obj_t machine_timer_deinit(mp_obj_t self_in);
+
+static void machine_timer_callback(struct k_timer *timer) {
+    machine_timer_obj_t *self = (machine_timer_obj_t *)k_timer_user_data_get(timer);
+    if (self->mode == TIMER_MODE_ONE_SHOT) {
+        machine_timer_deinit(self);
+    }
+    if (self->callback != mp_const_none) {
+        mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
+    }
+}
+
+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 = self_in;
+    qstr mode_str = (self->mode == TIMER_MODE_PERIODIC) ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
+    mp_printf(print, "Timer(-1, mode=%q, period=%lu)", mode_str, self->period_ms);
+}
+
+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, MP_OBJ_FUN_ARGS_MAX, true);
+
+    if (mp_obj_get_int(args[0]) != -1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("only virtual timers are supported"));
+    }
+
+    // Create the new timer.
+    machine_timer_obj_t *self = mp_obj_malloc_with_finaliser(machine_timer_obj_t, &machine_timer_type);
+
+    // 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;
+}
+
+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) {
+    enum {
+        ARG_mode,
+        ARG_callback,
+        ARG_period,
+        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_obj = mp_const_none} },
+        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
+        #if MICROPY_PY_BUILTINS_FLOAT
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        #else
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
+        #endif
+    };
+
+    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 MICROPY_PY_BUILTINS_FLOAT
+    if (args[ARG_freq].u_obj != mp_const_none) {
+        self->period_ms = (uint32_t)(TIMER_MS_PER_TICK / mp_obj_get_float(args[ARG_freq].u_obj));
+    }
+    #else
+    if (args[ARG_freq].u_int != 0xffffffff) {
+        self->period_ms = TIMER_MS_PER_TICK / ((uint64_t)args[ARG_freq].u_int);
+    }
+    #endif
+    else {
+        self->period_ms = args[ARG_period].u_int;
+    }
+
+    self->mode = args[ARG_mode].u_int;
+    self->callback = args[ARG_callback].u_obj;
+
+    k_timer_init(&self->my_timer, machine_timer_callback, NULL);
+    k_timer_user_data_set(&self->my_timer, self);
+    k_timer_start(&self->my_timer, K_MSEC(self->period_ms), K_MSEC(self->period_ms));
+
+    return mp_const_none;
+}
+
+static mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+    machine_timer_obj_t *self = self_in;
+    machine_timer_obj_t *prev = NULL;
+
+    k_timer_stop(&self->my_timer);
+
+    // remove it from the linked list
+    for (machine_timer_obj_t *_timer = MP_STATE_PORT(machine_timer_obj_head); _timer != NULL; _timer = _timer->next) {
+        if (_timer == self) {
+            if (prev != NULL) {
+                prev->next = _timer->next;
+            } else {
+                // move the start pointer
+                MP_STATE_PORT(machine_timer_obj_head) = _timer->next;
+            }
+            break;
+        } else {
+            prev = _timer;
+        }
+    }
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+
+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);
+
+static mp_obj_t machine_timer_value(mp_obj_t self_in) {
+    machine_timer_obj_t *self = self_in;
+    k_ticks_t ticks = k_timer_remaining_ticks(&self->my_timer);
+    return MP_OBJ_NEW_SMALL_INT(k_ticks_to_ms_near32(ticks));
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_value_obj, machine_timer_value);
+
+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_deinit),      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_value),       MP_ROM_PTR(&machine_timer_value_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);
+
+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
+    );
+
+MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *machine_timer_obj_head);
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index bbb9280a5dcb9..89ad12f185daa 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -44,6 +44,7 @@
     MICROPY_PY_MACHINE_RESET_ENTRY \
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) }, \
     { 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_obj_t machine_reset(void) {
     sys_reboot(SYS_REBOOT_COLD);

From 0ec496a98ca7ba0d81c877505fa7673bab5be75c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Mar 2025 13:07:25 +1100
Subject: [PATCH 1954/3129] lib/cyw43-driver: Update driver to latest version
 v1.1.0.

Includes various fixes and improvements to the WLAN driver, in particular:
- Add WPA3 STA and AP support.
- Attempt to reconnect to AP in response to validation error.
- Update 43439 BT firmware for Data Length Extension fix.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/cyw43-driver                | 2 +-
 ports/mimxrt/cyw43_configport.h | 2 +-
 ports/rp2/cyw43_configport.h    | 1 +
 ports/stm32/cyw43_configport.h  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/cyw43-driver b/lib/cyw43-driver
index 9f6405f0b3260..dd7568229f3bf 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 9f6405f0b3260968306d782e1c5ac275a46dc65d
+Subproject commit dd7568229f3bf7a37737b9e1ef250c26efe75b23
diff --git a/ports/mimxrt/cyw43_configport.h b/ports/mimxrt/cyw43_configport.h
index 619db24b1b579..ab535a477763d 100644
--- a/ports/mimxrt/cyw43_configport.h
+++ b/ports/mimxrt/cyw43_configport.h
@@ -107,7 +107,7 @@
 #endif
 
 #if MICROPY_HW_ENABLE_RF_SWITCH
-#define CYW43_PIN_WL_RFSW_VDD           pin_WL_RFSW_VDD
+#define CYW43_PIN_RFSW_VDD              pin_WL_RFSW_VDD
 #endif
 
 #define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 4294691c66657..bb99bb2976fee 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -35,6 +35,7 @@
 #include "extmod/modnetwork.h"
 #include "pendsv.h"
 
+#define CYW43_INCLUDE_LEGACY_F1_OVERFLOW_WORKAROUND_VARIABLES (1)
 #define CYW43_WIFI_NVRAM_INCLUDE_FILE   "wifi_nvram_43439.h"
 #define CYW43_IOCTL_TIMEOUT_US          (1000000)
 #define CYW43_SLEEP_MAX                 (10)
diff --git a/ports/stm32/cyw43_configport.h b/ports/stm32/cyw43_configport.h
index 1ea1ebde17ea2..595051180336e 100644
--- a/ports/stm32/cyw43_configport.h
+++ b/ports/stm32/cyw43_configport.h
@@ -102,7 +102,7 @@
 #define CYW43_PIN_BT_CTS                pyb_pin_BT_CTS
 
 #if MICROPY_HW_ENABLE_RF_SWITCH
-#define CYW43_PIN_WL_RFSW_VDD           pyb_pin_WL_RFSW_VDD
+#define CYW43_PIN_RFSW_VDD              pyb_pin_WL_RFSW_VDD
 #endif
 
 #define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)

From dafff1fd0e37514b230081b1b34288d1d4b25867 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Mar 2025 13:15:34 +1100
Subject: [PATCH 1955/3129] extmod/network_cyw43: Add WPA3 security constants.

These are now supported by cyw43-driver.

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

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 02b022cb81327..1b1b10b40741a 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -583,6 +583,8 @@ static const mp_rom_map_elem_t network_cyw43_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IF_AP), MP_ROM_INT(MOD_NETWORK_AP_IF) },
     { MP_ROM_QSTR(MP_QSTR_SEC_OPEN), MP_ROM_INT(CYW43_AUTH_OPEN) },
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA_WPA2), MP_ROM_INT(CYW43_AUTH_WPA2_MIXED_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA3), MP_ROM_INT(CYW43_AUTH_WPA3_SAE_AES_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA2_WPA3), MP_ROM_INT(CYW43_AUTH_WPA3_WPA2_AES_PSK) },
 
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(PM_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(PM_PERFORMANCE) },

From 4b1c666c28ef9adb5a9b5156624bccd6a3d129b6 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 4 Mar 2025 12:20:02 +1100
Subject: [PATCH 1956/3129] esp32: Merge the per-SoC "main" components back
 together.

Removes redundant metadata from each, shouldn't otherwise change
any build output.

Reverts the split originally added in e4650125.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/CMakeLists.txt                    |  3 --
 ports/esp32/esp32_common.cmake                | 14 ++++++-
 .../esp32/{main_esp32 => main}/CMakeLists.txt |  0
 .../{main_esp32 => main}/idf_component.yml    |  4 ++
 ports/esp32/main/linker_esp32.lf              | 41 +++++++++++++++++++
 ports/esp32/main_esp32/linker.lf              | 39 ------------------
 ports/esp32/main_esp32c3/CMakeLists.txt       | 14 -------
 ports/esp32/main_esp32c3/idf_component.yml    |  5 ---
 ports/esp32/main_esp32c3/linker.lf            |  1 -
 ports/esp32/main_esp32c6/CMakeLists.txt       | 14 -------
 ports/esp32/main_esp32c6/idf_component.yml    |  5 ---
 ports/esp32/main_esp32c6/linker.lf            |  1 -
 ports/esp32/main_esp32s2/CMakeLists.txt       | 13 ------
 ports/esp32/main_esp32s2/idf_component.yml    |  6 ---
 ports/esp32/main_esp32s2/linker.lf            |  1 -
 ports/esp32/main_esp32s3/CMakeLists.txt       | 13 ------
 ports/esp32/main_esp32s3/idf_component.yml    |  6 ---
 ports/esp32/main_esp32s3/linker.lf            |  1 -
 18 files changed, 58 insertions(+), 123 deletions(-)
 rename ports/esp32/{main_esp32 => main}/CMakeLists.txt (100%)
 rename ports/esp32/{main_esp32 => main}/idf_component.yml (52%)
 create mode 100644 ports/esp32/main/linker_esp32.lf
 delete mode 100644 ports/esp32/main_esp32/linker.lf
 delete mode 100644 ports/esp32/main_esp32c3/CMakeLists.txt
 delete mode 100644 ports/esp32/main_esp32c3/idf_component.yml
 delete mode 100644 ports/esp32/main_esp32c3/linker.lf
 delete mode 100644 ports/esp32/main_esp32c6/CMakeLists.txt
 delete mode 100644 ports/esp32/main_esp32c6/idf_component.yml
 delete mode 100644 ports/esp32/main_esp32c6/linker.lf
 delete mode 100644 ports/esp32/main_esp32s2/CMakeLists.txt
 delete mode 100644 ports/esp32/main_esp32s2/idf_component.yml
 delete mode 100644 ports/esp32/main_esp32s2/linker.lf
 delete mode 100644 ports/esp32/main_esp32s3/CMakeLists.txt
 delete mode 100644 ports/esp32/main_esp32s3/idf_component.yml
 delete mode 100644 ports/esp32/main_esp32s3/linker.lf

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index c3a675eb2b78f..1db374b40a431 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -61,8 +61,5 @@ set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
 # Include main IDF cmake file.
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-# Set the location of the main component for the project (one per target).
-list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
-
 # Define the project.
 project(micropython)
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 059989c10a4db..09952363d6d50 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -14,6 +14,18 @@ if(NOT MICROPY_PORT_DIR)
     get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
 endif()
 
+# RISC-V specific inclusions
+if(CONFIG_IDF_TARGET_ARCH_RISCV)
+    list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
+    list(APPEND IDF_COMPONENTS riscv)
+endif()
+
+if(NOT DEFINED MICROPY_PY_TINYUSB)
+    if(CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3)
+        set(MICROPY_PY_TINYUSB ON)
+    endif()
+endif()
+
 # Include core source components.
 include(${MICROPY_DIR}/py/py.cmake)
 
@@ -182,7 +194,7 @@ list(APPEND IDF_COMPONENTS
 if (MICROPY_USER_LDFRAGMENTS)
     set(MICROPY_LDFRAGMENTS ${MICROPY_USER_LDFRAGMENTS})
 else()
-    set(MICROPY_LDFRAGMENTS linker.lf)
+    set(MICROPY_LDFRAGMENTS linker_esp32.lf)
 endif()
 
 # Register the main IDF component.
diff --git a/ports/esp32/main_esp32/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
similarity index 100%
rename from ports/esp32/main_esp32/CMakeLists.txt
rename to ports/esp32/main/CMakeLists.txt
diff --git a/ports/esp32/main_esp32/idf_component.yml b/ports/esp32/main/idf_component.yml
similarity index 52%
rename from ports/esp32/main_esp32/idf_component.yml
rename to ports/esp32/main/idf_component.yml
index 11f078f69f761..ccbde1f27e412 100644
--- a/ports/esp32/main_esp32/idf_component.yml
+++ b/ports/esp32/main/idf_component.yml
@@ -1,5 +1,9 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/mdns: "~1.1.0"
+  espressif/esp_tinyusb:
+    rules:
+      - if: "target in [esp32s2, esp32s3]"
+    version: "~1.0.0"
   idf:
     version: ">=5.2.0"
diff --git a/ports/esp32/main/linker_esp32.lf b/ports/esp32/main/linker_esp32.lf
new file mode 100644
index 0000000000000..27e4ac2194c1b
--- /dev/null
+++ b/ports/esp32/main/linker_esp32.lf
@@ -0,0 +1,41 @@
+# This fixes components/esp_ringbuf/linker.lf for ESP32 only to allow us to put
+# non-ISR ringbuf functions in flash.
+
+# Requires that both RINGBUF_PLACE_FUNCTIONS_INTO_FLASH and RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH
+# are set to "n" (which is the default), otherwise this would result in duplicate section config
+# when resolving the linker fragments.
+
+# The effect of this file is to leave the ISR functions in RAM (which we require), but apply a fixed
+# version of RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y (leaving out prvGetFreeSize and prvGetCurMaxSizeByteBuf)
+# See https://github.com/espressif/esp-idf/issues/13378
+
+[mapping:esp_ringbuf_fix]
+archive: libesp_ringbuf.a
+entries:
+    if IDF_TARGET_ESP32 = y:
+        # This is exactly the list of functions from RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y,
+        # but with prvGetFreeSize and prvGetCurMaxSizeByteBuf removed.
+        ringbuf: prvGetCurMaxSizeNoSplit (default)
+        ringbuf: prvGetCurMaxSizeAllowSplit (default)
+        ringbuf: prvInitializeNewRingbuffer (default)
+        ringbuf: prvReceiveGeneric (default)
+        ringbuf: vRingbufferDelete (default)
+        ringbuf: vRingbufferGetInfo (default)
+        ringbuf: vRingbufferReturnItem (default)
+        ringbuf: xRingbufferAddToQueueSetRead (default)
+        ringbuf: xRingbufferCanRead (default)
+        ringbuf: xRingbufferCreate (default)
+        ringbuf: xRingbufferCreateStatic (default)
+        ringbuf: xRingbufferCreateNoSplit (default)
+        ringbuf: xRingbufferReceive (default)
+        ringbuf: xRingbufferReceiveSplit (default)
+        ringbuf: xRingbufferReceiveUpTo (default)
+        ringbuf: xRingbufferRemoveFromQueueSetRead (default)
+        ringbuf: xRingbufferSend (default)
+        ringbuf: xRingbufferSendAcquire (default)
+        ringbuf: xRingbufferSendComplete (default)
+        ringbuf: xRingbufferPrintInfo (default)
+        ringbuf: xRingbufferGetMaxItemSize (default)
+        ringbuf: xRingbufferGetCurFreeSize (default)
+
+        # Everything else will have the default rule already applied (i.e. noflash_text).
diff --git a/ports/esp32/main_esp32/linker.lf b/ports/esp32/main_esp32/linker.lf
deleted file mode 100644
index e00cd63f5548d..0000000000000
--- a/ports/esp32/main_esp32/linker.lf
+++ /dev/null
@@ -1,39 +0,0 @@
-# This fixes components/esp_ringbuf/linker.lf to allow us to put non-ISR ringbuf functions in flash.
-
-# Requires that both RINGBUF_PLACE_FUNCTIONS_INTO_FLASH and RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH
-# are set to "n" (which is the default), otherwise this would result in duplicate section config
-# when resolving the linker fragments.
-
-# The effect of this file is to leave the ISR functions in RAM (which we require), but apply a fixed
-# version of RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y (leaving out prvGetFreeSize and prvGetCurMaxSizeByteBuf)
-# See https://github.com/espressif/esp-idf/issues/13378
-
-[mapping:esp_ringbuf_fix]
-archive: libesp_ringbuf.a
-entries:
-    # This is exactly the list of functions from RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y,
-    # but with prvGetFreeSize and prvGetCurMaxSizeByteBuf removed.
-    ringbuf: prvGetCurMaxSizeNoSplit (default)
-    ringbuf: prvGetCurMaxSizeAllowSplit (default)
-    ringbuf: prvInitializeNewRingbuffer (default)
-    ringbuf: prvReceiveGeneric (default)
-    ringbuf: vRingbufferDelete (default)
-    ringbuf: vRingbufferGetInfo (default)
-    ringbuf: vRingbufferReturnItem (default)
-    ringbuf: xRingbufferAddToQueueSetRead (default)
-    ringbuf: xRingbufferCanRead (default)
-    ringbuf: xRingbufferCreate (default)
-    ringbuf: xRingbufferCreateStatic (default)
-    ringbuf: xRingbufferCreateNoSplit (default)
-    ringbuf: xRingbufferReceive (default)
-    ringbuf: xRingbufferReceiveSplit (default)
-    ringbuf: xRingbufferReceiveUpTo (default)
-    ringbuf: xRingbufferRemoveFromQueueSetRead (default)
-    ringbuf: xRingbufferSend (default)
-    ringbuf: xRingbufferSendAcquire (default)
-    ringbuf: xRingbufferSendComplete (default)
-    ringbuf: xRingbufferPrintInfo (default)
-    ringbuf: xRingbufferGetMaxItemSize (default)
-    ringbuf: xRingbufferGetCurFreeSize (default)
-
-    # Everything else will have the default rule already applied (i.e. noflash_text).
diff --git a/ports/esp32/main_esp32c3/CMakeLists.txt b/ports/esp32/main_esp32c3/CMakeLists.txt
deleted file mode 100644
index 307c0f32183a9..0000000000000
--- a/ports/esp32/main_esp32c3/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Set location of base MicroPython directory.
-if(NOT MICROPY_DIR)
-    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
-endif()
-
-# Set location of the ESP32 port directory.
-if(NOT MICROPY_PORT_DIR)
-    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
-endif()
-
-list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
-list(APPEND IDF_COMPONENTS riscv)
-
-include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32c3/idf_component.yml b/ports/esp32/main_esp32c3/idf_component.yml
deleted file mode 100644
index 11f078f69f761..0000000000000
--- a/ports/esp32/main_esp32c3/idf_component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-## IDF Component Manager Manifest File
-dependencies:
-  espressif/mdns: "~1.1.0"
-  idf:
-    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32c3/linker.lf b/ports/esp32/main_esp32c3/linker.lf
deleted file mode 100644
index 31c5b4563ca9a..0000000000000
--- a/ports/esp32/main_esp32c3/linker.lf
+++ /dev/null
@@ -1 +0,0 @@
-# Empty linker fragment (no workaround required for C3, see main_esp32/linker.lf).
diff --git a/ports/esp32/main_esp32c6/CMakeLists.txt b/ports/esp32/main_esp32c6/CMakeLists.txt
deleted file mode 100644
index 307c0f32183a9..0000000000000
--- a/ports/esp32/main_esp32c6/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Set location of base MicroPython directory.
-if(NOT MICROPY_DIR)
-    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
-endif()
-
-# Set location of the ESP32 port directory.
-if(NOT MICROPY_PORT_DIR)
-    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
-endif()
-
-list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
-list(APPEND IDF_COMPONENTS riscv)
-
-include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32c6/idf_component.yml b/ports/esp32/main_esp32c6/idf_component.yml
deleted file mode 100644
index 11f078f69f761..0000000000000
--- a/ports/esp32/main_esp32c6/idf_component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-## IDF Component Manager Manifest File
-dependencies:
-  espressif/mdns: "~1.1.0"
-  idf:
-    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32c6/linker.lf b/ports/esp32/main_esp32c6/linker.lf
deleted file mode 100644
index cedabcf979350..0000000000000
--- a/ports/esp32/main_esp32c6/linker.lf
+++ /dev/null
@@ -1 +0,0 @@
-# Empty linker fragment (no workaround required for C6, see main_esp32/linker.lf).
diff --git a/ports/esp32/main_esp32s2/CMakeLists.txt b/ports/esp32/main_esp32s2/CMakeLists.txt
deleted file mode 100644
index bc5ab939c3ce3..0000000000000
--- a/ports/esp32/main_esp32s2/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Set location of base MicroPython directory.
-if(NOT MICROPY_DIR)
-    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
-endif()
-
-# Set location of the ESP32 port directory.
-if(NOT MICROPY_PORT_DIR)
-    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
-endif()
-
-set(MICROPY_PY_TINYUSB ON)
-
-include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml
deleted file mode 100644
index 2ee00b287786b..0000000000000
--- a/ports/esp32/main_esp32s2/idf_component.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-## IDF Component Manager Manifest File
-dependencies:
-  espressif/mdns: "~1.1.0"
-  espressif/esp_tinyusb: "~1.0.0"
-  idf:
-    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32s2/linker.lf b/ports/esp32/main_esp32s2/linker.lf
deleted file mode 100644
index 3c496fa878b3f..0000000000000
--- a/ports/esp32/main_esp32s2/linker.lf
+++ /dev/null
@@ -1 +0,0 @@
-# Empty linker fragment (no workaround required for S2, see main_esp32/linker.lf).
diff --git a/ports/esp32/main_esp32s3/CMakeLists.txt b/ports/esp32/main_esp32s3/CMakeLists.txt
deleted file mode 100644
index bc5ab939c3ce3..0000000000000
--- a/ports/esp32/main_esp32s3/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Set location of base MicroPython directory.
-if(NOT MICROPY_DIR)
-    get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
-endif()
-
-# Set location of the ESP32 port directory.
-if(NOT MICROPY_PORT_DIR)
-    get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
-endif()
-
-set(MICROPY_PY_TINYUSB ON)
-
-include(${MICROPY_PORT_DIR}/esp32_common.cmake)
diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml
deleted file mode 100644
index 2ee00b287786b..0000000000000
--- a/ports/esp32/main_esp32s3/idf_component.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-## IDF Component Manager Manifest File
-dependencies:
-  espressif/mdns: "~1.1.0"
-  espressif/esp_tinyusb: "~1.0.0"
-  idf:
-    version: ">=5.2.0"
diff --git a/ports/esp32/main_esp32s3/linker.lf b/ports/esp32/main_esp32s3/linker.lf
deleted file mode 100644
index 81d27906be0e4..0000000000000
--- a/ports/esp32/main_esp32s3/linker.lf
+++ /dev/null
@@ -1 +0,0 @@
-# Empty linker fragment (no workaround required for S3, see main_esp32/linker.lf).

From 4d65b4e26119ab19de362174ec62cc3ea68a836a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 4 Mar 2025 12:30:10 +1100
Subject: [PATCH 1957/3129] esp32: Remove the ESP32 ringbuffer linker
 workaround.

Reverts workaround added in acbdbcd9.

According to the linked ESP-IDF issue this was only a problem for ESP-IDF
V5.0.x, and support for versions older than V5.2 was dropped in 6e5d8d009.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/sdkconfig.spiram |  2 +-
 ports/esp32/esp32_common.cmake      |  2 --
 ports/esp32/main/linker_esp32.lf    | 41 -----------------------------
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 ports/esp32/main/linker_esp32.lf

diff --git a/ports/esp32/boards/sdkconfig.spiram b/ports/esp32/boards/sdkconfig.spiram
index 35fe3c676ddf4..f5503d554149c 100644
--- a/ports/esp32/boards/sdkconfig.spiram
+++ b/ports/esp32/boards/sdkconfig.spiram
@@ -13,6 +13,6 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192
 # to PSRAM bug workarounds.  Apply some options to reduce the firmware size.
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
-# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y # Workaround required: see main_esp32/linker.lf
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 09952363d6d50..6473f04a53500 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -193,8 +193,6 @@ list(APPEND IDF_COMPONENTS
 # Provide the default LD fragment if not set
 if (MICROPY_USER_LDFRAGMENTS)
     set(MICROPY_LDFRAGMENTS ${MICROPY_USER_LDFRAGMENTS})
-else()
-    set(MICROPY_LDFRAGMENTS linker_esp32.lf)
 endif()
 
 # Register the main IDF component.
diff --git a/ports/esp32/main/linker_esp32.lf b/ports/esp32/main/linker_esp32.lf
deleted file mode 100644
index 27e4ac2194c1b..0000000000000
--- a/ports/esp32/main/linker_esp32.lf
+++ /dev/null
@@ -1,41 +0,0 @@
-# This fixes components/esp_ringbuf/linker.lf for ESP32 only to allow us to put
-# non-ISR ringbuf functions in flash.
-
-# Requires that both RINGBUF_PLACE_FUNCTIONS_INTO_FLASH and RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH
-# are set to "n" (which is the default), otherwise this would result in duplicate section config
-# when resolving the linker fragments.
-
-# The effect of this file is to leave the ISR functions in RAM (which we require), but apply a fixed
-# version of RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y (leaving out prvGetFreeSize and prvGetCurMaxSizeByteBuf)
-# See https://github.com/espressif/esp-idf/issues/13378
-
-[mapping:esp_ringbuf_fix]
-archive: libesp_ringbuf.a
-entries:
-    if IDF_TARGET_ESP32 = y:
-        # This is exactly the list of functions from RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y,
-        # but with prvGetFreeSize and prvGetCurMaxSizeByteBuf removed.
-        ringbuf: prvGetCurMaxSizeNoSplit (default)
-        ringbuf: prvGetCurMaxSizeAllowSplit (default)
-        ringbuf: prvInitializeNewRingbuffer (default)
-        ringbuf: prvReceiveGeneric (default)
-        ringbuf: vRingbufferDelete (default)
-        ringbuf: vRingbufferGetInfo (default)
-        ringbuf: vRingbufferReturnItem (default)
-        ringbuf: xRingbufferAddToQueueSetRead (default)
-        ringbuf: xRingbufferCanRead (default)
-        ringbuf: xRingbufferCreate (default)
-        ringbuf: xRingbufferCreateStatic (default)
-        ringbuf: xRingbufferCreateNoSplit (default)
-        ringbuf: xRingbufferReceive (default)
-        ringbuf: xRingbufferReceiveSplit (default)
-        ringbuf: xRingbufferReceiveUpTo (default)
-        ringbuf: xRingbufferRemoveFromQueueSetRead (default)
-        ringbuf: xRingbufferSend (default)
-        ringbuf: xRingbufferSendAcquire (default)
-        ringbuf: xRingbufferSendComplete (default)
-        ringbuf: xRingbufferPrintInfo (default)
-        ringbuf: xRingbufferGetMaxItemSize (default)
-        ringbuf: xRingbufferGetCurFreeSize (default)
-
-        # Everything else will have the default rule already applied (i.e. noflash_text).

From 79fb5aa8789e71c9bcd8430b58267d96552be94f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 5 Feb 2025 15:16:47 +1100
Subject: [PATCH 1958/3129] esp32/machine_sdcard: Add SDCard pin assignments
 for ESP32-S3 support.

Previously ESP32-S3 SDMMC could only use fixed pin assignments, however the
ESP-IDF defaults don't match common boards. The chip also supports using
GPIO Matrix to assign any pin.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/quickref.rst         |   2 +-
 docs/library/machine.SDCard.rst | 161 ++++++++++++++++++++++----------
 ports/esp32/machine_sdcard.c    |  47 ++++++++++
 3 files changed, 160 insertions(+), 50 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 0780e01300801..d65782e501ac7 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -747,7 +747,7 @@ See :ref:`machine.SDCard <machine.SDCard>`. ::
 
     import machine, os, vfs
 
-    # Slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
+    # On original ESP32, slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
     sd = machine.SDCard(slot=2)
     vfs.mount(sd, '/sd') # mount
 
diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index e4bb25dfc0377..62da8c3c2ea61 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -23,7 +23,8 @@ 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, freq=20000000)
+.. class:: SDCard(slot=1, width=1, cd=None, wp=None, sck=None, miso=None, mosi=None,
+                  cs=None, cmd=None, data=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.
@@ -37,7 +38,8 @@ vary from platform to platform.
      - *slot* selects which of the available interfaces to use. Leaving this
        unset will select the default interface.
 
-     - *width* selects the bus width for the SD/MMC interface.
+     - *width* selects the bus width for the SD/MMC interface. This many data
+       pins must be connected to the SD card.
 
      - *cd* can be used to specify a card-detect pin.
 
@@ -51,7 +53,14 @@ vary from platform to platform.
 
      - *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).
+    The following additional parameters are only present on ESP32 port:
+
+     - *cmd* can be used to specify the SD CMD pin (ESP32-S3 only).
+
+     - *data* can be used to specify a list or tuple of SD data bus pins
+       (ESP32-S3 only).
+
+     - *freq* selects the SD/MMC interface frequency in Hz.
 
 Implementation-specific details
 -------------------------------
@@ -67,52 +76,106 @@ The standard PyBoard has just one slot. No arguments are necessary or supported.
 ESP32
 `````
 
-The ESP32 provides two channels of SD/MMC hardware and also supports
-access to SD Cards through either of the two SPI ports that are
-generally available to the user. As a result the *slot* argument can
-take a value between 0 and 3, inclusive. Slots 0 and 1 use the
-built-in SD/MMC hardware while slots 2 and 3 use the SPI ports. Slot 0
-supports 1, 4 or 8-bit wide access while slot 1 supports 1 or 4-bit
-access; the SPI slots only support 1-bit access.
-
-  .. note:: Slot 0 is used to communicate with on-board flash memory
-            on most ESP32 modules and so will be unavailable to the
-            user.
-
-  .. note:: Most ESP32 modules that provide an SD card slot using the
-            dedicated hardware only wire up 1 data pin, so the default
-            value for *width* is 1.
-
-The pins used by the dedicated SD/MMC hardware are fixed. The pins
-used by the SPI hardware can be reassigned.
-
-  .. note:: If any of the SPI signals are remapped then all of the SPI
-            signals will pass through a GPIO multiplexer unit which
-            can limit the performance of high frequency signals. Since
-            the normal operating speed for SD cards is 40MHz this can
-            cause problems on some cards.
-
-The default (and preferred) pin assignment are as follows:
-
-    ====== ====== ====== ====== ======
-    Slot   0      1      2      3
-    ------ ------ ------ ------ ------
-    Signal   Pin    Pin    Pin    Pin
-    ====== ====== ====== ====== ======
-    sck       6     14     18     14
-    cmd      11     15
-    cs                      5     15
-    miso                   19     12
-    mosi                   23     13
-    D0        7      2
-    D1        8      4
-    D2        9     12
-    D3       10     13
-    D4       16
-    D5       17
-    D6        5
-    D7       18
-    ====== ====== ====== ====== ======
+SD cards support access in both SD/MMC mode and the simpler (but slower) SPI
+mode. ESP32 and ESP32-S3 chips can access SD cards using either mode. SPI mode
+makes use of a `SPI` host peripheral, which cannot concurrently be used for
+something else.
+
+The ``slot`` argument determines which mode is used. Different values are
+available on different chips:
+
+====== ================= ============ ========================
+Slot   Supported chips   Mode         Supported data width
+====== ================= ============ ========================
+0      ESP32-S3          SD/MMC       1, 4, or 8 bits.
+1      ESP32, ESP32-S3   SD/MMC       1 or 4 bits.
+2      ESP32, ESP32-S3   `SPI` (id=1) 1 bit.
+3      ESP32, ESP32-S3   `SPI` (id=0) 1 bit.
+====== ================= ============ ========================
+
+.. note:: On the original ESP32, SDMMC slot 0 is unavailable as its pins are
+          used to communicate with on-board flash memory.
+
+.. note:: Most ESP32 modules that provide an SD card slot using the
+          dedicated hardware only wire up 1 data pin, so the default
+          value for ``width`` is 1.
+
+Additional details depend on which ESP32 family chip is in use:
+
+Original ESP32
+~~~~~~~~~~~~~~
+
+Pin assignments in SD/MMC mode are fixed on the original ESP32. When accessing a
+card in SPI mode, pins can be set to different values in the constructor.
+
+The default pin assignments are as follows:
+
+    ====== ====== ====== ====== ============
+    Slot   1      2      3      Can be set
+    ------ ------ ------ ------ ------------
+    Signal   Pin    Pin    Pin
+    ====== ====== ====== ====== ============
+    CLK      14                 No
+    CMD      15                 No
+    D0        2                 No
+    D1        4                 No
+    D2       12                 No
+    D3       13                 No
+    sck             18     14   Yes
+    cs               5     15   Yes
+    miso            19     12   Yes
+    mosi            23     13   Yes
+    ====== ====== ====== ====== ============
+
+The ``cd`` and ``wp`` pins are not fixed in either mode and default to disabled, unless set.
+
+ESP32-S3
+~~~~~~~~
+
+The ESP32-S3 chip allows pins to be set to different values for both SD/MMC and
+SPI mode access.
+
+If not set, default pin assignments are as follows:
+
+    ======== ====== ====== ====== ======
+    Slot     0      1      2      3
+    -------- ------ ------ ------ ------
+    Signal     Pin    Pin    Pin    Pin
+    ======== ====== ====== ====== ======
+    CLK      14     14
+    CMD      15     15
+    D0        2      2
+    D1        4      4
+    D2       12     12
+    D3       13     13
+    D4       33*
+    D5       34*
+    D6       35*
+    D7       36*
+    sck                    37*     14
+    cs                     34*     13
+    miso                   37*      2
+    mosi                   35*     15
+    ======== ====== ====== ====== ======
+
+.. note:: Slots 0 and 1 cannot both be in use at the same time.
+
+.. note:: Pins marked with an asterisk * in the table must be changed from the
+          default if the ESP32-S3 board is configured for Octal SPI Flash or
+          PSRAM.
+
+To access a card in SD/MMC mode, set ``slot`` parameter value 0 or 1 and
+parameters ``sck`` (for CLK), ``cmd`` and ``data`` as needed to assign pins. If
+the ``data`` argument is passed then it should be a list or tuple of data pins
+or pin numbers with length equal to the ``width`` argument. For example::
+
+    sd = SDCard(slot=0, width=4, sck=8, cmd=9, data=(10, 11, 12, 13))
+
+To access a card in SPI mode, set ``slot`` parameter value 2 or 3 and pass
+parameters ``sck``, ``cs``, ``miso``, ``mosi`` as needed to assign pins.
+
+In either mode the ``cd`` and ``wp`` pins default to disabled, unless set in the
+constructor.
 
 cc3200
 ``````
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index da6b0df282caf..48fd96c6d2991 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -177,6 +177,10 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         ARG_mosi,
         ARG_sck,
         ARG_cs,
+        #if SOC_SDMMC_USE_GPIO_MATRIX
+        ARG_cmd,
+        ARG_data,
+        #endif
         ARG_freq,
     };
     static const mp_arg_t allowed_args[] = {
@@ -189,6 +193,11 @@ 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} },
+        // Optional assignment of SDMMC interface pins, if host supports this
+        #if SOC_SDMMC_USE_GPIO_MATRIX
+        { MP_QSTR_cmd,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_data,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        #endif
         // freq is valid for both SPI and SDMMC interfaces
         { MP_QSTR_freq,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 20000000} },
     };
@@ -211,6 +220,11 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         arg_vals[ARG_miso].u_obj, arg_vals[ARG_mosi].u_obj,
         arg_vals[ARG_sck].u_obj, arg_vals[ARG_cs].u_obj);
 
+    #if SOC_SDMMC_USE_GPIO_MATRIX
+    DEBUG_printf("  cmd=%p, data=%p",
+        arg_vals[ARG_cmd].u_obj, arg_vals[ARG_data].u_obj);
+    #endif
+
     int slot_num = arg_vals[ARG_slot].u_int;
     if (slot_num < 0 || slot_num > 3) {
         mp_raise_ValueError(MP_ERROR_TEXT("slot number must be between 0 and 3 inclusive"));
@@ -221,6 +235,13 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
     if (is_spi) {
         slot_num -= 2;
     }
+    // Verify valid argument combinations
+    #if SOC_SDMMC_USE_GPIO_MATRIX
+    if (is_spi && (arg_vals[ARG_cmd].u_obj != mp_const_none
+                   || arg_vals[ARG_data].u_obj != mp_const_none)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid config: SPI slot with SDMMC pin arguments"));
+    }
+    #endif
 
     DEBUG_printf("  Setting up host configuration");
 
@@ -307,6 +328,32 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
             mp_raise_ValueError(MP_ERROR_TEXT("width must be 1 or 4 (or 8 on slot 0)"));
         }
 
+        #if SOC_SDMMC_USE_GPIO_MATRIX
+        // Optionally configure all the SDMMC pins, if chip supports this
+        SET_CONFIG_PIN(slot_config, clk, ARG_sck); // reuse SPI SCK for CLK
+        SET_CONFIG_PIN(slot_config, cmd, ARG_cmd);
+        if (arg_vals[ARG_data].u_obj != mp_const_none) {
+            mp_obj_t *data_vals;
+            size_t data_len;
+            mp_obj_get_array(arg_vals[ARG_data].u_obj, &data_len, &data_vals);
+            if (data_len != width) {
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("data argument length must match width %d"), width);
+            }
+            slot_config.d0 = machine_pin_get_id(data_vals[0]);
+            if (width > 1) {
+                slot_config.d1 = machine_pin_get_id(data_vals[1]);
+                slot_config.d2 = machine_pin_get_id(data_vals[2]);
+                slot_config.d3 = machine_pin_get_id(data_vals[3]);
+            }
+            if (width == 8) {
+                slot_config.d4 = machine_pin_get_id(data_vals[4]);
+                slot_config.d5 = machine_pin_get_id(data_vals[5]);
+                slot_config.d6 = machine_pin_get_id(data_vals[6]);
+                slot_config.d7 = machine_pin_get_id(data_vals[7]);
+            }
+        }
+        #endif
+
         DEBUG_printf("  Calling init_slot()");
         check_esp_err(sdmmc_host_init_slot(self->host.slot, &slot_config));
     }

From c85eefc55b3cc8a460230129e11fb490a0a15f29 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 5 Feb 2025 15:17:27 +1100
Subject: [PATCH 1959/3129] esp32/machine_sdcard: Add SDCard SPI mode support
 for ESP32-S2,C3,C6.

These micros don't have full SDMMC host support, but they can initialise
the SDCard in SPI mode.

A bit limited on C3 and C6 as they only have one host SPI peripheral.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/machine.SDCard.rst |  60 ++++++++++++------
 ports/esp32/machine_sdcard.c    | 104 ++++++++++++++++++++++++--------
 2 files changed, 121 insertions(+), 43 deletions(-)

diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index 62da8c3c2ea61..c4a0d5d172b30 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -77,24 +77,34 @@ ESP32
 `````
 
 SD cards support access in both SD/MMC mode and the simpler (but slower) SPI
-mode. ESP32 and ESP32-S3 chips can access SD cards using either mode. SPI mode
-makes use of a `SPI` host peripheral, which cannot concurrently be used for
-something else.
+mode.
 
-The ``slot`` argument determines which mode is used. Different values are
-available on different chips:
-
-====== ================= ============ ========================
-Slot   Supported chips   Mode         Supported data width
-====== ================= ============ ========================
-0      ESP32-S3          SD/MMC       1, 4, or 8 bits.
-1      ESP32, ESP32-S3   SD/MMC       1 or 4 bits.
-2      ESP32, ESP32-S3   `SPI` (id=1) 1 bit.
-3      ESP32, ESP32-S3   `SPI` (id=0) 1 bit.
-====== ================= ============ ========================
+SPI mode makes use of a `SPI` host peripheral, which cannot concurrently be used
+for other SPI interactions.
 
-.. note:: On the original ESP32, SDMMC slot 0 is unavailable as its pins are
-          used to communicate with on-board flash memory.
+The ``slot`` argument determines which mode is used. Different values are
+supported on different chips:
+
+========== ======== ======== ============ ============
+Chip       Slot 0   Slot 1   Slot 2       Slot 3
+========== ======== ======== ============ ============
+ESP32               SD/MMC   SPI (id=1)   SPI (id=0)
+ESP32-C3                     SPI (id=0)
+ESP32-C6                     SPI (id=0)
+ESP32-S2                     SPI (id=1)   SPI (id=0)
+ESP32-S3   SD/MMC   SD/MMC   SPI (id=1)   SPI (id=0)
+========== ======== ======== ============ ============
+
+Different slots support different data bus widths (number of data pins):
+
+========== ========== =====================
+Slot       Type       Supported data widths
+========== ========== =====================
+0          SD/MMC     1, 4, 8
+1          SD/MMC     1, 4
+2          SPI        1
+3          SPI        1
+========== ========== =====================
 
 .. note:: Most ESP32 modules that provide an SD card slot using the
           dedicated hardware only wire up 1 data pin, so the default
@@ -105,8 +115,9 @@ Additional details depend on which ESP32 family chip is in use:
 Original ESP32
 ~~~~~~~~~~~~~~
 
-Pin assignments in SD/MMC mode are fixed on the original ESP32. When accessing a
-card in SPI mode, pins can be set to different values in the constructor.
+In SD/MMC mode (slot 1), pin assignments in SD/MMC mode are fixed on the
+original ESP32. The SPI mode slots (2 & 3) allow pins to be set to different
+values in the constructor.
 
 The default pin assignments are as follows:
 
@@ -177,6 +188,19 @@ parameters ``sck``, ``cs``, ``miso``, ``mosi`` as needed to assign pins.
 In either mode the ``cd`` and ``wp`` pins default to disabled, unless set in the
 constructor.
 
+Other ESP32 chips
+~~~~~~~~~~~~~~~~~
+
+Other ESP32 family chips do not have hardware SD/MMC host controllers and can
+only access SD cards in SPI mode.
+
+To access a card in SPI mode, set ``slot`` parameter value 2 or 3 and pass
+parameters ``sck``, ``cs``, ``miso``, ``mosi`` to assign pins.
+
+.. note:: ESP32-C3 and ESP32-C6 only have one available `SPI` bus, so the only
+          valid ``slot`` parameter value is 2. Using this bus for the SD card
+          will prevent also using it for :class:`machine.SPI`.
+
 cc3200
 ``````
 
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 48fd96c6d2991..0f8bd844692b4 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -33,7 +33,9 @@
 
 #if MICROPY_HW_ENABLE_SDCARD
 
+#if SOC_SDMMC_HOST_SUPPORTED
 #include "driver/sdmmc_host.h"
+#endif
 #include "driver/sdspi_host.h"
 #include "sdmmc_cmd.h"
 #include "esp_log.h"
@@ -69,18 +71,34 @@ typedef struct _sdcard_obj_t {
 
 #define _SECTOR_SIZE(self) (self->card.csd.sector_size)
 
+// Number SPI buses available for firmware app (including for SD)
+#define NUM_SD_SPI_BUS (SOC_SPI_PERIPH_NUM - 1)
+
+#if CONFIG_IDF_TARGET_ESP32
+#define SD_SLOT_MIN 1
+#elif SOC_SDMMC_HOST_SUPPORTED
+#define SD_SLOT_MIN 0
+#else
+#define SD_SLOT_MIN 2
+#endif
+#define SD_SLOT_MAX (NUM_SD_SPI_BUS + 1) // Inclusive
+
 // SPI bus default bus and device configuration.
 
-static const spi_bus_config_t spi_bus_defaults[2] = {
+static const spi_bus_config_t spi_bus_defaults[NUM_SD_SPI_BUS] = {
     {
         #if CONFIG_IDF_TARGET_ESP32
         .miso_io_num = GPIO_NUM_19,
         .mosi_io_num = GPIO_NUM_23,
         .sclk_io_num = GPIO_NUM_18,
-        #else
+        #elif CONFIG_IDF_TARGET_ESP32S3
         .miso_io_num = GPIO_NUM_36,
         .mosi_io_num = GPIO_NUM_35,
         .sclk_io_num = GPIO_NUM_37,
+        #else
+        .miso_io_num = GPIO_NUM_NC,
+        .mosi_io_num = GPIO_NUM_NC,
+        .sclk_io_num = GPIO_NUM_NC,
         #endif
         .data2_io_num = GPIO_NUM_NC,
         .data3_io_num = GPIO_NUM_NC,
@@ -92,6 +110,7 @@ static const spi_bus_config_t spi_bus_defaults[2] = {
         .flags = SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK | SPICOMMON_BUSFLAG_MISO | SPICOMMON_BUSFLAG_MOSI,
         .intr_flags = 0,
     },
+    #if NUM_SD_SPI_BUS > 1
     {
         .miso_io_num = GPIO_NUM_2,
         .mosi_io_num = GPIO_NUM_15,
@@ -106,28 +125,34 @@ static const spi_bus_config_t spi_bus_defaults[2] = {
         .flags = SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK | SPICOMMON_BUSFLAG_MISO | SPICOMMON_BUSFLAG_MOSI,
         .intr_flags = 0,
     },
+    #endif
 };
 
 #if CONFIG_IDF_TARGET_ESP32
-static const uint8_t spi_dma_channel_defaults[2] = {
+static const uint8_t spi_dma_channel_defaults[NUM_SD_SPI_BUS] = {
     2,
     1,
 };
 #endif
 
-static const sdspi_device_config_t spi_dev_defaults[2] = {
+static const sdspi_device_config_t spi_dev_defaults[NUM_SD_SPI_BUS] = {
+    #if NUM_SD_SPI_BUS > 1
     {
         #if CONFIG_IDF_TARGET_ESP32
         .host_id = VSPI_HOST,
         .gpio_cs = GPIO_NUM_5,
-        #else
+        #elif CONFIG_IDF_TARGET_ESP32S3
         .host_id = SPI3_HOST,
         .gpio_cs = GPIO_NUM_34,
+        #else
+        .host_id = SPI3_HOST,
+        .gpio_cs = GPIO_NUM_NC,
         #endif
         .gpio_cd = SDSPI_SLOT_NO_CD,
         .gpio_wp = SDSPI_SLOT_NO_WP,
         .gpio_int = SDSPI_SLOT_NO_INT,
     },
+    #endif
     SDSPI_DEVICE_CONFIG_DEFAULT(), // HSPI (ESP32) / SPI2 (ESP32S3)
 };
 
@@ -159,12 +184,15 @@ static esp_err_t sdcard_ensure_card_init(sdcard_card_obj_t *self, bool force) {
 // Expose the SD card or MMC as an object with the block protocol.
 
 // Create a new SDCard object
-// The driver supports either the host SD/MMC controller (default) or SPI mode
-// In both cases there are two "slots". Slot 0 on the SD/MMC controller is
-// typically tied up with the flash interface in most ESP32 modules but in
-// theory supports 1, 4 or 8-bit transfers. Slot 1 supports only 1 and 4-bit
-// transfers. Only 1-bit is supported on the SPI interfaces.
-// card = SDCard(slot=1, width=None, present_pin=None, wp_pin=None)
+//
+// SD/MMC or SPI mode is determined by the slot argument
+// 0,1 is SD/MMC mode where supported.
+// 2,3 is SPI mode where supported (1-bit only)
+//
+// Original ESP32 can't use 0
+// ESP32-C3/C6/etc can only use 2 (only one SPI bus, no SD/MMC controller)
+//
+// Consult machine.SDCard docs for more details.
 
 static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check arguments
@@ -183,8 +211,13 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         #endif
         ARG_freq,
     };
+    #if SOC_SDMMC_HOST_SUPPORTED
+    static const int DEFAULT_SLOT = 1;
+    #else
+    static const int DEFAULT_SLOT = SD_SLOT_MAX;
+    #endif
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_slot,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
+        { MP_QSTR_slot,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SLOT} },
         { MP_QSTR_width,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
         { MP_QSTR_cd,       MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_wp,       MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -226,15 +259,21 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
     #endif
 
     int slot_num = arg_vals[ARG_slot].u_int;
-    if (slot_num < 0 || slot_num > 3) {
-        mp_raise_ValueError(MP_ERROR_TEXT("slot number must be between 0 and 3 inclusive"));
+    if (slot_num < SD_SLOT_MIN || slot_num > SD_SLOT_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid slot number"));
     }
 
+    #if SOC_SDMMC_HOST_SUPPORTED
     // Slots 0 and 1 are native SD/MMC, slots 2 and 3 are SPI
     bool is_spi = (slot_num >= 2);
+    #else
+    bool is_spi = true;
+    #endif
     if (is_spi) {
         slot_num -= 2;
+        assert(slot_num < NUM_SD_SPI_BUS);
     }
+
     // Verify valid argument combinations
     #if SOC_SDMMC_USE_GPIO_MATRIX
     if (is_spi && (arg_vals[ARG_cmd].u_obj != mp_const_none
@@ -242,6 +281,13 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         mp_raise_ValueError(MP_ERROR_TEXT("invalid config: SPI slot with SDMMC pin arguments"));
     }
     #endif
+    #if SOC_SDMMC_HOST_SUPPORTED
+    if (!is_spi && (arg_vals[ARG_miso].u_obj != mp_const_none
+                    || arg_vals[ARG_mosi].u_obj != mp_const_none
+                    || arg_vals[ARG_cs].u_obj != mp_const_none)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid config: SDMMC slot with SPI pin arguments"));
+    }
+    #endif
 
     DEBUG_printf("  Setting up host configuration");
 
@@ -253,21 +299,17 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
     if (is_spi) {
         sdmmc_host_t _temp_host = SDSPI_HOST_DEFAULT();
         _temp_host.max_freq_khz = freq / 1000;
+        // SPI SDMMC sets the slot to the SPI host ID
+        _temp_host.slot = spi_dev_defaults[slot_num].host_id;
         self->host = _temp_host;
-    } else {
+    }
+    #if SOC_SDMMC_HOST_SUPPORTED
+    else {
         sdmmc_host_t _temp_host = SDMMC_HOST_DEFAULT();
         _temp_host.max_freq_khz = freq / 1000;
         self->host = _temp_host;
     }
-
-    if (is_spi) {
-        // Needs to match spi_dev_defaults above.
-        #if CONFIG_IDF_TARGET_ESP32
-        self->host.slot = slot_num ? HSPI_HOST : VSPI_HOST;
-        #else
-        self->host.slot = slot_num ? SPI2_HOST : SPI3_HOST;
-        #endif
-    }
+    #endif
 
     DEBUG_printf("  Calling host.init()");
 
@@ -294,6 +336,15 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         SET_CONFIG_PIN(dev_config, gpio_cd, ARG_cd);
         SET_CONFIG_PIN(dev_config, gpio_wp, ARG_wp);
 
+        // On chips other than original ESP32 and S3, there are not
+        // always default SPI pins assigned
+        if (dev_config.gpio_cs == GPIO_NUM_NC
+            || bus_config.miso_io_num == GPIO_NUM_NC
+            || bus_config.mosi_io_num == GPIO_NUM_NC
+            || bus_config.sclk_io_num == GPIO_NUM_NC) {
+            mp_raise_ValueError(MP_ERROR_TEXT("SPI pin values required"));
+        }
+
         DEBUG_printf("  Calling spi_bus_initialize()");
         check_esp_err(spi_bus_initialize(spi_host_id, &bus_config, dma_channel));
 
@@ -309,7 +360,9 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
             spi_bus_free(spi_host_id);
             mp_raise_ValueError(MP_ERROR_TEXT("SPI bus already in use"));
         }
-    } else {
+    }
+    #if SOC_SDMMC_HOST_SUPPORTED
+    else {
         // SD/MMC interface
         DEBUG_printf("  Setting up SDMMC slot configuration");
         sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
@@ -357,6 +410,7 @@ static mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         DEBUG_printf("  Calling init_slot()");
         check_esp_err(sdmmc_host_init_slot(self->host.slot, &slot_config));
     }
+    #endif // SOC_SDMMC_HOST_SUPPORTED
 
     DEBUG_printf("  Returning new card object: %p", self);
     return MP_OBJ_FROM_PTR(self);

From 464121f30158e769b4bcd4e0187f9fc58b6e09d9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 5 Feb 2025 18:17:02 +1100
Subject: [PATCH 1960/3129] esp32/boards: Enable machine.SDCard on all boards.

This increases binary size by about 4KB on C3, probably a bit less on S2.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h | 2 --
 ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h | 1 -
 ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h | 1 -
 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h    | 2 --
 ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h    | 1 -
 ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h    | 1 -
 ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h   | 1 -
 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h     | 1 -
 ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h  | 1 -
 ports/esp32/boards/UM_TINYC6/mpconfigboard.h        | 1 -
 ports/esp32/boards/UM_TINYS2/mpconfigboard.h        | 1 -
 11 files changed, 13 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
index a6cebdf6ee64f..988c7db8a144b 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.h
@@ -3,7 +3,5 @@
 #define MICROPY_HW_BOARD_NAME               "ESP32C3 module"
 #define MICROPY_HW_MCU_NAME                 "ESP32C3"
 
-#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/ESP32_GENERIC_C6/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
index be530ad3a87ba..d6cc9a6f67855 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_HW_BOARD_NAME               "ESP32C6 module"
 #define MICROPY_HW_MCU_NAME                 "ESP32C6"
 
-#define MICROPY_HW_ENABLE_SDCARD            (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
 
 // Enable UART REPL for modules that have an external USB-UART and don't use native USB.
diff --git a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h
index aaea41bcdec2b..9e03e8269b1b8 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.h
@@ -2,7 +2,6 @@
 #define MICROPY_HW_MCU_NAME "ESP32S2"
 
 #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/LOLIN_C3_MINI/mpconfigboard.h b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
index 46d720edc758f..9eb0bada1ee59 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
@@ -2,8 +2,6 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32-C3FH4"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-c3-mini"
 
-#define MICROPY_HW_ENABLE_SDCARD            (0)
-
 #define MICROPY_HW_I2C0_SCL                 (10)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h
index 9776b7b478aa1..08badc3845737 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-s2-mini"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
 
 #define MICROPY_HW_I2C0_SCL                 (35)
 #define MICROPY_HW_I2C0_SDA                 (33)
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h
index 9241280dec6a3..07db116c28471 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-s2-pico"
 
 #define MICROPY_PY_BLUETOOTH     (0)
-#define MICROPY_HW_ENABLE_SDCARD (0)
 
 #define MICROPY_HW_I2C0_SCL      (9)
 #define MICROPY_HW_I2C0_SDA      (8)
diff --git a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
index 9acab7096853b..656ec0bc6c3c5 100644
--- a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
@@ -1,7 +1,6 @@
 #define MICROPY_HW_BOARD_NAME    "M5Stack NanoC6"
 #define MICROPY_HW_MCU_NAME      "ESP32C6"
 
-#define MICROPY_HW_ENABLE_SDCARD (0)
 #define MICROPY_PY_MACHINE_I2S   (0)
 
 #define MICROPY_HW_I2C0_SCL      (1)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
index d8529b6342fe2..a2a00c0e46c0e 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "FeatherS2"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
 
 #define MICROPY_HW_I2C0_SCL (9)
 #define MICROPY_HW_I2C0_SDA (8)
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h
index e7e4d37ece95a..bcc809895d12f 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "FeatherS2-Neo"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
 
 #define MICROPY_HW_I2C0_SCL (9)
 #define MICROPY_HW_I2C0_SDA (8)
diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.h b/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
index 1a3f1c904a799..09392d55594a0 100644
--- a/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
@@ -1,7 +1,6 @@
 #define MICROPY_HW_BOARD_NAME    "Unexpected Maker TinyC6"
 #define MICROPY_HW_MCU_NAME      "ESP32C6"
 
-#define MICROPY_HW_ENABLE_SDCARD (0)
 #define MICROPY_PY_MACHINE_I2S   (0)
 
 #define MICROPY_HW_I2C0_SCL      (7)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
index e0bde417c8a2a..ecfb0056b43b0 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
@@ -3,7 +3,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "TinyS2"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
 
 #define MICROPY_HW_I2C0_SCL (9)
 #define MICROPY_HW_I2C0_SDA (8)

From bfd974d65823c5ab4be1a2d0934d7392a5fa3069 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Fri, 6 Dec 2024 13:20:34 +0800
Subject: [PATCH 1961/3129] esp32/machine_pwm: Correctly stop LEDC timer.

The ESP32 PWM (LEDC) timer wasn't correctly stopped.  `ledc_timer_rst()` is
for resetting the timer counter to zero, not for stopping the timer.

The correct way to stop a pwm timer is to pause it, then configure it with
`deconfigure = true`.

Signed-off-by: garywill <garywill@disroot.org>
---
 ports/esp32/machine_pwm.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 6e3610b156679..7826769556c98 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -156,7 +156,13 @@ static void pwm_deinit(int channel_idx) {
         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)));
+                check_esp_err(ledc_timer_pause(TIMER_IDX_TO_MODE(timer_idx), TIMER_IDX_TO_TIMER(timer_idx)));
+                ledc_timer_config_t timer_config = {
+                    .deconfigure = true,
+                    .speed_mode = TIMER_IDX_TO_MODE(timer_idx),
+                    .timer_num = TIMER_IDX_TO_TIMER(timer_idx),
+                };
+                check_esp_err(ledc_timer_config(&timer_config));
                 // Flag it unused
                 timers[chans[channel_idx].timer_idx].freq_hz = -1;
             }
@@ -635,7 +641,13 @@ static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
 
         if (!current_in_use) {
             // Free the old timer
-            check_esp_err(ledc_timer_rst(self->mode, self->timer));
+            check_esp_err(ledc_timer_pause(self->mode, self->timer));
+            ledc_timer_config_t timer_config = {
+                .deconfigure = true,
+                .speed_mode = self->mode,
+                .timer_num = self->timer,
+            };
+            check_esp_err(ledc_timer_config(&timer_config));
             // Flag it unused
             timers[current_timer_idx].freq_hz = -1;
         }

From 4d2d60d6e1422dc5a66f15f7e48e3ebad2dfc41c Mon Sep 17 00:00:00 2001
From: Garry W <32130780+garywill@users.noreply.github.com>
Date: Thu, 14 Nov 2024 04:19:31 +0000
Subject: [PATCH 1962/3129] esp32/machine_pin: Fix logic clearing
 USB_SERIAL_JTAG_USB_PAD_ENABLE.

When we don't use USB JTAG, we want to use the two USB pins (D+/D-) as
GPIO. So, do clear USB_SERIAL_JTAG_USB_PAD_ENABLE when USB SERIAL JTAG is
not enabled

Signed-off-by: Garry W <32130780+garywill@users.noreply.github.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 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 b821abf1fc18a..bb0d40c4d82ed 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -158,12 +158,12 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         }
     }
 
-    #if CONFIG_IDF_TARGET_ESP32C3 && MICROPY_HW_ESP_USB_SERIAL_JTAG
+    #if CONFIG_IDF_TARGET_ESP32C3 && !MICROPY_HW_ESP_USB_SERIAL_JTAG
     if (index == 18 || index == 19) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
-    #if CONFIG_IDF_TARGET_ESP32C6 && CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if CONFIG_IDF_TARGET_ESP32C6 && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
     if (index == 12 || index == 13) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }

From 1d5dc723b40d978b84da2f9b1a48e880777385ea Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 15 Nov 2024 15:48:52 +1100
Subject: [PATCH 1963/3129] esp32/machine_pin: Fix availability of USB
 Serial/JTAG pins on ESP32-C6.

Similar to parent commit, allow using USB Serial/JTAG pins for other
purposes but only if this feature is disabled in the build config.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_pin.c | 2 +-
 ports/esp32/machine_pin.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index bb0d40c4d82ed..d0c4ee1a7eca7 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -163,7 +163,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
-    #if CONFIG_IDF_TARGET_ESP32C6 && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if CONFIG_IDF_TARGET_ESP32C6 && !MICROPY_HW_ESP_USB_SERIAL_JTAG
     if (index == 12 || index == 13) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
index 3f94508e015f8..47f1ddebebf44 100644
--- a/ports/esp32/machine_pin.h
+++ b/ports/esp32/machine_pin.h
@@ -108,7 +108,7 @@
 #define MICROPY_HW_ENABLE_GPIO9 (1)
 #define MICROPY_HW_ENABLE_GPIO10 (1)
 #define MICROPY_HW_ENABLE_GPIO11 (1)
-#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#if !MICROPY_HW_ESP_USB_SERIAL_JTAG
 #define MICROPY_HW_ENABLE_GPIO12 (1)
 #define MICROPY_HW_ENABLE_GPIO13 (1)
 #endif

From e75ffc3bccb8b213704f0ddd2ce82731ab2069ba Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Tue, 11 Mar 2025 10:50:22 +0000
Subject: [PATCH 1964/3129] rp2/modrp2: Fix rp2.bootsel_button() function for
 RP2350.

Co-authored-by: graham sanderson <graham.sanderson@raspberrypi.com>
Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/modrp2.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index c90b6d5840208..5a43c11e71928 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -42,11 +42,17 @@
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj);
 #endif
 
+#define CS_PIN_INDEX 1
+
+#if PICO_RP2040
+#define CS_BIT (1u << CS_PIN_INDEX)
+#else
+#define CS_BIT SIO_GPIO_HI_IN_QSPI_CSN_BITS
+#endif
+
 // Improved version of
 // https://github.com/raspberrypi/pico-examples/blob/master/picoboard/button/button.c
 static bool __no_inline_not_in_flash_func(bootsel_button)(void) {
-    const uint CS_PIN_INDEX = 1;
-
     // Disable interrupts and the other core since they might be
     // executing code from flash and we are about to temporarily
     // disable flash access.
@@ -65,7 +71,7 @@ static bool __no_inline_not_in_flash_func(bootsel_button)(void) {
 
     // The HI GPIO registers in SIO can observe and control the 6 QSPI pins.
     // The button pulls the QSPI_SS pin *low* when pressed.
-    bool button_state = !(sio_hw->gpio_hi_in & (1 << CS_PIN_INDEX));
+    bool button_state = !(sio_hw->gpio_hi_in & CS_BIT);
 
     // Restore the QSPI_SS pin so we can use flash again.
     hw_write_masked(&ioqspi_hw->io[CS_PIN_INDEX].ctrl,

From 9a070fee343bb1f96b908ce3bb3032a8ec86c904 Mon Sep 17 00:00:00 2001
From: Alex Brudner <alex.brudner@sparkfun.com>
Date: Mon, 3 Mar 2025 17:09:56 -0700
Subject: [PATCH 1965/3129] rp2/boards/SPARKFUN_IOTREDBOARD_RP2350: Add support
 for IoT RedBoard.

Signed-off-by: Alex Brudner <alex.brudner@sparkfun.com>
Signed-off-by: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
---
 .../SPARKFUN_IOTREDBOARD_RP2350/board.json    |  26 +++
 .../SPARKFUN_IOTREDBOARD_RP2350/manifest.py   |   7 +
 .../mpconfigboard.cmake                       |  20 ++
 .../mpconfigboard.h                           |  61 ++++++
 .../mpconfigvariant.cmake                     |   1 +
 .../mpconfigvariant_RISCV.cmake               |   1 +
 .../SPARKFUN_IOTREDBOARD_RP2350/pins.csv      |  70 +++++++
 .../sparkfun_iotredboard_rp2350.h             | 183 ++++++++++++++++++
 8 files changed, 369 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/manifest.py
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant_RISCV.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/pins.csv
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/sparkfun_iotredboard_rp2350.h

diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json
new file mode 100644
index 0000000000000..a0dd4d835a1bc
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json
@@ -0,0 +1,26 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "USB-C",
+        "WiFi",
+        "External RAM",
+        "microSD",
+        "RGB LED",
+        "JST-SH",
+        "Battery Charging"
+    ],
+    "images": [
+        "27708-IoT-RedBoard-RP2350-Feature.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "SparkFun IoT RedBoard RP2350",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/sparkfun-iot-redboard-rp2350.html",
+    "vendor": "SparkFun"
+}
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/manifest.py b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/manifest.py
new file mode 100644
index 0000000000000..b1670d6804495
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/manifest.py
@@ -0,0 +1,7 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
+
+require("aioble")
+
+require("sdcard")
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.cmake
new file mode 100644
index 0000000000000..beefc90db6557
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.cmake
@@ -0,0 +1,20 @@
+# cmake file for SparkFun IoT RedBoard RP2350
+
+# TODO: DELETE THIS LINE WHEN SUBMODULED PICO-SDK INCLUDES THIS BOARD
+set(PICO_BOARD_HEADER_DIRS ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
+
+set(PICO_BOARD "sparkfun_iotredboard_rp2350")
+set(PICO_PLATFORM "rp2350")
+
+set(PICO_NUM_GPIOS 48)
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.h
new file mode 100644
index 0000000000000..34d08b0bec4b3
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigboard.h
@@ -0,0 +1,61 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "SparkFun IoT RedBoard RP2350"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - 1536 * 1024)
+
+// Enable networking.
+#define MICROPY_PY_NETWORK 1
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "IoTRedBoardRP2350"
+
+#define CYW43_USE_SPI (1)
+#define CYW43_LWIP (1)
+#define CYW43_GPIO (1)
+#define CYW43_SPI_PIO (1)
+
+// USB VID/PID
+#define MICROPY_HW_USB_VID (0x1B4F)
+#define MICROPY_HW_USB_PID (0x0047)
+
+// UART0
+#define MICROPY_HW_UART0_TX  (0)
+#define MICROPY_HW_UART0_RX  (1)
+#define MICROPY_HW_UART0_CTS (30)
+#define MICROPY_HW_UART0_RTS (31)
+
+// UART1
+#define MICROPY_HW_UART1_TX  (40)
+#define MICROPY_HW_UART1_RX  (41)
+#define MICROPY_HW_UART1_CTS (42)
+#define MICROPY_HW_UART1_RTS (43)
+
+// I2C0
+#define MICROPY_HW_I2C0_SCL  (5)
+#define MICROPY_HW_I2C0_SDA  (4)
+
+// I2C1
+#define MICROPY_HW_I2C1_SCL  (31)
+#define MICROPY_HW_I2C1_SDA  (30)
+
+// SPI0
+#define MICROPY_HW_SPI0_SCK  (22)
+#define MICROPY_HW_SPI0_MOSI (23)
+#define MICROPY_HW_SPI0_MISO (20)
+
+// SD Card/SPI1
+#define MICROPY_HW_SPI1_SCK  (10)
+#define MICROPY_HW_SPI1_MOSI (11)
+#define MICROPY_HW_SPI1_MISO (8)
+
+// PSRAM
+#define MICROPY_HW_PSRAM_CS_PIN (47)
+#define MICROPY_HW_ENABLE_PSRAM (1)
+
+// #include "enable_cyw43.h"
+
+// 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_EXT_COUNT    CYW43_WL_GPIO_COUNT
+
+int mp_hal_is_pin_reserved(int n);
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant.cmake b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/pins.csv b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/pins.csv
new file mode 100644
index 0000000000000..d8d98e1ada9ef
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/pins.csv
@@ -0,0 +1,70 @@
+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
+GP23,GPIO23
+GP25,GPIO25
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+GP29,GPIO29
+GP30,GPIO30
+GP31,GPIO31
+GP32,GPIO32
+GP33,GPIO33
+GP34,GPIO34
+GP35,GPIO35
+GP39,GPIO39
+GP40,GPIO40
+GP41,GPIO41
+GP42,GPIO42
+GP43,GPIO43
+GP44,GPIO44
+GP45,GPIO45
+WL_GPIO0,EXT_GPIO0
+WL_GPIO1,EXT_GPIO1
+WL_GPIO2,EXT_GPIO2
+WL_LED,EXT_GPIO0
+SD_DET,GPIO2
+RGB_LED,GPIO3
+NEOPIXEL,GPIO3
+B_ALRT,GPIO6
+PERIPH_POWER,GPIO7
+HSTX0,GPIO12
+HSTX1,GPIO13
+HSTX2,GPIO14
+HSTX3,GPIO15
+HSTX4,GPIO16
+HSTX5,GPIO17
+HSTX6,GPIO18
+HSTX7,GPIO19
+LED,GPIO25
+STAT,GPIO25
+SRC_5V,GPIO26
+BATT_PWR,GPIO27
+USER_SW,GPIO39
+A0,GPIO40
+A1,GPIO41
+A2,GPIO42
+A3,GPIO43
+A4,GPIO44
+A5,GPIO45
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/sparkfun_iotredboard_rp2350.h b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/sparkfun_iotredboard_rp2350.h
new file mode 100644
index 0000000000000..ac0972eb226a6
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/sparkfun_iotredboard_rp2350.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2024 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+// Board definition for the SparkFun IoT RedBoard - RP2350
+//
+// This header may be included by other board headers as "boards/sparkfun_iotredboard_rp2350.h"
+
+// pico_cmake_set PICO_PLATFORM=rp2350
+// pico_cmake_set PICO_CYW43_SUPPORTED = 1
+
+#ifndef _BOARDS_SPARKFUN_IOTREDBOARD_RP2350_H
+#define _BOARDS_SPARKFUN_IOTREDBOARD_RP2350_H
+
+// For board detection
+#define SPARKFUN_IOTREDBOARD_RP2350
+
+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 0 // 1 for RP2350A, 0 for RP2350B
+
+// --- BOARD SPECIFIC ---
+#define SPARKFUN_IOTREDBOARD_RP2350_USER_SW_PIN 39
+#define SPARKFUN_IOTREDBOARD_RP2350_PSRAM_CS_PIN 47
+
+
+// --- 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
+
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 3
+#endif
+
+// --- I2C --- Qwiic connector is on these pins
+#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 22
+#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_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 21
+#endif
+
+// --- FLASH ---
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#endif
+
+// The IoT RedBoard has an SD Card.
+#ifndef PICO_SD_CLK_PIN
+#define PICO_SD_CLK_PIN 10
+#endif
+#ifndef PICO_SD_CMD_PIN
+#define PICO_SD_CMD_PIN 11
+#endif
+#ifndef PICO_SD_DAT0_PIN
+#define PICO_SD_DAT0_PIN 8
+#endif
+#ifndef PICO_SD_DAT3_PIN
+#define PICO_SD_DAT3_PIN 9 // DAT3 of the SD card is the chip select pin
+#endif
+#ifndef PICO_SD_DAT_PIN_COUNT
+#define PICO_SD_DAT_PIN_COUNT 1
+#endif
+
+// The GPIO Pin used to monitor VSYS. Typically you would use this with ADC.
+// There is an example in adc/read_vsys in pico-examples.
+#ifndef PICO_VSYS_PIN
+#define PICO_VSYS_PIN 46
+#endif
+
+// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+#ifndef PICO_RP2350_A2_SUPPORTED
+#define PICO_RP2350_A2_SUPPORTED 1
+#endif
+
+// Bootloader activity LED in double reset mode.
+#ifndef PICO_BOOTSEL_VIA_DOUBLE_RESET_ACTIVITY_LED
+#define PICO_BOOTSEL_VIA_DOUBLE_RESET_ACTIVITY_LED PICO_DEFAULT_LED_PIN
+#endif
+
+// Bootloader activity LED in USB reset mode.
+#ifndef PICO_STDIO_USB_RESET_BOOTSEL_ACTIVITY_LED
+#define PICO_STDIO_USB_RESET_BOOTSEL_ACTIVITY_LED PICO_DEFAULT_LED_PIN
+#endif
+
+// --- CYW43 ---
+
+#ifndef CYW43_WL_GPIO_COUNT
+#define CYW43_WL_GPIO_COUNT 3
+#endif
+
+#ifndef CYW43_WL_GPIO_LED_PIN
+#define CYW43_WL_GPIO_LED_PIN 0
+#endif
+
+// If CYW43_WL_GPIO_VBUS_PIN is defined then a CYW43 GPIO has to be used to read VBUS.
+// This can be passed to cyw43_arch_gpio_get to determine if the device is battery powered.
+// PICO_VBUS_PIN and CYW43_WL_GPIO_VBUS_PIN should not both be defined.
+#ifndef CYW43_WL_GPIO_VBUS_PIN
+#define CYW43_WL_GPIO_VBUS_PIN 2
+#endif
+
+// cyw43 SPI pins can't be changed at runtime
+#ifndef CYW43_PIN_WL_DYNAMIC
+#define CYW43_PIN_WL_DYNAMIC 0
+#endif
+
+// gpio pin to power up the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_REG_ON
+#define CYW43_DEFAULT_PIN_WL_REG_ON 24u
+#endif
+
+// gpio pin for spi data out to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_OUT
+#define CYW43_DEFAULT_PIN_WL_DATA_OUT 38u
+#endif
+
+// gpio pin for spi data in from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_IN
+#define CYW43_DEFAULT_PIN_WL_DATA_IN 38u
+#endif
+
+// gpio (irq) pin for the irq line from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_HOST_WAKE
+#define CYW43_DEFAULT_PIN_WL_HOST_WAKE 38u
+#endif
+
+// gpio pin for the spi clock line to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CLOCK
+#define CYW43_DEFAULT_PIN_WL_CLOCK 37u
+#endif
+
+// gpio pin for the spi chip select to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CS
+#define CYW43_DEFAULT_PIN_WL_CS 36u
+#endif
+
+#endif // _BOARDS_SPARKFUN_IOTREDBOARD_RP2350_H

From 8dcf9290f85c98695866e6656bf9a2653c490828 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sat, 8 Mar 2025 19:24:09 +1100
Subject: [PATCH 1966/3129] rp2/boards/WEACTSTUDIO_RP2350B_CORE: Add WeAct
 Studio RP2350B Core.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 .../WEACTSTUDIO_RP2350B_CORE/board.json       | 23 ++++++++
 .../WEACTSTUDIO_RP2350B_CORE/manifest.py      |  1 +
 .../mpconfigboard.cmake                       | 13 +++++
 .../WEACTSTUDIO_RP2350B_CORE/mpconfigboard.h  | 16 +++++
 .../mpconfigvariant.cmake                     |  2 +
 .../mpconfigvariant_RISCV.cmake               |  2 +
 .../boards/WEACTSTUDIO_RP2350B_CORE/pins.csv  | 48 +++++++++++++++
 .../weactstudio_rp2350b_core.h                | 58 +++++++++++++++++++
 8 files changed, 163 insertions(+)
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/board.json
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/manifest.py
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.h
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant_RISCV.cmake
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/pins.csv
 create mode 100644 ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/weactstudio_rp2350b_core.h

diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/board.json b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/board.json
new file mode 100644
index 0000000000000..bd280820fd3bb
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Dual-core",
+        "External Flash",
+        "External RAM",
+        "USB-C"
+    ],
+    "images": [
+        "weactstudio_rp2350_core.png"
+    ],
+    "mcu": "rp2350",
+    "product": "RP2350B Core",
+    "thumbnail": "",
+    "url": "https://github.com/WeActStudio/WeActStudio.RP2350BCoreBoard",
+    "variants": {
+        "RISCV": "RISC V"
+    },
+    "vendor": "WeAct Studio"
+}
diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/manifest.py b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/manifest.py
new file mode 100644
index 0000000000000..832942f052606
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/manifest.py
@@ -0,0 +1 @@
+include("$(PORT_DIR)/boards/manifest.py")
diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.cmake b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.cmake
new file mode 100644
index 0000000000000..f03452c6273dc
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.cmake
@@ -0,0 +1,13 @@
+# CMake file for WeAct Studio RP2350B Core
+
+# The Core is powered by an RP2350B with 48 GPIOs
+set(PICO_NUM_GPIOS 48)
+
+# The WeAct Studio boards don't have official pico-sdk support.
+# So, add this board directory to the header search path and define PICO_BOARD
+# which will instruct pico-sdk to look for weactstudio_rp2350b_core.h
+list(APPEND PICO_BOARD_HEADER_DIRS ${MICROPY_BOARD_DIR})
+set(PICO_BOARD "weactstudio_rp2350b_core")
+
+# Freeze manifest and modules
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.h b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.h
new file mode 100644
index 0000000000000..1f0963db85c47
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigboard.h
@@ -0,0 +1,16 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME "WeAct Studio RP2350B Core"
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (2 * 1024 * 1024))
+
+// TODO: Split PSRAM option off as a variant
+#define MICROPY_HW_PSRAM_CS_PIN (0)
+#define MICROPY_HW_ENABLE_PSRAM (0)
+
+// Override machine_uart.c definitions.
+// See weactstudio_rp2350b.h and note that the PICO_DEFAULT_UART configuration
+// is not currently referenced in machine_uart.c.
+#define MICROPY_HW_UART0_TX     (16)
+#define MICROPY_HW_UART0_RX     (17)
+#define MICROPY_HW_UART0_CTS    (-1)
+#define MICROPY_HW_UART0_RTS    (-1)
diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant.cmake b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..531c91524402b
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant.cmake
@@ -0,0 +1,2 @@
+# Set the ARM-based RP2350 platform
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..9f62e459aa053
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/mpconfigvariant_RISCV.cmake
@@ -0,0 +1,2 @@
+# Set the RISC-V-based RP2350 platform
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/pins.csv b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/pins.csv
new file mode 100644
index 0000000000000..50d0de8560a33
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/pins.csv
@@ -0,0 +1,48 @@
+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
+GP29,GPIO29
+GP30,GPIO30
+GP31,GPIO31
+GP32,GPIO32
+GP33,GPIO33
+GP34,GPIO34
+GP35,GPIO35
+GP36,GPIO36
+GP37,GPIO37
+GP38,GPIO38
+GP39,GPIO39
+GP40,GPIO40
+GP41,GPIO41
+GP42,GPIO42
+GP43,GPIO43
+GP44,GPIO44
+GP45,GPIO45
+GP46,GPIO46
+GP47,GPIO47
+KEY,GPIO23
+LED,GPIO25
diff --git a/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/weactstudio_rp2350b_core.h b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/weactstudio_rp2350b_core.h
new file mode 100644
index 0000000000000..bb00ff2827518
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO_RP2350B_CORE/weactstudio_rp2350b_core.h
@@ -0,0 +1,58 @@
+#ifndef _BOARDS_WEACTSTUDIO_RP2350B_CORE_COMMON_H
+#define _BOARDS_WEACTSTUDIO_RP2350B_CORE_COMMON_H
+
+// --- LED ---
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN 25
+#endif
+
+// Note: Avoid using Pin 0 for any default peripheral since it can be used for
+// extra PSRAM/flash
+
+// --- UART ---
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 12
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 13
+#endif
+
+// --- I2C ---
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C 0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN 8
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN 9
+#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 configuration
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+#endif

From ac30dcb20cbe3cab73133623adc3a0dfff77dd20 Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Mon, 10 Mar 2025 17:34:47 -0600
Subject: [PATCH 1967/3129] rp2/boards/SPARKFUN_XRP_CONTROLLER: Add SparkFun
 XRP Controller.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 .../boards/SPARKFUN_XRP_CONTROLLER/board.json |  25 ++++
 .../SPARKFUN_XRP_CONTROLLER/manifest.py       |   6 +
 .../mpconfigboard.cmake                       |  20 +++
 .../SPARKFUN_XRP_CONTROLLER/mpconfigboard.h   |  52 +++++++
 .../boards/SPARKFUN_XRP_CONTROLLER/pins.csv   |  84 +++++++++++
 .../sparkfun_xrp_controller.h                 | 133 ++++++++++++++++++
 6 files changed, 320 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/manifest.py
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/pins.csv
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/sparkfun_xrp_controller.h

diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
new file mode 100644
index 0000000000000..92486564b1067
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "Dual-core",
+        "External Flash",
+        "External RAM",
+        "IMU",
+        "JST-SH",
+        "RGB LED",
+        "USB-C",
+        "WiFi"
+    ],
+    "images": [
+        "26619-XRP-Controller-Board-Feature.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "XRP Controller",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/sparkfun-experiential-robotics-platform-xrp-controller.html",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/manifest.py b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/manifest.py
new file mode 100644
index 0000000000000..4e38f09cdee4f
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/manifest.py
@@ -0,0 +1,6 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
+
+# Bluetooth
+require("aioble")
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.cmake
new file mode 100644
index 0000000000000..2af12f81382d0
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.cmake
@@ -0,0 +1,20 @@
+# cmake file for SparkFun XRP Controller
+
+# TODO: DELETE THIS LINE WHEN SUBMODULED PICO-SDK INCLUDES THIS BOARD
+set(PICO_BOARD_HEADER_DIRS ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
+
+set(PICO_BOARD "sparkfun_xrp_controller")
+set(PICO_PLATFORM "rp2350")
+
+set(PICO_NUM_GPIOS 48)
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.h
new file mode 100644
index 0000000000000..13f04b92d7965
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigboard.h
@@ -0,0 +1,52 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME          "SparkFun XRP Controller"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - 1536 * 1024)
+
+// Enable networking.
+#define MICROPY_PY_NETWORK 1
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "XRP"
+
+// 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_EXT_COUNT    CYW43_WL_GPIO_COUNT
+
+int mp_hal_is_pin_reserved(int n);
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
+
+#define MICROPY_HW_USB_VID (0x1B4F)
+#define MICROPY_HW_USB_PID (0x0046)
+
+#define MICROPY_HW_I2C0_SDA  (4)
+#define MICROPY_HW_I2C0_SCL  (5)
+
+#define MICROPY_HW_I2C1_SDA  (38)
+#define MICROPY_HW_I2C1_SCL  (39)
+
+#define MICROPY_HW_SPI0_SCK  (18)
+#define MICROPY_HW_SPI0_MOSI (19)
+#define MICROPY_HW_SPI0_MISO (16)
+
+#define MICROPY_HW_SPI1_SCK  (14)
+#define MICROPY_HW_SPI1_MOSI (15)
+#define MICROPY_HW_SPI1_MISO (12)
+
+#define MICROPY_HW_UART0_TX (12)
+#define MICROPY_HW_UART0_RX (13)
+#define MICROPY_HW_UART0_CTS (14)
+#define MICROPY_HW_UART0_RTS (15)
+
+#define MICROPY_HW_UART1_TX (8)
+#define MICROPY_HW_UART1_RX (9)
+#define MICROPY_HW_UART1_CTS (10)
+#define MICROPY_HW_UART1_RTS (11)
+
+#define MICROPY_HW_PSRAM_CS_PIN (47)
+#define MICROPY_HW_ENABLE_PSRAM (1)
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/pins.csv b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/pins.csv
new file mode 100644
index 0000000000000..abf77af56c031
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/pins.csv
@@ -0,0 +1,84 @@
+# XRP default pin names
+MOTOR_L_IN_1,GPIO34
+MOTOR_L_IN_2,GPIO35
+MOTOR_R_IN_1,GPIO32
+MOTOR_R_IN_2,GPIO33
+MOTOR_3_IN_1,GPIO20
+MOTOR_3_IN_2,GPIO21
+MOTOR_4_IN_1,GPIO10
+MOTOR_4_IN_2,GPIO11
+MOTOR_L_ENCODER_A,GPIO30
+MOTOR_L_ENCODER_B,GPIO31
+MOTOR_R_ENCODER_A,GPIO24
+MOTOR_R_ENCODER_B,GPIO25
+MOTOR_3_ENCODER_A,GPIO22
+MOTOR_3_ENCODER_B,GPIO23
+MOTOR_4_ENCODER_A,GPIO2
+MOTOR_4_ENCODER_B,GPIO3
+MOTOR_L_CURRENT,GPIO40
+MOTOR_R_CURRENT,GPIO43
+MOTOR_3_CURRENT,GPIO41
+MOTOR_4_CURRENT,GPIO42
+SERVO_1,GPIO6
+SERVO_2,GPIO9
+SERVO_3,GPIO7
+SERVO_4,GPIO8
+I2C_SDA_0,GPIO4
+I2C_SCL_0,GPIO5
+I2C_SDA_1,GPIO38
+I2C_SCL_1,GPIO39
+DISTANCE_TRIGGER,GPIO0
+DISTANCE_ECHO,GPIO1
+LINE_L,GPIO44
+LINE_R,GPIO45
+BOARD_VIN_MEASURE,GPIO46
+BOARD_USER_BUTTON,GPIO36
+BOARD_NEOPIXEL,GPIO37
+BOARD_LED,EXT_GPIO0
+
+# XRP alternate pin names
+ML_IN_1,GPIO34
+ML_IN_2,GPIO35
+MR_IN_1,GPIO32
+MR_IN_2,GPIO33
+M3_IN_1,GPIO20
+M3_IN_2,GPIO21
+M4_IN_1,GPIO10
+M4_IN_2,GPIO11
+ML_ENC_A,GPIO30
+ML_ENC_B,GPIO31
+MR_ENC_A,GPIO24
+MR_ENC_B,GPIO25
+M3_ENC_A,GPIO22
+M3_ENC_B,GPIO23
+M4_ENC_A,GPIO2
+M4_ENC_B,GPIO3
+ML_CUR,GPIO40
+MR_CUR,GPIO43
+M3_CUR,GPIO41
+M4_CUR,GPIO42
+S1,GPIO6
+S2,GPIO9
+S3,GPIO7
+S4,GPIO8
+SDA_0,GPIO4
+SCL_0,GPIO5
+SDA_1,GPIO38
+SCL_1,GPIO39
+RANGE_TRIGGER,GPIO0
+RANGE_ECHO,GPIO1
+REFLECTANCE_L,GPIO44
+REFLECTANCE_R,GPIO45
+BRD_VIN,GPIO46
+BRD_USR_BTN,GPIO36
+BRD_RGB_LED,GPIO37
+BRD_LED,EXT_GPIO0
+
+# LED default names
+LED,EXT_GPIO0
+NEOPIXEL,GPIO37
+
+# Radio GPIO pins
+WL_GPIO0,EXT_GPIO0
+WL_GPIO1,EXT_GPIO1
+WL_GPIO2,EXT_GPIO2
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/sparkfun_xrp_controller.h b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/sparkfun_xrp_controller.h
new file mode 100644
index 0000000000000..70c2f13c753fe
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/sparkfun_xrp_controller.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2024 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+// Board definition for the SparkFun XRP Controller
+//
+// This header may be included by other board headers as "boards/sparkfun_xrp_controller.h"
+
+// pico_cmake_set PICO_PLATFORM=rp2350
+// pico_cmake_set PICO_CYW43_SUPPORTED = 1
+
+#ifndef _BOARDS_SPARKFUN_XRP_CONTROLLER_H
+#define _BOARDS_SPARKFUN_XRP_CONTROLLER_H
+
+// For board detection
+#define SPARKFUN_XRP_CONTROLLER
+
+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 0
+
+// --- UART ---
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 12
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 13
+#endif
+
+// --- LED ---
+// no PICO_DEFAULT_LED_PIN - LED is on Wireless chip
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 37
+#endif
+
+// --- I2C --- Qwiic connector is on these pins
+#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
+
+// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#endif
+
+#ifndef CYW43_WL_GPIO_COUNT
+#define CYW43_WL_GPIO_COUNT 3
+#endif
+
+#ifndef CYW43_WL_GPIO_LED_PIN
+#define CYW43_WL_GPIO_LED_PIN 0
+#endif
+
+// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+#ifndef PICO_RP2350_A2_SUPPORTED
+#define PICO_RP2350_A2_SUPPORTED 1
+#endif
+
+// cyw43 SPI pins can't be changed at runtime
+#ifndef CYW43_PIN_WL_DYNAMIC
+#define CYW43_PIN_WL_DYNAMIC 0
+#endif
+
+// gpio pin to power up the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_REG_ON
+#define CYW43_DEFAULT_PIN_WL_REG_ON 26u
+#endif
+
+// gpio pin for spi data out to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_OUT
+#define CYW43_DEFAULT_PIN_WL_DATA_OUT 29u
+#endif
+
+// gpio pin for spi data in from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_IN
+#define CYW43_DEFAULT_PIN_WL_DATA_IN 29u
+#endif
+
+// gpio (irq) pin for the irq line from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_HOST_WAKE
+#define CYW43_DEFAULT_PIN_WL_HOST_WAKE 29u
+#endif
+
+// gpio pin for the spi clock line to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CLOCK
+#define CYW43_DEFAULT_PIN_WL_CLOCK 28u
+#endif
+
+// gpio pin for the spi chip select to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CS
+#define CYW43_DEFAULT_PIN_WL_CS 27u
+#endif
+
+#endif

From 2264340559ed9139658e8d78a6a714ec27c92142 Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Mon, 10 Mar 2025 17:35:58 -0600
Subject: [PATCH 1968/3129] rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA: Fix XRP
 Controller Beta URL.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
index cece574326503..b7dbd016007d7 100644
--- a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
@@ -18,6 +18,6 @@
     "mcu": "rp2040",
     "product": "XRP Controller (Beta)",
     "thumbnail": "",
-    "url": "https://www.sparkfun.com/sparkfun-experiential-robotics-platform-xrp-controller.html",
+    "url": "https://www.sparkfun.com/sparkfun-experiential-robotics-platform-xrp-controller-beta.html",
     "vendor": "Sparkfun"
 }

From 416c6cf0c861da94d679f5aa739acf167165c2a4 Mon Sep 17 00:00:00 2001
From: Lesords <2385342343@qq.com>
Date: Tue, 26 Nov 2024 02:25:37 +0000
Subject: [PATCH 1969/3129] rp2/boards/SEEED_XIAO_RP2350: Add new Seeed XIAO
 board definition.

Signed-off-by: Lesords <2385342343@qq.com>
---
 ports/rp2/boards/SEEED_XIAO_RP2350/board.json | 24 +++++++++++++++++++
 .../SEEED_XIAO_RP2350/mpconfigboard.cmake     |  5 ++++
 .../boards/SEEED_XIAO_RP2350/mpconfigboard.h  |  3 +++
 .../SEEED_XIAO_RP2350/mpconfigvariant.cmake   |  1 +
 .../mpconfigvariant_RISCV.cmake               |  1 +
 ports/rp2/boards/SEEED_XIAO_RP2350/pins.csv   | 24 +++++++++++++++++++
 6 files changed, 58 insertions(+)
 create mode 100644 ports/rp2/boards/SEEED_XIAO_RP2350/board.json
 create mode 100644 ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.h
 create mode 100644 ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant_RISCV.cmake
 create mode 100644 ports/rp2/boards/SEEED_XIAO_RP2350/pins.csv

diff --git a/ports/rp2/boards/SEEED_XIAO_RP2350/board.json b/ports/rp2/boards/SEEED_XIAO_RP2350/board.json
new file mode 100644
index 0000000000000..9198b17dbc95e
--- /dev/null
+++ b/ports/rp2/boards/SEEED_XIAO_RP2350/board.json
@@ -0,0 +1,24 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "Dual-core",
+        "External Flash",
+        "RGB LED",
+        "USB"
+    ],
+    "images": [
+        "xiao_rp2350-font.jpg"
+    ],
+    "mcu": "rp2350",
+    "product": "XIAO RP2350",
+    "thumbnail": "",
+    "url": "https://www.seeedstudio.com/Seeed-XIAO-RP2350-p-5944.html",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
+    "vendor": "Seeed Studio"
+}
diff --git a/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.cmake b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.cmake
new file mode 100644
index 0000000000000..a22ea4a5c9df5
--- /dev/null
+++ b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+# cmake file for Seeed XIAO RP2350
+set(PICO_BOARD "seeed_xiao_rp2350")
+
+# To change the gpio count for QFN-80
+# set(PICO_NUM_GPIOS 48)
diff --git a/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.h b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.h
new file mode 100644
index 0000000000000..ea7e7437567e1
--- /dev/null
+++ b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Seeed XIAO RP2350"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - 1024 * 1024)
diff --git a/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant.cmake b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/SEEED_XIAO_RP2350/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/boards/SEEED_XIAO_RP2350/pins.csv b/ports/rp2/boards/SEEED_XIAO_RP2350/pins.csv
new file mode 100644
index 0000000000000..34b71a57c620e
--- /dev/null
+++ b/ports/rp2/boards/SEEED_XIAO_RP2350/pins.csv
@@ -0,0 +1,24 @@
+D0,GPIO26
+D1,GPIO27
+D2,GPIO28
+D3,GPIO5
+D4,GPIO6
+D5,GPIO7
+D6,GPIO0
+D7,GPIO1
+D8,GPIO2
+D9,GPIO4
+D10,GPIO3
+D11,GPIO21
+D12,GPIO20
+D13,GPIO17
+D14,GPIO16
+D15,GPIO11
+D16,GPIO12
+D17,GPIO10
+D18,GPIO9
+LED,GPIO25
+NEOPIXEL_POWER,GPIO23
+NEOPIXEL,GPIO22
+BAT_ADC_EN,GPIO19
+BAT_ADC,GPIO29

From bf9cdd21891d30807ad6e0e229774d589cd5709f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Mar 2025 13:23:13 +1100
Subject: [PATCH 1970/3129] stm32: Rename ROMFS partition config variables to
 start at index 0.

Change ROMFS partition configuration variables to use index 0 as the
starting partition number (instead of index 1).

Reasons to do this:
- `vfs.rom_ioctl()` numbers the partitions starting from 0
- `mpremote romfs -p <partition id>` numbers the partitions starting from 0

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/f722_qspi.ld    |  4 ++--
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h |  2 +-
 ports/stm32/boards/PYBD_SF6/f767.ld         |  4 ++--
 ports/stm32/boards/PYBD_SF6/mpconfigboard.h |  2 +-
 ports/stm32/mpconfigboard_common.h          | 10 +++++-----
 ports/stm32/vfs_rom_ioctl.c                 | 20 ++++++++++----------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
index 05126233ec7ca..f5e6769834a09 100644
--- a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
+++ b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
@@ -41,8 +41,8 @@ _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
 /* ROMFS location */
-_micropy_hw_romfs_part1_start = ORIGIN(FLASH_ROMFS);
-_micropy_hw_romfs_part1_size = LENGTH(FLASH_ROMFS);
+_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
 
 /* Define output sections */
 SECTIONS
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index e8923bf9b66e5..3ae11125d8b1b 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -67,7 +67,7 @@ void board_sleep(int value);
 // ROMFS config
 #define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (1)
 #define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ (&spi_bdev2.spiflash)
-#define MICROPY_HW_ROMFS_ENABLE_PART1 (1)
+#define MICROPY_HW_ROMFS_ENABLE_PART0 (1)
 
 // SPI flash #1, for R/W storage
 #define MICROPY_HW_SOFTQSPI_SCK_LOW(self) (GPIOE->BSRR = (0x10000 << 11))
diff --git a/ports/stm32/boards/PYBD_SF6/f767.ld b/ports/stm32/boards/PYBD_SF6/f767.ld
index 68da1f19d40dc..0ee6cf76355fe 100644
--- a/ports/stm32/boards/PYBD_SF6/f767.ld
+++ b/ports/stm32/boards/PYBD_SF6/f767.ld
@@ -38,7 +38,7 @@ _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
 /* ROMFS location */
-_micropy_hw_romfs_part1_start = ORIGIN(FLASH_ROMFS);
-_micropy_hw_romfs_part1_size = LENGTH(FLASH_ROMFS);
+_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
 
 INCLUDE common_bl.ld
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
index 526a111177987..45261523bdaa0 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
@@ -48,7 +48,7 @@
 // ROMFS config
 #define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (1)
 #define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ (&spi_bdev2.spiflash)
-#define MICROPY_HW_ROMFS_ENABLE_PART1 (1)
+#define MICROPY_HW_ROMFS_ENABLE_PART0 (1)
 
 // Extra UART config
 #define MICROPY_HW_UART7_TX         (pyb_pin_W16)
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 2a650077f3a45..e01a4d4b87e0b 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -77,16 +77,16 @@
 #define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (0)
 #endif
 
+// Whether to enable ROMFS partition 0.
+#ifndef MICROPY_HW_ROMFS_ENABLE_PART0
+#define MICROPY_HW_ROMFS_ENABLE_PART0 (0)
+#endif
+
 // Whether to enable ROMFS partition 1.
 #ifndef MICROPY_HW_ROMFS_ENABLE_PART1
 #define MICROPY_HW_ROMFS_ENABLE_PART1 (0)
 #endif
 
-// Whether to enable ROMFS partition 2.
-#ifndef MICROPY_HW_ROMFS_ENABLE_PART2
-#define MICROPY_HW_ROMFS_ENABLE_PART2 (0)
-#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/vfs_rom_ioctl.c b/ports/stm32/vfs_rom_ioctl.c
index 5024d44e5adc8..1fa4408c53796 100644
--- a/ports/stm32/vfs_rom_ioctl.c
+++ b/ports/stm32/vfs_rom_ioctl.c
@@ -36,6 +36,13 @@
 
 #if MICROPY_VFS_ROM_IOCTL
 
+#if MICROPY_HW_ROMFS_ENABLE_PART0 && !defined(MICROPY_HW_ROMFS_PART0_START)
+#define MICROPY_HW_ROMFS_PART0_START (uintptr_t)(&_micropy_hw_romfs_part0_start)
+#define MICROPY_HW_ROMFS_PART0_SIZE (uintptr_t)(&_micropy_hw_romfs_part0_size)
+extern uint8_t _micropy_hw_romfs_part0_start;
+extern uint8_t _micropy_hw_romfs_part0_size;
+#endif
+
 #if MICROPY_HW_ROMFS_ENABLE_PART1 && !defined(MICROPY_HW_ROMFS_PART1_START)
 #define MICROPY_HW_ROMFS_PART1_START (uintptr_t)(&_micropy_hw_romfs_part1_start)
 #define MICROPY_HW_ROMFS_PART1_SIZE (uintptr_t)(&_micropy_hw_romfs_part1_size)
@@ -43,22 +50,15 @@ extern uint8_t _micropy_hw_romfs_part1_start;
 extern uint8_t _micropy_hw_romfs_part1_size;
 #endif
 
-#if MICROPY_HW_ROMFS_ENABLE_PART2 && !defined(MICROPY_HW_ROMFS_PART2_START)
-#define MICROPY_HW_ROMFS_PART2_START (uintptr_t)(&_micropy_hw_romfs_part2_start)
-#define MICROPY_HW_ROMFS_PART2_SIZE (uintptr_t)(&_micropy_hw_romfs_part2_size)
-extern uint8_t _micropy_hw_romfs_part2_start;
-extern uint8_t _micropy_hw_romfs_part2_size;
-#endif
-
 #define ROMFS_MEMORYVIEW(base, size) {{&mp_type_memoryview}, 'B', 0, (size), (void *)(base)}
 
 static const mp_obj_array_t romfs_obj_table[] = {
+    #if MICROPY_HW_ROMFS_ENABLE_PART0
+    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART0_START, MICROPY_HW_ROMFS_PART0_SIZE),
+    #endif
     #if MICROPY_HW_ROMFS_ENABLE_PART1
     ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART1_START, MICROPY_HW_ROMFS_PART1_SIZE),
     #endif
-    #if MICROPY_HW_ROMFS_ENABLE_PART2
-    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART2_START, MICROPY_HW_ROMFS_PART2_SIZE),
-    #endif
 };
 
 mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {

From d5aeca2e83a03657ee2b5b21225d5a10aba10f56 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Mar 2025 13:23:50 +1100
Subject: [PATCH 1971/3129] esp8266: Rename ROMFS partition config variables to
 include "part0".

For consistency with the stm32 port.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/esp8266_2MiB_ROMFS.ld | 4 ++--
 ports/esp8266/modesp.c                     | 4 ++--
 ports/esp8266/vfs_rom_ioctl.c              | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld b/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld
index 6020c3d485da6..ce057981aba88 100644
--- a/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld
+++ b/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld
@@ -17,8 +17,8 @@ MEMORY
 }
 
 /* define ROMFS extents */
-_micropy_hw_romfs_start = ORIGIN(FLASH_ROMFS);
-_micropy_hw_romfs_size = LENGTH(FLASH_ROMFS);
+_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
 
 /* define common sections and symbols */
 INCLUDE boards/esp8266_common.ld
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index c88022945cfe6..e1f9d39687593 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -165,13 +165,13 @@ static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
 
 extern byte _firmware_size[];
 #if MICROPY_VFS_ROM_IOCTL
-extern uint8_t _micropy_hw_romfs_size;
+extern uint8_t _micropy_hw_romfs_part0_size;
 #endif
 
 static mp_obj_t esp_flash_user_start(void) {
     uint32_t flash_user_start = (uint32_t)_firmware_size;
     #if MICROPY_VFS_ROM_IOCTL
-    flash_user_start += (uint32_t)&_micropy_hw_romfs_size;
+    flash_user_start += (uint32_t)&_micropy_hw_romfs_part0_size;
     #endif
     return MP_OBJ_NEW_SMALL_INT(flash_user_start);
 }
diff --git a/ports/esp8266/vfs_rom_ioctl.c b/ports/esp8266/vfs_rom_ioctl.c
index c7528375becd0..eb260cb50f471 100644
--- a/ports/esp8266/vfs_rom_ioctl.c
+++ b/ports/esp8266/vfs_rom_ioctl.c
@@ -35,13 +35,13 @@
 #define FLASH_MEM_BASE (0x40200000)
 #define FLASH_PAGE_SIZE (4096)
 
-#define MICROPY_HW_ROMFS_BASE (uintptr_t)(&_micropy_hw_romfs_start)
-#define MICROPY_HW_ROMFS_BYTES (uintptr_t)(&_micropy_hw_romfs_size)
+#define MICROPY_HW_ROMFS_BASE (uintptr_t)(&_micropy_hw_romfs_part0_start)
+#define MICROPY_HW_ROMFS_BYTES (uintptr_t)(&_micropy_hw_romfs_part0_size)
 
 #define ROMFS_SPI_FLASH_OFFSET (MICROPY_HW_ROMFS_BASE - FLASH_MEM_BASE)
 
-extern uint8_t _micropy_hw_romfs_start;
-extern uint8_t _micropy_hw_romfs_size;
+extern uint8_t _micropy_hw_romfs_part0_start;
+extern uint8_t _micropy_hw_romfs_part0_size;
 
 static const MP_DEFINE_MEMORYVIEW_OBJ(romfs_obj, 'B', 0, MICROPY_HW_ROMFS_BYTES, (void *)MICROPY_HW_ROMFS_BASE);
 

From 043dc7959206e13d044fda5d590e1452f4a226df Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Jan 2025 11:34:21 +0100
Subject: [PATCH 1972/3129] stm32/boards/ARDUINO_GIGA: Enable 4MiB ROMFS
 partition in ext flash.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h | 9 +++++++--
 ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld    | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index fdf3128a3606d..cef45d730cc20 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -32,6 +32,11 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 #define MICROPY_HW_TIM_IS_RESERVED(id) (id == 1)
 
+// ROMFS config
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI       (1)
+#define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ          (&spi_bdev.spiflash)
+#define MICROPY_HW_ROMFS_ENABLE_PART0               (1)
+
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
 #define MICROPY_HW_SPIFLASH_SOFT_RESET              (1)
@@ -125,8 +130,8 @@ void GIGA_board_low_power(int mode);
 // QSPI flash #1 for storage
 #define MICROPY_HW_QSPI_PRESCALER           (2) // 100MHz
 #define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (27)
-// Reserve 1MiB at the end for compatibility with alternate firmware that places WiFi blob here.
-#define MICROPY_HW_SPIFLASH_SIZE_BITS       (120 * 1024 * 1024)
+// Reserve 4MiB for romfs and 1MiB for WiFi/BT firmware.
+#define MICROPY_HW_SPIFLASH_SIZE_BITS       (88 * 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)
diff --git a/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld b/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
index 793a76b970292..e7bb950dbe6ce 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
@@ -13,11 +13,11 @@ MEMORY
     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_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
     FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
     FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1280K   /* CM7 firmware */
     FLASH_CM4 (rx)  : ORIGIN = 0x08180000, LENGTH = 512K    /* CM4 firmware */
+    FLASH_ROMFS (rx) : ORIGIN = 0x90B00000, LENGTH = 4096K   /* romfs partition in QSPI flash */
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -44,6 +44,10 @@ _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);
 
+/* Location of romfs filesystem */
+_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
+
 /* OpenAMP shared memory region */
 _openamp_shm_region_start = ORIGIN(SRAM4);
 _openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);

From edc927a1852dba9d444c842f7bcf11bbaeeaf092 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Jan 2025 11:35:45 +0100
Subject: [PATCH 1973/3129] stm32/boards/ARDUINO_NICLA_VISION: Enable 4MiB
 ROMFS part in ext flash.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h | 9 +++++++--
 ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld    | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 505f8b6890169..47bf1be23d460 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -32,6 +32,11 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 #define MICROPY_HW_TIM_IS_RESERVED(id) (id == 3)
 
+// ROMFS config
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI       (1)
+#define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ          (&spi_bdev.spiflash)
+#define MICROPY_HW_ROMFS_ENABLE_PART0               (1)
+
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
 #define MICROPY_HW_SPIFLASH_SOFT_RESET              (1)
@@ -130,8 +135,8 @@ void NICLAV_board_osc_enable(int enable);
 // QSPI flash for storage
 #define MICROPY_HW_QSPI_PRESCALER           (2) // 100MHz
 #define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (27)
-// Reserve 1MiB at the end for compatibility with alternate firmware that places WiFi blob here.
-#define MICROPY_HW_SPIFLASH_SIZE_BITS       (120 * 1024 * 1024)
+// Reserve 4MiB for romfs and 1MiB for WiFi/BT firmware.
+#define MICROPY_HW_SPIFLASH_SIZE_BITS       (88 * 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)
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld
index 6d6ce279f299c..9bd7f49a8ecaf 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h747.ld
@@ -13,11 +13,11 @@ MEMORY
     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_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
     FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
     FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1280K   /* CM7 firmware */
     FLASH_CM4 (rx)  : ORIGIN = 0x08180000, LENGTH = 512K    /* CM4 firmware */
+    FLASH_ROMFS (rx) : ORIGIN = 0x90B00000, LENGTH = 4096K   /* romfs partition in QSPI flash */
 }
 
 _cm4_ram_start = ORIGIN(SRAM4);
@@ -46,6 +46,10 @@ _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);
 
+/* Location of romfs filesystem */
+_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
+
 /* OpenAMP shared memory region */
 _openamp_shm_region_start = ORIGIN(SRAM4);
 _openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);

From 96ce08e498a2c62b38aad78f84f2a8f438dc7e3d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Jan 2025 11:36:22 +0100
Subject: [PATCH 1974/3129] stm32/boards/ARDUINO_PORTENTA_H7: Enable 4MiB ROMFS
 part in ext flash.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 9 +++++++--
 ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld    | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 900bf18673728..90a1469056634 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -32,6 +32,11 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 #define MICROPY_HW_TIM_IS_RESERVED(id) (id == 1)
 
+// ROMFS config
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI       (1)
+#define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ          (&spi_bdev.spiflash)
+#define MICROPY_HW_ROMFS_ENABLE_PART0               (1)
+
 // Flash storage config
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
 #define MICROPY_HW_SPIFLASH_SOFT_RESET              (1)
@@ -129,8 +134,8 @@ void PORTENTA_board_osc_enable(int enable);
 // QSPI flash #1 for storage
 #define MICROPY_HW_QSPI_PRESCALER           (2) // 100MHz
 #define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (27)
-// Reserve 1MiB at the end for compatibility with alternate firmware that places WiFi blob here.
-#define MICROPY_HW_SPIFLASH_SIZE_BITS       (120 * 1024 * 1024)
+// Reserve 4MiB for romfs and 1MiB for WiFi/BT firmware.
+#define MICROPY_HW_SPIFLASH_SIZE_BITS       (88 * 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)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
index 793a76b970292..e7bb950dbe6ce 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
@@ -13,11 +13,11 @@ MEMORY
     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_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
     FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
     FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1280K   /* CM7 firmware */
     FLASH_CM4 (rx)  : ORIGIN = 0x08180000, LENGTH = 512K    /* CM4 firmware */
+    FLASH_ROMFS (rx) : ORIGIN = 0x90B00000, LENGTH = 4096K   /* romfs partition in QSPI flash */
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -44,6 +44,10 @@ _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);
 
+/* Location of romfs filesystem */
+_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
+
 /* OpenAMP shared memory region */
 _openamp_shm_region_start = ORIGIN(SRAM4);
 _openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);

From 9db2398009ebb156fc6790f87be337c29f83b5d0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Oct 2024 15:55:46 +1100
Subject: [PATCH 1975/3129] stm32/can: Refactor can.h API to not depend on
 pyboard can types.

This is necessary for the machine.CAN implementation to use the same
low-level functions.

Includes some refactoring around FIFO selection as there was a footgun
where CAN_FIFO0/1 are 0/1 but FDCAN_RX_FIFO0/1 are not. Added an explicit
type for non-hardware-specific FIFO numbering.

Also moved responsibility for re-enabling CAN receive interrupts into the
higher layer (pyb_can.c layer) after calling can_receive().

Also includes this behaviour change for FDCAN boards:

- Fix for boards with FDCAN not updating error status
  counters (num_error_warning, num_error_passive, num_bus_off). These are
  now updated the same as on boards with CAN Classic controllers, as
  documented.

- Previously FDCAN boards would trigger the RX callback function on error
  events instead (passing undocumented irq numbers 3, 4, 5).
  This behaviour has been removed in favour of the documented behaviour of
  updating the status counters.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/can.c     | 198 +++++++++++++++++-----------------
 ports/stm32/can.h     |  84 ++++++++++-----
 ports/stm32/fdcan.c   | 243 +++++++++++++++++++-----------------------
 ports/stm32/main.c    |   6 +-
 ports/stm32/modpyb.c  |   2 +-
 ports/stm32/pyb_can.c | 202 ++++++++++++++++++-----------------
 ports/stm32/pyb_can.h |  58 ++++++++++
 7 files changed, 431 insertions(+), 362 deletions(-)
 create mode 100644 ports/stm32/pyb_can.h

diff --git a/ports/stm32/can.c b/ports/stm32/can.c
index 490faeba709a2..47385e0fa7b5b 100644
--- a/ports/stm32/can.c
+++ b/ports/stm32/can.c
@@ -28,29 +28,15 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "can.h"
+#include "pyb_can.h"
 #include "irq.h"
 
 #if MICROPY_HW_ENABLE_CAN
 
-void can_init0(void) {
-    for (uint i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(pyb_can_obj_all)); i++) {
-        MP_STATE_PORT(pyb_can_obj_all)[i] = NULL;
-    }
-}
-
-void can_deinit_all(void) {
-    for (int i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(pyb_can_obj_all)); i++) {
-        pyb_can_obj_t *can_obj = MP_STATE_PORT(pyb_can_obj_all)[i];
-        if (can_obj != NULL) {
-            can_deinit(can_obj);
-        }
-    }
-}
-
 #if !MICROPY_HW_ENABLE_FDCAN
 
-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) {
-    CAN_InitTypeDef *init = &can_obj->can.Init;
+bool can_init(CAN_HandleTypeDef *can, int can_id, uint32_t mode, uint32_t prescaler, uint32_t sjw, uint32_t bs1, uint32_t bs2, bool auto_restart) {
+    CAN_InitTypeDef *init = &can->Init;
     init->Mode = mode << 4; // shift-left so modes fit in a small-int
     init->Prescaler = prescaler;
     init->SJW = ((sjw - 1) & 3) << 24;
@@ -67,7 +53,7 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     uint32_t sce_irq = 0;
     const machine_pin_obj_t *pins[2];
 
-    switch (can_obj->can_id) {
+    switch (can_id) {
         #if defined(MICROPY_HW_CAN1_TX)
         case PYB_CAN_1:
             CANx = CAN1;
@@ -107,21 +93,16 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     uint32_t pin_mode = MP_HAL_PIN_MODE_ALT;
     uint32_t pin_pull = MP_HAL_PIN_PULL_UP;
     for (int i = 0; i < 2; i++) {
-        if (!mp_hal_pin_config_alt(pins[i], pin_mode, pin_pull, AF_FN_CAN, can_obj->can_id)) {
+        if (!mp_hal_pin_config_alt(pins[i], pin_mode, pin_pull, AF_FN_CAN, can_id)) {
             return false;
         }
     }
 
     // init CANx
-    can_obj->can.Instance = CANx;
-    HAL_CAN_Init(&can_obj->can);
+    can->Instance = CANx;
+    HAL_CAN_Init(can);
 
-    can_obj->is_enabled = true;
-    can_obj->num_error_warning = 0;
-    can_obj->num_error_passive = 0;
-    can_obj->num_bus_off = 0;
-
-    __HAL_CAN_ENABLE_IT(&can_obj->can, CAN_IT_ERR | CAN_IT_BOF | CAN_IT_EPV | CAN_IT_EWG);
+    __HAL_CAN_ENABLE_IT(can, CAN_IT_ERR | CAN_IT_BOF | CAN_IT_EPV | CAN_IT_EWG);
 
     NVIC_SetPriority(sce_irq, IRQ_PRI_CAN);
     HAL_NVIC_EnableIRQ(sce_irq);
@@ -129,10 +110,9 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     return true;
 }
 
-void can_deinit(pyb_can_obj_t *self) {
-    self->is_enabled = false;
-    HAL_CAN_DeInit(&self->can);
-    if (self->can.Instance == CAN1) {
+void can_deinit(CAN_HandleTypeDef *can) {
+    HAL_CAN_DeInit(can);
+    if (can->Instance == CAN1) {
         HAL_NVIC_DisableIRQ(CAN1_RX0_IRQn);
         HAL_NVIC_DisableIRQ(CAN1_RX1_IRQn);
         HAL_NVIC_DisableIRQ(CAN1_SCE_IRQn);
@@ -140,7 +120,7 @@ void can_deinit(pyb_can_obj_t *self) {
         __HAL_RCC_CAN1_RELEASE_RESET();
         __HAL_RCC_CAN1_CLK_DISABLE();
     #if defined(CAN2)
-    } else if (self->can.Instance == CAN2) {
+    } else if (can->Instance == CAN2) {
         HAL_NVIC_DisableIRQ(CAN2_RX0_IRQn);
         HAL_NVIC_DisableIRQ(CAN2_RX1_IRQn);
         HAL_NVIC_DisableIRQ(CAN2_SCE_IRQn);
@@ -149,7 +129,7 @@ void can_deinit(pyb_can_obj_t *self) {
         __HAL_RCC_CAN2_CLK_DISABLE();
     #endif
     #if defined(CAN3)
-    } else if (self->can.Instance == CAN3) {
+    } else if (can->Instance == CAN3) {
         HAL_NVIC_DisableIRQ(CAN3_RX0_IRQn);
         HAL_NVIC_DisableIRQ(CAN3_RX1_IRQn);
         HAL_NVIC_DisableIRQ(CAN3_SCE_IRQn);
@@ -160,7 +140,19 @@ void can_deinit(pyb_can_obj_t *self) {
     }
 }
 
-void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank) {
+void can_disable_rx_interrupts(CAN_HandleTypeDef *can, can_rx_fifo_t fifo) {
+    __HAL_CAN_DISABLE_IT(can, ((fifo == CAN_RX_FIFO0) ?
+        (CAN_IT_FMP0 | CAN_IT_FF0 | CAN_IT_FOV0) :
+        (CAN_IT_FMP1 | CAN_IT_FF1 | CAN_IT_FOV1)));
+}
+
+void can_enable_rx_interrupts(CAN_HandleTypeDef *can, can_rx_fifo_t fifo, bool enable_msg_received) {
+    __HAL_CAN_ENABLE_IT(can, ((fifo == CAN_RX_FIFO0) ?
+        ((enable_msg_received ? CAN_IT_FMP0 : 0) | CAN_IT_FF0 | CAN_IT_FOV0) :
+        ((enable_msg_received ? CAN_IT_FMP1 : 0) | CAN_IT_FF1 | CAN_IT_FOV1)));
+}
+
+void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, uint8_t bank) {
     CAN_FilterConfTypeDef filter;
 
     filter.FilterIdHigh = 0;
@@ -168,18 +160,18 @@ void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank) {
     filter.FilterMaskIdHigh = 0;
     filter.FilterMaskIdLow = 0;
     filter.FilterFIFOAssignment = CAN_FILTER_FIFO0;
-    filter.FilterNumber = f;
+    filter.FilterNumber = filter_num;
     filter.FilterMode = CAN_FILTERMODE_IDMASK;
     filter.FilterScale = CAN_FILTERSCALE_16BIT;
     filter.FilterActivation = DISABLE;
     filter.BankNumber = bank;
 
-    HAL_CAN_ConfigFilter(&self->can, &filter);
+    HAL_CAN_ConfigFilter(can, &filter);
 }
 
-int can_receive(CAN_HandleTypeDef *can, int fifo, CanRxMsgTypeDef *msg, uint8_t *data, uint32_t timeout_ms) {
+int can_receive(CAN_HandleTypeDef *can, can_rx_fifo_t fifo, CanRxMsgTypeDef *msg, uint8_t *data, uint32_t timeout_ms) {
     volatile uint32_t *rfr;
-    if (fifo == CAN_FIFO0) {
+    if (fifo == CAN_RX_FIFO0) {
         rfr = &can->Instance->RF0R;
     } else {
         rfr = &can->Instance->RF1R;
@@ -222,13 +214,16 @@ int can_receive(CAN_HandleTypeDef *can, int fifo, CanRxMsgTypeDef *msg, uint8_t
     return 0; // success
 }
 
-// We have our own version of CAN transmit so we can handle Timeout=0 correctly.
-HAL_StatusTypeDef CAN_Transmit(CAN_HandleTypeDef *hcan, uint32_t Timeout) {
+// Lightly modified version of HAL CAN_Transmit to handle Timeout=0 correctly
+HAL_StatusTypeDef can_transmit(CAN_HandleTypeDef *hcan, CanTxMsgTypeDef *txmsg, uint8_t *data, uint32_t Timeout) {
     uint32_t transmitmailbox;
     uint32_t tickstart;
     uint32_t rqcpflag = 0;
     uint32_t txokflag = 0;
 
+    hcan->pTxMsg = txmsg;
+    (void)data; // Not needed here, caller has set it up as &tx_msg->Data
+
     // Check the parameters
     assert_param(IS_CAN_IDTYPE(hcan->pTxMsg->IDE));
     assert_param(IS_CAN_RTR(hcan->pTxMsg->RTR));
@@ -312,79 +307,90 @@ HAL_StatusTypeDef CAN_Transmit(CAN_HandleTypeDef *hcan, uint32_t Timeout) {
     }
 }
 
-static void can_rx_irq_handler(uint can_id, uint fifo_id) {
-    mp_obj_t callback;
-    pyb_can_obj_t *self;
-    mp_obj_t irq_reason = MP_OBJ_NEW_SMALL_INT(0);
-    byte *state;
-
-    self = MP_STATE_PORT(pyb_can_obj_all)[can_id - 1];
-
-    if (fifo_id == CAN_FIFO0) {
-        callback = self->rxcallback0;
-        state = &self->rx_state0;
+// Workaround for the __HAL_CAN macros expecting a CAN_HandleTypeDef which we
+// don't have in the ISR. Using this "fake" struct instead of CAN_HandleTypeDef
+// so it's not possible to accidentally call an API that uses one of the other
+// fields in the structure.
+typedef struct {
+    CAN_TypeDef *Instance;
+} fake_handle_t;
+
+static void can_rx_irq_handler(uint can_id, CAN_TypeDef *instance, can_rx_fifo_t fifo) {
+    uint32_t full_flag, full_int, overrun_flag, overrun_int, pending_int;
+
+    const fake_handle_t handle = {
+        .Instance = instance,
+    };
+
+    if (fifo == CAN_RX_FIFO0) {
+        full_flag = CAN_FLAG_FF0;
+        full_int = CAN_IT_FF0;
+        overrun_flag = CAN_FLAG_FOV0;
+        overrun_int = CAN_IT_FOV0;
+        pending_int = CAN_IT_FMP0;
     } else {
-        callback = self->rxcallback1;
-        state = &self->rx_state1;
+        full_flag = CAN_FLAG_FF1;
+        full_int = CAN_IT_FF1;
+        overrun_flag = CAN_FLAG_FOV1;
+        overrun_int = CAN_IT_FOV1;
+        pending_int = CAN_IT_FMP1;
     }
 
-    switch (*state) {
-        case RX_STATE_FIFO_EMPTY:
-            __HAL_CAN_DISABLE_IT(&self->can,  (fifo_id == CAN_FIFO0) ? CAN_IT_FMP0 : CAN_IT_FMP1);
-            irq_reason = MP_OBJ_NEW_SMALL_INT(0);
-            *state = RX_STATE_MESSAGE_PENDING;
-            break;
-        case RX_STATE_MESSAGE_PENDING:
-            __HAL_CAN_DISABLE_IT(&self->can, (fifo_id == CAN_FIFO0) ? CAN_IT_FF0 : CAN_IT_FF1);
-            __HAL_CAN_CLEAR_FLAG(&self->can, (fifo_id == CAN_FIFO0) ? CAN_FLAG_FF0 : CAN_FLAG_FF1);
-            irq_reason = MP_OBJ_NEW_SMALL_INT(1);
-            *state = RX_STATE_FIFO_FULL;
-            break;
-        case RX_STATE_FIFO_FULL:
-            __HAL_CAN_DISABLE_IT(&self->can, (fifo_id == CAN_FIFO0) ? CAN_IT_FOV0 : CAN_IT_FOV1);
-            __HAL_CAN_CLEAR_FLAG(&self->can, (fifo_id == CAN_FIFO0) ? CAN_FLAG_FOV0 : CAN_FLAG_FOV1);
-            irq_reason = MP_OBJ_NEW_SMALL_INT(2);
-            *state = RX_STATE_FIFO_OVERFLOW;
-            break;
-        case RX_STATE_FIFO_OVERFLOW:
-            // This should never happen
-            break;
+    bool full = __HAL_CAN_GET_FLAG(&handle, full_flag);
+    bool overrun = __HAL_CAN_GET_FLAG(&handle, overrun_flag);
+
+    // Note: receive interrupt bits are disabled below, and re-enabled by the
+    // higher layer after calling can_receive()
+
+    if (full) {
+        __HAL_CAN_DISABLE_IT(&handle, full_int);
+        __HAL_CAN_CLEAR_FLAG(&handle, full_flag);
+        if (!overrun) {
+            can_irq_handler(can_id, CAN_INT_FIFO_FULL, fifo);
+        }
+    }
+    if (overrun) {
+        __HAL_CAN_DISABLE_IT(&handle, overrun_int);
+        __HAL_CAN_CLEAR_FLAG(&handle, overrun_flag);
+        can_irq_handler(can_id, CAN_INT_FIFO_OVERFLOW, fifo);
     }
 
-    pyb_can_handle_callback(self, fifo_id, callback, irq_reason);
+    if (!(full || overrun)) {
+        // Process of elimination, if neither of the above
+        // FIFO status flags are set then message pending interrupt is what fired.
+        __HAL_CAN_DISABLE_IT(&handle, pending_int);
+        can_irq_handler(can_id, CAN_INT_MESSAGE_RECEIVED, fifo);
+    }
 }
 
-static void can_sce_irq_handler(uint can_id) {
-    pyb_can_obj_t *self = MP_STATE_PORT(pyb_can_obj_all)[can_id - 1];
-    if (self) {
-        self->can.Instance->MSR = CAN_MSR_ERRI;
-        uint32_t esr = self->can.Instance->ESR;
-        if (esr & CAN_ESR_BOFF) {
-            ++self->num_bus_off;
-        } else if (esr & CAN_ESR_EPVF) {
-            ++self->num_error_passive;
-        } else if (esr & CAN_ESR_EWGF) {
-            ++self->num_error_warning;
-        }
+static void can_sce_irq_handler(uint can_id, CAN_TypeDef *instance) {
+    instance->MSR = CAN_MSR_ERRI; // Write to clear ERRIE interrupt
+    uint32_t esr = instance->ESR;
+    if (esr & CAN_ESR_BOFF) {
+        can_irq_handler(can_id, CAN_INT_ERR_BUS_OFF, 0);
+    } else if (esr & CAN_ESR_EPVF) {
+        can_irq_handler(can_id, CAN_INT_ERR_PASSIVE, 0);
+    } else if (esr & CAN_ESR_EWGF) {
+        can_irq_handler(can_id, CAN_INT_ERR_WARNING, 0);
     }
 }
 
 #if defined(MICROPY_HW_CAN1_TX)
 void CAN1_RX0_IRQHandler(void) {
     IRQ_ENTER(CAN1_RX0_IRQn);
-    can_rx_irq_handler(PYB_CAN_1, CAN_FIFO0);
+    can_rx_irq_handler(PYB_CAN_1, CAN1, CAN_RX_FIFO0);
     IRQ_EXIT(CAN1_RX0_IRQn);
 }
 
 void CAN1_RX1_IRQHandler(void) {
     IRQ_ENTER(CAN1_RX1_IRQn);
-    can_rx_irq_handler(PYB_CAN_1, CAN_FIFO1);
+    can_rx_irq_handler(PYB_CAN_1, CAN1, CAN_RX_FIFO1);
     IRQ_EXIT(CAN1_RX1_IRQn);
 }
 
 void CAN1_SCE_IRQHandler(void) {
     IRQ_ENTER(CAN1_SCE_IRQn);
-    can_sce_irq_handler(PYB_CAN_1);
+    can_sce_irq_handler(PYB_CAN_1, CAN1);
     IRQ_EXIT(CAN1_SCE_IRQn);
 }
 #endif
@@ -392,19 +398,19 @@ void CAN1_SCE_IRQHandler(void) {
 #if defined(MICROPY_HW_CAN2_TX)
 void CAN2_RX0_IRQHandler(void) {
     IRQ_ENTER(CAN2_RX0_IRQn);
-    can_rx_irq_handler(PYB_CAN_2, CAN_FIFO0);
+    can_rx_irq_handler(PYB_CAN_2, CAN2, CAN_RX_FIFO0);
     IRQ_EXIT(CAN2_RX0_IRQn);
 }
 
 void CAN2_RX1_IRQHandler(void) {
     IRQ_ENTER(CAN2_RX1_IRQn);
-    can_rx_irq_handler(PYB_CAN_2, CAN_FIFO1);
+    can_rx_irq_handler(PYB_CAN_2, CAN2, CAN_RX_FIFO1);
     IRQ_EXIT(CAN2_RX1_IRQn);
 }
 
 void CAN2_SCE_IRQHandler(void) {
     IRQ_ENTER(CAN2_SCE_IRQn);
-    can_sce_irq_handler(PYB_CAN_2);
+    can_sce_irq_handler(PYB_CAN_2, CAN2);
     IRQ_EXIT(CAN2_SCE_IRQn);
 }
 #endif
@@ -412,19 +418,19 @@ void CAN2_SCE_IRQHandler(void) {
 #if defined(MICROPY_HW_CAN3_TX)
 void CAN3_RX0_IRQHandler(void) {
     IRQ_ENTER(CAN3_RX0_IRQn);
-    can_rx_irq_handler(PYB_CAN_3, CAN_FIFO0);
+    can_rx_irq_handler(PYB_CAN_3, CAN3, CAN_RX_FIFO0);
     IRQ_EXIT(CAN3_RX0_IRQn);
 }
 
 void CAN3_RX1_IRQHandler(void) {
     IRQ_ENTER(CAN3_RX1_IRQn);
-    can_rx_irq_handler(PYB_CAN_3, CAN_FIFO1);
+    can_rx_irq_handler(PYB_CAN_3, CAN3, CAN_RX_FIFO1);
     IRQ_EXIT(CAN3_RX1_IRQn);
 }
 
 void CAN3_SCE_IRQHandler(void) {
     IRQ_ENTER(CAN3_SCE_IRQn);
-    can_sce_irq_handler(PYB_CAN_3);
+    can_sce_irq_handler(PYB_CAN_3, CAN3);
     IRQ_EXIT(CAN3_SCE_IRQn);
 }
 #endif
diff --git a/ports/stm32/can.h b/ports/stm32/can.h
index 45ac7187e0040..3422f4180d6df 100644
--- a/ports/stm32/can.h
+++ b/ports/stm32/can.h
@@ -26,10 +26,17 @@
 #ifndef MICROPY_INCLUDED_STM32_CAN_H
 #define MICROPY_INCLUDED_STM32_CAN_H
 
-#include "py/obj.h"
+#include "py/mphal.h"
 
 #if MICROPY_HW_ENABLE_CAN
 
+// This API provides a higher abstraction layer over the two STM32
+// CAN controller APIs provided by the ST HAL (one for their classic
+// CAN controller, one for their FD CAN controller.)
+
+// There are two implementations, can.c and fdcan.c - only one is included in
+// the build for a given board.
+
 #define PYB_CAN_1 (1)
 #define PYB_CAN_2 (2)
 #define PYB_CAN_3 (3)
@@ -61,31 +68,56 @@ typedef enum _rx_state_t {
     RX_STATE_FIFO_OVERFLOW,
 } rx_state_t;
 
-typedef struct _pyb_can_obj_t {
-    mp_obj_base_t base;
-    mp_obj_t rxcallback0;
-    mp_obj_t rxcallback1;
-    mp_uint_t can_id : 8;
-    bool is_enabled : 1;
-    byte rx_state0;
-    byte rx_state1;
-    uint16_t num_error_warning;
-    uint16_t num_error_passive;
-    uint16_t num_bus_off;
-    CAN_HandleTypeDef can;
-} pyb_can_obj_t;
-
-extern const mp_obj_type_t pyb_can_type;
-
-void can_init0(void);
-void can_deinit_all(void);
-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 can_deinit(pyb_can_obj_t *self);
-
-void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank);
-int can_receive(CAN_HandleTypeDef *can, int fifo, CanRxMsgTypeDef *msg, uint8_t *data, uint32_t timeout_ms);
-HAL_StatusTypeDef CAN_Transmit(CAN_HandleTypeDef *hcan, uint32_t Timeout);
-void pyb_can_handle_callback(pyb_can_obj_t *self, uint fifo_id, mp_obj_t callback, mp_obj_t irq_reason);
+typedef enum {
+    CAN_INT_MESSAGE_RECEIVED,
+    CAN_INT_FIFO_FULL,
+    CAN_INT_FIFO_OVERFLOW, // These first 3 correspond to pyb.CAN.rxcallback args
+
+    CAN_INT_ERR_BUS_OFF,
+    CAN_INT_ERR_PASSIVE,
+    CAN_INT_ERR_WARNING,
+} can_int_t;
+
+// RX FIFO numbering
+//
+// Note: For traditional CAN peripheral, the values of CAN_FIFO0 and CAN_FIFO1 are the same
+// as this enum. FDCAN macros FDCAN_RX_FIFO0 and FDCAN_RX_FIFO1 are hardware offsets and not the same.
+typedef enum {
+    CAN_RX_FIFO0,
+    CAN_RX_FIFO1,
+} can_rx_fifo_t;
+
+bool can_init(CAN_HandleTypeDef *can, int can_id, uint32_t mode, uint32_t prescaler, uint32_t sjw, uint32_t bs1, uint32_t bs2, bool auto_restart);
+void can_deinit(CAN_HandleTypeDef *can);
+
+void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, uint8_t bank);
+int can_receive(CAN_HandleTypeDef *can, can_rx_fifo_t fifo, CanRxMsgTypeDef *msg, uint8_t *data, uint32_t timeout_ms);
+HAL_StatusTypeDef can_transmit(CAN_HandleTypeDef *hcan, CanTxMsgTypeDef *txmsg, uint8_t *data, uint32_t Timeout);
+
+// Disable all CAN receive interrupts for a FIFO
+void can_disable_rx_interrupts(CAN_HandleTypeDef *can, can_rx_fifo_t fifo);
+
+// Enable CAN receive interrupts for a FIFO.
+//
+// Interrupt for CAN_INT_MESSAGE_RECEIVED is only enabled if enable_msg_received is set.
+void can_enable_rx_interrupts(CAN_HandleTypeDef *can, can_rx_fifo_t fifo, bool enable_msg_received);
+
+// Implemented in pyb_can.c, called from lower layer
+extern void can_irq_handler(uint can_id,  can_int_t interrupt, can_rx_fifo_t fifo);
+
+#if MICROPY_HW_ENABLE_FDCAN
+
+static inline unsigned can_rx_pending(CAN_HandleTypeDef *can, can_rx_fifo_t fifo) {
+    return HAL_FDCAN_GetRxFifoFillLevel(can, fifo == CAN_RX_FIFO0 ? FDCAN_RX_FIFO0 : FDCAN_RX_FIFO1);
+}
+
+#else
+
+static inline unsigned can_rx_pending(CAN_HandleTypeDef *can, can_rx_fifo_t fifo) {
+    return __HAL_CAN_MSG_PENDING(can, fifo == CAN_RX_FIFO0 ? CAN_FIFO0 : CAN_FIFO1);
+}
+
+#endif // MICROPY_HW_ENABLE_FDCAN
 
 #endif // MICROPY_HW_ENABLE_CAN
 
diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 04d8135c081b3..b87ab48f1ccb7 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -28,6 +28,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "can.h"
+#include "pyb_can.h"
 #include "irq.h"
 
 #if MICROPY_HW_ENABLE_CAN && MICROPY_HW_ENABLE_FDCAN
@@ -44,9 +45,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)
+#define FDCAN_IT_RX_FIFO0_MASK (FDCAN_IT_RX_FIFO0_MESSAGE_LOST | FDCAN_IT_RX_FIFO0_FULL | FDCAN_IT_RX_FIFO0_NEW_MESSAGE)
+#define FDCAN_IT_RX_FIFO1_MASK (FDCAN_IT_RX_FIFO1_MESSAGE_LOST | FDCAN_IT_RX_FIFO1_FULL | FDCAN_IT_RX_FIFO1_NEW_MESSAGE)
+#define FDCAN_IT_ERROR_STATUS_MASK (FDCAN_IT_ERROR_PASSIVE | FDCAN_IT_ERROR_WARNING | FDCAN_IT_BUS_OFF)
+
+#define FDCAN_IT_RX_NEW_MESSAGE_MASK (FDCAN_IT_RX_FIFO0_NEW_MESSAGE | FDCAN_IT_RX_FIFO1_NEW_MESSAGE)
+#define FDCAN_IT_RX_FULL_MASK (FDCAN_IT_RX_FIFO0_FULL | FDCAN_IT_RX_FIFO1_FULL)
+#define FDCAN_IT_RX_MESSAGE_LOST_MASK (FDCAN_IT_RX_FIFO0_MESSAGE_LOST | FDCAN_IT_RX_FIFO1_MESSAGE_LOST)
 
 #if defined(STM32H7)
 // adaptations for H7 to G4 naming convention in HAL
@@ -63,10 +68,10 @@
 // also defined in <PROC>_hal_fdcan.c, but not able to declare extern and reach the variable
 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) {
+bool can_init(CAN_HandleTypeDef *can, int can_id, 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;
+    FDCAN_InitTypeDef *init = &can->Init;
     // Configure FDCAN with FD frame and BRS support.
     init->FrameFormat = FDCAN_FRAME_FD_BRS;
     init->Mode = mode;
@@ -94,7 +99,7 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     // 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) {
+    if (can_id == PYB_CAN_1) {
         init->MessageRAMOffset = 0;
     } else {
         init->MessageRAMOffset = FDCAN_MESSAGE_RAM_SIZE / 2;
@@ -139,7 +144,7 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     FDCAN_GlobalTypeDef *CANx = NULL;
     const machine_pin_obj_t *pins[2];
 
-    switch (can_obj->can_id) {
+    switch (can_id) {
         #if defined(MICROPY_HW_CAN1_TX)
         case PYB_CAN_1:
             CANx = FDCAN1;
@@ -167,39 +172,34 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     uint32_t pin_mode = MP_HAL_PIN_MODE_ALT;
     uint32_t pin_pull = MP_HAL_PIN_PULL_UP;
     for (int i = 0; i < 2; ++i) {
-        if (!mp_hal_pin_config_alt(pins[i], pin_mode, pin_pull, AF_FN_CAN, can_obj->can_id)) {
+        if (!mp_hal_pin_config_alt(pins[i], pin_mode, pin_pull, AF_FN_CAN, can_id)) {
             return false;
         }
     }
 
     // init CANx
-    can_obj->can.Instance = CANx;
+    can->Instance = CANx;
     // catch bad configuration errors.
-    if (HAL_FDCAN_Init(&can_obj->can) != HAL_OK) {
+    if (HAL_FDCAN_Init(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);
+    HAL_FDCAN_ConfigGlobalFilter(can, FDCAN_REJECT, FDCAN_REJECT, DISABLE, DISABLE);
 
     // The configuration registers are locked after CAN is started.
-    HAL_FDCAN_Start(&can_obj->can);
+    HAL_FDCAN_Start(can);
 
     // Reset all filters
     for (int f = 0; f < init->StdFiltersNbr; ++f) {
-        can_clearfilter(can_obj, f, false);
+        can_clearfilter(can, f, false);
     }
 
     for (int f = 0; f < init->ExtFiltersNbr; ++f) {
-        can_clearfilter(can_obj, f, true);
+        can_clearfilter(can, f, true);
     }
 
-    can_obj->is_enabled = true;
-    can_obj->num_error_warning = 0;
-    can_obj->num_error_passive = 0;
-    can_obj->num_bus_off = 0;
-
-    switch (can_obj->can_id) {
+    switch (can_id) {
         case PYB_CAN_1:
             NVIC_SetPriority(FDCAN1_IT0_IRQn, IRQ_PRI_CAN);
             HAL_NVIC_EnableIRQ(FDCAN1_IT0_IRQn);
@@ -218,22 +218,18 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
             return false;
     }
     // 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);
+    HAL_FDCAN_ConfigInterruptLines(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);
+    HAL_FDCAN_ConfigInterruptLines(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);
+    // Enable error interrupts. RX-related interrupts are enabled via can_enable_rx_interrupts()
+    HAL_FDCAN_ActivateNotification(can, FDCAN_IT_BUS_OFF | FDCAN_IT_ERROR_WARNING | FDCAN_IT_ERROR_PASSIVE, 0);
     return true;
 }
 
-void can_deinit(pyb_can_obj_t *self) {
-    self->is_enabled = false;
-    HAL_FDCAN_DeInit(&self->can);
-    if (self->can.Instance == FDCAN1) {
+void can_deinit(FDCAN_HandleTypeDef *can) {
+    HAL_FDCAN_DeInit(can);
+    if (can->Instance == FDCAN1) {
         HAL_NVIC_DisableIRQ(FDCAN1_IT0_IRQn);
         HAL_NVIC_DisableIRQ(FDCAN1_IT1_IRQn);
         // TODO check if FDCAN2 is used.
@@ -241,7 +237,7 @@ void can_deinit(pyb_can_obj_t *self) {
         __HAL_RCC_FDCAN_RELEASE_RESET();
         __HAL_RCC_FDCAN_CLK_DISABLE();
     #if defined(MICROPY_HW_CAN2_TX)
-    } else if (self->can.Instance == FDCAN2) {
+    } else if (can->Instance == FDCAN2) {
         HAL_NVIC_DisableIRQ(FDCAN2_IT0_IRQn);
         HAL_NVIC_DisableIRQ(FDCAN2_IT1_IRQn);
         // TODO check if FDCAN2 is used.
@@ -252,25 +248,52 @@ void can_deinit(pyb_can_obj_t *self) {
     }
 }
 
-void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t extid) {
-    if (self && self->can.Instance) {
-        FDCAN_FilterTypeDef filter = {0};
-        if (extid == 1) {
-            filter.IdType = FDCAN_EXTENDED_ID;
-        } else {
-            filter.IdType = FDCAN_STANDARD_ID;
+void can_clearfilter(FDCAN_HandleTypeDef *can, uint32_t f, uint8_t extid) {
+    FDCAN_FilterTypeDef filter = {0};
+    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(can, &filter);
+}
+
+void can_disable_rx_interrupts(CAN_HandleTypeDef *can, can_rx_fifo_t fifo) {
+    HAL_FDCAN_DeactivateNotification(can, (fifo == CAN_RX_FIFO0) ? FDCAN_IT_RX_FIFO0_MASK : FDCAN_IT_RX_FIFO1_MASK);
+}
+
+void can_enable_rx_interrupts(CAN_HandleTypeDef *can, can_rx_fifo_t fifo, bool enable_msg_received) {
+    uint32_t ints = (fifo == CAN_RX_FIFO0) ? FDCAN_IT_RX_FIFO0_MASK : FDCAN_IT_RX_FIFO1_MASK;
+    if (!enable_msg_received) {
+        ints &= FDCAN_IT_RX_NEW_MESSAGE_MASK;
+    }
+    HAL_FDCAN_ActivateNotification(can, ints, 0);
+}
+
+HAL_StatusTypeDef can_transmit(CAN_HandleTypeDef *can, CanTxMsgTypeDef *txmsg, uint8_t *data, uint32_t timeout_ms) {
+    uint32_t start = HAL_GetTick();
+    while (HAL_FDCAN_GetTxFifoFreeLevel(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);
+            }
         }
-        filter.FilterIndex = f;
-        filter.FilterConfig = FDCAN_FILTER_DISABLE;
-        HAL_FDCAN_ConfigFilter(&self->can, &filter);
+        MICROPY_EVENT_POLL_HOOK
     }
+    return HAL_FDCAN_AddMessageToTxFifoQ(can, txmsg, data);
 }
 
-int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr, uint8_t *data, uint32_t timeout_ms) {
+int can_receive(FDCAN_HandleTypeDef *can, can_rx_fifo_t fifo, FDCAN_RxHeaderTypeDef *hdr, uint8_t *data, uint32_t timeout_ms) {
     volatile uint32_t *rxf, *rxa;
     uint32_t fl;
 
-    if (fifo == FDCAN_RX_FIFO0) {
+    if (fifo == CAN_RX_FIFO0) {
         rxf = &can->Instance->RXF0S;
         rxa = &can->Instance->RXF0A;
         fl = FDCAN_RXF0S_F0FL;
@@ -293,7 +316,7 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
 
     // Get pointer to incoming message
     uint32_t index, *address;
-    if (fifo == FDCAN_RX_FIFO0) {
+    if (fifo == CAN_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
@@ -303,7 +326,6 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
     } 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));
@@ -340,117 +362,66 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
     return 0; // success
 }
 
-static void can_rx_irq_handler(uint can_id, uint fifo_id) {
-    mp_obj_t callback;
-    pyb_can_obj_t *self;
-    mp_obj_t irq_reason = MP_OBJ_NEW_SMALL_INT(0);
-    byte *state;
-
-    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;
+static void can_rx_irq_handler(uint can_id, CAN_TypeDef *instance, can_rx_fifo_t fifo) {
+    uint32_t ints, rx_fifo_ints, error_ints;
 
-        }
-        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;
-        }
+    ints = instance->IR & instance->IE;
 
+    if (fifo == CAN_RX_FIFO0) {
+        rx_fifo_ints = ints & FDCAN_IT_RX_FIFO0_MASK;
     } else {
-        callback = self->rxcallback1;
-        state = &self->rx_state1;
-        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;
+        rx_fifo_ints = ints & FDCAN_IT_RX_FIFO1_MASK;
+    }
+    error_ints = ints & FDCAN_IT_ERROR_STATUS_MASK;
 
-        }
-        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;
+    // Disable receive interrupts, re-enabled by higher layer after calling can_receive()
+    // (Note: can't use __HAL_CAN API as only have a CAN_TypeDef, not CAN_HandleTypeDef)
+    instance->IE &= ~rx_fifo_ints;
+    instance->IR = rx_fifo_ints | error_ints;
 
+    if (rx_fifo_ints) {
+        if (rx_fifo_ints & FDCAN_IT_RX_NEW_MESSAGE_MASK) {
+            can_irq_handler(can_id, CAN_INT_MESSAGE_RECEIVED, fifo);
+        }
+        if (rx_fifo_ints & FDCAN_IT_RX_FULL_MASK) {
+            can_irq_handler(can_id, CAN_INT_FIFO_FULL, fifo);
         }
-        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;
+        if (rx_fifo_ints & FDCAN_IT_RX_MESSAGE_LOST_MASK) {
+            can_irq_handler(can_id, CAN_INT_FIFO_OVERFLOW, fifo);
         }
     }
 
-    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 (error_ints) {
+        uint32_t Psr = instance->PSR;
+
+        if (error_ints & FDCAN_IT_ERROR_WARNING) {
+            if (Psr & FDCAN_PSR_EW) {
+                can_irq_handler(can_id, CAN_INT_ERR_WARNING, 0);
+            }
         }
-    }
-    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 (error_ints & FDCAN_IT_ERROR_PASSIVE) {
+            if (Psr & FDCAN_PSR_EP) {
+                can_irq_handler(can_id, CAN_INT_ERR_PASSIVE, 0);
+            }
         }
-    }
-    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));
+        if (error_ints & FDCAN_IT_BUS_OFF) {
+            if (Psr & FDCAN_PSR_BO) {
+                can_irq_handler(can_id, CAN_INT_ERR_BUS_OFF, 0);
+            }
         }
     }
-
-    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)
 void FDCAN1_IT0_IRQHandler(void) {
     IRQ_ENTER(FDCAN1_IT0_IRQn);
-    can_rx_irq_handler(PYB_CAN_1, FDCAN_RX_FIFO0);
+    can_rx_irq_handler(PYB_CAN_1, FDCAN1, CAN_RX_FIFO0);
     IRQ_EXIT(FDCAN1_IT0_IRQn);
 }
 
 void FDCAN1_IT1_IRQHandler(void) {
     IRQ_ENTER(FDCAN1_IT1_IRQn);
-    can_rx_irq_handler(PYB_CAN_1, FDCAN_RX_FIFO1);
+    can_rx_irq_handler(PYB_CAN_1, FDCAN1, CAN_RX_FIFO1);
     IRQ_EXIT(FDCAN1_IT1_IRQn);
 }
 #endif
@@ -458,13 +429,13 @@ void FDCAN1_IT1_IRQHandler(void) {
 #if defined(MICROPY_HW_CAN2_TX)
 void FDCAN2_IT0_IRQHandler(void) {
     IRQ_ENTER(FDCAN2_IT0_IRQn);
-    can_rx_irq_handler(PYB_CAN_2, FDCAN_RX_FIFO0);
+    can_rx_irq_handler(PYB_CAN_2, FDCAN2, CAN_RX_FIFO0);
     IRQ_EXIT(FDCAN2_IT0_IRQn);
 }
 
 void FDCAN2_IT1_IRQHandler(void) {
     IRQ_ENTER(FDCAN2_IT1_IRQn);
-    can_rx_irq_handler(PYB_CAN_2, FDCAN_RX_FIFO1);
+    can_rx_irq_handler(PYB_CAN_2, FDCAN2, CAN_RX_FIFO1);
     IRQ_EXIT(FDCAN2_IT1_IRQn);
 }
 #endif
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index ea870ef0da7ca..55dbeed98246f 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -86,7 +86,7 @@
 #include "accel.h"
 #include "servo.h"
 #include "dac.h"
-#include "can.h"
+#include "pyb_can.h"
 #include "subghz.h"
 
 #if MICROPY_PY_THREAD
@@ -536,7 +536,7 @@ void stm32_main(uint32_t reset_mode) {
     timer_init0();
 
     #if MICROPY_HW_ENABLE_CAN
-    can_init0();
+    pyb_can_init0();
     #endif
 
     #if MICROPY_HW_ENABLE_USB
@@ -683,7 +683,7 @@ void stm32_main(uint32_t reset_mode) {
     pyb_i2c_deinit_all();
     #endif
     #if MICROPY_HW_ENABLE_CAN
-    can_deinit_all();
+    pyb_can_deinit_all();
     #endif
     #if MICROPY_HW_ENABLE_DAC
     dac_deinit_all();
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 176010a7e5107..3d8696e3c426e 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -41,7 +41,7 @@
 #include "i2c.h"
 #include "spi.h"
 #include "uart.h"
-#include "can.h"
+#include "pyb_can.h"
 #include "adc.h"
 #include "storage.h"
 #include "sdcard.h"
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 181b3173866c3..0d004ecfcb5e4 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "py/obj.h"
 #include "py/objarray.h"
 #include "py/runtime.h"
 #include "py/gc.h"
@@ -35,6 +36,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "bufhelper.h"
+#include "pyb_can.h"
 #include "can.h"
 #include "irq.h"
 
@@ -44,8 +46,6 @@
 
 #define CAN_MAX_DATA_FRAME          (64)
 
-#define CAN_FIFO0                   FDCAN_RX_FIFO0
-#define CAN_FIFO1                   FDCAN_RX_FIFO1
 #define CAN_FILTER_FIFO0            (0)
 
 // Default timings; 125Kbps
@@ -82,21 +82,6 @@
 #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
-#define CAN_IT_FIFO0_OVRF           FDCAN_IT_RX_FIFO0_MESSAGE_LOST
-#define CAN_IT_FIFO1_OVRF           FDCAN_IT_RX_FIFO1_MESSAGE_LOST
-#define CAN_IT_FIFO0_PENDING        FDCAN_IT_RX_FIFO0_NEW_MESSAGE
-#define CAN_IT_FIFO1_PENDING        FDCAN_IT_RX_FIFO1_NEW_MESSAGE
-#define CAN_FLAG_FIFO0_FULL         FDCAN_FLAG_RX_FIFO0_FULL
-#define CAN_FLAG_FIFO1_FULL         FDCAN_FLAG_RX_FIFO1_FULL
-#define CAN_FLAG_FIFO0_OVRF         FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST
-#define CAN_FLAG_FIFO1_OVRF         FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST
-
-#define __HAL_CAN_ENABLE_IT         __HAL_FDCAN_ENABLE_IT
-#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
 extern const uint8_t DLCtoBytes[16];
 #else
 
@@ -113,21 +98,27 @@ extern const uint8_t DLCtoBytes[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
-#define CAN_IT_FIFO1_OVRF           CAN_IT_FOV1
-#define CAN_IT_FIFO0_PENDING        CAN_IT_FMP0
-#define CAN_IT_FIFO1_PENDING        CAN_IT_FMP1
-#define CAN_FLAG_FIFO0_FULL         CAN_FLAG_FF0
-#define CAN_FLAG_FIFO1_FULL         CAN_FLAG_FF1
-#define CAN_FLAG_FIFO0_OVRF         CAN_FLAG_FOV0
-#define CAN_FLAG_FIFO1_OVRF         CAN_FLAG_FOV1
-
 static uint8_t can2_start_bank = 14;
 
 #endif
 
+static mp_obj_t pyb_can_deinit(mp_obj_t self_in);
+
+void pyb_can_init0(void) {
+    for (uint i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(pyb_can_obj_all)); i++) {
+        MP_STATE_PORT(pyb_can_obj_all)[i] = NULL;
+    }
+}
+
+void pyb_can_deinit_all(void) {
+    for (int i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(pyb_can_obj_all)); i++) {
+        pyb_can_obj_t *can_obj = MP_STATE_PORT(pyb_can_obj_all)[i];
+        if (can_obj != NULL) {
+            pyb_can_deinit(MP_OBJ_FROM_PTR(can_obj));
+        }
+    }
+}
+
 static void pyb_can_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->is_enabled) {
@@ -283,15 +274,20 @@ static mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
     // 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);
+        can_clearfilter(&self->can, f, can2_start_bank);
     }
     #endif
 
-    if (!can_init(self, args[ARG_mode].u_int, args[ARG_prescaler].u_int, args[ARG_sjw].u_int,
+    if (!can_init(&self->can, self->can_id, 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) init failure"), self->can_id);
     }
 
+    self->is_enabled = true;
+    self->num_error_warning = 0;
+    self->num_error_passive = 0;
+    self->num_bus_off = 0;
+
     return mp_const_none;
 }
 
@@ -346,7 +342,7 @@ static mp_obj_t pyb_can_make_new(const mp_obj_type_t *type, size_t n_args, size_
         if (self->is_enabled) {
             // The caller is requesting a reconfiguration of the hardware
             // this can only be done if the hardware is in init mode
-            can_deinit(self);
+            pyb_can_deinit(MP_OBJ_FROM_PTR(self));
         }
 
         self->rxcallback0 = mp_const_none;
@@ -373,7 +369,8 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_init_obj, 1, pyb_can_init);
 // deinit()
 static mp_obj_t pyb_can_deinit(mp_obj_t self_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    can_deinit(self);
+    can_deinit(&self->can);
+    self->is_enabled = false;
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(pyb_can_deinit_obj, pyb_can_deinit);
@@ -489,17 +486,8 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_can_info_obj, 1, 2, pyb_can_info)
 // any(fifo) - return `True` if any message waiting on the FIFO, else `False`
 static mp_obj_t pyb_can_any(mp_obj_t self_in, mp_obj_t fifo_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t fifo = mp_obj_get_int(fifo_in);
-    if (fifo == 0) {
-        if (__HAL_CAN_MSG_PENDING(&self->can, CAN_FIFO0) != 0) {
-            return mp_const_true;
-        }
-    } else {
-        if (__HAL_CAN_MSG_PENDING(&self->can, CAN_FIFO1) != 0) {
-            return mp_const_true;
-        }
-    }
-    return mp_const_false;
+    can_rx_fifo_t fifo = mp_obj_get_int(fifo_in);
+    return mp_obj_new_bool(can_rx_pending(&self->can, fifo) != 0);
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_any_obj, pyb_can_any);
 
@@ -533,6 +521,7 @@ static mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     }
 
     // send the data
+    HAL_StatusTypeDef status;
     CanTxMsgTypeDef tx_msg;
 
     #if MICROPY_HW_ENABLE_FDCAN
@@ -594,27 +583,7 @@ static mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         tx_data[i] = ((byte *)bufinfo.buf)[i];
     }
 
-    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;
-    status = CAN_Transmit(&self->can, args[ARG_timeout].u_int);
-    #endif
+    status = can_transmit(&self->can, &tx_msg, tx_data, args[ARG_timeout].u_int);
 
     if (status != HAL_OK) {
         mp_hal_raise(status);
@@ -646,12 +615,8 @@ static mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     uint8_t *rx_data = rx_msg.Data;
     #endif
 
-    mp_uint_t fifo = args[ARG_fifo].u_int;
-    if (fifo == 0) {
-        fifo = CAN_FIFO0;
-    } else if (fifo == 1) {
-        fifo = CAN_FIFO1;
-    } else {
+    can_rx_fifo_t fifo = args[ARG_fifo].u_int;
+    if (fifo != CAN_RX_FIFO0 && fifo != CAN_RX_FIFO1) {
         mp_raise_TypeError(NULL);
     }
 
@@ -667,30 +632,28 @@ static mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     #endif
 
     // Manage the rx state machine
-    if ((fifo == CAN_FIFO0 && self->rxcallback0 != mp_const_none) ||
-        (fifo == CAN_FIFO1 && self->rxcallback1 != mp_const_none)) {
-        byte *state = (fifo == CAN_FIFO0) ? &self->rx_state0 : &self->rx_state1;
-
+    if ((fifo == CAN_RX_FIFO0 && self->rxcallback0 != mp_const_none) ||
+        (fifo == CAN_RX_FIFO1 && self->rxcallback1 != mp_const_none)) {
+        bool fifo_empty = can_rx_pending(&self->can, fifo) == 0;
+        byte *state = (fifo == CAN_RX_FIFO0) ? &self->rx_state0 : &self->rx_state1;
         switch (*state) {
             case RX_STATE_FIFO_EMPTY:
                 break;
             case RX_STATE_MESSAGE_PENDING:
-                if (__HAL_CAN_MSG_PENDING(&self->can, fifo) == 0) {
-                    // Fifo is empty
-                    __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_PENDING : CAN_IT_FIFO1_PENDING);
+                if (fifo_empty) {
                     *state = RX_STATE_FIFO_EMPTY;
                 }
                 break;
             case RX_STATE_FIFO_FULL:
-                __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
                 *state = RX_STATE_MESSAGE_PENDING;
                 break;
             case RX_STATE_FIFO_OVERFLOW:
-                __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_OVRF : CAN_IT_FIFO1_OVRF);
-                __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
                 *state = RX_STATE_MESSAGE_PENDING;
                 break;
         }
+
+        // Re-enable any interrupts that were disabled in RX IRQ handlers
+        can_enable_rx_interrupts(&self->can, fifo, fifo_empty);
     }
 
     // Create the tuple, or get the list, that will hold the return values
@@ -756,12 +719,12 @@ static mp_obj_t pyb_can_clearfilter(size_t n_args, const mp_obj_t *pos_args, mp_
     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, args[ARG_extframe].u_bool);
+    can_clearfilter(&self->can, f, args[ARG_extframe].u_bool);
     #else
     if (self->can_id == 2) {
         f += can2_start_bank;
     }
-    can_clearfilter(self, f, can2_start_bank);
+    can_clearfilter(&self->can, f, can2_start_bank);
     #endif
     return mp_const_none;
 }
@@ -945,16 +908,12 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_setfilter_obj, 1, pyb_can_setfilter);
 
 static mp_obj_t pyb_can_rxcallback(mp_obj_t self_in, mp_obj_t fifo_in, mp_obj_t callback_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t fifo = mp_obj_get_int(fifo_in);
+    can_rx_fifo_t fifo = mp_obj_get_int(fifo_in);
     mp_obj_t *callback;
 
-    callback = (fifo == 0) ? &self->rxcallback0 : &self->rxcallback1;
+    callback = (fifo == CAN_RX_FIFO0) ? &self->rxcallback0 : &self->rxcallback1;
     if (callback_in == mp_const_none) {
-        __HAL_CAN_DISABLE_IT(&self->can, (fifo == 0) ? CAN_IT_FIFO0_PENDING : CAN_IT_FIFO1_PENDING);
-        __HAL_CAN_DISABLE_IT(&self->can, (fifo == 0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
-        __HAL_CAN_DISABLE_IT(&self->can, (fifo == 0) ? CAN_IT_FIFO0_OVRF : CAN_IT_FIFO1_OVRF);
-        __HAL_CAN_CLEAR_FLAG(&self->can, (fifo == CAN_FIFO0) ? CAN_FLAG_FIFO0_FULL : CAN_FLAG_FIFO1_FULL);
-        __HAL_CAN_CLEAR_FLAG(&self->can, (fifo == CAN_FIFO0) ? CAN_FLAG_FIFO0_OVRF : CAN_FLAG_FIFO1_OVRF);
+        can_disable_rx_interrupts(&self->can, fifo);
         *callback = mp_const_none;
     } else if (*callback != mp_const_none) {
         // Rx call backs has already been initialized
@@ -964,21 +923,19 @@ static mp_obj_t pyb_can_rxcallback(mp_obj_t self_in, mp_obj_t fifo_in, mp_obj_t
         *callback = callback_in;
         uint32_t irq = 0;
         if (self->can_id == PYB_CAN_1) {
-            irq = (fifo == 0) ? CAN1_RX0_IRQn : CAN1_RX1_IRQn;
+            irq = (fifo == CAN_RX_FIFO0) ? CAN1_RX0_IRQn : CAN1_RX1_IRQn;
         #if defined(CAN2)
         } else if (self->can_id == PYB_CAN_2) {
-            irq = (fifo == 0) ? CAN2_RX0_IRQn : CAN2_RX1_IRQn;
+            irq = (fifo == CAN_RX_FIFO0) ? CAN2_RX0_IRQn : CAN2_RX1_IRQn;
         #endif
         #if defined(CAN3)
         } else {
-            irq = (fifo == 0) ? CAN3_RX0_IRQn : CAN3_RX1_IRQn;
+            irq = (fifo == CAN_RX_FIFO0) ? CAN3_RX0_IRQn : CAN3_RX1_IRQn;
         #endif
         }
         NVIC_SetPriority(irq, IRQ_PRI_CAN);
         HAL_NVIC_EnableIRQ(irq);
-        __HAL_CAN_ENABLE_IT(&self->can, (fifo == 0) ? CAN_IT_FIFO0_PENDING : CAN_IT_FIFO1_PENDING);
-        __HAL_CAN_ENABLE_IT(&self->can, (fifo == 0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
-        __HAL_CAN_ENABLE_IT(&self->can, (fifo == 0) ? CAN_IT_FIFO0_OVRF : CAN_IT_FIFO1_OVRF);
+        can_enable_rx_interrupts(&self->can, fifo, true);
     }
     return mp_const_none;
 }
@@ -1038,8 +995,8 @@ static mp_uint_t can_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
         uintptr_t flags = arg;
         ret = 0;
         if ((flags & MP_STREAM_POLL_RD)
-            && ((__HAL_CAN_MSG_PENDING(&self->can, CAN_FIFO0) != 0)
-                || (__HAL_CAN_MSG_PENDING(&self->can, CAN_FIFO1) != 0))) {
+            && ((can_rx_pending(&self->can, 0) != 0)
+                || (can_rx_pending(&self->can, 1) != 0))) {
             ret |= MP_STREAM_POLL_RD;
         }
         #if MICROPY_HW_ENABLE_FDCAN
@@ -1057,17 +1014,62 @@ static mp_uint_t can_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     return ret;
 }
 
-void pyb_can_handle_callback(pyb_can_obj_t *self, uint fifo_id, mp_obj_t callback, mp_obj_t irq_reason) {
+// IRQ handler, called from lower layer can.c or fdcan.c in ISR context
+
+void can_irq_handler(uint can_id,  can_int_t interrupt, can_rx_fifo_t fifo) {
+    mp_obj_t callback;
+    pyb_can_obj_t *self;
+    byte *state;
+
+    self = MP_STATE_PORT(pyb_can_obj_all)[can_id - 1];
+
+    if (fifo == CAN_RX_FIFO0) {
+        callback = self->rxcallback0;
+        state = &self->rx_state0;
+    } else {
+        callback = self->rxcallback1;
+        state = &self->rx_state1;
+    }
+
+    switch (interrupt) {
+        // These interrupts go on to run a Python callback, interrupt arg is the
+        // 'interrupt' enum value as an int.
+        case CAN_INT_MESSAGE_RECEIVED:
+            *state = RX_STATE_MESSAGE_PENDING;
+            break;
+        case CAN_INT_FIFO_FULL:
+            *state = RX_STATE_FIFO_FULL;
+            break;
+        case CAN_INT_FIFO_OVERFLOW:
+            *state = RX_STATE_FIFO_OVERFLOW;
+            break;
+
+        // These interrupts do not run a Python callback
+        case CAN_INT_ERR_BUS_OFF:
+            self->num_bus_off++;
+            return;
+        case CAN_INT_ERR_PASSIVE:
+            self->num_error_passive++;
+            return;
+        case CAN_INT_ERR_WARNING:
+            self->num_error_warning++;
+            return;
+
+        default:
+            return; // Should be unreachable
+    }
+
+    // Run the callback
     if (callback != mp_const_none) {
         mp_sched_lock();
         gc_lock();
         nlr_buf_t nlr;
         if (nlr_push(&nlr) == 0) {
-            mp_call_function_2(callback, MP_OBJ_FROM_PTR(self), irq_reason);
+            mp_call_function_2(callback, MP_OBJ_FROM_PTR(self), MP_OBJ_NEW_SMALL_INT(interrupt));
             nlr_pop();
         } else {
             // Uncaught exception; disable the callback so it doesn't run again.
-            pyb_can_rxcallback(MP_OBJ_FROM_PTR(self), MP_OBJ_NEW_SMALL_INT(fifo_id), mp_const_none);
+            pyb_can_rxcallback(MP_OBJ_FROM_PTR(self), MP_OBJ_NEW_SMALL_INT(fifo), mp_const_none);
             mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in CAN(%u) rx interrupt handler\n", self->can_id);
             mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
         }
diff --git a/ports/stm32/pyb_can.h b/ports/stm32/pyb_can.h
new file mode 100644
index 0000000000000..a82043d7863ed
--- /dev/null
+++ b/ports/stm32/pyb_can.h
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+#ifndef MICROPY_INCLUDED_STM32_PYB_CAN_H
+#define MICROPY_INCLUDED_STM32_PYB_CAN_H
+
+#include "py/mphal.h"
+
+#if MICROPY_HW_ENABLE_CAN
+
+#include "py/obj.h"
+#include "can.h"
+
+typedef struct _pyb_can_obj_t {
+    mp_obj_base_t base;
+    mp_obj_t rxcallback0;
+    mp_obj_t rxcallback1;
+    mp_uint_t can_id : 8;
+    bool is_enabled : 1;
+    byte rx_state0;
+    byte rx_state1;
+    uint16_t num_error_warning;
+    uint16_t num_error_passive;
+    uint16_t num_bus_off;
+    CAN_HandleTypeDef can;
+} pyb_can_obj_t;
+
+extern const mp_obj_type_t pyb_can_type;
+
+void pyb_can_deinit_all(void);
+void pyb_can_init0(void);
+
+void pyb_can_irq_handler(uint can_id, can_rx_fifo_t fifo, can_int_t interrupt);
+
+#endif
+#endif

From dbda43b9e14ac1aa8a293840d3242d3baa489b18 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 23 May 2024 17:48:31 +1000
Subject: [PATCH 1976/3129] tests/multi_pyb_can: Add multitests for pyboard CAN
 controller.

Currently only classic CAN, but tests run on both the stm32 classic CAN
controller and the FD-CAN controller with the same results.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_pyb_can/rx_callback.py     | 98 ++++++++++++++++++++++++++
 tests/multi_pyb_can/rx_callback.py.exp |  9 +++
 tests/multi_pyb_can/rx_filters.py      | 50 +++++++++++++
 tests/multi_pyb_can/rx_filters.py.exp  | 15 ++++
 4 files changed, 172 insertions(+)
 create mode 100644 tests/multi_pyb_can/rx_callback.py
 create mode 100644 tests/multi_pyb_can/rx_callback.py.exp
 create mode 100644 tests/multi_pyb_can/rx_filters.py
 create mode 100644 tests/multi_pyb_can/rx_filters.py.exp

diff --git a/tests/multi_pyb_can/rx_callback.py b/tests/multi_pyb_can/rx_callback.py
new file mode 100644
index 0000000000000..960a225c93f28
--- /dev/null
+++ b/tests/multi_pyb_can/rx_callback.py
@@ -0,0 +1,98 @@
+from pyb import CAN
+import time
+import errno
+
+# Test the various receive IRQs, including overflow
+
+rx_overflow = False
+
+REASONS = ["received", "full", "overflow"]
+
+# CAN IDs
+ID_SPAM = 0x345  # messages spammed into the receive FIFO
+ID_ACK_OFLOW = 0x055  # message the receiver sends after it's seen an overflow
+ID_AFTER = 0x100  # message the sender sends after the ACK
+
+
+def cb0(bus, reason):
+    global rx_overflow
+    if reason != 0 and not rx_overflow:
+        # exact timing of 'received' callbacks depends on controller type,
+        # so only log the other two
+        print("rx0 reason", REASONS[reason])
+    if reason == 2:
+        rx_overflow = True
+
+
+# Accept all standard IDs on FIFO 0
+def _enable_accept_all():
+    if hasattr(CAN, "MASK"):  # FD-CAN controller
+        can.setfilter(0, CAN.RANGE, 0, (0x0, 0x7FF), extframe=False)
+    else:
+        can.setfilter(0, CAN.MASK16, 0, (0, 0, 0, 0), extframe=False)
+
+
+# Receiver
+def instance0():
+    _enable_accept_all()
+    can.rxcallback(0, cb0)
+
+    multitest.next()
+    multitest.wait("sender ready")
+    multitest.broadcast("receiver ready")
+
+    while not rx_overflow:
+        pass  # Resume ASAP after FIFO0 overflows
+
+    can.send(b"overflow", ID_ACK_OFLOW)
+
+    # drain the receive FIFO, making sure we read at least on ID_SPAM message
+    rxed_spam = False
+    while can.any(0):
+        msg = can.recv(0, timeout=0)
+        assert msg[0] == ID_SPAM
+        rxed_spam = True
+    print("rxed_spam", rxed_spam)
+
+    # This should be the one message with ID_AFTER, there may be one or two spam messages as well
+    for _ in range(10):
+        msg = can.recv(0, timeout=500)
+        if msg[0] == ID_AFTER:
+            print(msg)
+            break
+
+    # RX FIFO should be empty now
+    print("any", can.any(0))
+
+
+# Sender
+def instance1():
+    _enable_accept_all()
+    multitest.next()
+    multitest.broadcast("sender ready")
+    multitest.wait("receiver ready")
+
+    # Spam out messages until the receiver tells us its RX FIFO is full.
+    #
+    # The RX FIFO on the receiver can vary from 3 deep (BXCAN) to 25 deep (STM32H7),
+    # so we keep sending to it until we see a CAN message on ID_ACK_OFLOW indicating
+    # the receiver's FIFO has overflowed
+    for i in range(255):
+        can.send(bytes([i] * 8), ID_SPAM, timeout=25)
+        if can.any(0):
+            print(can.recv(0))  # should be ID_ACK_OFLOW
+            break
+        # on boards like STM32H7 the TX FIFO is really deep, so don't fill it too quickly...
+        time.sleep_ms(1)
+
+    # give the receiver some time to make space in the FIFO
+    time.sleep_ms(200)
+
+    # send the final message, the receiver should get this one
+    can.send(b"aaaaa", ID_AFTER)
+
+    # Sender's RX FIFO should also be empty at this point
+    print("any", can.any(0))
+
+
+can = CAN(1, CAN.NORMAL, baudrate=500_000, sample_point=75)
diff --git a/tests/multi_pyb_can/rx_callback.py.exp b/tests/multi_pyb_can/rx_callback.py.exp
new file mode 100644
index 0000000000000..3ab197cc10319
--- /dev/null
+++ b/tests/multi_pyb_can/rx_callback.py.exp
@@ -0,0 +1,9 @@
+--- instance0 ---
+rx0 reason full
+rx0 reason overflow
+rxed_spam True
+(256, False, False, 0, b'aaaaa')
+any False
+--- instance1 ---
+(85, False, False, 0, b'overflow')
+any False
diff --git a/tests/multi_pyb_can/rx_filters.py b/tests/multi_pyb_can/rx_filters.py
new file mode 100644
index 0000000000000..22e5eb0364748
--- /dev/null
+++ b/tests/multi_pyb_can/rx_filters.py
@@ -0,0 +1,50 @@
+from pyb import CAN
+import time
+import errno
+
+# Test for the filtering capabilities for RX FIFO 0 and 1.
+
+
+# Receiver
+def instance0():
+    # Configure to receive standard frames (in a range) on FIFO 0
+    # and extended frames (in a range) on FIFO 1.
+    if hasattr(CAN, "MASK"):
+        # FD-CAN has independent filter banks for standard and extended IDs
+        can.setfilter(0, CAN.MASK, 0, (0x300, 0x700), extframe=False)
+        can.setfilter(0, CAN.MASK, 1, (0x3000, 0x7000), extframe=True)
+    else:
+        # pyb.CAN only supports MASK32 for extended ids
+        can.setfilter(0, CAN.MASK16, 0, (0x300, 0x700, 0x300, 0x700), extframe=False)
+        can.setfilter(1, CAN.MASK32, 1, (0x3000, 0x7000), extframe=True)
+
+    multitest.next()
+    multitest.wait("sender ready")
+    multitest.broadcast("receiver ready")
+    for i in range(3):
+        print(i)
+        print("fifo0", can.recv(0, timeout=200))
+        print("fifo1", can.recv(1, timeout=200))
+
+    try:
+        can.recv(0, timeout=100)  # should time out
+    except OSError as e:
+        assert e.errno == errno.ETIMEDOUT
+        print("Timed out as expected")
+
+
+# Sender
+def instance1():
+    multitest.next()
+    multitest.broadcast("sender ready")
+    multitest.wait("receiver ready")
+
+    for i in range(3):
+        print(i)
+        can.send(bytes([i, 3] * i), 0x345)
+        can.send(bytes([0xEE] * i), 0x3700 + i, extframe=True)
+        can.send(b"abcdef", 0x123)  # matches no filter, expect ACKed but not received
+        time.sleep_ms(5)  # avoid flooding either our or the receiver's FIFO
+
+
+can = CAN(1, CAN.NORMAL, baudrate=500_000, sample_point=75)
diff --git a/tests/multi_pyb_can/rx_filters.py.exp b/tests/multi_pyb_can/rx_filters.py.exp
new file mode 100644
index 0000000000000..65fbdf4b1b22b
--- /dev/null
+++ b/tests/multi_pyb_can/rx_filters.py.exp
@@ -0,0 +1,15 @@
+--- instance0 ---
+0
+fifo0 (837, False, False, 0, b'')
+fifo1 (14080, True, False, 0, b'')
+1
+fifo0 (837, False, False, 0, b'\x01\x03')
+fifo1 (14081, True, False, 0, b'\xee')
+2
+fifo0 (837, False, False, 0, b'\x02\x03\x02\x03')
+fifo1 (14082, True, False, 0, b'\xee\xee')
+Timed out as expected
+--- instance1 ---
+0
+1
+2

From f187c77da8b0ff51927b62cd1f4efd78c03bdb7f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 27 Feb 2025 09:03:17 +0100
Subject: [PATCH 1977/3129] shared/runtime/pyexec: Add helper function to
 execute a vstr.

Add `pyexec_vstr()` to execute Python code from a vstr source.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 shared/runtime/pyexec.c | 5 +++++
 shared/runtime/pyexec.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 9dc4446ed4d66..c828c75817940 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -720,6 +720,11 @@ int pyexec_frozen_module(const char *name, bool allow_keyboard_interrupt) {
 }
 #endif
 
+int pyexec_vstr(vstr_t *str, bool allow_keyboard_interrupt) {
+    mp_uint_t exec_flags = allow_keyboard_interrupt ? 0 : EXEC_FLAG_NO_INTERRUPT;
+    return parse_compile_execute(str, MP_PARSE_FILE_INPUT, exec_flags | EXEC_FLAG_SOURCE_IS_VSTR);
+}
+
 #if MICROPY_REPL_INFO
 mp_obj_t pyb_set_repl_info(mp_obj_t o_value) {
     repl_display_debugging_info = mp_obj_get_int(o_value);
diff --git a/shared/runtime/pyexec.h b/shared/runtime/pyexec.h
index 5779d3e09a8c4..95f4481626611 100644
--- a/shared/runtime/pyexec.h
+++ b/shared/runtime/pyexec.h
@@ -42,6 +42,7 @@ int pyexec_friendly_repl(void);
 int pyexec_file(const char *filename);
 int pyexec_file_if_exists(const char *filename);
 int pyexec_frozen_module(const char *name, bool allow_keyboard_interrupt);
+int pyexec_vstr(vstr_t *str, bool allow_keyboard_interrupt);
 void pyexec_event_repl_init(void);
 int pyexec_event_repl_process_char(int c);
 extern uint8_t pyexec_repl_active;

From 51976110e2da32b7a5b7035b7d5f17ab49bbd40e Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Thu, 12 Sep 2024 14:39:59 +0300
Subject: [PATCH 1978/3129] tools/mpy_ld.py: Allow linking static libraries.

This commit introduces an additional symbol resolution mechanism to the
natmod linking process.  This allows the build scripts to look for required
symbols into selected libraries that are provided by the compiler
installation (libgcc and libm at the moment).

For example, using soft-float code in natmods, whilst technically possible,
was not an easy process and required some additional work to pull it off.
With this addition all the manual (and error-prone) operations have been
automated and folded into `tools/mpy_ld.py`.

Both newlib and picolibc toolchains are supported, albeit the latter may
require a bit of extra configuration depending on the environment the build
process runs on.  Picolibc's soft-float functions aren't in libm - in fact
the shipped libm is nothing but a stub - but they are inside libc.  This is
usually not a problem as these changes cater for that configuration quirk,
but on certain compilers the include paths used to find libraries in may
not be updated to take Picolibc's library directory into account.  The bare
metal RISC-V compiler shipped with the CI OS image (GCC 10.2.0 on Ubuntu
22.04LTS) happens to exhibit this very problem.

To work around that for CI builds, the Picolibc libraries' path is
hardcoded in the Makefile directives used by the linker, but this can be
changed by setting the PICOLIBC_ROOT environment library when building
natmods.

Signed-off-by: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Co-authored-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/develop/natmod.rst            |   7 +
 examples/natmod/features2/Makefile |   3 +
 examples/natmod/features2/main.c   |  11 ++
 py/dynruntime.mk                   |  81 +++++++---
 tools/ar_util.py                   | 236 +++++++++++++++++++++++++++++
 tools/ci.sh                        |  44 +++++-
 tools/mpy_ld.py                    | 140 ++++++++++-------
 7 files changed, 440 insertions(+), 82 deletions(-)
 create mode 100644 tools/ar_util.py

diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index ba45e4305c66d..18678eaefbf11 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -70,6 +70,13 @@ The known limitations are:
 So, if your C code has writable data, make sure the data is defined globally,
 without an initialiser, and only written to within functions.
 
+The native module is not automatically linked against the standard static libraries
+like ``libm.a`` and ``libgcc.a``, which can lead to ``undefined symbol`` errors.
+You can link the runtime libraries by setting ``LINK_RUNTIME = 1``
+in your Makefile. Custom static libraries can also be linked by adding
+``MPY_LD_FLAGS += -l path/to/library.a``. Note that these are linked into
+the native module and will not be shared with other modules or the system.
+
 Linker limitation: the native module is not linked against the symbol table of the
 full MicroPython firmware.  Rather, it is linked against an explicit table of exported
 symbols found in ``mp_fun_table`` (in ``py/nativeglue.h``), that is fixed at firmware
diff --git a/examples/natmod/features2/Makefile b/examples/natmod/features2/Makefile
index 4fd23c6879d47..5ddb74087b71a 100644
--- a/examples/natmod/features2/Makefile
+++ b/examples/natmod/features2/Makefile
@@ -10,5 +10,8 @@ SRC = main.c prod.c test.py
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
 ARCH = x64
 
+# Link with libm.a and libgcc.a from the toolchain
+LINK_RUNTIME = 1
+
 # Include to get the rules for compiling and linking the module
 include $(MPY_DIR)/py/dynruntime.mk
diff --git a/examples/natmod/features2/main.c b/examples/natmod/features2/main.c
index 22961aa494f5f..5ce8e7b013020 100644
--- a/examples/natmod/features2/main.c
+++ b/examples/natmod/features2/main.c
@@ -1,5 +1,6 @@
 /* This example demonstrates the following features in a native module:
     - using floats
+    - calling math functions from libm.a
     - defining additional code in Python (see test.py)
     - have extra C code in a separate file (see prod.c)
 */
@@ -10,6 +11,9 @@
 // Include the header for auxiliary C code for this module
 #include "prod.h"
 
+// Include standard library header
+#include <math.h>
+
 // Automatically detect if this module should include double-precision code.
 // If double precision is supported by the target architecture then it can
 // be used in native module regardless of what float setting the target
@@ -41,6 +45,12 @@ static mp_obj_t add_d(mp_obj_t x, mp_obj_t y) {
 static MP_DEFINE_CONST_FUN_OBJ_2(add_d_obj, add_d);
 #endif
 
+// A function that uses libm
+static mp_obj_t call_round(mp_obj_t x) {
+    return mp_obj_new_float_from_f(roundf(mp_obj_get_float_to_f(x)));
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(round_obj, call_round);
+
 // A function that computes the product of floats in an array.
 // This function uses the most general C argument interface, which is more difficult
 // to use but has access to the globals dict of the module via self->globals.
@@ -74,6 +84,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     #if USE_DOUBLE
     mp_store_global(MP_QSTR_add_d, MP_OBJ_FROM_PTR(&add_d_obj));
     #endif
+    mp_store_global(MP_QSTR_round, MP_OBJ_FROM_PTR(&round_obj));
 
     // The productf function uses the most general C argument interface
     mp_store_global(MP_QSTR_productf, MP_DYNRUNTIME_MAKE_FUNCTION(productf));
diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 68d5e2e268f5b..807befb464a84 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -29,16 +29,17 @@ CFLAGS += -Wall -Werror -DNDEBUG
 CFLAGS += -DNO_QSTR
 CFLAGS += -DMICROPY_ENABLE_DYNRUNTIME
 CFLAGS += -DMP_CONFIGFILE='<$(CONFIG_H)>'
-CFLAGS += -fpic -fno-common
-CFLAGS += -U _FORTIFY_SOURCE # prevent use of __*_chk libc functions
-#CFLAGS += -fdata-sections -ffunction-sections
+
+CFLAGS_ARCH += -fpic -fno-common
+CFLAGS_ARCH += -U_FORTIFY_SOURCE # prevent use of __*_chk libc functions
+#CFLAGS_ARCH += -fdata-sections -ffunction-sections
 
 MPY_CROSS_FLAGS += -march=$(ARCH)
 
 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))))
 
-CLEAN_EXTRA += $(MOD).mpy
+CLEAN_EXTRA += $(MOD).mpy .mpy_ld_cache
 
 ################################################################################
 # Architecture configuration
@@ -47,72 +48,74 @@ ifeq ($(ARCH),x86)
 
 # x86
 CROSS =
-CFLAGS += -m32 -fno-stack-protector
+CFLAGS_ARCH += -m32 -fno-stack-protector
 MICROPY_FLOAT_IMPL ?= double
 
 else ifeq ($(ARCH),x64)
 
 # x64
 CROSS =
-CFLAGS += -fno-stack-protector
+CFLAGS_ARCH += -fno-stack-protector
 MICROPY_FLOAT_IMPL ?= double
 
 else ifeq ($(ARCH),armv6m)
 
 # thumb
 CROSS = arm-none-eabi-
-CFLAGS += -mthumb -mcpu=cortex-m0
+CFLAGS_ARCH += -mthumb -mcpu=cortex-m0
 MICROPY_FLOAT_IMPL ?= none
 
 else ifeq ($(ARCH),armv7m)
 
 # thumb
 CROSS = arm-none-eabi-
-CFLAGS += -mthumb -mcpu=cortex-m3
+CFLAGS_ARCH += -mthumb -mcpu=cortex-m3
 MICROPY_FLOAT_IMPL ?= none
 
 else ifeq ($(ARCH),armv7emsp)
 
 # thumb
 CROSS = arm-none-eabi-
-CFLAGS += -mthumb -mcpu=cortex-m4
-CFLAGS += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+CFLAGS_ARCH += -mthumb -mcpu=cortex-m4
+CFLAGS_ARCH += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 MICROPY_FLOAT_IMPL ?= float
 
 else ifeq ($(ARCH),armv7emdp)
 
 # thumb
 CROSS = arm-none-eabi-
-CFLAGS += -mthumb -mcpu=cortex-m7
-CFLAGS += -mfpu=fpv5-d16 -mfloat-abi=hard
+CFLAGS_ARCH += -mthumb -mcpu=cortex-m7
+CFLAGS_ARCH += -mfpu=fpv5-d16 -mfloat-abi=hard
 MICROPY_FLOAT_IMPL ?= double
 
 else ifeq ($(ARCH),xtensa)
 
 # xtensa
 CROSS = xtensa-lx106-elf-
-CFLAGS += -mforce-l32
+CFLAGS_ARCH += -mforce-l32
 MICROPY_FLOAT_IMPL ?= none
 
 else ifeq ($(ARCH),xtensawin)
 
 # xtensawin
 CROSS = xtensa-esp32-elf-
-CFLAGS +=
 MICROPY_FLOAT_IMPL ?= float
 
 else ifeq ($(ARCH),rv32imc)
 
 # rv32imc
 CROSS = riscv64-unknown-elf-
-CFLAGS += -march=rv32imac -mabi=ilp32 -mno-relax
+CFLAGS_ARCH += -march=rv32imac -mabi=ilp32 -mno-relax
 # If Picolibc is available then select it explicitly.  Ubuntu 22.04 ships its
 # bare metal RISC-V toolchain with Picolibc rather than Newlib, and the default
 # is "nosys" so a value must be provided.  To avoid having per-distro
 # workarounds, always select Picolibc if available.
-PICOLIBC_SPECS = $(shell $(CROSS)gcc --print-file-name=picolibc.specs)
+PICOLIBC_SPECS := $(shell $(CROSS)gcc --print-file-name=picolibc.specs)
 ifneq ($(PICOLIBC_SPECS),picolibc.specs)
-CFLAGS += --specs=$(PICOLIBC_SPECS)
+CFLAGS_ARCH += -specs=$(PICOLIBC_SPECS)
+USE_PICOLIBC := 1
+PICOLIBC_ARCH := rv32imac
+PICOLIBC_ABI := ilp32
 endif
 
 MICROPY_FLOAT_IMPL ?= none
@@ -122,7 +125,47 @@ $(error architecture '$(ARCH)' not supported)
 endif
 
 MICROPY_FLOAT_IMPL_UPPER = $(shell echo $(MICROPY_FLOAT_IMPL) | tr '[:lower:]' '[:upper:]')
-CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_$(MICROPY_FLOAT_IMPL_UPPER)
+CFLAGS += $(CFLAGS_ARCH) -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_$(MICROPY_FLOAT_IMPL_UPPER)
+
+ifeq ($(LINK_RUNTIME),1)
+# All of these picolibc-specific directives are here to work around a
+# limitation of Ubuntu 22.04's RISC-V bare metal toolchain.  In short, the
+# specific version of GCC in use (10.2.0) does not seem to take into account
+# extra paths provided by an explicitly passed specs file when performing name
+# resolution via `--print-file-name`.
+#
+# If Picolibc is used and libc.a fails to resolve, then said file's path will
+# be computed by searching the Picolibc libraries root for a libc.a file in a
+# subdirectory whose path is built using the current `-march` and `-mabi`
+# flags that are passed to GCC.  The `PICOLIBC_ROOT` environment variable is
+# checked to override the starting point for the library file search, and if
+# it is not set then the default value is used, assuming that this is running
+# on an Ubuntu 22.04 machine.
+#
+# This should be revised when the CI base image is updated to a newer Ubuntu
+# version (that hopefully contains a newer RISC-V compiler) or to another Linux
+# distribution.
+ifeq ($(USE_PICOLIBC),1)
+LIBM_NAME := libc.a
+else
+LIBM_NAME := libm.a
+endif
+LIBGCC_PATH := $(realpath $(shell $(CROSS)gcc $(CFLAGS) --print-libgcc-file-name))
+LIBM_PATH := $(realpath $(shell $(CROSS)gcc $(CFLAGS) --print-file-name=$(LIBM_NAME)))
+ifeq ($(USE_PICOLIBC),1)
+ifeq ($(LIBM_PATH),)
+# The CROSS toolchain prefix usually ends with a dash, but that may not be
+# always the case.  If the prefix ends with a dash it has to be taken out as
+# Picolibc's architecture directory won't have it in its name.  GNU Make does
+# not have any facility to perform character-level text manipulation so we
+# shell out to sed.
+CROSS_PREFIX := $(shell echo $(CROSS) | sed -e 's/-$$//')
+PICOLIBC_ROOT ?= /usr/lib/picolibc/$(CROSS_PREFIX)/lib
+LIBM_PATH := $(PICOLIBC_ROOT)/$(PICOLIBC_ARCH)/$(PICOLIBC_ABI)/$(LIBM_NAME)
+endif
+endif
+MPY_LD_FLAGS += $(addprefix -l, $(LIBGCC_PATH) $(LIBM_PATH))
+endif
 
 CFLAGS += $(CFLAGS_EXTRA)
 
@@ -165,7 +208,7 @@ $(BUILD)/%.mpy: %.py
 # Build native .mpy from object files
 $(BUILD)/$(MOD).native.mpy: $(SRC_O)
 	$(ECHO) "LINK $<"
-	$(Q)$(MPY_LD) --arch $(ARCH) --qstrs $(CONFIG_H) -o $@ $^
+	$(Q)$(MPY_LD) --arch $(ARCH) --qstrs $(CONFIG_H) $(MPY_LD_FLAGS) -o $@ $^
 
 # Build final .mpy from all intermediate .mpy files
 $(MOD).mpy: $(BUILD)/$(MOD).native.mpy $(SRC_MPY)
diff --git a/tools/ar_util.py b/tools/ar_util.py
new file mode 100644
index 0000000000000..b90d379031467
--- /dev/null
+++ b/tools/ar_util.py
@@ -0,0 +1,236 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2024 Volodymyr Shymanskyy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import os
+import re
+import hashlib
+import functools
+import pickle
+
+from elftools.elf import elffile
+from collections import defaultdict
+
+try:
+    from ar import Archive
+except:
+    Archive = None
+
+
+class PickleCache:
+    def __init__(self, path, prefix=""):
+        self.path = path
+        self._get_fn = lambda key: os.path.join(path, prefix + key[:24])
+
+    def store(self, key, data):
+        os.makedirs(self.path, exist_ok=True)
+        # See also https://bford.info/cachedir/
+        cachedir_tag_path = os.path.join(self.path, "CACHEDIR.TAG")
+        if not os.path.exists(cachedir_tag_path):
+            with open(cachedir_tag_path, "w") as f:
+                f.write(
+                    "Signature: 8a477f597d28d172789f06886806bc55\n"
+                    "# This file is a cache directory tag created by MicroPython.\n"
+                    "# For information about cache directory tags see https://bford.info/cachedir/\n"
+                )
+        with open(self._get_fn(key), "wb") as f:
+            pickle.dump(data, f)
+
+    def load(self, key):
+        with open(self._get_fn(key), "rb") as f:
+            return pickle.load(f)
+
+
+def cached(key, cache):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            cache_key = key(*args, **kwargs)
+            try:
+                d = cache.load(cache_key)
+                if d["key"] != cache_key:
+                    raise Exception("Cache key mismatch")
+                return d["data"]
+            except Exception:
+                res = func(*args, **kwargs)
+                try:
+                    cache.store(
+                        cache_key,
+                        {
+                            "key": cache_key,
+                            "data": res,
+                        },
+                    )
+                except Exception:
+                    pass
+                return res
+
+        return wrapper
+
+    return decorator
+
+
+class CachedArFile:
+    def __init__(self, fn):
+        if not Archive:
+            raise RuntimeError("Please run 'pip install ar' to link .a files")
+        self.fn = fn
+        self._archive = Archive(open(fn, "rb"))
+        info = self.load_symbols()
+        self.objs = info["objs"]
+        self.symbols = info["symbols"]
+
+    def open(self, obj):
+        return self._archive.open(obj, "rb")
+
+    def _cache_key(self):
+        sha = hashlib.sha256()
+        with open(self.fn, "rb") as f:
+            for chunk in iter(lambda: f.read(4096), b""):
+                sha.update(chunk)
+        # Change this salt if the cache data format changes
+        sha.update(bytes.fromhex("00000000000000000000000000000001"))
+        return sha.hexdigest()
+
+    @cached(key=_cache_key, cache=PickleCache(path=".mpy_ld_cache", prefix="ar_"))
+    def load_symbols(self):
+        print("Loading", self.fn)
+        objs = defaultdict(lambda: {"def": set(), "undef": set(), "weak": set()})
+        symbols = {}
+        for entry in self._archive:
+            obj_name = entry.name
+            elf = elffile.ELFFile(self.open(obj_name))
+            symtab = elf.get_section_by_name(".symtab")
+            if not symtab:
+                continue
+
+            obj = objs[obj_name]
+
+            for symbol in symtab.iter_symbols():
+                sym_name = symbol.name
+                sym_bind = symbol["st_info"]["bind"]
+
+                if sym_bind in ("STB_GLOBAL", "STB_WEAK"):
+                    if symbol.entry["st_shndx"] != "SHN_UNDEF":
+                        obj["def"].add(sym_name)
+                        symbols[sym_name] = obj_name
+                    else:
+                        obj["undef"].add(sym_name)
+
+                    if sym_bind == "STB_WEAK":
+                        obj["weak"].add(sym_name)
+
+        return {"objs": dict(objs), "symbols": symbols}
+
+
+def resolve(archives, symbols):
+    resolved_objs = []  # Object files needed to resolve symbols
+    unresolved_symbols = set()
+    provided_symbols = {}  # Which symbol is provided by which object
+    symbol_stack = list(symbols)
+
+    # A helper function to handle symbol resolution from a particular object
+    def add_obj(archive, symbol):
+        obj_name = archive.symbols[symbol]
+        obj_info = archive.objs[obj_name]
+
+        obj_tuple = (archive, obj_name)
+        if obj_tuple in resolved_objs:
+            return  # Already processed this object
+
+        resolved_objs.append(obj_tuple)
+
+        # Add the symbols this object defines
+        for defined_symbol in obj_info["def"]:
+            if defined_symbol in provided_symbols and not defined_symbol.startswith(
+                "__x86.get_pc_thunk."
+            ):
+                if defined_symbol in obj_info["weak"]:
+                    continue
+                else:
+                    raise RuntimeError(f"Multiple definitions for {defined_symbol}")
+            provided_symbols[defined_symbol] = obj_name  # TODO: mark weak if needed
+
+        # Recursively add undefined symbols from this object
+        for undef_symbol in obj_info["undef"]:
+            if undef_symbol in obj_info["weak"]:
+                print(f"Skippping weak dependency: {undef_symbol}")
+                continue
+            if undef_symbol not in provided_symbols:
+                symbol_stack.append(undef_symbol)  # Add undefined symbol to resolve
+
+    while symbol_stack:
+        symbol = symbol_stack.pop(0)
+
+        if symbol in provided_symbols:
+            continue  # Symbol is already resolved
+
+        found = False
+        for archive in archives:
+            if symbol in archive.symbols:
+                add_obj(archive, symbol)
+                found = True
+                break
+
+        if not found:
+            unresolved_symbols.add(symbol)
+
+    return resolved_objs, list(unresolved_symbols)
+
+
+def expand_ld_script(fn):
+    # This function parses a subset of ld scripts
+    # Typically these are just groups of static lib references
+    group_pattern = re.compile(r"GROUP\s*\(\s*([^\)]+)\s*\)", re.MULTILINE)
+    output_format_pattern = re.compile(r"OUTPUT_FORMAT\s*\(\s*([^\)]+)\s*\)", re.MULTILINE)
+    comment_pattern = re.compile(r"/\*.*?\*/", re.MULTILINE | re.DOTALL)
+
+    with open(fn, "r") as f:
+        content = f.read()
+        content = comment_pattern.sub("", content).strip()
+
+    # Ensure no unrecognized instructions
+    leftovers = content
+    for pattern in (group_pattern, output_format_pattern):
+        leftovers = pattern.sub("", leftovers)
+    if leftovers.strip():
+        raise ValueError("Invalid instruction found in the ld script:" + leftovers)
+
+    # Extract files from GROUP instructions
+    files = []
+    for match in group_pattern.findall(content):
+        files.extend([file.strip() for file in re.split(r"[,\s]+", match) if file.strip()])
+
+    return files
+
+
+def load_archive(fn):
+    ar_header = b"!<arch>\012"
+    with open(fn, "rb") as f:
+        is_ar_file = f.read(len(ar_header)) == ar_header
+    if is_ar_file:
+        return [CachedArFile(fn)]
+    else:
+        return [CachedArFile(item) for item in expand_ld_script(fn)]
diff --git a/tools/ci.sh b/tools/ci.sh
index 682c3ae507a6d..5d57175c80e94 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -155,12 +155,15 @@ PYTHON_VER=$(python --version | cut -d' ' -f2)
 export IDF_CCACHE_ENABLE=1
 
 function ci_esp32_idf_setup {
-    pip3 install pyelftools
     git clone --depth 1 --branch $IDF_VER https://github.com/espressif/esp-idf.git
     # doing a treeless clone isn't quite as good as --shallow-submodules, but it
     # is smaller than full clones and works when the submodule commit isn't a head.
     git -C esp-idf submodule update --init --recursive --filter=tree:0
     ./esp-idf/install.sh
+    # Install additional packages for mpy_ld into the IDF env
+    source esp-idf/export.sh
+    pip3 install pyelftools
+    pip3 install ar
 }
 
 function ci_esp32_build_common {
@@ -287,6 +290,7 @@ function ci_qemu_setup_arm {
     sudo apt-get update
     sudo apt-get install qemu-system
     sudo pip3 install pyelftools
+    sudo pip3 install ar
     qemu-system-arm --version
 }
 
@@ -295,6 +299,7 @@ function ci_qemu_setup_rv32 {
     sudo apt-get update
     sudo apt-get install qemu-system
     sudo pip3 install pyelftools
+    sudo pip3 install ar
     qemu-system-riscv32 --version
 }
 
@@ -385,6 +390,7 @@ function ci_samd_build {
 function ci_stm32_setup {
     ci_gcc_arm_setup
     pip3 install pyelftools
+    pip3 install ar
     pip3 install pyhy
 }
 
@@ -503,18 +509,40 @@ function ci_native_mpy_modules_build {
     else
         arch=$1
     fi
-    for natmod in features1 features3 features4 deflate framebuf heapq random re
+    for natmod in features1 features3 features4 heapq re
     do
+        make -C examples/natmod/$natmod clean
         make -C examples/natmod/$natmod ARCH=$arch
     done
-    # btree requires thread local storage support on rv32imc.
-    if [ $arch != rv32imc ]; then
-        make -C examples/natmod/btree ARCH=$arch
+
+    # deflate, framebuf, and random currently cannot build on xtensa due to
+    # some symbols that have been removed from the compiler's runtime, in
+    # favour of being provided from ROM.
+    if [ $arch != "xtensa" ]; then
+        for natmod in deflate framebuf random
+        do
+            make -C examples/natmod/$natmod clean
+            make -C examples/natmod/$natmod ARCH=$arch
+        done
     fi
-    # features2 requires soft-float on armv7m and rv32imc.
-    if [ $arch != rv32imc ] && [ $arch != armv7m ]; then
+
+    # features2 requires soft-float on armv7m, rv32imc, and xtensa.  On armv6m
+    # the compiler generates absolute relocations in the object file
+    # referencing soft-float functions, which is not supported at the moment.
+    make -C examples/natmod/features2 clean
+    if [ $arch = "rv32imc" ] || [ $arch = "armv7m" ] || [ $arch = "xtensa" ]; then
+        make -C examples/natmod/features2 ARCH=$arch MICROPY_FLOAT_IMPL=float
+    elif [ $arch != "armv6m" ]; then
         make -C examples/natmod/features2 ARCH=$arch
     fi
+
+    # btree requires thread local storage support on rv32imc, whilst on xtensa
+    # it relies on symbols that are provided from ROM but not exposed to
+    # natmods at the moment.
+    if [ $arch != "rv32imc" ] && [ $arch != "xtensa" ]; then
+        make -C examples/natmod/btree clean
+        make -C examples/natmod/btree ARCH=$arch
+    fi
 }
 
 function ci_native_mpy_modules_32bit_build {
@@ -550,6 +578,7 @@ function ci_unix_standard_v2_run_tests {
 function ci_unix_coverage_setup {
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
+    sudo pip3 install ar
     gcc --version
     python3 --version
 }
@@ -598,6 +627,7 @@ function ci_unix_32bit_setup {
     sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386 python2.7
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
+    sudo pip3 install ar
     gcc --version
     python2.7 --version
     python3 --version
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 54295208f1a29..44a76bdee6bf0 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -30,6 +30,7 @@
 
 import sys, os, struct, re
 from elftools.elf import elffile
+import ar_util
 
 sys.path.append(os.path.dirname(__file__) + "/../py")
 import makeqstrdata as qstrutil
@@ -664,7 +665,7 @@ def do_relocation_text(env, text_addr, r):
         R_XTENSA_PDIFF32,
         R_XTENSA_ASM_EXPAND,
     ):
-        if s.section.name.startswith(".text"):
+        if not hasattr(s, "section") or s.section.name.startswith(".text"):
             # it looks like R_XTENSA_[P]DIFF32 into .text is already correctly relocated,
             # and expand relaxations cannot occur in non-executable sections.
             return
@@ -1075,59 +1076,59 @@ def process_riscv32_relocation(env, text_addr, r):
     return addr, value
 
 
-def load_object_file(env, felf):
-    with open(felf, "rb") as f:
-        elf = elffile.ELFFile(f)
-        env.check_arch(elf["e_machine"])
-
-        # Get symbol table
-        symtab = list(elf.get_section_by_name(".symtab").iter_symbols())
-
-        # Load needed sections from ELF file
-        sections_shndx = {}  # maps elf shndx to Section object
-        for idx, s in enumerate(elf.iter_sections()):
-            if s.header.sh_type in ("SHT_PROGBITS", "SHT_NOBITS"):
-                if s.data_size == 0:
-                    # Ignore empty sections
-                    pass
-                elif s.name.startswith((".literal", ".text", ".rodata", ".data.rel.ro", ".bss")):
-                    sec = Section.from_elfsec(s, felf)
-                    sections_shndx[idx] = sec
-                    if s.name.startswith(".literal"):
-                        env.literal_sections.append(sec)
-                    else:
-                        env.sections.append(sec)
-                elif s.name.startswith(".data"):
-                    raise LinkError("{}: {} non-empty".format(felf, s.name))
+def load_object_file(env, f, felf):
+    elf = elffile.ELFFile(f)
+    env.check_arch(elf["e_machine"])
+
+    # Get symbol table
+    symtab = list(elf.get_section_by_name(".symtab").iter_symbols())
+
+    # Load needed sections from ELF file
+    sections_shndx = {}  # maps elf shndx to Section object
+    for idx, s in enumerate(elf.iter_sections()):
+        if s.header.sh_type in ("SHT_PROGBITS", "SHT_NOBITS"):
+            if s.data_size == 0:
+                # Ignore empty sections
+                pass
+            elif s.name.startswith((".literal", ".text", ".rodata", ".data.rel.ro", ".bss")):
+                sec = Section.from_elfsec(s, felf)
+                sections_shndx[idx] = sec
+                if s.name.startswith(".literal"):
+                    env.literal_sections.append(sec)
                 else:
-                    # Ignore section
-                    pass
-            elif s.header.sh_type in ("SHT_REL", "SHT_RELA"):
-                shndx = s.header.sh_info
-                if shndx in sections_shndx:
-                    sec = sections_shndx[shndx]
-                    sec.reloc_name = s.name
-                    sec.reloc = list(s.iter_relocations())
-                    for r in sec.reloc:
-                        r.sym = symtab[r["r_info_sym"]]
-
-        # Link symbols to their sections, and update known and unresolved symbols
-        for sym in symtab:
-            sym.filename = felf
-            shndx = sym.entry["st_shndx"]
+                    env.sections.append(sec)
+            elif s.name.startswith(".data"):
+                raise LinkError("{}: {} non-empty".format(felf, s.name))
+            else:
+                # Ignore section
+                pass
+        elif s.header.sh_type in ("SHT_REL", "SHT_RELA"):
+            shndx = s.header.sh_info
             if shndx in sections_shndx:
-                # Symbol with associated section
-                sym.section = sections_shndx[shndx]
-                if sym["st_info"]["bind"] in ("STB_GLOBAL", "STB_WEAK"):
-                    # Defined global symbol
-                    if sym.name in env.known_syms and not sym.name.startswith(
-                        "__x86.get_pc_thunk."
-                    ):
-                        raise LinkError("duplicate symbol: {}".format(sym.name))
-                    env.known_syms[sym.name] = sym
-            elif sym.entry["st_shndx"] == "SHN_UNDEF" and sym["st_info"]["bind"] == "STB_GLOBAL":
-                # Undefined global symbol, needs resolving
-                env.unresolved_syms.append(sym)
+                sec = sections_shndx[shndx]
+                sec.reloc_name = s.name
+                sec.reloc = list(s.iter_relocations())
+                for r in sec.reloc:
+                    r.sym = symtab[r["r_info_sym"]]
+
+    # Link symbols to their sections, and update known and unresolved symbols
+    dup_errors = []
+    for sym in symtab:
+        sym.filename = felf
+        shndx = sym.entry["st_shndx"]
+        if shndx in sections_shndx:
+            # Symbol with associated section
+            sym.section = sections_shndx[shndx]
+            if sym["st_info"]["bind"] in ("STB_GLOBAL", "STB_WEAK"):
+                # Defined global symbol
+                if sym.name in env.known_syms and not sym.name.startswith("__x86.get_pc_thunk."):
+                    dup_errors.append("duplicate symbol: {}".format(sym.name))
+                env.known_syms[sym.name] = sym
+        elif sym.entry["st_shndx"] == "SHN_UNDEF" and sym["st_info"]["bind"] == "STB_GLOBAL":
+            # Undefined global symbol, needs resolving
+            env.unresolved_syms.append(sym)
+    if len(dup_errors):
+        raise LinkError("\n".join(dup_errors))
 
 
 def link_objects(env, native_qstr_vals_len):
@@ -1188,6 +1189,8 @@ def link_objects(env, native_qstr_vals_len):
             ]
         )
     }
+
+    undef_errors = []
     for sym in env.unresolved_syms:
         assert sym["st_value"] == 0
         if sym.name == "_GLOBAL_OFFSET_TABLE_":
@@ -1205,7 +1208,10 @@ def link_objects(env, native_qstr_vals_len):
                 sym.section = mp_fun_table_sec
                 sym.mp_fun_table_offset = fun_table[sym.name]
             else:
-                raise LinkError("{}: undefined symbol: {}".format(sym.filename, sym.name))
+                undef_errors.append("{}: undefined symbol: {}".format(sym.filename, sym.name))
+
+    if len(undef_errors):
+        raise LinkError("\n".join(undef_errors))
 
     # Align sections, assign their addresses, and create full_text
     env.full_text = bytearray(env.arch.asm_jump(8))  # dummy, to be filled in later
@@ -1446,8 +1452,27 @@ def do_link(args):
     log(LOG_LEVEL_2, "qstr vals: " + ", ".join(native_qstr_vals))
     env = LinkEnv(args.arch)
     try:
-        for file in args.files:
-            load_object_file(env, file)
+        # Load object files
+        for fn in args.files:
+            with open(fn, "rb") as f:
+                load_object_file(env, f, fn)
+
+        if args.libs:
+            # Load archive info
+            archives = []
+            for item in args.libs:
+                archives.extend(ar_util.load_archive(item))
+            # List symbols to look for
+            syms = set(sym.name for sym in env.unresolved_syms)
+            # Resolve symbols from libs
+            lib_objs, _ = ar_util.resolve(archives, syms)
+            # Load extra object files from libs
+            for ar, obj in lib_objs:
+                obj_name = ar.fn + ":" + obj
+                log(LOG_LEVEL_2, "using " + obj_name)
+                with ar.open(obj) as f:
+                    load_object_file(env, f, obj_name)
+
         link_objects(env, len(native_qstr_vals))
         build_mpy(env, env.find_addr("mpy_init"), args.output, native_qstr_vals)
     except LinkError as er:
@@ -1458,13 +1483,16 @@ def do_link(args):
 def main():
     import argparse
 
-    cmd_parser = argparse.ArgumentParser(description="Run scripts on the pyboard.")
+    cmd_parser = argparse.ArgumentParser(description="Link native object files into a MPY bundle.")
     cmd_parser.add_argument(
         "--verbose", "-v", action="count", default=1, help="increase verbosity"
     )
     cmd_parser.add_argument("--arch", default="x64", help="architecture")
     cmd_parser.add_argument("--preprocess", action="store_true", help="preprocess source files")
     cmd_parser.add_argument("--qstrs", default=None, help="file defining additional qstrs")
+    cmd_parser.add_argument(
+        "--libs", "-l", dest="libs", action="append", help="static .a libraries to link"
+    )
     cmd_parser.add_argument(
         "--output", "-o", default=None, help="output .mpy file (default to input with .o->.mpy)"
     )

From 1a7cbac879fa578cd992a3baf10950180e89340d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 7 Mar 2025 00:04:14 +0100
Subject: [PATCH 1979/3129] tools/ci.sh: Build Xtensa natmods as part of the CI
 process.

This commit expands the CI tests by checking whether the example native
modules are able to be built for the Xtensa architecture.

This was made possible by the changes to mpy_ld that allow symbol
resolution across standard compiler-provided libraries.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 5d57175c80e94..7105b2460b787 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -197,7 +197,7 @@ function ci_esp32_build_s3_c3 {
 # ports/esp8266
 
 function ci_esp8266_setup {
-    sudo pip install pyserial esptool==3.3.1
+    sudo pip3 install pyserial esptool==3.3.1 pyelftools ar
     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
@@ -214,6 +214,9 @@ function ci_esp8266_build {
     make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC
     make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_512K
     make ${MAKEOPTS} -C ports/esp8266 BOARD=ESP8266_GENERIC BOARD_VARIANT=FLASH_1M
+
+    # Test building native .mpy with xtensa architecture.
+    ci_native_mpy_modules_build xtensa
 }
 
 ########################################################################################

From 31a008c6e26eccc3798a9ab4169019a02eadb830 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 7 Mar 2025 00:07:11 +0100
Subject: [PATCH 1980/3129] tools/ci.sh: Do not assume the Python interpreter
 is called "python".

This commit removes the assumption made by the CI scripts that the
system-provided python executable is simply named "python".  The scripts
will now look for a binary called "python3" first, and then fall back to
"python" if that is not found.

Whilst this is currently the case for the CI environment, there are no
guarantees for this going forward.  For example minimal CI environments
set up by some developers, using the same base OS, have their python
executable called "python3".

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 7105b2460b787..c7a6db79d6ce9 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -150,7 +150,8 @@ function ci_cc3200_build {
 
 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
 IDF_VER=v5.2.2
-PYTHON_VER=$(python --version | cut -d' ' -f2)
+PYTHON=$(command -v python3 2> /dev/null)
+PYTHON_VER=$(${PYTHON:-python} --version | cut -d' ' -f2)
 
 export IDF_CCACHE_ENABLE=1
 

From f1018ee5c2dd0eabcc0cfe7e02c607594e489788 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 3 Mar 2025 13:48:41 +0100
Subject: [PATCH 1981/3129] mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT: Add new
 Makerdiary board.

This is a board based on the i.MX RT1011 in breadboard-friendly shape.  A
good basic board with 16M flash and regular pinout, providing access to
many GPIO_nn and GPIO_AD_nn Pins.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/mimxrt/pinout.rst                        | 67 +++++++++-----
 .../MAKERDIARY_RT1011_NANO_KIT/board.json     | 19 ++++
 .../deploy_makerdiary.md                      | 34 ++++++++
 .../mpconfigboard.h                           | 87 +++++++++++++++++++
 .../mpconfigboard.mk                          | 16 ++++
 .../MAKERDIARY_RT1011_NANO_KIT/pins.csv       | 42 +++++++++
 6 files changed, 245 insertions(+), 20 deletions(-)
 create mode 100644 ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/board.json
 create mode 100644 ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md
 create mode 100644 ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/pins.csv

diff --git a/docs/mimxrt/pinout.rst b/docs/mimxrt/pinout.rst
index 3ff892c64d688..9aeb85401be8d 100644
--- a/docs/mimxrt/pinout.rst
+++ b/docs/mimxrt/pinout.rst
@@ -30,26 +30,28 @@ MIMXRT1170-EVK     Debug USB      D0/D1       D12/D11      D10/D13
 Adafruit Metro M7     -           D0/D1        D7/D3        A1/A0
 Olimex RT1010Py       -          RxD/TxD       D7/D8        D5/D6
 Seeed ARCH MIX        -         J3_19/J3_20  J4_16/J4_17  J4_06/J4_07
+Makerdiary RT1011     -           D9/D10      D13/A0       D11/D12
 =================  ===========  ===========  ===========  ===========
 
 |
 
-================  ===========  ===========  =======  =======  =====
-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    -        -        -
-================  ===========  ===========  =======  =======  =====
+=================  ===========  ===========  =======  =======  =====
+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    -        -        -
+Makerdiary RT1011     A1/A2          -         -        -        -
+=================  ===========  ===========  =======  =======  =====
 
 .. _mimxrt_pwm_pinout:
 
@@ -188,7 +190,6 @@ LED_BLUE   F1/3/B
 =========  ===============
 Pin        Olimex RT1010PY
 =========  ===============
-D0           -
 D1         F1/0/B
 D2         F1/0/A
 D3         F1/1/B
@@ -197,13 +198,10 @@ 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
@@ -214,6 +212,32 @@ CS0        F1/1/X
 SCK        F1/0/X
 =========  ===============
 
+|
+
+=========  =================
+Pin        Makerdiary RT1011
+=========  =================
+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
+A3         F1/2/B
+A4         F1/2/A
+A5         F1/3/B
+A6         F1/3/A
+A9         F1/3/X
+A10        F1/2/X
+A11        F1/1/X
+SD1        F1/0/B
+SD2        F1/0/A
+LED        F1/1/B
+DIO        F1/0/X
+=========  =================
+
 Legend:
 
 * Qm/n:    QTMR module m, channel n
@@ -322,6 +346,7 @@ MIXMXRT1170-EVK    D10/-/D11/D12/D13          D28/-/D25/D24/D26        -/-/D14/D
 Adafruit Metro M7  -/-/MOSI/MISO/SCK                -                        -
 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
+Makerdiary RT1011  A5/A2/A4/A3/A6             A11/A1/A10/A9/CLK
 =================  =========================  =======================  ===============
 
 Pins denoted with (*) are by default not wired at the board. The CS0 and CS1 signals
@@ -355,6 +380,7 @@ MIXMXRT1170-EVK    D14/D15      D1/D0        A4/A5        D26/D25  D19/D18
 Adafruit Metro M7  D14/D15      D0/D1
 Olimex RT1010Py      -          SDA1/SCL1    SDA2/SCL2     -        -
 Seeed ARCH MIX     J3_17/J3_16  J4_06/J4_07  J5_05/J5_04   -        -
+Makerdiary RT1011  D1/D2        A7/A8
 =================  ===========  ===========  ===========  =======  =======
 
 .. _mimxrt_i2s_pinout:
@@ -379,6 +405,7 @@ Adafruit Metro M7  1   D8     D10      D9      D12     D14      D15     D13
 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"
+Makerdiary RT1011  1   D8     SD1      D7      D4      D1       D2      D3
 =================  ==  =====  ======== ======= ======= ======== ======= =======
 
 Symbolic pin names are provided for the MIMXRT_10xx_DEV boards.
diff --git a/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/board.json b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/board.json
new file mode 100644
index 0000000000000..ee04a5965fed7
--- /dev/null
+++ b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/board.json
@@ -0,0 +1,19 @@
+{
+    "deploy": [
+        "deploy_makerdiary.md"
+    ],
+    "docs": "",
+    "features": [
+        "External Flash",
+        "USB",
+        "microSD"
+    ],
+    "images": [
+        "MAKERDIARY_RT1011_NANO_KIT.jpg"
+    ],
+    "mcu": "mimxrt",
+    "product": "iMX RT1011 Nano Kit",
+    "thumbnail": "",
+    "url": "https://makerdiary.com/products/imxrt1011-nanokit",
+    "vendor": "Makerdiary"
+}
diff --git a/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md
new file mode 100644
index 0000000000000..fde3381592214
--- /dev/null
+++ b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md
@@ -0,0 +1,34 @@
+## 1. Deploy the MicroPython firmware to the iMX RT1011 Nano Kit.
+
+The iMX RT1011 Nano Kit comes pre-installed with a UF2 bootloader.
+It can be started by pushing reset twice. Then the bootloader drive will
+appear. If that does not happen or the bootloader was lost, you can
+reinstall the bootloader using the procedure below.
+
+Once the bootloader is installed and started, you can install MicroPython
+by copying the .uf2 version of the firmware file to the bootloader
+drive. When the firmware is installed, the drive will disappear.
+
+## 2. Reinstall the bootloader iMX RT1011 Nano Kit.
+
+1. 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.
+
+2. Get the UF2 boot-loader package https://github.com/adafruit/tinyuf2/releases/tag/0.21.0
+and extract the file  tinyuf2-makerdiary_rt1011-0.21.0.bin. You may as
+well go for a newer release.
+
+Now you have all files at hand that you will need for updating.
+
+1. Push and hold the "USR/BT" button, then press "RST", and release both buttons.
+
+2. Run the commands:
+
+```
+sudo ./sdphost -u 0x1fc9,0x0145 -- write-file 0x20206400 tinyuf2-makerdiary_rt1011-0.21.0.bin
+sudo ./sdphost -u 0x1fc9,0x0145 -- jump-address 0x20207000
+```
+Wait until a drive icon appears on the computer (or mount it explicitly).
+At this point the bootloader is installed. You can now copy the
+MicroPython .uf2 file to the board.
diff --git a/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.h b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.h
new file mode 100644
index 0000000000000..28085294f1410
--- /dev/null
+++ b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.h
@@ -0,0 +1,87 @@
+#define MICROPY_HW_BOARD_NAME "iMX_RT1011_Nano_Kit"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1011DAE5A"
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Makerdiary"
+#define MICROPY_HW_USB_VID 0xf055
+#define MICROPY_HW_USB_PID 0x9802
+#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (0)
+
+// RT1011-Nanokit has 1 board LED
+#define MICROPY_HW_LED1_PIN (pin_GPIO_SD_04)
+#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 MICROPY_PY_MACHINE_SDCARD    (0)
+
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 1, 2, 3, 4 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_10_LPUART1_TXD }, { IOMUXC_GPIO_09_LPUART1_RXD }, \
+    { IOMUXC_GPIO_AD_00_LPUART2_TXD }, { IOMUXC_GPIO_13_LPUART2_RXD }, \
+    { IOMUXC_GPIO_12_LPUART3_TXD }, { IOMUXC_GPIO_11_LPUART3_RXD }, \
+    { IOMUXC_GPIO_AD_02_LPUART4_TXD }, { IOMUXC_GPIO_AD_01_LPUART4_RXD },
+
+#define IOMUX_TABLE_UART_CTS_RTS \
+    { IOMUXC_GPIO_08_LPUART1_CTS_B }, { IOMUXC_GPIO_07_LPUART1_RTS_B }, \
+    { IOMUXC_GPIO_AD_08_LPUART2_CTS_B }, { IOMUXC_GPIO_AD_07_LPUART2_RTS_B }, \
+    { IOMUXC_GPIO_AD_14_LPUART3_CTS_B }, { IOMUXC_GPIO_AD_13_LPUART3_RTS_B }, \
+    { IOMUXC_GPIO_AD_14_LPUART4_CTS_B }, { IOMUXC_GPIO_AD_13_LPUART4_RTS_B },
+
+#define MICROPY_HW_SPI_INDEX { 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   { 1, 2 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_02_LPI2C1_SCL }, { IOMUXC_GPIO_01_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_AUDIO_PLL_CLOCK (2U)
+
+#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 SD1 */ \
+        I2S_GPIO(3, WS, TX, GPIO_SD_00, IOMUXC_GPIO_SD_00_SAI3_TX_SYNC), /* pin SD0 */ \
+        I2S_GPIO(3, SD, TX, GPIO_SD_02, IOMUXC_GPIO_SD_02_SAI3_TX_DATA) /* pin SD2 */ \
+    }
diff --git a/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.mk b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.mk
new file mode 100644
index 0000000000000..942012157dd22
--- /dev/null
+++ b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/mpconfigboard.mk
@@ -0,0 +1,16 @@
+MCU_SERIES = MIMXRT1011
+MCU_VARIANT = MIMXRT1011DAE5A
+
+MICROPY_FLOAT_IMPL = single
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x1000000  # 16MB
+MICROPY_HW_FLASH_CLK = kFlexSpiSerialClk_100MHz
+MICROPY_HW_FLASH_QE_CMD = 0x31
+MICROPY_HW_FLASH_QE_ARG = 0x02
+
+USE_UF2_BOOTLOADER = 1
+
+CFLAGS += -DMICROPY_HW_FLASH_SAMPLE_CLK=kFLEXSPIReadSampleClk_LoopbackInternally
+
+SRC_C += \
+	hal/flexspi_nor_flash.c \
diff --git a/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/pins.csv b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/pins.csv
new file mode 100644
index 0000000000000..c3f432e59f733
--- /dev/null
+++ b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/pins.csv
@@ -0,0 +1,42 @@
+A0,GPIO_AD_00
+A1,GPIO_AD_01
+A2,GPIO_AD_02
+A3,GPIO_AD_03
+A4,GPIO_AD_04
+A5,GPIO_AD_05
+A6,GPIO_AD_06
+A7,GPIO_AD_07
+A8,GPIO_AD_08
+A9,GPIO_AD_09
+A10,GPIO_AD_10
+A11,GPIO_AD_11
+A14,GPIO_AD_14
+
+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_09
+D10,GPIO_10
+D11,GPIO_11
+D12,GPIO_12
+D13,GPIO_13
+
+SD0,GPIO_SD_00
+SD1,GPIO_SD_01
+SD2,GPIO_SD_02
+SD5,GPIO_SD_05
+# Test pads at the bottom side
+SD3,GPIO_SD_03
+SD4,GPIO_SD_04
+SD12,GPIO_SD_12
+SD13,GPIO_SD_13
+
+LED,GPIO_SD_04
+CLK,GPIO_AD_12
+DIO,GPIO_AD_13

From 58f1ade318ecd72def23e9169a7a25d65d7967fb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 6 Dec 2024 20:38:19 +0100
Subject: [PATCH 1982/3129] mimxrt/machine_adc: Add ADC.read_uv() method.

Matching the generic documentation.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_adc.c  | 19 ++++++++++---------
 ports/mimxrt/mpconfigport.h |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index 29b73a20652ce..c332bd703128a 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -41,6 +41,12 @@
 // The ADC class doesn't have any constants for this port.
 #define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS
 
+#if defined(MIMXRT117x_SERIES)
+#define ADC_UV_FULL_RANGE (3840000)
+#else
+#define ADC_UV_FULL_RANGE (3300000)
+#endif
+
 typedef struct _machine_adc_obj_t {
     mp_obj_base_t base;
     ADC_Type *adc;
@@ -78,15 +84,6 @@ static mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_args
     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);
     o->adc = adc_instance;
@@ -169,3 +166,7 @@ void machine_adc_init(void) {
     }
 }
 #endif
+
+static mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self) {
+    return (uint64_t)ADC_UV_FULL_RANGE * mp_machine_adc_read_u16(self) / 65536;
+}
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 7da85f1aee579..b9fb87e050b83 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -84,6 +84,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/mimxrt/machine_adc.c"
+#define MICROPY_PY_MACHINE_ADC_READ_UV      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_DHT_READINTO     (1)

From d8edae040fb194c95e9569a44968d4c3858e0ac0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 17 Jan 2025 09:40:59 +0100
Subject: [PATCH 1983/3129] mimxrt/mpconfigport: Enable support for exFAT.

There is plenty of room in the MIMXRT board flash, so it can be enabled.

Tested with:
- MIMXRT1176_EVK
- MIMXRT1061 (Teensy 4.1)
- MIMXRT1010 (Olimex RT1010)

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index b9fb87e050b83..728354239c46f 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -125,6 +125,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_FATFS_RPATH                 (2)
 #define MICROPY_FATFS_MULTI_PARTITION       (1)
 #define MICROPY_FATFS_MAX_SS                (4096)
+#define MICROPY_FATFS_EXFAT                 (1)
 
 #ifndef MICROPY_PY_NETWORK
 #define MICROPY_PY_NETWORK                  (1)

From 2a5b97beaea2db3c7b8c6a77cf0ca854fdb16a4b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 15 Feb 2025 12:42:46 +0100
Subject: [PATCH 1984/3129] mimxrt/mpconfigport: Enable PPP for boards with
 lwIP.

PPP is now enabled on all boards with Ethernet support.  PPP could be
enabled for other boards without Ethernet like the Teensy 4.0 as well in a
second step.  Enabling for MIMXRT101x boards is hardly possible due to the
large RAM demand of lwIP.

Tested with a Teensy 4.1 board and a SimCom A7608 GPRS/LTE modem.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 728354239c46f..96ffc15379358 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -139,6 +139,10 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_HASHLIB_MD5              (MICROPY_PY_SSL)
 #define MICROPY_PY_HASHLIB_SHA1             (MICROPY_PY_SSL)
 #define MICROPY_PY_CRYPTOLIB                (MICROPY_PY_SSL)
+#ifndef MICROPY_PY_NETWORK_PPP_LWIP
+#define MICROPY_PY_NETWORK_PPP_LWIP         (MICROPY_PY_LWIP)
+#endif
+#define MICROPY_PY_LWIP_PPP                 (MICROPY_PY_NETWORK_PPP_LWIP)
 
 #ifndef MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)

From 2d20dbce2c4e45123349051dec16e6565fec54ef Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 22 Feb 2025 16:20:50 +0100
Subject: [PATCH 1985/3129] mimxrt/machine_uart: Remove duplicate init and make
 IRQ optional.

Changes:
- The duplicate LPUART_Init call was not needed, just an edit fail.
- Allow a port to disable UART.irq().  Some code for configuration stays,
  but the respective UART IRQ is not enabled.  Calling uart.irq() will
  cause an exception by extmod/machine_uart.c.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_uart.c | 10 +++++++---
 ports/mimxrt/mpconfigport.h |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 9f9d6c8fd256f..1c601b559d08e 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -326,22 +326,23 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
             self->timeout_char = min_timeout_char;
         }
 
+        self->config.rxIdleType = kLPUART_IdleTypeStartBit;
+        self->config.rxIdleConfig = kLPUART_IdleCharacter4;
         #if defined(MIMXRT117x_SERIES)
         // Use the Lpuart1 clock value, which is set for All UART devices.
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetRootClockFreq(kCLOCK_Root_Lpuart1));
         #else
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
         #endif
-        self->config.rxIdleType = kLPUART_IdleTypeStartBit;
-        self->config.rxIdleConfig = kLPUART_IdleCharacter4;
-        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);
         self->txbuf = m_new(uint8_t, txbuf_len); // Allocate the TX buffer.
         self->txbuf_len = txbuf_len;
 
+        #if MICROPY_PY_MACHINE_UART_IRQ
         LPUART_EnableInterrupts(self->lpuart, kLPUART_IdleLineInterruptEnable);
+        #endif
 
         // The Uart supports inverting, but not the fsl API, so it has to coded directly
         // And it has to be done after LPUART_Init.
@@ -381,6 +382,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->timeout_char = 1;
     self->new = true;
     self->mp_irq_obj = NULL;
+    self->mp_irq_trigger = 0;
 
     LPUART_GetDefaultConfig(&self->config);
 
@@ -427,6 +429,7 @@ void machine_uart_deinit_all(void) {
     }
 }
 
+#if MICROPY_PY_MACHINE_UART_IRQ
 static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     self->mp_irq_trigger = new_trigger;
@@ -475,6 +478,7 @@ static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
 
     return self->mp_irq_obj;
 }
+#endif
 
 static mp_uint_t mp_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);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 96ffc15379358..9a7dfc630f32a 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -114,7 +114,9 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_UART             (1)
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/mimxrt/machine_uart.c"
 #define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
+#ifndef MICROPY_PY_MACHINE_UART_IRQ
 #define MICROPY_PY_MACHINE_UART_IRQ         (1)
+#endif
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER       (1)
 

From 1398e7fd20ef399a003e4e476eb7726126f42d66 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 23 Feb 2025 16:11:56 +0100
Subject: [PATCH 1986/3129] mimxrt/hal/qspi_nor_flash_config: Use a safe common
 CS timing.

The flash devices used by the MIMXRT board are specified either with 3ns or
5 ns CS setup and hold time.  Since a single configuration file is used for
all boards, use 5ns instead of 3ns to be safe, even if there were no
problems so far.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/hal/qspi_nor_flash_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/hal/qspi_nor_flash_config.c b/ports/mimxrt/hal/qspi_nor_flash_config.c
index 36ccc30fc1922..0ed1b5032bb88 100644
--- a/ports/mimxrt/hal/qspi_nor_flash_config.c
+++ b/ports/mimxrt/hal/qspi_nor_flash_config.c
@@ -38,8 +38,8 @@ const flexspi_nor_config_t qspiflash_config = {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
         .readSampleClkSrc = MICROPY_HW_FLASH_DQS,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
+        .csHoldTime = 5u,   // safe time for all flash devices
+        .csSetupTime = 5u,
         .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
         .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
         .deviceModeCfgEnable = 1u,

From b85ad4bd4128876908ed0493a1b1d3df3d972cf1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Mar 2025 09:08:01 +0100
Subject: [PATCH 1987/3129] mimxrt/machine_uart: Fix rx/tx buffer allocation
 bug.

The buffer would be reset on every call to `uart.init()`.  If no sizes were
given, the buffer would be set to the default size 256.  That made problems
e.g. with PPP.  Also, the RX buffer was not stored at the UART object and
not visible to GC as being in use.  Then a `gc.collect()` would eventually
free the buffer.

This commit fixes those issues, keeping the buffer size if not deliberately
changed and allocating new buffers only if the size was changed.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_uart.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 1c601b559d08e..0d682a8a4d10a 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -66,6 +66,8 @@ typedef struct _machine_uart_obj_t {
     uint16_t tx_status;
     uint8_t *txbuf;
     uint16_t txbuf_len;
+    uint8_t *rxbuf;
+    uint16_t rxbuf_len;
     bool new;
     uint16_t mp_irq_trigger;   // user IRQ trigger mask
     uint16_t mp_irq_flags;     // user IRQ active IRQ flags
@@ -197,7 +199,7 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         self->id, self->config.baudRate_Bps, 8 - self->config.dataBitsCount,
         _parity_name[self->config.parityMode], self->config.stopBitCount + 1,
         _flow_name[(self->config.enableTxCTS << 1) | self->config.enableRxRTS],
-        self->handle.rxRingBufferSize, self->txbuf_len, self->timeout, self->timeout_char,
+        self->rxbuf_len, self->txbuf_len, self->timeout, self->timeout_char,
         _invert_name[self->invert], self->mp_irq_trigger);
 }
 
@@ -291,25 +293,33 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     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;
+        size_t 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"));
         }
+        // Force re-allocting of the buffer if the size changed
+        if (rxbuf_len != self->rxbuf_len) {
+            self->rxbuf = NULL;
+            self->rxbuf_len = rxbuf_len;
+        }
     }
 
     // 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;
+        size_t 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"));
         }
+        // Force re-allocting of the buffer if the size is changed
+        if (txbuf_len != self->txbuf_len) {
+            self->txbuf = NULL;
+            self->txbuf_len = txbuf_len;
+        }
     }
 
     // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
@@ -335,10 +345,13 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         LPUART_Init(self->lpuart, &self->config, CLOCK_GetClockRootFreq(kCLOCK_UartClkRoot));
         #endif
         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;
+        if (self->rxbuf == NULL) {
+            self->rxbuf = m_new(uint8_t, self->rxbuf_len + 1);
+        }
+        LPUART_TransferStartRingBuffer(self->lpuart, &self->handle, self->rxbuf, self->rxbuf_len);
+        if (self->txbuf == NULL) {
+            self->txbuf = m_new(uint8_t, self->txbuf_len); // Allocate the TX buffer.
+        }
 
         #if MICROPY_PY_MACHINE_UART_IRQ
         LPUART_EnableInterrupts(self->lpuart, kLPUART_IdleLineInterruptEnable);
@@ -380,6 +393,10 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->invert = false;
     self->timeout = 1;
     self->timeout_char = 1;
+    self->rxbuf = NULL;
+    self->rxbuf_len = DEFAULT_BUFFER_SIZE;
+    self->txbuf = NULL;
+    self->txbuf_len = DEFAULT_BUFFER_SIZE;
     self->new = true;
     self->mp_irq_obj = NULL;
     self->mp_irq_trigger = 0;

From 1e7328ca28de201d6cd1ef31fb64e37613c0f9fb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 13 Mar 2025 15:47:48 +0100
Subject: [PATCH 1988/3129] mimxrt/machine_i2c: Support the timeout keyword
 argument.

Set the default timeout to 50000 us.  The default used to be 0, causing the
NXP I2C driver to silently stop working in case of a non-responding device.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/machine_i2c.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index 89fe47dbf60c1..b9d23a23c9bab 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -36,6 +36,7 @@
 
 #define DEFAULT_I2C_FREQ        (400000)
 #define DEFAULT_I2C_DRIVE       (6)
+#define DEFAULT_I2C_TIMEOUT     (50000)
 
 typedef struct _machine_i2c_obj_t {
     mp_obj_base_t base;
@@ -82,16 +83,18 @@ bool lpi2c_set_iomux(int8_t hw_i2c, uint8_t drive) {
 
 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_printf(print, "I2C(%u, freq=%u, timeout=%u)",
+        self->i2c_id, self->master_config->baudRate_Hz,
+        self->master_config->pinLowTimeout_ns / 1000);
 }
 
 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};
+    enum { ARG_id, ARG_freq, ARG_drive, ARG_timeout};
     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} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_I2C_TIMEOUT} },
     };
 
     // Parse args.
@@ -121,6 +124,9 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     LPI2C_MasterGetDefaultConfig(self->master_config);
     // Initialise the I2C peripheral.
     self->master_config->baudRate_Hz = args[ARG_freq].u_int;
+    if (args[ARG_timeout].u_int >= 0) {
+        self->master_config->pinLowTimeout_ns = args[ARG_timeout].u_int * 1000; // to be set as ns
+    }
     LPI2C_MasterInit(self->i2c_inst, self->master_config, BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT);
 
     return MP_OBJ_FROM_PTR(self);

From cdcc70d4f86b2948db4003c7ed55092b628394a8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 13 Mar 2025 16:50:27 +0100
Subject: [PATCH 1989/3129] mimxrt: Enable default devices for I2C, SPI and
 UART.

Since all boards are configured to have a I2C(0), SPI(0) and UART(1), these
can be set as default devices, allowing the instantiation of I2C(), SPI(),
UART() without an id argument.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/mimxrt/quickref.rst    | 12 +++++++++++-
 ports/mimxrt/machine_i2c.c  |  5 +++--
 ports/mimxrt/machine_spi.c  |  5 +++--
 ports/mimxrt/machine_uart.c | 14 +++++++++++---
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index 49d7befc7452b..9f1efd4ffcad2 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -122,10 +122,13 @@ See :ref:`machine.UART <machine.UART>`. ::
     uart1 = UART(1, baudrate=115200)
     uart1.write('hello')  # write 5 bytes
     uart1.read(5)         # read up to 5 bytes
+    uart1 = UART(baudrate=19200) # open UART 1 at 19200 baud
 
 The i.MXRT has up to eight hardware UARTs, but not every board exposes all
 TX and RX pins for users. For the assignment of Pins to UART signals,
-refer to the :ref:`UART pinout <mimxrt_uart_pinout>`.
+refer to the :ref:`UART pinout <mimxrt_uart_pinout>`. If the UART ID is
+omitted, UART(1) is selected. Then, the keyword
+option for baudrate must be used to change it from the default value.
 
 PWM (pulse width modulation)
 ----------------------------
@@ -305,12 +308,15 @@ rates (up to 30Mhz).  Hardware SPI is accessed via the
     cs_pin(0)
     spi.write('Hello World')
     cs_pin(1)
+    spi = SPI(baudrate=4_000_000)  # Use SPI(0) at a baudrate of 4 MHz
 
 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.
+If the SPI ID is omitted, SPI(0) is selected. Then, the keyword
+option for baudrate must be used to change it from the default value.
 
 Notes:
 
@@ -355,6 +361,10 @@ has the same methods as software SPI above::
 
     i2c = I2C(0, 400_000)
     i2c.writeto(0x76, b"Hello World")
+    i2c = I2C(freq=100_000)  # use I2C(0) at 100kHz
+
+If the I2C ID is omitted, I2C(0) is selected. Then, the keyword
+option for freq must be used to change the freq from the default value.
 
 I2S bus
 -------
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index b9d23a23c9bab..d170804f4f058 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -34,6 +34,7 @@
 #include "fsl_iomuxc.h"
 #include "fsl_lpi2c.h"
 
+#define DEFAULT_I2C_ID          (0)
 #define DEFAULT_I2C_FREQ        (400000)
 #define DEFAULT_I2C_DRIVE       (6)
 #define DEFAULT_I2C_TIMEOUT     (50000)
@@ -91,7 +92,7 @@ static void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 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, ARG_timeout};
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = DEFAULT_I2C_ID} },
         { 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} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_I2C_TIMEOUT} },
@@ -102,7 +103,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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);
+    int i2c_id = args[ARG_id].u_int;
     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 56e155ff22f4b..4f6480607aa36 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -37,6 +37,7 @@
 #include "fsl_lpspi.h"
 #include "fsl_lpspi_edma.h"
 
+#define DEFAULT_SPI_ID          (0)
 #define DEFAULT_SPI_BAUDRATE    (1000000)
 #define DEFAULT_SPI_POLARITY    (0)
 #define DEFAULT_SPI_PHASE       (0)
@@ -130,7 +131,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, ARG_cs };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_id,       MP_ARG_INT, {.u_int = DEFAULT_SPI_ID} },
         { 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} },
@@ -146,7 +147,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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);
+    int spi_id = args[ARG_id].u_int;
     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);
     }
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 0d682a8a4d10a..4dcaf72f9862a 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -37,6 +37,7 @@
 #include "modmachine.h"
 #include "pin.h"
 
+#define DEFAULT_UART_ID  (1)
 #define DEFAULT_UART_BAUDRATE (115200)
 #define DEFAULT_BUFFER_SIZE (256)
 #define MIN_BUFFER_SIZE  (32)
@@ -377,10 +378,17 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
 }
 
 static mp_obj_t mp_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);
+    mp_arg_check_num(n_args, n_kw, 0, MP_OBJ_FUN_ARGS_MAX, true);
 
     // Get UART bus.
-    int uart_id = mp_obj_get_int(args[0]);
+    int uart_id;
+    if (n_args > 0) {
+        uart_id = mp_obj_get_int(args[0]);
+        n_args--;
+        args++;
+    } else {
+        uart_id = DEFAULT_UART_ID;
+    }
     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);
     }
@@ -409,7 +417,7 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     if (uart_present) {
         mp_map_t kw_args;
         mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        mp_machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+        mp_machine_uart_init_helper(self, n_args, args, &kw_args);
         return MP_OBJ_FROM_PTR(self);
     } else {
         return mp_const_none;

From 274c8c419c97bdb54fa14de37a38b08dcefd1493 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 23 Mar 2025 09:28:06 +0100
Subject: [PATCH 1990/3129] mimxrt/boards: Update deploy instructions.

Make the final step of the deploy more detailed.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md      |  6 +++++-
 .../MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md  |  7 ++++++-
 ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md   | 12 +++++++++---
 ports/mimxrt/boards/deploy_mimxrt.md                 |  7 +++++--
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md
index c5bfd1a28a79f..a2d6f5c824f0b 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/deploy_metro_m7.md
@@ -8,4 +8,8 @@ here: https://learn.adafruit.com/adafruit-metro-m7-microsd/installing-the-bootlo
 
 Once the bootloader is installed and started, you can install MicroPython
 by copying the .uf2 version of the firmware file to the bootloader
-drive. When the firmware is installed, the drive will disappear.
+drive. A LED on the board will start flickering, indicating that the
+upload is ongoing. Once the upload is complete, the drive icon will
+disappear. Wait until the LED stops flickering. In rare cases there
+may be an error message coming up, especially when there are only few
+or no changes in the firmware file. Then just repeat the upload.
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md
index fde3381592214..49922183b1248 100644
--- a/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md
+++ b/ports/mimxrt/boards/MAKERDIARY_RT1011_NANO_KIT/deploy_makerdiary.md
@@ -31,4 +31,9 @@ sudo ./sdphost -u 0x1fc9,0x0145 -- jump-address 0x20207000
 ```
 Wait until a drive icon appears on the computer (or mount it explicitly).
 At this point the bootloader is installed. You can now copy the
-MicroPython .uf2 file to the board.
+MicroPython .uf2 file to the board to start the firmware upload.
+A LED on the board will start flickering, indicating that the
+upload is ongoing. Once the upload is complete, the drive icon will
+disappear. Wait until the LED stops flickering. In rare cases there
+may be an error message coming up, especially when there are only few
+or no changes in the firmware file. Then just repeat the upload.
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
index 7abba784b940b..4db0b6f611942 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
@@ -33,10 +33,16 @@ and you will not need it for Windows.
 
 4. Once the upload of the bootloader is finished, push Reset twice.
 
-The bootloader should start and show a drive icon. Copy the .uf2 version of MicroPython
-to this drive to install or update MicroPython.
+The bootloader should start and show a drive icon.
 
-Once the UF2 bootloader is installed, only step 4 is required to deploy MicroPython. If
+5. Copy the .uf2 version of MicroPython to this drive to install or update MicroPython.
+
+A LED on the board will start flickering, indicating that the upload is ongoing. Once the upload
+is complete, the drive icon will disappear. Wait until the LED stops flickering. In rare cases there
+may be an error message coming up, especially when there are only few or no changes in
+the firmware file. Then just repeat the copy.
+
+Once the UF2 bootloader is installed, only steps 4 and 5 are required to deploy MicroPython. If
 MicroPython is already installed, the bootloader can as well be invoked by calling
 `machine.bootloader()`.
 
diff --git a/ports/mimxrt/boards/deploy_mimxrt.md b/ports/mimxrt/boards/deploy_mimxrt.md
index 7ad21fe64ca17..2c7f3500979c3 100644
--- a/ports/mimxrt/boards/deploy_mimxrt.md
+++ b/ports/mimxrt/boards/deploy_mimxrt.md
@@ -41,5 +41,8 @@ installed.
 
 If there is no valid Firmware on the device, the bootloader will start automatically.
 Once it's started, a drive ICON will appear. The MicroPython firmware file with .uf2
-extension must then be copied to that drive. When the file is copied and MicroPython
-is installed, the drive disappears and MicroPython starts.
+extension must then be copied to that drive. A LED on the board may start flickering,
+indicating that the upload is ongoing. Once the upload is complete, the drive icon
+will disappear. Wait until the LED stops flickering. In rare cases there
+may be an error message coming up, especially when there are only few or
+no changes in the firmware file. Then just repeat the copy.

From c61e85910879d5db120d00f7790ed36f4dcda44d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Mar 2025 15:47:35 +1100
Subject: [PATCH 1991/3129] drivers: Add MP_QSPI_IOCTL_MEMORY_MODIFIED to
 indicate flash changed.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/bus/qspi.h        |  3 ++-
 drivers/bus/softqspi.c    |  3 ++-
 drivers/memory/spiflash.c | 21 ++++++++++++++++++---
 drivers/memory/spiflash.h |  2 ++
 ports/stm32/octospi.c     |  3 ++-
 ports/stm32/qspi.c        |  2 +-
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/drivers/bus/qspi.h b/drivers/bus/qspi.h
index 009f55b159d41..7ba2e750943c5 100644
--- a/drivers/bus/qspi.h
+++ b/drivers/bus/qspi.h
@@ -37,10 +37,11 @@ enum {
     MP_QSPI_IOCTL_DEINIT,
     MP_QSPI_IOCTL_BUS_ACQUIRE,
     MP_QSPI_IOCTL_BUS_RELEASE,
+    MP_QSPI_IOCTL_MEMORY_MODIFIED,
 };
 
 typedef struct _mp_qspi_proto_t {
-    int (*ioctl)(void *self, uint32_t cmd);
+    int (*ioctl)(void *self, uint32_t cmd, uintptr_t arg);
     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);
     int (*read_cmd)(void *self, uint8_t cmd, size_t len, uint32_t *dest);
diff --git a/drivers/bus/softqspi.c b/drivers/bus/softqspi.c
index 65a504a739d25..5cfc4db5e3383 100644
--- a/drivers/bus/softqspi.c
+++ b/drivers/bus/softqspi.c
@@ -56,8 +56,9 @@ static void nibble_write(mp_soft_qspi_obj_t *self, uint8_t v) {
     mp_hal_pin_write(self->io3, (v >> 3) & 1);
 }
 
-static int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd) {
+static int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
+    (void)arg;
 
     switch (cmd) {
         case MP_QSPI_IOCTL_INIT:
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index 773334e167ae3..09ab7157b88eb 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -61,14 +61,22 @@
 static void mp_spiflash_acquire_bus(mp_spiflash_t *self) {
     const mp_spiflash_config_t *c = self->config;
     if (c->bus_kind == MP_SPIFLASH_BUS_QSPI) {
-        c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data, MP_QSPI_IOCTL_BUS_ACQUIRE);
+        c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data, MP_QSPI_IOCTL_BUS_ACQUIRE, 0);
     }
 }
 
 static void mp_spiflash_release_bus(mp_spiflash_t *self) {
     const mp_spiflash_config_t *c = self->config;
     if (c->bus_kind == MP_SPIFLASH_BUS_QSPI) {
-        c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data, MP_QSPI_IOCTL_BUS_RELEASE);
+        c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data, MP_QSPI_IOCTL_BUS_RELEASE, 0);
+    }
+}
+
+static void mp_spiflash_notify_modified(mp_spiflash_t *self, uint32_t addr, uint32_t len) {
+    const mp_spiflash_config_t *c = self->config;
+    if (c->bus_kind == MP_SPIFLASH_BUS_QSPI) {
+        uintptr_t arg[2] = { addr, len };
+        c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data, MP_QSPI_IOCTL_MEMORY_MODIFIED, (uintptr_t)&arg[0]);
     }
 }
 
@@ -174,7 +182,7 @@ void mp_spiflash_init(mp_spiflash_t *self) {
         mp_hal_pin_output(self->config->bus.u_spi.cs);
         self->config->bus.u_spi.proto->ioctl(self->config->bus.u_spi.data, MP_SPI_IOCTL_INIT);
     } else {
-        self->config->bus.u_qspi.proto->ioctl(self->config->bus.u_qspi.data, MP_QSPI_IOCTL_INIT);
+        self->config->bus.u_qspi.proto->ioctl(self->config->bus.u_qspi.data, MP_QSPI_IOCTL_INIT, 0);
     }
 
     mp_spiflash_acquire_bus(self);
@@ -285,6 +293,7 @@ static int mp_spiflash_write_page(mp_spiflash_t *self, uint32_t addr, size_t len
 int mp_spiflash_erase_block(mp_spiflash_t *self, uint32_t addr) {
     mp_spiflash_acquire_bus(self);
     int ret = mp_spiflash_erase_block_internal(self, addr);
+    mp_spiflash_notify_modified(self, addr, SECTOR_SIZE);
     mp_spiflash_release_bus(self);
     return ret;
 }
@@ -300,6 +309,8 @@ int mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *de
 }
 
 int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src) {
+    uint32_t orig_addr = addr;
+    uint32_t orig_len = len;
     mp_spiflash_acquire_bus(self);
     int ret = 0;
     uint32_t offset = addr & (PAGE_SIZE - 1);
@@ -317,12 +328,16 @@ int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint
         src += rest;
         offset = 0;
     }
+    mp_spiflash_notify_modified(self, orig_addr, orig_len);
     mp_spiflash_release_bus(self);
     return ret;
 }
 
 /******************************************************************************/
 // Interface functions that use the cache
+//
+// These functions do not call mp_spiflash_notify_modified(), so shouldn't be
+// used for memory-mapped flash (for example).
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 
diff --git a/drivers/memory/spiflash.h b/drivers/memory/spiflash.h
index 5ccf7d44c97de..edd7d49330da1 100644
--- a/drivers/memory/spiflash.h
+++ b/drivers/memory/spiflash.h
@@ -81,6 +81,8 @@ int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // These functions use the cache (which must already be configured)
+// Note: don't use these functions in combination with memory-mapped
+// flash, because MP_QSPI_IOCTL_MEMORY_MODIFIED is not called.
 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);
diff --git a/ports/stm32/octospi.c b/ports/stm32/octospi.c
index 407f485664c6b..345c4a2374128 100644
--- a/ports/stm32/octospi.c
+++ b/ports/stm32/octospi.c
@@ -105,8 +105,9 @@ void octospi_init(void) {
     OCTOSPI1->CR |= OCTOSPI_CR_EN;
 }
 
-static int octospi_ioctl(void *self_in, uint32_t cmd) {
+static int octospi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
     (void)self_in;
+    (void)arg;
     switch (cmd) {
         case MP_QSPI_IOCTL_INIT:
             octospi_init();
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 34359a1ccf838..1d3239b0d26d2 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -170,7 +170,7 @@ void qspi_memory_map(void) {
     qspi_mpu_enable_mapped();
 }
 
-static int qspi_ioctl(void *self_in, uint32_t cmd) {
+static int qspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
     (void)self_in;
     switch (cmd) {
         case MP_QSPI_IOCTL_INIT:

From 396ab268df8a0b52e25108e41370ec6ab64fd337 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Mar 2025 15:59:22 +1100
Subject: [PATCH 1992/3129] stm32/qspi: Implement MP_QSPI_IOCTL_MEMORY_MODIFIED
 ioctl.

stm32's QSPI driver supports memory-mapped mode.  The memory-mapped flash
can also be erased/written to.  To support both these modes, it switches in
and out of memory-mapped mode during an erase/write.

If the flash is erased/written and then switched back to memory mapped
mode, the cache related to the memory-mapped region that changed must be
invalidated.  Otherwise subsequent code may end up reading old data.

That cache invalidation is currently not being done, and this commit fixes
that.

This bug has been around ever since QSPI memory-mapped mode existed, but
it's never really been observed because it's not common to use flash in
memory-mapped mode and also erase/write it.  Eg PYBD_SF2 uses the
memory-mapped flash in read-only mode to store additional firmware.

But since the introduction of ROMFS, things changed.  The `vfs.rom_ioctl()`
command can erase/write memory-mapped flash.

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

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 1d3239b0d26d2..1311c27d1d46e 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -190,6 +190,14 @@ static int qspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
             // Switch to memory-map mode when bus is idle
             qspi_memory_map();
             break;
+        case MP_QSPI_IOCTL_MEMORY_MODIFIED: {
+            uintptr_t *addr_len = (uintptr_t *)arg;
+            volatile void *addr = (volatile void *)(QSPI_MAP_ADDR + addr_len[0]);
+            size_t len = addr_len[1];
+            SCB_InvalidateICache_by_Addr(addr, len);
+            SCB_InvalidateDCache_by_Addr(addr, len);
+            break;
+        }
     }
     return 0; // success
 }

From 1e92bdd206f6f87ba65ea05c5b2623fca0b926cd Mon Sep 17 00:00:00 2001
From: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
Date: Mon, 17 Mar 2025 08:41:31 -0600
Subject: [PATCH 1993/3129] rp2/boards: Fix SparkFun vendor name.

The preferred/correct spelling is "SparkFun" so this commit updates all of
the existing SparkFun board definitions with that spelling.
---
 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json | 2 +-
 ports/rp2/boards/SPARKFUN_PROMICRO/board.json               | 2 +-
 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json        | 2 +-
 ports/rp2/boards/SPARKFUN_THINGPLUS/board.json              | 2 +-
 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json       | 2 +-
 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json         | 2 +-
 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
index 4ddcd999fe5f8..e65a9462c73c3 100644
--- a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
@@ -21,5 +21,5 @@
     "product": "IoT Node LoRaWAN RP2350",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/26060",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
index b8c8afc914eac..66cea79ddeea8 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
@@ -17,5 +17,5 @@
     "product": "Pro Micro RP2040",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/18288",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
index d2bfa80a348d7..8e8b6319007ab 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
@@ -18,5 +18,5 @@
     "product": "Pro Micro RP2350",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/24870",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
index 3eeb397265572..e756c9bff445a 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
@@ -20,5 +20,5 @@
     "product": "Thing Plus RP2040",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/17745",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
index 09bbefe04dc1e..a6222d7a0def0 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
@@ -23,5 +23,5 @@
     "product": "Thing Plus RP2350",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/25134",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
index 92486564b1067..6a06c0875bde0 100644
--- a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
@@ -21,5 +21,5 @@
     "product": "XRP Controller",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/sparkfun-experiential-robotics-platform-xrp-controller.html",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
index b7dbd016007d7..b0566459a05e8 100644
--- a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/board.json
@@ -19,5 +19,5 @@
     "product": "XRP Controller (Beta)",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/sparkfun-experiential-robotics-platform-xrp-controller-beta.html",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }

From 93a8c53d64e63da4b965265a24ccdd33806055db Mon Sep 17 00:00:00 2001
From: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
Date: Mon, 17 Mar 2025 14:33:59 -0600
Subject: [PATCH 1994/3129] rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350: Add SD
 card support.

The IOTNODE_LORAWAN_RP2350 has an SD card and we want users to be able to
`import sdcard` without copying `sdcard.py` over to their board.

Signed-off-by: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
---
 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/manifest.py   | 3 +++
 .../boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/manifest.py

diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/manifest.py b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/manifest.py
new file mode 100644
index 0000000000000..3f5fa79bf7460
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("sdcard")
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake
index 11fe1ee28fce2..8a36724599d4a 100644
--- a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigboard.cmake
@@ -5,3 +5,6 @@ set(PICO_BOARD_HEADER_DIRS ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
 
 set(PICO_BOARD "sparkfun_iotnode_lorawan_rp2350")
 set(PICO_PLATFORM "rp2350")
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

From 39452dbeed27423fd207d3cc48c52b4e591deea5 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sun, 22 Dec 2024 20:08:54 +1100
Subject: [PATCH 1995/3129] docs/rp2: Add network information to the rp2
 quickref.

Some rp2 boards include WiFi, at least with the very popular Pico W and
Pico 2 W.  New users frequently ask how to set up WiFi and are confused
because it's not covered in the quickref.

This commit adds the wlan section, copied and modified with notes from the
ESP32 quickref.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 docs/esp32/quickref.rst | 24 +++++++++----------
 docs/rp2/quickref.rst   | 51 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index d65782e501ac7..ccc01099d17f9 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -83,30 +83,30 @@ The :class:`network.WLAN` class in the :mod:`network` module::
 
     import network
 
-    wlan = network.WLAN(network.WLAN.IF_STA) # create station interface
-    wlan.active(True)       # activate the interface
-    wlan.scan()             # scan for access points
-    wlan.isconnected()      # check if the station is connected to an AP
+    wlan = network.WLAN()       # create station interface (the default, see below for an access point interface)
+    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('ssid', 'key') # connect to an AP
-    wlan.config('mac')      # get the interface's MAC address
-    wlan.ipconfig('addr4')  # get the interface's IPv4 addresses
+    wlan.config('mac')          # get the interface's MAC address
+    wlan.ipconfig('addr4')      # get the interface's IPv4 addresses
 
     ap = network.WLAN(network.WLAN.IF_AP) # create access-point interface
-    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
+    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
 
 A useful function for connecting to your local WiFi network is::
 
     def do_connect():
-        import network
-        wlan = network.WLAN(network.WLAN.IF_STA)
+        import machine, network
+        wlan = network.WLAN()
         wlan.active(True)
         if not wlan.isconnected():
             print('connecting to network...')
             wlan.connect('ssid', 'key')
             while not wlan.isconnected():
-                pass
+                machine.idle()
         print('network config:', wlan.ipconfig('addr4'))
 
 Once the network is established the :mod:`socket <socket>` module can be used
diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 6be3180500746..23071d77215d5 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -55,6 +55,57 @@ The :mod:`rp2` module::
 
     import rp2
 
+Networking
+----------
+
+WLAN
+^^^^
+
+.. note::
+   This section applies only to devices that include WiFi support, such as the `Pico W`_ and `Pico 2 W`_.
+
+The :class:`network.WLAN` class in the :mod:`network` module::
+
+    import network
+
+    wlan = network.WLAN()       # create station interface (the default, see below for an access point interface)
+    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('ssid', 'key') # connect to an AP
+    wlan.config('mac')          # get the interface's MAC address
+    wlan.ipconfig('addr4')      # get the interface's IPv4 addresses
+
+    ap = network.WLAN(network.WLAN.IF_AP) # create access-point interface
+    ap.config(ssid='RP2-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
+
+A useful function for connecting to your local WiFi network is::
+
+    def do_connect():
+        import machine, network
+        wlan = network.WLAN()
+        wlan.active(True)
+        if not wlan.isconnected():
+            print('connecting to network...')
+            wlan.connect('ssid', 'key')
+            while not wlan.isconnected():
+                machine.idle()
+        print('network config:', wlan.ipconfig('addr4'))
+
+Once the network is established the :mod:`socket <socket>` module can be used
+to create and use TCP/UDP sockets as usual, and the ``requests`` 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.
+
+.. _Pico W: https://www.raspberrypi.com/documentation/microcontrollers/pico-series.html#picow-technical-specification
+.. _Pico 2 W: https://www.raspberrypi.com/documentation/microcontrollers/pico-series.html#pico2w-technical-specification
+
 Delay and timing
 ----------------
 

From f315a376b616fb195a18700a724715f0e7d250e3 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Thu, 13 Mar 2025 13:02:11 +0000
Subject: [PATCH 1996/3129] rp2/machine_i2c: Require an I2C bus ID when no
 default is available.

When PICO_DEFAULT_I2C is not set require an I2C bus ID instead of
using -1 as a default, which would fail with a cryptic:

    "I2C(-1) doesn't exist"

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/machine_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index e97a852b24305..94212fb487043 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -100,7 +100,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         #ifdef PICO_DEFAULT_I2C
         { MP_QSTR_id, MP_ARG_INT, {.u_int = PICO_DEFAULT_I2C} },
         #else
-        { MP_QSTR_id, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_id, MP_ARG_INT | MP_ARG_REQUIRED },
         #endif
         { MP_QSTR_freq, MP_ARG_INT, {.u_int = DEFAULT_I2C_FREQ} },
         { MP_QSTR_scl, MICROPY_I2C_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },

From a86122396d0cdb98ed0e72a4c208d7491581e3fa Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Wed, 12 Mar 2025 10:42:48 +0000
Subject: [PATCH 1997/3129] rp2/machine_spi: Make SPI ID optional.

If the "spi_id" arg is not supplied and then the board default specified by
PICO_DEFAULT_SPI will be used.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/machine_spi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index abf0a70bd0ebc..940e31b3b6ef6 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -128,7 +128,11 @@ 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_sck, ARG_mosi, ARG_miso };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
+        #ifdef PICO_DEFAULT_SPI
+        { MP_QSTR_id,       MP_ARG_INT, {.u_int = PICO_DEFAULT_SPI} },
+        #else
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_INT, },
+        #endif
         { 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} },
@@ -144,7 +148,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     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);
+    int spi_id = args[ARG_id].u_int;
     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);
     }

From dd7a950bbc27713df8cc461958757ec793189d72 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Wed, 12 Mar 2025 11:32:16 +0000
Subject: [PATCH 1998/3129] rp2/machine_spi: Allow MISO to be unspecified.

It's common with write-only SPI displays for MISO to be repurposed as a
register select or data/command pin.

While that was possible by setting up the pin after a call to
`machine.SPI()` this change makes `machine.SPI(miso=None)` explicit.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/machine_spi.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 940e31b3b6ef6..680a3df287850 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -80,6 +80,9 @@
 
 #endif
 
+// Assume we won't get an RP2-compatible with 255 GPIO pins
+#define MICROPY_HW_SPI_PIN_UNUSED UINT8_MAX
+
 // 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,...}
@@ -120,9 +123,14 @@ static machine_spi_obj_t machine_spi_obj[] = {
 
 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)",
+    mp_printf(print, "SPI(%u, baudrate=%u, polarity=%u, phase=%u, bits=%u, sck=%u, mosi=%u, miso=",
         self->spi_id, self->baudrate, self->polarity, self->phase, self->bits,
-        self->sck, self->mosi, self->miso);
+        self->sck, self->mosi);
+    if (self->miso == MICROPY_HW_SPI_PIN_UNUSED) {
+        mp_printf(print, "None)");
+    } else {
+        mp_printf(print, "%u)", 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) {
@@ -140,7 +148,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_sck,      MICROPY_SPI_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_mosi,     MICROPY_SPI_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_miso,     MICROPY_SPI_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_miso,     MICROPY_SPI_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(-1)} },
     };
 
     // Parse the arguments.
@@ -171,7 +179,10 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         }
         self->mosi = mosi;
     }
-    if (args[ARG_miso].u_obj != mp_const_none) {
+
+    if (args[ARG_miso].u_obj == mp_const_none) {
+        self->miso = MICROPY_HW_SPI_PIN_UNUSED;
+    } else if (args[ARG_miso].u_obj != MP_OBJ_NEW_SMALL_INT(-1)) {
         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"));
@@ -194,7 +205,9 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         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);
+        if (self->miso != MICROPY_HW_SPI_PIN_UNUSED) {
+            gpio_set_function(self->miso, GPIO_FUNC_SPI);
+        }
         gpio_set_function(self->mosi, GPIO_FUNC_SPI);
     }
 

From 6fa498cba1a622723d3dc13e15331085aea60d3c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Mar 2025 16:24:55 +1100
Subject: [PATCH 1999/3129] rp2/mpnetworkport: Fix lost CYW43 WiFi events when
 using both cores.

There's a very odd but predictable sequence of events that breaks Wi-Fi
when using both cores:

1) CPU1 calls pendsv_suspend() - for example sleep() causes
   a softtimer node to be inserted, which calls pendsv_suspend().
2) CYW43 sends wakeup IRQ. CPU0 GPIO IRQ handler schedules PendSV
   and disables the GPIO IRQ on CPU0, to re-enable after
   cyw43_poll() runs and completes.
3) CPU0 PendSV_Handler runs, sees pendsv is suspended, exits.
4) CPU1 calls pendsv_resume() and pendsv_resume() sees PendSV
   is pending and triggers it on CPU1.
5) CPU1 runs PendSV_Handler, runs cyw43_poll(), and at the end
   it re-enables the IRQ *but now on CPU1*.

However CPU1 has GPIO IRQs disabled, so the CYW43 interrupt never runs
again...

The fix in this commit is to always enable/disable the interrupt on CPU0.
This isn't supported by the pico-sdk, but it is supported by the hardware.

Fixes issue #16779.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mpnetworkport.c | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index af2cabb3bff0f..2687a56874996 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -59,13 +59,36 @@ static soft_timer_entry_t mp_network_soft_timer;
 
 volatile int cyw43_has_pending = 0;
 
+// The Pico SDK only lets us set GPIO wake on the current running CPU, but the
+// hardware doesn't have this limit. We need to always enable/disable the pin
+// interrupt on CPU0, regardless of which CPU runs PendSV and
+// cyw43_post_poll_hook(). See feature request at https://github.com/raspberrypi/pico-sdk/issues/2354
+static void gpio_set_cpu0_host_wake_irq_enabled(bool enable) {
+    // This is a re-implementation of gpio_set_irq_enabled() and _gpio_set_irq_enabled()
+    // from the pico-sdk, but with the core, gpio, and event type hardcoded to shrink
+    // code size.
+    io_bank0_irq_ctrl_hw_t *irq_ctrl_base = &io_bank0_hw->proc0_irq_ctrl;
+    uint32_t gpio = CYW43_PIN_WL_HOST_WAKE;
+    uint32_t events = CYW43_IRQ_LEVEL;
+    io_rw_32 *en_reg = &irq_ctrl_base->inte[gpio / 8];
+    events <<= 4 * (gpio % 8);
+    if (enable) {
+        hw_set_bits(en_reg, events);
+    } else {
+        hw_clear_bits(en_reg, events);
+    }
+}
+
+// GPIO IRQ always runs on CPU0
 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);
+        // As we use a level interrupt (and can't use an edge interrupt
+        // as CYW43_PIN_WL_HOST_WAKE is also a SPI data pin), we need to disable
+        // the interrupt to stop it re-triggering until after PendSV run
+        // cyw43_poll(). It is re-enabled in cyw43_post_poll_hook(), implemented
+        // below.
+        gpio_set_cpu0_host_wake_irq_enabled(false);
         cyw43_has_pending = 1;
         __sev();
         pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
@@ -81,9 +104,10 @@ void cyw43_irq_init(void) {
     #endif
 }
 
+// This hook will run on whichever CPU serviced the PendSV interrupt
 void cyw43_post_poll_hook(void) {
     cyw43_has_pending = 0;
-    gpio_set_irq_enabled(CYW43_PIN_WL_HOST_WAKE, CYW43_IRQ_LEVEL, true);
+    gpio_set_cpu0_host_wake_irq_enabled(true);
 }
 
 #endif

From 23fb171b808a54eb51304ced9504ce66261bcc54 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 18 Mar 2025 16:05:41 +1100
Subject: [PATCH 2000/3129] rp2/mpnetworkport: Refactor out cyw43_has_pending
 global variable.

A better indication of whether a cyw43 event is pending is the actual flag
in the PendSV handler table. (If this fails, could also use the GPIO
interrupt enabled register bit).

This commit was needed of a previous version of the fix in the parent
commit, but it turned out not strictly necessary for the current version.
However, it's still a good clean up.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/cyw43_configport.h | 6 ++++--
 ports/rp2/modmachine.c       | 2 +-
 ports/rp2/mpnetworkport.c    | 5 +----
 ports/rp2/pendsv.c           | 4 ++++
 ports/rp2/pendsv.h           | 1 +
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index bb99bb2976fee..ead1a3953d97e 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -140,10 +140,12 @@ uint cyw43_get_pin_wl(cyw43_pin_index_t pin_id);
 #endif
 
 void cyw43_post_poll_hook(void);
-extern volatile int cyw43_has_pending;
+static inline bool cyw43_poll_is_pending(void) {
+    return pendsv_is_pending(PENDSV_DISPATCH_CYW43);
+}
 
 static inline void cyw43_yield(void) {
-    if (!cyw43_has_pending) {
+    if (!cyw43_poll_is_pending()) {
         best_effort_wfe_or_timeout(make_timeout_time_ms(1));
     }
 }
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 954ea216497fe..31665a7640d9c 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -145,7 +145,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     uint32_t my_interrupts = MICROPY_BEGIN_ATOMIC_SECTION();
     #if MICROPY_PY_NETWORK_CYW43
-    if (cyw43_has_pending && cyw43_poll != NULL) {
+    if (cyw43_poll_is_pending()) {
         MICROPY_END_ATOMIC_SECTION(my_interrupts);
         return;
     }
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 2687a56874996..7a6df7f6e5b4d 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -57,7 +57,6 @@ static soft_timer_entry_t mp_network_soft_timer;
 #define CYW43_IRQ_LEVEL GPIO_IRQ_LEVEL_HIGH
 #define CYW43_SHARED_IRQ_HANDLER_PRIORITY PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY
 
-volatile int cyw43_has_pending = 0;
 
 // The Pico SDK only lets us set GPIO wake on the current running CPU, but the
 // hardware doesn't have this limit. We need to always enable/disable the pin
@@ -89,9 +88,8 @@ static void gpio_irq_handler(void) {
         // cyw43_poll(). It is re-enabled in cyw43_post_poll_hook(), implemented
         // below.
         gpio_set_cpu0_host_wake_irq_enabled(false);
-        cyw43_has_pending = 1;
-        __sev();
         pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
+        __sev();
         CYW43_STAT_INC(IRQ_COUNT);
     }
 }
@@ -106,7 +104,6 @@ void cyw43_irq_init(void) {
 
 // This hook will run on whichever CPU serviced the PendSV interrupt
 void cyw43_post_poll_hook(void) {
-    cyw43_has_pending = 0;
     gpio_set_cpu0_host_wake_irq_enabled(true);
 }
 
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 2c086f89429be..0bf64d0ae440d 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -99,6 +99,10 @@ static inline int pendsv_suspend_count(void) {
 
 #endif
 
+bool pendsv_is_pending(size_t slot) {
+    return pendsv_dispatch_table[slot] != NULL;
+}
+
 static inline void pendsv_resume_run_dispatch(void) {
     // Run pendsv if needed.  Find an entry with a dispatch and call pendsv dispatch
     // with it.  If pendsv runs it will service all slots.
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
index a5d9440211a10..6abe950df632e 100644
--- a/ports/rp2/pendsv.h
+++ b/ports/rp2/pendsv.h
@@ -51,5 +51,6 @@ void pendsv_init(void);
 void pendsv_suspend(void);
 void pendsv_resume(void);
 void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f);
+bool pendsv_is_pending(size_t slot);
 
 #endif // MICROPY_INCLUDED_RP2_PENDSV_H

From 35d4d2d06bf2776070c0635e4e3093ef7a6c8f39 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Mar 2025 16:57:19 +1100
Subject: [PATCH 2001/3129] rp2/pendsv: Account for PendSV running on both
 cores, and without CYW43.

Changes:
- Move setting of PendSV priority to pendsv_init().
- Call pendsv_init() from CPU1 as well, to ensure priority is the same.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mpnetworkport.c |  4 ----
 ports/rp2/mpthreadport.c  |  3 +++
 ports/rp2/pendsv.c        | 30 +++++++++++++++++++++++-------
 ports/rp2/pendsv.h        |  3 ---
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 7a6df7f6e5b4d..e1e1567828bfb 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -42,7 +42,6 @@ static soft_timer_entry_t mp_network_soft_timer;
 #if MICROPY_PY_NETWORK_CYW43
 #include "lib/cyw43-driver/src/cyw43.h"
 #include "lib/cyw43-driver/src/cyw43_stats.h"
-#include "hardware/irq.h"
 
 #if !defined(__riscv)
 #if PICO_RP2040
@@ -97,9 +96,6 @@ static void gpio_irq_handler(void) {
 void cyw43_irq_init(void) {
     gpio_add_raw_irq_handler_with_order_priority(CYW43_PIN_WL_HOST_WAKE, gpio_irq_handler, CYW43_SHARED_IRQ_HANDLER_PRIORITY);
     irq_set_enabled(IO_IRQ_BANK0, true);
-    #if !defined(__riscv)
-    NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
-    #endif
 }
 
 // This hook will run on whichever CPU serviced the PendSV interrupt
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 8fd5e5d790277..043a878c89b06 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -106,6 +106,9 @@ static void core1_entry_wrapper(void) {
     // Allow MICROPY_BEGIN_ATOMIC_SECTION to be invoked from core0.
     multicore_lockout_victim_init();
 
+    // Set PendSV interrupt priority correctly for CPU1
+    pendsv_init();
+
     if (core1_entry) {
         core1_entry(core1_arg);
     }
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 0bf64d0ae440d..05b521fde2607 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -28,6 +28,7 @@
 #include "py/mpconfig.h"
 #include "py/mpthread.h"
 #include "pendsv.h"
+#include "hardware/irq.h"
 
 #if PICO_RP2040
 #include "RP2040.h"
@@ -45,6 +46,9 @@ static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
 
 static inline void pendsv_resume_run_dispatch(void);
 
+// PendSV IRQ priority, to run system-level tasks that preempt the main thread.
+#define IRQ_PRI_PENDSV PICO_LOWEST_IRQ_PRIORITY
+
 void PendSV_Handler(void);
 
 #if MICROPY_PY_THREAD
@@ -53,8 +57,14 @@ void PendSV_Handler(void);
 // loop of mp_wfe_or_timeout(), where we don't want the CPU event bit to be set.
 static mp_thread_recursive_mutex_t pendsv_mutex;
 
+// Called from CPU0 during boot, but may be called later when CPU1 wakes up
 void pendsv_init(void) {
-    mp_thread_recursive_mutex_init(&pendsv_mutex);
+    if (get_core_num() == 0) {
+        mp_thread_recursive_mutex_init(&pendsv_mutex);
+    }
+    #if !defined(__riscv)
+    NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
+    #endif
 }
 
 void pendsv_suspend(void) {
@@ -117,11 +127,13 @@ static inline void pendsv_resume_run_dispatch(void) {
 
 void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
     pendsv_dispatch_table[slot] = f;
+    // There is a race here where other core calls pendsv_suspend() before ISR
+    // can execute so this check fails, but dispatch will happen later when
+    // other core calls pendsv_resume().
     if (pendsv_suspend_count() == 0) {
         #if PICO_ARM
-        // There is a race here where other core calls pendsv_suspend() before
-        // ISR can execute, but dispatch will happen later when other core
-        // calls pendsv_resume().
+        // Note this register is part of each CPU core, so setting it on CPUx
+        // will set the IRQ and run PendSV_Handler on CPUx only.
         SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
         #elif PICO_RISCV
         struct timespec ts;
@@ -136,15 +148,19 @@ void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
 }
 
 // PendSV interrupt handler to perform background processing.
+//
+// Handler can execute on either CPU if MICROPY_PY_THREAD is set (no code on
+// CPU1 calls pendsv_schedule_dispatch(), but CPU1 can call pendsv_resume()
+// which will trigger it).
 void PendSV_Handler(void) {
 
     #if MICROPY_PY_THREAD
     if (!mp_thread_recursive_mutex_lock(&pendsv_mutex, 0)) {
-        // Failure here means core 1 holds pendsv_mutex. ISR will
-        // run again after core 1 calls pendsv_resume().
+        // Failure here means other core holds pendsv_mutex. ISR will
+        // run again after that core calls pendsv_resume().
         return;
     }
-    // Core 0 should not already have locked pendsv_mutex
+    // This core should not already have locked pendsv_mutex
     assert(pendsv_mutex.mutex.enter_count == 1);
     #else
     assert(pendsv_suspend_count() == 0);
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
index 6abe950df632e..de89f0473e7fa 100644
--- a/ports/rp2/pendsv.h
+++ b/ports/rp2/pendsv.h
@@ -42,9 +42,6 @@ enum {
 
 #define PENDSV_DISPATCH_NUM_SLOTS PENDSV_DISPATCH_MAX
 
-// PendSV IRQ priority, to run system-level tasks that preempt the main thread.
-#define IRQ_PRI_PENDSV PICO_LOWEST_IRQ_PRIORITY
-
 typedef void (*pendsv_dispatch_t)(void);
 
 void pendsv_init(void);

From 2b2a43187890c47a90ef28b0874691d4df176d14 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Mar 2025 11:26:53 +0100
Subject: [PATCH 2002/3129] rp2/machine_uart: Fix unintended UART buffer
 allocation on init().

The buffer was be reset on every call to uart.init().  If no sizes were
given, the buffer was set to the default size 256.  That made problems e.g.
with PPP.

This commit fixes it, keeping the buffer size if not deliberately changed
and allocating new buffers only if the size was changed.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/rp2/machine_uart.c | 41 ++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 334c6fda328f3..9a4507ada69c4 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -116,8 +116,10 @@ typedef struct _machine_uart_obj_t {
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
     uint8_t invert;
     uint8_t flow;
+    uint16_t rxbuf_len;
     ringbuf_t read_buffer;
     mutex_t *read_mutex;
+    uint16_t txbuf_len;
     ringbuf_t write_buffer;
     mutex_t *write_mutex;
     uint16_t mp_irq_trigger;   // user IRQ trigger mask
@@ -128,10 +130,10 @@ 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,
      MICROPY_HW_UART0_TX, MICROPY_HW_UART0_RX, MICROPY_HW_UART0_CTS, MICROPY_HW_UART0_RTS,
-     0, 0, 0, 0, {NULL, 1, 0, 0}, &read_mutex_0, {NULL, 1, 0, 0}, &write_mutex_0, 0, 0, NULL},
+     0, 0, 0, 0, 0, {NULL, 1, 0, 0}, &read_mutex_0, 0, {NULL, 1, 0, 0}, &write_mutex_0, 0, 0, NULL},
     {{&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}, &read_mutex_1, {NULL, 1, 0, 0}, &write_mutex_1},
+     0, 0, 0, 0, 0, {NULL, 1, 0, 0}, &read_mutex_1, 0, {NULL, 1, 0, 0}, &write_mutex_1, 0, 0, NULL},
 };
 
 static const char *_parity_name[] = {"None", "0", "1"};
@@ -252,7 +254,7 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
     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, irq=%d)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
-        self->stop, self->tx, self->rx, self->write_buffer.size - 1, self->read_buffer.size - 1,
+        self->stop, self->tx, self->rx, self->txbuf_len, self->rxbuf_len,
         self->timeout, self->timeout_char, _invert_name[self->invert], self->mp_irq_trigger);
 }
 
@@ -365,25 +367,33 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     }
 
     // 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;
+        size_t 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"));
         }
+        // Force re-allocting of the buffer if the size changed
+        if (rxbuf_len != self->rxbuf_len) {
+            self->read_buffer.buf = NULL;
+            self->rxbuf_len = rxbuf_len;
+        }
     }
 
     // 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;
+        size_t 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"));
         }
+        // Force re-allocting of the buffer if the size changed
+        if (txbuf_len != self->txbuf_len) {
+            self->write_buffer.buf = NULL;
+            self->txbuf_len = txbuf_len;
+        }
     }
 
     // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
@@ -423,11 +433,14 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         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[self->uart_id]) = self->read_buffer.buf;
-
-        ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
-        MP_STATE_PORT(rp2_uart_tx_buffer[self->uart_id]) = self->write_buffer.buf;
+        if (self->read_buffer.buf == NULL) {
+            ringbuf_alloc(&(self->read_buffer), self->rxbuf_len + 1);
+            MP_STATE_PORT(rp2_uart_rx_buffer[self->uart_id]) = self->read_buffer.buf;
+        }
+        if (self->write_buffer.buf == NULL) {
+            ringbuf_alloc(&(self->write_buffer), self->txbuf_len + 1);
+            MP_STATE_PORT(rp2_uart_tx_buffer[self->uart_id]) = self->write_buffer.buf;
+        }
 
         // Set the irq handler.
         if (self->uart_id == 0) {
@@ -454,6 +467,10 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 
     // Get static peripheral object.
     machine_uart_obj_t *self = (machine_uart_obj_t *)&machine_uart_obj[uart_id];
+    self->rxbuf_len = DEFAULT_BUFFER_SIZE;
+    self->read_buffer.buf = NULL;
+    self->txbuf_len = DEFAULT_BUFFER_SIZE;
+    self->write_buffer.buf = NULL;
 
     // Initialise the UART peripheral.
     mp_map_t kw_args;

From 6db7b47ab931db3e95d2d97ad3c383a6ba035bb0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Mar 2025 11:39:12 +0100
Subject: [PATCH 2003/3129] samd/machine_uart: Fix unintended UART buffer
 allocation on init().

The buffer was be reset on every call to uart.init().  If no sizes were
given, the buffer was set to the default size 256.  That made problems
e.g. with PPP.

This commit fixes it, keeping the buffer size if not deliberately changed
and allocating new buffers only if the size was changed.  Cater for changes
of the bits value, which requires a change to the buffer size.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_uart.c | 49 ++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 45bfc3ddd5002..85a81660ca05f 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -88,8 +88,10 @@ 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)
     bool new;
+    uint16_t rxbuf_len;
     ringbuf_t read_buffer;
     #if MICROPY_HW_UART_TXBUF
+    uint16_t txbuf_len;
     ringbuf_t write_buffer;
     #endif
     #if MICROPY_PY_MACHINE_UART_IRQ
@@ -287,16 +289,6 @@ void machine_uart_set_baudrate(mp_obj_t self_in, uint32_t baudrate) {
 
 static void mp_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);
-    size_t rxbuf_len = self->read_buffer.size - 1;
-    #if MICROPY_HW_UART_TXBUF
-    size_t txbuf_len = self->write_buffer.size - 1;
-    #endif
-    if (self->bits > 8) {
-        rxbuf_len /= 2;
-        #if MICROPY_HW_UART_TXBUF
-        txbuf_len /= 2;
-        #endif
-    }
 
     mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
         "tx=\"%q\", rx=\"%q\", timeout=%u, timeout_char=%u, rxbuf=%d"
@@ -312,9 +304,9 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         ")",
         self->id, self->baudrate, self->bits, _parity_name[self->parity],
         self->stop + 1, pin_find_by_id(self->tx)->name, pin_find_by_id(self->rx)->name,
-        self->timeout, self->timeout_char, rxbuf_len
+        self->timeout, self->timeout_char, self->rxbuf_len
         #if MICROPY_HW_UART_TXBUF
-        , txbuf_len
+        , self->txbuf_len
         #endif
         #if MICROPY_HW_UART_RTSCTS
         , self->rts != 0xff ? pin_find_by_id(self->rts)->name : MP_QSTR_None
@@ -358,6 +350,11 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     // Set bits if configured.
     if (args[ARG_bits].u_int > 0) {
         self->bits = args[ARG_bits].u_int;
+        // Invalidate the buffers since the size may have to be changed
+        self->read_buffer.buf = NULL;
+        #if MICROPY_HW_UART_TXBUF
+        self->write_buffer.buf = NULL;
+        #endif
     }
 
     // Set parity if configured.
@@ -414,7 +411,7 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     }
 
     // Set the RX buffer size if configured.
-    size_t rxbuf_len = DEFAULT_BUFFER_SIZE;
+    size_t rxbuf_len = self->rxbuf_len;
     if (args[ARG_rxbuf].u_int > 0) {
         rxbuf_len = args[ARG_rxbuf].u_int;
         if (rxbuf_len < MIN_BUFFER_SIZE) {
@@ -422,11 +419,16 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         } else if (rxbuf_len > MAX_BUFFER_SIZE) {
             mp_raise_ValueError(MP_ERROR_TEXT("rxbuf too large"));
         }
+        // Force re-allocting of the buffer if the size changed
+        if (rxbuf_len != self->rxbuf_len) {
+            self->read_buffer.buf = NULL;
+            self->rxbuf_len = rxbuf_len;
+        }
     }
 
     #if MICROPY_HW_UART_TXBUF
     // Set the TX buffer size if configured.
-    size_t txbuf_len = DEFAULT_BUFFER_SIZE;
+    size_t txbuf_len = self->txbuf_len;
     if (args[ARG_txbuf].u_int > 0) {
         txbuf_len = args[ARG_txbuf].u_int;
         if (txbuf_len < MIN_BUFFER_SIZE) {
@@ -434,6 +436,11 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         } else if (txbuf_len > MAX_BUFFER_SIZE) {
             mp_raise_ValueError(MP_ERROR_TEXT("txbuf too large"));
         }
+        // Force re-allocting of the buffer if the size changed
+        if (txbuf_len != self->txbuf_len) {
+            self->write_buffer.buf = NULL;
+            self->txbuf_len = txbuf_len;
+        }
     }
     #endif
 
@@ -462,10 +469,14 @@ static void mp_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);
+        if (self->read_buffer.buf == NULL) {
+            ringbuf_alloc(&(self->read_buffer), rxbuf_len + 1);
+        }
 
         #if MICROPY_HW_UART_TXBUF
-        ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
+        if (self->write_buffer.buf == NULL) {
+            ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
+        }
         #endif
 
         // Step 1: Configure the Pin mux.
@@ -503,6 +514,12 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->stop = 0;
     self->timeout = 1;
     self->timeout_char = 1;
+    self->rxbuf_len = DEFAULT_BUFFER_SIZE;
+    self->read_buffer.buf = NULL;
+    #if MICROPY_HW_UART_TXBUF
+    self->txbuf_len = DEFAULT_BUFFER_SIZE;
+    self->write_buffer.buf = NULL;
+    #endif
     #if defined(pin_TX) && defined(pin_RX)
     // Initialize with the default pins
     self->tx = mp_hal_get_pin_obj((mp_obj_t)pin_TX);

From 4dfee50a0be8d61c79928f7bb11a4b77c485aea1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Mar 2025 11:39:12 +0100
Subject: [PATCH 2004/3129] samd/machine_uart: Fix lock-up in loopback mode if
 read buffer is full.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_uart.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 85a81660ca05f..5be38e961c121 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -156,7 +156,8 @@ void common_uart_irq_handler(int uart_id) {
                 }
             }
             #endif
-        } else if (uart->USART.INTFLAG.bit.DRE != 0) {
+        }
+        if (uart->USART.INTFLAG.bit.DRE != 0) {
             #if MICROPY_HW_UART_TXBUF
             // handle the outgoing data
             if (ringbuf_avail(&self->write_buffer) > 0) {

From 56e90cb60b028f0a306e6253ad183e6cd4a2b45e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Mar 2025 13:14:46 +1100
Subject: [PATCH 2005/3129] py/mpconfig: Enable 2-argument built-in next() at
 basic feature level.

This is a pretty fundamental built-in and having CPython-compatible
behaviour is beneficial.  The code size increase is not much, and
ports/boards can still disable it if needed to save space.

Addresses issue #5384.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 05f39b3605bf3..dfa32ebf7614a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1215,7 +1215,7 @@ typedef double mp_float_t;
 
 // Support for calling next() with second argument
 #ifndef MICROPY_PY_BUILTINS_NEXT2
-#define MICROPY_PY_BUILTINS_NEXT2 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#define MICROPY_PY_BUILTINS_NEXT2 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
 #endif
 
 // Whether to support rounding of integers (incl bignum); eg round(123,-1)=120

From 994751c25139496eed9c0eb90949ae8fd681e734 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 Mar 2025 10:58:43 +1100
Subject: [PATCH 2006/3129] tests/cpydiff: Remove builtin_next_arg2.py
 difference.

Because 2-arg `next()` is implemented, and now enabled at the basic feature
level.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cpydiff/builtin_next_arg2.py | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 tests/cpydiff/builtin_next_arg2.py

diff --git a/tests/cpydiff/builtin_next_arg2.py b/tests/cpydiff/builtin_next_arg2.py
deleted file mode 100644
index ed9565fe0fe77..0000000000000
--- a/tests/cpydiff/builtin_next_arg2.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-categories: Modules,builtins
-description: Second argument to next() is not implemented
-cause: MicroPython is optimised for code space.
-workaround: Instead of ``val = next(it, deflt)`` use::
-
-    try:
-        val = next(it)
-    except StopIteration:
-        val = deflt
-"""
-
-print(next(iter(range(0)), 42))

From fdc0c6f8f673cf5e6d2b02ff6820bcc14afe9c94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 Mar 2025 10:24:58 +1100
Subject: [PATCH 2007/3129] py/dynruntime: Make malloc functions raise
 MemoryError on failure.

Addresses some TODOs in this file.

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

diff --git a/py/dynruntime.h b/py/dynruntime.h
index d360d824ac39c..c93111bbd4d6f 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -28,6 +28,14 @@
 
 // This header file contains definitions to dynamically implement the static
 // MicroPython runtime API defined in py/obj.h and py/runtime.h.
+//
+// All of the symbols made available in this header are overriding those defined
+// in py/obj.h and py/runtime.h.  This is done with macros.  For macros that
+// would be too complicated (usually more than a single expression), they call a
+// static-inline function for the implementation.  This function has the same
+// name as the macro (hence the same name as a public API function) but with
+// "_dyn" appended. For example, the m_malloc() macro calls the m_malloc_dyn()
+// static-inline function.
 
 #include "py/binary.h"
 #include "py/nativeglue.h"
@@ -39,6 +47,10 @@
 #error "dynruntime.h included in non-dynamic-module build."
 #endif
 
+#if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+#error "MICROPY_MALLOC_USES_ALLOCATED_SIZE must be disable in a dynamic-module build."
+#endif
+
 #undef MP_ROM_QSTR
 #undef MP_OBJ_QSTR_VALUE
 #undef MP_OBJ_NEW_QSTR
@@ -52,13 +64,32 @@
 /******************************************************************************/
 // Memory allocation
 
+#define m_malloc_fail(num_bytes)        (m_malloc_fail_dyn((num_bytes)))
 #define m_malloc(n)                     (m_malloc_dyn((n)))
 #define m_free(ptr)                     (m_free_dyn((ptr)))
 #define m_realloc(ptr, new_num_bytes)   (m_realloc_dyn((ptr), (new_num_bytes)))
+#define m_realloc_maybe(ptr, new_num_bytes, allow_move) (m_realloc_maybe_dyn((ptr), (new_num_bytes), (allow_move)))
+
+static NORETURN inline void m_malloc_fail_dyn(size_t num_bytes) {
+    mp_fun_table.raise_msg(
+        mp_fun_table.load_global(MP_QSTR_MemoryError),
+        "memory allocation failed");
+}
+
+static inline void *m_realloc_maybe_dyn(void *ptr, size_t new_num_bytes, bool allow_move) {
+    return mp_fun_table.realloc_(ptr, new_num_bytes, allow_move);
+}
+
+static inline void *m_realloc_checked_dyn(void *ptr, size_t new_num_bytes, bool allow_move) {
+    ptr = m_realloc_maybe(ptr, new_num_bytes, allow_move);
+    if (ptr == NULL && new_num_bytes != 0) {
+        m_malloc_fail(new_num_bytes);
+    }
+    return ptr;
+}
 
 static inline void *m_malloc_dyn(size_t n) {
-    // TODO won't raise on OOM
-    return mp_fun_table.realloc_(NULL, n, false);
+    return m_realloc_checked_dyn(NULL, n, false);
 }
 
 static inline void m_free_dyn(void *ptr) {
@@ -66,8 +97,7 @@ static inline void m_free_dyn(void *ptr) {
 }
 
 static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
-    // TODO won't raise on OOM
-    return mp_fun_table.realloc_(ptr, new_num_bytes, true);
+    return m_realloc_checked_dyn(ptr, new_num_bytes, true);
 }
 
 /******************************************************************************/

From fa42487e45620534440256c9b29e4526f3137de9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 Mar 2025 00:34:20 +1100
Subject: [PATCH 2008/3129] extmod/moddeflate: Keep DeflateIO state consistent
 on window alloc fail.

Allocation of a large compression window may fail, and in that case keep
the `DeflateIO` state consistent so its other methods (such as `close()`)
still work.  Consistency is kept by only updating the `self->write` member
if the window allocation succeeds.

Thanks to @jimmo for finding the bug.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moddeflate.c                           | 12 ++++--
 tests/extmod/deflate_compress_memory_error.py | 39 +++++++++++++++++++
 .../deflate_compress_memory_error.py.exp      |  2 +
 tests/run-tests.py                            |  1 +
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 tests/extmod/deflate_compress_memory_error.py
 create mode 100644 tests/extmod/deflate_compress_memory_error.py.exp

diff --git a/extmod/moddeflate.c b/extmod/moddeflate.c
index 4afad01618c4d..920b898b2ccc2 100644
--- a/extmod/moddeflate.c
+++ b/extmod/moddeflate.c
@@ -168,16 +168,20 @@ static bool deflateio_init_write(mp_obj_deflateio_t *self) {
 
     const mp_stream_p_t *stream = mp_get_stream_raise(self->stream, MP_STREAM_OP_WRITE);
 
-    self->write = m_new_obj(mp_obj_deflateio_write_t);
-    self->write->input_len = 0;
-
     int wbits = self->window_bits;
     if (wbits == 0) {
         // Same default wbits for all formats.
         wbits = DEFLATEIO_DEFAULT_WBITS;
     }
+
+    // Allocate the large window before allocating the mp_obj_deflateio_write_t, in case the
+    // window allocation fails the mp_obj_deflateio_t object will remain in a consistent state.
     size_t window_len = 1 << wbits;
-    self->write->window = m_new(uint8_t, window_len);
+    uint8_t *window = m_new(uint8_t, window_len);
+
+    self->write = m_new_obj(mp_obj_deflateio_write_t);
+    self->write->window = window;
+    self->write->input_len = 0;
 
     uzlib_lz77_init(&self->write->lz77, self->write->window, window_len);
     self->write->lz77.dest_write_data = self;
diff --git a/tests/extmod/deflate_compress_memory_error.py b/tests/extmod/deflate_compress_memory_error.py
new file mode 100644
index 0000000000000..56ce0603081d4
--- /dev/null
+++ b/tests/extmod/deflate_compress_memory_error.py
@@ -0,0 +1,39 @@
+# Test deflate.DeflateIO compression, with out-of-memory errors.
+
+try:
+    # Check if deflate is available.
+    import deflate
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Check if compression is enabled.
+if not hasattr(deflate.DeflateIO, "write"):
+    print("SKIP")
+    raise SystemExit
+
+# Create a compressor object.
+b = io.BytesIO()
+g = deflate.DeflateIO(b, deflate.RAW, 15)
+
+# Then, use up most of the heap.
+l = []
+while True:
+    try:
+        l.append(bytearray(1000))
+    except:
+        break
+l.pop()
+
+# Try to compress.  This will try to allocate a large window and fail.
+try:
+    g.write('test')
+except MemoryError:
+    print("MemoryError")
+
+# Should still be able to close the stream.
+g.close()
+
+# The underlying output stream should be unchanged.
+print(b.getvalue())
diff --git a/tests/extmod/deflate_compress_memory_error.py.exp b/tests/extmod/deflate_compress_memory_error.py.exp
new file mode 100644
index 0000000000000..606315c14604c
--- /dev/null
+++ b/tests/extmod/deflate_compress_memory_error.py.exp
@@ -0,0 +1,2 @@
+MemoryError
+b''
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 50adb6b4d3bea..9e7cab4689a8d 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -163,6 +163,7 @@ def open(self, path, mode):
         "extmod/asyncio_threadsafeflag.py",
         "extmod/asyncio_wait_for_fwd.py",
         "extmod/binascii_a2b_base64.py",
+        "extmod/deflate_compress_memory_error.py",  # tries to allocate unlimited memory
         "extmod/re_stack_overflow.py",
         "extmod/time_res.py",
         "extmod/vfs_posix.py",

From 458a8f2e15c8932f83331ce316db3a71551c7a9a Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Fri, 14 Mar 2025 13:16:49 -0400
Subject: [PATCH 2009/3129] extmod/vfs: Refactor mp_vfs_mount to enable no-args
 mount overload.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 extmod/vfs.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index c83b8ce7d563e..88a32c3bc800d 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -206,22 +206,24 @@ static mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
 }
 
 mp_obj_t mp_vfs_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_readonly, ARG_mkfs };
+    enum { ARG_fsobj, ARG_mount_point, ARG_readonly, ARG_mkfs };
     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_readonly, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_FALSE} },
         { MP_QSTR_mkfs, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_FALSE} },
     };
 
     // parse args
     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);
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // get the mount point
     size_t mnt_len;
-    const char *mnt_str = mp_obj_str_get_data(pos_args[1], &mnt_len);
+    const char *mnt_str = mp_obj_str_get_data(args[ARG_mount_point].u_obj, &mnt_len);
 
     // see if we need to auto-detect and create the filesystem
-    mp_obj_t vfs_obj = pos_args[0];
+    mp_obj_t vfs_obj = args[ARG_fsobj].u_obj;
     mp_obj_t dest[2];
     mp_load_method_maybe(vfs_obj, MP_QSTR_mount, dest);
     if (dest[0] == MP_OBJ_NULL) {
@@ -238,11 +240,13 @@ mp_obj_t mp_vfs_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args
     vfs->next = NULL;
 
     // call the underlying object to do any mounting operation
-    mp_vfs_proxy_call(vfs, MP_QSTR_mount, 2, (mp_obj_t *)&args);
+    mp_arg_val_t *proxy_args = &args[ARG_readonly];
+    size_t proxy_args_len = MP_ARRAY_SIZE(args) - ARG_readonly;
+    mp_vfs_proxy_call(vfs, MP_QSTR_mount, proxy_args_len, (mp_obj_t *)proxy_args);
 
     // check that the destination mount point is unused
     const char *path_out;
-    mp_vfs_mount_t *existing_mount = mp_vfs_lookup_path(mp_obj_str_get_str(pos_args[1]), &path_out);
+    mp_vfs_mount_t *existing_mount = mp_vfs_lookup_path(mp_obj_str_get_str(args[ARG_mount_point].u_obj), &path_out);
     if (existing_mount != MP_VFS_NONE && existing_mount != MP_VFS_ROOT) {
         if (vfs->len != 1 && existing_mount->len == 1) {
             // if root dir is mounted, still allow to mount something within a subdir of root
@@ -266,7 +270,7 @@ mp_obj_t mp_vfs_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args
 
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_vfs_mount_obj, 2, mp_vfs_mount);
+MP_DEFINE_CONST_FUN_OBJ_KW(mp_vfs_mount_obj, 0, mp_vfs_mount);
 
 mp_obj_t mp_vfs_umount(mp_obj_t mnt_in) {
     // remove vfs from the mount table

From 1487a13079ec5e33cac8d273e6d2fa805bca4b1e Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Fri, 14 Mar 2025 13:19:06 -0400
Subject: [PATCH 2010/3129] extmod/vfs: Return mount table from no-args
 vfs.mount call.

This extends the existing `vfs.mount()` function to accept zero arguments,
in which case it returns a list of tuples of mounted filesystem objects
and their mount location.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 extmod/vfs.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 88a32c3bc800d..aebf5ed295b3b 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -206,6 +206,18 @@ static mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
 }
 
 mp_obj_t mp_vfs_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    if (n_args == 0) {
+        // zero-args, output a table of all current mountpoints
+        mp_obj_t mount_list = mp_obj_new_list(0, NULL);
+        mp_vfs_mount_t *vfsp = MP_STATE_VM(vfs_mount_table);
+        while (vfsp != NULL) {
+            mp_obj_t items[] = { vfsp->obj, mp_obj_new_str(vfsp->str, vfsp->len) };
+            mp_obj_list_append(mount_list, mp_obj_new_tuple(MP_ARRAY_SIZE(items), items));
+            vfsp = vfsp->next;
+        }
+        return mount_list;
+    }
+
     enum { ARG_fsobj, ARG_mount_point, ARG_readonly, ARG_mkfs };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },

From 9fcc25b9d7e6246f9c1dda3c07f3e718f751e74c Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 3 Mar 2025 14:05:31 -0500
Subject: [PATCH 2011/3129] tests/extmod/vfs_mountinfo.py: Add test for no-args
 mount output.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/extmod/vfs_mountinfo.py     | 66 +++++++++++++++++++++++++++++++
 tests/extmod/vfs_mountinfo.py.exp | 11 ++++++
 2 files changed, 77 insertions(+)
 create mode 100644 tests/extmod/vfs_mountinfo.py
 create mode 100644 tests/extmod/vfs_mountinfo.py.exp

diff --git a/tests/extmod/vfs_mountinfo.py b/tests/extmod/vfs_mountinfo.py
new file mode 100644
index 0000000000000..f674e80763409
--- /dev/null
+++ b/tests/extmod/vfs_mountinfo.py
@@ -0,0 +1,66 @@
+# test VFS functionality without any particular filesystem type
+
+try:
+    import os, vfs
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+import errno
+
+
+class Filesystem:
+    def __init__(self, id, paths=[]):
+        self.id = id
+        self.paths = paths
+
+    def mount(self, readonly, mksfs):
+        print("mount", self)
+
+    def umount(self):
+        print("umount", self)
+
+    def stat(self, path):
+        if path in self.paths:
+            return (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        else:
+            raise OSError
+
+    statvfs = stat
+
+    def open(self, path, mode):
+        pass
+
+    def __repr__(self):
+        return "Filesystem(%d)" % self.id
+
+
+# first we umount any existing mount points the target may have
+try:
+    vfs.umount("/")
+except OSError:
+    pass
+for path in os.listdir("/"):
+    vfs.umount("/" + path)
+
+
+print(vfs.mount())
+
+vfs.mount(Filesystem(1), "/foo")
+
+print(vfs.mount())
+
+vfs.mount(Filesystem(2), "/bar/baz")
+
+print(vfs.mount())
+
+vfs.mount(Filesystem(3), "/bar")
+
+print(vfs.mount())
+
+vfs.umount("/bar/baz")
+
+print(vfs.mount())
+
+vfs.mount(Filesystem(4), "/")
+
+print(vfs.mount())
diff --git a/tests/extmod/vfs_mountinfo.py.exp b/tests/extmod/vfs_mountinfo.py.exp
new file mode 100644
index 0000000000000..4ddf06c8c976f
--- /dev/null
+++ b/tests/extmod/vfs_mountinfo.py.exp
@@ -0,0 +1,11 @@
+[]
+mount Filesystem(1)
+[(Filesystem(1), '/foo')]
+mount Filesystem(2)
+[(Filesystem(1), '/foo'), (Filesystem(2), '/bar/baz')]
+mount Filesystem(3)
+[(Filesystem(1), '/foo'), (Filesystem(2), '/bar/baz'), (Filesystem(3), '/bar')]
+umount Filesystem(2)
+[(Filesystem(1), '/foo'), (Filesystem(3), '/bar')]
+mount Filesystem(4)
+[(Filesystem(1), '/foo'), (Filesystem(3), '/bar'), (Filesystem(4), '/')]

From c68a40ac94ea8a8dd6031dff6f21706977893bef Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 3 Mar 2025 14:25:14 -0500
Subject: [PATCH 2012/3129] docs/library/vfs: Document no-args mount output.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 docs/library/vfs.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/library/vfs.rst b/docs/library/vfs.rst
index fcd06eb4353b1..1fa1e3060cb5b 100644
--- a/docs/library/vfs.rst
+++ b/docs/library/vfs.rst
@@ -34,6 +34,14 @@ represented by VFS classes.
 
     Will raise ``OSError(EPERM)`` if *mount_point* is already mounted.
 
+.. function:: mount()
+    :noindex:
+
+    With no arguments to :func:`mount`, return a list of tuples representing
+    all active mountpoints.
+    
+    The returned list has the form *[(fsobj, mount_point), ...]*.
+
 .. function:: umount(mount_point)
 
     Unmount a filesystem. *mount_point* can be a string naming the mount location,

From e4051a1ca66703090383678a1747c3f99e993309 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Mar 2025 14:39:41 +1100
Subject: [PATCH 2013/3129] extmod/vfs_rom: Implement minimal VfsRom.getcwd()
 method.

This is needed if you chdir to a ROMFS and want to query your current
directory.

Prior to this change, using `os.getcwd()` when in a ROMFS would raise:

    AttributeError: 'VfsRom' object has no attribute 'getcwd'

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_rom.c        | 8 ++++++++
 tests/extmod/vfs_rom.py | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/extmod/vfs_rom.c b/extmod/vfs_rom.c
index ff3652d2ce3a2..7d814cb980524 100644
--- a/extmod/vfs_rom.c
+++ b/extmod/vfs_rom.c
@@ -300,6 +300,13 @@ static mp_obj_t vfs_rom_chdir(mp_obj_t self_in, mp_obj_t path_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(vfs_rom_chdir_obj, vfs_rom_chdir);
 
+static mp_obj_t vfs_rom_getcwd(mp_obj_t self_in) {
+    (void)self_in;
+    // The current directory is always the root of the ROMFS.
+    return MP_OBJ_NEW_QSTR(MP_QSTR_);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(vfs_rom_getcwd_obj, vfs_rom_getcwd);
+
 typedef struct _vfs_rom_ilistdir_it_t {
     mp_obj_base_t base;
     mp_fun_1_t iternext;
@@ -436,6 +443,7 @@ static const mp_rom_map_elem_t vfs_rom_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&vfs_rom_open_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&vfs_rom_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&vfs_rom_getcwd_obj) },
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&vfs_rom_ilistdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&vfs_rom_stat_obj) },
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&vfs_rom_statvfs_obj) },
diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py
index dc88481c028ac..770b6863b9c43 100644
--- a/tests/extmod/vfs_rom.py
+++ b/tests/extmod/vfs_rom.py
@@ -408,9 +408,11 @@ def test_listdir(self):
 
     def test_chdir(self):
         os.chdir("/test_rom")
+        self.assertEqual(os.getcwd(), "/test_rom")
         self.assertEqual(os.listdir(), self.romfs_listdir)
 
         os.chdir("/test_rom/")
+        self.assertEqual(os.getcwd(), "/test_rom")
         self.assertEqual(os.listdir(), self.romfs_listdir)
 
         # chdir within the romfs is not implemented.

From 2db0c0225f41292f85b2cf49257d663856d5c8db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Mar 2025 14:52:15 +1100
Subject: [PATCH 2014/3129] tools/mpremote: Make mip install skip /rom*/lib
 directories.

If a ROMFS is mounted then "/rom/lib" is usually in `sys.path` before the
writable filesystem's "lib" entry.  The ROMFS directory cannot be installed
to, so skip it if found.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/mip.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index 858b7933d11d8..26ae8bec5ec6c 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -175,7 +175,11 @@ def do_mip(state, args):
 
             if args.target is None:
                 state.transport.exec("import sys")
-                lib_paths = [p for p in state.transport.eval("sys.path") if p.endswith("/lib")]
+                lib_paths = [
+                    p
+                    for p in state.transport.eval("sys.path")
+                    if not p.startswith("/rom") and p.endswith("/lib")
+                ]
                 if lib_paths and lib_paths[0]:
                     args.target = lib_paths[0]
                 else:

From cccac2cc0127eb43de4524c74424ecaaa594c80e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 11 Mar 2025 17:17:39 +1100
Subject: [PATCH 2015/3129] rp2,esp32,extmod: Implement UPDATE_SUBMODULES in
 CMake.

Rather than having Make calling CMake to generate a list of submodules and
then run a Make target (which is complex and prone to masking other
errors), implement the submodule update logic in CMake itself.

Internal CMake-side changes are that GIT_SUBMODULES is now a CMake list,
and the trigger variable name is changed from ECHO_SUBMODULES to
UPDATE_SUBMODULES.

The run is otherwise 100% a normal CMake run now, so most of the other
special casing can be removed.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/extmod.cmake            | 89 ++++++++++++++++------------------
 ports/esp32/Makefile           | 14 +++---
 ports/esp32/esp32_common.cmake | 15 +++++-
 ports/rp2/CMakeLists.txt       | 18 +++----
 ports/rp2/Makefile             | 16 +++---
 py/mkrules.cmake               | 42 ++++++++++------
 py/mkrules.mk                  |  9 +---
 7 files changed, 105 insertions(+), 98 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 3643f1aee7bf5..7cacd0a43329e 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -107,62 +107,57 @@ set(MICROPY_SOURCE_LIB_LIBM_SQRT_HW ${MICROPY_DIR}/lib/libm/thumb_vfp_sqrtf.c)
 
 if(MICROPY_PY_BTREE)
     set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx")
-    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/berkeley-db-1.xx)
+    list(APPEND GIT_SUBMODULES lib/berkeley-db-1.xx)
 
-    if(ECHO_SUBMODULES)
-        # No-op, we're just doing submodule/variant discovery.
-        # Cannot run the add_library/target_include_directories rules (even though
-        # the build won't run) because IDF will attempt verify the files exist.
-    elseif(NOT EXISTS ${MICROPY_LIB_BERKELEY_DIR}/README)
+    if(NOT UPDATE_SUBMODULES AND NOT EXISTS ${MICROPY_LIB_BERKELEY_DIR}/README)
         # Regular build, submodule not initialised -- fail with a clear error.
         message(FATAL_ERROR " MICROPY_PY_BTREE is enabled but the berkeley-db submodule is not initialised.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
-    else()
-        # Regular build, we have the submodule.
-        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
-        )
+    endif()
 
-        target_include_directories(micropy_extmod_btree PRIVATE
-            ${MICROPY_LIB_BERKELEY_DIR}/include
-        )
+    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
+    )
 
-        if(NOT BERKELEY_DB_CONFIG_FILE)
-            set(BERKELEY_DB_CONFIG_FILE "${MICROPY_DIR}/extmod/berkeley-db/berkeley_db_config_port.h")
-        endif()
+    target_include_directories(micropy_extmod_btree PRIVATE
+        ${MICROPY_LIB_BERKELEY_DIR}/include
+    )
 
-        target_compile_definitions(micropy_extmod_btree PRIVATE
-            BERKELEY_DB_CONFIG_FILE="${BERKELEY_DB_CONFIG_FILE}"
-        )
+    if(NOT BERKELEY_DB_CONFIG_FILE)
+        set(BERKELEY_DB_CONFIG_FILE "${MICROPY_DIR}/extmod/berkeley-db/berkeley_db_config_port.h")
+    endif()
 
-        # The include directories and compile definitions below are needed to build
-        # modbtree.c and should be added to the main MicroPython target.
+    target_compile_definitions(micropy_extmod_btree PRIVATE
+        BERKELEY_DB_CONFIG_FILE="${BERKELEY_DB_CONFIG_FILE}"
+    )
 
-        list(APPEND MICROPY_INC_CORE
-            "${MICROPY_LIB_BERKELEY_DIR}/include"
-        )
+    # 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_DEF_CORE
-            MICROPY_PY_BTREE=1
-            BERKELEY_DB_CONFIG_FILE="${BERKELEY_DB_CONFIG_FILE}"
-        )
+    list(APPEND MICROPY_INC_CORE
+        "${MICROPY_LIB_BERKELEY_DIR}/include"
+    )
 
-        list(APPEND MICROPY_SOURCE_EXTMOD
-            ${MICROPY_EXTMOD_DIR}/modbtree.c
-        )
-    endif()
+    list(APPEND MICROPY_DEF_CORE
+        MICROPY_PY_BTREE=1
+        BERKELEY_DB_CONFIG_FILE="${BERKELEY_DB_CONFIG_FILE}"
+    )
+
+    list(APPEND MICROPY_SOURCE_EXTMOD
+        ${MICROPY_EXTMOD_DIR}/modbtree.c
+    )
 endif()
 
 # Library for mbedtls
@@ -350,5 +345,5 @@ if(MICROPY_PY_LWIP)
         ${MICROPY_LIB_LWIP_DIR}/include
     )
 
-    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/lwip)
+    list(APPEND GIT_SUBMODULES lib/lwip)
 endif()
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 1ce4d97208da7..a4e5531850c7d 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -106,12 +106,10 @@ size-components:
 size-files:
 	$(call RUN_IDF_PY,size-files)
 
-# Running the build with ECHO_SUBMODULES set will trigger py/mkrules.cmake to
-# print out the value of the GIT_SUBMODULES variable, prefixed with
-# "GIT_SUBMODULES", and then abort. This extracts out that line from the idf.py
-# output and passes the list of submodules to py/mkrules.mk which does the
-# `git submodule init` on each.
+# Run idf.py with the UPDATE_SUBMODULES flag to update
+# necessary submodules for this board.
+#
+# This is done in a dedicated build directory as some CMake cache values are not
+# set correctly if not all submodules are loaded yet.
 submodules:
-	@GIT_SUBMODULES=$$(IDF_COMPONENT_MANAGER=0 idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \
-	                  grep '^GIT_SUBMODULES=' | cut -d= -f2); \
-	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" GIT_SUBMODULES_FAIL_IF_EMPTY=1 submodules
+	IDF_COMPONENT_MANAGER=0 idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D UPDATE_SUBMODULES=1 reconfigure
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 6473f04a53500..f7b00900a0388 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -71,8 +71,8 @@ list(APPEND MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
-string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
-if(MICROPY_PY_TINYUSB AND NOT ECHO_SUBMODULES)
+list(APPEND GIT_SUBMODULES lib/tinyusb)
+if(MICROPY_PY_TINYUSB)
     set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
     string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
 
@@ -195,6 +195,17 @@ if (MICROPY_USER_LDFRAGMENTS)
     set(MICROPY_LDFRAGMENTS ${MICROPY_USER_LDFRAGMENTS})
 endif()
 
+if (UPDATE_SUBMODULES)
+    # ESP-IDF checks if some paths exist before CMake does. Some paths don't
+    # yet exist if this is an UPDATE_SUBMODULES pass on a brand new checkout, so remove
+    # any path which might not exist yet. A "real" build will not set UPDATE_SUBMODULES.
+    unset(MICROPY_SOURCE_TINYUSB)
+    unset(MICROPY_SOURCE_EXTMOD)
+    unset(MICROPY_SOURCE_LIB)
+    unset(MICROPY_INC_TINYUSB)
+    unset(MICROPY_INC_CORE)
+endif()
+
 # Register the main IDF component.
 idf_component_register(
     SRCS
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 7002ad8769ea9..f89e2792c6479 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -76,8 +76,8 @@ if (MICROPY_PY_NETWORK_CYW43)
 endif()
 
 # Necessary submodules for all boards.
-string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/mbedtls)
-string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
+list(APPEND GIT_SUBMODULES lib/mbedtls)
+list(APPEND GIT_SUBMODULES lib/tinyusb)
 
 # Include component cmake fragments
 include(${MICROPY_DIR}/py/py.cmake)
@@ -340,7 +340,7 @@ if (MICROPY_PY_BLUETOOTH_CYW43)
 endif()
 
 if (MICROPY_BLUETOOTH_BTSTACK)
-    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/btstack)
+    list(APPEND GIT_SUBMODULES lib/btstack)
 
     list(APPEND MICROPY_SOURCE_PORT mpbtstackport.c)
 
@@ -358,8 +358,8 @@ if (MICROPY_BLUETOOTH_BTSTACK)
 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)
+    list(APPEND GIT_SUBMODULES lib/mynewt-nimble)
+    if(NOT UPDATE_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()
 
@@ -386,8 +386,8 @@ target_include_directories(${MICROPY_TARGET} PRIVATE
 )
 
 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)
+    list(APPEND GIT_SUBMODULES lib/cyw43-driver)
+    if(NOT UPDATE_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()
 
@@ -433,8 +433,8 @@ 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)
+    list(APPEND GIT_SUBMODULES lib/wiznet5k)
+    if(NOT UPDATE_SUBMODULES AND NOT EXISTS ${MICROPY_DIR}/lib/wiznet5k/README.md)
         message(FATAL_ERROR " wiznet5k not initialized.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
     endif()
 
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 200899d338e6a..bfc85f3715e48 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -65,15 +65,11 @@ all:
 clean:
 	$(RM) -rf $(BUILD)
 
-# First ensure that pico-sdk is initialised, then use cmake to pick everything
-# else (including board-specific dependencies).
-# Running the build with ECHO_SUBMODULES set will trigger py/mkrules.cmake to
-# print out the value of the GIT_SUBMODULES variable, prefixed with
-# "GIT_SUBMODULES", and then abort. This extracts out that line from the cmake
-# output and passes the list of submodules to py/mkrules.mk which does the
-# `git submodule init` on each.
+# First ensure that pico-sdk is initialised, then run CMake with the
+# UPDATE_SUBMODULES flag to update necessary submodules for this board.
+#
+# This is done in a dedicated build directory as some CMake cache values are not
+# set correctly if not all submodules are loaded yet.
 submodules:
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="lib/pico-sdk" 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}" GIT_SUBMODULES_FAIL_IF_EMPTY=1 submodules
+	cmake -S . -B $(BUILD)/submodules -DUPDATE_SUBMODULES=1 ${CMAKE_ARGS}
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index cafcbce5681d8..4374b8b4da3cb 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -209,16 +209,11 @@ if(MICROPY_FROZEN_MANIFEST)
     # Note: target_compile_definitions already added earlier.
 
     if(NOT MICROPY_LIB_DIR)
-        string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/micropython-lib)
+        list(APPEND GIT_SUBMODULES lib/micropython-lib)
         set(MICROPY_LIB_DIR ${MICROPY_DIR}/lib/micropython-lib)
     endif()
 
-    if(ECHO_SUBMODULES)
-        # No-op, we're just doing submodule/variant discovery.
-        # Note: All the following rules are safe to run in discovery mode even
-        # though the submodule might not be available as they do not directly depend
-        # on anything from the submodule.
-    elseif(NOT EXISTS ${MICROPY_LIB_DIR}/README.md)
+    if(NOT UPDATE_SUBMODULES AND NOT EXISTS ${MICROPY_LIB_DIR}/README.md)
         message(FATAL_ERROR " micropython-lib not initialized.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
     endif()
 
@@ -272,12 +267,29 @@ if(MICROPY_FROZEN_MANIFEST)
     )
 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 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")
+# Update submodules, this is invoked on some ports via 'make submodules'.
+#
+# Note: This logic has a Makefile equivalent in py/mkrules.mk
+if(UPDATE_SUBMODULES AND GIT_SUBMODULES)
+    macro(run_git)
+      execute_process(COMMAND git ${ARGV} WORKING_DIRECTORY ${MICROPY_DIR}
+          RESULT_VARIABLE RES)
+    endmacro()
+
+    list(JOIN GIT_SUBMODULES " " GIT_SUBMODULES_MSG)
+    message("Updating submodules: ${GIT_SUBMODULES_MSG}")
+    run_git(submodule sync ${GIT_SUBMODULES})
+    if(RES EQUAL 0)
+        # If available, do blobless partial clones of submodules to save time and space.
+        # A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.).
+        run_git(submodule update --init --filter=blob:none ${GIT_SUBMODULES})
+        # Fallback to standard submodule update if blobless isn't available (earlier than git 2.36.0)
+        if (NOT RES EQUAL 0)
+            run_git(submodule update --init ${GIT_SUBMODULES})
+        endif()
+    endif()
+
+    if (NOT RES EQUAL 0)
+        message(FATAL_ERROR "Submodule update failed")
+    endif()
 endif()
diff --git a/py/mkrules.mk b/py/mkrules.mk
index ad855c0d7fc45..495d8d48bd2fc 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -262,19 +262,14 @@ endif
 # If available, do blobless partial clones of submodules to save time and space.
 # A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.).
 # Fallback to standard submodule update if blobless isn't available (earlier than 2.36.0)
+#
+# Note: This target has a CMake equivalent in py/mkrules.cmake
 submodules:
 	$(ECHO) "Updating submodules: $(GIT_SUBMODULES)"
 ifneq ($(GIT_SUBMODULES),)
 	$(Q)cd $(TOP) && git submodule sync $(GIT_SUBMODULES)
 	$(Q)cd $(TOP) && git submodule update --init --filter=blob:none $(GIT_SUBMODULES) || \
 	  git submodule update --init $(GIT_SUBMODULES)
-else
-ifeq ($(GIT_SUBMODULES_FAIL_IF_EMPTY),1)
-	# If you see this error, it may mean the internal step run by the port's build
-	# system to find git submodules has failed. Double-check dependencies are set correctly.
-	$(ECHO) "Internal build error: The submodule list should not be empty."
-	exit 1
-endif
 endif
 .PHONY: submodules
 

From 50da085d93de55719198fb4fb1272f467e7a16a7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 11 Mar 2025 17:34:24 +1100
Subject: [PATCH 2016/3129] rp2: Print an error message if pico-sdk submodule
 is missing.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index bfc85f3715e48..8cba521b2b201 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -56,9 +56,11 @@ ifdef MICROPY_PREVIEW_VERSION_2
 CMAKE_ARGS += -DMICROPY_PREVIEW_VERSION_2=1
 endif
 
+HELP_PICO_SDK_SUBMODULE ?= "\033[1;31mError: pico-sdk submodule is not initialized.\033[0m Run 'make submodules'"
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 all:
+	[ -f ../../lib/pico-sdk/README.md ] || (echo -e $(HELP_PICO_SDK_SUBMODULE); false)
 	[ -e $(BUILD)/Makefile ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
 	$(MAKE) $(MAKE_ARGS) -C $(BUILD) || (echo -e $(HELP_BUILD_ERROR); false)
 

From a828b99cffa97cc04c393a6fdec96bf9e39c07f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Mar 2025 11:46:39 +1100
Subject: [PATCH 2017/3129] esp32/Makefile: Use $(Q) prefix on all commands.

This prevents printing the lengthy command and makes the build output a
little cleaner.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index a4e5531850c7d..7f31ea69192ab 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -70,12 +70,12 @@ endif
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 define RUN_IDF_PY
-	idf.py $(IDFPY_FLAGS) -B $(BUILD) $(1)
+	$(Q)idf.py $(IDFPY_FLAGS) -B $(BUILD) $(1)
 endef
 
 all:
-	idf.py $(IDFPY_FLAGS) -B $(BUILD) build || (echo -e $(HELP_BUILD_ERROR); false)
-	@$(PYTHON) makeimg.py \
+	$(Q)idf.py $(IDFPY_FLAGS) -B $(BUILD) build || (echo -e $(HELP_BUILD_ERROR); false)
+	$(Q)$(PYTHON) makeimg.py \
 		$(BUILD)/sdkconfig \
 		$(BUILD)/bootloader/bootloader.bin \
 		$(BUILD)/partition_table/partition-table.bin \
@@ -112,4 +112,4 @@ size-files:
 # This is done in a dedicated build directory as some CMake cache values are not
 # set correctly if not all submodules are loaded yet.
 submodules:
-	IDF_COMPONENT_MANAGER=0 idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D UPDATE_SUBMODULES=1 reconfigure
+	$(Q)IDF_COMPONENT_MANAGER=0 idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D UPDATE_SUBMODULES=1 reconfigure

From 5eee5a67dc69f6b701e9a79b6fd1e047dfbd55a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Mar 2025 11:47:55 +1100
Subject: [PATCH 2018/3129] rp2/Makefile: Use $(Q) prefix on all commands.

This prevents printing the lengthy command and makes the build output a
little cleaner.

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

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 8cba521b2b201..76b5698d2c8ec 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -60,9 +60,9 @@ HELP_PICO_SDK_SUBMODULE ?= "\033[1;31mError: pico-sdk submodule is not initializ
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 all:
-	[ -f ../../lib/pico-sdk/README.md ] || (echo -e $(HELP_PICO_SDK_SUBMODULE); false)
-	[ -e $(BUILD)/Makefile ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
-	$(MAKE) $(MAKE_ARGS) -C $(BUILD) || (echo -e $(HELP_BUILD_ERROR); false)
+	$(Q)[ -f ../../lib/pico-sdk/README.md ] || (echo -e $(HELP_PICO_SDK_SUBMODULE); false)
+	$(Q)[ -e $(BUILD)/Makefile ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
+	$(Q)$(MAKE) $(MAKE_ARGS) -C $(BUILD) || (echo -e $(HELP_BUILD_ERROR); false)
 
 clean:
 	$(RM) -rf $(BUILD)
@@ -73,5 +73,5 @@ clean:
 # This is done in a dedicated build directory as some CMake cache values are not
 # set correctly if not all submodules are loaded yet.
 submodules:
-	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="lib/pico-sdk" submodules
-	cmake -S . -B $(BUILD)/submodules -DUPDATE_SUBMODULES=1 ${CMAKE_ARGS}
+	$(Q)$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="lib/pico-sdk" submodules
+	$(Q)cmake -S . -B $(BUILD)/submodules -DUPDATE_SUBMODULES=1 ${CMAKE_ARGS}

From f96417dbf28617c533e4f2e65c65d1ed11f089fa Mon Sep 17 00:00:00 2001
From: Mark Seminatore <nebula_peeps4t@icloud.com>
Date: Mon, 31 Mar 2025 11:38:36 -0700
Subject: [PATCH 2019/3129] rp2/cyw43_configport: Fix cyw43 mDNS by properly
 starting mDNS on netif.

The rp2 port has an incomplete mDNS implementation.  The code in `main.c`
calls `mdns_resp_init()` which opens the UDP socket for mDNS.  However, no
code in the cyw43 driver makes the proper calls to `mdns_resp_add_netif()`
and `mdns_resp_remove_netif()` to send the announce packets.  The wiznet5k
driver does make these calls and was used as a model for these changes.

This commit attempts to address this by very small changes to the
`ports/rp2/cyw43_configport.h` file.  The change uses new cyw43 driver
hooks to map the driver macros `CYW43_CB_TCPIP_INIT_EXTRA` and
`CYW43_CB_TCPIP_DEINIT_EXTRA` to the appropriate lwIP mDNS calls.

Fixes issue #15297.

Signed-off-by: Mark Seminatore <nebula_peeps4t@icloud.com>
---
 ports/rp2/cyw43_configport.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index ead1a3953d97e..5523305742325 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -33,6 +33,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "extmod/modnetwork.h"
+#include "lwip/apps/mdns.h"
 #include "pendsv.h"
 
 #define CYW43_INCLUDE_LEGACY_F1_OVERFLOW_WORKAROUND_VARIABLES (1)
@@ -167,4 +168,19 @@ static inline void cyw43_delay_ms(uint32_t ms) {
 
 #define CYW43_EVENT_POLL_HOOK mp_event_handle_nowait()
 
+#if LWIP_MDNS_RESPONDER == 1
+
+// Hook for any additional TCP/IP initialization than needs to be done.
+// Called after the netif specified by `itf` has been set up.
+#ifndef CYW43_CB_TCPIP_INIT_EXTRA
+#define CYW43_CB_TCPIP_INIT_EXTRA(self, itf) mdns_resp_add_netif(&self->netif[itf], mod_network_hostname_data)
+#endif
+
+// Hook for any additional TCP/IP deinitialization than needs to be done.
+// Called before the netif specified by `itf` is removed.
+#ifndef CYW43_CB_TCPIP_DEINIT_EXTRA
+#define CYW43_CB_TCPIP_DEINIT_EXTRA(self, itf) mdns_resp_remove_netif(&self->netif[itf])
+#endif
+
+#endif
 #endif // MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H

From b33b9f81217bb1521138a8064d1d1bee3eb49e0f Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 24 Jan 2024 09:08:29 +1100
Subject: [PATCH 2020/3129] stm32/main: Catch and report corrupted lfs
 filesystem at startup.

On stm32, the startup code attempts to mount the configured filesystem.  If
there is an existing littlefs filesystem that's suitable corrupted it's
possible for the reported blocksize to be incorrect here:

     uint32_t block_size = lfs2_fromle32(superblock->block_size);

This `block_size` (which is read from the filesystem iteself) is used to
create the len argument passed to `pyb_flash_make_new()`.  In that function
the len arg is validated to be a mutliple of the underlying hardware block
size, as well as not bigger than the physical flash.  Any failure is raised
as a ValueError.  This exception is not caught currently in main, it flows
up to the high level assert / startup failure.

As this occurs before `boot.py` is run, the users (potentially frozen)
application code doesn't have any opportunity to detect and handle the
issue.

This commit adds a helper function which attempts to create a block device,
and on error returns `None` instead of raising an exception.  Using this in
main means that a potentially corrupt filesystem will simply remain
unmounted, and the application can handle the issue safely.

The fix here also handles the case where the littlefs filesystem is valid
but the autodetection code (which detects the filesystem size) does not
work correctly.  In that case it will retry mounting the filesystem using
the whole size of the block device.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/main.c    | 11 ++++++++--
 ports/stm32/storage.c | 48 +++++++++++++++++++++++++------------------
 ports/stm32/storage.h |  4 ++++
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 55dbeed98246f..0f904a8ba958f 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -185,8 +185,15 @@ 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 = MP_OBJ_TYPE_GET_SLOT(&pyb_flash_type, make_new)(&pyb_flash_type, 0, 1, args);
+        mp_obj_t lfs_bdev = pyb_flash_new_obj(0, len);
+        if (lfs_bdev == mp_const_none) {
+            // Invalid len detected, filesystem header block likely corrupted.
+            // Create bdev with default size to attempt to mount the whole flash or
+            // let user attempt recovery if desired.
+            bdev = pyb_flash_new_obj(0, -1);
+        } else {
+            bdev = lfs_bdev;
+        }
     }
 
     #endif
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index a6594fd4d98c9..d810261fbcedf 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -273,6 +273,29 @@ const pyb_flash_obj_t pyb_flash_obj = {
     0, // actual size handled in ioctl, MP_BLOCKDEV_IOCTL_BLOCK_COUNT case
 };
 
+mp_obj_t pyb_flash_new_obj(mp_int_t start, mp_int_t len) {
+    uint32_t bl_len = (storage_get_block_count() - FLASH_PART1_START_BLOCK) * FLASH_BLOCK_SIZE;
+
+    if (start == -1) {
+        start = 0;
+    } else if (!(0 <= start && start < bl_len && start % MICROPY_HW_BDEV_BLOCKSIZE_EXT == 0)) {
+        return mp_const_none;
+    }
+
+    if (len == -1) {
+        len = bl_len - start;
+    } else if (!(0 < len && start + len <= bl_len && len % MICROPY_HW_BDEV_BLOCKSIZE_EXT == 0)) {
+        return mp_const_none;
+    }
+
+    pyb_flash_obj_t *self = mp_obj_malloc(pyb_flash_obj_t, &pyb_flash_type);
+    self->use_native_block_size = false;
+    self->start = start;
+    self->len = len;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
 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) {
@@ -296,30 +319,15 @@ static mp_obj_t pyb_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
         // Default singleton object that accesses entire flash, including virtual partition table
         return MP_OBJ_FROM_PTR(&pyb_flash_obj);
     }
-
-    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;
-
     mp_int_t start = args[ARG_start].u_int;
-    if (start == -1) {
-        start = 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 % MICROPY_HW_BDEV_BLOCKSIZE_EXT == 0)) {
+
+    mp_obj_t self = pyb_flash_new_obj(start, len);
+    if (self == mp_const_none) {
+        // Invalid start or end arg
         mp_raise_ValueError(NULL);
     }
-
-    self->start = start;
-    self->len = len;
-
-    return MP_OBJ_FROM_PTR(self);
+    return self;
 }
 
 static mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/stm32/storage.h b/ports/stm32/storage.h
index 05654855aa0e7..accf6c3904383 100644
--- a/ports/stm32/storage.h
+++ b/ports/stm32/storage.h
@@ -77,4 +77,8 @@ 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);
 
+#if !BUILDING_MBOOT
+mp_obj_t pyb_flash_new_obj(mp_int_t start, mp_int_t len);
+#endif
+
 #endif // MICROPY_INCLUDED_STM32_STORAGE_H

From 1a47379dd64ab0dab557092293cc9a9e27b5a418 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 15 Jan 2025 08:39:16 +0100
Subject: [PATCH 2021/3129] stm32/boards: Add F427 AF CSV file.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/stm32f427_af.csv | 170 ++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 ports/stm32/boards/stm32f427_af.csv

diff --git a/ports/stm32/boards/stm32f427_af.csv b/ports/stm32/boards/stm32f427_af.csv
new file mode 100644
index 0000000000000..34d5a94cb8fd3
--- /dev/null
+++ b/ports/stm32/boards/stm32f427_af.csv
@@ -0,0 +1,170 @@
+Port ,Pin ,AF0          ,AF1              ,AF2     ,AF3         ,AF4      ,AF5              ,AF6              ,AF7            ,AF8               ,AF9                   ,AF10           ,AF11                           ,AF12              ,AF13       ,AF14,AF15    ,ADC
+     ,    ,SYS          ,TIM1/2           ,TIM3/4/5,TIM8/9/10/11,I2C1/2/3 ,SPI1/2/3/4/5/6   ,SPI2/3/SAI1      ,SPI3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/LCD,OTG2_HS/OTG1_FS,ETH                            ,FMC/SDIO/OTG2_FS  ,DCMI       ,LCD ,SYS     ,
+PortA,PA0 ,             ,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR    ,         ,                 ,                 ,USART2_CTS     ,UART4_TX          ,                      ,               ,ETH_MII_CRS                    ,                  ,           ,    ,EVENTOUT,
+PortA,PA1 ,             ,TIM2_CH2         ,TIM5_CH2,            ,         ,                 ,                 ,USART2_RTS     ,UART4_RX          ,                      ,               ,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,                  ,           ,    ,EVENTOUT,ADC123_IN1
+PortA,PA2 ,             ,TIM2_CH3         ,TIM5_CH3,TIM9_CH1    ,         ,                 ,                 ,USART2_TX      ,                  ,                      ,               ,ETH_MDIO                       ,                  ,           ,    ,EVENTOUT,ADC123_IN2
+PortA,PA3 ,             ,TIM2_CH4         ,TIM5_CH4,TIM9_CH2    ,         ,                 ,                 ,USART2_RX      ,                  ,                      ,OTG_HS_ULPI_D0 ,ETH_MII_COL                    ,                  ,           ,    ,EVENTOUT,ADC123_IN3
+PortA,PA4 ,             ,                 ,        ,            ,         ,SPI1_NSS         ,SPI3_NSS/I2S3_WS ,USART2_CK      ,                  ,                      ,               ,                               ,OTG_HS_SOF        ,DCMI_HSYNC ,    ,EVENTOUT,ADC12_IN4
+PortA,PA5 ,             ,TIM2_CH1/TIM2_ETR,        ,TIM8_CH1N   ,         ,SPI1_SCK         ,                 ,               ,                  ,                      ,OTG_HS_ULPI_CK ,                               ,                  ,           ,    ,EVENTOUT,ADC12_IN5
+PortA,PA6 ,             ,TIM1_BKIN        ,TIM3_CH1,TIM8_BKIN   ,         ,SPI1_MISO        ,                 ,               ,                  ,TIM13_CH1             ,               ,                               ,                  ,DCMI_PIXCLK,    ,EVENTOUT,ADC12_IN6
+PortA,PA7 ,             ,TIM1_CH1N        ,TIM3_CH2,TIM8_CH1N   ,         ,SPI1_MOSI        ,                 ,               ,                  ,TIM14_CH1             ,               ,ETH_MII_RX_DV/ETH_RMII_CRS_DV  ,                  ,           ,    ,EVENTOUT,ADC12_IN7
+PortA,PA8 ,MCO1         ,TIM1_CH1         ,        ,            ,I2C3_SCL ,                 ,                 ,USART1_CK      ,                  ,                      ,OTG_FS_SOF     ,                               ,                  ,           ,    ,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2         ,        ,            ,I2C3_SMBA,                 ,                 ,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     ,                  ,CAN1_TX               ,OTG_FS_DP      ,                               ,                  ,           ,    ,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   ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_D1 ,ETH_MII_RXD2                   ,                  ,           ,    ,EVENTOUT,ADC12_IN8
+PortB,PB1 ,             ,TIM1_CH3N        ,TIM3_CH4,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_D2 ,ETH_MII_RXD3                   ,                  ,           ,    ,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        ,I2S3ext_SD     ,                  ,                      ,               ,                               ,                  ,           ,    ,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   ,    ,EVENTOUT,
+PortB,PB6 ,             ,                 ,TIM4_CH1,            ,I2C1_SCL ,                 ,                 ,USART1_TX      ,                  ,CAN2_TX               ,               ,                               ,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    ,    ,EVENTOUT,
+PortB,PB9 ,             ,                 ,TIM4_CH4,TIM11_CH1   ,I2C1_SDA ,SPI2_NSS/I2S2_WS ,                 ,               ,                  ,CAN1_TX               ,               ,                               ,SDIO_D5           ,DCMI_D7    ,    ,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3         ,        ,            ,I2C2_SCL ,SPI2_SCK/I2S2_CK ,                 ,USART3_TX      ,                  ,                      ,OTG_HS_ULPI_D3 ,ETH_MII_RX_ER                  ,                  ,           ,    ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4         ,        ,            ,I2C2_SDA ,                 ,                 ,USART3_RX      ,                  ,                      ,OTG_HS_ULPI_D4 ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,                  ,           ,    ,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        ,I2S2ext_SD       ,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         ,           ,    ,EVENTOUT,ADC123_IN10
+PortC,PC1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MDC                        ,                  ,           ,    ,EVENTOUT,ADC123_IN11
+PortC,PC2 ,             ,                 ,        ,            ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,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     ,                  ,           ,    ,EVENTOUT,ADC12_IN14
+PortC,PC5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD1/ETH_RMII_RXD1     ,                  ,           ,    ,EVENTOUT,ADC12_IN15
+PortC,PC6 ,             ,                 ,TIM3_CH1,TIM8_CH1    ,         ,I2S2_MCK         ,                 ,               ,USART6_TX         ,                      ,               ,                               ,SDIO_D6           ,DCMI_D0    ,    ,EVENTOUT,
+PortC,PC7 ,             ,                 ,TIM3_CH2,TIM8_CH2    ,         ,                 ,I2S3_MCK         ,               ,USART6_RX         ,                      ,               ,                               ,SDIO_D7           ,DCMI_D1    ,    ,EVENTOUT,
+PortC,PC8 ,             ,                 ,TIM3_CH3,TIM8_CH3    ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,SDIO_D0           ,DCMI_D2    ,    ,EVENTOUT,
+PortC,PC9 ,MCO2         ,                 ,TIM3_CH4,TIM8_CH4    ,I2C3_SDA ,I2S_CKIN         ,                 ,               ,                  ,                      ,               ,                               ,SDIO_D1           ,DCMI_D3    ,    ,EVENTOUT,
+PortC,PC10,             ,                 ,        ,            ,         ,                 ,SPI3_SCK/I2S3_CK ,USART3_TX      ,UART4_TX          ,                      ,               ,                               ,SDIO_D2           ,DCMI_D8    ,    ,EVENTOUT,
+PortC,PC11,             ,                 ,        ,            ,         ,I2S3ext_SD       ,SPI3_MISO        ,USART3_RX      ,UART4_RX          ,                      ,               ,                               ,SDIO_D3           ,DCMI_D4    ,    ,EVENTOUT,
+PortC,PC12,             ,                 ,        ,            ,         ,                 ,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 ,             ,                 ,TIM3_ETR,            ,         ,                 ,                 ,               ,UART5_RX          ,                      ,               ,                               ,SDIO_CMD          ,DCMI_D11   ,    ,EVENTOUT,
+PortD,PD3 ,             ,                 ,        ,            ,         ,SPI2_SCK/I2S2_CK ,                 ,USART2_CTS     ,                  ,                      ,               ,                               ,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      ,                  ,                      ,               ,                               ,FMC_NE1/FMC_NCE2  ,           ,    ,EVENTOUT,
+PortD,PD8 ,             ,                 ,        ,            ,         ,                 ,                 ,USART3_TX      ,                  ,                      ,               ,                               ,FMC_D13           ,           ,    ,EVENTOUT,
+PortD,PD9 ,             ,                 ,        ,            ,         ,                 ,                 ,USART3_RX      ,                  ,                      ,               ,                               ,FMC_D14           ,           ,    ,EVENTOUT,
+PortD,PD10,             ,                 ,        ,            ,         ,                 ,                 ,USART3_CK      ,                  ,                      ,               ,                               ,FMC_D15           ,           ,    ,EVENTOUT,
+PortD,PD11,             ,                 ,        ,            ,         ,                 ,                 ,USART3_CTS     ,                  ,                      ,               ,                               ,FMC_A16           ,           ,    ,EVENTOUT,
+PortD,PD12,             ,                 ,TIM4_CH1,            ,         ,                 ,                 ,USART3_RTS     ,                  ,                      ,               ,                               ,FMC_A17           ,           ,    ,EVENTOUT,
+PortD,PD13,             ,                 ,TIM4_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,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      ,               ,                  ,                      ,               ,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    ,    ,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         ,        ,            ,         ,                 ,                 ,               ,UART7_RX          ,                      ,               ,                               ,FMC_D4            ,           ,    ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N        ,        ,            ,         ,                 ,                 ,               ,UART7_TX          ,                      ,               ,                               ,FMC_D5            ,           ,    ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1         ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D6            ,           ,    ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N        ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D7            ,           ,    ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2         ,        ,            ,         ,SPI4_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_D8            ,           ,    ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N        ,        ,            ,         ,SPI4_SCK         ,                 ,               ,                  ,                      ,               ,                               ,FMC_D9            ,           ,    ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3         ,        ,            ,         ,SPI4_MISO        ,                 ,               ,                  ,                      ,               ,                               ,FMC_D10           ,           ,    ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4         ,        ,            ,         ,SPI4_MOSI        ,                 ,               ,                  ,                      ,               ,                               ,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   ,         ,SPI5_NSS         ,SAI1_SD_B        ,               ,UART7_RX          ,                      ,               ,                               ,FMC_NIORD         ,           ,    ,EVENTOUT,ADC3_IN4
+PortF,PF7 ,             ,                 ,        ,TIM11_CH1   ,         ,SPI5_SCK         ,SAI1_MCLK_B      ,               ,UART7_TX          ,                      ,               ,                               ,FMC_NREG          ,           ,    ,EVENTOUT,ADC3_IN5
+PortF,PF8 ,             ,                 ,        ,            ,         ,SPI5_MISO        ,SAI1_SCK_B       ,               ,                  ,TIM13_CH1             ,               ,                               ,FMC_NIOWR         ,           ,    ,EVENTOUT,ADC3_IN6
+PortF,PF9 ,             ,                 ,        ,            ,         ,SPI5_MOSI        ,SAI1_FS_B        ,               ,                  ,TIM14_CH1             ,               ,                               ,FMC_CD            ,           ,    ,EVENTOUT,ADC3_IN7
+PortF,PF10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INTR          ,DCMI_D11   ,    ,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 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_INT2          ,DCMI_D12   ,    ,EVENTOUT,
+PortG,PG7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CK         ,                      ,               ,                               ,FMC_INT3          ,DCMI_D13   ,    ,EVENTOUT,
+PortG,PG8 ,             ,                 ,        ,            ,         ,SPI6_NSS         ,                 ,               ,USART6_RTS        ,                      ,               ,ETH_PPS_OUT                    ,FMC_SDCLK         ,           ,    ,EVENTOUT,
+PortG,PG9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_RX         ,                      ,               ,                               ,FMC_NE2/FMC_NCE3  ,DCMI_VSYNC ,    ,EVENTOUT,
+PortG,PG10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_NCE4_1/FMC_NE3,DCMI_D2    ,    ,EVENTOUT,
+PortG,PG11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_TX_EN/ETH_RMII_TX_EN   ,FMC_NCE4_2        ,DCMI_D3    ,    ,EVENTOUT,
+PortG,PG12,             ,                 ,        ,            ,         ,SPI6_MISO        ,                 ,               ,USART6_RTS        ,                      ,               ,                               ,FMC_NE4           ,           ,    ,EVENTOUT,
+PortG,PG13,             ,                 ,        ,            ,         ,SPI6_SCK         ,                 ,               ,USART6_CTS        ,                      ,               ,ETH_MII_TXD0/ETH_RMII_TXD0     ,FMC_A24           ,           ,    ,EVENTOUT,
+PortG,PG14,             ,                 ,        ,            ,         ,SPI6_MOSI        ,                 ,               ,USART6_TX         ,                      ,               ,ETH_MII_TXD1/ETH_RMII_TXD1     ,FMC_A25           ,           ,    ,EVENTOUT,
+PortG,PG15,             ,                 ,        ,            ,         ,                 ,                 ,               ,USART6_CTS        ,                      ,               ,                               ,FMC_SDNCAS        ,DCMI_D13   ,    ,EVENTOUT,
+PortH,PH0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortH,PH1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortH,PH2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_CRS                    ,FMC_SDCKE0        ,           ,    ,EVENTOUT,
+PortH,PH3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_COL                    ,FMC_SDNE0         ,           ,    ,EVENTOUT,
+PortH,PH4 ,             ,                 ,        ,            ,I2C2_SCL ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_NXT,                               ,                  ,           ,    ,EVENTOUT,
+PortH,PH5 ,             ,                 ,        ,            ,I2C2_SDA ,SPI5_NSS         ,                 ,               ,                  ,                      ,               ,                               ,FMC_SDNWE         ,           ,    ,EVENTOUT,
+PortH,PH6 ,             ,                 ,        ,            ,I2C2_SMBA,SPI5_SCK         ,                 ,               ,                  ,TIM12_CH1             ,               ,                               ,FMC_SDNE1         ,DCMI_D8    ,    ,        ,
+PortH,PH7 ,             ,                 ,        ,            ,I2C3_SCL ,SPI5_MISO        ,                 ,               ,                  ,                      ,               ,ETH_MII_RXD3                   ,FMC_SDCKE1        ,DCMI_D9    ,    ,        ,
+PortH,PH8 ,             ,                 ,        ,            ,I2C3_SDA ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D16           ,DCMI_HSYNC ,    ,EVENTOUT,
+PortH,PH9 ,             ,                 ,        ,            ,I2C3_SMBA,                 ,                 ,               ,                  ,TIM12_CH2             ,               ,                               ,FMC_D17           ,DCMI_D0    ,    ,EVENTOUT,
+PortH,PH10,             ,                 ,TIM5_CH1,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D18           ,DCMI_D1    ,    ,EVENTOUT,
+PortH,PH11,             ,                 ,TIM5_CH2,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D19           ,DCMI_D2    ,    ,EVENTOUT,
+PortH,PH12,             ,                 ,TIM5_CH3,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D20           ,DCMI_D3    ,    ,EVENTOUT,
+PortH,PH13,             ,                 ,        ,TIM8_CH1N   ,         ,                 ,                 ,               ,                  ,CAN1_TX               ,               ,                               ,FMC_D21           ,           ,    ,EVENTOUT,
+PortH,PH14,             ,                 ,        ,TIM8_CH2N   ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D22           ,DCMI_D4    ,    ,EVENTOUT,
+PortH,PH15,             ,                 ,        ,TIM8_CH3N   ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D23           ,DCMI_D11   ,    ,EVENTOUT,
+PortI,PI0 ,             ,                 ,TIM5_CH4,            ,         ,SPI2_NSS/I2S2_WS ,                 ,               ,                  ,                      ,               ,                               ,FMC_D24           ,DCMI_D13   ,    ,EVENTOUT,
+PortI,PI1 ,             ,                 ,        ,            ,         ,SPI2_SCK/I2S2_CK ,                 ,               ,                  ,                      ,               ,                               ,FMC_D25           ,DCMI_D8    ,    ,EVENTOUT,
+PortI,PI2 ,             ,                 ,        ,TIM8_CH4    ,         ,SPI2_MISO        ,I2S2ext_SD       ,               ,                  ,                      ,               ,                               ,FMC_D26           ,DCMI_D9    ,    ,EVENTOUT,
+PortI,PI3 ,             ,                 ,        ,TIM8_ETR    ,         ,SPI2_MOSI/I2S2_SD,                 ,               ,                  ,                      ,               ,                               ,FMC_D27           ,DCMI_D10   ,    ,EVENTOUT,
+PortI,PI4 ,             ,                 ,        ,TIM8_BKIN   ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_NBL2          ,DCMI_D5    ,    ,EVENTOUT,
+PortI,PI5 ,             ,                 ,        ,TIM8_CH1    ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_NBL3          ,DCMI_VSYNC ,    ,EVENTOUT,
+PortI,PI6 ,             ,                 ,        ,TIM8_CH2    ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D28           ,DCMI_D6    ,    ,EVENTOUT,
+PortI,PI7 ,             ,                 ,        ,TIM8_CH3    ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,FMC_D29           ,DCMI_D7    ,    ,EVENTOUT,
+PortI,PI8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortI,PI9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,CAN1_RX               ,               ,                               ,FMC_D30           ,           ,    ,EVENTOUT,
+PortI,PI10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,ETH_MII_RX_ER                  ,FMC_D31           ,           ,    ,EVENTOUT,
+PortI,PI11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,OTG_HS_ULPI_DIR,                               ,                  ,           ,    ,EVENTOUT,
+PortI,PI12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortI,PI13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortI,PI14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortI,PI15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ8 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ9 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ10,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ11,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ12,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ13,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ14,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortJ,PJ15,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK0 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK1 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK2 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK3 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK4 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK5 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK6 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,
+PortK,PK7 ,             ,                 ,        ,            ,         ,                 ,                 ,               ,                  ,                      ,               ,                               ,                  ,           ,    ,EVENTOUT,

From 3b948893d827c39c967b0ca17da3e8159eaef176 Mon Sep 17 00:00:00 2001
From: Herwin Grobben <h.grobben@aemics.nl>
Date: Wed, 5 Feb 2025 11:08:09 +0100
Subject: [PATCH 2022/3129] stm32/stm32_it: Add handler for timer 20 interrupt.

Signed-off-by: Herwin Grobben <h.grobben@aemics.nl>
---
 ports/stm32/stm32_it.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 2e625a5894dd9..4bf509bb9462e 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -775,6 +775,14 @@ void TIM17_FDCAN_IT1_IRQHandler(void) {
 }
 #endif
 
+#if defined(STM32G4)
+void TIM20_UP_IRQHandler(void) {
+    IRQ_ENTER(TIM20_UP_IRQn);
+    timer_irq_handler(20);
+    IRQ_EXIT(TIM20_UP_IRQn);
+}
+#endif
+
 #if defined(STM32H7)
 void TIM15_IRQHandler(void) {
     IRQ_ENTER(TIM15_IRQn);

From 91386b3d56b4ef3bb27af89846c1cc2712f6065f Mon Sep 17 00:00:00 2001
From: Herwin Grobben <h.grobben@aemics.nl>
Date: Wed, 5 Feb 2025 13:58:57 +0100
Subject: [PATCH 2023/3129] stm32/timer: Use APB2 to calculate timer 20 source
 frequency.

Signed-off-by: Herwin Grobben <h.grobben@aemics.nl>
---
 ports/stm32/timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index acfdbd84eb2b6..5c333eb942a08 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -264,8 +264,8 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
     #else
 
     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 (tim_id == 1 || (8 <= tim_id && tim_id <= 11) || tim_id == 20) {
+        // TIM{1,8,9,10,11,20} are on APB2
         #if defined(STM32F0) || defined(STM32G0)
         source = HAL_RCC_GetPCLK1Freq();
         clk_div = RCC->CFGR & RCC_CFGR_PPRE;

From c18e925431c57384a8f28c8699fe46c8b22aaa3a Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Mon, 24 Mar 2025 00:28:43 +1100
Subject: [PATCH 2024/3129] stm32/timer: Add support for STM32H5 Timer 1.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/stm32/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 5c333eb942a08..9d65b484cd196 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -840,7 +840,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(1, TIM1_BRK_UP_TRG_COM_IRQn),
     #elif defined(STM32F4) || defined(STM32F7)
     TIM_ENTRY(1, TIM1_UP_TIM10_IRQn),
-    #elif defined(STM32H7)
+    #elif defined(STM32H7) || defined(STM32H5)
     TIM_ENTRY(1, TIM1_UP_IRQn),
     #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     TIM_ENTRY(1, TIM1_UP_TIM16_IRQn),

From ac1cbef36661625dabc47bc4aa0aa7a0d076dec1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Mar 2025 14:18:04 +1100
Subject: [PATCH 2025/3129] stm32/qspi: Add qspi_memory_map_exit and restart.

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

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 1311c27d1d46e..7334ece4f2181 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -170,6 +170,25 @@ void qspi_memory_map(void) {
     qspi_mpu_enable_mapped();
 }
 
+void qspi_memory_map_exit(void) {
+    // Prevent access to QSPI memory-mapped region.
+    qspi_mpu_disable_all();
+
+    // Abort any ongoing transfer if peripheral is busy
+    if (QUADSPI->SR & QUADSPI_SR_BUSY) {
+        QUADSPI->CR |= QUADSPI_CR_ABORT;
+        while (QUADSPI->CR & QUADSPI_CR_ABORT) {
+        }
+    }
+}
+
+// Needed on F7 due to errata 2.4.3: "Memory-mapped read operations may fail when timeout counter is enabled".
+// Call this function to disable then re-enable memory-mapped mode, which resets the CS pin to inactive.
+void qspi_memory_map_restart(void) {
+    qspi_memory_map_exit();
+    qspi_memory_map();
+}
+
 static int qspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
     (void)self_in;
     switch (cmd) {
@@ -178,13 +197,7 @@ static int qspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
             break;
         case MP_QSPI_IOCTL_BUS_ACQUIRE:
             // Disable memory-mapped region during bus access
-            qspi_mpu_disable_all();
-            // Abort any ongoing transfer if peripheral is busy
-            if (QUADSPI->SR & QUADSPI_SR_BUSY) {
-                QUADSPI->CR |= QUADSPI_CR_ABORT;
-                while (QUADSPI->CR & QUADSPI_CR_ABORT) {
-                }
-            }
+            qspi_memory_map_exit();
             break;
         case MP_QSPI_IOCTL_BUS_RELEASE:
             // Switch to memory-map mode when bus is idle
diff --git a/ports/stm32/qspi.h b/ports/stm32/qspi.h
index 6fe91168cfdba..a2d6b9f328db2 100644
--- a/ports/stm32/qspi.h
+++ b/ports/stm32/qspi.h
@@ -35,6 +35,8 @@ extern const mp_qspi_proto_t qspi_proto;
 
 void qspi_init(void);
 void qspi_memory_map(void);
+void qspi_memory_map_exit(void);
+void qspi_memory_map_restart(void);
 
 static inline bool qspi_is_valid_addr(uint32_t addr) {
     return QSPI_MAP_ADDR <= addr && addr < QSPI_MAP_ADDR_MAX;

From 1660faacf6c8a5837a76dfa2b12f90e87347863c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Mar 2025 22:01:56 +1100
Subject: [PATCH 2026/3129] stm32/boards/PYBD_SF2: Restart qspi memory-mapped
 mode during startup.

The PYBD boards use an F7xx which has an errata 2.4.3:

    Memory-mapped read operations may fail when timeout counter is enabled

This is unfortunate because it means that once QSPI memory-mapped flash is
accessed the QSPI peripheral will leave the CS pin active (low) forever,
which increases power consumption of the SPI flash chip (because it's
active and waiting for commands).  The exact amount of power increase
depends on the flash, but the PYBD_SFx increase by about 2.5mA.

Previously this increase in power only happened when QSPI flash was needed,
eg on PYBD_SF2 when mbedtls or nimble libraries were used.  On PYBD_SF6
it's actually never used.

But with the introduction of ROMFS which lives in the QSPI flash, the
memory is always access on start up to see if the ROMFS contains a valid
image (it must read the memory to find out).  That means these boards
always consume about 2.5mA more after starting up (compared to when ROMFS
is disabled).

The fix in this commit is to explicitly restart the QSPI memory mapped mode
during the start up process.  More precisely, the restart is done after
querying the ROMFS and just before trying to execute `boot.py`.  That's the
right location to keep power consumption permanently down if the QSPI is
never used (eg ROMFS image doesn't exist).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/board_init.c    | 10 ++++++++++
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/ports/stm32/boards/PYBD_SF2/board_init.c b/ports/stm32/boards/PYBD_SF2/board_init.c
index b39da97c4584e..2f277d1cce737 100644
--- a/ports/stm32/boards/PYBD_SF2/board_init.c
+++ b/ports/stm32/boards/PYBD_SF2/board_init.c
@@ -61,6 +61,16 @@ void board_early_init(void) {
 
 #if !BUILDING_MBOOT
 
+#include "boardctrl.h"
+#include "qspi.h"
+
+int board_run_boot_py(boardctrl_state_t *state) {
+    // Due to errata 2.4.3, restart memory-mapped mode to deactivate the CS line and save power.
+    qspi_memory_map_restart();
+
+    return boardctrl_run_boot_py(state);
+}
+
 void board_sleep(int value) {
     mp_spiflash_deepsleep(&spi_bdev.spiflash, value);
     mp_spiflash_deepsleep(&spi_bdev2.spiflash, value);
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 3ae11125d8b1b..da5ab9e7fa1eb 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -43,11 +43,14 @@
 #define MICROPY_HW_ENABLE_RF_SWITCH (1)
 
 #define MICROPY_BOARD_EARLY_INIT    board_early_init
+#define MICROPY_BOARD_RUN_BOOT_PY   board_run_boot_py
 #define MICROPY_BOARD_ENTER_STOP    board_sleep(1);
 #define MICROPY_BOARD_LEAVE_STOP    board_sleep(0);
 #define MICROPY_BOARD_ENTER_STANDBY board_sleep(1);
 #define MICROPY_BOARD_SDCARD_POWER  mp_hal_pin_high(pyb_pin_EN_3V3);
+struct _boardctrl_state_t;
 void board_early_init(void);
+int board_run_boot_py(struct _boardctrl_state_t *state);
 void board_sleep(int value);
 
 // HSE is 25MHz, run SYS at 120MHz

From 9ab6906f50fe41b6168ce64ae792e3750fd311f9 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 22 Mar 2025 02:35:32 +0100
Subject: [PATCH 2027/3129] esp32/esp32_common.cmake: Use native gchelper for
 RISC-V.

This commit changes the gchelper implementation in use for RV32-based
targets (ESP32C3, ESP32C6) from the generic one written in C to the one
written in assembler that is specific to the CPU in question.

The native implementation is already exercised on most CI builds as it
is used by the QEMU port to compile and test the RV32 target.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/esp32_common.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index f7b00900a0388..d026a64b0ce21 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -16,7 +16,10 @@ endif()
 
 # RISC-V specific inclusions
 if(CONFIG_IDF_TARGET_ARCH_RISCV)
-    list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
+    list(APPEND MICROPY_SOURCE_LIB
+        ${MICROPY_DIR}/shared/runtime/gchelper_native.c
+        ${MICROPY_DIR}/shared/runtime/gchelper_rv32i.s
+    )
     list(APPEND IDF_COMPONENTS riscv)
 endif()
 

From fda9bf491767603b762926fde35325480b5b14ee Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 22 Mar 2025 02:40:59 +0100
Subject: [PATCH 2028/3129] esp32/esp32_common.cmake: Clean up RISC-V
 directives.

This commit cleans up a couple of RISC-V specific directives in the
build script.  Namely, removes the forced inclusion of the "riscv"
component and introduces proper mpy-cross flags.

The "riscv" component is already included by the ESP-IDF build
framework, as certain low-level components would not build otherwise, so
there is no need to add it to the required components list.

The architecture flag for mpy-cross is now set for RISC-V targets, as it
was previously set only for Xtensa targets (and it relied on a string
comparison rather than using the appropriate configuration variable).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/esp32_common.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index d026a64b0ce21..99fcebac32697 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -20,7 +20,6 @@ if(CONFIG_IDF_TARGET_ARCH_RISCV)
         ${MICROPY_DIR}/shared/runtime/gchelper_native.c
         ${MICROPY_DIR}/shared/runtime/gchelper_rv32i.s
     )
-    list(APPEND IDF_COMPONENTS riscv)
 endif()
 
 if(NOT DEFINED MICROPY_PY_TINYUSB)
@@ -237,8 +236,10 @@ idf_component_register(
 set(MICROPY_TARGET ${COMPONENT_TARGET})
 
 # Define mpy-cross flags, for use with frozen code.
-if(CONFIG_IDF_TARGET_ARCH STREQUAL "xtensa")
-set(MICROPY_CROSS_FLAGS -march=xtensawin)
+if(CONFIG_IDF_TARGET_ARCH_XTENSA)
+    set(MICROPY_CROSS_FLAGS -march=xtensawin)
+elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
+    set(MICROPY_CROSS_FLAGS -march=rv32imc)
 endif()
 
 # Set compile options for this port.

From 6bb586619dc1b9022ca191016a3c32a6f89f3caa Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 22 Mar 2025 02:45:10 +0100
Subject: [PATCH 2029/3129] esp32/esp32_common.cmake: Remove obsolete
 definition.

This commit removes a definition used back when ESP-IDF v4 was supported
by MicroPython.  Those times are now long gone, and so is the need for
that particular definition to be set in the first place.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/esp32_common.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 99fcebac32697..dedef6d782cae 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -247,7 +247,6 @@ target_compile_definitions(${MICROPY_TARGET} PUBLIC
     ${MICROPY_DEF_CORE}
     ${MICROPY_DEF_BOARD}
     ${MICROPY_DEF_TINYUSB}
-    MICROPY_ESP_IDF_4=1
     MICROPY_VFS_FAT=1
     MICROPY_VFS_LFS2=1
     FFCONF_H=\"${MICROPY_OOFATFS_DIR}/ffconf.h\"

From 3805e65ed3b7306329bf0305d5b46f08d7619a11 Mon Sep 17 00:00:00 2001
From: Jon Nordby <jononor@gmail.com>
Date: Sat, 29 Mar 2025 00:38:14 +0100
Subject: [PATCH 2030/3129] tools/mpy_ld.py: Give better error for unsupported
 ARM absolute relocs.

This is a known limitation, so better to give a clear warning than a
catch-all AssertionError.  Happens for example when trying to use
soft-float on ARCH=armv6m

Also give more details on the assertion for unknown relocations, such that
one can see which symbol it affects etc, to aid in debugging.

References issue #14430.

Signed-off-by: Jon Nordby <jononor@gmail.com>
---
 tools/mpy_ld.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 44a76bdee6bf0..70cab2b894ba5 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -702,9 +702,13 @@ def do_relocation_text(env, text_addr, r):
     elif env.arch.name == "EM_RISCV":
         (addr, value) = process_riscv32_relocation(env, text_addr, r)
 
+    elif env.arch.name == "EM_ARM" and r_info_type == R_ARM_ABS32:
+        # happens for soft-float on armv6m
+        raise ValueError("Absolute relocations not supported on ARM")
+
     else:
         # Unknown/unsupported relocation
-        assert 0, r_info_type
+        assert 0, (r_info_type, s.name, s.entry, env.arch.name)
 
     # Write relocation
     if env.arch.name == "EM_RISCV":

From e34412f0f49032fcd3a08317c8f2e01c7bdae24f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Apr 2025 22:53:25 +1100
Subject: [PATCH 2031/3129] tools/ci.sh: Manually install picotool for rp2
 builds.

If picotool is not installed, it's fetched and built when compiling each
rp2 board.  And the "develop" branch of picotool is used instead of a
release.  Installing it manually using the "master" branch means the latest
released version is used (instead of a possibly unstable development
version), and also makes building each rp2 board a little faster.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index c7a6db79d6ce9..948eeeaef2d22 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -22,6 +22,15 @@ function ci_gcc_riscv_setup {
     riscv64-unknown-elf-gcc --version
 }
 
+function ci_picotool_setup {
+    # Manually installing picotool ensures we use a release version, and speeds up the build.
+    git clone https://github.com/raspberrypi/pico-sdk.git
+    (cd pico-sdk && git submodule update --init lib/mbedtls)
+    git clone https://github.com/raspberrypi/picotool.git
+    (cd picotool && mkdir build && cd build && cmake -DPICO_SDK_PATH=../../pico-sdk .. && make && sudo make install)
+    picotool version
+}
+
 ########################################################################################
 # c code formatting
 
@@ -62,6 +71,7 @@ function ci_code_size_setup {
     gcc --version
     ci_gcc_arm_setup
     ci_gcc_riscv_setup
+    ci_picotool_setup
 }
 
 function ci_code_size_build {
@@ -355,6 +365,7 @@ function ci_renesas_ra_board_build {
 
 function ci_rp2_setup {
     ci_gcc_arm_setup
+    ci_picotool_setup
 }
 
 function ci_rp2_build {

From 57f1e60dd05a58b6d78c72af31ee4d706b1c47a1 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 1 Apr 2025 12:09:41 +1100
Subject: [PATCH 2032/3129] tests/cpydiff: Update CPy diff for assign expr in
 nested comprehensions.

Since 7c1584aef1 MicroPython matches CPython in most cases, aside from
nested comprehensions.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/cpydiff/syntax_assign_expr.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/cpydiff/syntax_assign_expr.py b/tests/cpydiff/syntax_assign_expr.py
index 58f57ca1fbe02..704c5c3ecab37 100644
--- a/tests/cpydiff/syntax_assign_expr.py
+++ b/tests/cpydiff/syntax_assign_expr.py
@@ -1,8 +1,8 @@
 """
 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.
+description: MicroPython allows := to assign to the iteration variable in nested comprehensions, CPython does not.
+cause: MicroPython is optimised for code size. Although it is a syntax error to assign to the iteration variable in a standard comprehension (same as CPython), it doesn't check if an inner nested comprehension assigns to the iteration variable of the outer comprehension.
+workaround: Do not use := to assign to the iteration variable of a comprehension.
 """
 
-print([i := -1 for i in range(4)])
+print([[(j := i) for i in range(2)] for j in range(2)])

From e9a80fc9a0a13a6afe43973c526ea25b7bcdb9e7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 1 Apr 2025 11:53:31 +1100
Subject: [PATCH 2033/3129] tests/cpydiff: Remove types_str_endswith.

MicroPython support for this behaviour was added in eb45d97898a.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/cpydiff/types_str_endswith.py | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 tests/cpydiff/types_str_endswith.py

diff --git a/tests/cpydiff/types_str_endswith.py b/tests/cpydiff/types_str_endswith.py
deleted file mode 100644
index 890c7ba5ef47f..0000000000000
--- a/tests/cpydiff/types_str_endswith.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-categories: Types,str
-description: Start/end indices such as str.endswith(s, start) not implemented
-cause: Unknown
-workaround: Unknown
-"""
-
-print("abc".endswith("c", 1))

From 74a5bf94c187d41d0458814312d57d2105233726 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 1 Apr 2025 11:52:04 +1100
Subject: [PATCH 2034/3129] tools/gen-cpydiff.py: Fail CPython diff generation
 if output matches.

Previously this information was recorded in a "status" field of the result,
but nothing ever parsed this result which led to non-differences not being
removed.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/gen-cpydiff.py | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index c0b5734389cdf..2f9394deeae00 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -69,7 +69,6 @@
         "code",
         "output_cpy",
         "output_upy",
-        "status",
     ],
 )
 
@@ -98,7 +97,7 @@ def readfiles():
                 if not re.match(r"\s*# fmt: (on|off)\s*", x)
             )
 
-            output = Output(test, class_, desc, cause, workaround, code, "", "", "")
+            output = Output(test, class_, desc, cause, workaround, code, "", "")
             files.append(output)
         except IndexError:
             print("Incorrect format in file " + test_fullpath)
@@ -108,6 +107,7 @@ def readfiles():
 
 def run_tests(tests):
     """executes all tests"""
+    same_results = False
     results = []
     for test in tests:
         test_fullpath = os.path.join(TESTPATH, test.name)
@@ -133,23 +133,26 @@ def run_tests(tests):
         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"
-            print("Supported operation!\nFile: " + test_fullpath)
+            print("Error: Test has same output in CPython vs MicroPython: " + test_fullpath)
+            same_results = True
         else:
-            status = "Unsupported"
-
-        output = Output(
-            test.name,
-            test.class_,
-            test.desc,
-            test.cause,
-            test.workaround,
-            test.code,
-            output_cpy,
-            output_upy,
-            status,
+            output = Output(
+                test.name,
+                test.class_,
+                test.desc,
+                test.cause,
+                test.workaround,
+                test.code,
+                output_cpy,
+                output_upy,
+            )
+            results.append(output)
+
+    if same_results:
+        raise SystemExit(
+            "Failing due to non-differences in results. If MicroPython behaviour has changed "
+            "to match CPython, please remove the file(s) mentioned above."
         )
-        results.append(output)
 
     results.sort(key=lambda x: x.class_)
     return results

From 9e9be83fd69a36bf82019d1ecfcafa3b317ae899 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 29 Mar 2025 10:11:38 +0100
Subject: [PATCH 2035/3129] tools/mpremote: Allow .img for ROMFS file and
 validate ROMFS image.

Currently the tool allows writing an invalid ROMFS image, with a bad header
or images smaller than minimum size, and only checks the image extension.

This commit allows deploying a ROMFS with either a ".img" or ".romfs"
extension (in the future support may be added for other extensions that
have different semantics, eg a manifest), and validates the image header
before writing.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 tools/mpremote/mpremote/commands.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 7dd448c8b771c..e385d050927f2 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -9,7 +9,7 @@
 
 from .transport import TransportError, TransportExecError, stdout_write_bytes
 from .transport_serial import SerialTransport
-from .romfs import make_romfs
+from .romfs import make_romfs, VfsRomWriter
 
 
 class CommandError(Exception):
@@ -555,7 +555,7 @@ def _do_romfs_deploy(state, args):
     romfs_filename = args.path
 
     # Read in or create the ROMFS filesystem image.
-    if romfs_filename.endswith(".romfs"):
+    if os.path.isfile(romfs_filename) and romfs_filename.endswith((".img", ".romfs")):
         with open(romfs_filename, "rb") as f:
             romfs = f.read()
     else:
@@ -581,6 +581,11 @@ def _do_romfs_deploy(state, args):
         rom_size = transport.eval("len(dev)")
         print(f"ROMFS{rom_id} partition has size {rom_size} bytes")
 
+    # Check if ROMFS image is valid
+    if not romfs.startswith(VfsRomWriter.ROMFS_HEADER):
+        print("Invalid ROMFS image")
+        sys.exit(1)
+
     # Check if ROMFS filesystem image will fit in the target partition.
     if len(romfs) > rom_size:
         print("ROMFS image is too big for the target partition")

From 11f057dd9a5801e23b39822b3a57cbfa8cd10f00 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 6 Aug 2024 19:49:40 +0100
Subject: [PATCH 2036/3129] rp2: Add support for PSRAM with auto-detection.

Performs a best-effort attempt to detect attached PSRAM, configure it and
*add* it to the MicroPython heap.  If PSRAM is not present, should fall
back to use internal RAM.

Introduce two new port/board defines:
- MICROPY_HW_ENABLE_PSRAM to enable PSRAM.
- MICROPY_HW_PSRAM_CS_PIN to define the chip-select pin (required).

Changes are:
- ports/rp2/rp2_psram.[ch]: Add new PSRAM module.
- ports/rp2/main.c: Add optional PSRAM support.
- ports/rp2/CMakeLists.txt: Include rp2_psram.c.
- ports/rp2/mpconfigport.h: Add MICROPY_HW_ENABLE_PSRAM.
- ports/rp2/modmachine.c: Reconfigure PSRAM on freq change.

Co-authored-by: Kirk Benell <kirk.benell@sparkfun.com>
Co-authored-by: Mike Bell <mike@mercuna.com>
Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/CMakeLists.txt |   1 +
 ports/rp2/main.c         |  19 ++++
 ports/rp2/modmachine.c   |   4 +
 ports/rp2/mpconfigport.h |   4 +
 ports/rp2/rp2_psram.c    | 198 +++++++++++++++++++++++++++++++++++++++
 ports/rp2/rp2_psram.h    |  44 +++++++++
 6 files changed, 270 insertions(+)
 create mode 100644 ports/rp2/rp2_psram.c
 create mode 100644 ports/rp2/rp2_psram.h

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index f89e2792c6479..1a5029c150417 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -165,6 +165,7 @@ set(MICROPY_SOURCE_PORT
     pendsv.c
     rp2_flash.c
     rp2_pio.c
+    rp2_psram.c
     rp2_dma.c
     uart.c
     usbd.c
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 58da63c06f12d..764af6b7466cf 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -46,6 +46,7 @@
 #include "mpnetworkport.h"
 #include "genhdr/mpversion.h"
 #include "mp_usbd.h"
+#include "rp2_psram.h"
 
 #include "pico/stdlib.h"
 #include "pico/binary_info.h"
@@ -93,6 +94,10 @@ int main(int argc, char **argv) {
     // Hook for setting up anything that needs to be super early in the boot-up process.
     MICROPY_BOARD_STARTUP();
 
+    #if MICROPY_HW_ENABLE_PSRAM
+    size_t psram_size = psram_init(MICROPY_HW_PSRAM_CS_PIN);
+    #endif
+
     #if MICROPY_HW_ENABLE_UART_REPL
     bi_decl(bi_program_feature("UART REPL"))
     setup_default_uart();
@@ -120,7 +125,21 @@ int main(int argc, char **argv) {
 
     // Initialise stack extents and GC heap.
     mp_cstack_init_with_top(&__StackTop, &__StackTop - &__StackBottom);
+
+    #if MICROPY_HW_ENABLE_PSRAM
+    if (psram_size) {
+        #if MICROPY_GC_SPLIT_HEAP
+        gc_init(&__GcHeapStart, &__GcHeapEnd);
+        gc_add((void *)PSRAM_BASE, (void *)(PSRAM_BASE + psram_size));
+        #else
+        gc_init((void *)PSRAM_BASE, (void *)(PSRAM_BASE + psram_size));
+        #endif
+    } else {
+        gc_init(&__GcHeapStart, &__GcHeapEnd);
+    }
+    #else
     gc_init(&__GcHeapStart, &__GcHeapEnd);
+    #endif
 
     #if MICROPY_PY_LWIP
     // lwIP doesn't allow to reinitialise itself by subsequent calls to this function
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 31665a7640d9c..bf4e43a613c90 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -31,6 +31,7 @@
 #include "mp_usbd.h"
 #include "modmachine.h"
 #include "uart.h"
+#include "rp2_psram.h"
 #include "clocks_extra.h"
 #include "hardware/pll.h"
 #include "hardware/structs/rosc.h"
@@ -115,6 +116,9 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     setup_default_uart();
     mp_uart_init();
     #endif
+    #if MICROPY_HW_ENABLE_PSRAM
+    psram_init(MICROPY_HW_PSRAM_CS_PIN);
+    #endif
 }
 
 static void mp_machine_idle(void) {
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 38dcad1dae6e1..28022ba420942 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -81,6 +81,10 @@
 #define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 #endif
 
+#ifndef MICROPY_HW_ENABLE_PSRAM
+#define MICROPY_HW_ENABLE_PSRAM (0)
+#endif
+
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE             uint16_t
 #define MICROPY_ALLOC_PATH_MAX                  (128)
diff --git a/ports/rp2/rp2_psram.c b/ports/rp2/rp2_psram.c
new file mode 100644
index 0000000000000..bb063f4af7a06
--- /dev/null
+++ b/ports/rp2/rp2_psram.c
@@ -0,0 +1,198 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Phil Howard
+ *                    Mike Bell
+ *                    Kirk D. Benell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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"
+
+#if MICROPY_HW_ENABLE_PSRAM
+
+#include "hardware/structs/ioqspi.h"
+#include "hardware/structs/qmi.h"
+#include "hardware/structs/xip_ctrl.h"
+#include "hardware/clocks.h"
+#include "hardware/sync.h"
+#include "rp2_psram.h"
+
+size_t __no_inline_not_in_flash_func(psram_detect)(void) {
+    int psram_size = 0;
+
+    // Try and read the PSRAM ID via direct_csr.
+    qmi_hw->direct_csr = 30 << QMI_DIRECT_CSR_CLKDIV_LSB | QMI_DIRECT_CSR_EN_BITS;
+
+    // Need to poll for the cooldown on the last XIP transfer to expire
+    // (via direct-mode BUSY flag) before it is safe to perform the first
+    // direct-mode operation
+    while ((qmi_hw->direct_csr & QMI_DIRECT_CSR_BUSY_BITS) != 0) {
+    }
+
+    // Exit out of QMI in case we've inited already
+    qmi_hw->direct_csr |= QMI_DIRECT_CSR_ASSERT_CS1N_BITS;
+
+    // Transmit as quad.
+    qmi_hw->direct_tx = QMI_DIRECT_TX_OE_BITS | QMI_DIRECT_TX_IWIDTH_VALUE_Q << QMI_DIRECT_TX_IWIDTH_LSB | 0xf5;
+
+    while ((qmi_hw->direct_csr & QMI_DIRECT_CSR_BUSY_BITS) != 0) {
+    }
+
+    (void)qmi_hw->direct_rx;
+
+    qmi_hw->direct_csr &= ~(QMI_DIRECT_CSR_ASSERT_CS1N_BITS);
+
+    // Read the id
+    qmi_hw->direct_csr |= QMI_DIRECT_CSR_ASSERT_CS1N_BITS;
+    uint8_t kgd = 0;
+    uint8_t eid = 0;
+
+    for (size_t i = 0; i < 7; i++) {
+        if (i == 0) {
+            qmi_hw->direct_tx = 0x9f;
+        } else {
+            qmi_hw->direct_tx = 0xff;
+        }
+
+        while ((qmi_hw->direct_csr & QMI_DIRECT_CSR_TXEMPTY_BITS) == 0) {
+        }
+
+        while ((qmi_hw->direct_csr & QMI_DIRECT_CSR_BUSY_BITS) != 0) {
+        }
+
+        if (i == 5) {
+            kgd = qmi_hw->direct_rx;
+        } else if (i == 6) {
+            eid = qmi_hw->direct_rx;
+        } else {
+            (void)qmi_hw->direct_rx;
+        }
+    }
+
+    // Disable direct csr.
+    qmi_hw->direct_csr &= ~(QMI_DIRECT_CSR_ASSERT_CS1N_BITS | QMI_DIRECT_CSR_EN_BITS);
+
+    if (kgd == 0x5D) {
+        psram_size = 1024 * 1024; // 1 MiB
+        uint8_t size_id = eid >> 5;
+        if (eid == 0x26 || size_id == 2) {
+            psram_size *= 8; // 8 MiB
+        } else if (size_id == 0) {
+            psram_size *= 2; // 2 MiB
+        } else if (size_id == 1) {
+            psram_size *= 4; // 4 MiB
+        }
+    }
+
+    return psram_size;
+}
+
+size_t __no_inline_not_in_flash_func(psram_init)(uint cs_pin) {
+    gpio_set_function(cs_pin, GPIO_FUNC_XIP_CS1);
+
+    uint32_t intr_stash = save_and_disable_interrupts();
+
+    size_t psram_size = psram_detect();
+
+    if (!psram_size) {
+        restore_interrupts(intr_stash);
+        return 0;
+    }
+
+    // Enable direct mode, PSRAM CS, clkdiv of 10.
+    qmi_hw->direct_csr = 10 << QMI_DIRECT_CSR_CLKDIV_LSB | \
+        QMI_DIRECT_CSR_EN_BITS | \
+        QMI_DIRECT_CSR_AUTO_CS1N_BITS;
+    while (qmi_hw->direct_csr & QMI_DIRECT_CSR_BUSY_BITS) {
+    }
+
+    // Enable QPI mode on the PSRAM
+    const uint CMD_QPI_EN = 0x35;
+    qmi_hw->direct_tx = QMI_DIRECT_TX_NOPUSH_BITS | CMD_QPI_EN;
+
+    while (qmi_hw->direct_csr & QMI_DIRECT_CSR_BUSY_BITS) {
+    }
+
+    // Set PSRAM timing for APS6404
+    //
+    // Using an rxdelay equal to the divisor isn't enough when running the APS6404 close to 133MHz.
+    // So: don't allow running at divisor 1 above 100MHz (because delay of 2 would be too late),
+    // and add an extra 1 to the rxdelay if the divided clock is > 100MHz (i.e. sys clock > 200MHz).
+    const int max_psram_freq = 133000000;
+    const int clock_hz = clock_get_hz(clk_sys);
+    int divisor = (clock_hz + max_psram_freq - 1) / max_psram_freq;
+    if (divisor == 1 && clock_hz > 100000000) {
+        divisor = 2;
+    }
+    int rxdelay = divisor;
+    if (clock_hz / divisor > 100000000) {
+        rxdelay += 1;
+    }
+
+    // - Max select must be <= 8us.  The value is given in multiples of 64 system clocks.
+    // - Min deselect must be >= 18ns.  The value is given in system clock cycles - ceil(divisor / 2).
+    const int clock_period_fs = 1000000000000000ll / clock_hz;
+    const int max_select = (125 * 1000000) / clock_period_fs;  // 125 = 8000ns / 64
+    const int min_deselect = (18 * 1000000 + (clock_period_fs - 1)) / clock_period_fs - (divisor + 1) / 2;
+
+    qmi_hw->m[1].timing = 1 << QMI_M1_TIMING_COOLDOWN_LSB |
+        QMI_M1_TIMING_PAGEBREAK_VALUE_1024 << QMI_M1_TIMING_PAGEBREAK_LSB |
+        max_select << QMI_M1_TIMING_MAX_SELECT_LSB |
+        min_deselect << QMI_M1_TIMING_MIN_DESELECT_LSB |
+        rxdelay << QMI_M1_TIMING_RXDELAY_LSB |
+        divisor << QMI_M1_TIMING_CLKDIV_LSB;
+
+    // Set PSRAM commands and formats
+    qmi_hw->m[1].rfmt =
+        QMI_M0_RFMT_PREFIX_WIDTH_VALUE_Q << QMI_M0_RFMT_PREFIX_WIDTH_LSB | \
+            QMI_M0_RFMT_ADDR_WIDTH_VALUE_Q << QMI_M0_RFMT_ADDR_WIDTH_LSB | \
+            QMI_M0_RFMT_SUFFIX_WIDTH_VALUE_Q << QMI_M0_RFMT_SUFFIX_WIDTH_LSB | \
+            QMI_M0_RFMT_DUMMY_WIDTH_VALUE_Q << QMI_M0_RFMT_DUMMY_WIDTH_LSB | \
+            QMI_M0_RFMT_DATA_WIDTH_VALUE_Q << QMI_M0_RFMT_DATA_WIDTH_LSB | \
+            QMI_M0_RFMT_PREFIX_LEN_VALUE_8 << QMI_M0_RFMT_PREFIX_LEN_LSB | \
+            6 << QMI_M0_RFMT_DUMMY_LEN_LSB;
+
+    qmi_hw->m[1].rcmd = 0xEB;
+
+    qmi_hw->m[1].wfmt =
+        QMI_M0_WFMT_PREFIX_WIDTH_VALUE_Q << QMI_M0_WFMT_PREFIX_WIDTH_LSB | \
+            QMI_M0_WFMT_ADDR_WIDTH_VALUE_Q << QMI_M0_WFMT_ADDR_WIDTH_LSB | \
+            QMI_M0_WFMT_SUFFIX_WIDTH_VALUE_Q << QMI_M0_WFMT_SUFFIX_WIDTH_LSB | \
+            QMI_M0_WFMT_DUMMY_WIDTH_VALUE_Q << QMI_M0_WFMT_DUMMY_WIDTH_LSB | \
+            QMI_M0_WFMT_DATA_WIDTH_VALUE_Q << QMI_M0_WFMT_DATA_WIDTH_LSB | \
+            QMI_M0_WFMT_PREFIX_LEN_VALUE_8 << QMI_M0_WFMT_PREFIX_LEN_LSB;
+
+    qmi_hw->m[1].wcmd = 0x38;
+
+    // Disable direct mode
+    qmi_hw->direct_csr = 0;
+
+    // Enable writes to PSRAM
+    hw_set_bits(&xip_ctrl_hw->ctrl, XIP_CTRL_WRITABLE_M1_BITS);
+
+    restore_interrupts(intr_stash);
+
+    return psram_size;
+}
+
+#endif
diff --git a/ports/rp2/rp2_psram.h b/ports/rp2/rp2_psram.h
new file mode 100644
index 0000000000000..0eddf6341592b
--- /dev/null
+++ b/ports/rp2/rp2_psram.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Phil Howard
+ *                    Mike Bell
+ *                    Kirk D. Benell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "pico/stdlib.h"
+
+#ifndef MICROPY_INCLUDED_RP2_RP2_PSRAM_H
+#define MICROPY_INCLUDED_RP2_RP2_PSRAM_H
+
+#if MICROPY_HW_ENABLE_PSRAM
+#ifndef MICROPY_HW_PSRAM_CS_PIN
+#error "MICROPY_HW_ENABLE_PSRAM requires MICROPY_HW_PSRAM_CS_PIN"
+#endif
+
+#define PSRAM_BASE _u(0x11000000)
+
+extern size_t psram_init(uint cs_pin);
+#endif
+
+#endif

From b7d5caf2a3e08fa90bbb09b43b29455e2c20eaf6 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Fri, 9 Aug 2024 14:15:33 +0100
Subject: [PATCH 2037/3129] rp2/mpconfigport: Configure heap for PSRAM.

PSRAM will be used exclusively if MICROPY_GC_SPLIT_HEAP == 0, it will be
added to RAM if MICROPY_GC_SPLIT_HEAP == 1, and the system will fall back
to RAM only if it's not detected.

Due to the size of PSRAM, GC stack was overflowing and causing the GC to
scan through the entire memory pool.  This caused noticable slowdowns
during GC.  Increase the stack from 256 to 4096 bytes to avoid overflow and
increase the stack entry type size to accomodate 8MB+ PSRAM.

Changes are:
- ports/rp2/mpconfigport.h: Make split-heap optional and enable by default.
- ports/rp2/mpconfigport.h: Increase GC stack entry type to uint32_t.
- ports/rp2/mpconfigport.h: Raise GC stack size.

Co-authored-by: Kirk Benell <kirk.benell@sparkfun.com>
Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/mpconfigport.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 28022ba420942..3d65737266b49 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -86,7 +86,15 @@
 #endif
 
 // Memory allocation policies
+#if MICROPY_HW_ENABLE_PSRAM
+#define MICROPY_GC_STACK_ENTRY_TYPE             uint32_t
+#define MICROPY_ALLOC_GC_STACK_SIZE             (1024) // Avoid slowdown when GC stack overflow causes a full sweep of PSRAM-backed heap
+#else
 #define MICROPY_GC_STACK_ENTRY_TYPE             uint16_t
+#endif
+#ifndef MICROPY_GC_SPLIT_HEAP
+#define MICROPY_GC_SPLIT_HEAP                   MICROPY_HW_ENABLE_PSRAM // whether PSRAM is added to or replaces the heap
+#endif
 #define MICROPY_ALLOC_PATH_MAX                  (128)
 #define MICROPY_QSTR_BYTES_IN_HASH              (1)
 

From 89eea0f5e8d7fe2a1c0ca7c3bc1578b417d8fb8c Mon Sep 17 00:00:00 2001
From: Mike Bell <mdb036@gmail.com>
Date: Sun, 11 Aug 2024 21:39:05 +0100
Subject: [PATCH 2038/3129] rp2/rp2_flash: Support flash writes from PSRAM.

Add a 256 byte (FLASH_PAGE_SIZE) SRAM copy buffer to allow copies from
PSRAM to flash.  This would otherwise hardfault since PSRAM is disabled
when doing a write to flash.

Changes are:
- ports/rp2/rp2_flash.c: Add 256 byte (flash page size) SRAM copy buffer
                         for PSRAM to flash copies.
- ports/rp2/rp2_flash.c: Invalidate the XIP cache to purge any PSRAM
                         data before critical flash operations.

Co-authored-by: Phil Howard <github@gadgetoid.com>
Co-authored-by: Angus Gratton <angus@redyak.com.au>
Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/rp2_flash.c | 64 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index f3f154a1402d9..8739f17a4a548 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -33,9 +33,13 @@
 #include "modrp2.h"
 #include "hardware/flash.h"
 #include "pico/binary_info.h"
+#include "rp2_psram.h"
 
 #define BLOCK_SIZE_BYTES (FLASH_SECTOR_SIZE)
 
+// Size of buffer for flash writes from PSRAM, since they are mutually exclusive
+#define COPY_BUFFER_SIZE_BYTES (FLASH_PAGE_SIZE)
+
 static_assert(MICROPY_HW_ROMFS_BYTES % 4096 == 0, "ROMFS size must be a multiple of 4K");
 static_assert(MICROPY_HW_FLASH_STORAGE_BYTES % 4096 == 0, "Flash storage size must be a multiple of 4K");
 
@@ -96,10 +100,27 @@ static uint32_t begin_critical_flash_section(void) {
     if (use_multicore_lockout()) {
         multicore_lockout_start_blocking();
     }
-    return save_and_disable_interrupts();
+    uint32_t state = save_and_disable_interrupts();
+
+    #if MICROPY_HW_ENABLE_PSRAM
+    // We're about to invalidate the XIP cache, clean it first to commit any dirty writes to PSRAM
+    // Use the upper 16k of the maintenance space (0x1bffc000 through 0x1bffffff) to workaround
+    // incorrect behaviour of the XIP clean operation, where it also alters the tag of the associated
+    // cache line: https://forums.raspberrypi.com/viewtopic.php?t=378249#p2263677
+    volatile uint8_t *maintenance_ptr = (volatile uint8_t *)(XIP_SRAM_BASE + (XIP_MAINTENANCE_BASE - XIP_BASE));
+    for (int i = 1; i < 16 * 1024; i += 8) {
+        maintenance_ptr[i] = 0;
+    }
+    #endif
+
+    return state;
 }
 
 static void end_critical_flash_section(uint32_t state) {
+    #if MICROPY_HW_ENABLE_PSRAM
+    // The ROM function to program flash will reset PSRAM timings to defaults
+    psram_init(MICROPY_HW_PSRAM_CS_PIN);
+    #endif
     restore_interrupts(state);
     if (use_multicore_lockout()) {
         multicore_lockout_end_blocking();
@@ -192,10 +213,43 @@ static mp_obj_t rp2_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     } else {
         offset += mp_obj_get_int(args[3]);
     }
-    mp_uint_t atomic_state = begin_critical_flash_section();
-    flash_range_program(self->flash_base + offset, bufinfo.buf, bufinfo.len);
-    end_critical_flash_section(atomic_state);
-    mp_event_handle_nowait();
+
+    // If copying from SRAM, can write direct to flash.
+    // If copying from PSRAM/flash, use an SRAM buffer and write in chunks.
+    #if MICROPY_HW_ENABLE_PSRAM
+    bool write_direct = (uintptr_t)bufinfo.buf >= SRAM_BASE;
+    #else
+    bool write_direct = true;
+    #endif
+
+    if (write_direct) {
+        // If copying from SRAM, write direct
+        mp_uint_t atomic_state = begin_critical_flash_section();
+        flash_range_program(self->flash_base + offset, bufinfo.buf, bufinfo.len);
+        end_critical_flash_section(atomic_state);
+        mp_event_handle_nowait();
+    }
+    #if MICROPY_HW_ENABLE_PSRAM
+    else {
+        size_t bytes_left = bufinfo.len;
+        size_t bytes_offset = 0;
+        static uint8_t copy_buffer[COPY_BUFFER_SIZE_BYTES] = {0};
+
+        while (bytes_left) {
+            memcpy(copy_buffer, bufinfo.buf + bytes_offset, MIN(bytes_left, COPY_BUFFER_SIZE_BYTES));
+            mp_uint_t atomic_state = begin_critical_flash_section();
+            flash_range_program(self->flash_base + offset + bytes_offset, copy_buffer, MIN(bytes_left, COPY_BUFFER_SIZE_BYTES));
+            end_critical_flash_section(atomic_state);
+            bytes_offset += COPY_BUFFER_SIZE_BYTES;
+            if (bytes_left <= COPY_BUFFER_SIZE_BYTES) {
+                break;
+            }
+            bytes_left -= COPY_BUFFER_SIZE_BYTES;
+            mp_event_handle_nowait();
+        }
+    }
+    #endif
+
     // TODO check return value
     return mp_const_none;
 }

From 91cff8e4f10ea665c5f3f4b16d62c98d6ca22037 Mon Sep 17 00:00:00 2001
From: Mike Bell <mdb036@gmail.com>
Date: Tue, 25 Mar 2025 11:32:06 +0000
Subject: [PATCH 2039/3129] rp2/rp2_flash: Configure optimal flash timings.

Configure flash timings dynamically to match the system clock.  Reconfigure
timings after flash writes.

Changes are:
- ports/rp2/main.c: Set default flash timings.
- ports/rp2/modmachine.c: Configure optimal flash timings on freq change.
- ports/rp2/rp2_flash.c: Reconfigure flash when leaving critical section.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/main.c       |  4 +++
 ports/rp2/modmachine.c | 12 +++++++
 ports/rp2/rp2_flash.c  | 71 +++++++++++++++++++++++++++++++++++++++++-
 ports/rp2/rp2_flash.h  | 34 ++++++++++++++++++++
 4 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 ports/rp2/rp2_flash.h

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 764af6b7466cf..0f10f63c6d296 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 
+#include "rp2_flash.h"
 #include "py/compile.h"
 #include "py/cstack.h"
 #include "py/runtime.h"
@@ -94,6 +95,9 @@ int main(int argc, char **argv) {
     // Hook for setting up anything that needs to be super early in the boot-up process.
     MICROPY_BOARD_STARTUP();
 
+    // Set the flash divisor to an appropriate value
+    rp2_flash_set_timing();
+
     #if MICROPY_HW_ENABLE_PSRAM
     size_t psram_size = psram_init(MICROPY_HW_PSRAM_CS_PIN);
     #endif
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index bf4e43a613c90..58a3a8ae4d87d 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -32,6 +32,7 @@
 #include "modmachine.h"
 #include "uart.h"
 #include "rp2_psram.h"
+#include "rp2_flash.h"
 #include "clocks_extra.h"
 #include "hardware/pll.h"
 #include "hardware/structs/rosc.h"
@@ -95,6 +96,11 @@ static mp_obj_t mp_machine_get_freq(void) {
 
 static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_int_t freq = mp_obj_get_int(args[0]);
+
+    // If necessary, increase the flash divider before increasing the clock speed
+    const int old_freq = clock_get_hz(clk_sys);
+    rp2_flash_set_timing_for_freq(MAX(freq, old_freq));
+
     if (!set_sys_clock_khz(freq / 1000, false)) {
         mp_raise_ValueError(MP_ERROR_TEXT("cannot change frequency"));
     }
@@ -112,6 +118,12 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
             }
         }
     }
+
+    // If clock speed was reduced, maybe we can reduce the flash divider
+    if (freq < old_freq) {
+        rp2_flash_set_timing_for_freq(freq);
+    }
+
     #if MICROPY_HW_ENABLE_UART_REPL
     setup_default_uart();
     mp_uart_init();
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 8739f17a4a548..a9beabf051c2d 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -34,6 +34,12 @@
 #include "hardware/flash.h"
 #include "pico/binary_info.h"
 #include "rp2_psram.h"
+#ifdef PICO_RP2350
+#include "hardware/structs/ioqspi.h"
+#include "hardware/structs/qmi.h"
+#else
+#include "hardware/structs/ssi.h"
+#endif
 
 #define BLOCK_SIZE_BYTES (FLASH_SECTOR_SIZE)
 
@@ -94,6 +100,48 @@ static bool use_multicore_lockout(void) {
     ;
 }
 
+// Function to set the flash divisor to the correct divisor, assumes interrupts disabled
+// and core1 locked out if relevant.
+static void __no_inline_not_in_flash_func(rp2_flash_set_timing_internal)(int clock_hz) {
+
+    // Use the minimum divisor assuming a 133MHz flash.
+    const int max_flash_freq = 133000000;
+    int divisor = (clock_hz + max_flash_freq - 1) / max_flash_freq;
+
+    #if PICO_RP2350
+    // Make sure flash is deselected - QMI doesn't appear to have a busy flag(!)
+    while ((ioqspi_hw->io[1].status & IO_QSPI_GPIO_QSPI_SS_STATUS_OUTTOPAD_BITS) != IO_QSPI_GPIO_QSPI_SS_STATUS_OUTTOPAD_BITS) {
+        ;
+    }
+
+    // RX delay equal to the divisor means sampling at the same time as the next falling edge of SCK after the
+    // falling edge that generated the data.  This is pretty tight at 133MHz but seems to work with the Winbond flash chips.
+    const int rxdelay = divisor;
+    qmi_hw->m[0].timing = (1 << QMI_M0_TIMING_COOLDOWN_LSB) |
+        rxdelay << QMI_M1_TIMING_RXDELAY_LSB |
+        divisor << QMI_M1_TIMING_CLKDIV_LSB;
+
+    // Force a read through XIP to ensure the timing is applied
+    volatile uint32_t *ptr = (volatile uint32_t *)0x14000000;
+    (void)*ptr;
+    #else
+    // RP2040 SSI hardware only supports even divisors
+    if (divisor & 1) {
+        divisor += 1;
+    }
+
+    // Wait for SSI not busy
+    while (ssi_hw->sr & SSI_SR_BUSY_BITS) {
+        ;
+    }
+
+    // Disable, set the new divisor, and re-enable
+    hw_clear_bits(&ssi_hw->ssienr, SSI_SSIENR_SSI_EN_BITS);
+    ssi_hw->baudr = divisor;
+    hw_set_bits(&ssi_hw->ssienr, SSI_SSIENR_SSI_EN_BITS);
+    #endif
+}
+
 // Flash erase and write must run with interrupts disabled and the other core suspended,
 // because the XIP bit gets disabled.
 static uint32_t begin_critical_flash_section(void) {
@@ -117,8 +165,9 @@ static uint32_t begin_critical_flash_section(void) {
 }
 
 static void end_critical_flash_section(uint32_t state) {
+    // The ROM function to program flash will have reset flash and PSRAM timings to defaults
+    rp2_flash_set_timing_internal(clock_get_hz(clk_sys));
     #if MICROPY_HW_ENABLE_PSRAM
-    // The ROM function to program flash will reset PSRAM timings to defaults
     psram_init(MICROPY_HW_PSRAM_CS_PIN);
     #endif
     restore_interrupts(state);
@@ -313,3 +362,23 @@ mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
     }
 }
 #endif
+
+// Modify the flash timing.  Ensure flash access is suspended while
+// the timings are altered.
+void rp2_flash_set_timing_for_freq(int clock_hz) {
+    if (multicore_lockout_victim_is_initialized(1 - get_core_num())) {
+        multicore_lockout_start_blocking();
+    }
+    uint32_t state = save_and_disable_interrupts();
+
+    rp2_flash_set_timing_internal(clock_hz);
+
+    restore_interrupts(state);
+    if (multicore_lockout_victim_is_initialized(1 - get_core_num())) {
+        multicore_lockout_end_blocking();
+    }
+}
+
+void rp2_flash_set_timing(void) {
+    rp2_flash_set_timing_for_freq(clock_get_hz(clk_sys));
+}
diff --git a/ports/rp2/rp2_flash.h b/ports/rp2/rp2_flash.h
new file mode 100644
index 0000000000000..3c1fbbff2f9cd
--- /dev/null
+++ b/ports/rp2/rp2_flash.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Mike Bell
+ *                    Phil Howard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_RP2_FLASH_H
+#define MICROPY_INCLUDED_RP2_RP2_FLASH_H
+
+extern void rp2_flash_set_timing_for_freq(int clock_hz);
+extern void rp2_flash_set_timing(void);
+
+#endif

From 0ee160e7c06ddc6641257d5ebb88d006e731a3aa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Dec 2024 14:49:56 +1100
Subject: [PATCH 2040/3129] extmod/extmod.mk: Add cyw43_spi.c to list of
 sources.

This file is part of the updated cyw43-driver.  It will only be used if
`CYW43_USE_SPI` is enabled.

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

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index a510f3c54c25c..d2fe2acbad95c 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -458,6 +458,7 @@ SRC_THIRDPARTY_C += $(addprefix $(CYW43_DIR)/src/,\
 	cyw43_lwip.c \
 	cyw43_ll.c \
 	cyw43_sdio.c \
+	cyw43_spi.c \
 	cyw43_stats.c \
 	)
 ifeq ($(MICROPY_PY_BLUETOOTH),1)

From a9384c71c50a7bc4aaae1f88ddee5ebacc56ba81 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Feb 2025 23:19:31 +1100
Subject: [PATCH 2041/3129] extmod/extmod.mk: Switch from drivers/cyw43/cywbt
 to lib/cyw43-drivers.

The cyw43-driver now provides the Bluetooth initialisation code, making
`drivers/cyw43/cywbt.c` obsolete.  To use the new code a port must enable
the `CYW43_ENABLE_BLUETOOTH_OVER_UART` option.

Some ports have yet to migrate to the new code, so in the meantime they can
explicitly add the old source to their source list and continue to use it
without change.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.mk      | 4 +---
 ports/mimxrt/Makefile | 1 +
 ports/stm32/Makefile  | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index d2fe2acbad95c..859f610c90ac1 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -454,6 +454,7 @@ CYW43_DIR = lib/cyw43-driver
 GIT_SUBMODULES += $(CYW43_DIR)
 CFLAGS_EXTMOD += -DMICROPY_PY_NETWORK_CYW43=1
 SRC_THIRDPARTY_C += $(addprefix $(CYW43_DIR)/src/,\
+	cyw43_bthci_uart.c \
 	cyw43_ctrl.c \
 	cyw43_lwip.c \
 	cyw43_ll.c \
@@ -461,9 +462,6 @@ SRC_THIRDPARTY_C += $(addprefix $(CYW43_DIR)/src/,\
 	cyw43_spi.c \
 	cyw43_stats.c \
 	)
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-DRIVERS_SRC_C += drivers/cyw43/cywbt.c
-endif
 
 $(BUILD)/$(CYW43_DIR)/src/cyw43_%.o: CFLAGS += -std=c11
 endif # MICROPY_PY_NETWORK_CYW43
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 8106ab4f3ff03..5c54295028083 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -280,6 +280,7 @@ endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 SRC_C += mpbthciport.c
+DRIVERS_SRC_C += drivers/cyw43/cywbt.c
 endif # MICROPY_PY_BLUETOOTH
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8ac9a8af03d1a..c938dcbda7d6d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -432,6 +432,7 @@ endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 SRC_C += mpbthciport.c
+DRIVERS_SRC_C += drivers/cyw43/cywbt.c
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
 SRC_C += mpnimbleport.c

From 7268034d56d353e90992f0d688eb4a35ae86e09a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Feb 2025 23:35:07 +1100
Subject: [PATCH 2042/3129] top: Add "ser" to codespell exclusion list.

This word appears in the upcoming alif port.

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

diff --git a/pyproject.toml b/pyproject.toml
index 8053df24dd797..263b120d3fea4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.codespell]
 count = ""
 ignore-regex = '\b[A-Z]{3}\b'
-ignore-words-list = "ans,asend,deques,dout,emac,extint,hsi,iput,mis,notin,numer,shft,synopsys,technic,ure,curren"
+ignore-words-list = "ans,asend,deques,dout,emac,extint,hsi,iput,mis,notin,numer,ser,shft,synopsys,technic,ure,curren"
 quiet-level = 3
 skip = """
 */build*,\

From c5102a7858e9e23aaaa99e70bb0d196bd7e25ba4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Dec 2023 00:11:32 +1100
Subject: [PATCH 2043/3129] lib/alif_ensemble-cmsis-dfp: Add new submodule for
 Alif SDK v1.3.2.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules                 | 3 +++
 lib/alif_ensemble-cmsis-dfp | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/alif_ensemble-cmsis-dfp

diff --git a/.gitmodules b/.gitmodules
index 6338f0e66d63d..7c5a517259269 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,3 +68,6 @@
 [submodule "lib/arduino-lib"]
 	path = lib/arduino-lib
 	url = https://github.com/arduino/arduino-lib-mpy.git
+[submodule "lib/alif_ensemble-cmsis-dfp"]
+	path = lib/alif_ensemble-cmsis-dfp
+	url = https://github.com/alifsemi/alif_ensemble-cmsis-dfp.git
diff --git a/lib/alif_ensemble-cmsis-dfp b/lib/alif_ensemble-cmsis-dfp
new file mode 160000
index 0000000000000..04b3176a0031c
--- /dev/null
+++ b/lib/alif_ensemble-cmsis-dfp
@@ -0,0 +1 @@
+Subproject commit 04b3176a0031c945d4306db00663379e9b431e08

From 1356860e2258cf2ecef43a65f40d83ddcbf98d0b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Mar 2025 16:47:39 +1100
Subject: [PATCH 2044/3129] lib/alif-security-toolkit: Add new submodule for
 Alif Security Toolkit.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules               | 3 +++
 lib/alif-security-toolkit | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/alif-security-toolkit

diff --git a/.gitmodules b/.gitmodules
index 7c5a517259269..02849ec9bdd11 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -71,3 +71,6 @@
 [submodule "lib/alif_ensemble-cmsis-dfp"]
 	path = lib/alif_ensemble-cmsis-dfp
 	url = https://github.com/alifsemi/alif_ensemble-cmsis-dfp.git
+[submodule "lib/alif-security-toolkit"]
+	path = lib/alif-security-toolkit
+	url = https://github.com/micropython/alif-security-toolkit.git
diff --git a/lib/alif-security-toolkit b/lib/alif-security-toolkit
new file mode 160000
index 0000000000000..63698efe8567e
--- /dev/null
+++ b/lib/alif-security-toolkit
@@ -0,0 +1 @@
+Subproject commit 63698efe8567eed115fe620d5e5de75f460310d7

From 092d85557cc901a2840ac4abce3d12eb520c9765 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Dec 2023 00:11:41 +1100
Subject: [PATCH 2045/3129] alif/tinyusb_port: Add Alif TinyUSB DCD driver.

From https://github.com/alifsemi/alif_vscode-tinyusb.git,
commit c79f39361d334ee44f44fed30c56e70dbb368649

Signed-off-by: Damien George <damien.p.george@gmail.com>
Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/tinyusb_port/alif_dcd_reg.h  | 691 ++++++++++++++++++++++++
 ports/alif/tinyusb_port/tusb_alif_dcd.c | 688 +++++++++++++++++++++++
 2 files changed, 1379 insertions(+)
 create mode 100644 ports/alif/tinyusb_port/alif_dcd_reg.h
 create mode 100644 ports/alif/tinyusb_port/tusb_alif_dcd.c

diff --git a/ports/alif/tinyusb_port/alif_dcd_reg.h b/ports/alif/tinyusb_port/alif_dcd_reg.h
new file mode 100644
index 0000000000000..84220f6be4ce4
--- /dev/null
+++ b/ports/alif/tinyusb_port/alif_dcd_reg.h
@@ -0,0 +1,691 @@
+// *FORMAT-OFF*
+///-------------------------------------------------------------------------------------------------
+/// @file    alif_dcd_reg.h
+/// @author  karol.saja@alifsemi.com
+/// @version 0.0.1
+/// @date    2023-09-08
+/// @brief   Low Level SPI driver
+///-------------------------------------------------------------------------------------------------
+
+#ifndef __ALIF_DCD_REG_H__
+#define __ALIF_DCD_REG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+//--------------------------------------------------------------------------------------------------
+
+#define _rw volatile uint32_t
+#define __w volatile uint32_t
+#define __r volatile const uint32_t
+
+volatile struct {
+    union {
+        _rw gsbuscfg0;
+        struct {
+            _rw incrbrstena    : 1;
+            _rw incr4brstena   : 1;
+            _rw incr8brstena   : 1;
+            _rw incr16brstena  : 1;
+            _rw incr32brstena  : 1;
+            _rw incr64brstena  : 1;
+            _rw incr128brstena : 1;
+            _rw incr256brstena : 1;
+            __r : 2;
+            _rw desbigend      : 1;
+            _rw datbigend      : 1;
+            __r : 4;
+            _rw deswrreqinfo   : 4;
+            _rw datwrreqinfo   : 4;
+            _rw desrdreqinfo   : 4;
+            _rw datrdreqinfo   : 4;
+        } gsbuscfg0_b;
+    };
+
+    union {
+        _rw gsbuscfg1;
+        struct {
+            __r : 8;
+            _rw pipetranslimit : 4;
+            _rw en1kpage       : 1;
+            __r : 19;
+        } gsbuscfg1_b;
+    };
+
+    __r : 32; __r : 32;
+
+    union {
+        _rw gctl;
+        struct {
+            _rw dsblclkgtng      : 1;
+            _rw gblhibernationen : 1;
+            __r : 1;
+            _rw disscramble      : 1;
+            _rw scaledown        : 2;
+            _rw ramclksel        : 2;
+            __r : 2;
+            _rw sofitpsync       : 1;
+            _rw coresoftreset    : 1;
+            _rw prtcapdir        : 2;
+            _rw frmscldwn        : 2;
+            __r : 1;
+            _rw bypssetaddr      : 1;
+            __r : 14;
+        } gctl_b;
+    };
+
+    __r : 32;
+
+    union {
+        _rw gsts;
+        struct {
+            __r curmod        : 2;
+            __r : 2;
+            _rw buserraddrvld : 1;
+            _rw csrtimeout    : 1;
+            __r device_ip     : 1;
+            __r host_ip       : 1;
+            __r adp_ip        : 1;
+            __r bc_ip         : 1;
+            __r otg_ip        : 1;
+            __r ssic_ip       : 1;
+            __r : 8;
+            __r cbelt         : 12;
+        } gsts_b;
+    };
+
+    union {
+        _rw guctl1;
+        struct {
+            _rw loa_filter_en             : 1;
+            _rw ovrld_l1_susp_com         : 1;
+            _rw hc_parchk_disable         : 1;
+            _rw hc_errata_enable          : 1;
+            _rw l1_susp_thrld_for_host    : 4;
+            _rw l1_susp_thrld_en_for_host : 1;
+            _rw dev_hs_nyet_bulk_spr      : 1;
+            _rw resume_opmode_hs_host     : 1;
+            __r : 1;
+            _rw disusb2refclkgtng         : 1;
+            __r : 2;
+            _rw parkmode_disable_fsls     : 1;
+            _rw parkmode_disable_hs       : 1;
+            __r : 1;
+            _rw nak_per_enh_hs            : 1;
+            _rw nak_per_enh_fs            : 1;
+            _rw dev_lsp_tail_lock_dis     : 1;
+            _rw ip_gap_add_on             : 2;
+            _rw dev_l1_exit_by_hw         : 1;
+            __r : 2;
+            _rw dev_trb_out_spr_ind       : 1;
+            _rw tx_ipgap_linecheck_dis    : 1;
+            _rw filter_se0_fsls_eop       : 1;
+            __r : 1;
+            _rw dev_decouple_l1l2_evt     : 1;
+        } guctl1_b;
+    };
+
+    union {
+        _rw gsnpsid;
+    };
+
+    __r : 32;
+
+    union {
+        _rw guid;
+        struct {
+            _rw userid : 32;
+        } guid_b;
+    };
+
+    union { // <- host only, leaving unimplemented for now [FIXME]
+        _rw guctl;
+        struct {
+        } guctl_b;
+    };
+
+    union {
+        _rw gbuserraddrlo;
+        struct {
+            _rw buserraddr : 32;
+        } gbuserraddrlo_b;
+    };
+
+    union {
+        _rw gbuserraddrhi;
+        struct {
+            _rw buserraddr : 32;
+        } gbuserraddrhi_b;
+    };
+
+    __r : 32; __r : 32;
+
+    __r ghwparams[8];
+
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32;
+
+    // base + 0x9C here
+
+    union {
+        _rw guctl2;
+        struct {
+            __r : 11;
+            _rw disablecfc         : 1;
+            _rw enableepcacheevict : 1;
+            __r : 1;
+            _rw rst_actbitlater    : 1;
+            __r : 4;
+            _rw en_hp_pm_timer     : 7;
+            __r : 6;
+        } guctl2_b;
+    };
+
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x100 here
+
+    union {
+        _rw gusb2phycfg0;
+        struct {
+            _rw toutcal                  : 3;
+            _rw phyif                    : 1;
+            __r ulpi_utmi_sel            : 1;
+            __r fsintf                   : 1;
+            _rw suspendusb20             : 1;
+            _rw physel                   : 1;
+            _rw enblslpm                 : 1;
+            _rw xcvrdly                  : 1;
+            _rw usbtrdtim                : 4;
+            __r : 5;
+            _rw lsipd                    : 3;
+            _rw lstrd                    : 3;
+            _rw ovrd_fsls_disc_time      : 1;
+            __r inv_sel_hsic             : 1;
+            __r hsic_con_width_adj       : 2;
+            _rw ulpi_lpm_with_opmode_chk : 1;
+            _rw u2_freeclk_exists        : 1;
+            _rw physoftrst               : 1;
+        } gusb2phycfg0_b;
+    };
+
+    __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x200 here
+
+    union {
+        _rw gtxfifosiz[4];
+        struct {
+            _rw txfdep : 16;
+            _rw txfstaddr : 16;
+        } gtxfifosiz_b[4];
+    };
+
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x280 here
+
+    union {
+        _rw grxfifosiz[4];
+        struct {
+            _rw rxfdep : 16;
+            _rw rxfstaddr : 16;
+        } grxfifosiz_b[4];
+    };
+
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x300 here
+
+    union {
+        _rw gevntadrlo0;
+        struct {
+            _rw evntadrlo : 32;
+        } gevntadrlo0_b;
+    };
+
+    union {
+        _rw gevntadrhi0;
+        struct {
+            _rw evntadrhi : 32;
+        } gevntadrhi0_b;
+    };
+
+    union {
+        _rw gevntsiz0;
+        struct {
+            _rw eventsiz : 16;
+            __r : 15;
+            _rw evntintrptmask : 1;
+        } gevntsiz0_b;
+    };
+
+    union {
+        _rw gevntcount0;
+        struct {
+            _rw evntcount : 16;
+            __r : 15;
+            _rw evnt_handler_busy : 1;
+        } gevntcount0_b;
+    };
+
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x500 here
+
+    __r ghwparams8;
+
+    __r : 32; __r : 32; __r : 32;
+
+    // base + 0x510 here
+
+    union {
+        _rw gtxfifopridev;
+        struct {
+            _rw gtxfifopridev : 4;
+            __r : 28;
+        } gtxfifopridev_b;
+    };
+
+    __r : 32;
+
+    union {
+        _rw gtxfifoprihst;
+        struct {
+            _rw gtxfifoprihst : 2;
+            __r : 30;
+        } gtxfifoprihst_b;
+    };
+
+    union {
+        _rw grxfifoprihst;
+        struct {
+            _rw grxfifoprihst : 2;
+            __r : 30;
+        } grxfifoprihst_b;
+    };
+
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x530 here
+
+    union {
+        _rw gfladj;
+        struct {
+            _rw gfladj_30mhz : 6;
+            __r : 1;
+            _rw gfladj_30mhz_sdbnd_sel : 1;
+            _rw gfladj_refclk_fladj : 14;
+            __r : 1;
+            _rw gfladj_refclk_lpm_sel : 1;
+            _rw gfladj_refclk_240mhz_decr : 7;
+            _rw gfladj_refclk_240mhzdecr_pls1 : 1;
+        } gfladj_b;
+    };
+
+    __r : 32; __r : 32; __r : 32;
+
+    // base + 0x540 here
+
+    union {
+        _rw gusb2rhbctl0;
+        struct {
+            _rw ovrd_l1timeout : 4;
+            __r : 28;
+        } gusb2rhbctl0_b;
+    };
+
+} *ugbl = (void *) (USB_BASE + 0xC100);
+
+volatile struct {
+    union {
+        _rw dcfg;
+        struct {
+            _rw devspd : 3;
+            _rw devaddr : 7;
+            __r : 2;
+            _rw intrnum : 5;
+            _rw nump : 5;
+            _rw lpmcap : 1;
+            _rw ignstrmpp : 1;
+            __r : 8;
+        } dcfg_b;
+    };
+
+    union {
+        _rw dctl;
+        struct {
+            __r : 1;
+            _rw tstctl : 4;
+            __w ulstchngreq : 4;
+            __r : 7;
+            _rw css : 1;
+            _rw crs : 1;
+            _rw l1hibernationen : 1;
+            _rw keepconnect : 1;
+            _rw lpm_nyet_thres : 4;
+            _rw hirdthres : 5;
+            __r : 1;
+            _rw csftrst : 1;
+            _rw run_stop : 1;
+        } dctl_b;
+    };
+
+    union {
+        _rw devten;
+        struct {
+            _rw dissconnevten : 1;
+            _rw usbrstevten : 1;
+            _rw connectdoneevten : 1;
+            _rw ulstcngen : 1;
+            _rw wkupevten : 1;
+            _rw hibernationreqevten : 1;
+            _rw u3l2l1suspen : 1;
+            _rw softevten : 1;
+            _rw l1suspen : 1;
+            _rw errticerrevten : 1;
+            __r : 2;
+            _rw vendevtstrcvden : 1;
+            __r : 1;
+            _rw l1wkupevten : 1;
+            __r : 1;
+            _rw eccerren : 1;
+            __r : 15;
+        } devten_b;
+    };
+
+    union {
+        _rw dsts;
+        struct {
+            __r connectspd : 3;
+            __r soffn : 14;
+            __r rxfifoempty : 1;
+            __r usblnkst : 4;
+            __r devctrlhlt : 1;
+            __r coreidle : 1;
+            __r sss : 1;
+            __r rss : 1;
+            __r : 2;
+            _rw sre : 1;
+            __r dcnrd : 1;
+            __r : 2;
+        } dsts_b;
+    };
+
+    union {
+        _rw dgcmdpar;
+        struct {
+            _rw parameter : 32;
+        } dgcmdpar_b;
+    };
+
+    union {
+        _rw dgcmd;
+        struct {
+            _rw cmdtyp : 8;
+            _rw cmdioc : 1;
+            __r : 1;
+            _rw cmdact : 1;
+            __r : 1;
+            __r cmdstatus : 4;
+            __r : 16;
+        } dgcmd_b;
+    };
+
+    __r : 32; __r : 32;
+
+    union {
+        _rw dalepena;
+        struct {
+            _rw usbactep : 32;
+        } dalepena_b;
+    };
+
+    __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x100 here
+
+    struct {
+        union {
+            _rw par2;
+            struct {
+                _rw parameter : 32;
+            } par2_b;
+        };
+
+        union {
+            _rw par1;
+            struct {
+                _rw parameter : 32;
+            } par1_b;
+        };
+
+        union {
+            _rw par0;
+            struct {
+                _rw parameter : 32;
+            } par0_b;
+        };
+
+        union {
+            _rw depcmd;
+            struct {
+                _rw cmdtyp : 4;
+                __r : 4;
+                _rw cmdioc : 1;
+                __r : 1;
+                _rw cmdact : 1;
+                _rw hipri_forcerm : 1;
+                _rw cmdstatus : 4;
+                _rw commandparam : 16;
+            } depcmd_b;
+        };
+    } depcmd[8];
+
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+    __r : 32; __r : 32; __r : 32; __r : 32;
+
+    // base + 0x300 here
+
+    union {
+        _rw dev_imod0;
+        struct {
+            _rw device_imodi : 16;
+            _rw device_imocd : 16;
+        } dev_imod0_b;
+    };
+} *udev = (void *) (USB_BASE + 0xC700);
+
+//--------------------------------------------------------------------------------------------------
+
+typedef union {
+    _rw val : 32;
+    struct {
+        _rw sig  : 8;
+        _rw evt  : 5;
+        __r : 3;
+        _rw info : 9;
+        __r : 7;
+    } devt;
+    struct {
+        _rw sig : 1;
+        _rw ep  : 5;
+        _rw evt : 4;
+        __r : 2;
+        _rw sts : 4;
+        _rw par : 16;
+    } depevt;
+} evt_t;
+
+//--------------------------------------------------------------------------------------------------
+
+enum {
+    CMDTYP_RESERVED = 0,
+    CMDTYP_DEPCFG,
+    CMDTYP_DEPXFERCFG,
+    CMDTYP_DEPGETSTATE,
+    CMDTYP_DEPSSTALL,
+    CMDTYP_DEPCSTALL,
+    CMDTYP_DEPSTRTXFER,
+    CMDTYP_DEPUPDXFER,
+    CMDTYP_DEPENDXFER,
+    CMDTYP_DEPSTARTCFG
+} DEPCMD_CMDTYP;
+
+enum {
+    DEVT_DISCONNEVT = 0,
+    DEVT_USBRST,
+    DEVT_CONNECTDONE,
+    DEVT_ULSTCHNG,
+    DEVT_WKUPEVT,
+    // DEVT_HIBRQ not implemented
+    DEVT_USBSUSP = 6,
+    DEVT_SOF,
+    DEVT_L1SUSP,
+    DEVT_ERRTICERR,
+    DEVT_CMDCMPLT,
+    DEVT_EVNTOVERFLOW,
+    DEVT_VNDDEVTSTRCVED,
+    // reserved
+    DEVT_L1RESM = 14,
+    // reserved
+    DEVT_ECCERR = 16
+} DEVT;
+
+enum {
+    // reserved
+    DEPEVT_XFERCOMPLETE = 1,
+    DEPEVT_XFERINPROGRESS,
+    DEPEVT_XFERNOTREADY,
+    // not implemented
+    DEPEVT_STREAMEVT = 6,
+    DEPEVT_EPCMDCMPLT
+} DEPEVT;
+
+enum {
+    // reserved
+    TRBCTL_NORMAL = 1,
+    TRBCTL_CTL_SETUP,
+    TRBCTL_CTL_STAT2,
+    TRBCTL_CTL_STAT3,
+    TRBCTL_CTL_DATA,
+    TRBCTL_ISO_FIRST,
+    TRBCTL_ISO,
+    TRBCTL_LINK,
+    TRBCTL_NORMAL_ZLP
+} TRBCTL;
+
+//--------------------------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------------------------
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+
+#endif // __ALIF_DCD_REG_H__
diff --git a/ports/alif/tinyusb_port/tusb_alif_dcd.c b/ports/alif/tinyusb_port/tusb_alif_dcd.c
new file mode 100644
index 0000000000000..510f0e9c13a9b
--- /dev/null
+++ b/ports/alif/tinyusb_port/tusb_alif_dcd.c
@@ -0,0 +1,688 @@
+// *FORMAT-OFF*
+/* Copyright (C) 2024 Alif Semiconductor - All Rights Reserved.
+ * Use, distribution and modification of this code is permitted under the
+ * terms stated in the Alif Semiconductor Software License Agreement
+ *
+ * You should have received a copy of the Alif Semiconductor Software
+ * License Agreement with this file. If not, please write to:
+ * contact@alifsemi.com, or visit: https://alifsemi.com/license
+ *
+ */
+
+#include "tusb_option.h"
+
+#if CFG_TUD_ENABLED
+
+#if defined(CORE_M55_HE)
+#include "M55_HE.h"
+#elif defined(CORE_M55_HP)
+#include "M55_HP.h"
+#else
+#error "Unsupported core!"
+#endif
+
+#include "device/dcd.h"
+
+#include "alif_dcd_reg.h"
+
+#include "clk.h"
+#include "power.h"
+
+// #define TUSB_ALIF_DEBUG
+// #define TUSB_ALIF_DEBUG_DEPTH (2048)
+
+#if defined(TUSB_ALIF_DEBUG)
+#if (1 < TUSB_ALIF_DEBUG_DEPTH)
+#define LOG(...)      memset(logbuf[bi % TUSB_ALIF_DEBUG_DEPTH], ' ', 48);\
+                          snprintf(logbuf[(bi++) % TUSB_ALIF_DEBUG_DEPTH], 48, __VA_ARGS__);
+char logbuf[TUSB_ALIF_DEBUG_DEPTH][48];
+int bi = 0;
+#else
+#define LOG(...)      memset(logbuf, ' ', 48);\
+                          snprintf(logbuf, 48, __VA_ARGS__)
+char logbuf[48];
+#endif
+#else
+#define LOG(...)
+#endif
+
+/// Structs and Buffers --------------------------------------------------------
+
+static uint32_t  _evnt_buf[1024] CFG_TUSB_MEM_SECTION __attribute__((aligned(4096))); // [TODO] runtime alloc
+static volatile uint32_t* _evnt_tail;
+
+static uint8_t  _ctrl_buf[64] CFG_TUSB_MEM_SECTION __attribute__((aligned(32))); // [TODO] runtime alloc
+static uint32_t _xfer_trb[8][4] CFG_TUSB_MEM_SECTION __attribute__((aligned(32))); // [TODO] runtime alloc
+static uint16_t _xfer_bytes[8];
+static bool     _ctrl_long_data = false;
+static bool     _xfer_cfgd = false;
+// static bool     _addr_req = false;
+static uint32_t _sts_stage = 0;
+
+/// Private Functions ----------------------------------------------------------
+
+static uint8_t _dcd_cmd_wait(uint8_t ep, uint8_t typ, uint16_t param);
+static uint8_t _dcd_start_xfer(uint8_t ep, void* buf, uint32_t size, uint8_t type);
+
+static void _dcd_handle_depevt(uint8_t ep, uint8_t evt, uint8_t sts, uint16_t par);
+static void _dcd_handle_devt(uint8_t evt, uint16_t info);
+
+/// API Extension --------------------------------------------------------------
+
+void dcd_uninit(void);
+
+/// Device Setup ---------------------------------------------------------------
+
+// Initializes the USB peripheral for device mode and enables it.
+// This function should enable internal D+/D- pull-up for enumeration.
+void dcd_init(uint8_t rhport)
+{
+    // enable 20mhz clock
+    enable_cgu_clk20m();
+    // enable usb peripheral clock
+    enable_usb_periph_clk();
+    // power up usb phy
+    enable_usb_phy_power();
+    // disable usb phy isolation
+    disable_usb_phy_isolation();
+    // clear usb phy power-on-reset signal
+    CLKCTL_PER_MST->USB_CTRL2 &= ~(1 << 8);
+
+    // force stop/disconnect
+    udev->dctl_b.run_stop = 0;
+
+    // dctl set csftrst to 1 and wait for 0
+    udev->dctl_b.csftrst = 1;
+    while(0 != udev->dctl_b.csftrst);
+
+    sys_busy_loop_us(50000);
+    ugbl->gctl_b.coresoftreset = 1;
+    ugbl->gusb2phycfg0_b.physoftrst = 1;
+    sys_busy_loop_us(50000);
+    ugbl->gusb2phycfg0_b.physoftrst = 0;
+    sys_busy_loop_us(50000);
+    ugbl->gctl_b.coresoftreset = 0;
+    sys_busy_loop_us(50000);
+
+    ugbl->gsbuscfg0 = 0x00000009;
+    // ugbl->gusb2phycfg0 = 0x4000154F; // [TODO] document as bits
+    uint32_t reg = ugbl->gusb2phycfg0;
+    reg &= ~((1 << 3) | (1 << 4) | (0xF << 10)); // clear phyif, ulpi_utmi_sel and usbtrdtim
+    reg |= ((1 << 3) | (5 << 10));
+    ugbl->gusb2phycfg0 = reg;
+
+    // set device speed (USBHS only)
+    udev->dcfg_b.devspd = 0x0; // HS, this will need #if condition [TODO]
+
+    // allocate ring buffer for events
+    memset(_evnt_buf, 0, sizeof(_evnt_buf));
+    RTSS_CleanDCache_by_Addr(_evnt_buf, sizeof(_evnt_buf));
+    _evnt_tail = _evnt_buf;
+    ugbl->gevntadrlo0 = (uint32_t) LocalToGlobal(_evnt_buf);
+    ugbl->gevntsiz0_b.eventsiz = (uint32_t) sizeof(_evnt_buf);
+    ugbl->gevntcount0_b.evntcount = 0;
+
+    // write devten to enable usb reset, conn done, link state change...
+    udev->devten_b.dissconnevten = 1;
+    udev->devten_b.usbrstevten = 1;
+    udev->devten_b.connectdoneevten = 1;
+    udev->devten_b.ulstcngen = 1;
+
+    // begin endpoint setup
+    _dcd_cmd_wait(0, CMDTYP_DEPSTARTCFG, 0);
+
+    // configure CONTROL IN and OUT eps
+    udev->depcmd[0].par1 = (0 << 25) | (1 << 10) | (1 << 8);
+    udev->depcmd[0].par0 = (0 << 22) | (0 << 17) | (512 << 3) | (0 << 1);
+    _dcd_cmd_wait(0, CMDTYP_DEPCFG, 0);
+
+    udev->depcmd[1].par1 = (1 << 25) | (1 << 10) | (1 << 8);
+    udev->depcmd[1].par0 = (0 << 22) | (0 << 17) | (512 << 3) | (0 << 1);
+    _dcd_cmd_wait(1, CMDTYP_DEPCFG, 0);
+
+    // set initial xfer configuration for CONTROL eps
+    udev->depcmd[0].par0 = 1;
+    _dcd_cmd_wait(0, CMDTYP_DEPXFERCFG, 0);
+
+    udev->depcmd[1].par0 = 1;
+    _dcd_cmd_wait(1, CMDTYP_DEPXFERCFG, 0);
+
+    // enable pull-ups
+    dcd_connect(rhport);
+
+    // prepare trb for the first setup packet
+    memset(_ctrl_buf, 0, sizeof(_ctrl_buf));
+    _xfer_trb[0][0] = (uint32_t) LocalToGlobal(_ctrl_buf);
+    _xfer_trb[0][1] = 0;
+    _xfer_trb[0][2] = 8;
+    _xfer_trb[0][3] = (1 << 11) | (1 << 10) | (TRBCTL_CTL_SETUP << 4) | (1 << 1) | (1 << 0);
+    RTSS_CleanDCache_by_Addr(_xfer_trb[0], sizeof(_xfer_trb[0]));
+
+    // send trb to the usb dma
+    udev->depcmd[0].par1 = (uint32_t) LocalToGlobal(_xfer_trb[0]);
+    udev->depcmd[0].par0 = 0;
+    _dcd_cmd_wait(0, CMDTYP_DEPSTRTXFER, 0);
+
+    // enable ep event interrupts for CONTROL OUT and IN
+    udev->dalepena_b.usbactep = (1 << 1) | (1 << 0);
+
+    // enable interrupts in the NVIC
+#if !defined(TUSB_ALIF_NO_IRQ_CFG)
+    NVIC_ClearPendingIRQ(USB_IRQ_IRQn);
+    NVIC_SetPriority(USB_IRQ_IRQn, 5);
+#endif
+    dcd_int_enable(rhport);
+}
+
+
+// Processes all the hardware generated events e.g bus reset, new data packet
+// from host... It will be called by application in the MCU USB interrupt handler.
+void dcd_int_handler(uint8_t rhport)
+{
+    LOG("%010u IRQ enter, evntcount %u", DWT->CYCCNT, ugbl->gevntcount0_b.evntcount);
+
+    // process failures first
+    if (ugbl->gsts_b.device_ip) {
+        if (ugbl->gsts_b.csrtimeout || ugbl->gsts_b.buserraddrvld) {
+            // buserraddrvld is usually set when USB tries to write to protected
+            // memory region. Check linker script to ensure USB event buffer and
+            // TRBs reside in bulk memory or other NS-allowed region
+            __BKPT(0);
+        }
+    }
+
+    // cycle through event queue
+    // evaluate on every iteration to prevent unnecessary isr exit/reentry
+    while (0 < ugbl->gevntcount0_b.evntcount) {
+        RTSS_InvalidateDCache_by_Addr(_evnt_buf, sizeof(_evnt_buf));
+        volatile evt_t e = {.val = *_evnt_tail++};
+
+        LOG("%010u IRQ loop, evntcount %u evnt %08x", DWT->CYCCNT,
+            ugbl->gevntcount0_b.evntcount, e.val);
+
+        // wrap around
+        if (_evnt_tail >= (_evnt_buf + 1024)) _evnt_tail = _evnt_buf;
+
+        // dispatch the right handler for the event type
+        if (0 == e.depevt.sig) { // DEPEVT
+            _dcd_handle_depevt(e.depevt.ep, e.depevt.evt, e.depevt.sts, e.depevt.par);
+        } else if (1 == e.devt.sig) { // DEVT
+            _dcd_handle_devt(e.devt.evt, e.devt.info);
+        } else {
+            // bad event??
+            LOG("Unknown event %u", e.val);
+            __BKPT(0);
+        }
+
+        // consume one event
+        ugbl->gevntcount0 = 4;
+    }
+
+    LOG("%010u IRQ exit, evntcount %u", DWT->CYCCNT, ugbl->gevntcount0_b.evntcount);
+}
+
+
+// Enables the USB device interrupt.
+// May be used to prevent concurrency issues when mutating data structures
+// shared between main code and the interrupt handler.
+void dcd_int_enable (uint8_t rhport)
+{
+    NVIC_EnableIRQ(USB_IRQ_IRQn);
+
+    (void) rhport;
+}
+
+// Disables the USB device interrupt.
+// May be used to prevent concurrency issues when mutating data structures
+// shared between main code and the interrupt handler.
+void dcd_int_disable(uint8_t rhport)
+{
+    NVIC_DisableIRQ(USB_IRQ_IRQn);
+
+    (void) rhport;
+}
+
+// Receive Set Address request, mcu port must also include status IN response.
+// If your peripheral automatically changes address during enumeration you may
+// leave this empty and also no queue an event for the corresponding SETUP packet.
+void dcd_set_address(uint8_t rhport, uint8_t dev_addr)
+{
+    LOG("%010u >%s", DWT->CYCCNT, __func__);
+
+    udev->dcfg_b.devaddr = dev_addr;
+    dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_IN), NULL, 0);
+}
+
+// Called to remote wake up host when suspended (e.g hid keyboard)
+void dcd_remote_wakeup(uint8_t rhport)
+{
+    LOG("%010u >%s", DWT->CYCCNT, __func__);
+}
+
+// Connect by enabling internal pull-up resistor on D+/D-
+void dcd_connect(uint8_t rhport)
+{
+    udev->dctl_b.run_stop = 1;
+
+    (void) rhport;
+}
+
+// Disconnect by disabling internal pull-up resistor on D+/D-
+void dcd_disconnect(uint8_t rhport)
+{
+    // [TODO] clear all xfers and eps first
+
+    udev->dctl_b.run_stop = 0;
+
+    (void) rhport;
+}
+
+// Enable/Disable Start-of-frame interrupt. Default is disabled
+void dcd_sof_enable(uint8_t rhport, bool en)
+{
+    LOG("%010u >%s", DWT->CYCCNT, __func__);
+}
+
+
+/// Endpoint Management --------------------------------------------------------
+
+// Invoked when a control transfer's status stage is complete.
+// May help DCD to prepare for next control transfer, this API is optional.
+void dcd_edpt0_status_complete(uint8_t rhport, tusb_control_request_t const * request)
+{
+    LOG("%010u >%s", DWT->CYCCNT, __func__);
+
+    _ctrl_long_data = false;
+    _dcd_start_xfer(TUSB_DIR_OUT, _ctrl_buf, 8, TRBCTL_CTL_SETUP);
+}
+
+// Opening an endpoint is done for all non-control endpoints once the host picks
+// a configuration that the device should use.
+// At this point, the endpoint should be enabled in the peripheral and
+// configured to match the endpoint descriptor.
+// Pay special attention to the direction of the endpoint you can get from the
+// helper methods above. It will likely change what registers you are setting.
+// Also make sure to enable endpoint specific interrupts.
+bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * desc_ep)
+{
+    LOG("%010u >%s %u %s %u %u", DWT->CYCCNT, __func__, desc_ep->bEndpointAddress,
+        desc_ep->bmAttributes.xfer == TUSB_XFER_BULK ? "bulk" : "int",
+        desc_ep->wMaxPacketSize, desc_ep->bInterval);
+
+    if (TUSB_XFER_ISOCHRONOUS == desc_ep->bmAttributes.xfer)
+        return false;
+
+    uint8_t ep = (tu_edpt_number(desc_ep->bEndpointAddress) << 1) |
+                 tu_edpt_dir(desc_ep->bEndpointAddress);
+
+    // [TODO] verify that the num doesn't exceed hw max
+
+    if (false == _xfer_cfgd) {
+        _dcd_cmd_wait(0, CMDTYP_DEPSTARTCFG, 2);
+        _xfer_cfgd = true;
+    }
+
+    uint8_t fifo_num = TUSB_DIR_IN == tu_edpt_dir(desc_ep->bEndpointAddress) ?
+                       tu_edpt_number(desc_ep->bEndpointAddress) : 0;
+    uint8_t interval = 0 < desc_ep->bInterval ? (desc_ep->bInterval - 1) : 0;
+
+    udev->depcmd[ep].par1 = (ep << 25) | (interval << 16) |
+                            (1 << 10) | (1 << 8);
+    udev->depcmd[ep].par0 = (0 << 30) | (0 << 22) | (fifo_num << 17) |
+                            ((desc_ep->wMaxPacketSize & 0x7FF) << 3) |
+                            (desc_ep->bmAttributes.xfer << 1);
+
+    _dcd_cmd_wait(ep, CMDTYP_DEPCFG, 0);
+    udev->depcmd[ep].par0 = 1;
+    _dcd_cmd_wait(ep, CMDTYP_DEPXFERCFG, 0);
+
+    udev->dalepena_b.usbactep |= (1 << ep);
+
+    return true;
+}
+
+// Close all non-control endpoints, cancel all pending transfers if any.
+// Invoked when switching from a non-zero Configuration by SET_CONFIGURE therefore
+// required for multiple configuration support.
+void dcd_edpt_close_all(uint8_t rhport)
+{
+    LOG("%010u >%s", DWT->CYCCNT, __func__);
+}
+
+// Close an endpoint. his function is used for implementing alternate settings.
+// After calling this, the device should not respond to any packets directed
+// towards this endpoint. When called, this function must abort any transfers in
+// progress through this endpoint, before returning.
+// Implementation is optional. Must be called from the USB task.
+// Interrupts could be disabled or enabled during the call.
+void dcd_edpt_close(uint8_t rhport, uint8_t ep_addr) TU_ATTR_WEAK;
+
+// Submit a transfer, When complete dcd_event_xfer_complete() is invoked to
+// notify the stack
+bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes)
+{
+    // DEPSTRTXFER command
+    LOG("%010u >%s %u %x %u", DWT->CYCCNT, __func__, ep_addr, (uint32_t) buffer, total_bytes);
+
+    uint8_t ep = (tu_edpt_number(ep_addr) << 1) | tu_edpt_dir(ep_addr);
+
+    switch (ep) {
+        case 0: { // CONTROL OUT
+            if (0 < total_bytes) {
+                // DATA OUT request
+                _xfer_bytes[0] = total_bytes;
+                _dcd_start_xfer(0, buffer, total_bytes, TRBCTL_CTL_STAT3);
+            } else {
+                // TinyUSB explicitly requests STATUS OUT fetch after DATA IN
+                if (2 == ++_sts_stage) {
+                    _sts_stage = 0;
+                    dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(0, TUSB_DIR_OUT),
+                                            0, XFER_RESULT_SUCCESS, true);
+                }
+            }
+        } break;
+        case 1: { // CONTROL IN
+            _xfer_bytes[1] = total_bytes;
+
+            if (0 < total_bytes) {
+                RTSS_CleanDCache_by_Addr(buffer, total_bytes);
+                uint8_t type = _ctrl_long_data ? TRBCTL_NORMAL : TRBCTL_CTL_DATA;
+                if (64 == total_bytes) {
+                    _ctrl_long_data = true;
+                }
+                _dcd_start_xfer(1, buffer, total_bytes, type);
+            } else {
+                // status events are handled directly from the ISR when USB
+                // controller triggers XferNotReady event for status stage
+
+                if (2 == ++_sts_stage) {
+                    _sts_stage = 0;
+                    dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(0, TUSB_DIR_IN),
+                                            0, XFER_RESULT_SUCCESS, true);
+                }
+                // dcd_event_xfer_complete(rhport, tu_edpt_addr(0, TUSB_DIR_IN),
+                //                         0, XFER_RESULT_SUCCESS, false);
+            }
+        } break;
+        default: { // DATA EPs (BULK & INTERRUPT only)
+            _xfer_bytes[ep] = total_bytes;
+            if (TUSB_DIR_IN == tu_edpt_dir(ep_addr)) {
+                RTSS_CleanDCache_by_Addr(buffer, total_bytes);
+            } else {
+                total_bytes = 512; // temporary hack, controller requires max
+                                   // size requests on OUT endpoints [FIXME]
+            }
+            uint8_t ret = _dcd_start_xfer(ep, buffer, total_bytes,
+                            total_bytes ? TRBCTL_NORMAL : TRBCTL_NORMAL_ZLP);
+            LOG("start xfer sts %u", ret);
+        }
+    }
+
+    return true;
+}
+
+// Submit a transfer using fifo, When complete dcd_event_xfer_complete() is invoked to notify the stack
+// This API is optional, may be useful for register-based for transferring data.
+bool dcd_edpt_xfer_fifo(uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16_t total_bytes) TU_ATTR_WEAK;
+
+// Stall endpoint, any queuing transfer should be removed from endpoint
+void dcd_edpt_stall(uint8_t rhport, uint8_t ep_addr)
+{
+    // DEPSSTALL command
+    LOG(">%s", __func__);
+
+    uint8_t ep = (tu_edpt_number(ep_addr) << 1) | tu_edpt_dir(ep_addr);
+
+    _dcd_cmd_wait(ep, CMDTYP_DEPSSTALL, 0);
+
+    if (0 == tu_edpt_number(ep_addr)) {
+        _ctrl_long_data = false;
+        _dcd_start_xfer(TUSB_DIR_OUT, _ctrl_buf, 8, TRBCTL_CTL_SETUP);
+    }
+}
+
+// clear stall, data toggle is also reset to DATA0
+// This API never calls with control endpoints, since it is auto cleared when
+// receiving setup packet
+void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)
+{
+    // DEPCSTALL command
+    LOG(">%s", __func__);
+
+    uint8_t ep = (tu_edpt_number(ep_addr) << 1) | tu_edpt_dir(ep_addr);
+
+    _dcd_cmd_wait(ep, CMDTYP_DEPCSTALL, 0);
+}
+
+void dcd_uninit(void)
+{
+    CLKCTL_PER_MST->USB_CTRL2 |= 1 << 8; // set usb phy power-on-reset signal
+    enable_usb_phy_isolation(); // enable usb phy isolation
+    disable_usb_phy_power(); // power down usb phy
+    disable_usb_periph_clk(); // disable usb peripheral clock
+}
+
+void USB_IRQHandler(void)
+{
+    dcd_int_handler(TUD_OPT_RHPORT);
+}
+
+
+static uint8_t _dcd_cmd_wait(uint8_t ep, uint8_t typ, uint16_t param)
+{
+    // capture phy state and disable lpm and suspend
+    uint32_t phycfg = ugbl->gusb2phycfg0;
+    ugbl->gusb2phycfg0_b.enblslpm = 0;
+    ugbl->gusb2phycfg0_b.suspendusb20 = 0;
+
+    // set up command in depcmd register
+    udev->depcmd[ep].depcmd_b.cmdtyp = typ;
+    udev->depcmd[ep].depcmd_b.cmdioc = 0;
+    udev->depcmd[ep].depcmd_b.commandparam = param;
+
+    // dispatch command and wait for completion
+    udev->depcmd[ep].depcmd_b.cmdact = 1;
+    while(0 != udev->depcmd[ep].depcmd_b.cmdact);
+
+    // restore phy state
+    ugbl->gusb2phycfg0 = phycfg;
+
+    return udev->depcmd[ep].depcmd_b.cmdstatus;
+}
+
+
+static void _dcd_handle_depevt(uint8_t ep, uint8_t evt, uint8_t sts, uint16_t par)
+{
+    LOG("%010u DEPEVT ep%u evt%u sts%u par%u", DWT->CYCCNT, ep, evt, sts, par);
+
+    switch (evt) {
+        case DEPEVT_XFERCOMPLETE: {
+            LOG("Transfer complete");
+            RTSS_InvalidateDCache_by_Addr(_xfer_trb[ep], sizeof(_xfer_trb[0]));
+            if (0 == ep) {
+                uint8_t trbctl = (_xfer_trb[0][3] >> 4) & 0x3F;
+                LOG("ep0 xfer trb3 = %08x", _xfer_trb[0][3]);
+                if (TRBCTL_CTL_SETUP == trbctl) {
+                    RTSS_InvalidateDCache_by_Addr(_ctrl_buf, sizeof(_ctrl_buf));
+                    LOG("%02x %02x %02x %02x %02x %02x %02x %02x",
+                        _ctrl_buf[0], _ctrl_buf[1], _ctrl_buf[2], _ctrl_buf[3],
+                        _ctrl_buf[4], _ctrl_buf[5], _ctrl_buf[6], _ctrl_buf[7]);
+                    dcd_event_setup_received(TUD_OPT_RHPORT, _ctrl_buf, true);
+                } else if (TRBCTL_CTL_STAT3 == trbctl) {
+                    if (0 < _xfer_bytes[0]) {
+                        RTSS_InvalidateDCache_by_Addr((void*) _xfer_trb[0][0], _xfer_bytes[0]);
+                        dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(0, TUSB_DIR_OUT),
+                                                _xfer_bytes[0] - (_xfer_trb[0][2] & 0xFFFFFF),
+                                                XFER_RESULT_SUCCESS, true);
+                    } else {
+                        if (2 == ++_sts_stage) {
+                            _sts_stage = 0;
+                            dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(0, TUSB_DIR_OUT),
+                                                    0, XFER_RESULT_SUCCESS, true);
+
+                            // *(volatile uint32_t*) 0x4900C000 ^= 8; // [TEMP]
+                        }
+                    }
+                } else {
+                    // invalid TRBCTL value
+                    __BKPT(0);
+                }
+            } else if (1 == ep) {
+                uint8_t trbctl = (_xfer_trb[1][3] >> 4) & 0x3F;
+                LOG("ep1 xfer trb3 = %08x trb2 = %08x", _xfer_trb[1][3], _xfer_trb[1][2]);
+                if (TRBCTL_CTL_STAT2 != trbctl) { // STATUS IN notification is done at xfer request
+                    dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(0, TUSB_DIR_IN),
+                                            _xfer_bytes[1] - (_xfer_trb[1][2] & 0xFFFFFF),
+                                            XFER_RESULT_SUCCESS, true);
+                } else {
+                    if (2 == ++_sts_stage) {
+                        _sts_stage = 0;
+                        dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(0, TUSB_DIR_IN),
+                                                0, XFER_RESULT_SUCCESS, true);
+
+                        // *(volatile uint32_t*) 0x4900C000 ^= 8; // [TEMP]
+                    }
+                }
+            } else {
+                // [TODO] check if ep is open
+                LOG("ep%u xfer trb3 = %08x trb2 = %08x", ep, _xfer_trb[ep][3], _xfer_trb[ep][2]);
+                if (TUSB_DIR_OUT == tu_edpt_dir(tu_edpt_addr(ep >> 1, ep & 1))) {
+                    RTSS_InvalidateDCache_by_Addr((void*) _xfer_trb[ep][0],
+                                                  512 - _xfer_trb[ep][2]);
+                                                //   _xfer_bytes[ep] - _xfer_trb[ep][2]);
+                dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(ep >> 1, ep & 1),
+                                        512 - _xfer_trb[ep][2],
+                                        XFER_RESULT_SUCCESS, true);
+                } else
+                dcd_event_xfer_complete(TUD_OPT_RHPORT, tu_edpt_addr(ep >> 1, ep & 1),
+                                        _xfer_bytes[ep] - _xfer_trb[ep][2],
+                                        XFER_RESULT_SUCCESS, true);
+            }
+        } break;
+        case DEPEVT_XFERINPROGRESS: {
+            LOG("Transfer in progress");
+        } break;
+        case DEPEVT_XFERNOTREADY: {
+            LOG("Transfer not ready: %s", sts & 8 ? "no TRB" : "no XFER");
+
+            // XferNotReady NotActive for status stage
+            if ((1 == ep) && (0b0010 == (sts & 0b1011))) {
+                _dcd_start_xfer(1, NULL, 0, TRBCTL_CTL_STAT2);
+                break;
+            }
+
+            if ((0 == ep) && (0b0010 == (sts & 0b1011))) {
+                _xfer_bytes[0] = 0;
+                _dcd_start_xfer(0, _ctrl_buf, 64, TRBCTL_CTL_STAT3);
+                break;
+            }
+
+            if ((1 > ep) && (sts & (1 << 3))) {
+                if (_xfer_trb[ep][3] & (1 << 0)) { // transfer was configured
+                    // dependxfer can only block when actbitlater is set
+                    ugbl->guctl2_b.rst_actbitlater = 1;
+                    _dcd_cmd_wait(ep, CMDTYP_DEPENDXFER, 0);
+                    ugbl->guctl2_b.rst_actbitlater = 0;
+
+                    // reset the trb byte count and clean the cache
+                    RTSS_InvalidateDCache_by_Addr(_xfer_trb[ep], sizeof(_xfer_trb[0]));
+                    _xfer_trb[ep][2] = _xfer_bytes[ep];
+                    RTSS_CleanDCache_by_Addr(_xfer_trb[ep], sizeof(_xfer_trb[ep]));
+
+                    // prepare ep command
+                    udev->depcmd[ep].par1 = (uint32_t) LocalToGlobal(_xfer_trb[ep]);
+                    udev->depcmd[ep].par0 = 0;
+
+                    // issue the block command and pass the status
+                    _dcd_cmd_wait(ep, CMDTYP_DEPSTRTXFER, 0);
+
+                    *(volatile uint32_t*) 0x49007000 ^= 16; // [TEMP]
+                }
+            }
+        } break;
+        case DEPEVT_EPCMDCMPLT: {
+            // redundant, currently no commands are issued with IOC bit set
+        } break;
+    }
+}
+
+
+static void _dcd_handle_devt(uint8_t evt, uint16_t info)
+{
+    LOG("%010u DEVT evt%u info%u", DWT->CYCCNT, evt, info);
+    switch (evt) {
+        case DEVT_USBRST: {
+            _xfer_cfgd = false;
+
+            // [TODO] issue depcstall for any ep in stall mode
+            udev->dcfg_b.devaddr = 0;
+            LOG("USB reset");
+            dcd_event_bus_reset(TUD_OPT_RHPORT, TUSB_SPEED_HIGH, true); // [TODO] actual speed
+        } break;
+        case DEVT_CONNECTDONE: {
+            // read conn speed from dsts
+            // program ramclksel in gctl if needed
+            LOG("Connect done");
+
+            udev->depcmd[0].par1 = (0 << 25) | (1 << 10) | (1 << 8);
+            udev->depcmd[0].par0 = (2 << 30) | (0 << 22) | (0 << 17) | (64 << 3) | (0 << 1);
+            _dcd_cmd_wait(0, CMDTYP_DEPCFG, 0);
+
+            udev->depcmd[1].par1 = (1 << 25) | (1 << 10) | (1 << 8);
+            udev->depcmd[1].par0 = (2 << 30) | (0 << 22) | (0 << 17) | (64 << 3) | (0 << 1);
+            _dcd_cmd_wait(1, CMDTYP_DEPCFG, 0);
+        } break;
+        case DEVT_ULSTCHNG: {
+            LOG("Link status change");
+            switch (info) {
+                case 0x3: { // suspend (L2)
+                    dcd_event_bus_signal(TUD_OPT_RHPORT, DCD_EVENT_SUSPEND, true);
+                } break;
+                case 0x4: { // disconnected
+                    dcd_event_bus_signal(TUD_OPT_RHPORT, DCD_EVENT_UNPLUGGED, true);
+                } break;
+                case 0xF: { // resume
+                    dcd_event_bus_signal(TUD_OPT_RHPORT, DCD_EVENT_RESUME, true);
+                } break;
+                default: {}
+            }
+            // 0x0: ON state
+            // 0x2: L1 state (sleep)
+            // 0x3: L2 state (suspend)
+            // 0x4: disconnected state
+            // 0x5: early suspend
+            // 0xE: reset
+            // 0xF: resume
+        } break;
+        case DEVT_ERRTICERR: {
+            __BKPT(0);
+        } break;
+        default: {
+            LOG("Unknown DEVT event");
+        }
+    }
+}
+
+
+static uint8_t _dcd_start_xfer(uint8_t ep, void* buf, uint32_t size, uint8_t type)
+{
+    dcd_int_disable(TUD_OPT_RHPORT); // prevent race conditions
+
+    // program the trb and clean the cache
+    _xfer_trb[ep][0] = buf ? (uint32_t) LocalToGlobal(buf) : 0;
+    _xfer_trb[ep][1] = 0;
+    _xfer_trb[ep][2] = size;
+    _xfer_trb[ep][3] = (1 << 11) | (1 << 10) | (type << 4) | (1 << 1) | (1 << 0);
+    RTSS_CleanDCache_by_Addr(_xfer_trb[ep], sizeof(_xfer_trb[ep]));
+
+    // prepare ep command
+    udev->depcmd[ep].par1 = (uint32_t) LocalToGlobal(_xfer_trb[ep]);
+    udev->depcmd[ep].par0 = 0;
+
+    dcd_int_enable(TUD_OPT_RHPORT);
+
+    // issue the block command and pass the status
+    return _dcd_cmd_wait(ep, CMDTYP_DEPSTRTXFER, 0);
+}
+
+#endif // CFG_TUD_ENABLED

From ebecd6d101f0ca73baa8a7452ae946aac8b42817 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 22 Oct 2024 08:48:25 +0200
Subject: [PATCH 2046/3129] alif/tinyusb_port: Disable USB IRQ on deinit.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/tinyusb_port/tusb_alif_dcd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/alif/tinyusb_port/tusb_alif_dcd.c b/ports/alif/tinyusb_port/tusb_alif_dcd.c
index 510f0e9c13a9b..5ede591478645 100644
--- a/ports/alif/tinyusb_port/tusb_alif_dcd.c
+++ b/ports/alif/tinyusb_port/tusb_alif_dcd.c
@@ -460,6 +460,8 @@ void dcd_uninit(void)
     enable_usb_phy_isolation(); // enable usb phy isolation
     disable_usb_phy_power(); // power down usb phy
     disable_usb_periph_clk(); // disable usb peripheral clock
+    dcd_int_disable(TUD_OPT_RHPORT);
+    NVIC_ClearPendingIRQ(USB_IRQ_IRQn);
 }
 
 void USB_IRQHandler(void)

From b8a9cdf0673916457ca2abf8a69ad8e22afaea11 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Mar 2025 00:29:06 +1100
Subject: [PATCH 2047/3129] alif/tinyusb_port: Implement SOF event.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/tinyusb_port/tusb_alif_dcd.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/alif/tinyusb_port/tusb_alif_dcd.c b/ports/alif/tinyusb_port/tusb_alif_dcd.c
index 5ede591478645..9a990cedbe387 100644
--- a/ports/alif/tinyusb_port/tusb_alif_dcd.c
+++ b/ports/alif/tinyusb_port/tusb_alif_dcd.c
@@ -281,6 +281,8 @@ void dcd_disconnect(uint8_t rhport)
 void dcd_sof_enable(uint8_t rhport, bool en)
 {
     LOG("%010u >%s", DWT->CYCCNT, __func__);
+
+    udev->devten_b.softevten = en;
 }
 
 
@@ -656,6 +658,9 @@ static void _dcd_handle_devt(uint8_t evt, uint16_t info)
             // 0xE: reset
             // 0xF: resume
         } break;
+        case DEVT_SOF: {
+            dcd_event_bus_signal(TUD_OPT_RHPORT, DCD_EVENT_SOF, true);
+        } break;
         case DEVT_ERRTICERR: {
             __BKPT(0);
         } break;

From ccc5935234bbef026db776ebeb83a94f353e7d6b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Dec 2023 00:11:46 +1100
Subject: [PATCH 2048/3129] alif: Add initial port to Alif Ensemble MCUs.

This commit adds the beginning of a new alif port with support for Alif
Ensemble MCUs.  See https://alifsemi.com/

Supported features of this port added by this commit:
- UART REPL.
- TinyUSB support, for REPL and MSC.
- Octal SPI flash support, for filesystem.
- machine.Pin support.

General notes about the port:
- It uses make, similar to other bare-metal ports here.
- The toolchain is the standard arm-none-eabi- toolchain.
- Flashing a board can be done using either the built-in serial bootloader,
  or JLink (both supported here).
- There are two required submodules (one for drivers/SDK, one for security
  tools), both of which are open source and on GitHub.
- No special hardware or software is needed for development, just a board
  connected over USB.

OpenMV have generously sponsored the development of this port.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/Makefile                   | 261 ++++++++++++++++++++++
 ports/alif/README.md                  |  21 ++
 ports/alif/alif_flash.c               | 160 ++++++++++++++
 ports/alif/boards/manifest.py         |   5 +
 ports/alif/fatfs_port.c               |  38 ++++
 ports/alif/irq.h                      |  84 ++++++++
 ports/alif/machine_pin.c              | 298 ++++++++++++++++++++++++++
 ports/alif/main.c                     | 145 +++++++++++++
 ports/alif/mcu/M55_HP_cfg.json        |  14 ++
 ports/alif/mcu/ensemble.ld.S          | 165 ++++++++++++++
 ports/alif/mcu/make-pins.py           |  64 ++++++
 ports/alif/mcu/pins_prefix.c          |   2 +
 ports/alif/modalif.c                  |  46 ++++
 ports/alif/modalif.h                  |  33 +++
 ports/alif/modmachine.c               |  79 +++++++
 ports/alif/modules/_boot.py           |  23 ++
 ports/alif/mpconfigport.h             | 155 ++++++++++++++
 ports/alif/mpconfigport.mk            |  12 ++
 ports/alif/mphalport.c                | 152 +++++++++++++
 ports/alif/mphalport.h                | 152 +++++++++++++
 ports/alif/mpuart.c                   | 113 ++++++++++
 ports/alif/mpuart.h                   |  32 +++
 ports/alif/msc_disk.c                 | 151 +++++++++++++
 ports/alif/ospi_flash.c               | 265 +++++++++++++++++++++++
 ports/alif/ospi_flash.h               |  52 +++++
 ports/alif/ospi_xip_user.h            |   5 +
 ports/alif/pendsv.c                   |  49 +++++
 ports/alif/pendsv.h                   |  48 +++++
 ports/alif/qstrdefsport.h             |   2 +
 ports/alif/tinyusb_port/tusb_config.h |  73 +++++++
 ports/alif/usbd.c                     |  41 ++++
 31 files changed, 2740 insertions(+)
 create mode 100644 ports/alif/Makefile
 create mode 100644 ports/alif/README.md
 create mode 100644 ports/alif/alif_flash.c
 create mode 100644 ports/alif/boards/manifest.py
 create mode 100644 ports/alif/fatfs_port.c
 create mode 100644 ports/alif/irq.h
 create mode 100644 ports/alif/machine_pin.c
 create mode 100644 ports/alif/main.c
 create mode 100644 ports/alif/mcu/M55_HP_cfg.json
 create mode 100644 ports/alif/mcu/ensemble.ld.S
 create mode 100755 ports/alif/mcu/make-pins.py
 create mode 100644 ports/alif/mcu/pins_prefix.c
 create mode 100644 ports/alif/modalif.c
 create mode 100644 ports/alif/modalif.h
 create mode 100644 ports/alif/modmachine.c
 create mode 100644 ports/alif/modules/_boot.py
 create mode 100644 ports/alif/mpconfigport.h
 create mode 100644 ports/alif/mpconfigport.mk
 create mode 100644 ports/alif/mphalport.c
 create mode 100644 ports/alif/mphalport.h
 create mode 100644 ports/alif/mpuart.c
 create mode 100644 ports/alif/mpuart.h
 create mode 100644 ports/alif/msc_disk.c
 create mode 100644 ports/alif/ospi_flash.c
 create mode 100644 ports/alif/ospi_flash.h
 create mode 100644 ports/alif/ospi_xip_user.h
 create mode 100644 ports/alif/pendsv.c
 create mode 100644 ports/alif/pendsv.h
 create mode 100644 ports/alif/qstrdefsport.h
 create mode 100644 ports/alif/tinyusb_port/tusb_config.h
 create mode 100644 ports/alif/usbd.c

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
new file mode 100644
index 0000000000000..2863ebe2c4d61
--- /dev/null
+++ b/ports/alif/Makefile
@@ -0,0 +1,261 @@
+################################################################################
+# Initial setup of Makefile environment
+
+BOARD ?= ALIF_ENSEMBLE
+BOARD_DIR ?= boards/$(BOARD)
+BUILD ?= build-$(BOARD)
+
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
+
+include ../../py/mkenv.mk
+include mpconfigport.mk
+include $(BOARD_DIR)/mpconfigboard.mk
+
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS += qstrdefsport.h
+
+# include py core make definitions
+include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
+
+################################################################################
+# Project specific settings and compiler/linker flags
+
+CROSS_COMPILE ?= arm-none-eabi-
+GIT_SUBMODULES += lib/tinyusb lib/alif_ensemble-cmsis-dfp lib/alif-security-toolkit
+PORT ?= /dev/ttyACM0
+
+ALIF_TOOLS ?= ../../lib/alif-security-toolkit/toolkit
+ALIF_DFP_REL_TOP ?= lib/alif_ensemble-cmsis-dfp
+ALIF_DFP_REL_HERE ?= $(TOP)/lib/alif_ensemble-cmsis-dfp
+CMSIS_DIR ?= $(TOP)/lib/cmsis/inc
+
+MCU_CORE ?= M55_HP
+ALIF_CONFIG ?= mcu/$(MCU_CORE)_cfg.json
+LD_FILE ?= mcu/ensemble.ld.S
+
+INC += -I.
+INC += -I$(TOP)
+INC += -I$(BUILD)
+INC += -I$(BOARD_DIR)
+INC += -I$(CMSIS_DIR)
+INC += -I$(ALIF_DFP_REL_HERE)/drivers/include/
+INC += -I$(ALIF_DFP_REL_HERE)/ospi_xip/source/ospi
+INC += -I$(ALIF_DFP_REL_HERE)/Device/common/config/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/common/include/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/core/$(MCU_CORE)/config/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/core/$(MCU_CORE)/include/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/$(MCU_SERIES)/$(MCU_VARIANT)/
+INC += -I$(TOP)/lib/tinyusb/src
+INC += -Itinyusb_port
+
+GEN_PIN_MKPINS = mcu/make-pins.py
+GEN_PIN_PREFIX = mcu/pins_prefix.c
+GEN_PINS_BOARD_CSV = $(BOARD_DIR)/pins.csv
+GEN_PINS_SRC = $(BUILD)/pins_board.c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins_board.h
+
+CFLAGS_FPU += -mfloat-abi=hard -mfpu=fpv5-d16
+CFLAGS_CORTEX_M55 += -mthumb -mcpu=cortex-m55 -mtune=cortex-m55 $(CFLAGS_FPU)
+
+CFLAGS += $(INC) -Wall -Werror -std=c99 $(CFLAGS_CORTEX_M55) -nostdlib
+CFLAGS += -Wdouble-promotion -Wfloat-conversion
+CFLAGS += -fdata-sections -ffunction-sections
+CFLAGS += -D$(MCU_CORE) -DCORE_$(MCU_CORE) -DALIF_CMSIS_H="\"$(MCU_CORE).h\""
+
+ifeq ($(MICROPY_FLOAT_IMPL),float)
+CFLAGS += -fsingle-precision-constant
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
+else
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
+endif
+
+AFLAGS = -mthumb -march=armv8.1-m.main $(CFLAGS_FPU)
+
+LDFLAGS += -nostdlib
+LDFLAGS += -T$(BUILD)/ensemble.ld -Map=$@.map --cref --gc-sections
+LDFLAGS += --wrap=dcd_event_handler
+
+# Tune for Debugging or Optimization
+ifeq ($(DEBUG), 1)
+CFLAGS += -Og -ggdb3
+# Disable text compression in debug builds
+MICROPY_ROM_TEXT_COMPRESSION = 0
+else
+CFLAGS += -O2 -DNDEBUG
+endif
+
+LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
+
+JLINK_CMD = '\
+ExitOnError 1\n\
+Device $(JLINK_DEV)\n\
+SelectInterface SWD\n\
+Speed auto\n\
+Connect\n\
+Reset\n\
+ShowHWStatus\n\
+LoadFile "$(BUILD)/firmware_toc.bin",0x8057f1c0\n\
+LoadFile "$(BUILD)/firmware.bin",0x80000000\n\
+Reset\n\
+Exit'
+
+################################################################################
+# Source files and libraries
+
+SRC_O += \
+	shared/runtime/gchelper_thumb2.o
+
+SRC_C = \
+	alif_flash.c \
+	fatfs_port.c \
+	machine_pin.c \
+	main.c \
+	modalif.c \
+	mphalport.c \
+	mpuart.c \
+	msc_disk.c \
+	ospi_flash.c \
+	pendsv.c \
+	usbd.c \
+	$(wildcard $(BOARD_DIR)/*.c)
+
+ifeq ($(MICROPY_FLOAT_IMPL),float)
+LIBM_SRC_C += $(SRC_LIB_LIBM_C)
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
+$(BUILD)/lib/libm/%.o: CFLAGS += -Wno-maybe-uninitialized
+else
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_HW_C)
+$(BUILD)/lib/libm_dbl/%.o: CFLAGS += -Wno-maybe-uninitialized
+endif
+
+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/softtimer.c  \
+	runtime/stdout_helpers.c \
+	runtime/sys_stdio_mphal.c \
+	timeutils/timeutils.c \
+	tinyusb/mp_usbd.c \
+	tinyusb/mp_usbd_cdc.c \
+	tinyusb/mp_usbd_descriptor.c \
+	)
+
+DRIVERS_SRC_C += $(addprefix drivers/,\
+	bus/softspi.c \
+	bus/softqspi.c \
+	memory/spiflash.c \
+	dht/dht.c \
+	)
+
+TINYUSB_SRC_C += \
+	lib/tinyusb/src/tusb.c \
+	lib/tinyusb/src/class/cdc/cdc_device.c \
+	lib/tinyusb/src/class/msc/msc_device.c \
+	lib/tinyusb/src/common/tusb_fifo.c \
+	lib/tinyusb/src/device/usbd.c \
+	lib/tinyusb/src/device/usbd_control.c \
+	tinyusb_port/tusb_alif_dcd.c \
+
+ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
+	Device/common/source/clk.c \
+	Device/common/source/mpu_M55.c \
+	Device/common/source/system_M55.c \
+	Device/common/source/system_utils.c \
+	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
+	drivers/source/pinconf.c \
+	drivers/source/uart.c \
+	ospi_xip/source/ospi/ospi_drv.c \
+	)
+
+$(BUILD)/tinyusb_port/tusb_alif_dcd.o: CFLAGS += -Wno-unused-variable -DTUSB_ALIF_NO_IRQ_CFG=1
+
+# List of sources for qstr extraction
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(GEN_PINS_SRC)
+
+OBJ += $(PY_O)
+OBJ += $(addprefix $(BUILD)/, $(SRC_O))
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(ALIF_SRC_C:.c=.o))
+OBJ += $(GEN_PINS_SRC:.c=.o)
+
+################################################################################
+# Main targets
+
+.DELETE_ON_ERROR:
+
+.PHONY: all
+all: $(BUILD)/firmware_toc.bin
+
+$(BUILD)/ensemble.ld: $(LD_FILE)
+	$(ECHO) "Preprocess linker script $@"
+	$(Q)$(CPP) -P -E $(CFLAGS) $^ > $@
+
+$(BUILD)/firmware.elf: $(OBJ) $(BUILD)/ensemble.ld
+	$(ECHO) "Link $@"
+	$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+	$(Q)$(SIZE) $@
+
+$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
+	$(Q)$(OBJCOPY) -Obinary $^ $(BUILD)/firmware.bin
+
+$(BUILD)/firmware_toc.bin: $(BUILD)/firmware.bin
+	$(Q)python $(ALIF_TOOLS)/app-gen-toc.py \
+		--filename $(abspath $(BUILD)/$(ALIF_TOC_CONFIG)) \
+		--output-dir $(BUILD) \
+		--firmware-dir $(BUILD) \
+		--output $@
+
+.PHONY: deploy
+deploy: $(BUILD)/firmware_toc.bin
+	$(ECHO) "Writing $< to the board"
+	$(Q)python $(ALIF_TOOLS)/app-write-mram.py \
+		--cfg-part $(ALIF_TOOLKIT_CFG_PART) \
+		--port $(PORT) \
+		--pad \
+		--images file:$(BUILD)/application_package.ds
+
+.PHONY: deploy-jlink
+deploy-jlink: $(BUILD)/firmware_toc.bin
+	$(Q)echo -e $(JLINK_CMD) | $(JLINK_EXE)
+
+.PHONY: maintenance
+maintenance:
+	$(Q)python $(ALIF_TOOLS)/maintenance.py \
+		--cfg-part $(ALIF_TOOLKIT_CFG_PART) \
+		--port $(PORT)
+
+.PHONY: update-system-package
+update-system-package:
+	$(Q)python $(ALIF_TOOLS)/updateSystemPackage.py \
+		--cfg-part $(ALIF_TOOLKIT_CFG_PART) \
+		--port $(PORT)
+
+################################################################################
+# Remaining make rules
+
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_board.c and pins_board.h
+$(BUILD)/%_board.c $(HEADER_BUILD)/%_board.h: $(BOARD_DIR)/%.csv $(GEN_PIN_MKPINS) $(GEN_PIN_PREFIX) | $(HEADER_BUILD)
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(GEN_PIN_MKPINS) \
+	    --board-csv $(GEN_PINS_BOARD_CSV) \
+	    --prefix $(GEN_PIN_PREFIX) \
+	    --output-source $(GEN_PINS_SRC) \
+	    --output-header $(GEN_PINS_HDR)
+
+include $(TOP)/py/mkrules.mk
diff --git a/ports/alif/README.md b/ports/alif/README.md
new file mode 100644
index 0000000000000..824a63da186d2
--- /dev/null
+++ b/ports/alif/README.md
@@ -0,0 +1,21 @@
+MicroPython port to Alif Ensemble MCUs
+======================================
+
+This is a port of MicroPython to the Alif Ensemble series of microcontrollers.
+
+Initial development of this Alif port was sponsored by OpenMV LLC.
+
+Features currently supported:
+- UART REPL.
+- TinyUSB with CDC and MSC device support.
+- Octal SPI flash with XIP mode.
+- machine.Pin support with named pins.
+- machine.UART, machine.SPI, machine.I2C, machine.RTC peripherals.
+- WiFi and Bluetooth using cyw43.
+- Dual core support of the HE and HP cores using Open-AMP.
+- Low power modes.
+
+The following more advanced features will follow later:
+- Ethernet support.
+- SDRAM support.
+- Other machine modules.
diff --git a/ports/alif/alif_flash.c b/ports/alif/alif_flash.c
new file mode 100644
index 0000000000000..e3b2125800ea2
--- /dev/null
+++ b/ports/alif/alif_flash.c
@@ -0,0 +1,160 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/runtime.h"
+#include "extmod/vfs.h"
+#include "modalif.h"
+#include "ospi_flash.h"
+
+typedef struct _alif_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t flash_base_addr;
+    uint32_t flash_size;
+} alif_flash_obj_t;
+
+static alif_flash_obj_t alif_flash_obj = {
+    .base = { &alif_flash_type },
+    .flash_base_addr = MICROPY_HW_FLASH_STORAGE_BASE_ADDR,
+    .flash_size = MICROPY_HW_FLASH_STORAGE_BYTES,
+};
+
+static mp_obj_t alif_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
+        return MP_OBJ_FROM_PTR(&alif_flash_obj);
+    }
+
+    alif_flash_obj_t *self = mp_obj_malloc(alif_flash_obj_t, &alif_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 % MICROPY_HW_FLASH_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 % MICROPY_HW_FLASH_BLOCK_SIZE_BYTES == 0)) {
+        mp_raise_ValueError(NULL);
+    }
+
+    self->flash_base_addr = MICROPY_HW_FLASH_STORAGE_BASE_ADDR + start;
+    self->flash_size = len;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static mp_obj_t alif_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+    alif_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = mp_obj_get_int(args[1]) * MICROPY_HW_FLASH_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]);
+    }
+    int ret = ospi_flash_read(self->flash_base_addr + offset, bufinfo.len, bufinfo.buf);
+    mp_event_handle_nowait();
+    return MP_OBJ_NEW_SMALL_INT(ret);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alif_flash_readblocks_obj, 3, 4, alif_flash_readblocks);
+
+static mp_obj_t alif_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    alif_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = mp_obj_get_int(args[1]) * MICROPY_HW_FLASH_BLOCK_SIZE_BYTES;
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    if (n_args == 3) {
+        uint32_t addr = self->flash_base_addr + offset;
+        int32_t len = bufinfo.len;
+        while (len > 0) {
+            int ret = ospi_flash_erase_sector(addr);
+            mp_event_handle_nowait();
+            if (ret < 0) {
+                return MP_OBJ_NEW_SMALL_INT(ret);
+            }
+            addr += MICROPY_HW_FLASH_BLOCK_SIZE_BYTES;
+            len -= MICROPY_HW_FLASH_BLOCK_SIZE_BYTES;
+        }
+    } else {
+        offset += mp_obj_get_int(args[3]);
+    }
+    int ret = ospi_flash_write(self->flash_base_addr + offset, bufinfo.len, bufinfo.buf);
+    mp_event_handle_nowait();
+    return MP_OBJ_NEW_SMALL_INT(ret);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alif_flash_writeblocks_obj, 3, 4, alif_flash_writeblocks);
+
+static mp_obj_t alif_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    alif_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 / MICROPY_HW_FLASH_BLOCK_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(MICROPY_HW_FLASH_BLOCK_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            uint32_t offset = mp_obj_get_int(arg_in) * MICROPY_HW_FLASH_BLOCK_SIZE_BYTES;
+            int ret = ospi_flash_erase_sector(self->flash_base_addr + offset);
+            return MP_OBJ_NEW_SMALL_INT(ret);
+        }
+        default:
+            return mp_const_none;
+    }
+}
+static MP_DEFINE_CONST_FUN_OBJ_3(alif_flash_ioctl_obj, alif_flash_ioctl);
+
+static const mp_rom_map_elem_t alif_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&alif_flash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&alif_flash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&alif_flash_ioctl_obj) },
+};
+static MP_DEFINE_CONST_DICT(alif_flash_locals_dict, alif_flash_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    alif_flash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    make_new, alif_flash_make_new,
+    locals_dict, &alif_flash_locals_dict
+    );
diff --git a/ports/alif/boards/manifest.py b/ports/alif/boards/manifest.py
new file mode 100644
index 0000000000000..148f1d6a6eb5e
--- /dev/null
+++ b/ports/alif/boards/manifest.py
@@ -0,0 +1,5 @@
+freeze("$(PORT_DIR)/modules")
+include("$(MPY_DIR)/extmod/asyncio")
+require("dht")
+require("neopixel")
+require("onewire")
diff --git a/ports/alif/fatfs_port.c b/ports/alif/fatfs_port.c
new file mode 100644
index 0000000000000..5883c9f3b9447
--- /dev/null
+++ b/ports/alif/fatfs_port.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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"
+
+DWORD get_fattime(void) {
+    // TODO
+    int year = 2024;
+    int month = 1;
+    int day = 1;
+    int hour = 0;
+    int min = 0;
+    int sec = 0;
+    return ((year - 1980) << 25) | (month << 21) | (day << 16) | (hour << 11) | (min << 5) | (sec / 2);
+}
diff --git a/ports/alif/irq.h b/ports/alif/irq.h
new file mode 100644
index 0000000000000..723f89f1d907e
--- /dev/null
+++ b/ports/alif/irq.h
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2023 Damien P. George
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_IRQ_H
+#define MICROPY_INCLUDED_ALIF_IRQ_H
+
+#include <stdint.h>
+#include ALIF_CMSIS_H
+
+// IRQ priority definitions.
+//
+// The M55-HP CPU has __NVIC_PRIO_BITS==8 bits for setting the IRQ priority.
+// It uses NVIC_SetPriorityGrouping(0) which is 7 bits for preempt priority
+// and 1 bit for the sub-priority.
+//
+// Lower number implies higher interrupt priority.
+
+#define NVIC_PRIORITYGROUP_7    ((uint32_t)0x00000000U)
+#define IRQ_PRI_SYSTEM_TICK     NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 0, 0)
+#define IRQ_PRI_QUIET_TIMING    NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
+#define IRQ_PRI_UART_REPL       NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
+#define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 5, 0)
+#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
+
+// these states correspond to values from query_irq, enable_irq and disable_irq
+#define IRQ_STATE_DISABLED (0x00000001)
+#define IRQ_STATE_ENABLED  (0x00000000)
+
+static inline uint32_t query_irq(void) {
+    return __get_PRIMASK();
+}
+
+static inline void enable_irq(uint32_t state) {
+    __set_PRIMASK(state);
+}
+
+static inline uint32_t disable_irq(void) {
+    uint32_t state = __get_PRIMASK();
+    __disable_irq();
+    return state;
+}
+
+// irqs with a priority value greater or equal to "pri" will be disabled
+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);
+}
+
+#endif // MICROPY_INCLUDED_ALIF_IRQ_H
diff --git a/ports/alif/machine_pin.c b/ports/alif/machine_pin.c
new file mode 100644
index 0000000000000..02c5e482adb89
--- /dev/null
+++ b/ports/alif/machine_pin.c
@@ -0,0 +1,298 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/modmachine.h"
+#include "extmod/virtpin.h"
+#include "shared/runtime/mpirq.h"
+
+extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;
+extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
+
+static 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_obj_t *machine_pin_find(mp_obj_t pin) {
+    // Is already a object of the proper type
+    if (mp_obj_is_type(pin, &machine_pin_type)) {
+        return MP_OBJ_TO_PTR(pin);
+    }
+    if (mp_obj_is_str(pin)) {
+        // Try to find the pin in the board pins first.
+        const machine_pin_obj_t *self = machine_pin_find_named(&machine_pin_board_pins_locals_dict, pin);
+        if (self != NULL) {
+            return self;
+        }
+
+        // If not found, try to find the pin in the cpu pins.
+        self = machine_pin_find_named(&machine_pin_cpu_pins_locals_dict, pin);
+        if (self != NULL) {
+            return self;
+        }
+
+        // Pin name not found.
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unknown named pin \"%s\""), mp_obj_str_get_str(pin));
+    }
+    mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
+}
+
+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;
+
+    uint8_t alt_func, pad_ctrl;
+    pinconf_get(self->port, self->pin, &alt_func, &pad_ctrl);
+
+    qstr mode_qst;
+    if (gpio_get_direction(self->gpio, self->pin) == GPIO_PIN_DIR_INPUT) {
+        mode_qst = MP_QSTR_IN;
+    } else {
+        if (pad_ctrl & PADCTRL_DRIVER_OPEN_DRAIN) {
+            mode_qst = MP_QSTR_OPEN_DRAIN;
+        } else {
+            mode_qst = MP_QSTR_OUT;
+        }
+    }
+    mp_printf(print, "Pin(%q, mode=%q", self->name, mode_qst);
+    uint8_t pad_ctrl_pull = pad_ctrl & (PADCTRL_DRIVER_DISABLED_PULL_DOWN | PADCTRL_DRIVER_DISABLED_PULL_UP);
+    if (pad_ctrl_pull == PADCTRL_DRIVER_DISABLED_PULL_UP) {
+        mp_printf(print, ", pull=%q", MP_QSTR_PULL_UP);
+    } else if (pad_ctrl_pull == PADCTRL_DRIVER_DISABLED_PULL_DOWN) {
+        mp_printf(print, ", pull=%q", MP_QSTR_PULL_DOWN);
+    }
+    if (alt_func != PINMUX_ALTERNATE_FUNCTION_0) {
+        mp_printf(print, ", alt=%u", alt_func);
+    }
+    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 = 0}},
+};
+
+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);
+
+    // 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);
+    }
+
+    // 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 == MP_HAL_PIN_MODE_INPUT) {
+            mp_hal_pin_input(self);
+        } else if (mode == MP_HAL_PIN_MODE_OUTPUT) {
+            if (value != -1) {
+                // set initial output value before configuring mode
+                mp_hal_pin_write(self, value);
+            }
+            mp_hal_pin_output(self);
+        } else if (mode == MP_HAL_PIN_MODE_OPEN_DRAIN) {
+            if (value != -1) {
+                // set initial output value before configuring mode
+                mp_hal_pin_write(self, value);
+            }
+            mp_hal_pin_open_drain(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);
+    }
+    uint8_t alt_func;
+    uint8_t pad_ctrl;
+    pinconf_get(self->port, self->pin, &alt_func, &pad_ctrl);
+    alt_func = PINMUX_ALTERNATE_FUNCTION_0;
+    pad_ctrl |= PADCTRL_READ_ENABLE;
+    pad_ctrl &= ~(PADCTRL_DRIVER_DISABLED_PULL_DOWN | PADCTRL_DRIVER_DISABLED_PULL_UP);
+    if (pull & MP_HAL_PIN_PULL_UP) {
+        pad_ctrl |= PADCTRL_DRIVER_DISABLED_PULL_UP;
+    }
+    if (pull & MP_HAL_PIN_PULL_DOWN) {
+        pad_ctrl |= PADCTRL_DRIVER_DISABLED_PULL_DOWN;
+    }
+    pinconf_set(self->port, self->pin, alt_func, pad_ctrl);
+
+    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);
+
+    const machine_pin_obj_t *self = 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(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(mp_hal_pin_read(self));
+    } else {
+        // set pin
+        bool value = mp_obj_is_true(args[0]);
+        mp_hal_pin_write(self, 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);
+    mp_hal_pin_low(self);
+    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_high(self);
+    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);
+    gpio_toggle_value(self->gpio, self->pin);
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
+
+static MP_DEFINE_CONST_OBJ_TYPE(
+    pin_cpu_pins_obj_type,
+    MP_QSTR_cpu,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &machine_pin_cpu_pins_locals_dict
+    );
+
+static MP_DEFINE_CONST_OBJ_TYPE(
+    pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &machine_pin_board_pins_locals_dict
+    );
+
+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) },
+
+    // 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(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_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) },
+};
+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 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 pin_pin_p = {
+    .ioctl = pin_ioctl,
+};
+
+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
+    );
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
+    return machine_pin_find(obj);
+}
diff --git a/ports/alif/main.c b/ports/alif/main.c
new file mode 100644
index 0000000000000..0eb43a38268a6
--- /dev/null
+++ b/ports/alif/main.c
@@ -0,0 +1,145 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/compile.h"
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "py/stackctrl.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/gchelper.h"
+#include "shared/runtime/pyexec.h"
+#include "shared/tinyusb/mp_usbd.h"
+#include "tusb.h"
+#include "mpuart.h"
+#include "ospi_flash.h"
+#include "pendsv.h"
+
+extern uint8_t __StackTop, __StackLimit;
+extern uint8_t __GcHeapStart, __GcHeapEnd;
+
+NORETURN void panic(const char *msg) {
+    mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
+    mp_hal_stdout_tx_strn(msg, strlen(msg));
+    for (;;) {
+        *(volatile uint32_t *)0x4900C000 ^= 9;
+        for (volatile uint delay = 0; delay < 10000000; delay++) {
+        }
+    }
+}
+
+void _start(void) {
+    SysTick_Config(SystemCoreClock / 1000);
+
+    MICROPY_BOARD_STARTUP();
+
+    pendsv_init();
+
+    MICROPY_BOARD_EARLY_INIT();
+
+    #if MICROPY_HW_ENABLE_UART_REPL
+    mp_uart_init();
+    #endif
+
+    if (ospi_flash_init() != 0) {
+        MICROPY_BOARD_FATAL_ERROR("ospi_init failed");
+    }
+
+    #if MICROPY_HW_ENABLE_USBDEV
+    NVIC_ClearPendingIRQ(USB_IRQ_IRQn);
+    NVIC_SetPriority(USB_IRQ_IRQn, IRQ_PRI_USB);
+    #endif
+
+    // Initialise stack extents and GC heap.
+    mp_stack_set_top(&__StackTop);
+    mp_stack_set_limit(&__StackTop - &__StackLimit - 1024);
+    gc_init(&__GcHeapStart, &__GcHeapEnd);
+
+    for (;;) {
+        // Initialise MicroPython runtime.
+        mp_init();
+
+        // Initialise sub-systems.
+        readline_init0();
+
+        // Execute _boot.py to set up the filesystem.
+        pyexec_frozen_module("_boot.py", false);
+
+        // Execute user scripts.
+        int ret = pyexec_file_if_exists("boot.py");
+        #if MICROPY_HW_ENABLE_USBDEV
+        mp_usbd_init();
+        #endif
+        if (ret & PYEXEC_FORCED_EXIT) {
+            goto soft_reset_exit;
+        }
+        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) {
+                if (pyexec_raw_repl() != 0) {
+                    break;
+                }
+            } else {
+                if (pyexec_friendly_repl() != 0) {
+                    break;
+                }
+            }
+        }
+
+    soft_reset_exit:
+        mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        gc_sweep_all();
+        mp_deinit();
+    }
+}
+
+void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    gc_collect_end();
+}
+
+void nlr_jump_fail(void *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 (;;) {
+        __WFE();
+    }
+}
+
+#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
diff --git a/ports/alif/mcu/M55_HP_cfg.json b/ports/alif/mcu/M55_HP_cfg.json
new file mode 100644
index 0000000000000..228ddbf6c9464
--- /dev/null
+++ b/ports/alif/mcu/M55_HP_cfg.json
@@ -0,0 +1,14 @@
+{
+  "USER_APP": {
+    "binary": "firmware.bin",
+    "mramAddress": "0x80000000",
+    "version": "1.0.0",
+    "cpu_id": "M55_HP",
+    "flags": ["boot"],
+    "signed": false
+  },
+  "DEVICE": {
+    "binary": "app-device-config.json",
+    "version" : "0.5.00"
+  }
+}
diff --git a/ports/alif/mcu/ensemble.ld.S b/ports/alif/mcu/ensemble.ld.S
new file mode 100644
index 0000000000000..198641ba3dcba
--- /dev/null
+++ b/ports/alif/mcu/ensemble.ld.S
@@ -0,0 +1,165 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Entry Point
+ENTRY(Reset_Handler)
+
+MEMORY
+{
+  ROM   (rx)  : ORIGIN = 0x80000000, LENGTH = 0x0057F000
+  ITCM  (rwx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  #ifdef CORE_M55_HP
+  DTCM  (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00100000
+  #else
+  DTCM  (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000
+  #endif
+  SRAM0 (rwx) : ORIGIN = 0x02000000, LENGTH = 0x00400000
+  SRAM1 (rwx) : ORIGIN = 0x08000000, LENGTH = 0x00280000
+}
+
+__STACK_SIZE = 0x00004000;
+__HEAP_SIZE  = 0x00004000;
+__MP_HEAP_SIZE = 0x00040000;
+
+SECTIONS
+{
+  .text : ALIGN(16)
+  {
+    KEEP(*(.vectors))
+    . = ALIGN(4);
+    *(.text*)
+    . = ALIGN(4);
+    *(.rodata*)
+    . = ALIGN(16);
+  } > ROM
+
+  .copy.table : ALIGN(4)
+  {
+    __copy_table_start__ = .;
+    LONG ( LOADADDR(.data) )
+    LONG ( ADDR(.data) )
+    LONG ( SIZEOF(.data)/4 )
+    __copy_table_end__ = .;
+    . = ALIGN(16);
+  } > ROM
+
+  .zero.table : ALIGN(4)
+  {
+    __zero_table_start__ = .;
+    LONG (ADDR(.bss))
+    LONG (SIZEOF(.bss)/4)
+    LONG (ADDR(.bss.sram0))
+    LONG (SIZEOF(.bss.sram0)/4)
+    __zero_table_end__ = .;
+    . = ALIGN(16);
+  } > ROM
+
+  .data : ALIGN(8)
+  {
+    *(.data)
+    . = ALIGN(8);
+    *(.data.*)
+    . = ALIGN(16);
+  } > DTCM AT > ROM
+
+  /* Peripherals in expansion master 0 (USB, Ethernet, SD/MMC)
+     are by default configured as non-secure, so they don't
+     have access to DTCMs. This can be fixed in the ToC by allowing
+     access to DTCMs to all bus masters, for now these peripherals
+     should place buffers in regular SRAM */
+  .bss.sram0 (NOLOAD) : ALIGN(4)
+  {
+    * (.bss.sram0*)
+  } > SRAM0
+
+  .bss : ALIGN(4)
+  {
+    __bss_start__ = .;
+    *(.bss)
+    . = ALIGN(4);
+    *(.bss.*)
+    . = ALIGN(4);
+    *(COMMON)
+    . = ALIGN(4);
+    __bss_end__ = .;
+  } > DTCM
+
+  .heap (NOLOAD) : ALIGN(4)
+  {
+    __end__ = .;
+    PROVIDE(end = .);
+    . = . + __HEAP_SIZE;
+    . = ALIGN(4);
+    __HeapLimit = .;
+
+    /* MicroPython GC heap */
+    . = ALIGN(16);
+    __GcHeapStart = .;
+    . = . + __MP_HEAP_SIZE;
+    __GcHeapEnd = .;
+  } > DTCM
+
+  .stack (NOLOAD) : ALIGN(4)
+  {
+    __StackLimit = .;
+    . = . + __STACK_SIZE;
+    . = ALIGN(4);
+    __StackTop = .;
+  } > DTCM
+  PROVIDE(__stack = __StackTop);
+
+  .init_fini_arrays : ALIGN(16)
+  {
+    KEEP(*(.init))
+    KEEP(*(.fini))
+
+    . = 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(*(.eh_frame*))
+    . = ALIGN(16);
+  } > ROM
+
+  /* Check if data + heap + stack exceeds RAM limit */
+  ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/ports/alif/mcu/make-pins.py b/ports/alif/mcu/make-pins.py
new file mode 100755
index 0000000000000..b49db4cfe49bb
--- /dev/null
+++ b/ports/alif/mcu/make-pins.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+import os
+import re
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../tools"))
+import boardgen
+
+NUM_PORTS = 16
+NUM_PINS_PER_PORT = 8
+
+
+class AlifPin(boardgen.Pin):
+    # Emit the struct which contains the pin instance.
+    def definition(self):
+        port, pin = self.name()[1:].split("_")
+        base = "LPGPIO_BASE" if port == "15" else "GPIO{}_BASE".format(port)
+        return (
+            "{{ "
+            ".base = {{ .type = &machine_pin_type }}, "
+            ".gpio = (GPIO_Type *){base}, "
+            ".port = PORT_{port}, "
+            ".pin = PIN_{pin}, "
+            ".name = MP_QSTR_P{port}_{pin} "
+            "}}".format(port=port, pin=pin, base=base)
+        )
+
+    # Alif cpu names must be "Pn_m".
+    @staticmethod
+    def validate_cpu_pin_name(cpu_pin_name):
+        boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
+
+        if not (m := re.match("P([0-9]){1,2}_([0-9])", cpu_pin_name)):
+            raise boardgen.PinGeneratorError(
+                "Invalid cpu pin name '{}', must be 'Pn_m'".format(cpu_pin_name)
+            )
+
+        port = int(m.group(1))
+        pin = int(m.group(2))
+        if not (0 <= port < NUM_PORTS and 0 <= pin < NUM_PINS_PER_PORT):
+            raise boardgen.PinGeneratorError("Unknown cpu pin '{}'".format(cpu_pin_name))
+
+
+class AlifPinGenerator(boardgen.PinGenerator):
+    def __init__(self):
+        # Use custom pin type above.
+        super().__init__(pin_type=AlifPin)
+
+        # Pre-define the pins (i.e. don't require them to be listed in pins.csv).
+        for i in range(NUM_PORTS):
+            for j in range(NUM_PINS_PER_PORT):
+                self.add_cpu_pin("P{}_{}".format(i, j))
+
+    # Only use pre-defined cpu pins (do not let board.csv create them).
+    def find_pin_by_cpu_pin_name(self, cpu_pin_name, create=True):
+        return super().find_pin_by_cpu_pin_name(cpu_pin_name, create=False)
+
+    def cpu_table_size(self):
+        return "{} * {}".format(NUM_PORTS, NUM_PINS_PER_PORT)
+
+
+if __name__ == "__main__":
+    AlifPinGenerator().main()
diff --git a/ports/alif/mcu/pins_prefix.c b/ports/alif/mcu/pins_prefix.c
new file mode 100644
index 0000000000000..99fef5939a0ce
--- /dev/null
+++ b/ports/alif/mcu/pins_prefix.c
@@ -0,0 +1,2 @@
+#include "py/mphal.h"
+#include "extmod/modmachine.h"
diff --git a/ports/alif/modalif.c b/ports/alif/modalif.c
new file mode 100644
index 0000000000000..69b7e6c5c8e87
--- /dev/null
+++ b/ports/alif/modalif.c
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/runtime.h"
+#include "modalif.h"
+
+static const mp_rom_map_elem_t alif_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_alif) },
+    { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&alif_flash_type) },
+    #if MICROPY_HW_USB_MSC
+    // Attribute to indicate USB MSC is enabled.
+    { MP_ROM_QSTR(MP_QSTR_usb_msc),             MP_ROM_TRUE },
+    #endif
+};
+static MP_DEFINE_CONST_DICT(alif_module_globals, alif_module_globals_table);
+
+const mp_obj_module_t mp_module_alif = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&alif_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_alif, mp_module_alif);
diff --git a/ports/alif/modalif.h b/ports/alif/modalif.h
new file mode 100644
index 0000000000000..5812d6ba54597
--- /dev/null
+++ b/ports/alif/modalif.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_MODALIF_H
+#define MICROPY_INCLUDED_ALIF_MODALIF_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t alif_flash_type;
+
+#endif // MICROPY_INCLUDED_ALIF_MODALIF_H
diff --git a/ports/alif/modmachine.c b/ports/alif/modmachine.c
new file mode 100644
index 0000000000000..c4102225dabfc
--- /dev/null
+++ b/ports/alif/modmachine.c
@@ -0,0 +1,79 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 never compiled standalone, it's included directly from
+// extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
+
+#define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) }, \
+
+static void mp_machine_idle(void) {
+    mp_event_wait_indefinite();
+}
+
+static mp_obj_t mp_machine_unique_id(void) {
+    return mp_obj_new_bytes((const uint8_t *)"ABCD", 4);
+}
+
+NORETURN static void mp_machine_reset(void) {
+    NVIC_SystemReset();
+}
+
+NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+    __disable_irq();
+
+    MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
+
+    while (1) {
+        ;
+    }
+}
+
+static mp_int_t mp_machine_reset_cause(void) {
+    // TODO
+    return 0;
+}
+
+static mp_obj_t mp_machine_get_freq(void) {
+    return MP_OBJ_NEW_SMALL_INT(SystemCoreClock);
+}
+
+static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
+    mp_raise_NotImplementedError(NULL);
+}
+
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    mp_int_t delay = -1;
+    if (n_args == 1) {
+        delay = mp_obj_get_int(args[0]);
+    }
+    mp_hal_delay_ms(delay);
+}
+
+NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    mp_machine_lightsleep(n_args, args);
+    mp_machine_reset();
+}
diff --git a/ports/alif/modules/_boot.py b/ports/alif/modules/_boot.py
new file mode 100644
index 0000000000000..36044b461e662
--- /dev/null
+++ b/ports/alif/modules/_boot.py
@@ -0,0 +1,23 @@
+import sys, os, alif
+
+
+bdev = alif.Flash()
+if hasattr(alif, "usb_msc"):
+    try:
+        # This may fail on VfsFat construction, or mount.
+        os.mount(os.VfsFat(bdev), "/flash")
+    except:
+        os.VfsFat.mkfs(bdev)
+        os.mount(os.VfsFat(bdev), "/flash")
+else:
+    try:
+        os.mount(os.VfsLfs2(bdev, progsize=256), "/flash")
+    except:
+        os.VfsLfs2.mkfs(bdev, progsize=256)
+        os.mount(os.VfsLfs2(bdev, progsize=256), "/flash")
+
+sys.path.append("/flash")
+sys.path.append("/flash/lib")
+os.chdir("/flash")
+
+del sys, os, alif, bdev
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
new file mode 100644
index 0000000000000..2d8e3b2a09dbe
--- /dev/null
+++ b/ports/alif/mpconfigport.h
@@ -0,0 +1,155 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <alloca.h> // for alloca()
+
+// board specific definitions
+#include "mpconfigboard.h"
+
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
+#endif
+
+#define MICROPY_HW_ENABLE_UART_REPL             (1) // useful if there is no USB
+#define MICROPY_HW_ENABLE_USBDEV                (1)
+
+#ifndef MICROPY_HW_USB_PRODUCT_FS_STRING
+#define MICROPY_HW_USB_PRODUCT_FS_STRING        "Board in HS mode"
+#endif
+#define MICROPY_HW_USB_CDC                      (1)
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT           (500)
+#ifndef MICROPY_HW_USB_MSC
+#define MICROPY_HW_USB_MSC                      (0)
+#endif
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID                      (0xf055)
+#endif
+#ifndef MICROPY_HW_USB_PID
+#define MICROPY_HW_USB_PID                      (0x9802) // interface has CDC only
+#endif
+
+#define MICROPY_HW_FLASH_BLOCK_SIZE_BYTES       (4096)
+
+// Memory allocation policies
+#ifndef MICROPY_ALLOC_GC_STACK_SIZE
+#define MICROPY_ALLOC_GC_STACK_SIZE             (128)
+#endif
+#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               (1)
+#define MICROPY_EMIT_INLINE_THUMB               (1)
+#define MICROPY_EMIT_INLINE_THUMB_FLOAT         (1)
+
+// Optimisations
+#define MICROPY_OPT_COMPUTED_GOTO               (1)
+
+// Python internal features
+#define MICROPY_READER_VFS                      (1)
+#define MICROPY_ENABLE_GC                       (1)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
+#define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
+#define MICROPY_SCHEDULER_DEPTH                 (8)
+#define MICROPY_SCHEDULER_STATIC_NODES          (1)
+#define MICROPY_USE_INTERNAL_ERRNO              (1)
+
+// Fine control over Python builtins, classes, modules, etc
+#define MICROPY_PY_SYS_PLATFORM                 "alif"
+
+// Extended modules
+#define MICROPY_EPOCH_IS_1970                   (1)
+#define MICROPY_PY_OS_DUPTERM                   (1)
+#define MICROPY_PY_OS_SEP                       (1)
+#define MICROPY_PY_OS_SYNC                      (1)
+#define MICROPY_PY_OS_UNAME                     (1)
+#define MICROPY_PY_TIME                         (1)
+#define MICROPY_PY_MACHINE                      (1)
+#define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/alif/modmachine.c"
+#define MICROPY_PY_MACHINE_RESET                (1)
+#define MICROPY_PY_MACHINE_BOOTLOADER           (1)
+#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS     (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
+#define MICROPY_PY_MACHINE_DHT_READINTO         (1)
+#define MICROPY_PY_MACHINE_PULSE                (1)
+#define MICROPY_PY_MACHINE_SOFTI2C              (1)
+#define MICROPY_PY_MACHINE_SOFTSPI              (1)
+#define MICROPY_PY_MACHINE_TIMER                (1)
+#define MICROPY_VFS                             (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)
+#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                    (MICROPY_HW_FLASH_BLOCK_SIZE_BYTES)
+#endif
+
+#define MP_STATE_PORT MP_STATE_VM
+
+// Miscellaneous settings
+
+// We need an implementation of the log2 function which is not a macro
+#define MP_NEED_LOG2 (1)
+
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_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
+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;
+#endif
+
+// Board configuration settings.
+
+#ifndef MICROPY_BOARD_STARTUP
+#define MICROPY_BOARD_STARTUP()
+#endif
+
+#ifndef MICROPY_BOARD_EARLY_INIT
+#define MICROPY_BOARD_EARLY_INIT()
+#endif
+
+#ifndef MICROPY_BOARD_FATAL_ERROR
+extern void panic(const char *);
+#define MICROPY_BOARD_FATAL_ERROR panic
+#endif
+
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
+#endif
diff --git a/ports/alif/mpconfigport.mk b/ports/alif/mpconfigport.mk
new file mode 100644
index 0000000000000..3d04450a60fa7
--- /dev/null
+++ b/ports/alif/mpconfigport.mk
@@ -0,0 +1,12 @@
+# Enable/disable extra modules and features
+
+# MicroPython feature configurations
+MICROPY_ROM_TEXT_COMPRESSION ?= 1
+MICROPY_FLOAT_IMPL ?= double
+
+# VFS support.
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# File containing description of content to be frozen into firmware.
+FROZEN_MANIFEST ?= boards/manifest.py
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
new file mode 100644
index 0000000000000..b433aa5e155d2
--- /dev/null
+++ b/ports/alif/mphalport.c
@@ -0,0 +1,152 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Damien P. George
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/ringbuf.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "extmod/misc.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared/tinyusb/mp_usbd.h"
+#include "shared/tinyusb/mp_usbd_cdc.h"
+#include "tusb.h"
+#include "mpuart.h"
+
+#ifndef MICROPY_HW_STDIN_BUFFER_LEN
+#define MICROPY_HW_STDIN_BUFFER_LEN 512
+#endif
+
+static uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
+ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
+
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    #if MICROPY_HW_USB_CDC
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
+    #endif
+    #if MICROPY_HW_ENABLE_UART_REPL
+    if (poll_flags & MP_STREAM_POLL_WR) {
+        ret |= MP_STREAM_POLL_WR;
+    }
+    #endif
+    #if MICROPY_PY_OS_DUPTERM
+    ret |= mp_os_dupterm_poll(poll_flags);
+    #endif
+    return ret;
+}
+
+// Receive single character
+int mp_hal_stdin_rx_chr(void) {
+    for (;;) {
+        #if MICROPY_HW_USB_CDC
+        mp_usbd_cdc_poll_interfaces(0);
+        #endif
+        int c = ringbuf_get(&stdin_ringbuf);
+        if (c != -1) {
+            return c;
+        }
+        #if MICROPY_PY_OS_DUPTERM
+        int dupterm_c = mp_os_dupterm_rx_chr();
+        if (dupterm_c >= 0) {
+            return dupterm_c;
+        }
+        #endif
+        mp_event_wait_indefinite();
+    }
+}
+
+// Send string of given length
+mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
+    mp_uint_t ret = len;
+    bool did_write = false;
+
+    #if MICROPY_HW_ENABLE_UART_REPL
+    mp_uart_write_strn(str, len);
+    did_write = true;
+    #endif
+
+    #if MICROPY_HW_USB_CDC
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
+        did_write = true;
+        ret = MIN(cdc_res, ret);
+    }
+    #endif
+
+    #if MICROPY_PY_OS_DUPTERM
+    int dupterm_res = mp_os_dupterm_tx_strn(str, len);
+    if (dupterm_res >= 0) {
+        did_write = true;
+        ret = MIN((mp_uint_t)dupterm_res, ret);
+    }
+    #endif
+
+    return did_write ? ret : 0;
+}
+
+static uint32_t volatile ticks_ms;
+
+void SysTick_Handler(void) {
+    ++ticks_ms;
+}
+
+mp_uint_t mp_hal_ticks_cpu(void) {
+    if (!(DWT->CTRL & DWT_CTRL_CYCCNTENA_Msk)) {
+        CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
+        #if defined(__CORTEX_M) && __CORTEX_M == 7
+        // on Cortex-M7 we must unlock the DWT before writing to its registers
+        DWT->LAR = 0xc5acce55;
+        #endif
+        DWT->CYCCNT = 0;
+        DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
+    }
+    return DWT->CYCCNT;
+}
+
+mp_uint_t mp_hal_ticks_us(void) {
+    return ticks_ms / 1000;
+}
+
+mp_uint_t mp_hal_ticks_ms(void) {
+    return ticks_ms;
+}
+
+void mp_hal_delay_us(mp_uint_t us) {
+    mp_hal_delay_ms(us / 1000);
+}
+
+void mp_hal_delay_ms(mp_uint_t ms) {
+    uint32_t t0 = mp_hal_ticks_ms();
+    while ((mp_hal_ticks_ms() - t0) < ms) {
+        __WFI();
+    }
+}
+
+uint64_t mp_hal_time_ns(void) {
+    return 0;
+}
diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
new file mode 100644
index 0000000000000..1b8c854fd0b95
--- /dev/null
+++ b/ports/alif/mphalport.h
@@ -0,0 +1,152 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/ringbuf.h"
+#include "shared/runtime/interrupt_char.h"
+#include "irq.h"
+#include ALIF_CMSIS_H
+
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(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);
+
+// Port level Wait-for-Event macro
+//
+// Do not use this macro directly, include py/runtime.h and
+// call mp_event_wait_indefinite() or mp_event_wait_ms(timeout)
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) \
+    do {                                 \
+        if ((TIMEOUT_MS) < 0) { \
+            __WFE(); \
+        } else { \
+            /* TODO */ \
+            __WFE(); \
+        } \
+    } while (0)
+
+// TODO requires mods to py/emitglue.c for this to be picked up
+#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)))
+
+extern ringbuf_t stdin_ringbuf;
+
+// TODO
+#define mp_hal_quiet_timing_enter() 0
+#define mp_hal_quiet_timing_exit(x) (void)x
+#define mp_hal_delay_us_fast mp_hal_delay_us
+
+/******************************************************************************/
+// C-level pin HAL
+
+#include "py/obj.h"
+#include "gpio.h"
+#include "pinconf.h"
+
+#define MP_HAL_PIN_FMT                          "%q"
+#define MP_HAL_PIN_MODE_INPUT                   (0)
+#define MP_HAL_PIN_MODE_OUTPUT                  (1)
+#define MP_HAL_PIN_MODE_OPEN_DRAIN              (2)
+#define MP_HAL_PIN_PULL_NONE                    (0)
+#define MP_HAL_PIN_PULL_UP                      (1)
+#define MP_HAL_PIN_PULL_DOWN                    (2)
+
+#define mp_hal_pin_obj_t const machine_pin_obj_t *
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    GPIO_Type *gpio;
+    uint8_t port;
+    uint8_t pin;
+    qstr name;
+} machine_pin_obj_t;
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
+
+static inline qstr mp_hal_pin_name(mp_hal_pin_obj_t pin) {
+    return pin->name;
+}
+
+static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
+    uint8_t alt_func = PINMUX_ALTERNATE_FUNCTION_0;
+    uint8_t pad_ctrl = PADCTRL_READ_ENABLE;
+    pinconf_set(pin->port, pin->pin, alt_func, pad_ctrl);
+    gpio_set_direction_input(pin->gpio, pin->pin);
+}
+
+static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
+    uint8_t alt_func = PINMUX_ALTERNATE_FUNCTION_0;
+    uint8_t pad_ctrl = PADCTRL_READ_ENABLE;
+    pinconf_set(pin->port, pin->pin, alt_func, pad_ctrl);
+    gpio_set_direction_output(pin->gpio, pin->pin);
+}
+
+static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
+    uint8_t alt_func = PINMUX_ALTERNATE_FUNCTION_0;
+    uint8_t pad_ctrl = PADCTRL_DRIVER_OPEN_DRAIN | PADCTRL_READ_ENABLE;
+    pinconf_set(pin->port, pin->pin, alt_func, pad_ctrl);
+    gpio_set_direction_output(pin->gpio, pin->pin);
+}
+
+static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) {
+    gpio_set_value_low(pin->gpio, pin->pin);
+}
+
+static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {
+    gpio_set_value_high(pin->gpio, pin->pin);
+}
+
+static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {
+    return gpio_get_value(pin->gpio, pin->pin);
+}
+
+static inline void mp_hal_pin_write(mp_hal_pin_obj_t pin, int v) {
+    if (v) {
+        mp_hal_pin_high(pin);
+    } else {
+        mp_hal_pin_low(pin);
+    }
+}
+
+static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
+    mp_hal_pin_low(pin);
+}
+
+static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
+    mp_hal_pin_high(pin);
+}
+
+static inline void mp_hal_wake_main_task_from_isr(void) {
+    // Defined for tinyusb support, nothing needs to be done here.
+}
+
+// Include all the pin definitions.
+#include "genhdr/pins_board.h"
diff --git a/ports/alif/mpuart.c b/ports/alif/mpuart.c
new file mode 100644
index 0000000000000..e9cfcf34fed53
--- /dev/null
+++ b/ports/alif/mpuart.c
@@ -0,0 +1,113 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "mpuart.h"
+
+#if MICROPY_HW_ENABLE_UART_REPL
+
+#include "pinconf.h"
+#include "sys_ctrl_uart.h"
+#include "uart.h"
+
+#define TX_PORT PORT_12
+#define TX_PIN PIN_2
+#define RX_PORT PORT_12
+#define RX_PIN PIN_1
+#define UART_ID 4
+#define UART_IRQN UART4_IRQ_IRQn
+#define UART_PTR ((UART_Type *)UART4_BASE)
+#define BAUDRATE 115200
+#define SYST_PCLK 100000000
+
+static UART_TRANSFER transfer;
+
+void mp_uart_init(void) {
+    pinconf_set(TX_PORT, TX_PIN, PINMUX_ALTERNATE_FUNCTION_2, 0);
+    pinconf_set(RX_PORT, RX_PIN, PINMUX_ALTERNATE_FUNCTION_2, PADCTRL_READ_ENABLE);
+    select_uart_clock_syst_pclk(UART_ID);
+    enable_uart_clock(UART_ID);
+    uart_software_reset(UART_PTR);
+    uart_enable_fifo(UART_PTR);
+    uart_disable_tx_irq(UART_PTR);
+    uart_disable_rx_irq(UART_PTR);
+    uart_set_baudrate(UART_PTR, SYST_PCLK, BAUDRATE);
+    uart_set_data_parity_stop_bits(UART_PTR, UART_DATA_BITS_8, UART_PARITY_NONE, UART_STOP_BITS_1);
+    uart_set_flow_control(UART_PTR, UART_FLOW_CONTROL_NONE);
+    NVIC_ClearPendingIRQ(UART_IRQN);
+    NVIC_SetPriority(UART_IRQN, IRQ_PRI_UART_REPL);
+    NVIC_EnableIRQ(UART_IRQN);
+    uart_set_tx_trigger(UART_PTR, UART_TX_FIFO_EMPTY);
+    uart_set_rx_trigger(UART_PTR, UART_RX_ONE_CHAR_IN_FIFO);
+    uart_enable_rx_irq(UART_PTR);
+}
+
+void mp_uart_write_strn(const char *str, size_t len) {
+    memset(&transfer, 0, sizeof(transfer));
+    transfer.tx_buf = (uint8_t *)str;
+    transfer.tx_total_num = len;
+    transfer.tx_curr_cnt = 0U;
+    transfer.status = UART_TRANSFER_STATUS_NONE;
+
+    uart_enable_tx_irq(UART_PTR);
+
+    uint32_t start = mp_hal_ticks_ms();
+    while (transfer.status == UART_TRANSFER_STATUS_NONE) {
+        if (mp_hal_ticks_ms() - start > 10 * len) {
+            break;
+        }
+        __WFE();
+    }
+    uart_disable_tx_irq(UART_PTR);
+}
+
+void UART4_IRQHandler(void) {
+    if (UART_PTR->UART_RFL) {
+        for (;;) {
+            uint32_t rx_fifo_available_cnt = UART_PTR->UART_RFL;
+            if (rx_fifo_available_cnt == 0) {
+                break;
+            }
+            for (uint32_t i = 0; i < rx_fifo_available_cnt; ++i) {
+                int c = UART_PTR->UART_RBR;
+                #if MICROPY_KBD_EXCEPTION
+                if (c == mp_interrupt_char) {
+                    mp_sched_keyboard_interrupt();
+                    continue;
+                }
+                #endif
+                ringbuf_put(&stdin_ringbuf, c);
+            }
+        }
+    } else {
+        uart_irq_handler(UART_PTR, &transfer);
+    }
+    __SEV();
+}
+
+#endif
diff --git a/ports/alif/mpuart.h b/ports/alif/mpuart.h
new file mode 100644
index 0000000000000..0c2e510a94e7c
--- /dev/null
+++ b/ports/alif/mpuart.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF2_UART_H
+#define MICROPY_INCLUDED_ALIF2_UART_H
+
+void mp_uart_init(void);
+void mp_uart_write_strn(const char *str, size_t len);
+
+#endif // MICROPY_INCLUDED_ALIF2_UART_H
diff --git a/ports/alif/msc_disk.c b/ports/alif/msc_disk.c
new file mode 100644
index 0000000000000..a01494d20f0e4
--- /dev/null
+++ b/ports/alif/msc_disk.c
@@ -0,0 +1,151 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "ospi_flash.h"
+#include "tusb.h"
+
+#if CFG_TUD_MSC
+
+#if MICROPY_FATFS_MAX_SS != MICROPY_HW_FLASH_BLOCK_SIZE_BYTES
+#error MICROPY_FATFS_MAX_SS must be the same size as MICROPY_HW_FLASH_BLOCK_SIZE_BYTES
+#endif
+
+#define BLOCK_SIZE          (MICROPY_HW_FLASH_BLOCK_SIZE_BYTES)
+#define BLOCK_COUNT         (MICROPY_HW_FLASH_STORAGE_BYTES / BLOCK_SIZE)
+#define FLASH_BASE_ADDR     (MICROPY_HW_FLASH_STORAGE_BASE_ADDR)
+
+static bool ejected = false;
+
+// Invoked on SCSI_CMD_INQUIRY.
+// 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]) {
+    memcpy(vendor_id, MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING), 8));
+    memcpy(product_id, MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING), 16));
+    memcpy(product_rev, MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING), 4));
+}
+
+// Invoked on 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 on SCSI_CMD_READ_CAPACITY_10 and SCSI_CMD_READ_FORMAT_CAPACITY to determine the disk 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 on 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 on READ10 command.
+// Copy disk's data to buffer (up to bufsize) and return number of read bytes.
+int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void *buffer, uint32_t bufsize) {
+    uint32_t addr = FLASH_BASE_ADDR + lba * BLOCK_SIZE;
+    uint32_t block_count = bufsize / BLOCK_SIZE;
+    int ret = ospi_flash_read(addr, block_count * BLOCK_SIZE, buffer);
+    if (ret < 0) {
+        return ret;
+    }
+    return block_count * BLOCK_SIZE;
+}
+
+// Callback invoked on 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) {
+    if (bufsize < BLOCK_SIZE) {
+        // Workaround for issue with TinyUSB passing in a small buffer.
+        uint32_t addr = FLASH_BASE_ADDR + lba * BLOCK_SIZE + offset;
+        if (offset == 0) {
+            int ret = ospi_flash_erase_sector(addr);
+            if (ret < 0) {
+                return ret;
+            }
+        }
+        int ret = ospi_flash_write(addr, bufsize, buffer);
+        if (ret < 0) {
+            return ret;
+        }
+        return bufsize;
+    }
+
+    uint32_t addr = FLASH_BASE_ADDR + lba * BLOCK_SIZE;
+    uint32_t block_count = bufsize / BLOCK_SIZE;
+    for (uint32_t block = 0; block < block_count; ++block) {
+        int ret = ospi_flash_erase_sector(addr);
+        if (ret < 0) {
+            return ret;
+        }
+        ret = ospi_flash_write(addr, BLOCK_SIZE, buffer);
+        if (ret < 0) {
+            return ret;
+        }
+        addr += BLOCK_SIZE;
+        buffer += BLOCK_SIZE;
+    }
+    return block_count * BLOCK_SIZE;
+}
+
+// Callback invoked on a SCSI command that's not handled by TinyUSB.
+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/alif/ospi_flash.c b/ports/alif/ospi_flash.c
new file mode 100644
index 0000000000000..fa96053b36579
--- /dev/null
+++ b/ports/alif/ospi_flash.c
@@ -0,0 +1,265 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/mperrno.h"
+#include "py/mphal.h"
+#include "ospi_flash.h"
+
+#include "ospi_drv.h"
+#include "pinconf.h"
+
+#define CMD_RDSR        (0x05)
+#define CMD_WREN        (0x06)
+#define CMD_SEC_ERASE_32ADDR (0x21) // 4kiB sector erase with 32-bit address
+#define CMD_WRVOL       (0x81)
+#define CMD_RD_DEVID    (0x9f)
+
+#define WAIT_SR_TIMEOUT (1000000)
+
+// maximum bytes we can write in one SPI transfer
+// limited by 256 byte FIFO buffer (can't go up to 256)
+// need to use DMA to make this 256
+#define PAGE_SIZE       (128)
+
+#define ISSI_MODE_OCTAL_DDR_DQS (0xe7)
+
+// All OSPI1 pins use the same alternate function.
+#define OSPI1_PIN_FUNCTION PINMUX_ALTERNATE_FUNCTION_1
+
+typedef struct _mp_spiflash_t {
+    ospi_flash_cfg_t cfg;
+} mp_spiflash_t;
+
+static mp_spiflash_t global_flash;
+
+// Alif version of this function can overwrite the destination buffer.
+static void ospi_recv_blocking2(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint8_t *buffer) {
+    uint32_t val;
+
+    ospi_writel(ospi_cfg, data_reg, command);
+    ospi_writel(ospi_cfg, ser, ospi_cfg->ser);
+
+    ospi_cfg->rx_cnt = 0;
+
+    while (ospi_cfg->rx_cnt < ospi_cfg->rx_req) {
+        unsigned int timeout = 100000;
+        while (ospi_readl(ospi_cfg, rxflr) == 0) {
+            if (--timeout == 0) {
+                return;
+            }
+        }
+        val = ospi_readl(ospi_cfg, data_reg);
+        *buffer++ = (uint8_t)val;
+        ospi_cfg->rx_cnt++;
+    }
+}
+
+static int mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len, uint8_t *dest) {
+    ospi_setup_read(&self->cfg, 0, len, 8);
+    ospi_recv_blocking2(&self->cfg, cmd, dest);
+    return 0;
+}
+
+static int mp_spiflash_write_cmd(mp_spiflash_t *self, uint8_t cmd) {
+    ospi_setup_write(&self->cfg, 0);
+    ospi_send_blocking(&self->cfg, cmd);
+    return 0;
+}
+
+static int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, uint32_t timeout) {
+    do {
+        uint8_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
+        }
+    } while (timeout--);
+
+    return -MP_ETIMEDOUT;
+}
+
+static int mp_spiflash_wait_wel1(mp_spiflash_t *self) {
+    return mp_spiflash_wait_sr(self, 2, 2, WAIT_SR_TIMEOUT);
+}
+
+static int mp_spiflash_wait_wip0(mp_spiflash_t *self) {
+    return mp_spiflash_wait_sr(self, 1, 0, WAIT_SR_TIMEOUT);
+}
+
+static uint32_t ospi_flash_read_id(mp_spiflash_t *self) {
+    uint8_t buf[8];
+    ospi_setup_read(&self->cfg, 0, 3, ospi_flash_settings.read_id_dummy_cycles);
+    ospi_recv_blocking2(&self->cfg, CMD_RD_DEVID, buf);
+    return buf[0] | buf[1] << 8 | buf[2] << 16;
+}
+
+static void ospi_flash_write_reg_sdr(mp_spiflash_t *self, uint8_t cmd, uint8_t addr, uint8_t value) {
+    mp_spiflash_write_cmd(self, CMD_WREN);
+    ospi_setup_write_sdr(&self->cfg, 6);
+    ospi_push(&self->cfg, cmd);
+    ospi_push(&self->cfg, 0x00);
+    ospi_push(&self->cfg, 0x00);
+    ospi_push(&self->cfg, addr);
+    ospi_send_blocking(&self->cfg, value);
+}
+
+int ospi_flash_init(void) {
+    mp_spiflash_t *self = &global_flash;
+
+    uint32_t pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST | PADCTRL_READ_ENABLE;
+
+    pinconf_set(pin_OSPI1_CS->port, pin_OSPI1_CS->pin, OSPI1_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA);
+    pinconf_set(pin_OSPI1_SCLK->port, pin_OSPI1_SCLK->pin, OSPI1_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST);
+    pinconf_set(pin_OSPI1_D0->port, pin_OSPI1_D0->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin_OSPI1_D1->port, pin_OSPI1_D1->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin_OSPI1_D2->port, pin_OSPI1_D2->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin_OSPI1_D3->port, pin_OSPI1_D3->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    #if defined(pin_OSPI1_D4)
+    pinconf_set(pin_OSPI1_D4->port, pin_OSPI1_D4->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin_OSPI1_D5->port, pin_OSPI1_D5->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin_OSPI1_D6->port, pin_OSPI1_D6->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin_OSPI1_D7->port, pin_OSPI1_D7->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    #endif
+    #if defined(pin_OSPI1_RXDS)
+    pinconf_set(pin_OSPI1_RXDS->port, pin_OSPI1_RXDS->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
+    #endif
+
+    #if defined(pin_OSPI1_RXDS)
+    if (pin_OSPI1_RXDS->port == PORT_10 && pin_OSPI1_RXDS->pin == PIN_7) {
+        // Alif: P5_6 is needed to support proper alt function selection of P10_7.
+        pinconf_set(PORT_5, PIN_6, OSPI1_PIN_FUNCTION, pad_ctrl);
+    }
+    #endif
+
+    // Reset the SPI flash.
+    mp_hal_pin_output(pin_OSPI1_RESET);
+    mp_hal_pin_low(pin_OSPI1_RESET);
+    mp_hal_delay_us(30);
+    mp_hal_pin_high(pin_OSPI1_RESET);
+
+    // Configure the OSPI peripheral.
+    self->cfg.regs = (ssi_regs_t *)OSPI1_BASE;
+    self->cfg.aes_regs = (aes_regs_t *)AES1_BASE;
+    self->cfg.xip_base = (volatile void *)OSPI1_XIP_BASE;
+    self->cfg.ser = 1;
+    self->cfg.addrlen = 8; // 32-bit address length
+    self->cfg.ospi_clock = ospi_flash_settings.freq_mhz;
+    self->cfg.ddr_en = 0;
+    self->cfg.wait_cycles = 0; // used only for ospi_xip_exit
+    ospi_init(&self->cfg);
+
+    if (ospi_flash_settings.is_oct && ospi_flash_settings.is_ddr) {
+        // Switch SPI flash to Octal DDR mode.
+        ospi_flash_write_reg_sdr(self, CMD_WRVOL, 0x00, ISSI_MODE_OCTAL_DDR_DQS);
+        self->cfg.ddr_en = 1;
+    }
+
+    // Check the device ID.
+    if (ospi_flash_read_id(self) != ospi_flash_settings.jedec_id) {
+        return -1;
+    }
+
+    return 0;
+}
+
+int ospi_flash_erase_sector(uint32_t addr) {
+    mp_spiflash_t *self = &global_flash;
+
+    mp_spiflash_write_cmd(self, CMD_WREN);
+    int ret = mp_spiflash_wait_wel1(self);
+    if (ret < 0) {
+        return ret;
+    }
+
+    ospi_setup_write(&self->cfg, 8 /* 32-bit addr len*/);
+    ospi_push(&self->cfg, CMD_SEC_ERASE_32ADDR);
+    ospi_send_blocking(&self->cfg, addr);
+
+    return mp_spiflash_wait_wip0(self);
+}
+
+int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest) {
+    // OSPI FIFO is limited to 256 bytes.  Need DMA to get a longer read.
+    mp_spiflash_t *self = &global_flash;
+
+    while (len) {
+        uint32_t l = len;
+        if (l > 256) {
+            l = 256;
+        }
+        ospi_setup_read(&self->cfg, 8 /* 32-bit addr len*/, l, ospi_flash_settings.read_dummy_cycles);
+        ospi_push(&self->cfg, ospi_flash_settings.read_command);
+        ospi_recv_blocking2(&self->cfg, addr, dest);
+        addr += l;
+        len -= l;
+        dest += l;
+    }
+
+    return 0;
+}
+
+static int ospi_flash_write_page(uint32_t addr, uint32_t len, const uint8_t *src) {
+    mp_spiflash_t *self = &global_flash;
+
+    mp_spiflash_write_cmd(self, CMD_WREN);
+    int ret = mp_spiflash_wait_wel1(self);
+    if (ret < 0) {
+        return ret;
+    }
+
+    ospi_setup_write(&self->cfg, 8 /* 32-bit addr len*/);
+    ospi_push(&self->cfg, ospi_flash_settings.write_command);
+    ospi_push(&self->cfg, addr);
+    while (--len) {
+        ospi_push(&self->cfg, *src++);
+    }
+    ospi_send_blocking(&self->cfg, *src);
+
+    return mp_spiflash_wait_wip0(self);
+}
+
+int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
+    int ret = 0;
+    uint32_t offset = addr & (PAGE_SIZE - 1);
+    while (len) {
+        size_t rest = PAGE_SIZE - offset;
+        if (rest > len) {
+            rest = len;
+        }
+        ret = ospi_flash_write_page(addr, rest, src);
+        if (ret != 0) {
+            break;
+        }
+        len -= rest;
+        addr += rest;
+        src += rest;
+        offset = 0;
+    }
+    return ret;
+}
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
new file mode 100644
index 0000000000000..945dc4bb07ba4
--- /dev/null
+++ b/ports/alif/ospi_flash.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_OSPI_FLASH_H
+#define MICROPY_INCLUDED_ALIF_OSPI_FLASH_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+typedef struct _ospi_flash_settings_t {
+    uint32_t jedec_id;
+    uint32_t freq_mhz;
+    bool is_quad : 1;
+    bool is_oct : 1;
+    bool is_ddr : 1;
+    uint8_t read_id_dummy_cycles;
+    uint8_t read_dummy_cycles;
+    uint8_t read_command;
+    uint8_t write_command;
+} ospi_flash_settings_t;
+
+// Provided by the board when it enables OSPI1.
+extern const ospi_flash_settings_t ospi_flash_settings;
+
+int ospi_flash_init(void);
+int ospi_flash_erase_sector(uint32_t addr);
+int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest);
+int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src);
+
+#endif // MICROPY_INCLUDED_ALIF_OSPI_FLASH_H
diff --git a/ports/alif/ospi_xip_user.h b/ports/alif/ospi_xip_user.h
new file mode 100644
index 0000000000000..a15baff2a8ba4
--- /dev/null
+++ b/ports/alif/ospi_xip_user.h
@@ -0,0 +1,5 @@
+// This file is needed by ospi_xip/source/ospi/ospi_drv.c.
+#define OSPI_XIP_ENABLE_AES_DECRYPTION (0)
+#define OSPI_XIP_RX_SAMPLE_DELAY (4)
+#define OSPI_XIP_DDR_DRIVE_EDGE (1)
+#define OSPI_XIP_RXDS_DELAY (12)
diff --git a/ports/alif/pendsv.c b/ports/alif/pendsv.c
new file mode 100644
index 0000000000000..965053e6c595a
--- /dev/null
+++ b/ports/alif/pendsv.c
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "pendsv.h"
+#include "irq.h"
+
+static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
+
+void pendsv_init(void) {
+    NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
+}
+
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
+    pendsv_dispatch_table[slot] = f;
+    SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+}
+
+void PendSV_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();
+        }
+    }
+}
diff --git a/ports/alif/pendsv.h b/ports/alif/pendsv.h
new file mode 100644
index 0000000000000..43a4b7a853846
--- /dev/null
+++ b/ports/alif/pendsv.h
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_PENDSV_H
+#define MICROPY_INCLUDED_ALIF_PENDSV_H
+
+#include "py/mpconfig.h"
+
+#ifndef MICROPY_BOARD_PENDSV_ENTRIES
+#define MICROPY_BOARD_PENDSV_ENTRIES
+#endif
+
+enum {
+    PENDSV_DISPATCH_SOFT_TIMER,
+    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_schedule_dispatch(size_t slot, pendsv_dispatch_t f);
+
+#endif // MICROPY_INCLUDED_ALIF_PENDSV_H
diff --git a/ports/alif/qstrdefsport.h b/ports/alif/qstrdefsport.h
new file mode 100644
index 0000000000000..00d3e2ae3c555
--- /dev/null
+++ b/ports/alif/qstrdefsport.h
@@ -0,0 +1,2 @@
+// qstrs specific to this port
+// *FORMAT-OFF*
diff --git a/ports/alif/tinyusb_port/tusb_config.h b/ports/alif/tinyusb_port/tusb_config.h
new file mode 100644
index 0000000000000..d244b4c241e6b
--- /dev/null
+++ b/ports/alif/tinyusb_port/tusb_config.h
@@ -0,0 +1,73 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 _ALIF_TUSB_CONFIG_H_
+#define _ALIF_TUSB_CONFIG_H_
+
+// --------------------------------------------------------------------+
+// Board Specific Configuration
+// --------------------------------------------------------------------+
+
+#define CFG_TUSB_MCU OPT_MCU_NONE
+// #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE
+#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED)
+#define TUP_DCD_ENDPOINT_MAX 8
+#define TUD_OPT_RHPORT 0
+
+// --------------------------------------------------------------------
+// COMMON CONFIGURATION
+// --------------------------------------------------------------------
+
+#define CFG_TUSB_OS           OPT_OS_NONE
+#define CFG_TUSB_DEBUG        0
+
+// Enable Device stack
+#define CFG_TUD_ENABLED       1
+
+// Default is max speed that hardware controller could support with on-chip PHY
+#define CFG_TUD_MAX_SPEED OPT_MODE_HIGH_SPEED
+
+/* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
+ * Tinyusb use follows macros to declare transferring memory so that they can be put
+ * into those specific section.
+ */
+#define CFG_TUSB_MEM_SECTION        __attribute__((section(".bss.sram0")))
+
+#define CFG_TUSB_MEM_ALIGN          __attribute__ ((aligned(32)))
+
+// --------------------------------------------------------------------
+// DEVICE CONFIGURATION
+// --------------------------------------------------------------------
+
+#define CFG_TUD_ENDPOINT0_SIZE    64
+
+// CDC Endpoint transfer buffer size, more is faster
+#define CFG_TUD_CDC_EP_BUFSIZE  (4096)
+#define CFG_TUD_CDC_RX_BUFSIZE  (4096)
+#define CFG_TUD_CDC_TX_BUFSIZE  (4096)
+
+#include "shared/tinyusb/tusb_config.h"
+
+#endif /* _ALIF_TUSB_CONFIG_H_ */
diff --git a/ports/alif/usbd.c b/ports/alif/usbd.c
new file mode 100644
index 0000000000000..9df6610683507
--- /dev/null
+++ b/ports/alif/usbd.c
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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"
+
+#if MICROPY_HW_ENABLE_USBDEV
+
+#include "shared/tinyusb/mp_usbd.h"
+#include "tusb.h"
+
+void mp_usbd_port_get_serial_number(char *serial_buf) {
+    // TODO
+    uint8_t id[8] = "ABCDEFGH";
+    MP_STATIC_ASSERT(sizeof(id) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
+    mp_usbd_hex_str(serial_buf, id, sizeof(id));
+}
+
+#endif

From 40ff0c2f276883ea325ce8977453bd16a2f2029a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Jan 2024 14:37:52 +1100
Subject: [PATCH 2049/3129] alif/system_tick: Use a UTIMER for system ticks and
 timing.

Includes an implementation of `system_tick_wfe_with_timeout_us()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/Makefile      |   2 +
 ports/alif/main.c        |   3 +-
 ports/alif/mphalport.c   |  36 +++++------
 ports/alif/system_tick.c | 128 +++++++++++++++++++++++++++++++++++++++
 ports/alif/system_tick.h |  38 ++++++++++++
 5 files changed, 184 insertions(+), 23 deletions(-)
 create mode 100644 ports/alif/system_tick.c
 create mode 100644 ports/alif/system_tick.h

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index 2863ebe2c4d61..cd02f4ac2d61c 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -119,6 +119,7 @@ SRC_C = \
 	msc_disk.c \
 	ospi_flash.c \
 	pendsv.c \
+	system_tick.c \
 	usbd.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
@@ -175,6 +176,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
 	drivers/source/pinconf.c \
 	drivers/source/uart.c \
+	drivers/source/utimer.c \
 	ospi_xip/source/ospi/ospi_drv.c \
 	)
 
diff --git a/ports/alif/main.c b/ports/alif/main.c
index 0eb43a38268a6..9293d74c0b80d 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -38,6 +38,7 @@
 #include "mpuart.h"
 #include "ospi_flash.h"
 #include "pendsv.h"
+#include "system_tick.h"
 
 extern uint8_t __StackTop, __StackLimit;
 extern uint8_t __GcHeapStart, __GcHeapEnd;
@@ -53,7 +54,7 @@ NORETURN void panic(const char *msg) {
 }
 
 void _start(void) {
-    SysTick_Config(SystemCoreClock / 1000);
+    system_tick_init();
 
     MICROPY_BOARD_STARTUP();
 
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index b433aa5e155d2..abb71aae69624 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -36,6 +36,7 @@
 #include "shared/tinyusb/mp_usbd_cdc.h"
 #include "tusb.h"
 #include "mpuart.h"
+#include "system_tick.h"
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
 #define MICROPY_HW_STDIN_BUFFER_LEN 512
@@ -109,42 +110,33 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     return did_write ? ret : 0;
 }
 
-static uint32_t volatile ticks_ms;
-
-void SysTick_Handler(void) {
-    ++ticks_ms;
-}
-
 mp_uint_t mp_hal_ticks_cpu(void) {
-    if (!(DWT->CTRL & DWT_CTRL_CYCCNTENA_Msk)) {
-        CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
-        #if defined(__CORTEX_M) && __CORTEX_M == 7
-        // on Cortex-M7 we must unlock the DWT before writing to its registers
-        DWT->LAR = 0xc5acce55;
-        #endif
-        DWT->CYCCNT = 0;
-        DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
-    }
-    return DWT->CYCCNT;
+    return system_tick_get_u32();
 }
 
 mp_uint_t mp_hal_ticks_us(void) {
-    return ticks_ms / 1000;
+    // Convert system tick to microsecond counter.
+    return system_tick_get_u64() / system_core_clock_mhz;
 }
 
 mp_uint_t mp_hal_ticks_ms(void) {
-    return ticks_ms;
+    // Convert system tick to millisecond counter.
+    return system_tick_get_u64() / (SystemCoreClock / 1000);
 }
 
 void mp_hal_delay_us(mp_uint_t us) {
-    mp_hal_delay_ms(us / 1000);
+    uint64_t ticks_delay = (uint64_t)us * system_core_clock_mhz;
+    uint64_t start = system_tick_get_u64();
+    while (system_tick_get_u64() - start < ticks_delay) {
+    }
 }
 
 void mp_hal_delay_ms(mp_uint_t ms) {
     uint32_t t0 = mp_hal_ticks_ms();
-    while ((mp_hal_ticks_ms() - t0) < ms) {
-        __WFI();
-    }
+    do {
+        // TODO: power saving wait
+        mp_event_handle_nowait();
+    } while (mp_hal_ticks_ms() - t0 < ms);
 }
 
 uint64_t mp_hal_time_ns(void) {
diff --git a/ports/alif/system_tick.c b/ports/alif/system_tick.c
new file mode 100644
index 0000000000000..95d5391c03855
--- /dev/null
+++ b/ports/alif/system_tick.c
@@ -0,0 +1,128 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "irq.h"
+#include "system_tick.h"
+
+#include "utimer.h"
+
+#define MIN(x, y) ((x) < (y) ? (x) : (y))
+
+#define UTIMER ((UTIMER_Type *)UTIMER_BASE)
+#define UTIMER_CHANNEL (11)
+
+uint64_t system_core_clock_mhz;
+static volatile uint32_t system_tick_hi;
+
+static void system_tick_nvic_config(unsigned int index) {
+    NVIC_ClearPendingIRQ(UTIMER_IRQ0_IRQn + UTIMER_CHANNEL * 8 + index);
+    NVIC_SetPriority(UTIMER_IRQ0_IRQn + UTIMER_CHANNEL * 8 + index, IRQ_PRI_SYSTEM_TICK);
+    NVIC_EnableIRQ(UTIMER_IRQ0_IRQn + UTIMER_CHANNEL * 8 + index);
+}
+
+void system_tick_init(void) {
+    system_tick_hi = 0;
+    system_core_clock_mhz = SystemCoreClock / 1000000;
+
+    // Configure NVIC OVER_FLOW interrupt.
+    system_tick_nvic_config(7);
+
+    utimer_clock_enable(UTIMER, UTIMER_CHANNEL);
+    utimer_channel_config cfg = { 0 };
+    cfg.fixed_buffer = false;
+    utimer_config_direction(UTIMER, UTIMER_CHANNEL, UTIMER_COUNTER_UP, &cfg);
+    utimer_set_count(UTIMER, UTIMER_CHANNEL, UTIMER_CNTR_PTR, 0xffffffff);
+    utimer_unmask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_OVER_FLOW_MASK);
+    utimer_control_enable(UTIMER, UTIMER_CHANNEL);
+    utimer_counter_start(UTIMER, UTIMER_CHANNEL);
+
+    // Set up the UTIMER compare interrupt, to be used later.
+    system_tick_nvic_config(2);
+    UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_COMPARE_CTRL_A |= COMPARE_CTRL_DRV_COMPARE_EN;
+}
+
+// COMPARE_A_BUF1
+void UTIMER_IRQ90Handler(void) {
+    uint32_t chan_interrupt = UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_CHAN_INTERRUPT;
+    if (chan_interrupt & CHAN_INTERRUPT_COMPARE_A_BUF1_MASK) {
+        utimer_clear_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_A_BUF1_MASK);
+        __SEV();
+    }
+}
+
+// OVER_FLOW
+void UTIMER_IRQ95Handler(void) {
+    uint32_t chan_interrupt = UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_CHAN_INTERRUPT;
+    if (chan_interrupt & CHAN_INTERRUPT_OVER_FLOW_MASK) {
+        utimer_clear_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_OVER_FLOW_MASK);
+        ++system_tick_hi;
+    }
+}
+
+uint32_t system_tick_get_u32(void) {
+    return utimer_get_count(UTIMER, UTIMER_CHANNEL, UTIMER_CNTR);
+}
+
+uint64_t system_tick_get_u64(void) {
+    uint32_t irq_state = disable_irq();
+    uint32_t ticks_lo = utimer_get_count(UTIMER, UTIMER_CHANNEL, UTIMER_CNTR);
+    uint32_t ticks_hi = system_tick_hi;
+    uint32_t chan_interrupt = UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_CHAN_INTERRUPT;
+    enable_irq(irq_state);
+
+    if (chan_interrupt & CHAN_INTERRUPT_OVER_FLOW_MASK) {
+        // The timer had an overflow while interrupts were disabled.
+        if (ticks_lo < 0x80000000) {
+            // The timer had an overflow just before we sampled it.
+            ++ticks_hi;
+        }
+    }
+
+    // This ticks runs at SystemCoreClock.
+    return (uint64_t)ticks_hi << 32 | ticks_lo;
+}
+
+void system_tick_wfe_with_timeout_us(uint32_t timeout_us) {
+    // Maximum 10 second timeout, to not overflow signed 32-bit ticks when
+    // system_core_clock_mhz==400.
+    uint32_t timeout_ticks = MIN(timeout_us, 10000000) * system_core_clock_mhz;
+
+    // Set up the UTIMER compare interrupt to fire after the given timeout.
+    uint32_t cntr = utimer_get_count(UTIMER, UTIMER_CHANNEL, UTIMER_CNTR);
+    utimer_set_count(UTIMER, UTIMER_CHANNEL, UTIMER_COMPARE_A_BUF1, cntr + timeout_ticks);
+    utimer_clear_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_A_BUF1_MASK);
+    utimer_unmask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_A_BUF1_MASK);
+
+    // Wait for an event (or compare timeout event) if the timeout hasn't expired yet
+    // (this check handles the case of short timeouts).
+    uint32_t cntr2 = utimer_get_count(UTIMER, UTIMER_CHANNEL, UTIMER_CNTR);
+    if ((uint32_t)(cntr2 - cntr) < timeout_ticks) {
+        __WFE();
+    }
+
+    // Disable the UTIMER compare interrupt.
+    utimer_mask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_A_BUF1_MASK);
+}
diff --git a/ports/alif/system_tick.h b/ports/alif/system_tick.h
new file mode 100644
index 0000000000000..307c87a345fb8
--- /dev/null
+++ b/ports/alif/system_tick.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_SYSTEM_TICK_H
+#define MICROPY_INCLUDED_ALIF_SYSTEM_TICK_H
+
+#include <stdint.h>
+
+extern uint64_t system_core_clock_mhz;
+
+void system_tick_init(void);
+uint32_t system_tick_get_u32(void);
+uint64_t system_tick_get_u64(void);
+void system_tick_wfe_with_timeout_us(uint32_t timeout_us);
+
+#endif // MICROPY_INCLUDED_ALIF_SYSTEM_TICK_H

From 975f84f2adc1f89b4c9349b6a6e83f6bc4ec2fd6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Jan 2024 16:08:45 +1100
Subject: [PATCH 2050/3129] alif/mphalport: Enable efficient events and
 implement quiet timing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mphalport.c | 12 ++++++++----
 ports/alif/mphalport.h | 13 ++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index abb71aae69624..8d0fa1b92ba4a 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -133,10 +133,14 @@ void mp_hal_delay_us(mp_uint_t us) {
 
 void mp_hal_delay_ms(mp_uint_t ms) {
     uint32_t t0 = mp_hal_ticks_ms();
-    do {
-        // TODO: power saving wait
-        mp_event_handle_nowait();
-    } while (mp_hal_ticks_ms() - t0 < ms);
+    mp_event_handle_nowait();
+    for (;;) {
+        uint32_t t1 = mp_hal_ticks_ms();
+        if (t1 - t0 >= ms) {
+            break;
+        }
+        mp_event_wait_ms(ms - (t1 - t0));
+    }
 }
 
 uint64_t mp_hal_time_ns(void) {
diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
index 1b8c854fd0b95..8098c2650df01 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -27,6 +27,7 @@
 #include "py/ringbuf.h"
 #include "shared/runtime/interrupt_char.h"
 #include "irq.h"
+#include "system_tick.h"
 #include ALIF_CMSIS_H
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
@@ -47,8 +48,7 @@
         if ((TIMEOUT_MS) < 0) { \
             __WFE(); \
         } else { \
-            /* TODO */ \
-            __WFE(); \
+            system_tick_wfe_with_timeout_us(TIMEOUT_MS * 1000); \
         } \
     } while (0)
 
@@ -57,13 +57,12 @@
     (SCB_CleanDCache_by_Addr((uint32_t *)((uint32_t)addr & ~0x1f), \
     ((uint32_t)((uint8_t *)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
 
-extern ringbuf_t stdin_ringbuf;
-
-// TODO
-#define mp_hal_quiet_timing_enter() 0
-#define mp_hal_quiet_timing_exit(x) (void)x
+#define mp_hal_quiet_timing_enter() raise_irq_pri(IRQ_PRI_QUIET_TIMING)
+#define mp_hal_quiet_timing_exit(irq_state) restore_irq_pri(irq_state)
 #define mp_hal_delay_us_fast mp_hal_delay_us
 
+extern ringbuf_t stdin_ringbuf;
+
 /******************************************************************************/
 // C-level pin HAL
 

From ada0939c5f474e7204b6d3468bd27603daea676b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Jan 2024 23:41:00 +1100
Subject: [PATCH 2051/3129] alif/system_tick: Integrate soft timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/main.c        |  2 ++
 ports/alif/mphalport.c   | 17 ++++++++++++++++
 ports/alif/system_tick.c | 44 ++++++++++++++++++++++++++++++++++++++--
 ports/alif/system_tick.h |  2 ++
 4 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/ports/alif/main.c b/ports/alif/main.c
index 9293d74c0b80d..b4e2434399970 100644
--- a/ports/alif/main.c
+++ b/ports/alif/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 "shared/tinyusb/mp_usbd.h"
 #include "tusb.h"
 #include "mpuart.h"
@@ -119,6 +120,7 @@ void _start(void) {
 
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        soft_timer_deinit();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index 8d0fa1b92ba4a..ba58923f2fe2a 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -31,11 +31,13 @@
 #include "py/stream.h"
 #include "extmod/misc.h"
 #include "shared/runtime/interrupt_char.h"
+#include "shared/runtime/softtimer.h"
 #include "shared/timeutils/timeutils.h"
 #include "shared/tinyusb/mp_usbd.h"
 #include "shared/tinyusb/mp_usbd_cdc.h"
 #include "tusb.h"
 #include "mpuart.h"
+#include "pendsv.h"
 #include "system_tick.h"
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
@@ -146,3 +148,18 @@ void mp_hal_delay_ms(mp_uint_t ms) {
 uint64_t mp_hal_time_ns(void) {
     return 0;
 }
+
+void system_tick_schedule_callback(void) {
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+}
+
+uint32_t soft_timer_get_ms(void) {
+    return mp_hal_ticks_ms();
+}
+
+void soft_timer_schedule_at_ms(uint32_t ticks_ms) {
+    int32_t ms = soft_timer_ticks_diff(ticks_ms, mp_hal_ticks_ms());
+    ms = MAX(0, ms);
+    ms = MIN(ms, 4000000); // ensure ms * 1000 doesn't overflow
+    system_tick_schedule_after_us(ms * 1000);
+}
diff --git a/ports/alif/system_tick.c b/ports/alif/system_tick.c
index 95d5391c03855..5cdf45cba0126 100644
--- a/ports/alif/system_tick.c
+++ b/ports/alif/system_tick.c
@@ -59,9 +59,13 @@ void system_tick_init(void) {
     utimer_control_enable(UTIMER, UTIMER_CHANNEL);
     utimer_counter_start(UTIMER, UTIMER_CHANNEL);
 
-    // Set up the UTIMER compare interrupt, to be used later.
+    // Set up the UTIMER compare A interrupt, to be used by system_tick_wfe_with_timeout_us.
     system_tick_nvic_config(2);
     UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_COMPARE_CTRL_A |= COMPARE_CTRL_DRV_COMPARE_EN;
+
+    // Set up the UTIMER compare B interrupt, to be used by soft-timer.
+    system_tick_nvic_config(4);
+    UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_COMPARE_CTRL_B |= COMPARE_CTRL_DRV_COMPARE_EN;
 }
 
 // COMPARE_A_BUF1
@@ -73,6 +77,17 @@ void UTIMER_IRQ90Handler(void) {
     }
 }
 
+// COMPARE_B_BUF1
+void UTIMER_IRQ92Handler(void) {
+    uint32_t chan_interrupt = UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_CHAN_INTERRUPT;
+    if (chan_interrupt & CHAN_INTERRUPT_COMPARE_B_BUF1_MASK) {
+        utimer_clear_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_B_BUF1_MASK);
+        utimer_mask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_B_BUF1_MASK);
+        system_tick_schedule_callback();
+        __SEV();
+    }
+}
+
 // OVER_FLOW
 void UTIMER_IRQ95Handler(void) {
     uint32_t chan_interrupt = UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_CHAN_INTERRUPT;
@@ -106,7 +121,7 @@ uint64_t system_tick_get_u64(void) {
 }
 
 void system_tick_wfe_with_timeout_us(uint32_t timeout_us) {
-    // Maximum 10 second timeout, to not overflow signed 32-bit ticks when
+    // Maximum 10 second timeout, to not overflow 32-bit ticks when
     // system_core_clock_mhz==400.
     uint32_t timeout_ticks = MIN(timeout_us, 10000000) * system_core_clock_mhz;
 
@@ -126,3 +141,28 @@ void system_tick_wfe_with_timeout_us(uint32_t timeout_us) {
     // Disable the UTIMER compare interrupt.
     utimer_mask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_A_BUF1_MASK);
 }
+
+void system_tick_schedule_after_us(uint32_t ticks_us) {
+    // Disable the interrupt in case it's still active.
+    utimer_mask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_B_BUF1_MASK);
+
+    // Maximum 10 second timeout, to not overflow 32-bit ticks when
+    // system_core_clock_mhz==400.
+    uint32_t timeout_ticks = MIN(ticks_us, 10000000) * system_core_clock_mhz;
+
+    // Set up the UTIMER compare interrupt to fire after the given timeout.
+    uint32_t cntr = utimer_get_count(UTIMER, UTIMER_CHANNEL, UTIMER_CNTR);
+    utimer_set_count(UTIMER, UTIMER_CHANNEL, UTIMER_COMPARE_B_BUF1, cntr + timeout_ticks);
+    utimer_clear_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_B_BUF1_MASK);
+    utimer_unmask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_B_BUF1_MASK);
+
+    // Handle the case of short timeouts.
+    uint32_t cntr2 = utimer_get_count(UTIMER, UTIMER_CHANNEL, UTIMER_CNTR);
+    if ((uint32_t)(cntr2 - cntr) >= timeout_ticks) {
+        if (!(UTIMER->UTIMER_CHANNEL_CFG[UTIMER_CHANNEL].UTIMER_CHAN_INTERRUPT_MASK & CHAN_INTERRUPT_COMPARE_B_BUF1_MASK)) {
+            // Interrupt is still enabled, so disable it and manually call the callback.
+            utimer_mask_interrupt(UTIMER, UTIMER_CHANNEL, CHAN_INTERRUPT_COMPARE_B_BUF1_MASK);
+            system_tick_schedule_callback();
+        }
+    }
+}
diff --git a/ports/alif/system_tick.h b/ports/alif/system_tick.h
index 307c87a345fb8..2373f9421de7b 100644
--- a/ports/alif/system_tick.h
+++ b/ports/alif/system_tick.h
@@ -34,5 +34,7 @@ void system_tick_init(void);
 uint32_t system_tick_get_u32(void);
 uint64_t system_tick_get_u64(void);
 void system_tick_wfe_with_timeout_us(uint32_t timeout_us);
+void system_tick_schedule_after_us(uint32_t ticks_us);
+void system_tick_schedule_callback(void);
 
 #endif // MICROPY_INCLUDED_ALIF_SYSTEM_TICK_H

From 53b7c14836b00a432855439513721dcf07392041 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Jan 2024 23:41:10 +1100
Subject: [PATCH 2052/3129] alif/modmachine: Enable machine.Timer.

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

diff --git a/ports/alif/modmachine.c b/ports/alif/modmachine.c
index c4102225dabfc..e19150e010d0b 100644
--- a/ports/alif/modmachine.c
+++ b/ports/alif/modmachine.c
@@ -29,6 +29,7 @@
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { 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 void mp_machine_idle(void) {
     mp_event_wait_indefinite();

From 4e62ade4421337944a12a53c05ddd4498ba3be8f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jan 2024 12:00:18 +1100
Subject: [PATCH 2053/3129] alif/se_services: Add SE services interface.

Includes services to get random numbers, reset SoC, get unique-id, dump SoC
info, and CPU control services.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/Makefile      |  12 ++
 ports/alif/irq.h         |   1 +
 ports/alif/main.c        |   2 +
 ports/alif/se_services.c | 247 +++++++++++++++++++++++++++++++++++++++
 ports/alif/se_services.h |  47 ++++++++
 5 files changed, 309 insertions(+)
 create mode 100644 ports/alif/se_services.c
 create mode 100644 ports/alif/se_services.h

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index cd02f4ac2d61c..656cdc0e4cd44 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -42,6 +42,7 @@ INC += -I$(BUILD)
 INC += -I$(BOARD_DIR)
 INC += -I$(CMSIS_DIR)
 INC += -I$(ALIF_DFP_REL_HERE)/drivers/include/
+INC += -I$(ALIF_DFP_REL_HERE)/se_services/include/
 INC += -I$(ALIF_DFP_REL_HERE)/ospi_xip/source/ospi
 INC += -I$(ALIF_DFP_REL_HERE)/Device/common/config/
 INC += -I$(ALIF_DFP_REL_HERE)/Device/common/include/
@@ -120,6 +121,7 @@ SRC_C = \
 	ospi_flash.c \
 	pendsv.c \
 	system_tick.c \
+	se_services.c \
 	usbd.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
@@ -174,13 +176,23 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	Device/common/source/system_M55.c \
 	Device/common/source/system_utils.c \
 	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
+	drivers/source/mhu_driver.c \
+	drivers/source/mhu_receiver.c \
+	drivers/source/mhu_sender.c \
 	drivers/source/pinconf.c \
 	drivers/source/uart.c \
 	drivers/source/utimer.c \
 	ospi_xip/source/ospi/ospi_drv.c \
+	se_services/source/services_host_application.c \
+	se_services/source/services_host_boot.c \
+	se_services/source/services_host_clocks.c \
+	se_services/source/services_host_cryptocell.c \
+	se_services/source/services_host_handler.c \
+	se_services/source/services_host_system.c \
 	)
 
 $(BUILD)/tinyusb_port/tusb_alif_dcd.o: CFLAGS += -Wno-unused-variable -DTUSB_ALIF_NO_IRQ_CFG=1
+$(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_boot.o: CFLAGS += -Wno-stringop-truncation
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(GEN_PINS_SRC)
diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index 723f89f1d907e..e2e0685c679a9 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -40,6 +40,7 @@
 
 #define NVIC_PRIORITYGROUP_7    ((uint32_t)0x00000000U)
 #define IRQ_PRI_SYSTEM_TICK     NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 0, 0)
+#define IRQ_PRI_MHU             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 0, 0)
 #define IRQ_PRI_QUIET_TIMING    NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
 #define IRQ_PRI_UART_REPL       NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
 #define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 5, 0)
diff --git a/ports/alif/main.c b/ports/alif/main.c
index b4e2434399970..2d3134176d32e 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -39,6 +39,7 @@
 #include "mpuart.h"
 #include "ospi_flash.h"
 #include "pendsv.h"
+#include "se_services.h"
 #include "system_tick.h"
 
 extern uint8_t __StackTop, __StackLimit;
@@ -60,6 +61,7 @@ void _start(void) {
     MICROPY_BOARD_STARTUP();
 
     pendsv_init();
+    se_services_init();
 
     MICROPY_BOARD_EARLY_INIT();
 
diff --git a/ports/alif/se_services.c b/ports/alif/se_services.c
new file mode 100644
index 0000000000000..cbf66bfac6ccd
--- /dev/null
+++ b/ports/alif/se_services.c
@@ -0,0 +1,247 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "irq.h"
+#include "se_services.h"
+
+#include "mhu.h"
+#include "services_lib_bare_metal.h"
+#include "services_lib_protocol.h"
+
+#include "py/mphal.h"
+
+// MHU indices.
+#define MHU_M55_SE_MHU0 0
+#define MAX_MHU         1
+
+// The following timeout is implemented in se_services_handle.c as a
+// simple loop busy polling on a variable set from an IRQ.
+#define TIMEOUT         10000000
+
+typedef struct {
+    volatile unsigned int RST_CTRL; // 0x1A010318
+    volatile unsigned int RST_STAT; // 0x1A01031C
+} CPU_Type;
+
+// HE CPU register flags
+#define RST_CTRL_CPUWAIT_MASK   (1 << 0)
+#define RST_CTRL_RST_REQ_MASK   (1 << 1)
+#define RST_STAT_RST_ACK_MASK   (3 << 1)
+#define HE_CPU                  ((CPU_Type *)0x1A010318)
+
+static const uint32_t mhu_sender_base_address_list[MAX_MHU] = {
+    MHU_SESS_S_TX_BASE,
+};
+
+static const uint32_t mhu_receiver_base_address_list[MAX_MHU] = {
+    MHU_SESS_S_RX_BASE,
+};
+
+// Must be aligned as a uint32_t.
+static uint32_t packet_buffer[SERVICES_MAX_PACKET_BUFFER_SIZE / sizeof(uint32_t)];
+
+static mhu_driver_out_t mhu_driver_out;
+static uint32_t se_services_handle;
+
+void MHU_SESS_S_TX_IRQHandler(void) {
+    mhu_driver_out.sender_irq_handler(MHU_M55_SE_MHU0);
+}
+
+void MHU_SESS_S_RX_IRQHandler(void) {
+    mhu_driver_out.receiver_irq_handler(MHU_M55_SE_MHU0);
+}
+
+int dummy_printf(const char *fmt, ...) {
+    (void)fmt;
+    return 0;
+}
+
+void se_services_init(void) {
+    // Initialize MHU.
+    mhu_driver_in_t mhu_driver_in;
+    mhu_driver_in.sender_base_address_list = (uint32_t *)mhu_sender_base_address_list;
+    mhu_driver_in.receiver_base_address_list = (uint32_t *)mhu_receiver_base_address_list;
+    mhu_driver_in.mhu_count = MAX_MHU;
+    mhu_driver_in.send_msg_acked_callback = SERVICES_send_msg_acked_callback;
+    mhu_driver_in.rx_msg_callback = SERVICES_rx_msg_callback;
+    mhu_driver_in.debug_print = NULL; // not currently used by MHU_driver_initialize
+    MHU_driver_initialize(&mhu_driver_in, &mhu_driver_out);
+
+    // Initialize SE services.
+    services_lib_t services_init_params = {
+        .packet_buffer_address = (uint32_t)packet_buffer,
+        .fn_send_mhu_message = mhu_driver_out.send_message,
+        .fn_wait_ms = NULL, // not currently used by services_host_handler.c
+        .wait_timeout = TIMEOUT,
+        .fn_print_msg = dummy_printf,
+    };
+    SERVICES_initialize(&services_init_params);
+
+    // Create SE services channel for sending requests.
+    se_services_handle = SERVICES_register_channel(MHU_M55_SE_MHU0, 0);
+
+    // Enable MHU interrupts.
+    NVIC_ClearPendingIRQ(MHU_SESS_S_RX_IRQ_IRQn);
+    NVIC_SetPriority(MHU_SESS_S_RX_IRQ_IRQn, IRQ_PRI_MHU);
+    NVIC_EnableIRQ(MHU_SESS_S_RX_IRQ_IRQn);
+    NVIC_ClearPendingIRQ(MHU_SESS_S_TX_IRQ_IRQn);
+    NVIC_SetPriority(MHU_SESS_S_TX_IRQ_IRQn, IRQ_PRI_MHU);
+    NVIC_EnableIRQ(MHU_SESS_S_TX_IRQ_IRQn);
+
+    // Send heartbeat services requests until one succeeds.
+    SERVICES_synchronize_with_se(se_services_handle);
+}
+
+void se_services_dump_device_data(void) {
+    uint32_t error_code;
+
+    uint8_t revision[80];
+    SERVICES_get_se_revision(se_services_handle, revision, &error_code);
+
+    SERVICES_version_data_t data;
+    SERVICES_system_get_device_data(se_services_handle, &data, &error_code);
+
+    printf("SE revision: %s\n", revision);
+    printf("ALIF_PN:     %s\n", data.ALIF_PN);
+    printf("Raw device data:\n");
+    for (int i = 0; i < sizeof(data); ++i) {
+        printf(" %02x", ((uint8_t *)&data)[i]);
+        if (i % 16 == 15) {
+            printf("\n");
+        }
+    }
+    printf("\n");
+}
+
+void se_services_get_unique_id(uint8_t id[5]) {
+    uint32_t error_code;
+    SERVICES_version_data_t data;
+    SERVICES_system_get_device_data(se_services_handle, &data, &error_code);
+    // The MfgData has 5 bytes of valid data, at least on REV_B2.
+    memcpy(id, data.MfgData, 5);
+}
+
+__attribute__((noreturn)) void se_services_reset_soc(void) {
+    SERVICES_boot_reset_soc(se_services_handle);
+    NVIC_SystemReset();
+}
+
+uint64_t se_services_rand64(void) {
+    // If the SE core is not ready then the return value can be
+    // SERVICES_REQ_NOT_ACKNOWLEDGE.  So retry a few times.
+    for (int retry = 0; retry < 100; ++retry) {
+        uint64_t value;
+        int32_t error_code;
+        uint32_t ret = SERVICES_cryptocell_get_rnd(se_services_handle, sizeof(uint64_t), &value, &error_code);
+        if (ret == SERVICES_REQ_SUCCESS) {
+            return value;
+        }
+    }
+
+    // No random number available.
+    return 0;
+}
+
+uint32_t se_services_enable_clock(clock_enable_t clock, bool enable) {
+    uint32_t error_code;
+    SERVICES_clocks_enable_clock(se_services_handle, clock, enable, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_select_pll_source(pll_source_t source, pll_target_t target) {
+    uint32_t error_code;
+    SERVICES_clocks_select_pll_source(se_services_handle, source, target, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_get_run_profile(run_profile_t *profile) {
+    uint32_t error_code;
+    SERVICES_get_run_cfg(se_services_handle, profile, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_set_run_profile(run_profile_t *profile) {
+    uint32_t error_code;
+    SERVICES_set_run_cfg(se_services_handle, profile, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_get_off_profile(off_profile_t *profile) {
+    uint32_t error_code;
+    SERVICES_get_off_cfg(se_services_handle, profile, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_set_off_profile(off_profile_t *profile) {
+    uint32_t error_code;
+    SERVICES_set_off_cfg(se_services_handle, profile, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_boot_process_toc_entry(const uint8_t *image_id) {
+    uint32_t error_code;
+    SERVICES_boot_process_toc_entry(se_services_handle, image_id, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_boot_cpu(uint32_t cpu_id, uint32_t address) {
+    uint32_t error_code;
+    SERVICES_boot_cpu(se_services_handle, cpu_id, address, &error_code);
+    return error_code;
+}
+
+uint32_t se_services_boot_reset_cpu(uint32_t cpu_id) {
+    uint32_t error_code;
+    if (HE_CPU->RST_CTRL & RST_CTRL_CPUWAIT_MASK) {
+        // CPU held in reset
+        return SERVICES_REQ_SUCCESS;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(1)) {
+        uint32_t ret = SERVICES_boot_reset_cpu(se_services_handle, cpu_id, &error_code);
+        if (ret != SERVICES_REQ_SUCCESS) {
+            return error_code;
+        }
+
+        if ((HE_CPU->RST_STAT & RST_STAT_RST_ACK_MASK) == 0x4) {
+            return SERVICES_REQ_SUCCESS;
+        }
+
+        if ((mp_hal_ticks_ms() - start) >= 100) {
+            return SERVICES_REQ_TIMEOUT;
+        }
+    }
+    return error_code;
+}
+
+uint32_t se_services_boot_release_cpu(uint32_t cpu_id) {
+    uint32_t error_code;
+    SERVICES_boot_release_cpu(se_services_handle, cpu_id, &error_code);
+    return error_code;
+}
diff --git a/ports/alif/se_services.h b/ports/alif/se_services.h
new file mode 100644
index 0000000000000..b1079130c1635
--- /dev/null
+++ b/ports/alif/se_services.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_SE_SERVICES_H
+#define MICROPY_INCLUDED_ALIF_SE_SERVICES_H
+
+#include "services_lib_api.h"
+
+void se_services_init(void);
+void se_services_dump_device_data(void);
+void se_services_get_unique_id(uint8_t id[5]);
+__attribute__((noreturn)) void se_services_reset_soc(void);
+uint64_t se_services_rand64(void);
+uint32_t se_services_enable_clock(clock_enable_t clock, bool enable);
+uint32_t se_services_select_pll_source(pll_source_t source, pll_target_t target);
+uint32_t se_services_get_run_profile(run_profile_t *profile);
+uint32_t se_services_set_run_profile(run_profile_t *profile);
+uint32_t se_services_get_off_profile(off_profile_t *profile);
+uint32_t se_services_set_off_profile(off_profile_t *profile);
+
+uint32_t se_services_boot_process_toc_entry(const uint8_t *image_id);
+uint32_t se_services_boot_cpu(uint32_t cpu_id, uint32_t address);
+uint32_t se_services_boot_reset_cpu(uint32_t cpu_id);
+uint32_t se_services_boot_release_cpu(uint32_t cpu_id);
+#endif // MICROPY_INCLUDED_ALIF_SE_SERVICES_H

From c6cb082ed1716396f436ae4983131be2dcbf0447 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jan 2024 12:00:37 +1100
Subject: [PATCH 2054/3129] alif/mpconfigport: Enable os.urandom().

Uses the SE services to provide random numbers.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/modos.c        | 49 +++++++++++++++++++++++++++++++++++++++
 ports/alif/mpconfigport.h |  2 ++
 2 files changed, 51 insertions(+)
 create mode 100644 ports/alif/modos.c

diff --git a/ports/alif/modos.c b/ports/alif/modos.c
new file mode 100644
index 0000000000000..9c8c84268ca16
--- /dev/null
+++ b/ports/alif/modos.c
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "se_services.h"
+
+#if MICROPY_PY_OS_URANDOM
+static mp_obj_t mp_os_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+    uint64_t rnd = 0;
+    size_t rnd_bits = 0;
+    for (int i = 0; i < n; i++) {
+        if (rnd_bits == 0) {
+            rnd = se_services_rand64();
+            rnd_bits = 64;
+        }
+        vstr.buf[i] = rnd;
+        rnd >>= 8;
+        rnd_bits -= 8;
+    }
+    return mp_obj_new_bytes_from_vstr(&vstr);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
+#endif
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 2d8e3b2a09dbe..74cfe8edaab74 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -87,10 +87,12 @@
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
+#define MICROPY_PY_OS_INCLUDEFILE               "ports/alif/modos.c"
 #define MICROPY_PY_OS_DUPTERM                   (1)
 #define MICROPY_PY_OS_SEP                       (1)
 #define MICROPY_PY_OS_SYNC                      (1)
 #define MICROPY_PY_OS_UNAME                     (1)
+#define MICROPY_PY_OS_URANDOM                   (1)
 #define MICROPY_PY_TIME                         (1)
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/alif/modmachine.c"

From 64af93e74e9de36fd6106e6bea4923fc300afb49 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jan 2024 12:03:46 +1100
Subject: [PATCH 2055/3129] alif/mpconfigport: Enable
 MICROPY_PY_RANDOM_SEED_INIT_FUNC.

Uses the SE services to provide a random seed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 74cfe8edaab74..b01eb1908abb0 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -93,6 +93,7 @@
 #define MICROPY_PY_OS_SYNC                      (1)
 #define MICROPY_PY_OS_UNAME                     (1)
 #define MICROPY_PY_OS_URANDOM                   (1)
+#define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (se_services_rand64())
 #define MICROPY_PY_TIME                         (1)
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/alif/modmachine.c"
@@ -155,3 +156,6 @@ extern void panic(const char *);
 #ifndef MICROPY_BOARD_ENTER_BOOTLOADER
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
 #endif
+
+// Needed for MICROPY_PY_RANDOM_SEED_INIT_FUNC.
+uint64_t se_services_rand64(void);

From 2a580b05ada2ce6c87d6e94196178c511ef7acdf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Feb 2024 17:50:15 +1100
Subject: [PATCH 2056/3129] alif/modalif: Add alif.info() function.

Calls the SE services to print information about the SoC.

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

diff --git a/ports/alif/modalif.c b/ports/alif/modalif.c
index 69b7e6c5c8e87..5577b53eaca85 100644
--- a/ports/alif/modalif.c
+++ b/ports/alif/modalif.c
@@ -27,10 +27,18 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "modalif.h"
+#include "se_services.h"
+
+static mp_obj_t alif_info(void) {
+    se_services_dump_device_data();
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(alif_info_obj, alif_info);
 
 static const mp_rom_map_elem_t alif_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_alif) },
     { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&alif_flash_type) },
+    { MP_ROM_QSTR(MP_QSTR_info),                MP_ROM_PTR(&alif_info_obj) },
     #if MICROPY_HW_USB_MSC
     // Attribute to indicate USB MSC is enabled.
     { MP_ROM_QSTR(MP_QSTR_usb_msc),             MP_ROM_TRUE },

From 2f85a19d7d7c342aefa6e3d628c1d398f53d3adf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Feb 2024 17:50:34 +1100
Subject: [PATCH 2057/3129] alif/modmachine: Implement machine.unique_id(), fix
 machine.reset().

They both use SE services.

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

diff --git a/ports/alif/modmachine.c b/ports/alif/modmachine.c
index e19150e010d0b..29a70305dd516 100644
--- a/ports/alif/modmachine.c
+++ b/ports/alif/modmachine.c
@@ -27,6 +27,8 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
+#include "se_services.h"
+
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) }, \
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) }, \
@@ -36,11 +38,13 @@ static void mp_machine_idle(void) {
 }
 
 static mp_obj_t mp_machine_unique_id(void) {
-    return mp_obj_new_bytes((const uint8_t *)"ABCD", 4);
+    uint8_t id[5];
+    se_services_get_unique_id(id);
+    return mp_obj_new_bytes(id, sizeof(id));
 }
 
 NORETURN static void mp_machine_reset(void) {
-    NVIC_SystemReset();
+    se_services_reset_soc();
 }
 
 NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {

From 31d18c5885fd53c6aacc80428bdfb8b0bbdcd7cb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Feb 2024 17:51:03 +1100
Subject: [PATCH 2058/3129] alif/usbd: Implement proper USB serial number.

Using SE services to get the SoC unique id.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/usbd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/alif/usbd.c b/ports/alif/usbd.c
index 9df6610683507..da16905d43cd9 100644
--- a/ports/alif/usbd.c
+++ b/ports/alif/usbd.c
@@ -30,10 +30,11 @@
 
 #include "shared/tinyusb/mp_usbd.h"
 #include "tusb.h"
+#include "se_services.h"
 
 void mp_usbd_port_get_serial_number(char *serial_buf) {
-    // TODO
-    uint8_t id[8] = "ABCDEFGH";
+    uint8_t id[5];
+    se_services_get_unique_id(id);
     MP_STATIC_ASSERT(sizeof(id) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
     mp_usbd_hex_str(serial_buf, id, sizeof(id));
 }

From 62beb541e76e7776cb402fabc10a6116da8f2dcf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Feb 2024 18:05:05 +1100
Subject: [PATCH 2059/3129] alif/machine_adc: Add basic ADC support.

ADC12 information has been added to pin struct.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/Makefile         |   1 +
 ports/alif/irq.h            |   1 +
 ports/alif/machine_adc.c    | 225 ++++++++++++++++++++++++++++++++++++
 ports/alif/mcu/make-pins.py |  33 +++++-
 ports/alif/mpconfigport.h   |   2 +
 ports/alif/mphalport.h      |   2 +
 6 files changed, 263 insertions(+), 1 deletion(-)
 create mode 100644 ports/alif/machine_adc.c

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index 656cdc0e4cd44..068e34575a143 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -176,6 +176,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	Device/common/source/system_M55.c \
 	Device/common/source/system_utils.c \
 	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
+	drivers/source/adc.c \
 	drivers/source/mhu_driver.c \
 	drivers/source/mhu_receiver.c \
 	drivers/source/mhu_sender.c \
diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index e2e0685c679a9..a20ff7aebdef1 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -43,6 +43,7 @@
 #define IRQ_PRI_MHU             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 0, 0)
 #define IRQ_PRI_QUIET_TIMING    NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
 #define IRQ_PRI_UART_REPL       NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
+#define IRQ_PRI_ADC             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 3, 0)
 #define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 5, 0)
 #define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
 
diff --git a/ports/alif/machine_adc.c b/ports/alif/machine_adc.c
new file mode 100644
index 0000000000000..91eb95b5ba002
--- /dev/null
+++ b/ports/alif/machine_adc.c
@@ -0,0 +1,225 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
+
+#include "py/mphal.h"
+
+#include "analog_config.h"
+#include "adc.h"
+#include "sys_ctrl_adc.h"
+
+#define ADC_CHANNEL_TEMP_SENSOR (6)
+#define ADC_CHANNEL_INT_VREF (7)
+
+static const uint8_t adc_instance_table[4] = {
+    ADC_INSTANCE_ADC12_0,
+    ADC_INSTANCE_ADC12_1,
+    ADC_INSTANCE_ADC12_2,
+    ADC_INSTANCE_ADC24_0,
+};
+
+static ADC_Type *const adc_regs_table[4] = {
+    (ADC_Type *)ADC120_BASE,
+    (ADC_Type *)ADC121_BASE,
+    (ADC_Type *)ADC122_BASE,
+    (ADC_Type *)ADC24_BASE,
+};
+
+static bool adc_inited[4];
+static conv_info_t adc_conv_info_table[4];
+
+static void adc_nvic_config(unsigned int irq) {
+    NVIC_ClearPendingIRQ(irq);
+    NVIC_SetPriority(irq, IRQ_PRI_ADC);
+    NVIC_EnableIRQ(irq);
+}
+
+static void adc_init(uint8_t adc_periph) {
+    if (adc_inited[adc_periph]) {
+        return;
+    }
+
+    ADC_Type *regs = adc_regs_table[adc_periph];
+    uint8_t adc_instance = adc_instance_table[adc_periph];
+    conv_info_t *conv_info = &adc_conv_info_table[adc_periph];
+
+    adc_set_clk_control(adc_instance, true);
+    enable_cmp_periph_clk();
+    analog_config_vbat_reg2();
+    analog_config_cmp_reg2();
+    adc_set_differential_ctrl(adc_instance, false);
+    adc_set_comparator_ctrl(adc_instance, true, 2);
+
+    if (adc_instance == ADC_INSTANCE_ADC24_0) {
+        enable_adc24();
+        set_adc24_output_rate(0);
+        set_adc24_bias(0);
+    } else {
+        adc_set_sample_width(regs, 32);
+    }
+
+    adc_set_clk_div(regs, 4);
+    adc_set_avg_sample(regs, 32);
+    adc_set_n_shift_bit(regs, 1, 1);
+    adc_set_single_ch_scan_mode(regs, conv_info);
+    adc_unmask_interrupt(regs);
+
+    adc_nvic_config(ADC120_DONE0_IRQ_IRQn);
+    adc_nvic_config(ADC120_DONE1_IRQ_IRQn);
+    adc_nvic_config(ADC121_DONE0_IRQ_IRQn);
+    adc_nvic_config(ADC121_DONE1_IRQ_IRQn);
+    adc_nvic_config(ADC122_DONE0_IRQ_IRQn);
+    adc_nvic_config(ADC122_DONE1_IRQ_IRQn);
+}
+
+static uint16_t adc_config_and_read_u16(unsigned int adc_periph, uint32_t channel) {
+    ADC_Type *adc_regs = adc_regs_table[adc_periph];
+    conv_info_t *conv_info = &adc_conv_info_table[adc_periph];
+
+    conv_info->status = ADC_CONV_STAT_NONE;
+    conv_info->mode = ADC_CONV_MODE_SINGLE_SHOT;
+
+    // Select channel and start conversion.
+    adc_init_channel_select(adc_regs, channel);
+    adc_set_single_ch_scan_mode(adc_regs, conv_info);
+    adc_enable_single_shot_conv(adc_regs);
+
+    // Wait for conversion to complete.
+    while (!(conv_info->status & ADC_CONV_STAT_COMPLETE)) {
+        __WFE();
+    }
+
+    return conv_info->sampled_value;
+}
+
+static void adc_done0_irq_handler_helper(unsigned int adc_periph) {
+    adc_done0_irq_handler(adc_regs_table[adc_periph], &adc_conv_info_table[adc_periph]);
+}
+
+static void adc_done1_irq_handler_helper(unsigned int adc_periph) {
+    adc_done1_irq_handler(adc_regs_table[adc_periph], &adc_conv_info_table[adc_periph]);
+}
+
+void ADC120_DONE0_IRQHandler(void) {
+    adc_done0_irq_handler_helper(0);
+    __SEV();
+}
+
+void ADC120_DONE1_IRQHandler(void) {
+    adc_done1_irq_handler_helper(0);
+    __SEV();
+}
+
+void ADC121_DONE0_IRQHandler(void) {
+    adc_done0_irq_handler_helper(1);
+    __SEV();
+}
+
+void ADC121_DONE1_IRQHandler(void) {
+    adc_done1_irq_handler_helper(1);
+    __SEV();
+}
+
+void ADC122_DONE0_IRQHandler(void) {
+    adc_done0_irq_handler_helper(2);
+    __SEV();
+}
+
+void ADC122_DONE1_IRQHandler(void) {
+    adc_done1_irq_handler_helper(2);
+    __SEV();
+}
+
+/******************************************************************************/
+// MicroPython bindings for machine.ADC
+
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_CHANNEL_TEMP_SENSOR) }, \
+    { MP_ROM_QSTR(MP_QSTR_CORE_VREF), MP_ROM_INT(ADC_CHANNEL_INT_VREF) }, \
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    uint8_t adc_periph;
+    uint8_t adc_channel;
+} machine_adc_obj_t;
+
+static void mp_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, "<ADC12%u channel=%u>", self->adc_periph, self->adc_channel);
+}
+
+// ADC(id)
+static mp_obj_t mp_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];
+
+    uint8_t adc_periph;
+    uint8_t adc_channel;
+    const machine_pin_obj_t *pin = NULL;
+
+    if (mp_obj_is_int(source)) {
+        // Get and validate channel number.
+        adc_channel = mp_obj_get_int(source);
+        if (adc_channel < ADC_CHANNEL_TEMP_SENSOR) {
+            adc_periph = 0;
+        } else if (adc_channel == ADC_CHANNEL_TEMP_SENSOR || adc_channel == ADC_CHANNEL_INT_VREF) {
+            adc_periph = 2;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid channel"));
+        }
+    } else {
+        // Get GPIO and check it has ADC capabilities.
+        pin = mp_hal_get_pin_obj(source);
+        if (pin->adc12_periph <= 2 && pin->adc12_channel <= 5) {
+            // Select the ADC12 peripheral and channel.
+            adc_periph = pin->adc12_periph;
+            adc_channel = pin->adc12_channel;
+            // Configure the pad for analog input.
+            pinconf_set(pin->port, pin->pin, PINMUX_ALTERNATE_FUNCTION_7, PADCTRL_READ_ENABLE);
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't have ADC capabilities"));
+        }
+    }
+
+    // Initialise the ADC peripheral.
+    adc_init(adc_periph);
+
+    // Create ADC object.
+    machine_adc_obj_t *o = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
+    o->adc_periph = adc_periph;
+    o->adc_channel = adc_channel;
+
+    return MP_OBJ_FROM_PTR(o);
+}
+
+// read_u16()
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+    return adc_config_and_read_u16(self->adc_periph, self->adc_channel);
+}
diff --git a/ports/alif/mcu/make-pins.py b/ports/alif/mcu/make-pins.py
index b49db4cfe49bb..d4fbf5d8b8d9a 100755
--- a/ports/alif/mcu/make-pins.py
+++ b/ports/alif/mcu/make-pins.py
@@ -10,11 +10,34 @@
 NUM_PORTS = 16
 NUM_PINS_PER_PORT = 8
 
+# Maps pad name to (adc12_periph, adc12_channel).
+ADC12_ANA_MAP = {
+    "P0_0": (0, 0),
+    "P0_1": (0, 1),
+    "P0_2": (0, 2),
+    "P0_3": (0, 3),
+    "P0_4": (0, 4),
+    "P0_5": (0, 5),
+    "P0_6": (1, 0),
+    "P0_7": (1, 1),
+    "P1_0": (1, 2),
+    "P1_1": (1, 3),
+    "P1_2": (1, 4),
+    "P1_3": (1, 5),
+    "P1_4": (2, 0),
+    "P1_5": (2, 1),
+    "P1_6": (2, 2),
+    "P1_7": (2, 3),
+    "P2_0": (2, 4),
+    "P2_1": (2, 5),
+}
+
 
 class AlifPin(boardgen.Pin):
     # Emit the struct which contains the pin instance.
     def definition(self):
         port, pin = self.name()[1:].split("_")
+        adc12_periph, adc12_channel = ADC12_ANA_MAP.get(self.name(), (3, 7))
         base = "LPGPIO_BASE" if port == "15" else "GPIO{}_BASE".format(port)
         return (
             "{{ "
@@ -22,8 +45,16 @@ def definition(self):
             ".gpio = (GPIO_Type *){base}, "
             ".port = PORT_{port}, "
             ".pin = PIN_{pin}, "
+            ".adc12_periph = {adc12_periph}, "
+            ".adc12_channel = {adc12_channel}, "
             ".name = MP_QSTR_P{port}_{pin} "
-            "}}".format(port=port, pin=pin, base=base)
+            "}}".format(
+                port=port,
+                pin=pin,
+                base=base,
+                adc12_periph=adc12_periph,
+                adc12_channel=adc12_channel,
+            )
         )
 
     # Alif cpu names must be "Pn_m".
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index b01eb1908abb0..95b5e3ca9fa24 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -101,6 +101,8 @@
 #define MICROPY_PY_MACHINE_BOOTLOADER           (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS     (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
+#define MICROPY_PY_MACHINE_ADC                  (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE      "ports/alif/machine_adc.c"
 #define MICROPY_PY_MACHINE_DHT_READINTO         (1)
 #define MICROPY_PY_MACHINE_PULSE                (1)
 #define MICROPY_PY_MACHINE_SOFTI2C              (1)
diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
index 8098c2650df01..7b054b671bcd6 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -85,6 +85,8 @@ typedef struct _machine_pin_obj_t {
     GPIO_Type *gpio;
     uint8_t port;
     uint8_t pin;
+    uint8_t adc12_periph : 2;
+    uint8_t adc12_channel : 3;
     qstr name;
 } machine_pin_obj_t;
 

From b7df5aa86a6f150ab3282f0525fe9c3538ceaef7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 10 Jul 2024 20:30:02 +0300
Subject: [PATCH 2060/3129] alif/mcu: Add ToC config for dual images.

Note that 128K at the beginning of MRAM is reserved for future bootloaders.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/mcu/M55_DUAL_cfg.json | 26 ++++++++++++++++++++++++++
 ports/alif/mcu/M55_HE_cfg.json   | 17 +++++++++++++++++
 ports/alif/mcu/M55_HP_cfg.json   | 17 ++++++++++-------
 3 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 ports/alif/mcu/M55_DUAL_cfg.json
 create mode 100644 ports/alif/mcu/M55_HE_cfg.json

diff --git a/ports/alif/mcu/M55_DUAL_cfg.json b/ports/alif/mcu/M55_DUAL_cfg.json
new file mode 100644
index 0000000000000..81beef5f03614
--- /dev/null
+++ b/ports/alif/mcu/M55_DUAL_cfg.json
@@ -0,0 +1,26 @@
+{
+  "DEVICE": {
+    "disabled" : false,
+    "binary": "app-device-config.json",
+    "version" : "0.5.00",
+    "signed": false
+  },
+  "HP_APP": {
+    "disabled" : false,
+    "binary": "M55_HP/firmware.bin",
+    "mramAddress": "0x80020000",
+    "version": "1.0.0",
+    "cpu_id": "M55_HP",
+    "flags": ["boot"],
+    "signed": false
+  },
+  "HE_APP": {
+    "disabled" : false,
+    "binary": "M55_HE/firmware.bin",
+    "mramAddress": "0x80320000",
+    "version": "1.0.0",
+    "cpu_id": "M55_HE",
+    "flags": ["deferred"],
+    "signed": false
+  }
+}
diff --git a/ports/alif/mcu/M55_HE_cfg.json b/ports/alif/mcu/M55_HE_cfg.json
new file mode 100644
index 0000000000000..83898418043ec
--- /dev/null
+++ b/ports/alif/mcu/M55_HE_cfg.json
@@ -0,0 +1,17 @@
+{
+  "DEVICE": {
+    "disabled" : false,
+    "binary": "app-device-config.json",
+    "version" : "0.5.00",
+    "signed": false
+  },
+  "HE_APP": {
+    "disabled" : false,
+    "binary": "M55_HE/firmware.bin",
+    "mramAddress": "0x80320000",
+    "version": "1.0.0",
+    "cpu_id": "M55_HE",
+    "flags": ["boot"],
+    "signed": false
+  }
+}
diff --git a/ports/alif/mcu/M55_HP_cfg.json b/ports/alif/mcu/M55_HP_cfg.json
index 228ddbf6c9464..d6710f69c77b6 100644
--- a/ports/alif/mcu/M55_HP_cfg.json
+++ b/ports/alif/mcu/M55_HP_cfg.json
@@ -1,14 +1,17 @@
 {
-  "USER_APP": {
-    "binary": "firmware.bin",
-    "mramAddress": "0x80000000",
+  "DEVICE": {
+    "disabled" : false,
+    "binary": "app-device-config.json",
+    "version" : "0.5.00",
+    "signed": false
+  },
+  "HP_APP": {
+    "disabled" : false,
+    "binary": "M55_HP/firmware.bin",
+    "mramAddress": "0x80020000",
     "version": "1.0.0",
     "cpu_id": "M55_HP",
     "flags": ["boot"],
     "signed": false
-  },
-  "DEVICE": {
-    "binary": "app-device-config.json",
-    "version" : "0.5.00"
   }
 }

From 8f82089bd051eb154e7c55951dd29220bde94611 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 10 Jul 2024 20:27:18 +0300
Subject: [PATCH 2061/3129] alif: Support building the port for HE or HP or
 both cores.

With this new Makefile you can build the following:

    make BOARD=MY_BOARD MCU_CORE=M55_HP # build HP firmware/ToC.

    make BOARD=MY_BOARD MCU_CORE=M55_HE # build HE firmware/ToC.

    make BOARD=MY_BOARD MCU_CORE=M55_DUAL # build HE+HP firmware + ToC.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/Makefile          | 269 +++++++----------------------------
 ports/alif/alif.mk           | 257 +++++++++++++++++++++++++++++++++
 ports/alif/mcu/ensemble.ld.S |  43 ++++--
 3 files changed, 343 insertions(+), 226 deletions(-)
 create mode 100644 ports/alif/alif.mk

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index 068e34575a143..5cc334a7cf9f9 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -1,242 +1,96 @@
-################################################################################
-# Initial setup of Makefile environment
-
 BOARD ?= ALIF_ENSEMBLE
 BOARD_DIR ?= boards/$(BOARD)
 BUILD ?= build-$(BOARD)
-
-ifeq ($(wildcard $(BOARD_DIR)/.),)
-$(error Invalid BOARD specified: $(BOARD_DIR))
-endif
-
-include ../../py/mkenv.mk
-include mpconfigport.mk
-include $(BOARD_DIR)/mpconfigboard.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS += qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-include $(TOP)/extmod/extmod.mk
-
-################################################################################
-# Project specific settings and compiler/linker flags
-
-CROSS_COMPILE ?= arm-none-eabi-
+MCU_CORE ?= M55_HP
 GIT_SUBMODULES += lib/tinyusb lib/alif_ensemble-cmsis-dfp lib/alif-security-toolkit
 PORT ?= /dev/ttyACM0
 
 ALIF_TOOLS ?= ../../lib/alif-security-toolkit/toolkit
-ALIF_DFP_REL_TOP ?= lib/alif_ensemble-cmsis-dfp
-ALIF_DFP_REL_HERE ?= $(TOP)/lib/alif_ensemble-cmsis-dfp
-CMSIS_DIR ?= $(TOP)/lib/cmsis/inc
-
-MCU_CORE ?= M55_HP
-ALIF_CONFIG ?= mcu/$(MCU_CORE)_cfg.json
-LD_FILE ?= mcu/ensemble.ld.S
-
-INC += -I.
-INC += -I$(TOP)
-INC += -I$(BUILD)
-INC += -I$(BOARD_DIR)
-INC += -I$(CMSIS_DIR)
-INC += -I$(ALIF_DFP_REL_HERE)/drivers/include/
-INC += -I$(ALIF_DFP_REL_HERE)/se_services/include/
-INC += -I$(ALIF_DFP_REL_HERE)/ospi_xip/source/ospi
-INC += -I$(ALIF_DFP_REL_HERE)/Device/common/config/
-INC += -I$(ALIF_DFP_REL_HERE)/Device/common/include/
-INC += -I$(ALIF_DFP_REL_HERE)/Device/core/$(MCU_CORE)/config/
-INC += -I$(ALIF_DFP_REL_HERE)/Device/core/$(MCU_CORE)/include/
-INC += -I$(ALIF_DFP_REL_HERE)/Device/$(MCU_SERIES)/$(MCU_VARIANT)/
-INC += -I$(TOP)/lib/tinyusb/src
-INC += -Itinyusb_port
-
-GEN_PIN_MKPINS = mcu/make-pins.py
-GEN_PIN_PREFIX = mcu/pins_prefix.c
-GEN_PINS_BOARD_CSV = $(BOARD_DIR)/pins.csv
-GEN_PINS_SRC = $(BUILD)/pins_board.c
-GEN_PINS_HDR = $(HEADER_BUILD)/pins_board.h
-
-CFLAGS_FPU += -mfloat-abi=hard -mfpu=fpv5-d16
-CFLAGS_CORTEX_M55 += -mthumb -mcpu=cortex-m55 -mtune=cortex-m55 $(CFLAGS_FPU)
-
-CFLAGS += $(INC) -Wall -Werror -std=c99 $(CFLAGS_CORTEX_M55) -nostdlib
-CFLAGS += -Wdouble-promotion -Wfloat-conversion
-CFLAGS += -fdata-sections -ffunction-sections
-CFLAGS += -D$(MCU_CORE) -DCORE_$(MCU_CORE) -DALIF_CMSIS_H="\"$(MCU_CORE).h\""
-
-ifeq ($(MICROPY_FLOAT_IMPL),float)
-CFLAGS += -fsingle-precision-constant
-CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
-else
-CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
-endif
-
-AFLAGS = -mthumb -march=armv8.1-m.main $(CFLAGS_FPU)
-
-LDFLAGS += -nostdlib
-LDFLAGS += -T$(BUILD)/ensemble.ld -Map=$@.map --cref --gc-sections
-LDFLAGS += --wrap=dcd_event_handler
 
-# Tune for Debugging or Optimization
-ifeq ($(DEBUG), 1)
-CFLAGS += -Og -ggdb3
-# Disable text compression in debug builds
-MICROPY_ROM_TEXT_COMPRESSION = 0
-else
-CFLAGS += -O2 -DNDEBUG
-endif
-
-LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
-
-JLINK_CMD = '\
+JLINK_CMD_PREFIX = \
 ExitOnError 1\n\
 Device $(JLINK_DEV)\n\
 SelectInterface SWD\n\
 Speed auto\n\
 Connect\n\
 Reset\n\
-ShowHWStatus\n\
-LoadFile "$(BUILD)/firmware_toc.bin",0x8057f1c0\n\
-LoadFile "$(BUILD)/firmware.bin",0x80000000\n\
-Reset\n\
-Exit'
-
-################################################################################
-# Source files and libraries
+ShowHWStatus\n
 
-SRC_O += \
-	shared/runtime/gchelper_thumb2.o
+JLINK_CMD_SUFFIX = \
+Reset\n\
+Exit
 
-SRC_C = \
-	alif_flash.c \
-	fatfs_port.c \
-	machine_pin.c \
-	main.c \
-	modalif.c \
-	mphalport.c \
-	mpuart.c \
-	msc_disk.c \
-	ospi_flash.c \
-	pendsv.c \
-	system_tick.c \
-	se_services.c \
-	usbd.c \
-	$(wildcard $(BOARD_DIR)/*.c)
+ifeq ($(MCU_CORE),M55_HP)
 
-ifeq ($(MICROPY_FLOAT_IMPL),float)
-LIBM_SRC_C += $(SRC_LIB_LIBM_C)
-LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
-$(BUILD)/lib/libm/%.o: CFLAGS += -Wno-maybe-uninitialized
-else
-LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
-LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_HW_C)
-$(BUILD)/lib/libm_dbl/%.o: CFLAGS += -Wno-maybe-uninitialized
-endif
+ALIF_TOC_CONFIG = mcu/M55_HP_cfg.json
+ALIF_TOC_APPS = $(BUILD)/M55_HP/firmware.bin
+JLINK_CMD = '\
+$(JLINK_CMD_PREFIX)\
+LoadFile "$(BUILD)/M55_HP/firmware.bin",0x80020000\n\
+$(JLINK_CMD_SUFFIX)'
 
-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/softtimer.c  \
-	runtime/stdout_helpers.c \
-	runtime/sys_stdio_mphal.c \
-	timeutils/timeutils.c \
-	tinyusb/mp_usbd.c \
-	tinyusb/mp_usbd_cdc.c \
-	tinyusb/mp_usbd_descriptor.c \
-	)
+else ifeq ($(MCU_CORE),M55_HE)
 
-DRIVERS_SRC_C += $(addprefix drivers/,\
-	bus/softspi.c \
-	bus/softqspi.c \
-	memory/spiflash.c \
-	dht/dht.c \
-	)
+ALIF_TOC_CONFIG = mcu/M55_HE_cfg.json
+ALIF_TOC_APPS = $(BUILD)/M55_HE/firmware.bin
+JLINK_CMD = '\
+$(JLINK_CMD_PREFIX)\
+LoadFile "$(BUILD)/M55_HE/firmware.bin",0x80320000\n\
+$(JLINK_CMD_SUFFIX)'
 
-TINYUSB_SRC_C += \
-	lib/tinyusb/src/tusb.c \
-	lib/tinyusb/src/class/cdc/cdc_device.c \
-	lib/tinyusb/src/class/msc/msc_device.c \
-	lib/tinyusb/src/common/tusb_fifo.c \
-	lib/tinyusb/src/device/usbd.c \
-	lib/tinyusb/src/device/usbd_control.c \
-	tinyusb_port/tusb_alif_dcd.c \
+else ifeq ($(MCU_CORE),M55_DUAL)
 
-ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
-	Device/common/source/clk.c \
-	Device/common/source/mpu_M55.c \
-	Device/common/source/system_M55.c \
-	Device/common/source/system_utils.c \
-	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
-	drivers/source/adc.c \
-	drivers/source/mhu_driver.c \
-	drivers/source/mhu_receiver.c \
-	drivers/source/mhu_sender.c \
-	drivers/source/pinconf.c \
-	drivers/source/uart.c \
-	drivers/source/utimer.c \
-	ospi_xip/source/ospi/ospi_drv.c \
-	se_services/source/services_host_application.c \
-	se_services/source/services_host_boot.c \
-	se_services/source/services_host_clocks.c \
-	se_services/source/services_host_cryptocell.c \
-	se_services/source/services_host_handler.c \
-	se_services/source/services_host_system.c \
-	)
+ALIF_TOC_CONFIG = mcu/M55_DUAL_cfg.json
+ALIF_TOC_APPS = $(BUILD)/M55_HP/firmware.bin $(BUILD)/M55_HE/firmware.bin
+JLINK_CMD = '\
+$(JLINK_CMD_PREFIX)\
+LoadFile "$(BUILD)/M55_HP/firmware.bin",0x80020000\n\
+LoadFile "$(BUILD)/M55_HE/firmware.bin",0x80320000\n\
+$(JLINK_CMD_SUFFIX)'
 
-$(BUILD)/tinyusb_port/tusb_alif_dcd.o: CFLAGS += -Wno-unused-variable -DTUSB_ALIF_NO_IRQ_CFG=1
-$(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_boot.o: CFLAGS += -Wno-stringop-truncation
+else
+$(error Invalid MCU core specified))
+endif
 
-# List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(GEN_PINS_SRC)
+include ../../py/mkenv.mk
+include mpconfigport.mk
+include $(BOARD_DIR)/mpconfigboard.mk
 
-OBJ += $(PY_O)
-OBJ += $(addprefix $(BUILD)/, $(SRC_O))
-OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(ALIF_SRC_C:.c=.o))
-OBJ += $(GEN_PINS_SRC:.c=.o)
+# include py core make definitions
+include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 ################################################################################
 # Main targets
 
-.DELETE_ON_ERROR:
-
 .PHONY: all
-all: $(BUILD)/firmware_toc.bin
+all: $(BUILD)/firmware.toc.bin
+
+# Force make commands to run the targets every time
+# regardless of whether firmware.toc.bin already exists
+# to detect changes in the source files and rebuild.
+.PHONY: $(BUILD)/M55_HE/firmware.bin
+.PHONY: $(BUILD)/M55_HP/firmware.bin
 
-$(BUILD)/ensemble.ld: $(LD_FILE)
-	$(ECHO) "Preprocess linker script $@"
-	$(Q)$(CPP) -P -E $(CFLAGS) $^ > $@
+$(BUILD):
+	$(MKDIR) -p $@
 
-$(BUILD)/firmware.elf: $(OBJ) $(BUILD)/ensemble.ld
-	$(ECHO) "Link $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-	$(Q)$(SIZE) $@
+$(BUILD)/M55_HP/firmware.bin:
+	make -f alif.mk MCU_CORE=M55_HP
 
-$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
-	$(Q)$(OBJCOPY) -Obinary $^ $(BUILD)/firmware.bin
+$(BUILD)/M55_HE/firmware.bin:
+	make -f alif.mk MCU_CORE=M55_HE
 
-$(BUILD)/firmware_toc.bin: $(BUILD)/firmware.bin
+$(BUILD)/firmware.toc.bin: $(ALIF_TOC_APPS)
 	$(Q)python $(ALIF_TOOLS)/app-gen-toc.py \
-		--filename $(abspath $(BUILD)/$(ALIF_TOC_CONFIG)) \
+		--filename $(abspath $(ALIF_TOC_CONFIG)) \
+		--config-dir $(BOARD_DIR) \
 		--output-dir $(BUILD) \
 		--firmware-dir $(BUILD) \
 		--output $@
 
 .PHONY: deploy
-deploy: $(BUILD)/firmware_toc.bin
+deploy: $(BUILD)/firmware.toc.bin
 	$(ECHO) "Writing $< to the board"
 	$(Q)python $(ALIF_TOOLS)/app-write-mram.py \
 		--cfg-part $(ALIF_TOOLKIT_CFG_PART) \
@@ -245,7 +99,7 @@ deploy: $(BUILD)/firmware_toc.bin
 		--images file:$(BUILD)/application_package.ds
 
 .PHONY: deploy-jlink
-deploy-jlink: $(BUILD)/firmware_toc.bin
+deploy-jlink: $(ALIF_TOC_APPS)
 	$(Q)echo -e $(JLINK_CMD) | $(JLINK_EXE)
 
 .PHONY: maintenance
@@ -260,17 +114,4 @@ update-system-package:
 		--cfg-part $(ALIF_TOOLKIT_CFG_PART) \
 		--port $(PORT)
 
-################################################################################
-# Remaining make rules
-
-# Use a pattern rule here so that make will only call make-pins.py once to make
-# both pins_board.c and pins_board.h
-$(BUILD)/%_board.c $(HEADER_BUILD)/%_board.h: $(BOARD_DIR)/%.csv $(GEN_PIN_MKPINS) $(GEN_PIN_PREFIX) | $(HEADER_BUILD)
-	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(GEN_PIN_MKPINS) \
-	    --board-csv $(GEN_PINS_BOARD_CSV) \
-	    --prefix $(GEN_PIN_PREFIX) \
-	    --output-source $(GEN_PINS_SRC) \
-	    --output-header $(GEN_PINS_HDR)
-
 include $(TOP)/py/mkrules.mk
diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
new file mode 100644
index 0000000000000..ad69499eccfa8
--- /dev/null
+++ b/ports/alif/alif.mk
@@ -0,0 +1,257 @@
+################################################################################
+# Initial setup of Makefile environment
+
+BOARD ?= ALIF_ENSEMBLE
+BOARD_DIR ?= boards/$(BOARD)
+BUILD ?= build-$(BOARD)/$(MCU_CORE)
+
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
+
+include ../../py/mkenv.mk
+include mpconfigport.mk
+include $(BOARD_DIR)/mpconfigboard.mk
+
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS += qstrdefsport.h
+
+# include py core make definitions
+include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
+
+################################################################################
+# Project specific settings and compiler/linker flags
+
+CROSS_COMPILE ?= arm-none-eabi-
+ALIF_DFP_REL_TOP ?= lib/alif_ensemble-cmsis-dfp
+ALIF_DFP_REL_HERE ?= $(TOP)/lib/alif_ensemble-cmsis-dfp
+CMSIS_DIR ?= $(TOP)/lib/cmsis/inc
+
+MCU_CORE ?= M55_HP
+ALIF_CONFIG ?= mcu/$(MCU_CORE)_cfg.json
+LD_FILE ?= mcu/ensemble.ld.S
+
+INC += -I.
+INC += -I$(TOP)
+INC += -I$(BUILD)
+INC += -I$(BOARD_DIR)
+INC += -I$(CMSIS_DIR)
+INC += -I$(ALIF_DFP_REL_HERE)/drivers/include/
+INC += -I$(ALIF_DFP_REL_HERE)/se_services/include
+INC += -I$(ALIF_DFP_REL_HERE)/ospi_xip/source/ospi
+INC += -I$(ALIF_DFP_REL_HERE)/Device/common/config/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/common/include/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/core/$(MCU_CORE)/config/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/core/$(MCU_CORE)/include/
+INC += -I$(ALIF_DFP_REL_HERE)/Device/$(MCU_SERIES)/$(MCU_VARIANT)/
+INC += -I$(TOP)/lib/tinyusb/src
+INC += -Itinyusb_port
+
+GEN_PIN_MKPINS = mcu/make-pins.py
+GEN_PIN_PREFIX = mcu/pins_prefix.c
+GEN_PINS_BOARD_CSV = $(BOARD_DIR)/pins.csv
+GEN_PINS_SRC = $(BUILD)/pins_board.c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins_board.h
+
+CFLAGS_FPU += -mfloat-abi=hard -mfpu=fpv5-d16
+
+CFLAGS += $(INC) \
+          -std=c99 \
+          -Wall \
+          -Werror \
+          -Wdouble-promotion \
+          -Wfloat-conversion \
+          -mthumb \
+          -mcpu=cortex-m55 \
+          -mtune=cortex-m55 \
+          $(CFLAGS_FPU) \
+          -march=armv8.1-m.main+fp+mve.fp \
+          -nostdlib \
+          -fdata-sections \
+          -ffunction-sections \
+          -D$(MCU_CORE)=1 \
+          -DCORE_$(MCU_CORE) \
+          -DALIF_CMSIS_H="\"$(MCU_CORE).h\""
+
+ifeq ($(MICROPY_FLOAT_IMPL),float)
+CFLAGS += -fsingle-precision-constant
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
+else
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
+endif
+
+# Tune for Debugging or Optimization
+ifeq ($(DEBUG), 1)
+CFLAGS += -Og -ggdb3
+# Disable text compression in debug builds
+MICROPY_ROM_TEXT_COMPRESSION = 0
+else
+CFLAGS += -O2 -DNDEBUG
+endif
+
+CFLAGS += $(CFLAGS_EXTRA)
+
+AFLAGS = -mthumb -march=armv8.1-m.main+fp+mve.fp $(CFLAGS_FPU)
+
+LDFLAGS += -nostdlib \
+           -T$(BUILD)/ensemble.ld \
+           -Map=$@.map \
+           --cref \
+           --gc-sections \
+           --print-memory-usage
+ifeq ($(MCU_CORE),M55_HP)
+LDFLAGS += --wrap=dcd_event_handler
+endif
+
+LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
+
+################################################################################
+# Source files and libraries
+
+SRC_O += \
+	shared/runtime/gchelper_thumb2.o
+
+SRC_C = \
+	alif_flash.c \
+	fatfs_port.c \
+	machine_pin.c \
+	main.c \
+	modalif.c \
+	mphalport.c \
+	mpuart.c \
+	msc_disk.c \
+	ospi_flash.c \
+	pendsv.c \
+	system_tick.c \
+	se_services.c \
+	usbd.c \
+	$(wildcard $(BOARD_DIR)/*.c)
+
+ifeq ($(MICROPY_FLOAT_IMPL),float)
+LIBM_SRC_C += $(SRC_LIB_LIBM_C)
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
+$(BUILD)/lib/libm/%.o: CFLAGS += -Wno-maybe-uninitialized
+else
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_HW_C)
+$(BUILD)/lib/libm_dbl/%.o: CFLAGS += -Wno-maybe-uninitialized
+endif
+
+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/softtimer.c  \
+	runtime/stdout_helpers.c \
+	runtime/sys_stdio_mphal.c \
+	timeutils/timeutils.c \
+	tinyusb/mp_usbd.c \
+	tinyusb/mp_usbd_cdc.c \
+	tinyusb/mp_usbd_descriptor.c \
+	)
+
+DRIVERS_SRC_C += $(addprefix drivers/,\
+	bus/softspi.c \
+	bus/softqspi.c \
+	memory/spiflash.c \
+	dht/dht.c \
+	)
+
+TINYUSB_SRC_C += \
+	lib/tinyusb/src/tusb.c \
+	lib/tinyusb/src/class/cdc/cdc_device.c \
+	lib/tinyusb/src/class/msc/msc_device.c \
+	lib/tinyusb/src/common/tusb_fifo.c \
+	lib/tinyusb/src/device/usbd.c \
+	lib/tinyusb/src/device/usbd_control.c \
+	tinyusb_port/tusb_alif_dcd.c \
+
+ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
+	Device/common/source/clk.c \
+	Device/common/source/mpu_M55.c \
+	Device/common/source/system_M55.c \
+	Device/common/source/system_utils.c \
+	Device/common/source/tcm_partition.c \
+	Device/common/source/tgu_M55.c \
+	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
+	drivers/source/adc.c \
+	drivers/source/mhu_driver.c \
+	drivers/source/mhu_receiver.c \
+	drivers/source/mhu_sender.c \
+	drivers/source/pinconf.c \
+	drivers/source/uart.c \
+	drivers/source/utimer.c \
+	ospi_xip/source/ospi/ospi_drv.c \
+	se_services/source/services_host_application.c \
+	se_services/source/services_host_boot.c \
+	se_services/source/services_host_clocks.c \
+	se_services/source/services_host_cryptocell.c \
+	se_services/source/services_host_handler.c \
+	se_services/source/services_host_system.c \
+	se_services/source/services_host_power.c \
+	se_services/source/services_host_maintenance.c \
+	)
+
+$(BUILD)/tinyusb_port/tusb_alif_dcd.o: CFLAGS += -Wno-unused-variable -DTUSB_ALIF_NO_IRQ_CFG=1
+$(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_boot.o: CFLAGS += -Wno-stringop-truncation
+$(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_system.o: CFLAGS += -Wno-maybe-uninitialized
+
+# List of sources for qstr extraction
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(GEN_PINS_SRC)
+
+OBJ += $(PY_O)
+OBJ += $(addprefix $(BUILD)/, $(SRC_O))
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(ALIF_SRC_C:.c=.o))
+OBJ += $(GEN_PINS_SRC:.c=.o)
+
+################################################################################
+# Main targets
+
+.PHONY: all erase deploy gdb objdump release
+
+.DELETE_ON_ERROR:
+
+obj: $(OBJ)
+all: $(BUILD)/firmware.bin
+
+$(BUILD):
+	$(MKDIR) -p $@
+
+$(BUILD)/ensemble.ld: $(LD_FILE)
+	$(ECHO) "Preprocess linker script $@"
+	$(Q)$(CPP) -P -E $(CFLAGS) $^ > $@
+
+$(BUILD)/firmware.elf: $(OBJ) $(BUILD)/ensemble.ld
+	$(ECHO) "Link $@"
+	$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+	$(Q)$(SIZE) $@
+
+$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
+	$(Q)$(OBJCOPY) -Obinary $^ $(BUILD)/firmware.bin
+
+################################################################################
+# Remaining make rules
+
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_board.c and pins_board.h
+$(BUILD)/%_board.c $(HEADER_BUILD)/%_board.h: $(BOARD_DIR)/%.csv $(GEN_PIN_MKPINS) $(GEN_PIN_PREFIX) | $(HEADER_BUILD)
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(GEN_PIN_MKPINS) \
+	    --board-csv $(GEN_PINS_BOARD_CSV) \
+	    --prefix $(GEN_PIN_PREFIX) \
+	    --output-source $(GEN_PINS_SRC) \
+	    --output-header $(GEN_PINS_HDR)
+
+include $(TOP)/py/mkrules.mk
diff --git a/ports/alif/mcu/ensemble.ld.S b/ports/alif/mcu/ensemble.ld.S
index 198641ba3dcba..8129a749eb22b 100644
--- a/ports/alif/mcu/ensemble.ld.S
+++ b/ports/alif/mcu/ensemble.ld.S
@@ -24,25 +24,44 @@
  * THE SOFTWARE.
  */
 
+#ifdef CORE_M55_HP
+__DTCM_SIZE = 1024K;
+#else
+__DTCM_SIZE = 256K;
+#endif
+
 // Entry Point
 ENTRY(Reset_Handler)
 
 MEMORY
 {
-  ROM   (rx)  : ORIGIN = 0x80000000, LENGTH = 0x0057F000
-  ITCM  (rwx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
-  #ifdef CORE_M55_HP
-  DTCM  (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00100000
-  #else
-  DTCM  (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000
-  #endif
-  SRAM0 (rwx) : ORIGIN = 0x02000000, LENGTH = 0x00400000
-  SRAM1 (rwx) : ORIGIN = 0x08000000, LENGTH = 0x00280000
+  MRAM_BL (rx) : ORIGIN = 0x80000000, LENGTH = 128K
+  MRAM_HP (rx) : ORIGIN = 0x80020000, LENGTH = 3072K
+  MRAM_HE (rx) : ORIGIN = 0x80320000, LENGTH = 1400K
+  MRAM_FS (rx) : ORIGIN = 0x8047e000, LENGTH = 1024K
+  MRAM_TOC (rx): ORIGIN = 0x8057e000, LENGTH = 8K
+  ITCM  (rwx)  : ORIGIN = 0x00000000, LENGTH = 256K
+  DTCM  (rwx)  : ORIGIN = 0x20000000, LENGTH = __DTCM_SIZE
+  SRAM0 (rwx)  : ORIGIN = 0x02000000, LENGTH = 4096K
+  SRAM1 (rwx)  : ORIGIN = 0x08000000, LENGTH = 2560K
+  SRAM6_A (rw) : ORIGIN = 0x62000000, LENGTH = 1024K
+  SRAM6_B (rw) : ORIGIN = 0x62400000, LENGTH = 1024K
+  SRAM7 (rw)   : ORIGIN = 0x63000000, LENGTH = 512K
+  SRAM8 (rw)   : ORIGIN = 0x63200000, LENGTH = 2048K
+  SRAM9_A (rw) : ORIGIN = 0x60000000, LENGTH = 256K
+  SRAM9_B (rw) : ORIGIN = 0x60040000, LENGTH = 512K
 }
 
-__STACK_SIZE = 0x00004000;
-__HEAP_SIZE  = 0x00004000;
-__MP_HEAP_SIZE = 0x00040000;
+#ifdef CORE_M55_HP
+REGION_ALIAS("ROM", MRAM_HP);
+__MP_HEAP_SIZE = 256K;
+#else
+REGION_ALIAS("ROM", MRAM_HE);
+__MP_HEAP_SIZE = 128K;
+#endif
+
+__STACK_SIZE = 16K;
+__HEAP_SIZE  = 16K;
 
 SECTIONS
 {

From 6b4d46569bf87673521645b3340e25a3336c8d40 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 17 Jul 2024 17:43:38 +0300
Subject: [PATCH 2062/3129] alif: Support running the port on the HE core.

The same MicroPython firmware is built for the HE but with slightly
different options, for example no USB.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/alif_flash.c               |  2 ++
 ports/alif/boards/manifest.py         |  2 +-
 ports/alif/main.c                     |  4 ++--
 ports/alif/modalif.c                  |  2 ++
 ports/alif/modules/he/_boot.py        | 21 +++++++++++++++++++++
 ports/alif/modules/{ => hp}/_boot.py  |  0
 ports/alif/mpconfigport.h             | 20 +++++++++++++++-----
 ports/alif/mpconfigport.mk            |  1 +
 ports/alif/mphalport.c                |  2 ++
 ports/alif/ospi_flash.c               |  4 +++-
 ports/alif/tinyusb_port/tusb_config.h |  2 +-
 11 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 ports/alif/modules/he/_boot.py
 rename ports/alif/modules/{ => hp}/_boot.py (100%)

diff --git a/ports/alif/alif_flash.c b/ports/alif/alif_flash.c
index e3b2125800ea2..f2ea5ac85a88e 100644
--- a/ports/alif/alif_flash.c
+++ b/ports/alif/alif_flash.c
@@ -30,6 +30,7 @@
 #include "modalif.h"
 #include "ospi_flash.h"
 
+#if MICROPY_HW_ENABLE_OSPI
 typedef struct _alif_flash_obj_t {
     mp_obj_base_t base;
     uint32_t flash_base_addr;
@@ -158,3 +159,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     make_new, alif_flash_make_new,
     locals_dict, &alif_flash_locals_dict
     );
+#endif // MICROPY_HW_ENABLE_OSPI
diff --git a/ports/alif/boards/manifest.py b/ports/alif/boards/manifest.py
index 148f1d6a6eb5e..1dc9e179acc14 100644
--- a/ports/alif/boards/manifest.py
+++ b/ports/alif/boards/manifest.py
@@ -1,4 +1,4 @@
-freeze("$(PORT_DIR)/modules")
+freeze("$(PORT_DIR)/modules/$(MCU_CORE)")
 include("$(MPY_DIR)/extmod/asyncio")
 require("dht")
 require("neopixel")
diff --git a/ports/alif/main.c b/ports/alif/main.c
index 2d3134176d32e..975ee7ed2d328 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -68,11 +68,11 @@ void _start(void) {
     #if MICROPY_HW_ENABLE_UART_REPL
     mp_uart_init();
     #endif
-
+    #if MICROPY_HW_ENABLE_OSPI
     if (ospi_flash_init() != 0) {
         MICROPY_BOARD_FATAL_ERROR("ospi_init failed");
     }
-
+    #endif
     #if MICROPY_HW_ENABLE_USBDEV
     NVIC_ClearPendingIRQ(USB_IRQ_IRQn);
     NVIC_SetPriority(USB_IRQ_IRQn, IRQ_PRI_USB);
diff --git a/ports/alif/modalif.c b/ports/alif/modalif.c
index 5577b53eaca85..1c3c34394cd11 100644
--- a/ports/alif/modalif.c
+++ b/ports/alif/modalif.c
@@ -37,7 +37,9 @@ static MP_DEFINE_CONST_FUN_OBJ_0(alif_info_obj, alif_info);
 
 static const mp_rom_map_elem_t alif_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_alif) },
+    #if MICROPY_HW_ENABLE_OSPI
     { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&alif_flash_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_info),                MP_ROM_PTR(&alif_info_obj) },
     #if MICROPY_HW_USB_MSC
     // Attribute to indicate USB MSC is enabled.
diff --git a/ports/alif/modules/he/_boot.py b/ports/alif/modules/he/_boot.py
new file mode 100644
index 0000000000000..bc1320f190694
--- /dev/null
+++ b/ports/alif/modules/he/_boot.py
@@ -0,0 +1,21 @@
+import openamp
+import time
+from machine import Pin
+
+
+def ept_recv_callback(src_addr, data):
+    print("Received message on endpoint", data)
+
+
+# Create a new RPMsg endpoint to communicate with main core.
+ept = openamp.Endpoint("vuart-channel", callback=ept_recv_callback)
+
+pin = Pin("LED_BLUE", Pin.OUT)
+
+count = 0
+while True:
+    if ept.is_ready():
+        ept.send("Hello from HE %d" % count, timeout=1000)
+        count += 1
+    time.sleep_ms(100)
+    pin(not pin())
diff --git a/ports/alif/modules/_boot.py b/ports/alif/modules/hp/_boot.py
similarity index 100%
rename from ports/alif/modules/_boot.py
rename to ports/alif/modules/hp/_boot.py
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 95b5e3ca9fa24..df33b92202431 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -36,13 +36,18 @@
 #define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
 #endif
 
-#define MICROPY_HW_ENABLE_UART_REPL             (1) // useful if there is no USB
-#define MICROPY_HW_ENABLE_USBDEV                (1)
-
+#ifndef MICROPY_HW_ENABLE_OSPI
+#define MICROPY_HW_ENABLE_OSPI                  (CORE_M55_HP)
+#endif
+#ifndef MICROPY_HW_ENABLE_USBDEV
+#define MICROPY_HW_ENABLE_USBDEV                (CORE_M55_HP)
+#endif
 #ifndef MICROPY_HW_USB_PRODUCT_FS_STRING
 #define MICROPY_HW_USB_PRODUCT_FS_STRING        "Board in HS mode"
 #endif
-#define MICROPY_HW_USB_CDC                      (1)
+#ifndef MICROPY_HW_USB_CDC
+#define MICROPY_HW_USB_CDC                      (CORE_M55_HP)
+#endif
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT           (500)
 #ifndef MICROPY_HW_USB_MSC
 #define MICROPY_HW_USB_MSC                      (0)
@@ -53,7 +58,9 @@
 #ifndef MICROPY_HW_USB_PID
 #define MICROPY_HW_USB_PID                      (0x9802) // interface has CDC only
 #endif
-
+#ifndef MICROPY_HW_ENABLE_UART_REPL
+#define MICROPY_HW_ENABLE_UART_REPL             (CORE_M55_HP) // useful if there is no USB
+#endif
 #define MICROPY_HW_FLASH_BLOCK_SIZE_BYTES       (4096)
 
 // Memory allocation policies
@@ -78,6 +85,9 @@
 #define MICROPY_ENABLE_GC                       (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
+#ifndef MICROPY_FLOAT_IMPL
+#define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
+#endif
 #define MICROPY_SCHEDULER_DEPTH                 (8)
 #define MICROPY_SCHEDULER_STATIC_NODES          (1)
 #define MICROPY_USE_INTERNAL_ERRNO              (1)
diff --git a/ports/alif/mpconfigport.mk b/ports/alif/mpconfigport.mk
index 3d04450a60fa7..92d9a5db8faf0 100644
--- a/ports/alif/mpconfigport.mk
+++ b/ports/alif/mpconfigport.mk
@@ -10,3 +10,4 @@ MICROPY_VFS_LFS2 ?= 1
 
 # File containing description of content to be frozen into firmware.
 FROZEN_MANIFEST ?= boards/manifest.py
+MICROPY_MANIFEST_MCU_CORE := $(shell echo $(MCU_CORE) | awk -F'_' '{print tolower($$2)}')
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index ba58923f2fe2a..9769ddeaeb61e 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -85,8 +85,10 @@ int mp_hal_stdin_rx_chr(void) {
 
 // Send string of given length
 mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
+    #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC || MICROPY_PY_OS_DUPTERM
     mp_uint_t ret = len;
     bool did_write = false;
+    #endif
 
     #if MICROPY_HW_ENABLE_UART_REPL
     mp_uart_write_strn(str, len);
diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index fa96053b36579..f84761366b3f0 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -26,8 +26,9 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "ospi_flash.h"
 
+#if MICROPY_HW_ENABLE_OSPI
+#include "ospi_flash.h"
 #include "ospi_drv.h"
 #include "pinconf.h"
 
@@ -263,3 +264,4 @@ int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
     }
     return ret;
 }
+#endif // MICROPY_HW_ENABLE_OSPI
diff --git a/ports/alif/tinyusb_port/tusb_config.h b/ports/alif/tinyusb_port/tusb_config.h
index d244b4c241e6b..6c4ead1128846 100644
--- a/ports/alif/tinyusb_port/tusb_config.h
+++ b/ports/alif/tinyusb_port/tusb_config.h
@@ -44,7 +44,7 @@
 #define CFG_TUSB_DEBUG        0
 
 // Enable Device stack
-#define CFG_TUD_ENABLED       1
+#define CFG_TUD_ENABLED       (CORE_M55_HP)
 
 // Default is max speed that hardware controller could support with on-chip PHY
 #define CFG_TUD_MAX_SPEED OPT_MODE_HIGH_SPEED

From 4f6f283abbdcbdec5cb2144a74fdd2937540ac71 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 17 Jul 2024 17:45:08 +0300
Subject: [PATCH 2063/3129] alif: Implement Open-AMP port backend.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/Makefile           |   4 +-
 ports/alif/alif.mk            |  11 +++
 ports/alif/irq.h              |   1 +
 ports/alif/mcu/ensemble.ld.S  |   8 ++
 ports/alif/mpconfigport.h     |   1 +
 ports/alif/mpmetalport.c      | 119 +++++++++++++++++++++++
 ports/alif/mpmetalport.h      |  89 ++++++++++++++++++
 ports/alif/mpremoteprocport.c | 172 ++++++++++++++++++++++++++++++++++
 8 files changed, 403 insertions(+), 2 deletions(-)
 create mode 100644 ports/alif/mpmetalport.c
 create mode 100644 ports/alif/mpmetalport.h
 create mode 100644 ports/alif/mpremoteprocport.c

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index 5cc334a7cf9f9..7d6731dacf200 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -76,10 +76,10 @@ $(BUILD):
 	$(MKDIR) -p $@
 
 $(BUILD)/M55_HP/firmware.bin:
-	make -f alif.mk MCU_CORE=M55_HP
+	make -f alif.mk MCU_CORE=M55_HP MICROPY_PY_OPENAMP_MODE=0
 
 $(BUILD)/M55_HE/firmware.bin:
-	make -f alif.mk MCU_CORE=M55_HE
+	make -f alif.mk MCU_CORE=M55_HE MICROPY_PY_OPENAMP_MODE=1
 
 $(BUILD)/firmware.toc.bin: $(ALIF_TOC_APPS)
 	$(Q)python $(ALIF_TOOLS)/app-gen-toc.py \
diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index ad69499eccfa8..c68fc66d44cc6 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -203,6 +203,17 @@ $(BUILD)/tinyusb_port/tusb_alif_dcd.o: CFLAGS += -Wno-unused-variable -DTUSB_ALI
 $(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_boot.o: CFLAGS += -Wno-stringop-truncation
 $(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_system.o: CFLAGS += -Wno-maybe-uninitialized
 
+# Add Alif-specific implementation of libmetal (and optionally OpenAMP's rproc).
+# Note: libmetal code is generated via a pre-processor so ensure that runs first.
+ifeq ($(MICROPY_PY_OPENAMP),1)
+SRC_C += mpmetalport.c
+$(BUILD)/mpmetalport.o: $(BUILD)/openamp/metal/config.h
+ifeq ($(MICROPY_PY_OPENAMP_REMOTEPROC),1)
+SRC_C += mpremoteprocport.c
+$(BUILD)/mpremoteprocport.o: $(BUILD)/openamp/metal/config.h
+endif
+endif
+
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(GEN_PINS_SRC)
 
diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index a20ff7aebdef1..de6d07ab6d32c 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -45,6 +45,7 @@
 #define IRQ_PRI_UART_REPL       NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
 #define IRQ_PRI_ADC             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 3, 0)
 #define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 5, 0)
+#define IRQ_PRI_HWSEM           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 8, 0)
 #define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
 
 // these states correspond to values from query_irq, enable_irq and disable_irq
diff --git a/ports/alif/mcu/ensemble.ld.S b/ports/alif/mcu/ensemble.ld.S
index 8129a749eb22b..aeefdb7eacb78 100644
--- a/ports/alif/mcu/ensemble.ld.S
+++ b/ports/alif/mcu/ensemble.ld.S
@@ -114,6 +114,14 @@ SECTIONS
     * (.bss.sram0*)
   } > SRAM0
 
+  /* Open-AMP Shared Memory Region */
+  .openamp_memory (NOLOAD) : ALIGN(32)
+  {
+      _openamp_shm_region_start = .;
+      . = . + 64K;
+      _openamp_shm_region_end = .;
+  } >SRAM6_A
+
   .bss : ALIGN(4)
   {
     __bss_start__ = .;
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index df33b92202431..dfe1ec2561380 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -91,6 +91,7 @@
 #define MICROPY_SCHEDULER_DEPTH                 (8)
 #define MICROPY_SCHEDULER_STATIC_NODES          (1)
 #define MICROPY_USE_INTERNAL_ERRNO              (1)
+#define MICROPY_TRACKED_ALLOC                   (MICROPY_PY_OPENAMP)
 
 // Fine control over Python builtins, classes, modules, etc
 #define MICROPY_PY_SYS_PLATFORM                 "alif"
diff --git a/ports/alif/mpmetalport.c b/ports/alif/mpmetalport.c
new file mode 100644
index 0000000000000..f80d039c26d23
--- /dev/null
+++ b/ports/alif/mpmetalport.c
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * libmetal Alif port.
+ */
+
+#include ALIF_CMSIS_H
+#include "hwsem.h"
+
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#include "metal/sys.h"
+#include "metal/utilities.h"
+#include "metal/device.h"
+
+struct metal_state _metal;
+static mp_sched_node_t rproc_notify_node;
+
+int metal_sys_init(const struct metal_init_params *params) {
+    metal_unused(params);
+
+    // Reset the hardware semaphore.
+    hwsem_reset(METAL_HSEM_DEVICE);
+    #if MICROPY_PY_OPENAMP_HOST
+    hwsem_reset(METAL_HSEM_REMOTE);
+    #endif
+
+    // Enable the hardware semaphore IRQ.
+    NVIC_ClearPendingIRQ(METAL_HSEM_IRQn);
+    NVIC_SetPriority(METAL_HSEM_IRQn, IRQ_PRI_HWSEM);
+    NVIC_EnableIRQ(METAL_HSEM_IRQn);
+
+    // If cache management is not enabled, configure the MPU to disable
+    // caching for the entire Open-AMP shared memory region.
+    #ifndef VIRTIO_USE_DCACHE
+    ARM_MPU_Disable();
+    // NOTE: The startup code uses the first 4 attributes.
+    #define MEMATTR_IDX_NORMAL_NON_CACHEABLE      4
+    ARM_MPU_SetMemAttr(MEMATTR_IDX_NORMAL_NON_CACHEABLE, ARM_MPU_ATTR(
+        ARM_MPU_ATTR_NON_CACHEABLE,
+        ARM_MPU_ATTR_NON_CACHEABLE));
+    MPU->RNR = METAL_MPU_REGION_ID;
+    MPU->RBAR = ARM_MPU_RBAR(METAL_MPU_REGION_BASE, ARM_MPU_SH_NON, 0, 1, 0); // RO-0, NP-1, XN-0
+    MPU->RLAR = ARM_MPU_RLAR(METAL_MPU_REGION_BASE + METAL_MPU_REGION_SIZE - 1, MEMATTR_IDX_NORMAL_NON_CACHEABLE);
+    ARM_MPU_Enable(MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_HFNMIENA_Msk);
+    #endif
+
+    metal_bus_register(&metal_generic_bus);
+
+    return 0;
+}
+
+void metal_sys_finish(void) {
+    NVIC_DisableIRQ(METAL_HSEM_IRQn);
+    NVIC_ClearPendingIRQ(METAL_HSEM_IRQn);
+    hwsem_reset(METAL_HSEM_DEVICE);
+    metal_bus_unregister(&metal_generic_bus);
+}
+
+unsigned int sys_irq_save_disable(void) {
+    return disable_irq();
+}
+
+void sys_irq_restore_enable(unsigned int state) {
+    enable_irq(state);
+}
+
+void *metal_machine_io_mem_map(void *va, metal_phys_addr_t pa,
+    size_t size, unsigned int flags) {
+    metal_unused(pa);
+    metal_unused(size);
+    metal_unused(flags);
+    return va;
+}
+
+void metal_machine_cache_flush(void *addr, unsigned int len) {
+    SCB_CleanDCache_by_Addr(addr, len);
+}
+
+void metal_machine_cache_invalidate(void *addr, unsigned int len) {
+    SCB_InvalidateDCache_by_Addr(addr, len);
+}
+
+int metal_rproc_notify(void *priv, uint32_t id) {
+    // Release the HW semaphore to notify the other core.
+    hwsem_release(METAL_HSEM_REMOTE, HWSEM_MASTERID);
+    return 0;
+}
+
+void METAL_HSEM_IRQ_HANDLER(void) {
+    // Schedule the node only if the other core released the Semaphore.
+    if (METAL_HSEM_DEVICE->HWSEM_REL_REG == 0) {
+        mp_sched_schedule_node(&rproc_notify_node, openamp_remoteproc_notified);
+    }
+    hwsem_request(METAL_HSEM_DEVICE, METAL_HSEM_REMOTE_ID);
+}
diff --git a/ports/alif/mpmetalport.h b/ports/alif/mpmetalport.h
new file mode 100644
index 0000000000000..5cd697c0e9c7b
--- /dev/null
+++ b/ports/alif/mpmetalport.h
@@ -0,0 +1,89 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * libmetal alif port.
+ */
+#ifndef MICROPY_INCLUDED_ALIF_MPMETALPORT_H
+#define MICROPY_INCLUDED_ALIF_MPMETALPORT_H
+
+#include <stdlib.h>
+#include "py/mphal.h"
+#include "py/runtime.h"
+
+#define METAL_HAVE_STDATOMIC_H      0
+#define METAL_HAVE_FUTEX_H          0
+
+#define METAL_MAX_DEVICE_REGIONS    2
+
+#if MICROPY_PY_OPENAMP_HOST
+#define METAL_HSEM_DEVICE           ((HWSEM_Type *)HWSEM14_BASE)
+#define METAL_HSEM_REMOTE           ((HWSEM_Type *)HWSEM15_BASE)
+#define METAL_HSEM_REMOTE_ID        (0x410FD222U)
+#define METAL_HSEM_IRQn             HWSEM_IRQ14_IRQn
+#define METAL_HSEM_IRQ_HANDLER      HWSEM_IRQ14Handler
+#else
+#define METAL_HSEM_DEVICE           ((HWSEM_Type *)HWSEM15_BASE)
+#define METAL_HSEM_REMOTE           ((HWSEM_Type *)HWSEM14_BASE)
+#define METAL_HSEM_REMOTE_ID        (0x410FD221U)
+#define METAL_HSEM_IRQn             HWSEM_IRQ15_IRQn
+#define METAL_HSEM_IRQ_HANDLER      HWSEM_IRQ15Handler
+#endif
+
+// Set to 1 to enable log output.
+#define METAL_LOG_HANDLER_ENABLE    0
+
+#define metal_cpu_yield()
+
+// Shared memory config
+#define METAL_SHM_NAME              "OPENAMP_SHM"
+// Note 1K must be reserved at the start of the openamp
+// shared memory region, for the shared resource table.
+#define METAL_RSC_ADDR              ((void *)_openamp_shm_region_start)
+#define METAL_RSC_SIZE              (1024)
+
+#define METAL_SHM_ADDR              ((metal_phys_addr_t)(_openamp_shm_region_start + METAL_RSC_SIZE))
+#define METAL_SHM_SIZE              ((size_t)(_openamp_shm_region_end - _openamp_shm_region_start - METAL_RSC_SIZE))
+
+#define METAL_MPU_REGION_ID         (9) // NOTE: The startup code uses the first 9 regions.
+#define METAL_MPU_REGION_BASE       ((uint32_t)_openamp_shm_region_start)
+#define METAL_MPU_REGION_SIZE       (0x00010000U)
+
+extern const char _openamp_shm_region_start[];
+extern const char _openamp_shm_region_end[];
+
+int metal_rproc_notify(void *priv, uint32_t id);
+extern void openamp_remoteproc_notified(mp_sched_node_t *node);
+
+static inline int __metal_sleep_usec(unsigned int usec) {
+    mp_hal_delay_us(usec);
+    return 0;
+}
+
+static inline void metal_generic_default_poll(void) {
+    mp_event_handle_nowait();
+    __WFI();
+}
+
+#endif // MICROPY_INCLUDED_ALIF_METAL_PORT_H
diff --git a/ports/alif/mpremoteprocport.c b/ports/alif/mpremoteprocport.c
new file mode 100644
index 0000000000000..27210a824057e
--- /dev/null
+++ b/ports/alif/mpremoteprocport.c
@@ -0,0 +1,172 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * modremoteproc alif port.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "metal/alloc.h"
+#include "metal/errno.h"
+#include "metal/io.h"
+#include "metal/sys.h"
+#include "metal/device.h"
+#include "metal/utilities.h"
+#include "extmod/modopenamp_remoteproc.h"
+#include "se_services.h"
+
+typedef struct mmap {
+    uintptr_t base;
+    uintptr_t limit;
+} mmap_t;
+
+static const mmap_t mmap_nocache[] = {
+    { .base = ITCM_BASE, .limit = ITCM_BASE + ITCM_SIZE },
+    { .base = DTCM_BASE, .limit = DTCM_BASE + ITCM_SIZE },
+    { .base = MRAM_BASE, .limit = MRAM_BASE + MRAM_SIZE }
+};
+
+static bool is_cacheable(const void *p, size_t bytes) {
+    uintptr_t base = (uintptr_t)p;
+    if (bytes == 0) {
+        return false;
+    }
+    uintptr_t limit = base + bytes;
+    for (unsigned int i = 0; i < sizeof(mmap_nocache) / sizeof(mmap_nocache[0]); i++) {
+        if (base >= mmap_nocache[i].base && limit < mmap_nocache[i].limit) {
+            return false;
+        }
+    }
+    return true;
+}
+
+struct remoteproc *mp_openamp_remoteproc_init(struct remoteproc *rproc,
+    const struct remoteproc_ops *ops, void *arg) {
+    metal_log(METAL_LOG_DEBUG, "rproc_init()\n");
+
+    rproc->ops = ops;
+    rproc->state = RPROC_OFFLINE;
+    // Allocate the image store and save it in private data.
+    rproc->priv = mp_openamp_remoteproc_store_alloc();
+
+    // Reset the remote core.
+    se_services_boot_reset_cpu(EXTSYS_1);
+    return rproc;
+}
+
+void *mp_openamp_remoteproc_mmap(struct remoteproc *rproc, metal_phys_addr_t *pa,
+    metal_phys_addr_t *da, size_t size, unsigned int attribute,
+    struct metal_io_region **io) {
+    metal_log(METAL_LOG_DEBUG, "rproc_mmap(): pa 0x%p da 0x%p io 0x%p size %u\n", *pa, *da, *io, size);
+
+    struct remoteproc_mem *mem;
+    metal_phys_addr_t lpa = *pa;
+    metal_phys_addr_t lda = *da;
+
+    if (lda == METAL_BAD_PHYS) {
+        return NULL;
+    }
+
+    if (lpa == METAL_BAD_PHYS) {
+        lpa = lda;
+    }
+
+    // Currently this port doesn't support loading firmware to flash,
+    // only SD/SRAM images are supported. Check of load address is in
+    // the flash region, and if so return NULL.
+    if (lda >= MRAM_BASE && lda < (MRAM_BASE + MRAM_SIZE)) {
+        return NULL;
+    }
+
+    mem = metal_allocate_memory(sizeof(*mem));
+    if (!mem) {
+        return NULL;
+    }
+
+    *io = metal_allocate_memory(sizeof(struct metal_io_region));
+    if (!*io) {
+        metal_free_memory(mem);
+        return NULL;
+    }
+
+    remoteproc_init_mem(mem, NULL, lpa, lda, size, *io);
+
+    metal_io_init(*io, (void *)mem->da, &mem->pa, size,
+        sizeof(metal_phys_addr_t) << 3, attribute, NULL);
+
+    remoteproc_add_mem(rproc, mem);
+    *pa = lpa;
+    *da = lda;
+    return metal_io_phys_to_virt(*io, mem->pa);
+}
+
+int mp_openamp_remoteproc_start(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_start()\n");
+
+    // Flush cached areas for the remote core.
+    struct metal_list *node;
+    metal_list_for_each(&rproc->mems, node) {
+        struct remoteproc_mem *mem;
+        mem = metal_container_of(node, struct remoteproc_mem, node);
+        if (is_cacheable((uint32_t *)mem->pa, mem->size)) {
+            SCB_CleanDCache_by_Addr((uint32_t *)mem->pa, mem->size);
+        }
+    }
+
+    se_services_boot_reset_cpu(EXTSYS_1);
+    se_services_boot_cpu(EXTSYS_1, (uint32_t)rproc->bootaddr);  // GlobalToLocal
+    return 0;
+}
+
+int mp_openamp_remoteproc_stop(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_stop()\n");
+    if (rproc->state == RPROC_RUNNING) {
+        se_services_boot_reset_cpu(EXTSYS_1);
+    }
+    return 0;
+}
+
+int mp_openamp_remoteproc_config(struct remoteproc *rproc, void *data) {
+    metal_log(METAL_LOG_DEBUG, "rproc_config()\n");
+    (void)rproc;
+    return 0;
+}
+
+void mp_openamp_remoteproc_remove(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_remove()\n");
+    (void)rproc;
+}
+
+int mp_openamp_remoteproc_shutdown(struct remoteproc *rproc) {
+    metal_log(METAL_LOG_DEBUG, "rproc_shutdown()\n");
+    if (rproc->state == RPROC_RUNNING) {
+        se_services_boot_reset_cpu(EXTSYS_1);
+    }
+    return 0;
+}

From cee8e111cbaedc877fcffeb7d8166b60317f7377 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 28 Jul 2024 21:51:29 +0300
Subject: [PATCH 2064/3129] alif/irq: Define more IRQ priorities.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/irq.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index de6d07ab6d32c..59dbce9705947 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -44,8 +44,10 @@
 #define IRQ_PRI_QUIET_TIMING    NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
 #define IRQ_PRI_UART_REPL       NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 1, 0)
 #define IRQ_PRI_ADC             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 3, 0)
-#define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 5, 0)
+#define IRQ_PRI_CSI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 5, 0)
+#define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 7, 0)
 #define IRQ_PRI_HWSEM           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 8, 0)
+#define IRQ_PRI_GPU             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 10, 0)
 #define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
 
 // these states correspond to values from query_irq, enable_irq and disable_irq

From bbb8fd77fde3400cc1b9902e94f05889a7c1f49a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Aug 2024 16:50:28 +1000
Subject: [PATCH 2065/3129] alif/system_tick: Implement optional LPTIMER
 support for systick.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpconfigport.h |   6 ++
 ports/alif/mphalport.c    |  12 ++++
 ports/alif/system_tick.c  | 137 +++++++++++++++++++++++++++++++++++++-
 ports/alif/system_tick.h  |   6 +-
 4 files changed, 158 insertions(+), 3 deletions(-)

diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index dfe1ec2561380..b1a01910628bb 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -36,6 +36,12 @@
 #define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
 #endif
 
+// Select the low-level system tick implementation.
+#if !defined(MICROPY_HW_SYSTEM_TICK_USE_LPTIMER) \
+    && !defined(MICROPY_HW_SYSTEM_TICK_USE_UTIMER)
+#define MICROPY_HW_SYSTEM_TICK_USE_UTIMER       (1)
+#endif
+
 #ifndef MICROPY_HW_ENABLE_OSPI
 #define MICROPY_HW_ENABLE_OSPI                  (CORE_M55_HP)
 #endif
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index 9769ddeaeb61e..becac8f3b4a0a 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -120,16 +120,28 @@ mp_uint_t mp_hal_ticks_cpu(void) {
 
 mp_uint_t mp_hal_ticks_us(void) {
     // Convert system tick to microsecond counter.
+    #if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+    return system_tick_get_u64() * 1000000 / system_tick_source_hz;
+    #else
     return system_tick_get_u64() / system_core_clock_mhz;
+    #endif
 }
 
 mp_uint_t mp_hal_ticks_ms(void) {
     // Convert system tick to millisecond counter.
+    #if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+    return system_tick_get_u64() * 1000ULL / system_tick_source_hz;
+    #else
     return system_tick_get_u64() / (SystemCoreClock / 1000);
+    #endif
 }
 
 void mp_hal_delay_us(mp_uint_t us) {
+    #if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+    uint64_t ticks_delay = (uint64_t)us * system_tick_source_hz / 1000000;
+    #else
     uint64_t ticks_delay = (uint64_t)us * system_core_clock_mhz;
+    #endif
     uint64_t start = system_tick_get_u64();
     while (system_tick_get_u64() - start < ticks_delay) {
     }
diff --git a/ports/alif/system_tick.c b/ports/alif/system_tick.c
index 5cdf45cba0126..72b8d021c39c0 100644
--- a/ports/alif/system_tick.c
+++ b/ports/alif/system_tick.c
@@ -27,10 +27,141 @@
 #include "irq.h"
 #include "system_tick.h"
 
-#include "utimer.h"
-
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 
+#if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+
+#include "lptimer.h"
+#include "sys_ctrl_lptimer.h"
+
+// Channel 0 and 1 are cascaded to make a 64-bit counter.
+// Channel 2 is used for system_tick_wfe_with_timeout_us.
+// Channel 3 is used for system_tick_schedule_after_us.
+#define LPTIMER ((LPTIMER_Type *)LPTIMER_BASE)
+#define LPTIMER_CH_A (0)
+#define LPTIMER_CH_B (1)
+#define LPTIMER_CH_C (2)
+#define LPTIMER_CH_D (3)
+
+uint64_t system_tick_source_hz;
+
+void system_tick_init(void) {
+    lptimer_disable_counter(LPTIMER, LPTIMER_CH_A);
+    lptimer_disable_counter(LPTIMER, LPTIMER_CH_B);
+
+    ANA_REG->MISC_CTRL |= 1 << 0; // SEL_32K, select LXFO
+
+    select_lptimer_clk(LPTIMER_CLK_SOURCE_32K, LPTIMER_CH_A);
+    select_lptimer_clk(LPTIMER_CLK_SOURCE_CASCADE, LPTIMER_CH_B);
+    select_lptimer_clk(LPTIMER_CLK_SOURCE_32K, LPTIMER_CH_C);
+    select_lptimer_clk(LPTIMER_CLK_SOURCE_32K, LPTIMER_CH_D);
+
+    lptimer_load_max_count(LPTIMER, LPTIMER_CH_A);
+    lptimer_set_mode_freerunning(LPTIMER, LPTIMER_CH_A);
+
+    lptimer_load_max_count(LPTIMER, LPTIMER_CH_B);
+    lptimer_set_mode_freerunning(LPTIMER, LPTIMER_CH_B);
+
+    lptimer_enable_counter(LPTIMER, LPTIMER_CH_B);
+    lptimer_enable_counter(LPTIMER, LPTIMER_CH_A);
+
+    system_tick_source_hz = 32768;
+
+    NVIC_ClearPendingIRQ(LPTIMER2_IRQ_IRQn);
+    NVIC_SetPriority(LPTIMER2_IRQ_IRQn, IRQ_PRI_SYSTEM_TICK);
+    NVIC_EnableIRQ(LPTIMER2_IRQ_IRQn);
+
+    NVIC_ClearPendingIRQ(LPTIMER3_IRQ_IRQn);
+    NVIC_SetPriority(LPTIMER3_IRQ_IRQn, IRQ_PRI_SYSTEM_TICK);
+    NVIC_EnableIRQ(LPTIMER3_IRQ_IRQn);
+}
+
+void LPTIMER2_IRQHandler(void) {
+    lptimer_clear_interrupt(LPTIMER, LPTIMER_CH_C);
+    __SEV();
+}
+
+void LPTIMER3_IRQHandler(void) {
+    lptimer_clear_interrupt(LPTIMER, LPTIMER_CH_D);
+    lptimer_mask_interrupt(LPTIMER, LPTIMER_CH_D);
+    lptimer_disable_counter(LPTIMER, LPTIMER_CH_D);
+    system_tick_schedule_callback();
+    __SEV();
+}
+
+uint32_t system_tick_get_u32(void) {
+    return 0xffffffff - lptimer_get_count(LPTIMER, LPTIMER_CH_A);
+}
+
+uint64_t system_tick_get_u64(void) {
+    // Get 64-bit counter value from the hardware timer.
+    // Sample it twice in case the low counter wraps around while sampling.
+    uint32_t irq_state = disable_irq();
+    uint32_t lo0 = lptimer_get_count(LPTIMER, LPTIMER_CH_A);
+    uint32_t hi0 = lptimer_get_count(LPTIMER, LPTIMER_CH_B);
+    uint32_t lo1 = lptimer_get_count(LPTIMER, LPTIMER_CH_A);
+    uint32_t hi1 = lptimer_get_count(LPTIMER, LPTIMER_CH_B);
+    enable_irq(irq_state);
+
+    if (hi0 == hi1) {
+        // Low counter may have wrapped around between sampling of lo0 and hi0, so prefer second sampling.
+        lo0 = lo1;
+        hi0 = hi1;
+    } else {
+        // Low counter wrapped around either between sampling of hi0 and lo1, or sampling of lo1 and hi1.
+        // In either case use the first sampling.
+    }
+
+    // Convert from descending count to ascending.
+    lo0 = 0xffffffff - lo0;
+    hi0 = 0xffffffff - hi0;
+
+    // Return a 64-bit value.
+    return ((uint64_t)hi0 << 32) | (uint64_t)lo0;
+}
+
+void system_tick_wfe_with_timeout_us(uint32_t timeout_us) {
+    // Maximum 131 second timeout, to not overflow 32-bit ticks when
+    // LPTIMER is clocked at 32768Hz.
+    uint32_t timeout_ticks = (uint64_t)MIN(timeout_us, 131000000) * system_tick_source_hz / 1000000;
+
+    // Set up the LPTIMER interrupt to fire after the given timeout.
+    lptimer_disable_counter(LPTIMER, LPTIMER_CH_C);
+    lptimer_set_mode_userdefined(LPTIMER, LPTIMER_CH_C);
+    lptimer_load_count(LPTIMER, LPTIMER_CH_C, &timeout_ticks);
+    lptimer_clear_interrupt(LPTIMER, LPTIMER_CH_C);
+    lptimer_unmask_interrupt(LPTIMER, LPTIMER_CH_C);
+    lptimer_enable_counter(LPTIMER, LPTIMER_CH_C);
+
+    // Wait for an event.
+    __WFE();
+
+    // Disable the LPTIMER interrupt (in case a different interrupt woke the WFE).
+    lptimer_mask_interrupt(LPTIMER, LPTIMER_CH_C);
+    lptimer_disable_counter(LPTIMER, LPTIMER_CH_C);
+}
+
+void system_tick_schedule_after_us(uint32_t ticks_us) {
+    // Disable the interrupt in case it's still active.
+    lptimer_mask_interrupt(LPTIMER, LPTIMER_CH_D);
+
+    // Maximum 131 second timeout, to not overflow 32-bit ticks when
+    // LPTIMER is clocked at 32768Hz.
+    uint32_t timeout_ticks = (uint64_t)MIN(ticks_us, 131000000) * system_tick_source_hz / 1000000;
+
+    // Set up the LPTIMER interrupt to fire after the given timeout.
+    lptimer_disable_counter(LPTIMER, LPTIMER_CH_D);
+    lptimer_set_mode_userdefined(LPTIMER, LPTIMER_CH_D);
+    lptimer_load_count(LPTIMER, LPTIMER_CH_D, &timeout_ticks);
+    lptimer_clear_interrupt(LPTIMER, LPTIMER_CH_D);
+    lptimer_unmask_interrupt(LPTIMER, LPTIMER_CH_D);
+    lptimer_enable_counter(LPTIMER, LPTIMER_CH_D);
+}
+
+#elif MICROPY_HW_SYSTEM_TICK_USE_UTIMER
+
+#include "utimer.h"
+
 #define UTIMER ((UTIMER_Type *)UTIMER_BASE)
 #define UTIMER_CHANNEL (11)
 
@@ -166,3 +297,5 @@ void system_tick_schedule_after_us(uint32_t ticks_us) {
         }
     }
 }
+
+#endif
diff --git a/ports/alif/system_tick.h b/ports/alif/system_tick.h
index 2373f9421de7b..d808b76322e7d 100644
--- a/ports/alif/system_tick.h
+++ b/ports/alif/system_tick.h
@@ -26,9 +26,13 @@
 #ifndef MICROPY_INCLUDED_ALIF_SYSTEM_TICK_H
 #define MICROPY_INCLUDED_ALIF_SYSTEM_TICK_H
 
-#include <stdint.h>
+#include "py/mpconfig.h"
 
+#if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+extern uint64_t system_tick_source_hz;
+#else
 extern uint64_t system_core_clock_mhz;
+#endif
 
 void system_tick_init(void);
 uint32_t system_tick_get_u32(void);

From c6ebecc4c3dbeeecbb0eecabd4ecb6162b8f14bb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Aug 2024 12:59:47 +1000
Subject: [PATCH 2066/3129] alif/system_tick: Implement optional ARM SysTick
 support for systick.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpconfigport.h |  6 +++-
 ports/alif/mphalport.c    | 16 ++++++++--
 ports/alif/system_tick.c  | 64 ++++++++++++++++++++++++++++++++++++++-
 ports/alif/system_tick.h  |  2 +-
 4 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index b1a01910628bb..0fee2c379a3bd 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -37,10 +37,14 @@
 #endif
 
 // Select the low-level system tick implementation.
-#if !defined(MICROPY_HW_SYSTEM_TICK_USE_LPTIMER) \
+#if !defined(MICROPY_HW_SYSTEM_TICK_USE_SYSTICK) \
+    && !defined(MICROPY_HW_SYSTEM_TICK_USE_LPTIMER) \
     && !defined(MICROPY_HW_SYSTEM_TICK_USE_UTIMER)
 #define MICROPY_HW_SYSTEM_TICK_USE_UTIMER       (1)
 #endif
+#if MICROPY_HW_SYSTEM_TICK_USE_SYSTICK
+#define MICROPY_SOFT_TIMER_TICKS_MS             system_tick_ms_counter
+#endif
 
 #ifndef MICROPY_HW_ENABLE_OSPI
 #define MICROPY_HW_ENABLE_OSPI                  (CORE_M55_HP)
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index becac8f3b4a0a..5e3dad141908e 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -120,7 +120,9 @@ mp_uint_t mp_hal_ticks_cpu(void) {
 
 mp_uint_t mp_hal_ticks_us(void) {
     // Convert system tick to microsecond counter.
-    #if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+    #if MICROPY_HW_SYSTEM_TICK_USE_SYSTICK
+    return system_tick_get_u64();
+    #elif MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
     return system_tick_get_u64() * 1000000 / system_tick_source_hz;
     #else
     return system_tick_get_u64() / system_core_clock_mhz;
@@ -129,7 +131,9 @@ mp_uint_t mp_hal_ticks_us(void) {
 
 mp_uint_t mp_hal_ticks_ms(void) {
     // Convert system tick to millisecond counter.
-    #if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+    #if MICROPY_HW_SYSTEM_TICK_USE_SYSTICK
+    return system_tick_get_u64() / 1000ULL;
+    #elif MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
     return system_tick_get_u64() * 1000ULL / system_tick_source_hz;
     #else
     return system_tick_get_u64() / (SystemCoreClock / 1000);
@@ -137,7 +141,9 @@ mp_uint_t mp_hal_ticks_ms(void) {
 }
 
 void mp_hal_delay_us(mp_uint_t us) {
-    #if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+    #if MICROPY_HW_SYSTEM_TICK_USE_SYSTICK
+    uint64_t ticks_delay = (uint64_t)us;
+    #elif MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
     uint64_t ticks_delay = (uint64_t)us * system_tick_source_hz / 1000000;
     #else
     uint64_t ticks_delay = (uint64_t)us * system_core_clock_mhz;
@@ -167,6 +173,8 @@ void system_tick_schedule_callback(void) {
     pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
 }
 
+#if !defined(MICROPY_SOFT_TIMER_TICKS_MS)
+
 uint32_t soft_timer_get_ms(void) {
     return mp_hal_ticks_ms();
 }
@@ -177,3 +185,5 @@ void soft_timer_schedule_at_ms(uint32_t ticks_ms) {
     ms = MIN(ms, 4000000); // ensure ms * 1000 doesn't overflow
     system_tick_schedule_after_us(ms * 1000);
 }
+
+#endif
diff --git a/ports/alif/system_tick.c b/ports/alif/system_tick.c
index 72b8d021c39c0..4f161e6709e4b 100644
--- a/ports/alif/system_tick.c
+++ b/ports/alif/system_tick.c
@@ -29,7 +29,69 @@
 
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 
-#if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
+#if MICROPY_HW_SYSTEM_TICK_USE_SYSTICK
+
+#include "shared/runtime/softtimer.h"
+#include "pendsv.h"
+
+volatile uint32_t system_tick_ms_counter;
+
+void system_tick_init(void) {
+    // Configure SysTick to run at 1kHz (1ms interval)
+    SysTick_Config(SystemCoreClock / 1000);
+    NVIC_SetPriority(SysTick_IRQn, IRQ_PRI_SYSTEM_TICK);
+    NVIC_EnableIRQ(SysTick_IRQn);
+}
+
+void SysTick_Handler(void) {
+    uint32_t uw_tick = system_tick_ms_counter + 1;
+    system_tick_ms_counter = uw_tick;
+
+    // Read the systick control register to clear the COUNTFLAG bit.
+    SysTick->CTRL;
+
+    if (soft_timer_next == uw_tick) {
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+    }
+}
+
+uint32_t system_tick_get_u32(void) {
+    return system_tick_get_u64();
+}
+
+uint64_t system_tick_get_u64(void) {
+    mp_uint_t irq_state = disable_irq();
+    uint32_t counter = SysTick->VAL;
+    uint32_t milliseconds = system_tick_ms_counter;
+    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 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
+
+    // Calculate 64-bit microsecond counter.
+    return (uint64_t)milliseconds * 1000ULL + (uint64_t)((counter * 1000) / (load + 1));
+}
+
+void system_tick_wfe_with_timeout_us(uint32_t timeout_us) {
+    if (timeout_us > 1000) {
+        // SysTick will wake us in at most 1ms.
+        __WFI();
+    }
+}
+
+#elif MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
 
 #include "lptimer.h"
 #include "sys_ctrl_lptimer.h"
diff --git a/ports/alif/system_tick.h b/ports/alif/system_tick.h
index d808b76322e7d..a380808b2e043 100644
--- a/ports/alif/system_tick.h
+++ b/ports/alif/system_tick.h
@@ -30,7 +30,7 @@
 
 #if MICROPY_HW_SYSTEM_TICK_USE_LPTIMER
 extern uint64_t system_tick_source_hz;
-#else
+#elif MICROPY_HW_SYSTEM_TICK_USE_UTIMER
 extern uint64_t system_core_clock_mhz;
 #endif
 

From 58d6fe236b60daa92810abc81c8462e362a344dc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Sep 2024 17:04:56 +1000
Subject: [PATCH 2067/3129] alif/mpconfigport: Select SysTick on HE core.

UTIMER is used by the HP.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 0fee2c379a3bd..ae3ad7a30d352 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -40,7 +40,11 @@
 #if !defined(MICROPY_HW_SYSTEM_TICK_USE_SYSTICK) \
     && !defined(MICROPY_HW_SYSTEM_TICK_USE_LPTIMER) \
     && !defined(MICROPY_HW_SYSTEM_TICK_USE_UTIMER)
+#if CORE_M55_HP
 #define MICROPY_HW_SYSTEM_TICK_USE_UTIMER       (1)
+#else
+#define MICROPY_HW_SYSTEM_TICK_USE_SYSTICK      (1)
+#endif
 #endif
 #if MICROPY_HW_SYSTEM_TICK_USE_SYSTICK
 #define MICROPY_SOFT_TIMER_TICKS_MS             system_tick_ms_counter

From 4c4b4844df7746aa2ed4b124663e2472cb908b1a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Oct 2024 18:20:06 +1100
Subject: [PATCH 2068/3129] alif/mpu: Add custom MPU_Load_Regions function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif.mk |  1 +
 ports/alif/mpu.c   | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 ports/alif/mpu.h   | 31 ++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 ports/alif/mpu.c
 create mode 100644 ports/alif/mpu.h

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index c68fc66d44cc6..210b06c65f74e 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -119,6 +119,7 @@ SRC_C = \
 	main.c \
 	modalif.c \
 	mphalport.c \
+	mpu.c \
 	mpuart.c \
 	msc_disk.c \
 	ospi_flash.c \
diff --git a/ports/alif/mpu.c b/ports/alif/mpu.c
new file mode 100644
index 0000000000000..11c6273fcb345
--- /dev/null
+++ b/ports/alif/mpu.c
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "mpu.h"
+#include ALIF_CMSIS_H
+
+static const ARM_MPU_Region_t mpu_table[] __STARTUP_RO_DATA_ATTRIBUTE = {
+    {   /* SRAM0 - 4MB : RO-0, NP-1, XN-0 */
+        .RBAR = ARM_MPU_RBAR(0x02000000, ARM_MPU_SH_NON, 0, 1, 0),
+        .RLAR = ARM_MPU_RLAR(0x023FFFFF, MP_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT)
+    },
+    {   /* SRAM1 - 2.5MB : RO-0, NP-1, XN-0 */
+        .RBAR = ARM_MPU_RBAR(0x08000000, ARM_MPU_SH_NON, 0, 1, 0),
+        .RLAR = ARM_MPU_RLAR(0x0827FFFF, MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA)
+    },
+    {   /* Host Peripherals - 16MB : RO-0, NP-1, XN-1 */
+        .RBAR = ARM_MPU_RBAR(0x1A000000, ARM_MPU_SH_NON, 0, 1, 1),
+        .RLAR = ARM_MPU_RLAR(0x1AFFFFFF, MP_MPU_ATTR_INDEX_DEVICE_nGnRE)
+    },
+    {   /* MRAM - 5.5MB : RO-1, NP-1, XN-0  */
+        .RBAR = ARM_MPU_RBAR(0x80000000, ARM_MPU_SH_NON, 1, 1, 0),
+        .RLAR = ARM_MPU_RLAR(0x8057FFFF, MP_MPU_ATTR_INDEX_NORMAL_WT_RA)
+    },
+    {   /* OSPI Regs - 16MB : RO-0, NP-1, XN-1  */
+        .RBAR = ARM_MPU_RBAR(0x83000000, ARM_MPU_SH_NON, 0, 1, 1),
+        .RLAR = ARM_MPU_RLAR(0x83FFFFFF, MP_MPU_ATTR_INDEX_DEVICE_nGnRE)
+    },
+    {   /* OSPI0 XIP flash - 512MB : RO-1, NP-1, XN-0  */
+        .RBAR = ARM_MPU_RBAR(0xA0000000, ARM_MPU_SH_NON, 1, 1, 0),
+        .RLAR = ARM_MPU_RLAR(0xBFFFFFFF, MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE)
+    },
+};
+
+void MPU_Load_Regions(void) {
+    // Configure memory attributes.
+
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT,
+        ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(0, 0, 1, 0), ARM_MPU_ATTR_MEMORY_(0, 0, 1, 0)));
+
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_DEVICE_nGnRE,
+        ARM_MPU_ATTR(ARM_MPU_ATTR_DEVICE, ARM_MPU_ATTR_DEVICE_nGnRE));
+
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA,
+        ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(1, 1, 1, 1), ARM_MPU_ATTR_MEMORY_(1, 1, 1, 1)));
+
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WT_RA,
+        ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(1, 0, 1, 0), ARM_MPU_ATTR_MEMORY_(1, 0, 1, 0)));
+
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE,
+        ARM_MPU_ATTR(ARM_MPU_ATTR_NON_CACHEABLE, ARM_MPU_ATTR_NON_CACHEABLE));
+
+    // Load the MPU regions from the table.
+    ARM_MPU_Load(0, mpu_table, sizeof(mpu_table) / sizeof(ARM_MPU_Region_t));
+}
diff --git a/ports/alif/mpu.h b/ports/alif/mpu.h
new file mode 100644
index 0000000000000..87a7518a126be
--- /dev/null
+++ b/ports/alif/mpu.h
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT    (0)
+#define MP_MPU_ATTR_INDEX_DEVICE_nGnRE              (1)
+#define MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA           (2)
+#define MP_MPU_ATTR_INDEX_NORMAL_WT_RA              (3)
+#define MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE      (4)

From 84effb386ac23257e9a399bf52dc23f8f50387fe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Oct 2024 16:06:50 +1100
Subject: [PATCH 2069/3129] alif/ospi_flash: Generalise flash driver to support
 MX chips.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif.mk         |   1 +
 ports/alif/ospi_ext.c      | 292 ++++++++++++++++++++++++++++++
 ports/alif/ospi_ext.h      |  57 ++++++
 ports/alif/ospi_flash.c    | 362 ++++++++++++++++++++++++-------------
 ports/alif/ospi_flash.h    |  61 ++++++-
 ports/alif/ospi_xip_user.h |   5 -
 6 files changed, 643 insertions(+), 135 deletions(-)
 create mode 100644 ports/alif/ospi_ext.c
 create mode 100644 ports/alif/ospi_ext.h
 delete mode 100644 ports/alif/ospi_xip_user.h

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 210b06c65f74e..1581452195840 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -122,6 +122,7 @@ SRC_C = \
 	mpu.c \
 	mpuart.c \
 	msc_disk.c \
+	ospi_ext.c \
 	ospi_flash.c \
 	pendsv.c \
 	system_tick.c \
diff --git a/ports/alif/ospi_ext.c b/ports/alif/ospi_ext.c
new file mode 100644
index 0000000000000..48446d0622d48
--- /dev/null
+++ b/ports/alif/ospi_ext.c
@@ -0,0 +1,292 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 ALIF_CMSIS_H
+#include "ospi_ext.h"
+#include "ospi_xip_user.h"
+
+#define INST_L16bit (3)
+
+static void ospi_xip_disable(ospi_flash_cfg_t *ospi_cfg) {
+    ospi_cfg->aes_regs->aes_control &= ~AES_CONTROL_XIP_EN;
+}
+
+static void ospi_xip_enable(ospi_flash_cfg_t *ospi_cfg) {
+    ospi_cfg->aes_regs->aes_control |= AES_CONTROL_XIP_EN;
+    #if OSPI_XIP_ENABLE_AES_DECRYPTION
+    ospi_cfg->aes_regs->aes_control |= (AES_CONTROL_LD_KEY | AES_CONTROL_DECRYPT_EN);
+    #endif
+}
+
+// Standard SPI transfer.
+void ospi_spi_transfer(ospi_flash_cfg_t *ospi_cfg, size_t len, const uint8_t *buf_out, uint8_t *buf_in) {
+    ospi_writel(ospi_cfg, ser, 0);
+    spi_disable(ospi_cfg);
+
+    uint32_t ctrlr0 = CTRLR0_IS_MST
+        | (SINGLE << CTRLR0_SPI_FRF_OFFSET)
+        | (SPI_TMOD_TR << CTRLR0_TMOD_OFFSET)
+        | (CTRLR0_DFS_8bit << CTRLR0_DFS_OFFSET)
+    ;
+
+    uint32_t spi_ctrlr0 = TRANS_TYPE_STANDARD;
+
+    ospi_writel(ospi_cfg, ctrlr0, ctrlr0);
+    ospi_writel(ospi_cfg, ctrlr1, len - 1);
+    ospi_writel(ospi_cfg, spi_ctrlr0, spi_ctrlr0);
+    spi_enable(ospi_cfg);
+
+    // Buffer output data in SPI FIFO.
+    for (int i = 0; i < len; ++i) {
+        ospi_writel(ospi_cfg, data_reg, buf_out[i]);
+    }
+
+    // Enable the SPI peripheral.
+    ospi_writel(ospi_cfg, ser, ospi_cfg->ser);
+
+    // Read in data.
+    for (int i = 0; i < len; ++i) {
+        unsigned int timeout = 100000;
+        while (ospi_readl(ospi_cfg, rxflr) == 0) {
+            if (--timeout == 0) {
+                return;
+            }
+        }
+        buf_in[i] = ospi_readl(ospi_cfg, data_reg);
+    }
+}
+
+void ospi_setup_read_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_len, uint32_t addr_len, uint32_t data_len, uint32_t read_len, uint32_t wait_cycles) {
+    ospi_writel(ospi_cfg, ser, 0);
+    spi_disable(ospi_cfg);
+
+    uint32_t val = CTRLR0_IS_MST
+        | (OCTAL << CTRLR0_SPI_FRF_OFFSET)
+        | (TMOD_RO << CTRLR0_TMOD_OFFSET)
+        | (data_len << CTRLR0_DFS_OFFSET);
+
+    ospi_writel(ospi_cfg, ctrlr0, val);
+    ospi_writel(ospi_cfg, ctrlr1, read_len - 1);
+
+    if (ospi_cfg->ddr_en) {
+        val = TRANS_TYPE_FRF_DEFINED
+            | (rxds << CTRLR0_SPI_RXDS_EN_OFFSET)
+            | (1 << CTRLR0_SPI_DDR_EN_OFFSET)
+            | (inst_len << CTRLR0_INST_L_OFFSET)
+            | (addr_len << CTRLR0_ADDR_L_OFFSET)
+            | (wait_cycles << CTRLR0_WAIT_CYCLES_OFFSET);
+        if (inst_len == OSPI_INST_L_16bit) {
+            val |= 1 << CTRLR0_INST_DDR_EN_OFFSET;
+        }
+    } else {
+        val = TRANS_TYPE_FRF_DEFINED
+            | (rxds << CTRLR0_SPI_RXDS_EN_OFFSET)
+            | (inst_len << CTRLR0_INST_L_OFFSET)
+            | (addr_len << CTRLR0_ADDR_L_OFFSET)
+            | (wait_cycles << CTRLR0_WAIT_CYCLES_OFFSET);
+    }
+
+    ospi_writel(ospi_cfg, spi_ctrlr0, val);
+    ospi_cfg->rx_req = read_len;
+    spi_enable(ospi_cfg);
+}
+
+int ospi_recv_blocking_8bit_data(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint8_t *buffer) {
+    ospi_writel(ospi_cfg, data_reg, command);
+    ospi_writel(ospi_cfg, ser, ospi_cfg->ser);
+
+    ospi_cfg->rx_cnt = 0;
+
+    while (ospi_cfg->rx_cnt < ospi_cfg->rx_req) {
+        unsigned int timeout = 100000;
+        while (ospi_readl(ospi_cfg, rxflr) == 0) {
+            if (--timeout == 0) {
+                return -OSPI_ETIMEDOUT;
+            }
+        }
+        *buffer++ = ospi_readl(ospi_cfg, data_reg);
+        ospi_cfg->rx_cnt++;
+    }
+
+    return 0;
+}
+
+int ospi_recv_blocking_16bit_data(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint16_t *buffer) {
+    ospi_writel(ospi_cfg, data_reg, command);
+    ospi_writel(ospi_cfg, ser, ospi_cfg->ser);
+
+    ospi_cfg->rx_cnt = 0;
+
+    while (ospi_cfg->rx_cnt < ospi_cfg->rx_req) {
+        unsigned int timeout = 100000;
+        while (ospi_readl(ospi_cfg, rxflr) == 0) {
+            if (--timeout == 0) {
+                return -OSPI_ETIMEDOUT;
+            }
+        }
+        *buffer++ = ospi_readl(ospi_cfg, data_reg);
+        ospi_cfg->rx_cnt++;
+    }
+
+    return 0;
+}
+
+int ospi_recv_blocking_32bit_data(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint32_t *buffer) {
+    ospi_writel(ospi_cfg, data_reg, command);
+    ospi_writel(ospi_cfg, ser, ospi_cfg->ser);
+
+    ospi_cfg->rx_cnt = 0;
+
+    while (ospi_cfg->rx_cnt < ospi_cfg->rx_req) {
+        unsigned int timeout = 100000;
+        while (ospi_readl(ospi_cfg, rxflr) == 0) {
+            if (--timeout == 0) {
+                return -OSPI_ETIMEDOUT;
+            }
+        }
+        *buffer++ = __ROR(ospi_readl(ospi_cfg, data_reg), 16);
+        ospi_cfg->rx_cnt++;
+    }
+
+    return 0;
+}
+
+void ospi_setup_write_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_len, uint32_t addr_len, uint32_t data_len) {
+    ospi_writel(ospi_cfg, ser, 0);
+    spi_disable(ospi_cfg);
+
+    uint32_t val = CTRLR0_IS_MST
+        | (OCTAL << CTRLR0_SPI_FRF_OFFSET)
+        | (TMOD_TO << CTRLR0_TMOD_OFFSET)
+        | (data_len << CTRLR0_DFS_OFFSET);
+
+    ospi_writel(ospi_cfg, ctrlr0, val);
+    ospi_writel(ospi_cfg, ctrlr1, 0);
+
+    if (ospi_cfg->ddr_en) {
+        val = TRANS_TYPE_FRF_DEFINED
+            | (rxds << CTRLR0_SPI_RXDS_EN_OFFSET)
+            | (1 << CTRLR0_SPI_DDR_EN_OFFSET)
+            | (inst_len << CTRLR0_INST_L_OFFSET)
+            | (addr_len << CTRLR0_ADDR_L_OFFSET)
+            | (0 << CTRLR0_WAIT_CYCLES_OFFSET);
+        if (inst_len == OSPI_INST_L_16bit) {
+            val |= 1 << CTRLR0_INST_DDR_EN_OFFSET;
+        }
+    } else {
+        val = TRANS_TYPE_FRF_DEFINED
+            | (rxds << CTRLR0_SPI_RXDS_EN_OFFSET)
+            | (inst_len << CTRLR0_INST_L_OFFSET)
+            | (addr_len << CTRLR0_ADDR_L_OFFSET)
+            | (0 << CTRLR0_WAIT_CYCLES_OFFSET);
+    }
+
+    ospi_writel(ospi_cfg, spi_ctrlr0, val);
+    spi_enable(ospi_cfg);
+}
+
+void ospi_xip_enter_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles) {
+    spi_disable(ospi_cfg);
+
+    uint32_t val = CTRLR0_IS_MST
+        | (OCTAL << CTRLR0_SPI_FRF_OFFSET)
+        | (0 << CTRLR0_SCPOL_OFFSET)
+        | (0 << CTRLR0_SCPH_OFFSET)
+        | (0 << CTRLR0_SSTE_OFFSET)
+        | (TMOD_RO << CTRLR0_TMOD_OFFSET)
+        | (data_len << CTRLR0_DFS_OFFSET);
+
+    ospi_writel(ospi_cfg, ctrlr0, val);
+
+    val = (OCTAL << XIP_CTRL_FRF_OFFSET)
+        | (0x2 << XIP_CTRL_TRANS_TYPE_OFFSET)
+        | (ADDR_L32bit << XIP_CTRL_ADDR_L_OFFSET)
+        | (INST_L16bit << XIP_CTRL_INST_L_OFFSET)
+        | (0x0 << XIP_CTRL_MD_BITS_EN_OFFSET)
+        | (read_dummy_cycles << XIP_CTRL_WAIT_CYCLES_OFFSET)
+        | (0x1 << XIP_CTRL_DFC_HC_OFFSET)
+        | (ospi_cfg->ddr_en << XIP_CTRL_DDR_EN_OFFSET)
+        | (ospi_cfg->ddr_en << XIP_CTRL_INST_DDR_EN_OFFSET)
+        | (0x1 << XIP_CTRL_RXDS_EN_OFFSET)
+        | (0x1 << XIP_CTRL_INST_EN_OFFSET)
+        | (0x0 << XIP_CTRL_CONT_XFER_EN_OFFSET)
+        | (0x0 << XIP_CTRL_HYPERBUS_EN_OFFSET)
+        | (0x1 << XIP_CTRL_RXDS_SIG_EN)
+        | (0x0 << XIP_CTRL_XIP_MBL_OFFSET)
+        | (0x0 << XIP_PREFETCH_EN_OFFSET)
+        | (0x0 << XIP_CTRL_RXDS_VL_EN_OFFSET);
+
+    ospi_writel(ospi_cfg, xip_ctrl, val);
+
+    ospi_writel(ospi_cfg, rx_sample_dly, 4);
+    ospi_writel(ospi_cfg, txd_drive_edge, 1);
+    ospi_cfg->aes_regs->aes_rxds_delay = OSPI_XIP_RXDS_DELAY;
+
+    ospi_writel(ospi_cfg, xip_mode_bits, 0x0);
+    ospi_writel(ospi_cfg, xip_incr_inst, incr_command);
+    ospi_writel(ospi_cfg, xip_wrap_inst, wrap_command);
+    ospi_writel(ospi_cfg, xip_ser, ospi_cfg->ser);
+
+    spi_enable(ospi_cfg);
+    ospi_xip_enable(ospi_cfg);
+}
+
+void ospi_xip_exit_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint16_t incr_command, uint16_t wrap_command) {
+    spi_disable(ospi_cfg);
+
+    uint32_t val = CTRLR0_IS_MST
+        | (OCTAL << CTRLR0_SPI_FRF_OFFSET)
+        | (0 << CTRLR0_SCPOL_OFFSET)
+        | (0 << CTRLR0_SCPH_OFFSET)
+        | (0 << CTRLR0_SSTE_OFFSET)
+        | (TMOD_RO << CTRLR0_TMOD_OFFSET)
+        | (CTRLR0_DFS_32bit << CTRLR0_DFS_OFFSET);
+
+    ospi_writel(ospi_cfg, ctrlr0, val);
+
+    val = TRANS_TYPE_FRF_DEFINED
+        | ((ospi_cfg->ddr_en) << CTRLR0_SPI_DDR_EN_OFFSET)
+        | (2 << CTRLR0_XIP_MBL_OFFSET)
+        | (1 << CTRLR0_XIP_DFS_HC_OFFSET)
+        | (1 << CTRLR0_XIP_INST_EN_OFFSET)
+        | (CTRLR0_INST_L_16bit << CTRLR0_INST_L_OFFSET)
+        | (ospi_cfg->addrlen) << (CTRLR0_ADDR_L_OFFSET)
+        | (ospi_cfg->wait_cycles << CTRLR0_WAIT_CYCLES_OFFSET);
+
+    ospi_writel(ospi_cfg, spi_ctrlr0, val);
+
+    ospi_writel(ospi_cfg, xip_mode_bits, 0x1);
+    ospi_writel(ospi_cfg, xip_incr_inst, incr_command);
+    ospi_writel(ospi_cfg, xip_wrap_inst, wrap_command);
+    ospi_writel(ospi_cfg, xip_ser, ospi_cfg->ser);
+    ospi_writel(ospi_cfg, ser, ospi_cfg->ser);
+    ospi_writel(ospi_cfg, xip_cnt_time_out, 100);
+
+    spi_enable(ospi_cfg);
+
+    ospi_xip_enable(ospi_cfg);
+    ospi_xip_disable(ospi_cfg);
+}
diff --git a/ports/alif/ospi_ext.h b/ports/alif/ospi_ext.h
new file mode 100644
index 0000000000000..e467772d15670
--- /dev/null
+++ b/ports/alif/ospi_ext.h
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_OSPI_EXT_H
+#define MICROPY_INCLUDED_ALIF_OSPI_EXT_H
+
+#include <stddef.h>
+#include "ospi_drv.h"
+
+#define OSPI_ETIMEDOUT (110)
+
+#define OSPI_INST_L_8bit    (CTRLR0_INST_L_8bit)
+#define OSPI_INST_L_16bit   (CTRLR0_INST_L_16bit)
+
+#define OSPI_ADDR_L_0bit    UINT32_C(0x0)
+#define OSPI_ADDR_L_24bit   UINT32_C(0x6)
+#define OSPI_ADDR_L_32bit   UINT32_C(0x8)
+
+#define OSPI_DATA_L_8bit    (CTRLR0_DFS_8bit)
+#define OSPI_DATA_L_16bit   (CTRLR0_DFS_16bit)
+#define OSPI_DATA_L_32bit   (CTRLR0_DFS_32bit)
+
+void ospi_spi_transfer(ospi_flash_cfg_t *ospi_cfg, size_t len, const uint8_t *buf_out, uint8_t *buf_in);
+
+void ospi_setup_read_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_len, uint32_t addr_len, uint32_t data_len, uint32_t read_len, uint32_t wait_cycles);
+int ospi_recv_blocking_8bit_data(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint8_t *buffer);
+int ospi_recv_blocking_16bit_data(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint16_t *buffer);
+int ospi_recv_blocking_32bit_data(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint32_t *buffer);
+
+void ospi_setup_write_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_len, uint32_t addr_len, uint32_t data_len);
+
+void ospi_xip_enter_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles);
+void ospi_xip_exit_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint16_t incr_command, uint16_t wrap_command);
+
+#endif // MICROPY_INCLUDED_ALIF_OSPI_EXT_H
diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index f84761366b3f0..6f083de630aa9 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -28,72 +28,84 @@
 #include "py/mphal.h"
 
 #if MICROPY_HW_ENABLE_OSPI
+
+#include "ospi_ext.h"
 #include "ospi_flash.h"
 #include "ospi_drv.h"
+#include "ospi_xip_user.h"
 #include "pinconf.h"
 
-#define CMD_RDSR        (0x05)
-#define CMD_WREN        (0x06)
-#define CMD_SEC_ERASE_32ADDR (0x21) // 4kiB sector erase with 32-bit address
-#define CMD_WRVOL       (0x81)
-#define CMD_RD_DEVID    (0x9f)
-
-#define WAIT_SR_TIMEOUT (1000000)
+#define WAIT_SR_TIMEOUT     (1000000)
 
-// maximum bytes we can write in one SPI transfer
-// limited by 256 byte FIFO buffer (can't go up to 256)
-// need to use DMA to make this 256
-#define PAGE_SIZE       (128)
+// Generic SPI flash commands.
+#define CMD_SPI_WREN (0x06)
 
-#define ISSI_MODE_OCTAL_DDR_DQS (0xe7)
+// This is the maximum number of bytes that can be written to SPI flash at once.
+#define PAGE_SIZE (256)
 
-// All OSPI1 pins use the same alternate function.
-#define OSPI1_PIN_FUNCTION PINMUX_ALTERNATE_FUNCTION_1
+// All OSP0/OSPI1 pins use the same alternate function.
+#define OSPI_PIN_FUNCTION PINMUX_ALTERNATE_FUNCTION_1
 
-typedef struct _mp_spiflash_t {
+typedef struct _ospi_flash_t {
+    const ospi_pin_settings_t *pin;
+    const ospi_flash_settings_t *set;
     ospi_flash_cfg_t cfg;
-} mp_spiflash_t;
+} ospi_flash_t;
 
-static mp_spiflash_t global_flash;
+static ospi_flash_t global_flash;
 
-// Alif version of this function can overwrite the destination buffer.
-static void ospi_recv_blocking2(ospi_flash_cfg_t *ospi_cfg, uint32_t command, uint8_t *buffer) {
-    uint32_t val;
+/******************************************************************************/
+// Generic SPI-flash helper functions.
 
-    ospi_writel(ospi_cfg, data_reg, command);
-    ospi_writel(ospi_cfg, ser, ospi_cfg->ser);
-
-    ospi_cfg->rx_cnt = 0;
+static void ospi_flash_wren_spi(ospi_flash_t *self) {
+    uint8_t buf[1] = {CMD_SPI_WREN};
+    ospi_spi_transfer(&self->cfg, 1, buf, buf);
+}
 
-    while (ospi_cfg->rx_cnt < ospi_cfg->rx_req) {
-        unsigned int timeout = 100000;
-        while (ospi_readl(ospi_cfg, rxflr) == 0) {
-            if (--timeout == 0) {
-                return;
-            }
-        }
-        val = ospi_readl(ospi_cfg, data_reg);
-        *buffer++ = (uint8_t)val;
-        ospi_cfg->rx_cnt++;
+static int ospi_flash_read_cmd(ospi_flash_t *self, uint32_t cmd, uint8_t cmd_dummy_cycles, size_t len, uint8_t *dest) {
+    int ret = 0;
+    if (self->set->inst_len == OSPI_INST_L_8bit) {
+        ospi_setup_read_ext(&self->cfg, self->set->rxds, self->set->inst_len, OSPI_ADDR_L_0bit, OSPI_DATA_L_8bit, len, cmd_dummy_cycles);
+        ret = ospi_recv_blocking_8bit_data(&self->cfg, cmd, dest);
+    } else {
+        uint16_t dest16 = 0;
+        ospi_setup_read_ext(&self->cfg, self->set->rxds, self->set->inst_len, OSPI_ADDR_L_32bit, OSPI_DATA_L_16bit, len, cmd_dummy_cycles);
+        ospi_push(&self->cfg, cmd);
+        ret = ospi_recv_blocking_16bit_data(&self->cfg, 0 /* addr */, &dest16);
+        *dest = dest16;
     }
+    return ret;
 }
 
-static int mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len, uint8_t *dest) {
-    ospi_setup_read(&self->cfg, 0, len, 8);
-    ospi_recv_blocking2(&self->cfg, cmd, dest);
+static int ospi_flash_write_cmd_addr(ospi_flash_t *self, uint32_t cmd, uint32_t addr_len, uint32_t addr) {
+    if (self->set->inst_len == OSPI_INST_L_8bit) {
+        ospi_setup_write_ext(&self->cfg, false, self->set->inst_len, addr_len, OSPI_DATA_L_8bit);
+    } else {
+        ospi_setup_write_ext(&self->cfg, self->set->rxds, self->set->inst_len, addr_len, OSPI_DATA_L_16bit);
+    }
+    if (addr_len == OSPI_ADDR_L_0bit) {
+        ospi_send_blocking(&self->cfg, cmd);
+    } else {
+        ospi_push(&self->cfg, cmd);
+        ospi_send_blocking(&self->cfg, addr);
+    }
     return 0;
 }
 
-static int mp_spiflash_write_cmd(mp_spiflash_t *self, uint8_t cmd) {
-    ospi_setup_write(&self->cfg, 0);
-    ospi_send_blocking(&self->cfg, cmd);
-    return 0;
+static int ospi_flash_write_cmd(ospi_flash_t *self, uint32_t cmd) {
+    return ospi_flash_write_cmd_addr(self, cmd, OSPI_ADDR_L_0bit, 0);
 }
 
-static int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, uint32_t timeout) {
+static uint32_t ospi_flash_read_id_spi(ospi_flash_t *self) {
+    uint8_t buf[4] = {0x9f, 0, 0, 0};
+    ospi_spi_transfer(&self->cfg, 4, buf, buf);
+    return buf[1] | buf[2] << 8 | buf[3] << 16;
+}
+
+static int ospi_flash_wait_sr(ospi_flash_t *self, uint8_t mask, uint8_t val, uint32_t timeout) {
     do {
-        uint8_t sr;
-        int ret = mp_spiflash_read_cmd(self, CMD_RDSR, 1, &sr);
+        uint8_t sr = 0;
+        int ret = ospi_flash_read_cmd(self, self->set->read_sr, self->set->read_sr_dummy_cycles, 1, &sr);
         if (ret != 0) {
             return ret;
         }
@@ -105,144 +117,251 @@ static int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, u
     return -MP_ETIMEDOUT;
 }
 
-static int mp_spiflash_wait_wel1(mp_spiflash_t *self) {
-    return mp_spiflash_wait_sr(self, 2, 2, WAIT_SR_TIMEOUT);
+static int ospi_flash_wait_wel1(ospi_flash_t *self) {
+    return ospi_flash_wait_sr(self, 2, 2, WAIT_SR_TIMEOUT);
 }
 
-static int mp_spiflash_wait_wip0(mp_spiflash_t *self) {
-    return mp_spiflash_wait_sr(self, 1, 0, WAIT_SR_TIMEOUT);
+static int ospi_flash_wait_wip0(ospi_flash_t *self) {
+    return ospi_flash_wait_sr(self, 1, 0, WAIT_SR_TIMEOUT);
 }
 
-static uint32_t ospi_flash_read_id(mp_spiflash_t *self) {
-    uint8_t buf[8];
-    ospi_setup_read(&self->cfg, 0, 3, ospi_flash_settings.read_id_dummy_cycles);
-    ospi_recv_blocking2(&self->cfg, CMD_RD_DEVID, buf);
+static uint32_t ospi_flash_read_id(ospi_flash_t *self) {
+    uint8_t buf[4] = {0};
+    if (self->set->inst_len == OSPI_INST_L_8bit) {
+        ospi_setup_read_ext(&self->cfg, self->set->rxds, self->set->inst_len, OSPI_ADDR_L_0bit, OSPI_DATA_L_8bit, 3, self->set->read_id_dummy_cycles);
+        ospi_recv_blocking_8bit_data(&self->cfg, self->set->read_id, buf);
+    } else {
+        ospi_setup_read_ext(&self->cfg, self->set->rxds, self->set->inst_len, OSPI_ADDR_L_32bit, OSPI_DATA_L_16bit, 4, self->set->read_id_dummy_cycles);
+        ospi_push(&self->cfg, self->set->read_id);
+        // Read 8-bit values because data is in SDR mode for read id.
+        ospi_recv_blocking_8bit_data(&self->cfg, 0, buf);
+    }
     return buf[0] | buf[1] << 8 | buf[2] << 16;
 }
 
-static void ospi_flash_write_reg_sdr(mp_spiflash_t *self, uint8_t cmd, uint8_t addr, uint8_t value) {
-    mp_spiflash_write_cmd(self, CMD_WREN);
-    ospi_setup_write_sdr(&self->cfg, 6);
-    ospi_push(&self->cfg, cmd);
-    ospi_push(&self->cfg, 0x00);
-    ospi_push(&self->cfg, 0x00);
+/******************************************************************************/
+// Functions specific to ISSI flash chips.
+
+int ospi_flash_issi_octal_switch(ospi_flash_t *self) {
+    // Switch SPI flash to Octal DDR mode.
+    const uint8_t cmd_wrvol = 0x81;
+    const uint8_t issi_mode_octal_ddr_dqs = 0xe7;
+    ospi_flash_wren_spi(self);
+    uint8_t buf[5] = {cmd_wrvol, 0, 0, 0, issi_mode_octal_ddr_dqs};
+    ospi_spi_transfer(&self->cfg, sizeof(buf), buf, buf);
+    self->cfg.ddr_en = 1;
+    return 0;
+}
+
+/******************************************************************************/
+// Functions specific to MX flash chips.
+
+int ospi_flash_mx_octal_switch(ospi_flash_t *self) {
+    // Switch SPI flash to Octal SDR or DDR mode (SOPI or DOPI) by writing to CR2.
+    const uint8_t cmd_wrcr2 = 0x72;
+    const uint8_t mx_mode_enable_sopi = 0x01;
+    const uint8_t mx_mode_enable_dopi = 0x02;
+    uint8_t mx_mode;
+    if (self->set->octal_mode == OSPI_FLASH_OCTAL_MODE_DDD) {
+        mx_mode = mx_mode_enable_dopi;
+    } else {
+        mx_mode = mx_mode_enable_sopi;
+    }
+    ospi_flash_wren_spi(self);
+    uint8_t buf[6] = {cmd_wrcr2, 0, 0, 0, 0, mx_mode};
+    ospi_spi_transfer(&self->cfg, sizeof(buf), buf, buf);
+    if (self->set->octal_mode == OSPI_FLASH_OCTAL_MODE_DDD) {
+        self->cfg.ddr_en = 1;
+    } else {
+        self->cfg.ddr_en = 0;
+    }
+    return 0;
+}
+
+static uint8_t ospi_flash_mx_read_cr_helper(ospi_flash_t *self, uint16_t command, uint32_t addr) {
+    // TODO: currently only works in DDR mode
+
+    uint16_t buf[1] = {0};
+    ospi_setup_read_ext(&self->cfg, self->set->rxds, OSPI_INST_L_16bit, OSPI_ADDR_L_32bit, OSPI_DATA_L_16bit, 1, 4);
+    ospi_push(&self->cfg, command);
+    ospi_recv_blocking_16bit_data(&self->cfg, addr, buf);
+    return buf[0] & 0xff;
+}
+
+uint8_t ospi_flash_mx_read_cr(ospi_flash_t *self) {
+    return ospi_flash_mx_read_cr_helper(self, 0x15ea, 0);
+}
+
+uint8_t ospi_flash_mx_read_cr2(ospi_flash_t *self, uint32_t addr) {
+    return ospi_flash_mx_read_cr_helper(self, 0x718e, addr);
+}
+
+static int ospi_flash_mx_write_cr_helper(ospi_flash_t *self, uint16_t command, uint32_t addr, uint8_t value) {
+    // TODO: currently only works in DDR mode
+
+    // Enable writes so that the register can be modified.
+    ospi_flash_write_cmd(self, self->set->write_en);
+    int ret = ospi_flash_wait_wel1(self);
+    if (ret < 0) {
+        return ret;
+    }
+
+    // Do the write.
+    ospi_setup_write_ext(&self->cfg, self->set->rxds, OSPI_INST_L_16bit, OSPI_ADDR_L_32bit, OSPI_DATA_L_16bit);
+    ospi_push(&self->cfg, command);
     ospi_push(&self->cfg, addr);
-    ospi_send_blocking(&self->cfg, value);
+    ospi_push(&self->cfg, value << 8); // in DDR mode, MSByte contains the register value to write
+    ospi_writel((&self->cfg), ser, self->cfg.ser);
+    while ((ospi_readl((&self->cfg), sr) & (SR_TF_EMPTY | SR_BUSY)) != SR_TF_EMPTY) {
+    }
+
+    // Wait for the write to finish.
+    return ospi_flash_wait_wip0(self);
+}
+
+int ospi_flash_mx_write_cr(ospi_flash_t *self, uint8_t value) {
+    return ospi_flash_mx_write_cr_helper(self, 0x01fe, 1, value);
 }
 
+int ospi_flash_mx_write_cr2(ospi_flash_t *self, uint32_t addr, uint8_t value) {
+    return ospi_flash_mx_write_cr_helper(self, 0x728d, addr, value);
+}
+
+/******************************************************************************/
+// SPI flash initialisation.
+
 int ospi_flash_init(void) {
-    mp_spiflash_t *self = &global_flash;
+    ospi_flash_t *self = &global_flash;
+
+    const ospi_pin_settings_t *pin = &ospi_pin_settings;
+    const ospi_flash_settings_t *set = &ospi_flash_settings;
+    self->pin = pin;
+    self->set = set;
 
     uint32_t pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST | PADCTRL_READ_ENABLE;
 
-    pinconf_set(pin_OSPI1_CS->port, pin_OSPI1_CS->pin, OSPI1_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA);
-    pinconf_set(pin_OSPI1_SCLK->port, pin_OSPI1_SCLK->pin, OSPI1_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST);
-    pinconf_set(pin_OSPI1_D0->port, pin_OSPI1_D0->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin_OSPI1_D1->port, pin_OSPI1_D1->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin_OSPI1_D2->port, pin_OSPI1_D2->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin_OSPI1_D3->port, pin_OSPI1_D3->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    #if defined(pin_OSPI1_D4)
-    pinconf_set(pin_OSPI1_D4->port, pin_OSPI1_D4->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin_OSPI1_D5->port, pin_OSPI1_D5->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin_OSPI1_D6->port, pin_OSPI1_D6->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin_OSPI1_D7->port, pin_OSPI1_D7->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    #endif
-    #if defined(pin_OSPI1_RXDS)
-    pinconf_set(pin_OSPI1_RXDS->port, pin_OSPI1_RXDS->pin, OSPI1_PIN_FUNCTION, pad_ctrl);
-    #endif
-
-    #if defined(pin_OSPI1_RXDS)
-    if (pin_OSPI1_RXDS->port == PORT_10 && pin_OSPI1_RXDS->pin == PIN_7) {
-        // Alif: P5_6 is needed to support proper alt function selection of P10_7.
-        pinconf_set(PORT_5, PIN_6, OSPI1_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin->pin_cs->port, pin->pin_cs->pin, OSPI_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA);
+    pinconf_set(pin->pin_clk->port, pin->pin_clk->pin, OSPI_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST);
+    if (pin->pin_rwds != NULL) {
+        pinconf_set(pin->pin_rwds->port, pin->pin_rwds->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+        if (pin->pin_rwds->port == PORT_10 && pin->pin_rwds->pin == PIN_7) {
+            // Alif: P5_6 is needed to support proper alt function selection of P10_7.
+            pinconf_set(PORT_5, PIN_6, OSPI_PIN_FUNCTION, pad_ctrl);
+        }
+    }
+    pinconf_set(pin->pin_d0->port, pin->pin_d0->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin->pin_d1->port, pin->pin_d1->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin->pin_d2->port, pin->pin_d2->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin->pin_d3->port, pin->pin_d3->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+    if (pin->pin_d4 != NULL) {
+        pinconf_set(pin->pin_d4->port, pin->pin_d4->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+        pinconf_set(pin->pin_d5->port, pin->pin_d5->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+        pinconf_set(pin->pin_d6->port, pin->pin_d6->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+        pinconf_set(pin->pin_d7->port, pin->pin_d7->pin, OSPI_PIN_FUNCTION, pad_ctrl);
     }
-    #endif
 
     // Reset the SPI flash.
-    mp_hal_pin_output(pin_OSPI1_RESET);
-    mp_hal_pin_low(pin_OSPI1_RESET);
-    mp_hal_delay_us(30);
-    mp_hal_pin_high(pin_OSPI1_RESET);
+    mp_hal_pin_output(pin->pin_reset);
+    mp_hal_pin_low(pin->pin_reset);
+    mp_hal_delay_us(100);
+    mp_hal_pin_high(pin->pin_reset);
+    mp_hal_delay_us(1000);
 
     // Configure the OSPI peripheral.
-    self->cfg.regs = (ssi_regs_t *)OSPI1_BASE;
-    self->cfg.aes_regs = (aes_regs_t *)AES1_BASE;
-    self->cfg.xip_base = (volatile void *)OSPI1_XIP_BASE;
-    self->cfg.ser = 1;
+    if (pin->peripheral_number == 0) {
+        self->cfg.regs = (ssi_regs_t *)OSPI0_BASE;
+        self->cfg.aes_regs = (aes_regs_t *)AES0_BASE;
+        self->cfg.xip_base = (volatile void *)OSPI0_XIP_BASE;
+    } else {
+        self->cfg.regs = (ssi_regs_t *)OSPI1_BASE;
+        self->cfg.aes_regs = (aes_regs_t *)AES1_BASE;
+        self->cfg.xip_base = (volatile void *)OSPI1_XIP_BASE;
+    }
+    self->cfg.ser = 1; // enable slave select
     self->cfg.addrlen = 8; // 32-bit address length
-    self->cfg.ospi_clock = ospi_flash_settings.freq_mhz;
+    self->cfg.ospi_clock = set->freq_hz;
     self->cfg.ddr_en = 0;
     self->cfg.wait_cycles = 0; // used only for ospi_xip_exit
     ospi_init(&self->cfg);
 
-    if (ospi_flash_settings.is_oct && ospi_flash_settings.is_ddr) {
-        // Switch SPI flash to Octal DDR mode.
-        ospi_flash_write_reg_sdr(self, CMD_WRVOL, 0x00, ISSI_MODE_OCTAL_DDR_DQS);
-        self->cfg.ddr_en = 1;
+    // Check the device ID before attempting to switch to octal mode (if needed).
+    if (ospi_flash_read_id_spi(self) != set->jedec_id) {
+        return -1;
     }
 
-    // Check the device ID.
-    if (ospi_flash_read_id(self) != ospi_flash_settings.jedec_id) {
-        return -1;
+    // Switch to octal mode if needed.
+    if (set->octal_switch != NULL) {
+        set->octal_switch(self);
+
+        // Check the device ID after switching mode.
+        if (ospi_flash_read_id(self) != set->jedec_id) {
+            return -1;
+        }
     }
 
     return 0;
 }
 
+/******************************************************************************/
+// Top-level read/erase/write functions.
+
 int ospi_flash_erase_sector(uint32_t addr) {
-    mp_spiflash_t *self = &global_flash;
+    ospi_flash_t *self = &global_flash;
 
-    mp_spiflash_write_cmd(self, CMD_WREN);
-    int ret = mp_spiflash_wait_wel1(self);
+    ospi_flash_write_cmd(self, self->set->write_en);
+    int ret = ospi_flash_wait_wel1(self);
     if (ret < 0) {
         return ret;
     }
 
-    ospi_setup_write(&self->cfg, 8 /* 32-bit addr len*/);
-    ospi_push(&self->cfg, CMD_SEC_ERASE_32ADDR);
-    ospi_send_blocking(&self->cfg, addr);
+    ospi_flash_write_cmd_addr(self, self->set->erase_command, OSPI_ADDR_L_32bit, addr);
 
-    return mp_spiflash_wait_wip0(self);
+    return ospi_flash_wait_wip0(self);
 }
 
 int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest) {
     // OSPI FIFO is limited to 256 bytes.  Need DMA to get a longer read.
-    mp_spiflash_t *self = &global_flash;
+    ospi_flash_t *self = &global_flash;
 
     while (len) {
-        uint32_t l = len;
+        uint32_t l = len / 4;
         if (l > 256) {
             l = 256;
         }
-        ospi_setup_read(&self->cfg, 8 /* 32-bit addr len*/, l, ospi_flash_settings.read_dummy_cycles);
-        ospi_push(&self->cfg, ospi_flash_settings.read_command);
-        ospi_recv_blocking2(&self->cfg, addr, dest);
-        addr += l;
-        len -= l;
-        dest += l;
+        ospi_setup_read_ext(&self->cfg, self->set->rxds, self->set->inst_len, OSPI_ADDR_L_32bit, OSPI_DATA_L_32bit, l, self->set->read_dummy_cycles);
+        ospi_push(&self->cfg, self->set->read_command);
+        ospi_recv_blocking_32bit_data(&self->cfg, addr, (uint32_t *)dest);
+        addr += l * 4;
+        len -= l * 4;
+        dest += l * 4;
     }
 
     return 0;
 }
 
 static int ospi_flash_write_page(uint32_t addr, uint32_t len, const uint8_t *src) {
-    mp_spiflash_t *self = &global_flash;
+    ospi_flash_t *self = &global_flash;
 
-    mp_spiflash_write_cmd(self, CMD_WREN);
-    int ret = mp_spiflash_wait_wel1(self);
+    ospi_flash_write_cmd(self, self->set->write_en);
+    int ret = ospi_flash_wait_wel1(self);
     if (ret < 0) {
         return ret;
     }
 
-    ospi_setup_write(&self->cfg, 8 /* 32-bit addr len*/);
-    ospi_push(&self->cfg, ospi_flash_settings.write_command);
+    ospi_setup_write_ext(&self->cfg, self->set->rxds, self->set->inst_len, OSPI_ADDR_L_32bit, OSPI_DATA_L_32bit);
+    ospi_push(&self->cfg, self->set->write_command);
     ospi_push(&self->cfg, addr);
-    while (--len) {
-        ospi_push(&self->cfg, *src++);
+
+    const uint32_t *src32 = (const uint32_t *)src;
+    for (; len; len -= 4) {
+        ospi_push(&self->cfg, __ROR(*src32++, 16));
     }
-    ospi_send_blocking(&self->cfg, *src);
 
-    return mp_spiflash_wait_wip0(self);
+    ospi_writel((&self->cfg), ser, self->cfg.ser);
+    while ((ospi_readl((&self->cfg), sr) & (SR_TF_EMPTY | SR_BUSY)) != SR_TF_EMPTY) {
+    }
+
+    return ospi_flash_wait_wip0(self);
 }
 
 int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
@@ -264,4 +383,5 @@ int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
     }
     return ret;
 }
+
 #endif // MICROPY_HW_ENABLE_OSPI
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
index 945dc4bb07ba4..6f5d8327b416d 100644
--- a/ports/alif/ospi_flash.h
+++ b/ports/alif/ospi_flash.h
@@ -26,24 +26,67 @@
 #ifndef MICROPY_INCLUDED_ALIF_OSPI_FLASH_H
 #define MICROPY_INCLUDED_ALIF_OSPI_FLASH_H
 
-#include <stdbool.h>
-#include <stdint.h>
+#include "py/mphal.h"
+
+// Format of command, address and data phases.
+enum {
+    OSPI_FLASH_OCTAL_MODE_SSS,
+    OSPI_FLASH_OCTAL_MODE_SDD,
+    OSPI_FLASH_OCTAL_MODE_DDD,
+};
+
+struct _ospi_flash_t;
+
+typedef struct _ospi_pin_settings_t {
+    uint32_t peripheral_number;
+    const mp_hal_pin_obj_t pin_reset;
+    const mp_hal_pin_obj_t pin_cs;
+    const mp_hal_pin_obj_t pin_clk;
+    const mp_hal_pin_obj_t pin_rwds;
+    const mp_hal_pin_obj_t pin_d0;
+    const mp_hal_pin_obj_t pin_d1;
+    const mp_hal_pin_obj_t pin_d2;
+    const mp_hal_pin_obj_t pin_d3;
+    const mp_hal_pin_obj_t pin_d4;
+    const mp_hal_pin_obj_t pin_d5;
+    const mp_hal_pin_obj_t pin_d6;
+    const mp_hal_pin_obj_t pin_d7;
+} ospi_pin_settings_t;
 
 typedef struct _ospi_flash_settings_t {
     uint32_t jedec_id;
-    uint32_t freq_mhz;
-    bool is_quad : 1;
-    bool is_oct : 1;
-    bool is_ddr : 1;
+    uint32_t freq_hz;
+    int (*octal_switch)(struct _ospi_flash_t *);
+    uint8_t octal_mode;
+    bool rxds;
+    uint8_t inst_len;
+    uint8_t xip_data_len;
+    uint16_t read_sr;
+    uint8_t read_sr_dummy_cycles;
+    uint16_t read_id;
     uint8_t read_id_dummy_cycles;
+    uint16_t write_en;
+    uint16_t read_command;
     uint8_t read_dummy_cycles;
-    uint8_t read_command;
-    uint8_t write_command;
+    uint16_t write_command;
+    uint16_t erase_command;
 } ospi_flash_settings_t;
 
-// Provided by the board when it enables OSPI1.
+// Provided by the board when it enables OSPI.
+extern const ospi_pin_settings_t ospi_pin_settings;
 extern const ospi_flash_settings_t ospi_flash_settings;
 
+// Functions specific to ISSI flash chips.
+int ospi_flash_issi_octal_switch(struct _ospi_flash_t *self);
+
+// Functions specific to MX flash chips.
+int ospi_flash_mx_octal_switch(struct _ospi_flash_t *self);
+uint8_t ospi_flash_mx_read_cr(struct _ospi_flash_t *self);
+uint8_t ospi_flash_mx_read_cr2(struct _ospi_flash_t *self, uint32_t addr);
+int ospi_flash_mx_write_cr(struct _ospi_flash_t *self, uint8_t value);
+int ospi_flash_mx_write_cr2(struct _ospi_flash_t *self, uint32_t addr, uint8_t value);
+
+// SPI flash interface.
 int ospi_flash_init(void);
 int ospi_flash_erase_sector(uint32_t addr);
 int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest);
diff --git a/ports/alif/ospi_xip_user.h b/ports/alif/ospi_xip_user.h
deleted file mode 100644
index a15baff2a8ba4..0000000000000
--- a/ports/alif/ospi_xip_user.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is needed by ospi_xip/source/ospi/ospi_drv.c.
-#define OSPI_XIP_ENABLE_AES_DECRYPTION (0)
-#define OSPI_XIP_RX_SAMPLE_DELAY (4)
-#define OSPI_XIP_DDR_DRIVE_EDGE (1)
-#define OSPI_XIP_RXDS_DELAY (12)

From 41e16886b1bec870b601d8eb14cd4b05426d8015 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Oct 2024 23:07:35 +1100
Subject: [PATCH 2070/3129] alif/ospi_flash: Enter XIP mode when flash is idle.

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

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 6f083de630aa9..be575d9ed772d 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -50,10 +50,14 @@ typedef struct _ospi_flash_t {
     const ospi_pin_settings_t *pin;
     const ospi_flash_settings_t *set;
     ospi_flash_cfg_t cfg;
+    bool xip_active;
 } ospi_flash_t;
 
 static ospi_flash_t global_flash;
 
+static int ospi_flash_xip_enter(ospi_flash_t *self);
+static int ospi_flash_xip_exit(ospi_flash_t *self);
+
 /******************************************************************************/
 // Generic SPI-flash helper functions.
 
@@ -299,6 +303,34 @@ int ospi_flash_init(void) {
         }
     }
 
+    // Enter XIP mode.  It will be disabled during flash read/erase/write.
+    ospi_flash_xip_enter(self);
+
+    return 0;
+}
+
+uintptr_t ospi_flash_get_xip_base(void) {
+    ospi_flash_t *self = &global_flash;
+    return (uintptr_t)self->cfg.xip_base;
+}
+
+static int ospi_flash_xip_enter(ospi_flash_t *self) {
+    if (!self->xip_active) {
+        uint32_t irq_state = disable_irq();
+        self->xip_active = true;
+        ospi_xip_enter_16bit_cmd(&self->cfg, self->set->xip_data_len, self->set->read_command, self->set->read_command, self->set->read_dummy_cycles);
+        enable_irq(irq_state);
+    }
+    return 0;
+}
+
+static int ospi_flash_xip_exit(ospi_flash_t *self) {
+    if (self->xip_active) {
+        uint32_t irq_state = disable_irq();
+        ospi_xip_exit_16bit_cmd(&self->cfg, self->set->read_command, self->set->read_command);
+        self->xip_active = false;
+        enable_irq(irq_state);
+    }
     return 0;
 }
 
@@ -308,21 +340,29 @@ int ospi_flash_init(void) {
 int ospi_flash_erase_sector(uint32_t addr) {
     ospi_flash_t *self = &global_flash;
 
+    ospi_flash_xip_exit(self);
+
     ospi_flash_write_cmd(self, self->set->write_en);
     int ret = ospi_flash_wait_wel1(self);
     if (ret < 0) {
+        ospi_flash_xip_enter(self);
         return ret;
     }
 
     ospi_flash_write_cmd_addr(self, self->set->erase_command, OSPI_ADDR_L_32bit, addr);
+    ret = ospi_flash_wait_wip0(self);
 
-    return ospi_flash_wait_wip0(self);
+    ospi_flash_xip_enter(self);
+    return ret;
 }
 
 int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest) {
     // OSPI FIFO is limited to 256 bytes.  Need DMA to get a longer read.
+    // Note that direct reading is much faster than using XIP memory-mapped read.
     ospi_flash_t *self = &global_flash;
 
+    ospi_flash_xip_exit(self);
+
     while (len) {
         uint32_t l = len / 4;
         if (l > 256) {
@@ -336,6 +376,7 @@ int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest) {
         dest += l * 4;
     }
 
+    ospi_flash_xip_enter(self);
     return 0;
 }
 
@@ -365,6 +406,8 @@ static int ospi_flash_write_page(uint32_t addr, uint32_t len, const uint8_t *src
 }
 
 int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
+    ospi_flash_xip_exit(&global_flash);
+
     int ret = 0;
     uint32_t offset = addr & (PAGE_SIZE - 1);
     while (len) {
@@ -381,6 +424,8 @@ int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
         src += rest;
         offset = 0;
     }
+
+    ospi_flash_xip_enter(&global_flash);
     return ret;
 }
 
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
index 6f5d8327b416d..8fe69764a3777 100644
--- a/ports/alif/ospi_flash.h
+++ b/ports/alif/ospi_flash.h
@@ -88,6 +88,7 @@ int ospi_flash_mx_write_cr2(struct _ospi_flash_t *self, uint32_t addr, uint8_t v
 
 // SPI flash interface.
 int ospi_flash_init(void);
+uintptr_t ospi_flash_get_xip_base(void);
 int ospi_flash_erase_sector(uint32_t addr);
 int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest);
 int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src);

From 3d17f634785f4e151d883b1d1110db3a66673efd Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 21 Nov 2024 07:55:10 +0100
Subject: [PATCH 2071/3129] alif/mpu: Define constants for MPU regions.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/mpu.c | 34 +++++++++++++++++-----------------
 ports/alif/mpu.h | 17 ++++++++++++-----
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/ports/alif/mpu.c b/ports/alif/mpu.c
index 11c6273fcb345..471eff20a2c5b 100644
--- a/ports/alif/mpu.c
+++ b/ports/alif/mpu.c
@@ -29,48 +29,48 @@
 #include ALIF_CMSIS_H
 
 static const ARM_MPU_Region_t mpu_table[] __STARTUP_RO_DATA_ATTRIBUTE = {
-    {   /* SRAM0 - 4MB : RO-0, NP-1, XN-0 */
+    [MP_MPU_REGION_SRAM0] = {   /* SRAM0 - 4MB : RO-0, NP-1, XN-0 */
         .RBAR = ARM_MPU_RBAR(0x02000000, ARM_MPU_SH_NON, 0, 1, 0),
-        .RLAR = ARM_MPU_RLAR(0x023FFFFF, MP_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT)
+        .RLAR = ARM_MPU_RLAR(0x023FFFFF, MP_MPU_ATTR_NORMAL_WT_RA_TRANSIENT)
     },
-    {   /* SRAM1 - 2.5MB : RO-0, NP-1, XN-0 */
+    [MP_MPU_REGION_SRAM1] = {   /* SRAM1 - 2.5MB : RO-0, NP-1, XN-0 */
         .RBAR = ARM_MPU_RBAR(0x08000000, ARM_MPU_SH_NON, 0, 1, 0),
-        .RLAR = ARM_MPU_RLAR(0x0827FFFF, MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA)
+        .RLAR = ARM_MPU_RLAR(0x0827FFFF, MP_MPU_ATTR_NORMAL_WB_RA_WA)
     },
-    {   /* Host Peripherals - 16MB : RO-0, NP-1, XN-1 */
+    [MP_MPU_REGION_HOST_PERIPHERALS] = {   /* Host Peripherals - 16MB : RO-0, NP-1, XN-1 */
         .RBAR = ARM_MPU_RBAR(0x1A000000, ARM_MPU_SH_NON, 0, 1, 1),
-        .RLAR = ARM_MPU_RLAR(0x1AFFFFFF, MP_MPU_ATTR_INDEX_DEVICE_nGnRE)
+        .RLAR = ARM_MPU_RLAR(0x1AFFFFFF, MP_MPU_ATTR_DEVICE_nGnRE)
     },
-    {   /* MRAM - 5.5MB : RO-1, NP-1, XN-0  */
+    [MP_MPU_REGION_MRAM] = {   /* MRAM - 5.5MB : RO-1, NP-1, XN-0  */
         .RBAR = ARM_MPU_RBAR(0x80000000, ARM_MPU_SH_NON, 1, 1, 0),
-        .RLAR = ARM_MPU_RLAR(0x8057FFFF, MP_MPU_ATTR_INDEX_NORMAL_WT_RA)
+        .RLAR = ARM_MPU_RLAR(0x8057FFFF, MP_MPU_ATTR_NORMAL_WT_RA)
     },
-    {   /* OSPI Regs - 16MB : RO-0, NP-1, XN-1  */
+    [MP_MPU_REGION_OSPI_REGISTERS] = {   /* OSPI Regs - 16MB : RO-0, NP-1, XN-1  */
         .RBAR = ARM_MPU_RBAR(0x83000000, ARM_MPU_SH_NON, 0, 1, 1),
-        .RLAR = ARM_MPU_RLAR(0x83FFFFFF, MP_MPU_ATTR_INDEX_DEVICE_nGnRE)
+        .RLAR = ARM_MPU_RLAR(0x83FFFFFF, MP_MPU_ATTR_DEVICE_nGnRE)
     },
-    {   /* OSPI0 XIP flash - 512MB : RO-1, NP-1, XN-0  */
+    [MP_MPU_REGION_OSPI0_XIP] = {   /* OSPI0 XIP flash - 512MB : RO-1, NP-1, XN-0  */
         .RBAR = ARM_MPU_RBAR(0xA0000000, ARM_MPU_SH_NON, 1, 1, 0),
-        .RLAR = ARM_MPU_RLAR(0xBFFFFFFF, MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE)
+        .RLAR = ARM_MPU_RLAR(0xBFFFFFFF, MP_MPU_ATTR_NORMAL_NON_CACHEABLE)
     },
 };
 
 void MPU_Load_Regions(void) {
     // Configure memory attributes.
 
-    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT,
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_WT_RA_TRANSIENT,
         ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(0, 0, 1, 0), ARM_MPU_ATTR_MEMORY_(0, 0, 1, 0)));
 
-    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_DEVICE_nGnRE,
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_DEVICE_nGnRE,
         ARM_MPU_ATTR(ARM_MPU_ATTR_DEVICE, ARM_MPU_ATTR_DEVICE_nGnRE));
 
-    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA,
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_WB_RA_WA,
         ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(1, 1, 1, 1), ARM_MPU_ATTR_MEMORY_(1, 1, 1, 1)));
 
-    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_WT_RA,
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_WT_RA,
         ARM_MPU_ATTR(ARM_MPU_ATTR_MEMORY_(1, 0, 1, 0), ARM_MPU_ATTR_MEMORY_(1, 0, 1, 0)));
 
-    ARM_MPU_SetMemAttr(MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE,
+    ARM_MPU_SetMemAttr(MP_MPU_ATTR_NORMAL_NON_CACHEABLE,
         ARM_MPU_ATTR(ARM_MPU_ATTR_NON_CACHEABLE, ARM_MPU_ATTR_NON_CACHEABLE));
 
     // Load the MPU regions from the table.
diff --git a/ports/alif/mpu.h b/ports/alif/mpu.h
index 87a7518a126be..c259c8585adfd 100644
--- a/ports/alif/mpu.h
+++ b/ports/alif/mpu.h
@@ -24,8 +24,15 @@
  * THE SOFTWARE.
  */
 
-#define MP_MPU_ATTR_INDEX_NORMAL_WT_RA_TRANSIENT    (0)
-#define MP_MPU_ATTR_INDEX_DEVICE_nGnRE              (1)
-#define MP_MPU_ATTR_INDEX_NORMAL_WB_RA_WA           (2)
-#define MP_MPU_ATTR_INDEX_NORMAL_WT_RA              (3)
-#define MP_MPU_ATTR_INDEX_NORMAL_NON_CACHEABLE      (4)
+#define MP_MPU_ATTR_NORMAL_WT_RA_TRANSIENT  (0)
+#define MP_MPU_ATTR_DEVICE_nGnRE            (1)
+#define MP_MPU_ATTR_NORMAL_WB_RA_WA         (2)
+#define MP_MPU_ATTR_NORMAL_WT_RA            (3)
+#define MP_MPU_ATTR_NORMAL_NON_CACHEABLE    (4)
+
+#define MP_MPU_REGION_SRAM0                 (0)
+#define MP_MPU_REGION_SRAM1                 (1)
+#define MP_MPU_REGION_HOST_PERIPHERALS      (2)
+#define MP_MPU_REGION_MRAM                  (3)
+#define MP_MPU_REGION_OSPI_REGISTERS        (4)
+#define MP_MPU_REGION_OSPI0_XIP             (5)

From 5152a1f04da3699bc35419bc40bf204760eac66c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 21 Nov 2024 07:56:02 +0100
Subject: [PATCH 2072/3129] alif/mpmetalport: Add Open-AMP MPU region.

Define an MPU region for Open-AMP and remove hard-coded attribute.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/mpmetalport.c | 18 ++++++------------
 ports/alif/mpmetalport.h |  3 ++-
 ports/alif/mpu.h         |  1 +
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ports/alif/mpmetalport.c b/ports/alif/mpmetalport.c
index f80d039c26d23..a7d4025468a16 100644
--- a/ports/alif/mpmetalport.c
+++ b/ports/alif/mpmetalport.c
@@ -48,28 +48,22 @@ int metal_sys_init(const struct metal_init_params *params) {
     hwsem_reset(METAL_HSEM_REMOTE);
     #endif
 
-    // Enable the hardware semaphore IRQ.
-    NVIC_ClearPendingIRQ(METAL_HSEM_IRQn);
-    NVIC_SetPriority(METAL_HSEM_IRQn, IRQ_PRI_HWSEM);
-    NVIC_EnableIRQ(METAL_HSEM_IRQn);
-
     // If cache management is not enabled, configure the MPU to disable
     // caching for the entire Open-AMP shared memory region.
     #ifndef VIRTIO_USE_DCACHE
     ARM_MPU_Disable();
-    // NOTE: The startup code uses the first 4 attributes.
-    #define MEMATTR_IDX_NORMAL_NON_CACHEABLE      4
-    ARM_MPU_SetMemAttr(MEMATTR_IDX_NORMAL_NON_CACHEABLE, ARM_MPU_ATTR(
-        ARM_MPU_ATTR_NON_CACHEABLE,
-        ARM_MPU_ATTR_NON_CACHEABLE));
     MPU->RNR = METAL_MPU_REGION_ID;
-    MPU->RBAR = ARM_MPU_RBAR(METAL_MPU_REGION_BASE, ARM_MPU_SH_NON, 0, 1, 0); // RO-0, NP-1, XN-0
-    MPU->RLAR = ARM_MPU_RLAR(METAL_MPU_REGION_BASE + METAL_MPU_REGION_SIZE - 1, MEMATTR_IDX_NORMAL_NON_CACHEABLE);
+    MPU->RBAR = ARM_MPU_RBAR(METAL_MPU_REGION_BASE, ARM_MPU_SH_NON, 0, 1, 1); // RO-0, NP-1, XN-1
+    MPU->RLAR = ARM_MPU_RLAR(METAL_MPU_REGION_BASE + METAL_MPU_REGION_SIZE - 1, MP_MPU_ATTR_NORMAL_NON_CACHEABLE);
     ARM_MPU_Enable(MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_HFNMIENA_Msk);
     #endif
 
     metal_bus_register(&metal_generic_bus);
 
+    // Enable the hardware semaphore IRQ.
+    NVIC_ClearPendingIRQ(METAL_HSEM_IRQn);
+    NVIC_SetPriority(METAL_HSEM_IRQn, IRQ_PRI_HWSEM);
+    NVIC_EnableIRQ(METAL_HSEM_IRQn);
     return 0;
 }
 
diff --git a/ports/alif/mpmetalport.h b/ports/alif/mpmetalport.h
index 5cd697c0e9c7b..7a428dbc6c62a 100644
--- a/ports/alif/mpmetalport.h
+++ b/ports/alif/mpmetalport.h
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include "py/mphal.h"
 #include "py/runtime.h"
+#include "mpu.h"
 
 #define METAL_HAVE_STDATOMIC_H      0
 #define METAL_HAVE_FUTEX_H          0
@@ -66,7 +67,7 @@
 #define METAL_SHM_ADDR              ((metal_phys_addr_t)(_openamp_shm_region_start + METAL_RSC_SIZE))
 #define METAL_SHM_SIZE              ((size_t)(_openamp_shm_region_end - _openamp_shm_region_start - METAL_RSC_SIZE))
 
-#define METAL_MPU_REGION_ID         (9) // NOTE: The startup code uses the first 9 regions.
+#define METAL_MPU_REGION_ID         (MP_MPU_REGION_OPENAMP)
 #define METAL_MPU_REGION_BASE       ((uint32_t)_openamp_shm_region_start)
 #define METAL_MPU_REGION_SIZE       (0x00010000U)
 
diff --git a/ports/alif/mpu.h b/ports/alif/mpu.h
index c259c8585adfd..88fbe011206ed 100644
--- a/ports/alif/mpu.h
+++ b/ports/alif/mpu.h
@@ -36,3 +36,4 @@
 #define MP_MPU_REGION_MRAM                  (3)
 #define MP_MPU_REGION_OSPI_REGISTERS        (4)
 #define MP_MPU_REGION_OSPI0_XIP             (5)
+#define MP_MPU_REGION_OPENAMP               (6)

From 1585080ff0ee3075e49fce01effddfc51644b5ed Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 14 Dec 2024 15:47:59 +0100
Subject: [PATCH 2073/3129] alif/ospi_flash: Fix XIP for 8-bit instructions
 (ISSI).

Disable XIP instruction DDR for 8-bit instructions.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_ext.c   | 15 ++++++++-------
 ports/alif/ospi_ext.h   |  4 ++--
 ports/alif/ospi_flash.c |  5 +++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ports/alif/ospi_ext.c b/ports/alif/ospi_ext.c
index 48446d0622d48..3226c244697b8 100644
--- a/ports/alif/ospi_ext.c
+++ b/ports/alif/ospi_ext.c
@@ -28,8 +28,6 @@
 #include "ospi_ext.h"
 #include "ospi_xip_user.h"
 
-#define INST_L16bit (3)
-
 static void ospi_xip_disable(ospi_flash_cfg_t *ospi_cfg) {
     ospi_cfg->aes_regs->aes_control &= ~AES_CONTROL_XIP_EN;
 }
@@ -208,7 +206,7 @@ void ospi_setup_write_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_l
     spi_enable(ospi_cfg);
 }
 
-void ospi_xip_enter_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles) {
+void ospi_xip_enter_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles) {
     spi_disable(ospi_cfg);
 
     uint32_t val = CTRLR0_IS_MST
@@ -224,12 +222,11 @@ void ospi_xip_enter_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len, uin
     val = (OCTAL << XIP_CTRL_FRF_OFFSET)
         | (0x2 << XIP_CTRL_TRANS_TYPE_OFFSET)
         | (ADDR_L32bit << XIP_CTRL_ADDR_L_OFFSET)
-        | (INST_L16bit << XIP_CTRL_INST_L_OFFSET)
+        | (inst_len << XIP_CTRL_INST_L_OFFSET)
         | (0x0 << XIP_CTRL_MD_BITS_EN_OFFSET)
         | (read_dummy_cycles << XIP_CTRL_WAIT_CYCLES_OFFSET)
         | (0x1 << XIP_CTRL_DFC_HC_OFFSET)
         | (ospi_cfg->ddr_en << XIP_CTRL_DDR_EN_OFFSET)
-        | (ospi_cfg->ddr_en << XIP_CTRL_INST_DDR_EN_OFFSET)
         | (0x1 << XIP_CTRL_RXDS_EN_OFFSET)
         | (0x1 << XIP_CTRL_INST_EN_OFFSET)
         | (0x0 << XIP_CTRL_CONT_XFER_EN_OFFSET)
@@ -239,6 +236,10 @@ void ospi_xip_enter_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len, uin
         | (0x0 << XIP_PREFETCH_EN_OFFSET)
         | (0x0 << XIP_CTRL_RXDS_VL_EN_OFFSET);
 
+    if (inst_len == OSPI_INST_L_16bit) {
+        val |= 1 << XIP_CTRL_INST_DDR_EN_OFFSET;
+    }
+
     ospi_writel(ospi_cfg, xip_ctrl, val);
 
     ospi_writel(ospi_cfg, rx_sample_dly, 4);
@@ -254,7 +255,7 @@ void ospi_xip_enter_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len, uin
     ospi_xip_enable(ospi_cfg);
 }
 
-void ospi_xip_exit_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint16_t incr_command, uint16_t wrap_command) {
+void ospi_xip_exit_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint16_t incr_command, uint16_t wrap_command) {
     spi_disable(ospi_cfg);
 
     uint32_t val = CTRLR0_IS_MST
@@ -272,7 +273,7 @@ void ospi_xip_exit_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint16_t incr_command,
         | (2 << CTRLR0_XIP_MBL_OFFSET)
         | (1 << CTRLR0_XIP_DFS_HC_OFFSET)
         | (1 << CTRLR0_XIP_INST_EN_OFFSET)
-        | (CTRLR0_INST_L_16bit << CTRLR0_INST_L_OFFSET)
+        | (inst_len << CTRLR0_INST_L_OFFSET)
         | (ospi_cfg->addrlen) << (CTRLR0_ADDR_L_OFFSET)
         | (ospi_cfg->wait_cycles << CTRLR0_WAIT_CYCLES_OFFSET);
 
diff --git a/ports/alif/ospi_ext.h b/ports/alif/ospi_ext.h
index e467772d15670..e5a2b50beb693 100644
--- a/ports/alif/ospi_ext.h
+++ b/ports/alif/ospi_ext.h
@@ -51,7 +51,7 @@ int ospi_recv_blocking_32bit_data(ospi_flash_cfg_t *ospi_cfg, uint32_t command,
 
 void ospi_setup_write_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_len, uint32_t addr_len, uint32_t data_len);
 
-void ospi_xip_enter_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles);
-void ospi_xip_exit_16bit_cmd(ospi_flash_cfg_t *ospi_cfg, uint16_t incr_command, uint16_t wrap_command);
+void ospi_xip_enter_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles);
+void ospi_xip_exit_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint16_t incr_command, uint16_t wrap_command);
 
 #endif // MICROPY_INCLUDED_ALIF_OSPI_EXT_H
diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index be575d9ed772d..c3ae50a9ee4ef 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -318,7 +318,8 @@ static int ospi_flash_xip_enter(ospi_flash_t *self) {
     if (!self->xip_active) {
         uint32_t irq_state = disable_irq();
         self->xip_active = true;
-        ospi_xip_enter_16bit_cmd(&self->cfg, self->set->xip_data_len, self->set->read_command, self->set->read_command, self->set->read_dummy_cycles);
+        ospi_xip_enter_ext(&self->cfg, self->set->inst_len, self->set->xip_data_len,
+            self->set->read_command, self->set->read_command, self->set->read_dummy_cycles);
         enable_irq(irq_state);
     }
     return 0;
@@ -327,7 +328,7 @@ static int ospi_flash_xip_enter(ospi_flash_t *self) {
 static int ospi_flash_xip_exit(ospi_flash_t *self) {
     if (self->xip_active) {
         uint32_t irq_state = disable_irq();
-        ospi_xip_exit_16bit_cmd(&self->cfg, self->set->read_command, self->set->read_command);
+        ospi_xip_exit_ext(&self->cfg, self->set->inst_len, self->set->read_command, self->set->read_command);
         self->xip_active = false;
         enable_irq(irq_state);
     }

From aec030004f019155334f56f61cf230fcf63ad759 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 16 Dec 2024 15:52:09 +0100
Subject: [PATCH 2074/3129] alif/ospi_flash: Support flash device
 auto-detection in runtime.

This commit enables detecting the flash device in runtime, and uses the
settings of the detected device instead of board-defined flash settings.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_flash.c          | 26 +++++++++--
 ports/alif/ospi_flash.h          |  4 +-
 ports/alif/ospi_flash_settings.h | 79 ++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 ports/alif/ospi_flash_settings.h

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index c3ae50a9ee4ef..8bffd69805c9f 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -238,9 +238,9 @@ int ospi_flash_init(void) {
     ospi_flash_t *self = &global_flash;
 
     const ospi_pin_settings_t *pin = &ospi_pin_settings;
-    const ospi_flash_settings_t *set = &ospi_flash_settings;
+    const ospi_flash_settings_t *set = NULL;
+
     self->pin = pin;
-    self->set = set;
 
     uint32_t pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST | PADCTRL_READ_ENABLE;
 
@@ -283,16 +283,32 @@ int ospi_flash_init(void) {
     }
     self->cfg.ser = 1; // enable slave select
     self->cfg.addrlen = 8; // 32-bit address length
-    self->cfg.ospi_clock = set->freq_hz;
     self->cfg.ddr_en = 0;
     self->cfg.wait_cycles = 0; // used only for ospi_xip_exit
+    self->cfg.ospi_clock = 100000;  // use 100KHz for detection.
     ospi_init(&self->cfg);
 
-    // Check the device ID before attempting to switch to octal mode (if needed).
-    if (ospi_flash_read_id_spi(self) != set->jedec_id) {
+    // Read the device ID.
+    uint32_t jedec_id = ospi_flash_read_id_spi(self);
+
+    // Auto-detect the flash.
+    for (size_t i = 0; i < ospi_flash_settings_len; i++) {
+        set = &ospi_flash_settings[i];
+        if (jedec_id == set->jedec_id) {
+            self->set = set;
+            break;
+        }
+    }
+
+    if (self->set == NULL) {
+        // Flash part is not supported.
         return -1;
     }
 
+    // Switch to the higher frequency.
+    self->cfg.ospi_clock = set->freq_hz;
+    ospi_init(&self->cfg);
+
     // Switch to octal mode if needed.
     if (set->octal_switch != NULL) {
         set->octal_switch(self);
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
index 8fe69764a3777..20846d4471315 100644
--- a/ports/alif/ospi_flash.h
+++ b/ports/alif/ospi_flash.h
@@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_ALIF_OSPI_FLASH_H
 
 #include "py/mphal.h"
+#include "ospi_flash_settings.h"
 
 // Format of command, address and data phases.
 enum {
@@ -74,7 +75,8 @@ typedef struct _ospi_flash_settings_t {
 
 // Provided by the board when it enables OSPI.
 extern const ospi_pin_settings_t ospi_pin_settings;
-extern const ospi_flash_settings_t ospi_flash_settings;
+extern const ospi_flash_settings_t ospi_flash_settings[];
+extern const size_t ospi_flash_settings_len;
 
 // Functions specific to ISSI flash chips.
 int ospi_flash_issi_octal_switch(struct _ospi_flash_t *self);
diff --git a/ports/alif/ospi_flash_settings.h b/ports/alif/ospi_flash_settings.h
new file mode 100644
index 0000000000000..c409f856dfa1a
--- /dev/null
+++ b/ports/alif/ospi_flash_settings.h
@@ -0,0 +1,79 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 __OSPI_FLASH_SETTINGS_H__
+#define __OSPI_FLASH_SETTINGS_H__
+#include <stdint.h>
+#include "ospi_flash.h"
+
+// Macronix MX25
+#define OSPI_FLASH_SETTINGS_MX25 \
+    .octal_switch = ospi_flash_mx_octal_switch, \
+    .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
+    .rxds = true, \
+    .inst_len = OSPI_INST_L_16bit, \
+    .xip_data_len = OSPI_DATA_L_16bit, \
+    .read_sr = 0x05fa, \
+    .read_sr_dummy_cycles = 4, \
+    .write_en = 0x06f9, \
+    .read_id = 0x9f60, \
+    .read_id_dummy_cycles = 4, \
+    .read_command = 0xee11, \
+    .write_command = 0x12ed, \
+    .erase_command = 0x21de
+
+// Everspin EM.
+#define OSPI_FLASH_SETTINGS_EM \
+    .octal_switch = ospi_flash_issi_octal_switch, \
+    .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
+    .rxds = false, \
+    .inst_len = OSPI_INST_L_8bit, \
+    .xip_data_len = OSPI_DATA_L_16bit, \
+    .read_sr = 0x05, \
+    .read_sr_dummy_cycles = 8, \
+    .write_en = 0x06, \
+    .read_id = 0x9f, \
+    .read_id_dummy_cycles = 8, \
+    .read_command = 0xfd, \
+    .write_command = 0xc2, \
+    .erase_command = 0x21
+
+// ISSI IS25.
+#define OSPI_FLASH_SETTINGS_IS25 \
+    .octal_switch = ospi_flash_issi_octal_switch, \
+    .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
+    .rxds = true, \
+    .inst_len = OSPI_INST_L_8bit, \
+    .xip_data_len = OSPI_DATA_L_16bit, \
+    .read_sr = 0x05, \
+    .read_sr_dummy_cycles = 8, \
+    .write_en = 0x06, \
+    .read_id = 0x9f, \
+    .read_id_dummy_cycles = 8, \
+    .read_command = 0xfd, \
+    .write_command = 0xc2, \
+    .erase_command = 0x21
+#endif  // __OSPI_FLASH_SETTINGS_H__

From 8807f8d01bc29d7c09a71a329877a1e8ad617fa8 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 16 Dec 2024 15:52:51 +0100
Subject: [PATCH 2075/3129] alif/ospi_flash: Configure dummy cycles.

The default dummy cycles may not match the actual flash frequency supported
by a certain board.  For example, the MX chip uses 20 dummy cycles by
default which supports up to 200MHz DDR, but the maximum frequency
supported by the AE3 board is 50MHz DDR.  So the dummy cycles for this
board can be as low as 6.  It's important to set the correct dummy cycles,
as it results in doubling the XIP read speed, in the case of the AE3 board.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_flash.c          | 43 ++++++++++++++++++++++++--------
 ports/alif/ospi_flash.h          |  6 ++---
 ports/alif/ospi_flash_settings.h |  6 ++---
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 8bffd69805c9f..279227aa36d06 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -146,13 +146,19 @@ static uint32_t ospi_flash_read_id(ospi_flash_t *self) {
 /******************************************************************************/
 // Functions specific to ISSI flash chips.
 
-int ospi_flash_issi_octal_switch(ospi_flash_t *self) {
-    // Switch SPI flash to Octal DDR mode.
+int ospi_flash_issi_init(ospi_flash_t *self) {
     const uint8_t cmd_wrvol = 0x81;
+
+    // Configure dummy cycles.
+    ospi_flash_wren_spi(self);
+    uint8_t buf0[5] = {cmd_wrvol, 0, 0, 1, self->set->read_dummy_cycles};
+    ospi_spi_transfer(&self->cfg, sizeof(buf0), buf0, buf0);
+
+    // Switch SPI flash to Octal DDR mode.
     const uint8_t issi_mode_octal_ddr_dqs = 0xe7;
     ospi_flash_wren_spi(self);
-    uint8_t buf[5] = {cmd_wrvol, 0, 0, 0, issi_mode_octal_ddr_dqs};
-    ospi_spi_transfer(&self->cfg, sizeof(buf), buf, buf);
+    uint8_t buf1[5] = {cmd_wrvol, 0, 0, 0, issi_mode_octal_ddr_dqs};
+    ospi_spi_transfer(&self->cfg, sizeof(buf1), buf1, buf1);
     self->cfg.ddr_en = 1;
     return 0;
 }
@@ -160,8 +166,7 @@ int ospi_flash_issi_octal_switch(ospi_flash_t *self) {
 /******************************************************************************/
 // Functions specific to MX flash chips.
 
-int ospi_flash_mx_octal_switch(ospi_flash_t *self) {
-    // Switch SPI flash to Octal SDR or DDR mode (SOPI or DOPI) by writing to CR2.
+int ospi_flash_mx_init(ospi_flash_t *self) {
     const uint8_t cmd_wrcr2 = 0x72;
     const uint8_t mx_mode_enable_sopi = 0x01;
     const uint8_t mx_mode_enable_dopi = 0x02;
@@ -171,9 +176,26 @@ int ospi_flash_mx_octal_switch(ospi_flash_t *self) {
     } else {
         mx_mode = mx_mode_enable_sopi;
     }
+
+    // Configure dummy cycles.
+    uint8_t ddc_value = 0;
+    const uint8_t ospi_flash_mx_ddc[][2] = {
+        {20, 0}, {18, 1}, {16, 2}, {14, 3}, {12, 4}, {10, 5}, {8, 6}, {6, 7}
+    };
+    for (size_t i = 0; i < MP_ARRAY_SIZE(ospi_flash_mx_ddc); i++) {
+        if (self->set->read_dummy_cycles == ospi_flash_mx_ddc[i][0]) {
+            ddc_value = ospi_flash_mx_ddc[i][1];
+            break;
+        }
+    }
     ospi_flash_wren_spi(self);
-    uint8_t buf[6] = {cmd_wrcr2, 0, 0, 0, 0, mx_mode};
-    ospi_spi_transfer(&self->cfg, sizeof(buf), buf, buf);
+    uint8_t buf0[6] = {cmd_wrcr2, 0, 0, 3, 0, ddc_value};
+    ospi_spi_transfer(&self->cfg, sizeof(buf0), buf0, buf0);
+
+    // Switch SPI flash to Octal SDR or DDR mode.
+    ospi_flash_wren_spi(self);
+    uint8_t buf1[6] = {cmd_wrcr2, 0, 0, 0, 0, mx_mode};
+    ospi_spi_transfer(&self->cfg, sizeof(buf1), buf1, buf1);
     if (self->set->octal_mode == OSPI_FLASH_OCTAL_MODE_DDD) {
         self->cfg.ddr_en = 1;
     } else {
@@ -310,8 +332,8 @@ int ospi_flash_init(void) {
     ospi_init(&self->cfg);
 
     // Switch to octal mode if needed.
-    if (set->octal_switch != NULL) {
-        set->octal_switch(self);
+    if (set->flash_init != NULL) {
+        set->flash_init(self);
 
         // Check the device ID after switching mode.
         if (ospi_flash_read_id(self) != set->jedec_id) {
@@ -321,7 +343,6 @@ int ospi_flash_init(void) {
 
     // Enter XIP mode.  It will be disabled during flash read/erase/write.
     ospi_flash_xip_enter(self);
-
     return 0;
 }
 
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
index 20846d4471315..39d270d7d5465 100644
--- a/ports/alif/ospi_flash.h
+++ b/ports/alif/ospi_flash.h
@@ -57,7 +57,7 @@ typedef struct _ospi_pin_settings_t {
 typedef struct _ospi_flash_settings_t {
     uint32_t jedec_id;
     uint32_t freq_hz;
-    int (*octal_switch)(struct _ospi_flash_t *);
+    int (*flash_init)(struct _ospi_flash_t *);
     uint8_t octal_mode;
     bool rxds;
     uint8_t inst_len;
@@ -79,10 +79,10 @@ extern const ospi_flash_settings_t ospi_flash_settings[];
 extern const size_t ospi_flash_settings_len;
 
 // Functions specific to ISSI flash chips.
-int ospi_flash_issi_octal_switch(struct _ospi_flash_t *self);
+int ospi_flash_issi_init(struct _ospi_flash_t *self);
 
 // Functions specific to MX flash chips.
-int ospi_flash_mx_octal_switch(struct _ospi_flash_t *self);
+int ospi_flash_mx_init(struct _ospi_flash_t *self);
 uint8_t ospi_flash_mx_read_cr(struct _ospi_flash_t *self);
 uint8_t ospi_flash_mx_read_cr2(struct _ospi_flash_t *self, uint32_t addr);
 int ospi_flash_mx_write_cr(struct _ospi_flash_t *self, uint8_t value);
diff --git a/ports/alif/ospi_flash_settings.h b/ports/alif/ospi_flash_settings.h
index c409f856dfa1a..c8605275cdcc0 100644
--- a/ports/alif/ospi_flash_settings.h
+++ b/ports/alif/ospi_flash_settings.h
@@ -31,7 +31,7 @@
 
 // Macronix MX25
 #define OSPI_FLASH_SETTINGS_MX25 \
-    .octal_switch = ospi_flash_mx_octal_switch, \
+    .flash_init = ospi_flash_mx_init, \
     .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
     .rxds = true, \
     .inst_len = OSPI_INST_L_16bit, \
@@ -47,7 +47,7 @@
 
 // Everspin EM.
 #define OSPI_FLASH_SETTINGS_EM \
-    .octal_switch = ospi_flash_issi_octal_switch, \
+    .flash_init = ospi_flash_issi_init, \
     .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
     .rxds = false, \
     .inst_len = OSPI_INST_L_8bit, \
@@ -63,7 +63,7 @@
 
 // ISSI IS25.
 #define OSPI_FLASH_SETTINGS_IS25 \
-    .octal_switch = ospi_flash_issi_octal_switch, \
+    .flash_init = ospi_flash_issi_init, \
     .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
     .rxds = true, \
     .inst_len = OSPI_INST_L_8bit, \

From 872f3d70d37d189525783137e53a50878314d37d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 14 Dec 2024 18:19:42 +0100
Subject: [PATCH 2076/3129] alif/ospi_flash: Add negative clock pin.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_flash.c | 28 ++++++++++++++++------------
 ports/alif/ospi_flash.h |  3 ++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 279227aa36d06..8eaf923550141 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -264,26 +264,30 @@ int ospi_flash_init(void) {
 
     self->pin = pin;
 
-    uint32_t pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST | PADCTRL_READ_ENABLE;
+    uint32_t ck_pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST;
+    uint32_t io_pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST | PADCTRL_READ_ENABLE;
 
     pinconf_set(pin->pin_cs->port, pin->pin_cs->pin, OSPI_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA);
-    pinconf_set(pin->pin_clk->port, pin->pin_clk->pin, OSPI_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST);
+    pinconf_set(pin->pin_clk_p->port, pin->pin_clk_p->pin, OSPI_PIN_FUNCTION, ck_pad_ctrl);
+    if (pin->pin_clk_n != NULL) {
+        pinconf_set(pin->pin_clk_n->port, pin->pin_clk_n->pin, OSPI_PIN_FUNCTION, ck_pad_ctrl);
+    }
     if (pin->pin_rwds != NULL) {
-        pinconf_set(pin->pin_rwds->port, pin->pin_rwds->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+        pinconf_set(pin->pin_rwds->port, pin->pin_rwds->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
         if (pin->pin_rwds->port == PORT_10 && pin->pin_rwds->pin == PIN_7) {
             // Alif: P5_6 is needed to support proper alt function selection of P10_7.
-            pinconf_set(PORT_5, PIN_6, OSPI_PIN_FUNCTION, pad_ctrl);
+            pinconf_set(PORT_5, PIN_6, OSPI_PIN_FUNCTION, io_pad_ctrl);
         }
     }
-    pinconf_set(pin->pin_d0->port, pin->pin_d0->pin, OSPI_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin->pin_d1->port, pin->pin_d1->pin, OSPI_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin->pin_d2->port, pin->pin_d2->pin, OSPI_PIN_FUNCTION, pad_ctrl);
-    pinconf_set(pin->pin_d3->port, pin->pin_d3->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+    pinconf_set(pin->pin_d0->port, pin->pin_d0->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+    pinconf_set(pin->pin_d1->port, pin->pin_d1->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+    pinconf_set(pin->pin_d2->port, pin->pin_d2->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+    pinconf_set(pin->pin_d3->port, pin->pin_d3->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
     if (pin->pin_d4 != NULL) {
-        pinconf_set(pin->pin_d4->port, pin->pin_d4->pin, OSPI_PIN_FUNCTION, pad_ctrl);
-        pinconf_set(pin->pin_d5->port, pin->pin_d5->pin, OSPI_PIN_FUNCTION, pad_ctrl);
-        pinconf_set(pin->pin_d6->port, pin->pin_d6->pin, OSPI_PIN_FUNCTION, pad_ctrl);
-        pinconf_set(pin->pin_d7->port, pin->pin_d7->pin, OSPI_PIN_FUNCTION, pad_ctrl);
+        pinconf_set(pin->pin_d4->port, pin->pin_d4->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+        pinconf_set(pin->pin_d5->port, pin->pin_d5->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+        pinconf_set(pin->pin_d6->port, pin->pin_d6->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+        pinconf_set(pin->pin_d7->port, pin->pin_d7->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
     }
 
     // Reset the SPI flash.
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
index 39d270d7d5465..affa4e6102215 100644
--- a/ports/alif/ospi_flash.h
+++ b/ports/alif/ospi_flash.h
@@ -42,7 +42,8 @@ typedef struct _ospi_pin_settings_t {
     uint32_t peripheral_number;
     const mp_hal_pin_obj_t pin_reset;
     const mp_hal_pin_obj_t pin_cs;
-    const mp_hal_pin_obj_t pin_clk;
+    const mp_hal_pin_obj_t pin_clk_p;
+    const mp_hal_pin_obj_t pin_clk_n;
     const mp_hal_pin_obj_t pin_rwds;
     const mp_hal_pin_obj_t pin_d0;
     const mp_hal_pin_obj_t pin_d1;

From 0709936653895e0de499e0a7019afb80eda7425c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Dec 2024 09:47:04 +0100
Subject: [PATCH 2077/3129] alif/ospi_flash: Enable pull-up IO2/WP.

Leaving this pin low in combination with the default EM settings enables
flash protection for the EM flash.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 8eaf923550141..d5aa99f2b493f 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -281,7 +281,7 @@ int ospi_flash_init(void) {
     }
     pinconf_set(pin->pin_d0->port, pin->pin_d0->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
     pinconf_set(pin->pin_d1->port, pin->pin_d1->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
-    pinconf_set(pin->pin_d2->port, pin->pin_d2->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+    pinconf_set(pin->pin_d2->port, pin->pin_d2->pin, OSPI_PIN_FUNCTION, io_pad_ctrl | PADCTRL_DRIVER_DISABLED_PULL_UP);
     pinconf_set(pin->pin_d3->port, pin->pin_d3->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
     if (pin->pin_d4 != NULL) {
         pinconf_set(pin->pin_d4->port, pin->pin_d4->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);

From df06bf91a5a78c89eaa7b6b7d157df83c576553f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 20 Dec 2024 08:57:08 +0100
Subject: [PATCH 2078/3129] alif/ospi_ext: Optimize XIP speed.

This change increases XIP read speed to ~30Mbytes/s at 50MHz DDR:
- Enable continuous mode.
- Remove hard-coded settings.
- Set XIP continuous mode timeout.

The prefetch remains disabled.  Although enabling the prefetch gives the
best performance for the CPU in XIP mode, it must be disabled when the NPU
accesses the OSPI flash.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_ext.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/alif/ospi_ext.c b/ports/alif/ospi_ext.c
index 3226c244697b8..e3389d8bd54da 100644
--- a/ports/alif/ospi_ext.c
+++ b/ports/alif/ospi_ext.c
@@ -229,7 +229,7 @@ void ospi_xip_enter_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint32_t
         | (ospi_cfg->ddr_en << XIP_CTRL_DDR_EN_OFFSET)
         | (0x1 << XIP_CTRL_RXDS_EN_OFFSET)
         | (0x1 << XIP_CTRL_INST_EN_OFFSET)
-        | (0x0 << XIP_CTRL_CONT_XFER_EN_OFFSET)
+        | (0x1 << XIP_CTRL_CONT_XFER_EN_OFFSET)
         | (0x0 << XIP_CTRL_HYPERBUS_EN_OFFSET)
         | (0x1 << XIP_CTRL_RXDS_SIG_EN)
         | (0x0 << XIP_CTRL_XIP_MBL_OFFSET)
@@ -242,14 +242,15 @@ void ospi_xip_enter_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint32_t
 
     ospi_writel(ospi_cfg, xip_ctrl, val);
 
-    ospi_writel(ospi_cfg, rx_sample_dly, 4);
-    ospi_writel(ospi_cfg, txd_drive_edge, 1);
+    ospi_writel(ospi_cfg, rx_sample_dly, OSPI_XIP_RX_SAMPLE_DELAY);
+    ospi_writel(ospi_cfg, txd_drive_edge, OSPI_XIP_DDR_DRIVE_EDGE);
     ospi_cfg->aes_regs->aes_rxds_delay = OSPI_XIP_RXDS_DELAY;
 
     ospi_writel(ospi_cfg, xip_mode_bits, 0x0);
     ospi_writel(ospi_cfg, xip_incr_inst, incr_command);
     ospi_writel(ospi_cfg, xip_wrap_inst, wrap_command);
     ospi_writel(ospi_cfg, xip_ser, ospi_cfg->ser);
+    ospi_writel(ospi_cfg, xip_cnt_time_out, 100);
 
     spi_enable(ospi_cfg);
     ospi_xip_enable(ospi_cfg);

From 602bc86b6d8ebd200029568c060b878146050da1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 8 Jan 2025 15:12:18 +0100
Subject: [PATCH 2079/3129] alif/ospi_flash: Use OSPI in XIP mode only.

The OSPI controller supports concurrent direct/XIP accesses, there's no
need to disable XIP on direct access.  In addition to improving the
performance, this change lays the groundwork for supporting access by
the HP and HE cores simultaneously.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_flash.c | 39 ++++++++-------------------------------
 ports/alif/ospi_flash.h |  4 ++++
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index d5aa99f2b493f..7400a678b226a 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -55,9 +55,6 @@ typedef struct _ospi_flash_t {
 
 static ospi_flash_t global_flash;
 
-static int ospi_flash_xip_enter(ospi_flash_t *self);
-static int ospi_flash_xip_exit(ospi_flash_t *self);
-
 /******************************************************************************/
 // Generic SPI-flash helper functions.
 
@@ -188,6 +185,7 @@ int ospi_flash_mx_init(ospi_flash_t *self) {
             break;
         }
     }
+
     ospi_flash_wren_spi(self);
     uint8_t buf0[6] = {cmd_wrcr2, 0, 0, 3, 0, ddc_value};
     ospi_spi_transfer(&self->cfg, sizeof(buf0), buf0, buf0);
@@ -355,7 +353,7 @@ uintptr_t ospi_flash_get_xip_base(void) {
     return (uintptr_t)self->cfg.xip_base;
 }
 
-static int ospi_flash_xip_enter(ospi_flash_t *self) {
+int ospi_flash_xip_enter(ospi_flash_t *self) {
     if (!self->xip_active) {
         uint32_t irq_state = disable_irq();
         self->xip_active = true;
@@ -366,7 +364,7 @@ static int ospi_flash_xip_enter(ospi_flash_t *self) {
     return 0;
 }
 
-static int ospi_flash_xip_exit(ospi_flash_t *self) {
+int ospi_flash_xip_exit(ospi_flash_t *self) {
     if (self->xip_active) {
         uint32_t irq_state = disable_irq();
         ospi_xip_exit_ext(&self->cfg, self->set->inst_len, self->set->read_command, self->set->read_command);
@@ -382,43 +380,23 @@ static int ospi_flash_xip_exit(ospi_flash_t *self) {
 int ospi_flash_erase_sector(uint32_t addr) {
     ospi_flash_t *self = &global_flash;
 
-    ospi_flash_xip_exit(self);
-
     ospi_flash_write_cmd(self, self->set->write_en);
     int ret = ospi_flash_wait_wel1(self);
     if (ret < 0) {
-        ospi_flash_xip_enter(self);
         return ret;
     }
 
     ospi_flash_write_cmd_addr(self, self->set->erase_command, OSPI_ADDR_L_32bit, addr);
     ret = ospi_flash_wait_wip0(self);
 
-    ospi_flash_xip_enter(self);
+    SCB_InvalidateDCache_by_Addr(global_flash.cfg.xip_base + addr, MICROPY_HW_FLASH_BLOCK_SIZE_BYTES);
     return ret;
 }
 
 int ospi_flash_read(uint32_t addr, uint32_t len, uint8_t *dest) {
-    // OSPI FIFO is limited to 256 bytes.  Need DMA to get a longer read.
-    // Note that direct reading is much faster than using XIP memory-mapped read.
     ospi_flash_t *self = &global_flash;
-
-    ospi_flash_xip_exit(self);
-
-    while (len) {
-        uint32_t l = len / 4;
-        if (l > 256) {
-            l = 256;
-        }
-        ospi_setup_read_ext(&self->cfg, self->set->rxds, self->set->inst_len, OSPI_ADDR_L_32bit, OSPI_DATA_L_32bit, l, self->set->read_dummy_cycles);
-        ospi_push(&self->cfg, self->set->read_command);
-        ospi_recv_blocking_32bit_data(&self->cfg, addr, (uint32_t *)dest);
-        addr += l * 4;
-        len -= l * 4;
-        dest += l * 4;
-    }
-
-    ospi_flash_xip_enter(self);
+    // Perform an XIP read (memcpy)
+    memcpy(dest, (void *)self->cfg.xip_base + addr, len);
     return 0;
 }
 
@@ -448,10 +426,9 @@ static int ospi_flash_write_page(uint32_t addr, uint32_t len, const uint8_t *src
 }
 
 int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
-    ospi_flash_xip_exit(&global_flash);
-
     int ret = 0;
     uint32_t offset = addr & (PAGE_SIZE - 1);
+
     while (len) {
         size_t rest = PAGE_SIZE - offset;
         if (rest > len) {
@@ -467,7 +444,7 @@ int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
         offset = 0;
     }
 
-    ospi_flash_xip_enter(&global_flash);
+    SCB_InvalidateDCache_by_Addr(global_flash.cfg.xip_base + addr, len);
     return ret;
 }
 
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
index affa4e6102215..0095ee2d4280b 100644
--- a/ports/alif/ospi_flash.h
+++ b/ports/alif/ospi_flash.h
@@ -89,6 +89,10 @@ uint8_t ospi_flash_mx_read_cr2(struct _ospi_flash_t *self, uint32_t addr);
 int ospi_flash_mx_write_cr(struct _ospi_flash_t *self, uint8_t value);
 int ospi_flash_mx_write_cr2(struct _ospi_flash_t *self, uint32_t addr, uint8_t value);
 
+// XIP control
+int ospi_flash_xip_enter(struct _ospi_flash_t *self);
+int ospi_flash_xip_exit(struct _ospi_flash_t *self);
+
 // SPI flash interface.
 int ospi_flash_init(void);
 uintptr_t ospi_flash_get_xip_base(void);

From 92f056d58f74cfd3986aaef1eea08f4f948fe03a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Feb 2025 10:14:34 +0100
Subject: [PATCH 2080/3129] alif/ospi_flash: Add 16-bit words swap flash
 setting.

The byte order (endianness) seems to be swapped when read in 8D-8D-8D in
XIP mode, for most flashes, with the exception of MX which seems to swap
half-words.

This commit adds a flash setting to allow parts to enable half-word swap
when data is written, to fix this issue.  By default, only endianness is
fixed.

Tested with both MX and ISSI parts on AE3, flash test and simple file
write/read.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_flash.c          | 12 ++++++++++--
 ports/alif/ospi_flash.h          |  1 +
 ports/alif/ospi_flash_settings.h |  5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 7400a678b226a..f2f95a04cf241 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -414,8 +414,16 @@ static int ospi_flash_write_page(uint32_t addr, uint32_t len, const uint8_t *src
     ospi_push(&self->cfg, addr);
 
     const uint32_t *src32 = (const uint32_t *)src;
-    for (; len; len -= 4) {
-        ospi_push(&self->cfg, __ROR(*src32++, 16));
+    if (self->set->bswap16) {
+        // MX flashes swap 16-bit words when read in 8D-8D-8D.
+        for (; len; len -= 4) {
+            ospi_push(&self->cfg, __ROR(*src32++, 16));
+        }
+    } else {
+        // For the rest of the flashes, we just correct the endianness.
+        for (; len; len -= 4) {
+            ospi_push(&self->cfg, __REV(*src32++));
+        }
     }
 
     ospi_writel((&self->cfg), ser, self->cfg.ser);
diff --git a/ports/alif/ospi_flash.h b/ports/alif/ospi_flash.h
index 0095ee2d4280b..f909f4a43c889 100644
--- a/ports/alif/ospi_flash.h
+++ b/ports/alif/ospi_flash.h
@@ -61,6 +61,7 @@ typedef struct _ospi_flash_settings_t {
     int (*flash_init)(struct _ospi_flash_t *);
     uint8_t octal_mode;
     bool rxds;
+    bool bswap16;
     uint8_t inst_len;
     uint8_t xip_data_len;
     uint16_t read_sr;
diff --git a/ports/alif/ospi_flash_settings.h b/ports/alif/ospi_flash_settings.h
index c8605275cdcc0..72403c26b67b5 100644
--- a/ports/alif/ospi_flash_settings.h
+++ b/ports/alif/ospi_flash_settings.h
@@ -34,6 +34,7 @@
     .flash_init = ospi_flash_mx_init, \
     .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
     .rxds = true, \
+    .bswap16 = true, \
     .inst_len = OSPI_INST_L_16bit, \
     .xip_data_len = OSPI_DATA_L_16bit, \
     .read_sr = 0x05fa, \
@@ -50,6 +51,7 @@
     .flash_init = ospi_flash_issi_init, \
     .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
     .rxds = false, \
+    .bswap16 = false, \
     .inst_len = OSPI_INST_L_8bit, \
     .xip_data_len = OSPI_DATA_L_16bit, \
     .read_sr = 0x05, \
@@ -65,7 +67,8 @@
 #define OSPI_FLASH_SETTINGS_IS25 \
     .flash_init = ospi_flash_issi_init, \
     .octal_mode = OSPI_FLASH_OCTAL_MODE_DDD, \
-    .rxds = true, \
+    .rxds = false, \
+    .bswap16 = false, \
     .inst_len = OSPI_INST_L_8bit, \
     .xip_data_len = OSPI_DATA_L_16bit, \
     .read_sr = 0x05, \

From ff6ed730c534a809ea32648b0b30832b2993aaae Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 5 Feb 2025 19:57:40 +0100
Subject: [PATCH 2081/3129] alif/se_services: Use EUI extension for unique id.

The right service call to get UID is SERVICES_system_get_eui_extension
which returns an 8 bytes UID.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/modmachine.c  | 2 +-
 ports/alif/se_services.c | 7 ++-----
 ports/alif/se_services.h | 2 +-
 ports/alif/usbd.c        | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ports/alif/modmachine.c b/ports/alif/modmachine.c
index 29a70305dd516..b77a207fe2cf7 100644
--- a/ports/alif/modmachine.c
+++ b/ports/alif/modmachine.c
@@ -38,7 +38,7 @@ static void mp_machine_idle(void) {
 }
 
 static mp_obj_t mp_machine_unique_id(void) {
-    uint8_t id[5];
+    uint8_t id[8] = {0};
     se_services_get_unique_id(id);
     return mp_obj_new_bytes(id, sizeof(id));
 }
diff --git a/ports/alif/se_services.c b/ports/alif/se_services.c
index cbf66bfac6ccd..e79a5b97c8944 100644
--- a/ports/alif/se_services.c
+++ b/ports/alif/se_services.c
@@ -139,12 +139,9 @@ void se_services_dump_device_data(void) {
     printf("\n");
 }
 
-void se_services_get_unique_id(uint8_t id[5]) {
+void se_services_get_unique_id(uint8_t id[8]) {
     uint32_t error_code;
-    SERVICES_version_data_t data;
-    SERVICES_system_get_device_data(se_services_handle, &data, &error_code);
-    // The MfgData has 5 bytes of valid data, at least on REV_B2.
-    memcpy(id, data.MfgData, 5);
+    SERVICES_system_get_eui_extension(se_services_handle, false, id, &error_code);
 }
 
 __attribute__((noreturn)) void se_services_reset_soc(void) {
diff --git a/ports/alif/se_services.h b/ports/alif/se_services.h
index b1079130c1635..87deb05592990 100644
--- a/ports/alif/se_services.h
+++ b/ports/alif/se_services.h
@@ -30,7 +30,7 @@
 
 void se_services_init(void);
 void se_services_dump_device_data(void);
-void se_services_get_unique_id(uint8_t id[5]);
+void se_services_get_unique_id(uint8_t id[8]);
 __attribute__((noreturn)) void se_services_reset_soc(void);
 uint64_t se_services_rand64(void);
 uint32_t se_services_enable_clock(clock_enable_t clock, bool enable);
diff --git a/ports/alif/usbd.c b/ports/alif/usbd.c
index da16905d43cd9..8d841d188c333 100644
--- a/ports/alif/usbd.c
+++ b/ports/alif/usbd.c
@@ -33,7 +33,7 @@
 #include "se_services.h"
 
 void mp_usbd_port_get_serial_number(char *serial_buf) {
-    uint8_t id[5];
+    uint8_t id[8] = {0};
     se_services_get_unique_id(id);
     MP_STATIC_ASSERT(sizeof(id) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
     mp_usbd_hex_str(serial_buf, id, sizeof(id));

From 039df0c884ef0169257b3ab31255be8cd45caacf Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 3 Feb 2025 06:54:37 +0100
Subject: [PATCH 2082/3129] alif/modmachine: Implement proper low-power modes.

Lightsleep current is around 23mA.  Deepsleep current is sub 50uA.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/alif.mk      |  1 +
 ports/alif/modmachine.c | 56 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 1581452195840..35f316cae0edd 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -182,6 +182,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	Device/common/source/system_utils.c \
 	Device/common/source/tcm_partition.c \
 	Device/common/source/tgu_M55.c \
+	Device/common/source/pm.c \
 	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
 	drivers/source/adc.c \
 	drivers/source/mhu_driver.c \
diff --git a/ports/alif/modmachine.c b/ports/alif/modmachine.c
index b77a207fe2cf7..98d7bffbad932 100644
--- a/ports/alif/modmachine.c
+++ b/ports/alif/modmachine.c
@@ -28,6 +28,9 @@
 // extmod/modmachine.c via MICROPY_PY_MACHINE_INCLUDEFILE.
 
 #include "se_services.h"
+#include "tusb.h"
+
+extern void dcd_uninit(void);
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) }, \
@@ -70,15 +73,56 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(NULL);
 }
 
-static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
-    mp_int_t delay = -1;
-    if (n_args == 1) {
-        delay = mp_obj_get_int(args[0]);
+#if MICROPY_HW_ENABLE_USBDEV
+static void mp_machine_enable_usb(bool enable) {
+    if (enable) {
+        // Initialize TinyUSB and DCD.
+        tusb_init();
+    } else {
+        // Disconnect USB device.
+        tud_disconnect();
+        // Deinitialize TinyUSB.
+        tud_deinit(TUD_OPT_RHPORT);
+        // Deinitialize DCD (disables IRQs).
+        dcd_uninit();
     }
-    mp_hal_delay_ms(delay);
+}
+#endif
+
+static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    #if MICROPY_HW_ENABLE_USBDEV
+    mp_machine_enable_usb(false);
+    #endif
+
+    #ifdef MICROPY_BOARD_ENTER_STANDBY
+    MICROPY_BOARD_ENTER_STANDBY();
+    #endif
+
+    // This enters the deepest possible CPU sleep state, without
+    // losing CPU state. CPU and subsystem power will remain on.
+    pm_core_enter_deep_sleep();
+
+    #ifdef MICROPY_BOARD_EXIT_STANDBY
+    MICROPY_BOARD_EXIT_STANDBY();
+    #endif
+
+    #if MICROPY_HW_ENABLE_USBDEV
+    mp_machine_enable_usb(true);
+    #endif
 }
 
 NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
-    mp_machine_lightsleep(n_args, args);
+    #if MICROPY_HW_ENABLE_USBDEV
+    mp_machine_enable_usb(false);
+    #endif
+
+    #ifdef MICROPY_BOARD_ENTER_STOP
+    MICROPY_BOARD_ENTER_STOP();
+    #endif
+
+    // If power is removed from the subsystem, the function does
+    // not return, and the CPU will reboot when/if the subsystem
+    // is next powered up.
+    pm_core_enter_deep_sleep_request_subsys_off();
     mp_machine_reset();
 }

From 82bae652eb43ac3ce8226d08c1ce0047ffa76191 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 9 Jan 2025 19:58:25 +0100
Subject: [PATCH 2083/3129] alif: Add support for pin alternate function
 selection.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/alif.mk                  |   2 +
 ports/alif/mcu/ensemble_pin_alt.csv | 130 ++++++++++++++++++++++++++++
 ports/alif/mcu/make-pins.py         |  28 ++++--
 ports/alif/mphalport.c              |  50 +++++++++++
 ports/alif/mphalport.h              |  41 +++++++++
 5 files changed, 242 insertions(+), 9 deletions(-)
 create mode 100644 ports/alif/mcu/ensemble_pin_alt.csv

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 35f316cae0edd..b338e67c66c9a 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -51,6 +51,7 @@ INC += -Itinyusb_port
 GEN_PIN_MKPINS = mcu/make-pins.py
 GEN_PIN_PREFIX = mcu/pins_prefix.c
 GEN_PINS_BOARD_CSV = $(BOARD_DIR)/pins.csv
+GEN_PINS_MCU_CSV = mcu/ensemble_pin_alt.csv
 GEN_PINS_SRC = $(BUILD)/pins_board.c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins_board.h
 
@@ -263,6 +264,7 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/%_board.c $(HEADER_BUILD)/%_board.h: $(BOARD_DIR)/%.csv $(GEN_PIN_MKPINS) $(GEN_PIN_PREFIX) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(GEN_PIN_MKPINS) \
+	    --af-csv $(GEN_PINS_MCU_CSV) \
 	    --board-csv $(GEN_PINS_BOARD_CSV) \
 	    --prefix $(GEN_PIN_PREFIX) \
 	    --output-source $(GEN_PINS_SRC) \
diff --git a/ports/alif/mcu/ensemble_pin_alt.csv b/ports/alif/mcu/ensemble_pin_alt.csv
new file mode 100644
index 0000000000000..10bfedc9a1d68
--- /dev/null
+++ b/ports/alif/mcu/ensemble_pin_alt.csv
@@ -0,0 +1,130 @@
+Pin,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7
+P0_0,,OSPI,UART,I3C,UT,LPCAM,CAM,ANA
+P0_1,,OSPI,UART,I3C,UT,LPCAM,CAM,ANA
+P0_2,,OSPI,UART,I2C,UT,LPCAM,CAM,ANA
+P0_3,,OSPI,UART,I2C,UT,LPCAM,CAM,ANA
+P0_4,,OSPI,UART,PDM,I2C,UT,,ANA
+P0_5,,OSPI,UART,PDM,I2C,UT,,ANA
+P0_6,,OSPI,UART,PDM,I2C,UT,,ANA
+P0_7,,OSPI,UART,PDM,I2C,UT,CDC,ANA
+P1_0,,UART,SPI,I2C,UT,LPCAM,ETH,ANA
+P1_1,,UART,SPI,I2C,UT,LPCAM,ETH,ANA
+P1_2,,UART,SPI,I3C,UT,LPCAM,ETH,ANA
+P1_3,,UART,SPI,I3C,UT,LPCAM,ETH,ANA
+P1_4,,OSPI,UART,SPI,UT,LPCAM,ETH,ANA
+P1_5,,OSPI,UART,SPI,UT,LPCAM,ETH,ANA
+P1_6,,OSPI,UART,I2S,UT,LPCAM,ETH,ANA
+P1_7,,OSPI,UART,I2S,UT,LPCAM,ETH,ANA
+P2_0,,OSPI,UART,LPPDM,UT,LPCAM,ETH,ANA
+P2_1,,OSPI,UART,LPPDM,UT,LPCAM,ETH,ANA
+P2_2,,OSPI,UART,LPPDM,UT,LPCAM,ETH,ANA
+P2_3,,OSPI,UART,LPPDM,UT,LPCAM,CDC,ANA
+P2_4,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
+P2_5,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
+P2_6,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
+P2_7,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
+P3_0,,OSPI,UART,PDM,I2S,QEC,LPCAM,CAM
+P3_1,,OSPI,UART,PDM,I2S,QEC,LPCAM,CAM
+P3_2,,OSPI,PDM,I2S,I3C,QEC,LPCAM,CAM
+P3_3,,OSPI,PDM,I2S,I3C,QEC,LPCAM,CAM
+P3_4,,OSPI,UART,LPPDM,I2S,I2C,QEC,CAM
+P3_5,,OSPI,UART,LPPDM,SPI,I2C,QEC,CAM
+P3_6,,HFXO,LPUART,LPPDM,SPI,I2C,QEC,CAM
+P3_7,,JTAG,LPUART,LPPDM,SPI,I2C,QEC,CAM
+P4_0,,JTAG,,I2S,SPI,QEC,CDC,CAM
+P4_1,,JTAG,I2S,SPI,QEC,SD,CDC,CAM
+P4_2,,JTAG,,I2S,SPI,QEC,SD,CAM
+P4_3,,JTAG,,I2S,SPI,QEC,SD,CAM
+P4_4,,JTAG,I2S,SPI,FAULT,,,
+P4_5,,JTAG,SPI,FAULT,,,,
+P4_6,,JTAG,SPI,FAULT,,,,
+P4_7,,JTAG,SPI,FAULT,,,,
+P5_0,,OSPI,UART,PDM,SPI,I2C,UT,SD
+P5_1,,OSPI,UART,PDM,SPI,I2C,UT,SD
+P5_2,,OSPI,UART,PDM,SPI,LPI2C,UT,SD
+P5_3,,OSPI,UART,SPI,LPI2C,UT,SD,CDC
+P5_4,,OSPI,UART,PDM,SPI,UT,SD,CDC
+P5_5,,OSPI,UART,PDM,UT,SD,ETH,CDC
+# P5_6 doesn't really have OSPI on AF1 but it's needed for P10_7 to be in OSPI mode
+P5_6,,OSPI,UART,I2C,UT,SD,ETH,CDC
+P5_7,,OSPI,UART,I2C,UT,SD,ETH,
+P6_0,,OSPI,UART,PDM,UT,SD,ETH,
+P6_1,,OSPI,UART,PDM,UT,SD,ETH,
+P6_2,,OSPI,UART,,PDM,UT,SD,ETH
+P6_3,,OSPI,UART,,PDM,UT,SD,ETH
+P6_4,,OSPI,UART,,SPI,UT,SD,ETH
+P6_5,,OSPI,UART,,SPI,UT,SD,ETH
+P6_6,,OSPI,UART,,SPI,UT,SD,ETH
+P6_7,,OSPI,UART,PDM,SPI,UT,SD,ETH
+P7_0,,,CMP,SPI,I2C,UT,SD,
+P7_1,,,CMP,SPI,I2C,UT,SD,
+P7_2,,,UART,CMP,SPI,I2C,UT,SD
+P7_3,,,UART,CMP,SPI,I2C,UT,
+P7_4,,,LPUART,LPPDM,LPSPI,LPI2C,UT,
+P7_5,,,LPUART,,LPPDM,LPSPI,LPI2C,UT
+P7_6,,,LPUART,,LPPDM,LPSPI,I3C,UT
+P7_7,,,LPUART,,LPPDM,LPSPI,I3C,UT
+P8_0,,OSPI,AUDIO,FAULT,LPCAM,SD,CDC,CAM
+P8_1,,I2S,FAULT,LPCAM,SD,CDC,CAM,
+P8_2,,I2S,SPI,FAULT,LPCAM,SD,CDC,CAM
+P8_3,,I2S,SPI,FAULT,LPCAM,SD,CDC,CAM
+P8_4,,I2S,SPI,QEC,LPCAM,SD,CDC,CAM
+P8_5,,,SPI,QEC,LPCAM,SD,CDC,CAM
+P8_6,,,I2S,QEC,LPCAM,SD,CDC,CAM
+P8_7,,,I2S,QEC,LPCAM,SD,CDC,CAM
+P9_0,,,I2S,QEC,SD,CDC,CAM,
+P9_1,,LPUART,I2S,QEC,SD,CDC,CAM,
+P9_2,,LPUART,I2S,SPI,QEC,SD,CDC,CAM
+P9_3,,HFXO,UART,I2S,SPI,QEC,CDC,CAM
+P9_4,,UART,I2S,SPI,I2C,QEC,CDC,CAM
+P9_5,,OSPI,I2S,SPI,I2C,QEC,CDC,CAM
+P9_6,,OSPI,AUDIO,SPI,I2C,QEC,CDC,CAM
+P9_7,,OSPI,UART,SPI,I2C,QEC,CDC,CAM
+P10_0,,OSPI,UART,SPI,UT,LPCAM,CDC,CAM
+P10_1,,OSPI,,LPI2S,UT,LPCAM,CDC,CAM
+P10_2,,OSPI,,LPI2S,UT,LPCAM,CDC,CAM
+P10_3,,OSPI,,LPI2S,UT,LPCAM,CDC,CAM
+P10_4,,OSPI,,LPI2S,I2C,UT,ETH,CDC
+P10_5,,UART,I2S,SPI,I2C,UT,ETH,CDC
+P10_6,,UART,I2S,SPI,I2C,UT,ETH,CDC
+P10_7,,UART,I2S,SPI,I2C,UT,CDC,OSPI
+P11_0,,OSPI,UART,I2S,SPI,UT,ETH,CDC
+P11_1,,OSPI,UART,SPI,UT,ETH,CDC,
+P11_2,,OSPI,UART,LPPDM,SPI,UT,ETH,CDC
+P11_3,,OSPI,UART,LPPDM,SPI,UT,ETH,CDC
+P11_4,,OSPI,UART,PDM,LPSPI,UT,ETH,CDC
+P11_5,,OSPI,UART,PDM,LPSPI,UT,ETH,CDC
+P11_6,,OSPI,UART,LPPDM,LPSPI,UT,ETH,CDC
+P11_7,,OSPI,UART,LPPDM,LPSPI,UT,ETH,CDC
+P12_0,,OSPI,AUDIO,I2S,UT,CDC,,
+P12_1,,OSPI,UART,I2S,UT,CDC,,
+P12_2,,OSPI,UART,I2S,UT,CDC,,
+P12_3,,OSPI,UART,I2S,UT,CDC,,
+P12_4,,OSPI,SPI,UT,,CDC,,
+P12_5,,,SPI,UT,,CDC,,
+P12_6,,,SPI,UT,,CDC,,
+P12_7,,OSPI,,SPI,UT,CDC,,
+P13_0,,OSPI,,SPI,QEC,SD,CDC,
+P13_1,,OSPI,SPI,QEC,SD,CDC,,
+P13_2,,OSPI,SPI,QEC,SD,CDC,,
+P13_3,,OSPI,SPI,QEC,SD,CDC,,
+P13_4,,OSPI,LPI2S,QEC,SD,CDC,,
+P13_5,,OSPI,LPI2S,QEC,SD,CDC,,
+P13_6,,OSPI,LPI2S,QEC,SD,CDC,,
+P13_7,,OSPI,LPI2S,QEC,SD,CDC,,
+P14_0,,OSPI,UART,QEC,SD,,,
+P14_1,,OSPI,UART,,QEC,SD,,
+P14_2,,OSPI,UART,,QEC,SD,,
+P14_3,,OSPI,UART,,QEC,,,
+P14_4,,CMP,SPI,FAULT,,,,
+P14_5,,CMP,SPI,FAULT,,,,
+P14_6,,CMP,SPI,FAULT,,,,
+P14_7,,CMP,SPI,FAULT,,,,
+P15_0,,LPTMR,,,,,,
+P15_1,,LPTMR,,,,,,
+P15_2,,LPTMR,,,,,,
+P15_3,,LPTMR,,,,,,
+P15_4,,,,,,,,
+P15_5,,,,,,,,
+P15_6,,,,,,,,
+P15_7,,,,,,,,
diff --git a/ports/alif/mcu/make-pins.py b/ports/alif/mcu/make-pins.py
index d4fbf5d8b8d9a..fb000082642bc 100755
--- a/ports/alif/mcu/make-pins.py
+++ b/ports/alif/mcu/make-pins.py
@@ -34,26 +34,36 @@
 
 
 class AlifPin(boardgen.Pin):
+    def __init__(self, cpu_pin_name):
+        super().__init__(cpu_pin_name)
+        self._afs = ["MP_HAL_PIN_ALT_NONE"] * 8
+
+    # Called for each AF defined in the csv file for this pin.
+    def add_af(self, af_idx, af_name, af):
+        self._afs[af_idx] = f"MP_HAL_PIN_ALT_{af}"
+
     # Emit the struct which contains the pin instance.
     def definition(self):
         port, pin = self.name()[1:].split("_")
         adc12_periph, adc12_channel = ADC12_ANA_MAP.get(self.name(), (3, 7))
         base = "LPGPIO_BASE" if port == "15" else "GPIO{}_BASE".format(port)
         return (
-            "{{ "
-            ".base = {{ .type = &machine_pin_type }}, "
-            ".gpio = (GPIO_Type *){base}, "
-            ".port = PORT_{port}, "
-            ".pin = PIN_{pin}, "
-            ".adc12_periph = {adc12_periph}, "
-            ".adc12_channel = {adc12_channel}, "
-            ".name = MP_QSTR_P{port}_{pin} "
+            "{{\n"
+            "    .name = MP_QSTR_P{port}_{pin},\n"
+            "    .base = {{ .type = &machine_pin_type }},\n"
+            "    .gpio = (GPIO_Type *){base},\n"
+            "    .port = PORT_{port},\n"
+            "    .pin = PIN_{pin},\n"
+            "    .adc12_periph = {adc12_periph},\n"
+            "    .adc12_channel = {adc12_channel},\n"
+            "    .alt = {{{alt}}},\n"
             "}}".format(
                 port=port,
                 pin=pin,
                 base=base,
                 adc12_periph=adc12_periph,
                 adc12_channel=adc12_channel,
+                alt=", ".join([f"{af}" for af in self._afs]),
             )
         )
 
@@ -76,7 +86,7 @@ def validate_cpu_pin_name(cpu_pin_name):
 class AlifPinGenerator(boardgen.PinGenerator):
     def __init__(self):
         # Use custom pin type above.
-        super().__init__(pin_type=AlifPin)
+        super().__init__(pin_type=AlifPin, enable_af=True)
 
         # Pre-define the pins (i.e. don't require them to be listed in pins.csv).
         for i in range(NUM_PORTS):
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index 5e3dad141908e..1a6136c31abeb 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -169,6 +169,56 @@ uint64_t mp_hal_time_ns(void) {
     return 0;
 }
 
+void mp_hal_pin_config(const machine_pin_obj_t *pin, uint32_t mode,
+    uint32_t pull, uint32_t speed, uint32_t drive, uint32_t alt, bool ren) {
+    uint8_t alt_func = PINMUX_ALTERNATE_FUNCTION_0;
+    uint8_t pad_ctrl = drive | speed | (ren ? PADCTRL_READ_ENABLE : 0);
+
+    // Configure pull-up or pull-down.
+    if (pull & MP_HAL_PIN_PULL_UP) {
+        pad_ctrl |= PADCTRL_DRIVER_DISABLED_PULL_UP;
+    }
+
+    if (pull & MP_HAL_PIN_PULL_DOWN) {
+        pad_ctrl |= PADCTRL_DRIVER_DISABLED_PULL_DOWN;
+    }
+
+    // Configure open-drain mode.
+    if (mode == MP_HAL_PIN_MODE_OPEN_DRAIN) {
+        pad_ctrl |= PADCTRL_DRIVER_OPEN_DRAIN;
+    }
+
+    // For ALT mode, find alternate function.
+    if (mode == MP_HAL_PIN_MODE_ALT) {
+        for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(pin->alt); i++) {
+            if (alt == pin->alt[i]) {
+                alt_func = i;
+                break;
+            }
+        }
+        if (alt_func == PINMUX_ALTERNATE_FUNCTION_0) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin af: %d"), alt);
+        }
+    }
+
+    // Set pad config.
+    pinconf_set(pin->port, pin->pin, alt_func, pad_ctrl);
+
+    // For INPUT/OUTPUT/OD modes, set the GPIO direction.
+    switch (mode) {
+        case MP_HAL_PIN_MODE_INPUT:
+            gpio_set_direction_input(pin->gpio, pin->pin);
+            break;
+        case MP_HAL_PIN_MODE_OUTPUT:
+        case MP_HAL_PIN_MODE_OPEN_DRAIN:
+            gpio_set_direction_output(pin->gpio, pin->pin);
+            break;
+        default:
+            break;
+    }
+}
+
+
 void system_tick_schedule_callback(void) {
     pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
 }
diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
index 7b054b671bcd6..3b23cb6a2c514 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -74,12 +74,49 @@ extern ringbuf_t stdin_ringbuf;
 #define MP_HAL_PIN_MODE_INPUT                   (0)
 #define MP_HAL_PIN_MODE_OUTPUT                  (1)
 #define MP_HAL_PIN_MODE_OPEN_DRAIN              (2)
+#define MP_HAL_PIN_MODE_ALT                     (3)
 #define MP_HAL_PIN_PULL_NONE                    (0)
 #define MP_HAL_PIN_PULL_UP                      (1)
 #define MP_HAL_PIN_PULL_DOWN                    (2)
+#define MP_HAL_PIN_DRIVE_2MA                    (PADCTRL_OUTPUT_DRIVE_STRENGTH_2MA)
+#define MP_HAL_PIN_DRIVE_4MA                    (PADCTRL_OUTPUT_DRIVE_STRENGTH_4MA)
+#define MP_HAL_PIN_DRIVE_8MA                    (PADCTRL_OUTPUT_DRIVE_STRENGTH_8MA)
+#define MP_HAL_PIN_DRIVE_12MA                   (PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA)
+#define MP_HAL_PIN_SPEED_LOW                    (0)
+#define MP_HAL_PIN_SPEED_HIGH                   (PADCTRL_SLEW_RATE_FAST)
 
 #define mp_hal_pin_obj_t const machine_pin_obj_t *
 
+enum {
+    MP_HAL_PIN_ALT_NONE = 0,
+    MP_HAL_PIN_ALT_ANA,
+    MP_HAL_PIN_ALT_AUDIO,
+    MP_HAL_PIN_ALT_CAM,
+    MP_HAL_PIN_ALT_CDC,
+    MP_HAL_PIN_ALT_CMP,
+    MP_HAL_PIN_ALT_ETH,
+    MP_HAL_PIN_ALT_FAULT,
+    MP_HAL_PIN_ALT_HFXO,
+    MP_HAL_PIN_ALT_I2C,
+    MP_HAL_PIN_ALT_I2S,
+    MP_HAL_PIN_ALT_I3C,
+    MP_HAL_PIN_ALT_JTAG,
+    MP_HAL_PIN_ALT_LPCAM,
+    MP_HAL_PIN_ALT_LPI2C,
+    MP_HAL_PIN_ALT_LPI2S,
+    MP_HAL_PIN_ALT_LPPDM,
+    MP_HAL_PIN_ALT_LPSPI,
+    MP_HAL_PIN_ALT_LPTMR,
+    MP_HAL_PIN_ALT_LPUART,
+    MP_HAL_PIN_ALT_OSPI,
+    MP_HAL_PIN_ALT_PDM,
+    MP_HAL_PIN_ALT_QEC,
+    MP_HAL_PIN_ALT_SD,
+    MP_HAL_PIN_ALT_SPI,
+    MP_HAL_PIN_ALT_UART,
+    MP_HAL_PIN_ALT_UT,
+};
+
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     GPIO_Type *gpio;
@@ -88,6 +125,7 @@ typedef struct _machine_pin_obj_t {
     uint8_t adc12_periph : 2;
     uint8_t adc12_channel : 3;
     qstr name;
+    const uint8_t alt[8];
 } machine_pin_obj_t;
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
@@ -149,5 +187,8 @@ static inline void mp_hal_wake_main_task_from_isr(void) {
     // Defined for tinyusb support, nothing needs to be done here.
 }
 
+void mp_hal_pin_config(const machine_pin_obj_t *pin, uint32_t mode,
+    uint32_t pull, uint32_t speed, uint32_t drive, uint32_t alt, bool ren);
+
 // Include all the pin definitions.
 #include "genhdr/pins_board.h"

From 9073270c2e0daa1a3539aa14c0feadadd6c6b08d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 2 Jan 2025 06:29:05 +0100
Subject: [PATCH 2084/3129] alif/machine_i2c: Add machine.I2C peripheral
 support.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/alif.mk        |   2 +
 ports/alif/machine_i2c.c  | 301 ++++++++++++++++++++++++++++++++++++++
 ports/alif/mpconfigport.h |   2 +
 3 files changed, 305 insertions(+)
 create mode 100644 ports/alif/machine_i2c.c

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index b338e67c66c9a..5cfd37fc4b6e9 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -117,6 +117,7 @@ SRC_C = \
 	alif_flash.c \
 	fatfs_port.c \
 	machine_pin.c \
+	machine_i2c.c \
 	main.c \
 	modalif.c \
 	mphalport.c \
@@ -186,6 +187,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	Device/common/source/pm.c \
 	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
 	drivers/source/adc.c \
+	drivers/source/i2c.c \
 	drivers/source/mhu_driver.c \
 	drivers/source/mhu_receiver.c \
 	drivers/source/mhu_sender.c \
diff --git a/ports/alif/machine_i2c.c b/ports/alif/machine_i2c.c
new file mode 100644
index 0000000000000..f117b93c2b1e8
--- /dev/null
+++ b/ports/alif/machine_i2c.c
@@ -0,0 +1,301 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/modmachine.h"
+
+#if MICROPY_HW_ENABLE_HW_I2C
+#include "i2c.h"
+
+#define I2C_DEFAULT_FREQ    (400000)
+#define I2C_DEFAULT_TIMEOUT (50000)
+
+#define I2C_DAT_INDEX       (0)
+#define I2C_TX_FIFO_LEN     (I2C_FIFO_DEPTH / 2)
+#define I2C_RX_FIFO_LEN     (I2C_FIFO_DEPTH / 2)
+
+#define I2C_SPEED(freq) \
+    ((freq) <= 100000 ? I2C_SPEED_STANDARD : \
+    ((freq) <= 400000 ? I2C_SPEED_FAST : \
+    I2C_SPEED_FASTPLUS))
+
+#define I2C_IC_CON_SPEED(freq) \
+    ((freq) <= 100000 ? I2C_IC_CON_SPEED_STANDARD : \
+    ((freq) <= 400000 ? I2C_IC_CON_SPEED_FAST : \
+    I2C_IC_CON_SPEED_HIGH))
+#define I2C_IC_CON_MASTER_TX_EMPTY_CTRL (1 << 8)
+
+#define I2C_IC_STATUS_RFNE  I2C_IC_STATUS_RECEIVE_FIFO_NOT_EMPTY
+#define I2C_IC_STATUS_TFNF  I2C_IC_STATUS_TRANSMIT_FIFO_NOT_FULL
+#define I2C_STAT_ERRORS     (I2C_IC_INTR_STAT_TX_ABRT | I2C_IC_INTR_STAT_TX_OVER | \
+    I2C_IC_INTR_STAT_RX_OVER | I2C_IC_INTR_STAT_RX_UNDER)
+
+#define debug_printf(...) // mp_printf(&mp_plat_print, "i2c.c: " __VA_ARGS__)
+#define I2C_CHECK_ERRORS(base) \
+    if (base->I2C_RAW_INTR_STAT & I2C_STAT_ERRORS) { \
+        uint32_t status = base->I2C_RAW_INTR_STAT; \
+        debug_printf("status: 0x%lx raw_int: 0x%lx abort: 0x%lx line: %d\n", \
+    base->I2C_STATUS, status, base->I2C_TX_ABRT_SOURCE, __LINE__); \
+        (void)status; \
+        (void)base->I2C_CLR_TX_ABRT; \
+        (void)base->I2C_CLR_ACTIVITY; \
+        return -MP_EIO; \
+    }
+
+typedef struct _machine_i2c_obj_t {
+    mp_obj_base_t base;
+    uint32_t i2c_id;
+    I2C_Type *i2c;
+    mp_hal_pin_obj_t scl;
+    mp_hal_pin_obj_t sda;
+    uint32_t freq;
+    uint32_t timeout;
+} machine_i2c_obj_t;
+
+static machine_i2c_obj_t machine_i2c_obj[] = {
+    #if defined(MICROPY_HW_I2C0_SCL)
+    [0] = {{&machine_i2c_type}, 0, (I2C_Type *)I2C0_BASE, MICROPY_HW_I2C0_SCL, MICROPY_HW_I2C0_SDA},
+    #endif
+    #if defined(MICROPY_HW_I2C1_SCL)
+    [1] = {{&machine_i2c_type}, 1, (I2C_Type *)I2C1_BASE, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
+    #endif
+    #if defined(MICROPY_HW_I2C2_SCL)
+    [2] = {{&machine_i2c_type}, 2, (I2C_Type *)I2C2_BASE, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA},
+    #endif
+    #if defined(MICROPY_HW_I2C3_SCL)
+    [3] = {{&machine_i2c_type}, 3, (I2C_Type *)I2C3_BASE, MICROPY_HW_I2C3_SCL, MICROPY_HW_I2C3_SDA},
+    #endif
+};
+
+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, timeout=%u)",
+        self->i2c_id, self->freq, self->scl->name, self->sda->name, self->timeout);
+}
+
+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, ARG_timeout };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = I2C_DEFAULT_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} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = I2C_DEFAULT_TIMEOUT} },
+    };
+
+    // 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) || !machine_i2c_obj[i2c_id].i2c) {
+        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[i2c_id];
+
+    // Set args
+    self->freq = args[ARG_freq].u_int;
+    self->timeout = args[ARG_timeout].u_int;
+
+    // here we would check the scl/sda pins and configure them, but it's not implemented
+    if (args[ARG_scl].u_obj != mp_const_none || args[ARG_sda].u_obj != mp_const_none) {
+        mp_raise_ValueError(MP_ERROR_TEXT("explicit choice of scl/sda is not implemented"));
+    }
+
+    // Disable I2C controller.
+    i2c_disable(self->i2c);
+
+    // Configure I2C pins.
+    mp_hal_pin_config(self->scl, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+    mp_hal_pin_config(self->sda, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+
+    // Initialize I2C controller.
+    self->i2c->I2C_CON = I2C_IC_CON_ENABLE_MASTER_MODE |
+        I2C_IC_CON_MASTER_RESTART_EN |
+        I2C_IC_CON_MASTER_TX_EMPTY_CTRL |
+        I2C_IC_CON_SPEED(self->freq);
+
+    // Configure FIFO threshold.
+    self->i2c->I2C_TX_TL = I2C_TX_FIFO_LEN;
+    self->i2c->I2C_RX_TL = I2C_RX_FIFO_LEN;
+
+    // Configure clock.
+    i2c_master_set_clock(self->i2c, GetSystemAPBClock() / 1000, I2C_SPEED(self->freq));
+
+    // Enable I2C controller.
+    i2c_clear_all_interrupt(self->i2c);
+    i2c_enable(self->i2c);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static int machine_i2c_poll_flags(I2C_Type *base, uint32_t flags, uint32_t timeout_us) {
+    mp_uint_t tick_start = mp_hal_ticks_us();
+    while (!(base->I2C_STATUS & flags)) {
+        I2C_CHECK_ERRORS(base);
+        if ((mp_hal_ticks_us() - tick_start) >= timeout_us) {
+            return -MP_ETIMEDOUT;
+        }
+        // Can't delay or handle pending events here otherwise we risk
+        // the FIFO getting empty, which will generate a STOP condition.
+    }
+    return 0;
+}
+
+static int machine_i2c_write(machine_i2c_obj_t *self, uint8_t *buf, size_t tx_size) {
+    mp_uint_t tick_start = mp_hal_ticks_us();
+    for (size_t tx_idx = 0; tx_idx < tx_size;) {
+        // Write data to FIFO
+        if (self->i2c->I2C_STATUS & I2C_IC_STATUS_TFNF) {
+            self->i2c->I2C_DATA_CMD = (uint16_t)buf[tx_idx++];
+            I2C_CHECK_ERRORS(self->i2c);
+            tick_start = mp_hal_ticks_us();
+        }
+
+        // Check for timeout
+        if ((mp_hal_ticks_us() - tick_start) >= self->timeout) {
+            return -MP_ETIMEDOUT;
+        }
+    }
+    return 0;
+}
+
+static int machine_i2c_read(machine_i2c_obj_t *self, uint8_t *buf, size_t rx_size) {
+    mp_uint_t tick_start = mp_hal_ticks_us();
+    for (size_t tx_idx = 0, rx_idx = 0; rx_idx < rx_size;) {
+        // Write command to FIFO
+        if (tx_idx < rx_size && (self->i2c->I2C_STATUS & I2C_IC_STATUS_TFNF)) {
+            self->i2c->I2C_DATA_CMD = I2C_IC_DATA_CMD_READ_REQ;
+            I2C_CHECK_ERRORS(self->i2c);
+            ++tx_idx;
+        }
+
+        // Read data from FIFO
+        while (rx_idx < rx_size && (self->i2c->I2C_STATUS & I2C_IC_STATUS_RFNE)) {
+            buf[rx_idx++] = self->i2c->I2C_DATA_CMD & 0xFF;
+            tick_start = mp_hal_ticks_us();
+        }
+
+        // Check for timeout
+        if ((mp_hal_ticks_us() - tick_start) >= self->timeout) {
+            return -MP_ETIMEDOUT;
+        }
+    }
+    return 0;
+}
+
+int machine_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags) {
+    int ret = 0;
+    uint32_t bytes = 0;
+    machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
+
+    // The DesignWare I2C IP on AE3 is configured such that it auto-generates a STOP
+    // condition when the TX FIFO gets empty. In other words, the code can't have any
+    // control over STOP condition generation. The only fix for this would be to buffer
+    // complete read/write sequences and send them out when the STOP flag is set.
+    if (!(flags & MP_MACHINE_I2C_FLAG_STOP)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("nostop flag is not supported"));
+    }
+
+    i2c_clear_all_interrupt(self->i2c);
+    i2c_set_target_addr(self->i2c, addr, I2C_7BIT_ADDRESS, 0);
+
+    // Workaround issue with hardware I2C not accepting zero-length writes.
+    if (!bufs->len) {
+        mp_machine_i2c_buf_t bufs = { 0 };
+
+        mp_machine_soft_i2c_obj_t soft_i2c = {
+            .base = { &mp_machine_soft_i2c_type },
+            .scl = self->scl,
+            .sda = self->sda,
+            .us_timeout = self->timeout,
+            .us_delay = 500000 / self->freq + 1,
+        };
+
+        // Switch pins to GPIO/OD.
+        mp_hal_pin_config(self->scl, MP_HAL_PIN_MODE_OPEN_DRAIN, MP_HAL_PIN_PULL_UP,
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_NONE, true);
+        mp_hal_pin_config(self->sda, MP_HAL_PIN_MODE_OPEN_DRAIN, MP_HAL_PIN_PULL_UP,
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_NONE, true);
+
+        // Perform the transfer.
+        ret = mp_machine_soft_i2c_transfer(&soft_i2c.base, addr, 1, &bufs, flags);
+
+        // Re-configure I2C pins.
+        mp_hal_pin_config(self->scl, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+        mp_hal_pin_config(self->sda, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+
+        return ret;
+    }
+
+    for (size_t i = 0; i < n; i++) {
+        mp_machine_i2c_buf_t *buf = &bufs[i];
+        if (i == 0 && (flags & MP_MACHINE_I2C_FLAG_WRITE1)) {
+            ret = machine_i2c_write(self, buf->buf, buf->len);
+        } else if (flags & MP_MACHINE_I2C_FLAG_READ) {
+            ret = machine_i2c_read(self, buf->buf, buf->len);
+        } else if (bufs->len != 0) {
+            ret = machine_i2c_write(self, buf->buf, buf->len);
+        }
+        if (ret < 0) {
+            return ret;
+        }
+        bytes += bufs->len;
+    }
+
+    // Wait for TX FIFO empty
+    ret = machine_i2c_poll_flags(self->i2c, I2C_IC_STATUS_TFE, self->timeout);
+    if (ret < 0) {
+        return ret;
+    }
+
+    return bytes;
+}
+
+static const mp_machine_i2c_p_t machine_i2c_p = {
+    .transfer_supports_write1 = true,
+    .transfer = machine_i2c_transfer,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_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
+    );
+#endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index ae3ad7a30d352..b23886637e308 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -130,6 +130,8 @@
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE      "ports/alif/machine_adc.c"
 #define MICROPY_PY_MACHINE_DHT_READINTO         (1)
 #define MICROPY_PY_MACHINE_PULSE                (1)
+#define MICROPY_PY_MACHINE_I2C                  (MICROPY_HW_ENABLE_HW_I2C)
+#define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1  (1)
 #define MICROPY_PY_MACHINE_SOFTI2C              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)
 #define MICROPY_PY_MACHINE_TIMER                (1)

From 280e6e2a40dbddb3aec5424c1ca1bf9dea876dd0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 19 Jan 2025 15:59:25 +0100
Subject: [PATCH 2085/3129] alif/machine_spi: Add machine.SPI peripheral
 support.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif.mk        |   3 +
 ports/alif/machine_spi.c  | 312 ++++++++++++++++++++++++++++++++++++++
 ports/alif/mpconfigport.h |   1 +
 3 files changed, 316 insertions(+)
 create mode 100644 ports/alif/machine_spi.c

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 5cfd37fc4b6e9..63003b58a0937 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -118,6 +118,7 @@ SRC_C = \
 	fatfs_port.c \
 	machine_pin.c \
 	machine_i2c.c \
+	machine_spi.c \
 	main.c \
 	modalif.c \
 	mphalport.c \
@@ -188,6 +189,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
 	drivers/source/adc.c \
 	drivers/source/i2c.c \
+	drivers/source/spi.c \
 	drivers/source/mhu_driver.c \
 	drivers/source/mhu_receiver.c \
 	drivers/source/mhu_sender.c \
@@ -206,6 +208,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	)
 
 $(BUILD)/tinyusb_port/tusb_alif_dcd.o: CFLAGS += -Wno-unused-variable -DTUSB_ALIF_NO_IRQ_CFG=1
+$(BUILD)/$(ALIF_DFP_REL_TOP)/drivers/source/spi.o: CFLAGS += -Wno-maybe-uninitialized
 $(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_boot.o: CFLAGS += -Wno-stringop-truncation
 $(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_system.o: CFLAGS += -Wno-maybe-uninitialized
 
diff --git a/ports/alif/machine_spi.c b/ports/alif/machine_spi.c
new file mode 100644
index 0000000000000..d13c6368f2515
--- /dev/null
+++ b/ports/alif/machine_spi.c
@@ -0,0 +1,312 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/modmachine.h"
+
+#if MICROPY_PY_MACHINE_SPI
+#include "clk.h"
+#include "spi.h"
+#include "sys_ctrl_spi.h"
+
+typedef struct _machine_spi_obj_t {
+    mp_obj_base_t base;
+    uint8_t id;
+    SPI_Type *inst;
+    bool is_lp;
+} machine_spi_obj_t;
+
+static machine_spi_obj_t machine_spi_obj[] = {
+    #if defined(MICROPY_HW_SPI0_SCK)
+    [0] = {{&machine_spi_type}, 0, (SPI_Type *)SPI0_BASE, false},
+    #endif
+    #if defined(MICROPY_HW_SPI1_SCK)
+    [1] = {{&machine_spi_type}, 1, (SPI_Type *)SPI1_BASE, false},
+    #endif
+    #if defined(MICROPY_HW_SPI2_SCK)
+    [2] = {{&machine_spi_type}, 2, (SPI_Type *)SPI2_BASE, false},
+    #endif
+    #if defined(MICROPY_HW_SPI3_SCK)
+    [3] = {{&machine_spi_type}, 3, (SPI_Type *)SPI3_BASE, false},
+    #endif
+    #if defined(MICROPY_HW_LPSPI0_SCK)
+    [4] = {{&machine_spi_type}, 4, (SPI_Type *)LPSPI0_BASE, true},
+    #endif
+
+};
+
+static inline uint32_t spi_get_clk(machine_spi_obj_t *spi) {
+    return spi->is_lp ? GetSystemCoreClock() : GetSystemAHBClock();
+}
+
+static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
+    uint32_t polarity, uint32_t phase, uint32_t bits, uint32_t firstbit) {
+    const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
+    switch (spi->id) {
+        #if defined(MICROPY_HW_SPI0_SCK)
+        case 0:
+            pins[0] = MICROPY_HW_SPI0_SCK;
+            pins[1] = MICROPY_HW_SPI0_MISO;
+            pins[2] = MICROPY_HW_SPI0_MOSI;
+            #if defined(MICROPY_HW_SPI0_NSS)
+            pins[3] = MICROPY_HW_SPI0_NSS;
+            #endif
+            break;
+        #endif
+        #if defined(MICROPY_HW_SPI1_SCK)
+        case 1:
+            pins[0] = MICROPY_HW_SPI1_SCK;
+            pins[1] = MICROPY_HW_SPI1_MISO;
+            pins[2] = MICROPY_HW_SPI1_MOSI;
+            #if defined(MICROPY_HW_SPI1_NSS)
+            pins[3] = MICROPY_HW_SPI1_NSS;
+            #endif
+            break;
+        #endif
+        #if defined(MICROPY_HW_SPI2_SCK)
+        case 2:
+            pins[0] = MICROPY_HW_SPI2_SCK;
+            pins[1] = MICROPY_HW_SPI2_MISO;
+            pins[2] = MICROPY_HW_SPI2_MOSI;
+            #if defined(MICROPY_HW_SPI2_NSS)
+            pins[3] = MICROPY_HW_SPI2_NSS;
+            #endif
+            break;
+        #endif
+        #if defined(MICROPY_HW_SPI3_SCK)
+        case 3:
+            pins[0] = MICROPY_HW_SPI3_SCK;
+            pins[1] = MICROPY_HW_SPI3_MISO;
+            pins[2] = MICROPY_HW_SPI3_MOSI;
+            #if defined(MICROPY_HW_SPI3_NSS)
+            pins[3] = MICROPY_HW_SPI3_NSS;
+            #endif
+            break;
+        #endif
+        #if defined(MICROPY_HW_LPSPI0_SCK)
+        case 4:  // LPSPI0
+            pins[0] = MICROPY_HW_LPSPI0_SCK;
+            pins[1] = MICROPY_HW_LPSPI0_MISO;
+            pins[2] = MICROPY_HW_LPSPI0_MOSI;
+            #if defined(MICROPY_HW_LPSPI0_NSS)
+            pins[3] = MICROPY_HW_LPSPI0_NSS;
+            #endif
+            break;
+        #endif
+        default:
+            return;
+    }
+
+    // Disable SPI.
+    spi_disable(spi->inst);
+
+    // Enable clocks.
+    if (spi->is_lp) {
+        enable_lpspi_clk();
+    }
+
+    // Configure SPI pins.
+    for (size_t i = 0; i < MP_ARRAY_SIZE(pins) && pins[i]; i++) {
+        mp_hal_pin_config(pins[i], MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
+    }
+
+    // Disable all interrupts.
+    spi_mask_interrupts(spi->inst);
+
+    // Configure baudrate clock
+    spi_set_bus_speed(spi->inst, baudrate, spi_get_clk(spi));
+
+    // Configure FIFOs
+    spi_set_tx_threshold(spi->inst, 0);
+    spi_set_rx_threshold(spi->inst, 0);
+    if (!spi->is_lp) {
+        spi_set_rx_sample_delay(spi->inst, 0);
+        spi_set_tx_fifo_start_level(spi->inst, 0);
+    }
+
+    // Configure SPI bus mode.
+    uint32_t spi_mode = (polarity << 1) | phase;
+    if (!spi->is_lp) {
+        spi_set_mode(spi->inst, spi_mode);
+    } else {
+        lpspi_set_mode(spi->inst, spi_mode);
+    }
+
+    // Configure SPI bus protocol.
+    uint32_t spi_proto = SPI_PROTO_SPI;
+    if (!spi->is_lp) {
+        spi_set_protocol(spi->inst, spi_proto);
+    } else {
+        lpspi_set_protocol(spi->inst, spi_proto);
+    }
+
+    // Configure SPI transfer mode.
+    if (!spi->is_lp) {
+        spi_mode_master(spi->inst);
+    }
+
+    // Configure frame size.
+    if (!spi->is_lp) {
+        spi_set_dfs(spi->inst, bits);
+    } else {
+        lpspi_set_dfs(spi->inst, bits);
+    }
+
+    // Configure slave select pin
+    spi_control_ss(spi->inst, 0, true);
+    if (!spi->is_lp) {
+        spi_set_sste(spi->inst, false);
+    } else {
+        lpspi_set_sste(spi->inst, false);
+    }
+
+    // Clear IRQs.
+    (void)spi->inst->SPI_ICR;
+
+    // Enable SPI.
+    spi_enable(spi->inst);
+}
+
+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);
+    uint32_t baudrate = spi_get_bus_speed(self->inst, spi_get_clk(self));
+    mp_printf(print, "SPI(%u, baudrate=%u, lp=%u)", self->id, baudrate, self->is_lp);
+}
+
+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 = 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} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { 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} },
+    };
+
+    // 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 spi bus.
+    int spi_id = mp_obj_get_int(args[ARG_id].u_obj);
+    if (spi_id < 0 || spi_id >= MP_ARRAY_SIZE(machine_spi_obj) || !machine_spi_obj[spi_id].inst) {
+        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[spi_id];
+
+    // here we would check the sck/mosi/miso pins and configure them, but it's not implemented
+    if (args[ARG_sck].u_obj != MP_OBJ_NULL ||
+        args[ARG_mosi].u_obj != MP_OBJ_NULL ||
+        args[ARG_miso].u_obj != MP_OBJ_NULL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("explicit choice of sck/mosi/miso is not implemented"));
+    }
+
+    // Initialize and configure SPI.
+    spi_init(self, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
+        args[ARG_phase].u_int, args[ARG_bits].u_int, args[ARG_firstbit].u_int);
+
+    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);
+
+    // Initialize and configure SPI.
+    spi_init(self, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
+        args[ARG_phase].u_int, args[ARG_bits].u_int, args[ARG_firstbit].u_int);
+}
+
+static void machine_spi_deinit(mp_obj_base_t *self_in) {
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
+    // Disable all interrupts.
+    spi_mask_interrupts(self->inst);
+    // Disable SS pin.
+    spi_control_ss(self->inst, 0, 0);
+    // Disable SPI.
+    spi_disable(self->inst);
+    // Deinitialize GPIOs and clocks.
+    if (self->is_lp) {
+        disable_lpspi_clk();
+    }
+}
+
+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;
+    spi_transfer_t spi_xfer = {
+        .tx_buff = src,
+        .tx_total_cnt = len,
+        .rx_buff = dest,
+        .rx_total_cnt = len,
+        .tx_default_val = 0xFF,
+        .tx_default_enable = true,
+        .mode = SPI_TMOD_TX_AND_RX,
+    };
+    // TODO redo transfer_blocking to timeout and poll events.
+    if (!self->is_lp) {
+        spi_transfer_blocking(self->inst, &spi_xfer);
+    } else {
+        lpspi_transfer_blocking(self->inst, &spi_xfer);
+    }
+}
+
+static const mp_machine_spi_p_t machine_spi_p = {
+    .init = machine_spi_init,
+    .deinit = machine_spi_deinit,
+    .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
+    );
+
+#endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index b23886637e308..83f808b131f48 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -133,6 +133,7 @@
 #define MICROPY_PY_MACHINE_I2C                  (MICROPY_HW_ENABLE_HW_I2C)
 #define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1  (1)
 #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_VFS                             (1)

From ec92bcfeff787a4ceb25c3b9c1703043a7e3052d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 31 Jan 2025 14:15:06 +0100
Subject: [PATCH 2086/3129] alif/machine_rtc: Add basic machine.RTC support.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/alif.mk       |   1 +
 ports/alif/irq.h         |   1 +
 ports/alif/machine_rtc.c | 109 +++++++++++++++++++++++++++++++++++++++
 ports/alif/modmachine.c  |   1 +
 4 files changed, 112 insertions(+)
 create mode 100644 ports/alif/machine_rtc.c

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 63003b58a0937..aa2451d7a6291 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -119,6 +119,7 @@ SRC_C = \
 	machine_pin.c \
 	machine_i2c.c \
 	machine_spi.c \
+	machine_rtc.c \
 	main.c \
 	modalif.c \
 	mphalport.c \
diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index 59dbce9705947..ed454adcb4657 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -48,6 +48,7 @@
 #define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 7, 0)
 #define IRQ_PRI_HWSEM           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 8, 0)
 #define IRQ_PRI_GPU             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 10, 0)
+#define IRQ_PRI_RTC             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 100, 0)
 #define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
 
 // these states correspond to values from query_irq, enable_irq and disable_irq
diff --git a/ports/alif/machine_rtc.c b/ports/alif/machine_rtc.c
new file mode 100644
index 0000000000000..6473d1d80fbff
--- /dev/null
+++ b/ports/alif/machine_rtc.c
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/modmachine.h"
+#include "rtc.h"
+#include "sys_ctrl_rtc.h"
+
+typedef struct _machine_rtc_obj_t {
+    mp_obj_base_t base;
+    LPRTC_Type *rtc;
+} machine_rtc_obj_t;
+
+// Singleton RTC object.
+static const machine_rtc_obj_t machine_rtc = {{&machine_rtc_type}, (LPRTC_Type *)LPRTC_BASE};
+
+void LPRTC_IRQHandler(void) {
+    lprtc_interrupt_ack(machine_rtc.rtc);
+    lprtc_interrupt_disable(machine_rtc.rtc);
+}
+
+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) {
+    const machine_rtc_obj_t *self = &machine_rtc;
+
+    // Check arguments.
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    enable_lprtc_clk();
+    lprtc_prescaler_disable(self->rtc);
+    lprtc_counter_wrap_disable(self->rtc);
+    lprtc_interrupt_disable(self->rtc);
+    lprtc_interrupt_unmask(self->rtc);
+
+    NVIC_SetPriority(LPRTC_IRQ_IRQn, IRQ_PRI_RTC);
+    NVIC_ClearPendingIRQ(LPRTC_IRQ_IRQn);
+    NVIC_EnableIRQ(LPRTC_IRQ_IRQn);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_id, ARG_time, ARG_repeat };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_time, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_repeat,  MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+    };
+
+    machine_rtc_obj_t *self = MP_OBJ_TO_PTR(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(args), allowed_args, args);
+
+    if (mp_obj_is_int(args[ARG_time].u_obj)) {
+        uint32_t seconds = mp_obj_get_int(args[1].u_obj) / 1000;
+
+        lprtc_counter_disable(self->rtc);
+        lprtc_load_count(self->rtc, 1);
+        lprtc_load_counter_match_register(self->rtc, seconds * 32768);
+
+        lprtc_interrupt_ack(self->rtc);
+        lprtc_interrupt_enable(self->rtc);
+        lprtc_counter_enable(self->rtc);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s)"));
+    }
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_alarm_obj, 1, machine_rtc_alarm);
+
+static const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_alarm), MP_ROM_PTR(&machine_rtc_alarm_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
+    );
diff --git a/ports/alif/modmachine.c b/ports/alif/modmachine.c
index 98d7bffbad932..9868abbeeaf35 100644
--- a/ports/alif/modmachine.c
+++ b/ports/alif/modmachine.c
@@ -35,6 +35,7 @@ extern void dcd_uninit(void);
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { 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 void mp_machine_idle(void) {
     mp_event_wait_indefinite();

From facd0b7190d48d7d6f4af1d1eaba0c3a18734356 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 7 Feb 2025 15:41:42 +0100
Subject: [PATCH 2087/3129] alif/ospi_flash: Use mp_hal_pin_config to configure
 OSPI pins.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/ospi_flash.c | 42 +++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index f2f95a04cf241..17c8be8128da3 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -262,30 +262,40 @@ int ospi_flash_init(void) {
 
     self->pin = pin;
 
-    uint32_t ck_pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST;
-    uint32_t io_pad_ctrl = PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA | PADCTRL_SLEW_RATE_FAST | PADCTRL_READ_ENABLE;
-
-    pinconf_set(pin->pin_cs->port, pin->pin_cs->pin, OSPI_PIN_FUNCTION, PADCTRL_OUTPUT_DRIVE_STRENGTH_12MA);
-    pinconf_set(pin->pin_clk_p->port, pin->pin_clk_p->pin, OSPI_PIN_FUNCTION, ck_pad_ctrl);
+    mp_hal_pin_config(pin->pin_cs, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, false);
+    mp_hal_pin_config(pin->pin_clk_p, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, false);
     if (pin->pin_clk_n != NULL) {
-        pinconf_set(pin->pin_clk_n->port, pin->pin_clk_n->pin, OSPI_PIN_FUNCTION, ck_pad_ctrl);
+        mp_hal_pin_config(pin->pin_clk_n, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, false);
     }
     if (pin->pin_rwds != NULL) {
-        pinconf_set(pin->pin_rwds->port, pin->pin_rwds->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+        mp_hal_pin_config(pin->pin_rwds, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
         if (pin->pin_rwds->port == PORT_10 && pin->pin_rwds->pin == PIN_7) {
             // Alif: P5_6 is needed to support proper alt function selection of P10_7.
-            pinconf_set(PORT_5, PIN_6, OSPI_PIN_FUNCTION, io_pad_ctrl);
+            mp_hal_pin_config(pin_P5_6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+                MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
         }
     }
-    pinconf_set(pin->pin_d0->port, pin->pin_d0->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
-    pinconf_set(pin->pin_d1->port, pin->pin_d1->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
-    pinconf_set(pin->pin_d2->port, pin->pin_d2->pin, OSPI_PIN_FUNCTION, io_pad_ctrl | PADCTRL_DRIVER_DISABLED_PULL_UP);
-    pinconf_set(pin->pin_d3->port, pin->pin_d3->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+    mp_hal_pin_config(pin->pin_d0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+    mp_hal_pin_config(pin->pin_d1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+    mp_hal_pin_config(pin->pin_d2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+    mp_hal_pin_config(pin->pin_d3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
     if (pin->pin_d4 != NULL) {
-        pinconf_set(pin->pin_d4->port, pin->pin_d4->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
-        pinconf_set(pin->pin_d5->port, pin->pin_d5->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
-        pinconf_set(pin->pin_d6->port, pin->pin_d6->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
-        pinconf_set(pin->pin_d7->port, pin->pin_d7->pin, OSPI_PIN_FUNCTION, io_pad_ctrl);
+        mp_hal_pin_config(pin->pin_d4, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+        mp_hal_pin_config(pin->pin_d5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+        mp_hal_pin_config(pin->pin_d6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+        mp_hal_pin_config(pin->pin_d7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
     }
 
     // Reset the SPI flash.

From b9e5f1ffba8551164374bf732aa165c87519a569 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 15 Feb 2025 13:53:44 +0100
Subject: [PATCH 2088/3129] alif/se_services: Add a secondary MHU channel.

This channel can be used to communicate (pass messages) between the M55
cores in the RTSS.  Currently it's only used to notify the cores.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/se_services.c | 120 +++++++++++++++++++++++++++++----------
 ports/alif/se_services.h |   4 ++
 2 files changed, 93 insertions(+), 31 deletions(-)

diff --git a/ports/alif/se_services.c b/ports/alif/se_services.c
index e79a5b97c8944..1ed6e3fbfdad0 100644
--- a/ports/alif/se_services.c
+++ b/ports/alif/se_services.c
@@ -37,8 +37,9 @@
 #include "py/mphal.h"
 
 // MHU indices.
-#define MHU_M55_SE_MHU0 0
-#define MAX_MHU         1
+#define MHU_SESS_MHU0   0
+#define MHU_RTSS_MHU0   1
+#define MAX_MHU         2
 
 // The following timeout is implemented in se_services_handle.c as a
 // simple loop busy polling on a variable set from an IRQ.
@@ -57,24 +58,36 @@ typedef struct {
 
 static const uint32_t mhu_sender_base_address_list[MAX_MHU] = {
     MHU_SESS_S_TX_BASE,
+    MHU_RTSS_S_TX_BASE
 };
 
 static const uint32_t mhu_receiver_base_address_list[MAX_MHU] = {
     MHU_SESS_S_RX_BASE,
+    MHU_RTSS_S_RX_BASE
 };
 
 // Must be aligned as a uint32_t.
 static uint32_t packet_buffer[SERVICES_MAX_PACKET_BUFFER_SIZE / sizeof(uint32_t)];
 
+static uint32_t se_sess_handle;
+static uint32_t se_rtss_handle;
+
 static mhu_driver_out_t mhu_driver_out;
-static uint32_t se_services_handle;
 
 void MHU_SESS_S_TX_IRQHandler(void) {
-    mhu_driver_out.sender_irq_handler(MHU_M55_SE_MHU0);
+    mhu_driver_out.sender_irq_handler(MHU_SESS_MHU0);
 }
 
 void MHU_SESS_S_RX_IRQHandler(void) {
-    mhu_driver_out.receiver_irq_handler(MHU_M55_SE_MHU0);
+    mhu_driver_out.receiver_irq_handler(MHU_SESS_MHU0);
+}
+
+void MHU_RTSS_S_TX_IRQHandler(void) {
+    mhu_driver_out.sender_irq_handler(MHU_RTSS_MHU0);
+}
+
+void MHU_RTSS_S_RX_IRQHandler(void) {
+    mhu_driver_out.receiver_irq_handler(MHU_RTSS_MHU0);
 }
 
 int dummy_printf(const char *fmt, ...) {
@@ -82,6 +95,33 @@ int dummy_printf(const char *fmt, ...) {
     return 0;
 }
 
+static void se_services_irq_config(IRQn_Type irqn, bool enable) {
+    if (enable) {
+        NVIC_ClearPendingIRQ(irqn);
+        NVIC_SetPriority(irqn, IRQ_PRI_MHU);
+        NVIC_EnableIRQ(irqn);
+    } else {
+        NVIC_DisableIRQ(irqn);
+        NVIC_ClearPendingIRQ(irqn);
+    }
+}
+
+void se_services_rx_callback(uint32_t id, uint32_t channel, uint32_t data) {
+    switch (id) {
+        case MHU_SESS_MHU0:
+            SERVICES_rx_msg_callback(id, channel, data);
+            break;
+        case MHU_RTSS_MHU0:
+            #if MICROPY_PY_OPENAMP
+            extern void metal_rproc_notified(void);
+            metal_rproc_notified();
+            #endif
+            break;
+        default:
+            break;
+    }
+}
+
 void se_services_init(void) {
     // Initialize MHU.
     mhu_driver_in_t mhu_driver_in;
@@ -89,7 +129,7 @@ void se_services_init(void) {
     mhu_driver_in.receiver_base_address_list = (uint32_t *)mhu_receiver_base_address_list;
     mhu_driver_in.mhu_count = MAX_MHU;
     mhu_driver_in.send_msg_acked_callback = SERVICES_send_msg_acked_callback;
-    mhu_driver_in.rx_msg_callback = SERVICES_rx_msg_callback;
+    mhu_driver_in.rx_msg_callback = se_services_rx_callback;
     mhu_driver_in.debug_print = NULL; // not currently used by MHU_driver_initialize
     MHU_driver_initialize(&mhu_driver_in, &mhu_driver_out);
 
@@ -103,29 +143,38 @@ void se_services_init(void) {
     };
     SERVICES_initialize(&services_init_params);
 
-    // Create SE services channel for sending requests.
-    se_services_handle = SERVICES_register_channel(MHU_M55_SE_MHU0, 0);
+    // Register SESS MHU channel.
+    se_sess_handle = SERVICES_register_channel(MHU_SESS_MHU0, 0);
+    se_services_irq_config(MHU_SESS_S_RX_IRQ_IRQn, true);
+    se_services_irq_config(MHU_SESS_S_TX_IRQ_IRQn, true);
 
-    // Enable MHU interrupts.
-    NVIC_ClearPendingIRQ(MHU_SESS_S_RX_IRQ_IRQn);
-    NVIC_SetPriority(MHU_SESS_S_RX_IRQ_IRQn, IRQ_PRI_MHU);
-    NVIC_EnableIRQ(MHU_SESS_S_RX_IRQ_IRQn);
-    NVIC_ClearPendingIRQ(MHU_SESS_S_TX_IRQ_IRQn);
-    NVIC_SetPriority(MHU_SESS_S_TX_IRQ_IRQn, IRQ_PRI_MHU);
-    NVIC_EnableIRQ(MHU_SESS_S_TX_IRQ_IRQn);
+    // Register RTSS MHU channel.
+    se_rtss_handle = SERVICES_register_channel(MHU_RTSS_MHU0, 0);
+    se_services_irq_config(MHU_RTSS_S_RX_IRQ_IRQn, true);
+    se_services_irq_config(MHU_RTSS_S_TX_IRQ_IRQn, true);
 
     // Send heartbeat services requests until one succeeds.
-    SERVICES_synchronize_with_se(se_services_handle);
+    SERVICES_synchronize_with_se(se_sess_handle);
+}
+
+void se_services_deinit(void) {
+    // Disable SESS MHU channel IRQs.
+    se_services_irq_config(MHU_SESS_S_RX_IRQ_IRQn, false);
+    se_services_irq_config(MHU_SESS_S_TX_IRQ_IRQn, false);
+
+    // Disable RTSS MHU channel IRQs.
+    se_services_irq_config(MHU_RTSS_S_RX_IRQ_IRQn, false);
+    se_services_irq_config(MHU_RTSS_S_TX_IRQ_IRQn, false);
 }
 
 void se_services_dump_device_data(void) {
     uint32_t error_code;
 
     uint8_t revision[80];
-    SERVICES_get_se_revision(se_services_handle, revision, &error_code);
+    SERVICES_get_se_revision(se_sess_handle, revision, &error_code);
 
     SERVICES_version_data_t data;
-    SERVICES_system_get_device_data(se_services_handle, &data, &error_code);
+    SERVICES_system_get_device_data(se_sess_handle, &data, &error_code);
 
     printf("SE revision: %s\n", revision);
     printf("ALIF_PN:     %s\n", data.ALIF_PN);
@@ -141,11 +190,11 @@ void se_services_dump_device_data(void) {
 
 void se_services_get_unique_id(uint8_t id[8]) {
     uint32_t error_code;
-    SERVICES_system_get_eui_extension(se_services_handle, false, id, &error_code);
+    SERVICES_system_get_eui_extension(se_sess_handle, false, id, &error_code);
 }
 
 __attribute__((noreturn)) void se_services_reset_soc(void) {
-    SERVICES_boot_reset_soc(se_services_handle);
+    SERVICES_boot_reset_soc(se_sess_handle);
     NVIC_SystemReset();
 }
 
@@ -155,7 +204,7 @@ uint64_t se_services_rand64(void) {
     for (int retry = 0; retry < 100; ++retry) {
         uint64_t value;
         int32_t error_code;
-        uint32_t ret = SERVICES_cryptocell_get_rnd(se_services_handle, sizeof(uint64_t), &value, &error_code);
+        uint32_t ret = SERVICES_cryptocell_get_rnd(se_sess_handle, sizeof(uint64_t), &value, &error_code);
         if (ret == SERVICES_REQ_SUCCESS) {
             return value;
         }
@@ -165,51 +214,59 @@ uint64_t se_services_rand64(void) {
     return 0;
 }
 
+uint32_t se_services_notify(void) {
+    uint32_t ret = SERVICES_send_msg(se_rtss_handle, LocalToGlobal(0));
+    if (ret != SERVICES_REQ_SUCCESS) {
+        return -1;
+    }
+    return 0;
+}
+
 uint32_t se_services_enable_clock(clock_enable_t clock, bool enable) {
     uint32_t error_code;
-    SERVICES_clocks_enable_clock(se_services_handle, clock, enable, &error_code);
+    SERVICES_clocks_enable_clock(se_sess_handle, clock, enable, &error_code);
     return error_code;
 }
 
 uint32_t se_services_select_pll_source(pll_source_t source, pll_target_t target) {
     uint32_t error_code;
-    SERVICES_clocks_select_pll_source(se_services_handle, source, target, &error_code);
+    SERVICES_clocks_select_pll_source(se_sess_handle, source, target, &error_code);
     return error_code;
 }
 
 uint32_t se_services_get_run_profile(run_profile_t *profile) {
     uint32_t error_code;
-    SERVICES_get_run_cfg(se_services_handle, profile, &error_code);
+    SERVICES_get_run_cfg(se_sess_handle, profile, &error_code);
     return error_code;
 }
 
 uint32_t se_services_set_run_profile(run_profile_t *profile) {
     uint32_t error_code;
-    SERVICES_set_run_cfg(se_services_handle, profile, &error_code);
+    SERVICES_set_run_cfg(se_sess_handle, profile, &error_code);
     return error_code;
 }
 
 uint32_t se_services_get_off_profile(off_profile_t *profile) {
     uint32_t error_code;
-    SERVICES_get_off_cfg(se_services_handle, profile, &error_code);
+    SERVICES_get_off_cfg(se_sess_handle, profile, &error_code);
     return error_code;
 }
 
 uint32_t se_services_set_off_profile(off_profile_t *profile) {
     uint32_t error_code;
-    SERVICES_set_off_cfg(se_services_handle, profile, &error_code);
+    SERVICES_set_off_cfg(se_sess_handle, profile, &error_code);
     return error_code;
 }
 
 uint32_t se_services_boot_process_toc_entry(const uint8_t *image_id) {
     uint32_t error_code;
-    SERVICES_boot_process_toc_entry(se_services_handle, image_id, &error_code);
+    SERVICES_boot_process_toc_entry(se_sess_handle, image_id, &error_code);
     return error_code;
 }
 
 uint32_t se_services_boot_cpu(uint32_t cpu_id, uint32_t address) {
     uint32_t error_code;
-    SERVICES_boot_cpu(se_services_handle, cpu_id, address, &error_code);
+    SERVICES_boot_cpu(se_sess_handle, cpu_id, address, &error_code);
     return error_code;
 }
 
@@ -221,7 +278,7 @@ uint32_t se_services_boot_reset_cpu(uint32_t cpu_id) {
     }
 
     for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(1)) {
-        uint32_t ret = SERVICES_boot_reset_cpu(se_services_handle, cpu_id, &error_code);
+        uint32_t ret = SERVICES_boot_reset_cpu(se_sess_handle, cpu_id, &error_code);
         if (ret != SERVICES_REQ_SUCCESS) {
             return error_code;
         }
@@ -234,11 +291,12 @@ uint32_t se_services_boot_reset_cpu(uint32_t cpu_id) {
             return SERVICES_REQ_TIMEOUT;
         }
     }
+
     return error_code;
 }
 
 uint32_t se_services_boot_release_cpu(uint32_t cpu_id) {
     uint32_t error_code;
-    SERVICES_boot_release_cpu(se_services_handle, cpu_id, &error_code);
+    SERVICES_boot_release_cpu(se_sess_handle, cpu_id, &error_code);
     return error_code;
 }
diff --git a/ports/alif/se_services.h b/ports/alif/se_services.h
index 87deb05592990..44b6584a20000 100644
--- a/ports/alif/se_services.h
+++ b/ports/alif/se_services.h
@@ -29,12 +29,16 @@
 #include "services_lib_api.h"
 
 void se_services_init(void);
+void se_services_deinit(void);
 void se_services_dump_device_data(void);
 void se_services_get_unique_id(uint8_t id[8]);
 __attribute__((noreturn)) void se_services_reset_soc(void);
 uint64_t se_services_rand64(void);
+uint32_t se_services_notify(void);
+
 uint32_t se_services_enable_clock(clock_enable_t clock, bool enable);
 uint32_t se_services_select_pll_source(pll_source_t source, pll_target_t target);
+
 uint32_t se_services_get_run_profile(run_profile_t *profile);
 uint32_t se_services_set_run_profile(run_profile_t *profile);
 uint32_t se_services_get_off_profile(off_profile_t *profile);

From 182b5f3a12427d3dc21744b0164d546663ea696b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 15 Feb 2025 14:00:42 +0100
Subject: [PATCH 2089/3129] alif/mpmetalport: Use MHU to notify remote cores.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unlike HWSEM, the MHU IRQ can wake up cores from low-power modes, making it
better suited for notifying remote cores.  Note that no special function is
required to wake up a remote core—the act of sending a message alone will
notify it.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/mpmetalport.c | 31 +++++++------------------------
 ports/alif/mpmetalport.h | 14 --------------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/ports/alif/mpmetalport.c b/ports/alif/mpmetalport.c
index a7d4025468a16..b0a017fdd797a 100644
--- a/ports/alif/mpmetalport.c
+++ b/ports/alif/mpmetalport.c
@@ -27,8 +27,6 @@
  */
 
 #include ALIF_CMSIS_H
-#include "hwsem.h"
-
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
@@ -36,18 +34,14 @@
 #include "metal/utilities.h"
 #include "metal/device.h"
 
+#include "se_services.h"
+
 struct metal_state _metal;
 static mp_sched_node_t rproc_notify_node;
 
 int metal_sys_init(const struct metal_init_params *params) {
     metal_unused(params);
 
-    // Reset the hardware semaphore.
-    hwsem_reset(METAL_HSEM_DEVICE);
-    #if MICROPY_PY_OPENAMP_HOST
-    hwsem_reset(METAL_HSEM_REMOTE);
-    #endif
-
     // If cache management is not enabled, configure the MPU to disable
     // caching for the entire Open-AMP shared memory region.
     #ifndef VIRTIO_USE_DCACHE
@@ -59,18 +53,10 @@ int metal_sys_init(const struct metal_init_params *params) {
     #endif
 
     metal_bus_register(&metal_generic_bus);
-
-    // Enable the hardware semaphore IRQ.
-    NVIC_ClearPendingIRQ(METAL_HSEM_IRQn);
-    NVIC_SetPriority(METAL_HSEM_IRQn, IRQ_PRI_HWSEM);
-    NVIC_EnableIRQ(METAL_HSEM_IRQn);
     return 0;
 }
 
 void metal_sys_finish(void) {
-    NVIC_DisableIRQ(METAL_HSEM_IRQn);
-    NVIC_ClearPendingIRQ(METAL_HSEM_IRQn);
-    hwsem_reset(METAL_HSEM_DEVICE);
     metal_bus_unregister(&metal_generic_bus);
 }
 
@@ -99,15 +85,12 @@ void metal_machine_cache_invalidate(void *addr, unsigned int len) {
 }
 
 int metal_rproc_notify(void *priv, uint32_t id) {
-    // Release the HW semaphore to notify the other core.
-    hwsem_release(METAL_HSEM_REMOTE, HWSEM_MASTERID);
+    // Notify the remote core.
+    se_services_notify();
     return 0;
 }
 
-void METAL_HSEM_IRQ_HANDLER(void) {
-    // Schedule the node only if the other core released the Semaphore.
-    if (METAL_HSEM_DEVICE->HWSEM_REL_REG == 0) {
-        mp_sched_schedule_node(&rproc_notify_node, openamp_remoteproc_notified);
-    }
-    hwsem_request(METAL_HSEM_DEVICE, METAL_HSEM_REMOTE_ID);
+void metal_rproc_notified(void) {
+    // The remote core notified this core.
+    mp_sched_schedule_node(&rproc_notify_node, openamp_remoteproc_notified);
 }
diff --git a/ports/alif/mpmetalport.h b/ports/alif/mpmetalport.h
index 7a428dbc6c62a..c11725a1f1e45 100644
--- a/ports/alif/mpmetalport.h
+++ b/ports/alif/mpmetalport.h
@@ -38,20 +38,6 @@
 
 #define METAL_MAX_DEVICE_REGIONS    2
 
-#if MICROPY_PY_OPENAMP_HOST
-#define METAL_HSEM_DEVICE           ((HWSEM_Type *)HWSEM14_BASE)
-#define METAL_HSEM_REMOTE           ((HWSEM_Type *)HWSEM15_BASE)
-#define METAL_HSEM_REMOTE_ID        (0x410FD222U)
-#define METAL_HSEM_IRQn             HWSEM_IRQ14_IRQn
-#define METAL_HSEM_IRQ_HANDLER      HWSEM_IRQ14Handler
-#else
-#define METAL_HSEM_DEVICE           ((HWSEM_Type *)HWSEM15_BASE)
-#define METAL_HSEM_REMOTE           ((HWSEM_Type *)HWSEM14_BASE)
-#define METAL_HSEM_REMOTE_ID        (0x410FD221U)
-#define METAL_HSEM_IRQn             HWSEM_IRQ15_IRQn
-#define METAL_HSEM_IRQ_HANDLER      HWSEM_IRQ15Handler
-#endif
-
 // Set to 1 to enable log output.
 #define METAL_LOG_HANDLER_ENABLE    0
 

From 68b1dae011dd9f2696e9f6f2f914317d827c879d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 19 Feb 2025 14:42:05 +0100
Subject: [PATCH 2090/3129] alif: Link with libnosys.

This allows the correct start up functions to be called by the stdlib.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/alif.mk       | 22 +++++++++----------
 ports/alif/main.c        |  2 +-
 ports/alif/nosys_stubs.c | 46 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 ports/alif/nosys_stubs.c

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index aa2451d7a6291..7e58aa5729f39 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -68,9 +68,9 @@ CFLAGS += $(INC) \
           -mtune=cortex-m55 \
           $(CFLAGS_FPU) \
           -march=armv8.1-m.main+fp+mve.fp \
-          -nostdlib \
           -fdata-sections \
           -ffunction-sections \
+          --specs=nosys.specs \
           -D$(MCU_CORE)=1 \
           -DCORE_$(MCU_CORE) \
           -DALIF_CMSIS_H="\"$(MCU_CORE).h\""
@@ -95,18 +95,17 @@ CFLAGS += $(CFLAGS_EXTRA)
 
 AFLAGS = -mthumb -march=armv8.1-m.main+fp+mve.fp $(CFLAGS_FPU)
 
-LDFLAGS += -nostdlib \
-           -T$(BUILD)/ensemble.ld \
-           -Map=$@.map \
-           --cref \
-           --gc-sections \
-           --print-memory-usage
+CFLAGS += -Wl,-T$(BUILD)/ensemble.ld \
+          -Wl,-Map=$@.map \
+          -Wl,--cref \
+          -Wl,--gc-sections \
+          -Wl,--print-memory-usage \
+          -Wl,--no-warn-rwx-segment
+
 ifeq ($(MCU_CORE),M55_HP)
-LDFLAGS += --wrap=dcd_event_handler
+CFLAGS += -Wl,--wrap=dcd_event_handler
 endif
 
-LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
-
 ################################################################################
 # Source files and libraries
 
@@ -126,6 +125,7 @@ SRC_C = \
 	mpu.c \
 	mpuart.c \
 	msc_disk.c \
+	nosys_stubs.c \
 	ospi_ext.c \
 	ospi_flash.c \
 	pendsv.c \
@@ -256,7 +256,7 @@ $(BUILD)/ensemble.ld: $(LD_FILE)
 
 $(BUILD)/firmware.elf: $(OBJ) $(BUILD)/ensemble.ld
 	$(ECHO) "Link $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+	$(Q)$(CC) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
 	$(Q)$(SIZE) $@
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
diff --git a/ports/alif/main.c b/ports/alif/main.c
index 975ee7ed2d328..793425fff2e74 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -55,7 +55,7 @@ NORETURN void panic(const char *msg) {
     }
 }
 
-void _start(void) {
+int main(void) {
     system_tick_init();
 
     MICROPY_BOARD_STARTUP();
diff --git a/ports/alif/nosys_stubs.c b/ports/alif/nosys_stubs.c
new file mode 100644
index 0000000000000..a394ec8f1cf66
--- /dev/null
+++ b/ports/alif/nosys_stubs.c
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <errno.h>
+
+int _write(int handle, char *buffer, int size) {
+    errno = ENOSYS;
+    return -1;
+}
+
+int _read(int handle, char *buffer, int size) {
+    errno = ENOSYS;
+    return -1;
+}
+
+int _close(int f) {
+    errno = ENOSYS;
+    return -1;
+}
+
+int _lseek(int f, int ptr, int dir) {
+    errno = ENOSYS;
+    return -1;
+}

From 7e32c232183441e1022f59e58c31ba431c25fe2f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Mar 2025 23:29:58 +1100
Subject: [PATCH 2091/3129] alif/mpmetalport: Only notify after metal subsystem
 is init'd.

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

diff --git a/ports/alif/mpmetalport.c b/ports/alif/mpmetalport.c
index b0a017fdd797a..9d774cb906766 100644
--- a/ports/alif/mpmetalport.c
+++ b/ports/alif/mpmetalport.c
@@ -37,6 +37,8 @@
 #include "se_services.h"
 
 struct metal_state _metal;
+
+static bool metal_active;
 static mp_sched_node_t rproc_notify_node;
 
 int metal_sys_init(const struct metal_init_params *params) {
@@ -53,10 +55,13 @@ int metal_sys_init(const struct metal_init_params *params) {
     #endif
 
     metal_bus_register(&metal_generic_bus);
+    metal_active = true;
+
     return 0;
 }
 
 void metal_sys_finish(void) {
+    metal_active = false;
     metal_bus_unregister(&metal_generic_bus);
 }
 
@@ -91,6 +96,9 @@ int metal_rproc_notify(void *priv, uint32_t id) {
 }
 
 void metal_rproc_notified(void) {
+    if (!metal_active) {
+        return;
+    }
     // The remote core notified this core.
     mp_sched_schedule_node(&rproc_notify_node, openamp_remoteproc_notified);
 }

From ca3d50a096ffa999e47b98335ceb0b7f459196c2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Mar 2025 23:31:58 +1100
Subject: [PATCH 2092/3129] alif/mpuart: Use mp_hal_pin_config for TX/RX
 configuration.

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

diff --git a/ports/alif/mpuart.c b/ports/alif/mpuart.c
index e9cfcf34fed53..69734659a4101 100644
--- a/ports/alif/mpuart.c
+++ b/ports/alif/mpuart.c
@@ -35,10 +35,8 @@
 #include "sys_ctrl_uart.h"
 #include "uart.h"
 
-#define TX_PORT PORT_12
-#define TX_PIN PIN_2
-#define RX_PORT PORT_12
-#define RX_PIN PIN_1
+#define TX_PIN pin_P12_2
+#define RX_PIN pin_P12_1
 #define UART_ID 4
 #define UART_IRQN UART4_IRQ_IRQn
 #define UART_PTR ((UART_Type *)UART4_BASE)
@@ -48,8 +46,8 @@
 static UART_TRANSFER transfer;
 
 void mp_uart_init(void) {
-    pinconf_set(TX_PORT, TX_PIN, PINMUX_ALTERNATE_FUNCTION_2, 0);
-    pinconf_set(RX_PORT, RX_PIN, PINMUX_ALTERNATE_FUNCTION_2, PADCTRL_READ_ENABLE);
+    mp_hal_pin_config(TX_PIN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_UART, false);
+    mp_hal_pin_config(RX_PIN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_UART, true);
     select_uart_clock_syst_pclk(UART_ID);
     enable_uart_clock(UART_ID);
     uart_software_reset(UART_PTR);

From af574a86c2ec3af02b167d449b8a8718f39f1ca8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Dec 2024 00:18:56 +1100
Subject: [PATCH 2093/3129] alif/alif_flash: Distinguish between total flash
 size and FS size.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif_flash.c | 8 ++++----
 ports/alif/msc_disk.c   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/alif/alif_flash.c b/ports/alif/alif_flash.c
index f2ea5ac85a88e..de7b37804f955 100644
--- a/ports/alif/alif_flash.c
+++ b/ports/alif/alif_flash.c
@@ -37,10 +37,10 @@ typedef struct _alif_flash_obj_t {
     uint32_t flash_size;
 } alif_flash_obj_t;
 
-static alif_flash_obj_t alif_flash_obj = {
+static const alif_flash_obj_t alif_flash_fs_obj = {
     .base = { &alif_flash_type },
     .flash_base_addr = MICROPY_HW_FLASH_STORAGE_BASE_ADDR,
-    .flash_size = MICROPY_HW_FLASH_STORAGE_BYTES,
+    .flash_size = MICROPY_HW_FLASH_STORAGE_FS_BYTES,
 };
 
 static mp_obj_t alif_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -54,8 +54,8 @@ static mp_obj_t alif_flash_make_new(const mp_obj_type_t *type, size_t n_args, si
     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
-        return MP_OBJ_FROM_PTR(&alif_flash_obj);
+        // Default singleton object that accesses writable-filesystem flash
+        return MP_OBJ_FROM_PTR(&alif_flash_fs_obj);
     }
 
     alif_flash_obj_t *self = mp_obj_malloc(alif_flash_obj_t, &alif_flash_type);
diff --git a/ports/alif/msc_disk.c b/ports/alif/msc_disk.c
index a01494d20f0e4..0b8ddddeda248 100644
--- a/ports/alif/msc_disk.c
+++ b/ports/alif/msc_disk.c
@@ -37,7 +37,7 @@
 #endif
 
 #define BLOCK_SIZE          (MICROPY_HW_FLASH_BLOCK_SIZE_BYTES)
-#define BLOCK_COUNT         (MICROPY_HW_FLASH_STORAGE_BYTES / BLOCK_SIZE)
+#define BLOCK_COUNT         (MICROPY_HW_FLASH_STORAGE_FS_BYTES / BLOCK_SIZE)
 #define FLASH_BASE_ADDR     (MICROPY_HW_FLASH_STORAGE_BASE_ADDR)
 
 static bool ejected = false;

From d895a62b0703d28fb2b15427760aae8a67ad666f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Dec 2024 00:19:20 +1100
Subject: [PATCH 2094/3129] alif/alif_flash: Make flash respond to the buffer
 protocol.

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

diff --git a/ports/alif/alif_flash.c b/ports/alif/alif_flash.c
index de7b37804f955..722afadae1f7b 100644
--- a/ports/alif/alif_flash.c
+++ b/ports/alif/alif_flash.c
@@ -80,6 +80,19 @@ static mp_obj_t alif_flash_make_new(const mp_obj_type_t *type, size_t n_args, si
     return MP_OBJ_FROM_PTR(self);
 }
 
+static mp_int_t alif_flash_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+    alif_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (flags == MP_BUFFER_READ) {
+        bufinfo->buf = (void *)(ospi_flash_get_xip_base() + self->flash_base_addr);
+        bufinfo->len = self->flash_size;
+        bufinfo->typecode = 'B';
+        return 0;
+    } else {
+        // Can't return a writable buffer.
+        return 1;
+    }
+}
+
 static mp_obj_t alif_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     alif_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     uint32_t offset = mp_obj_get_int(args[1]) * MICROPY_HW_FLASH_BLOCK_SIZE_BYTES;
@@ -157,6 +170,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     make_new, alif_flash_make_new,
+    buffer, alif_flash_get_buffer,
     locals_dict, &alif_flash_locals_dict
     );
 #endif // MICROPY_HW_ENABLE_OSPI

From f83f6e7eed39f961ff9788814d3ee9104d3577a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Mar 2025 16:30:15 +1100
Subject: [PATCH 2095/3129] alif/mpu: Add function to set read-only bit on MRAM
 MPU region.

To allow writing to MRAM region.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpu.c | 11 +++++++++++
 ports/alif/mpu.h |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/ports/alif/mpu.c b/ports/alif/mpu.c
index 471eff20a2c5b..60753674ae1e5 100644
--- a/ports/alif/mpu.c
+++ b/ports/alif/mpu.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/mpconfig.h"
+#include "irq.h"
 #include "mpu.h"
 #include ALIF_CMSIS_H
 
@@ -76,3 +77,13 @@ void MPU_Load_Regions(void) {
     // Load the MPU regions from the table.
     ARM_MPU_Load(0, mpu_table, sizeof(mpu_table) / sizeof(ARM_MPU_Region_t));
 }
+
+void mpu_config_mram(bool read_only) {
+    uintptr_t atomic = disable_irq();
+    ARM_MPU_Disable();
+    MPU->RNR = MP_MPU_REGION_MRAM;
+    MPU->RBAR = ARM_MPU_RBAR(MRAM_BASE, ARM_MPU_SH_NON, read_only, 1, 0);
+    MPU->RLAR = ARM_MPU_RLAR(MRAM_BASE + MRAM_SIZE - 1, MP_MPU_ATTR_NORMAL_WT_RA);
+    ARM_MPU_Enable(MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_HFNMIENA_Msk);
+    enable_irq(atomic);
+}
diff --git a/ports/alif/mpu.h b/ports/alif/mpu.h
index 88fbe011206ed..1d3602941efb7 100644
--- a/ports/alif/mpu.h
+++ b/ports/alif/mpu.h
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include <stdbool.h>
+
 #define MP_MPU_ATTR_NORMAL_WT_RA_TRANSIENT  (0)
 #define MP_MPU_ATTR_DEVICE_nGnRE            (1)
 #define MP_MPU_ATTR_NORMAL_WB_RA_WA         (2)
@@ -37,3 +39,5 @@
 #define MP_MPU_REGION_OSPI_REGISTERS        (4)
 #define MP_MPU_REGION_OSPI0_XIP             (5)
 #define MP_MPU_REGION_OPENAMP               (6)
+
+void mpu_config_mram(bool read_only);

From 8297c95c22fd15aa706243bfebb0688a61827855 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Mar 2025 14:51:45 +1100
Subject: [PATCH 2096/3129] alif/vfs_rom_ioctl: Add vfs_rom_ioctl with support
 for OSPI and MRAM.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif.mk         |   3 +
 ports/alif/mpconfigport.h  |   1 +
 ports/alif/vfs_rom_ioctl.c | 175 +++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 ports/alif/vfs_rom_ioctl.c

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 7e58aa5729f39..f0ff8d91a53d9 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -132,6 +132,7 @@ SRC_C = \
 	system_tick.c \
 	se_services.c \
 	usbd.c \
+	vfs_rom_ioctl.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
 ifeq ($(MICROPY_FLOAT_IMPL),float)
@@ -194,6 +195,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	drivers/source/mhu_driver.c \
 	drivers/source/mhu_receiver.c \
 	drivers/source/mhu_sender.c \
+	drivers/source/mram.c \
 	drivers/source/pinconf.c \
 	drivers/source/uart.c \
 	drivers/source/utimer.c \
@@ -209,6 +211,7 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	)
 
 $(BUILD)/tinyusb_port/tusb_alif_dcd.o: CFLAGS += -Wno-unused-variable -DTUSB_ALIF_NO_IRQ_CFG=1
+$(BUILD)/$(ALIF_DFP_REL_TOP)/drivers/source/mram.o: CFLAGS += -Wno-strict-aliasing
 $(BUILD)/$(ALIF_DFP_REL_TOP)/drivers/source/spi.o: CFLAGS += -Wno-maybe-uninitialized
 $(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_boot.o: CFLAGS += -Wno-stringop-truncation
 $(BUILD)/$(ALIF_DFP_REL_TOP)/se_services/source/services_host_system.o: CFLAGS += -Wno-maybe-uninitialized
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 83f808b131f48..33f300641fbba 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -137,6 +137,7 @@
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)
 #define MICROPY_PY_MACHINE_TIMER                (1)
 #define MICROPY_VFS                             (1)
+#define MICROPY_VFS_ROM                         (1)
 
 // fatfs configuration
 #define MICROPY_FATFS_ENABLE_LFN                (1)
diff --git a/ports/alif/vfs_rom_ioctl.c b/ports/alif/vfs_rom_ioctl.c
new file mode 100644
index 0000000000000..d82ac6f8417e2
--- /dev/null
+++ b/ports/alif/vfs_rom_ioctl.c
@@ -0,0 +1,175 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/mperrno.h"
+#include "py/objarray.h"
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "modalif.h"
+#include "mpu.h"
+#include "mram.h"
+#include "ospi_flash.h"
+
+#if MICROPY_VFS_ROM_IOCTL
+
+#if MICROPY_HW_ROMFS_ENABLE_PART0 && !defined(MICROPY_HW_ROMFS_PART0_START)
+#define MICROPY_HW_ROMFS_PART0_START (uintptr_t)(&_micropy_hw_romfs_part0_start)
+#define MICROPY_HW_ROMFS_PART0_SIZE (uintptr_t)(&_micropy_hw_romfs_part0_size)
+extern uint8_t _micropy_hw_romfs_part0_start;
+extern uint8_t _micropy_hw_romfs_part0_size;
+#endif
+
+#if MICROPY_HW_ROMFS_ENABLE_PART1 && !defined(MICROPY_HW_ROMFS_PART1_START)
+#define MICROPY_HW_ROMFS_PART1_START (uintptr_t)(&_micropy_hw_romfs_part1_start)
+#define MICROPY_HW_ROMFS_PART1_SIZE (uintptr_t)(&_micropy_hw_romfs_part1_size)
+extern uint8_t _micropy_hw_romfs_part1_start;
+extern uint8_t _micropy_hw_romfs_part1_size;
+#endif
+
+#define ROMFS_MEMORYVIEW(base, size) {{&mp_type_memoryview}, 'B', 0, (size), (void *)(base)}
+
+static const mp_obj_array_t romfs_obj_table[] = {
+    #if MICROPY_HW_ROMFS_ENABLE_PART0
+    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART0_START, MICROPY_HW_ROMFS_PART0_SIZE),
+    #endif
+    #if MICROPY_HW_ROMFS_ENABLE_PART1
+    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART1_START, MICROPY_HW_ROMFS_PART1_SIZE),
+    #endif
+};
+
+static inline bool mram_is_valid_addr(uintptr_t addr) {
+    return MRAM_BASE <= addr && addr < MRAM_BASE + MRAM_SIZE;
+}
+
+static inline bool ospi_is_valid_addr(uintptr_t xip_base, uintptr_t addr) {
+    MP_STATIC_ASSERT(OSPI0_XIP_SIZE == OSPI1_XIP_SIZE);
+    return xip_base <= addr && addr < xip_base + OSPI0_XIP_SIZE;
+}
+
+mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
+    mp_int_t cmd = mp_obj_get_int(args[0]);
+    if (cmd == MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS) {
+        return MP_OBJ_NEW_SMALL_INT(MP_ARRAY_SIZE(romfs_obj_table));
+    }
+
+    if (n_args < 2) {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+    }
+
+    mp_int_t romfs_id = mp_obj_get_int(args[1]);
+    if (!(0 <= romfs_id && romfs_id < MP_ARRAY_SIZE(romfs_obj_table))) {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+    }
+
+    const mp_obj_array_t *romfs_obj = &romfs_obj_table[romfs_id];
+
+    if (cmd == MP_VFS_ROM_IOCTL_GET_SEGMENT) {
+        // Return the ROMFS memoryview object.
+        return MP_OBJ_FROM_PTR(romfs_obj);
+    }
+
+    uintptr_t romfs_base = (uintptr_t)romfs_obj->items;
+    uintptr_t romfs_len = romfs_obj->len;
+
+    #if MICROPY_HW_ENABLE_OSPI
+    const uintptr_t ospi_base = ospi_flash_get_xip_base();
+    #endif
+
+    if (cmd == MP_VFS_ROM_IOCTL_WRITE_PREPARE) {
+        if (n_args < 3) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+        uint32_t dest = romfs_base;
+        uint32_t dest_max = dest + mp_obj_get_int(args[2]);
+        if (dest_max > romfs_base + romfs_len) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+
+        if (mram_is_valid_addr(dest)) {
+            // No preparation needed for MRAM.
+            // Return the minimum write size.
+            return MP_OBJ_NEW_SMALL_INT(MRAM_SECTOR_SIZE);
+        }
+
+        #if MICROPY_HW_ENABLE_OSPI
+        if (ospi_is_valid_addr(ospi_base, dest)) {
+            // Erase OSPI flash.
+            dest -= ospi_base;
+            dest_max -= ospi_base;
+            while (dest < dest_max) {
+                int ret = ospi_flash_erase_sector(dest);
+                mp_event_handle_nowait();
+                if (ret < 0) {
+                    return MP_OBJ_NEW_SMALL_INT(ret);
+                }
+                dest += MICROPY_HW_FLASH_BLOCK_SIZE_BYTES;
+            }
+            // Return the minimum write size.
+            return MP_OBJ_NEW_SMALL_INT(4);
+        }
+        #endif
+    }
+
+    if (cmd == MP_VFS_ROM_IOCTL_WRITE) {
+        if (n_args < 4) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+        uint32_t dest = romfs_base + mp_obj_get_int(args[2]);
+        mp_buffer_info_t bufinfo;
+        mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
+        if (dest + bufinfo.len > romfs_base + romfs_len) {
+            return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+        }
+
+        if (mram_is_valid_addr(dest)) {
+            // Write data to MRAM.
+            mpu_config_mram(false);
+            const uint8_t *src = bufinfo.buf;
+            const uint8_t *max = src + bufinfo.len;
+            while (src < max) {
+                mram_write_128bit((uint8_t *)dest, src);
+                dest += MRAM_SECTOR_SIZE;
+                src += MRAM_SECTOR_SIZE;
+            }
+            mpu_config_mram(true);
+            return MP_OBJ_NEW_SMALL_INT(0); // success
+        }
+
+        #if MICROPY_HW_ENABLE_OSPI
+        if (ospi_is_valid_addr(ospi_base, dest)) {
+            // Write data to OSPI flash.
+            dest -= ospi_base;
+            int ret = ospi_flash_write(dest, bufinfo.len, bufinfo.buf);
+            mp_event_handle_nowait();
+            return MP_OBJ_NEW_SMALL_INT(ret);
+        }
+        #endif
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+}
+
+#endif // MICROPY_VFS_ROM_IOCTL

From d1b12cb6766d8b48d0e8cdf551808c324d0599c1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 Mar 2025 23:19:47 +1100
Subject: [PATCH 2097/3129] alif/modules: Make HE core set /rom as current dir.

This allows HE to execute code from the ROMFS in MRAM.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/modules/he/_boot.py | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/ports/alif/modules/he/_boot.py b/ports/alif/modules/he/_boot.py
index bc1320f190694..3df1804709073 100644
--- a/ports/alif/modules/he/_boot.py
+++ b/ports/alif/modules/he/_boot.py
@@ -1,21 +1,7 @@
-import openamp
-import time
-from machine import Pin
+# Change working directory to ROMFS, so boot.py and main.py can run from there.
+try:
+    import os
 
-
-def ept_recv_callback(src_addr, data):
-    print("Received message on endpoint", data)
-
-
-# Create a new RPMsg endpoint to communicate with main core.
-ept = openamp.Endpoint("vuart-channel", callback=ept_recv_callback)
-
-pin = Pin("LED_BLUE", Pin.OUT)
-
-count = 0
-while True:
-    if ept.is_ready():
-        ept.send("Hello from HE %d" % count, timeout=1000)
-        count += 1
-    time.sleep_ms(100)
-    pin(not pin())
+    os.chdir("/rom")
+except:
+    pass

From 4f2a8bd99f81f88fd173aa717523345ba32083e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Oct 2024 16:25:22 +1100
Subject: [PATCH 2098/3129] alif/mphalport: Add mp_hal_pin_config_irq_falling
 helper.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mphalport.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
index 3b23cb6a2c514..5f1e3fff8296e 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -155,6 +155,16 @@ static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
     gpio_set_direction_output(pin->gpio, pin->pin);
 }
 
+static inline void mp_hal_pin_config_irq_falling(mp_hal_pin_obj_t pin, bool enable) {
+    if (enable) {
+        gpio_enable_interrupt(pin->gpio, pin->pin);
+        gpio_interrupt_set_edge_trigger(pin->gpio, pin->pin);
+        gpio_interrupt_set_polarity_low(pin->gpio, pin->pin);
+    } else {
+        gpio_disable_interrupt(pin->gpio, pin->pin);
+    }
+}
+
 static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) {
     gpio_set_value_low(pin->gpio, pin->pin);
 }

From 411146b0ed0fa2d70fc13264b1bd2cda9045c99e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Oct 2024 21:48:51 +1100
Subject: [PATCH 2099/3129] alif/mpuart: Generalise UART driver to suppot all
 UART instances.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/main.c         |   2 +-
 ports/alif/mpconfigport.h |   2 +-
 ports/alif/mphalport.c    |   2 +-
 ports/alif/mpuart.c       | 294 ++++++++++++++++++++++++++++++--------
 ports/alif/mpuart.h       |  17 ++-
 5 files changed, 251 insertions(+), 66 deletions(-)

diff --git a/ports/alif/main.c b/ports/alif/main.c
index 793425fff2e74..77e413e1eb492 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -66,7 +66,7 @@ int main(void) {
     MICROPY_BOARD_EARLY_INIT();
 
     #if MICROPY_HW_ENABLE_UART_REPL
-    mp_uart_init();
+    mp_uart_init_repl();
     #endif
     #if MICROPY_HW_ENABLE_OSPI
     if (ospi_flash_init() != 0) {
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 33f300641fbba..a5fd4f6dbfa87 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -73,7 +73,7 @@
 #define MICROPY_HW_USB_PID                      (0x9802) // interface has CDC only
 #endif
 #ifndef MICROPY_HW_ENABLE_UART_REPL
-#define MICROPY_HW_ENABLE_UART_REPL             (CORE_M55_HP) // useful if there is no USB
+#define MICROPY_HW_ENABLE_UART_REPL             (0)
 #endif
 #define MICROPY_HW_FLASH_BLOCK_SIZE_BYTES       (4096)
 
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index 1a6136c31abeb..8f7780bb8acdf 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -91,7 +91,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     #endif
 
     #if MICROPY_HW_ENABLE_UART_REPL
-    mp_uart_write_strn(str, len);
+    mp_uart_write_strn_repl(str, len);
     did_write = true;
     #endif
 
diff --git a/ports/alif/mpuart.c b/ports/alif/mpuart.c
index 69734659a4101..7f14ff5444702 100644
--- a/ports/alif/mpuart.c
+++ b/ports/alif/mpuart.c
@@ -24,88 +24,260 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
-#include "py/runtime.h"
 #include "py/mphal.h"
+#include "py/runtime.h"
 #include "mpuart.h"
 
-#if MICROPY_HW_ENABLE_UART_REPL
-
-#include "pinconf.h"
 #include "sys_ctrl_uart.h"
 #include "uart.h"
 
-#define TX_PIN pin_P12_2
-#define RX_PIN pin_P12_1
-#define UART_ID 4
-#define UART_IRQN UART4_IRQ_IRQn
-#define UART_PTR ((UART_Type *)UART4_BASE)
-#define BAUDRATE 115200
-#define SYST_PCLK 100000000
-
-static UART_TRANSFER transfer;
-
-void mp_uart_init(void) {
-    mp_hal_pin_config(TX_PIN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_UART, false);
-    mp_hal_pin_config(RX_PIN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_UART, true);
-    select_uart_clock_syst_pclk(UART_ID);
-    enable_uart_clock(UART_ID);
-    uart_software_reset(UART_PTR);
-    uart_enable_fifo(UART_PTR);
-    uart_disable_tx_irq(UART_PTR);
-    uart_disable_rx_irq(UART_PTR);
-    uart_set_baudrate(UART_PTR, SYST_PCLK, BAUDRATE);
-    uart_set_data_parity_stop_bits(UART_PTR, UART_DATA_BITS_8, UART_PARITY_NONE, UART_STOP_BITS_1);
-    uart_set_flow_control(UART_PTR, UART_FLOW_CONTROL_NONE);
-    NVIC_ClearPendingIRQ(UART_IRQN);
-    NVIC_SetPriority(UART_IRQN, IRQ_PRI_UART_REPL);
-    NVIC_EnableIRQ(UART_IRQN);
-    uart_set_tx_trigger(UART_PTR, UART_TX_FIFO_EMPTY);
-    uart_set_rx_trigger(UART_PTR, UART_RX_ONE_CHAR_IN_FIFO);
-    uart_enable_rx_irq(UART_PTR);
+#define UART_MAX (8)
+#define SYST_PCLK (100000000)
+
+typedef struct _uart_state_t {
+    UART_TRANSFER_STATUS status;
+    ringbuf_t *rx_ringbuf;
+    const uint8_t *tx_src;
+    const uint8_t *tx_src_max;
+    void (*irq_callback)(void);
+} uart_state_t;
+
+static const uint8_t uart_irqn[UART_MAX] = {
+    UART0_IRQ_IRQn,
+    UART1_IRQ_IRQn,
+    UART2_IRQ_IRQn,
+    UART3_IRQ_IRQn,
+    UART4_IRQ_IRQn,
+    UART5_IRQ_IRQn,
+    UART6_IRQ_IRQn,
+    UART7_IRQ_IRQn,
+};
+
+static UART_Type *const uart_periph[UART_MAX] = {
+    (UART_Type *)UART0_BASE,
+    (UART_Type *)UART1_BASE,
+    (UART_Type *)UART2_BASE,
+    (UART_Type *)UART3_BASE,
+    (UART_Type *)UART4_BASE,
+    (UART_Type *)UART5_BASE,
+    (UART_Type *)UART6_BASE,
+    (UART_Type *)UART7_BASE,
+};
+
+static uart_state_t uart_state[UART_MAX];
+
+void mp_uart_init(unsigned int uart_id, uint32_t baudrate, mp_hal_pin_obj_t tx, mp_hal_pin_obj_t rx, ringbuf_t *rx_ringbuf) {
+    UART_Type *uart = uart_periph[uart_id];
+    uart_state_t *state = &uart_state[uart_id];
+
+    // Configure TX/RX pins.
+    mp_hal_pin_config(tx, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, false);
+    mp_hal_pin_config(rx, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, true);
+
+    // Configure the UART peripheral.
+    select_uart_clock_syst_pclk(uart_id);
+    enable_uart_clock(uart_id);
+    uart_software_reset(uart);
+    uart_enable_fifo(uart);
+    uart_disable_tx_irq(uart);
+    uart_disable_rx_irq(uart);
+    uart_set_baudrate(uart, SYST_PCLK, baudrate);
+    uart_set_data_parity_stop_bits(uart, UART_DATA_BITS_8, UART_PARITY_NONE, UART_STOP_BITS_1);
+    uart_set_flow_control(uart, UART_FLOW_CONTROL_NONE);
+    uart->UART_FCR |= UART_FCR_RCVR_FIFO_RESET;
+    uart_set_tx_trigger(uart, UART_TX_FIFO_EMPTY);
+    uart_set_rx_trigger(uart, UART_RX_ONE_CHAR_IN_FIFO);
+
+    // Initialise the state.
+    state->status = UART_TRANSFER_STATUS_NONE;
+    state->rx_ringbuf = rx_ringbuf;
+    state->tx_src = NULL;
+    state->tx_src_max = NULL;
+    state->irq_callback = NULL;
+
+    // Enable interrupts.
+    NVIC_ClearPendingIRQ(uart_irqn[uart_id]);
+    NVIC_SetPriority(uart_irqn[uart_id], IRQ_PRI_UART_REPL);
+    NVIC_EnableIRQ(uart_irqn[uart_id]);
+    uart_enable_rx_irq(uart);
+}
+
+void mp_uart_deinit(unsigned int uart_id) {
+    UART_Type *uart = uart_periph[uart_id];
+
+    uart_disable_rx_irq(uart);
+    NVIC_DisableIRQ(uart_irqn[uart_id]);
+}
+
+void mp_uart_set_irq_callback(unsigned int uart_id, void (*callback)(void)) {
+    uart_state_t *state = &uart_state[uart_id];
+    state->irq_callback = callback;
 }
 
-void mp_uart_write_strn(const char *str, size_t len) {
-    memset(&transfer, 0, sizeof(transfer));
-    transfer.tx_buf = (uint8_t *)str;
-    transfer.tx_total_num = len;
-    transfer.tx_curr_cnt = 0U;
-    transfer.status = UART_TRANSFER_STATUS_NONE;
+void mp_uart_set_flow(unsigned int uart_id, mp_hal_pin_obj_t rts, mp_hal_pin_obj_t cts) {
+    UART_Type *uart = uart_periph[uart_id];
 
-    uart_enable_tx_irq(UART_PTR);
+    unsigned int flow = UART_FLOW_CONTROL_NONE;
+    if (rts != NULL) {
+        flow |= UART_FLOW_CONTROL_RTS;
+        mp_hal_pin_config(rts, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, false);
+    }
+    if (cts != NULL) {
+        flow |= UART_FLOW_CONTROL_CTS;
+        mp_hal_pin_config(cts, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, true);
+    }
+    uart_set_flow_control(uart, flow);
+}
+
+void mp_uart_set_baudrate(unsigned int uart_id, uint32_t baudrate) {
+    UART_Type *uart = uart_periph[uart_id];
+
+    uart_set_baudrate(uart, SYST_PCLK, baudrate);
+}
+
+size_t mp_uart_rx_any(unsigned int uart_id) {
+    uart_state_t *state = &uart_state[uart_id];
+    if (state->rx_ringbuf != NULL) {
+        return ringbuf_avail(state->rx_ringbuf);
+    }
+    return 0;
+}
 
+int mp_uart_rx_char(unsigned int uart_id) {
+    uart_state_t *state = &uart_state[uart_id];
+    if (state->rx_ringbuf != NULL && ringbuf_avail(state->rx_ringbuf)) {
+        return ringbuf_get(state->rx_ringbuf);
+    }
+    return -1;
+}
+
+void mp_uart_tx_data_blocking(unsigned int uart_id, const uint8_t *src, size_t len) {
+    UART_Type *uart = uart_periph[uart_id];
+
+    for (size_t i = 0; i < len; ++i) {
+        for (;;) {
+            size_t tx_avail = UART_FIFO_DEPTH - uart->UART_TFL;
+            if (tx_avail > 0) {
+                break;
+            }
+            mp_event_handle_nowait();
+        }
+        uart->UART_THR = src[i];
+    }
+}
+
+void mp_uart_tx_data(unsigned int uart_id, const uint8_t *src, size_t len) {
+    UART_Type *uart = uart_periph[uart_id];
+
+    // Configure transmission, to be handled by IRQ.
+    uart_state_t *state = &uart_state[uart_id];
+    state->status = UART_TRANSFER_STATUS_NONE;
+    state->tx_src = src;
+    state->tx_src_max = src + len;
+
+    // Enable TX IRQ to start transmission.
+    uart_enable_tx_irq(uart);
+
+    // Wait for transfer to complete.
+    const uint32_t total_timeout_ms = 100 * len;
     uint32_t start = mp_hal_ticks_ms();
-    while (transfer.status == UART_TRANSFER_STATUS_NONE) {
-        if (mp_hal_ticks_ms() - start > 10 * len) {
+    while (state->status == UART_TRANSFER_STATUS_NONE) {
+        if (mp_hal_ticks_ms() - start > total_timeout_ms) {
             break;
         }
-        __WFE();
+        mp_event_wait_indefinite();
     }
-    uart_disable_tx_irq(UART_PTR);
+
+    // Disable TX IRQ.
+    uart_disable_tx_irq(uart);
 }
 
-void UART4_IRQHandler(void) {
-    if (UART_PTR->UART_RFL) {
-        for (;;) {
-            uint32_t rx_fifo_available_cnt = UART_PTR->UART_RFL;
-            if (rx_fifo_available_cnt == 0) {
-                break;
+static void mp_uart_irq_handler(unsigned int uart_id) {
+    UART_Type *uart = uart_periph[uart_id];
+    uart_state_t *state = &uart_state[uart_id];
+
+    // Process pending interrupt (below is order of highest to lowest priority).
+    uint32_t iir = uart->UART_IIR & UART_IIR_INTERRUPT_ID_MASK;
+    switch (iir) {
+        case UART_IIR_RECEIVER_LINE_STATUS: {
+            uint32_t lsr = uart->UART_LSR;
+            if (lsr & (UART_LSR_RECEIVER_FIFO_ERR | UART_LSR_OVERRUN_ERR)) {
+                state->status = UART_TRANSFER_STATUS_ERROR;
             }
-            for (uint32_t i = 0; i < rx_fifo_available_cnt; ++i) {
-                int c = UART_PTR->UART_RBR;
-                #if MICROPY_KBD_EXCEPTION
-                if (c == mp_interrupt_char) {
-                    mp_sched_keyboard_interrupt();
-                    continue;
+            break;
+        }
+
+        case UART_IIR_RECEIVED_DATA_AVAILABLE:
+        case UART_IIR_CHARACTER_TIMEOUT:
+            while (uart->UART_USR & UART_USR_RECEIVE_FIFO_NOT_EMPTY) {
+                for (uint32_t rfl = uart->UART_RFL; rfl; --rfl) {
+                    int c = uart->UART_RBR;
+                    #if MICROPY_HW_ENABLE_UART_REPL && MICROPY_KBD_EXCEPTION
+                    if (uart_id == MICROPY_HW_UART_REPL) {
+                        if (c == mp_interrupt_char) {
+                            mp_sched_keyboard_interrupt();
+                            continue;
+                        }
+                    }
+                    #endif
+                    if (state->rx_ringbuf != NULL) {
+                        ringbuf_put(state->rx_ringbuf, c);
+                    }
                 }
-                #endif
-                ringbuf_put(&stdin_ringbuf, c);
             }
-        }
-    } else {
-        uart_irq_handler(UART_PTR, &transfer);
+
+            if (iir == UART_IIR_CHARACTER_TIMEOUT) {
+                if (state->irq_callback != NULL) {
+                    state->irq_callback();
+                }
+            }
+
+            break;
+
+        case UART_IIR_TRANSMIT_HOLDING_REG_EMPTY:
+            while (uart->UART_USR & UART_USR_TRANSMIT_FIFO_NOT_FULL) {
+                if (state->tx_src < state->tx_src_max) {
+                    uart->UART_THR = *state->tx_src++;
+                } else {
+                    uart_disable_tx_irq(uart);
+                    state->status = UART_TRANSFER_STATUS_SEND_COMPLETE;
+                    break;
+                }
+            }
+            break;
+
+        case UART_IIR_MODEM_STATUS:
+            (void)uart->UART_MSR;
+            break;
     }
+
     __SEV();
 }
 
+#define DEFINE_IRQ_HANDLER(id) \
+    void UART##id##_IRQHandler(void) { \
+        mp_uart_irq_handler(id); \
+    }
+
+DEFINE_IRQ_HANDLER(0)
+DEFINE_IRQ_HANDLER(1)
+DEFINE_IRQ_HANDLER(2)
+DEFINE_IRQ_HANDLER(3)
+DEFINE_IRQ_HANDLER(4)
+DEFINE_IRQ_HANDLER(5)
+DEFINE_IRQ_HANDLER(6)
+DEFINE_IRQ_HANDLER(7)
+
+#if MICROPY_HW_ENABLE_UART_REPL
+
+#define REPL_BAUDRATE (115200)
+
+void mp_uart_init_repl(void) {
+    mp_uart_init(MICROPY_HW_UART_REPL, REPL_BAUDRATE, pin_REPL_UART_TX, pin_REPL_UART_RX, &stdin_ringbuf);
+}
+
+void mp_uart_write_strn_repl(const char *str, size_t len) {
+    mp_uart_tx_data(MICROPY_HW_UART_REPL, (const uint8_t *)str, len);
+}
+
 #endif
diff --git a/ports/alif/mpuart.h b/ports/alif/mpuart.h
index 0c2e510a94e7c..1c28da4627859 100644
--- a/ports/alif/mpuart.h
+++ b/ports/alif/mpuart.h
@@ -26,7 +26,20 @@
 #ifndef MICROPY_INCLUDED_ALIF2_UART_H
 #define MICROPY_INCLUDED_ALIF2_UART_H
 
-void mp_uart_init(void);
-void mp_uart_write_strn(const char *str, size_t len);
+#include "py/ringbuf.h"
+
+void mp_uart_init(unsigned int uart_id, uint32_t baudrate, mp_hal_pin_obj_t tx, mp_hal_pin_obj_t rx, ringbuf_t *rx_ringbuf);
+void mp_uart_deinit(unsigned int uart_id);
+
+void mp_uart_set_irq_callback(unsigned int uart_id, void (*callback)(void));
+void mp_uart_set_flow(unsigned int uart_id, mp_hal_pin_obj_t rts, mp_hal_pin_obj_t cts);
+void mp_uart_set_baudrate(unsigned int uart_id, uint32_t baudrate);
+
+size_t mp_uart_rx_any(unsigned int uart_id);
+int mp_uart_rx_char(unsigned int uart_id);
+void mp_uart_tx_data(unsigned int uart_id, const uint8_t *src, size_t len);
+
+void mp_uart_init_repl(void);
+void mp_uart_write_strn_repl(const char *str, size_t len);
 
 #endif // MICROPY_INCLUDED_ALIF2_UART_H

From 526c7eabcec97c5705ce43fe2e9588506c4a936a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Oct 2024 21:48:51 +1100
Subject: [PATCH 2100/3129] alif: Integrate lwIP and mbedTLS.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif.mk                       |  7 ++-
 ports/alif/boards/manifest.py            |  1 +
 ports/alif/lwip_inc/arch/cc.h            | 10 ++++
 ports/alif/lwip_inc/arch/sys_arch.h      |  1 +
 ports/alif/lwip_inc/lwipopts.h           | 60 +++++++++++++++++++++
 ports/alif/main.c                        | 17 ++++++
 ports/alif/mbedtls/mbedtls_config_port.h | 41 +++++++++++++++
 ports/alif/mbedtls/mbedtls_port.c        | 65 +++++++++++++++++++++++
 ports/alif/mpconfigport.h                |  4 ++
 ports/alif/mphalport.c                   | 30 +++++++++++
 ports/alif/mphalport.h                   | 19 +++++++
 ports/alif/mpnetworkport.c               | 66 ++++++++++++++++++++++++
 12 files changed, 320 insertions(+), 1 deletion(-)
 create mode 100644 ports/alif/lwip_inc/arch/cc.h
 create mode 100644 ports/alif/lwip_inc/arch/sys_arch.h
 create mode 100644 ports/alif/lwip_inc/lwipopts.h
 create mode 100644 ports/alif/mbedtls/mbedtls_config_port.h
 create mode 100644 ports/alif/mbedtls/mbedtls_port.c
 create mode 100644 ports/alif/mpnetworkport.c

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index f0ff8d91a53d9..e21fe74c46ec6 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -47,6 +47,7 @@ INC += -I$(ALIF_DFP_REL_HERE)/Device/core/$(MCU_CORE)/include/
 INC += -I$(ALIF_DFP_REL_HERE)/Device/$(MCU_SERIES)/$(MCU_VARIANT)/
 INC += -I$(TOP)/lib/tinyusb/src
 INC += -Itinyusb_port
+INC += -Ilwip_inc
 
 GEN_PIN_MKPINS = mcu/make-pins.py
 GEN_PIN_PREFIX = mcu/pins_prefix.c
@@ -122,6 +123,7 @@ SRC_C = \
 	main.c \
 	modalif.c \
 	mphalport.c \
+	mpnetworkport.c \
 	mpu.c \
 	mpuart.c \
 	msc_disk.c \
@@ -135,6 +137,10 @@ SRC_C = \
 	vfs_rom_ioctl.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
+ifeq ($(MICROPY_SSL_MBEDTLS),1)
+SRC_C += mbedtls/mbedtls_port.c
+endif
+
 ifeq ($(MICROPY_FLOAT_IMPL),float)
 LIBM_SRC_C += $(SRC_LIB_LIBM_C)
 LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
@@ -148,7 +154,6 @@ endif
 SHARED_SRC_C += $(addprefix shared/,\
 	libc/string0.c \
 	netutils/dhcpserver.c \
-	netutils/netutils.c \
 	netutils/trace.c \
 	readline/readline.c \
 	runtime/gchelper_native.c \
diff --git a/ports/alif/boards/manifest.py b/ports/alif/boards/manifest.py
index 1dc9e179acc14..834aa46702731 100644
--- a/ports/alif/boards/manifest.py
+++ b/ports/alif/boards/manifest.py
@@ -3,3 +3,4 @@
 require("dht")
 require("neopixel")
 require("onewire")
+require("bundle-networking")
diff --git a/ports/alif/lwip_inc/arch/cc.h b/ports/alif/lwip_inc/arch/cc.h
new file mode 100644
index 0000000000000..35d45afa71c8c
--- /dev/null
+++ b/ports/alif/lwip_inc/arch/cc.h
@@ -0,0 +1,10 @@
+#ifndef MICROPY_INCLUDED_ALIF_LWIP_ARCH_CC_H
+#define MICROPY_INCLUDED_ALIF_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_ALIF_LWIP_ARCH_CC_H
diff --git a/ports/alif/lwip_inc/arch/sys_arch.h b/ports/alif/lwip_inc/arch/sys_arch.h
new file mode 100644
index 0000000000000..8b1a393741c96
--- /dev/null
+++ b/ports/alif/lwip_inc/arch/sys_arch.h
@@ -0,0 +1 @@
+// empty
diff --git a/ports/alif/lwip_inc/lwipopts.h b/ports/alif/lwip_inc/lwipopts.h
new file mode 100644
index 0000000000000..c0622225e10de
--- /dev/null
+++ b/ports/alif/lwip_inc/lwipopts.h
@@ -0,0 +1,60 @@
+#ifndef MICROPY_INCLUDED_ALIF_LWIP_LWIPOPTS_H
+#define MICROPY_INCLUDED_ALIF_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
+#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_LOOPIF_MULTICAST           1
+#define LWIP_LOOPBACK_MAX_PBUFS         8
+
+#define LWIP_IPV6                       0
+#define LWIP_DHCP                       1
+#define LWIP_DHCP_CHECK_LINK_UP         1
+#define LWIP_DHCP_DOES_ACD_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 uint64_t se_services_rand64(void);
+#define LWIP_RAND() se_services_rand64()
+
+#define MEM_SIZE                        (16 * 1024)
+#define TCP_MSS                         (1460)
+#define TCP_OVERSIZE                    (TCP_MSS)
+#define TCP_WND                         (8 * TCP_MSS)
+#define TCP_SND_BUF                     (8 * TCP_MSS)
+#define TCP_SND_QUEUELEN                (2 * (TCP_SND_BUF / TCP_MSS))
+#define TCP_QUEUE_OOSEQ                 (1)
+#define MEMP_NUM_TCP_SEG                (2 * TCP_SND_QUEUELEN)
+
+typedef uint32_t sys_prot_t;
+
+#endif // MICROPY_INCLUDED_ALIF_LWIP_LWIPOPTS_H
diff --git a/ports/alif/main.c b/ports/alif/main.c
index 77e413e1eb492..15a77348cf7e3 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -30,6 +30,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/stackctrl.h"
+#include "extmod/modnetwork.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
@@ -42,6 +43,11 @@
 #include "se_services.h"
 #include "system_tick.h"
 
+#if MICROPY_PY_LWIP
+#include "lwip/init.h"
+#include "lwip/apps/mdns.h"
+#endif
+
 extern uint8_t __StackTop, __StackLimit;
 extern uint8_t __GcHeapStart, __GcHeapEnd;
 
@@ -83,6 +89,17 @@ int main(void) {
     mp_stack_set_limit(&__StackTop - &__StackLimit - 1024);
     gc_init(&__GcHeapStart, &__GcHeapEnd);
 
+    #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
+    mod_network_lwip_init();
+    #endif
+
     for (;;) {
         // Initialise MicroPython runtime.
         mp_init();
diff --git a/ports/alif/mbedtls/mbedtls_config_port.h b/ports/alif/mbedtls/mbedtls_config_port.h
new file mode 100644
index 0000000000000..d9566304d28b9
--- /dev/null
+++ b/ports/alif/mbedtls/mbedtls_config_port.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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
+
+// Time hook.
+#include <time.h>
+extern time_t alif_mbedtls_time(time_t *timer);
+#define MBEDTLS_PLATFORM_TIME_MACRO alif_mbedtls_time
+#define MBEDTLS_PLATFORM_MS_TIME_ALT undefined_and_unused
+
+// 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/alif/mbedtls/mbedtls_port.c b/ports/alif/mbedtls/mbedtls_port.c
new file mode 100644
index 0000000000000..a8c155e31ae65
--- /dev/null
+++ b/ports/alif/mbedtls/mbedtls_port.c
@@ -0,0 +1,65 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "se_services.h"
+#include "mbedtls_config_port.h"
+
+#if defined(MBEDTLS_HAVE_TIME)
+#include "shared/timeutils/timeutils.h"
+#include "mbedtls/platform_time.h"
+#endif
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
+    uint32_t val = 0;
+    int n = 0;
+    *olen = len;
+    while (len--) {
+        if (!n) {
+            val = se_services_rand64();
+            n = 4;
+        }
+        *output++ = val;
+        val >>= 8;
+        --n;
+    }
+    return 0;
+}
+
+#if defined(MBEDTLS_HAVE_TIME)
+
+time_t alif_mbedtls_time(time_t *timer) {
+    // TODO implement proper RTC time
+    unsigned int year = 2025;
+    unsigned int month = 1;
+    unsigned int date = 1;
+    unsigned int hours = 12;
+    unsigned int minutes = 0;
+    unsigned int seconds = 0;
+    return timeutils_seconds_since_epoch(year, month, date, hours, minutes, seconds);
+}
+
+#endif
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index a5fd4f6dbfa87..a437c1385cb0c 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -136,6 +136,10 @@
 #define MICROPY_PY_MACHINE_SPI                  (1)
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)
 #define MICROPY_PY_MACHINE_TIMER                (1)
+#define MICROPY_PY_NETWORK                      (CORE_M55_HP)
+#ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "mpy-alif"
+#endif
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_ROM                         (1)
 
diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index 8f7780bb8acdf..39528a4b9f272 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -38,6 +38,7 @@
 #include "tusb.h"
 #include "mpuart.h"
 #include "pendsv.h"
+#include "se_services.h"
 #include "system_tick.h"
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
@@ -237,3 +238,32 @@ void soft_timer_schedule_at_ms(uint32_t ticks_ms) {
 }
 
 #endif
+
+/*******************************************************************************/
+// 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[8];
+    se_services_get_unique_id(id);
+    buf[0] = 0x02; // LAA range
+    buf[1] = id[4];
+    buf[2] = id[3];
+    buf[3] = id[2];
+    buf[4] = id[1];
+    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/alif/mphalport.h b/ports/alif/mphalport.h
index 5f1e3fff8296e..2ba62db2d2e5a 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -39,6 +39,11 @@
 #define MICROPY_PY_PENDSV_REENTER atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state);
 
+// 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
+
 // Port level Wait-for-Event macro
 //
 // Do not use this macro directly, include py/runtime.h and
@@ -202,3 +207,17 @@ void mp_hal_pin_config(const machine_pin_obj_t *pin, uint32_t mode,
 
 // Include all the pin definitions.
 #include "genhdr/pins_board.h"
+
+/******************************************************************************/
+// Other HAL functions.
+
+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);
diff --git a/ports/alif/mpnetworkport.c b/ports/alif/mpnetworkport.c
new file mode 100644
index 0000000000000..312fadf08a9c3
--- /dev/null
+++ b/ports/alif/mpnetworkport.c
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/obj.h"
+
+#if MICROPY_PY_LWIP
+
+#include "shared/runtime/softtimer.h"
+#include "lwip/timeouts.h"
+
+// Poll lwIP every 64ms by default
+#define LWIP_TICK_RATE_MS 64
+
+// Soft timer for running lwIP in the background.
+static soft_timer_entry_t mp_network_soft_timer;
+
+u32_t sys_now(void) {
+    return mp_hal_ticks_ms();
+}
+
+// This is called by soft_timer and executes at PendSV level.
+static void mp_network_soft_timer_callback(soft_timer_entry_t *self) {
+    // Run the lwIP internal updates.
+    sys_check_timeouts();
+
+    #if LWIP_NETIF_LOOPBACK
+    netif_poll_all();
+    #endif
+}
+
+void mod_network_lwip_init(void) {
+    soft_timer_static_init(
+        &mp_network_soft_timer,
+        SOFT_TIMER_MODE_PERIODIC,
+        LWIP_TICK_RATE_MS,
+        mp_network_soft_timer_callback
+        );
+
+    soft_timer_reinsert(&mp_network_soft_timer, LWIP_TICK_RATE_MS);
+}
+
+#endif // MICROPY_PY_LWIP

From d6e33423da471ddcba91632f032b18c5a79e9880 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 10 Mar 2025 14:09:04 +1100
Subject: [PATCH 2101/3129] alif: Integrate cyw43 WLAN driver.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif.mk            |   3 +-
 ports/alif/cyw43_configport.h | 123 ++++++++++++++++++++++++++++
 ports/alif/cyw43_port_spi.c   | 150 ++++++++++++++++++++++++++++++++++
 ports/alif/irq.h              |   1 +
 ports/alif/main.c             |  15 ++++
 ports/alif/mpconfigport.h     |  15 ++++
 ports/alif/mpnetworkport.c    |  14 ++++
 ports/alif/pendsv.h           |   3 +
 8 files changed, 323 insertions(+), 1 deletion(-)
 create mode 100644 ports/alif/cyw43_configport.h
 create mode 100644 ports/alif/cyw43_port_spi.c

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index e21fe74c46ec6..179df67a58c30 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -115,6 +115,7 @@ SRC_O += \
 
 SRC_C = \
 	alif_flash.c \
+	cyw43_port_spi.c \
 	fatfs_port.c \
 	machine_pin.c \
 	machine_i2c.c \
@@ -196,12 +197,12 @@ ALIF_SRC_C += $(addprefix $(ALIF_DFP_REL_TOP)/,\
 	Device/core/$(MCU_CORE)/source/startup_$(MCU_CORE).c \
 	drivers/source/adc.c \
 	drivers/source/i2c.c \
-	drivers/source/spi.c \
 	drivers/source/mhu_driver.c \
 	drivers/source/mhu_receiver.c \
 	drivers/source/mhu_sender.c \
 	drivers/source/mram.c \
 	drivers/source/pinconf.c \
+	drivers/source/spi.c \
 	drivers/source/uart.c \
 	drivers/source/utimer.c \
 	ospi_xip/source/ospi/ospi_drv.c \
diff --git a/ports/alif/cyw43_configport.h b/ports/alif/cyw43_configport.h
new file mode 100644
index 0000000000000..b7e4ad702a599
--- /dev/null
+++ b/ports/alif/cyw43_configport.h
@@ -0,0 +1,123 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_ALIF_CYW43_CONFIGPORT_H
+#define MICROPY_INCLUDED_ALIF_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 "py/runtime.h"
+#include "extmod/modnetwork.h"
+#include "pendsv.h"
+
+#ifndef static_assert
+#define static_assert(expr, msg)        typedef int static_assert_##__LINE__[(expr) ? 1 : -1]
+#endif
+
+#define CYW43_USE_SPI                   (1)
+#define CYW43_LWIP                      (1)
+#define CYW43_USE_STATS                 (0)
+#define CYW43_PRINTF(...)               mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
+
+#if 0
+#define CYW43_VERBOSE_DEBUG             (1)
+#define CYW43_VDEBUG(...)               mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
+#define CYW43_DEBUG(...)                mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
+#define CYW43_INFO(...)                 mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
+#define CYW43_WARN(...)                 mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
+#endif
+
+#define CYW43_IOCTL_TIMEOUT_US          (1000000)
+#define CYW43_SLEEP_MAX                 (50)
+#define CYW43_NETUTILS                  (1)
+#define CYW43_CLEAR_SDIO_INT            (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_HOST_NAME                 mod_network_hostname_data
+
+#define CYW43_SDPCM_SEND_COMMON_WAIT    __WFE()
+#define CYW43_DO_IOCTL_WAIT             // __WFE()
+#define CYW43_EVENT_POLL_HOOK           mp_event_handle_nowait()
+
+#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         0
+
+#define CYW43_HAL_MAC_WLAN0             MP_HAL_MAC_WLAN0
+
+#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_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_PIN_WL_REG_ON             pin_WL_REG_ON
+#define CYW43_PIN_WL_IRQ                pin_WL_IRQ
+
+#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) {
+    mp_hal_delay_ms(ms);
+}
+
+static inline void cyw43_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint32_t alt) {
+    if (mode == MP_HAL_PIN_MODE_INPUT) {
+        mp_hal_pin_input(pin);
+    } else {
+        mp_hal_pin_output(pin);
+    }
+}
+
+static inline void cyw43_hal_pin_config_irq_falling(mp_hal_pin_obj_t pin, bool enable) {
+    mp_hal_pin_config_irq_falling(pin, enable);
+}
+
+#endif // MICROPY_INCLUDED_ALIF_CYW43_CONFIGPORT_H
diff --git a/ports/alif/cyw43_port_spi.c b/ports/alif/cyw43_port_spi.c
new file mode 100644
index 0000000000000..84d84b0e1de48
--- /dev/null
+++ b/ports/alif/cyw43_port_spi.c
@@ -0,0 +1,150 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_NETWORK_CYW43
+
+#include "lib/cyw43-driver/src/cyw43.h"
+#include "lib/cyw43-driver/src/cyw43_internal.h"
+#include "lib/cyw43-driver/src/cyw43_spi.h"
+
+#include "spi.h"
+#include "sys_ctrl_spi.h"
+
+// CYW43 is connected to SPI3.
+#define HW_SPI ((SPI_Type *)SPI3_BASE)
+#define SPI_BAUDRATE (16000000)
+#define SPI_RX_FIFO_SIZE (16)
+
+// WL_IRQ is on P9_6.
+#define WL_IRQ_IRQN (GPIO9_IRQ6_IRQn)
+#define WL_IRQ_HANDLER GPIO9_IRQ6Handler
+
+// Must run at IRQ priority above PendSV so it can wake cyw43-driver when PendSV is disabled.
+void WL_IRQ_HANDLER(void) {
+    if (gpio_read_int_rawstatus(pin_WL_IRQ->gpio, pin_WL_IRQ->pin)) {
+        gpio_interrupt_eoi(pin_WL_IRQ->gpio, pin_WL_IRQ->pin);
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
+        __SEV();
+    }
+}
+
+static void spi_bus_init(void) {
+    // Configure pins.
+    mp_hal_pin_output(pin_WL_CS);
+    mp_hal_pin_high(pin_WL_CS);
+    // NOTE: Alif recommends enabled input read for all SPI pins.
+    mp_hal_pin_config(pin_WL_SCLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
+    mp_hal_pin_config(pin_WL_MOSI, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
+    mp_hal_pin_config(pin_WL_MISO, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
+
+    // Starts out clock_polarity=1, clock_phase=0.
+    spi_mode_master(HW_SPI);
+    spi_set_bus_speed(HW_SPI, SPI_BAUDRATE, GetSystemAHBClock());
+    spi_set_mode(HW_SPI, SPI_MODE_2);
+    spi_set_protocol(HW_SPI, SPI_PROTO_SPI);
+    spi_set_dfs(HW_SPI, 8);
+    spi_set_tmod(HW_SPI, SPI_TMOD_TX_AND_RX);
+    spi_control_ss(HW_SPI, 0, SPI_SS_STATE_ENABLE);
+}
+
+int cyw43_spi_init(cyw43_int_t *self) {
+    spi_bus_init();
+
+    // Configure IRQ for WL_IRQ (active low input).
+    NVIC_SetPriority(WL_IRQ_IRQN, IRQ_PRI_CYW43);
+    NVIC_ClearPendingIRQ(WL_IRQ_IRQN);
+    NVIC_EnableIRQ(WL_IRQ_IRQN);
+
+    return 0;
+}
+
+void cyw43_spi_deinit(cyw43_int_t *self) {
+    // Disable clock, SS and SPI.
+    spi_mask_interrupts(HW_SPI);
+    spi_control_ss(HW_SPI, 0, 0);
+    spi_disable(HW_SPI);
+
+    // Disable SPI IRQ.
+    NVIC_DisableIRQ(WL_IRQ_IRQN);
+    NVIC_ClearPendingIRQ(WL_IRQ_IRQN);
+}
+
+void cyw43_spi_gpio_setup(void) {
+}
+
+void cyw43_spi_reset(void) {
+}
+
+void cyw43_spi_set_polarity(cyw43_int_t *self, int pol) {
+    (void)self;
+
+    if (pol == 0) {
+        spi_set_mode(HW_SPI, SPI_MODE_0);
+    } else {
+        spi_set_mode(HW_SPI, SPI_MODE_2);
+    }
+}
+
+// tx must not be NULL.
+// rx_len must be 0, or the same as tx_len.
+int cyw43_spi_transfer(cyw43_int_t *self, const uint8_t *tx, size_t tx_len, uint8_t *rx, size_t rx_len) {
+    (void)self;
+
+    if (tx_len == 0 && rx_len == 0) {
+        return 0;
+    }
+
+    mp_hal_pin_low(pin_WL_CS);
+
+    // Must read the same amount of data that is written out to SPI.
+    rx_len = tx_len;
+
+    while (tx_len || rx_len) {
+        // Only add data to the TX FIFO if:
+        // - there's data to add
+        // - and TX is not ahead of RX by more than the RX FIFO size
+        // - and there's space in the TX FIFO
+        if (tx_len && tx_len + SPI_RX_FIFO_SIZE > rx_len && (HW_SPI->SPI_SR & SPI_SR_TFNF) != 0) {
+            HW_SPI->SPI_DR[0] = *tx++;
+            --tx_len;
+        }
+
+        // Take data from the RX FIFO and store it into the output buffer (if given).
+        if (rx_len && (HW_SPI->SPI_SR & SPI_SR_RFNE) != 0) {
+            uint8_t data = HW_SPI->SPI_DR[0];
+            if (rx != NULL) {
+                *rx++ = data;
+            }
+            --rx_len;
+        }
+    }
+
+    mp_hal_pin_high(pin_WL_CS);
+
+    return 0;
+}
+
+#endif
diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index ed454adcb4657..08b8ef8086bc3 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -49,6 +49,7 @@
 #define IRQ_PRI_HWSEM           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 8, 0)
 #define IRQ_PRI_GPU             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 10, 0)
 #define IRQ_PRI_RTC             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 100, 0)
+#define IRQ_PRI_CYW43           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 126, 0)
 #define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
 
 // these states correspond to values from query_irq, enable_irq and disable_irq
diff --git a/ports/alif/main.c b/ports/alif/main.c
index 15a77348cf7e3..3bff8cf4ae9f8 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -47,6 +47,9 @@
 #include "lwip/init.h"
 #include "lwip/apps/mdns.h"
 #endif
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
 
 extern uint8_t __StackTop, __StackLimit;
 extern uint8_t __GcHeapStart, __GcHeapEnd;
@@ -100,6 +103,18 @@ int main(void) {
     mod_network_lwip_init();
     #endif
 
+    #if MICROPY_PY_NETWORK_CYW43
+    {
+        cyw43_init(&cyw43_state);
+        uint8_t buf[8];
+        memcpy(&buf[0], "ALIF", 4);
+        mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, (char *)&buf[4]);
+        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 *)"alif0123");
+    }
+    #endif
+
     for (;;) {
         // Initialise MicroPython runtime.
         mp_init();
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index a437c1385cb0c..76b603027fcf1 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -155,6 +155,21 @@
 #define MICROPY_FATFS_MAX_SS                    (MICROPY_HW_FLASH_BLOCK_SIZE_BYTES)
 #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
+
+#ifndef MICROPY_BOARD_NETWORK_INTERFACES
+#define MICROPY_BOARD_NETWORK_INTERFACES
+#endif
+
+#define MICROPY_PORT_NETWORK_INTERFACES \
+    MICROPY_HW_NIC_CYW43 \
+    MICROPY_BOARD_NETWORK_INTERFACES \
+
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
diff --git a/ports/alif/mpnetworkport.c b/ports/alif/mpnetworkport.c
index 312fadf08a9c3..40def7f7fd7e9 100644
--- a/ports/alif/mpnetworkport.c
+++ b/ports/alif/mpnetworkport.c
@@ -32,6 +32,10 @@
 #include "shared/runtime/softtimer.h"
 #include "lwip/timeouts.h"
 
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
+
 // Poll lwIP every 64ms by default
 #define LWIP_TICK_RATE_MS 64
 
@@ -50,6 +54,16 @@ static void mp_network_soft_timer_callback(soft_timer_entry_t *self) {
     #if LWIP_NETIF_LOOPBACK
     netif_poll_all();
     #endif
+
+    #if MICROPY_PY_NETWORK_CYW43
+    if (cyw43_poll) {
+        if (cyw43_sleep != 0) {
+            if (--cyw43_sleep == 0) {
+                cyw43_poll();
+            }
+        }
+    }
+    #endif
 }
 
 void mod_network_lwip_init(void) {
diff --git a/ports/alif/pendsv.h b/ports/alif/pendsv.h
index 43a4b7a853846..17d7e82dfc7e7 100644
--- a/ports/alif/pendsv.h
+++ b/ports/alif/pendsv.h
@@ -34,6 +34,9 @@
 
 enum {
     PENDSV_DISPATCH_SOFT_TIMER,
+    #if MICROPY_PY_NETWORK_CYW43
+    PENDSV_DISPATCH_CYW43,
+    #endif
     MICROPY_BOARD_PENDSV_ENTRIES
     PENDSV_DISPATCH_MAX
 };

From 30dfbe5dc0d8a8ce4af3724b9b2a49b60a323a31 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 10 Mar 2025 13:57:48 +1100
Subject: [PATCH 2102/3129] alif: Integrate cyw43 Bluetooth with NimBLE.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/alif.mk            |   4 +
 ports/alif/cyw43_configport.h |  18 +++++
 ports/alif/main.c             |   9 +++
 ports/alif/mpbthciport.c      | 140 ++++++++++++++++++++++++++++++++++
 ports/alif/mpbthciport.h      |  46 +++++++++++
 ports/alif/mpconfigport.h     |   6 ++
 ports/alif/mpnimbleport.c     |  78 +++++++++++++++++++
 ports/alif/mpnimbleport.h     |  32 ++++++++
 8 files changed, 333 insertions(+)
 create mode 100644 ports/alif/mpbthciport.c
 create mode 100644 ports/alif/mpbthciport.h
 create mode 100644 ports/alif/mpnimbleport.c
 create mode 100644 ports/alif/mpnimbleport.h

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 179df67a58c30..eee27b3b7d698 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -142,6 +142,10 @@ ifeq ($(MICROPY_SSL_MBEDTLS),1)
 SRC_C += mbedtls/mbedtls_port.c
 endif
 
+ifeq ($(MICROPY_PY_BLUETOOTH),1)
+SRC_C += mpbthciport.c mpnimbleport.c
+endif
+
 ifeq ($(MICROPY_FLOAT_IMPL),float)
 LIBM_SRC_C += $(SRC_LIB_LIBM_C)
 LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
diff --git a/ports/alif/cyw43_configport.h b/ports/alif/cyw43_configport.h
index b7e4ad702a599..4b5cce67132e9 100644
--- a/ports/alif/cyw43_configport.h
+++ b/ports/alif/cyw43_configport.h
@@ -32,6 +32,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "extmod/modnetwork.h"
+#include "extmod/mpbthci.h"
 #include "pendsv.h"
 
 #ifndef static_assert
@@ -39,6 +40,7 @@
 #endif
 
 #define CYW43_USE_SPI                   (1)
+#define CYW43_ENABLE_BLUETOOTH_OVER_UART (1)
 #define CYW43_LWIP                      (1)
 #define CYW43_USE_STATS                 (0)
 #define CYW43_PRINTF(...)               mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
@@ -78,6 +80,7 @@
 #define CYW43_HAL_PIN_PULL_NONE         0
 
 #define CYW43_HAL_MAC_WLAN0             MP_HAL_MAC_WLAN0
+#define CYW43_HAL_MAC_BDADDR            MP_HAL_MAC_BDADDR
 
 #define cyw43_hal_ticks_us              mp_hal_ticks_us
 #define cyw43_hal_ticks_ms              mp_hal_ticks_ms
@@ -87,6 +90,10 @@
 #define cyw43_hal_pin_low               mp_hal_pin_low
 #define cyw43_hal_pin_high              mp_hal_pin_high
 
+#define cyw43_hal_uart_set_baudrate     mp_bluetooth_hci_uart_set_baudrate
+#define cyw43_hal_uart_write            mp_bluetooth_hci_uart_write
+#define cyw43_hal_uart_readchar         mp_bluetooth_hci_uart_readchar
+
 #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
@@ -94,6 +101,11 @@
 #define CYW43_PIN_WL_REG_ON             pin_WL_REG_ON
 #define CYW43_PIN_WL_IRQ                pin_WL_IRQ
 
+#define CYW43_PIN_BT_REG_ON             pin_BT_REG_ON
+#define CYW43_PIN_BT_HOST_WAKE          pin_BT_HOST_WAKE
+#define CYW43_PIN_BT_DEV_WAKE           pin_BT_DEV_WAKE
+#define CYW43_PIN_BT_CTS                pin_BT_UART_CTS
+
 #define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
 
 void cyw43_post_poll_hook(void);
@@ -120,4 +132,10 @@ static inline void cyw43_hal_pin_config_irq_falling(mp_hal_pin_obj_t pin, bool e
     mp_hal_pin_config_irq_falling(pin, enable);
 }
 
+#define cyw43_bluetooth_controller_init mp_bluetooth_hci_controller_init
+#define cyw43_bluetooth_controller_deinit mp_bluetooth_hci_controller_deinit
+#define cyw43_bluetooth_controller_sleep_maybe mp_bluetooth_hci_controller_sleep_maybe
+#define cyw43_bluetooth_controller_woken mp_bluetooth_hci_controller_woken
+#define cyw43_bluetooth_controller_wakeup mp_bluetooth_hci_controller_wakeup
+
 #endif // MICROPY_INCLUDED_ALIF_CYW43_CONFIGPORT_H
diff --git a/ports/alif/main.c b/ports/alif/main.c
index 3bff8cf4ae9f8..fd35604cbc234 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -30,6 +30,7 @@
 #include "py/mperrno.h"
 #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"
@@ -37,6 +38,7 @@
 #include "shared/runtime/softtimer.h"
 #include "shared/tinyusb/mp_usbd.h"
 #include "tusb.h"
+#include "mpbthciport.h"
 #include "mpuart.h"
 #include "ospi_flash.h"
 #include "pendsv.h"
@@ -103,6 +105,10 @@ int main(void) {
     mod_network_lwip_init();
     #endif
 
+    #if MICROPY_PY_BLUETOOTH
+    mp_bluetooth_hci_init();
+    #endif
+
     #if MICROPY_PY_NETWORK_CYW43
     {
         cyw43_init(&cyw43_state);
@@ -154,6 +160,9 @@ int main(void) {
 
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        #if MICROPY_PY_BLUETOOTH
+        mp_bluetooth_deinit();
+        #endif
         soft_timer_deinit();
         gc_sweep_all();
         mp_deinit();
diff --git a/ports/alif/mpbthciport.c b/ports/alif/mpbthciport.c
new file mode 100644
index 0000000000000..a37c9621564a1
--- /dev/null
+++ b/ports/alif/mpbthciport.c
@@ -0,0 +1,140 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "py/runtime.h"
+#include "extmod/mpbthci.h"
+#include "shared/runtime/softtimer.h"
+#include "mpbthciport.h"
+
+#if MICROPY_PY_BLUETOOTH
+
+uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
+// Soft timer and scheduling node for scheduling a HCI poll.
+static soft_timer_entry_t mp_bluetooth_hci_soft_timer;
+static mp_sched_node_t mp_bluetooth_hci_sched_node;
+
+// 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) {
+    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) {
+    mp_bluetooth_hci_poll_now();
+}
+
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+    soft_timer_reinsert(&mp_bluetooth_hci_soft_timer, ms);
+}
+
+// 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 void run_events_scheduled_task(mp_sched_node_t *node) {
+    (void)node;
+    // This will process all buffered HCI UART data, and run any callouts or events.
+    mp_bluetooth_hci_poll();
+}
+
+// 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) {
+    mp_sched_schedule_node(&mp_bluetooth_hci_sched_node, run_events_scheduled_task);
+}
+
+/******************************************************************************/
+// HCI over UART
+
+#include "mpuart.h"
+
+static uint32_t hci_uart_id;
+static bool hci_uart_first_char;
+static uint8_t hci_rx_ringbuf_array[768];
+static ringbuf_t hci_rx_ringbuf = {
+    .buf = hci_rx_ringbuf_array,
+    .size = sizeof(hci_rx_ringbuf_array),
+    .iget = 0,
+    .iput = 0,
+};
+
+int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
+    hci_uart_id = port;
+    hci_uart_first_char = true;
+
+    // Initialise the UART.
+    mp_uart_init(hci_uart_id, baudrate, pin_BT_UART_TX, pin_BT_UART_RX, &hci_rx_ringbuf);
+    mp_uart_set_flow(hci_uart_id, pin_BT_UART_RTS, pin_BT_UART_CTS);
+    mp_uart_set_irq_callback(hci_uart_id, mp_bluetooth_hci_poll_now);
+
+    // Start the HCI polling to process any initial events/packets.
+    mp_bluetooth_hci_start_polling();
+
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_deinit(void) {
+    mp_uart_deinit(hci_uart_id);
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
+    mp_uart_set_baudrate(hci_uart_id, baudrate);
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
+    mp_bluetooth_hci_controller_wakeup();
+    mp_uart_tx_data(hci_uart_id, (void *)buf, len);
+    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) {
+    if (mp_uart_rx_any(hci_uart_id)) {
+        int c = mp_uart_rx_char(hci_uart_id);
+        if (hci_uart_first_char) {
+            if (c == 0) {
+                return -1;
+            }
+            hci_uart_first_char = false;
+        }
+        return c;
+    } else {
+        return -1;
+    }
+}
+
+#endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/alif/mpbthciport.h b/ports/alif/mpbthciport.h
new file mode 100644
index 0000000000000..65e9d1752a798
--- /dev/null
+++ b/ports/alif/mpbthciport.h
@@ -0,0 +1,46 @@
+/*
+ * 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_ALIF_MPBTHCIPORT_H
+#define MICROPY_INCLUDED_ALIF_MPBTHCIPORT_H
+
+#include "py/mpconfig.h"
+
+// Initialise the HCI subsystem (should be called once, early on).
+void mp_bluetooth_hci_init(void);
+
+// Call this to poll the HCI now.
+void mp_bluetooth_hci_poll_now(void);
+
+// Call this to poll the HCI after a certain timeout.
+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_ALIF_MPBTHCIPORT_H
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 76b603027fcf1..73abb8924c393 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -170,6 +170,12 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
     MICROPY_HW_NIC_CYW43 \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
+// 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;
+#define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
+#define MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS (1)
+
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
diff --git a/ports/alif/mpnimbleport.c b/ports/alif/mpnimbleport.c
new file mode 100644
index 0000000000000..8da5ce293c9bd
--- /dev/null
+++ b/ports/alif/mpnimbleport.c
@@ -0,0 +1,78 @@
+/*
+ * 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"
+
+#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"
+#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) {
+    __WFE();
+
+    // 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/alif/mpnimbleport.h b/ports/alif/mpnimbleport.h
new file mode 100644
index 0000000000000..150ec42da76d7
--- /dev/null
+++ b/ports/alif/mpnimbleport.h
@@ -0,0 +1,32 @@
+/*
+ * 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_ALIF_NIMBLE_PORT_H
+#define MICROPY_INCLUDED_ALIF_NIMBLE_PORT_H
+
+// To allow MICROPY_HW_BLE_UART_ID to be resolved.
+
+#endif // MICROPY_INCLUDED_ALIF_NIMBLE_PORT_H

From da46b4d7089e6b0be553798568bbdf9e7ea9368b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 13 Mar 2025 14:54:49 +0100
Subject: [PATCH 2103/3129] alif/mcu: Remove json config files.

They will be generated as part of the build.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/mcu/M55_DUAL_cfg.json | 26 --------------------------
 ports/alif/mcu/M55_HE_cfg.json   | 17 -----------------
 ports/alif/mcu/M55_HP_cfg.json   | 17 -----------------
 3 files changed, 60 deletions(-)
 delete mode 100644 ports/alif/mcu/M55_DUAL_cfg.json
 delete mode 100644 ports/alif/mcu/M55_HE_cfg.json
 delete mode 100644 ports/alif/mcu/M55_HP_cfg.json

diff --git a/ports/alif/mcu/M55_DUAL_cfg.json b/ports/alif/mcu/M55_DUAL_cfg.json
deleted file mode 100644
index 81beef5f03614..0000000000000
--- a/ports/alif/mcu/M55_DUAL_cfg.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "DEVICE": {
-    "disabled" : false,
-    "binary": "app-device-config.json",
-    "version" : "0.5.00",
-    "signed": false
-  },
-  "HP_APP": {
-    "disabled" : false,
-    "binary": "M55_HP/firmware.bin",
-    "mramAddress": "0x80020000",
-    "version": "1.0.0",
-    "cpu_id": "M55_HP",
-    "flags": ["boot"],
-    "signed": false
-  },
-  "HE_APP": {
-    "disabled" : false,
-    "binary": "M55_HE/firmware.bin",
-    "mramAddress": "0x80320000",
-    "version": "1.0.0",
-    "cpu_id": "M55_HE",
-    "flags": ["deferred"],
-    "signed": false
-  }
-}
diff --git a/ports/alif/mcu/M55_HE_cfg.json b/ports/alif/mcu/M55_HE_cfg.json
deleted file mode 100644
index 83898418043ec..0000000000000
--- a/ports/alif/mcu/M55_HE_cfg.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "DEVICE": {
-    "disabled" : false,
-    "binary": "app-device-config.json",
-    "version" : "0.5.00",
-    "signed": false
-  },
-  "HE_APP": {
-    "disabled" : false,
-    "binary": "M55_HE/firmware.bin",
-    "mramAddress": "0x80320000",
-    "version": "1.0.0",
-    "cpu_id": "M55_HE",
-    "flags": ["boot"],
-    "signed": false
-  }
-}
diff --git a/ports/alif/mcu/M55_HP_cfg.json b/ports/alif/mcu/M55_HP_cfg.json
deleted file mode 100644
index d6710f69c77b6..0000000000000
--- a/ports/alif/mcu/M55_HP_cfg.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "DEVICE": {
-    "disabled" : false,
-    "binary": "app-device-config.json",
-    "version" : "0.5.00",
-    "signed": false
-  },
-  "HP_APP": {
-    "disabled" : false,
-    "binary": "M55_HP/firmware.bin",
-    "mramAddress": "0x80020000",
-    "version": "1.0.0",
-    "cpu_id": "M55_HP",
-    "flags": ["boot"],
-    "signed": false
-  }
-}

From 19a4689c6b0b652f8d50be6b658adc649649d5d1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 13 Mar 2025 14:55:19 +0100
Subject: [PATCH 2104/3129] alif/mcu: Pre-process Alif ToC config file.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/Makefile             | 24 +++++++++++------
 ports/alif/mcu/alif_cfg.json.in | 47 +++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 ports/alif/mcu/alif_cfg.json.in

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index 7d6731dacf200..68706674365c1 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -20,10 +20,14 @@ JLINK_CMD_SUFFIX = \
 Reset\n\
 Exit
 
+ALIF_TOC_CONFIG = alif_cfg.json
+ALIF_TOC_APPS = $(BUILD)/$(ALIF_TOC_CONFIG)
+ALIF_TOC_CFLAGS += -DTOC_CFG_FILE=$(ALIF_TOOLKIT_CFG_FILE)
+
 ifeq ($(MCU_CORE),M55_HP)
 
-ALIF_TOC_CONFIG = mcu/M55_HP_cfg.json
-ALIF_TOC_APPS = $(BUILD)/M55_HP/firmware.bin
+ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HP_APP=1
+ALIF_TOC_APPS += $(BUILD)/M55_HP/firmware.bin
 JLINK_CMD = '\
 $(JLINK_CMD_PREFIX)\
 LoadFile "$(BUILD)/M55_HP/firmware.bin",0x80020000\n\
@@ -31,8 +35,8 @@ $(JLINK_CMD_SUFFIX)'
 
 else ifeq ($(MCU_CORE),M55_HE)
 
-ALIF_TOC_CONFIG = mcu/M55_HE_cfg.json
-ALIF_TOC_APPS = $(BUILD)/M55_HE/firmware.bin
+ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HE_APP=1
+ALIF_TOC_APPS += $(BUILD)/M55_HE/firmware.bin
 JLINK_CMD = '\
 $(JLINK_CMD_PREFIX)\
 LoadFile "$(BUILD)/M55_HE/firmware.bin",0x80320000\n\
@@ -40,8 +44,9 @@ $(JLINK_CMD_SUFFIX)'
 
 else ifeq ($(MCU_CORE),M55_DUAL)
 
-ALIF_TOC_CONFIG = mcu/M55_DUAL_cfg.json
-ALIF_TOC_APPS = $(BUILD)/M55_HP/firmware.bin $(BUILD)/M55_HE/firmware.bin
+ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HP_APP=1
+ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HE_APP=1
+ALIF_TOC_APPS += $(BUILD)/M55_HP/firmware.bin $(BUILD)/M55_HE/firmware.bin
 JLINK_CMD = '\
 $(JLINK_CMD_PREFIX)\
 LoadFile "$(BUILD)/M55_HP/firmware.bin",0x80020000\n\
@@ -81,10 +86,13 @@ $(BUILD)/M55_HP/firmware.bin:
 $(BUILD)/M55_HE/firmware.bin:
 	make -f alif.mk MCU_CORE=M55_HE MICROPY_PY_OPENAMP_MODE=1
 
+$(BUILD)/$(ALIF_TOC_CONFIG): mcu/$(ALIF_TOC_CONFIG).in | $(BUILD)
+	$(ECHO) "Preprocess toc config $@"
+	$(Q)$(CPP) -P -E $(ALIF_TOC_CFLAGS) - < mcu/$(ALIF_TOC_CONFIG).in > $@
+
 $(BUILD)/firmware.toc.bin: $(ALIF_TOC_APPS)
 	$(Q)python $(ALIF_TOOLS)/app-gen-toc.py \
-		--filename $(abspath $(ALIF_TOC_CONFIG)) \
-		--config-dir $(BOARD_DIR) \
+		--filename $(abspath $(BUILD)/$(ALIF_TOC_CONFIG)) \
 		--output-dir $(BUILD) \
 		--firmware-dir $(BUILD) \
 		--output $@
diff --git a/ports/alif/mcu/alif_cfg.json.in b/ports/alif/mcu/alif_cfg.json.in
new file mode 100644
index 0000000000000..7760bd91d2e43
--- /dev/null
+++ b/ports/alif/mcu/alif_cfg.json.in
@@ -0,0 +1,47 @@
+{
+  "DEVICE": {
+    "disabled" : false,
+    "binary": TOC_CFG_FILE,
+    "version" : "0.5.00",
+    "signed": false
+  },
+  "HP_BOOT": {
+    #if TOC_CORE_M55_HP_BOOT
+    "disabled" : false,
+    #else
+    "disabled" : true,
+    #endif
+    "binary": "bootloader.bin",
+    "mramAddress": "0x80000000",
+    "version": "1.0.0",
+    "cpu_id": "M55_HP",
+    "flags": ["boot"],
+    "signed": false
+  },
+  "HP_APP": {
+    #if TOC_CORE_M55_HP_APP
+    "disabled" : false,
+    #else
+    "disabled" : true,
+    #endif
+    "binary": "M55_HP/firmware.bin",
+    "mramAddress": "0x80020000",
+    "version": "1.0.0",
+    "cpu_id": "M55_HP",
+    "flags": ["boot"],
+    "signed": false
+  },
+  "HE_APP": {
+    #if TOC_CORE_M55_HE_APP
+    "disabled" : false,
+    #else
+    "disabled" : true,
+    #endif
+    "binary": "M55_HE/firmware.bin",
+    "mramAddress": "0x80320000",
+    "version": "1.0.0",
+    "cpu_id": "M55_HE",
+    "flags": ["deferred"],
+    "signed": false
+  }
+}

From 293e8db9d739c4e32420a48304ac9d2251e63570 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Mar 2025 13:19:07 +1100
Subject: [PATCH 2105/3129] alif/mpuart: Enhance UART to support
 bits/parity/stop and more IRQs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpbthciport.c | 10 ++++-
 ports/alif/mpuart.c      | 85 ++++++++++++++++++++++++++++++++++------
 ports/alif/mpuart.h      | 14 ++++++-
 3 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/ports/alif/mpbthciport.c b/ports/alif/mpbthciport.c
index a37c9621564a1..10a0505fe02d8 100644
--- a/ports/alif/mpbthciport.c
+++ b/ports/alif/mpbthciport.c
@@ -89,14 +89,20 @@ static ringbuf_t hci_rx_ringbuf = {
     .iput = 0,
 };
 
+static void mp_bluetooth_hci_uart_irq_callback(unsigned int uart_id, unsigned int trigger) {
+    if (trigger == MP_UART_IRQ_RXIDLE) {
+        mp_bluetooth_hci_poll_now();
+    }
+}
+
 int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     hci_uart_id = port;
     hci_uart_first_char = true;
 
     // Initialise the UART.
-    mp_uart_init(hci_uart_id, baudrate, pin_BT_UART_TX, pin_BT_UART_RX, &hci_rx_ringbuf);
+    mp_uart_init(hci_uart_id, baudrate, UART_DATA_BITS_8, UART_PARITY_NONE, UART_STOP_BITS_1, pin_BT_UART_TX, pin_BT_UART_RX, &hci_rx_ringbuf);
     mp_uart_set_flow(hci_uart_id, pin_BT_UART_RTS, pin_BT_UART_CTS);
-    mp_uart_set_irq_callback(hci_uart_id, mp_bluetooth_hci_poll_now);
+    mp_uart_set_irq_callback(hci_uart_id, MP_UART_IRQ_RXIDLE, mp_bluetooth_hci_uart_irq_callback);
 
     // Start the HCI polling to process any initial events/packets.
     mp_bluetooth_hci_start_polling();
diff --git a/ports/alif/mpuart.c b/ports/alif/mpuart.c
index 7f14ff5444702..4fe82ce123176 100644
--- a/ports/alif/mpuart.c
+++ b/ports/alif/mpuart.c
@@ -26,20 +26,28 @@
 
 #include "py/mphal.h"
 #include "py/runtime.h"
+#include "shared/runtime/softtimer.h"
 #include "mpuart.h"
-
 #include "sys_ctrl_uart.h"
-#include "uart.h"
 
-#define UART_MAX (8)
+#define mp_container_of(ptr, structure, member) (void *)((uintptr_t)(ptr) - offsetof(structure, member))
+
+#define UART_LSR_TEMT_Pos (6)
 #define SYST_PCLK (100000000)
 
+#define CALCULATE_BITS_PER_CHAR(data_bits, parity, stop_bits) \
+    (1 + ((data_bits) + 5) + ((parity) != UART_PARITY_NONE) + ((stop_bits) + 1))
+
 typedef struct _uart_state_t {
     UART_TRANSFER_STATUS status;
+    uint32_t baudrate;
+    uint32_t bits_per_char;
     ringbuf_t *rx_ringbuf;
     const uint8_t *tx_src;
     const uint8_t *tx_src_max;
-    void (*irq_callback)(void);
+    soft_timer_entry_t rx_idle_timer;
+    unsigned int irq_trigger;
+    void (*irq_callback)(unsigned int uart_id, unsigned int trigger);
 } uart_state_t;
 
 static const uint8_t uart_irqn[UART_MAX] = {
@@ -66,7 +74,19 @@ static UART_Type *const uart_periph[UART_MAX] = {
 
 static uart_state_t uart_state[UART_MAX];
 
-void mp_uart_init(unsigned int uart_id, uint32_t baudrate, mp_hal_pin_obj_t tx, mp_hal_pin_obj_t rx, ringbuf_t *rx_ringbuf) {
+// This is called by soft_timer and executes at IRQ_PRI_PENDSV.
+static void rx_idle_timer_callback(soft_timer_entry_t *self) {
+    uart_state_t *state = mp_container_of(self, uart_state_t, rx_idle_timer);
+    if (state->irq_callback != NULL && state->irq_trigger & MP_UART_IRQ_RXIDLE) {
+        unsigned int uart_id = state - &uart_state[0];
+        state->irq_callback(uart_id, MP_UART_IRQ_RXIDLE);
+    }
+}
+
+void mp_uart_init(unsigned int uart_id, uint32_t baudrate,
+    UART_DATA_BITS data_bits, UART_PARITY parity, UART_STOP_BITS stop_bits,
+    mp_hal_pin_obj_t tx, mp_hal_pin_obj_t rx, ringbuf_t *rx_ringbuf) {
+
     UART_Type *uart = uart_periph[uart_id];
     uart_state_t *state = &uart_state[uart_id];
 
@@ -82,17 +102,20 @@ void mp_uart_init(unsigned int uart_id, uint32_t baudrate, mp_hal_pin_obj_t tx,
     uart_disable_tx_irq(uart);
     uart_disable_rx_irq(uart);
     uart_set_baudrate(uart, SYST_PCLK, baudrate);
-    uart_set_data_parity_stop_bits(uart, UART_DATA_BITS_8, UART_PARITY_NONE, UART_STOP_BITS_1);
+    uart_set_data_parity_stop_bits(uart, data_bits, parity, stop_bits);
     uart_set_flow_control(uart, UART_FLOW_CONTROL_NONE);
     uart->UART_FCR |= UART_FCR_RCVR_FIFO_RESET;
     uart_set_tx_trigger(uart, UART_TX_FIFO_EMPTY);
-    uart_set_rx_trigger(uart, UART_RX_ONE_CHAR_IN_FIFO);
+    uart_set_rx_trigger(uart, UART_RX_FIFO_QUARTER_FULL);
 
     // Initialise the state.
     state->status = UART_TRANSFER_STATUS_NONE;
+    state->baudrate = baudrate;
+    state->bits_per_char = CALCULATE_BITS_PER_CHAR(data_bits, parity, stop_bits);
     state->rx_ringbuf = rx_ringbuf;
     state->tx_src = NULL;
     state->tx_src_max = NULL;
+    state->irq_trigger = 0;
     state->irq_callback = NULL;
 
     // Enable interrupts.
@@ -100,6 +123,8 @@ void mp_uart_init(unsigned int uart_id, uint32_t baudrate, mp_hal_pin_obj_t tx,
     NVIC_SetPriority(uart_irqn[uart_id], IRQ_PRI_UART_REPL);
     NVIC_EnableIRQ(uart_irqn[uart_id]);
     uart_enable_rx_irq(uart);
+
+    soft_timer_static_init(&state->rx_idle_timer, SOFT_TIMER_MODE_ONE_SHOT, 0, rx_idle_timer_callback);
 }
 
 void mp_uart_deinit(unsigned int uart_id) {
@@ -109,9 +134,16 @@ void mp_uart_deinit(unsigned int uart_id) {
     NVIC_DisableIRQ(uart_irqn[uart_id]);
 }
 
-void mp_uart_set_irq_callback(unsigned int uart_id, void (*callback)(void)) {
+void mp_uart_set_irq_callback(unsigned int uart_id, unsigned int trigger, void (*callback)(unsigned int uart_id, unsigned int trigger)) {
+    UART_Type *uart = uart_periph[uart_id];
     uart_state_t *state = &uart_state[uart_id];
+    state->irq_trigger = trigger;
     state->irq_callback = callback;
+    if (trigger & MP_UART_IRQ_RX) {
+        uart_set_rx_trigger(uart, UART_RX_ONE_CHAR_IN_FIFO);
+    } else {
+        uart_set_rx_trigger(uart, UART_RX_FIFO_QUARTER_FULL);
+    }
 }
 
 void mp_uart_set_flow(unsigned int uart_id, mp_hal_pin_obj_t rts, mp_hal_pin_obj_t cts) {
@@ -131,10 +163,20 @@ void mp_uart_set_flow(unsigned int uart_id, mp_hal_pin_obj_t rts, mp_hal_pin_obj
 
 void mp_uart_set_baudrate(unsigned int uart_id, uint32_t baudrate) {
     UART_Type *uart = uart_periph[uart_id];
+    uart_state_t *state = &uart_state[uart_id];
 
+    state->baudrate = baudrate;
     uart_set_baudrate(uart, SYST_PCLK, baudrate);
 }
 
+void mp_uart_set_bits_parity_stop(unsigned int uart_id, UART_DATA_BITS data_bits, UART_PARITY parity, UART_STOP_BITS stop_bits) {
+    UART_Type *uart = uart_periph[uart_id];
+    uart_state_t *state = &uart_state[uart_id];
+
+    state->bits_per_char = CALCULATE_BITS_PER_CHAR(data_bits, parity, stop_bits);
+    uart_set_data_parity_stop_bits(uart, data_bits, parity, stop_bits);
+}
+
 size_t mp_uart_rx_any(unsigned int uart_id) {
     uart_state_t *state = &uart_state[uart_id];
     if (state->rx_ringbuf != NULL) {
@@ -143,6 +185,11 @@ size_t mp_uart_rx_any(unsigned int uart_id) {
     return 0;
 }
 
+size_t mp_uart_tx_any(unsigned int uart_id) {
+    UART_Type *uart = uart_periph[uart_id];
+    return uart->UART_TFL + !((uart->UART_LSR >> UART_LSR_TEMT_Pos) & 1);
+}
+
 int mp_uart_rx_char(unsigned int uart_id) {
     uart_state_t *state = &uart_state[uart_id];
     if (state->rx_ringbuf != NULL && ringbuf_avail(state->rx_ringbuf)) {
@@ -208,9 +255,11 @@ static void mp_uart_irq_handler(unsigned int uart_id) {
         }
 
         case UART_IIR_RECEIVED_DATA_AVAILABLE:
-        case UART_IIR_CHARACTER_TIMEOUT:
+        case UART_IIR_CHARACTER_TIMEOUT: {
+            bool had_char = false;
             while (uart->UART_USR & UART_USR_RECEIVE_FIFO_NOT_EMPTY) {
                 for (uint32_t rfl = uart->UART_RFL; rfl; --rfl) {
+                    had_char = true;
                     int c = uart->UART_RBR;
                     #if MICROPY_HW_ENABLE_UART_REPL && MICROPY_KBD_EXCEPTION
                     if (uart_id == MICROPY_HW_UART_REPL) {
@@ -226,13 +275,18 @@ static void mp_uart_irq_handler(unsigned int uart_id) {
                 }
             }
 
-            if (iir == UART_IIR_CHARACTER_TIMEOUT) {
-                if (state->irq_callback != NULL) {
-                    state->irq_callback();
+            if (had_char) {
+                if (state->irq_callback != NULL && state->irq_trigger & MP_UART_IRQ_RX) {
+                    state->irq_callback(uart_id, MP_UART_IRQ_RX);
                 }
             }
 
+            if (state->irq_trigger & MP_UART_IRQ_RXIDLE) {
+                // Wait for 2 characters worth of time before triggering the RXIDLE event.
+                soft_timer_reinsert(&state->rx_idle_timer, 2000 * state->bits_per_char / state->baudrate + 1);
+            }
             break;
+        }
 
         case UART_IIR_TRANSMIT_HOLDING_REG_EMPTY:
             while (uart->UART_USR & UART_USR_TRANSMIT_FIFO_NOT_FULL) {
@@ -241,6 +295,9 @@ static void mp_uart_irq_handler(unsigned int uart_id) {
                 } else {
                     uart_disable_tx_irq(uart);
                     state->status = UART_TRANSFER_STATUS_SEND_COMPLETE;
+                    if (state->irq_callback != NULL && state->irq_trigger & MP_UART_IRQ_TXIDLE) {
+                        state->irq_callback(uart_id, MP_UART_IRQ_TXIDLE);
+                    }
                     break;
                 }
             }
@@ -273,7 +330,9 @@ DEFINE_IRQ_HANDLER(7)
 #define REPL_BAUDRATE (115200)
 
 void mp_uart_init_repl(void) {
-    mp_uart_init(MICROPY_HW_UART_REPL, REPL_BAUDRATE, pin_REPL_UART_TX, pin_REPL_UART_RX, &stdin_ringbuf);
+    mp_uart_init(MICROPY_HW_UART_REPL,
+        REPL_BAUDRATE, UART_DATA_BITS_8, UART_PARITY_NONE, UART_STOP_BITS_1,
+        pin_REPL_UART_TX, pin_REPL_UART_RX, &stdin_ringbuf);
 }
 
 void mp_uart_write_strn_repl(const char *str, size_t len) {
diff --git a/ports/alif/mpuart.h b/ports/alif/mpuart.h
index 1c28da4627859..76dadaab38015 100644
--- a/ports/alif/mpuart.h
+++ b/ports/alif/mpuart.h
@@ -27,15 +27,25 @@
 #define MICROPY_INCLUDED_ALIF2_UART_H
 
 #include "py/ringbuf.h"
+#include "uart.h"
 
-void mp_uart_init(unsigned int uart_id, uint32_t baudrate, mp_hal_pin_obj_t tx, mp_hal_pin_obj_t rx, ringbuf_t *rx_ringbuf);
+#define UART_MAX (8)
+#define MP_UART_IRQ_RX (1)
+#define MP_UART_IRQ_RXIDLE (2)
+#define MP_UART_IRQ_TXIDLE (4)
+
+void mp_uart_init(unsigned int uart_id, uint32_t baudrate,
+    UART_DATA_BITS data_bits, UART_PARITY parity, UART_STOP_BITS stop_bits,
+    mp_hal_pin_obj_t tx, mp_hal_pin_obj_t rx, ringbuf_t *rx_ringbuf);
 void mp_uart_deinit(unsigned int uart_id);
 
-void mp_uart_set_irq_callback(unsigned int uart_id, void (*callback)(void));
+void mp_uart_set_irq_callback(unsigned int uart_id, unsigned int trigger, void (*callback)(unsigned int uart_id, unsigned int trigger));
 void mp_uart_set_flow(unsigned int uart_id, mp_hal_pin_obj_t rts, mp_hal_pin_obj_t cts);
 void mp_uart_set_baudrate(unsigned int uart_id, uint32_t baudrate);
+void mp_uart_set_bits_parity_stop(unsigned int uart_id, UART_DATA_BITS data_bits, UART_PARITY parity, UART_STOP_BITS stop_bits);
 
 size_t mp_uart_rx_any(unsigned int uart_id);
+size_t mp_uart_tx_any(unsigned int uart_id);
 int mp_uart_rx_char(unsigned int uart_id);
 void mp_uart_tx_data(unsigned int uart_id, const uint8_t *src, size_t len);
 

From 29a873ec0778107bcc9b25b0ab8a32a7f9e5bba9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 Mar 2025 23:38:56 +1100
Subject: [PATCH 2106/3129] alif/machine_uart: Add machine.UART peripheral
 support.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/machine_uart.c | 560 ++++++++++++++++++++++++++++++++++++++
 ports/alif/mpconfigport.h |   3 +
 2 files changed, 563 insertions(+)
 create mode 100644 ports/alif/machine_uart.c

diff --git a/ports/alif/machine_uart.c b/ports/alif/machine_uart.c
new file mode 100644
index 0000000000000..746c86677f956
--- /dev/null
+++ b/ports/alif/machine_uart.c
@@ -0,0 +1,560 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 never compiled standalone, it's included directly from
+// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
+
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "mpuart.h"
+
+#define DEFAULT_UART_BAUDRATE (115200)
+#define DEFAULT_UART_BITS (8)
+#define DEFAULT_UART_PARITY (MP_ROM_NONE)
+#define DEFAULT_UART_STOP (1)
+#define DEFAULT_UART_RX_BUFFER_SIZE (256)
+
+typedef struct _machine_uart_obj_t {
+    mp_obj_base_t base;
+    unsigned int uart_id;
+    uint32_t baudrate;
+    UART_DATA_BITS bits;
+    UART_PARITY parity;
+    UART_STOP_BITS stop;
+    mp_hal_pin_obj_t tx;
+    mp_hal_pin_obj_t rx;
+    mp_hal_pin_obj_t rts;
+    mp_hal_pin_obj_t cts;
+    uint32_t flow;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
+    uint8_t *rx_ringbuf_array;
+    ringbuf_t rx_ringbuf;
+    uint32_t irq_flags;
+    uint32_t irq_trigger;
+    mp_irq_obj_t irq_obj;
+} machine_uart_obj_t;
+
+typedef struct _machine_uart_default_pins_t {
+    mp_hal_pin_obj_t tx;
+    mp_hal_pin_obj_t rx;
+    mp_hal_pin_obj_t rts;
+    mp_hal_pin_obj_t cts;
+} machine_uart_default_pins_t;
+
+static const machine_uart_default_pins_t machine_uart_default_pins[UART_MAX] = {
+    [0] = {
+        #if defined(MICROPY_HW_UART0_TX) && defined(MICROPY_HW_UART0_RX)
+        MICROPY_HW_UART0_TX, MICROPY_HW_UART0_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART0_RTS) && defined(MICROPY_HW_UART0_CTS)
+        MICROPY_HW_UART0_RTS, MICROPY_HW_UART0_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+    [1] = {
+        #if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)
+        MICROPY_HW_UART1_TX, MICROPY_HW_UART1_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART1_RTS) && defined(MICROPY_HW_UART1_CTS)
+        MICROPY_HW_UART1_RTS, MICROPY_HW_UART1_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+    [2] = {
+        #if defined(MICROPY_HW_UART2_TX) && defined(MICROPY_HW_UART2_RX)
+        MICROPY_HW_UART2_TX, MICROPY_HW_UART2_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART2_RTS) && defined(MICROPY_HW_UART2_CTS)
+        MICROPY_HW_UART2_RTS, MICROPY_HW_UART2_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+    [3] = {
+        #if defined(MICROPY_HW_UART3_TX) && defined(MICROPY_HW_UART3_RX)
+        MICROPY_HW_UART3_TX, MICROPY_HW_UART3_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART3_RTS) && defined(MICROPY_HW_UART3_CTS)
+        MICROPY_HW_UART3_RTS, MICROPY_HW_UART3_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+    [4] = {
+        #if defined(MICROPY_HW_UART4_TX) && defined(MICROPY_HW_UART4_RX)
+        MICROPY_HW_UART4_TX, MICROPY_HW_UART4_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART4_RTS) && defined(MICROPY_HW_UART4_CTS)
+        MICROPY_HW_UART4_RTS, MICROPY_HW_UART4_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+    [5] = {
+        #if defined(MICROPY_HW_UART5_TX) && defined(MICROPY_HW_UART5_RX)
+        MICROPY_HW_UART5_TX, MICROPY_HW_UART5_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART5_RTS) && defined(MICROPY_HW_UART5_CTS)
+        MICROPY_HW_UART5_RTS, MICROPY_HW_UART5_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+    [6] = {
+        #if defined(MICROPY_HW_UART6_TX) && defined(MICROPY_HW_UART6_RX)
+        MICROPY_HW_UART6_TX, MICROPY_HW_UART6_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART6_RTS) && defined(MICROPY_HW_UART6_CTS)
+        MICROPY_HW_UART6_RTS, MICROPY_HW_UART6_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+    [7] = {
+        #if defined(MICROPY_HW_UART7_TX) && defined(MICROPY_HW_UART7_RX)
+        MICROPY_HW_UART7_TX, MICROPY_HW_UART7_RX,
+        #else
+        NULL, NULL,
+        #endif
+        #if defined(MICROPY_HW_UART7_RTS) && defined(MICROPY_HW_UART7_CTS)
+        MICROPY_HW_UART7_RTS, MICROPY_HW_UART7_CTS,
+        #else
+        NULL, NULL,
+        #endif
+    },
+};
+
+static void machine_uart_irq_callback(unsigned int uart_id, unsigned int trigger);
+
+MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *machine_uart_obj_all[UART_MAX]);
+
+/******************************************************************************/
+// MicroPython bindings for UART
+
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_uart___del___obj) }, \
+    { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(UART_FLOW_CONTROL_RTS) }, \
+    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_FLOW_CONTROL_CTS) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(MP_UART_IRQ_RX) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(MP_UART_IRQ_RXIDLE) }, \
+    { MP_ROM_QSTR(MP_QSTR_IRQ_TXIDLE), MP_ROM_INT(MP_UART_IRQ_TXIDLE) }, \
+
+#define GET_PIN_WITH_DEFAULT(uart_id_, pin_name, pin_selection) \
+    (pin_selection == mp_const_none ? machine_uart_default_pins[uart_id_].pin_name : mp_hal_get_pin_obj(pin_selection))
+
+static void machine_uart_set_bits(machine_uart_obj_t *self, mp_int_t bits) {
+    if (!(5 <= bits && bits <= 8)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+    }
+    self->bits = UART_DATA_BITS_5 + (bits - 5);
+}
+
+static void machine_uart_set_parity(machine_uart_obj_t *self, mp_obj_t parity) {
+    if (parity == mp_const_none) {
+        self->parity = UART_PARITY_NONE;
+    } else if (mp_obj_get_int(parity) & 1) {
+        self->parity = UART_PARITY_ODD;
+    } else {
+        self->parity = UART_PARITY_EVEN;
+    }
+}
+
+static void machine_uart_set_stop(machine_uart_obj_t *self, mp_int_t stop) {
+    if (!(1 <= stop && stop <= 2)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid stop"));
+    }
+    self->stop = UART_STOP_BITS_1 + (stop - 1);
+}
+
+static void machine_uart_set_timeout_char(machine_uart_obj_t *self, mp_int_t timeout_char) {
+    // 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;
+    self->timeout_char = MAX(min_timeout_char, timeout_char);
+}
+
+static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    static const char *parity_name[] = {[UART_PARITY_NONE] = "None", [UART_PARITY_EVEN] = "0", [UART_PARITY_ODD] = "1"};
+
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    unsigned int bits = 5 + (self->bits - UART_DATA_BITS_5);
+    const char *parity = parity_name[self->parity];
+    unsigned int stop = 1 + (self->stop - UART_STOP_BITS_1);
+
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
+        "tx=%q, rx=%q, ",
+        self->uart_id, self->baudrate, bits, parity, stop,
+        mp_hal_pin_name(self->tx), mp_hal_pin_name(self->rx));
+    if (self->rts != NULL) {
+        mp_printf(print, "rts=%q, ", mp_hal_pin_name(self->rts));
+    }
+    if (self->cts != NULL) {
+        mp_printf(print, "cts=%q, ", mp_hal_pin_name(self->cts));
+    }
+    mp_printf(print, "flow=", self->rts);
+    if (self->flow == 0) {
+        mp_printf(print, "0");
+    } else {
+        if (self->flow & UART_FLOW_CONTROL_RTS) {
+            mp_printf(print, "RTS");
+            if (self->flow & UART_FLOW_CONTROL_CTS) {
+                mp_printf(print, "|");
+            }
+        }
+        if (self->flow & UART_FLOW_CONTROL_CTS) {
+            mp_printf(print, "CTS");
+        }
+    }
+    mp_printf(print, ", timeout=%u, timeout_char=%u, rxbuf=%u)",
+        self->timeout, self->timeout_char, self->rx_ringbuf.size - 1);
+}
+
+static mp_obj_t mp_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_rts, ARG_cts,
+        ARG_flow, ARG_timeout, ARG_timeout_char, ARG_rxbuf,
+    };
+    static const mp_arg_t allowed_args[] = {
+        #if !defined(MICROPY_HW_DEFAULT_UART_ID)
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
+        #else
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = MICROPY_HW_DEFAULT_UART_ID} },
+        #endif
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = DEFAULT_UART_BAUDRATE} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = DEFAULT_UART_BITS} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_rom_obj = DEFAULT_UART_PARITY} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = DEFAULT_UART_STOP} },
+        { 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_rts, 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_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 = DEFAULT_UART_RX_BUFFER_SIZE} },
+    };
+
+    // 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 = args[ARG_id].u_int;
+    if (uart_id < 0 || uart_id >= UART_MAX) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
+    }
+
+    machine_uart_obj_t *self;
+    bool need_init;
+    if (MP_STATE_PORT(machine_uart_obj_all)[uart_id] == NULL) {
+        // Create new UART object.
+        self = mp_obj_malloc_with_finaliser(machine_uart_obj_t, &machine_uart_type);
+        self->uart_id = uart_id;
+        need_init = true;
+    } else {
+        // Reference existing UART object.
+        self = MP_STATE_PORT(machine_uart_obj_all)[uart_id];
+        need_init = n_args > 1 || n_kw > 0;
+    }
+
+    if (need_init) {
+        // Set the UART parameters.
+        self->baudrate = args[ARG_baudrate].u_int;
+        machine_uart_set_bits(self, args[ARG_bits].u_int);
+        machine_uart_set_parity(self, args[ARG_parity].u_obj);
+        machine_uart_set_stop(self, args[ARG_stop].u_int);
+        self->tx = GET_PIN_WITH_DEFAULT(self->uart_id, tx, args[ARG_tx].u_obj);
+        self->rx = GET_PIN_WITH_DEFAULT(self->uart_id, rx, args[ARG_rx].u_obj);
+        self->rts = GET_PIN_WITH_DEFAULT(self->uart_id, rts, args[ARG_rts].u_obj);
+        self->cts = GET_PIN_WITH_DEFAULT(self->uart_id, cts, args[ARG_cts].u_obj);
+        self->flow = args[ARG_flow].u_int;
+        self->timeout = args[ARG_timeout].u_int;
+        uint32_t min_timeout_char = 13000 / self->baudrate + 1; // 13 bits to be safe
+        self->timeout = MAX(min_timeout_char, args[ARG_timeout_char].u_int);
+
+        // Check TX/RX pins are given.
+        if (self->tx == NULL) {
+            mp_raise_ValueError(MP_ERROR_TEXT("tx not given"));
+        }
+        if (self->rx == NULL) {
+            mp_raise_ValueError(MP_ERROR_TEXT("rx not given"));
+        }
+
+        // Configure flow control.
+        mp_hal_pin_obj_t rts = NULL;
+        mp_hal_pin_obj_t cts = NULL;
+        if (self->flow & UART_FLOW_CONTROL_RTS) {
+            if (self->rts == NULL) {
+                mp_raise_ValueError(MP_ERROR_TEXT("rts not given"));
+            }
+            rts = self->rts;
+        }
+        if (self->flow & UART_FLOW_CONTROL_CTS) {
+            if (self->cts == NULL) {
+                mp_raise_ValueError(MP_ERROR_TEXT("cts not given"));
+            }
+            cts = self->cts;
+        }
+
+        // Allocate the RX buffer.
+        size_t rxbuf_len = args[ARG_rxbuf].u_int;
+        self->rx_ringbuf_array = m_new(uint8_t, rxbuf_len + 1);
+        self->rx_ringbuf.buf = self->rx_ringbuf_array;
+        self->rx_ringbuf.size = rxbuf_len + 1;
+        self->rx_ringbuf.iput = 0;
+        self->rx_ringbuf.iget = 0;
+
+        // Reset the IRQ state
+        self->irq_flags = 0;
+        self->irq_trigger = 0;
+        self->irq_obj.base.type = NULL;
+
+        // Initialize the UART hardware.
+        mp_uart_init(self->uart_id, self->baudrate, self->bits, self->parity, self->stop, self->tx, self->rx, &self->rx_ringbuf);
+
+        mp_uart_set_flow(self->uart_id, rts, cts);
+    }
+
+    MP_STATE_PORT(machine_uart_obj_all)[uart_id] = self;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void mp_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,
+    };
+    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} },
+    };
+
+    // 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);
+
+    bool change_baudrate = false;
+    bool change_bits_parity_stop = false;
+
+    // Change baudrate if requested.
+    if (args[ARG_baudrate].u_int > 0) {
+        self->baudrate = args[ARG_baudrate].u_int;
+        change_baudrate = true;
+    }
+
+    // Change data bits if requested.
+    if (args[ARG_bits].u_int > 0) {
+        machine_uart_set_bits(self, args[ARG_bits].u_int);
+        change_bits_parity_stop = true;
+    }
+
+    // Change parity if requested.
+    if (args[ARG_parity].u_obj != MP_OBJ_NEW_SMALL_INT(-1)) {
+        machine_uart_set_parity(self, args[ARG_parity].u_obj);
+        change_bits_parity_stop = true;
+    }
+
+    // Change stop bits if requested.
+    if (args[ARG_stop].u_int > 0) {
+        machine_uart_set_stop(self, args[ARG_stop].u_int);
+        change_bits_parity_stop = true;
+    }
+
+    // Change timeout if requested.
+    if (args[ARG_timeout].u_int >= 0) {
+        self->timeout = args[ARG_timeout].u_int;
+    }
+
+    // Change timeout_char if requested.
+    if (args[ARG_timeout_char].u_int >= 0) {
+        machine_uart_set_timeout_char(self, args[ARG_timeout_char].u_int);
+    }
+
+    // Reconfigure the hardware parameters that have changed.
+    if (change_baudrate) {
+        mp_uart_set_baudrate(self->uart_id, self->baudrate);
+    }
+    if (change_bits_parity_stop) {
+        mp_uart_set_bits_parity_stop(self->uart_id, self->bits, self->parity, self->stop);
+    }
+}
+
+static mp_obj_t machine_uart___del__(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uart_deinit(self->uart_id);
+    MP_STATE_PORT(machine_uart_obj_all)[self->uart_id] = NULL;
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_uart___del___obj, machine_uart___del__);
+
+// Turn off the UART bus.
+static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+    mp_uart_deinit(self->uart_id);
+}
+
+// Return number of characters waiting.
+static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
+    return mp_uart_rx_any(self->uart_id);
+}
+
+// Since uart.write() waits up to the last byte, uart.txdone() always returns True.
+static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
+    return !!mp_uart_tx_any(self->uart_id);
+}
+
+// Change the trigger for the UART IRQ.
+static mp_uint_t machine_uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->irq_trigger = new_trigger;
+    mp_uart_set_irq_callback(self->uart_id, self->irq_trigger, machine_uart_irq_callback);
+    return 0;
+}
+
+// Get UART IRQ state.
+static mp_uint_t machine_uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return self->irq_flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return self->irq_trigger;
+    }
+    return 0;
+}
+
+static const mp_irq_methods_t machine_uart_irq_methods = {
+    .trigger = machine_uart_irq_trigger,
+    .info = machine_uart_irq_info,
+};
+
+// Retrieve and configure the UART IRQ object.
+static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+    if (self->irq_obj.base.type == NULL) {
+        mp_irq_init(&self->irq_obj, &machine_uart_irq_methods, MP_OBJ_FROM_PTR(self));
+    }
+
+    if (any_args) {
+        self->irq_obj.handler = args[MP_IRQ_ARG_INIT_handler].u_obj;
+        self->irq_obj.ishard = args[MP_IRQ_ARG_INIT_hard].u_bool;
+        machine_uart_irq_trigger(MP_OBJ_FROM_PTR(self), args[MP_IRQ_ARG_INIT_trigger].u_int);
+    }
+
+    return &self->irq_obj;
+}
+
+static mp_uint_t mp_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);
+    mp_uint_t start = mp_hal_ticks_ms();
+    mp_uint_t timeout = self->timeout;
+    uint8_t *dest = buf_in;
+
+    for (size_t i = 0; i < size; i++) {
+        // Wait for the first/next character
+        while (!mp_uart_rx_any(self->uart_id)) {
+            mp_uint_t elapsed = mp_hal_ticks_ms() - start;
+            if (elapsed > timeout) {  // timed out
+                if (i <= 0) {
+                    *errcode = MP_EAGAIN;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return i;
+                }
+            }
+            mp_event_handle_nowait();
+        }
+        *dest++ = mp_uart_rx_char(self->uart_id);
+        start = mp_hal_ticks_ms(); // Inter-character timeout
+        timeout = self->timeout_char;
+    }
+    return size;
+}
+
+static mp_uint_t mp_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);
+    mp_uart_tx_data(self->uart_id, buf_in, size);
+    return size;
+}
+
+static mp_uint_t mp_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) {
+        uintptr_t flags = arg;
+        ret = 0;
+        if ((flags & MP_STREAM_POLL_RD) && mp_uart_rx_any(self->uart_id)) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else if (request == MP_STREAM_FLUSH) {
+        uint32_t t0 = mp_hal_ticks_ms();
+        const uint32_t timeout_ms = 100 + 10 * mp_uart_tx_any(self->uart_id);
+        while (mp_uart_tx_any(self->uart_id)) {
+            if (mp_hal_ticks_ms() - t0 > timeout_ms) {
+                *errcode = MP_ETIMEDOUT;
+                ret = MP_STREAM_ERROR;
+            }
+            mp_event_handle_nowait();
+        }
+        return 0;
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+static void machine_uart_irq_callback(unsigned int uart_id, unsigned int trigger) {
+    machine_uart_obj_t *self = MP_STATE_PORT(machine_uart_obj_all)[uart_id];
+    self->irq_flags = trigger;
+    if (self->irq_obj.base.type != NULL && (self->irq_flags & self->irq_trigger)) {
+        mp_irq_handler(&self->irq_obj);
+    }
+}
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 73abb8924c393..6c9e6af635f57 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -136,6 +136,9 @@
 #define MICROPY_PY_MACHINE_SPI                  (1)
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)
 #define MICROPY_PY_MACHINE_TIMER                (1)
+#define MICROPY_PY_MACHINE_UART                 (1)
+#define MICROPY_PY_MACHINE_UART_INCLUDEFILE     "ports/alif/machine_uart.c"
+#define MICROPY_PY_MACHINE_UART_IRQ             (1)
 #define MICROPY_PY_NETWORK                      (CORE_M55_HP)
 #ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "mpy-alif"

From 737acef5cbd8ffb5a7c0ef605741debd70e72606 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Mar 2025 14:28:57 +1100
Subject: [PATCH 2107/3129] alif: Support more fine-grained pin alternate
 function selection.

Now raises an exception if the pin doesn't support the alternate function
unit number and line type, eg UART0_TX (previously it only checked the
peripheral).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/cyw43_port_spi.c         |  10 +-
 ports/alif/machine_i2c.c            |  12 +-
 ports/alif/machine_spi.c            |  22 ++-
 ports/alif/mcu/ensemble_pin_alt.csv | 258 ++++++++++++++--------------
 ports/alif/mcu/make-pins.py         |  14 +-
 ports/alif/mphalport.h              | 201 +++++++++++++++++++---
 ports/alif/mpuart.c                 |  12 +-
 ports/alif/ospi_flash.c             |  27 +--
 8 files changed, 371 insertions(+), 185 deletions(-)

diff --git a/ports/alif/cyw43_port_spi.c b/ports/alif/cyw43_port_spi.c
index 84d84b0e1de48..6ebcaa057dc97 100644
--- a/ports/alif/cyw43_port_spi.c
+++ b/ports/alif/cyw43_port_spi.c
@@ -34,6 +34,7 @@
 #include "sys_ctrl_spi.h"
 
 // CYW43 is connected to SPI3.
+#define HW_SPI_UNIT (3)
 #define HW_SPI ((SPI_Type *)SPI3_BASE)
 #define SPI_BAUDRATE (16000000)
 #define SPI_RX_FIFO_SIZE (16)
@@ -56,9 +57,12 @@ static void spi_bus_init(void) {
     mp_hal_pin_output(pin_WL_CS);
     mp_hal_pin_high(pin_WL_CS);
     // NOTE: Alif recommends enabled input read for all SPI pins.
-    mp_hal_pin_config(pin_WL_SCLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
-    mp_hal_pin_config(pin_WL_MOSI, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
-    mp_hal_pin_config(pin_WL_MISO, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
+    mp_hal_pin_config(pin_WL_SCLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(SPI_SCLK, HW_SPI_UNIT), true);
+    mp_hal_pin_config(pin_WL_MOSI, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(SPI_MOSI, HW_SPI_UNIT), true);
+    mp_hal_pin_config(pin_WL_MISO, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(SPI_MISO, HW_SPI_UNIT), true);
 
     // Starts out clock_polarity=1, clock_phase=0.
     spi_mode_master(HW_SPI);
diff --git a/ports/alif/machine_i2c.c b/ports/alif/machine_i2c.c
index f117b93c2b1e8..a710aeeb01132 100644
--- a/ports/alif/machine_i2c.c
+++ b/ports/alif/machine_i2c.c
@@ -135,9 +135,9 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 
     // Configure I2C pins.
     mp_hal_pin_config(self->scl, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
-        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(I2C_SCL, self->i2c_id), true);
     mp_hal_pin_config(self->sda, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
-        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(I2C_SDA, self->i2c_id), true);
 
     // Initialize I2C controller.
     self->i2c->I2C_CON = I2C_IC_CON_ENABLE_MASTER_MODE |
@@ -244,18 +244,18 @@ int machine_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_mac
 
         // Switch pins to GPIO/OD.
         mp_hal_pin_config(self->scl, MP_HAL_PIN_MODE_OPEN_DRAIN, MP_HAL_PIN_PULL_UP,
-            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_NONE, true);
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, 0, true);
         mp_hal_pin_config(self->sda, MP_HAL_PIN_MODE_OPEN_DRAIN, MP_HAL_PIN_PULL_UP,
-            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_NONE, true);
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, 0, true);
 
         // Perform the transfer.
         ret = mp_machine_soft_i2c_transfer(&soft_i2c.base, addr, 1, &bufs, flags);
 
         // Re-configure I2C pins.
         mp_hal_pin_config(self->scl, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
-            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(I2C_SCL, self->i2c_id), true);
         mp_hal_pin_config(self->sda, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
-            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_I2C, true);
+            MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(I2C_SDA, self->i2c_id), true);
 
         return ret;
     }
diff --git a/ports/alif/machine_spi.c b/ports/alif/machine_spi.c
index d13c6368f2515..abb60bc4e8325 100644
--- a/ports/alif/machine_spi.c
+++ b/ports/alif/machine_spi.c
@@ -60,6 +60,20 @@ static machine_spi_obj_t machine_spi_obj[] = {
 
 };
 
+static const uint8_t spi_pin_alt[] = {
+    MP_HAL_PIN_ALT_SPI_SCLK,
+    MP_HAL_PIN_ALT_SPI_MISO,
+    MP_HAL_PIN_ALT_SPI_MOSI,
+    MP_HAL_PIN_ALT_SPI_SS0,
+};
+
+static const uint8_t lpspi_pin_alt[] = {
+    MP_HAL_PIN_ALT_LPSPI_SCLK,
+    MP_HAL_PIN_ALT_LPSPI_MISO,
+    MP_HAL_PIN_ALT_LPSPI_MOSI,
+    MP_HAL_PIN_ALT_LPSPI_SS,
+};
+
 static inline uint32_t spi_get_clk(machine_spi_obj_t *spi) {
     return spi->is_lp ? GetSystemCoreClock() : GetSystemAHBClock();
 }
@@ -131,9 +145,15 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
     }
 
     // Configure SPI pins.
+    const uint8_t *alt;
+    if (spi->id <= 3) {
+        alt = spi_pin_alt;
+    } else {
+        alt = lpspi_pin_alt;
+    }
     for (size_t i = 0; i < MP_ARRAY_SIZE(pins) && pins[i]; i++) {
         mp_hal_pin_config(pins[i], MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_SPI, true);
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_MAKE(alt[i], spi->id), true);
     }
 
     // Disable all interrupts.
diff --git a/ports/alif/mcu/ensemble_pin_alt.csv b/ports/alif/mcu/ensemble_pin_alt.csv
index 10bfedc9a1d68..34f13e86f6d3c 100644
--- a/ports/alif/mcu/ensemble_pin_alt.csv
+++ b/ports/alif/mcu/ensemble_pin_alt.csv
@@ -1,130 +1,130 @@
 Pin,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7
-P0_0,,OSPI,UART,I3C,UT,LPCAM,CAM,ANA
-P0_1,,OSPI,UART,I3C,UT,LPCAM,CAM,ANA
-P0_2,,OSPI,UART,I2C,UT,LPCAM,CAM,ANA
-P0_3,,OSPI,UART,I2C,UT,LPCAM,CAM,ANA
-P0_4,,OSPI,UART,PDM,I2C,UT,,ANA
-P0_5,,OSPI,UART,PDM,I2C,UT,,ANA
-P0_6,,OSPI,UART,PDM,I2C,UT,,ANA
-P0_7,,OSPI,UART,PDM,I2C,UT,CDC,ANA
-P1_0,,UART,SPI,I2C,UT,LPCAM,ETH,ANA
-P1_1,,UART,SPI,I2C,UT,LPCAM,ETH,ANA
-P1_2,,UART,SPI,I3C,UT,LPCAM,ETH,ANA
-P1_3,,UART,SPI,I3C,UT,LPCAM,ETH,ANA
-P1_4,,OSPI,UART,SPI,UT,LPCAM,ETH,ANA
-P1_5,,OSPI,UART,SPI,UT,LPCAM,ETH,ANA
-P1_6,,OSPI,UART,I2S,UT,LPCAM,ETH,ANA
-P1_7,,OSPI,UART,I2S,UT,LPCAM,ETH,ANA
-P2_0,,OSPI,UART,LPPDM,UT,LPCAM,ETH,ANA
-P2_1,,OSPI,UART,LPPDM,UT,LPCAM,ETH,ANA
-P2_2,,OSPI,UART,LPPDM,UT,LPCAM,ETH,ANA
-P2_3,,OSPI,UART,LPPDM,UT,LPCAM,CDC,ANA
-P2_4,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
-P2_5,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
-P2_6,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
-P2_7,,OSPI,LPI2S,SPI,UT,LPCAM,CAM,ANA
-P3_0,,OSPI,UART,PDM,I2S,QEC,LPCAM,CAM
-P3_1,,OSPI,UART,PDM,I2S,QEC,LPCAM,CAM
-P3_2,,OSPI,PDM,I2S,I3C,QEC,LPCAM,CAM
-P3_3,,OSPI,PDM,I2S,I3C,QEC,LPCAM,CAM
-P3_4,,OSPI,UART,LPPDM,I2S,I2C,QEC,CAM
-P3_5,,OSPI,UART,LPPDM,SPI,I2C,QEC,CAM
-P3_6,,HFXO,LPUART,LPPDM,SPI,I2C,QEC,CAM
-P3_7,,JTAG,LPUART,LPPDM,SPI,I2C,QEC,CAM
-P4_0,,JTAG,,I2S,SPI,QEC,CDC,CAM
-P4_1,,JTAG,I2S,SPI,QEC,SD,CDC,CAM
-P4_2,,JTAG,,I2S,SPI,QEC,SD,CAM
-P4_3,,JTAG,,I2S,SPI,QEC,SD,CAM
-P4_4,,JTAG,I2S,SPI,FAULT,,,
-P4_5,,JTAG,SPI,FAULT,,,,
-P4_6,,JTAG,SPI,FAULT,,,,
-P4_7,,JTAG,SPI,FAULT,,,,
-P5_0,,OSPI,UART,PDM,SPI,I2C,UT,SD
-P5_1,,OSPI,UART,PDM,SPI,I2C,UT,SD
-P5_2,,OSPI,UART,PDM,SPI,LPI2C,UT,SD
-P5_3,,OSPI,UART,SPI,LPI2C,UT,SD,CDC
-P5_4,,OSPI,UART,PDM,SPI,UT,SD,CDC
-P5_5,,OSPI,UART,PDM,UT,SD,ETH,CDC
-# P5_6 doesn't really have OSPI on AF1 but it's needed for P10_7 to be in OSPI mode
-P5_6,,OSPI,UART,I2C,UT,SD,ETH,CDC
-P5_7,,OSPI,UART,I2C,UT,SD,ETH,
-P6_0,,OSPI,UART,PDM,UT,SD,ETH,
-P6_1,,OSPI,UART,PDM,UT,SD,ETH,
-P6_2,,OSPI,UART,,PDM,UT,SD,ETH
-P6_3,,OSPI,UART,,PDM,UT,SD,ETH
-P6_4,,OSPI,UART,,SPI,UT,SD,ETH
-P6_5,,OSPI,UART,,SPI,UT,SD,ETH
-P6_6,,OSPI,UART,,SPI,UT,SD,ETH
-P6_7,,OSPI,UART,PDM,SPI,UT,SD,ETH
-P7_0,,,CMP,SPI,I2C,UT,SD,
-P7_1,,,CMP,SPI,I2C,UT,SD,
-P7_2,,,UART,CMP,SPI,I2C,UT,SD
-P7_3,,,UART,CMP,SPI,I2C,UT,
-P7_4,,,LPUART,LPPDM,LPSPI,LPI2C,UT,
-P7_5,,,LPUART,,LPPDM,LPSPI,LPI2C,UT
-P7_6,,,LPUART,,LPPDM,LPSPI,I3C,UT
-P7_7,,,LPUART,,LPPDM,LPSPI,I3C,UT
-P8_0,,OSPI,AUDIO,FAULT,LPCAM,SD,CDC,CAM
-P8_1,,I2S,FAULT,LPCAM,SD,CDC,CAM,
-P8_2,,I2S,SPI,FAULT,LPCAM,SD,CDC,CAM
-P8_3,,I2S,SPI,FAULT,LPCAM,SD,CDC,CAM
-P8_4,,I2S,SPI,QEC,LPCAM,SD,CDC,CAM
-P8_5,,,SPI,QEC,LPCAM,SD,CDC,CAM
-P8_6,,,I2S,QEC,LPCAM,SD,CDC,CAM
-P8_7,,,I2S,QEC,LPCAM,SD,CDC,CAM
-P9_0,,,I2S,QEC,SD,CDC,CAM,
-P9_1,,LPUART,I2S,QEC,SD,CDC,CAM,
-P9_2,,LPUART,I2S,SPI,QEC,SD,CDC,CAM
-P9_3,,HFXO,UART,I2S,SPI,QEC,CDC,CAM
-P9_4,,UART,I2S,SPI,I2C,QEC,CDC,CAM
-P9_5,,OSPI,I2S,SPI,I2C,QEC,CDC,CAM
-P9_6,,OSPI,AUDIO,SPI,I2C,QEC,CDC,CAM
-P9_7,,OSPI,UART,SPI,I2C,QEC,CDC,CAM
-P10_0,,OSPI,UART,SPI,UT,LPCAM,CDC,CAM
-P10_1,,OSPI,,LPI2S,UT,LPCAM,CDC,CAM
-P10_2,,OSPI,,LPI2S,UT,LPCAM,CDC,CAM
-P10_3,,OSPI,,LPI2S,UT,LPCAM,CDC,CAM
-P10_4,,OSPI,,LPI2S,I2C,UT,ETH,CDC
-P10_5,,UART,I2S,SPI,I2C,UT,ETH,CDC
-P10_6,,UART,I2S,SPI,I2C,UT,ETH,CDC
-P10_7,,UART,I2S,SPI,I2C,UT,CDC,OSPI
-P11_0,,OSPI,UART,I2S,SPI,UT,ETH,CDC
-P11_1,,OSPI,UART,SPI,UT,ETH,CDC,
-P11_2,,OSPI,UART,LPPDM,SPI,UT,ETH,CDC
-P11_3,,OSPI,UART,LPPDM,SPI,UT,ETH,CDC
-P11_4,,OSPI,UART,PDM,LPSPI,UT,ETH,CDC
-P11_5,,OSPI,UART,PDM,LPSPI,UT,ETH,CDC
-P11_6,,OSPI,UART,LPPDM,LPSPI,UT,ETH,CDC
-P11_7,,OSPI,UART,LPPDM,LPSPI,UT,ETH,CDC
-P12_0,,OSPI,AUDIO,I2S,UT,CDC,,
-P12_1,,OSPI,UART,I2S,UT,CDC,,
-P12_2,,OSPI,UART,I2S,UT,CDC,,
-P12_3,,OSPI,UART,I2S,UT,CDC,,
-P12_4,,OSPI,SPI,UT,,CDC,,
-P12_5,,,SPI,UT,,CDC,,
-P12_6,,,SPI,UT,,CDC,,
-P12_7,,OSPI,,SPI,UT,CDC,,
-P13_0,,OSPI,,SPI,QEC,SD,CDC,
-P13_1,,OSPI,SPI,QEC,SD,CDC,,
-P13_2,,OSPI,SPI,QEC,SD,CDC,,
-P13_3,,OSPI,SPI,QEC,SD,CDC,,
-P13_4,,OSPI,LPI2S,QEC,SD,CDC,,
-P13_5,,OSPI,LPI2S,QEC,SD,CDC,,
-P13_6,,OSPI,LPI2S,QEC,SD,CDC,,
-P13_7,,OSPI,LPI2S,QEC,SD,CDC,,
-P14_0,,OSPI,UART,QEC,SD,,,
-P14_1,,OSPI,UART,,QEC,SD,,
-P14_2,,OSPI,UART,,QEC,SD,,
-P14_3,,OSPI,UART,,QEC,,,
-P14_4,,CMP,SPI,FAULT,,,,
-P14_5,,CMP,SPI,FAULT,,,,
-P14_6,,CMP,SPI,FAULT,,,,
-P14_7,,CMP,SPI,FAULT,,,,
-P15_0,,LPTMR,,,,,,
-P15_1,,LPTMR,,,,,,
-P15_2,,LPTMR,,,,,,
-P15_3,,LPTMR,,,,,,
-P15_4,,,,,,,,
-P15_5,,,,,,,,
-P15_6,,,,,,,,
-P15_7,,,,,,,,
+P0_0,GPIO,OSPI0_D0,UART0_RX,I3C_SDA,UT0_T0,LPCAM_HSYNC,CAM_HSYNC,ANA_S0
+P0_1,GPIO,OSPI0_D1,UART0_TX,I3C_SCL,UT0_T1,LPCAM_VSYNC,CAM_VSYNC,ANA_S1
+P0_2,GPIO,OSPI0_D2,UART0_CTS,I2C0_SDA,UT1_T0,LPCAM_PCLK,CAM_PCLK,ANA_S2
+P0_3,GPIO,OSPI0_D3,UART0_RTS,I2C0_SCL,UT1_T1,LPCAM_XVCLK,CAM_XVCLK,ANA_S3
+P0_4,GPIO,OSPI0_D4,UART1_RX,PDM_D0,I2C1_SDA,UT2_T0,,ANA_S4
+P0_5,GPIO,OSPI0_D5,UART1_TX,PDM_C0,I2C1_SCL,UT2_T1,,ANA_S5
+P0_6,GPIO,OSPI0_D6,UART1_CTS,PDM_D1,I2C2_SCL,UT3_T0,,ANA_S6
+P0_7,GPIO,OSPI0_D7,UART1_RTS,PDM_C1,I2C2_SDA,UT3_T1,CDC_DE,ANA_S7
+P1_0,GPIO,UART2_RX,SPI0_MISO,I2C3_SDA,UT4_T0,LPCAM_HSYNC,ETH_RXD0,ANA_S8
+P1_1,GPIO,UART2_TX,SPI0_MOSI,I2C3_SCL,UT4_T1,LPCAM_VSYNC,ETH_RXD1,ANA_S9
+P1_2,GPIO,UART3_RX,SPI0_SCLK,I3C_SDA,UT5_T0,LPCAM_PCLK,ETH_RST,ANA_S10
+P1_3,GPIO,UART3_TX,SPI0_SS0,I3C_SCL,UT5_T1,LPCAM_XVCLK,ETH_TXD0,ANA_S11
+P1_4,GPIO,OSPI0_SS0,UART0_RX,SPI0_SS1,UT6_T0,LPCAM_D0,ETH_TXD1,ANA_S12
+P1_5,GPIO,OSPI0_SS1,UART0_TX,SPI0_SS2,UT6_T1,LPCAM_D1,ETH_TXEN,ANA_S13
+P1_6,GPIO,OSPI0_RXDS,UART1_RX,I2S0_SDI,UT7_T0,LPCAM_D2,ETH_IRQ,ANA_S14
+P1_7,GPIO,OSPI0_SCLK,UART1_TX,I2S0_SDO,UT7_T1,LPCAM_D3,ETH_REFCLK,ANA_S15
+P2_0,GPIO,OSPI0_D0,UART2_RX,LPPDM_D0,UT8_T0,LPCAM_D4,ETH_MDIO,ANA_S16
+P2_1,GPIO,OSPI0_D1,UART2_TX,LPPDM_C0,UT8_T1,LPCAM_D5,ETH_MDC,ANA_S17
+P2_2,GPIO,OSPI0_D2,UART3_RX,LPPDM_D1,UT9_T0,LPCAM_D6,ETH_CRS_DV_C,ANA_S18
+P2_3,GPIO,OSPI0_D3,UART3_TX,LPPDM_C1,UT9_T1,LPCAM_D7,CDC_PCLK,ANA_S19
+P2_4,GPIO,OSPI0_D4,LPI2S_SDI,SPI1_MISO,UT10_T0,LPCAM_D0,CAM_D0,ANA_S20
+P2_5,GPIO,OSPI0_D5,LPI2S_SDO,SPI1_MOSI,UT10_T1,LPCAM_D1,CAM_D1,ANA_S21
+P2_6,GPIO,OSPI0_D6,LPI2S_SCLK,SPI1_SCLK,UT11_T0,LPCAM_D2,CAM_D2,ANA_S22
+P2_7,GPIO,OSPI0_D7,LPI2S_WS,SPI1_SS0,UT11_T1,LPCAM_D3,CAM_D3,ANA_S23
+P3_0,GPIO,OSPI0_SCLK,UART4_RX,PDM_D0,I2S0_SCLK,QEC0_X,LPCAM_D4,CAM_D4
+P3_1,GPIO,OSPI0_SCLKN,UART4_TX,PDM_C0,I2S0_WS,QEC0_Y,LPCAM_D5,CAM_D5
+P3_2,GPIO,OSPI0_SS0,PDM_D1,I2S1_SDI,I3C_SDA,QEC0_Z,LPCAM_D6,CAM_D6
+P3_3,GPIO,OSPI0_SS1,PDM_C1,I2S1_SDO,I3C_SCL,QEC1_X,LPCAM_D7,CAM_D7
+P3_4,GPIO,OSPI0_RXDS,UART5_RX,LPPDM_C0,I2S1_SCLK,I2C0_SCL,QEC1_Y,CAM_D8
+P3_5,GPIO,OSPI0_SCLKN,UART5_TX,LPPDM_D0,SPI0_SS1,I2C0_SDA,QEC1_Z,CAM_D9
+P3_6,GPIO,HFXO_OUT,LPUART_CTS,LPPDM_C1,SPI0_SS2,I2C1_SDA,QEC2_X,CAM_D10
+P3_7,GPIO,JTAG_TRACECLK,LPUART_RTS,LPPDM_D1,SPI1_SS1,I2C1_SCL,QEC2_Y,CAM_D11
+P4_0,GPIO,JTAG_TDATA0,,I2S1_WS,SPI1_SS2,QEC2_Z,CDC_VSYNC,CAM_D12
+P4_1,GPIO,JTAG_TDATA1,I2S0_SDI,SPI1_SS3,QEC3_X,SD_CLK,CDC_HSYNC,CAM_D13
+P4_2,GPIO,JTAG_TDATA2,,I2S0_SDO,SPI2_MISO,QEC3_Y,SD_CMD,CAM_D14
+P4_3,GPIO,JTAG_TDATA3,,I2S0_SCLK,SPI2_MOSI,QEC3_Z,SD_RST,CAM_D15
+P4_4,GPIO,JTAG_TCK,I2S0_WS,SPI2_SCLK,FAULT0_A,,,
+P4_5,GPIO,JTAG_TMS,SPI2_SS0,FAULT1_A,,,,
+P4_6,GPIO,JTAG_TDI,SPI2_SS1,FAULT2_A,,,,
+P4_7,GPIO,JTAG_TDO,SPI2_SS2,FAULT3_A,,,,
+P5_0,GPIO,OSPI1_RXDS,UART4_RX,PDM_D2,SPI0_MISO,I2C2_SDA,UT0_T0,SD_D0
+P5_1,GPIO,OSPI1_SS0,UART4_TX,PDM_D3,SPI0_MOSI,I2C2_SCL,UT0_T1,SD_D1
+P5_2,GPIO,OSPI1_SCLKN,UART5_RX,PDM_C3,SPI0_SS0,LPI2C_SCL,UT1_T0,SD_D2
+P5_3,GPIO,OSPI1_SCLK,UART5_TX,SPI0_SCLK,LPI2C_SDA,UT1_T1,SD_D3,CDC_PCLK
+P5_4,GPIO,OSPI1_SS1,UART3_CTS,PDM_D2,SPI0_SS3,UT2_T0,SD_D4,CDC_DE
+P5_5,GPIO,OSPI1_SCLK,UART3_RTS,PDM_D3,UT2_T1,SD_D5,ETH_RXD0,CDC_HSYNC
+# P5_6 doesn't really have OSPI on AF1 but it's needed for P10_7 to be in OSPI1_RXDS mode
+P5_6,GPIO,OSPI1_RXDS,UART1_CTS,I2C2_SCL,UT3_T0,SD_D6,ETH_RXD1,CDC_VSYNC
+P5_7,GPIO,OSPI1_SS0,UART1_RTS,I2C2_SDA,UT3_T1,SD_D7,ETH_RST,
+P6_0,GPIO,OSPI0_D0,UART4_DE,PDM_D0,UT4_T0,SD_D0,ETH_TXD0,
+P6_1,GPIO,OSPI0_D1,UART5_DE,PDM_C0,UT4_T1,SD_D1,ETH_TXD1,
+P6_2,GPIO,OSPI0_D2,UART2_CTS,,PDM_D1,UT5_T0,SD_D2,ETH_TXEN
+P6_3,GPIO,OSPI0_D3,UART2_RTS,,PDM_C1,UT5_T1,SD_D3,ETH_IRQ
+P6_4,GPIO,OSPI0_D4,UART2_CTS,,SPI1_SS0,UT6_T0,SD_D4,ETH_REFCLK
+P6_5,GPIO,OSPI0_D5,UART2_RTS,,SPI1_SS1,UT6_T1,SD_D5,ETH_MDIO
+P6_6,GPIO,OSPI0_D6,UART0_CTS,,SPI1_SS2,UT7_T0,SD_D6,ETH_MDC
+P6_7,GPIO,OSPI0_D7,UART0_RTS,PDM_C2,SPI1_SS3,UT7_T1,SD_D7,ETH_CRS_DV_A
+P7_0,GPIO,,CMP3_OUT,SPI0_MISO,I2C0_SDA,UT8_T0,SD_CMD,
+P7_1,GPIO,,CMP2_OUT,SPI0_MOSI,I2C0_SCL,UT8_T1,SD_CLK,
+P7_2,GPIO,,UART3_CTS,CMP1_OUT,SPI0_SCLK,I2C1_SDA,UT9_T0,SD_RST
+P7_3,GPIO,,UART3_RTS,CMP0_OUT,SPI0_SS0,I2C1_SCL,UT9_T1,
+P7_4,GPIO,,LPUART_CTS,LPPDM_C2,LPSPI_MISO,LPI2C_SCL,UT10_T0,
+P7_5,GPIO,,LPUART_RTS,,LPPDM_D2,LPSPI_MOSI,LPI2C_SDA,UT10_T1
+P7_6,GPIO,,LPUART_RX,,LPPDM_C3,LPSPI_SCLK,I3C_SDA,UT11_T0
+P7_7,GPIO,,LPUART_TX,,LPPDM_D3,LPSPI_SS,I3C_SCL,UT11_T1
+P8_0,GPIO,OSPI1_SCLKN,AUDIO_CLK,FAULT0_B,LPCAM_D0,SD_D0,CDC_D0,CAM_D0
+P8_1,GPIO,I2S2_SDI,FAULT1_B,LPCAM_D1,SD_D1,CDC_D1,CAM_D1,
+P8_2,GPIO,I2S2_SDO,SPI0_SS3,FAULT2_B,LPCAM_D2,SD_D2,CDC_D2,CAM_D2
+P8_3,GPIO,I2S2_SCLK,SPI1_MISO,FAULT3_B,LPCAM_D3,SD_D3,CDC_D3,CAM_D3
+P8_4,GPIO,I2S2_WS,SPI1_MOSI,QEC0_X,LPCAM_D4,SD_D4,CDC_D4,CAM_D4
+P8_5,GPIO,,SPI1_SCLK,QEC0_Y,LPCAM_D5,SD_D5,CDC_D5,CAM_D5
+P8_6,GPIO,,I2S3_SCLK,QEC0_Z,LPCAM_D6,SD_D6,CDC_D6,CAM_D6
+P8_7,GPIO,,I2S3_WS,QEC1_X,LPCAM_D7,SD_D7,CDC_D7,CAM_D7
+P9_0,GPIO,,I2S3_SDI,QEC1_Y,SD_CMD,CDC_D8,CAM_D8,
+P9_1,GPIO,LPUART_RX,I2S3_SDO,QEC1_Z,SD_CLK,CDC_D9,CAM_D9,
+P9_2,GPIO,LPUART_TX,I2S3_SDI,SPI2_MISO,QEC2_X,SD_RST,CDC_D10,CAM_D10
+P9_3,GPIO,HFXO_OUT,UART7_RX,I2S3_SDO,SPI2_MOSI,QEC2_Y,CDC_D11,CAM_D11
+P9_4,GPIO,UART7_TX,I2S3_SCLK,SPI2_SCLK,I2C3_SDA,QEC2_Z,CDC_D12,CAM_D12
+P9_5,GPIO,OSPI1_D0,I2S3_WS,SPI2_SS0,I2C3_SCL,QEC3_X,CDC_D13,CAM_D13
+P9_6,GPIO,OSPI1_D1,AUDIO_CLK,SPI2_SS1,I2C3_SDA,QEC3_Y,CDC_D14,CAM_D14
+P9_7,GPIO,OSPI1_D2,UART7_DE,SPI2_SS2,I2C3_SCL,QEC3_Z,CDC_D15,CAM_D15
+P10_0,GPIO,OSPI1_D3,UART6_DE,SPI2_SS3,UT0_T0,LPCAM_HSYNC,CDC_D16,CAM_HSYNC
+P10_1,GPIO,OSPI1_D4,,LPI2S_SDI,UT0_T1,LPCAM_VSYNC,CDC_D17,CAM_VSYNC
+P10_2,GPIO,OSPI1_D5,,LPI2S_SDO,UT1_T0,LPCAM_PCLK,CDC_D18,CAM_PCLK
+P10_3,GPIO,OSPI1_D6,,LPI2S_SCLK,UT1_T1,LPCAM_XVCLK,CDC_D19,CAM_XVCLK
+P10_4,GPIO,OSPI1_D7,,LPI2S_WS,I2C0_SDA,UT2_T0,ETH_TXD0,CDC_D20
+P10_5,GPIO,UART6_RX,I2S2_SDI,SPI3_MISO,I2C0_SCL,UT2_T1,ETH_TXD1,CDC_D21
+P10_6,GPIO,UART6_TX,I2S2_SDO,SPI3_MOSI,I2C1_SDA,UT3_T0,ETH_TXEN,CDC_D22
+P10_7,GPIO,UART7_RX,I2S2_SCLK,SPI3_SCLK,I2C1_SCL,UT3_T1,CDC_D23,OSPI1_RXDS
+P11_0,GPIO,OSPI1_D0,UART7_TX,I2S2_WS,SPI3_SS0,UT4_T0,ETH_REFCLK,CDC_D0
+P11_1,GPIO,OSPI1_D1,UART7_DE,SPI3_SS1,UT4_T1,ETH_MDIO,CDC_D1,
+P11_2,GPIO,OSPI1_D2,UART6_DE,LPPDM_C2,SPI3_SS2,UT5_T0,ETH_MDC,CDC_D2
+P11_3,GPIO,OSPI1_D3,UART5_RX,LPPDM_C3,SPI3_SS3,UT5_T1,ETH_RXD0,CDC_D3
+P11_4,GPIO,OSPI1_D4,UART5_TX,PDM_C2,LPSPI_MISO,UT6_T0,ETH_RXD1,CDC_D4
+P11_5,GPIO,OSPI1_D5,UART6_RX,PDM_C3,LPSPI_MOSI,UT6_T1,ETH_CRS_DV_B,CDC_D5
+P11_6,GPIO,OSPI1_D6,UART6_TX,LPPDM_D2,LPSPI_SCLK,UT7_T0,ETH_RST,CDC_D6
+P11_7,GPIO,OSPI1_D7,UART5_DE,LPPDM_D3,LPSPI_SS,UT7_T1,ETH_IRQ,CDC_D7
+P12_0,GPIO,OSPI0_SCLK,AUDIO_CLK,I2S1_SDI,UT8_T0,CDC_D8,,
+P12_1,GPIO,OSPI0_SCLKN,UART4_RX,I2S1_SDO,UT8_T1,CDC_D9,,
+P12_2,GPIO,OSPI0_RXDS,UART4_TX,I2S1_SCLK,UT9_T0,CDC_D10,,
+P12_3,GPIO,OSPI0_SS0,UART4_DE,I2S1_WS,UT9_T1,CDC_D11,,
+P12_4,GPIO,OSPI0_SS1,SPI3_MISO,UT10_T0,,CDC_D12,,
+P12_5,GPIO,,SPI3_MOSI,UT10_T1,,CDC_D13,,
+P12_6,GPIO,,SPI3_SCLK,UT11_T0,,CDC_D14,,
+P12_7,GPIO,OSPI1_RXDS,,SPI3_SS0,UT11_T1,CDC_D15,,
+P13_0,GPIO,OSPI1_D0,,SPI3_SS1,QEC0_X,SD_D0,CDC_D16,
+P13_1,GPIO,OSPI1_D1,SPI3_SS2,QEC0_Y,SD_D1,CDC_D17,,
+P13_2,GPIO,OSPI1_D2,SPI3_SS3,QEC0_Z,SD_D2,CDC_D18,,
+P13_3,GPIO,OSPI1_D3,SPI2_SS3,QEC1_X,SD_D3,CDC_D19,,
+P13_4,GPIO,OSPI1_D4,LPI2S_SDI,QEC1_Y,SD_D4,CDC_D20,,
+P13_5,GPIO,OSPI1_D5,LPI2S_SDO,QEC1_Z,SD_D5,CDC_D21,,
+P13_6,GPIO,OSPI1_D6,LPI2S_SCLK,QEC2_X,SD_D6,CDC_D22,,
+P13_7,GPIO,OSPI1_D7,LPI2S_WS,QEC2_Y,SD_D7,CDC_D23,,
+P14_0,GPIO,OSPI1_SCLK,UART6_RX,QEC2_Z,SD_CMD,,,
+P14_1,GPIO,OSPI1_SCLKN,UART6_TX,,QEC3_X,SD_CLK,,
+P14_2,GPIO,OSPI1_SS0,UART7_RX,,QEC3_Y,SD_RST,,
+P14_3,GPIO,OSPI1_SS1,UART7_TX,,QEC3_Z,,,
+P14_4,GPIO,CMP3_OUT,SPI1_MISO,FAULT0_C,,,,
+P14_5,GPIO,CMP2_OUT,SPI1_MOSI,FAULT1_C,,,,
+P14_6,GPIO,CMP1_OUT,SPI1_SCLK,FAULT2_C,,,,
+P14_7,GPIO,CMP0_OUT,SPI1_SS0,FAULT3_C,,,,
+P15_0,GPIO,LPTMR0_CLK,,,,,,
+P15_1,GPIO,LPTMR1_CLK,,,,,,
+P15_2,GPIO,LPTMR2_CLK,,,,,,
+P15_3,GPIO,LPTMR3_CLK,,,,,,
+P15_4,GPIO,,,,,,,
+P15_5,GPIO,,,,,,,
+P15_6,GPIO,,,,,,,
+P15_7,GPIO,,,,,,,
diff --git a/ports/alif/mcu/make-pins.py b/ports/alif/mcu/make-pins.py
index fb000082642bc..3666953e613f5 100755
--- a/ports/alif/mcu/make-pins.py
+++ b/ports/alif/mcu/make-pins.py
@@ -36,11 +36,19 @@
 class AlifPin(boardgen.Pin):
     def __init__(self, cpu_pin_name):
         super().__init__(cpu_pin_name)
-        self._afs = ["MP_HAL_PIN_ALT_NONE"] * 8
+        self._afs = [("NONE", -1)] * 8
 
     # Called for each AF defined in the csv file for this pin.
     def add_af(self, af_idx, af_name, af):
-        self._afs[af_idx] = f"MP_HAL_PIN_ALT_{af}"
+        if af == "GPIO":
+            self._afs[af_idx] = "GPIO", -1
+        elif af.startswith("ANA_S"):
+            self._afs[af_idx] = "ANA", int(af[5:])
+        else:
+            m = re.match(r"([A-Z0-9]+[A-Z])(\d*)_([A-Z0-9_]+)$", af)
+            periph, unit, line = m.groups()
+            unit = -1 if unit == "" else int(unit)
+            self._afs[af_idx] = f"{periph}_{line}", unit
 
     # Emit the struct which contains the pin instance.
     def definition(self):
@@ -63,7 +71,7 @@ def definition(self):
                 base=base,
                 adc12_periph=adc12_periph,
                 adc12_channel=adc12_channel,
-                alt=", ".join([f"{af}" for af in self._afs]),
+                alt=", ".join([f"MP_HAL_PIN_ALT({func}, {unit})" for func, unit in self._afs]),
             )
         )
 
diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
index 2ba62db2d2e5a..4f81439b5492e 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -92,34 +92,183 @@ extern ringbuf_t stdin_ringbuf;
 
 #define mp_hal_pin_obj_t const machine_pin_obj_t *
 
+#define MP_HAL_PIN_ALT(function, unit)          (MP_HAL_PIN_ALT_MAKE((MP_HAL_PIN_ALT_##function), (unit)))
+#define MP_HAL_PIN_ALT_MAKE(function, unit)     ((function) | ((unit) << 8))
+#define MP_HAL_PIN_ALT_GET_FUNC(alt)            ((alt) & 0xff)
+#define MP_HAL_PIN_ALT_GET_UNIT(alt)            ((alt) >> 8)
+
 enum {
     MP_HAL_PIN_ALT_NONE = 0,
+    MP_HAL_PIN_ALT_GPIO,
     MP_HAL_PIN_ALT_ANA,
-    MP_HAL_PIN_ALT_AUDIO,
-    MP_HAL_PIN_ALT_CAM,
-    MP_HAL_PIN_ALT_CDC,
-    MP_HAL_PIN_ALT_CMP,
-    MP_HAL_PIN_ALT_ETH,
-    MP_HAL_PIN_ALT_FAULT,
-    MP_HAL_PIN_ALT_HFXO,
-    MP_HAL_PIN_ALT_I2C,
-    MP_HAL_PIN_ALT_I2S,
-    MP_HAL_PIN_ALT_I3C,
-    MP_HAL_PIN_ALT_JTAG,
-    MP_HAL_PIN_ALT_LPCAM,
-    MP_HAL_PIN_ALT_LPI2C,
-    MP_HAL_PIN_ALT_LPI2S,
-    MP_HAL_PIN_ALT_LPPDM,
-    MP_HAL_PIN_ALT_LPSPI,
-    MP_HAL_PIN_ALT_LPTMR,
-    MP_HAL_PIN_ALT_LPUART,
-    MP_HAL_PIN_ALT_OSPI,
-    MP_HAL_PIN_ALT_PDM,
-    MP_HAL_PIN_ALT_QEC,
-    MP_HAL_PIN_ALT_SD,
-    MP_HAL_PIN_ALT_SPI,
-    MP_HAL_PIN_ALT_UART,
-    MP_HAL_PIN_ALT_UT,
+    MP_HAL_PIN_ALT_AUDIO_CLK,
+    MP_HAL_PIN_ALT_CAM_D0,
+    MP_HAL_PIN_ALT_CAM_D1,
+    MP_HAL_PIN_ALT_CAM_D2,
+    MP_HAL_PIN_ALT_CAM_D3,
+    MP_HAL_PIN_ALT_CAM_D4,
+    MP_HAL_PIN_ALT_CAM_D5,
+    MP_HAL_PIN_ALT_CAM_D6,
+    MP_HAL_PIN_ALT_CAM_D7,
+    MP_HAL_PIN_ALT_CAM_D8,
+    MP_HAL_PIN_ALT_CAM_D9,
+    MP_HAL_PIN_ALT_CAM_D10,
+    MP_HAL_PIN_ALT_CAM_D11,
+    MP_HAL_PIN_ALT_CAM_D12,
+    MP_HAL_PIN_ALT_CAM_D13,
+    MP_HAL_PIN_ALT_CAM_D14,
+    MP_HAL_PIN_ALT_CAM_D15,
+    MP_HAL_PIN_ALT_CAM_HSYNC,
+    MP_HAL_PIN_ALT_CAM_PCLK,
+    MP_HAL_PIN_ALT_CAM_VSYNC,
+    MP_HAL_PIN_ALT_CAM_XVCLK,
+    MP_HAL_PIN_ALT_CDC_D0,
+    MP_HAL_PIN_ALT_CDC_D1,
+    MP_HAL_PIN_ALT_CDC_D2,
+    MP_HAL_PIN_ALT_CDC_D3,
+    MP_HAL_PIN_ALT_CDC_D4,
+    MP_HAL_PIN_ALT_CDC_D5,
+    MP_HAL_PIN_ALT_CDC_D6,
+    MP_HAL_PIN_ALT_CDC_D7,
+    MP_HAL_PIN_ALT_CDC_D8,
+    MP_HAL_PIN_ALT_CDC_D9,
+    MP_HAL_PIN_ALT_CDC_D10,
+    MP_HAL_PIN_ALT_CDC_D11,
+    MP_HAL_PIN_ALT_CDC_D12,
+    MP_HAL_PIN_ALT_CDC_D13,
+    MP_HAL_PIN_ALT_CDC_D14,
+    MP_HAL_PIN_ALT_CDC_D15,
+    MP_HAL_PIN_ALT_CDC_D16,
+    MP_HAL_PIN_ALT_CDC_D17,
+    MP_HAL_PIN_ALT_CDC_D18,
+    MP_HAL_PIN_ALT_CDC_D19,
+    MP_HAL_PIN_ALT_CDC_D20,
+    MP_HAL_PIN_ALT_CDC_D21,
+    MP_HAL_PIN_ALT_CDC_D22,
+    MP_HAL_PIN_ALT_CDC_D23,
+    MP_HAL_PIN_ALT_CDC_DE,
+    MP_HAL_PIN_ALT_CDC_HSYNC,
+    MP_HAL_PIN_ALT_CDC_PCLK,
+    MP_HAL_PIN_ALT_CDC_VSYNC,
+    MP_HAL_PIN_ALT_CMP_OUT,
+    MP_HAL_PIN_ALT_ETH_CRS_DV_A,
+    MP_HAL_PIN_ALT_ETH_CRS_DV_B,
+    MP_HAL_PIN_ALT_ETH_CRS_DV_C,
+    MP_HAL_PIN_ALT_ETH_IRQ,
+    MP_HAL_PIN_ALT_ETH_MDC,
+    MP_HAL_PIN_ALT_ETH_MDIO,
+    MP_HAL_PIN_ALT_ETH_REFCLK,
+    MP_HAL_PIN_ALT_ETH_RST,
+    MP_HAL_PIN_ALT_ETH_RXD0,
+    MP_HAL_PIN_ALT_ETH_RXD1,
+    MP_HAL_PIN_ALT_ETH_TXD0,
+    MP_HAL_PIN_ALT_ETH_TXD1,
+    MP_HAL_PIN_ALT_ETH_TXEN,
+    MP_HAL_PIN_ALT_FAULT_A,
+    MP_HAL_PIN_ALT_FAULT_B,
+    MP_HAL_PIN_ALT_FAULT_C,
+    MP_HAL_PIN_ALT_HFXO_OUT,
+    MP_HAL_PIN_ALT_I2C_SCL,
+    MP_HAL_PIN_ALT_I2C_SDA,
+    MP_HAL_PIN_ALT_I2S_SCLK,
+    MP_HAL_PIN_ALT_I2S_SDI,
+    MP_HAL_PIN_ALT_I2S_SDO,
+    MP_HAL_PIN_ALT_I2S_WS,
+    MP_HAL_PIN_ALT_I3C_SCL,
+    MP_HAL_PIN_ALT_I3C_SDA,
+    MP_HAL_PIN_ALT_JTAG_TCK,
+    MP_HAL_PIN_ALT_JTAG_TDATA0,
+    MP_HAL_PIN_ALT_JTAG_TDATA1,
+    MP_HAL_PIN_ALT_JTAG_TDATA2,
+    MP_HAL_PIN_ALT_JTAG_TDATA3,
+    MP_HAL_PIN_ALT_JTAG_TDI,
+    MP_HAL_PIN_ALT_JTAG_TDO,
+    MP_HAL_PIN_ALT_JTAG_TMS,
+    MP_HAL_PIN_ALT_JTAG_TRACECLK,
+    MP_HAL_PIN_ALT_LPCAM_D0,
+    MP_HAL_PIN_ALT_LPCAM_D1,
+    MP_HAL_PIN_ALT_LPCAM_D2,
+    MP_HAL_PIN_ALT_LPCAM_D3,
+    MP_HAL_PIN_ALT_LPCAM_D4,
+    MP_HAL_PIN_ALT_LPCAM_D5,
+    MP_HAL_PIN_ALT_LPCAM_D6,
+    MP_HAL_PIN_ALT_LPCAM_D7,
+    MP_HAL_PIN_ALT_LPCAM_HSYNC,
+    MP_HAL_PIN_ALT_LPCAM_PCLK,
+    MP_HAL_PIN_ALT_LPCAM_VSYNC,
+    MP_HAL_PIN_ALT_LPCAM_XVCLK,
+    MP_HAL_PIN_ALT_LPI2C_SCL,
+    MP_HAL_PIN_ALT_LPI2C_SDA,
+    MP_HAL_PIN_ALT_LPI2S_SCLK,
+    MP_HAL_PIN_ALT_LPI2S_SDI,
+    MP_HAL_PIN_ALT_LPI2S_SDO,
+    MP_HAL_PIN_ALT_LPI2S_WS,
+    MP_HAL_PIN_ALT_LPPDM_C0,
+    MP_HAL_PIN_ALT_LPPDM_C1,
+    MP_HAL_PIN_ALT_LPPDM_C2,
+    MP_HAL_PIN_ALT_LPPDM_C3,
+    MP_HAL_PIN_ALT_LPPDM_D0,
+    MP_HAL_PIN_ALT_LPPDM_D1,
+    MP_HAL_PIN_ALT_LPPDM_D2,
+    MP_HAL_PIN_ALT_LPPDM_D3,
+    MP_HAL_PIN_ALT_LPSPI_MISO,
+    MP_HAL_PIN_ALT_LPSPI_MOSI,
+    MP_HAL_PIN_ALT_LPSPI_SCLK,
+    MP_HAL_PIN_ALT_LPSPI_SS,
+    MP_HAL_PIN_ALT_LPTMR_CLK,
+    MP_HAL_PIN_ALT_LPUART_CTS,
+    MP_HAL_PIN_ALT_LPUART_RTS,
+    MP_HAL_PIN_ALT_LPUART_RX,
+    MP_HAL_PIN_ALT_LPUART_TX,
+    MP_HAL_PIN_ALT_OSPI_D0,
+    MP_HAL_PIN_ALT_OSPI_D1,
+    MP_HAL_PIN_ALT_OSPI_D2,
+    MP_HAL_PIN_ALT_OSPI_D3,
+    MP_HAL_PIN_ALT_OSPI_D4,
+    MP_HAL_PIN_ALT_OSPI_D5,
+    MP_HAL_PIN_ALT_OSPI_D6,
+    MP_HAL_PIN_ALT_OSPI_D7,
+    MP_HAL_PIN_ALT_OSPI_RXDS,
+    MP_HAL_PIN_ALT_OSPI_SCLK,
+    MP_HAL_PIN_ALT_OSPI_SCLKN,
+    MP_HAL_PIN_ALT_OSPI_SS0,
+    MP_HAL_PIN_ALT_OSPI_SS1,
+    MP_HAL_PIN_ALT_PDM_C0,
+    MP_HAL_PIN_ALT_PDM_C1,
+    MP_HAL_PIN_ALT_PDM_C2,
+    MP_HAL_PIN_ALT_PDM_C3,
+    MP_HAL_PIN_ALT_PDM_D0,
+    MP_HAL_PIN_ALT_PDM_D1,
+    MP_HAL_PIN_ALT_PDM_D2,
+    MP_HAL_PIN_ALT_PDM_D3,
+    MP_HAL_PIN_ALT_QEC_X,
+    MP_HAL_PIN_ALT_QEC_Y,
+    MP_HAL_PIN_ALT_QEC_Z,
+    MP_HAL_PIN_ALT_SD_CLK,
+    MP_HAL_PIN_ALT_SD_CMD,
+    MP_HAL_PIN_ALT_SD_D0,
+    MP_HAL_PIN_ALT_SD_D1,
+    MP_HAL_PIN_ALT_SD_D2,
+    MP_HAL_PIN_ALT_SD_D3,
+    MP_HAL_PIN_ALT_SD_D4,
+    MP_HAL_PIN_ALT_SD_D5,
+    MP_HAL_PIN_ALT_SD_D6,
+    MP_HAL_PIN_ALT_SD_D7,
+    MP_HAL_PIN_ALT_SD_RST,
+    MP_HAL_PIN_ALT_SPI_MISO,
+    MP_HAL_PIN_ALT_SPI_MOSI,
+    MP_HAL_PIN_ALT_SPI_SCLK,
+    MP_HAL_PIN_ALT_SPI_SS0,
+    MP_HAL_PIN_ALT_SPI_SS1,
+    MP_HAL_PIN_ALT_SPI_SS2,
+    MP_HAL_PIN_ALT_SPI_SS3,
+    MP_HAL_PIN_ALT_UART_CTS,
+    MP_HAL_PIN_ALT_UART_DE,
+    MP_HAL_PIN_ALT_UART_RTS,
+    MP_HAL_PIN_ALT_UART_RX,
+    MP_HAL_PIN_ALT_UART_TX,
+    MP_HAL_PIN_ALT_UT_T0,
+    MP_HAL_PIN_ALT_UT_T1,
 };
 
 typedef struct _machine_pin_obj_t {
@@ -130,7 +279,7 @@ typedef struct _machine_pin_obj_t {
     uint8_t adc12_periph : 2;
     uint8_t adc12_channel : 3;
     qstr name;
-    const uint8_t alt[8];
+    const uint16_t alt[8]; // holds result of MP_HAL_PIN_ALT_MAKE(function, unit)
 } machine_pin_obj_t;
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
diff --git a/ports/alif/mpuart.c b/ports/alif/mpuart.c
index 4fe82ce123176..b646e6f2be471 100644
--- a/ports/alif/mpuart.c
+++ b/ports/alif/mpuart.c
@@ -91,8 +91,10 @@ void mp_uart_init(unsigned int uart_id, uint32_t baudrate,
     uart_state_t *state = &uart_state[uart_id];
 
     // Configure TX/RX pins.
-    mp_hal_pin_config(tx, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, false);
-    mp_hal_pin_config(rx, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, true);
+    mp_hal_pin_config(tx, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(UART_TX, uart_id), false);
+    mp_hal_pin_config(rx, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(UART_RX, uart_id), true);
 
     // Configure the UART peripheral.
     select_uart_clock_syst_pclk(uart_id);
@@ -152,11 +154,13 @@ void mp_uart_set_flow(unsigned int uart_id, mp_hal_pin_obj_t rts, mp_hal_pin_obj
     unsigned int flow = UART_FLOW_CONTROL_NONE;
     if (rts != NULL) {
         flow |= UART_FLOW_CONTROL_RTS;
-        mp_hal_pin_config(rts, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, false);
+        mp_hal_pin_config(rts, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(UART_RTS, uart_id), false);
     }
     if (cts != NULL) {
         flow |= UART_FLOW_CONTROL_CTS;
-        mp_hal_pin_config(cts, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT_UART, true);
+        mp_hal_pin_config(cts, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(UART_CTS, uart_id), true);
     }
     uart_set_flow_control(uart, flow);
 }
diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 17c8be8128da3..9ba7ebe6eca63 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -262,40 +262,41 @@ int ospi_flash_init(void) {
 
     self->pin = pin;
 
+    unsigned int unit = pin->peripheral_number;
     mp_hal_pin_config(pin->pin_cs, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, false);
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_SS0, unit), false);
     mp_hal_pin_config(pin->pin_clk_p, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, false);
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_SCLK, unit), false);
     if (pin->pin_clk_n != NULL) {
         mp_hal_pin_config(pin->pin_clk_n, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, false);
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_SCLKN, unit), false);
     }
     if (pin->pin_rwds != NULL) {
         mp_hal_pin_config(pin->pin_rwds, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_RXDS, unit), true);
         if (pin->pin_rwds->port == PORT_10 && pin->pin_rwds->pin == PIN_7) {
             // Alif: P5_6 is needed to support proper alt function selection of P10_7.
             mp_hal_pin_config(pin_P5_6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-                MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+                MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_RXDS, unit), true);
         }
     }
     mp_hal_pin_config(pin->pin_d0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D0, unit), true);
     mp_hal_pin_config(pin->pin_d1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D1, unit), true);
     mp_hal_pin_config(pin->pin_d2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
-        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D2, unit), true);
     mp_hal_pin_config(pin->pin_d3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+        MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D3, unit), true);
     if (pin->pin_d4 != NULL) {
         mp_hal_pin_config(pin->pin_d4, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D4, unit), true);
         mp_hal_pin_config(pin->pin_d5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D5, unit), true);
         mp_hal_pin_config(pin->pin_d6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D6, unit), true);
         mp_hal_pin_config(pin->pin_d7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
-            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT_OSPI, true);
+            MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D7, unit), true);
     }
 
     // Reset the SPI flash.

From 3564ce5bd8c22254c39a556232891f9d43201eac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Mar 2025 12:35:26 +1100
Subject: [PATCH 2108/3129] alif/ospi_flash: Don't invalidate cache after
 erasing/writing.

It's not needed, the MPU configures the XIP as non-cacheable.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/ospi_flash.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 9ba7ebe6eca63..8bcd1fb5b13af 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -393,14 +393,11 @@ int ospi_flash_erase_sector(uint32_t addr) {
 
     ospi_flash_write_cmd(self, self->set->write_en);
     int ret = ospi_flash_wait_wel1(self);
-    if (ret < 0) {
-        return ret;
+    if (ret == 0) {
+        ospi_flash_write_cmd_addr(self, self->set->erase_command, OSPI_ADDR_L_32bit, addr);
+        ret = ospi_flash_wait_wip0(self);
     }
 
-    ospi_flash_write_cmd_addr(self, self->set->erase_command, OSPI_ADDR_L_32bit, addr);
-    ret = ospi_flash_wait_wip0(self);
-
-    SCB_InvalidateDCache_by_Addr(global_flash.cfg.xip_base + addr, MICROPY_HW_FLASH_BLOCK_SIZE_BYTES);
     return ret;
 }
 
@@ -463,7 +460,6 @@ int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
         offset = 0;
     }
 
-    SCB_InvalidateDCache_by_Addr(global_flash.cfg.xip_base + addr, len);
     return ret;
 }
 

From df5e4ced762aac83200906c34e6dfcda7b7ccd6e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Mar 2025 12:35:50 +1100
Subject: [PATCH 2109/3129] alif/ospi_flash_settings: Use 8-bit DFS for XIP.

To match the instruction length, so the DFS is restored to the XIP value
after an erase or write (due to the final wait WIP).

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

diff --git a/ports/alif/ospi_flash_settings.h b/ports/alif/ospi_flash_settings.h
index 72403c26b67b5..89686c4946c4b 100644
--- a/ports/alif/ospi_flash_settings.h
+++ b/ports/alif/ospi_flash_settings.h
@@ -53,7 +53,7 @@
     .rxds = false, \
     .bswap16 = false, \
     .inst_len = OSPI_INST_L_8bit, \
-    .xip_data_len = OSPI_DATA_L_16bit, \
+    .xip_data_len = OSPI_DATA_L_8bit, \
     .read_sr = 0x05, \
     .read_sr_dummy_cycles = 8, \
     .write_en = 0x06, \
@@ -70,7 +70,7 @@
     .rxds = false, \
     .bswap16 = false, \
     .inst_len = OSPI_INST_L_8bit, \
-    .xip_data_len = OSPI_DATA_L_16bit, \
+    .xip_data_len = OSPI_DATA_L_8bit, \
     .read_sr = 0x05, \
     .read_sr_dummy_cycles = 8, \
     .write_en = 0x06, \

From c395f5ebb07a2ebcafba32178f5d7680771969a3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Apr 2025 23:07:27 +1100
Subject: [PATCH 2110/3129] alif/ospi_flash: Restore XIP settings after erase
 and write.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/ospi_ext.c   | 28 ++++++++++++++++++----------
 ports/alif/ospi_ext.h   |  1 +
 ports/alif/ospi_flash.c | 16 +++++++++++++++-
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/ports/alif/ospi_ext.c b/ports/alif/ospi_ext.c
index e3389d8bd54da..6ddaaf4e5a325 100644
--- a/ports/alif/ospi_ext.c
+++ b/ports/alif/ospi_ext.c
@@ -206,20 +206,22 @@ void ospi_setup_write_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_l
     spi_enable(ospi_cfg);
 }
 
+static inline uint32_t ospi_xip_ctrlr0(uint32_t data_len) {
+    return CTRLR0_IS_MST
+           | (OCTAL << CTRLR0_SPI_FRF_OFFSET)
+           | (0 << CTRLR0_SCPOL_OFFSET)
+           | (0 << CTRLR0_SCPH_OFFSET)
+           | (0 << CTRLR0_SSTE_OFFSET)
+           | (TMOD_RO << CTRLR0_TMOD_OFFSET)
+           | (data_len << CTRLR0_DFS_OFFSET);
+}
+
 void ospi_xip_enter_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles) {
     spi_disable(ospi_cfg);
 
-    uint32_t val = CTRLR0_IS_MST
-        | (OCTAL << CTRLR0_SPI_FRF_OFFSET)
-        | (0 << CTRLR0_SCPOL_OFFSET)
-        | (0 << CTRLR0_SCPH_OFFSET)
-        | (0 << CTRLR0_SSTE_OFFSET)
-        | (TMOD_RO << CTRLR0_TMOD_OFFSET)
-        | (data_len << CTRLR0_DFS_OFFSET);
-
-    ospi_writel(ospi_cfg, ctrlr0, val);
+    ospi_writel(ospi_cfg, ctrlr0, ospi_xip_ctrlr0(data_len));
 
-    val = (OCTAL << XIP_CTRL_FRF_OFFSET)
+    uint32_t val = (OCTAL << XIP_CTRL_FRF_OFFSET)
         | (0x2 << XIP_CTRL_TRANS_TYPE_OFFSET)
         | (ADDR_L32bit << XIP_CTRL_ADDR_L_OFFSET)
         | (inst_len << XIP_CTRL_INST_L_OFFSET)
@@ -292,3 +294,9 @@ void ospi_xip_exit_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint16_t i
     ospi_xip_enable(ospi_cfg);
     ospi_xip_disable(ospi_cfg);
 }
+
+void ospi_xip_restore_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len) {
+    spi_disable(ospi_cfg);
+    ospi_writel(ospi_cfg, ctrlr0, ospi_xip_ctrlr0(data_len));
+    spi_enable(ospi_cfg);
+}
diff --git a/ports/alif/ospi_ext.h b/ports/alif/ospi_ext.h
index e5a2b50beb693..65e2ced1ff7bc 100644
--- a/ports/alif/ospi_ext.h
+++ b/ports/alif/ospi_ext.h
@@ -53,5 +53,6 @@ void ospi_setup_write_ext(ospi_flash_cfg_t *ospi_cfg, bool rxds, uint32_t inst_l
 
 void ospi_xip_enter_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint32_t data_len, uint16_t incr_command, uint16_t wrap_command, uint16_t read_dummy_cycles);
 void ospi_xip_exit_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t inst_len, uint16_t incr_command, uint16_t wrap_command);
+void ospi_xip_restore_ext(ospi_flash_cfg_t *ospi_cfg, uint32_t data_len);
 
 #endif // MICROPY_INCLUDED_ALIF_OSPI_EXT_H
diff --git a/ports/alif/ospi_flash.c b/ports/alif/ospi_flash.c
index 8bcd1fb5b13af..f78002eb0ef97 100644
--- a/ports/alif/ospi_flash.c
+++ b/ports/alif/ospi_flash.c
@@ -354,8 +354,9 @@ int ospi_flash_init(void) {
         }
     }
 
-    // Enter XIP mode.  It will be disabled during flash read/erase/write.
+    // Enter XIP mode.
     ospi_flash_xip_enter(self);
+
     return 0;
 }
 
@@ -385,6 +386,13 @@ int ospi_flash_xip_exit(ospi_flash_t *self) {
     return 0;
 }
 
+int ospi_flash_xip_restore(ospi_flash_t *self) {
+    if (self->xip_active) {
+        ospi_xip_restore_ext(&self->cfg, self->set->xip_data_len);
+    }
+    return 0;
+}
+
 /******************************************************************************/
 // Top-level read/erase/write functions.
 
@@ -398,6 +406,8 @@ int ospi_flash_erase_sector(uint32_t addr) {
         ret = ospi_flash_wait_wip0(self);
     }
 
+    ospi_flash_xip_restore(self);
+
     return ret;
 }
 
@@ -442,6 +452,8 @@ static int ospi_flash_write_page(uint32_t addr, uint32_t len, const uint8_t *src
 }
 
 int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
+    ospi_flash_t *self = &global_flash;
+
     int ret = 0;
     uint32_t offset = addr & (PAGE_SIZE - 1);
 
@@ -460,6 +472,8 @@ int ospi_flash_write(uint32_t addr, uint32_t len, const uint8_t *src) {
         offset = 0;
     }
 
+    ospi_flash_xip_restore(self);
+
     return ret;
 }
 

From b79b64a726d9f1796605f75980d2ae52595863f8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Mar 2025 22:40:58 +1100
Subject: [PATCH 2111/3129] alif/mpu: Add MPU region for OSPI1 XIP memory
 range.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpu.c | 4 ++++
 ports/alif/mpu.h | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/alif/mpu.c b/ports/alif/mpu.c
index 60753674ae1e5..9a051794de845 100644
--- a/ports/alif/mpu.c
+++ b/ports/alif/mpu.c
@@ -54,6 +54,10 @@ static const ARM_MPU_Region_t mpu_table[] __STARTUP_RO_DATA_ATTRIBUTE = {
         .RBAR = ARM_MPU_RBAR(0xA0000000, ARM_MPU_SH_NON, 1, 1, 0),
         .RLAR = ARM_MPU_RLAR(0xBFFFFFFF, MP_MPU_ATTR_NORMAL_NON_CACHEABLE)
     },
+    [MP_MPU_REGION_OSPI1_XIP] = {   /* OSPI1 XIP flash - 512MB : RO-1, NP-1, XN-0  */
+        .RBAR = ARM_MPU_RBAR(0xC0000000, ARM_MPU_SH_NON, 1, 1, 0),
+        .RLAR = ARM_MPU_RLAR(0xDFFFFFFF, MP_MPU_ATTR_NORMAL_NON_CACHEABLE)
+    },
 };
 
 void MPU_Load_Regions(void) {
diff --git a/ports/alif/mpu.h b/ports/alif/mpu.h
index 1d3602941efb7..f4df496683e55 100644
--- a/ports/alif/mpu.h
+++ b/ports/alif/mpu.h
@@ -38,6 +38,7 @@
 #define MP_MPU_REGION_MRAM                  (3)
 #define MP_MPU_REGION_OSPI_REGISTERS        (4)
 #define MP_MPU_REGION_OSPI0_XIP             (5)
-#define MP_MPU_REGION_OPENAMP               (6)
+#define MP_MPU_REGION_OSPI1_XIP             (6)
+#define MP_MPU_REGION_OPENAMP               (7)
 
 void mpu_config_mram(bool read_only);

From 7c216d17b6e1d8394d05fd5eaae1c812c3846963 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 17 Dec 2023 12:12:06 +0100
Subject: [PATCH 2112/3129] alif/boards/ALIF_ENSEMBLE: Add Alif Ensemble board
 config.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/boards/ALIF_ENSEMBLE/board.c       | 56 +++++++++++++++++++
 ports/alif/boards/ALIF_ENSEMBLE/board.ld.S    | 14 +++++
 .../alif/boards/ALIF_ENSEMBLE/mpconfigboard.h | 56 +++++++++++++++++++
 .../boards/ALIF_ENSEMBLE/mpconfigboard.mk     | 11 ++++
 .../alif/boards/ALIF_ENSEMBLE/ospi_xip_user.h |  5 ++
 ports/alif/boards/ALIF_ENSEMBLE/pins.csv      | 30 ++++++++++
 6 files changed, 172 insertions(+)
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/board.c
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/board.ld.S
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.h
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.mk
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/ospi_xip_user.h
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/pins.csv

diff --git a/ports/alif/boards/ALIF_ENSEMBLE/board.c b/ports/alif/boards/ALIF_ENSEMBLE/board.c
new file mode 100644
index 0000000000000..72b93e31ffbea
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/board.c
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "ospi_ext.h"
+#include "ospi_flash.h"
+
+const ospi_pin_settings_t ospi_pin_settings = {
+    .peripheral_number = 1,
+    .pin_reset = pin_OSPI1_RESET,
+    .pin_cs = pin_OSPI1_CS,
+    .pin_clk_p = pin_OSPI1_SCLK,
+    .pin_clk_n = NULL,
+    .pin_rwds = pin_OSPI1_RXDS,
+    .pin_d0 = pin_OSPI1_D0,
+    .pin_d1 = pin_OSPI1_D1,
+    .pin_d2 = pin_OSPI1_D2,
+    .pin_d3 = pin_OSPI1_D3,
+    .pin_d4 = pin_OSPI1_D4,
+    .pin_d5 = pin_OSPI1_D5,
+    .pin_d6 = pin_OSPI1_D6,
+    .pin_d7 = pin_OSPI1_D7,
+};
+
+const ospi_flash_settings_t ospi_flash_settings[] = {
+    {
+        .jedec_id = 0x1a5b9d,
+        .freq_hz = 100000000,
+        .read_dummy_cycles = 9,
+        OSPI_FLASH_SETTINGS_IS25,
+    },
+};
+const size_t ospi_flash_settings_len = 1;
diff --git a/ports/alif/boards/ALIF_ENSEMBLE/board.ld.S b/ports/alif/boards/ALIF_ENSEMBLE/board.ld.S
new file mode 100644
index 0000000000000..7adcdbbcc3761
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/board.ld.S
@@ -0,0 +1,14 @@
+#include "mcu/ensemble.ld.S"
+
+/* Define ROMFS partition locations. */
+#if CORE_M55_HP
+/* The HP core has access to the external OSPI1 flash and MRAM ROMFS partitions. */
+_micropy_hw_romfs_part0_start = 0xc1000000;
+_micropy_hw_romfs_part0_size = 16M;
+_micropy_hw_romfs_part1_start = ORIGIN(MRAM_FS);
+_micropy_hw_romfs_part1_size = LENGTH(MRAM_FS);
+#else
+/* The HP core has access to the MRAM ROMFS partition. */
+_micropy_hw_romfs_part0_start = ORIGIN(MRAM_FS);
+_micropy_hw_romfs_part0_size = LENGTH(MRAM_FS);
+#endif
diff --git a/ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.h b/ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.h
new file mode 100644
index 0000000000000..8a6003ebbfb53
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.h
@@ -0,0 +1,56 @@
+#define MICROPY_HW_BOARD_NAME                   "Alif Ensemble DevKit"
+#define MICROPY_HW_MCU_NAME                     "AE722F80F55D5XX"
+
+#define MICROPY_HW_ENABLE_UART_REPL             (CORE_M55_HP)
+#define MICROPY_HW_UART_REPL                    (4)
+#define MICROPY_HW_USB_MSC                      (1)
+#define MICROPY_HW_ENABLE_HW_I2C                (1)
+
+// ROMFS partitions
+#define MICROPY_HW_ROMFS_ENABLE_PART0           (1)
+#define MICROPY_HW_ROMFS_ENABLE_PART1           (CORE_M55_HP)
+
+// I2C buses
+#define MICROPY_HW_I2C0_SCL                     (pin_P0_3)
+#define MICROPY_HW_I2C0_SDA                     (pin_P0_2)
+#define MICROPY_HW_I2C1_SCL                     (pin_P3_7)
+#define MICROPY_HW_I2C1_SDA                     (pin_P3_6)
+#define MICROPY_HW_I2C2_SCL                     (pin_P5_1)
+#define MICROPY_HW_I2C2_SDA                     (pin_P5_0)
+#define MICROPY_HW_I2C3_SCL                     (pin_P1_1)
+#define MICROPY_HW_I2C3_SDA                     (pin_P1_0)
+
+// SPI buses
+#define MICROPY_HW_SPI0_MISO                    (pin_P1_0)
+#define MICROPY_HW_SPI0_MOSI                    (pin_P1_1)
+#define MICROPY_HW_SPI0_SCK                     (pin_P1_2)
+#define MICROPY_HW_SPI1_MISO                    (pin_P2_4)
+#define MICROPY_HW_SPI1_MOSI                    (pin_P2_5)
+#define MICROPY_HW_SPI1_SCK                     (pin_P2_6)
+#define MICROPY_HW_SPI2_MISO                    (pin_P4_2)
+#define MICROPY_HW_SPI2_MOSI                    (pin_P4_3)
+#define MICROPY_HW_SPI2_SCK                     (pin_P4_4)
+#define MICROPY_HW_SPI3_MISO                    (pin_P12_4)
+#define MICROPY_HW_SPI3_MOSI                    (pin_P12_5)
+#define MICROPY_HW_SPI3_SCK                     (pin_P12_6)
+#define MICROPY_HW_LPSPI0_MISO                  (pin_P7_4)
+#define MICROPY_HW_LPSPI0_MOSI                  (pin_P7_5)
+#define MICROPY_HW_LPSPI0_SCK                   (pin_P7_6)
+
+// UART buses
+#define MICROPY_HW_UART0_TX                     (pin_P0_1)
+#define MICROPY_HW_UART0_RX                     (pin_P0_0)
+#define MICROPY_HW_UART0_RTS                    (pin_P0_3)
+#define MICROPY_HW_UART0_CTS                    (pin_P0_2)
+#define MICROPY_HW_UART1_TX                     (pin_P0_5)
+#define MICROPY_HW_UART1_RX                     (pin_P0_4)
+#define MICROPY_HW_UART1_RTS                    (pin_P0_7)
+#define MICROPY_HW_UART1_CTS                    (pin_P0_6)
+#define MICROPY_HW_REPL_UART_TX                 (pin_P12_2)
+#define MICROPY_HW_REPL_UART_RX                 (pin_P12_1)
+
+// This is used for alif.Flash() and USB MSC.
+#define MICROPY_HW_FLASH_STORAGE_BASE_ADDR      (0)
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (32 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_FS_BYTES       (16 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_ROMFS_BYTES    (16 * 1024 * 1024)
diff --git a/ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.mk b/ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.mk
new file mode 100644
index 0000000000000..d35a7aad84a07
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/mpconfigboard.mk
@@ -0,0 +1,11 @@
+MCU_SERIES = E7
+MCU_VARIANT = AE722F80F55D5XX
+JLINK_DEV = AE722F80F55D5_HP
+LD_FILE = boards/ALIF_ENSEMBLE/board.ld.S
+
+ALIF_TOOLKIT_CFG_PART = AE722F80F55D5LS
+ALIF_TOOLKIT_CFG_FILE = \"app-device-config-ae7.json\"
+
+MICROPY_FLOAT_IMPL = float
+MICROPY_PY_OPENAMP = 1
+MICROPY_PY_OPENAMP_REMOTEPROC = 1
diff --git a/ports/alif/boards/ALIF_ENSEMBLE/ospi_xip_user.h b/ports/alif/boards/ALIF_ENSEMBLE/ospi_xip_user.h
new file mode 100644
index 0000000000000..49921bdd22ddc
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/ospi_xip_user.h
@@ -0,0 +1,5 @@
+// This file is needed by ospi_xip/source/ospi/ospi_drv.c.
+#define OSPI_XIP_ENABLE_AES_DECRYPTION (0)
+#define OSPI_XIP_RX_SAMPLE_DELAY (3)
+#define OSPI_XIP_DDR_DRIVE_EDGE (1)
+#define OSPI_XIP_RXDS_DELAY (12)
diff --git a/ports/alif/boards/ALIF_ENSEMBLE/pins.csv b/ports/alif/boards/ALIF_ENSEMBLE/pins.csv
new file mode 100644
index 0000000000000..ec397d9cf604c
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/pins.csv
@@ -0,0 +1,30 @@
+# OSP1 flash
+OSPI1_RESET,P15_7
+OSPI1_CS,P5_7
+OSPI1_SCLK,P5_5
+OSPI1_D0,P9_5
+OSPI1_D1,P9_6
+OSPI1_D2,P9_7
+OSPI1_D3,P10_0
+OSPI1_D4,P10_1
+OSPI1_D5,P10_2
+OSPI1_D6,P10_3
+OSPI1_D7,P10_4
+OSPI1_RXDS,P10_7
+
+LED_BLUE,P12_0
+LED_RED,P12_3
+JOY_LEFT,P15_0
+JOY_RIGHT,P15_1
+
+# UART buses
+UART0_TX,P0_1
+UART0_RX,P0_0
+UART0_RTS,P0_3
+UART0_CTS,P0_2
+UART1_TX,P0_5
+UART1_RX,P0_4
+UART1_RTS,P0_7
+UART1_CTS,P0_6
+REPL_UART_TX,P12_2
+REPL_UART_RX,P12_1

From 704d2f2d57b3e30b3b0d0cf02849e9784b60ccb6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 2 Sep 2024 21:24:47 +1000
Subject: [PATCH 2113/3129] alif/boards/OPENMV_AE3: Add OpenMV AE3 board
 definition.

Supports Murata 1YN for WiFi and BLE.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/boards/OPENMV_AE3/board.c          | 192 ++++++++++++++++++
 ports/alif/boards/OPENMV_AE3/board.ld.S       |  14 ++
 ports/alif/boards/OPENMV_AE3/mpconfigboard.h  |  85 ++++++++
 ports/alif/boards/OPENMV_AE3/mpconfigboard.mk |  22 ++
 ports/alif/boards/OPENMV_AE3/ospi_xip_user.h  |   6 +
 ports/alif/boards/OPENMV_AE3/pins.csv         |  69 +++++++
 6 files changed, 388 insertions(+)
 create mode 100644 ports/alif/boards/OPENMV_AE3/board.c
 create mode 100644 ports/alif/boards/OPENMV_AE3/board.ld.S
 create mode 100644 ports/alif/boards/OPENMV_AE3/mpconfigboard.h
 create mode 100644 ports/alif/boards/OPENMV_AE3/mpconfigboard.mk
 create mode 100644 ports/alif/boards/OPENMV_AE3/ospi_xip_user.h
 create mode 100644 ports/alif/boards/OPENMV_AE3/pins.csv

diff --git a/ports/alif/boards/OPENMV_AE3/board.c b/ports/alif/boards/OPENMV_AE3/board.c
new file mode 100644
index 0000000000000..65da152d8536f
--- /dev/null
+++ b/ports/alif/boards/OPENMV_AE3/board.c
@@ -0,0 +1,192 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 OpenMV LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "ospi_ext.h"
+#include "ospi_flash.h"
+#include "se_services.h"
+
+#define OMV_BOOT_MAGIC_ADDR     (0x200FFFFCU)
+#define OMV_BOOT_MAGIC_VALUE    (0xB00710ADU)
+
+#if CORE_M55_HP
+#define NPU_IRQ_NUMBER          NPU_HP_IRQ_IRQn
+#define NPU_BASE_ADDRESS        (void *)NPU_HP_BASE
+#else
+#define NPU_IRQ_NUMBER          NPU_HE_IRQ_IRQn
+#define NPU_BASE_ADDRESS        (void *)NPU_HE_BASE
+#endif
+
+typedef struct {
+    volatile uint32_t ID;       // 0x0
+    volatile uint32_t STATUS;   // 0x4
+    volatile uint32_t CMD;      // 0x8
+    volatile uint32_t RESET;    // 0xC
+} npu_regs_t;
+
+#define NPU ((npu_regs_t *)NPU_BASE_ADDRESS)
+
+const ospi_pin_settings_t ospi_pin_settings = {
+    .peripheral_number = 0,
+    .pin_reset = pin_FLASH_RESET,
+    .pin_cs = pin_FLASH_CS,
+    .pin_clk_p = pin_FLASH_SCLK_P,
+    .pin_clk_n = pin_FLASH_SCLK_N,
+    .pin_rwds = pin_FLASH_DQSM,
+    .pin_d0 = pin_FLASH_D0,
+    .pin_d1 = pin_FLASH_D1,
+    .pin_d2 = pin_FLASH_D2,
+    .pin_d3 = pin_FLASH_D3,
+    .pin_d4 = pin_FLASH_D4,
+    .pin_d5 = pin_FLASH_D5,
+    .pin_d6 = pin_FLASH_D6,
+    .pin_d7 = pin_FLASH_D7,
+};
+
+const ospi_flash_settings_t ospi_flash_settings[] = {
+    {
+        .jedec_id = 0x3980c2,
+        .freq_hz = 100000000,
+        .read_dummy_cycles = 10,
+        OSPI_FLASH_SETTINGS_MX25,
+    },
+    {
+        .jedec_id = 0x195b9d,
+        .freq_hz = 100000000,
+        .read_dummy_cycles = 9,
+        OSPI_FLASH_SETTINGS_IS25,
+    },
+    {
+        .jedec_id = 0x17bb6b,
+        .freq_hz = 100000000,
+        .read_dummy_cycles = 7,
+        OSPI_FLASH_SETTINGS_EM,
+    },
+};
+const size_t ospi_flash_settings_len = 3;
+
+void board_startup(void) {
+    // Switch the USB multiplexer to use the Alif USB port.
+    mp_hal_pin_output(pin_USB_D_SEL);
+    mp_hal_pin_high(pin_USB_D_SEL);
+}
+
+void board_enter_bootloader(void) {
+    *((uint32_t *)OMV_BOOT_MAGIC_ADDR) = OMV_BOOT_MAGIC_VALUE;
+    NVIC_SystemReset();
+}
+
+void board_early_init(void) {
+    // Set default run profile
+    run_profile_t run_profile = {
+        .dcdc_mode = DCDC_MODE_PWM,
+        .dcdc_voltage = DCDC_VOUT_0825,
+        // CLK_SRC_LFRC or CLK_SRC_LFXO
+        .aon_clk_src = CLK_SRC_LFXO,
+        // CLK_SRC_HFRC, CLK_SRC_HFXO or CLK_SRC_PLL
+        .run_clk_src = CLK_SRC_PLL,
+        #if CORE_M55_HP
+        .cpu_clk_freq = CLOCK_FREQUENCY_400MHZ,
+        #else
+        .cpu_clk_freq = CLOCK_FREQUENCY_160MHZ,
+        #endif
+        .scaled_clk_freq = SCALED_FREQ_XO_HIGH_DIV_38_4_MHZ,
+        // AON, modem aon, SSE-700 AON, modem, SYSTOP, DEBUG, SE
+        .power_domains = PD_VBAT_AON_MASK | PD_SSE700_AON_MASK | PD_SYST_MASK |
+            PD_DBSS_MASK | PD_SESS_MASK | PD_SRAMS_MASK | PD_SRAM_CTRL_AON_MASK,
+        // Add all memories
+        .memory_blocks = SERAM_MASK | SRAM0_MASK | SRAM1_MASK | MRAM_MASK | BACKUP4K_MASK |
+            SRAM6A_MASK | SRAM6B_MASK | SRAM7_1_MASK | SRAM7_2_MASK | SRAM7_3_MASK |
+            SRAM8_MASK | SRAM9_MASK | FWRAM_MASK,
+        .phy_pwr_gating = LDO_PHY_MASK | USB_PHY_MASK | MIPI_TX_DPHY_MASK | MIPI_RX_DPHY_MASK |
+            MIPI_PLL_DPHY_MASK,
+        .vdd_ioflex_3V3 = IOFLEX_LEVEL_3V3,
+    };
+
+    if (se_services_set_run_profile(&run_profile)) {
+        MICROPY_BOARD_FATAL_ERROR("se_services_set_run_profile");
+    }
+
+    // Set default off profile
+    off_profile_t off_profile = {
+        .dcdc_mode = DCDC_MODE_PWM,
+        .dcdc_voltage = DCDC_VOUT_0825,
+        // CLK_SRC_LFRC or CLK_SRC_LFXO
+        .aon_clk_src = CLK_SRC_LFXO,
+        // CLK_SRC_HFRC, CLK_SRC_HFXO or CLK_SRC_PLL
+        .stby_clk_src = CLK_SRC_HFRC,
+        .stby_clk_freq = SCALED_FREQ_RC_STDBY_76_8_MHZ,
+        // Disable all power domains.
+        .power_domains = 0,
+        // Add all memories
+        .memory_blocks = SERAM_MASK | SRAM0_MASK | SRAM1_MASK | MRAM_MASK | BACKUP4K_MASK |
+            SRAM6A_MASK | SRAM6B_MASK | SRAM7_1_MASK | SRAM7_2_MASK | SRAM7_3_MASK |
+            SRAM8_MASK | SRAM9_MASK | FWRAM_MASK,
+        .phy_pwr_gating = LDO_PHY_MASK | USB_PHY_MASK | MIPI_TX_DPHY_MASK | MIPI_RX_DPHY_MASK |
+            MIPI_PLL_DPHY_MASK,
+        .vdd_ioflex_3V3 = IOFLEX_LEVEL_3V3,
+        .vtor_address = SCB->VTOR,
+        .vtor_address_ns = SCB->VTOR,
+        .ewic_cfg = EWIC_RTC_A,
+        .wakeup_events = WE_LPRTC,
+    };
+
+    if (se_services_set_off_profile(&off_profile)) {
+        MICROPY_BOARD_FATAL_ERROR("se_services_set_off_profile");
+    }
+
+    // Select PLL for PD4 memory.
+    if (se_services_select_pll_source(PLL_SOURCE_PLL, PLL_TARGET_PD4_SRAM)) {
+        MICROPY_BOARD_FATAL_ERROR("se_services_select_pll_source");
+    }
+}
+
+MP_WEAK void board_enter_stop(void) {
+    // Disable NPU interrupt
+    NVIC_DisableIRQ(NPU_IRQ_NUMBER);
+    NVIC_ClearPendingIRQ(NPU_IRQ_NUMBER);
+
+    // Soft-reset NPU
+    NPU->RESET = 0x00000000;
+
+    // Wait until reset
+    uint32_t data = 0;
+    do {
+        // Poll channel0 status registers
+        data = NPU->STATUS;
+    } while (data);
+
+    // Set default value, enables off for clocks and power.
+    NPU->CMD = 0x0000000C;
+}
+
+MP_WEAK void board_enter_standby(void) {
+
+}
+
+MP_WEAK void board_exit_standby(void) {
+
+}
diff --git a/ports/alif/boards/OPENMV_AE3/board.ld.S b/ports/alif/boards/OPENMV_AE3/board.ld.S
new file mode 100644
index 0000000000000..0d09bb15f874f
--- /dev/null
+++ b/ports/alif/boards/OPENMV_AE3/board.ld.S
@@ -0,0 +1,14 @@
+#include "mcu/ensemble.ld.S"
+
+/* Define ROMFS partition locations. */
+#if CORE_M55_HP
+/* The HP core has access to the external OSPI flash and MRAM ROMFS partitions. */
+_micropy_hw_romfs_part0_start = 0xa1000000;
+_micropy_hw_romfs_part0_size = 16M;
+_micropy_hw_romfs_part1_start = ORIGIN(MRAM_FS);
+_micropy_hw_romfs_part1_size = LENGTH(MRAM_FS);
+#else
+/* The HP core has access to the MRAM ROMFS partition. */
+_micropy_hw_romfs_part0_start = ORIGIN(MRAM_FS);
+_micropy_hw_romfs_part0_size = LENGTH(MRAM_FS);
+#endif
diff --git a/ports/alif/boards/OPENMV_AE3/mpconfigboard.h b/ports/alif/boards/OPENMV_AE3/mpconfigboard.h
new file mode 100644
index 0000000000000..cbdbd063ed3df
--- /dev/null
+++ b/ports/alif/boards/OPENMV_AE3/mpconfigboard.h
@@ -0,0 +1,85 @@
+#define MICROPY_HW_BOARD_NAME       "OpenMV-AE3"
+#define MICROPY_HW_MCU_NAME         "AE302F80F55D5AE"
+
+#define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
+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;
+
+#define MICROPY_HW_USB_MSC          (CORE_M55_HP)
+#define MICROPY_HW_ENABLE_HW_I2C    (1)
+#define MICROPY_HW_ENABLE_OSPI      (CORE_M55_HP)
+
+// ROMFS partitions
+#define MICROPY_HW_ROMFS_ENABLE_PART0 (1)
+#define MICROPY_HW_ROMFS_ENABLE_PART1 (CORE_M55_HP)
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pin_P0_5)
+#define MICROPY_HW_I2C1_SDA         (pin_P0_4)
+
+#define MICROPY_HW_I2C2_SCL         (pin_P5_1)
+#define MICROPY_HW_I2C2_SDA         (pin_P5_0)
+
+#define MICROPY_HW_I2C3_SCL         (pin_P1_1)
+#define MICROPY_HW_I2C3_SDA         (pin_P1_0)
+
+// SPI buses
+#define MICROPY_HW_SPI0_MISO        (pin_P5_0)
+#define MICROPY_HW_SPI0_MOSI        (pin_P5_1)
+// #define MICROPY_HW_SPI0_NSS         (pin_P5_2)
+#define MICROPY_HW_SPI0_SCK         (pin_P5_3)
+
+// UART buses
+#define MICROPY_HW_UART1_TX         (pin_P0_5)
+#define MICROPY_HW_UART1_RX         (pin_P0_4)
+#define MICROPY_HW_UART3_TX         (pin_P1_3)
+#define MICROPY_HW_UART3_RX         (pin_P1_2)
+#define MICROPY_HW_UART3_RTS        (pin_P7_3)
+#define MICROPY_HW_UART3_CTS        (pin_P7_2)
+#define MICROPY_HW_UART4_TX         (pin_P5_1)
+#define MICROPY_HW_UART4_RX         (pin_P5_0)
+#define MICROPY_HW_UART5_TX         (pin_P5_3)
+#define MICROPY_HW_UART5_RX         (pin_P5_2)
+
+#define MICROPY_HW_USB_VID          0x37C5
+#define MICROPY_HW_USB_PID          0x16E3
+
+#define MICROPY_HW_USB_MANUFACTURER_STRING  "OpenMV"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING    "OpenMV Camera"
+#define MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING "OpenMV"
+
+extern void board_startup(void);
+#define MICROPY_BOARD_STARTUP       board_startup
+
+extern void board_early_init(void);
+#define MICROPY_BOARD_EARLY_INIT board_early_init
+
+extern void board_enter_bootloader(void);
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) board_enter_bootloader()
+
+extern void board_enter_stop(void);
+#define MICROPY_BOARD_ENTER_STOP board_enter_stop
+
+extern void board_enter_standby(void);
+#define MICROPY_BOARD_ENTER_STANDBY board_enter_standby
+
+extern void board_exit_standby(void);
+#define MICROPY_BOARD_EXIT_STANDBY board_exit_standby
+
+// This is used for alif.Flash() and USB MSC.
+#define MICROPY_HW_FLASH_STORAGE_BASE_ADDR      (0)
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (32 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_FS_BYTES       (16 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_ROMFS_BYTES    (16 * 1024 * 1024)
+
+// Murata 1YN configuration
+#define CYW43_CHIPSET_FIRMWARE_INCLUDE_FILE     "lib/cyw43-driver/firmware/w43439_sdio_1yn_7_95_59_combined.h"
+#define CYW43_WIFI_NVRAM_INCLUDE_FILE           "lib/cyw43-driver/firmware/wifi_nvram_1yn.h"
+#define CYW43_BT_FIRMWARE_INCLUDE_FILE          "lib/cyw43-driver/firmware/cyw43_btfw_1yn.h"
+#define CYW43_BT_UART_BAUDRATE_DOWNLOAD_FIRMWARE (2000000)
+#define CYW43_BT_UART_BAUDRATE_ACTIVE_USE       (2000000)
+
+// Bluetooth config
+#define MICROPY_HW_BLE_UART_ID                  (0)
+#define MICROPY_HW_BLE_UART_BAUDRATE            (115200)
diff --git a/ports/alif/boards/OPENMV_AE3/mpconfigboard.mk b/ports/alif/boards/OPENMV_AE3/mpconfigboard.mk
new file mode 100644
index 0000000000000..83cc17dd15ed9
--- /dev/null
+++ b/ports/alif/boards/OPENMV_AE3/mpconfigboard.mk
@@ -0,0 +1,22 @@
+# TODO: alif_ensemble-cmsis-dfp only supports AE722F80F55D5XX at the moment.
+MCU_SERIES = E7
+MCU_VARIANT = AE722F80F55D5XX
+JLINK_DEV = AE302F80F55D5_HP
+LD_FILE = boards/OPENMV_AE3/board.ld.S
+PORT = /dev/ttyUSB0
+
+ALIF_TOOLKIT_CFG_PART = AE302F80F55D5AE
+ALIF_TOOLKIT_CFG_FILE = \"app-device-config-ae3.json\"
+
+CORE_M55_HP := $(if $(filter M55_HP,$(MCU_CORE)),1,0)
+
+# MicroPython settings
+MICROPY_FLOAT_IMPL = float
+MICROPY_PY_BLUETOOTH = $(CORE_M55_HP)
+MICROPY_BLUETOOTH_NIMBLE = $(CORE_M55_HP)
+MICROPY_PY_LWIP = $(CORE_M55_HP)
+MICROPY_PY_NETWORK_CYW43 = $(CORE_M55_HP)
+MICROPY_PY_SSL = $(CORE_M55_HP)
+MICROPY_SSL_MBEDTLS = $(CORE_M55_HP)
+MICROPY_PY_OPENAMP = 1
+MICROPY_PY_OPENAMP_REMOTEPROC = 1
diff --git a/ports/alif/boards/OPENMV_AE3/ospi_xip_user.h b/ports/alif/boards/OPENMV_AE3/ospi_xip_user.h
new file mode 100644
index 0000000000000..c0bd9afeb5cea
--- /dev/null
+++ b/ports/alif/boards/OPENMV_AE3/ospi_xip_user.h
@@ -0,0 +1,6 @@
+// This file is needed by ospi_xip/source/ospi/ospi_drv.c.
+#define OSPI_XIP_ENABLE_AES_DECRYPTION (0)
+#define OSPI_XIP_RX_SAMPLE_DELAY (4)
+#define OSPI_XIP_DDR_DRIVE_EDGE (0)
+// floor(1/4 OSPI clock cycle + 3.6ns) * 2
+#define OSPI_XIP_RXDS_DELAY (12)
diff --git a/ports/alif/boards/OPENMV_AE3/pins.csv b/ports/alif/boards/OPENMV_AE3/pins.csv
new file mode 100644
index 0000000000000..ab4f1a34f7e11
--- /dev/null
+++ b/ports/alif/boards/OPENMV_AE3/pins.csv
@@ -0,0 +1,69 @@
+# USB multiplexer
+USB_D_SEL,P15_0
+USB_D_SEL_FB,P15_1
+
+# LEDs
+LED_RED,P0_0
+LED_GREEN,P6_3
+LED_BLUE,P6_0
+
+# User switch
+USR_SW,P15_7
+
+# Flash on OSPI0
+FLASH_RESET,P3_3
+FLASH_CS,P3_2
+FLASH_SCLK_P,P3_0
+FLASH_SCLK_N,P3_1
+FLASH_DQSM,P1_6
+FLASH_D0,P2_0
+FLASH_D1,P2_1
+FLASH_D2,P2_2
+FLASH_D3,P2_3
+FLASH_D4,P2_4
+FLASH_D5,P2_5
+FLASH_D6,P2_6
+FLASH_D7,P2_7
+
+# Murata 1YN
+BT_UART_RX,P1_4
+BT_UART_TX,P1_5
+BT_UART_CTS,P6_6
+BT_UART_RTS,P6_7
+BT_REG_ON,P5_7
+BT_DEV_WAKE,P9_2
+BT_HOST_WAKE,P13_3
+WL_REG_ON,P10_4
+WL_HOST_WAKE,P11_0
+WL_I2S_SDI,P12_0
+WL_I2S_SDO,P12_1
+WL_I2S_SCLK,P12_2
+WL_I2S_WS,P12_3
+WL_IRQ,P9_6
+WL_MISO,P12_4
+WL_MOSI,P12_5
+WL_SCLK,P12_6
+WL_CS,P12_7
+
+P0,P5_1
+P1,P5_0
+P2,P5_3
+P3,P5_2
+P4,P0_5
+P5,P0_4
+P6,P7_2
+P7,P7_3
+P8,P1_2
+P9,P1_3
+
+# UART buses
+UART1_TX,P0_5
+UART1_RX,P0_4
+UART3_TX,P1_3
+UART3_RX,P1_2
+UART3_RTS,P7_3
+UART3_CTS,P7_2
+UART4_TX,P5_1
+UART4_RX,P5_0
+UART5_TX,P5_3
+UART5_RX,P5_2

From 547207ddc889a395f831a45f508d676aff197e17 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 20 Feb 2025 12:24:19 +0100
Subject: [PATCH 2114/3129] github/workflows: Add Alif port to CI.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .github/workflows/ports_alif.yml | 33 ++++++++++++++++++++++++++++++++
 tools/ci.sh                      | 15 +++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 .github/workflows/ports_alif.yml

diff --git a/.github/workflows/ports_alif.yml b/.github/workflows/ports_alif.yml
new file mode 100644
index 0000000000000..0e96e7d816e50
--- /dev/null
+++ b/.github/workflows/ports_alif.yml
@@ -0,0 +1,33 @@
+name: alif port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'shared/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/alif/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_alif:
+    strategy:
+      fail-fast: false
+      matrix:
+        ci_func:  # names are functions in ci.sh
+          - alif_ae3_build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_alif_setup
+    - name: Build ci_${{matrix.ci_func }}
+      run: source tools/ci.sh && ci_${{ matrix.ci_func }}
diff --git a/tools/ci.sh b/tools/ci.sh
index 948eeeaef2d22..cfc9754837f76 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -871,3 +871,18 @@ function ci_zephyr_run_tests {
     # - inf_nan_arith fails pow(-1, nan) test
     (cd tests && ./run-tests.py -t execpty:"qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -monitor null -serial pty -kernel ../ports/zephyr/build/zephyr/zephyr.elf" -d basics float --exclude inf_nan_arith)
 }
+
+########################################################################################
+# ports/alif
+
+function ci_alif_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_alif_ae3_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/alif BOARD=OPENMV_AE3 MCU_CORE=M55_HP submodules
+    make ${MAKEOPTS} -C ports/alif BOARD=OPENMV_AE3 MCU_CORE=M55_HE submodules
+    make ${MAKEOPTS} -C ports/alif BOARD=OPENMV_AE3 MCU_CORE=M55_DUAL
+    make ${MAKEOPTS} -C ports/alif BOARD=ALIF_ENSEMBLE MCU_CORE=M55_DUAL
+}

From 2ad592530256ebfdab6459e918748b729a3de7de Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Oct 2024 13:31:57 +1100
Subject: [PATCH 2115/3129] tests/ports/alif_hardware: Add flash testing
 script.

This test is not intended to be run automatically and does not have a
corresponding .exp file.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/alif_hardware/flash_test.py | 149 ++++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 tests/ports/alif_hardware/flash_test.py

diff --git a/tests/ports/alif_hardware/flash_test.py b/tests/ports/alif_hardware/flash_test.py
new file mode 100644
index 0000000000000..5be3fc2d02f3e
--- /dev/null
+++ b/tests/ports/alif_hardware/flash_test.py
@@ -0,0 +1,149 @@
+# MIT license; Copyright (c) 2024 OpenMV LLC.
+#
+# Note: this test completely erases the filesystem!
+# It is intended to be run manually.
+
+import alif
+import hashlib
+import os
+import sys
+import time
+import vfs
+
+hash_algo = "sha256"
+
+
+def flash_make_filesystem():
+    try:
+        vfs.umount("/flash")
+    except:
+        pass
+    bdev = alif.Flash()
+    vfs.VfsFat.mkfs(bdev)
+    vfs.mount(vfs.VfsFat(bdev), "/flash")
+    sys.path.append("/flash")
+    sys.path.append("/flash/lib")
+    os.chdir("/flash")
+
+
+def flash_block_test():
+    try:
+        vfs.umount("/flash")
+    except:
+        pass
+    dev = alif.Flash()
+
+    data512 = os.urandom(512)
+    buf512 = bytearray(512)
+    block_numbers = tuple(range(32)) + tuple(range(250, 266))
+
+    print("Block read/write integrity: ", end="")
+    ok = True
+    for block_n in block_numbers:
+        dev.writeblocks(block_n, data512)
+        dev.readblocks(block_n, buf512)
+        if buf512 != data512:
+            ok = False
+    print(ok)
+
+    print("Block read back integrity: ", end="")
+    ok = True
+    for block_n in block_numbers:
+        dev.readblocks(block_n, buf512)
+        if buf512 != data512:
+            ok = False
+    print(ok)
+
+    N = 16 * 1024
+    data_big = os.urandom(N)
+    t0 = time.ticks_us()
+    dev.writeblocks(0, data_big)
+    dt = time.ticks_diff(time.ticks_us(), t0)
+    print(f"Block write speed: {len(data_big) / 1024 / dt * 1_000_000} KiB/sec")
+
+    buf_big = bytearray(N)
+    t0 = time.ticks_us()
+    dev.readblocks(0, buf_big)
+    dt = time.ticks_diff(time.ticks_us(), t0)
+    print(f"Block read speed:  {len(buf_big) / 1024 / dt * 1_000_000} KiB/sec")
+
+    if buf_big != data_big:
+        raise RuntimeError("big block read-back failed")
+
+    try:
+        import uctypes
+
+        xip = memoryview(dev)
+    except:
+        xip = None
+    if xip is not None:
+        t0 = time.ticks_us()
+        buf_big[:] = xip[: len(buf_big)]
+        dt = time.ticks_diff(time.ticks_us(), t0)
+        print(f"XIP read speed:    {len(buf_big) / 1024 / dt * 1_000_000} KiB/sec")
+
+        if buf_big != data_big:
+            raise RuntimeError("XIP read-back failed")
+        for i in range(len(buf_big)):
+            if xip[i] != data_big[i]:
+                raise RuntimeError("XIP byte-wise read-back failed")
+
+
+def flash_write_verify(path, size=1024 * 1024, block_size=1024):
+    hash_sum = getattr(hashlib, hash_algo)()
+    block_count = size // block_size
+
+    print("-" * 16)
+    print(f"Writing file {size=} {block_size=}")
+    t0 = time.ticks_ms()
+    total_size = 0
+    with open(path, "wb") as file:
+        for i in range(block_count):
+            buf = os.urandom(block_size)
+            # Update digest
+            hash_sum.update(buf)
+            total_size += file.write(buf)
+            if i % (block_count // 16) == 0:
+                print(f"{i}/{block_count}", end="\r")
+    dt = time.ticks_diff(time.ticks_ms(), t0)
+    print(f"Flash write finished:       {total_size / 1024 / dt * 1000} KiB/sec")
+    digest = hash_sum.digest()
+
+    print("Reading file... ", end="")
+    hash_sum = getattr(hashlib, hash_algo)()
+    buf = bytearray(block_size)
+    t0 = time.ticks_ms()
+    total_size = 0
+    with open(path, "rb") as file:
+        for i in range(block_count):
+            total_size += file.readinto(buf)
+    dt = time.ticks_diff(time.ticks_ms(), t0)
+    print(f"finished:   {total_size / 1024 / dt * 1000} KiB/sec")
+
+    print("Verifying file... ", end="")
+    hash_sum = getattr(hashlib, hash_algo)()
+    t0 = time.ticks_ms()
+    total_size = 0
+    with open(path, "rb") as file:
+        for i in range(block_count):
+            buf = file.read(block_size)
+            total_size += len(buf)
+            # Update digest
+            hash_sum.update(buf)
+    dt = time.ticks_diff(time.ticks_ms(), t0)
+    print(f"finished: {total_size / 1024 / dt * 1000} KiB/sec; ", end="")
+
+    if digest != hash_sum.digest():
+        raise RuntimeError(f"{hash_algo} checksum verify failed")
+
+    print(f"{hash_algo} checksum verified")
+
+
+if __name__ == "__main__":
+    flash_block_test()
+    flash_make_filesystem()
+    flash_write_verify("test0.bin", size=64 * 1024, block_size=1024)
+    flash_write_verify("test1.bin", size=128 * 1024, block_size=1024)
+    flash_write_verify("test2.bin", size=64 * 1024, block_size=2048)
+    flash_write_verify("test4.bin", size=256 * 1024, block_size=4096)
+    flash_write_verify("test4.bin", size=512 * 1024, block_size=16384)

From 037f2dad72a7d11d461330873b50bb9ccf4fed69 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Mar 2025 13:18:20 +1100
Subject: [PATCH 2116/3129] tests: Update UART and SPI tests to work on Alif
 boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_spi_rate.py                 | 5 ++++-
 tests/extmod/machine_uart_irq_txidle.py          | 5 ++++-
 tests/extmod/machine_uart_tx.py                  | 6 +++++-
 tests/extmod_hardware/machine_uart_irq_rx.py     | 6 +++++-
 tests/extmod_hardware/machine_uart_irq_rxidle.py | 6 +++++-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
index 7022955a3da75..c65095f22a1a5 100644
--- a/tests/extmod/machine_spi_rate.py
+++ b/tests/extmod/machine_spi_rate.py
@@ -13,7 +13,10 @@
 
 # Configure pins based on the port/board details.
 # Values are tuples of (spi_id, sck, mosi, miso)
-if "pyboard" in sys.platform:
+if "alif" in sys.platform:
+    MAX_DELTA_MS = 20
+    spi_instances = ((0, None, None, None),)
+elif "pyboard" in sys.platform:
     spi_instances = (
         (1, None, None, None),  # "explicit choice of sck/mosi/miso is not implemented"
         (2, None, None, None),
diff --git a/tests/extmod/machine_uart_irq_txidle.py b/tests/extmod/machine_uart_irq_txidle.py
index feb95fabaa44f..084e9825768a8 100644
--- a/tests/extmod/machine_uart_irq_txidle.py
+++ b/tests/extmod/machine_uart_irq_txidle.py
@@ -12,7 +12,10 @@
 import time, sys
 
 # Configure pins based on the target.
-if "rp2" in sys.platform:
+if "alif" in sys.platform:
+    uart_id = 1
+    tx_pin = None
+elif "rp2" in sys.platform:
     uart_id = 0
     tx_pin = "GPIO0"
     rx_pin = "GPIO1"
diff --git a/tests/extmod/machine_uart_tx.py b/tests/extmod/machine_uart_tx.py
index e9652f3c7ac21..f0cc912da66e0 100644
--- a/tests/extmod/machine_uart_tx.py
+++ b/tests/extmod/machine_uart_tx.py
@@ -14,7 +14,11 @@
 timing_margin_us = 100
 
 # Configure pins based on the target.
-if "esp32" in sys.platform:
+if "alif" in sys.platform:
+    uart_id = 1
+    pins = {}
+    bit_margin = 1
+elif "esp32" in sys.platform:
     uart_id = 1
     pins = {}
     timing_margin_us = 400
diff --git a/tests/extmod_hardware/machine_uart_irq_rx.py b/tests/extmod_hardware/machine_uart_irq_rx.py
index bf34900bd0826..ecc95e62ae570 100644
--- a/tests/extmod_hardware/machine_uart_irq_rx.py
+++ b/tests/extmod_hardware/machine_uart_irq_rx.py
@@ -15,7 +15,11 @@
 
 byte_by_byte = False
 # Configure pins based on the target.
-if "esp32" in sys.platform:
+if "alif" in sys.platform:
+    uart_id = 1
+    tx_pin = None
+    rx_pin = None
+elif "esp32" in sys.platform:
     uart_id = 1
     tx_pin = 4
     rx_pin = 5
diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py b/tests/extmod_hardware/machine_uart_irq_rxidle.py
index 182ab24ebe0c4..af2412c75eedc 100644
--- a/tests/extmod_hardware/machine_uart_irq_rxidle.py
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py
@@ -14,7 +14,11 @@
 import time, sys
 
 # Configure pins based on the target.
-if "esp32" in sys.platform:
+if "alif" in sys.platform:
+    uart_id = 1
+    tx_pin = None
+    rx_pin = None
+elif "esp32" in sys.platform:
     uart_id = 1
     tx_pin = 4
     rx_pin = 5

From 1aa9b3d94bd66a625173b6182df8a5308279b6d0 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Mon, 7 Apr 2025 23:01:06 +0200
Subject: [PATCH 2117/3129] tools/mpremote: Add recursive remove functionality
 to filesystem cmds.

mpremote now supports `mpremote rm -r`.

Addresses #9802 and #16845.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 tools/mpremote/mpremote/commands.py  | 28 +++++++++++++++++++++++++++-
 tools/mpremote/mpremote/main.py      |  2 +-
 tools/mpremote/mpremote/transport.py |  6 +++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index e385d050927f2..690b2ea723ea4 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -1,4 +1,5 @@
 import binascii
+import errno
 import hashlib
 import os
 import sys
@@ -300,6 +301,28 @@ def _mkdir(a, *b):
         do_filesystem_cp(state, src_path_joined, dest_path_joined, False, check_hash)
 
 
+def do_filesystem_recursive_rm(state, path, args):
+    if state.transport.fs_isdir(path):
+        for entry in state.transport.fs_listdir(path):
+            do_filesystem_recursive_rm(state, _remote_path_join(path, entry.name), args)
+        if path:
+            try:
+                state.transport.fs_rmdir(path)
+                if args.verbose:
+                    print(f"removed directory: '{path}'")
+            except OSError as e:
+                if e.errno != errno.EINVAL:  # not vfs mountpoint
+                    raise CommandError(
+                        f"rm -r: cannot remove :{path} {os.strerror(e.errno) if e.errno else ''}"
+                    ) from e
+                if args.verbose:
+                    print(f"skipped: '{path}' (vfs mountpoint)")
+    else:
+        state.transport.fs_rmfile(path)
+        if args.verbose:
+            print(f"removed: '{path}'")
+
+
 def do_filesystem(state, args):
     state.ensure_raw_repl()
     state.did_action()
@@ -352,7 +375,10 @@ def do_filesystem(state, args):
             elif command == "mkdir":
                 state.transport.fs_mkdir(path)
             elif command == "rm":
-                state.transport.fs_rmfile(path)
+                if args.recursive:
+                    do_filesystem_recursive_rm(state, path, args)
+                else:
+                    state.transport.fs_rmfile(path)
             elif command == "rmdir":
                 state.transport.fs_rmdir(path)
             elif command == "touch":
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index bdae8f163656b..b30a1a21354cc 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -182,7 +182,7 @@ def argparse_rtc():
 
 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, "recursive", "r", False, "recursive (for cp and rm commands)")
     _bool_flag(
         cmd_parser,
         "force",
diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index c8fdc54a8891a..8d30c7f517ff9 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -24,7 +24,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import ast, hashlib, os, sys
+import ast, errno, hashlib, os, sys
 from collections import namedtuple
 
 
@@ -63,6 +63,10 @@ def _convert_filesystem_error(e, info):
         return FileExistsError(info)
     if "OSError" in e.error_output and "ENODEV" in e.error_output:
         return FileNotFoundError(info)
+    if "OSError" in e.error_output and "EINVAL" in e.error_output:
+        return OSError(errno.EINVAL, info)
+    if "OSError" in e.error_output and "EPERM" in e.error_output:
+        return OSError(errno.EPERM, info)
     return e
 
 

From 72d4c409418b2d35be41b7b04f1802457309bc6d Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Mon, 7 Apr 2025 23:01:21 +0200
Subject: [PATCH 2118/3129] tools/mpremote/tests: Add tests for mpremote rm -r.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 tools/mpremote/tests/test_filesystem.sh     | 64 +++++++++++++++++
 tools/mpremote/tests/test_filesystem.sh.exp | 76 +++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/tools/mpremote/tests/test_filesystem.sh b/tools/mpremote/tests/test_filesystem.sh
index afeb7c91da8d6..a20d77dfea399 100755
--- a/tools/mpremote/tests/test_filesystem.sh
+++ b/tools/mpremote/tests/test_filesystem.sh
@@ -170,3 +170,67 @@ EOF
 $MPREMOTE resume cp -r "${TMP}/package" :
 $MPREMOTE resume ls : :package :package/subpackage
 $MPREMOTE resume exec "import package; package.x(); package.y()"
+
+echo -----
+# Test rm -r functionality
+# start with a fresh ramdisk before each test
+# rm -r MCU current working directory
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume touch :a.py
+$MPREMOTE resume touch :b.py
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume rm -r -v :
+$MPREMOTE resume ls :
+$MPREMOTE resume ls :/ramdisk
+
+echo -----
+# rm -r relative subfolder
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume touch :a.py
+$MPREMOTE resume mkdir :testdir
+$MPREMOTE resume cp -r "${TMP}/package" :testdir/package
+$MPREMOTE resume ls :testdir
+$MPREMOTE resume ls :testdir/package
+$MPREMOTE resume rm -r :testdir/package
+$MPREMOTE resume ls :/ramdisk
+$MPREMOTE resume ls :testdir
+
+echo -----
+# rm -r non-existent path
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume ls :
+$MPREMOTE resume rm -r :nonexistent || echo "expect error"
+
+echo -----
+# rm -r absolute root
+# no -v to generate same output on stm32 and other ports
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume touch :a.py
+$MPREMOTE resume touch :b.py
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume cp -r "${TMP}/package" :package2
+$MPREMOTE resume rm -r :/ || echo "expect error"
+$MPREMOTE resume ls :
+$MPREMOTE resume ls :/ramdisk
+
+echo -----
+# rm -r relative mountpoint
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume touch :a.py
+$MPREMOTE resume touch :b.py
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume exec "import os;os.chdir('/')"
+$MPREMOTE resume rm -r -v :ramdisk
+$MPREMOTE resume ls :/ramdisk
+
+echo -----
+# rm -r absolute mountpoint
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume touch :a.py
+$MPREMOTE resume touch :b.py
+$MPREMOTE resume cp -r "${TMP}/package" :
+$MPREMOTE resume exec "import os;os.chdir('/')"
+$MPREMOTE resume rm -r -v :/ramdisk
+$MPREMOTE resume ls :/ramdisk
+
+echo -----
\ No newline at end of file
diff --git a/tools/mpremote/tests/test_filesystem.sh.exp b/tools/mpremote/tests/test_filesystem.sh.exp
index 82fe7d6bf78c5..16d98c4ded8ec 100644
--- a/tools/mpremote/tests/test_filesystem.sh.exp
+++ b/tools/mpremote/tests/test_filesystem.sh.exp
@@ -191,3 +191,79 @@ ls :package/subpackage
           23 y.py
 x
 y2
+-----
+touch :a.py
+touch :b.py
+cp ${TMP}/package :
+rm :
+removed: './a.py'
+removed: './b.py'
+removed: './package/subpackage/__init__.py'
+removed: './package/subpackage/y.py'
+removed directory: './package/subpackage'
+removed: './package/__init__.py'
+removed: './package/x.py'
+removed directory: './package'
+ls :
+ls :/ramdisk
+-----
+touch :a.py
+mkdir :testdir
+cp ${TMP}/package :testdir/package
+ls :testdir
+           0 package/
+ls :testdir/package
+           0 subpackage/
+          43 __init__.py
+          22 x.py
+rm :testdir/package
+ls :/ramdisk
+           0 a.py
+           0 testdir/
+ls :testdir
+-----
+ls :
+rm :nonexistent
+mpremote: rm: nonexistent: No such file or directory.
+expect error
+-----
+touch :a.py
+touch :b.py
+cp ${TMP}/package :
+cp ${TMP}/package :package2
+rm :/
+mpremote: rm -r: cannot remove :/ Operation not permitted
+expect error
+ls :
+ls :/ramdisk
+-----
+touch :a.py
+touch :b.py
+cp ${TMP}/package :
+rm :ramdisk
+removed: 'ramdisk/a.py'
+removed: 'ramdisk/b.py'
+removed: 'ramdisk/package/subpackage/__init__.py'
+removed: 'ramdisk/package/subpackage/y.py'
+removed directory: 'ramdisk/package/subpackage'
+removed: 'ramdisk/package/__init__.py'
+removed: 'ramdisk/package/x.py'
+removed directory: 'ramdisk/package'
+skipped: 'ramdisk' (vfs mountpoint)
+ls :/ramdisk
+-----
+touch :a.py
+touch :b.py
+cp ${TMP}/package :
+rm :/ramdisk
+removed: '/ramdisk/a.py'
+removed: '/ramdisk/b.py'
+removed: '/ramdisk/package/subpackage/__init__.py'
+removed: '/ramdisk/package/subpackage/y.py'
+removed directory: '/ramdisk/package/subpackage'
+removed: '/ramdisk/package/__init__.py'
+removed: '/ramdisk/package/x.py'
+removed directory: '/ramdisk/package'
+skipped: '/ramdisk' (vfs mountpoint)
+ls :/ramdisk
+-----

From ef8282c717be8363e9a04ebf2b9d843e2485604f Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Mon, 7 Apr 2025 23:14:17 +0200
Subject: [PATCH 2119/3129] docs/reference/mpremote: Update docs for mpremote
 rm -r.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 docs/reference/mpremote.rst    | 28 ++++++++++++++++++++++++----
 tools/mpremote/tests/README.md | 15 +++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index ef23cd85c21a3..32ca5c246a7a4 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -229,7 +229,7 @@ The full list of supported commands are:
   - ``ls`` to list the current directory
   - ``ls <dirs...>`` to list the given directories
   - ``cp [-rf] <src...> <dest>`` to copy files
-  - ``rm <src...>`` to remove files on the device
+  - ``rm [-r] <src...>`` to remove files or folders 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)
@@ -238,15 +238,35 @@ The full list of supported commands are:
   The ``cp`` command uses a convention where a leading ``:`` represents a remote
   path. Without a leading ``:`` means a local path. This is based on the
   convention used by the `Secure Copy Protocol (scp) client
-  <https://en.wikipedia.org/wiki/Secure_copy_protocol>`_. All other commands
-  implicitly assume the path is a remote path, but the ``:`` can be optionally
-  used for clarity.
+  <https://en.wikipedia.org/wiki/Secure_copy_protocol>`_.
 
   So for example, ``mpremote fs cp main.py :main.py`` copies ``main.py`` from
   the current local directory to the remote filesystem, whereas
   ``mpremote fs cp :main.py main.py`` copies ``main.py`` from the device back
   to the current directory.
 
+  The ``mpremote rm -r`` command accepts both relative and absolute paths.
+  Use ``:`` to refer to the current remote working directory (cwd) to allow a
+  directory tree to be removed from the device's default path (eg ``/flash``, ``/``).
+  Use ``-v/--verbose`` to see the files being removed.
+
+  For example:
+
+  - ``mpremote rm -r :libs`` will remove the ``libs`` directory and all its
+    child items from the device.
+  - ``mpremote rm -rv :/sd`` will remove all files from a mounted SDCard and result
+    in a non-blocking warning. The mount will be retained.
+  - ``mpremote rm -rv :/`` will remove all files on the device, including any
+    located in mounted vfs such as ``/sd`` or ``/flash``. After removing all folders
+    and files, this will  also return an error to mimic unix ``rm -rf /`` behaviour.
+
+  .. warning::
+    There is no supported way to undelete files removed by ``mpremote rm -r :``.
+    Please use with caution.
+
+  All other commands implicitly assume the path is a remote path, but the ``:``
+  can be optionally used for clarity.
+
   All of the filesystem sub-commands take multiple path arguments, so if there
   is another command in the sequence, you must use ``+`` to terminate the
   arguments, e.g.
diff --git a/tools/mpremote/tests/README.md b/tools/mpremote/tests/README.md
index 5b924d2fb8701..d1d77f1fb52df 100644
--- a/tools/mpremote/tests/README.md
+++ b/tools/mpremote/tests/README.md
@@ -4,11 +4,26 @@ This directory contains a set of tests for `mpremote`.
 
 Requirements:
 - A device running MicroPython connected to a serial port on the host.
+- The device you are testing against must be flashed with a firmware of the same build
+  as `mpremote`.
+- If the device has an SDcard or other vfs mounted, the vfs's filesystem must be empty
+  to pass the filesystem test.
 - Python 3.x, `bash` and various Unix tools such as `find`, `mktemp`, `sed`, `sort`, `tr`.
+- To test on Windows, you can either:
+    - Run the (Linux) tests in WSL2 against a USB device that is passed though to WSL2.
+    - Use the `Git Bash` terminal to run the tests against a device connected to a COM
+      port. _Note:_ While the tests will run in `Git Bash`, several will throw false
+      positive errors due to differences in the way that TMP files are logged and and
+      several other details.
 
 To run the tests do:
 
+    $ cd tools/mpremote/tests
     $ ./run-mpremote-tests.sh
 
+To run a single test do:
+
+    $ ./run-mpremote-tests.sh test_filesystem.sh
+
 Each test should print "OK" if it passed.  Otherwise it will print "CRASH", or "FAIL"
 and a diff of the expected and actual test output.

From e7edf0783e945f4107dcc7f68543ed05e92189a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Apr 2025 21:30:17 +1000
Subject: [PATCH 2120/3129] drivers/memory/spiflash: Allow a board/port to
 configure chip params.

This commit allows the user of this driver to dynamically configure the SPI
flash chip parameters.  For this, enable `MICROPY_HW_SPIFLASH_CHIP_PARAMS`
and then set the `mp_spiflash_t::chip_params` element to point to a valid
`mp_spiflash_chip_params_t` struct.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/memory/spiflash.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/memory/spiflash.h b/drivers/memory/spiflash.h
index edd7d49330da1..a22742fc6f2b9 100644
--- a/drivers/memory/spiflash.h
+++ b/drivers/memory/spiflash.h
@@ -29,6 +29,11 @@
 #include "drivers/bus/spi.h"
 #include "drivers/bus/qspi.h"
 
+// Whether to enable dynamic configuration of SPI flash through mp_spiflash_chip_params_t.
+#ifndef MICROPY_HW_SPIFLASH_CHIP_PARAMS
+#define MICROPY_HW_SPIFLASH_CHIP_PARAMS (0)
+#endif
+
 #define MP_SPIFLASH_ERASE_BLOCK_SIZE (4096) // must be a power of 2
 
 enum {
@@ -66,8 +71,20 @@ typedef struct _mp_spiflash_config_t {
     #endif
 } mp_spiflash_config_t;
 
+#if MICROPY_HW_SPIFLASH_CHIP_PARAMS
+typedef struct _mp_spiflash_chip_params_t {
+    uint32_t jedec_id;
+    uint8_t memory_size_bytes_log2;
+    uint8_t qspi_prescaler;
+    uint8_t qread_num_dummy;
+} mp_spiflash_chip_params_t;
+#endif
+
 typedef struct _mp_spiflash_t {
     const mp_spiflash_config_t *config;
+    #if MICROPY_HW_SPIFLASH_CHIP_PARAMS
+    const mp_spiflash_chip_params_t *chip_params;
+    #endif
     volatile uint32_t flags;
 } mp_spiflash_t;
 

From b078569cffb4b32585806b42ef7a0501bc4d0bca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Apr 2025 12:47:48 +1100
Subject: [PATCH 2121/3129] drivers/memory/spiflash: Allow a board/port to
 detect SPI flash.

This commit allows the user of this driver to intercept the SPI flash
initialisation routine and possibly take some action based on the JEDEC id,
for example change the `mp_spiflash_t::chip_params` element.

To do this, enable `MICROPY_HW_SPIFLASH_DETECT_DEVICE` and define a
function called `mp_spiflash_detect()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/memory/spiflash.c | 12 +++++++++---
 drivers/memory/spiflash.h | 10 ++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index 09ab7157b88eb..b4133fe2f068f 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -31,6 +31,10 @@
 #include "py/mphal.h"
 #include "drivers/memory/spiflash.h"
 
+#if defined(CHECK_DEVID)
+#error "CHECK_DEVID no longer supported, use MICROPY_HW_SPIFLASH_DETECT_DEVICE instead"
+#endif
+
 #define QSPI_QE_MASK (0x02)
 #define USE_WR_DELAY (1)
 
@@ -198,11 +202,13 @@ void mp_spiflash_init(mp_spiflash_t *self) {
     mp_hal_delay_ms(1);
     #endif
 
-    #if defined(CHECK_DEVID)
-    // Validate device id
+    #if MICROPY_HW_SPIFLASH_DETECT_DEVICE
+    // Attempt to detect SPI flash based on its JEDEC id.
     uint32_t devid;
     int ret = mp_spiflash_read_cmd(self, CMD_RD_DEVID, 3, &devid);
-    if (ret != 0 || devid != CHECK_DEVID) {
+    ret = mp_spiflash_detect(self, ret, devid);
+    if (ret != 0) {
+        // Could not read device id.
         mp_spiflash_release_bus(self);
         return;
     }
diff --git a/drivers/memory/spiflash.h b/drivers/memory/spiflash.h
index a22742fc6f2b9..d98047c89f07c 100644
--- a/drivers/memory/spiflash.h
+++ b/drivers/memory/spiflash.h
@@ -34,6 +34,11 @@
 #define MICROPY_HW_SPIFLASH_CHIP_PARAMS (0)
 #endif
 
+// Whether to enable detection of SPI flash during initialisation.
+#ifndef MICROPY_HW_SPIFLASH_DETECT_DEVICE
+#define MICROPY_HW_SPIFLASH_DETECT_DEVICE (0)
+#endif
+
 #define MP_SPIFLASH_ERASE_BLOCK_SIZE (4096) // must be a power of 2
 
 enum {
@@ -91,6 +96,11 @@ typedef struct _mp_spiflash_t {
 void mp_spiflash_init(mp_spiflash_t *self);
 void mp_spiflash_deepsleep(mp_spiflash_t *self, int value);
 
+#if MICROPY_HW_SPIFLASH_DETECT_DEVICE
+// A board/port should define this function to perform actions based on the JEDEC id.
+int mp_spiflash_detect(mp_spiflash_t *spiflash, int ret, uint32_t devid);
+#endif
+
 // These functions go direct to the SPI flash device
 int mp_spiflash_erase_block(mp_spiflash_t *self, uint32_t addr);
 int mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);

From 2c0240e068b66b5f7b063125a7977cbca03d9483 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Apr 2025 12:47:40 +1100
Subject: [PATCH 2122/3129] drivers/bus/qspi: Make num_dummy configurable for
 quad reads.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/bus/qspi.h                            |  2 +-
 drivers/bus/softqspi.c                        |  6 +++---
 drivers/memory/spiflash.c                     | 14 ++++++++++++--
 ports/stm32/boards/STM32F769DISC/board_init.c |  4 +++-
 ports/stm32/octospi.c                         |  4 ++--
 ports/stm32/qspi.c                            | 14 +++++++++-----
 ports/stm32/qspi.h                            |  2 +-
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/drivers/bus/qspi.h b/drivers/bus/qspi.h
index 7ba2e750943c5..32b2890e3fc4a 100644
--- a/drivers/bus/qspi.h
+++ b/drivers/bus/qspi.h
@@ -45,7 +45,7 @@ typedef struct _mp_qspi_proto_t {
     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);
     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);
+    int (*read_cmd_qaddr_qdata)(void *self, uint8_t cmd, uint32_t addr, uint8_t num_dummy, 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 5cfc4db5e3383..06dcd03b02dda 100644
--- a/drivers/bus/softqspi.c
+++ b/drivers/bus/softqspi.c
@@ -189,13 +189,13 @@ static int mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_
     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) {
+static int mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, uint8_t num_dummy, 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 cmd_buf[16] = {cmd};
     uint8_t addr_len = mp_spi_set_addr_buff(&cmd_buf[1], addr);
     CS_LOW(self);
     mp_soft_qspi_transfer(self, 1, cmd_buf, NULL);
-    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_qwrite(self, addr_len + 1 + num_dummy, &cmd_buf[1]); // 3/4 addr bytes, 1 extra byte (0), N dummy bytes (2*N dummy cycles)
     mp_soft_qspi_qread(self, len, dest);
     CS_HIGH(self);
     return 0;
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index b4133fe2f068f..1ae0bbbc6792a 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -35,6 +35,14 @@
 #error "CHECK_DEVID no longer supported, use MICROPY_HW_SPIFLASH_DETECT_DEVICE instead"
 #endif
 
+// The default number of dummy bytes for quad-read is 2.  This can be changed by enabling
+// MICROPY_HW_SPIFLASH_CHIP_PARAMS and configuring the value in mp_spiflash_chip_params_t.
+#if MICROPY_HW_SPIFLASH_CHIP_PARAMS
+#define MICROPY_HW_SPIFLASH_QREAD_NUM_DUMMY(spiflash) (spiflash->chip_params->qread_num_dummy)
+#else
+#define MICROPY_HW_SPIFLASH_QREAD_NUM_DUMMY(spiflash) (2)
+#endif
+
 #define QSPI_QE_MASK (0x02)
 #define USE_WR_DELAY (1)
 
@@ -115,7 +123,8 @@ static int 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) {
-            ret = c->bus.u_qspi.proto->read_cmd_qaddr_qdata(c->bus.u_qspi.data, cmd, addr, len, dest);
+            uint8_t num_dummy = MICROPY_HW_SPIFLASH_QREAD_NUM_DUMMY(self);
+            ret = c->bus.u_qspi.proto->read_cmd_qaddr_qdata(c->bus.u_qspi.data, cmd, addr, num_dummy, len, dest);
         } else {
             ret = c->bus.u_qspi.proto->write_cmd_addr_data(c->bus.u_qspi.data, cmd, addr, len, src);
         }
@@ -186,7 +195,8 @@ void mp_spiflash_init(mp_spiflash_t *self) {
         mp_hal_pin_output(self->config->bus.u_spi.cs);
         self->config->bus.u_spi.proto->ioctl(self->config->bus.u_spi.data, MP_SPI_IOCTL_INIT);
     } else {
-        self->config->bus.u_qspi.proto->ioctl(self->config->bus.u_qspi.data, MP_QSPI_IOCTL_INIT, 0);
+        uint8_t num_dummy = MICROPY_HW_SPIFLASH_QREAD_NUM_DUMMY(self);
+        self->config->bus.u_qspi.proto->ioctl(self->config->bus.u_qspi.data, MP_QSPI_IOCTL_INIT, num_dummy);
     }
 
     mp_spiflash_acquire_bus(self);
diff --git a/ports/stm32/boards/STM32F769DISC/board_init.c b/ports/stm32/boards/STM32F769DISC/board_init.c
index 578dc9adb6c82..001b18bc06783 100644
--- a/ports/stm32/boards/STM32F769DISC/board_init.c
+++ b/ports/stm32/boards/STM32F769DISC/board_init.c
@@ -3,6 +3,8 @@
 
 // This configuration is needed for mboot to be able to write to the external QSPI flash
 
+#define QSPI_QREAD_NUM_DUMMY (2)
+
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 static mp_spiflash_cache_t spi_bdev_cache;
 #endif
@@ -21,6 +23,6 @@ spi_bdev_t spi_bdev;
 // This init function is needed to memory map the QSPI flash early in the boot process
 
 void board_early_init(void) {
-    qspi_init();
+    qspi_init(QSPI_QREAD_NUM_DUMMY);
     qspi_memory_map();
 }
diff --git a/ports/stm32/octospi.c b/ports/stm32/octospi.c
index 345c4a2374128..861941325c615 100644
--- a/ports/stm32/octospi.c
+++ b/ports/stm32/octospi.c
@@ -283,7 +283,7 @@ static int octospi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *de
     return 0;
 }
 
-static int octospi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
+static int octospi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, uint8_t num_dummy, size_t len, uint8_t *dest) {
     (void)self_in;
 
     #if defined(MICROPY_HW_OSPIFLASH_IO1) && !defined(MICROPY_HW_OSPIFLASH_IO2) && !defined(MICROPY_HW_OSPIFLASH_IO4)
@@ -293,7 +293,7 @@ static int octospi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t add
     uint32_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
     uint32_t dmode = 2; // data on 2-lines
     uint32_t admode = 2; // address on 2-lines
-    uint32_t dcyc = 4; // 4 dummy cycles
+    uint32_t dcyc = 2 * num_dummy; // 2N dummy cycles
 
     if (cmd == 0xeb || cmd == 0xec) {
         // Convert to 2-line command.
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 7334ece4f2181..1360d9b490d29 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -62,6 +62,8 @@
 #define QSPI_ADSIZE 2
 #endif
 
+static uint8_t qspi_num_dummy;
+
 static inline void qspi_mpu_disable_all(void) {
     // Configure MPU to disable access to entire QSPI region, to prevent CPU
     // speculative execution from accessing this region and modifying QSPI registers.
@@ -110,7 +112,9 @@ static inline void qspi_mpu_enable_mapped(void) {
     mpu_config_end(irq_state);
 }
 
-void qspi_init(void) {
+void qspi_init(uint8_t num_dummy) {
+    qspi_num_dummy = num_dummy;
+
     qspi_mpu_disable_all();
 
     // Configure pins
@@ -158,7 +162,7 @@ void qspi_memory_map(void) {
             | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
             | 3 << QUADSPI_CCR_FMODE_Pos // memory-mapped mode
             | 3 << QUADSPI_CCR_DMODE_Pos // data on 4 lines
-            | 4 << QUADSPI_CCR_DCYC_Pos // 4 dummy cycles
+            | (2 * qspi_num_dummy) << QUADSPI_CCR_DCYC_Pos // 2N dummy cycles
             | 0 << QUADSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
             | 3 << QUADSPI_CCR_ABMODE_Pos // alternate byte on 4 lines
             | QSPI_ADSIZE << QUADSPI_CCR_ADSIZE_Pos
@@ -193,7 +197,7 @@ static int qspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
     (void)self_in;
     switch (cmd) {
         case MP_QSPI_IOCTL_INIT:
-            qspi_init();
+            qspi_init(arg);
             break;
         case MP_QSPI_IOCTL_BUS_ACQUIRE:
             // Disable memory-mapped region during bus access
@@ -369,7 +373,7 @@ static int qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest)
     return 0;
 }
 
-static int 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, uint8_t num_dummy, size_t len, uint8_t *dest) {
     (void)self_in;
 
     uint8_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
@@ -383,7 +387,7 @@ static int qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr,
             | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
             | 1 << QUADSPI_CCR_FMODE_Pos // indirect read mode
             | 3 << QUADSPI_CCR_DMODE_Pos // data on 4 lines
-            | 4 << QUADSPI_CCR_DCYC_Pos // 4 dummy cycles
+            | (2 * num_dummy) << QUADSPI_CCR_DCYC_Pos // 2N dummy cycles
             | 0 << QUADSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
             | 3 << QUADSPI_CCR_ABMODE_Pos // alternate byte on 4 lines
             | adsize << QUADSPI_CCR_ADSIZE_Pos // 32 or 24-bit address size
diff --git a/ports/stm32/qspi.h b/ports/stm32/qspi.h
index a2d6b9f328db2..c8a3181653db7 100644
--- a/ports/stm32/qspi.h
+++ b/ports/stm32/qspi.h
@@ -33,7 +33,7 @@
 
 extern const mp_qspi_proto_t qspi_proto;
 
-void qspi_init(void);
+void qspi_init(uint8_t num_dummy);
 void qspi_memory_map(void);
 void qspi_memory_map_exit(void);
 void qspi_memory_map_restart(void);

From 1d83c8175680b911ab24ba834b7f8bcadaa5aa79 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Apr 2025 14:31:26 +1100
Subject: [PATCH 2123/3129] stm32/vfs_rom_ioctl: Allow ROMFS configuration to
 be dynamic.

Options for a board to configure ROMFS are:

- Leave ROMFS disabled, do nothing.

- Enable by defining `MICROPY_HW_ROMFS_ENABLE_PARTx` to 1 and then in the
  linker script define `_micropy_hw_romfs_partX_start` and
  `_micropy_hw_romfs_partX_size`.

- Enable by defining `MICROPY_HW_ROMFS_ENABLE_PARTx` to 1 and also define
  `MICROPY_HW_ROMFS_PARTx_START` and `MICROPY_HW_ROMFS_PARTx_SIZE` which
  can be arbitrary expressions (not necessarily static)

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

diff --git a/ports/stm32/vfs_rom_ioctl.c b/ports/stm32/vfs_rom_ioctl.c
index 1fa4408c53796..7592aa22d622a 100644
--- a/ports/stm32/vfs_rom_ioctl.c
+++ b/ports/stm32/vfs_rom_ioctl.c
@@ -36,28 +36,32 @@
 
 #if MICROPY_VFS_ROM_IOCTL
 
-#if MICROPY_HW_ROMFS_ENABLE_PART0 && !defined(MICROPY_HW_ROMFS_PART0_START)
-#define MICROPY_HW_ROMFS_PART0_START (uintptr_t)(&_micropy_hw_romfs_part0_start)
-#define MICROPY_HW_ROMFS_PART0_SIZE (uintptr_t)(&_micropy_hw_romfs_part0_size)
+#if MICROPY_HW_ROMFS_ENABLE_PART0 && defined(MICROPY_HW_ROMFS_PART0_START)
+#define ROMFS0_DYNAMIC (1)
+static MP_DEFINE_MEMORYVIEW_OBJ(romfs0_obj, 'B', 0, (uintptr_t)-1, (void *)-1);
+#elif MICROPY_HW_ROMFS_ENABLE_PART0 && !defined(MICROPY_HW_ROMFS_PART0_START)
+#define ROMFS0_DYNAMIC (0)
 extern uint8_t _micropy_hw_romfs_part0_start;
 extern uint8_t _micropy_hw_romfs_part0_size;
+static const MP_DEFINE_MEMORYVIEW_OBJ(romfs0_obj, 'B', 0, (uintptr_t)&_micropy_hw_romfs_part0_size, (void *)&_micropy_hw_romfs_part0_start);
 #endif
 
-#if MICROPY_HW_ROMFS_ENABLE_PART1 && !defined(MICROPY_HW_ROMFS_PART1_START)
-#define MICROPY_HW_ROMFS_PART1_START (uintptr_t)(&_micropy_hw_romfs_part1_start)
-#define MICROPY_HW_ROMFS_PART1_SIZE (uintptr_t)(&_micropy_hw_romfs_part1_size)
+#if MICROPY_HW_ROMFS_ENABLE_PART1 && defined(MICROPY_HW_ROMFS_PART1_START)
+#define ROMFS1_DYNAMIC (1)
+static MP_DEFINE_MEMORYVIEW_OBJ(romfs1_obj, 'B', 0, (uintptr_t)-1, (void *)-1);
+#elif MICROPY_HW_ROMFS_ENABLE_PART1 && !defined(MICROPY_HW_ROMFS_PART1_START)
+#define ROMFS1_DYNAMIC (0)
 extern uint8_t _micropy_hw_romfs_part1_start;
 extern uint8_t _micropy_hw_romfs_part1_size;
+static const MP_DEFINE_MEMORYVIEW_OBJ(romfs1_obj, 'B', 0, (uintptr_t)&_micropy_hw_romfs_part1_size, (void *)&_micropy_hw_romfs_part1_start);
 #endif
 
-#define ROMFS_MEMORYVIEW(base, size) {{&mp_type_memoryview}, 'B', 0, (size), (void *)(base)}
-
-static const mp_obj_array_t romfs_obj_table[] = {
+static const mp_obj_array_t *romfs_obj_table[] = {
     #if MICROPY_HW_ROMFS_ENABLE_PART0
-    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART0_START, MICROPY_HW_ROMFS_PART0_SIZE),
+    &romfs0_obj,
     #endif
     #if MICROPY_HW_ROMFS_ENABLE_PART1
-    ROMFS_MEMORYVIEW(MICROPY_HW_ROMFS_PART1_START, MICROPY_HW_ROMFS_PART1_SIZE),
+    &romfs1_obj,
     #endif
 };
 
@@ -76,7 +80,20 @@ mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
         return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
     }
 
-    const mp_obj_array_t *romfs_obj = &romfs_obj_table[romfs_id];
+    #if ROMFS0_DYNAMIC
+    if (romfs_id == 0) {
+        romfs0_obj.items = (void *)MICROPY_HW_ROMFS_PART0_START;
+        romfs0_obj.len = MICROPY_HW_ROMFS_PART0_SIZE;
+    }
+    #endif
+    #if ROMFS1_DYNAMIC
+    if (romfs_id == 1) {
+        romfs1_obj.items = (void *)MICROPY_HW_ROMFS_PART1_START;
+        romfs1_obj.len = MICROPY_HW_ROMFS_PART1_SIZE;
+    }
+    #endif
+
+    const mp_obj_array_t *romfs_obj = romfs_obj_table[romfs_id];
     uintptr_t romfs_base = (uintptr_t)romfs_obj->items;
     uintptr_t romfs_len = romfs_obj->len;
 

From aa0945698b714c25f85b1234e0b03f34ac76c24c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Mar 2025 11:09:01 +1100
Subject: [PATCH 2124/3129] stm32/qspi: Allow SPI flash size to be decided at
 runtime.

Allows `MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2` and
`MICROPY_HW_QSPI_MPU_REGION_SIZE` to be arbitrary expressions, eg function
calls.

The `storage.h` header needs to be included in case access to `spi_bdev_t`
is needed by the macros.

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

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 1360d9b490d29..781aae803ef21 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -31,6 +31,7 @@
 #include "mpu.h"
 #include "qspi.h"
 #include "pin_static_af.h"
+#include "storage.h"
 
 #if defined(MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2)
 
@@ -50,18 +51,11 @@
 #define MICROPY_HW_QSPI_CS_HIGH_CYCLES  2  // nCS stays high for 2 cycles
 #endif
 
+// Region size in units of 1024*1024 bytes.
 #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
-#else
-#define QSPI_CMD 0xeb
-#define QSPI_ADSIZE 2
-#endif
-
 static uint8_t qspi_num_dummy;
 
 static inline void qspi_mpu_disable_all(void) {
@@ -83,32 +77,32 @@ static inline void qspi_mpu_enable_mapped(void) {
     // 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_NOACCESS(0xFF, MPU_REGION_SIZE_256MB));
-    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 64
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x0F, MPU_REGION_SIZE_256MB));
-    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 32
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x03, MPU_REGION_SIZE_256MB));
-    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 16
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
-    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 8
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
-    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x0F, MPU_REGION_SIZE_32MB));
-    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 4
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
-    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x03, MPU_REGION_SIZE_32MB));
-    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 2
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
-    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_32MB));
-    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 1
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
-    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x0F, MPU_REGION_SIZE_32MB));
-    mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_16MB));
-    #else
-    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
-    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_32MB));
-    mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x03, MPU_REGION_SIZE_4MB));
-    #endif
+    if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 128) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0xFF, MPU_REGION_SIZE_256MB));
+    } else if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 64) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x0F, MPU_REGION_SIZE_256MB));
+    } else if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 32) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x03, MPU_REGION_SIZE_256MB));
+    } else if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 16) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+    } else if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 8) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+        mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x0F, MPU_REGION_SIZE_32MB));
+    } else if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 4) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+        mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x03, MPU_REGION_SIZE_32MB));
+    } else if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 2) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+        mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_32MB));
+    } else if (MICROPY_HW_QSPI_MPU_REGION_SIZE > 1) {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+        mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x0F, MPU_REGION_SIZE_32MB));
+        mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_16MB));
+    } else {
+        mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_256MB));
+        mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x01, MPU_REGION_SIZE_32MB));
+        mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_NOACCESS(0x03, MPU_REGION_SIZE_4MB));
+    }
     mpu_config_end(irq_state);
 }
 
@@ -155,6 +149,17 @@ void qspi_init(uint8_t num_dummy) {
 void qspi_memory_map(void) {
     // Enable memory-mapped mode
 
+    // Work out command to use for reads, based on size of the memory.
+    uint8_t cmd;
+    uint8_t adsize;
+    if ((MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 - 3 - 1) >= 24) {
+        cmd = 0xec;
+        adsize = 3;
+    } else {
+        cmd = 0xeb;
+        adsize = 2;
+    }
+
     QUADSPI->ABR = 0; // disable continuous read mode
 
     QUADSPI->CCR =
@@ -165,10 +170,10 @@ void qspi_memory_map(void) {
             | (2 * qspi_num_dummy) << QUADSPI_CCR_DCYC_Pos // 2N dummy cycles
             | 0 << QUADSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
             | 3 << QUADSPI_CCR_ABMODE_Pos // alternate byte on 4 lines
-            | QSPI_ADSIZE << QUADSPI_CCR_ADSIZE_Pos
+            | adsize << QUADSPI_CCR_ADSIZE_Pos
             | 3 << QUADSPI_CCR_ADMODE_Pos // address on 4 lines
             | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
-            | QSPI_CMD << QUADSPI_CCR_INSTRUCTION_Pos
+            | cmd << QUADSPI_CCR_INSTRUCTION_Pos
     ;
 
     qspi_mpu_enable_mapped();

From de08190cb736f3bb1027d15bdf88135e49603c23 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Apr 2025 12:49:54 +1100
Subject: [PATCH 2125/3129] stm32/mboot: Allow USB strings to be dynamic.

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

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 9bb2dcfcaf408..01f8892a514c8 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -429,38 +429,82 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
     || 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
+#define INTERNAL_FLASH_LAYOUT "@Internal Flash  /0x08000000/04*016Kg,01*064Kg,07*128Kg"
 #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
+#define INTERNAL_FLASH_LAYOUT "@Internal Flash  /0x08000000/04*032Kg,01*128Kg,07*256Kg"
 #elif defined(STM32G0)
-#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*02Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#define INTERNAL_FLASH_LAYOUT "@Internal Flash  /0x08000000/256*02Kg"
 #elif defined(STM32H5)
-#define FLASH_LAYOUT_TEMPLATE "@Internal Flash  /0x08000000/???*08Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#define INTERNAL_FLASH_LAYOUT "@Internal Flash  /0x08000000/???*08Kg"
+#define INTERNAL_FLASH_LAYOUT_HAS_TEMPLATE (1)
 #elif defined(STM32H743xx)
-#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/16*128Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#define INTERNAL_FLASH_LAYOUT "@Internal Flash  /0x08000000/16*128Kg"
 #elif defined(STM32H750xx)
-#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/01*128Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#define INTERNAL_FLASH_LAYOUT "@Internal Flash  /0x08000000/01*128Kg"
 #elif defined(STM32WB)
-#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*04Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#define INTERNAL_FLASH_LAYOUT "@Internal Flash  /0x08000000/256*04Kg"
 #endif
 
-#if !defined(FLASH_LAYOUT_STR)
+#if INTERNAL_FLASH_LAYOUT_HAS_TEMPLATE \
+    || defined(MBOOT_SPIFLASH_LAYOUT_DYNAMIC_MAX_LEN) \
+    || defined(MBOOT_SPIFLASH2_LAYOUT_DYNAMIC_MAX_LEN)
 
-#define FLASH_LAYOUT_STR_ALLOC (sizeof(FLASH_LAYOUT_TEMPLATE))
+#ifndef MBOOT_SPIFLASH_LAYOUT_DYNAMIC_MAX_LEN
+#define MBOOT_SPIFLASH_LAYOUT_DYNAMIC_MAX_LEN (sizeof(MBOOT_SPIFLASH_LAYOUT) - 1)
+#endif
+
+#ifndef MBOOT_SPIFLASH2_LAYOUT_DYNAMIC_MAX_LEN
+#define MBOOT_SPIFLASH2_LAYOUT_DYNAMIC_MAX_LEN (sizeof(MBOOT_SPIFLASH2_LAYOUT) - 1)
+#endif
+
+#define FLASH_LAYOUT_STR_ALLOC \
+    ( \
+    (sizeof(INTERNAL_FLASH_LAYOUT) - 1) \
+    + MBOOT_SPIFLASH_LAYOUT_DYNAMIC_MAX_LEN \
+    + MBOOT_SPIFLASH2_LAYOUT_DYNAMIC_MAX_LEN \
+    + 1 \
+    )
 
 // Build the flash layout string from a template with total flash size inserted.
-static size_t build_flash_layout_str(char *buf) {
-    size_t len = FLASH_LAYOUT_STR_ALLOC - 1;
-    memcpy(buf, FLASH_LAYOUT_TEMPLATE, len + 1);
+static size_t build_flash_layout_str(uint8_t *buf) {
+    const char *internal_layout = INTERNAL_FLASH_LAYOUT;
+    size_t internal_layout_len = strlen(internal_layout);
+
+    const char *spiflash_layout = MBOOT_SPIFLASH_LAYOUT;
+    size_t spiflash_layout_len = strlen(spiflash_layout);
+
+    const char *spiflash2_layout = MBOOT_SPIFLASH2_LAYOUT;
+    size_t spiflash2_layout_len = strlen(spiflash2_layout);
+
+    uint8_t *buf_orig = buf;
+
+    memcpy(buf, internal_layout, internal_layout_len);
+    buf += internal_layout_len;
+
+    #if INTERNAL_FLASH_LAYOUT_HAS_TEMPLATE
     unsigned int num_sectors = FLASH_SIZE / FLASH_SECTOR_SIZE;
-    buf += 31; // location of "???" in FLASH_LAYOUT_TEMPLATE
+    uint8_t *buf_size = buf_orig + 31; // location of "???" in FLASH_LAYOUT_TEMPLATE
     for (unsigned int i = 0; i < 3; ++i) {
-        *buf-- = '0' + num_sectors % 10;
+        *buf_size-- = '0' + num_sectors % 10;
         num_sectors /= 10;
     }
-    return len;
+    #endif
+
+    memcpy(buf, spiflash_layout, spiflash_layout_len);
+    buf += spiflash_layout_len;
+
+    memcpy(buf, spiflash2_layout, spiflash2_layout_len);
+    buf += spiflash2_layout_len;
+
+    *buf++ = '\0';
+
+    return buf - buf_orig;
 }
 
+#else
+
+#define FLASH_LAYOUT_STR INTERNAL_FLASH_LAYOUT MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+
 #endif
 
 static bool flash_is_modifiable_addr_range(uint32_t addr, uint32_t len) {
@@ -1188,7 +1232,7 @@ static uint8_t *pyb_usbdd_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, u
             USBD_GetString((uint8_t *)FLASH_LAYOUT_STR, str_desc, length);
             #else
             {
-                char buf[FLASH_LAYOUT_STR_ALLOC];
+                uint8_t buf[FLASH_LAYOUT_STR_ALLOC];
                 build_flash_layout_str(buf);
                 USBD_GetString((uint8_t *)buf, str_desc, length);
             }

From ed4833d495e1a328ef35edda1666799a9c84802c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Apr 2025 12:50:23 +1100
Subject: [PATCH 2126/3129] stm32/modmachine: Add SPI flash size to
 machine.info dump.

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

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 7c1c4da60bff2..620ae468cb9b3 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -247,6 +247,14 @@ static mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
         mp_printf(print, "  1=%u 2=%u m=%u\n", info.num_1block, info.num_2block, info.max_block);
     }
 
+    // SPI flash size
+    #if defined(MICROPY_HW_SPIFLASH_SIZE_BITS)
+    mp_printf(print, "SPI flash size: %d\n", MICROPY_HW_SPIFLASH_SIZE_BITS / 8);
+    #endif
+    #if defined(MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2)
+    mp_printf(print, "QSPI flash size: %d\n", 1 << (MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 - 3));
+    #endif
+
     // free space on flash
     {
         #if MICROPY_VFS_FAT

From db854270719bfa4dda003d38893c1b8f39bf58de Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Apr 2025 12:48:48 +1100
Subject: [PATCH 2127/3129] stm32/boards/PYBD_SF6: Support boards with larger
 SPI flash.

There are some newer PYBD_SF6 being produced which have a larger flash,
namely two of 8MiB (instead of the older ones with two of 2MiB).

This commit adds support for these boards.  The idea is to have the same
PYBD_SF6 firmware run on both old and new boards.  That means autodetecting
the flash at start-up and configuring all the relevant SPI/QSPI parameters,
including for ROMFS and mboot.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF6/board_init.c    | 88 +++++++++++++++++++++
 ports/stm32/boards/PYBD_SF6/f767.ld         |  3 +-
 ports/stm32/boards/PYBD_SF6/mpconfigboard.h | 50 ++++++++++++
 3 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF6/board_init.c b/ports/stm32/boards/PYBD_SF6/board_init.c
index c7a9f28006be3..836c4db8b5d24 100644
--- a/ports/stm32/boards/PYBD_SF6/board_init.c
+++ b/ports/stm32/boards/PYBD_SF6/board_init.c
@@ -1 +1,89 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 <stdbool.h>
+#include "boardctrl.h"
+#include "qspi.h"
+
+#if BUILDING_MBOOT
+#include "mboot/mboot.h"
+#endif
+
+// Use PYBD_SF2 as base configuration.
 #include "boards/PYBD_SF2/board_init.c"
+
+// Adesto AT25SF161 16-MBit.
+static const mp_spiflash_chip_params_t chip_params_at25sf161 = {
+    .jedec_id = 0x01861f,
+    .memory_size_bytes_log2 = 21,
+    .qspi_prescaler = 3, // maximum frequency 104MHz
+    .qread_num_dummy = 2,
+};
+
+// Infineon S25FL064 64-MBit.
+static const mp_spiflash_chip_params_t chip_params_s25fl064 = {
+    .jedec_id = 0x176001,
+    .memory_size_bytes_log2 = 23,
+    .qspi_prescaler = 2, // maximum frequency 108MHz
+    .qread_num_dummy = 4,
+};
+
+// Selection of possible SPI flash chips.
+static const mp_spiflash_chip_params_t *const chip_params_table[] = {
+    &chip_params_at25sf161,
+    &chip_params_s25fl064,
+};
+
+void board_early_init_sf6(void) {
+    // Initialise default SPI flash parameters.
+    MICROPY_BOARD_SPIFLASH_CHIP_PARAMS0 = &chip_params_at25sf161;
+    MICROPY_BOARD_SPIFLASH_CHIP_PARAMS1 = &chip_params_at25sf161;
+
+    // Continue with standard board early init.
+    board_early_init();
+}
+
+int mp_spiflash_detect(mp_spiflash_t *spiflash, int ret, uint32_t devid) {
+    if (ret != 0) {
+        // Could not identify flash.  Succeed anyway using default chip parameters.
+        return 0;
+    }
+
+    // Try to detect the SPI flash based on the JEDEC id.
+    for (size_t i = 0; i < MP_ARRAY_SIZE(chip_params_table); ++i) {
+        if (devid == chip_params_table[i]->jedec_id) {
+            spiflash->chip_params = chip_params_table[i];
+            if (spiflash->config->bus_kind == MP_SPIFLASH_BUS_QSPI) {
+                // Reinitialise the QSPI but to set new size, prescaler and dummy bytes.
+                uint8_t num_dummy = spiflash->chip_params->qread_num_dummy;
+                spiflash->config->bus.u_qspi.proto->ioctl(spiflash->config->bus.u_qspi.data, MP_QSPI_IOCTL_INIT, num_dummy);
+            }
+            break;
+        }
+    }
+
+    return 0;
+}
diff --git a/ports/stm32/boards/PYBD_SF6/f767.ld b/ports/stm32/boards/PYBD_SF6/f767.ld
index 0ee6cf76355fe..37fb3715d67ee 100644
--- a/ports/stm32/boards/PYBD_SF6/f767.ld
+++ b/ports/stm32/boards/PYBD_SF6/f767.ld
@@ -18,7 +18,7 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
     FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 2016K   /* sectors 1-11 3x32K 1*128K 7*256K */
-    FLASH_ROMFS (rx): ORIGIN = 0x90000000, LENGTH = 2048K   /* external QSPI */
+    FLASH_ROMFS (rx): ORIGIN = 0x90000000, LENGTH = 2048K   /* external QSPI, at least 2MiB */
     RAM (rwx)       : ORIGIN = 0x20000000, LENGTH = 512K    /* DTCM=128k, SRAM1=368K, SRAM2=16K */
 }
 
@@ -39,6 +39,5 @@ _heap_end = _sstack;
 
 /* ROMFS location */
 _micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
-_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
 
 INCLUDE common_bl.ld
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
index 45261523bdaa0..8cd1e52d3bd78 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
@@ -69,3 +69,53 @@
 #define MICROPY_HW_ETH_RMII_TX_EN   (pyb_pin_W8)
 #define MICROPY_HW_ETH_RMII_TXD0    (pyb_pin_W45)
 #define MICROPY_HW_ETH_RMII_TXD1    (pyb_pin_W49)
+
+// The below code reconfigures SPI flash for dynamic size detection.
+
+#undef MICROPY_BOARD_EARLY_INIT
+#undef MICROPY_HW_SPIFLASH_SIZE_BITS
+#undef MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2
+#undef MBOOT_SPIFLASH_BYTE_SIZE
+#undef MBOOT_SPIFLASH_LAYOUT
+#undef MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE
+#undef MBOOT_SPIFLASH2_BYTE_SIZE
+#undef MBOOT_SPIFLASH2_LAYOUT
+#undef MBOOT_SPIFLASH2_ERASE_BLOCKS_PER_PAGE
+
+// These are convenience macros to refer to the SPI flash chip parameters for the external SPI flash.
+#define MICROPY_BOARD_SPIFLASH_CHIP_PARAMS0 (spi_bdev.spiflash.chip_params) // SPI flash #1, R/W storage
+#define MICROPY_BOARD_SPIFLASH_CHIP_PARAMS1 (spi_bdev2.spiflash.chip_params) // SPI flash #2, memory mapped
+
+// Early init is needed to initialise the default SPI flash chip parameters.
+#define MICROPY_BOARD_EARLY_INIT    board_early_init_sf6
+
+// Enable dynamic detection of SPI flash.
+#define MICROPY_HW_SPIFLASH_CHIP_PARAMS (1)
+#define MICROPY_HW_SPIFLASH_DETECT_DEVICE (1)
+
+// Settings for SPI flash #1.
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (1 << (MICROPY_BOARD_SPIFLASH_CHIP_PARAMS0->memory_size_bytes_log2 + 3))
+
+// Settings for SPI flash #2.
+#define MICROPY_HW_QSPI_PRESCALER   (MICROPY_BOARD_SPIFLASH_CHIP_PARAMS1->qspi_prescaler)
+#define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (MICROPY_BOARD_SPIFLASH_CHIP_PARAMS1->memory_size_bytes_log2 + 3)
+
+// ROMFS partition 0 is dynamically sized (SPI flash #2).
+#define MICROPY_HW_ROMFS_PART0_START (uintptr_t)(&_micropy_hw_romfs_part0_start)
+#define MICROPY_HW_ROMFS_PART0_SIZE (1 << MICROPY_BOARD_SPIFLASH_CHIP_PARAMS1->memory_size_bytes_log2)
+
+// Mboot SPI flash #1 configuration.
+#define MBOOT_SPIFLASH_LAYOUT_DYNAMIC_MAX_LEN (20)
+#define MBOOT_SPIFLASH_LAYOUT       (MICROPY_BOARD_SPIFLASH_CHIP_PARAMS0->memory_size_bytes_log2 == 21 ? "/0x80000000/512*4Kg" : "/0x80000000/2048*4Kg")
+#define MBOOT_SPIFLASH_BYTE_SIZE    (1 << MICROPY_BOARD_SPIFLASH_CHIP_PARAMS0->memory_size_bytes_log2)
+#define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE (1)
+
+// Mboot SPI flash #2 configuration.
+#define MBOOT_SPIFLASH2_LAYOUT_DYNAMIC_MAX_LEN (20)
+#define MBOOT_SPIFLASH2_LAYOUT      (MICROPY_BOARD_SPIFLASH_CHIP_PARAMS1->memory_size_bytes_log2 == 21 ? "/0x90000000/512*4Kg" : "/0x90000000/2048*4Kg")
+#define MBOOT_SPIFLASH2_BYTE_SIZE   (1 << MICROPY_BOARD_SPIFLASH_CHIP_PARAMS1->memory_size_bytes_log2)
+#define MBOOT_SPIFLASH2_ERASE_BLOCKS_PER_PAGE (1)
+
+extern unsigned char _micropy_hw_romfs_part0_start;
+
+void board_early_init_sf6(void);

From 0b3ad98ea97bc504bb594639f5fcced5b5397eec Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Apr 2025 13:54:01 +1000
Subject: [PATCH 2128/3129] mimxrt/Makefile: Fix dependencies for generation of
 flexram_config.s.

Prior to this fix the following would fail:

    $ make build-TEENSY40/flexram_config.s

because it didn't create the build directory before generating the file.

Also, make `hal/resethandler_MIMXRT10xx.S` have an explicit dependency on
`flexram_config.s` rather than the latter just being forced to be built
before everything else.

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

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 5c54295028083..c0358387f975f 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -327,6 +327,8 @@ SRC_SS = \
 
 SRC_S += shared/runtime/gchelper_thumb2.s \
 
+hal/resethandler_MIMXRT10xx.S: $(GEN_FLEXRAM_CONFIG_SRC)
+
 # =============================================================================
 # QSTR Sources
 # =============================================================================
@@ -521,16 +523,16 @@ $(BUILD)/firmware.uf2: $(BUILD)/firmware.elf
 # 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) $(GEN_FLEXRAM_CONFIG_SRC)
+$(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
 
-$(GEN_FLEXRAM_CONFIG_SRC):
+$(GEN_FLEXRAM_CONFIG_SRC): $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(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)
+		-f $(TOP)/$(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $@
 
 # Use a pattern rule here so that make will only call make-pins.py once to make
 # both pins_gen.c and pins.h

From 9ee2ef5108102ce2f5851fba06da3dcab585f501 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Apr 2025 15:35:39 +1000
Subject: [PATCH 2129/3129] py/emitinlinerv32: Move include of asmrv32.h to
 within feature guard.

Otherwise, when compiling on 16-bit systems (where `mp_uint_t` is 16 bits
wide) the compiler warns about "left shift count >= width of type", from
the static inline functions that have RV32_ENCODE_TYPE_xxx macros which
do a lot of bit shifting.

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

diff --git a/py/emitinlinerv32.c b/py/emitinlinerv32.c
index a9a81ddf16c4c..a539242b84d95 100644
--- a/py/emitinlinerv32.c
+++ b/py/emitinlinerv32.c
@@ -30,12 +30,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/asmrv32.h"
 #include "py/emit.h"
 #include "py/misc.h"
 
 #if MICROPY_EMIT_INLINE_RV32
 
+#include "py/asmrv32.h"
+
 typedef enum {
 // define rules with a compile function
 #define DEF_RULE(rule, comp, kind, ...) PN_##rule,

From 9f3062799633dc8fa4cc556fc48a135cd5d4c2d4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Apr 2025 14:32:41 +1000
Subject: [PATCH 2130/3129] lib/micropython-lib: Update submodule to latest.

This brings in:
- requests: do not leak header modifications when calling request
- mip: allow relative URLs in package.json
- mip: make mip.install() skip /rom*/lib directories
- umqtt.simple: restore legacy ssl/ssl_params arguments
- nrf24l01: increase startup delay
- nrf24l01: properly handle timeout
- nrf24l01: optimize status reading
- lora-sx126x: fix invert_iq_rx / invert_iq_tx behaviour
- unix-ffi/json: accept both str and bytes as arg for json.loads()
- unix-ffi/machine: use libc if librt is not present
- requests: use the host in the redirect url, not the one in headers
- aiohttp: fix header case sensitivity
- aiohttp: allow headers to be passed to a WebSocketClient
- usb-device-cdc: optimise writing small data so it doesn't require alloc
- inspect: fix isgenerator logic
- inspect: implement iscoroutinefunction and iscoroutine

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 e4cf09527bce7..5b496e944ec04 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit e4cf09527bce7569f5db742cf6ae9db68d50c6a9
+Subproject commit 5b496e944ec045177afa1620920a168410b7f60b

From f498a16c7db6d4b2de200b3e0856528dfe0613c3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Apr 2025 00:28:30 +1000
Subject: [PATCH 2131/3129] all: Bump version to 1.25.0.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index dfa32ebf7614a..dcf0e4f05c97f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -32,7 +32,7 @@
 #define MICROPY_VERSION_MAJOR 1
 #define MICROPY_VERSION_MINOR 25
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 1
+#define MICROPY_VERSION_PRERELEASE 0
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 28901b2c300e8c9dacd2236502bb00c5f3f24958 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Apr 2025 17:07:30 +1000
Subject: [PATCH 2132/3129] all: Bump version to 1.26.0-preview.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index dcf0e4f05c97f..d06932a77b742 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -30,9 +30,9 @@
 // as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
 // are unavailable.
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 25
+#define MICROPY_VERSION_MINOR 26
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 0
+#define MICROPY_VERSION_PRERELEASE 1
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 760b962924ef5df72310832f87552341565d9325 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 27 Mar 2025 21:29:14 -0500
Subject: [PATCH 2133/3129] tests/basics/builtin_range.py: Add more tests for
 range slicing.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/basics/builtin_range.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/basics/builtin_range.py b/tests/basics/builtin_range.py
index 66226bad16a6d..728679bc9a1fc 100644
--- a/tests/basics/builtin_range.py
+++ b/tests/basics/builtin_range.py
@@ -32,11 +32,27 @@
 print(range(1, 4)[0:])
 print(range(1, 4)[1:])
 print(range(1, 4)[:-1])
+print(range(4, 1)[:])
+print(range(4, 1)[0:])
+print(range(4, 1)[1:])
+print(range(4, 1)[:-1])
 print(range(7, -2, -4)[:])
 print(range(1, 100, 5)[5:15:3])
 print(range(1, 100, 5)[15:5:-3])
 print(range(100, 1, -5)[5:15:3])
 print(range(100, 1, -5)[15:5:-3])
+print(range(1, 100, 5)[5:15:-3])
+print(range(1, 100, 5)[15:5:3])
+print(range(100, 1, -5)[5:15:-3])
+print(range(100, 1, -5)[15:5:3])
+print(range(1, 100, 5)[5:15:3])
+print(range(1, 100, 5)[15:5:-3])
+print(range(1, 100, -5)[5:15:3])
+print(range(1, 100, -5)[15:5:-3])
+print(range(1, 100, 5)[5:15:-3])
+print(range(1, 100, 5)[15:5:3])
+print(range(1, 100, -5)[5:15:-3])
+print(range(1, 100, -5)[15:5:3])
 
 # for this case uPy gives a different stop value but the listed elements are still correct
 print(list(range(7, -2, -4)[2:-2:]))

From 8faa6bafdc76a6ee307551ef4d88fd2d54db04b2 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 27 Mar 2025 21:29:01 -0500
Subject: [PATCH 2134/3129] py/objrange: Match CPython range slicing.

The "index fixing" behavior of get_fast_slice_indexes are not desired here;
the underlying behavior of mp_obj_slice_indexes actually is.

Fixes issue #17016.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objrange.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/py/objrange.c b/py/objrange.c
index 5ccb04fba60c8..1cc575f33e763 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -164,15 +164,11 @@ static mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
         #if MICROPY_PY_BUILTINS_SLICE
         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_slice_indices(index, len, &slice);
             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;
-            if (slice.step < 0) {
-                // Negative slice steps have inclusive stop, so adjust for exclusive
-                o->stop -= self->step;
-            }
             return MP_OBJ_FROM_PTR(o);
         }
         #endif

From 0d2c18c299936a34cdeb43e2ef9cbdaecb35c610 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Thu, 20 Mar 2025 12:03:59 +0100
Subject: [PATCH 2135/3129] py/objstr: Fix handling of OP_MODULO with
 namedtuple.

This fix handles attrtuple as well, eg. os.uname().  A test case has been
added in basics/attrtuple2.py.

Fixes issue #16969.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 py/objstr.c                 |  4 ++--
 py/objtuple.c               |  3 ---
 py/objtuple.h               |  3 +++
 tests/basics/attrtuple2.py  | 25 +++++++++++++++++++++++++
 tests/basics/namedtuple1.py |  3 +++
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 tests/basics/attrtuple2.py

diff --git a/py/objstr.c b/py/objstr.c
index 307e956a15236..a160ab415c6cf 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -33,6 +33,7 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/cstack.h"
+#include "py/objtuple.h"
 
 #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);
@@ -357,8 +358,7 @@ mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
         mp_obj_t *args = &rhs_in;
         size_t n_args = 1;
         mp_obj_t dict = MP_OBJ_NULL;
-        if (mp_obj_is_type(rhs_in, &mp_type_tuple)) {
-            // TODO: Support tuple subclasses?
+        if (mp_obj_is_tuple_compatible(rhs_in)) {
             mp_obj_tuple_get(rhs_in, &n_args, &args);
         } else if (mp_obj_is_type(rhs_in, &mp_type_dict)) {
             dict = rhs_in;
diff --git a/py/objtuple.c b/py/objtuple.c
index 2cbcc0e502f9a..a8bd11c7e2735 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -31,9 +31,6 @@
 #include "py/objtuple.h"
 #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), iter) == mp_obj_tuple_getiter)
-
 /******************************************************************************/
 /* tuple                                                                      */
 
diff --git a/py/objtuple.h b/py/objtuple.h
index cc42aa6df3980..034814b82662d 100644
--- a/py/objtuple.h
+++ b/py/objtuple.h
@@ -61,4 +61,7 @@ void mp_obj_attrtuple_print_helper(const mp_print_t *print, const qstr *fields,
 
 mp_obj_t mp_obj_new_attrtuple(const qstr *fields, size_t n, const mp_obj_t *items);
 
+// 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), iter) == mp_obj_tuple_getiter)
+
 #endif // MICROPY_INCLUDED_PY_OBJTUPLE_H
diff --git a/tests/basics/attrtuple2.py b/tests/basics/attrtuple2.py
new file mode 100644
index 0000000000000..081d24b6ae92c
--- /dev/null
+++ b/tests/basics/attrtuple2.py
@@ -0,0 +1,25 @@
+# test os.uname() attrtuple, if available
+try:
+    import os
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    u = os.uname()
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+# test printing of attrtuple
+print(str(u).find("machine=") > 0)
+
+# test read attr
+print(isinstance(u.machine, str))
+
+# test str modulo operator for attrtuple
+impl_str = ("%s " * len(u)) % u
+test_str = ""
+for val in u:
+    test_str += val + " "
+print(impl_str == test_str)
diff --git a/tests/basics/namedtuple1.py b/tests/basics/namedtuple1.py
index 362c60583ec32..b9689b58423b8 100644
--- a/tests/basics/namedtuple1.py
+++ b/tests/basics/namedtuple1.py
@@ -21,6 +21,9 @@
 
     print(isinstance(t, tuple))
 
+    # a NamedTuple can be used as a tuple
+    print("(%d, %d)" % t)
+
     # Check tuple can compare equal to namedtuple with same elements
     print(t == (t[0], t[1]), (t[0], t[1]) == t)
 

From 52ca8268800416538368dea1976d0922ff07543f Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Thu, 20 Mar 2025 12:03:59 +0100
Subject: [PATCH 2136/3129] unix/variants: Enable os.uname() in coverage build
 for tests.

In order to provide test coverage for the previous commit, `os.uname()`
support is added to the unix coverage build.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 ports/unix/variants/coverage/mpconfigvariant.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index a72e533e74c4a..04b5b8ae1ae70 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -44,3 +44,10 @@
 #undef MICROPY_VFS_ROM_IOCTL
 #define MICROPY_VFS_ROM_IOCTL          (1)
 #define MICROPY_PY_CRYPTOLIB_CTR       (1)
+
+// Enable os.uname for attrtuple coverage test
+#define MICROPY_PY_OS_UNAME            (1)
+#define MICROPY_HW_BOARD_NAME          "a machine"
+#define MICROPY_HW_MCU_NAME            MICROPY_PY_SYS_PLATFORM
+// Keep the standard banner message
+#define MICROPY_BANNER_MACHINE MICROPY_PY_SYS_PLATFORM " [" MICROPY_PLATFORM_COMPILER "] version"

From 6025b78d01a883ed24c2f983c1d7b6a4a05d3774 Mon Sep 17 00:00:00 2001
From: David Yang <mmyangfl@gmail.com>
Date: Fri, 21 Mar 2025 10:25:40 +0800
Subject: [PATCH 2137/3129] unix/main: Remove PATH_MAX from realpath.

POSIX.1-2008 ensures realpath() give a dynamically allocated buffer if
NULL is passed (which is also true for ports/windows/realpath.c),
avoiding an explicit call to malloc() and use of PATH_MAX, which may be
undefined on some systems.

Signed-off-by: David Yang <mmyangfl@gmail.com>
---
 ports/unix/main.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 0d137fe1b58ea..9f51573fbfbe9 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -453,10 +453,13 @@ 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 char *executable_path = NULL;
 
 static void sys_set_excecutable(char *argv0) {
-    if (realpath(argv0, executable_path)) {
+    if (executable_path == NULL) {
+        executable_path = realpath(argv0, NULL);
+    }
+    if (executable_path != NULL) {
         mp_obj_str_set_data(&mp_sys_executable_obj, (byte *)executable_path, strlen(executable_path));
     }
 }
@@ -721,11 +724,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 return invalid_args();
             }
         } else {
-            char *pathbuf = malloc(PATH_MAX);
-            char *basedir = realpath(argv[a], pathbuf);
+            char *basedir = realpath(argv[a], NULL);
             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;
@@ -734,7 +735,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
             // Set base dir of the script as first entry in sys.path.
             char *p = strrchr(basedir, '/');
             mp_obj_list_store(mp_sys_path, MP_OBJ_NEW_SMALL_INT(0), mp_obj_new_str_via_qstr(basedir, p - basedir));
-            free(pathbuf);
+            free(basedir);
 
             set_sys_argv(argv, argc, a);
             ret = do_file(argv[a]);
@@ -800,6 +801,11 @@ MP_NOINLINE int main_(int argc, char **argv) {
     #endif
     #endif
 
+    #if MICROPY_PY_SYS_EXECUTABLE && !defined(NDEBUG)
+    // Again, make memory leak detector happy
+    free(executable_path);
+    #endif
+
     // printf("total bytes = %d\n", m_get_total_bytes_allocated());
     return ret & 0xff;
 }

From 38a3873310c571c32e52edc2a7d4de7c80ff35d5 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 18 Nov 2024 05:35:48 +0100
Subject: [PATCH 2138/3129] unix/mpthreadport: Work around lack of thread
 cancellation on Android.

This commit fixes thread-related compilation issues under Android using
Termux as its runtime environment.

On Android's libc (Bionic) thread cancellation is not implemented, but
the Unix port uses that mechanism to provide asynchronous thread
termination.  In this commit there is a workaround for that, by adding a
new signal handler to each newly created thread, whose callback simply
exits the thread.  Threads are then sent the new signal rather than
being explicitly cancelled, which in turn trigger the signal handler to
stop the thread execution at the next possible occasion.

This makes the cancellation behaviour differ slightly on Android, as
threads are probably going to linger a little bit more since the method
introduced in this commit is equivalent to setting
PTHREAD_CANCEL_DEFERRED as the thread cancellation type.  On the other
hand there are no guarantees of immediate cancellation using
PTHREAD_CANCEL_ASYNCHRONOUS either.

This fixes the pthread-related issues reported in #16259.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/unix/mpthreadport.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 5172645bc147a..ded3bd14aff70 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -45,8 +45,14 @@
 // potential conflict with other uses of the more commonly used SIGUSR1.
 #ifdef SIGRTMIN
 #define MP_THREAD_GC_SIGNAL (SIGRTMIN + 5)
+#ifdef __ANDROID__
+#define MP_THREAD_TERMINATE_SIGNAL (SIGRTMIN + 6)
+#endif
 #else
 #define MP_THREAD_GC_SIGNAL (SIGUSR1)
+#ifdef __ANDROID__
+#define MP_THREAD_TERMINATE_SIGNAL (SIGUSR2)
+#endif
 #endif
 
 // This value seems to be about right for both 32-bit and 64-bit builds.
@@ -107,6 +113,18 @@ static void mp_thread_gc(int signo, siginfo_t *info, void *context) {
     }
 }
 
+// On Android, pthread_cancel and pthread_setcanceltype are not implemented.
+// To achieve that result a new signal handler responding on either
+// (SIGRTMIN + 6) or SIGUSR2 is installed on every child thread.  The sole
+// purpose of this new signal handler is to terminate the thread in a safe
+// asynchronous manner.
+
+#ifdef __ANDROID__
+static void mp_thread_terminate(int signo, siginfo_t *info, void *context) {
+    pthread_exit(NULL);
+}
+#endif
+
 void mp_thread_init(void) {
     pthread_key_create(&tls_key, NULL);
     pthread_setspecific(tls_key, &mp_state_ctx.thread);
@@ -135,6 +153,14 @@ void mp_thread_init(void) {
     sa.sa_sigaction = mp_thread_gc;
     sigemptyset(&sa.sa_mask);
     sigaction(MP_THREAD_GC_SIGNAL, &sa, NULL);
+
+    // Install a signal handler for asynchronous termination if needed.
+    #if defined(__ANDROID__)
+    sa.sa_flags = SA_SIGINFO;
+    sa.sa_sigaction = mp_thread_terminate;
+    sigemptyset(&sa.sa_mask);
+    sigaction(MP_THREAD_TERMINATE_SIGNAL, &sa, NULL);
+    #endif
 }
 
 void mp_thread_deinit(void) {
@@ -142,7 +168,11 @@ void mp_thread_deinit(void) {
     while (thread->next != NULL) {
         mp_thread_t *th = thread;
         thread = thread->next;
+        #if defined(__ANDROID__)
+        pthread_kill(th->id, MP_THREAD_TERMINATE_SIGNAL);
+        #else
         pthread_cancel(th->id);
+        #endif
         free(th);
     }
     mp_thread_unix_end_atomic_section();
@@ -200,7 +230,9 @@ void mp_thread_start(void) {
     }
     #endif
 
+    #if !defined(__ANDROID__)
     pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+    #endif
     mp_thread_unix_begin_atomic_section();
     for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == pthread_self()) {

From 27f4351f5fcd649fde12314d874083fcf967c01b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 19 Mar 2025 11:38:29 +1100
Subject: [PATCH 2139/3129] CODECONVENTIONS: Document the static naming
 conventions.

Goal is to document what's most commonly already in use, not to come up
with a new standard.

Also reformat the doc a bit for easier deep linking.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 CODECONVENTIONS.md | 52 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index d6af0418e42ef..d3f71cb083deb 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -206,14 +206,21 @@ adhere to the existing style and use `tools/codeformat.py` to check any changes.
 The main conventions, and things not enforceable via the auto-formatter, are
 described below.
 
-White space:
+As the MicroPython code base is over ten years old, not every source file
+conforms fully to these conventions. If making small changes to existing code,
+then it's usually acceptable to follow the existing code's style. New code or
+major changes should follow the conventions described here.
+
+## White space
+
 - Expand tabs to 4 spaces.
 - Don't leave trailing whitespace at the end of a line.
 - For control blocks (if, for, while), put 1 space between the
   keyword and the opening parenthesis.
 - Put 1 space after a comma, and 1 space around operators.
 
-Braces:
+## Braces
+
 - Use braces for all blocks, even no-line and single-line pieces of
   code.
 - Put opening braces on the end of the line it belongs to, not on
@@ -221,18 +228,43 @@ Braces:
 - For else-statements, put the else on the same line as the previous
   closing brace.
 
-Header files:
+## Header files
+
 - Header files should be protected from multiple inclusion with #if
   directives. See an existing header for naming convention.
 
-Names:
+## Names
+
 - Use underscore_case, not camelCase for all names.
 - Use CAPS_WITH_UNDERSCORE for enums and macros.
 - When defining a type use underscore_case and put '_t' after it.
 
-Integer types: MicroPython runs on 16, 32, and 64 bit machines, so it's
-important to use the correctly-sized (and signed) integer types.  The
-general guidelines are:
+### Public names (declared in headers)
+
+- MicroPython-specific names (especially any declared in `py/` and `extmod/`
+  directories) should generally start with `mp_` or `MP_`.
+- Functions and variables declared in a header should generally share a longer
+  common prefix. Usually the prefix matches the file name (i.e. items defined in
+  `py/obj.c` are declared in `py/obj.h` and should be prefixed `mp_obj_`). There
+  are exceptions, for example where one header file contains declarations
+  implemented in multiple source files for expediency.
+
+### Private names (specific to a single .c file)
+
+- For static functions and variables exposed to Python (i.e. a static C function
+  that is wrapped in `MP_DEFINE_CONST_FUN_...` and attached to a module), use
+  the file-level shared common prefix, i.e. name them as if the function or
+  variable was not static.
+- Other static definitions in source files (i.e. functions or variables defined
+  in a .c file that are only used within that .c file) don't need any prefix
+  (specifically: no `s_` or `_` prefix, and generally avoid adding the
+  file-level common prefix).
+
+## Integer types
+
+MicroPython runs on 16, 32, and 64 bit machines, so it's important to use the
+correctly-sized (and signed) integer types. The general guidelines are:
+
 - For most cases use mp_int_t for signed and mp_uint_t for unsigned
   integer values.  These are guaranteed to be machine-word sized and
   therefore big enough to hold the value from a MicroPython small-int
@@ -241,11 +273,13 @@ general guidelines are:
 - You can use int/uint, but remember that they may be 16-bits wide.
 - If in doubt, use mp_int_t/mp_uint_t.
 
-Comments:
+## Comments
+
 - Be concise and only write comments for things that are not obvious.
 - Use `// ` prefix, NOT `/* ... */`. No extra fluff.
 
-Memory allocation:
+## Memory allocation
+
 - Use m_new, m_renew, m_del (and friends) to allocate and free heap memory.
   These macros are defined in py/misc.h.
 

From ba4179bb66ad2dabc385de4584e7b57c9bffb347 Mon Sep 17 00:00:00 2001
From: dubiousjim <dubiousjim@gmail.com>
Date: Thu, 20 Mar 2025 05:55:55 -0400
Subject: [PATCH 2140/3129] py/dynruntime.mk: Fix use of musl's libm.a when
 LINK_RUNTIME=1.

Like PICOLIBC, MUSL also has its math functions in libc.a.  There is a
libm.a, but it's empty.

Signed-off-by: dubiousjim <dubiousjim@gmail.com>
---
 py/dynruntime.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 807befb464a84..1ef521bd9aecc 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -124,6 +124,10 @@ else
 $(error architecture '$(ARCH)' not supported)
 endif
 
+ifneq ($(findstring -musl,$(shell $(CROSS)gcc -dumpmachine)),)
+USE_MUSL := 1
+endif
+
 MICROPY_FLOAT_IMPL_UPPER = $(shell echo $(MICROPY_FLOAT_IMPL) | tr '[:lower:]' '[:upper:]')
 CFLAGS += $(CFLAGS_ARCH) -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_$(MICROPY_FLOAT_IMPL_UPPER)
 
@@ -147,6 +151,8 @@ ifeq ($(LINK_RUNTIME),1)
 # distribution.
 ifeq ($(USE_PICOLIBC),1)
 LIBM_NAME := libc.a
+else ifeq ($(USE_MUSL),1)
+LIBM_NAME := libc.a
 else
 LIBM_NAME := libm.a
 endif

From 7c7a9bdb344bd83db9bc4e5a41114283a624095c Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 26 Mar 2025 09:43:50 +1100
Subject: [PATCH 2141/3129] drivers/ninaw10/machine_pin_nina: Add exception
 text wrappers.

Required in MICROPY_PREVIEW_VERSION_2.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 drivers/ninaw10/machine_pin_nina.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ninaw10/machine_pin_nina.c b/drivers/ninaw10/machine_pin_nina.c
index c72ecee3dbb3e..fe6eb5c03af39 100644
--- a/drivers/ninaw10/machine_pin_nina.c
+++ b/drivers/ninaw10/machine_pin_nina.c
@@ -114,13 +114,13 @@ void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value) {
         mode = NINA_GPIO_OUTPUT;
         self->is_output = true;
     } else {
-        mp_raise_ValueError("only Pin.OUT and Pin.IN are supported for this pin");
+        mp_raise_ValueError(MP_ERROR_TEXT("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};
         if (mode == NINA_GPIO_OUTPUT) {
             if (NINA_GPIO_IS_INPUT_ONLY(self->id)) {
-                mp_raise_ValueError("only Pin.IN is supported for this pin");
+                mp_raise_ValueError(MP_ERROR_TEXT("only Pin.IN is supported for this pin"));
             }
             machine_pin_ext_set(self, value);
         }

From b6dbc47664e0b5dc3516f59a24322d26d2ad2617 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 26 Mar 2025 10:19:40 +1100
Subject: [PATCH 2142/3129] extmod/machine_usb_device: Add exception text
 wrappers.

Required in MICROPY_PREVIEW_VERSION_2.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/machine_usb_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/machine_usb_device.c b/extmod/machine_usb_device.c
index 5c4e84c38d1fe..5019cd98779f5 100644
--- a/extmod/machine_usb_device.c
+++ b/extmod/machine_usb_device.c
@@ -108,7 +108,7 @@ static mp_obj_t usb_device_submit_xfer(mp_obj_t self, mp_obj_t ep, mp_obj_t buff
         //
         // This C layer doesn't otherwise keep track of which endpoints the host
         // is aware of (or not).
-        mp_raise_ValueError("ep");
+        mp_raise_ValueError(MP_ERROR_TEXT("ep"));
     }
 
     if (!usbd_edpt_claim(USBD_RHPORT, ep_addr)) {

From 9bde1970044b7b0a6667d2f4a675c8c3f7816706 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 26 Mar 2025 10:19:53 +1100
Subject: [PATCH 2143/3129] rp2: Add exception text wrappers.

Required in MICROPY_PREVIEW_VERSION_2.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/rp2/machine_pin.c       |  6 +++---
 ports/rp2/machine_pin_cyw43.c |  2 +-
 ports/rp2/rp2_pio.c           | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 8ba0b44a684f7..d9ca3f8ce37a5 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -193,7 +193,7 @@ const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
             return &machine_pin_obj_table[wanted_pin];
         }
     }
-    mp_raise_ValueError("invalid pin");
+    mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
 }
 
 static void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -259,11 +259,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(MP_ERROR_TEXT("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(MP_ERROR_TEXT("alternate functions are not supported for external pins"));
     }
 
     // get initial value of pin (only valid for OUT and OPEN_DRAIN modes)
diff --git a/ports/rp2/machine_pin_cyw43.c b/ports/rp2/machine_pin_cyw43.c
index 9fc262454f86c..f79d932f7a535 100644
--- a/ports/rp2/machine_pin_cyw43.c
+++ b/ports/rp2/machine_pin_cyw43.c
@@ -70,7 +70,7 @@ void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value) {
             self->is_output = true;
         }
     } else {
-        mp_raise_ValueError("only Pin.OUT and Pin.IN are supported for this pin");
+        mp_raise_ValueError(MP_ERROR_TEXT("only Pin.OUT and Pin.IN are supported for this pin"));
     }
 
     if (value != -1) {
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 56c576581e0df..d936553b55573 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -126,7 +126,7 @@ void rp2_pio_irq_set_exclusive_handler(PIO pio, uint irq) {
     irq_handler_t current = irq_get_exclusive_handler(irq);
     // If the IRQ is set and isn't our handler, or a shared handler is set, then raise an error
     if ((current && current != rp2_pio_get_irq_handler(pio)) || irq_has_shared_handler(irq)) {
-        mp_raise_ValueError("irq claimed by external resource");
+        mp_raise_ValueError(MP_ERROR_TEXT("irq claimed by external resource"));
         // If the IRQ is not set, add our handler
     } else if (!current) {
         irq_set_exclusive_handler(irq, rp2_pio_get_irq_handler(pio));
@@ -304,7 +304,7 @@ static mp_obj_t rp2_pio_make_new(const mp_obj_type_t *type, size_t n_args, size_
     // 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");
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid PIO"));
     }
     const rp2_pio_obj_t *self = &rp2_pio_obj[pio_id];
 
@@ -353,7 +353,7 @@ static mp_obj_t rp2_pio_remove_program(size_t n_args, const mp_obj_t *args) {
         length = bufinfo.len / 2;
         offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + pio_get_index(self->pio)]);
         if (offset < 0) {
-            mp_raise_ValueError("prog not in instruction memory");
+            mp_raise_ValueError(MP_ERROR_TEXT("prog not in instruction memory"));
         }
         // Invalidate the program offset in the program object.
         prog[PROG_OFFSET_PIO0 + pio_get_index(self->pio)] = MP_OBJ_NEW_SMALL_INT(-1);
@@ -374,7 +374,7 @@ 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("invalid StateMachine");
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid StateMachine"));
     }
 
     // Return the correct StateMachine object.
@@ -400,7 +400,7 @@ static mp_obj_t rp2_pio_gpio_base(size_t n_args, const mp_obj_t *args) {
 
         // Must be 0 for GPIOs 0 to 31 inclusive, or 16 for GPIOs 16 to 48 inclusive.
         if (!(gpio_base == 0 || gpio_base == 16)) {
-            mp_raise_ValueError("invalid GPIO base");
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid GPIO base"));
         }
 
         if (pio_set_gpio_base(self->pio, gpio_base) != PICO_OK) {
@@ -556,14 +556,14 @@ static const rp2_state_machine_obj_t rp2_state_machine_obj[] = {
 
 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");
+        mp_raise_ValueError(MP_ERROR_TEXT("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");
+            mp_raise_ValueError(MP_ERROR_TEXT("StateMachine claimed by external resource"));
         }
         pio_sm_claim(sm_obj->pio, sm_obj->sm);
         rp2_state_machine_claimed_mask |= 1 << sm_id;
@@ -830,7 +830,7 @@ static mp_obj_t rp2_state_machine_get(size_t n_args, const mp_obj_t *args) {
             *(uint32_t *)dest = value;
             dest += sizeof(uint32_t);
         } else {
-            mp_raise_ValueError("unsupported buffer type");
+            mp_raise_ValueError(MP_ERROR_TEXT("unsupported buffer type"));
         }
         if (dest >= dest_top) {
             return args[1];
@@ -868,7 +868,7 @@ static mp_obj_t rp2_state_machine_put(size_t n_args, const mp_obj_t *args) {
             value = *(uint32_t *)src;
             src += sizeof(uint32_t);
         } else {
-            mp_raise_ValueError("unsupported buffer type");
+            mp_raise_ValueError(MP_ERROR_TEXT("unsupported buffer type"));
         }
         while (pio_sm_is_tx_fifo_full(self->pio, self->sm)) {
             // This delay must be fast.

From 569d472bc7f6f6fb20f69fcdb3ff19f525dec071 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 26 Mar 2025 10:21:52 +1100
Subject: [PATCH 2144/3129] extmod/modbluetooth: Use newer
 mp_map_slot_is_filled function.

Required in MICROPY_PREVIEW_VERSION_2.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/modbluetooth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 7049c35dfdf56..b95c42a4ee14a 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -340,7 +340,7 @@ static mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
         }
 
         for (size_t i = 0; i < kwargs->alloc; ++i) {
-            if (MP_MAP_SLOT_IS_FILLED(kwargs, 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_gap_name: {

From d6c673f28f12978625577a4d1214ebf450d57c8d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 26 Mar 2025 10:23:55 +1100
Subject: [PATCH 2145/3129] stm32/main: Replace mp_stack_set calls with new
 mp_cstack_init_with_top.

Required in MICROPY_PREVIEW_VERSION_2.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/main.c         | 7 ++-----
 ports/stm32/mpconfigport.h | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 0f904a8ba958f..e8395013b9188 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -515,11 +515,8 @@ void stm32_main(uint32_t reset_mode) {
     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);
+    // Stack limit init.
+    mp_cstack_init_with_top(&_estack, (char *)&_estack - (char *)&_sstack);
 
     // GC init
     gc_init(MICROPY_HEAP_START, MICROPY_HEAP_END);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index da86fa641623a..d1d6fe249bd6f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -43,6 +43,7 @@
 #define MICROPY_GC_STACK_ENTRY_TYPE uint16_t
 #endif
 #endif
+#define MICROPY_STACK_CHECK_MARGIN  (1024)
 #define MICROPY_ALLOC_PATH_MAX      (128)
 
 // optimisations

From bb1489965f74cfe839c3452e1b6a04e82c695bf5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Mar 2025 15:18:48 +1100
Subject: [PATCH 2146/3129] py/mkrules.cmake: Add CMake support for compressed
 error messages.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.cmake | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 4374b8b4da3cb..27d8b24f67ac8 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -14,6 +14,9 @@ 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")
+set(MICROPY_COMPRESSED_SPLIT "${MICROPY_GENHDR_DIR}/compressed.split")
+set(MICROPY_COMPRESSED_COLLECTED "${MICROPY_GENHDR_DIR}/compressed.collected")
+set(MICROPY_COMPRESSED_DATA "${MICROPY_GENHDR_DIR}/compressed.data.h")
 
 if(NOT MICROPY_PREVIEW_VERSION_2)
     set(MICROPY_PREVIEW_VERSION_2 0)
@@ -32,6 +35,13 @@ if(MICROPY_BOARD)
     )
 endif()
 
+# Need to do this before extracting MICROPY_CPP_DEF below.
+if(MICROPY_ROM_TEXT_COMPRESSION)
+    target_compile_definitions(${MICROPY_TARGET} PUBLIC
+        MICROPY_ROM_TEXT_COMPRESSION=\(1\)
+    )
+endif()
+
 # 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)
@@ -84,6 +94,12 @@ target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_ROOT_POINTERS}
 )
 
+if(MICROPY_ROM_TEXT_COMPRESSION)
+    target_sources(${MICROPY_TARGET} PRIVATE
+        ${MICROPY_COMPRESSED_DATA}
+    )
+endif()
+
 # Command to force the build of another command
 
 # Generate mpversion.h
@@ -197,6 +213,32 @@ add_custom_command(
     DEPENDS ${MICROPY_ROOT_POINTERS_COLLECTED} ${MICROPY_PY_DIR}/make_root_pointers.py
 )
 
+# Generate compressed.data.h
+
+add_custom_command(
+    OUTPUT ${MICROPY_COMPRESSED_SPLIT}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py split compress ${MICROPY_QSTRDEFS_LAST} ${MICROPY_GENHDR_DIR}/compress _
+    COMMAND touch ${MICROPY_COMPRESSED_SPLIT}
+    DEPENDS ${MICROPY_QSTRDEFS_LAST}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_COMPRESSED_COLLECTED}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat compress _ ${MICROPY_GENHDR_DIR}/compress ${MICROPY_COMPRESSED_COLLECTED}
+    BYPRODUCTS "${MICROPY_COMPRESSED_COLLECTED}.hash"
+    DEPENDS ${MICROPY_COMPRESSED_SPLIT}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_COMPRESSED_DATA}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makecompresseddata.py ${MICROPY_COMPRESSED_COLLECTED} > ${MICROPY_COMPRESSED_DATA}
+    DEPENDS ${MICROPY_COMPRESSED_COLLECTED} ${MICROPY_PY_DIR}/makecompresseddata.py
+)
+
 # Build frozen code if enabled
 
 if(MICROPY_FROZEN_MANIFEST)

From bfe16ef09bd06acf359a214f97a1b21f5fc71d66 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Mar 2025 15:19:08 +1100
Subject: [PATCH 2147/3129] esp32: Enable compressed error messages by default.

Reduces firmware size by about 3300 bytes.

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

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index dedef6d782cae..a9827249bd334 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -28,6 +28,11 @@ if(NOT DEFINED MICROPY_PY_TINYUSB)
     endif()
 endif()
 
+# Enable error text compression by default.
+if(NOT MICROPY_ROM_TEXT_COMPRESSION)
+    set(MICROPY_ROM_TEXT_COMPRESSION ON)
+endif()
+
 # Include core source components.
 include(${MICROPY_DIR}/py/py.cmake)
 

From 048ccccee01cdb1f36242d4ee5bba43a6900c891 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Mar 2025 15:19:24 +1100
Subject: [PATCH 2148/3129] rp2: Enable compressed error messages by default.

Reduces firmware size by about 3000 bytes.

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

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 1a5029c150417..fcc1a1e1b9b96 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -66,6 +66,11 @@ if(NOT MICROPY_C_HEAP_SIZE)
     set(MICROPY_C_HEAP_SIZE 0)
 endif()
 
+# Enable error text compression by default.
+if(NOT MICROPY_ROM_TEXT_COMPRESSION)
+    set(MICROPY_ROM_TEXT_COMPRESSION ON)
+endif()
+
 # Enable extmod components that will be configured by extmod.cmake.
 # A board may also have enabled additional components.
 set(MICROPY_SSL_MBEDTLS ON)

From e3c2cf7a040052143b19ef140fd666f86ec0fbda Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 21 Mar 2025 02:12:31 +0100
Subject: [PATCH 2149/3129] esp32/esp32_common.cmake: Skip BTree module when
 requested.

This commit makes the BTree module truly optional, as it was
unconditionally enabled in the shared CMake script for the port.

This meant that if a board/variant did explicitly turn BTree off said
request was not honoured by the build system and the BTree module would
still be brought in.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/esp32_common.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index a9827249bd334..c54f5a5403226 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -42,7 +42,9 @@ 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)
+    if (NOT DEFINED MICROPY_PY_BTREE)
+        set(MICROPY_PY_BTREE ON)
+    endif()
 
     include(${MICROPY_DIR}/py/usermod.cmake)
     include(${MICROPY_DIR}/extmod/extmod.cmake)
@@ -276,7 +278,9 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
 )
 
 # Add additional extmod and usermod components.
-target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
+if (MICROPY_PY_BTREE)
+    target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
+endif()
 target_link_libraries(${MICROPY_TARGET} usermod)
 
 # Extra linker options

From 193460d18f018e7306812fb41283fc241342eb1a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 28 Feb 2025 09:48:52 +0100
Subject: [PATCH 2150/3129] drivers/esp-hosted: Rename Bluetooth HCI backend
 driver.

Rename `bthci` to `bthci_uart` for consistency with the CYW43 driver and to
distinguish it from HCI backends that use a different transport.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .../esp-hosted/{esp_hosted_bthci.c => esp_hosted_bthci_uart.c}  | 0
 extmod/extmod.mk                                                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename drivers/esp-hosted/{esp_hosted_bthci.c => esp_hosted_bthci_uart.c} (100%)

diff --git a/drivers/esp-hosted/esp_hosted_bthci.c b/drivers/esp-hosted/esp_hosted_bthci_uart.c
similarity index 100%
rename from drivers/esp-hosted/esp_hosted_bthci.c
rename to drivers/esp-hosted/esp_hosted_bthci_uart.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 859f610c90ac1..b2a0f490b6e10 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -504,7 +504,7 @@ ESP_HOSTED_SRC_C = $(addprefix $(ESP_HOSTED_DIR)/,\
 	)
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
-ESP_HOSTED_SRC_C += $(ESP_HOSTED_DIR)/esp_hosted_bthci.c
+ESP_HOSTED_SRC_C += $(ESP_HOSTED_DIR)/esp_hosted_bthci_uart.c
 endif
 
 # Include the protobuf-c support functions

From fa76d52edbbecf4b3dbc27238d4ec83fb88a55ff Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 28 Feb 2025 09:52:19 +0100
Subject: [PATCH 2151/3129] drivers/ninaw10: Rename Bluetooth HCI backend
 driver.

Rename `bt_hci` to `bthci_uart` for consistency with the CYW43 driver and
to distinguish it from HCI backends that use a different transport.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/ninaw10/{nina_bt_hci.c => nina_bthci_uart.c} | 4 ++--
 ports/rp2/CMakeLists.txt                             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/ninaw10/{nina_bt_hci.c => nina_bthci_uart.c} (98%)

diff --git a/drivers/ninaw10/nina_bt_hci.c b/drivers/ninaw10/nina_bthci_uart.c
similarity index 98%
rename from drivers/ninaw10/nina_bt_hci.c
rename to drivers/ninaw10/nina_bthci_uart.c
index f0d1b9bc8986b..50631711097f2 100644
--- a/drivers/ninaw10/nina_bt_hci.c
+++ b/drivers/ninaw10/nina_bthci_uart.c
@@ -50,8 +50,8 @@
 #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__)
+#define error_printf(...)   // mp_printf(&mp_plat_print, "nina_bthci_uart.c: " __VA_ARGS__)
+#define debug_printf(...)   // mp_printf(&mp_plat_print, "nina_bthci_uart.c: " __VA_ARGS__)
 
 // Provided by the port, and also possibly shared with the stack.
 extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index fcc1a1e1b9b96..53d00c7dfdaa4 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -431,7 +431,7 @@ if (MICROPY_PY_NETWORK_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_bthci_uart.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

From 399c10dc28eba4ddd163dd0e930529f1b81d514a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 3 Mar 2025 17:32:41 +0100
Subject: [PATCH 2152/3129] mimxrt/machine_uart: Enable CTS SION so it can be
 read.

The new CYW43 BTHCI UART backend requires CTS pin to be defined and
readable.  This patch enables the CTS pin SION bit to allow it to be read
regardless of mux mode.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 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 4dcaf72f9862a..107af72297d4f 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -136,7 +136,7 @@ bool lpuart_set_iomux_cts(int8_t uart) {
     int index = (uart - 1) * 2;
 
     if (CTS.muxRegister != 0) {
-        IOMUXC_SetPinMux(CTS.muxRegister, CTS.muxMode, CTS.inputRegister, CTS.inputDaisy, CTS.configRegister, 0U);
+        IOMUXC_SetPinMux(CTS.muxRegister, CTS.muxMode, CTS.inputRegister, CTS.inputDaisy, CTS.configRegister, 1U);
         IOMUXC_SetPinConfig(CTS.muxRegister, CTS.muxMode, CTS.inputRegister, CTS.inputDaisy, CTS.configRegister,
             pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_IN, PIN_DRIVE_6, CTS.configRegister));
         return true;

From 3bbed952fdc884d85112a15715152c9c4f558c14 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 3 Mar 2025 17:46:56 +0100
Subject: [PATCH 2153/3129] mimxrt/cyw43_configport: Update cyw43 config to use
 new BTHCI UART.

Update the cyw43 configuration to use the new BTHCI UART backend provided
by cyw43-driver.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/mimxrt/Makefile           |  1 -
 ports/mimxrt/cyw43_configport.h | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index c0358387f975f..7788b54ca57ff 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -280,7 +280,6 @@ endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 SRC_C += mpbthciport.c
-DRIVERS_SRC_C += drivers/cyw43/cywbt.c
 endif # MICROPY_PY_BLUETOOTH
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
diff --git a/ports/mimxrt/cyw43_configport.h b/ports/mimxrt/cyw43_configport.h
index ab535a477763d..cf2f5d4b9fb55 100644
--- a/ports/mimxrt/cyw43_configport.h
+++ b/ports/mimxrt/cyw43_configport.h
@@ -32,10 +32,12 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "extmod/modnetwork.h"
+#include "extmod/mpbthci.h"
 #include "pendsv.h"
 #include "sdio.h"
 
 #define CYW43_USE_SPI                   (0)
+#define CYW43_ENABLE_BLUETOOTH_OVER_UART (1)
 #define CYW43_LWIP                      (1)
 #define CYW43_USE_STATS                 (0)
 
@@ -47,6 +49,18 @@
 #define CYW43_WIFI_NVRAM_INCLUDE_FILE   "lib/cyw43-driver/firmware/wifi_nvram_1dx.h"
 #endif
 
+#ifndef CYW43_BT_FIRMWARE_INCLUDE_FILE
+#define CYW43_BT_FIRMWARE_INCLUDE_FILE  "lib/cyw43-driver/firmware/cyw43_btfw_4343A1.h"
+#endif
+
+#ifdef MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY
+#define CYW43_BT_UART_BAUDRATE_ACTIVE_USE MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY
+#endif
+
+#ifdef MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE
+#define CYW43_BT_UART_BAUDRATE_DOWNLOAD_FIRMWARE MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE
+#endif
+
 #define CYW43_IOCTL_TIMEOUT_US          (1000000)
 #define CYW43_SLEEP_MAX                 (50)
 #define CYW43_NETUTILS                  (1)
@@ -75,6 +89,7 @@
 #define CYW43_HAL_PIN_PULL_DOWN         MP_HAL_PIN_PULL_DOWN
 
 #define CYW43_HAL_MAC_WLAN0             MP_HAL_MAC_WLAN0
+#define CYW43_HAL_MAC_BDADDR            MP_HAL_MAC_BDADDR
 
 #define cyw43_hal_ticks_us              mp_hal_ticks_us
 #define cyw43_hal_ticks_ms              mp_hal_ticks_ms
@@ -88,9 +103,19 @@
 #define cyw43_hal_get_mac_ascii         mp_hal_get_mac_ascii
 #define cyw43_hal_generate_laa_mac      mp_hal_generate_laa_mac
 
+#define cyw43_hal_uart_set_baudrate     mp_bluetooth_hci_uart_set_baudrate
+#define cyw43_hal_uart_write            mp_bluetooth_hci_uart_write
+#define cyw43_hal_uart_readchar         mp_bluetooth_hci_uart_readchar
+
 #define cyw43_delay_us                  mp_hal_delay_us
 #define cyw43_delay_ms                  mp_hal_delay_ms
 
+#define cyw43_bluetooth_controller_init     mp_bluetooth_hci_controller_init
+#define cyw43_bluetooth_controller_deinit   mp_bluetooth_hci_controller_deinit
+#define cyw43_bluetooth_controller_woken    mp_bluetooth_hci_controller_woken
+#define cyw43_bluetooth_controller_wakeup   mp_bluetooth_hci_controller_wakeup
+#define cyw43_bluetooth_controller_sleep_maybe mp_bluetooth_hci_controller_sleep_maybe
+
 #define CYW43_PIN_WL_REG_ON             MICROPY_HW_WL_REG_ON
 #define CYW43_PIN_WL_HOST_WAKE          MICROPY_HW_WL_HOST_WAKE
 #define CYW43_PIN_WL_SDIO_1             MICROPY_HW_SDIO_D1

From 0f360880aa01ca87c637eaa3517a90a78c2dbfd2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 30 Mar 2025 09:29:57 +0200
Subject: [PATCH 2154/3129] stm32/cyw43_configport: Update cyw43 config to use
 new BTHCI UART.

Update the cyw43 configuration to use the new BTHCI UART backend provided
by cyw43-driver.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/Makefile                     |  1 -
 ports/stm32/boards/PYBD_SF2/f722_qspi.ld |  2 +-
 ports/stm32/cyw43_configport.h           | 27 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index c938dcbda7d6d..8ac9a8af03d1a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -432,7 +432,6 @@ endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 SRC_C += mpbthciport.c
-DRIVERS_SRC_C += drivers/cyw43/cywbt.c
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
 SRC_C += mpnimbleport.c
diff --git a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
index f5e6769834a09..354c1919b41a3 100644
--- a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
+++ b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
@@ -54,7 +54,7 @@ SECTIONS
         *lib/mbedtls/*(.text* .rodata*)
         *lib/mynewt-nimble/*(.text* .rodata*)
         *lib/cyw43-driver/*(.rodata.w4343*_combined)
-        *drivers/cyw43/*(.rodata.cyw43_btfw_*)
+        *lib/cyw43-driver/*(.rodata.cyw43_btfw_*)
         . = ALIGN(4);
     } >FLASH_EXT
 }
diff --git a/ports/stm32/cyw43_configport.h b/ports/stm32/cyw43_configport.h
index 595051180336e..c26c55476167c 100644
--- a/ports/stm32/cyw43_configport.h
+++ b/ports/stm32/cyw43_configport.h
@@ -32,11 +32,13 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "extmod/modnetwork.h"
+#include "extmod/mpbthci.h"
 #include "extint.h"
 #include "pendsv.h"
 #include "sdio.h"
 
 #define CYW43_USE_SPI                   (0)
+#define CYW43_ENABLE_BLUETOOTH_OVER_UART (1)
 #define CYW43_LWIP                      (1)
 #define CYW43_USE_STATS                 (0)
 
@@ -48,6 +50,18 @@
 #define CYW43_WIFI_NVRAM_INCLUDE_FILE   "lib/cyw43-driver/firmware/wifi_nvram_1dx.h"
 #endif
 
+#ifndef CYW43_BT_FIRMWARE_INCLUDE_FILE
+#define CYW43_BT_FIRMWARE_INCLUDE_FILE  "lib/cyw43-driver/firmware/cyw43_btfw_4343A1.h"
+#endif
+
+#ifdef MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY
+#define CYW43_BT_UART_BAUDRATE_ACTIVE_USE MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY
+#endif
+
+#ifdef MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE
+#define CYW43_BT_UART_BAUDRATE_DOWNLOAD_FIRMWARE MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE
+#endif
+
 #define CYW43_IOCTL_TIMEOUT_US          (1000000)
 #define CYW43_SLEEP_MAX                 (50)
 #define CYW43_NETUTILS                  (1)
@@ -66,6 +80,7 @@
 
 #define CYW43_SDPCM_SEND_COMMON_WAIT    __WFI();
 #define CYW43_DO_IOCTL_WAIT             __WFI();
+#define CYW43_HAL_UART_READCHAR_BLOCKING_WAIT __WFI()
 
 #define CYW43_ARRAY_SIZE(a)             MP_ARRAY_SIZE(a)
 
@@ -76,6 +91,7 @@
 #define CYW43_HAL_PIN_PULL_DOWN         MP_HAL_PIN_PULL_DOWN
 
 #define CYW43_HAL_MAC_WLAN0             MP_HAL_MAC_WLAN0
+#define CYW43_HAL_MAC_BDADDR            MP_HAL_MAC_BDADDR
 
 #define cyw43_hal_ticks_us              mp_hal_ticks_us
 #define cyw43_hal_ticks_ms              mp_hal_ticks_ms
@@ -90,6 +106,16 @@
 #define cyw43_hal_get_mac_ascii         mp_hal_get_mac_ascii
 #define cyw43_hal_generate_laa_mac      mp_hal_generate_laa_mac
 
+#define cyw43_hal_uart_set_baudrate     mp_bluetooth_hci_uart_set_baudrate
+#define cyw43_hal_uart_write            mp_bluetooth_hci_uart_write
+#define cyw43_hal_uart_readchar         mp_bluetooth_hci_uart_readchar
+
+#define cyw43_bluetooth_controller_init     mp_bluetooth_hci_controller_init
+#define cyw43_bluetooth_controller_deinit   mp_bluetooth_hci_controller_deinit
+#define cyw43_bluetooth_controller_woken    mp_bluetooth_hci_controller_woken
+#define cyw43_bluetooth_controller_wakeup   mp_bluetooth_hci_controller_wakeup
+#define cyw43_bluetooth_controller_sleep_maybe mp_bluetooth_hci_controller_sleep_maybe
+
 #define CYW43_PIN_WL_REG_ON             pyb_pin_WL_REG_ON
 #define CYW43_PIN_WL_HOST_WAKE          pyb_pin_WL_HOST_WAKE
 #define CYW43_PIN_WL_SDIO_1             pyb_pin_WL_SDIO_1
@@ -103,6 +129,7 @@
 
 #if MICROPY_HW_ENABLE_RF_SWITCH
 #define CYW43_PIN_RFSW_VDD              pyb_pin_WL_RFSW_VDD
+#define CYW43_PIN_RFSW_SELECT           pyb_pin_WL_GPIO_1
 #endif
 
 #define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)

From 0b729623366dab3aa2575eeab934b2629f8e52c5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 30 Mar 2025 09:31:26 +0200
Subject: [PATCH 2155/3129] drivers/cyw43: Remove old BTHCI UART backend.

It has been completely replaced by equivalent code in cyw43-driver.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 drivers/cyw43/README.md |  17 ---
 drivers/cyw43/cywbt.c   | 304 ----------------------------------------
 2 files changed, 321 deletions(-)
 delete mode 100644 drivers/cyw43/README.md
 delete mode 100644 drivers/cyw43/cywbt.c

diff --git a/drivers/cyw43/README.md b/drivers/cyw43/README.md
deleted file mode 100644
index 5af6f65580668..0000000000000
--- a/drivers/cyw43/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-CYW43xx WiFi SoC driver
-=======================
-
-This is a driver for the CYW43xx WiFi SoC.
-
-There are four layers to the driver:
-
-1. SDIO bus interface, provided by the host device/system.
-
-2. Low-level CYW43xx interface, managing the bus, control messages, Ethernet
-   frames and asynchronous events.  Includes download of SoC firmware.  The
-   header file `cyw43_ll.h` defines the interface to this layer.
-
-3. Mid-level CYW43xx control, to control and set WiFi parameters and manage
-   events.  See `cyw43_ctrl.c`.
-
-4. TCP/IP bindings to lwIP.  See `cyw43_lwip.c`.
diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
deleted file mode 100644
index 0ee69a07ecd2c..0000000000000
--- a/drivers/cyw43/cywbt.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * 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 <stdio.h>
-#include <string.h>
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "extmod/mpbthci.h"
-
-#if MICROPY_PY_NETWORK_CYW43
-
-#include "lib/cyw43-driver/src/cyw43_config.h"
-#include "lib/cyw43-driver/firmware/cyw43_btfw_4343A1.h"
-
-// 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
-
-#ifdef CYW43_PIN_BT_CTS
-// This code is not portable and currently only builds on stm32 port.
-
-#include "pin_static_af.h"
-#include "uart.h"
-
-// Provided by the port.
-extern machine_uart_obj_t mp_bluetooth_hci_uart_obj;
-
-static void cywbt_wait_cts_low(void) {
-    mp_hal_pin_config(CYW43_PIN_BT_CTS, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
-    for (int i = 0; i < 200; ++i) {
-        if (mp_hal_pin_read(CYW43_PIN_BT_CTS) == 0) {
-            break;
-        }
-        mp_hal_delay_ms(1);
-    }
-    mp_hal_pin_config_alt(CYW43_PIN_BT_CTS, MP_HAL_PIN_MODE_ALT,
-        MP_HAL_PIN_PULL_UP, AF_FN_UART, mp_bluetooth_hci_uart_obj.uart_id);
-}
-#endif
-
-static int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {
-    mp_bluetooth_hci_uart_write((void *)buf, len);
-    for (int c, i = 0; i < 6; ++i) {
-        while ((c = mp_bluetooth_hci_uart_readchar()) == -1) {
-            mp_event_wait_indefinite();
-        }
-        buf[i] = c;
-    }
-
-    // expect a command complete event (event 0x0e)
-    if (buf[0] != 0x04 || buf[1] != 0x0e) {
-        printf("unknown response: %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3]);
-        return -1;
-    }
-
-    /*
-    if buf[3:6] != cmd[:3]:
-        print('response doesn\'t match cmd:', cmd, ev)
-        return b''
-        */
-
-    int sz = buf[2] - 3;
-    for (int c, i = 0; i < sz; ++i) {
-        while ((c = mp_bluetooth_hci_uart_readchar()) == -1) {
-            mp_event_wait_indefinite();
-        }
-        buf[i] = c;
-    }
-
-    return 0;
-}
-
-static int cywbt_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] = 0x01;
-    buf[1] = ocf;
-    buf[2] = ogf << 2 | ocf >> 8;
-    buf[3] = param_len;
-    if (param_len) {
-        memcpy(buf + 4, param_buf, param_len);
-    }
-    return cywbt_hci_cmd_raw(4 + param_len, buf);
-}
-
-static void put_le16(uint8_t *buf, uint16_t val) {
-    buf[0] = val;
-    buf[1] = val >> 8;
-}
-
-static void put_le32(uint8_t *buf, uint32_t val) {
-    buf[0] = val;
-    buf[1] = val >> 8;
-    buf[2] = val >> 16;
-    buf[3] = val >> 24;
-}
-
-static int cywbt_set_baudrate(uint32_t baudrate) {
-    uint8_t buf[6];
-    put_le16(buf, 0);
-    put_le32(buf + 2, baudrate);
-    return cywbt_hci_cmd(0x3f, 0x18, 6, buf);
-}
-
-// download firmware
-static int cywbt_download_firmware(const uint8_t *firmware) {
-    cywbt_hci_cmd(0x3f, 0x2e, 0, NULL);
-
-    bool last_packet = false;
-    while (!last_packet) {
-        uint8_t *buf = mp_bluetooth_hci_cmd_buf;
-        memcpy(buf + 1, firmware, 3);
-        firmware += 3;
-        last_packet = buf[1] == 0x4e;
-        if (buf[2] != 0xfc) {
-            printf("fail1 %02x\n", buf[2]);
-            break;
-        }
-        uint8_t len = buf[3];
-
-        memcpy(buf + 4, firmware, len);
-        firmware += len;
-
-        buf[0] = 1;
-        cywbt_hci_cmd_raw(4 + len, buf);
-        if (buf[0] != 0) {
-            printf("fail3 %02x\n", buf[0]);
-            break;
-        }
-    }
-
-    // RF switch must select high path during BT patch boot
-    #if MICROPY_HW_ENABLE_RF_SWITCH
-    mp_hal_pin_config(CYW43_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
-    #ifdef CYW43_PIN_BT_CTS
-    cywbt_wait_cts_low();
-    #endif
-    #if MICROPY_HW_ENABLE_RF_SWITCH
-    // Select chip antenna (could also select external)
-    mp_hal_pin_config(CYW43_PIN_WL_GPIO_1, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_DOWN, 0);
-    #endif
-
-    mp_bluetooth_hci_uart_set_baudrate(115200);
-    cywbt_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY);
-    mp_bluetooth_hci_uart_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY);
-
-    return 0;
-}
-
-int mp_bluetooth_hci_controller_init(void) {
-    // This is called immediately after the UART is initialised during stack initialisation.
-
-    mp_hal_pin_output(CYW43_PIN_BT_REG_ON);
-    mp_hal_pin_low(CYW43_PIN_BT_REG_ON);
-    #ifdef CYW43_PIN_BT_HOST_WAKE
-    mp_hal_pin_input(CYW43_PIN_BT_HOST_WAKE);
-    #endif
-    #ifdef CYW43_PIN_BT_DEV_WAKE
-    mp_hal_pin_output(CYW43_PIN_BT_DEV_WAKE);
-    mp_hal_pin_low(CYW43_PIN_BT_DEV_WAKE);
-    #endif
-
-    #if MICROPY_HW_ENABLE_RF_SWITCH
-    // TODO don't select antenna if wifi is enabled
-    mp_hal_pin_config(CYW43_PIN_WL_GPIO_4, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0); // RF-switch power
-    mp_hal_pin_high(CYW43_PIN_WL_GPIO_4); // Turn the RF-switch on
-    #endif
-
-    uint8_t buf[256];
-
-    mp_hal_pin_low(CYW43_PIN_BT_REG_ON);
-    mp_bluetooth_hci_uart_set_baudrate(115200);
-    mp_hal_delay_ms(100);
-    mp_hal_pin_high(CYW43_PIN_BT_REG_ON);
-    #ifdef CYW43_PIN_BT_CTS
-    cywbt_wait_cts_low();
-    #else
-    mp_hal_delay_ms(100);
-    #endif
-
-    // Reset
-    cywbt_hci_cmd(0x03, 0x0003, 0, NULL);
-
-    #ifdef MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE
-    // Change baudrate
-    cywbt_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE);
-    mp_bluetooth_hci_uart_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE);
-    #endif
-
-    cywbt_download_firmware((const uint8_t *)&cyw43_btfw_4343A1[0]);
-
-    // Reset
-    cywbt_hci_cmd(0x03, 0x0003, 0, NULL);
-
-    // Set BD_ADDR (sent as little endian)
-    uint8_t bdaddr[6];
-    mp_hal_get_mac(MP_HAL_MAC_BDADDR, bdaddr);
-    buf[0] = bdaddr[5];
-    buf[1] = bdaddr[4];
-    buf[2] = bdaddr[3];
-    buf[3] = bdaddr[2];
-    buf[4] = bdaddr[1];
-    buf[5] = bdaddr[0];
-    cywbt_hci_cmd(0x3f, 0x0001, 6, buf);
-
-    // Set local name
-    // memset(buf, 0, 248);
-    // memcpy(buf, "PYBD-BLE", 8);
-    // cywbt_hci_cmd(0x03, 0x0013, 248, buf);
-
-    // Configure sleep mode
-    cywbt_hci_cmd(0x3f, 0x27, 12, (const uint8_t *)"\x01\x02\x02\x00\x00\x00\x01\x00\x00\x00\x00\x00");
-
-    // HCI_Write_LE_Host_Support
-    cywbt_hci_cmd(3, 109, 2, (const uint8_t *)"\x01\x00");
-
-    #ifdef CYW43_PIN_BT_DEV_WAKE
-    mp_hal_pin_high(CYW43_PIN_BT_DEV_WAKE); // let sleep
-    #endif
-
-    return 0;
-}
-
-int mp_bluetooth_hci_controller_deinit(void) {
-    mp_hal_pin_low(CYW43_PIN_BT_REG_ON);
-
-    return 0;
-}
-
-#ifdef CYW43_PIN_BT_DEV_WAKE
-static uint32_t bt_sleep_ticks;
-#endif
-
-int mp_bluetooth_hci_controller_sleep_maybe(void) {
-    #ifdef CYW43_PIN_BT_DEV_WAKE
-    if (mp_hal_pin_read(CYW43_PIN_BT_DEV_WAKE) == 0) {
-        if (mp_hal_ticks_ms() - bt_sleep_ticks > 500) {
-            mp_hal_pin_high(CYW43_PIN_BT_DEV_WAKE); // let sleep
-        }
-    }
-    #endif
-    return 0;
-}
-
-bool mp_bluetooth_hci_controller_woken(void) {
-    #ifdef CYW43_PIN_BT_HOST_WAKE
-    bool host_wake = mp_hal_pin_read(CYW43_PIN_BT_HOST_WAKE);
-    /*
-    // this is just for info/tracing purposes
-    static bool last_host_wake = false;
-    if (host_wake != last_host_wake) {
-        printf("HOST_WAKE change %d -> %d\n", last_host_wake, host_wake);
-        last_host_wake = host_wake;
-    }
-    */
-    return host_wake;
-    #else
-    return true;
-    #endif
-}
-
-int mp_bluetooth_hci_controller_wakeup(void) {
-    #ifdef CYW43_PIN_BT_DEV_WAKE
-    bt_sleep_ticks = mp_hal_ticks_ms();
-
-    if (mp_hal_pin_read(CYW43_PIN_BT_DEV_WAKE) == 1) {
-        mp_hal_pin_low(CYW43_PIN_BT_DEV_WAKE); // wake up
-        // Use delay_us rather than delay_ms to prevent running the scheduler (which
-        // might result in more BLE operations).
-        mp_hal_delay_us(5000); // can't go lower than this
-    }
-    #endif
-
-    return 0;
-}
-
-#endif

From f5cb9eb9746bea3dc49cc1ae0d424058fb7a09f2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Apr 2025 10:43:38 +1000
Subject: [PATCH 2156/3129] top: Bump Ruff version to v0.11.6.

Brings it into sync with a matching change to micropython-lib (which was
much older).  Includes one small automatic fix.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ruff.yml | 4 ++--
 .pre-commit-config.yaml    | 4 ++--
 tools/mpy_ld.py            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 9265c25bcba13..4c4a2a3162ed6 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    # ruff version should be kept in sync with .pre-commit-config.yaml
-    - run: pipx install ruff==0.9.6
+    # ruff version should be kept in sync with .pre-commit-config.yaml & also micropython-lib
+    - run: pipx install ruff==0.11.6
     - run: ruff check --output-format=github .
     - run: ruff format --diff .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d07f9b0fda2a9..ac9785bb59232 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,8 +12,8 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    # Version should be kept in sync with .github/workflows/ruff.yml
-    rev: v0.9.6
+    # Version should be kept in sync with .github/workflows/ruff.yml & also micropython-lib
+    rev: v0.11.6
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 70cab2b894ba5..a47653f900cc8 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -1131,7 +1131,7 @@ def load_object_file(env, f, felf):
         elif sym.entry["st_shndx"] == "SHN_UNDEF" and sym["st_info"]["bind"] == "STB_GLOBAL":
             # Undefined global symbol, needs resolving
             env.unresolved_syms.append(sym)
-    if len(dup_errors):
+    if dup_errors:
         raise LinkError("\n".join(dup_errors))
 
 
@@ -1214,7 +1214,7 @@ def link_objects(env, native_qstr_vals_len):
             else:
                 undef_errors.append("{}: undefined symbol: {}".format(sym.filename, sym.name))
 
-    if len(undef_errors):
+    if undef_errors:
         raise LinkError("\n".join(undef_errors))
 
     # Align sections, assign their addresses, and create full_text

From c83e907d9dba3d6be2305b2e2e6b646dd51c495a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Apr 2025 12:20:19 +1000
Subject: [PATCH 2157/3129] tests/extmod: Skip binascii tests when
 hexlify/unhexlify don't exist.

These functions are only available when `MICROPY_PY_BUILTINS_BYTES_HEX` is
enabled.

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

diff --git a/tests/extmod/binascii_hexlify.py b/tests/extmod/binascii_hexlify.py
index d06029aabaffb..ae90b67336586 100644
--- a/tests/extmod/binascii_hexlify.py
+++ b/tests/extmod/binascii_hexlify.py
@@ -1,5 +1,5 @@
 try:
-    import binascii
+    from binascii import hexlify
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -10,10 +10,10 @@
     b"\x7f\x80\xff",
     b"1234ABCDabcd",
 ):
-    print(binascii.hexlify(x))
+    print(hexlify(x))
 
 # Two-argument version (now supported in CPython)
-print(binascii.hexlify(b"123", ":"))
+print(hexlify(b"123", ":"))
 
 # zero length buffer
-print(binascii.hexlify(b"", b":"))
+print(hexlify(b"", b":"))
diff --git a/tests/extmod/binascii_unhexlify.py b/tests/extmod/binascii_unhexlify.py
index bb663bc5b0c0d..ec31fb2325aa3 100644
--- a/tests/extmod/binascii_unhexlify.py
+++ b/tests/extmod/binascii_unhexlify.py
@@ -1,5 +1,5 @@
 try:
-    import binascii
+    from binascii import unhexlify
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -10,14 +10,14 @@
     b"7f80ff",
     b"313233344142434461626364",
 ):
-    print(binascii.unhexlify(x))
+    print(unhexlify(x))
 
 try:
-    a = binascii.unhexlify(b"0")  # odd buffer length
+    a = unhexlify(b"0")  # odd buffer length
 except ValueError:
     print("ValueError")
 
 try:
-    a = binascii.unhexlify(b"gg")  # digit not hex
+    a = unhexlify(b"gg")  # digit not hex
 except ValueError:
     print("ValueError")

From a081b2e151565550508ac782ef15db8e9d2a7eff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Apr 2025 12:21:04 +1000
Subject: [PATCH 2158/3129] tests/extmod/vfs_lfs_ilistdir_del.py: Skip test if
 not enough memory.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_lfs_ilistdir_del.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/vfs_lfs_ilistdir_del.py b/tests/extmod/vfs_lfs_ilistdir_del.py
index 7b59bc412d983..f463b84b22492 100644
--- a/tests/extmod/vfs_lfs_ilistdir_del.py
+++ b/tests/extmod/vfs_lfs_ilistdir_del.py
@@ -71,5 +71,10 @@ def test(bdev, vfs_class):
         fs.open("/test", "w").close()
 
 
-bdev = RAMBlockDevice(30)
+try:
+    bdev = RAMBlockDevice(30)
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
 test(bdev, vfs.VfsLfs2)

From 898c04ae0e24ca523a630eecc9ac4b4787e55a7e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Apr 2025 12:21:27 +1000
Subject: [PATCH 2159/3129] tests/extmod/vfs_mountinfo.py: Don't import unused
 errno module.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_mountinfo.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/extmod/vfs_mountinfo.py b/tests/extmod/vfs_mountinfo.py
index f674e80763409..b31dc60ce76d7 100644
--- a/tests/extmod/vfs_mountinfo.py
+++ b/tests/extmod/vfs_mountinfo.py
@@ -5,7 +5,6 @@
 except ImportError:
     print("SKIP")
     raise SystemExit
-import errno
 
 
 class Filesystem:

From ce7f65f96703bbbe6039ba29e079023a32dccef0 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 24 Apr 2025 05:07:28 +0200
Subject: [PATCH 2160/3129] tests/extmod/vfs_posix.py: Fix test on Android.

This commit makes a slight change to the vfs_posix test suite to let it
pass on Android.

On Android, non-root processes can perform most filesystem operations
only on a restricted set of directories.  The vfs_posix test suite
attempted to enumerate the filesystem root directory, and said directory
happens to be restricted for non-root processes.  This would raise
an EACCES OSError and terminate the test with a unexpected failure.

To fix this, rather than enumerating the filesystem root directory the
enumeration target is the internal shared storage area root - which
doesn't have enumeration restrictions for non-root processes.  The path
is hardcoded because it is guaranteed to be there on pretty much any
recent-ish device for now (it stayed the same for more than a decade for
compatibility reasons).  The proper way would be to query the storage
subsystem via a JNI round-trip call, but this introduces too much
complexity for something that is unlikely to break going forward.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/extmod/vfs_posix.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index d060c0b9c84f3..b3ca2753ba9cf 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -29,7 +29,21 @@
 print(type(os.stat("/")))
 
 # listdir and ilistdir
-print(type(os.listdir("/")))
+target = "/"
+try:
+    import platform
+
+    # On Android non-root users are permitted full filesystem access only to
+    # selected directories.  To let this test pass on bionic, the internal
+    # user-accessible storage area root is enumerated instead of the
+    # filesystem root.  "/storage/emulated/0" should be there on pretty much
+    # any recent-ish device; querying the proper location requires a JNI
+    # round-trip, not really worth it.
+    if platform.platform().startswith("Android-"):
+        target = "/storage/emulated/0"
+except ImportError:
+    pass
+print(type(os.listdir(target)))
 
 # mkdir
 os.mkdir(temp_dir)

From 584fa8800b833b53c6d6f9eb7572774a67304d2f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Apr 2025 17:52:43 +1000
Subject: [PATCH 2161/3129] esp32/tools: Update metrics_esp32 script for
 ESP-IDF >=v5.4.x.

The output of 'idf.py size' has changed, plus some other cleanups around
build dir name, etc.  Can now run on v5.2.2 and v5.4.1, probably other
versions.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/tools/metrics_esp32.py | 46 +++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/tools/metrics_esp32.py b/ports/esp32/tools/metrics_esp32.py
index 66a6a588ba212..5e65a78c97a27 100755
--- a/ports/esp32/tools/metrics_esp32.py
+++ b/ports/esp32/tools/metrics_esp32.py
@@ -32,6 +32,7 @@
 # column of the table is really D/IRAM.
 import os
 import re
+import shutil
 import sys
 import subprocess
 from dataclasses import dataclass
@@ -47,6 +48,13 @@
 )
 
 
+def rmtree(path):
+    try:
+        shutil.rmtree(path)
+    except FileNotFoundError:
+        pass
+
+
 @dataclass
 class BuildSizes:
     idf_ver: str
@@ -99,7 +107,7 @@ def __lt__(self, other):
 
     def build_dir(self):
         if self.variant:
-            return f"build-{self.board}_{self.variant}"
+            return f"build-{self.board}-{self.variant}"
         else:
             return f"build-{self.board}"
 
@@ -124,12 +132,23 @@ def run_make(self, target):
     def make_size(self):
         try:
             size_out = self.run_make("size")
-            # "Used static DRAM:" or "Used stat D/IRAM:"
-            RE_DRAM = r"Used stat(?:ic)? D.*: *(\d+) bytes"
-            RE_IRAM = r"Used static IRAM: *(\d+) bytes"
+            try:
+                # pre IDF v5.4 size output
+                # "Used static DRAM:" or "Used stat D/IRAM:"
+                RE_DRAM = r"Used stat(?:ic)? D.*: *(\d+) bytes"
+                RE_IRAM = r"Used static IRAM: *(\d+) bytes"
+                self.dram_size = re.search(RE_DRAM, size_out).group(1)
+                self.iram_size = re.search(RE_IRAM, size_out).group(1)
+            except AttributeError:
+                # IDF v5.4 size output is much nicer formatted
+                # Note the pipes in these expressions are not the ASCII/RE |
+                RE_DRAM = r"│ *DI?RAM *│ *(\d+)"
+                RE_IRAM = r"│ *IRAM *│ *(\d+)"
+                self.dram_size = re.search(RE_DRAM, size_out).group(1)
+                self.iram_size = re.search(RE_IRAM, size_out).group(1)
+
+            # This line is the same on before/after versions
             RE_BIN = r"Total image size: *(\d+) bytes"
-            self.dram_size = re.search(RE_DRAM, size_out).group(1)
-            self.iram_size = re.search(RE_IRAM, size_out).group(1)
             self.bin_size = re.search(RE_BIN, size_out).group(1)
         except subprocess.CalledProcessError:
             self.bin_size = "build failed"
@@ -139,13 +158,26 @@ def main(do_clean):
     if "IDF_PATH" not in os.environ:
         raise RuntimeError("IDF_PATH must be set")
 
+    if not os.path.exists("Makefile"):
+        raise RuntimeError(
+            "This script must be run from the ports/esp32 directory, i.e. as ./tools/metrics_esp32.py"
+        )
+
+    if "IDF_PYTHON_ENV_PATH" in os.environ:
+        raise RuntimeError(
+            "Run this script without any existing ESP-IDF environment active/exported."
+        )
+
     sizes = []
     for idf_ver in IDF_VERS:
         switch_ver(idf_ver)
+        rmtree("managed_components")
         for board, variant in BUILDS:
             print(f"Building '{board}'/'{variant}'...", file=sys.stderr)
             result = BuildSizes(idf_ver, board, variant)
-            result.run_make("clean")
+            # Rather than running the 'clean' target, delete the build directory to avoid
+            # environment version mismatches, etc.
+            rmtree(result.build_dir())
             result.make_size()
             result.print_summary()
             sizes.append(result)

From dcca3ff602c821e5b252cbe44e669806b0a6f416 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Apr 2025 10:20:33 +1000
Subject: [PATCH 2162/3129] tools/mpremote: Use zlib.compressobj instead of
 zlib.compress.

Because the `wbits` parameter was only added to `zlib.compress` in
CPython 3.11.  Using `zlib.compressobj` makes the code compatible with much
older CPython versions.

Fixes issue #17140.

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

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 690b2ea723ea4..1e13b33afe7de 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -649,7 +649,9 @@ def _do_romfs_deploy(state, args):
         romfs_chunk += bytes(chunk_size - len(romfs_chunk))
         if has_deflate_io:
             # Needs: binascii.a2b_base64, io.BytesIO, deflate.DeflateIO.
-            romfs_chunk_compressed = zlib.compress(romfs_chunk, wbits=-9)
+            compressor = zlib.compressobj(wbits=-9)
+            romfs_chunk_compressed = compressor.compress(romfs_chunk)
+            romfs_chunk_compressed += compressor.flush()
             buf = binascii.b2a_base64(romfs_chunk_compressed).strip()
             transport.exec(f"buf=DeflateIO(BytesIO(a2b_base64({buf})),RAW,9).read()")
         elif has_a2b_base64:

From 076e07197e35cdc0e23bd6f45fd21a36e2162e88 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Mar 2025 11:44:09 +1100
Subject: [PATCH 2163/3129] lib/lwip: Update lwIP to STABLE-2_2_1_RELEASE.

This updates lwIP from STABLE-2_2_0_RELEASE, which was released in
September 2023.  The latest STABLE-2_2_1_RELEASE was released in February
2025.

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 0a0452b2c39bd..77dcd25a72509 160000
--- a/lib/lwip
+++ b/lib/lwip
@@ -1 +1 @@
-Subproject commit 0a0452b2c39bdd91e252aef045c115f88f6ca773
+Subproject commit 77dcd25a72509eb83f72b033d219b1d40cd8eb95

From 02eea0da2448f2be9bcc04f340a6a0a1fae18f7b Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 22 Apr 2025 14:53:07 +0200
Subject: [PATCH 2164/3129] py: Make struct-initializing macros compatible with
 C++.

This requires explicitly naming and initializing all members so add that
where needed and possible.  For MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1
this would require initializing the .callback member, but that's a bit
of a waste since the macro is always followed by a call to
nlr_push_jump_callback() to initialize exactly that member, so rewrite
the macro without initializers.

Signed-off-by: stijn <stijn@ignitron.net>
---
 py/obj.h      | 14 +++++++-------
 py/objtuple.h |  2 +-
 py/runtime.h  | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 93d1e0ee34349..07362522474d6 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -371,25 +371,25 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
 
 #define MP_DEFINE_CONST_FUN_OBJ_0(obj_name, fun_name) \
     const mp_obj_fun_builtin_fixed_t obj_name = \
-    {{&mp_type_fun_builtin_0}, .fun._0 = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_0}, .fun = {._0 = fun_name}}
 #define MP_DEFINE_CONST_FUN_OBJ_1(obj_name, fun_name) \
     const mp_obj_fun_builtin_fixed_t obj_name = \
-    {{&mp_type_fun_builtin_1}, .fun._1 = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_1}, .fun = {._1 = fun_name}}
 #define MP_DEFINE_CONST_FUN_OBJ_2(obj_name, fun_name) \
     const mp_obj_fun_builtin_fixed_t obj_name = \
-    {{&mp_type_fun_builtin_2}, .fun._2 = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_2}, .fun = {._2 = fun_name}}
 #define MP_DEFINE_CONST_FUN_OBJ_3(obj_name, fun_name) \
     const mp_obj_fun_builtin_fixed_t obj_name = \
-    {{&mp_type_fun_builtin_3}, .fun._3 = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_3}, .fun = {._3 = fun_name}}
 #define MP_DEFINE_CONST_FUN_OBJ_VAR(obj_name, n_args_min, fun_name) \
     const mp_obj_fun_builtin_var_t obj_name = \
-    {{&mp_type_fun_builtin_var}, MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, false), .fun.var = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, false), .fun = {.var = fun_name}}
 #define MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(obj_name, n_args_min, n_args_max, fun_name) \
     const mp_obj_fun_builtin_var_t obj_name = \
-    {{&mp_type_fun_builtin_var}, MP_OBJ_FUN_MAKE_SIG(n_args_min, n_args_max, false), .fun.var = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, n_args_max, false), .fun = {.var = fun_name}}
 #define MP_DEFINE_CONST_FUN_OBJ_KW(obj_name, n_args_min, fun_name) \
     const mp_obj_fun_builtin_var_t obj_name = \
-    {{&mp_type_fun_builtin_var}, MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, true), .fun.kw = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, true), .fun = {.kw = fun_name}}
 
 // These macros are used to define constant map/dict objects
 // You can put "static" in front of the definition to make it local
diff --git a/py/objtuple.h b/py/objtuple.h
index 034814b82662d..3c82a9edcf345 100644
--- a/py/objtuple.h
+++ b/py/objtuple.h
@@ -50,7 +50,7 @@ extern const mp_obj_type_t mp_type_attrtuple;
 
 #define MP_DEFINE_ATTRTUPLE(tuple_obj_name, fields, nitems, ...) \
     const mp_rom_obj_tuple_t tuple_obj_name = { \
-        .base = {&mp_type_attrtuple}, \
+        .base = {.type = &mp_type_attrtuple}, \
         .len = nitems, \
         .items = { __VA_ARGS__, MP_ROM_PTR((void *)fields) } \
     }
diff --git a/py/runtime.h b/py/runtime.h
index e8e5a758f8beb..77cdd0e203da9 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -30,12 +30,12 @@
 #include "py/pystack.h"
 #include "py/cstack.h"
 
-// For use with mp_call_function_1_from_nlr_jump_callback.
+// Initialize an nlr_jump_callback_node_call_function_1_t struct for use with
+// nlr_push_jump_callback(&ctx.callback, mp_call_function_1_from_nlr_jump_callback);
 #define MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, f, a) \
-    nlr_jump_callback_node_call_function_1_t ctx = { \
-        .func = (void (*)(void *))(f), \
-        .arg = (a), \
-    }
+    nlr_jump_callback_node_call_function_1_t ctx; \
+    ctx.func = (void (*)(void *))(f); \
+    ctx.arg = (a)
 
 typedef enum {
     MP_VM_RETURN_NORMAL,

From 9a377801dc5a99825d6d613f6affcafe059306c0 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 22 Apr 2025 13:31:45 +0200
Subject: [PATCH 2165/3129] unix/coveragecpp: Verify struct-initializing
 macros' C++-compatibility.

Add code using all relevant macros to make sure they initialize
structs correctly.

Signed-off-by: stijn <stijn@ignitron.net>
---
 ports/unix/coveragecpp.cpp | 51 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/ports/unix/coveragecpp.cpp b/ports/unix/coveragecpp.cpp
index 23c3955ae9d0b..8ba308f6468f3 100644
--- a/ports/unix/coveragecpp.cpp
+++ b/ports/unix/coveragecpp.cpp
@@ -17,10 +17,61 @@ extern "C" {
 #include <py/runtime.h>
 }
 
+// Invoke all (except one, see below) public API macros which initialize structs to make sure
+// they are C++-compatible, meaning they explicitly initialize all struct members.
+mp_obj_t f0();
+MP_DEFINE_CONST_FUN_OBJ_0(f0_obj, f0);
+mp_obj_t f1(mp_obj_t);
+MP_DEFINE_CONST_FUN_OBJ_1(f1_obj, f1);
+mp_obj_t f2(mp_obj_t, mp_obj_t);
+MP_DEFINE_CONST_FUN_OBJ_2(f2_obj, f2);
+mp_obj_t f3(mp_obj_t, mp_obj_t, mp_obj_t);
+MP_DEFINE_CONST_FUN_OBJ_3(f3_obj, f3);
+mp_obj_t fvar(size_t, const mp_obj_t *);
+MP_DEFINE_CONST_FUN_OBJ_VAR(fvar_obj, 1, fvar);
+mp_obj_t fvarbetween(size_t, const mp_obj_t *);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fvarbetween_obj, 1, 2, fvarbetween);
+mp_obj_t fkw(size_t, const mp_obj_t *, mp_map_t *);
+MP_DEFINE_CONST_FUN_OBJ_KW(fkw_obj, 1, fkw);
+
+static const mp_rom_map_elem_t table[] = {
+    { MP_ROM_QSTR(MP_QSTR_f0), MP_ROM_PTR(&f0_obj) },
+};
+MP_DEFINE_CONST_MAP(map, table);
+MP_DEFINE_CONST_DICT(dict, table);
+
+static const qstr attrtuple_fields[] = {
+    MP_QSTR_f0,
+};
+MP_DEFINE_ATTRTUPLE(attrtuple, attrtuple_fields, 1, MP_ROM_PTR(&f0_obj));
+
+void nlr_cb(void *);
+void nlr_cb(void *){
+}
+
+// The MP_DEFINE_CONST_OBJ_TYPE macro is not C++-compatible because each of the
+// MP_DEFINE_CONST_OBJ_TYPE_NARGS_X macros only initializes some of _mp_obj_type_t's
+// .slot_index_xxx members but that cannot be fixed to be done in a deterministic way.
+
+
 #if defined(MICROPY_UNIX_COVERAGE)
 
 // Just to test building of C++ code.
 static mp_obj_t extra_cpp_coverage_impl() {
+    MP_DEFINE_NLR_JUMP_CALLBACK_FUNCTION_1(ctx, nlr_cb, (void *) nlr_cb);
+
+    // To avoid 'error: unused variable [-Werror,-Wunused-const-variable]'.
+    (void) ctx;
+    (void) f0_obj;
+    (void) f1_obj;
+    (void) f2_obj;
+    (void) f3_obj;
+    (void) fvar_obj;
+    (void) fvarbetween_obj;
+    (void) fkw_obj;
+    (void) map;
+    (void) dict;
+    (void) attrtuple;
     return mp_const_none;
 }
 

From cee0419021396a87bd38bb3231b06311f604fad4 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Tue, 22 Apr 2025 09:08:14 -0400
Subject: [PATCH 2166/3129] tools/mpremote/tests: Add tests for errno behavior.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tools/mpremote/tests/test_errno.sh     | 38 ++++++++++++++++++++++++++
 tools/mpremote/tests/test_errno.sh.exp | 25 +++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100755 tools/mpremote/tests/test_errno.sh
 create mode 100644 tools/mpremote/tests/test_errno.sh.exp

diff --git a/tools/mpremote/tests/test_errno.sh b/tools/mpremote/tests/test_errno.sh
new file mode 100755
index 0000000000000..0899706552d14
--- /dev/null
+++ b/tools/mpremote/tests/test_errno.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+# Special ErrorFS so the test can induce arbitrary filesystem errors.
+cat << EOF > "${TMP}/fs.py"
+import os, vfs, errno
+
+class ErrorFS:
+    def mount(self, *a, **k):
+        pass
+    def umount(self, *a, **k):
+        pass
+    def chdir(self, *a, **k):
+        pass
+    def open(self, *a, **k):
+        raise self.error
+
+fs = ErrorFS()
+vfs.mount(fs, '/fs')
+os.chdir('/fs')
+EOF
+
+$MPREMOTE run "${TMP}/fs.py"
+
+echo -----
+$MPREMOTE resume exec "fs.error = Exception()"
+(
+  $MPREMOTE resume cat :Exception.py || echo "expect error"
+) 2> >(head -n1 >&2) # discard traceback specifics but keep main error message
+
+for errno in ENOENT EISDIR EEXIST ENODEV EINVAL EPERM EOPNOTSUPP ; do
+echo -----
+$MPREMOTE resume exec "fs.error = OSError(errno.$errno, '')"
+$MPREMOTE resume cat :$errno.py || echo "expect error"
+done
+
+echo -----
+$MPREMOTE resume exec "vfs.umount('/fs')"
diff --git a/tools/mpremote/tests/test_errno.sh.exp b/tools/mpremote/tests/test_errno.sh.exp
new file mode 100644
index 0000000000000..deda52f5fb0e8
--- /dev/null
+++ b/tools/mpremote/tests/test_errno.sh.exp
@@ -0,0 +1,25 @@
+-----
+mpremote: Error with transport:
+expect error
+-----
+mpremote: cat: ENOENT.py: No such file or directory.
+expect error
+-----
+mpremote: cat: EISDIR.py: Is a directory.
+expect error
+-----
+mpremote: cat: EEXIST.py: File exists.
+expect error
+-----
+mpremote: cat: ENODEV.py: No such device.
+expect error
+-----
+mpremote: cat: EINVAL.py: Invalid argument.
+expect error
+-----
+mpremote: cat: EPERM.py: Operation not permitted.
+expect error
+-----
+mpremote: cat: EOPNOTSUPP.py: Operation not supported.
+expect error
+-----

From 805fe083a3dea76b0acd36ecc436c2b76b808059 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 7 Apr 2025 10:08:36 -0400
Subject: [PATCH 2167/3129] tools/mpremote: Refactor error handling to apply
 generally to any errno.

This rewrites the code that previously manually emitted and caught various
OSError subclasses with equivalent code that uses the errno name dictionary
to do this generically, and updates the exception handler in do_filesystem
to catch them in a similarly-generic fashion using os.strerror to retrieve
an appropriate error message text equivalent to the current messages.

Note that in the CPython environments where mpremote runs, the call to the
OSError constructor already returns an instance of the corresponding mapped
exception subtype.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tools/mpremote/mpremote/commands.py  |  8 ++------
 tools/mpremote/mpremote/transport.py | 16 ++++------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 1e13b33afe7de..b1e5d3c7ed664 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -393,12 +393,8 @@ def do_filesystem(state, args):
                     )
                 else:
                     do_filesystem_cp(state, path, cp_dest, len(paths) > 1, not args.force)
-    except FileNotFoundError as er:
-        raise CommandError("{}: {}: No such file or directory.".format(command, er.args[0]))
-    except IsADirectoryError as er:
-        raise CommandError("{}: {}: Is a directory.".format(command, er.args[0]))
-    except FileExistsError as er:
-        raise CommandError("{}: {}: File exists.".format(command, er.args[0]))
+    except OSError as er:
+        raise CommandError("{}: {}: {}.".format(command, er.strerror, os.strerror(er.errno)))
     except TransportError as er:
         raise CommandError("Error with transport:\n{}".format(er.args[0]))
 
diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index 8d30c7f517ff9..df8ef209aecf6 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -55,18 +55,10 @@ def __init__(self, status_code, error_output):
 # Takes a Transport error (containing the text of an OSError traceback) and
 # raises it as the corresponding OSError-derived exception.
 def _convert_filesystem_error(e, info):
-    if "OSError" in e.error_output and "ENOENT" in e.error_output:
-        return FileNotFoundError(info)
-    if "OSError" in e.error_output and "EISDIR" in e.error_output:
-        return IsADirectoryError(info)
-    if "OSError" in e.error_output and "EEXIST" in e.error_output:
-        return FileExistsError(info)
-    if "OSError" in e.error_output and "ENODEV" in e.error_output:
-        return FileNotFoundError(info)
-    if "OSError" in e.error_output and "EINVAL" in e.error_output:
-        return OSError(errno.EINVAL, info)
-    if "OSError" in e.error_output and "EPERM" in e.error_output:
-        return OSError(errno.EPERM, info)
+    if "OSError" in e.error_output:
+        for code, estr in errno.errorcode.items():
+            if estr in e.error_output:
+                return OSError(code, info)
     return e
 
 

From dc46cf15c17ab5bd8371c00e11ee9743229b7868 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 7 Apr 2025 13:52:57 -0400
Subject: [PATCH 2168/3129] tools/mpremote: Fix possibly-missing EOPNOTSUPP
 errno name.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tools/mpremote/mpremote/transport.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index df8ef209aecf6..1b70f9b2edc40 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -56,7 +56,10 @@ def __init__(self, status_code, error_output):
 # raises it as the corresponding OSError-derived exception.
 def _convert_filesystem_error(e, info):
     if "OSError" in e.error_output:
-        for code, estr in errno.errorcode.items():
+        for code, estr in [
+            *errno.errorcode.items(),
+            (errno.EOPNOTSUPP, "EOPNOTSUPP"),
+        ]:
             if estr in e.error_output:
                 return OSError(code, info)
     return e

From 37fe3f66c3eaac084d9da5b92fabdf84977142f9 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Thu, 17 Apr 2025 17:14:16 +0200
Subject: [PATCH 2169/3129] tools/mpremote/tests: Add test for rm -r on /remote
 vfs.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 tools/mpremote/tests/test_filesystem.sh     | 5 ++++-
 tools/mpremote/tests/test_filesystem.sh.exp | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/tests/test_filesystem.sh b/tools/mpremote/tests/test_filesystem.sh
index a20d77dfea399..a29015e987268 100755
--- a/tools/mpremote/tests/test_filesystem.sh
+++ b/tools/mpremote/tests/test_filesystem.sh
@@ -233,4 +233,7 @@ $MPREMOTE resume exec "import os;os.chdir('/')"
 $MPREMOTE resume rm -r -v :/ramdisk
 $MPREMOTE resume ls :/ramdisk
 
-echo -----
\ No newline at end of file
+echo -----
+# try to delete existing folder in mounted filesystem
+$MPREMOTE mount "${TMP}" + rm -rv :package || echo "expect error"
+echo -----
diff --git a/tools/mpremote/tests/test_filesystem.sh.exp b/tools/mpremote/tests/test_filesystem.sh.exp
index 16d98c4ded8ec..3d9d0fe9ae8fa 100644
--- a/tools/mpremote/tests/test_filesystem.sh.exp
+++ b/tools/mpremote/tests/test_filesystem.sh.exp
@@ -267,3 +267,8 @@ removed directory: '/ramdisk/package'
 skipped: '/ramdisk' (vfs mountpoint)
 ls :/ramdisk
 -----
+Local directory ${TMP} is mounted at /remote
+rm :package
+mpremote: rm -r not permitted on /remote directory
+expect error
+-----

From 6406afb1f3ad8216ef205098880b2e602104af5f Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Thu, 17 Apr 2025 16:52:23 +0200
Subject: [PATCH 2170/3129] tools/mpremote: Prevent deletion of /remote files
 via rm -r.

Removes the risk of inadvertently deleting files on the host by preventing
the deletion of files via `rm -r` on the `/remote` vfs mount point.

Fixes issue #17147.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 tools/mpremote/mpremote/commands.py         | 11 +++++++++++
 tools/mpremote/mpremote/transport_serial.py | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index b1e5d3c7ed664..452384728ab71 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -303,6 +303,17 @@ def _mkdir(a, *b):
 
 def do_filesystem_recursive_rm(state, path, args):
     if state.transport.fs_isdir(path):
+        if state.transport.mounted:
+            r_cwd = state.transport.eval("os.getcwd()")
+            abs_path = os.path.normpath(
+                os.path.join(r_cwd, path) if not os.path.isabs(path) else path
+            )
+            if isinstance(state.transport, SerialTransport) and abs_path.startswith(
+                f'{SerialTransport.fs_hook_mount}/'
+            ):
+                raise CommandError(
+                    f"rm -r not permitted on {SerialTransport.fs_hook_mount} directory"
+                )
         for entry in state.transport.fs_listdir(path):
             do_filesystem_recursive_rm(state, _remote_path_join(path, entry.name), args)
         if path:
diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 6aed0bb496b93..53fc48553b167 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -42,6 +42,8 @@
 
 
 class SerialTransport(Transport):
+    fs_hook_mount = "/remote"  # MUST match the mount point in fs_hook_code
+
     def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None):
         self.in_raw_repl = False
         self.use_raw_paste = True
@@ -375,7 +377,11 @@ def write_ctrl_d(self, out_callback):
         self.serial = self.serial.orig_serial
 
         # Provide a message about the remount.
-        out_callback(bytes(f"\r\nRemount local directory {self.cmd.root} at /remote\r\n", "utf8"))
+        out_callback(
+            bytes(
+                f"\r\nRemount local directory {self.cmd.root} at {self.fs_hook_mount}\r\n", "utf8"
+            )
+        )
 
         # Enter raw REPL and re-mount the remote filesystem.
         self.serial.write(b"\x01")
@@ -392,7 +398,7 @@ def write_ctrl_d(self, out_callback):
 
     def umount_local(self):
         if self.mounted:
-            self.exec('os.umount("/remote")')
+            self.exec(f'os.umount("{self.fs_hook_mount}")')
             self.mounted = False
             self.serial = self.serial.orig_serial
 
@@ -413,7 +419,7 @@ def umount_local(self):
     "CMD_RMDIR": 13,
 }
 
-fs_hook_code = """\
+fs_hook_code = f"""\
 import os, io, struct, micropython
 
 SEEK_SET = 0
@@ -746,8 +752,8 @@ def open(self, path, mode):
 
 
 def __mount():
-    os.mount(RemoteFS(RemoteCommand()), '/remote')
-    os.chdir('/remote')
+    os.mount(RemoteFS(RemoteCommand()), '{SerialTransport.fs_hook_mount}')
+    os.chdir('{SerialTransport.fs_hook_mount}')
 """
 
 # Apply basic compression on hook code.

From cd71db0172c9f0905fd3d3438b1f2cf70da11dfa Mon Sep 17 00:00:00 2001
From: Detlev Zundel <dzu@member.fsf.org>
Date: Thu, 6 Feb 2025 16:44:39 +0100
Subject: [PATCH 2171/3129] zephyr: Fix prj.conf for v4.1-rc1.

The (deprecated) kconfig option NET_SOCKETS_POSIX_NAMES was removed in
commit abad505bdeed6102061767f45acd63323973f564 so remove it from our
configuration.

As the option has been deprecated longer, this also works for v3.7 and
v4.0 the other still supported versions.

Signed-off-by: Detlev Zundel <dzu@member.fsf.org>
---
 ports/zephyr/prj.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index ae37c3ff07614..0325cddd206c4 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -29,7 +29,6 @@ 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 cd3eaad05cf94cd86e9762c854c68a4d4b5c2fab Mon Sep 17 00:00:00 2001
From: Detlev Zundel <dzu@member.fsf.org>
Date: Thu, 6 Feb 2025 16:45:25 +0100
Subject: [PATCH 2172/3129] zephyr: Fix call to thread_analyzer_print for v4.0.

Commit 1b6e0f64796dfd6f86a8679ea6d24e1fca1e63a8 for Zephyr v4.0.0
changed the function "thread_analyzer_print" to require a cpu argument
and allow thread analysis on each cpu separately. The argument is
ignored when THREAD_ANALYZER_AUTO_SEPARATE_CORES=n which is the
default on single core machines.

Promote this change to the MicroPython zephyr module.

Signed-off-by: Detlev Zundel <dzu@member.fsf.org>
Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 docs/library/zephyr.rst  |  8 ++++++--
 ports/zephyr/modzephyr.c | 10 ++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/library/zephyr.rst b/docs/library/zephyr.rst
index 10676d9085289..1a106d50ea717 100644
--- a/docs/library/zephyr.rst
+++ b/docs/library/zephyr.rst
@@ -22,9 +22,10 @@ Functions
 
    Returns the thread id of the current thread, which is used to reference the thread.
 
-.. function:: thread_analyze()
+.. function:: thread_analyze(cpu)
 
-   Runs the Zephyr debug thread analyzer on the current thread and prints stack size statistics in the format:
+   Runs the Zephyr debug thread analyzer on the current thread on the given cpu
+   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`` %"
@@ -35,6 +36,9 @@ Functions
    For more information, see documentation for Zephyr `thread analyzer
    <https://docs.zephyrproject.org/latest/guides/debug_tools/thread-analyzer.html#thread-analyzer>`_.
 
+   Note that the ``cpu`` argument is only used in Zephyr v4.0.0 and
+   newer and ignored otherwise.
+
 .. function:: shell_exec(cmd_in)
 
    Executes the given command on an UART backend. This function can only be accessed if ``CONFIG_SHELL_BACKEND_SERIAL``
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index c059c7e395796..08fdf5c5aa44d 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <zephyr/kernel.h>
+#include <zephyr/version.h>
 #include <zephyr/debug/thread_analyzer.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/shell/shell_uart.h>
@@ -48,11 +49,16 @@ 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_ANALYZER
-static mp_obj_t mod_thread_analyze(void) {
+static mp_obj_t mod_thread_analyze(mp_obj_t cpu_in) {
+    #if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(4, 0, 0)
+    unsigned int cpu = mp_obj_get_int(cpu_in);
+    thread_analyzer_print(cpu);
+    #else
     thread_analyzer_print();
+    #endif
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_analyze_obj, mod_thread_analyze);
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_thread_analyze_obj, mod_thread_analyze);
 #endif
 
 #ifdef CONFIG_SHELL_BACKEND_SERIAL

From b83606fe337614543f18f0ddf4a3250974b93d3c Mon Sep 17 00:00:00 2001
From: Detlev Zundel <dzu@member.fsf.org>
Date: Thu, 6 Feb 2025 16:40:14 +0100
Subject: [PATCH 2173/3129] zephyr: Remove reference to CONFIG_MMC_VOLUME_NAME
 for v4.0.

Commit 07a8e3253a2d8a2076c9c83c4ed4158fa3fbb2a2 removes
CONFIG_MMC_VOLUME_NAME from the Kconfig space. Instead we need to use
the device tree to find the "disk-name" property of "zephyr,mmc-disk"
devices.

Signed-off-by: Detlev Zundel <dzu@member.fsf.org>
---
 ports/zephyr/main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 9fae2b3a873e5..206b7f92d3917 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include <zephyr/kernel.h>
+#include <zephyr/version.h>
 #ifdef CONFIG_NETWORKING
 #include <zephyr/net/net_context.h>
 #endif
@@ -97,7 +98,11 @@ static void vfs_init(void) {
     int ret = 0;
 
     #ifdef CONFIG_DISK_DRIVER_SDMMC
+    #if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(4, 0, 0)
+    mp_obj_t args[] = { mp_obj_new_str_from_cstr(DT_PROP(DT_INST(0, zephyr_sdmmc_disk), disk_name)) };
+    #else
     mp_obj_t args[] = { mp_obj_new_str_from_cstr(CONFIG_SDMMC_VOLUME_NAME) };
+    #endif
     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) && FIXED_PARTITION_EXISTS(storage_partition)

From 3c8d1b13f5b7e60e491e3a19734c237e1485e413 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@analog.com>
Date: Sun, 10 Nov 2024 08:24:02 -0600
Subject: [PATCH 2174/3129] zephyr: Upgrade to Zephyr v4.0.0.

Updates the Zephyr port build instructions. The CI is updated to use
Zephyr docker image 0.27.4, SDK 0.17.0 and the latest Zephyr release
tag.

Tested on max32690fthr and frdm_k64f.

Signed-off-by: Maureen Helm <maureen.helm@analog.com>
Signed-off-by: Detlev Zundel <dzu@member.fsf.org>
---
 docs/zephyr/tutorial/repl.rst |  2 +-
 ports/zephyr/README.md        | 15 +++++++++------
 tools/ci.sh                   |  6 +++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
index db7b7333d2416..199dda2b7aeee 100644
--- a/docs/zephyr/tutorial/repl.rst
+++ b/docs/zephyr/tutorial/repl.rst
@@ -31,7 +31,7 @@ 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 v3.7.0 ***
+        *** Booting Zephyr OS build v4.0.0 ***
         MicroPython v1.24.0-preview.179.g5b85b24bd on 2024-08-05; zephyr-frdm_k64f with mk64f12
         Type "help()" for more information.
         >>>
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 4590eb7199c25..84adf96395246 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,10 +4,13 @@ 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.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).
+This port tries to support all Zephyr versions supported upstream,
+i.e. currently v3.7 (LTS), v4.0 and the development branch. The CI is
+setup to use the latest version, i.e. v4.0.
+
+All boards supported by Zephyr (with standard level of features
+support, like UART console) should work with MicroPython (but not all
+were tested).
 
 Features supported at this time:
 
@@ -39,13 +42,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.7.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v4.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 v3.7.0
+    $ git checkout v4.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 cfc9754837f76..6f8d1cb80c4aa 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -818,9 +818,9 @@ function ci_windows_build {
 ########################################################################################
 # ports/zephyr
 
-ZEPHYR_DOCKER_VERSION=v0.26.13
-ZEPHYR_SDK_VERSION=0.16.8
-ZEPHYR_VERSION=v3.7.0
+ZEPHYR_DOCKER_VERSION=v0.27.4
+ZEPHYR_SDK_VERSION=0.17.0
+ZEPHYR_VERSION=v4.0.0
 
 function ci_zephyr_setup {
     IMAGE=ghcr.io/zephyrproject-rtos/ci:${ZEPHYR_DOCKER_VERSION}

From f4a7e713ea8b374de04c471d877e442bf6ff48e8 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Sat, 19 Oct 2024 12:53:33 +0530
Subject: [PATCH 2175/3129] zephyr/machine_pwm: Implement PWM support.

Implement PWM support using standard zephyr APIs, exposed as the standard
MicroPython `machine.PWM` class.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 ports/zephyr/README.md      |   1 +
 ports/zephyr/machine_pwm.c  | 205 ++++++++++++++++++++++++++++++++++++
 ports/zephyr/mpconfigport.h |   2 +
 3 files changed, 208 insertions(+)
 create mode 100644 ports/zephyr/machine_pwm.c

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 84adf96395246..fc18d25c0aadb 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -19,6 +19,7 @@ Features supported at this time:
 * `machine.Pin` class for GPIO control, with IRQ support.
 * `machine.I2C` class for I2C control.
 * `machine.SPI` class for SPI control.
+* `machine.PWM` class for PWM control
 * `socket` module for networking (IPv4/IPv6).
 * "Frozen modules" support to allow to bundle Python modules together
   with firmware. Including complete applications, including with
diff --git a/ports/zephyr/machine_pwm.c b/ports/zephyr/machine_pwm.c
new file mode 100644
index 0000000000000..5720dac9caf49
--- /dev/null
+++ b/ports/zephyr/machine_pwm.c
@@ -0,0 +1,205 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Ayush Singh <ayush@beagleboard.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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/modmachine.h"
+#include "py/runtime.h"
+#include "stdint.h"
+#include "zephyr/drivers/pwm.h"
+#include "zephyr_device.h"
+
+#define VALUE_NOT_SET (-1)
+
+typedef struct _machine_pwm_obj_t {
+    mp_obj_base_t base;
+    const struct device *pwm;
+    uint32_t channel;
+    int32_t freq;
+    int32_t duty_u16;
+    int32_t duty_ns;
+    pwm_flags_t flags;
+} machine_pwm_obj_t;
+
+static void configure_pwm(machine_pwm_obj_t *self) {
+    const uint32_t period = NSEC_PER_SEC / self->freq;
+
+    if ((self->duty_u16 == VALUE_NOT_SET && self->duty_ns == VALUE_NOT_SET) ||
+        self->freq == VALUE_NOT_SET) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Frequency and duty values must be set"));
+    }
+
+    if (self->duty_ns == VALUE_NOT_SET) {
+        self->duty_ns = (self->duty_u16 * period) / UINT16_MAX;
+    }
+
+    if (self->duty_ns < 0) {
+        self->duty_ns = 0;
+    } else if (self->duty_ns > period) {
+        self->duty_ns = period;
+    }
+
+    pwm_set(self->pwm, self->channel, period, self->duty_ns, self->flags);
+}
+
+/******************************************************************************/
+// 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 Controller %p channel=%d ", self->pwm, self->channel);
+
+    if (self->duty_ns != VALUE_NOT_SET) {
+        mp_printf(print, " duty_ns=%d", self->duty_ns);
+    } else {
+        mp_printf(print, " duty_u16=%d", self->duty_u16);
+    }
+
+    mp_printf(print, " freq=%d, flags=%u>", self->freq, self->flags);
+}
+
+// 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_u16,
+        ARG_duty_ns,
+        ARG_invert,
+    };
+    static const mp_arg_t allowed_args[] = {
+        {MP_QSTR_freq, MP_ARG_INT, {.u_int = VALUE_NOT_SET}},
+        {MP_QSTR_duty_u16, MP_ARG_INT, {.u_int = VALUE_NOT_SET}},
+        {MP_QSTR_duty_ns, MP_ARG_INT, {.u_int = VALUE_NOT_SET}},
+        {MP_QSTR_invert, 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);
+
+    // Maybe change PWM timer
+    if (args[ARG_freq].u_int > 0) {
+        self->freq = args[ARG_freq].u_int;
+    }
+
+    // Set duty_u16 cycle?
+    int32_t duty = args[ARG_duty_u16].u_int;
+    if (duty >= 0) {
+        self->duty_u16 = duty;
+        self->duty_ns = VALUE_NOT_SET;
+    }
+    // Set duty_ns value?
+    duty = args[ARG_duty_ns].u_int;
+    if (duty >= 0) {
+        self->duty_ns = duty;
+        self->duty_u16 = VALUE_NOT_SET;
+    }
+
+    self->flags = 0;
+    if (args[ARG_invert].u_int >= 0) {
+        self->flags |= PWM_POLARITY_INVERTED;
+    }
+
+    configure_pwm(self);
+}
+
+// PWM(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) {
+    mp_obj_t *items;
+    uint32_t wanted_chan;
+    const struct device *wanted_pwm;
+
+    // Check number of arguments
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Get referred Pin object(s)
+    if (!mp_obj_is_type(args[0], &mp_type_tuple)) {
+        mp_raise_ValueError(
+            MP_ERROR_TEXT("Pin id must be tuple of (\"pwm_x\", channel#)"));
+    }
+
+    mp_obj_get_array_fixed_n(args[0], 2, &items);
+    wanted_pwm = zephyr_device_find(items[0]);
+    wanted_chan = mp_obj_get_int(items[1]);
+
+    machine_pwm_obj_t *pwm = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
+    pwm->pwm = wanted_pwm;
+    pwm->channel = wanted_chan;
+    pwm->duty_ns = VALUE_NOT_SET;
+    pwm->duty_u16 = VALUE_NOT_SET;
+    pwm->freq = VALUE_NOT_SET;
+    pwm->flags = 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);
+        mp_machine_pwm_init_helper(pwm, n_args - 1, args + 1, &kw_args);
+    }
+
+    return (mp_obj_t)pwm;
+}
+
+// This called from pwm.deinit() method
+static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+    self->duty_ns = 0;
+    self->duty_u16 = VALUE_NOT_SET;
+    configure_pwm(self);
+}
+
+static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(self->freq);
+}
+
+static void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    self->freq = freq;
+    configure_pwm(self);
+}
+
+static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self,
+    mp_int_t duty_ns) {
+    self->duty_ns = duty_ns;
+    self->duty_u16 = VALUE_NOT_SET;
+    configure_pwm(self);
+}
+
+static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(self->duty_ns);
+}
+
+static mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+    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) {
+    self->duty_ns = VALUE_NOT_SET;
+    self->duty_u16 = duty_u16;
+    configure_pwm(self);
+}
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index c4fa6c5b95439..e015776a4eb64 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -72,6 +72,8 @@
 #define MICROPY_PY_MACHINE_WDT      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/zephyr/machine_wdt.c"
 #endif
+#define MICROPY_PY_MACHINE_PWM      (1)
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE "ports/zephyr/machine_pwm.c"
 #define MICROPY_PY_STRUCT           (0)
 #ifdef CONFIG_NETWORKING
 // If we have networking, we likely want errno comfort

From c9c39b88afe1d51b9bb4984cb19b787ac5834c52 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Sat, 19 Oct 2024 13:13:39 +0530
Subject: [PATCH 2176/3129] docs/zephyr: Add quick reference for PWM support.

Add docs for PWM support.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 docs/zephyr/quickref.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 63d4bced039fb..a7ae69860772d 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -56,6 +56,21 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
     switch = Pin(("gpioc", 6), Pin.IN)            # create input pin for a switch
     switch.irq(lambda t: print("SW2 changed"))    # enable an interrupt when switch state is changed
 
+PWM
+---
+
+Use the :ref:`machine.PWM <machine.PWM>` class::
+
+    from machine import PWM
+
+    pwm = PWM(("pwm0", 0), freq=3921568, duty_ns=200, invert=True)    # create pwm on PWM0
+    print(pwm)                                                        # print pwm
+
+    print(pwm.duty_ns())                                              # print pwm duty cycle in nanoseconds
+    pwm.duty_ns(255)                                                  # set new pwm duty cycle in nanoseconds
+
+    pwm.deinit()
+
 Hardware I2C bus
 ----------------
 

From f9a755c91c8b002407ffb930d2bdaa7e85b2c350 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Sat, 19 Oct 2024 12:27:14 +0530
Subject: [PATCH 2177/3129] zephyr/boards: Enable PWM on beagleconnect_freedom.

Enable PWM config for bcf.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 .../zephyr/boards/beagleconnect_freedom.conf  |  1 +
 .../boards/beagleconnect_freedom.overlay      | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 ports/zephyr/boards/beagleconnect_freedom.overlay

diff --git a/ports/zephyr/boards/beagleconnect_freedom.conf b/ports/zephyr/boards/beagleconnect_freedom.conf
index 14ce9c526e059..1e3f6037bd8da 100644
--- a/ports/zephyr/boards/beagleconnect_freedom.conf
+++ b/ports/zephyr/boards/beagleconnect_freedom.conf
@@ -1,4 +1,5 @@
 # Hardware features
+CONFIG_PWM=y
 CONFIG_I2C=y
 CONFIG_SPI=y
 
diff --git a/ports/zephyr/boards/beagleconnect_freedom.overlay b/ports/zephyr/boards/beagleconnect_freedom.overlay
new file mode 100644
index 0000000000000..7dd4469c99247
--- /dev/null
+++ b/ports/zephyr/boards/beagleconnect_freedom.overlay
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Ayush Singh <ayush@beagleboard.org>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	/* MB1 PWM */
+	pwm0_default: pwm0_default {
+		pinmux = <17 IOC_PORT_MCU_PORT_EVENT1>;
+		bias-disable;
+		drive-strength = <2>;
+	};
+
+	/* MB2 PWM */
+	pwm1_default: pwm1_default {
+		pinmux = <19 IOC_PORT_MCU_PORT_EVENT3>;
+		bias-disable;
+		drive-strength = <2>;
+	};
+};
+
+&gpt0 {
+	status = "okay";
+};
+
+&gpt1 {
+	status = "okay";
+};
+
+&pwm0 {
+	status = "okay";
+	pinctrl-0 = <&pwm0_default>;
+	pinctrl-names = "default";
+};
+
+&pwm1 {
+	status = "okay";
+	pinctrl-0 = <&pwm1_default>;
+	pinctrl-names = "default";
+};

From d939511dae6b29c0d65a066a5eafafdcb4a5524b Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Fri, 29 Nov 2024 08:58:21 +0100
Subject: [PATCH 2178/3129] zephyr: Create options to enable frozen modules.

Enables the ability to use frozen modules in the zephyr port.

Enabled by adding `CONFIG_MICROPY_FROZEN_MODULES` to the board
configuration file.  Manually set manifest path with
`CONFIG_MICROPY_FROZEN_MANIFEST`.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/CMakeLists.txt     | 10 ++++++++--
 ports/zephyr/Kconfig            |  8 ++++++++
 ports/zephyr/boards/manifest.py |  7 +++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 ports/zephyr/boards/manifest.py

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index b955089066749..4f457f4a58cb5 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -34,6 +34,11 @@ set(MICROPY_TARGET      micropython)
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
 
+if (CONFIG_MICROPY_FROZEN_MODULES)
+    cmake_path(ABSOLUTE_PATH CONFIG_MICROPY_FROZEN_MANIFEST BASE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+    set(MICROPY_FROZEN_MANIFEST ${CONFIG_MICROPY_FROZEN_MANIFEST})
+endif()
+
 set(MICROPY_SOURCE_PORT
     main.c
     help.c
@@ -115,10 +120,11 @@ zephyr_library_compile_definitions(
 zephyr_library_sources(${MICROPY_SOURCE_QSTR})
 zephyr_library_link_libraries(kernel)
 
-add_dependencies(${MICROPY_TARGET} zephyr_generated_headers)
-
 include(${MICROPY_DIR}/py/mkrules.cmake)
 
+add_dependencies(BUILD_VERSION_HEADER zephyr_generated_headers)
+add_dependencies(${MICROPY_TARGET} zephyr_generated_headers)
+
 target_sources(app PRIVATE
     src/zephyr_start.c
     src/zephyr_getchar.c
diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig
index 227e943bcd13c..f8d154315597c 100644
--- a/ports/zephyr/Kconfig
+++ b/ports/zephyr/Kconfig
@@ -41,6 +41,14 @@ config MICROPY_VFS_LFS1
 config MICROPY_VFS_LFS2
 	bool "LittleFs version 2 file system"
 
+config MICROPY_FROZEN_MODULES
+	bool "Enable Frozen Modules"
+
+config MICROPY_FROZEN_MANIFEST
+	string "Path to Frozen Modules manifest.py"
+	depends on MICROPY_FROZEN_MODULES
+	default "boards/manifest.py"
+
 endmenu # MicroPython Options
 
 source "Kconfig.zephyr"
diff --git a/ports/zephyr/boards/manifest.py b/ports/zephyr/boards/manifest.py
new file mode 100644
index 0000000000000..df1169c081c59
--- /dev/null
+++ b/ports/zephyr/boards/manifest.py
@@ -0,0 +1,7 @@
+# This is an example frozen module manifest. Enable this by configuring
+# the Zephyr project and enabling the frozen modules config feature.
+
+freeze("$(PORT_DIR)/modules")
+
+# Require a micropython-lib module.
+require("upysh")

From e3d9d8ef51d3668ce51ab3cd7e610109a8f9db98 Mon Sep 17 00:00:00 2001
From: Patrick Joy <patrick@joytech.com.au>
Date: Sat, 8 Mar 2025 22:11:35 +1100
Subject: [PATCH 2179/3129] zephyr/boards: Add nrf5340dk board configuration.

Add support for the nrf5340dk.  This DK has a MX25R64 8mb external QSPI
flash chip.

Compile using:

    $ west build -b nrf5340dk/nrf5340/cpuapp

Signed-off-by: Patrick Joy <patrick@thinktransit.com.au>
---
 .../zephyr/boards/nrf5340dk_nrf5340_cpuapp.conf  |  2 ++
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay      | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.conf
 create mode 100644 ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.overlay

diff --git a/ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.conf b/ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.conf
new file mode 100644
index 0000000000000..b4aed364a746e
--- /dev/null
+++ b/ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
diff --git a/ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.overlay b/ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 0000000000000..7310d1e55f760
--- /dev/null
+++ b/ports/zephyr/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,16 @@
+// Replace default internal storage partition with external flash
+
+/delete-node/ &storage_partition;
+
+&mx25r64 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		storage_partition: partition@0 {
+			reg = <0x00000000 0x800000>;
+			label = "storage";
+		};
+	};
+};

From 62479f2cb60ae73dcb81d0b0e2b2d147813e0604 Mon Sep 17 00:00:00 2001
From: Patrick Joy <patrick@joytech.com.au>
Date: Sat, 8 Mar 2025 23:55:53 +1100
Subject: [PATCH 2180/3129] zephyr/boards: Add nrf9151dk board configuration.

Add support for the nrf9151dk.  This DK has a GD25WB256 32mb external QSPI
flash chip.

Signed-off-by: Patrick Joy <patrick@thinktransit.com.au>
---
 ports/zephyr/boards/nrf9151dk_nrf9151.conf    |  7 ++++++
 ports/zephyr/boards/nrf9151dk_nrf9151.overlay | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 ports/zephyr/boards/nrf9151dk_nrf9151.conf
 create mode 100644 ports/zephyr/boards/nrf9151dk_nrf9151.overlay

diff --git a/ports/zephyr/boards/nrf9151dk_nrf9151.conf b/ports/zephyr/boards/nrf9151dk_nrf9151.conf
new file mode 100644
index 0000000000000..e89f332ba13d0
--- /dev/null
+++ b/ports/zephyr/boards/nrf9151dk_nrf9151.conf
@@ -0,0 +1,7 @@
+# Enable external flash
+CONFIG_SPI=y
+CONFIG_SPI_NOR=y
+CONFIG_SPI_NOR_SFDP_DEVICETREE=y
+
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
diff --git a/ports/zephyr/boards/nrf9151dk_nrf9151.overlay b/ports/zephyr/boards/nrf9151dk_nrf9151.overlay
new file mode 100644
index 0000000000000..85cab574148fe
--- /dev/null
+++ b/ports/zephyr/boards/nrf9151dk_nrf9151.overlay
@@ -0,0 +1,22 @@
+/ {
+	/* Configure partition manager to use gd25wb256 as the external flash */
+	chosen {
+		nordic,pm-ext-flash = &gd25wb256;
+	};
+};
+
+/delete-node/ &storage_partition;
+
+&gd25wb256 {
+	status = "okay";
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		storage_partition: partition@0 {
+			reg = <0x00000000 0x2000000>;
+			label = "storage";
+		};
+	};
+};

From 3f1df4bacb2aa8f9018011c6a61eff9247248e1b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Apr 2025 10:24:52 +1000
Subject: [PATCH 2181/3129] tests/net_hosted: Only run network loopback test on
 supported targets.

Only a few ports have TCP/IP loopback enabled in their network stack, and
this test will only pass on those ports.  There's not really any good way
to do a feature check for loopback mode without actually running the test
and seeing if it passes/fails, so add an explicit check that the test is
running on a port known to support loopback.

(Enabling loopback on lwIP, eg RPI_PICO_W, costs +568 code and +272 bss and
is a rarely used feature, so not worth unconditionally enabling.)

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_hosted/asyncio_loopback.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/net_hosted/asyncio_loopback.py b/tests/net_hosted/asyncio_loopback.py
index fd4674544ce71..03513ae6244d1 100644
--- a/tests/net_hosted/asyncio_loopback.py
+++ b/tests/net_hosted/asyncio_loopback.py
@@ -1,5 +1,12 @@
 # Test network loopback behaviour
 
+import sys
+
+# Only certain platforms can do TCP/IP loopback.
+if sys.platform not in ("darwin", "esp32", "linux"):
+    print("SKIP")
+    raise SystemExit
+
 try:
     import asyncio
 except ImportError:

From ffd7e0e28d030225dcfdfc8af6fb6eb79fbdd56f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Apr 2025 13:19:39 +1000
Subject: [PATCH 2182/3129] tests/ports/rp2: Convert rp2.DMA test to a
 unittest.

This test is rather complicated and benefits from being a unittest.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_dma.py     | 233 +++++++++++++++++++--------------
 tests/ports/rp2/rp2_dma.py.exp |  31 -----
 2 files changed, 136 insertions(+), 128 deletions(-)
 delete mode 100644 tests/ports/rp2/rp2_dma.py.exp

diff --git a/tests/ports/rp2/rp2_dma.py b/tests/ports/rp2/rp2_dma.py
index 62ec1dcf24d14..bd7f17913eae0 100644
--- a/tests/ports/rp2/rp2_dma.py
+++ b/tests/ports/rp2/rp2_dma.py
@@ -4,103 +4,142 @@
 import time
 import machine
 import rp2
+import unittest
 
 is_rp2350 = "RP2350" in sys.implementation._machine
 
-src = bytes(i & 0xFF for i in range(16 * 1024))
-
-print("# test basic usage")
-
-dma = rp2.DMA()
-
-# Test printing.
-print(dma)
-
-# Test pack_ctrl/unpack_ctrl.
-ctrl_dict = rp2.DMA.unpack_ctrl(dma.pack_ctrl())
-if is_rp2350:
-    for entry in ("inc_read_rev", "inc_write_rev"):
-        assert entry in ctrl_dict
-        del ctrl_dict[entry]
-for key, value in sorted(ctrl_dict.items()):
-    print(key, value)
-
-# Test register access.
-dma.read = 0
-dma.write = 0
-dma.count = 0
-dma.ctrl = dma.pack_ctrl()
-print(dma.read, dma.write, dma.count, dma.ctrl & 0x01F, dma.channel, dma.registers)
-dma.close()
-
-# Test closing when already closed.
-dma.close()
-
-# Test using when closed.
-try:
-    dma.active()
-    assert False
-except ValueError:
-    print("ValueError")
-
-# Test simple memory copy.
-print("# test memory copy")
-dest = bytearray(1024)
-dma = rp2.DMA()
-dma.config(read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=False)
-print(not any(dest))
-dma.active(True)
-while dma.active():
-    pass
-print(dest[:8], dest[-8:])
-dma.close()
-
-
-# Test time taken for a large memory copy.
-def run_and_time_dma(dma):
-    ticks_us = time.ticks_us
-    irq_state = machine.disable_irq()
-    t0 = ticks_us()
-    dma.active(True)
-    while dma.active():
-        pass
-    t1 = ticks_us()
-    machine.enable_irq(irq_state)
-    return time.ticks_diff(t1, t0)
-
-
-print("# test timing")
-dest = bytearray(16 * 1024)
-dma = rp2.DMA()
-dma.read = src
-dma.write = dest
-dma.count = len(dest) // 4
-dma.ctrl = dma.pack_ctrl()
-dt = run_and_time_dma(dma)
-expected_dt_range = range(40, 70) if is_rp2350 else range(70, 125)
-print(dt in expected_dt_range)
-print(dest[:8], dest[-8:])
-dma.close()
-
-# Test using .config(trigger=True).
-print("# test immediate trigger")
-dest = bytearray(1024)
-dma = rp2.DMA()
-dma.config(read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=True)
-while dma.active():
-    pass
-print(dest[:8], dest[-8:])
-dma.close()
-
-# Test the DMA.irq() method.
-print("# test irq")
-dest = bytearray(1024)
-dma = rp2.DMA()
-dma.irq(lambda dma: print("irq fired", dma.irq().flags()))
-dma.config(
-    read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(irq_quiet=0), trigger=True
-)
-while dma.active():
-    pass
-print(dest[:8], dest[-8:])
-dma.close()
+SRC = bytes(i & 0xFF for i in range(16 * 1024))
+
+
+class Test(unittest.TestCase):
+    def setUp(self):
+        self.dma = rp2.DMA()
+
+    def tearDown(self):
+        self.dma.close()
+
+    def test_printing(self):
+        dma = self.dma
+        self.assertEqual(str(dma), "DMA(0)")
+
+    def test_pack_unpack_ctrl(self):
+        dma = self.dma
+        ctrl_dict = rp2.DMA.unpack_ctrl(dma.pack_ctrl())
+        if is_rp2350:
+            self.assertEqual(len(ctrl_dict), 18)
+            self.assertTrue("inc_read_rev" in ctrl_dict)
+            self.assertTrue("inc_write_rev" in ctrl_dict)
+        else:
+            self.assertEqual(len(ctrl_dict), 16)
+        self.assertEqual(ctrl_dict["ahb_err"], 0)
+        self.assertEqual(ctrl_dict["bswap"], 0)
+        self.assertEqual(ctrl_dict["busy"], 0)
+        self.assertEqual(ctrl_dict["chain_to"], 0)
+        self.assertEqual(ctrl_dict["enable"], 1)
+        self.assertEqual(ctrl_dict["high_pri"], 0)
+        self.assertEqual(ctrl_dict["inc_read"], 1)
+        self.assertEqual(ctrl_dict["inc_write"], 1)
+        self.assertEqual(ctrl_dict["irq_quiet"], 1)
+        self.assertEqual(ctrl_dict["read_err"], 0)
+        self.assertEqual(ctrl_dict["ring_sel"], 0)
+        self.assertEqual(ctrl_dict["ring_size"], 0)
+        self.assertEqual(ctrl_dict["size"], 2)
+        self.assertEqual(ctrl_dict["sniff_en"], 0)
+        self.assertEqual(ctrl_dict["treq_sel"], 63)
+        self.assertEqual(ctrl_dict["write_err"], 0)
+
+    def test_register_access(self):
+        dma = self.dma
+        dma.read = 0
+        dma.write = 0
+        dma.count = 0
+        dma.ctrl = dma.pack_ctrl()
+        self.assertEqual(dma.read, 0)
+        self.assertEqual(dma.write, 0)
+        self.assertEqual(dma.count, 0)
+        self.assertEqual(dma.ctrl & 0x01F, 25)
+        self.assertEqual(dma.channel, 0)
+        self.assertIsInstance(dma.registers, memoryview)
+
+    def test_close(self):
+        dma = self.dma
+        dma.close()
+
+        # Test closing when already closed.
+        dma.close()
+
+        # Test using when closed.
+        with self.assertRaises(ValueError):
+            dma.active()
+
+    def test_simple_memory_copy(self):
+        dma = self.dma
+        dest = bytearray(1024)
+        dma.config(read=SRC, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=False)
+        self.assertFalse(any(dest))
+        dma.active(True)
+        while dma.active():
+            pass
+        self.assertEqual(dest[:8], SRC[:8])
+        self.assertEqual(dest[-8:], SRC[-8:])
+
+    def test_time_taken_for_large_memory_copy(self):
+        def run_and_time_dma(dma):
+            ticks_us = time.ticks_us
+            irq_state = machine.disable_irq()
+            t0 = ticks_us()
+            dma.active(True)
+            while dma.active():
+                pass
+            t1 = ticks_us()
+            machine.enable_irq(irq_state)
+            return time.ticks_diff(t1, t0)
+
+        dma = self.dma
+        dest = bytearray(16 * 1024)
+        dma.read = SRC
+        dma.write = dest
+        dma.count = len(dest) // 4
+        dma.ctrl = dma.pack_ctrl()
+        dt = run_and_time_dma(dma)
+        expected_dt_range = range(40, 70) if is_rp2350 else range(70, 125)
+        self.assertIn(dt, expected_dt_range)
+        self.assertEqual(dest[:8], SRC[:8])
+        self.assertEqual(dest[-8:], SRC[-8:])
+
+    def test_config_trigger(self):
+        # Test using .config(trigger=True) to start DMA immediately.
+        dma = self.dma
+        dest = bytearray(1024)
+        dma.config(read=SRC, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=True)
+        while dma.active():
+            pass
+        self.assertEqual(dest[:8], SRC[:8])
+        self.assertEqual(dest[-8:], SRC[-8:])
+
+    def test_irq(self):
+        def callback(dma):
+            nonlocal irq_flags
+            print("irq fired")
+            irq_flags = dma.irq().flags()
+
+        dma = self.dma
+        irq_flags = None
+        dest = bytearray(1024)
+        dma.irq(callback)
+        dma.config(
+            read=SRC,
+            write=dest,
+            count=len(dest) // 4,
+            ctrl=dma.pack_ctrl(irq_quiet=0),
+            trigger=True,
+        )
+        while dma.active():
+            pass
+        self.assertEqual(irq_flags, 1)
+        self.assertEqual(dest[:8], SRC[:8])
+        self.assertEqual(dest[-8:], SRC[-8:])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/ports/rp2/rp2_dma.py.exp b/tests/ports/rp2/rp2_dma.py.exp
deleted file mode 100644
index 6fad5429b291d..0000000000000
--- a/tests/ports/rp2/rp2_dma.py.exp
+++ /dev/null
@@ -1,31 +0,0 @@
-# test basic usage
-DMA(0)
-ahb_err 0
-bswap 0
-busy 0
-chain_to 0
-enable 1
-high_pri 0
-inc_read 1
-inc_write 1
-irq_quiet 1
-read_err 0
-ring_sel 0
-ring_size 0
-size 2
-sniff_en 0
-treq_sel 63
-write_err 0
-0 0 0 25 0 <memoryview>
-ValueError
-# test memory copy
-True
-bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
-# test timing
-True
-bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
-# test immediate trigger
-bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
-# test irq
-irq fired 1
-bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')

From 00a0cd70f54241d4c8fb04c396a636cb0d3a1535 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Apr 2025 13:28:15 +1000
Subject: [PATCH 2183/3129] tests/ports/rp2: Tune rp2.DMA test so it runs in
 all configurations.

Changes in this commit:
- Allow the DMA instance to be any instance, not just DMA(0); eg WLAN may
  be using DMA(0).
- Make the DMA timing test run a little faster by preloading `dma.active`.
- Run the DMA timing test 10 times and take the average time taken as the
  test result, to eliminate any big effects of caching.
- Change the expected time to `range(30, 80)` to cover RP2040, RP2350,
  RISC-V variants, and both bytecode and native emitter.
- Add a `sleep_ms(1)` after waiting for the IRQ to fire, so that any
  scheduled code gets a chance to run when the test is compiled with the
  native emitter.

With these changes this test passes reliably on RPI_PICO, RPI_PICO_W,
RPI_PICO2, RPI_PICO2_W, RPI_PICO2-RISCV and RPI_PICO2_W-RISCV, in both
bytecode and native emitter mode, with and without WLAN enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_dma.py | 39 ++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/tests/ports/rp2/rp2_dma.py b/tests/ports/rp2/rp2_dma.py
index bd7f17913eae0..436e5ee48ec5b 100644
--- a/tests/ports/rp2/rp2_dma.py
+++ b/tests/ports/rp2/rp2_dma.py
@@ -20,7 +20,7 @@ def tearDown(self):
 
     def test_printing(self):
         dma = self.dma
-        self.assertEqual(str(dma), "DMA(0)")
+        self.assertEqual(str(dma), "DMA({})".format(dma.channel))
 
     def test_pack_unpack_ctrl(self):
         dma = self.dma
@@ -34,7 +34,7 @@ def test_pack_unpack_ctrl(self):
         self.assertEqual(ctrl_dict["ahb_err"], 0)
         self.assertEqual(ctrl_dict["bswap"], 0)
         self.assertEqual(ctrl_dict["busy"], 0)
-        self.assertEqual(ctrl_dict["chain_to"], 0)
+        self.assertEqual(ctrl_dict["chain_to"], dma.channel)
         self.assertEqual(ctrl_dict["enable"], 1)
         self.assertEqual(ctrl_dict["high_pri"], 0)
         self.assertEqual(ctrl_dict["inc_read"], 1)
@@ -58,7 +58,7 @@ def test_register_access(self):
         self.assertEqual(dma.write, 0)
         self.assertEqual(dma.count, 0)
         self.assertEqual(dma.ctrl & 0x01F, 25)
-        self.assertEqual(dma.channel, 0)
+        self.assertIn(dma.channel, range(16))
         self.assertIsInstance(dma.registers, memoryview)
 
     def test_close(self):
@@ -86,26 +86,32 @@ def test_simple_memory_copy(self):
     def test_time_taken_for_large_memory_copy(self):
         def run_and_time_dma(dma):
             ticks_us = time.ticks_us
+            active = dma.active
             irq_state = machine.disable_irq()
             t0 = ticks_us()
-            dma.active(True)
-            while dma.active():
+            active(True)
+            while active():
                 pass
             t1 = ticks_us()
             machine.enable_irq(irq_state)
             return time.ticks_diff(t1, t0)
 
-        dma = self.dma
-        dest = bytearray(16 * 1024)
-        dma.read = SRC
-        dma.write = dest
-        dma.count = len(dest) // 4
-        dma.ctrl = dma.pack_ctrl()
-        dt = run_and_time_dma(dma)
-        expected_dt_range = range(40, 70) if is_rp2350 else range(70, 125)
-        self.assertIn(dt, expected_dt_range)
-        self.assertEqual(dest[:8], SRC[:8])
-        self.assertEqual(dest[-8:], SRC[-8:])
+        num_average = 10
+        dt_sum = 0
+        for _ in range(num_average):
+            dma = self.dma
+            dest = bytearray(16 * 1024)
+            dma.read = SRC
+            dma.write = dest
+            dma.count = len(dest) // 4
+            dma.ctrl = dma.pack_ctrl()
+            dt_sum += run_and_time_dma(dma)
+            self.assertEqual(dest[:8], SRC[:8])
+            self.assertEqual(dest[-8:], SRC[-8:])
+            self.tearDown()
+            self.setUp()
+        dt = dt_sum // num_average
+        self.assertIn(dt, range(30, 80))
 
     def test_config_trigger(self):
         # Test using .config(trigger=True) to start DMA immediately.
@@ -136,6 +142,7 @@ def callback(dma):
         )
         while dma.active():
             pass
+        time.sleep_ms(1)  # when running as native code, give the scheduler a chance to run
         self.assertEqual(irq_flags, 1)
         self.assertEqual(dest[:8], SRC[:8])
         self.assertEqual(dest[-8:], SRC[-8:])

From 4117a2d9b5a2e0f3e84e7d49a8f05ae04fac8b39 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Apr 2025 11:54:01 +1000
Subject: [PATCH 2184/3129] tools/ci.sh: Update URL for
 xtensa-lx106-elf-standalone.tar.gz.

The https://github.com/jepler/esp-open-sdk repository has been removed, so
use the file hosted at micropython.org (it's the same file).

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 6f8d1cb80c4aa..a4bd43567c861 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -209,7 +209,7 @@ function ci_esp32_build_s3_c3 {
 
 function ci_esp8266_setup {
     sudo pip3 install pyserial esptool==3.3.1 pyelftools ar
-    wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
+    wget https://micropython.org/resources/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

From e53f262a85349b4871a38d899a30b05b2ed4b62f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Apr 2025 16:00:21 +1000
Subject: [PATCH 2185/3129] tools/mpremote: For mip install, use hash to skip
 files that exist.

When using `mip install`, if a file that needs to be downloaded already
exists locally, then the hash of that local file will be computed and if it
matches the known hash of the remote file it will not be downloaded.

Hashes in mip are guaranteed unique, so this change should never leave
stale files on the filesystem.

This behaviour follows that of the `mip` package in `micropython-lib`.

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

diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
index 26ae8bec5ec6c..fa7974053f44d 100644
--- a/tools/mpremote/mpremote/mip.py
+++ b/tools/mpremote/mpremote/mip.py
@@ -34,6 +34,15 @@ def _ensure_path_exists(transport, path):
         prefix += "/"
 
 
+# Check if the specified path exists and matches the hash.
+def _check_exists(transport, path, short_hash):
+    try:
+        remote_hash = transport.fs_hashfile(path, "sha256")
+    except FileNotFoundError:
+        return False
+    return remote_hash.hex()[: len(short_hash)] == short_hash
+
+
 def _rewrite_url(url, branch=None):
     if not branch:
         branch = "HEAD"
@@ -115,8 +124,11 @@ def _install_json(transport, package_json_url, index, target, version, mpy):
         raise CommandError(f"Invalid url for package: {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(transport, file_url, fs_target_path)
+        if _check_exists(transport, fs_target_path, short_hash):
+            print("Exists:", fs_target_path)
+        else:
+            file_url = f"{index}/file/{short_hash[:2]}/{short_hash}"
+            _download_file(transport, file_url, fs_target_path)
     for target_path, url in package_json.get("urls", ()):
         fs_target_path = target + "/" + target_path
         if base_url and not url.startswith(allowed_mip_url_prefixes):

From 6601d4d7ebd9c6ce11a28f63efa0ec0a6a2fa27a Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Fri, 29 Nov 2024 09:37:31 +0100
Subject: [PATCH 2186/3129] zephyr: Create ability to use device_next with CDC
 ACM as REPL.

This enables using the newer USB stack and its CDC ACM for the REPL.

To switch to it, board file must contain `CONFIG_USB_DEVICE_STACK_NEXT=y`
and `CONFIG_USBD_CDC_ACM_CLASS=y`.  In the case of a board that is a
platform that supports the older device stack, `CONFIG_USB_DEVICE_STACK=n`
may be necessary.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/CMakeLists.txt |   1 +
 ports/zephyr/Kconfig        |   8 ++
 ports/zephyr/main.c         |   8 ++
 ports/zephyr/src/usbd.c     | 183 ++++++++++++++++++++++++++++++++++++
 4 files changed, 200 insertions(+)
 create mode 100644 ports/zephyr/src/usbd.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 4f457f4a58cb5..debf2bd2c15d4 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -128,6 +128,7 @@ add_dependencies(${MICROPY_TARGET} zephyr_generated_headers)
 target_sources(app PRIVATE
     src/zephyr_start.c
     src/zephyr_getchar.c
+    src/usbd.c
 )
 
 target_link_libraries(app PRIVATE ${MICROPY_TARGET})
diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig
index f8d154315597c..6db0133f4f15d 100644
--- a/ports/zephyr/Kconfig
+++ b/ports/zephyr/Kconfig
@@ -49,6 +49,14 @@ config MICROPY_FROZEN_MANIFEST
 	depends on MICROPY_FROZEN_MODULES
 	default "boards/manifest.py"
 
+config MICROPY_USB_DEVICE_VID
+	hex "USB VID"
+	default 0x2fe3
+
+config MICROPY_USB_DEVICE_PID
+	hex "USB PID"
+	default 0x0001
+
 endmenu # MicroPython Options
 
 source "Kconfig.zephyr"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 206b7f92d3917..d4498c1079c1d 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -63,6 +63,10 @@
 
 static char heap[MICROPY_HEAP_SIZE];
 
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+extern int mp_usbd_init(void);
+#endif // defined(CONFIG_USB_DEVICE_STACK_NEXT)
+
 void init_zephyr(void) {
     // We now rely on CONFIG_NET_APP_SETTINGS to set up bootstrap
     // network addresses.
@@ -143,6 +147,10 @@ int real_main(void) {
     usb_enable(NULL);
     #endif
 
+    #ifdef CONFIG_USB_DEVICE_STACK_NEXT
+    mp_usbd_init();
+    #endif
+
     #if MICROPY_VFS
     vfs_init();
     #endif
diff --git a/ports/zephyr/src/usbd.c b/ports/zephyr/src/usbd.c
new file mode 100644
index 0000000000000..2444706cbeaa9
--- /dev/null
+++ b/ports/zephyr/src/usbd.c
@@ -0,0 +1,183 @@
+/*
+* This file is part of the MicroPython project, http://micropython.org/
+*
+* The MIT License (MIT)
+*
+* Copyright (c) 2024-2025 MASSDRIVER EI (massdriver.space)
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION 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 <zephyr/device.h>
+#include <zephyr/usb/usbd.h>
+#include <zephyr/usb/bos.h>
+
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(mp_usbd);
+
+/* By default, do not register the USB DFU class DFU mode instance. */
+static const char *const blocklist[] = {
+    "dfu_dfu",
+    NULL,
+};
+
+USBD_DEVICE_DEFINE(mp_usbd,
+    DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),
+    CONFIG_MICROPY_USB_DEVICE_VID, CONFIG_MICROPY_USB_DEVICE_PID);
+
+USBD_DESC_LANG_DEFINE(mp_lang);
+USBD_DESC_MANUFACTURER_DEFINE(mp_mfr, "Zephyr Project");
+USBD_DESC_PRODUCT_DEFINE(mp_product, "Micropython on Zephyr RTOS");
+USBD_DESC_SERIAL_NUMBER_DEFINE(mp_sn);
+
+USBD_DESC_CONFIG_DEFINE(fs_cfg_desc, "FS Configuration");
+USBD_DESC_CONFIG_DEFINE(hs_cfg_desc, "HS Configuration");
+
+/* not self-powered, no remote wakeup  */
+static const uint8_t attributes = 0;
+
+/* Full speed configuration
+* power = 250 * 2 mA = 500mA
+*/
+USBD_CONFIGURATION_DEFINE(mp_fs_config,
+    attributes,
+    250, &fs_cfg_desc);
+
+/* High speed configuration */
+USBD_CONFIGURATION_DEFINE(mp_hs_config,
+    attributes,
+    250, &hs_cfg_desc);
+
+static void mp_fix_code_triple(struct usbd_context *uds_ctx,
+    const enum usbd_speed speed) {
+    /* Always use class code information from Interface Descriptors */
+    if (IS_ENABLED(CONFIG_USBD_CDC_ACM_CLASS) ||
+        IS_ENABLED(CONFIG_USBD_CDC_ECM_CLASS) ||
+        IS_ENABLED(CONFIG_USBD_CDC_NCM_CLASS) ||
+        IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
+        /*
+         * Class with multiple interfaces have an Interface
+         * Association Descriptor available, use an appropriate triple
+         * to indicate it.
+         */
+        usbd_device_set_code_triple(uds_ctx, speed,
+            USB_BCC_MISCELLANEOUS, 0x02, 0x01);
+    } else {
+        usbd_device_set_code_triple(uds_ctx, speed, 0, 0, 0);
+    }
+}
+
+struct usbd_context *mp_usbd_init_device(usbd_msg_cb_t msg_cb) {
+    int err;
+
+    err = usbd_add_descriptor(&mp_usbd, &mp_lang);
+    if (err) {
+        LOG_ERR("Failed to initialize language descriptor (%d)", err);
+        return NULL;
+    }
+
+    err = usbd_add_descriptor(&mp_usbd, &mp_mfr);
+    if (err) {
+        LOG_ERR("Failed to initialize manufacturer descriptor (%d)", err);
+        return NULL;
+    }
+
+    err = usbd_add_descriptor(&mp_usbd, &mp_product);
+    if (err) {
+        LOG_ERR("Failed to initialize product descriptor (%d)", err);
+        return NULL;
+    }
+
+    err = usbd_add_descriptor(&mp_usbd, &mp_sn);
+    if (err) {
+        LOG_ERR("Failed to initialize SN descriptor (%d)", err);
+        return NULL;
+    }
+
+    if (usbd_caps_speed(&mp_usbd) == USBD_SPEED_HS) {
+        err = usbd_add_configuration(&mp_usbd, USBD_SPEED_HS,
+            &mp_hs_config);
+        if (err) {
+            LOG_ERR("Failed to add High-Speed configuration");
+            return NULL;
+        }
+
+        err = usbd_register_all_classes(&mp_usbd, USBD_SPEED_HS, 1, blocklist);
+        if (err) {
+            LOG_ERR("Failed to add register classes");
+            return NULL;
+        }
+
+        mp_fix_code_triple(&mp_usbd, USBD_SPEED_HS);
+    }
+
+    err = usbd_add_configuration(&mp_usbd, USBD_SPEED_FS,
+        &mp_fs_config);
+    if (err) {
+        LOG_ERR("Failed to add Full-Speed configuration");
+        return NULL;
+    }
+
+    err = usbd_register_all_classes(&mp_usbd, USBD_SPEED_FS, 1, blocklist);
+    if (err) {
+        LOG_ERR("Failed to add register classes");
+        return NULL;
+    }
+
+    mp_fix_code_triple(&mp_usbd, USBD_SPEED_FS);
+
+    if (msg_cb != NULL) {
+        err = usbd_msg_register_cb(&mp_usbd, msg_cb);
+        if (err) {
+            LOG_ERR("Failed to register message callback");
+            return NULL;
+        }
+    }
+
+    err = usbd_init(&mp_usbd);
+    if (err) {
+        LOG_ERR("Failed to initialize device support");
+        return NULL;
+    }
+
+    return &mp_usbd;
+}
+
+static struct usbd_context *mp_usbd_context;
+
+int mp_usbd_init(void) {
+    int err;
+
+    mp_usbd_context = mp_usbd_init_device(NULL);
+    if (mp_usbd_context == NULL) {
+        return -ENODEV;
+    }
+
+    err = usbd_enable(mp_usbd_context);
+    if (err) {
+        return err;
+    }
+
+    return 0;
+}
+
+#endif // defined(CONFIG_USB_DEVICE_STACK_NEXT)

From 8728db3e414bdddebed5f9439b971a40c62eab9b Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Fri, 7 Mar 2025 14:17:42 +0100
Subject: [PATCH 2187/3129] zephyr: Introduce auto-listing of FlashArea
 Partitions.

This enables listing all flash area partitions automagically instead of
just sotrage_partitions.  It uses the label, and the ID when not present.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/zephyr_storage.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 484feb113017a..40bcef73384cf 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -139,6 +139,20 @@ MP_DEFINE_CONST_OBJ_TYPE(
 #endif // CONFIG_DISK_ACCESS
 
 #ifdef CONFIG_FLASH_MAP
+
+#define FLASH_AREA_DEFINE_LABEL(part) CONCAT(MP_QSTR_ID_, DT_STRING_TOKEN(part, label))
+#define FLASH_AREA_DEFINE_NB(part) CONCAT(MP_QSTR_ID_, DT_FIXED_PARTITION_ID(part))
+
+#define FLASH_AREA_DEFINE_GETNAME(part) COND_CODE_1(DT_NODE_HAS_PROP(part, label), \
+    (FLASH_AREA_DEFINE_LABEL(part)), (FLASH_AREA_DEFINE_NB(part)))
+
+#define FLASH_AREA_DEFINE_DEFINE(part) { MP_ROM_QSTR(FLASH_AREA_DEFINE_GETNAME(part)), MP_ROM_INT(DT_FIXED_PARTITION_ID(part)) },
+
+#define FLASH_AREA_DEFINE(part) COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_MTD_FROM_FIXED_PARTITION(part)), \
+    (FLASH_AREA_DEFINE_DEFINE(part)), ())
+
+#define FOREACH_PARTITION(n) DT_FOREACH_CHILD(n, FLASH_AREA_DEFINE)
+
 const mp_obj_type_t zephyr_flash_area_type;
 
 typedef struct _zephyr_flash_area_obj_t {
@@ -244,9 +258,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) },
-    #if FIXED_PARTITION_EXISTS(storage_partition)
-    { MP_ROM_QSTR(MP_QSTR_STORAGE), MP_ROM_INT(FIXED_PARTITION_ID(storage_partition)) },
-    #endif
+    /* Generate list of partition IDs from Zephyr Devicetree */
+    DT_FOREACH_STATUS_OKAY(fixed_partitions, FOREACH_PARTITION)
 };
 static MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);
 

From ced7ebb873f923397aa5c9ddc7b286e32eb4e80a Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Wed, 30 Apr 2025 15:40:26 +0200
Subject: [PATCH 2188/3129] docs/zephyr: Add zephyr FlashArea IDs docs.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 docs/zephyr/quickref.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index a7ae69860772d..0e985c70b3eb6 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -153,6 +153,8 @@ Use the :ref:`zephyr.FlashArea <zephyr.FlashArea>` class to support filesystem::
         f.write('Hello world')                  # write to the file
     print(open('/flash/hello.txt').read())      # print contents of the file
 
+The FlashAreas' IDs that are available are listed in the FlashArea module, as ID_*.
+
 Sensor
 ------
 

From bee1fd5e7887d48ad2b217f5c4746f6b518f3fd8 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Wed, 16 Oct 2024 17:08:49 +0530
Subject: [PATCH 2189/3129] zephyr/boards: Enable ADC on beagleconnect_freedom.

Enable Analog inputs.  Requires Zephyr >= v3.8.0.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 ports/zephyr/boards/beagleconnect_freedom.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/zephyr/boards/beagleconnect_freedom.conf b/ports/zephyr/boards/beagleconnect_freedom.conf
index 1e3f6037bd8da..8fe2583205b39 100644
--- a/ports/zephyr/boards/beagleconnect_freedom.conf
+++ b/ports/zephyr/boards/beagleconnect_freedom.conf
@@ -1,4 +1,5 @@
 # Hardware features
+CONFIG_ADC=y
 CONFIG_PWM=y
 CONFIG_I2C=y
 CONFIG_SPI=y

From 70ed3151933635429a66937bae2701958b6b47dd Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Oct 2024 13:28:37 +1100
Subject: [PATCH 2190/3129] py/malloc: Add mutex for tracked allocations.

Fixes thread safety issue that could cause memory corruption on ports
with (MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL) - currently only rp2 and
unix have this configuration.

Adds unit test for TLS sockets that exercises this code path.  I wasn't
able to make this fail on rp2, the race condition window is pretty narrow
and may not have a direct impact on a quiet system.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/malloc.c                 | 33 ++++++++++++++++++++-
 tests/extmod/ssl_threads.py | 57 +++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 tests/extmod/ssl_threads.py

diff --git a/py/malloc.c b/py/malloc.c
index f557ade44f500..05daeb35d098a 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -209,6 +209,31 @@ void m_free(void *ptr)
 
 #if MICROPY_TRACKED_ALLOC
 
+#if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
+// If there's no GIL, use the GC recursive mutex to protect the tracked node linked list
+// under m_tracked_head.
+//
+// (For ports with GIL, the expectation is to only call tracked alloc functions
+// while holding the GIL.)
+
+static inline void m_tracked_node_lock(void) {
+    mp_thread_recursive_mutex_lock(&MP_STATE_MEM(gc_mutex), 1);
+}
+
+static inline void m_tracked_node_unlock(void) {
+    mp_thread_recursive_mutex_unlock(&MP_STATE_MEM(gc_mutex));
+}
+
+#else
+
+static inline void m_tracked_node_lock(void) {
+}
+
+static inline void m_tracked_node_unlock(void) {
+}
+
+#endif
+
 #define MICROPY_TRACKED_ALLOC_STORE_SIZE (!MICROPY_ENABLE_GC)
 
 typedef struct _m_tracked_node_t {
@@ -222,6 +247,7 @@ typedef struct _m_tracked_node_t {
 
 #if MICROPY_DEBUG_VERBOSE
 static size_t m_tracked_count_links(size_t *nb) {
+    m_tracked_node_lock();
     m_tracked_node_t *node = MP_STATE_VM(m_tracked_head);
     size_t n = 0;
     *nb = 0;
@@ -234,6 +260,7 @@ static size_t m_tracked_count_links(size_t *nb) {
         #endif
         node = node->next;
     }
+    m_tracked_node_unlock();
     return n;
 }
 #endif
@@ -248,12 +275,14 @@ void *m_tracked_calloc(size_t nmemb, size_t size) {
     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
+    m_tracked_node_lock();
     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;
+    m_tracked_node_unlock();
     #if MICROPY_TRACKED_ALLOC_STORE_SIZE
     node->size = nmemb * size;
     #endif
@@ -278,7 +307,8 @@ void m_tracked_free(void *ptr_in) {
     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
+    #endif // MICROPY_DEBUG_VERBOSE
+    m_tracked_node_lock();
     if (node->next != NULL) {
         node->next->prev = node->prev;
     }
@@ -287,6 +317,7 @@ void m_tracked_free(void *ptr_in) {
     } else {
         MP_STATE_VM(m_tracked_head) = node->next;
     }
+    m_tracked_node_unlock();
     m_free(node
         #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
         #if MICROPY_TRACKED_ALLOC_STORE_SIZE
diff --git a/tests/extmod/ssl_threads.py b/tests/extmod/ssl_threads.py
new file mode 100644
index 0000000000000..4564abd3d80de
--- /dev/null
+++ b/tests/extmod/ssl_threads.py
@@ -0,0 +1,57 @@
+# Ensure that SSL sockets can be allocated from multiple
+# threads without thread safety issues
+import unittest
+
+try:
+    import _thread
+    import io
+    import tls
+    import time
+except ImportError:
+    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):
+        return 0
+
+    def setblocking(self, value):
+        pass
+
+
+ITERS = 256
+
+
+class TLSThreads(unittest.TestCase):
+    def test_sslsocket_threaded(self):
+        self.done = False
+        # only run in two threads: too much RAM demand otherwise, and rp2 only
+        # supports two anyhow
+        _thread.start_new_thread(self._alloc_many_sockets, (True,))
+        self._alloc_many_sockets(False)
+        while not self.done:
+            time.sleep(0.1)
+        print("done")
+
+    def _alloc_many_sockets(self, set_done_flag):
+        print("start", _thread.get_ident())
+        ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+        ctx.verify_mode = tls.CERT_NONE
+        for n in range(ITERS):
+            s = TestSocket()
+            s = ctx.wrap_socket(s, do_handshake_on_connect=False)
+            s.close()  # Free associated resources now from thread, not in a GC pass
+        print("done", _thread.get_ident())
+        if set_done_flag:
+            self.done = True
+
+
+if __name__ == "__main__":
+    unittest.main()

From 79abdad9e97f18f45650e1abce64ee51c3372953 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 1 May 2025 16:24:13 +1000
Subject: [PATCH 2191/3129] tests/extmod: Rename ssl tests that only use the
 tls module.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/{ssl_noleak.py => tls_noleak.py}   | 0
 tests/extmod/{ssl_threads.py => tls_threads.py} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/extmod/{ssl_noleak.py => tls_noleak.py} (100%)
 rename tests/extmod/{ssl_threads.py => tls_threads.py} (100%)

diff --git a/tests/extmod/ssl_noleak.py b/tests/extmod/tls_noleak.py
similarity index 100%
rename from tests/extmod/ssl_noleak.py
rename to tests/extmod/tls_noleak.py
diff --git a/tests/extmod/ssl_threads.py b/tests/extmod/tls_threads.py
similarity index 100%
rename from tests/extmod/ssl_threads.py
rename to tests/extmod/tls_threads.py

From bdb7e036d2400c25beeb2b4252ff51c5255c4020 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Sat, 15 Feb 2025 15:24:50 +0100
Subject: [PATCH 2192/3129] extmod/asyncio: Fix early exit of asyncio
 scheduler.

This commit fixes three open issues related to the asyncio scheduler
exiting prematurely when the main task queue is empty, in cases where
CPython would not exit (for example, because the main task is not done
because it's on a different queue).

In the first case, the scheduler exits because running a task via
`run_until_complete` did not schedule any dependent tasks.

In the other two cases, the scheduler exits because the tasks are queued in
an event queue.

Tests have been added which reproduce the original issues.  These test
cases document the unauthorized use of `Event.set()` from a soft IRQ, and
are skipped in unsupported environments (webassembly and native emitter).

Fixes issues #16759, #16569 and #16318.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 extmod/asyncio/core.py                       | 36 +++++---
 tests/extmod/asyncio_event_queue.py          | 64 +++++++++++++++
 tests/extmod/asyncio_event_queue.py.exp      |  5 ++
 tests/extmod/asyncio_iterator_event.py       | 86 ++++++++++++++++++++
 tests/extmod/asyncio_iterator_event.py.exp   |  5 ++
 tests/extmod/asyncio_wait_for_linked_task.py | 66 +++++++++++++++
 tests/run-tests.py                           |  5 ++
 7 files changed, 255 insertions(+), 12 deletions(-)
 create mode 100644 tests/extmod/asyncio_event_queue.py
 create mode 100644 tests/extmod/asyncio_event_queue.py.exp
 create mode 100644 tests/extmod/asyncio_iterator_event.py
 create mode 100644 tests/extmod/asyncio_iterator_event.py.exp
 create mode 100644 tests/extmod/asyncio_wait_for_linked_task.py

diff --git a/extmod/asyncio/core.py b/extmod/asyncio/core.py
index 8aad234514b0c..5d46b4b80e2a1 100644
--- a/extmod/asyncio/core.py
+++ b/extmod/asyncio/core.py
@@ -163,9 +163,16 @@ def run_until_complete(main_task=None):
                 # A task waiting on _task_queue; "ph_key" is time to schedule task at
                 dt = max(0, ticks_diff(t.ph_key, ticks()))
             elif not _io_queue.map:
-                # No tasks can be woken so finished running
+                # No tasks can be woken
                 cur_task = None
-                return
+                if not main_task or not main_task.state:
+                    # no main_task, or main_task is done so finished running
+                    return
+                # At this point, there is theoretically nothing that could wake the
+                # scheduler, but it is not allowed to exit either. We keep the code
+                # running so that a hypothetical debugger (or other such meta-process)
+                # can get a view of what is happening and possibly abort.
+                dt = 3
             # print('(poll {})'.format(dt), len(_io_queue.map))
             _io_queue.wait_io_event(dt)
 
@@ -187,31 +194,33 @@ def run_until_complete(main_task=None):
         except excs_all as er:
             # Check the task is not on any event queue
             assert t.data is None
-            # This task is done, check if it's the main task and then loop should stop
-            if t is main_task:
+            # If it's the main task, it is considered as awaited by the caller
+            awaited = t is main_task
+            if awaited:
                 cur_task = None
-                if isinstance(er, StopIteration):
-                    return er.value
-                raise er
+                if not isinstance(er, StopIteration):
+                    t.state = False
+                    raise er
+                if t.state is None:
+                    t.state = False
             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
+                    t.state = False if awaited else 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
+                    awaited = True
                 else:
                     # Schedule any other tasks waiting on the completion of this task.
                     while t.state.peek():
                         _task_queue.push(t.state.pop())
-                        waiting = True
+                        awaited = 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):
+                if not awaited 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).
@@ -229,6 +238,9 @@ def run_until_complete(main_task=None):
                 _exc_context["exception"] = exc
                 _exc_context["future"] = t
                 Loop.call_exception_handler(_exc_context)
+            # If it's the main task then the loop should stop
+            if t is main_task:
+                return er.value
 
 
 # Create a new task from a coroutine and run it until it finishes
diff --git a/tests/extmod/asyncio_event_queue.py b/tests/extmod/asyncio_event_queue.py
new file mode 100644
index 0000000000000..e0125b1aefe13
--- /dev/null
+++ b/tests/extmod/asyncio_event_queue.py
@@ -0,0 +1,64 @@
+# Ensure that an asyncio task can wait on an Event when the
+# _task_queue is empty
+# https://github.com/micropython/micropython/issues/16569
+
+try:
+    import asyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# This test requires checking that the asyncio scheduler
+# remains active "indefinitely" when the task queue is empty.
+#
+# To check this, we need another independent scheduler that
+# can wait for a certain amount of time. So we have to
+# create one using micropython.schedule() and time.ticks_ms()
+#
+# Technically, this code breaks the rules, as it is clearly
+# documented that Event.set() should _NOT_ be called from a
+# schedule (soft IRQ) because in some cases, a race condition
+# can occur, resulting in a crash. However:
+# - since the risk of a race condition in that specific
+#   case has been analysed and excluded
+# - given that there is no other simple alternative to
+#   write this test case,
+# an exception to the rule was deemed acceptable. See
+# https://github.com/micropython/micropython/pull/16772
+
+import micropython, time
+
+try:
+    micropython.schedule
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+evt = asyncio.Event()
+
+
+def schedule_watchdog(end_ticks):
+    if time.ticks_diff(end_ticks, time.ticks_ms()) <= 0:
+        print("asyncio still pending, unlocking event")
+        # Caution: about to call Event.set() from a schedule
+        #          (see the note in the comment above)
+        evt.set()
+        return
+    micropython.schedule(schedule_watchdog, end_ticks)
+
+
+async def foo():
+    print("foo waiting")
+    schedule_watchdog(time.ticks_add(time.ticks_ms(), 100))
+    await evt.wait()
+    print("foo done")
+
+
+async def main():
+    print("main started")
+    await foo()
+    print("main done")
+
+
+asyncio.run(main())
diff --git a/tests/extmod/asyncio_event_queue.py.exp b/tests/extmod/asyncio_event_queue.py.exp
new file mode 100644
index 0000000000000..ee42c96d83ed8
--- /dev/null
+++ b/tests/extmod/asyncio_event_queue.py.exp
@@ -0,0 +1,5 @@
+main started
+foo waiting
+asyncio still pending, unlocking event
+foo done
+main done
diff --git a/tests/extmod/asyncio_iterator_event.py b/tests/extmod/asyncio_iterator_event.py
new file mode 100644
index 0000000000000..6efa6b864567a
--- /dev/null
+++ b/tests/extmod/asyncio_iterator_event.py
@@ -0,0 +1,86 @@
+# Ensure that an asyncio task can wait on an Event when the
+# _task_queue is empty, in the context of an async iterator
+# https://github.com/micropython/micropython/issues/16318
+
+try:
+    import asyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# This test requires checking that the asyncio scheduler
+# remains active "indefinitely" when the task queue is empty.
+#
+# To check this, we need another independent scheduler that
+# can wait for a certain amount of time. So we have to
+# create one using micropython.schedule() and time.ticks_ms()
+#
+# Technically, this code breaks the rules, as it is clearly
+# documented that Event.set() should _NOT_ be called from a
+# schedule (soft IRQ) because in some cases, a race condition
+# can occur, resulting in a crash. However:
+# - since the risk of a race condition in that specific
+#   case has been analysed and excluded
+# - given that there is no other simple alternative to
+#   write this test case,
+# an exception to the rule was deemed acceptable. See
+# https://github.com/micropython/micropython/pull/16772
+
+import micropython, time
+
+try:
+    micropython.schedule
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+ai = None
+
+
+def schedule_watchdog(end_ticks):
+    if time.ticks_diff(end_ticks, time.ticks_ms()) <= 0:
+        print("good: asyncio iterator is still pending, exiting")
+        # Caution: ai.fetch_data() will invoke Event.set()
+        #          (see the note in the comment above)
+        ai.fetch_data(None)
+        return
+    micropython.schedule(schedule_watchdog, end_ticks)
+
+
+async def test(ai):
+    for x in range(3):
+        await asyncio.sleep(0.1)
+        ai.fetch_data(f"bar {x}")
+
+
+class AsyncIterable:
+    def __init__(self):
+        self.message = None
+        self.evt = asyncio.Event()
+
+    def __aiter__(self):
+        return self
+
+    async def __anext__(self):
+        await self.evt.wait()
+        self.evt.clear()
+        if self.message is None:
+            raise StopAsyncIteration
+        return self.message
+
+    def fetch_data(self, message):
+        self.message = message
+        self.evt.set()
+
+
+async def main():
+    global ai
+    ai = AsyncIterable()
+    asyncio.create_task(test(ai))
+    schedule_watchdog(time.ticks_add(time.ticks_ms(), 500))
+    async for message in ai:
+        print(message)
+    print("end main")
+
+
+asyncio.run(main())
diff --git a/tests/extmod/asyncio_iterator_event.py.exp b/tests/extmod/asyncio_iterator_event.py.exp
new file mode 100644
index 0000000000000..a1893197d02ef
--- /dev/null
+++ b/tests/extmod/asyncio_iterator_event.py.exp
@@ -0,0 +1,5 @@
+bar 0
+bar 1
+bar 2
+good: asyncio iterator is still pending, exiting
+end main
diff --git a/tests/extmod/asyncio_wait_for_linked_task.py b/tests/extmod/asyncio_wait_for_linked_task.py
new file mode 100644
index 0000000000000..4dda62d5476c7
--- /dev/null
+++ b/tests/extmod/asyncio_wait_for_linked_task.py
@@ -0,0 +1,66 @@
+# Test asyncio.wait_for, with dependent tasks
+# https://github.com/micropython/micropython/issues/16759
+
+try:
+    import asyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+# CPython 3.12 deprecated calling get_event_loop() when there is no current event
+# loop, so to make this test run on CPython requires setting the event loop.
+if hasattr(asyncio, "set_event_loop"):
+    asyncio.set_event_loop(asyncio.new_event_loop())
+
+
+class Worker:
+    def __init__(self):
+        self._eventLoop = None
+        self._tasks = []
+
+    def launchTask(self, asyncJob):
+        if self._eventLoop is None:
+            self._eventLoop = asyncio.get_event_loop()
+        return self._eventLoop.create_task(asyncJob)
+
+    async def job(self, prerequisite, taskName):
+        if prerequisite:
+            await prerequisite
+        await asyncio.sleep(0.1)
+        print(taskName, "work completed")
+
+    def planTasks(self):
+        self._tasks.append(self.launchTask(self.job(None, "task0")))
+        self._tasks.append(self.launchTask(self.job(self._tasks[0], "task1")))
+        self._tasks.append(self.launchTask(self.job(self._tasks[1], "task2")))
+
+    async def waitForTask(self, taskIdx):
+        return await self._tasks[taskIdx]
+
+    def syncWaitForTask(self, taskIdx):
+        return self._eventLoop.run_until_complete(self._tasks[taskIdx])
+
+
+async def async_test():
+    print("--- async test")
+    worker = Worker()
+    worker.planTasks()
+    await worker.waitForTask(0)
+    print("-> task0 done")
+    await worker.waitForTask(2)
+    print("-> task2 done")
+
+
+def sync_test():
+    print("--- sync test")
+    worker = Worker()
+    worker.planTasks()
+    worker.syncWaitForTask(0)
+    print("-> task0 done")
+    worker.syncWaitForTask(2)
+    print("-> task2 done")
+
+
+asyncio.get_event_loop().run_until_complete(async_test())
+sync_test()
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 9e7cab4689a8d..ac411a0be6ada 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -162,6 +162,9 @@ def open(self, path, mode):
         "extmod/asyncio_new_event_loop.py",
         "extmod/asyncio_threadsafeflag.py",
         "extmod/asyncio_wait_for_fwd.py",
+        "extmod/asyncio_event_queue.py",
+        "extmod/asyncio_iterator_event.py",
+        "extmod/asyncio_wait_for_linked_task.py",
         "extmod/binascii_a2b_base64.py",
         "extmod/deflate_compress_memory_error.py",  # tries to allocate unlimited memory
         "extmod/re_stack_overflow.py",
@@ -843,6 +846,8 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         )  # 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
+        skip_tests.add("extmod/asyncio_event_queue.py")  # native can't run schedule
+        skip_tests.add("extmod/asyncio_iterator_event.py")  # native can't run schedule
 
     def run_one_test(test_file):
         test_file = test_file.replace("\\", "/")

From 288dce26bd1f6c4bf664aefe11103840e458ebb2 Mon Sep 17 00:00:00 2001
From: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
Date: Tue, 6 May 2025 16:25:53 -0600
Subject: [PATCH 2193/3129] docs,ports: Fix SparkFun capitalization.

This is a follow-up to 1e92bdd206f6f87ba65ea05c5b2623fca0b926cd correcting
more of the instances where "Sparkfun" should be "SparkFun".

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/wm8960.rst                                   | 8 ++++----
 docs/samd/pinout.rst                                      | 2 +-
 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json   | 4 ++--
 .../boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h     | 2 +-
 ports/samd/modmachine.c                                   | 2 +-
 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json     | 2 +-
 .../stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h  | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/library/wm8960.rst b/docs/library/wm8960.rst
index 5abfb6a8a011c..4115d20758100 100644
--- a/docs/library/wm8960.rst
+++ b/docs/library/wm8960.rst
@@ -358,13 +358,13 @@ Run WM8960 on a MIMXRT10xx_DEV board in secondary mode (default)::
         sysclk_source=wm8960.SYSCLK_MCLK)
 
 
-Record with a Sparkfun WM8960 breakout board with Teensy in secondary mode (default)::
+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
+    # 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.
     #
@@ -379,11 +379,11 @@ Record with a Sparkfun WM8960 breakout board with Teensy in secondary mode (defa
         right_input=wm8960.INPUT_CLOSED)
 
 
-Play with a Sparkfun WM8960 breakout board with Teensy in secondary mode (default)::
+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
+    # 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.
 
diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 3945e2bf2ff1c..1ad8f55884060 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -892,7 +892,7 @@ Default pin assignments:
 
 There seems to be no default pin assignment for this board.
 
-Sparkfun SAMD51 Thing Plus pin assignment table
+SparkFun SAMD51 Thing Plus pin assignment table
 ------------------------------------------------
 
 === ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
index ee9ca9d3689b0..51d124e751d6e 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
@@ -13,8 +13,8 @@
         "sparkfun_samd51_thing_plus.jpg"
     ],
     "mcu": "samd51",
-    "product": "Sparkfun SAMD51 Thing Plus",
+    "product": "SparkFun SAMD51 Thing Plus",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/14713",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
index fe2226a59eb58..9e0db7875f247 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME       "Sparkfun SAMD51 Thing Plus"
+#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/modmachine.c b/ports/samd/modmachine.c
index 65dbf8a7f5039..82e7b7c062045 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -42,7 +42,7 @@
 #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
+// Needed at the moment for SparkFun SAMD51 Thing Plus
 #define DBL_TAP_MAGIC_LOADER 0xf01669ef
 #define DBL_TAP_MAGIC_RESET 0xf02669ef
 
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
index 0bd3573d6445e..01ed363cf3740 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
@@ -11,5 +11,5 @@
     "product": "Micromod STM32",
     "thumbnail": "",
     "url": "",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
index d2f44cf6cccf0..1e17905bb0d6c 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
@@ -1,4 +1,4 @@
-// The Sparkfun MicroMod spec uses a zero-based peripheral numbering scheme.
+// 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").
 //

From 8e328da9bf96b4347bd4746afc337fe28f2e75b1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Feb 2025 12:49:45 +0100
Subject: [PATCH 2194/3129] samd/boards/SAMD_GENERIC_Dxxx: Add Microchip URL to
 board.json.

To the Microchip Web site.  Thanks to Matt Trentini for suggesting this
site.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/SAMD_GENERIC_D21X18/board.json | 1 +
 ports/samd/boards/SAMD_GENERIC_D51X19/board.json | 1 +
 ports/samd/boards/SAMD_GENERIC_D51X20/board.json | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ports/samd/boards/SAMD_GENERIC_D21X18/board.json b/ports/samd/boards/SAMD_GENERIC_D21X18/board.json
index a14730bd1bf49..c00d78addd40e 100644
--- a/ports/samd/boards/SAMD_GENERIC_D21X18/board.json
+++ b/ports/samd/boards/SAMD_GENERIC_D21X18/board.json
@@ -11,6 +11,7 @@
     ],
     "mcu": "samd21",
     "vendor": "Microchip",
+    "url": "https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d",
     "product": "Generic SAMD21J18",
     "thumbnail": ""
 }
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X19/board.json b/ports/samd/boards/SAMD_GENERIC_D51X19/board.json
index 21cb114bf65fb..2be5f20851eb7 100644
--- a/ports/samd/boards/SAMD_GENERIC_D51X19/board.json
+++ b/ports/samd/boards/SAMD_GENERIC_D51X19/board.json
@@ -11,6 +11,7 @@
     ],
     "mcu": "samd51",
     "vendor": "Microchip",
+    "url": "https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d",
     "product": "Generic SAMD51P19",
     "thumbnail": ""
 }
diff --git a/ports/samd/boards/SAMD_GENERIC_D51X20/board.json b/ports/samd/boards/SAMD_GENERIC_D51X20/board.json
index ae4f83472ecd4..8384484327894 100644
--- a/ports/samd/boards/SAMD_GENERIC_D51X20/board.json
+++ b/ports/samd/boards/SAMD_GENERIC_D51X20/board.json
@@ -11,6 +11,7 @@
     ],
     "mcu": "samd51",
     "vendor": "Microchip",
+    "url": "https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus/sam-d",
     "product": "Generic SAMD51P20",
     "thumbnail": ""
 }

From 2fda4bbe05799ccf387051acec600c6ac2e243e2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 12 Mar 2025 20:28:51 +0100
Subject: [PATCH 2195/3129] samd/machine_i2c: Add the timeout keyword argument
 to the constructor.

To make it compliant with the documentation.  The default value is 50000us.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_i2c.c | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index 03af3d29ed614..172518523d208 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -37,9 +37,9 @@
 #include "genhdr/pins.h"
 #include "clock_config.h"
 
-#define DEFAULT_I2C_FREQ  (400000)
-#define RISETIME_NS       (200)
-#define I2C_TIMEOUT       (100)
+#define DEFAULT_I2C_FREQ    (400000)
+#define RISETIME_NS         (200)
+#define DEFAULT_I2C_TIMEOUT (50000)
 
 #define IS_BUS_BUSY       (i2c->I2CM.STATUS.bit.BUSSTATE == 3)
 #define NACK_RECVD        (i2c->I2CM.STATUS.bit.RXNACK == 1)
@@ -67,6 +67,7 @@ typedef struct _machine_i2c_obj_t {
     uint8_t state;
     uint32_t freq;
     uint32_t timeout;
+    uint32_t timer;
     size_t len;
     uint8_t *buf;
 } machine_i2c_obj_t;
@@ -88,7 +89,7 @@ void common_i2c_irq_handler(int i2c_id) {
             if (self->len > 0) {
                 *(self->buf)++ = i2c->I2CM.DATA.reg;
                 self->len--;
-                self->timeout = I2C_TIMEOUT;
+                self->timer = self->timeout;
             }
             if (self->len > 0) { // no ACK at the last byte
                 PREPARE_ACK; // Send ACK
@@ -105,7 +106,7 @@ void common_i2c_irq_handler(int i2c_id) {
             } else if (self->len > 0) { // data to be sent
                 i2c->I2CM.DATA.bit.DATA = *(self->buf)++;
                 self->len--;
-                self->timeout = I2C_TIMEOUT;
+                self->timer = self->timeout;
             } else { // No data left, if there was any.
                 self->state = state_done;
                 i2c->I2CM.INTFLAG.reg |= SERCOM_I2CM_INTFLAG_MB;
@@ -120,12 +121,13 @@ void common_i2c_irq_handler(int i2c_id) {
 
 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->id, self->freq, pin_find_by_id(self->scl)->name, pin_find_by_id(self->sda)->name);
+    mp_printf(print, "I2C(%u, freq=%u, scl=\"%q\", sda=\"%q\", timeout=%u)",
+        self->id, self->freq, pin_find_by_id(self->scl)->name, pin_find_by_id(self->sda)->name,
+        self->timeout * 1000);
 }
 
 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 };
+    enum { ARG_id, ARG_freq, ARG_scl, ARG_sda, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
         #if MICROPY_HW_DEFAULT_I2C_ID < 0
         { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
@@ -140,6 +142,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         { 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} },
         #endif
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_I2C_TIMEOUT} },
     };
 
     // Parse args.
@@ -168,6 +171,8 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     }
     MP_STATE_PORT(sercom_table[self->id]) = self;
     self->freq = args[ARG_freq].u_int;
+    // The unit for ARG_timeout is us, but the code uses ms.
+    self->timeout = args[ARG_timeout].u_int / 1000;
 
     // Configure the Pin mux.
     mp_hal_set_pin_mux(self->scl, scl_pad_config.alt_fct);
@@ -224,13 +229,13 @@ static int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
     Sercom *i2c = self->instance;
 
-    self->timeout = I2C_TIMEOUT;
+    self->timer = self->timeout;
     self->len = len;
     self->buf = buf;
     // Wait a while if the bus is busy
-    while (IS_BUS_BUSY && self->timeout) {
+    while (IS_BUS_BUSY && self->timer) {
         MICROPY_EVENT_POLL_HOOK
-        if (--self->timeout == 0) {
+        if (--self->timer == 0) {
             return -MP_ETIMEDOUT;
         }
     }
@@ -242,9 +247,9 @@ static int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     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--;
+    self->timer = self->timeout;
+    while (self->state == state_busy && self->timer) {
+        self->timer--;
         MICROPY_EVENT_POLL_HOOK
     }
     i2c->I2CM.INTENCLR.reg = SERCOM_I2CM_INTENSET_MB | SERCOM_I2CM_INTENSET_SB | SERCOM_I2CM_INTENSET_ERROR;
@@ -256,7 +261,7 @@ static int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     } else if (self->state == state_buserr) {
         SET_STOP_STATE;
         return -MP_EIO;
-    } else if (self->timeout == 0) {
+    } else if (self->timer == 0) {
         SET_STOP_STATE;
         return -MP_ETIMEDOUT;
     }

From ff9e01782b7e0f21d8d085bdc4c917a7faf6c17e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 26 Mar 2025 09:24:19 +0100
Subject: [PATCH 2196/3129] samd/modtime: Change time.time_ns() to follow the
 RTC time.

That is done by adding the offset to epoch, following the scheme from the
RP2 port.  RTC and `ticks_us()` are not precisely in sync, and so the
difference between `time.time_ns()/1e9` and `time.time()` will increase by
more than 9 seconds/24h.  So applications should avoid using `time.time()`
and `time.time_ns()` in the same context.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_rtc.c |  1 +
 ports/samd/main.c        |  2 ++
 ports/samd/modtime.c     | 14 ++++++++++++++
 ports/samd/mphalport.h   |  5 +----
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ports/samd/machine_rtc.c b/ports/samd/machine_rtc.c
index 74c2266d60926..4b03488b71b73 100644
--- a/ports/samd/machine_rtc.c
+++ b/ports/samd/machine_rtc.c
@@ -133,6 +133,7 @@ static mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args,
         }
         #endif
 
+        mp_hal_time_ns_set_from_rtc();
         return mp_const_none;
     }
 }
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 2bbaf63e6e4c5..a7da95582f76c 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -28,6 +28,7 @@
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
+#include "py/mphal.h"
 #include "py/stackctrl.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
@@ -45,6 +46,7 @@ extern void sercom_deinit_all(void);
 void samd_main(void) {
     mp_stack_set_top(&_estack);
     mp_stack_set_limit(&_estack - &_sstack - 1024);
+    mp_hal_time_ns_set_from_rtc();
 
     for (;;) {
         gc_init(&_sheap, &_eheap);
diff --git a/ports/samd/modtime.c b/ports/samd/modtime.c
index 83072dd16feeb..0bed3cb83a868 100644
--- a/ports/samd/modtime.c
+++ b/ports/samd/modtime.c
@@ -28,6 +28,8 @@
 #include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 
+static uint64_t time_us_64_offset_from_epoch;
+
 // Return the localtime as an 8-tuple.
 static mp_obj_t mp_time_localtime_get(void) {
     timeutils_struct_time_t tm;
@@ -54,3 +56,15 @@ static mp_obj_t mp_time_time_get(void) {
     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));
 }
+
+void mp_hal_time_ns_set_from_rtc(void) {
+    timeutils_struct_time_t tm;
+    rtc_gettime(&tm);
+    uint64_t time_us = (uint64_t)timeutils_mktime(tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour,
+        tm.tm_min, tm.tm_sec) * 1000000ULL;
+    time_us_64_offset_from_epoch = time_us - mp_hal_ticks_us_64();
+}
+
+uint64_t mp_hal_time_ns(void) {
+    return (time_us_64_offset_from_epoch + mp_hal_ticks_us_64()) * 1000ULL;
+}
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 6c9e525bb9162..69e2b606408be 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -47,6 +47,7 @@ extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
 extern volatile uint32_t systick_ms;
 uint64_t mp_hal_ticks_us_64(void);
+void mp_hal_time_ns_set_from_rtc(void);
 
 void mp_hal_set_interrupt_char(int c);
 
@@ -94,10 +95,6 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 }
 #endif
 
-static inline uint64_t mp_hal_time_ns(void) {
-    return mp_hal_ticks_us_64() * 1000;
-}
-
 // C-level pin HAL
 
 #include "py/obj.h"

From c22c2c806694dbce55cfe484b1b9e55af33bb950 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 15 Apr 2025 16:57:53 +0200
Subject: [PATCH 2197/3129] samd/boards/SAMD_GENERIC_D51xxx: Fix VFS settings
 for internal flash.

Fixes in this commit:
- The wrong loader script was assigned for SAMD_GENERIC_D51X20, causing the
  VFS block count to be wrong.
- Change the VFS block size from 1536 to 2048.  With the setting of 1536,
  writing more that 1536 bytes at once failed.  This applies to
  SAMD_GENERIC_D51X19 and SAMD_GENERIC_D51X20.  No other SAMD51 board uses
  the internal flash for the file system.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk | 6 ++----
 ports/samd/mcu/samd51/mpconfigmcu.h                    | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk b/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk
index ddba3dcbbade9..b240c2587f8d0 100644
--- a/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk
+++ b/ports/samd/boards/SAMD_GENERIC_D51X20/mpconfigboard.mk
@@ -1,13 +1,11 @@
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51P20A
-LD_FILES = boards/samd51x19a.ld sections.ld
+LD_FILES = boards/samd51x20a.ld sections.ld
 TEXT0 = 0x4000
 
-
 # The ?='s allow overriding in mpconfigboard.mk.
 # MicroPython settings
 # The size of a MCU flash filesystem will be
-# 1008k - MICROPY_HW_CODESIZE - MICROPY_HW_VFSROMSIZE
+# 1008k - MICROPY_HW_CODESIZE
 # The default for MICROPY_HW_VFSROMSIZE is 64K
 MICROPY_HW_CODESIZE ?= 752K
-MICROPY_HW_VFSROMSIZE ?= 128K
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 831949bab56a0..8cce90b886c07 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -23,7 +23,7 @@ unsigned long 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) */
 
-#define VFS_BLOCK_SIZE_BYTES            (1536) //
+#define VFS_BLOCK_SIZE_BYTES            (2048) //
 
 #ifndef MICROPY_HW_UART_TXBUF
 #define MICROPY_HW_UART_TXBUF           (1)

From 2e6df08e05f4832806f062c56f78c5412fd37ceb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 9 Apr 2025 18:07:24 +0200
Subject: [PATCH 2198/3129] samd/samd_spiflash: Improve the flash type
 detection.

Changes in this commit:
- Check for the proper SFDP header.
- Use the flash size information from SFDP, if present.
- Add two more special flash chips <= 1 MByte without SFDP.  JEDEC-ID table
  for special flash types instead of a series of conditional statements.
- Add a compile flag `MICROPY_HW_SPIFLASH_SIZE` to set the size in
  `mpconfigboard.h`, which replaces getting the size from the JEDEC ID or
  the SFDP record.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/samd_spiflash.c | 65 +++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/ports/samd/samd_spiflash.c b/ports/samd/samd_spiflash.c
index 8ada7e96092c2..63dc0a83045b1 100644
--- a/ports/samd/samd_spiflash.c
+++ b/ports/samd/samd_spiflash.c
@@ -67,6 +67,19 @@ typedef struct _spiflash_obj_t {
 
 extern const mp_obj_type_t samd_spiflash_type;
 
+typedef struct _spiflash_jedec_id_t {
+    uint32_t jedec_id;
+    uint32_t mask;
+    uint32_t size;
+}  spiflash_jedec_id_t;
+
+spiflash_jedec_id_t jedec_id_table[] = {
+    { 0x1f8401, 0xffff00, 512 * 1024 }, // Adesto/Renesas 4 MBit
+    { 0x1f2400, 0xffff00, 512 * 1024 }, // Adesto 4 MBit
+    { 0x1f4501, 0xffff00, 1024 * 1024 }, // Adesto/Renesas/Atmel 8 MBit
+    { 0xc84013, 0xffffff, 512 * 1024 }, // Gigadevices 4 MBit
+};
+
 // The SPIflash object is a singleton
 static spiflash_obj_t spiflash_obj = {
     { &samd_spiflash_type }, NULL, 0, false, PAGE_SIZE, SECTOR_SIZE, NULL, 0
@@ -124,6 +137,7 @@ static void write_enable(spiflash_obj_t *self) {
     mp_hal_pin_write(self->cs, 1);
 }
 
+#if !defined(MICROPY_HW_SPIFLASH_SIZE)
 // Write status register 1
 static void write_sr1(spiflash_obj_t *self, uint8_t value) {
     uint8_t msg[2];
@@ -134,6 +148,7 @@ static void write_sr1(spiflash_obj_t *self, uint8_t value) {
     spi_transfer(self->spi, 2, msg, NULL);
     mp_hal_pin_write(self->cs, 1);
 }
+#endif
 
 static void get_sfdp(spiflash_obj_t *self, uint32_t addr, uint8_t *buffer, int size) {
     uint8_t dummy[1];
@@ -170,32 +185,46 @@ static mp_obj_t spiflash_make_new(const mp_obj_type_t *type, size_t n_args, size
     // Get the flash size from the device ID (default)
     uint8_t id[3];
     get_id(self, id);
-    bool read_sfdp = true;
-
-    if (id[1] == 0x84 && id[2] == 1) {  // Adesto
-        self->size = 512 * 1024;
-    } else if (id[0] == 0x1f && id[1] == 0x45 && id[2] == 1) {  // Adesto/Renesas 8 MBit
-        self->size = 1024 * 1024;
-        read_sfdp = false;
-        self->sectorsize = 4096;
-        self->addr_is_32bit = false;
-        // Globally unlock the sectors, which are locked after power on.
-        write_enable(self);
-        write_sr1(self, 0);
-    } else {
-        self->size = 1 << id[2];
+
+    #if defined(MICROPY_HW_SPIFLASH_SIZE)
+    self->size = MICROPY_HW_SPIFLASH_SIZE;
+    #else
+    // Assume as default that the size is coded into the last JEDEC ID byte.
+    self->size = 1 << id[2];
+    // Look for specific flash devices with different encoding.
+    uint32_t jedec_id = (id[0] << 16) | (id[1] << 8) | id[2];
+    for (int i = 0; i < MP_ARRAY_SIZE(jedec_id_table); i++) {
+        if (jedec_id_table[i].jedec_id == (jedec_id & jedec_id_table[i].mask)) {
+            self->size = jedec_id_table[i].size;
+            // Globally unlock the sectors, which may be locked after power on.
+            write_enable(self);
+            write_sr1(self, 0);
+            break;
+        }
     }
+    #endif
 
-    // Get the addr_is_32bit flag and the sector size
-    if (read_sfdp) {
-        uint8_t buffer[128];
-        get_sfdp(self, 0, buffer, 16);  // get the header
+    // Get the flash size, addr_is_32bit flag and sector size from SFDP, if present.
+    uint8_t buffer[128];
+    get_sfdp(self, 0, buffer, 16);  // get the header
+    if (*(uint32_t *)buffer == 0x50444653) {  // Header signature "SFDP"
         int len = MIN(buffer[11] * 4, sizeof(buffer));
         if (len >= 29) {
             int addr = buffer[12] + (buffer[13] << 8) + (buffer[14] << 16);
             get_sfdp(self, addr, buffer, len);  // Get the JEDEC mandatory table
             self->sectorsize = 1 << buffer[28];
             self->addr_is_32bit = ((buffer[2] >> 1) & 0x03) != 0;
+            #if !defined(MICROPY_HW_SPIFLASH_SIZE)
+            // Get the bit size from the SFDP data
+            uint32_t size = *(uint32_t *)(buffer + 4);
+            if (size & 0x8000000) {
+                // Byte size is 2 ** lower_31_bits / 8
+                self->size = 1 << ((size & 0x7fffffff) >> 3);
+            } else {
+                // Byte size is lower_31_bits / 8 + 1
+                self->size = ((size & 0x7fffffff) >> 3) + 1;
+            }
+            #endif
         }
     }
     self->commands = self->addr_is_32bit ? _COMMANDS_32BIT : _COMMANDS_24BIT;

From 80d03b77804da44d56b7b9446520ffafde7e3eea Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 16 Apr 2025 21:46:15 +0200
Subject: [PATCH 2199/3129] samd/samd_qspiflash: Remove the attempt to handle a
 unknown device.

Since all QSPI flash device used by this port are defined, this code was
only used unintentionally.  Besides that it was incomplete, so better drop
it.

Note: The flash type for Mini-SAM had to be changed too.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/MINISAM_M4/mpconfigboard.h |  2 +-
 ports/samd/samd_qspiflash.c                  | 32 +-------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.h b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
index 6d908bdcb81d2..30a7a804542cb 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.h
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
@@ -7,4 +7,4 @@
 #define MICROPY_HW_DEFAULT_I2C_ID   (2)
 #define MICROPY_HW_DEFAULT_SPI_ID   (1)
 
-#define MICROPY_HW_QSPIFLASH   GD25Q16C
+#define MICROPY_HW_QSPIFLASH   W25Q16JV_IQ
diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
index e25ddf21efe8f..f314a955197d6 100644
--- a/ports/samd/samd_qspiflash.c
+++ b/ports/samd/samd_qspiflash.c
@@ -105,7 +105,6 @@ static const external_flash_device possible_devices[] = {
 
 #define EXTERNAL_FLASH_DEVICE_COUNT MP_ARRAY_SIZE(possible_devices)
 static external_flash_device const *flash_device;
-static external_flash_device generic_config = GENERIC;
 extern const mp_obj_type_t samd_qspiflash_type;
 
 // The QSPIflash object is a singleton
@@ -248,15 +247,6 @@ static uint8_t get_baud(int32_t freq_mhz) {
     return baud;
 }
 
-int get_sfdp_table(uint8_t *table, int maxlen) {
-    uint8_t header[16];
-    read_memory_single(QSPI_CMD_READ_SFDP_PARAMETER, 0, header, sizeof(header));
-    int len = MIN(header[11] * 4, maxlen);
-    int addr = header[12] + (header[13] << 8) + (header[14] << 16);
-    read_memory_single(QSPI_CMD_READ_SFDP_PARAMETER, addr, table, len);
-    return len;
-}
-
 static mp_obj_t samd_qspiflash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
@@ -297,19 +287,6 @@ static mp_obj_t samd_qspiflash_make_new(const mp_obj_type_t *type, size_t n_args
     uint8_t jedec_ids[3];
     read_command(QSPI_CMD_READ_JEDEC_ID, jedec_ids, sizeof(jedec_ids));
 
-    // Read the common sfdp table
-    // Check the device addr length, support of 1-1-4 mode and get the sector size
-    uint8_t sfdp_table[128];
-    int len = get_sfdp_table(sfdp_table, sizeof(sfdp_table));
-    if (len >= 29) {
-        self->sectorsize = 1 << sfdp_table[28];
-        bool addr4b = ((sfdp_table[2] >> 1) & 0x03) == 0x02;
-        bool supports_qspi_114 = (sfdp_table[2] & 0x40) != 0;
-        if (addr4b || !supports_qspi_114) {
-            mp_raise_ValueError(MP_ERROR_TEXT("QSPI mode not supported"));
-        }
-    }
-
     // Check, if the flash device is known and get it's properties.
     flash_device = NULL;
     for (uint8_t i = 0; i < EXTERNAL_FLASH_DEVICE_COUNT; i++) {
@@ -321,15 +298,8 @@ static mp_obj_t samd_qspiflash_make_new(const mp_obj_type_t *type, size_t n_args
             break;
         }
     }
-
-    // If the flash device is not known, try generic config options
     if (flash_device == NULL) {
-        if (jedec_ids[0] == 0xc2) { // Macronix devices
-            generic_config.quad_enable_bit_mask = 0x04;
-            generic_config.single_status_byte = true;
-        }
-        generic_config.total_size = 1 << jedec_ids[2];
-        flash_device = &generic_config;
+        mp_raise_ValueError(MP_ERROR_TEXT("QSPI device not supported"));
     }
 
     self->size = flash_device->total_size;

From 9287a1e6eaa9c6dc1bb9be27466acd3e639d8113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 27 Mar 2024 20:16:13 +0100
Subject: [PATCH 2200/3129] lib/littlefs: Update LittleFS to v2.10.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Going above the root directory (/../foo) now gives an error.  This is an
intentional change made by LittleFS.  It required a update of the testsuite
and is a (minor) compatibility break.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 lib/littlefs/lfs2.c      | 785 ++++++++++++++++++++++++---------------
 lib/littlefs/lfs2.h      |  94 +++--
 lib/littlefs/lfs2_util.c |   3 +
 lib/littlefs/lfs2_util.h |  40 +-
 tests/extmod/vfs_lfs.py  |   2 +-
 5 files changed, 585 insertions(+), 339 deletions(-)

diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index d89c42fd59a21..f9ce2cf290686 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -282,6 +282,21 @@ static int lfs2_bd_erase(lfs2_t *lfs2, lfs2_block_t block) {
 
 
 /// Small type-level utilities ///
+
+// some operations on paths
+static inline lfs2_size_t lfs2_path_namelen(const char *path) {
+    return strcspn(path, "/");
+}
+
+static inline bool lfs2_path_islast(const char *path) {
+    lfs2_size_t namelen = lfs2_path_namelen(path);
+    return path[namelen + strspn(path + namelen, "/")] == '\0';
+}
+
+static inline bool lfs2_path_isdir(const char *path) {
+    return path[lfs2_path_namelen(path)] != '\0';
+}
+
 // operations on block pairs
 static inline void lfs2_pair_swap(lfs2_block_t pair[2]) {
     lfs2_block_t t = pair[0];
@@ -389,18 +404,15 @@ struct lfs2_diskoff {
 
 // operations on global state
 static inline void lfs2_gstate_xor(lfs2_gstate_t *a, const lfs2_gstate_t *b) {
-    for (int i = 0; i < 3; i++) {
-        ((uint32_t*)a)[i] ^= ((const uint32_t*)b)[i];
-    }
+    a->tag ^= b->tag;
+    a->pair[0] ^= b->pair[0];
+    a->pair[1] ^= b->pair[1];
 }
 
 static inline bool lfs2_gstate_iszero(const lfs2_gstate_t *a) {
-    for (int i = 0; i < 3; i++) {
-        if (((uint32_t*)a)[i] != 0) {
-            return false;
-        }
-    }
-    return true;
+    return a->tag == 0
+            && a->pair[0] == 0
+            && a->pair[1] == 0;
 }
 
 #ifndef LFS2_READONLY
@@ -550,9 +562,9 @@ static int lfs2_dir_compact(lfs2_t *lfs2,
         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,
+static lfs2_ssize_t lfs2_file_write_(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_sync_(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);
 
@@ -574,65 +586,72 @@ 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 int lfs2_dir_rewind_(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,
+static lfs2_ssize_t lfs2_file_read_(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 int lfs2_file_close_(lfs2_t *lfs2, lfs2_file_t *file);
+static lfs2_soff_t lfs2_file_size_(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,
+static lfs2_ssize_t lfs2_fs_size_(lfs2_t *lfs2);
+static int lfs2_fs_traverse_(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);
+static int lfs2_unmount_(lfs2_t *lfs2);
 
 
 /// Block allocator ///
+
+// allocations should call this when all allocated blocks are committed to
+// the filesystem
+//
+// after a checkpoint, the block allocator may realloc any untracked blocks
+static void lfs2_alloc_ckpoint(lfs2_t *lfs2) {
+    lfs2->lookahead.ckpoint = lfs2->block_count;
+}
+
+// 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->lookahead.size = 0;
+    lfs2->lookahead.next = 0;
+    lfs2_alloc_ckpoint(lfs2);
+}
+
 #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)
+    lfs2_block_t off = ((block - lfs2->lookahead.start)
             + lfs2->block_count) % lfs2->block_count;
 
-    if (off < lfs2->free.size) {
-        lfs2->free.buffer[off / 32] |= 1U << (off % 32);
+    if (off < lfs2->lookahead.size) {
+        lfs2->lookahead.buffer[off / 8] |= 1U << (off % 8);
     }
 
     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->block_count;
-}
-
-// 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_fs_rawgc(lfs2_t *lfs2) {
-    // Move free offset at the first unused block (lfs2->free.i)
-    // lfs2->free.i is equal lfs2->free.size when all blocks are used
-    lfs2->free.off = (lfs2->free.off + lfs2->free.i) % lfs2->block_count;
-    lfs2->free.size = lfs2_min(8*lfs2->cfg->lookahead_size, lfs2->free.ack);
-    lfs2->free.i = 0;
+static int lfs2_alloc_scan(lfs2_t *lfs2) {
+    // move lookahead buffer to the first unused block
+    //
+    // note we limit the lookahead buffer to at most the amount of blocks
+    // checkpointed, this prevents the math in lfs2_alloc from underflowing
+    lfs2->lookahead.start = (lfs2->lookahead.start + lfs2->lookahead.next) 
+            % lfs2->block_count;
+    lfs2->lookahead.next = 0;
+    lfs2->lookahead.size = lfs2_min(
+            8*lfs2->cfg->lookahead_size,
+            lfs2->lookahead.ckpoint);
 
     // find mask of free blocks from tree
-    memset(lfs2->free.buffer, 0, lfs2->cfg->lookahead_size);
-    int err = lfs2_fs_rawtraverse(lfs2, lfs2_alloc_lookahead, lfs2, true);
+    memset(lfs2->lookahead.buffer, 0, lfs2->cfg->lookahead_size);
+    int err = lfs2_fs_traverse_(lfs2, lfs2_alloc_lookahead, lfs2, true);
     if (err) {
         lfs2_alloc_drop(lfs2);
         return err;
@@ -645,36 +664,49 @@ static int lfs2_fs_rawgc(lfs2_t *lfs2) {
 #ifndef LFS2_READONLY
 static int lfs2_alloc(lfs2_t *lfs2, lfs2_block_t *block) {
     while (true) {
-        while (lfs2->free.i != lfs2->free.size) {
-            lfs2_block_t off = lfs2->free.i;
-            lfs2->free.i += 1;
-            lfs2->free.ack -= 1;
-
-            if (!(lfs2->free.buffer[off / 32] & (1U << (off % 32)))) {
+        // scan our lookahead buffer for free blocks
+        while (lfs2->lookahead.next < lfs2->lookahead.size) {
+            if (!(lfs2->lookahead.buffer[lfs2->lookahead.next / 8]
+                    & (1U << (lfs2->lookahead.next % 8)))) {
                 // found a free block
-                *block = (lfs2->free.off + off) % lfs2->block_count;
-
-                // eagerly find next off so an alloc ack can
-                // discredit old lookahead blocks
-                while (lfs2->free.i != lfs2->free.size &&
-                        (lfs2->free.buffer[lfs2->free.i / 32]
-                            & (1U << (lfs2->free.i % 32)))) {
-                    lfs2->free.i += 1;
-                    lfs2->free.ack -= 1;
+                *block = (lfs2->lookahead.start + lfs2->lookahead.next)
+                        % lfs2->block_count;
+
+                // eagerly find next free block to maximize how many blocks
+                // lfs2_alloc_ckpoint makes available for scanning
+                while (true) {
+                    lfs2->lookahead.next += 1;
+                    lfs2->lookahead.ckpoint -= 1;
+
+                    if (lfs2->lookahead.next >= lfs2->lookahead.size
+                            || !(lfs2->lookahead.buffer[lfs2->lookahead.next / 8]
+                                & (1U << (lfs2->lookahead.next % 8)))) {
+                        return 0;
+                    }
                 }
-
-                return 0;
             }
+
+            lfs2->lookahead.next += 1;
+            lfs2->lookahead.ckpoint -= 1;
         }
 
-        // check if we have looked at all blocks since last ack
-        if (lfs2->free.ack == 0) {
-            LFS2_ERROR("No more free space %"PRIu32,
-                    lfs2->free.i + lfs2->free.off);
+        // In order to keep our block allocator from spinning forever when our
+        // filesystem is full, we mark points where there are no in-flight
+        // allocations with a checkpoint before starting a set of allocations.
+        //
+        // If we've looked at all blocks since the last checkpoint, we report
+        // the filesystem as out of storage.
+        //
+        if (lfs2->lookahead.ckpoint <= 0) {
+            LFS2_ERROR("No more free space 0x%"PRIx32,
+                    (lfs2->lookahead.start + lfs2->lookahead.next)
+                        % lfs2->block_count);
             return LFS2_ERR_NOSPC;
         }
 
-        int err = lfs2_fs_rawgc(lfs2);
+        // No blocks in our lookahead buffer, we need to scan the filesystem for
+        // unused blocks in the next lookahead window.
+        int err = lfs2_alloc_scan(lfs2);
         if(err) {
             return err;
         }
@@ -690,11 +722,14 @@ static lfs2_stag_t lfs2_dir_getslice(lfs2_t *lfs2, const lfs2_mdir_t *dir,
     lfs2_tag_t ntag = dir->etag;
     lfs2_stag_t gdiff = 0;
 
+    // synthetic moves
     if (lfs2_gstate_hasmovehere(&lfs2->gdisk, dir->pair) &&
-            lfs2_tag_id(gmask) != 0 &&
-            lfs2_tag_id(lfs2->gdisk.tag) <= lfs2_tag_id(gtag)) {
-        // synthetic moves
-        gdiff -= LFS2_MKTAG(0, 1, 0);
+            lfs2_tag_id(gmask) != 0) {
+        if (lfs2_tag_id(lfs2->gdisk.tag) == lfs2_tag_id(gtag)) {
+            return LFS2_ERR_NOENT;
+        } else if (lfs2_tag_id(lfs2->gdisk.tag) < lfs2_tag_id(gtag)) {
+            gdiff -= LFS2_MKTAG(0, 1, 0);
+        }
     }
 
     // iterate over dir block backwards (for faster lookups)
@@ -1438,32 +1473,46 @@ static int lfs2_dir_find_match(void *data,
     return LFS2_CMP_EQ;
 }
 
+// lfs2_dir_find tries to set path and id even if file is not found
+//
+// returns:
+// - 0                  if file is found
+// - LFS2_ERR_NOENT      if file or parent is not found
+// - LFS2_ERR_NOTDIR     if parent is not a dir
 static lfs2_stag_t lfs2_dir_find(lfs2_t *lfs2, lfs2_mdir_t *dir,
         const char **path, uint16_t *id) {
     // we reduce path to a single name if we can find it
     const char *name = *path;
-    if (id) {
-        *id = 0x3ff;
-    }
 
     // default to root dir
     lfs2_stag_t tag = LFS2_MKTAG(LFS2_TYPE_DIR, 0x3ff, 0);
     dir->tail[0] = lfs2->root[0];
     dir->tail[1] = lfs2->root[1];
 
+    // empty paths are not allowed
+    if (*name == '\0') {
+        return LFS2_ERR_INVAL;
+    }
+
     while (true) {
 nextname:
-        // skip slashes
-        name += strspn(name, "/");
+        // skip slashes if we're a directory
+        if (lfs2_tag_type3(tag) == LFS2_TYPE_DIR) {
+            name += strspn(name, "/");
+        }
         lfs2_size_t namelen = strcspn(name, "/");
 
-        // skip '.' and root '..'
-        if ((namelen == 1 && memcmp(name, ".", 1) == 0) ||
-            (namelen == 2 && memcmp(name, "..", 2) == 0)) {
+        // skip '.'
+        if (namelen == 1 && memcmp(name, ".", 1) == 0) {
             name += namelen;
             goto nextname;
         }
 
+        // error on unmatched '..', trying to go above root?
+        if (namelen == 2 && memcmp(name, "..", 2) == 0) {
+            return LFS2_ERR_INVAL;
+        }
+
         // skip if matched by '..' in name
         const char *suffix = name + namelen;
         lfs2_size_t sufflen;
@@ -1475,7 +1524,9 @@ static lfs2_stag_t lfs2_dir_find(lfs2_t *lfs2, lfs2_mdir_t *dir,
                 break;
             }
 
-            if (sufflen == 2 && memcmp(suffix, "..", 2) == 0) {
+            if (sufflen == 1 && memcmp(suffix, ".", 1) == 0) {
+                // noop
+            } else if (sufflen == 2 && memcmp(suffix, "..", 2) == 0) {
                 depth -= 1;
                 if (depth == 0) {
                     name = suffix + sufflen;
@@ -1489,14 +1540,14 @@ static lfs2_stag_t lfs2_dir_find(lfs2_t *lfs2, lfs2_mdir_t *dir,
         }
 
         // found path
-        if (name[0] == '\0') {
+        if (*name == '\0') {
             return tag;
         }
 
         // update what we've found so far
         *path = name;
 
-        // only continue if we hit a directory
+        // only continue if we're a directory
         if (lfs2_tag_type3(tag) != LFS2_TYPE_DIR) {
             return LFS2_ERR_NOTDIR;
         }
@@ -1516,8 +1567,7 @@ static lfs2_stag_t lfs2_dir_find(lfs2_t *lfs2, lfs2_mdir_t *dir,
             tag = lfs2_dir_fetchmatch(lfs2, dir, dir->tail,
                     LFS2_MKTAG(0x780, 0, 0),
                     LFS2_MKTAG(LFS2_TYPE_NAME, 0, namelen),
-                     // are we last name?
-                    (strchr(name, '/') == NULL) ? id : NULL,
+                    id,
                     lfs2_dir_find_match, &(struct lfs2_dir_find_match){
                         lfs2, name, namelen});
             if (tag < 0) {
@@ -2105,13 +2155,14 @@ static int lfs2_dir_splittingcompact(lfs2_t *lfs2, lfs2_mdir_t *dir,
             // And we cap at half a block to avoid degenerate cases with
             // nearly-full metadata blocks.
             //
+            lfs2_size_t metadata_max = (lfs2->cfg->metadata_max)
+                    ? lfs2->cfg->metadata_max
+                    : lfs2->cfg->block_size;
             if (end - split < 0xff
                     && size <= lfs2_min(
-                        lfs2->cfg->block_size - 40,
+                        metadata_max - 40,
                         lfs2_alignup(
-                            (lfs2->cfg->metadata_max
-                                ? lfs2->cfg->metadata_max
-                                : lfs2->cfg->block_size)/2,
+                            metadata_max/2,
                             lfs2->cfg->prog_size))) {
                 break;
             }
@@ -2146,14 +2197,16 @@ static int lfs2_dir_splittingcompact(lfs2_t *lfs2, lfs2_mdir_t *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);
+        lfs2_ssize_t size = lfs2_fs_size_(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->block_count/2) {
+        // littlefs cannot reclaim expanded superblocks, so expand cautiously
+        //
+        // if our filesystem is more than ~88% full, don't expand, this is
+        // somewhat arbitrary
+        if (lfs2->block_count - size > lfs2->block_count/8) {
             LFS2_DEBUG("Expanding superblock at rev %"PRIu32, dir->rev);
             int err = lfs2_dir_split(lfs2, dir, attrs, attrcount,
                     source, begin, end);
@@ -2166,7 +2219,8 @@ static int lfs2_dir_splittingcompact(lfs2_t *lfs2, lfs2_mdir_t *dir,
                 // we can do, we'll error later if we've become frozen
                 LFS2_WARN("Unable to expand superblock");
             } else {
-                end = begin;
+                // duplicate the superblock entry into the new superblock
+                end = 1;
             }
         }
     }
@@ -2312,7 +2366,8 @@ fixmlist:;
             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->id == lfs2_tag_id(attrs[i].tag) &&
+                            d->type != LFS2_TYPE_DIR) {
                         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 &&
@@ -2333,7 +2388,9 @@ fixmlist:;
 
             while (d->id >= d->m.count && d->m.split) {
                 // we split and id is on tail now
-                d->id -= d->m.count;
+                if (lfs2_pair_cmp(d->m.tail, lfs2->root) != 0) {
+                    d->id -= d->m.count;
+                }
                 int err = lfs2_dir_fetch(lfs2, &d->m, d->m.tail);
                 if (err) {
                     return err;
@@ -2499,7 +2556,7 @@ static int lfs2_dir_orphaningcommit(lfs2_t *lfs2, lfs2_mdir_t *dir,
         if (err != LFS2_ERR_NOENT) {
             if (lfs2_gstate_hasorphans(&lfs2->gstate)) {
                 // next step, clean up orphans
-                err = lfs2_fs_preporphans(lfs2, -hasparent);
+                err = lfs2_fs_preporphans(lfs2, -(int8_t)hasparent);
                 if (err) {
                     return err;
                 }
@@ -2564,7 +2621,7 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
 
 /// Top level directory operations ///
 #ifndef LFS2_READONLY
-static int lfs2_rawmkdir(lfs2_t *lfs2, const char *path) {
+static int lfs2_mkdir_(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) {
@@ -2575,18 +2632,18 @@ static int lfs2_rawmkdir(lfs2_t *lfs2, const char *path) {
     cwd.next = lfs2->mlist;
     uint16_t id;
     err = lfs2_dir_find(lfs2, &cwd.m, &path, &id);
-    if (!(err == LFS2_ERR_NOENT && id != 0x3ff)) {
+    if (!(err == LFS2_ERR_NOENT && lfs2_path_islast(path))) {
         return (err < 0) ? err : LFS2_ERR_EXIST;
     }
 
     // check that name fits
-    lfs2_size_t nlen = strlen(path);
+    lfs2_size_t nlen = lfs2_path_namelen(path);
     if (nlen > lfs2->name_max) {
         return LFS2_ERR_NAMETOOLONG;
     }
 
     // build up new directory
-    lfs2_alloc_ack(lfs2);
+    lfs2_alloc_ckpoint(lfs2);
     lfs2_mdir_t dir;
     err = lfs2_dir_alloc(lfs2, &dir);
     if (err) {
@@ -2660,7 +2717,7 @@ static int lfs2_rawmkdir(lfs2_t *lfs2, const char *path) {
 }
 #endif
 
-static int lfs2_dir_rawopen(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
+static int lfs2_dir_open_(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) {
         return tag;
@@ -2704,14 +2761,14 @@ static int lfs2_dir_rawopen(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
     return 0;
 }
 
-static int lfs2_dir_rawclose(lfs2_t *lfs2, lfs2_dir_t *dir) {
+static int lfs2_dir_close_(lfs2_t *lfs2, lfs2_dir_t *dir) {
     // remove from list of mdirs
     lfs2_mlist_remove(lfs2, (struct lfs2_mlist *)dir);
 
     return 0;
 }
 
-static int lfs2_dir_rawread(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
+static int lfs2_dir_read_(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
     memset(info, 0, sizeof(*info));
 
     // special offset for '.' and '..'
@@ -2756,9 +2813,9 @@ static int lfs2_dir_rawread(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *inf
     return true;
 }
 
-static int lfs2_dir_rawseek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
+static int lfs2_dir_seek_(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
     // simply walk from head dir
-    int err = lfs2_dir_rawrewind(lfs2, dir);
+    int err = lfs2_dir_rewind_(lfs2, dir);
     if (err) {
         return err;
     }
@@ -2793,12 +2850,12 @@ static int lfs2_dir_rawseek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
     return 0;
 }
 
-static lfs2_soff_t lfs2_dir_rawtell(lfs2_t *lfs2, lfs2_dir_t *dir) {
+static lfs2_soff_t lfs2_dir_tell_(lfs2_t *lfs2, lfs2_dir_t *dir) {
     (void)lfs2;
     return dir->pos;
 }
 
-static int lfs2_dir_rawrewind(lfs2_t *lfs2, lfs2_dir_t *dir) {
+static int lfs2_dir_rewind_(lfs2_t *lfs2, lfs2_dir_t *dir) {
     // reload the head dir
     int err = lfs2_dir_fetch(lfs2, &dir->m, dir->head);
     if (err) {
@@ -3004,7 +3061,7 @@ static int lfs2_ctz_traverse(lfs2_t *lfs2,
 
 
 /// Top level file operations ///
-static int lfs2_file_rawopencfg(lfs2_t *lfs2, lfs2_file_t *file,
+static int lfs2_file_opencfg_(lfs2_t *lfs2, lfs2_file_t *file,
         const char *path, int flags,
         const struct lfs2_file_config *cfg) {
 #ifndef LFS2_READONLY
@@ -3029,7 +3086,7 @@ static int lfs2_file_rawopencfg(lfs2_t *lfs2, lfs2_file_t *file,
 
     // allocate entry for file if it doesn't exist
     lfs2_stag_t tag = lfs2_dir_find(lfs2, &file->m, &path, &file->id);
-    if (tag < 0 && !(tag == LFS2_ERR_NOENT && file->id != 0x3ff)) {
+    if (tag < 0 && !(tag == LFS2_ERR_NOENT && lfs2_path_islast(path))) {
         err = tag;
         goto cleanup;
     }
@@ -3049,8 +3106,14 @@ static int lfs2_file_rawopencfg(lfs2_t *lfs2, lfs2_file_t *file,
             goto cleanup;
         }
 
+        // don't allow trailing slashes
+        if (lfs2_path_isdir(path)) {
+            err = LFS2_ERR_NOTDIR;
+            goto cleanup;
+        }
+
         // check that name fits
-        lfs2_size_t nlen = strlen(path);
+        lfs2_size_t nlen = lfs2_path_namelen(path);
         if (nlen > lfs2->name_max) {
             err = LFS2_ERR_NAMETOOLONG;
             goto cleanup;
@@ -3166,22 +3229,22 @@ static int lfs2_file_rawopencfg(lfs2_t *lfs2, lfs2_file_t *file,
 #ifndef LFS2_READONLY
     file->flags |= LFS2_F_ERRED;
 #endif
-    lfs2_file_rawclose(lfs2, file);
+    lfs2_file_close_(lfs2, file);
     return err;
 }
 
 #ifndef LFS2_NO_MALLOC
-static int lfs2_file_rawopen(lfs2_t *lfs2, lfs2_file_t *file,
+static int lfs2_file_open_(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);
+    int err = lfs2_file_opencfg_(lfs2, file, path, flags, &defaults);
     return err;
 }
 #endif
 
-static int lfs2_file_rawclose(lfs2_t *lfs2, lfs2_file_t *file) {
+static int lfs2_file_close_(lfs2_t *lfs2, lfs2_file_t *file) {
 #ifndef LFS2_READONLY
-    int err = lfs2_file_rawsync(lfs2, file);
+    int err = lfs2_file_sync_(lfs2, file);
 #else
     int err = 0;
 #endif
@@ -3272,7 +3335,7 @@ static int lfs2_file_relocate(lfs2_t *lfs2, lfs2_file_t *file) {
 #ifndef LFS2_READONLY
 static int lfs2_file_outline(lfs2_t *lfs2, lfs2_file_t *file) {
     file->off = file->pos;
-    lfs2_alloc_ack(lfs2);
+    lfs2_alloc_ckpoint(lfs2);
     int err = lfs2_file_relocate(lfs2, file);
     if (err) {
         return err;
@@ -3364,7 +3427,7 @@ static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
 }
 
 #ifndef LFS2_READONLY
-static int lfs2_file_rawsync(lfs2_t *lfs2, lfs2_file_t *file) {
+static int lfs2_file_sync_(lfs2_t *lfs2, lfs2_file_t *file) {
     if (file->flags & LFS2_F_ERRED) {
         // it's not safe to do anything if our file errored
         return 0;
@@ -3379,6 +3442,15 @@ static int lfs2_file_rawsync(lfs2_t *lfs2, lfs2_file_t *file) {
 
     if ((file->flags & LFS2_F_DIRTY) &&
             !lfs2_pair_isnull(file->m.pair)) {
+        // before we commit metadata, we need sync the disk to make sure
+        // data writes don't complete after metadata writes
+        if (!(file->flags & LFS2_F_INLINE)) {
+            err = lfs2_bd_sync(lfs2, &lfs2->pcache, &lfs2->rcache, false);
+            if (err) {
+                return err;
+            }
+        }
+
         // update dir entry
         uint16_t type;
         const void *buffer;
@@ -3477,7 +3549,7 @@ static lfs2_ssize_t lfs2_file_flushedread(lfs2_t *lfs2, lfs2_file_t *file,
     return size;
 }
 
-static lfs2_ssize_t lfs2_file_rawread(lfs2_t *lfs2, lfs2_file_t *file,
+static lfs2_ssize_t lfs2_file_read_(lfs2_t *lfs2, lfs2_file_t *file,
         void *buffer, lfs2_size_t size) {
     LFS2_ASSERT((file->flags & LFS2_O_RDONLY) == LFS2_O_RDONLY);
 
@@ -3502,11 +3574,7 @@ static lfs2_ssize_t lfs2_file_flushedwrite(lfs2_t *lfs2, lfs2_file_t *file,
     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->metadata_max ?
-                    lfs2->cfg->metadata_max : lfs2->cfg->block_size) / 8))) {
+            lfs2_max(file->pos+nsize, file->ctz.size) > lfs2->inline_max) {
         // inline file doesn't fit anymore
         int err = lfs2_file_outline(lfs2, file);
         if (err) {
@@ -3535,7 +3603,7 @@ static lfs2_ssize_t lfs2_file_flushedwrite(lfs2_t *lfs2, lfs2_file_t *file,
                 }
 
                 // extend file with new blocks
-                lfs2_alloc_ack(lfs2);
+                lfs2_alloc_ckpoint(lfs2);
                 int err = lfs2_ctz_extend(lfs2, &file->cache, &lfs2->rcache,
                         file->block, file->pos,
                         &file->block, &file->off);
@@ -3578,13 +3646,13 @@ static lfs2_ssize_t lfs2_file_flushedwrite(lfs2_t *lfs2, lfs2_file_t *file,
         data += diff;
         nsize -= diff;
 
-        lfs2_alloc_ack(lfs2);
+        lfs2_alloc_ckpoint(lfs2);
     }
 
     return size;
 }
 
-static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
+static lfs2_ssize_t lfs2_file_write_(lfs2_t *lfs2, lfs2_file_t *file,
         const void *buffer, lfs2_size_t size) {
     LFS2_ASSERT((file->flags & LFS2_O_WRONLY) == LFS2_O_WRONLY);
 
@@ -3628,25 +3696,19 @@ static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
 }
 #endif
 
-static lfs2_soff_t lfs2_file_rawseek(lfs2_t *lfs2, lfs2_file_t *file,
+static lfs2_soff_t lfs2_file_seek_(lfs2_t *lfs2, lfs2_file_t *file,
         lfs2_soff_t off, int whence) {
     // find new pos
+    //
+    // fortunately for us, littlefs is limited to 31-bit file sizes, so we
+    // don't have to worry too much about integer overflow
     lfs2_off_t npos = file->pos;
     if (whence == LFS2_SEEK_SET) {
         npos = off;
     } else if (whence == LFS2_SEEK_CUR) {
-        if ((lfs2_soff_t)file->pos + off < 0) {
-            return LFS2_ERR_INVAL;
-        } else {
-            npos = file->pos + off;
-        }
+        npos = file->pos + (lfs2_off_t)off;
     } else if (whence == LFS2_SEEK_END) {
-        lfs2_soff_t res = lfs2_file_rawsize(lfs2, file) + off;
-        if (res < 0) {
-            return LFS2_ERR_INVAL;
-        } else {
-            npos = res;
-        }
+        npos = (lfs2_off_t)lfs2_file_size_(lfs2, file) + (lfs2_off_t)off;
     }
 
     if (npos > lfs2->file_max) {
@@ -3661,13 +3723,8 @@ static lfs2_soff_t lfs2_file_rawseek(lfs2_t *lfs2, lfs2_file_t *file,
 
     // 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
-            ) {
+    if ((file->flags & LFS2_F_READING)
+            && file->off != lfs2->cfg->block_size) {
         int oindex = lfs2_ctz_index(lfs2, &(lfs2_off_t){file->pos});
         lfs2_off_t noff = npos;
         int nindex = lfs2_ctz_index(lfs2, &noff);
@@ -3692,7 +3749,7 @@ static lfs2_soff_t lfs2_file_rawseek(lfs2_t *lfs2, lfs2_file_t *file,
 }
 
 #ifndef LFS2_READONLY
-static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
+static int lfs2_file_truncate_(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) {
@@ -3700,15 +3757,12 @@ static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t siz
     }
 
     lfs2_off_t pos = file->pos;
-    lfs2_off_t oldsize = lfs2_file_rawsize(lfs2, file);
+    lfs2_off_t oldsize = lfs2_file_size_(lfs2, file);
     if (size < oldsize) {
         // revert to inline file?
-        if (size <= lfs2_min(0x3fe, lfs2_min(
-                lfs2->cfg->cache_size,
-                (lfs2->cfg->metadata_max ?
-                    lfs2->cfg->metadata_max : lfs2->cfg->block_size) / 8))) {
+        if (size <= lfs2->inline_max) {
             // flush+seek to head
-            lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_SET);
+            lfs2_soff_t res = lfs2_file_seek_(lfs2, file, 0, LFS2_SEEK_SET);
             if (res < 0) {
                 return (int)res;
             }
@@ -3753,14 +3807,14 @@ static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t siz
         }
     } else if (size > oldsize) {
         // flush+seek if not already at end
-        lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_END);
+        lfs2_soff_t res = lfs2_file_seek_(lfs2, file, 0, LFS2_SEEK_END);
         if (res < 0) {
             return (int)res;
         }
 
         // fill with zeros
         while (file->pos < size) {
-            res = lfs2_file_rawwrite(lfs2, file, &(uint8_t){0}, 1);
+            res = lfs2_file_write_(lfs2, file, &(uint8_t){0}, 1);
             if (res < 0) {
                 return (int)res;
             }
@@ -3768,7 +3822,7 @@ static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t siz
     }
 
     // restore pos
-    lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, pos, LFS2_SEEK_SET);
+    lfs2_soff_t res = lfs2_file_seek_(lfs2, file, pos, LFS2_SEEK_SET);
     if (res < 0) {
       return (int)res;
     }
@@ -3777,13 +3831,13 @@ static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t siz
 }
 #endif
 
-static lfs2_soff_t lfs2_file_rawtell(lfs2_t *lfs2, lfs2_file_t *file) {
+static lfs2_soff_t lfs2_file_tell_(lfs2_t *lfs2, lfs2_file_t *file) {
     (void)lfs2;
     return file->pos;
 }
 
-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);
+static int lfs2_file_rewind_(lfs2_t *lfs2, lfs2_file_t *file) {
+    lfs2_soff_t res = lfs2_file_seek_(lfs2, file, 0, LFS2_SEEK_SET);
     if (res < 0) {
         return (int)res;
     }
@@ -3791,7 +3845,7 @@ static int lfs2_file_rawrewind(lfs2_t *lfs2, lfs2_file_t *file) {
     return 0;
 }
 
-static lfs2_soff_t lfs2_file_rawsize(lfs2_t *lfs2, lfs2_file_t *file) {
+static lfs2_soff_t lfs2_file_size_(lfs2_t *lfs2, lfs2_file_t *file) {
     (void)lfs2;
 
 #ifndef LFS2_READONLY
@@ -3805,18 +3859,24 @@ static lfs2_soff_t lfs2_file_rawsize(lfs2_t *lfs2, lfs2_file_t *file) {
 
 
 /// General fs operations ///
-static int lfs2_rawstat(lfs2_t *lfs2, const char *path, struct lfs2_info *info) {
+static int lfs2_stat_(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) {
         return (int)tag;
     }
 
+    // only allow trailing slashes on dirs
+    if (strchr(path, '/') != NULL
+            && lfs2_tag_type3(tag) != LFS2_TYPE_DIR) {
+        return LFS2_ERR_NOTDIR;
+    }
+
     return lfs2_dir_getinfo(lfs2, &cwd, lfs2_tag_id(tag), info);
 }
 
 #ifndef LFS2_READONLY
-static int lfs2_rawremove(lfs2_t *lfs2, const char *path) {
+static int lfs2_remove_(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) {
@@ -3895,7 +3955,7 @@ static int lfs2_rawremove(lfs2_t *lfs2, const char *path) {
 #endif
 
 #ifndef LFS2_READONLY
-static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
+static int lfs2_rename_(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) {
@@ -3914,7 +3974,7 @@ static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath
     uint16_t newid;
     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)) {
+            !(prevtag == LFS2_ERR_NOENT && lfs2_path_islast(newpath))) {
         return (prevtag < 0) ? (int)prevtag : LFS2_ERR_INVAL;
     }
 
@@ -3925,8 +3985,14 @@ static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath
     struct lfs2_mlist prevdir;
     prevdir.next = lfs2->mlist;
     if (prevtag == LFS2_ERR_NOENT) {
+        // if we're a file, don't allow trailing slashes
+        if (lfs2_path_isdir(newpath)
+                && lfs2_tag_type3(oldtag) != LFS2_TYPE_DIR) {
+            return LFS2_ERR_NOTDIR;
+        }
+
         // check that name fits
-        lfs2_size_t nlen = strlen(newpath);
+        lfs2_size_t nlen = lfs2_path_namelen(newpath);
         if (nlen > lfs2->name_max) {
             return LFS2_ERR_NAMETOOLONG;
         }
@@ -3938,7 +4004,9 @@ static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath
             newoldid += 1;
         }
     } else if (lfs2_tag_type3(prevtag) != lfs2_tag_type3(oldtag)) {
-        return LFS2_ERR_ISDIR;
+        return (lfs2_tag_type3(prevtag) == LFS2_TYPE_DIR)
+                ? LFS2_ERR_ISDIR
+                : LFS2_ERR_NOTDIR;
     } else if (samepair && newid == newoldid) {
         // we're renaming to ourselves??
         return 0;
@@ -3984,7 +4052,8 @@ static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath
             {LFS2_MKTAG_IF(prevtag != LFS2_ERR_NOENT,
                 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_tag_type3(oldtag),
+                newid, lfs2_path_namelen(newpath)), newpath},
             {LFS2_MKTAG(LFS2_FROM_MOVE, newid, lfs2_tag_id(oldtag)), &oldcwd},
             {LFS2_MKTAG_IF(samepair,
                 LFS2_TYPE_DELETE, newoldid, 0), NULL}));
@@ -4030,7 +4099,7 @@ static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath
 }
 #endif
 
-static lfs2_ssize_t lfs2_rawgetattr(lfs2_t *lfs2, const char *path,
+static lfs2_ssize_t lfs2_getattr_(lfs2_t *lfs2, const char *path,
         uint8_t type, void *buffer, lfs2_size_t size) {
     lfs2_mdir_t cwd;
     lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL);
@@ -4088,7 +4157,7 @@ static int lfs2_commitattr(lfs2_t *lfs2, const char *path,
 #endif
 
 #ifndef LFS2_READONLY
-static int lfs2_rawsetattr(lfs2_t *lfs2, const char *path,
+static int lfs2_setattr_(lfs2_t *lfs2, const char *path,
         uint8_t type, const void *buffer, lfs2_size_t size) {
     if (size > lfs2->attr_max) {
         return LFS2_ERR_NOSPC;
@@ -4099,13 +4168,28 @@ static int lfs2_rawsetattr(lfs2_t *lfs2, const char *path,
 #endif
 
 #ifndef LFS2_READONLY
-static int lfs2_rawremoveattr(lfs2_t *lfs2, const char *path, uint8_t type) {
+static int lfs2_removeattr_(lfs2_t *lfs2, const char *path, uint8_t type) {
     return lfs2_commitattr(lfs2, path, type, NULL, 0x3ff);
 }
 #endif
 
 
 /// Filesystem operations ///
+
+// compile time checks, see lfs2.h for why these limits exist
+#if LFS2_NAME_MAX > 1022
+#error "Invalid LFS2_NAME_MAX, must be <= 1022"
+#endif
+
+#if LFS2_FILE_MAX > 2147483647
+#error "Invalid LFS2_FILE_MAX, must be <= 2147483647"
+#endif
+
+#if LFS2_ATTR_MAX > 1022
+#error "Invalid LFS2_ATTR_MAX, must be <= 1022"
+#endif
+
+// common filesystem initialization
 static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     lfs2->cfg = cfg;
     lfs2->block_count = cfg->block_count;  // May be 0
@@ -4126,6 +4210,14 @@ static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     // which littlefs currently does not support
     LFS2_ASSERT((bool)0x80000000);
 
+    // check that the required io functions are provided
+    LFS2_ASSERT(lfs2->cfg->read != NULL);
+#ifndef LFS2_READONLY
+    LFS2_ASSERT(lfs2->cfg->prog != NULL);
+    LFS2_ASSERT(lfs2->cfg->erase != NULL);
+    LFS2_ASSERT(lfs2->cfg->sync != NULL);
+#endif
+
     // validate that the lfs2-cfg sizes were initiated properly before
     // performing any arithmetic logics with them
     LFS2_ASSERT(lfs2->cfg->read_size != 0);
@@ -4153,6 +4245,23 @@ static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     // wear-leveling.
     LFS2_ASSERT(lfs2->cfg->block_cycles != 0);
 
+    // check that compact_thresh makes sense
+    //
+    // metadata can't be compacted below block_size/2, and metadata can't
+    // exceed a block_size
+    LFS2_ASSERT(lfs2->cfg->compact_thresh == 0
+            || lfs2->cfg->compact_thresh >= lfs2->cfg->block_size/2);
+    LFS2_ASSERT(lfs2->cfg->compact_thresh == (lfs2_size_t)-1
+            || lfs2->cfg->compact_thresh <= lfs2->cfg->block_size);
+
+    // check that metadata_max is a multiple of read_size and prog_size,
+    // and a factor of the block_size
+    LFS2_ASSERT(!lfs2->cfg->metadata_max
+            || lfs2->cfg->metadata_max % lfs2->cfg->read_size == 0);
+    LFS2_ASSERT(!lfs2->cfg->metadata_max
+            || lfs2->cfg->metadata_max % lfs2->cfg->prog_size == 0);
+    LFS2_ASSERT(!lfs2->cfg->metadata_max
+            || lfs2->cfg->block_size % lfs2->cfg->metadata_max == 0);
 
     // setup read cache
     if (lfs2->cfg->read_buffer) {
@@ -4180,15 +4289,14 @@ static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     lfs2_cache_zero(lfs2, &lfs2->rcache);
     lfs2_cache_zero(lfs2, &lfs2->pcache);
 
-    // setup lookahead, must be multiple of 64-bits, 32-bit aligned
+    // setup lookahead buffer, note mount finishes initializing this after
+    // we establish a decent pseudo-random seed
     LFS2_ASSERT(lfs2->cfg->lookahead_size > 0);
-    LFS2_ASSERT(lfs2->cfg->lookahead_size % 8 == 0 &&
-            (uintptr_t)lfs2->cfg->lookahead_buffer % 4 == 0);
     if (lfs2->cfg->lookahead_buffer) {
-        lfs2->free.buffer = lfs2->cfg->lookahead_buffer;
+        lfs2->lookahead.buffer = lfs2->cfg->lookahead_buffer;
     } else {
-        lfs2->free.buffer = lfs2_malloc(lfs2->cfg->lookahead_size);
-        if (!lfs2->free.buffer) {
+        lfs2->lookahead.buffer = lfs2_malloc(lfs2->cfg->lookahead_size);
+        if (!lfs2->lookahead.buffer) {
             err = LFS2_ERR_NOMEM;
             goto cleanup;
         }
@@ -4215,6 +4323,27 @@ static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
     LFS2_ASSERT(lfs2->cfg->metadata_max <= lfs2->cfg->block_size);
 
+    LFS2_ASSERT(lfs2->cfg->inline_max == (lfs2_size_t)-1
+            || lfs2->cfg->inline_max <= lfs2->cfg->cache_size);
+    LFS2_ASSERT(lfs2->cfg->inline_max == (lfs2_size_t)-1
+            || lfs2->cfg->inline_max <= lfs2->attr_max);
+    LFS2_ASSERT(lfs2->cfg->inline_max == (lfs2_size_t)-1
+            || lfs2->cfg->inline_max <= ((lfs2->cfg->metadata_max)
+                ? lfs2->cfg->metadata_max
+                : lfs2->cfg->block_size)/8);
+    lfs2->inline_max = lfs2->cfg->inline_max;
+    if (lfs2->inline_max == (lfs2_size_t)-1) {
+        lfs2->inline_max = 0;
+    } else if (lfs2->inline_max == 0) {
+        lfs2->inline_max = lfs2_min(
+                lfs2->cfg->cache_size,
+                lfs2_min(
+                    lfs2->attr_max,
+                    ((lfs2->cfg->metadata_max)
+                        ? lfs2->cfg->metadata_max
+                        : lfs2->cfg->block_size)/8));
+    }
+
     // setup default state
     lfs2->root[0] = LFS2_BLOCK_NULL;
     lfs2->root[1] = LFS2_BLOCK_NULL;
@@ -4245,7 +4374,7 @@ static int lfs2_deinit(lfs2_t *lfs2) {
     }
 
     if (!lfs2->cfg->lookahead_buffer) {
-        lfs2_free(lfs2->free.buffer);
+        lfs2_free(lfs2->lookahead.buffer);
     }
 
     return 0;
@@ -4254,7 +4383,7 @@ static int lfs2_deinit(lfs2_t *lfs2) {
 
 
 #ifndef LFS2_READONLY
-static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
+static int lfs2_format_(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     int err = 0;
     {
         err = lfs2_init(lfs2, cfg);
@@ -4265,12 +4394,12 @@ static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
         LFS2_ASSERT(cfg->block_count != 0);
 
         // create free lookahead
-        memset(lfs2->free.buffer, 0, lfs2->cfg->lookahead_size);
-        lfs2->free.off = 0;
-        lfs2->free.size = lfs2_min(8*lfs2->cfg->lookahead_size,
+        memset(lfs2->lookahead.buffer, 0, lfs2->cfg->lookahead_size);
+        lfs2->lookahead.start = 0;
+        lfs2->lookahead.size = lfs2_min(8*lfs2->cfg->lookahead_size,
                 lfs2->block_count);
-        lfs2->free.i = 0;
-        lfs2_alloc_ack(lfs2);
+        lfs2->lookahead.next = 0;
+        lfs2_alloc_ckpoint(lfs2);
 
         // create root dir
         lfs2_mdir_t root;
@@ -4321,7 +4450,31 @@ static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 }
 #endif
 
-static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
+struct lfs2_tortoise_t {
+    lfs2_block_t pair[2];
+    lfs2_size_t i;
+    lfs2_size_t period;
+};
+
+static int lfs2_tortoise_detectcycles(
+    const lfs2_mdir_t *dir, struct lfs2_tortoise_t *tortoise) {
+    // detect cycles with Brent's algorithm
+    if (lfs2_pair_issync(dir->tail, tortoise->pair)) {
+        LFS2_WARN("Cycle detected in tail list");
+        return LFS2_ERR_CORRUPT;
+    }
+    if (tortoise->i == tortoise->period) {
+        tortoise->pair[0] = dir->tail[0];
+        tortoise->pair[1] = dir->tail[1];
+        tortoise->i = 0;
+        tortoise->period *= 2;
+    }
+    tortoise->i += 1;
+
+    return LFS2_ERR_OK;
+}
+
+static int lfs2_mount_(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     int err = lfs2_init(lfs2, cfg);
     if (err) {
         return err;
@@ -4329,23 +4482,16 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
     // scan directory blocks for superblock and any global updates
     lfs2_mdir_t dir = {.tail = {0, 1}};
-    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
-    lfs2_size_t tortoise_i = 1;
-    lfs2_size_t tortoise_period = 1;
+    struct lfs2_tortoise_t tortoise = {
+        .pair = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL},
+        .i = 1,
+        .period = 1,
+    };
     while (!lfs2_pair_isnull(dir.tail)) {
-        // detect cycles with Brent's algorithm
-        if (lfs2_pair_issync(dir.tail, tortoise)) {
-            LFS2_WARN("Cycle detected in tail list");
-            err = LFS2_ERR_CORRUPT;
+        err = lfs2_tortoise_detectcycles(&dir, &tortoise);
+        if (err < 0) {
             goto cleanup;
         }
-        if (tortoise_i == tortoise_period) {
-            tortoise[0] = dir.tail[0];
-            tortoise[1] = dir.tail[1];
-            tortoise_i = 0;
-            tortoise_period *= 2;
-        }
-        tortoise_i += 1;
 
         // fetch next block in tail list
         lfs2_stag_t tag = lfs2_dir_fetchmatch(lfs2, &dir, dir.tail,
@@ -4394,6 +4540,7 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
             // found older minor version? set an in-device only bit in the
             // gstate so we know we need to rewrite the superblock before
             // the first write
+            bool needssuperblock = false;
             if (minor_version < lfs2_fs_disk_version_minor(lfs2)) {
                 LFS2_DEBUG("Found older minor version "
                         "v%"PRIu16".%"PRIu16" < v%"PRIu16".%"PRIu16,
@@ -4401,10 +4548,11 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
                         minor_version,
                         lfs2_fs_disk_version_major(lfs2),
                         lfs2_fs_disk_version_minor(lfs2));
-                // note this bit is reserved on disk, so fetching more gstate
-                // will not interfere here
-                lfs2_fs_prepsuperblock(lfs2, true);
+                needssuperblock = true;
             }
+            // note this bit is reserved on disk, so fetching more gstate
+            // will not interfere here
+            lfs2_fs_prepsuperblock(lfs2, needssuperblock);
 
             // check superblock configuration
             if (superblock.name_max) {
@@ -4438,6 +4586,9 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
                 }
 
                 lfs2->attr_max = superblock.attr_max;
+
+                // we also need to update inline_max in case attr_max changed
+                lfs2->inline_max = lfs2_min(lfs2->inline_max, lfs2->attr_max);
             }
 
             // this is where we get the block_count from disk if block_count=0
@@ -4478,23 +4629,23 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
     // setup free lookahead, to distribute allocations uniformly across
     // boots, we start the allocator at a random location
-    lfs2->free.off = lfs2->seed % lfs2->block_count;
+    lfs2->lookahead.start = lfs2->seed % lfs2->block_count;
     lfs2_alloc_drop(lfs2);
 
     return 0;
 
 cleanup:
-    lfs2_rawunmount(lfs2);
+    lfs2_unmount_(lfs2);
     return err;
 }
 
-static int lfs2_rawunmount(lfs2_t *lfs2) {
+static int lfs2_unmount_(lfs2_t *lfs2) {
     return lfs2_deinit(lfs2);
 }
 
 
 /// Filesystem filesystem operations ///
-static int lfs2_fs_rawstat(lfs2_t *lfs2, struct lfs2_fsinfo *fsinfo) {
+static int lfs2_fs_stat_(lfs2_t *lfs2, struct lfs2_fsinfo *fsinfo) {
     // if the superblock is up-to-date, we must be on the most recent
     // minor version of littlefs
     if (!lfs2_gstate_needssuperblock(&lfs2->gstate)) {
@@ -4534,7 +4685,7 @@ static int lfs2_fs_rawstat(lfs2_t *lfs2, struct lfs2_fsinfo *fsinfo) {
     return 0;
 }
 
-int lfs2_fs_rawtraverse(lfs2_t *lfs2,
+int lfs2_fs_traverse_(lfs2_t *lfs2,
         int (*cb)(void *data, lfs2_block_t block), void *data,
         bool includeorphans) {
     // iterate over metadata pairs
@@ -4553,22 +4704,17 @@ int lfs2_fs_rawtraverse(lfs2_t *lfs2,
     }
 #endif
 
-    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
-    lfs2_size_t tortoise_i = 1;
-    lfs2_size_t tortoise_period = 1;
+    struct lfs2_tortoise_t tortoise = {
+        .pair = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL},
+        .i = 1,
+        .period = 1,
+    };
+    int err = LFS2_ERR_OK;
     while (!lfs2_pair_isnull(dir.tail)) {
-        // detect cycles with Brent's algorithm
-        if (lfs2_pair_issync(dir.tail, tortoise)) {
-            LFS2_WARN("Cycle detected in tail list");
+        err = lfs2_tortoise_detectcycles(&dir, &tortoise);
+        if (err < 0) {
             return LFS2_ERR_CORRUPT;
         }
-        if (tortoise_i == tortoise_period) {
-            tortoise[0] = dir.tail[0];
-            tortoise[1] = dir.tail[1];
-            tortoise_i = 0;
-            tortoise_period *= 2;
-        }
-        tortoise_i += 1;
 
         for (int i = 0; i < 2; i++) {
             int err = cb(data, dir.tail[i]);
@@ -4647,22 +4793,17 @@ static int lfs2_fs_pred(lfs2_t *lfs2,
     // iterate over all directory directory entries
     pdir->tail[0] = 0;
     pdir->tail[1] = 1;
-    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
-    lfs2_size_t tortoise_i = 1;
-    lfs2_size_t tortoise_period = 1;
+    struct lfs2_tortoise_t tortoise = {
+        .pair = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL},
+        .i = 1,
+        .period = 1,
+    };
+    int err = LFS2_ERR_OK;
     while (!lfs2_pair_isnull(pdir->tail)) {
-        // detect cycles with Brent's algorithm
-        if (lfs2_pair_issync(pdir->tail, tortoise)) {
-            LFS2_WARN("Cycle detected in tail list");
+        err = lfs2_tortoise_detectcycles(pdir, &tortoise);
+        if (err < 0) {
             return LFS2_ERR_CORRUPT;
         }
-        if (tortoise_i == tortoise_period) {
-            tortoise[0] = pdir->tail[0];
-            tortoise[1] = pdir->tail[1];
-            tortoise_i = 0;
-            tortoise_period *= 2;
-        }
-        tortoise_i += 1;
 
         if (lfs2_pair_cmp(pdir->tail, pair) == 0) {
             return 0;
@@ -4712,22 +4853,17 @@ static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t pair[2],
     // use fetchmatch with callback to find pairs
     parent->tail[0] = 0;
     parent->tail[1] = 1;
-    lfs2_block_t tortoise[2] = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL};
-    lfs2_size_t tortoise_i = 1;
-    lfs2_size_t tortoise_period = 1;
+    struct lfs2_tortoise_t tortoise = {
+        .pair = {LFS2_BLOCK_NULL, LFS2_BLOCK_NULL},
+        .i = 1,
+        .period = 1,
+    };
+    int err = LFS2_ERR_OK;
     while (!lfs2_pair_isnull(parent->tail)) {
-        // detect cycles with Brent's algorithm
-        if (lfs2_pair_issync(parent->tail, tortoise)) {
-            LFS2_WARN("Cycle detected in tail list");
-            return LFS2_ERR_CORRUPT;
-        }
-        if (tortoise_i == tortoise_period) {
-            tortoise[0] = parent->tail[0];
-            tortoise[1] = parent->tail[1];
-            tortoise_i = 0;
-            tortoise_period *= 2;
+        err = lfs2_tortoise_detectcycles(parent, &tortoise);
+        if (err < 0) {
+            return err;
         }
-        tortoise_i += 1;
 
         lfs2_stag_t tag = lfs2_dir_fetchmatch(lfs2, parent, parent->tail,
                 LFS2_MKTAG(0x7ff, 0, 0x3ff),
@@ -4999,7 +5135,7 @@ static int lfs2_fs_forceconsistency(lfs2_t *lfs2) {
 #endif
 
 #ifndef LFS2_READONLY
-static int lfs2_fs_rawmkconsistent(lfs2_t *lfs2) {
+static int lfs2_fs_mkconsistent_(lfs2_t *lfs2) {
     // lfs2_fs_forceconsistency does most of the work here
     int err = lfs2_fs_forceconsistency(lfs2);
     if (err) {
@@ -5035,9 +5171,9 @@ static int lfs2_fs_size_count(void *p, lfs2_block_t block) {
     return 0;
 }
 
-static lfs2_ssize_t lfs2_fs_rawsize(lfs2_t *lfs2) {
+static lfs2_ssize_t lfs2_fs_size_(lfs2_t *lfs2) {
     lfs2_size_t size = 0;
-    int err = lfs2_fs_rawtraverse(lfs2, lfs2_fs_size_count, &size, false);
+    int err = lfs2_fs_traverse_(lfs2, lfs2_fs_size_count, &size, false);
     if (err) {
         return err;
     }
@@ -5045,8 +5181,59 @@ static lfs2_ssize_t lfs2_fs_rawsize(lfs2_t *lfs2) {
     return size;
 }
 
+// explicit garbage collection
 #ifndef LFS2_READONLY
-static int lfs2_fs_rawgrow(lfs2_t *lfs2, lfs2_size_t block_count) {
+static int lfs2_fs_gc_(lfs2_t *lfs2) {
+    // force consistency, even if we're not necessarily going to write,
+    // because this function is supposed to take care of janitorial work
+    // isn't it?
+    int err = lfs2_fs_forceconsistency(lfs2);
+    if (err) {
+        return err;
+    }
+
+    // try to compact metadata pairs, note we can't really accomplish
+    // anything if compact_thresh doesn't at least leave a prog_size
+    // available
+    if (lfs2->cfg->compact_thresh
+            < lfs2->cfg->block_size - lfs2->cfg->prog_size) {
+        // iterate over all mdirs
+        lfs2_mdir_t mdir = {.tail = {0, 1}};
+        while (!lfs2_pair_isnull(mdir.tail)) {
+            err = lfs2_dir_fetch(lfs2, &mdir, mdir.tail);
+            if (err) {
+                return err;
+            }
+
+            // not erased? exceeds our compaction threshold?
+            if (!mdir.erased || ((lfs2->cfg->compact_thresh == 0)
+                    ? mdir.off > lfs2->cfg->block_size - lfs2->cfg->block_size/8
+                    : mdir.off > lfs2->cfg->compact_thresh)) {
+                // the easiest way to trigger a compaction is to mark
+                // the mdir as unerased and add an empty commit
+                mdir.erased = false;
+                err = lfs2_dir_commit(lfs2, &mdir, NULL, 0);
+                if (err) {
+                    return err;
+                }
+            }
+        }
+    }
+
+    // try to populate the lookahead buffer, unless it's already full
+    if (lfs2->lookahead.size < 8*lfs2->cfg->lookahead_size) {
+        err = lfs2_alloc_scan(lfs2);
+        if (err) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+#endif
+
+#ifndef LFS2_READONLY
+static int lfs2_fs_grow_(lfs2_t *lfs2, lfs2_size_t block_count) {
     // shrinking is not supported
     LFS2_ASSERT(block_count >= lfs2->block_count);
 
@@ -5451,10 +5638,10 @@ static int lfs21_mount(lfs2_t *lfs2, struct lfs21 *lfs21,
         lfs2->lfs21->root[1] = LFS2_BLOCK_NULL;
 
         // setup free lookahead
-        lfs2->free.off = 0;
-        lfs2->free.size = 0;
-        lfs2->free.i = 0;
-        lfs2_alloc_ack(lfs2);
+        lfs2->lookahead.start = 0;
+        lfs2->lookahead.size = 0;
+        lfs2->lookahead.next = 0;
+        lfs2_alloc_ckpoint(lfs2);
 
         // load superblock
         lfs21_dir_t dir;
@@ -5505,7 +5692,7 @@ static int lfs21_unmount(lfs2_t *lfs2) {
 }
 
 /// v1 migration ///
-static int lfs2_rawmigrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
+static int lfs2_migrate_(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     struct lfs21 lfs21;
 
     // Indeterminate filesystem size not allowed for migration.
@@ -5759,7 +5946,7 @@ int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *cfg) {
                 ".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", "
+                ".block_cycles=%"PRId32", .cache_size=%"PRIu32", "
                 ".lookahead_size=%"PRIu32", .read_buffer=%p, "
                 ".prog_buffer=%p, .lookahead_buffer=%p, "
                 ".name_max=%"PRIu32", .file_max=%"PRIu32", "
@@ -5772,7 +5959,7 @@ int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *cfg) {
             cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
             cfg->name_max, cfg->file_max, cfg->attr_max);
 
-    err = lfs2_rawformat(lfs2, cfg);
+    err = lfs2_format_(lfs2, cfg);
 
     LFS2_TRACE("lfs2_format -> %d", err);
     LFS2_UNLOCK(cfg);
@@ -5789,7 +5976,7 @@ int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
                 ".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", "
+                ".block_cycles=%"PRId32", .cache_size=%"PRIu32", "
                 ".lookahead_size=%"PRIu32", .read_buffer=%p, "
                 ".prog_buffer=%p, .lookahead_buffer=%p, "
                 ".name_max=%"PRIu32", .file_max=%"PRIu32", "
@@ -5802,7 +5989,7 @@ int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
             cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
             cfg->name_max, cfg->file_max, cfg->attr_max);
 
-    err = lfs2_rawmount(lfs2, cfg);
+    err = lfs2_mount_(lfs2, cfg);
 
     LFS2_TRACE("lfs2_mount -> %d", err);
     LFS2_UNLOCK(cfg);
@@ -5816,7 +6003,7 @@ int lfs2_unmount(lfs2_t *lfs2) {
     }
     LFS2_TRACE("lfs2_unmount(%p)", (void*)lfs2);
 
-    err = lfs2_rawunmount(lfs2);
+    err = lfs2_unmount_(lfs2);
 
     LFS2_TRACE("lfs2_unmount -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5831,7 +6018,7 @@ int lfs2_remove(lfs2_t *lfs2, const char *path) {
     }
     LFS2_TRACE("lfs2_remove(%p, \"%s\")", (void*)lfs2, path);
 
-    err = lfs2_rawremove(lfs2, path);
+    err = lfs2_remove_(lfs2, path);
 
     LFS2_TRACE("lfs2_remove -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5847,7 +6034,7 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
     }
     LFS2_TRACE("lfs2_rename(%p, \"%s\", \"%s\")", (void*)lfs2, oldpath, newpath);
 
-    err = lfs2_rawrename(lfs2, oldpath, newpath);
+    err = lfs2_rename_(lfs2, oldpath, newpath);
 
     LFS2_TRACE("lfs2_rename -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5862,7 +6049,7 @@ 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);
 
-    err = lfs2_rawstat(lfs2, path, info);
+    err = lfs2_stat_(lfs2, path, info);
 
     LFS2_TRACE("lfs2_stat -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5878,7 +6065,7 @@ lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
     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_ssize_t res = lfs2_getattr_(lfs2, path, type, buffer, size);
 
     LFS2_TRACE("lfs2_getattr -> %"PRId32, res);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5895,7 +6082,7 @@ int lfs2_setattr(lfs2_t *lfs2, const char *path,
     LFS2_TRACE("lfs2_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")",
             (void*)lfs2, path, type, buffer, size);
 
-    err = lfs2_rawsetattr(lfs2, path, type, buffer, size);
+    err = lfs2_setattr_(lfs2, path, type, buffer, size);
 
     LFS2_TRACE("lfs2_setattr -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5911,7 +6098,7 @@ int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type) {
     }
     LFS2_TRACE("lfs2_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs2, path, type);
 
-    err = lfs2_rawremoveattr(lfs2, path, type);
+    err = lfs2_removeattr_(lfs2, path, type);
 
     LFS2_TRACE("lfs2_removeattr -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5926,10 +6113,10 @@ int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file, const char *path, int flags)
         return err;
     }
     LFS2_TRACE("lfs2_file_open(%p, %p, \"%s\", %x)",
-            (void*)lfs2, (void*)file, path, flags);
+            (void*)lfs2, (void*)file, path, (unsigned)flags);
     LFS2_ASSERT(!lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
 
-    err = lfs2_file_rawopen(lfs2, file, path, flags);
+    err = lfs2_file_open_(lfs2, file, path, flags);
 
     LFS2_TRACE("lfs2_file_open -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5946,11 +6133,11 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
     }
     LFS2_TRACE("lfs2_file_opencfg(%p, %p, \"%s\", %x, %p {"
                  ".buffer=%p, .attrs=%p, .attr_count=%"PRIu32"})",
-            (void*)lfs2, (void*)file, path, flags,
+            (void*)lfs2, (void*)file, path, (unsigned)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);
+    err = lfs2_file_opencfg_(lfs2, file, path, flags, cfg);
 
     LFS2_TRACE("lfs2_file_opencfg -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5965,7 +6152,7 @@ int lfs2_file_close(lfs2_t *lfs2, lfs2_file_t *file) {
     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);
+    err = lfs2_file_close_(lfs2, file);
 
     LFS2_TRACE("lfs2_file_close -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5981,7 +6168,7 @@ int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file) {
     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);
+    err = lfs2_file_sync_(lfs2, file);
 
     LFS2_TRACE("lfs2_file_sync -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -5999,7 +6186,7 @@ lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
             (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_ssize_t res = lfs2_file_read_(lfs2, file, buffer, size);
 
     LFS2_TRACE("lfs2_file_read -> %"PRId32, res);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6017,7 +6204,7 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
             (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_ssize_t res = lfs2_file_write_(lfs2, file, buffer, size);
 
     LFS2_TRACE("lfs2_file_write -> %"PRId32, res);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6035,7 +6222,7 @@ lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
             (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_soff_t res = lfs2_file_seek_(lfs2, file, off, whence);
 
     LFS2_TRACE("lfs2_file_seek -> %"PRId32, res);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6052,7 +6239,7 @@ int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
             (void*)lfs2, (void*)file, size);
     LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
 
-    err = lfs2_file_rawtruncate(lfs2, file, size);
+    err = lfs2_file_truncate_(lfs2, file, size);
 
     LFS2_TRACE("lfs2_file_truncate -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6068,7 +6255,7 @@ 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(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
 
-    lfs2_soff_t res = lfs2_file_rawtell(lfs2, file);
+    lfs2_soff_t res = lfs2_file_tell_(lfs2, file);
 
     LFS2_TRACE("lfs2_file_tell -> %"PRId32, res);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6082,7 +6269,7 @@ int lfs2_file_rewind(lfs2_t *lfs2, lfs2_file_t *file) {
     }
     LFS2_TRACE("lfs2_file_rewind(%p, %p)", (void*)lfs2, (void*)file);
 
-    err = lfs2_file_rawrewind(lfs2, file);
+    err = lfs2_file_rewind_(lfs2, file);
 
     LFS2_TRACE("lfs2_file_rewind -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6097,9 +6284,9 @@ 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(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
 
-    lfs2_soff_t res = lfs2_file_rawsize(lfs2, file);
+    lfs2_soff_t res = lfs2_file_size_(lfs2, file);
 
-    LFS2_TRACE("lfs2_file_size -> %"PRId32, res);
+    LFS2_TRACE("lfs2_file_size -> %"PRIu32, res);
     LFS2_UNLOCK(lfs2->cfg);
     return res;
 }
@@ -6112,7 +6299,7 @@ int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
     }
     LFS2_TRACE("lfs2_mkdir(%p, \"%s\")", (void*)lfs2, path);
 
-    err = lfs2_rawmkdir(lfs2, path);
+    err = lfs2_mkdir_(lfs2, path);
 
     LFS2_TRACE("lfs2_mkdir -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6128,7 +6315,7 @@ 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);
     LFS2_ASSERT(!lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)dir));
 
-    err = lfs2_dir_rawopen(lfs2, dir, path);
+    err = lfs2_dir_open_(lfs2, dir, path);
 
     LFS2_TRACE("lfs2_dir_open -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6142,7 +6329,7 @@ int lfs2_dir_close(lfs2_t *lfs2, lfs2_dir_t *dir) {
     }
     LFS2_TRACE("lfs2_dir_close(%p, %p)", (void*)lfs2, (void*)dir);
 
-    err = lfs2_dir_rawclose(lfs2, dir);
+    err = lfs2_dir_close_(lfs2, dir);
 
     LFS2_TRACE("lfs2_dir_close -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6157,7 +6344,7 @@ 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);
 
-    err = lfs2_dir_rawread(lfs2, dir, info);
+    err = lfs2_dir_read_(lfs2, dir, info);
 
     LFS2_TRACE("lfs2_dir_read -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6172,7 +6359,7 @@ 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);
 
-    err = lfs2_dir_rawseek(lfs2, dir, off);
+    err = lfs2_dir_seek_(lfs2, dir, off);
 
     LFS2_TRACE("lfs2_dir_seek -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6186,7 +6373,7 @@ lfs2_soff_t lfs2_dir_tell(lfs2_t *lfs2, lfs2_dir_t *dir) {
     }
     LFS2_TRACE("lfs2_dir_tell(%p, %p)", (void*)lfs2, (void*)dir);
 
-    lfs2_soff_t res = lfs2_dir_rawtell(lfs2, dir);
+    lfs2_soff_t res = lfs2_dir_tell_(lfs2, dir);
 
     LFS2_TRACE("lfs2_dir_tell -> %"PRId32, res);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6200,7 +6387,7 @@ int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir) {
     }
     LFS2_TRACE("lfs2_dir_rewind(%p, %p)", (void*)lfs2, (void*)dir);
 
-    err = lfs2_dir_rawrewind(lfs2, dir);
+    err = lfs2_dir_rewind_(lfs2, dir);
 
     LFS2_TRACE("lfs2_dir_rewind -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6214,7 +6401,7 @@ int lfs2_fs_stat(lfs2_t *lfs2, struct lfs2_fsinfo *fsinfo) {
     }
     LFS2_TRACE("lfs2_fs_stat(%p, %p)", (void*)lfs2, (void*)fsinfo);
 
-    err = lfs2_fs_rawstat(lfs2, fsinfo);
+    err = lfs2_fs_stat_(lfs2, fsinfo);
 
     LFS2_TRACE("lfs2_fs_stat -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6228,7 +6415,7 @@ lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2) {
     }
     LFS2_TRACE("lfs2_fs_size(%p)", (void*)lfs2);
 
-    lfs2_ssize_t res = lfs2_fs_rawsize(lfs2);
+    lfs2_ssize_t res = lfs2_fs_size_(lfs2);
 
     LFS2_TRACE("lfs2_fs_size -> %"PRId32, res);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6243,7 +6430,7 @@ int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void *, lfs2_block_t), void *data)
     LFS2_TRACE("lfs2_fs_traverse(%p, %p, %p)",
             (void*)lfs2, (void*)(uintptr_t)cb, data);
 
-    err = lfs2_fs_rawtraverse(lfs2, cb, data, true);
+    err = lfs2_fs_traverse_(lfs2, cb, data, true);
 
     LFS2_TRACE("lfs2_fs_traverse -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6251,32 +6438,32 @@ int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void *, lfs2_block_t), void *data)
 }
 
 #ifndef LFS2_READONLY
-int lfs2_fs_gc(lfs2_t *lfs2) {
+int lfs2_fs_mkconsistent(lfs2_t *lfs2) {
     int err = LFS2_LOCK(lfs2->cfg);
     if (err) {
         return err;
     }
-    LFS2_TRACE("lfs2_fs_gc(%p)", (void*)lfs2);
+    LFS2_TRACE("lfs2_fs_mkconsistent(%p)", (void*)lfs2);
 
-    err = lfs2_fs_rawgc(lfs2);
+    err = lfs2_fs_mkconsistent_(lfs2);
 
-    LFS2_TRACE("lfs2_fs_gc -> %d", err);
+    LFS2_TRACE("lfs2_fs_mkconsistent -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
     return err;
 }
 #endif
 
 #ifndef LFS2_READONLY
-int lfs2_fs_mkconsistent(lfs2_t *lfs2) {
+int lfs2_fs_gc(lfs2_t *lfs2) {
     int err = LFS2_LOCK(lfs2->cfg);
     if (err) {
         return err;
     }
-    LFS2_TRACE("lfs2_fs_mkconsistent(%p)", (void*)lfs2);
+    LFS2_TRACE("lfs2_fs_gc(%p)", (void*)lfs2);
 
-    err = lfs2_fs_rawmkconsistent(lfs2);
+    err = lfs2_fs_gc_(lfs2);
 
-    LFS2_TRACE("lfs2_fs_mkconsistent -> %d", err);
+    LFS2_TRACE("lfs2_fs_gc -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
     return err;
 }
@@ -6290,7 +6477,7 @@ int lfs2_fs_grow(lfs2_t *lfs2, lfs2_size_t block_count) {
     }
     LFS2_TRACE("lfs2_fs_grow(%p, %"PRIu32")", (void*)lfs2, block_count);
 
-    err = lfs2_fs_rawgrow(lfs2, block_count);
+    err = lfs2_fs_grow_(lfs2, block_count);
 
     LFS2_TRACE("lfs2_fs_grow -> %d", err);
     LFS2_UNLOCK(lfs2->cfg);
@@ -6308,7 +6495,7 @@ int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
                 ".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", "
+                ".block_cycles=%"PRId32", .cache_size=%"PRIu32", "
                 ".lookahead_size=%"PRIu32", .read_buffer=%p, "
                 ".prog_buffer=%p, .lookahead_buffer=%p, "
                 ".name_max=%"PRIu32", .file_max=%"PRIu32", "
@@ -6321,7 +6508,7 @@ int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
             cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
             cfg->name_max, cfg->file_max, cfg->attr_max);
 
-    err = lfs2_rawmigrate(lfs2, cfg);
+    err = lfs2_migrate_(lfs2, cfg);
 
     LFS2_TRACE("lfs2_migrate -> %d", err);
     LFS2_UNLOCK(cfg);
diff --git a/lib/littlefs/lfs2.h b/lib/littlefs/lfs2.h
index 4c426fc4c7096..f503fd00bcfa2 100644
--- a/lib/littlefs/lfs2.h
+++ b/lib/littlefs/lfs2.h
@@ -21,7 +21,7 @@ extern "C"
 // Software library version
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_VERSION 0x00020008
+#define LFS2_VERSION 0x0002000a
 #define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
 #define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >>  0))
 
@@ -52,16 +52,15 @@ typedef uint32_t lfs2_block_t;
 #endif
 
 // Maximum size of a file in bytes, may be redefined to limit to support other
-// drivers. Limited on disk to <= 4294967296. However, above 2147483647 the
-// functions lfs2_file_seek, lfs2_file_size, and lfs2_file_tell will return
-// incorrect values due to using signed integers. Stored in superblock and
-// must be respected by other littlefs drivers.
+// drivers. Limited on disk to <= 2147483647. Stored in superblock and must be
+// respected by other littlefs drivers.
 #ifndef LFS2_FILE_MAX
 #define LFS2_FILE_MAX 2147483647
 #endif
 
 // Maximum size of custom attributes in bytes, may be redefined, but there is
-// no real benefit to using a smaller LFS2_ATTR_MAX. Limited to <= 1022.
+// no real benefit to using a smaller LFS2_ATTR_MAX. Limited to <= 1022. Stored
+// in superblock and must be respected by other littlefs drivers.
 #ifndef LFS2_ATTR_MAX
 #define LFS2_ATTR_MAX 1022
 #endif
@@ -205,7 +204,8 @@ struct lfs2_config {
     // program sizes.
     lfs2_size_t block_size;
 
-    // Number of erasable blocks on the device.
+    // Number of erasable blocks on the device. Defaults to block_count stored
+    // on disk when zero.
     lfs2_size_t block_count;
 
     // Number of erase cycles before littlefs evicts metadata logs and moves
@@ -226,9 +226,20 @@ struct lfs2_config {
     // Size of the lookahead buffer in bytes. A larger lookahead buffer
     // increases the number of blocks found during an allocation pass. The
     // lookahead buffer is stored as a compact bitmap, so each byte of RAM
-    // can track 8 blocks. Must be a multiple of 8.
+    // can track 8 blocks.
     lfs2_size_t lookahead_size;
 
+    // Threshold for metadata compaction during lfs2_fs_gc in bytes. Metadata
+    // pairs that exceed this threshold will be compacted during lfs2_fs_gc.
+    // Defaults to ~88% block_size when zero, though the default may change
+    // in the future.
+    //
+    // Note this only affects lfs2_fs_gc. Normal compactions still only occur
+    // when full.
+    //
+    // Set to -1 to disable metadata compaction during lfs2_fs_gc.
+    lfs2_size_t compact_thresh;
+
     // Optional statically allocated read buffer. Must be cache_size.
     // By default lfs2_malloc is used to allocate this buffer.
     void *read_buffer;
@@ -237,25 +248,24 @@ struct lfs2_config {
     // By default lfs2_malloc is used to allocate this buffer.
     void *prog_buffer;
 
-    // Optional statically allocated lookahead buffer. Must be lookahead_size
-    // and aligned to a 32-bit boundary. By default lfs2_malloc is used to
-    // allocate this buffer.
+    // Optional statically allocated lookahead buffer. Must be lookahead_size.
+    // By default lfs2_malloc is used to allocate this buffer.
     void *lookahead_buffer;
 
     // Optional upper limit on length of file names in bytes. No downside for
     // larger names except the size of the info struct which is controlled by
-    // the LFS2_NAME_MAX define. Defaults to LFS2_NAME_MAX when zero. Stored in
-    // superblock and must be respected by other littlefs drivers.
+    // the LFS2_NAME_MAX define. Defaults to LFS2_NAME_MAX or name_max stored on
+    // disk when zero.
     lfs2_size_t name_max;
 
     // Optional upper limit on files in bytes. No downside for larger files
-    // but must be <= LFS2_FILE_MAX. Defaults to LFS2_FILE_MAX when zero. Stored
-    // in superblock and must be respected by other littlefs drivers.
+    // but must be <= LFS2_FILE_MAX. Defaults to LFS2_FILE_MAX or file_max stored
+    // on disk when zero.
     lfs2_size_t file_max;
 
     // Optional upper limit on custom attributes in bytes. No downside for
     // larger attributes size but must be <= LFS2_ATTR_MAX. Defaults to
-    // LFS2_ATTR_MAX when zero.
+    // LFS2_ATTR_MAX or attr_max stored on disk when zero.
     lfs2_size_t attr_max;
 
     // Optional upper limit on total space given to metadata pairs in bytes. On
@@ -264,6 +274,15 @@ struct lfs2_config {
     // Defaults to block_size when zero.
     lfs2_size_t metadata_max;
 
+    // Optional upper limit on inlined files in bytes. Inlined files live in
+    // metadata and decrease storage requirements, but may be limited to
+    // improve metadata-related performance. Must be <= cache_size, <=
+    // attr_max, and <= block_size/8. Defaults to the largest possible
+    // inline_max when zero.
+    //
+    // Set to -1 to disable inlined files.
+    lfs2_size_t inline_max;
+
 #ifdef LFS2_MULTIVERSION
     // On-disk version to use when writing in the form of 16-bit major version
     // + 16-bit minor version. This limiting metadata to what is supported by
@@ -430,19 +449,20 @@ typedef struct lfs2 {
     lfs2_gstate_t gdisk;
     lfs2_gstate_t gdelta;
 
-    struct lfs2_free {
-        lfs2_block_t off;
+    struct lfs2_lookahead {
+        lfs2_block_t start;
         lfs2_block_t size;
-        lfs2_block_t i;
-        lfs2_block_t ack;
-        uint32_t *buffer;
-    } free;
+        lfs2_block_t next;
+        lfs2_block_t ckpoint;
+        uint8_t *buffer;
+    } lookahead;
 
     const struct lfs2_config *cfg;
     lfs2_size_t block_count;
     lfs2_size_t name_max;
     lfs2_size_t file_max;
     lfs2_size_t attr_max;
+    lfs2_size_t inline_max;
 
 #ifdef LFS2_MIGRATE
     struct lfs21 *lfs21;
@@ -712,18 +732,6 @@ 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);
 
-// Attempt to proactively find free blocks
-//
-// Calling this function is not required, but may allowing the offloading of
-// the expensive block allocation scan to a less time-critical code path.
-//
-// Note: littlefs currently does not persist any found free blocks to disk.
-// This may change in the future.
-//
-// Returns a negative error code on failure. Finding no free blocks is
-// not an error.
-int lfs2_fs_gc(lfs2_t *lfs2);
-
 #ifndef LFS2_READONLY
 // Attempt to make the filesystem consistent and ready for writing
 //
@@ -736,6 +744,24 @@ int lfs2_fs_gc(lfs2_t *lfs2);
 int lfs2_fs_mkconsistent(lfs2_t *lfs2);
 #endif
 
+#ifndef LFS2_READONLY
+// Attempt any janitorial work
+//
+// This currently:
+// 1. Calls mkconsistent if not already consistent
+// 2. Compacts metadata > compact_thresh
+// 3. Populates the block allocator
+//
+// Though additional janitorial work may be added in the future.
+//
+// Calling this function is not required, but may allow the offloading of
+// expensive janitorial work to a less time-critical code path.
+//
+// Returns a negative error code on failure. Accomplishing nothing is not
+// an error.
+int lfs2_fs_gc(lfs2_t *lfs2);
+#endif
+
 #ifndef LFS2_READONLY
 // Grows the filesystem to a new size, updating the superblock with the new
 // block count.
diff --git a/lib/littlefs/lfs2_util.c b/lib/littlefs/lfs2_util.c
index c9850e78869c3..4fe7e5340ce77 100644
--- a/lib/littlefs/lfs2_util.c
+++ b/lib/littlefs/lfs2_util.c
@@ -11,6 +11,8 @@
 #ifndef LFS2_CONFIG
 
 
+// If user provides their own CRC impl we don't need this
+#ifndef LFS2_CRC
 // Software CRC implementation with small lookup table
 uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size) {
     static const uint32_t rtable[16] = {
@@ -29,6 +31,7 @@ uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size) {
 
     return crc;
 }
+#endif
 
 
 #endif
diff --git a/lib/littlefs/lfs2_util.h b/lib/littlefs/lfs2_util.h
index dd2cbcc106d84..48d9f4c572a0c 100644
--- a/lib/littlefs/lfs2_util.h
+++ b/lib/littlefs/lfs2_util.h
@@ -8,6 +8,9 @@
 #ifndef LFS2_UTIL_H
 #define LFS2_UTIL_H
 
+#define LFS2_STRINGIZE(x) LFS2_STRINGIZE2(x)
+#define LFS2_STRINGIZE2(x) #x
+
 // Users can override lfs2_util.h with their own configuration by defining
 // LFS2_CONFIG as a header file to include (-DLFS2_CONFIG=lfs2_config.h).
 //
@@ -15,11 +18,26 @@
 // provided by the config file. To start, I would suggest copying lfs2_util.h
 // and modifying as needed.
 #ifdef LFS2_CONFIG
-#define LFS2_STRINGIZE(x) LFS2_STRINGIZE2(x)
-#define LFS2_STRINGIZE2(x) #x
 #include LFS2_STRINGIZE(LFS2_CONFIG)
 #else
 
+// Alternatively, users can provide a header file which defines
+// macros and other things consumed by littlefs.
+//
+// For example, provide my_defines.h, which contains
+// something like:
+//
+// #include <stddef.h>
+// extern void *my_malloc(size_t sz);
+// #define LFS2_MALLOC(sz) my_malloc(sz)
+//
+// And build littlefs with the header by defining LFS2_DEFINES.
+// (-DLFS2_DEFINES=my_defines.h)
+
+#ifdef LFS2_DEFINES
+#include LFS2_STRINGIZE(LFS2_DEFINES)
+#endif
+
 // System includes
 #include <stdint.h>
 #include <stdbool.h>
@@ -212,12 +230,22 @@ static inline uint32_t lfs2_tobe32(uint32_t a) {
 }
 
 // Calculate CRC-32 with polynomial = 0x04c11db7
+#ifdef LFS2_CRC
+uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size) {
+    return LFS2_CRC(crc, buffer, size)
+}
+#else
 uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size);
+#endif
 
 // Allocate memory, only used if buffers are not provided to littlefs
-// Note, memory must be 64-bit aligned
+//
+// littlefs current has no alignment requirements, as it only allocates
+// byte-level buffers.
 static inline void *lfs2_malloc(size_t size) {
-#ifndef LFS2_NO_MALLOC
+#if defined(LFS2_MALLOC)
+    return LFS2_MALLOC(size);
+#elif !defined(LFS2_NO_MALLOC)
     return malloc(size);
 #else
     (void)size;
@@ -227,7 +255,9 @@ static inline void *lfs2_malloc(size_t size) {
 
 // Deallocate memory, only used if buffers are not provided to littlefs
 static inline void lfs2_free(void *p) {
-#ifndef LFS2_NO_MALLOC
+#if defined(LFS2_FREE)
+    LFS2_FREE(p);
+#elif !defined(LFS2_NO_MALLOC)
     free(p);
 #else
     (void)p;
diff --git a/tests/extmod/vfs_lfs.py b/tests/extmod/vfs_lfs.py
index 3ad57fd9c38f1..40d58e9c9f743 100644
--- a/tests/extmod/vfs_lfs.py
+++ b/tests/extmod/vfs_lfs.py
@@ -136,7 +136,7 @@ def test(bdev, vfs_class):
     print(fs.getcwd())
     fs.chdir("../testdir")
     print(fs.getcwd())
-    fs.chdir("../..")
+    fs.chdir("..")
     print(fs.getcwd())
     fs.chdir(".//testdir")
     print(fs.getcwd())

From 2b29b1b8f9dc7014c27d9df43ca0ebd3ccc86060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 16 Apr 2025 18:26:37 +0200
Subject: [PATCH 2201/3129] lib/littlefs: Reuse existing CRC32 function to save
 space.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Getting this to work required fixing a small issue in `lfs2_util.h`, which
has been submitted upstream.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/extmod.mk                       |  2 +-
 extmod/littlefs-include/lfs2_defines.h | 12 ++++++++++++
 lib/littlefs/lfs2_util.h               |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 extmod/littlefs-include/lfs2_defines.h

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index b2a0f490b6e10..997dd3ba98ead 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -206,7 +206,7 @@ endif
 
 ifeq ($(MICROPY_VFS_LFS2),1)
 CFLAGS_EXTMOD += -DMICROPY_VFS_LFS2=1
-CFLAGS_THIRDPARTY += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
+CFLAGS_THIRDPARTY += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT -DLFS2_DEFINES=extmod/littlefs-include/lfs2_defines.h
 SRC_THIRDPARTY_C += $(addprefix $(LITTLEFS_DIR)/,\
 	lfs2.c \
 	lfs2_util.c \
diff --git a/extmod/littlefs-include/lfs2_defines.h b/extmod/littlefs-include/lfs2_defines.h
new file mode 100644
index 0000000000000..4ae566f508afa
--- /dev/null
+++ b/extmod/littlefs-include/lfs2_defines.h
@@ -0,0 +1,12 @@
+#ifndef LFS2_DEFINES_H
+#define LFS2_DEFINES_H
+
+#include "py/mpconfig.h"
+
+#if MICROPY_PY_DEFLATE
+// We reuse the CRC32 implementation from uzlib to save a few bytes
+#include "lib/uzlib/uzlib.h"
+#define LFS2_CRC(crc, buffer, size) uzlib_crc32(buffer, size, crc)
+#endif
+
+#endif
\ No newline at end of file
diff --git a/lib/littlefs/lfs2_util.h b/lib/littlefs/lfs2_util.h
index 48d9f4c572a0c..3b191f6885f44 100644
--- a/lib/littlefs/lfs2_util.h
+++ b/lib/littlefs/lfs2_util.h
@@ -231,8 +231,8 @@ static inline uint32_t lfs2_tobe32(uint32_t a) {
 
 // Calculate CRC-32 with polynomial = 0x04c11db7
 #ifdef LFS2_CRC
-uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size) {
-    return LFS2_CRC(crc, buffer, size)
+static inline uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size) {
+    return LFS2_CRC(crc, buffer, size);
 }
 #else
 uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size);

From aedaa405953f6fad29ecd5e16d10de126ecb1af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 16 Apr 2025 14:17:14 +0200
Subject: [PATCH 2202/3129] py/modthread: Initialize thread state nlr_top to
 NULL.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures the check in MP_NLR_JUMP_HEAD works as expected and
nlr_jump_fail gets called so we get a bit better error message.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 py/runtime.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/runtime.h b/py/runtime.h
index 77cdd0e203da9..ffbc3972a32dc 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -165,6 +165,7 @@ static inline void mp_thread_init_state(mp_state_thread_t *ts, size_t stack_size
     ts->gc_lock_depth = 0;
 
     // There are no pending jump callbacks or exceptions yet
+    ts->nlr_top = NULL;
     ts->nlr_jump_callback_top = NULL;
     ts->mp_pending_exception = MP_OBJ_NULL;
 

From 1b123579a2c987901c3ddb9c342b041f1526943f Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Wed, 9 Apr 2025 13:39:51 +0200
Subject: [PATCH 2203/3129] py/makeversionhdr.py: Change utcfromtimestamp() to
 fromtimestamp().

The former is deprecated.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 py/makeversionhdr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index cb7325e416cb4..406a061a0948a 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -117,8 +117,8 @@ def make_version_header(repo_path, filename):
 
     build_date = datetime.date.today()
     if "SOURCE_DATE_EPOCH" in os.environ:
-        build_date = datetime.datetime.utcfromtimestamp(
-            int(os.environ["SOURCE_DATE_EPOCH"])
+        build_date = datetime.datetime.fromtimestamp(
+            int(os.environ["SOURCE_DATE_EPOCH"]), datetime.timezone.utc
         ).date()
 
     # Generate the file with the git and version info

From fe28cd78fefde7da1bc7614982223ce9e522143a Mon Sep 17 00:00:00 2001
From: danicampora <danicampora@gmail.com>
Date: Thu, 3 Oct 2024 09:50:15 +0200
Subject: [PATCH 2204/3129] zephyr/modbluetooth_zephyr: Allow BLE to create
 services at runtime.

This commit adds the required functionality for a peripheral to create
services at runtime, using `BLE.register_services()`.

The feature is enabled on the nrf52840dk_nrf52840 board.

Note that the `CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n` option must be used
so that BLE notifications/indications can be sent even if not subscribed.

Signed-off-by: danicampora <danicampora@gmail.com>
---
 ports/zephyr/boards/nrf52840dk_nrf52840.conf |   5 +
 ports/zephyr/modbluetooth_zephyr.c           | 611 ++++++++++++++++++-
 2 files changed, 604 insertions(+), 12 deletions(-)

diff --git a/ports/zephyr/boards/nrf52840dk_nrf52840.conf b/ports/zephyr/boards/nrf52840dk_nrf52840.conf
index e9ec78b64ffae..dc2ed1c4b49df 100644
--- a/ports/zephyr/boards/nrf52840dk_nrf52840.conf
+++ b/ports/zephyr/boards/nrf52840dk_nrf52840.conf
@@ -1,8 +1,13 @@
 CONFIG_NETWORKING=n
 CONFIG_BT=y
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
+CONFIG_BT_GATT_CLIENT=y
+CONFIG_BT_L2CAP_TX_MTU=252
+CONFIG_BT_BUF_ACL_RX_SIZE=256
+CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
 
 CONFIG_MICROPY_HEAP_SIZE=98304
 CONFIG_MAIN_STACK_SIZE=8192
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index 8947bdf53567d..cdbeb7fc353ff 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -31,8 +31,12 @@
 
 #if MICROPY_PY_BLUETOOTH
 
+#include <zephyr/types.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 #include "extmod/modbluetooth.h"
 
 #define DEBUG_printf(...) // printk("BLE: " __VA_ARGS__)
@@ -44,6 +48,23 @@
 
 #define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
 
+#define MP_BLUETOOTH_ZEPHYR_MAX_SERVICES            (8)
+
+/* This masks Permission bits from GATT API */
+#define GATT_PERM_MASK  (BT_GATT_PERM_READ | \
+    BT_GATT_PERM_READ_AUTHEN | \
+    BT_GATT_PERM_READ_ENCRYPT | \
+    BT_GATT_PERM_WRITE | \
+    BT_GATT_PERM_WRITE_AUTHEN | \
+    BT_GATT_PERM_WRITE_ENCRYPT | \
+    BT_GATT_PERM_PREPARE_WRITE)
+
+#define GATT_PERM_ENC_READ_MASK     (BT_GATT_PERM_READ_ENCRYPT | \
+    BT_GATT_PERM_READ_AUTHEN)
+
+#define GATT_PERM_ENC_WRITE_MASK    (BT_GATT_PERM_WRITE_ENCRYPT | \
+    BT_GATT_PERM_WRITE_AUTHEN)
+
 enum {
     MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF,
     MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE,
@@ -56,9 +77,42 @@ enum {
     MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE,
 };
 
+union uuid_u {
+    struct bt_uuid uuid;
+    struct bt_uuid_16 u16;
+    struct bt_uuid_32 u32;
+    struct bt_uuid_128 u128;
+};
+
+struct add_characteristic {
+    uint8_t properties;
+    uint8_t permissions;
+    const struct bt_uuid *uuid;
+};
+
+struct add_descriptor {
+    uint8_t permissions;
+    const struct bt_uuid *uuid;
+};
+
+typedef struct _mp_bt_zephyr_conn_t {
+    struct bt_conn *conn;
+    struct _mp_bt_zephyr_conn_t *next;
+} mp_bt_zephyr_conn_t;
+
 typedef struct _mp_bluetooth_zephyr_root_pointers_t {
+    // list of objects to be tracked by the gc
+    mp_obj_t objs_list;
+
     // Characteristic (and descriptor) value storage.
     mp_gatts_db_t gatts_db;
+
+    // Service definitions.
+    size_t n_services;
+    struct bt_gatt_service *services[MP_BLUETOOTH_ZEPHYR_MAX_SERVICES];
+
+    // active connections
+    mp_bt_zephyr_conn_t *connections;
 } mp_bluetooth_zephyr_root_pointers_t;
 
 static int mp_bluetooth_zephyr_ble_state;
@@ -69,6 +123,98 @@ 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 struct bt_data bt_ad_data[8];
+static size_t bt_ad_len = 0;
+static struct bt_data bt_sd_data[8];
+static size_t bt_sd_len = 0;
+
+static mp_bt_zephyr_conn_t *mp_bt_zephyr_next_conn;
+
+static mp_bt_zephyr_conn_t *mp_bt_zephyr_find_connection(uint8_t conn_handle);
+static void mp_bt_zephyr_insert_connection(mp_bt_zephyr_conn_t *connection);
+static void mp_bt_zephyr_remove_connection(uint8_t conn_handle);
+static void mp_bt_zephyr_connected(struct bt_conn *connected, uint8_t err);
+static void mp_bt_zephyr_disconnected(struct bt_conn *disconn, uint8_t reason);
+static struct bt_uuid *create_zephyr_uuid(const mp_obj_bluetooth_uuid_t *uuid);
+static void gatt_db_add(const struct bt_gatt_attr *pattern, struct bt_gatt_attr *attr, size_t user_data_len);
+static void add_service(const struct bt_uuid *u, struct bt_gatt_attr *attr);
+static void add_characteristic(struct add_characteristic *ch, struct bt_gatt_attr *attr_chrc, struct bt_gatt_attr *attr_value);
+static void add_ccc(struct bt_gatt_attr *attr, struct bt_gatt_attr *attr_desc);
+static void add_cep(const struct bt_gatt_attr *attr_chrc, struct bt_gatt_attr *attr_desc);
+static void add_descriptor(struct bt_gatt_attr *chrc, struct add_descriptor *d, struct bt_gatt_attr *attr_desc);
+static void mp_bt_zephyr_gatt_indicate_done(struct bt_conn *conn, struct bt_gatt_indicate_params *params, uint8_t err);
+static struct bt_gatt_attr *mp_bt_zephyr_find_attr_by_handle(uint16_t value_handle);
+
+static struct bt_conn_cb mp_bt_zephyr_conn_callbacks = {
+    .connected = mp_bt_zephyr_connected,
+    .disconnected = mp_bt_zephyr_disconnected,
+};
+
+static mp_bt_zephyr_conn_t *mp_bt_zephyr_find_connection(uint8_t conn_handle) {
+    struct bt_conn_info info;
+    for (mp_bt_zephyr_conn_t *connection = MP_STATE_PORT(bluetooth_zephyr_root_pointers)->connections; connection != NULL; connection = connection->next) {
+        if (connection->conn) {
+            bt_conn_get_info(connection->conn, &info);
+            if (info.id == conn_handle) {
+                return connection;
+            }
+        }
+    }
+    return NULL;
+}
+
+static void mp_bt_zephyr_insert_connection(mp_bt_zephyr_conn_t *connection) {
+    connection->next = MP_STATE_PORT(bluetooth_zephyr_root_pointers)->connections;
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->connections = connection;
+}
+
+static void mp_bt_zephyr_remove_connection(uint8_t conn_handle) {
+    struct bt_conn_info info;
+    mp_bt_zephyr_conn_t *prev = NULL;
+    for (mp_bt_zephyr_conn_t *connection = MP_STATE_PORT(bluetooth_zephyr_root_pointers)->connections; connection != NULL; connection = connection->next) {
+        if (connection->conn) {
+            bt_conn_get_info(connection->conn, &info);
+            if (info.id == conn_handle) {
+                // unlink this item and the gc will eventually collect it
+                if (prev != NULL) {
+                    prev->next = connection->next;
+                } else {
+                    // move the start pointer
+                    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->connections = connection->next;
+                }
+                break;
+            } else {
+                prev = connection;
+            }
+        }
+    }
+}
+
+static void mp_bt_zephyr_connected(struct bt_conn *conn, uint8_t err) {
+    struct bt_conn_info info;
+    bt_conn_get_info(conn, &info);
+
+    if (err) {
+        uint8_t addr[6] = {0};
+        DEBUG_printf("Connection from central failed (err %u)\n", err);
+        mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT, info.id, 0xff, addr);
+    } else {
+        DEBUG_printf("Central connected with id %d\n", info.id);
+        mp_bt_zephyr_next_conn->conn = bt_conn_ref(conn);
+        mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_CENTRAL_CONNECT, info.id, info.le.dst->type, info.le.dst->a.val);
+        mp_bt_zephyr_insert_connection(mp_bt_zephyr_next_conn);
+    }
+}
+
+static void mp_bt_zephyr_disconnected(struct bt_conn *conn, uint8_t reason) {
+    struct bt_conn_info info;
+    bt_conn_get_info(conn, &info);
+    DEBUG_printf("Central disconnected (id %d reason %u)\n", info.id, reason);
+    bt_conn_unref(conn);
+    mp_bt_zephyr_remove_connection(info.id);
+    mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT, info.id, info.le.dst->type, info.le.dst->a.val);
+}
+
 static int bt_err_to_errno(int err) {
     // Zephyr uses errno codes directly, but they are negative.
     return -err;
@@ -128,6 +274,11 @@ int mp_bluetooth_init(void) {
     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);
 
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->connections = NULL;
+    mp_bt_zephyr_next_conn = NULL;
+
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list = mp_obj_new_list(0, NULL);
+
     #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);
@@ -137,6 +288,9 @@ int mp_bluetooth_init(void) {
     #endif
 
     if (mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF) {
+
+        bt_conn_cb_register(&mp_bt_zephyr_conn_callbacks);
+
         // bt_enable can only be called once.
         int ret = bt_enable(NULL);
         if (ret) {
@@ -160,6 +314,13 @@ void mp_bluetooth_deinit(void) {
 
     mp_bluetooth_gap_advertise_stop();
 
+    #if CONFIG_BT_GATT_DYNAMIC_DB
+    for (size_t i = 0; i < MP_STATE_PORT(bluetooth_zephyr_root_pointers)->n_services; ++i) {
+        bt_gatt_service_unregister(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[i]);
+        MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[i] = NULL;
+    }
+    #endif
+
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     mp_bluetooth_gap_scan_stop();
     bt_le_scan_cb_unregister(&mp_bluetooth_zephyr_gap_scan_cb_struct);
@@ -170,6 +331,7 @@ void mp_bluetooth_deinit(void) {
     mp_bluetooth_zephyr_ble_state = MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED;
 
     MP_STATE_PORT(bluetooth_zephyr_root_pointers) = NULL;
+    mp_bt_zephyr_next_conn = NULL;
 }
 
 bool mp_bluetooth_is_active(void) {
@@ -191,7 +353,7 @@ void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr) {
 }
 
 void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
-    // TODO: implement
+    mp_raise_OSError(MP_EOPNOTSUPP);
 }
 
 size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
@@ -232,15 +394,11 @@ int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, cons
 
     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);
@@ -259,6 +417,10 @@ int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, cons
         .peer = NULL,
     };
 
+    // pre-allocate a new connection structure as we cannot allocate this inside the connection callback
+    mp_bt_zephyr_next_conn = m_new0(mp_bt_zephyr_conn_t, 1);
+    mp_obj_list_append(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list, MP_OBJ_FROM_PTR(mp_bt_zephyr_next_conn));
+
     return bt_err_to_errno(bt_le_adv_start(&param, bt_ad_data, bt_ad_len, bt_sd_data, bt_sd_len));
 }
 
@@ -271,6 +433,8 @@ void mp_bluetooth_gap_advertise_stop(void) {
 }
 
 int mp_bluetooth_gatts_register_service_begin(bool append) {
+    #if CONFIG_BT_GATT_DYNAMIC_DB
+
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
@@ -280,25 +444,190 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
         return MP_EOPNOTSUPP;
     }
 
+    // Unregister and unref any previous service definitions.
+    for (size_t i = 0; i < MP_STATE_PORT(bluetooth_zephyr_root_pointers)->n_services; ++i) {
+        bt_gatt_service_unregister(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[i]);
+        MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[i] = NULL;
+    }
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->n_services = 0;
+
     // Reset the gatt characteristic value db.
     mp_bluetooth_gatts_db_reset(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db);
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->connections = NULL;
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list = mp_obj_new_list(0, NULL);
+    mp_bt_zephyr_next_conn = NULL;
+
+    return 0;
 
+    #else
     return MP_EOPNOTSUPP;
+    #endif
 }
 
 int mp_bluetooth_gatts_register_service_end(void) {
-    return MP_EOPNOTSUPP;
+    return 0;
 }
 
 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 CONFIG_BT_GATT_DYNAMIC_DB
+    if (MP_STATE_PORT(bluetooth_zephyr_root_pointers)->n_services >= MP_BLUETOOTH_ZEPHYR_MAX_SERVICES) {
+        return MP_E2BIG;
+    }
+
+    // first of all allocate the entire memory for all the attributes that this service is composed of
+    // 1 for the service itself, 2 for each characteristic (the declaration and the value), and one for each descriptor
+    size_t total_descriptors = 0;
+    for (size_t i = 0; i < num_characteristics; ++i) {
+        total_descriptors += num_descriptors[i];
+        // we have to add the CCC manually
+        if (characteristic_flags[i] & (MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY | MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE)) {
+            total_descriptors += 1;
+        }
+    }
+    size_t total_attributes = 1 + (num_characteristics * 2) + total_descriptors;
+
+    // allocate one extra so that we can know later where the final attribute is
+    struct bt_gatt_attr *svc_attributes = m_new(struct bt_gatt_attr, total_attributes + 1);
+    mp_obj_list_append(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list, MP_OBJ_FROM_PTR(svc_attributes));
+
+    size_t handle_index = 0;
+    size_t descriptor_index = 0;
+    size_t attr_index = 0;
+    // bitfield of the handles we should ignore, should be more than enough for most applications
+    uint64_t attrs_to_ignore = 0;
+    uint64_t attrs_are_chrs = 0;
+    uint64_t chr_has_ccc = 0;
+
+    add_service(create_zephyr_uuid(service_uuid), &svc_attributes[attr_index]);
+    attr_index += 1;
+
+    for (size_t i = 0; i < num_characteristics; ++i) {
+
+        struct add_characteristic add_char;
+        add_char.uuid = create_zephyr_uuid(characteristic_uuids[i]);
+        add_char.permissions = 0;
+        add_char.properties = 0;
+        if (characteristic_flags[i] & MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ) {
+            add_char.permissions |= BT_GATT_PERM_READ;
+            add_char.properties |= BT_GATT_CHRC_READ;
+        }
+        if (characteristic_flags[i] & MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY) {
+            add_char.properties |= BT_GATT_CHRC_NOTIFY;
+        }
+        if (characteristic_flags[i] & MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE) {
+            add_char.properties |= BT_GATT_CHRC_INDICATE;
+        }
+        if (characteristic_flags[i] & (MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE | MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_NO_RESPONSE)) {
+            add_char.permissions |= BT_GATT_PERM_WRITE;
+            add_char.properties |= (BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP);
+        }
+
+        add_characteristic(&add_char, &svc_attributes[attr_index], &svc_attributes[attr_index + 1]);
+
+        struct bt_gatt_attr *curr_char = &svc_attributes[attr_index];
+        attrs_are_chrs |= (1 << attr_index);
+        if (characteristic_flags[i] & (MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY | MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE)) {
+            chr_has_ccc |= (1 << attr_index);
+        }
+        attr_index += 1;
+        attrs_to_ignore |= (1 << attr_index);   // ignore the value handle
+        attr_index += 1;
+
+        if (num_descriptors[i] > 0) {
+            for (size_t j = 0; j < num_descriptors[i]; ++j) {
+
+                struct add_descriptor add_desc;
+                add_desc.uuid = create_zephyr_uuid(descriptor_uuids[descriptor_index]);
+                add_desc.permissions = 0;
+                if (descriptor_flags[descriptor_index] & MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ) {
+                    add_desc.permissions |= BT_GATT_PERM_READ;
+                }
+                if (descriptor_flags[descriptor_index] & (MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE | MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_NO_RESPONSE)) {
+                    add_desc.permissions |= BT_GATT_PERM_WRITE;
+                }
+
+                add_descriptor(curr_char, &add_desc, &svc_attributes[attr_index]);
+                attr_index += 1;
+
+                descriptor_index++;
+            }
+        }
+
+        // to support indications and notifications we must add the CCC descriptor manually
+        if (characteristic_flags[i] & (MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY | MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE)) {
+            struct add_descriptor add_desc;
+            mp_obj_bluetooth_uuid_t ccc_uuid;
+            ccc_uuid.base.type = &mp_type_bluetooth_uuid;
+            ccc_uuid.data[0] = BT_UUID_GATT_CCC_VAL & 0xff;
+            ccc_uuid.data[1] = (BT_UUID_GATT_CCC_VAL >> 8) & 0xff;
+            ccc_uuid.type = MP_BLUETOOTH_UUID_TYPE_16;
+            add_desc.uuid = create_zephyr_uuid(&ccc_uuid);
+            add_desc.permissions = BT_GATT_PERM_READ | BT_GATT_PERM_WRITE;
+
+            attrs_to_ignore |= (1 << attr_index);
+
+            add_descriptor(curr_char, &add_desc, &svc_attributes[attr_index]);
+            attr_index += 1;
+        }
+    }
+
+    struct bt_gatt_service *service = m_new(struct bt_gatt_service, 1);
+    mp_obj_list_append(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list, MP_OBJ_FROM_PTR(service));
+    service->attrs = svc_attributes;
+    service->attr_count = attr_index;
+    // invalidate the last attribute uuid pointer so that we new this is the end of attributes for this service
+    svc_attributes[attr_index].uuid = NULL;
+
+    // Note: advertising must be stopped for gatts registration to work
+
+    int err = bt_gatt_service_register(service);
+    if (err) {
+        return bt_err_to_errno(err);
+    }
+
+    // now that the service has been registered, we can assign the handles for the characteristics and the descriptors
+    // we are not interested in the handle of the service itself, so we start the loop from index 1
+    for (int i = 1; i < total_attributes; i++) {
+        // store all the relevant handles (characteristics and descriptors defined in Python)
+        if (!((uint64_t)(attrs_to_ignore >> i) & (uint64_t)0x01)) {
+            if (svc_attributes[i].user_data == NULL) {
+                mp_bluetooth_gatts_db_create_entry(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, svc_attributes[i].handle, MP_BLUETOOTH_DEFAULT_ATTR_LEN);
+                mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, svc_attributes[i].handle);
+                svc_attributes[i].user_data = entry->data;
+            } else if (((uint64_t)(attrs_are_chrs >> i) & (uint64_t)0x01)) {
+                if (svc_attributes[i + 1].user_data == NULL) {
+                    mp_bluetooth_gatts_db_create_entry(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, svc_attributes[i].handle, MP_BLUETOOTH_DEFAULT_ATTR_LEN);
+                    mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, svc_attributes[i].handle);
+                    svc_attributes[i + 1].user_data = entry->data;
+
+                    if (((uint64_t)(chr_has_ccc >> i) & (uint64_t)0x01)) {
+                        // create another database entry for the ccc of this characteristic
+                        mp_bluetooth_gatts_db_create_entry(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, svc_attributes[i].handle + 2, 1);
+                    }
+                }
+            }
+            handles[handle_index++] = svc_attributes[i].handle;
+        }
+    }
+
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[MP_STATE_PORT(bluetooth_zephyr_root_pointers)->n_services++] = service;
+
+    return 0;
+
+    #else
     return MP_EOPNOTSUPP;
+    #endif
 }
 
 int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    return MP_EOPNOTSUPP;
+    mp_bt_zephyr_conn_t *connection = mp_bt_zephyr_find_connection(conn_handle);
+    if (connection) {
+        return bt_conn_disconnect(connection->conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+    }
+    return MP_ENOENT;
 }
 
 int mp_bluetooth_gatts_read(uint16_t value_handle, const uint8_t **value, size_t *value_len) {
@@ -312,24 +641,155 @@ int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    if (send_update) {
-        return MP_EOPNOTSUPP;
+
+    int err = mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
+
+    if ((err == 0) && send_update) {
+        struct bt_gatt_attr *attr_val = mp_bt_zephyr_find_attr_by_handle(value_handle + 1);
+        mp_bluetooth_gatts_db_entry_t *ccc_entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle + 2);
+
+        if (ccc_entry && (ccc_entry->data[0] == BT_GATT_CCC_NOTIFY)) {
+            err = bt_gatt_notify(NULL, attr_val, value, value_len);
+        } else if (ccc_entry && (ccc_entry->data[0] == BT_GATT_CCC_INDICATE)) {
+            struct bt_gatt_indicate_params params = {
+                .uuid = NULL,
+                .attr = attr_val,
+                .func = mp_bt_zephyr_gatt_indicate_done,
+                .destroy = NULL,
+                .data = value,
+                .len = value_len
+            };
+            err = bt_gatt_indicate(NULL, &params);
+        }
+    }
+    return err;
+}
+
+static void mp_bt_zephyr_gatt_indicate_done(struct bt_conn *conn, struct bt_gatt_indicate_params *params, uint8_t err) {
+    struct bt_conn_info info;
+    bt_conn_get_info(conn, &info);
+    uint16_t chr_handle = params->attr->handle - 1;
+    mp_bluetooth_gatts_on_indicate_complete(info.id, chr_handle, err);
+}
+
+static ssize_t mp_bt_zephyr_gatts_attr_read(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, uint16_t len, uint16_t offset) {
+    // we receive the value handle, but to look up in the gatts db we need the characteristic handle, and that is is the value handle minus 1
+    uint16_t _handle = attr->handle - 1;
+
+    DEBUG_printf("BLE attr read for handle %d\n", attr->handle);
+
+    mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, _handle);
+    if (!entry) {
+        // it could be a descriptor instead
+        _handle = attr->handle;
+        entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, _handle);
+        if (!entry) {
+            return BT_GATT_ERR(BT_ATT_ERR_INVALID_HANDLE);
+        }
+    }
+
+    return bt_gatt_attr_read(conn, attr, buf, len, offset, entry->data, entry->data_len);
+}
+
+static ssize_t mp_bt_zephyr_gatts_attr_write(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, uint16_t len, uint16_t offset, uint8_t flags) {
+    struct bt_conn_info info;
+    bt_conn_get_info(conn, &info);
+
+    DEBUG_printf("BLE attr write for handle %d\n", attr->handle);
+
+    // the characteristic handle is the value handle minus 1
+    uint16_t _handle = attr->handle - 1;
+
+    mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, _handle);
+    if (!entry) {
+        // it could be a descriptor instead
+        _handle = attr->handle;
+        entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, _handle);
+        if (!entry) {
+            return BT_GATT_ERR(BT_ATT_ERR_INVALID_HANDLE);
+        }
+    }
+
+    // Don't write anything if prepare flag is set
+    if (flags & BT_GATT_WRITE_FLAG_PREPARE) {
+        return 0;
     }
-    return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
+
+    if (offset > entry->data_alloc) {
+        return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
+    }
+
+    if ((offset + len) > entry->data_alloc) {
+        return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
+    }
+
+    if (entry->append) {
+        offset = entry->data_len;
+    }
+
+    // copy the data into the buffer in the gatts database
+    memcpy(&entry->data[offset], buf, len);
+    entry->data_len = offset + len;
+
+    mp_bluetooth_gatts_on_write(info.id, _handle);
+
+    return len;
+}
+
+static struct bt_gatt_attr *mp_bt_zephyr_find_attr_by_handle(uint16_t value_handle) {
+    for (int i = 0; i < MP_STATE_PORT(bluetooth_zephyr_root_pointers)->n_services; i++) {
+        int j = 0;
+        while (MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[i]->attrs[j].uuid != NULL) {
+            if (MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[i]->attrs[j].handle == value_handle) {
+                return &MP_STATE_PORT(bluetooth_zephyr_root_pointers)->services[i]->attrs[j];
+            }
+            j++;
+        }
+    }
+    return NULL;
 }
 
 int mp_bluetooth_gatts_notify_indicate(uint16_t conn_handle, uint16_t value_handle, int gatts_op, const uint8_t *value, size_t value_len) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    return MP_EOPNOTSUPP;
+
+    int err = MP_ENOENT;
+    mp_bt_zephyr_conn_t *connection = mp_bt_zephyr_find_connection(conn_handle);
+
+    if (connection) {
+        struct bt_gatt_attr *attr_val = mp_bt_zephyr_find_attr_by_handle(value_handle + 1);
+
+        if (attr_val) {
+            switch (gatts_op) {
+                case MP_BLUETOOTH_GATTS_OP_NOTIFY: {
+                    err = bt_gatt_notify(connection->conn, attr_val, value, value_len);
+                    break;
+                }
+                case MP_BLUETOOTH_GATTS_OP_INDICATE: {
+                    struct bt_gatt_indicate_params params = {
+                        .uuid = NULL,
+                        .attr = attr_val,
+                        .func = mp_bt_zephyr_gatt_indicate_done,
+                        .destroy = NULL,
+                        .data = value,
+                        .len = value_len
+                    };
+                    err = bt_gatt_indicate(connection->conn, &params);
+                    break;
+                }
+            }
+        }
+    }
+
+    return err;
 }
 
 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;
+    return mp_bluetooth_gatts_db_resize(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, len, append);
 }
 
 int mp_bluetooth_get_preferred_mtu(void) {
@@ -404,6 +864,133 @@ int mp_bluetooth_gap_peripheral_connect_cancel(void) {
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+// Note: modbluetooth UUIDs store their data in LE.
+static struct bt_uuid *create_zephyr_uuid(const mp_obj_bluetooth_uuid_t *uuid) {
+    struct bt_uuid *result = (struct bt_uuid *)m_new(union uuid_u, 1);
+    mp_obj_list_append(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list, MP_OBJ_FROM_PTR(result));
+    if (uuid->type == MP_BLUETOOTH_UUID_TYPE_16) {
+        bt_uuid_create(result, uuid->data, 2);
+    } else if (uuid->type == MP_BLUETOOTH_UUID_TYPE_32) {
+        bt_uuid_create(result, uuid->data, 4);
+    } else {    //  MP_BLUETOOTH_UUID_TYPE_128
+        bt_uuid_create(result, uuid->data, 16);
+    }
+    return result;
+}
+
+static void gatt_db_add(const struct bt_gatt_attr *pattern, struct bt_gatt_attr *attr, size_t user_data_len) {
+    const union uuid_u *u = CONTAINER_OF(pattern->uuid, union uuid_u, uuid);
+    size_t uuid_size = sizeof(u->u16);
+
+    if (u->uuid.type == BT_UUID_TYPE_32) {
+        uuid_size = sizeof(u->u32);
+    } else if (u->uuid.type == BT_UUID_TYPE_128) {
+        uuid_size = sizeof(u->u128);
+    }
+
+    memcpy(attr, pattern, sizeof(*attr));
+
+    // Store the UUID.
+    attr->uuid = (const struct bt_uuid *)m_new(union uuid_u, 1);
+    mp_obj_list_append(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list, MP_OBJ_FROM_PTR(attr->uuid));
+    memcpy((void *)attr->uuid, &u->uuid, uuid_size);
+
+    // Copy user_data to the buffer.
+    if (user_data_len) {
+        attr->user_data = m_new(uint8_t, user_data_len);
+        mp_obj_list_append(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->objs_list, MP_OBJ_FROM_PTR(attr->user_data));
+        memcpy(attr->user_data, pattern->user_data, user_data_len);
+    }
+}
+
+static void add_service(const struct bt_uuid *u, struct bt_gatt_attr *attr) {
+    union uuid_u *uuid = (union uuid_u *)u;
+
+    size_t uuid_size = sizeof(uuid->u16);
+
+    if (uuid->uuid.type == BT_UUID_TYPE_32) {
+        uuid_size = sizeof(uuid->u32);
+    } else if (uuid->uuid.type == BT_UUID_TYPE_128) {
+        uuid_size = sizeof(uuid->u128);
+    }
+
+    gatt_db_add(&(struct bt_gatt_attr)BT_GATT_PRIMARY_SERVICE(&uuid->uuid), attr, uuid_size);
+}
+
+static void add_characteristic(struct add_characteristic *ch, struct bt_gatt_attr *attr_chrc, struct bt_gatt_attr *attr_value) {
+    struct bt_gatt_chrc *chrc_data;
+
+    // Add Characteristic Declaration
+    gatt_db_add(&(struct bt_gatt_attr)
+        BT_GATT_ATTRIBUTE(BT_UUID_GATT_CHRC,
+            BT_GATT_PERM_READ,
+            bt_gatt_attr_read_chrc, NULL,
+            (&(struct bt_gatt_chrc) {})), attr_chrc, sizeof(*chrc_data));
+
+    // Allow prepare writes
+    ch->permissions |= BT_GATT_PERM_PREPARE_WRITE;
+
+    // Add Characteristic Value
+    gatt_db_add(&(struct bt_gatt_attr)
+        BT_GATT_ATTRIBUTE(ch->uuid,
+            ch->permissions & GATT_PERM_MASK,
+            mp_bt_zephyr_gatts_attr_read, mp_bt_zephyr_gatts_attr_write, NULL), attr_value, 0);
+
+    chrc_data = attr_chrc->user_data;
+    chrc_data->properties = ch->properties;
+    chrc_data->uuid = attr_value->uuid;
+}
+
+static void ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value) {
+    mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, attr->handle);
+    entry->data[0] = value;
+}
+
+static struct bt_gatt_attr ccc_definition = BT_GATT_CCC(ccc_cfg_changed, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE);
+
+static void add_ccc(struct bt_gatt_attr *attr, struct bt_gatt_attr *attr_desc) {
+    struct bt_gatt_chrc *chrc = attr->user_data;
+
+    // Check characteristic properties
+    if (!(chrc->properties & (BT_GATT_CHRC_NOTIFY | BT_GATT_CHRC_INDICATE))) {
+        mp_raise_OSError(MP_EINVAL);
+    }
+
+    // Add CCC descriptor to GATT database
+    gatt_db_add(&ccc_definition, attr_desc, 0);
+}
+
+static void add_cep(const struct bt_gatt_attr *attr_chrc, struct bt_gatt_attr *attr_desc) {
+    struct bt_gatt_chrc *chrc = attr_chrc->user_data;
+    struct bt_gatt_cep cep_value;
+
+    // Extended Properties bit shall be set
+    if (!(chrc->properties & BT_GATT_CHRC_EXT_PROP)) {
+        mp_raise_OSError(MP_EINVAL);
+    }
+
+    cep_value.properties = 0x0000;
+
+    // Add CEP descriptor to GATT database
+    gatt_db_add(&(struct bt_gatt_attr)BT_GATT_CEP(&cep_value), attr_desc, sizeof(cep_value));
+}
+
+static void add_descriptor(struct bt_gatt_attr *chrc, struct add_descriptor *d, struct bt_gatt_attr *attr_desc) {
+    if (!bt_uuid_cmp(d->uuid, BT_UUID_GATT_CEP)) {
+        add_cep(chrc, attr_desc);
+    } else if (!bt_uuid_cmp(d->uuid, BT_UUID_GATT_CCC)) {
+        add_ccc(chrc, attr_desc);
+    } else {
+        // Allow prepare writes
+        d->permissions |= BT_GATT_PERM_PREPARE_WRITE;
+
+        gatt_db_add(&(struct bt_gatt_attr)
+            BT_GATT_DESCRIPTOR(d->uuid,
+                d->permissions & GATT_PERM_MASK,
+                mp_bt_zephyr_gatts_attr_read, mp_bt_zephyr_gatts_attr_write, NULL), attr_desc, 0);
+    }
+}
+
 MP_REGISTER_ROOT_POINTER(struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers);
 
 #endif // MICROPY_PY_BLUETOOTH

From 45e4deb96daf23e648d1cb52100d12da275cdfe8 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <antonb@tenstorrent.com>
Date: Thu, 31 Oct 2024 15:41:28 +1100
Subject: [PATCH 2205/3129] zephyr/mpconfigport: Fix mp_int_t and mp_uint_t to
 work on 64-bit archs.

These both need to fit a pointer, so make them `intptr_t` and `uintptr_t`,
similar to other ports.

Signed-off-by: Anton Blanchard <antonb@tenstorrent.com>
---
 ports/zephyr/mpconfigport.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index e015776a4eb64..3a6e93486228a 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -139,8 +139,8 @@ void mp_hal_signal_event(void);
 #define MICROPY_HW_MCU_NAME "unknown-cpu"
 #endif
 
-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_STATE_PORT MP_STATE_VM

From b2cda6c6046132738fdf7d354b811f216c91bf52 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 1 Apr 2025 16:38:47 +1100
Subject: [PATCH 2206/3129] extmod,alif,mimxrt,rp2,stm32: Create common cyw43
 driver config header.

This is only a surface level refactor, some deeper refactoring would be
possible with (for example) the SDIO interface in mimxrt and stm32, or the
BTHCI interface which is is similar on supported ports. But sticking to
cases where the macros are the same across all ports.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/cyw43_config_common.h    | 110 ++++++++++++++++++++++++++++++++
 extmod/mpbthci.h                |   4 ++
 ports/alif/cyw43_configport.h   |  54 +---------------
 ports/mimxrt/cyw43_configport.h |  50 +--------------
 ports/rp2/cyw43_configport.h    |  94 +++++----------------------
 ports/stm32/cyw43_configport.h  |  67 +------------------
 6 files changed, 135 insertions(+), 244 deletions(-)
 create mode 100644 extmod/cyw43_config_common.h

diff --git a/extmod/cyw43_config_common.h b/extmod/cyw43_config_common.h
new file mode 100644
index 0000000000000..091b6d3e650dd
--- /dev/null
+++ b/extmod/cyw43_config_common.h
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Damien P. George, 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_EXTMOD_CYW43_CONFIG_COMMON_H
+#define MICROPY_INCLUDED_EXTMOD_CYW43_CONFIG_COMMON_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 "py/runtime.h"
+#include "extmod/modnetwork.h"
+#include "lwip/apps/mdns.h"
+#include "pendsv.h"
+
+// This file is included at the top of port-specific cyw43_configport.h files,
+// and holds the MicroPython-specific but non-port-specific parts.
+//
+// It's included into both MicroPython sources and the lib/cyw43-driver sources.
+
+#define CYW43_IOCTL_TIMEOUT_US          (1000000)
+#define CYW43_NETUTILS                  (1)
+#define CYW43_PRINTF(...)               mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
+
+#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_HOST_NAME                 mod_network_hostname_data
+
+#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
+#define CYW43_HAL_MAC_BDADDR            MP_HAL_MAC_BDADDR
+
+#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)
+
+// Note: this function is only called if CYW43_POST_POLL_HOOK is defined in cyw43_configport.h
+void cyw43_post_poll_hook(void);
+
+#ifdef MICROPY_EVENT_POLL_HOOK
+// Older style hook macros on some ports
+#define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK
+#else
+// Newer style hooks on other ports
+#define CYW43_EVENT_POLL_HOOK mp_event_handle_nowait()
+#endif
+
+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) {
+    // PendSV may be disabled via CYW43_THREAD_ENTER, so this delay is a busy loop.
+    uint32_t us = ms * 1000;
+    uint32_t start = mp_hal_ticks_us();
+    while (mp_hal_ticks_us() - start < us) {
+        CYW43_EVENT_POLL_HOOK;
+    }
+}
+
+#endif // MICROPY_INCLUDED_EXTMOD_CYW43_CONFIG_COMMON_H
diff --git a/extmod/mpbthci.h b/extmod/mpbthci.h
index c10f99c3dfd7c..3ff8294c4c6c5 100644
--- a/extmod/mpbthci.h
+++ b/extmod/mpbthci.h
@@ -27,6 +27,10 @@
 #ifndef MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
 #define MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
 
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
 #define MICROPY_PY_BLUETOOTH_HCI_READ_MODE_BYTE  (0)
 #define MICROPY_PY_BLUETOOTH_HCI_READ_MODE_PACKET  (1)
 
diff --git a/ports/alif/cyw43_configport.h b/ports/alif/cyw43_configport.h
index 4b5cce67132e9..bfd4364ab9076 100644
--- a/ports/alif/cyw43_configport.h
+++ b/ports/alif/cyw43_configport.h
@@ -27,13 +27,8 @@
 #define MICROPY_INCLUDED_ALIF_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 "py/runtime.h"
-#include "extmod/modnetwork.h"
 #include "extmod/mpbthci.h"
-#include "pendsv.h"
+#include "extmod/cyw43_config_common.h"
 
 #ifndef static_assert
 #define static_assert(expr, msg)        typedef int static_assert_##__LINE__[(expr) ? 1 : -1]
@@ -53,51 +48,15 @@
 #define CYW43_WARN(...)                 mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
 #endif
 
-#define CYW43_IOCTL_TIMEOUT_US          (1000000)
-#define CYW43_SLEEP_MAX                 (50)
-#define CYW43_NETUTILS                  (1)
 #define CYW43_CLEAR_SDIO_INT            (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_HOST_NAME                 mod_network_hostname_data
-
 #define CYW43_SDPCM_SEND_COMMON_WAIT    __WFE()
 #define CYW43_DO_IOCTL_WAIT             // __WFE()
-#define CYW43_EVENT_POLL_HOOK           mp_event_handle_nowait()
-
-#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         0
-
-#define CYW43_HAL_MAC_WLAN0             MP_HAL_MAC_WLAN0
-#define CYW43_HAL_MAC_BDADDR            MP_HAL_MAC_BDADDR
-
-#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_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_uart_set_baudrate     mp_bluetooth_hci_uart_set_baudrate
 #define cyw43_hal_uart_write            mp_bluetooth_hci_uart_write
 #define cyw43_hal_uart_readchar         mp_bluetooth_hci_uart_readchar
 
-#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_PIN_WL_REG_ON             pin_WL_REG_ON
 #define CYW43_PIN_WL_IRQ                pin_WL_IRQ
 
@@ -110,15 +69,7 @@
 
 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) {
-    mp_hal_delay_ms(ms);
-}
+#undef cyw43_hal_pin_config // mp_hal_pin_config on alif port is not API compatible
 
 static inline void cyw43_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint32_t alt) {
     if (mode == MP_HAL_PIN_MODE_INPUT) {
@@ -127,7 +78,6 @@ static inline void cyw43_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uin
         mp_hal_pin_output(pin);
     }
 }
-
 static inline void cyw43_hal_pin_config_irq_falling(mp_hal_pin_obj_t pin, bool enable) {
     mp_hal_pin_config_irq_falling(pin, enable);
 }
diff --git a/ports/mimxrt/cyw43_configport.h b/ports/mimxrt/cyw43_configport.h
index cf2f5d4b9fb55..b1dd6fbe6ae9f 100644
--- a/ports/mimxrt/cyw43_configport.h
+++ b/ports/mimxrt/cyw43_configport.h
@@ -28,12 +28,8 @@
 #define MICROPY_INCLUDED_MIMXRT_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 "extmod/modnetwork.h"
 #include "extmod/mpbthci.h"
-#include "pendsv.h"
+#include "extmod/cyw43_config_common.h"
 #include "sdio.h"
 
 #define CYW43_USE_SPI                   (0)
@@ -61,55 +57,15 @@
 #define CYW43_BT_UART_BAUDRATE_DOWNLOAD_FIRMWARE MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE
 #endif
 
-#define CYW43_IOCTL_TIMEOUT_US          (1000000)
-#define CYW43_SLEEP_MAX                 (50)
-#define CYW43_NETUTILS                  (1)
 #define CYW43_CLEAR_SDIO_INT            (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_HOST_NAME                 mod_network_hostname_data
-
 #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
-#define CYW43_HAL_MAC_BDADDR            MP_HAL_MAC_BDADDR
-
-#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_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_hal_uart_set_baudrate     mp_bluetooth_hci_uart_set_baudrate
 #define cyw43_hal_uart_write            mp_bluetooth_hci_uart_write
 #define cyw43_hal_uart_readchar         mp_bluetooth_hci_uart_readchar
 
-#define cyw43_delay_us                  mp_hal_delay_us
-#define cyw43_delay_ms                  mp_hal_delay_ms
-
 #define cyw43_bluetooth_controller_init     mp_bluetooth_hci_controller_init
 #define cyw43_bluetooth_controller_deinit   mp_bluetooth_hci_controller_deinit
 #define cyw43_bluetooth_controller_woken    mp_bluetooth_hci_controller_woken
@@ -135,7 +91,7 @@
 #define CYW43_PIN_RFSW_VDD              pin_WL_RFSW_VDD
 #endif
 
-#define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
+#undef cyw43_hal_pin_config // mp_hal_pin_config not yet implemented on this port
 
 static inline void cyw43_hal_pin_config(cyw43_hal_pin_obj_t pin, uint8_t mode, uint8_t pull, uint8_t alt) {
     machine_pin_set_mode(pin, mode);
@@ -175,6 +131,4 @@ static inline int cyw43_sdio_transfer_cmd53(bool write, uint32_t block_size, uin
     return sdio_transfer_cmd53(write, block_size, arg, len, buf);
 }
 
-#define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK
-
 #endif // MICROPY_INCLUDED_MIMXRT_CYW43_CONFIGPORT_H
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 5523305742325..ef35cfafc24c2 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -26,34 +26,27 @@
 #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 <stdio.h>
-#include "py/mpconfig.h"
-#include "py/mperrno.h"
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "extmod/modnetwork.h"
-#include "lwip/apps/mdns.h"
-#include "pendsv.h"
+#include "extmod/cyw43_config_common.h"
 
 #define CYW43_INCLUDE_LEGACY_F1_OVERFLOW_WORKAROUND_VARIABLES (1)
 #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)
+#define CYW43_SLEEP_MAX                 (10) // Unclear why rp2 port overrides the default here
 #define CYW43_USE_OTP_MAC               (1)
-#define CYW43_PRINTF(...)               mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
 
-#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
+static inline bool cyw43_poll_is_pending(void) {
+    return pendsv_is_pending(PENDSV_DISPATCH_CYW43);
+}
 
-#define CYW43_THREAD_ENTER              MICROPY_PY_LWIP_ENTER
-#define CYW43_THREAD_EXIT               MICROPY_PY_LWIP_EXIT
-#define CYW43_THREAD_LOCK_CHECK
+static inline void cyw43_yield(void) {
+    if (!cyw43_poll_is_pending()) {
+        best_effort_wfe_or_timeout(make_timeout_time_ms(1));
+    }
+}
 
-#define CYW43_HOST_NAME                 mod_network_hostname_data
+#define CYW43_POST_POLL_HOOK            cyw43_post_poll_hook();
+
+// set in SDK board header
+#define CYW43_NUM_GPIOS                 CYW43_WL_GPIO_COUNT
 
 #if CYW43_PIN_WL_DYNAMIC
 
@@ -100,36 +93,6 @@ uint cyw43_get_pin_wl(cyw43_pin_index_t pin_id);
         cyw43_yield(); \
     } \
 
-#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)
-
 // Bluetooth requires dynamic memory allocation to load its firmware (the allocation
 // call is made from pico-sdk).  This allocation is always done at thread-level, not
 // from an IRQ, so is safe to delegate to the MicroPython GC heap.
@@ -140,34 +103,6 @@ uint cyw43_get_pin_wl(cyw43_pin_index_t pin_id);
 #define cyw43_free m_tracked_free
 #endif
 
-void cyw43_post_poll_hook(void);
-static inline bool cyw43_poll_is_pending(void) {
-    return pendsv_is_pending(PENDSV_DISPATCH_CYW43);
-}
-
-static inline void cyw43_yield(void) {
-    if (!cyw43_poll_is_pending()) {
-        best_effort_wfe_or_timeout(make_timeout_time_ms(1));
-    }
-}
-
-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) {
-    // PendSV may be disabled via CYW43_THREAD_ENTER, so this delay is a busy loop.
-    uint32_t us = ms * 1000;
-    uint32_t start = mp_hal_ticks_us();
-    while (mp_hal_ticks_us() - start < us) {
-        mp_event_handle_nowait();
-    }
-}
-
-#define CYW43_EVENT_POLL_HOOK mp_event_handle_nowait()
-
 #if LWIP_MDNS_RESPONDER == 1
 
 // Hook for any additional TCP/IP initialization than needs to be done.
@@ -183,4 +118,5 @@ static inline void cyw43_delay_ms(uint32_t ms) {
 #endif
 
 #endif
+
 #endif // MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H
diff --git a/ports/stm32/cyw43_configport.h b/ports/stm32/cyw43_configport.h
index c26c55476167c..6528dbc625e85 100644
--- a/ports/stm32/cyw43_configport.h
+++ b/ports/stm32/cyw43_configport.h
@@ -27,14 +27,9 @@
 #ifndef MICROPY_INCLUDED_STM32_CYW43_CONFIGPORT_H
 #define MICROPY_INCLUDED_STM32_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 "extmod/modnetwork.h"
-#include "extmod/mpbthci.h"
 #include "extint.h"
-#include "pendsv.h"
+#include "extmod/mpbthci.h"
+#include "extmod/cyw43_config_common.h"
 #include "sdio.h"
 
 #define CYW43_USE_SPI                   (0)
@@ -62,50 +57,12 @@
 #define CYW43_BT_UART_BAUDRATE_DOWNLOAD_FIRMWARE MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE
 #endif
 
-#define CYW43_IOCTL_TIMEOUT_US          (1000000)
-#define CYW43_SLEEP_MAX                 (50)
-#define CYW43_NETUTILS                  (1)
 #define CYW43_CLEAR_SDIO_INT            (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_HOST_NAME                 mod_network_hostname_data
-
 #define CYW43_SDPCM_SEND_COMMON_WAIT    __WFI();
 #define CYW43_DO_IOCTL_WAIT             __WFI();
 #define CYW43_HAL_UART_READCHAR_BLOCKING_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
-#define CYW43_HAL_MAC_BDADDR            MP_HAL_MAC_BDADDR
-
-#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_hal_uart_set_baudrate     mp_bluetooth_hci_uart_set_baudrate
 #define cyw43_hal_uart_write            mp_bluetooth_hci_uart_write
 #define cyw43_hal_uart_readchar         mp_bluetooth_hci_uart_readchar
@@ -132,24 +89,6 @@
 #define CYW43_PIN_RFSW_SELECT           pyb_pin_WL_GPIO_1
 #endif
 
-#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;
-    uint32_t start = mp_hal_ticks_us();
-    while (mp_hal_ticks_us() - start < us) {
-        MICROPY_EVENT_POLL_HOOK;
-    }
-}
-
 static inline void cyw43_hal_pin_config_irq_falling(cyw43_hal_pin_obj_t pin, int enable) {
     if (enable) {
         extint_set(pin, GPIO_MODE_IT_FALLING);
@@ -184,6 +123,4 @@ static inline int cyw43_sdio_transfer_cmd53(bool write, uint32_t block_size, uin
     return sdio_transfer_cmd53(write, block_size, arg, len, buf);
 }
 
-#define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK
-
 #endif // MICROPY_INCLUDED_STM32_CYW43_CONFIGPORT_H

From d00eab4a3056ebaf47a1d2fdf8c21d132c465055 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 8 Apr 2025 10:23:11 +1000
Subject: [PATCH 2207/3129] rp2,extmod/cyw43: Move the LWIP responder fix into
 common CYW43 config.

This means the fix from dd1465e7 will also apply to stm32 and mimxrt ports
that use CYW43.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/cyw43_config_common.h | 16 ++++++++++++++++
 ports/rp2/cyw43_configport.h | 16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/extmod/cyw43_config_common.h b/extmod/cyw43_config_common.h
index 091b6d3e650dd..595af37d71318 100644
--- a/extmod/cyw43_config_common.h
+++ b/extmod/cyw43_config_common.h
@@ -107,4 +107,20 @@ static inline void cyw43_delay_ms(uint32_t ms) {
     }
 }
 
+#if LWIP_MDNS_RESPONDER == 1
+
+// Hook for any additional TCP/IP initialization than needs to be done.
+// Called after the netif specified by `itf` has been set up.
+#ifndef CYW43_CB_TCPIP_INIT_EXTRA
+#define CYW43_CB_TCPIP_INIT_EXTRA(self, itf) mdns_resp_add_netif(&self->netif[itf], mod_network_hostname_data)
+#endif
+
+// Hook for any additional TCP/IP deinitialization than needs to be done.
+// Called before the netif specified by `itf` is removed.
+#ifndef CYW43_CB_TCPIP_DEINIT_EXTRA
+#define CYW43_CB_TCPIP_DEINIT_EXTRA(self, itf) mdns_resp_remove_netif(&self->netif[itf])
+#endif
+
+#endif
+
 #endif // MICROPY_INCLUDED_EXTMOD_CYW43_CONFIG_COMMON_H
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index ef35cfafc24c2..2da0b1f8a4982 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -103,20 +103,4 @@ uint cyw43_get_pin_wl(cyw43_pin_index_t pin_id);
 #define cyw43_free m_tracked_free
 #endif
 
-#if LWIP_MDNS_RESPONDER == 1
-
-// Hook for any additional TCP/IP initialization than needs to be done.
-// Called after the netif specified by `itf` has been set up.
-#ifndef CYW43_CB_TCPIP_INIT_EXTRA
-#define CYW43_CB_TCPIP_INIT_EXTRA(self, itf) mdns_resp_add_netif(&self->netif[itf], mod_network_hostname_data)
-#endif
-
-// Hook for any additional TCP/IP deinitialization than needs to be done.
-// Called before the netif specified by `itf` is removed.
-#ifndef CYW43_CB_TCPIP_DEINIT_EXTRA
-#define CYW43_CB_TCPIP_DEINIT_EXTRA(self, itf) mdns_resp_remove_netif(&self->netif[itf])
-#endif
-
-#endif
-
 #endif // MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H

From 928466d74c10c09570e63030419804889f8e0e98 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Apr 2025 12:25:05 +1000
Subject: [PATCH 2208/3129] rp2/Makefile: Add deploy target that uses picotool
 load.

This is a convenient way to deploy firmware to an RP2xxx-based board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/Makefile  | 3 +++
 ports/rp2/README.md | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 76b5698d2c8ec..2895faaca6178 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -67,6 +67,9 @@ all:
 clean:
 	$(RM) -rf $(BUILD)
 
+deploy: all
+	$(Q)picotool load -x $(BUILD)/firmware.elf
+
 # First ensure that pico-sdk is initialised, then run CMake with the
 # UPDATE_SUBMODULES flag to update necessary submodules for this board.
 #
diff --git a/ports/rp2/README.md b/ports/rp2/README.md
index 911d797fe01a2..41fca97f95ec9 100644
--- a/ports/rp2/README.md
+++ b/ports/rp2/README.md
@@ -47,8 +47,10 @@ pass the board name to the build; e.g. for Raspberry Pi Pico W:
 ## 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.
+(hold down BOOTSEL while powering on or resetting) and then either copying
+`firmware.uf2` to the USB mass storage device that appears, or using
+`picotool load -x firmware.elf`.  The latter command can be accessed
+conveniently via `make deploy`.
 
 If MicroPython is already installed then the bootloader can be entered by
 executing `import machine; machine.bootloader()` at the REPL.

From 9c8c219f8af4128822dc525cc7d934533bd4675a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Apr 2025 12:51:51 +1000
Subject: [PATCH 2209/3129] rp2/rp2_dma: Fix default value used in pack_ctrl on
 RP2350.

The bit position of CHAIN_TO is not the same as on RP2040.

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

diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
index 78f69e6452758..94c61e226e695 100644
--- a/ports/rp2/rp2_dma.c
+++ b/ports/rp2/rp2_dma.c
@@ -315,7 +315,7 @@ static mp_obj_t rp2_dma_pack_ctrl(size_t n_pos_args, const mp_obj_t *pos_args, m
     // Pack keyword settings into a control register value, using either the default for this
     // DMA channel or the provided defaults
     rp2_dma_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-    mp_uint_t value = DEFAULT_DMA_CONFIG | ((self->channel & 0xf) << 11);
+    mp_uint_t value = DEFAULT_DMA_CONFIG | ((self->channel & 0xf) << DMA_CH0_CTRL_TRIG_CHAIN_TO_LSB);
 
     if (n_pos_args > 1) {
         mp_raise_TypeError(MP_ERROR_TEXT("pack_ctrl only takes keyword arguments"));

From d01a981a9b924ccb8b25b8d13621c3bba3d04bb4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 May 2025 13:49:12 +1000
Subject: [PATCH 2210/3129] py/mpconfig: Enable io.IOBase at core feature
 level.

IOBase is quite an important building block of other parts of the system,
such as `mpremote mount` and running .mpy and native tests.

This feature costs +244 bytes of firmware size on ARM Thumb2 architectures,
which is worth the cost for the extra features it enables.

The change here means that `io.IOBase` is now enabled on all nrf boards,
(previously it was only nRF52840 and nRF9160) and also B_L072Z_LRWAN1
(there is no change to other ports or boards).

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index d06932a77b742..9001b8983bf37 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1469,7 +1469,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 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#define MICROPY_PY_IO_IOBASE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide "io.BytesIO" class

From 3fa77bdc7d413a410fb85a8943d417bca3b562e7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 9 May 2025 14:01:48 +1000
Subject: [PATCH 2211/3129] rp2: Add temporary workaround for GCC 15.1 build
 failure.

This is a workaround for this upstream issue:
https://github.com/raspberrypi/pico-sdk/issues/2448

Can be removed after the next pico-sdk update.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/CMakeLists.txt               |  3 ++
 ports/rp2/tools_patch/Findpioasm.cmake | 58 ++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 ports/rp2/tools_patch/Findpioasm.cmake

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 53d00c7dfdaa4..7cb0c60aa21f4 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -84,6 +84,9 @@ endif()
 list(APPEND GIT_SUBMODULES lib/mbedtls)
 list(APPEND GIT_SUBMODULES lib/tinyusb)
 
+# Workaround for pico-sdk host toolchain issue, see directory for details
+list(APPEND CMAKE_MODULE_PATH "${MICROPY_PORT_DIR}/tools_patch")
+
 # Include component cmake fragments
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
diff --git a/ports/rp2/tools_patch/Findpioasm.cmake b/ports/rp2/tools_patch/Findpioasm.cmake
new file mode 100644
index 0000000000000..72e6bf6fb61c0
--- /dev/null
+++ b/ports/rp2/tools_patch/Findpioasm.cmake
@@ -0,0 +1,58 @@
+# Finds (or builds) the pioasm executable
+#
+# This will define the following imported targets
+#
+#     pioasm
+#
+
+# This is a temporary patched copy of pico-sdk file Findpioasm.cmake to work around
+# a host toolchain issue with GCC 15.1:
+# https://github.com/raspberrypi/pico-sdk/issues/2448
+
+if (NOT TARGET pioasm)
+    # todo we would like to use pckgconfig to look for it first
+    # see https://pabloariasal.github.io/2018/02/19/its-time-to-do-cmake-right/
+
+    include(ExternalProject)
+
+    set(PIOASM_SOURCE_DIR ${PICO_SDK_PATH}/tools/pioasm)
+    set(PIOASM_BINARY_DIR ${CMAKE_BINARY_DIR}/pioasm)
+    set(PIOASM_INSTALL_DIR ${CMAKE_BINARY_DIR}/pioasm-install CACHE PATH "Directory where pioasm has been installed" FORCE)
+
+    set(pioasmBuild_TARGET pioasmBuild)
+    set(pioasm_TARGET pioasm)
+
+    if (NOT TARGET ${pioasmBuild_TARGET})
+        pico_message_debug("PIOASM will need to be built")
+#        message("Adding external project ${pioasmBuild_Target} in ${CMAKE_CURRENT_LIST_DIR}}")
+        ExternalProject_Add(${pioasmBuild_TARGET}
+                PREFIX pioasm
+                SOURCE_DIR ${PIOASM_SOURCE_DIR}
+                BINARY_DIR ${PIOASM_BINARY_DIR}
+                INSTALL_DIR ${PIOASM_INSTALL_DIR}
+                CMAKE_ARGS
+                    "--no-warn-unused-cli"
+                    "-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}"
+                    "-DPIOASM_FLAT_INSTALL=1"
+                    "-DCMAKE_INSTALL_PREFIX=${PIOASM_INSTALL_DIR}"
+                    "-DCMAKE_RULE_MESSAGES=OFF" # quieten the build
+                    "-DCMAKE_INSTALL_MESSAGE=NEVER" # quieten the install
+                    # Toolchain workaround follows
+                    "-DCMAKE_CXX_FLAGS=-include cstdint"
+                CMAKE_CACHE_ARGS "-DPIOASM_EXTRA_SOURCE_FILES:STRING=${PIOASM_EXTRA_SOURCE_FILES}"
+                BUILD_ALWAYS 1 # force dependency checking
+                EXCLUDE_FROM_ALL TRUE
+                )
+    endif()
+
+    if (CMAKE_HOST_WIN32)
+        set(pioasm_EXECUTABLE ${PIOASM_INSTALL_DIR}/pioasm/pioasm.exe)
+    else()
+        set(pioasm_EXECUTABLE ${PIOASM_INSTALL_DIR}/pioasm/pioasm)
+    endif()
+    add_executable(${pioasm_TARGET} IMPORTED GLOBAL)
+    set_property(TARGET ${pioasm_TARGET} PROPERTY IMPORTED_LOCATION
+            ${pioasm_EXECUTABLE})
+
+    add_dependencies(${pioasm_TARGET} ${pioasmBuild_TARGET})
+endif()

From 7d5aba0523cac0a23dc63a5bb4b64a8eab845836 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 9 May 2025 13:34:37 +1000
Subject: [PATCH 2212/3129] extmod/moductypes: Refactor string literal as array
 initializer.

Avoids the new Wunterminated-string-literal when compiled with gcc 15.1.

Also split out the duplicate string to a top-level array (probably the
duplicate string literal was interned, so unlikely to have any impact.)

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/moductypes.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index bf45797658fa0..54abce79e06fe 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -277,15 +277,18 @@ static mp_obj_t uctypes_struct_sizeof(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uctypes_struct_sizeof_obj, 1, 2, uctypes_struct_sizeof);
 
+static const char type2char[16] = {
+    'B', 'b', 'H', 'h', 'I', 'i', 'Q', 'q',
+    '-', '-', '-', '-', '-', '-', 'f', 'd'
+};
+
 static inline mp_obj_t get_unaligned(uint val_type, byte *p, int big_endian) {
     char struct_type = big_endian ? '>' : '<';
-    static const char type2char[16] = "BbHhIiQq------fd";
     return mp_binary_get_val(struct_type, type2char[val_type], p, &p);
 }
 
 static inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) {
     char struct_type = big_endian ? '>' : '<';
-    static const char type2char[16] = "BbHhIiQq------fd";
     mp_binary_set_val(struct_type, type2char[val_type], val, p, &p);
 }
 

From 9f8600588584cb58fcc5593f18b090622a406565 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 9 May 2025 13:36:05 +1000
Subject: [PATCH 2213/3129] py/emitinlinethumb: Refactor string literal as
 array initializer.

Avoids the new Wunterminated-string-literal when compiled with gcc 15.1.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/emitinlinethumb.c | 108 +++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 7818bb4f46da8..d6596337ae5a6 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -150,27 +150,27 @@ typedef struct _reg_name_t { byte reg;
                              byte name[3];
 } reg_name_t;
 static const reg_name_t reg_name_table[] = {
-    {0, "r0\0"},
-    {1, "r1\0"},
-    {2, "r2\0"},
-    {3, "r3\0"},
-    {4, "r4\0"},
-    {5, "r5\0"},
-    {6, "r6\0"},
-    {7, "r7\0"},
-    {8, "r8\0"},
-    {9, "r9\0"},
-    {10, "r10"},
-    {11, "r11"},
-    {12, "r12"},
-    {13, "r13"},
-    {14, "r14"},
-    {15, "r15"},
-    {10, "sl\0"},
-    {11, "fp\0"},
-    {13, "sp\0"},
-    {14, "lr\0"},
-    {15, "pc\0"},
+    {0, {'r', '0' }},
+    {1, {'r', '1' }},
+    {2, {'r', '2' }},
+    {3, {'r', '3' }},
+    {4, {'r', '4' }},
+    {5, {'r', '5' }},
+    {6, {'r', '6' }},
+    {7, {'r', '7' }},
+    {8, {'r', '8' }},
+    {9, {'r', '9' }},
+    {10, {'r', '1', '0' }},
+    {11, {'r', '1', '1' }},
+    {12, {'r', '1', '2' }},
+    {13, {'r', '1', '3' }},
+    {14, {'r', '1', '4' }},
+    {15, {'r', '1', '5' }},
+    {10, {'s', 'l' }},
+    {11, {'f', 'p' }},
+    {13, {'s', 'p' }},
+    {14, {'l', 'r' }},
+    {15, {'p', 'c' }},
 };
 
 #define MAX_SPECIAL_REGISTER_NAME_LENGTH 7
@@ -368,20 +368,20 @@ typedef struct _cc_name_t { byte cc;
                             byte name[2];
 } cc_name_t;
 static const cc_name_t cc_name_table[] = {
-    { ASM_THUMB_CC_EQ, "eq" },
-    { ASM_THUMB_CC_NE, "ne" },
-    { ASM_THUMB_CC_CS, "cs" },
-    { ASM_THUMB_CC_CC, "cc" },
-    { ASM_THUMB_CC_MI, "mi" },
-    { ASM_THUMB_CC_PL, "pl" },
-    { ASM_THUMB_CC_VS, "vs" },
-    { ASM_THUMB_CC_VC, "vc" },
-    { ASM_THUMB_CC_HI, "hi" },
-    { ASM_THUMB_CC_LS, "ls" },
-    { ASM_THUMB_CC_GE, "ge" },
-    { ASM_THUMB_CC_LT, "lt" },
-    { ASM_THUMB_CC_GT, "gt" },
-    { ASM_THUMB_CC_LE, "le" },
+    { ASM_THUMB_CC_EQ, { 'e', 'q' }},
+    { ASM_THUMB_CC_NE, { 'n', 'e' }},
+    { ASM_THUMB_CC_CS, { 'c', 's' }},
+    { ASM_THUMB_CC_CC, { 'c', 'c' }},
+    { ASM_THUMB_CC_MI, { 'm', 'i' }},
+    { ASM_THUMB_CC_PL, { 'p', 'l' }},
+    { ASM_THUMB_CC_VS, { 'v', 's' }},
+    { ASM_THUMB_CC_VC, { 'v', 'c' }},
+    { ASM_THUMB_CC_HI, { 'h', 'i' }},
+    { ASM_THUMB_CC_LS, { 'l', 's' }},
+    { ASM_THUMB_CC_GE, { 'g', 'e' }},
+    { ASM_THUMB_CC_LT, { 'l', 't' }},
+    { ASM_THUMB_CC_GT, { 'g', 't' }},
+    { ASM_THUMB_CC_LE, { 'l', 'e' }},
 };
 
 typedef struct _format_4_op_t { byte op;
@@ -389,21 +389,21 @@ typedef struct _format_4_op_t { byte op;
 } format_4_op_t;
 #define X(x) (((x) >> 4) & 0xff) // only need 1 byte to distinguish these ops
 static const format_4_op_t format_4_op_table[] = {
-    { X(ASM_THUMB_FORMAT_4_EOR), "eor" },
-    { X(ASM_THUMB_FORMAT_4_LSL), "lsl" },
-    { X(ASM_THUMB_FORMAT_4_LSR), "lsr" },
-    { X(ASM_THUMB_FORMAT_4_ASR), "asr" },
-    { X(ASM_THUMB_FORMAT_4_ADC), "adc" },
-    { X(ASM_THUMB_FORMAT_4_SBC), "sbc" },
-    { X(ASM_THUMB_FORMAT_4_ROR), "ror" },
-    { X(ASM_THUMB_FORMAT_4_TST), "tst" },
-    { X(ASM_THUMB_FORMAT_4_NEG), "neg" },
-    { X(ASM_THUMB_FORMAT_4_CMP), "cmp" },
-    { X(ASM_THUMB_FORMAT_4_CMN), "cmn" },
-    { X(ASM_THUMB_FORMAT_4_ORR), "orr" },
-    { X(ASM_THUMB_FORMAT_4_MUL), "mul" },
-    { X(ASM_THUMB_FORMAT_4_BIC), "bic" },
-    { X(ASM_THUMB_FORMAT_4_MVN), "mvn" },
+    { X(ASM_THUMB_FORMAT_4_EOR), {'e', 'o', 'r' }},
+    { X(ASM_THUMB_FORMAT_4_LSL), {'l', 's', 'l' }},
+    { X(ASM_THUMB_FORMAT_4_LSR), {'l', 's', 'r' }},
+    { X(ASM_THUMB_FORMAT_4_ASR), {'a', 's', 'r' }},
+    { X(ASM_THUMB_FORMAT_4_ADC), {'a', 'd', 'c' }},
+    { X(ASM_THUMB_FORMAT_4_SBC), {'s', 'b', 'c' }},
+    { X(ASM_THUMB_FORMAT_4_ROR), {'r', 'o', 'r' }},
+    { X(ASM_THUMB_FORMAT_4_TST), {'t', 's', 't' }},
+    { X(ASM_THUMB_FORMAT_4_NEG), {'n', 'e', 'g' }},
+    { X(ASM_THUMB_FORMAT_4_CMP), {'c', 'm', 'p' }},
+    { X(ASM_THUMB_FORMAT_4_CMN), {'c', 'm', 'n' }},
+    { X(ASM_THUMB_FORMAT_4_ORR), {'o', 'r', 'r' }},
+    { X(ASM_THUMB_FORMAT_4_MUL), {'m', 'u', 'l' }},
+    { X(ASM_THUMB_FORMAT_4_BIC), {'b', 'i', 'c' }},
+    { X(ASM_THUMB_FORMAT_4_MVN), {'m', 'v', 'n' }},
 };
 #undef X
 
@@ -428,10 +428,10 @@ typedef struct _format_vfp_op_t {
     char name[3];
 } format_vfp_op_t;
 static const format_vfp_op_t format_vfp_op_table[] = {
-    { 0x30, "add" },
-    { 0x34, "sub" },
-    { 0x20, "mul" },
-    { 0x80, "div" },
+    { 0x30, {'a', 'd', 'd' }},
+    { 0x34, {'s', 'u', 'b' }},
+    { 0x20, {'m', 'u', 'l' }},
+    { 0x80, {'d', 'i', 'v' }},
 };
 
 // shorthand alias for whether we allow ARMv7-M instructions

From ae6062a45a776e193e8c02ece62d058b64f2b4f5 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 9 May 2025 14:34:09 +1000
Subject: [PATCH 2214/3129] lib/littlefs: Fix string initializer in lfs1.c.

Avoids the new Wunterminated-string-literal when compiled with gcc 15.1.

It would be preferable to just disable this warning, but Clang
-Wunknown-warning-option kicks in even when disabling warnings so this
becomes fiddly to apply.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 lib/littlefs/lfs1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/littlefs/lfs1.c b/lib/littlefs/lfs1.c
index 6a3fd670012cc..ec18dc470258c 100644
--- a/lib/littlefs/lfs1.c
+++ b/lib/littlefs/lfs1.c
@@ -2141,7 +2141,7 @@ int lfs1_format(lfs1_t *lfs1, const struct lfs1_config *cfg) {
             .d.elen = sizeof(superblock.d) - sizeof(superblock.d.magic) - 4,
             .d.nlen = sizeof(superblock.d.magic),
             .d.version = LFS1_DISK_VERSION,
-            .d.magic = {"littlefs"},
+            .d.magic = {'l', 'i', 't', 't', 'l', 'e', 'f', 's'},
             .d.block_size  = lfs1->cfg->block_size,
             .d.block_count = lfs1->cfg->block_count,
             .d.root = {lfs1->root[0], lfs1->root[1]},

From f7c53cd221a4d8b1a7b3098ab71db06d00da51ad Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 May 2025 12:39:29 +1000
Subject: [PATCH 2215/3129] tests/net_inet: Update micropython.org certificate
 for SSL tests.

The Let's Encrypt root certificate has changed so needs updating in these
tests.

Also use `bytes.fromhex()` instead of `binascii.unhexlify()`, to eliminate
the need for the `binascii` module.  Both of these features are controlled
by `MICROPY_PY_BUILTINS_BYTES_HEX`, so the test will still work on the same
targets that it previously did.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/mpycert.der               | Bin 1290 -> 1289 bytes
 tests/net_inet/ssl_cert.py               |  79 +++++++++++------------
 tests/net_inet/test_sslcontext_client.py |  10 ++-
 3 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/tests/net_inet/mpycert.der b/tests/net_inet/mpycert.der
index 0b0eabc9bc8135de25785cb8574ab78e03947aa9..ac22dcf9e8b888a98c10bd12f2108feb696b68c8 100644
GIT binary patch
delta 849
zcmV-X1Frmv3W*9IFoFdIFoFW@paTK{0s;_As8W;nnlGYr21}>}jdjqGAhZE6k<}r8
z&sXK<#8eXPv`7BQCs=kyP$-NYK8W81oz=A%DZSmbTEF`C&ZEAs03l0aT3S2-FU42`
z_KE+F5ku?2wcr#7mXB{A*XO!{ISF-Tx5BR&TQ?>s=cDuoD{UJ8t6031u0a3k%U8s;
zTYq>B7-75@=TyeKNs-NN7}0=*?xtmbHoSD|yiiQ){2}u=7L$~^u+wWe2F(@{ddgCD
z$gOs=!kk^0MO<%Td&Vv9JQGre0ohmPI2_-NwI7m^n&(O!%tfejRq(LpqX+E$ryFLT
zKS+ylgmGBOI{NQk@>@hJJap%evPZ!OYR#Ir4VL#3fhJK@3hZI__x0lPipZ4$4ULob
z0a+Bgyu(MO<h-fI!=!Qy5RIZW;mGKdV*;mtlCkGOH|u$wf#%KPCE+?C>5xQ~qk&w{
z!(IKopm5c(mM9_%(()+J4CmD5LyROM9l=79(Fw1gOZ3QaPaqbtTHOKmANU_(YZNE2
za*boI?&8i%&o|w>qtwmktx&DKzvJvaVm5G@F{kK_-RffE60Y@})IBT=s?eNyzUn=H
zTtse`F=JYN)_zYUpi2dRUT@OW>R&TU6V_L@%HC19U84ztbp6M8p0l~E7TQWHmczD-
zVvqTB8KRy8-sx|fun*FpTK0up!UVU-)lM?RzXV;pDfah)j|^QrQ^`P(i~F_+Wx1pw
z)d}SjgoHPO&JZa4cEScFdPY)B+Ea3Wq$fXOaIC&*NC5k158GRz=+^@wE!WBRnL;^(
zL*I7_5(x1n*1D7#R2Yb*#g5?`nUi^I>>T+qK(Nd*0N<Zp=d_Zmkb;qo4d5P?x>-9e
zOJBmbMm1772Ee_ltWv=uphTCM_Y9yRr=e_dM-~?WXu!&*CS?SCv#!bKlvToiZ<{<E
zsrfF&AR6#?;J)k_)=$_a`*soNzvdwi=;+L~wx`v&_n$$}VIoFqgSKdwE_~`vmD?lh
zF32k=grs2UN%TZ6JNe3DR{`Q(kQVvL{CXouj;7Uta`7noUC#UMPIHfxF494in3>zB
buW(=WzWV|ozh)<Fw5|Ge5(_H?KF$N4`0cGR

delta 850
zcmV-Y1Figt3W^FKFoFdJFoFW^paTK{0s;{LihVv4)-N#cBZj>x2WvF=ksq`HF_F|E
zf4YafTpIv6%gPGP)MpU+0X(HnrD4k^%2N9k0k^p*^(Y?gC$l6NIcEtB2<+fGuse4S
zz4PTcR6z_*u0htBbly?h?|c7Py{NYn_TDko@^Z;?Y72vOm7GQZWE7e6vDqTo&8U*9
z942}{{_j`?dkB?*+i?$$`{OYQy9vHfe@$PHk#;>=ot}g8>BMHU;Ra?yNEm=+pf?zr
zn}jl#v9i6y_!R)1Cy4vvV;7cen<r;W#M>xdX~KE%NnGG0P~pV9p#`jaKy3iD!a+Z$
zShz36T$`o437+x(>#&76{iq7>MZ|dPWh%nYUp(I9TumGI3nwe83qp5OPkCw`0*Bd?
z^#NHF#m`2h>h#0FdTf=%EwEmaFDB!;lVSp=e@^0wT?zvnkT}rwANg@y_`{E~H;8&~
zuq7YuzPH$h29D_ogw1llf%E*z&r?Y4z4mEB)TI$VHOLdPk{tzK>MqpS_({X9^_iBO
z?<Uycv?L2iAWi(!RJ5taA;{r28~=A?DHpl$OYdFk&3VwjkiWhovXI(JsYo$&sYDCm
zf8zEngK?yFd(xD_1sO&hxsUV2bVwyC4dwOQL*m<$o4FaZA1~i(4v#U@V-LG2+}&m@
zKd>8TQTRbT<W0G(xTKtBWA&?rBOT0BwySZj+{FQL+BWVA7%DRT2{C++_H*Z)oV7|7
zYIlNK&)SVe{vRr21u#By!p01_);nWLf2&3V{+Yl=Kqp{h-%vUSN7xlgpXx^+nOX>9
z47O}D2u;^G?MN*y1!%5-UGGfX*dRe)Xz{yR&EpQR3^9kBL*7Y4;m8C((L5W6MKEco
zsd5f^5*#tuJ|kD%r%#~p9D&hyA8*#uxu~-P7J)fSpH;5XYUH!O>ZR46OQXrwe>-yX
zO7>K%4E#9vV1VClHOh6NROBzbZWqZKr8l*rn!4=tz;#AXcc|!DR*_~cZr&+@)~1&Q
zUSvhSEY9j=LPW5`Pp$B@+yly)n+bxIf(>JeX89R%_|>_I5aNlL2{rkm9KMosBXsGV
cAJ;odnuJ&o!t<x%HSB&nMb0or1X63jz{`)ILI3~&

diff --git a/tests/net_inet/ssl_cert.py b/tests/net_inet/ssl_cert.py
index 3597b7855db4f..83d83e3f8e572 100644
--- a/tests/net_inet/ssl_cert.py
+++ b/tests/net_inet/ssl_cert.py
@@ -1,4 +1,3 @@
-import binascii
 import socket
 import ssl
 
@@ -6,48 +5,48 @@
 # 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=R11
+# 1 s:C=US, O=Let's Encrypt, CN=R10
 #   i:C=US, O=Internet Security Research Group, CN=ISRG Root X1
-#   a:PKEY: rsaEncryption, 2048 (bit); sigalg: RSA-SHA256
+#   a:PKEY: RSA, 2048 (bit); sigalg: sha256WithRSAEncryption
 #   v:NotBefore: Mar 13 00:00:00 2024 GMT; NotAfter: Mar 12 23:59:59 2027 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).
+# Copy PEM content to a file (mpycert.pem) and convert to DER e.g.
+# $ openssl x509 -in mpycert.pem -out mpycert.der -outform DER
+# Then convert to hex format using: for i in range(0,len(data),40):print(data[i:i+40].hex())
 
-ca_cert_chain = binascii.unhexlify(
-    b"30820506308202eea0030201020211008a7d3e13d62f30ef2386bd29076b34f8300d06092a864886"
-    b"f70d01010b0500304f310b300906035504061302555331293027060355040a1320496e7465726e65"
-    b"742053656375726974792052657365617263682047726f7570311530130603550403130c49535247"
-    b"20526f6f74205831301e170d3234303331333030303030305a170d3237303331323233353935395a"
-    b"3033310b300906035504061302555331163014060355040a130d4c6574277320456e637279707431"
-    b"0c300a0603550403130352313130820122300d06092a864886f70d01010105000382010f00308201"
-    b"0a0282010100ba87bc5c1b0039cbca0acdd46710f9013ca54ea561cb26ca52fb1501b7b928f5281e"
-    b"ed27b324183967090c08ece03ab03b770ebdf3e53954410c4eae41d69974de51dbef7bff58bda8b7"
-    b"13f6de31d5f272c9726a0b8374959c4600641499f3b1d922d9cda892aa1c267a3ffeef58057b0895"
-    b"81db710f8efbe33109bb09be504d5f8f91763d5a9d9e83f2e9c466b3e106664348188065a037189a"
-    b"9b843297b1b2bdc4f815009d2788fbe26317966c9b27674bc4db285e69c279f0495ce02450e1c4bc"
-    b"a105ac7b406d00b4c2413fa758b82fc55c9ba5bb099ef1feebb08539fda80aef45c478eb652ac2cf"
-    b"5f3cdee35c4d1bf70b272baa0b4277534f796a1d87d90203010001a381f83081f5300e0603551d0f"
-    b"0101ff040403020186301d0603551d250416301406082b0601050507030206082b06010505070301"
-    b"30120603551d130101ff040830060101ff020100301d0603551d0e04160414c5cf46a4eaf4c3c07a"
-    b"6c95c42db05e922f26e3b9301f0603551d2304183016801479b459e67bb6e5e40173800888c81a58"
-    b"f6e99b6e303206082b0601050507010104263024302206082b060105050730028616687474703a2f"
-    b"2f78312e692e6c656e63722e6f72672f30130603551d20040c300a3008060667810c010201302706"
-    b"03551d1f0420301e301ca01aa0188616687474703a2f2f78312e632e6c656e63722e6f72672f300d"
-    b"06092a864886f70d01010b050003820201004ee2895d0a031c9038d0f51ff9715cf8c38fb237887a"
-    b"6fb0251fedbeb7d886068ee90984cd72bf81f3fccacf5348edbdf66942d4a5113e35c813b2921d05"
-    b"5fea2ed4d8f849c3adf599969cef26d8e1b4240b48204dfcd354b4a9c621c8e1361bff77642917b9"
-    b"f04bef5deacd79d0bf90bfbe23b290da4aa9483174a9440be1e2f62d8371a4757bd294c10519461c"
-    b"b98ff3c47448252a0de5f5db43e2db939bb919b41f2fdf6a0e8f31d3630fbb29dcdd662c3fb01b67"
-    b"51f8413ce44db9acb8a49c6663f5ab85231dcc53b6ab71aedcc50171da36ee0a182a32fd09317c8f"
-    b"f673e79c9cb54a156a77825acfda8d45fe1f2a6405303e73c2c60cb9d63b634aab4603fe99c04640"
-    b"276063df503a0747d8154a9fea471f995a08620cb66c33084dd738ed482d2e0568ae805def4cdcd8"
-    b"20415f68f1bb5acde30eb00c31879b43de4943e1c8043fd13c1b87453069a8a9720e79121c31d83e"
-    b"2357dda74fa0f01c81d1771f6fd6d2b9a8b3031681394b9f55aed26ae4b3bfeaa5d59f4ba3c9d63b"
-    b"72f34af654ab0cfc38f76080df6e35ca75a154e42fbc6e17c91aa537b5a29abaecf4c075464f77a8"
-    b"e8595691662d6ede2981d6a697055e6445be2cceea644244b0c34fadf0b4dc03ca999b098295820d"
-    b"638a66f91972f8d5b98910e289980935f9a21cbe92732374e99d1fd73b4a9a845810c2f3a7e235ec"
-    b"7e3b45ce3046526bc0c0"
+ca_cert_chain = bytes.fromhex(
+    "30820505308202eda00302010202104ba85293f79a2fa273064ba8048d75d0300d06092a864886f7"
+    "0d01010b0500304f310b300906035504061302555331293027060355040a1320496e7465726e6574"
+    "2053656375726974792052657365617263682047726f7570311530130603550403130c4953524720"
+    "526f6f74205831301e170d3234303331333030303030305a170d3237303331323233353935395a30"
+    "33310b300906035504061302555331163014060355040a130d4c6574277320456e6372797074310c"
+    "300a0603550403130352313030820122300d06092a864886f70d01010105000382010f003082010a"
+    "0282010100cf57e5e6c45412edb447fec92758764650288c1d3e88df059dd5b51829bdddb55abffa"
+    "f6cea3beaf00214b625a5a3c012fc55803f689ff8e1143ebc1b5e01407968f6f1fd7e7ba81390975"
+    "65b7c2af185b372628e7a3f4072b6d1affab58bc95ae40ffe9cb57c4b55b7f780d1861bc17e754c6"
+    "bb4991cd6e18d18085eea66536bc74eabc504ceafc21f338169394bab0d36b3806cd16127aca5275"
+    "c8ad76b2c29c5d98455c6f617bc62dee3c13528601d957e6381cdf8db51f92919ae74a1ccc45a872"
+    "55f0b0e6a307ecfda71b669e3f488b71847158c93afaef5ef25b442b3c74e78fb247c1076acd9ab7"
+    "0d96f712812651540aec61f6f7f5e2f28ac8950d8d0203010001a381f83081f5300e0603551d0f01"
+    "01ff040403020186301d0603551d250416301406082b0601050507030206082b0601050507030130"
+    "120603551d130101ff040830060101ff020100301d0603551d0e04160414bbbcc347a5e4bca9c6c3"
+    "a4720c108da235e1c8e8301f0603551d2304183016801479b459e67bb6e5e40173800888c81a58f6"
+    "e99b6e303206082b0601050507010104263024302206082b060105050730028616687474703a2f2f"
+    "78312e692e6c656e63722e6f72672f30130603551d20040c300a3008060667810c01020130270603"
+    "551d1f0420301e301ca01aa0188616687474703a2f2f78312e632e6c656e63722e6f72672f300d06"
+    "092a864886f70d01010b0500038202010092b1e74137eb799d81e6cde225e13a20e9904495a3815c"
+    "cfc35dfdbda070d5b19628220bd2f228cf0ce7d4e6438c24221dc14292d109af9f4bf4c8704f2016"
+    "b15add01f61ff81f616b1427b0728d63aeeee2ce4bcf37ddbba3d4cde7ad50adbdbfe3ec3e623670"
+    "9931a7e88dddea62e212aef59cd43d2c0caad09c79beea3d5c446e9631635a7dd67e4f24a04b057f"
+    "5e6fd2d4ea5f334b13d657b6cade51b85da3098274fdc7789eb3b9ac16da4a2b96c3b68b628ff974"
+    "19a29e03dee96f9bb00fd2a05af6855cc204b7c8d54e32c4bf045dbc29f6f7818f0c5d3c53c94090"
+    "8bfbb60865b9a421d509e51384843782ce1028fc76c206257a46524dda5372a4273f6270acbe6948"
+    "00fb670fdb5ba1e8d703212dd7c9f69942398343df770a1208f125d6ba9419541888a5c58ee11a99"
+    "93796bec1cf93140b0cc3200df9f5ee7b492ab9082918d0de01e95ba593b2e4b5fc2b74635523906"
+    "c0bdaaac52c122a0449799f70ca021a7a16c714716170168c0caa62665047cb3aec9e79455c26f9b"
+    "3c1ca9f92ec5201af076e0beec18d64fd825fb7611e8bfe6210fe8e8ccb5b6a7d5b8f79f41cf6122"
+    "466a83b668972e7cea4e95db23eb2ec82b2884a460e949f4442e3bf9ca625701e25d9016f9c9fc7a"
+    "23488ea6d58172f128fa5dcefbed4e738f942ed241949899dba7af705ff5befb0220bf66276cb4ad"
+    "fa75120b2b3ece039e"
 )
 
 
diff --git a/tests/net_inet/test_sslcontext_client.py b/tests/net_inet/test_sslcontext_client.py
index 30ec0ac7c83fc..119a42721fa3f 100644
--- a/tests/net_inet/test_sslcontext_client.py
+++ b/tests/net_inet/test_sslcontext_client.py
@@ -5,14 +5,12 @@
 # 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=R11
+# 1 s:C=US, O=Let's Encrypt, CN=R10
 #   i:C=US, O=Internet Security Research Group, CN=ISRG Root X1
-#   a:PKEY: rsaEncryption, 2048 (bit); sigalg: RSA-SHA256
+#   a:PKEY: RSA, 2048 (bit); sigalg: sha256WithRSAEncryption
 #   v:NotBefore: Mar 13 00:00:00 2024 GMT; NotAfter: Mar 12 23:59:59 2027 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).
-
+# Copy PEM content to a file (mpycert.pem) and convert to DER e.g.
+# $ openssl x509 -in mpycert.pem -out mpycert.der -outform DER
 
 ca_cert_chain = "mpycert.der"
 try:

From 487c94c2532ebb1b346afb92cb79a6b561e064be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 May 2025 13:56:01 +1000
Subject: [PATCH 2216/3129] tests/extmod/vfs_rom.py: Clear sys.path before
 running test.

Otherwise if the target has certain files/directories (such as "test") in
its filesystem then these interfere with the unit tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_rom.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py
index 770b6863b9c43..cd14542ea6b09 100644
--- a/tests/extmod/vfs_rom.py
+++ b/tests/extmod/vfs_rom.py
@@ -394,6 +394,7 @@ class TestMounted(TestBase):
     def setUp(self):
         self.orig_sys_path = list(sys.path)
         self.orig_cwd = os.getcwd()
+        sys.path = []
         vfs.mount(vfs.VfsRom(self.romfs), "/test_rom")
 
     def tearDown(self):

From 61eedbbd1126f895f729a1cf5f9e52e42ddcd471 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Sep 2024 12:43:16 +1000
Subject: [PATCH 2217/3129] tools/verifygitlog.py: Apply stricter rules on git
 subject line.

There is a bit of ambiguity as to how the prefix of the git subject line
should look like.  Eg `py/vm: ...` vs `py/vm.c: ...` (whether the extension
should be there or not).

This commit makes the existing CI check of the git commit message stricter,
by applying extra rules to the prefix, the bit before the : in the subject
line.  It now checks that the subject prefix:
- doesn't start with unwanted bits: ., /, ports/
- doesn't have an extension: .c, .h, .cpp, .js, .rst or .md

Full error messages are given when a rule does not pass.

This helps to reduce maintainer burden by applying stricter rules, to keep
the git commit history consistent.

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

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index 67215d5c5d066..5234611983be6 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -96,6 +96,9 @@ def verify_message_body(raw_body, err):
     if len(subject_line) >= 73:
         err.error("Subject line must be 72 or fewer characters: " + subject_line)
 
+    # Do additional checks on the prefix of the subject line.
+    verify_subject_line_prefix(subject_line.split(": ")[0], err)
+
     # Second one divides subject and body.
     if len(raw_body) > 1 and raw_body[1]:
         err.error("Second message line must be empty: " + raw_body[1])
@@ -110,6 +113,26 @@ def verify_message_body(raw_body, err):
         err.error('Message must be signed-off. Use "git commit -s".')
 
 
+def verify_subject_line_prefix(prefix, err):
+    ext = (".c", ".h", ".cpp", ".js", ".rst", ".md")
+
+    if prefix.startswith("."):
+        err.error('Subject prefix cannot begin with ".".')
+
+    if prefix.endswith("/"):
+        err.error('Subject prefix cannot end with "/".')
+
+    if prefix.startswith("ports/"):
+        err.error(
+            'Subject prefix cannot begin with "ports/", start with the name of the port instead.'
+        )
+
+    if prefix.endswith(ext):
+        err.error(
+            "Subject prefix cannot end with a file extension, use the main part of the filename without the extension."
+        )
+
+
 def run(args):
     verbose("run", *args)
 

From 26e978e7bc0b799d8b75d7cfe0219d2b788affa6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 May 2025 13:05:13 +1000
Subject: [PATCH 2218/3129] extmod/modlwip: Implement a queue of incoming
 UDP/raw packets.

The bare-metal lwIP socket interface is currently quite limited when used
for UDP streams, because it only allows one outstanding incoming UDP
packet.  If one UDP packet is waiting to be socket.recv'd and another one
comes along, then the second one is simply dropped.

This commit implements a queue for incoming UDP and raw packets.  The queue
depth is fixed at compile time, and is currently 4.

This allows better use of UDP connections, eg more efficient.  It also
makes DTLS work better which sometimes has a queue of UDP packets (eg
during the connection phase).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modlwip.c | 167 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 114 insertions(+), 53 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index f109e0029bb0f..961803f5e84dd 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -286,6 +286,15 @@ static const int error_lookup_table[] = {
 #define MOD_NETWORK_SOCK_DGRAM (2)
 #define MOD_NETWORK_SOCK_RAW (3)
 
+// Total queue length for buffered UDP/raw incoming packets.
+#define LWIP_INCOMING_PACKET_QUEUE_LEN (4)
+
+typedef struct _lwip_incoming_packet_t {
+    struct pbuf *pbuf;
+    ip_addr_t peer_addr;
+    uint16_t peer_port;
+} lwip_incoming_packet_t;
+
 typedef struct _lwip_socket_obj_t {
     mp_obj_base_t base;
 
@@ -294,8 +303,11 @@ typedef struct _lwip_socket_obj_t {
         struct udp_pcb *udp;
         struct raw_pcb *raw;
     } pcb;
+
+    // Data structure that holds incoming pbuf's.
+    // Each socket type has different state that it needs to keep track of.
     volatile union {
-        struct pbuf *pbuf;
+        // TCP listening sockets have a queue of incoming connections, implemented as a ringbuffer.
         struct {
             uint8_t alloc;
             uint8_t iget;
@@ -305,10 +317,23 @@ typedef struct _lwip_socket_obj_t {
                 struct tcp_pcb **array; // if alloc != 0
             } tcp;
         } connection;
+
+        // Connected TCP sockets have a single incoming pbuf that new data is appended to.
+        struct {
+            struct pbuf *pbuf;
+        } tcp;
+
+        // UDP and raw sockets have a queue of incoming pbuf's, implemented as a ringbuffer.
+        struct {
+            uint8_t iget; // ringbuffer read index
+            uint8_t iput; // ringbuffer write index
+            lwip_incoming_packet_t *array;
+        } udp_raw;
     } incoming;
+
     mp_obj_t callback;
-    ip_addr_t peer;
-    mp_uint_t peer_port;
+    ip_addr_t tcp_peer_addr;
+    mp_uint_t tcp_peer_port;
     mp_uint_t timeout;
     uint16_t recv_offset;
 
@@ -347,9 +372,21 @@ static void lwip_socket_free_incoming(lwip_socket_obj_t *socket) {
         && socket->pcb.tcp->state == LISTEN;
 
     if (!socket_is_listener) {
-        if (socket->incoming.pbuf != NULL) {
-            pbuf_free(socket->incoming.pbuf);
-            socket->incoming.pbuf = NULL;
+        if (socket->type == MOD_NETWORK_SOCK_STREAM) {
+            if (socket->incoming.tcp.pbuf != NULL) {
+                pbuf_free(socket->incoming.tcp.pbuf);
+                socket->incoming.tcp.pbuf = NULL;
+            }
+        } else {
+            for (size_t i = 0; i < LWIP_INCOMING_PACKET_QUEUE_LEN; ++i) {
+                lwip_incoming_packet_t *slot = &socket->incoming.udp_raw.array[i];
+                if (slot->pbuf != NULL) {
+                    pbuf_free(slot->pbuf);
+                    slot->pbuf = NULL;
+                }
+            }
+            socket->incoming.udp_raw.iget = 0;
+            socket->incoming.udp_raw.iput = 0;
         }
     } else {
         uint8_t alloc = socket->incoming.connection.alloc;
@@ -407,6 +444,19 @@ static inline void exec_user_callback(lwip_socket_obj_t *socket) {
     }
 }
 
+static void udp_raw_incoming(lwip_socket_obj_t *socket, struct pbuf *p, const ip_addr_t *addr, u16_t port) {
+    lwip_incoming_packet_t *slot = &socket->incoming.udp_raw.array[socket->incoming.udp_raw.iput];
+    if (slot->pbuf != NULL) {
+        // No room in the inn, drop the packet.
+        pbuf_free(p);
+    } else {
+        slot->pbuf = p;
+        slot->peer_addr = *addr;
+        slot->peer_port = port;
+        socket->incoming.udp_raw.iput = (socket->incoming.udp_raw.iput + 1) % LWIP_INCOMING_PACKET_QUEUE_LEN;
+    }
+}
+
 #if MICROPY_PY_LWIP_SOCK_RAW
 // Callback for incoming raw packets.
 #if LWIP_VERSION_MAJOR < 2
@@ -416,13 +466,7 @@ static u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, c
 #endif
 {
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
-
-    if (socket->incoming.pbuf != NULL) {
-        pbuf_free(p);
-    } else {
-        socket->incoming.pbuf = p;
-        memcpy(&socket->peer, addr, sizeof(socket->peer));
-    }
+    udp_raw_incoming(socket, p, addr, 0);
     return 1; // we ate the packet
 }
 #endif
@@ -436,15 +480,7 @@ static void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p,
 #endif
 {
     lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
-
-    if (socket->incoming.pbuf != NULL) {
-        // That's why they call it "unreliable". No room in the inn, drop the packet.
-        pbuf_free(p);
-    } else {
-        socket->incoming.pbuf = p;
-        socket->peer_port = (mp_uint_t)port;
-        memcpy(&socket->peer, addr, sizeof(socket->peer));
-    }
+    udp_raw_incoming(socket, p, addr, port);
 }
 
 // Callback for general tcp errors.
@@ -562,13 +598,13 @@ static err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err
         return ERR_OK;
     }
 
-    if (socket->incoming.pbuf == NULL) {
-        socket->incoming.pbuf = p;
+    if (socket->incoming.tcp.pbuf == NULL) {
+        socket->incoming.tcp.pbuf = p;
     } else {
         #ifdef SOCKET_SINGLE_PBUF
         return ERR_BUF;
         #else
-        pbuf_cat(socket->incoming.pbuf, p);
+        pbuf_cat(socket->incoming.tcp.pbuf, p);
         #endif
     }
 
@@ -639,7 +675,9 @@ static mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, m
 // Helper function for recv/recvfrom to handle raw/UDP packets
 static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, ip_addr_t *ip, mp_uint_t *port, int *_errno) {
 
-    if (socket->incoming.pbuf == NULL) {
+    lwip_incoming_packet_t *slot = &socket->incoming.udp_raw.array[socket->incoming.udp_raw.iget];
+
+    if (slot->pbuf == NULL) {
         if (socket->timeout == 0) {
             // Non-blocking socket.
             *_errno = MP_EAGAIN;
@@ -648,7 +686,7 @@ static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_u
 
         // Wait for data to arrive on UDP socket.
         mp_uint_t start = mp_hal_ticks_ms();
-        while (socket->incoming.pbuf == NULL) {
+        while (slot->pbuf == NULL) {
             if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
                 *_errno = MP_ETIMEDOUT;
                 return -1;
@@ -658,17 +696,18 @@ static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_u
     }
 
     if (ip != NULL) {
-        memcpy(ip, &socket->peer, sizeof(socket->peer));
-        *port = socket->peer_port;
+        *ip = slot->peer_addr;
+        *port = slot->peer_port;
     }
 
-    struct pbuf *p = socket->incoming.pbuf;
+    struct pbuf *p = slot->pbuf;
 
     MICROPY_PY_LWIP_ENTER
 
     u16_t result = pbuf_copy_partial(p, buf, ((p->tot_len > len) ? len : p->tot_len), 0);
     pbuf_free(p);
-    socket->incoming.pbuf = NULL;
+    slot->pbuf = NULL;
+    socket->incoming.udp_raw.iget = (socket->incoming.udp_raw.iget + 1) % LWIP_INCOMING_PACKET_QUEUE_LEN;
 
     MICROPY_PY_LWIP_EXIT
 
@@ -780,7 +819,7 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
     // Check for any pending errors
     STREAM_ERROR_CHECK(socket);
 
-    if (socket->incoming.pbuf == NULL) {
+    if (socket->incoming.tcp.pbuf == NULL) {
 
         // Non-blocking socket
         if (socket->timeout == 0) {
@@ -792,7 +831,7 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
         }
 
         mp_uint_t start = mp_hal_ticks_ms();
-        while (socket->state == STATE_CONNECTED && socket->incoming.pbuf == NULL) {
+        while (socket->state == STATE_CONNECTED && socket->incoming.tcp.pbuf == NULL) {
             if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
                 *_errno = MP_ETIMEDOUT;
                 return -1;
@@ -801,7 +840,7 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
         }
 
         if (socket->state == STATE_PEER_CLOSED) {
-            if (socket->incoming.pbuf == NULL) {
+            if (socket->incoming.tcp.pbuf == NULL) {
                 // socket closed and no data left in buffer
                 return 0;
             }
@@ -819,7 +858,7 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
 
     assert(socket->pcb.tcp != NULL);
 
-    struct pbuf *p = socket->incoming.pbuf;
+    struct pbuf *p = socket->incoming.tcp.pbuf;
 
     mp_uint_t remaining = p->len - socket->recv_offset;
     if (len > remaining) {
@@ -830,7 +869,7 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
 
     remaining -= len;
     if (remaining == 0) {
-        socket->incoming.pbuf = p->next;
+        socket->incoming.tcp.pbuf = p->next;
         // If we don't ref here, free() will free the entire chain,
         // if we ref, it does what we need: frees 1st buf, and decrements
         // next buf's refcount back to 1.
@@ -854,8 +893,18 @@ static const mp_obj_type_t lwip_socket_type;
 
 static void lwip_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     lwip_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<socket state=%d timeout=%d incoming=%p off=%d>", self->state, self->timeout,
-        self->incoming.pbuf, self->recv_offset);
+    mp_printf(print, "<socket state=%d timeout=%d incoming=", self->state, self->timeout);
+    if (self->type == MOD_NETWORK_SOCK_STREAM) {
+        mp_printf(print, "%p off=%d>", self->incoming.tcp.pbuf, self->recv_offset);
+    } else {
+        int num_in_queue = 0;
+        for (size_t i = 0; i < LWIP_INCOMING_PACKET_QUEUE_LEN; ++i) {
+            if (self->incoming.udp_raw.array[i].pbuf != NULL) {
+                ++num_in_queue;
+            }
+        }
+        mp_printf(print, "%d>", num_in_queue);
+    }
 }
 
 // FIXME: Only supports two arguments at present
@@ -884,16 +933,22 @@ static mp_obj_t lwip_socket_make_new(const mp_obj_type_t *type, size_t n_args, s
             socket->incoming.connection.tcp.item = NULL;
             break;
         case MOD_NETWORK_SOCK_DGRAM:
-            socket->pcb.udp = udp_new();
-            socket->incoming.pbuf = NULL;
-            break;
         #if MICROPY_PY_LWIP_SOCK_RAW
-        case MOD_NETWORK_SOCK_RAW: {
-            mp_int_t proto = n_args <= 2 ? 0 : mp_obj_get_int(args[2]);
-            socket->pcb.raw = raw_new(proto);
-            break;
-        }
+        case MOD_NETWORK_SOCK_RAW:
         #endif
+            if (socket->type == MOD_NETWORK_SOCK_DGRAM) {
+                socket->pcb.udp = udp_new();
+            }
+            #if MICROPY_PY_LWIP_SOCK_RAW
+            else {
+                mp_int_t proto = n_args <= 2 ? 0 : mp_obj_get_int(args[2]);
+                socket->pcb.raw = raw_new(proto);
+            }
+            #endif
+            socket->incoming.udp_raw.iget = 0;
+            socket->incoming.udp_raw.iput = 0;
+            socket->incoming.udp_raw.array = m_new0(lwip_incoming_packet_t, LWIP_INCOMING_PACKET_QUEUE_LEN);
+            break;
         default:
             mp_raise_OSError(MP_EINVAL);
     }
@@ -1075,7 +1130,7 @@ static mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
     // ...and set up the new socket for it.
     socket2->domain = MOD_NETWORK_AF_INET;
     socket2->type = MOD_NETWORK_SOCK_STREAM;
-    socket2->incoming.pbuf = NULL;
+    socket2->incoming.tcp.pbuf = NULL;
     socket2->timeout = socket->timeout;
     socket2->state = STATE_CONNECTED;
     socket2->recv_offset = 0;
@@ -1130,8 +1185,8 @@ static mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
                 socket->state = STATE_NEW;
                 mp_raise_OSError(error_lookup_table[-err]);
             }
-            socket->peer_port = (mp_uint_t)port;
-            memcpy(&socket->peer, &dest, sizeof(socket->peer));
+            socket->tcp_peer_addr = dest;
+            socket->tcp_peer_port = (mp_uint_t)port;
             MICROPY_PY_LWIP_EXIT
 
             // And now we wait...
@@ -1299,8 +1354,8 @@ static mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     mp_uint_t ret = 0;
     switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM: {
-            memcpy(&ip, &socket->peer, sizeof(socket->peer));
-            port = (mp_uint_t)socket->peer_port;
+            ip = socket->tcp_peer_addr;
+            port = (mp_uint_t)socket->tcp_peer_port;
             ret = lwip_tcp_receive(socket, (byte *)vstr.buf, len, &_errno);
             break;
         }
@@ -1537,9 +1592,15 @@ static mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
                 if (lwip_socket_incoming_array(socket)[socket->incoming.connection.iget] != NULL) {
                     ret |= MP_STREAM_POLL_RD;
                 }
+            } else if (socket->type == MOD_NETWORK_SOCK_STREAM) {
+                // For TCP sockets there is just one slot for incoming data
+                if (socket->incoming.tcp.pbuf != NULL) {
+                    ret |= MP_STREAM_POLL_RD;
+                }
             } else {
-                // Otherwise there is just one slot for incoming data
-                if (socket->incoming.pbuf != NULL) {
+                // Otherwise for UDP/raw there is a queue of incoming data
+                lwip_incoming_packet_t *slot = &socket->incoming.udp_raw.array[socket->incoming.udp_raw.iget];
+                if (slot->pbuf != NULL) {
                     ret |= MP_STREAM_POLL_RD;
                 }
             }

From a05766f47b34136a405a90f9c670f8f886c2e0b4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 May 2025 13:06:00 +1000
Subject: [PATCH 2219/3129] tests/multi_net: Add test that requires queuing UDP
 packets.

This commit adds a new network multi-test which sends a burst of UDP
packets from the client, and the server doesn't recv them until they have
all been sent.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/udp_data_multi.py     | 69 +++++++++++++++++++++++++++
 tests/multi_net/udp_data_multi.py.exp | 15 ++++++
 2 files changed, 84 insertions(+)
 create mode 100644 tests/multi_net/udp_data_multi.py
 create mode 100644 tests/multi_net/udp_data_multi.py.exp

diff --git a/tests/multi_net/udp_data_multi.py b/tests/multi_net/udp_data_multi.py
new file mode 100644
index 0000000000000..5d7b13e5188dd
--- /dev/null
+++ b/tests/multi_net/udp_data_multi.py
@@ -0,0 +1,69 @@
+# Test UDP reception when there are multiple incoming UDP packets that need to be
+# queued internally in the TCP/IP stack.
+
+import socket
+
+NUM_NEW_SOCKETS = 4
+NUM_PACKET_BURSTS = 6
+NUM_PACKET_GROUPS = 5
+TOTAL_PACKET_BURSTS = NUM_NEW_SOCKETS * NUM_PACKET_BURSTS
+# The tast passes if more than 75% of packets are received in each group.
+PACKET_RECV_THRESH = 0.75 * TOTAL_PACKET_BURSTS
+PORT = 8000
+
+
+# Server
+def instance0():
+    recv_count = {i: 0 for i in range(NUM_PACKET_GROUPS)}
+    multitest.globals(IP=multitest.get_network_ip())
+    multitest.next()
+    for i in range(NUM_NEW_SOCKETS):
+        print("test socket", i)
+        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 + i)[0][-1])
+        s.settimeout(0.250)
+        multitest.broadcast("server ready")
+        for burst in range(NUM_PACKET_BURSTS):
+            # Wait for all packets to be sent, without receiving any yet.
+            multitest.wait("data sent burst={}".format(burst))
+            # Try to receive all packets (they should be waiting in the queue).
+            for group in range(NUM_PACKET_GROUPS):
+                try:
+                    data, addr = s.recvfrom(1000)
+                except:
+                    continue
+                recv_burst, recv_group = data.split(b":")
+                recv_burst = int(recv_burst)
+                recv_group = int(recv_group)
+                if recv_burst == burst:
+                    recv_count[recv_group] += 1
+            # Inform the client that all data was received.
+            multitest.broadcast("data received burst={}".format(burst))
+        s.close()
+
+    # Check how many packets were received.
+    for group, count in recv_count.items():
+        if count >= PACKET_RECV_THRESH:
+            print("pass group={}".format(group))
+        else:
+            print("fail group={} received={}%".format(group, 100 * count // TOTAL_PACKET_BURSTS))
+
+
+# Client
+def instance1():
+    multitest.next()
+    for i in range(NUM_NEW_SOCKETS):
+        print("test socket", i)
+        ai = socket.getaddrinfo(IP, PORT + i)[0][-1]
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        multitest.wait("server ready")
+        for burst in range(NUM_PACKET_BURSTS):
+            # Send a bunch of packets all in a row.
+            for group in range(NUM_PACKET_GROUPS):
+                s.sendto(b"%d:%d" % (burst, group), ai)
+            # Inform the server that the data has been sent.
+            multitest.broadcast("data sent burst={}".format(burst))
+            # Wait for the server to finish receiving.
+            multitest.wait("data received burst={}".format(burst))
+        s.close()
diff --git a/tests/multi_net/udp_data_multi.py.exp b/tests/multi_net/udp_data_multi.py.exp
new file mode 100644
index 0000000000000..bc67c6ab0cf01
--- /dev/null
+++ b/tests/multi_net/udp_data_multi.py.exp
@@ -0,0 +1,15 @@
+--- instance0 ---
+test socket 0
+test socket 1
+test socket 2
+test socket 3
+pass group=0
+pass group=1
+pass group=2
+pass group=3
+pass group=4
+--- instance1 ---
+test socket 0
+test socket 1
+test socket 2
+test socket 3

From ee2c78cd972ddd91543d2e73b81b83895ca4cfae Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Mon, 30 Sep 2024 13:05:22 +0100
Subject: [PATCH 2220/3129] rp2: Use pico-sdk alarm pool instead of soft timer
 for sleep.

Stop using soft timer for `mp_wfe_or_timeout`.  Now uses the alarm pool
again as issues with this code have been fixed.  This resolves the "sev"
issue that stops the RP2350 going idle.

Also, change the lightsleep code to use the hardware timer library and
alarm 1, as alarm 2 is used by and soft timers and alarm 3 is used by the
alarm pool.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/modmachine.c   | 35 ++++++++++++++++++++---------------
 ports/rp2/mpconfigport.h |  3 ++-
 ports/rp2/mphalport.c    | 12 +-----------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 58a3a8ae4d87d..742d20f1f8a4c 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -137,6 +137,9 @@ static void mp_machine_idle(void) {
     MICROPY_INTERNAL_WFE(1);
 }
 
+static void alarm_sleep_callback(uint alarm_id) {
+}
+
 static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_int_t delay_ms = 0;
     bool use_timer_alarm = false;
@@ -206,6 +209,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     // Disable ROSC.
     rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_DISABLE << ROSC_CTRL_ENABLE_LSB;
 
+    bool alarm_armed = false;
     if (n_args == 0) {
         #if MICROPY_PY_NETWORK_CYW43
         gpio_set_dormant_irq_enabled(CYW43_PIN_WL_HOST_WAKE, GPIO_IRQ_LEVEL_HIGH, true);
@@ -214,16 +218,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     } else {
         uint32_t save_sleep_en0 = clocks_hw->sleep_en0;
         uint32_t save_sleep_en1 = clocks_hw->sleep_en1;
-        bool timer3_enabled = irq_is_enabled(3);
-
-        const uint32_t alarm_num = 3;
-        const uint32_t irq_num = TIMER_ALARM_IRQ_NUM(timer_hw, alarm_num);
         if (use_timer_alarm) {
-            // Make sure ALARM3/IRQ3 is enabled on _this_ core
-            if (!timer3_enabled) {
-                irq_set_enabled(irq_num, true);
-            }
-            hw_set_bits(&timer_hw->inte, 1u << alarm_num);
             // Use timer alarm to wake.
             clocks_hw->sleep_en0 = 0x0;
             #if PICO_RP2040
@@ -233,8 +228,11 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
             #else
             #error Unknown processor
             #endif
-            timer_hw->intr = 1u << alarm_num; // clear any IRQ
-            timer_hw->alarm[alarm_num] = timer_hw->timerawl + delay_ms * 1000;
+            hardware_alarm_claim(MICROPY_HW_LIGHTSLEEP_ALARM_NUM);
+            hardware_alarm_set_callback(MICROPY_HW_LIGHTSLEEP_ALARM_NUM, alarm_sleep_callback);
+            if (hardware_alarm_set_target(MICROPY_HW_LIGHTSLEEP_ALARM_NUM, make_timeout_time_ms(delay_ms)) == PICO_OK) {
+                alarm_armed = true;
+            }
         } else {
             // TODO: Use RTC alarm to wake.
             clocks_hw->sleep_en0 = 0x0;
@@ -264,10 +262,8 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         #endif
 
         // Go into low-power mode.
-        __wfi();
-
-        if (!timer3_enabled) {
-            irq_set_enabled(irq_num, false);
+        if (alarm_armed) {
+            __wfi();
         }
         clocks_hw->sleep_en0 = save_sleep_en0;
         clocks_hw->sleep_en1 = save_sleep_en1;
@@ -282,6 +278,15 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     // Re-sync mp_hal_time_ns() counter with aon timer.
     mp_hal_time_ns_set_from_rtc();
+
+    // Note: This must be done after MICROPY_END_ATOMIC_SECTION
+    if (use_timer_alarm) {
+        if (alarm_armed) {
+            hardware_alarm_cancel(MICROPY_HW_LIGHTSLEEP_ALARM_NUM);
+        }
+        hardware_alarm_set_callback(MICROPY_HW_LIGHTSLEEP_ALARM_NUM, NULL);
+        hardware_alarm_unclaim(MICROPY_HW_LIGHTSLEEP_ALARM_NUM);
+    }
 }
 
 NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 3d65737266b49..877cea08717fd 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -198,8 +198,9 @@
 #define MICROPY_PY_LWIP_SOCK_RAW                (MICROPY_PY_LWIP)
 
 // Hardware timer alarm index. Available range 0-3.
-// Number 3 is currently used by pico-sdk (PICO_TIME_DEFAULT_ALARM_POOL_HARDWARE_ALARM_NUM)
+// Number 3 is currently used by pico-sdk alarm pool (PICO_TIME_DEFAULT_ALARM_POOL_HARDWARE_ALARM_NUM)
 #define MICROPY_HW_SOFT_TIMER_ALARM_NUM         (2)
+#define MICROPY_HW_LIGHTSLEEP_ALARM_NUM         (1)
 
 // fatfs configuration
 #define MICROPY_FATFS_ENABLE_LFN                (2)
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index caecb695099d5..b581b3b59f95d 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -266,17 +266,7 @@ void soft_timer_init(void) {
 }
 
 void mp_wfe_or_timeout(uint32_t timeout_ms) {
-    soft_timer_entry_t timer;
-
-    // Note the timer doesn't have an associated callback, it just exists to create a
-    // hardware interrupt to wake the CPU
-    soft_timer_static_init(&timer, SOFT_TIMER_MODE_ONE_SHOT, 0, NULL);
-    soft_timer_insert(&timer, timeout_ms);
-
-    __wfe();
-
-    // Clean up the timer node if it's not already
-    soft_timer_remove(&timer);
+    best_effort_wfe_or_timeout(delayed_by_ms(get_absolute_time(), timeout_ms));
 }
 
 int mp_hal_is_pin_reserved(int n) {

From 2a4f1c9f0fd4f582cb22b25e6fcf7521bfa4f268 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Tue, 18 Mar 2025 15:32:02 +0000
Subject: [PATCH 2221/3129] rp2/modmachine: Add debug code for
 mp_machine_lightsleep.

Add some debug code that can be enabled to determine why lightsleep is
returning early.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/modmachine.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 742d20f1f8a4c..fd2912c80f828 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -140,6 +140,9 @@ static void mp_machine_idle(void) {
 static void alarm_sleep_callback(uint alarm_id) {
 }
 
+// Set this to 1 to enable some debug of the interrupt that woke the device
+#define DEBUG_LIGHTSLEEP 0
+
 static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_int_t delay_ms = 0;
     bool use_timer_alarm = false;
@@ -209,6 +212,14 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     // Disable ROSC.
     rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_DISABLE << ROSC_CTRL_ENABLE_LSB;
 
+    #if DEBUG_LIGHTSLEEP
+    #if PICO_RP2040
+    uint32_t pending_intr = 0;
+    #else
+    uint32_t pending_intr[2] = { 0 };
+    #endif
+    #endif
+
     bool alarm_armed = false;
     if (n_args == 0) {
         #if MICROPY_PY_NETWORK_CYW43
@@ -264,6 +275,15 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         // Go into low-power mode.
         if (alarm_armed) {
             __wfi();
+
+            #if DEBUG_LIGHTSLEEP
+            #if PICO_RP2040
+            pending_intr = nvic_hw->ispr;
+            #else
+            pending_intr[0] = nvic_hw->ispr[0];
+            pending_intr[1] = nvic_hw->ispr[1];
+            #endif
+            #endif
         }
         clocks_hw->sleep_en0 = save_sleep_en0;
         clocks_hw->sleep_en1 = save_sleep_en1;
@@ -286,6 +306,19 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         }
         hardware_alarm_set_callback(MICROPY_HW_LIGHTSLEEP_ALARM_NUM, NULL);
         hardware_alarm_unclaim(MICROPY_HW_LIGHTSLEEP_ALARM_NUM);
+
+        #if DEBUG_LIGHTSLEEP
+        // Check irq.h for the list of IRQ's
+        // for rp2040 00000042: TIMER_IRQ_1 woke the device as expected
+        //            00000020: USBCTRL_IRQ woke the device (probably early)
+        // For rp2350 00000000:00000002: TIMER0_IRQ_1 woke the device as expected
+        //            00000000:00004000: USBCTRL_IRQ woke the device (probably early)
+        #if PICO_RP2040
+        mp_printf(MP_PYTHON_PRINTER, "lightsleep: pending_intr=%08lx\n", pending_intr);
+        #else
+        mp_printf(MP_PYTHON_PRINTER, "lightsleep: pending_intr=%08lx:%08lx\n", pending_intr[1], pending_intr[0]);
+        #endif
+        #endif
     }
 }
 

From 03da15575f088085e66be641c7e5ffd5cb2cc318 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Tue, 18 Mar 2025 17:45:48 +0000
Subject: [PATCH 2222/3129] tests/ports/rp2: Update machine idle test to revert
 skip for RP2350.

This reverts commit b42bb911c663dc90575d6a7fe3ea4760b6559372.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 tests/ports/rp2/rp2_machine_idle.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/ports/rp2/rp2_machine_idle.py b/tests/ports/rp2/rp2_machine_idle.py
index 3135110b82000..f9c28284782f8 100644
--- a/tests/ports/rp2/rp2_machine_idle.py
+++ b/tests/ports/rp2/rp2_machine_idle.py
@@ -1,4 +1,3 @@
-import sys
 import machine
 import time
 
@@ -18,11 +17,6 @@
 # Verification uses the average idle time, as individual iterations will always
 # have outliers due to interrupts, scheduler, etc.
 
-# RP2350 currently fails this test because machine.idle() resumes immediately.
-if "RP2350" in sys.implementation._machine:
-    print("SKIP")
-    raise SystemExit
-
 ITERATIONS = 500
 total = 0
 

From 977fd94856dfb909b816a93e9d962d4c467f253a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 18 Dec 2024 16:27:48 +1100
Subject: [PATCH 2223/3129] tests/ports/rp2: Add a test case for light sleeping
 from CPU1.

Not currently passing.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/ports/rp2/rp2_lightsleep_thread.py | 54 ++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 tests/ports/rp2/rp2_lightsleep_thread.py

diff --git a/tests/ports/rp2/rp2_lightsleep_thread.py b/tests/ports/rp2/rp2_lightsleep_thread.py
new file mode 100644
index 0000000000000..2aaa34bbe3989
--- /dev/null
+++ b/tests/ports/rp2/rp2_lightsleep_thread.py
@@ -0,0 +1,54 @@
+# Verify that a thread running on CPU1 can go to lightsleep
+# and wake up in the expected timeframe
+import _thread
+import time
+import unittest
+from machine import lightsleep
+
+N_SLEEPS = 5
+SLEEP_MS = 250
+
+IDEAL_RUNTIME = N_SLEEPS * SLEEP_MS
+MAX_RUNTIME = (N_SLEEPS + 1) * SLEEP_MS
+MAX_DELTA = 20
+
+
+class LightSleepInThread(unittest.TestCase):
+    def thread_entry(self, is_thread=True):
+        for _ in range(N_SLEEPS):
+            lightsleep(SLEEP_MS)
+        if is_thread:
+            self.thread_done = True
+
+    def elapsed_ms(self):
+        return time.ticks_diff(time.ticks_ms(), self.t0)
+
+    def setUp(self):
+        self.thread_done = False
+        self.t0 = time.ticks_ms()
+
+    def test_cpu0_busy(self):
+        _thread.start_new_thread(self.thread_entry, ())
+        # CPU0 is busy-waiting not asleep itself
+        while not self.thread_done:
+            self.assertLessEqual(self.elapsed_ms(), MAX_RUNTIME)
+        self.assertAlmostEqual(self.elapsed_ms(), IDEAL_RUNTIME, delta=MAX_DELTA)
+
+    def test_cpu0_sleeping(self):
+        _thread.start_new_thread(self.thread_entry, ())
+        time.sleep_ms(MAX_RUNTIME)
+        self.assertTrue(self.thread_done)
+        self.assertAlmostEqual(self.elapsed_ms(), MAX_RUNTIME, delta=MAX_DELTA)
+
+    def test_cpu0_also_lightsleep(self):
+        _thread.start_new_thread(self.thread_entry, ())
+        time.sleep(0.050)  # account for any delay in starting the thread
+        self.thread_entry(False)  # does the same lightsleep loop, doesn't set the done flag
+        self.assertTrue(self.thread_done)
+        # only one thread can actually be in lightsleep at a time to avoid races, so the total
+        # runtime is doubled by doing it on both CPUs
+        self.assertAlmostEqual(self.elapsed_ms(), IDEAL_RUNTIME * 2, delta=IDEAL_RUNTIME)
+
+
+if __name__ == "__main__":
+    unittest.main()

From 69993daa5c2eae6055f0b3b2330e95e78d6e3738 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 9 May 2025 15:59:16 +1000
Subject: [PATCH 2224/3129] rp2/modmachine: Add mutual exclusion for
 machine.lightsleep().

There's no specified behaviour for what should happen if both CPUs call
`lightsleep()` together, but the latest changes could cause a permanent
hang due to a race in the timer cleanup code.  Add a flag to prevent hangs
if two threads accidentally lightsleep, at least.

This allows the new lightsleep test to pass on RPI_PICO and RPI_PICO2, and
even have much tighter time deltas.  However, the test still fails on
wireless boards where the lwIP tick wakes them up too frequently.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/modmachine.c                   | 16 ++++++++++++++++
 tests/ports/rp2/rp2_lightsleep_thread.py | 23 ++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index fd2912c80f828..3625d404cdc7b 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -173,6 +173,16 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     }
     #endif
 
+    #if MICROPY_PY_THREAD
+    static bool in_lightsleep;
+    if (in_lightsleep) {
+        // The other CPU is also in machine.lightsleep()
+        MICROPY_END_ATOMIC_SECTION(my_interrupts);
+        return;
+    }
+    in_lightsleep = true;
+    #endif
+
     #if MICROPY_HW_ENABLE_USBDEV
     // Only disable the USB clock if a USB host has not configured the device
     // or if going to DORMANT mode.
@@ -320,6 +330,12 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         #endif
         #endif
     }
+
+    #if MICROPY_PY_THREAD
+    // Clearing the flag here is atomic, and we know we're the ones who set it
+    // (higher up, inside the critical section)
+    in_lightsleep = false;
+    #endif
 }
 
 NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
diff --git a/tests/ports/rp2/rp2_lightsleep_thread.py b/tests/ports/rp2/rp2_lightsleep_thread.py
index 2aaa34bbe3989..494ead422315b 100644
--- a/tests/ports/rp2/rp2_lightsleep_thread.py
+++ b/tests/ports/rp2/rp2_lightsleep_thread.py
@@ -42,12 +42,25 @@ def test_cpu0_sleeping(self):
 
     def test_cpu0_also_lightsleep(self):
         _thread.start_new_thread(self.thread_entry, ())
-        time.sleep(0.050)  # account for any delay in starting the thread
+        time.sleep_ms(50)  # account for any delay in starting the thread
         self.thread_entry(False)  # does the same lightsleep loop, doesn't set the done flag
-        self.assertTrue(self.thread_done)
-        # only one thread can actually be in lightsleep at a time to avoid races, so the total
-        # runtime is doubled by doing it on both CPUs
-        self.assertAlmostEqual(self.elapsed_ms(), IDEAL_RUNTIME * 2, delta=IDEAL_RUNTIME)
+        while not self.thread_done:
+            time.sleep_ms(10)
+        #
+        # Only one thread can actually be in lightsleep at a time to avoid
+        # races, but otherwise the behaviour when both threads call lightsleep()
+        # is unspecified.
+        #
+        # Currently, the other thread will return immediately if one is already
+        # in lightsleep. Therefore, runtime can be between IDEAL_RUNTIME and
+        # IDEAL_RUNTIME * 2 depending on how many times the calls to lightsleep() race
+        # each other.
+        #
+        # Note this test case is really only here to ensure that the rp2 hasn't
+        # hung or failed to sleep at all - not to verify any correct behaviour
+        # when there's a race to call lightsleep().
+        self.assertGreaterEqual(self.elapsed_ms(), IDEAL_RUNTIME - MAX_DELTA)
+        self.assertLessEqual(self.elapsed_ms(), IDEAL_RUNTIME * 2 + MAX_DELTA)
 
 
 if __name__ == "__main__":

From f47e214cdcf11c2067936cb4b4e4f9deab73f6fc Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 15 Jan 2025 16:25:55 +0100
Subject: [PATCH 2225/3129] all: Rename the "NORETURN" macro to "MP_NORETURN".

This commit renames the NORETURN macro, indicating to the compiler
that a function does not return, into MP_NORETURN to maintain the same
naming convention of other similar macros.

To maintain compaitiblity with existing code NORETURN is aliased to
MP_NORETURN, but it is also deprecated for MicroPython v2.

This changeset was created using a similar process to
decf8e6a8bb940d5829ca3296790631fcece7b21 ("all: Remove the "STATIC"
macro and just use "static" instead."), with no documentation or python
scripts to change to reflect the new macro name.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 extmod/modmachine.c                    | 12 ++++-----
 extmod/modmachine.h                    |  2 +-
 extmod/modtls_axtls.c                  |  2 +-
 extmod/modtls_mbedtls.c                |  2 +-
 extmod/moductypes.c                    |  2 +-
 mpy-cross/mpconfigport.h               |  2 +-
 ports/alif/main.c                      |  2 +-
 ports/alif/modmachine.c                |  6 ++---
 ports/cc3200/misc/mperror.c            |  2 +-
 ports/cc3200/misc/mperror.h            |  2 +-
 ports/cc3200/mods/modmachine.c         |  4 +--
 ports/cc3200/mods/pybsleep.c           |  4 +--
 ports/esp32/modmachine.c               |  8 +++---
 ports/esp32/modnetwork.h               |  2 +-
 ports/esp32/network_common.c           |  2 +-
 ports/esp8266/esp_init_data.c          |  2 +-
 ports/esp8266/modmachine.c             |  4 +--
 ports/mimxrt/modmachine.c              |  6 ++---
 ports/minimal/main.c                   |  2 +-
 ports/nrf/main.c                       |  4 +--
 ports/nrf/modules/machine/modmachine.c |  6 ++---
 ports/nrf/mphalport.c                  |  2 +-
 ports/nrf/mphalport.h                  |  2 +-
 ports/pic16bit/main.c                  |  2 +-
 ports/powerpc/main.c                   |  2 +-
 ports/qemu/mcu/arm/errorhandler.c      | 20 +++++++--------
 ports/qemu/mcu/arm/startup.c           |  2 +-
 ports/renesas-ra/main.c                |  2 +-
 ports/renesas-ra/modmachine.c          |  6 ++---
 ports/renesas-ra/mphalport.c           |  2 +-
 ports/renesas-ra/mphalport.h           |  2 +-
 ports/renesas-ra/powerctrl.c           |  6 ++---
 ports/renesas-ra/powerctrl.h           |  6 ++---
 ports/renesas-ra/uart.c                |  2 +-
 ports/rp2/modmachine.c                 |  6 ++---
 ports/samd/modmachine.c                |  6 ++---
 ports/stm32/boardctrl.c                |  2 +-
 ports/stm32/boardctrl.h                |  2 +-
 ports/stm32/mboot/main.c               |  4 +--
 ports/stm32/mboot/mboot.h              |  2 +-
 ports/stm32/modmachine.c               |  4 +--
 ports/stm32/mphalport.c                |  2 +-
 ports/stm32/mphalport.h                |  2 +-
 ports/stm32/powerctrl.c                |  8 +++---
 ports/stm32/powerctrl.h                |  6 ++---
 ports/webassembly/main.c               |  2 +-
 ports/windows/mpconfigport.h           |  2 +-
 ports/zephyr/main.c                    |  2 +-
 py/argcheck.c                          |  4 +--
 py/bc.c                                |  2 +-
 py/dynruntime.h                        |  4 +--
 py/misc.h                              |  2 +-
 py/modmath.c                           |  2 +-
 py/mpconfig.h                          |  8 ++++--
 py/nativeglue.h                        |  2 +-
 py/nlr.c                               |  2 +-
 py/nlr.h                               |  6 ++---
 py/nlraarch64.c                        |  2 +-
 py/nlrmips.c                           |  2 +-
 py/nlrpowerpc.c                        |  4 +--
 py/nlrrv32.c                           |  2 +-
 py/nlrrv64.c                           |  2 +-
 py/nlrthumb.c                          |  2 +-
 py/nlrx64.c                            |  2 +-
 py/nlrx86.c                            |  2 +-
 py/nlrxtensa.c                         |  2 +-
 py/objstr.c                            |  6 ++---
 py/parsenum.c                          |  2 +-
 py/runtime.c                           | 32 ++++++++++++------------
 py/runtime.h                           | 34 +++++++++++++-------------
 shared/libc/abort_.c                   |  4 +--
 71 files changed, 159 insertions(+), 155 deletions(-)

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index 5906835949861..f2570123e3751 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -45,11 +45,11 @@
 static void mp_machine_idle(void);
 
 #if MICROPY_PY_MACHINE_BOOTLOADER
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args);
+MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args);
 #endif
 
 #if MICROPY_PY_MACHINE_RESET
-NORETURN static void mp_machine_reset(void);
+MP_NORETURN static void mp_machine_reset(void);
 static mp_int_t mp_machine_reset_cause(void);
 #endif
 
@@ -58,7 +58,7 @@ static mp_obj_t mp_machine_unique_id(void);
 static mp_obj_t mp_machine_get_freq(void);
 static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args);
 static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args);
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
 #endif
 
 // The port can provide additional machine-module implementation in this file.
@@ -67,7 +67,7 @@ NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args);
 #endif
 
 #if MICROPY_PY_MACHINE_BOOTLOADER
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     mp_machine_bootloader(n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
@@ -81,7 +81,7 @@ static MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 
 #if MICROPY_PY_MACHINE_RESET
 
-NORETURN static mp_obj_t machine_reset(void) {
+MP_NORETURN static mp_obj_t machine_reset(void) {
     mp_machine_reset();
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
@@ -116,7 +116,7 @@ static mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lightsleep);
 
-NORETURN static mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_deepsleep(n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsleep);
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 7c16ed302ee2f..26010be8e18f9 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -242,7 +242,7 @@ uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
 uintptr_t MICROPY_MACHINE_MEM_GET_WRITE_ADDR(mp_obj_t addr_o, uint align);
 #endif
 
-NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
+MP_NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len);
 mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
 
diff --git a/extmod/modtls_axtls.c b/extmod/modtls_axtls.c
index 0e49fde2d84c5..ba28c13fce212 100644
--- a/extmod/modtls_axtls.c
+++ b/extmod/modtls_axtls.c
@@ -105,7 +105,7 @@ static const char *const ssl_error_tab2[] = {
     "NOT_SUPPORTED",
 };
 
-static NORETURN void ssl_raise_error(int err) {
+static MP_NORETURN void ssl_raise_error(int err) {
     MP_STATIC_ASSERT(SSL_NOT_OK - 3 == SSL_EAGAIN);
     MP_STATIC_ASSERT(SSL_ERROR_CONN_LOST - 18 == SSL_ERROR_NOT_SUPPORTED);
 
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 6c34805da42cb..71a14adcff12d 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -147,7 +147,7 @@ static const unsigned char *asn1_get_data(mp_obj_t obj, size_t *out_len) {
     return (const unsigned char *)str;
 }
 
-static NORETURN void mbedtls_raise_error(int err) {
+static MP_NORETURN void mbedtls_raise_error(int err) {
     // Handle special cases.
     if (err == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
         mp_raise_OSError(MP_ENOMEM);
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 54abce79e06fe..eb72f441bbbce 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -89,7 +89,7 @@ typedef struct _mp_obj_uctypes_struct_t {
     uint32_t flags;
 } mp_obj_uctypes_struct_t;
 
-static NORETURN void syntax_error(void) {
+static MP_NORETURN void syntax_error(void) {
     mp_raise_TypeError(MP_ERROR_TEXT("syntax error in uctypes descriptor"));
 }
 
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index d3805f0307356..94a598c9954b8 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -137,7 +137,7 @@ typedef long mp_off_t;
 #ifdef _MSC_VER
 
 #define MP_ENDIANNESS_LITTLE        (1)
-#define NORETURN                    __declspec(noreturn)
+#define MP_NORETURN                 __declspec(noreturn)
 #define MP_NOINLINE                 __declspec(noinline)
 #define MP_ALWAYSINLINE             __forceinline
 #define MP_LIKELY(x)                (x)
diff --git a/ports/alif/main.c b/ports/alif/main.c
index fd35604cbc234..47836113577e8 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -56,7 +56,7 @@
 extern uint8_t __StackTop, __StackLimit;
 extern uint8_t __GcHeapStart, __GcHeapEnd;
 
-NORETURN void panic(const char *msg) {
+MP_NORETURN void panic(const char *msg) {
     mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
     mp_hal_stdout_tx_strn(msg, strlen(msg));
     for (;;) {
diff --git a/ports/alif/modmachine.c b/ports/alif/modmachine.c
index 9868abbeeaf35..71b5be5193d1c 100644
--- a/ports/alif/modmachine.c
+++ b/ports/alif/modmachine.c
@@ -47,11 +47,11 @@ static mp_obj_t mp_machine_unique_id(void) {
     return mp_obj_new_bytes(id, sizeof(id));
 }
 
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     se_services_reset_soc();
 }
 
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     __disable_irq();
 
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
@@ -112,7 +112,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     #endif
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_USBDEV
     mp_machine_enable_usb(false);
     #endif
diff --git a/ports/cc3200/misc/mperror.c b/ports/cc3200/misc/mperror.c
index 6d6c0ff0bae8a..69f0a25371c13 100644
--- a/ports/cc3200/misc/mperror.c
+++ b/ports/cc3200/misc/mperror.c
@@ -159,7 +159,7 @@ void mperror_heartbeat_signal (void) {
     }
 }
 
-void NORETURN __fatal_error(const char *msg) {
+void MP_NORETURN __fatal_error(const char *msg) {
 #ifdef DEBUG
     if (msg != NULL) {
         // wait for 20ms
diff --git a/ports/cc3200/misc/mperror.h b/ports/cc3200/misc/mperror.h
index 1c3eb62697009..30effbbf91162 100644
--- a/ports/cc3200/misc/mperror.h
+++ b/ports/cc3200/misc/mperror.h
@@ -27,7 +27,7 @@
 #ifndef MICROPY_INCLUDED_CC3200_MISC_MPERROR_H
 #define MICROPY_INCLUDED_CC3200_MISC_MPERROR_H
 
-extern void NORETURN __fatal_error(const char *msg);
+extern void MP_NORETURN __fatal_error(const char *msg);
 
 void mperror_init0 (void);
 void mperror_bootloader_check_reset_cause (void);
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index f7184df442736..8986635ac6577 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -93,7 +93,7 @@ extern OsiTaskHandle    xSimpleLinkSpawnTaskHndl;
 /******************************************************************************/
 // MicroPython bindings;
 
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     // disable wlan
     wlan_stop(SL_STOP_TIMEOUT_LONG);
     // reset the cpu and it's peripherals
@@ -161,7 +161,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     pyb_sleep_sleep();
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     pyb_sleep_deepsleep();
     for (;;) {
     }
diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c
index 9d04dd411ddcd..291860de8d676 100644
--- a/ports/cc3200/mods/pybsleep.c
+++ b/ports/cc3200/mods/pybsleep.c
@@ -136,7 +136,7 @@ static MP_DEFINE_CONST_OBJ_TYPE(
  ******************************************************************************/
 static pyb_sleep_obj_t *pyb_sleep_find (mp_obj_t obj);
 static void pyb_sleep_flash_powerdown (void);
-static NORETURN void pyb_sleep_suspend_enter (void);
+static MP_NORETURN void pyb_sleep_suspend_enter (void);
 void pyb_sleep_suspend_exit (void);
 static void pyb_sleep_obj_wakeup (void);
 static void PRCMInterruptHandler (void);
@@ -360,7 +360,7 @@ static void pyb_sleep_flash_powerdown (void) {
     MAP_SPICSDisable(SSPI_BASE);
 }
 
-static NORETURN void pyb_sleep_suspend_enter (void) {
+static MP_NORETURN void pyb_sleep_suspend_enter (void) {
     // enable full RAM retention
     MAP_PRCMSRAMRetentionEnable(PRCM_SRAM_COL_1 | PRCM_SRAM_COL_2 | PRCM_SRAM_COL_3 | PRCM_SRAM_COL_4, PRCM_SRAM_LPDS_RET);
 
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 0c1b94d02d940..0d7ea44c66960 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -178,7 +178,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     machine_sleep_helper(MACHINE_WAKE_SLEEP, n_args, args);
 };
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     machine_sleep_helper(MACHINE_WAKE_DEEPSLEEP, n_args, args);
     mp_machine_reset();
 };
@@ -221,7 +221,7 @@ static mp_int_t mp_machine_reset_cause(void) {
 #include "esp32s3/rom/usb/chip_usb_dw_wrapper.h"
 #endif
 
-NORETURN static void machine_bootloader_rtc(void) {
+MP_NORETURN static void machine_bootloader_rtc(void) {
     #if CONFIG_IDF_TARGET_ESP32S3 && MICROPY_HW_USB_CDC
     usb_usj_mode();
     usb_dc_prepare_persist();
@@ -233,7 +233,7 @@ NORETURN static void machine_bootloader_rtc(void) {
 #endif
 
 #ifdef MICROPY_BOARD_ENTER_BOOTLOADER
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
     for (;;) {
     }
@@ -254,7 +254,7 @@ static mp_obj_t machine_wake_reason(size_t n_args, const mp_obj_t *pos_args, mp_
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(machine_wake_reason_obj, 0,  machine_wake_reason);
 
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     esp_restart();
 }
 
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 387f961976d60..308a515c6e249 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -61,7 +61,7 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj);
 
 mp_obj_t esp_ifname(esp_netif_t *netif);
 
-NORETURN void esp_exceptions_helper(esp_err_t e);
+MP_NORETURN void esp_exceptions_helper(esp_err_t e);
 
 static inline void esp_exceptions(esp_err_t e) {
     if (e != ESP_OK) {
diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index fce8a0304c8be..e07d7a993f25f 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -45,7 +45,7 @@
 #include "lwip/sockets.h"
 #include "lwip/dns.h"
 
-NORETURN void esp_exceptions_helper(esp_err_t e) {
+MP_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"));
diff --git a/ports/esp8266/esp_init_data.c b/ports/esp8266/esp_init_data.c
index c369ed58f515f..a3dd6ffed1ea4 100644
--- a/ports/esp8266/esp_init_data.c
+++ b/ports/esp8266/esp_init_data.c
@@ -30,7 +30,7 @@
 #include "user_interface.h"
 #include "extmod/misc.h"
 
-NORETURN void call_user_start(void);
+MP_NORETURN void call_user_start(void);
 void ets_printf(const char *fmt, ...);
 extern char flashchip;
 
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 23ccf8cebfb0d..6ac17da457622 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -71,7 +71,7 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     system_update_cpu_freq(freq);
 }
 
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     system_restart();
 
     // we must not return
@@ -114,7 +114,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     // default to sleep forever
     uint32_t sleep_us = 0;
 
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 204699bcc4263..ad078ff3ac6d2 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -87,7 +87,7 @@ static mp_obj_t mp_machine_unique_id(void) {
     return mp_obj_new_bytes(id, sizeof(id));
 }
 
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     WDOG_TriggerSystemSoftwareReset(WDOG1);
     while (true) {
         ;
@@ -131,7 +131,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(NULL);
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     if (n_args != 0) {
         mp_int_t seconds = mp_obj_get_int(args[0]) / 1000;
         if (seconds > 0) {
@@ -159,7 +159,7 @@ NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     }
 }
 
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if defined(MICROPY_BOARD_ENTER_BOOTLOADER)
     // If a board has a custom bootloader, call it first.
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index 5f472c1afd657..b9e9034bf5172 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -87,7 +87,7 @@ void nlr_jump_fail(void *val) {
     }
 }
 
-void NORETURN __fatal_error(const char *msg) {
+void MP_NORETURN __fatal_error(const char *msg) {
     while (1) {
         ;
     }
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 29550bd77a748..99ed39895eb5a 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -107,7 +107,7 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
 extern uint32_t _heap_start;
 extern uint32_t _heap_end;
 
-void NORETURN _start(void) {
+void MP_NORETURN _start(void) {
     // 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();
@@ -353,7 +353,7 @@ void HardFault_Handler(void) {
     #endif
 }
 
-void NORETURN __fatal_error(const char *msg) {
+void MP_NORETURN __fatal_error(const char *msg) {
     while (1) {
         ;
     }
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index de1d0e31246b4..aa1f5a8a4a0c4 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -181,11 +181,11 @@ static mp_obj_t mp_machine_unique_id(void) {
 }
 
 // Resets the board in a manner similar to pushing the external RESET button.
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     NVIC_SystemReset();
 }
 
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
     for (;;) {
     }
@@ -199,7 +199,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     __WFE();
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_reset();
 }
 
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 9bb51deb12153..3a3d3ad7a6863 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -202,7 +202,7 @@ const byte mp_hal_status_to_errno_table[4] = {
     [HAL_TIMEOUT] = MP_ETIMEDOUT,
 };
 
-NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
+MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
     mp_raise_OSError(mp_hal_status_to_errno_table[status]);
 }
 
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index a0bca58a625ba..3a89636aec6bc 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -47,7 +47,7 @@ extern const unsigned char mp_hal_status_to_errno_table[4];
 
 extern ringbuf_t stdin_ringbuf;
 
-NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
+MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 
 int mp_hal_stdin_rx_chr(void);
diff --git a/ports/pic16bit/main.c b/ports/pic16bit/main.c
index b1fe7321f0d46..437f91ca7c75c 100644
--- a/ports/pic16bit/main.c
+++ b/ports/pic16bit/main.c
@@ -121,7 +121,7 @@ void nlr_jump_fail(void *val) {
     }
 }
 
-void NORETURN __fatal_error(const char *msg) {
+void MP_NORETURN __fatal_error(const char *msg) {
     while (1) {
         ;
     }
diff --git a/ports/powerpc/main.c b/ports/powerpc/main.c
index 4b668c861c96b..bbd2082b42b17 100644
--- a/ports/powerpc/main.c
+++ b/ports/powerpc/main.c
@@ -130,7 +130,7 @@ void nlr_jump_fail(void *val) {
     }
 }
 
-void NORETURN __fatal_error(const char *msg) {
+void MP_NORETURN __fatal_error(const char *msg) {
     while (1) {
         ;
     }
diff --git a/ports/qemu/mcu/arm/errorhandler.c b/ports/qemu/mcu/arm/errorhandler.c
index a0e7ef930f0b8..a647c0e153606 100644
--- a/ports/qemu/mcu/arm/errorhandler.c
+++ b/ports/qemu/mcu/arm/errorhandler.c
@@ -63,7 +63,7 @@ static const char *EXCEPTION_NAMES_TABLE[] = {
 // R0-R15, PSR, Kind
 uintptr_t registers_copy[18] = { 0 };
 
-__attribute__((naked)) NORETURN void exception_handler(uintptr_t kind) {
+__attribute__((naked)) MP_NORETURN void exception_handler(uintptr_t kind) {
     // Save registers
     __asm volatile (
         "ldr r1, =registers_copy \n"
@@ -137,39 +137,39 @@ __attribute__((naked)) NORETURN void exception_handler(uintptr_t kind) {
     for (;;) {}
 }
 
-__attribute__((naked)) NORETURN void NMI_Handler(void) {
+__attribute__((naked)) MP_NORETURN void NMI_Handler(void) {
     exception_handler(NMI);
 }
 
-__attribute__((naked)) NORETURN void HardFault_Handler(void) {
+__attribute__((naked)) MP_NORETURN void HardFault_Handler(void) {
     exception_handler(HARD_FAULT);
 }
 
-__attribute__((naked)) NORETURN void MemManage_Handler(void) {
+__attribute__((naked)) MP_NORETURN void MemManage_Handler(void) {
     exception_handler(MEM_MANAGE);
 }
 
-__attribute__((naked)) NORETURN void BusFault_Handler(void) {
+__attribute__((naked)) MP_NORETURN void BusFault_Handler(void) {
     exception_handler(BUS_FAULT);
 }
 
-__attribute__((naked)) NORETURN void UsageFault_Handler(void) {
+__attribute__((naked)) MP_NORETURN void UsageFault_Handler(void) {
     exception_handler(USAGE_FAULT);
 }
 
-__attribute__((naked)) NORETURN void SVC_Handler(void) {
+__attribute__((naked)) MP_NORETURN void SVC_Handler(void) {
     exception_handler(SV_CALL);
 }
 
-__attribute__((naked)) NORETURN void DebugMon_Handler(void) {
+__attribute__((naked)) MP_NORETURN void DebugMon_Handler(void) {
     exception_handler(DEBUG_MONITOR);
 }
 
-__attribute__((naked)) NORETURN void PendSV_Handler(void) {
+__attribute__((naked)) MP_NORETURN void PendSV_Handler(void) {
     exception_handler(PENDING_SV);
 }
 
-__attribute__((naked)) NORETURN void SysTick_Handler(void) {
+__attribute__((naked)) MP_NORETURN void SysTick_Handler(void) {
     exception_handler(SYSTEM_TICK);
 }
 
diff --git a/ports/qemu/mcu/arm/startup.c b/ports/qemu/mcu/arm/startup.c
index dbb75e3392287..a7e9efb9fba0f 100644
--- a/ports/qemu/mcu/arm/startup.c
+++ b/ports/qemu/mcu/arm/startup.c
@@ -52,7 +52,7 @@ __attribute__((naked)) void Reset_Handler(void) {
     _start();
 }
 
-NORETURN void Default_Handler(void) {
+MP_NORETURN void Default_Handler(void) {
     for (;;) {
     }
 }
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index febb7b6d7aaa3..cfc4611ecb5cd 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -88,7 +88,7 @@ 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) {
+void MP_NORETURN __fatal_error(const char *msg) {
     for (volatile uint delay = 0; delay < 1000000; delay++) {
     }
     led_state(1, 1);
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index dc38d809dd701..c23ce7e4695da 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -184,12 +184,12 @@ static mp_obj_t mp_machine_unique_id(void) {
 }
 
 // Resets the pyboard in a manner similar to pushing the external RESET button.
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     powerctrl_mcu_reset();
 }
 
 // Activate the bootloader without BOOT* pins.
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_STORAGE
     storage_flush();
     #endif
@@ -232,7 +232,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     powerctrl_enter_stop_mode();
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_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]};
         machine_rtc_wakeup(2, args2);
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index 1c62c23dd70be..b2587af06de2c 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -61,7 +61,7 @@ const byte mp_hal_status_to_errno_table[4] = {
     [HAL_TIMEOUT] = MP_ETIMEDOUT,
 };
 
-NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
+MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
     mp_raise_OSError(mp_hal_status_to_errno_table[status]);
 }
 
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index 0819abeaf617e..1dab67f9a76db 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -49,7 +49,7 @@ 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);
+MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 
 static inline void mp_hal_wake_main_task_from_isr(void) {
diff --git a/ports/renesas-ra/powerctrl.c b/ports/renesas-ra/powerctrl.c
index 548d31679adaa..04c39b35110b2 100644
--- a/ports/renesas-ra/powerctrl.c
+++ b/ports/renesas-ra/powerctrl.c
@@ -174,7 +174,7 @@ const lpm_instance_t g_lpm_standby = {
 
 #endif
 
-NORETURN void powerctrl_mcu_reset(void) {
+MP_NORETURN void powerctrl_mcu_reset(void) {
     #if BSP_TZ_SECURE_BUILD
     R_BSP_NonSecureEnter();
     #else
@@ -185,7 +185,7 @@ NORETURN void powerctrl_mcu_reset(void) {
     }
 }
 
-NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
+MP_NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
     while (1) {
         ;
     }
@@ -245,7 +245,7 @@ void powerctrl_enter_stop_mode(void) {
     enable_irq(irq_state);
 }
 
-NORETURN void powerctrl_enter_standby_mode(void) {
+MP_NORETURN void powerctrl_enter_standby_mode(void) {
     rtc_init_finalise();
 
     #if defined(MICROPY_BOARD_ENTER_STANDBY)
diff --git a/ports/renesas-ra/powerctrl.h b/ports/renesas-ra/powerctrl.h
index 34c40ea1adc32..37932b1002bee 100644
--- a/ports/renesas-ra/powerctrl.h
+++ b/ports/renesas-ra/powerctrl.h
@@ -32,11 +32,11 @@
 
 void SystemClock_Config(void);
 
-NORETURN void powerctrl_mcu_reset(void);
-NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr);
+MP_NORETURN void powerctrl_mcu_reset(void);
+MP_NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr);
 void powerctrl_check_enter_bootloader(void);
 
 void powerctrl_enter_stop_mode(void);
-NORETURN void powerctrl_enter_standby_mode(void);
+MP_NORETURN void powerctrl_enter_standby_mode(void);
 
 #endif // MICROPY_INCLUDED_RA_POWERCTRL_H
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index c319b4c0a8dca..4800e0ea03f95 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -42,7 +42,7 @@
 
 typedef int (*KEYEX_CB)(uint32_t d);
 
-extern void NORETURN __fatal_error(const char *msg);
+extern void MP_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};
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 3625d404cdc7b..1f1b0e2f59b1e 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -65,7 +65,7 @@ static mp_obj_t mp_machine_unique_id(void) {
     return mp_obj_new_bytes(id.id, sizeof(id.id));
 }
 
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     watchdog_reboot(0, SRAM_END, 0);
     for (;;) {
         __wfi();
@@ -82,7 +82,7 @@ static mp_int_t mp_machine_reset_cause(void) {
     return reset_cause;
 }
 
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_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);
@@ -338,7 +338,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     #endif
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_lightsleep(n_args, args);
     mp_machine_reset();
 }
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 82e7b7c062045..c20ce8d641d39 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -65,7 +65,7 @@
 extern bool EIC_occured;
 extern uint32_t _dbl_tap_addr;
 
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_RESET;
     #ifdef DBL_TAP_ADDR_ALT
     *DBL_TAP_ADDR_ALT = DBL_TAP_MAGIC_RESET;
@@ -73,7 +73,7 @@ NORETURN static void mp_machine_reset(void) {
     NVIC_SystemReset();
 }
 
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_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;
@@ -164,7 +164,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     set_cpu_freq(freq);
 }
 
-NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     mp_machine_lightsleep(n_args, args);
     mp_machine_reset();
 }
diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 8f0d066f372b4..ea95c8d2d59dd 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -35,7 +35,7 @@
 #include "led.h"
 #include "usrsw.h"
 
-NORETURN void boardctrl_fatal_error(const char *msg) {
+MP_NORETURN void boardctrl_fatal_error(const char *msg) {
     for (volatile uint delay = 0; delay < 10000000; delay++) {
     }
     led_state(1, 1);
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 8f4ce30eff80a..1a03925ef46da 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -114,7 +114,7 @@ typedef struct _boardctrl_state_t {
     bool log_soft_reset;
 } boardctrl_state_t;
 
-NORETURN void boardctrl_fatal_error(const char *msg);
+MP_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/mboot/main.c b/ports/stm32/mboot/main.c
index 01f8892a514c8..ff44dac630aae 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -176,7 +176,7 @@ void HAL_Delay(uint32_t ms) {
     mp_hal_delay_ms(ms);
 }
 
-NORETURN static void __fatal_error(const char *msg) {
+MP_NORETURN static void __fatal_error(const char *msg) {
     NVIC_SystemReset();
     for (;;) {
     }
@@ -1443,7 +1443,7 @@ static int pyb_usbdd_shutdown(void) {
 /******************************************************************************/
 // main
 
-NORETURN static __attribute__((naked)) void branch_to_application(uint32_t r0, uint32_t bl_addr) {
+MP_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
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 1fabff0080b1c..bc1320c5cdb36 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -36,7 +36,7 @@
 #define ELEM_DATA_START (&_estack[0])
 #define ELEM_DATA_MAX (&_estack[ELEM_DATA_SIZE])
 
-#define NORETURN __attribute__((noreturn))
+#define MP_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.
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 620ae468cb9b3..f3bdf1bc50278 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -291,12 +291,12 @@ static mp_obj_t mp_machine_unique_id(void) {
 }
 
 // Resets the pyboard in a manner similar to pushing the external RESET button.
-NORETURN static void mp_machine_reset(void) {
+MP_NORETURN static void mp_machine_reset(void) {
     powerctrl_mcu_reset();
 }
 
 // Activate the bootloader without BOOT* pins.
-NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
+MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_USB
     pyb_usb_dev_deinit();
     #endif
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index dfd50cebd3dee..b4b2267fa02b1 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -20,7 +20,7 @@ const byte mp_hal_status_to_errno_table[4] = {
 uint8_t mp_hal_unique_id_address[12];
 #endif
 
-NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
+MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
     mp_raise_OSError(mp_hal_status_to_errno_table[status]);
 }
 
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index e520bc54ae6c0..03b0f8e7722ae 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -37,7 +37,7 @@ 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);
+MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 
 // Atomic section helpers.
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index eea009e2d782b..e3e2fcdd44eb5 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -115,7 +115,7 @@ static inline void powerctrl_disable_hsi_if_unused(void) {
     #endif
 }
 
-NORETURN void powerctrl_mcu_reset(void) {
+MP_NORETURN void powerctrl_mcu_reset(void) {
     #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
     *BL_STATE_PTR = BL_STATE_INVALID;
     #if __DCACHE_PRESENT == 1
@@ -125,7 +125,7 @@ NORETURN void powerctrl_mcu_reset(void) {
     NVIC_SystemReset();
 }
 
-NORETURN static __attribute__((naked)) void branch_to_bootloader(uint32_t r0, uint32_t bl_addr) {
+MP_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
@@ -135,7 +135,7 @@ NORETURN static __attribute__((naked)) void branch_to_bootloader(uint32_t r0, ui
     MP_UNREACHABLE;
 }
 
-NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
+MP_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).
@@ -1016,7 +1016,7 @@ void powerctrl_enter_stop_mode(void) {
     enable_irq(irq_state);
 }
 
-NORETURN void powerctrl_enter_standby_mode(void) {
+MP_NORETURN void powerctrl_enter_standby_mode(void) {
     rtc_init_finalise();
 
     #if defined(MICROPY_BOARD_ENTER_STANDBY)
diff --git a/ports/stm32/powerctrl.h b/ports/stm32/powerctrl.h
index 5b9240561182f..05a70e52c6aaa 100644
--- a/ports/stm32/powerctrl.h
+++ b/ports/stm32/powerctrl.h
@@ -39,14 +39,14 @@ static inline void stm32_system_init(void) {
 
 void SystemClock_Config(void);
 
-NORETURN void powerctrl_mcu_reset(void);
-NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr);
+MP_NORETURN void powerctrl_mcu_reset(void);
+MP_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);
-NORETURN void powerctrl_enter_standby_mode(void);
+MP_NORETURN void powerctrl_enter_standby_mode(void);
 
 #endif // MICROPY_INCLUDED_STM32_POWERCTRL_H
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index c542f0cd72efe..770dfbe0ca5c7 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -233,7 +233,7 @@ void nlr_jump_fail(void *val) {
     }
 }
 
-void NORETURN __fatal_error(const char *msg) {
+void MP_NORETURN __fatal_error(const char *msg) {
     while (1) {
         ;
     }
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index fabc9072d6c70..6e32d5fe5ebdf 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -242,7 +242,7 @@ typedef long mp_off_t;
 
 // CL specific overrides from mpconfig
 
-#define NORETURN                    __declspec(noreturn)
+#define MP_NORETURN                 __declspec(noreturn)
 #define MP_WEAK
 #define MP_NOINLINE                 __declspec(noinline)
 #define MP_ALWAYSINLINE             __forceinline
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index d4498c1079c1d..45af7b0c72c40 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -219,7 +219,7 @@ 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);
 #endif
 
-NORETURN void nlr_jump_fail(void *val) {
+MP_NORETURN void nlr_jump_fail(void *val) {
     while (1) {
         ;
     }
diff --git a/py/argcheck.c b/py/argcheck.c
index 35b116ec0d414..298c19bcfdbc3 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -137,12 +137,12 @@ void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args,
     mp_arg_parse_all(n_pos, args, &kw_args, n_allowed, allowed, out_vals);
 }
 
-NORETURN void mp_arg_error_terse_mismatch(void) {
+MP_NORETURN void mp_arg_error_terse_mismatch(void) {
     mp_raise_TypeError(MP_ERROR_TEXT("argument num/types mismatch"));
 }
 
 #if MICROPY_CPYTHON_COMPAT
-NORETURN void mp_arg_error_unimpl_kw(void) {
+MP_NORETURN void mp_arg_error_unimpl_kw(void) {
     mp_raise_NotImplementedError(MP_ERROR_TEXT("keyword argument(s) not implemented - use normal args instead"));
 }
 #endif
diff --git a/py/bc.c b/py/bc.c
index 899dbd6a0727d..cea31c93bd8a0 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -88,7 +88,7 @@ const byte *mp_decode_uint_skip(const byte *ptr) {
     return ptr;
 }
 
-static NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected, size_t given) {
+static MP_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
     (void)f;
diff --git a/py/dynruntime.h b/py/dynruntime.h
index c93111bbd4d6f..0e438da4b7032 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -70,7 +70,7 @@
 #define m_realloc(ptr, new_num_bytes)   (m_realloc_dyn((ptr), (new_num_bytes)))
 #define m_realloc_maybe(ptr, new_num_bytes, allow_move) (m_realloc_maybe_dyn((ptr), (new_num_bytes), (allow_move)))
 
-static NORETURN inline void m_malloc_fail_dyn(size_t num_bytes) {
+static MP_NORETURN inline void m_malloc_fail_dyn(size_t num_bytes) {
     mp_fun_table.raise_msg(
         mp_fun_table.load_global(MP_QSTR_MemoryError),
         "memory allocation failed");
@@ -295,7 +295,7 @@ static inline mp_obj_t mp_obj_new_exception_arg1_dyn(const mp_obj_type_t *exc_ty
     return mp_call_function_n_kw(MP_OBJ_FROM_PTR(exc_type), 1, 0, &args[0]);
 }
 
-static NORETURN inline void mp_raise_dyn(mp_obj_t o) {
+static MP_NORETURN inline void mp_raise_dyn(mp_obj_t o) {
     mp_fun_table.raise(o);
     for (;;) {
     }
diff --git a/py/misc.h b/py/misc.h
index e05fbe61a9d6d..49f2f87111157 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -105,7 +105,7 @@ void *m_realloc(void *ptr, size_t new_num_bytes);
 void *m_realloc_maybe(void *ptr, size_t new_num_bytes, bool allow_move);
 void m_free(void *ptr);
 #endif
-NORETURN void m_malloc_fail(size_t num_bytes);
+MP_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
diff --git a/py/modmath.c b/py/modmath.c
index 4d51a28d0bbb0..b792d8581d062 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -37,7 +37,7 @@
 #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) {
+static MP_NORETURN void math_error(void) {
     mp_raise_ValueError(MP_ERROR_TEXT("math domain error"));
 }
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 9001b8983bf37..49a9fa35ccf02 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -2115,8 +2115,12 @@ typedef double mp_float_t;
 #endif // INT_FMT
 
 // Modifier for function which doesn't return
-#ifndef NORETURN
-#define NORETURN __attribute__((noreturn))
+#ifndef MP_NORETURN
+#define MP_NORETURN __attribute__((noreturn))
+#endif
+
+#if !MICROPY_PREVIEW_VERSION_2
+#define NORETURN MP_NORETURN
 #endif
 
 // Modifier for weak functions
diff --git a/py/nativeglue.h b/py/nativeglue.h
index e96fd7b66a03f..2c7923c56df85 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -143,7 +143,7 @@ typedef struct _mp_fun_table_t {
     int (*printf_)(const mp_print_t *print, const char *fmt, ...);
     int (*vprintf_)(const mp_print_t *print, const char *fmt, va_list args);
     #if defined(__GNUC__)
-    NORETURN // Only certain compilers support no-return attributes in function pointer declarations
+    MP_NORETURN // Only certain compilers support no-return attributes in function pointer declarations
     #endif
     void (*raise_msg)(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
     const mp_obj_type_t *(*obj_get_type)(mp_const_obj_t o_in);
diff --git a/py/nlr.c b/py/nlr.c
index 7ab0c0955a294..de2a38ceff3e9 100644
--- a/py/nlr.c
+++ b/py/nlr.c
@@ -81,7 +81,7 @@ void nlr_call_jump_callbacks(nlr_buf_t *nlr) {
 }
 
 #if MICROPY_ENABLE_VM_ABORT
-NORETURN void nlr_jump_abort(void) {
+MP_NORETURN void nlr_jump_abort(void) {
     MP_STATE_THREAD(nlr_top) = MP_STATE_VM(nlr_abort);
     nlr_jump(NULL);
 }
diff --git a/py/nlr.h b/py/nlr.h
index ce30bc91d67ae..47447c5d174ff 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -177,18 +177,18 @@ unsigned int nlr_push(nlr_buf_t *);
 
 unsigned int nlr_push_tail(nlr_buf_t *top);
 void nlr_pop(void);
-NORETURN void nlr_jump(void *val);
+MP_NORETURN void nlr_jump(void *val);
 
 #if MICROPY_ENABLE_VM_ABORT
 #define nlr_set_abort(buf) MP_STATE_VM(nlr_abort) = buf
 #define nlr_get_abort() MP_STATE_VM(nlr_abort)
-NORETURN void nlr_jump_abort(void);
+MP_NORETURN void nlr_jump_abort(void);
 #endif
 
 // This must be implemented by a port.  It's called by nlr_jump
 // if no nlr buf has been pushed.  It must not return, but rather
 // should bail out with a fatal error.
-NORETURN void nlr_jump_fail(void *val);
+MP_NORETURN void nlr_jump_fail(void *val);
 
 // use nlr_raise instead of nlr_jump so that debugging is easier
 #ifndef MICROPY_DEBUG_NLR
diff --git a/py/nlraarch64.c b/py/nlraarch64.c
index d6d87ebc50db8..3318004b5e037 100644
--- a/py/nlraarch64.c
+++ b/py/nlraarch64.c
@@ -56,7 +56,7 @@ __asm(
     #endif
     );
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
 
     MP_STATIC_ASSERT(offsetof(nlr_buf_t, regs) == 16); // asm assumes it
diff --git a/py/nlrmips.c b/py/nlrmips.c
index cba52b16a266a..5c55db7e268ec 100644
--- a/py/nlrmips.c
+++ b/py/nlrmips.c
@@ -57,7 +57,7 @@ __asm(
     ".end nlr_push            \n"
     );
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
     __asm(
         "move $4, %0    \n"
diff --git a/py/nlrpowerpc.c b/py/nlrpowerpc.c
index 8a69fe1eeca6b..cf140400e68f5 100644
--- a/py/nlrpowerpc.c
+++ b/py/nlrpowerpc.c
@@ -78,7 +78,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     return 0;
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
 
     __asm__ volatile (
@@ -167,7 +167,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     return 0;
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
 
     __asm__ volatile (
diff --git a/py/nlrrv32.c b/py/nlrrv32.c
index 9a12ede400daa..565a8629db5f0 100644
--- a/py/nlrrv32.c
+++ b/py/nlrrv32.c
@@ -50,7 +50,7 @@ __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
         );
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
     __asm volatile (
         "add  x10, x0, %0  \n" // Load nlr_buf address.
diff --git a/py/nlrrv64.c b/py/nlrrv64.c
index e7ba79797b857..b7d1467b8f6f6 100644
--- a/py/nlrrv64.c
+++ b/py/nlrrv64.c
@@ -50,7 +50,7 @@ __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
         );
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
     __asm volatile (
         "add  x10, x0, %0  \n" // Load nlr_buf address.
diff --git a/py/nlrthumb.c b/py/nlrthumb.c
index e7b24f242bc52..8546308a3dedf 100644
--- a/py/nlrthumb.c
+++ b/py/nlrthumb.c
@@ -100,7 +100,7 @@ __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
     #endif
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
 
     __asm volatile (
diff --git a/py/nlrx64.c b/py/nlrx64.c
index d1ad91ff7d718..51224729fc90d 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -100,7 +100,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     #endif
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
 
     __asm volatile (
diff --git a/py/nlrx86.c b/py/nlrx86.c
index 085e30d2034a1..26bf0dc6ccb85 100644
--- a/py/nlrx86.c
+++ b/py/nlrx86.c
@@ -78,7 +78,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     #endif
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
 
     __asm volatile (
diff --git a/py/nlrxtensa.c b/py/nlrxtensa.c
index ff7af6edeef98..2d1bf35e381a3 100644
--- a/py/nlrxtensa.c
+++ b/py/nlrxtensa.c
@@ -55,7 +55,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     return 0; // needed to silence compiler warning
 }
 
-NORETURN void nlr_jump(void *val) {
+MP_NORETURN void nlr_jump(void *val) {
     MP_NLR_JUMP_HEAD(val, top)
 
     __asm volatile (
diff --git a/py/objstr.c b/py/objstr.c
index a160ab415c6cf..fda31d53185f9 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -40,7 +40,7 @@ static mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
 #endif
 
 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_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);
 
@@ -1001,7 +1001,7 @@ static mp_obj_t arg_as_int(mp_obj_t arg) {
 #endif
 
 #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
-static NORETURN void terse_str_format_value_error(void) {
+static MP_NORETURN void terse_str_format_value_error(void) {
     mp_raise_ValueError(MP_ERROR_TEXT("bad format string"));
 }
 #else
@@ -2357,7 +2357,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) {
+static MP_NORETURN void bad_implicit_conversion(mp_obj_t self_in) {
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("can't convert to str implicitly"));
     #else
diff --git a/py/parsenum.c b/py/parsenum.c
index 3281eb4b8511a..a38ce563f9530 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -36,7 +36,7 @@
 #include <math.h>
 #endif
 
-static NORETURN void raise_exc(mp_obj_t exc, mp_lexer_t *lex) {
+static MP_NORETURN void raise_exc(mp_obj_t exc, mp_lexer_t *lex) {
     // if lex!=NULL then the parser called us and we need to convert the
     // exception's type from ValueError to SyntaxError and add traceback info
     if (lex != NULL) {
diff --git a/py/runtime.c b/py/runtime.c
index 58819819ad025..d6fea172f212b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1649,7 +1649,7 @@ mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_i
 
 #endif // MICROPY_ENABLE_COMPILER
 
-NORETURN void m_malloc_fail(size_t num_bytes) {
+MP_NORETURN void m_malloc_fail(size_t num_bytes) {
     DEBUG_printf("memory allocation failed, allocating %u bytes\n", (uint)num_bytes);
     #if MICROPY_ENABLE_GC
     if (gc_is_locked()) {
@@ -1662,25 +1662,25 @@ NORETURN void m_malloc_fail(size_t num_bytes) {
 
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
 
-NORETURN void mp_raise_type(const mp_obj_type_t *exc_type) {
+MP_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_NORETURN void mp_raise_ValueError_no_msg(void) {
     mp_raise_type(&mp_type_ValueError);
 }
 
-NORETURN void mp_raise_TypeError_no_msg(void) {
+MP_NORETURN void mp_raise_TypeError_no_msg(void) {
     mp_raise_type(&mp_type_TypeError);
 }
 
-NORETURN void mp_raise_NotImplementedError_no_msg(void) {
+MP_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) {
+MP_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));
     } else {
@@ -1688,7 +1688,7 @@ NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t ms
     }
 }
 
-NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...) {
+MP_NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...) {
     va_list args;
     va_start(args, fmt);
     mp_obj_t exc = mp_obj_new_exception_msg_vlist(exc_type, fmt, args);
@@ -1696,25 +1696,25 @@ NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text
     nlr_raise(exc);
 }
 
-NORETURN void mp_raise_ValueError(mp_rom_error_text_t msg) {
+MP_NORETURN void mp_raise_ValueError(mp_rom_error_text_t msg) {
     mp_raise_msg(&mp_type_ValueError, msg);
 }
 
-NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg) {
+MP_NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg) {
     mp_raise_msg(&mp_type_TypeError, msg);
 }
 
-NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg) {
+MP_NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg) {
     mp_raise_msg(&mp_type_NotImplementedError, msg);
 }
 
 #endif
 
-NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg) {
+MP_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) {
+MP_NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
     if (arg == MP_OBJ_NULL) {
         mp_raise_type(&mp_type_StopIteration);
     } else {
@@ -1722,7 +1722,7 @@ NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
     }
 }
 
-NORETURN void mp_raise_TypeError_int_conversion(mp_const_obj_t arg) {
+MP_NORETURN void mp_raise_TypeError_int_conversion(mp_const_obj_t arg) {
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     (void)arg;
     mp_raise_TypeError(MP_ERROR_TEXT("can't convert to int"));
@@ -1732,11 +1732,11 @@ NORETURN void mp_raise_TypeError_int_conversion(mp_const_obj_t arg) {
     #endif
 }
 
-NORETURN void mp_raise_OSError(int errno_) {
+MP_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) {
+MP_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);
@@ -1746,7 +1746,7 @@ NORETURN void mp_raise_OSError_with_filename(int errno_, const char *filename) {
 }
 
 #if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
-NORETURN void mp_raise_recursion_depth(void) {
+MP_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));
 }
 #endif
diff --git a/py/runtime.h b/py/runtime.h
index ffbc3972a32dc..064bd021d780d 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -136,8 +136,8 @@ static inline void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_mi
 }
 void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
 void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
-NORETURN void mp_arg_error_terse_mismatch(void);
-NORETURN void mp_arg_error_unimpl_kw(void);
+MP_NORETURN void mp_arg_error_terse_mismatch(void);
+MP_NORETURN void mp_arg_error_unimpl_kw(void);
 
 static inline mp_obj_dict_t *mp_locals_get(void) {
     return MP_STATE_THREAD(dict_locals);
@@ -246,10 +246,10 @@ 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);
+MP_NORETURN void mp_raise_type(const mp_obj_type_t *exc_type);
+MP_NORETURN void mp_raise_ValueError_no_msg(void);
+MP_NORETURN void mp_raise_TypeError_no_msg(void);
+MP_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()
@@ -257,19 +257,19 @@ NORETURN void mp_raise_NotImplementedError_no_msg(void);
 #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);
+MP_NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
+MP_NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...);
+MP_NORETURN void mp_raise_ValueError(mp_rom_error_text_t msg);
+MP_NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg);
+MP_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_TypeError_int_conversion(mp_const_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);
+MP_NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg);
+MP_NORETURN void mp_raise_StopIteration(mp_obj_t arg);
+MP_NORETURN void mp_raise_TypeError_int_conversion(mp_const_obj_t arg);
+MP_NORETURN void mp_raise_OSError(int errno_);
+MP_NORETURN void mp_raise_OSError_with_filename(int errno_, const char *filename);
+MP_NORETURN void mp_raise_recursion_depth(void);
 
 #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
 #undef mp_check_self
diff --git a/shared/libc/abort_.c b/shared/libc/abort_.c
index 3051eae81e0ce..54eab67d3fb49 100644
--- a/shared/libc/abort_.c
+++ b/shared/libc/abort_.c
@@ -1,7 +1,7 @@
 #include <py/runtime.h>
 
-NORETURN void abort_(void);
+MP_NORETURN void abort_(void);
 
-NORETURN void abort_(void) {
+MP_NORETURN void abort_(void) {
     mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("abort() called"));
 }

From 9032491efd8a63e0b13dbcfb8579cde4791c03af Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 25 Jan 2024 09:09:06 -0600
Subject: [PATCH 2226/3129] py/objstr: Add support for the :_b/o/x specifier in
 str.format.

This groups non-decimal values by fours, such as bbb_bbbb_bbbb.  It also
supports `{:_d}` to use underscore for decimal numbers (grouped in threes).

Use of incorrect ":,b" is not diagnosed.

Thanks to @dpgeorge for the suggestion to reduce code size.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/mpprint.c                  | 11 ++++-------
 py/mpprint.h                  | 14 +++++++-------
 py/mpz.c                      |  4 +++-
 py/objint.c                   |  5 +++--
 py/objstr.c                   |  7 ++++---
 py/runtime.h                  |  2 +-
 tests/basics/string_format.py | 10 ++++++++++
 7 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/py/mpprint.c b/py/mpprint.c
index 291e4145ff0cd..00a5f944c69ef 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -58,7 +58,7 @@ int mp_print_str(const mp_print_t *print, const char *str) {
     return len;
 }
 
-int mp_print_strn(const mp_print_t *print, const char *str, size_t len, int flags, char fill, int width) {
+int mp_print_strn(const mp_print_t *print, const char *str, size_t len, unsigned int flags, char fill, int width) {
     int left_pad = 0;
     int right_pad = 0;
     int pad = width - len;
@@ -201,7 +201,7 @@ static int mp_print_int(const mp_print_t *print, mp_uint_t x, int sgn, int base,
     return len;
 }
 
-int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, int base, int base_char, int flags, char fill, int width, int prec) {
+int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, unsigned int base, int base_char, int flags, char fill, int width, int prec) {
     // These are the only values for "base" that are required to be supported by this
     // function, since Python only allows the user to format integers in these bases.
     // If needed this function could be generalised to handle other values.
@@ -248,10 +248,7 @@ int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, int base, int base_char
     int prefix_len = prefix - prefix_buf;
     prefix = prefix_buf;
 
-    char comma = '\0';
-    if (flags & PF_FLAG_SHOW_COMMA) {
-        comma = ',';
-    }
+    char comma = flags >> PF_FLAG_SEP_POS;
 
     // The size of this buffer is rather arbitrary. If it's not large
     // enough, a dynamic one will be allocated.
@@ -340,7 +337,7 @@ int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, int base, int base_char
 }
 
 #if MICROPY_PY_BUILTINS_FLOAT
-int mp_print_float(const mp_print_t *print, mp_float_t f, char fmt, int flags, char fill, int width, int prec) {
+int mp_print_float(const mp_print_t *print, mp_float_t f, char fmt, unsigned int flags, char fill, int width, int prec) {
     char buf[32];
     char sign = '\0';
     int chrs = 0;
diff --git a/py/mpprint.h b/py/mpprint.h
index 8383ea85794c2..511af329baf8d 100644
--- a/py/mpprint.h
+++ b/py/mpprint.h
@@ -33,11 +33,11 @@
 #define PF_FLAG_SPACE_SIGN        (0x004)
 #define PF_FLAG_NO_TRAILZ         (0x008)
 #define PF_FLAG_SHOW_PREFIX       (0x010)
-#define PF_FLAG_SHOW_COMMA        (0x020)
-#define PF_FLAG_PAD_AFTER_SIGN    (0x040)
-#define PF_FLAG_CENTER_ADJUST     (0x080)
-#define PF_FLAG_ADD_PERCENT       (0x100)
-#define PF_FLAG_SHOW_OCTAL_LETTER (0x200)
+#define PF_FLAG_PAD_AFTER_SIGN    (0x020)
+#define PF_FLAG_CENTER_ADJUST     (0x040)
+#define PF_FLAG_ADD_PERCENT       (0x080)
+#define PF_FLAG_SHOW_OCTAL_LETTER (0x100)
+#define PF_FLAG_SEP_POS           (9) // must be above all the above PF_FLAGs
 
 #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
 #define MP_PYTHON_PRINTER &mp_sys_stdout_print
@@ -69,9 +69,9 @@ extern const mp_print_t mp_sys_stdout_print;
 #endif
 
 int mp_print_str(const mp_print_t *print, const char *str);
-int mp_print_strn(const mp_print_t *print, const char *str, size_t len, int flags, char fill, int width);
+int mp_print_strn(const mp_print_t *print, const char *str, size_t len, unsigned int flags, char fill, int width);
 #if MICROPY_PY_BUILTINS_FLOAT
-int mp_print_float(const mp_print_t *print, mp_float_t f, char fmt, int flags, char fill, int width, int prec);
+int mp_print_float(const mp_print_t *print, mp_float_t f, char fmt, unsigned int flags, char fill, int width, int prec);
 #endif
 
 int mp_printf(const mp_print_t *print, const char *fmt, ...);
diff --git a/py/mpz.c b/py/mpz.c
index 084aebda9ecaa..471bd1598188e 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -1672,6 +1672,8 @@ size_t mpz_as_str_inpl(const mpz_t *i, unsigned int base, const char *prefix, ch
 
     size_t ilen = i->len;
 
+    int n_comma = (base == 10) ? 3 : 4;
+
     char *s = str;
     if (ilen == 0) {
         if (prefix) {
@@ -1717,7 +1719,7 @@ size_t mpz_as_str_inpl(const mpz_t *i, unsigned int base, const char *prefix, ch
                 break;
             }
         }
-        if (!done && comma && (s - last_comma) == 3) {
+        if (!done && comma && (s - last_comma) == n_comma) {
             *s++ = comma;
             last_comma = s;
         }
diff --git a/py/objint.c b/py/objint.c
index 4be6009a440e4..87d8a27852d34 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -209,7 +209,7 @@ static const uint8_t log_base2_floor[] = {
 size_t mp_int_format_size(size_t num_bits, int base, const char *prefix, char comma) {
     assert(2 <= base && base <= 16);
     size_t num_digits = num_bits / log_base2_floor[base - 1] + 1;
-    size_t num_commas = comma ? num_digits / 3 : 0;
+    size_t num_commas = comma ? (base == 10 ? num_digits / 3 : num_digits / 4): 0;
     size_t prefix_len = prefix ? strlen(prefix) : 0;
     return num_digits + num_commas + prefix_len + 2; // +1 for sign, +1 for null byte
 }
@@ -251,6 +251,7 @@ char *mp_obj_int_formatted(char **buf, size_t *buf_size, size_t *fmt_size, mp_co
         sign = '-';
     }
 
+    int n_comma = (base == 10) ? 3 : 4;
     size_t needed_size = mp_int_format_size(sizeof(fmt_int_t) * 8, base, prefix, comma);
     if (needed_size > *buf_size) {
         *buf = m_new(char, needed_size);
@@ -275,7 +276,7 @@ char *mp_obj_int_formatted(char **buf, size_t *buf_size, size_t *fmt_size, mp_co
                 c += '0';
             }
             *(--b) = c;
-            if (comma && num != 0 && b > str && (last_comma - b) == 3) {
+            if (comma && num != 0 && b > str && (last_comma - b) == n_comma) {
                 *(--b) = comma;
                 last_comma = b;
             }
diff --git a/py/objstr.c b/py/objstr.c
index fda31d53185f9..c81fc682fd4e8 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1184,7 +1184,7 @@ static vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
         int width = -1;
         int precision = -1;
         char type = '\0';
-        int flags = 0;
+        unsigned int flags = 0;
 
         if (format_spec) {
             // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
@@ -1229,8 +1229,9 @@ static vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 }
             }
             s = str_to_int(s, stop, &width);
-            if (*s == ',') {
-                flags |= PF_FLAG_SHOW_COMMA;
+            if (*s == ',' || *s == '_') {
+                MP_STATIC_ASSERT((unsigned)'_' << PF_FLAG_SEP_POS >> PF_FLAG_SEP_POS == '_');
+                flags |= (unsigned)*s << PF_FLAG_SEP_POS;
                 s++;
             }
             if (*s == '.') {
diff --git a/py/runtime.h b/py/runtime.h
index 064bd021d780d..a93488e2cdc04 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -128,7 +128,7 @@ void mp_event_wait_indefinite(void);
 void mp_event_wait_ms(mp_uint_t timeout_ms);
 
 // extra printing method specifically for mp_obj_t's which are integral type
-int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, int base, int base_char, int flags, char fill, int width, int prec);
+int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, unsigned base, int base_char, int flags, char fill, int width, int prec);
 
 void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig);
 static inline void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_args_max, bool takes_kw) {
diff --git a/tests/basics/string_format.py b/tests/basics/string_format.py
index e8600f5836139..11e7836a73ece 100644
--- a/tests/basics/string_format.py
+++ b/tests/basics/string_format.py
@@ -22,7 +22,17 @@ def test(fmt, *args):
 test("{:4x}", 123)
 test("{:4X}", 123)
 
+test("{:4,d}", 1)
+test("{:4_d}", 1)
+test("{:4_o}", 1)
+test("{:4_b}", 1)
+test("{:4_x}", 1)
+
 test("{:4,d}", 12345678)
+test("{:4_d}", 12345678)
+test("{:4_o}", 12345678)
+test("{:4_b}", 12345678)
+test("{:4_x}", 12345678)
 
 test("{:#4b}", 10)
 test("{:#4o}", 123)

From f77fd6257cc14ff9a05d702406501a49b7bacbd0 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 12 May 2025 17:39:16 +0200
Subject: [PATCH 2227/3129] tests/cpydiff: Document format separator
 difference.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cpydiff/types_str_formatsep.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/cpydiff/types_str_formatsep.py

diff --git a/tests/cpydiff/types_str_formatsep.py b/tests/cpydiff/types_str_formatsep.py
new file mode 100644
index 0000000000000..05d0b8d3d2cf4
--- /dev/null
+++ b/tests/cpydiff/types_str_formatsep.py
@@ -0,0 +1,19 @@
+"""
+categories: Types,str
+description: MicroPython accepts the "," grouping option with any radix, unlike CPython
+cause: To reduce code size, MicroPython does not issue an error for this combination
+workaround: Do not use a format string like ``{:,b}`` if CPython compatibility is required.
+"""
+
+try:
+    print("{:,b}".format(99))
+except ValueError:
+    print("ValueError")
+try:
+    print("{:,x}".format(99))
+except ValueError:
+    print("ValueError")
+try:
+    print("{:,o}".format(99))
+except ValueError:
+    print("ValueError")

From d7371124d288cc85d2386b63ea39cfa4fa803194 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 21 Mar 2025 10:44:20 +0100
Subject: [PATCH 2228/3129] esp32/esp32_common.cmake: Use the tinyusb source
 files from ESP-IDF.

This commit removes the explicit dependency on the vendored tinyusb
version for the ESP32S2 and ESP32S3 boards.

Tinyusb is still available to MicroPython through a dependency on the
`espressif/esp_tinyusb` ESP-IDF component, which in turn depends on
the `espressif/tinyusb` component itself.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/esp32_common.cmake | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index c54f5a5403226..063e8d6b92f6a 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -80,9 +80,7 @@ list(APPEND MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
-list(APPEND GIT_SUBMODULES lib/tinyusb)
 if(MICROPY_PY_TINYUSB)
-    set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
     string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
 
     list(APPEND MICROPY_DEF_TINYUSB
@@ -90,12 +88,6 @@ if(MICROPY_PY_TINYUSB)
     )
 
     list(APPEND MICROPY_SOURCE_TINYUSB
-        ${TINYUSB_SRC}/tusb.c
-        ${TINYUSB_SRC}/common/tusb_fifo.c
-        ${TINYUSB_SRC}/device/usbd.c
-        ${TINYUSB_SRC}/device/usbd_control.c
-        ${TINYUSB_SRC}/class/cdc/cdc_device.c
-        ${TINYUSB_SRC}/portable/synopsys/dwc2/dcd_dwc2.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
@@ -103,7 +95,6 @@ if(MICROPY_PY_TINYUSB)
     )
 
     list(APPEND MICROPY_INC_TINYUSB
-        ${TINYUSB_SRC}
         ${MICROPY_DIR}/shared/tinyusb/
     )
 

From 1d4bf8ac40236e22d0a67b103b4330d1ee6659d4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 29 Mar 2025 09:12:28 +0100
Subject: [PATCH 2229/3129] esp32/machine_timer: Fix timer.value() for an
 uninitialized timer.

Raises a value error in that case, which happens after a timer was created
but not initialized, or after calling `timer.deinit()`.

Fixes issue #17033.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 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 82b432bbacddd..34d49c79d2894 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -246,6 +246,9 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init)
 
 static mp_obj_t machine_timer_value(mp_obj_t self_in) {
     machine_timer_obj_t *self = self_in;
+    if (self->handle == NULL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("timer not set"));
+    }
     uint64_t result = timer_ll_get_counter_value(self->hal_context.dev, self->index);
     return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result / (TIMER_SCALE / 1000))); // value in ms
 }

From 116d0d494589e470b4003fcecd18162c9eed7e9b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 25 Mar 2025 21:53:45 +0100
Subject: [PATCH 2230/3129] esp32/esp32_common.cmake: Allow adding defines and
 compiler flags.

This commit introduces two extra CMake variables, MICROPY_DEF_COMPONENT
and MICROPY_COMPILE_COMPONENT, that make it easier to integrate
MicroPython as a custom ESP-IDF component.

Whilst there is no official MicroPython component available for ESP-IDF,
integration can be achieved with some minor CMake scripting outside the
MicroPython tree - except for customisation of compilation defines and
build flags, which is what this commit tries to provide.

Compilation defines customisation is especially important for
MicroPython configuration, as it is not possible to inject a value for
MP_CONFIGFILE otherwise.  This means that unless MicroPython itself is
forked first to edit ports/esp32/mpconfigport.h, it is not possible to
perform any meaningful configuration of the interpreter/runtime when
included as a component.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/esp32_common.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 063e8d6b92f6a..2e7b95b385be5 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -242,6 +242,7 @@ endif()
 
 # Set compile options for this port.
 target_compile_definitions(${MICROPY_TARGET} PUBLIC
+    ${MICROPY_DEF_COMPONENT}
     ${MICROPY_DEF_CORE}
     ${MICROPY_DEF_BOARD}
     ${MICROPY_DEF_TINYUSB}
@@ -254,6 +255,7 @@ target_compile_definitions(${MICROPY_TARGET} PUBLIC
 
 # Disable some warnings to keep the build output clean.
 target_compile_options(${MICROPY_TARGET} PUBLIC
+    ${MICROPY_COMPILE_COMPONENT}
     -Wno-clobbered
     -Wno-deprecated-declarations
     -Wno-missing-field-initializers

From 883dc41d465a6a652b607b7982d8eb6be39fa7f4 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 25 Mar 2025 22:43:23 +0100
Subject: [PATCH 2231/3129] esp32/main: Make the entry point function name
 configurable.

This commit introduces a new port configuration entry allowing the entry
point function name to be changed, from "app_main" to a custom name.

This is needed when MicroPython is embedded as an ESP-IDF component,
since the "app_main" symbol is already provided elsewhere, making
compilation not possible.  Marking MicroPython's symbol as weak would
make it compile and make it possible to create and start the MicroPython
task anyway with the right FreeRTOS task creation incantation, but it is
probably easier to just rename the initialisation function into
something else that can be accessed from outside.

When MicroPython is embedded as an ESP-IDF component, the
MICROPY_ESP_IDF_ENTRY definition can be set to indicate the new entry
point function name.  The new function name prototype should still be
defined in external code to let linking succeed.

Also, the NLR failure callback is marked as weak to give the chance of
handling such error in a more controlled fashion rather than trigger an
unconditional board restart.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/main.c         | 4 ++--
 ports/esp32/mpconfigport.h | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 4f0c27ee078f8..b8f49a33baaee 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -216,7 +216,7 @@ void boardctrl_startup(void) {
     }
 }
 
-void app_main(void) {
+void MICROPY_ESP_IDF_ENTRY(void) {
     // Hook for a board to run code at start up.
     // This defaults to initialising NVS.
     MICROPY_BOARD_STARTUP();
@@ -225,7 +225,7 @@ void app_main(void) {
     xTaskCreatePinnedToCore(mp_task, "mp_task", MICROPY_TASK_STACK_SIZE / sizeof(StackType_t), NULL, MP_TASK_PRIORITY, &mp_main_task_handle, MP_TASK_COREID);
 }
 
-void nlr_jump_fail(void *val) {
+MP_WEAK void nlr_jump_fail(void *val) {
     printf("NLR jump failed, val=%p\n", val);
     esp_restart();
 }
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b5b7d63a56333..7c26009578928 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -391,3 +391,8 @@ void boardctrl_startup(void);
 #ifndef MICROPY_PY_STRING_TX_GIL_THRESHOLD
 #define MICROPY_PY_STRING_TX_GIL_THRESHOLD  (20)
 #endif
+
+// Code can override this to provide a custom ESP-IDF entry point.
+#ifndef MICROPY_ESP_IDF_ENTRY
+#define MICROPY_ESP_IDF_ENTRY app_main
+#endif

From 155fa94fbf6afda9dbb3b8508c093648b5bffa09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 6 Mar 2025 18:52:54 +0100
Subject: [PATCH 2232/3129] esp32/machine_uart: Correctly manage UART queue and
 event task.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the driver was reinitialised while there was
already an event task running the queue that task
is trying to receive from would be deleted,
causing it to try to take a lock that no longer
existed and deadlocking the CPU.

This change ensures the task is always shut down
before recreating the queue and recreates the task
afterwards.

It also allows setting an IRQ handler before the
UART is initialized (like other ports allow),
removes the task when the UART is deinitialized
(which was previously missing), adds a check that
no event task can be started when no queue exists,
and adds a check to prevent reinitialising the
UART driver unnecessarily.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_uart.c | 39 ++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 73089ef463681..e5857e894b90e 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -59,6 +59,7 @@
 #define UART_IRQ_BREAK (1 << UART_BREAK)
 #define MP_UART_ALLOWED_FLAGS (UART_IRQ_RX | UART_IRQ_RXIDLE | UART_IRQ_BREAK)
 #define RXIDLE_TIMER_MIN (5000)  // 500 us
+#define UART_QUEUE_SIZE (3)
 
 enum {
     RXIDLE_INACTIVE,
@@ -174,6 +175,13 @@ static void uart_event_task(void *self_in) {
     }
 }
 
+static inline void uart_event_task_create(machine_uart_obj_t *self) {
+    if (xTaskCreatePinnedToCore(uart_event_task, "uart_event_task", 2048, self,
+        ESP_TASKD_EVENT_PRIO, (TaskHandle_t *)&self->uart_event_task, MP_TASK_COREID) != pdPASS) {
+        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("failed to create UART event task"));
+    }
+}
+
 static void mp_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);
     uint32_t baudrate;
@@ -250,7 +258,7 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     // wait for all data to be transmitted before changing settings
     uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000));
 
-    if (args[ARG_txbuf].u_int >= 0 || args[ARG_rxbuf].u_int >= 0) {
+    if ((args[ARG_txbuf].u_int >= 0 && args[ARG_txbuf].u_int != self->txbuf) || (args[ARG_rxbuf].u_int >= 0 && args[ARG_rxbuf].u_int != self->rxbuf)) {
         // must reinitialise driver to change the tx/rx buffer size
         #if MICROPY_HW_ENABLE_UART_REPL
         if (self->uart_num == MICROPY_HW_UART_REPL) {
@@ -275,9 +283,12 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         check_esp_err(uart_get_word_length(self->uart_num, &uartcfg.data_bits));
         check_esp_err(uart_get_parity(self->uart_num, &uartcfg.parity));
         check_esp_err(uart_get_stop_bits(self->uart_num, &uartcfg.stop_bits));
-        check_esp_err(uart_driver_delete(self->uart_num));
+        mp_machine_uart_deinit(self);
         check_esp_err(uart_param_config(self->uart_num, &uartcfg));
-        check_esp_err(uart_driver_install(self->uart_num, self->rxbuf, self->txbuf, 0, NULL, 0));
+        check_esp_err(uart_driver_install(self->uart_num, self->rxbuf, self->txbuf, UART_QUEUE_SIZE, &self->uart_queue, 0));
+        if (self->mp_irq_obj != NULL && self->mp_irq_obj->handler != mp_const_none) {
+            uart_event_task_create(self);
+        }
     }
 
     // set baudrate
@@ -437,7 +448,8 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     self->timeout_char = 0;
     self->invert = 0;
     self->flowcontrol = 0;
-    self->uart_event_task = 0;
+    self->uart_event_task = NULL;
+    self->uart_queue = NULL;
     self->rxidle_state = RXIDLE_INACTIVE;
 
     switch (uart_num) {
@@ -470,12 +482,13 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     {
         // Remove any existing configuration
         check_esp_err(uart_driver_delete(self->uart_num));
+        self->uart_queue = NULL;
 
         // init the peripheral
         // Setup
         check_esp_err(uart_param_config(self->uart_num, &uartcfg));
 
-        check_esp_err(uart_driver_install(uart_num, self->rxbuf, self->txbuf, 3, &self->uart_queue, 0));
+        check_esp_err(uart_driver_install(uart_num, self->rxbuf, self->txbuf, UART_QUEUE_SIZE, &self->uart_queue, 0));
     }
 
     mp_map_t kw_args;
@@ -489,7 +502,12 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
+    if (self->uart_event_task != NULL) {
+        vTaskDelete(self->uart_event_task);
+        self->uart_event_task = NULL;
+    }
     check_esp_err(uart_driver_delete(self->uart_num));
+    self->uart_queue = NULL;
 }
 
 static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
@@ -568,6 +586,12 @@ static const mp_irq_methods_t uart_irq_methods = {
 };
 
 static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
+    #if MICROPY_HW_ENABLE_UART_REPL
+    if (self->uart_num == MICROPY_HW_UART_REPL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("UART does not support IRQs"));
+    }
+    #endif
+
     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));
@@ -597,9 +621,8 @@ static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
         uart_irq_configure_timer(self, trigger);
 
         // Start a task for handling events
-        if (handler != mp_const_none && self->uart_event_task == NULL) {
-            xTaskCreatePinnedToCore(uart_event_task, "uart_event_task", 2048, self,
-                ESP_TASKD_EVENT_PRIO, (TaskHandle_t *)&self->uart_event_task, MP_TASK_COREID);
+        if (handler != mp_const_none && self->uart_event_task == NULL && self->uart_queue != NULL) {
+            uart_event_task_create(self);
         } else if (handler == mp_const_none && self->uart_event_task != NULL) {
             vTaskDelete(self->uart_event_task);
             self->uart_event_task = NULL;

From 24065824796b54d42fdb93457bf53d21656e473e Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 28 Mar 2025 15:30:29 +0100
Subject: [PATCH 2233/3129] esp32/network_common: Raise a memory error on
 ESP_ERR_NO_MEM.

This commit changes the error handler for WiFi operations to recognise
out of memory conditions reported by ESP-IDF functions, and report them
as more descriptive exceptions rather than a generic "error 0x101".

The error handler only provided a human-readable error description for
WiFi-specific error codes (codes in the ESP_ERR_WIFI_BASE range), but
WiFi functions are known to return other codes.  Now ESP_ERR_NO_MEM is
covered with a specific error message, making it easier to debug issues
related to running out of ESP-IDF heap.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/network_common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/network_common.c b/ports/esp32/network_common.c
index e07d7a993f25f..bd34f1b41fdfc 100644
--- a/ports/esp32/network_common.c
+++ b/ports/esp32/network_common.c
@@ -77,6 +77,8 @@ MP_NORETURN void esp_exceptions_helper(esp_err_t e) {
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Wifi Would Block"));
         case ESP_ERR_WIFI_NOT_CONNECT:
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Wifi Not Connected"));
+        case ESP_ERR_NO_MEM:
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("WiFi Out of Memory"));
         default:
             mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Wifi Unknown Error 0x%04x"), e);
     }

From 3b1e22c66947271e8b60eddf4e8aa6dadc6d9a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 27 May 2024 14:25:23 +0200
Subject: [PATCH 2234/3129] esp32/network_ppp: Restructure to match
 extmod/network_ppp_lwip.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ESP32 PPP implementation predates the generic
implementation in extmod. The new extmod
implementation has a few advantages such as a
better deinitialisation procedure (the ESP32
implemementation would not clean up properly and
cause crashes if recreated) and using the UART IRQ
functionality instead of running a task to read
data from the UART.

This change restructures the ESP implementation to
be much closer to the new extmod version, while
also bringing a few tiny improvements from the
ESP32 version to the extmod version. The diff
between extmod/network_ppp_lwip.c and
ports/esp32/network_ppp.c is now a small set of
easy to review ESP32 port-specific changes.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/network_ppp_lwip.c        |   9 +-
 ports/esp32/modnetwork.h         |   2 +-
 ports/esp32/modnetwork_globals.h |   2 +-
 ports/esp32/network_ppp.c        | 511 ++++++++++++++++++-------------
 4 files changed, 310 insertions(+), 214 deletions(-)

diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
index 8eb90ea4a6529..2c3dac92012a0 100644
--- a/extmod/network_ppp_lwip.c
+++ b/extmod/network_ppp_lwip.c
@@ -24,6 +24,10 @@
  * THE SOFTWARE.
  */
 
+// This file is intended to closely match ports/esp32/network_ppp.c. Changes can
+// and should probably be applied to both files. Compare them directly by using:
+// git diff --no-index extmod/network_ppp_lwip.c ports/esp32/network_ppp.c
+
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/stream.h"
@@ -80,7 +84,6 @@ static void network_ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
             break;
         case PPPERR_USER:
             if (self->state >= STATE_ERROR) {
-                network_ppp_stream_uart_irq_disable(self);
                 // Indicate that we are no longer connected and thus
                 // only need to free the PPP PCB, not close it.
                 self->state = STATE_ACTIVE;
@@ -121,6 +124,7 @@ static mp_obj_t network_ppp___del__(mp_obj_t self_in) {
             self->state = STATE_INACTIVE;
             ppp_close(self->pcb, 1);
         }
+        network_ppp_stream_uart_irq_disable(self);
         // Free PPP PCB and reset state.
         self->state = STATE_INACTIVE;
         ppp_free(self->pcb);
@@ -295,7 +299,8 @@ static mp_obj_t network_ppp_connect(size_t n_args, const mp_obj_t *args, mp_map_
         ppp_set_auth(self->pcb, parsed_args[ARG_security].u_int, user_str, key_str);
     }
 
-    netif_set_default(self->pcb->netif);
+    ppp_set_default(self->pcb);
+
     ppp_set_usepeerdns(self->pcb, true);
 
     if (ppp_connect(self->pcb, 0) != ERR_OK) {
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 308a515c6e249..383e200b983c2 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -52,7 +52,7 @@ extern const mp_obj_type_t esp_network_wlan_type;
 MP_DECLARE_CONST_FUN_OBJ_0(esp_network_initialize_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_get_wlan_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(esp_network_get_lan_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(esp_network_ppp_make_new_obj);
+extern const struct _mp_obj_type_t esp_network_ppp_lwip_type;
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_ifconfig_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(esp_network_ipconfig_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(esp_nic_ipconfig_obj);
diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 1aad785ee3d9c..9e355e958f1a4 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -8,7 +8,7 @@
 { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&esp_network_get_lan_obj) },
 #endif
 #if defined(CONFIG_ESP_NETIF_TCPIP_LWIP) && defined(CONFIG_LWIP_PPP_SUPPORT)
-{ MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&esp_network_ppp_make_new_obj) },
+{ MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&esp_network_ppp_lwip_type) },
 #endif
 { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_network_phy_mode_obj) },
 { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&esp_network_ipconfig_obj) },
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 4dd5a3718c295..8b700c98ef386 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 "Eric Poulsen" <eric@zyxod.com>
+ * Copyright (c) 2024 Damien P. George
  *
  * Based on the ESP IDF example code which is Public Domain / CC0
  *
@@ -26,172 +27,265 @@
  * THE SOFTWARE.
  */
 
+// This file is intended to closely match extmod/network_ppp_lwip.c. Changes can
+// and should probably be applied to both files. Compare them directly by using:
+// git diff --no-index extmod/network_ppp_lwip.c ports/esp32/network_ppp.c
+
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "py/objtype.h"
 #include "py/stream.h"
-#include "shared/netutils/netutils.h"
-#include "modmachine.h"
-#include "ppp_set_auth.h"
 
-#include "netif/ppp/ppp.h"
-#include "netif/ppp/pppos.h"
-#include "lwip/err.h"
-#include "lwip/sockets.h"
-#include "lwip/sys.h"
-#include "lwip/netdb.h"
+#if defined(CONFIG_ESP_NETIF_TCPIP_LWIP) && defined(CONFIG_LWIP_PPP_SUPPORT)
+
 #include "lwip/dns.h"
+#include "netif/ppp/ppp.h"
 #include "netif/ppp/pppapi.h"
+#include "netif/ppp/pppos.h"
 
-#if defined(CONFIG_ESP_NETIF_TCPIP_LWIP) && defined(CONFIG_LWIP_PPP_SUPPORT)
+// Includes for port-specific changes compared to network_ppp_lwip.c
+#include "shared/netutils/netutils.h"
+#include "ppp_set_auth.h"
 
-#define PPP_CLOSE_TIMEOUT_MS (4000)
+// Enable this to see the serial data going between the PPP layer.
+#define PPP_TRACE_IN_OUT (0)
 
-typedef struct _ppp_if_obj_t {
+typedef enum {
+    STATE_INACTIVE,
+    STATE_ACTIVE,
+    STATE_ERROR,
+    STATE_CONNECTING,
+    STATE_CONNECTED,
+} network_ppp_state_t;
+
+typedef struct _network_ppp_obj_t {
     mp_obj_base_t base;
-    bool active;
-    bool connected;
-    volatile bool clean_close;
-    ppp_pcb *pcb;
+    network_ppp_state_t state;
+    int error_code;
     mp_obj_t stream;
-    SemaphoreHandle_t inactiveWaitSem;
-    volatile TaskHandle_t client_task_handle;
-    struct netif pppif;
-} ppp_if_obj_t;
+    ppp_pcb *pcb;
+    struct netif netif;
+} network_ppp_obj_t;
 
-const mp_obj_type_t ppp_if_type;
+const mp_obj_type_t esp_network_ppp_lwip_type;
+
+static mp_obj_t network_ppp___del__(mp_obj_t self_in);
+
+static void network_ppp_stream_uart_irq_disable(network_ppp_obj_t *self) {
+    if (self->stream == mp_const_none) {
+        return;
+    }
 
-static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
-    ppp_if_obj_t *self = ctx;
-    struct netif *pppif = ppp_netif(self->pcb);
+    // Disable UART IRQ.
+    mp_obj_t dest[3];
+    mp_load_method(self->stream, MP_QSTR_irq, dest);
+    dest[2] = mp_const_none;
+    mp_call_method_n_kw(1, 0, dest);
+}
 
+static void network_ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
+    network_ppp_obj_t *self = ctx;
     switch (err_code) {
         case PPPERR_NONE:
-            #if CONFIG_LWIP_IPV6
-            self->connected = (pppif->ip_addr.u_addr.ip4.addr != 0);
-            #else
-            self->connected = (pppif->ip_addr.addr != 0);
-            #endif // CONFIG_LWIP_IPV6
+            self->state = STATE_CONNECTED;
             break;
         case PPPERR_USER:
-            self->clean_close = true;
-            break;
-        case PPPERR_CONNECT:
-            self->connected = false;
+            if (self->state >= STATE_ERROR) {
+                // Indicate that we are no longer connected and thus
+                // only need to free the PPP PCB, not close it.
+                self->state = STATE_ACTIVE;
+            }
+            // Clean up the PPP PCB.
+            network_ppp___del__(MP_OBJ_FROM_PTR(self));
             break;
         default:
+            self->state = STATE_ERROR;
+            self->error_code = err_code;
             break;
     }
 }
 
-static mp_obj_t ppp_make_new(mp_obj_t stream) {
+static mp_obj_t network_ppp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    mp_obj_t stream = all_args[0];
+
     if (stream != mp_const_none) {
         mp_get_stream_raise(stream, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
     }
 
-    ppp_if_obj_t *self = mp_obj_malloc_with_finaliser(ppp_if_obj_t, &ppp_if_type);
+    network_ppp_obj_t *self = mp_obj_malloc_with_finaliser(network_ppp_obj_t, type);
+    self->state = STATE_INACTIVE;
     self->stream = stream;
-    self->active = false;
-    self->connected = false;
-    self->clean_close = false;
-    self->client_task_handle = NULL;
+    self->pcb = NULL;
 
     return MP_OBJ_FROM_PTR(self);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(esp_network_ppp_make_new_obj, ppp_make_new);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
-static u32_t ppp_output_callback(ppp_pcb *pcb, const void *data, u32_t len, void *ctx)
-#else
-static u32_t ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx)
-#endif
-{
-    ppp_if_obj_t *self = ctx;
-
-    mp_obj_t stream = self->stream;
-    if (stream == mp_const_none) {
-        return 0;
+static mp_obj_t network_ppp___del__(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->state >= STATE_ACTIVE) {
+        if (self->state >= STATE_ERROR) {
+            // Still connected over the stream.
+            // Force the connection to close, with nocarrier=1.
+            self->state = STATE_INACTIVE;
+            pppapi_close(self->pcb, 1);
+        }
+        network_ppp_stream_uart_irq_disable(self);
+        // Free PPP PCB and reset state.
+        self->state = STATE_INACTIVE;
+        pppapi_free(self->pcb);
+        self->pcb = NULL;
     }
-
-    int err;
-    return mp_stream_rw(stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);
+    return mp_const_none;
 }
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp___del___obj, network_ppp___del__);
 
-static void pppos_client_task(void *self_in) {
-    ppp_if_obj_t *self = (ppp_if_obj_t *)self_in;
-    uint8_t buf[256];
+static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
-    int len = 0;
-    while (ulTaskNotifyTake(pdTRUE, len <= 0) == 0) {
-        mp_obj_t stream = self->stream;
-        if (stream == mp_const_none) {
-            len = 0;
-        } else {
-            int err;
-            len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);
-            if (len > 0) {
-                pppos_input_tcpip(self->pcb, (u8_t *)buf, len);
-            }
-        }
+    if (self->state <= STATE_ERROR) {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EPERM);
     }
 
-    self->client_task_handle = NULL;
-    vTaskDelete(NULL);
-    for (;;) {
+    mp_int_t total_len = 0;
+    mp_obj_t stream = self->stream;
+    while (stream != mp_const_none) {
+        uint8_t buf[256];
+        int err;
+        mp_uint_t len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);
+        if (len == 0) {
+            break;
+        }
+        #if PPP_TRACE_IN_OUT
+        mp_printf(&mp_plat_print, "ppp_in(n=%u,data=", len);
+        for (size_t i = 0; i < len; ++i) {
+            mp_printf(&mp_plat_print, "%02x:", buf[i]);
+        }
+        mp_printf(&mp_plat_print, ")\n");
+        #endif
+        pppos_input(self->pcb, (u8_t *)buf, len);
+        total_len += len;
     }
+
+    return MP_OBJ_NEW_SMALL_INT(total_len);
 }
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ppp_poll_obj, 1, 2, network_ppp_poll);
 
-static mp_obj_t ppp_active(size_t n_args, const mp_obj_t *args) {
-    ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+static void network_ppp_stream_uart_irq_enable(network_ppp_obj_t *self) {
+    if (self->stream == mp_const_none) {
+        return;
+    }
 
-    if (n_args > 1) {
-        if (mp_obj_is_true(args[1])) {
-            if (self->active) {
-                return mp_const_true;
-            }
+    // Enable UART IRQ to call PPP.poll() when incoming data is ready.
+    mp_obj_t dest[4];
+    mp_load_method(self->stream, MP_QSTR_irq, dest);
+    dest[2] = mp_obj_new_bound_meth(MP_OBJ_FROM_PTR(&network_ppp_poll_obj), MP_OBJ_FROM_PTR(self));
+    dest[3] = mp_load_attr(self->stream, MP_QSTR_IRQ_RXIDLE);
+    mp_call_method_n_kw(2, 0, dest);
+}
 
-            self->pcb = pppapi_pppos_create(&self->pppif, ppp_output_callback, ppp_status_cb, self);
+static mp_obj_t network_ppp_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"));
+    }
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
-            if (self->pcb == NULL) {
-                mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("init failed"));
-            }
-            self->active = true;
-        } else {
-            if (!self->active) {
-                return mp_const_false;
+    if (kwargs->used != 0) {
+        for (size_t i = 0; i < kwargs->alloc; i++) {
+            if (mp_map_slot_is_filled(kwargs, i)) {
+                switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    case MP_QSTR_stream: {
+                        if (kwargs->table[i].value != mp_const_none) {
+                            mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
+                        }
+                        if (self->state >= STATE_ACTIVE) {
+                            network_ppp_stream_uart_irq_disable(self);
+                        }
+                        self->stream = kwargs->table[i].value;
+                        if (self->state >= STATE_ACTIVE) {
+                            network_ppp_stream_uart_irq_enable(self);
+                        }
+                        break;
+                    }
+                    default:
+                        break;
+                }
             }
+        }
+        return mp_const_none;
+    }
 
-            if (self->client_task_handle != NULL) { // is connecting or connected?
-                // Wait for PPPERR_USER, with timeout
-                pppapi_close(self->pcb, 0);
-                uint32_t t0 = mp_hal_ticks_ms();
-                while (!self->clean_close && mp_hal_ticks_ms() - t0 < PPP_CLOSE_TIMEOUT_MS) {
-                    mp_hal_delay_ms(10);
-                }
+    if (n_args != 2) {
+        mp_raise_TypeError(MP_ERROR_TEXT("can query only one param"));
+    }
 
-                // Shutdown task
-                xTaskNotifyGive(self->client_task_handle);
-                t0 = mp_hal_ticks_ms();
-                while (self->client_task_handle != NULL && mp_hal_ticks_ms() - t0 < PPP_CLOSE_TIMEOUT_MS) {
-                    mp_hal_delay_ms(10);
+    mp_obj_t val = mp_const_none;
+
+    switch (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_stream: {
+            val = self->stream;
+            break;
+        }
+        case MP_QSTR_ifname: {
+            if (self->pcb != NULL) {
+                struct netif *pppif = ppp_netif(self->pcb);
+                char ifname[NETIF_NAMESIZE + 1] = {0};
+                netif_index_to_name(netif_get_index(pppif), ifname);
+                if (ifname[0] != 0) {
+                    val = mp_obj_new_str_from_cstr((char *)ifname);
                 }
             }
-
-            // Release PPP
-            pppapi_free(self->pcb);
-            self->pcb = NULL;
-            self->active = false;
-            self->connected = false;
-            self->clean_close = false;
+            break;
         }
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+    }
+
+    return val;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_ppp_config_obj, 1, network_ppp_config);
+
+static mp_obj_t network_ppp_status(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->state == STATE_ERROR) {
+        return MP_OBJ_NEW_SMALL_INT(-self->error_code);
+    } else {
+        return MP_OBJ_NEW_SMALL_INT(self->state);
+    }
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp_status_obj, network_ppp_status);
+
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+static u32_t network_ppp_output_callback(ppp_pcb *pcb, const void *data, u32_t len, void *ctx)
+#else
+static u32_t network_ppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx)
+#endif
+{
+    network_ppp_obj_t *self = ctx;
+    #if PPP_TRACE_IN_OUT
+    mp_printf(&mp_plat_print, "ppp_out(n=%u,data=", len);
+    for (size_t i = 0; i < len; ++i) {
+        mp_printf(&mp_plat_print, "%02x:", ((const uint8_t *)data)[i]);
+    }
+    mp_printf(&mp_plat_print, ")\n");
+    #endif
+    mp_obj_t stream = self->stream;
+    if (stream == mp_const_none) {
+        return 0;
     }
-    return mp_obj_new_bool(self->active);
+    int err;
+    // The return value from this output callback is the number of bytes written out.
+    // If it's less than the requested number of bytes then lwIP will propagate out an error.
+    return mp_stream_rw(stream, (void *)data, len, &err, MP_STREAM_RW_WRITE);
 }
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ppp_active_obj, 1, 2, ppp_active);
 
-static mp_obj_t ppp_connect_py(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    enum { ARG_authmode, ARG_username, ARG_password };
+static mp_obj_t network_ppp_connect(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    enum { ARG_security, ARG_user, ARG_key, ARG_authmode, ARG_username, ARG_password };
     static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_user, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        // Deprecated arguments for backwards compatibility
         { MP_QSTR_authmode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PPPAUTHTYPE_NONE} },
         { MP_QSTR_username, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_password, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -200,17 +294,34 @@ static mp_obj_t ppp_connect_py(size_t n_args, const mp_obj_t *args, mp_map_t *kw
     mp_arg_val_t parsed_args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, parsed_args);
 
-    ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    // Use deprecated arguments as defaults
+    if (parsed_args[ARG_security].u_int == -1) {
+        parsed_args[ARG_security].u_int = parsed_args[ARG_authmode].u_int;
+    }
+    if (parsed_args[ARG_user].u_obj == mp_const_none) {
+        parsed_args[ARG_user].u_obj = parsed_args[ARG_username].u_obj;
+    }
+    if (parsed_args[ARG_key].u_obj == mp_const_none) {
+        parsed_args[ARG_key].u_obj = parsed_args[ARG_password].u_obj;
+    }
+
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (self->state == STATE_INACTIVE) {
+        self->pcb = pppapi_pppos_create(&self->netif, network_ppp_output_callback, network_ppp_status_cb, self);
+        if (self->pcb == NULL) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("pppos_create failed"));
+        }
+        self->state = STATE_ACTIVE;
 
-    if (!self->active) {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("must be active"));
+        network_ppp_stream_uart_irq_enable(self);
     }
 
-    if (self->client_task_handle != NULL) {
+    if (self->state == STATE_CONNECTING || self->state == STATE_CONNECTED) {
         mp_raise_OSError(MP_EALREADY);
     }
 
-    switch (parsed_args[ARG_authmode].u_int) {
+    switch (parsed_args[ARG_security].u_int) {
         case PPPAUTHTYPE_NONE:
         case PPPAUTHTYPE_PAP:
         case PPPAUTHTYPE_CHAP:
@@ -219,39 +330,49 @@ static mp_obj_t ppp_connect_py(size_t n_args, const mp_obj_t *args, mp_map_t *kw
             mp_raise_ValueError(MP_ERROR_TEXT("invalid auth"));
     }
 
-    if (parsed_args[ARG_authmode].u_int != PPPAUTHTYPE_NONE) {
-        const char *username_str = mp_obj_str_get_str(parsed_args[ARG_username].u_obj);
-        const char *password_str = mp_obj_str_get_str(parsed_args[ARG_password].u_obj);
-        pppapi_set_auth(self->pcb, parsed_args[ARG_authmode].u_int, username_str, password_str);
+    if (parsed_args[ARG_security].u_int != PPPAUTHTYPE_NONE) {
+        const char *user_str = mp_obj_str_get_str(parsed_args[ARG_user].u_obj);
+        const char *key_str = mp_obj_str_get_str(parsed_args[ARG_key].u_obj);
+        pppapi_set_auth(self->pcb, parsed_args[ARG_security].u_int, user_str, key_str);
     }
-    if (pppapi_set_default(self->pcb) != ESP_OK) {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("set default failed"));
+
+    if (pppapi_set_default(self->pcb) != ERR_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ppp_set_default failed"));
     }
 
     ppp_set_usepeerdns(self->pcb, true);
 
-    if (pppapi_connect(self->pcb, 0) != ESP_OK) {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("connect failed"));
+    if (pppapi_connect(self->pcb, 0) != ERR_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ppp_connect failed"));
     }
 
-    if (xTaskCreatePinnedToCore(pppos_client_task, "ppp", 2048, self, 1, (TaskHandle_t *)&self->client_task_handle, MP_TASK_COREID) != pdPASS) {
-        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("failed to create worker task"));
-    }
+    self->state = STATE_CONNECTING;
+
+    // Do a poll in case there is data waiting on the input stream.
+    network_ppp_poll(1, args);
 
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_KW(ppp_connect_obj, 1, ppp_connect_py);
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_ppp_connect_obj, 1, network_ppp_connect);
 
-static mp_obj_t ppp_delete(mp_obj_t self_in) {
-    ppp_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_t args[] = {self, mp_const_false};
-    ppp_active(2, args);
+static mp_obj_t network_ppp_disconnect(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->state == STATE_CONNECTING || self->state == STATE_CONNECTED) {
+        // Initiate close and wait for PPPERR_USER callback.
+        pppapi_close(self->pcb, 0);
+    }
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(ppp_delete_obj, ppp_delete);
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp_disconnect_obj, network_ppp_disconnect);
+
+static mp_obj_t network_ppp_isconnected(mp_obj_t self_in) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(self->state == STATE_CONNECTED);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(network_ppp_isconnected_obj, network_ppp_isconnected);
 
-static mp_obj_t ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
-    ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+static mp_obj_t network_ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
         // get
         const ip_addr_t *dns;
@@ -282,11 +403,11 @@ static mp_obj_t ppp_ifconfig(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ppp_ifconfig_obj, 1, 2, ppp_ifconfig);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ppp_ifconfig_obj, 1, 2, network_ppp_ifconfig);
 
-static mp_obj_t ppp_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+static mp_obj_t network_ppp_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (kwargs->used == 0) {
-        ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
         if (self->pcb == NULL) {
             mp_raise_ValueError(MP_ERROR_TEXT("PPP not active"));
         }
@@ -318,94 +439,64 @@ static mp_obj_t ppp_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwar
     }
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_KW(ppp_ipconfig_obj, 1, ppp_ipconfig);
+static MP_DEFINE_CONST_FUN_OBJ_KW(network_ppp_ipconfig_obj, 1, network_ppp_ipconfig);
 
-static mp_obj_t ppp_status(mp_obj_t self_in) {
-    return mp_const_none;
-}
-static MP_DEFINE_CONST_FUN_OBJ_1(ppp_status_obj, ppp_status);
-
-static mp_obj_t ppp_isconnected(mp_obj_t self_in) {
-    ppp_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(self->connected);
-}
-static MP_DEFINE_CONST_FUN_OBJ_1(ppp_isconnected_obj, ppp_isconnected);
-
-static mp_obj_t ppp_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"));
-    }
-    ppp_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-
-    if (kwargs->used != 0) {
-        for (size_t i = 0; i < kwargs->alloc; i++) {
-            if (mp_map_slot_is_filled(kwargs, i)) {
-                switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
-                    case MP_QSTR_stream: {
-                        if (kwargs->table[i].value != mp_const_none) {
-                            mp_get_stream_raise(kwargs->table[i].value, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE);
-                        }
-                        self->stream = kwargs->table[i].value;
-                        break;
-                    }
-                    default:
-                        break;
-                }
+static mp_obj_t network_ppp_active(size_t n_args, const mp_obj_t *args) {
+    network_ppp_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args > 1) {
+        if (mp_obj_is_true(args[1])) {
+            if (self->state >= STATE_ACTIVE) {
+                return mp_const_true;
             }
-        }
-        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;
+            self->pcb = pppapi_pppos_create(&self->netif, network_ppp_output_callback, network_ppp_status_cb, self);
+            if (self->pcb == NULL) {
+                mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("pppos_create failed"));
+            }
+            self->state = STATE_ACTIVE;
 
-    switch (mp_obj_str_get_qstr(args[1])) {
-        case MP_QSTR_stream: {
-            val = self->stream;
-            break;
-        }
-        case MP_QSTR_ifname: {
-            if (self->pcb != NULL) {
-                struct netif *pppif = ppp_netif(self->pcb);
-                char ifname[NETIF_NAMESIZE + 1] = {0};
-                netif_index_to_name(netif_get_index(pppif), ifname);
-                if (ifname[0] != 0) {
-                    val = mp_obj_new_str_from_cstr((char *)ifname);
-                }
+            network_ppp_stream_uart_irq_enable(self);
+        } else {
+            if (self->state < STATE_ACTIVE) {
+                return mp_const_false;
             }
-            break;
+
+            network_ppp___del__(MP_OBJ_FROM_PTR(self));
         }
-        default:
-            mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
     }
-
-    return val;
+    return mp_obj_new_bool(self->state >= STATE_ACTIVE);
 }
-static MP_DEFINE_CONST_FUN_OBJ_KW(ppp_config_obj, 1, ppp_config);
-
-static const mp_rom_map_elem_t ppp_if_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&ppp_active_obj) },
-    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&ppp_connect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&ppp_isconnected_obj) },
-    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&ppp_status_obj) },
-    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&ppp_config_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&ppp_ifconfig_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&ppp_ipconfig_obj) },
-    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&ppp_delete_obj) },
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ppp_active_obj, 1, 2, network_ppp_active);
+
+static const mp_rom_map_elem_t network_ppp_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&network_ppp___del___obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&network_ppp_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&network_ppp_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&network_ppp_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&network_ppp_disconnect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&network_ppp_isconnected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&network_ppp_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipconfig), MP_ROM_PTR(&network_ppp_ipconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&network_ppp_poll_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_SEC_NONE), MP_ROM_INT(PPPAUTHTYPE_NONE) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_PAP), MP_ROM_INT(PPPAUTHTYPE_PAP) },
+    { MP_ROM_QSTR(MP_QSTR_SEC_CHAP), MP_ROM_INT(PPPAUTHTYPE_CHAP) },
+
+    // Deprecated interface for backwards compatibility
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&network_ppp_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_NONE), MP_ROM_INT(PPPAUTHTYPE_NONE) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_PAP), MP_ROM_INT(PPPAUTHTYPE_PAP) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_CHAP), MP_ROM_INT(PPPAUTHTYPE_CHAP) },
 };
-static MP_DEFINE_CONST_DICT(ppp_if_locals_dict, ppp_if_locals_dict_table);
+static MP_DEFINE_CONST_DICT(network_ppp_locals_dict, network_ppp_locals_dict_table);
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    ppp_if_type,
+    esp_network_ppp_lwip_type,
     MP_QSTR_PPP,
     MP_TYPE_FLAG_NONE,
-    locals_dict, &ppp_if_locals_dict
+    make_new, network_ppp_make_new,
+    locals_dict, &network_ppp_locals_dict
     );
 
 #endif

From 51b821ce820008b5419bf6889d15d5a7c00a2c99 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 May 2025 12:35:49 +1000
Subject: [PATCH 2235/3129] tools/verifygitlog.py: Disallow a leading slash in
 commit subject line.

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

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index 5234611983be6..f2d3d722d0883 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -116,8 +116,8 @@ def verify_message_body(raw_body, err):
 def verify_subject_line_prefix(prefix, err):
     ext = (".c", ".h", ".cpp", ".js", ".rst", ".md")
 
-    if prefix.startswith("."):
-        err.error('Subject prefix cannot begin with ".".')
+    if prefix.startswith((".", "/")):
+        err.error('Subject prefix cannot begin with "." or "/".')
 
     if prefix.endswith("/"):
         err.error('Subject prefix cannot end with "/".')

From 420897045171305fa36440c08b575ebe3f6d4ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 14 May 2025 18:05:06 +0200
Subject: [PATCH 2236/3129] tools/verifygitlog.py: Allow long co-author and
 sign-off names.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 tools/verifygitlog.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index f2d3d722d0883..dba6ebd6de59a 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -105,8 +105,12 @@ def verify_message_body(raw_body, err):
 
     # 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:
+        # Long lines with URLs or human names are exempt from the line length rule.
+        if len(line) >= 76 and not (
+            "://" in line
+            or line.startswith("Co-authored-by: ")
+            or line.startswith("Signed-off-by: ")
+        ):
             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]:

From 62d26bfc15840b6bc172a081066931b2fce6a696 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 May 2025 12:54:47 +1000
Subject: [PATCH 2237/3129] extmod/vfs_lfsx: Fix errno value raised from chdir.

OSError errno values should be positive.

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 4b10ca3aa597c..404eab84f47a8 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -300,7 +300,7 @@ static mp_obj_t MP_VFS_LFSx(chdir)(mp_obj_t self_in, mp_obj_t path_in) {
         struct LFSx_API (info) info;
         int ret = LFSx_API(stat)(&self->lfs, path, &info);
         if (ret < 0 || info.type != LFSx_MACRO(_TYPE_DIR)) {
-            mp_raise_OSError(-MP_ENOENT);
+            mp_raise_OSError(MP_ENOENT);
         }
     }
 

From 44bcfe53de6fdc1f3eb0f104798f5679d7b4473d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 May 2025 12:55:01 +1000
Subject: [PATCH 2238/3129] tests/extmod/vfs_lfs_error.py: Test value of all
 OSError's errno.

To make sure they have the correct value.

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

diff --git a/tests/extmod/vfs_lfs_error.py b/tests/extmod/vfs_lfs_error.py
index 2ac7629bfa8fc..73cdf3437330b 100644
--- a/tests/extmod/vfs_lfs_error.py
+++ b/tests/extmod/vfs_lfs_error.py
@@ -1,7 +1,7 @@
 # Test for VfsLittle using a RAM device, testing error handling
 
 try:
-    import vfs
+    import errno, vfs
 
     vfs.VfsLfs1
     vfs.VfsLfs2
@@ -41,14 +41,14 @@ def test(bdev, vfs_class):
     # mkfs with too-small block device
     try:
         vfs_class.mkfs(RAMBlockDevice(1))
-    except OSError:
-        print("mkfs OSError")
+    except OSError as er:
+        print("mkfs OSError", er.errno > 0)
 
     # mount with invalid filesystem
     try:
         vfs_class(bdev)
-    except OSError:
-        print("mount OSError")
+    except OSError as er:
+        print("mount OSError", er.errno > 0)
 
     # set up for following tests
     vfs_class.mkfs(bdev)
@@ -60,60 +60,60 @@ def test(bdev, vfs_class):
     # ilistdir
     try:
         fs.ilistdir("noexist")
-    except OSError:
-        print("ilistdir OSError")
+    except OSError as er:
+        print("ilistdir OSError", er)
 
     # remove
     try:
         fs.remove("noexist")
-    except OSError:
-        print("remove OSError")
+    except OSError as er:
+        print("remove OSError", er)
 
     # rmdir
     try:
         fs.rmdir("noexist")
-    except OSError:
-        print("rmdir OSError")
+    except OSError as er:
+        print("rmdir OSError", er)
 
     # rename
     try:
         fs.rename("noexist", "somethingelse")
-    except OSError:
-        print("rename OSError")
+    except OSError as er:
+        print("rename OSError", er)
 
     # mkdir
     try:
         fs.mkdir("testdir")
-    except OSError:
-        print("mkdir OSError")
+    except OSError as er:
+        print("mkdir OSError", er)
 
     # chdir to nonexistent
     try:
         fs.chdir("noexist")
-    except OSError:
-        print("chdir OSError")
+    except OSError as er:
+        print("chdir OSError", er)
     print(fs.getcwd())  # check still at root
 
     # chdir to file
     try:
         fs.chdir("testfile")
-    except OSError:
-        print("chdir OSError")
+    except OSError as er:
+        print("chdir OSError", er)
     print(fs.getcwd())  # check still at root
 
     # stat
     try:
         fs.stat("noexist")
-    except OSError:
-        print("stat OSError")
+    except OSError as er:
+        print("stat OSError", er)
 
     # error during seek
     with fs.open("testfile", "r") as f:
         f.seek(1 << 30)  # SEEK_SET
         try:
             f.seek(1 << 30, 1)  # SEEK_CUR
-        except OSError:
-            print("seek OSError")
+        except OSError as er:
+            print("seek OSError", er)
 
 
 bdev = RAMBlockDevice(30)
diff --git a/tests/extmod/vfs_lfs_error.py.exp b/tests/extmod/vfs_lfs_error.py.exp
index f4327f6962ec3..440607ed84b22 100644
--- a/tests/extmod/vfs_lfs_error.py.exp
+++ b/tests/extmod/vfs_lfs_error.py.exp
@@ -1,28 +1,28 @@
 test <class 'VfsLfs1'>
-mkfs OSError
-mount OSError
-ilistdir OSError
-remove OSError
-rmdir OSError
-rename OSError
-mkdir OSError
-chdir OSError
+mkfs OSError True
+mount OSError True
+ilistdir OSError [Errno 2] ENOENT
+remove OSError [Errno 2] ENOENT
+rmdir OSError [Errno 2] ENOENT
+rename OSError [Errno 2] ENOENT
+mkdir OSError [Errno 17] EEXIST
+chdir OSError [Errno 2] ENOENT
 /
-chdir OSError
+chdir OSError [Errno 2] ENOENT
 /
-stat OSError
-seek OSError
+stat OSError [Errno 2] ENOENT
+seek OSError [Errno 22] EINVAL
 test <class 'VfsLfs2'>
-mkfs OSError
-mount OSError
-ilistdir OSError
-remove OSError
-rmdir OSError
-rename OSError
-mkdir OSError
-chdir OSError
+mkfs OSError True
+mount OSError True
+ilistdir OSError [Errno 2] ENOENT
+remove OSError [Errno 2] ENOENT
+rmdir OSError [Errno 2] ENOENT
+rename OSError [Errno 2] ENOENT
+mkdir OSError [Errno 17] EEXIST
+chdir OSError [Errno 2] ENOENT
 /
-chdir OSError
+chdir OSError [Errno 2] ENOENT
 /
-stat OSError
-seek OSError
+stat OSError [Errno 2] ENOENT
+seek OSError [Errno 22] EINVAL

From e22c666d0623e6273d748f787a84d3108a57f1c3 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 9 May 2025 19:17:50 +0200
Subject: [PATCH 2239/3129] tests/cpydiff: Explain the numeric literal parsing
 difference.

Fixes issue #17224.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cpydiff/syntax_spaces.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/cpydiff/syntax_spaces.py b/tests/cpydiff/syntax_spaces.py
index 03d25d56199d1..86faa5981ceb0 100644
--- a/tests/cpydiff/syntax_spaces.py
+++ b/tests/cpydiff/syntax_spaces.py
@@ -1,8 +1,15 @@
 """
 categories: Syntax,Spaces
-description: uPy requires spaces between literal numbers and keywords, CPy doesn't
-cause: Unknown
-workaround: Unknown
+description: MicroPython requires spaces between literal numbers and keywords, CPython doesn't
+cause: Different parser implementation
+
+MicroPython's tokenizer treats a sequence like ``1and`` as a single token, while CPython treats it as two tokens.
+
+Since CPython 3.11, this syntax causes a ``SyntaxWarning`` for an "invalid literal".
+
+workaround: Add a space between the integer literal and the intended next token.
+
+This also fixes the ``SyntaxWarning`` in CPython.
 """
 
 try:

From 2f97d1dd28a7e2d34df268676e533944410aab42 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 9 May 2025 21:22:33 +0200
Subject: [PATCH 2240/3129] tests/cpydiff: Document that uPy requires space
 after number+period.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cpydiff/syntax_spaces.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/cpydiff/syntax_spaces.py b/tests/cpydiff/syntax_spaces.py
index 86faa5981ceb0..e7d00838cb667 100644
--- a/tests/cpydiff/syntax_spaces.py
+++ b/tests/cpydiff/syntax_spaces.py
@@ -1,11 +1,11 @@
 """
 categories: Syntax,Spaces
-description: MicroPython requires spaces between literal numbers and keywords, CPython doesn't
+description: MicroPython requires spaces between literal numbers and keywords or ".", CPython doesn't
 cause: Different parser implementation
 
 MicroPython's tokenizer treats a sequence like ``1and`` as a single token, while CPython treats it as two tokens.
 
-Since CPython 3.11, this syntax causes a ``SyntaxWarning`` for an "invalid literal".
+Since CPython 3.11, when the literal number is followed by a token, this syntax causes a ``SyntaxWarning`` for an "invalid literal". When a literal number is followed by a "." denoting attribute access, CPython does not warn.
 
 workaround: Add a space between the integer literal and the intended next token.
 
@@ -24,3 +24,7 @@
     print(eval("1if 1else 0"))
 except SyntaxError:
     print("Should have worked")
+try:
+    print(eval("0x1.to_bytes(1)"))
+except SyntaxError:
+    print("Should have worked")

From 605eda158de4f40ba03e15fa183a178f7cf1a1da Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 9 May 2025 21:26:26 +0200
Subject: [PATCH 2241/3129] tools/gen-cpydiff.py: Improve stdout vs stderr
 interleaving.

In the syntax_space cpydiff, all the warnings were shown after the other
output.  This is because the output always showed all of stdout first and
all of stdout second.

By running Python in unbuffered mode and using `stderr=STDOUT`, the two
streams are interleaved in exactly the order they're printed, so the
SyntaxWarnings are interleaved with the other output.

By using the `encoding=` argument of Popen, the need to explicitly convert
to utf-8 is avoided.  The encoding of the input also becomes utf-8 in this
case, which all the test cases are (well, they're all ASCII, I think).  As
in `run-tests.py`, setting PYTHONIOENCODING ensures the Python
interpreter's input and output are in utf-8, which is not always the case,
especially on Windows systems.

I spot-checked the generated doc pages and they all seemed to make sense
still.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tools/gen-cpydiff.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 2f9394deeae00..744cde8d7b57b 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -45,6 +45,12 @@
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
+# Set PYTHONIOENCODING so that CPython will use utf-8 on systems which set another encoding in the locale
+os.environ["PYTHONIOENCODING"] = "utf-8"
+
+# Set PYTHONUNBUFFERED so that CPython will interleave stdout & stderr without buffering
+os.environ["PYTHONUNBUFFERED"] = "a non-empty string"
+
 TESTPATH = "../tests/cpydiff"
 DOCPATH = "../docs/genrst"
 SRCDIR = "../docs/differences"
@@ -111,7 +117,7 @@ def run_tests(tests):
     results = []
     for test in tests:
         test_fullpath = os.path.join(TESTPATH, test.name)
-        with open(test_fullpath, "rb") as f:
+        with open(test_fullpath, "r") as f:
             input_py = f.read()
 
         process = subprocess.Popen(
@@ -119,20 +125,22 @@ def run_tests(tests):
             shell=True,
             stdout=subprocess.PIPE,
             stdin=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            encoding="utf-8",
         )
-        output_cpy = [com.decode("utf8") for com in process.communicate(input_py)]
+        output_cpy = process.communicate(input_py)[0]
 
         process = subprocess.Popen(
             MICROPYTHON,
             shell=True,
             stdout=subprocess.PIPE,
             stdin=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            encoding="utf-8",
         )
-        output_upy = [com.decode("utf8") for com in process.communicate(input_py)]
+        output_upy = process.communicate(input_py)[0]
 
-        if output_cpy[0] == output_upy[0] and output_cpy[1] == output_upy[1]:
+        if output_cpy == output_upy:
             print("Error: Test has same output in CPython vs MicroPython: " + test_fullpath)
             same_results = True
         else:
@@ -246,9 +254,9 @@ def gen_rst(results):
             rst.write("**Workaround:** " + output.workaround + "\n\n")
 
         rst.write("Sample code::\n\n" + indent(output.code, TAB) + "\n")
-        output_cpy = indent("".join(output.output_cpy[0:2]), TAB).rstrip()
+        output_cpy = indent(output.output_cpy, TAB).rstrip()
         output_cpy = ("::\n\n" if output_cpy != "" else "") + output_cpy
-        output_upy = indent("".join(output.output_upy[0:2]), TAB).rstrip()
+        output_upy = indent(output.output_upy, TAB).rstrip()
         output_upy = ("::\n\n" if output_upy != "" else "") + output_upy
         table = gen_table([["CPy output:", output_cpy], ["uPy output:", output_upy]])
         rst.write(table)

From 8648e6d1cf19afec1485ed204b2135ca322c6a8b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 9 May 2025 22:04:29 +0200
Subject: [PATCH 2242/3129] tests/cpydiff: Add test of underscore-in-literals.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cpydiff/syntax_literal_underscore.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/cpydiff/syntax_literal_underscore.py

diff --git a/tests/cpydiff/syntax_literal_underscore.py b/tests/cpydiff/syntax_literal_underscore.py
new file mode 100644
index 0000000000000..4b1406e9f3f71
--- /dev/null
+++ b/tests/cpydiff/syntax_literal_underscore.py
@@ -0,0 +1,19 @@
+"""
+categories: Syntax,Literals
+description: MicroPython accepts underscores in numeric literals where CPython doesn't
+cause: Different parser implementation
+
+MicroPython's tokenizer ignores underscores in numeric literals, while CPython
+rejects multiple consecutive underscores and underscores after the last digit.
+
+workaround: Remove the underscores not accepted by CPython.
+"""
+
+try:
+    print(eval("1__1"))
+except SyntaxError:
+    print("Should not work")
+try:
+    print(eval("1_"))
+except SyntaxError:
+    print("Should not work")

From a19d3f742e84eb72fd8fb2a0f4e38822392ea88e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 9 May 2025 22:08:23 +0200
Subject: [PATCH 2243/3129] tools/gen-cpydiff.py: Fix RST heading generation.

The heading character for the difference title was always "~", but items
had been added which had just a single heading level.  This made the
generated table of contents confused about heading levels, because heading
levels are not fixed in rst, but are inferred from the order they appear in
the document.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tools/gen-cpydiff.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 744cde8d7b57b..278023a4bddcd 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -228,8 +228,8 @@ def gen_rst(results):
                     filename = section[i].replace(" ", "_").lower()
                     rst = open(os.path.join(DOCPATH, filename + ".rst"), "w")
                     rst.write(HEADER)
-                    rst.write(section[i] + "\n")
-                    rst.write(RSTCHARS[0] * len(section[i]))
+                    rst.write(section[0] + "\n")
+                    rst.write(RSTCHARS[0] * len(section[0]) + "\n\n")
                     rst.write(time.strftime("\nGenerated %a %d %b %Y %X UTC\n\n", time.gmtime()))
                     # If a file docs/differences/<filename>_preamble.txt exists
                     # then its output is inserted after the top-level heading,
@@ -247,7 +247,7 @@ def gen_rst(results):
         class_ = section
         rst.write(".. _cpydiff_%s:\n\n" % os.path.splitext(output.name)[0])
         rst.write(output.desc + "\n")
-        rst.write("~" * len(output.desc) + "\n\n")
+        rst.write(RSTCHARS[min(i + 1, len(RSTCHARS) - 1)] * len(output.desc) + "\n\n")
         if output.cause != "Unknown":
             rst.write("**Cause:** " + output.cause + "\n\n")
         if output.workaround != "Unknown":

From ea19f3b7358eba713d6bcea5d5fd141312cf2e9d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 9 May 2025 22:08:35 +0200
Subject: [PATCH 2244/3129] tests/cpydiff: Ensure all have two levels of
 category.

This improves the TOC display of the generated differences section.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cpydiff/core_fstring_concat.py  | 2 +-
 tests/cpydiff/core_fstring_parser.py  | 2 +-
 tests/cpydiff/core_fstring_repr.py    | 2 +-
 tests/cpydiff/syntax_arg_unpacking.py | 2 +-
 tests/cpydiff/syntax_spaces.py        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/cpydiff/core_fstring_concat.py b/tests/cpydiff/core_fstring_concat.py
index 3daa13d75360e..2fbe1b961a1e6 100644
--- a/tests/cpydiff/core_fstring_concat.py
+++ b/tests/cpydiff/core_fstring_concat.py
@@ -1,5 +1,5 @@
 """
-categories: Core
+categories: Core,f-strings
 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 they are not both f-strings
diff --git a/tests/cpydiff/core_fstring_parser.py b/tests/cpydiff/core_fstring_parser.py
index 22bbc5866ec3a..570b92434a9a0 100644
--- a/tests/cpydiff/core_fstring_parser.py
+++ b/tests/cpydiff/core_fstring_parser.py
@@ -1,5 +1,5 @@
 """
-categories: Core
+categories: Core,f-strings
 description: f-strings cannot support expressions that require parsing to resolve unbalanced nested braces and brackets
 cause: MicroPython is optimised for code space.
 workaround: Always use balanced braces and brackets in expressions inside f-strings
diff --git a/tests/cpydiff/core_fstring_repr.py b/tests/cpydiff/core_fstring_repr.py
index d37fb48db758c..2589a34b7e3b9 100644
--- a/tests/cpydiff/core_fstring_repr.py
+++ b/tests/cpydiff/core_fstring_repr.py
@@ -1,5 +1,5 @@
 """
-categories: Core
+categories: Core,f-strings
 description: f-strings don't support !a conversions
 cause: MicropPython does not implement ascii()
 workaround: None
diff --git a/tests/cpydiff/syntax_arg_unpacking.py b/tests/cpydiff/syntax_arg_unpacking.py
index e54832ddb9165..7133a8a28272c 100644
--- a/tests/cpydiff/syntax_arg_unpacking.py
+++ b/tests/cpydiff/syntax_arg_unpacking.py
@@ -1,5 +1,5 @@
 """
-categories: Syntax
+categories: Syntax,Unpacking
 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.
diff --git a/tests/cpydiff/syntax_spaces.py b/tests/cpydiff/syntax_spaces.py
index e7d00838cb667..670cefdeac23e 100644
--- a/tests/cpydiff/syntax_spaces.py
+++ b/tests/cpydiff/syntax_spaces.py
@@ -1,5 +1,5 @@
 """
-categories: Syntax,Spaces
+categories: Syntax,Literals
 description: MicroPython requires spaces between literal numbers and keywords or ".", CPython doesn't
 cause: Different parser implementation
 

From 6d74b4e3c15d0b677247ce02c459095d3cf03fc5 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 10 May 2025 08:31:27 +0200
Subject: [PATCH 2245/3129] tools/gen-cpydiff.py: Ensure every item has at
 least 2 TOC levels.

Previously, the navigation ended up messy when the (long) description of
the item became used as a 2nd level header, meaning that it was placed in
the navigation.  Check for this when generating cpydiff so that new cases
don't sneak in unnoticed.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tools/gen-cpydiff.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 278023a4bddcd..3bb928090bb6e 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -219,6 +219,8 @@ def gen_rst(results):
     class_ = []
     for output in results:
         section = output.class_.split(",")
+        if len(section) < 2:
+            raise SystemExit("Each item must have at least 2 categories")
         for i in range(len(section)):
             section[i] = section[i].rstrip()
             if section[i] in CLASSMAP:

From c310301f27e351e0dc9f966556cab512b3c82615 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Mon, 16 Dec 2024 14:44:37 +0200
Subject: [PATCH 2246/3129] docs/esp32: Improve PWM documentation and examples.

This reduces inconsitencies between esp32 and other ports.

According to the discussion in #10817.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 docs/esp32/quickref.rst      |  35 ++++--
 docs/esp32/tutorial/pwm.rst  | 220 ++++++++++++++++++++++++++++-------
 docs/library/machine.PWM.rst |  14 +--
 3 files changed, 209 insertions(+), 60 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index ccc01099d17f9..707ae27c08cf2 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -393,7 +393,7 @@ Use the :ref:`machine.PWM <machine.PWM>` class::
     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(65536*3//4)  # set duty cycle from 0 to 65535 as a ratio duty_u16/65535, (now 75%)
 
     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%)
@@ -402,19 +402,32 @@ Use the :ref:`machine.PWM <machine.PWM>` class::
 
     pwm2 = PWM(Pin(2), freq=20000, duty=512)  # create and configure in one go
     print(pwm2)                               # view PWM settings
+    pwm2.deinit()                             # turn off PWM on the pin
+
+    pwm0 = PWM(Pin(0), duty_u16=16384)            # The output is at a high level 25% of the time.
+    pwm2 = PWM(Pin(2), duty_u16=16384, invert=1)  # The output is at a low level 25% of the time.
+
+    pwm4 = PWM(Pin(4), lightsleep=True)           # Allow PWM during light sleep mode
 
 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 PWM frequencies (groups * timers)                   8         4         4
-Total PWM channels (Pins, duties) (groups * channels)        16         8         6
-=====================================================  ========  ========  ========
+=======================================================  ========  =========  ==========
+Hardware specification                                      ESP32  ESP32-S2,  ESP32-C2,
+                                                                   ESP32-S3,  ESP32-C3,
+                                                                   ESP32-P4   ESP32-C5,
+                                                                              ESP32-C6,
+                                                                              ESP32-H2
+-------------------------------------------------------  --------  ---------  ----------
+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 PWM frequencies = (groups * timers)                   8          4         4
+Total PWM channels (Pins, duties) = (groups * channels)        16          8         6
+=======================================================  ========  =========  ==========
+
+In light sleep, the ESP32 PWM can only operate in low speed mode, so only 4 timers and
+8 channels are available.
 
 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
diff --git a/docs/esp32/tutorial/pwm.rst b/docs/esp32/tutorial/pwm.rst
index 2650284d35f41..82d43b36f6cb6 100644
--- a/docs/esp32/tutorial/pwm.rst
+++ b/docs/esp32/tutorial/pwm.rst
@@ -11,16 +11,20 @@ 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 time import sleep
     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)
+        F = 10000  # Hz
+        D = 65536 // 16  # 6.25%
+        pins = (2, 4, 12, 13, 14, 15, 16, 18, 19, 22, 23, 25, 26, 27, 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)))
+            f = F * (i // 2 + 1)
+            d = min(65535, D * (i + 1))
+            pwms.append(PWM(pin, freq=f, duty_u16=d))
+            sleep(2 / f)
             print(pwms[i])
     finally:
         for pwm in pwms:
@@ -31,65 +35,100 @@ low all of the time.
 
   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::
+    PWM(Pin(2), freq=10000, duty_u16=4096)
+    PWM(Pin(4), freq=10000, duty_u16=8192)
+    PWM(Pin(12), freq=20000, duty_u16=12288)
+    PWM(Pin(13), freq=20000, duty_u16=16384)
+    PWM(Pin(14), freq=30030, duty_u16=20480)
+    PWM(Pin(15), freq=30030, duty_u16=24576)
+    PWM(Pin(16), freq=40000, duty_u16=28672)
+    PWM(Pin(18), freq=40000, duty_u16=32768)
+    PWM(Pin(19), freq=50000, duty_u16=36864)
+    PWM(Pin(22), freq=50000, duty_u16=40960)
+    PWM(Pin(23), freq=60060, duty_u16=45056)
+    PWM(Pin(25), freq=60060, duty_u16=49152)
+    PWM(Pin(26), freq=69930, duty_u16=53248)
+    PWM(Pin(27), freq=69930, duty_u16=57344)
+    PWM(Pin(32), freq=80000, duty_u16=61440)
+    PWM(Pin(33), freq=80000, duty_u16=65535)
+
+
+* Example of a **smooth frequency change**::
 
     from time import sleep
     from machine import Pin, PWM
 
-    F_MIN = 500
-    F_MAX = 1000
+    F_MIN = 1000
+    F_MAX = 10000
 
     f = F_MIN
-    delta_f = 1
+    delta_f = F_MAX // 50
 
-    p = PWM(Pin(5), f)
-    print(p)
+    pwm = PWM(Pin(27), f)
 
     while True:
-        p.freq(f)
-
-        sleep(10 / F_MIN)
+        pwm.freq(f)
+        sleep(1 / f)
+        sleep(0.1)
+        print(pwm)
 
         f += delta_f
-        if f >= F_MAX or f <= F_MIN:
+        if f > F_MAX or f < F_MIN:
             delta_f = -delta_f
+            print()
+            if f > F_MAX:
+                f = F_MAX
+            elif f < F_MIN:
+                f = F_MIN
 
-  See PWM wave at Pin(5) with an oscilloscope.
+  See PWM wave on Pin(27) with an oscilloscope.
+
+  Output is::
 
-* Example of a smooth duty change::
+    PWM(Pin(27), freq=998, duty_u16=32768)
+    PWM(Pin(27), freq=1202, duty_u16=32768)
+    PWM(Pin(27), freq=1401, duty_u16=32768)
+    PWM(Pin(27), freq=1598, duty_u16=32768)
+    ...
+    PWM(Pin(27), freq=9398, duty_u16=32768)
+    PWM(Pin(27), freq=9615, duty_u16=32768)
+    PWM(Pin(27), freq=9804, duty_u16=32768)
+    PWM(Pin(27), freq=10000, duty_u16=32768)
+
+    PWM(Pin(27), freq=10000, duty_u16=32768)
+    PWM(Pin(27), freq=9804, duty_u16=32768)
+    PWM(Pin(27), freq=9615, duty_u16=32768)
+    PWM(Pin(27), freq=9398, duty_u16=32768)
+    ...
+    PWM(Pin(27), freq=1598, duty_u16=32768)
+    PWM(Pin(27), freq=1401, duty_u16=32768)
+    PWM(Pin(27), freq=1202, duty_u16=32768)
+    PWM(Pin(27), freq=998, duty_u16=32768)
+
+
+* Example of a **smooth duty change**::
 
     from time import sleep
     from machine import Pin, PWM
 
-    DUTY_MAX = 2**16 - 1
+    DUTY_MAX = 65535
 
     duty_u16 = 0
-    delta_d = 16
+    delta_d = 256
 
-    p = PWM(Pin(5), 1000, duty_u16=duty_u16)
-    print(p)
+    pwm = PWM(Pin(27), freq=1000, duty_u16=duty_u16)
 
     while True:
-        p.duty_u16(duty_u16)
+        pwm.duty_u16(duty_u16)
+        sleep(2 / pwm.freq())
+        print(pwm)
 
-        sleep(1 / 1000)
+        if duty_u16 >= DUTY_MAX:
+            print()
+            sleep(2)
+        elif duty_u16 <= 0:
+            print()
+            sleep(2)
 
         duty_u16 += delta_d
         if duty_u16 >= DUTY_MAX:
@@ -99,9 +138,106 @@ low all of the time.
             duty_u16 = 0
             delta_d = -delta_d
 
-  See PWM wave at Pin(5) with an oscilloscope.
+  PWM wave on Pin(27) with an oscilloscope.
+
+  Output is::
+
+    PWM(Pin(27), freq=998, duty_u16=0)
+    PWM(Pin(27), freq=998, duty_u16=256)
+    PWM(Pin(27), freq=998, duty_u16=512)
+    PWM(Pin(27), freq=998, duty_u16=768)
+    PWM(Pin(27), freq=998, duty_u16=1024)
+    ...
+    PWM(Pin(27), freq=998, duty_u16=64512)
+    PWM(Pin(27), freq=998, duty_u16=64768)
+    PWM(Pin(27), freq=998, duty_u16=65024)
+    PWM(Pin(27), freq=998, duty_u16=65280)
+    PWM(Pin(27), freq=998, duty_u16=65535)
+
+    PWM(Pin(27), freq=998, duty_u16=65279)
+    PWM(Pin(27), freq=998, duty_u16=65023)
+    PWM(Pin(27), freq=998, duty_u16=64767)
+    PWM(Pin(27), freq=998, duty_u16=64511)
+    ...
+    PWM(Pin(27), freq=998, duty_u16=1023)
+    PWM(Pin(27), freq=998, duty_u16=767)
+    PWM(Pin(27), freq=998, duty_u16=511)
+    PWM(Pin(27), freq=998, duty_u16=255)
+    PWM(Pin(27), freq=998, duty_u16=0)
+
+
+* Example of a **smooth duty change and PWM output inversion**::
+
+    from utime import sleep
+    from machine import Pin, PWM
+
+    try:
+        DUTY_MAX = 65535
+
+        duty_u16 = 0
+        delta_d = 65536 // 32
+
+        pwm = PWM(Pin(27))
+        pwmi = PWM(Pin(32), invert=1)
+
+        while True:
+            pwm.duty_u16(duty_u16)
+            pwmi.duty_u16(duty_u16)
+
+            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
+
+            sleep(.01)
+            print(pwm)
+            print(pwmi)
+
+    finally:
+        try:
+            pwm.deinit()
+        except:
+            pass
+        try:
+            pwmi.deinit()
+        except:
+            pass
+
+  Output is::
+
+    PWM(Pin(27), freq=5000, duty_u16=0)
+    PWM(Pin(32), freq=5000, duty_u16=32768, invert=1)
+    PWM(Pin(27), freq=5000, duty_u16=2048)
+    PWM(Pin(32), freq=5000, duty_u16=2048, invert=1)
+    PWM(Pin(27), freq=5000, duty_u16=4096)
+    PWM(Pin(32), freq=5000, duty_u16=4096, invert=1)
+    PWM(Pin(27), freq=5000, duty_u16=6144)
+    PWM(Pin(32), freq=5000, duty_u16=6144, invert=1)
+    PWM(Pin(27), freq=5000, duty_u16=8192)
+    PWM(Pin(32), freq=5000, duty_u16=8192, invert=1)
+    ...
+
+
+  See PWM waves on Pin(27) and Pin(32) with an oscilloscope.
+
+Note: New PWM parameters take effect in the next PWM cycle.
+
+    pwm = PWM(2, duty=512)
+    print(pwm)
+    >>> PWM(Pin(2), freq=5000, duty=1023)  # the duty is not relevant
+    pwm.init(freq=2, duty=64)
+    print(pwm)
+    >>> PWM(Pin(2), freq=2, duty=16)  # the duty is not relevant
+    time.sleep(1 / 2)                # wait one PWM period
+    print(pwm)
+    >>> PWM(Pin(2), freq=2, duty=64)  # the duty is actual
+
+Note: machine.freq(20_000_000) reduces the highest PWM frequency to 10 MHz.
 
-Note: the Pin.OUT mode does not need to be specified.  The channel is initialized
+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::
diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
index 5f592b8dff593..c2b606affd675 100644
--- a/docs/library/machine.PWM.rst
+++ b/docs/library/machine.PWM.rst
@@ -11,20 +11,20 @@ Example usage::
     from machine import PWM
 
     pwm = PWM(pin, freq=50, duty_u16=8192)  # create a PWM object on a pin
-                                            # and set freq and duty
-    pwm.duty_u16(32768)     # set duty to 50%
+                                            # and set freq 50 Hz and duty 12.5%
+    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.duty_ns(3000)                       # set pulse width to 3us
 
     pwm.deinit()
 
 Constructors
 ------------
 
-.. class:: PWM(dest, *, freq, duty_u16, duty_ns, invert)
+.. class:: PWM(dest, *, freq, duty_u16, duty_ns, invert=False)
 
    Construct and return a new PWM object using the following parameters:
 
@@ -40,7 +40,7 @@ Constructors
    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.
-   *invert* is not available at all ports.
+   *invert* is available only on the esp32, mimxrt, nrf, rp2, samd and zephyr ports.
 
 Methods
 -------
@@ -116,10 +116,10 @@ Limitations of PWM
   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)
+    pwm=PWM(Pin(13), freq=300_000, duty_u16=65536//2)
 
   and::
 
-    pwm=PWM(Pin(13), freq=300_000, duty_u16=2**16//2 + 255)
+    pwm=PWM(Pin(13), freq=300_000, duty_u16=65536//2 + 255)
 
   will generate PWM with the same 50% duty cycle.

From 150a5aa3a102fb0f1f0388275e7e59d669bb79e5 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <ihor.nehrutsa@gmail.com>
Date: Wed, 19 Feb 2025 09:21:01 +0200
Subject: [PATCH 2247/3129] esp32/machine_pwm: Improve PWM and make its API
 match other ports.

This reduce inconsistencies between esp32 PWM and other ports:
1. duty_u16() high value is 2**16-1 == 65535
2. Invert PWM wave with invert=1 parameter
3. Enable PWM in light sleep mode
4. Allow PWM output and read pulse input simultaneously on the same Pin()
5. Code refactoring

Co-Authored-By: Angus Gratton <angus@redyak.com.au>
Co-Authored-By: robert-hh <robert@hammelrath.com>
Co-Authored-By: Andrew Leech <andrew.leech@planetinnovation.com.au>
Co-Authored-By: Yoann Darche <yoannd@hotmail.com>

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/machine_pwm.c | 974 +++++++++++++++++++++-----------------
 1 file changed, 538 insertions(+), 436 deletions(-)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 7826769556c98..7cb84640eecaf 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -6,7 +6,8 @@
  * Copyright (c) 2016-2021 Damien P. George
  * Copyright (c) 2018 Alan Dragomirecky
  * Copyright (c) 2020 Antoine Aubert
- * Copyright (c) 2021 Ihor Nehrutsa
+ * Copyright (c) 2021, 2023-2025 Ihor Nehrutsa
+ * Copyright (c) 2024 Yoann Darche
  *
  * 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,79 +33,41 @@
 
 #include <math.h>
 #include "py/mphal.h"
-#include "driver/ledc.h"
 #include "esp_err.h"
+#include "driver/ledc.h"
+#include "soc/ledc_periph.h"
 #include "soc/gpio_sig_map.h"
-
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
 #include "esp_clk_tree.h"
-#endif
-
-#define PWM_DBG(...)
-// #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)
-    gpio_num_t pin;
-    // Which channel has which timer assigned?
-    // (-1 if not assigned)
-    int timer_idx;
-} chan_t;
+#include "py/mpprint.h"
 
-// List of PWM channels
-static chan_t chans[PWM_CHANNEL_MAX];
+#define debug_printf(...) mp_printf(&mp_plat_print, __VA_ARGS__); mp_printf(&mp_plat_print, " | %d at %s\n", __LINE__, __FILE__);
 
-// 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)
+#define FADE 0
 
-// Total number of timers
-#define PWM_TIMER_MAX (LEDC_SPEED_MODE_MAX * LEDC_TIMER_MAX)
+// 10-bit user interface resolution compatible with esp8266 PWM.duty()
+#define UI_RES_10_BIT  (10)
+#define DUTY_10        UI_RES_10_BIT
+// Maximum duty value on 10-bit resolution is 1024 but reduced to 1023 in UI
+#define MAX_10_DUTY    (1U << UI_RES_10_BIT)
 
-// List of timer configs
-static ledc_timer_config_t timers[PWM_TIMER_MAX];
+// 16-bit user interface resolution used in PWM.duty_u16()
+#define UI_RES_16_BIT  (16)
+#define DUTY_16        UI_RES_16_BIT
+// Maximum duty value on 16-bit resolution is 65536 but reduced to 65535 in UI
+#define MAX_16_DUTY    (1U << UI_RES_16_BIT)
 
-// 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)
+// ns user interface used in PWM.duty_ns()
+#define DUTY_NS        (1)
 
-// Params for PWM operation
 // 5khz is default frequency
-#define PWM_FREQ (5000)
-
-// 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 << 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
-
-// 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
-#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 SOC_LEDC_SUPPORT_REF_TICK
+#define PWM_FREQ       (5000)
+// default duty 50%
+#define PWM_DUTY       ((1U << UI_RES_16_BIT) / 2)
+
+// All chips except esp32 and esp32s2 do not have timer-specific clock sources, which means clock source for all timers must be the same one.
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
 // 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
+#define EMPIRIC_FREQ   (10) // Hz
 #endif
 
 // Config of timer upon which we run all PWM'ed GPIO pins
@@ -113,490 +76,675 @@ static bool pwm_inited = false;
 // 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;
-    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; // - / -
+    int8_t pin;
+    int8_t mode;
+    int8_t channel;
+    int8_t timer;
+    bool lightsleep;
+    int32_t freq;
+    int8_t duty_scale; // DUTY_10 if duty(), DUTY_16 if duty_u16(), DUTY_NS if duty_ns()
+    int duty_ui;       // saved values of UI duty
+    int channel_duty;  // saved values of UI duty, calculated to raw channel->duty
+    bool output_invert;
+    bool output_invert_prev;
 } 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);
+typedef struct _chans_t {
+    int8_t pin;      // Which channel has which GPIO pin assigned? (-1 if not assigned)
+    int8_t timer;    // Which channel has which timer assigned? (-1 if not assigned)
+    bool lightsleep; // Is light sleep enable has been set for this pin
+} chans_t;
+
+// List of PWM channels
+static chans_t chans[LEDC_SPEED_MODE_MAX][LEDC_CHANNEL_MAX];
+
+typedef struct _timers_t {
+    int32_t freq;
+    int8_t duty_resolution;
+    ledc_clk_cfg_t clk_cfg;
+} timers_t;
+
+// List of PWM timers
+static timers_t timers[LEDC_SPEED_MODE_MAX][LEDC_TIMER_MAX];
+
+// register-unregister channel
+static void register_channel(int mode, int channel, int pin, int timer) {
+    chans[mode][channel].pin = pin;
+    chans[mode][channel].timer = timer;
+}
+
+static void unregister_channel(int mode, int channel) {
+    register_channel(mode, channel, -1, -1);
+    chans[mode][channel].lightsleep = false;
+}
+
+static void unregister_timer(int mode, int timer) {
+    timers[mode][timer].freq = -1; // unused timer freq is -1
+    timers[mode][timer].duty_resolution = 0;
+    timers[mode][timer].clk_cfg = LEDC_AUTO_CLK;
+}
 
 static void pwm_init(void) {
-    // Initial condition: no channels assigned
-    for (int i = 0; i < PWM_CHANNEL_MAX; ++i) {
-        chans[i].pin = -1;
-        chans[i].timer_idx = -1;
+    for (int mode = 0; mode < LEDC_SPEED_MODE_MAX; ++mode) {
+        // Initial condition: no channels assigned
+        for (int channel = 0; channel < LEDC_CHANNEL_MAX; ++channel) {
+            unregister_channel(mode, channel);
+        }
+        // Initial condition: no timers assigned
+        for (int timer = 0; timer < LEDC_TIMER_MAX; ++timer) {
+            unregister_timer(mode, timer);
+        }
     }
+}
 
-    // Prepare all timers config
-    // Initial condition: no timers assigned
-    for (int i = 0; i < PWM_TIMER_MAX; ++i) {
-        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; // will reinstall later according to the EMPIRIC_FREQ
+// Returns true if the timer is in use in addition to current channel
+static bool is_timer_in_use(int mode, int current_channel, int timer) {
+    for (int channel = 0; channel < LEDC_CHANNEL_MAX; ++channel) {
+        if ((channel != current_channel) && (chans[mode][channel].timer == timer) && (chans[mode][channel].pin >= 0)) {
+            return true;
+        }
     }
+    return false;
 }
 
 // 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)) {
+static void pwm_deinit(int mode, int channel, int level) {
+    // Is valid channel?
+    if ((mode >= 0) && (mode < LEDC_SPEED_MODE_MAX) && (channel >= 0) && (channel < LEDC_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_pause(TIMER_IDX_TO_MODE(timer_idx), TIMER_IDX_TO_TIMER(timer_idx)));
-                ledc_timer_config_t timer_config = {
+        int timer = chans[mode][channel].timer;
+        if (timer >= 0) {
+            if (!is_timer_in_use(mode, channel, timer)) {
+                check_esp_err(ledc_timer_pause(mode, timer));
+                ledc_timer_config_t ledc_timer = {
                     .deconfigure = true,
-                    .speed_mode = TIMER_IDX_TO_MODE(timer_idx),
-                    .timer_num = TIMER_IDX_TO_TIMER(timer_idx),
+                    .speed_mode = mode,
+                    .timer_num = timer,
                 };
-                check_esp_err(ledc_timer_config(&timer_config));
-                // Flag it unused
-                timers[chans[channel_idx].timer_idx].freq_hz = -1;
+                ledc_timer_config(&ledc_timer);
+                unregister_timer(mode, timer);
             }
         }
 
-        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
-            // esp_rom_gpio_connect_out_signal(pin, SIG_GPIO_OUT_IDX, false, false);
-            if (mode == LEDC_LOW_SPEED_MODE) {
-                esp_rom_gpio_connect_out_signal(pin, LEDC_LS_SIG_OUT0_IDX + channel, false, true);
-            } else {
-                #if LEDC_SPEED_MODE_MAX > 1
-                #if CONFIG_IDF_TARGET_ESP32
-                esp_rom_gpio_connect_out_signal(pin, LEDC_HS_SIG_OUT0_IDX + channel, false, true);
-                #else
-                #error Add supported CONFIG_IDF_TARGET_ESP32_xxx
-                #endif
-                #endif
+        int pin = chans[mode][channel].pin;
+        if (pin >= 0) {
+            // Disable LEDC output, and set idle level
+            check_esp_err(ledc_stop(mode, channel, level));
+            if (chans[mode][channel].lightsleep) {
+                // Enable SLP_SEL to change GPIO status automantically in lightsleep.
+                check_esp_err(gpio_sleep_sel_en(pin));
+                chans[mode][channel].lightsleep = false;
             }
         }
-        chans[channel_idx].pin = -1;
-        chans[channel_idx].timer_idx = -1;
+        unregister_channel(mode, channel);
     }
 }
 
 // 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);
+        for (int mode = 0; mode < LEDC_SPEED_MODE_MAX; ++mode) {
+            for (int channel = 0; channel < LEDC_CHANNEL_MAX; ++channel) {
+                pwm_deinit(mode, channel, 0);
+            }
         }
+        #if FADE
+        ledc_fade_func_uninstall();
+        #endif
         pwm_inited = false;
     }
 }
 
-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(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_config_t *timer) {
-    esp_err_t err;
-    if (freq != timer->freq_hz) {
-        // Configure the new frequency and resolution
-        timer->freq_hz = freq;
-
-        #if SOC_LEDC_SUPPORT_PLL_DIV_CLOCK
-        timer->clk_cfg = LEDC_USE_PLL_DIV_CLK;
-        #elif SOC_LEDC_SUPPORT_APB_CLOCK
-        timer->clk_cfg = LEDC_USE_APB_CLK;
-        #elif SOC_LEDC_SUPPORT_XTAL_CLOCK
-        timer->clk_cfg = LEDC_USE_XTAL_CLK;
-        #else
-        #error No supported PWM / LEDC clocks.
-        #endif
-        #if SOC_LEDC_SUPPORT_REF_TICK
-        if (freq < EMPIRIC_FREQ) {
-            timer->clk_cfg = LEDC_USE_REF_TICK;
-        }
-        #endif
-        uint32_t src_clk_freq = 0;
-        err = esp_clk_tree_src_get_freq_hz(timer->clk_cfg, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &src_clk_freq);
-        if (err != ESP_OK) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unable to query source clock frequency %d"), (int)timer->clk_cfg);
-        }
-
-        timer->duty_resolution = ledc_find_suitable_duty_resolution(src_clk_freq, timer->freq_hz);
-
-        // Set frequency
-        err = ledc_timer_config(timer);
-        if (err != ESP_OK) {
-            if (err == ESP_FAIL) {
-                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 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);
+static void pwm_is_active(machine_pwm_obj_t *self) {
+    if (self->timer < 0) {
+        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("PWM is inactive"));
     }
 }
 
 // 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;
+    pwm_is_active(self);
+    int64_t duty = ((int64_t)ns * (int64_t)MAX_16_DUTY * self->freq + 500000000LL) / 1000000000LL;
     if ((ns > 0) && (duty == 0)) {
         duty = 1;
-    } else if (duty > UI_MAX_DUTY) {
-        duty = UI_MAX_DUTY;
+    } else if (duty > MAX_16_DUTY) {
+        duty = MAX_16_DUTY;
     }
     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);
-    return ns;
+    pwm_is_active(self);
+    return ((int64_t)duty * 1000000000LL + (int64_t)self->freq * (int64_t)(MAX_16_DUTY / 2)) / ((int64_t)self->freq * (int64_t)MAX_16_DUTY);
 }
 
-#define get_duty_raw(self) ledc_get_duty(self->mode, self->channel)
+// Reconfigure PWM pin output as input/output.
+static void reconfigure_pin(machine_pwm_obj_t *self) {
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0)
+    // This allows to read the pin level.
+    gpio_set_direction(self->pin, GPIO_MODE_INPUT_OUTPUT);
+    #endif
+    esp_rom_gpio_connect_out_signal(self->pin, ledc_periph_signal[self->mode].sig_out0_idx + self->channel, self->output_invert, 0);
+}
 
-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 void apply_duty(machine_pwm_obj_t *self) {
+    pwm_is_active(self);
+
+    int duty = 0;
+    if (self->duty_scale == DUTY_16) {
+        duty = self->duty_ui;
+    } else if (self->duty_scale == DUTY_10) {
+        duty = self->duty_ui << (UI_RES_16_BIT - UI_RES_10_BIT);
+    } else if (self->duty_scale == DUTY_NS) {
+        duty = ns_to_duty(self, self->duty_ui);
+    }
+    self->channel_duty = duty >> (UI_RES_16_BIT - timers[self->mode][self->timer].duty_resolution);
+    if ((chans[self->mode][self->channel].pin == -1) || (self->output_invert_prev != self->output_invert)) {
+        self->output_invert_prev = self->output_invert;
+        // New PWM assignment
+        ledc_channel_config_t cfg = {
+            .channel = self->channel,
+            .duty = self->channel_duty,
+            .gpio_num = self->pin,
+            .intr_type = LEDC_INTR_DISABLE,
+            .speed_mode = self->mode,
+            .timer_sel = self->timer,
+            .hpoint = 0,
+            .flags.output_invert = self->output_invert,
+        };
+        check_esp_err(ledc_channel_config(&cfg));
+        reconfigure_pin(self);
+    } else {
+        #if FADE
+        check_esp_err(ledc_set_duty_and_update(self->mode, self->channel, self->channel_duty, 0));
+        #else
+        check_esp_err(ledc_set_duty(self->mode, self->channel, self->channel_duty));
+        check_esp_err(ledc_update_duty(self->mode, self->channel));
+        #endif
+    }
+    if (self->lightsleep) {
+        // Disable SLP_SEL to change GPIO status automantically in lightsleep.
+        check_esp_err(gpio_sleep_sel_dis(self->pin));
+        chans[self->mode][self->channel].lightsleep = true;
     }
+    register_channel(self->mode, self->channel, self->pin, self->timer);
+}
+
+static uint32_t find_suitable_duty_resolution(uint32_t src_clk_freq, uint32_t timer_freq) {
+    unsigned int resolution = ledc_find_suitable_duty_resolution(src_clk_freq, timer_freq);
+    if (resolution > UI_RES_16_BIT) {
+        // limit resolution to user interface
+        resolution = UI_RES_16_BIT;
+    }
+    // Note: On ESP32, ESP32S2, ESP32S3, ESP32C3, ESP32C2, ESP32C6, ESP32H2, ESP32P4, due to a hardware bug,
+    //       100% duty cycle (i.e. 2**duty_res) is not reachable when the binded timer selects the maximum duty
+    //       resolution. For example, the max duty resolution on ESP32C3 is 14-bit width, then set duty to (2**14)
+    //       will mess up the duty calculation in hardware.
+    // Reduce the resolution from 14 to 13 bits to resolve the hardware bug.
+    if (resolution >= SOC_LEDC_TIMER_BIT_WIDTH) {
+        resolution -= 1;
+    }
+    return resolution;
 }
 
 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) {
-        duty <<= (UI_RES_16_BIT - resolution);
+    int duty = ledc_get_duty(self->mode, self->channel) << (UI_RES_16_BIT - timers[self->mode][self->timer].duty_resolution);
+    if (duty != MAX_16_DUTY) {
+        return duty;
     } else {
-        duty >>= (resolution - UI_RES_16_BIT);
+        return MAX_16_DUTY - 1;
     }
-    return duty;
 }
 
 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
+    // Scale down from 16 bit to 10 bit resolution
+    return get_duty_u16(self) >> (UI_RES_16_BIT - UI_RES_10_BIT);
 }
 
 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);
+static void check_duty_u16(machine_pwm_obj_t *self, int duty) {
+    if ((duty < 0) || (duty > MAX_16_DUTY - 1)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_u16 must be from 0 to %d"), MAX_16_DUTY);
     }
-    ledc_timer_config_t timer = timers[TIMER_IDX(self->mode, self->timer)];
-    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);
+    if (duty == MAX_16_DUTY - 1) {
+        duty = MAX_16_DUTY;
     }
-    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));
+    self->duty_scale = DUTY_16;
+    self->duty_ui = duty;
+}
 
-    /*
-    // 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 set during 2 signal periods, but 1 period is expected.
-    // See https://github.com/espressif/esp-idf/issues/7288
-    if (duty != get_duty_u16(self)) {
-        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);
-        esp_rom_delay_us(2 * 1000000 / timer.freq_hz);
-        if (duty != get_duty_u16(self)) {
-            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);
-        }
-    }
-    */
+static void set_duty_u16(machine_pwm_obj_t *self, int duty) {
+    check_duty_u16(self, duty);
+    apply_duty(self);
+}
 
-    self->duty_x = HIGHEST_PWM_RES;
-    self->duty_u16 = duty;
+static void check_duty_u10(machine_pwm_obj_t *self, int duty) {
+    if ((duty < 0) || (duty > MAX_10_DUTY - 1)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty must be from 0 to %u"), MAX_10_DUTY - 1);
+    }
+    if (duty == MAX_10_DUTY - 1) {
+        duty = MAX_10_DUTY;
+    }
+    self->duty_scale = DUTY_10;
+    self->duty_ui = 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);
+    check_duty_u10(self, duty);
+    apply_duty(self);
+}
+
+static void check_duty_ns(machine_pwm_obj_t *self, int ns) {
+    if ((ns < 0) || (ns > duty_to_ns(self, MAX_16_DUTY))) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_ns must be from 0 to %d ns"), duty_to_ns(self, MAX_16_DUTY));
     }
-    set_duty_u16(self, duty << (UI_RES_16_BIT - PWM_RES_10_BIT));
-    self->duty_x = PWM_RES_10_BIT;
-    self->duty_u10 = duty;
+    self->duty_scale = DUTY_NS;
+    self->duty_ui = ns;
 }
 
 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));
+    check_duty_ns(self, ns);
+    apply_duty(self);
+}
+
+#if !(CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)
+// This check if a clock is already set in the timer list, if yes, return the LEDC_XXX value
+static ledc_clk_cfg_t find_clock_in_use() {
+    for (int mode = 0; mode < LEDC_SPEED_MODE_MAX; ++mode) {
+        for (int timer = 0; timer < LEDC_TIMER_MAX; ++timer) {
+            if (timers[mode][timer].clk_cfg != LEDC_AUTO_CLK) {
+                return timers[mode][timer].clk_cfg;
+            }
+        }
     }
-    set_duty_u16(self, ns_to_duty(self, ns));
-    self->duty_x = -HIGHEST_PWM_RES;
-    self->duty_ns = ns;
+    return LEDC_AUTO_CLK;
 }
 
-/******************************************************************************/
+// Check if a timer is already set with a different clock source
+static bool is_timer_with_different_clock(int mode, int current_timer, ledc_clk_cfg_t clk_cfg) {
+    for (int timer = 0; timer < LEDC_TIMER_MAX; ++timer) {
+        if ((timer != current_timer) && (clk_cfg != LEDC_AUTO_CLK) && (timers[mode][timer].clk_cfg != LEDC_AUTO_CLK) && (timers[mode][timer].clk_cfg != clk_cfg)) {
+            return true;
+        }
+    }
+    return false;
+}
+#endif
 
-#define SAME_FREQ_ONLY (true)
-#define SAME_FREQ_OR_FREE (false)
-#define ANY_MODE (-1)
+static void check_freq_ranges(machine_pwm_obj_t *self, int freq, int upper_freq) {
+    if ((freq <= 0) || (freq > upper_freq)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("frequency must be from 1Hz to %dMHz"), upper_freq / 1000000);
+    }
+}
 
-// 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(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) {
-        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.
+// Set timer frequency
+static void set_freq(machine_pwm_obj_t *self, unsigned int freq) {
+    self->freq = freq;
+    if ((timers[self->mode][self->timer].freq != freq) || (self->lightsleep)) {
+        ledc_timer_config_t timer = {};
+        timer.speed_mode = self->mode;
+        timer.timer_num = self->timer;
+        timer.freq_hz = freq;
+        timer.deconfigure = false;
+
+        timer.clk_cfg = LEDC_AUTO_CLK;
+        #if !(CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)
+        ledc_clk_cfg_t clk_cfg = find_clock_in_use();
+        if (clk_cfg != LEDC_AUTO_CLK) {
+            timer.clk_cfg = clk_cfg;
+        } else
+        #endif
+        if (self->lightsleep) {
+            timer.clk_cfg = LEDC_USE_RC_FAST_CLK; // 8 or 20 MHz
+        } else {
+            #if SOC_LEDC_SUPPORT_APB_CLOCK
+            timer.clk_cfg = LEDC_USE_APB_CLK; // 80 MHz
+            #elif SOC_LEDC_SUPPORT_PLL_DIV_CLOCK
+            timer.clk_cfg = LEDC_USE_PLL_DIV_CLK; // 60 or 80 or 96 MHz
+            #elif SOC_LEDC_SUPPORT_XTAL_CLOCK
+            timer.clk_cfg = LEDC_USE_XTAL_CLK; // 40 MHz
+            #else
+            #error No supported PWM / LEDC clocks.
+            #endif
+
+            #ifdef EMPIRIC_FREQ // ESP32 and ESP32S2 only
+            if (freq < EMPIRIC_FREQ) {
+                timer.clk_cfg = LEDC_USE_REF_TICK; // 1 MHz
             }
+            #endif
         }
-    }
+        #if !(CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)
+        // Check for clock source conflict
+        clk_cfg = find_clock_in_use();
+        if ((clk_cfg != LEDC_AUTO_CLK) && (clk_cfg != timer.clk_cfg)) {
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("one or more active timers use a different clock source, not supported by the current SoC."));
+        }
+        #endif
 
-    return free_timer_idx_found;
+        uint32_t src_clk_freq = 0;
+        check_esp_err(esp_clk_tree_src_get_freq_hz(timer.clk_cfg, ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX, &src_clk_freq));
+        // machine.freq(20_000_000) reduces APB_CLK_FREQ to 20MHz and the highest PWM frequency to 10MHz
+        check_freq_ranges(self, freq, src_clk_freq / 2);
+
+        // Configure the new resolution
+        timer.duty_resolution = find_suitable_duty_resolution(src_clk_freq, self->freq);
+        // Configure timer - Set frequency
+        if ((timers[self->mode][self->timer].duty_resolution == timer.duty_resolution) && (timers[self->mode][self->timer].clk_cfg == timer.clk_cfg)) {
+            check_esp_err(ledc_set_freq(self->mode, self->timer, freq));
+        } else {
+            check_esp_err(ledc_timer_config(&timer));
+        }
+        // Reset the timer if low speed
+        if (self->mode == LEDC_LOW_SPEED_MODE) {
+            check_esp_err(ledc_timer_rst(self->mode, self->timer));
+        }
+        timers[self->mode][self->timer].freq = freq;
+        timers[self->mode][self->timer].duty_resolution = timer.duty_resolution;
+        timers[self->mode][self->timer].clk_cfg = timer.clk_cfg;
+    }
 }
 
-// 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)) {
+static bool is_free_channels(int mode, int pin) {
+    for (int channel = 0; channel < LEDC_CHANNEL_MAX; ++channel) {
+        if ((chans[mode][channel].pin < 0) || (chans[mode][channel].pin == pin)) {
             return true;
         }
     }
+    return false;
+}
 
+static bool is_free_timers(int mode, int32_t freq) {
+    for (int timer = 0; timer < LEDC_TIMER_MAX; ++timer) {
+        if ((timers[mode][timer].freq < 0) || (timers[mode][timer].freq == freq)) {
+            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;
+// Find self channel or free channel
+static void find_channel(machine_pwm_obj_t *self, int *ret_mode, int *ret_channel, int32_t freq) {
+    // Try to find self channel first
+    for (int mode = 0; mode < LEDC_SPEED_MODE_MAX; ++mode) {
+        #if SOC_LEDC_SUPPORT_HS_MODE
+        if (self->lightsleep && (mode == LEDC_HIGH_SPEED_MODE)) {
+            continue;
+        }
+        #endif
+        for (int channel = 0; channel < LEDC_CHANNEL_MAX; ++channel) {
+            if (chans[mode][channel].pin == self->pin) {
+                *ret_mode = mode;
+                *ret_channel = channel;
+                return;
             }
-            if ((avail_idx == -1) && (chans[channel_idx].pin == -1)) {
-                avail_idx = channel_idx;
+        }
+    }
+    // Find free channel
+    for (int mode = 0; mode < LEDC_SPEED_MODE_MAX; ++mode) {
+        #if SOC_LEDC_SUPPORT_HS_MODE
+        if (self->lightsleep && (mode == LEDC_HIGH_SPEED_MODE)) {
+            continue;
+        }
+        #endif
+        for (int channel = 0; channel < LEDC_CHANNEL_MAX; ++channel) {
+            if ((chans[mode][channel].pin < 0) && is_free_timers(mode, freq)) {
+                *ret_mode = mode;
+                *ret_channel = channel;
+                return;
             }
         }
     }
-    if (channel_idx >= PWM_CHANNEL_MAX) {
-        channel_idx = avail_idx;
+}
+
+// Returns timer with the same frequency, freq == -1 means free timer
+static void find_timer(machine_pwm_obj_t *self, int freq, int *ret_mode, int *ret_timer) {
+    for (int mode = 0; mode < LEDC_SPEED_MODE_MAX; ++mode) {
+        #if SOC_LEDC_SUPPORT_HS_MODE
+        if (self->lightsleep && (mode == LEDC_HIGH_SPEED_MODE)) {
+            continue;
+        }
+        #endif
+        if (is_free_channels(mode, self->pin)) {
+            for (int timer = 0; timer < LEDC_TIMER_MAX; ++timer) {
+                if (timers[mode][timer].freq == freq) {
+                    *ret_mode = mode;
+                    *ret_timer = timer;
+                    return;
+                }
+            }
+        }
     }
-    return channel_idx;
 }
 
-/******************************************************************************/
+// Try to find a timer with the same frequency in the current mode, otherwise in the next mode.
+// If no existing timer and channel was found, then try to find free timer in any mode.
+// If the mode or channel is changed, release the channel and register a new channel in the next mode.
+static void select_timer(machine_pwm_obj_t *self, int freq) {
+    // mode, channel, timer may be -1(not defined) or actual values
+    int mode = -1;
+    int timer = -1;
+    // Check if an already running timer with the required frequency is running
+    find_timer(self, freq, &mode, &timer);
+    if (timer < 0) {
+        // Try to reuse self timer
+        if ((self->mode >= 0) && (self->channel >= 0)) {
+            if (!is_timer_in_use(self->mode, self->channel, self->timer)) {
+                mode = self->mode;
+                timer = self->timer;
+            }
+        }
+        // If no existing timer and channel was found, then try to find free timer in any mode
+        if (timer < 0) {
+            find_timer(self, -1, &mode, &timer);
+        }
+    }
+    if (timer < 0) {
+        mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("out of %sPWM timers:%d"), self->lightsleep ? "light sleep capable " : "", self->lightsleep ? LEDC_TIMER_MAX : LEDC_SPEED_MODE_MAX *LEDC_TIMER_MAX);
+    }
+    // If the timer is found, then register
+    if (self->timer != timer) {
+        unregister_channel(self->mode, self->channel);
+        // Rregister the channel to the timer
+        self->mode = mode;
+        self->timer = timer;
+        register_channel(self->mode, self->channel, -1, self->timer);
+    }
+    #if !(CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)
+    if (is_timer_with_different_clock(self->mode, self->timer, timers[self->mode][self->timer].clk_cfg)) {
+        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("one or more active timers use a different clock source, not supported by the current SoC."));
+    }
+    #endif
+}
+
+static void set_freq_duty(machine_pwm_obj_t *self, unsigned int freq) {
+    select_timer(self, freq);
+    set_freq(self, freq);
+    apply_duty(self);
+}
+
+// ******************************************************************************
 // 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(Pin(%u)", self->pin);
-    if (self->active) {
+    if (self->timer >= 0) {
         mp_printf(print, ", freq=%u", ledc_get_freq(self->mode, self->timer));
-
-        if (self->duty_x == PWM_RES_10_BIT) {
+        if (self->duty_scale == DUTY_10) {
             mp_printf(print, ", duty=%d", get_duty_u10(self));
-        } else if (self->duty_x == -HIGHEST_PWM_RES) {
+        } else if (self->duty_scale == DUTY_NS) {
             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);
+        if (self->output_invert) {
+            mp_printf(print, ", invert=True");
+        }
+        if (self->lightsleep) {
+            mp_printf(print, ", lightsleep=True");
+        }
+        mp_printf(print, ")");
+
+        #if MICROPY_ERROR_REPORTING > MICROPY_ERROR_REPORTING_NORMAL
+        mp_printf(print, "  # duty=%.2f%%", 100.0 * get_duty_u16(self) / MAX_16_DUTY);
+        mp_printf(print, ", raw_duty=%d, resolution=%d", ledc_get_duty(self->mode, self->channel), timers[self->mode][self->timer].duty_resolution);
+        mp_printf(print, ", mode=%d, timer=%d, channel=%d", self->mode, self->timer, self->channel);
+        int clk_cfg = timers[self->mode][self->timer].clk_cfg;
+        mp_printf(print, ", clk_cfg=%d=", clk_cfg);
+        if (clk_cfg == LEDC_USE_RC_FAST_CLK) {
+            mp_printf(print, "RC_FAST_CLK");
+        }
+        #if SOC_LEDC_SUPPORT_APB_CLOCK
+        else if (clk_cfg == LEDC_USE_APB_CLK) {
+            mp_printf(print, "APB_CLK");
+        }
+        #endif
+        #if SOC_LEDC_SUPPORT_XTAL_CLOCK
+        else if (clk_cfg == LEDC_USE_XTAL_CLK) {
+            mp_printf(print, "XTAL_CLK");
+        }
+        #endif
+        #if SOC_LEDC_SUPPORT_REF_TICK
+        else if (clk_cfg == LEDC_USE_REF_TICK) {
+            mp_printf(print, "REF_TICK");
+        }
+        #endif
+        #if SOC_LEDC_SUPPORT_PLL_DIV_CLOCK
+        else if (clk_cfg == LEDC_USE_PLL_DIV_CLK) {
+            mp_printf(print, "PLL_CLK");
+        }
+        #endif
+        else if (clk_cfg == LEDC_AUTO_CLK) {
+            mp_printf(print, "AUTO_CLK");
+        } else {
+            mp_printf(print, "UNKNOWN");
+        }
+        #endif
+    } else {
+        mp_printf(print, ")");
     }
-    mp_printf(print, ")");
 }
 
 // This called from pwm.init() method
+//
+// Check the current mode.
+// If the frequency is changed, try to find a timer with the same frequency
+// in the current mode, otherwise in the new mode.
+// If the mode is changed, release the channel and select a new channel in the new mode.
+// Then set the frequency with the same duty.
 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, ARG_duty_u16, ARG_duty_ns };
-    static const mp_arg_t allowed_args[] = {
+
+    enum { ARG_freq, ARG_duty, ARG_duty_u16, ARG_duty_ns, ARG_invert, ARG_lightsleep };
+    mp_arg_t allowed_args[] = {
         { MP_QSTR_freq, 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_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = self->output_invert} },
+        { MP_QSTR_lightsleep, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = self->lightsleep} },
     };
     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);
 
-    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
+    self->lightsleep = args[ARG_lightsleep].u_bool;
+
+    int freq = args[ARG_freq].u_int;
+    if (freq != -1) {
+        check_freq_ranges(self, freq, 40000000);
     }
 
     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"));
+    if (duty_u16 >= 0) {
+        check_duty_u16(self, duty_u16);
+    } else if (duty_ns >= 0) {
+        check_duty_ns(self, duty_ns);
+    } else if (duty >= 0) {
+        check_duty_u10(self, duty);
+    } else if (self->duty_scale == 0) {
+        self->duty_scale = DUTY_16;
+        self->duty_ui = PWM_DUTY;
+    }
+
+    self->output_invert = args[ARG_invert].u_bool;
+
+    // Check the current mode and channel
+    int mode = -1;
+    int channel = -1;
+    find_channel(self, &mode, &channel, freq);
+    if (channel < 0) {
+        mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("out of %sPWM channels:%d"), self->lightsleep ? "light sleep capable " : "", self->lightsleep ? LEDC_CHANNEL_MAX : LEDC_SPEED_MODE_MAX *LEDC_CHANNEL_MAX);
     }
+    self->mode = mode;
+    self->channel = channel;
 
-    int freq = args[ARG_freq].u_int;
     // Check if freq wasn't passed as an argument
-    if (freq == -1) {
+    if ((freq == -1) && (mode >= 0) && (channel >= 0)) {
         // Check if already set, otherwise use the default freq.
         // 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 (chans[mode][channel].timer >= 0) {
+            freq = timers[mode][chans[mode][channel].timer].freq;
         }
         if (freq <= 0) {
             freq = PWM_FREQ;
         }
     }
-    if ((freq <= 0) || (freq > 40000000)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("frequency 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;
-    }
-
-    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
-    }
-
-    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
-        }
-    }
-    self->mode = mode;
-    self->timer = TIMER_IDX_TO_TIMER(timer_idx);
-    self->channel = CHANNEL_IDX_TO_CHANNEL(channel_idx);
-
-    // 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(self, freq, &timers[timer_idx]);
+    set_freq_duty(self, freq);
+}
 
-    // Set duty cycle?
-    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 << PWM_RES_10_BIT) / 2); // 50%
-    }
+static void self_reset(machine_pwm_obj_t *self) {
+    self->mode = -1;
+    self->channel = -1;
+    self->timer = -1;
+    self->freq = -1;
+    self->duty_scale = 0;
+    self->duty_ui = 0;
+    self->channel_duty = -1;
+    self->output_invert = false;
+    self->output_invert_prev = false;
+    self->lightsleep = false;
 }
 
 // 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, 2, true);
-    gpio_num_t pin_id = machine_pin_get_id(args[0]);
-
-    // create PWM object from the given pin
-    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;
-    self->channel = -1;
-    self->timer = -1;
-    self->duty_x = 0;
 
     // start the PWM subsystem if it's not already running
     if (!pwm_inited) {
         pwm_init();
+        #if FADE
+        ledc_fade_func_install(0);
+        #endif
         pwm_inited = true;
     }
 
-    // start the PWM running for this channel
+    // create PWM object from the given pin
+    machine_pwm_obj_t *self = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
+    self_reset(self);
+
+    self->pin = machine_pin_get_id(args[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);
 }
 
 // This called from pwm.deinit() method
 static void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
-    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;
+    pwm_deinit(self->mode, self->channel, self->output_invert);
+    self_reset(self);
 }
 
 // Set and get methods of PWM class
@@ -608,57 +756,11 @@ static mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
 
 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("frequency must be from 1Hz to 40MHz"));
-    }
-    if (freq == timers[TIMER_IDX(self->mode, self->timer)].freq_hz) {
+    check_freq_ranges(self, freq, 40000000);
+    if (freq == timers[self->mode][self->timer].freq) {
         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_pause(self->mode, self->timer));
-            ledc_timer_config_t timer_config = {
-                .deconfigure = true,
-                .speed_mode = self->mode,
-                .timer_num = self->timer,
-            };
-            check_esp_err(ledc_timer_config(&timer_config));
-            // 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 frequency
-    set_freq(self, freq, &timers[current_timer_idx]);
+    set_freq_duty(self, freq);
 }
 
 static mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {

From a72454519362dd1de5eff9e2eb268e6ea1040a40 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <ihor.nehrutsa@gmail.com>
Date: Wed, 19 Feb 2025 09:23:04 +0200
Subject: [PATCH 2248/3129] esp32/mpconfigport: Document how to get more debug
 info.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/mpconfigport.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 7c26009578928..35c8ff1831dbf 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -62,7 +62,8 @@
 #define MICROPY_STACK_CHECK_MARGIN          (1024)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_NORMAL)
+#define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_NORMAL) // Debugging Note: Increase the error reporting level to view
+                                                                             // __FUNCTION__, __LINE__, __FILE__ in check_esp_err() exceptions
 #define MICROPY_WARNINGS                    (1)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_STREAMS_POSIX_API           (1)

From 9d565182d757e7a9bdf95bcb2b18fe2d6fa4111a Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <ihor.nehrutsa@gmail.com>
Date: Thu, 13 Mar 2025 13:46:46 +0200
Subject: [PATCH 2249/3129] docs/esp32/quickref: Add PWM lightsleep example.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 docs/esp32/quickref.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 707ae27c08cf2..56d8b0e4f6bc9 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -383,7 +383,7 @@ for more details.
 
 Use the :ref:`machine.PWM <machine.PWM>` class::
 
-    from machine import Pin, PWM
+    from machine import Pin, PWM, lightsleep
 
     pwm0 = PWM(Pin(0), freq=5000, duty_u16=32768) # create PWM object from a pin
     freq = pwm0.freq()         # get current frequency
@@ -409,6 +409,9 @@ Use the :ref:`machine.PWM <machine.PWM>` class::
 
     pwm4 = PWM(Pin(4), lightsleep=True)           # Allow PWM during light sleep mode
 
+    lightsleep(10*1000) # pwm0, pwm2 goes off, pwm4 stays on during 10s light sleep
+                        # pwm0, pwm2, pwm4 on after 10s light sleep
+
 ESP chips have different hardware peripherals:
 
 =======================================================  ========  =========  ==========

From e1ab04e8205f78bb3ed9d0368bc1bb013b1bdcf9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 May 2025 13:18:33 +1000
Subject: [PATCH 2250/3129] esp32/mpthreadport: Fix double delete of tasks on
 soft reset.

Python threads (created via the `_thread` module) are backed by a FreeRTOS
task.  Managing the deletion of the task can be tricky, and there are
currently some bugs with this in the esp32 port.

The actual crash seen was in FreeRTOS' `uxListRemove()`, and that's because
of two calls to `vTaskDelete()` for the same task: one in
`freertos_entry()` when the task ran to completion, and the other in
`mp_thread_deinit()`.  The latter tried to delete the task a second time
because it was still in the linked list, because `vTaskPreDeletionHook()`
had not yet been called.  And the reason `vTaskPreDeletionHook()` was yet
to be called is because the FreeRTOS idle task was starved.

This commit fixes that.

There are three things done by this commit:
- remove the `vTaskPreDeletionHook`, it's not needed anymore because task
  stack memory is allocated by the IDF, not on the MicroPython heap
- when a task finishes it now removes itself from the linked list, just
  before it deletes itself
- on soft reset, all tasks are deleted and removed from the linked list in
  one swoop (while the mutex is held)

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.base |  1 -
 ports/esp32/mpthreadport.c        | 96 ++++++++++++-------------------
 2 files changed, 37 insertions(+), 60 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 530db427119ca..5595444e86f39 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -50,7 +50,6 @@ CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
-CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y
 
 # UDP
 CONFIG_LWIP_PPP_SUPPORT=y
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 962b5780d08dd..67917e33e5189 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -41,10 +41,16 @@
 #define MP_THREAD_DEFAULT_STACK_SIZE                    (MP_THREAD_MIN_STACK_SIZE + MICROPY_STACK_CHECK_MARGIN)
 #define MP_THREAD_PRIORITY                              (ESP_TASK_PRIO_MIN + 1)
 
+typedef enum {
+    MP_THREAD_RUN_STATE_NEW,
+    MP_THREAD_RUN_STATE_RUNNING,
+    MP_THREAD_RUN_STATE_FINISHED,
+} mp_thread_run_state_t;
+
 // this structure forms a linked list, one node per active thread
 typedef struct _mp_thread_t {
     TaskHandle_t id;        // system id of thread
-    int ready;              // whether the thread is ready and running
+    mp_thread_run_state_t run_state; // current run state of the thread
     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
@@ -60,18 +66,16 @@ 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_entry0.id = xTaskGetCurrentTaskHandle();
-    thread_entry0.ready = 1;
+    thread_entry0.run_state = MP_THREAD_RUN_STATE_RUNNING;
     thread_entry0.arg = NULL;
     thread_entry0.stack = stack;
     thread_entry0.stack_len = stack_len;
     thread_entry0.next = NULL;
+    thread = &thread_entry0;
     mp_thread_mutex_init(&thread_mutex);
 
     // memory barrier to ensure above data is committed
     __sync_synchronize();
-
-    // vTaskPreDeletionHook needs the thread ready after thread_mutex is ready
-    thread = &thread_entry0;
 }
 
 void mp_thread_gc_others(void) {
@@ -82,7 +86,7 @@ void mp_thread_gc_others(void) {
         if (th->id == xTaskGetCurrentTaskHandle()) {
             continue;
         }
-        if (!th->ready) {
+        if (th->run_state != MP_THREAD_RUN_STATE_RUNNING) {
             continue;
         }
         gc_collect_root(th->stack, th->stack_len);
@@ -106,7 +110,7 @@ void mp_thread_start(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
     for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == xTaskGetCurrentTaskHandle()) {
-            th->ready = 1;
+            th->run_state = MP_THREAD_RUN_STATE_RUNNING;
             break;
         }
     }
@@ -116,12 +120,22 @@ void mp_thread_start(void) {
 static void *(*ext_thread_entry)(void *) = NULL;
 
 static void freertos_entry(void *arg) {
+    // Run the Python code.
     if (ext_thread_entry) {
         ext_thread_entry(arg);
     }
-    vTaskDelete(NULL);
-    for (;;) {;
+
+    // Remove the thread from the linked-list of active threads.
+    mp_thread_mutex_lock(&thread_mutex, 1);
+    for (mp_thread_t **th = &thread; *th != NULL; th = &(*th)->next) {
+        if ((*th)->id == xTaskGetCurrentTaskHandle()) {
+            *th = (*th)->next;
+        }
     }
+    mp_thread_mutex_unlock(&thread_mutex);
+
+    // Delete this FreeRTOS task (this call to vTaskDelete will not return).
+    vTaskDelete(NULL);
 }
 
 mp_uint_t mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size, int priority, char *name) {
@@ -147,7 +161,7 @@ mp_uint_t mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_s
     }
 
     // add thread to linked list of all threads
-    th->ready = 0;
+    th->run_state = MP_THREAD_RUN_STATE_NEW;
     th->arg = arg;
     th->stack = pxTaskGetStackStart(th->id);
     th->stack_len = *stack_size / sizeof(uintptr_t);
@@ -167,33 +181,7 @@ void mp_thread_finish(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
     for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == xTaskGetCurrentTaskHandle()) {
-            th->ready = 0;
-            break;
-        }
-    }
-    mp_thread_mutex_unlock(&thread_mutex);
-}
-
-// This is called either from vTaskDelete() or from the FreeRTOS idle task, so
-// may not be within Python context. Therefore MP_STATE_THREAD may not be valid
-// and it does not have the GIL.
-void vTaskPreDeletionHook(void *tcb) {
-    if (thread == NULL) {
-        // threading not yet initialised
-        return;
-    }
-    mp_thread_t *prev = NULL;
-    mp_thread_mutex_lock(&thread_mutex, 1);
-    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) {
-                prev->next = th->next;
-            } else {
-                // move the start pointer
-                thread = th->next;
-            }
-            // The "th" memory will eventually be reclaimed by the GC.
+            th->run_state = MP_THREAD_RUN_STATE_FINISHED;
             break;
         }
     }
@@ -221,32 +209,22 @@ void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
 }
 
 void mp_thread_deinit(void) {
-    for (;;) {
-        // Find a task to delete
-        TaskHandle_t id = NULL;
-        mp_thread_mutex_lock(&thread_mutex, 1);
-        for (mp_thread_t *th = thread; th != NULL; th = th->next) {
-            // Don't delete the current task
-            if (th->id != xTaskGetCurrentTaskHandle()) {
-                id = th->id;
-                break;
-            }
-        }
-        mp_thread_mutex_unlock(&thread_mutex);
+    // The current task should be thread_entry0 and should be the last in the linked list.
+    assert(thread_entry0.id == xTaskGetCurrentTaskHandle());
+    assert(thread_entry0.next == NULL);
 
-        if (id == NULL) {
-            // No tasks left to delete
-            break;
-        } else {
-            // Call FreeRTOS to delete the task (it will call vTaskPreDeletionHook)
-            vTaskDelete(id);
+    // Delete all tasks except the main one.
+    mp_thread_mutex_lock(&thread_mutex, 1);
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
+        if (th != &thread_entry0) {
+            vTaskDelete(th->id);
         }
     }
-}
-
-#else
+    thread = &thread_entry0;
+    mp_thread_mutex_unlock(&thread_mutex);
 
-void vTaskPreDeletionHook(void *tcb) {
+    // Give the idle task a chance to run, to clean up any deleted tasks.
+    vTaskDelay(1);
 }
 
 #endif // MICROPY_PY_THREAD

From f48b9815671eb81e99339dc443fb20dca1c72e69 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <ihor.nehrutsa@gmail.com>
Date: Sun, 16 Feb 2025 12:58:50 +0200
Subject: [PATCH 2251/3129] esp32: Update to use ESP-IDF v5.4.1.

This version of the IDF uses about 1KB more IRAM and 1KB more DRAM on most
boards, but 6.5KB more DRAM usage on the S3.  It seems that's due to a lot
of small increases in many components.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 ports/esp32/README.md              | 8 ++++----
 ports/esp32/tools/metrics_esp32.py | 2 +-
 tools/ci.sh                        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index d9115072a45c3..e11c64ad70797 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -31,7 +31,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 v5.2, v5.2.2, v5.3 and v5.4.
+Currently MicroPython supports v5.2, v5.2.2, v5.3, v5.4 and v5.4.1.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
@@ -49,10 +49,10 @@ The steps to take are summarised below.
 To check out a copy of the IDF use git clone:
 
 ```bash
-$ git clone -b v5.2.2 --recursive https://github.com/espressif/esp-idf.git
+$ git clone -b v5.4.1 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v5.2.2` with any other supported version.
+You can replace `v5.4.1` with 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.)
 
@@ -61,7 +61,7 @@ MicroPython and update the submodules using:
 
 ```bash
 $ cd esp-idf
-$ git checkout v5.2.2
+$ git checkout v5.4.1
 $ git submodule update --init --recursive
 ```
 
diff --git a/ports/esp32/tools/metrics_esp32.py b/ports/esp32/tools/metrics_esp32.py
index 5e65a78c97a27..9efaae63a9baf 100755
--- a/ports/esp32/tools/metrics_esp32.py
+++ b/ports/esp32/tools/metrics_esp32.py
@@ -37,7 +37,7 @@
 import subprocess
 from dataclasses import dataclass
 
-IDF_VERS = ("v5.2.2",)
+IDF_VERS = ("v5.4.1",)
 
 BUILDS = (
     ("ESP32_GENERIC", ""),
diff --git a/tools/ci.sh b/tools/ci.sh
index a4bd43567c861..d12b4bcd31645 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -159,7 +159,7 @@ function ci_cc3200_build {
 # ports/esp32
 
 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
-IDF_VER=v5.2.2
+IDF_VER=v5.4.1
 PYTHON=$(command -v python3 2> /dev/null)
 PYTHON_VER=$(${PYTHON:-python} --version | cut -d' ' -f2)
 

From 10f6c0699e52857a4f7350a5d3a9561862c98a8d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 5 Feb 2025 10:42:55 +1100
Subject: [PATCH 2252/3129] esp32/network_lan: Add support for LAN8670 PHY.

This adds support for LAN8670 to the esp32 port.  Enabled conditionally for
the esp32 target, if ESP-IDF version is new enough (v5.3 or newer).

Fixes issue #15731.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/main/idf_component.yml |  5 +++++
 ports/esp32/modnetwork.h           | 17 ++++++++++++++++-
 ports/esp32/modnetwork_globals.h   |  3 +++
 ports/esp32/network_lan.c          | 12 ++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main/idf_component.yml b/ports/esp32/main/idf_component.yml
index ccbde1f27e412..f7773f4f4e472 100644
--- a/ports/esp32/main/idf_component.yml
+++ b/ports/esp32/main/idf_component.yml
@@ -5,5 +5,10 @@ dependencies:
     rules:
       - if: "target in [esp32s2, esp32s3]"
     version: "~1.0.0"
+  espressif/lan867x:
+    version: "~1.0.0"
+    rules:
+      - if: "target == esp32"
+      - if: "idf_version >=5.3"
   idf:
     version: ">=5.2.0"
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 383e200b983c2..4debea1114b74 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -28,7 +28,22 @@
 
 #include "esp_netif.h"
 
-enum { PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041, PHY_KSZ8081, PHY_KSZ8851SNL = 100, PHY_DM9051, PHY_W5500 };
+// lan867x component requires newer IDF version
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) && CONFIG_IDF_TARGET_ESP32
+#define PHY_LAN867X_ENABLED (1)
+#else
+#define PHY_LAN867X_ENABLED (0)
+#endif
+
+enum {
+    // PHYs supported by the internal Ethernet MAC:
+    PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041, PHY_KSZ8081,
+    #if PHY_LAN867X_ENABLED
+    PHY_LAN8670,
+    #endif
+    // PHYs which are actually SPI Ethernet MAC+PHY chips:
+    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/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 9e355e958f1a4..9909e7c056a4f 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -47,6 +47,9 @@
 { MP_ROM_QSTR(MP_QSTR_PHY_DP83848), MP_ROM_INT(PHY_DP83848) },
 { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8041), MP_ROM_INT(PHY_KSZ8041) },
 { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8081), MP_ROM_INT(PHY_KSZ8081) },
+#if PHY_LAN867X_ENABLED
+{ MP_ROM_QSTR(MP_QSTR_PHY_LAN8670), MP_ROM_INT(PHY_LAN8670) },
+#endif
 
 #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
 { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8851SNL), MP_ROM_INT(PHY_KSZ8851SNL) },
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index e1a8c957857c4..bf6b565e8cd19 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -45,6 +45,10 @@
 #include "modnetwork.h"
 #include "extmod/modnetwork.h"
 
+#if PHY_LAN867X_ENABLED
+#include "esp_eth_phy_lan867x.h"
+#endif
+
 typedef struct _lan_if_obj_t {
     base_if_obj_t base;
     bool initialized;
@@ -156,6 +160,9 @@ static mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         args[ARG_phy_type].u_int != PHY_RTL8201 &&
         args[ARG_phy_type].u_int != PHY_KSZ8041 &&
         args[ARG_phy_type].u_int != PHY_KSZ8081 &&
+        #if PHY_LAN867X_ENABLED
+        args[ARG_phy_type].u_int != PHY_LAN8670 &&
+        #endif
         #if CONFIG_ETH_USE_SPI_ETHERNET
         #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
         args[ARG_phy_type].u_int != PHY_KSZ8851SNL &&
@@ -231,7 +238,12 @@ static mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         case PHY_KSZ8081:
             self->phy = esp_eth_phy_new_ksz80xx(&phy_config);
             break;
+        #if PHY_LAN867X_ENABLED
+        case PHY_LAN8670:
+            self->phy = esp_eth_phy_new_lan867x(&phy_config);
+            break;
         #endif
+        #endif // CONFIG_IDF_TARGET_ESP32
         #if CONFIG_ETH_USE_SPI_ETHERNET
         #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
         case PHY_KSZ8851SNL: {

From 06d8c084b90cb6e56ab9be0de040dcae439ce261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 1 Mar 2022 22:29:58 +0100
Subject: [PATCH 2253/3129] esp32/modesp32: Implement esp32.idf_task_info().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds a new function, `esp32.idf_task_info()`, that can be used to
retrieve task statistics which is useful for diagnosing issues where some
tasks are using up a lot of CPU time.

It's best used in conjunction with the `utop` module from micropython-lib.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 docs/library/esp32.rst | 23 +++++++++++++++++++++
 ports/esp32/modesp32.c | 46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index dc35e7905e162..24831c58d6d20 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -80,6 +80,29 @@ Functions
        The result of :func:`gc.mem_free()` is the total of the current "free"
        and "max new split" values printed by :func:`micropython.mem_info()`.
 
+.. function:: idf_task_info()
+
+    Returns information about running ESP-IDF/FreeRTOS tasks, which include
+    MicroPython threads. This data is useful to gain insight into how much time
+    tasks spend running or if they are blocked for significant parts of time,
+    and to determine if allocated stacks are fully utilized or might be reduced.
+
+    ``CONFIG_FREERTOS_USE_TRACE_FACILITY=y`` must be set in the board
+    configuration to make this method available. Additionally configuring
+    ``CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y`` and
+    ``CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y`` is recommended to be able to
+    retrieve the total and per-task runtime and the core ID respectively.
+
+    The return value is a 2-tuple where the first value is the total runtime,
+    and the second a list of tasks. Each task is a 7-tuple containing: the task
+    ID, name, current state, priority, runtime, stack high water mark, and the
+    ID of the core it is running on. Runtime and core ID will be None when the
+    respective FreeRTOS configuration option is not enabled.
+
+    .. note:: For an easier to use output based on this function you can use the
+       `utop library <https://github.com/micropython/micropython-lib/tree/master/micropython/utop>`_,
+       which implements a live overview similar to the Unix ``top`` command.
+
 
 Flash partitions
 ----------------
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 164b1918261f4..0296ddf10e775 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -212,6 +212,49 @@ static mp_obj_t esp32_idf_heap_info(const mp_obj_t cap_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_idf_heap_info_obj, esp32_idf_heap_info);
 
+#if CONFIG_FREERTOS_USE_TRACE_FACILITY
+static mp_obj_t esp32_idf_task_info(void) {
+    const size_t task_count_max = uxTaskGetNumberOfTasks();
+    TaskStatus_t *task_array = m_new(TaskStatus_t, task_count_max);
+    uint32_t total_time;
+    const size_t task_count = uxTaskGetSystemState(task_array, task_count_max, &total_time);
+
+    mp_obj_list_t *task_list = MP_OBJ_TO_PTR(mp_obj_new_list(task_count, NULL));
+    for (size_t i = 0; i < task_count; i++) {
+        mp_obj_t task_data[] = {
+            mp_obj_new_int_from_uint((mp_uint_t)task_array[i].xHandle),
+            mp_obj_new_str(task_array[i].pcTaskName, strlen(task_array[i].pcTaskName)),
+            MP_OBJ_NEW_SMALL_INT(task_array[i].eCurrentState),
+            MP_OBJ_NEW_SMALL_INT(task_array[i].uxCurrentPriority),
+            #if CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS
+            mp_obj_new_int_from_uint(task_array[i].ulRunTimeCounter),
+            #else
+            mp_const_none,
+            #endif
+            mp_obj_new_int_from_uint(task_array[i].usStackHighWaterMark),
+            #if CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID
+            MP_OBJ_NEW_SMALL_INT(task_array[i].xCoreID),
+            #else
+            mp_const_none,
+            #endif
+        };
+        task_list->items[i] = mp_obj_new_tuple(7, task_data);
+    }
+
+    m_del(TaskStatus_t, task_array, task_count_max);
+    mp_obj_t task_stats[] = {
+        #if CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS
+        MP_OBJ_NEW_SMALL_INT(total_time),
+        #else
+        mp_const_none,
+        #endif
+        task_list
+    };
+    return mp_obj_new_tuple(2, task_stats);
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(esp32_idf_task_info_obj, esp32_idf_task_info);
+#endif
+
 static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32) },
 
@@ -228,6 +271,9 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mcu_temperature), MP_ROM_PTR(&esp32_mcu_temperature_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_idf_heap_info), MP_ROM_PTR(&esp32_idf_heap_info_obj) },
+    #if CONFIG_FREERTOS_USE_TRACE_FACILITY
+    { MP_ROM_QSTR(MP_QSTR_idf_task_info), MP_ROM_PTR(&esp32_idf_task_info_obj) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_NVS), MP_ROM_PTR(&esp32_nvs_type) },
     { MP_ROM_QSTR(MP_QSTR_Partition), MP_ROM_PTR(&esp32_partition_type) },

From 90aeac800a0ac861c64dda4b99db1a3f0ed91cea Mon Sep 17 00:00:00 2001
From: Rick Sorensen <rick.sorensen@gmail.com>
Date: Wed, 16 Apr 2025 09:28:39 -0500
Subject: [PATCH 2254/3129] esp32/machine_i2c: Fix default I2C pins for C3, S3.

The default I2C init does not require setting SCL or SDA but the default
I2C0 pins for C3, S3 conflict with the espressif GPIO usage.

For the C3, pins 18/19 are for USB/JTAG.  If used for I2C() they will cause
the REPL to hang on initialization of the I2C.

For the S3 pin 19 is allocated for USB/JTAG also but the defaults do not
seem to affect the REPL.

See related #16956.

Fixes issue #17103.

Signed-off-by: Rick Sorensen <rick.sorensen@gmail.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_i2c.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 12b86e4aa0294..259101ee7e145 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -35,9 +35,14 @@
 #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 
 #ifndef MICROPY_HW_I2C0_SCL
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+#define MICROPY_HW_I2C0_SCL (GPIO_NUM_9)
+#define MICROPY_HW_I2C0_SDA (GPIO_NUM_8)
+#else
 #define MICROPY_HW_I2C0_SCL (GPIO_NUM_18)
 #define MICROPY_HW_I2C0_SDA (GPIO_NUM_19)
 #endif
+#endif
 
 #ifndef MICROPY_HW_I2C1_SCL
 #if CONFIG_IDF_TARGET_ESP32

From ecbbc512b2083c472f7bec45e8fae521e7af22aa Mon Sep 17 00:00:00 2001
From: Elvis Pfutzenreuter <epxx@epxx.co>
Date: Thu, 1 May 2025 14:30:04 -0300
Subject: [PATCH 2255/3129] esp32/network_lan: Add PHY_GENERIC device type.

Support the new PHY_GENERIC device type, added in ESP-IDF v5.4.0 [1].

This PHY driver was added to ESP-IDF to support "generic"/oddball PHY
LAN chips like the JL1101, which offer no features beyond the bare
802.3 PHY standard and don't actually need a chip-specific driver (see
discussion at [2]).

[1] https://github.com/espressif/esp-idf/commit/0738314308ad36a73601ddb8bb82f1dcbfe1f550
[2] https://github.com/espressif/esp-eth-drivers/pull/28

Signed-off-by: Elvis Pfutzenreuter <epxx@epxx.co>
---
 docs/esp32/quickref.rst          |  1 +
 ports/esp32/modnetwork.h         | 10 ++++++++++
 ports/esp32/modnetwork_globals.h |  3 +++
 ports/esp32/network_lan.c        |  8 ++++++++
 4 files changed, 22 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 56d8b0e4f6bc9..4e70ff255ec48 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -148,6 +148,7 @@ Required keyword arguments for the constructor:
 - ``mdc`` and ``mdio`` - :class:`machine.Pin` objects (or integers) specifying
   the MDC and MDIO pins.
 - ``phy_type`` - Select the PHY device type. Supported devices are
+  ``PHY_GENERIC``,
   ``PHY_LAN8710``, ``PHY_LAN8720``, ``PHY_IP101``, ``PHY_RTL8201``,
   ``PHY_DP83848``, ``PHY_KSZ8041`` and ``PHY_KSZ8081``. These values are all
   constants defined in the ``network`` module.
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 4debea1114b74..ba69d5cc0f901 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -35,12 +35,22 @@
 #define PHY_LAN867X_ENABLED (0)
 #endif
 
+// PHY_GENERIC support requires newer IDF version
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0) && CONFIG_IDF_TARGET_ESP32
+#define PHY_GENERIC_ENABLED (1)
+#else
+#define PHY_GENERIC_ENABLED (0)
+#endif
+
 enum {
     // PHYs supported by the internal Ethernet MAC:
     PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041, PHY_KSZ8081,
     #if PHY_LAN867X_ENABLED
     PHY_LAN8670,
     #endif
+    #if PHY_GENERIC_ENABLED
+    PHY_GENERIC,
+    #endif
     // PHYs which are actually SPI Ethernet MAC+PHY chips:
     PHY_KSZ8851SNL = 100, PHY_DM9051, PHY_W5500
 };
diff --git a/ports/esp32/modnetwork_globals.h b/ports/esp32/modnetwork_globals.h
index 9909e7c056a4f..12252ddbc5de6 100644
--- a/ports/esp32/modnetwork_globals.h
+++ b/ports/esp32/modnetwork_globals.h
@@ -50,6 +50,9 @@
 #if PHY_LAN867X_ENABLED
 { MP_ROM_QSTR(MP_QSTR_PHY_LAN8670), MP_ROM_INT(PHY_LAN8670) },
 #endif
+#if PHY_GENERIC_ENABLED
+{ MP_ROM_QSTR(MP_QSTR_PHY_GENERIC), MP_ROM_INT(PHY_GENERIC) },
+#endif
 
 #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
 { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8851SNL), MP_ROM_INT(PHY_KSZ8851SNL) },
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index bf6b565e8cd19..309ee0b14a23c 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -163,6 +163,9 @@ static mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         #if PHY_LAN867X_ENABLED
         args[ARG_phy_type].u_int != PHY_LAN8670 &&
         #endif
+        #if PHY_GENERIC_ENABLED
+        args[ARG_phy_type].u_int != PHY_GENERIC &&
+        #endif
         #if CONFIG_ETH_USE_SPI_ETHERNET
         #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
         args[ARG_phy_type].u_int != PHY_KSZ8851SNL &&
@@ -243,6 +246,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_lan867x(&phy_config);
             break;
         #endif
+        #if PHY_GENERIC_ENABLED
+        case PHY_GENERIC:
+            self->phy = esp_eth_phy_new_generic(&phy_config);
+            break;
+        #endif
         #endif // CONFIG_IDF_TARGET_ESP32
         #if CONFIG_ETH_USE_SPI_ETHERNET
         #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL

From 1dfb5092fc66b70420af5a6b8d6239e70b8c6e13 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Sat, 26 Apr 2025 23:41:32 +0200
Subject: [PATCH 2256/3129] tools/mpremote: Add new 'fs tree' command.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add `mpremote fs tree` command to show a tree of the device's files.  It:
- Shows a treeview from current path or specified path.
- Uses the graph chars ("├── ", "└── ") (not configurable).
- Has the options:
    -v/--verbose adds the serial device name to the top of the tree
    -s/--size add a size to the files
    -h/--human add a human readable size to the files

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 tools/mpremote/mpremote/commands.py | 49 +++++++++++++++++++++++++++--
 tools/mpremote/mpremote/main.py     | 34 +++++++++++++++++---
 2 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 452384728ab71..428600baf4375 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -334,6 +334,49 @@ def do_filesystem_recursive_rm(state, path, args):
             print(f"removed: '{path}'")
 
 
+def human_size(size, decimals=1):
+    for unit in ['B', 'K', 'M', 'G', 'T']:
+        if size < 1024.0 or unit == 'T':
+            break
+        size /= 1024.0
+    return f"{size:.{decimals}f}{unit}" if unit != 'B' else f"{int(size)}"
+
+
+def do_filesystem_tree(state, path, args):
+    """Print a tree of the device's filesystem starting at path."""
+    connectors = ("├── ", "└── ")
+
+    def _tree_recursive(path, prefix=""):
+        entries = state.transport.fs_listdir(path)
+        entries.sort(key=lambda e: e.name)
+        for i, entry in enumerate(entries):
+            connector = connectors[1] if i == len(entries) - 1 else connectors[0]
+            is_dir = entry.st_mode & 0x4000  # Directory
+            size_str = ""
+            # most MicroPython filesystems don't support st_size on directories, reduce clutter
+            if entry.st_size > 0 or not is_dir:
+                if args.size:
+                    size_str = f"[{entry.st_size:>9}]  "
+                elif args.human:
+                    size_str = f"[{human_size(entry.st_size):>6}]  "
+            print(f"{prefix}{connector}{size_str}{entry.name}")
+            if is_dir:
+                _tree_recursive(
+                    _remote_path_join(path, entry.name),
+                    prefix + ("    " if i == len(entries) - 1 else "│   "),
+                )
+
+    if not path or path == ".":
+        path = state.transport.exec("import os;print(os.getcwd())").strip().decode("utf-8")
+    if not (path == "." or state.transport.fs_isdir(path)):
+        raise CommandError(f"tree: '{path}' is not a directory")
+    if args.verbose:
+        print(f":{path} on {state.transport.device_name}")
+    else:
+        print(f":{path}")
+    _tree_recursive(path)
+
+
 def do_filesystem(state, args):
     state.ensure_raw_repl()
     state.did_action()
@@ -361,8 +404,8 @@ def do_filesystem(state, args):
         # leading ':' if the user included them.
         paths = [path[1:] if path.startswith(":") else path for path in paths]
 
-    # ls implicitly lists the cwd.
-    if command == "ls" and not paths:
+    # ls and tree implicitly lists the cwd.
+    if command in ("ls", "tree") and not paths:
         paths = [""]
 
     try:
@@ -404,6 +447,8 @@ def do_filesystem(state, args):
                     )
                 else:
                     do_filesystem_cp(state, path, cp_dest, len(paths) > 1, not args.force)
+            elif command == "tree":
+                do_filesystem_tree(state, path, args)
     except OSError as er:
         raise CommandError("{}: {}: {}.".format(command, er.strerror, os.strerror(er.errno)))
     except TransportError as er:
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index b30a1a21354cc..f8c913d26d194 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -181,7 +181,11 @@ def argparse_rtc():
 
 
 def argparse_filesystem():
-    cmd_parser = argparse.ArgumentParser(description="execute filesystem commands on the device")
+    cmd_parser = argparse.ArgumentParser(
+        description="execute filesystem commands on the device",
+        add_help=False,
+    )
+    cmd_parser.add_argument("--help", action="help", help="show this help message and exit")
     _bool_flag(cmd_parser, "recursive", "r", False, "recursive (for cp and rm commands)")
     _bool_flag(
         cmd_parser,
@@ -197,10 +201,26 @@ def argparse_filesystem():
         None,
         "enable verbose output (defaults to True for all commands except cat)",
     )
+    size_group = cmd_parser.add_mutually_exclusive_group()
+    size_group.add_argument(
+        "--size",
+        "-s",
+        default=False,
+        action="store_true",
+        help="show file size in bytes(tree command only)",
+    )
+    size_group.add_argument(
+        "--human",
+        "-h",
+        default=False,
+        action="store_true",
+        help="show file size in a more human readable way (tree command only)",
+    )
+
     cmd_parser.add_argument(
         "command",
         nargs=1,
-        help="filesystem command (e.g. cat, cp, sha256sum, ls, rm, rmdir, touch)",
+        help="filesystem command (e.g. cat, cp, sha256sum, ls, rm, rmdir, touch, tree)",
     )
     cmd_parser.add_argument("path", nargs="+", help="local and remote paths")
     return cmd_parser
@@ -355,6 +375,7 @@ def argparse_none(description):
     "rmdir": "fs rmdir",
     "sha256sum": "fs sha256sum",
     "touch": "fs touch",
+    "tree": "fs tree",
     # Disk used/free.
     "df": [
         "exec",
@@ -552,8 +573,13 @@ def main():
                 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":
+            # Special case: "fs ls" and "fs tree" can have only options and no path specified.
+            if (
+                cmd == "fs"
+                and len(command_args) >= 1
+                and command_args[0] in ("ls", "tree")
+                and sum(1 for a in command_args if not a.startswith('-')) == 1
+            ):
                 command_args.append("")
 
             # Use the command-specific argument parser.

From d9453164320e8c30b665c5252bbf8a59479ae848 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Sat, 26 Apr 2025 23:41:32 +0200
Subject: [PATCH 2257/3129] tools/mpremote/tests: Add tests for 'fs tree'
 command.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 tools/mpremote/tests/test_filesystem.sh     |   3 +
 tools/mpremote/tests/test_filesystem.sh.exp |   2 +
 tools/mpremote/tests/test_fs_tree.sh        | 114 ++++++++++
 tools/mpremote/tests/test_fs_tree.sh.exp    | 225 ++++++++++++++++++++
 4 files changed, 344 insertions(+)
 create mode 100755 tools/mpremote/tests/test_fs_tree.sh
 create mode 100644 tools/mpremote/tests/test_fs_tree.sh.exp

diff --git a/tools/mpremote/tests/test_filesystem.sh b/tools/mpremote/tests/test_filesystem.sh
index a29015e987268..13c5394f71c88 100755
--- a/tools/mpremote/tests/test_filesystem.sh
+++ b/tools/mpremote/tests/test_filesystem.sh
@@ -237,3 +237,6 @@ echo -----
 # try to delete existing folder in mounted filesystem
 $MPREMOTE mount "${TMP}" + rm -rv :package || echo "expect error"
 echo -----
+# fs without command should raise error
+$MPREMOTE fs 2>/dev/null || echo "expect error: $?"
+echo -----
diff --git a/tools/mpremote/tests/test_filesystem.sh.exp b/tools/mpremote/tests/test_filesystem.sh.exp
index 3d9d0fe9ae8fa..63411580b756e 100644
--- a/tools/mpremote/tests/test_filesystem.sh.exp
+++ b/tools/mpremote/tests/test_filesystem.sh.exp
@@ -272,3 +272,5 @@ rm :package
 mpremote: rm -r not permitted on /remote directory
 expect error
 -----
+expect error: 2
+-----
diff --git a/tools/mpremote/tests/test_fs_tree.sh b/tools/mpremote/tests/test_fs_tree.sh
new file mode 100755
index 0000000000000..d7fc433ae6a15
--- /dev/null
+++ b/tools/mpremote/tests/test_fs_tree.sh
@@ -0,0 +1,114 @@
+#!/bin/bash
+set -e
+
+# Creates a RAM disk big enough to hold two copies of the test directory
+# structure.
+cat << EOF > "${TMP}/ramdisk.py"
+class RAMBlockDev:
+    def __init__(self, block_size, num_blocks):
+        self.block_size = block_size
+        self.data = bytearray(block_size * num_blocks)
+
+    def readblocks(self, block_num, buf):
+        for i in range(len(buf)):
+            buf[i] = self.data[block_num * self.block_size + i]
+
+    def writeblocks(self, block_num, buf):
+        for i in range(len(buf)):
+            self.data[block_num * self.block_size + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4: # get number of blocks
+            return len(self.data) // self.block_size
+        if op == 5: # get block size
+            return self.block_size
+
+import os
+
+bdev = RAMBlockDev(512, 50)
+os.VfsFat.mkfs(bdev)
+os.mount(bdev, '/ramdisk')
+os.chdir('/ramdisk')
+EOF
+
+# setup 
+echo -----
+$MPREMOTE run "${TMP}/ramdisk.py"
+$MPREMOTE resume ls
+
+echo -----
+echo "empty tree"
+$MPREMOTE resume tree :
+
+echo -----
+$MPREMOTE resume touch :a.py + touch :b.py  
+$MPREMOTE resume mkdir :foo + touch :foo/aa.py + touch :foo/ba.py
+
+echo "small tree - :" 
+$MPREMOTE resume tree :
+
+echo -----
+echo "no path" 
+$MPREMOTE resume tree 
+
+echo -----
+echo "path = '.'" 
+$MPREMOTE resume tree .
+
+echo -----
+echo "path = ':.'" 
+$MPREMOTE resume tree :.
+
+
+echo -----
+echo "multiple trees" 
+$MPREMOTE resume mkdir :bar + touch :bar/aaa.py + touch :bar/bbbb.py
+$MPREMOTE resume mkdir :bar/baz + touch :bar/baz/aaa.py + touch :bar/baz/bbbb.py
+$MPREMOTE resume mkdir :bar/baz/quux + touch :bar/baz/quux/aaa.py + touch :bar/baz/quux/bbbb.py
+$MPREMOTE resume mkdir :bar/baz/quux/xen + touch :bar/baz/quux/xen/aaa.py
+
+$MPREMOTE resume tree
+
+echo -----
+echo single path
+$MPREMOTE resume tree :foo
+
+echo -----
+echo "multiple paths" 
+$MPREMOTE resume tree :foo :bar
+
+echo -----
+echo "subtree" 
+$MPREMOTE resume tree bar/baz
+
+echo -----
+echo mountpoint
+$MPREMOTE resume tree :/ramdisk
+
+echo -----
+echo non-existent folder : error
+$MPREMOTE resume tree :not_there || echo "expect error: $?"
+
+echo -----
+echo file : error 
+$MPREMOTE resume tree :a.py || echo "expect error: $?"
+
+echo -----
+echo "tree -s :"
+mkdir -p "${TMP}/data"
+dd if=/dev/zero of="${TMP}/data/file1.txt" bs=1 count=20 > /dev/null 2>&1
+dd if=/dev/zero of="${TMP}/data/file2.txt" bs=1 count=204 > /dev/null 2>&1
+dd if=/dev/zero of="${TMP}/data/file3.txt" bs=1 count=1096 > /dev/null 2>&1
+dd if=/dev/zero of="${TMP}/data/file4.txt" bs=1 count=2192 > /dev/null 2>&1
+
+$MPREMOTE resume cp -r "${TMP}/data" :
+$MPREMOTE resume tree -s :
+echo -----
+echo "tree -s"
+$MPREMOTE resume tree -s
+echo -----
+$MPREMOTE resume tree --human :
+echo -----
+$MPREMOTE resume tree -s --human : || echo "expect error: $?"
+echo -----
+
diff --git a/tools/mpremote/tests/test_fs_tree.sh.exp b/tools/mpremote/tests/test_fs_tree.sh.exp
new file mode 100644
index 0000000000000..9a67883b1c87f
--- /dev/null
+++ b/tools/mpremote/tests/test_fs_tree.sh.exp
@@ -0,0 +1,225 @@
+-----
+ls :
+-----
+empty tree
+tree :
+:/ramdisk
+-----
+touch :a.py
+touch :b.py
+mkdir :foo
+touch :foo/aa.py
+touch :foo/ba.py
+small tree - :
+tree :
+:/ramdisk
+├── a.py
+├── b.py
+└── foo
+    ├── aa.py
+    └── ba.py
+-----
+no path
+tree :
+:/ramdisk
+├── a.py
+├── b.py
+└── foo
+    ├── aa.py
+    └── ba.py
+-----
+path = '.'
+tree :.
+:/ramdisk
+├── a.py
+├── b.py
+└── foo
+    ├── aa.py
+    └── ba.py
+-----
+path = ':.'
+tree :.
+:/ramdisk
+├── a.py
+├── b.py
+└── foo
+    ├── aa.py
+    └── ba.py
+-----
+multiple trees
+mkdir :bar
+touch :bar/aaa.py
+touch :bar/bbbb.py
+mkdir :bar/baz
+touch :bar/baz/aaa.py
+touch :bar/baz/bbbb.py
+mkdir :bar/baz/quux
+touch :bar/baz/quux/aaa.py
+touch :bar/baz/quux/bbbb.py
+mkdir :bar/baz/quux/xen
+touch :bar/baz/quux/xen/aaa.py
+tree :
+:/ramdisk
+├── a.py
+├── b.py
+├── bar
+│   ├── aaa.py
+│   ├── baz
+│   │   ├── aaa.py
+│   │   ├── bbbb.py
+│   │   └── quux
+│   │       ├── aaa.py
+│   │       ├── bbbb.py
+│   │       └── xen
+│   │           └── aaa.py
+│   └── bbbb.py
+└── foo
+    ├── aa.py
+    └── ba.py
+-----
+single path
+tree :foo
+:foo
+├── aa.py
+└── ba.py
+-----
+multiple paths
+tree :foo
+:foo
+├── aa.py
+└── ba.py
+tree :bar
+:bar
+├── aaa.py
+├── baz
+│   ├── aaa.py
+│   ├── bbbb.py
+│   └── quux
+│       ├── aaa.py
+│       ├── bbbb.py
+│       └── xen
+│           └── aaa.py
+└── bbbb.py
+-----
+subtree
+tree :bar/baz
+:bar/baz
+├── aaa.py
+├── bbbb.py
+└── quux
+    ├── aaa.py
+    ├── bbbb.py
+    └── xen
+        └── aaa.py
+-----
+mountpoint
+tree :/ramdisk
+:/ramdisk
+├── a.py
+├── b.py
+├── bar
+│   ├── aaa.py
+│   ├── baz
+│   │   ├── aaa.py
+│   │   ├── bbbb.py
+│   │   └── quux
+│   │       ├── aaa.py
+│   │       ├── bbbb.py
+│   │       └── xen
+│   │           └── aaa.py
+│   └── bbbb.py
+└── foo
+    ├── aa.py
+    └── ba.py
+-----
+non-existent folder : error
+tree :not_there
+mpremote: tree: 'not_there' is not a directory
+expect error: 1
+-----
+file : error
+tree :a.py
+mpremote: tree: 'a.py' is not a directory
+expect error: 1
+-----
+tree -s :
+cp ${TMP}/data :
+tree :
+:/ramdisk
+├── [        0]  a.py
+├── [        0]  b.py
+├── bar
+│   ├── [        0]  aaa.py
+│   ├── baz
+│   │   ├── [        0]  aaa.py
+│   │   ├── [        0]  bbbb.py
+│   │   └── quux
+│   │       ├── [        0]  aaa.py
+│   │       ├── [        0]  bbbb.py
+│   │       └── xen
+│   │           └── [        0]  aaa.py
+│   └── [        0]  bbbb.py
+├── data
+│   ├── [       20]  file1.txt
+│   ├── [      204]  file2.txt
+│   ├── [     1096]  file3.txt
+│   └── [     2192]  file4.txt
+└── foo
+    ├── [        0]  aa.py
+    └── [        0]  ba.py
+-----
+tree -s
+tree :
+:/ramdisk
+├── [        0]  a.py
+├── [        0]  b.py
+├── bar
+│   ├── [        0]  aaa.py
+│   ├── baz
+│   │   ├── [        0]  aaa.py
+│   │   ├── [        0]  bbbb.py
+│   │   └── quux
+│   │       ├── [        0]  aaa.py
+│   │       ├── [        0]  bbbb.py
+│   │       └── xen
+│   │           └── [        0]  aaa.py
+│   └── [        0]  bbbb.py
+├── data
+│   ├── [       20]  file1.txt
+│   ├── [      204]  file2.txt
+│   ├── [     1096]  file3.txt
+│   └── [     2192]  file4.txt
+└── foo
+    ├── [        0]  aa.py
+    └── [        0]  ba.py
+-----
+tree :
+:/ramdisk
+├── [     0]  a.py
+├── [     0]  b.py
+├── bar
+│   ├── [     0]  aaa.py
+│   ├── baz
+│   │   ├── [     0]  aaa.py
+│   │   ├── [     0]  bbbb.py
+│   │   └── quux
+│   │       ├── [     0]  aaa.py
+│   │       ├── [     0]  bbbb.py
+│   │       └── xen
+│   │           └── [     0]  aaa.py
+│   └── [     0]  bbbb.py
+├── data
+│   ├── [    20]  file1.txt
+│   ├── [   204]  file2.txt
+│   ├── [  1.1K]  file3.txt
+│   └── [  2.1K]  file4.txt
+└── foo
+    ├── [     0]  aa.py
+    └── [     0]  ba.py
+-----
+usage: fs [--help] [--recursive | --no-recursive] [--force | --no-force]
+          [--verbose | --no-verbose] [--size | --human]
+          command path [path ...] ...
+fs: error: argument --human/-h: not allowed with argument --size/-s
+expect error: 2
+-----

From e39243c3820c193b97f34ff033c9a598e40277a7 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Fri, 9 May 2025 20:30:10 +0200
Subject: [PATCH 2258/3129] docs/reference/mpremote: Document the 'fs tree'
 command.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 docs/reference/mpremote.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 32ca5c246a7a4..bee008c637319 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -234,6 +234,7 @@ 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)
   - ``sha256sum <file..>`` to calculate the SHA256 sum of files
+  - ``tree [-vsh] <dirs...>`` to print a tree of the given directories
 
   The ``cp`` command uses a convention where a leading ``:`` represents a remote
   path. Without a leading ``:`` means a local path. This is based on the
@@ -264,6 +265,13 @@ The full list of supported commands are:
     There is no supported way to undelete files removed by ``mpremote rm -r :``.
     Please use with caution.
 
+  The ``tree`` command will print a tree of the given directories.
+  Using the ``--size/-s`` option will print the size of each file, or use
+  ``--human/-h`` to use a more human readable format.
+  Note: Directory size is only printed when a non-zero size is reported by the device's filesystem.
+  The ``-v`` option  can be used to include the name of the serial device in
+  the output.
+
   All other commands implicitly assume the path is a remote path, but the ``:``
   can be optionally used for clarity.
 

From 7a55cb6b364fdbc2f3291456643bd640ba566ec9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 May 2025 17:16:11 +1000
Subject: [PATCH 2259/3129] tests/run-tests.py: Add list of passed/skipped
 tests to _result.json.

The output `_result.json` file generated by `run-tests.py` currently
contains a list of failed tests.  This commit adds to the output a list of
passed and skipped tests, and so now provides full information about which
tests were run and what their results were.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 48 ++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index ac411a0be6ada..9294c7e636fe8 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -605,7 +605,7 @@ def run_script_on_remote_target(self, args, test_file, is_special):
 def run_tests(pyb, tests, args, result_dir, num_threads=1):
     test_count = ThreadSafeCounter()
     testcase_count = ThreadSafeCounter()
-    passed_count = ThreadSafeCounter()
+    passed_tests = ThreadSafeCounter([])
     failed_tests = ThreadSafeCounter([])
     skipped_tests = ThreadSafeCounter([])
 
@@ -896,7 +896,7 @@ def run_one_test(test_file):
 
         if skip_it:
             print("skip ", test_file)
-            skipped_tests.append(test_name)
+            skipped_tests.append((test_name, test_file))
             return
 
         # Run the test on the MicroPython target.
@@ -911,7 +911,7 @@ def run_one_test(test_file):
                 # start-up code (eg boot.py) when preparing to run the next test.
                 pyb.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
             print("skip ", test_file)
-            skipped_tests.append(test_name)
+            skipped_tests.append((test_name, test_file))
             return
 
         # Look at the output of the test to see if unittest was used.
@@ -994,7 +994,7 @@ def run_one_test(test_file):
         # Print test summary, update counters, and save .exp/.out files if needed.
         if test_passed:
             print("pass ", test_file, extra_info)
-            passed_count.increment()
+            passed_tests.append((test_name, test_file))
             rm_f(filename_expected)
             rm_f(filename_mupy)
         else:
@@ -1035,17 +1035,30 @@ def run_one_test(test_file):
             print(line)
         sys.exit(1)
 
+    passed_tests = sorted(passed_tests.value)
+    skipped_tests = sorted(skipped_tests.value)
+    failed_tests = sorted(failed_tests.value)
+
     print(
         "{} tests performed ({} individual testcases)".format(
             test_count.value, testcase_count.value
         )
     )
-    print("{} tests passed".format(passed_count.value))
+    print("{} tests passed".format(len(passed_tests)))
 
-    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)
+        print(
+            "{} tests skipped: {}".format(
+                len(skipped_tests), " ".join(test[0] for test in skipped_tests)
+            )
+        )
+
+    if len(failed_tests) > 0:
+        print(
+            "{} tests failed: {}".format(
+                len(failed_tests), " ".join(test[0] for test in failed_tests)
+            )
+        )
 
     # Serialize regex added by append_filter.
     def to_json(obj):
@@ -1055,21 +1068,18 @@ def to_json(obj):
 
     with open(os.path.join(result_dir, RESULTS_FILE), "w") as f:
         json.dump(
-            {"args": vars(args), "failed_tests": [test[1] for test in failed_tests]},
+            {
+                "args": vars(args),
+                "passed_tests": [test[1] for test in passed_tests],
+                "skipped_tests": [test[1] for test in skipped_tests],
+                "failed_tests": [test[1] for test in failed_tests],
+            },
             f,
             default=to_json,
         )
 
-    if len(failed_tests) > 0:
-        print(
-            "{} tests failed: {}".format(
-                len(failed_tests), " ".join(test[0] for test in failed_tests)
-            )
-        )
-        return False
-
-    # all tests succeeded
-    return True
+    # Return True only if all tests succeeded.
+    return len(failed_tests) == 0
 
 
 class append_filter(argparse.Action):

From 9ef16b466bf980a3b3e0980e7d010b0b9130569b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 17 Apr 2025 16:56:11 +0200
Subject: [PATCH 2260/3129] extmod/modjson: Detect unterminated composite
 entities.

This commit makes the JSON parser raise an exception when handling
objects or arrays whose declaration is incomplete, as in missing the
closing marker (brace or bracket) and if the missing marker would have
been the last non-whitespace character in the incoming string.

Since CPython's JSON parser would raise an exception in such a case,
unlike MicroPython's, this commit aligns MicroPython's behaviour with
CPython.

This commit fixes issue #17141.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 extmod/modjson.c           |  3 ++-
 tests/extmod/json_loads.py | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/extmod/modjson.c b/extmod/modjson.c
index e655a02bc00ef..11aedd1983380 100644
--- a/extmod/modjson.c
+++ b/extmod/modjson.c
@@ -160,7 +160,8 @@ static mp_obj_t mod_json_load(mp_obj_t stream_obj) {
     for (;;) {
     cont:
         if (S_END(s)) {
-            break;
+            // Input finished abruptly in the middle of a composite entity.
+            goto fail;
         }
         mp_obj_t next = MP_OBJ_NULL;
         bool enter = false;
diff --git a/tests/extmod/json_loads.py b/tests/extmod/json_loads.py
index f9073c121e2ef..095e67d740b9d 100644
--- a/tests/extmod/json_loads.py
+++ b/tests/extmod/json_loads.py
@@ -71,3 +71,27 @@ def my_print(o):
     my_print(json.loads("[null]   a"))
 except ValueError:
     print("ValueError")
+
+# incomplete object declaration
+try:
+    my_print(json.loads('{"a":0,'))
+except ValueError:
+    print("ValueError")
+
+# incomplete nested array declaration
+try:
+    my_print(json.loads('{"a":0, ['))
+except ValueError:
+    print("ValueError")
+
+# incomplete array declaration
+try:
+    my_print(json.loads('[0,'))
+except ValueError:
+    print("ValueError")
+
+# incomplete nested object declaration
+try:
+    my_print(json.loads('[0, {"a":0, '))
+except ValueError:
+    print("ValueError")

From 186caf9f0326c9d61494a7d5c6d0408c0fef8485 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 15 May 2025 11:26:17 +1000
Subject: [PATCH 2261/3129] extmod/network_cyw43: Disconnect STA if making
 inactive.

esp32 port will disconnect if active(0) is called on a STA
interface, but rp2 port stays associated without this change.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/network_cyw43.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 1b1b10b40741a..9ebfa904db568 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -143,6 +143,9 @@ static mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_bool(if_active[self->itf]);
     } else {
         bool value = mp_obj_is_true(args[1]);
+        if (!value && self->itf == CYW43_ITF_STA) {
+            cyw43_wifi_leave(self->cyw, self->itf);
+        }
         cyw43_wifi_set_up(self->cyw, self->itf, value, get_country_code());
         if_active[self->itf] = value;
         return mp_const_none;

From 1d37caa3679c86ef4fe43d2f9e6ac13074498433 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 17 Apr 2025 00:27:28 +0200
Subject: [PATCH 2262/3129] py/emitnative: Improve Viper register-indexed code
 for Arm.

This commit lets the Viper code generator use optimised code sequences
for register-indexed load and store operations when generating Arm code.

The existing code defaulted to generic multi-operations code sequences
for Arm code on most cases.  Now optimised implementations are provided
for register-indexed loads and stores of all data sizes, taking at most
two machine opcodes for each operation.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.c     | 16 ++++++++++++++++
 py/asmarm.h     |  6 ++++++
 py/emitnative.c | 14 ++++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index 6fa751b32eb7c..d304567882cef 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -343,6 +343,12 @@ 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_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
+    // ldrh doesn't support scaled register index
+    emit_al(as, 0x1a00080 | (ASM_ARM_REG_R8 << 12) | rn); // mov r8, rn, lsl #1
+    emit_al(as, 0x19000b0 | (rm << 16) | (rd << 12) | ASM_ARM_REG_R8); // ldrh rd, [rm, r8];
+}
+
 void asm_arm_ldrh_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset) {
     if (byte_offset < 0x100) {
         // ldrh rd, [rn, #off]
@@ -360,6 +366,16 @@ void asm_arm_ldrb_reg_reg(asm_arm_t *as, uint rd, uint rn) {
     emit_al(as, 0x5d00000 | (rn << 16) | (rd << 12));
 }
 
+void asm_arm_ldrb_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
+    // ldrb rd, [rm, rn]
+    emit_al(as, 0x7d00000 | (rm << 16) | (rd << 12) | rn);
+}
+
+void asm_arm_ldr_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
+    // ldr rd, [rm, rn, lsl #2]
+    emit_al(as, 0x7900100 | (rm << 16) | (rd << 12) | rn);
+}
+
 void asm_arm_str_reg_reg(asm_arm_t *as, uint rd, uint rm, uint byte_offset) {
     // str rd, [rm, #off]
     emit_al(as, 0x5800000 | (rm << 16) | (rd << 12) | byte_offset);
diff --git a/py/asmarm.h b/py/asmarm.h
index 4a4253aef6878..20b4757d21fa9 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -116,6 +116,12 @@ 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);
 void asm_arm_strb_reg_reg(asm_arm_t *as, uint rd, uint rm);
+
+// load from array
+void asm_arm_ldr_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn);
+void asm_arm_ldrh_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn);
+void asm_arm_ldrb_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn);
+
 // store to array
 void asm_arm_str_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn);
 void asm_arm_strh_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn);
diff --git a/py/emitnative.c b/py/emitnative.c
index 1aab0a9eb7865..2fb4bdb4285a9 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1638,6 +1638,10 @@ static void emit_native_load_subscr(emit_t *emit) {
             switch (vtype_base) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
+                    #if N_ARM
+                    asm_arm_ldrb_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    break;
+                    #endif
                     // TODO optimise to use thumb ldrb r1, [r2, r3]
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_LOAD8_REG_REG(emit->as, REG_RET, REG_ARG_1); // store value to (base+index)
@@ -1645,7 +1649,10 @@ static void emit_native_load_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
-                    #if N_XTENSA || N_XTENSAWIN
+                    #if N_ARM
+                    asm_arm_ldrh_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    break;
+                    #elif N_XTENSA || N_XTENSAWIN
                     asm_xtensa_op_addx2(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
                     asm_xtensa_op_l16ui(emit->as, REG_RET, REG_ARG_1, 0);
                     break;
@@ -1657,7 +1664,10 @@ static void emit_native_load_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR32: {
                     // pointer to word-size memory
-                    #if N_RV32
+                    #if N_ARM
+                    asm_arm_ldr_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    break;
+                    #elif N_RV32
                     asm_rv32_opcode_slli(emit->as, REG_TEMP2, reg_index, 2);
                     asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
                     asm_rv32_opcode_lw(emit->as, REG_RET, REG_ARG_1, 0);

From 04c6b99cb941cdc00822f17fe530a63639359019 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 7 May 2025 22:21:30 +0200
Subject: [PATCH 2263/3129] py/emitnative: Improve Viper register-indexed code
 for Thumb.

This commit lets the Viper code generator use optimised code sequence
for register-indexed load and store operations when generating Thumb
code.

Register-indexed load and store operations for Thumb now can take at
most two machine opcodes for halfword and word values, and just a single
machine opcode for byte values.  The original implementation could
generate up to four opcodes in the worst case (dealing with word
values).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmthumb.c   | 20 ++++++++++++++++++++
 py/asmthumb.h   | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 py/emitnative.c | 18 ++++++++++++++++++
 3 files changed, 87 insertions(+)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 420815e80269a..73684c0f5f060 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -491,6 +491,26 @@ void asm_thumb_ldrh_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint r
     }
 }
 
+void asm_thumb_ldrh_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index) {
+    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 1);
+    asm_thumb_ldrh_rlo_rlo_rlo(as, reg_dest, reg_base, reg_index);
+}
+
+void asm_thumb_ldr_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index) {
+    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 2);
+    asm_thumb_ldr_rlo_rlo_rlo(as, reg_dest, reg_base, reg_index);
+}
+
+void asm_thumb_strh_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index) {
+    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 1);
+    asm_thumb_strh_rlo_rlo_rlo(as, reg_val, reg_base, reg_index);
+}
+
+void asm_thumb_str_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index) {
+    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 2);
+    asm_thumb_str_rlo_rlo_rlo(as, reg_val, reg_base, reg_index);
+}
+
 // 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 a9e68d7adbbea..f7cd52fb40701 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -251,6 +251,50 @@ static inline void asm_thumb_bx_reg(asm_thumb_t *as, uint r_src) {
     asm_thumb_format_5(as, ASM_THUMB_FORMAT_5_BX, 0, r_src);
 }
 
+// FORMAT 7: load/store with register offset
+// FORMAT 8: load/store sign-extended byte/halfword
+
+#define ASM_THUMB_FORMAT_7_LDR (0x5800)
+#define ASM_THUMB_FORMAT_7_STR (0x5000)
+#define ASM_THUMB_FORMAT_7_WORD_TRANSFER (0x0000)
+#define ASM_THUMB_FORMAT_7_BYTE_TRANSFER (0x0400)
+#define ASM_THUMB_FORMAT_8_LDRH (0x5A00)
+#define ASM_THUMB_FORMAT_8_STRH (0x5200)
+
+#define ASM_THUMB_FORMAT_7_8_ENCODE(op, rlo_dest, rlo_base, rlo_index) \
+    ((op) | ((rlo_index) << 6) | ((rlo_base) << 3) | ((rlo_dest)))
+
+static inline void asm_thumb_format_7_8(asm_thumb_t *as, uint op, uint rlo_dest, uint rlo_base, uint rlo_index) {
+    assert(rlo_dest < ASM_THUMB_REG_R8);
+    assert(rlo_base < ASM_THUMB_REG_R8);
+    assert(rlo_index < ASM_THUMB_REG_R8);
+    asm_thumb_op16(as, ASM_THUMB_FORMAT_7_8_ENCODE(op, rlo_dest, rlo_base, rlo_index));
+}
+
+static inline void asm_thumb_ldrb_rlo_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint rlo_index) {
+    asm_thumb_format_7_8(as, ASM_THUMB_FORMAT_7_LDR | ASM_THUMB_FORMAT_7_BYTE_TRANSFER, rlo_dest, rlo_base, rlo_index);
+}
+
+static inline void asm_thumb_ldrh_rlo_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint rlo_index) {
+    asm_thumb_format_7_8(as, ASM_THUMB_FORMAT_8_LDRH, rlo_dest, rlo_base, rlo_index);
+}
+
+static inline void asm_thumb_ldr_rlo_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint rlo_index) {
+    asm_thumb_format_7_8(as, ASM_THUMB_FORMAT_7_LDR | ASM_THUMB_FORMAT_7_WORD_TRANSFER, rlo_dest, rlo_base, rlo_index);
+}
+
+static inline void asm_thumb_strb_rlo_rlo_rlo(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint rlo_index) {
+    asm_thumb_format_7_8(as, ASM_THUMB_FORMAT_7_STR | ASM_THUMB_FORMAT_7_BYTE_TRANSFER, rlo_src, rlo_base, rlo_index);
+}
+
+static inline void asm_thumb_strh_rlo_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint rlo_index) {
+    asm_thumb_format_7_8(as, ASM_THUMB_FORMAT_8_STRH, rlo_dest, rlo_base, rlo_index);
+}
+
+static inline void asm_thumb_str_rlo_rlo_rlo(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint rlo_index) {
+    asm_thumb_format_7_8(as, ASM_THUMB_FORMAT_7_STR | ASM_THUMB_FORMAT_7_WORD_TRANSFER, rlo_src, rlo_base, rlo_index);
+}
+
 // FORMAT 9: load/store with immediate offset
 // For word transfers the offset must be aligned, and >>2
 
@@ -341,6 +385,11 @@ 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_ldrh_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index);
+void asm_thumb_ldr_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index);
+void asm_thumb_strh_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index);
+void asm_thumb_str_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index);
+
 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
diff --git a/py/emitnative.c b/py/emitnative.c
index 2fb4bdb4285a9..088e1e7ae0e11 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1641,6 +1641,9 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_ldrb_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
                     break;
+                    #elif N_THUMB
+                    asm_thumb_ldrb_rlo_rlo_rlo(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    break;
                     #endif
                     // TODO optimise to use thumb ldrb r1, [r2, r3]
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
@@ -1652,6 +1655,9 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_ldrh_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
                     break;
+                    #elif N_THUMB
+                    asm_thumb_ldrh_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    break;
                     #elif N_XTENSA || N_XTENSAWIN
                     asm_xtensa_op_addx2(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
                     asm_xtensa_op_l16ui(emit->as, REG_RET, REG_ARG_1, 0);
@@ -1667,6 +1673,9 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_ldr_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
                     break;
+                    #elif N_THUMB
+                    asm_thumb_ldr_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    break;
                     #elif N_RV32
                     asm_rv32_opcode_slli(emit->as, REG_TEMP2, reg_index, 2);
                     asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
@@ -1944,6 +1953,9 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_strb_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
                     break;
+                    #elif N_THUMB
+                    asm_thumb_strb_rlo_rlo_rlo(emit->as, reg_value, REG_ARG_1, reg_index);
+                    break;
                     #endif
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_STORE8_REG_REG(emit->as, reg_value, REG_ARG_1); // store value to (base+index)
@@ -1954,6 +1966,9 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_strh_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
                     break;
+                    #elif N_THUMB
+                    asm_thumb_strh_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
+                    break;
                     #elif N_XTENSA || N_XTENSAWIN
                     asm_xtensa_op_addx2(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
                     asm_xtensa_op_s16i(emit->as, reg_value, REG_ARG_1, 0);
@@ -1969,6 +1984,9 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #if N_ARM
                     asm_arm_str_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
                     break;
+                    #elif N_THUMB
+                    asm_thumb_str_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
+                    break;
                     #elif N_RV32
                     asm_rv32_opcode_slli(emit->as, REG_TEMP2, reg_index, 2);
                     asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);

From b6d269ee32026c7380fdb6ebcbc7e50e84239c12 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 7 May 2025 22:41:33 +0200
Subject: [PATCH 2264/3129] py/emitnative: Refactor Viper register-indexed
 load/stores.

This commit cleans up the Viper code generation blocks for
register-indexed load and store operations.

An attempt is made to simplify the code in the common code generator
code block, by moving architecture-specific code to the appropriate
native generation backends whenever possible.  This should make that
specific bit of code in the Viper generator clearer and easier to
maintain in the long term.

To achieve this, six generic assembler meta-opcodes have been
introduced, named `ASM_{LOAD,STORE}{8,16,32}_REG_REG_REG`.  A
platform-independent implementation for those operations is provided, so
backends that cannot emit a shorter sequence for the requested operation
or are fine with the platform-independent implementation can just not
provide said meta-opcodes.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.h     |  7 ++++
 py/asmrv32.h    | 24 +++++++++++++
 py/asmthumb.c   | 20 -----------
 py/asmthumb.h   | 28 ++++++++++++---
 py/asmxtensa.h  | 20 +++++++++++
 py/emitnative.c | 94 +++++++++++++------------------------------------
 6 files changed, 98 insertions(+), 95 deletions(-)

diff --git a/py/asmarm.h b/py/asmarm.h
index 20b4757d21fa9..77c700ff0b87b 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -221,6 +221,13 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #define ASM_STORE16_REG_REG(as, reg_value, reg_base) asm_arm_strh_reg_reg((as), (reg_value), (reg_base))
 #define ASM_STORE32_REG_REG(as, reg_value, reg_base) asm_arm_str_reg_reg((as), (reg_value), (reg_base), 0)
 
+#define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldrb_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
+#define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldrh_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
+#define ASM_LOAD32_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldr_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
+#define ASM_STORE8_REG_REG_REG(as, reg_val, reg_base, reg_index) asm_arm_strb_reg_reg_reg((as), (reg_val), (reg_base), (reg_index))
+#define ASM_STORE16_REG_REG_REG(as, reg_val, reg_base, reg_index) asm_arm_strh_reg_reg_reg((as), (reg_val), (reg_base), (reg_index))
+#define ASM_STORE32_REG_REG_REG(as, reg_val, reg_base, reg_index) asm_arm_str_reg_reg_reg((as), (reg_val), (reg_base), (reg_index))
+
 #endif // GENERIC_ASM_API
 
 #endif // MICROPY_INCLUDED_PY_ASMARM_H
diff --git a/py/asmrv32.h b/py/asmrv32.h
index b09f48eb12f66..1cbdc88720884 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -758,6 +758,30 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_SUB_REG_REG(state, rd, rs) asm_rv32_opcode_sub(state, rd, rd, rs)
 #define ASM_XOR_REG_REG(state, rd, rs) asm_rv32_emit_optimised_xor(state, rd, rs)
 #define ASM_CLR_REG(state, rd)
+#define ASM_LOAD16_REG_REG_REG(state, rd, rs1, rs2) \
+    do { \
+        asm_rv32_opcode_slli(state, rs2, rs2, 1); \
+        asm_rv32_opcode_cadd(state, rs1, rs2); \
+        asm_rv32_opcode_lhu(state, rd, rs1, 0); \
+    } while (0)
+#define ASM_LOAD32_REG_REG_REG(state, rd, rs1, rs2) \
+    do { \
+        asm_rv32_opcode_slli(state, rs2, rs2, 2); \
+        asm_rv32_opcode_cadd(state, rs1, rs2); \
+        asm_rv32_opcode_lw(state, rd, rs1, 0); \
+    } while (0)
+#define ASM_STORE16_REG_REG_REG(state, rd, rs1, rs2) \
+    do { \
+        asm_rv32_opcode_slli(state, rs2, rs2, 1); \
+        asm_rv32_opcode_cadd(state, rs1, rs2); \
+        asm_rv32_opcode_sh(state, rd, rs1, 0); \
+    } while (0)
+#define ASM_STORE32_REG_REG_REG(state, rd, rs1, rs2) \
+    do { \
+        asm_rv32_opcode_slli(state, rs2, rs2, 2); \
+        asm_rv32_opcode_cadd(state, rs1, rs2); \
+        asm_rv32_opcode_sw(state, rd, rs1, 0); \
+    } while (0)
 
 #endif
 
diff --git a/py/asmthumb.c b/py/asmthumb.c
index 73684c0f5f060..420815e80269a 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -491,26 +491,6 @@ void asm_thumb_ldrh_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint r
     }
 }
 
-void asm_thumb_ldrh_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index) {
-    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 1);
-    asm_thumb_ldrh_rlo_rlo_rlo(as, reg_dest, reg_base, reg_index);
-}
-
-void asm_thumb_ldr_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index) {
-    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 2);
-    asm_thumb_ldr_rlo_rlo_rlo(as, reg_dest, reg_base, reg_index);
-}
-
-void asm_thumb_strh_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index) {
-    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 1);
-    asm_thumb_strh_rlo_rlo_rlo(as, reg_val, reg_base, reg_index);
-}
-
-void asm_thumb_str_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index) {
-    asm_thumb_lsl_rlo_rlo_i5(as, reg_index, reg_index, 2);
-    asm_thumb_str_rlo_rlo_rlo(as, reg_val, reg_base, reg_index);
-}
-
 // 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 f7cd52fb40701..f62f7dd8d9e73 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -385,11 +385,6 @@ 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_ldrh_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index);
-void asm_thumb_ldr_reg_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_base, uint reg_index);
-void asm_thumb_strh_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index);
-void asm_thumb_str_reg_reg_reg(asm_thumb_t *as, uint reg_val, uint reg_base, uint reg_index);
-
 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
@@ -480,6 +475,29 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 #define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_thumb_strh_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
 #define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
 
+#define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_thumb_ldrb_rlo_rlo_rlo((as), (reg_dest), (reg_base), (reg_index))
+#define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
+    do { \
+        asm_thumb_lsl_rlo_rlo_i5((as), (reg_index), (reg_index), 1); \
+        asm_thumb_ldrh_rlo_rlo_rlo((as), (reg_dest), (reg_base), (reg_index)); \
+    } while (0)
+#define ASM_LOAD32_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
+    do { \
+        asm_thumb_lsl_rlo_rlo_i5((as), (reg_index), (reg_index), 2); \
+        asm_thumb_ldr_rlo_rlo_rlo((as), (reg_dest), (reg_base), (reg_index)); \
+    } while (0)
+#define ASM_STORE8_REG_REG_REG(as, reg_val, reg_base, reg_index) asm_thumb_strb_rlo_rlo_rlo((as), (reg_val), (reg_base), (reg_index))
+#define ASM_STORE16_REG_REG_REG(as, reg_val, reg_base, reg_index) \
+    do { \
+        asm_thumb_lsl_rlo_rlo_i5((as), (reg_index), (reg_index), 1); \
+        asm_thumb_strh_rlo_rlo_rlo((as), (reg_val), (reg_base), (reg_index)); \
+    } while (0)
+#define ASM_STORE32_REG_REG_REG(as, reg_val, reg_base, reg_index) \
+    do { \
+        asm_thumb_lsl_rlo_rlo_i5((as), (reg_index), (reg_index), 2); \
+        asm_thumb_str_rlo_rlo_rlo((as), (reg_val), (reg_base), (reg_index)); \
+    } while (0)
+
 #endif // GENERIC_ASM_API
 
 #endif // MICROPY_INCLUDED_PY_ASMTHUMB_H
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index d2f37bf828e86..6451c75aa597e 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -411,12 +411,32 @@ void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 #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_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
+    do { \
+        asm_xtensa_op_addx2((as), (reg_base), (reg_index), (reg_base)); \
+        asm_xtensa_op_l16ui((as), (reg_dest), (reg_base), 0); \
+    } while (0)
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD32_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
+    do { \
+        asm_xtensa_op_addx4((as), (reg_base), (reg_index), (reg_base)); \
+        asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), 0); \
+    } while (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))
 #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_STORE16_REG_REG_REG(as, reg_val, reg_base, reg_index) \
+    do { \
+        asm_xtensa_op_addx2((as), (reg_base), (reg_index), (reg_base)); \
+        asm_xtensa_op_s16i((as), (reg_val), (reg_base), 0); \
+    } while (0)
 #define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_xtensa_op_s32i_n((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_REG(as, reg_val, reg_base, reg_index) \
+    do { \
+        asm_xtensa_op_addx4((as), (reg_base), (reg_index), (reg_base)); \
+        asm_xtensa_op_s32i_n((as), (reg_val), (reg_base), 0); \
+    } while (0)
 
 #endif // GENERIC_ASM_API
 
diff --git a/py/emitnative.c b/py/emitnative.c
index 088e1e7ae0e11..c2eb46657de33 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1638,59 +1638,36 @@ static void emit_native_load_subscr(emit_t *emit) {
             switch (vtype_base) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
-                    #if N_ARM
-                    asm_arm_ldrb_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_THUMB
-                    asm_thumb_ldrb_rlo_rlo_rlo(emit->as, REG_RET, REG_ARG_1, reg_index);
-                    break;
-                    #endif
-                    // TODO optimise to use thumb ldrb r1, [r2, r3]
+                    #ifdef ASM_LOAD8_REG_REG_REG
+                    ASM_LOAD8_REG_REG_REG(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    #else
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_LOAD8_REG_REG(emit->as, REG_RET, REG_ARG_1); // store value to (base+index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
-                    #if N_ARM
-                    asm_arm_ldrh_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_THUMB
-                    asm_thumb_ldrh_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_XTENSA || N_XTENSAWIN
-                    asm_xtensa_op_addx2(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
-                    asm_xtensa_op_l16ui(emit->as, REG_RET, REG_ARG_1, 0);
-                    break;
-                    #endif
+                    #ifdef ASM_LOAD16_REG_REG_REG
+                    ASM_LOAD16_REG_REG_REG(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    #else
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_LOAD16_REG_REG(emit->as, REG_RET, REG_ARG_1); // load from (base+2*index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR32: {
                     // pointer to word-size memory
-                    #if N_ARM
-                    asm_arm_ldr_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_THUMB
-                    asm_thumb_ldr_reg_reg_reg(emit->as, REG_RET, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_RV32
-                    asm_rv32_opcode_slli(emit->as, REG_TEMP2, reg_index, 2);
-                    asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
-                    asm_rv32_opcode_lw(emit->as, REG_RET, REG_ARG_1, 0);
-                    break;
-                    #elif N_XTENSA || N_XTENSAWIN
-                    asm_xtensa_op_addx4(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
-                    asm_xtensa_op_l32i_n(emit->as, REG_RET, REG_ARG_1, 0);
-                    break;
-                    #endif
+                    #ifdef ASM_LOAD32_REG_REG_REG
+                    ASM_LOAD32_REG_REG_REG(emit->as, REG_RET, REG_ARG_1, reg_index);
+                    #else
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_LOAD32_REG_REG(emit->as, REG_RET, REG_ARG_1); // load from (base+4*index)
+                    #endif
                     break;
                 }
                 default:
@@ -1949,59 +1926,36 @@ static void emit_native_store_subscr(emit_t *emit) {
             switch (vtype_base) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
-                    // TODO optimise to use thumb strb r1, [r2, r3]
-                    #if N_ARM
-                    asm_arm_strb_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_THUMB
-                    asm_thumb_strb_rlo_rlo_rlo(emit->as, reg_value, REG_ARG_1, reg_index);
-                    break;
-                    #endif
+                    #ifdef ASM_STORE8_REG_REG_REG
+                    ASM_STORE8_REG_REG_REG(emit->as, reg_value, REG_ARG_1, reg_index);
+                    #else
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_STORE8_REG_REG(emit->as, reg_value, REG_ARG_1); // store value to (base+index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
-                    #if N_ARM
-                    asm_arm_strh_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_THUMB
-                    asm_thumb_strh_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_XTENSA || N_XTENSAWIN
-                    asm_xtensa_op_addx2(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
-                    asm_xtensa_op_s16i(emit->as, reg_value, REG_ARG_1, 0);
-                    break;
-                    #endif
+                    #ifdef ASM_STORE16_REG_REG_REG
+                    ASM_STORE16_REG_REG_REG(emit->as, reg_value, REG_ARG_1, reg_index);
+                    #else
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_STORE16_REG_REG(emit->as, reg_value, REG_ARG_1); // store value to (base+2*index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR32: {
                     // pointer to 32-bit memory
-                    #if N_ARM
-                    asm_arm_str_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_THUMB
-                    asm_thumb_str_reg_reg_reg(emit->as, reg_value, REG_ARG_1, reg_index);
-                    break;
-                    #elif N_RV32
-                    asm_rv32_opcode_slli(emit->as, REG_TEMP2, reg_index, 2);
-                    asm_rv32_opcode_cadd(emit->as, REG_ARG_1, REG_TEMP2);
-                    asm_rv32_opcode_sw(emit->as, reg_value, REG_ARG_1, 0);
-                    break;
-                    #elif N_XTENSA || N_XTENSAWIN
-                    asm_xtensa_op_addx4(emit->as, REG_ARG_1, reg_index, REG_ARG_1);
-                    asm_xtensa_op_s32i_n(emit->as, reg_value, REG_ARG_1, 0);
-                    break;
-                    #endif
+                    #ifdef ASM_STORE32_REG_REG_REG
+                    ASM_STORE32_REG_REG_REG(emit->as, reg_value, REG_ARG_1, reg_index);
+                    #else
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_ADD_REG_REG(emit->as, REG_ARG_1, reg_index); // add index to base
                     ASM_STORE32_REG_REG(emit->as, reg_value, REG_ARG_1); // store value to (base+4*index)
+                    #endif
                     break;
                 }
                 default:

From e66a6022e2a3263de6f2fa383d4c7d2c4c1cf359 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 7 May 2025 22:45:56 +0200
Subject: [PATCH 2265/3129] py/asm: Remove unused generic ASM API opcode
 definitions.

This commit removes the ASM_LOAD_REG_REG and ASM_STORE_REG_REG generic
ASM API opcodes from all backends, as they are not used anymore in the
native emitter framework.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.h     | 2 --
 py/asmrv32.h    | 2 --
 py/asmthumb.h   | 2 --
 py/asmx64.h     | 2 --
 py/asmx86.h     | 2 --
 py/emitndebug.c | 4 ----
 6 files changed, 14 deletions(-)

diff --git a/py/asmarm.h b/py/asmarm.h
index 77c700ff0b87b..42fa1ea212a8a 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -208,14 +208,12 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_arm_sub_reg_reg_reg((as), (reg_dest), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_arm_mul_reg_reg_reg((as), (reg_dest), (reg_dest), (reg_src))
 
-#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) asm_arm_ldr_reg_reg((as), (reg_dest), (reg_base), 0)
 #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)
 #define ASM_STORE_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_arm_str_reg_reg((as), (reg_dest), (reg_base), 4 * (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_value, reg_base) asm_arm_strb_reg_reg((as), (reg_value), (reg_base))
 #define ASM_STORE16_REG_REG(as, reg_value, reg_base) asm_arm_strh_reg_reg((as), (reg_value), (reg_base))
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 1cbdc88720884..6453b0a3d4367 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -737,7 +737,6 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_LOAD32_REG_REG(state, rd, rs) ASM_LOAD_REG_REG_OFFSET(state, rd, rs, 0)
 #define ASM_LOAD8_REG_REG(state, rd, rs) asm_rv32_opcode_lbu(state, rd, rs, 0)
 #define ASM_LOAD_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset)
-#define ASM_LOAD_REG_REG(state, rd, rs) ASM_LOAD32_REG_REG(state, rd, rs)
 #define ASM_LSL_REG_REG(state, rd, rs) asm_rv32_opcode_sll(state, rd, rd, rs)
 #define ASM_LSR_REG_REG(state, rd, rs) asm_rv32_opcode_srl(state, rd, rd, rs)
 #define ASM_MOV_LOCAL_REG(state, local, rs) asm_rv32_emit_mov_local_reg(state, local, rs)
@@ -754,7 +753,6 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_STORE32_REG_REG(state, rs1, rs2) ASM_STORE_REG_REG_OFFSET(state, rs1, rs2, 0)
 #define ASM_STORE8_REG_REG(state, rs1, rs2) asm_rv32_opcode_sb(state, rs1, rs2, 0)
 #define ASM_STORE_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset)
-#define ASM_STORE_REG_REG(state, rs1, rs2) ASM_STORE32_REG_REG(state, rs1, rs2)
 #define ASM_SUB_REG_REG(state, rd, rs) asm_rv32_opcode_sub(state, rd, rd, rs)
 #define ASM_XOR_REG_REG(state, rd, rs) asm_rv32_emit_optimised_xor(state, rd, rs)
 #define ASM_CLR_REG(state, rd)
diff --git a/py/asmthumb.h b/py/asmthumb.h
index f62f7dd8d9e73..cc4213503bf31 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -462,14 +462,12 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_thumb_sub_rlo_rlo_rlo((as), (reg_dest), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_MUL, (reg_dest), (reg_src))
 
-#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) asm_thumb_ldr_rlo_rlo_i5((as), (reg_dest), (reg_base), 0)
 #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)
 #define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_thumb_strb_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
 #define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_thumb_strh_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
diff --git a/py/asmx64.h b/py/asmx64.h
index c63e31797ef54..30c6efd6d05b2 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -205,14 +205,12 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_x64_sub_r64_r64((as), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_x64_mul_r64_r64((as), (reg_dest), (reg_src))
 
-#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) asm_x64_mov_mem64_to_r64((as), (reg_base), 0, (reg_dest))
 #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)
 #define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x64_mov_r64_to_mem64((as), (reg_src), (reg_base), 8 * (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_x64_mov_r8_to_mem8((as), (reg_src), (reg_base), 0)
 #define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_x64_mov_r16_to_mem16((as), (reg_src), (reg_base), 0)
diff --git a/py/asmx86.h b/py/asmx86.h
index 027d44151e82e..af73c163b4f03 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -200,14 +200,12 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_x86_sub_r32_r32((as), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_x86_mul_r32_r32((as), (reg_dest), (reg_src))
 
-#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) asm_x86_mov_mem32_to_r32((as), (reg_base), 0, (reg_dest))
 #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)
 #define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 4 * (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_x86_mov_r8_to_mem8((as), (reg_src), (reg_base), 0)
 #define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_x86_mov_r16_to_mem16((as), (reg_src), (reg_base), 0)
diff --git a/py/emitndebug.c b/py/emitndebug.c
index bd896a75c8ddf..c068a9a9a126e 100644
--- a/py/emitndebug.c
+++ b/py/emitndebug.c
@@ -251,8 +251,6 @@ static void asm_debug_setcc_reg_reg_reg(asm_debug_t *as, int op, int reg1, int r
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) \
     asm_debug_reg_reg(as, "mul", reg_dest, reg_src)
 
-#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) \
-    asm_debug_reg_reg(as, "load", reg_dest, reg_base)
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) \
     asm_debug_reg_reg_offset(as, "load", reg_dest, reg_base, word_offset)
 #define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) \
@@ -264,8 +262,6 @@ static void asm_debug_setcc_reg_reg_reg(asm_debug_t *as, int op, int reg1, int r
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) \
     asm_debug_reg_reg(as, "load32", reg_dest, reg_base)
 
-#define ASM_STORE_REG_REG(as, reg_src, reg_base) \
-    asm_debug_reg_reg(as, "store", reg_src, reg_base)
 #define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) \
     asm_debug_reg_reg_offset(as, "store", reg_src, reg_base, word_offset)
 #define ASM_STORE8_REG_REG(as, reg_src, reg_base) \

From 2260fe0828a87b511ad69c0314ecdcb36b66a2cf Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 7 May 2025 20:31:38 +0200
Subject: [PATCH 2266/3129] tests/micropython/viper_ptr: Add tests for arch
 edge cases.

This commit adds a series of test cases to exercise the Viper code
generator load/store emitting capabilities on certain boundary
conditions.

The new test cases check whether the emitted load/store code performs
correctly when dealing with specific memory offsets, which trigger
specific code generation sequences on different architectures.

Right now the cases are for unsigned offsets whose bitmasks span up to
5, 8, and 12 bits (respectively Arm/Thumb, Xtensa, RV32).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .../micropython/viper_ptr16_load_boundary.py  | 25 +++++++++++
 .../viper_ptr16_load_boundary.py.exp          | 12 ++++++
 .../micropython/viper_ptr16_store_boundary.py | 41 +++++++++++++++++++
 .../viper_ptr16_store_boundary.py.exp         | 18 ++++++++
 .../micropython/viper_ptr32_load_boundary.py  | 25 +++++++++++
 .../viper_ptr32_load_boundary.py.exp          | 12 ++++++
 .../micropython/viper_ptr32_store_boundary.py | 35 ++++++++++++++++
 .../viper_ptr32_store_boundary.py.exp         | 18 ++++++++
 tests/micropython/viper_ptr8_load_boundary.py | 25 +++++++++++
 .../viper_ptr8_load_boundary.py.exp           | 12 ++++++
 .../micropython/viper_ptr8_store_boundary.py  | 30 ++++++++++++++
 .../viper_ptr8_store_boundary.py.exp          | 12 ++++++
 12 files changed, 265 insertions(+)
 create mode 100644 tests/micropython/viper_ptr16_load_boundary.py
 create mode 100644 tests/micropython/viper_ptr16_load_boundary.py.exp
 create mode 100644 tests/micropython/viper_ptr16_store_boundary.py
 create mode 100644 tests/micropython/viper_ptr16_store_boundary.py.exp
 create mode 100644 tests/micropython/viper_ptr32_load_boundary.py
 create mode 100644 tests/micropython/viper_ptr32_load_boundary.py.exp
 create mode 100644 tests/micropython/viper_ptr32_store_boundary.py
 create mode 100644 tests/micropython/viper_ptr32_store_boundary.py.exp
 create mode 100644 tests/micropython/viper_ptr8_load_boundary.py
 create mode 100644 tests/micropython/viper_ptr8_load_boundary.py.exp
 create mode 100644 tests/micropython/viper_ptr8_store_boundary.py
 create mode 100644 tests/micropython/viper_ptr8_store_boundary.py.exp

diff --git a/tests/micropython/viper_ptr16_load_boundary.py b/tests/micropython/viper_ptr16_load_boundary.py
new file mode 100644
index 0000000000000..ccaaa0909af9d
--- /dev/null
+++ b/tests/micropython/viper_ptr16_load_boundary.py
@@ -0,0 +1,25 @@
+# Test boundary conditions for various architectures
+
+GET_TEMPLATE = """
+@micropython.viper
+def get{off}(src: ptr16) -> int:
+    return src[{off}]
+print(b[{off} * 2:({off} + 1) * 2])
+"""
+
+
+@micropython.viper
+def get_index(src: ptr16, i: int) -> int:
+    return src[i]
+
+
+b = bytearray(5000)
+b[28:38] = b"0123456789"
+b[252:262] = b"ABCDEFGHIJ"
+b[4092:4102] = b"KLMNOPQRST"
+
+for pre, idx, post in (15, 16, 17), (127, 128, 129), (2047, 2048, 2049):
+    print(get_index(b, pre), get_index(b, idx), get_index(b, post))
+    exec(GET_TEMPLATE.format(off=pre))
+    exec(GET_TEMPLATE.format(off=idx))
+    exec(GET_TEMPLATE.format(off=post))
diff --git a/tests/micropython/viper_ptr16_load_boundary.py.exp b/tests/micropython/viper_ptr16_load_boundary.py.exp
new file mode 100644
index 0000000000000..4b8c184c134cb
--- /dev/null
+++ b/tests/micropython/viper_ptr16_load_boundary.py.exp
@@ -0,0 +1,12 @@
+13106 13620 14134
+bytearray(b'23')
+bytearray(b'45')
+bytearray(b'67')
+17475 17989 18503
+bytearray(b'CD')
+bytearray(b'EF')
+bytearray(b'GH')
+20045 20559 21073
+bytearray(b'MN')
+bytearray(b'OP')
+bytearray(b'QR')
diff --git a/tests/micropython/viper_ptr16_store_boundary.py b/tests/micropython/viper_ptr16_store_boundary.py
new file mode 100644
index 0000000000000..e0a4f84557366
--- /dev/null
+++ b/tests/micropython/viper_ptr16_store_boundary.py
@@ -0,0 +1,41 @@
+# Test boundary conditions for various architectures
+
+SET_TEMPLATE = """
+@micropython.viper
+def set{off}(dest: ptr16):
+    dest[{off}] = {val}
+set{off}(b)
+print(b[{off} * 2:({off} + 1) * 2])
+"""
+
+TEST_DATA = (
+    (15, (0x4241, 0x4443, 0x4645)),
+    (127, (0x4847, 0x4A49, 0x4C4B)),
+    (2047, (0x4E4D, 0x504F, 0x5251)),
+)
+
+
+@micropython.viper
+def set_index(dest: ptr16, i: int, val: int):
+    dest[i] = val
+
+
+@micropython.viper
+def set_index(dest: ptr16, i: int, val: int):
+    dest[i] = val
+
+
+b = bytearray(5000)
+for start, vals in TEST_DATA:
+    for i, v in enumerate(vals):
+        set_index(b, start + i, v)
+        print(b[(start + i) * 2 : (start + i + 1) * 2])
+
+
+for i in range(len(b)):
+    b[i] = 0
+
+
+for start, vals in TEST_DATA:
+    for i, v in enumerate(vals):
+        exec(SET_TEMPLATE.format(off=start + i, val=v + 0x0101))
diff --git a/tests/micropython/viper_ptr16_store_boundary.py.exp b/tests/micropython/viper_ptr16_store_boundary.py.exp
new file mode 100644
index 0000000000000..b56fe6695f298
--- /dev/null
+++ b/tests/micropython/viper_ptr16_store_boundary.py.exp
@@ -0,0 +1,18 @@
+bytearray(b'AB')
+bytearray(b'CD')
+bytearray(b'EF')
+bytearray(b'GH')
+bytearray(b'IJ')
+bytearray(b'KL')
+bytearray(b'MN')
+bytearray(b'OP')
+bytearray(b'QR')
+bytearray(b'BC')
+bytearray(b'DE')
+bytearray(b'FG')
+bytearray(b'HI')
+bytearray(b'JK')
+bytearray(b'LM')
+bytearray(b'NO')
+bytearray(b'PQ')
+bytearray(b'RS')
diff --git a/tests/micropython/viper_ptr32_load_boundary.py b/tests/micropython/viper_ptr32_load_boundary.py
new file mode 100644
index 0000000000000..6954bd46b239f
--- /dev/null
+++ b/tests/micropython/viper_ptr32_load_boundary.py
@@ -0,0 +1,25 @@
+# Test boundary conditions for various architectures
+
+GET_TEMPLATE = """
+@micropython.viper
+def get{off}(src: ptr32) -> int:
+    return src[{off}]
+print(b[{off} * 4:({off} + 1) * 4])
+"""
+
+
+@micropython.viper
+def get_index(src: ptr32, i: int) -> int:
+    return src[i]
+
+
+b = bytearray(5000)
+b[24:43] = b"0123456789ABCDEFGHIJ"
+b[248:268] = b"KLMNOPQRSTUVWXYZabcd"
+b[4088:4108] = b"efghijklmnopqrstuvwx"
+
+for pre, idx, post in (7, 8, 9), (63, 64, 65), (1023, 1024, 1025):
+    print(get_index(b, pre), get_index(b, idx), get_index(b, post))
+    exec(GET_TEMPLATE.format(off=pre))
+    exec(GET_TEMPLATE.format(off=idx))
+    exec(GET_TEMPLATE.format(off=post))
diff --git a/tests/micropython/viper_ptr32_load_boundary.py.exp b/tests/micropython/viper_ptr32_load_boundary.py.exp
new file mode 100644
index 0000000000000..a58e703f91286
--- /dev/null
+++ b/tests/micropython/viper_ptr32_load_boundary.py.exp
@@ -0,0 +1,12 @@
+926299444 1111570744 1178944579
+bytearray(b'4567')
+bytearray(b'89AB')
+bytearray(b'CDEF')
+1381060687 1448432723 1515804759
+bytearray(b'OPQR')
+bytearray(b'STUV')
+bytearray(b'WXYZ')
+1818978921 1886350957 1953722993
+bytearray(b'ijkl')
+bytearray(b'mnop')
+bytearray(b'qrst')
diff --git a/tests/micropython/viper_ptr32_store_boundary.py b/tests/micropython/viper_ptr32_store_boundary.py
new file mode 100644
index 0000000000000..243ff5cd9c2af
--- /dev/null
+++ b/tests/micropython/viper_ptr32_store_boundary.py
@@ -0,0 +1,35 @@
+# Test boundary conditions for various architectures
+
+TEST_DATA = (
+    (3, (0x04030201, 0x08070605, 0x0C0B0A09)),
+    (63, (0x100F0E0D, 0x14131211, 0x18171615)),
+    (1023, (0x1C1B1A19, 0x201F1E1D, 0x24232221)),
+)
+
+SET_TEMPLATE = """
+@micropython.viper
+def set{off}(dest: ptr32):
+    dest[{off}] = {val} & 0x3FFFFFFF
+set{off}(b)
+print(b[{off} * 4:({off} + 1) * 4])
+"""
+
+
+@micropython.viper
+def set_index(dest: ptr32, i: int, val: int):
+    dest[i] = val
+
+
+b = bytearray(5000)
+for start, vals in TEST_DATA:
+    for i, v in enumerate(vals):
+        set_index(b, start + i, v)
+        print(b[(start + i) * 4 : (start + i + 1) * 4])
+
+for i in range(len(b)):
+    b[i] = 0
+
+
+for start, vals in TEST_DATA:
+    for i, v in enumerate(vals):
+        exec(SET_TEMPLATE.format(off=start + i, val=v + 0x01010101))
diff --git a/tests/micropython/viper_ptr32_store_boundary.py.exp b/tests/micropython/viper_ptr32_store_boundary.py.exp
new file mode 100644
index 0000000000000..89f09fbc7af5f
--- /dev/null
+++ b/tests/micropython/viper_ptr32_store_boundary.py.exp
@@ -0,0 +1,18 @@
+bytearray(b'\x01\x02\x03\x04')
+bytearray(b'\x05\x06\x07\x08')
+bytearray(b'\t\n\x0b\x0c')
+bytearray(b'\r\x0e\x0f\x10')
+bytearray(b'\x11\x12\x13\x14')
+bytearray(b'\x15\x16\x17\x18')
+bytearray(b'\x19\x1a\x1b\x1c')
+bytearray(b'\x1d\x1e\x1f ')
+bytearray(b'!"#$')
+bytearray(b'\x02\x03\x04\x05')
+bytearray(b'\x06\x07\x08\t')
+bytearray(b'\n\x0b\x0c\r')
+bytearray(b'\x0e\x0f\x10\x11')
+bytearray(b'\x12\x13\x14\x15')
+bytearray(b'\x16\x17\x18\x19')
+bytearray(b'\x1a\x1b\x1c\x1d')
+bytearray(b'\x1e\x1f !')
+bytearray(b'"#$%')
diff --git a/tests/micropython/viper_ptr8_load_boundary.py b/tests/micropython/viper_ptr8_load_boundary.py
new file mode 100644
index 0000000000000..bcb17a1e1f2bc
--- /dev/null
+++ b/tests/micropython/viper_ptr8_load_boundary.py
@@ -0,0 +1,25 @@
+# Test boundary conditions for various architectures
+
+GET_TEMPLATE = """
+@micropython.viper
+def get{off}(src: ptr8) -> int:
+    return src[{off}]
+print(get{off}(b))
+"""
+
+
+@micropython.viper
+def get_index(src: ptr8, i: int) -> int:
+    return src[i]
+
+
+b = bytearray(5000)
+b[30:32] = b"123"
+b[254:256] = b"456"
+b[4094:4096] = b"789"
+
+for pre, idx, post in (30, 31, 32), (254, 255, 256), (4094, 4095, 4096):
+    print(get_index(b, pre), get_index(b, idx), get_index(b, post))
+    exec(GET_TEMPLATE.format(off=pre))
+    exec(GET_TEMPLATE.format(off=idx))
+    exec(GET_TEMPLATE.format(off=post))
diff --git a/tests/micropython/viper_ptr8_load_boundary.py.exp b/tests/micropython/viper_ptr8_load_boundary.py.exp
new file mode 100644
index 0000000000000..7cbd1ac78cff1
--- /dev/null
+++ b/tests/micropython/viper_ptr8_load_boundary.py.exp
@@ -0,0 +1,12 @@
+49 50 51
+49
+50
+51
+52 53 54
+52
+53
+54
+55 56 57
+55
+56
+57
diff --git a/tests/micropython/viper_ptr8_store_boundary.py b/tests/micropython/viper_ptr8_store_boundary.py
new file mode 100644
index 0000000000000..ad512684549a7
--- /dev/null
+++ b/tests/micropython/viper_ptr8_store_boundary.py
@@ -0,0 +1,30 @@
+# Test boundary conditions for various architectures
+
+TEST_DATA = ((49, 30, 3), (52, 254, 3), (55, 4094, 3))
+
+SET_TEMPLATE = """
+@micropython.viper
+def set{off}(dest: ptr8):
+    dest[{off}] = {val}
+set{off}(b)
+print(b[{off}])
+"""
+
+
+@micropython.viper
+def set_index(dest: ptr8, i: int, val: int):
+    dest[i] = val
+
+
+b = bytearray(5000)
+for val, start, count in TEST_DATA:
+    for i in range(count):
+        set_index(b, start + i, val + i)
+    print(b[start : start + count])
+
+for i in range(len(b)):
+    b[i] = 0
+
+for val, start, count in TEST_DATA:
+    for i in range(count):
+        exec(SET_TEMPLATE.format(off=start + i, val=val + i + 16))
diff --git a/tests/micropython/viper_ptr8_store_boundary.py.exp b/tests/micropython/viper_ptr8_store_boundary.py.exp
new file mode 100644
index 0000000000000..a35cb3ac9e0dd
--- /dev/null
+++ b/tests/micropython/viper_ptr8_store_boundary.py.exp
@@ -0,0 +1,12 @@
+bytearray(b'123')
+bytearray(b'456')
+bytearray(b'789')
+65
+66
+67
+68
+69
+70
+71
+72
+73

From 6b2792a097a841bf1c0a27e4fcffcaacc4968285 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 19 Apr 2025 22:36:13 +0200
Subject: [PATCH 2267/3129] py/asmthumb: Generate proper sequences for large
 register offsets.

This commit lets the Thumb native emitter generate a proper opcode
sequence when calculating an indexed register offset for load/store
operations with said offset beight both greater than 65535 and not
able to be represented as a shifted 8-bit bitmask.

The original code would assume the scaled index would always fit in 16
bits and silently discard upper bits of the offset.  Now an optimised
constant loading sequence is emitted instead, and the final offset is
also stored in the correct register in all cases.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmthumb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 420815e80269a..06021f2bc93cb 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -450,12 +450,12 @@ static void asm_thumb_add_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint re
             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);
+            asm_thumb_mov_reg_i32_optimised(as, reg_dest, offset << offset_shift);
+            asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_base);
         } 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_mov_reg_i32_optimised(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)));
         }

From 3d19a8bc2df1d153aedde587e8f8e9fded4d6c08 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 8 May 2025 00:02:26 +0200
Subject: [PATCH 2268/3129] py/emitnative: Clean up int-indexed Viper
 load/store code.

This commit performs some minor clean up for the code involved in Viper
load/store operations when said operations have an integer index.

Most platform-specific code blocks were able to generate correct opcodes
even when the index is 0, but they would still fall back to the general
case.  The general case would still emit a shortened opcode sequence so
this commit does not alter the overall behaviour, but makes it easier to
extend platform-specific code whenever the full index range is going to
be handled rather than a subset of indices as it is now.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitnative.c | 198 ++++++++++++++++++++++++------------------------
 1 file changed, 99 insertions(+), 99 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index c2eb46657de33..4b470f3c93522 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1537,25 +1537,24 @@ static void emit_native_load_subscr(emit_t *emit) {
             switch (vtype_base) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
-                    // TODO optimise to use thumb ldrb r1, [r2, r3]
+                    #if N_THUMB
+                    if (index_value >= 0 && index_value < 32) {
+                        asm_thumb_ldrb_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_RV32
+                    if (FIT_SIGNED(index_value, 12)) {
+                        asm_rv32_opcode_lbu(emit->as, REG_RET, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_XTENSA || N_XTENSAWIN
+                    if (index_value >= 0 && index_value < 256) {
+                        asm_xtensa_op_l8ui(emit->as, REG_RET, reg_base, index_value);
+                        break;
+                    }
+                    #endif
                     if (index_value != 0) {
                         // index is non-zero
-                        #if N_THUMB
-                        if (index_value > 0 && index_value < 32) {
-                            asm_thumb_ldrb_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_RV32
-                        if (FIT_SIGNED(index_value, 12)) {
-                            asm_rv32_opcode_lbu(emit->as, REG_RET, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_XTENSA || N_XTENSAWIN
-                        if (index_value > 0 && index_value < 256) {
-                            asm_xtensa_op_l8ui(emit->as, REG_RET, reg_base, index_value);
-                            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
@@ -1566,24 +1565,24 @@ static void emit_native_load_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
+                    #if N_THUMB
+                    if (index_value >= 0 && index_value < 32) {
+                        asm_thumb_ldrh_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_RV32
+                    if (FIT_SIGNED(index_value, 11)) {
+                        asm_rv32_opcode_lhu(emit->as, REG_RET, reg_base, index_value << 1);
+                        break;
+                    }
+                    #elif N_XTENSA || N_XTENSAWIN
+                    if (index_value >= 0 && index_value < 256) {
+                        asm_xtensa_op_l16ui(emit->as, REG_RET, reg_base, index_value);
+                        break;
+                    }
+                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
-                        #if N_THUMB
-                        if (index_value > 0 && index_value < 32) {
-                            asm_thumb_ldrh_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_RV32
-                        if (FIT_SIGNED(index_value, 11)) {
-                            asm_rv32_opcode_lhu(emit->as, REG_RET, reg_base, index_value << 1);
-                            break;
-                        }
-                        #elif N_XTENSA || N_XTENSAWIN
-                        if (index_value > 0 && index_value < 256) {
-                            asm_xtensa_op_l16ui(emit->as, REG_RET, reg_base, index_value);
-                            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
@@ -1594,24 +1593,24 @@ static void emit_native_load_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR32: {
                     // pointer to 32-bit memory
+                    #if N_THUMB
+                    if (index_value >= 0 && index_value < 32) {
+                        asm_thumb_ldr_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_RV32
+                    if (FIT_SIGNED(index_value, 10)) {
+                        asm_rv32_opcode_lw(emit->as, REG_RET, reg_base, index_value << 2);
+                        break;
+                    }
+                    #elif N_XTENSA || N_XTENSAWIN
+                    if (index_value >= 0 && index_value < 256) {
+                        asm_xtensa_l32i_optimised(emit->as, REG_RET, reg_base, index_value);
+                        break;
+                    }
+                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
-                        #if N_THUMB
-                        if (index_value > 0 && index_value < 32) {
-                            asm_thumb_ldr_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_RV32
-                        if (FIT_SIGNED(index_value, 10)) {
-                            asm_rv32_opcode_lw(emit->as, REG_RET, reg_base, index_value << 2);
-                            break;
-                        }
-                        #elif N_XTENSA || N_XTENSAWIN
-                        if (index_value > 0 && index_value < 256) {
-                            asm_xtensa_l32i_optimised(emit->as, REG_RET, reg_base, index_value);
-                            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
@@ -1811,28 +1810,28 @@ static void emit_native_store_subscr(emit_t *emit) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
                     // TODO optimise to use thumb strb r1, [r2, r3]
+                    #if N_THUMB
+                    if (index_value >= 0 && index_value < 32) {
+                        asm_thumb_strb_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_RV32
+                    if (FIT_SIGNED(index_value, 12)) {
+                        asm_rv32_opcode_sb(emit->as, reg_value, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_XTENSA || N_XTENSAWIN
+                    if (index_value >= 0 && index_value < 256) {
+                        asm_xtensa_op_s8i(emit->as, reg_value, reg_base, index_value);
+                        break;
+                    }
+                    #endif
                     if (index_value != 0) {
                         // index is non-zero
-                        #if N_THUMB
-                        if (index_value > 0 && index_value < 32) {
-                            asm_thumb_strb_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_RV32
-                        if (FIT_SIGNED(index_value, 12)) {
-                            asm_rv32_opcode_sb(emit->as, reg_value, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_XTENSA || N_XTENSAWIN
-                        if (index_value > 0 && index_value < 256) {
-                            asm_xtensa_op_s8i(emit->as, REG_RET, reg_base, index_value);
-                            break;
-                        }
-                        #endif
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
                         #if N_ARM
                         asm_arm_strb_reg_reg_reg(emit->as, reg_value, reg_base, reg_index);
-                        return;
+                        break;
                         #endif
                         ASM_ADD_REG_REG(emit->as, reg_index, reg_base); // add index to base
                         reg_base = reg_index;
@@ -1842,24 +1841,24 @@ static void emit_native_store_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
+                    #if N_THUMB
+                    if (index_value >= 0 && index_value < 32) {
+                        asm_thumb_strh_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_RV32
+                    if (FIT_SIGNED(index_value, 11)) {
+                        asm_rv32_opcode_sh(emit->as, reg_value, reg_base, index_value << 1);
+                        break;
+                    }
+                    #elif N_XTENSA || N_XTENSAWIN
+                    if (index_value >= 0 && index_value < 256) {
+                        asm_xtensa_op_s16i(emit->as, reg_value, reg_base, index_value);
+                        break;
+                    }
+                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
-                        #if N_THUMB
-                        if (index_value > 0 && index_value < 32) {
-                            asm_thumb_strh_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_RV32
-                        if (FIT_SIGNED(index_value, 11)) {
-                            asm_rv32_opcode_sh(emit->as, reg_value, reg_base, index_value << 1);
-                            break;
-                        }
-                        #elif N_XTENSA || N_XTENSAWIN
-                        if (index_value > 0 && index_value < 256) {
-                            asm_xtensa_op_s16i(emit->as, REG_RET, reg_base, index_value);
-                            break;
-                        }
-                        #endif
                         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;
@@ -1869,27 +1868,28 @@ static void emit_native_store_subscr(emit_t *emit) {
                 }
                 case VTYPE_PTR32: {
                     // pointer to 32-bit memory
+                    #if N_THUMB
+                    if (index_value >= 0 && index_value < 32) {
+                        asm_thumb_str_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
+                        break;
+                    }
+                    #elif N_RV32
+                    if (FIT_SIGNED(index_value, 10)) {
+                        asm_rv32_opcode_sw(emit->as, reg_value, reg_base, index_value << 2);
+                        break;
+                    }
+                    #elif N_XTENSA || N_XTENSAWIN
+                    if (index_value >= 0 && index_value < 256) {
+                        asm_xtensa_s32i_optimised(emit->as, reg_value, reg_base, index_value);
+                        break;
+                    }
+                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
-                        #if N_THUMB
-                        if (index_value > 0 && index_value < 32) {
-                            asm_thumb_str_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_RV32
-                        if (FIT_SIGNED(index_value, 10)) {
-                            asm_rv32_opcode_sw(emit->as, reg_value, reg_base, index_value << 2);
-                            break;
-                        }
-                        #elif N_XTENSA || N_XTENSAWIN
-                        if (index_value > 0 && index_value < 256) {
-                            asm_xtensa_s32i_optimised(emit->as, REG_RET, reg_base, index_value);
-                            break;
-                        }
-                        #elif N_ARM
+                        #if N_ARM
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
                         asm_arm_str_reg_reg_reg(emit->as, reg_value, reg_base, reg_index);
-                        return;
+                        break;
                         #endif
                         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

From 3d7edbd9ab80182b0a11a5df3860dd12f65597a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Apr 2025 11:48:30 +1000
Subject: [PATCH 2269/3129] py/persistentcode: Allow a port a custom commit
 function and track data.

Allows both MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA and MP_PLAT_COMMIT_EXEC
to be enabled at the same time.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c | 14 ++++++++------
 py/runtime.c        |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index 2a42b904bc138..43207a0cc8f66 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -72,6 +72,8 @@ typedef struct _bytecode_prelude_t {
 static int read_byte(mp_reader_t *reader);
 static size_t read_uint(mp_reader_t *reader);
 
+#if MICROPY_EMIT_MACHINE_CODE
+
 #if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA
 
 // An mp_obj_list_t that tracks native text/BSS/rodata to prevent the GC from reclaiming them.
@@ -86,8 +88,6 @@ static void track_root_pointer(void *ptr) {
 
 #endif
 
-#if MICROPY_EMIT_MACHINE_CODE
-
 typedef struct _reloc_info_t {
     mp_reader_t *reader;
     mp_module_context_t *context;
@@ -415,15 +415,17 @@ static mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
 
         // Relocate and commit code to executable address space
         reloc_info_t ri = {reader, context, rodata, bss};
+        #if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA
+        if (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) {
+            // Track the function data memory so it's not reclaimed by the GC.
+            track_root_pointer(fun_data);
+        }
+        #endif
         #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);
         #else
         if (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) {
-            #if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA
-            // Track the function data memory so it's not reclaimed by the GC.
-            track_root_pointer(fun_data);
-            #endif
             // Do the relocations.
             mp_native_relocate(&ri, fun_data, (uintptr_t)fun_data);
         }
diff --git a/py/runtime.c b/py/runtime.c
index d6fea172f212b..7979e520da481 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -123,7 +123,7 @@ void mp_init(void) {
     MP_STATE_VM(mp_module_builtins_override_dict) = NULL;
     #endif
 
-    #if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA
+    #if MICROPY_EMIT_MACHINE_CODE && (MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA)
     MP_STATE_VM(persistent_code_root_pointers) = MP_OBJ_NULL;
     #endif
 

From d5db8f04613b6a7e6f3d55dd8d618e8ccdaecdfa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Apr 2025 11:50:34 +1000
Subject: [PATCH 2270/3129] nrf: Use correct IRAM address for native code
 execution on nRF52.

On nRF52, the physical SRAM is mapped to 0x20000000 for data access and
0x00800000 for instruction access.  So, while native code is allocated and
written using addresses in the 0x20000000 range, it must execute from the
0x00800000 range.

This commit makes this work correctly on nRF52 MCUs by adjusting the
address.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/main.c         | 14 ++++++++++++++
 ports/nrf/mpconfigport.h | 12 +++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 99ed39895eb5a..784a031ce29bb 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -39,6 +39,7 @@
 #include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/compile.h"
+#include "py/persistentcode.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "readline.h"
@@ -369,3 +370,16 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
     printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
     __fatal_error("Assertion failed");
 }
+
+#if MICROPY_EMIT_MACHINE_CODE
+void *nrf_native_code_commit(void *buf, unsigned int len, void *reloc) {
+    (void)len;
+    if (reloc) {
+        // Native code in RAM must execute from the IRAM region at 0x00800000, and so relocations
+        // to text must also point to this region.  The MICROPY_MAKE_POINTER_CALLABLE macro will
+        // adjust the `buf` address from RAM to IRAM.
+        mp_native_relocate(reloc, buf, (uintptr_t)MICROPY_MAKE_POINTER_CALLABLE(buf) & ~1);
+    }
+    return buf;
+}
+#endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 7cc8a66d9840c..8c5c0300628dc 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -320,7 +320,17 @@
 
 // type definitions for the specific machine
 
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
+#if defined(NRF52832) || defined(NRF52840)
+// On nRF52, the physical SRAM is mapped to 0x20000000 for data access and 0x00800000
+// for instruction access.  So convert addresses to make them executable.
+#define MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA (1)
+#define MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA (0)
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)(((uintptr_t)(p) - 0x20000000 + 0x00800000) | 1))
+void *nrf_native_code_commit(void *, unsigned int, void *);
+#define MP_PLAT_COMMIT_EXEC(buf, len, reloc) nrf_native_code_commit(buf, len, reloc)
+#else
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uintptr_t)(p) | 1))
+#endif
 
 #define MP_SSIZE_MAX (0x7fffffff)
 

From 32c65ad4552d7e7d88c06e94fd903dcea5080c5f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Apr 2025 11:51:35 +1000
Subject: [PATCH 2271/3129] nrf: Only process interrupt chars on UARTs used for
 REPL.

This commit adds an `attached_to_repl` property to each UART, and makes
sure that property is correctly set/unset when the UART is attached to or
detached from the REPL.

That property is then used to make sure incoming characters on the UART are
only checked for the interrupt character if the UART is attached to the
REPL.  Otherwise a board without REPL on UART can have its code interrupted
if ctrl-C is received on the UART.

Also, put incoming UART characters on to `stdin_ringbuf` instead of the
UARTs ring buffer (the former is much larger than the latter).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/main.c                 |  4 +++-
 ports/nrf/modules/machine/uart.c | 26 ++++++++++++++++++--------
 ports/nrf/modules/machine/uart.h |  3 +--
 ports/nrf/modules/os/modos.c     | 14 +++++++++++---
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 784a031ce29bb..21a71c7c9e48c 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -40,6 +40,7 @@
 #include "py/gc.h"
 #include "py/compile.h"
 #include "py/persistentcode.h"
+#include "extmod/misc.h"
 #include "extmod/modmachine.h"
 #include "shared/runtime/pyexec.h"
 #include "readline.h"
@@ -172,7 +173,8 @@ void MP_NORETURN _start(void) {
             MP_OBJ_NEW_SMALL_INT(MICROPY_HW_UART_REPL),
             MP_OBJ_NEW_SMALL_INT(MICROPY_HW_UART_REPL_BAUD),
         };
-        MP_STATE_VM(dupterm_objs[0]) = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, MP_ARRAY_SIZE(args), 0, args);
+        mp_obj_t uart = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, MP_ARRAY_SIZE(args), 0, args);
+        mp_os_dupterm_obj.fun.var(1, &uart);
     }
     #endif
 
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 8d5a73e095f5e..45c79cda12a69 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -104,6 +104,7 @@ typedef struct _machine_uart_obj_t {
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
     uint8_t uart_id;
     bool initialized;       // static flag. Initialized to False
+    bool attached_to_repl;
     #if MICROPY_PY_MACHINE_UART_IRQ
     uint16_t mp_irq_trigger;   // user IRQ trigger mask
     uint16_t mp_irq_flags;     // user IRQ active IRQ flags
@@ -118,6 +119,13 @@ static machine_uart_obj_t machine_uart_obj[] = {
 };
 
 void uart_init0(void) {
+    for (int i = 0; i < MP_ARRAY_SIZE(machine_uart_obj); i++) {
+        machine_uart_obj[i].attached_to_repl = false;
+    }
+}
+
+void uart_attach_to_repl(machine_uart_obj_t *self, bool attached) {
+    self->attached_to_repl = attached;
 }
 
 static int uart_find(mp_obj_t id) {
@@ -137,14 +145,16 @@ static void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context
     if (p_event->type == NRFX_UART_EVT_RX_DONE) {
         nrfx_uart_rx(self->p_uart, &self->buf.rx_buf[0], 1);
         int chr = self->buf.rx_buf[0];
-        #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
-        {
+        if (self->attached_to_repl) {
+            #if MICROPY_KBD_EXCEPTION
+            if (chr == mp_interrupt_char) {
+                mp_sched_keyboard_interrupt();
+            } else
+            #endif
+            {
+                ringbuf_put((ringbuf_t *)&stdin_ringbuf, chr);
+            }
+        } else {
             ringbuf_put((ringbuf_t *)&self->buf.rx_ringbuf, chr);
         }
         #if MICROPY_PY_MACHINE_UART_IRQ
diff --git a/ports/nrf/modules/machine/uart.h b/ports/nrf/modules/machine/uart.h
index 741473ab7a4e3..85c2092458541 100644
--- a/ports/nrf/modules/machine/uart.h
+++ b/ports/nrf/modules/machine/uart.h
@@ -34,8 +34,7 @@
 typedef struct _machine_uart_obj_t machine_uart_obj_t;
 
 void uart_init0(void);
-void uart_deinit(void);
-void uart_irq_handler(mp_uint_t uart_id);
+void uart_attach_to_repl(machine_uart_obj_t *self, bool attached);
 
 bool uart_rx_any(machine_uart_obj_t *uart_obj);
 int uart_rx_char(machine_uart_obj_t *uart_obj);
diff --git a/ports/nrf/modules/os/modos.c b/ports/nrf/modules/os/modos.c
index f000e1eeb6457..97ed1e1badbbc 100644
--- a/ports/nrf/modules/os/modos.c
+++ b/ports/nrf/modules/os/modos.c
@@ -30,6 +30,7 @@
 #include "py/runtime.h"
 #include "extmod/modmachine.h"
 #include "drivers/rng.h"
+#include "modules/machine/uart.h"
 
 #if MICROPY_PY_OS_URANDOM
 // Return a bytes object with n random bytes, generated by the hardware random number generator.
@@ -46,10 +47,17 @@ static MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
 #endif
 
 #if MICROPY_PY_OS_DUPTERM
-// TODO should accept any object with read/write methods.
 void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
-    if (!(stream_attached == mp_const_none || mp_obj_get_type(stream_attached) == &machine_uart_type)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("need a UART object"));
+    #if MICROPY_PY_MACHINE_UART
+    if (mp_obj_get_type(stream_detached) == &machine_uart_type) {
+        uart_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
+    #endif
+
+    #if MICROPY_PY_MACHINE_UART
+    if (mp_obj_get_type(stream_attached) == &machine_uart_type) {
+        uart_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
+    }
+    #endif
 }
 #endif // MICROPY_PY_OS_DUPTERM

From e676b58d9fae4c4ebebfe0ea7fb787317dafba38 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Apr 2025 11:52:35 +1000
Subject: [PATCH 2272/3129] nrf: Fix UART write on parts that can't write more
 than 255 bytes.

Some MCUs cannot write more than 255 bytes to the UART at once.  Eg writing
256 bytes gets truncated to 0, writing 257 gets truncated to 1, etc.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/modules/machine/uart.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 45c79cda12a69..4c75bf8209830 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -46,6 +46,11 @@
 #include "nrfx_uarte.h"
 #endif
 
+#if defined(NRF52832)
+// The nRF52832 cannot write more than 255 bytes at a time.
+#define UART_MAX_TX_CHUNK (255)
+#endif
+
 typedef struct _machine_uart_buf_t {
     uint8_t tx_buf[1];
     uint8_t rx_buf[1];
@@ -456,17 +461,29 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf, mp_uin
     #endif
 
     machine_uart_obj_t *self = self_in;
-    nrfx_err_t err = nrfx_uart_tx(self->p_uart, buf, size);
-    if (err == NRFX_SUCCESS) {
+
+    // Send data out, in chunks if needed.
+    mp_uint_t remaining = size;
+    while (remaining) {
+        #ifdef UART_MAX_TX_CHUNK
+        mp_uint_t chunk = MIN(UART_MAX_TX_CHUNK, remaining);
+        #else
+        mp_uint_t chunk = remaining;
+        #endif
+        nrfx_err_t err = nrfx_uart_tx(self->p_uart, buf, chunk);
+        if (err != NRFX_SUCCESS) {
+            *errcode = mp_hal_status_to_errno_table[err];
+            return MP_STREAM_ERROR;
+        }
         while (nrfx_uart_tx_in_progress(self->p_uart)) {
             MICROPY_EVENT_POLL_HOOK;
         }
-        // return number of bytes written
-        return size;
-    } else {
-        *errcode = mp_hal_status_to_errno_table[err];
-        return MP_STREAM_ERROR;
+        buf += chunk;
+        remaining -= chunk;
     }
+
+    // return number of bytes written
+    return size;
 }
 
 static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {

From cc7eb1a5351c0d7d60f084dc79ccd0fa047b259e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Apr 2025 11:54:13 +1000
Subject: [PATCH 2273/3129] nrf/boards: Use 64 byte raw-paste buffer on
 PCA10028 and PCA10040.

To workaround issues with JLink CDC.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/boards/PCA10028/mpconfigboard.h | 5 +++++
 ports/nrf/boards/PCA10040/mpconfigboard.h | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ports/nrf/boards/PCA10028/mpconfigboard.h b/ports/nrf/boards/PCA10028/mpconfigboard.h
index 3dc8ed3459b53..df2e4e85d931f 100644
--- a/ports/nrf/boards/PCA10028/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10028/mpconfigboard.h
@@ -60,3 +60,8 @@
 #define MICROPY_HW_SPI0_MISO        (28)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3,4"
+
+// The JLink CDC on the PCA10028 cannot accept more than 64 incoming bytes at a time.
+// That makes the UART REPL unreliable in general.  But it can be improved to some
+// extent by setting the raw-paste buffer size to that limit of 64.
+#define MICROPY_REPL_STDIN_BUFFER_MAX (64)
diff --git a/ports/nrf/boards/PCA10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h
index b965bf319d082..2b1c4c7ef5cfb 100644
--- a/ports/nrf/boards/PCA10040/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10040/mpconfigboard.h
@@ -64,3 +64,8 @@
 #define MICROPY_HW_PWM2_NAME        "PWM2"
 
 #define HELP_TEXT_BOARD_LED         "1,2,3,4"
+
+// The JLink CDC on the PCA10040 cannot accept more than 64 incoming bytes at a time.
+// That makes the UART REPL unreliable in general.  But it can be improved to some
+// extent by setting the raw-paste buffer size to that limit of 64.
+#define MICROPY_REPL_STDIN_BUFFER_MAX (64)

From a1ee42cd3e6172cd57756e382a4702ae2a1d4a9e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Apr 2025 11:53:18 +1000
Subject: [PATCH 2274/3129] nrf: Use common implementation of machine
 disable/enable IRQ.

This is a breaking change due to the signature change of `enable_irq()`.
Previously the signature was:

    machine.enable_irq()

Now the signature matches other ports, and the docs, and is:

    machine.enable_irq(state)

Where `state` is the return value from `machine.disable_irq()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/modules/machine/modmachine.c | 23 -----------------------
 ports/nrf/mpconfigport.h               |  1 +
 ports/nrf/mphalport.h                  | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index aa1f5a8a4a0c4..f543265479c48 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -85,8 +85,6 @@
 
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_info),               MP_ROM_PTR(&machine_info_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) }, \
     { MP_ROM_QSTR(MP_QSTR_Pin),                MP_ROM_PTR(&pin_type) }, \
     \
@@ -214,24 +212,3 @@ static mp_obj_t mp_machine_get_freq(void) {
 static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_raise_NotImplementedError(NULL);
 }
-
-static mp_obj_t machine_enable_irq(void) {
-    #ifndef BLUETOOTH_SD
-    __enable_irq();
-    #else
-
-    #endif
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(machine_enable_irq_obj, machine_enable_irq);
-
-// Resets the board in a manner similar to pushing the external RESET button.
-static mp_obj_t machine_disable_irq(void) {
-    #ifndef BLUETOOTH_SD
-    __disable_irq();
-    #else
-
-    #endif
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 8c5c0300628dc..d52b5745d4e8f 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -181,6 +181,7 @@
 #define MICROPY_PY_MACHINE_RESET    (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_BOOTLOADER (1)
+#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
 #define MICROPY_PY_MACHINE_SOFTI2C  (MICROPY_PY_MACHINE_I2C)
 
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 3a89636aec6bc..12e881d7b636b 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -35,6 +35,22 @@
 #include "nrfx_config.h"
 #include "shared/runtime/interrupt_char.h"
 
+// Entering a critical section.
+#ifndef BLUETOOTH_SD
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+#endif
+
+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;
+}
+
 typedef enum
 {
     HAL_OK       = 0x00,

From 4545eb844df3acf342052bf80b35a8127cf7e194 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 26 Mar 2025 11:21:09 +1100
Subject: [PATCH 2275/3129] rp2: Disable the LWIP tick timer when not needed.

Prevents lightsleep being woken up every 64ms to service LWIP timers, when:

1. No netif is up, and
2. No TCP sockets are active

The TCP socket check may not be strictly necessary, but without ticking the
tcp timer they won't ever time out by themselves.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/rp2/mpnetworkport.c | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index e1e1567828bfb..fed34be380a50 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -31,6 +31,7 @@
 #if MICROPY_PY_LWIP
 
 #include "shared/runtime/softtimer.h"
+#include "lwip/netif.h"
 #include "lwip/timeouts.h"
 
 // Poll lwIP every 64ms by default
@@ -39,6 +40,9 @@
 // Soft timer for running lwIP in the background.
 static soft_timer_entry_t mp_network_soft_timer;
 
+// Callback for change of netif state
+NETIF_DECLARE_EXT_CALLBACK(netif_callback)
+
 #if MICROPY_PY_NETWORK_CYW43
 #include "lib/cyw43-driver/src/cyw43.h"
 #include "lib/cyw43-driver/src/cyw43_stats.h"
@@ -137,17 +141,48 @@ static void mp_network_soft_timer_callback(soft_timer_entry_t *self) {
     #if MICROPY_PY_NETWORK_WIZNET5K
     wiznet5k_poll();
     #endif
+
+    // Only keep the timer running if any TCP sockets are active, or any netif is up
+    struct netif *netif;
+    extern void *tcp_active_pcbs;
+    bool keep_running = (tcp_active_pcbs != NULL);
+    if (!keep_running) {
+        NETIF_FOREACH(netif) {
+            if (netif->flags & NETIF_FLAG_LINK_UP) {
+                keep_running = true;
+                break;
+            }
+        }
+    }
+
+    // Periodic timer will re-queue as soon as this handler exits,
+    // one shot timer will not
+    mp_network_soft_timer.mode = keep_running ? SOFT_TIMER_MODE_PERIODIC : SOFT_TIMER_MODE_ONE_SHOT;
 }
 
+static void mp_network_netif_status_cb(struct netif *netif, netif_nsc_reason_t reason, const netif_ext_callback_args_t *args);
+
 void mod_network_lwip_init(void) {
     soft_timer_static_init(
         &mp_network_soft_timer,
-        SOFT_TIMER_MODE_PERIODIC,
+        SOFT_TIMER_MODE_ONE_SHOT,
         LWIP_TICK_RATE_MS,
         mp_network_soft_timer_callback
         );
 
-    soft_timer_reinsert(&mp_network_soft_timer, LWIP_TICK_RATE_MS);
+    if (netif_callback.callback_fn == NULL) {
+        netif_add_ext_callback(&netif_callback, mp_network_netif_status_cb);
+    }
+}
+
+static void mp_network_netif_status_cb(struct netif *netif, netif_nsc_reason_t reason, const netif_ext_callback_args_t *args) {
+    // Start the network soft timer any time an interface comes up, unless
+    // it's already running
+    if (reason == LWIP_NSC_LINK_CHANGED && args->link_changed.state
+        && mp_network_soft_timer.mode == SOFT_TIMER_MODE_ONE_SHOT) {
+        mp_network_soft_timer.mode = SOFT_TIMER_MODE_PERIODIC;
+        soft_timer_reinsert(&mp_network_soft_timer, LWIP_TICK_RATE_MS);
+    }
 }
 
 #endif // MICROPY_PY_LWIP

From 28c8fff6d8f920eb6199cc5db59da1baf1b00843 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Mon, 12 May 2025 10:21:52 +0100
Subject: [PATCH 2276/3129] rp2/machine_pin: Replace macros with Pico SDK
 functions.

Replace custom macros with Pico SDK functions, enabling support for RP2350B
variant chips with > 32 GPIOs.

Fixes issue #17241.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/machine_pin.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index d9ca3f8ce37a5..db3ca69d8b1ae 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -46,12 +46,6 @@
 
 #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)))
 
@@ -198,13 +192,13 @@ const machine_pin_obj_t *machine_pin_find(mp_obj_t pin) {
 
 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);
+    uint funcsel = gpio_get_function(self->id);
     qstr mode_qst;
     if (!is_ext_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)) {
+            } else if (gpio_is_dir_out(self->id)) {
                 mode_qst = MP_QSTR_OUT;
             } else {
                 mode_qst = MP_QSTR_IN;
@@ -214,11 +208,11 @@ static void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         }
         mp_printf(print, "Pin(%q, mode=%q", self->name, mode_qst);
         bool pull_up = false;
-        if (GPIO_IS_PULL_UP(self->id)) {
+        if (gpio_is_pulled_up(self->id)) {
             mp_printf(print, ", pull=%q", MP_QSTR_PULL_UP);
             pull_up = true;
         }
-        if (GPIO_IS_PULL_DOWN(self->id)) {
+        if (gpio_is_pulled_down(self->id)) {
             if (pull_up) {
                 mp_printf(print, "|%q", MP_QSTR_PULL_DOWN);
             } else {
@@ -411,7 +405,7 @@ static mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
         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)) {
+        if (gpio_is_dir_out(self->id)) {
             gpio_set_dir(self->id, GPIO_IN);
         } else {
             gpio_set_dir(self->id, GPIO_OUT);

From 45cb9b4444a7316a137f9c32942bc6c76f904f01 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Mon, 12 May 2025 11:08:54 +0100
Subject: [PATCH 2277/3129] rp2/machine_pin: Fix simulated open drain with more
 than 32 GPIOs.

Changes are:
- Refactor the open-drain macros, add GPIO_ENABLE/DISABLE_OPEN_DRAIN, and
  move them to `mphalport.h`.
- Only use `uint64_t` for the open-drain mask if there are more than 32
  GPIOs (saves code size).
- Ensure we're shifting a `uint64_t` by using 1ULL constants.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/machine_pin.c |  9 +++++----
 ports/rp2/mphalport.h   | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index db3ca69d8b1ae..7a2de0c0bc690 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -46,9 +46,6 @@
 
 #define GPIO_IRQ_ALL (0xf)
 
-// 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
@@ -83,7 +80,11 @@ static const mp_irq_methods_t machine_pin_irq_methods;
 static const int num_intr_regs = sizeof(iobank0_hw->intr) / sizeof(iobank0_hw->intr[0]);
 
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
+#if NUM_BANK0_GPIOS > 32
 uint64_t machine_pin_open_drain_mask;
+#else
+uint32_t machine_pin_open_drain_mask;
+#endif
 
 #if MICROPY_HW_PIN_EXT_COUNT
 static inline bool is_ext_pin(__unused const machine_pin_obj_t *self) {
@@ -292,7 +293,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
                 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 &= ~(1ULL << self->id);
+            GPIO_DISABLE_OPEN_DRAIN(self->id);
         }
     }
 
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 956db3ec702fb..5012b682b9d29 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -123,7 +123,18 @@ static inline mp_uint_t mp_hal_get_cpu_freq(void) {
 #define MP_HAL_PIN_PULL_UP              (1)
 #define MP_HAL_PIN_PULL_DOWN            (2)
 
+// Open drain behaviour is simulated.
+#if NUM_BANK0_GPIOS > 32
 extern uint64_t machine_pin_open_drain_mask;
+#define GPIO_IS_OPEN_DRAIN(id)          (machine_pin_open_drain_mask & (1ULL << id))
+#define GPIO_ENABLE_OPEN_DRAIN(id)      (machine_pin_open_drain_mask |= (1ULL << id))
+#define GPIO_DISABLE_OPEN_DRAIN(id)     (machine_pin_open_drain_mask &= ~(1ULL << id))
+#else
+extern uint32_t machine_pin_open_drain_mask;
+#define GPIO_IS_OPEN_DRAIN(id)          (machine_pin_open_drain_mask & (1U << id))
+#define GPIO_ENABLE_OPEN_DRAIN(id)      (machine_pin_open_drain_mask |= (1U << id))
+#define GPIO_DISABLE_OPEN_DRAIN(id)     (machine_pin_open_drain_mask &= ~(1U << id))
+#endif
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
 
@@ -133,13 +144,13 @@ 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_dir(pin, GPIO_IN);
-    machine_pin_open_drain_mask &= ~(1 << pin);
+    GPIO_DISABLE_OPEN_DRAIN(pin);
     gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 
 static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
     gpio_set_dir(pin, GPIO_OUT);
-    machine_pin_open_drain_mask &= ~(1 << pin);
+    GPIO_DISABLE_OPEN_DRAIN(pin);
     gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 
@@ -151,7 +162,7 @@ static inline void mp_hal_pin_open_drain_with_value(mp_hal_pin_obj_t pin, int v)
         gpio_put(pin, 0);
         gpio_set_dir(pin, GPIO_OUT);
     }
-    machine_pin_open_drain_mask |= 1 << pin;
+    GPIO_ENABLE_OPEN_DRAIN(pin);
     gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 

From 7f6fedef2aeb0234f3c7d35a735ade75b9fdeaf3 Mon Sep 17 00:00:00 2001
From: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
Date: Tue, 20 May 2025 13:23:25 -0600
Subject: [PATCH 2278/3129] rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA: Fix
 default I2C to use I2C1.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h
index 56071e1873341..931391d972e0c 100644
--- a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER_BETA/mpconfigboard.h
@@ -24,5 +24,9 @@
 int mp_hal_is_pin_reserved(int n);
 #define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
 
+// Set the default I2C to I2C1 on pins 18 and 19 which route to the qwiic connector
+#undef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C (1)
+
 #define MICROPY_HW_I2C1_SDA (18)
 #define MICROPY_HW_I2C1_SCL (19)

From dc1af386a81f0238d809b2443714dc8feba5f174 Mon Sep 17 00:00:00 2001
From: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
Date: Mon, 17 Mar 2025 09:19:44 -0600
Subject: [PATCH 2279/3129] esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32: Add
 SparkFun board.

Add board definition files for SparkFun IoT RedBoard ESP32.

Signed-off-by: Malcolm McKellips <malcolm.mckellips@sparkfun.com>
---
 .../SPARKFUN_IOT_REDBOARD_ESP32/board.json    | 23 +++++++++++++++++++
 .../SPARKFUN_IOT_REDBOARD_ESP32/manifest.py   |  2 ++
 .../mpconfigboard.cmake                       |  7 ++++++
 .../mpconfigboard.h                           | 14 +++++++++++
 .../SPARKFUN_IOT_REDBOARD_ESP32/pins.csv      | 22 ++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/board.json
 create mode 100644 ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/manifest.py
 create mode 100644 ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.h
 create mode 100644 ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/pins.csv

diff --git a/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/board.json b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/board.json
new file mode 100644
index 0000000000000..8bce1a001336f
--- /dev/null
+++ b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
+    "docs": "",
+    "features": [
+        "BLE",
+        "External Flash",
+        "WiFi",
+        "USB-C"
+    ],
+    "images": [
+        "19177-Sparkfun_IoT_Redboard-ESP32.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "ESP32 / WROOM",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/sparkfun-iot-redboard-esp32-development-board.html",
+    "vendor": "SparkFun"
+}
diff --git a/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/manifest.py b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/manifest.py
new file mode 100644
index 0000000000000..73446ecac9892
--- /dev/null
+++ b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("sdcard")
diff --git a/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.cmake b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.cmake
new file mode 100644
index 0000000000000..0ffcc38c877b7
--- /dev/null
+++ b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.cmake
@@ -0,0 +1,7 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.h b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.h
new file mode 100644
index 0000000000000..4fe888ac17c9a
--- /dev/null
+++ b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.h
@@ -0,0 +1,14 @@
+// Board and hardware specific configuration
+
+#define MICROPY_HW_BOARD_NAME "SparkFun IoT RedBoard ESP32"
+#define MICROPY_HW_MCU_NAME "ESP32"
+
+// 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            (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/SPARKFUN_IOT_REDBOARD_ESP32/pins.csv b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/pins.csv
new file mode 100644
index 0000000000000..d37c51af8f775
--- /dev/null
+++ b/ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/pins.csv
@@ -0,0 +1,22 @@
+TX,GPIO1
+RX,GPIO3
+ALERT,GPIO4
+TCK,GPIO13
+TMS,GPIO14
+CS,GPIO5
+PICO,GPIO23
+POCI,GPIO19
+SCK,GPIO18
+SDA,GPIO21
+SCL,GPIO22
+A0,GPIO36
+A3,GPIO39
+A4,GPIO32
+A5,GPIO33
+A6,GPIO34
+A7,GPIO35
+LED,GPIO18
+LED_BLUE,GPIO18
+BLUE_LED,GPIO18
+RGB_LED,GPIO2
+NEOPIXEL,GPIO2

From 49f81d5046aaeb31f90626426363ae2518dbd810 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 May 2025 10:34:56 +1000
Subject: [PATCH 2280/3129] tests/float/math_constants.py: Test actual e and pi
 constant values.

The existing test for `math.e` and `math.pi` constants can fail on certain
targets if the functions `math.exp()` and/or `math.cos()` are not accurate
enough (eg out by an LSB of float precision).  For example this test
currently fails on PYBD_SF6 which uses double precision floats (and that's
due to the `lib/libm_dbl/exp.c` implementation not being exact).

This commit changes this constant test so that it tests the actual constant
value, not the evaluation of `exp()` and `cos()` functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/math_constants.py | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/tests/float/math_constants.py b/tests/float/math_constants.py
index 2e4c321052625..21d822a01e3e8 100644
--- a/tests/float/math_constants.py
+++ b/tests/float/math_constants.py
@@ -1,11 +1,30 @@
 # Tests various constants of the math module.
+
+import sys
+
 try:
-    import math
-    from math import exp, cos
+    from array import array
+    from math import e, pi
 except ImportError:
     print("SKIP")
     raise SystemExit
 
-print(math.e == exp(1.0))
+# Hexadecimal representations of e and pi constants.
+e_truth_single = 0x402DF854
+pi_truth_single = 0x40490FDB
+e_truth_double = 0x4005BF0A8B145769
+pi_truth_double = 0x400921FB54442D18
+
+# Detect the floating-point precision of the system, to determine the exact values of
+# the constants (parsing the float from a decimal string can lead to inaccuracies).
+if float("1e300") == float("inf"):
+    # Single precision floats.
+    e_truth = array("f", e_truth_single.to_bytes(4, sys.byteorder))[0]
+    pi_truth = array("f", pi_truth_single.to_bytes(4, sys.byteorder))[0]
+else:
+    # Double precision floats.
+    e_truth = array("d", e_truth_double.to_bytes(8, sys.byteorder))[0]
+    pi_truth = array("d", pi_truth_double.to_bytes(8, sys.byteorder))[0]
 
-print(cos(math.pi))
+print("e:", e == e_truth or (e, e_truth, e - e_truth))
+print("pi:", pi == pi_truth or (pi, pi_truth, pi - pi_truth))

From 22f1d766334f96f48aaaa04a72faeb9a2a37b595 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 22 May 2025 17:38:22 +1000
Subject: [PATCH 2281/3129] shared/tinyusb: Use device event hook to schedule
 USB task.

Previously MicroPython ports would linker-wrap dcd_event_handler
in order to schedule the USB task callback to run when needed.

TinyUSB 0.16 added proper support for an event hook to do the
same thing without the hacky linker wrapping.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/alif/alif.mk             |  4 ----
 ports/esp32/esp32_common.cmake |  8 --------
 ports/nrf/Makefile             |  1 -
 ports/renesas-ra/Makefile      |  3 ---
 ports/rp2/CMakeLists.txt       |  1 -
 ports/samd/Makefile            |  2 --
 shared/tinyusb/mp_usbd.c       | 13 ++-----------
 7 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index eee27b3b7d698..bb07a3aa2025c 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -103,10 +103,6 @@ CFLAGS += -Wl,-T$(BUILD)/ensemble.ld \
           -Wl,--print-memory-usage \
           -Wl,--no-warn-rwx-segment
 
-ifeq ($(MCU_CORE),M55_HP)
-CFLAGS += -Wl,--wrap=dcd_event_handler
-endif
-
 ################################################################################
 # Source files and libraries
 
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 2e7b95b385be5..09b120391305f 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -97,10 +97,6 @@ if(MICROPY_PY_TINYUSB)
     list(APPEND MICROPY_INC_TINYUSB
         ${MICROPY_DIR}/shared/tinyusb/
     )
-
-    list(APPEND MICROPY_LINK_TINYUSB
-        -Wl,--wrap=dcd_event_handler
-    )
 endif()
 
 list(APPEND MICROPY_SOURCE_PORT
@@ -261,10 +257,6 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
     -Wno-missing-field-initializers
 )
 
-target_link_options(${MICROPY_TARGET} PUBLIC
-     ${MICROPY_LINK_TINYUSB}
-)
-
 # Additional include directories needed for private NimBLE headers.
 target_include_directories(${MICROPY_TARGET} PUBLIC
     ${IDF_PATH}/components/bt/host/nimble/nimble
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 59e74dce4215a..d3d747186ff98 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -268,7 +268,6 @@ SRC_C += $(addprefix lib/tinyusb/src/,\
 	portable/nordic/nrf5x/dcd_nrf5x.c \
 	)
 
-LDFLAGS += -Wl,--wrap=dcd_event_handler
 endif
 
 DRIVERS_SRC_C += $(addprefix modules/,\
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index ec47510d981ad..fd74c60a8564e 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -157,9 +157,6 @@ LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
-# Hook tinyusb USB interrupt if used to service usb task.
-LDFLAGS += --wrap=dcd_event_handler
-
 # Options for mpy-cross
 MPY_CROSS_FLAGS += -march=armv7m
 
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 7cb0c60aa21f4..f0b278df2bb34 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -525,7 +525,6 @@ target_compile_options(${MICROPY_TARGET} PRIVATE
 
 target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}
-    -Wl,--wrap=dcd_event_handler
     -Wl,--wrap=runtime_init_clocks
 )
 
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 005664f178d3c..bec530d803f7e 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -113,8 +113,6 @@ LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
-LDFLAGS += --wrap=dcd_event_handler
-
 MPY_CROSS_FLAGS += -march=$(MPY_CROSS_MCU_ARCH)
 
 SRC_C += \
diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
index 7ccfa7018d4bc..f03f7f7db419a 100644
--- a/shared/tinyusb/mp_usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -30,10 +30,6 @@
 
 #include "mp_usbd.h"
 
-#ifndef NO_QSTR
-#include "device/dcd.h"
-#endif
-
 #if !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
 
 void mp_usbd_task(void) {
@@ -47,13 +43,8 @@ void mp_usbd_task_callback(mp_sched_node_t *node) {
 
 #endif // !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
 
-extern void __real_dcd_event_handler(dcd_event_t const *event, bool in_isr);
-
-// If -Wl,--wrap=dcd_event_handler is passed to the linker, then this wrapper
-// will be called and allows MicroPython to schedule the TinyUSB task when
-// dcd_event_handler() is called from an ISR.
-TU_ATTR_FAST_FUNC void __wrap_dcd_event_handler(dcd_event_t const *event, bool in_isr) {
-    __real_dcd_event_handler(event, in_isr);
+// Schedule the TinyUSB task on demand, when there is a new USB device event
+TU_ATTR_FAST_FUNC void tud_event_hook_cb(uint8_t rhport, uint32_t eventid, bool in_isr) {
     mp_usbd_schedule_task();
     mp_hal_wake_main_task_from_isr();
 }

From b36111b12c74889b1a9fdb2bdc63b8953389f30c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 22 May 2025 17:46:58 +1000
Subject: [PATCH 2282/3129] nrf: Revert "nrf/Makefile: Enable LTO by default
 only on newer gcc.".

This reverts commit 62e0fa04a7a6f9044db1bb0f20ea7a2e00599921.

Reverting as the only linker wrap needed for nrf port was removed
in the parent commit.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/nrf/Makefile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index d3d747186ff98..7b16974f97023 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -129,14 +129,7 @@ CFLAGS_MCU_m4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-s
 
 CFLAGS_MCU_m0 = $(CFLAGS_CORTEX_M) -fshort-enums -mtune=cortex-m0 -mcpu=cortex-m0 -mfloat-abi=soft
 
-# linker wrap does not work with lto on older gcc/binutils: https://sourceware.org/bugzilla/show_bug.cgi?id=24406
-GCC_VERSION = $(shell arm-none-eabi-gcc -dumpversion)
-GCC_MAJOR_VERS = $(word 1,$(subst ., ,$(GCC_VERSION)))
-ifeq ($(shell test $(GCC_MAJOR_VERS) -ge 10; echo $$?),0)
 LTO ?= 1
-else
-LTO ?= 0
-endif
 
 ifeq ($(LTO),1)
 CFLAGS += -flto

From 670b7c93505a3995bcb7ba9af5cb721994414a1f Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Thu, 24 Oct 2024 15:52:55 +0530
Subject: [PATCH 2283/3129] zephyr/boards: Add support for BeaglePlay CC1352p7.

- Enable support for FLASH and IEEE802154 subg radio
- Requires Zephyr v3.8.0

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 ports/zephyr/boards/beagleplay_cc1352p7.conf | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 ports/zephyr/boards/beagleplay_cc1352p7.conf

diff --git a/ports/zephyr/boards/beagleplay_cc1352p7.conf b/ports/zephyr/boards/beagleplay_cc1352p7.conf
new file mode 100644
index 0000000000000..f63d184e38ef0
--- /dev/null
+++ b/ports/zephyr/boards/beagleplay_cc1352p7.conf
@@ -0,0 +1,13 @@
+# Flash drivers
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+
+# Networking
+CONFIG_BT=n
+CONFIG_NET_IPV4=n
+CONFIG_NET_CONFIG_NEED_IPV6=y
+CONFIG_NET_CONFIG_NEED_IPV4=n
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_L2_IEEE802154=y
+CONFIG_NET_DHCPV4=n
+CONFIG_NET_CONFIG_IEEE802154_CHANNEL=1

From 9dbae39348e2c95190d808bc14a0e8adb1c3b8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 13 May 2025 13:50:42 +0200
Subject: [PATCH 2284/3129] lib/littlefs: Update LittleFS to v2.11.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 lib/littlefs/lfs2.c      | 80 +++++++++++++++++++++++++++-------------
 lib/littlefs/lfs2.h      |  8 +++-
 lib/littlefs/lfs2_util.h | 16 ++++----
 3 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index f9ce2cf290686..abdec19d7cb6d 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -3932,7 +3932,9 @@ static int lfs2_remove_(lfs2_t *lfs2, const char *path) {
     }
 
     lfs2->mlist = dir.next;
-    if (lfs2_tag_type3(tag) == LFS2_TYPE_DIR) {
+    if (lfs2_gstate_hasorphans(&lfs2->gstate)) {
+        LFS2_ASSERT(lfs2_tag_type3(tag) == LFS2_TYPE_DIR);
+
         // fix orphan
         err = lfs2_fs_preporphans(lfs2, -1);
         if (err) {
@@ -4076,8 +4078,10 @@ static int lfs2_rename_(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 (lfs2_gstate_hasorphans(&lfs2->gstate)) {
+        LFS2_ASSERT(prevtag != LFS2_ERR_NOENT
+                && lfs2_tag_type3(prevtag) == LFS2_TYPE_DIR);
+
         // fix orphan
         err = lfs2_fs_preporphans(lfs2, -1);
         if (err) {
@@ -5233,40 +5237,64 @@ static int lfs2_fs_gc_(lfs2_t *lfs2) {
 #endif
 
 #ifndef LFS2_READONLY
+#ifdef LFS2_SHRINKNONRELOCATING
+static int lfs2_shrink_checkblock(void *data, lfs2_block_t block) {
+    lfs2_size_t threshold = *((lfs2_size_t*)data);
+    if (block >= threshold) {
+        return LFS2_ERR_NOTEMPTY;
+    }
+    return 0;
+}
+#endif
+
 static int lfs2_fs_grow_(lfs2_t *lfs2, lfs2_size_t block_count) {
-    // shrinking is not supported
-    LFS2_ASSERT(block_count >= lfs2->block_count);
+    int err;
 
-    if (block_count > lfs2->block_count) {
-        lfs2->block_count = block_count;
+    if (block_count == lfs2->block_count) {
+        return 0;
+    }
 
-        // fetch the root
-        lfs2_mdir_t root;
-        int err = lfs2_dir_fetch(lfs2, &root, lfs2->root);
+    
+#ifndef LFS2_SHRINKNONRELOCATING
+    // shrinking is not supported
+    LFS2_ASSERT(block_count >= lfs2->block_count);
+#endif
+#ifdef LFS2_SHRINKNONRELOCATING
+    if (block_count < lfs2->block_count) {
+        err = lfs2_fs_traverse_(lfs2, lfs2_shrink_checkblock, &block_count, true);
         if (err) {
             return err;
         }
+    }
+#endif
 
-        // update the superblock
-        lfs2_superblock_t superblock;
-        lfs2_stag_t tag = lfs2_dir_get(lfs2, &root, LFS2_MKTAG(0x7ff, 0x3ff, 0),
-                LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, 0, sizeof(superblock)),
-                &superblock);
-        if (tag < 0) {
-            return tag;
-        }
-        lfs2_superblock_fromle32(&superblock);
+    lfs2->block_count = block_count;
 
-        superblock.block_count = lfs2->block_count;
+    // fetch the root
+    lfs2_mdir_t root;
+    err = lfs2_dir_fetch(lfs2, &root, lfs2->root);
+    if (err) {
+        return err;
+    }
 
-        lfs2_superblock_tole32(&superblock);
-        err = lfs2_dir_commit(lfs2, &root, LFS2_MKATTRS(
-                {tag, &superblock}));
-        if (err) {
-            return err;
-        }
+    // update the superblock
+    lfs2_superblock_t superblock;
+    lfs2_stag_t tag = lfs2_dir_get(lfs2, &root, LFS2_MKTAG(0x7ff, 0x3ff, 0),
+            LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, 0, sizeof(superblock)),
+            &superblock);
+    if (tag < 0) {
+        return tag;
     }
+    lfs2_superblock_fromle32(&superblock);
+
+    superblock.block_count = lfs2->block_count;
 
+    lfs2_superblock_tole32(&superblock);
+    err = lfs2_dir_commit(lfs2, &root, LFS2_MKATTRS(
+            {tag, &superblock}));
+    if (err) {
+        return err;
+    }
     return 0;
 }
 #endif
diff --git a/lib/littlefs/lfs2.h b/lib/littlefs/lfs2.h
index f503fd00bcfa2..77477aaff83c0 100644
--- a/lib/littlefs/lfs2.h
+++ b/lib/littlefs/lfs2.h
@@ -21,7 +21,7 @@ extern "C"
 // Software library version
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_VERSION 0x0002000a
+#define LFS2_VERSION 0x0002000b
 #define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
 #define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >>  0))
 
@@ -766,7 +766,11 @@ int lfs2_fs_gc(lfs2_t *lfs2);
 // Grows the filesystem to a new size, updating the superblock with the new
 // block count.
 //
-// Note: This is irreversible.
+// If LFS2_SHRINKNONRELOCATING is defined, this function will also accept
+// block_counts smaller than the current configuration, after checking
+// that none of the blocks that are being removed are in use.
+// Note that littlefs's pseudorandom block allocation means that
+// this is very unlikely to work in the general case.
 //
 // Returns a negative error code on failure.
 int lfs2_fs_grow(lfs2_t *lfs2, lfs2_size_t block_count);
diff --git a/lib/littlefs/lfs2_util.h b/lib/littlefs/lfs2_util.h
index 3b191f6885f44..12c82a630b079 100644
--- a/lib/littlefs/lfs2_util.h
+++ b/lib/littlefs/lfs2_util.h
@@ -195,10 +195,10 @@ static inline uint32_t lfs2_fromle32(uint32_t a) {
     (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
     return __builtin_bswap32(a);
 #else
-    return (((uint8_t*)&a)[0] <<  0) |
-           (((uint8_t*)&a)[1] <<  8) |
-           (((uint8_t*)&a)[2] << 16) |
-           (((uint8_t*)&a)[3] << 24);
+    return ((uint32_t)((uint8_t*)&a)[0] <<  0) |
+           ((uint32_t)((uint8_t*)&a)[1] <<  8) |
+           ((uint32_t)((uint8_t*)&a)[2] << 16) |
+           ((uint32_t)((uint8_t*)&a)[3] << 24);
 #endif
 }
 
@@ -218,10 +218,10 @@ static inline uint32_t lfs2_frombe32(uint32_t a) {
     (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
     return a;
 #else
-    return (((uint8_t*)&a)[0] << 24) |
-           (((uint8_t*)&a)[1] << 16) |
-           (((uint8_t*)&a)[2] <<  8) |
-           (((uint8_t*)&a)[3] <<  0);
+    return ((uint32_t)((uint8_t*)&a)[0] << 24) |
+           ((uint32_t)((uint8_t*)&a)[1] << 16) |
+           ((uint32_t)((uint8_t*)&a)[2] <<  8) |
+           ((uint32_t)((uint8_t*)&a)[3] <<  0);
 #endif
 }
 

From 2dada065ac4333d8623fd2c7509c47d15d8c9a5e Mon Sep 17 00:00:00 2001
From: Herwin Grobben <h.grobben@aemics.nl>
Date: Thu, 22 May 2025 12:26:59 +0200
Subject: [PATCH 2285/3129] stm32: Allow QSPI to work on STM32G4.

Adding a QSPI memory chip on a STM32G4 does not work due to some small
issues, which are fixed in this commit:

- Rename QUADSPI1_xxx alt-func names to QUADSPI_xxx, to match the static
  names used in `qspi.c`.

- Enable `mpu.h` macros on G4.

- Don't include I- and D-cache invalidation on G4.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32g474_af.csv | 58 ++++++++++++++---------------
 ports/stm32/mpu.h                   |  2 +-
 ports/stm32/qspi.c                  |  2 +
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/ports/stm32/boards/stm32g474_af.csv b/ports/stm32/boards/stm32g474_af.csv
index 5853f5f9008af..59a0e91a14f85 100644
--- a/ports/stm32/boards/stm32g474_af.csv
+++ b/ports/stm32/boards/stm32g474_af.csv
@@ -2,12 +2,12 @@ Port ,Pin ,AF0         ,AF1                   ,AF2
      ,    ,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
 PortA,PA0 ,            ,TIM2_CH1              ,TIM5_CH1                         ,                                                ,                       ,                                                     ,                                           ,USART2_CTS              ,COMP1_OUT                               ,TIM8_BKIN           ,TIM8_ETR              ,                    ,                            ,                      ,TIM2_ETR                  ,EVENTOUT,ADC12_IN1
 PortA,PA1 ,RTC_REFIN   ,TIM2_CH2              ,TIM5_CH2                         ,                                                ,                       ,                                                     ,                                           ,USART2_RTS_DE           ,                                        ,TIM15_CH1N          ,                      ,                    ,                            ,                      ,                          ,EVENTOUT,ADC12_IN2
-PortA,PA2 ,            ,TIM2_CH3              ,TIM5_CH3                         ,                                                ,                       ,                                                     ,                                           ,USART2_TX               ,COMP2_OUT                               ,TIM15_CH1           ,QUADSPI1_BK1_NCS      ,                    ,LPUART1_TX                  ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC1_IN3
-PortA,PA3 ,            ,TIM2_CH4              ,TIM5_CH4                         ,SAI1_CK1                                        ,                       ,                                                     ,                                           ,USART2_RX               ,                                        ,TIM15_CH2           ,QUADSPI1_CLK          ,                    ,LPUART1_RX                  ,SAI1_MCLK_A           ,                          ,EVENTOUT,ADC1_IN4
+PortA,PA2 ,            ,TIM2_CH3              ,TIM5_CH3                         ,                                                ,                       ,                                                     ,                                           ,USART2_TX               ,COMP2_OUT                               ,TIM15_CH1           ,QUADSPI_BK1_NCS      ,                    ,LPUART1_TX                  ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC1_IN3
+PortA,PA3 ,            ,TIM2_CH4              ,TIM5_CH4                         ,SAI1_CK1                                        ,                       ,                                                     ,                                           ,USART2_RX               ,                                        ,TIM15_CH2           ,QUADSPI_CLK          ,                    ,LPUART1_RX                  ,SAI1_MCLK_A           ,                          ,EVENTOUT,ADC1_IN4
 PortA,PA4 ,            ,                      ,TIM3_CH2                         ,                                                ,                       ,SPI1_NSS                                             ,SPI3_NSS/I2S3_WS                           ,USART2_CK               ,                                        ,                    ,                      ,                    ,                            ,SAI1_FS_B             ,                          ,EVENTOUT,ADC2_IN17
 PortA,PA5 ,            ,TIM2_CH1              ,TIM2_ETR                         ,                                                ,                       ,SPI1_SCK                                             ,                                           ,                        ,                                        ,                    ,                      ,                    ,                            ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC2_IN13
-PortA,PA6 ,            ,TIM16_CH1             ,TIM3_CH1                         ,                                                ,TIM8_BKIN              ,SPI1_MISO                                            ,TIM1_BKIN                                  ,                        ,COMP1_OUT                               ,                    ,QUADSPI1_BK1_IO3      ,                    ,LPUART1_CTS                 ,                      ,                          ,EVENTOUT,ADC2_IN3
-PortA,PA7 ,            ,TIM17_CH1             ,TIM3_CH2                         ,                                                ,TIM8_CH1N              ,SPI1_MOSI                                            ,TIM1_CH1N                                  ,                        ,COMP2_OUT                               ,                    ,QUADSPI1_BK1_IO2      ,                    ,                            ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC2_IN4
+PortA,PA6 ,            ,TIM16_CH1             ,TIM3_CH1                         ,                                                ,TIM8_BKIN              ,SPI1_MISO                                            ,TIM1_BKIN                                  ,                        ,COMP1_OUT                               ,                    ,QUADSPI_BK1_IO3      ,                    ,LPUART1_CTS                 ,                      ,                          ,EVENTOUT,ADC2_IN3
+PortA,PA7 ,            ,TIM17_CH1             ,TIM3_CH2                         ,                                                ,TIM8_CH1N              ,SPI1_MOSI                                            ,TIM1_CH1N                                  ,                        ,COMP2_OUT                               ,                    ,QUADSPI_BK1_IO2      ,                    ,                            ,                      ,UCPD1_FRSTX               ,EVENTOUT,ADC2_IN4
 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
 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,
@@ -16,9 +16,9 @@ PortA,PA12,            ,TIM16_CH1             ,
 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
-PortB,PB1 ,            ,                      ,TIM3_CH4                         ,                                                ,TIM8_CH3N              ,                                                     ,TIM1_CH3N                                  ,                        ,COMP4_OUT                               ,                    ,QUADSPI1_BK1_IO0      ,                    ,LPUART1_RTS_DE              ,HRTIM1_SCOUT          ,                          ,EVENTOUT,ADC3_IN1/ADC1_IN12
-PortB,PB2 ,RTC_OUT2    ,LPTIM1_OUT            ,TIM5_CH1                         ,TIM20_CH1                                       ,I2C3_SMBA              ,                                                     ,                                           ,                        ,                                        ,                    ,QUADSPI1_BK2_IO1      ,                    ,                            ,HRTIM1_SCIN           ,                          ,EVENTOUT,ADC2_IN12
+PortB,PB0 ,            ,                      ,TIM3_CH3                         ,                                                ,TIM8_CH2N              ,                                                     ,TIM1_CH2N                                  ,                        ,                                        ,                    ,QUADSPI_BK1_IO1      ,                    ,                            ,HRTIM1_FLT5           ,UCPD1_FRSTX               ,EVENTOUT,ADC3_IN12/ADC1_IN15
+PortB,PB1 ,            ,                      ,TIM3_CH4                         ,                                                ,TIM8_CH3N              ,                                                     ,TIM1_CH3N                                  ,                        ,COMP4_OUT                               ,                    ,QUADSPI_BK1_IO0      ,                    ,LPUART1_RTS_DE              ,HRTIM1_SCOUT          ,                          ,EVENTOUT,ADC3_IN1/ADC1_IN12
+PortB,PB2 ,RTC_OUT2    ,LPTIM1_OUT            ,TIM5_CH1                         ,TIM20_CH1                                       ,I2C3_SMBA              ,                                                     ,                                           ,                        ,                                        ,                    ,QUADSPI_BK2_IO1      ,                    ,                            ,HRTIM1_SCIN           ,                          ,EVENTOUT,ADC2_IN12
 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,
@@ -26,17 +26,17 @@ PortB,PB6 ,            ,TIM16_CH1N            ,TIM4_CH1
 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,
-PortB,PB11,            ,TIM2_CH4              ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_RX               ,LPUART1_TX                              ,                    ,QUADSPI1_BK1_NCS      ,                    ,                            ,HRTIM1_FLT4           ,                          ,EVENTOUT,ADC12_IN14
+PortB,PB10,            ,TIM2_CH3              ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_TX               ,LPUART1_RX                              ,                    ,QUADSPI_CLK          ,                    ,TIM1_BKIN                   ,HRTIM1_FLT3           ,SAI1_SCK_A                ,EVENTOUT,
+PortB,PB11,            ,TIM2_CH4              ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_RX               ,LPUART1_TX                              ,                    ,QUADSPI_BK1_NCS      ,                    ,                            ,HRTIM1_FLT4           ,                          ,EVENTOUT,ADC12_IN14
 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
 PortB,PB13,            ,                      ,                                 ,                                                ,                       ,SPI2_SCK/I2S2_CK                                     ,TIM1_CH1N                                  ,USART3_CTS              ,LPUART1_CTS                             ,CAN2_TX             ,                      ,                    ,                            ,HRTIM1_CHC2           ,                          ,EVENTOUT,ADC3_IN5
 PortB,PB14,            ,TIM15_CH1             ,                                 ,                                                ,                       ,SPI2_MISO                                            ,TIM1_CH2N                                  ,USART3_RTS_DE           ,COMP4_OUT                               ,                    ,                      ,                    ,                            ,HRTIM1_CHD1           ,                          ,EVENTOUT,ADC4_IN4/ADC1_IN5
 PortB,PB15,RTC_REFIN   ,TIM15_CH2             ,TIM15_CH1N                       ,COMP3_OUT                                       ,TIM1_CH3N              ,SPI2_MOSI/I2S2_SD                                    ,                                           ,                        ,                                        ,                    ,                      ,                    ,                            ,HRTIM1_CHD2           ,                          ,EVENTOUT,ADC4_IN5/ADC2_IN15
 PortC,PC0 ,            ,LPTIM1_IN1            ,TIM1_CH1                         ,                                                ,                       ,                                                     ,                                           ,                        ,LPUART1_RX                              ,                    ,                      ,                    ,                            ,                      ,                          ,EVENTOUT,ADC12_IN6
-PortC,PC1 ,            ,LPTIM1_OUT            ,TIM1_CH2                         ,                                                ,                       ,                                                     ,                                           ,                        ,LPUART1_TX                              ,                    ,QUADSPI1_BK2_IO0      ,                    ,                            ,SAI1_SD_A             ,                          ,EVENTOUT,ADC12_IN7
-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
-PortC,PC4 ,            ,                      ,TIM1_ETR                         ,                                                ,I2C2_SCL               ,                                                     ,                                           ,USART1_TX               ,                                        ,                    ,QUADSPI1_BK2_IO3      ,                    ,                            ,                      ,                          ,EVENTOUT,ADC2_IN5
+PortC,PC1 ,            ,LPTIM1_OUT            ,TIM1_CH2                         ,                                                ,                       ,                                                     ,                                           ,                        ,LPUART1_TX                              ,                    ,QUADSPI_BK2_IO0      ,                    ,                            ,SAI1_SD_A             ,                          ,EVENTOUT,ADC12_IN7
+PortC,PC2 ,            ,LPTIM1_IN2            ,TIM1_CH3                         ,COMP3_OUT                                       ,                       ,                                                     ,TIM20_CH2                                  ,                        ,                                        ,                    ,QUADSPI_BK2_IO1      ,                    ,                            ,                      ,                          ,EVENTOUT,ADC12_IN8
+PortC,PC3 ,            ,LPTIM1_ETR            ,TIM1_CH4                         ,SAI1_D1                                         ,                       ,                                                     ,TIM1_BKIN2                                 ,                        ,                                        ,                    ,QUADSPI_BK2_IO2      ,                    ,                            ,SAI1_SD_A             ,                          ,EVENTOUT,ADC12_IN9
+PortC,PC4 ,            ,                      ,TIM1_ETR                         ,                                                ,I2C2_SCL               ,                                                     ,                                           ,USART1_TX               ,                                        ,                    ,QUADSPI_BK2_IO3      ,                    ,                            ,                      ,                          ,EVENTOUT,ADC2_IN5
 PortC,PC5 ,            ,                      ,TIM15_BKIN                       ,SAI1_D3                                         ,                       ,                                                     ,TIM1_CH4N                                  ,USART1_RX               ,                                        ,                    ,                      ,                    ,                            ,HRTIM1_EEV10          ,                          ,EVENTOUT,ADC2_IN11
 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,
@@ -51,11 +51,11 @@ PortC,PC15,            ,                      ,
 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,PD3 ,            ,                      ,TIM2_CH1/TIM2_ETR                ,                                                ,                       ,                                                     ,                                           ,USART2_CTS              ,                                        ,                    ,QUADSPI_BK2_NCS      ,                    ,FMC_CLK                     ,                      ,                          ,EVENTOUT,
+PortD,PD4 ,            ,                      ,TIM2_CH2                         ,                                                ,                       ,                                                     ,                                           ,USART2_RTS_DE           ,                                        ,                    ,QUADSPI_BK2_IO0      ,                    ,FMC_NOE                     ,                      ,                          ,EVENTOUT,
+PortD,PD5 ,            ,                      ,                                 ,                                                ,                       ,                                                     ,                                           ,USART2_TX               ,                                        ,                    ,QUADSPI_BK2_IO1      ,                    ,FMC_NWE                     ,                      ,                          ,EVENTOUT,
+PortD,PD6 ,            ,                      ,TIM2_CH4                         ,SAI1_D1                                         ,                       ,                                                     ,                                           ,USART2_RX               ,                                        ,                    ,QUADSPI_BK2_IO2      ,                    ,FMC_NWAIT                   ,SAI1_SD_A             ,                          ,EVENTOUT,
+PortD,PD7 ,            ,                      ,TIM2_CH3                         ,                                                ,                       ,                                                     ,                                           ,USART2_CK               ,                                        ,                    ,QUADSPI_BK2_IO3      ,                    ,FMC_NCE/FMC_NE1             ,                      ,                          ,EVENTOUT,
 PortD,PD8 ,            ,                      ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_TX               ,                                        ,                    ,                      ,                    ,FMC_D13                     ,                      ,                          ,EVENTOUT,ADC4_IN12/ADC5_IN12
 PortD,PD9 ,            ,                      ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_RX               ,                                        ,                    ,                      ,                    ,FMC_D14                     ,                      ,                          ,EVENTOUT,ADC4_IN13/ADC5_IN13
 PortD,PD10,            ,                      ,                                 ,                                                ,                       ,                                                     ,                                           ,USART3_CK               ,                                        ,                    ,                      ,                    ,FMC_D15                     ,                      ,                          ,EVENTOUT,ADC345_IN7
@@ -74,23 +74,23 @@ PortE,PE6 ,TRACED3     ,                      ,
 PortE,PE7 ,            ,                      ,TIM1_ETR                         ,                                                ,                       ,                                                     ,                                           ,                        ,                                        ,                    ,                      ,                    ,FMC_D4                      ,SAI1_SD_B             ,                          ,EVENTOUT,ADC3_IN4
 PortE,PE8 ,            ,TIM5_CH3              ,TIM1_CH1N                        ,                                                ,                       ,                                                     ,                                           ,                        ,                                        ,                    ,                      ,                    ,FMC_D5                      ,SAI1_SCK_B            ,                          ,EVENTOUT,ADC345_IN6
 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
+PortE,PE10,            ,                      ,TIM1_CH2N                        ,                                                ,                       ,                                                     ,                                           ,                        ,                                        ,                    ,QUADSPI_CLK          ,                    ,FMC_D7                      ,SAI1_MCLK_B           ,                          ,EVENTOUT,ADC345_IN14
+PortE,PE11,            ,                      ,TIM1_CH2                         ,                                                ,                       ,SPI4_NSS                                             ,                                           ,                        ,                                        ,                    ,QUADSPI_BK1_NCS      ,                    ,FMC_D8                      ,                      ,                          ,EVENTOUT,ADC345_IN15
+PortE,PE12,            ,                      ,TIM1_CH3N                        ,                                                ,                       ,SPI4_SCK                                             ,                                           ,                        ,                                        ,                    ,QUADSPI_BK1_IO0      ,                    ,FMC_D9                      ,                      ,                          ,EVENTOUT,ADC345_IN16
+PortE,PE13,            ,                      ,TIM1_CH3                         ,                                                ,                       ,SPI4_MISO                                            ,                                           ,                        ,                                        ,                    ,QUADSPI_BK1_IO1      ,                    ,FMC_D10                     ,                      ,                          ,EVENTOUT,ADC3_IN3
+PortE,PE14,            ,                      ,TIM1_CH4                         ,                                                ,                       ,SPI4_MOSI                                            ,TIM1_BKIN2                                 ,                        ,                                        ,                    ,QUADSPI_BK1_IO2      ,                    ,FMC_D11                     ,                      ,                          ,EVENTOUT,ADC4_IN1
+PortE,PE15,            ,                      ,TIM1_BKIN                        ,                                                ,                       ,                                                     ,TIM1_CH4N                                  ,USART3_RX               ,                                        ,                    ,QUADSPI_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
 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,PF6 ,            ,TIM5_ETR              ,TIM4_CH4                         ,SAI1_SD_B                                       ,I2C2_SCL               ,                                                     ,TIM5_CH1                                   ,USART3_RTS              ,                                        ,                    ,QUADSPI_BK1_IO3      ,                    ,                            ,                      ,                          ,EVENTOUT,
+PortF,PF7 ,            ,                      ,TIM20_BKIN                       ,                                                ,                       ,                                                     ,TIM5_CH2                                   ,                        ,                                        ,                    ,QUADSPI_BK1_IO2      ,                    ,FMC_A1                      ,SAI1_MCLK_B           ,                          ,EVENTOUT,
+PortF,PF8 ,            ,                      ,TIM20_BKIN2                      ,                                                ,                       ,                                                     ,TIM5_CH3                                   ,                        ,                                        ,                    ,QUADSPI_BK1_IO0      ,                    ,FMC_A24                     ,SAI1_SCK_B            ,                          ,EVENTOUT,
+PortF,PF9 ,            ,                      ,TIM20_BKIN                       ,TIM15_CH1                                       ,                       ,SPI2_SCK                                             ,TIM5_CH4                                   ,                        ,                                        ,                    ,QUADSPI_BK1_IO1      ,                    ,FMC_A25                     ,SAI1_FS_B             ,                          ,EVENTOUT,
+PortF,PF10,            ,                      ,TIM20_BKIN2                      ,TIM15_CH2                                       ,                       ,SPI2_SCK                                             ,                                           ,                        ,                                        ,                    ,QUADSPI_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,
diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index a87c04a58df5c..5756cb0560dde 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -28,7 +28,7 @@
 
 #include "irq.h"
 
-#if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
+#if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
 
 #define MPU_REGION_ETH      (MPU_REGION_NUMBER0)
 #define MPU_REGION_QSPI1    (MPU_REGION_NUMBER1)
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 781aae803ef21..2ef9a4d0187b0 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -213,11 +213,13 @@ static int qspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
             qspi_memory_map();
             break;
         case MP_QSPI_IOCTL_MEMORY_MODIFIED: {
+            #if defined(__ICACHE_PRESENT) && (__ICACHE_PRESENT == 1U)
             uintptr_t *addr_len = (uintptr_t *)arg;
             volatile void *addr = (volatile void *)(QSPI_MAP_ADDR + addr_len[0]);
             size_t len = addr_len[1];
             SCB_InvalidateICache_by_Addr(addr, len);
             SCB_InvalidateDCache_by_Addr(addr, len);
+            #endif
             break;
         }
     }

From 6bfb83e30aa28e7bbfb0f77f378da05b32574f3d Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Thu, 22 May 2025 10:40:48 -0600
Subject: [PATCH 2286/3129] rp2: Make FLASH LENGTH match PICO_FLASH_SIZE_BYTES
 in .ld files.

With a fallback to default sizes if `PICO_FLASH_SIZE_BYTES` is not defined.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.com>
---
 ports/rp2/CMakeLists.txt      | 14 ++++++++++++++
 ports/rp2/memmap_mp_rp2040.ld |  2 +-
 ports/rp2/memmap_mp_rp2350.ld |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index f0b278df2bb34..cf9f180792832 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -528,6 +528,20 @@ target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--wrap=runtime_init_clocks
 )
 
+if(PICO_FLASH_SIZE_BYTES GREATER 0)
+    target_link_options(${MICROPY_TARGET} PRIVATE
+        -Wl,--defsym=__micropy_flash_size__=${PICO_FLASH_SIZE_BYTES}
+    )
+elseif(PICO_RP2040)
+    target_link_options(${MICROPY_TARGET} PRIVATE
+        -Wl,--defsym=__micropy_flash_size__=2048k # Default to 2MB
+    )
+elseif(PICO_RP2350)
+    target_link_options(${MICROPY_TARGET} PRIVATE
+        -Wl,--defsym=__micropy_flash_size__=4096k # Default to 4MB
+    )
+endif()
+
 if(PICO_RP2350)
     target_link_options(${MICROPY_TARGET} PRIVATE
         -Wl,--defsym=__micropy_extra_stack__=4096
diff --git a/ports/rp2/memmap_mp_rp2040.ld b/ports/rp2/memmap_mp_rp2040.ld
index a5799cd88be0e..5c8d9f4718891 100644
--- a/ports/rp2/memmap_mp_rp2040.ld
+++ b/ports/rp2/memmap_mp_rp2040.ld
@@ -23,7 +23,7 @@
 
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 2048k
+    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __micropy_flash_size__
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k
diff --git a/ports/rp2/memmap_mp_rp2350.ld b/ports/rp2/memmap_mp_rp2350.ld
index 1e1cbbfd70296..1c4770efe1027 100644
--- a/ports/rp2/memmap_mp_rp2350.ld
+++ b/ports/rp2/memmap_mp_rp2350.ld
@@ -23,7 +23,7 @@
 
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 4096k
+    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __micropy_flash_size__
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 512k
     SCRATCH_X(rwx) : ORIGIN = 0x20080000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20081000, LENGTH = 4k

From bbdc832ca9719947124ebcd70da8d08b38cae24b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 26 Mar 2025 16:22:04 +0100
Subject: [PATCH 2287/3129] samd/boards: Add two SparkFun SAMD21 boards.

Add support for the boards:
- SparkFun SAMD21 Dev Breakout
- SparkFun RedBoard Turbo

Both boards are SAMD21 based and actively sold by SparkFun.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/samd/pinout.rst                          | 118 ++++++++++++++++++
 .../boards/SPARKFUN_REDBOARD_TURBO/board.json |  21 ++++
 .../SPARKFUN_REDBOARD_TURBO/mpconfigboard.h   |  11 ++
 .../SPARKFUN_REDBOARD_TURBO/mpconfigboard.mk  |   8 ++
 .../boards/SPARKFUN_REDBOARD_TURBO/pins.csv   |  47 +++++++
 .../SPARKFUN_SAMD21_DEV_BREAKOUT/board.json   |  19 +++
 .../mpconfigboard.h                           |   8 ++
 .../mpconfigboard.mk                          |   4 +
 .../SPARKFUN_SAMD21_DEV_BREAKOUT/pins.csv     |  45 +++++++
 9 files changed, 281 insertions(+)
 create mode 100644 ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json
 create mode 100644 ports/samd/boards/SPARKFUN_REDBOARD_TURBO/mpconfigboard.h
 create mode 100644 ports/samd/boards/SPARKFUN_REDBOARD_TURBO/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SPARKFUN_REDBOARD_TURBO/pins.csv
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.h
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/pins.csv

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 1ad8f55884060..5731a8fa7698e 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -650,6 +650,124 @@ Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
 
 The board does not provide access to UART, I2C, SPI or DAC.
 
+SparkFun Redboard Turbo 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
+  6 PA06           D8   6    6     -     0/2    1/0     -
+  7 PA07           D9   7    7     -     0/3    1/1     -
+ 11 PA11           RX  11   19    0/3    2/3    1/1    0/3
+ 10 PA10           TX  10   18    0/2    2/2    1/0    0/2
+  3 PA03         AREF   3    1     -      -      -      -
+ 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   FLASH_MISO   3   11     -     5/1    6/1     -
+ 54 PB22   FLASH_MOSI   6    -     -     5/2    7/0     -
+ 55 PB23    FLASH_SCK   7    -     -     5/3    7/1     -
+ 31 PA31       LED_RX  11    -     -     1/3    1/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
+ 30 PA30     NEOPIXEL  10    -     -     1/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     -
+ 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 PA11/PA10, labelled RX/TX
+- I2C 3 at pins PA22/PA23, labelled SDA/SCL
+- SPI 4 at pins PB10/PA12/PB11, labelled MISO, MOSI and SCK
+- DAC output on pin PA02, labelled A0
+
+
+SparkFun SAMD21 Dev Breakout 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
+  6 PA06           D8   6    6      -    0/2    1/0     -
+  7 PA07           D9   7    7      -    0/3    1/1     -
+ 11 PA11           RX  11   19     0/3   2/3    1/1    0/3
+ 10 PA10           TX  10   18     0/2   2/2    1/0    0/2
+  3 PA03         AREF   3    1      -     -      -      -
+ 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
+ 54 PB22          D30   6    -      -    5/2    7/0     -
+ 55 PB23          D31   7    -      -    5/3    7/1     -
+ 13 PA13          D38  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
+ 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     -
+ 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 PA11/PA10, labelled RX/TX
+- I2C 3 at pins PA22/PA23, labelled SDA/SCL
+- SPI 4 at pins PB10/PA12/PB11, labelled MISO, MOSI and SCK
+- DAC output on pin PA02, labelled A0
 
 SAMD21 Xplained PRO pin assignment table
 ----------------------------------------
diff --git a/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json
new file mode 100644
index 0000000000000..b7ccac725d4f5
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "DAC",
+        "External Flash",
+        "USB",
+        "RGB LED"
+    ],
+    "images": [
+        "sparkfun_readboard_turbo.jpg"
+    ],
+    "mcu": "samd21",
+    "product": "SparkFun RedBoard Turbo",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/14812",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/mpconfigboard.h b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/mpconfigboard.h
new file mode 100644
index 0000000000000..cd0ec51acce0c
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/mpconfigboard.h
@@ -0,0 +1,11 @@
+#define MICROPY_HW_BOARD_NAME "SparkFun RedBoard Turbo"
+#define MICROPY_HW_MCU_NAME   "SAMD21G18A"
+
+#define MICROPY_HW_XOSC32K     (1)
+
+#define MICROPY_HW_SPIFLASH    (1)
+#define MICROPY_HW_SPIFLASH_ID (5)
+
+#define MICROPY_HW_DEFAULT_UART_ID  (0)
+#define MICROPY_HW_DEFAULT_I2C_ID   (3)
+#define MICROPY_HW_DEFAULT_SPI_ID   (4)
diff --git a/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/mpconfigboard.mk b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/mpconfigboard.mk
new file mode 100644
index 0000000000000..6ea327a650d40
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/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_HW_CODESIZE ?= 232K
diff --git a/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/pins.csv b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/pins.csv
new file mode 100644
index 0000000000000..f065fc8917051
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/pins.csv
@@ -0,0 +1,47 @@
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
+
+USB_DM,PA24
+USB_DP,PA25
+
+SWCLK,PA30
+SWDIO,PA31
+
+D0,PA11
+D1,PA10
+D2,PA14
+D3,PA09
+D4,PA08
+D5,PA15
+D6,PA20
+D7,PA21
+D8,PA06
+D9,PA07
+D10,PA18
+D11,PA16
+D12,PA19
+D13,PA17
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PB02
+AREF,PA03
+RX,PA11
+TX,PA10
+SCL,PA23
+SDA,PA22
+MOSI,PB10
+MISO,PA12
+SCK,PB11
+FLASH_MOSI,PB22
+FLASH_MISO,PB03
+FLASH_SCK,PB23
+FLASH_CS,PA13
+NEOPIXEL,PA30
+
+LED_TX,PA27
+LED_RX,PA31
diff --git a/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json
new file mode 100644
index 0000000000000..b2e6553b2d2e1
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json
@@ -0,0 +1,19 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "DAC",
+        "USB"
+    ],
+    "images": [
+        "sparkfun_sam21_dev_breakout.jpg"
+    ],
+    "mcu": "samd21",
+    "product": "SparkFun SAMD21 Dev Breakout",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/13672",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.h b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.h
new file mode 100644
index 0000000000000..0679a9f4e4b97
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.h
@@ -0,0 +1,8 @@
+#define MICROPY_HW_BOARD_NAME "SparkFun SAMD21 Dev Breakout"
+#define MICROPY_HW_MCU_NAME   "SAMD21G18A"
+
+#define MICROPY_HW_XOSC32K          (1)
+
+#define MICROPY_HW_DEFAULT_UART_ID  (0)
+#define MICROPY_HW_DEFAULT_I2C_ID   (3)
+#define MICROPY_HW_DEFAULT_SPI_ID   (4)
diff --git a/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.mk b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.mk
new file mode 100644
index 0000000000000..8696c966bc321
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = SAMD21
+CMSIS_MCU = SAMD21G18A
+LD_FILES = boards/samd21x18a.ld sections.ld
+TEXT0 = 0x2000
diff --git a/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/pins.csv b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/pins.csv
new file mode 100644
index 0000000000000..794be318000cf
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/pins.csv
@@ -0,0 +1,45 @@
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
+
+USB_DM,PA24
+USB_DP,PA25
+
+SWCLK,PA30
+SWDIO,PA31
+
+D0,PA11
+D1,PA10
+D2,PA14
+D3,PA09
+D4,PA08
+D5,PA15
+D6,PA20
+D7,PA21
+D8,PA06
+D9,PA07
+D10,PA18
+D11,PA16
+D12,PA19
+D13,PA17
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PB02
+AREF,PA03
+RX,PA11
+TX,PA10
+SCL,PA23
+SDA,PA22
+MOSI,PB10
+MISO,PA12
+SCK,PB11
+D38,PA13
+D30,PB22
+D31,PB23
+
+LED_TX,PA27
+LED_RX,PB03

From 2f864416c6535cdf33a85ea0092e2415dc29dde3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 29 Dec 2024 21:32:44 +0100
Subject: [PATCH 2288/3129] docs/library/time: Amend the documentation of
 time.mktime().

By showing the argument and refer to epoch instead of a fixed date.  The
note about epoch lists the ports using the POSIX epoch.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/library/time.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/library/time.rst b/docs/library/time.rst
index 8c1c1d4d6fb23..b53bb133ec408 100644
--- a/docs/library/time.rst
+++ b/docs/library/time.rst
@@ -9,9 +9,10 @@
 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, some embedded ports use epoch of
-2000-01-01 00:00:00 UTC. Epoch year may be determined with ``gmtime(0)[0]``.
+**Time Epoch**: The unix, windows, webassembly, alif, mimxrt and rp2 ports
+use the standard for POSIX systems epoch of 1970-01-01 00:00:00 UTC.
+The other embedded ports use an 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
@@ -57,11 +58,11 @@ Functions
    * weekday is 0-6 for Mon-Sun
    * yearday is 1-366
 
-.. function:: mktime()
+.. function:: mktime(date_time_tuple)
 
    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.
+   the number of seconds since the time epoch.
 
 .. function:: sleep(seconds)
 

From 92c219afd6377b10579d7511242cbc747b79a026 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 12 Jan 2025 12:16:26 +0100
Subject: [PATCH 2289/3129] docs/esp32/quickref: Mention the different timer
 counts.

Since the are ESP32 variants with 1, 2 or 4 hardware timers.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/esp32/quickref.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 4e70ff255ec48..c7d4a098e5712 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -271,8 +271,10 @@ Use the :mod:`time <time>` module::
 Timers
 ------
 
-The ESP32 port has four hardware timers. Use the :ref:`machine.Timer <machine.Timer>` class
-with a timer ID from 0 to 3 (inclusive)::
+The ESP32 port has one, two or four hardware timers, depending on the ESP32 device type.
+There is 1 timer for ESP32C2, 2 timers for ESP32C4, ESP32C6 and ESP32H4, and
+4 timers otherwise. Use the :ref:`machine.Timer <machine.Timer>` class
+with a timer ID of 0, 0 and 1, or from 0 to 3 (inclusive)::
 
     from machine import Timer
 

From 5cfafb73dacb6df7ab9e8dc374e6f8a75a3fae77 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 31 Mar 2025 08:10:18 +0200
Subject: [PATCH 2290/3129] docs/esp32: Mention the use of Timer(0) by
 UART.IRQ_RXIDLE.

In both the machine.UART and esp32.quickref sections.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/esp32/quickref.rst       | 3 ++-
 docs/library/machine.UART.rst | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index c7d4a098e5712..63180b470aeb4 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -284,7 +284,8 @@ with a timer ID of 0, 0 and 1, or from 0 to 3 (inclusive)::
     tim1 = Timer(1)
     tim1.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(1))
 
-The period is in milliseconds.
+The period is in milliseconds. When using UART.IRQ_RXIDLE, timer 0 is needed for
+the IRQ_RXIDLE mechanism and must not be used otherwise.
 
 Virtual timers are not currently supported on this port.
 
diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 5be79cccce884..fbad3fc5922a9 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -224,7 +224,8 @@ Methods
 
 
    .. note::
-     - The ESP32 port does not support the option hard=True.
+     - The ESP32 port does not support the option hard=True. It uses Timer(0)
+       for UART.IRQ_RXIDLE, so this timer cannot be used for other means.
 
      - The rp2 port's UART.IRQ_TXIDLE is only triggered when the message
        is longer than 5 characters and the trigger happens when still 5 characters

From eccd23feb6ba32abca2a26978501a53ff4e25fe0 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 25 Jan 2025 09:50:20 +0100
Subject: [PATCH 2291/3129] py/asmxtensa: Replace printf messages with
 exceptions.

This commit removes old raw printf calls happening inside certain branch
opcode emitters, indicating the target label is out of range for the
opcode.  They have been replaced with a RuntimeError being raised in
these cases, using a parameterised qstr instead.

Whilst this technically breaks runtime behaviour expectations, the
generated code would not have worked anyway so it's better to catch
those cases early.  This should be updated to always emit long jumps
unless jumps are backwards and short enough, following the other ports,
but that's something coming later.

This is actually needed because there are test files that do not work
when processed through mpy-cross and entirely converted to native code.
The original implementation would still generate mostly-valid code that
was bound to crash on the device, whilst this change would prevent
invalid code to even be emitted in the first place.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 0fbe351dcf3c7..41bfcb54e33e0 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -38,6 +38,8 @@
 #define SIGNED_FIT8(x) ((((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80))
 #define SIGNED_FIT12(x) ((((x) & 0xfffff800) == 0) || (((x) & 0xfffff800) == 0xfffff800))
 
+#define ET_OUT_OF_RANGE MP_ERROR_TEXT("ERROR: xtensa %q out of range")
+
 void asm_xtensa_end_pass(asm_xtensa_t *as) {
     as->num_const = as->cur_const;
     as->cur_const = 0;
@@ -150,7 +152,7 @@ void asm_xtensa_bccz_reg_label(asm_xtensa_t *as, uint cond, uint reg, uint label
     uint32_t dest = get_label_dest(as, label);
     int32_t rel = dest - as->base.code_offset - 4;
     if (as->base.pass == MP_ASM_PASS_EMIT && !SIGNED_FIT12(rel)) {
-        printf("ERROR: xtensa bccz out of range\n");
+        mp_raise_msg_varg(&mp_type_RuntimeError, ET_OUT_OF_RANGE, MP_QSTR_bccz);
     }
     asm_xtensa_op_bccz(as, cond, reg, rel);
 }
@@ -159,7 +161,7 @@ void asm_xtensa_bcc_reg_reg_label(asm_xtensa_t *as, uint cond, uint reg1, uint r
     uint32_t dest = get_label_dest(as, label);
     int32_t rel = dest - as->base.code_offset - 4;
     if (as->base.pass == MP_ASM_PASS_EMIT && !SIGNED_FIT8(rel)) {
-        printf("ERROR: xtensa bcc out of range\n");
+        mp_raise_msg_varg(&mp_type_RuntimeError, ET_OUT_OF_RANGE, MP_QSTR_bcc);
     }
     asm_xtensa_op_bcc(as, cond, reg1, reg2, rel);
 }

From 555f1cf4885c65c9ff08e84f068fa175d3d8127d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 29 Jan 2025 16:39:22 +0100
Subject: [PATCH 2292/3129] py/asmxtensa: Make the generated code dumper work
 on mpy-cross.

This commit fixes compilation errors occurring when enabling the Xtensa
code dumper inside mpy-cross.

The original code was meant to dump the code from an Xtensa device
itself, but for debugging the inline assembler this functionality was
also needed off-line.  The changes involve solving a signed/unsigned
mismatch that was not much of a problem for the 8266's gcc version but
made modern compilers complain, and using the printf formatter for
pointers when it comes to printing code addresses.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 41bfcb54e33e0..11b61ad946783 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -49,9 +49,9 @@ void asm_xtensa_end_pass(asm_xtensa_t *as) {
     if (as->base.pass == MP_ASM_PASS_EMIT) {
         uint8_t *d = as->base.code_base;
         printf("XTENSA ASM:");
-        for (int i = 0; i < ((as->base.code_size + 15) & ~15); ++i) {
+        for (size_t i = 0; i < ((as->base.code_size + 15) & ~15); ++i) {
             if (i % 16 == 0) {
-                printf("\n%08x:", (uint32_t)&d[i]);
+                printf("\n%p:", &d[i]);
             }
             if (i % 2 == 0) {
                 printf(" ");

From 1006ed69f0ee8ea326a02ff05f45234c62d32d4e Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 25 Jan 2025 09:33:41 +0100
Subject: [PATCH 2293/3129] py/emitinlinextensa: Add the rest of LX3 opcodes to
 the assembler.

This commit expands the Xtensa inline assembler to support most if not
all opcodes available on the ESP8266 and LX3 Xtensa cores.

This is meant as a stepping stone to add inline assembler support for
the ESP32 and its LX6 core, along to windowed-specific opcodes and
additional opcodes that are present only on the LX7 core (ESP32-S3 and
later).

New opcodes being added are covered by tests, and the provided tests
were expanded to also include opcodes available in the existing
implementation.  Given that the ESP8266 space requirements are tighter
than ESP32's, certain opcodes that won't be commonly used have been put
behind a define to save some space in the general use case.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c                             |  45 ++++
 py/asmxtensa.h                             |   8 +-
 py/emitinlinextensa.c                      | 211 ++++++++++++++-
 py/mpconfig.h                              |   5 +
 tests/inlineasm/xtensa/asmargs.py          |  44 +++
 tests/inlineasm/xtensa/asmargs.py.exp      |   5 +
 tests/inlineasm/xtensa/asmarith.py         | 119 ++++++++
 tests/inlineasm/xtensa/asmarith.py.exp     |  40 +++
 tests/inlineasm/xtensa/asmbranch.py        | 299 +++++++++++++++++++++
 tests/inlineasm/xtensa/asmbranch.py.exp    |  66 +++++
 tests/inlineasm/xtensa/asmjump.py          |  26 ++
 tests/inlineasm/xtensa/asmjump.py.exp      |   2 +
 tests/inlineasm/xtensa/asmloadstore.py     |  98 +++++++
 tests/inlineasm/xtensa/asmloadstore.py.exp |   9 +
 tests/inlineasm/xtensa/asmmisc.py          |  25 ++
 tests/inlineasm/xtensa/asmmisc.py.exp      |   3 +
 tests/inlineasm/xtensa/asmshift.py         | 137 ++++++++++
 tests/inlineasm/xtensa/asmshift.py.exp     |  17 ++
 18 files changed, 1145 insertions(+), 14 deletions(-)
 create mode 100644 tests/inlineasm/xtensa/asmargs.py
 create mode 100644 tests/inlineasm/xtensa/asmargs.py.exp
 create mode 100644 tests/inlineasm/xtensa/asmarith.py
 create mode 100644 tests/inlineasm/xtensa/asmarith.py.exp
 create mode 100644 tests/inlineasm/xtensa/asmbranch.py
 create mode 100644 tests/inlineasm/xtensa/asmbranch.py.exp
 create mode 100644 tests/inlineasm/xtensa/asmjump.py
 create mode 100644 tests/inlineasm/xtensa/asmjump.py.exp
 create mode 100644 tests/inlineasm/xtensa/asmloadstore.py
 create mode 100644 tests/inlineasm/xtensa/asmloadstore.py.exp
 create mode 100644 tests/inlineasm/xtensa/asmmisc.py
 create mode 100644 tests/inlineasm/xtensa/asmmisc.py.exp
 create mode 100644 tests/inlineasm/xtensa/asmshift.py
 create mode 100644 tests/inlineasm/xtensa/asmshift.py.exp

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 11b61ad946783..0e612bfa7ecaa 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -37,8 +37,10 @@
 #define WORD_SIZE (4)
 #define SIGNED_FIT8(x) ((((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80))
 #define SIGNED_FIT12(x) ((((x) & 0xfffff800) == 0) || (((x) & 0xfffff800) == 0xfffff800))
+#define SIGNED_FIT18(x) ((((x) & 0xfffe0000) == 0) || (((x) & 0xfffe0000) == 0xfffe0000))
 
 #define ET_OUT_OF_RANGE MP_ERROR_TEXT("ERROR: xtensa %q out of range")
+#define ET_NOT_ALIGNED MP_ERROR_TEXT("ERROR: %q %q not word-aligned")
 
 void asm_xtensa_end_pass(asm_xtensa_t *as) {
     as->num_const = as->cur_const;
@@ -266,4 +268,47 @@ void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx) {
     asm_xtensa_op_callx8(as, ASM_XTENSA_REG_A8);
 }
 
+void asm_xtensa_bit_branch(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t bit, mp_uint_t label, mp_uint_t condition) {
+    uint32_t dest = get_label_dest(as, label);
+    int32_t rel = dest - as->base.code_offset - 4;
+    if (as->base.pass == MP_ASM_PASS_EMIT && !SIGNED_FIT8(rel)) {
+        mp_raise_msg_varg(&mp_type_RuntimeError, ET_OUT_OF_RANGE, MP_QSTR_bit_branch);
+    }
+    asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRI8(7, condition | ((bit >> 4) & 0x01), reg, bit & 0x0F, rel & 0xFF));
+}
+
+void asm_xtensa_call0(asm_xtensa_t *as, mp_uint_t label) {
+    uint32_t dest = get_label_dest(as, label);
+    int32_t rel = dest - as->base.code_offset - 3;
+    if (as->base.pass == MP_ASM_PASS_EMIT) {
+        if ((dest & 0x03) != 0) {
+            mp_raise_msg_varg(&mp_type_RuntimeError, ET_NOT_ALIGNED, MP_QSTR_call0, MP_QSTR_target);
+        }
+        if ((rel & 0x03) != 0) {
+            mp_raise_msg_varg(&mp_type_RuntimeError, ET_NOT_ALIGNED, MP_QSTR_call0, MP_QSTR_location);
+        }
+        if (!SIGNED_FIT18(rel)) {
+            mp_raise_msg_varg(&mp_type_RuntimeError, ET_OUT_OF_RANGE, MP_QSTR_call0);
+        }
+    }
+    asm_xtensa_op_call0(as, rel);
+}
+
+void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label) {
+    uint32_t dest = get_label_dest(as, label);
+    int32_t rel = dest - as->base.code_offset;
+    if (as->base.pass == MP_ASM_PASS_EMIT) {
+        if ((dest & 0x03) != 0) {
+            mp_raise_msg_varg(&mp_type_RuntimeError, ET_NOT_ALIGNED, MP_QSTR_l32r, MP_QSTR_target);
+        }
+        if ((rel & 0x03) != 0) {
+            mp_raise_msg_varg(&mp_type_RuntimeError, ET_NOT_ALIGNED, MP_QSTR_l32r, MP_QSTR_location);
+        }
+        if (!SIGNED_FIT18(rel) || (rel >= 0)) {
+            mp_raise_msg_varg(&mp_type_RuntimeError, ET_OUT_OF_RANGE, MP_QSTR_l32r);
+        }
+    }
+    asm_xtensa_op_l32r(as, reg, as->base.code_offset, dest);
+}
+
 #endif // MICROPY_EMIT_XTENSA || MICROPY_EMIT_INLINE_XTENSA || MICROPY_EMIT_XTENSAWIN
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 6451c75aa597e..d0fd2dcc18739 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -64,9 +64,11 @@
 #define ASM_XTENSA_REG_A14 (14)
 #define ASM_XTENSA_REG_A15 (15)
 
-// for bccz
+// for bccz and bcci
 #define ASM_XTENSA_CCZ_EQ (0)
 #define ASM_XTENSA_CCZ_NE (1)
+#define ASM_XTENSA_CCZ_LT (2)
+#define ASM_XTENSA_CCZ_GE (3)
 
 // for bcc and setcc
 #define ASM_XTENSA_CC_NONE  (0)
@@ -295,6 +297,10 @@ void asm_xtensa_l32i_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, u
 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);
+void asm_xtensa_bit_branch(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t bit, mp_uint_t label, mp_uint_t condition);
+void asm_xtensa_immediate_branch(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t immediate, mp_uint_t label, mp_uint_t cond);
+void asm_xtensa_call0(asm_xtensa_t *as, mp_uint_t label);
+void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 
 // Holds a pointer to mp_fun_table
 #define ASM_XTENSA_REG_FUN_TABLE ASM_XTENSA_REG_A15
diff --git a/py/emitinlinextensa.c b/py/emitinlinextensa.c
index fed259cfc6b20..d0eb3d566fce3 100644
--- a/py/emitinlinextensa.c
+++ b/py/emitinlinextensa.c
@@ -173,7 +173,7 @@ static int get_arg_label(emit_inline_asm_t *emit, const char *op, mp_parse_node_
 #define RRI8_B (2)
 
 typedef struct _opcode_table_3arg_t {
-    uint16_t name; // actually a qstr, which should fit in 16 bits
+    qstr_short_t name;
     uint8_t type;
     uint8_t a0 : 4;
     uint8_t a1 : 4;
@@ -187,6 +187,13 @@ static const opcode_table_3arg_t opcode_table_3arg[] = {
     {MP_QSTR_add, RRR, 0, 8},
     {MP_QSTR_sub, RRR, 0, 12},
     {MP_QSTR_mull, RRR, 2, 8},
+    {MP_QSTR_addx2, RRR, 0, 9},
+    {MP_QSTR_addx4, RRR, 0, 10},
+    {MP_QSTR_addx8, RRR, 0, 11},
+    {MP_QSTR_subx2, RRR, 0, 13},
+    {MP_QSTR_subx4, RRR, 0, 14},
+    {MP_QSTR_subx8, RRR, 0, 15},
+    {MP_QSTR_src, RRR, 1, 8},
 
     // load/store/addi opcodes: reg, reg, imm
     // upper nibble of type encodes the range of the immediate arg
@@ -208,21 +215,62 @@ static const opcode_table_3arg_t opcode_table_3arg[] = {
     {MP_QSTR_bge, RRI8_B, ASM_XTENSA_CC_GE, 0},
     {MP_QSTR_bgeu, RRI8_B, ASM_XTENSA_CC_GEU, 0},
     {MP_QSTR_blt, RRI8_B, ASM_XTENSA_CC_LT, 0},
+    {MP_QSTR_bltu, RRI8_B, ASM_XTENSA_CC_LTU, 0},
     {MP_QSTR_bnall, RRI8_B, ASM_XTENSA_CC_NALL, 0},
     {MP_QSTR_bne, RRI8_B, ASM_XTENSA_CC_NE, 0},
     {MP_QSTR_bnone, RRI8_B, ASM_XTENSA_CC_NONE, 0},
 };
 
+// The index of the first four qstrs matches the CCZ condition value to be
+// embedded into the opcode.
+static const qstr_short_t BCCZ_OPCODES[] = {
+    MP_QSTR_beqz, MP_QSTR_bnez, MP_QSTR_bltz, MP_QSTR_bgez,
+    MP_QSTR_beqz_n, MP_QSTR_bnez_n
+};
+
+#if MICROPY_EMIT_INLINE_XTENSA_UNCOMMON_OPCODES
+typedef struct _single_opcode_t {
+    qstr_short_t name;
+    uint16_t value;
+} single_opcode_t;
+
+static const single_opcode_t NOARGS_OPCODES[] = {
+    {MP_QSTR_dsync, 0x2030},
+    {MP_QSTR_esync, 0x2020},
+    {MP_QSTR_extw,  0x20D0},
+    {MP_QSTR_ill,   0x0000},
+    {MP_QSTR_isync, 0x2000},
+    {MP_QSTR_memw,  0x20C0},
+    {MP_QSTR_rsync, 0x2010},
+};
+#endif
+
 static void emit_inline_xtensa_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_args, mp_parse_node_t *pn_args) {
     size_t op_len;
     const char *op_str = (const char *)qstr_data(op, &op_len);
 
     if (n_args == 0) {
-        if (op == MP_QSTR_ret_n) {
+        if (op == MP_QSTR_ret_n || op == MP_QSTR_ret) {
             asm_xtensa_op_ret_n(&emit->as);
-        } else {
-            goto unknown_op;
+            return;
+        } else if (op == MP_QSTR_nop) {
+            asm_xtensa_op24(&emit->as, 0x20F0);
+            return;
+        } else if (op == MP_QSTR_nop_n) {
+            asm_xtensa_op16(&emit->as, 0xF03D);
+            return;
         }
+        #if MICROPY_EMIT_INLINE_XTENSA_UNCOMMON_OPCODES
+        for (size_t index = 0; index < MP_ARRAY_SIZE(NOARGS_OPCODES); index++) {
+            const single_opcode_t *opcode = &NOARGS_OPCODES[index];
+            if (op == opcode->name) {
+                asm_xtensa_op24(&emit->as, opcode->value);
+                return;
+            }
+        }
+        #endif
+
+        goto unknown_op;
 
     } else if (n_args == 1) {
         if (op == MP_QSTR_callx0) {
@@ -234,19 +282,45 @@ static void emit_inline_xtensa_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_
         } else if (op == MP_QSTR_jx) {
             uint r0 = get_arg_reg(emit, op_str, pn_args[0]);
             asm_xtensa_op_jx(&emit->as, r0);
+        } else if (op == MP_QSTR_ssl) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            asm_xtensa_op_ssl(&emit->as, r0);
+        } else if (op == MP_QSTR_ssr) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            asm_xtensa_op_ssr(&emit->as, r0);
+        } else if (op == MP_QSTR_ssai) {
+            mp_uint_t sa = get_arg_i(emit, op_str, pn_args[0], 0, 31);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 4, 4, sa & 0x0F, (sa >> 4) & 0x01));
+        } else if (op == MP_QSTR_ssa8b) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 4, 3, r0, 0));
+        } else if (op == MP_QSTR_ssa8l) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 4, 2, r0, 0));
+        } else if (op == MP_QSTR_call0) {
+            mp_uint_t label = get_arg_label(emit, op_str, pn_args[0]);
+            asm_xtensa_call0(&emit->as, label);
+        #if MICROPY_EMIT_INLINE_XTENSA_UNCOMMON_OPCODES
+        } else if (op == MP_QSTR_fsync) {
+            mp_uint_t imm3 = get_arg_i(emit, op_str, pn_args[0], 0, 7);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 0, 2, 8 | imm3, 0));
+        } else if (op == MP_QSTR_ill_n) {
+            asm_xtensa_op16(&emit->as, 0xF06D);
+        #endif
         } else {
             goto unknown_op;
         }
 
     } else if (n_args == 2) {
         uint r0 = get_arg_reg(emit, op_str, pn_args[0]);
-        if (op == MP_QSTR_beqz) {
-            int label = get_arg_label(emit, op_str, pn_args[1]);
-            asm_xtensa_bccz_reg_label(&emit->as, ASM_XTENSA_CCZ_EQ, r0, label);
-        } else if (op == MP_QSTR_bnez) {
-            int label = get_arg_label(emit, op_str, pn_args[1]);
-            asm_xtensa_bccz_reg_label(&emit->as, ASM_XTENSA_CCZ_NE, r0, label);
-        } else if (op == MP_QSTR_mov || op == MP_QSTR_mov_n) {
+        for (size_t index = 0; index < MP_ARRAY_SIZE(BCCZ_OPCODES); index++) {
+            if (op == BCCZ_OPCODES[index]) {
+                mp_uint_t label = get_arg_label(emit, op_str, pn_args[1]);
+                asm_xtensa_bccz_reg_label(&emit->as, index & 0x03, r0, label);
+                return;
+            }
+        }
+        if (op == MP_QSTR_mov || op == MP_QSTR_mov_n) {
             // we emit mov.n for both "mov" and "mov_n" opcodes
             uint r1 = get_arg_reg(emit, op_str, pn_args[1]);
             asm_xtensa_op_mov_n(&emit->as, r0, r1);
@@ -254,7 +328,53 @@ static void emit_inline_xtensa_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_
             // for convenience we emit l32r if the integer doesn't fit in movi
             uint32_t imm = get_arg_i(emit, op_str, pn_args[1], 0, 0);
             asm_xtensa_mov_reg_i32(&emit->as, r0, imm);
-        } else {
+        } else if (op == MP_QSTR_abs_) {
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 6, r0, 1, r1));
+        } else if (op == MP_QSTR_neg) {
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 6, r0, 0, r1));
+        } else if (op == MP_QSTR_sll) {
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 1, 10, r0, r1, 0));
+        } else if (op == MP_QSTR_sra) {
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 1, 11, r0, 0, r1));
+        } else if (op == MP_QSTR_srl) {
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 1, 9, r0, 0, r1));
+        } else if (op == MP_QSTR_nsa) {
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 4, 14, r1, r0));
+        } else if (op == MP_QSTR_nsau) {
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 0, 4, 15, r1, r0));
+        } else if (op == MP_QSTR_l32r) {
+            mp_uint_t label = get_arg_label(emit, op_str, pn_args[1]);
+            asm_xtensa_l32r(&emit->as, r0, label);
+        } else if (op == MP_QSTR_movi_n) {
+            mp_int_t imm = get_arg_i(emit, op_str, pn_args[1], -32, 95);
+            asm_xtensa_op_movi_n(&emit->as, r0, imm);
+        } else
+        #if MICROPY_EMIT_INLINE_XTENSA_UNCOMMON_OPCODES
+        if (op == MP_QSTR_rsr) {
+            mp_uint_t sr = get_arg_i(emit, op_str, pn_args[1], 0, 255);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RSR(0, 3, 0, sr, r0));
+        } else if (op == MP_QSTR_rur) {
+            mp_uint_t imm8 = get_arg_i(emit, op_str, pn_args[1], 0, 255);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 3, 14, r0, (imm8 >> 4) & 0x0F, imm8 & 0x0F));
+        } else if (op == MP_QSTR_wsr) {
+            mp_uint_t sr = get_arg_i(emit, op_str, pn_args[1], 0, 255);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RSR(0, 3, 1, sr, r0));
+        } else if (op == MP_QSTR_wur) {
+            mp_uint_t sr = get_arg_i(emit, op_str, pn_args[1], 0, 255);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RSR(0, 3, 15, sr, r0));
+        } else if (op == MP_QSTR_xsr) {
+            mp_uint_t sr = get_arg_i(emit, op_str, pn_args[1], 0, 255);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RSR(0, 1, 6, sr, r0));
+        } else
+        #endif
+        {
             goto unknown_op;
         }
 
@@ -288,7 +408,72 @@ static void emit_inline_xtensa_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_
                 return;
             }
         }
-        goto unknown_op;
+
+        if (op == MP_QSTR_add_n) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_uint_t r2 = get_arg_reg(emit, op_str, pn_args[2]);
+            asm_xtensa_op16(&emit->as, ASM_XTENSA_ENCODE_RRRN(10, r0, r1, r2));
+        } else if (op == MP_QSTR_addi_n) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_int_t imm4 = get_arg_i(emit, op_str, pn_args[2], -1, 15);
+            asm_xtensa_op16(&emit->as, ASM_XTENSA_ENCODE_RRRN(11, r0, r1, (imm4 != 0 ? imm4 : -1)));
+        } else if (op == MP_QSTR_addmi) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_int_t imm8 = get_arg_i(emit, op_str, pn_args[2], -128 * 256, 127 * 256);
+            if ((imm8 & 0xFF) != 0) {
+                emit_inline_xtensa_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, MP_ERROR_TEXT("%d is not a multiple of %d"), imm8, 256));
+            } else {
+                asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRI8(2, 13, r1, r0, imm8 >> 8));
+            }
+        } else if (op == MP_QSTR_bbci) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t bit = get_arg_i(emit, op_str, pn_args[1], 0, 31);
+            mp_int_t label = get_arg_label(emit, op_str, pn_args[2]);
+            asm_xtensa_bit_branch(&emit->as, r0, bit, label, 6);
+        } else if (op == MP_QSTR_bbsi) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t bit = get_arg_i(emit, op_str, pn_args[1], 0, 31);
+            mp_uint_t label = get_arg_label(emit, op_str, pn_args[2]);
+            asm_xtensa_bit_branch(&emit->as, r0, bit, label, 14);
+        } else if (op == MP_QSTR_slli) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_uint_t bits = 32 - get_arg_i(emit, op_str, pn_args[2], 1, 31);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 1, 0 | ((bits >> 4) & 0x01), r0, r1, bits & 0x0F));
+        } else if (op == MP_QSTR_srai) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_uint_t bits = get_arg_i(emit, op_str, pn_args[2], 0, 31);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 1, 2 | ((bits >> 4) & 0x01), r0, bits & 0x0F, r1));
+        } else if (op == MP_QSTR_srli) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_uint_t bits = get_arg_i(emit, op_str, pn_args[2], 0, 15);
+            asm_xtensa_op24(&emit->as, ASM_XTENSA_ENCODE_RRR(0, 1, 4, r0, bits, r1));
+        } else if (op == MP_QSTR_l32i_n) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_uint_t imm = get_arg_i(emit, op_str, pn_args[2], 0, 60);
+            if ((imm & 0x03) != 0) {
+                emit_inline_xtensa_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, MP_ERROR_TEXT("%d is not a multiple of %d"), imm, 4));
+            } else {
+                asm_xtensa_op_l32i_n(&emit->as, r0, r1, imm >> 2);
+            }
+        } else if (op == MP_QSTR_s32i_n) {
+            mp_uint_t r0 = get_arg_reg(emit, op_str, pn_args[0]);
+            mp_uint_t r1 = get_arg_reg(emit, op_str, pn_args[1]);
+            mp_uint_t imm = get_arg_i(emit, op_str, pn_args[2], 0, 60);
+            if ((imm & 0x03) != 0) {
+                emit_inline_xtensa_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, MP_ERROR_TEXT("%d is not a multiple of %d"), imm, 4));
+            } else {
+                asm_xtensa_op_s32i_n(&emit->as, r0, r1, imm >> 2);
+            }
+        } else {
+            goto unknown_op;
+        }
 
     } else {
         goto unknown_op;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 49a9fa35ccf02..01712bd5b4d90 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -406,6 +406,11 @@
 #define MICROPY_EMIT_INLINE_XTENSA (0)
 #endif
 
+// Whether to support uncommon Xtensa inline assembler opcodes
+#ifndef MICROPY_EMIT_INLINE_XTENSA_UNCOMMON_OPCODES
+#define MICROPY_EMIT_INLINE_XTENSA_UNCOMMON_OPCODES (0)
+#endif
+
 // Whether to emit Xtensa-Windowed native code
 #ifndef MICROPY_EMIT_XTENSAWIN
 #define MICROPY_EMIT_XTENSAWIN (0)
diff --git a/tests/inlineasm/xtensa/asmargs.py b/tests/inlineasm/xtensa/asmargs.py
new file mode 100644
index 0000000000000..2bfccfcc69bb2
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmargs.py
@@ -0,0 +1,44 @@
+# test passing arguments
+
+
+@micropython.asm_xtensa
+def arg0():
+    movi(a2, 1)
+
+
+print(arg0())
+
+
+@micropython.asm_xtensa
+def arg1(a2):
+    addi(a2, a2, 1)
+
+
+print(arg1(1))
+
+
+@micropython.asm_xtensa
+def arg2(a2, a3):
+    add(a2, a2, a3)
+
+
+print(arg2(1, 2))
+
+
+@micropython.asm_xtensa
+def arg3(a2, a3, a4):
+    add(a2, a2, a3)
+    add(a2, a2, a4)
+
+
+print(arg3(1, 2, 3))
+
+
+@micropython.asm_xtensa
+def arg4(a2, a3, a4, a5):
+    add(a2, a2, a3)
+    add(a2, a2, a4)
+    add(a2, a2, a5)
+
+
+print(arg4(1, 2, 3, 4))
diff --git a/tests/inlineasm/xtensa/asmargs.py.exp b/tests/inlineasm/xtensa/asmargs.py.exp
new file mode 100644
index 0000000000000..e33a6964f46e8
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmargs.py.exp
@@ -0,0 +1,5 @@
+1
+2
+3
+6
+10
diff --git a/tests/inlineasm/xtensa/asmarith.py b/tests/inlineasm/xtensa/asmarith.py
new file mode 100644
index 0000000000000..1c0934eb7a631
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmarith.py
@@ -0,0 +1,119 @@
+@micropython.asm_xtensa
+def f1(a2):
+    abs_(a2, a2)
+
+
+for value in (10, -10, 0):
+    print(f1(value))
+
+
+ADDMI_TEMPLATE = """
+@micropython.asm_xtensa
+def f1(a2) -> int:
+    addmi(a2, a2, {})
+print(f1(0))
+"""
+
+for value in (-32768, -32767, 32512, 32513, 0):
+    try:
+        exec(ADDMI_TEMPLATE.format(value))
+    except SyntaxError as error:
+        print(error)
+
+
+@micropython.asm_xtensa
+def a2(a2, a3) -> int:
+    addx2(a2, a2, a3)
+
+
+@micropython.asm_xtensa
+def a4(a2, a3) -> int:
+    addx4(a2, a2, a3)
+
+
+@micropython.asm_xtensa
+def a8(a2, a3) -> int:
+    addx8(a2, a2, a3)
+
+
+@micropython.asm_xtensa
+def s2(a2, a3) -> int:
+    subx2(a2, a2, a3)
+
+
+@micropython.asm_xtensa
+def s4(a2, a3) -> int:
+    subx4(a2, a2, a3)
+
+
+@micropython.asm_xtensa
+def s8(a2, a3) -> int:
+    subx8(a2, a2, a3)
+
+
+for first, second in ((100, 100), (-100, 100), (-100, -100), (100, -100)):
+    print("a2", a2(first, second))
+    print("a4", a4(first, second))
+    print("a8", a8(first, second))
+    print("s2", s2(first, second))
+    print("s4", s4(first, second))
+    print("s8", s8(first, second))
+
+
+@micropython.asm_xtensa
+def f5(a2) -> int:
+    neg(a2, a2)
+
+
+for value in (0, -100, 100):
+    print(f5(value))
+
+
+@micropython.asm_xtensa
+def f6():
+    movi(a2, 0x100)
+    movi(a3, 1)
+    add(a2, a2, a3)
+    addi(a2, a2, 1)
+    addi(a2, a2, -2)
+    sub(a2, a2, a3)
+
+
+print(hex(f6()))
+
+
+@micropython.asm_xtensa
+def f7():
+    movi(a2, 0x10FF)
+    movi(a3, 1)
+    and_(a4, a2, a3)
+    or_(a4, a4, a3)
+    movi(a3, 0x200)
+    xor(a2, a4, a3)
+
+
+print(hex(f7()))
+
+
+@micropython.asm_xtensa
+def f8(a2, a3):
+    add_n(a2, a2, a3)
+
+
+print(f8(100, 200))
+
+
+@micropython.asm_xtensa
+def f9(a2):
+    addi_n(a2, a2, 1)
+
+
+print(f9(100))
+
+
+@micropython.asm_xtensa
+def f10(a2, a3) -> uint:
+    mull(a2, a2, a3)
+
+
+print(hex(f10(0xC0000000, 2)))
diff --git a/tests/inlineasm/xtensa/asmarith.py.exp b/tests/inlineasm/xtensa/asmarith.py.exp
new file mode 100644
index 0000000000000..7aba46a27d9b5
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmarith.py.exp
@@ -0,0 +1,40 @@
+10
+10
+0
+-32768
+-32767 is not a multiple of 256
+32512
+'addmi' integer 32513 isn't within range -32768..32512
+0
+a2 300
+a4 500
+a8 900
+s2 100
+s4 300
+s8 700
+a2 -100
+a4 -300
+a8 -700
+s2 -300
+s4 -500
+s8 -900
+a2 -300
+a4 -500
+a8 -900
+s2 -100
+s4 -300
+s8 -700
+a2 100
+a4 300
+a8 700
+s2 300
+s4 500
+s8 900
+0
+100
+-100
+0xff
+0x201
+300
+101
+0x80000000
diff --git a/tests/inlineasm/xtensa/asmbranch.py b/tests/inlineasm/xtensa/asmbranch.py
new file mode 100644
index 0000000000000..22bcd5a7c71a3
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmbranch.py
@@ -0,0 +1,299 @@
+# test branch instructions
+
+
+@micropython.asm_xtensa
+def tball(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    ball(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tball(0xFFFFFFFF, 0xFFFFFFFF))
+print(tball(0xFFFEFFFF, 0xFFFFFFFF))
+print(tball(0x00000000, 0xFFFFFFFF))
+print(tball(0xFFFFFFFF, 0x01010101))
+
+
+@micropython.asm_xtensa
+def tbany(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bany(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbany(0xFFFFFFFF, 0xFFFFFFFF))
+print(tbany(0xFFFEFFFF, 0xFFFFFFFF))
+print(tbany(0x00000000, 0xFFFFFFFF))
+print(tbany(0xFFFFFFFF, 0x01010101))
+
+
+@micropython.asm_xtensa
+def tbbc(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bbc(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbbc(0xFFFFFFFF, 4))
+print(tbbc(0xFFFEFFFF, 16))
+print(tbbc(0x00000000, 1))
+
+
+BBCI_TEMPLATE = """
+@micropython.asm_xtensa
+def tbbci(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    bbci(a3, {}, end)
+    movi(a2, -1)
+    label(end)
+
+print(tbbci({}))
+"""
+
+
+for value, bit in ((0xFFFFFFFF, 4), (0xFFFEFFFF, 16), (0x00000000, 1)):
+    try:
+        exec(BBCI_TEMPLATE.format(bit, value))
+    except SyntaxError as error:
+        print(error)
+
+
+@micropython.asm_xtensa
+def tbbs(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bbs(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbbs(0x00000000, 4))
+print(tbbs(0x00010000, 16))
+print(tbbs(0xFFFFFFFF, 1))
+
+
+BBSI_TEMPLATE = """
+@micropython.asm_xtensa
+def tbbsi(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    bbsi(a3, {}, end)
+    movi(a2, -1)
+    label(end)
+
+print(tbbsi({}))
+"""
+
+
+for value, bit in ((0x00000000, 4), (0x00010000, 16), (0xFFFFFFFF, 1)):
+    try:
+        exec(BBSI_TEMPLATE.format(bit, value))
+    except SyntaxError as error:
+        print(error)
+
+
+@micropython.asm_xtensa
+def tbeq(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    beq(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbeq(0x00000000, 0x00000000))
+print(tbeq(0x00010000, 0x00000000))
+print(tbeq(0xFFFFFFFF, 0xFFFFFFFF))
+
+
+@micropython.asm_xtensa
+def tbeqz(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    beqz(a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbeqz(0))
+print(tbeqz(0x12345678))
+print(tbeqz(-1))
+
+
+@micropython.asm_xtensa
+def tbge(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bge(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbge(0x00000000, 0x00000000))
+print(tbge(0x00010000, 0x00000000))
+print(tbge(0xF0000000, 0xFFFFFFFF))
+
+
+@micropython.asm_xtensa
+def tbgeu(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bgeu(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbgeu(0x00000000, 0x00000000))
+print(tbgeu(0x00010000, 0x00000000))
+print(tbgeu(0xF0000000, 0xFFFFFFFF))
+print(tbgeu(0xFFFFFFFF, 0xF0000000))
+
+
+@micropython.asm_xtensa
+def tbgez(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    bgez(a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbgez(0))
+print(tbgez(0x12345678))
+print(tbgez(-1))
+
+
+@micropython.asm_xtensa
+def tblt(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    blt(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tblt(0x00000000, 0x00000000))
+print(tblt(0x00010000, 0x00000000))
+print(tblt(0xF0000000, 0xFFFFFFFF))
+
+
+@micropython.asm_xtensa
+def tbltu(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bltu(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbltu(0x00000000, 0x00000000))
+print(tbltu(0x00010000, 0x00000000))
+print(tbltu(0xF0000000, 0xFFFFFFFF))
+print(tbltu(0xFFFFFFFF, 0xF0000000))
+
+
+@micropython.asm_xtensa
+def tbltz(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    bltz(a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbltz(0))
+print(tbltz(0x12345678))
+print(tbltz(-1))
+
+
+@micropython.asm_xtensa
+def tbnall(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bnall(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbnall(0xFFFFFFFF, 0xFFFFFFFF))
+print(tbnall(0xFFFEFFFF, 0xFFFFFFFF))
+print(tbnall(0x00000000, 0xFFFFFFFF))
+print(tbnall(0xFFFFFFFF, 0x01010101))
+
+
+@micropython.asm_xtensa
+def tbne(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bne(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbne(0x00000000, 0x00000000))
+print(tbne(0x00010000, 0x00000000))
+print(tbne(0xFFFFFFFF, 0xFFFFFFFF))
+
+
+@micropython.asm_xtensa
+def tbnez(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    bnez(a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbnez(0))
+print(tbnez(0x12345678))
+print(tbnez(-1))
+
+
+@micropython.asm_xtensa
+def tbnone(a2, a3) -> int:
+    mov(a4, a2)
+    movi(a2, 0)
+    bnone(a4, a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbnone(0xFFFFFFFF, 0xFFFFFFFF))
+print(tbnone(0xFFFEFFFF, 0xFFFFFFFF))
+print(tbnone(0x00000000, 0xFFFFFFFF))
+print(tbnone(0x10101010, 0x01010101))
+
+
+@micropython.asm_xtensa
+def tbeqz_n(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    beqz_n(a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbeqz_n(0))
+print(tbeqz_n(0x12345678))
+print(tbeqz_n(-1))
+
+
+@micropython.asm_xtensa
+def tbnez_n(a2) -> int:
+    mov(a3, a2)
+    movi(a2, 0)
+    bnez(a3, end)
+    movi(a2, -1)
+    label(end)
+
+
+print(tbnez_n(0))
+print(tbnez_n(0x12345678))
+print(tbnez_n(-1))
diff --git a/tests/inlineasm/xtensa/asmbranch.py.exp b/tests/inlineasm/xtensa/asmbranch.py.exp
new file mode 100644
index 0000000000000..319a4b435ef2f
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmbranch.py.exp
@@ -0,0 +1,66 @@
+0
+-1
+-1
+0
+0
+0
+-1
+0
+-1
+0
+0
+-1
+0
+0
+-1
+0
+0
+-1
+0
+0
+0
+-1
+0
+0
+-1
+-1
+0
+0
+-1
+0
+0
+-1
+0
+0
+0
+-1
+-1
+-1
+0
+-1
+-1
+0
+-1
+-1
+-1
+0
+-1
+0
+0
+-1
+-1
+0
+-1
+-1
+0
+0
+-1
+-1
+0
+0
+0
+-1
+-1
+-1
+0
+0
diff --git a/tests/inlineasm/xtensa/asmjump.py b/tests/inlineasm/xtensa/asmjump.py
new file mode 100644
index 0000000000000..f41c9482319da
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmjump.py
@@ -0,0 +1,26 @@
+@micropython.asm_xtensa
+def jump() -> int:
+    movi(a2, 0)
+    j(NEXT)
+    addi(a2, a2, 1)
+    j(DONE)
+    label(NEXT)
+    addi(a2, a2, 2)
+    label(DONE)
+
+
+print(jump())
+
+
+@micropython.asm_xtensa
+def jumpx() -> int:
+    call0(ENTRY)
+    label(ENTRY)
+    movi(a2, 0)
+    addi(a3, a0, 12)
+    jx(a3)
+    movi(a2, 1)
+    movi(a2, 2)
+
+
+print(jumpx())
diff --git a/tests/inlineasm/xtensa/asmjump.py.exp b/tests/inlineasm/xtensa/asmjump.py.exp
new file mode 100644
index 0000000000000..51993f072d583
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmjump.py.exp
@@ -0,0 +1,2 @@
+2
+2
diff --git a/tests/inlineasm/xtensa/asmloadstore.py b/tests/inlineasm/xtensa/asmloadstore.py
new file mode 100644
index 0000000000000..b185e30520cc9
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmloadstore.py
@@ -0,0 +1,98 @@
+import array
+
+# On the 8266 the generated code gets put into the IRAM segment, which is only
+# word-addressable.  Therefore, to test byte and halfword load/store opcodes
+# some memory must be reserved in the DRAM segment.
+
+BYTE_DATA = array.array("B", (0x11, 0x22, 0x33, 0x44))
+WORD_DATA = array.array("h", (100, 200, -100, -200))
+DWORD_DATA = array.array("i", (100_000, -200_000, 300_000, -400_000))
+
+
+@micropython.asm_xtensa
+def tl32r() -> int:
+    nop()
+    j(CODE)
+    align(4)
+    label(DATA)
+    data(1, 1, 2, 3, 4, 5, 6, 7)
+    align(4)
+    label(CODE)
+    nop_n()
+    nop_n()
+    l32r(a2, DATA)
+
+
+print(hex(tl32r()))
+
+
+@micropython.asm_xtensa
+def tl32i() -> uint:
+    call0(ENTRY)
+    label(ENTRY)
+    l32i(a2, a0, 0)
+
+
+print(hex(tl32i()))
+
+
+@micropython.asm_xtensa
+def tl8ui(a2) -> uint:
+    mov(a3, a2)
+    l8ui(a2, a3, 1)
+
+
+print(hex(tl8ui(BYTE_DATA)))
+
+
+@micropython.asm_xtensa
+def tl16ui(a2) -> uint:
+    mov(a3, a2)
+    l16ui(a2, a3, 2)
+
+
+print(tl16ui(WORD_DATA))
+
+
+@micropython.asm_xtensa
+def tl16si(a2) -> int:
+    mov(a3, a2)
+    l16si(a2, a3, 6)
+
+
+print(tl16si(WORD_DATA))
+
+
+@micropython.asm_xtensa
+def ts8i(a2, a3):
+    s8i(a3, a2, 1)
+
+
+ts8i(BYTE_DATA, 0xFF)
+print(BYTE_DATA)
+
+
+@micropython.asm_xtensa
+def ts16i(a2, a3):
+    s16i(a3, a2, 2)
+
+
+ts16i(WORD_DATA, -123)
+print(WORD_DATA)
+
+
+@micropython.asm_xtensa
+def ts32i(a2, a3) -> uint:
+    s32i(a3, a2, 4)
+
+
+ts32i(DWORD_DATA, -123456)
+print(DWORD_DATA)
+
+
+@micropython.asm_xtensa
+def tl32i_n(a2) -> uint:
+    l32i_n(a2, a2, 8)
+
+
+print(tl32i_n(DWORD_DATA))
diff --git a/tests/inlineasm/xtensa/asmloadstore.py.exp b/tests/inlineasm/xtensa/asmloadstore.py.exp
new file mode 100644
index 0000000000000..e6672df6f8132
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmloadstore.py.exp
@@ -0,0 +1,9 @@
+0x4030201
+0xf8002022
+0x22
+200
+-200
+array('B', [17, 255, 51, 68])
+array('h', [100, -123, -100, -200])
+array('i', [100000, -123456, 300000, -400000])
+300000
diff --git a/tests/inlineasm/xtensa/asmmisc.py b/tests/inlineasm/xtensa/asmmisc.py
new file mode 100644
index 0000000000000..271ab836625dc
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmmisc.py
@@ -0,0 +1,25 @@
+@micropython.asm_xtensa
+def tnop(a2, a3, a4, a5):
+    nop()
+
+
+out2 = tnop(0x100, 0x200, 0x300, 0x400)
+print(out2 == 0x100)
+
+
+@micropython.asm_xtensa
+def tnop_n(a2, a3, a4, a5):
+    nop_n()
+
+
+out2 = tnop_n(0x100, 0x200, 0x300, 0x400)
+print(out2 == 0x100)
+
+
+@micropython.asm_xtensa
+def tmov_n(a2, a3):
+    mov_n(a4, a3)
+    add(a2, a4, a3)
+
+
+print(tmov_n(0, 1))
diff --git a/tests/inlineasm/xtensa/asmmisc.py.exp b/tests/inlineasm/xtensa/asmmisc.py.exp
new file mode 100644
index 0000000000000..eefaa35daf0f1
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmmisc.py.exp
@@ -0,0 +1,3 @@
+True
+True
+2
diff --git a/tests/inlineasm/xtensa/asmshift.py b/tests/inlineasm/xtensa/asmshift.py
new file mode 100644
index 0000000000000..271ca1ccd494c
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmshift.py
@@ -0,0 +1,137 @@
+@micropython.asm_xtensa
+def lsl1(a2):
+    slli(a2, a2, 1)
+
+
+print(hex(lsl1(0x123)))
+
+
+@micropython.asm_xtensa
+def lsl23(a2):
+    slli(a2, a2, 23)
+
+
+print(hex(lsl23(1)))
+
+
+@micropython.asm_xtensa
+def lsr1(a2):
+    srli(a2, a2, 1)
+
+
+print(hex(lsr1(0x123)))
+
+
+@micropython.asm_xtensa
+def lsr15(a2):
+    srli(a2, a2, 15)
+
+
+print(hex(lsr15(0x80000000)))
+
+
+@micropython.asm_xtensa
+def asr1(a2):
+    srai(a2, a2, 1)
+
+
+print(hex(asr1(0x123)))
+
+
+@micropython.asm_xtensa
+def asr31(a2):
+    srai(a2, a2, 31)
+
+
+print(hex(asr31(0x80000000)))
+
+
+@micropython.asm_xtensa
+def lsl1r(a2):
+    movi(a3, 1)
+    ssl(a3)
+    sll(a2, a2)
+
+
+print(hex(lsl1r(0x123)))
+
+
+@micropython.asm_xtensa
+def lsr1r(a2):
+    movi(a3, 1)
+    ssr(a3)
+    srl(a2, a2)
+
+
+print(hex(lsr1r(0x123)))
+
+
+@micropython.asm_xtensa
+def asr1r(a2):
+    movi(a3, 1)
+    ssr(a3)
+    sra(a2, a2)
+
+
+print(hex(asr1r(0x123)))
+
+
+@micropython.asm_xtensa
+def sll9(a2):
+    ssai(9)
+    sll(a2, a2)
+
+
+print(hex(sll9(1)))
+
+
+@micropython.asm_xtensa
+def srlr(a2, a3):
+    ssa8l(a3)
+    srl(a2, a2)
+
+
+print(hex(srlr(0x12340000, 2)))
+
+
+@micropython.asm_xtensa
+def sllr(a2, a3):
+    ssa8b(a3)
+    sll(a2, a2)
+
+
+print(hex(sllr(0x1234, 2)))
+
+
+@micropython.asm_xtensa
+def srcr(a2, a3, a4):
+    ssr(a4)
+    src(a2, a2, a3)
+
+
+print(hex(srcr(0x00000001, 0x80000000, 2)))
+
+
+@micropython.asm_xtensa
+def srai24(a2):
+    srai(a2, a2, 24)
+
+
+print(hex(srai24(0x12345678)))
+
+
+@micropython.asm_xtensa
+def nsar(a2, a3):
+    nsa(a2, a3)
+
+
+print(nsar(0x12345678, 0))
+print(nsar(0x12345678, -1))
+
+
+@micropython.asm_xtensa
+def nsaur(a2, a3):
+    nsau(a2, a3)
+
+
+print(nsaur(0x12345678, 0))
diff --git a/tests/inlineasm/xtensa/asmshift.py.exp b/tests/inlineasm/xtensa/asmshift.py.exp
new file mode 100644
index 0000000000000..3e2bb3b4aefa9
--- /dev/null
+++ b/tests/inlineasm/xtensa/asmshift.py.exp
@@ -0,0 +1,17 @@
+0x246
+0x800000
+0x91
+0x10000
+0x91
+-0x1
+0x246
+0x91
+0x91
+0x800000
+0x1234
+0x12340000
+0x60000000
+0x12
+31
+31
+32

From f5d10c322ecacc6be208388fa93adba5bee6eb0c Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 4 Mar 2025 00:55:25 +0100
Subject: [PATCH 2294/3129] py/asmxtensa: Emit prologue jump only when
 constants table is in use.

This commit simplifies native functions' prologue code by not emitting a
jump opcode that goes over the function's constants pool if the pool is
empty.

The original code assumed the constants pool is never empty as large
32-bits constants are commonly used, but for inline assembler functions
that may not be the case.  This meant that inline assembler functions
may start with an unneeded jump (along with its alignment byte), using
four bytes more than necessary.

This commit is limited to the "xtensa" target, as "xtensawin" doesn't
support inline assembler functions yet, so native functions' constant
pools are almost always guaranteed to hold one or more values.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 0e612bfa7ecaa..ab2e7aeaeb6bb 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -66,10 +66,12 @@ void asm_xtensa_end_pass(asm_xtensa_t *as) {
 }
 
 void asm_xtensa_entry(asm_xtensa_t *as, int num_locals) {
-    // jump over the constants
-    asm_xtensa_op_j(as, as->num_const * WORD_SIZE + 4 - 4);
-    mp_asm_base_get_cur_to_write_bytes(&as->base, 1); // padding/alignment byte
-    as->const_table = (uint32_t *)mp_asm_base_get_cur_to_write_bytes(&as->base, as->num_const * 4);
+    if (as->num_const > 0) {
+        // jump over the constants
+        asm_xtensa_op_j(as, as->num_const * WORD_SIZE + 4 - 4);
+        mp_asm_base_get_cur_to_write_bytes(&as->base, 1); // padding/alignment byte
+        as->const_table = (uint32_t *)mp_asm_base_get_cur_to_write_bytes(&as->base, as->num_const * 4);
+    }
 
     // adjust the stack-pointer to store a0, a12, a13, a14, a15 and locals, 16-byte aligned
     as->stack_adjust = (((ASM_XTENSA_NUM_REGS_SAVED + num_locals) * WORD_SIZE) + 15) & ~15;
@@ -183,6 +185,8 @@ size_t asm_xtensa_mov_reg_i32(asm_xtensa_t *as, uint reg_dest, uint32_t i32) {
     // store the constant in the table
     if (as->const_table != NULL) {
         as->const_table[as->cur_const] = i32;
+    } else {
+        assert((as->base.pass != MP_ASM_PASS_EMIT) && "Constants table was not built.");
     }
     ++as->cur_const;
     return loc;

From aaedd59b7ce68ac0b445960584fc58f657c835ad Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 May 2025 16:48:38 +1000
Subject: [PATCH 2295/3129] tools/pyboard.py: Avoid initial blocking read in
 read_until().

This applies the mpremote commit 0d46e45a1f72ee61a153c41aaaf6c63818ccffb0
to pyboard.py.

If the target does not return any data then `read_until()` will block
indefinitely.  Fix this by making the initial read part of the general read
look, which always checks `inWaiting() > 0` before reading from the serial
device.

Also added the UART timeout to the constructor.  This is not currently used
but may be used as an additional safeguard.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index d49365f617efd..950a6568fb347 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -267,7 +267,14 @@ def inWaiting(self):
 
 class Pyboard:
     def __init__(
-        self, device, baudrate=115200, user="micro", password="python", wait=0, exclusive=True
+        self,
+        device,
+        baudrate=115200,
+        user="micro",
+        password="python",
+        wait=0,
+        exclusive=True,
+        timeout=None,
     ):
         self.in_raw_repl = False
         self.use_raw_paste = True
@@ -283,7 +290,11 @@ def __init__(
             import serial.tools.list_ports
 
             # Set options, and exclusive if pyserial supports it
-            serial_kwargs = {"baudrate": baudrate, "interCharTimeout": 1}
+            serial_kwargs = {
+                "baudrate": baudrate,
+                "timeout": timeout,
+                "interCharTimeout": 1,
+            }
             if serial.__version__ >= "3.3":
                 serial_kwargs["exclusive"] = exclusive
 
@@ -324,13 +335,20 @@ def close(self):
         self.serial.close()
 
     def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
-        # if data_consumer is used then data is not accumulated and the ending must be 1 byte long
+        """
+        min_num_bytes: Obsolete.
+        ending: Return if 'ending' matches.
+        timeout [s]: Return if timeout between characters. None: Infinite timeout.
+        data_consumer: Use callback for incoming characters.
+            If data_consumer is used then data is not accumulated and the ending must be 1 byte long
+
+        It is not visible to the caller why the function returned. It could be ending or timeout.
+        """
         assert data_consumer is None or len(ending) == 1
+        assert isinstance(timeout, (type(None), int, float))
 
-        data = self.serial.read(min_num_bytes)
-        if data_consumer:
-            data_consumer(data)
-        timeout_count = 0
+        data = b""
+        begin_char_s = time.monotonic()
         while True:
             if data.endswith(ending):
                 break
@@ -341,10 +359,9 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
                     data = new_data
                 else:
                     data = data + new_data
-                timeout_count = 0
+                begin_char_s = time.monotonic()
             else:
-                timeout_count += 1
-                if timeout is not None and timeout_count >= 100 * timeout:
+                if timeout is not None and time.monotonic() >= begin_char_s + timeout:
                     break
                 time.sleep(0.01)
         return data

From b1c947ab45937e262cfef99295a91202b8bb3a55 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 May 2025 16:53:00 +1000
Subject: [PATCH 2296/3129] tools/pyboard.py: Introduce timeout_overall for
 read_until().

This applies the mpremote commit 03fe9c55ea8a3ef8bede5547476f37d7fca20119
to pyboard.py.

The `timeout_overall` is used in `enter_raw_repl()`.  It prevents waiting
forever for a serial device that does not respond to the Ctrl-C/Ctrl-D/etc
commands and is constantly outputting data.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 950a6568fb347..a177106ad62e6 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -334,11 +334,14 @@ def __init__(
     def close(self):
         self.serial.close()
 
-    def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
+    def read_until(
+        self, min_num_bytes, ending, timeout=10, data_consumer=None, timeout_overall=None
+    ):
         """
         min_num_bytes: Obsolete.
         ending: Return if 'ending' matches.
         timeout [s]: Return if timeout between characters. None: Infinite timeout.
+        timeout_overall [s]: Return not later than timeout_overall. None: Infinite timeout.
         data_consumer: Use callback for incoming characters.
             If data_consumer is used then data is not accumulated and the ending must be 1 byte long
 
@@ -346,9 +349,10 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
         """
         assert data_consumer is None or len(ending) == 1
         assert isinstance(timeout, (type(None), int, float))
+        assert isinstance(timeout_overall, (type(None), int, float))
 
         data = b""
-        begin_char_s = time.monotonic()
+        begin_overall_s = begin_char_s = time.monotonic()
         while True:
             if data.endswith(ending):
                 break
@@ -363,10 +367,15 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
             else:
                 if timeout is not None and time.monotonic() >= begin_char_s + timeout:
                     break
+                if (
+                    timeout_overall is not None
+                    and time.monotonic() >= begin_overall_s + timeout_overall
+                ):
+                    break
                 time.sleep(0.01)
         return data
 
-    def enter_raw_repl(self, soft_reset=True):
+    def enter_raw_repl(self, soft_reset=True, timeout_overall=10):
         self.serial.write(b"\r\x03")  # ctrl-C: interrupt any running program
 
         # flush input (without relying on serial.flushInput())
@@ -378,7 +387,9 @@ def enter_raw_repl(self, soft_reset=True):
         self.serial.write(b"\r\x01")  # ctrl-A: enter raw REPL
 
         if soft_reset:
-            data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
+            data = self.read_until(
+                1, b"raw REPL; CTRL-B to exit\r\n>", timeout_overall=timeout_overall
+            )
             if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
                 print(data)
                 raise PyboardError("could not enter raw repl")
@@ -388,12 +399,12 @@ def enter_raw_repl(self, soft_reset=True):
             # 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")
+            data = self.read_until(1, b"soft reboot\r\n", timeout_overall=timeout_overall)
             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")
+        data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n", timeout_overall=timeout_overall)
         if not data.endswith(b"raw REPL; CTRL-B to exit\r\n"):
             print(data)
             raise PyboardError("could not enter raw repl")

From dea3035b88a82b48f98b9951f3d2ad6500e4c9a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 May 2025 13:10:12 +1000
Subject: [PATCH 2297/3129] tools/pyboard.py: Add write_timeout and catch
 errors in enter_raw_repl.

If the USB serial device locks up, then writes to that device can hang
forever.  That can make the test runner `tests/run-tests.py` lock up, among
other problems.

This commit introduces a 5 second write-timeout, and catches any OSError's
raised during `enter_raw_repl()`.  Now, if a USB serial device locks up,
`enter_raw_repl()` will eventually raise an exception.

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

diff --git a/tools/pyboard.py b/tools/pyboard.py
index a177106ad62e6..40928e8bbbe93 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -275,6 +275,7 @@ def __init__(
         wait=0,
         exclusive=True,
         timeout=None,
+        write_timeout=5,
     ):
         self.in_raw_repl = False
         self.use_raw_paste = True
@@ -293,6 +294,7 @@ def __init__(
             serial_kwargs = {
                 "baudrate": baudrate,
                 "timeout": timeout,
+                "write_timeout": write_timeout,
                 "interCharTimeout": 1,
             }
             if serial.__version__ >= "3.3":
@@ -376,6 +378,12 @@ def read_until(
         return data
 
     def enter_raw_repl(self, soft_reset=True, timeout_overall=10):
+        try:
+            self._enter_raw_repl_unprotected(soft_reset, timeout_overall)
+        except OSError as er:
+            raise PyboardError("could not enter raw repl: {}".format(er))
+
+    def _enter_raw_repl_unprotected(self, soft_reset, timeout_overall):
         self.serial.write(b"\r\x03")  # ctrl-C: interrupt any running program
 
         # flush input (without relying on serial.flushInput())

From c0111e63b3bacaece5249399e2a563012afa4baa Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 14 May 2025 21:28:56 +1000
Subject: [PATCH 2298/3129] lib/libhydrogen: Update to latest release.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 lib/libhydrogen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libhydrogen b/lib/libhydrogen
index 5c5d513093075..bbca575b62510 160000
--- a/lib/libhydrogen
+++ b/lib/libhydrogen
@@ -1 +1 @@
-Subproject commit 5c5d513093075f7245ea522101b17c50aa579af2
+Subproject commit bbca575b62510bfdc6dd927a4bfa7df4a51cb846

From 4dff9cbf1aa6681eea146cf8900d00cf2d93bb0f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 May 2025 10:21:46 +1000
Subject: [PATCH 2299/3129] tests/run-tests.py: Change _results.json to have a
 combined result list.

The `_results.json` output of `run-tests.py` was recently changed in
7a55cb6b364fdbc2f3291456643bd640ba566ec9 to add a list of passed and
skipped tests.

The way this was done turned out to be not general enough, because we want
to add another type of result, namely tests that are skipped because they
are too large.

Instead of having separate lists in `_results.json` for each kind of result
(pass, fail, skip, skip too large, etc), this commit changes the output
form of `_results.json` so that it stores a single list of 3-tuples of all
tests that were run:

    [(test_name, result, reason), ...]

That's more general and allows adding a reason for skipped and failed
tests.  At the moment this reason is just an empty string, but can be
improved in the future.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 9294c7e636fe8..ecd611aa5b56d 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -605,9 +605,7 @@ def run_script_on_remote_target(self, args, test_file, is_special):
 def run_tests(pyb, tests, args, result_dir, num_threads=1):
     test_count = ThreadSafeCounter()
     testcase_count = ThreadSafeCounter()
-    passed_tests = ThreadSafeCounter([])
-    failed_tests = ThreadSafeCounter([])
-    skipped_tests = ThreadSafeCounter([])
+    test_results = ThreadSafeCounter([])
 
     skip_tests = set()
     skip_native = False
@@ -896,7 +894,7 @@ def run_one_test(test_file):
 
         if skip_it:
             print("skip ", test_file)
-            skipped_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "skip", ""))
             return
 
         # Run the test on the MicroPython target.
@@ -911,7 +909,7 @@ def run_one_test(test_file):
                 # start-up code (eg boot.py) when preparing to run the next test.
                 pyb.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
             print("skip ", test_file)
-            skipped_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "skip", ""))
             return
 
         # Look at the output of the test to see if unittest was used.
@@ -994,7 +992,7 @@ def run_one_test(test_file):
         # Print test summary, update counters, and save .exp/.out files if needed.
         if test_passed:
             print("pass ", test_file, extra_info)
-            passed_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "pass", ""))
             rm_f(filename_expected)
             rm_f(filename_mupy)
         else:
@@ -1006,7 +1004,7 @@ def run_one_test(test_file):
                 rm_f(filename_expected)  # in case left over from previous failed run
             with open(filename_mupy, "wb") as f:
                 f.write(output_mupy)
-            failed_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "fail", ""))
 
         test_count.increment()
 
@@ -1035,9 +1033,10 @@ def run_one_test(test_file):
             print(line)
         sys.exit(1)
 
-    passed_tests = sorted(passed_tests.value)
-    skipped_tests = sorted(skipped_tests.value)
-    failed_tests = sorted(failed_tests.value)
+    test_results = test_results.value
+    passed_tests = list(r for r in test_results if r[2] == "pass")
+    skipped_tests = list(r for r in test_results if r[2] == "skip")
+    failed_tests = list(r for r in test_results if r[2] == "fail")
 
     print(
         "{} tests performed ({} individual testcases)".format(
@@ -1069,9 +1068,11 @@ def to_json(obj):
     with open(os.path.join(result_dir, RESULTS_FILE), "w") as f:
         json.dump(
             {
+                # The arguments passed on the command-line.
                 "args": vars(args),
-                "passed_tests": [test[1] for test in passed_tests],
-                "skipped_tests": [test[1] for test in skipped_tests],
+                # A list of all results of the form [(test, result, reason), ...].
+                "results": list(test[1:] for test in test_results),
+                # A list of failed tests.  This is deprecated, use the "results" above instead.
                 "failed_tests": [test[1] for test in failed_tests],
             },
             f,
@@ -1248,7 +1249,7 @@ def main():
         results_file = os.path.join(args.result_dir, RESULTS_FILE)
         if os.path.exists(results_file):
             with open(results_file, "r") as f:
-                tests = json.load(f)["failed_tests"]
+                tests = list(test[0] for test in json.load(f)["results"] if test[1] == "fail")
         else:
             tests = []
     elif len(args.files) == 0:

From e8447768ef18c0ce959ca3b2abe8f4a334b41056 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 16 May 2025 15:02:02 +1000
Subject: [PATCH 2300/3129] extmod/modlwip: Add optional flags argument for
 recv and recvfrom.

Implements MSG_PEEK and MSG_DONTWAIT.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/modlwip.c | 140 +++++++++++++++++++++--------------------------
 1 file changed, 62 insertions(+), 78 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 961803f5e84dd..65a3412ecb801 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -70,6 +70,10 @@
 
 #define TCP_NODELAY TF_NODELAY
 
+// Socket flags
+#define MSG_PEEK     0x01
+#define MSG_DONTWAIT 0x02
+
 // For compatibilily with older lwIP versions.
 #ifndef ip_set_option
 #define ip_set_option(pcb, opt)   ((pcb)->so_options |= (opt))
@@ -673,13 +677,13 @@ static mp_uint_t lwip_raw_udp_send(lwip_socket_obj_t *socket, const byte *buf, m
 }
 
 // Helper function for recv/recvfrom to handle raw/UDP packets
-static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, ip_addr_t *ip, mp_uint_t *port, int *_errno) {
+static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, mp_int_t flags, ip_addr_t *ip, mp_uint_t *port, int *_errno) {
 
     lwip_incoming_packet_t *slot = &socket->incoming.udp_raw.array[socket->incoming.udp_raw.iget];
 
     if (slot->pbuf == NULL) {
-        if (socket->timeout == 0) {
-            // Non-blocking socket.
+        // Non-blocking socket or flag
+        if (socket->timeout == 0 || (flags & MSG_DONTWAIT)) {
             *_errno = MP_EAGAIN;
             return -1;
         }
@@ -705,9 +709,11 @@ static mp_uint_t lwip_raw_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_u
     MICROPY_PY_LWIP_ENTER
 
     u16_t result = pbuf_copy_partial(p, buf, ((p->tot_len > len) ? len : p->tot_len), 0);
-    pbuf_free(p);
-    slot->pbuf = NULL;
-    socket->incoming.udp_raw.iget = (socket->incoming.udp_raw.iget + 1) % LWIP_INCOMING_PACKET_QUEUE_LEN;
+    if ((flags & MSG_PEEK) == 0) {
+        pbuf_free(p);
+        slot->pbuf = NULL;
+        socket->incoming.udp_raw.iget = (socket->incoming.udp_raw.iget + 1) % LWIP_INCOMING_PACKET_QUEUE_LEN;
+    }
 
     MICROPY_PY_LWIP_EXIT
 
@@ -815,14 +821,14 @@ static mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
 }
 
 // Helper function for recv/recvfrom to handle TCP packets
-static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
+static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_t len, mp_int_t flags, int *_errno) {
     // Check for any pending errors
     STREAM_ERROR_CHECK(socket);
 
     if (socket->incoming.tcp.pbuf == NULL) {
 
-        // Non-blocking socket
-        if (socket->timeout == 0) {
+        // Non-blocking socket or flag
+        if (socket->timeout == 0 || (flags & MSG_DONTWAIT)) {
             if (socket->state == STATE_PEER_CLOSED) {
                 return 0;
             }
@@ -867,19 +873,21 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
 
     memcpy(buf, (byte *)p->payload + socket->recv_offset, len);
 
-    remaining -= len;
-    if (remaining == 0) {
-        socket->incoming.tcp.pbuf = p->next;
-        // If we don't ref here, free() will free the entire chain,
-        // if we ref, it does what we need: frees 1st buf, and decrements
-        // next buf's refcount back to 1.
-        pbuf_ref(p->next);
-        pbuf_free(p);
-        socket->recv_offset = 0;
-    } else {
-        socket->recv_offset += len;
+    if ((flags & MSG_PEEK) == 0) {
+        remaining -= len;
+        if (remaining == 0) {
+            socket->incoming.tcp.pbuf = p->next;
+            // If we don't ref here, free() will free the entire chain,
+            // if we ref, it does what we need: frees 1st buf, and decrements
+            // next buf's refcount back to 1.
+            pbuf_ref(p->next);
+            pbuf_free(p);
+            socket->recv_offset = 0;
+        } else {
+            socket->recv_offset += len;
+        }
+        tcp_recved(socket->pcb.tcp, len);
     }
-    tcp_recved(socket->pcb.tcp, len);
 
     MICROPY_PY_LWIP_EXIT
 
@@ -1271,40 +1279,58 @@ static mp_obj_t lwip_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_send_obj, lwip_socket_send);
 
-static mp_obj_t lwip_socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
-    lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
+// Common implementation for recv & recvfrom
+static mp_obj_t lwip_socket_recv_common(size_t n_args, const mp_obj_t *args, ip_addr_t *ip, mp_uint_t *port) {
+    lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(args[0]);
+    mp_int_t len = mp_obj_get_int(args[1]);
+    mp_int_t flags = n_args > 2 ? mp_obj_get_int(args[2]) : 0;
     int _errno;
+    vstr_t vstr;
+    mp_uint_t ret = 0;
 
     lwip_socket_check_connected(socket);
 
-    mp_int_t len = mp_obj_get_int(len_in);
-    vstr_t vstr;
     vstr_init_len(&vstr, len);
 
-    mp_uint_t ret = 0;
     switch (socket->type) {
-        case MOD_NETWORK_SOCK_STREAM: {
-            ret = lwip_tcp_receive(socket, (byte *)vstr.buf, len, &_errno);
+        case MOD_NETWORK_SOCK_STREAM:
+            if (ip != NULL) {
+                *ip = socket->tcp_peer_addr;
+                *port = (mp_uint_t)socket->tcp_peer_port;
+            }
+            ret = lwip_tcp_receive(socket, (byte *)vstr.buf, len, flags, &_errno);
             break;
-        }
         case MOD_NETWORK_SOCK_DGRAM:
         #if MICROPY_PY_LWIP_SOCK_RAW
         case MOD_NETWORK_SOCK_RAW:
         #endif
-            ret = lwip_raw_udp_receive(socket, (byte *)vstr.buf, len, NULL, NULL, &_errno);
+            ret = lwip_raw_udp_receive(socket, (byte *)vstr.buf, len, flags, ip, port, &_errno);
             break;
     }
     if (ret == -1) {
         mp_raise_OSError(_errno);
     }
-
     if (ret == 0) {
         return mp_const_empty_bytes;
     }
     vstr.len = ret;
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recv_obj, lwip_socket_recv);
+
+static mp_obj_t lwip_socket_recv(size_t n_args, const mp_obj_t *args) {
+    return lwip_socket_recv_common(n_args, args, NULL, NULL);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_recv_obj, 2, 3, lwip_socket_recv);
+
+static mp_obj_t lwip_socket_recvfrom(size_t n_args, const mp_obj_t *args) {
+    ip_addr_t ip;
+    mp_uint_t port;
+    mp_obj_t tuple[2];
+    tuple[0] = lwip_socket_recv_common(n_args, args, &ip, &port);
+    tuple[1] = lwip_format_inet_addr(&ip, port);
+    return mp_obj_new_tuple(2, tuple);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_recvfrom_obj, 2, 3, lwip_socket_recvfrom);
 
 static mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
@@ -1339,50 +1365,6 @@ static mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t
 }
 static MP_DEFINE_CONST_FUN_OBJ_3(lwip_socket_sendto_obj, lwip_socket_sendto);
 
-static mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
-    lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
-    int _errno;
-
-    lwip_socket_check_connected(socket);
-
-    mp_int_t len = mp_obj_get_int(len_in);
-    vstr_t vstr;
-    vstr_init_len(&vstr, len);
-    ip_addr_t ip;
-    mp_uint_t port;
-
-    mp_uint_t ret = 0;
-    switch (socket->type) {
-        case MOD_NETWORK_SOCK_STREAM: {
-            ip = socket->tcp_peer_addr;
-            port = (mp_uint_t)socket->tcp_peer_port;
-            ret = lwip_tcp_receive(socket, (byte *)vstr.buf, len, &_errno);
-            break;
-        }
-        case MOD_NETWORK_SOCK_DGRAM:
-        #if MICROPY_PY_LWIP_SOCK_RAW
-        case MOD_NETWORK_SOCK_RAW:
-        #endif
-            ret = lwip_raw_udp_receive(socket, (byte *)vstr.buf, len, &ip, &port, &_errno);
-            break;
-    }
-    if (ret == -1) {
-        mp_raise_OSError(_errno);
-    }
-
-    mp_obj_t tuple[2];
-    if (ret == 0) {
-        tuple[0] = mp_const_empty_bytes;
-    } else {
-        vstr.len = ret;
-        tuple[0] = mp_obj_new_bytes_from_vstr(&vstr);
-    }
-    tuple[1] = lwip_format_inet_addr(&ip, port);
-
-    return mp_obj_new_tuple(2, tuple);
-}
-static MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recvfrom_obj, lwip_socket_recvfrom);
-
 static mp_obj_t lwip_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
     lwip_socket_check_connected(socket);
@@ -1542,12 +1524,12 @@ static mp_uint_t lwip_socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, i
 
     switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM:
-            return lwip_tcp_receive(socket, buf, size, errcode);
+            return lwip_tcp_receive(socket, buf, size, 0, errcode);
         case MOD_NETWORK_SOCK_DGRAM:
         #if MICROPY_PY_LWIP_SOCK_RAW
         case MOD_NETWORK_SOCK_RAW:
         #endif
-            return lwip_raw_udp_receive(socket, buf, size, NULL, NULL, errcode);
+            return lwip_raw_udp_receive(socket, buf, size, 0, NULL, NULL, errcode);
     }
     // Unreachable
     return MP_STREAM_ERROR;
@@ -1919,6 +1901,8 @@ static const mp_rom_map_elem_t mp_module_lwip_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_TCP), MP_ROM_INT(IP_PROTO_TCP) },
     { MP_ROM_QSTR(MP_QSTR_TCP_NODELAY), MP_ROM_INT(TCP_NODELAY) },
+    { MP_ROM_QSTR(MP_QSTR_MSG_PEEK), MP_ROM_INT(MSG_PEEK) },
+    { MP_ROM_QSTR(MP_QSTR_MSG_DONTWAIT), MP_ROM_INT(MSG_DONTWAIT) },
 };
 
 static MP_DEFINE_CONST_DICT(mp_module_lwip_globals, mp_module_lwip_globals_table);

From 4781cde4f78ca386c99bb63cb1ad238f8aff7731 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 16 May 2025 15:04:37 +1000
Subject: [PATCH 2301/3129] esp32/modsocket: Add optional flags argument for
 recv and recvfrom.

Implements MSG_PEEK and MSG_DONTWAIT (both passed through to LWIP
sockets API).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/modsocket.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 7ea5e855d325e..2050d1d04d4d6 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -611,7 +611,7 @@ static MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
 // 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,
+static mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size, mp_int_t flags,
     struct sockaddr *from, socklen_t *from_len, int *errcode) {
     socket_obj_t *sock = MP_OBJ_TO_PTR(self_in);
 
@@ -645,7 +645,7 @@ static mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
         if (release_gil) {
             MP_THREAD_GIL_EXIT();
         }
-        int r = lwip_recvfrom(sock->fd, buf, size, 0, from, from_len);
+        int r = lwip_recvfrom(sock->fd, buf, size, flags, from, from_len);
         if (release_gil) {
             MP_THREAD_GIL_ENTER();
         }
@@ -655,7 +655,7 @@ static mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
         if (r >= 0) {
             return r;
         }
-        if (errno != EWOULDBLOCK) {
+        if (errno != EWOULDBLOCK || (flags & MSG_DONTWAIT)) {
             *errcode = errno;
             return MP_STREAM_ERROR;
         }
@@ -666,14 +666,17 @@ 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,
+mp_obj_t _socket_recvfrom(size_t n_args, const mp_obj_t *args,
     struct sockaddr *from, socklen_t *from_len) {
-    size_t len = mp_obj_get_int(len_in);
+    mp_obj_t self_in = args[0];
+    size_t len = mp_obj_get_int(args[1]);
+    int flags = n_args > 2 ? mp_obj_get_int(args[2]) : 0;
+
     vstr_t vstr;
     vstr_init_len(&vstr, len);
 
     int errcode;
-    mp_uint_t ret = _socket_read_data(self_in, vstr.buf, len, from, from_len, &errcode);
+    mp_uint_t ret = _socket_read_data(self_in, vstr.buf, len, flags, from, from_len, &errcode);
     if (ret == MP_STREAM_ERROR) {
         mp_raise_OSError(errcode);
     }
@@ -682,17 +685,17 @@ mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
 
-static mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
-    return _socket_recvfrom(self_in, len_in, NULL, NULL);
+static mp_obj_t socket_recv(size_t n_args, const mp_obj_t *args) {
+    return _socket_recvfrom(n_args, args, NULL, NULL);
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recv_obj, 2, 3, socket_recv);
 
-static mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
+static mp_obj_t socket_recvfrom(size_t n_args, const mp_obj_t *args) {
     struct sockaddr from;
     socklen_t fromlen = sizeof(from);
 
     mp_obj_t tuple[2];
-    tuple[0] = _socket_recvfrom(self_in, len_in, &from, &fromlen);
+    tuple[0] = _socket_recvfrom(n_args, args, &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);
@@ -700,7 +703,7 @@ static mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
 
     return mp_obj_new_tuple(2, tuple);
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recvfrom_obj, 2, 3, socket_recvfrom);
 
 int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
     int sentlen = 0;
@@ -789,7 +792,7 @@ 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_uint_t socket_stream_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
-    return _socket_read_data(self_in, buf, size, NULL, NULL, errcode);
+    return _socket_read_data(self_in, buf, size, 0, NULL, NULL, errcode);
 }
 
 static mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
@@ -1010,6 +1013,8 @@ static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SO_BINDTODEVICE), MP_ROM_INT(SO_BINDTODEVICE) },
     { MP_ROM_QSTR(MP_QSTR_IP_ADD_MEMBERSHIP), MP_ROM_INT(IP_ADD_MEMBERSHIP) },
     { MP_ROM_QSTR(MP_QSTR_TCP_NODELAY), MP_ROM_INT(TCP_NODELAY) },
+    { MP_ROM_QSTR(MP_QSTR_MSG_PEEK), MP_ROM_INT(MSG_PEEK) },
+    { MP_ROM_QSTR(MP_QSTR_MSG_DONTWAIT), MP_ROM_INT(MSG_DONTWAIT) },
 };
 
 static MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);

From 0b224048ef1cf448cfae18cde91ed42c6b7838f0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 16 May 2025 15:04:48 +1000
Subject: [PATCH 2302/3129] unix/modsocket: Expose MSG_PEEK flag for recv &
 recvfrom.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/modsocket.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index 6d6059ae44c54..2aaa21183a9d4 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -701,6 +701,7 @@ static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
 
     C(MSG_DONTROUTE),
     C(MSG_DONTWAIT),
+    C(MSG_PEEK),
 
     C(SOL_SOCKET),
     C(SO_BROADCAST),

From 73d4ddce6cc797e2dabe37aadef5795c4be11665 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 16 May 2025 15:05:12 +1000
Subject: [PATCH 2303/3129] tests/multi_net: Add test coverage for socket recv
 flag MSG_PEEK.

Adds TCP and UDP multi_net test cases.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_net/tcp_recv_peek.py | 46 ++++++++++++++++++++++++++++++++
 tests/multi_net/udp_recv_peek.py | 36 +++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 tests/multi_net/tcp_recv_peek.py
 create mode 100644 tests/multi_net/udp_recv_peek.py

diff --git a/tests/multi_net/tcp_recv_peek.py b/tests/multi_net/tcp_recv_peek.py
new file mode 100644
index 0000000000000..ff540dd3c3c41
--- /dev/null
+++ b/tests/multi_net/tcp_recv_peek.py
@@ -0,0 +1,46 @@
+# Test TCP recv with MSG_PEEK
+#
+# Note that bare metal LWIP only returns at most one packet's worth of TCP data
+# in any recv() call - including when peeking - so can't be too clever with
+# different recv() combinations
+import socket
+import random
+
+
+# Server
+def instance0():
+    PORT = random.randrange(10000, 50000)
+    multitest.globals(IP=multitest.get_network_ip(), PORT=PORT)
+    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()
+    multitest.next()
+    s2, _ = s.accept()
+    print(s2.recv(8, socket.MSG_PEEK))
+    print(s2.recv(8))
+    s2.send(b"1234567890")
+    multitest.broadcast("0-sent")
+    multitest.wait("1-sent")
+    print(s2.recv(5, socket.MSG_PEEK))
+    print(s2.recv(5, socket.MSG_PEEK))
+    multitest.broadcast("0-recved")
+    multitest.wait("1-recved")  # sync here necessary as MP sends RST if closing TCP early
+    s2.close()
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket()
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    s.send(b"abcdefgh")
+    multitest.broadcast("1-sent")
+    multitest.wait("0-sent")
+    s.send(b"klmnopqr")
+    print(s.recv(5, socket.MSG_PEEK))
+    print(s.recv(10))
+    multitest.broadcast("1-recved")
+    multitest.wait("0-recved")
+    s.close()
diff --git a/tests/multi_net/udp_recv_peek.py b/tests/multi_net/udp_recv_peek.py
new file mode 100644
index 0000000000000..47897ce553954
--- /dev/null
+++ b/tests/multi_net/udp_recv_peek.py
@@ -0,0 +1,36 @@
+# Test UDP recv and recvfrom with MSG_PEEK
+import random
+import socket
+import time
+
+
+# Server
+def instance0():
+    PORT = random.randrange(10000, 50000)
+    multitest.globals(IP=multitest.get_network_ip(), PORT=PORT)
+    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.next()
+    peek_bytes, peek_addr = s.recvfrom(8, socket.MSG_PEEK)
+    print(peek_bytes)
+    real_bytes, real_addr = s.recvfrom(8)
+    print(real_bytes)
+    print(peek_addr == real_addr)  # source addr should be the same for each
+    res = s.sendto(b"1234567890", peek_addr)
+    print(res)
+    print(s.recv(5, socket.MSG_PEEK))
+    print(s.recv(5, socket.MSG_PEEK))
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    s.send(b"abcdefgh")
+    s.send(b"klmnopqr")
+    print(s.recv(5, socket.MSG_PEEK))
+    print(s.recv(10))
+    s.close()

From d23fb869349a1525069380e5cce30ffb6bce8a8c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 16 May 2025 15:51:43 +1000
Subject: [PATCH 2304/3129] tests/multi_net: Add test coverage for socket recv
 flag MSG_DONTWAIT.

Adding multi_net case for UDP only, as TCP timing is hard to test reliably.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_net/udp_recv_dontwait.py     | 59 ++++++++++++++++++++++++
 tests/multi_net/udp_recv_dontwait.py.exp |  7 +++
 2 files changed, 66 insertions(+)
 create mode 100644 tests/multi_net/udp_recv_dontwait.py
 create mode 100644 tests/multi_net/udp_recv_dontwait.py.exp

diff --git a/tests/multi_net/udp_recv_dontwait.py b/tests/multi_net/udp_recv_dontwait.py
new file mode 100644
index 0000000000000..640f3f060ea74
--- /dev/null
+++ b/tests/multi_net/udp_recv_dontwait.py
@@ -0,0 +1,59 @@
+# Test UDP recv and recvfrom with MSG_DONTWAIT
+import random
+import socket
+
+try:
+    import errno, time
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+# Server
+def instance0():
+    PORT = random.randrange(10000, 50000)
+    multitest.globals(IP=multitest.get_network_ip(), PORT=PORT)
+    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.next()
+    begin = time.ticks_ms()
+
+    # do some recvs before instance1 starts, when we know no packet is waiting
+    try:
+        print(s.recvfrom(8, socket.MSG_DONTWAIT))
+    except OSError as e:
+        print(e.errno == errno.EAGAIN)
+    try:
+        print(s.recv(8, socket.MSG_DONTWAIT))
+    except OSError as e:
+        print(e.errno == errno.EAGAIN)
+
+    # the above steps should not have taken any substantial time
+    elapsed = time.ticks_diff(time.ticks_ms(), begin)
+    print(True if elapsed < 50 else elapsed)
+
+    # Now instance1 will send us a UDP packet
+    multitest.broadcast("0-ready")
+    multitest.wait("1-sent")
+
+    for _ in range(10):  # retry if necessary, to allow for network delay
+        time.sleep_ms(100)
+        try:
+            print(s.recv(8, socket.MSG_DONTWAIT))
+            break
+        except OSError as er:
+            if er.errno != errno.EAGAIN:
+                raise er
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    multitest.wait("0-ready")
+    print(s.send(b"abcdefgh"))
+    multitest.broadcast("1-sent")
+    s.close()
diff --git a/tests/multi_net/udp_recv_dontwait.py.exp b/tests/multi_net/udp_recv_dontwait.py.exp
new file mode 100644
index 0000000000000..f61fd4bbe2ee5
--- /dev/null
+++ b/tests/multi_net/udp_recv_dontwait.py.exp
@@ -0,0 +1,7 @@
+--- instance0 ---
+True
+True
+True
+b'abcdefgh'
+--- instance1 ---
+8

From ba92063d6491753411ea0737da3eed19278964b2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 16 May 2025 16:09:12 +1000
Subject: [PATCH 2305/3129] docs: Add a description of recv/recvfrom flags
 argument.

Implementation added for various ports in the parent commits.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/socket.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/library/socket.rst b/docs/library/socket.rst
index 944e7e631ac76..38e0aab704ad6 100644
--- a/docs/library/socket.rst
+++ b/docs/library/socket.rst
@@ -227,22 +227,28 @@ Methods
    has the same "no short writes" policy for blocking sockets, and will return
    number of bytes sent on non-blocking sockets.
 
-.. method:: socket.recv(bufsize)
+.. method:: socket.recv(bufsize, [flags])
 
    Receive data from the socket. The return value is a bytes object representing the data
    received. The maximum amount of data to be received at once is specified by bufsize.
 
+   Most ports support the optional *flags* argument. Available *flags* are defined as constants
+   in the socket module and have the same meaning as in CPython. ``MSG_PEEK`` and ``MSG_DONTWAIT``
+   are supported on all ports which accept the *flags* argument.
+
 .. method:: socket.sendto(bytes, address)
 
    Send data to the socket. The socket should not be connected to a remote socket, since the
    destination socket is specified by *address*.
 
-.. method:: socket.recvfrom(bufsize)
+.. method:: socket.recvfrom(bufsize, [flags])
 
   Receive data from the socket. The return value is a pair *(bytes, address)* where *bytes* is a
   bytes object representing the data received and *address* is the address of the socket sending
   the data.
 
+  See the `recv` function for an explanation of the optional *flags* argument.
+
 .. method:: socket.setsockopt(level, optname, value)
 
    Set the value of the given socket option. The needed symbolic constants are defined in the

From 3e33d0567fd9850a1291f2116f8bc09845d8f096 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Fri, 18 Oct 2024 00:25:19 +1100
Subject: [PATCH 2306/3129] ports: Update board.json files for vendor/product
 consistency.

The vendor and product fields in the `board.json` files were somewhat
inconsistent.  Remove any duplication of the vendor name in the product
field so that `f"{vendor} {product}"` reads well.

In addition to that, update most of the URL's for `board.json` files that
are modified here, and match case and spacing used by the manufacturers for
the vendor and product names.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/esp32/boards/ARDUINO_NANO_ESP32/board.json         | 4 ++--
 ports/esp32/boards/LILYGO_TTGO_LORA32/board.json         | 4 ++--
 ports/esp32/boards/M5STACK_ATOM/board.json               | 6 +++---
 ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json        | 2 +-
 ports/esp32/boards/M5STACK_NANOC6/board.json             | 2 +-
 ports/esp32/boards/OLIMEX_ESP32_EVB/board.json           | 6 +++---
 ports/esp32/boards/OLIMEX_ESP32_POE/board.json           | 6 +++---
 ports/esp32/boards/SIL_WESP32/board.json                 | 2 +-
 ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json         | 2 +-
 ports/mimxrt/boards/OLIMEX_RT1010/board.json             | 6 +++---
 ports/nrf/boards/ACTINIUS_ICARUS/board.json              | 2 +-
 ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json    | 2 +-
 ports/nrf/boards/ARDUINO_PRIMO/board.json                | 4 ++--
 ports/nrf/boards/BLUEIO_TAG_EVIM/board.json              | 2 +-
 ports/nrf/boards/DVK_BL652/board.json                    | 6 +++---
 ports/nrf/boards/EVK_NINA_B1/board.json                  | 2 +-
 ports/nrf/boards/EVK_NINA_B3/board.json                  | 2 +-
 ports/nrf/boards/IBK_BLYST_NANO/board.json               | 2 +-
 ports/nrf/boards/IDK_BLYST_NANO/board.json               | 2 +-
 ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json      | 2 +-
 ports/nrf/boards/SEEED_XIAO_NRF52/board.json             | 4 ++--
 ports/nrf/boards/WT51822_S4AT/board.json                 | 4 ++--
 ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json  | 2 +-
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json  | 2 +-
 ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json | 2 +-
 ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json        | 2 +-
 ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json       | 2 +-
 ports/rp2/boards/SPARKFUN_PROMICRO/board.json            | 2 +-
 ports/rp2/boards/SPARKFUN_THINGPLUS/board.json           | 2 +-
 ports/rp2/boards/W5100S_EVB_PICO/board.json              | 6 +++---
 ports/rp2/boards/W5500_EVB_PICO/board.json               | 4 ++--
 ports/rp2/boards/WEACTSTUDIO/board.json                  | 2 +-
 ports/samd/boards/SEEED_XIAO_SAMD21/board.json           | 2 +-
 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json  | 2 +-
 ports/stm32/boards/ARDUINO_GIGA/board.json               | 2 +-
 ports/stm32/boards/ARDUINO_NICLA_VISION/board.json       | 2 +-
 ports/stm32/boards/ARDUINO_OPTA/board.json               | 2 +-
 ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json        | 2 +-
 ports/stm32/boards/HYDRABUS/board.json                   | 2 +-
 ports/stm32/boards/LIMIFROG/board.json                   | 2 +-
 ports/stm32/boards/OLIMEX_E407/board.json                | 6 +++---
 ports/stm32/boards/OLIMEX_H407/board.json                | 6 +++---
 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json    | 4 ++--
 43 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
index 9d0016017fc6c..936a498b5e1fe 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/board.json
@@ -17,8 +17,8 @@
         "ABX00092_01.iso_1000x750.jpg"
     ],
     "mcu": "esp32s3",
-    "product": "Arduino Nano ESP32",
+    "product": "Nano ESP32",
     "thumbnail": "",
-    "url": "https://store.arduino.cc/products/arduino-nano-esp32",
+    "url": "https://docs.arduino.cc/hardware/nano-esp32/",
     "vendor": "Arduino"
 }
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
index d68a9baaddaa6..7521c01a6bb77 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
@@ -19,8 +19,8 @@
         "lilygo-ttgo-lora-32-v1-6.jpg"
     ],
     "mcu": "esp32",
-    "product": "LILYGO TTGO LoRa32",
+    "product": "TTGO LoRa32",
     "thumbnail": "",
-    "url": "http://www.lilygo.cn/prod_view.aspx?TypeId=50060&Id=1270&FId=t3:50060:3",
+    "url": "https://www.lilygo.cc/products/lora3",
     "vendor": "LILYGO"
 }
diff --git a/ports/esp32/boards/M5STACK_ATOM/board.json b/ports/esp32/boards/M5STACK_ATOM/board.json
index 3a1e7ce359c50..c3908a47794fa 100644
--- a/ports/esp32/boards/M5STACK_ATOM/board.json
+++ b/ports/esp32/boards/M5STACK_ATOM/board.json
@@ -18,8 +18,8 @@
         "m5stack_atom.jpg"
     ],
     "mcu": "esp32",
-    "product": "M5 Stack Atom",
+    "product": "Atom",
     "thumbnail": "",
-    "url": "https://m5stack.com/",
-    "vendor": "M5 Stack"
+    "url": "https://shop.m5stack.com/products/atom-matrix-esp32-development-kit",
+    "vendor": "M5Stack"
 }
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
index fe0e97f9f9ce6..26b1a4d54a1c2 100644
--- a/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/board.json
@@ -20,5 +20,5 @@
     "product": "AtomS3 Lite",
     "thumbnail": "",
     "url": "https://shop.m5stack.com/products/atoms3-lite-esp32s3-dev-kit",
-    "vendor": "M5 Stack"
+    "vendor": "M5Stack"
 }
diff --git a/ports/esp32/boards/M5STACK_NANOC6/board.json b/ports/esp32/boards/M5STACK_NANOC6/board.json
index 087851ae5ee0b..ddf3406c837e6 100644
--- a/ports/esp32/boards/M5STACK_NANOC6/board.json
+++ b/ports/esp32/boards/M5STACK_NANOC6/board.json
@@ -18,7 +18,7 @@
         "m5stack_nanoc6.jpg"
     ],
     "mcu": "esp32c6",
-    "product": "M5Stack NanoC6",
+    "product": "NanoC6",
     "url": "https://shop.m5stack.com/products/m5stack-nanoc6-dev-kit",
     "vendor": "M5Stack"
 }
diff --git a/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
index 3eb9a5e0a71e5..198f1d4b6d918 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/board.json
@@ -18,8 +18,8 @@
         "ESP32-EVB_Rev_K1.png"
     ],
     "mcu": "esp32",
-    "product": "Olimex ESP32 EVB",
+    "product": "ESP32 EVB",
     "thumbnail": "",
-    "url": "https://www.olimex.com/Products/IoT/ESP32/ESP32-EVB/open-source-hardware",
-    "vendor": "OLIMEX"
+    "url": "https://www.olimex.com/Products/IoT/ESP32/ESP32-EVB",
+    "vendor": "Olimex"
 }
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
index cda26178d75f2..1b00d213c713c 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
@@ -19,8 +19,8 @@
         "ESP32-POE-ISO-1.jpg"
     ],
     "mcu": "esp32",
-    "product": "Olimex ESP32 POE",
+    "product": "ESP32 POE",
     "thumbnail": "",
-    "url": "https://www.olimex.com/",
-    "vendor": "OLIMEX"
+    "url": "https://www.olimex.com/Products/IoT/ESP32/ESP32-POE",
+    "vendor": "Olimex"
 }
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 53a50f3286d23..7126fa7ea1bf2 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -18,7 +18,7 @@
         "wesp32-top.jpg"
     ],
     "mcu": "esp32",
-    "product": "SIL WESP32",
+    "product": "wESP32",
     "thumbnail": "",
     "url": "https://wesp32.com/",
     "vendor": "Silicognition"
diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
index 9f260b3a00f9b..804b4fd734373 100644
--- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
+++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/board.json
@@ -15,7 +15,7 @@
         "Metro_M7.jpg"
     ],
     "mcu": "mimxrt",
-    "product": "Adafruit Metro M7",
+    "product": "Metro M7",
     "thumbnail": "",
     "url": "https://www.adafruit.com/product/4950",
     "vendor": "Adafruit"
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/board.json b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
index 882b931f8b7d2..a6f0316bc85fd 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/board.json
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
@@ -12,8 +12,8 @@
         "OLIMEX_RT1010Py.jpg"
     ],
     "mcu": "mimxrt",
-    "product": "Olimex_RT1010Py",
+    "product": "RT1010-Py",
     "thumbnail": "",
-    "url": "https://www.olimex.com/Products/ARM/NXP",
-    "vendor": "OLIMEX"
+    "url": "https://www.olimex.com/Products/MicroPython/RT1010-Py",
+    "vendor": "Olimex"
 }
diff --git a/ports/nrf/boards/ACTINIUS_ICARUS/board.json b/ports/nrf/boards/ACTINIUS_ICARUS/board.json
index c1d9f1c4ef637..09ed3fcba3bcc 100644
--- a/ports/nrf/boards/ACTINIUS_ICARUS/board.json
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/board.json
@@ -8,7 +8,7 @@
         "icarus-v1.4-front-shadow-p-800.jpg"
     ],
     "mcu": "nrf91",
-    "product": "actinius_icarus",
+    "product": "Icarus",
     "thumbnail": "",
     "url": "https://www.actinius.com/icarus",
     "vendor": "Actinius"
diff --git a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
index 9079fbd666d7a..72b51356114fd 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
@@ -15,7 +15,7 @@
         "ABX00031_01.iso_998x749.jpg"
     ],
     "mcu": "nrf52",
-    "product": "Arduino Nano 33 BLE Sense",
+    "product": "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_PRIMO/board.json b/ports/nrf/boards/ARDUINO_PRIMO/board.json
index f7afed0ced576..236acfd448c03 100644
--- a/ports/nrf/boards/ARDUINO_PRIMO/board.json
+++ b/ports/nrf/boards/ARDUINO_PRIMO/board.json
@@ -8,8 +8,8 @@
         "arduino_primo.jpg"
     ],
     "mcu": "nrf52",
-    "product": "arduino_primo",
+    "product": "Primo",
     "thumbnail": "",
-    "url": "",
+    "url": "https://docs.arduino.cc/retired/boards/arduino-primo/",
     "vendor": "Arduino"
 }
diff --git a/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json b/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
index 5b6e5747d5838..e910ea8db2731 100644
--- a/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
@@ -8,7 +8,7 @@
         "blyst-nano-mod-4_jpg_project-body.jpg"
     ],
     "mcu": "nrf52",
-    "product": "blueio_tag_evim",
+    "product": "BLUEIO Tag EVIM",
     "thumbnail": "",
     "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 5c9cfad26e6f5..d0942ca256c70 100644
--- a/ports/nrf/boards/DVK_BL652/board.json
+++ b/ports/nrf/boards/DVK_BL652/board.json
@@ -8,8 +8,8 @@
         "BL652-SA_JPG-500.jpg"
     ],
     "mcu": "nrf52",
-    "product": "dvk_bl652",
+    "product": "DVK-BL652",
     "thumbnail": "",
-    "url": "https://www.lairdconnect.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl652-series-bluetooth-v5-nfc-module",
-    "vendor": "Laird Connectivity"
+    "url": "https://www.ezurio.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl652-series-bluetooth-v5-nfc-module",
+    "vendor": "Ezurio"
 }
diff --git a/ports/nrf/boards/EVK_NINA_B1/board.json b/ports/nrf/boards/EVK_NINA_B1/board.json
index 657b0fa06db54..ef9c6ae5be2b1 100644
--- a/ports/nrf/boards/EVK_NINA_B1/board.json
+++ b/ports/nrf/boards/EVK_NINA_B1/board.json
@@ -8,7 +8,7 @@
         "EVK-NINA-B1_.jpg"
     ],
     "mcu": "nrf52",
-    "product": "evk_nina_b1",
+    "product": "EVK-NINA-B1",
     "thumbnail": "",
     "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 54e3dc3585c3f..6311b17338148 100644
--- a/ports/nrf/boards/EVK_NINA_B3/board.json
+++ b/ports/nrf/boards/EVK_NINA_B3/board.json
@@ -8,7 +8,7 @@
         "EVK-NINA-B3-top.jpg"
     ],
     "mcu": "nrf52",
-    "product": "evk_nina_b3",
+    "product": "EVK-NINA-B3",
     "thumbnail": "",
     "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 562c33607b153..ddbbef66f5b20 100644
--- a/ports/nrf/boards/IBK_BLYST_NANO/board.json
+++ b/ports/nrf/boards/IBK_BLYST_NANO/board.json
@@ -8,7 +8,7 @@
         "blyst-nano-fingertip-close_jpg_content-body-gallery.jpg"
     ],
     "mcu": "nrf52",
-    "product": "ibk_blyst_nano",
+    "product": "IBK BLYST Nano",
     "thumbnail": "",
     "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 199721698d403..cb692f44cda9b 100644
--- a/ports/nrf/boards/IDK_BLYST_NANO/board.json
+++ b/ports/nrf/boards/IDK_BLYST_NANO/board.json
@@ -8,7 +8,7 @@
         "blyst-nano-fingertip-close_jpg_content-body-gallery.jpg"
     ],
     "mcu": "nrf52",
-    "product": "idk_blyst_nano",
+    "product": "IDK BLYST Nano",
     "thumbnail": "",
     "url": "https://www.i-syst.com/products/blyst-nano",
     "vendor": "I-SYST"
diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
index 99d0caad235df..102102b6c23b2 100644
--- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
@@ -8,7 +8,7 @@
         "dongle_pcba_case.jpg"
     ],
     "mcu": "nrf52",
-    "product": "nrf52840-mdk-usb-dongle",
+    "product": "nrf52840 MDK USB Dongle",
     "thumbnail": "",
     "url": "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle",
     "vendor": "Makerdiary"
diff --git a/ports/nrf/boards/SEEED_XIAO_NRF52/board.json b/ports/nrf/boards/SEEED_XIAO_NRF52/board.json
index d40355bb2e2d8..b00044a56a0c9 100644
--- a/ports/nrf/boards/SEEED_XIAO_NRF52/board.json
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/board.json
@@ -16,8 +16,8 @@
         "XIAO_nrf52840_front.jpg"
     ],
     "mcu": "nrf52",
-    "product": "SEEED XIAO nRF52840 Sense",
+    "product": "XIAO nRF52840 Sense",
     "thumbnail": "",
-    "url": "https://www.seeedstudio.com",
+    "url": "https://www.seeedstudio.com/Seeed-XIAO-BLE-Sense-nRF52840-p-5253.html",
     "vendor": "Seeed Studio"
 }
diff --git a/ports/nrf/boards/WT51822_S4AT/board.json b/ports/nrf/boards/WT51822_S4AT/board.json
index 89d008c6f5da5..2ec42ac4141e9 100644
--- a/ports/nrf/boards/WT51822_S4AT/board.json
+++ b/ports/nrf/boards/WT51822_S4AT/board.json
@@ -8,8 +8,8 @@
         "WT51822-S4AT.jpg"
     ],
     "mcu": "nrf51",
-    "product": "wt51822_s4at",
+    "product": "WT51822-S4AT",
     "thumbnail": "",
-    "url": "http://www.wireless-tag.com/portfolio/wt51822-s4at-2/",
+    "url": "https://shop.wireless-tag.com/products/esp32-c3-mini-1-10pcs-espressif-esp32-c3-mini-1-4mb-flash-pcb-antenna-15-gpios-wifi-ble-5-module-esp32-c3-module-on-esp32-c3-chip",
     "vendor": "Wireless-Tag"
 }
diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
index 4c4d4e4326b3d..70a33b3515016 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/board.json
@@ -15,7 +15,7 @@
         "ABX00074_01.iso_1000x750.jpg"
     ],
     "mcu": "RA6M5",
-    "product": "Arduino Portenta C33",
+    "product": "Portenta C33",
     "thumbnail": "",
     "url": "https://store.arduino.cc/pages/portenta-c33",
     "vendor": "Arduino"
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
index 5639aaa2a4b7b..5914445ed8373 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
@@ -17,7 +17,7 @@
         "ABX00052_01.iso_999x750.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Arduino Nano RP2040 Connect",
+    "product": "Nano RP2040 Connect",
     "thumbnail": "",
     "url": "https://store-usa.arduino.cc/products/arduino-nano-rp2040-connect",
     "vendor": "Arduino"
diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
index df9dd5d0de8e4..108d632678bbf 100644
--- a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
@@ -13,7 +13,7 @@
         "pybstick-rp2040-26-broches-micropython-c.jpg"
     ],
     "mcu": "rp2040",
-    "product": "PYBSTICK26 RP2040",
+    "product": "RP2040 PYBStick",
     "thumbnail": "",
     "url": "https://shop.mchobby.be/product.php?id_product=2331",
     "vendor": "McHobby"
diff --git a/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json
index 5358db627e125..4b12cfda65c7c 100644
--- a/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json
+++ b/ports/rp2/boards/POLOLU_3PI_2040_ROBOT/board.json
@@ -15,7 +15,7 @@
         "pololu_3pi_2040_robot.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Pololu 3pi+ 2040 Robot",
+    "product": "3pi+ 2040 Robot",
     "thumbnail": "",
     "url": "https://www.pololu.com/3pi",
     "vendor": "Pololu"
diff --git a/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json
index 7ef383a9c408b..1ec15ad591d02 100644
--- a/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json
+++ b/ports/rp2/boards/POLOLU_ZUMO_2040_ROBOT/board.json
@@ -16,7 +16,7 @@
         "pololu_zumo_2040_robot.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Pololu Zumo 2040 Robot",
+    "product": "Zumo 2040 Robot",
     "thumbnail": "",
     "url": "https://www.pololu.com/zumo",
     "vendor": "Pololu"
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
index 66cea79ddeea8..5ee6bcb7549cc 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
@@ -14,7 +14,7 @@
         "18288-SparkFun_Pro_Micro_-_RP2040-01.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Pro Micro RP2040",
+    "product": "Pro Micro - RP2040",
     "thumbnail": "",
     "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 e756c9bff445a..ebd68bc5d98f7 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
@@ -17,7 +17,7 @@
         "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Thing Plus RP2040",
+    "product": "Thing Plus - RP2040",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/17745",
     "vendor": "SparkFun"
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/board.json b/ports/rp2/boards/W5100S_EVB_PICO/board.json
index daaf1cf8ac8af..3d052de420472 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/board.json
+++ b/ports/rp2/boards/W5100S_EVB_PICO/board.json
@@ -13,8 +13,8 @@
         "W5100S-EVB-Pico.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Wiznet W5100S-EVB-Pico",
+    "product": "W5100S-EVB-Pico",
     "thumbnail": "",
-    "url": "https://www.wiznet.io/product-item/w5100s-evb-pico/",
-    "vendor": "Wiznet"
+    "url": "https://docs.wiznet.io/Product/iEthernet/W5100S/w5100s-evb-pico",
+    "vendor": "WIZnet"
 }
diff --git a/ports/rp2/boards/W5500_EVB_PICO/board.json b/ports/rp2/boards/W5500_EVB_PICO/board.json
index e7625c343698e..d4298014c0f69 100644
--- a/ports/rp2/boards/W5500_EVB_PICO/board.json
+++ b/ports/rp2/boards/W5500_EVB_PICO/board.json
@@ -13,8 +13,8 @@
         "W5500-EVB-Pico.jpg"
     ],
     "mcu": "rp2040",
-    "product": "Wiznet W5500-EVB-Pico",
+    "product": "W5500-EVB-Pico",
     "thumbnail": "",
     "url": "https://docs.wiznet.io/Product/iEthernet/W5500/w5500-evb-pico",
-    "vendor": "Wiznet"
+    "vendor": "WIZnet"
 }
diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
index 8881b40e732a7..58d89ddf2e34e 100644
--- a/ports/rp2/boards/WEACTSTUDIO/board.json
+++ b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -12,7 +12,7 @@
         "weact_rp2040.jpg"
     ],
     "mcu": "rp2040",
-    "product": "WeAct Studio RP2040",
+    "product": "Studio RP2040",
     "url": "https://github.com/WeActTC/WeActStudio.RP2040CoreBoard",
     "variants": {
         "FLASH_2M": "2 MiB Flash",
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/board.json b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
index 4d19f6b94529a..0d6b2fc30d2c0 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
@@ -10,7 +10,7 @@
         "seeeduino-xiao.jpg"
     ],
     "mcu": "samd21",
-    "product": "Seeeduino XIAO (SAMD21)",
+    "product": "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/SPARKFUN_SAMD51_THING_PLUS/board.json b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
index 51d124e751d6e..6e89cebadd61a 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
@@ -13,7 +13,7 @@
         "sparkfun_samd51_thing_plus.jpg"
     ],
     "mcu": "samd51",
-    "product": "SparkFun SAMD51 Thing Plus",
+    "product": "SAMD51 Thing Plus",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/14713",
     "vendor": "SparkFun"
diff --git a/ports/stm32/boards/ARDUINO_GIGA/board.json b/ports/stm32/boards/ARDUINO_GIGA/board.json
index 53c636c774418..a99e747017773 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/board.json
+++ b/ports/stm32/boards/ARDUINO_GIGA/board.json
@@ -15,7 +15,7 @@
         "ABX00063_01.front_1000x750.jpg"
     ],
     "mcu": "stm32h7",
-    "product": "Arduino Giga",
+    "product": "Giga",
     "thumbnail": "",
     "url": "https://store.arduino.cc/products/giga-r1-wifi",
     "vendor": "Arduino"
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json b/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
index a4c81d69d4277..129d9f2fc7c0e 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/board.json
@@ -15,7 +15,7 @@
         "ABX00051_01.iso_1000x750.jpg"
     ],
     "mcu": "stm32h7",
-    "product": "Arduino Nicla Vision",
+    "product": "Nicla Vision",
     "thumbnail": "",
     "url": "https://store.arduino.cc/products/nicla-vision",
     "vendor": "Arduino"
diff --git a/ports/stm32/boards/ARDUINO_OPTA/board.json b/ports/stm32/boards/ARDUINO_OPTA/board.json
index 3955d7df3182d..dd6c39a191418 100644
--- a/ports/stm32/boards/ARDUINO_OPTA/board.json
+++ b/ports/stm32/boards/ARDUINO_OPTA/board.json
@@ -14,7 +14,7 @@
         "AFX00002_01.iso_1000x750.jpg"
     ],
     "mcu": "stm32h7",
-    "product": "Arduino Opta WiFi",
+    "product": "Opta WiFi",
     "thumbnail": "",
     "url": "https://store.arduino.cc/products/opta-wifi",
     "vendor": "Arduino"
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
index f39d7d4c4792d..c97b9f165c8dc 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
@@ -16,7 +16,7 @@
         "ABX00042_01.iso_1000x750.jpg"
     ],
     "mcu": "stm32h7",
-    "product": "Arduino Portenta H7",
+    "product": "Portenta H7",
     "thumbnail": "",
     "url": "https://store.arduino.cc/products/portenta-h7",
     "vendor": "Arduino"
diff --git a/ports/stm32/boards/HYDRABUS/board.json b/ports/stm32/boards/HYDRABUS/board.json
index 20a2ac5eaef7e..24df6ac99f5c1 100644
--- a/ports/stm32/boards/HYDRABUS/board.json
+++ b/ports/stm32/boards/HYDRABUS/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32f4",
     "product": "HydraBus v1.0",
     "thumbnail": "",
-    "url": "",
+    "url": "https://github.com/hydrabus/hydrabus",
     "vendor": "HydraBus"
 }
diff --git a/ports/stm32/boards/LIMIFROG/board.json b/ports/stm32/boards/LIMIFROG/board.json
index f516963a5bac2..36c80f8f72478 100644
--- a/ports/stm32/boards/LIMIFROG/board.json
+++ b/ports/stm32/boards/LIMIFROG/board.json
@@ -10,6 +10,6 @@
     "mcu": "stm32l4",
     "product": "LimiFrog",
     "thumbnail": "",
-    "url": "",
+    "url": "https://github.com/LimiFrog",
     "vendor": "LimiFrog"
 }
diff --git a/ports/stm32/boards/OLIMEX_E407/board.json b/ports/stm32/boards/OLIMEX_E407/board.json
index c14755c564d91..408df5a320049 100644
--- a/ports/stm32/boards/OLIMEX_E407/board.json
+++ b/ports/stm32/boards/OLIMEX_E407/board.json
@@ -8,8 +8,8 @@
         "olimex_e407.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "E407",
+    "product": "STM32-E407",
     "thumbnail": "",
-    "url": "",
-    "vendor": "OLIMEX"
+    "url": "https://www.olimex.com/Products/ARM/ST/STM32-E407",
+    "vendor": "Olimex"
 }
diff --git a/ports/stm32/boards/OLIMEX_H407/board.json b/ports/stm32/boards/OLIMEX_H407/board.json
index 9ecc860ddc2e3..27d294051312e 100644
--- a/ports/stm32/boards/OLIMEX_H407/board.json
+++ b/ports/stm32/boards/OLIMEX_H407/board.json
@@ -8,8 +8,8 @@
         "olimex_h407.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "H407",
+    "product": "STM32-H407",
     "thumbnail": "",
-    "url": "",
-    "vendor": "OLIMEX"
+    "url": "https://www.olimex.com/Products/ARM/ST/STM32-H407",
+    "vendor": "Olimex"
 }
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
index 01ed363cf3740..5efd188618223 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
@@ -8,8 +8,8 @@
         "sparkfun_micromod_stm32.jpg"
     ],
     "mcu": "stm32f4",
-    "product": "Micromod STM32",
+    "product": "MicroMod STM32",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.sparkfun.com/products/17713",
     "vendor": "SparkFun"
 }

From 17898f8607dc4fb881e860719cc1906d304e60f4 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 16 Apr 2025 16:26:34 +1000
Subject: [PATCH 2307/3129] stm32/machine_adc: Enable ADC re-read errata
 handling for STM32WB55.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/machine_adc.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 8f07075914b88..c3211ea4f4a1a 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -445,10 +445,13 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
 
 static uint32_t adc_read_channel(ADC_TypeDef *adc) {
     uint32_t value;
-    #if defined(STM32G4)
-    // For STM32G4 there is errata 2.7.7, "Wrong ADC result if conversion done late after
-    // calibration or previous conversion".  According to the errata, this can be avoided
-    // by performing two consecutive ADC conversions and keeping the second result.
+    #if defined(STM32G4) || defined(STM32WB)
+    // For STM32G4 errata 2.7.7 / STM32WB errata 2.7.1:
+    // "Wrong ADC result if conversion done late after calibration or previous conversion"
+    // states an incorrect reading is returned if more than 1ms has elapsed since the last
+    // reading or calibration. According to the errata, this can be avoided by performing
+    // two consecutive ADC conversions and keeping the second result.
+    // Note: On STM32WB55 @ 64Mhz each ADC read takes ~ 3us.
     for (uint8_t i = 0; i < 2; i++)
     #endif
     {

From d5f2fc239af2d69407170fa290ba6752c8f1790c Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 7 May 2025 09:11:25 +1000
Subject: [PATCH 2308/3129] extmod/modbluetooth: Add timeout to deinit.

If the BLE radio stops responding before deinit is called the function can
get stuck waiting for an event that is never received, particularly if the
radio is external or on a separate core.

This commit adds a timeout, similar to the timeout already used in the init
function.  Updated for nimble, btstack, esp32 and zephyr bindings.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/btstack/modbluetooth_btstack.c |  7 +++++--
 extmod/modbluetooth.c                 |  7 ++++---
 extmod/modbluetooth.h                 |  2 +-
 extmod/nimble/modbluetooth_nimble.c   | 21 ++++++++++++++++-----
 extmod/nimble/modbluetooth_nimble.h   |  2 +-
 ports/esp32/mpnimbleport.c            |  4 +++-
 ports/unix/main.c                     |  2 +-
 ports/zephyr/modbluetooth_zephyr.c    |  5 +++--
 8 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index b29970842ceb9..7694a1874f40b 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -705,12 +705,12 @@ int mp_bluetooth_init(void) {
     return 0;
 }
 
-void mp_bluetooth_deinit(void) {
+int mp_bluetooth_deinit(void) {
     DEBUG_printf("mp_bluetooth_deinit\n");
 
     // Nothing to do if not initialised.
     if (!MP_STATE_PORT(bluetooth_btstack_root_pointers)) {
-        return;
+        return 0;
     }
 
     mp_bluetooth_gap_advertise_stop();
@@ -737,6 +737,9 @@ void mp_bluetooth_deinit(void) {
     deinit_stack();
 
     DEBUG_printf("mp_bluetooth_deinit: complete\n");
+
+    bool timeout = mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_TIMEOUT;
+    return timeout ? MP_ETIMEDOUT : 0;
 }
 
 bool mp_bluetooth_is_active(void) {
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index b95c42a4ee14a..ffa407809aa71 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -290,12 +290,13 @@ static mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
 static mp_obj_t bluetooth_ble_active(size_t n_args, const mp_obj_t *args) {
     if (n_args == 2) {
         // Boolean enable/disable argument supplied, set current state.
+        int err;
         if (mp_obj_is_true(args[1])) {
-            int err = mp_bluetooth_init();
-            bluetooth_handle_errno(err);
+            err = mp_bluetooth_init();
         } else {
-            mp_bluetooth_deinit();
+            err = mp_bluetooth_deinit();
         }
+        bluetooth_handle_errno(err);
     }
     // Return current state.
     return mp_obj_new_bool(mp_bluetooth_is_active());
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 6a087c8e256cc..24f063fa5d617 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -295,7 +295,7 @@ extern const mp_obj_type_t mp_type_bluetooth_uuid;
 int mp_bluetooth_init(void);
 
 // Disables the Bluetooth stack. Is a no-op when not enabled.
-void mp_bluetooth_deinit(void);
+int mp_bluetooth_deinit(void);
 
 // Returns true when the Bluetooth stack is active.
 bool mp_bluetooth_is_active(void);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 6ca0c172677c7..5e7030e36fab4 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -60,6 +60,7 @@
 static uint8_t nimble_address_mode = BLE_OWN_ADDR_RANDOM;
 
 #define NIMBLE_STARTUP_TIMEOUT 2000
+#define NIMBLE_SHUTDOWN_TIMEOUT 500
 
 // Any BLE_HS_xxx code not in this table will default to MP_EIO.
 static int8_t ble_hs_err_to_errno_table[] = {
@@ -554,7 +555,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_nimble_port_shutdown(void) {
+int 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.
 
@@ -562,9 +563,17 @@ void mp_bluetooth_nimble_port_shutdown(void) {
 
     ble_hs_stop(&ble_hs_shutdown_stop_listener, ble_hs_shutdown_stop_cb, NULL);
 
+    mp_uint_t timeout_start_ticks_ms = mp_hal_ticks_ms();
     while (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
-        mp_event_wait_indefinite();
+        mp_uint_t elapsed = mp_hal_ticks_ms() - timeout_start_ticks_ms;
+        if (elapsed > NIMBLE_SHUTDOWN_TIMEOUT) {
+            // Stack had not responded (via ble_hs_shutdown_stop_cb)
+            return MP_ETIMEDOUT;
+        }
+
+        mp_event_wait_ms(NIMBLE_SHUTDOWN_TIMEOUT - elapsed);
     }
+    return 0;
 }
 
 #endif // !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
@@ -659,10 +668,11 @@ int mp_bluetooth_init(void) {
     return 0;
 }
 
-void mp_bluetooth_deinit(void) {
+int mp_bluetooth_deinit(void) {
     DEBUG_printf("mp_bluetooth_deinit %d\n", mp_bluetooth_nimble_ble_state);
+    int ret = 0;
     if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
-        return;
+        return 0;
     }
 
     // Must call ble_hs_stop() in a port-specific way to stop the background
@@ -675,7 +685,7 @@ void mp_bluetooth_deinit(void) {
 
         DEBUG_printf("mp_bluetooth_deinit: starting port shutdown\n");
 
-        mp_bluetooth_nimble_port_shutdown();
+        ret = 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;
@@ -692,6 +702,7 @@ void mp_bluetooth_deinit(void) {
     #endif
 
     DEBUG_printf("mp_bluetooth_deinit: shut down\n");
+    return ret;
 }
 
 bool mp_bluetooth_is_active(void) {
diff --git a/extmod/nimble/modbluetooth_nimble.h b/extmod/nimble/modbluetooth_nimble.h
index d9bef649201ce..0dd20eb658fa8 100644
--- a/extmod/nimble/modbluetooth_nimble.h
+++ b/extmod/nimble/modbluetooth_nimble.h
@@ -84,7 +84,7 @@ void mp_bluetooth_nimble_port_hci_deinit(void);
 void mp_bluetooth_nimble_port_start(void);
 
 // Tell the port to stop its background task.
-void mp_bluetooth_nimble_port_shutdown(void);
+int 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);
diff --git a/ports/esp32/mpnimbleport.c b/ports/esp32/mpnimbleport.c
index ce4b77727a190..77185883fd437 100644
--- a/ports/esp32/mpnimbleport.c
+++ b/ports/esp32/mpnimbleport.c
@@ -58,7 +58,7 @@ void mp_bluetooth_nimble_port_start(void) {
     nimble_port_freertos_init(ble_host_task);
 }
 
-void mp_bluetooth_nimble_port_shutdown(void) {
+int mp_bluetooth_nimble_port_shutdown(void) {
     DEBUG_printf("mp_bluetooth_nimble_port_shutdown\n");
 
     #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK
@@ -79,6 +79,8 @@ void mp_bluetooth_nimble_port_shutdown(void) {
 
     // Mark stack as shutdown.
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
+
+    return 0;
 }
 
 #endif
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 9f51573fbfbe9..530e20a3863b4 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -775,7 +775,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
     #endif
 
     #if MICROPY_PY_BLUETOOTH
-    void mp_bluetooth_deinit(void);
+    int mp_bluetooth_deinit(void);
     mp_bluetooth_deinit();
     #endif
 
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index cdbeb7fc353ff..c1b8ddfd8b404 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -305,11 +305,11 @@ int mp_bluetooth_init(void) {
     return 0;
 }
 
-void mp_bluetooth_deinit(void) {
+int 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;
+        return 0;
     }
 
     mp_bluetooth_gap_advertise_stop();
@@ -332,6 +332,7 @@ void mp_bluetooth_deinit(void) {
 
     MP_STATE_PORT(bluetooth_zephyr_root_pointers) = NULL;
     mp_bt_zephyr_next_conn = NULL;
+    return 0;
 }
 
 bool mp_bluetooth_is_active(void) {

From b15348415e9d5ad2a978ca38a8da356faee88e91 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 May 2025 00:17:56 +1000
Subject: [PATCH 2309/3129] extmod/modframebuf: Add support for blit'ing
 read-only data.

Currently the `FrameBuffer.blit(buf, x, y)` method requires the `buf`
argument to be another `FrameBuffer`, which is quite restrictive because it
doesn't allow blit'ing read-only memory/data.

This commit extends `blit()` to allow the `buf` argument to be a tuple or
list of the form:

    (buffer, width, height, format[, stride])

where `buffer` can be anything with the buffer protocol and may be
read-only, eg `bytes`.

Also, the palette argument to `blit()` may be of the same form.

The form of this tuple/list was chosen to be the same as the signature of
the `FrameBuffer` constructor (that saves quite a bit of code size doing it
that way).

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/framebuf.rst           | 12 +++++
 examples/natmod/framebuf/framebuf.c |  3 ++
 extmod/modframebuf.c                | 57 ++++++++++++++++--------
 tests/extmod/framebuf_blit.py       | 68 +++++++++++++++++++++++++++++
 tests/extmod/framebuf_blit.py.exp   | 45 +++++++++++++++++++
 5 files changed, 167 insertions(+), 18 deletions(-)
 create mode 100644 tests/extmod/framebuf_blit.py
 create mode 100644 tests/extmod/framebuf_blit.py.exp

diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index f22a3613bdbcb..e2a231207d673 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -137,6 +137,18 @@ Other methods
     is compared to the value from *palette*, not to the value directly from
     *fbuf*.)
 
+    *fbuf* can be another FrameBuffer instance, or a tuple or list of the form::
+
+        (buffer, width, height, format)
+
+    or::
+
+        (buffer, width, height, format, stride)
+
+    This matches the signature of the FrameBuffer constructor, and the elements
+    of the tuple/list are the same as the arguments to the constructor except that
+    the *buffer* here can be read-only.
+
     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
diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index 1ba702e33d907..5fd7c6be3a456 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -4,6 +4,9 @@
 #include "py/dynruntime.h"
 
 #if !defined(__linux__)
+void *memcpy(void *dst, const void *src, size_t n) {
+    return mp_fun_table.memmove_(dst, src, n);
+}
 void *memset(void *s, int c, size_t n) {
     return mp_fun_table.memset_(s, c, n);
 }
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index b718a66cc62fe..5c4b9abf0c0b8 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -270,8 +270,7 @@ 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_in) {
-    mp_arg_check_num(n_args, n_kw, 4, 5, false);
+static mp_obj_t framebuf_make_new_helper(size_t n_args, const mp_obj_t *args_in, unsigned int buf_flags, mp_obj_framebuf_t *o) {
 
     mp_int_t width = mp_obj_get_int(args_in[1]);
     mp_int_t height = mp_obj_get_int(args_in[2]);
@@ -318,13 +317,15 @@ static mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size
     }
 
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
+    mp_get_buffer_raise(args_in[0], &bufinfo, buf_flags);
 
     if ((strides_required * stride + (height_required - strides_required) * width_required) * bpp / 8 > bufinfo.len) {
         mp_raise_ValueError(NULL);
     }
 
-    mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, type);
+    if (o == NULL) {
+        o = mp_obj_malloc(mp_obj_framebuf_t, (const mp_obj_type_t *)&mp_type_framebuf);
+    }
     o->buf_obj = args_in[0];
     o->buf = bufinfo.buf;
     o->width = width;
@@ -335,6 +336,11 @@ 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 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);
+    return framebuf_make_new_helper(n_args, args_in, MP_BUFFER_WRITE, NULL);
+}
+
 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]);
@@ -707,13 +713,27 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_poly_obj, 5, 6, framebuf_pol
 
 #endif // MICROPY_PY_ARRAY
 
+static void get_readonly_framebuffer(mp_obj_t arg, mp_obj_framebuf_t *rofb) {
+    mp_obj_t fb = mp_obj_cast_to_native_base(arg, MP_OBJ_FROM_PTR(&mp_type_framebuf));
+    if (fb != MP_OBJ_NULL) {
+        *rofb = *(mp_obj_framebuf_t *)MP_OBJ_TO_PTR(fb);
+    } else {
+        // A tuple/list of the form: (buffer, width, height, format[, stride]).
+        size_t len;
+        mp_obj_t *items;
+        mp_obj_get_array(arg, &len, &items);
+        if (len < 4 || len > 5) {
+            mp_raise_ValueError(NULL);
+        }
+        framebuf_make_new_helper(len, items, MP_BUFFER_READ, rofb);
+    }
+}
+
 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_obj_framebuf_t source;
+    get_readonly_framebuffer(args_in[1], &source);
 
     mp_int_t x = mp_obj_get_int(args_in[2]);
     mp_int_t y = mp_obj_get_int(args_in[3]);
@@ -721,16 +741,17 @@ static mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args_in) {
     if (n_args > 4) {
         key = mp_obj_get_int(args_in[4]);
     }
-    mp_obj_framebuf_t *palette = NULL;
+    mp_obj_framebuf_t palette;
+    palette.buf = NULL;
     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)));
+        get_readonly_framebuffer(args_in[5], &palette);
     }
 
     if (
         (x >= self->width) ||
         (y >= self->height) ||
-        (-x >= source->width) ||
-        (-y >= source->height)
+        (-x >= source.width) ||
+        (-y >= source.height)
         ) {
         // Out of bounds, no-op.
         return mp_const_none;
@@ -741,15 +762,15 @@ static mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args_in) {
     int y0 = MAX(0, y);
     int x1 = MAX(0, -x);
     int y1 = MAX(0, -y);
-    int x0end = MIN(self->width, x + source->width);
-    int y0end = MIN(self->height, y + source->height);
+    int x0end = MIN(self->width, x + source.width);
+    int y0end = MIN(self->height, y + source.height);
 
     for (; y0 < y0end; ++y0) {
         int cx1 = x1;
         for (int cx0 = x0; cx0 < x0end; ++cx0) {
-            uint32_t col = getpixel(source, cx1, y1);
-            if (palette) {
-                col = getpixel(palette, col, 0);
+            uint32_t col = getpixel(&source, cx1, y1);
+            if (palette.buf) {
+                col = getpixel(&palette, col, 0);
             }
             if (col != (uint32_t)key) {
                 setpixel(self, cx0, y0, col);
diff --git a/tests/extmod/framebuf_blit.py b/tests/extmod/framebuf_blit.py
new file mode 100644
index 0000000000000..b1d98b330a838
--- /dev/null
+++ b/tests/extmod/framebuf_blit.py
@@ -0,0 +1,68 @@
+# Test FrameBuffer.blit method.
+
+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 = 5
+h = 4
+buf = bytearray(w * h)
+fbuf = framebuf.FrameBuffer(buf, w, h, framebuf.GS8)
+
+fbuf2 = framebuf.FrameBuffer(bytearray(4), 2, 2, framebuf.GS8)
+fbuf2.fill(0xFF)
+
+# Blit another FrameBuffer, at various locations.
+for x, y in ((-1, -1), (0, 0), (1, 1), (4, 3)):
+    fbuf.fill(0)
+    fbuf.blit(fbuf2, x, y)
+    printbuf()
+
+# Blit a bytes object.
+fbuf.fill(0)
+image = (b"\x10\x11\x12\x13", 2, 2, framebuf.GS8)
+fbuf.blit(image, 1, 1)
+printbuf()
+
+# Blit a bytes object that has a stride.
+fbuf.fill(0)
+image = (b"\x20\x21\xff\x22\x23\xff", 2, 2, framebuf.GS8, 3)
+fbuf.blit(image, 1, 1)
+printbuf()
+
+# Blit a bytes object with a bytes palette.
+fbuf.fill(0)
+image = (b"\x00\x01\x01\x00", 2, 2, framebuf.GS8)
+palette = (b"\xa1\xa2", 2, 1, framebuf.GS8)
+fbuf.blit(image, 1, 1, -1, palette)
+printbuf()
+
+# Not enough elements in the tuple.
+try:
+    fbuf.blit((0, 0, 0), 0, 0)
+except ValueError:
+    print("ValueError")
+
+# Too many elements in the tuple.
+try:
+    fbuf.blit((0, 0, 0, 0, 0, 0), 0, 0)
+except ValueError:
+    print("ValueError")
+
+# Bytes too small.
+try:
+    fbuf.blit((b"", 1, 1, framebuf.GS8), 0, 0)
+except ValueError:
+    print("ValueError")
diff --git a/tests/extmod/framebuf_blit.py.exp b/tests/extmod/framebuf_blit.py.exp
new file mode 100644
index 0000000000000..e340f1990c783
--- /dev/null
+++ b/tests/extmod/framebuf_blit.py.exp
@@ -0,0 +1,45 @@
+--8<--
+ff00000000
+0000000000
+0000000000
+0000000000
+-->8--
+--8<--
+ffff000000
+ffff000000
+0000000000
+0000000000
+-->8--
+--8<--
+0000000000
+00ffff0000
+00ffff0000
+0000000000
+-->8--
+--8<--
+0000000000
+0000000000
+0000000000
+00000000ff
+-->8--
+--8<--
+0000000000
+0010110000
+0012130000
+0000000000
+-->8--
+--8<--
+0000000000
+0020210000
+0022230000
+0000000000
+-->8--
+--8<--
+0000000000
+00a1a20000
+00a2a10000
+0000000000
+-->8--
+ValueError
+ValueError
+ValueError

From 7f274c7550654160f73b0de8fa73338dc58109a6 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 23 May 2025 14:39:37 +1000
Subject: [PATCH 2310/3129] py/scheduler: Only run scheduler callbacks queued
 before run started.

Without this change, a scheduler callback which itself queues a new
callback will have that callback executed as part of the same scheduler
run. Where a callback may re-queue itself, this can lead to an infinite
loop.

With this change, each call to mp_handle_pending() will only service the
callbacks which were queued when the scheduler pass started - any callbacks
added during the run are serviced on the next mp_handle_pending().

This does mean some interrupts may have higher latency (as callback is
deferred until next scheduler run), but the worst-case latency should stay
very similar.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/scheduler.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/py/scheduler.c b/py/scheduler.c
index 2170b9577e124..d4cdb59efb6b5 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -88,17 +88,21 @@ static inline void mp_sched_run_pending(void) {
 
     #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();
+    mp_sched_node_t *original_tail = MP_STATE_VM(sched_tail);
+    if (original_tail != NULL) {
+        mp_sched_node_t *node;
+        do {
+            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();
+        } while (node != original_tail); // Don't execute any callbacks scheduled during this run
     }
     #endif
 

From 820485358d1f2a53a5fb019e571b13729ccb1158 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 5 May 2025 15:31:53 +1000
Subject: [PATCH 2311/3129] unix/coverage: Add coverage test for
 mp_sched_schedule_node.

Test modified to reschedule itself based on a flag setting. Without the
change in the parent commit, this test executes the callback indefinitely
and hangs but with the change it runs only once each time
mp_handle_pending() is called.

Modified-by: Angus Gratton <angus@redyak.com.au>
Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/unix/coverage.c                         | 25 +++++++++++++++++++
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 tests/ports/unix/extra_coverage.py.exp        |  7 ++++++
 3 files changed, 33 insertions(+)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 2b65b47fc5bc9..29e1457cb717e 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -184,6 +184,18 @@ static void pairheap_test(size_t nops, int *ops) {
     mp_printf(&mp_plat_print, "\n");
 }
 
+static mp_sched_node_t mp_coverage_sched_node;
+static bool coverage_sched_function_continue;
+
+static void coverage_sched_function(mp_sched_node_t *node) {
+    (void)node;
+    mp_printf(&mp_plat_print, "scheduled function\n");
+    if (coverage_sched_function_continue) {
+        // Re-scheduling node will cause it to run again next time scheduled functions are run
+        mp_sched_schedule_node(&mp_coverage_sched_node, coverage_sched_function);
+    }
+}
+
 // function to run extra tests for things that can't be checked by scripts
 static mp_obj_t extra_coverage(void) {
     // mp_printf (used by ports that don't have a native printf)
@@ -621,6 +633,19 @@ static mp_obj_t extra_coverage(void) {
             mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
         }
         mp_handle_pending(true);
+
+        coverage_sched_function_continue = true;
+        mp_sched_schedule_node(&mp_coverage_sched_node, coverage_sched_function);
+        for (int i = 0; i < 3; ++i) {
+            mp_printf(&mp_plat_print, "loop\n");
+            mp_handle_pending(true);
+        }
+        // Clear this flag to prevent the function scheduling itself again
+        coverage_sched_function_continue = false;
+        // Will only run the first time through this loop, then not scheduled again
+        for (int i = 0; i < 3; ++i) {
+            mp_handle_pending(true);
+        }
     }
 
     // ringbuf
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 04b5b8ae1ae70..cfefeb46720f8 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -44,6 +44,7 @@
 #undef MICROPY_VFS_ROM_IOCTL
 #define MICROPY_VFS_ROM_IOCTL          (1)
 #define MICROPY_PY_CRYPTOLIB_CTR       (1)
+#define MICROPY_SCHEDULER_STATIC_NODES (1)
 
 // Enable os.uname for attrtuple coverage test
 #define MICROPY_PY_OS_UNAME            (1)
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 5ff947e883d37..19b32f1c9d945 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -122,6 +122,13 @@ unlocked
 KeyboardInterrupt: 
 KeyboardInterrupt: 
 10
+loop
+scheduled function
+loop
+scheduled function
+loop
+scheduled function
+scheduled function
 # ringbuf
 99 0
 98 1

From e869dae31e19a283ff62f4a49125a9d97aacd499 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 May 2025 22:44:19 +1000
Subject: [PATCH 2312/3129] mpy-cross/main: Exit with error if arch not
 specified with emit=native.

Currently, mpy-cross will crash if called as:

    mpy-cross -X emit=native foo.py

because it tries to use the native emitter with no target architecture set.

Fix that by checking that an architecture is set when `-X emit=native` or
`-X emit=viper` is used.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/main.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 7ab95149c720c..5375f38ac66c1 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -350,6 +350,15 @@ MP_NOINLINE int main_(int argc, char **argv) {
         }
     }
 
+    #if MICROPY_EMIT_NATIVE
+    if ((MP_STATE_VM(default_emit_opt) == MP_EMIT_OPT_NATIVE_PYTHON
+         || MP_STATE_VM(default_emit_opt) == MP_EMIT_OPT_VIPER)
+        && mp_dynamic_compiler.native_arch == MP_NATIVE_ARCH_NONE) {
+        mp_printf(&mp_stderr_print, "arch not specified\n");
+        exit(1);
+    }
+    #endif
+
     if (input_file == NULL) {
         mp_printf(&mp_stderr_print, "no input file\n");
         exit(1);

From 9174cffc47a5c317dab174fee4e76678a0554068 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 May 2025 22:44:39 +1000
Subject: [PATCH 2313/3129] mpy-cross/main: Document emit=host option in help.

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

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 5375f38ac66c1..16f749ae4dc35 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -130,7 +130,7 @@ static int usage(char **argv) {
         "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;\n"
-        "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin, rv32imc, debug\n"
+        "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin, rv32imc, host, debug\n"
         "\n"
         "Implementation specific options:\n", argv[0]
         );

From bf2005de9e3d9e75a26a6bb98e82be8511266604 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 7 Apr 2025 22:25:00 +0200
Subject: [PATCH 2314/3129] tools/mpy_ld.py: Resolve fixed-address symbols if
 requested.

This commit lets mpy_ld.py resolve symbols not only from the object
files involved in the linking process, or from compiler-supplied static
libraries, but also from a list of symbols referenced by an absolute
address (usually provided by the system's ROM).

This is needed for ESP8266 targets as some C stdlib functions are
provided by the MCU's own ROM code to reduce the final code footprint,
and therefore those functions' implementation was removed from the
compiler's support libraries.  This means that unless `LINK_RUNTIME` is
set (which lets tooling look at more libraries to resolve symbols) the
build process will fail as tooling is unaware of the ROM symbols'
existence.  With this change, fixed-address symbols can be exposed to
the symbol resolution step when performing natmod linking.

If there are symbols coming in from a fixed-address symbols list and
internal code or external libraries, the fixed-address symbol address
will take precedence in all cases.

Although this is - in theory - also working for the whole range of ESP32
MCUs, testing is currently limited to Xtensa processors and the example
natmods' makefiles only make use of this commit's changes for the
ESP8266 target.

Natmod builds can set the MPY_EXTERN_SYM_FILE variable pointing to a
linkerscript file containing a series of symbols (weak or strong) at a
fixed address; these symbols will then be used by the MicroPython
linker when packaging the natmod.  If a different natmod build method is
used (eg. custom CMake scripts), `tools/mpy_ld.py` can now accept a
command line parameter called `--externs` (or its short variant `-e`)
that contains the path of a linkerscript file with the fixed-address
symbols to use when performing the linking process.

The linkerscript file parser can handle a very limited subset of
binutils's linkerscript syntax, namely just block comments, strong
symbols, and weak symbols.  Each symbol must be in its own line for the
parser to succeed, empty lines or comment blocks are skipped.  For an
example of what this parser was meant to handle, you can look at
`ports/esp8266/boards/eagle.rom.addr.v6.ld` and follow its format.

The natmod developer documentation is also updated to reflect the new
command line argument accepted by `mpy_ld.py` and the use cases for the
changes introduced by this commit.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/develop/natmod.rst |  9 ++++-
 py/dynruntime.mk        |  3 ++
 tools/mpy_ld.py         | 82 +++++++++++++++++++++++++++++++++++++++--
 3 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index 18678eaefbf11..2ccd83288565c 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -81,7 +81,14 @@ Linker limitation: the native module is not linked against the symbol table of t
 full MicroPython firmware.  Rather, it is linked against an explicit table of exported
 symbols found in ``mp_fun_table`` (in ``py/nativeglue.h``), that is fixed at firmware
 build time.  It is thus not possible to simply call some arbitrary HAL/OS/RTOS/system
-function, for example.
+function, for example, unless that resides at a fixed address. In that case, the path
+of a linkerscript containing a series of symbol names and their fixed address can be
+passed to ``mpy_ld.py`` via the ``--externs`` command line argument. That way symbols
+appearing in the linkerscript will take precedence over what is provided from object
+files, but at the moment the object files' implementation will still reside in the
+final MPY file. The linkerscript parser is limited in its capabilities, and is
+currently used only for parsing the ESP8266 port ROM symbols list (see
+``ports/esp8266/boards/eagle.rom.addr.v6.ld``).
 
 New symbols can be added to the end of the table and the firmware rebuilt.
 The symbols also need to be added to ``tools/mpy_ld.py``'s ``fun_table`` dict in the
diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 1ef521bd9aecc..84c78d6225c5a 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -172,6 +172,9 @@ endif
 endif
 MPY_LD_FLAGS += $(addprefix -l, $(LIBGCC_PATH) $(LIBM_PATH))
 endif
+ifneq ($(MPY_EXTERN_SYM_FILE),)
+MPY_LD_FLAGS += --externs "$(realpath $(MPY_EXTERN_SYM_FILE))"
+endif
 
 CFLAGS += $(CFLAGS_EXTRA)
 
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index a47653f900cc8..6518037f2ef33 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -402,6 +402,7 @@ def __init__(self, arch):
         self.known_syms = {}  # dict of symbols that are defined
         self.unresolved_syms = []  # list of unresolved symbols
         self.mpy_relocs = []  # list of relocations needed in the output .mpy file
+        self.externs = {}  # dict of externally-defined symbols
 
     def check_arch(self, arch_name):
         if arch_name != self.arch.name:
@@ -491,10 +492,14 @@ def populate_got(env):
         sym = got_entry.sym
         if hasattr(sym, "resolved"):
             sym = sym.resolved
-        sec = sym.section
-        addr = sym["st_value"]
-        got_entry.sec_name = sec.name
-        got_entry.link_addr += sec.addr + addr
+        if sym.name in env.externs:
+            got_entry.sec_name = ".external.fixed_addr"
+            got_entry.link_addr = env.externs[sym.name]
+        else:
+            sec = sym.section
+            addr = sym["st_value"]
+            got_entry.sec_name = sec.name
+            got_entry.link_addr += sec.addr + addr
 
     # Get sorted GOT, sorted by external, text, rodata, bss so relocations can be combined
     got_list = sorted(
@@ -520,6 +525,9 @@ def populate_got(env):
             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 == ".external.fixed_addr":
+            # Fixed-address symbols should not be relocated.
+            continue
         elif got_entry.sec_name.startswith(".text"):
             dest = ".text"
         elif got_entry.sec_name.startswith(".rodata"):
@@ -1207,6 +1215,9 @@ def link_objects(env, native_qstr_vals_len):
             sym.section = env.obj_table_section
         elif sym.name in env.known_syms:
             sym.resolved = env.known_syms[sym.name]
+        elif sym.name in env.externs:
+            # Fixed-address symbols do not need pre-processing.
+            continue
         else:
             if sym.name in fun_table:
                 sym.section = mp_fun_table_sec
@@ -1214,6 +1225,15 @@ def link_objects(env, native_qstr_vals_len):
             else:
                 undef_errors.append("{}: undefined symbol: {}".format(sym.filename, sym.name))
 
+    for sym in env.externs:
+        if sym in env.known_syms:
+            log(
+                LOG_LEVEL_1,
+                "Symbol {} is a fixed-address symbol at {:08x} and is also provided from an object file".format(
+                    sym, env.externs[sym]
+                ),
+            )
+
     if undef_errors:
         raise LinkError("\n".join(undef_errors))
 
@@ -1456,6 +1476,9 @@ def do_link(args):
     log(LOG_LEVEL_2, "qstr vals: " + ", ".join(native_qstr_vals))
     env = LinkEnv(args.arch)
     try:
+        if args.externs:
+            env.externs = parse_linkerscript(args.externs)
+
         # Load object files
         for fn in args.files:
             with open(fn, "rb") as f:
@@ -1484,6 +1507,50 @@ def do_link(args):
         sys.exit(1)
 
 
+def parse_linkerscript(source):
+    # This extracts fixed-address symbol lists from linkerscripts, only parsing
+    # a small subset of all possible directives.  Right now the only
+    # linkerscript file this is really tested against is the ESP8266's builtin
+    # ROM functions list ($SDK/ld/eagle.rom.addr.v6.ld).
+    #
+    # The parser should be able to handle symbol entries inside ESP-IDF's ROM
+    # symbol lists for the ESP32 range of MCUs as well (see *.ld files in
+    # $SDK/components/esp_rom/<name>/).
+
+    symbols = {}
+
+    LINE_REGEX = re.compile(
+        r'^(?P<weak>PROVIDE\()?'  # optional weak marker start
+        r'(?P<symbol>[a-zA-Z_]\w*)'  # symbol name
+        r'=0x(?P<address>[\da-fA-F]{1,8})*'  # symbol address
+        r'(?(weak)\));$',  # optional weak marker end and line terminator
+        re.ASCII,
+    )
+
+    inside_comment = False
+    for line in (line.strip() for line in source.readlines()):
+        if line.startswith('/*') and not inside_comment:
+            if not line.endswith('*/'):
+                inside_comment = True
+            continue
+        if inside_comment:
+            if line.endswith('*/'):
+                inside_comment = False
+            continue
+        if line.startswith('//'):
+            continue
+        match = LINE_REGEX.match(''.join(line.split()))
+        if not match:
+            continue
+        tokens = match.groupdict()
+        symbol = tokens['symbol']
+        address = int(tokens['address'], 16)
+        if symbol in symbols:
+            raise ValueError(f"Symbol {symbol} already defined")
+        symbols[symbol] = address
+    return symbols
+
+
 def main():
     import argparse
 
@@ -1500,6 +1567,13 @@ def main():
     cmd_parser.add_argument(
         "--output", "-o", default=None, help="output .mpy file (default to input with .o->.mpy)"
     )
+    cmd_parser.add_argument(
+        "--externs",
+        "-e",
+        type=argparse.FileType("rt"),
+        default=None,
+        help="linkerscript providing fixed-address symbols to augment symbol resolution",
+    )
     cmd_parser.add_argument("files", nargs="+", help="input files")
     args = cmd_parser.parse_args()
 

From 9ef7322a5d11937e061b85da12900eeee62e9891 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 9 Apr 2025 21:58:19 +0200
Subject: [PATCH 2315/3129] tests/run-natmodtests.py: Allow injected code
 customisation.

This commit introduces a mechanism to customise the code that is
injected to the board when performing a native module import.

A new argument, "-b"/"--begin", is added so regular Python code can be
inserted in the injected fragment between the module file creation and
the effective module import.  This is needed for running natmod tests on
ESP8266 as that board does not have enough memory to fit certain modules
unless additional configuration is performed.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/run-natmodtests.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index b858989daa434..073e0b053e699 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -73,6 +73,7 @@ def open(self, path, mode):
     return __File()
 vfs.mount(__FS(), '/__remote')
 sys.path.insert(0, '/__remote')
+{import_prelude}
 sys.modules['{}'] = __import__('__injected')
 """
 
@@ -133,6 +134,13 @@ def detect_architecture(target):
 
 
 def run_tests(target_truth, target, args, stats, resolved_arch):
+    global injected_import_hook_code
+
+    prelude = ""
+    if args.begin:
+        prelude = args.begin.read()
+    injected_import_hook_code = injected_import_hook_code.replace("{import_prelude}", prelude)
+
     for test_file in args.files:
         # Find supported test
         test_file_basename = os.path.basename(test_file)
@@ -212,6 +220,13 @@ def main():
     cmd_parser.add_argument(
         "-a", "--arch", choices=AVAILABLE_ARCHS, help="override native architecture of the target"
     )
+    cmd_parser.add_argument(
+        "-b",
+        "--begin",
+        type=argparse.FileType("rt"),
+        default=None,
+        help="prologue python file to execute before module import",
+    )
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     args = cmd_parser.parse_args()
 

From 0bf2fd7ad034404208d79339c1bd82136b1cd4e3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 7 Apr 2025 22:36:26 +0200
Subject: [PATCH 2316/3129] examples/natmod/random: Fix build for Xtensa.

This commit provides the appropriate external symbol addresses to let
the "random" example natmod build for the Xtensa platform.

On the ESP8266, signed integer division code isn't provided as part of
libgcc.a, libm.a, or libc.a, but it is instead provided by the ROM.
Regular builds inject the appropriate symbol addresses as part of the
linking process (see eagle.rom.addr.v6.ld), but natmods need this
information brought in from somewhere else.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 examples/natmod/random/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/natmod/random/Makefile b/examples/natmod/random/Makefile
index 8abdb66dc8724..5d23eac1e9cfd 100644
--- a/examples/natmod/random/Makefile
+++ b/examples/natmod/random/Makefile
@@ -8,6 +8,10 @@ MOD = random_$(ARCH)
 SRC = random.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
-ARCH = x64
+ARCH ?= x64
+
+ifeq ($(ARCH),xtensa)
+MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
+endif
 
 include $(MPY_DIR)/py/dynruntime.mk

From 462ee12d3c9b04d815eb347881b7b2f4951a17c1 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 7 Apr 2025 22:45:45 +0200
Subject: [PATCH 2317/3129] examples/natmod/framebuf: Fix build for Xtensa.

This commit provides the appropriate external symbol addresses to let
the "framebuf" example natmod build for the Xtensa platform.

On the ESP8266, integer division code isn't provided as part of
libgcc.a, libm.a, or libc.a, but it is instead provided by the ROM.
Regular builds inject the appropriate symbol addresses as part of the
linking process (see eagle.rom.addr.v6.ld), but natmods need this
information brought in from somewhere else.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 examples/natmod/framebuf/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/natmod/framebuf/Makefile b/examples/natmod/framebuf/Makefile
index 2e2b815975432..cb821736e70dc 100644
--- a/examples/natmod/framebuf/Makefile
+++ b/examples/natmod/framebuf/Makefile
@@ -8,6 +8,10 @@ MOD = framebuf_$(ARCH)
 SRC = framebuf.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
-ARCH = x64
+ARCH ?= x64
+
+ifeq ($(ARCH),xtensa)
+MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
+endif
 
 include $(MPY_DIR)/py/dynruntime.mk

From 887125fc589de9ada0bc532d9bdc29a3806694c3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 1 Jun 2025 10:56:58 +0200
Subject: [PATCH 2318/3129] examples/natmod/deflate: Fix build for Xtensa.

This commit provides the appropriate external symbol addresses to let
the "deflate" example natmod build for the Xtensa platform.

Unlike other natmods that require an external symbol list to build
without bringing in the whole runtime libraries set, this natmod is
referencing the `__modsi3` symbol which was removed from the ESP8266's
SDK but not present in ROM.  The latter only has a `__umodsi3`
implementation that only operates on unsigned values, and thus unable to
handle this natmod.  Thus, the extended library resolution process is
enabled for this natmod as a `__modsi3` implementation is made available
that way (still using ROM symbols whenever possible).  This also means
that symbols that appear in both ROM and external libraries sort of
co-exist in the final MPY file, with ROM symbols being used by natmod
code but the implementation from the library still exists in the final
MPY file, unused.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 examples/natmod/deflate/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/natmod/deflate/Makefile b/examples/natmod/deflate/Makefile
index 504130d5723b3..1f63de20d206e 100644
--- a/examples/natmod/deflate/Makefile
+++ b/examples/natmod/deflate/Makefile
@@ -8,6 +8,12 @@ MOD = deflate_$(ARCH)
 SRC = deflate.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
-ARCH = x64
+ARCH ?= x64
+
+ifeq ($(ARCH),xtensa)
+# Link with libm.a and libgcc.a from the toolchain
+LINK_RUNTIME = 1
+MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
+endif
 
 include $(MPY_DIR)/py/dynruntime.mk

From 4227654d4294b778b2bbba8a3b735882786b1d2d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 1 Jun 2025 11:24:48 +0200
Subject: [PATCH 2319/3129] examples/natmod/btree: Fix build for Xtensa.

This commit provides the appropriate external symbol addresses to let
the "btree" example natmod build for the Xtensa platform.

On the ESP8266, unsigned integer division code isn't provided as part of
libgcc.a, libm.a, or libc.a, but it is instead provided by the ROM.
Regular builds inject the appropriate symbol addresses as part of the
linking process (see eagle.rom.addr.v6.ld), but natmods need this
information brought in from somewhere else.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 examples/natmod/btree/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/natmod/btree/Makefile b/examples/natmod/btree/Makefile
index ff130d61b3793..6273ccc6572a9 100644
--- a/examples/natmod/btree/Makefile
+++ b/examples/natmod/btree/Makefile
@@ -8,7 +8,7 @@ MOD = btree_$(ARCH)
 SRC = btree_c.c
 
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
-ARCH = x64
+ARCH ?= x64
 
 BTREE_DIR = $(MPY_DIR)/lib/berkeley-db-1.xx
 BERKELEY_DB_CONFIG_FILE ?= \"extmod/berkeley-db/berkeley_db_config_port.h\"
@@ -32,6 +32,10 @@ SRC += $(addprefix $(realpath $(BTREE_DIR))/,\
 	mpool/mpool.c \
 	)
 
+ifeq ($(ARCH),xtensa)
+MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
+endif
+
 include $(MPY_DIR)/py/dynruntime.mk
 
 # btree needs gnu99 defined

From e4c0e2b73d0e8842160c86a39706d872ec226b6c Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 1 Jun 2025 18:54:37 +0200
Subject: [PATCH 2320/3129] esp8266/main: Print error information on
 crash-induced reboots.

This commit adds an optional configuration option for the ESP8266 port
that, if the board rebooted due to a crash, will print to stdout some
information about the error that triggered the issue.

It is not possible using regular SDK functions to intercept errors and
print information at that stage, and the only error response from the
board is to reboot itself.  This is the next best thing, print some
error information just once at boot time after the crash - the least
invasive option given the situation we're in.

This is disabled by default, and can be enabled by enabling
MICROPY_HW_HARD_FAULT_DEBUG in the port configuration - obviously with a
small increase in the firmware code footprint.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp8266/main.c         | 62 ++++++++++++++++++++++++++++++++++++
 ports/esp8266/mpconfigport.h |  3 ++
 2 files changed, 65 insertions(+)

diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 2dd7c1dece3a4..da712fce9be15 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -49,6 +49,64 @@
 
 static char heap[38 * 1024];
 
+#if MICROPY_HW_HARD_FAULT_DEBUG
+
+static void format_hex(uint32_t hex, char *buffer) {
+    static const char table[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+    int offset = 7;
+    uint32_t value = hex;
+    while (offset >= 0) {
+        buffer[offset--] = table[value & 0x0F];
+        value >>= 4;
+    }
+}
+
+static void print_reset_info(void) {
+    struct rst_info *rst_info = system_get_rst_info();
+    if ((rst_info->reason == REASON_WDT_RST) || (rst_info->reason == REASON_EXCEPTION_RST) || (rst_info->reason == REASON_SOFT_WDT_RST)) {
+        char buffer[8];
+        mp_hal_stdout_tx_str("\r\n\r\nThe system restarted due to an error.\r\n\r\nReason: ");
+        switch (rst_info->reason) {
+            case REASON_WDT_RST:
+                mp_hal_stdout_tx_str("WDT");
+                break;
+
+            case REASON_EXCEPTION_RST:
+                mp_hal_stdout_tx_str("EXCEPTION");
+                break;
+
+            case REASON_SOFT_WDT_RST:
+                mp_hal_stdout_tx_str("SOFT_WDT");
+                break;
+
+            default:
+                assert(!"Should not ever get here.");
+                break;
+        }
+        mp_hal_stdout_tx_str(" Cause: ");
+        format_hex(rst_info->exccause, buffer);
+        mp_hal_stdout_tx_strn(buffer, sizeof(buffer));
+        mp_hal_stdout_tx_str(" EPC1: ");
+        format_hex(rst_info->epc1, buffer);
+        mp_hal_stdout_tx_strn(buffer, sizeof(buffer));
+        mp_hal_stdout_tx_str(" EPC2: ");
+        format_hex(rst_info->epc2, buffer);
+        mp_hal_stdout_tx_strn(buffer, sizeof(buffer));
+        mp_hal_stdout_tx_str(" EPC3: ");
+        format_hex(rst_info->epc3, buffer);
+        mp_hal_stdout_tx_strn(buffer, sizeof(buffer));
+        mp_hal_stdout_tx_str(" Exception Vector address: ");
+        format_hex(rst_info->excvaddr, buffer);
+        mp_hal_stdout_tx_strn(buffer, sizeof(buffer));
+        mp_hal_stdout_tx_str(" DEPC: ");
+        format_hex(rst_info->depc, buffer);
+        mp_hal_stdout_tx_strn(buffer, sizeof(buffer));
+        mp_hal_stdout_tx_str("\r\n\r\n");
+    }
+}
+
+#endif
+
 static void mp_reset(void) {
     mp_stack_set_top((void *)0x40000000);
     mp_stack_set_limit(8192);
@@ -114,6 +172,10 @@ void init_done(void) {
     pyexec_event_repl_init();
     #endif
 
+    #if MICROPY_HW_HARD_FAULT_DEBUG
+    print_reset_info();
+    #endif
+
     #if !MICROPY_REPL_EVENT_DRIVEN
 soft_reset:
     for (;;) {
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 83d80a7c963f6..03f3bb643d19b 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -117,6 +117,9 @@
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 #define MICROPY_ESP8266_APA102         (1)
 
+// Print error information at reboot time if the board crashed.
+#define MICROPY_HW_HARD_FAULT_DEBUG    (0)
+
 // No blocking wait-for-event on ESP8266, only non-blocking pump of the "OS" event
 // loop
 //

From e8c92240e25f75a754f3b12f6a25edd6b8771bb7 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 1 Jun 2025 19:19:58 +0200
Subject: [PATCH 2321/3129] tools/ci.sh: Remove natmod build restrictions for
 Xtensa.

This commit lets the CI pipeline build all natmods for the Xtensa
target, now that ROM symbols can be used in the linking process.

The restriction was put in place due to build failures on certain
natmods for Xtensa, as ROM symbols would not be used, causing undefined
symbol errors at build time.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index d12b4bcd31645..7de21e43b38b7 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -524,23 +524,12 @@ function ci_native_mpy_modules_build {
     else
         arch=$1
     fi
-    for natmod in features1 features3 features4 heapq re
+    for natmod in deflate features1 features3 features4 framebuf heapq random re
     do
         make -C examples/natmod/$natmod clean
         make -C examples/natmod/$natmod ARCH=$arch
     done
 
-    # deflate, framebuf, and random currently cannot build on xtensa due to
-    # some symbols that have been removed from the compiler's runtime, in
-    # favour of being provided from ROM.
-    if [ $arch != "xtensa" ]; then
-        for natmod in deflate framebuf random
-        do
-            make -C examples/natmod/$natmod clean
-            make -C examples/natmod/$natmod ARCH=$arch
-        done
-    fi
-
     # features2 requires soft-float on armv7m, rv32imc, and xtensa.  On armv6m
     # the compiler generates absolute relocations in the object file
     # referencing soft-float functions, which is not supported at the moment.
@@ -551,10 +540,8 @@ function ci_native_mpy_modules_build {
         make -C examples/natmod/features2 ARCH=$arch
     fi
 
-    # btree requires thread local storage support on rv32imc, whilst on xtensa
-    # it relies on symbols that are provided from ROM but not exposed to
-    # natmods at the moment.
-    if [ $arch != "rv32imc" ] && [ $arch != "xtensa" ]; then
+    # btree requires thread local storage support on rv32imc.
+    if [ $arch != "rv32imc" ]; then
         make -C examples/natmod/btree clean
         make -C examples/natmod/btree ARCH=$arch
     fi

From 193603dbac9712df5a54f4cecf3cab17851e2ce8 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 4 Jun 2025 07:07:02 +0200
Subject: [PATCH 2322/3129] tools/ci.sh: Clean the correct MPY files when batch
 compiling.

This commit fixes a small yet harmless issue that occurs when invoking
`ci_native_mpy_modules_build` on a persistent environment, as only X64
MPY files would be removed by the cleaning process.

Now the correct architecture is passed at all times when cleaning before
building a natmod for a particular architecture, forcing a full build of
all files to better simulate the CI environment (where there's no state
persisted between runs for this step).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/ci.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 7de21e43b38b7..32eb99235c42c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -526,14 +526,14 @@ function ci_native_mpy_modules_build {
     fi
     for natmod in deflate features1 features3 features4 framebuf heapq random re
     do
-        make -C examples/natmod/$natmod clean
+        make -C examples/natmod/$natmod ARCH=$arch clean
         make -C examples/natmod/$natmod ARCH=$arch
     done
 
     # features2 requires soft-float on armv7m, rv32imc, and xtensa.  On armv6m
     # the compiler generates absolute relocations in the object file
     # referencing soft-float functions, which is not supported at the moment.
-    make -C examples/natmod/features2 clean
+    make -C examples/natmod/features2 ARCH=$arch clean
     if [ $arch = "rv32imc" ] || [ $arch = "armv7m" ] || [ $arch = "xtensa" ]; then
         make -C examples/natmod/features2 ARCH=$arch MICROPY_FLOAT_IMPL=float
     elif [ $arch != "armv6m" ]; then
@@ -542,7 +542,7 @@ function ci_native_mpy_modules_build {
 
     # btree requires thread local storage support on rv32imc.
     if [ $arch != "rv32imc" ]; then
-        make -C examples/natmod/btree clean
+        make -C examples/natmod/btree ARCH=$arch clean
         make -C examples/natmod/btree ARCH=$arch
     fi
 }

From 4c55b0879b38b373b44e84552d6754b7842b5b72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 31 May 2025 13:44:03 +1000
Subject: [PATCH 2323/3129] tools/ci.sh: Allow errors in code-size build to
 fail the CI.

It was possible for CI to pass even if the bare-arm port fails to build.
This commit fixes that.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 32eb99235c42c..ea67e2c104813 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -93,23 +93,30 @@ function ci_code_size_build {
     function code_size_build_step {
         COMMIT=$1
         OUTFILE=$2
-        IGNORE_ERRORS=$3
 
         echo "Building ${COMMIT}..."
         git checkout --detach $COMMIT
         git submodule update --init $SUBMODULES
         git show -s
         tools/metrics.py clean $PORTS_TO_CHECK
-        tools/metrics.py build $PORTS_TO_CHECK | tee $OUTFILE || $IGNORE_ERRORS
+        tools/metrics.py build $PORTS_TO_CHECK | tee $OUTFILE
+        return $?
     }
 
+    # Allow errors from tools/metrics.py to propagate out of the pipe above.
+    set -o pipefail
+
     # build reference, save to size0
     # ignore any errors with this build, in case master is failing
-    code_size_build_step $REFERENCE ~/size0 true
+    code_size_build_step $REFERENCE ~/size0
     # build PR/branch, save to size1
-    code_size_build_step $COMPARISON ~/size1 false
+    code_size_build_step $COMPARISON ~/size1
+    STATUS=$?
 
+    set +o pipefail
     unset -f code_size_build_step
+
+    return $STATUS
 }
 
 ########################################################################################

From 229104558fb7f9d283b7302bc3720bc35c5c49cf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Apr 2025 11:15:32 +1000
Subject: [PATCH 2324/3129] tests/run-tests.py: Automatically skip tests that
 are too large.

Some tests are just too big for targets that don't have much heap memory,
eg `tests/extmod/vfs_rom.py`.  Other tests are too large because the target
doesn't have enough IRAM for native code, eg esp8266 running
`tests/micropython/viper_args.py`.

Previously, such tests were explicitly skipped on targets known to have
little memory, eg esp8266.  But this doesn't scale to multiple targets, nor
to more and more tests which are too large.

This commit addresses that by adding logic to the test runner so it can
automatically skip tests when they don't fit in the target's memory.  It
does this by prepending a `print('START TEST')` to every test, and if a
`MemoryError` occurs before that line is printed then the test was too big.
This works for standard tests, tests that go via .mpy files, and tests that
run in native emitter mode via .mpy files.

For tests that are too big, it prints `lrge  <test name>` on the output,
and at the end prints them on a separate line of skipped tests so they can
be distinguished.  They are also distinguished in the `_result.json` file
as a skipped test with reason "too large".

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/misc/print_exception.py |  2 ++
 tests/run-tests.py            | 53 ++++++++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/tests/misc/print_exception.py b/tests/misc/print_exception.py
index 1d196d6ab167f..92754733b58b1 100644
--- a/tests/misc/print_exception.py
+++ b/tests/misc/print_exception.py
@@ -1,3 +1,5 @@
+# Test sys.print_exception (MicroPython) / traceback.print_exception (CPython).
+
 try:
     import io
     import sys
diff --git a/tests/run-tests.py b/tests/run-tests.py
index ecd611aa5b56d..c012dc96f452e 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -105,14 +105,11 @@ def open(self, path, mode):
 # These are tests that are difficult to detect that they should not be run on the given target.
 platform_tests_to_skip = {
     "esp8266": (
-        "micropython/viper_args.py",  # too large
-        "micropython/viper_binop_arith.py",  # too large
-        "misc/rge_sm.py",  # too large
+        "misc/rge_sm.py",  # incorrect values due to object representation C
     ),
     "minimal": (
         "basics/class_inplace_op.py",  # all special methods not supported
         "basics/subclass_native_init.py",  # native subclassing corner cases not support
-        "misc/rge_sm.py",  # too large
         "micropython/opt_level.py",  # don't assume line numbers are stored
     ),
     "nrf": (
@@ -315,9 +312,21 @@ def prepare_script_for_target(args, *, script_filename=None, script_text=None, f
 
 
 def run_script_on_remote_target(pyb, args, test_file, is_special):
-    had_crash, script = prepare_script_for_target(
-        args, script_filename=test_file, force_plain=is_special
-    )
+    with open(test_file, "rb") as f:
+        script = f.read()
+
+    # If the test is not a special test, prepend it with a print to indicate that it started.
+    # If the print does not execute this means that the test did not even start, eg it was
+    # too large for the target.
+    prepend_start_test = not is_special
+    if prepend_start_test:
+        if script.startswith(b"#"):
+            script = b"print('START TEST')" + script
+        else:
+            script = b"print('START TEST')\n" + script
+
+    had_crash, script = prepare_script_for_target(args, script_text=script, force_plain=is_special)
+
     if had_crash:
         return True, script
 
@@ -328,9 +337,19 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
     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 prepend_start_test and e.args[1] == b"" and b"MemoryError" in e.args[2]:
+                output_mupy = b"SKIP-TOO-LARGE\n"
+            else:
+                output_mupy = e.args[1] + e.args[2] + b"CRASH"
         else:
             output_mupy = bytes(e.args[0], "ascii") + b"\nCRASH"
+
+    if prepend_start_test:
+        if output_mupy.startswith(b"START TEST\r\n"):
+            output_mupy = output_mupy.removeprefix(b"START TEST\r\n")
+        else:
+            had_crash = True
+
     return had_crash, output_mupy
 
 
@@ -474,7 +493,7 @@ def send_get(what):
     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"SKIP-TOO-LARGE\n", b"CRASH"):
         return output_mupy
 
     # skipped special tests will output "SKIP" surrounded by other interpreter debug output
@@ -911,6 +930,10 @@ def run_one_test(test_file):
             print("skip ", test_file)
             test_results.append((test_name, test_file, "skip", ""))
             return
+        elif output_mupy == b"SKIP-TOO-LARGE\n":
+            print("lrge ", test_file)
+            test_results.append((test_name, test_file, "skip", "too large"))
+            return
 
         # Look at the output of the test to see if unittest was used.
         uses_unittest = False
@@ -1035,7 +1058,10 @@ def run_one_test(test_file):
 
     test_results = test_results.value
     passed_tests = list(r for r in test_results if r[2] == "pass")
-    skipped_tests = list(r for r in test_results if r[2] == "skip")
+    skipped_tests = list(r for r in test_results if r[2] == "skip" and r[3] != "too large")
+    skipped_tests_too_large = list(
+        r for r in test_results if r[2] == "skip" and r[3] == "too large"
+    )
     failed_tests = list(r for r in test_results if r[2] == "fail")
 
     print(
@@ -1052,6 +1078,13 @@ def run_one_test(test_file):
             )
         )
 
+    if len(skipped_tests_too_large) > 0:
+        print(
+            "{} tests skipped because they are too large: {}".format(
+                len(skipped_tests_too_large), " ".join(test[0] for test in skipped_tests_too_large)
+            )
+        )
+
     if len(failed_tests) > 0:
         print(
             "{} tests failed: {}".format(

From 5b340b12b8ac8498838e0df73ff491bc2d105b46 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 May 2025 10:41:33 +1000
Subject: [PATCH 2325/3129] tests/run-tests.py: Remove filename arg from
 prepare_script_for_target.

It's no longer used.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index c012dc96f452e..cb7a8b7705647 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -269,22 +269,17 @@ def detect_test_platform(pyb, args):
     print()
 
 
-def prepare_script_for_target(args, *, script_filename=None, script_text=None, force_plain=False):
+def prepare_script_for_target(args, *, 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()
+        # A plain test to run as-is, no processing needed.
+        pass
     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
+        script_filename = tempname + ".py"
+        with open(script_filename, "wb") as f:
+            f.write(script_text)
 
         try:
             subprocess.check_output(
@@ -300,8 +295,7 @@ def prepare_script_for_target(args, *, script_filename=None, script_text=None, f
             script_text = b"__buf=" + bytes(repr(f.read()), "ascii") + b"\n"
 
         rm_f(mpy_filename)
-        if cleanup_script_filename:
-            rm_f(script_filename)
+        rm_f(script_filename)
 
         script_text += bytes(injected_import_hook_code, "ascii")
     else:

From bf909303ffaf64140f69f2c4696fad82dec01d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 22 Apr 2025 17:12:26 +0200
Subject: [PATCH 2326/3129] esp32/machine_timer: Do not free interrupt from
 ISR.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

esp_intr_free is not safe to call from the timer ISR because it requires
the current task (the one the ISR interrupted) to be pinned to the same
core as the interrupt was allocated on. Merely disabling the ISR however is
safe since that only requires that we're currently running on the same core
(which the ISR always is), regardless of the current task.

This was causing deadlocks in machine_uart when the ISR happened to
interrupt a task that was not pinned to a specific core.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_timer.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 34d49c79d2894..6bd4fa7390a0f 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -50,12 +50,13 @@
 const mp_obj_type_t machine_timer_type;
 
 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);
+static mp_obj_t machine_timer_deinit(mp_obj_t self_in);
 
 void machine_timer_deinit_all(void) {
     // Disable, deallocate and remove all timers from list
     machine_timer_obj_t **t = &MP_STATE_PORT(machine_timer_obj_head);
     while (*t != NULL) {
-        machine_timer_disable(*t);
+        machine_timer_deinit(*t);
         machine_timer_obj_t *next = (*t)->next;
         m_del_obj(machine_timer_obj_t, *t);
         *t = next;
@@ -96,6 +97,7 @@ machine_timer_obj_t *machine_timer_create(mp_uint_t timer) {
         self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type);
         self->group = group;
         self->index = index;
+        self->handle = NULL;
 
         // Add the timer to the linked-list of timers
         self->next = MP_STATE_PORT(machine_timer_obj_head);
@@ -131,9 +133,8 @@ void machine_timer_disable(machine_timer_obj_t *self) {
     }
 
     if (self->handle) {
-        // Free the interrupt handler.
-        esp_intr_free(self->handle);
-        self->handle = NULL;
+        // Disable the interrupt
+        ESP_ERROR_CHECK(esp_intr_disable(self->handle));
     }
 
     // We let the disabled timer stay in the list, as it might be
@@ -167,6 +168,10 @@ void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr)) {
     // Allocate and enable the alarm interrupt.
     timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), false);
     timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
+    if (self->handle) {
+        ESP_ERROR_CHECK(esp_intr_free(self->handle));
+        self->handle = NULL;
+    }
     ESP_ERROR_CHECK(
         esp_intr_alloc(timer_group_periph_signals.groups[self->group].timer_irq_id[self->index],
             TIMER_FLAGS, timer_isr, self, &self->handle)
@@ -233,7 +238,13 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
 }
 
 static mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
-    machine_timer_disable(self_in);
+    machine_timer_obj_t *self = self_in;
+
+    machine_timer_disable(self);
+    if (self->handle) {
+        ESP_ERROR_CHECK(esp_intr_free(self->handle));
+        self->handle = NULL;
+    }
 
     return mp_const_none;
 }

From 2c2f0b292afbeb41a23a742c3cd74a714e9c03c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 22 Apr 2025 17:42:29 +0200
Subject: [PATCH 2327/3129] esp32: Re-use allocated timer interrupts and
 simplify UART timer code.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the interrupt is not freed but merely disabled, instead of reallocating
it every time the timer is enabled again we can instead just re-enable it.
That means we're no longer setting the handler every time, and we need to
ensure it does not change. Doing so by adding an additional wrapper
function does not only solve that problem, it also allows us to remove
some code duplication and simplify how machine_uart uses the timer.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_timer.c | 29 ++++++++++++++++++-----------
 ports/esp32/machine_timer.h |  3 ++-
 ports/esp32/machine_uart.c  | 35 +++++++++++------------------------
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 6bd4fa7390a0f..a104288f6ee3c 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -151,12 +151,16 @@ static void machine_timer_isr(void *self_in) {
         if (self->repeat) {
             timer_ll_enable_alarm(self->hal_context.dev, self->index, true);
         }
-        mp_sched_schedule(self->callback, self);
-        mp_hal_wake_main_task_from_isr();
+        self->handler(self);
     }
 }
 
-void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr)) {
+static void machine_timer_isr_handler(machine_timer_obj_t *self) {
+    mp_sched_schedule(self->callback, self);
+    mp_hal_wake_main_task_from_isr();
+}
+
+void machine_timer_enable(machine_timer_obj_t *self) {
     // Initialise the timer.
     timer_hal_init(&self->hal_context, self->group, self->index);
     timer_ll_enable_counter(self->hal_context.dev, self->index, false);
@@ -169,13 +173,16 @@ void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr)) {
     timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), false);
     timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
     if (self->handle) {
-        ESP_ERROR_CHECK(esp_intr_free(self->handle));
-        self->handle = NULL;
+        ESP_ERROR_CHECK(esp_intr_enable(self->handle));
+    } else {
+        ESP_ERROR_CHECK(esp_intr_alloc(
+            timer_group_periph_signals.groups[self->group].timer_irq_id[self->index],
+            TIMER_FLAGS,
+            machine_timer_isr,
+            self,
+            &self->handle
+            ));
     }
-    ESP_ERROR_CHECK(
-        esp_intr_alloc(timer_group_periph_signals.groups[self->group].timer_irq_id[self->index],
-            TIMER_FLAGS, timer_isr, self, &self->handle)
-        );
     timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), true);
 
     // Enable the alarm to trigger at the given period.
@@ -229,10 +236,10 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
     }
 
     self->repeat = args[ARG_mode].u_int;
+    self->handler = machine_timer_isr_handler;
     self->callback = args[ARG_callback].u_obj;
-    self->handle = NULL;
 
-    machine_timer_enable(self, machine_timer_isr);
+    machine_timer_enable(self);
 
     return mp_const_none;
 }
diff --git a/ports/esp32/machine_timer.h b/ports/esp32/machine_timer.h
index 914bedd86baa9..10fe2f39c90ae 100644
--- a/ports/esp32/machine_timer.h
+++ b/ports/esp32/machine_timer.h
@@ -55,12 +55,13 @@ typedef struct _machine_timer_obj_t {
     mp_obj_t callback;
 
     intr_handle_t handle;
+    void (*handler)(struct _machine_timer_obj_t *timer);
 
     struct _machine_timer_obj_t *next;
 } machine_timer_obj_t;
 
 machine_timer_obj_t *machine_timer_create(mp_uint_t timer);
-void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr));
+void machine_timer_enable(machine_timer_obj_t *self);
 void machine_timer_disable(machine_timer_obj_t *self);
 
 #endif // MICROPY_INCLUDED_ESP32_MACHINE_TIMER_H
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index e5857e894b90e..982d9a7e27aed 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -110,30 +110,19 @@ static const char *_parity_name[] = {"None", "1", "0"};
     { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_IRQ_RXIDLE) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_BREAK), MP_ROM_INT(UART_IRQ_BREAK) }, \
 
-static void uart_timer_callback(void *self_in) {
-    machine_timer_obj_t *self = self_in;
-
-    uint32_t intr_status = timer_ll_get_intr_status(self->hal_context.dev);
-
-    if (intr_status & TIMER_LL_EVENT_ALARM(self->index)) {
-        timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
-        if (self->repeat) {
-            timer_ll_enable_alarm(self->hal_context.dev, self->index, true);
-        }
-    }
-
+static void uart_timer_callback(machine_timer_obj_t *timer) {
     // The UART object is referred here by the callback field.
-    machine_uart_obj_t *uart = (machine_uart_obj_t *)self->callback;
-    if (uart->rxidle_state == RXIDLE_ALERT) {
+    machine_uart_obj_t *self = (machine_uart_obj_t *)timer->callback;
+    if (self->rxidle_state == RXIDLE_ALERT) {
         // At the first call, just switch the state
-        uart->rxidle_state = RXIDLE_ARMED;
-    } else if (uart->rxidle_state == RXIDLE_ARMED) {
+        self->rxidle_state = RXIDLE_ARMED;
+    } else if (self->rxidle_state == RXIDLE_ARMED) {
         // At the second call, run the irq callback and stop the timer
-        uart->rxidle_state = RXIDLE_STANDBY;
-        uart->mp_irq_flags = UART_IRQ_RXIDLE;
-        mp_irq_handler(uart->mp_irq_obj);
+        self->rxidle_state = RXIDLE_STANDBY;
+        self->mp_irq_flags = UART_IRQ_RXIDLE;
+        mp_irq_handler(self->mp_irq_obj);
         mp_hal_wake_main_task_from_isr();
-        machine_timer_disable(uart->rxidle_timer);
+        machine_timer_disable(self->rxidle_timer);
     }
 }
 
@@ -150,9 +139,7 @@ static void uart_event_task(void *self_in) {
                     if (self->mp_irq_trigger & UART_IRQ_RXIDLE) {
                         if (self->rxidle_state != RXIDLE_INACTIVE) {
                             if (self->rxidle_state == RXIDLE_STANDBY) {
-                                self->rxidle_timer->repeat = true;
-                                self->rxidle_timer->handle = NULL;
-                                machine_timer_enable(self->rxidle_timer, uart_timer_callback);
+                                machine_timer_enable(self->rxidle_timer);
                             }
                         }
                         self->rxidle_state = RXIDLE_ALERT;
@@ -553,11 +540,11 @@ static void uart_irq_configure_timer(machine_uart_obj_t *self, mp_uint_t trigger
         }
         self->rxidle_period = period;
         self->rxidle_timer->period = period;
+        self->rxidle_timer->handler = uart_timer_callback;
         // The Python callback is not used. So use this
         // data field to hold a reference to the UART object.
         self->rxidle_timer->callback = self;
         self->rxidle_timer->repeat = true;
-        self->rxidle_timer->handle = NULL;
         self->rxidle_state = RXIDLE_STANDBY;
     }
 }

From 5f058e9863c0770aa8a4defe23f70919cea94160 Mon Sep 17 00:00:00 2001
From: purewack <bobimaster15@gmail.com>
Date: Thu, 2 Jan 2025 11:44:00 +0000
Subject: [PATCH 2328/3129] esp32: Update ADC driver update to the new esp_adc
 API.

This commit updates the ADC to use the new driver `esp_adc/adc_oneshot.h`.

There are several errata notes about not being able to change the bit-width
of the ADCs certain chips.  The only chip that can switch resolution to a
lower one is the normal ESP32.  ESP32 C2 and S3 are stuck at 12 bits, while
S2 is at 13 bits.

On the S2, you can change the resolution, but it has no effect on the
resolution, rather, it prevents attenuation from working at all!

The resolution is set to the maximum possible for each SoC, with the ESP32
being the only one not throwing errors when trying to set the bit-width to
9, 10, 11 or 12 bits using `ADC.width(bits)`.

Signed-off-by: Damian Nowacki (purewack) bobimaster15@gmail.com
---
 docs/esp32/quickref.rst           | 15 ++++-
 ports/esp32/adc.c                 | 94 ++++++++++++++----------------
 ports/esp32/adc.h                 | 47 +++++++++++++--
 ports/esp32/boards/sdkconfig.base |  1 -
 ports/esp32/machine_adc.c         | 95 +++++++++++++++++--------------
 ports/esp32/machine_adc_block.c   | 14 ++---
 ports/esp32/modesp32.c            |  1 -
 ports/esp32/mpconfigport.h        |  1 +
 8 files changed, 155 insertions(+), 113 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 63180b470aeb4..c394414a76f51 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -544,14 +544,27 @@ Legacy methods:
 
     Equivalent to ``ADC.block().init(bits=bits)``.
 
+The only chip that can switch resolution to a lower one is the normal esp32.
+The C2 & S3 are stuck at 12 bits, while the S2 is at 13 bits.
+
 For compatibility, the ``ADC`` object also provides constants matching the
-supported ADC resolutions:
+supported ADC resolutions, per chip:
 
+ESP32:
   - ``ADC.WIDTH_9BIT`` = 9
   - ``ADC.WIDTH_10BIT`` = 10
   - ``ADC.WIDTH_11BIT`` = 11
   - ``ADC.WIDTH_12BIT`` = 12
 
+ESP32 C3 & S3:
+  - ``ADC.WIDTH_12BIT`` = 12
+
+ESP32 S2:
+  - ``ADC.WIDTH_13BIT`` = 13
+
+.. method:: ADC.deinit()
+
+    Provided to deinit the adc driver.
 
 Software SPI bus
 ----------------
diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
index 83af6dce0b2a5..d0e5e81330d7e 100644
--- a/ports/esp32/adc.c
+++ b/ports/esp32/adc.c
@@ -26,83 +26,73 @@
  */
 
 #include "py/mphal.h"
+#include "py/mperrno.h"
 #include "adc.h"
-#include "driver/adc.h"
+#include "esp_adc/adc_oneshot.h"
 #include "esp_adc/adc_cali_scheme.h"
 
-#define DEFAULT_VREF 1100
+static esp_err_t ensure_adc_calibration(machine_adc_block_obj_t *self, adc_atten_t atten);
 
-void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t bits) {
-    if (bits < SOC_ADC_RTC_MIN_BITWIDTH && bits > SOC_ADC_RTC_MAX_BITWIDTH) {
-        // Invalid value for the current chip, raise exception in the switch below.
-        bits = -1;
+void adc_is_init_guard(machine_adc_block_obj_t *self) {
+    if (!self->handle) {
+        mp_raise_OSError(MP_EPERM);
     }
-    switch (bits) {
-        case 9:
-            self->width = ADC_BITWIDTH_9;
-            break;
-        case 10:
-            self->width = ADC_BITWIDTH_10;
-            break;
-        case 11:
-            self->width = ADC_BITWIDTH_11;
-            break;
-        case 12:
-            self->width = ADC_BITWIDTH_12;
-            break;
-        case 13:
-            self->width = ADC_BITWIDTH_13;
-            break;
-        default:
-            mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
-    }
-    self->bits = bits;
+}
 
-    if (self->unit_id == ADC_UNIT_1) {
-        adc1_config_width(self->width);
-    }
+esp_err_t apply_self_adc_channel_atten(const machine_adc_obj_t *self, uint8_t atten) {
+    adc_is_init_guard(self->block);
+
+    adc_oneshot_chan_cfg_t config = {
+        .atten = atten,
+        .bitwidth = self->block->bitwidth,
+    };
+    esp_err_t ret = adc_oneshot_config_channel(self->block->handle, self->channel_id, &config);
+    return ret;
 }
 
 mp_int_t madcblock_read_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id) {
-    int raw = 0;
-    if (self->unit_id == ADC_UNIT_1) {
-        raw = adc1_get_raw(channel_id);
-    } else {
-        #if (SOC_ADC_PERIPH_NUM >= 2)
-        check_esp_err(adc2_get_raw(channel_id, self->width, &raw));
-        #endif
-    }
-    return raw;
+    adc_is_init_guard(self);
+
+    int reading = 0;
+    adc_oneshot_read(self->handle, channel_id, &reading);
+    return reading;
+}
+
+/*
+During testing, it turned out that the function `adc_cali_raw_to_voltage` does not account for the lower resolution,
+instead it expects the full resolution value as an argument, hence the scaling applied here
+*/
+mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten) {
+    int raw = madcblock_read_helper(self, channel_id);
+    int uv = 0;
+
+    check_esp_err(ensure_adc_calibration(self, atten));
+    check_esp_err(adc_cali_raw_to_voltage(self->calib[atten], (raw << (ADC_WIDTH_MAX - self->bitwidth)), &uv));
+    return (mp_int_t)uv * 1000;
 }
 
 static esp_err_t ensure_adc_calibration(machine_adc_block_obj_t *self, adc_atten_t atten) {
-    if (self->handle[atten] != NULL) {
+    if (self->calib[atten] != NULL) {
         return ESP_OK;
     }
 
+    esp_err_t ret = ESP_OK;
+
     #if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
     adc_cali_curve_fitting_config_t cali_config = {
         .unit_id = self->unit_id,
         .atten = atten,
-        .bitwidth = self->width,
+        .bitwidth = self->bitwidth,
     };
-    return adc_cali_create_scheme_curve_fitting(&cali_config, &self->handle[atten]);
+    ret = adc_cali_create_scheme_curve_fitting(&cali_config, &self->calib[atten]);
     #else
     adc_cali_line_fitting_config_t cali_config = {
         .unit_id = self->unit_id,
         .atten = atten,
-        .bitwidth = self->width,
+        .bitwidth = self->bitwidth,
     };
-    return adc_cali_create_scheme_line_fitting(&cali_config, &self->handle[atten]);
+    ret = adc_cali_create_scheme_line_fitting(&cali_config, &self->calib[atten]);
     #endif
-}
 
-mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten) {
-    int raw = madcblock_read_helper(self, channel_id);
-    int uv;
-
-    check_esp_err(ensure_adc_calibration(self, atten));
-    check_esp_err(adc_cali_raw_to_voltage(self->handle[atten], raw, &uv));
-
-    return (mp_int_t)uv * 1000;
+    return ret;
 }
diff --git a/ports/esp32/adc.h b/ports/esp32/adc.h
index 5688e0a29a706..ebf7fcc21aa4f 100644
--- a/ports/esp32/adc.h
+++ b/ports/esp32/adc.h
@@ -29,17 +29,45 @@
 #define MICROPY_INCLUDED_ESP32_ADC_H
 
 #include "py/runtime.h"
-#include "esp_adc_cal.h"
+#include "esp_adc/adc_oneshot.h"
 #include "esp_adc/adc_cali_scheme.h"
 
-#define ADC_ATTEN_MAX SOC_ADC_ATTEN_NUM
+#define ADC_ATTEN_COUNT SOC_ADC_ATTEN_NUM
+#define ADC_ATTEN_MIN ADC_ATTEN_DB_0
+#define ADC_ATTEN_MAX ADC_ATTEN_DB_11
+
+/*
+https://github.com/espressif/esp-idf/issues/13128
+https://github.com/espressif/esp-idf/blob/release/v5.2/components/soc/esp32s3/include/soc/soc_caps.h
+https://docs.espressif.com/projects/esp-chip-errata/en/latest/esp32s2/03-errata-description/index.html
+https://docs.espressif.com/projects/esp-idf/en/v4.2/esp32/api-reference/peripherals/adc.html
+
+Looks like only the original esp32 is capable of bitwidth adjustment, all others are stuck at 12 bits,
+except the S2, which is locked at 13 bits, otherwise attenuation doesn't work.
+*/
+#if CONFIG_IDF_TARGET_ESP32S2
+
+#define ADC_WIDTH_MIN ADC_BITWIDTH_13
+#define ADC_WIDTH_MAX ADC_BITWIDTH_13
+
+#elif CONFIG_IDF_TARGET_ESP32
+
+#define ADC_WIDTH_MIN ADC_BITWIDTH_9
+#define ADC_WIDTH_MAX ADC_BITWIDTH_12
+
+#else
+
+#define ADC_WIDTH_MIN ADC_BITWIDTH_12
+#define ADC_WIDTH_MAX ADC_BITWIDTH_12
+
+#endif
 
 typedef struct _machine_adc_block_obj_t {
     mp_obj_base_t base;
     adc_unit_t unit_id;
-    mp_int_t bits;
-    adc_bits_width_t width;
-    adc_cali_handle_t handle[ADC_ATTEN_MAX];
+    adc_oneshot_unit_handle_t handle;
+    adc_bitwidth_t bitwidth;
+    adc_cali_handle_t calib[ADC_ATTEN_COUNT];
 } machine_adc_block_obj_t;
 
 typedef struct _machine_adc_obj_t {
@@ -51,11 +79,18 @@ typedef struct _machine_adc_obj_t {
 
 extern machine_adc_block_obj_t madcblock_obj[];
 
-void madcblock_bits_helper(machine_adc_block_obj_t *self, mp_int_t bits);
+esp_err_t apply_self_adc_channel_atten(const machine_adc_obj_t *self, uint8_t atten);
+
 mp_int_t madcblock_read_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id);
 mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten);
 
 const machine_adc_obj_t *madc_search_helper(machine_adc_block_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id);
 void madc_init_helper(const machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
 
+mp_int_t mp_machine_adc_atten_get_helper(const machine_adc_obj_t *self);
+void mp_machine_adc_atten_set_helper(const machine_adc_obj_t *self, mp_int_t atten);
+
+mp_int_t mp_machine_adc_width_get_helper(const machine_adc_obj_t *self);
+void mp_machine_adc_block_width_set_helper(machine_adc_block_obj_t *self, mp_int_t width);
+
 #endif // MICROPY_INCLUDED_ESP32_ADC_H
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 5595444e86f39..823b916d960a5 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -117,7 +117,6 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
 CONFIG_UART_ISR_IN_IRAM=y
 
 # IDF 5 deprecated
-CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 
 CONFIG_ETH_USE_SPI_ETHERNET=y
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index be1725c3709a6..02acaa22da035 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -30,7 +30,7 @@
 
 #include "py/mphal.h"
 #include "adc.h"
-#include "driver/adc.h"
+#include "esp_adc/adc_oneshot.h"
 
 #define ADCBLOCK1 (&madcblock_obj[0])
 #define ADCBLOCK2 (&madcblock_obj[1])
@@ -126,20 +126,8 @@ static const machine_adc_obj_t madc_obj[] = {
     #endif
 };
 
-// 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 machine_adc_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 machine_adc_obj_t *self, adc_atten_t atten) {
-    madc_obj_atten[self - &madc_obj[0]] = atten + 1;
-}
-
 const machine_adc_obj_t *madc_search_helper(machine_adc_block_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 machine_adc_obj_t *adc = &madc_obj[i];
@@ -152,22 +140,7 @@ const machine_adc_obj_t *madc_search_helper(machine_adc_block_obj_t *block, adc_
 
 static void mp_machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     const machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "ADC(Pin(%u), atten=%u)", self->gpio_id, madc_atten_get(self));
-}
-
-static void madc_atten_helper(const machine_adc_obj_t *self, mp_int_t atten) {
-    esp_err_t err = ESP_FAIL;
-    if (self->block->unit_id == ADC_UNIT_1) {
-        err = adc1_config_channel_atten(self->channel_id, atten);
-    } else {
-        #if SOC_ADC_PERIPH_NUM >= 2
-        err = adc2_config_channel_atten(self->channel_id, atten);
-        #endif
-    }
-    if (err != ESP_OK) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid atten"));
-    }
-    madc_atten_set(self, atten);
+    mp_printf(print, "ADC(Pin(%u), atten=%u)", self->gpio_id, mp_machine_adc_atten_get_helper(self));
 }
 
 void madc_init_helper(const machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -182,18 +155,32 @@ void madc_init_helper(const machine_adc_obj_t *self, size_t n_pos_args, const mp
     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_atten_get(self) == ADC_ATTEN_MAX) {
-        madc_atten_helper(self, ADC_ATTEN_DB_0);
+
+    if (!self->block->handle) {
+        adc_oneshot_unit_init_cfg_t init_config = {
+            .unit_id = self->block->unit_id
+        };
+        check_esp_err(adc_oneshot_new_unit(&init_config, &self->block->handle));
     }
+
+    mp_int_t atten = args[ARG_atten].u_int;
+    mp_machine_adc_atten_set_helper(self, atten != -1 ? atten : ADC_ATTEN_MAX);
+    mp_machine_adc_block_width_set_helper(self->block, ADC_WIDTH_MAX);
+    apply_self_adc_channel_atten(self, mp_machine_adc_atten_get_helper(self));
+
 }
 
 static void mp_machine_adc_init_helper(machine_adc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     madc_init_helper(self, n_pos_args, pos_args, kw_args);
 }
 
+static void mp_machine_adc_deinit(machine_adc_obj_t *self) {
+    if (self->block->handle) {
+        check_esp_err(adc_oneshot_del_unit(self->block->handle));
+        self->block->handle = NULL;
+    }
+}
+
 static mp_obj_t mp_machine_adc_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]);
@@ -202,10 +189,6 @@ static mp_obj_t mp_machine_adc_make_new(const mp_obj_type_t *type, size_t n_pos_
         mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
     }
 
-    if (self->block->width == -1) {
-        madcblock_bits_helper(self->block, self->block->bits);
-    }
-
     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);
@@ -225,20 +208,46 @@ static mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
 static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
     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)
-    mp_int_t bits = self->block->bits;
+    mp_int_t bits = mp_machine_adc_width_get_helper(self);
     mp_uint_t u16 = raw << (16 - bits) | raw >> (2 * bits - 16);
     return u16;
 }
 
 static mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self) {
-    adc_atten_t atten = madc_atten_get(self);
-    return madcblock_read_uv_helper(self->block, self->channel_id, atten);
+    return madcblock_read_uv_helper(self->block, self->channel_id, mp_machine_adc_atten_get_helper(self));
+}
+
+mp_int_t mp_machine_adc_atten_get_helper(const machine_adc_obj_t *self) {
+    uint8_t value = madc_obj_atten[self - &madc_obj[0]];
+    return value == 0 ? ADC_ATTEN_MAX : value - 1;
+}
+
+void mp_machine_adc_atten_set_helper(const machine_adc_obj_t *self, mp_int_t atten) {
+    if (atten < ADC_ATTEN_MIN || atten > ADC_ATTEN_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid attenuation"));
+    }
+
+    madc_obj_atten[self - &madc_obj[0]] = atten + 1;
 }
 
 static void mp_machine_adc_atten_set(machine_adc_obj_t *self, mp_int_t atten) {
-    madc_atten_helper(self, atten);
+    mp_machine_adc_atten_set_helper(self, atten);
+    apply_self_adc_channel_atten(self, mp_machine_adc_atten_get_helper(self));
+}
+
+mp_int_t mp_machine_adc_width_get_helper(const machine_adc_obj_t *self) {
+    return self->block->bitwidth;
+}
+
+void mp_machine_adc_block_width_set_helper(machine_adc_block_obj_t *self, mp_int_t width) {
+    if (width < ADC_WIDTH_MIN || width > ADC_WIDTH_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid bit-width"));
+    }
+
+    self->bitwidth = width;
 }
 
 static void mp_machine_adc_width_set(machine_adc_obj_t *self, mp_int_t width) {
-    madcblock_bits_helper(self->block, width);
+    mp_machine_adc_block_width_set_helper(self->block, width);
+    apply_self_adc_channel_atten(self, mp_machine_adc_atten_get_helper(self));
 }
diff --git a/ports/esp32/machine_adc_block.c b/ports/esp32/machine_adc_block.c
index a373603b7e396..6b06b432c28e4 100644
--- a/ports/esp32/machine_adc_block.c
+++ b/ports/esp32/machine_adc_block.c
@@ -29,25 +29,21 @@
 
 #include "py/mphal.h"
 #include "adc.h"
-#include "driver/adc.h"
+#include "esp_adc/adc_oneshot.h"
 
 machine_adc_block_obj_t madcblock_obj[] = {
-    {{&machine_adc_block_type}, ADC_UNIT_1, SOC_ADC_RTC_MAX_BITWIDTH, -1, {0}},
+    {{&machine_adc_block_type}, ADC_UNIT_1, NULL, ADC_WIDTH_MAX, {0}},
     #if SOC_ADC_PERIPH_NUM > 1
-    {{&machine_adc_block_type}, ADC_UNIT_2, SOC_ADC_RTC_MAX_BITWIDTH, -1, {0}},
+    {{&machine_adc_block_type}, ADC_UNIT_2, NULL, ADC_WIDTH_MAX, {0}},
     #endif
 };
 
 static void mp_machine_adc_block_print(const mp_print_t *print, machine_adc_block_obj_t *self) {
-    mp_printf(print, "ADCBlock(%u, bits=%u)", self->unit_id, self->bits);
+    mp_printf(print, "ADCBlock(%u, bits=%u)", self->unit_id, self->bitwidth);
 }
 
 static void mp_machine_adc_block_bits_set(machine_adc_block_obj_t *self, mp_int_t bits) {
-    if (bits != -1) {
-        madcblock_bits_helper(self, bits);
-    } else if (self->width == -1) {
-        madcblock_bits_helper(self, self->bits);
-    }
+    mp_machine_adc_block_width_set_helper(self, bits);
 }
 
 static machine_adc_block_obj_t *mp_machine_adc_block_get(mp_int_t unit) {
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 0296ddf10e775..4572e7b68b72a 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -30,7 +30,6 @@
 #include <time.h>
 #include <sys/time.h>
 #include "driver/gpio.h"
-#include "driver/adc.h"
 #include "esp_heap_caps.h"
 #include "multi_heap.h"
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 35c8ff1831dbf..a6f103cdef7a5 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -124,6 +124,7 @@
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH  (1)
 #define MICROPY_PY_MACHINE_ADC_INIT         (1)
+#define MICROPY_PY_MACHINE_ADC_DEINIT       (1)
 #define MICROPY_PY_MACHINE_ADC_READ         (1)
 #define MICROPY_PY_MACHINE_ADC_READ_UV      (1)
 #define MICROPY_PY_MACHINE_ADC_BLOCK        (1)

From b8e56a17b126fd990b7cdf3fb81944d504146f69 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 3 Jun 2025 22:54:09 +0200
Subject: [PATCH 2329/3129] github/workflows: Split QEMU/Arm builds into
 separate entries.

This commit takes the QEMU/Arm CI build and test step and splits it into
three separate steps (bigendian, sabrelite, thumb), to allow them to run
in parallel.

Currently the QEMU/Arm CI build step would take up to 16 minutes, often
being the last step blocking a full test run.  With this commit, when
the steps run in parallel the time it takes to complete the QEMU/Arm
build and test procedure is cut in half - taking between 8 to 9 minutes
depending on the CI runner load.

The existing `ci_build_and_test_arm` function has been removed, in
favour of having three separate functions - one per configuration.  They
are called `ci_build_and_test_arm_bigendian`,
`ci_build_and_test_arm_sabrelite`, and `ci_build_and_test_arm_thumb`.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .github/workflows/ports_qemu.yml | 11 +++++++++--
 tools/ci.sh                      | 17 ++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ports_qemu.yml b/.github/workflows/ports_qemu.yml
index 57192c43936e5..ac09dde86408b 100644
--- a/.github/workflows/ports_qemu.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -20,13 +20,20 @@ concurrency:
 
 jobs:
   build_and_test_arm:
+    strategy:
+      fail-fast: false
+      matrix:
+        ci_func:  # names are functions in ci.sh
+          - bigendian
+          - sabrelite
+          - thumb
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_qemu_setup_arm
-    - name: Build and run test suite
-      run: source tools/ci.sh && ci_qemu_build_arm
+    - name: Build and run test suite ci_qemu_build_arm_${{ matrix.ci_func }}
+      run: source tools/ci.sh && ci_qemu_build_arm_${{ matrix.ci_func }}
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
diff --git a/tools/ci.sh b/tools/ci.sh
index ea67e2c104813..011aabea31c57 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -324,13 +324,24 @@ function ci_qemu_setup_rv32 {
     qemu-system-riscv32 --version
 }
 
-function ci_qemu_build_arm {
+function ci_qemu_build_arm_prepare {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/qemu submodules
+}
+
+function ci_qemu_build_arm_bigendian {
+    ci_qemu_build_arm_prepare
     make ${MAKEOPTS} -C ports/qemu CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
-    make ${MAKEOPTS} -C ports/qemu clean
-    make ${MAKEOPTS} -C ports/qemu test_full
+}
+
+function ci_qemu_build_arm_sabrelite {
+    ci_qemu_build_arm_prepare
     make ${MAKEOPTS} -C ports/qemu BOARD=SABRELITE test_full
+}
+
+function ci_qemu_build_arm_thumb {
+    ci_qemu_build_arm_prepare
+    make ${MAKEOPTS} -C ports/qemu test_full
 
     # Test building and running native .mpy with armv7m architecture.
     ci_native_mpy_modules_build armv7m

From 95203ab88b50f5083c28afe6a39aae605b4df2da Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 5 Jun 2025 10:43:48 +1000
Subject: [PATCH 2330/3129] tools/boardgen.py: Ensure board pin locals_dict has
 consistent order.

`tools/boardgen.py` is used by the `make-pins.py` scripts in many ports to
generate the pin definitions for the machine module.

In #17391 it was found that this is currently generating the C structs for
board pin definitions with inconsistent ordering (across different build
runs), which makes it sometimes impossible to get a consistent binary file
even for no change in source files.

This commit fixes that by sorting the board pin names alphabetically.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 tools/boardgen.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/boardgen.py b/tools/boardgen.py
index 39bedf71cd0c8..3723e7ce31b83 100644
--- a/tools/boardgen.py
+++ b/tools/boardgen.py
@@ -108,6 +108,10 @@ def add_board_pin_name(self, board_pin_name, hidden=False):
             )
         )
 
+    # Iterate over board pin names in consistent sorted order.
+    def board_pin_names(self):
+        return sorted(self._board_pin_names, key=lambda x: x[0])
+
     # Override this to handle an af specified in af.csv.
     def add_af(self, af_idx, af_name, af):
         raise NotImplementedError
@@ -295,7 +299,7 @@ def print_board_locals_dict(self, out_source):
             file=out_source,
         )
         for pin in self.available_pins():
-            for board_pin_name, board_hidden in pin._board_pin_names:
+            for board_pin_name, board_hidden in pin.board_pin_names():
                 if board_hidden:
                     # Don't include hidden pins in Pins.board.
                     continue
@@ -389,7 +393,7 @@ def print_defines(self, out_header, cpu=True, board=True):
 
             # #define pin_BOARDNAME (pin_CPUNAME)
             if board:
-                for board_pin_name, _board_hidden in pin._board_pin_names:
+                for board_pin_name, _board_hidden in pin.board_pin_names():
                     # Note: Hidden board pins are still available to C via the macro.
                     # Note: The RHS isn't wrapped in (), which is necessary to make the
                     # STATIC_AF_ macro work on STM32.

From fffaf8a41f094868590aab0506bba03f126a3f5d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 4 Jun 2025 12:13:46 +1000
Subject: [PATCH 2331/3129] extmod/modnetwork: Consolidate definition of common
 drivers.

Most extmod network drivers were being defined on a per-port basis,
duplicating code and making enabling a driver on a new port harder.

This consolidates extmod driver declarations and removes the existing
per-port definitions of them.

This commit has been verified to be a no-op in terms of firmware change.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/modnetwork.c             | 39 +++++++++++++++++++++++++++++++++
 extmod/modnetwork.h             |  5 +++++
 extmod/network_esp_hosted.c     |  2 ++
 extmod/network_wiznet5k.c       |  2 ++
 ports/alif/mpconfigport.h       |  8 -------
 ports/mimxrt/mpconfigport.h     |  8 -------
 ports/renesas-ra/mpconfigport.h |  8 -------
 ports/rp2/mpconfigport.h        | 35 -----------------------------
 ports/stm32/mpconfigport.h      | 16 --------------
 9 files changed, 48 insertions(+), 75 deletions(-)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 336836b6b8694..b6855fcaaab97 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -40,6 +40,19 @@
 #if MICROPY_PY_NETWORK_CYW43
 // So that CYW43_LINK_xxx constants are available to MICROPY_PORT_NETWORK_INTERFACES.
 #include "lib/cyw43-driver/src/cyw43.h"
+extern const struct _mp_obj_type_t mp_network_cyw43_type;
+#endif
+
+#if MICROPY_PY_NETWORK_WIZNET5K
+extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
+#endif
+
+#if MICROPY_PY_NETWORK_NINAW10
+extern const struct _mp_obj_type_t mod_network_nic_type_nina;
+#endif
+
+#if MICROPY_PY_NETWORK_ESP_HOSTED
+extern const struct _mp_obj_type_t mod_network_esp_hosted_type;
 #endif
 
 #ifdef MICROPY_PY_NETWORK_INCLUDEFILE
@@ -166,6 +179,32 @@ static const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     MICROPY_PORT_NETWORK_INTERFACES
     #endif
 
+    #if MICROPY_PY_NETWORK_CYW43
+    { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mp_network_cyw43_type) },
+    // CYW43 status constants, currently for rp2 port only.
+    // TODO move these to WIFI module for all ports.
+    #if defined(PICO_PROGRAM_NAME) && defined(CYW43_LINK_DOWN)
+    { 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) },
+    #endif
+    #endif
+
+    #if MICROPY_PY_NETWORK_WIZNET5K
+    { MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
+    #endif
+
+    #if MICROPY_PY_NETWORK_NINAW10
+    { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) },
+    #endif
+
+    #if MICROPY_PY_NETWORK_ESP_HOSTED
+    { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_esp_hosted_type) },
+    #endif
+
     // Allow a port to take mostly full control of the network module.
     #ifdef MICROPY_PY_NETWORK_MODULE_GLOBALS_INCLUDEFILE
     #include MICROPY_PY_NETWORK_MODULE_GLOBALS_INCLUDEFILE
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 7e5a283353724..d16329f07ddc2 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -60,6 +60,11 @@ extern char mod_network_country_code[2];
 #define MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN (32)
 #endif
 
+#if MICROPY_PY_NETWORK_NINAW10
+// This Network interface requires the extended socket state.
+#define MICROPY_PY_SOCKET_EXTENDED_STATE    (1)
+#endif
+
 // This is a null-terminated string.
 extern char mod_network_hostname_data[MICROPY_PY_NETWORK_HOSTNAME_MAX_LEN + 1];
 
diff --git a/extmod/network_esp_hosted.c b/extmod/network_esp_hosted.c
index 04cfc36b323ce..6ed348450bab0 100644
--- a/extmod/network_esp_hosted.c
+++ b/extmod/network_esp_hosted.c
@@ -48,6 +48,8 @@
 #include "esp_hosted_wifi.h"
 #include "esp_hosted_hal.h"
 
+extern const mp_obj_type_t mod_network_esp_hosted_type;
+
 typedef struct _esp_hosted_obj_t {
     mp_obj_base_t base;
     uint32_t itf;
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 533d39a18719f..e065c1486677b 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -78,6 +78,8 @@
 
 #endif
 
+extern const mp_obj_type_t mod_network_nic_type_wiznet5k;
+
 #ifndef printf
 #define printf(...) mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
 #endif
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 6c9e6af635f57..ddfc551bf8983 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -158,19 +158,11 @@
 #define MICROPY_FATFS_MAX_SS                    (MICROPY_HW_FLASH_BLOCK_SIZE_BYTES)
 #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
-
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
 #endif
 
 #define MICROPY_PORT_NETWORK_INTERFACES \
-    MICROPY_HW_NIC_CYW43 \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
 // Bluetooth code only runs in the scheduler, no locking/mutex required.
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 9a7dfc630f32a..e1c605f452a32 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -178,20 +178,12 @@ extern const struct _mp_obj_type_t network_lan_type;
 #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
-
 #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_BOARD_NETWORK_INTERFACES \
 
 #ifndef MICROPY_BOARD_ROOT_POINTERS
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index bd936061fa406..c2b89f415bad7 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -210,19 +210,11 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#if MICROPY_PY_NETWORK_ESP_HOSTED
-extern const struct _mp_obj_type_t mod_network_esp_hosted_type;
-#define MICROPY_HW_NIC_ESP_HOSTED   { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_esp_hosted_type) },
-#else
-#define MICROPY_HW_NIC_ESP_HOSTED
-#endif
-
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
 #endif
 
 #define MICROPY_PORT_NETWORK_INTERFACES \
-    MICROPY_HW_NIC_ESP_HOSTED \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
 // Miscellaneous settings
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 877cea08717fd..35afea4fac5f4 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -242,46 +242,11 @@
 #endif
 #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_SOCKET_EXTENDED_STATE
-#define MICROPY_PY_SOCKET_EXTENDED_STATE    (1)
-#endif
-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
-extern const struct _mp_obj_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
-
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
 #endif
 
 #define MICROPY_PORT_NETWORK_INTERFACES \
-    MICROPY_HW_NIC_CYW43 \
-    MICROPY_HW_NIC_NINAW10  \
-    MICROPY_HW_NIC_WIZNET5K \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
 // Additional entries for use with pendsv_schedule_dispatch.
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index d1d6fe249bd6f..bfaa3fb0ba084 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -205,20 +205,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 #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_NETWORK_WIZNET5K
-extern const struct _mp_obj_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
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     MACHINE_BUILTIN_MODULE_CONSTANTS \
@@ -231,8 +217,6 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 
 #define MICROPY_PORT_NETWORK_INTERFACES \
     MICROPY_HW_NIC_ETH  \
-    MICROPY_HW_NIC_CYW43 \
-    MICROPY_HW_NIC_WIZNET5K \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
 #define MP_STATE_PORT MP_STATE_VM

From e43a3849d9b725f7a59dd17623193738b7ea04a5 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 6 Jun 2025 07:57:54 +0200
Subject: [PATCH 2332/3129] lib/berkeley-db-1.xx: Update submodule to latest.

Fixes a memory leak in the case lseek fails when creating the mpool.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 lib/berkeley-db-1.xx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/berkeley-db-1.xx b/lib/berkeley-db-1.xx
index 85373b548f1fb..0f3bb6947c2f5 160000
--- a/lib/berkeley-db-1.xx
+++ b/lib/berkeley-db-1.xx
@@ -1 +1 @@
-Subproject commit 85373b548f1fb0119a463582570b44189dfb09ae
+Subproject commit 0f3bb6947c2f57233916dccd7bb425d7bf86e5a6

From 78ee1bac60a89f13d62395c1f7b6b122e26af98a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 22 May 2025 12:20:43 +0200
Subject: [PATCH 2333/3129] py/emitnative: Let Viper int-indexed code use
 appropriate operands.

This commit extends the generic ASM API by adding the rest of the
ASM_{LOAD,STORE}[size]_REG_REG_OFFSET macros whenever applicable.

The Viper int-indexed load/store code generator was changed to use those
API functions if they are available, falling back to backend-specific
implementations if possible and ultimately to a generic implementation.

Right now all backends except for x64 implement load16, load32, and
store32 operations (x64 only implements load16).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.h     |  6 ++++--
 py/asmrv32.h    | 10 ++++++----
 py/asmthumb.h   |  6 ++++--
 py/asmx86.h     |  6 ++++--
 py/asmxtensa.h  |  6 ++++--
 py/emitnative.c | 24 ++++++++++++++++++++++++
 6 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/py/asmarm.h b/py/asmarm.h
index 42fa1ea212a8a..2c3af41312567 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -208,16 +208,18 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_arm_sub_reg_reg_reg((as), (reg_dest), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_arm_mul_reg_reg_reg((as), (reg_dest), (reg_dest), (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_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), (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_LOAD32_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_STORE_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_arm_str_reg_reg((as), (reg_dest), (reg_base), 4 * (word_offset))
+#define ASM_STORE_REG_REG_OFFSET(as, reg_value, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_value), (reg_base), (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_value, reg_base) asm_arm_strb_reg_reg((as), (reg_value), (reg_base))
 #define ASM_STORE16_REG_REG(as, reg_value, reg_base) asm_arm_strh_reg_reg((as), (reg_value), (reg_base))
 #define ASM_STORE32_REG_REG(as, reg_value, reg_base) asm_arm_str_reg_reg((as), (reg_value), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_value, reg_base, word_offset) asm_arm_str_reg_reg((as), (reg_value), (reg_base), 4 * (word_offset))
 
 #define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldrb_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
 #define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldrh_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 6453b0a3d4367..4f986d7bbd583 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -732,11 +732,12 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_JUMP_IF_REG_NONZERO(state, rs, label, bool_test) asm_rv32_emit_jump_if_reg_nonzero(state, rs, label)
 #define ASM_JUMP_IF_REG_ZERO(state, rs, label, bool_test) asm_rv32_emit_jump_if_reg_eq(state, rs, ASM_RV32_REG_ZERO, label)
 #define ASM_JUMP_REG(state, rs) asm_rv32_opcode_cjr(state, rs)
+#define ASM_LOAD_REG_REG_OFFSET(state, rd, rs, offset) ASM_LOAD32_REG_REG_OFFSET(state, rd, rs, offset)
 #define ASM_LOAD16_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load16_reg_reg_offset(state, rd, rs, offset)
 #define ASM_LOAD16_REG_REG(state, rd, rs) asm_rv32_opcode_lhu(state, rd, rs, 0)
-#define ASM_LOAD32_REG_REG(state, rd, rs) ASM_LOAD_REG_REG_OFFSET(state, rd, rs, 0)
+#define ASM_LOAD32_REG_REG(state, rd, rs) ASM_LOAD32_REG_REG_OFFSET(state, rd, rs, 0)
+#define ASM_LOAD32_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset)
 #define ASM_LOAD8_REG_REG(state, rd, rs) asm_rv32_opcode_lbu(state, rd, rs, 0)
-#define ASM_LOAD_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset)
 #define ASM_LSL_REG_REG(state, rd, rs) asm_rv32_opcode_sll(state, rd, rd, rs)
 #define ASM_LSR_REG_REG(state, rd, rs) asm_rv32_opcode_srl(state, rd, rd, rs)
 #define ASM_MOV_LOCAL_REG(state, local, rs) asm_rv32_emit_mov_local_reg(state, local, rs)
@@ -749,10 +750,11 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_NEG_REG(state, rd) asm_rv32_opcode_sub(state, rd, ASM_RV32_REG_ZERO, rd)
 #define ASM_NOT_REG(state, rd) asm_rv32_opcode_xori(state, rd, rd, -1)
 #define ASM_OR_REG_REG(state, rd, rs) asm_rv32_opcode_or(state, rd, rd, rs)
+#define ASM_STORE_REG_REG_OFFSET(state, rd, rs, offset) ASM_STORE32_REG_REG_OFFSET(state, rd, rs, offset)
 #define ASM_STORE16_REG_REG(state, rs1, rs2) asm_rv32_opcode_sh(state, rs1, rs2, 0)
-#define ASM_STORE32_REG_REG(state, rs1, rs2) ASM_STORE_REG_REG_OFFSET(state, rs1, rs2, 0)
+#define ASM_STORE32_REG_REG(state, rs1, rs2) ASM_STORE32_REG_REG_OFFSET(state, rs1, rs2, 0)
+#define ASM_STORE32_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset)
 #define ASM_STORE8_REG_REG(state, rs1, rs2) asm_rv32_opcode_sb(state, rs1, rs2, 0)
-#define ASM_STORE_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset)
 #define ASM_SUB_REG_REG(state, rd, rs) asm_rv32_opcode_sub(state, rd, rd, rs)
 #define ASM_XOR_REG_REG(state, rd, rs) asm_rv32_emit_optimised_xor(state, rd, rs)
 #define ASM_CLR_REG(state, rd)
diff --git a/py/asmthumb.h b/py/asmthumb.h
index cc4213503bf31..570b44b96bc35 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -462,16 +462,18 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_thumb_sub_rlo_rlo_rlo((as), (reg_dest), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_MUL, (reg_dest), (reg_src))
 
-#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_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((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_LOAD32_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_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), (word_offset))
+#define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_thumb_strb_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
 #define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_thumb_strh_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
 #define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), (word_offset))
 
 #define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_thumb_ldrb_rlo_rlo_rlo((as), (reg_dest), (reg_base), (reg_index))
 #define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
diff --git a/py/asmx86.h b/py/asmx86.h
index af73c163b4f03..5011e56d0c1df 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -200,16 +200,18 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_x86_sub_r32_r32((as), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_x86_mul_r32_r32((as), (reg_dest), (reg_src))
 
-#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_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), (word_offset))
 #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_LOAD32_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_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 4 * (word_offset))
+#define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_x86_mov_r8_to_mem8((as), (reg_src), (reg_base), 0)
 #define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_x86_mov_r16_to_mem16((as), (reg_src), (reg_base), 0)
 #define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 4 * (word_offset))
 
 #endif // GENERIC_ASM_API
 
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index d0fd2dcc18739..598111f909f74 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -413,7 +413,7 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 #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_l32i_optimised((as), (reg_dest), (reg_base), (word_offset))
+#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((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))
@@ -423,13 +423,14 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
         asm_xtensa_op_l16ui((as), (reg_dest), (reg_base), 0); \
     } while (0)
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_l32i_optimised((as), (reg_dest), (reg_base), (word_offset))
 #define ASM_LOAD32_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
     do { \
         asm_xtensa_op_addx4((as), (reg_base), (reg_index), (reg_base)); \
         asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), 0); \
     } while (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))
+#define ASM_STORE_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((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_STORE16_REG_REG_REG(as, reg_val, reg_base, reg_index) \
@@ -438,6 +439,7 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
         asm_xtensa_op_s16i((as), (reg_val), (reg_base), 0); \
     } while (0)
 #define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_xtensa_op_s32i_n((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_s32i_optimised((as), (reg_dest), (reg_base), (word_offset))
 #define ASM_STORE32_REG_REG_REG(as, reg_val, reg_base, reg_index) \
     do { \
         asm_xtensa_op_addx4((as), (reg_base), (reg_index), (reg_base)); \
diff --git a/py/emitnative.c b/py/emitnative.c
index 4b470f3c93522..577bcddfbfc42 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1537,6 +1537,9 @@ static void emit_native_load_subscr(emit_t *emit) {
             switch (vtype_base) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
+                    #ifdef ASM_LOAD8_REG_REG_OFFSET
+                    ASM_LOAD8_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
+                    #else
                     #if N_THUMB
                     if (index_value >= 0 && index_value < 32) {
                         asm_thumb_ldrb_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
@@ -1561,10 +1564,14 @@ static void emit_native_load_subscr(emit_t *emit) {
                         reg_base = reg_index;
                     }
                     ASM_LOAD8_REG_REG(emit->as, REG_RET, reg_base); // load from (base+index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
+                    #ifdef ASM_LOAD16_REG_REG_OFFSET
+                    ASM_LOAD16_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
+                    #else
                     #if N_THUMB
                     if (index_value >= 0 && index_value < 32) {
                         asm_thumb_ldrh_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
@@ -1589,10 +1596,14 @@ static void emit_native_load_subscr(emit_t *emit) {
                         reg_base = reg_index;
                     }
                     ASM_LOAD16_REG_REG(emit->as, REG_RET, reg_base); // load from (base+2*index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR32: {
                     // pointer to 32-bit memory
+                    #ifdef ASM_LOAD32_REG_REG_OFFSET
+                    ASM_LOAD32_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
+                    #else
                     #if N_THUMB
                     if (index_value >= 0 && index_value < 32) {
                         asm_thumb_ldr_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
@@ -1617,6 +1628,7 @@ static void emit_native_load_subscr(emit_t *emit) {
                         reg_base = reg_index;
                     }
                     ASM_LOAD32_REG_REG(emit->as, REG_RET, reg_base); // load from (base+4*index)
+                    #endif
                     break;
                 }
                 default:
@@ -1809,6 +1821,9 @@ static void emit_native_store_subscr(emit_t *emit) {
             switch (vtype_base) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
+                    #ifdef ASM_STORE8_REG_REG_OFFSET
+                    ASM_STORE8_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
+                    #else
                     // TODO optimise to use thumb strb r1, [r2, r3]
                     #if N_THUMB
                     if (index_value >= 0 && index_value < 32) {
@@ -1837,10 +1852,14 @@ static void emit_native_store_subscr(emit_t *emit) {
                         reg_base = reg_index;
                     }
                     ASM_STORE8_REG_REG(emit->as, reg_value, reg_base); // store value to (base+index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR16: {
                     // pointer to 16-bit memory
+                    #ifdef ASM_STORE16_REG_REG_OFFSET
+                    ASM_STORE16_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
+                    #else
                     #if N_THUMB
                     if (index_value >= 0 && index_value < 32) {
                         asm_thumb_strh_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
@@ -1864,10 +1883,14 @@ static void emit_native_store_subscr(emit_t *emit) {
                         reg_base = reg_index;
                     }
                     ASM_STORE16_REG_REG(emit->as, reg_value, reg_base); // store value to (base+2*index)
+                    #endif
                     break;
                 }
                 case VTYPE_PTR32: {
                     // pointer to 32-bit memory
+                    #ifdef ASM_STORE32_REG_REG_OFFSET
+                    ASM_STORE32_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
+                    #else
                     #if N_THUMB
                     if (index_value >= 0 && index_value < 32) {
                         asm_thumb_str_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
@@ -1896,6 +1919,7 @@ static void emit_native_store_subscr(emit_t *emit) {
                         reg_base = reg_index;
                     }
                     ASM_STORE32_REG_REG(emit->as, reg_value, reg_base); // store value to (base+4*index)
+                    #endif
                     break;
                 }
                 default:

From 1f5ba6998bb1895354f5afcd7bb52d83a02733be Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 22 May 2025 12:34:12 +0200
Subject: [PATCH 2334/3129] py/asmthumb: Extend load/store generators with
 ARMv7-M opcodes.

This commit lets the Thumb native code generator backend emit ARMv7-M
specific opcodes for indexed load/store operations if possible.

Now T3 opcode encodings are used if the generator backend is configured
to allow emitting ARMv7-M opcodes and if the (unsigned) scaled index
fits in 12 bits.  Or, in other words, LDR{B,H}.W and STR{B,H}.W opcodes
are now emitted if possible.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmthumb.c   | 66 ++++++++++++++++++++++++++-----------------------
 py/asmthumb.h   | 27 +++++++++++---------
 py/emitnative.c | 43 +++++---------------------------
 3 files changed, 57 insertions(+), 79 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 06021f2bc93cb..c0ba6222cfd6f 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -40,6 +40,7 @@
 #define UNSIGNED_FIT5(x) ((uint32_t)(x) < 32)
 #define UNSIGNED_FIT7(x) ((uint32_t)(x) < 128)
 #define UNSIGNED_FIT8(x) (((x) & 0xffffff00) == 0)
+#define UNSIGNED_FIT12(x) (((x) & 0xfffff000) == 0)
 #define UNSIGNED_FIT16(x) (((x) & 0xffff0000) == 0)
 #define SIGNED_FIT8(x) (((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80)
 #define SIGNED_FIT9(x) (((x) & 0xffffff00) == 0) || (((x) & 0xffffff00) == 0xffffff00)
@@ -52,12 +53,6 @@
 #define OP_SUB_W_RRI_HI(reg_src) (0xf2a0 | (reg_src))
 #define OP_SUB_W_RRI_LO(reg_dest, imm11) ((imm11 << 4 & 0x7000) | reg_dest << 8 | (imm11 & 0xff))
 
-#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))
-
 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);
 }
@@ -432,11 +427,6 @@ void asm_thumb_mov_reg_pcrel(asm_thumb_t *as, uint rlo_dest, uint label) {
     asm_thumb_add_reg_reg(as, rlo_dest, ASM_THUMB_REG_R15); // 2 bytes
 }
 
-// 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));
-}
-
 // 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) {
@@ -464,30 +454,44 @@ static void asm_thumb_add_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint re
     }
 }
 
-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 (asm_thumb_allow_armv7m(as)) {
-        asm_thumb_ldr_reg_reg_i12(as, reg_dest, reg_base, word_offset);
+#define OP_LDR_STR_W_HI(shift, reg) ((0xf880 | (shift) << 5) | (reg))
+#define OP_LDR_STR_W_LO(reg, imm12) (((reg) << 12) | (imm12))
+
+#define OP_LDR 0x01
+#define OP_STR 0x00
+
+#define OP_LDR_W 0x10
+#define OP_STR_W 0x00
+
+static const uint8_t OP_LDR_STR_TABLE[3] = {
+    0x0E, 0x10, 0x0C
+};
+
+void asm_thumb_load_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint shift) {
+    if (UNSIGNED_FIT5(offset) && (reg_dest < ASM_THUMB_REG_R8) && (reg_base < ASM_THUMB_REG_R8)) {
+        // Can use T1 encoding
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_LDR) << 11) | (offset << 6) | (reg_base << 3) | reg_dest);
+    } else if (asm_thumb_allow_armv7m(as) && UNSIGNED_FIT12(offset << shift)) {
+        // Can use T3 encoding
+        asm_thumb_op32(as, (OP_LDR_STR_W_HI(shift, reg_base) | OP_LDR_W), OP_LDR_STR_W_LO(reg_dest, (offset << shift)));
     } 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);
+        // Must use the generic sequence
+        asm_thumb_add_reg_reg_offset(as, reg_dest, reg_base, offset - 31, shift);
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_LDR) << 11) | (31 << 6) | (reg_dest << 3) | (reg_dest));
     }
 }
 
-// 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));
-}
-
-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 (asm_thumb_allow_armv7m(as)) {
-        asm_thumb_ldrh_reg_reg_i12(as, reg_dest, reg_base, uint16_offset);
+void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base, uint offset, uint shift) {
+    if (UNSIGNED_FIT5(offset) && (reg_src < ASM_THUMB_REG_R8) && (reg_base < ASM_THUMB_REG_R8)) {
+        // Can use T1 encoding
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_STR) << 11) | (offset << 6) | (reg_base << 3) | reg_src);
+    } else if (asm_thumb_allow_armv7m(as) && UNSIGNED_FIT12(offset << shift)) {
+        // Can use T3 encoding
+        asm_thumb_op32(as, (OP_LDR_STR_W_HI(shift, reg_base) | OP_STR_W), OP_LDR_STR_W_LO(reg_src, (offset << shift)));
     } 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);
+        // Must use the generic sequence
+        asm_thumb_add_reg_reg_offset(as, reg_base, reg_base, offset - 31, shift);
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_STR) << 11) | (31 << 6) | (reg_base << 3) | reg_src);
     }
 }
 
@@ -569,7 +573,7 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel) {
 
 void asm_thumb_bl_ind(asm_thumb_t *as, uint fun_id, uint reg_temp) {
     // Load ptr to function from table, indexed by fun_id, then call it
-    asm_thumb_ldr_reg_reg_i12_optimised(as, reg_temp, ASM_THUMB_REG_FUN_TABLE, fun_id);
+    asm_thumb_load_reg_reg_offset(as, reg_temp, ASM_THUMB_REG_FUN_TABLE, fun_id, 2);
     asm_thumb_op16(as, OP_BLX(reg_temp));
 }
 
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 570b44b96bc35..6c83b583e2b08 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -382,8 +382,10 @@ 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 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
+// Generate optimised load dest, [src, #offset] sequence
+void asm_thumb_load_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint shift);
+// Generate optimised store src, [dest, #offset] sequence
+void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base, uint offset, uint shift);
 
 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
@@ -463,17 +465,20 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_MUL, (reg_dest), (reg_src))
 
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((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_LOAD32_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_LOAD8_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD8_REG_REG_OFFSET(as, reg_dest, reg_base, byte_offset) asm_thumb_load_reg_reg_offset((as), (reg_dest), (reg_base), (byte_offset), 0)
+#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) ASM_LOAD16_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, halfword_offset) asm_thumb_load_reg_reg_offset((as), (reg_dest), (reg_base), (halfword_offset), 1)
+#define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_thumb_load_reg_reg_offset((as), (reg_dest), (reg_base), (word_offset), 2)
 
 #define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), (word_offset))
-#define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_thumb_strb_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
-#define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_thumb_strh_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
-#define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
-#define ASM_STORE32_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), (word_offset))
+#define ASM_STORE8_REG_REG(as, reg_src, reg_base) ASM_STORE8_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE8_REG_REG_OFFSET(as, reg_src, reg_base, byte_offset) asm_thumb_store_reg_reg_offset((as), (reg_src), (reg_base), (byte_offset), 0)
+#define ASM_STORE16_REG_REG(as, reg_src, reg_base) ASM_STORE16_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE16_REG_REG_OFFSET(as, reg_src, reg_base, halfword_offset) asm_thumb_store_reg_reg_offset((as), (reg_src), (reg_base), (halfword_offset), 1)
+#define ASM_STORE32_REG_REG(as, reg_src, reg_base) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_thumb_store_reg_reg_offset((as), (reg_src), (reg_base), (word_offset), 2)
 
 #define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_thumb_ldrb_rlo_rlo_rlo((as), (reg_dest), (reg_base), (reg_index))
 #define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
diff --git a/py/emitnative.c b/py/emitnative.c
index 577bcddfbfc42..c1965fc913fdd 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1540,12 +1540,7 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #ifdef ASM_LOAD8_REG_REG_OFFSET
                     ASM_LOAD8_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
                     #else
-                    #if N_THUMB
-                    if (index_value >= 0 && index_value < 32) {
-                        asm_thumb_ldrb_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_RV32
+                    #if N_RV32
                     if (FIT_SIGNED(index_value, 12)) {
                         asm_rv32_opcode_lbu(emit->as, REG_RET, reg_base, index_value);
                         break;
@@ -1572,12 +1567,7 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #ifdef ASM_LOAD16_REG_REG_OFFSET
                     ASM_LOAD16_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
                     #else
-                    #if N_THUMB
-                    if (index_value >= 0 && index_value < 32) {
-                        asm_thumb_ldrh_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_RV32
+                    #if N_RV32
                     if (FIT_SIGNED(index_value, 11)) {
                         asm_rv32_opcode_lhu(emit->as, REG_RET, reg_base, index_value << 1);
                         break;
@@ -1604,12 +1594,7 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #ifdef ASM_LOAD32_REG_REG_OFFSET
                     ASM_LOAD32_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
                     #else
-                    #if N_THUMB
-                    if (index_value >= 0 && index_value < 32) {
-                        asm_thumb_ldr_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_RV32
+                    #if N_RV32
                     if (FIT_SIGNED(index_value, 10)) {
                         asm_rv32_opcode_lw(emit->as, REG_RET, reg_base, index_value << 2);
                         break;
@@ -1824,13 +1809,7 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE8_REG_REG_OFFSET
                     ASM_STORE8_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    // TODO optimise to use thumb strb r1, [r2, r3]
-                    #if N_THUMB
-                    if (index_value >= 0 && index_value < 32) {
-                        asm_thumb_strb_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_RV32
+                    #if N_RV32
                     if (FIT_SIGNED(index_value, 12)) {
                         asm_rv32_opcode_sb(emit->as, reg_value, reg_base, index_value);
                         break;
@@ -1860,12 +1839,7 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE16_REG_REG_OFFSET
                     ASM_STORE16_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    #if N_THUMB
-                    if (index_value >= 0 && index_value < 32) {
-                        asm_thumb_strh_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_RV32
+                    #if N_RV32
                     if (FIT_SIGNED(index_value, 11)) {
                         asm_rv32_opcode_sh(emit->as, reg_value, reg_base, index_value << 1);
                         break;
@@ -1891,12 +1865,7 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE32_REG_REG_OFFSET
                     ASM_STORE32_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    #if N_THUMB
-                    if (index_value >= 0 && index_value < 32) {
-                        asm_thumb_str_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_RV32
+                    #if N_RV32
                     if (FIT_SIGNED(index_value, 10)) {
                         asm_rv32_opcode_sw(emit->as, reg_value, reg_base, index_value << 2);
                         break;

From 84ad2c6cd04a1c51d706f9b25b81cad52c6c5802 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 22 May 2025 13:38:36 +0200
Subject: [PATCH 2335/3129] py/asmxtensa: Extend existing specialised
 load/store operations range.

This commit updates the existing specialised implementations for
int-indexed 32-bit load and store operations, and adds a specialised
implementation for int-indexed 16-bit load.

The 32-bit operations relied on the fact that their applicability was
limited to a specific range, falling back on a generic implementation
otherwise.  Introducing a single entry point for each int-indexed
load/store operation size would break that assumption.  Now those two
operations contain fallback code to generate working code by themselves
instead of raising an exception.

The 16-bit operation instead simply did not have any range check, but it
was not exposed directly to the Viper emitter.  When a 16-bit
int-indexed load entry point was introduced, the existing implementation
would fail when accessing memory outside its 0..255 halfwords range.  A
specialised implementation is now present, performing fewer operations
than the existing Viper emitter equivalent.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c  | 24 ++++++++++++++++++++++--
 py/asmxtensa.h  |  8 +++++++-
 py/emitnative.c | 15 ---------------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index ab2e7aeaeb6bb..2b36a56ead247 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -34,6 +34,12 @@
 
 #include "py/asmxtensa.h"
 
+#if N_XTENSAWIN
+#define REG_TEMP ASM_XTENSA_REG_TEMPORARY_WIN
+#else
+#define REG_TEMP ASM_XTENSA_REG_TEMPORARY
+#endif
+
 #define WORD_SIZE (4)
 #define SIGNED_FIT8(x) ((((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80))
 #define SIGNED_FIT12(x) ((((x) & 0xfffff800) == 0) || (((x) & 0xfffff800) == 0xfffff800))
@@ -248,7 +254,9 @@ void asm_xtensa_l32i_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, u
     } else if (word_offset < 256) {
         asm_xtensa_op_l32i(as, reg_dest, reg_base, word_offset);
     } else {
-        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("asm overflow"));
+        asm_xtensa_mov_reg_i32_optimised(as, reg_dest, word_offset * 4);
+        asm_xtensa_op_add_n(as, reg_dest, reg_base, reg_dest);
+        asm_xtensa_op_l32i_n(as, reg_dest, reg_dest, 0);
     }
 }
 
@@ -258,7 +266,19 @@ void asm_xtensa_s32i_optimised(asm_xtensa_t *as, uint reg_src, uint reg_base, ui
     } else if (word_offset < 256) {
         asm_xtensa_op_s32i(as, reg_src, reg_base, word_offset);
     } else {
-        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("asm overflow"));
+        asm_xtensa_mov_reg_i32_optimised(as, REG_TEMP, word_offset * 4);
+        asm_xtensa_op_add_n(as, REG_TEMP, reg_base, REG_TEMP);
+        asm_xtensa_op_s32i_n(as, reg_src, REG_TEMP, 0);
+    }
+}
+
+void asm_xtensa_l16ui_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint halfword_offset) {
+    if (halfword_offset < 256) {
+        asm_xtensa_op_l16ui(as, reg_dest, reg_base, halfword_offset);
+    } else {
+        asm_xtensa_mov_reg_i32_optimised(as, reg_dest, halfword_offset * 2);
+        asm_xtensa_op_add_n(as, reg_dest, reg_base, reg_dest);
+        asm_xtensa_op_l16ui(as, reg_dest, reg_dest, 0);
     }
 }
 
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 598111f909f74..d90aef3c533ca 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -295,6 +295,7 @@ void asm_xtensa_mov_reg_local_addr(asm_xtensa_t *as, uint reg_dest, int local_nu
 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_l16ui_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint halfword_offset);
 void asm_xtensa_call_ind(asm_xtensa_t *as, uint idx);
 void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 void asm_xtensa_bit_branch(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t bit, mp_uint_t label, mp_uint_t condition);
@@ -306,6 +307,11 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 #define ASM_XTENSA_REG_FUN_TABLE ASM_XTENSA_REG_A15
 #define ASM_XTENSA_REG_FUN_TABLE_WIN ASM_XTENSA_REG_A7
 
+// Internal temporary register (currently aliased to REG_ARG_5 for xtensa,
+// and to REG_TEMP2 for xtensawin).
+#define ASM_XTENSA_REG_TEMPORARY ASM_XTENSA_REG_A6
+#define ASM_XTENSA_REG_TEMPORARY_WIN ASM_XTENSA_REG_A12
+
 #if GENERIC_ASM_API
 
 // The following macros provide a (mostly) arch-independent API to
@@ -416,7 +422,7 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((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_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, uint16_offset) asm_xtensa_l16ui_optimised((as), (reg_dest), (reg_base), (uint16_offset))
 #define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
     do { \
         asm_xtensa_op_addx2((as), (reg_base), (reg_index), (reg_base)); \
diff --git a/py/emitnative.c b/py/emitnative.c
index c1965fc913fdd..dba9c7169b6b5 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1572,11 +1572,6 @@ static void emit_native_load_subscr(emit_t *emit) {
                         asm_rv32_opcode_lhu(emit->as, REG_RET, reg_base, index_value << 1);
                         break;
                     }
-                    #elif N_XTENSA || N_XTENSAWIN
-                    if (index_value >= 0 && index_value < 256) {
-                        asm_xtensa_op_l16ui(emit->as, REG_RET, reg_base, index_value);
-                        break;
-                    }
                     #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
@@ -1599,11 +1594,6 @@ static void emit_native_load_subscr(emit_t *emit) {
                         asm_rv32_opcode_lw(emit->as, REG_RET, reg_base, index_value << 2);
                         break;
                     }
-                    #elif N_XTENSA || N_XTENSAWIN
-                    if (index_value >= 0 && index_value < 256) {
-                        asm_xtensa_l32i_optimised(emit->as, REG_RET, reg_base, index_value);
-                        break;
-                    }
                     #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
@@ -1870,11 +1860,6 @@ static void emit_native_store_subscr(emit_t *emit) {
                         asm_rv32_opcode_sw(emit->as, reg_value, reg_base, index_value << 2);
                         break;
                     }
-                    #elif N_XTENSA || N_XTENSAWIN
-                    if (index_value >= 0 && index_value < 256) {
-                        asm_xtensa_s32i_optimised(emit->as, reg_value, reg_base, index_value);
-                        break;
-                    }
                     #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate

From 901c96dc554100513523cc9136161126e8cda436 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 22 May 2025 14:03:53 +0200
Subject: [PATCH 2336/3129] py/emitnative: Remove redundant RV32 Viper
 int-indexed code.

This commit removes redundant RV32 implementations of certain
int-indexed code generation operations (32-bit load/store and 16-bit
load).

Those operations were already available as part of the native emitter
API but were not exposed to the Viper code generator.  As part of the
introduction of more specialised load and store API calls to
int-indexed Viper load/store generator bits, the existing native emitter
implementations are reused, thus making the Viper implementations
redundant.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitnative.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index dba9c7169b6b5..8ac9810c8ff54 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1567,12 +1567,6 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #ifdef ASM_LOAD16_REG_REG_OFFSET
                     ASM_LOAD16_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
                     #else
-                    #if N_RV32
-                    if (FIT_SIGNED(index_value, 11)) {
-                        asm_rv32_opcode_lhu(emit->as, REG_RET, reg_base, index_value << 1);
-                        break;
-                    }
-                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
                         need_reg_single(emit, reg_index, 0);
@@ -1589,12 +1583,6 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #ifdef ASM_LOAD32_REG_REG_OFFSET
                     ASM_LOAD32_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
                     #else
-                    #if N_RV32
-                    if (FIT_SIGNED(index_value, 10)) {
-                        asm_rv32_opcode_lw(emit->as, REG_RET, reg_base, index_value << 2);
-                        break;
-                    }
-                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
                         need_reg_single(emit, reg_index, 0);
@@ -1855,12 +1843,6 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE32_REG_REG_OFFSET
                     ASM_STORE32_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    #if N_RV32
-                    if (FIT_SIGNED(index_value, 10)) {
-                        asm_rv32_opcode_sw(emit->as, reg_value, reg_base, index_value << 2);
-                        break;
-                    }
-                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
                         #if N_ARM

From bbab2e98f5d82b3111544d26e600af592977c0c3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 22 May 2025 14:37:21 +0200
Subject: [PATCH 2337/3129] py/asmarm: Extend int-indexed 32-bit load/store
 offset ranges.

This commit extends the range for int-indexed load/store opcode
generators, making them emit correct code sequences for offsets that
span more than 12 bits.

This is necessary due to those generator bits being also used in the
Viper emitter, where it's more probable to reference offsets that can
not be embedded in the LDR/STR opcodes.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.c     | 26 ++++++++++++++++++++------
 py/asmarm.h     | 12 ++++++------
 py/emitnative.c |  5 -----
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index d304567882cef..5322321553c13 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -333,9 +333,16 @@ void asm_arm_asr_reg_reg(asm_arm_t *as, uint rd, uint rs) {
     emit_al(as, 0x1a00050 | (rd << 12) | (rs << 8) | rd);
 }
 
-void asm_arm_ldr_reg_reg(asm_arm_t *as, uint rd, uint rn, uint byte_offset) {
-    // ldr rd, [rn, #off]
-    emit_al(as, 0x5900000 | (rn << 16) | (rd << 12) | byte_offset);
+void asm_arm_ldr_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset) {
+    if (byte_offset < 0x1000) {
+        // ldr rd, [rn, #off]
+        emit_al(as, 0x5900000 | (rn << 16) | (rd << 12) | byte_offset);
+    } else {
+        // mov r8, #off
+        // ldr rd, [rn, r8]
+        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, byte_offset);
+        emit_al(as, 0x7900000 | (rn << 16) | (rd << 12) | ASM_ARM_REG_R8);
+    }
 }
 
 void asm_arm_ldrh_reg_reg(asm_arm_t *as, uint rd, uint rn) {
@@ -376,9 +383,16 @@ void asm_arm_ldr_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
     emit_al(as, 0x7900100 | (rm << 16) | (rd << 12) | rn);
 }
 
-void asm_arm_str_reg_reg(asm_arm_t *as, uint rd, uint rm, uint byte_offset) {
-    // str rd, [rm, #off]
-    emit_al(as, 0x5800000 | (rm << 16) | (rd << 12) | byte_offset);
+void asm_arm_str_reg_reg_offset(asm_arm_t *as, uint rd, uint rm, uint byte_offset) {
+    if (byte_offset < 0x1000) {
+        // str rd, [rm, #off]
+        emit_al(as, 0x5800000 | (rm << 16) | (rd << 12) | byte_offset);
+    } else {
+        // mov r8, #off
+        // str rd, [rm, r8]
+        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, byte_offset);
+        emit_al(as, 0x7800000 | (rm << 16) | (rd << 12) | ASM_ARM_REG_R8);
+    }
 }
 
 void asm_arm_strh_reg_reg(asm_arm_t *as, uint rd, uint rm) {
diff --git a/py/asmarm.h b/py/asmarm.h
index 2c3af41312567..07ed425c98031 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -109,11 +109,11 @@ 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
-void asm_arm_ldr_reg_reg(asm_arm_t *as, uint rd, uint rn, uint byte_offset);
+void asm_arm_ldr_reg_reg_offset(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_str_reg_reg_offset(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);
 void asm_arm_strb_reg_reg(asm_arm_t *as, uint rd, uint rm);
 
@@ -212,14 +212,14 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #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_LOAD32_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_LOAD32_REG_REG(as, reg_dest, reg_base) asm_arm_ldr_reg_reg_offset((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_arm_ldr_reg_reg_offset((as), (reg_dest), (reg_base), 4 * (word_offset))
 
 #define ASM_STORE_REG_REG_OFFSET(as, reg_value, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_value), (reg_base), (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_value, reg_base) asm_arm_strb_reg_reg((as), (reg_value), (reg_base))
 #define ASM_STORE16_REG_REG(as, reg_value, reg_base) asm_arm_strh_reg_reg((as), (reg_value), (reg_base))
-#define ASM_STORE32_REG_REG(as, reg_value, reg_base) asm_arm_str_reg_reg((as), (reg_value), (reg_base), 0)
-#define ASM_STORE32_REG_REG_OFFSET(as, reg_value, reg_base, word_offset) asm_arm_str_reg_reg((as), (reg_value), (reg_base), 4 * (word_offset))
+#define ASM_STORE32_REG_REG(as, reg_value, reg_base) asm_arm_str_reg_reg_offset((as), (reg_value), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_value, reg_base, word_offset) asm_arm_str_reg_reg_offset((as), (reg_value), (reg_base), 4 * (word_offset))
 
 #define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldrb_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
 #define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldrh_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
diff --git a/py/emitnative.c b/py/emitnative.c
index 8ac9810c8ff54..7662de69e22fb 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1845,11 +1845,6 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #else
                     if (index_value != 0) {
                         // index is a non-zero immediate
-                        #if N_ARM
-                        ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
-                        asm_arm_str_reg_reg_reg(emit->as, reg_value, reg_base, reg_index);
-                        break;
-                        #endif
                         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;

From 5b90d6d4183d0455ba5077cfa8601bfacaa0bf15 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 8 Jun 2025 23:27:31 +0200
Subject: [PATCH 2338/3129] py/asmarm: Give a proper name to the temporary
 register.

This commit performs a small refactoring on the Arm native emitter, by
renaming all but one instance of ASM_ARM_REG_R8 into REG_TEMP.

ASM_ARM_REG_R8 is the temporary register used by the emitter when
operations cannot overwrite the value of a particular register and some
extra storage is needed.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.c | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index 5322321553c13..be50a991b7d72 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -36,6 +36,8 @@
 
 #include "py/asmarm.h"
 
+#define REG_TEMP ASM_ARM_REG_R8
+
 #define SIGNED_FIT24(x) (((x) & 0xff800000) == 0) || (((x) & 0xff000000) == 0xff000000)
 
 // Insert word into instruction flow
@@ -171,8 +173,8 @@ void asm_arm_entry(asm_arm_t *as, int num_locals) {
         if (as->stack_adjust < 0x100) {
             emit_al(as, asm_arm_op_sub_imm(ASM_ARM_REG_SP, ASM_ARM_REG_SP, as->stack_adjust));
         } else {
-            asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, as->stack_adjust);
-            emit_al(as, asm_arm_op_sub_reg(ASM_ARM_REG_SP, ASM_ARM_REG_SP, ASM_ARM_REG_R8));
+            asm_arm_mov_reg_i32_optimised(as, REG_TEMP, as->stack_adjust);
+            emit_al(as, asm_arm_op_sub_reg(ASM_ARM_REG_SP, ASM_ARM_REG_SP, REG_TEMP));
         }
     }
 }
@@ -182,8 +184,8 @@ void asm_arm_exit(asm_arm_t *as) {
         if (as->stack_adjust < 0x100) {
             emit_al(as, asm_arm_op_add_imm(ASM_ARM_REG_SP, ASM_ARM_REG_SP, as->stack_adjust));
         } else {
-            asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, as->stack_adjust);
-            emit_al(as, asm_arm_op_add_reg(ASM_ARM_REG_SP, ASM_ARM_REG_SP, ASM_ARM_REG_R8));
+            asm_arm_mov_reg_i32_optimised(as, REG_TEMP, as->stack_adjust);
+            emit_al(as, asm_arm_op_add_reg(ASM_ARM_REG_SP, ASM_ARM_REG_SP, REG_TEMP));
         }
     }
 
@@ -293,10 +295,10 @@ 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) {
     if (local_num >= 0x40) {
-        // mov r8, #local_num*4
-        // add rd, sp, r8
-        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, local_num << 2);
-        emit_al(as, asm_arm_op_add_reg(rd, ASM_ARM_REG_SP, ASM_ARM_REG_R8));
+        // mov temp, #local_num*4
+        // add rd, sp, temp
+        asm_arm_mov_reg_i32_optimised(as, REG_TEMP, local_num << 2);
+        emit_al(as, asm_arm_op_add_reg(rd, ASM_ARM_REG_SP, REG_TEMP));
     } else {
         // add rd, sp, #local_num*4
         emit_al(as, asm_arm_op_add_imm(rd, ASM_ARM_REG_SP, local_num << 2));
@@ -338,10 +340,10 @@ void asm_arm_ldr_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offse
         // ldr rd, [rn, #off]
         emit_al(as, 0x5900000 | (rn << 16) | (rd << 12) | byte_offset);
     } else {
-        // mov r8, #off
-        // ldr rd, [rn, r8]
-        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, byte_offset);
-        emit_al(as, 0x7900000 | (rn << 16) | (rd << 12) | ASM_ARM_REG_R8);
+        // mov temp, #off
+        // ldr rd, [rn, temp]
+        asm_arm_mov_reg_i32_optimised(as, REG_TEMP, byte_offset);
+        emit_al(as, 0x7900000 | (rn << 16) | (rd << 12) | REG_TEMP);
     }
 }
 
@@ -352,8 +354,8 @@ void asm_arm_ldrh_reg_reg(asm_arm_t *as, uint rd, uint rn) {
 
 void asm_arm_ldrh_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
     // ldrh doesn't support scaled register index
-    emit_al(as, 0x1a00080 | (ASM_ARM_REG_R8 << 12) | rn); // mov r8, rn, lsl #1
-    emit_al(as, 0x19000b0 | (rm << 16) | (rd << 12) | ASM_ARM_REG_R8); // ldrh rd, [rm, r8];
+    emit_al(as, 0x1a00080 | (REG_TEMP << 12) | rn); // mov temp, rn, lsl #1
+    emit_al(as, 0x19000b0 | (rm << 16) | (rd << 12) | REG_TEMP); // ldrh rd, [rm, temp];
 }
 
 void asm_arm_ldrh_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset) {
@@ -361,10 +363,10 @@ void asm_arm_ldrh_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offs
         // ldrh rd, [rn, #off]
         emit_al(as, 0x1d000b0 | (rn << 16) | (rd << 12) | ((byte_offset & 0xf0) << 4) | (byte_offset & 0xf));
     } else {
-        // mov r8, #off
-        // ldrh rd, [rn, r8]
-        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, byte_offset);
-        emit_al(as, 0x19000b0 | (rn << 16) | (rd << 12) | ASM_ARM_REG_R8);
+        // mov temp, #off
+        // ldrh rd, [rn, temp]
+        asm_arm_mov_reg_i32_optimised(as, REG_TEMP, byte_offset);
+        emit_al(as, 0x19000b0 | (rn << 16) | (rd << 12) | REG_TEMP);
     }
 }
 
@@ -388,10 +390,10 @@ void asm_arm_str_reg_reg_offset(asm_arm_t *as, uint rd, uint rm, uint byte_offse
         // str rd, [rm, #off]
         emit_al(as, 0x5800000 | (rm << 16) | (rd << 12) | byte_offset);
     } else {
-        // mov r8, #off
-        // str rd, [rm, r8]
-        asm_arm_mov_reg_i32_optimised(as, ASM_ARM_REG_R8, byte_offset);
-        emit_al(as, 0x7800000 | (rm << 16) | (rd << 12) | ASM_ARM_REG_R8);
+        // mov temp, #off
+        // str rd, [rm, temp]
+        asm_arm_mov_reg_i32_optimised(as, REG_TEMP, byte_offset);
+        emit_al(as, 0x7800000 | (rm << 16) | (rd << 12) | REG_TEMP);
     }
 }
 
@@ -412,8 +414,8 @@ void asm_arm_str_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
 
 void asm_arm_strh_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
     // strh doesn't support scaled register index
-    emit_al(as, 0x1a00080 | (ASM_ARM_REG_R8 << 12) | rn); // mov r8, rn, lsl #1
-    emit_al(as, 0x18000b0 | (rm << 16) | (rd << 12) | ASM_ARM_REG_R8); // strh rd, [rm, r8]
+    emit_al(as, 0x1a00080 | (REG_TEMP << 12) | rn); // mov temp, rn, lsl #1
+    emit_al(as, 0x18000b0 | (rm << 16) | (rd << 12) | REG_TEMP); // strh rd, [rm, temp]
 }
 
 void asm_arm_strb_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {

From c1c73d966ea2d3ee20dbde8c5cd6ea5bd99bc94f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 4 Jun 2025 21:16:43 +0200
Subject: [PATCH 2339/3129] tests/run-tests.py: Unconditionally enable native
 tests if asked.

This commit lets the test runner enumerate and run native tests if the
feature check fails but native tests were explicitly requested from the
command line.

The old behaviour would disable native tests anyway if the feature check
failed, however this hid a bug in the x86 native emitter that would be
triggered even during the feature check.  That meant the test suite
would pass on x86 even with a broken emitter, as those tests would have
been skipped anyway.

Now, if the user asks for native code it will get native code out of the
runner no matter what.

Co-authored-by: Damien George <damien@micropython.org>
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/run-tests.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index cb7a8b7705647..da05e18e4f1d6 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -875,11 +875,7 @@ def run_one_test(test_file):
 
         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_")
         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")

From 0da22b2c30aac8a843c504f907b0675190ee0c89 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 4 Jun 2025 23:02:07 +0200
Subject: [PATCH 2340/3129] tools/ci.sh: Fix nanbox CI test runs.

This commit fixes CI test runs for the `nanbox` target, which were
broken by the unconditional native emitter code output changes in the
test runner.

The `nanbox` configuration does not enable native emitters of any kind,
and with a full test run that includes executing emitted native code
things would break when doing CI runs.

This is worked around by introducing a common subset of tests that do
not involve the native emitter, and a more comprehensive set of tests
that include both non-emitter and emitter tests.  The `nanbox` CI test
run will stop at the first subset, whilst other configurations will run
that and execute further tests.

Function names have been kept the same for steps that involve native
code, with the `nanbox` subset having another one.  This should not
trigger any breakage in existing CI configurations or external scripts.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/unix/Makefile | 11 +++++++----
 tools/ci.sh         | 19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 88fa1af045454..3c54d156c31ba 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -256,21 +256,24 @@ endif
 
 include $(TOP)/py/mkrules.mk
 
-.PHONY: test test_full
+.PHONY: test test_full_no_native test_full
 
 test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
 
-test_full: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
+test_full_no_native: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	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_full: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py test_full_no_native
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	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) --emit native -d basics float micropython
+
 test_gcov: test_full
 	gcov -o $(BUILD)/py $(TOP)/py/*.c
 	gcov -o $(BUILD)/extmod $(TOP)/extmod/*.c
diff --git a/tools/ci.sh b/tools/ci.sh
index 011aabea31c57..aafd6cc573b03 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -527,13 +527,26 @@ function ci_unix_run_tests_helper {
     make -C ports/unix "$@" test
 }
 
+function ci_unix_run_tests_full_extra {
+    micropython=$1
+    (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_unix_run_tests_full_no_native_helper {
+    variant=$1
+    shift
+    micropython=../ports/unix/build-$variant/micropython
+    make -C ports/unix VARIANT=$variant "$@" test_full_no_native
+    ci_unix_run_tests_full_extra $micropython
+}
+
 function ci_unix_run_tests_full_helper {
     variant=$1
     shift
     micropython=../ports/unix/build-$variant/micropython
     make -C ports/unix VARIANT=$variant "$@" test_full
-    (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)
+    ci_unix_run_tests_full_extra $micropython
 }
 
 function ci_native_mpy_modules_build {
@@ -673,7 +686,7 @@ function ci_unix_nanbox_build {
 }
 
 function ci_unix_nanbox_run_tests {
-    ci_unix_run_tests_full_helper nanbox PYTHON=python2.7
+    ci_unix_run_tests_full_no_native_helper nanbox PYTHON=python2.7
 }
 
 function ci_unix_float_build {

From 80b823bca15d846de940d08a6e8144290514f8a2 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 8 Jun 2025 21:51:30 +0200
Subject: [PATCH 2341/3129] py/asmxtensa: Extend BCCZ range to 18 bits.

This commit lets the native emitter backend extends the range of the
BCCZ family of opcodes (BEQZ, BNEZ, BLTZ, BGEZ) from 12 bits to 18
bits.

The test suite contains some test files that, when compiled into native
code, would require BCCZ jumps outside the (signed) 12 bits range.  In
this case either the MicroPython interpreter or mpy-cross would raise an
exception, not running the test when using the "--via-mpy --emit native"
command line options with the test runner.

This comes with a 3 bytes penalty on each forward jump, bringing the
footprint of those jumps to 6 bytes each, as a longer opcode sequence
has to be emitted to let jumps access a larger range.  However, this is
slightly offset by the fact that backward jumps can be emitted with a
single opcode if the range is small enough (3 bytes for a 12-bits
offset).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 2b36a56ead247..fd71dedb16fae 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -41,6 +41,7 @@
 #endif
 
 #define WORD_SIZE (4)
+#define SIGNED_FIT6(x) ((((x) & 0xffffffe0) == 0) || (((x) & 0xffffffe0) == 0xffffffe0))
 #define SIGNED_FIT8(x) ((((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80))
 #define SIGNED_FIT12(x) ((((x) & 0xfffff800) == 0) || (((x) & 0xfffff800) == 0xfffff800))
 #define SIGNED_FIT18(x) ((((x) & 0xfffe0000) == 0) || (((x) & 0xfffe0000) == 0xfffe0000))
@@ -158,13 +159,36 @@ void asm_xtensa_j_label(asm_xtensa_t *as, uint label) {
     asm_xtensa_op_j(as, rel);
 }
 
+static bool calculate_branch_displacement(asm_xtensa_t *as, uint label, ptrdiff_t *displacement) {
+    assert(displacement != NULL && "Displacement pointer is NULL");
+
+    uint32_t label_offset = get_label_dest(as, label);
+    *displacement = (ptrdiff_t)(label_offset - as->base.code_offset - 4);
+    return (label_offset != (uint32_t)-1) && (*displacement < 0);
+}
+
 void asm_xtensa_bccz_reg_label(asm_xtensa_t *as, uint cond, uint reg, uint label) {
-    uint32_t dest = get_label_dest(as, label);
-    int32_t rel = dest - as->base.code_offset - 4;
-    if (as->base.pass == MP_ASM_PASS_EMIT && !SIGNED_FIT12(rel)) {
+    ptrdiff_t rel = 0;
+    bool can_emit_short_jump = calculate_branch_displacement(as, label, &rel);
+
+    if (can_emit_short_jump && SIGNED_FIT12(rel)) {
+        // Backwards BCCZ opcodes with an offset that fits in 12 bits can
+        // be emitted without any change.
+        asm_xtensa_op_bccz(as, cond, reg, rel);
+        return;
+    }
+
+    // Range is effectively extended to 18 bits, as a more complex jump code
+    // sequence is emitted.
+    if (as->base.pass == MP_ASM_PASS_EMIT && !SIGNED_FIT18(rel - 6)) {
         mp_raise_msg_varg(&mp_type_RuntimeError, ET_OUT_OF_RANGE, MP_QSTR_bccz);
     }
-    asm_xtensa_op_bccz(as, cond, reg, rel);
+
+    // ~BCCZ skip ; +0  <- Condition is flipped here (EQ -> NE, etc.)
+    //  J    addr ; +3
+    // skip:      ; +6
+    asm_xtensa_op_bccz(as, cond ^ 1, reg, 6 - 4);
+    asm_xtensa_op_j(as, rel - 3);
 }
 
 void asm_xtensa_bcc_reg_reg_label(asm_xtensa_t *as, uint cond, uint reg1, uint reg2, uint label) {

From 43f6013294ff1c59fb956b47be5686bab5a389a6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 8 Jun 2025 22:58:33 +0200
Subject: [PATCH 2342/3129] py/asmxtensa: Extend BCC range to 18 bits.

This commit lets the native emitter backend extends the range of the
BCC family of opcodes (BALL, BANY, BBC, BBS, BEQ, BGE, BGEU, BLT,
BLTU, BNALL, BNE, BNONE) from 8 bits to 18 bits.

The test suite contains some test files that, when compiled into native
code, would require BCC jumps outside the (signed) 8 bits range.  In
this case either the MicroPython interpreter or mpy-cross would raise an
exception, not running the test when using the "--via-mpy --emit native"
command line options with the test runner.

This comes with a 3 bytes penalty on each forward jump, bringing the
footprint of those jumps to 6 bytes each, as a longer opcode sequence
has to be emitted to let jumps access a larger range.  However, this is
slightly offset by the fact that backward jumps can be emitted with a
single opcode if the range is small enough (8-bits offset).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index fd71dedb16fae..85a8cfef55518 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -192,12 +192,27 @@ void asm_xtensa_bccz_reg_label(asm_xtensa_t *as, uint cond, uint reg, uint label
 }
 
 void asm_xtensa_bcc_reg_reg_label(asm_xtensa_t *as, uint cond, uint reg1, uint reg2, uint label) {
-    uint32_t dest = get_label_dest(as, label);
-    int32_t rel = dest - as->base.code_offset - 4;
-    if (as->base.pass == MP_ASM_PASS_EMIT && !SIGNED_FIT8(rel)) {
+    ptrdiff_t rel = 0;
+    bool can_emit_short_jump = calculate_branch_displacement(as, label, &rel);
+
+    if (can_emit_short_jump && SIGNED_FIT8(rel)) {
+        // Backwards BCC opcodes with an offset that fits in 8 bits can
+        // be emitted without any change.
+        asm_xtensa_op_bcc(as, cond, reg1, reg2, rel);
+        return;
+    }
+
+    // Range is effectively extended to 18 bits, as a more complex jump code
+    // sequence is emitted.
+    if (as->base.pass == MP_ASM_PASS_EMIT && !SIGNED_FIT18(rel - 6)) {
         mp_raise_msg_varg(&mp_type_RuntimeError, ET_OUT_OF_RANGE, MP_QSTR_bcc);
     }
-    asm_xtensa_op_bcc(as, cond, reg1, reg2, rel);
+
+    // ~BCC skip ; +0  <- Condition is flipped here (EQ -> NE, etc.)
+    //  J   addr ; +3
+    // skip:     ; +6
+    asm_xtensa_op_bcc(as, cond ^ 8, reg1, reg2, 6 - 4);
+    asm_xtensa_op_j(as, rel - 3);
 }
 
 // convenience function; reg_dest must be different from reg_src[12]

From 5f4abeb3859c948cc4a65221af6013a95533cdc4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 May 2025 12:26:12 +1000
Subject: [PATCH 2343/3129] py/asmthumb: Implement long jumps on Thumb/armv6m
 architecture.

With this change, all tests (except thread tests) now pass on RPI_PICO when
using the native emitter:

    (plug in RPI_PICO)
    $ cd tests
    $ ./run-tests.py -t a0 --via-mpy --emit native

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmthumb.c | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index c0ba6222cfd6f..fda0f52705e53 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -499,6 +499,7 @@ void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base
 #define OP_BW_HI(byte_offset) (0xf000 | (((byte_offset) >> 12) & 0x07ff))
 #define OP_BW_LO(byte_offset) (0xb800 | (((byte_offset) >> 1) & 0x07ff))
 
+// In Thumb1 mode, this may clobber r1.
 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;
@@ -518,19 +519,40 @@ void asm_thumb_b_label(asm_thumb_t *as, uint label) {
     if (asm_thumb_allow_armv7m(as)) {
         asm_thumb_op32(as, OP_BW_HI(rel), OP_BW_LO(rel));
     } else {
+        // this code path has to be the same instruction size irrespective of the value of rel
+        bool need_align = as->base.code_offset & 2u;
         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"));
+            asm_thumb_op16(as, ASM_THUMB_OP_NOP);
+            asm_thumb_op16(as, ASM_THUMB_OP_NOP);
+            if (need_align) {
+                asm_thumb_op16(as, ASM_THUMB_OP_NOP);
             }
+        } else {
+            // do a large jump using:
+            //     (nop)
+            //     ldr r1, [pc, _data]
+            //     add pc, r1
+            // _data: .word rel
+            //
+            // note: can't use r0 as a temporary because native code can have the return value
+            // in that register and use a large jump to get to the exit point of the function
+
+            rel -= 2; // account for the "ldr r1, [pc, _data]"
+            if (need_align) {
+                asm_thumb_op16(as, ASM_THUMB_OP_NOP);
+                rel -= 2; // account for this nop
+            }
+            asm_thumb_ldr_rlo_pcrel_i8(as, ASM_THUMB_REG_R1, 0);
+            asm_thumb_add_reg_reg(as, ASM_THUMB_REG_R15, ASM_THUMB_REG_R1);
+            asm_thumb_op16(as, rel & 0xffff);
+            asm_thumb_op16(as, rel >> 16);
         }
     }
 }
 
+// In Thumb1 mode, this may clobber r1.
 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;
@@ -551,8 +573,15 @@ void asm_thumb_bcc_label(asm_thumb_t *as, int cond, uint label) {
         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));
+        size_t code_offset_start = as->base.code_offset;
+        byte *c = asm_thumb_get_cur_to_write_bytes(as, 2);
         asm_thumb_b_label(as, label);
+        size_t bytes_to_skip = as->base.code_offset - code_offset_start;
+        uint16_t op = OP_BCC_N(cond ^ 1, bytes_to_skip - 4);
+        if (c != NULL) {
+            c[0] = op;
+            c[1] = op >> 8;
+        }
     }
 }
 

From 718ff4fdd58efd3e853599b489640877070d17be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 May 2025 14:27:35 +1000
Subject: [PATCH 2344/3129] tools/mpy_ld.py: Support R_ARM_ABS32 relocation in
 text.

Add support for R_ARM_ABS32 relocations in native .mpy files.  These can be
rewritten in the same way that data relocations are.

Fixes issue #14430.

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

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 6518037f2ef33..a600ec12c3d85 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -711,8 +711,9 @@ def do_relocation_text(env, text_addr, r):
         (addr, value) = process_riscv32_relocation(env, text_addr, r)
 
     elif env.arch.name == "EM_ARM" and r_info_type == R_ARM_ABS32:
-        # happens for soft-float on armv6m
-        raise ValueError("Absolute relocations not supported on ARM")
+        # Absolute relocation, handled as a data relocation.
+        do_relocation_data(env, text_addr, r)
+        return
 
     else:
         # Unknown/unsupported relocation
@@ -781,9 +782,9 @@ def do_relocation_data(env, text_addr, r):
     ):
         # Relocation in data.rel.ro to internal/external symbol
         if env.arch.word_size == 4:
-            struct_type = "<I"
+            struct_type = "<i"
         elif env.arch.word_size == 8:
-            struct_type = "<Q"
+            struct_type = "<q"
         if hasattr(s, "resolved"):
             s = s.resolved
         sec = s.section

From 17951cee87d63bcc001fdaf1e669a74e6da4af29 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 May 2025 14:28:02 +1000
Subject: [PATCH 2345/3129] py/dynruntime.mk: Enable single-precision float by
 default on armv6/7m.

Soft float now works on these ARM targets thanks to the parent commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/natmod/random/Makefile | 5 +++++
 py/dynruntime.mk                | 4 ++--
 tools/ci.sh                     | 8 +++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/examples/natmod/random/Makefile b/examples/natmod/random/Makefile
index 5d23eac1e9cfd..bffbb32d60ef1 100644
--- a/examples/natmod/random/Makefile
+++ b/examples/natmod/random/Makefile
@@ -14,4 +14,9 @@ ifeq ($(ARCH),xtensa)
 MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
 endif
 
+ifeq ($(ARCH),$(filter $(ARCH),armv6m armv7m))
+# Link with libm.a for soft-float helper functions
+LINK_RUNTIME = 1
+endif
+
 include $(MPY_DIR)/py/dynruntime.mk
diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 84c78d6225c5a..030728cfc9adf 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -63,14 +63,14 @@ else ifeq ($(ARCH),armv6m)
 # thumb
 CROSS = arm-none-eabi-
 CFLAGS_ARCH += -mthumb -mcpu=cortex-m0
-MICROPY_FLOAT_IMPL ?= none
+MICROPY_FLOAT_IMPL ?= float
 
 else ifeq ($(ARCH),armv7m)
 
 # thumb
 CROSS = arm-none-eabi-
 CFLAGS_ARCH += -mthumb -mcpu=cortex-m3
-MICROPY_FLOAT_IMPL ?= none
+MICROPY_FLOAT_IMPL ?= float
 
 else ifeq ($(ARCH),armv7emsp)
 
diff --git a/tools/ci.sh b/tools/ci.sh
index aafd6cc573b03..a5cd326c1c7d7 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -561,13 +561,11 @@ function ci_native_mpy_modules_build {
         make -C examples/natmod/$natmod ARCH=$arch
     done
 
-    # features2 requires soft-float on armv7m, rv32imc, and xtensa.  On armv6m
-    # the compiler generates absolute relocations in the object file
-    # referencing soft-float functions, which is not supported at the moment.
+    # features2 requires soft-float on rv32imc and xtensa.
     make -C examples/natmod/features2 ARCH=$arch clean
-    if [ $arch = "rv32imc" ] || [ $arch = "armv7m" ] || [ $arch = "xtensa" ]; then
+    if [ $arch = "rv32imc" ] || [ $arch = "xtensa" ]; then
         make -C examples/natmod/features2 ARCH=$arch MICROPY_FLOAT_IMPL=float
-    elif [ $arch != "armv6m" ]; then
+    else
         make -C examples/natmod/features2 ARCH=$arch
     fi
 

From 745bec9ce3cc4c95d8e80fcc8f64ffecde1d91bc Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 1 Jun 2025 18:47:36 +0200
Subject: [PATCH 2346/3129] extmod/modre: Use specific error message if regex
 is too complex.

If the error reporting mode is at least "normal", report a failure due to a
complex regex with a different message.

Fixes issue #17150.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/modre.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/modre.c b/extmod/modre.c
index 1a118009cbd1f..d17ec68d50eda 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -427,6 +427,9 @@ static mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
     const char *re_str = mp_obj_str_get_str(args[0]);
     int size = re1_5_sizecode(re_str);
     if (size == -1) {
+        #if MICROPY_ERROR_REPORTING >= MICROPY_ERROR_REPORTING_NORMAL
+        mp_raise_ValueError(MP_ERROR_TEXT("regex too complex"));
+        #endif
         goto error;
     }
     mp_obj_re_t *o = mp_obj_malloc_var(mp_obj_re_t, re.insts, char, size, (mp_obj_type_t *)&re_type);

From 5eb97552591c6d2681b3e452b4b7d8445354b138 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 30 May 2025 07:54:08 +0200
Subject: [PATCH 2347/3129] py/parsenum: Reduce code size in check for inf/nan.

By avoiding two different checks of the string length, code size is reduced
without changing behavior: Some invalid float/complex strings like "ix"
will get handled just like "xx" in the main number literal parsing code
instead.

The optimizer alone couldn't remove the reundant comparisons because it
couldn't make a transformation that let an invalid string like "ix" pass
into the generic number parsing code.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/parsenum.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index a38ce563f9530..e5c08b02883fc 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -252,9 +252,9 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
     const char *str_val_start = str;
 
     // determine what the string is
-    if (str < top && (str[0] | 0x20) == 'i') {
+    if (str + 2 < top && (str[0] | 0x20) == 'i') {
         // string starts with 'i', should be 'inf' or 'infinity' (case insensitive)
-        if (str + 2 < top && (str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'f') {
+        if ((str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'f') {
             // inf
             str += 3;
             dec_val = (mp_float_t)INFINITY;
@@ -263,9 +263,9 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
                 str += 5;
             }
         }
-    } else if (str < top && (str[0] | 0x20) == 'n') {
+    } else if (str + 2 < top && (str[0] | 0x20) == 'n') {
         // string starts with 'n', should be 'nan' (case insensitive)
-        if (str + 2 < top && (str[1] | 0x20) == 'a' && (str[2] | 0x20) == 'n') {
+        if ((str[1] | 0x20) == 'a' && (str[2] | 0x20) == 'n') {
             // NaN
             str += 3;
             dec_val = MICROPY_FLOAT_C_FUN(nan)("");

From c1629dc2ff12a92d600b5988827566f8d693cad1 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 30 May 2025 07:56:52 +0200
Subject: [PATCH 2348/3129] py/parsenum: Further reduce code size in check for
 inf/nan.

A few more bytes can be saved by not using nested `if`s (4 bytes for
`build-MICROBIT/py/parsenum.o`, 8 bytes for RPI_PICO firmware).

This commit is better viewed with whitespace changes hidden, because
two blocks were reindented (e.g., `git show -b`).

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/parsenum.c | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index e5c08b02883fc..300b5f28de81b 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -252,24 +252,18 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
     const char *str_val_start = str;
 
     // determine what the string is
-    if (str + 2 < top && (str[0] | 0x20) == 'i') {
-        // string starts with 'i', should be 'inf' or 'infinity' (case insensitive)
-        if ((str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'f') {
-            // inf
-            str += 3;
-            dec_val = (mp_float_t)INFINITY;
-            if (str + 4 < top && (str[0] | 0x20) == 'i' && (str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'i' && (str[3] | 0x20) == 't' && (str[4] | 0x20) == 'y') {
-                // infinity
-                str += 5;
-            }
-        }
-    } else if (str + 2 < top && (str[0] | 0x20) == 'n') {
-        // string starts with 'n', should be 'nan' (case insensitive)
-        if ((str[1] | 0x20) == 'a' && (str[2] | 0x20) == 'n') {
-            // NaN
-            str += 3;
-            dec_val = MICROPY_FLOAT_C_FUN(nan)("");
+    if (str + 2 < top && (str[0] | 0x20) == 'i' && (str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'f') {
+        // 'inf' or 'infinity' (case insensitive)
+        str += 3;
+        dec_val = (mp_float_t)INFINITY;
+        if (str + 4 < top && (str[0] | 0x20) == 'i' && (str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'i' && (str[3] | 0x20) == 't' && (str[4] | 0x20) == 'y') {
+            // infinity
+            str += 5;
         }
+    } else if (str + 2 < top && (str[0] | 0x20) == 'n' && (str[1] | 0x20) == 'a' && (str[2] | 0x20) == 'n') {
+        // 'nan' (case insensitive)
+        str += 3;
+        dec_val = MICROPY_FLOAT_C_FUN(nan)("");
     } else {
         // string should be a decimal number
         parse_dec_in_t in = PARSE_DEC_IN_INTG;

From 0a98f3a91130d127c937d6865ead24b6693182eb Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 1 Jun 2025 19:19:51 +0200
Subject: [PATCH 2349/3129] py/objarray: Allow extending array with any
 iterable.

As suggested by @dpgeorge, factor out part of array_construct to allow it
to be used for construction & extension.

Note that extending with a known-length list (or tuple) goes through the
slow path of calling array_extend once per element.

Fixes issue #7408.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objarray.c             | 31 ++++++++++++++++++-------------
 tests/basics/array_add.py |  6 ++++++
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 9d68aa70616ca..1fd0269390409 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -113,6 +113,19 @@ static mp_obj_array_t *array_new(char typecode, size_t n) {
 #endif
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
+static void array_extend_impl(mp_obj_array_t *array, mp_obj_t arg, char typecode, size_t len) {
+    mp_obj_t iterable = mp_getiter(arg, NULL);
+    mp_obj_t item;
+    size_t i = 0;
+    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+        if (len == 0) {
+            array_append(MP_OBJ_FROM_PTR(array), item);
+        } else {
+            mp_binary_set_val_array(typecode, array->items, i++, item);
+        }
+    }
+}
+
 static mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
     // bytearrays can be raw-initialised from anything with the buffer protocol
     // other arrays can only be raw-initialised from bytes and bytearray objects
@@ -142,18 +155,7 @@ static mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
     }
 
     mp_obj_array_t *array = array_new(typecode, len);
-
-    mp_obj_t iterable = mp_getiter(initializer, NULL);
-    mp_obj_t item;
-    size_t i = 0;
-    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        if (len == 0) {
-            array_append(MP_OBJ_FROM_PTR(array), item);
-        } else {
-            mp_binary_set_val_array(typecode, array->items, i++, item);
-        }
-    }
-
+    array_extend_impl(array, initializer, typecode, len);
     return MP_OBJ_FROM_PTR(array);
 }
 #endif
@@ -413,7 +415,10 @@ static mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
 
     // allow to extend by anything that has the buffer protocol (extension to CPython)
     mp_buffer_info_t arg_bufinfo;
-    mp_get_buffer_raise(arg_in, &arg_bufinfo, MP_BUFFER_READ);
+    if (!mp_get_buffer(arg_in, &arg_bufinfo, MP_BUFFER_READ)) {
+        array_extend_impl(self, arg_in, 0, 0);
+        return mp_const_none;
+    }
 
     size_t sz = mp_binary_get_size('@', self->typecode, NULL);
 
diff --git a/tests/basics/array_add.py b/tests/basics/array_add.py
index 76ce59f761e06..e78615541c3cb 100644
--- a/tests/basics/array_add.py
+++ b/tests/basics/array_add.py
@@ -14,3 +14,9 @@
 
 a1.extend(array.array('I', [5]))
 print(a1)
+
+a1.extend([6, 7])
+print(a1)
+
+a1.extend(i for i in (8, 9))
+print(a1)

From 2ce63b142068fc04aae701ae78af683736dc179c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 28 May 2025 20:49:29 +0200
Subject: [PATCH 2350/3129] py/parsenum: Fix parsing complex literals with
 negative real part.

If a complex literal had a negative real part and a positive imaginary
part, it was not parsed properly because the imaginary part also came out
negative.

Includes a test of complex parsing, which fails without this fix.

Co-authored-by: ComplexSymbol <141301057+ComplexSymbol@users.noreply.github.com>
Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/parsenum.c           | 4 ++--
 tests/float/complex1.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index 300b5f28de81b..7e6695fbfcd70 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -227,13 +227,13 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
 
     const char *top = str + len;
     mp_float_t dec_val = 0;
-    bool dec_neg = false;
 
     #if MICROPY_PY_BUILTINS_COMPLEX
     unsigned int real_imag_state = REAL_IMAG_STATE_START;
     mp_float_t dec_real = 0;
-parse_start:
+parse_start:;
     #endif
+    bool dec_neg = false;
 
     // skip leading space
     for (; str < top && unichar_isspace(*str); str++) {
diff --git a/tests/float/complex1.py b/tests/float/complex1.py
index f4107a1390fee..0a1d98b9af3eb 100644
--- a/tests/float/complex1.py
+++ b/tests/float/complex1.py
@@ -12,9 +12,11 @@
 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(" +1-2j "))
+print(complex(" -1+2j "))
 print(complex("nanj"))
 print(complex("nan-infj"))
 print(complex(1, 2))

From ca80aabf21eac1d97f108ad7ed86ff3426f88449 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Jun 2025 22:15:37 +1000
Subject: [PATCH 2351/3129] py/objfloat: Change MSVC workaround for NAN being a
 constant.

It's actually a bug in the Windows SDK, not MSVC, as per
https://stackoverflow.com/questions/79195142/recent-msvc-versions-dont-treat-nan-as-constant-workaround/79324199#79324199

Thanks to @stinos.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objfloat.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/py/objfloat.c b/py/objfloat.c
index 0728fce3151fe..81b0daa620916 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -34,6 +34,11 @@
 
 #if MICROPY_PY_BUILTINS_FLOAT
 
+// Workaround a bug in Windows SDK version 10.0.26100.0, where NAN is no longer constant.
+#if defined(_MSC_VER) && !defined(_UCRT_NOISY_NAN)
+#define _UCRT_NOISY_NAN
+#endif
+
 #include <math.h>
 #include "py/formatfloat.h"
 
@@ -47,13 +52,6 @@
 #define M_PI (3.14159265358979323846)
 #endif
 
-// Workaround a bug in recent MSVC where NAN is no longer constant.
-// (By redefining back to the previous MSVC definition of NAN)
-#if defined(_MSC_VER) && _MSC_VER >= 1942
-#undef NAN
-#define NAN (-(float)(((float)(1e+300 * 1e+300)) * 0.0F))
-#endif
-
 typedef struct _mp_obj_float_t {
     mp_obj_base_t base;
     mp_float_t value;

From 9bde12597a6980ff87ff0137a2616e6e430a1a0e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Jun 2025 13:46:29 +1000
Subject: [PATCH 2352/3129] github/workflows: Use windows-latest runner for all
 Windows CI jobs.

The windows-2019 runner has been deprecated by GitHub, so stop using that.
Also take the chance to stop using windows-2022 and just use windows-latest
everywhere.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_windows.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 84e018ba15d16..f33277d471d3c 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -28,13 +28,10 @@ jobs:
         visualstudio: ['2017', '2019', '2022']
         include:
         - visualstudio: '2017'
-          runner: windows-latest
           vs_version: '[15, 16)'
         - visualstudio: '2019'
-          runner: windows-2019
           vs_version: '[16, 17)'
         - visualstudio: '2022'
-          runner: windows-2022
           vs_version: '[17, 18)'
         # trim down the number of jobs in the matrix
         exclude:
@@ -42,9 +39,9 @@ jobs:
           configuration: Debug
         - visualstudio: '2019'
           configuration: Debug
+    runs-on: windows-latest
     env:
       CI_BUILD_CONFIGURATION: ${{ matrix.configuration }}
-    runs-on: ${{ matrix.runner }}
     steps:
     - name: Install Visual Studio 2017
       if: matrix.visualstudio == '2017'
@@ -52,13 +49,15 @@ jobs:
         choco install visualstudio2017buildtools
         choco install visualstudio2017-workload-vctools
         choco install windows-sdk-8.1
+    - name: Install Visual Studio 2019
+      if: matrix.visualstudio == '2019'
+      run: |
+        choco install visualstudio2019buildtools
+        choco install visualstudio2019-workload-vctools
+        choco install windows-sdk-8.1
     - uses: microsoft/setup-msbuild@v2
       with:
         vs-version: ${{ matrix.vs_version }}
-    - uses: actions/setup-python@v5
-      if: matrix.runner == 'windows-2019'
-      with:
-        python-version: '3.9'
     - uses: actions/checkout@v4
     - name: Build mpy-cross.exe
       run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
@@ -103,7 +102,7 @@ jobs:
             env: i686
           - sys: mingw64
             env: x86_64
-    runs-on: windows-2022
+    runs-on: windows-latest
     env:
       CHERE_INVOKING: enabled_from_arguments
     defaults:

From e4d556b14931d0c5245cda585341f377f9186298 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 May 2025 16:06:36 +1000
Subject: [PATCH 2353/3129] tests/extmod/random_extra_float.py: Skip when funcs
 not available.

This test was factored out from `random_extra.py` back in commit
6572029dc0665e58c2ea7355c9e541bdf83105a4, and the skip logic copied from
that file.  But the skip logic needs to test that the `random` and
`uniform` functions exist, not `randint`.

This commit fixes that skip logic.

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

diff --git a/tests/extmod/random_extra_float.py b/tests/extmod/random_extra_float.py
index 3b37ed8dcef2f..03973c583492d 100644
--- a/tests/extmod/random_extra_float.py
+++ b/tests/extmod/random_extra_float.py
@@ -1,12 +1,8 @@
 try:
     import random
-except ImportError:
-    print("SKIP")
-    raise SystemExit
 
-try:
-    random.randint
-except AttributeError:
+    random.random
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 

From 2bc5af694593c3654d0e7b59ad18b6f4a442072a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Jun 2025 00:09:32 +1000
Subject: [PATCH 2354/3129] tests/run-tests.py: Factor out helper function to
 create test report.

This commit factors existing code in `run-tests.py` into a new helper
function `create_test_report()`.  That function prints out a summary of the
test run (eg number of tests passed, number failed, number skipped) and
creates the corresponding `_results.json` file.

This is done so `create_test_report()` can be reused by the other test
runners.

The `test_count` counter is now gone, and instead the number of passed plus
number of failed tests is used as an equivalent count.

For consistency this commit makes a minor change to the printed output of
`run-tests.py`: instead of printing a shorthand name for tests that failed
or skipped, it now prints the full name.  Eg what was previously printed as
`attrtuple2` is now printed as `basics/attrtuple2.py`.  This makes the
output a little longer (when there are failed/skipped tests) but helps to
disambiguate the test name, eg which directory it's in.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 50 ++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index da05e18e4f1d6..5eebc72460acf 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -616,7 +616,6 @@ def run_script_on_remote_target(self, args, test_file, is_special):
 
 
 def run_tests(pyb, tests, args, result_dir, num_threads=1):
-    test_count = ThreadSafeCounter()
     testcase_count = ThreadSafeCounter()
     test_results = ThreadSafeCounter([])
 
@@ -903,7 +902,7 @@ def run_one_test(test_file):
 
         if skip_it:
             print("skip ", test_file)
-            test_results.append((test_name, test_file, "skip", ""))
+            test_results.append((test_file, "skip", ""))
             return
 
         # Run the test on the MicroPython target.
@@ -918,11 +917,11 @@ def run_one_test(test_file):
                 # start-up code (eg boot.py) when preparing to run the next test.
                 pyb.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
             print("skip ", test_file)
-            test_results.append((test_name, test_file, "skip", ""))
+            test_results.append((test_file, "skip", ""))
             return
         elif output_mupy == b"SKIP-TOO-LARGE\n":
             print("lrge ", test_file)
-            test_results.append((test_name, test_file, "skip", "too large"))
+            test_results.append((test_file, "skip", "too large"))
             return
 
         # Look at the output of the test to see if unittest was used.
@@ -1005,7 +1004,7 @@ def run_one_test(test_file):
         # Print test summary, update counters, and save .exp/.out files if needed.
         if test_passed:
             print("pass ", test_file, extra_info)
-            test_results.append((test_name, test_file, "pass", ""))
+            test_results.append((test_file, "pass", ""))
             rm_f(filename_expected)
             rm_f(filename_mupy)
         else:
@@ -1017,9 +1016,7 @@ def run_one_test(test_file):
                 rm_f(filename_expected)  # in case left over from previous failed run
             with open(filename_mupy, "wb") as f:
                 f.write(output_mupy)
-            test_results.append((test_name, test_file, "fail", ""))
-
-        test_count.increment()
+            test_results.append((test_file, "fail", ""))
 
         # Print a note if this looks like it might have been a misfired unittest
         if not uses_unittest and not test_passed:
@@ -1046,19 +1043,27 @@ def run_one_test(test_file):
             print(line)
         sys.exit(1)
 
-    test_results = test_results.value
-    passed_tests = list(r for r in test_results if r[2] == "pass")
-    skipped_tests = list(r for r in test_results if r[2] == "skip" and r[3] != "too large")
+    # Return test results.
+    return test_results.value, testcase_count.value
+
+
+# Print a summary of the results and save them to a JSON file.
+# Returns True if everything succeeded, False otherwise.
+def create_test_report(args, test_results, testcase_count=None):
+    passed_tests = list(r for r in test_results if r[1] == "pass")
+    skipped_tests = list(r for r in test_results if r[1] == "skip" and r[2] != "too large")
     skipped_tests_too_large = list(
-        r for r in test_results if r[2] == "skip" and r[3] == "too large"
+        r for r in test_results if r[1] == "skip" and r[2] == "too large"
     )
-    failed_tests = list(r for r in test_results if r[2] == "fail")
+    failed_tests = list(r for r in test_results if r[1] == "fail")
+
+    num_tests_performed = len(passed_tests) + len(failed_tests)
+
+    testcase_count_info = ""
+    if testcase_count is not None:
+        testcase_count_info = " ({} individual testcases)".format(testcase_count)
+    print("{} tests performed{}".format(num_tests_performed, testcase_count_info))
 
-    print(
-        "{} tests performed ({} individual testcases)".format(
-            test_count.value, testcase_count.value
-        )
-    )
     print("{} tests passed".format(len(passed_tests)))
 
     if len(skipped_tests) > 0:
@@ -1088,15 +1093,15 @@ def to_json(obj):
             return obj.pattern
         return obj
 
-    with open(os.path.join(result_dir, RESULTS_FILE), "w") as f:
+    with open(os.path.join(args.result_dir, RESULTS_FILE), "w") as f:
         json.dump(
             {
                 # The arguments passed on the command-line.
                 "args": vars(args),
                 # A list of all results of the form [(test, result, reason), ...].
-                "results": list(test[1:] for test in test_results),
+                "results": list(test for test in test_results),
                 # A list of failed tests.  This is deprecated, use the "results" above instead.
-                "failed_tests": [test[1] for test in failed_tests],
+                "failed_tests": [test[0] for test in failed_tests],
             },
             f,
             default=to_json,
@@ -1350,7 +1355,8 @@ def main():
 
     try:
         os.makedirs(args.result_dir, exist_ok=True)
-        res = run_tests(pyb, tests, args, args.result_dir, args.jobs)
+        test_results, testcase_count = run_tests(pyb, tests, args, args.result_dir, args.jobs)
+        res = create_test_report(args, test_results, testcase_count)
     finally:
         if pyb:
             pyb.close()

From 6db9c808567dfb921bc9dfbc19100a8daba867a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Jun 2025 22:13:33 +1000
Subject: [PATCH 2355/3129] tests/run-multitests.py: Create a _result.json at
 end of run.

Reuse the `create_test_report()` function from `run-tests.py` to generate a
`_result.json` file summarising the test run.  If there's more than one
permutation of the test run, only the last result is saved.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 387eec7018bb3..92bd64193d8ce 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -15,6 +15,8 @@
 import subprocess
 import tempfile
 
+run_tests_module = __import__("run-tests")
+
 test_dir = os.path.abspath(os.path.dirname(__file__))
 
 if os.path.abspath(sys.path[0]) == test_dir:
@@ -488,9 +490,7 @@ def print_diff(a, b):
 
 
 def run_tests(test_files, instances_truth, instances_test):
-    skipped_tests = []
-    passed_tests = []
-    failed_tests = []
+    test_results = []
 
     for test_file, num_instances in test_files:
         instances_str = "|".join(str(instances_test[i]) for i in range(num_instances))
@@ -526,13 +526,13 @@ def run_tests(test_files, instances_truth, instances_test):
         # Print result of test
         if skip:
             print("skip")
-            skipped_tests.append(test_file)
+            test_results.append((test_file, "skip", ""))
         elif output_test == output_truth:
             print("pass")
-            passed_tests.append(test_file)
+            test_results.append((test_file, "pass", ""))
         else:
             print("FAIL")
-            failed_tests.append(test_file)
+            test_results.append((test_file, "fail", ""))
             if not cmd_args.show_output:
                 print("### TEST ###")
                 print(output_test, end="")
@@ -549,15 +549,7 @@ def run_tests(test_files, instances_truth, instances_test):
         if cmd_args.show_output:
             print()
 
-    print("{} tests performed".format(len(skipped_tests) + len(passed_tests) + len(failed_tests)))
-    print("{} tests passed".format(len(passed_tests)))
-
-    if skipped_tests:
-        print("{} tests skipped: {}".format(len(skipped_tests), " ".join(skipped_tests)))
-    if failed_tests:
-        print("{} tests failed: {}".format(len(failed_tests), " ".join(failed_tests)))
-
-    return not failed_tests
+    return test_results
 
 
 def main():
@@ -583,6 +575,12 @@ def main():
         default=1,
         help="repeat the test with this many permutations of the instance order",
     )
+    cmd_parser.add_argument(
+        "-r",
+        "--result-dir",
+        default=run_tests_module.base_path("results"),
+        help="directory for test results",
+    )
     cmd_parser.epilog = (
         "Supported instance types:\r\n"
         " -i pyb:<port>   physical device (eg. pyboard) on provided repl port.\n"
@@ -623,13 +621,15 @@ def main():
     for _ in range(max_instances - len(instances_test)):
         instances_test.append(PyInstanceSubProcess([MICROPYTHON]))
 
+    os.makedirs(cmd_args.result_dir, exist_ok=True)
     all_pass = True
     try:
         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)
+            test_results = run_tests(test_files, instances_truth, instances_test_permutation)
+            all_pass &= run_tests_module.create_test_report(cmd_args, test_results)
 
     finally:
         for i in instances_truth:

From 09b058559b09a76fa81feeaacc3e4b22c4021e8f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Jun 2025 00:10:54 +1000
Subject: [PATCH 2356/3129] tests/run-natmodtests.py: Create a _result.json at
 end of run.

Reuse the `create_test_report()` function from `run-tests.py` to generate a
`_result.json` file summarising the test run.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-natmodtests.py | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 073e0b053e699..b689a07a5b2e9 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -9,6 +9,8 @@
 import sys
 import argparse
 
+run_tests_module = __import__("run-tests")
+
 sys.path.append("../tools")
 import pyboard
 
@@ -133,7 +135,7 @@ def detect_architecture(target):
         return platform, arch, None
 
 
-def run_tests(target_truth, target, args, stats, resolved_arch):
+def run_tests(target_truth, target, args, resolved_arch):
     global injected_import_hook_code
 
     prelude = ""
@@ -141,6 +143,7 @@ def run_tests(target_truth, target, args, stats, resolved_arch):
         prelude = args.begin.read()
     injected_import_hook_code = injected_import_hook_code.replace("{import_prelude}", prelude)
 
+    test_results = []
     for test_file in args.files:
         # Find supported test
         test_file_basename = os.path.basename(test_file)
@@ -195,17 +198,18 @@ def run_tests(target_truth, target, args, stats, resolved_arch):
                 result = "pass"
 
         # Accumulate statistics
-        stats["total"] += 1
         if result == "pass":
-            stats["pass"] += 1
+            test_results.append((test_file, "pass", ""))
         elif result == "SKIP":
-            stats["skip"] += 1
+            test_results.append((test_file, "skip", ""))
         else:
-            stats["fail"] += 1
+            test_results.append((test_file, "fail", ""))
 
         # Print result
         print("{:4}  {}{}".format(result, test_file, extra))
 
+    return test_results
+
 
 def main():
     cmd_parser = argparse.ArgumentParser(
@@ -227,6 +231,12 @@ def main():
         default=None,
         help="prologue python file to execute before module import",
     )
+    cmd_parser.add_argument(
+        "-r",
+        "--result-dir",
+        default=run_tests_module.base_path("results"),
+        help="directory for test results",
+    )
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     args = cmd_parser.parse_args()
 
@@ -251,20 +261,14 @@ def main():
         print("platform={} ".format(target_platform), end="")
     print("arch={}".format(target_arch))
 
-    stats = {"total": 0, "pass": 0, "fail": 0, "skip": 0}
-    run_tests(target_truth, target, args, stats, target_arch)
+    os.makedirs(args.result_dir, exist_ok=True)
+    test_results = run_tests(target_truth, target, args, target_arch)
+    res = run_tests_module.create_test_report(args, test_results)
 
     target.close()
     target_truth.close()
 
-    print("{} tests performed".format(stats["total"]))
-    print("{} tests passed".format(stats["pass"]))
-    if stats["fail"]:
-        print("{} tests failed".format(stats["fail"]))
-    if stats["skip"]:
-        print("{} tests skipped".format(stats["skip"]))
-
-    if stats["fail"]:
+    if not res:
         sys.exit(1)
 
 

From 63701c2e949861e2b07913d72b0f1490ca079005 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Jun 2025 00:11:14 +1000
Subject: [PATCH 2357/3129] tests/run-perfbench.py: Create a _result.json at
 end of run.

Reuse the `create_test_report()` function from `run-tests.py` to generate a
`_result.json` file summarising the test run.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 81d873c45997d..cac2fee58f0dc 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -10,10 +10,12 @@
 import argparse
 from glob import glob
 
+run_tests_module = __import__("run-tests")
+
 sys.path.append("../tools")
 import pyboard
 
-prepare_script_for_target = __import__("run-tests").prepare_script_for_target
+prepare_script_for_target = run_tests_module.prepare_script_for_target
 
 # Paths for host executables
 if os.name == "nt":
@@ -90,9 +92,9 @@ def run_benchmark_on_target(target, script):
 
 
 def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
+    test_results = []
     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="")
@@ -105,6 +107,7 @@ def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
             and test_file.find("viper_") != -1
         )
         if skip:
+            test_results.append((test_file, "skip", ""))
             print("SKIP")
             continue
 
@@ -125,6 +128,7 @@ def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
         if isinstance(target, pyboard.Pyboard) or args.via_mpy:
             crash, test_script_target = prepare_script_for_target(args, script_text=test_script)
             if crash:
+                test_results.append((test_file, "fail", "preparation"))
                 print("CRASH:", test_script_target)
                 continue
         else:
@@ -162,10 +166,13 @@ def run_benchmarks(args, 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
+            if error.startswith("SKIP"):
+                test_results.append((test_file, "skip", error))
+            else:
+                test_results.append((test_file, "fail", error))
             print(error)
         else:
+            test_results.append((test_file, "pass", ""))
             t_avg, t_sd = compute_stats(times)
             s_avg, s_sd = compute_stats(scores)
             print(
@@ -179,7 +186,7 @@ def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
 
         sys.stdout.flush()
 
-    return target_had_error
+    return test_results
 
 
 def parse_output(filename):
@@ -264,6 +271,12 @@ def main():
     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(
+        "-r",
+        "--result-dir",
+        default=run_tests_module.base_path("results"),
+        help="directory for test results",
+    )
     cmd_parser.add_argument(
         "N", nargs=1, help="N parameter (approximate target CPU frequency in MHz)"
     )
@@ -307,13 +320,15 @@ def main():
 
     print("N={} M={} n_average={}".format(N, M, n_average))
 
-    target_had_error = run_benchmarks(args, target, N, M, n_average, tests)
+    os.makedirs(args.result_dir, exist_ok=True)
+    test_results = run_benchmarks(args, target, N, M, n_average, tests)
+    res = run_tests_module.create_test_report(args, test_results)
 
     if isinstance(target, pyboard.Pyboard):
         target.exit_raw_repl()
         target.close()
 
-    if target_had_error:
+    if not res:
         sys.exit(1)
 
 

From 5676b45cbb8644f7b04e2a0495c760d905007983 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Jun 2025 19:47:03 +1000
Subject: [PATCH 2358/3129] tests/run-natmodtests.py: Consider a test skipped
 if mpy doesn't exist.

This is different to a test not being run because there is no corresponding
natmod at all.

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

diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index b689a07a5b2e9..f9d2074f6f02b 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -166,7 +166,8 @@ def run_tests(target_truth, target, args, resolved_arch):
             with open(NATMOD_EXAMPLE_DIR + test_mpy, "rb") as f:
                 test_script += b"__buf=" + bytes(repr(f.read()), "ascii") + b"\n"
         except OSError:
-            print("----  {} - mpy file not compiled".format(test_file))
+            test_results.append((test_file, "skip", "mpy file not compiled"))
+            print("skip  {} - mpy file not compiled".format(test_file))
             continue
         test_script += bytes(injected_import_hook_code.format(test_module), "ascii")
         test_script += test_file_data

From ef21ade602116421db2734d23320401ac6669773 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 May 2025 12:56:12 +1000
Subject: [PATCH 2359/3129] extmod/machine_pulse: Optimise time_pulse_us for
 code size.

This implementation is based on the esp8266 custom implementation, and
further optimised for size and accuracy.

Testing on PYBD_SF2 and RPI_PICO2_W shows that it is at least as good as
the original implementation in performance.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_pulse.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/extmod/machine_pulse.c b/extmod/machine_pulse.c
index 85dba86d9b5ad..1ec4d5f0831d1 100644
--- a/extmod/machine_pulse.c
+++ b/extmod/machine_pulse.c
@@ -31,19 +31,34 @@
 #if MICROPY_PY_MACHINE_PULSE
 
 MP_WEAK mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us) {
+    mp_uint_t nchanges = 2;
     mp_uint_t start = mp_hal_ticks_us();
-    while (mp_hal_pin_read(pin) != pulse_level) {
-        if ((mp_uint_t)(mp_hal_ticks_us() - start) >= timeout_us) {
-            return (mp_uint_t)-2;
-        }
-    }
-    start = mp_hal_ticks_us();
-    while (mp_hal_pin_read(pin) == pulse_level) {
-        if ((mp_uint_t)(mp_hal_ticks_us() - start) >= timeout_us) {
-            return (mp_uint_t)-1;
+    for (;;) {
+        // Sample ticks and pin as close together as possible, and always in the same
+        // order each time around the loop.  This gives the most accurate measurement.
+        mp_uint_t t = mp_hal_ticks_us();
+        int pin_value = mp_hal_pin_read(pin);
+
+        if (pin_value == pulse_level) {
+            // Pin is at desired value.  Flip desired value and see if we are done.
+            pulse_level = 1 - pulse_level;
+            if (--nchanges == 0) {
+                return t - start;
+            }
+            start = t;
+        } else {
+            // Pin hasn't changed yet, check for timeout.
+            mp_uint_t dt = t - start;
+            if (dt >= timeout_us) {
+                return -nchanges;
+            }
+
+            // Allow a port to perform background task processing if needed.
+            #ifdef MICROPY_PY_MACHINE_TIME_PULSE_US_HOOK
+            MICROPY_PY_MACHINE_TIME_PULSE_US_HOOK(dt);
+            #endif
         }
     }
-    return mp_hal_ticks_us() - start;
 }
 
 static mp_obj_t machine_time_pulse_us_(size_t n_args, const mp_obj_t *args) {

From 398da22492d9e593f87f0b9ae4fc043f8b2b8a11 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 May 2025 12:57:20 +1000
Subject: [PATCH 2360/3129] esp8266/modmachine: Use common
 machine_time_pulse_us implementation.

Testing shows that for frequencies which the esp8266 can handle -- up to
about 1kHz -- `machine.time_pulse_us()` now gives more accurate results.

Prior to this commit it would measure on average about 1us lower, but now
the average is much closer to the true value.  For example a pulse that is
1000us long, it would measure between 998 and 1000us.  Now it measures
between 999us and 1001us.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_pulse.c     |  2 +-
 ports/esp8266/esp_mphal.h  |  9 +++++++++
 ports/esp8266/modmachine.c | 30 ------------------------------
 3 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/extmod/machine_pulse.c b/extmod/machine_pulse.c
index 1ec4d5f0831d1..b78a63f182728 100644
--- a/extmod/machine_pulse.c
+++ b/extmod/machine_pulse.c
@@ -30,7 +30,7 @@
 
 #if MICROPY_PY_MACHINE_PULSE
 
-MP_WEAK mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us) {
+mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us) {
     mp_uint_t nchanges = 2;
     mp_uint_t start = mp_hal_ticks_us();
     for (;;) {
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index 0a4f92ac0bf29..fb2e441c97297 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -27,11 +27,20 @@
 #include "user_interface.h"
 #include "py/ringbuf.h"
 #include "shared/runtime/interrupt_char.h"
+#include "ets_alt_task.h"
 #include "xtirq.h"
 
 #define MICROPY_BEGIN_ATOMIC_SECTION() esp_disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state) esp_enable_irq(state)
 
+// During machine.time_pulse_us, feed WDT every now and then.
+#define MICROPY_PY_MACHINE_TIME_PULSE_US_HOOK(dt) \
+    do { \
+        if ((dt & 0xffff) == 0xffff && !ets_loop_dont_feed_sw_wdt) { \
+            system_soft_wdt_feed(); \
+        } \
+    } while (0)
+
 void mp_sched_keyboard_interrupt(void);
 
 struct _mp_print_t;
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 6ac17da457622..d43fe382457e0 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -33,7 +33,6 @@
 #include "os_type.h"
 #include "osapi.h"
 #include "etshal.h"
-#include "ets_alt_task.h"
 #include "user_interface.h"
 
 // #define MACHINE_WAKE_IDLE (0x01)
@@ -327,32 +326,3 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, esp_timer_print,
     locals_dict, &esp_timer_locals_dict
     );
-
-// Custom version of this function that feeds system WDT if necessary
-mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us) {
-    int nchanges = 2;
-    uint32_t start = system_get_time(); // in microseconds
-    for (;;) {
-        uint32_t dt = system_get_time() - start;
-
-        // Check if pin changed to wanted value
-        if (mp_hal_pin_read(pin) == pulse_level) {
-            if (--nchanges == 0) {
-                return dt;
-            }
-            pulse_level = 1 - pulse_level;
-            start = system_get_time();
-            continue;
-        }
-
-        // Check for timeout
-        if (dt >= timeout_us) {
-            return (mp_uint_t)-nchanges;
-        }
-
-        // Only feed WDT every now and then, to make sure edge timing is accurate
-        if ((dt & 0xffff) == 0xffff && !ets_loop_dont_feed_sw_wdt) {
-            system_soft_wdt_feed();
-        }
-    }
-}

From 2a0e2b578265bac43e158bccb195ca88ffea64c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 May 2025 10:33:21 +1000
Subject: [PATCH 2361/3129] esp32/main: Auto detect the size of flash and auto
 create vfs partition.

Currently in the esp32 port the size of the SPI flash must be configured at
build time, eg 4MiB, 8MiB, etc.  Also, the esp32 partition table must be
configured at build time, which depends on the size of the SPI flash.  A
bigger flash means more can be allocated to the user filesystem.

This commit makes it so the SPI flash size is automatically determined at
runtime, and the filesystem size is automatically set to take up as much
room as possible (a "vfs" partition is created automatically if it doesn't
exist).

This works by:
- Setting the SPI flash size to be 4MiB in the build (or some other value,
  as long as the firmware app fits).
- Removing the vfs partition from the esp32 partition table (only nvs,
  phy_init and firmware, and maybe romfs, remain in the partition table).
- At boot, query the physical size of the SPI flash and use that as the
  actual size in the code.
- If it doesn't already exist, automatically create a "vfs" partition which
  takes up the flash from the end of all existing partitions to the end of
  flash.

This allows simplifying a lot of board configurations, and removing some
board variants that just change the flash size (to be done in a following
commit).

It's also fully backwards compatible, in the following sense:
- Existing boards with MicroPython firmware will continue to work with the
  same filesystem, ie the filesystem won't be erased when the firmware is
  updated.
- If a user has a custom esp32 partition table and installs MicroPython as
  a bare app into the app partition, the new MicroPython firmware will
  honour the esp32 partition table and use either "vfs" or "ffat"
  partitions as the filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index b8f49a33baaee..f048aa85f5f7f 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -38,6 +38,7 @@
 #include "nvs_flash.h"
 #include "esp_task.h"
 #include "esp_event.h"
+#include "esp_flash.h"
 #include "esp_log.h"
 #include "esp_memory_utils.h"
 #include "esp_psram.h"
@@ -214,11 +215,38 @@ void boardctrl_startup(void) {
         nvs_flash_erase();
         nvs_flash_init();
     }
+
+    // Query the physical size of the SPI flash and store it in the size
+    // variable of the global, default SPI flash handle.
+    esp_flash_get_physical_size(NULL, &esp_flash_default_chip->size);
+
+    // If there is no filesystem partition (no "vfs" or "ffat"), add a "vfs" partition
+    // that extends from the end of the application partition up to the end of flash.
+    if (esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_ANY, "vfs") == NULL
+        && esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_ANY, "ffat") == NULL) {
+        // No "vfs" or "ffat" partition, so try to create one.
+
+        // Find the end of the last partition that exists in the partition table.
+        size_t offset = 0;
+        esp_partition_iterator_t iter = esp_partition_find(ESP_PARTITION_TYPE_ANY, ESP_PARTITION_SUBTYPE_ANY, NULL);
+        while (iter != NULL) {
+            const esp_partition_t *part = esp_partition_get(iter);
+            offset = MAX(offset, part->address + part->size);
+            iter = esp_partition_next(iter);
+        }
+
+        // If we found the application partition and there is some space between the end of
+        // that and the end of flash, create a "vfs" partition taking up all of that space.
+        if (offset > 0 && esp_flash_default_chip->size > offset) {
+            size_t size = esp_flash_default_chip->size - offset;
+            esp_partition_register_external(esp_flash_default_chip, offset, size, "vfs", ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_FAT, NULL);
+        }
+    }
 }
 
 void MICROPY_ESP_IDF_ENTRY(void) {
     // Hook for a board to run code at start up.
-    // This defaults to initialising NVS.
+    // This defaults to initialising NVS and detecting the flash size.
     MICROPY_BOARD_STARTUP();
 
     // Create and transfer control to the MicroPython task.

From 6201e77999b3614518abc4b21773e735d9b0b0ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 May 2025 14:18:02 +1000
Subject: [PATCH 2362/3129] esp32/boards: Convert all boards to auto detect
 flash size.

Remove the "vfs" entry from all partitions-*.csv files, and then remove
duplicated files.

And remove the ESP32_GENERIC_S3-FLASH_4M variant, because it's no longer
needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_GENERIC/board.md              |  2 +-
 ports/esp32/boards/ESP32_GENERIC_C3/board.md           |  4 ++--
 ports/esp32/boards/ESP32_GENERIC_S2/board.md           |  2 +-
 ports/esp32/boards/ESP32_GENERIC_S3/board.json         |  3 +--
 ports/esp32/boards/ESP32_GENERIC_S3/board.md           |  4 +---
 .../ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake    |  4 ----
 ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board    |  6 ------
 ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m |  4 ----
 ports/esp32/boards/SIL_WESP32/sdkconfig.board          |  9 +++------
 ports/esp32/boards/UM_FEATHERS2/sdkconfig.board        |  5 -----
 ports/esp32/boards/UM_FEATHERS3/sdkconfig.board        |  5 -----
 ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board     |  5 -----
 ports/esp32/boards/UM_NANOS3/sdkconfig.board           |  5 -----
 ports/esp32/boards/UM_OMGS3/sdkconfig.board            |  5 -----
 ports/esp32/boards/UM_PROS3/sdkconfig.board            |  5 -----
 ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board    |  5 -----
 ports/esp32/boards/UM_TINYC6/sdkconfig.board           |  5 -----
 ports/esp32/boards/UM_TINYS3/sdkconfig.board           |  5 -----
 ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board      |  5 -----
 ports/esp32/boards/sdkconfig.base                      |  2 +-
 ports/esp32/partitions-16MiB-ota.csv                   | 10 ----------
 ports/esp32/partitions-16MiB.csv                       |  7 -------
 ports/esp32/partitions-2MiB.csv                        |  1 -
 ports/esp32/partitions-32MiB.csv                       |  7 -------
 ports/esp32/partitions-4MiB-ota.csv                    |  1 -
 ports/esp32/partitions-4MiB-romfs.csv                  |  1 -
 .../{partitions-4MiB.csv => partitions-4MiBplus.csv}   |  5 ++++-
 ports/esp32/partitions-8MiB.csv                        |  7 -------
 ...tions-32MiB-ota.csv => partitions-8MiBplus-ota.csv} |  6 ++++--
 29 files changed, 18 insertions(+), 117 deletions(-)
 delete mode 100644 ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake
 delete mode 100644 ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
 delete mode 100644 ports/esp32/partitions-16MiB-ota.csv
 delete mode 100644 ports/esp32/partitions-16MiB.csv
 delete mode 100644 ports/esp32/partitions-32MiB.csv
 rename ports/esp32/{partitions-4MiB.csv => partitions-4MiBplus.csv} (60%)
 delete mode 100644 ports/esp32/partitions-8MiB.csv
 rename ports/esp32/{partitions-32MiB-ota.csv => partitions-8MiBplus-ota.csv} (65%)

diff --git a/ports/esp32/boards/ESP32_GENERIC/board.md b/ports/esp32/boards/ESP32_GENERIC/board.md
index 9346d18d84a3c..06972e436f206 100644
--- a/ports/esp32/boards/ESP32_GENERIC/board.md
+++ b/ports/esp32/boards/ESP32_GENERIC/board.md
@@ -1,5 +1,5 @@
 The following files are firmware that should work on most ESP32-based boards
-with 4MiB of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
+with 4MiB or more of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
 
 This board has multiple variants available:
 
diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/board.md b/ports/esp32/boards/ESP32_GENERIC_C3/board.md
index 1604b879c59ae..6097eb85df707 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/board.md
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/board.md
@@ -1,6 +1,6 @@
 The following files are firmware images that should work on most
-ESP32-C3-based boards with 4MiB of flash, including WROOM and MINI modules,
-that use the revision 3 silicon (or newer).
+ESP32-C3-based boards with 4MiB or more of flash, including WROOM and MINI
+modules, that use the revision 3 silicon (or newer).
 
 USB serial/JTAG support is enabled on pin 18 and 19. Note that this
 is not a full USB stack, the C3 just provides a CDC/ACM class serial
diff --git a/ports/esp32/boards/ESP32_GENERIC_S2/board.md b/ports/esp32/boards/ESP32_GENERIC_S2/board.md
index 3e46c02467ac6..d065ecbbb9944 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S2/board.md
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/board.md
@@ -1,5 +1,5 @@
 The following files are firmware that should work on most ESP32-S2-based
-boards with 4MiB of flash, including WROOM, WROVER, and MINI modules.
+boards with 4MiB or more of flash, including WROOM, WROVER, and MINI modules.
 
 This firmware supports configurations with and without SPIRAM (also known as
 PSRAM) and will auto-detect a connected SPIRAM chip at startup and allocate
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/board.json b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
index fd0c9edce09ec..7a546d35fcd4f 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/board.json
@@ -21,7 +21,6 @@
     "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif",
     "variants": {
-        "SPIRAM_OCT": "Support for Octal-SPIRAM",
-        "FLASH_4M": "4MiB flash"
+        "SPIRAM_OCT": "Support for Octal-SPIRAM"
     }
 }
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/board.md b/ports/esp32/boards/ESP32_GENERIC_S3/board.md
index 16930c9193c51..68ce0917e04d1 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/board.md
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/board.md
@@ -1,9 +1,7 @@
 The following files are firmware that should work on most ESP32-S3-based
-boards with 4/8MiB of flash, including WROOM and MINI modules.
+boards with 4MiB or more of flash, including WROOM and MINI modules.
 
 This firmware supports configurations with and without SPIRAM (also known as
 PSRAM) and will auto-detect a connected SPIRAM chip at startup and allocate
 the MicroPython heap accordingly. However if your board has Octal SPIRAM, then
 use the "spiram-oct" variant.
-
-If your board has 4MiB flash (including ESP32-S3FH4R2 based ones with embedded flash), then use the "flash-4m" build.
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake
deleted file mode 100644
index e832cdb60fd72..0000000000000
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_FLASH_4M.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(SDKCONFIG_DEFAULTS
-    ${SDKCONFIG_DEFAULTS}
-    boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
-)
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
index 9839b0d300510..369330682f91a 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board
@@ -1,8 +1,2 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-
-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/ESP32_GENERIC_S3/sdkconfig.flash_4m b/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
deleted file mode 100644
index c967c46ae6bed..0000000000000
--- a/ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.flash_4m
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
-
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB.csv"
diff --git a/ports/esp32/boards/SIL_WESP32/sdkconfig.board b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
index 741a4db439099..36155cd5e31e5 100644
--- a/ports/esp32/boards/SIL_WESP32/sdkconfig.board
+++ b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
@@ -1,9 +1,6 @@
-# 16 MB flash
+# 8 MB+ flash
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 
 # Fast flash
 
@@ -14,7 +11,7 @@ CONFIG_ESP32_REV_MIN_1=y
 # OTA
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB-ota.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiBplus-ota.csv"
 
 # Network name
 
diff --git a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
index 9ab58f215f2e6..162de0da14ab3 100644
--- a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
@@ -3,11 +3,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=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"
-
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2"
 # end of LWIP
diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
index 3ca0c4b243e28..3092e355982eb 100644
--- a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -1,12 +1,7 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS3"
 
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
index d0355a94dccef..25b8d7689d86e 100644
--- a/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
@@ -3,11 +3,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=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="UMFeatherS3Neo"
 
diff --git a/ports/esp32/boards/UM_NANOS3/sdkconfig.board b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
index 2a39c64337b20..e06f7a4245f9f 100644
--- a/ports/esp32/boards/UM_NANOS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
@@ -1,12 +1,7 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMNanoS3"
 
diff --git a/ports/esp32/boards/UM_OMGS3/sdkconfig.board b/ports/esp32/boards/UM_OMGS3/sdkconfig.board
index 84a8ce449ef3a..8a0bf0b13afcd 100644
--- a/ports/esp32/boards/UM_OMGS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_OMGS3/sdkconfig.board
@@ -2,12 +2,7 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMOMGS3"
 
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
index 5752e03e60013..75ca58d80b096 100644
--- a/ports/esp32/boards/UM_PROS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -1,12 +1,7 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMProS3"
 
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board b/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
index ef3f38af47e27..7d244fdc163f7 100644
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
@@ -2,12 +2,7 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMRGBTouchMini"
 
diff --git a/ports/esp32/boards/UM_TINYC6/sdkconfig.board b/ports/esp32/boards/UM_TINYC6/sdkconfig.board
index 7917467b12ea1..213d28d8b4a08 100644
--- a/ports/esp32/boards/UM_TINYC6/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYC6/sdkconfig.board
@@ -2,9 +2,4 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
diff --git a/ports/esp32/boards/UM_TINYS3/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
index d1d19761a0666..2474c5fb27914 100644
--- a/ports/esp32/boards/UM_TINYS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -1,12 +1,7 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS3"
 
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
index 1380e15ce8481..10121d235d0aa 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
@@ -1,12 +1,7 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyWATCHS3"
 
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 823b916d960a5..30740af434ddb 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -97,7 +97,7 @@ CONFIG_ULP_COPROC_RESERVE_MEM=2040
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiBplus.csv"
 
 # To reduce iRAM usage
 CONFIG_ESP32_WIFI_IRAM_OPT=n
diff --git a/ports/esp32/partitions-16MiB-ota.csv b/ports/esp32/partitions-16MiB-ota.csv
deleted file mode 100644
index a6f83bc46b860..0000000000000
--- a/ports/esp32/partitions-16MiB-ota.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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,
diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
deleted file mode 100644
index ae926c7b94eab..0000000000000
--- a/ports/esp32/partitions-16MiB.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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, 0xE00000,
diff --git a/ports/esp32/partitions-2MiB.csv b/ports/esp32/partitions-2MiB.csv
index ea6626825c0c7..5449201a7a2de 100644
--- a/ports/esp32/partitions-2MiB.csv
+++ b/ports/esp32/partitions-2MiB.csv
@@ -4,4 +4,3 @@
 nvs,        data, nvs,     0x9000,   0x6000,
 phy_init,   data, phy,     0xf000,   0x1000,
 factory,    app,  factory, 0x10000,  0x160000,
-vfs,        data, fat,     0x170000, 0x50000,
diff --git a/ports/esp32/partitions-32MiB.csv b/ports/esp32/partitions-32MiB.csv
deleted file mode 100644
index 31591c99495f9..0000000000000
--- a/ports/esp32/partitions-32MiB.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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,
diff --git a/ports/esp32/partitions-4MiB-ota.csv b/ports/esp32/partitions-4MiB-ota.csv
index 094ad76660ddf..9cbb42279984f 100644
--- a/ports/esp32/partitions-4MiB-ota.csv
+++ b/ports/esp32/partitions-4MiB-ota.csv
@@ -7,4 +7,3 @@ otadata,  data, ota,     0xd000,   0x2000,
 phy_init, data, phy,     0xf000,   0x1000,
 ota_0,    app,  ota_0,   0x10000,  0x180000,
 ota_1,    app,  ota_1,   0x190000, 0x180000,
-vfs,      data, fat,     0x310000, 0x0f0000,
diff --git a/ports/esp32/partitions-4MiB-romfs.csv b/ports/esp32/partitions-4MiB-romfs.csv
index dd02506e54684..29033ff3ab720 100644
--- a/ports/esp32/partitions-4MiB-romfs.csv
+++ b/ports/esp32/partitions-4MiB-romfs.csv
@@ -5,4 +5,3 @@ nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
 factory,  app,  factory, 0x10000, 0x1D0000,
 romfs,    data, 0x8f,    0x1E0000, 0x20000,
-vfs,      data, fat,     0x200000, 0x200000,
diff --git a/ports/esp32/partitions-4MiB.csv b/ports/esp32/partitions-4MiBplus.csv
similarity index 60%
rename from ports/esp32/partitions-4MiB.csv
rename to ports/esp32/partitions-4MiBplus.csv
index 53f0f167442bc..460e5cc0e97ac 100644
--- a/ports/esp32/partitions-4MiB.csv
+++ b/ports/esp32/partitions-4MiBplus.csv
@@ -1,7 +1,10 @@
+# This partition table is for devices with 4MiB or more of flash.
+# The first 2MiB is used for bootloader, nvs, phy_init and firmware.
+# The remaining flash is for the user filesystem(s).
+
 # 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, 0x200000,
diff --git a/ports/esp32/partitions-8MiB.csv b/ports/esp32/partitions-8MiB.csv
deleted file mode 100644
index 582d3b50e54dc..0000000000000
--- a/ports/esp32/partitions-8MiB.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/partitions-32MiB-ota.csv b/ports/esp32/partitions-8MiBplus-ota.csv
similarity index 65%
rename from ports/esp32/partitions-32MiB-ota.csv
rename to ports/esp32/partitions-8MiBplus-ota.csv
index 7366a2ad8df79..09a8e6d702de4 100644
--- a/ports/esp32/partitions-32MiB-ota.csv
+++ b/ports/esp32/partitions-8MiBplus-ota.csv
@@ -1,4 +1,7 @@
-# Partition table for MicroPython with OTA support using 32MB flash
+# This partition table is for devices with 8MiB or more of flash and OTA support.
+# The first 5056kiB is used for bootloader, nvs, phy_init and firmware.
+# The remaining flash is for the user filesystem(s).
+
 # Notes: the offset of the partition table itself is set in
 # $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,   Type, SubType, Offset,   Size,     Flags
@@ -7,4 +10,3 @@ 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,

From fa393feaed16eb040c3fa7f57537eca1404f6f70 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Jun 2025 10:52:32 +1000
Subject: [PATCH 2363/3129] esp32/README: Update README to describe auto
 filesystem sizing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index e11c64ad70797..d8b55e45f3b42 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -221,6 +221,30 @@ import machine
 antenna = machine.Pin(16, machine.Pin.OUT, value=0)
 ```
 
+Partition table and filesystem size
+-----------------------------------
+
+ESP32 firmware contains a bootloader, partition table and main application
+firmware, which are all stored in (external) SPI flash.  The user filesystem
+is also stored in the same SPI flash.  By default, MicroPython does not have
+a fixed entry in the ESP32 partition table for the filesystem.  Instead it
+will automatically determine the size of the SPI flash upon boot, and then --
+so long as there is no existing partition called "vfs" or "ffat" -- it will
+create a partition for the filesystem called "vfs" which takes all of the
+remaining flash between the end of the last defined partition up until the
+end of flash.
+
+This means that firmware built for, say, a 4MiB flash will work on any
+device that has at least 4MiB flash.  The user "vfs" filesystem will then
+take up as much space as possible.
+
+This auto-detection behaviour can be overridden: if the ESP32 partition
+table does contain an entry called "vfs" or "ffat" then these are used for
+the user filesystem and no automatic "vfs" partition is added.  This is
+useful in cases where only the MicroPython ESP32 application is flashed to
+the device (and not the bootloader or partition table), eg when deploying
+.uf2 files.
+
 Defining a custom ESP32 board
 -----------------------------
 

From 42404b5588eb12c22e07283f2e62ee9bb80f1714 Mon Sep 17 00:00:00 2001
From: Meir Armon <meirarmon@gmail.com>
Date: Thu, 29 May 2025 07:43:54 +0300
Subject: [PATCH 2364/3129] esp32/modesp32: Make wake_on_ulp available only on
 SoCs that support it.

The `esp32.wake_on_ulp()` method should only be available on boards that
have SOC_ULP_SUPPORTED=y.  Update docs to reflect this.

Signed-off-by: Meir Armon <meirarmon@gmail.com>
---
 docs/library/esp32.rst    | 2 ++
 ports/esp32/machine_rtc.h | 2 ++
 ports/esp32/modesp32.c    | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 24831c58d6d20..aeba3d60335b8 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -23,6 +23,8 @@ Functions
     Configure whether or not the Ultra-Low-Power co-processor can wake the
     device from sleep. *wake* should be a boolean value.
 
+    .. note:: This is only available for boards that have ULP coprocessor support.
+
 .. 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 ce2a5482a2241..f327b9a2ac2c8 100644
--- a/ports/esp32/machine_rtc.h
+++ b/ports/esp32/machine_rtc.h
@@ -34,7 +34,9 @@ typedef struct {
     uint64_t ext1_pins; // set bit == pin#
     int8_t ext0_pin;   // just the pin#, -1 == None
     bool wake_on_touch : 1;
+    #if SOC_ULP_SUPPORTED
     bool wake_on_ulp : 1;
+    #endif
     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 4572e7b68b72a..f51c15322c6fe 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -126,6 +126,7 @@ 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 SOC_ULP_SUPPORTED
 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"));
@@ -134,6 +135,7 @@ static mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_ulp_obj, esp32_wake_on_ulp);
+#endif
 
 #if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
 static mp_obj_t esp32_gpio_deep_sleep_hold(const mp_obj_t enable) {
@@ -260,7 +262,9 @@ 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 SOC_ULP_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_wake_on_ulp), MP_ROM_PTR(&esp32_wake_on_ulp_obj) },
+    #endif
     #if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
     { MP_ROM_QSTR(MP_QSTR_gpio_deep_sleep_hold), MP_ROM_PTR(&esp32_gpio_deep_sleep_hold_obj) },
     #endif

From 0ef5ede3823ef00e95d1cc1a5b475d8d30c9caa4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 11 Jun 2025 19:32:28 +0200
Subject: [PATCH 2365/3129] py/mpz: Avoid undefined behavior decrementing NULL.

In the case where an mpz number is zero, its `len` is 0 and its `dig` is
NULL.  In that case, decrementing NULL via `d--` is undefined behavior
according to the C specification.

Restructuring the loops in this way avoids undefined behavior.

Also, ensure that these cases are tested in the coverage test.  This
doesn't make much difference now, but would otherwise cause errors later
when the undefined behavior sanitizer is employed in CI.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c                  | 12 ++++++++++++
 py/mpz.c                               | 12 ++++++++----
 tests/ports/unix/extra_coverage.py.exp |  4 ++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 29e1457cb717e..9201dab12d26f 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -475,6 +475,18 @@ static mp_obj_t extra_coverage(void) {
         mp_int_t value_signed;
         mpz_as_int_checked(&mpz, &value_signed);
         mp_printf(&mp_plat_print, "%d\n", (int)value_signed);
+
+        // hash the zero mpz integer
+        mpz_set_from_int(&mpz, 0);
+        mp_printf(&mp_plat_print, "%d\n", mpz_hash(&mpz));
+
+        // convert the mpz zero integer to int
+        mp_printf(&mp_plat_print, "%d\n", mpz_as_int_checked(&mpz, &value_signed));
+        mp_printf(&mp_plat_print, "%d\n", value_signed);
+
+        // mpz_set_from_float with 0 as argument
+        mpz_set_from_float(&mpz, 0);
+        mp_printf(&mp_plat_print, "%f\n", mpz_as_float(&mpz));
     }
 
     // runtime utils
diff --git a/py/mpz.c b/py/mpz.c
index 471bd1598188e..5a4d7d27d94d5 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -1537,7 +1537,8 @@ mp_int_t mpz_hash(const mpz_t *z) {
     mp_uint_t val = 0;
     mpz_dig_t *d = z->dig + z->len;
 
-    while (d-- > z->dig) {
+    while (d > z->dig) {
+        d--;
         val = (val << DIG_SIZE) | *d;
     }
 
@@ -1552,11 +1553,12 @@ bool mpz_as_int_checked(const mpz_t *i, mp_int_t *value) {
     mp_uint_t val = 0;
     mpz_dig_t *d = i->dig + i->len;
 
-    while (d-- > i->dig) {
+    while (d > i->dig) {
         if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> DIG_SIZE)) {
             // will overflow
             return false;
         }
+        d--;
         val = (val << DIG_SIZE) | *d;
     }
 
@@ -1577,11 +1579,12 @@ bool mpz_as_uint_checked(const mpz_t *i, mp_uint_t *value) {
     mp_uint_t val = 0;
     mpz_dig_t *d = i->dig + i->len;
 
-    while (d-- > i->dig) {
+    while (d > i->dig) {
         if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> (DIG_SIZE - 1))) {
             // will overflow
             return false;
         }
+        d--;
         val = (val << DIG_SIZE) | *d;
     }
 
@@ -1642,7 +1645,8 @@ mp_float_t mpz_as_float(const mpz_t *i) {
     mp_float_t val = 0;
     mpz_dig_t *d = i->dig + i->len;
 
-    while (d-- > i->dig) {
+    while (d > i->dig) {
+        d--;
         val = val * DIG_BASE + *d;
     }
 
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 19b32f1c9d945..1549168228e4d 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -89,6 +89,10 @@ data
 12345
 6
 -1
+0
+1
+0
+0.000000
 # runtime utils
 TypeError: unsupported type for __abs__: 'str'
 TypeError: unsupported types for __divmod__: 'str', 'str'

From 73b1cbc17abe6da6f913d30dad960e5401577c0f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 12 Jun 2025 18:47:12 +0200
Subject: [PATCH 2366/3129] py/objlist: Reduce code size in slice operations.

By refactoring the code to separate out the slicing operation from the
regular indexing operation, code can be shared between the various types of
slice operations (read/assign/delete).

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objlist.c | 101 ++++++++++++++++++++++-----------------------------
 1 file changed, 44 insertions(+), 57 deletions(-)

diff --git a/py/objlist.c b/py/objlist.c
index 9a88de3892eb3..71414a849f40b 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -159,76 +159,63 @@ static mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
 }
 
 static mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-    if (value == MP_OBJ_NULL) {
-        // delete
-        #if MICROPY_PY_BUILTINS_SLICE
-        if (mp_obj_is_type(index, &mp_type_slice)) {
-            mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-            mp_bound_slice_t slice;
-            if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
-                mp_raise_NotImplementedError(NULL);
+    #if MICROPY_PY_BUILTINS_SLICE
+    if (mp_obj_is_type(index, &mp_type_slice)) {
+        mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
+        mp_bound_slice_t slice;
+        bool fast = mp_seq_get_fast_slice_indexes(self->len, index, &slice);
+        if (value == MP_OBJ_SENTINEL) {
+            // load
+            if (!fast) {
+                return mp_seq_extract_slice(self->items, &slice);
             }
-
-            mp_int_t len_adj = slice.start - slice.stop;
-            assert(len_adj <= 0);
-            mp_seq_replace_slice_no_grow(self->items, self->len, slice.start, slice.stop, self->items /*NULL*/, 0, sizeof(*self->items));
+            mp_obj_list_t *res = list_new(slice.stop - slice.start);
+            mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);
+            return MP_OBJ_FROM_PTR(res);
+        }
+        // assign/delete
+        if (value == MP_OBJ_NULL) {
+            // delete is equivalent to slice assignment of an empty sequence
+            value = mp_const_empty_tuple;
+        }
+        if (!fast) {
+            mp_raise_NotImplementedError(NULL);
+        }
+        size_t value_len;
+        mp_obj_t *value_items;
+        mp_obj_get_array(value, &value_len, &value_items);
+        mp_int_t len_adj = value_len - (slice.stop - slice.start);
+        if (len_adj > 0) {
+            if (self->len + len_adj > self->alloc) {
+                // TODO: Might optimize memory copies here by checking if block can
+                // be grown inplace or not
+                self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + len_adj);
+                self->alloc = self->len + len_adj;
+            }
+            mp_seq_replace_slice_grow_inplace(self->items, self->len,
+                slice.start, slice.stop, value_items, value_len, len_adj, sizeof(*self->items));
+        } else {
+            mp_seq_replace_slice_no_grow(self->items, self->len,
+                slice.start, slice.stop, value_items, value_len, sizeof(*self->items));
             // Clear "freed" elements at the end of list
             mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items));
-            self->len += len_adj;
-            return mp_const_none;
+            // TODO: apply allocation policy re: alloc_size
         }
-        #endif
+        self->len += len_adj;
+        return mp_const_none;
+    }
+    #endif
+    if (value == MP_OBJ_NULL) {
+        // delete
         mp_obj_t args[2] = {self_in, index};
         list_pop(2, args);
         return mp_const_none;
     } else if (value == MP_OBJ_SENTINEL) {
         // load
         mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-        #if MICROPY_PY_BUILTINS_SLICE
-        if (mp_obj_is_type(index, &mp_type_slice)) {
-            mp_bound_slice_t slice;
-            if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
-                return mp_seq_extract_slice(self->items, &slice);
-            }
-            mp_obj_list_t *res = list_new(slice.stop - slice.start);
-            mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);
-            return MP_OBJ_FROM_PTR(res);
-        }
-        #endif
         size_t index_val = mp_get_index(self->base.type, self->len, index, false);
         return self->items[index_val];
     } else {
-        #if MICROPY_PY_BUILTINS_SLICE
-        if (mp_obj_is_type(index, &mp_type_slice)) {
-            mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-            size_t value_len;
-            mp_obj_t *value_items;
-            mp_obj_get_array(value, &value_len, &value_items);
-            mp_bound_slice_t slice_out;
-            if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice_out)) {
-                mp_raise_NotImplementedError(NULL);
-            }
-            mp_int_t len_adj = value_len - (slice_out.stop - slice_out.start);
-            if (len_adj > 0) {
-                if (self->len + len_adj > self->alloc) {
-                    // TODO: Might optimize memory copies here by checking if block can
-                    // be grown inplace or not
-                    self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + len_adj);
-                    self->alloc = self->len + len_adj;
-                }
-                mp_seq_replace_slice_grow_inplace(self->items, self->len,
-                    slice_out.start, slice_out.stop, value_items, value_len, len_adj, sizeof(*self->items));
-            } else {
-                mp_seq_replace_slice_no_grow(self->items, self->len,
-                    slice_out.start, slice_out.stop, value_items, value_len, sizeof(*self->items));
-                // Clear "freed" elements at the end of list
-                mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items));
-                // TODO: apply allocation policy re: alloc_size
-            }
-            self->len += len_adj;
-            return mp_const_none;
-        }
-        #endif
         mp_obj_list_store(self_in, index, value);
         return mp_const_none;
     }

From 1a8f4b290bc19cc3981f6deb2cb10a40a7b3bbea Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 13 Jun 2025 17:52:29 +0200
Subject: [PATCH 2367/3129] py/mpprint: Remove unused "PF_FLAG_NO_TRAILZ" flag.

Looking at the git history, there's no indication that the
`PF_FLAG_NO_TRAILZ` flag was ever implemented or that "%!" was used as an
`mp_printf` format string in practice.

So remove the flag and re-number the other flags.

Leave `PF_FLAG_SEP_POS` at 9 (the highest position that probably works with
16-bit integers like the pic16bit port).

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/mpprint.c |  2 --
 py/mpprint.h | 11 +++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/py/mpprint.c b/py/mpprint.c
index 00a5f944c69ef..86dbfad05e30c 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -413,8 +413,6 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                 flags |= PF_FLAG_SHOW_SIGN;
             } else if (*fmt == ' ') {
                 flags |= PF_FLAG_SPACE_SIGN;
-            } else if (*fmt == '!') {
-                flags |= PF_FLAG_NO_TRAILZ;
             } else if (*fmt == '0') {
                 flags |= PF_FLAG_PAD_AFTER_SIGN;
                 fill = '0';
diff --git a/py/mpprint.h b/py/mpprint.h
index 511af329baf8d..583f00bda8099 100644
--- a/py/mpprint.h
+++ b/py/mpprint.h
@@ -31,12 +31,11 @@
 #define PF_FLAG_LEFT_ADJUST       (0x001)
 #define PF_FLAG_SHOW_SIGN         (0x002)
 #define PF_FLAG_SPACE_SIGN        (0x004)
-#define PF_FLAG_NO_TRAILZ         (0x008)
-#define PF_FLAG_SHOW_PREFIX       (0x010)
-#define PF_FLAG_PAD_AFTER_SIGN    (0x020)
-#define PF_FLAG_CENTER_ADJUST     (0x040)
-#define PF_FLAG_ADD_PERCENT       (0x080)
-#define PF_FLAG_SHOW_OCTAL_LETTER (0x100)
+#define PF_FLAG_SHOW_PREFIX       (0x008)
+#define PF_FLAG_PAD_AFTER_SIGN    (0x010)
+#define PF_FLAG_CENTER_ADJUST     (0x020)
+#define PF_FLAG_ADD_PERCENT       (0x040)
+#define PF_FLAG_SHOW_OCTAL_LETTER (0x080)
 #define PF_FLAG_SEP_POS           (9) // must be above all the above PF_FLAGs
 
 #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES

From fc6205c4f005dcc9d0560cfe1619f022db8ff12f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 13 Jun 2025 17:50:05 +0200
Subject: [PATCH 2368/3129] unix/coverage: Add coverage test for left adjusted
 print.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c                  | 1 +
 tests/ports/unix/extra_coverage.py.exp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 9201dab12d26f..b041141f0f1ae 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -220,6 +220,7 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%X\n", 0x80000000); // should print unsigned
         mp_printf(&mp_plat_print, "abc\n%"); // string ends in middle of format specifier
         mp_printf(&mp_plat_print, "%%\n"); // literal % character
+        mp_printf(&mp_plat_print, ".%-3s.\n", "a"); // left adjust
     }
 
     // GC
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 1549168228e4d..3775036bb37e1 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -14,6 +14,7 @@ false true
 80000000
 abc
 %
+.a  .
 # GC
 0
 0

From 5ff2ae5a6c955a5123082ba441ad57fe4908b690 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 15 Jun 2025 08:08:55 +0200
Subject: [PATCH 2369/3129] py/asmbase: Fix assertion error with viper code.

In the case of viper code it's possible to reach MP_ASM_PASS_EMIT with a
code size of 0 bytes.  Update the assertion accordingly.

After this change, `mpy-cross -march=debug' on viper tests no longer
crashes.

Fixes issue #17467.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/asmbase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/asmbase.c b/py/asmbase.c
index 3fce543a7f485..f1b823fa368f8 100644
--- a/py/asmbase.c
+++ b/py/asmbase.c
@@ -53,7 +53,7 @@ void mp_asm_base_start_pass(mp_asm_base_t *as, int pass) {
     } else {
         // allocating executable RAM is platform specific
         MP_PLAT_ALLOC_EXEC(as->code_offset, (void **)&as->code_base, &as->code_size);
-        assert(as->code_base != NULL);
+        assert(as->code_size == 0 || as->code_base != NULL);
     }
     as->pass = pass;
     as->suppress = false;

From cb315bb8e4d267eddb550ab71d17015eb6b5586c Mon Sep 17 00:00:00 2001
From: Meir Armon <meirarmon@gmail.com>
Date: Thu, 29 May 2025 20:12:35 +0300
Subject: [PATCH 2370/3129] esp32/modesp32: Make wake_on_touch available only
 on SoCs supporting it.

The `esp32.wake_on_touch()` method should only be available on boards that
have SOC_TOUCH_SENSOR_SUPPORTED=y.  And update docs to reflect this.

Signed-off-by: Meir Armon <meirarmon@gmail.com>
---
 docs/library/esp32.rst    | 2 ++
 ports/esp32/machine_pin.c | 2 ++
 ports/esp32/machine_rtc.h | 2 ++
 ports/esp32/modesp32.c    | 7 +++++++
 4 files changed, 13 insertions(+)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index aeba3d60335b8..8a849adfcc102 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -18,6 +18,8 @@ Functions
     Configure whether or not a touch will wake the device from sleep.
     *wake* should be a boolean value.
 
+    .. note:: This is only available for boards that have touch sensor support.
+
 .. function:: wake_on_ulp(wake)
 
     Configure whether or not the Ultra-Low-Power co-processor can wake the
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index d0c4ee1a7eca7..5cc55beb930ec 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -325,9 +325,11 @@ static mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
                 mp_raise_ValueError(MP_ERROR_TEXT("bad wake value"));
             }
 
+            #if SOC_TOUCH_SENSOR_SUPPORTED
             if (machine_rtc_config.wake_on_touch) { // not compatible
                 mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
             }
+            #endif
 
             if (!RTC_IS_VALID_EXT_PIN(index)) {
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid pin for wake"));
diff --git a/ports/esp32/machine_rtc.h b/ports/esp32/machine_rtc.h
index f327b9a2ac2c8..566920f8500f9 100644
--- a/ports/esp32/machine_rtc.h
+++ b/ports/esp32/machine_rtc.h
@@ -33,7 +33,9 @@
 typedef struct {
     uint64_t ext1_pins; // set bit == pin#
     int8_t ext0_pin;   // just the pin#, -1 == None
+    #if SOC_TOUCH_SENSOR_SUPPORTED
     bool wake_on_touch : 1;
+    #endif
     #if SOC_ULP_SUPPORTED
     bool wake_on_ulp : 1;
     #endif
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index f51c15322c6fe..478cea68d3ada 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -47,6 +47,7 @@
 #include "../multi_heap_platform.h"
 #include "../heap_private.h"
 
+#if SOC_TOUCH_SENSOR_SUPPORTED
 static mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
 
     if (machine_rtc_config.ext0_pin != -1) {
@@ -57,12 +58,16 @@ static mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_touch_obj, esp32_wake_on_touch);
+#endif
 
 static mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
 
+    #if SOC_TOUCH_SENSOR_SUPPORTED
     if (machine_rtc_config.wake_on_touch) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
     }
+    #endif
+
     enum {ARG_pin, ARG_level};
     const mp_arg_t allowed_args[] = {
         { MP_QSTR_pin,  MP_ARG_OBJ, {.u_obj = mp_obj_new_int(machine_rtc_config.ext0_pin)} },
@@ -259,7 +264,9 @@ static MP_DEFINE_CONST_FUN_OBJ_0(esp32_idf_task_info_obj, esp32_idf_task_info);
 static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32) },
 
+    #if SOC_TOUCH_SENSOR_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_wake_on_touch), MP_ROM_PTR(&esp32_wake_on_touch_obj) },
+    #endif
     { 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 SOC_ULP_SUPPORTED

From 4697a06fdb9d2639975e049463c2a3d776238aec Mon Sep 17 00:00:00 2001
From: Meir Armon <meirarmon@gmail.com>
Date: Fri, 30 May 2025 14:01:06 +0300
Subject: [PATCH 2371/3129] esp32/modesp32: Make wake_on_ext0 available only on
 SoCs supporting it.

The `esp32.wake_on_ext0()` method should only be available on boards that
have SOC_PM_SUPPORT_EXT0_WAKEUP=y.  And update docs to reflect this.

Signed-off-by: Meir Armon <meirarmon@gmail.com>
---
 docs/library/esp32.rst    | 2 ++
 ports/esp32/machine_pin.c | 4 ++++
 ports/esp32/machine_rtc.c | 2 ++
 ports/esp32/machine_rtc.h | 4 ++++
 ports/esp32/modesp32.c    | 4 ++++
 5 files changed, 16 insertions(+)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 8a849adfcc102..b4f423b5f48f2 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -33,6 +33,8 @@ Functions
     or a valid Pin object.  *level* should be ``esp32.WAKEUP_ALL_LOW`` or
     ``esp32.WAKEUP_ANY_HIGH``.
 
+    .. note:: This is only available for boards that have ext0 support.
+
 .. function:: wake_on_ext1(pins, level)
 
     Configure how EXT1 wakes the device from sleep.  *pins* can be ``None``
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 5cc55beb930ec..4ab79f0a26460 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -335,6 +335,7 @@ static mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid pin for wake"));
             }
 
+            #if SOC_PM_SUPPORT_EXT0_WAKEUP
             if (machine_rtc_config.ext0_pin == -1) {
                 machine_rtc_config.ext0_pin = index;
             } else if (machine_rtc_config.ext0_pin != index) {
@@ -343,10 +344,13 @@ static mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 
             machine_rtc_config.ext0_level = trigger == GPIO_INTR_LOW_LEVEL ? 0 : 1;
             machine_rtc_config.ext0_wake_types = wake;
+            #endif
         } else {
+            #if SOC_PM_SUPPORT_EXT0_WAKEUP
             if (machine_rtc_config.ext0_pin == index) {
                 machine_rtc_config.ext0_pin = -1;
             }
+            #endif
 
             if (handler == mp_const_none) {
                 handler = MP_OBJ_NULL;
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index a2f4bb132d4ea..48a2e2926c9dd 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -83,7 +83,9 @@ static const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 machine_rtc_config_t machine_rtc_config = {
     .ext1_pins = 0,
+    #if SOC_PM_SUPPORT_EXT0_WAKEUP
     .ext0_pin = -1
+    #endif
 };
 
 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) {
diff --git a/ports/esp32/machine_rtc.h b/ports/esp32/machine_rtc.h
index 566920f8500f9..6376f795819de 100644
--- a/ports/esp32/machine_rtc.h
+++ b/ports/esp32/machine_rtc.h
@@ -32,15 +32,19 @@
 
 typedef struct {
     uint64_t ext1_pins; // set bit == pin#
+    #if SOC_PM_SUPPORT_EXT0_WAKEUP
     int8_t ext0_pin;   // just the pin#, -1 == None
+    #endif
     #if SOC_TOUCH_SENSOR_SUPPORTED
     bool wake_on_touch : 1;
     #endif
     #if SOC_ULP_SUPPORTED
     bool wake_on_ulp : 1;
     #endif
+    #if SOC_PM_SUPPORT_EXT0_WAKEUP
     bool ext0_level : 1;
     wake_type_t ext0_wake_types;
+    #endif
     bool ext1_level : 1;
 } machine_rtc_config_t;
 
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 478cea68d3ada..4a42ebef98f6f 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -60,6 +60,7 @@ static mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_touch_obj, esp32_wake_on_touch);
 #endif
 
+#if SOC_PM_SUPPORT_EXT0_WAKEUP
 static mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
 
     #if SOC_TOUCH_SENSOR_SUPPORTED
@@ -94,6 +95,7 @@ static mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_m
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext0_obj, 0, esp32_wake_on_ext0);
+#endif
 
 static mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_pins, ARG_level};
@@ -267,7 +269,9 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     #if SOC_TOUCH_SENSOR_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_wake_on_touch), MP_ROM_PTR(&esp32_wake_on_touch_obj) },
     #endif
+    #if SOC_PM_SUPPORT_EXT0_WAKEUP
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext0), MP_ROM_PTR(&esp32_wake_on_ext0_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext1), MP_ROM_PTR(&esp32_wake_on_ext1_obj) },
     #if SOC_ULP_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_wake_on_ulp), MP_ROM_PTR(&esp32_wake_on_ulp_obj) },

From 171d751242ba7c9fd32b86852a1383bc23c6fda1 Mon Sep 17 00:00:00 2001
From: Meir Armon <meirarmon@gmail.com>
Date: Fri, 30 May 2025 17:22:53 +0300
Subject: [PATCH 2372/3129] esp32/modesp32: Make wake_on_ext1 available only on
 SoCs supporting it.

The `esp32.wake_on_ext1()` method should only be available on boards that
have SOC_PM_SUPPORT_EXT1_WAKEUP=y.  And update docs to reflect this.

Signed-off-by: Meir Armon <meirarmon@gmail.com>
---
 docs/library/esp32.rst    | 2 ++
 ports/esp32/machine_rtc.c | 2 ++
 ports/esp32/machine_rtc.h | 4 ++++
 ports/esp32/modesp32.c    | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index b4f423b5f48f2..4be6dc2671c52 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -41,6 +41,8 @@ Functions
     or a tuple/list of valid Pin objects.  *level* should be ``esp32.WAKEUP_ALL_LOW``
     or ``esp32.WAKEUP_ANY_HIGH``.
 
+    .. note:: This is only available for boards that have ext1 support.
+
 .. function:: gpio_deep_sleep_hold(enable)
 
     Configure whether non-RTC GPIO pin configuration is retained during
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 48a2e2926c9dd..ee6b1ad5cb5ec 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -82,7 +82,9 @@ _USER_MEM_ATTR uint8_t rtc_user_mem_data[MICROPY_HW_RTC_USER_MEM_MAX];
 static const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 machine_rtc_config_t machine_rtc_config = {
+    #if SOC_PM_SUPPORT_EXT1_WAKEUP
     .ext1_pins = 0,
+    #endif
     #if SOC_PM_SUPPORT_EXT0_WAKEUP
     .ext0_pin = -1
     #endif
diff --git a/ports/esp32/machine_rtc.h b/ports/esp32/machine_rtc.h
index 6376f795819de..72717c5936d5b 100644
--- a/ports/esp32/machine_rtc.h
+++ b/ports/esp32/machine_rtc.h
@@ -31,7 +31,9 @@
 #include "modmachine.h"
 
 typedef struct {
+    #if SOC_PM_SUPPORT_EXT1_WAKEUP
     uint64_t ext1_pins; // set bit == pin#
+    #endif
     #if SOC_PM_SUPPORT_EXT0_WAKEUP
     int8_t ext0_pin;   // just the pin#, -1 == None
     #endif
@@ -45,7 +47,9 @@ typedef struct {
     bool ext0_level : 1;
     wake_type_t ext0_wake_types;
     #endif
+    #if SOC_PM_SUPPORT_EXT1_WAKEUP
     bool ext1_level : 1;
+    #endif
 } machine_rtc_config_t;
 
 extern machine_rtc_config_t machine_rtc_config;
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 4a42ebef98f6f..26a39d44511e0 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -97,6 +97,7 @@ static mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_m
 static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext0_obj, 0, esp32_wake_on_ext0);
 #endif
 
+#if SOC_PM_SUPPORT_EXT1_WAKEUP
 static mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_pins, ARG_level};
     const mp_arg_t allowed_args[] = {
@@ -132,6 +133,7 @@ static mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_m
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1);
+#endif
 
 #if SOC_ULP_SUPPORTED
 static mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
@@ -272,7 +274,9 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     #if SOC_PM_SUPPORT_EXT0_WAKEUP
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext0), MP_ROM_PTR(&esp32_wake_on_ext0_obj) },
     #endif
+    #if SOC_PM_SUPPORT_EXT1_WAKEUP
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext1), MP_ROM_PTR(&esp32_wake_on_ext1_obj) },
+    #endif
     #if SOC_ULP_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_wake_on_ulp), MP_ROM_PTR(&esp32_wake_on_ulp_obj) },
     #endif

From d9467b07cb036dfc0d54f36fd74356001881d154 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Apr 2025 13:15:40 +1000
Subject: [PATCH 2373/3129] tools/mpremote: Improve df command to use new
 no-arg vfs.mount() query.

The existing `mpremote df` command is not very good, because it needs to
assume that all directories in the root directory are mount points, and
also doesn't correctly stat filesystems when the current directory is not
the root. This leads to wrong results

With the introduction of `vfs.mount()` to return a list of mounted
filesystems and their path, a much better df can be implemented, as done in
this commit.

The new df will also fall back to using the old approach of listing the
root directory if the no-arg `vfs.mount()` query is not supported.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index f8c913d26d194..d122e93c0f964 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -379,7 +379,27 @@ def argparse_none(description):
     # Disk used/free.
     "df": [
         "exec",
-        "import os\nprint('mount \\tsize \\tused \\tavail \\tuse%')\nfor _m in [''] + os.listdir('/'):\n _s = os.stat('/' + _m)\n if not _s[0] & 1 << 14: continue\n _s = os.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')",
+        """
+import os,vfs
+_f = "{:<10}{:>9}{:>9}{:>9}{:>5} {}"
+print(_f.format("filesystem", "size", "used", "avail", "use%", "mounted on"))
+try:
+ _ms = vfs.mount()
+except:
+ _ms = []
+ for _m in [""] + os.listdir("/"):
+  _m = "/" + _m
+  _s = os.stat(_m)
+  if _s[0] & 1 << 14:
+   _ms.append(("<unknown>",_m))
+for _v,_p in _ms:
+ _s = os.statvfs(_p)
+ _sz = _s[0]*_s[2]
+ if _sz:
+  _av = _s[0]*_s[3]
+  _us = 100*(_sz-_av)//_sz
+  print(_f.format(str(_v), _sz, _sz-_av, _av, _us, _p))
+""",
     ],
     # Other shortcuts.
     "reset": {

From 573180f7884112e2bc5bf279549b4941f7fab06b Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 29 Sep 2024 21:23:29 +1000
Subject: [PATCH 2374/3129] renesas-ra: Replace MICROPY_EVENT_POLL_HOOK with
 mp_event_wait.

Basic update to the renesas-ra port to replace the traditional
`MICROPY_EVENT_POLL_HOOK` with the newer mp_event_wait API as appropriate.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/renesas-ra/machine_uart.c |  2 +-
 ports/renesas-ra/mpconfigport.h | 13 +------------
 ports/renesas-ra/mphalport.c    |  2 +-
 ports/renesas-ra/mphalport.h    |  8 ++++++++
 ports/renesas-ra/systick.c      | 10 ++++++----
 ports/renesas-ra/uart.c         |  4 ++--
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index b70978ad7a5fe..196e1ccd6dd3a 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -501,7 +501,7 @@ static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
             if (!uart_tx_busy(self)) {
                 return 0;
             }
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_wait_indefinite();
         } while (mp_hal_ticks_ms() < timeout);
         *errcode = MP_ETIMEDOUT;
         ret = MP_STREAM_ERROR;
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index c2b89f415bad7..8a116269bb49e 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -243,28 +243,17 @@ typedef unsigned int mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
 #if MICROPY_PY_THREAD
-#define MICROPY_EVENT_POLL_HOOK \
+#define MICROPY_INTERNAL_EVENT_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
 
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index b2587af06de2c..455b28af19506 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -104,7 +104,7 @@ int mp_hal_stdin_rx_chr(void) {
             return dupterm_c;
         }
         #endif
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_indefinite();
     }
 }
 
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index 1dab67f9a76db..4f8be705d1cbc 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -35,6 +35,14 @@
 #define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV)
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state)
 
+// Port level Wait-for-Event macro
+//
+// Do not use this macro directly, include py/runtime.h and
+// call mp_event_wait_indefinite() or mp_event_wait_ms(timeout).
+// Uses WFI which will wake up from regular systick interrupt if not
+// before from any other source.
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) __WFI()
+
 #define MICROPY_PY_LWIP_ENTER
 #define MICROPY_PY_LWIP_REENTER
 #define MICROPY_PY_LWIP_EXIT
diff --git a/ports/renesas-ra/systick.c b/ports/renesas-ra/systick.c
index 6fa02a2b6ec0a..cb528d91d2325 100644
--- a/ports/renesas-ra/systick.c
+++ b/ports/renesas-ra/systick.c
@@ -97,22 +97,24 @@ void HAL_Delay(uint32_t 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) {
+void mp_hal_delay_ms(mp_uint_t ms) {
     if (query_irq() == IRQ_STATE_ENABLED) {
         // IRQs enabled, so can use systick counter to do the delay
         uint32_t start = uwTick;
+        mp_uint_t elapsed = 0;
         // 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);
+            mp_event_wait_ms(ms - elapsed);
+            elapsed = uwTick - start;
+        } while (elapsed < ms);
     } 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) {
+        while (ms-- > 0) {
             count_1ms = (MICROPY_HW_MCU_PCLK / 1000 / 10);
             while (count_1ms-- > 0) {
                 __asm__ __volatile__ ("nop");
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index 4800e0ea03f95..91714bf05b376 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -477,7 +477,7 @@ bool uart_rx_wait(machine_uart_obj_t *self, uint32_t timeout) {
         if (HAL_GetTick() - start >= timeout) {
             return false; // timeout
         }
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(1);
     }
 }
 
@@ -498,7 +498,7 @@ bool uart_tx_wait(machine_uart_obj_t *self, uint32_t timeout) {
         if (HAL_GetTick() - start >= timeout) {
             return false; // timeout
         }
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(1);
     }
 }
 

From cfcc53da72d330d2eb9728d5f75c3ef5b459f1cf Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Oct 2024 20:41:23 +1000
Subject: [PATCH 2375/3129] drivers/esp-hosted: Replace EVENT_POLL_HOOK with
 mp_event_wait_ms.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 drivers/esp-hosted/esp_hosted_bthci_uart.c | 4 ++--
 drivers/esp-hosted/esp_hosted_wifi.c       | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/esp-hosted/esp_hosted_bthci_uart.c b/drivers/esp-hosted/esp_hosted_bthci_uart.c
index 003054460d9a6..069509edde77e 100644
--- a/drivers/esp-hosted/esp_hosted_bthci_uart.c
+++ b/drivers/esp-hosted/esp_hosted_bthci_uart.c
@@ -72,7 +72,7 @@ int esp_hosted_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param_
     // 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
+            mp_event_wait_ms(1);
             // Timeout.
             if ((mp_hal_ticks_ms() - start) > HCI_COMMAND_TIMEOUT) {
                 error_printf("timeout waiting for HCI packet\n");
@@ -126,7 +126,7 @@ int mp_bluetooth_hci_controller_init(void) {
         if (mp_bluetooth_hci_uart_any()) {
             mp_bluetooth_hci_uart_readchar();
         }
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(1);
     }
 
     #ifdef MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY
diff --git a/drivers/esp-hosted/esp_hosted_wifi.c b/drivers/esp-hosted/esp_hosted_wifi.c
index d1b6333aa012c..763b04db376d4 100644
--- a/drivers/esp-hosted/esp_hosted_wifi.c
+++ b/drivers/esp-hosted/esp_hosted_wifi.c
@@ -243,7 +243,7 @@ static int esp_hosted_request(CtrlMsgId msg_id, void *ctrl_payload) {
 
 static CtrlMsg *esp_hosted_response(CtrlMsgId msg_id, uint32_t timeout) {
     CtrlMsg *ctrl_msg = NULL;
-    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_event_wait_ms(10)) {
         if (!esp_hosted_stack_empty(&esp_state.stack)) {
             ctrl_msg = esp_hosted_stack_pop(&esp_state.stack, true);
             if (ctrl_msg->msg_id == msg_id) {
@@ -264,8 +264,6 @@ static CtrlMsg *esp_hosted_response(CtrlMsgId msg_id, uint32_t timeout) {
         if ((mp_hal_ticks_ms() - start) >= timeout) {
             return NULL;
         }
-
-        MICROPY_EVENT_POLL_HOOK
     }
 
     // If message type is a response, check the response struct's return value.

From 7816b1f5134b24d5c352af679d398a491a427edd Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 16 Jun 2025 12:35:51 +0100
Subject: [PATCH 2376/3129] rp2/machine_timer: Support hard IRQ timer
 callbacks.

Unlike some boards like stm32, timer callbacks on the rp2 port are
unconditionally dispatched via mp_sched_schedule(), behaving like
soft IRQs with consequent GC jitter and delays.

Add a 'hard' keyword argument to the rp2 Timer constructor and init.
This defaults to False but if it is set True, the timer callback will
be dispatched in hard IRQ context rather than queued.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/rp2/machine_timer.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index 6f8b04f10eab0..ffb4c7024308a 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -27,6 +27,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "py/gc.h"
 #include "pico/time.h"
 
 #define ALARM_ID_INVALID (-1)
@@ -40,13 +41,36 @@ typedef struct _machine_timer_obj_t {
     uint32_t mode;
     uint64_t delta_us; // for periodic mode
     mp_obj_t callback;
+    bool ishard;
 } 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->ishard) {
+        // 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) {
+            mp_call_function_1(self->callback, MP_OBJ_FROM_PTR(self));
+            nlr_pop();
+        } else {
+            // Uncaught exception; disable the callback so it doesn't run again.
+            self->mode = TIMER_MODE_ONE_SHOT;
+            mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in timer callback\n");
+            mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+        gc_unlock();
+        mp_sched_unlock();
+    } else {
+        mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
+    }
+
     if (self->mode == TIMER_MODE_ONE_SHOT) {
         return 0;
     } else {
@@ -66,13 +90,14 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
 }
 
 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, };
+    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, ARG_hard, };
     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} },
+        { MP_QSTR_hard,         MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
 
     // Parse args
@@ -96,6 +121,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;
+    self->ishard = args[ARG_hard].u_bool;
     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);

From 8f85edad8601c87a107b51a1b417600fbb8d8087 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 16 Jun 2025 12:35:51 +0100
Subject: [PATCH 2377/3129] tests/ports/rp2: Add tests for rp2-specific timer
 options.

Add tests for both one-shot and periodic timers using the rp2-specific
tick_hz= and hard= parameters.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 tests/ports/rp2/rp2_machine_timer.py     | 20 ++++++++++++++++++++
 tests/ports/rp2/rp2_machine_timer.py.exp | 16 ++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 tests/ports/rp2/rp2_machine_timer.py
 create mode 100644 tests/ports/rp2/rp2_machine_timer.py.exp

diff --git a/tests/ports/rp2/rp2_machine_timer.py b/tests/ports/rp2/rp2_machine_timer.py
new file mode 100644
index 0000000000000..ac4efcf7f3835
--- /dev/null
+++ b/tests/ports/rp2/rp2_machine_timer.py
@@ -0,0 +1,20 @@
+from machine import Timer
+from time import sleep_ms
+
+# Test the rp2-specific adjustable tick_hz and hard/soft IRQ handlers
+# for both one-shot and periodic timers.
+
+modes = {Timer.ONE_SHOT: "one-shot", Timer.PERIODIC: "periodic"}
+kinds = {False: "soft", True: "hard"}
+
+for mode in modes:
+    for hard in kinds:
+        for period in 2, 4:
+            timer = Timer(
+                mode=mode,
+                period=period,
+                hard=hard,
+                callback=lambda t: print("callback", modes[mode], kinds[hard], period),
+            )
+            sleep_ms(9)
+            timer.deinit()
diff --git a/tests/ports/rp2/rp2_machine_timer.py.exp b/tests/ports/rp2/rp2_machine_timer.py.exp
new file mode 100644
index 0000000000000..b3dd93dfabfa8
--- /dev/null
+++ b/tests/ports/rp2/rp2_machine_timer.py.exp
@@ -0,0 +1,16 @@
+callback one-shot soft 2
+callback one-shot soft 4
+callback one-shot hard 2
+callback one-shot hard 4
+callback periodic soft 2
+callback periodic soft 2
+callback periodic soft 2
+callback periodic soft 2
+callback periodic soft 4
+callback periodic soft 4
+callback periodic hard 2
+callback periodic hard 2
+callback periodic hard 2
+callback periodic hard 2
+callback periodic hard 4
+callback periodic hard 4

From 816246836e00b6c2af0ba26e8d16c234b43da4a0 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 16 Jun 2025 12:35:51 +0100
Subject: [PATCH 2378/3129] docs/rp2: Document the new rp2 Timer hard= option.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 docs/rp2/quickref.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 23071d77215d5..ec31442990ff4 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -135,6 +135,12 @@ Use the :mod:`machine.Timer` class::
     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))
 
+By default, timer callbacks run as soft IRQs so they can allocate but
+are prone to GC jitter and delays. Pass ``hard=True`` to the ``Timer()``
+constructor or ``init()`` method to run the callback in hard-IRQ context
+instead. This reduces delay and jitter, but see :ref:`isr_rules` for the
+restrictions that apply to hard-IRQ handlers.
+
 
 .. _rp2_Pins_and_GPIO:
 

From 2c8ccd3ee8945d53857e383911bf822374174257 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 1 Jun 2025 20:06:56 +0200
Subject: [PATCH 2379/3129] py: Fix undefined left shift operations.

By ensuring the value to be shifted is an unsigned of the appropriate type.

This fixes several runtime diagnostics such as:

    ../../py/binary.c:199:28: runtime error:
     left shift of 32768 by 16 places
     cannot be represented in type 'int'

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/binary.c         | 2 +-
 py/persistentcode.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/binary.c b/py/binary.c
index 4fc8f751ad39a..48d3421bca963 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -196,7 +196,7 @@ static float mp_decode_half_float(uint16_t hf) {
         ++e;
     }
 
-    fpu.i = ((hf & 0x8000) << 16) | (e << 23) | (m << 13);
+    fpu.i = ((hf & 0x8000u) << 16) | (e << 23) | (m << 13);
     return fpu.f;
 }
 
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 43207a0cc8f66..6ec0717f948b4 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -759,7 +759,7 @@ static void bit_vector_clear(bit_vector_t *self) {
 static bool bit_vector_is_set(bit_vector_t *self, size_t index) {
     const size_t bits_size = sizeof(*self->bits) * MP_BITS_PER_BYTE;
     return index / bits_size < self->alloc
-           && (self->bits[index / bits_size] & (1 << (index % bits_size))) != 0;
+           && (self->bits[index / bits_size] & ((uintptr_t)1 << (index % bits_size))) != 0;
 }
 
 static void bit_vector_set(bit_vector_t *self, size_t index) {
@@ -770,7 +770,7 @@ static void bit_vector_set(bit_vector_t *self, size_t index) {
         self->bits = m_renew(uintptr_t, self->bits, self->alloc, new_alloc);
         self->alloc = new_alloc;
     }
-    self->bits[index / bits_size] |= 1 << (index % bits_size);
+    self->bits[index / bits_size] |= (uintptr_t)1 << (index % bits_size);
 }
 
 typedef struct _mp_opcode_t {

From 268264fe64d04b82434c8efb2e9e94e8712719d4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 15 Jun 2025 16:35:13 +0200
Subject: [PATCH 2380/3129] tools/ci.sh: Add functions for sanitizer builds.

Includes both undefined and address sanitizer configurations.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tools/ci.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index a5cd326c1c7d7..b0e59509add83 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -512,6 +512,18 @@ CI_UNIX_OPTS_QEMU_RISCV64=(
     MICROPY_STANDALONE=1
 )
 
+CI_UNIX_OPTS_SANITIZE_ADDRESS=(
+    VARIANT=coverage
+    CFLAGS_EXTRA="-fsanitize=address"
+    LDFLAGS_EXTRA="-fsanitize=address"
+)
+
+CI_UNIX_OPTS_SANITIZE_UNDEFINED=(
+    VARIANT=coverage
+    CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
+    LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
+)
+
 function ci_unix_build_helper {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix "$@" submodules
@@ -742,6 +754,28 @@ function ci_unix_settrace_stackless_run_tests {
     ci_unix_run_tests_full_helper standard "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}"
 }
 
+function ci_unix_sanitize_undefined_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix submodules
+    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+    ci_unix_build_ffi_lib_helper gcc
+}
+
+function ci_unix_sanitize_undefined_run_tests {
+    ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+}
+
+function ci_unix_sanitize_address_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix submodules
+    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+    ci_unix_build_ffi_lib_helper gcc
+}
+
+function ci_unix_sanitize_address_run_tests {
+    ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+}
+
 function ci_unix_macos_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix submodules

From 841acb9df1eba53b1d6daf0684eddec17680235c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 15 Jun 2025 16:45:23 +0200
Subject: [PATCH 2381/3129] github/workflows: Add sanitize_undefined workflow
 to unix port CI.

gcc's "undefined behavior" sanitizer can catch a range of misbehaviors at
runtime that normally go unnoticed.  These include integer and pointer
operations that are "undefined" per the relevant C specification.

This commit enables undefined behavior detection during a new unix
coverage-like build.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 .github/workflows/ports_unix.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 2547015038e4d..662121654e4f7 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -262,3 +262,23 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  sanitize_undefined:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_coverage_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_sanitize_undefined_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_sanitize_undefined_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
+      run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures

From 5901b8d149d63d74354bfb3f7f44a0b942eda23e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 10 Jun 2025 08:21:14 +0200
Subject: [PATCH 2382/3129] tests/cpydiff: Document complex() parsing
 difference.

In #17384 it was decided that fixing this difference was not worth the code
size increase.  So document it instead.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cpydiff/types_complex_parser.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tests/cpydiff/types_complex_parser.py

diff --git a/tests/cpydiff/types_complex_parser.py b/tests/cpydiff/types_complex_parser.py
new file mode 100644
index 0000000000000..4a012987d9e48
--- /dev/null
+++ b/tests/cpydiff/types_complex_parser.py
@@ -0,0 +1,14 @@
+"""
+categories: Types,complex
+description: MicroPython's complex() accepts certain incorrect values that CPython rejects
+cause: MicroPython is highly optimized for memory usage.
+workaround: Do not use non-standard complex literals as argument to complex()
+
+MicroPython's ``complex()`` function accepts literals that contain a space and
+no sign between the real and imaginary parts, and interprets it as a plus.
+"""
+
+try:
+    print(complex("1 1j"))
+except ValueError:
+    print("ValueError")

From 5ade8b7058f95e77a0d62d523c8443647f176532 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 16 Jun 2025 09:11:31 +0200
Subject: [PATCH 2383/3129] tests/extmod: Add platform_basic.py for basic
 coverage test of platform.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/extmod/platform_basic.py | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 tests/extmod/platform_basic.py

diff --git a/tests/extmod/platform_basic.py b/tests/extmod/platform_basic.py
new file mode 100644
index 0000000000000..eb6f2be13c17a
--- /dev/null
+++ b/tests/extmod/platform_basic.py
@@ -0,0 +1,8 @@
+try:
+    import platform
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+print(type(platform.python_compiler()))
+print(type(platform.libc_ver()))

From b6b7d64bd9257cc1c138d37033108dcff5ceb89e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 13 Jun 2025 17:24:08 +0200
Subject: [PATCH 2384/3129] py/modio: Fix the case where write fails in
 BufferedWriter.flush.

Previously, there was no test coverage of the "write failed" path.  In
fact, the assertion would fire instead of gracefully raising a Python
exception.

Slightly re-organize the code to place the assertion later.  Add a test
case which exercises all paths, and update the expected output.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/modio.c                             |  9 +++++----
 tests/basics/io_buffered_writer.py     | 24 ++++++++++++++++++++++++
 tests/basics/io_buffered_writer.py.exp |  5 +++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/py/modio.c b/py/modio.c
index d3e563dbcf447..9aeb42d30aa13 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -169,12 +169,13 @@ static mp_obj_t bufwriter_flush(mp_obj_t self_in) {
         int err;
         mp_uint_t out_sz = mp_stream_write_exactly(self->stream, self->buf, self->len, &err);
         (void)out_sz;
-        // TODO: try to recover from a case of non-blocking stream, e.g. move
-        // remaining chunk to the beginning of buffer.
-        assert(out_sz == self->len);
-        self->len = 0;
         if (err != 0) {
             mp_raise_OSError(err);
+        } else {
+            // TODO: try to recover from a case of non-blocking stream, e.g. move
+            // remaining chunk to the beginning of buffer.
+            assert(out_sz == self->len);
+            self->len = 0;
         }
     }
 
diff --git a/tests/basics/io_buffered_writer.py b/tests/basics/io_buffered_writer.py
index 5c065f158a2d3..60cf2c837d10f 100644
--- a/tests/basics/io_buffered_writer.py
+++ b/tests/basics/io_buffered_writer.py
@@ -28,3 +28,27 @@
 
 # hashing a BufferedWriter
 print(type(hash(buf)))
+
+# Test failing flush()
+class MyIO(io.IOBase):
+    def __init__(self):
+        self.count = 0
+
+    def write(self, buf):
+        self.count += 1
+        if self.count < 3:
+            return None
+        print("writing", buf)
+        return len(buf)
+
+
+buf = io.BufferedWriter(MyIO(), 8)
+
+buf.write(b"foobar")
+
+for _ in range(4):
+    try:
+        buf.flush()
+        print("flushed")
+    except OSError:
+        print("OSError")
diff --git a/tests/basics/io_buffered_writer.py.exp b/tests/basics/io_buffered_writer.py.exp
index 2209348f5af45..d61eb148b453c 100644
--- a/tests/basics/io_buffered_writer.py.exp
+++ b/tests/basics/io_buffered_writer.py.exp
@@ -4,3 +4,8 @@ b'foobarfoobar'
 b'foobarfoobar'
 b'foo'
 <class 'int'>
+OSError
+OSError
+writing bytearray(b'foobar')
+flushed
+flushed

From c1196cadb185a6834146c358ecbf495bd556c303 Mon Sep 17 00:00:00 2001
From: Meir Armon <meirarmon@gmail.com>
Date: Mon, 16 Jun 2025 18:49:24 +0300
Subject: [PATCH 2385/3129] esp32/modesp32: Fix access to ext0_pin only if
 defined.

In different functions `machine_rtc_config.ext0_pin` is accessed where
SOC_PM_SUPPORT_EXT0_WAKEUP is not defined, fix that.

Signed-off-by: Meir Armon <meirarmon@gmail.com>
---
 ports/esp32/modesp32.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 26a39d44511e0..fcd6ed9fa83b8 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -50,9 +50,11 @@
 #if SOC_TOUCH_SENSOR_SUPPORTED
 static mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
 
+    #if SOC_PM_SUPPORT_EXT0_WAKEUP
     if (machine_rtc_config.ext0_pin != -1) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
     }
+    #endif
 
     machine_rtc_config.wake_on_touch = mp_obj_is_true(wake);
     return mp_const_none;
@@ -137,9 +139,11 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1)
 
 #if SOC_ULP_SUPPORTED
 static mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
+    #if SOC_PM_SUPPORT_EXT0_WAKEUP
     if (machine_rtc_config.ext0_pin != -1) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
     }
+    #endif
     machine_rtc_config.wake_on_ulp = mp_obj_is_true(wake);
     return mp_const_none;
 }

From b725c26b4e351b71b8f72ad8e55bbbd5ccce4602 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Thu, 29 May 2025 13:46:05 +0100
Subject: [PATCH 2386/3129] rp2/rp2_flash: Add MICROPY_HW_FLASH_MAX_FREQ to
 replace fixed max freq.

Assuming a 133MHz capable flash in 91cff8e4f10ea665c5f3f4b16d62c98d6ca22037
caused `rp2_flash_set_timing_internal` to set out of range dividers for
some boards (anything with value of 4 and flash that doesn't tolerate
higher speeds).

This affected (at least) the XIAO RP2350 board, making it non-bootable.

Since Pico SDK's `PICO_FLASH_SPI_CLKDIV` is entirely unreliable on a system
with a variable system clock (users can change it at runtime) then use it
only to work out a default `MICROPY_HW_FLASH_MAX_FREQ`.

This value can be overridden in board config.

Note that RP2350's default clock is 150MHz, RP2040's is 125MHz and it has
been certified at 200MHz so it's quite possible that
`PICO_FLASH_SPI_CLKDIV` is unreliable even at standard RP2 clocks.

(If flash timings are marginal then this can manifest as instability rather
than outright failure.)

Fixes issue #17375.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/rp2_flash.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index a9beabf051c2d..8b467fc6c842e 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -49,6 +49,14 @@
 static_assert(MICROPY_HW_ROMFS_BYTES % 4096 == 0, "ROMFS size must be a multiple of 4K");
 static_assert(MICROPY_HW_FLASH_STORAGE_BYTES % 4096 == 0, "Flash storage size must be a multiple of 4K");
 
+#ifndef MICROPY_HW_FLASH_MAX_FREQ
+// Emulate Pico SDK's SYS_CLK_HZ / PICO_FLASH_SPI_CLKDIV behaviour by default.
+// On RP2040 if PICO_USE_FASTEST_SUPPORTED_CLOCK is set then SYS_CLK_HZ can be
+// 200MHz, potentially putting timings derived from PICO_FLASH_SPI_CLKDIV
+// out of range.
+#define MICROPY_HW_FLASH_MAX_FREQ (SYS_CLK_HZ / PICO_FLASH_SPI_CLKDIV)
+#endif
+
 #ifndef MICROPY_HW_FLASH_STORAGE_BASE
 #define MICROPY_HW_FLASH_STORAGE_BASE (PICO_FLASH_SIZE_BYTES - MICROPY_HW_FLASH_STORAGE_BYTES)
 #endif
@@ -104,9 +112,8 @@ static bool use_multicore_lockout(void) {
 // and core1 locked out if relevant.
 static void __no_inline_not_in_flash_func(rp2_flash_set_timing_internal)(int clock_hz) {
 
-    // Use the minimum divisor assuming a 133MHz flash.
-    const int max_flash_freq = 133000000;
-    int divisor = (clock_hz + max_flash_freq - 1) / max_flash_freq;
+    // Use the minimum divisor based upon our target MICROPY_HW_FLASH_MAX_FREQ
+    int divisor = (clock_hz + MICROPY_HW_FLASH_MAX_FREQ - 1) / MICROPY_HW_FLASH_MAX_FREQ;
 
     #if PICO_RP2350
     // Make sure flash is deselected - QMI doesn't appear to have a busy flag(!)

From dc8daad3c90d48efb50f5f0469346fae8402540d Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Tue, 17 Jun 2025 14:55:25 +0100
Subject: [PATCH 2387/3129] rp2/rp2_flash: Add default
 MICROPY_HW_FLASH_MAX_FREQ.

Set a default MICROPY_HW_FLASH_MAX_FREQ if PICO_FLASH_SPI_CLKDIV
is unset.

Use a divider of 4, which is the default in boot2_generic_03h.S.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/rp2_flash.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 8b467fc6c842e..d6b9e13653315 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -54,7 +54,12 @@ static_assert(MICROPY_HW_FLASH_STORAGE_BYTES % 4096 == 0, "Flash storage size mu
 // On RP2040 if PICO_USE_FASTEST_SUPPORTED_CLOCK is set then SYS_CLK_HZ can be
 // 200MHz, potentially putting timings derived from PICO_FLASH_SPI_CLKDIV
 // out of range.
+#ifdef PICO_FLASH_SPI_CLKDIV
 #define MICROPY_HW_FLASH_MAX_FREQ (SYS_CLK_HZ / PICO_FLASH_SPI_CLKDIV)
+#else
+// A default PICO_FLASH_SPI_CLKDIV of 4 is set in boot2_generic_03h.S
+#define MICROPY_HW_FLASH_MAX_FREQ (SYS_CLK_HZ / 4)
+#endif
 #endif
 
 #ifndef MICROPY_HW_FLASH_STORAGE_BASE

From 1a060e87cd413241b526bfd6ed4f94c72f748285 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Fri, 28 Mar 2025 14:06:26 +0000
Subject: [PATCH 2388/3129] rp2/CMakeLists.txt: Make board's pins.csv
 configurable.

Allow `mpconfigboard.cmake` to specify a custom `MICROPY_BOARD_PINS` to
override `${MICROPY_BOARD_DIR}/pins.csv`.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index cf9f180792832..b9776012a0d0c 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -654,9 +654,13 @@ if(NOT PICO_NUM_EXT_GPIOS)
     set(PICO_NUM_EXT_GPIOS 10)
 endif()
 
-if(EXISTS "${MICROPY_BOARD_DIR}/pins.csv")
-    set(GEN_PINS_BOARD_CSV "${MICROPY_BOARD_DIR}/pins.csv")
-    set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
+if(NOT MICROPY_BOARD_PINS)
+    set(MICROPY_BOARD_PINS "${MICROPY_BOARD_DIR}/pins.csv")
+endif()
+
+if(EXISTS "${MICROPY_BOARD_PINS}")
+    set(GEN_PINS_BOARD_CSV "${MICROPY_BOARD_PINS}")
+    set(GEN_PINS_CSV_ARG --board-csv "${MICROPY_BOARD_PINS}")
 endif()
 
 target_sources(${MICROPY_TARGET} PRIVATE

From c16a4db151c0fac7db45c7c896741f707e9ad364 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Fri, 28 Mar 2025 14:27:26 +0000
Subject: [PATCH 2389/3129] rp2/CMakeLists.txt: Make linker script
 configurable.

Add `MICROPY_BOARD_LINKER_SCRIPT` to specify a custom linker script for rp2
boards/variants.

This may, for example, include a PSRAM region so that C buffers or
otherwise can be allocated into PSRAM.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index b9776012a0d0c..49ba8d77d6352 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -610,14 +610,18 @@ 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.
-if (PICO_ON_DEVICE AND NOT PICO_NO_FLASH AND NOT PICO_COPY_TO_RAM)
+if (NOT MICROPY_BOARD_LINKER_SCRIPT)
     if(PICO_RP2040)
-        pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2040.ld)
+        set(MICROPY_BOARD_LINKER_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2040.ld)
     elseif(PICO_RP2350)
-        pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2350.ld)
+        set(MICROPY_BOARD_LINKER_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/memmap_mp_rp2350.ld)
     endif()
 endif()
 
+if (PICO_ON_DEVICE AND NOT PICO_NO_FLASH AND NOT PICO_COPY_TO_RAM)
+    pico_set_linker_script(${MICROPY_TARGET} ${MICROPY_BOARD_LINKER_SCRIPT})
+endif()
+
 pico_add_extra_outputs(${MICROPY_TARGET})
 
 pico_find_compiler_with_triples(PICO_COMPILER_SIZE "${PICO_GCC_TRIPLE}" size)

From 5e965618beb24927091a897e9cc81241d22d89ad Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 18 Jun 2025 07:21:36 +1000
Subject: [PATCH 2390/3129] tests/run-tests.py: Add support for ctrl keys in
 REPL tests.

This allows having {\xDD} in tests, which will be expanded to the given
hex character.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 tests/run-tests.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 5eebc72460acf..628fde9d30a4c 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -405,6 +405,10 @@ def get(required=False):
                                     return rv
 
                     def send_get(what):
+                        # Detect {\x00} pattern and convert to ctrl-key codes.
+                        ctrl_code = lambda m: bytes([int(m.group(1))])
+                        what = re.sub(rb'{\\x(\d\d)}', ctrl_code, what)
+
                         os.write(master, what)
                         return get()
 

From 8eb56369967382b6644fa56b98acbff2e77a66a3 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 19 Jun 2025 14:10:57 +1000
Subject: [PATCH 2391/3129] tests/cmdline: Add a test for REPL paste mode.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 pyproject.toml                  |   1 +
 tests/cmdline/repl_paste.py     |  90 +++++++++++++++++++++
 tests/cmdline/repl_paste.py.exp | 133 ++++++++++++++++++++++++++++++++
 3 files changed, 224 insertions(+)
 create mode 100644 tests/cmdline/repl_paste.py
 create mode 100644 tests/cmdline/repl_paste.py.exp

diff --git a/pyproject.toml b/pyproject.toml
index 263b120d3fea4..556dfdaeeaee5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,6 +33,7 @@ exclude = [  # Ruff finds Python SyntaxError in these files
   "tests/cmdline/repl_basic.py",
   "tests/cmdline/repl_cont.py",
   "tests/cmdline/repl_emacs_keys.py",
+  "tests/cmdline/repl_paste.py",
   "tests/cmdline/repl_words_move.py",
   "tests/feature_check/repl_emacs_check.py",
   "tests/feature_check/repl_words_move_check.py",
diff --git a/tests/cmdline/repl_paste.py b/tests/cmdline/repl_paste.py
new file mode 100644
index 0000000000000..7cec450fce7bf
--- /dev/null
+++ b/tests/cmdline/repl_paste.py
@@ -0,0 +1,90 @@
+# Test REPL paste mode functionality
+
+# Basic paste mode with a simple function
+{\x05}
+def hello():
+    print('Hello from paste mode!')
+hello()
+{\x04}
+
+# Paste mode with multiple indentation levels
+{\x05}
+def calculate(n):
+    if n > 0:
+        for i in range(n):
+            if i % 2 == 0:
+                print(f'Even: {i}')
+            else:
+                print(f'Odd: {i}')
+    else:
+        print('n must be positive')
+
+calculate(5)
+{\x04}
+
+# Paste mode with blank lines
+{\x05}
+def function_with_blanks():
+    print('First line')
+    
+    print('After blank line')
+    
+    
+    print('After two blank lines')
+
+function_with_blanks()
+{\x04}
+
+# Paste mode with class definition and multiple methods
+{\x05}
+class TestClass:
+    def __init__(self, value):
+        self.value = value
+    
+    def display(self):
+        print(f'Value is: {self.value}')
+    
+    def double(self):
+        self.value *= 2
+        return self.value
+
+obj = TestClass(21)
+obj.display()
+print(f'Doubled: {obj.double()}')
+obj.display()
+{\x04}
+
+# Paste mode with exception handling
+{\x05}
+try:
+    x = 1 / 0
+except ZeroDivisionError:
+    print('Caught division by zero')
+finally:
+    print('Finally block executed')
+{\x04}
+
+# Cancel paste mode with Ctrl-C
+{\x05}
+print('This should not execute')
+{\x03}
+
+# Normal REPL still works after cancelled paste
+print('Back to normal REPL')
+
+# Paste mode with syntax error
+{\x05}
+def bad_syntax(:
+    print('Missing parameter')
+{\x04}
+
+# Paste mode with runtime error
+{\x05}
+def will_error():
+    undefined_variable
+    
+will_error()
+{\x04}
+
+# Final test to show REPL is still functioning
+1 + 2 + 3
diff --git a/tests/cmdline/repl_paste.py.exp b/tests/cmdline/repl_paste.py.exp
new file mode 100644
index 0000000000000..22d9bd574006a
--- /dev/null
+++ b/tests/cmdline/repl_paste.py.exp
@@ -0,0 +1,133 @@
+MicroPython \.\+ version
+Use Ctrl-D to exit, Ctrl-E for paste mode
+>>> # Test REPL paste mode functionality
+>>> 
+>>> # Basic paste mode with a simple function
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== def hello():
+===     print('Hello from paste mode!')
+=== hello()
+=== 
+Hello from paste mode!
+>>> 
+>>> # Paste mode with multiple indentation levels
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== def calculate(n):
+===     if n > 0:
+===         for i in range(n):
+===             if i % 2 == 0:
+===                 print(f'Even: {i}')
+===             else:
+===                 print(f'Odd: {i}')
+===     else:
+===         print('n must be positive')
+=== 
+=== calculate(5)
+=== 
+Even: 0
+Odd: 1
+Even: 2
+Odd: 3
+Even: 4
+>>> 
+>>> # Paste mode with blank lines
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== def function_with_blanks():
+===     print('First line')
+===     
+===     print('After blank line')
+===     
+===     
+===     print('After two blank lines')
+=== 
+=== function_with_blanks()
+=== 
+First line
+After blank line
+After two blank lines
+>>> 
+>>> # Paste mode with class definition and multiple methods
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== class TestClass:
+===     def __init__(self, value):
+===         self.value = value
+===     
+===     def display(self):
+===         print(f'Value is: {self.value}')
+===     
+===     def double(self):
+===         self.value *= 2
+===         return self.value
+=== 
+=== obj = TestClass(21)
+=== obj.display()
+=== print(f'Doubled: {obj.double()}')
+=== obj.display()
+=== 
+Value is: 21
+Doubled: 42
+Value is: 42
+>>> 
+>>> # Paste mode with exception handling
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== try:
+===     x = 1 / 0
+=== except ZeroDivisionError:
+===     print('Caught division by zero')
+=== finally:
+===     print('Finally block executed')
+=== 
+Caught division by zero
+Finally block executed
+>>> 
+>>> # Cancel paste mode with Ctrl-C
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== print('This should not execute')
+=== 
+>>> 
+>>> 
+>>> # Normal REPL still works after cancelled paste
+>>> print('Back to normal REPL')
+Back to normal REPL
+>>> 
+>>> # Paste mode with syntax error
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== def bad_syntax(:
+===     print('Missing parameter')
+=== 
+Traceback (most recent call last):
+  File "<stdin>", line 2
+SyntaxError: invalid syntax
+>>> 
+>>> # Paste mode with runtime error
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== def will_error():
+===     undefined_variable
+===     
+=== will_error()
+=== 
+Traceback (most recent call last):
+  File "<stdin>", line 5, in <module>
+  File "<stdin>", line 3, in will_error
+NameError: name 'undefined_variable' isn't defined
+>>> 
+>>> # Final test to show REPL is still functioning
+>>> 1 + 2 + 3
+6
+>>> 

From 09541b78963d6aff334b143c3247271a939d54fa Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 26 Mar 2025 11:29:54 +1100
Subject: [PATCH 2392/3129] py/repl: Skip private variables when printing tab
 completion options.

Any '_' variables/functions in frozen modules are currently printed, when
they shouldn't be.  That's due to underscore names possibly existing
between the start and end qstrs which are used to print the auto-complete
matches.  The underscore names should be skipped when iterating between the
two boundary qstrs.

The underscore attributes are removed from the extra coverage exp file
because tab completing "import <tab>" no longer lists modules beginning
with an underscore.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 py/repl.c                                     |  4 ++
 pyproject.toml                                |  1 +
 tests/cmdline/repl_autocomplete_underscore.py | 33 +++++++++++++++
 .../repl_autocomplete_underscore.py.exp       | 41 +++++++++++++++++++
 tests/ports/unix/extra_coverage.py.exp        | 20 ++++-----
 5 files changed, 89 insertions(+), 10 deletions(-)
 create mode 100644 tests/cmdline/repl_autocomplete_underscore.py
 create mode 100644 tests/cmdline/repl_autocomplete_underscore.py.exp

diff --git a/py/repl.c b/py/repl.c
index 87c171cc87283..b0ccfa383af3d 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -218,6 +218,10 @@ static void print_completions(const mp_print_t *print,
     for (qstr q = q_first; q <= q_last; ++q) {
         size_t d_len;
         const char *d_str = (const char *)qstr_data(q, &d_len);
+        // 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)) {
                 int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
diff --git a/pyproject.toml b/pyproject.toml
index 556dfdaeeaee5..0dd15d06c7bcc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,6 +29,7 @@ target-version = "py37"
 [tool.ruff.lint]
 exclude = [  # Ruff finds Python SyntaxError in these files
   "tests/cmdline/repl_autocomplete.py",
+  "tests/cmdline/repl_autocomplete_underscore.py",
   "tests/cmdline/repl_autoindent.py",
   "tests/cmdline/repl_basic.py",
   "tests/cmdline/repl_cont.py",
diff --git a/tests/cmdline/repl_autocomplete_underscore.py b/tests/cmdline/repl_autocomplete_underscore.py
new file mode 100644
index 0000000000000..98bbb699200d3
--- /dev/null
+++ b/tests/cmdline/repl_autocomplete_underscore.py
@@ -0,0 +1,33 @@
+# Test REPL autocompletion filtering of underscore attributes
+
+# Start paste mode
+{\x05}
+class TestClass:
+    def __init__(self):
+        self.public_attr = 1
+        self._private_attr = 2
+        self.__very_private = 3
+    
+    def public_method(self):
+        pass
+    
+    def _private_method(self):
+        pass
+    
+    @property
+    def public_property(self):
+        return 42
+    
+    @property  
+    def _private_property(self):
+        return 99
+
+{\x04}
+# Paste executed
+
+# Create an instance
+obj = TestClass()
+
+# Test tab completion on the instance
+# The tab character after `obj.` and 'a' below triggers the completions
+obj.{\x09}{\x09}a{\x09}
diff --git a/tests/cmdline/repl_autocomplete_underscore.py.exp b/tests/cmdline/repl_autocomplete_underscore.py.exp
new file mode 100644
index 0000000000000..35617554f57b7
--- /dev/null
+++ b/tests/cmdline/repl_autocomplete_underscore.py.exp
@@ -0,0 +1,41 @@
+MicroPython \.\+ version
+Use Ctrl-D to exit, Ctrl-E for paste mode
+>>> # Test REPL autocompletion filtering of underscore attributes
+>>> 
+>>> # Start paste mode
+>>> 
+paste mode; Ctrl-C to cancel, Ctrl-D to finish
+=== 
+=== class TestClass:
+===     def __init__(self):
+===         self.public_attr = 1
+===         self._private_attr = 2
+===         self.__very_private = 3
+===     
+===     def public_method(self):
+===         pass
+===     
+===     def _private_method(self):
+===         pass
+===     
+===     @property
+===     def public_property(self):
+===         return 42
+===     
+===     @property  
+===     def _private_property(self):
+===         return 99
+=== 
+=== 
+>>> # Paste executed
+>>> 
+>>> # Create an instance
+>>> obj = TestClass()
+>>> 
+>>> # Test tab completion on the instance
+>>> # The tab character after `obj.` and 'a' below triggers the completions
+>>> obj.public_
+public_attr     public_method   public_property
+>>> obj.public_attr
+1
+>>> 
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 3775036bb37e1..ac64edde6925b 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -51,16 +51,16 @@ RuntimeError:
 ame__
 port 
 
-builtins        micropython     _asyncio        _thread
-array           binascii        btree           cexample
-cmath           collections     cppexample      cryptolib
-deflate         errno           example_package
-ffi             framebuf        gc              hashlib
-heapq           io              json            machine
-marshal         math            os              platform
-random          re              select          socket
-struct          sys             termios         time
-tls             uctypes         vfs             websocket
+builtins        micropython     array           binascii
+btree           cexample        cmath           collections
+cppexample      cryptolib       deflate         errno
+example_package                 ffi             framebuf
+gc              hashlib         heapq           io
+json            machine         marshal         math
+os              platform        random          re
+select          socket          struct          sys
+termios         time            tls             uctypes
+vfs             websocket
 me
 
 micropython     machine         marshal         math

From 32e69f7fdb31781b2b57c260db9ee4cbb70c1bf3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 19 Jun 2025 15:12:49 +0200
Subject: [PATCH 2393/3129] samd/boards: Change the SparkFun vendor name to
 SparkFun.

Only the board.json files are affected. No other file uses the
style "Sparkfun". The documentation is fine.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json      | 2 +-
 ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json
index b7ccac725d4f5..789bd97730357 100644
--- a/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json
+++ b/ports/samd/boards/SPARKFUN_REDBOARD_TURBO/board.json
@@ -17,5 +17,5 @@
     "product": "SparkFun RedBoard Turbo",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/14812",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }
diff --git a/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json
index b2e6553b2d2e1..e5c5411a0c3f4 100644
--- a/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json
+++ b/ports/samd/boards/SPARKFUN_SAMD21_DEV_BREAKOUT/board.json
@@ -15,5 +15,5 @@
     "product": "SparkFun SAMD21 Dev Breakout",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/13672",
-    "vendor": "Sparkfun"
+    "vendor": "SparkFun"
 }

From 41fc3e1505fff31e79d60c17b29a790b46c3af6b Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Mon, 16 Jun 2025 22:04:56 +0530
Subject: [PATCH 2394/3129] zephyr/boards/beagleconnect_freedom: Enable
 networking.

Having both PWM and networking enabled now works fine. So enable subg
networking.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 ports/zephyr/boards/beagleconnect_freedom.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/zephyr/boards/beagleconnect_freedom.conf b/ports/zephyr/boards/beagleconnect_freedom.conf
index 8fe2583205b39..e31e09444fb1b 100644
--- a/ports/zephyr/boards/beagleconnect_freedom.conf
+++ b/ports/zephyr/boards/beagleconnect_freedom.conf
@@ -7,3 +7,13 @@ CONFIG_SPI=y
 # Flash drivers
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
+
+# Networking
+CONFIG_BT=n
+CONFIG_NET_IPV4=n
+CONFIG_NET_CONFIG_NEED_IPV6=y
+CONFIG_NET_CONFIG_NEED_IPV4=n
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_L2_IEEE802154=y
+CONFIG_NET_DHCPV4=n
+CONFIG_NET_CONFIG_IEEE802154_CHANNEL=1

From 35f15cfdf2a04a0ad290d70383fc3e4be4f79812 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Mon, 16 Jun 2025 22:05:35 +0530
Subject: [PATCH 2395/3129] zephyr/boards/beagleconnect_freedom: Remove board
 overlay.

Since MicroPython supports Zephyr v4.0.0, no need for overlay to enable
PWM.  It is enabled by default for a while now.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 .../boards/beagleconnect_freedom.overlay      | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 ports/zephyr/boards/beagleconnect_freedom.overlay

diff --git a/ports/zephyr/boards/beagleconnect_freedom.overlay b/ports/zephyr/boards/beagleconnect_freedom.overlay
deleted file mode 100644
index 7dd4469c99247..0000000000000
--- a/ports/zephyr/boards/beagleconnect_freedom.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Ayush Singh <ayush@beagleboard.org>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&pinctrl {
-	/* MB1 PWM */
-	pwm0_default: pwm0_default {
-		pinmux = <17 IOC_PORT_MCU_PORT_EVENT1>;
-		bias-disable;
-		drive-strength = <2>;
-	};
-
-	/* MB2 PWM */
-	pwm1_default: pwm1_default {
-		pinmux = <19 IOC_PORT_MCU_PORT_EVENT3>;
-		bias-disable;
-		drive-strength = <2>;
-	};
-};
-
-&gpt0 {
-	status = "okay";
-};
-
-&gpt1 {
-	status = "okay";
-};
-
-&pwm0 {
-	status = "okay";
-	pinctrl-0 = <&pwm0_default>;
-	pinctrl-names = "default";
-};
-
-&pwm1 {
-	status = "okay";
-	pinctrl-0 = <&pwm1_default>;
-	pinctrl-names = "default";
-};

From 66c01480226aaf880a9d6e88340772bd53bc0421 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Tue, 20 May 2025 15:57:11 +0200
Subject: [PATCH 2396/3129] py/runtime: Add support for using __all__ in star
 import.

When the symbol `__all__` is defined in a module, `mp_import_all()` should
import all listed symbols into the global environment, rather than relying
on the underscore-is-private default.  This is the standard in CPython.

Each item is loaded in the same way as if it would be an explicit import
statement, and will invoke the module's `__getattr__` function if needed.
This provides a straightforward solution for fixing star import of modules
using a dynamic loader, such as `extmod/asyncio` (see issue #7266).

This improvement has been enabled at BASIC_FEATURES level, to avoid
impacting devices with limited ressources, for which star import is of
little use anyway.

Additionally, detailled reporting of errors during `__all__` import has
been implemented to match CPython, but this is only enabled when
ERROR_REPORTING is set to MICROPY_ERROR_REPORTING_DETAILED.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 py/mpconfig.h                              |  5 ++
 py/runtime.c                               | 35 ++++++++++++-
 tests/cpydiff/core_import_all.py           | 10 ----
 tests/cpydiff/modules3/__init__.py         |  1 -
 tests/cpydiff/modules3/foo.py              |  2 -
 tests/import/import_star.py                | 59 ++++++++++++++++++++++
 tests/import/pkgstar_all_array/__init__.py | 49 ++++++++++++++++++
 tests/import/pkgstar_all_array/funcs.py    |  2 +
 tests/import/pkgstar_all_inval/__init__.py |  1 +
 tests/import/pkgstar_all_miss/__init__.py  |  8 +++
 tests/import/pkgstar_all_tuple/__init__.py | 22 ++++++++
 tests/import/pkgstar_default/__init__.py   | 20 ++++++++
 12 files changed, 200 insertions(+), 14 deletions(-)
 delete mode 100644 tests/cpydiff/core_import_all.py
 delete mode 100644 tests/cpydiff/modules3/__init__.py
 delete mode 100644 tests/cpydiff/modules3/foo.py
 create mode 100644 tests/import/import_star.py
 create mode 100644 tests/import/pkgstar_all_array/__init__.py
 create mode 100644 tests/import/pkgstar_all_array/funcs.py
 create mode 100644 tests/import/pkgstar_all_inval/__init__.py
 create mode 100644 tests/import/pkgstar_all_miss/__init__.py
 create mode 100644 tests/import/pkgstar_all_tuple/__init__.py
 create mode 100644 tests/import/pkgstar_default/__init__.py

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 01712bd5b4d90..94b84530037e5 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1323,6 +1323,11 @@ typedef double mp_float_t;
 #define MICROPY_PY___FILE__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Whether to process __all__ when importing all public symbols from module
+#ifndef MICROPY_MODULE___ALL__
+#define MICROPY_MODULE___ALL__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
+#endif
+
 // Whether to provide mem-info related functions in micropython module
 #ifndef MICROPY_PY_MICROPYTHON_MEM_INFO
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/runtime.c b/py/runtime.c
index 7979e520da481..90587a010a460 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1247,6 +1247,19 @@ void mp_load_method(mp_obj_t base, qstr attr, mp_obj_t *dest) {
             mp_raise_msg_varg(&mp_type_AttributeError,
                 MP_ERROR_TEXT("type object '%q' has no attribute '%q'"),
                 ((mp_obj_type_t *)MP_OBJ_TO_PTR(base))->name, attr);
+        #if MICROPY_MODULE___ALL__ && MICROPY_ERROR_REPORTING >= MICROPY_ERROR_REPORTING_DETAILED
+        } else if (mp_obj_is_type(base, &mp_type_module)) {
+            // report errors in __all__ as done by CPython
+            mp_obj_t dest_name[2];
+            qstr module_name = MP_QSTR_;
+            mp_load_method_maybe(base, MP_QSTR___name__, dest_name);
+            if (mp_obj_is_qstr(dest_name[0])) {
+                module_name = mp_obj_str_get_qstr(dest_name[0]);
+            }
+            mp_raise_msg_varg(&mp_type_AttributeError,
+                MP_ERROR_TEXT("module '%q' has no attribute '%q'"),
+                module_name, attr);
+        #endif
         } else {
             mp_raise_msg_varg(&mp_type_AttributeError,
                 MP_ERROR_TEXT("'%s' object has no attribute '%q'"),
@@ -1593,8 +1606,28 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name) {
 void mp_import_all(mp_obj_t module) {
     DEBUG_printf("import all %p\n", module);
 
-    // TODO: Support __all__
     mp_map_t *map = &mp_obj_module_get_globals(module)->map;
+
+    #if MICROPY_MODULE___ALL__
+    mp_map_elem_t *elem = mp_map_lookup(map, MP_OBJ_NEW_QSTR(MP_QSTR___all__), MP_MAP_LOOKUP);
+    if (elem != NULL) {
+        // When __all__ is defined, we must explicitly load all specified
+        // symbols, possibly invoking the module __getattr__ function
+        size_t len;
+        mp_obj_t *items;
+        mp_obj_get_array(elem->value, &len, &items);
+        for (size_t i = 0; i < len; i++) {
+            qstr qname = mp_obj_str_get_qstr(items[i]);
+            mp_obj_t dest[2];
+            mp_load_method(module, qname, dest);
+            mp_store_name(qname, dest[0]);
+        }
+        return;
+    }
+    #endif
+
+    // By default, the set of public names includes all names found in the module's
+    // namespace which do not begin with an underscore character ('_')
     for (size_t i = 0; i < map->alloc; i++) {
         if (mp_map_slot_is_filled(map, i)) {
             // Entry in module global scope may be generated programmatically
diff --git a/tests/cpydiff/core_import_all.py b/tests/cpydiff/core_import_all.py
deleted file mode 100644
index 0fbe9d4d4ecd6..0000000000000
--- a/tests/cpydiff/core_import_all.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""
-categories: Core,import
-description: __all__ is unsupported in __init__.py in MicroPython.
-cause: Not implemented.
-workaround: Manually import the sub-modules directly in __init__.py using ``from . import foo, bar``.
-"""
-
-from modules3 import *
-
-foo.hello()
diff --git a/tests/cpydiff/modules3/__init__.py b/tests/cpydiff/modules3/__init__.py
deleted file mode 100644
index 27a2bf2ad9044..0000000000000
--- a/tests/cpydiff/modules3/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = ["foo"]
diff --git a/tests/cpydiff/modules3/foo.py b/tests/cpydiff/modules3/foo.py
deleted file mode 100644
index dd9b9d4ddd4c4..0000000000000
--- a/tests/cpydiff/modules3/foo.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def hello():
-    print("hello")
diff --git a/tests/import/import_star.py b/tests/import/import_star.py
new file mode 100644
index 0000000000000..0947f6a835db1
--- /dev/null
+++ b/tests/import/import_star.py
@@ -0,0 +1,59 @@
+# test `from package import *` conventions, including __all__ support
+#
+# This test requires MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES
+
+try:
+    next(iter([]), 42)
+except TypeError:
+    # 2-argument version of next() not supported
+    # we are probably not at MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES
+    print('SKIP')
+    raise SystemExit
+
+# 1. test default visibility
+from pkgstar_default import *
+
+print('visibleFun' in globals())
+print('VisibleClass' in globals())
+print('_hiddenFun' in globals())
+print('_HiddenClass' in globals())
+print(visibleFun())
+
+# 2. test explicit visibility as defined by __all__ (as an array)
+from pkgstar_all_array import *
+
+print('publicFun' in globals())
+print('PublicClass' in globals())
+print('unlistedFun' in globals())
+print('UnlistedClass' in globals())
+print('_privateFun' in globals())
+print('_PrivateClass' in globals())
+print(publicFun())
+# test dynamic import as used in asyncio
+print('dynamicFun' in globals())
+print(dynamicFun())
+
+# 3. test explicit visibility as defined by __all__ (as an tuple)
+from pkgstar_all_tuple import *
+
+print('publicFun2' in globals())
+print('PublicClass2' in globals())
+print('unlistedFun2' in globals())
+print('UnlistedClass2' in globals())
+print(publicFun2())
+
+# 4. test reporting of missing entries in __all__
+try:
+    from pkgstar_all_miss import *
+
+    print("missed detection of incorrect __all__ definition")
+except AttributeError as er:
+    print("AttributeError triggered for bad __all__ definition")
+
+# 5. test reporting of invalid __all__ definition
+try:
+    from pkgstar_all_inval import *
+
+    print("missed detection of incorrect __all__ definition")
+except TypeError as er:
+    print("TypeError triggered for bad __all__ definition")
diff --git a/tests/import/pkgstar_all_array/__init__.py b/tests/import/pkgstar_all_array/__init__.py
new file mode 100644
index 0000000000000..4499a94d59181
--- /dev/null
+++ b/tests/import/pkgstar_all_array/__init__.py
@@ -0,0 +1,49 @@
+__all__ = ['publicFun', 'PublicClass', 'dynamicFun']
+
+
+# Definitions below should always be imported by a star import
+def publicFun():
+    return 1
+
+
+class PublicClass:
+    def __init__(self):
+        self._val = 1
+
+
+# If __all__ support is enabled, definitions below
+# should not be imported by a star import
+def unlistedFun():
+    return 0
+
+
+class UnlistedClass:
+    def __init__(self):
+        self._val = 0
+
+
+# Definitions below should be not be imported by a star import
+# (they start with an underscore, and are not listed in __all__)
+def _privateFun():
+    return -1
+
+
+class _PrivateClass:
+    def __init__(self):
+        self._val = -1
+
+
+# Test lazy loaded function, as used by extmod/asyncio:
+# Works with a star import only if __all__ support is enabled
+_attrs = {
+    "dynamicFun": "funcs",
+}
+
+
+def __getattr__(attr):
+    mod = _attrs.get(attr, None)
+    if mod is None:
+        raise AttributeError(attr)
+    value = getattr(__import__(mod, globals(), locals(), True, 1), attr)
+    globals()[attr] = value
+    return value
diff --git a/tests/import/pkgstar_all_array/funcs.py b/tests/import/pkgstar_all_array/funcs.py
new file mode 100644
index 0000000000000..7540d70f66bce
--- /dev/null
+++ b/tests/import/pkgstar_all_array/funcs.py
@@ -0,0 +1,2 @@
+def dynamicFun():
+    return 777
diff --git a/tests/import/pkgstar_all_inval/__init__.py b/tests/import/pkgstar_all_inval/__init__.py
new file mode 100644
index 0000000000000..7022476c19be8
--- /dev/null
+++ b/tests/import/pkgstar_all_inval/__init__.py
@@ -0,0 +1 @@
+__all__ = 42
diff --git a/tests/import/pkgstar_all_miss/__init__.py b/tests/import/pkgstar_all_miss/__init__.py
new file mode 100644
index 0000000000000..d960c7d0e29f5
--- /dev/null
+++ b/tests/import/pkgstar_all_miss/__init__.py
@@ -0,0 +1,8 @@
+__all__ = ('existingFun', 'missingFun')
+
+
+def existingFun():
+    return None
+
+
+# missingFun is not defined, should raise an error on import
diff --git a/tests/import/pkgstar_all_tuple/__init__.py b/tests/import/pkgstar_all_tuple/__init__.py
new file mode 100644
index 0000000000000..a97715ed3918d
--- /dev/null
+++ b/tests/import/pkgstar_all_tuple/__init__.py
@@ -0,0 +1,22 @@
+__all__ = ('publicFun2', 'PublicClass2')
+
+
+# Definitions below should always be imported by a star import
+def publicFun2():
+    return 2
+
+
+class PublicClass2:
+    def __init__(self):
+        self._val = 2
+
+
+# If __all__ support is enabled, definitions below
+# should not be imported by a star import
+def unlistedFun2():
+    return 0
+
+
+class UnlistedClass2:
+    def __init__(self):
+        self._val = 0
diff --git a/tests/import/pkgstar_default/__init__.py b/tests/import/pkgstar_default/__init__.py
new file mode 100644
index 0000000000000..4947e4ce7f180
--- /dev/null
+++ b/tests/import/pkgstar_default/__init__.py
@@ -0,0 +1,20 @@
+# When __all__ is undefined, star import should only
+# show objects that do not start with an underscore
+
+
+def visibleFun():
+    return 42
+
+
+class VisibleClass:
+    def __init__(self):
+        self._val = 42
+
+
+def _hiddenFun():
+    return -1
+
+
+class _HiddenClass:
+    def __init__(self):
+        self._val = -1

From e57aa7e70a326659529d02891abb9a57b055fc0c Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Thu, 19 Jun 2025 15:47:13 +0200
Subject: [PATCH 2397/3129] py/obj: Fix nan handling in object REPR_C and
 REPR_D.

CPython math.nan is positive with regards to copysign.  The signaling bit
(aka sign flag) was incorrectly set.

In addition, REPR_C and REPR_D should only use the _true_ nan to prevent
system crash in case of hand-crafted floats.  For instance, with REPR_C,
any nan-like float following the pattern
`01111111 1xxxxxxx xxxxxxxx xxxxx1xx` would be switched to an immediate
object or a qstr string.  When the qstr index is too large, this would
cause a crash.

This commit fixes the issue, and adds the relevant test cases.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 ports/windows/mpconfigport.h        |  5 +++++
 py/modmath.c                        |  5 +++++
 py/obj.h                            | 20 +++++++++++++++++---
 tests/float/float_array.py          |  8 +++++++-
 tests/float/math_constants_extra.py |  3 +++
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 6e32d5fe5ebdf..4e140d5edb7d0 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -266,6 +266,11 @@ typedef long mp_off_t;
 #endif
 #endif
 
+// VC++ 2017 fixes
+#if (_MSC_VER < 1920)
+#define MICROPY_PY_MATH_COPYSIGN_FIX_NAN (1)
+#endif
+
 // CL specific definitions
 
 #ifndef __cplusplus
diff --git a/py/modmath.c b/py/modmath.c
index b792d8581d062..919a8ccd9d3c0 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -161,6 +161,11 @@ MATH_FUN_2(atan2, atan2)
 MATH_FUN_1_TO_INT(ceil, ceil)
 // copysign(x, y)
 static mp_float_t MICROPY_FLOAT_C_FUN(copysign_func)(mp_float_t x, mp_float_t y) {
+    #if MICROPY_PY_MATH_COPYSIGN_FIX_NAN
+    if (isnan(y)) {
+        y = 0.0;
+    }
+    #endif
     return MICROPY_FLOAT_C_FUN(copysign)(x, y);
 }
 MATH_FUN_2(copysign, copysign_func)
diff --git a/py/obj.h b/py/obj.h
index 07362522474d6..0f87282a9f40b 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -184,13 +184,15 @@ static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
 #define MP_OBJ_NEW_SMALL_INT(small_int) ((mp_obj_t)((((mp_uint_t)(small_int)) << 1) | 1))
 
 #if MICROPY_PY_BUILTINS_FLOAT
-#define MP_OBJ_NEW_CONST_FLOAT(f) MP_ROM_PTR((mp_obj_t)((((((uint64_t)f) & ~3) | 2) + 0x80800000) & 0xffffffff))
+#include <math.h>
+// note: MP_OBJ_NEW_CONST_FLOAT should be a MP_ROM_PTR but that macro isn't available yet
+#define MP_OBJ_NEW_CONST_FLOAT(f) ((mp_obj_t)((((((uint64_t)f) & ~3) | 2) + 0x80800000) & 0xffffffff))
 #define mp_const_float_e  MP_OBJ_NEW_CONST_FLOAT(0x402df854)
 #define mp_const_float_pi MP_OBJ_NEW_CONST_FLOAT(0x40490fdb)
+#define mp_const_float_nan MP_OBJ_NEW_CONST_FLOAT(0x7fc00000)
 #if MICROPY_PY_MATH_CONSTANTS
 #define mp_const_float_tau MP_OBJ_NEW_CONST_FLOAT(0x40c90fdb)
 #define mp_const_float_inf MP_OBJ_NEW_CONST_FLOAT(0x7f800000)
-#define mp_const_float_nan MP_OBJ_NEW_CONST_FLOAT(0xffc00000)
 #endif
 
 static inline bool mp_obj_is_float(mp_const_obj_t o) {
@@ -207,6 +209,10 @@ static inline mp_float_t mp_obj_float_get(mp_const_obj_t o) {
     return num.f;
 }
 static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
+    if (isnan(f)) {
+        // prevent creation of bad nanboxed pointers via array.array or struct
+        return mp_const_float_nan;
+    }
     union {
         mp_float_t f;
         mp_uint_t u;
@@ -257,12 +263,13 @@ static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
 #error MICROPY_OBJ_REPR_D requires MICROPY_FLOAT_IMPL_DOUBLE
 #endif
 
+#include <math.h>
 #define mp_const_float_e {((mp_obj_t)((uint64_t)0x4005bf0a8b145769 + 0x8004000000000000))}
 #define mp_const_float_pi {((mp_obj_t)((uint64_t)0x400921fb54442d18 + 0x8004000000000000))}
+#define mp_const_float_nan {((mp_obj_t)((uint64_t)0x7ff8000000000000 + 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) {
@@ -276,6 +283,13 @@ static inline mp_float_t mp_obj_float_get(mp_const_obj_t o) {
     return num.f;
 }
 static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
+    if (isnan(f)) {
+        // prevent creation of bad nanboxed pointers via array.array or struct
+        struct {
+            uint64_t r;
+        } num = mp_const_float_nan;
+        return num.r;
+    }
     union {
         mp_float_t f;
         uint64_t r;
diff --git a/tests/float/float_array.py b/tests/float/float_array.py
index 3d128da83819f..cfff3b220c657 100644
--- a/tests/float/float_array.py
+++ b/tests/float/float_array.py
@@ -19,4 +19,10 @@ def test(a):
 test(array("f"))
 test(array("d"))
 
-print("{:.4f}".format(array("f", bytes(array("I", [0x3DCCCCCC])))[0]))
+# hand-crafted floats, including non-standard nan
+for float_hex in (0x3DCCCCCC, 0x7F800024, 0x7FC00004):
+    f = array("f", bytes(array("I", [float_hex])))[0]
+    if type(f) is float:
+        print("{:.4e}".format(f))
+    else:
+        print(f)
diff --git a/tests/float/math_constants_extra.py b/tests/float/math_constants_extra.py
index dea49aef5a732..756cb45803696 100644
--- a/tests/float/math_constants_extra.py
+++ b/tests/float/math_constants_extra.py
@@ -9,9 +9,12 @@
     raise SystemExit
 
 print(math.tau == 2.0 * math.pi)
+print(math.copysign(1.0, math.tau))
 
 print(math.inf == float("inf"))
 print(-math.inf == -float("inf"))
+print(math.copysign(1.0, math.inf))
 
 print(isnan(math.nan))
 print(isnan(-math.nan))
+print(math.copysign(1.0, math.nan))

From 6fee099cae58644ea49ca0f470e9cb00a7da8f29 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 14 Jun 2025 22:22:30 +1000
Subject: [PATCH 2398/3129] py/misc: Fix fallback implementation of
 mp_popcount.

Tested using gcc 7.3.1 which does not have the popcount built-in and uses
this fallback version.  Without the fix, mpy-cross produces mpy files with
corrupt RISC-V machine code.  With the fix, mpy-cross output is correct.

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 49f2f87111157..1cf582456c010 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -390,7 +390,7 @@ static inline uint32_t mp_popcount(uint32_t x) {
     x = x - ((x >> 1) & 0x55555555);
     x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
     x = (x + (x >> 4)) & 0x0F0F0F0F;
-    return x * 0x01010101;
+    return (x * 0x01010101) >> 24;
 }
 #endif
 #endif

From b4b7c0a0033b128b488dae99251e7492fbb24008 Mon Sep 17 00:00:00 2001
From: Garatronic <fpierson@garatronic.fr>
Date: Thu, 29 May 2025 09:51:51 +0200
Subject: [PATCH 2399/3129] esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3: Add
 pybstick26-esp32c3 defn.

---
 .../GARATRONIC_PYBSTICK26_ESP32C3/board.json  | 23 +++++++++++++++++++
 .../mpconfigboard.cmake                       |  7 ++++++
 .../mpconfigboard.h                           | 10 ++++++++
 .../GARATRONIC_PYBSTICK26_ESP32C3/pins.csv    | 13 +++++++++++
 .../sdkconfig.board                           |  4 ++++
 5 files changed, 57 insertions(+)
 create mode 100644 ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/board.json
 create mode 100644 ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/pins.csv
 create mode 100644 ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/sdkconfig.board

diff --git a/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/board.json b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/board.json
new file mode 100644
index 0000000000000..d2ada7cccd97f
--- /dev/null
+++ b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy_nativeusb.md"
+    ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
+    "docs": "",
+    "features": [
+        "BLE",
+        "External Flash",
+	"RGB LED",
+        "WiFi"
+    ],
+    "images": [
+        "GAR-PYBSTICK26-C3-mUSB-00.JPG"
+    ],
+    "mcu": "esp32c3",
+    "product": "PYBSTICK26_ESP32C3",
+    "thumbnail": "",
+    "url": "https://shop.mchobby.be/fr/pybstick/2505-pybstick26-esp32-c3-micropython-et-arduino-3232100025059.html",
+    "vendor": "McHobby"
+}
diff --git a/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..81cfff1d77b84
--- /dev/null
+++ b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake
@@ -0,0 +1,7 @@
+set(IDF_TARGET esp32c3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/GARATRONIC_PYBSTICK26_ESP32C3/sdkconfig.board
+)
diff --git a/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.h b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.h
new file mode 100644
index 0000000000000..c9796d1f659bb
--- /dev/null
+++ b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME               "PYBSTICK26_ESP32C3"
+#define MICROPY_HW_MCU_NAME                 "ESP32C3"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "pybstick26_esp32c3"
+
+#define MICROPY_HW_I2C0_SCL                 (1)
+#define MICROPY_HW_I2C0_SDA                 (0)
+
+#define MICROPY_HW_SPI1_MOSI                (7)
+#define MICROPY_HW_SPI1_MISO                (2)
+#define MICROPY_HW_SPI1_SCK                 (6)
diff --git a/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/pins.csv b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/pins.csv
new file mode 100644
index 0000000000000..d7866549037d3
--- /dev/null
+++ b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/pins.csv
@@ -0,0 +1,13 @@
+GP0,GPIO0
+GP1,GPIO1
+GP2,GPIO2
+GP3,GPIO3
+GP4,GPIO4
+GP5,GPIO5
+GP6,GPIO6
+GP7,GPIO7
+GP8,GPIO8
+GP9,GPIO9
+GP10,GPIO10
+GP20,GPIO20
+GP21,GPIO21
diff --git a/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/sdkconfig.board b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/sdkconfig.board
new file mode 100644
index 0000000000000..70e5f1f0d195a
--- /dev/null
+++ b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/sdkconfig.board
@@ -0,0 +1,4 @@
+CONFIG_ESP32C3_REV_MIN_3=y
+
+# Workaround for https://github.com/espressif/esp-idf/issues/14456
+CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n

From 0815b454796c198eeed90c0bb5645b8d0e3b9b38 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 23 Jun 2025 09:31:18 +0200
Subject: [PATCH 2400/3129] stm32/boards/ARDUINO_PORTENTA_H7: Free reserved
 timer.

This pin is used for the camera clock on Portenta carrier, and vision
shield but it doesn't need to be reserved.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 90a1469056634..a9ecf38fbfab4 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -30,7 +30,6 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_HW_ENABLE_MMCARD    (0)
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
-#define MICROPY_HW_TIM_IS_RESERVED(id) (id == 1)
 
 // ROMFS config
 #define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI       (1)

From cbe50635e85e7b7966d51fe65626304bd04f4032 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 27 Mar 2025 13:47:31 +0100
Subject: [PATCH 2401/3129] stm32/main: Add support for additional GC blocks.

Add support for defining additional GC blocks via linker scripts.  A board
would need to define `_gc_blocks_table_start` and `_gc_blocks_table_end`
and within that region have pairs of (address, length) for each GC block
to add.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/main.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index e8395013b9188..5e114f562f241 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -521,6 +521,23 @@ void stm32_main(uint32_t reset_mode) {
     // GC init
     gc_init(MICROPY_HEAP_START, MICROPY_HEAP_END);
 
+    // Add additional GC blocks (if enabled).
+    #if MICROPY_GC_SPLIT_HEAP
+    typedef struct {
+        uint8_t *addr;
+        uint32_t size;
+    } gc_blocks_table_t;
+
+    extern const gc_blocks_table_t _gc_blocks_table_start;
+    extern const gc_blocks_table_t _gc_blocks_table_end;
+
+    for (gc_blocks_table_t const *block = &_gc_blocks_table_start; block < &_gc_blocks_table_end; block++) {
+        if (block->size) {
+            gc_add(block->addr, block->addr + block->size);
+        }
+    }
+    #endif
+
     #if MICROPY_ENABLE_PYSTACK
     static mp_obj_t pystack[384];
     mp_pystack_init(pystack, &pystack[384]);

From 5c6da117995ef7f9a7396c4048d3e34f56d73ba4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 27 Mar 2025 13:48:42 +0100
Subject: [PATCH 2402/3129] stm32/boards/ARDUINO_GIGA: Define additional GC
 blocks in SDRAM.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 .../stm32/boards/ARDUINO_GIGA/mpconfigboard.h |  1 +
 ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld  | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index cef45d730cc20..44f6ce66bc495 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -31,6 +31,7 @@ typedef unsigned int mp_uint_t;     // must be pointer size
 #define MICROPY_HW_ENABLE_MMCARD    (0)
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET   (0)
 #define MICROPY_HW_TIM_IS_RESERVED(id) (id == 1)
+#define MICROPY_GC_SPLIT_HEAP       (1)
 
 // ROMFS config
 #define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI       (1)
diff --git a/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld b/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
index e7bb950dbe6ce..dceb1a7489991 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_GIGA/stm32h747.ld
@@ -12,6 +12,7 @@ MEMORY
     SRAM2 (xrw)     : ORIGIN = 0x30020000, LENGTH = 128K    /* SRAM2 D2    */
     SRAM3 (xrw)     : ORIGIN = 0x30040000, LENGTH = 32K     /* SRAM3 D2    */
     SRAM4 (xrw)     : ORIGIN = 0x38000000, LENGTH = 64K     /* SRAM4 D3    */
+    SDRAM (xrw)     : ORIGIN = 0x60000000, LENGTH = 8M      /* SDRAM */
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K   /* Total available flash */
     FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 128K    /* Arduino bootloader */
     FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* filesystem */
@@ -53,3 +54,27 @@ _openamp_shm_region_start = ORIGIN(SRAM4);
 _openamp_shm_region_end = ORIGIN(SRAM4) + LENGTH(SRAM4);
 
 INCLUDE common_blifs.ld
+
+SECTIONS
+{
+    /* GC blocks addresses and sizes */
+    .gc.blocks.table (READONLY) : {
+      . = ALIGN(4);
+      _gc_blocks_table_start = .;
+
+      LONG (ORIGIN(SRAM1));
+      LONG (128K);
+
+      LONG (ORIGIN(SDRAM) + 0M);
+      LONG (2M);
+
+      LONG (ORIGIN(SDRAM) + 2M);
+      LONG (2M);
+
+      LONG (ORIGIN(SDRAM) + 4M);
+      LONG (4M);
+
+      _gc_blocks_table_end = .;
+      . = ALIGN(4);
+    } > FLASH_TEXT
+}

From 2a46759fe83a5295f7c06e2dab37c3f85848800e Mon Sep 17 00:00:00 2001
From: ennyKey <ennyKey@fn.de>
Date: Wed, 4 Dec 2024 22:33:17 +0100
Subject: [PATCH 2403/3129] stm32/uart: Enable UART FIFO for H7 MCUs.

The H7 has a hardware UART FIFO, so it's worth enabling it, to reduce the
chance of missed incoming characters.  Note that `HAL_UART_Init(&huart)`
does not activate the FIFO, it must be done explicitly by calling
`HAL_UARTEx_EnableFifoMode(&huart)`.

Signed-off-by: ennyKey <ennyKey@fn.de>
---
 ports/stm32/Makefile                         |  6 ++++++
 ports/stm32/boards/stm32h7xx_hal_conf_base.h |  1 +
 ports/stm32/uart.c                           | 11 ++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8ac9a8af03d1a..eabbd64a3b112 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -417,6 +417,12 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),h7))
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+    hal_uart_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/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index 670dee383f81f..1953ba020b86d 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -90,6 +90,7 @@
 #include "stm32h7xx_hal_spi.h"
 #include "stm32h7xx_hal_tim.h"
 #include "stm32h7xx_hal_uart.h"
+#include "stm32h7xx_hal_uart_ex.h"
 #include "stm32h7xx_hal_usart.h"
 #include "stm32h7xx_hal_wwdg.h"
 #include "stm32h7xx_ll_adc.h"
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 91db91395eac1..55fa6221422b0 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -653,7 +653,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     huart.Init.HwFlowCtl = flow;
     huart.Init.OverSampling = UART_OVERSAMPLING_16;
 
-    #if defined(STM32G4)  // H7 and WB also have fifo..
+    #if defined(STM32G4) || defined(STM32H7) // WB also has a fifo..
     huart.FifoMode = UART_FIFOMODE_ENABLE;
     #endif
 
@@ -701,6 +701,12 @@ bool uart_init(machine_uart_obj_t *uart_obj,
         uart_obj->char_width = CHAR_WIDTH_8BIT;
     }
 
+    #if defined(STM32H7)
+    HAL_UARTEx_SetTxFifoThreshold(&huart, UART_TXFIFO_THRESHOLD_1_8);
+    HAL_UARTEx_SetRxFifoThreshold(&huart, UART_RXFIFO_THRESHOLD_1_8);
+    HAL_UARTEx_EnableFifoMode(&huart);
+    #endif
+
     uart_obj->mp_irq_trigger = 0;
     uart_obj->mp_irq_obj = NULL;
 
@@ -1141,6 +1147,9 @@ size_t uart_tx_data(machine_uart_obj_t *self, const void *src_in, size_t num_cha
     // timeout_char by FIFO size + 1.
     // STM32G4 has 8 words FIFO.
     timeout = (8 + 1) * self->timeout_char;
+    #elif defined(STM32H7)
+    // STM32H7 has 16 words FIFO.
+    timeout = (16 + 1) * self->timeout_char;
     #else
     // The timeout specified here is for waiting for the TX data register to
     // become empty (ie between chars), as well as for the final char to be

From 2f04381aeb18b11a9973b8bf461bdb5cfd46edc5 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 21 May 2025 11:16:54 +1000
Subject: [PATCH 2404/3129] extmod/modlwip: Fix crash when calling recv on
 listening socket.

Add check to prevent calling recv on a socket in the listening state.  This
prevents a crash/hard fault when user code mistakenly tries to recv on the
listening socket instead of on the accepted connection.

Add corresponding test case to demonstrate the bug.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/modlwip.c                   |  6 +++
 tests/multi_net/tcp_accept_recv.py | 73 ++++++++++++++++++++++++------
 2 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 65a3412ecb801..b53559ed8cfe7 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -825,6 +825,12 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
     // Check for any pending errors
     STREAM_ERROR_CHECK(socket);
 
+    if (socket->state == STATE_LISTENING) {
+        // original socket in listening state, not the accepted connection.
+        *_errno = MP_ENOTCONN;
+        return -1;
+    }
+
     if (socket->incoming.tcp.pbuf == NULL) {
 
         // Non-blocking socket or flag
diff --git a/tests/multi_net/tcp_accept_recv.py b/tests/multi_net/tcp_accept_recv.py
index dee14e3b9774c..4108a6f8a3e9b 100644
--- a/tests/multi_net/tcp_accept_recv.py
+++ b/tests/multi_net/tcp_accept_recv.py
@@ -1,30 +1,73 @@
-# Test recv on socket that just accepted a connection
+# Test recv on listening socket after accept(), with various listen() arguments
 
 import socket
 
 PORT = 8000
 
+# Test cases for listen() function
+LISTEN_ARGS = [None, 0, 1, 2]  # None means no argument
+
 
 # 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()
-    s.accept()
-    try:
-        print("recv", s.recv(10))  # should raise Errno 107 ENOTCONN
-    except OSError as er:
-        print(er.errno in (107, 128))
-    s.close()
+
+    test_num = 0
+    for blocking_mode in [True, False]:
+        for listen_arg in LISTEN_ARGS:
+            test_num += 1
+            s = socket.socket()
+            s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
+
+            # Call listen with or without argument based on test case
+            if listen_arg is None:
+                print(f"Test case {test_num}/8: listen() blocking={blocking_mode}")
+                s.listen()
+            else:
+                print(f"Test case {test_num}/8: listen({listen_arg}) blocking={blocking_mode}")
+                s.listen(listen_arg)
+
+            # Signal client that server is ready
+            multitest.broadcast(f"server_ready_{test_num}")
+
+            # Wait for client connection
+            c, _ = s.accept()
+
+            # Set blocking mode after accept
+            s.setblocking(blocking_mode)
+
+            try:
+                print("recv", s.recv(10))  # should raise Errno 107 ENOTCONN
+            except OSError as er:
+                # Verify the error code is either 107 (ENOTCONN) or 128 (ENOTCONN on Windows)
+                print(er.errno in (107, 128))
+
+            # Cleanup
+            c.close()
+            s.close()
+
+            # Signal client we're done with this test case
+            multitest.broadcast(f"server_done_{test_num}")
 
 
 # Client
 def instance1():
     multitest.next()
-    s = socket.socket()
-    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
-    s.send(b"GET / HTTP/1.0\r\n\r\n")
-    s.close()
+
+    test_num = 0
+    for blocking_mode in [True, False]:
+        for _ in LISTEN_ARGS:
+            test_num += 1
+            # Wait for server to be ready
+            multitest.wait(f"server_ready_{test_num}")
+
+            # Connect to server
+            s = socket.socket()
+            s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+            s.send(b"GET / HTTP/1.0\r\n\r\n")
+            s.close()
+
+            # Wait for server to finish this test case
+            multitest.wait(f"server_done_{test_num}")

From 74a4cce6d1697fce89e7dbd0e846b68b96e534c0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 14 Jun 2025 00:33:08 +1000
Subject: [PATCH 2405/3129] alif/Makefile: Create firmware.zip with files
 needed for deploying.

The resulting `firmware.zip` file is self contained with everything needed
to deploy the firmware, eg over SE UART.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index 68706674365c1..07f87f7f8031c 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -21,6 +21,7 @@ Reset\n\
 Exit
 
 ALIF_TOC_CONFIG = alif_cfg.json
+ALIF_TOC_BIN = $(BUILD)/firmware.toc.bin
 ALIF_TOC_APPS = $(BUILD)/$(ALIF_TOC_CONFIG)
 ALIF_TOC_CFLAGS += -DTOC_CFG_FILE=$(ALIF_TOOLKIT_CFG_FILE)
 
@@ -69,7 +70,7 @@ include $(TOP)/extmod/extmod.mk
 # Main targets
 
 .PHONY: all
-all: $(BUILD)/firmware.toc.bin
+all: $(BUILD)/firmware.zip
 
 # Force make commands to run the targets every time
 # regardless of whether firmware.toc.bin already exists
@@ -90,15 +91,19 @@ $(BUILD)/$(ALIF_TOC_CONFIG): mcu/$(ALIF_TOC_CONFIG).in | $(BUILD)
 	$(ECHO) "Preprocess toc config $@"
 	$(Q)$(CPP) -P -E $(ALIF_TOC_CFLAGS) - < mcu/$(ALIF_TOC_CONFIG).in > $@
 
-$(BUILD)/firmware.toc.bin: $(ALIF_TOC_APPS)
+$(ALIF_TOC_BIN): $(ALIF_TOC_APPS)
 	$(Q)python $(ALIF_TOOLS)/app-gen-toc.py \
 		--filename $(abspath $(BUILD)/$(ALIF_TOC_CONFIG)) \
 		--output-dir $(BUILD) \
 		--firmware-dir $(BUILD) \
 		--output $@
 
+$(BUILD)/firmware.zip: $(ALIF_TOC_BIN) $(ALIF_TOC_APPS)
+	$(ECHO) "Create $@"
+	$(Q)$(ZIP) -q - $(BUILD)/application_package.ds $^ > $@
+
 .PHONY: deploy
-deploy: $(BUILD)/firmware.toc.bin
+deploy: $(ALIF_TOC_BIN)
 	$(ECHO) "Writing $< to the board"
 	$(Q)python $(ALIF_TOOLS)/app-write-mram.py \
 		--cfg-part $(ALIF_TOOLKIT_CFG_PART) \

From 77c454829f075f0234ff6495b00e04ac3589c647 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 14 Jun 2025 00:33:30 +1000
Subject: [PATCH 2406/3129] tools/autobuild: Build alif boards as part of
 auto-build.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/autobuild.sh    | 4 +++-
 tools/autobuild/build-boards.sh | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 7854945bbee0b..7073152df7931 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -69,7 +69,9 @@ fi
 FW_TAG="-$FW_DATE-$FW_SEMVER"
 
 # build new firmware
-cd ports/cc3200
+cd ports/alif
+build_alif_boards ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../cc3200
 build_cc3200_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
 build_esp8266_boards ${FW_TAG} ${LOCAL_FIRMWARE}
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index bd6828cb40f50..165743cab565e 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -86,6 +86,10 @@ function build_boards {
     done
 }
 
+function build_alif_boards {
+    build_boards modalif.c $1 $2 zip
+}
+
 function build_cc3200_boards {
     build_boards hal/cc3200_hal.c $1 $2 zip
 }

From 8cd8e146a4da6dc689b5db876e56692f547fff38 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 5 Jun 2025 09:53:03 +0200
Subject: [PATCH 2407/3129] alif/boards/ALIF_ENSEMBLE: Add board.json and
 deploy instructions.

The firmware for this board will now be built and available automatically.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/boards/ALIF_ENSEMBLE/board.json | 17 ++++++++++
 ports/alif/boards/ALIF_ENSEMBLE/deploy.md  | 37 ++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/board.json
 create mode 100644 ports/alif/boards/ALIF_ENSEMBLE/deploy.md

diff --git a/ports/alif/boards/ALIF_ENSEMBLE/board.json b/ports/alif/boards/ALIF_ENSEMBLE/board.json
new file mode 100644
index 0000000000000..0c63494f7ac1a
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/board.json
@@ -0,0 +1,17 @@
+{
+    "deploy": [
+        "./deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Ethernet"
+    ],
+    "images": [
+        "ensemble-devkit-gen-2.jpg"
+    ],
+    "mcu": "AE722F80F55D5XX",
+    "product": "Ensemble E7 DevKit",
+    "thumbnail": "",
+    "url": "https://alifsemi.com/support/kits/ensemble-devkit/",
+    "vendor": "Alif Semiconductor"
+}
diff --git a/ports/alif/boards/ALIF_ENSEMBLE/deploy.md b/ports/alif/boards/ALIF_ENSEMBLE/deploy.md
new file mode 100644
index 0000000000000..acbc85617e11b
--- /dev/null
+++ b/ports/alif/boards/ALIF_ENSEMBLE/deploy.md
@@ -0,0 +1,37 @@
+### Alif Security Toolkit
+
+This board can be programmed via the SE UART interface using the Alif Security
+Toolkit. MicroPython uses a custom version of the toolkit, which can be downloaded
+from [here](https://github.com/micropython/alif-security-toolkit/) or cloned:
+
+```bash
+git clone https://github.com/micropython/alif-security-toolkit/
+```
+
+---
+
+### Update the SE Firmware (Optional)
+
+If needed, update the SE firmware to match the version used by MicroPython. Ensure
+you have the correct port, part number, and chip revision.
+
+```bash
+python alif-security-toolkit/toolkit/updateSystemPackage.py --port /dev/ttyACM0 --cfg-part AE722F80F55D5LS --cfg-rev B4
+```
+
+**Note:** The board must be power-cycled after this step.
+
+---
+
+### Deploy MicroPython
+
+Download (or build) the firmware package, unzip it, then deploy it:
+
+```bash
+
+python alif-security-toolkit/toolkit/app-write-mram.py --port /dev/ttyACM0 --cfg-part AE722F80F55D5LS --cfg-rev B4 --pad --images file:build-ALIF_ENSEMBLE/application_package.ds
+```
+
+The MicroPython REPL is available on the second USB serial port, eg `/dev/ttyACM1`.
+
+---

From 9b38cf9f82257a9c58b76b151475f41b431f374e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 10 Jun 2025 10:46:09 +0200
Subject: [PATCH 2408/3129] alif/README: Update README with build instructions.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/README.md | 58 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/ports/alif/README.md b/ports/alif/README.md
index 824a63da186d2..dcf327060ffd9 100644
--- a/ports/alif/README.md
+++ b/ports/alif/README.md
@@ -19,3 +19,61 @@ The following more advanced features will follow later:
 - Ethernet support.
 - SDRAM support.
 - Other machine modules.
+
+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:
+```bash
+$ 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/alif/ directory.
+
+An ARM compiler is required for the build, along with the associated binary
+utilities.  The recommended toolchain version to use with this port is
+Arm GNU toolchain version 13.3.Rel1. The compiler can be changed using the
+`CROSS_COMPILE` variable when invoking `make`.
+
+Next, the board to build must be selected. The default board is `ALIF_ENSEMBLE`
+but any of the names of the subdirectories in the `boards/` directory is valid.
+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 `ALIF_ENSEMBLE`
+as an example of the selected board):
+```bash
+make BOARD=ALIF_ENSEMBLE submodules
+```
+
+Then to build the board's firmware run:
+```bash
+make BOARD=ALIF_ENSEMBLE
+```
+
+The above command should produce binary images in the `build-ALIF_ENSEMBLE/`
+subdirectory (or the equivalent directory for the board specified).
+
+### Update the SE Firmware
+
+The SE firmware must be updated **before** flashing the main firmware to match
+the version used by MicroPython. This step only needs to be performed once.
+Connect the board to your PC via the **SE UART USB** port (on the Ensemble kit,
+this is labeled **PRG USB**), then run:
+
+```bash
+make update-system-package
+```
+
+**Note:** The board must be power-cycled after this step.
+
+### Deploy MicroPython
+
+To flash the firmware, run:
+
+```bash
+make BOARD=ALIF_ENSEMBLE deploy
+```

From 4bd99260dc31ab5dbc8dcfb64a6255cd50eb4de7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Jun 2025 14:22:13 +1000
Subject: [PATCH 2409/3129] alif/Makefile: Allow specifying a custom build
 directory.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/Makefile | 4 ++--
 ports/alif/alif.mk  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/alif/Makefile b/ports/alif/Makefile
index 07f87f7f8031c..d258b27b1d578 100644
--- a/ports/alif/Makefile
+++ b/ports/alif/Makefile
@@ -82,10 +82,10 @@ $(BUILD):
 	$(MKDIR) -p $@
 
 $(BUILD)/M55_HP/firmware.bin:
-	make -f alif.mk MCU_CORE=M55_HP MICROPY_PY_OPENAMP_MODE=0
+	make -f alif.mk BUILD=$(BUILD)/M55_HP MCU_CORE=M55_HP MICROPY_PY_OPENAMP_MODE=0
 
 $(BUILD)/M55_HE/firmware.bin:
-	make -f alif.mk MCU_CORE=M55_HE MICROPY_PY_OPENAMP_MODE=1
+	make -f alif.mk BUILD=$(BUILD)/M55_HE MCU_CORE=M55_HE MICROPY_PY_OPENAMP_MODE=1
 
 $(BUILD)/$(ALIF_TOC_CONFIG): mcu/$(ALIF_TOC_CONFIG).in | $(BUILD)
 	$(ECHO) "Preprocess toc config $@"
diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index bb07a3aa2025c..265418aa07456 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -3,7 +3,6 @@
 
 BOARD ?= ALIF_ENSEMBLE
 BOARD_DIR ?= boards/$(BOARD)
-BUILD ?= build-$(BOARD)/$(MCU_CORE)
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))

From 9a5cf0e3dbb7dbc1b66ef67dd2fec0245d24e37e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 16 Jun 2025 09:35:31 +0200
Subject: [PATCH 2410/3129] github/workflows: Run the address sanitizer (ASan)
 build during CI.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 .github/workflows/ports_unix.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 662121654e4f7..c5223a71e6cb8 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -263,6 +263,26 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
+  sanitize_address:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_coverage_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_sanitize_address_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_sanitize_address_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
+      run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
   sanitize_undefined:
     runs-on: ubuntu-latest
     steps:

From 07c3bf21f22edf83fb3ced3d5e6c7095c4b4d7f4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 16 Jun 2025 17:04:16 +0200
Subject: [PATCH 2411/3129] tools/ci.sh: Disable "stack use after return" in
 ASan build.

This check, runtime-enabled by default in gcc 13 (and existing at least
since gcc 12, but runtime-disabled) changes the stack layout in ways that
are not compatible with assumptions spread across the core code (nlr, gc,
and stack checking).

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tools/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index b0e59509add83..8254336258494 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -514,8 +514,8 @@ CI_UNIX_OPTS_QEMU_RISCV64=(
 
 CI_UNIX_OPTS_SANITIZE_ADDRESS=(
     VARIANT=coverage
-    CFLAGS_EXTRA="-fsanitize=address"
-    LDFLAGS_EXTRA="-fsanitize=address"
+    CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
+    LDFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
 )
 
 CI_UNIX_OPTS_SANITIZE_UNDEFINED=(

From 1eb27e11f3bf8e5e0ee13191ef1e9c30b00f9ead Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 16 Jun 2025 17:04:58 +0200
Subject: [PATCH 2412/3129] unix/README: Add some small documentation about
 sanitizers.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ports/unix/README.md b/ports/unix/README.md
index b7aa6e3fef76d..656d4303d3816 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -155,3 +155,21 @@ The default compiler optimisation level is -Os, or -Og if `DEBUG=1` is set.
 Setting the variable `COPT` will explicitly set the optimisation level. For
 example `make [other arguments] COPT=-O0 DEBUG=1` will build a binary with no
 optimisations, assertions enabled, and debug symbols.
+
+### Sanitizers
+
+Sanitizers are extra runtime checks supported by gcc and clang. The CI process
+supports building with the "undefined behavior" (UBSan) or "address" (ASan)
+sanitizers. The script `tools/ci.sh` is the source of truth about how to build
+and run in these modes.
+
+Several classes of checks are disabled via compiler flags:
+
+* In the undefined behavior sanitizer, checks based on the presence of the
+  `non_null` attribute are disabled because the code makes technically incorrect
+  calls like `memset(NULL, 0, 0)`. A future C standard is likely to permit such
+  calls.
+* In the address sanitizer, `detect_stack_use_after_return` is disabled. This
+  check is intended to make sure locals in a "returned from" stack frame are not
+  used. However, this mode interferes with various assumptions that
+  MicroPython's stack checking, NLR, and GC rely on.

From 703d5acbadd0234aa9c8cbb9aaba7a42aca99fc4 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 10 Jun 2025 07:01:17 +0200
Subject: [PATCH 2413/3129] py/misc: Introduce macros to check values' bits
 size.

This commit adds two macros that lets check whether a given value can
fit an arbitrary number of bits, either as a signed or as an unsigned
number.

The native emitter code backends perform a lot of bit size checks to see
if a particular code sequence can be emitted instead of a generic one,
and each platform backend has its own ad-hoc macros (usually one per bit
count and signedness).

With these macros there's a single way to perform those checks, plus
there's no more chance for off-by-one mask length errors when dealing
with signed numbers.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/misc.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/py/misc.h b/py/misc.h
index 1cf582456c010..5d0893bbdd3f2 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -395,6 +395,11 @@ static inline uint32_t mp_popcount(uint32_t x) {
 #endif
 #endif
 
+#define MP_FIT_UNSIGNED(bits, value) (((value) & (~0U << (bits))) == 0)
+#define MP_FIT_SIGNED(bits, value) \
+    (MP_FIT_UNSIGNED(((bits) - 1), (value)) || \
+    (((value) & (~0U << ((bits) - 1))) == (~0U << ((bits) - 1))))
+
 // mp_int_t can be larger than long, i.e. Windows 64-bit, nan-box variants
 static inline uint32_t mp_clz_mpi(mp_int_t x) {
     #ifdef __XC16__

From a8e036982677077e27ab3bdfb0792a8de14f8b77 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 10 Jun 2025 17:58:34 +0200
Subject: [PATCH 2414/3129] py/asmrv32: Implement the full set of Viper
 load/store operations.

This commit expands the implementation of Viper load/store operations
that are optimised for the RV32 platform.

Given the way opcodes are encoded, all value sizes are implemented with
only two functions - one for loads and one for stores.  This should
reduce duplication with existing operations and should, in theory, save
space as some code is removed.  Both load and store emitters will
generate the shortest possible sequence (as long as the stack pointer is
not involved), using compressed opcodes when possible.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c    | 73 ++++++++++++++++++++++---------------------------
 py/asmrv32.h    | 32 +++++++++++++++-------
 py/emitnative.c | 27 ++----------------
 3 files changed, 58 insertions(+), 74 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index c24d05a1384d4..158b5521917a6 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -450,18 +450,24 @@ void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t
     asm_rv32_opcode_cadd(state, rd, ASM_RV32_REG_SP);
 }
 
-void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
-    mp_int_t scaled_offset = offset * sizeof(ASM_WORD_SIZE);
+static const uint8_t RV32_LOAD_OPCODE_TABLE[3] = {
+    0x04, 0x05, 0x02
+};
 
-    if (scaled_offset >= 0 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs) && FIT_UNSIGNED(scaled_offset, 6)) {
+void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, int32_t offset, mp_uint_t operation_size) {
+    assert(operation_size <= 2 && "Operation size value out of range.");
+
+    int32_t scaled_offset = offset << operation_size;
+
+    if (scaled_offset >= 0 && operation_size == 2 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs) && MP_FIT_UNSIGNED(6, scaled_offset)) {
         // c.lw rd', offset(rs')
         asm_rv32_opcode_clw(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), RV32_MAP_IN_C_REGISTER_WINDOW(rs), scaled_offset);
         return;
     }
 
-    if (FIT_SIGNED(scaled_offset, 12)) {
-        // lw rd, offset(rs)
-        asm_rv32_opcode_lw(state, rd, rs, scaled_offset);
+    if (MP_FIT_SIGNED(12, scaled_offset)) {
+        // lbu|lhu|lw rd, offset(rs)
+        asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, RV32_LOAD_OPCODE_TABLE[operation_size], rd, rs, scaled_offset));
         return;
     }
 
@@ -469,12 +475,12 @@ void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_
     mp_uint_t lower = 0;
     split_immediate(scaled_offset, &upper, &lower);
 
-    // lui   rd, HI(offset) ; Or c.lui if possible
-    // c.add rd, rs
-    // lw    rd, LO(offset)(rd)
+    // lui        rd, HI(offset) ; Or c.lui if possible
+    // c.add      rd, rs
+    // lbu|lhu|lw rd, LO(offset)(rd)
     load_upper_immediate(state, rd, upper);
     asm_rv32_opcode_cadd(state, rd, rs);
-    asm_rv32_opcode_lw(state, rd, rd, lower);
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, RV32_LOAD_OPCODE_TABLE[operation_size], rd, rd, lower));
 }
 
 void asm_rv32_emit_jump(asm_rv32_t *state, mp_uint_t label) {
@@ -497,12 +503,20 @@ void asm_rv32_emit_jump(asm_rv32_t *state, mp_uint_t label) {
     asm_rv32_opcode_jalr(state, ASM_RV32_REG_ZERO, REG_TEMP2, lower);
 }
 
-void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
-    mp_int_t scaled_offset = offset * ASM_WORD_SIZE;
+void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, int32_t offset, mp_uint_t operation_size) {
+    assert(operation_size <= 2 && "Operation size value out of range.");
+
+    int32_t scaled_offset = offset << operation_size;
 
-    if (FIT_SIGNED(scaled_offset, 12)) {
-        // sw rd, offset(rs)
-        asm_rv32_opcode_sw(state, rd, rs, scaled_offset);
+    if (scaled_offset >= 0 && operation_size == 2 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs) && MP_FIT_UNSIGNED(6, scaled_offset)) {
+        // c.sw rd', offset(rs')
+        asm_rv32_opcode_csw(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), RV32_MAP_IN_C_REGISTER_WINDOW(rs), scaled_offset);
+        return;
+    }
+
+    if (MP_FIT_SIGNED(12, scaled_offset)) {
+        // sb|sh|sw rd, offset(rs)
+        asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0x23, operation_size, rs, rd, scaled_offset));
         return;
     }
 
@@ -510,12 +524,12 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint
     mp_uint_t lower = 0;
     split_immediate(scaled_offset, &upper, &lower);
 
-    // lui   temporary, HI(offset) ; Or c.lui if possible
-    // c.add temporary, rs
-    // sw    rd, LO(offset)(temporary)
+    // lui      temporary, HI(offset) ; Or c.lui if possible
+    // c.add    temporary, rs
+    // sb|sh|sw rd, LO(offset)(temporary)
     load_upper_immediate(state, REG_TEMP2, upper);
     asm_rv32_opcode_cadd(state, REG_TEMP2, rs);
-    asm_rv32_opcode_sw(state, rd, REG_TEMP2, lower);
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0x23, operation_size, REG_TEMP2, rd, lower));
 }
 
 void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t label) {
@@ -530,27 +544,6 @@ void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t labe
     asm_rv32_opcode_addi(state, rd, rd, lower);
 }
 
-void asm_rv32_emit_load16_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset) {
-    mp_int_t scaled_offset = offset * sizeof(uint16_t);
-
-    if (FIT_SIGNED(scaled_offset, 12)) {
-        // lhu rd, offset(rs)
-        asm_rv32_opcode_lhu(state, rd, rs, scaled_offset);
-        return;
-    }
-
-    mp_uint_t upper = 0;
-    mp_uint_t lower = 0;
-    split_immediate(scaled_offset, &upper, &lower);
-
-    // lui   rd, HI(offset) ; Or c.lui if possible
-    // c.add rd, rs
-    // lhu   rd, LO(offset)(rd)
-    load_upper_immediate(state, rd, upper);
-    asm_rv32_opcode_cadd(state, rd, rs);
-    asm_rv32_opcode_lhu(state, rd, rd, lower);
-}
-
 void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs) {
     if (rs == rd) {
         // c.li rd, 0
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 4f986d7bbd583..99c2226ef33ab 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -709,14 +709,13 @@ void asm_rv32_emit_call_ind(asm_rv32_t *state, mp_uint_t index);
 void asm_rv32_emit_jump(asm_rv32_t *state, mp_uint_t label);
 void asm_rv32_emit_jump_if_reg_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t label);
 void asm_rv32_emit_jump_if_reg_nonzero(asm_rv32_t *state, mp_uint_t rs, mp_uint_t label);
-void asm_rv32_emit_load16_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset);
-void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, mp_int_t offset);
+void asm_rv32_emit_load_reg_reg_offset(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs, int32_t offset, mp_uint_t operation_size);
 void asm_rv32_emit_mov_local_reg(asm_rv32_t *state, mp_uint_t local, mp_uint_t rs);
 void asm_rv32_emit_mov_reg_local_addr(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local);
 void asm_rv32_emit_mov_reg_local(asm_rv32_t *state, mp_uint_t rd, mp_uint_t local);
 void asm_rv32_emit_mov_reg_pcrel(asm_rv32_t *state, mp_uint_t rd, mp_uint_t label);
 void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs);
-void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_uint_t base, mp_int_t offset);
+void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_uint_t base, int32_t offset, mp_uint_t operation_size);
 
 #define ASM_T asm_rv32_t
 #define ASM_ENTRY(state, labels) asm_rv32_entry(state, labels)
@@ -733,11 +732,12 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_JUMP_IF_REG_ZERO(state, rs, label, bool_test) asm_rv32_emit_jump_if_reg_eq(state, rs, ASM_RV32_REG_ZERO, label)
 #define ASM_JUMP_REG(state, rs) asm_rv32_opcode_cjr(state, rs)
 #define ASM_LOAD_REG_REG_OFFSET(state, rd, rs, offset) ASM_LOAD32_REG_REG_OFFSET(state, rd, rs, offset)
-#define ASM_LOAD16_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load16_reg_reg_offset(state, rd, rs, offset)
-#define ASM_LOAD16_REG_REG(state, rd, rs) asm_rv32_opcode_lhu(state, rd, rs, 0)
+#define ASM_LOAD8_REG_REG(state, rd, rs) ASM_LOAD8_REG_REG_OFFSET(state, rd, rs, 0)
+#define ASM_LOAD16_REG_REG(state, rd, rs) ASM_LOAD16_REG_REG_OFFSET(state, rd, rs, 0)
 #define ASM_LOAD32_REG_REG(state, rd, rs) ASM_LOAD32_REG_REG_OFFSET(state, rd, rs, 0)
-#define ASM_LOAD32_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset)
-#define ASM_LOAD8_REG_REG(state, rd, rs) asm_rv32_opcode_lbu(state, rd, rs, 0)
+#define ASM_LOAD8_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset, 0)
+#define ASM_LOAD16_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset, 1)
+#define ASM_LOAD32_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_load_reg_reg_offset(state, rd, rs, offset, 2)
 #define ASM_LSL_REG_REG(state, rd, rs) asm_rv32_opcode_sll(state, rd, rd, rs)
 #define ASM_LSR_REG_REG(state, rd, rs) asm_rv32_opcode_srl(state, rd, rd, rs)
 #define ASM_MOV_LOCAL_REG(state, local, rs) asm_rv32_emit_mov_local_reg(state, local, rs)
@@ -751,13 +751,20 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_NOT_REG(state, rd) asm_rv32_opcode_xori(state, rd, rd, -1)
 #define ASM_OR_REG_REG(state, rd, rs) asm_rv32_opcode_or(state, rd, rd, rs)
 #define ASM_STORE_REG_REG_OFFSET(state, rd, rs, offset) ASM_STORE32_REG_REG_OFFSET(state, rd, rs, offset)
-#define ASM_STORE16_REG_REG(state, rs1, rs2) asm_rv32_opcode_sh(state, rs1, rs2, 0)
+#define ASM_STORE8_REG_REG(state, rs1, rs2) ASM_STORE8_REG_REG_OFFSET(state, rs1, rs2, 0)
+#define ASM_STORE16_REG_REG(state, rs1, rs2) ASM_STORE16_REG_REG_OFFSET(state, rs1, rs2, 0)
 #define ASM_STORE32_REG_REG(state, rs1, rs2) ASM_STORE32_REG_REG_OFFSET(state, rs1, rs2, 0)
-#define ASM_STORE32_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset)
-#define ASM_STORE8_REG_REG(state, rs1, rs2) asm_rv32_opcode_sb(state, rs1, rs2, 0)
+#define ASM_STORE8_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset, 0)
+#define ASM_STORE16_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset, 1)
+#define ASM_STORE32_REG_REG_OFFSET(state, rd, rs, offset) asm_rv32_emit_store_reg_reg_offset(state, rd, rs, offset, 2)
 #define ASM_SUB_REG_REG(state, rd, rs) asm_rv32_opcode_sub(state, rd, rd, rs)
 #define ASM_XOR_REG_REG(state, rd, rs) asm_rv32_emit_optimised_xor(state, rd, rs)
 #define ASM_CLR_REG(state, rd)
+#define ASM_LOAD8_REG_REG_REG(state, rd, rs1, rs2) \
+    do { \
+        asm_rv32_opcode_cadd(state, rs1, rs2); \
+        asm_rv32_opcode_lbu(state, rd, rs1, 0); \
+    } while (0)
 #define ASM_LOAD16_REG_REG_REG(state, rd, rs1, rs2) \
     do { \
         asm_rv32_opcode_slli(state, rs2, rs2, 1); \
@@ -770,6 +777,11 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
         asm_rv32_opcode_cadd(state, rs1, rs2); \
         asm_rv32_opcode_lw(state, rd, rs1, 0); \
     } while (0)
+#define ASM_STORE8_REG_REG_REG(state, rd, rs1, rs2) \
+    do { \
+        asm_rv32_opcode_cadd(state, rs1, rs2); \
+        asm_rv32_opcode_sb(state, rd, rs1, 0); \
+    } while (0)
 #define ASM_STORE16_REG_REG_REG(state, rd, rs1, rs2) \
     do { \
         asm_rv32_opcode_slli(state, rs2, rs2, 1); \
diff --git a/py/emitnative.c b/py/emitnative.c
index 7662de69e22fb..2cce31dae985b 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -180,12 +180,6 @@ static const uint8_t reg_local_table[MAX_REGS_FOR_LOCAL_VARS] = {REG_LOCAL_1, RE
         *emit->error_slot = mp_obj_new_exception_msg_varg(&mp_type_ViperTypeError, __VA_ARGS__); \
 } while (0)
 
-#if N_RV32
-#define FIT_SIGNED(value, bits)                                                                                     \
-    ((((value) & ~((1U << ((bits) - 1)) - 1)) == 0) ||                                      \
-    (((value) & ~((1U << ((bits) - 1)) - 1)) == ~((1U << ((bits) - 1)) - 1)))
-#endif
-
 typedef enum {
     STACK_VALUE,
     STACK_REG,
@@ -1540,12 +1534,7 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #ifdef ASM_LOAD8_REG_REG_OFFSET
                     ASM_LOAD8_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
                     #else
-                    #if N_RV32
-                    if (FIT_SIGNED(index_value, 12)) {
-                        asm_rv32_opcode_lbu(emit->as, REG_RET, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_XTENSA || N_XTENSAWIN
+                    #if N_XTENSA || N_XTENSAWIN
                     if (index_value >= 0 && index_value < 256) {
                         asm_xtensa_op_l8ui(emit->as, REG_RET, reg_base, index_value);
                         break;
@@ -1787,12 +1776,7 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE8_REG_REG_OFFSET
                     ASM_STORE8_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    #if N_RV32
-                    if (FIT_SIGNED(index_value, 12)) {
-                        asm_rv32_opcode_sb(emit->as, reg_value, reg_base, index_value);
-                        break;
-                    }
-                    #elif N_XTENSA || N_XTENSAWIN
+                    #if N_XTENSA || N_XTENSAWIN
                     if (index_value >= 0 && index_value < 256) {
                         asm_xtensa_op_s8i(emit->as, reg_value, reg_base, index_value);
                         break;
@@ -1817,12 +1801,7 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE16_REG_REG_OFFSET
                     ASM_STORE16_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    #if N_RV32
-                    if (FIT_SIGNED(index_value, 11)) {
-                        asm_rv32_opcode_sh(emit->as, reg_value, reg_base, index_value << 1);
-                        break;
-                    }
-                    #elif N_XTENSA || N_XTENSAWIN
+                    #if N_XTENSA || N_XTENSAWIN
                     if (index_value >= 0 && index_value < 256) {
                         asm_xtensa_op_s16i(emit->as, reg_value, reg_base, index_value);
                         break;

From cd1b921bf296da72cee4f6135ad8bd74e6217d2f Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 10 Jun 2025 19:24:10 +0200
Subject: [PATCH 2415/3129] py/asmarm: Implement the full set of Viper
 load/store operations.

This commit expands the implementation of Viper load/store operations
that are optimised for the Arm platform.

Now both load and store emitters should generate the shortest possible
sequence in all cases.  Redundant specialised operation emitters have
been folded into the general case implementation - this was the case of
integer-indexed load/store operations with a fixed offset of zero.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.c     | 52 +++++++++++++++++++++++++++++++------------------
 py/asmarm.h     | 24 ++++++++++++-----------
 py/emitnative.c |  4 ----
 3 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index be50a991b7d72..15bc73b61eca6 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -38,8 +38,6 @@
 
 #define REG_TEMP ASM_ARM_REG_R8
 
-#define SIGNED_FIT24(x) (((x) & 0xff800000) == 0) || (((x) & 0xff000000) == 0xff000000)
-
 // 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);
@@ -347,11 +345,6 @@ void asm_arm_ldr_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offse
     }
 }
 
-void asm_arm_ldrh_reg_reg(asm_arm_t *as, uint rd, uint rn) {
-    // ldrh rd, [rn]
-    emit_al(as, 0x1d000b0 | (rn << 16) | (rd << 12));
-}
-
 void asm_arm_ldrh_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
     // ldrh doesn't support scaled register index
     emit_al(as, 0x1a00080 | (REG_TEMP << 12) | rn); // mov temp, rn, lsl #1
@@ -370,16 +363,23 @@ void asm_arm_ldrh_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offs
     }
 }
 
-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));
-}
-
 void asm_arm_ldrb_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
     // ldrb rd, [rm, rn]
     emit_al(as, 0x7d00000 | (rm << 16) | (rd << 12) | rn);
 }
 
+void asm_arm_ldrb_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset) {
+    if (byte_offset < 0x1000) {
+        // ldrb rd, [rn, #off]
+        emit_al(as, 0x5d00000 | (rn << 16) | (rd << 12) | byte_offset);
+    } else {
+        // mov temp, #off
+        // ldrb rd, [rn, temp]
+        asm_arm_mov_reg_i32_optimised(as, REG_TEMP, byte_offset);
+        emit_al(as, 0x7d00000 | (rn << 16) | (rd << 12) | REG_TEMP);
+    }
+}
+
 void asm_arm_ldr_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
     // ldr rd, [rm, rn, lsl #2]
     emit_al(as, 0x7900100 | (rm << 16) | (rd << 12) | rn);
@@ -397,14 +397,28 @@ void asm_arm_str_reg_reg_offset(asm_arm_t *as, uint rd, uint rm, uint byte_offse
     }
 }
 
-void asm_arm_strh_reg_reg(asm_arm_t *as, uint rd, uint rm) {
-    // strh rd, [rm]
-    emit_al(as, 0x1c000b0 | (rm << 16) | (rd << 12));
+void asm_arm_strh_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset) {
+    if (byte_offset < 0x100) {
+        // strh rd, [rn, #off]
+        emit_al(as, 0x1c000b0 | (rn << 16) | (rd << 12) | ((byte_offset & 0xf0) << 4) | (byte_offset & 0xf));
+    } else {
+        // mov temp, #off
+        // strh rd, [rn, temp]
+        asm_arm_mov_reg_i32_optimised(as, REG_TEMP, byte_offset);
+        emit_al(as, 0x18000b0 | (rn << 16) | (rd << 12) | REG_TEMP);
+    }
 }
 
-void asm_arm_strb_reg_reg(asm_arm_t *as, uint rd, uint rm) {
-    // strb rd, [rm]
-    emit_al(as, 0x5c00000 | (rm << 16) | (rd << 12));
+void asm_arm_strb_reg_reg_offset(asm_arm_t *as, uint rd, uint rm, uint byte_offset) {
+    if (byte_offset < 0x1000) {
+        // strb rd, [rm, #off]
+        emit_al(as, 0x5c00000 | (rm << 16) | (rd << 12) | byte_offset);
+    } else {
+        // mov temp, #off
+        // strb rd, [rm, temp]
+        asm_arm_mov_reg_i32_optimised(as, REG_TEMP, byte_offset);
+        emit_al(as, 0x7c00000 | (rm << 16) | (rd << 12) | REG_TEMP);
+    }
 }
 
 void asm_arm_str_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn) {
@@ -430,7 +444,7 @@ void asm_arm_bcc_label(asm_arm_t *as, int cond, uint label) {
     rel -= 8; // account for instruction prefetch, PC is 8 bytes ahead of this instruction
     rel >>= 2; // in ARM mode the branch target is 32-bit aligned, so the 2 LSB are omitted
 
-    if (SIGNED_FIT24(rel)) {
+    if (MP_FIT_SIGNED(24, rel)) {
         emit(as, cond | 0xa000000 | (rel & 0xffffff));
     } else {
         printf("asm_arm_bcc: branch does not fit in 24 bits\n");
diff --git a/py/asmarm.h b/py/asmarm.h
index 07ed425c98031..0d68812145fd8 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -110,12 +110,11 @@ void asm_arm_asr_reg_reg(asm_arm_t *as, uint rd, uint rs);
 
 // memory
 void asm_arm_ldr_reg_reg_offset(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_ldrb_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset);
 void asm_arm_str_reg_reg_offset(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);
-void asm_arm_strb_reg_reg(asm_arm_t *as, uint rd, uint rm);
+void asm_arm_strh_reg_reg_offset(asm_arm_t *as, uint rd, uint rm, uint byte_offset);
+void asm_arm_strb_reg_reg_offset(asm_arm_t *as, uint rd, uint rm, uint byte_offset);
 
 // load from array
 void asm_arm_ldr_reg_reg_reg(asm_arm_t *as, uint rd, uint rm, uint rn);
@@ -209,16 +208,19 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_arm_mul_reg_reg_reg((as), (reg_dest), (reg_dest), (reg_src))
 
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), (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_offset((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) ASM_LOAD8_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD8_REG_REG_OFFSET(as, reg_dest, reg_base, byte_offset) asm_arm_ldrb_reg_reg_offset((as), (reg_dest), (reg_base), (byte_offset))
+#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) ASM_LOAD16_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, halfword_offset) asm_arm_ldrh_reg_reg_offset((as), (reg_dest), (reg_base), 2 * (halfword_offset))
+#define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
 #define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_arm_ldr_reg_reg_offset((as), (reg_dest), (reg_base), 4 * (word_offset))
 
 #define ASM_STORE_REG_REG_OFFSET(as, reg_value, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_value), (reg_base), (word_offset))
-#define ASM_STORE8_REG_REG(as, reg_value, reg_base) asm_arm_strb_reg_reg((as), (reg_value), (reg_base))
-#define ASM_STORE16_REG_REG(as, reg_value, reg_base) asm_arm_strh_reg_reg((as), (reg_value), (reg_base))
-#define ASM_STORE32_REG_REG(as, reg_value, reg_base) asm_arm_str_reg_reg_offset((as), (reg_value), (reg_base), 0)
+#define ASM_STORE8_REG_REG(as, reg_value, reg_base) ASM_STORE8_REG_REG_OFFSET((as), (reg_value), (reg_base), 0)
+#define ASM_STORE8_REG_REG_OFFSET(as, reg_value, reg_base, byte_offset) asm_arm_strb_reg_reg_offset((as), (reg_value), (reg_base), (byte_offset))
+#define ASM_STORE16_REG_REG(as, reg_value, reg_base) ASM_STORE16_REG_REG_OFFSET((as), (reg_value), (reg_base), 0)
+#define ASM_STORE16_REG_REG_OFFSET(as, reg_value, reg_base, halfword_offset) asm_arm_strh_reg_reg_offset((as), (reg_value), (reg_base), 2 * (halfword_offset))
+#define ASM_STORE32_REG_REG(as, reg_value, reg_base) ASM_STORE32_REG_REG_OFFSET((as), (reg_value), (reg_base), 0)
 #define ASM_STORE32_REG_REG_OFFSET(as, reg_value, reg_base, word_offset) asm_arm_str_reg_reg_offset((as), (reg_value), (reg_base), 4 * (word_offset))
 
 #define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) asm_arm_ldrb_reg_reg_reg((as), (reg_dest), (reg_base), (reg_index))
diff --git a/py/emitnative.c b/py/emitnative.c
index 2cce31dae985b..36e9719db4085 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1785,10 +1785,6 @@ static void emit_native_store_subscr(emit_t *emit) {
                     if (index_value != 0) {
                         // index is non-zero
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
-                        #if N_ARM
-                        asm_arm_strb_reg_reg_reg(emit->as, reg_value, reg_base, reg_index);
-                        break;
-                        #endif
                         ASM_ADD_REG_REG(emit->as, reg_index, reg_base); // add index to base
                         reg_base = reg_index;
                     }

From 12f36cc13c126770d81bc95daf695f3aa05bc5cb Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 10 Jun 2025 19:54:28 +0200
Subject: [PATCH 2416/3129] py/asmxtensa: Implement the full set of Viper
 load/store operations.

This commit expands the implementation of Viper load/store operations
that are optimised for the Xtensa platform.

Now both load and store emitters should generate the shortest possible
sequence in all cases.  Redundant specialised operation emitters have
been aliased to the general case implementation - this was the case of
integer-indexed load/store operations with a fixed offset of zero.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmxtensa.c  | 50 +++++++++++++++++++++++++++++++++++--------------
 py/asmxtensa.h  | 36 +++++++++++++++++++++++------------
 py/emitnative.c | 18 ------------------
 3 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 85a8cfef55518..bc3e717d9f3a0 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -299,25 +299,47 @@ void asm_xtensa_l32i_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, u
     }
 }
 
-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);
+void asm_xtensa_load_reg_reg_offset(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint offset, uint operation_size) {
+    assert(operation_size <= 2 && "Operation size value out of range.");
+
+    if (operation_size == 2 && MP_FIT_UNSIGNED(4, offset)) {
+        asm_xtensa_op_l32i_n(as, reg_dest, reg_base, offset);
+        return;
+    }
+
+    if (MP_FIT_UNSIGNED(8, offset)) {
+        asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRI8(2, operation_size, reg_base, reg_dest, offset));
+        return;
+    }
+
+    asm_xtensa_mov_reg_i32_optimised(as, reg_dest, offset << operation_size);
+    asm_xtensa_op_add_n(as, reg_dest, reg_base, reg_dest);
+    if (operation_size == 2) {
+        asm_xtensa_op_l32i_n(as, reg_dest, reg_dest, 0);
     } else {
-        asm_xtensa_mov_reg_i32_optimised(as, REG_TEMP, word_offset * 4);
-        asm_xtensa_op_add_n(as, REG_TEMP, reg_base, REG_TEMP);
-        asm_xtensa_op_s32i_n(as, reg_src, REG_TEMP, 0);
+        asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRI8(2, operation_size, reg_dest, reg_dest, 0));
     }
 }
 
-void asm_xtensa_l16ui_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint halfword_offset) {
-    if (halfword_offset < 256) {
-        asm_xtensa_op_l16ui(as, reg_dest, reg_base, halfword_offset);
+void asm_xtensa_store_reg_reg_offset(asm_xtensa_t *as, uint reg_src, uint reg_base, uint offset, uint operation_size) {
+    assert(operation_size <= 2 && "Operation size value out of range.");
+
+    if (operation_size == 2 && MP_FIT_UNSIGNED(4, offset)) {
+        asm_xtensa_op_s32i_n(as, reg_src, reg_base, offset);
+        return;
+    }
+
+    if (MP_FIT_UNSIGNED(8, offset)) {
+        asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRI8(2, 0x04 | operation_size, reg_base, reg_src, offset));
+        return;
+    }
+
+    asm_xtensa_mov_reg_i32_optimised(as, REG_TEMP, offset << operation_size);
+    asm_xtensa_op_add_n(as, REG_TEMP, reg_base, REG_TEMP);
+    if (operation_size == 2) {
+        asm_xtensa_op_s32i_n(as, reg_src, REG_TEMP, 0);
     } else {
-        asm_xtensa_mov_reg_i32_optimised(as, reg_dest, halfword_offset * 2);
-        asm_xtensa_op_add_n(as, reg_dest, reg_base, reg_dest);
-        asm_xtensa_op_l16ui(as, reg_dest, reg_dest, 0);
+        asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRI8(2, 0x04 | operation_size, REG_TEMP, reg_src, 0));
     }
 }
 
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index d90aef3c533ca..7f113ca12e090 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -293,9 +293,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_l16ui_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint halfword_offset);
+void asm_xtensa_load_reg_reg_offset(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint offset, uint operation_size);
+void asm_xtensa_store_reg_reg_offset(asm_xtensa_t *as, uint reg_src, uint reg_base, uint offset, uint operation_size);
 void asm_xtensa_call_ind(asm_xtensa_t *as, uint idx);
 void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 void asm_xtensa_bit_branch(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t bit, mp_uint_t label, mp_uint_t condition);
@@ -420,16 +419,22 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 #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_LOAD32_REG_REG_OFFSET((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_l16ui_optimised((as), (reg_dest), (reg_base), (uint16_offset))
+#define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) ASM_LOAD8_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD8_REG_REG_OFFSET(as, reg_dest, reg_base, byte_offset) asm_xtensa_load_reg_reg_offset((as), (reg_dest), (reg_base), (byte_offset), 0)
+#define ASM_LOAD8_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
+    do { \
+        asm_xtensa_op_add_n((as), (reg_base), (reg_index), (reg_base)); \
+        asm_xtensa_op_l8ui((as), (reg_dest), (reg_base), 0); \
+    } while (0)
+#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) ASM_LOAD16_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, halfword_offset) asm_xtensa_load_reg_reg_offset((as), (reg_dest), (reg_base), (halfword_offset), 1)
 #define ASM_LOAD16_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
     do { \
         asm_xtensa_op_addx2((as), (reg_base), (reg_index), (reg_base)); \
         asm_xtensa_op_l16ui((as), (reg_dest), (reg_base), 0); \
     } while (0)
-#define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), 0)
-#define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_l32i_optimised((as), (reg_dest), (reg_base), (word_offset))
+#define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_load_reg_reg_offset((as), (reg_dest), (reg_base), (word_offset), 2)
 #define ASM_LOAD32_REG_REG_REG(as, reg_dest, reg_base, reg_index) \
     do { \
         asm_xtensa_op_addx4((as), (reg_base), (reg_index), (reg_base)); \
@@ -437,15 +442,22 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
     } while (0)
 
 #define ASM_STORE_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((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_STORE8_REG_REG(as, reg_src, reg_base) ASM_STORE8_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE8_REG_REG_OFFSET(as, reg_src, reg_base, byte_offset) asm_xtensa_store_reg_reg_offset((as), (reg_src), (reg_base), (byte_offset), 0)
+#define ASM_STORE8_REG_REG_REG(as, reg_val, reg_base, reg_index) \
+    do { \
+        asm_xtensa_op_add_n((as), (reg_base), (reg_index), (reg_base)); \
+        asm_xtensa_op_s8i((as), (reg_val), (reg_base), 0); \
+    } while (0)
+#define ASM_STORE16_REG_REG(as, reg_src, reg_base) ASM_STORE16_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE16_REG_REG_OFFSET(as, reg_src, reg_base, halfword_offset) asm_xtensa_store_reg_reg_offset((as), (reg_src), (reg_base), (halfword_offset), 1)
 #define ASM_STORE16_REG_REG_REG(as, reg_val, reg_base, reg_index) \
     do { \
         asm_xtensa_op_addx2((as), (reg_base), (reg_index), (reg_base)); \
         asm_xtensa_op_s16i((as), (reg_val), (reg_base), 0); \
     } while (0)
-#define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_xtensa_op_s32i_n((as), (reg_src), (reg_base), 0)
-#define ASM_STORE32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_s32i_optimised((as), (reg_dest), (reg_base), (word_offset))
+#define ASM_STORE32_REG_REG(as, reg_src, reg_base) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_store_reg_reg_offset((as), (reg_dest), (reg_base), (word_offset), 2)
 #define ASM_STORE32_REG_REG_REG(as, reg_val, reg_base, reg_index) \
     do { \
         asm_xtensa_op_addx4((as), (reg_base), (reg_index), (reg_base)); \
diff --git a/py/emitnative.c b/py/emitnative.c
index 36e9719db4085..f3ab483e8a638 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1534,12 +1534,6 @@ static void emit_native_load_subscr(emit_t *emit) {
                     #ifdef ASM_LOAD8_REG_REG_OFFSET
                     ASM_LOAD8_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value);
                     #else
-                    #if N_XTENSA || N_XTENSAWIN
-                    if (index_value >= 0 && index_value < 256) {
-                        asm_xtensa_op_l8ui(emit->as, REG_RET, reg_base, index_value);
-                        break;
-                    }
-                    #endif
                     if (index_value != 0) {
                         // index is non-zero
                         need_reg_single(emit, reg_index, 0);
@@ -1776,12 +1770,6 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE8_REG_REG_OFFSET
                     ASM_STORE8_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    #if N_XTENSA || N_XTENSAWIN
-                    if (index_value >= 0 && index_value < 256) {
-                        asm_xtensa_op_s8i(emit->as, reg_value, reg_base, index_value);
-                        break;
-                    }
-                    #endif
                     if (index_value != 0) {
                         // index is non-zero
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
@@ -1797,12 +1785,6 @@ static void emit_native_store_subscr(emit_t *emit) {
                     #ifdef ASM_STORE16_REG_REG_OFFSET
                     ASM_STORE16_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value);
                     #else
-                    #if N_XTENSA || N_XTENSAWIN
-                    if (index_value >= 0 && index_value < 256) {
-                        asm_xtensa_op_s16i(emit->as, reg_value, reg_base, index_value);
-                        break;
-                    }
-                    #endif
                     if (index_value != 0) {
                         // index is a non-zero immediate
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value << 1);

From 7bb5f2da9d36d8e017953969d5acbd561c5bb1d6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 10 Jun 2025 20:05:59 +0200
Subject: [PATCH 2417/3129] py/asmthumb: Remove redundant load/store opcode
 implementations.

This commit removes load/store opcode implementations that have been
made redundant in 1f5ba6998bb1895354f5afcd7bb52d83a02733be.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmthumb.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/py/asmthumb.h b/py/asmthumb.h
index 6c83b583e2b08..b423ce7a4d0e7 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -317,24 +317,6 @@ static inline void asm_thumb_format_9_10(asm_thumb_t *as, uint op, uint rlo_dest
     asm_thumb_op16(as, ASM_THUMB_FORMAT_9_10_ENCODE(op, rlo_dest, rlo_base, offset));
 }
 
-static inline void asm_thumb_str_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint word_offset) {
-    asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_STR | ASM_THUMB_FORMAT_9_WORD_TRANSFER, rlo_src, rlo_base, word_offset);
-}
-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 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);
-}
-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 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);
 }

From a8dd393eee7e3ebfc5c6e97b2fe2d4b3099f2959 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 10 Jun 2025 20:23:30 +0200
Subject: [PATCH 2418/3129] py/asmx86: Implement the full set of Viper
 load/store operations.

This commit expands the implementation of Viper load/store operations
that are optimised for the x86 platform.

Unlike other platforms, x86 already implemented all necessary
functions and all it took to expose these to Viper after the
infrastructure refactoring was to add a few defines.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmx86.h | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/py/asmx86.h b/py/asmx86.h
index 5011e56d0c1df..2cec38ed4517e 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -200,18 +200,21 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_x86_sub_r32_r32((as), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_x86_mul_r32_r32((as), (reg_dest), (reg_src))
 
-#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), (word_offset))
-#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_LOAD32_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_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), (word_offset))
-#define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_x86_mov_r8_to_mem8((as), (reg_src), (reg_base), 0)
-#define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_x86_mov_r16_to_mem16((as), (reg_src), (reg_base), 0)
-#define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 0)
-#define ASM_STORE32_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 4 * (word_offset))
+#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, dword_offset) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), (dword_offset))
+#define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) ASM_LOAD8_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD8_REG_REG_OFFSET(as, reg_dest, reg_base, byte_offset) asm_x86_mov_mem8_to_r32zx((as), (reg_base), (byte_offset), (reg_dest))
+#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) ASM_LOAD16_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_x86_mov_mem16_to_r32zx((as), (reg_base), 2 * (word_offset), (reg_dest))
+#define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, dword_offset) asm_x86_mov_mem32_to_r32((as), (reg_base), 4 * (dword_offset), (reg_dest))
+
+#define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, dword_offset) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), (dword_offset))
+#define ASM_STORE8_REG_REG(as, reg_src, reg_base) ASM_STORE8_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE8_REG_REG_OFFSET(as, reg_src, reg_base, byte_offset) asm_x86_mov_r8_to_mem8((as), (reg_src), (reg_base), (byte_offset))
+#define ASM_STORE16_REG_REG(as, reg_src, reg_base) ASM_STORE16_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE16_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x86_mov_r16_to_mem16((as), (reg_src), (reg_base), 2 * (word_offset))
+#define ASM_STORE32_REG_REG(as, reg_src, reg_base) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_src, reg_base, dword_offset) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 4 * (dword_offset))
 
 #endif // GENERIC_ASM_API
 

From c8c8b0456955cd78436657c885b83620393e81a6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 11 Jun 2025 07:51:55 +0200
Subject: [PATCH 2419/3129] py/asmx64: Implement the full set of Viper
 load/store operations.

This commit expands the implementation of Viper load/store operations
that are optimised for the x86 platform.

Like x86, x64 already implemented all necessary functions and all it
took to expose these to Viper after the infrastructure refactoring
was to add a few defines.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmx64.h | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/py/asmx64.h b/py/asmx64.h
index 30c6efd6d05b2..f2fb5da180597 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -205,16 +205,21 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_x64_sub_r64_r64((as), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_x64_mul_r64_r64((as), (reg_dest), (reg_src))
 
-#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_OFFSET(as, reg_src, reg_base, word_offset) asm_x64_mov_r64_to_mem64((as), (reg_src), (reg_base), 8 * (word_offset))
-#define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_x64_mov_r8_to_mem8((as), (reg_src), (reg_base), 0)
-#define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_x64_mov_r16_to_mem16((as), (reg_src), (reg_base), 0)
-#define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_x64_mov_r32_to_mem32((as), (reg_src), (reg_base), 0)
+#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, qword_offset) asm_x64_mov_mem64_to_r64((as), (reg_base), 8 * (qword_offset), (reg_dest))
+#define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) ASM_LOAD8_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD8_REG_REG_OFFSET(as, reg_dest, reg_base, byte_offset) asm_x64_mov_mem8_to_r64zx((as), (reg_base), (byte_offset), (reg_dest))
+#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) ASM_LOAD16_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_x64_mov_mem16_to_r64zx((as), (reg_base), 2 * (word_offset), (reg_dest))
+#define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) ASM_LOAD32_REG_REG_OFFSET((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD32_REG_REG_OFFSET(as, reg_dest, reg_base, dword_offset) asm_x64_mov_mem32_to_r64zx((as), (reg_base), 4 * (dword_offset), (reg_dest))
+
+#define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, qword_offset) asm_x64_mov_r64_to_mem64((as), (reg_src), (reg_base), 8 * (qword_offset))
+#define ASM_STORE8_REG_REG(as, reg_src, reg_base) ASM_STORE8_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE8_REG_REG_OFFSET(as, reg_src, reg_base, byte_offset) asm_x64_mov_r8_to_mem8((as), (reg_src), (reg_base), (byte_offset))
+#define ASM_STORE16_REG_REG(as, reg_src, reg_base) ASM_STORE16_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE16_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x64_mov_r16_to_mem16((as), (reg_src), (reg_base), 2 * (word_offset))
+#define ASM_STORE32_REG_REG(as, reg_src, reg_base) ASM_STORE32_REG_REG_OFFSET((as), (reg_src), (reg_base), 0)
+#define ASM_STORE32_REG_REG_OFFSET(as, reg_src, reg_base, dword_offset) asm_x64_mov_r32_to_mem32((as), (reg_src), (reg_base), 4 * (dword_offset))
 
 #endif // GENERIC_ASM_API
 

From 0d435959e0acf4059cff843e45936c21c6e7eb84 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 11 Jun 2025 09:31:34 +0200
Subject: [PATCH 2420/3129] tests/micropython: Improve viper ptr boundary
 tests.

This commit reworks the Viper pointer boundary tests in order to make
them more accurate and easier to extend.

The tests are now easier to reason about in their output, using easier
to read values, and bit thresholds are now more configurable.  If a new
conditional code sequence is introduced, adding a new bit threshold is
just a matter of adding a value into a tuple at the beginning of the
relevant test file.

Load tests have also been made more accurate, with better function
templates to test register-indexed operations.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .../micropython/viper_ptr16_load_boundary.py  | 32 ++++++---
 .../viper_ptr16_load_boundary.py.exp          | 32 +++++----
 .../micropython/viper_ptr16_store_boundary.py | 66 ++++++++++--------
 .../viper_ptr16_store_boundary.py.exp         | 38 +++++-----
 .../micropython/viper_ptr32_load_boundary.py  | 32 ++++++---
 .../viper_ptr32_load_boundary.py.exp          | 32 +++++----
 .../micropython/viper_ptr32_store_boundary.py | 69 ++++++++++++-------
 .../viper_ptr32_store_boundary.py.exp         | 38 +++++-----
 tests/micropython/viper_ptr8_load_boundary.py | 31 ++++++---
 .../viper_ptr8_load_boundary.py.exp           | 32 +++++----
 .../micropython/viper_ptr8_store_boundary.py  | 53 +++++++++-----
 .../viper_ptr8_store_boundary.py.exp          | 32 +++++----
 12 files changed, 309 insertions(+), 178 deletions(-)

diff --git a/tests/micropython/viper_ptr16_load_boundary.py b/tests/micropython/viper_ptr16_load_boundary.py
index ccaaa0909af9d..0d4c3105b685b 100644
--- a/tests/micropython/viper_ptr16_load_boundary.py
+++ b/tests/micropython/viper_ptr16_load_boundary.py
@@ -2,24 +2,38 @@
 
 GET_TEMPLATE = """
 @micropython.viper
-def get{off}(src: ptr16) -> int:
-    return src[{off}]
-print(b[{off} * 2:({off} + 1) * 2])
+def get{off}(src: ptr16) -> uint:
+    return uint(src[{off}])
+print(hex(get{off}(buffer)))
 """
 
 
+BIT_THRESHOLDS = (5, 8, 11, 12)
+SIZE = 2
+
+
 @micropython.viper
 def get_index(src: ptr16, i: int) -> int:
     return src[i]
 
 
-b = bytearray(5000)
-b[28:38] = b"0123456789"
-b[252:262] = b"ABCDEFGHIJ"
-b[4092:4102] = b"KLMNOPQRST"
+def data(start, len):
+    output = bytearray(len)
+    for idx in range(len):
+        output[idx] = (start + idx) & 0xFF
+    return output
+
+
+buffer = bytearray((((1 << max(BIT_THRESHOLDS)) + 1) // 1024) * 1024)
+val = 0
+for bit in BIT_THRESHOLDS:
+    print("---", bit)
+    pre, idx, post = ((1 << bit) - (2 * SIZE), (1 << bit) - (1 * SIZE), 1 << bit)
+    buffer[pre:post] = data(val, 3 * SIZE)
+    val = val + (3 * SIZE)
 
-for pre, idx, post in (15, 16, 17), (127, 128, 129), (2047, 2048, 2049):
-    print(get_index(b, pre), get_index(b, idx), get_index(b, post))
+    pre, idx, post = pre // SIZE, idx // SIZE, post // SIZE
+    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
     exec(GET_TEMPLATE.format(off=pre))
     exec(GET_TEMPLATE.format(off=idx))
     exec(GET_TEMPLATE.format(off=post))
diff --git a/tests/micropython/viper_ptr16_load_boundary.py.exp b/tests/micropython/viper_ptr16_load_boundary.py.exp
index 4b8c184c134cb..56f1d32290468 100644
--- a/tests/micropython/viper_ptr16_load_boundary.py.exp
+++ b/tests/micropython/viper_ptr16_load_boundary.py.exp
@@ -1,12 +1,20 @@
-13106 13620 14134
-bytearray(b'23')
-bytearray(b'45')
-bytearray(b'67')
-17475 17989 18503
-bytearray(b'CD')
-bytearray(b'EF')
-bytearray(b'GH')
-20045 20559 21073
-bytearray(b'MN')
-bytearray(b'OP')
-bytearray(b'QR')
+--- 5
+0x100 0x302 0x504
+0x100
+0x302
+0x504
+--- 8
+0x706 0x908 0xb0a
+0x706
+0x908
+0xb0a
+--- 11
+0xd0c 0xf0e 0x1110
+0xd0c
+0xf0e
+0x1110
+--- 12
+0x1312 0x1514 0x1716
+0x1312
+0x1514
+0x1716
diff --git a/tests/micropython/viper_ptr16_store_boundary.py b/tests/micropython/viper_ptr16_store_boundary.py
index e0a4f84557366..1694c61ac0a61 100644
--- a/tests/micropython/viper_ptr16_store_boundary.py
+++ b/tests/micropython/viper_ptr16_store_boundary.py
@@ -4,38 +4,50 @@
 @micropython.viper
 def set{off}(dest: ptr16):
     dest[{off}] = {val}
-set{off}(b)
-print(b[{off} * 2:({off} + 1) * 2])
+set{off}(buffer)
+print(hex(get_index(buffer, {off})))
 """
 
-TEST_DATA = (
-    (15, (0x4241, 0x4443, 0x4645)),
-    (127, (0x4847, 0x4A49, 0x4C4B)),
-    (2047, (0x4E4D, 0x504F, 0x5251)),
-)
+BIT_THRESHOLDS = (5, 8, 11, 12)
+SIZE = 2
+MASK = (1 << (8 * SIZE)) - 1
 
 
 @micropython.viper
-def set_index(dest: ptr16, i: int, val: int):
+def set_index(dest: ptr16, i: int, val: uint):
     dest[i] = val
 
 
-@micropython.viper
-def set_index(dest: ptr16, i: int, val: int):
-    dest[i] = val
-
-
-b = bytearray(5000)
-for start, vals in TEST_DATA:
-    for i, v in enumerate(vals):
-        set_index(b, start + i, v)
-        print(b[(start + i) * 2 : (start + i + 1) * 2])
-
-
-for i in range(len(b)):
-    b[i] = 0
-
-
-for start, vals in TEST_DATA:
-    for i, v in enumerate(vals):
-        exec(SET_TEMPLATE.format(off=start + i, val=v + 0x0101))
+def get_index(src, i):
+    return src[i * SIZE] + (src[(i * SIZE) + 1] << 8)
+
+
+buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
+next = 1
+val = 0
+for bit in BIT_THRESHOLDS:
+    print("---", bit)
+    pre, idx, post = (
+        (((1 << bit) - (2 * SIZE)) // SIZE),
+        (((1 << bit) - (1 * SIZE)) // SIZE),
+        ((1 << bit) // SIZE),
+    )
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, pre, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, idx, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, post, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
+    exec(SET_TEMPLATE.format(off=pre, val=val & MASK))
+    val = (val << 8) + next
+    next += 1
+    exec(SET_TEMPLATE.format(off=idx, val=val & MASK))
+    val = (val << 8) + next
+    next += 1
+    exec(SET_TEMPLATE.format(off=post, val=val & MASK))
diff --git a/tests/micropython/viper_ptr16_store_boundary.py.exp b/tests/micropython/viper_ptr16_store_boundary.py.exp
index b56fe6695f298..1c084da2d9c0f 100644
--- a/tests/micropython/viper_ptr16_store_boundary.py.exp
+++ b/tests/micropython/viper_ptr16_store_boundary.py.exp
@@ -1,18 +1,20 @@
-bytearray(b'AB')
-bytearray(b'CD')
-bytearray(b'EF')
-bytearray(b'GH')
-bytearray(b'IJ')
-bytearray(b'KL')
-bytearray(b'MN')
-bytearray(b'OP')
-bytearray(b'QR')
-bytearray(b'BC')
-bytearray(b'DE')
-bytearray(b'FG')
-bytearray(b'HI')
-bytearray(b'JK')
-bytearray(b'LM')
-bytearray(b'NO')
-bytearray(b'PQ')
-bytearray(b'RS')
+--- 5
+0x1 0x102 0x203
+0x304
+0x405
+0x506
+--- 8
+0x607 0x708 0x809
+0x90a
+0xa0b
+0xb0c
+--- 11
+0xc0d 0xd0e 0xe0f
+0xf10
+0x1011
+0x1112
+--- 12
+0x1213 0x1314 0x1415
+0x1516
+0x1617
+0x1718
diff --git a/tests/micropython/viper_ptr32_load_boundary.py b/tests/micropython/viper_ptr32_load_boundary.py
index 6954bd46b239f..971d1113c49bb 100644
--- a/tests/micropython/viper_ptr32_load_boundary.py
+++ b/tests/micropython/viper_ptr32_load_boundary.py
@@ -2,24 +2,38 @@
 
 GET_TEMPLATE = """
 @micropython.viper
-def get{off}(src: ptr32) -> int:
-    return src[{off}]
-print(b[{off} * 4:({off} + 1) * 4])
+def get{off}(src: ptr32) -> uint:
+    return uint(src[{off}])
+print(hex(get{off}(buffer)))
 """
 
 
+BIT_THRESHOLDS = (5, 8, 11, 12)
+SIZE = 4
+
+
 @micropython.viper
 def get_index(src: ptr32, i: int) -> int:
     return src[i]
 
 
-b = bytearray(5000)
-b[24:43] = b"0123456789ABCDEFGHIJ"
-b[248:268] = b"KLMNOPQRSTUVWXYZabcd"
-b[4088:4108] = b"efghijklmnopqrstuvwx"
+def data(start, len):
+    output = bytearray(len)
+    for idx in range(len):
+        output[idx] = (start + idx) & 0xFF
+    return output
+
+
+buffer = bytearray((((1 << max(BIT_THRESHOLDS)) + 1) // 1024) * 1024)
+val = 0
+for bit in BIT_THRESHOLDS:
+    print("---", bit)
+    pre, idx, post = (((1 << bit) - (2 * SIZE)), ((1 << bit) - (1 * SIZE)), (1 << bit))
+    buffer[pre:post] = data(val, 3 * SIZE)
+    val = val + (3 * SIZE)
 
-for pre, idx, post in (7, 8, 9), (63, 64, 65), (1023, 1024, 1025):
-    print(get_index(b, pre), get_index(b, idx), get_index(b, post))
+    pre, idx, post = pre // SIZE, idx // SIZE, post // SIZE
+    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
     exec(GET_TEMPLATE.format(off=pre))
     exec(GET_TEMPLATE.format(off=idx))
     exec(GET_TEMPLATE.format(off=post))
diff --git a/tests/micropython/viper_ptr32_load_boundary.py.exp b/tests/micropython/viper_ptr32_load_boundary.py.exp
index a58e703f91286..1e22a8b361333 100644
--- a/tests/micropython/viper_ptr32_load_boundary.py.exp
+++ b/tests/micropython/viper_ptr32_load_boundary.py.exp
@@ -1,12 +1,20 @@
-926299444 1111570744 1178944579
-bytearray(b'4567')
-bytearray(b'89AB')
-bytearray(b'CDEF')
-1381060687 1448432723 1515804759
-bytearray(b'OPQR')
-bytearray(b'STUV')
-bytearray(b'WXYZ')
-1818978921 1886350957 1953722993
-bytearray(b'ijkl')
-bytearray(b'mnop')
-bytearray(b'qrst')
+--- 5
+0x3020100 0x7060504 0xb0a0908
+0x3020100
+0x7060504
+0xb0a0908
+--- 8
+0xf0e0d0c 0x13121110 0x17161514
+0xf0e0d0c
+0x13121110
+0x17161514
+--- 11
+0x1b1a1918 0x1f1e1d1c 0x23222120
+0x1b1a1918
+0x1f1e1d1c
+0x23222120
+--- 12
+0x27262524 0x2b2a2928 0x2f2e2d2c
+0x27262524
+0x2b2a2928
+0x2f2e2d2c
diff --git a/tests/micropython/viper_ptr32_store_boundary.py b/tests/micropython/viper_ptr32_store_boundary.py
index 243ff5cd9c2af..5109abb9dcaa8 100644
--- a/tests/micropython/viper_ptr32_store_boundary.py
+++ b/tests/micropython/viper_ptr32_store_boundary.py
@@ -1,35 +1,58 @@
 # Test boundary conditions for various architectures
 
-TEST_DATA = (
-    (3, (0x04030201, 0x08070605, 0x0C0B0A09)),
-    (63, (0x100F0E0D, 0x14131211, 0x18171615)),
-    (1023, (0x1C1B1A19, 0x201F1E1D, 0x24232221)),
-)
-
 SET_TEMPLATE = """
 @micropython.viper
 def set{off}(dest: ptr32):
-    dest[{off}] = {val} & 0x3FFFFFFF
-set{off}(b)
-print(b[{off} * 4:({off} + 1) * 4])
+    dest[{off}] = {val}
+set{off}(buffer)
+print(hex(get_index(buffer, {off})))
 """
 
+BIT_THRESHOLDS = (5, 8, 11, 12)
+SIZE = 4
+MASK = (1 << (8 * SIZE)) - 1
+
 
 @micropython.viper
-def set_index(dest: ptr32, i: int, val: int):
+def set_index(dest: ptr32, i: int, val: uint):
     dest[i] = val
 
 
-b = bytearray(5000)
-for start, vals in TEST_DATA:
-    for i, v in enumerate(vals):
-        set_index(b, start + i, v)
-        print(b[(start + i) * 4 : (start + i + 1) * 4])
-
-for i in range(len(b)):
-    b[i] = 0
-
-
-for start, vals in TEST_DATA:
-    for i, v in enumerate(vals):
-        exec(SET_TEMPLATE.format(off=start + i, val=v + 0x01010101))
+def get_index(src, i):
+    return (
+        src[i * SIZE]
+        + (src[(i * SIZE) + 1] << 8)
+        + (src[(i * SIZE) + 2] << 16)
+        + (src[(i * SIZE) + 3] << 24)
+    )
+
+
+buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
+next = 1
+val = 0
+for bit in BIT_THRESHOLDS:
+    print("---", bit)
+    pre, idx, post = (
+        (((1 << bit) - (2 * SIZE)) // SIZE),
+        (((1 << bit) - (1 * SIZE)) // SIZE),
+        ((1 << bit) // SIZE),
+    )
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, pre, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, idx, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, post, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
+    exec(SET_TEMPLATE.format(off=pre, val=val & MASK))
+    val = (val << 8) + next
+    next += 1
+    exec(SET_TEMPLATE.format(off=idx, val=val & MASK))
+    val = (val << 8) + next
+    next += 1
+    exec(SET_TEMPLATE.format(off=post, val=val & MASK))
diff --git a/tests/micropython/viper_ptr32_store_boundary.py.exp b/tests/micropython/viper_ptr32_store_boundary.py.exp
index 89f09fbc7af5f..67b114d3358ee 100644
--- a/tests/micropython/viper_ptr32_store_boundary.py.exp
+++ b/tests/micropython/viper_ptr32_store_boundary.py.exp
@@ -1,18 +1,20 @@
-bytearray(b'\x01\x02\x03\x04')
-bytearray(b'\x05\x06\x07\x08')
-bytearray(b'\t\n\x0b\x0c')
-bytearray(b'\r\x0e\x0f\x10')
-bytearray(b'\x11\x12\x13\x14')
-bytearray(b'\x15\x16\x17\x18')
-bytearray(b'\x19\x1a\x1b\x1c')
-bytearray(b'\x1d\x1e\x1f ')
-bytearray(b'!"#$')
-bytearray(b'\x02\x03\x04\x05')
-bytearray(b'\x06\x07\x08\t')
-bytearray(b'\n\x0b\x0c\r')
-bytearray(b'\x0e\x0f\x10\x11')
-bytearray(b'\x12\x13\x14\x15')
-bytearray(b'\x16\x17\x18\x19')
-bytearray(b'\x1a\x1b\x1c\x1d')
-bytearray(b'\x1e\x1f !')
-bytearray(b'"#$%')
+--- 5
+0x1 0x102 0x10203
+0x1020304
+0x2030405
+0x3040506
+--- 8
+0x4050607 0x5060708 0x6070809
+0x708090a
+0x8090a0b
+0x90a0b0c
+--- 11
+0xa0b0c0d 0xb0c0d0e 0xc0d0e0f
+0xd0e0f10
+0xe0f1011
+0xf101112
+--- 12
+0x10111213 0x11121314 0x12131415
+0x13141516
+0x14151617
+0x15161718
diff --git a/tests/micropython/viper_ptr8_load_boundary.py b/tests/micropython/viper_ptr8_load_boundary.py
index bcb17a1e1f2bc..57e06da5709ab 100644
--- a/tests/micropython/viper_ptr8_load_boundary.py
+++ b/tests/micropython/viper_ptr8_load_boundary.py
@@ -2,24 +2,37 @@
 
 GET_TEMPLATE = """
 @micropython.viper
-def get{off}(src: ptr8) -> int:
-    return src[{off}]
-print(get{off}(b))
+def get{off}(src: ptr8) -> uint:
+    return uint(src[{off}])
+print(hex(get{off}(buffer)))
 """
 
 
+BIT_THRESHOLDS = (5, 8, 11, 12)
+SIZE = 1
+
+
 @micropython.viper
 def get_index(src: ptr8, i: int) -> int:
     return src[i]
 
 
-b = bytearray(5000)
-b[30:32] = b"123"
-b[254:256] = b"456"
-b[4094:4096] = b"789"
+def data(start, len):
+    output = bytearray(len)
+    for idx in range(len):
+        output[idx] = (start + idx) & 0xFF
+    return output
+
+
+buffer = bytearray((((1 << max(BIT_THRESHOLDS)) + 1) // 1024) * 1024)
+val = 0
+for bit in BIT_THRESHOLDS:
+    print("---", bit)
+    pre, idx, post = (((1 << bit) - (2 * SIZE)), ((1 << bit) - (1 * SIZE)), (1 << bit))
+    buffer[pre:post] = data(val, 3 * SIZE)
+    val = val + (3 * SIZE)
 
-for pre, idx, post in (30, 31, 32), (254, 255, 256), (4094, 4095, 4096):
-    print(get_index(b, pre), get_index(b, idx), get_index(b, post))
+    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
     exec(GET_TEMPLATE.format(off=pre))
     exec(GET_TEMPLATE.format(off=idx))
     exec(GET_TEMPLATE.format(off=post))
diff --git a/tests/micropython/viper_ptr8_load_boundary.py.exp b/tests/micropython/viper_ptr8_load_boundary.py.exp
index 7cbd1ac78cff1..a0e423686b8fa 100644
--- a/tests/micropython/viper_ptr8_load_boundary.py.exp
+++ b/tests/micropython/viper_ptr8_load_boundary.py.exp
@@ -1,12 +1,20 @@
-49 50 51
-49
-50
-51
-52 53 54
-52
-53
-54
-55 56 57
-55
-56
-57
+--- 5
+0x0 0x1 0x2
+0x0
+0x1
+0x2
+--- 8
+0x3 0x4 0x5
+0x3
+0x4
+0x5
+--- 11
+0x6 0x7 0x8
+0x6
+0x7
+0x8
+--- 12
+0x9 0xa 0xb
+0x9
+0xa
+0xb
diff --git a/tests/micropython/viper_ptr8_store_boundary.py b/tests/micropython/viper_ptr8_store_boundary.py
index ad512684549a7..e1fe6dcae3279 100644
--- a/tests/micropython/viper_ptr8_store_boundary.py
+++ b/tests/micropython/viper_ptr8_store_boundary.py
@@ -1,30 +1,49 @@
 # Test boundary conditions for various architectures
 
-TEST_DATA = ((49, 30, 3), (52, 254, 3), (55, 4094, 3))
-
 SET_TEMPLATE = """
 @micropython.viper
 def set{off}(dest: ptr8):
     dest[{off}] = {val}
-set{off}(b)
-print(b[{off}])
+set{off}(buffer)
+print(hex(get_index(buffer, {off})))
 """
 
+BIT_THRESHOLDS = (5, 8, 11, 12)
+SIZE = 1
+MASK = (1 << (8 * SIZE)) - 1
+
 
 @micropython.viper
-def set_index(dest: ptr8, i: int, val: int):
+def set_index(dest: ptr8, i: int, val: uint):
     dest[i] = val
 
 
-b = bytearray(5000)
-for val, start, count in TEST_DATA:
-    for i in range(count):
-        set_index(b, start + i, val + i)
-    print(b[start : start + count])
-
-for i in range(len(b)):
-    b[i] = 0
-
-for val, start, count in TEST_DATA:
-    for i in range(count):
-        exec(SET_TEMPLATE.format(off=start + i, val=val + i + 16))
+def get_index(src: ptr8, i: int):
+    return src[i]
+
+
+buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
+next = 1
+val = 0
+for bit in BIT_THRESHOLDS:
+    print("---", bit)
+    pre, idx, post = (((1 << bit) - (2 * SIZE)), ((1 << bit) - (1 * SIZE)), (1 << bit))
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, pre, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, idx, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    set_index(buffer, post, val & MASK)
+    val = (val << 8) + next
+    next += 1
+    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
+    exec(SET_TEMPLATE.format(off=pre, val=val & MASK))
+    val = (val << 8) + next
+    next += 1
+    exec(SET_TEMPLATE.format(off=idx, val=val & MASK))
+    val = (val << 8) + next
+    next += 1
+    exec(SET_TEMPLATE.format(off=post, val=val & MASK))
diff --git a/tests/micropython/viper_ptr8_store_boundary.py.exp b/tests/micropython/viper_ptr8_store_boundary.py.exp
index a35cb3ac9e0dd..6b0f7ce13e8cf 100644
--- a/tests/micropython/viper_ptr8_store_boundary.py.exp
+++ b/tests/micropython/viper_ptr8_store_boundary.py.exp
@@ -1,12 +1,20 @@
-bytearray(b'123')
-bytearray(b'456')
-bytearray(b'789')
-65
-66
-67
-68
-69
-70
-71
-72
-73
+--- 5
+0x1 0x2 0x3
+0x4
+0x5
+0x6
+--- 8
+0x7 0x8 0x9
+0xa
+0xb
+0xc
+--- 11
+0xd 0xe 0xf
+0x10
+0x11
+0x12
+--- 12
+0x13 0x14 0x15
+0x16
+0x17
+0x18

From 6fd7422a8e5b6c8952f7b67713f0551992d247cc Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 10 Jun 2025 22:54:38 +0200
Subject: [PATCH 2421/3129] tests/run-tests.py: Allow injected code
 customisation.

This commit introduces a mechanism to customise the code that is
injected to the board when performing a test file upload and execution.

A new argument, --begin", is added so regular Python code can be
inserted in the injected fragment between the module file creation and
the effective file import.  This is needed for running larger tests
(usually ones that have been pre-compiled with
"--via-mpy --emit native") on ESP8266, as that board does not have
enough memory to fit certain blocks of code unless additional
configuration is performed.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/run-tests.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 628fde9d30a4c..e45122b10edda 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -95,6 +95,7 @@ def open(self, path, mode):
     return __File()
 vfs.mount(__FS(), '/__vfstest')
 os.chdir('/__vfstest')
+{import_prologue}
 __import__('__injected_test')
 """
 
@@ -1130,6 +1131,8 @@ def __call__(self, parser, args, value, option):
 
 
 def main():
+    global injected_import_hook_code
+
     cmd_parser = argparse.ArgumentParser(
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description="""Run and manage tests for MicroPython.
@@ -1239,8 +1242,20 @@ def main():
         action="store_true",
         help="re-run only the failed tests",
     )
+    cmd_parser.add_argument(
+        "--begin",
+        metavar="PROLOGUE",
+        default=None,
+        help="prologue python file to execute before module import",
+    )
     args = cmd_parser.parse_args()
 
+    prologue = ""
+    if args.begin:
+        with open(args.begin, "rt") as source:
+            prologue = source.read()
+    injected_import_hook_code = injected_import_hook_code.replace("{import_prologue}", prologue)
+
     if args.print_failures:
         for out in glob(os.path.join(args.result_dir, "*.out")):
             testbase = out[:-4]

From 1b0cdc0794825fe147fc3bc8a717e83246640d2d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 26 Jun 2025 20:25:09 +0200
Subject: [PATCH 2422/3129] py/asmthumb: Clean up integer-indexed load/store
 emitters.

This commit cleans up the single entry point integer-indexed load/store
emitters that have been built by merging the single operand type
load/store functions in 1f5ba6998bb1895354f5afcd7bb52d83a02733be.

To follow the same convention found in RV32 and Xtensa emitters, the
function operand size is not named after the left shift amount to apply
to the initial offset to get its true byte offset, but by a generic
"operand size".

Also, those functions were updated to use the new MP_FIT_UNSIGNED macros
to perform bit width checks when figuring out which opcode encoding is
the best one to use.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmthumb.c | 36 +++++++++++++++++++-----------------
 py/asmthumb.h |  4 ++--
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index fda0f52705e53..18c3db9e4e28f 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -37,10 +37,8 @@
 #include "py/asmthumb.h"
 #include "py/misc.h"
 
-#define UNSIGNED_FIT5(x) ((uint32_t)(x) < 32)
 #define UNSIGNED_FIT7(x) ((uint32_t)(x) < 128)
 #define UNSIGNED_FIT8(x) (((x) & 0xffffff00) == 0)
-#define UNSIGNED_FIT12(x) (((x) & 0xfffff000) == 0)
 #define UNSIGNED_FIT16(x) (((x) & 0xffff0000) == 0)
 #define SIGNED_FIT8(x) (((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80)
 #define SIGNED_FIT9(x) (((x) & 0xffffff00) == 0) || (((x) & 0xffffff00) == 0xffffff00)
@@ -454,7 +452,7 @@ static void asm_thumb_add_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint re
     }
 }
 
-#define OP_LDR_STR_W_HI(shift, reg) ((0xf880 | (shift) << 5) | (reg))
+#define OP_LDR_STR_W_HI(operation_size, reg) ((0xf880 | (operation_size) << 5) | (reg))
 #define OP_LDR_STR_W_LO(reg, imm12) (((reg) << 12) | (imm12))
 
 #define OP_LDR 0x01
@@ -467,31 +465,35 @@ static const uint8_t OP_LDR_STR_TABLE[3] = {
     0x0E, 0x10, 0x0C
 };
 
-void asm_thumb_load_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint shift) {
-    if (UNSIGNED_FIT5(offset) && (reg_dest < ASM_THUMB_REG_R8) && (reg_base < ASM_THUMB_REG_R8)) {
+void asm_thumb_load_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint operation_size) {
+    assert(operation_size <= 2 && "Operation size out of range.");
+
+    if (MP_FIT_UNSIGNED(5, offset) && (reg_dest < ASM_THUMB_REG_R8) && (reg_base < ASM_THUMB_REG_R8)) {
         // Can use T1 encoding
-        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_LDR) << 11) | (offset << 6) | (reg_base << 3) | reg_dest);
-    } else if (asm_thumb_allow_armv7m(as) && UNSIGNED_FIT12(offset << shift)) {
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[operation_size] | OP_LDR) << 11) | (offset << 6) | (reg_base << 3) | reg_dest);
+    } else if (asm_thumb_allow_armv7m(as) && MP_FIT_UNSIGNED(12, offset << operation_size)) {
         // Can use T3 encoding
-        asm_thumb_op32(as, (OP_LDR_STR_W_HI(shift, reg_base) | OP_LDR_W), OP_LDR_STR_W_LO(reg_dest, (offset << shift)));
+        asm_thumb_op32(as, (OP_LDR_STR_W_HI(operation_size, reg_base) | OP_LDR_W), OP_LDR_STR_W_LO(reg_dest, (offset << operation_size)));
     } else {
         // Must use the generic sequence
-        asm_thumb_add_reg_reg_offset(as, reg_dest, reg_base, offset - 31, shift);
-        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_LDR) << 11) | (31 << 6) | (reg_dest << 3) | (reg_dest));
+        asm_thumb_add_reg_reg_offset(as, reg_dest, reg_base, offset - 31, operation_size);
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[operation_size] | OP_LDR) << 11) | (31 << 6) | (reg_dest << 3) | (reg_dest));
     }
 }
 
-void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base, uint offset, uint shift) {
-    if (UNSIGNED_FIT5(offset) && (reg_src < ASM_THUMB_REG_R8) && (reg_base < ASM_THUMB_REG_R8)) {
+void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base, uint offset, uint operation_size) {
+    assert(operation_size <= 2 && "Operation size out of range.");
+
+    if (MP_FIT_UNSIGNED(5, offset) && (reg_src < ASM_THUMB_REG_R8) && (reg_base < ASM_THUMB_REG_R8)) {
         // Can use T1 encoding
-        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_STR) << 11) | (offset << 6) | (reg_base << 3) | reg_src);
-    } else if (asm_thumb_allow_armv7m(as) && UNSIGNED_FIT12(offset << shift)) {
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[operation_size] | OP_STR) << 11) | (offset << 6) | (reg_base << 3) | reg_src);
+    } else if (asm_thumb_allow_armv7m(as) && MP_FIT_UNSIGNED(12, offset << operation_size)) {
         // Can use T3 encoding
-        asm_thumb_op32(as, (OP_LDR_STR_W_HI(shift, reg_base) | OP_STR_W), OP_LDR_STR_W_LO(reg_src, (offset << shift)));
+        asm_thumb_op32(as, (OP_LDR_STR_W_HI(operation_size, reg_base) | OP_STR_W), OP_LDR_STR_W_LO(reg_src, (offset << operation_size)));
     } else {
         // Must use the generic sequence
-        asm_thumb_add_reg_reg_offset(as, reg_base, reg_base, offset - 31, shift);
-        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[shift] | OP_STR) << 11) | (31 << 6) | (reg_base << 3) | reg_src);
+        asm_thumb_add_reg_reg_offset(as, reg_base, reg_base, offset - 31, operation_size);
+        asm_thumb_op16(as, ((OP_LDR_STR_TABLE[operation_size] | OP_STR) << 11) | (31 << 6) | (reg_base << 3) | reg_src);
     }
 }
 
diff --git a/py/asmthumb.h b/py/asmthumb.h
index b423ce7a4d0e7..9cd9d32d83fb3 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -365,9 +365,9 @@ 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);
 
 // Generate optimised load dest, [src, #offset] sequence
-void asm_thumb_load_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint shift);
+void asm_thumb_load_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint operation_size);
 // Generate optimised store src, [dest, #offset] sequence
-void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base, uint offset, uint shift);
+void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base, uint offset, uint operation_size);
 
 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 4a1edc4866f253cb446889e1f1a719c74e7dcd04 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 Jun 2025 18:30:25 +0200
Subject: [PATCH 2423/3129] alif/machine_pin: Add support for machine.Pin IRQ.

Matches existing `Pin.irq()` API.  Both rising and falling edge work.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/irq.h         |   1 +
 ports/alif/machine_pin.c | 197 +++++++++++++++++++++++++++++++++++++++
 ports/alif/main.c        |   2 +
 ports/alif/mphalport.h   |   3 +
 4 files changed, 203 insertions(+)

diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index 08b8ef8086bc3..02df524a49c86 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -48,6 +48,7 @@
 #define IRQ_PRI_USB             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 7, 0)
 #define IRQ_PRI_HWSEM           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 8, 0)
 #define IRQ_PRI_GPU             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 10, 0)
+#define IRQ_PRI_GPIO            NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 50, 0)
 #define IRQ_PRI_RTC             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 100, 0)
 #define IRQ_PRI_CYW43           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 126, 0)
 #define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
diff --git a/ports/alif/machine_pin.c b/ports/alif/machine_pin.c
index 02c5e482adb89..b8773f103f27a 100644
--- a/ports/alif/machine_pin.c
+++ b/ports/alif/machine_pin.c
@@ -30,8 +30,76 @@
 #include "extmod/virtpin.h"
 #include "shared/runtime/mpirq.h"
 
+#ifndef MACHINE_PIN_NUM_VECTORS
+#define MACHINE_PIN_NUM_PORT_IO (8)
+#define MACHINE_PIN_NUM_VECTORS (16 * MACHINE_PIN_NUM_PORT_IO)
+#endif
+
+typedef struct _machine_pin_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+    IRQn_Type irq_num;
+    bool reserved; // for use by other drivers
+} machine_pin_irq_obj_t;
+
+#define MACHINE_PIN_IRQ_INDEX(port, pin) \
+    ((port) * MACHINE_PIN_NUM_PORT_IO + (pin))
+
+#define MACHINE_PIN_IRQ_OBJECT(port, pin) \
+    (MP_STATE_PORT(machine_pin_irq_obj[MACHINE_PIN_IRQ_INDEX((port), (pin))]))
+
+// Defines a single GPIO IRQ handler
+#define DEFINE_GPIO_IRQ_HANDLER(pname, port, pin) \
+    void pname##_IRQ##pin##Handler(void) { \
+        machine_pin_irq_obj_t *irq = MACHINE_PIN_IRQ_OBJECT(port, pin); \
+        machine_pin_obj_t *self = MP_OBJ_TO_PTR(irq->base.parent); \
+        gpio_interrupt_eoi(self->gpio, pin); \
+        irq->flags = irq->trigger; \
+        mp_irq_handler(&irq->base); \
+    }
+
+// Defines all 8 pin IRQ handlers for a port
+#define DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(gpio, port) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 0) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 1) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 2) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 3) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 4) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 5) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 6) \
+    DEFINE_GPIO_IRQ_HANDLER(gpio, port, 7)
+
+// Generate handlers for GPIO ports 0 to 14 + LPGPIO
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO0, 0)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO1, 1)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO2, 2)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO3, 3)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO4, 4)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO5, 5)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO6, 6)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO7, 7)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO8, 8)
+
+DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 0)
+DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 1)
+DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 2)
+DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 3)
+DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 4)
+DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 5)
+// DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 6)  // Reserved for WiFi
+DEFINE_GPIO_IRQ_HANDLER(GPIO9, 9, 7)
+
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO10, 10)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO11, 11)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO12, 12)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO13, 13)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(GPIO14, 14)
+DEFINE_GPIO_IRQ_HANDLERS_FOR_PORT(LPGPIO, 15)
+
 extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;
 extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
+static const mp_irq_methods_t machine_pin_irq_methods;
 
 static 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;
@@ -171,6 +239,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
         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);
 }
 
@@ -225,6 +294,129 @@ 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);
 
+static mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t trigger) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_irq_obj_t *irq = MACHINE_PIN_IRQ_OBJECT(self->port, self->pin);
+
+    irq->flags = 0;
+    irq->trigger = trigger;
+
+    // Disable IRQs.
+    gpio_disable_interrupt(self->gpio, self->pin);
+    gpio_mask_interrupt(self->gpio, self->pin);
+
+    NVIC_ClearPendingIRQ(irq->irq_num);
+    NVIC_DisableIRQ(irq->irq_num);
+
+    // Return if the trigger is disabled.
+    if (trigger == 0) {
+        return 0;
+    }
+
+    // Clear and enable GPIO IRQ.
+    gpio_enable_interrupt(self->gpio, self->pin);
+    gpio_unmask_interrupt(self->gpio, self->pin);
+
+    // Clear GPIO config.
+    self->gpio->GPIO_INT_BOTHEDGE &= ~(1 << self->pin);
+    self->gpio->GPIO_INT_POLARITY &= ~(1 << self->pin);
+    self->gpio->GPIO_INTTYPE_LEVEL &= ~(1 << self->pin);
+
+    // Configure GPIO IRQ trigger
+    if (trigger == MP_HAL_PIN_TRIGGER_FALL) {
+        gpio_interrupt_set_edge_trigger(self->gpio, self->pin);
+        gpio_interrupt_set_polarity_low(self->gpio, self->pin);
+    } else if (trigger == MP_HAL_PIN_TRIGGER_RISE) {
+        gpio_interrupt_set_edge_trigger(self->gpio, self->pin);
+        gpio_interrupt_set_polarity_high(self->gpio, self->pin);
+    } else if (trigger == (MP_HAL_PIN_TRIGGER_FALL | MP_HAL_PIN_TRIGGER_RISE)) {
+        gpio_interrupt_set_both_edge_trigger(self->gpio, self->pin);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("Invalid IRQ trigger"));
+    }
+
+    // Clear GPIO IRQ (must be done after configuring trigger)
+    gpio_interrupt_eoi(self->gpio, self->pin);
+
+    // Clear and enable NVIC GPIO IRQ.
+    NVIC_ClearPendingIRQ(irq->irq_num);
+    NVIC_SetPriority(irq->irq_num, IRQ_PRI_GPIO);
+    NVIC_EnableIRQ(irq->irq_num);
+
+    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 = MACHINE_PIN_IRQ_OBJECT(self->port, 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,
+};
+
+// 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_IRQ_OBJECT(self->port, self->pin);
+
+    // Allocate a new IRQ object if it doesn't exist.
+    if (irq == NULL) {
+        irq = m_new_obj(machine_pin_irq_obj_t);
+        uint32_t idx = MACHINE_PIN_IRQ_INDEX(self->port, self->pin);
+
+        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->reserved = false;
+        irq->irq_num = (self->port < 15) ? (GPIO0_IRQ0_IRQn + idx) : (LPGPIO_IRQ0_IRQn + self->pin);
+        MP_STATE_PORT(machine_pin_irq_obj[idx]) = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        if (irq->reserved) {
+            mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("Pin IRQ is reserved"));
+        }
+        irq->base.handler = args[ARG_handler].u_obj;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        machine_pin_irq_trigger(self, args[ARG_trigger].u_int);
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
+void machine_pin_irq_deinit(void) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(machine_pin_irq_obj)); i++) {
+        machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[i]);
+        if (irq != NULL) {
+            machine_pin_obj_t *self = MP_OBJ_TO_PTR(irq->base.parent);
+            machine_pin_irq_trigger(self, 0);
+            MP_STATE_PORT(machine_pin_irq_obj[i]) = NULL;
+        }
+    }
+}
+
 static MP_DEFINE_CONST_OBJ_TYPE(
     pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
@@ -248,6 +440,7 @@ static const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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 attributes
     { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&pin_board_pins_obj_type) },
@@ -259,6 +452,8 @@ static const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(MP_HAL_PIN_MODE_OPEN_DRAIN) },
     { 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_IRQ_FALLING), MP_ROM_INT(MP_HAL_PIN_TRIGGER_FALL) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(MP_HAL_PIN_TRIGGER_RISE) },
 };
 static MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
@@ -296,3 +491,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
     return machine_pin_find(obj);
 }
+
+MP_REGISTER_ROOT_POINTER(void *machine_pin_irq_obj[MACHINE_PIN_NUM_VECTORS]);
diff --git a/ports/alif/main.c b/ports/alif/main.c
index 47836113577e8..ab5e85d5b9db6 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -55,6 +55,7 @@
 
 extern uint8_t __StackTop, __StackLimit;
 extern uint8_t __GcHeapStart, __GcHeapEnd;
+extern void machine_pin_irq_deinit(void);
 
 MP_NORETURN void panic(const char *msg) {
     mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
@@ -164,6 +165,7 @@ int main(void) {
         mp_bluetooth_deinit();
         #endif
         soft_timer_deinit();
+        machine_pin_irq_deinit();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
index 4f81439b5492e..f03dc7c1c1f84 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -90,6 +90,9 @@ extern ringbuf_t stdin_ringbuf;
 #define MP_HAL_PIN_SPEED_LOW                    (0)
 #define MP_HAL_PIN_SPEED_HIGH                   (PADCTRL_SLEW_RATE_FAST)
 
+#define MP_HAL_PIN_TRIGGER_FALL                 (1)
+#define MP_HAL_PIN_TRIGGER_RISE                 (2)
+
 #define mp_hal_pin_obj_t const machine_pin_obj_t *
 
 #define MP_HAL_PIN_ALT(function, unit)          (MP_HAL_PIN_ALT_MAKE((MP_HAL_PIN_ALT_##function), (unit)))

From 16f9d7fdc3b97aad9613b95e3258844ef722af5c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 Jun 2025 18:59:31 +0200
Subject: [PATCH 2424/3129] alif/machine_spi: Improve transfer function to poll
 events.

Poll events during SPI transfer (USB fails during long transfers
otherwise).  And add a timeout for the blocking transfer.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/machine_spi.c | 60 ++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/ports/alif/machine_spi.c b/ports/alif/machine_spi.c
index abb60bc4e8325..b2c14745cfc32 100644
--- a/ports/alif/machine_spi.c
+++ b/ports/alif/machine_spi.c
@@ -39,6 +39,7 @@ typedef struct _machine_spi_obj_t {
     uint8_t id;
     SPI_Type *inst;
     bool is_lp;
+    uint32_t bits;
 } machine_spi_obj_t;
 
 static machine_spi_obj_t machine_spi_obj[] = {
@@ -246,6 +247,9 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     // Get static peripheral object.
     machine_spi_obj_t *self = &machine_spi_obj[spi_id];
 
+    // Set args
+    self->bits = args[ARG_bits].u_int;
+
     // here we would check the sck/mosi/miso pins and configure them, but it's not implemented
     if (args[ARG_sck].u_obj != MP_OBJ_NULL ||
         args[ARG_mosi].u_obj != MP_OBJ_NULL ||
@@ -294,22 +298,50 @@ static void machine_spi_deinit(mp_obj_base_t *self_in) {
     }
 }
 
+static void machine_spi_poll_flag(SPI_Type *spi, uint32_t flag, uint32_t timeout) {
+    mp_uint_t tick_start = mp_hal_ticks_ms();
+    while (!(spi->SPI_SR & flag)) {
+        if (mp_hal_ticks_ms() - tick_start >= timeout) {
+            mp_raise_OSError(MP_ETIMEDOUT);
+        }
+        mp_event_handle_nowait();
+    }
+}
+
 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;
-    spi_transfer_t spi_xfer = {
-        .tx_buff = src,
-        .tx_total_cnt = len,
-        .rx_buff = dest,
-        .rx_total_cnt = len,
-        .tx_default_val = 0xFF,
-        .tx_default_enable = true,
-        .mode = SPI_TMOD_TX_AND_RX,
-    };
-    // TODO redo transfer_blocking to timeout and poll events.
-    if (!self->is_lp) {
-        spi_transfer_blocking(self->inst, &spi_xfer);
-    } else {
-        lpspi_transfer_blocking(self->inst, &spi_xfer);
+    volatile uint32_t *dr = self->inst->SPI_DR;
+
+    spi_set_tmod(self->inst, SPI_TMOD_TX_AND_RX);
+
+    for (size_t i = 0; i < len; i++) {
+        // Wait for space in the TX FIFO
+        machine_spi_poll_flag(self->inst, SPI_SR_TFNF, 100);
+
+        // Send data
+        if (src == NULL) {
+            *dr = 0xFFFFFFFFU;
+        } else if (self->bits > 16) {
+            *dr = ((uint32_t *)src)[i];
+        } else if (self->bits > 8) {
+            *dr = ((uint16_t *)src)[i];
+        } else {
+            *dr = ((uint8_t *)src)[i];
+        }
+
+        // Wait for data in the RX FIFO
+        machine_spi_poll_flag(self->inst, SPI_SR_RFNE, 100);
+
+        // Recv data
+        if (dest == NULL) {
+            (void)*dr;
+        } else if (self->bits > 16) {
+            ((uint32_t *)dest)[i] = *dr;
+        } else if (self->bits > 8) {
+            ((uint16_t *)dest)[i] = *dr;
+        } else {
+            ((uint8_t *)dest)[i] = *dr;
+        }
     }
 }
 

From e33a0f4682374faadc0a6ef5bb02b16bcc3f2d88 Mon Sep 17 00:00:00 2001
From: Andrea Giammarchi <andrea.giammarchi@gmail.com>
Date: Wed, 2 Jul 2025 18:54:21 +0200
Subject: [PATCH 2425/3129] webassembly/objpyproxy: Avoid throwing on symbol or
 iterator has-check.

JavaScript code uses "Symbol in object" to brand check its own proxies, and
such checks should also work on the Python side.

Signed-off-by: Andrea Giammarchi <andrea.giammarchi@gmail.com>
---
 ports/webassembly/objpyproxy.js              | 6 ++++++
 tests/ports/webassembly/py_proxy_has.mjs     | 2 ++
 tests/ports/webassembly/py_proxy_has.mjs.exp | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/ports/webassembly/objpyproxy.js b/ports/webassembly/objpyproxy.js
index 3b94f8aadc782..0eafd0dec53de 100644
--- a/ports/webassembly/objpyproxy.js
+++ b/ports/webassembly/objpyproxy.js
@@ -148,6 +148,12 @@ const py_proxy_handler = {
         };
     },
     has(target, prop) {
+        // avoid throwing on `Symbol() in proxy` checks
+        if (typeof prop !== "string") {
+            // returns true only on iterator because other
+            // symbols are not considered in the `get` trap
+            return prop === Symbol.iterator;
+        }
         return Module.ccall(
             "proxy_c_to_js_has_attr",
             "number",
diff --git a/tests/ports/webassembly/py_proxy_has.mjs b/tests/ports/webassembly/py_proxy_has.mjs
index 8881776fdbe51..37df0ae1794c9 100644
--- a/tests/ports/webassembly/py_proxy_has.mjs
+++ b/tests/ports/webassembly/py_proxy_has.mjs
@@ -9,3 +9,5 @@ x = []
 const x = mp.globals.get("x");
 console.log("no_exist" in x);
 console.log("sort" in x);
+console.log(Symbol.toStringTag in x);
+console.log(Symbol.iterator in x);
diff --git a/tests/ports/webassembly/py_proxy_has.mjs.exp b/tests/ports/webassembly/py_proxy_has.mjs.exp
index 1d474d5255713..7565230c01f70 100644
--- a/tests/ports/webassembly/py_proxy_has.mjs.exp
+++ b/tests/ports/webassembly/py_proxy_has.mjs.exp
@@ -1,2 +1,4 @@
 false
 true
+false
+true

From 3a97175f5f7023d9f8db37c21e0c04174df0f205 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 27 Sep 2021 17:42:50 +1000
Subject: [PATCH 2426/3129] tools/mpremote: Fix disconnect handling on Windows
 and Linux.

Changes in this commit:
- Handle SerialException on Windows when device disconnects.
- Print clean 'device disconnected' message instead of stack trace.
- Fix terminal formatting issues on Linux after disconnect.
- Return disconnected state after console cleanup to avoid terminal issues.

This ensures proper disconnect messages on both platforms without showing
confusing error traces to users.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 tools/mpremote/mpremote/main.py |   6 +-
 tools/mpremote/mpremote/repl.py | 107 +++++++++++++++++++-------------
 2 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index d122e93c0f964..0441857fab777 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -620,7 +620,11 @@ def main():
         # If no commands were "actions" then implicitly finish with the REPL
         # using default args.
         if state.run_repl_on_completion():
-            do_repl(state, argparse_repl().parse_args([]))
+            disconnected = do_repl(state, argparse_repl().parse_args([]))
+
+            # Handle disconnection message
+            if disconnected:
+                print("\ndevice disconnected")
 
         return 0
     except CommandError as e:
diff --git a/tools/mpremote/mpremote/repl.py b/tools/mpremote/mpremote/repl.py
index d24a7774ac37d..4fda04a2e2ab3 100644
--- a/tools/mpremote/mpremote/repl.py
+++ b/tools/mpremote/mpremote/repl.py
@@ -7,51 +7,53 @@ def do_repl_main_loop(
     state, console_in, console_out_write, *, escape_non_printable, code_to_inject, file_to_inject
 ):
     while True:
-        console_in.waitchar(state.transport.serial)
-        c = console_in.readchar()
-        if c:
-            if c in (b"\x1d", b"\x18"):  # ctrl-] or ctrl-x, quit
-                break
-            elif c == b"\x04":  # ctrl-D
-                # special handling needed for ctrl-D if filesystem is mounted
-                state.transport.write_ctrl_d(console_out_write)
-            elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
-                state.transport.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.transport.enter_raw_repl(soft_reset=False)
-                with open(file_to_inject, "rb") as f:
-                    pyfile = f.read()
-                try:
-                    state.transport.exec_raw_no_follow(pyfile)
-                except TransportError as er:
-                    console_out_write(b"Error:\r\n")
-                    console_out_write(er)
-                state.transport.exit_raw_repl()
-            else:
-                state.transport.serial.write(c)
-
         try:
+            console_in.waitchar(state.transport.serial)
+            c = console_in.readchar()
+            if c:
+                if c in (b"\x1d", b"\x18"):  # ctrl-] or ctrl-x, quit
+                    break
+                elif c == b"\x04":  # ctrl-D
+                    # special handling needed for ctrl-D if filesystem is mounted
+                    state.transport.write_ctrl_d(console_out_write)
+                elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
+                    state.transport.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.transport.enter_raw_repl(soft_reset=False)
+                    with open(file_to_inject, "rb") as f:
+                        pyfile = f.read()
+                    try:
+                        state.transport.exec_raw_no_follow(pyfile)
+                    except TransportError as er:
+                        console_out_write(b"Error:\r\n")
+                        console_out_write(er)
+                    state.transport.exit_raw_repl()
+                else:
+                    state.transport.serial.write(c)
+
             n = state.transport.serial.inWaiting()
-        except OSError as er:
-            if er.args[0] == 5:  # IO error, device disappeared
-                print("device disconnected")
-                break
+            if n > 0:
+                dev_data_in = state.transport.serial.read(n)
+                if dev_data_in is not None:
+                    if escape_non_printable:
+                        # Pass data through to the console, with escaping of non-printables.
+                        console_data_out = bytearray()
+                        for c in dev_data_in:
+                            if c in (8, 9, 10, 13, 27) or 32 <= c <= 126:
+                                console_data_out.append(c)
+                            else:
+                                console_data_out.extend(b"[%02x]" % c)
+                    else:
+                        console_data_out = dev_data_in
+                    console_out_write(console_data_out)
 
-        if n > 0:
-            dev_data_in = state.transport.serial.read(n)
-            if dev_data_in is not None:
-                if escape_non_printable:
-                    # Pass data through to the console, with escaping of non-printables.
-                    console_data_out = bytearray()
-                    for c in dev_data_in:
-                        if c in (8, 9, 10, 13, 27) or 32 <= c <= 126:
-                            console_data_out.append(c)
-                        else:
-                            console_data_out.extend(b"[%02x]" % c)
-                else:
-                    console_data_out = dev_data_in
-                console_out_write(console_data_out)
+        except OSError as er:
+            if _is_disconnect_exception(er):
+                return True
+            else:
+                raise
+    return False
 
 
 def do_repl(state, args):
@@ -86,7 +88,7 @@ def console_out_write(b):
             capture_file.flush()
 
     try:
-        do_repl_main_loop(
+        return do_repl_main_loop(
             state,
             console,
             console_out_write,
@@ -98,3 +100,22 @@ def console_out_write(b):
         console.exit()
         if capture_file is not None:
             capture_file.close()
+
+
+def _is_disconnect_exception(exception):
+    """
+    Check if an exception indicates device disconnect.
+
+    Returns True if the exception indicates the device has disconnected,
+    False otherwise.
+    """
+    if isinstance(exception, OSError):
+        if hasattr(exception, 'args') and len(exception.args) > 0:
+            # IO error, device disappeared
+            if exception.args[0] == 5:
+                return True
+        # Check for common disconnect messages in the exception string
+        exception_str = str(exception)
+        disconnect_indicators = ["Write timeout", "Device disconnected", "ClearCommError failed"]
+        return any(indicator in exception_str for indicator in disconnect_indicators)
+    return False

From 2ab06b61b3f60e42cda250203bda31667ecef043 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 26 Jun 2025 21:56:26 +0200
Subject: [PATCH 2427/3129] py/emitnative: Let emitters know the compiled
 entity's name.

This commit introduces an optional feature to provide to native emitters
the fully qualified name of the entity they are compiling.

This is achieved by altering the generic ASM API to provide a third
argument to the entry function, containing the name of the entity being
compiled.  Currently only the debug emitter uses this feature, as it is
not really useful for other emitters for the time being; in fact the
macros in question just strip the name away.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmarm.h     | 10 +++++-----
 py/asmrv32.h    |  2 +-
 py/asmthumb.h   | 10 +++++-----
 py/asmx64.h     | 10 +++++-----
 py/asmx86.h     | 10 +++++-----
 py/asmxtensa.h  | 12 ++++++------
 py/emitnative.c | 34 +++++++++++++++++++++++++++++++---
 py/emitndebug.c |  8 ++++----
 py/mpconfig.h   |  5 +++++
 9 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/py/asmarm.h b/py/asmarm.h
index 0d68812145fd8..405457d4408a8 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -164,12 +164,12 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 // Holds a pointer to mp_fun_table
 #define REG_FUN_TABLE ASM_ARM_REG_FUN_TABLE
 
-#define ASM_T               asm_arm_t
-#define ASM_END_PASS        asm_arm_end_pass
-#define ASM_ENTRY           asm_arm_entry
-#define ASM_EXIT            asm_arm_exit
+#define ASM_T                           asm_arm_t
+#define ASM_END_PASS                    asm_arm_end_pass
+#define ASM_ENTRY(as, num_locals, name) asm_arm_entry((as), (num_locals))
+#define ASM_EXIT                        asm_arm_exit
 
-#define ASM_JUMP            asm_arm_b_label
+#define ASM_JUMP                        asm_arm_b_label
 #define ASM_JUMP_IF_REG_ZERO(as, reg, label, bool_test) \
     do { \
         asm_arm_cmp_reg_i8(as, reg, 0); \
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 99c2226ef33ab..dac9c028b07a5 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -718,7 +718,7 @@ void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs);
 void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_uint_t base, int32_t offset, mp_uint_t operation_size);
 
 #define ASM_T asm_rv32_t
-#define ASM_ENTRY(state, labels) asm_rv32_entry(state, labels)
+#define ASM_ENTRY(state, labels, name) asm_rv32_entry(state, labels)
 #define ASM_EXIT(state) asm_rv32_exit(state)
 #define ASM_END_PASS(state) asm_rv32_end_pass(state)
 
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 9cd9d32d83fb3..5edf6573e1a6a 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -403,12 +403,12 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 
 #define REG_FUN_TABLE ASM_THUMB_REG_FUN_TABLE
 
-#define ASM_T               asm_thumb_t
-#define ASM_END_PASS        asm_thumb_end_pass
-#define ASM_ENTRY           asm_thumb_entry
-#define ASM_EXIT            asm_thumb_exit
+#define ASM_T                           asm_thumb_t
+#define ASM_END_PASS                    asm_thumb_end_pass
+#define ASM_ENTRY(as, num_locals, name) asm_thumb_entry((as), (num_locals))
+#define ASM_EXIT                        asm_thumb_exit
 
-#define ASM_JUMP            asm_thumb_b_label
+#define ASM_JUMP                        asm_thumb_b_label
 #define ASM_JUMP_IF_REG_ZERO(as, reg, label, bool_test) \
     do { \
         asm_thumb_cmp_rlo_i8(as, reg, 0); \
diff --git a/py/asmx64.h b/py/asmx64.h
index f2fb5da180597..d80c5dcc13f1a 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -154,12 +154,12 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 // Holds a pointer to mp_fun_table
 #define REG_FUN_TABLE ASM_X64_REG_FUN_TABLE
 
-#define ASM_T               asm_x64_t
-#define ASM_END_PASS        asm_x64_end_pass
-#define ASM_ENTRY           asm_x64_entry
-#define ASM_EXIT            asm_x64_exit
+#define ASM_T                           asm_x64_t
+#define ASM_END_PASS                    asm_x64_end_pass
+#define ASM_ENTRY(as, num_locals, name) asm_x64_entry((as), (num_locals))
+#define ASM_EXIT                        asm_x64_exit
 
-#define ASM_JUMP            asm_x64_jmp_label
+#define ASM_JUMP                        asm_x64_jmp_label
 #define ASM_JUMP_IF_REG_ZERO(as, reg, label, bool_test) \
     do { \
         if (bool_test) { \
diff --git a/py/asmx86.h b/py/asmx86.h
index 2cec38ed4517e..d2e078ad51d29 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -149,12 +149,12 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
 // Holds a pointer to mp_fun_table
 #define REG_FUN_TABLE ASM_X86_REG_FUN_TABLE
 
-#define ASM_T               asm_x86_t
-#define ASM_END_PASS        asm_x86_end_pass
-#define ASM_ENTRY           asm_x86_entry
-#define ASM_EXIT            asm_x86_exit
+#define ASM_T                           asm_x86_t
+#define ASM_END_PASS                    asm_x86_end_pass
+#define ASM_ENTRY(as, num_locals, name) asm_x86_entry((as), (num_locals))
+#define ASM_EXIT                        asm_x86_exit
 
-#define ASM_JUMP            asm_x86_jmp_label
+#define ASM_JUMP                        asm_x86_jmp_label
 #define ASM_JUMP_IF_REG_ZERO(as, reg, label, bool_test) \
     do { \
         if (bool_test) { \
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 7f113ca12e090..559b3cacd5d45 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -340,9 +340,9 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 #define ASM_NUM_REGS_SAVED ASM_XTENSA_NUM_REGS_SAVED
 #define REG_FUN_TABLE ASM_XTENSA_REG_FUN_TABLE
 
-#define ASM_ENTRY(as, nlocal)   asm_xtensa_entry((as), (nlocal))
-#define ASM_EXIT(as)            asm_xtensa_exit((as))
-#define ASM_CALL_IND(as, idx)   asm_xtensa_call_ind((as), (idx))
+#define ASM_ENTRY(as, nlocal, name)   asm_xtensa_entry((as), (nlocal))
+#define ASM_EXIT(as)                  asm_xtensa_exit((as))
+#define ASM_CALL_IND(as, idx)         asm_xtensa_call_ind((as), (idx))
 
 #else
 // Configuration for windowed calls with window size 8
@@ -370,9 +370,9 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 #define ASM_NUM_REGS_SAVED ASM_XTENSA_NUM_REGS_SAVED_WIN
 #define REG_FUN_TABLE ASM_XTENSA_REG_FUN_TABLE_WIN
 
-#define ASM_ENTRY(as, nlocal)   asm_xtensa_entry_win((as), (nlocal))
-#define ASM_EXIT(as)            asm_xtensa_exit_win((as))
-#define ASM_CALL_IND(as, idx)   asm_xtensa_call_ind_win((as), (idx))
+#define ASM_ENTRY(as, nlocal, name)   asm_xtensa_entry_win((as), (nlocal))
+#define ASM_EXIT(as)                  asm_xtensa_exit_win((as))
+#define ASM_CALL_IND(as, idx)         asm_xtensa_call_ind_win((as), (idx))
 
 #endif
 
diff --git a/py/emitnative.c b/py/emitnative.c
index f3ab483e8a638..3aacf69a81784 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -419,6 +419,30 @@ static void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         emit->stack_info[i].vtype = VTYPE_UNBOUND;
     }
 
+    char *qualified_name = NULL;
+
+    #if N_DEBUG
+    scope_t *current_scope = scope;
+    vstr_t *qualified_name_vstr = vstr_new(qstr_len(current_scope->simple_name));
+    size_t fragment_length = 0;
+    const byte *fragment_pointer;
+    for (;;) {
+        fragment_pointer = qstr_data(current_scope->simple_name, &fragment_length);
+        vstr_hint_size(qualified_name_vstr, fragment_length);
+        memmove(qualified_name_vstr->buf + fragment_length, qualified_name_vstr->buf, qualified_name_vstr->len);
+        memcpy(qualified_name_vstr->buf, fragment_pointer, fragment_length);
+        qualified_name_vstr->len += fragment_length;
+        if (current_scope->parent == NULL || current_scope->parent->simple_name == MP_QSTR__lt_module_gt_) {
+            break;
+        }
+        vstr_ins_char(qualified_name_vstr, 0, '.');
+        current_scope = current_scope->parent;
+    }
+    qualified_name = vstr_null_terminated_str(qualified_name_vstr);
+    #else
+    (void)qualified_name;
+    #endif
+
     mp_asm_base_start_pass(&emit->as->base, pass == MP_PASS_EMIT ? MP_ASM_PASS_EMIT : MP_ASM_PASS_COMPUTE);
 
     // generate code for entry to function
@@ -465,7 +489,7 @@ static void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         }
 
         // Entry to function
-        ASM_ENTRY(emit->as, emit->stack_start + emit->n_state - num_locals_in_regs);
+        ASM_ENTRY(emit->as, emit->stack_start + emit->n_state - num_locals_in_regs, qualified_name);
 
         #if N_X86
         asm_x86_mov_arg_to_r32(emit->as, 0, REG_PARENT_ARG_1);
@@ -536,7 +560,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) {
             mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->start_offset);
-            ASM_ENTRY(emit->as, emit->code_state_start);
+            ASM_ENTRY(emit->as, emit->code_state_start, qualified_name);
 
             // Reset the state size for the state pointed to by REG_GENERATOR_STATE
             emit->code_state_start = 0;
@@ -568,7 +592,7 @@ static void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             emit->stack_start = emit->code_state_start + SIZEOF_CODE_STATE;
 
             // Allocate space on C-stack for code_state structure, which includes state
-            ASM_ENTRY(emit->as, emit->stack_start + emit->n_state);
+            ASM_ENTRY(emit->as, emit->stack_start + emit->n_state, qualified_name);
 
             // Prepare incoming arguments for call to mp_setup_code_state
 
@@ -634,6 +658,10 @@ static void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             }
         }
     }
+
+    #if N_DEBUG
+    vstr_free(qualified_name_vstr);
+    #endif
 }
 
 static inline void emit_native_write_code_info_byte(emit_t *emit, byte val) {
diff --git a/py/emitndebug.c b/py/emitndebug.c
index c068a9a9a126e..e49c5cdbffa7b 100644
--- a/py/emitndebug.c
+++ b/py/emitndebug.c
@@ -108,8 +108,8 @@ static void asm_debug_end_pass(asm_debug_t *as) {
     (void)as;
 }
 
-static void asm_debug_entry(asm_debug_t *as, int num_locals) {
-    asm_debug_printf(as, "ENTRY(num_locals=%d)\n", num_locals);
+static void asm_debug_entry(asm_debug_t *as, int num_locals, char *name) {
+    asm_debug_printf(as, "ENTRY(%s, num_locals=%d)\n", name != NULL ? name : "?", num_locals);
 }
 
 static void asm_debug_exit(asm_debug_t *as) {
@@ -195,8 +195,8 @@ static void asm_debug_setcc_reg_reg_reg(asm_debug_t *as, int op, int reg1, int r
 
 #define ASM_T               asm_debug_t
 #define ASM_END_PASS        asm_debug_end_pass
-#define ASM_ENTRY(as, num_locals) \
-    asm_debug_entry(as, num_locals)
+#define ASM_ENTRY(as, num_locals, name) \
+    asm_debug_entry(as, num_locals, name)
 #define ASM_EXIT(as) \
     asm_debug_exit(as)
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 94b84530037e5..cf0538cae4d39 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -426,6 +426,11 @@
 #define MICROPY_EMIT_INLINE_RV32 (0)
 #endif
 
+// Whether to enable the human-readable native instructions emitter
+#ifndef MICROPY_EMIT_NATIVE_DEBUG
+#define MICROPY_EMIT_NATIVE_DEBUG (0)
+#endif
+
 // 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 || MICROPY_EMIT_RV32 || MICROPY_EMIT_NATIVE_DEBUG)
 

From fcfed6a0ea763ff14ea2bf819179fdf7eecda889 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 20 Jun 2025 19:44:07 +0200
Subject: [PATCH 2428/3129] unix/variants/coverage: Enable sys.settrace.

The unix coverage variant should have all features enabled, so they can be
tested for coverage.  Therefore, enabled `MICROPY_PY_SYS_SETTRACE`.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/variants/coverage/mpconfigvariant.h | 1 +
 tests/ports/unix/extra_coverage.py.exp         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index cfefeb46720f8..2f5d9683b3f4b 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -39,6 +39,7 @@
 
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
+#define MICROPY_PY_SYS_SETTRACE        (1)
 #define MICROPY_TRACKED_ALLOC          (1)
 #define MICROPY_WARNINGS_CATEGORY      (1)
 #undef MICROPY_VFS_ROM_IOCTL
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index ac64edde6925b..ed21ced24258b 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -69,8 +69,8 @@ argv            atexit          byteorder       exc_info
 executable      exit            getsizeof       implementation
 intern          maxsize         modules         path
 platform        print_exception                 ps1
-ps2             stderr          stdin           stdout
-tracebacklimit  version         version_info
+ps2             settrace        stderr          stdin
+stdout          tracebacklimit  version         version_info
 ementation
 # attrtuple
 (start=1, stop=2, step=3)

From ff8c4e594375711297e1c6181dec483f1127f29e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 20 Jun 2025 19:59:14 +0200
Subject: [PATCH 2429/3129] tests/misc: Improve test coverage of py/profile.c.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/misc/sys_settrace_cov.py     | 23 +++++++++++++++++++++++
 tests/misc/sys_settrace_cov.py.exp |  2 ++
 tests/run-tests.py                 |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 tests/misc/sys_settrace_cov.py
 create mode 100644 tests/misc/sys_settrace_cov.py.exp

diff --git a/tests/misc/sys_settrace_cov.py b/tests/misc/sys_settrace_cov.py
new file mode 100644
index 0000000000000..579c8a4a25e50
--- /dev/null
+++ b/tests/misc/sys_settrace_cov.py
@@ -0,0 +1,23 @@
+import sys
+
+try:
+    sys.settrace
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+def trace_tick_handler(frame, event, arg):
+    print("FRAME", frame)
+    print("LASTI", frame.f_lasti)
+    return None
+
+
+def f():
+    x = 3
+    return x
+
+
+sys.settrace(trace_tick_handler)
+f()
+sys.settrace(None)
diff --git a/tests/misc/sys_settrace_cov.py.exp b/tests/misc/sys_settrace_cov.py.exp
new file mode 100644
index 0000000000000..423d78ec42b89
--- /dev/null
+++ b/tests/misc/sys_settrace_cov.py.exp
@@ -0,0 +1,2 @@
+FRAME <frame at 0x\[0-9a-f\]\+, file '\.\*/sys_settrace_cov.py', line \\d\+, code f>
+LASTI \\d\+
diff --git a/tests/run-tests.py b/tests/run-tests.py
index e45122b10edda..d1d22a3c53809 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -354,6 +354,7 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
         "micropython/meminfo.py",
         "basics/bytes_compare3.py",
         "basics/builtin_help.py",
+        "misc/sys_settrace_cov.py",
         "thread/thread_exc2.py",
         "ports/esp32/partition_ota.py",
     )

From f04475afd82537e830a09bc58a3d14f9fee4a767 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 21 Jun 2025 08:24:21 +0200
Subject: [PATCH 2430/3129] py/runtime: Initialize profile fields in
 mp_thread_init_state.

If the fields added for `MICROPY_PY_SYS_SETTRACE` are not initialized
properly, their value in a thread is indeterminate.  In particular, if the
callback is not NULL, it will be invoked as a function.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/runtime.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/runtime.h b/py/runtime.h
index a93488e2cdc04..f42039cab9055 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -169,6 +169,12 @@ static inline void mp_thread_init_state(mp_state_thread_t *ts, size_t stack_size
     ts->nlr_jump_callback_top = NULL;
     ts->mp_pending_exception = MP_OBJ_NULL;
 
+    #if MICROPY_PY_SYS_SETTRACE
+    ts->prof_trace_callback = MP_OBJ_NULL;
+    ts->prof_callback_is_executing = false;
+    ts->current_code_state = NULL;
+    #endif
+
     // If locals/globals are not given, inherit from main thread
     if (locals == NULL) {
         locals = mp_state_ctx.thread.dict_locals;

From f33f1aa9d36c4dd2de4e1209ed7a94f14505d981 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 21 Jun 2025 08:26:20 +0200
Subject: [PATCH 2431/3129] unix/coverage: Initialize more code_state fields.

When `MICROPY_PY_SYS_SETTRACE` was enabled, a crash was seen in the
qemu_mips build.  It seems likely that this was due to these added fields
not being initialized.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index b041141f0f1ae..33e4208d9248c 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -582,12 +582,24 @@ static mp_obj_t extra_coverage(void) {
         fun_bc.context = &context;
         fun_bc.child_table = NULL;
         fun_bc.bytecode = (const byte *)"\x01"; // just needed for n_state
+        #if MICROPY_PY_SYS_SETTRACE
+        struct _mp_raw_code_t rc = {};
+        fun_bc.rc = &rc;
+        #endif
         mp_code_state_t *code_state = m_new_obj_var(mp_code_state_t, state, mp_obj_t, 1);
         code_state->fun_bc = &fun_bc;
         code_state->ip = (const byte *)"\x00"; // just needed for an invalid opcode
         code_state->sp = &code_state->state[0];
         code_state->exc_sp_idx = 0;
         code_state->old_globals = NULL;
+        #if MICROPY_STACKLESS
+        code_state->prev = NULL;
+        #endif
+        #if MICROPY_PY_SYS_SETTRACE
+        code_state->prev_state = NULL;
+        code_state->frame = NULL;
+        #endif
+
         mp_vm_return_kind_t ret = mp_execute_bytecode(code_state, MP_OBJ_NULL);
         mp_printf(&mp_plat_print, "%d %d\n", ret, mp_obj_get_type(code_state->state[0]) == &mp_type_NotImplementedError);
     }

From db0a836fc1c4cb20fc84edca19b57534d7365287 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 21 Jun 2025 09:35:39 +0200
Subject: [PATCH 2432/3129] py/profile: Fix printing lineno in frame objects.

The argument corresponding to a `%q` specifier must be of type `qstr`, not
a narrower type like `int16_t`.  Not ensuring this caused an assertion
error on one Windows x64 build.

The argument corresponding to a `%d` specifier must be of type `int`, not a
potentially-wider type like `mp_uint_t`.  Not ensuring this prevented the
function name from being printed on the unix nanbox build.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objcode.h | 2 +-
 py/profile.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/objcode.h b/py/objcode.h
index 8db9a34b6e1c9..8f26bd9dbd947 100644
--- a/py/objcode.h
+++ b/py/objcode.h
@@ -72,7 +72,7 @@ static inline const void *mp_code_get_proto_fun(mp_obj_code_t *self) {
 
 #include "py/emitglue.h"
 
-#define MP_CODE_QSTR_MAP(context, idx) (context->constants.qstr_table[idx])
+#define MP_CODE_QSTR_MAP(context, idx) ((qstr)(context->constants.qstr_table[idx]))
 
 typedef struct _mp_obj_code_t {
     // TODO this was 4 words
diff --git a/py/profile.c b/py/profile.c
index 397d0291f9fad..b5a0c54728c97 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -80,7 +80,7 @@ static void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
         "<frame at 0x%p, file '%q', line %d, code %q>",
         frame,
         MP_CODE_QSTR_MAP(code->context, 0),
-        frame->lineno,
+        (int)frame->lineno,
         MP_CODE_QSTR_MAP(code->context, prelude->qstr_block_name_idx)
         );
 }

From e415d03e7fd31af71c643a3d8f38a50e25fca0e7 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 2 Jul 2025 21:33:34 +0100
Subject: [PATCH 2433/3129] github/workflows: Remove the unix "settrace" CI
 job.

This becomes redundant when the main coverage build includes settrace.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 .github/workflows/ports_unix.yml | 17 -----------------
 tools/ci.sh                      | 17 -----------------
 2 files changed, 34 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index c5223a71e6cb8..e3ebcfda3d88c 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -169,23 +169,6 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
-  settrace:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
-      # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
-      with:
-        python-version: '3.11'
-    - 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.py --print-failures
-
   settrace_stackless:
     runs-on: ubuntu-latest
     steps:
diff --git a/tools/ci.sh b/tools/ci.sh
index 8254336258494..2f62f3efe9586 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -480,13 +480,6 @@ function ci_stm32_misc_build {
 ########################################################################################
 # ports/unix
 
-CI_UNIX_OPTS_SYS_SETTRACE=(
-    MICROPY_PY_BTREE=0
-    MICROPY_PY_FFI=0
-    MICROPY_PY_SSL=0
-    CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1"
-)
-
 CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS=(
     MICROPY_PY_BTREE=0
     MICROPY_PY_FFI=0
@@ -734,16 +727,6 @@ 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 submodules
-    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SYS_SETTRACE[@]}"
-}
-
-function ci_unix_settrace_run_tests {
-    ci_unix_run_tests_full_helper standard "${CI_UNIX_OPTS_SYS_SETTRACE[@]}"
-}
-
 function ci_unix_settrace_stackless_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix submodules

From a8c2b917e2837541597f24f7220c8c73c16c2fa7 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 3 Jul 2025 20:11:03 +0100
Subject: [PATCH 2434/3129] tools/ci.sh: Increase test timeout to 60s in
 coverage jobs.

The additional overhead of the settrace profiler means that the
`aes_stress.py` test was running too slowly on GitHub CI.  Double the
timeout to 60 seconds.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/run-tests.py | 2 +-
 tools/ci.sh        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index d1d22a3c53809..faf1d2e3b485e 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -16,7 +16,7 @@
 import tempfile
 
 # Maximum time to run a PC-based test, in seconds.
-TEST_TIMEOUT = 30
+TEST_TIMEOUT = float(os.environ.get('MICROPY_TEST_TIMEOUT', 30))
 
 # See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
 # are guaranteed to always work, this one should though.
diff --git a/tools/ci.sh b/tools/ci.sh
index 2f62f3efe9586..2f0b742428b46 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -625,7 +625,7 @@ function ci_unix_coverage_build {
 }
 
 function ci_unix_coverage_run_tests {
-    ci_unix_run_tests_full_helper coverage
+    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage
 }
 
 function ci_unix_coverage_run_mpy_merge_tests {
@@ -745,7 +745,7 @@ function ci_unix_sanitize_undefined_build {
 }
 
 function ci_unix_sanitize_undefined_run_tests {
-    ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
 }
 
 function ci_unix_sanitize_address_build {
@@ -756,7 +756,7 @@ function ci_unix_sanitize_address_build {
 }
 
 function ci_unix_sanitize_address_run_tests {
-    ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
 }
 
 function ci_unix_macos_build {

From a9801f9960ea2b8e94d5626840c97bc45286e1a3 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 4 Jul 2025 09:56:29 +0100
Subject: [PATCH 2435/3129] github/workflows: Use Python 3.11 for unix coverage
 testing.

This removes the need for an explicit `sys_settrace_features.py.exp` file.

This means that people testing locally will also need to install Python
3.11 in some way, such as with pyenv or uv, and use it during
`make VARIANT=coverage test`, or they will get failures.

When using Python from GitHub actions/setup-python, pip3 can't be wrapped
by sudo, because this invokes the operating system python instead.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 .github/workflows/ports_unix.yml | 15 +++++++++++++++
 tools/ci.sh                      |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index e3ebcfda3d88c..4b22926eaf8e5 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -71,6 +71,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
+      # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
+      with:
+        python-version: '3.11'
     - name: Install packages
       run: source tools/ci.sh && ci_unix_coverage_setup
     - name: Build
@@ -250,6 +255,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
+      # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
+      with:
+        python-version: '3.11'
     - name: Install packages
       run: source tools/ci.sh && ci_unix_coverage_setup
     - name: Build
@@ -270,6 +280,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
+      # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
+      with:
+        python-version: '3.11'
     - name: Install packages
       run: source tools/ci.sh && ci_unix_coverage_setup
     - name: Build
diff --git a/tools/ci.sh b/tools/ci.sh
index 2f0b742428b46..4007dfebfc3a2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -612,9 +612,9 @@ function ci_unix_standard_v2_run_tests {
 }
 
 function ci_unix_coverage_setup {
-    sudo pip3 install setuptools
-    sudo pip3 install pyelftools
-    sudo pip3 install ar
+    pip3 install setuptools
+    pip3 install pyelftools
+    pip3 install ar
     gcc --version
     python3 --version
 }

From 431b79146e4c8611144795eebf4e7645aa0c6591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 30 Jun 2025 13:52:52 +0200
Subject: [PATCH 2436/3129] esp32/panichandler: Support building against
 IDFv5.4.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The IDF panic handler resets the watchdog timeout to prevent the printing
of the error message from being cut off by a WDT reset.  We use the exact
same function call in our wrapper function for the same purpose.

In IDFv5.4.2 the function used for this was changed from
`esp_panic_handler_reconfigure_wdts` to `esp_panic_handler_feed_wdts`,
specifically in this commit:
https://github.com/espressif/esp-idf/commit/cd887ef59a7b966a7f431754aaec6ee653849d77

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/panichandler.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/panichandler.c b/ports/esp32/panichandler.c
index e6ff98ded272e..5211286f8401d 100644
--- a/ports/esp32/panichandler.c
+++ b/ports/esp32/panichandler.c
@@ -42,11 +42,20 @@
 #endif
 
 void __real_esp_panic_handler(void *);
-void esp_panic_handler_reconfigure_wdts(uint32_t timeout_ms);
 void panic_print_str(const char *str);
 
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 2)
+void esp_panic_handler_reconfigure_wdts(uint32_t timeout_ms);
+#else
+void esp_panic_handler_feed_wdts(void);
+#endif
+
 void MICROPY_WRAP_PANICHANDLER_FUN(__wrap_esp_panic_handler)(void *info) {
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 2)
     esp_panic_handler_reconfigure_wdts(1000);
+    #else
+    esp_panic_handler_feed_wdts();
+    #endif
 
     const static char *msg = MICROPY_WRAP_PANICHANDLER_STR(
         "\r\n"

From abcf023554df96f34e80e6eb73b9b705523ac5c5 Mon Sep 17 00:00:00 2001
From: Daniel Campora <danicampora@gmail.com>
Date: Wed, 28 May 2025 23:19:14 +0800
Subject: [PATCH 2437/3129] zephyr/machine_uart: Complete UART driver and make
 it interrupt driven.

Before this commit the UART would only work in very simple use cases.
Receiving large amounts of data would result in lost bytes.  Plus the print
function would crash due to `uart_config_get()` returning incorrect values.
Additionally, receiving data with `timeout==0` would fail even if data was
already available in the internal UART Rx FIFO.

This commit fixes those issues.  The non-implemented functions have also
been made usable.

Signed-off-by: Daniel Campora <danicampora@gmail.com>
---
 ports/zephyr/machine_uart.c | 194 ++++++++++++++++++++++++++++++++----
 ports/zephyr/prj.conf       |   5 +
 2 files changed, 177 insertions(+), 22 deletions(-)

diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 1927335ddf1c1..60613befb12b6 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2016 Damien P. George
  * Copyright (c) 2020 Yonatan Schachter
+ * Copyright (c) 2025 Daniel Campora on behalf of REMOTE TECH LTD
  *
  * 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,16 +33,32 @@
 #include <zephyr/drivers/uart.h>
 
 #include "py/mperrno.h"
+#include "py/ringbuf.h"
 #include "zephyr_device.h"
 
-// The UART class doesn't have any constants for this port.
-#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS
+
+#define MACHINE_UART_RTS                            1
+#define MACHINE_UART_CTS                            2
+
+// This class needs a finalizer, so we add it here
+#define MICROPY_PY_MACHINE_UART_CLASS_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(MACHINE_UART_RTS) }, \
+    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(MACHINE_UART_CTS) }, \
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_uart_deinit_obj) },
+
+#define UART_RX_RING_BUF_DEF_SIZE                   128
+#define UART_TX_RING_BUF_DEF_SIZE                   128
+
+static void uart_interrupt_handler(const struct device *dev, void *user_data);
 
 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)
+    ringbuf_t rx_ringbuffer;
+    ringbuf_t tx_ringbuffer;
+    bool tx_complete;
 } machine_uart_obj_t;
 
 static const char *_parity_name[] = {"None", "Odd", "Even", "Mark", "Space"};
@@ -60,23 +77,96 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
 }
 
 static void mp_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 };
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_txbuf, ARG_rxbuf, ARG_timeout, ARG_timeout_char, ARG_flow };
     static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 115200} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = 8} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = 1} },
+        { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = UART_RX_RING_BUF_DEF_SIZE} },
+        { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = UART_TX_RING_BUF_DEF_SIZE} },
         { 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_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);
 
     self->timeout = args[ARG_timeout].u_int;
     self->timeout_char = args[ARG_timeout_char].u_int;
+
+    uint8_t data_bits;
+    if (args[ARG_bits].u_int == 5) {
+        data_bits = UART_CFG_DATA_BITS_5;
+    } else if (args[ARG_bits].u_int == 6) {
+        data_bits = UART_CFG_DATA_BITS_6;
+    } else if (args[ARG_bits].u_int == 7) {
+        data_bits = UART_CFG_DATA_BITS_7;
+    } else if (args[ARG_bits].u_int == 8) {
+        data_bits = UART_CFG_DATA_BITS_8;
+    } else if (args[ARG_bits].u_int == 9) {
+        data_bits = UART_CFG_DATA_BITS_9;
+    } else {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid data bits"));
+    }
+
+    uint8_t parity;
+    if (args[ARG_parity].u_obj == mp_const_none) {
+        parity = UART_CFG_PARITY_NONE;
+    } else if (mp_obj_get_int(args[ARG_parity].u_obj) == 0) {
+        parity = UART_CFG_PARITY_EVEN;
+    } else if (mp_obj_get_int(args[ARG_parity].u_obj) == 1) {
+        parity = UART_CFG_PARITY_ODD;
+    } else {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid parity"));
+    }
+
+    uint8_t stop_bits;
+    if (args[ARG_stop].u_int == 1) {
+        stop_bits = UART_CFG_STOP_BITS_1;
+    } else if (args[ARG_stop].u_int == 2) {
+        data_bits = UART_CFG_STOP_BITS_2;
+    } else {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid stop bits"));
+    }
+
+    uint8_t flow_ctrl;
+    if (args[ARG_flow].u_int == 0) {
+        flow_ctrl = UART_CFG_FLOW_CTRL_NONE;
+    } else if (args[ARG_flow].u_int == (MACHINE_UART_RTS | MACHINE_UART_CTS)) {
+        flow_ctrl = UART_CFG_FLOW_CTRL_RTS_CTS;
+    } else {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid flow control"));
+    }
+
+    const struct uart_config cfg = {
+        .baudrate = args[ARG_baudrate].u_int,
+        .parity = parity,
+        .stop_bits = args[ARG_stop].u_int,
+        .data_bits = data_bits,
+        .flow_ctrl = flow_ctrl
+    };
+
+    int ret = uart_configure(self->dev, &cfg);
+    if (ret < 0) {
+        mp_raise_OSError(-ret);
+    }
+
+    ringbuf_alloc(&self->tx_ringbuffer, args[ARG_txbuf].u_int);
+    ringbuf_alloc(&self->rx_ringbuffer, args[ARG_rxbuf].u_int);
+
+    uart_irq_callback_user_data_set(self->dev, uart_interrupt_handler, (void *)self);
+    uart_irq_rx_enable(self->dev);
 }
 
 static mp_obj_t mp_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);
 
-    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
-    self->dev = zephyr_device_find(args[0]);
+    const struct device *dev = zephyr_device_find(args[0]);
+    machine_uart_obj_t *self = mp_obj_malloc_with_finaliser(machine_uart_obj_t, &machine_uart_type);
+    self->dev = dev;
+    self->tx_complete = true;
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
@@ -86,37 +176,38 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
-    (void)self;
+    uart_irq_rx_disable(self->dev);
+    uart_irq_tx_disable(self->dev);
 }
 
 static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
-    (void)self;
-    mp_raise_NotImplementedError(NULL); // TODO
+    return ringbuf_avail(&self->rx_ringbuffer);
 }
 
 static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
-    (void)self;
-    mp_raise_NotImplementedError(NULL); // TODO
+    return self->tx_complete && !ringbuf_avail(&self->tx_ringbuffer) ? true : false;
 }
 
 static mp_uint_t mp_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;
+    do {
+        int _rx_len = MIN(ringbuf_avail(&self->rx_ringbuffer), size - bytes_read);
+        if (_rx_len > 0) {
+            ringbuf_get_bytes(&self->rx_ringbuffer, &buffer[bytes_read], _rx_len);
+            bytes_read += _rx_len;
             elapsed_ms = 0;
             time_to_wait = self->timeout_char;
         } else {
             k_msleep(1);
             elapsed_ms++;
         }
-    }
+    } while ((elapsed_ms < time_to_wait) && (bytes_read < size));
+
     return bytes_read;
 }
 
@@ -124,27 +215,86 @@ static mp_uint_t mp_machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_
     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++) {
+    // wait for any pending transmission to complete
+    while (!mp_machine_uart_txdone(self)) {
+        MICROPY_EVENT_POLL_HOOK;
+    }
+
+    int _ex_size = 0;
+    int _free_space = ringbuf_free(&self->tx_ringbuffer);
+    if (size > _free_space) {
+        _ex_size = size - _free_space;
+    }
+
+    // do a blocking tx of what doesn't fit into the outgoing ring buffer
+    for (mp_uint_t i = 0; i < _ex_size; i++) {
         uart_poll_out(self->dev, buffer[i]);
     }
 
+    ringbuf_put_bytes(&self->tx_ringbuffer, &buffer[_ex_size], size - _ex_size);
+    self->tx_complete = false;
+    uart_irq_tx_enable(self->dev);
+
     return size;
 }
 
 static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
-    mp_uint_t ret;
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret = 0;
 
     if (request == MP_STREAM_POLL) {
-        ret = 0;
-        // read is always blocking
-
-        if (arg & MP_STREAM_POLL_WR) {
+        uintptr_t flags = arg;
+        if ((flags & MP_STREAM_POLL_RD) && (mp_machine_uart_any(self) > 0)) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR) && mp_machine_uart_txdone(self)) {
             ret |= MP_STREAM_POLL_WR;
         }
-        return ret;
+    } else if (request == MP_STREAM_FLUSH) {
+        while (!mp_machine_uart_txdone(self)) {
+            MICROPY_EVENT_POLL_HOOK;
+        }
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;
     }
+
     return ret;
 }
+
+static void uart_interrupt_handler(const struct device *dev, void *user_data) {
+    machine_uart_obj_t *self = (machine_uart_obj_t *)user_data;
+
+    while (uart_irq_update(dev) && uart_irq_is_pending(dev)) {
+        if (uart_irq_rx_ready(dev)) {
+            uint8_t _rx_buffer[32];
+            size_t _free_space = MIN(ringbuf_free(&self->rx_ringbuffer), sizeof(_rx_buffer));
+
+            // empty the uart fifo even if we can't store bytes anymore
+            // otherwise we will never exit this interrupt handler
+            int rcv_len = uart_fifo_read(dev, _rx_buffer, (_free_space > 0) ? _free_space : 1);
+            if ((rcv_len <= 0) || (_free_space == 0)) {
+                continue;
+            }
+
+            ringbuf_put_bytes(&self->rx_ringbuffer, _rx_buffer, rcv_len);
+        }
+
+        int _max_uart_tx_len = uart_irq_tx_ready(dev);
+        if (_max_uart_tx_len > 0) {
+            uint8_t _tx_buffer[32];
+            size_t _buffer_tx_len;
+
+            _max_uart_tx_len = MIN(_max_uart_tx_len, sizeof(_tx_buffer));
+            _buffer_tx_len = ringbuf_avail(&self->tx_ringbuffer);
+            if (_buffer_tx_len > 0) {
+                _buffer_tx_len = MIN(_max_uart_tx_len, _buffer_tx_len);
+                ringbuf_get_bytes(&self->tx_ringbuffer, _tx_buffer, _buffer_tx_len);
+                uart_fifo_fill(dev, _tx_buffer, _buffer_tx_len);
+            } else if (uart_irq_tx_complete(dev)) {
+                uart_irq_tx_disable(dev);
+                self->tx_complete = true;
+            }
+        }
+    }
+}
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 0325cddd206c4..7b7513abd9d46 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -81,3 +81,8 @@ CONFIG_MICROPY_VFS_LFS2=y
 
 CONFIG_WATCHDOG=y
 CONFIG_WDT_DISABLE_AT_BOOT=y
+
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_UART_LINE_CTRL=y
+CONFIG_UART_USE_RUNTIME_CONFIGURE=y

From 49dbe1e272f486077bd16a6e68ece6d66a2bea7f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Jul 2025 11:42:18 +1000
Subject: [PATCH 2438/3129] zephyr/machine_pin: Configure OUT pin also as input
 so it's readable.

Zephyr allows setting both GPIO_OUTPUT and GPIO_INPUT on a pin, which means
it's an output pin that can have its current value read.

Fixes issue #17596.

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

diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 2240196690071..1baee656f5aca 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -270,7 +270,7 @@ static const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
 
     // 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_OUT),       MP_ROM_INT(GPIO_OUTPUT | GPIO_INPUT) },
     { 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) },

From 91718657826139017f5cdd54efe0ab9c16f7e49c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Jul 2025 11:13:42 +1000
Subject: [PATCH 2439/3129] zephyr/boards: Disable WDT on qemu boards and
 networking for cortex_m3.

This gets qemu_x86 and qemu_cortex_m3 building with `prj.conf` settings.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/qemu_cortex_m3.conf | 9 ++++++---
 ports/zephyr/boards/qemu_x86.conf       | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/boards/qemu_cortex_m3.conf b/ports/zephyr/boards/qemu_cortex_m3.conf
index dac0c358dc9ce..50d0c4d928163 100644
--- a/ports/zephyr/boards/qemu_cortex_m3.conf
+++ b/ports/zephyr/boards/qemu_cortex_m3.conf
@@ -2,6 +2,9 @@
 # disable it
 CONFIG_CONSOLE_SUBSYS=n
 
-# Networking drivers
-# SLIP driver for QEMU
-CONFIG_NET_SLIP_TAP=y
+# This QEMU target only has 256k ROM and 64k RAM, so disable networking
+CONFIG_NETWORKING=n
+
+# QEMU doesn't have a watchdog, so disable it
+CONFIG_WATCHDOG=n
+CONFIG_WDT_DISABLE_AT_BOOT=n
diff --git a/ports/zephyr/boards/qemu_x86.conf b/ports/zephyr/boards/qemu_x86.conf
index dac0c358dc9ce..35461025aa8b7 100644
--- a/ports/zephyr/boards/qemu_x86.conf
+++ b/ports/zephyr/boards/qemu_x86.conf
@@ -5,3 +5,7 @@ CONFIG_CONSOLE_SUBSYS=n
 # Networking drivers
 # SLIP driver for QEMU
 CONFIG_NET_SLIP_TAP=y
+
+# QEMU doesn't have a watchdog, so disable it
+CONFIG_WATCHDOG=n
+CONFIG_WDT_DISABLE_AT_BOOT=n

From 5321b666ea3cb1108a64d64f0813f602bcefd424 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Jul 2025 11:14:59 +1000
Subject: [PATCH 2440/3129] zephyr/README: Update URL describing QEMU network
 settings.

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

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index fc18d25c0aadb..17c1f613de4ed 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -95,7 +95,7 @@ qemu_cortex_m3):
 
 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
+https://docs.zephyrproject.org/latest/connectivity/networking/qemu_setup.html#networking-with-qemu
 to setup the host side of TAP/SLIP networking. If you get an error like:
 
     could not connect serial device to character backend 'unix:/tmp/slip.sock'

From 5eb94df09ec5964822b9de64d6430de16901562d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Jul 2025 11:15:36 +1000
Subject: [PATCH 2441/3129] zephyr/prj.conf: Use UART for console as default,
 not CONSOLE_SUBSYS.

Most boards enable the UART console because it's needed for USB (where USB
CDC creates a virtual UART), and for ctrl-C to work.

The `prj_minimal.conf` settings still use CONSOLE_SUBSYS.

Fixes issue #17608.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/bbc_microbit_v2.conf | 1 -
 ports/zephyr/boards/nucleo_h743zi.conf   | 3 ---
 ports/zephyr/boards/nucleo_wb55rg.conf   | 1 -
 ports/zephyr/boards/qemu_cortex_m3.conf  | 4 ----
 ports/zephyr/boards/qemu_x86.conf        | 4 ----
 ports/zephyr/prj.conf                    | 5 -----
 ports/zephyr/prj_minimal.conf            | 3 ---
 7 files changed, 21 deletions(-)

diff --git a/ports/zephyr/boards/bbc_microbit_v2.conf b/ports/zephyr/boards/bbc_microbit_v2.conf
index 31872244ca712..43742078f563e 100644
--- a/ports/zephyr/boards/bbc_microbit_v2.conf
+++ b/ports/zephyr/boards/bbc_microbit_v2.conf
@@ -1,4 +1,3 @@
-CONFIG_CONSOLE_SUBSYS=n
 CONFIG_NETWORKING=n
 CONFIG_BT=y
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
diff --git a/ports/zephyr/boards/nucleo_h743zi.conf b/ports/zephyr/boards/nucleo_h743zi.conf
index 942415b7967d8..ea6a60b3529d1 100644
--- a/ports/zephyr/boards/nucleo_h743zi.conf
+++ b/ports/zephyr/boards/nucleo_h743zi.conf
@@ -1,6 +1,3 @@
-# disable console subsys to get REPL working
-CONFIG_CONSOLE_SUBSYS=n
-
 # flash config
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
index baf0f28075553..fab993676ac66 100644
--- a/ports/zephyr/boards/nucleo_wb55rg.conf
+++ b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -1,4 +1,3 @@
-CONFIG_CONSOLE_SUBSYS=n
 CONFIG_NETWORKING=n
 CONFIG_BT=y
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
diff --git a/ports/zephyr/boards/qemu_cortex_m3.conf b/ports/zephyr/boards/qemu_cortex_m3.conf
index 50d0c4d928163..11eebd960637e 100644
--- a/ports/zephyr/boards/qemu_cortex_m3.conf
+++ b/ports/zephyr/boards/qemu_cortex_m3.conf
@@ -1,7 +1,3 @@
-# Interrupt-driven UART console has emulation artifacts under QEMU,
-# disable it
-CONFIG_CONSOLE_SUBSYS=n
-
 # This QEMU target only has 256k ROM and 64k RAM, so disable networking
 CONFIG_NETWORKING=n
 
diff --git a/ports/zephyr/boards/qemu_x86.conf b/ports/zephyr/boards/qemu_x86.conf
index 35461025aa8b7..1d04675df41e0 100644
--- a/ports/zephyr/boards/qemu_x86.conf
+++ b/ports/zephyr/boards/qemu_x86.conf
@@ -1,7 +1,3 @@
-# Interrupt-driven UART console has emulation artifacts under QEMU,
-# disable it
-CONFIG_CONSOLE_SUBSYS=n
-
 # Networking drivers
 # SLIP driver for QEMU
 CONFIG_NET_SLIP_TAP=y
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 7b7513abd9d46..011cb72cfd005 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -6,11 +6,6 @@ CONFIG_STDOUT_CONSOLE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y
 
-CONFIG_CONSOLE_SUBSYS=y
-CONFIG_CONSOLE_GETCHAR=y
-CONFIG_CONSOLE_GETCHAR_BUFSIZE=258
-CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128
-
 CONFIG_NEWLIB_LIBC=y
 CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4736
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index 6c850751d7233..3f9acc655e9a5 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -8,8 +8,5 @@ CONFIG_CONSOLE_SUBSYS=y
 CONFIG_CONSOLE_GETCHAR=y
 CONFIG_CONSOLE_GETCHAR_BUFSIZE=258
 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=32
-# TODO: Disable once https://github.com/zephyrproject-rtos/zephyr/pull/13731 is merged
-#CONFIG_CONSOLE=n
-#CONFIG_UART_CONSOLE=n
 
 CONFIG_MICROPY_HEAP_SIZE=16384

From 16d9e704aeb48d9507c56bf90f565c0b19b3fb79 Mon Sep 17 00:00:00 2001
From: David Schneider <schneidav81@gmail.com>
Date: Mon, 23 Jun 2025 14:52:57 +0200
Subject: [PATCH 2442/3129] zephyr: Update generated header path.

Support disabled LEGACY_GENERATED_INCLUDE_PATH compatibility option.
Since Zephyr 3.7 generated include files are namespaced.

See also: zephyrproject-rtos/zephyr@bbe5e1e6ebf4a1a66c0

Signed-off-by: David Schneider <schneidav81@gmail.com>
---
 ports/zephyr/modsocket.c            | 2 --
 ports/zephyr/mpconfigport.h         | 2 +-
 ports/zephyr/mpconfigport_minimal.h | 2 +-
 ports/zephyr/prj.conf               | 2 ++
 ports/zephyr/prj_minimal.conf       | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index 1ca84edcac897..d8955bffbe4a9 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -32,8 +32,6 @@
 
 #include <stdio.h>
 #include <zephyr/kernel.h>
-// Zephyr's generated version header
-#include <version.h>
 #include <zephyr/net/net_context.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/dns_resolve.h>
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 3a6e93486228a..e7e67b02d612e 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -26,7 +26,7 @@
 #include <alloca.h>
 
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
-#include "autoconf.h"
+#include <zephyr/autoconf.h>
 // Included here to get basic Zephyr environment (macros, etc.)
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index 9aae20c72c681..a0a7f97394610 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -26,7 +26,7 @@
 #include <alloca.h>
 
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
-#include "autoconf.h"
+#include <zephyr/autoconf.h>
 // Included here to get basic Zephyr environment (macros, etc.)
 #include <zephyr/kernel.h>
 
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 011cb72cfd005..0939e226cfcf4 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -81,3 +81,5 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_LINE_CTRL=y
 CONFIG_UART_USE_RUNTIME_CONFIGURE=y
+
+CONFIG_LEGACY_GENERATED_INCLUDE_PATH=n
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index 3f9acc655e9a5..f58c932ceabe3 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -10,3 +10,5 @@ CONFIG_CONSOLE_GETCHAR_BUFSIZE=258
 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=32
 
 CONFIG_MICROPY_HEAP_SIZE=16384
+
+CONFIG_LEGACY_GENERATED_INCLUDE_PATH=n

From d9b4327c66d455f4654ab4f223067f3e20440333 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:52:05 +1000
Subject: [PATCH 2443/3129] zephyr/main: Execute boot.py and main.py like other
 ports.

Changes here make the zephyr port act the same as other ports for the
start up and shut down sequence:
- `boot.py` is executed if it exists, and can force a soft reset
- `main.py` is only executed if in friendly REPL and if `boot.py` executed
  successfully; and it can also force a soft reset
- print "MPY: " before "soft reboot" on soft reset

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/main.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 45af7b0c72c40..9addd7d6cdbe0 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -156,7 +156,17 @@ int real_main(void) {
     #endif
 
     #if MICROPY_MODULE_FROZEN || MICROPY_VFS
-    pyexec_file_if_exists("main.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 != 0) {
+        ret = pyexec_file_if_exists("main.py");
+        if (ret & PYEXEC_FORCED_EXIT) {
+            goto soft_reset_exit;
+        }
+    }
     #endif
 
     for (;;) {
@@ -171,7 +181,11 @@ int real_main(void) {
         }
     }
 
-    printf("soft reboot\n");
+    #if MICROPY_MODULE_FROZEN || MICROPY_VFS
+soft_reset_exit:
+    #endif
+
+    mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
 
     #if MICROPY_PY_BLUETOOTH
     mp_bluetooth_deinit();

From 6b82eb75bef70d44ef583385301b7c483ac9ae94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:53:49 +1000
Subject: [PATCH 2444/3129] zephyr/main: Add /flash/lib or /sd/lib to sys.path
 on start up.

If there is a filesystem available, this change makes sure there is a "lib"
in `sys.path`, eg so that "mip install" works correctly.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt | 4 ++++
 ports/zephyr/main.c         | 4 ++++
 ports/zephyr/qstrdefsport.h | 4 ++++
 3 files changed, 12 insertions(+)
 create mode 100644 ports/zephyr/qstrdefsport.h

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index debf2bd2c15d4..0ae4b26ac697b 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -70,6 +70,10 @@ set(MICROPY_SOURCE_SHARED
 )
 list(TRANSFORM MICROPY_SOURCE_SHARED PREPEND ${MICROPY_DIR}/shared/)
 
+set(MICROPY_QSTRDEFS_PORT
+    ${MICROPY_PORT_DIR}/qstrdefsport.h
+)
+
 set(MICROPY_SOURCE_LIB
     oofatfs/ff.c
     oofatfs/ffunicode.c
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 9addd7d6cdbe0..eaef34a7868d3 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -99,6 +99,7 @@ static void vfs_init(void) {
     mp_obj_t bdev = NULL;
     mp_obj_t mount_point;
     const char *mount_point_str = NULL;
+    qstr path_lib_qstr = MP_QSTRnull;
     int ret = 0;
 
     #ifdef CONFIG_DISK_DRIVER_SDMMC
@@ -109,15 +110,18 @@ static void vfs_init(void) {
     #endif
     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";
+    path_lib_qstr = MP_QSTR__slash_sd_slash_lib;
     #elif defined(CONFIG_FLASH_MAP) && FIXED_PARTITION_EXISTS(storage_partition)
     mp_obj_t args[] = { MP_OBJ_NEW_SMALL_INT(FIXED_PARTITION_ID(storage_partition)), MP_OBJ_NEW_SMALL_INT(4096) };
     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";
+    path_lib_qstr = MP_QSTR__slash_flash_slash_lib;
     #endif
 
     if ((bdev != NULL)) {
         mount_point = mp_obj_new_str_from_cstr(mount_point_str);
         ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(path_lib_qstr));
         // TODO: if this failed, make a new file system and try to mount again
     }
 }
diff --git a/ports/zephyr/qstrdefsport.h b/ports/zephyr/qstrdefsport.h
new file mode 100644
index 0000000000000..66819e432c7db
--- /dev/null
+++ b/ports/zephyr/qstrdefsport.h
@@ -0,0 +1,4 @@
+// qstrs specific to this port
+// *FORMAT-OFF*
+Q(/flash/lib)
+Q(/sd/lib)

From 4951a06bbb5b3987a8ac922c06b8764c083d168c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:56:04 +1000
Subject: [PATCH 2445/3129] zephyr: Enable sys.stdin/out/err.

This change enables `sys.stdin`, `sys.stdout` and `sys.stderr` objects.
They are useful for general IO, and also help with testing zephyr boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt       |  1 +
 ports/zephyr/mpconfigport.h       |  1 +
 ports/zephyr/src/zephyr_getchar.c |  5 +++++
 ports/zephyr/src/zephyr_getchar.h |  1 +
 ports/zephyr/uart_core.c          | 19 +++++++++++++++++++
 5 files changed, 27 insertions(+)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 0ae4b26ac697b..c15d68babed74 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -66,6 +66,7 @@ set(MICROPY_SOURCE_SHARED
     runtime/mpirq.c
     runtime/pyexec.c
     runtime/stdout_helpers.c
+    runtime/sys_stdio_mphal.c
     timeutils/timeutils.c
 )
 list(TRANSFORM MICROPY_SOURCE_SHARED PREPEND ${MICROPY_DIR}/shared/)
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index e7e67b02d612e..b6f9176b6a7b1 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -96,6 +96,7 @@
 #define MICROPY_PY_ZEPHYR           (1)
 #define MICROPY_PY_ZSENSOR          (1)
 #define MICROPY_PY_SYS_MODULES      (0)
+#define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 94e35e2e84ee0..7660e3cc1f143 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -49,6 +49,11 @@ static int console_irq_input_hook(uint8_t ch) {
     return 1;
 }
 
+// Returns true if a char is available for reading.
+int zephyr_getchar_check(void) {
+    return i_get != i_put;
+}
+
 int zephyr_getchar(void) {
     mp_hal_wait_sem(&uart_sem, 0);
     if (k_sem_take(&uart_sem, K_MSEC(0)) == 0) {
diff --git a/ports/zephyr/src/zephyr_getchar.h b/ports/zephyr/src/zephyr_getchar.h
index fee899e1b4349..3f31c4317fa35 100644
--- a/ports/zephyr/src/zephyr_getchar.h
+++ b/ports/zephyr/src/zephyr_getchar.h
@@ -17,4 +17,5 @@
 #include <stdint.h>
 
 void zephyr_getchar_init(void);
+int zephyr_getchar_check(void);
 int zephyr_getchar(void);
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index ee525c33f7266..fe8a2a51db9eb 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include "py/mpconfig.h"
 #include "py/runtime.h"
+#include "py/stream.h"
 #include "src/zephyr_getchar.h"
 // Zephyr headers
 #include <zephyr/kernel.h>
@@ -52,6 +53,24 @@ static uint8_t mp_console_txbuf[CONFIG_CONSOLE_PUTCHAR_BUFSIZE];
  * Core UART functions to implement for a port
  */
 
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if (poll_flags & MP_STREAM_POLL_RD) {
+        #ifdef CONFIG_CONSOLE_SUBSYS
+        // It's not easy to test if tty is readable, so just unconditionally set it for now.
+        ret |= MP_STREAM_POLL_RD;
+        #else
+        if (zephyr_getchar_check()) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        #endif
+    }
+    if (poll_flags & MP_STREAM_POLL_WR) {
+        ret |= MP_STREAM_POLL_WR;
+    }
+    return ret;
+}
+
 // Receive single character
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {

From 6a53319336ce234757e04223cfe8560d6bea2de6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:56:35 +1000
Subject: [PATCH 2446/3129] zephyr/src: Increase UART input buffer to 512 bytes
 and reduce latency.

There are two changes here:

1. Increase the UART input bufffer to 512 bytes.  That's necessary to get
   basic REPL reliability tests working, and helps improve `mpremote`
   usage, eg copying large files.

2. Remove `uart_sem` semaphore.  This is no longer needed because
   `zephyr_getchar()` should be fully non-blocking and have as low a
   latency as possible.  `mp_hal_stdin_rx_chr()` (which calls
   `zephyr_getchar`) already uses `MICROPY_EVENT_POLL_HOOK` to get
   an efficient wait, and doing an extra wait and check for the
   semaphore in `zephyr_getchar()` just introduces unnecessary latency and
   can lead to slower input, and potentially overflowing the UART input
   buffer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/src/zephyr_getchar.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 7660e3cc1f143..bf504a97c9b5a 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -23,12 +23,10 @@
 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
+#define UART_BUFSIZE (512)
 static uint8_t uart_ringbuf[UART_BUFSIZE];
-static uint8_t i_get, i_put;
+static uint16_t i_get, i_put;
 
 static int console_irq_input_hook(uint8_t ch) {
     int i_next = (i_put + 1) & (UART_BUFSIZE - 1);
@@ -44,8 +42,6 @@ static int console_irq_input_hook(uint8_t ch) {
         uart_ringbuf[i_put] = ch;
         i_put = i_next;
     }
-    // printk("%x\n", ch);
-    k_sem_give(&uart_sem);
     return 1;
 }
 
@@ -55,8 +51,7 @@ int zephyr_getchar_check(void) {
 }
 
 int zephyr_getchar(void) {
-    mp_hal_wait_sem(&uart_sem, 0);
-    if (k_sem_take(&uart_sem, K_MSEC(0)) == 0) {
+    if (i_get != i_put) {
         unsigned int key = irq_lock();
         int c = (int)uart_ringbuf[i_get++];
         i_get &= UART_BUFSIZE - 1;
@@ -67,7 +62,6 @@ int zephyr_getchar(void) {
 }
 
 void zephyr_getchar_init(void) {
-    k_sem_init(&uart_sem, 0, UINT_MAX);
     uart_console_in_debug_hook_install(console_irq_input_hook);
     // All NULLs because we're interested only in the callback above
     uart_register_input(NULL, NULL, NULL);

From 6fd069e8a5b8139c0a5aaec506d3d83c60285ac4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:57:41 +1000
Subject: [PATCH 2447/3129] zephyr/src: Fix USB device_next driver to work with
 zephyr 4.0.0.

The blocklist argument is not available in zephyr 4.0.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/src/usbd.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/zephyr/src/usbd.c b/ports/zephyr/src/usbd.c
index 2444706cbeaa9..36b07a8638fd0 100644
--- a/ports/zephyr/src/usbd.c
+++ b/ports/zephyr/src/usbd.c
@@ -34,12 +34,22 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mp_usbd);
 
+#if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(4, 1, 0)
+
+#define BLOCKLIST , blocklist
+
 /* By default, do not register the USB DFU class DFU mode instance. */
 static const char *const blocklist[] = {
     "dfu_dfu",
     NULL,
 };
 
+#else
+
+#define BLOCKLIST
+
+#endif
+
 USBD_DEVICE_DEFINE(mp_usbd,
     DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),
     CONFIG_MICROPY_USB_DEVICE_VID, CONFIG_MICROPY_USB_DEVICE_PID);
@@ -121,7 +131,7 @@ struct usbd_context *mp_usbd_init_device(usbd_msg_cb_t msg_cb) {
             return NULL;
         }
 
-        err = usbd_register_all_classes(&mp_usbd, USBD_SPEED_HS, 1, blocklist);
+        err = usbd_register_all_classes(&mp_usbd, USBD_SPEED_HS, 1 BLOCKLIST);
         if (err) {
             LOG_ERR("Failed to add register classes");
             return NULL;
@@ -137,7 +147,7 @@ struct usbd_context *mp_usbd_init_device(usbd_msg_cb_t msg_cb) {
         return NULL;
     }
 
-    err = usbd_register_all_classes(&mp_usbd, USBD_SPEED_FS, 1, blocklist);
+    err = usbd_register_all_classes(&mp_usbd, USBD_SPEED_FS, 1 BLOCKLIST);
     if (err) {
         LOG_ERR("Failed to add register classes");
         return NULL;

From 9b97a30943ebf5fe381c29610d4b5cd1046240d7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:58:49 +1000
Subject: [PATCH 2448/3129] zephyr/machine_pin: Add Pin.OPEN_DRAIN constant.

Adding this constant is all that's needed to support open-drain pins.

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

diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 1baee656f5aca..818216ffef1c0 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -271,6 +271,7 @@ static const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN),        MP_ROM_INT(GPIO_INPUT) },
     { MP_ROM_QSTR(MP_QSTR_OUT),       MP_ROM_INT(GPIO_OUTPUT | GPIO_INPUT) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_OUTPUT | GPIO_INPUT | GPIO_OPEN_DRAIN) },
     { 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) },

From 359887933cf179bf7c4d9c5dec69aecfbd9a14fb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:59:51 +1000
Subject: [PATCH 2449/3129] zephyr/machine_pin: Allow constructing a Pin with
 an existing Pin.

Following other ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/machine_pin.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 818216ffef1c0..517ef51167a04 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -126,19 +126,26 @@ static mp_obj_t machine_pin_obj_init_helper(machine_pin_obj_t *self, size_t n_ar
 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 port
-    if (!mp_obj_is_type(args[0], &mp_type_tuple)) {
+    machine_pin_obj_t *pin;
+    if (mp_obj_is_type(args[0], &machine_pin_type)) {
+        // Already a Pin object, reuse it.
+        pin = MP_OBJ_TO_PTR(args[0]);
+    } else if (mp_obj_is_type(args[0], &mp_type_tuple)) {
+        // Get the wanted (port, pin) values.
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[0], 2, &items);
+        const struct device *wanted_port = zephyr_device_find(items[0]);
+        int wanted_pin = mp_obj_get_int(items[1]);
+
+        pin = m_new_obj(machine_pin_obj_t);
+        pin->base = machine_pin_obj_template;
+        pin->port = wanted_port;
+        pin->pin = wanted_pin;
+        pin->irq = NULL;
+    } else {
+        // Unknown Pin.
         mp_raise_ValueError(MP_ERROR_TEXT("Pin id must be tuple of (\"GPIO_x\", pin#)"));
     }
-    mp_obj_t *items;
-    mp_obj_get_array_fixed_n(args[0], 2, &items);
-    const struct device *wanted_port = zephyr_device_find(items[0]);
-    int wanted_pin = mp_obj_get_int(items[1]);
-
-    machine_pin_obj_t *pin = m_new_obj(machine_pin_obj_t);
-    pin->base = machine_pin_obj_template;
-    pin->port = wanted_port;
-    pin->pin = wanted_pin;
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO

From 19814bf50fe19f3f276646a51be4f392a0d6ff64 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 13:00:15 +1000
Subject: [PATCH 2450/3129] zephyr/mphalport: Implement C-level pin HAL.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/machine_pin.c |  1 +
 ports/zephyr/mphalport.c   |  8 +++++++
 ports/zephyr/mphalport.h   | 46 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 517ef51167a04..7834b5de6d2c9 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -36,6 +36,7 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "extmod/modmachine.h"
+#include "extmod/virtpin.h"
 #include "shared/runtime/mpirq.h"
 #include "modmachine.h"
 #include "zephyr_device.h"
diff --git a/ports/zephyr/mphalport.c b/ports/zephyr/mphalport.c
index 2c95032843276..db536ec085177 100644
--- a/ports/zephyr/mphalport.c
+++ b/ports/zephyr/mphalport.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 
 static struct k_poll_signal wait_signal;
 static struct k_poll_event wait_events[2] = {
@@ -75,3 +76,10 @@ void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
         }
     }
 }
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in) {
+    if (mp_obj_is_type(pin_in, &machine_pin_type)) {
+        return MP_OBJ_TO_PTR(pin_in);
+    }
+    mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
+}
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index e5414c27059ad..7410204621efa 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,4 +1,5 @@
 #include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
 #include "shared/runtime/interrupt_char.h"
 
 #define MICROPY_BEGIN_ATOMIC_SECTION irq_lock
@@ -35,3 +36,48 @@ static inline uint64_t mp_hal_time_ns(void) {
 }
 
 #define mp_hal_delay_us_fast(us)   (mp_hal_delay_us(us))
+
+// C-level pin HAL
+
+#include "modmachine.h"
+
+#define MP_HAL_PIN_FMT "%u"
+#define mp_hal_pin_obj_t const machine_pin_obj_t *
+
+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) {
+    // TODO make it include the port
+    return pin->pin;
+}
+
+static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
+    (void)gpio_pin_configure(pin->port, pin->pin, GPIO_INPUT);
+}
+
+static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
+    if (gpio_pin_configure(pin->port, pin->pin, GPIO_OUTPUT | GPIO_INPUT) == -ENOTSUP) {
+        // If GPIO_OUTPUT|GPIO_INPUT is not supported (eg frdm_k64f) then try just GPIO_OUTPUT.
+        (void)gpio_pin_configure(pin->port, pin->pin, GPIO_OUTPUT);
+    }
+}
+
+static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
+    (void)gpio_pin_configure(pin->port, pin->pin, GPIO_OUTPUT | GPIO_INPUT | GPIO_OPEN_DRAIN);
+}
+
+static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {
+    return gpio_pin_get_raw(pin->port, pin->pin);
+}
+
+static inline void mp_hal_pin_write(mp_hal_pin_obj_t pin, int v) {
+    (void)gpio_pin_set_raw(pin->port, pin->pin, v);
+}
+
+static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
+    (void)gpio_pin_set_raw(pin->port, pin->pin, 0);
+}
+
+static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
+    (void)gpio_pin_set_raw(pin->port, pin->pin, 1);
+}

From 16b00cd6e78d9afc9f5c3930939fdae0d60dfb78 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 13:00:48 +1000
Subject: [PATCH 2451/3129] zephyr/mpconfigport: Enable machine.SoftI2C and
 machine.SoftSPI.

These work now that the C-level pin HAL is implemented.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt | 6 ++++++
 ports/zephyr/mpconfigport.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index c15d68babed74..a5cc477204eb5 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -71,6 +71,11 @@ set(MICROPY_SOURCE_SHARED
 )
 list(TRANSFORM MICROPY_SOURCE_SHARED PREPEND ${MICROPY_DIR}/shared/)
 
+set(MICROPY_SOURCE_DRIVERS
+    bus/softspi.c
+)
+list(TRANSFORM MICROPY_SOURCE_DRIVERS PREPEND ${MICROPY_DIR}/drivers/)
+
 set(MICROPY_QSTRDEFS_PORT
     ${MICROPY_PORT_DIR}/qstrdefsport.h
 )
@@ -89,6 +94,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
     ${MICROPY_SOURCE_SHARED}
+    ${MICROPY_SOURCE_DRIVERS}
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
 )
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index b6f9176b6a7b1..1ab838ad9c792 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -62,9 +62,11 @@
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
 #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_TRANSFER_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB (SPI_TRANSFER_LSB)
+#define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/zephyr/machine_uart.c"

From 07285323cf68435db86b3e736a714a487464dceb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 13:01:33 +1000
Subject: [PATCH 2452/3129] zephyr/mpconfigport: Enable import of mpy and a few
 related features.

Support for importing .mpy files is quite fundamental to MicroPython these
days, eg it allows installing more efficient .mpy code via "mip install"
(and installing `unittest` only works with the .mpy version because the .py
version uses f-strings, which are not enabled on the zephyr port).  So
enable it generally for use by all boards.

As part of this, also enable:
- min/max: needed by `micropython/import_mpy_invalid.py`, and widely used
- sys.modules: needed by `run-tests.py` to run .mpy tests with --via-mpy
- io module: needed to run .mpy tests, and useful for `io.IOBase`
- array slice assign: needed to run .mpy tests, and generally useful as a
  way to do a memory copy.

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

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 1ab838ad9c792..a24caf74578b7 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -36,6 +36,7 @@
 #define MICROPY_HEAP_SIZE (16 * 1024)
 #endif
 
+#define MICROPY_PERSISTENT_CODE_LOAD (1)
 #define MICROPY_ENABLE_SOURCE_LINE  (1)
 #define MICROPY_STACK_CHECK         (1)
 #define MICROPY_ENABLE_GC           (1)
@@ -46,7 +47,6 @@
 #define MICROPY_PY_ASYNC_AWAIT      (0)
 #define MICROPY_PY_BUILTINS_BYTES_HEX (1)
 #define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_MIN_MAX (0)
 #define MICROPY_PY_BUILTINS_PROPERTY (0)
 #define MICROPY_PY_BUILTINS_RANGE_ATTRS (0)
 #define MICROPY_PY_BUILTINS_REVERSED (0)
@@ -55,9 +55,9 @@
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT zephyr_help_text
 #define MICROPY_PY_ARRAY            (0)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_COLLECTIONS      (0)
 #define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
@@ -97,7 +97,6 @@
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modtime.c"
 #define MICROPY_PY_ZEPHYR           (1)
 #define MICROPY_PY_ZSENSOR          (1)
-#define MICROPY_PY_SYS_MODULES      (0)
 #define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)

From d0ccaff5b719e72456b92e2f40daa93a182801a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 13:01:47 +1000
Subject: [PATCH 2453/3129] zephyr/mpconfigport: Enable
 MICROPY_NLR_THUMB_USE_LONG_JUMP.

Needed for some ARMv6M boards, eg rpi_pico.

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

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index a24caf74578b7..bf85ef6eaa620 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -36,6 +36,9 @@
 #define MICROPY_HEAP_SIZE (16 * 1024)
 #endif
 
+// We can't guarantee object layout of nlr code so use long jump by default.
+#define MICROPY_NLR_THUMB_USE_LONG_JUMP (1)
+
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
 #define MICROPY_ENABLE_SOURCE_LINE  (1)
 #define MICROPY_STACK_CHECK         (1)

From 35880d432ae5f9763ebab7a1d8ce1798662898ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 13:02:16 +1000
Subject: [PATCH 2454/3129] zephyr/boards/frdm_k64f: Improve board
 configuration.

Changes:
- Enable CONFIG_PWM so that `machine.PWM()` works.
- Increase MicroPython GC heap size.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/frdm_k64f.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/zephyr/boards/frdm_k64f.conf b/ports/zephyr/boards/frdm_k64f.conf
index c164c0c32c567..71f8cc178bc6e 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_PWM=y
 CONFIG_SPI=y
 
 # Sensor drivers
@@ -14,3 +15,6 @@ CONFIG_FXOS8700_TEMP=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
+
+# MicroPython config
+CONFIG_MICROPY_HEAP_SIZE=114688

From 0faddb3c8a0f44e04577c8f6e46bf0d1e976d2c9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 13:02:36 +1000
Subject: [PATCH 2455/3129] zephyr/boards/nucleo_wb55rg: Enable BLE, I2C, SPI
 and add filesystem.

Bluetooth works well now on this board, so enable all supported features.

Also increase the MicroPython GC heap size to make use of the available
RAM.

Unfortunately the filesystem does not match the stm32 port's NUCLEO_WB55
configuration.  That's not possible to do because stm32 uses a 512 byte
flash erase size, while zephyr uses 4096 bytes.  But at least here in
zephyr there's now a sizable and usable filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/nucleo_wb55rg.conf    | 16 ++++++++++++++++
 ports/zephyr/boards/nucleo_wb55rg.overlay | 23 +++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 ports/zephyr/boards/nucleo_wb55rg.overlay

diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
index fab993676ac66..adfab367c892a 100644
--- a/ports/zephyr/boards/nucleo_wb55rg.conf
+++ b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -1,5 +1,21 @@
 CONFIG_NETWORKING=n
+
+# Hardware features
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_I2C=y
+CONFIG_SPI=y
+
+# Bluetooth
 CONFIG_BT=y
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
+CONFIG_BT_GATT_CLIENT=y
+CONFIG_BT_L2CAP_TX_MTU=252
+CONFIG_BT_BUF_ACL_RX_SIZE=256
+CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
+
+# MicroPython config
+CONFIG_MICROPY_HEAP_SIZE=131072
diff --git a/ports/zephyr/boards/nucleo_wb55rg.overlay b/ports/zephyr/boards/nucleo_wb55rg.overlay
new file mode 100644
index 0000000000000..d9a4d3f24c5c6
--- /dev/null
+++ b/ports/zephyr/boards/nucleo_wb55rg.overlay
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Damien P. George
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Delete the defined partitions and create bigger one for storage. */
+/delete-node/ &slot1_partition;
+/delete-node/ &scratch_partition;
+/delete-node/ &storage_partition;
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Storage slot: 424 KiB placed after slot0_partition. */
+		storage_partition: partition@70000 {
+			label = "storage";
+			reg = <0x00070000 DT_SIZE_K(424)>;
+		};
+	};
+};

From ec65cac971263975b32ec9fc73db512fdeb21ad7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:40:11 +1000
Subject: [PATCH 2456/3129] zephyr/boards/rpi_pico: Add board configuration for
 rpi_pico.

Although the rpi_pico can already build and run with the zephyr port, this
configuration improves it in a number of ways:
- Use the USB CDC ACM as the REPL, rather than just a UART.
- Enable I2C and SPI, and add I2C1.
- Enable a filesystem, which matches exactly the rp2 port's RPI_PICO
  configuration.  So switching between zephyr and rp2 is possible and will
  retain the filesystem.
- Make the MicroPython GC heap make the most use of the available RAM.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/rpi_pico.conf    | 19 +++++++++++
 ports/zephyr/boards/rpi_pico.overlay | 48 ++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 ports/zephyr/boards/rpi_pico.conf
 create mode 100644 ports/zephyr/boards/rpi_pico.overlay

diff --git a/ports/zephyr/boards/rpi_pico.conf b/ports/zephyr/boards/rpi_pico.conf
new file mode 100644
index 0000000000000..6b31bc9f98bcb
--- /dev/null
+++ b/ports/zephyr/boards/rpi_pico.conf
@@ -0,0 +1,19 @@
+# Disable floating point hardware.
+CONFIG_FPU=n
+
+# Configure serial console over USB CDC ACM.
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_USBD_CDC_ACM_CLASS=y
+CONFIG_UART_LINE_CTRL=y
+
+# Disable networking.
+CONFIG_NETWORKING=n
+
+# Hardware features.
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_I2C=y
+CONFIG_SPI=y
+
+# MicroPython config.
+CONFIG_MICROPY_HEAP_SIZE=196608
diff --git a/ports/zephyr/boards/rpi_pico.overlay b/ports/zephyr/boards/rpi_pico.overlay
new file mode 100644
index 0000000000000..d63ed73bdf62b
--- /dev/null
+++ b/ports/zephyr/boards/rpi_pico.overlay
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025 Damien P. George
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		/* Use USB CDC ACM as the console. */
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+/* Delete defined partitions and make a layout matching the rp2 port RPI_PICO configuration. */
+/delete-node/ &code_partition;
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Code slot: 640 KiB - 0x100 placed after second-stage bootloader. */
+		code_partition: partition@100 {
+			label = "code-partition";
+			reg = <0x00000100 (DT_SIZE_K(640) - 0x100)>;
+			read-only;
+		};
+
+		/* Storage slot: 1408 KiB placed after code_partition. */
+		storage_partition: partition@a0000 {
+			label = "storage";
+			reg = <0x000a0000 DT_SIZE_K(1408)>;
+		};
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+	};
+};
+
+&i2c1 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	status = "okay";
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+};

From 688161830717ad34fe8b499455c2fcafee662c62 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 6 Jul 2025 20:31:16 +1000
Subject: [PATCH 2457/3129] zephyr/mpconfigport: Enable sys.maxsize.

Costs +48 bytes.  Useful to introspect the target.

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

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index bf85ef6eaa620..576618e368747 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -100,6 +100,7 @@
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modtime.c"
 #define MICROPY_PY_ZEPHYR           (1)
 #define MICROPY_PY_ZSENSOR          (1)
+#define MICROPY_PY_SYS_MAXSIZE      (1)
 #define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
@@ -150,6 +151,8 @@ typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
 
+#define MP_SSIZE_MAX (0x7fffffff)
+
 // 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 0fd65c44cf23b22a582a86409ca8408077dd0a94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 6 Jul 2025 21:59:55 +1000
Subject: [PATCH 2458/3129] zephyr/mpconfigport: Enable emergency exception
 buffer.

Needed to pass exception tests.

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

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 576618e368747..62226a2ded738 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -46,6 +46,7 @@
 #define MICROPY_ENABLE_FINALISER    (MICROPY_VFS)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_AUTO_INDENT    (1)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_PY_ASYNC_AWAIT      (0)
 #define MICROPY_PY_BUILTINS_BYTES_HEX (1)

From bf432a3e0f542321b15fcc775f62f072ba56f29d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 6 Jul 2025 22:00:27 +1000
Subject: [PATCH 2459/3129] zephyr/machine_timer: Make machine.Timer id
 argument optional.

With a default of -1, for soft timer.  This matches other ports, and the
`extmod/machine_timer.c` implementation.

This change allows the `tests/extmod/machine_soft_timer.py` test to pass.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/machine_timer.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/zephyr/machine_timer.c b/ports/zephyr/machine_timer.c
index 8ab2f629131c0..1bb743c2eb909 100644
--- a/ports/zephyr/machine_timer.c
+++ b/ports/zephyr/machine_timer.c
@@ -77,9 +77,14 @@ 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, MP_OBJ_FUN_ARGS_MAX, true);
-
-    if (mp_obj_get_int(args[0]) != -1) {
+    // 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("only virtual timers are supported"));
     }
 
@@ -90,10 +95,10 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     self->next = MP_STATE_PORT(machine_timer_obj_head);
     MP_STATE_PORT(machine_timer_obj_head) = self;
 
-    if (n_args > 1 || n_kw > 0) {
+    if (n_args > 0 || 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);
+        machine_timer_init_helper(self, n_args, args, &kw_args);
     }
     return self;
 }

From 9a9e5529af9012534f2935474476d631c1e7cb81 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Jul 2025 11:12:45 +1000
Subject: [PATCH 2460/3129] zephyr/machine_pin: Retry configuring gpio with
 just GPIO_OUTPUT.

Some targets like frdm_k64f don't support GPIO_OUTPUT|GPIO_INPUT, so just
use GPIO_OUTPUT in those cases (it seems they still support reading the
current output state even when configured only as GPIO_OUTPUT, unlike other
targets which require both settings).

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

diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 7834b5de6d2c9..e0718588d6599 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -116,6 +116,10 @@ static mp_obj_t machine_pin_obj_init_helper(machine_pin_obj_t *self, size_t n_ar
     }
 
     int ret = gpio_pin_configure(self->port, self->pin, mode | pull | init);
+    if (ret == -ENOTSUP && mode == (GPIO_OUTPUT | GPIO_INPUT)) {
+        // Some targets (eg frdm_k64f) don't support GPIO_OUTPUT|GPIO_INPUT, so try again with just GPIO_OUTPUT.
+        ret = gpio_pin_configure(self->port, self->pin, GPIO_OUTPUT | pull | init);
+    }
     if (ret) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
     }

From ea2000b81d2007e373a302d5361455147c693dbb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Jun 2025 14:23:36 +1000
Subject: [PATCH 2461/3129] stm32/adc: Apply re-read errata for WB55.

Following 17898f8607dc4fb881e860719cc1906d304e60f4.

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

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 3549fc29a98b8..239175bac6d32 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -464,10 +464,13 @@ static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
 
 static uint32_t adc_read_channel(ADC_HandleTypeDef *adcHandle) {
     uint32_t value;
-    #if defined(STM32G4)
-    // For STM32G4 there is errata 2.7.7, "Wrong ADC result if conversion done late after
-    // calibration or previous conversion".  According to the errata, this can be avoided
-    // by performing two consecutive ADC conversions and keeping the second result.
+    #if defined(STM32G4) || defined(STM32WB)
+    // For STM32G4 errata 2.7.7 / STM32WB errata 2.7.1:
+    // "Wrong ADC result if conversion done late after calibration or previous conversion"
+    // states an incorrect reading is returned if more than 1ms has elapsed since the last
+    // reading or calibration. According to the errata, this can be avoided by performing
+    // two consecutive ADC conversions and keeping the second result.
+    // Note: On STM32WB55 @ 64Mhz each ADC read takes ~ 3us.
     for (uint8_t i = 0; i < 2; i++)
     #endif
     {

From 841439d5fb285a748acb0bdfa8c0cac7af7b10a7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Jun 2025 14:24:21 +1000
Subject: [PATCH 2462/3129] stm32/adc: Simplify ADC calibration settings.

Combine the common settings for L1/L4/WB with existing G0/G4/H5 settings.

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

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 239175bac6d32..34c52f4895506 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -107,12 +107,12 @@
 #define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 4))
 #define ADC_CAL_BITS            (12)
 
-#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB)
 
 #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_ADDRESS         (VREFINT_CAL_ADDR)
+#define ADC_CAL1                (TEMPSENSOR_CAL1_ADDR)
+#define ADC_CAL2                (TEMPSENSOR_CAL2_ADDR)
 #define ADC_CAL_BITS            (12) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits'
 
 #elif defined(STM32H7)
@@ -123,22 +123,6 @@
 #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)
-#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
 
 #error Unsupported processor

From c9adabc25a648a3d3d1e32bc60866a1bad30ffc5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Jun 2025 14:25:10 +1000
Subject: [PATCH 2463/3129] stm32/adc: Fix core temperature reading on WB55.

It needs a divisor of 100 because the calibration temperatures are 30 and
130 degrees, similar to the H5.

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

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 34c52f4895506..10d78125927dc 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -923,7 +923,7 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
         return 0;
     }
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 100.0f;
-    #elif defined(STM32H5)
+    #elif defined(STM32H5) || defined(STM32WB)
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 100.0f;
     #else

From d5246cea616c9b783cfd88e5cd854b92953ed9d4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Jun 2025 14:25:46 +1000
Subject: [PATCH 2464/3129] stm32/machine_adc: Fix internal ADC channel reading
 on WB MCUs.

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

diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index c3211ea4f4a1a..aa72fc68d9267 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -386,6 +386,7 @@ 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(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+
     #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     ADC_Common_TypeDef *adc_common = ADC12_COMMON;
     #elif defined(STM32H7)
@@ -423,8 +424,8 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
         adc->OR |= ADC_OR_OP0; // Enable Vddcore channel on ADC2
     #endif
     }
-    #if defined(STM32G4) || defined(STM32H5)
-    // G4 and H5 use encoded literals for internal channels -> extract ADC channel for following code
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32WB)
+    // MCU uses encoded literals for internal channels -> extract ADC channel for following code
     if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
     }

From 0975255f863be2e2529d57fb67bc7ba841e81249 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 29 Jun 2025 22:14:52 +1000
Subject: [PATCH 2465/3129] stm32/uart: Suppress additional RX idle IRQs on
 F4/L1.

These MCUs only clear the RX idle IRQ if the data register is read, which
won't occur if the only IRQ is the RX idle IRQ (because then reading and
discarding the DR may lead to lost data).

To work around this, explicitly suppress the RX idle IRQ so that it's only
passed through to the Python callback once.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/uart.c | 15 +++++++++++++++
 ports/stm32/uart.h |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 55fa6221422b0..e3f8dc1f90648 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -689,6 +689,10 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     uart_obj->is_enabled = true;
     uart_obj->attached_to_repl = false;
 
+    #if defined(STM32F4) || defined(STM32L1)
+    uart_obj->suppress_idle_irq = true;
+    #endif
+
     if (bits == UART_WORDLENGTH_9B && parity == UART_PARITY_NONE) {
         uart_obj->char_mask = 0x1ff;
         uart_obj->char_width = CHAR_WIDTH_9BIT;
@@ -1274,6 +1278,9 @@ void uart_irq_handler(mp_uint_t uart_id) {
             self->uartx->CR1 &= ~USART_CR1_RXNEIE;
         }
     }
+    if (self->suppress_idle_irq) {
+        self->mp_irq_flags &= ~USART_SR_IDLE;
+    }
     #else
     self->uartx->ICR = self->mp_irq_flags & (USART_ICR_IDLECF | USART_ICR_ORECF);
     #endif
@@ -1282,6 +1289,14 @@ void uart_irq_handler(mp_uint_t uart_id) {
     if (self->mp_irq_trigger & self->mp_irq_flags) {
         mp_irq_handler(self->mp_irq_obj);
     }
+
+    #if defined(STM32F4) || defined(STM32L1)
+    if (did_clear_sr) {
+        self->suppress_idle_irq = false;
+    } else {
+        self->suppress_idle_irq = true;
+    }
+    #endif
 }
 
 static mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index de4b70cdea738..d92434c641c3e 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_UART_H
 #define MICROPY_INCLUDED_STM32_UART_H
 
+#include "py/mphal.h"
 #include "shared/runtime/mpirq.h"
 
 typedef enum {
@@ -63,6 +64,9 @@ typedef struct _machine_uart_obj_t {
     pyb_uart_t uart_id : 8;
     bool is_static : 1;
     bool is_enabled : 1;
+    #if defined(STM32F4) || defined(STM32L1)
+    bool suppress_idle_irq : 1;         // whether the RX idle IRQ is suppressed (F4/L1 only)
+    #endif
     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

From bb484b6d81516ecfd110973af371a6eb00918e85 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Jun 2025 14:28:17 +1000
Subject: [PATCH 2466/3129] tests/extmod/machine_uart_tx.py: Support STM32WB
 boards.

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

diff --git a/tests/extmod/machine_uart_tx.py b/tests/extmod/machine_uart_tx.py
index f0cc912da66e0..85bf7e9fb878a 100644
--- a/tests/extmod/machine_uart_tx.py
+++ b/tests/extmod/machine_uart_tx.py
@@ -28,7 +28,10 @@
     initial_delay_ms = 20  # UART sends idle frame after init, so wait for that
     bit_margin = 1
 elif "pyboard" in sys.platform:
-    uart_id = 4
+    if "STM32WB" in sys.implementation._machine:
+        uart_id = "LP1"
+    else:
+        uart_id = 4
     pins = {}
     initial_delay_ms = 50  # UART sends idle frame after init, so wait for that
     bit_margin = 1  # first start-bit must wait to sync with the UART clock

From a2e3055d2d4d84577d4c9c95b2dc740a705d1bfd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Jun 2025 00:03:52 +1000
Subject: [PATCH 2467/3129] tests/extmod_hardware: Add UART config for STM32WB
 boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod_hardware/machine_uart_irq_rx.py     | 11 ++++++++---
 tests/extmod_hardware/machine_uart_irq_rxidle.py | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/extmod_hardware/machine_uart_irq_rx.py b/tests/extmod_hardware/machine_uart_irq_rx.py
index ecc95e62ae570..3602c260e396d 100644
--- a/tests/extmod_hardware/machine_uart_irq_rx.py
+++ b/tests/extmod_hardware/machine_uart_irq_rx.py
@@ -24,9 +24,14 @@
     tx_pin = 4
     rx_pin = 5
 elif "pyboard" in sys.platform:
-    uart_id = 4
-    tx_pin = None  # PA0
-    rx_pin = None  # PA1
+    if "STM32WB" in sys.implementation._machine:
+        # LPUART(1) is on PA2/PA3
+        uart_id = "LP1"
+    else:
+        # UART(4) is on PA0/PA1
+        uart_id = 4
+    tx_pin = None
+    rx_pin = None
 elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
     uart_id = 0
     tx_pin = "D1"
diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py b/tests/extmod_hardware/machine_uart_irq_rxidle.py
index af2412c75eedc..634369150c02f 100644
--- a/tests/extmod_hardware/machine_uart_irq_rxidle.py
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py
@@ -26,9 +26,14 @@
     uart_id = 1
     tx_pin = None
 elif "pyboard" in sys.platform:
-    uart_id = 4
-    tx_pin = None  # PA0
-    rx_pin = None  # PA1
+    if "STM32WB" in sys.implementation._machine:
+        # LPUART(1) is on PA2/PA3
+        uart_id = "LP1"
+    else:
+        # UART(4) is on PA0/PA1
+        uart_id = 4
+    tx_pin = None
+    rx_pin = None
 elif "renesas-ra" in sys.platform:
     uart_id = 9
     tx_pin = None  # P602 @ RA6M2

From a4a098ff8210a086d947b53771ed747a8998cef0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Jun 2025 00:29:22 +1000
Subject: [PATCH 2468/3129] tests/extmod_hardware/machine_uart_irq_rxidle.py:
 Ignore inital IRQ.

On stm32, the hardware generates an RXIDLE IRQ after enabling the UART,
because the RX line is technically idle.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod_hardware/machine_uart_irq_rxidle.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py b/tests/extmod_hardware/machine_uart_irq_rxidle.py
index 634369150c02f..ced24dca64222 100644
--- a/tests/extmod_hardware/machine_uart_irq_rxidle.py
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py
@@ -13,6 +13,9 @@
 
 import time, sys
 
+# Target tuning options.
+tune_wait_initial_rxidle = False
+
 # Configure pins based on the target.
 if "alif" in sys.platform:
     uart_id = 1
@@ -26,6 +29,7 @@
     uart_id = 1
     tx_pin = None
 elif "pyboard" in sys.platform:
+    tune_wait_initial_rxidle = True
     if "STM32WB" in sys.implementation._machine:
         # LPUART(1) is on PA2/PA3
         uart_id = "LP1"
@@ -69,8 +73,15 @@ def irq(u):
     else:
         uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
 
+    # Ignore a possible initial RXIDLE condition after creating UART.
+    if tune_wait_initial_rxidle:
+        uart.irq(lambda _: None, uart.IRQ_RXIDLE)
+        time.sleep_ms(10)
+
+    # Configure desired IRQ.
     uart.irq(irq, uart.IRQ_RXIDLE)
 
+    # Write data and wait for IRQ.
     print("write", bits_per_s)
     uart.write(text)
     uart.flush()

From 29b5c2207cd3f267018c566ee20f2d95f3b38f5e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Jun 2025 11:27:50 +1000
Subject: [PATCH 2469/3129] tests/extmod_hardware/machine_uart_irq_rxidle.py:
 Test multiple writes.

This tests that the RXIDLE callback is called correctly after a second lot
of bytes are received.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../machine_uart_irq_rxidle.py                | 20 +++++++++-------
 .../machine_uart_irq_rxidle.py.exp            | 24 ++++++++++++++++---
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py b/tests/extmod_hardware/machine_uart_irq_rxidle.py
index ced24dca64222..3c743c9e0c1c0 100644
--- a/tests/extmod_hardware/machine_uart_irq_rxidle.py
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py
@@ -64,10 +64,13 @@ def irq(u):
     print("IRQ_RXIDLE:", bool(u.irq().flags() & u.IRQ_RXIDLE), "data:", u.read())
 
 
-text = "12345678"
+text = ("12345678", "abcdefgh")
 
 # Test that the IRQ is called for each set of byte received.
 for bits_per_s in (2400, 9600, 115200):
+    print("========")
+    print("bits_per_s:", bits_per_s)
+
     if tx_pin is None:
         uart = UART(uart_id, bits_per_s)
     else:
@@ -81,10 +84,11 @@ def irq(u):
     # Configure desired IRQ.
     uart.irq(irq, uart.IRQ_RXIDLE)
 
-    # Write data and wait for IRQ.
-    print("write", bits_per_s)
-    uart.write(text)
-    uart.flush()
-    print("ready")
-    time.sleep_ms(100)
-    print("done")
+    for i in range(2):
+        # Write data and wait for IRQ.
+        print("write")
+        uart.write(text[i])
+        uart.flush()
+        print("ready")
+        time.sleep_ms(100)
+        print("done")
diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py.exp b/tests/extmod_hardware/machine_uart_irq_rxidle.py.exp
index ce1890a06a4b2..f3c7497e4ce11 100644
--- a/tests/extmod_hardware/machine_uart_irq_rxidle.py.exp
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py.exp
@@ -1,12 +1,30 @@
-write 2400
+========
+bits_per_s: 2400
+write
 ready
 IRQ_RXIDLE: True data: b'12345678'
 done
-write 9600
+write
+ready
+IRQ_RXIDLE: True data: b'abcdefgh'
+done
+========
+bits_per_s: 9600
+write
 ready
 IRQ_RXIDLE: True data: b'12345678'
 done
-write 115200
+write
+ready
+IRQ_RXIDLE: True data: b'abcdefgh'
+done
+========
+bits_per_s: 115200
+write
 ready
 IRQ_RXIDLE: True data: b'12345678'
 done
+write
+ready
+IRQ_RXIDLE: True data: b'abcdefgh'
+done

From b680011d91229e6eff76e6e02bf3f3b3f537967b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Jun 2025 14:28:39 +1000
Subject: [PATCH 2470/3129] tests/ports/stm32: Tweak tests to run on a wider
 set of boards.

There should be no change to these tests for existing PYBV1x and PYBD_SFx
boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/stm32/adc.py            |  5 +++++
 tests/ports/stm32/adcall.py         | 16 ++++++++++++++--
 tests/ports/stm32/extint.py         |  3 ++-
 tests/ports/stm32/i2c.py            |  7 +++++--
 tests/ports/stm32/i2c_accel.py      |  9 ++++-----
 tests/ports/stm32/i2c_error.py      |  3 ++-
 tests/ports/stm32/irq.py            |  5 +++--
 tests/ports/stm32/modstm.py         |  4 ++--
 tests/ports/stm32/pin.py            | 14 ++++++++++----
 tests/ports/stm32/pyb1.py           |  4 ++++
 tests/ports/stm32/rtc.py            | 14 ++++++++++----
 tests/ports/stm32/servo.py          |  6 +++++-
 tests/ports/stm32/timer.py          | 11 ++++++++---
 tests/ports/stm32/timer_callback.py | 26 ++++++++++++++++----------
 tests/ports/stm32/uart.py           |  6 ++++++
 15 files changed, 96 insertions(+), 37 deletions(-)

diff --git a/tests/ports/stm32/adc.py b/tests/ports/stm32/adc.py
index 875d31d732cc3..299a5af9c6345 100644
--- a/tests/ports/stm32/adc.py
+++ b/tests/ports/stm32/adc.py
@@ -1,5 +1,10 @@
+import sys
 from pyb import ADC, Timer
 
+if "STM32WB" in sys.implementation._machine:
+    print("SKIP")
+    raise SystemExit
+
 adct = ADC(16)  # Temperature 930 -> 20C
 print(str(adct)[:19])
 adcv = ADC(17)  # Voltage 1500 -> 3.3V
diff --git a/tests/ports/stm32/adcall.py b/tests/ports/stm32/adcall.py
index cfe179a97b212..18896c40cb2a3 100644
--- a/tests/ports/stm32/adcall.py
+++ b/tests/ports/stm32/adcall.py
@@ -1,5 +1,13 @@
+import sys
 from pyb import Pin, ADCAll
 
+if "STM32WB" in sys.implementation._machine:
+    pa0_adc_channel = 5
+    skip_temp_test = True  # temperature fails on WB55
+else:
+    pa0_adc_channel = 0
+    skip_temp_test = False
+
 pins = [Pin.cpu.A0, Pin.cpu.A1, Pin.cpu.A2, Pin.cpu.A3]
 
 # set pins to IN mode, init ADCAll, then check pins are ANALOG
@@ -12,7 +20,7 @@
 # set pins to IN mode, init ADCAll with mask, then check some pins are ANALOG
 for p in pins:
     p.init(p.IN)
-adc = ADCAll(12, 0x70003)
+adc = ADCAll(12, 0x70000 | 3 << pa0_adc_channel)
 for p in pins:
     print(p)
 
@@ -25,7 +33,11 @@
     print(type(adc.read_channel(c)))
 
 # call special reading functions
-print(0 < adc.read_core_temp() < 100)
+print(skip_temp_test or 0 < adc.read_core_temp() < 100)
 print(0 < adc.read_core_vbat() < 4)
 print(0 < adc.read_core_vref() < 2)
 print(0 < adc.read_vref() < 4)
+
+if sys.implementation._build == "NUCLEO_WB55":
+    # Restore button pin settings.
+    Pin("SW", Pin.IN, Pin.PULL_UP)
diff --git a/tests/ports/stm32/extint.py b/tests/ports/stm32/extint.py
index 5510600020e53..d3161f7cc76a1 100644
--- a/tests/ports/stm32/extint.py
+++ b/tests/ports/stm32/extint.py
@@ -1,7 +1,8 @@
 import pyb
 
 # test basic functionality
-ext = pyb.ExtInt("X5", pyb.ExtInt.IRQ_RISING, pyb.Pin.PULL_DOWN, lambda l: print("line:", l))
+pin = pyb.Pin.cpu.A4
+ext = pyb.ExtInt(pin, pyb.ExtInt.IRQ_RISING, pyb.Pin.PULL_DOWN, lambda l: print("line:", l))
 ext.disable()
 ext.enable()
 print(ext.line())
diff --git a/tests/ports/stm32/i2c.py b/tests/ports/stm32/i2c.py
index c968843273a59..7e7fd25040880 100644
--- a/tests/ports/stm32/i2c.py
+++ b/tests/ports/stm32/i2c.py
@@ -1,5 +1,8 @@
-import pyb
-from pyb import I2C
+try:
+    from pyb import I2C
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # test we can correctly create by id
 for bus in (-1, 0, 1):
diff --git a/tests/ports/stm32/i2c_accel.py b/tests/ports/stm32/i2c_accel.py
index 8b87d406d06ee..11ff1392ba414 100644
--- a/tests/ports/stm32/i2c_accel.py
+++ b/tests/ports/stm32/i2c_accel.py
@@ -1,15 +1,14 @@
 # use accelerometer to test i2c bus
 
-import pyb
-from pyb import I2C
-
-if not hasattr(pyb, "Accel"):
+try:
+    from pyb import Accel, I2C
+except ImportError:
     print("SKIP")
     raise SystemExit
 
 accel_addr = 76
 
-pyb.Accel()  # this will init the MMA for us
+Accel()  # this will init the MMA for us
 
 i2c = I2C(1, I2C.CONTROLLER, baudrate=400000)
 
diff --git a/tests/ports/stm32/i2c_error.py b/tests/ports/stm32/i2c_error.py
index 1228962f5f408..de6e1ca6fece2 100644
--- a/tests/ports/stm32/i2c_error.py
+++ b/tests/ports/stm32/i2c_error.py
@@ -1,12 +1,13 @@
 # test I2C errors, with polling (disabled irqs) and DMA
 
 import pyb
-from pyb import I2C
 
 if not hasattr(pyb, "Accel"):
     print("SKIP")
     raise SystemExit
 
+from pyb import I2C
+
 # init accelerometer
 pyb.Accel()
 
diff --git a/tests/ports/stm32/irq.py b/tests/ports/stm32/irq.py
index 04e70a7b79211..fd8742d3eaf7f 100644
--- a/tests/ports/stm32/irq.py
+++ b/tests/ports/stm32/irq.py
@@ -1,3 +1,4 @@
+import time
 import pyb
 
 
@@ -8,7 +9,7 @@ def test_irq():
     pyb.enable_irq()  # by default should enable IRQ
 
     # check that interrupts are enabled by waiting for ticks
-    pyb.delay(10)
+    time.sleep_ms(10)
 
     # check nested disable/enable
     i1 = pyb.disable_irq()
@@ -18,7 +19,7 @@ def test_irq():
     pyb.enable_irq(i1)
 
     # check that interrupts are enabled by waiting for ticks
-    pyb.delay(10)
+    time.sleep_ms(10)
 
 
 test_irq()
diff --git a/tests/ports/stm32/modstm.py b/tests/ports/stm32/modstm.py
index f1e147c0529b0..1459ee2a9e3f6 100644
--- a/tests/ports/stm32/modstm.py
+++ b/tests/ports/stm32/modstm.py
@@ -1,13 +1,13 @@
 # test stm module
 
 import stm
-import pyb
+import time
 
 # test storing a full 32-bit number
 # turn on then off the A15(=yellow) LED
 BSRR = 0x18
 stm.mem32[stm.GPIOA + BSRR] = 0x00008000
-pyb.delay(100)
+time.sleep_ms(100)
 print(hex(stm.mem32[stm.GPIOA + stm.GPIO_ODR] & 0x00008000))
 stm.mem32[stm.GPIOA + BSRR] = 0x80000000
 print(hex(stm.mem32[stm.GPIOA + stm.GPIO_ODR] & 0x00008000))
diff --git a/tests/ports/stm32/pin.py b/tests/ports/stm32/pin.py
index 3d2bef97e3437..cbc78e68abd6a 100644
--- a/tests/ports/stm32/pin.py
+++ b/tests/ports/stm32/pin.py
@@ -1,14 +1,20 @@
+import sys
 from pyb import Pin
 
-p = Pin("X8", Pin.IN)
+if "PYB" in sys.implementation._machine:
+    test_pin = "X8"
+else:
+    test_pin = Pin.cpu.A7
+
+p = Pin(test_pin, Pin.IN)
 print(p)
 print(p.name())
 print(p.pin())
 print(p.port())
 
-p = Pin("X8", Pin.IN, Pin.PULL_UP)
-p = Pin("X8", Pin.IN, pull=Pin.PULL_UP)
-p = Pin("X8", mode=Pin.IN, pull=Pin.PULL_UP)
+p = Pin(test_pin, Pin.IN, Pin.PULL_UP)
+p = Pin(test_pin, Pin.IN, pull=Pin.PULL_UP)
+p = Pin(test_pin, mode=Pin.IN, pull=Pin.PULL_UP)
 print(p)
 print(p.value())
 
diff --git a/tests/ports/stm32/pyb1.py b/tests/ports/stm32/pyb1.py
index e9626ecf4e7d4..5627946dbc3ca 100644
--- a/tests/ports/stm32/pyb1.py
+++ b/tests/ports/stm32/pyb1.py
@@ -2,6 +2,10 @@
 
 import pyb
 
+if not hasattr(pyb, "delay"):
+    print("SKIP")
+    raise SystemExit
+
 # test delay
 
 pyb.delay(-1)
diff --git a/tests/ports/stm32/rtc.py b/tests/ports/stm32/rtc.py
index 013b2f33142f0..03ed93adc26d3 100644
--- a/tests/ports/stm32/rtc.py
+++ b/tests/ports/stm32/rtc.py
@@ -1,13 +1,15 @@
-import pyb, stm
+import time, stm
 from pyb import RTC
 
+prediv_a = stm.mem32[stm.RTC + stm.RTC_PRER] >> 16
+
 rtc = RTC()
 rtc.init()
 print(rtc)
 
 # make sure that 1 second passes correctly
 rtc.datetime((2014, 1, 1, 1, 0, 0, 0, 0))
-pyb.delay(1002)
+time.sleep_ms(1002)
 print(rtc.datetime()[:7])
 
 
@@ -38,8 +40,12 @@ def set_and_print(datetime):
 
 
 def set_and_print_calib(cal):
-    rtc.calibration(cal)
-    print(rtc.calibration())
+    if cal > 0 and prediv_a < 3:
+        # can't set positive calibration if prediv_a<3, so just make test pass
+        print(cal)
+    else:
+        rtc.calibration(cal)
+        print(rtc.calibration())
 
 
 set_and_print_calib(512)
diff --git a/tests/ports/stm32/servo.py b/tests/ports/stm32/servo.py
index d15cafe483e01..0784f64d33677 100644
--- a/tests/ports/stm32/servo.py
+++ b/tests/ports/stm32/servo.py
@@ -1,4 +1,8 @@
-from pyb import Servo
+try:
+    from pyb import Servo
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 servo = Servo(1)
 print(servo)
diff --git a/tests/ports/stm32/timer.py b/tests/ports/stm32/timer.py
index 251a06c081bbe..add8c2993770e 100644
--- a/tests/ports/stm32/timer.py
+++ b/tests/ports/stm32/timer.py
@@ -1,10 +1,15 @@
 # check basic functionality of the timer class
 
-import pyb
+import sys
 from pyb import Timer
 
-tim = Timer(4)
-tim = Timer(4, prescaler=100, period=200)
+if "STM32WB" in sys.implementation._machine:
+    tim_id = 16
+else:
+    tim_id = 4
+
+tim = Timer(tim_id)
+tim = Timer(tim_id, prescaler=100, period=200)
 print(tim.prescaler())
 print(tim.period())
 tim.prescaler(300)
diff --git a/tests/ports/stm32/timer_callback.py b/tests/ports/stm32/timer_callback.py
index 5f170ccde1137..4add88ec6a7eb 100644
--- a/tests/ports/stm32/timer_callback.py
+++ b/tests/ports/stm32/timer_callback.py
@@ -1,8 +1,14 @@
 # check callback feature of the timer class
 
-import pyb
+import sys
+import time
 from pyb import Timer
 
+if "STM32WB" in sys.implementation._machine:
+    tim_extra_id = 16
+else:
+    tim_extra_id = 4
+
 
 # callback function that disables the callback when called
 def cb1(t):
@@ -29,27 +35,27 @@ def cb4(t):
 
 # create a timer with a callback, using callback(None) to stop
 tim = Timer(1, freq=100, callback=cb1)
-pyb.delay(5)
+time.sleep_ms(5)
 print("before cb1")
-pyb.delay(15)
+time.sleep_ms(15)
 
 # create a timer with a callback, using deinit to stop
 tim = Timer(2, freq=100, callback=cb2)
-pyb.delay(5)
+time.sleep_ms(5)
 print("before cb2")
-pyb.delay(15)
+time.sleep_ms(15)
 
 # create a timer, then set the freq, then set the callback
-tim = Timer(4)
+tim = Timer(tim_extra_id)
 tim.init(freq=100)
 tim.callback(cb1)
-pyb.delay(5)
+time.sleep_ms(5)
 print("before cb1")
-pyb.delay(15)
+time.sleep_ms(15)
 
 # test callback with a closure
 tim.init(freq=100)
 tim.callback(cb3(3))
-pyb.delay(5)
+time.sleep_ms(5)
 print("before cb4")
-pyb.delay(15)
+time.sleep_ms(15)
diff --git a/tests/ports/stm32/uart.py b/tests/ports/stm32/uart.py
index 53b0ea6ade459..28eb2261b7fa1 100644
--- a/tests/ports/stm32/uart.py
+++ b/tests/ports/stm32/uart.py
@@ -1,5 +1,11 @@
+import sys
 from pyb import UART
 
+if "STM32WB" in sys.implementation._machine:
+    # UART(1) is usually connected to the REPL on these MCUs.
+    print("SKIP")
+    raise SystemExit
+
 # test we can correctly create by id
 for bus in (-1, 0, 1, 2, 5, 6):
     try:

From 168e2c8f66d9cfb8c5212fc236aa645ad8275876 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Jun 2025 11:53:00 +1000
Subject: [PATCH 2471/3129] tests/extmod/select_poll_eintr.py: Skip test if
 target can't bind.

Eg on PYBV10 with THREAD variant, the firmware has both the `_thread` and
`socket` modules but no NIC.

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

diff --git a/tests/extmod/select_poll_eintr.py b/tests/extmod/select_poll_eintr.py
index e1cbc2aaf57d0..d9e9b3190907c 100644
--- a/tests/extmod/select_poll_eintr.py
+++ b/tests/extmod/select_poll_eintr.py
@@ -10,6 +10,18 @@
     print("SKIP")
     raise SystemExit
 
+# Use a new UDP socket for tests, which should be writable but not readable.
+s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+localhost_addr_info = socket.getaddrinfo("127.0.0.1", 8000)
+try:
+    s.bind(localhost_addr_info[0][-1])
+except OSError:
+    # Target can't bind to localhost.
+    # Most likely it doesn't have a NIC and the test cannot be run.
+    s.close()
+    print("SKIP")
+    raise SystemExit
+
 
 def thread_main():
     lock.acquire()
@@ -26,10 +38,6 @@ def thread_main():
 lock.acquire()
 _thread.start_new_thread(thread_main, ())
 
-# Use a new UDP socket for tests, which should be writable but not readable.
-s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-s.bind(socket.getaddrinfo("127.0.0.1", 8000)[0][-1])
-
 # Create the poller object.
 poller = select.poll()
 poller.register(s, select.POLLIN)

From f3c56c81eaeb197e7765514b8e3c3aed731f8c5f Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 29 Jun 2025 13:34:09 +0900
Subject: [PATCH 2472/3129] stm32/irq: Change SPI IRQ priority to be higher
 than DMA IRQ.

On STM32H5/STM32H7, SPI flash cannot use as storage device with DMA.  SPI
interruption may not be genearated even if DMA transfer has been done.
This is due to lower priority of SPI interruption than DMA.

This commit changes SPI interrupt priority more higher than DMA's priority.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/irq.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/irq.h b/ports/stm32/irq.h
index 58e6d0a804854..dfe901ff74b24 100644
--- a/ports/stm32/irq.h
+++ b/ports/stm32/irq.h
@@ -155,6 +155,9 @@ static inline void restore_irq_pri(uint32_t state) {
 // SDIO must be higher priority than DMA for SDIO DMA transfers to work.
 #define IRQ_PRI_SDIO            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 4, 0)
 
+// SPI must be higher priority than DMA for SPI DMA transfers to work.
+#define IRQ_PRI_SPI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 4, 0)
+
 // DMA should be higher priority than USB, since USB Mass Storage calls
 // into the sdcard driver which waits for the DMA to complete.
 #define IRQ_PRI_DMA             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 5, 0)
@@ -172,8 +175,6 @@ static inline void restore_irq_pri(uint32_t state) {
 
 #define IRQ_PRI_SUBGHZ_RADIO    NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 8, 0)
 
-#define IRQ_PRI_SPI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 8, 0)
-
 #define IRQ_PRI_HSEM            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 10, 0)
 
 // Interrupt priority for non-special timers.

From 42cfa7cdaeef455e3744ee8a21a5a423926e211f Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Tue, 1 Jul 2025 08:17:09 +1000
Subject: [PATCH 2473/3129] stm32/dma: Extend STM32H5 DMA use to SPI3 and SPI4.

Attempting to configure SPI3 and SPI4 for the STM32H5 would fail with a
linker error.  This patch resolves that, ensuring that appropriate DMA
channels are assigned to those SPI resources.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 ports/stm32/dma.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index df8a408cbf8ba..53c53868cd1fc 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -735,9 +735,13 @@ const dma_descr_t dma_SPI_1_RX = { GPDMA1_Channel0, GPDMA1_REQUEST_SPI1_RX, dma_
 const dma_descr_t dma_SPI_1_TX = { GPDMA1_Channel1, GPDMA1_REQUEST_SPI1_TX, dma_id_1, &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_2_RX = { GPDMA1_Channel2, GPDMA1_REQUEST_SPI2_RX, dma_id_2, &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_2_TX = { GPDMA1_Channel3, GPDMA1_REQUEST_SPI2_TX, dma_id_3, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_3_RX = { GPDMA1_Channel4, GPDMA1_REQUEST_SPI3_RX, dma_id_4, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_3_TX = { GPDMA1_Channel5, GPDMA1_REQUEST_SPI3_TX, dma_id_5, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_4_RX = { GPDMA1_Channel6, GPDMA1_REQUEST_SPI4_RX, dma_id_6, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_4_TX = { GPDMA1_Channel7, GPDMA1_REQUEST_SPI4_TX, dma_id_7, &dma_init_struct_spi_i2c };
 #if MICROPY_HW_ENABLE_DAC
-const dma_descr_t dma_DAC_1_TX = { GPDMA1_Channel4, GPDMA1_REQUEST_DAC1_CH1, dma_id_4, &dma_init_struct_dac };
-const dma_descr_t dma_DAC_2_TX = { GPDMA1_Channel5, GPDMA1_REQUEST_DAC1_CH2, dma_id_5, &dma_init_struct_dac };
+const dma_descr_t dma_DAC_1_TX = { GPDMA2_Channel0, GPDMA1_REQUEST_DAC1_CH1, dma_id_8, &dma_init_struct_dac };
+const dma_descr_t dma_DAC_2_TX = { GPDMA2_Channel1, GPDMA1_REQUEST_DAC1_CH2, dma_id_9, &dma_init_struct_dac };
 #endif
 
 static const uint8_t dma_irqn[NSTREAM] = {

From eaffbacb10783c769dc46a61b9eea65fcb7413fe Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Thu, 3 Jul 2025 20:47:00 +0900
Subject: [PATCH 2474/3129] stm32/machine_adc: Add machine.ADC implementation
 for STM32L1.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c         |  2 +-
 ports/stm32/machine_adc.c | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 10d78125927dc..28e254ace2372 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -416,7 +416,7 @@ static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
     } else {
-        sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
+        sConfig.SamplingTime = ADC_SAMPLETIME_16CYCLES;
     }
     #elif defined(STM32G0)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index aa72fc68d9267..77d6248d02fda 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -80,7 +80,7 @@
 #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      ADC_SAMPLETIME_16CYCLES
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_384CYCLES
 #elif defined(STM32L4) || defined(STM32WB)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
@@ -225,6 +225,8 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     ADC3_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
     #elif defined(STM32L0)
     ADC1_COMMON->CCR = 0; // ADCPR=PCLK/2
+    #elif defined(STM32L1)
+    ADC1_COMMON->CCR = 1 << ADC_CCR_ADCPRE_Pos; // ADCPRE=2
     #elif defined(STM32WB)
     ADC1_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos | 0 << ADC_CCR_CKMODE_Pos; // PRESC=1, MODE=ASYNC
     #elif defined(STM32WL)
@@ -385,6 +387,31 @@ 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(STM32L1)
+
+    ADC_Common_TypeDef *adc_common = ADC1_COMMON;
+    if (channel == ADC_CHANNEL_VREFINT || channel == ADC_CHANNEL_TEMPSENSOR) {
+        adc_common->CCR |= ADC_CCR_TSVREFE;
+        if (channel == ADC_CHANNEL_TEMPSENSOR) {
+            adc_stabilisation_delay_us(ADC_TEMPSENSOR_DELAY_US);
+        }
+    }
+
+    adc->SQR1 = (1 - 1) << ADC_SQR1_L_Pos;
+    adc->SQR5 = (channel & 0x1f) << ADC_SQR5_SQ1_Pos;
+
+    __IO uint32_t *smpr;
+    if (channel >= 20) {
+        smpr = &adc->SMPR1;
+        channel -= 20;
+    } else if (channel >= 10) {
+        smpr = &adc->SMPR2;
+        channel -= 10;
+    } else {
+        smpr = &adc->SMPR3;
+    }
+    *smpr = (*smpr & ~(7 << (channel * 3))) | sample_time << (channel * 3); // select sample time
+
     #elif defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
 
     #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)

From 62a674c9c40b52903d7da4fda5331b0f8653d966 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 May 2025 01:19:52 +1000
Subject: [PATCH 2475/3129] drivers: Support special QSPI direct-read protocol.

This is useful for interfaces that stay in memory-mapped mode by default.
They can implement this method with a simple `memcpy()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/bus/qspi.h        | 1 +
 drivers/memory/spiflash.c | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/bus/qspi.h b/drivers/bus/qspi.h
index 32b2890e3fc4a..05d9dd473c3af 100644
--- a/drivers/bus/qspi.h
+++ b/drivers/bus/qspi.h
@@ -46,6 +46,7 @@ typedef struct _mp_qspi_proto_t {
     int (*write_cmd_addr_data)(void *self, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src);
     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, uint8_t num_dummy, size_t len, uint8_t *dest);
+    int (*direct_read)(void *self, uint32_t addr, size_t len, uint8_t *dest); // can be NULL if direct read not supported
 } mp_qspi_proto_t;
 
 typedef struct _mp_soft_qspi_obj_t {
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index 1ae0bbbc6792a..7cd1d18a3f941 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -197,6 +197,10 @@ void mp_spiflash_init(mp_spiflash_t *self) {
     } else {
         uint8_t num_dummy = MICROPY_HW_SPIFLASH_QREAD_NUM_DUMMY(self);
         self->config->bus.u_qspi.proto->ioctl(self->config->bus.u_qspi.data, MP_QSPI_IOCTL_INIT, num_dummy);
+        if (self->config->bus.u_qspi.proto->direct_read != NULL) {
+            // A bus with a custom read function should not have any further initialisation done.
+            return;
+        }
     }
 
     mp_spiflash_acquire_bus(self);
@@ -318,6 +322,10 @@ int mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *de
     if (len == 0) {
         return 0;
     }
+    const mp_spiflash_config_t *c = self->config;
+    if (c->bus_kind == MP_SPIFLASH_BUS_QSPI && c->bus.u_qspi.proto->direct_read != NULL) {
+        return c->bus.u_qspi.proto->direct_read(c->bus.u_qspi.data, addr, len, dest);
+    }
     mp_spiflash_acquire_bus(self);
     int ret = mp_spiflash_read_data(self, addr, len, dest);
     mp_spiflash_release_bus(self);

From d8f004b62fccae7e1b102d3ff5e055a1823d88d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 May 2025 17:05:03 +1000
Subject: [PATCH 2476/3129] lib/libm_dbl: Support FLT_EVAL_METHOD == 16.

That's almost the same as FLT_EVAL_METHOD == 0, but indicates the
presence of _Float16_t support.

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

diff --git a/lib/libm_dbl/rint.c b/lib/libm_dbl/rint.c
index fbba390e7d723..b85dec8f2465e 100644
--- a/lib/libm_dbl/rint.c
+++ b/lib/libm_dbl/rint.c
@@ -2,7 +2,7 @@
 #include <math.h>
 #include <stdint.h>
 
-#if FLT_EVAL_METHOD==0 || FLT_EVAL_METHOD==1
+#if FLT_EVAL_METHOD==0 || FLT_EVAL_METHOD==1 || FLT_EVAL_METHOD==16
 #define EPS DBL_EPSILON
 #elif FLT_EVAL_METHOD==2
 #define EPS LDBL_EPSILON

From 228abf8fc7404306db54e8be01bb3feed56c913e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 May 2025 14:27:58 +1000
Subject: [PATCH 2477/3129] lib/stm32lib: Update library for N6 v1.1.0.

Changes in this new library version are:
- Add N6 HAL at v1.1.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 928df866e4d28..8b2bb4ef44fbf 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 928df866e4d287ebc3c60726151513ebee609128
+Subproject commit 8b2bb4ef44fbfab5075ed9d09e83ddc3754b9257

From 24fd5f72682922664c0bcf70d6e3631a6d5b8d2b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jun 2024 16:24:32 +1000
Subject: [PATCH 2478/3129] stm32/boards/make-pins.py: Support up to GPIO-O.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/make-pins.py | 2 +-
 ports/stm32/pin_defs_stm32.h    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 1b89fd641542a..6f8a0a659d2eb 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -215,7 +215,7 @@ def print_source(self, out_source):
     def validate_cpu_pin_name(cpu_pin_name):
         boardgen.Pin.validate_cpu_pin_name(cpu_pin_name)
 
-        if not re.match("P[A-K][0-9]+(_C)?$", cpu_pin_name):
+        if not re.match("P[A-O][0-9]+(_C)?$", cpu_pin_name):
             raise boardgen.PinGeneratorError("Invalid cpu pin name '{}'".format(cpu_pin_name))
 
 
diff --git a/ports/stm32/pin_defs_stm32.h b/ports/stm32/pin_defs_stm32.h
index 6c67b6492422b..645ec5b2df519 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -39,6 +39,10 @@ enum {
     PORT_I,
     PORT_J,
     PORT_K,
+    PORT_L,
+    PORT_M,
+    PORT_N,
+    PORT_O,
 };
 
 // Must have matching entries in SUPPORTED_FN in boards/make-pins.py

From eb3ea9ee13093d81053f5d07b8c96e4fc0e1383d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 Jun 2024 17:46:21 +1000
Subject: [PATCH 2479/3129] stm32: Add support for STM32N6xx MCUs.

This commit adds preliminary support for ST's new STM32N6xx MCUs.

Supported features of this MCU so far are:
- basic clock tree initialisation, running at 800MHz
- fully working USB
- XSPI in memory-mapped mode
- machine.Pin
- machine.UART
- RTC and deepsleep support
- SD card
- filesystem
- ROMFS
- WiFi and BLE via cyw43-driver (SDIO backend)

Note that the N6 does not have internal flash, and has some tricky boot
sequence, so using a custom bootloader (mboot) is almost a necessity.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                          |  54 +-
 ports/stm32/adc.c                             |  56 +-
 ports/stm32/adc.h                             |   2 +-
 ports/stm32/boardctrl.h                       |   1 +
 ports/stm32/boards/common_n6_flash.ld         |  57 ++
 ports/stm32/boards/common_text.ld             |   8 +
 ports/stm32/boards/pllvalues.py               |   2 +-
 ports/stm32/dma.c                             |  83 ++-
 ports/stm32/dma.h                             |  13 +
 ports/stm32/extint.c                          |  39 +-
 ports/stm32/extint.h                          |   4 +-
 ports/stm32/flash.c                           |   4 +
 ports/stm32/i2cslave.h                        |  10 +
 ports/stm32/machine_adc.c                     |  36 +-
 ports/stm32/machine_uart.c                    |   2 +-
 ports/stm32/main.c                            |  47 +-
 ports/stm32/modmachine.c                      |  20 +-
 ports/stm32/mpconfigboard_common.h            |  31 +-
 ports/stm32/mpconfigport.h                    |   2 +-
 ports/stm32/mphalport.c                       |   2 +-
 ports/stm32/mpu.h                             |  20 +-
 ports/stm32/powerctrl.c                       |  80 ++-
 ports/stm32/powerctrl.h                       |   6 +
 ports/stm32/powerctrlboot.c                   | 126 +++-
 ports/stm32/resethandler_iram.s               |  82 +++
 ports/stm32/rtc.c                             |  55 +-
 ports/stm32/sdcard.c                          |   8 +-
 ports/stm32/sdio.c                            |  30 +-
 ports/stm32/spi.c                             |  32 +-
 ports/stm32/spibdev.c                         |  39 +-
 ports/stm32/stm32.mk                          |   8 +-
 ports/stm32/stm32_it.c                        |  27 +-
 ports/stm32/storage.c                         |  15 +-
 ports/stm32/storage.h                         |   4 +
 ports/stm32/timer.c                           |  32 +-
 ports/stm32/uart.c                            |  51 +-
 ports/stm32/usb.c                             |   2 +-
 ports/stm32/usbd_conf.c                       |  35 +-
 .../stm32/usbdev/class/inc/usbd_cdc_msc_hid.h |   6 +-
 ports/stm32/vfs_rom_ioctl.c                   |  21 +
 ports/stm32/xspi.c                            | 599 ++++++++++++++++++
 ports/stm32/xspi.h                            |  43 ++
 42 files changed, 1659 insertions(+), 135 deletions(-)
 create mode 100644 ports/stm32/boards/common_n6_flash.ld
 create mode 100644 ports/stm32/resethandler_iram.s
 create mode 100644 ports/stm32/xspi.c
 create mode 100644 ports/stm32/xspi.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index eabbd64a3b112..affd9d2f2f6b9 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -123,7 +123,15 @@ CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
 CFLAGS += -DMBOOT_VTOR=$(MBOOT_TEXT0_ADDR)
 CFLAGS += -DMICROPY_HW_VTOR=$(TEXT0_ADDR)
 
+ifeq ($(MCU_SERIES),n6)
+ifeq ($(USE_MBOOT),1)
+CFLAGS += -DMICROPY_HW_RUNS_FROM_EXT_FLASH=1
+endif
+# as doesn't recognise -mcpu=cortex-m55
+AFLAGS += -march=armv8.1-m.main
+else
 AFLAGS += $(filter -mcpu=%,$(CFLAGS_MCU_$(MCU_SERIES)))
+endif
 
 # Configure for nan-boxing object model if requested
 ifeq ($(NANBOX),1)
@@ -300,6 +308,7 @@ SRC_C += \
 	adc.c \
 	sdio.c \
 	subghz.c \
+	xspi.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
 SRC_O += \
@@ -316,6 +325,13 @@ CFLAGS += -DUSE_HAL_DRIVER
 SRC_O += \
 	resethandler_m3.o \
 	shared/runtime/gchelper_thumb2.o
+else ifeq ($(MCU_SERIES),n6)
+SRC_O += shared/runtime/gchelper_thumb2.o
+ifeq ($(USE_MBOOT),1)
+SRC_O += resethandler_iram.o
+else
+SRC_O += resethandler.o
+endif
 else
 SRC_O += \
 	system_stm32.o \
@@ -329,8 +345,6 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_adc_ex.c \
 	hal_cortex.c \
 	hal_dma.c \
-	hal_flash.c \
-	hal_flash_ex.c \
 	hal_gpio.c \
 	hal_i2c.c \
 	hal_pwr.c \
@@ -347,7 +361,14 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_utils.c \
 	)
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 l0 l1 l4 wb))
+ifneq ($(MCU_SERIES),n6)
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_flash.c \
+	hal_flash_ex.c \
+	)
+endif
+
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 l0 l1 l4 n6 wb))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_pcd.c \
 	hal_pcd_ex.c \
@@ -355,7 +376,15 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h5 h7 l4))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),n6))
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_bsec.c \
+	hal_rif.c \
+	hal_xspi.c \
+	)
+endif
+
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h5 h7 l4 n6))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_sd.c \
 	ll_sdmmc.c \
@@ -380,7 +409,7 @@ $(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno
 endif
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 n6))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_dma_ex.c \
 	)
@@ -496,6 +525,12 @@ all: $(TOP)/lib/stm32lib/README.md all_main $(BUILD)/firmware.hex
 
 ifeq ($(MBOOT_ENABLE_PACKING),1)
 all_main: $(BUILD)/firmware.pack.dfu
+else ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),n6))
+ifeq ($(USE_MBOOT),1)
+all_main: $(BUILD)/firmware.dfu
+else
+all_main: $(BUILD)/firmware-trusted.bin
+endif
 else
 all_main: $(BUILD)/firmware.dfu
 endif
@@ -556,7 +591,7 @@ define GENERATE_HEX
 	$(Q)$(OBJCOPY) -O ihex $(2) $(1)
 endef
 
-.PHONY: deploy deploy-stlink deploy-openocd
+.PHONY: deploy deploy-stlink deploy-openocd deploy-trusted
 
 ifeq ($(MBOOT_ENABLE_PACKING),1)
 deploy: $(BUILD)/firmware.pack.dfu
@@ -566,6 +601,9 @@ deploy: $(BUILD)/firmware.dfu
 	$(call RUN_DFU,$^)
 endif
 
+deploy-trusted: $(BUILD)/firmware-trusted.bin
+	$(STM32_CUBE_PROGRAMMER)/bin/STM32_Programmer.sh -c port=SWD mode=HOTPLUG ap=1 -el $(DKEL) -w $^ 0x70000000 -hardRst
+
 # 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.
@@ -620,6 +658,10 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 $(BUILD)/firmware.elf: $(OBJ)
 	$(call GENERATE_ELF,$@,$^)
 
+$(BUILD)/firmware-trusted.bin: $(BUILD)/firmware.bin
+	/bin/rm -f $@
+	$(STM32_CUBE_PROGRAMMER)/bin/STM32_SigningTool_CLI -bin $^ -nk -of 0x80000000 -t fsbl -o $@ -hv $(STM32_N6_HEADER_VERSION)
+
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(GEN_PINS_SRC)
 
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 28e254ace2372..f47e9eaad7b35 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -51,7 +51,7 @@
 ///     val = adc.read_core_vref()      # read MCU VREF
 
 /* ADC definitions */
-#if defined(STM32H5)
+#if defined(STM32H5) || defined(STM32N6)
 // STM32H5 features two ADC instances, ADCx and pin_adc_table are set dynamically
 #define PIN_ADC_MASK            (PIN_ADC1 | PIN_ADC2)
 #else
@@ -107,7 +107,7 @@
 #define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 4))
 #define ADC_CAL_BITS            (12)
 
-#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
 
 #define ADC_SCALE_V             (((float)VREFINT_CAL_VREF) / 1000.0f)
 #define ADC_CAL_ADDRESS         (VREFINT_CAL_ADDR)
@@ -166,6 +166,9 @@
 #define VBAT_DIV (3)
 #elif defined(STM32L152xE)
 // STM32L152xE does not have vbat.
+#elif defined(STM32N6)
+// ADC2 VINP 16
+#define VBAT_DIV (4)
 #else
 #error Unsupported processor
 #endif
@@ -247,7 +250,7 @@ static bool is_adcx_channel(int channel) {
     handle.Instance = ADCx;
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
            || IS_ADC_CHANNEL(&handle, __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
-    #elif defined(STM32H5)
+    #elif defined(STM32H5) || defined(STM32N6)
     // The first argument to the IS_ADC_CHANNEL macro is unused.
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
            || IS_ADC_CHANNEL(NULL, __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
@@ -260,7 +263,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) || defined(STM32L1)
     while ((adcHandle->Instance->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
     while (READ_BIT(adcHandle->Instance->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #else
     #error Unsupported processor
@@ -279,7 +282,7 @@ static void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_CLKP);
     #elif defined(STM32G0)
     __HAL_RCC_ADC_CLK_ENABLE();
-    #elif defined(STM32G4)
+    #elif defined(STM32G4) || defined(STM32N6)
     __HAL_RCC_ADC12_CLK_ENABLE();
     #elif defined(STM32H5)
     __HAL_RCC_ADC_CLK_ENABLE();
@@ -352,6 +355,15 @@ static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.OversamplingMode = DISABLE;
     adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
     adch->Init.DMAContinuousRequests = DISABLE;
+    #elif defined(STM32N6)
+    adch->Init.GainCompensation = 0;
+    adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
+    adch->Init.LowPowerAutoWait = DISABLE;
+    adch->Init.SamplingMode = ADC_SAMPLING_MODE_NORMAL;
+    adch->Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
+    adch->Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+    adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
+    adch->Init.OversamplingMode = DISABLE;
     #else
     #error Unsupported processor
     #endif
@@ -384,7 +396,7 @@ static void adc_init_single(pyb_obj_adc_t *adc_obj, ADC_TypeDef *adc) {
 static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
     ADC_ChannelConfTypeDef sConfig;
 
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
     sConfig.Rank = ADC_REGULAR_RANK_1;
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel) == 0) {
         channel = __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel);
@@ -433,6 +445,18 @@ static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     sConfig.SingleDiff = ADC_SINGLE_ENDED;
     sConfig.OffsetNumber = ADC_OFFSET_NONE;
     sConfig.Offset = 0;
+    #elif defined(STM32N6)
+    if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
+        sConfig.SamplingTime = ADC_SAMPLETIME_246CYCLES_5;
+    } else {
+        sConfig.SamplingTime = ADC_SAMPLETIME_11CYCLES_5;
+    }
+    sConfig.SingleDiff = ADC_SINGLE_ENDED;
+    sConfig.OffsetNumber = ADC_OFFSET_NONE;
+    sConfig.Offset = 0;
+    sConfig.OffsetSignedSaturation = DISABLE;
+    sConfig.OffsetSaturation = DISABLE;
+    sConfig.OffsetSign = ADC_OFFSET_SIGN_POSITIVE;
     #else
     #error Unsupported processor
     #endif
@@ -510,7 +534,7 @@ static mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     // 1st argument is the pin name
     mp_obj_t pin_obj = args[0];
 
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     // STM32H5 has two ADC instances where some pins are only available on ADC1 or ADC2 (but not both).
     // Assume we're using a channel of ADC1. Can be overridden for ADC2 later in this function.
     ADC_TypeDef *adc = ADC1;
@@ -527,7 +551,7 @@ static mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
             // 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);
         }
-        #if defined(STM32H5)
+        #if defined(STM32H5) || defined(STM32N6)
         if ((pin->adc_num & PIN_ADC2) == PIN_ADC2) {
             adc = ADC2;
             pin_adc_table = pin_adc2;
@@ -542,7 +566,7 @@ static mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     }
 
     // If this channel corresponds to a pin then configure the pin in ADC mode.
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     if (channel < num_adc_pins) {
         const machine_pin_obj_t *pin = pin_adc_table[channel];
         if (pin != NULL) {
@@ -563,7 +587,7 @@ static mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     o->base.type = &pyb_adc_type;
     o->pin_name = pin_obj;
     o->channel = channel;
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     adc_init_single(o, adc);
     #else
     adc_init_single(o, ADCx);
@@ -654,7 +678,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) || defined(STM32L1)
             self->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
             SET_BIT(self->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -764,7 +788,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) || defined(STM32L1)
             adc->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
             SET_BIT(adc->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -898,6 +922,8 @@ int adc_read_core_temp(ADC_HandleTypeDef *adcHandle) {
     } else {
         return 0;
     }
+    #elif defined(STM32N6)
+    int32_t raw_value = 0; // TODO
     #else
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
     #endif
@@ -909,6 +935,10 @@ 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(STM32N6)
+    return 0.0f; // TODO
+    #else
+
     #if defined(STM32G4) || defined(STM32L1) || defined(STM32L4)
     // Update the reference correction factor before reading tempsensor
     // because TS_CAL1 and TS_CAL2 of STM32G4,L1/L4 are at VDDA=3.0V
@@ -931,6 +961,8 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 80.0f;
     #endif
     return (((float)raw_value * adc_refcor - *ADC_CAL1) / core_temp_avg_slope) + 30.0f;
+
+    #endif
 }
 
 float adc_read_core_vbat(ADC_HandleTypeDef *adcHandle) {
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 0518cdcd9a59f..0adc9ac2be648 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -48,7 +48,7 @@ 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) || defined(STM32H5)
+        #elif defined(STM32G4) || defined(STM32H5) || defined(STM32N6)
         adc_common = ADC12_COMMON;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         adc_common = ADC12_COMMON;
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 1a03925ef46da..cb5380c298e29 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -122,5 +122,6 @@ 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);
+void boardctrl_enter_standby(void);
 
 #endif // MICROPY_INCLUDED_STM32_BOARDCTRL_H
diff --git a/ports/stm32/boards/common_n6_flash.ld b/ports/stm32/boards/common_n6_flash.ld
new file mode 100644
index 0000000000000..a1f1fa531f45e
--- /dev/null
+++ b/ports/stm32/boards/common_n6_flash.ld
@@ -0,0 +1,57 @@
+/* Memory layout for N6 when the application runs from external flash in XIP mode.
+
+    FLASH_APP   .isr_vector
+    FLASH_APP   .text
+    FLASH_APP   .data
+
+    RAM         .data
+    RAM         .bss
+    RAM         .heap
+    RAM         .stack
+*/
+
+ENTRY(Reset_Handler)
+
+REGION_ALIAS("FLASH_COMMON", FLASH_APP);
+
+/* define output sections */
+SECTIONS
+{
+    .isr_vector :
+    {
+        _siram = .;
+
+        /* This ISR is used for normal application mode. */
+        . = ALIGN(1024);
+        KEEP(*(.isr_vector));
+
+        /* This ISR is used when waking from STANDBY. */
+        . = ALIGN(1024);
+        KEEP(*(.rodata.iram_bootloader_isr_vector));
+
+        /* Need to place in RAM all the code necessary to write to
+         * flash, and to resume from STANDBY. */
+        *(.*.iram_bootloader_reset);
+        *(.*.memcpy);
+        *(.*.mp_hal_gpio_clock_enable);
+        *(.*.mp_hal_pin_config);
+        *(.*.mp_hal_pin_config_speed);
+        *drivers/memory/spiflash.o(.text.* .rodata.*)
+        *xspi.o(.text.* .rodata.*);
+        *boards*(.rodata.spiflash_config*)
+        *boards*(.*.board_leave_standby);
+        *(*.rodata.pin_N*_obj);
+        *(.text.LL_AHB4_GRP1_EnableClock);
+        *(.text.LL_APB4_GRP2_EnableClock);
+
+        . = ALIGN(4);
+        _eiram = .;
+    } >IRAM AT> FLASH_COMMON
+
+    INCLUDE common_text.ld
+    INCLUDE common_extratext_data_in_flash.ld
+    INCLUDE common_bss_heap_stack.ld
+}
+
+/* Used by the start-up code to initialise data */
+_siiram = LOADADDR(.isr_vector);
diff --git a/ports/stm32/boards/common_text.ld b/ports/stm32/boards/common_text.ld
index 16eea43bae2c1..d95467babc719 100644
--- a/ports/stm32/boards/common_text.ld
+++ b/ports/stm32/boards/common_text.ld
@@ -12,3 +12,11 @@
     . = ALIGN(4);
     _etext = .;        /* define a global symbol at end of code */
 } >FLASH_COMMON
+
+/* Secure Gateway stubs */
+.gnu.sgstubs :
+{
+    . = ALIGN(4);
+    *(.gnu.sgstubs*)
+    . = ALIGN(4);
+} >FLASH_COMMON
diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index d8856bfecdbd4..ae042d999cec8 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -293,7 +293,7 @@ def main():
             break
 
     # Relax constraint on PLLQ being 48MHz on MCUs which have separate PLLs for 48MHz
-    relax_pll48 = mcu_series.startswith(("stm32f413", "stm32f7", "stm32h5", "stm32h7"))
+    relax_pll48 = mcu_series.startswith(("stm32f413", "stm32f7", "stm32h5", "stm32h7", "stm32n6"))
 
     hse_valid_plls = compute_pll_table(hse, relax_pll48)
     if hsi is not None:
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 53c53868cd1fc..c252770740d01 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -81,7 +81,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(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -93,7 +93,7 @@ struct _dma_descr_t {
 
 // Default parameters to dma_init() shared by spi and i2c; Channel and Direction
 // vary depending on the peripheral instance so they get passed separately
-#if defined(STM32H5)
+#if defined(STM32H5) || defined(STM32N6)
 static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     .Request = 0, // set by dma_init_handle
     .BlkHWRequest = DMA_BREQ_SINGLE_BURST,
@@ -157,7 +157,7 @@ static const DMA_InitTypeDef dma_init_struct_i2s = {
 };
 #endif
 
-#if ENABLE_SDIO && !defined(STM32H5) && !defined(STM32H7)
+#if ENABLE_SDIO && !defined(STM32H5) && !defined(STM32H7) && !defined(STM32N6)
 // Parameters to dma_init() for SDIO tx and rx.
 static const DMA_InitTypeDef dma_init_struct_sdio = {
     #if defined(STM32F4) || defined(STM32F7)
@@ -830,6 +830,46 @@ static const uint8_t dma_irqn[NSTREAM] = {
     DMA2_Stream7_IRQn,
 };
 
+#elif defined(STM32N6)
+
+#define NCONTROLLERS            (1)
+#define NSTREAMS_PER_CONTROLLER (16)
+#define NSTREAM                 (NCONTROLLERS * NSTREAMS_PER_CONTROLLER)
+
+#define DMA_SUB_INSTANCE_AS_UINT8(dma_channel) (dma_channel)
+
+#define DMA1_ENABLE_MASK (0xffff) // Bits in dma_enable_mask corresponding to GPDMA1
+
+const dma_descr_t dma_SPI_1_RX = { GPDMA1_Channel0, GPDMA1_REQUEST_SPI1_RX, dma_id_0, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_1_TX = { GPDMA1_Channel1, GPDMA1_REQUEST_SPI1_TX, dma_id_1, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_RX = { GPDMA1_Channel2, GPDMA1_REQUEST_SPI2_RX, dma_id_2, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_TX = { GPDMA1_Channel3, GPDMA1_REQUEST_SPI2_TX, dma_id_3, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_3_RX = { GPDMA1_Channel4, GPDMA1_REQUEST_SPI3_RX, dma_id_4, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_3_TX = { GPDMA1_Channel5, GPDMA1_REQUEST_SPI3_TX, dma_id_5, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_4_RX = { GPDMA1_Channel6, GPDMA1_REQUEST_SPI4_RX, dma_id_6, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_4_TX = { GPDMA1_Channel7, GPDMA1_REQUEST_SPI4_TX, dma_id_7, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_5_RX = { GPDMA1_Channel8, GPDMA1_REQUEST_SPI5_RX, dma_id_8, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_5_TX = { GPDMA1_Channel9, GPDMA1_REQUEST_SPI5_TX, dma_id_9, &dma_init_struct_spi_i2c };
+
+static const uint8_t dma_irqn[NSTREAM] = {
+    GPDMA1_Channel0_IRQn,
+    GPDMA1_Channel1_IRQn,
+    GPDMA1_Channel2_IRQn,
+    GPDMA1_Channel3_IRQn,
+    GPDMA1_Channel4_IRQn,
+    GPDMA1_Channel5_IRQn,
+    GPDMA1_Channel6_IRQn,
+    GPDMA1_Channel7_IRQn,
+    GPDMA1_Channel8_IRQn,
+    GPDMA1_Channel9_IRQn,
+    GPDMA1_Channel10_IRQn,
+    GPDMA1_Channel11_IRQn,
+    GPDMA1_Channel12_IRQn,
+    GPDMA1_Channel13_IRQn,
+    GPDMA1_Channel14_IRQn,
+    GPDMA1_Channel15_IRQn,
+};
+
 #endif
 
 static DMA_HandleTypeDef *dma_handle[NSTREAM] = {NULL};
@@ -853,6 +893,10 @@ volatile dma_idle_count_t dma_idle;
 #define __HAL_RCC_DMA2_CLK_ENABLE __HAL_RCC_GPDMA2_CLK_ENABLE
 #define __HAL_RCC_DMA1_CLK_DISABLE __HAL_RCC_GPDMA1_CLK_DISABLE
 #define __HAL_RCC_DMA2_CLK_DISABLE __HAL_RCC_GPDMA2_CLK_DISABLE
+#elif defined(STM32N6)
+#define DMA1_IS_CLK_ENABLED()   (__HAL_RCC_GPDMA1_IS_CLK_ENABLED())
+#define __HAL_RCC_DMA1_CLK_ENABLE __HAL_RCC_GPDMA1_CLK_ENABLE
+#define __HAL_RCC_DMA1_CLK_DISABLE __HAL_RCC_GPDMA1_CLK_DISABLE
 #else
 #define DMA1_IS_CLK_ENABLED()   ((RCC->AHB1ENR & RCC_AHB1ENR_DMA1EN) != 0)
 #define DMA2_IS_CLK_ENABLED()   ((RCC->AHB1ENR & RCC_AHB1ENR_DMA2EN) != 0)
@@ -1185,10 +1229,11 @@ void DMA2_Channel8_IRQHandler(void) {
 }
 #endif
 
-#elif defined(STM32H5)
+#elif defined(STM32H5) || defined(STM32N6)
 
 #define DEFINE_IRQ_HANDLER(periph, channel, id) \
     void GPDMA##periph##_Channel##channel##_IRQHandler(void) { \
+        MP_STATIC_ASSERT(GPDMA##periph##_Channel##channel##_IRQn > 0); \
         IRQ_ENTER(GPDMA##periph##_Channel##channel##_IRQn); \
         if (dma_handle[id] != NULL) { \
             HAL_DMA_IRQHandler(dma_handle[id]); \
@@ -1204,6 +1249,7 @@ DEFINE_IRQ_HANDLER(1, 4, dma_id_4)
 DEFINE_IRQ_HANDLER(1, 5, dma_id_5)
 DEFINE_IRQ_HANDLER(1, 6, dma_id_6)
 DEFINE_IRQ_HANDLER(1, 7, dma_id_7)
+#if defined(STM32H5)
 DEFINE_IRQ_HANDLER(2, 0, dma_id_8)
 DEFINE_IRQ_HANDLER(2, 1, dma_id_9)
 DEFINE_IRQ_HANDLER(2, 2, dma_id_10)
@@ -1212,6 +1258,16 @@ DEFINE_IRQ_HANDLER(2, 4, dma_id_12)
 DEFINE_IRQ_HANDLER(2, 5, dma_id_13)
 DEFINE_IRQ_HANDLER(2, 6, dma_id_14)
 DEFINE_IRQ_HANDLER(2, 7, dma_id_15)
+#else
+DEFINE_IRQ_HANDLER(1, 8, dma_id_8)
+DEFINE_IRQ_HANDLER(1, 9, dma_id_9)
+DEFINE_IRQ_HANDLER(1, 10, dma_id_10)
+DEFINE_IRQ_HANDLER(1, 11, dma_id_11)
+DEFINE_IRQ_HANDLER(1, 12, dma_id_12)
+DEFINE_IRQ_HANDLER(1, 13, dma_id_13)
+DEFINE_IRQ_HANDLER(1, 14, dma_id_14)
+DEFINE_IRQ_HANDLER(1, 15, dma_id_15)
+#endif
 
 #elif defined(STM32L0)
 
@@ -1424,7 +1480,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
     dma->Init.Request = dma_descr->sub_instance;
     #else
     #if !defined(STM32F0) && !defined(STM32L1)
@@ -1432,7 +1488,7 @@ void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint3
     #endif
     #endif
 
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     // Configure src/dest settings based on the DMA direction.
     if (dir == DMA_MEMORY_TO_PERIPH) {
         dma->Init.SrcInc = DMA_SINC_INCREMENTED;
@@ -1463,13 +1519,24 @@ 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(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || 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);
         dma->Parent = data; // HAL_DMA_DeInit may clear Parent, so set it again
         HAL_DMA_Init(dma);
+
+        #if defined(STM32N6)
+        // Configure security attributes.
+        HAL_DMA_ConfigChannelAttributes(dma, DMA_CHANNEL_PRIV | DMA_CHANNEL_SEC | DMA_CHANNEL_SRC_SEC | DMA_CHANNEL_DEST_SEC);
+        // Configure data handling.
+        DMA_DataHandlingConfTypeDef config;
+        config.DataExchange = DMA_EXCHANGE_NONE;
+        config.DataAlignment = DMA_DATA_RIGHTALIGN_ZEROPADDED;
+        HAL_DMAEx_ConfigDataHandling(dma, &config);
+        #endif
+
         NVIC_SetPriority(IRQn_NONNEG(dma_irqn[dma_id]), IRQ_PRI_DMA);
         #else
         // if this stream was previously configured for this channel/request and direction then we
@@ -1740,7 +1807,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(STM32G0) || defined(STM32WB) || defined(STM32WL)
+#elif defined(STM32G0) || defined(STM32N6) || 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 7ba04baf520ba..f05b22b5d05cd 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -147,6 +147,19 @@ extern const dma_descr_t dma_I2C_4_RX;
 extern const dma_descr_t dma_SPI_SUBGHZ_TX;
 extern const dma_descr_t dma_SPI_SUBGHZ_RX;
 
+#elif defined(STM32N6)
+
+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_SPI_3_RX;
+extern const dma_descr_t dma_SPI_3_TX;
+extern const dma_descr_t dma_SPI_4_RX;
+extern const dma_descr_t dma_SPI_4_TX;
+extern const dma_descr_t dma_SPI_5_RX;
+extern const dma_descr_t dma_SPI_5_TX;
+
 #endif
 
 // API that configures the DMA via the HAL.
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 5b5658809bc84..9c3c24325368c 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -92,7 +92,7 @@
 #define EXTI_SWIER_BB(line) (*(__IO uint32_t *)(PERIPH_BB_BASE + ((EXTI_OFFSET + offsetof(EXTI_TypeDef, SWIER)) * 32) + ((line) * 4)))
 #endif
 
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || 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.
@@ -170,7 +170,7 @@ static const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     ADC1_COMP_IRQn,
     #endif
 
-    #elif defined(STM32H5)
+    #elif defined(STM32N6) || defined(STM32H5)
 
     EXTI0_IRQn,
     EXTI1_IRQn,
@@ -189,6 +189,13 @@ static const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     EXTI14_IRQn,
     EXTI15_IRQn,
 
+    #if defined(STM32N6)
+    0,
+    RTC_S_IRQn,
+    RTC_IRQn,
+    TAMP_IRQn,
+    #endif
+
     #else
 
     EXTI0_IRQn,     EXTI1_IRQn,     EXTI2_IRQn,     EXTI3_IRQn,     EXTI4_IRQn,
@@ -307,7 +314,7 @@ void EXTI15_10_IRQHandler(void) {
     IRQ_EXIT(EXTI15_10_IRQn);
 }
 
-#elif defined(STM32H5)
+#elif defined(STM32H5) || defined(STM32N6)
 
 DEFINE_EXTI_IRQ_HANDLER(0)
 DEFINE_EXTI_IRQ_HANDLER(1)
@@ -440,10 +447,10 @@ void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_
         #if !defined(STM32H5) && !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
-        #if defined(STM32G0) || defined(STM32H5)
+        #if defined(STM32G0) || defined(STM32H5) || defined(STM32N6)
         EXTI->EXTICR[line >> 2] =
-            (EXTI->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
-            | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
+            (EXTI->EXTICR[line >> 2] & ~(0xff << (8 * (line & 0x03))))
+            | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (8 * (line & 0x03)));
         #else
         SYSCFG->EXTICR[line >> 2] =
             (SYSCFG->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
@@ -480,13 +487,13 @@ void extint_set(const machine_pin_obj_t *pin, uint32_t mode) {
         pyb_extint_callback_arg[line] = MP_OBJ_FROM_PTR(pin);
 
         // Route the GPIO to EXTI
-        #if !defined(STM32H5) && !defined(STM32WB) && !defined(STM32WL)
+        #if !defined(STM32H5) && !defined(STM32N6) && !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
-        #if defined(STM32G0) || defined(STM32H5)
+        #if defined(STM32G0) || defined(STM32H5) || defined(STM32N6)
         EXTI->EXTICR[line >> 2] =
-            (EXTI->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
-            | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
+            (EXTI->EXTICR[line >> 2] & ~(0xff << (8 * (line & 0x03))))
+            | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (8 * (line & 0x03)));
         #else
         SYSCFG->EXTICR[line >> 2] =
             (SYSCFG->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
@@ -526,7 +533,7 @@ void extint_enable(uint line) {
     if (pyb_extint_mode[line] == EXTI_Mode_Interrupt) {
         #if defined(STM32H7)
         EXTI_D1->IMR1 |= (1 << line);
-        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= (1 << line);
         #else
         EXTI->IMR |= (1 << line);
@@ -534,7 +541,7 @@ void extint_enable(uint line) {
     } else {
         #if defined(STM32H7)
         EXTI_D1->EMR1 |= (1 << line);
-        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
         EXTI->EMR1 |= (1 << line);
         #else
         EXTI->EMR |= (1 << line);
@@ -560,7 +567,7 @@ void extint_disable(uint line) {
     #if defined(STM32H7)
     EXTI_D1->IMR1 &= ~(1 << line);
     EXTI_D1->EMR1 &= ~(1 << line);
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
     EXTI->IMR1 &= ~(1 << line);
     EXTI->EMR1 &= ~(1 << line);
     #else
@@ -582,7 +589,7 @@ void extint_swint(uint line) {
         return;
     }
     // we need 0 to 1 transition to trigger the interrupt
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
     EXTI->SWIER1 &= ~(1 << line);
     EXTI->SWIER1 |= (1 << line);
     #else
@@ -662,7 +669,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
 static mp_obj_t extint_regs(void) {
     const mp_print_t *print = &mp_plat_print;
 
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
     mp_printf(print, "EXTI_IMR1   %08x\n", (unsigned int)EXTI->IMR1);
     mp_printf(print, "EXTI_IMR2   %08x\n", (unsigned int)EXTI->IMR2);
     mp_printf(print, "EXTI_EMR1   %08x\n", (unsigned int)EXTI->EMR1);
@@ -673,7 +680,7 @@ static mp_obj_t extint_regs(void) {
     mp_printf(print, "EXTI_FTSR2  %08x\n", (unsigned int)EXTI->FTSR2);
     mp_printf(print, "EXTI_SWIER1 %08x\n", (unsigned int)EXTI->SWIER1);
     mp_printf(print, "EXTI_SWIER2 %08x\n", (unsigned int)EXTI->SWIER2);
-    #if defined(STM32G0) || defined(STM32H5)
+    #if defined(STM32G0) || defined(STM32N6) || defined(STM32H5)
     mp_printf(print, "EXTI_RPR1    %08x\n", (unsigned int)EXTI->RPR1);
     mp_printf(print, "EXTI_FPR1    %08x\n", (unsigned int)EXTI->FPR1);
     mp_printf(print, "EXTI_RPR2    %08x\n", (unsigned int)EXTI->RPR2);
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index d5abb04d654e4..801dcf62b54bd 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -46,7 +46,7 @@
 #if defined(STM32F0) || defined(STM32G4) || defined(STM32L1) || defined(STM32L4) || defined(STM32WL)
 #define EXTI_RTC_TIMESTAMP      (19)
 #define EXTI_RTC_WAKEUP         (20)
-#elif defined(STM32H5)
+#elif defined(STM32H5) || defined(STM32N6)
 #define EXTI_RTC_WAKEUP         (17)
 #define EXTI_RTC_TAMP           (19)
 #elif defined(STM32H7) || defined(STM32WB)
@@ -55,8 +55,6 @@
 #elif defined(STM32G0)
 #define EXTI_RTC_WAKEUP         (19)
 #define EXTI_RTC_TIMESTAMP      (21)
-#elif defined(STM32H5)
-#define EXTI_RTC_WAKEUP         (17)
 #else
 #define EXTI_RTC_TIMESTAMP      (21)
 #define EXTI_RTC_WAKEUP         (22)
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 7668b53a43b58..85bcee5a97c91 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -30,6 +30,8 @@
 #include "py/mphal.h"
 #include "flash.h"
 
+#if !defined(STM32N6)
+
 #if defined(STM32F0)
 
 #define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR)
@@ -509,3 +511,5 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
 
     return mp_hal_status_to_neg_errno(status);
 }
+
+#endif
diff --git a/ports/stm32/i2cslave.h b/ports/stm32/i2cslave.h
index a4b2957de3347..cc4e7f9be92e3 100644
--- a/ports/stm32/i2cslave.h
+++ b/ports/stm32/i2cslave.h
@@ -51,6 +51,16 @@ 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(STM32N6)
+    if (i2c_idx == 3) {
+        RCC->APB4ENR1 |= RCC_APB4ENR1_I2C4EN;
+        volatile uint32_t tmp = RCC->APB4ENR1; // Delay after enabling clock
+        (void)tmp;
+    } else {
+        RCC->APB1ENR1 |= 1 << (RCC_APB1ENR1_I2C1EN_Pos + i2c_idx);
+        volatile uint32_t tmp = RCC->APB1ENR1; // 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
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 77d6248d02fda..63cd4e089dd8b 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -30,7 +30,7 @@
 #include "py/mphal.h"
 #include "adc.h"
 
-#if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
 #define ADC_V2 (1)
 #else
 #define ADC_V2 (0)
@@ -85,6 +85,9 @@
 #elif defined(STM32L4) || defined(STM32WB)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_247CYCLES_5
+#elif defined(STM32N6)
+#define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_11CYCLES_5
+#define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_246CYCLES_5
 #endif
 
 // Timeout for waiting for end-of-conversion
@@ -127,6 +130,8 @@ static uint32_t adc_ll_channel(uint32_t channel_id) {
         case MACHINE_ADC_INT_CH_TEMPSENSOR:
             #if defined(STM32G4)
             adc_ll_ch = ADC_CHANNEL_TEMPSENSOR_ADC1;
+            #elif defined(STM32N6)
+            adc_ll_ch = ADC_CHANNEL_0; // TODO
             #else
             adc_ll_ch = ADC_CHANNEL_TEMPSENSOR;
             #endif
@@ -183,7 +188,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     if (adc == ADC1) {
         #if defined(STM32H5)
         __HAL_RCC_ADC_CLK_ENABLE();
-        #elif defined(STM32G4) || defined(STM32H7)
+        #elif defined(STM32G4) || defined(STM32H7) || defined(STM32N6)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC1_CLK_ENABLE();
@@ -193,7 +198,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     if (adc == ADC2) {
         #if defined(STM32H5)
         __HAL_RCC_ADC_CLK_ENABLE();
-        #elif defined(STM32G4) || defined(STM32H7)
+        #elif defined(STM32G4) || defined(STM32H7) || defined(STM32N6)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC2_CLK_ENABLE();
@@ -233,7 +238,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     ADC_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos; // PRESC=1
     #endif
 
-    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
     if (adc->CR & ADC_CR_DEEPPWD) {
         adc->CR = 0; // disable deep powerdown
     }
@@ -257,6 +262,11 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
         LL_ADC_StartCalibration(adc);
         #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
         LL_ADC_StartCalibration(adc, LL_ADC_SINGLE_ENDED);
+        #elif defined(STM32N6)
+        ADC_HandleTypeDef hadc;
+        hadc.Instance = adc;
+        hadc.State = 0;
+        HAL_ADCEx_Calibration_Start(&hadc, ADC_SINGLE_ENDED);
         #else
         LL_ADC_StartCalibration(adc, LL_ADC_CALIB_OFFSET_LINEARITY, LL_ADC_SINGLE_ENDED);
         #endif
@@ -312,11 +322,17 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     uint32_t cfgr = res << ADC_CFGR_RES_Pos;
     adc->CFGR = (adc->CFGR & ~cfgr_clr) | cfgr;
 
+    #elif defined(STM32N6)
+
+    uint32_t cfgr1_clr = ADC_CFGR1_CONT | ADC_CFGR1_EXTEN;
+    uint32_t cfgr1 = res << ADC_CFGR1_RES_Pos;
+    adc->CFGR1 = (adc->CFGR1 & ~cfgr1_clr) | cfgr1;
+
     #endif
 }
 
 static int adc_get_bits(ADC_TypeDef *adc) {
-    #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32N6) || defined(STM32WL)
     uint32_t res = (adc->CFGR1 & ADC_CFGR1_RES) >> ADC_CFGR1_RES_Pos;
     #elif defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
     uint32_t res = (adc->CR1 & ADC_CR1_RES) >> ADC_CR1_RES_Pos;
@@ -412,9 +428,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(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
 
-    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ) || defined(STM32N6)
     ADC_Common_TypeDef *adc_common = ADC12_COMMON;
     #elif defined(STM32H7)
     #if defined(ADC_VER_V5_V90)
@@ -432,6 +448,7 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     #endif
     if (channel == ADC_CHANNEL_VREFINT) {
         adc_common->CCR |= ADC_CCR_VREFEN;
+        #if !defined(STM32N6)
     #if defined(STM32G4)
     } else if (channel == ADC_CHANNEL_TEMPSENSOR_ADC1) {
         adc_common->CCR |= ADC_CCR_VSENSESEL;
@@ -440,18 +457,19 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
         adc_common->CCR |= ADC_CCR_TSEN;
     #endif
         adc_stabilisation_delay_us(ADC_TEMPSENSOR_DELAY_US);
+        #endif
     } else if (channel == ADC_CHANNEL_VBAT) {
         #if defined(STM32G4)
         adc_common->CCR |= ADC_CCR_VBATSEL;
         #else
         adc_common->CCR |= ADC_CCR_VBATEN;
         #endif
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     } else if (channel == ADC_CHANNEL_VDDCORE) {
         adc->OR |= ADC_OR_OP0; // Enable Vddcore channel on ADC2
     #endif
     }
-    #if defined(STM32G4) || defined(STM32H5) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB)
     // MCU uses encoded literals for internal channels -> extract ADC channel for following code
     if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 8444b2998971e..8f1faea4b69ec 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -399,7 +399,7 @@ static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
 
 // Send a break condition.
 static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
-    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || 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/main.c b/ports/stm32/main.c
index 5e114f562f241..aea1953fd65fa 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -306,11 +306,30 @@ static bool init_sdcard_fs(void) {
 }
 #endif
 
+#if defined(STM32N6)
+static void risaf_init(void) {
+    RIMC_MasterConfig_t rimc_master = {0};
+
+    __HAL_RCC_RIFSC_CLK_ENABLE();
+    LL_AHB3_GRP1_EnableClockLowPower(LL_AHB3_GRP1_PERIPH_RIFSC | LL_AHB3_GRP1_PERIPH_RISAF);
+
+    rimc_master.MasterCID = RIF_CID_1;
+    rimc_master.SecPriv = RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV;
+
+    HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_SDMMC1, &rimc_master);
+    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_SDMMC1, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
+    HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_SDMMC2, &rimc_master);
+    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_SDMMC2, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
+}
+#endif
+
 void stm32_main(uint32_t reset_mode) {
     // Low-level MCU initialisation.
     stm32_system_init();
 
-    #if !defined(STM32F0)
+    // Set VTOR, the location of the interrupt vector table.
+    // On N6, SystemInit does this, setting VTOR to &g_pfnVectors.
+    #if !defined(STM32F0) && !defined(STM32N6)
     #if MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM
     // Copy IRQ vector table to RAM and point VTOR there
     extern uint32_t __isr_vector_flash_addr, __isr_vector_ram_start, __isr_vector_ram_end;
@@ -325,8 +344,7 @@ void stm32_main(uint32_t reset_mode) {
     #endif
     #endif
 
-
-    #if __CORTEX_M != 33
+    #if __CORTEX_M != 33 && __CORTEX_M != 55
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
     #endif
@@ -349,7 +367,7 @@ void stm32_main(uint32_t reset_mode) {
     __HAL_FLASH_PREFETCH_BUFFER_ENABLE();
     #endif
 
-    #elif defined(STM32F7) || defined(STM32H7)
+    #elif defined(STM32F7) || defined(STM32H7) || defined(STM32N6)
 
     #if ART_ACCLERATOR_ENABLE
     __HAL_FLASH_ART_ENABLE();
@@ -376,6 +394,23 @@ void stm32_main(uint32_t reset_mode) {
 
     #endif
 
+    #if defined(STM32N6)
+    // SRAM, XSPI needs to remain awake during sleep, eg so DMA from flash works.
+    LL_MEM_EnableClockLowPower(0xffffffff);
+    LL_AHB5_GRP1_EnableClockLowPower(LL_AHB5_GRP1_PERIPH_XSPI2 | LL_AHB5_GRP1_PERIPH_XSPIM);
+    LL_APB4_GRP1_EnableClock(LL_APB4_GRP1_PERIPH_RTC | LL_APB4_GRP1_PERIPH_RTCAPB);
+    LL_APB4_GRP1_EnableClockLowPower(LL_APB4_GRP1_PERIPH_RTC | LL_APB4_GRP1_PERIPH_RTCAPB);
+
+    // Enable some AHB peripherals during sleep.
+    LL_AHB1_GRP1_EnableClockLowPower(0xffffffff); // GPDMA1, ADC12
+    LL_AHB4_GRP1_EnableClockLowPower(0xffffffff); // GPIOA-Q, PWR, CRC
+
+    // Enable some APB peripherals during sleep.
+    LL_APB1_GRP1_EnableClockLowPower(0xffffffff); // I2C, I3C, LPTIM, SPI, TIM, UART, WWDG
+    LL_APB2_GRP1_EnableClockLowPower(0xffffffff); // SAI, SPI, TIM, UART
+    LL_APB4_GRP1_EnableClockLowPower(0xffffffff); // I2C, LPTIM, LPUART, RTC, SPI
+    #endif
+
     mpu_init();
 
     #if __CORTEX_M >= 0x03
@@ -389,6 +424,10 @@ void stm32_main(uint32_t reset_mode) {
     // set the system clock to be HSE
     SystemClock_Config();
 
+    #if defined(STM32N6)
+    risaf_init();
+    #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,
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index f3bdf1bc50278..8123cd8011521 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -54,7 +54,7 @@
 #define RCC_CSR_PORRSTF RCC_CSR_PWRRSTF
 #endif
 
-#if defined(STM32H5)
+#if defined(STM32H5) || defined(STM32N6)
 #define RCC_SR          RSR
 #define RCC_SR_IWDGRSTF RCC_RSR_IWDGRSTF
 #define RCC_SR_WWDGRSTF RCC_RSR_WWDGRSTF
@@ -135,7 +135,7 @@ void machine_init(void) {
         reset_cause = PYB_RESET_DEEPSLEEP;
         PWR->PMCR |= PWR_PMCR_CSSF;
     } else
-    #elif defined(STM32H7)
+    #elif defined(STM32H7) || defined(STM32N6)
     if (PWR->CPUCR & PWR_CPUCR_SBF || PWR->CPUCR & PWR_CPUCR_STOPF) {
         // came out of standby or stop mode
         reset_cause = PYB_RESET_DEEPSLEEP;
@@ -323,6 +323,19 @@ MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
 
 // get or set the MCU frequencies
 static mp_obj_t mp_machine_get_freq(void) {
+    #if defined(STM32N6)
+    LL_RCC_ClocksTypeDef clocks;
+    LL_RCC_GetSystemClocksFreq(&clocks);
+    mp_obj_t tuple[] = {
+        mp_obj_new_int(clocks.CPUCLK_Frequency),
+        mp_obj_new_int(clocks.SYSCLK_Frequency),
+        mp_obj_new_int(clocks.HCLK_Frequency),
+        mp_obj_new_int(clocks.PCLK1_Frequency),
+        mp_obj_new_int(clocks.PCLK2_Frequency),
+        mp_obj_new_int(clocks.PCLK4_Frequency),
+        mp_obj_new_int(clocks.PCLK5_Frequency),
+    };
+    #else
     mp_obj_t tuple[] = {
         mp_obj_new_int(HAL_RCC_GetSysClockFreq()),
         mp_obj_new_int(HAL_RCC_GetHCLKFreq()),
@@ -331,11 +344,12 @@ static mp_obj_t mp_machine_get_freq(void) {
         mp_obj_new_int(HAL_RCC_GetPCLK2Freq()),
         #endif
     };
+    #endif
     return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
 }
 
 static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
-    #if defined(STM32F0) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32G0)
+    #if defined(STM32F0) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32N6)
     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 e01a4d4b87e0b..9fa9bf7714877 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -64,8 +64,12 @@
 
 // Whether machine.bootloader() will enter the bootloader via reset, or direct jump.
 #ifndef MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
+#if defined(STM32N6)
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET (0)
+#else
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET (1)
 #endif
+#endif
 
 // Whether to enable ROMFS on the internal flash.
 #ifndef MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH
@@ -77,6 +81,11 @@
 #define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI (0)
 #endif
 
+// Whether to enable ROMFS on external XSPI flash.
+#ifndef MICROPY_HW_ROMFS_ENABLE_EXTERNAL_XSPI
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_XSPI (0)
+#endif
+
 // Whether to enable ROMFS partition 0.
 #ifndef MICROPY_HW_ROMFS_ENABLE_PART0
 #define MICROPY_HW_ROMFS_ENABLE_PART0 (0)
@@ -465,6 +474,16 @@
 #define MICROPY_HW_MAX_UART (5)
 #define MICROPY_HW_MAX_LPUART (1)
 
+// Configuration for STM32N6 series
+#elif defined(STM32N6)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (UID_BASE)
+#define PYB_EXTI_NUM_VECTORS (20) // only EXTI[15:0], RTC and TAMP currently supported
+#define MICROPY_HW_MAX_I2C (4)
+#define MICROPY_HW_MAX_TIMER (18)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (1)
+
 // Configuration for STM32WB series
 #elif defined(STM32WB)
 
@@ -589,8 +608,16 @@
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(MICROPY_HW_BDEV_SPIFLASH, (op), (uint32_t)MICROPY_HW_BDEV_SPIFLASH_CONFIG) : \
     spi_bdev_ioctl(MICROPY_HW_BDEV_SPIFLASH, (op), (arg)) \
     )
-#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(MICROPY_HW_BDEV_SPIFLASH, (dest), (bl), (n))
-#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(MICROPY_HW_BDEV_SPIFLASH, (src), (bl), (n))
+#ifndef MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES
+#define MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES (0)
+#endif
+#define MICROPY_HW_BDEV_SPIFLASH_OFFSET_BLOCKS (MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES / FLASH_BLOCK_SIZE)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(MICROPY_HW_BDEV_SPIFLASH, (dest), MICROPY_HW_BDEV_SPIFLASH_OFFSET_BLOCKS + (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(MICROPY_HW_BDEV_SPIFLASH, (src), MICROPY_HW_BDEV_SPIFLASH_OFFSET_BLOCKS + (bl), (n))
+#endif
+
+#if defined(STM32N6)
+#define MICROPY_FATFS_MAX_SS                    (4096)
 #endif
 
 // Whether to enable caching for external SPI flash, to allow block writes that are
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index bfaa3fb0ba084..41ed3d08b7bb0 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -81,7 +81,7 @@
 #define MICROPY_SCHEDULER_DEPTH     (8)
 #define MICROPY_VFS                 (1)
 #ifndef MICROPY_VFS_ROM
-#define MICROPY_VFS_ROM (MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH || MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI)
+#define MICROPY_VFS_ROM (MICROPY_HW_ROMFS_ENABLE_INTERNAL_FLASH || MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI || MICROPY_HW_ROMFS_ENABLE_EXTERNAL_XSPI)
 #endif
 
 // control over Python builtins
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index b4b2267fa02b1..fcd08cbd84562 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -105,7 +105,7 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
     #elif defined(STM32F4) || defined(STM32F7)
     #define AHBxENR AHB1ENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHB1ENR_GPIOAEN_Pos
-    #elif defined(STM32H7)
+    #elif defined(STM32H7) || defined(STM32N6)
     #define AHBxENR AHB4ENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHB4ENR_GPIOAEN_Pos
     #elif defined(STM32L0)
diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index 5756cb0560dde..8713fe8370c5b 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -137,18 +137,26 @@ static inline void mpu_config_end(uint32_t irq_state) {
     enable_irq(irq_state);
 }
 
-#elif defined(STM32H5)
+#elif defined(STM32H5) || defined(STM32N6)
 
 #define MPU_REGION_SIG      (MPU_REGION_NUMBER0)
 #define MPU_REGION_ETH      (MPU_REGION_NUMBER1)
-#define MPU_REGION_LAST_USED (MPU_REGION_NUMBER1)
+#define MPU_REGION_DMA_UNCACHED_1 (MPU_REGION_NUMBER2)
+#define MPU_REGION_DMA_UNCACHED_2 (MPU_REGION_NUMBER3)
+#define MPU_REGION_LAST_USED (MPU_REGION_NUMBER3)
 
 #define ST_DEVICE_SIGNATURE_BASE (0x08fff800)
 #define ST_DEVICE_SIGNATURE_LIMIT (0x08ffffff)
 
 // STM32H5 Cortex-M33 MPU works differently from older cores.
 // Macro only takes region size in bytes, Attributes are coded in mpu_config_region().
+#define MPU_CONFIG_DISABLE (0)
 #define MPU_CONFIG_ETH(size) (size)
+#define MPU_CONFIG_UNCACHED(size) (size)
+
+#if defined(STM32N6)
+#define MPU_REGION_SIZE_32B (32)
+#endif
 
 static inline void mpu_init(void) {
     // Configure attribute 0, inner-outer non-cacheable (=0x44).
@@ -180,8 +188,12 @@ static inline uint32_t mpu_config_start(void) {
 }
 
 static inline void mpu_config_region(uint32_t region, uint32_t base_addr, uint32_t size) {
-    if (region == MPU_REGION_ETH) {
-        // Configure region 1 to make DMA memory non-cacheable.
+    if (size == 0) {
+        // Disable MPU for this region.
+        MPU->RNR = region;
+        MPU->RLAR &= ~MPU_RLAR_EN_Msk;
+    } else if (region == MPU_REGION_ETH || region == MPU_REGION_DMA_UNCACHED_1 || region == MPU_REGION_DMA_UNCACHED_2) {
+        // Configure region to make DMA memory non-cacheable.
 
         __DMB();
         // Configure attribute 1, inner-outer non-cacheable (=0x44).
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index e3e2fcdd44eb5..a750e8f5be7e1 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -26,10 +26,10 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "boardctrl.h"
 #include "powerctrl.h"
 #include "rtc.h"
 #include "extmod/modbluetooth.h"
-#include "py/mpconfig.h"
 #ifndef NO_QSTR
 #include "genhdr/pllfreqtable.h"
 #endif
@@ -46,7 +46,7 @@ static uint32_t __attribute__((unused)) micropy_hw_hse_value = HSE_VALUE;
 static uint32_t __attribute__((unused)) micropy_hw_clk_pllm = MICROPY_HW_CLK_PLLM;
 #endif
 
-#if defined(STM32H5) || defined(STM32H7)
+#if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
 #define RCC_SR          RSR
 #if defined(STM32H747xx)
 #define RCC_SR_SFTRSTF  RCC_RSR_SFT2RSTF
@@ -63,7 +63,7 @@ static uint32_t __attribute__((unused)) micropy_hw_clk_pllm = MICROPY_HW_CLK_PLL
 #define POWERCTRL_GET_VOLTAGE_SCALING() PWR_REGULATOR_VOLTAGE_SCALE0
 #elif defined(STM32H723xx)
 #define POWERCTRL_GET_VOLTAGE_SCALING() LL_PWR_GetRegulVoltageScaling()
-#elif defined(STM32H5)
+#elif defined(STM32H5) || defined(STM32N6)
 #define POWERCTRL_GET_VOLTAGE_SCALING() LL_PWR_GetRegulVoltageScaling()
 #else
 #define POWERCTRL_GET_VOLTAGE_SCALING()     \
@@ -136,6 +136,12 @@ MP_NORETURN static __attribute__((naked)) void branch_to_bootloader(uint32_t r0,
 }
 
 MP_NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
+    #if defined(STM32N6)
+    LL_PWR_EnableBkUpAccess();
+    TAMP_S->BKP31R = r0;
+    NVIC_SystemReset();
+    #endif
+
     #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
 
     // Enter the bootloader via a reset, so everything is reset (including WDT).
@@ -169,6 +175,8 @@ void powerctrl_check_enter_bootloader(void) {
     #endif
 }
 
+#if !defined(STM32N6)
+
 #if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32WB) && !defined(STM32WL)
 
 typedef struct _sysclk_scaling_table_entry_t {
@@ -781,6 +789,8 @@ static void powerctrl_low_power_exit_wb55() {
 
 #endif // !defined(STM32F0) && !defined(STM32G0) && !defined(STM32L0) && !defined(STM32L1) && !defined(STM32L4)
 
+#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
@@ -809,7 +819,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(STM32L1) && !defined(STM32L4) && !defined(STM32WB) && !defined(STM32WL)
+    #if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L1) && !defined(STM32L4) && !defined(STM32N6) && !defined(STM32WB) && !defined(STM32WL)
     // takes longer to wake but reduces stop current
     HAL_PWREx_EnableFlashPowerDown();
     #endif
@@ -848,6 +858,8 @@ void powerctrl_enter_stop_mode(void) {
 
     #if defined(STM32F7)
     HAL_PWR_EnterSTOPMode((PWR_CR1_LPDS | PWR_CR1_LPUDS | PWR_CR1_FPDS | PWR_CR1_UDEN), PWR_STOPENTRY_WFI);
+    #elif defined(STM32N6)
+    HAL_PWR_EnterSTOPMode(PWR_MAINREGULATOR_ON, PWR_STOPENTRY_WFI);
     #else
     HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
     #endif
@@ -912,6 +924,19 @@ void powerctrl_enter_stop_mode(void) {
     while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL1) {
     }
 
+    #elif defined(STM32N6)
+
+    // Enable PLL1, and switch the CPU and system clock source to use PLL1.
+    LL_RCC_PLL1_Enable();
+    while (!LL_RCC_PLL1_IsReady()) {
+    }
+    LL_RCC_SetCpuClkSource(LL_RCC_CPU_CLKSOURCE_IC1);
+    while (LL_RCC_GetCpuClkSource() != LL_RCC_CPU_CLKSOURCE_STATUS_IC1) {
+    }
+    LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_IC2_IC6_IC11);
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_IC2_IC6_IC11) {
+    }
+
     #else // defined(STM32H5)
 
     // enable PLL
@@ -1016,9 +1041,47 @@ void powerctrl_enter_stop_mode(void) {
     enable_irq(irq_state);
 }
 
+#if defined(STM32N6)
+
+// Upon wake from standby, STM32N6 can resume execution from retained SRAM1.
+// Place a small bootloader there which initialises XSPI in memory-mapped mode
+// and jumps to the main application entry point.
+
+#include "xspi.h"
+
+extern uint32_t _estack;
+
+void Reset_Handler(void);
+
+void iram_bootloader_reset(void) {
+    #if defined(MICROPY_BOARD_LEAVE_STANDBY)
+    MICROPY_BOARD_LEAVE_STANDBY;
+    #endif
+    xspi_init();
+    Reset_Handler();
+}
+
+// Very simple ARM vector table.
+const uint32_t iram_bootloader_isr_vector[] = {
+    (uint32_t)&_estack,
+    (uint32_t)&iram_bootloader_reset,
+};
+
+#endif
+
 MP_NORETURN void powerctrl_enter_standby_mode(void) {
     rtc_init_finalise();
 
+    #if defined(STM32N6)
+    // Upon wake from standby, jump to the code at SRAM1.
+    // A board can reconfigure this in MICROPY_BOARD_ENTER_STANDBY if needed.
+    LL_PWR_EnableTCMSBRetention();
+    LL_PWR_EnableTCMFLXSBRetention();
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_SYSCFG);
+    SCB_CleanDCache();
+    SYSCFG->INITSVTORCR = (uint32_t)&iram_bootloader_isr_vector[0];
+    #endif
+
     #if defined(MICROPY_BOARD_ENTER_STANDBY)
     MICROPY_BOARD_ENTER_STANDBY
     #endif
@@ -1039,6 +1102,13 @@ MP_NORETURN void powerctrl_enter_standby_mode(void) {
     mp_bluetooth_deinit();
     #endif
 
+    #if defined(STM32N6)
+
+    // Clear all WKUPx flags.
+    LL_PWR_ClearFlag_WU();
+
+    #else
+
     // 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
@@ -1135,6 +1205,8 @@ MP_NORETURN void powerctrl_enter_standby_mode(void) {
     powerctrl_low_power_prep_wb55();
     #endif
 
+    #endif
+
     // enter standby mode
     HAL_PWR_EnterSTANDBYMode();
 
diff --git a/ports/stm32/powerctrl.h b/ports/stm32/powerctrl.h
index 05a70e52c6aaa..724ab58366f4a 100644
--- a/ports/stm32/powerctrl.h
+++ b/ports/stm32/powerctrl.h
@@ -34,6 +34,12 @@ void stm32_system_init(void);
 #else
 static inline void stm32_system_init(void) {
     SystemInit();
+
+    #if defined(STM32N6)
+    // The ROM bootloader uses PLL1 to set the CPU to 400MHz, so update
+    // the value of SystemCoreClock to reflect the hardware state.
+    SystemCoreClockUpdate();
+    #endif
 }
 #endif
 
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 31dae527c1e5e..059d2a45da9ce 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -47,9 +47,15 @@ void stm32_system_init(void) {
 #endif
 
 void powerctrl_config_systick(void) {
+    #if defined(STM32N6)
+    uint32_t systick_source_freq = HAL_RCC_GetCpuClockFreq();
+    #else
+    uint32_t systick_source_freq = HAL_RCC_GetHCLKFreq();
+    #endif
+
     // Configure SYSTICK to run at 1kHz (1ms interval)
     SysTick->CTRL |= SYSTICK_CLKSOURCE_HCLK;
-    SysTick_Config(HAL_RCC_GetHCLKFreq() / 1000);
+    SysTick_Config(systick_source_freq / 1000);
     NVIC_SetPriority(SysTick_IRQn, IRQ_PRI_SYSTICK);
 
     #if !BUILDING_MBOOT && (defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB))
@@ -410,6 +416,124 @@ void SystemClock_Config(void) {
     DBGMCU->CR &= ~(DBGMCU_CR_DBG_SLEEP | DBGMCU_CR_DBG_STOP | DBGMCU_CR_DBG_STANDBY);
     #endif
 }
+
+#elif defined(STM32N6)
+
+void SystemClock_Config(void) {
+    // Enable HSI.
+    LL_RCC_HSI_Enable();
+    while (!LL_RCC_HSI_IsReady()) {
+    }
+
+    // Switch the CPU clock source to HSI.
+    LL_RCC_SetCpuClkSource(LL_RCC_CPU_CLKSOURCE_HSI);
+    while (LL_RCC_GetCpuClkSource() != LL_RCC_CPU_CLKSOURCE_STATUS_HSI) {
+    }
+
+    // Switch the system clock source to HSI.
+    LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSI);
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSI) {
+    }
+
+    // Disable all ICx clocks.
+    RCC->DIVENCR = 0x000fffff;
+
+    // This doesn't work, VOSRDY never becomes active.
+    #if 0
+    LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE0);
+    while (!LL_PWR_IsActiveFlag_VOSRDY()) {
+    }
+    #endif
+
+    // Enable HSE.
+    LL_RCC_HSE_Enable();
+    while (!LL_RCC_HSE_IsReady()) {
+    }
+
+    // Disable PLL1.
+    LL_RCC_PLL1_Disable();
+    while (LL_RCC_PLL1_IsReady()) {
+    }
+
+    // Configure PLL1 for use as system clock.
+    LL_RCC_PLL1_SetSource(LL_RCC_PLLSOURCE_HSE);
+    LL_RCC_PLL1_DisableBypass();
+    LL_RCC_PLL1_DisableFractionalModulationSpreadSpectrum();
+    LL_RCC_PLL1_SetM(MICROPY_HW_CLK_PLLM);
+    LL_RCC_PLL1_SetN(MICROPY_HW_CLK_PLLN);
+    LL_RCC_PLL1_SetP1(MICROPY_HW_CLK_PLLP1);
+    LL_RCC_PLL1_SetP2(MICROPY_HW_CLK_PLLP2);
+    LL_RCC_PLL1_SetFRACN(MICROPY_HW_CLK_PLLFRAC);
+    LL_RCC_PLL1P_Enable();
+
+    // Enable PLL1.
+    LL_RCC_PLL1_Enable();
+    while (!LL_RCC_PLL1_IsReady()) {
+    }
+
+    // Configure IC1, IC2, IC6, IC11.
+    LL_RCC_IC1_SetSource(LL_RCC_ICCLKSOURCE_PLL1);
+    LL_RCC_IC1_SetDivider(1);
+    LL_RCC_IC1_Enable();
+    LL_RCC_IC2_SetSource(LL_RCC_ICCLKSOURCE_PLL1);
+    LL_RCC_IC2_SetDivider(2);
+    LL_RCC_IC2_Enable();
+    LL_RCC_IC6_SetSource(LL_RCC_ICCLKSOURCE_PLL1);
+    LL_RCC_IC6_SetDivider(1);
+    LL_RCC_IC6_Enable();
+    LL_RCC_IC11_SetSource(LL_RCC_ICCLKSOURCE_PLL1);
+    LL_RCC_IC11_SetDivider(1);
+    LL_RCC_IC11_Enable();
+
+    // Configure IC14 at 100MHz for slower peripherals.
+    LL_RCC_IC14_SetSource(LL_RCC_ICCLKSOURCE_PLL1);
+    LL_RCC_IC14_SetDivider(8);
+    LL_RCC_IC14_Enable();
+
+    // Enable buses.
+    LL_BUS_EnableClock(LL_APB5 | LL_APB4 | LL_APB3 | LL_APB2 | LL_APB1 | LL_AHB5 | LL_AHB4 | LL_AHB3 | LL_AHB2 | LL_AHB1);
+    LL_MISC_EnableClock(LL_PER);
+
+    // Configure bus dividers.
+    LL_RCC_SetAHBPrescaler(LL_RCC_AHB_DIV_2);
+    LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
+    LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
+    LL_RCC_SetAPB4Prescaler(LL_RCC_APB4_DIV_1);
+    LL_RCC_SetAPB5Prescaler(LL_RCC_APB5_DIV_1);
+
+    // Switch the CPU clock source to IC1 (connected to PLL1).
+    LL_RCC_SetCpuClkSource(LL_RCC_CPU_CLKSOURCE_IC1);
+    while (LL_RCC_GetCpuClkSource() != LL_RCC_CPU_CLKSOURCE_STATUS_IC1) {
+    }
+
+    // Switch the system clock source to IC2/IC6/IC11 (connected to PLL1).
+    LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_IC2_IC6_IC11);
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_IC2_IC6_IC11) {
+    }
+
+    // ADC clock configuration, HCLK/2.
+    LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_HCLK);
+    LL_RCC_SetADCPrescaler(2 - 1);
+
+    // USB clock configuration.
+    #if MICROPY_HW_ENABLE_USB
+
+    // Select HSE/2 as output of direct HSE signal.
+    LL_RCC_HSE_SelectHSEDiv2AsDiv2Clock();
+
+    // Select HSE/2 for OTG1 clock source.
+    LL_RCC_SetClockSource(LL_RCC_OTGPHY1_CLKSOURCE_HSE_DIV_2_OSC);
+    LL_RCC_SetClockSource(LL_RCC_OTGPHY1CKREF_CLKSOURCE_HSE_DIV_2_OSC);
+    LL_RCC_SetOTGPHYClockSource(LL_RCC_OTGPHY1_CLKSOURCE_HSE_DIV_2_OSC);
+    LL_RCC_SetOTGPHYCKREFClockSource(LL_RCC_OTGPHY1CKREF_CLKSOURCE_HSE_DIV_2_OSC);
+
+    #endif
+
+    // Reconfigure clock state and SysTick.
+    SystemCoreClockUpdate();
+    powerctrl_config_systick();
+}
+
 #elif defined(STM32WB)
 
 void SystemClock_Config(void) {
diff --git a/ports/stm32/resethandler_iram.s b/ports/stm32/resethandler_iram.s
new file mode 100644
index 0000000000000..49a8b40068f75
--- /dev/null
+++ b/ports/stm32/resethandler_iram.s
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2025 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-m4
+    .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  sp, =_estack
+
+    /* Initialise the iram section */
+    ldr  r1, =_siiram
+    ldr  r2, =_siram
+    ldr  r3, =_eiram
+    b    .iram_copy_entry
+    nop
+.iram_copy_loop:
+    ldr  r0, [r1], #4 /* Should be 4-aligned to be as fast as possible */
+    str  r0, [r2], #4
+.iram_copy_entry:
+    cmp  r2, r3
+    bcc  .iram_copy_loop
+
+    /* Initialise the data section */
+    ldr  r1, =_sidata
+    ldr  r2, =_sdata
+    ldr  r3, =_edata
+    b    .data_copy_entry
+.data_copy_loop:
+    ldr  r0, [r1], #4 /* Should be 4-aligned to be as fast as possible */
+    str  r0, [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], #4 /* Should be 4-aligned to be as fast as possible */
+.bss_zero_entry:
+    cmp  r1, r2
+    bcc  .bss_zero_loop
+
+    /* Jump to the main code */
+    mov  r0, r4
+    b    stm32_main
+
+    .size Reset_Handler, .-Reset_Handler
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 8dadc4a88d760..b90d17149bde4 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -100,6 +100,10 @@ static bool rtc_need_init_finalise = false;
 #define RCC_BDCR_LSEBYP RCC_CSR_LSEBYP
 #endif
 
+#if defined(STM32N6)
+#define RCC_DBP_TIMEOUT_VALUE (5)
+#endif
+
 void rtc_init_start(bool force_init) {
     // Enable the RTC APB bus clock, to communicate with the RTC.
     #if defined(STM32H5)
@@ -129,6 +133,32 @@ void rtc_init_start(bool force_init) {
 
     if (!force_init) {
         bool rtc_running = false;
+        #if defined(STM32N6)
+        if (LL_RCC_IsEnabledRTC()
+            && LL_RCC_GetRTCClockSource() == LL_RCC_RTC_CLKSOURCE_LSE
+            && LL_RCC_LSE_IsReady()) {
+            // 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;
+        } else if (LL_RCC_IsEnabledRTC()
+                   && LL_RCC_GetRTCClockSource() == LL_RCC_RTC_CLKSOURCE_LSI) {
+            // 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
+            __HAL_RCC_CLEAR_RESET_FLAGS();
+            // Turn the LSI on (it may need this even if the RTC is running)
+            LL_RCC_LSI_Enable();
+            // provide some status information
+            rtc_info |= 0x80000;
+        }
+        #else
         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)) {
@@ -157,6 +187,7 @@ void rtc_init_start(bool force_init) {
             // provide some status information
             rtc_info |= 0x80000;
         }
+        #endif
 
         if (rtc_running) {
             // Provide information about the registers that indicated the RTC is running.
@@ -296,7 +327,7 @@ static HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
                 return HAL_TIMEOUT;
             }
         }
-        #elif defined(STM32H5)
+        #elif defined(STM32H5) || defined(STM32N6)
         // Wait for Backup domain Write protection disable
         while (!LL_PWR_IsEnabledBkUpAccess()) {
             if (HAL_GetTick() - tickstart > RCC_DBP_TIMEOUT_VALUE) {
@@ -381,7 +412,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WL)
         hrtc->Instance->CR &= (uint32_t) ~RTC_CR_TAMPALRM_TYPE_Msk;
         hrtc->Instance->CR |= (uint32_t)(hrtc->Init.OutPutType);
         #else
@@ -413,7 +444,14 @@ static void PYB_RTC_MspInit_Kick(RTC_HandleTypeDef *hrtc, bool rtc_use_lse, bool
 
     RCC_OscInitTypeDef RCC_OscInitStruct;
     RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+    #if defined(STM32N6)
+    RCC_OscInitStruct.PLL1.PLLState = RCC_PLL_NONE;
+    RCC_OscInitStruct.PLL2.PLLState = RCC_PLL_NONE;
+    RCC_OscInitStruct.PLL3.PLLState = RCC_PLL_NONE;
+    RCC_OscInitStruct.PLL4.PLLState = RCC_PLL_NONE;
+    #else
     RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+    #endif
     #if MICROPY_HW_RTC_USE_BYPASS
     if (rtc_use_byp) {
         RCC_OscInitStruct.LSEState = RCC_LSE_BYPASS;
@@ -651,6 +689,8 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime
 #define RTC_WKUP_IRQn RTC_IRQn
 #elif defined(STM32G0)
 #define RTC_WKUP_IRQn RTC_TAMP_IRQn
+#elif defined(STM32N6)
+#define RTC_WKUP_IRQn RTC_S_IRQn
 #endif
 
 // wakeup(None)
@@ -759,8 +799,9 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #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(STM32H5)
+        #elif defined(STM32H5) || defined(STM32N6)
         EXTI->IMR1 |= 1 << EXTI_RTC_WAKEUP;
+        EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
         EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
@@ -772,8 +813,8 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         // clear interrupt flags
         #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
         RTC->ICSR &= ~RTC_ICSR_WUTWF;
-        #elif defined(STM32H5)
-        RTC->SCR = RTC_SCR_CWUTF;
+        #elif defined(STM32H5) || defined(STM32N6)
+        LL_RTC_ClearFlag_WUT(RTC);
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         RTC->SR &= ~RTC_SR_WUTF;
         #else
@@ -783,7 +824,7 @@ 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) || defined(STM32H5)
+        #elif defined(STM32G0) || defined(STM32H5) || defined(STM32N6)
         // Do nothing
         #else
         EXTI->PR = 1 << EXTI_RTC_WAKEUP;
@@ -799,7 +840,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || 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/sdcard.c b/ports/stm32/sdcard.c
index 706d6315c44d4..b91fa3a9c284e 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -40,7 +40,7 @@
 
 #if MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD
 
-#if defined(STM32F7) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4)
+#if defined(STM32F7) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6)
 
 // 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.
@@ -104,7 +104,7 @@
 #define SDIO_HARDWARE_FLOW_CONTROL_DISABLE  SDMMC_HARDWARE_FLOW_CONTROL_DISABLE
 #define SDIO_HARDWARE_FLOW_CONTROL_ENABLE   SDMMC_HARDWARE_FLOW_CONTROL_ENABLE
 
-#if defined(STM32H5) || defined(STM32H7)
+#if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
 #define SDIO_TRANSFER_CLK_DIV               SDMMC_NSpeed_CLK_DIV
 #define SDIO_USE_GPDMA                      0
 #else
@@ -214,7 +214,7 @@ static void sdmmc_msp_init(void) {
     // enable SDIO clock
     SDMMC_CLK_ENABLE();
 
-    #if defined(STM32H7)
+    #if defined(STM32H7) || defined(STM32N6)
     // Reset SDMMC
     SDMMC_FORCE_RESET();
     SDMMC_RELEASE_RESET();
@@ -270,7 +270,7 @@ static HAL_StatusTypeDef sdmmc_init_sd(void) {
     // SD device interface configuration
     sdmmc_handle.sd.Instance = SDIO;
     sdmmc_handle.sd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
-    #if !defined(STM32H5) && !defined(STM32H7)
+    #if !defined(STM32H5) && !defined(STM32H7) && !defined(STM32N6)
     sdmmc_handle.sd.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
     #endif
     sdmmc_handle.sd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 99d05a51555ec..de82ceadc5f33 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -77,7 +77,11 @@ static volatile uint8_t *sdmmc_buf_top;
 #define SDMMC_IRQHandler        SDMMC2_IRQHandler
 #define SDMMC_CLK_ENABLE()      __HAL_RCC_SDMMC2_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE()     __HAL_RCC_SDMMC2_CLK_DISABLE()
+#if defined(STM32N6)
+#define SDMMC_IS_CLK_DISABLED() (!__HAL_RCC_SDMMC2_IS_CLK_ENABLED())
+#else
 #define SDMMC_IS_CLK_DISABLED() __HAL_RCC_SDMMC2_IS_CLK_DISABLED()
+#endif
 #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
@@ -96,9 +100,17 @@ static volatile uint8_t *sdmmc_buf_top;
 #define MICROPY_HW_SDIO_CMD     (pin_D2)
 #endif
 
-#if defined(STM32H7)
+#if defined(STM32H7) || defined(STM32N6)
 static uint32_t safe_divide(uint32_t denom) {
+    #if defined(STM32N6)
+    #if MICROPY_HW_SDIO_SDMMC == 1
+    uint32_t num = LL_RCC_GetSDMMCClockFreq(LL_RCC_SDMMC1_CLKSOURCE);
+    #else
+    uint32_t num = LL_RCC_GetSDMMCClockFreq(LL_RCC_SDMMC2_CLKSOURCE);
+    #endif
+    #else
     uint32_t num = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
+    #endif
     uint32_t divres;
 
     divres = num / (2U * denom);
@@ -119,11 +131,15 @@ void sdio_init(uint32_t irq_pri) {
     mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_CMD);
 
     SDMMC_CLK_ENABLE(); // enable SDIO peripheral
+    #if defined(STM32N6)
+    LL_AHB5_GRP1_EnableClockLowPower(LL_AHB5_GRP1_PERIPH_SDMMC1);
+    LL_AHB5_GRP1_EnableClockLowPower(LL_AHB5_GRP1_PERIPH_SDMMC2);
+    #endif
 
     SDMMC_TypeDef *SDIO = SDMMC;
     #if defined(STM32F7)
     SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_PWRSAV | (120 - 2); // 1-bit, 400kHz
-    #elif defined(STM32H7)
+    #elif defined(STM32H7) || defined(STM32N6)
     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
@@ -172,7 +188,7 @@ 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)
+    #elif defined(STM32H7) || defined(STM32N6)
     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
@@ -199,7 +215,7 @@ void SDMMC_IRQHandler(void) {
             sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
             return;
         }
-        #if defined(STM32H7)
+        #if defined(STM32H7) || defined(STM32N6)
         if (!sdmmc_dma) {
             while (sdmmc_buf_cur < sdmmc_buf_top && (SDMMC->STA & SDMMC_STA_DPSMACT) && !(SDMMC->STA & SDMMC_STA_RXFIFOE)) {
                 *(uint32_t *)sdmmc_buf_cur = SDMMC->FIFO;
@@ -413,11 +429,15 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         dma_nohal_init(&dma_SDIO_0, dma_config);
         dma_nohal_start(&dma_SDIO_0, dma_src, dma_dest, dma_len);
         #else
+        #if defined(STM32N6)
+        SDMMC->IDMABASER = (uint32_t)buf;
+        #else
         SDMMC->IDMABASE0 = (uint32_t)buf;
+        #endif
         SDMMC->IDMACTRL = SDMMC_IDMA_IDMAEN;
         #endif
     } else {
-        #if defined(STM32H7)
+        #if defined(STM32H7) || defined(STM32N6)
         SDMMC->IDMACTRL = 0;
         #endif
     }
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 96dd170652e1e..19f2b65ed288e 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -106,7 +106,7 @@ const spi_t spi_obj[6] = {
 #error "spi_obj needs updating for new value of MICROPY_HW_SUBGHZSPI_ID"
 #endif
 
-#if defined(STM32H5) || defined(STM32H7)
+#if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
 // STM32H5/H7 HAL requires SPI IRQs to be enabled and handled.
 #if defined(MICROPY_HW_SPI1_SCK)
 void SPI1_IRQHandler(void) {
@@ -176,6 +176,18 @@ void spi_init0(void) {
     #if defined(MICROPY_HW_SUBGHZSPI_ID)
     SPIHandleSubGhz.Instance = SUBGHZSPI;
     #endif
+
+    #if defined(STM32N6)
+    // SPI1/2/3/6 clock configuration, PCLKx (max 200MHz).
+    LL_RCC_SetSPIClockSource(LL_RCC_SPI1_CLKSOURCE_PCLK2);
+    LL_RCC_SetSPIClockSource(LL_RCC_SPI2_CLKSOURCE_PCLK1);
+    LL_RCC_SetSPIClockSource(LL_RCC_SPI3_CLKSOURCE_PCLK1);
+    LL_RCC_SetSPIClockSource(LL_RCC_SPI6_CLKSOURCE_PCLK4);
+
+    // SPI4/5 clock configuration, IC14 (max 100MHz).
+    LL_RCC_SetSPIClockSource(LL_RCC_SPI4_CLKSOURCE_IC14);
+    LL_RCC_SetSPIClockSource(LL_RCC_SPI5_CLKSOURCE_IC14);
+    #endif
 }
 
 int spi_find_index(mp_obj_t id) {
@@ -256,6 +268,20 @@ static uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
     } else {
         return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI6);
     }
+    #elif defined(STM32N6)
+    if (spi->Instance == SPI1) {
+        return LL_RCC_GetSPIClockFreq(LL_RCC_SPI1_CLKSOURCE);
+    } else if (spi->Instance == SPI2) {
+        return LL_RCC_GetSPIClockFreq(LL_RCC_SPI2_CLKSOURCE);
+    } else if (spi->Instance == SPI3) {
+        return LL_RCC_GetSPIClockFreq(LL_RCC_SPI3_CLKSOURCE);
+    } else if (spi->Instance == SPI4) {
+        return LL_RCC_GetSPIClockFreq(LL_RCC_SPI4_CLKSOURCE);
+    } else if (spi->Instance == SPI5) {
+        return LL_RCC_GetSPIClockFreq(LL_RCC_SPI5_CLKSOURCE);
+    } else {
+        return LL_RCC_GetSPIClockFreq(LL_RCC_SPI6_CLKSOURCE);
+    }
     #else // !STM32F0, !STM32G0, !STM32H
     #if defined(SPI2)
     if (spi->Instance == SPI2) {
@@ -470,7 +496,7 @@ int spi_init(const spi_t *self, bool enable_nss_pin) {
     dma_invalidate_channel(self->tx_dma_descr);
     dma_invalidate_channel(self->rx_dma_descr);
 
-    #if defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     NVIC_SetPriority(irqn, IRQ_PRI_SPI);
     HAL_NVIC_EnableIRQ(irqn);
     #else
@@ -724,7 +750,7 @@ 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(STM32H5) || defined(STM32H7)
+            #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
             uint log_prescaler = (spi->Init.BaudRatePrescaler >> 28) + 1;
             #else
             uint log_prescaler = (spi->Init.BaudRatePrescaler >> 3) + 1;
diff --git a/ports/stm32/spibdev.c b/ports/stm32/spibdev.c
index fecd4a991536c..d7a75ed2402a5 100644
--- a/ports/stm32/spibdev.c
+++ b/ports/stm32/spibdev.c
@@ -32,6 +32,16 @@
 
 #if MICROPY_HW_ENABLE_STORAGE
 
+#if MICROPY_HW_RUNS_FROM_EXT_FLASH
+// Disable all interrupts.
+#define FLASH_WRITE_ENTER uint32_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION()
+#define FLASH_WRITE_EXIT MICROPY_END_ATOMIC_SECTION(atomic_state)
+#else
+// Prevent cache flushing and USB access.
+#define FLASH_WRITE_ENTER uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH)
+#define FLASH_WRITE_EXIT restore_irq_pri(basepri)
+#endif
+
 int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
     switch (op) {
         case BDEV_IOCTL_INIT:
@@ -68,6 +78,7 @@ 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
     int ret = mp_spiflash_cached_read(&bdev->spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, dest);
@@ -87,20 +98,36 @@ int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_nu
 
     return ret;
 }
+
+#elif FLASH_BLOCK_SIZE == MP_SPIFLASH_ERASE_BLOCK_SIZE
+
+int spi_bdev_readblocks(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
+    int ret = spi_bdev_readblocks_raw(bdev, dest, block_num, 0, num_blocks * FLASH_BLOCK_SIZE);
+    return ret;
+}
+
+int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {
+    int ret = spi_bdev_eraseblocks_raw(bdev, block_num, num_blocks * FLASH_BLOCK_SIZE);
+    if (ret == 0) {
+        ret = spi_bdev_writeblocks_raw(bdev, src, block_num, 0, num_blocks * FLASH_BLOCK_SIZE);
+    }
+    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
+    FLASH_WRITE_ENTER;
     int ret = mp_spiflash_read(&bdev->spiflash, block_num * MP_SPIFLASH_ERASE_BLOCK_SIZE + block_offset, num_bytes, dest);
-    restore_irq_pri(basepri);
+    FLASH_WRITE_EXIT;
 
     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) {
-    uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
+    FLASH_WRITE_ENTER;
     int ret = mp_spiflash_write(&bdev->spiflash, block_num * MP_SPIFLASH_ERASE_BLOCK_SIZE + block_offset, num_bytes, src);
-    restore_irq_pri(basepri);
+    FLASH_WRITE_EXIT;
 
     return ret;
 }
@@ -108,9 +135,9 @@ int spi_bdev_writeblocks_raw(spi_bdev_t *bdev, const uint8_t *src, uint32_t bloc
 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
+        FLASH_WRITE_ENTER;
         ret = mp_spiflash_erase_block(&bdev->spiflash, block_num * MP_SPIFLASH_ERASE_BLOCK_SIZE);
-        restore_irq_pri(basepri);
+        FLASH_WRITE_EXIT;
         if (ret) {
             break;
         }
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index 718fa8cf0679d..e2e7d955c6c1f 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -43,19 +43,17 @@ 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 STM32H747xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H747xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ STM32N657xx))
 CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard -mfp16-format=ieee
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1
-else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0 l1 wl))
+else 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 -mfp16-format=ieee
 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
@@ -68,6 +66,7 @@ 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_h5 = $(CFLAGS_CORTEX_M) -mtune=cortex-m33 -mcpu=cortex-m33
 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
+CFLAGS_MCU_n6 = $(CFLAGS_CORTEX_M) -mtune=cortex-m55 -mcpu=cortex-m55 -mcmse
 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_wl = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 
@@ -81,5 +80,6 @@ MPY_CROSS_MCU_ARCH_l1 = armv7m
 MPY_CROSS_MCU_ARCH_l4 = armv7m
 MPY_CROSS_MCU_ARCH_h5 = armv7m
 MPY_CROSS_MCU_ARCH_h7 = armv7m
+MPY_CROSS_MCU_ARCH_n6 = armv7m # really armv8m
 MPY_CROSS_MCU_ARCH_wb = armv7m
 MPY_CROSS_MCU_ARCH_wl = armv7m
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 4bf509bb9462e..3639e2f0499dd 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -343,14 +343,22 @@ void OTG_FS_IRQHandler(void) {
 }
 #endif
 #if MICROPY_HW_USB_HS
+#if defined(STM32N6)
+void USB1_OTG_HS_IRQHandler(void) {
+    IRQ_ENTER(USB1_OTG_HS_IRQn);
+    HAL_PCD_IRQHandler(&pcd_hs_handle);
+    IRQ_EXIT(USB1_OTG_HS_IRQn);
+}
+#else
 void OTG_HS_IRQHandler(void) {
     IRQ_ENTER(OTG_HS_IRQn);
     HAL_PCD_IRQHandler(&pcd_hs_handle);
     IRQ_EXIT(OTG_HS_IRQn);
 }
 #endif
+#endif
 
-#if MICROPY_HW_USB_FS || MICROPY_HW_USB_HS
+#if (MICROPY_HW_USB_FS || MICROPY_HW_USB_HS) && !defined(STM32N6)
 /**
   * @brief  This function handles USB OTG Common FS/HS Wakeup functions.
   * @param  *pcd_handle for FS or HS
@@ -421,7 +429,7 @@ void OTG_FS_WKUP_IRQHandler(void) {
 }
 #endif
 
-#if MICROPY_HW_USB_HS
+#if MICROPY_HW_USB_HS && !defined(STM32N6)
 /**
   * @brief  This function handles USB OTG HS Wakeup IRQ Handler.
   * @param  None
@@ -480,7 +488,7 @@ void ETH_WKUP_IRQHandler(void) {
 }
 #endif
 
-#if defined(STM32H5)
+#if defined(STM32H5) || defined(STM32N6)
 void TAMP_IRQHandler(void) {
     IRQ_ENTER(TAMP_IRQn);
     Handle_EXTI_Irq(EXTI_RTC_TAMP);
@@ -502,6 +510,9 @@ void TAMP_STAMP_IRQHandler(void) {
 
 #if defined(STM32H5)
 void RTC_IRQHandler(void)
+#elif defined(STM32N6)
+#define RTC_WKUP_IRQn RTC_S_IRQn
+void RTC_S_IRQHandler(void)
 #else
 void RTC_WKUP_IRQHandler(void)
 #endif
@@ -509,8 +520,8 @@ void RTC_WKUP_IRQHandler(void)
     IRQ_ENTER(RTC_WKUP_IRQn);
     #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
     RTC->MISR &= ~RTC_MISR_WUTMF; // clear wakeup interrupt flag
-    #elif defined(STM32H5)
-    RTC->SCR = RTC_SCR_CWUTF; // clear wakeup interrupt flag
+    #elif defined(STM32H5) || defined(STM32N6)
+    LL_RTC_ClearFlag_WUT(RTC);
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     RTC->SR &= ~RTC_SR_WUTF; // clear wakeup interrupt flag
     #else
@@ -520,6 +531,12 @@ void RTC_WKUP_IRQHandler(void)
     IRQ_EXIT(RTC_WKUP_IRQn);
 }
 
+#if defined(STM32N6)
+void RTC_IRQHandler(void) {
+    RTC_S_IRQHandler();
+}
+#endif
+
 #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0)
 
 #if defined(STM32G0)
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index d810261fbcedf..d26ac821e5952 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -32,6 +32,7 @@
 #include "led.h"
 #include "storage.h"
 #include "irq.h"
+#include "xspi.h"
 
 #if MICROPY_HW_ENABLE_STORAGE
 
@@ -44,13 +45,17 @@
 
 static bool storage_is_initialised = false;
 
+#if !defined(STM32N6)
 static void storage_systick_callback(uint32_t ticks_ms);
+#endif
 
 void storage_init(void) {
     if (!storage_is_initialised) {
         storage_is_initialised = true;
 
+        #if !defined(STM32N6)
         systick_enable_dispatch(SYSTICK_DISPATCH_STORAGE, storage_systick_callback);
+        #endif
 
         MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_INIT, 0);
 
@@ -58,10 +63,12 @@ void storage_init(void) {
         MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_INIT, 0);
         #endif
 
+        #if !defined(STM32N6)
         // Enable the flash IRQ, which is used to also call our storage IRQ handler
         // It must go at the same priority as USB (see comment in irq.h).
         NVIC_SetPriority(FLASH_IRQn, IRQ_PRI_FLASH);
         HAL_NVIC_EnableIRQ(FLASH_IRQn);
+        #endif
     }
 }
 
@@ -77,6 +84,7 @@ uint32_t storage_get_block_count(void) {
     #endif
 }
 
+#if !defined(STM32N6)
 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
@@ -96,6 +104,7 @@ void FLASH_IRQHandler(void) {
     #endif
     IRQ_EXIT(FLASH_IRQn);
 }
+#endif
 
 void storage_flush(void) {
     MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_SYNC, 0);
@@ -235,11 +244,11 @@ int storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_bl
 // Board defined an external SPI flash for use with extended block protocol
 #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)))
+    (spi_bdev_readblocks_raw(MICROPY_HW_BDEV_SPIFLASH_EXTENDED, (dest), MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES / MP_SPIFLASH_ERASE_BLOCK_SIZE + (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)))
+    (spi_bdev_writeblocks_raw(MICROPY_HW_BDEV_SPIFLASH_EXTENDED, (src), MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES / MP_SPIFLASH_ERASE_BLOCK_SIZE + (bl), (off), (len)))
 #define MICROPY_HW_BDEV_ERASEBLOCKS_EXT(bl, len) \
-    (spi_bdev_eraseblocks_raw(MICROPY_HW_BDEV_SPIFLASH_EXTENDED, (bl), (len)))
+    (spi_bdev_eraseblocks_raw(MICROPY_HW_BDEV_SPIFLASH_EXTENDED, MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES / MP_SPIFLASH_ERASE_BLOCK_SIZE + (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
diff --git a/ports/stm32/storage.h b/ports/stm32/storage.h
index accf6c3904383..75cb0e9c1e52e 100644
--- a/ports/stm32/storage.h
+++ b/ports/stm32/storage.h
@@ -28,7 +28,11 @@
 
 #include "drivers/memory/spiflash.h"
 
+#if defined(STM32N6)
+#define FLASH_BLOCK_SIZE (4096)
+#else
 #define FLASH_BLOCK_SIZE (512)
+#endif
 #define FLASH_PART1_START_BLOCK (0x100)
 
 // Try to match Python-level VFS block protocol where possible for these constants
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 9d65b484cd196..4ec467d9db53d 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -261,6 +261,12 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
         }
     }
 
+    #elif defined(STM32N6)
+
+    // Timers are clocked either by ck_timg1 or ck_timg2.
+    // Both of those have the same frequency: sys_bus_ck / prescaler(TIMPRE)
+    return LL_RCC_GetSystemClockFreq() / (1 << LL_RCC_GetTIMPrescaler());
+
     #else
 
     uint32_t source, clk_div;
@@ -846,7 +852,9 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(1, TIM1_UP_TIM16_IRQn),
     #endif
     #endif
+
     TIM_ENTRY(2, TIM2_IRQn),
+
     #if defined(TIM3)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(3, TIM3_TIM4_IRQn),
@@ -854,6 +862,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(3, TIM3_IRQn),
     #endif
     #endif
+
     #if defined(TIM4)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(3, TIM3_TIM4_IRQn),
@@ -861,20 +870,23 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(4, TIM4_IRQn),
     #endif
     #endif
+
     #if defined(TIM5)
     TIM_ENTRY(5, TIM5_IRQn),
     #endif
+
     #if defined(TIM6)
     #if defined(STM32F412Zx) || defined(STM32L1)
     TIM_ENTRY(6, TIM6_IRQn),
     #elif defined(STM32G0)
     TIM_ENTRY(6, TIM6_DAC_LPTIM1_IRQn),
-    #elif defined(STM32H5)
+    #elif defined(STM32H5) || defined(STM32N6)
     TIM_ENTRY(6, TIM6_IRQn),
     #else
     TIM_ENTRY(6, TIM6_DAC_IRQn),
     #endif
     #endif
+
     #if defined(TIM7)
     #if defined(STM32G0)
     TIM_ENTRY(7, TIM7_LPTIM2_IRQn),
@@ -894,7 +906,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
 
     #if defined(TIM9)
-    #if defined(STM32L1)
+    #if defined(STM32L1) || defined(STM32N6)
     TIM_ENTRY(9, TIM9_IRQn),
     #else
     TIM_ENTRY(9, TIM1_BRK_TIM9_IRQn),
@@ -902,7 +914,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
 
     #if defined(TIM10)
-    #if defined(STM32L1)
+    #if defined(STM32L1) || defined(STM32N6)
     TIM_ENTRY(10, TIM10_IRQn),
     #else
     TIM_ENTRY(10, TIM1_UP_TIM10_IRQn),
@@ -910,7 +922,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
 
     #if defined(TIM11)
-    #if defined(STM32L1)
+    #if defined(STM32L1) || defined(STM32N6)
     TIM_ENTRY(11, TIM11_IRQn),
     #else
     TIM_ENTRY(11, TIM1_TRG_COM_TIM11_IRQn),
@@ -918,7 +930,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
 
     #if defined(TIM12)
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     TIM_ENTRY(12, TIM12_IRQn),
     #else
     TIM_ENTRY(12, TIM8_BRK_TIM12_IRQn),
@@ -926,21 +938,21 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
 
     #if defined(TIM13)
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     TIM_ENTRY(13, TIM13_IRQn),
     #else
     TIM_ENTRY(13, TIM8_UP_TIM13_IRQn),
     #endif
     #endif
 
-    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32N6)
     TIM_ENTRY(14, TIM14_IRQn),
     #elif defined(TIM14)
     TIM_ENTRY(14, TIM8_TRG_COM_TIM14_IRQn),
     #endif
 
     #if defined(TIM15)
-    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     TIM_ENTRY(15, TIM15_IRQn),
     #else
     TIM_ENTRY(15, TIM1_BRK_TIM15_IRQn),
@@ -950,7 +962,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #if defined(TIM16)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(16, TIM16_FDCAN_IT0_IRQn),
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WL)
     TIM_ENTRY(16, TIM16_IRQn),
     #else
     TIM_ENTRY(16, TIM1_UP_TIM16_IRQn),
@@ -960,7 +972,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #if defined(TIM17)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(17, TIM17_FDCAN_IT1_IRQn),
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || 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 e3f8dc1f90648..9354af4a291e3 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -91,7 +91,7 @@
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_WUFIE)
 #endif
 
-#elif defined(STM32H7)
+#elif defined(STM32H7) || defined(STM32N6)
 #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)
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_RXFTIE | USART_CR3_TCBGTIE | USART_CR3_TXFTIE | USART_CR3_WUFIE)
@@ -157,6 +157,18 @@ void uart_init0(void) {
     if (HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphClkInit) != HAL_OK) {
         MICROPY_BOARD_FATAL_ERROR("HAL_RCCEx_PeriphCLKConfig");
     }
+    #elif defined(STM32N6)
+    // UART clock configuration, IC14 (max 100MHz).
+    LL_RCC_SetUSARTClockSource(LL_RCC_USART1_CLKSOURCE_IC14);
+    LL_RCC_SetUSARTClockSource(LL_RCC_USART2_CLKSOURCE_IC14);
+    LL_RCC_SetUSARTClockSource(LL_RCC_USART3_CLKSOURCE_IC14);
+    LL_RCC_SetUARTClockSource(LL_RCC_UART4_CLKSOURCE_IC14);
+    LL_RCC_SetUARTClockSource(LL_RCC_UART5_CLKSOURCE_IC14);
+    LL_RCC_SetUSARTClockSource(LL_RCC_USART6_CLKSOURCE_IC14);
+    LL_RCC_SetUARTClockSource(LL_RCC_UART7_CLKSOURCE_IC14);
+    LL_RCC_SetUARTClockSource(LL_RCC_UART8_CLKSOURCE_IC14);
+    LL_RCC_SetUARTClockSource(LL_RCC_UART9_CLKSOURCE_IC14);
+    LL_RCC_SetUSARTClockSource(LL_RCC_USART10_CLKSOURCE_IC14);
     #endif
 }
 
@@ -661,7 +673,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     huart.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
     #endif
 
-    #if defined(STM32H7) || defined(STM32WB)
+    #if defined(STM32H7) || defined(STM32N6) || 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) {
@@ -976,6 +988,29 @@ uint32_t uart_get_source_freq(machine_uart_obj_t *self) {
         default:
             break;
     }
+
+    #elif defined(STM32N6)
+
+    static const uint16_t is_usart = 1 << 10 | 1 << 6 | 1 << 3 | 1 << 2 | 1 << 1;
+    static const uint32_t clksource[] = {
+        LL_RCC_USART1_CLKSOURCE,
+        LL_RCC_USART2_CLKSOURCE,
+        LL_RCC_USART3_CLKSOURCE,
+        LL_RCC_UART4_CLKSOURCE,
+        LL_RCC_UART5_CLKSOURCE,
+        LL_RCC_USART6_CLKSOURCE,
+        LL_RCC_UART7_CLKSOURCE,
+        LL_RCC_UART8_CLKSOURCE,
+        LL_RCC_UART9_CLKSOURCE,
+        LL_RCC_USART10_CLKSOURCE,
+    };
+
+    if (is_usart & (1 << self->uart_id)) {
+        uart_clk = LL_RCC_GetUSARTClockFreq(clksource[self->uart_id - 1]);
+    } else {
+        uart_clk = LL_RCC_GetUARTClockFreq(clksource[self->uart_id - 1]);
+    }
+
     #else
     if (self->uart_id == 1
         #if defined(USART6)
@@ -1001,14 +1036,14 @@ uint32_t uart_get_baudrate(machine_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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
             , self->uartx->PRESC
             #endif
             );
     }
     #endif
     return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
         self->uartx->PRESC,
         #endif
         LL_USART_OVERSAMPLING_16);
@@ -1018,7 +1053,7 @@ void uart_set_baudrate(machine_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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
             LL_LPUART_PRESCALER_DIV1,
             #endif
             baudrate);
@@ -1026,7 +1061,7 @@ void uart_set_baudrate(machine_uart_obj_t *self, uint32_t baudrate) {
     }
     #endif
     LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
         LL_USART_PRESCALER_DIV1,
         #endif
         LL_USART_OVERSAMPLING_16, baudrate);
@@ -1077,7 +1112,7 @@ int uart_rx_char(machine_uart_obj_t *self) {
         return data;
     } else {
         // no buffering
-        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32N6) || 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;
@@ -1232,7 +1267,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || 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/usb.c b/ports/stm32/usb.c
index af9dd1d70ec2b..2d70dcb2619c5 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -67,7 +67,7 @@
 #define MAX_ENDPOINT(dev_id) ((dev_id) == USB_PHY_FS_ID ? 3 : 5)
 #elif defined(STM32F7)
 #define MAX_ENDPOINT(dev_id) ((dev_id) == USB_PHY_FS_ID ? 5 : 8)
-#elif defined(STM32H7)
+#elif defined(STM32H7) || defined(STM32N6)
 #define MAX_ENDPOINT(dev_id) (8)
 #endif
 
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 829037ba935f6..7a9e63c9f32c1 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -51,6 +51,11 @@ PCD_HandleTypeDef pcd_hs_handle;
 #define USB_OTG_FS USB
 #endif
 
+#if defined(STM32N6)
+#define USB_OTG_HS USB1_OTG_HS
+#define OTG_HS_IRQn USB1_OTG_HS_IRQn
+#endif
+
 /*******************************************************************************
                        PCD BSP Routines
 *******************************************************************************/
@@ -191,6 +196,10 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         mp_hal_pin_config(pin_A12, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
         mp_hal_pin_config_speed(pin_A12, GPIO_SPEED_FREQ_VERY_HIGH);
 
+        #elif defined(STM32N6)
+
+        // These MCUs have dedicated USB pins.
+
         #else
 
         // Other MCUs have an alternate function for GPIO's to be in USB mode.
@@ -220,6 +229,23 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, otg_alt);
         #endif
 
+        #if defined(STM32N6)
+
+        __HAL_RCC_USB1_OTG_HS_FORCE_RESET();
+        __HAL_RCC_USB1_OTG_HS_PHY_FORCE_RESET();
+        __HAL_RCC_USB1_OTG_HS_PHY_RELEASE_RESET();
+        __HAL_RCC_USB1_OTG_HS_RELEASE_RESET();
+
+        LL_AHB5_GRP1_EnableClock(LL_AHB5_GRP1_PERIPH_OTG1);
+        LL_AHB5_GRP1_EnableClock(LL_AHB5_GRP1_PERIPH_OTGPHY1);
+        LL_AHB5_GRP1_EnableClockLowPower(LL_AHB5_GRP1_PERIPH_OTG1);
+        LL_AHB5_GRP1_EnableClockLowPower(LL_AHB5_GRP1_PERIPH_OTGPHY1);
+
+        // Select 24MHz clock.
+        MODIFY_REG(USB1_HS_PHYC->USBPHYC_CR, USB_USBPHYC_CR_FSEL, 2 << USB_USBPHYC_CR_FSEL_Pos);
+
+        #else
+
         // Enable calling WFI and correct function of the embedded USB_FS_IN_HS phy
         __HAL_RCC_USB_OTG_HS_ULPI_CLK_SLEEP_DISABLE();
         __HAL_RCC_USB_OTG_HS_CLK_SLEEP_ENABLE();
@@ -235,6 +261,8 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
 
         __HAL_RCC_USB_OTG_HS_CLK_ENABLE();
 
+        #endif
+
         #else // !MICROPY_HW_USB_HS_IN_FS
 
         // Configure USB HS GPIOs
@@ -283,7 +311,12 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef *hpcd) {
     #if MICROPY_HW_USB_HS
     if (hpcd->Instance == USB_OTG_HS) {
         /* Disable USB FS Clocks */
+        #if defined(STM32N6)
+        LL_AHB5_GRP1_DisableClock(LL_AHB5_GRP1_PERIPH_OTG1);
+        LL_AHB5_GRP1_DisableClock(LL_AHB5_GRP1_PERIPH_OTGPHY1);
+        #else
         __USB_OTG_HS_CLK_DISABLE();
+        #endif
     }
     #endif
 
@@ -517,7 +550,7 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const
 
         #if MICROPY_HW_USB_HS_IN_FS
 
-        #if defined(STM32F723xx) || defined(STM32F733xx)
+        #if defined(STM32F723xx) || defined(STM32F733xx) || defined(STM32N6)
         pcd_hs_handle.Init.phy_itface = USB_OTG_HS_EMBEDDED_PHY;
         #else
         pcd_hs_handle.Init.phy_itface = PCD_PHY_EMBEDDED;
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 2c90ce165e2a7..34f04125341d2 100644
--- a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
+++ b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
@@ -11,7 +11,7 @@
 
 // Work out if we should support USB high-speed device mode
 #if MICROPY_HW_USB_HS \
-    && (!MICROPY_HW_USB_HS_IN_FS || defined(STM32F723xx) || defined(STM32F733xx))
+    && (!MICROPY_HW_USB_HS_IN_FS || defined(STM32F723xx) || defined(STM32F733xx) || defined(STM32N6))
 #define USBD_SUPPORT_HS_MODE (1)
 #else
 #define USBD_SUPPORT_HS_MODE (0)
@@ -31,7 +31,11 @@
 #else
 #define CDC_DATA_MAX_PACKET_SIZE    CDC_DATA_FS_MAX_PACKET_SIZE
 #endif
+#if defined(STM32N6)
+#define MSC_MEDIA_PACKET            (4096) // must be at least the SPI flash erase size
+#else
 #define MSC_MEDIA_PACKET            (2048) // was 8192; how low can it go whilst still working?
+#endif
 #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
diff --git a/ports/stm32/vfs_rom_ioctl.c b/ports/stm32/vfs_rom_ioctl.c
index 7592aa22d622a..5dbc855861dd5 100644
--- a/ports/stm32/vfs_rom_ioctl.c
+++ b/ports/stm32/vfs_rom_ioctl.c
@@ -33,6 +33,7 @@
 #include "flash.h"
 #include "qspi.h"
 #include "storage.h"
+#include "xspi.h"
 
 #if MICROPY_VFS_ROM_IOCTL
 
@@ -142,6 +143,18 @@ mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
             return MP_OBJ_NEW_SMALL_INT(4);
         }
         #endif
+
+        #if MICROPY_HW_ROMFS_ENABLE_EXTERNAL_XSPI
+        if (xspi_is_valid_addr(&xspi_flash2, dest)) {
+            dest -= xspi_get_xip_base(&xspi_flash2);
+            dest_max -= xspi_get_xip_base(&xspi_flash2);
+            int ret = spi_bdev_eraseblocks_raw(MICROPY_HW_ROMFS_XSPI_SPIBDEV_OBJ, dest / MP_SPIFLASH_ERASE_BLOCK_SIZE, dest_max - dest + MP_SPIFLASH_ERASE_BLOCK_SIZE - 1);
+            if (ret < 0) {
+                return MP_OBJ_NEW_SMALL_INT(ret);
+            }
+            return MP_OBJ_NEW_SMALL_INT(4);
+        }
+        #endif
     }
 
     if (cmd == MP_VFS_ROM_IOCTL_WRITE) {
@@ -170,6 +183,14 @@ mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
             return MP_OBJ_NEW_SMALL_INT(ret);
         }
         #endif
+
+        #if MICROPY_HW_ROMFS_ENABLE_EXTERNAL_XSPI
+        if (xspi_is_valid_addr(&xspi_flash2, dest)) {
+            dest -= xspi_get_xip_base(&xspi_flash2);
+            int ret = spi_bdev_writeblocks_raw(MICROPY_HW_ROMFS_XSPI_SPIBDEV_OBJ, bufinfo.buf, 0, dest, bufinfo.len);
+            return MP_OBJ_NEW_SMALL_INT(ret);
+        }
+        #endif
     }
 
     return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
diff --git a/ports/stm32/xspi.c b/ports/stm32/xspi.c
new file mode 100644
index 0000000000000..b113110c05e91
--- /dev/null
+++ b/ports/stm32/xspi.c
@@ -0,0 +1,599 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 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 XSPI driver is currently configured to run in 1-line (SPI) mode.
+// It uses the mp_qspi_proto_t QSPI protocol and translates quad-commands
+// into 1-line commands.
+
+#include <string.h>
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "xspi.h"
+
+#if defined(MICROPY_HW_XSPIFLASH_SIZE_BITS_LOG2)
+
+#ifndef MICROPY_HW_XSPI_PRESCALER
+#define MICROPY_HW_XSPI_PRESCALER (4) // F_CLK = F_AHB/4
+#endif
+
+#ifndef MICROPY_HW_XSPI_CS_HIGH_CYCLES
+#define MICROPY_HW_XSPI_CS_HIGH_CYCLES (2) // nCS stays high for 4 cycles
+#endif
+
+// Currently hard-coded to use XSPI2 instance.
+#define XSPIx (XSPI2)
+
+// For XSPI2, PN0 through PN12.
+#define XSPI2_AF (9)
+
+typedef struct _xspi_flash_t {
+    XSPI_TypeDef *xspi;
+    uintptr_t xip_base;
+} xspi_flash_t;
+
+const xspi_flash_t xspi_flash1 = {
+    .xspi = XSPI1,
+    .xip_base = 0x90000000,
+};
+
+const xspi_flash_t xspi_flash2 = {
+    .xspi = XSPI2,
+    .xip_base = 0x70000000,
+};
+
+static bool xspi_dtr_enabled = false;
+
+#ifdef pyb_pin_FLASH_RESET
+// Can't rely on SysTick being available, so use a busy loop for delays.
+// The timing here is approximate and assumes a CPU frequency of 800MHz.
+static void xspi_delay_us(unsigned int us) {
+    while (us--) {
+        for (unsigned int i = 0; i < 800; ++i) {
+            __NOP();
+        }
+    }
+}
+#endif
+
+static inline void mp_hal_pin_config_alt_speed(mp_hal_pin_obj_t pin, uint32_t pull, uint32_t alt, uint32_t speed) {
+    mp_hal_pin_config(pin, MP_HAL_PIN_MODE_ALT, pull, alt);
+    mp_hal_pin_config_speed(pin, speed);
+}
+
+static int xspi_read_111_ext(uint8_t cmd, bool addr_enabled, uint32_t addr, size_t len, uint8_t *dest);
+static int xspi_write_111_ext(uint8_t cmd, bool addr_enabled, uint32_t addr, size_t len, const uint8_t *src);
+static int xspi_read_888_dtr_ext(uint16_t cmd, bool addr_enabled, uint32_t addr, uint32_t num_dummy, size_t len, uint8_t *dest);
+static int xspi_write_888_dtr_ext(uint16_t cmd, bool addr_enabled, uint32_t addr, size_t len, const uint8_t *src);
+static void xspi_memory_map_111(void);
+static void xspi_memory_map_888(void);
+static void xspi_memory_map_exit(void);
+
+void xspi_init(void) {
+    // Configure XSPI pins.
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_CS, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_SCK, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_DQS, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO0, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO1, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO2, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO3, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO4, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO5, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO6, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+    mp_hal_pin_config_alt_speed(pyb_pin_XSPIM_P2_IO7, MP_HAL_PIN_PULL_NONE, XSPI2_AF, MP_HAL_PIN_SPEED_VERY_HIGH);
+
+    LL_AHB5_GRP1_ForceReset(LL_AHB5_GRP1_PERIPH_XSPIM);
+    LL_AHB5_GRP1_ForceReset(LL_AHB5_GRP1_PERIPH_XSPI1);
+    LL_AHB5_GRP1_ForceReset(LL_AHB5_GRP1_PERIPH_XSPI2);
+    LL_AHB5_GRP1_ForceReset(LL_AHB5_GRP1_PERIPH_XSPI3);
+
+    LL_AHB5_GRP1_ReleaseReset(LL_AHB5_GRP1_PERIPH_XSPIM);
+    LL_AHB5_GRP1_ReleaseReset(LL_AHB5_GRP1_PERIPH_XSPI1);
+    LL_AHB5_GRP1_ReleaseReset(LL_AHB5_GRP1_PERIPH_XSPI2);
+    LL_AHB5_GRP1_ReleaseReset(LL_AHB5_GRP1_PERIPH_XSPI3);
+
+    LL_RCC_SetXSPIClockSource(LL_RCC_XSPI1_CLKSOURCE_HCLK);
+    LL_RCC_SetXSPIClockSource(LL_RCC_XSPI2_CLKSOURCE_HCLK);
+
+    LL_AHB5_GRP1_EnableClock(LL_AHB5_GRP1_PERIPH_XSPIM);
+    LL_AHB5_GRP1_EnableClock(LL_AHB5_GRP1_PERIPH_XSPI1);
+    LL_AHB5_GRP1_EnableClock(LL_AHB5_GRP1_PERIPH_XSPI2);
+
+    // Configure XSPIM in direct mode.
+    XSPI1->CR &= ~XSPI_CR_EN;
+    XSPI2->CR &= ~XSPI_CR_EN;
+    XSPIM->CR = 0;
+
+    // Configure the XSPIx peripheral.
+
+    XSPIx->CR =
+        3 << XSPI_CR_FTHRES_Pos // 4 byte must be available to read/write
+            | 0 << XSPI_CR_MSEL_Pos // FLASH 0 selected
+            | 0 << XSPI_CR_CSSEL_Pos // use NCS1 as chip select
+            | 0 << XSPI_CR_DMM_Pos // dual-memory mode disabled
+            | 1 << XSPI_CR_TCEN_Pos // time-out counter enabled
+            | 0 << XSPI_CR_DMAEN_Pos // DMA disabled
+            | 0 << XSPI_CR_ABORT_Pos // no abort request
+            | 0 << XSPI_CR_EN_Pos // disabled
+    ;
+
+    XSPIx->DCR1 =
+        1 << XSPI_DCR1_MTYP_Pos // Macronix mode
+            | (MICROPY_HW_XSPIFLASH_SIZE_BITS_LOG2 - 3 - 1) << XSPI_DCR1_DEVSIZE_Pos
+            | (MICROPY_HW_XSPI_CS_HIGH_CYCLES - 1) << XSPI_DCR1_CSHT_Pos
+            | 0 << XSPI_DCR1_FRCK_Pos // CLK is not free running
+            | 0 << XSPI_DCR1_CKMODE_Pos // CLK idles at low state
+    ;
+
+    XSPIx->DCR2 =
+        0 << XSPI_DCR2_WRAPSIZE_Pos // separate wrap reads are not supported by the memory
+            | (MICROPY_HW_XSPI_PRESCALER - 1) << XSPI_DCR2_PRESCALER_Pos
+    ;
+
+    XSPIx->DCR3 =
+        0
+        // 10 << XSPI_DCR3_CSBOUND_Pos // transaction boundary at 1024
+    ;
+
+    XSPIx->DCR4 =
+        0 << XSPI_DCR4_REFRESH_Pos // refresh disabled (it's non-volatile memory)
+    ;
+
+    XSPIx->TCR = 0;
+
+    // Enable the XSPI peripheral.
+    XSPIx->CR |= XSPI_CR_EN;
+
+    // XSPIM init
+    XSPI1->CR &= ~(1 << XSPI_CR_EN_Pos);
+    XSPI2->CR &= ~(1 << XSPI_CR_EN_Pos);
+    XSPIM->CR = 0; // can also be (1 << 4) to pass through CS signal
+    XSPIx->CR |= 1 << XSPI_CR_EN_Pos;
+
+    #ifdef pyb_pin_FLASH_RESET
+    // Reset SPI flash to make sure it's in a known state (SPI mode).
+    mp_hal_pin_output(pyb_pin_FLASH_RESET);
+    mp_hal_pin_low(pyb_pin_FLASH_RESET);
+    xspi_delay_us(1000);
+    mp_hal_pin_high(pyb_pin_FLASH_RESET);
+    xspi_delay_us(10000);
+    #endif
+
+    // Enable memory-mapped mode.
+    // Can select either SPI or DTR mode.
+    if (1) {
+        xspi_switch_to_dtr();
+        xspi_memory_map_888();
+    } else {
+        xspi_memory_map_111();
+    }
+}
+
+uint32_t xspi_get_xip_base(const xspi_flash_t *self) {
+    return self->xip_base;
+}
+
+bool xspi_is_valid_addr(const xspi_flash_t *self, uint32_t addr) {
+    return self->xip_base <= addr && addr < self->xip_base + 256 * 1024 * 1024;
+}
+
+static int xspi_read_111_ext(uint8_t cmd, bool addr_enabled, uint32_t addr, size_t len, uint8_t *dest) {
+    uint32_t admode = addr_enabled ? 1 : 0;
+    XSPIx->CR = (XSPIx->CR & ~XSPI_CR_FMODE_Msk) | 1 << XSPI_CR_FMODE_Pos; // indirect read mode
+    XSPIx->CCR =
+        1 << XSPI_CCR_DMODE_Pos // data on 1 line
+            | 3 << XSPI_CCR_ADSIZE_Pos // 32-bit address size
+            | admode << XSPI_CCR_ADMODE_Pos // address on 1 line, or disabled
+            | 1 << XSPI_CCR_IMODE_Pos // instruction on 1 line
+    ;
+    XSPIx->TCR = 0 << XSPI_TCR_DCYC_Pos; // 0 dummy cycles
+    XSPIx->DLR = len - 1; // number of bytes to read
+    XSPIx->IR = cmd; // read opcode (triggers the start of the transaction if address disabled)
+    if (addr_enabled) {
+        XSPIx->AR = addr; // triggers the start of the transaction
+    }
+
+    #if 0 // untested code
+    // Read in the data 4 bytes at a time if dest is aligned.
+    if (((uintptr_t)dest & 3) == 0) {
+        while (len >= 4) {
+            while (!(XSPIx->SR & XSPI_SR_FTF)) {
+                if (XSPIx->SR & XSPI_SR_TEF) {
+                    return -MP_EIO;
+                }
+            }
+            *(uint32_t *)dest = XSPIx->DR;
+            dest += 4;
+            len -= 4;
+        }
+    }
+    #endif
+
+    // Read in data 1 byte at a time.
+    while (len--) {
+        while (!((XSPIx->SR >> XSPI_SR_FLEVEL_Pos) & 0x3f)) {
+            if (XSPIx->SR & XSPI_SR_TEF) {
+                return -MP_EIO;
+            }
+        }
+        *dest++ = *(volatile uint8_t *)&XSPIx->DR;
+    }
+
+    XSPIx->FCR = XSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
+}
+
+static int xspi_write_111_ext(uint8_t cmd, bool addr_enabled, uint32_t addr, size_t len, const uint8_t *src) {
+    uint32_t dmode = len == 0 ? 0 : 1;
+    uint32_t admode = addr_enabled ? 1 : 0;
+
+    // Configure and start the transfer.
+    // Transfer starts with IR write if no address or data, with AR write if no data,
+    // otherwise with DR write.
+
+    XSPIx->CR = (XSPIx->CR & ~XSPI_CR_FMODE_Msk) | 0 << XSPI_CR_FMODE_Pos; // indirect write mode
+    XSPIx->CCR =
+        dmode << XSPI_CCR_DMODE_Pos // data on 1 line, or disabled
+            | 3 << XSPI_CCR_ADSIZE_Pos // 32-bit address size
+            | admode << XSPI_CCR_ADMODE_Pos // address on 1 line, or disabled
+            | 1 << XSPI_CCR_IMODE_Pos // instruction on 1 line
+    ;
+    XSPIx->TCR = 0 << XSPI_TCR_DCYC_Pos; // 0 dummy cycles
+    if (len != 0) {
+        XSPIx->DLR = len - 1;
+    }
+    XSPIx->IR = cmd; // write opcode
+    if (addr_enabled) {
+        XSPIx->AR = addr; // address
+    }
+
+    // Write out the data one byte at a time
+    while (len--) {
+        while (!(XSPIx->SR & XSPI_SR_FTF)) {
+            if (XSPIx->SR & XSPI_SR_TEF) {
+                return -MP_EIO;
+            }
+        }
+        *(volatile uint8_t *)&XSPIx->DR = *src++;
+    }
+
+    // Wait for write to finish
+    while (!(XSPIx->SR & XSPI_SR_TCF)) {
+        if (XSPIx->SR & XSPI_SR_TEF) {
+            return -MP_EIO;
+        }
+    }
+
+    XSPIx->FCR = XSPI_FCR_CTCF; // clear TC flag
+
+    // Wait for peripheral to return to idle.
+    while (XSPIx->SR & XSPI_SR_BUSY) {
+    }
+
+    return 0;
+}
+
+static int xspi_read_888_dtr_ext(uint16_t cmd, bool addr_enabled, uint32_t addr, uint32_t num_dummy, size_t len, uint8_t *dest) {
+    uint32_t admode = addr_enabled ? 4 : 0;
+
+    // Configure and start the transfer.
+    // Transfer starts with IR write if no address, otherwise with AR write.
+
+    XSPIx->CR = (XSPIx->CR & ~XSPI_CR_FMODE_Msk) | 1 << XSPI_CR_FMODE_Pos; // indirect read mode
+    XSPIx->CCR =
+        1 << XSPI_CCR_DQSE_Pos // DQS enabled
+            | 1 << XSPI_CCR_DDTR_Pos // data DTR enabled
+            | 4 << XSPI_CCR_DMODE_Pos // data on 8 lines
+            | 3 << XSPI_CCR_ADSIZE_Pos // 32-bit address size
+            | 1 << XSPI_CCR_ADDTR_Pos // address DTR enabled
+            | admode << XSPI_CCR_ADMODE_Pos // address on 8 lines, or disabled
+            | 1 << XSPI_CCR_ISIZE_Pos // 16-bit instruction
+            | 1 << XSPI_CCR_IDTR_Pos // instruction DTR enabled
+            | 4 << XSPI_CCR_IMODE_Pos // instruction on 8 lines
+    ;
+    XSPIx->TCR = num_dummy << XSPI_TCR_DCYC_Pos; // N dummy cycles
+    XSPIx->DLR = len - 1;
+    XSPIx->IR = cmd; // read opcode
+    if (addr_enabled) {
+        XSPIx->AR = addr; // address
+    }
+
+    // Read in data 1 byte at a time.
+    while (len--) {
+        while (!((XSPIx->SR >> XSPI_SR_FLEVEL_Pos) & 0x3f)) {
+            if (XSPIx->SR & XSPI_SR_TEF) {
+                return -MP_EIO;
+            }
+        }
+        *dest++ = *(volatile uint8_t *)&XSPIx->DR;
+    }
+
+    XSPIx->FCR = XSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
+}
+
+static int xspi_write_888_dtr_ext(uint16_t cmd, bool addr_enabled, uint32_t addr, size_t len, const uint8_t *src) {
+    uint32_t dmode = len == 0 ? 0 : 4;
+    uint32_t admode = addr_enabled ? 4 : 0;
+
+    // Configure and start the transfer.
+    // Transfer starts with IR write if no address or data, with AR write if no data,
+    // otherwise with DR write.
+
+    XSPIx->CR = (XSPIx->CR & ~XSPI_CR_FMODE_Msk) | 0 << XSPI_CR_FMODE_Pos; // indirect write mode
+    XSPIx->CCR =
+        1 << XSPI_CCR_DDTR_Pos // data DTR enabled
+            | dmode << XSPI_CCR_DMODE_Pos // data on 8 lines, or disabled
+            | 3 << XSPI_CCR_ADSIZE_Pos // 32-bit address size
+            | 1 << XSPI_CCR_ADDTR_Pos // address DTR enabled
+            | admode << XSPI_CCR_ADMODE_Pos // address on 8 lines, or disabled
+            | 1 << XSPI_CCR_ISIZE_Pos // 16-bit instruction
+            | 1 << XSPI_CCR_IDTR_Pos // instruction DTR enabled
+            | 4 << XSPI_CCR_IMODE_Pos // instruction on 8 lines
+    ;
+    XSPIx->TCR = 0 << XSPI_TCR_DCYC_Pos; // 0 dummy cycles
+    if (len != 0) {
+        XSPIx->DLR = len - 1;
+    }
+    XSPIx->IR = cmd; // write opcode
+    if (addr_enabled) {
+        XSPIx->AR = addr; // address
+    }
+
+    // Write out the data one byte at a time
+    while (len--) {
+        while (!(XSPIx->SR & XSPI_SR_FTF)) {
+            if (XSPIx->SR & XSPI_SR_TEF) {
+                return -MP_EIO;
+            }
+        }
+        *(volatile uint8_t *)&XSPIx->DR = *src++;
+    }
+
+    // Wait for write to finish
+    while (!(XSPIx->SR & XSPI_SR_TCF)) {
+        if (XSPIx->SR & XSPI_SR_TEF) {
+            return -MP_EIO;
+        }
+    }
+
+    XSPIx->FCR = XSPI_FCR_CTCF; // clear TC flag
+
+    // Wait for peripheral to return to idle.
+    while (XSPIx->SR & XSPI_SR_BUSY) {
+    }
+
+    return 0;
+}
+
+static void xspi_memory_map_111(void) {
+    XSPIx->CCR =
+        1 << XSPI_CCR_DMODE_Pos // data on 1 line
+            | 3 << XSPI_CCR_ADSIZE_Pos // 32-bit address
+            | 1 << XSPI_CCR_ADMODE_Pos // address on 1 line
+            | 1 << XSPI_CCR_IMODE_Pos // instruction on 1 line
+    ;
+
+    XSPIx->TCR = 0 << XSPI_TCR_DCYC_Pos; // no dummy cycles
+    XSPIx->IR = 0x13; // READ4B
+    XSPIx->LPTR = 1024; // timeout period in number of CLK cycles
+
+    // Enable the XSPI peripheral in memory-mapped mode.
+    XSPIx->CR = (XSPIx->CR & ~XSPI_CR_FMODE_Msk) | 3 << XSPI_CR_FMODE_Pos;
+}
+
+static void xspi_memory_map_888(void) {
+    XSPIx->CCR =
+        1 << XSPI_CCR_DQSE_Pos // DQS enabled
+            | 1 << XSPI_CCR_DDTR_Pos // data DTR enabled
+            | 4 << XSPI_CCR_DMODE_Pos // data on 8 lines
+            | 3 << XSPI_CCR_ADSIZE_Pos // 32-bit address
+            | 1 << XSPI_CCR_ADDTR_Pos // address DTR enabled
+            | 4 << XSPI_CCR_ADMODE_Pos // address on 8 lines
+            | 1 << XSPI_CCR_ISIZE_Pos // 16-bit instruction
+            | 1 << XSPI_CCR_IDTR_Pos // instruction DTR enabled
+            | 4 << XSPI_CCR_IMODE_Pos // instruction on 8 lines
+    ;
+
+    XSPIx->TCR = 20 << XSPI_TCR_DCYC_Pos; // 20 dummy cycles for reading (minimum, flash may insert more by holding DQS low)
+    XSPIx->IR = 0xee11; // octal DTR read mode (8DTRD)
+    XSPIx->LPTR = 1024; // timeout period in number of CLK cycles
+
+    // Enable the XSPI peripheral in memory-mapped mode.
+    XSPIx->CR = (XSPIx->CR & ~XSPI_CR_FMODE_Msk) | 3 << XSPI_CR_FMODE_Pos;
+}
+
+static void xspi_memory_map_exit(void) {
+    // Abort any ongoing transfer if peripheral is busy.
+    if (XSPIx->SR & XSPI_SR_BUSY) {
+        XSPIx->CR |= XSPI_CR_ABORT;
+        while (!(XSPIx->SR & XSPI_SR_TCF)) {
+        }
+        XSPIx->FCR = XSPI_FCR_CTCF; // clear TC flag
+        while (XSPIx->SR & XSPI_SR_BUSY) {
+        }
+    }
+    XSPIx->CR = (XSPIx->CR & ~XSPI_CR_FMODE_Msk) | 0 << XSPI_CR_FMODE_Pos; // indirect write mode
+}
+
+void xspi_switch_to_dtr(void) {
+    uint8_t buf[4];
+
+    // WREN.
+    xspi_write_111_ext(0x06, false, 0, 0, NULL);
+
+    // Wait WEL=1, with small timeout.
+    for (unsigned int i = 0; i < 100; ++i) {
+        xspi_read_111_ext(0x05, false, 0, 1, buf);
+        if (buf[0] & 2) {
+            break;
+        }
+    }
+
+    // Switch to DOPI DTR mode.
+    buf[0] = 2;
+    xspi_write_111_ext(0x72, true, 0x00000000, 1, buf);
+
+    xspi_dtr_enabled = true;
+}
+
+void xspi_switch_to_spi(void) {
+    uint8_t buf[4];
+
+    // WREN.
+    xspi_write_888_dtr_ext(0x06f9, false, 0, 0, NULL);
+
+    // Wait WEL=1, with small timeout.
+    for (unsigned int i = 0; i < 100; ++i) {
+        xspi_read_111_ext(0x05, false, 0, 1, buf);
+        if (buf[0] & 2) {
+            break;
+        }
+    }
+
+    // Switch to SPI mode.
+    buf[0] = 0;
+    buf[1] = 0;
+    xspi_write_888_dtr_ext(0x728d, true, 0x00000000, 2, buf);
+
+    xspi_dtr_enabled = false;
+}
+
+static int xspi_ioctl(void *self_in, uint32_t cmd, uintptr_t arg) {
+    xspi_flash_t *self = self_in;
+    switch (cmd) {
+        case MP_QSPI_IOCTL_INIT:
+            // XSPI must be manually initialise by calling `xspi_init()` at boot.
+            // Here, just determine if it's in SPI or DTR mode.
+            xspi_dtr_enabled = XSPIx->IR == 0xee11;
+            break;
+        case MP_QSPI_IOCTL_BUS_ACQUIRE:
+            xspi_memory_map_exit();
+            break;
+        case MP_QSPI_IOCTL_BUS_RELEASE:
+            if (xspi_dtr_enabled) {
+                xspi_memory_map_888();
+            } else {
+                xspi_memory_map_111();
+            }
+            break;
+        case MP_QSPI_IOCTL_MEMORY_MODIFIED: {
+            uintptr_t *addr_len = (uintptr_t *)arg;
+            volatile void *addr = (volatile void *)(self->xip_base + addr_len[0]);
+            size_t len = addr_len[1];
+            SCB_InvalidateICache_by_Addr(addr, len);
+            SCB_InvalidateDCache_by_Addr(addr, len);
+            break;
+        }
+    }
+    return 0; // success
+}
+
+// These commands may be passed to this function.
+#define CMD_WREN        (0x06)
+#define CMD_RSTEN       (0x66)
+#define CMD_RESET       (0x99)
+#define CMD_SLEEP       (0xb9)
+#define CMD_AWAKE       (0xab)
+static int xspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
+    if (xspi_dtr_enabled) {
+        uint16_t cmd16 = 0;
+        if (cmd == CMD_WREN) {
+            cmd16 = 0x06f9;
+        } else if (cmd == CMD_SLEEP) {
+            cmd16 = 0xb946;
+        } else if (cmd == CMD_AWAKE) {
+            cmd16 = 0xab54;
+        }
+        return xspi_write_888_dtr_ext(cmd16, false, 0, len, (const uint8_t *)&data);
+    }
+    return xspi_write_111_ext(cmd, false, 0, len, (const uint8_t *)&data);
+}
+
+// These commands may be passed to this function.
+#define CMD_WRITE       (0x02)
+#define CMD_WRITE_32    (0x12)
+#define CMD_SEC_ERASE   (0x20)
+#define CMD_SEC_ERASE_32 (0x21)
+static int xspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
+    // Convert 24-bit address commands to 32-bit address commands.
+    if (cmd == CMD_WRITE) {
+        cmd = CMD_WRITE_32;
+    } else if (cmd == CMD_SEC_ERASE) {
+        cmd = CMD_SEC_ERASE_32;
+    }
+    if (xspi_dtr_enabled) {
+        uint16_t cmd16 = 0;
+        if (cmd == CMD_WRITE_32) {
+            cmd16 = 0x12ed;
+        } else if (cmd == CMD_SEC_ERASE_32) {
+            cmd16 = 0x21de;
+        }
+        return xspi_write_888_dtr_ext(cmd16, true, addr, len, src);
+    }
+    return xspi_write_111_ext(cmd, true, addr, len, src);
+}
+
+// These commands may be passed to this function.
+#define CMD_RDSR        (0x05)
+#define CMD_RD_DEVID    (0x9f)
+static int xspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
+    (void)self_in;
+    if (xspi_dtr_enabled) {
+        uint16_t cmd16 = 0;
+        uint32_t num_dummy = 0;
+        if (cmd == CMD_RDSR) {
+            cmd16 = 0x05fa;
+            num_dummy = 4;
+            len = 2;
+        } else if (cmd == CMD_RD_DEVID) {
+            // TODO this doesn't really work, because result is in STR format.
+            cmd16 = 0x9f60;
+            num_dummy = 4;
+        }
+        return xspi_read_888_dtr_ext(cmd16, true, 0, num_dummy, len, (uint8_t *)dest);
+    }
+    return xspi_read_111_ext(cmd, false, 0, len, (uint8_t *)dest);
+}
+
+static int xspi_direct_read(void *self_in, uint32_t addr, size_t len, uint8_t *dest) {
+    xspi_flash_t *self = self_in;
+    memcpy(dest, (const void *)(self->xip_base + addr), len);
+    return 0;
+}
+
+const mp_qspi_proto_t xspi_proto = {
+    .ioctl = xspi_ioctl,
+    .write_cmd_data = xspi_write_cmd_data,
+    .write_cmd_addr_data = xspi_write_cmd_addr_data,
+    .read_cmd = xspi_read_cmd,
+    .read_cmd_qaddr_qdata = NULL, // unused because .direct_read is set below, and caching is disabled
+    .direct_read = xspi_direct_read,
+};
+
+#endif // defined(MICROPY_HW_XSPIFLASH_SIZE_BITS_LOG2)
diff --git a/ports/stm32/xspi.h b/ports/stm32/xspi.h
new file mode 100644
index 0000000000000..cd216629667ee
--- /dev/null
+++ b/ports/stm32/xspi.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 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_XSPI_H
+#define MICROPY_INCLUDED_STM32_XSPI_H
+
+#include "drivers/bus/qspi.h"
+
+typedef struct _xspi_flash_t xspi_flash_t;
+
+extern const mp_qspi_proto_t xspi_proto;
+extern const xspi_flash_t xspi_flash1;
+extern const xspi_flash_t xspi_flash2;
+
+void xspi_init(void);
+uint32_t xspi_get_xip_base(const xspi_flash_t *self);
+bool xspi_is_valid_addr(const xspi_flash_t *self, uint32_t addr);
+void xspi_switch_to_spi(void);
+void xspi_switch_to_dtr(void);
+
+#endif // MICROPY_INCLUDED_STM32_XSPI_H

From eaed2518fab968362d15745c4f1f3d39bd60ad38 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 12 Sep 2024 09:34:01 +0200
Subject: [PATCH 2480/3129] stm32/main: Disable D-cache when debugging N6.

See ST Errata ES0620 - Rev 0.2 section 2.1.2.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index aea1953fd65fa..137e132817483 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -374,7 +374,11 @@ void stm32_main(uint32_t reset_mode) {
     #endif
 
     SCB_EnableICache();
+    #if defined(STM32N6) && !defined(NDEBUG)
+    // Don't enable D-cache on N6 when debugging; see ST Errata ES0620 - Rev 0.2 section 2.1.2.
+    #else
     SCB_EnableDCache();
+    #endif
 
     #elif defined(STM32H5)
 

From 959e910366d0109f959a1ecbb91d5fbd92b9be2f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Jun 2025 13:31:40 +1000
Subject: [PATCH 2481/3129] stm32/lwip_inc: Increase lwIP memory on N6.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/lwip_inc/lwipopts.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/stm32/lwip_inc/lwipopts.h b/ports/stm32/lwip_inc/lwipopts.h
index 9e2402c8dc5dc..ad1143845f793 100644
--- a/ports/stm32/lwip_inc/lwipopts.h
+++ b/ports/stm32/lwip_inc/lwipopts.h
@@ -10,6 +10,15 @@
 
 #define LWIP_RAND() rng_get()
 
+// Increase memory for lwIP to get better performance.
+#if defined(STM32N6)
+#define MEM_SIZE                        (16 * 1024)
+#define TCP_MSS                         (1460)
+#define TCP_WND                         (8 * TCP_MSS)
+#define TCP_SND_BUF                     (8 * TCP_MSS)
+#define MEMP_NUM_TCP_SEG                (32)
+#endif
+
 // Include common lwIP configuration.
 #include "extmod/lwip-include/lwipopts_common.h"
 

From 96b8f3aebcc7abc67f15c912286d0cba64589de1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 Jun 2024 17:46:41 +1000
Subject: [PATCH 2482/3129] stm32/boards: Add board support files for N6.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32n657_af.csv          |  42 ++++
 ports/stm32/boards/stm32n657x0.ld            |  34 +++
 ports/stm32/boards/stm32n6xx_hal_conf_base.h | 215 +++++++++++++++++++
 3 files changed, 291 insertions(+)
 create mode 100644 ports/stm32/boards/stm32n657_af.csv
 create mode 100644 ports/stm32/boards/stm32n657x0.ld
 create mode 100644 ports/stm32/boards/stm32n6xx_hal_conf_base.h

diff --git a/ports/stm32/boards/stm32n657_af.csv b/ports/stm32/boards/stm32n657_af.csv
new file mode 100644
index 0000000000000..35e305a37676f
--- /dev/null
+++ b/ports/stm32/boards/stm32n657_af.csv
@@ -0,0 +1,42 @@
+Port ,Pin ,AF0          ,AF1                ,AF2                           ,AF3                                 ,AF4                                                ,AF5                                                   ,AF6                                                     ,AF7                                                          ,AF8                               ,AF9                                                                  ,AF10                                         ,AF11                                                   ,AF12                                                        ,AF13                                            ,AF14                   ,AF15    ,ADC
+     ,    ,SYS          ,LPTIM1/TIM1/2/16/17,LPTIM3/PDM_SAI1/TIM3/4/5/12/15,I3C1/LPTIM2/3/LPUART1/OCTOSPI/TIM1/8,CEC/DCMI/I2C1/2/3/4/LPTIM1/2/SPI1/I2S1/TIM15/USART1,CEC/I3C1/LPTIM1/SPI1/I2S1/SPI2/I2S2/SPI3/I2S3/SPI4/5/6,I2C4/OCTOSPI/SAI1/SPI3/I2S3/SPI4/UART4/12/USART10/USB_PD,SDMMC1/SPI2/I2S2/SPI3/I2S3/SPI6/UART7/8/12/USART1/2/3/6/10/11,LPUART1/SAI2/SDMMC1/SPI6/UART4/5/8,FDCAN1/2/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/OCTOSPI/SDMMC2/TIM13/14,CRS/FMC[NAND16]/OCTOSPI/SAI2/SDMMC2/TIM8/USB_,ETH[MII/RMII]/FMC[NAND16]/OCTOSPI/SDMMC2/UART7/9/USB_PD,FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/FMC[SDRAM_16bit]/SDMMC1,DCMI/FMC[NAND16]/FMC[NORmux]/FMC[NOR_RAM]/LPTIM5,LPTIM3/4/5/6/TIM2/UART5,SYS     ,ADC
+PortA,PA0 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_CMD                                             ,                                                            ,                                                ,                       ,        ,ADC12_INP0/ADC12_INN1
+PortA,PA3 ,             ,                   ,                              ,                                    ,                                                   ,SPI5_NSS                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortA,PA5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC2_INP18
+PortA,PA8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP5
+PortA,PA9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP10
+PortA,PA10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP11/ADC12_INN10
+PortA,PA11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_RX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP12/ADC12_INN11
+PortA,PA12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_TX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP13/ADC12_INN12
+PortB,PB4 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D3                                              ,                                                            ,                                                ,                       ,        ,
+PortB,PB8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D0                                              ,                                                            ,                                                ,                       ,        ,
+PortB,PB9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D2                                              ,                                                            ,                                                ,                       ,        ,
+PortB,PB10,             ,TIM2_CH3           ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortB,PB11,             ,TIM2_CH4           ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortC,PC8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D0                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortC,PC9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D1                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortC,PC10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D2                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortC,PC11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D3                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortC,PC12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_CK                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD2 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_CK                                              ,                                                            ,                                                ,                       ,        ,
+PortD,PD5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD6 ,             ,                   ,                              ,                                    ,TIM15_CH2                                          ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD13,             ,                   ,TIM4_CH2                      ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART1_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE6 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART1_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE7 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART7_RX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART7_TX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE15,             ,                   ,                              ,                                    ,                                                   ,SPI5_SCK                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortF,PF3 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC1_INP16
+PortF,PF6 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG0 ,             ,                   ,TIM12_CH1                     ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG1 ,             ,                   ,                              ,                                    ,                                                   ,SPI5_MISO                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG2 ,             ,                   ,                              ,                                    ,                                                   ,SPI5_MOSI                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_CTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D1                                              ,                                                            ,                                                ,                       ,        ,
+PortG,PG12,             ,TIM17_CH1          ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG13,             ,                   ,TIM4_CH1                      ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP7/ADC12_INN3
+PortC,PH2 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_CMD                                   ,                                                       ,                                                            ,                                                ,                       ,        ,
diff --git a/ports/stm32/boards/stm32n657x0.ld b/ports/stm32/boards/stm32n657x0.ld
new file mode 100644
index 0000000000000..242d113b30925
--- /dev/null
+++ b/ports/stm32/boards/stm32n657x0.ld
@@ -0,0 +1,34 @@
+/*
+    GNU linker script for STM32N657x0
+
+    Note: upper 512k of SRAM2 is copied from external flash upon reset.
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLEXRAM_S (xrw)     : ORIGIN = 0x34000000, LENGTH = 80K
+    SRAM2_S_RAM (xrw)   : ORIGIN = 0x34100000, LENGTH = 512K /* only use first half, second half may contain firmware */
+    SRAM2_S_FSBL (xrw)  : ORIGIN = 0x34180400, LENGTH = 511K /* firmware loaded from SPI flash upon reset */
+    EXT_FLASH (rx)      : ORIGIN = 0x70080000, LENGTH = 1536K
+}
+
+REGION_ALIAS("IRAM", FLEXRAM_S);
+REGION_ALIAS("RAM", SRAM2_S_RAM);
+REGION_ALIAS("FLASH", SRAM2_S_FSBL);
+REGION_ALIAS("FLASH_APP", EXT_FLASH);
+
+/* 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/stm32n6xx_hal_conf_base.h b/ports/stm32/boards/stm32n6xx_hal_conf_base.h
new file mode 100644
index 0000000000000..641a003d8bf32
--- /dev/null
+++ b/ports/stm32/boards/stm32n6xx_hal_conf_base.h
@@ -0,0 +1,215 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 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_STM32N6XX_HAL_CONF_BASE_H
+#define MICROPY_INCLUDED_STM32N6XX_HAL_CONF_BASE_H
+
+// Enable various HAL modules
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_BSEC_MODULE_ENABLED
+#define HAL_CACHEAXI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+#define HAL_CSI_MODULE_ENABLED
+#define HAL_DCMI_MODULE_ENABLED
+#define HAL_DCMIPP_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_DMA2D_MODULE_ENABLED
+#define HAL_DTS_MODULE_ENABLED
+#define HAL_ETH_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_FDCAN_MODULE_ENABLED
+#define HAL_GFXMMU_MODULE_ENABLED
+#define HAL_GFXTIM_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_GPU2D_MODULE_ENABLED
+#define HAL_HASH_MODULE_ENABLED
+#define HAL_HCD_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_I3C_MODULE_ENABLED
+#define HAL_ICACHE_MODULE_ENABLED
+#define HAL_IRDA_MODULE_ENABLED
+#define HAL_IWDG_MODULE_ENABLED
+#define HAL_JPEG_MODULE_ENABLED
+#define HAL_LPTIM_MODULE_ENABLED
+#define HAL_LTDC_MODULE_ENABLED
+#define HAL_MCE_MODULE_ENABLED
+#define HAL_MDF_MODULE_ENABLED
+#define HAL_MDIOS_MODULE_ENABLED
+#define HAL_MMC_MODULE_ENABLED
+#define HAL_NAND_MODULE_ENABLED
+#define HAL_NOR_MODULE_ENABLED
+#define HAL_PCD_MODULE_ENABLED
+#define HAL_PKA_MODULE_ENABLED
+#define HAL_PSSI_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RAMCFG_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_RIF_MODULE_ENABLED
+#define HAL_RNG_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SAI_MODULE_ENABLED
+#define HAL_SD_MODULE_ENABLED
+#define HAL_SDRAM_MODULE_ENABLED
+#define HAL_SMARTCARD_MODULE_ENABLED
+#define HAL_SMBUS_MODULE_ENABLED
+#define HAL_SPDIFRX_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
+#define HAL_XSPI_MODULE_ENABLED
+
+// Oscillator values in Hz
+#define HSI_VALUE (64000000UL)
+#define LSI_VALUE (32000UL)
+#define MSI_VALUE (4000000UL)
+
+// SysTick has the highest priority
+#define TICK_INT_PRIORITY (0x00)
+
+// Miscellaneous HAL settings
+#define VDD_VALUE           3300UL
+#define USE_RTOS            0
+#define USE_SD_TRANSCEIVER  0
+#define USE_SPI_CRC         1
+
+// Disable dynamic callback registration
+#define  USE_HAL_ADC_REGISTER_CALLBACKS       0U /* ADC register callback disabled       */
+#define  USE_HAL_CACHEAXI_REGISTER_CALLBACKS  0U /* CACHEAXI register callback disabled  */
+#define  USE_HAL_CRYP_REGISTER_CALLBACKS      0U /* CRYP register callback disabled      */
+#define  USE_HAL_DCMI_REGISTER_CALLBACKS      0U /* DCMI register callback disabled      */
+#define  USE_HAL_DCMIPP_REGISTER_CALLBACKS    0U /* DCMIPP register callback disabled    */
+#define  USE_HAL_DMA2D_REGISTER_CALLBACKS     0U /* DMA2D register callback disabled     */
+#define  USE_HAL_DTS_REGISTER_CALLBACKS       0U /* DTS register callback disabled       */
+#define  USE_HAL_ETH_REGISTER_CALLBACKS       0U /* ETH register callback disabled       */
+#define  USE_HAL_FDCAN_REGISTER_CALLBACKS     0U /* FDCAN register callback disabled     */
+#define  USE_HAL_GFXMMU_REGISTER_CALLBACKS    0U /* GFXMMU register callback disabled    */
+#define  USE_HAL_GFXTIM_REGISTER_CALLBACKS    0U /* GFXTIM register callback disabled    */
+#define  USE_HAL_HASH_REGISTER_CALLBACKS      0U /* HASH register callback disabled      */
+#define  USE_HAL_HCD_REGISTER_CALLBACKS       0U /* HCD register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS       0U /* I2C register callback disabled       */
+#define  USE_HAL_I3C_REGISTER_CALLBACKS       0U /* I3C register callback disabled       */
+#define  USE_HAL_IWDG_REGISTER_CALLBACKS      0U /* IWDG register callback disabled      */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS      0U /* IRDA register callback disabled      */
+#define  USE_HAL_LPTIM_REGISTER_CALLBACKS     0U /* LPTIM register callback disabled     */
+#define  USE_HAL_LTDC_REGISTER_CALLBACKS      0U /* LTDC register callback disabled      */
+#define  USE_HAL_MCE_REGISTER_CALLBACKS       0U /* MCE register callback disabled       */
+#define  USE_HAL_MDF_REGISTER_CALLBACKS       0U /* MDF register callback disabled       */
+#define  USE_HAL_MMC_REGISTER_CALLBACKS       0U /* MMC register callback disabled       */
+#define  USE_HAL_NAND_REGISTER_CALLBACKS      0U /* NAND register callback disabled      */
+#define  USE_HAL_NOR_REGISTER_CALLBACKS       0U /* NOR register callback disabled       */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS       0U /* PCD register callback disabled       */
+#define  USE_HAL_PKA_REGISTER_CALLBACKS       0U /* PKA register callback disabled       */
+#define  USE_HAL_PSSI_REGISTER_CALLBACKS      0U /* PSSI register callback disabled      */
+#define  USE_HAL_RAMCFG_REGISTER_CALLBACKS    0U /* RAMCFG register callback disabled    */
+#define  USE_HAL_RNG_REGISTER_CALLBACKS       0U /* RNG register callback disabled       */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS       0U /* RTC register callback disabled       */
+#define  USE_HAL_SAI_REGISTER_CALLBACKS       0U /* SAI register callback disabled       */
+#define  USE_HAL_SD_REGISTER_CALLBACKS        0U /* SD register callback disabled        */
+#define  USE_HAL_SDRAM_REGISTER_CALLBACKS     0U /* SDRAM register callback disabled     */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_SMBUS_REGISTER_CALLBACKS     0U /* SMBUS register callback disabled     */
+#define  USE_HAL_SPDIFRX_REGISTER_CALLBACKS   0U /* SPDIFRX register callback disabled   */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS       0U /* SPI register callback disabled       */
+#define  USE_HAL_SRAM_REGISTER_CALLBACKS      0U /* SRAM register callback disabled      */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS       0U /* TIM register callback disabled       */
+#define  USE_HAL_UART_REGISTER_CALLBACKS      0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS     0U /* USART register callback disabled     */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS      0U /* WWDG register callback disabled      */
+#define  USE_HAL_XSPI_REGISTER_CALLBACKS      0U /* XSPI register callback disabled      */
+
+// Include various HAL modules for convenience
+#include "stm32n6xx_hal_rcc.h"
+#include "stm32n6xx_hal_gpio.h"
+#include "stm32n6xx_hal_rif.h"
+#include "stm32n6xx_hal_dma.h"
+#include "stm32n6xx_hal_cacheaxi.h"
+#include "stm32n6xx_hal_cortex.h"
+#include "stm32n6xx_hal_adc.h"
+#include "stm32n6xx_hal_bsec.h"
+#include "stm32n6xx_hal_crc.h"
+#include "stm32n6xx_hal_cryp.h"
+#include "stm32n6xx_hal_dcmi.h"
+#include "stm32n6xx_hal_dcmipp.h"
+#include "stm32n6xx_hal_dma2d.h"
+#include "stm32n6xx_hal_dts.h"
+#include "stm32n6xx_hal_eth.h"
+#include "stm32n6xx_hal_exti.h"
+#include "stm32n6xx_hal_fdcan.h"
+#include "stm32n6xx_hal_gfxmmu.h"
+#include "stm32n6xx_hal_gfxtim.h"
+#include "stm32n6xx_hal_gpio.h"
+#include "stm32n6xx_hal_gpu2d.h"
+#include "stm32n6xx_hal_hash.h"
+#include "stm32n6xx_hal_hcd.h"
+#include "stm32n6xx_hal_i2c.h"
+#include "stm32n6xx_hal_i3c.h"
+#include "stm32n6xx_hal_icache.h"
+#include "stm32n6xx_hal_irda.h"
+#include "stm32n6xx_hal_iwdg.h"
+#include "stm32n6xx_hal_jpeg.h"
+#include "stm32n6xx_hal_lptim.h"
+#include "stm32n6xx_hal_ltdc.h"
+#include "stm32n6xx_hal_mce.h"
+#include "stm32n6xx_hal_mdf.h"
+#include "stm32n6xx_hal_mdios.h"
+#include "stm32n6xx_hal_mmc.h"
+#include "stm32n6xx_hal_nand.h"
+#include "stm32n6xx_hal_nor.h"
+#include "stm32n6xx_hal_nand.h"
+#include "stm32n6xx_hal_pcd.h"
+#include "stm32n6xx_hal_pka.h"
+#include "stm32n6xx_hal_pssi.h"
+#include "stm32n6xx_hal_pwr.h"
+#include "stm32n6xx_hal_ramcfg.h"
+#include "stm32n6xx_hal_rng.h"
+#include "stm32n6xx_hal_rtc.h"
+#include "stm32n6xx_hal_sai.h"
+#include "stm32n6xx_hal_sd.h"
+#include "stm32n6xx_hal_sdram.h"
+#include "stm32n6xx_hal_smartcard.h"
+#include "stm32n6xx_hal_smbus.h"
+#include "stm32n6xx_hal_spdifrx.h"
+#include "stm32n6xx_hal_spi.h"
+#include "stm32n6xx_hal_sram.h"
+#include "stm32n6xx_hal_tim.h"
+#include "stm32n6xx_hal_uart.h"
+#include "stm32n6xx_hal_usart.h"
+#include "stm32n6xx_hal_wwdg.h"
+#include "stm32n6xx_hal_xspi.h"
+#include "stm32n6xx_ll_lpuart.h"
+#include "stm32n6xx_ll_pwr.h"
+#include "stm32n6xx_ll_rtc.h"
+#include "stm32n6xx_ll_usart.h"
+
+// HAL parameter assertions are disabled
+#define assert_param(expr) ((void)0)
+
+#endif // MICROPY_INCLUDED_STM32N6XX_HAL_CONF_BASE_H

From acb294f61af3bd214cc95a4881722754624b912d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Sep 2024 00:02:18 +1000
Subject: [PATCH 2483/3129] stm32/mboot: Add support for STM32N6xx MCUs.

Works in the usual USB DFU mode, and can program external SPI flash.  It
will enable XSPI memory-mapped mode before jumping to the application
firmware in the external SPI flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile           | 40 +++++++++++++++++++++++-----
 ports/stm32/mboot/adc.c              |  2 ++
 ports/stm32/mboot/main.c             | 37 ++++++++++++++++++++++---
 ports/stm32/mboot/mphalport.h        | 17 ++++++++++++
 ports/stm32/mboot/stm32_memory_n6.ld | 18 +++++++++++++
 ports/stm32/mboot/stm32_sections.ld  |  8 ++++++
 6 files changed, 112 insertions(+), 10 deletions(-)
 create mode 100644 ports/stm32/mboot/stm32_memory_n6.ld

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 87bced1aee7ce..7c0bde81fdd4b 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -34,7 +34,13 @@ include ../../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
 # A board can set MBOOT_TEXT0_ADDR to a custom location where mboot should reside.
+ifeq ($(MCU_SERIES),n6)
+MBOOT_TEXT0_ADDR ?= 0x34180400
+MBOOT_LD_FILES ?= stm32_memory_n6.ld stm32_sections.ld
+else
 MBOOT_TEXT0_ADDR ?= 0x08000000
+MBOOT_LD_FILES ?= stm32_memory.ld stm32_sections.ld
+endif
 
 # The string in MBOOT_VERSION (default defined in version.c if not defined by a
 # board) will be stored in the final MBOOT_VERSION_ALLOCATED_BYTES bytes of mboot flash.
@@ -89,7 +95,6 @@ CFLAGS += -DMBOOT_VERSION=\"$(MBOOT_VERSION)\"
 endif
 CFLAGS += -DMBOOT_VERSION_ALLOCATED_BYTES=$(MBOOT_VERSION_ALLOCATED_BYTES) -DMBOOT_VERSION_INCLUDE_OPTIONS=$(MBOOT_VERSION_INCLUDE_OPTIONS)
 
-MBOOT_LD_FILES ?= stm32_memory.ld stm32_sections.ld
 LDFLAGS += -nostdlib -L . $(addprefix -T,$(MBOOT_LD_FILES)) -Map=$(@:.elf=.map) --cref
 LDFLAGS += --defsym mboot_version_len=$(MBOOT_VERSION_ALLOCATED_BYTES)
 LIBS += $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
@@ -137,12 +142,11 @@ SRC_C += \
 	drivers/bus/softqspi.c \
 	drivers/memory/spiflash.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 \
+	ports/stm32/xspi.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
 SRC_O += \
@@ -169,16 +173,22 @@ SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal.c \
 	hal_cortex.c \
 	hal_dma.c \
-	hal_flash.c \
-	hal_flash_ex.c \
 	hal_pcd.c \
 	hal_pcd_ex.c \
 	hal_pwr_ex.c \
 	hal_rcc.c \
 	hal_rcc_ex.c \
+	ll_rcc.c \
 	ll_usb.c \
 	)
 
+ifneq ($(MCU_SERIES),n6)
+SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_flash.c \
+	hal_flash_ex.c \
+	)
+endif
+
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7))
 SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_mmc.c \
@@ -187,6 +197,12 @@ SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
+ifeq ($(MCU_SERIES),n6)
+SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_bsec.c \
+	)
+endif
+
 SRC_USBDEV += $(addprefix ports/stm32/$(USBDEV_DIR)/,\
 	core/src/usbd_core.c \
 	core/src/usbd_ctlreq.c \
@@ -206,7 +222,7 @@ $(TOP)/lib/stm32lib/README.md:
 	$(ECHO) "stm32lib submodule not found, fetching it now..."
 	(cd $(TOP) && git submodule update --init lib/stm32lib)
 
-.PHONY: deploy deploy-stlink
+.PHONY: deploy deploy-stlink deploy-trusted
 
 deploy: $(BUILD)/firmware.dfu
 	$(ECHO) "Writing $< to the board"
@@ -216,9 +232,15 @@ deploy-stlink: $(BUILD)/firmware.dfu
 	$(ECHO) "Writing $< to the board via ST-LINK"
 	$(Q)$(STFLASH) write $(BUILD)/firmware.bin $(MBOOT_TEXT0_ADDR)
 
-$(BUILD)/firmware.dfu: $(BUILD)/firmware.elf
+deploy-trusted: $(BUILD)/firmware-trusted.bin
+	$(STM32_CUBE_PROGRAMMER)/bin/STM32_Programmer.sh -c port=SWD mode=HOTPLUG ap=1 -el $(DKEL) -w $^ 0x70000000 -hardRst
+
+$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
 	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data -j .mboot_version_text $^ $(BUILD)/firmware.bin
+
+$(BUILD)/firmware.dfu: $(BUILD)/firmware.bin
+	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(DFU) -b $(MBOOT_TEXT0_ADDR):$(BUILD)/firmware.bin $@
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
@@ -230,6 +252,10 @@ $(BUILD)/firmware.elf: $(OBJ)
 	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 	$(Q)$(SIZE) $@
 
+$(BUILD)/firmware-trusted.bin: $(BUILD)/firmware.bin
+	/bin/rm -f $@
+	$(STM32_CUBE_PROGRAMMER)/bin/STM32_SigningTool_CLI -bin $^ -nk -of 0x80000000 -t fsbl -o $@ -hv $(STM32_N6_HEADER_VERSION)
+
 #########################################
 # Rules to generate header files
 
diff --git a/ports/stm32/mboot/adc.c b/ports/stm32/mboot/adc.c
index c7b9749244d49..06db0b59b735f 100644
--- a/ports/stm32/mboot/adc.c
+++ b/ports/stm32/mboot/adc.c
@@ -1,3 +1,5 @@
 // Include the main ADC driver, so mboot can use adc_config() and adc_config_and_read_u16().
 #include "py/obj.h"
+#if MICROPY_PY_MACHINE_ADC
 #include "../machine_adc.c"
+#endif
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index ff44dac630aae..2be8793351e86 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -41,6 +41,7 @@
 #include "sdcard.h"
 #include "dfu.h"
 #include "pack.h"
+#include "xspi.h"
 
 // Whether the bootloader will leave via reset, or direct jump to the application.
 #ifndef MBOOT_LEAVE_BOOTLOADER_VIA_RESET
@@ -373,7 +374,7 @@ void SystemClock_Config(void) {
 #elif defined(STM32G0)
 #define AHBxENR IOPENR
 #define AHBxENR_GPIOAEN_Pos RCC_IOPENR_GPIOAEN_Pos
-#elif defined(STM32H7)
+#elif defined(STM32H7) || defined(STM32N6)
 #define AHBxENR AHB4ENR
 #define AHBxENR_GPIOAEN_Pos RCC_AHB4ENR_GPIOAEN_Pos
 #elif defined(STM32H5) || defined(STM32WB)
@@ -424,6 +425,10 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 #define MBOOT_SPIFLASH2_LAYOUT ""
 #endif
 
+#if defined(STM32N6)
+#define FLASH_LAYOUT_STR "@Internal Flash  " MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#else
+
 #if defined(STM32F4) \
     || defined(STM32F722xx) \
     || defined(STM32F723xx) \
@@ -584,12 +589,18 @@ static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
     return 0;
 }
 
+#endif
+
 /******************************************************************************/
 // Writable address space interface
 
 static int do_mass_erase(void) {
+    #if defined(STM32N6)
+    return -1;
+    #else
     // TODO spiflash erase ?
     return mboot_flash_mass_erase();
+    #endif
 }
 
 #if defined(MBOOT_SPIFLASH_ADDR) || defined(MBOOT_SPIFLASH2_ADDR)
@@ -625,7 +636,12 @@ int hw_page_erase(uint32_t addr, uint32_t *next_addr) {
     } else
     #endif
     {
+        #if defined(STM32N6)
+        dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
+        dfu_context.error = MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
+        #else
         ret = mboot_flash_page_erase(addr, next_addr);
+        #endif
     }
 
     mboot_state_change(MBOOT_STATE_ERASE_END, ret);
@@ -678,9 +694,12 @@ int hw_write(uint32_t addr, const uint8_t *src8, size_t len) {
         ret = mp_spiflash_write(MBOOT_SPIFLASH2_SPIFLASH, addr - MBOOT_SPIFLASH2_ADDR, len, src8);
     } else
     #endif
+    #if !defined(STM32N6)
     if (flash_is_valid_addr(addr)) {
         ret = mboot_flash_write(addr, src8, len);
-    } else {
+    } else
+    #endif
+    {
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
     }
@@ -1509,7 +1528,7 @@ void stm32_main(uint32_t initial_r0) {
     // Make sure IRQ vector table points to flash where this bootloader lives.
     SCB->VTOR = MBOOT_VTOR;
 
-    #if __CORTEX_M != 33
+    #if __CORTEX_M != 33 && __CORTEX_M != 55
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
     #endif
@@ -1539,6 +1558,12 @@ void stm32_main(uint32_t initial_r0) {
     SCB_EnableDCache();
     #endif
 
+    #if defined(STM32N6)
+    LL_PWR_EnableBkUpAccess();
+    initial_r0 = TAMP_S->BKP31R;
+    TAMP_S->BKP31R = 0;
+    #endif
+
     MBOOT_BOARD_EARLY_INIT(&initial_r0);
 
     #ifdef MBOOT_BOOTPIN_PIN
@@ -1748,6 +1773,12 @@ void USB_DRD_FS_IRQHandler(void) {
     HAL_PCD_IRQHandler(&pcd_fs_handle);
 }
 
+#elif defined(STM32N6)
+
+void USB1_OTG_HS_IRQHandler(void) {
+    HAL_PCD_IRQHandler(&pcd_hs_handle);
+}
+
 #elif defined(STM32WB)
 
 void USB_LP_IRQHandler(void) {
diff --git a/ports/stm32/mboot/mphalport.h b/ports/stm32/mboot/mphalport.h
index 45bf11d42b73d..9cac0f70c49a9 100644
--- a/ports/stm32/mboot/mphalport.h
+++ b/ports/stm32/mboot/mphalport.h
@@ -239,3 +239,20 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_J13 (GPIOJ_BASE | 13)
 #define pin_J14 (GPIOJ_BASE | 14)
 #define pin_J15 (GPIOJ_BASE | 15)
+
+#define pin_N0  (GPION_BASE | 0)
+#define pin_N1  (GPION_BASE | 1)
+#define pin_N2  (GPION_BASE | 2)
+#define pin_N3  (GPION_BASE | 3)
+#define pin_N4  (GPION_BASE | 4)
+#define pin_N5  (GPION_BASE | 5)
+#define pin_N6  (GPION_BASE | 6)
+#define pin_N7  (GPION_BASE | 7)
+#define pin_N8  (GPION_BASE | 8)
+#define pin_N9  (GPION_BASE | 9)
+#define pin_N10 (GPION_BASE | 10)
+#define pin_N11 (GPION_BASE | 11)
+#define pin_N12 (GPION_BASE | 12)
+#define pin_N13 (GPION_BASE | 13)
+#define pin_N14 (GPION_BASE | 14)
+#define pin_N15 (GPION_BASE | 15)
diff --git a/ports/stm32/mboot/stm32_memory_n6.ld b/ports/stm32/mboot/stm32_memory_n6.ld
new file mode 100644
index 0000000000000..bd2471dbfad4d
--- /dev/null
+++ b/ports/stm32/mboot/stm32_memory_n6.ld
@@ -0,0 +1,18 @@
+/*
+    Linker script fragment for mboot on an STM32N6xx MCU.
+    This defines the memory sections for the bootloader to use.
+
+    On N6, the hardware bootloader loads the first 512k of external flash into
+    the upper part of SRAM2 AXI S, starting at 0x34180000.  The first 1024 bytes
+    is a header. Then comes the actual code, starting with the vector table.
+*/
+
+MEMORY
+{
+    FLASH_BL (rx)   : ORIGIN = 0x34180400, LENGTH = 31744   /* AXISRAM2_S */
+    RAM (xrw)       : ORIGIN = 0x341e0000, LENGTH = 128K    /* AXISRAM2_S */
+}
+
+/* Location of protected flash area which must not be modified, because mboot lives there. */
+_mboot_protected_flash_start = ORIGIN(FLASH_BL);
+_mboot_protected_flash_end_exclusive = ORIGIN(FLASH_BL) + LENGTH(FLASH_BL);
diff --git a/ports/stm32/mboot/stm32_sections.ld b/ports/stm32/mboot/stm32_sections.ld
index 43511f083971d..4a6fd44b2b73f 100644
--- a/ports/stm32/mboot/stm32_sections.ld
+++ b/ports/stm32/mboot/stm32_sections.ld
@@ -33,6 +33,14 @@ SECTIONS
         _etext = .;
     } >FLASH_BL
 
+    /* Secure Gateway stubs */
+    .gnu.sgstubs :
+    {
+        . = ALIGN(4);
+        *(.gnu.sgstubs*)
+        . = ALIGN(4);
+    } >FLASH_BL
+
     /* used by the startup to initialize data */
     _sidata = LOADADDR(.data);
 

From 7016900fbe6d691129dd03f87ede3a9a7bde5236 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Jul 2025 15:03:04 +1000
Subject: [PATCH 2484/3129] stm32/spi: Fail spi_init if pins can't be
 configured.

Follows the UART and I2C drivers.

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

diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 19f2b65ed288e..248075579a87f 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -481,7 +481,10 @@ int spi_init(const spi_t *self, bool enable_nss_pin) {
         if (pins[i] == NULL) {
             continue;
         }
-        mp_hal_pin_config_alt(pins[i], mode, pull, AF_FN_SPI, (self - &spi_obj[0]) + 1);
+        if (!mp_hal_pin_config_alt(pins[i], mode, pull, AF_FN_SPI, (self - &spi_obj[0]) + 1)) {
+            // Pin does not have SPI alternate function.
+            return -MP_EINVAL;
+        }
     }
 
     // init the SPI device

From 3189e49d2824260ca786a93301a237d78eed092e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Sep 2024 00:00:29 +1000
Subject: [PATCH 2485/3129] stm32/boards/OPENMV_N6: Add new board definition
 files.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/OPENMV_N6/bdev.c           |  41 +++++
 ports/stm32/boards/OPENMV_N6/board.c          | 131 ++++++++++++++
 ports/stm32/boards/OPENMV_N6/board.ld         |  39 ++++
 ports/stm32/boards/OPENMV_N6/manifest.py      |   3 +
 ports/stm32/boards/OPENMV_N6/mpconfigboard.h  | 167 ++++++++++++++++++
 ports/stm32/boards/OPENMV_N6/mpconfigboard.mk |  30 ++++
 .../boards/OPENMV_N6/partition_stm32n657xx.h  |   5 +
 ports/stm32/boards/OPENMV_N6/pins.csv         | 142 +++++++++++++++
 .../boards/OPENMV_N6/stm32n6xx_hal_conf.h     |  18 ++
 9 files changed, 576 insertions(+)
 create mode 100644 ports/stm32/boards/OPENMV_N6/bdev.c
 create mode 100644 ports/stm32/boards/OPENMV_N6/board.c
 create mode 100644 ports/stm32/boards/OPENMV_N6/board.ld
 create mode 100644 ports/stm32/boards/OPENMV_N6/manifest.py
 create mode 100644 ports/stm32/boards/OPENMV_N6/mpconfigboard.h
 create mode 100644 ports/stm32/boards/OPENMV_N6/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/OPENMV_N6/partition_stm32n657xx.h
 create mode 100644 ports/stm32/boards/OPENMV_N6/pins.csv
 create mode 100644 ports/stm32/boards/OPENMV_N6/stm32n6xx_hal_conf.h

diff --git a/ports/stm32/boards/OPENMV_N6/bdev.c b/ports/stm32/boards/OPENMV_N6/bdev.c
new file mode 100644
index 0000000000000..c6c918bd67cd9
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/bdev.c
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 "storage.h"
+#include "xspi.h"
+
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+#error "Cannot enable MICROPY_HW_SPIFLASH_ENABLE_CACHE"
+#endif
+
+// External SPI flash uses hardware XSPI interface.
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_QSPI,
+    .bus.u_qspi.data = (void *)&xspi_flash2,
+    .bus.u_qspi.proto = &xspi_proto,
+};
+
+spi_bdev_t spi_bdev;
diff --git a/ports/stm32/boards/OPENMV_N6/board.c b/ports/stm32/boards/OPENMV_N6/board.c
new file mode 100644
index 0000000000000..1f82d10bac233
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/board.c
@@ -0,0 +1,131 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 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 "boardctrl.h"
+#include "xspi.h"
+
+// Values for OTP fuses for VDDIO2/3, to select low voltage mode (<2.5V).
+// See RM0486, Section 5, Table 18.
+#define BSEC_HW_CONFIG_ID       (124U)
+#define BSEC_HWS_HSLV_VDDIO3    (1U << 15)
+#define BSEC_HWS_HSLV_VDDIO2    (1U << 16)
+
+#define OMV_BOOT_MAGIC_ADDR     (0x3401FFFCU)
+#define OMV_BOOT_MAGIC_VALUE    (0xB00710ADU)
+
+void mboot_board_early_init(void) {
+    // TODO: move some of the below code to a common location for all N6 boards?
+
+    // Enable PWR, BSEC and SYSCFG clocks.
+    LL_AHB4_GRP1_EnableClock(LL_AHB4_GRP1_PERIPH_PWR);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_BSEC);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_SYSCFG);
+
+    // Program high speed IO optimization fuses if they aren't already set.
+    uint32_t fuse;
+    BSEC_HandleTypeDef hbsec = { .Instance = BSEC };
+    const uint32_t mask = BSEC_HWS_HSLV_VDDIO2 | BSEC_HWS_HSLV_VDDIO3;
+    if (HAL_BSEC_OTP_Read(&hbsec, BSEC_HW_CONFIG_ID, &fuse) != HAL_OK) {
+        fuse = 0;
+    } else if ((fuse & mask) != mask) {
+        // Program the fuse, and read back the set value.
+        if (HAL_BSEC_OTP_Program(&hbsec, BSEC_HW_CONFIG_ID, fuse | mask, HAL_BSEC_NORMAL_PROG) != HAL_OK) {
+            fuse = 0;
+        } else if (HAL_BSEC_OTP_Read(&hbsec, BSEC_HW_CONFIG_ID, &fuse) != HAL_OK) {
+            fuse = 0;
+        }
+    }
+
+    // Enable Vdd ADC, needed for the ADC to work.
+    LL_PWR_EnableVddADC();
+
+    // Configure VDDIO2.  Only enable 1.8V mode if the fuse is set.
+    LL_PWR_EnableVddIO2();
+    if (fuse & BSEC_HWS_HSLV_VDDIO2) {
+        LL_PWR_SetVddIO2VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_1V8);
+    }
+    SYSCFG->VDDIO2CCCR |= SYSCFG_VDDIO2CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO3.  Only enable 1.8V mode if the fuse is set.
+    LL_PWR_EnableVddIO3();
+    if (fuse & BSEC_HWS_HSLV_VDDIO3) {
+        LL_PWR_SetVddIO3VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_1V8);
+    }
+    SYSCFG->VDDIO3CCCR |= SYSCFG_VDDIO3CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO4.
+    LL_PWR_EnableVddIO4();
+    LL_PWR_SetVddIO4VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_3V3);
+    SYSCFG->VDDIO4CCCR |= SYSCFG_VDDIO4CCCR_EN; // enable IO compensation
+
+    // Enable VDD for ADC and USB.
+    LL_PWR_EnableVddADC();
+    LL_PWR_EnableVddUSB();
+
+    // Enable XSPI in memory-mapped mode.
+    xspi_init();
+}
+
+void board_enter_bootloader(unsigned int n_args, const void *args) {
+    // Support both OpenMV bootloader and mboot.
+    *((uint32_t *)OMV_BOOT_MAGIC_ADDR) = OMV_BOOT_MAGIC_VALUE;
+    SCB_CleanDCache();
+    boardctrl_maybe_enter_mboot(n_args, args);
+}
+
+void board_early_init(void) {
+    // TODO: if (HAL_PWREx_ConfigSupply(PWR_EXTERNAL_SOURCE_SUPPLY ) != HAL_OK)
+
+    LL_PWR_EnableWakeUpPin(LL_PWR_WAKEUP_PIN3 | LL_PWR_WAKEUP_PIN2);
+    LL_PWR_SetWakeUpPinPolarityLow(LL_PWR_WAKEUP_PIN3 | LL_PWR_WAKEUP_PIN2);
+}
+
+void board_leave_standby(void) {
+    // TODO: move some of the below code to a common location for all N6 boards?
+
+    // Enable PWR, BSEC and SYSCFG clocks.
+    LL_AHB4_GRP1_EnableClock(LL_AHB4_GRP1_PERIPH_PWR);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_BSEC);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_SYSCFG);
+
+    // Configure VDDIO2 (1.8V mode selection is retained).
+    LL_PWR_EnableVddIO2();
+    SYSCFG->VDDIO2CCCR |= SYSCFG_VDDIO2CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO3 (1.8V mode selection is retained).
+    LL_PWR_EnableVddIO3();
+    SYSCFG->VDDIO3CCCR |= SYSCFG_VDDIO3CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO4.
+    LL_PWR_EnableVddIO4();
+    LL_PWR_SetVddIO4VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_3V3);
+    SYSCFG->VDDIO4CCCR |= SYSCFG_VDDIO4CCCR_EN; // enable IO compensation
+
+    // Enable VDD for ADC and USB.
+    LL_PWR_EnableVddADC();
+    LL_PWR_EnableVddUSB();
+}
diff --git a/ports/stm32/boards/OPENMV_N6/board.ld b/ports/stm32/boards/OPENMV_N6/board.ld
new file mode 100644
index 0000000000000..e9ded785f2d77
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/board.ld
@@ -0,0 +1,39 @@
+/*
+    Linker script for OPENMV_N6.
+
+    Note: upper 512k of SRAM2 is copied from external flash upon reset.
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLEXRAM_S (xrw)         : ORIGIN = 0x34000000, LENGTH = 80K
+    SRAM2_S_RAM (xrw)       : ORIGIN = 0x34100000, LENGTH = 1024K
+    SRAM2_S_FSBL (xrw)      : ORIGIN = 0x34180400, LENGTH = 511K /* mboot firmware, not needed after mboot exits */
+    EXT_FLASH (rx)          : ORIGIN = 0x70080000, LENGTH = 3584K
+    EXT_FLASH_FS (rx)       : ORIGIN = 0x70400000, LENGTH = 4M
+    EXT_FLASH_ROMFS (rx)    : ORIGIN = 0x70800000, LENGTH = 24M
+}
+
+REGION_ALIAS("IRAM", FLEXRAM_S);
+REGION_ALIAS("RAM", SRAM2_S_RAM);
+REGION_ALIAS("FLASH_APP", EXT_FLASH);
+
+/* 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;
+
+/* ROMFS location */
+_micropy_hw_romfs_part0_start = ORIGIN(EXT_FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(EXT_FLASH_ROMFS);
diff --git a/ports/stm32/boards/OPENMV_N6/manifest.py b/ports/stm32/boards/OPENMV_N6/manifest.py
new file mode 100644
index 0000000000000..62990220f3180
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
+require("aioble")
diff --git a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
new file mode 100644
index 0000000000000..ed7bb548a1d29
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
@@ -0,0 +1,167 @@
+#define MICROPY_HW_BOARD_NAME       "OpenMV N6"
+#define MICROPY_HW_MCU_NAME         "STM32N657X0"
+
+#define MICROPY_GC_STACK_ENTRY_TYPE uint32_t
+#define MICROPY_ALLOC_GC_STACK_SIZE (128)
+#define MICROPY_FATFS_EXFAT         (1)
+
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+#define MICROPY_HW_HAS_SWITCH       (0)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_SDCARD_MOUNT_AT_BOOT (0)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (0)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+#define MICROPY_PY_PYB_LEGACY       (0)
+
+#define MICROPY_BOARD_ENTER_BOOTLOADER board_enter_bootloader
+#define MICROPY_BOARD_EARLY_INIT    board_early_init
+#define MICROPY_BOARD_LEAVE_STANDBY board_leave_standby()
+
+// HSE is 48MHz, this gives a CPU frequency of 800MHz.
+#define MICROPY_HW_CLK_PLLM         (6)
+#define MICROPY_HW_CLK_PLLN         (100)
+#define MICROPY_HW_CLK_PLLP1        (1)
+#define MICROPY_HW_CLK_PLLP2        (1)
+#define MICROPY_HW_CLK_PLLFRAC      (0)
+
+// The LSE is a 32kHz crystal.
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (1)
+
+// External SPI flash.
+#define MICROPY_HW_XSPIFLASH_SIZE_BITS_LOG2 (28) // 256Mbit
+
+// ROMFS config
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_XSPI (1)
+#define MICROPY_HW_ROMFS_XSPI_SPIBDEV_OBJ (&spi_bdev)
+#define MICROPY_HW_ROMFS_ENABLE_PART0 (1)
+
+// SPI flash, block device config.
+#define MICROPY_HW_BDEV_SPIFLASH                (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED       (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG         (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES   (4 * 1024 * 1024)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES     (4 * 1024 * 1024)
+
+// UART buses
+#define MICROPY_HW_UART2_TX         (pyb_pin_BT_TXD)
+#define MICROPY_HW_UART2_RX         (pyb_pin_BT_RXD)
+#define MICROPY_HW_UART2_RTS        (pyb_pin_BT_RTS)
+#define MICROPY_HW_UART2_CTS        (pyb_pin_BT_CTS)
+#define MICROPY_HW_UART3_TX         (pyb_pin_UART3_TX)
+#define MICROPY_HW_UART3_RX         (pyb_pin_UART3_RX)
+#define MICROPY_HW_UART4_TX         (pyb_pin_UART4_TX)
+#define MICROPY_HW_UART4_RX         (pyb_pin_UART4_RX)
+#define MICROPY_HW_UART7_TX         (pyb_pin_UART7_TX)
+#define MICROPY_HW_UART7_RX         (pyb_pin_UART7_RX)
+
+// I2C buses
+#define MICROPY_HW_I2C2_SCL         (pyb_pin_I2C2_SCL)
+#define MICROPY_HW_I2C2_SDA         (pyb_pin_I2C2_SDA)
+#define MICROPY_HW_I2C4_SCL         (pyb_pin_I2C4_SCL)
+#define MICROPY_HW_I2C4_SDA         (pyb_pin_I2C4_SDA)
+
+// SPI buses
+#define MICROPY_HW_SPI2_NSS         (pyb_pin_SPI2_CS)
+#define MICROPY_HW_SPI2_SCK         (pyb_pin_SPI2_SCK)
+#define MICROPY_HW_SPI2_MISO        (pyb_pin_SPI2_MISO)
+#define MICROPY_HW_SPI2_MOSI        (pyb_pin_SPI2_MOSI)
+#define MICROPY_HW_SPI4_NSS         (pyb_pin_SPI4_CS)
+#define MICROPY_HW_SPI4_SCK         (pyb_pin_SPI4_SCK)
+#define MICROPY_HW_SPI4_MISO        (pyb_pin_SPI4_MISO)
+#define MICROPY_HW_SPI4_MOSI        (pyb_pin_SPI4_MOSI)
+
+// USER is pulled high, and pressing the button makes the input go low.
+#define MICROPY_HW_USRSW_PIN        (pyb_pin_BUTTON)
+#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             (pyb_pin_LED_RED)
+#define MICROPY_HW_LED2             (pyb_pin_LED_GREEN)
+#define MICROPY_HW_LED3             (pyb_pin_LED_BLUE)
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
+
+// SD Card SDMMC
+// SD_VSELECT: low(default)=3.3V IO, high=1.8V IO
+// SD_RESET: drive low to turn off SD VCC (pulled high by default)
+// SD_DETECT: pulled high in hardware, goes low when SD inserted
+#define MICROPY_HW_SDCARD_SDMMC             (1)
+#define MICROPY_HW_SDCARD_CK                (pyb_pin_SD_SDIO_CK)
+#define MICROPY_HW_SDCARD_CMD               (pyb_pin_SD_SDIO_CMD)
+#define MICROPY_HW_SDCARD_D0                (pyb_pin_SD_SDIO_D0)
+#define MICROPY_HW_SDCARD_D1                (pyb_pin_SD_SDIO_D1)
+#define MICROPY_HW_SDCARD_D2                (pyb_pin_SD_SDIO_D2)
+#define MICROPY_HW_SDCARD_D3                (pyb_pin_SD_SDIO_D3)
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pyb_pin_SD_DETECT)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+
+// WiFi SDMMC
+#define MICROPY_HW_SDIO_SDMMC       (2)
+#define MICROPY_HW_SDIO_CK          (pyb_pin_WL_SDIO_CK)
+#define MICROPY_HW_SDIO_CMD         (pyb_pin_WL_SDIO_CMD)
+#define MICROPY_HW_SDIO_D0          (pyb_pin_WL_SDIO_D0)
+#define MICROPY_HW_SDIO_D1          (pyb_pin_WL_SDIO_D1)
+#define MICROPY_HW_SDIO_D2          (pyb_pin_WL_SDIO_D2)
+#define MICROPY_HW_SDIO_D3          (pyb_pin_WL_SDIO_D3)
+
+// USB config
+#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_VID          0x37C5
+#define MICROPY_HW_USB_PID          0x1206
+#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_CDC_MSC  (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC_HID  (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC_MSC_HID  (MICROPY_HW_USB_PID)
+
+// Murata 1YN configuration
+#define CYW43_CHIPSET_FIRMWARE_INCLUDE_FILE     "lib/cyw43-driver/firmware/w43439_sdio_1yn_7_95_59_combined.h"
+#define CYW43_WIFI_NVRAM_INCLUDE_FILE           "lib/cyw43-driver/firmware/wifi_nvram_1yn.h"
+#define CYW43_BT_FIRMWARE_INCLUDE_FILE          "lib/cyw43-driver/firmware/cyw43_btfw_1yn.h"
+
+// 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  (3000000)
+#define MICROPY_HW_BLE_UART_BAUDRATE_DOWNLOAD_FIRMWARE (3000000)
+
+/******************************************************************************/
+// Bootloader configuration
+
+#define MBOOT_BOARD_EARLY_INIT(initial_r0)      mboot_board_early_init()
+
+#define MBOOT_FSLOAD                            (1)
+#define MBOOT_VFS_FAT                           (1)
+
+#define MBOOT_SPIFLASH_CS                       (pyb_pin_XSPIM_P2_CS)
+#define MBOOT_SPIFLASH_SCK                      (pyb_pin_XSPIM_P2_SCK)
+#define MBOOT_SPIFLASH_MOSI                     (pyb_pin_XSPIM_P2_IO0)
+#define MBOOT_SPIFLASH_MISO                     (pyb_pin_XSPIM_P2_IO1)
+#define MBOOT_SPIFLASH_ADDR                     (0x70000000)
+#define MBOOT_SPIFLASH_BYTE_SIZE                (32 * 1024 * 1024)
+#define MBOOT_SPIFLASH_LAYOUT                   "/0x70000000/8192*4Kg"
+#define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE    (1)
+#define MBOOT_SPIFLASH_SPIFLASH                 (&spi_bdev.spiflash)
+#define MBOOT_SPIFLASH_CONFIG                   (&spiflash_config)
+
+/******************************************************************************/
+// Function and variable declarations
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+
+void mboot_board_early_init(void);
+void mboot_board_entry_init(void);
+
+void board_enter_bootloader(unsigned int n_args, const void *args);
+void board_early_init(void);
+void board_leave_standby(void);
diff --git a/ports/stm32/boards/OPENMV_N6/mpconfigboard.mk b/ports/stm32/boards/OPENMV_N6/mpconfigboard.mk
new file mode 100644
index 0000000000000..0283a486c1ad3
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/mpconfigboard.mk
@@ -0,0 +1,30 @@
+# This board requires a bootloader, either mboot or OpenMV's bootloader.
+USE_MBOOT = 1
+
+MCU_SERIES = n6
+CMSIS_MCU = STM32N657xx
+AF_FILE = boards/stm32n657_af.csv
+ifeq ($(BUILDING_MBOOT),1)
+SYSTEM_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/system_stm32$(MCU_SERIES)xx_fsbl.o
+else
+SYSTEM_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/system_stm32$(MCU_SERIES)xx_s.o
+endif
+STM32_N6_HEADER_VERSION = 2.3
+DKEL = $(STM32_CUBE_PROGRAMMER)/bin/ExternalLoader/MX25UM51245G_STM32N6570-NUCLEO.stldr
+
+LD_FILES = boards/OPENMV_N6/board.ld boards/common_n6_flash.ld
+TEXT0_ADDR = 0x70080000
+
+# MicroPython settings
+MICROPY_FLOAT_IMPL = double
+MICROPY_PY_BLUETOOTH ?= 1
+MICROPY_BLUETOOTH_NIMBLE ?= 1
+MICROPY_BLUETOOTH_BTSTACK ?= 0
+MICROPY_PY_LWIP ?= 1
+MICROPY_PY_NETWORK_CYW43 ?= 1
+MICROPY_PY_SSL ?= 1
+MICROPY_SSL_MBEDTLS ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Board specific frozen modules
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/OPENMV_N6/partition_stm32n657xx.h b/ports/stm32/boards/OPENMV_N6/partition_stm32n657xx.h
new file mode 100644
index 0000000000000..ac38dac7486ad
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/partition_stm32n657xx.h
@@ -0,0 +1,5 @@
+// This board does not use any security settings, so can just stay in secure
+// mode without configuring the SAU.
+
+static inline void TZ_SAU_Setup(void) {
+}
diff --git a/ports/stm32/boards/OPENMV_N6/pins.csv b/ports/stm32/boards/OPENMV_N6/pins.csv
new file mode 100644
index 0000000000000..b05b8b57f9eb3
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/pins.csv
@@ -0,0 +1,142 @@
+,PA0
+,PA1
+,PA2
+,PA3
+,PA4
+,PA5
+,PA6
+,PA7
+,PA8
+,PA9
+,PA10
+SPI2_CS,PA11
+SPI2_SCK,PA12
+UART4_RX,PA11
+UART4_TX,PA12
+P3,PA11
+P2,PA12
+,PA13
+,PA14
+,PA15
+,PB0
+,PB1
+,PB2
+,PB3
+,PB4
+,PB5
+SPI4_MISO,PB6
+SPI4_MOSI,PB7
+,PB8
+,PB9
+I2C2_SCL,PB10
+I2C2_SDA,PB11
+UART3_TX,PB10
+UART3_RX,PB11
+P4,PB10
+P5,PB11
+,PB12
+,PB13
+,PB14
+,PB15
+,PC0
+,PC1
+,PC2
+,PC3
+,PC4
+,PC5
+,PC6
+,PC7
+,PC8
+,PC9
+,PC10
+,PC11
+,PC12
+P11,PC13
+,PC14
+,PC15
+,PD0
+,PD1
+,PD2
+,PD3
+,PD4
+,PD5
+P10,PD6
+SPI2_MOSI,PD7
+P0,PD7
+,PD8
+,PD9
+,PD10
+SPI2_MISO,PD11
+P1,PD11
+,PD12
+P8,PD13
+,PD14
+,PD15
+,PE0
+,PE1
+,PE2
+,PE3
+,PE4
+,PE5
+,PE6
+UART7_RX,PE7
+UART7_TX,PE8
+,PE9
+,PE10
+SPI4_CS,PE11
+SPI4_SCK,PE12
+I2C4_SCL,PE13
+I2C4_SDA,PE14
+,PE15
+P6,PG0
+P9,PG12
+P7,PG13
+,PG15
+
+BUTTON,PF4
+LED_RED,PG10
+LED_GREEN,PA7
+LED_BLUE,PB1
+
+-XSPIM_P2_DQS,PN0
+-XSPIM_P2_CS,PN1
+-XSPIM_P2_IO0,PN2
+-XSPIM_P2_IO1,PN3
+-XSPIM_P2_IO2,PN4
+-XSPIM_P2_IO3,PN5
+-XSPIM_P2_SCK,PN6
+-XSPIM_P2_NCLK,PN7
+-XSPIM_P2_IO4,PN8
+-XSPIM_P2_IO5,PN9
+-XSPIM_P2_IO6,PN10
+-XSPIM_P2_IO7,PN11
+-FLASH_RESET,PN12
+
+-WL_REG_ON,PB12
+-WL_HOST_WAKE,PB14
+-WL_SDIO_D0,PB8
+-WL_SDIO_D1,PG8
+-WL_SDIO_D2,PB9
+-WL_SDIO_D3,PB4
+-WL_SDIO_CMD,PA0
+-WL_SDIO_CK,PD2
+-WL_I2S_SDO,PG14
+-WL_I2S_WS,PB15
+-WL_I2S_SCLK,PB13
+-BT_RXD,PF6
+-BT_TXD,PD5
+-BT_CTS,PG5
+-BT_RTS,PF3
+-BT_REG_ON,PD10
+-BT_HOST_WAKE,PD14
+-BT_DEV_WAKE,PD15
+
+-SD_SDIO_D0,PC8
+-SD_SDIO_D1,PC9
+-SD_SDIO_D2,PC10
+-SD_SDIO_D3,PC11
+-SD_SDIO_CK,PC12
+-SD_SDIO_CMD,PH2
+-SD_RESET,PC7
+-SD_DETECT,PC6
+-SD_VSELECT,PG6
diff --git a/ports/stm32/boards/OPENMV_N6/stm32n6xx_hal_conf.h b/ports/stm32/boards/OPENMV_N6/stm32n6xx_hal_conf.h
new file mode 100644
index 0000000000000..4012d56e5a3f0
--- /dev/null
+++ b/ports/stm32/boards/OPENMV_N6/stm32n6xx_hal_conf.h
@@ -0,0 +1,18 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32N6XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32N6XX_HAL_CONF_H
+
+// Oscillator values in Hz
+#define HSE_VALUE (48000000)
+#define LSE_VALUE (32768)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#include "boards/stm32n6xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32N6XX_HAL_CONF_H

From 50ea398b002d5e8ae4da2caa9c09d08c20df7007 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 Jun 2024 17:46:54 +1000
Subject: [PATCH 2486/3129] stm32/boards/NUCLEO_N657X0: Add new board
 definition files.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_N657X0/bdev.c       |  42 ++++++
 ports/stm32/boards/NUCLEO_N657X0/board.c      | 122 ++++++++++++++++++
 ports/stm32/boards/NUCLEO_N657X0/board.md     |  17 +++
 .../boards/NUCLEO_N657X0/mpconfigboard.h      | 103 +++++++++++++++
 .../boards/NUCLEO_N657X0/mpconfigboard.mk     |  26 ++++
 .../NUCLEO_N657X0/partition_stm32n657xx.h     |   5 +
 ports/stm32/boards/NUCLEO_N657X0/pins.csv     |  62 +++++++++
 .../boards/NUCLEO_N657X0/stm32n6xx_hal_conf.h |  18 +++
 8 files changed, 395 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/bdev.c
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/board.c
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/board.md
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/partition_stm32n657xx.h
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_N657X0/stm32n6xx_hal_conf.h

diff --git a/ports/stm32/boards/NUCLEO_N657X0/bdev.c b/ports/stm32/boards/NUCLEO_N657X0/bdev.c
new file mode 100644
index 0000000000000..2180d46174a33
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/bdev.c
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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"
+#include "xspi.h"
+
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+#error "Cannot enable MICROPY_HW_SPIFLASH_ENABLE_CACHE"
+#endif
+
+// External SPI flash uses hardware XSPI interface.
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_QSPI,
+    .bus.u_qspi.data = (void *)&xspi_flash2,
+    .bus.u_qspi.proto = &xspi_proto,
+};
+
+spi_bdev_t spi_bdev;
diff --git a/ports/stm32/boards/NUCLEO_N657X0/board.c b/ports/stm32/boards/NUCLEO_N657X0/board.c
new file mode 100644
index 0000000000000..fe5f2f1cc8313
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/board.c
@@ -0,0 +1,122 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024-2025 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 "boardctrl.h"
+#include "xspi.h"
+
+// Values for OTP fuses for VDDIO3, to select low voltage mode (<2.5V).
+// See RM0486, Section 5, Table 18.
+#define BSEC_HW_CONFIG_ID       (124U)
+#define BSEC_HWS_HSLV_VDDIO3    (1U << 15)
+
+static void board_config_vdd(void) {
+    // TODO: move some of the below code to a common location for all N6 boards?
+
+    // Enable PWR, BSEC and SYSCFG clocks.
+    LL_AHB4_GRP1_EnableClock(LL_AHB4_GRP1_PERIPH_PWR);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_BSEC);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_SYSCFG);
+
+    // Program high speed IO optimization fuses if they aren't already set.
+    uint32_t fuse;
+    BSEC_HandleTypeDef hbsec = { .Instance = BSEC };
+    const uint32_t mask = BSEC_HWS_HSLV_VDDIO3;
+    if (HAL_BSEC_OTP_Read(&hbsec, BSEC_HW_CONFIG_ID, &fuse) != HAL_OK) {
+        fuse = 0;
+    } else if ((fuse & mask) != mask) {
+        // Program the fuse, and read back the set value.
+        if (HAL_BSEC_OTP_Program(&hbsec, BSEC_HW_CONFIG_ID, fuse | mask, HAL_BSEC_NORMAL_PROG) != HAL_OK) {
+            fuse = 0;
+        } else if (HAL_BSEC_OTP_Read(&hbsec, BSEC_HW_CONFIG_ID, &fuse) != HAL_OK) {
+            fuse = 0;
+        }
+    }
+
+    // Enable Vdd ADC, needed for the ADC to work.
+    LL_PWR_EnableVddADC();
+
+    // Configure VDDIO2.
+    LL_PWR_EnableVddIO2();
+    LL_PWR_SetVddIO2VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_3V3);
+    SYSCFG->VDDIO2CCCR |= SYSCFG_VDDIO2CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO3.  Only enable 1.8V mode if the fuse is set.
+    LL_PWR_EnableVddIO3();
+    if (fuse & BSEC_HWS_HSLV_VDDIO3) {
+        LL_PWR_SetVddIO3VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_1V8);
+    }
+    SYSCFG->VDDIO3CCCR |= SYSCFG_VDDIO3CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO4.
+    LL_PWR_EnableVddIO4();
+    LL_PWR_SetVddIO4VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_3V3);
+    SYSCFG->VDDIO4CCCR |= SYSCFG_VDDIO4CCCR_EN; // enable IO compensation
+
+    // Enable VDD for ADC and USB.
+    LL_PWR_EnableVddADC();
+    LL_PWR_EnableVddUSB();
+}
+
+void mboot_board_early_init(void) {
+    board_config_vdd();
+    xspi_init();
+}
+
+void board_early_init(void) {
+    #if !MICROPY_HW_RUNS_FROM_EXT_FLASH
+    // Firmware runs directly from SRAM, so configure VDD and enable XSPI flash.
+    board_config_vdd();
+    xspi_init();
+    #endif
+}
+
+void board_leave_standby(void) {
+    // TODO: move some of the below code to a common location for all N6 boards?
+
+    // Enable PWR, BSEC and SYSCFG clocks.
+    LL_AHB4_GRP1_EnableClock(LL_AHB4_GRP1_PERIPH_PWR);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_BSEC);
+    LL_APB4_GRP2_EnableClock(LL_APB4_GRP2_PERIPH_SYSCFG);
+
+    // Configure VDDIO2.
+    LL_PWR_EnableVddIO2();
+    LL_PWR_SetVddIO2VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_3V3);
+    SYSCFG->VDDIO2CCCR |= SYSCFG_VDDIO2CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO3 (1.8V mode selection is retained).
+    LL_PWR_EnableVddIO3();
+    SYSCFG->VDDIO3CCCR |= SYSCFG_VDDIO3CCCR_EN; // enable IO compensation
+
+    // Configure VDDIO4.
+    LL_PWR_EnableVddIO4();
+    LL_PWR_SetVddIO4VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_3V3);
+    SYSCFG->VDDIO4CCCR |= SYSCFG_VDDIO4CCCR_EN; // enable IO compensation
+
+    // Enable VDD for ADC and USB.
+    LL_PWR_EnableVddADC();
+    LL_PWR_EnableVddUSB();
+}
diff --git a/ports/stm32/boards/NUCLEO_N657X0/board.md b/ports/stm32/boards/NUCLEO_N657X0/board.md
new file mode 100644
index 0000000000000..3360c5db6c70d
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/board.md
@@ -0,0 +1,17 @@
+The mboot bootloader must first be built and deployed to this board.  Make sure that
+CN9 is in position 1-2 to select STLK as the 5V power source, that JP1 is in position
+1-2 (lower position) and JP2 is in position 2-3 (upper position).  Then plug in a USB
+cable into the ST-LINK port CN10.  This will allow mboot firmware to be programmed to
+the external SPI flash via ST's tools, eg:
+
+    make -C ports/stm32/mboot BOARD=NUCLEO_N657X0 deploy-trusted
+
+Once mboot is installed, change CN9 to position 3-4 to select USB as the 5V power
+source, change JP2 back to position 1-2 (lower position) and change the USB cable to
+CN8.  mboot will present a USB DFU device on this USB port, and the red LED2 should be
+blinking at 1Hz to indicate that mboot is active.  If it's not active then hold the
+USER button and press NRST, and wait until all three LEDs are on, then release USER.
+Now mboot will be active.
+
+Once the USB DFU port can be seen, the firmware below can be programmed as usual with
+any DFU loader.
diff --git a/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h
new file mode 100644
index 0000000000000..ccc3fa051ff3e
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h
@@ -0,0 +1,103 @@
+#define MICROPY_HW_BOARD_NAME                   "NUCLEO-N657X0"
+#define MICROPY_HW_MCU_NAME                     "STM32N657X0"
+
+#define MICROPY_GC_STACK_ENTRY_TYPE             uint32_t
+#define MICROPY_ALLOC_GC_STACK_SIZE             (128)
+#define MICROPY_FATFS_EXFAT                     (1)
+
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+#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                   (0)
+#define MICROPY_HW_ENABLE_USB                   (1)
+#define MICROPY_PY_PYB_LEGACY                   (0)
+
+#define MICROPY_BOARD_EARLY_INIT                board_early_init
+#define MICROPY_BOARD_LEAVE_STANDBY             board_leave_standby()
+
+// HSE is 48MHz, this gives a CPU frequency of 800MHz.
+#define MICROPY_HW_CLK_PLLM                     (6)
+#define MICROPY_HW_CLK_PLLN                     (100)
+#define MICROPY_HW_CLK_PLLP1                    (1)
+#define MICROPY_HW_CLK_PLLP2                    (1)
+#define MICROPY_HW_CLK_PLLFRAC                  (0)
+
+// The LSE is a 32kHz crystal.
+#define MICROPY_HW_RTC_USE_LSE                  (1)
+#define MICROPY_HW_RTC_USE_US                   (1)
+
+// External SPI flash, MX25UM51245GXDI00.
+#define MICROPY_HW_XSPIFLASH_SIZE_BITS_LOG2     (29)
+
+// SPI flash, block device config.
+#define MICROPY_HW_BDEV_SPIFLASH                (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED       (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG         (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_OFFSET_BYTES   (4 * 1024 * 1024)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES     (60 * 1024 * 1024)
+
+// UART buses
+#define MICROPY_HW_UART1_TX                     (pyb_pin_UART1_TX)
+#define MICROPY_HW_UART1_RX                     (pyb_pin_UART1_RX)
+#define MICROPY_HW_UART3_TX                     (pyb_pin_UART3_TX)
+#define MICROPY_HW_UART3_RX                     (pyb_pin_UART3_RX)
+#define MICROPY_HW_UART_REPL                    (PYB_UART_1)
+#define MICROPY_HW_UART_REPL_BAUD               (115200)
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL                     (pyb_pin_I2C1_SCL)
+#define MICROPY_HW_I2C1_SDA                     (pyb_pin_I2C1_SDA)
+
+// SPI buses
+#define MICROPY_HW_SPI5_NSS                     (pyb_pin_SPI5_CS)
+#define MICROPY_HW_SPI5_SCK                     (pyb_pin_SPI5_SCK)
+#define MICROPY_HW_SPI5_MISO                    (pyb_pin_SPI5_MISO)
+#define MICROPY_HW_SPI5_MOSI                    (pyb_pin_SPI5_MOSI)
+
+// USER2 is floating, and pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN                    (pyb_pin_BUTTON)
+#define MICROPY_HW_USRSW_PULL                   (GPIO_PULLDOWN)
+#define MICROPY_HW_USRSW_EXTI_MODE              (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED                (1)
+
+// LEDs
+#define MICROPY_HW_LED1                         (pyb_pin_LED_RED)
+#define MICROPY_HW_LED2                         (pyb_pin_LED_GREEN)
+#define MICROPY_HW_LED3                         (pyb_pin_LED_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_HS                       (1)
+#define MICROPY_HW_USB_HS_IN_FS                 (1)
+#define MICROPY_HW_USB_MAIN_DEV                 (USB_PHY_HS_ID)
+
+/******************************************************************************/
+// Bootloader configuration
+
+#define MBOOT_BOARD_EARLY_INIT(initial_r0)      mboot_board_early_init()
+
+#define MBOOT_SPIFLASH_CS                       (pyb_pin_XSPIM_P2_CS)
+#define MBOOT_SPIFLASH_SCK                      (pyb_pin_XSPIM_P2_SCK)
+#define MBOOT_SPIFLASH_MOSI                     (pyb_pin_XSPIM_P2_IO0)
+#define MBOOT_SPIFLASH_MISO                     (pyb_pin_XSPIM_P2_IO1)
+#define MBOOT_SPIFLASH_ADDR                     (0x70000000)
+#define MBOOT_SPIFLASH_BYTE_SIZE                (64 * 1024 * 1024)
+#define MBOOT_SPIFLASH_LAYOUT                   "/0x70000000/16384*4Kg"
+#define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE    (1)
+#define MBOOT_SPIFLASH_SPIFLASH                 (&spi_bdev.spiflash)
+#define MBOOT_SPIFLASH_CONFIG                   (&spiflash_config)
+
+/******************************************************************************/
+// Function and variable declarations
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+
+void mboot_board_early_init(void);
+void mboot_board_entry_init(void);
+
+void board_early_init(void);
+void board_leave_standby(void);
diff --git a/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk
new file mode 100644
index 0000000000000..fa64cb17065e0
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk
@@ -0,0 +1,26 @@
+# Without mboot, the main firmware must fit in 512k flash, will be copied to SRAM by
+# the hardware bootloader, and will run from SRAM.  With mboot, the main firmware can
+# be much larger and will run from flash via XSPI in memory-mapped mode.
+USE_MBOOT ?= 1
+
+MCU_SERIES = n6
+CMSIS_MCU = STM32N657xx
+AF_FILE = boards/stm32n657_af.csv
+ifeq ($(BUILDING_MBOOT),1)
+SYSTEM_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/system_stm32$(MCU_SERIES)xx_fsbl.o
+else
+SYSTEM_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/system_stm32$(MCU_SERIES)xx_s.o
+endif
+STM32_N6_HEADER_VERSION = 2.1
+DKEL = $(STM32_CUBE_PROGRAMMER)/bin/ExternalLoader/MX25UM51245G_STM32N6570-NUCLEO.stldr
+
+ifeq ($(USE_MBOOT),1)
+LD_FILES = boards/stm32n657x0.ld boards/common_n6_flash.ld
+TEXT0_ADDR = 0x70080000
+else
+LD_FILES = boards/stm32n657x0.ld boards/common_basic.ld
+TEXT0_ADDR = 0x34180400
+endif
+
+# MicroPython settings
+MICROPY_FLOAT_IMPL = double
diff --git a/ports/stm32/boards/NUCLEO_N657X0/partition_stm32n657xx.h b/ports/stm32/boards/NUCLEO_N657X0/partition_stm32n657xx.h
new file mode 100644
index 0000000000000..ac38dac7486ad
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/partition_stm32n657xx.h
@@ -0,0 +1,5 @@
+// This board does not use any security settings, so can just stay in secure
+// mode without configuring the SAU.
+
+static inline void TZ_SAU_Setup(void) {
+}
diff --git a/ports/stm32/boards/NUCLEO_N657X0/pins.csv b/ports/stm32/boards/NUCLEO_N657X0/pins.csv
new file mode 100644
index 0000000000000..033f0a552e00b
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/pins.csv
@@ -0,0 +1,62 @@
+D0,PD9
+D1,PD8
+D2,PD0
+D3,PE9
+D4,PE0
+D5,PE10
+D6,PD5
+D7,PE11
+D8,PD12
+D9,PD7
+D10,PA3
+D11,PG2
+D12,PG1
+D13,PE15
+D14,PC1
+D15,PH9
+
+# Ax header pins are connected directly to the following digital IO
+A0D,PF5
+A1D,PC10
+A2D,PF6
+A3D,PA2
+A4D,PC12
+A5D,PH2
+
+# Ax header pins are connected to the following analog IO via an op-amp in voltage-follower mode running at 1.8V
+A0,PA8
+A1,PA9
+A2,PA10
+A3,PA12
+A4,PF3
+A5,PG15
+
+-UART1_TX,PE5
+-UART1_RX,PE6
+-UART3_TX,PD8
+-UART3_RX,PD9
+
+-I2C1_SCL,PH9
+-I2C1_SDA,PC1
+
+-SPI5_CS,PA3
+-SPI5_SCK,PE15
+-SPI5_MISO,PG1
+-SPI5_MOSI,PG2
+
+-BUTTON,PC13
+LED_BLUE,PG8
+LED_RED,PG10
+LED_GREEN,PG0
+
+-XSPIM_P2_DQS,PN0
+-XSPIM_P2_CS,PN1
+-XSPIM_P2_IO0,PN2
+-XSPIM_P2_IO1,PN3
+-XSPIM_P2_IO2,PN4
+-XSPIM_P2_IO3,PN5
+-XSPIM_P2_SCK,PN6
+-XSPIM_P2_IO4,PN8
+-XSPIM_P2_IO5,PN9
+-XSPIM_P2_IO6,PN10
+-XSPIM_P2_IO7,PN11
diff --git a/ports/stm32/boards/NUCLEO_N657X0/stm32n6xx_hal_conf.h b/ports/stm32/boards/NUCLEO_N657X0/stm32n6xx_hal_conf.h
new file mode 100644
index 0000000000000..4012d56e5a3f0
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_N657X0/stm32n6xx_hal_conf.h
@@ -0,0 +1,18 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32N6XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32N6XX_HAL_CONF_H
+
+// Oscillator values in Hz
+#define HSE_VALUE (48000000)
+#define LSE_VALUE (32768)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#include "boards/stm32n6xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32N6XX_HAL_CONF_H

From 99740dbace962eb8e38da174cc1857406e626456 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Jul 2025 15:25:28 +1000
Subject: [PATCH 2487/3129] stm32/stm32.mk: Error out if compiling for
 cortex-m55 on old gcc.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile       |  4 +---
 ports/stm32/mboot/Makefile |  3 +--
 ports/stm32/stm32.mk       | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index affd9d2f2f6b9..37d70dcdbf028 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -60,6 +60,7 @@ include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/libhydrogen lib/stm32lib
 
+CROSS_COMPILE ?= arm-none-eabi-
 LD_DIR=boards
 USBDEV_DIR=usbdev
 #USBHOST_DIR=usbhost
@@ -101,9 +102,6 @@ GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.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-
-
 INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 7c0bde81fdd4b..7226dd353f399 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -48,6 +48,7 @@ endif
 MBOOT_VERSION_ALLOCATED_BYTES ?= 64
 MBOOT_VERSION_INCLUDE_OPTIONS ?= 1  # if set to 1, this will append build options to version string (see version.c)
 
+CROSS_COMPILE ?= arm-none-eabi-
 USBDEV_DIR=usbdev
 DFU=$(TOP)/tools/dfu.py
 PYDFU ?= $(TOP)/tools/pydfu.py
@@ -59,8 +60,6 @@ OPENOCD_CONFIG ?= boards/openocd_stm32f4.cfg
 
 include ../stm32.mk
 
-CROSS_COMPILE ?= arm-none-eabi-
-
 INC += -I.
 INC += -I..
 INC += -I$(TOP)
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index e2e7d955c6c1f..e6526fc6bd541 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -83,3 +83,17 @@ MPY_CROSS_MCU_ARCH_h7 = armv7m
 MPY_CROSS_MCU_ARCH_n6 = armv7m # really armv8m
 MPY_CROSS_MCU_ARCH_wb = armv7m
 MPY_CROSS_MCU_ARCH_wl = armv7m
+
+# gcc up to 14.2.0 have a known loop-optimisation bug:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116799
+# This bug manifests for Cortex M55 targets, so require a newer compiler on such targets.
+ifeq ($(MCU_SERIES),n6)
+# Check if GCC version is less than 14.3
+GCC_VERSION := $(shell $(CROSS_COMPILE)gcc -dumpversion | cut -d. -f1-2)
+GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION) | cut -d. -f1)
+GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION) | cut -d. -f2)
+GCC_VERSION_NUM := $(shell echo $$(($(GCC_VERSION_MAJOR) * 100 + $(GCC_VERSION_MINOR))))
+ifeq ($(shell test $(GCC_VERSION_NUM) -lt 1403 && echo yes),yes)
+$(error Error: GCC $(GCC_VERSION) has known issues with Cortex-M55; upgrade to GCC 14.3+ for proper CM55 support)
+endif
+endif

From da3709a73810d054bb93baf8509dcc5d246962b1 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 5 Jul 2025 18:50:13 +0100
Subject: [PATCH 2488/3129] unix/coverage: Add missing MP_OBJ_FROM_PTR casts.

An attempt to build the coverage module into the nanbox binary failed, but
pointed out that these sites needed explicit conversion from pointer to
object.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 33e4208d9248c..cdab17cacfa01 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -505,7 +505,7 @@ static mp_obj_t extra_coverage(void) {
         mp_call_function_2_protected(MP_OBJ_FROM_PTR(&mp_builtin_divmod_obj), mp_obj_new_str_from_cstr("abc"), mp_obj_new_str_from_cstr("abc"));
 
         // mp_obj_int_get_checked with mp_obj_int_t that has a value that is a small integer
-        mp_printf(&mp_plat_print, "%d\n", mp_obj_int_get_checked(mp_obj_int_new_mpz()));
+        mp_printf(&mp_plat_print, "%d\n", mp_obj_int_get_checked(MP_OBJ_FROM_PTR(mp_obj_int_new_mpz())));
 
         // mp_obj_int_get_uint_checked with non-negative small-int
         mp_printf(&mp_plat_print, "%d\n", (int)mp_obj_int_get_uint_checked(MP_OBJ_NEW_SMALL_INT(1)));
@@ -844,7 +844,7 @@ static mp_obj_t extra_coverage(void) {
     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)};
+    mp_obj_t items[] = {MP_OBJ_FROM_PTR(&str_no_hash_obj), MP_OBJ_FROM_PTR(&bytes_no_hash_obj), MP_OBJ_FROM_PTR(s), MP_OBJ_FROM_PTR(s2)};
     return mp_obj_new_tuple(MP_ARRAY_SIZE(items), items);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(extra_coverage_obj, extra_coverage);

From 05342b013d251b3e2ae84432aa541a2588e39925 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:42:01 +1000
Subject: [PATCH 2489/3129] tools/mpremote: Support OSError's on targets
 without errno.

Targets without the `errno` module enabled will not render `OSError`s
with the name of the error.  Instead they just print the numeric error
code.

Add support for such targets by explicitly recognising certain error codes.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/mp_errno.py  | 53 ++++++++++++++++++++++++++++
 tools/mpremote/mpremote/transport.py | 13 ++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 tools/mpremote/mpremote/mp_errno.py

diff --git a/tools/mpremote/mpremote/mp_errno.py b/tools/mpremote/mpremote/mp_errno.py
new file mode 100644
index 0000000000000..37cb1e0cb9b04
--- /dev/null
+++ b/tools/mpremote/mpremote/mp_errno.py
@@ -0,0 +1,53 @@
+import errno
+
+# This table maps numeric values defined by `py/mperrno.h` to host errno code.
+MP_ERRNO_TABLE = {
+    1: errno.EPERM,
+    2: errno.ENOENT,
+    3: errno.ESRCH,
+    4: errno.EINTR,
+    5: errno.EIO,
+    6: errno.ENXIO,
+    7: errno.E2BIG,
+    8: errno.ENOEXEC,
+    9: errno.EBADF,
+    10: errno.ECHILD,
+    11: errno.EAGAIN,
+    12: errno.ENOMEM,
+    13: errno.EACCES,
+    14: errno.EFAULT,
+    15: errno.ENOTBLK,
+    16: errno.EBUSY,
+    17: errno.EEXIST,
+    18: errno.EXDEV,
+    19: errno.ENODEV,
+    20: errno.ENOTDIR,
+    21: errno.EISDIR,
+    22: errno.EINVAL,
+    23: errno.ENFILE,
+    24: errno.EMFILE,
+    25: errno.ENOTTY,
+    26: errno.ETXTBSY,
+    27: errno.EFBIG,
+    28: errno.ENOSPC,
+    29: errno.ESPIPE,
+    30: errno.EROFS,
+    31: errno.EMLINK,
+    32: errno.EPIPE,
+    33: errno.EDOM,
+    34: errno.ERANGE,
+    95: errno.EOPNOTSUPP,
+    97: errno.EAFNOSUPPORT,
+    98: errno.EADDRINUSE,
+    103: errno.ECONNABORTED,
+    104: errno.ECONNRESET,
+    105: errno.ENOBUFS,
+    106: errno.EISCONN,
+    107: errno.ENOTCONN,
+    110: errno.ETIMEDOUT,
+    111: errno.ECONNREFUSED,
+    113: errno.EHOSTUNREACH,
+    114: errno.EALREADY,
+    115: errno.EINPROGRESS,
+    125: errno.ECANCELED,
+}
diff --git a/tools/mpremote/mpremote/transport.py b/tools/mpremote/mpremote/transport.py
index 1b70f9b2edc40..d7568b281b1be 100644
--- a/tools/mpremote/mpremote/transport.py
+++ b/tools/mpremote/mpremote/transport.py
@@ -24,8 +24,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import ast, errno, hashlib, os, sys
+import ast, errno, hashlib, os, re, sys
 from collections import namedtuple
+from .mp_errno import MP_ERRNO_TABLE
 
 
 def stdout_write_bytes(b):
@@ -62,6 +63,16 @@ def _convert_filesystem_error(e, info):
         ]:
             if estr in e.error_output:
                 return OSError(code, info)
+
+        # Some targets don't render OSError with the name of the errno, so in these
+        # cases support an explicit mapping of errnos to known numeric codes.
+        error_lines = e.error_output.splitlines()
+        match = re.match(r"OSError: (\d+)$", error_lines[-1])
+        if match:
+            value = int(match.group(1), 10)
+            if value in MP_ERRNO_TABLE:
+                return OSError(MP_ERRNO_TABLE[value], info)
+
     return e
 
 

From 00fe312f83a9fd5816f8034c7f7ee591325d15d9 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Thu, 26 Jun 2025 12:41:01 -0400
Subject: [PATCH 2490/3129] py/bc: Factor out helper for line-number decoding.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/bc.h | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/py/bc.h b/py/bc.h
index 718ba4a684617..f24510ea7ec72 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -308,25 +308,35 @@ static inline void mp_module_context_alloc_tables(mp_module_context_t *context,
     #endif
 }
 
+typedef struct _mp_code_lineinfo_t {
+    size_t bc_increment;
+    size_t line_increment;
+} mp_code_lineinfo_t;
+
+static inline mp_code_lineinfo_t mp_bytecode_decode_lineinfo(const byte **line_info) {
+    mp_code_lineinfo_t result;
+    size_t c = (*line_info)[0];
+    if ((c & 0x80) == 0) {
+        // 0b0LLBBBBB encoding
+        result.bc_increment = c & 0x1f;
+        result.line_increment = c >> 5;
+        *line_info += 1;
+    } else {
+        // 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte)
+        result.bc_increment = c & 0xf;
+        result.line_increment = ((c << 4) & 0x700) | (*line_info)[1];
+        *line_info += 2;
+    }
+    return result;
+}
+
 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;
     while (line_info < line_info_top) {
-        size_t c = *line_info;
-        size_t b, l;
-        if ((c & 0x80) == 0) {
-            // 0b0LLBBBBB encoding
-            b = c & 0x1f;
-            l = c >> 5;
-            line_info += 1;
-        } else {
-            // 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte)
-            b = c & 0xf;
-            l = ((c << 4) & 0x700) | line_info[1];
-            line_info += 2;
-        }
-        if (bc_offset >= b) {
-            bc_offset -= b;
-            source_line += l;
+        mp_code_lineinfo_t decoded = mp_bytecode_decode_lineinfo(&line_info);
+        if (bc_offset >= decoded.bc_increment) {
+            bc_offset -= decoded.bc_increment;
+            source_line += decoded.line_increment;
         } else {
             // found source line corresponding to bytecode offset
             break;

From 0732c45683fe7fabe61e4ef4eb95011817966372 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Thu, 26 Jun 2025 12:41:44 -0400
Subject: [PATCH 2491/3129] py/showbc: Use line-number decoding helper.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/showbc.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/py/showbc.c b/py/showbc.c
index 6913d18c1ca82..792fccd013383 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -144,17 +144,9 @@ void mp_bytecode_print(const mp_print_t *print, const mp_raw_code_t *rc, size_t
         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 < line_info_top;) {
-            if ((ci[0] & 0x80) == 0) {
-                // 0b0LLBBBBB encoding
-                bc += ci[0] & 0x1f;
-                source_line += ci[0] >> 5;
-                ci += 1;
-            } else {
-                // 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte)
-                bc += ci[0] & 0xf;
-                source_line += ((ci[0] << 4) & 0x700) | ci[1];
-                ci += 2;
-            }
+            mp_code_lineinfo_t decoded = mp_bytecode_decode_lineinfo(&ci);
+            bc += decoded.bc_increment;
+            source_line += decoded.line_increment;
             mp_printf(print, "  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
         }
     }

From d6b62a28fe77962e1c0d6fcf4ad0d5d47dda0e6b Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Fri, 21 Mar 2025 13:05:16 -0400
Subject: [PATCH 2492/3129] tests/basics/fun_code_full: Test code objects with
 full feature set.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/basics/fun_code_full.py | 47 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 tests/basics/fun_code_full.py

diff --git a/tests/basics/fun_code_full.py b/tests/basics/fun_code_full.py
new file mode 100644
index 0000000000000..5eb23150df09c
--- /dev/null
+++ b/tests/basics/fun_code_full.py
@@ -0,0 +1,47 @@
+# Test function.__code__ attributes not available with MICROPY_PY_BUILTINS_CODE <= MICROPY_PY_BUILTINS_CODE_BASIC
+
+try:
+    (lambda: 0).__code__.co_code
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    import warnings
+    warnings.simplefilter("ignore") # ignore deprecation warning about co_lnotab
+except ImportError:
+    pass
+
+def f(x, y):
+    a = x + y
+    b = x - y
+    return a * b
+
+code = f.__code__
+
+print(type(code.co_code)) # both bytes (but mpy and cpy have different instruction sets)
+print(code.co_consts) # (not necessarily the same set, but in this function they are)
+print(code.co_filename.rsplit('/')[-1]) # same terminal filename but might be different paths on other ports
+print(type(code.co_firstlineno)) # both ints (but mpy points to first line inside, cpy points to declaration)
+print(code.co_name)
+print(iter(code.co_names) is not None) # both iterable (but mpy returns dict with names as keys, cpy only the names; and not necessarily the same set)
+print(type(code.co_lnotab)) # both bytes
+
+co_lines = code.co_lines()
+
+l = list(co_lines)
+first_start = l[0][0]
+last_end = l[-1][1]
+print(first_start) # co_lines should start at the start of the bytecode
+print(len(code.co_code) - last_end) # and end at the end of the bytecode
+
+prev_end = 0
+for start, end, line_no in l:
+    if end != prev_end:
+        print("non-contiguous")
+        break # the offset ranges should be contiguous
+    prev_end = end
+else:
+    print("contiguous")
+
+

From 4b6d1085d12698f55bc47a9b58e7004def57991a Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Tue, 1 Jul 2025 12:47:23 -0400
Subject: [PATCH 2493/3129] tests/basics/fun_code_colines: Test decoded
 co_lines values.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/basics/fun_code_colines.py     | 81 ++++++++++++++++++++++++++++
 tests/basics/fun_code_colines.py.exp | 20 +++++++
 2 files changed, 101 insertions(+)
 create mode 100644 tests/basics/fun_code_colines.py
 create mode 100644 tests/basics/fun_code_colines.py.exp

diff --git a/tests/basics/fun_code_colines.py b/tests/basics/fun_code_colines.py
new file mode 100644
index 0000000000000..a8867770eddf1
--- /dev/null
+++ b/tests/basics/fun_code_colines.py
@@ -0,0 +1,81 @@
+# Check that we have sensical bytecode offsets in function.__code__.co_lines
+
+def f1(x, y, obj, obj2, obj3):
+    a = x + y # line 4: bc+4 line+4
+    b = x - y # line 5: bc+4 line+1
+    # line 6
+    # line 7
+    # line 8
+    # line 9
+    # line 10
+    # line 11
+    # line 12
+    # line 13
+    # line 14
+    # line 15
+    # line 16
+    # line 17
+    # line 18
+    # line 19
+    c = a * b # line 20: bc+4 line+15
+    obj.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.fun() # line 21: bc+31 line+1; bc+27 line+0
+    # line 22
+    # line 23
+    # line 24: bc+0 line+3
+    # line 25
+    # line 26
+    # line 27: bc+0 line+3
+    # line 28
+    # line 29
+    obj2.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.fun() # line 30: bc+31 line+3; bc+27 line+0
+    # line 31
+    # line 32
+    # line 33: bc+0 line+3
+    # line 34
+    # line 35
+    # line 36
+    # line 37
+    # line 38
+    # line 39
+    # line 40
+    # line 41
+    # line 42
+    # line 43
+    # line 44
+    # line 45
+    # line 46
+    # line 47
+    # line 48
+    # line 49
+    # line 50
+    # line 51
+    # line 52
+    # line 53
+    # line 54
+    # line 55
+    # line 56
+    # line 57
+    # line 58
+    # line 59
+    return obj3.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.fun() # line 60: bc+31 line+27; bc+27 line+0
+
+def f2(x, y):
+    a = x + y # line 63
+    b = x - y # line 64
+    return a * b # line 65
+
+try:
+    f1.__code__.co_lines
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+print("f1")
+for start, end, line_no in f1.__code__.co_lines():
+    print("line {} start: {}".format(line_no, start))
+    print("line {} end: {}".format(line_no, end))
+
+print("f2")
+for start, end, line_no in f2.__code__.co_lines():
+    print("line {} start: {}".format(line_no, start))
+    print("line {} end: {}".format(line_no, end))
diff --git a/tests/basics/fun_code_colines.py.exp b/tests/basics/fun_code_colines.py.exp
new file mode 100644
index 0000000000000..19bd4ef6e2a5a
--- /dev/null
+++ b/tests/basics/fun_code_colines.py.exp
@@ -0,0 +1,20 @@
+f1
+line 4 start: 0
+line 4 end: 4
+line 5 start: 4
+line 5 end: 8
+line 20 start: 8
+line 20 end: 12
+line 21 start: 12
+line 21 end: 70
+line 30 start: 70
+line 30 end: 128
+line 60 start: 128
+line 60 end: 186
+f2
+line 63 start: 0
+line 63 end: 4
+line 64 start: 4
+line 64 end: 8
+line 65 start: 8
+line 65 end: 12

From 49159ef6b7e283681cb1c2dfe44cdf14bd397467 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Fri, 21 Mar 2025 12:44:34 -0400
Subject: [PATCH 2494/3129] py/objcode: Implement co_lines method.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/objcode.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/py/objcode.c b/py/objcode.c
index 9b98a696798d4..52df84d012b58 100644
--- a/py/objcode.c
+++ b/py/objcode.c
@@ -107,6 +107,67 @@ static mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
     return o;
 }
 
+static mp_obj_t code_colines_iter(mp_obj_t);
+static mp_obj_t code_colines_next(mp_obj_t);
+typedef struct _mp_obj_colines_iter_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    const mp_raw_code_t *rc;
+    mp_uint_t bc;
+    mp_uint_t source_line;
+    const byte *ci;
+} mp_obj_colines_iter_t;
+
+static mp_obj_t code_colines_iter(mp_obj_t self_in) {
+    mp_obj_code_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_colines_iter_t *iter = mp_obj_malloc(mp_obj_colines_iter_t, &mp_type_polymorph_iter);
+    iter->iternext = code_colines_next;
+    iter->rc = self->rc;
+    iter->bc = 0;
+    iter->source_line = 1;
+    iter->ci = self->rc->prelude.line_info;
+    return MP_OBJ_FROM_PTR(iter);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(code_colines_obj, code_colines_iter);
+
+static mp_obj_t code_colines_next(mp_obj_t iter_in) {
+    mp_obj_colines_iter_t *iter = MP_OBJ_TO_PTR(iter_in);
+    const byte *ci_end = iter->rc->prelude.line_info_top;
+
+    mp_uint_t start = iter->bc;
+    mp_uint_t line_no = iter->source_line;
+    bool another = true;
+
+    while (another && iter->ci < ci_end) {
+        another = false;
+        mp_code_lineinfo_t decoded = mp_bytecode_decode_lineinfo(&iter->ci);
+        iter->bc += decoded.bc_increment;
+        iter->source_line += decoded.line_increment;
+
+        if (decoded.bc_increment == 0) {
+            line_no = iter->source_line;
+            another = true;
+        } else if (decoded.line_increment == 0) {
+            another = true;
+        }
+    }
+
+    if (another) {
+        mp_uint_t prelude_size = (iter->rc->prelude.opcodes - (const byte *)iter->rc->fun_data);
+        mp_uint_t bc_end = iter->rc->fun_data_len - prelude_size;
+        if (iter->bc >= bc_end) {
+            return MP_OBJ_STOP_ITERATION;
+        } else {
+            iter->bc = bc_end;
+        }
+    }
+
+    mp_uint_t end = iter->bc;
+    mp_obj_t next[3] = {MP_OBJ_NEW_SMALL_INT(start), MP_OBJ_NEW_SMALL_INT(end), MP_OBJ_NEW_SMALL_INT(line_no)};
+
+    return mp_obj_new_tuple(MP_ARRAY_SIZE(next), next);
+}
+
 static void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
         // not load attribute
@@ -143,6 +204,10 @@ static void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             }
             dest[0] = o->lnotab;
             break;
+        case MP_QSTR_co_lines:
+            dest[0] = MP_OBJ_FROM_PTR(&code_colines_obj);
+            dest[1] = self_in;
+            break;
     }
 }
 

From c4a88f2ce7da87d5f635ec25edba481917020fd8 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Mon, 30 Jun 2025 23:28:20 +0200
Subject: [PATCH 2495/3129] py/obj: Add functions to retrieve large integers
 from mp_obj_t.

This commit provides helpers to retrieve integer values from
mp_obj_t when the content does not fit in a 32 bits integer,
without risking an implicit wrap due to an int overflow.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 ports/unix/coverage.c                  | 36 ++++++++++++++++++++++++++
 py/obj.c                               | 30 +++++++++++++++++++++
 py/obj.h                               |  2 ++
 py/objint_longlong.c                   | 16 ++++++++++++
 tests/ports/unix/extra_coverage.py     | 10 +++++++
 tests/ports/unix/extra_coverage.py.exp |  8 ++++++
 6 files changed, 102 insertions(+)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index cdab17cacfa01..0df6bf279ae4d 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -488,6 +488,26 @@ static mp_obj_t extra_coverage(void) {
         // mpz_set_from_float with 0 as argument
         mpz_set_from_float(&mpz, 0);
         mp_printf(&mp_plat_print, "%f\n", mpz_as_float(&mpz));
+
+        // convert a large integer value (stored in a mpz) to mp_uint_t and to ll;
+        mp_obj_t obj_bigint = mp_obj_new_int_from_uint((mp_uint_t)0xdeadbeef);
+        mp_printf(&mp_plat_print, "%x\n", mp_obj_get_uint(obj_bigint));
+        obj_bigint = mp_obj_new_int_from_ll(0xc0ffee777c0ffeell);
+        long long value_ll = mp_obj_get_ll(obj_bigint);
+        mp_printf(&mp_plat_print, "%x%08x\n", (uint32_t)(value_ll >> 32), (uint32_t)value_ll);
+
+        // convert a large integer value (stored via a struct object) to uint and to ll
+        // `deadbeef` global is an uctypes.struct defined by extra_coverage.py
+        obj_bigint = mp_load_global(MP_QSTR_deadbeef);
+        mp_printf(&mp_plat_print, "%x\n", mp_obj_get_uint(obj_bigint));
+        value_ll = mp_obj_get_ll(obj_bigint);
+        mp_printf(&mp_plat_print, "%x%08x\n", (uint32_t)(value_ll >> 32), (uint32_t)value_ll);
+
+        // convert a smaller integer value to mp_uint_t and to ll
+        obj_bigint = mp_obj_new_int_from_uint(0xc0ffee);
+        mp_printf(&mp_plat_print, "%x\n", mp_obj_get_uint(obj_bigint));
+        value_ll = mp_obj_get_ll(obj_bigint);
+        mp_printf(&mp_plat_print, "%x%08x\n", (uint32_t)(value_ll >> 32), (uint32_t)value_ll);
     }
 
     // runtime utils
@@ -530,6 +550,22 @@ static mp_obj_t extra_coverage(void) {
             mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
         }
 
+        // mp_obj_get_uint from a non-int object (should raise exception)
+        if (nlr_push(&nlr) == 0) {
+            mp_obj_get_uint(mp_const_none);
+            nlr_pop();
+        } else {
+            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+
+        // mp_obj_int_get_ll from a non-int object (should raise exception)
+        if (nlr_push(&nlr) == 0) {
+            mp_obj_get_ll(mp_const_none);
+            nlr_pop();
+        } else {
+            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+
         // call mp_obj_new_exception_args (it's a part of the public C API and not used in the core)
         mp_obj_print_exception(&mp_plat_print, mp_obj_new_exception_args(&mp_type_ValueError, 0, NULL));
     }
diff --git a/py/obj.c b/py/obj.c
index 1606ad5209e7b..586759460762b 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -314,6 +314,36 @@ mp_int_t mp_obj_get_int(mp_const_obj_t arg) {
     return val;
 }
 
+#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
+mp_uint_t mp_obj_get_uint(mp_const_obj_t arg) {
+    if (!mp_obj_is_exact_type(arg, &mp_type_int)) {
+        mp_obj_t as_int = mp_unary_op(MP_UNARY_OP_INT_MAYBE, (mp_obj_t)arg);
+        if (as_int == MP_OBJ_NULL) {
+            mp_raise_TypeError_int_conversion(arg);
+        }
+        arg = as_int;
+    }
+    return mp_obj_int_get_uint_checked(arg);
+}
+
+long long mp_obj_get_ll(mp_const_obj_t arg) {
+    if (!mp_obj_is_exact_type(arg, &mp_type_int)) {
+        mp_obj_t as_int = mp_unary_op(MP_UNARY_OP_INT_MAYBE, (mp_obj_t)arg);
+        if (as_int == MP_OBJ_NULL) {
+            mp_raise_TypeError_int_conversion(arg);
+        }
+        arg = as_int;
+    }
+    if (mp_obj_is_small_int(arg)) {
+        return MP_OBJ_SMALL_INT_VALUE(arg);
+    } else {
+        long long res;
+        mp_obj_int_to_bytes_impl((mp_obj_t)arg, MP_ENDIANNESS_BIG, sizeof(res), (byte *)&res);
+        return res;
+    }
+}
+#endif
+
 mp_int_t mp_obj_get_int_truncated(mp_const_obj_t arg) {
     if (mp_obj_is_int(arg)) {
         return mp_obj_int_get_truncated(arg);
diff --git a/py/obj.h b/py/obj.h
index 0f87282a9f40b..a1df661ff0992 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -1051,6 +1051,8 @@ static inline bool mp_obj_is_integer(mp_const_obj_t o) {
 }
 
 mp_int_t mp_obj_get_int(mp_const_obj_t arg);
+mp_uint_t mp_obj_get_uint(mp_const_obj_t arg);
+long long mp_obj_get_ll(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);
 #if MICROPY_PY_BUILTINS_FLOAT
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 1940b815386a6..5b60eb65ad85e 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -295,6 +295,22 @@ mp_int_t mp_obj_int_get_checked(mp_const_obj_t self_in) {
     return mp_obj_int_get_truncated(self_in);
 }
 
+mp_uint_t mp_obj_int_get_uint_checked(mp_const_obj_t self_in) {
+    if (mp_obj_is_small_int(self_in)) {
+        if (MP_OBJ_SMALL_INT_VALUE(self_in) >= 0) {
+            return MP_OBJ_SMALL_INT_VALUE(self_in);
+        }
+    } else {
+        const mp_obj_int_t *self = self_in;
+        long long value = self->val;
+        mp_uint_t truncated = (mp_uint_t)value;
+        if (value >= 0 && (long long)truncated == value) {
+            return truncated;
+        }
+    }
+    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("overflow converting long int to machine word"));
+}
+
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mp_obj_int_as_float_impl(mp_obj_t self_in) {
     assert(mp_obj_is_exact_type(self_in, &mp_type_int));
diff --git a/tests/ports/unix/extra_coverage.py b/tests/ports/unix/extra_coverage.py
index ec68a55508132..72f5fe56b3a3e 100644
--- a/tests/ports/unix/extra_coverage.py
+++ b/tests/ports/unix/extra_coverage.py
@@ -6,6 +6,16 @@
 
 import errno
 import io
+import uctypes
+
+# create an int-like variable used for coverage of `mp_obj_get_ll`
+buf = bytearray(b"\xde\xad\xbe\xef")
+struct = uctypes.struct(
+    uctypes.addressof(buf),
+    {"f32": uctypes.UINT32 | 0},
+    uctypes.BIG_ENDIAN,
+)
+deadbeef = struct.f32
 
 data = extra_coverage()
 
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index ed21ced24258b..00658ab3adcea 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -94,6 +94,12 @@ data
 1
 0
 0.000000
+deadbeef
+c0ffee777c0ffee
+deadbeef
+0deadbeef
+c0ffee
+000c0ffee
 # runtime utils
 TypeError: unsupported type for __abs__: 'str'
 TypeError: unsupported types for __divmod__: 'str', 'str'
@@ -102,6 +108,8 @@ TypeError: unsupported types for __divmod__: 'str', 'str'
 2
 OverflowError: overflow converting long int to machine word
 OverflowError: overflow converting long int to machine word
+TypeError: can't convert NoneType to int
+TypeError: can't convert NoneType to int
 ValueError: 
 Warning: test
 # format float

From df05caea6c6437a8b4756ec502a5e6210f4b6256 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Tue, 1 Jul 2025 13:16:20 +0200
Subject: [PATCH 2496/3129] shared/timeutils: Standardize supported date range
 on all platforms.

This is code makes sure that time functions work properly on a
reasonable date range, on all platforms, regardless of the epoch.
The suggested minimum range is 1970 to 2099.

In order to reduce code footprint, code to support far away dates
is only enabled specified by the port.

New types are defined to identify timestamps.

The implementation with the smallest code footprint is when
support timerange is limited to 1970-2099 and Epoch is 1970.
This makes it possible to use 32 bit unsigned integers for
all timestamps.

On ARM4F, adding support for dates up to year 3000 adds
460 bytes of code. Supporting dates back to 1600 adds
another 44 bytes of code.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 extmod/modtime.c             |   4 +-
 extmod/vfs_fat.c             |   8 +--
 extmod/vfs_lfsx.c            |   8 +--
 ports/cc3200/mods/modtime.c  |   2 +-
 ports/esp32/modtime.c        |   2 +-
 ports/esp8266/modtime.c      |   4 +-
 ports/mimxrt/modtime.c       |   9 +--
 ports/renesas-ra/modtime.c   |   2 +-
 ports/stm32/modtime.c        |   2 +-
 ports/stm32/mpconfigport.h   |   1 +
 ports/unix/Makefile          |   4 ++
 ports/unix/modtime.c         |  10 +--
 ports/unix/mpconfigport.h    |   3 +
 ports/windows/Makefile       |   4 ++
 py/mpconfig.h                |  58 +++++++++++++++
 shared/timeutils/timeutils.c | 134 ++++++++++++++++++++++-------------
 shared/timeutils/timeutils.h | 118 +++++++++++++++++++++++-------
 tests/extmod/time_mktime.py  | 120 +++++++++++++++++++++++++++++++
 18 files changed, 387 insertions(+), 106 deletions(-)
 create mode 100644 tests/extmod/time_mktime.py

diff --git a/extmod/modtime.c b/extmod/modtime.c
index deb4bb4c9ace7..999b81230bcb9 100644
--- a/extmod/modtime.c
+++ b/extmod/modtime.c
@@ -58,7 +58,7 @@ static mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
         return mp_time_localtime_get();
     } else {
         // Convert given seconds to tuple.
-        mp_int_t seconds = mp_obj_get_int(args[0]);
+        mp_timestamp_t seconds = timeutils_obj_get_timestamp(args[0]);
         timeutils_struct_time_t tm;
         timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
         mp_obj_t tuple[8] = {
@@ -90,7 +90,7 @@ static mp_obj_t time_mktime(mp_obj_t tuple) {
         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]),
+    return timeutils_obj_from_timestamp(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])));
 }
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index ee1169b8c3193..e832992f46f4e 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -326,7 +326,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_epoch(
+    mp_timestamp_t seconds = timeutils_seconds_since_epoch(
         1980 + ((fno.fdate >> 9) & 0x7f),
         (fno.fdate >> 5) & 0x0f,
         fno.fdate & 0x1f,
@@ -341,9 +341,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_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
+    t->items[7] = timeutils_obj_from_timestamp(seconds); // st_atime
+    t->items[8] = timeutils_obj_from_timestamp(seconds); // st_mtime
+    t->items[9] = timeutils_obj_from_timestamp(seconds); // st_ctime
 
     return MP_OBJ_FROM_PTR(t);
 }
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 404eab84f47a8..372037784b484 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -378,7 +378,7 @@ 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;
+    mp_timestamp_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));
@@ -400,9 +400,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_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
+    t->items[7] = timeutils_obj_from_timestamp(mtime); // st_atime
+    t->items[8] = timeutils_obj_from_timestamp(mtime); // st_mtime
+    t->items[9] = timeutils_obj_from_timestamp(mtime); // st_ctime
 
     return MP_OBJ_FROM_PTR(t);
 }
diff --git a/ports/cc3200/mods/modtime.c b/ports/cc3200/mods/modtime.c
index 21388568ab8e8..254678fb2ddc5 100644
--- a/ports/cc3200/mods/modtime.c
+++ b/ports/cc3200/mods/modtime.c
@@ -50,5 +50,5 @@ static mp_obj_t mp_time_localtime_get(void) {
 
 // Returns the number of seconds, as an integer, since the Epoch.
 static mp_obj_t mp_time_time_get(void) {
-    return mp_obj_new_int(pyb_rtc_get_seconds());
+    return timeutils_obj_from_timestamp(pyb_rtc_get_seconds());
 }
diff --git a/ports/esp32/modtime.c b/ports/esp32/modtime.c
index 4695dd23e7f3e..991f2cf578771 100644
--- a/ports/esp32/modtime.c
+++ b/ports/esp32/modtime.c
@@ -54,5 +54,5 @@ static mp_obj_t mp_time_localtime_get(void) {
 static mp_obj_t mp_time_time_get(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return mp_obj_new_int(tv.tv_sec);
+    return timeutils_obj_from_timestamp(tv.tv_sec);
 }
diff --git a/ports/esp8266/modtime.c b/ports/esp8266/modtime.c
index 090300559751b..e99d920fde80b 100644
--- a/ports/esp8266/modtime.c
+++ b/ports/esp8266/modtime.c
@@ -31,7 +31,7 @@
 
 // Return the localtime as an 8-tuple.
 static mp_obj_t mp_time_localtime_get(void) {
-    mp_int_t seconds = pyb_rtc_get_us_since_epoch() / 1000 / 1000;
+    mp_uint_t seconds = pyb_rtc_get_us_since_epoch() / 1000u / 1000u;
     timeutils_struct_time_t tm;
     timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
     mp_obj_t tuple[8] = {
@@ -50,5 +50,5 @@ static mp_obj_t mp_time_localtime_get(void) {
 // Returns the number of seconds, as an integer, since the Epoch.
 static mp_obj_t mp_time_time_get(void) {
     // get date and time
-    return mp_obj_new_int(pyb_rtc_get_us_since_epoch() / 1000 / 1000);
+    return timeutils_obj_from_timestamp(pyb_rtc_get_us_since_epoch() / 1000 / 1000);
 }
diff --git a/ports/mimxrt/modtime.c b/ports/mimxrt/modtime.c
index a2ccf1b273fc7..3bcfac411c0b3 100644
--- a/ports/mimxrt/modtime.c
+++ b/ports/mimxrt/modtime.c
@@ -51,14 +51,7 @@ static mp_obj_t mp_time_localtime_get(void) {
 static mp_obj_t mp_time_time_get(void) {
     snvs_lp_srtc_datetime_t t;
     SNVS_LP_SRTC_GetDatetime(SNVS, &t);
-    // 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(
+    return timeutils_obj_from_timestamp(
         timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second)
-        & (t.year < 2000 ? 0xffffffff : 0xffffffffffff)
         );
 }
diff --git a/ports/renesas-ra/modtime.c b/ports/renesas-ra/modtime.c
index cbd639721fc2a..e1358f82bc5a4 100644
--- a/ports/renesas-ra/modtime.c
+++ b/ports/renesas-ra/modtime.c
@@ -53,5 +53,5 @@ static mp_obj_t mp_time_time_get(void) {
     rtc_init_finalise();
     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));
+    return timeutils_obj_from_timestamp(timeutils_seconds_since_epoch(time.year, time.month, time.date, time.hour, time.minute, time.second));
 }
diff --git a/ports/stm32/modtime.c b/ports/stm32/modtime.c
index ff1495a5d965a..87a4536b04374 100644
--- a/ports/stm32/modtime.c
+++ b/ports/stm32/modtime.c
@@ -59,5 +59,5 @@ static mp_obj_t mp_time_time_get(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_epoch(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds));
+    return timeutils_obj_from_timestamp(timeutils_seconds_since_epoch(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds));
 }
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 41ed3d08b7bb0..b910188c5afaf 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -76,6 +76,7 @@
 #ifndef MICROPY_FLOAT_IMPL // can be configured by each board via mpconfigboard.mk
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #endif
+#define MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_SCHEDULER_STATIC_NODES (1)
 #define MICROPY_SCHEDULER_DEPTH     (8)
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 3c54d156c31ba..8bd58a2542683 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -52,6 +52,10 @@ CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EX
 # This option has no effect on 64-bit builds.
 CFLAGS += -D_FILE_OFFSET_BITS=64
 
+# Force the use of 64-bits for time_t in C library functions on 32-bit platforms.
+# This option has no effect on 64-bit builds.
+CFLAGS += -D_TIME_BITS=64
+
 # Debugging/Optimization
 ifdef DEBUG
 COPT ?= -Og
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index fbd94b5ecd129..41b7c89df4243 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -34,6 +34,7 @@
 
 #include "py/mphal.h"
 #include "py/runtime.h"
+#include "shared/timeutils/timeutils.h"
 
 #ifdef _WIN32
 static inline int msec_sleep_tv(struct timeval *tv) {
@@ -130,12 +131,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 && 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
-        t = mp_obj_get_int(args[0]);
-        #endif
+        t = (time_t)timeutils_obj_get_timestamp(args[0]);
     }
     struct tm *tm = time_func(&t);
 
@@ -196,7 +192,7 @@ static mp_obj_t mod_time_mktime(mp_obj_t tuple) {
     if (ret == -1) {
         mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("invalid mktime usage"));
     }
-    return mp_obj_new_int(ret);
+    return timeutils_obj_from_timestamp(ret);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mod_time_mktime_obj, mod_time_mktime);
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 21ce75a351e98..973b5e74ce10d 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -124,6 +124,9 @@ typedef long mp_off_t;
 // VFS stat functions should return time values relative to 1970/1/1
 #define MICROPY_EPOCH_IS_1970       (1)
 
+// port modtime functions use time_t
+#define MICROPY_TIMESTAMP_IMPL      (MICROPY_TIMESTAMP_IMPL_TIME_T)
+
 // Assume that select() call, interrupted with a signal, and erroring
 // with EINTR, updates remaining timeout value.
 #define MICROPY_SELECT_REMAINING_TIME (1)
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 115d1a61ef51e..9eee98cdd4538 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -46,6 +46,10 @@ LDFLAGS += -lm -lbcrypt $(LDFLAGS_EXTRA)
 # This option has no effect on 64-bit builds.
 CFLAGS += -D_FILE_OFFSET_BITS=64
 
+# Force the use of 64-bits for time_t in C library functions on 32-bit platforms.
+# This option has no effect on 64-bit builds.
+CFLAGS += -D_TIME_BITS=64
+
 # Debugging/Optimization
 ifdef DEBUG
 CFLAGS += -g
diff --git a/py/mpconfig.h b/py/mpconfig.h
index cf0538cae4d39..4c1276275964d 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -893,6 +893,64 @@ typedef double mp_float_t;
 #define MICROPY_FULL_CHECKS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Ports can choose to use timestamps based on 2000-01-01 or 1970-01-01
+// Default is timestamps based on 2000-01-01
+#if !defined(MICROPY_EPOCH_IS_2000) && !defined(MICROPY_EPOCH_IS_1970)
+#define MICROPY_EPOCH_IS_2000 (1)
+#define MICROPY_EPOCH_IS_1970 (0)
+#elif !defined(MICROPY_EPOCH_IS_1970)
+#define MICROPY_EPOCH_IS_1970 (1 - (MICROPY_EPOCH_IS_2000))
+#elif !defined(MICROPY_EPOCH_IS_2000)
+#define MICROPY_EPOCH_IS_2000 (1 - (MICROPY_EPOCH_IS_1970))
+#endif
+
+// To maintain reasonable compatibility with CPython on embedded systems,
+// and avoid breaking anytime soon, time functions are defined to work
+// at least between 1970 and 2099 (included) on any machine.
+//
+// Specific ports can enable extended date support
+// - after 2099 using MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND
+// - before 1970 using MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+// The largest possible range is year 1600 to year 3000
+//
+// By default, extended date support is only enabled for machines using 64 bit pointers,
+// but it can be enabled by specific ports
+#ifndef MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+#if MP_SSIZE_MAX > 2147483647
+#define MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE (1)
+#else
+#define MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE (0)
+#endif
+#endif
+
+// When support for dates <1970 is enabled, supporting >=2100 does not cost anything
+#ifndef MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND
+#define MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND (MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE)
+#endif
+
+// The type to be used to represent platform-specific timestamps depends on the choices above
+#define MICROPY_TIMESTAMP_IMPL_LONG_LONG (0)
+#define MICROPY_TIMESTAMP_IMPL_UINT (1)
+#define MICROPY_TIMESTAMP_IMPL_TIME_T (2)
+
+#ifndef MICROPY_TIMESTAMP_IMPL
+#if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE || MICROPY_EPOCH_IS_2000
+#define MICROPY_TIMESTAMP_IMPL (MICROPY_TIMESTAMP_IMPL_LONG_LONG)
+#else
+#define MICROPY_TIMESTAMP_IMPL (MICROPY_TIMESTAMP_IMPL_UINT)
+#endif
+#endif
+
+// `mp_timestamp_t` is the type that should be used by the port
+// to represent timestamps, and is referenced to the platform epoch
+#if MICROPY_TIMESTAMP_IMPL == MICROPY_TIMESTAMP_IMPL_LONG_LONG
+typedef long long mp_timestamp_t;
+#elif MICROPY_TIMESTAMP_IMPL == MICROPY_TIMESTAMP_IMPL_UINT
+typedef mp_uint_t mp_timestamp_t;
+#elif MICROPY_TIMESTAMP_IMPL == MICROPY_TIMESTAMP_IMPL_TIME_T
+typedef time_t mp_timestamp_t;
+#endif
+
 // Whether POSIX-semantics non-blocking streams are supported
 #ifndef MICROPY_STREAMS_NON_BLOCK
 #define MICROPY_STREAMS_NON_BLOCK (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/shared/timeutils/timeutils.c b/shared/timeutils/timeutils.c
index 4282a0178dd6e..0c6916e06ddd6 100644
--- a/shared/timeutils/timeutils.c
+++ b/shared/timeutils/timeutils.c
@@ -29,12 +29,27 @@
 
 #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.
+// To maintain reasonable compatibility with CPython on embedded systems,
+// and avoid breaking anytime soon, timeutils functions are required to
+// work properly between 1970 and 2099 on all ports.
 //
-// Our timebase is relative to 2000-01-01.
-
-#define LEAPOCH ((31 + 29) * 86400)
+// During that period of time, leap years occur every 4 years without
+// exception, so we can keep the code short for 32 bit machines.
+
+// The last leap day before the required period is Feb 29, 1968.
+// This is the number of days to add to get to that date.
+#define PREV_LEAP_DAY  ((mp_uint_t)(365 + 366 - (31 + 29)))
+#define PREV_LEAP_YEAR 1968
+
+// On ports where either MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND or
+// MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE is enabled, we include extra
+// code to support leap years outside of the 'easy' period.
+// Computation is then made based on 1600 (a mod-400 year).
+// This is the number of days between 1600 and 1968.
+#define QC_BASE_DAY  134409
+#define QC_LEAP_YEAR 1600
+// This is the number of leap days between 1600 and 1970
+#define QC_LEAP_DAYS 89
 
 #define DAYS_PER_400Y (365 * 400 + 97)
 #define DAYS_PER_100Y (365 * 100 + 24)
@@ -42,8 +57,20 @@
 
 static const uint16_t days_since_jan1[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 };
 
+// type used internally to count small integers relative to epoch
+// (using uint when possible produces smaller code on some platforms)
+#if MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+typedef mp_int_t relint_t;
+#else
+typedef mp_uint_t relint_t;
+#endif
+
 bool timeutils_is_leap_year(mp_uint_t year) {
+    #if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
     return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0;
+    #else
+    return year % 4 == 0;
+    #endif
 }
 
 // month is one based
@@ -65,67 +92,67 @@ mp_uint_t timeutils_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date) {
     return yday;
 }
 
-void timeutils_seconds_since_2000_to_struct_time(mp_uint_t t, timeutils_struct_time_t *tm) {
-    // The following algorithm was adapted from musl's __secs_to_tm and adapted
-    // for differences in MicroPython's timebase.
-
-    mp_int_t seconds = t - LEAPOCH;
+void timeutils_seconds_since_1970_to_struct_time(timeutils_timestamp_t seconds, timeutils_struct_time_t *tm) {
+    // The following algorithm was inspired from musl's __secs_to_tm
+    // and simplified to reduce code footprint in the simple case
 
-    mp_int_t days = seconds / 86400;
+    relint_t days = seconds / 86400;
     seconds %= 86400;
+    #if MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
     if (seconds < 0) {
         seconds += 86400;
         days -= 1;
     }
+    #endif
     tm->tm_hour = seconds / 3600;
     tm->tm_min = seconds / 60 % 60;
     tm->tm_sec = seconds % 60;
 
-    mp_int_t wday = (days + 2) % 7;   // Mar 1, 2000 was a Wednesday (2)
+    relint_t wday = (days + 3) % 7;   // Jan 1, 1970 was a Thursday (3)
+    #if MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
     if (wday < 0) {
         wday += 7;
     }
+    #endif
     tm->tm_wday = wday;
 
-    mp_int_t qc_cycles = days / DAYS_PER_400Y;
+    days += PREV_LEAP_DAY;
+
+    #if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+    // rebase day to the oldest supported date (=> always positive)
+    mp_uint_t base_year = QC_LEAP_YEAR;
+    days += QC_BASE_DAY;
+    mp_uint_t qc_cycles = days / DAYS_PER_400Y;
     days %= DAYS_PER_400Y;
-    if (days < 0) {
-        days += DAYS_PER_400Y;
-        qc_cycles--;
-    }
-    mp_int_t c_cycles = days / DAYS_PER_100Y;
+    mp_uint_t c_cycles = days / DAYS_PER_100Y;
     if (c_cycles == 4) {
         c_cycles--;
     }
     days -= (c_cycles * DAYS_PER_100Y);
-
-    mp_int_t q_cycles = days / DAYS_PER_4Y;
+    #else
+    mp_uint_t base_year = PREV_LEAP_YEAR;
+    mp_uint_t qc_cycles = 0;
+    mp_uint_t c_cycles = 0;
+    #endif
+
+    mp_uint_t q_cycles = days / DAYS_PER_4Y;
+    #if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
     if (q_cycles == 25) {
         q_cycles--;
     }
+    #endif
     days -= q_cycles * DAYS_PER_4Y;
 
-    mp_int_t years = days / 365;
+    relint_t years = days / 365;
     if (years == 4) {
         years--;
     }
     days -= (years * 365);
 
-    /* We will compute tm_yday at the very end
-    mp_int_t leap = !years && (q_cycles || !c_cycles);
-
-    tm->tm_yday = days + 31 + 28 + leap;
-    if (tm->tm_yday >= 365 + leap) {
-        tm->tm_yday -= 365 + leap;
-    }
-
-    tm->tm_yday++;  // Make one based
-    */
-
-    tm->tm_year = 2000 + years + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles;
+    tm->tm_year = base_year + years + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles;
 
     // Note: days_in_month[0] corresponds to March
-    static const int8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29};
+    static const uint8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29};
 
     mp_int_t month;
     for (month = 0; days_in_month[month] <= days; month++) {
@@ -144,21 +171,28 @@ void timeutils_seconds_since_2000_to_struct_time(mp_uint_t t, timeutils_struct_t
 }
 
 // returns the number of seconds, as an integer, since 2000-01-01
-mp_uint_t timeutils_seconds_since_2000(mp_uint_t year, mp_uint_t month,
+timeutils_timestamp_t timeutils_seconds_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
-        second
-        + minute * 60
-        + hour * 3600
-        + (timeutils_year_day(year, month, date) - 1
-            + ((year - 2000 + 3) / 4) // add a day each 4 years starting with 2001
-            - ((year - 2000 + 99) / 100) // subtract a day each 100 years starting with 2001
-            + ((year - 2000 + 399) / 400) // add a day each 400 years starting with 2001
-            ) * 86400
-        + (year - 2000) * 31536000;
+    #if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+    mp_uint_t ref_year = QC_LEAP_YEAR;
+    #else
+    mp_uint_t ref_year = PREV_LEAP_YEAR;
+    #endif
+    timeutils_timestamp_t res;
+    res = ((relint_t)year - 1970) * 365;
+    res += (year - (ref_year + 1)) / 4; // add a day each 4 years
+    #if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+    res -= (year - (ref_year + 1)) / 100; // subtract a day each 100 years
+    res += (year - (ref_year + 1)) / 400; // add a day each 400 years
+    res -= QC_LEAP_DAYS;
+    #endif
+    res += timeutils_year_day(year, month, date) - 1;
+    res *= 86400;
+    res += hour * 3600 + minute * 60 + second;
+    return res;
 }
 
-mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
+timeutils_timestamp_t timeutils_mktime_1970(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:
@@ -211,12 +245,16 @@ mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
             year++;
         }
     }
-    return timeutils_seconds_since_2000(year, month, mday, hours, minutes, seconds);
+    return timeutils_seconds_since_1970(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;
+    return ((d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4
+        #if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+        - y / 100 + y / 400
+        #endif
+        ) + 6) % 7;
 }
diff --git a/shared/timeutils/timeutils.h b/shared/timeutils/timeutils.h
index 874d16e97646d..35356b462aafc 100644
--- a/shared/timeutils/timeutils.h
+++ b/shared/timeutils/timeutils.h
@@ -27,9 +27,23 @@
 #ifndef MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
 #define MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
 
+#include "py/obj.h"
+#if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+#include <math.h> // required for trunc()
+#endif
+
+// `timeutils_timestamp_t` is the type used internally by timeutils to
+// represent timestamps, and is always referenced to 1970.
+// It may not match the platform-specific `mp_timestamp_t`.
+#if MICROPY_TIME_SUPPORT_Y2100_AND_BEYOND || MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE
+typedef long long timeutils_timestamp_t;
+#else
+typedef mp_uint_t timeutils_timestamp_t;
+#endif
+
 // 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)
+#define TIMEUTILS_SECONDS_1970_TO_2000 (946684800LL)
 
 typedef struct _timeutils_struct_time_t {
     uint16_t tm_year;       // i.e. 2014
@@ -45,66 +59,116 @@ typedef struct _timeutils_struct_time_t {
 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);
+int timeutils_calc_weekday(int y, int m, int d);
 
-void timeutils_seconds_since_2000_to_struct_time(mp_uint_t t,
+void timeutils_seconds_since_1970_to_struct_time(timeutils_timestamp_t t,
     timeutils_struct_time_t *tm);
 
 // Year is absolute, month/date are 1-based, hour/minute/second are 0-based.
-mp_uint_t timeutils_seconds_since_2000(mp_uint_t year, mp_uint_t month,
+timeutils_timestamp_t timeutils_seconds_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);
 
 // Year is absolute, month/mday are 1-based, hours/minutes/seconds are 0-based.
-mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
+timeutils_timestamp_t timeutils_mktime_1970(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 mp_timestamp_t timeutils_obj_get_timestamp(mp_obj_t o_in) {
+    #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+    mp_float_t val = mp_obj_get_float(o_in);
+    return (mp_timestamp_t)MICROPY_FLOAT_C_FUN(trunc)(val);
+    #elif MICROPY_TIMESTAMP_IMPL == MICROPY_TIMESTAMP_IMPL_UINT
+    return mp_obj_get_uint(o_in);
+    #else
+    return mp_obj_get_ll(o_in);
+    #endif
+}
+
+static inline mp_obj_t timeutils_obj_from_timestamp(mp_timestamp_t t) {
+    #if MICROPY_TIMESTAMP_IMPL == MICROPY_TIMESTAMP_IMPL_UINT
+    return mp_obj_new_int_from_uint(t);
+    #else
+    return mp_obj_new_int_from_ll(t);
+    #endif
+}
+
+static inline void timeutils_seconds_since_2000_to_struct_time(mp_timestamp_t t, timeutils_struct_time_t *tm) {
+    timeutils_seconds_since_1970_to_struct_time((timeutils_timestamp_t)(t + TIMEUTILS_SECONDS_1970_TO_2000), tm);
+}
+
+// Year is absolute, month/date are 1-based, hour/minute/second are 0-based.
+static inline mp_timestamp_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) {
+    return (mp_timestamp_t)timeutils_seconds_since_1970(year, month, date, hour, minute, second) - TIMEUTILS_SECONDS_1970_TO_2000;
+}
+
+// Year is absolute, month/mday are 1-based, hours/minutes/seconds are 0-based.
+static inline mp_timestamp_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) {
+    return (mp_timestamp_t)timeutils_mktime_1970(year, month, mday, hours, minutes, seconds) - TIMEUTILS_SECONDS_1970_TO_2000;
+}
+
+
 // 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
-    timeutils_seconds_since_2000_to_struct_time((mp_uint_t)(t - TIMEUTILS_SECONDS_1970_TO_2000), tm);
+static inline void timeutils_seconds_since_epoch_to_struct_time(mp_timestamp_t t, timeutils_struct_time_t *tm) {
+    timeutils_seconds_since_1970_to_struct_time(t, tm);
+}
+
+// Year is absolute, month/date are 1-based, hour/minute/second are 0-based.
+static inline mp_timestamp_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_1970(year, month, date, hour, minute, second);
 }
 
 // Year is absolute, month/mday are 1-based, hours/minutes/seconds are 0-based.
-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 mp_timestamp_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_1970(year, month, mday, hours, minutes, seconds);
 }
 
-// Year is absolute, month/date are 1-based, hour/minute/second are 0-based.
-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;
+static inline mp_timestamp_t timeutils_seconds_since_epoch_from_nanoseconds_since_1970(int64_t ns) {
+    return (mp_timestamp_t)(ns / 1000000000LL);
 }
 
-static inline mp_uint_t timeutils_seconds_since_epoch_from_nanoseconds_since_1970(uint64_t ns) {
-    return (mp_uint_t)(ns / 1000000000ULL);
+static inline int64_t timeutils_seconds_since_epoch_to_nanoseconds_since_1970(mp_timestamp_t s) {
+    return (int64_t)s * 1000000000LL;
 }
 
-static inline uint64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970(uint64_t ns) {
+static inline int64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970(int64_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
-#define timeutils_mktime timeutils_mktime_2000
+static inline void timeutils_seconds_since_epoch_to_struct_time(mp_timestamp_t t, timeutils_struct_time_t *tm) {
+    timeutils_seconds_since_2000_to_struct_time(t, tm);
+}
+
+// Year is absolute, month/date are 1-based, hour/minute/second are 0-based.
+static inline mp_timestamp_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);
+}
+
+// Year is absolute, month/mday are 1-based, hours/minutes/seconds are 0-based.
+static inline mp_timestamp_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);
+}
 
-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_timestamp_t timeutils_seconds_since_epoch_from_nanoseconds_since_1970(int64_t ns) {
+    return (mp_timestamp_t)(ns / 1000000000LL - TIMEUTILS_SECONDS_1970_TO_2000);
 }
 
-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_seconds_since_epoch_to_nanoseconds_since_1970(mp_timestamp_t s) {
+    return ((int64_t)s + TIMEUTILS_SECONDS_1970_TO_2000) * 1000000000LL;
 }
 
 static inline int64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970(int64_t ns) {
-    return ns + TIMEUTILS_SECONDS_1970_TO_2000 * 1000000000ULL;
+    return ns + TIMEUTILS_SECONDS_1970_TO_2000 * 1000000000LL;
 }
 
 #endif
 
-int timeutils_calc_weekday(int y, int m, int d);
-
 #endif // MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
diff --git a/tests/extmod/time_mktime.py b/tests/extmod/time_mktime.py
new file mode 100644
index 0000000000000..7fc643dc3cb8c
--- /dev/null
+++ b/tests/extmod/time_mktime.py
@@ -0,0 +1,120 @@
+# test conversion from date tuple to timestamp and back
+
+try:
+    import time
+
+    time.localtime
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+# Range of date expected to work on all MicroPython platforms
+MIN_YEAR = 1970
+MAX_YEAR = 2099
+# CPython properly supported date range:
+# - on Windows: year 1970 to 3000+
+# - on Unix:    year 1583 to 3000+
+
+# Start test from Jan 1, 2001 13:00 (Feb 2000 might already be broken)
+SAFE_DATE = (2001, 1, 1, 13, 0, 0, 0, 0, -1)
+
+
+# mktime function that checks that the result is reversible
+def safe_mktime(date_tuple):
+    try:
+        res = time.mktime(date_tuple)
+        chk = time.localtime(res)
+    except OverflowError:
+        print("safe_mktime:", date_tuple, "overflow error")
+        return None
+    if chk[0:5] != date_tuple[0:5]:
+        print("safe_mktime:", date_tuple[0:5], " -> ", res, " -> ", chk[0:5])
+        return None
+    return res
+
+
+# localtime function that checks that the result is reversible
+def safe_localtime(timestamp):
+    try:
+        res = time.localtime(timestamp)
+        chk = time.mktime(res)
+    except OverflowError:
+        print("safe_localtime:", timestamp, "overflow error")
+        return None
+    if chk != timestamp:
+        print("safe_localtime:", timestamp, " -> ", res, " -> ", chk)
+        return None
+    return res
+
+
+# look for smallest valid timestamps by iterating backwards on tuple
+def test_bwd(date_tuple):
+    curr_stamp = safe_mktime(date_tuple)
+    year = date_tuple[0]
+    month = date_tuple[1] - 1
+    if month < 1:
+        year -= 1
+        month = 12
+    while year >= MIN_YEAR:
+        while month >= 1:
+            next_tuple = (year, month) + date_tuple[2:]
+            next_stamp = safe_mktime(next_tuple)
+            # at this stage, only test consistency and monotonicity
+            if next_stamp is None or next_stamp >= curr_stamp:
+                return date_tuple
+            date_tuple = next_tuple
+            curr_stamp = next_stamp
+            month -= 1
+        year -= 1
+        month = 12
+    return date_tuple
+
+
+# test day-by-day to ensure that every date is properly converted
+def test_fwd(start_date):
+    DAYS_PER_MONTH = (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
+    curr_stamp = safe_mktime(start_date)
+    curr_date = safe_localtime(curr_stamp)
+    while curr_date[0] <= MAX_YEAR:
+        if curr_date[2] < 15:
+            skip_days = 13
+        else:
+            skip_days = 1
+        next_stamp = curr_stamp + skip_days * 86400
+        next_date = safe_localtime(next_stamp)
+        if next_date is None:
+            return curr_date
+        if next_date[2] != curr_date[2] + skip_days:
+            # next month
+            if next_date[2] != 1:
+                print("wrong day of month:", next_date)
+                return curr_date
+            # check the number of days in previous month
+            month_days = DAYS_PER_MONTH[curr_date[1]]
+            if month_days == 28 and curr_date[0] % 4 == 0:
+                if curr_date[0] % 100 != 0 or curr_date[0] % 400 == 0:
+                    month_days += 1
+            if curr_date[2] != month_days:
+                print("wrong day count in prev month:", curr_date[2], "vs", month_days)
+                return curr_date
+            if next_date[1] != curr_date[1] + 1:
+                # next year
+                if curr_date[1] != 12:
+                    print("wrong month count in prev year:", curr_date[1])
+                    return curr_date
+                if next_date[1] != 1:
+                    print("wrong month:", next_date)
+                    return curr_date
+                if next_date[0] != curr_date[0] + 1:
+                    print("wrong year:", next_date)
+                    return curr_date
+        curr_stamp = next_stamp
+        curr_date = next_date
+    return curr_date
+
+
+small_date = test_bwd(SAFE_DATE)
+large_date = test_fwd(small_date)
+print("tested from", small_date[0:3], "to", large_date[0:3])
+print(small_date[0:3], "wday is", small_date[6])
+print(large_date[0:3], "wday is", large_date[6])

From 499bedf7aa07bb26dc19fb8b3ef5db5c8e578f52 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 10 Jul 2025 19:46:26 +0100
Subject: [PATCH 2497/3129] tools/ci.sh: Always call `apt-get update` before
 `apt-get install`.

There have been recent build failures in build_renesas_ra_board.  It
appears to be the case that a security update for this package was recently
issued by Ubuntu for CVE-2025-4565 and the buggy version is no longer on
package servers.  However, it is still referred to by the cached apt
metadata in the GitHub runners.

Add `apt-get update` to fix this, and audit for other sites in `ci.sh`
where it might also be necessary.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tools/ci.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 4007dfebfc3a2..518eb7449713b 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -13,11 +13,13 @@ ulimit -n 1024
 # general helper functions
 
 function ci_gcc_arm_setup {
+    sudo apt-get update
     sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
     arm-none-eabi-gcc --version
 }
 
 function ci_gcc_riscv_setup {
+    sudo apt-get update
     sudo apt-get install gcc-riscv64-unknown-elf picolibc-riscv64-unknown-elf
     riscv64-unknown-elf-gcc --version
 }
@@ -35,6 +37,7 @@ function ci_picotool_setup {
 # c code formatting
 
 function ci_c_code_formatting_setup {
+    sudo apt-get update
     sudo apt-get install uncrustify
     uncrustify --version
 }
@@ -703,6 +706,7 @@ function ci_unix_float_run_tests {
 }
 
 function ci_unix_clang_setup {
+    sudo apt-get update
     sudo apt-get install clang
     clang --version
 }
@@ -839,6 +843,7 @@ function ci_unix_qemu_riscv64_run_tests {
 # ports/windows
 
 function ci_windows_setup {
+    sudo apt-get update
     sudo apt-get install gcc-mingw-w64
 }
 

From 908f938c44cc45bd725cf14d09895ab7472dd67a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 13:08:36 +1000
Subject: [PATCH 2498/3129] tests/extmod/asyncio_iterator_event.py: Use format
 instead of f-string.

Some targets don't have f-strings enabled, so try not to use them in tests.
Rather, use `str.format`, which is more portable.

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

diff --git a/tests/extmod/asyncio_iterator_event.py b/tests/extmod/asyncio_iterator_event.py
index 6efa6b864567a..f61fefcf051be 100644
--- a/tests/extmod/asyncio_iterator_event.py
+++ b/tests/extmod/asyncio_iterator_event.py
@@ -50,7 +50,7 @@ def schedule_watchdog(end_ticks):
 async def test(ai):
     for x in range(3):
         await asyncio.sleep(0.1)
-        ai.fetch_data(f"bar {x}")
+        ai.fetch_data("bar {}".format(x))
 
 
 class AsyncIterable:

From 125d19ce7be05c91be332ba088cc38ada8020b2f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Jun 2025 12:25:01 +1000
Subject: [PATCH 2499/3129] tests/micropython: Add missing SystemExit after
 printing SKIP.

The test runner expects `print("SKIP")` to be followed by
`raise SystemExit`.  Otherwise it waits for 10 seconds for the target to
do a soft reset before timing out and continuing.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/meminfo.py   | 11 ++++++-----
 tests/micropython/memstats.py  | 17 +++++++++--------
 tests/micropython/stack_use.py |  5 +++--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/tests/micropython/meminfo.py b/tests/micropython/meminfo.py
index 9df341fbb8334..957f061f1539a 100644
--- a/tests/micropython/meminfo.py
+++ b/tests/micropython/meminfo.py
@@ -5,8 +5,9 @@
 # these functions are not always available
 if not hasattr(micropython, "mem_info"):
     print("SKIP")
-else:
-    micropython.mem_info()
-    micropython.mem_info(1)
-    micropython.qstr_info()
-    micropython.qstr_info(1)
+    raise SystemExit
+
+micropython.mem_info()
+micropython.mem_info(1)
+micropython.qstr_info()
+micropython.qstr_info(1)
diff --git a/tests/micropython/memstats.py b/tests/micropython/memstats.py
index dee3a4ce2f225..33204d908c626 100644
--- a/tests/micropython/memstats.py
+++ b/tests/micropython/memstats.py
@@ -5,13 +5,14 @@
 # these functions are not always available
 if not hasattr(micropython, "mem_total"):
     print("SKIP")
-else:
-    t = micropython.mem_total()
-    c = micropython.mem_current()
-    p = micropython.mem_peak()
+    raise SystemExit
 
-    l = list(range(10000))
+t = micropython.mem_total()
+c = micropython.mem_current()
+p = micropython.mem_peak()
 
-    print(micropython.mem_total() > t)
-    print(micropython.mem_current() > c)
-    print(micropython.mem_peak() > p)
+l = list(range(10000))
+
+print(micropython.mem_total() > t)
+print(micropython.mem_current() > c)
+print(micropython.mem_peak() > p)
diff --git a/tests/micropython/stack_use.py b/tests/micropython/stack_use.py
index 266885d9d1897..640bb8b2f38cf 100644
--- a/tests/micropython/stack_use.py
+++ b/tests/micropython/stack_use.py
@@ -3,5 +3,6 @@
 
 if not hasattr(micropython, "stack_use"):
     print("SKIP")
-else:
-    print(type(micropython.stack_use()))  # output varies
+    raise SystemExit
+
+print(type(micropython.stack_use()))  # output varies

From 8f8f8539827a4d38dd51e4960fe54a0ed8ab08ea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Jul 2025 00:45:13 +1000
Subject: [PATCH 2500/3129] tests/run-tests.py: Consider tests ending in
 _async.py as async tests.

The test `micropython/ringio_async.py` is a test that requires async
keyword support, and will fail with SyntaxError on targets that don't
support async/await.  Really it should be skipped on such targets, and this
commit makes sure that's the case.

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 faf1d2e3b485e..0eaee5278e0b0 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -886,7 +886,7 @@ def run_one_test(test_file):
         is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
         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_", "asyncio_"))
+        is_async = test_name.startswith(("async_", "asyncio_")) or test_name.endswith("_async")
         is_const = test_name.startswith("const")
         is_io_module = test_name.startswith("io_")
         is_fstring = test_name.startswith("string_fstring")

From 274306860b2d64b67ef6e8a14e8af3fd56c8d0ff Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Fri, 11 Jul 2025 08:24:20 +0800
Subject: [PATCH 2501/3129] tests/extmod: Close UDP sockets at end of test.

This adds call to release UDP port in a timely manner, so they can be
reused in subsequent tests.  Otherwise, one could face issue like #17623.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 tests/extmod/select_poll_udp.py     | 2 ++
 tests/extmod/socket_udp_nonblock.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/extmod/select_poll_udp.py b/tests/extmod/select_poll_udp.py
index 133871b1a4292..887176a4f655c 100644
--- a/tests/extmod/select_poll_udp.py
+++ b/tests/extmod/select_poll_udp.py
@@ -29,3 +29,5 @@
 if hasattr(select, "select"):
     r, w, e = select.select([s], [], [], 0)
     assert not r and not w and not e
+
+s.close()
diff --git a/tests/extmod/socket_udp_nonblock.py b/tests/extmod/socket_udp_nonblock.py
index 1e74e2917dc30..394115e4b8849 100644
--- a/tests/extmod/socket_udp_nonblock.py
+++ b/tests/extmod/socket_udp_nonblock.py
@@ -19,3 +19,5 @@
     s.recv(1)
 except OSError as er:
     print("EAGAIN:", er.errno == errno.EAGAIN)
+
+s.close()

From aa2362d4de3bed960b65c5e6e66544f68f2e7ed1 Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Tue, 8 Jul 2025 12:22:25 +0800
Subject: [PATCH 2502/3129] unix/Makefile: Drop include path of
 "i686-linux-gnu".

This drops use of non-existing path `/usr/include/i686-linux-gnu` as
default include paths shall suffice.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 ports/unix/Makefile | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 8bd58a2542683..4e4e81a965c07 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -120,16 +120,6 @@ LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
 # Flags to link with pthread library
 LIBPTHREAD = -lpthread
 
-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 += -I/usr/include/i686-linux-gnu
-endif
-endif
-endif
-
 ifeq ($(MICROPY_USE_READLINE),1)
 INC += -I$(TOP)/shared/readline
 CFLAGS += -DMICROPY_USE_READLINE=1

From 5e9189d6d1c00c92694888bf9c74276779c40716 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 5 Dec 2022 17:01:30 +1100
Subject: [PATCH 2503/3129] py/vm: Avoid heap-allocating slices when
 subscripting built-ins.

This commit adds a fast-path optimisation for when a BUILD_SLICE is
immediately followed by a LOAD/STORE_SUBSCR for a native type, to avoid
needing to allocate the slice on the heap.

In some cases (e.g. `a[1:3] = x`) this can result in no allocations at all.

We can't do this for instance types because the get/set/delattr
implementation may keep a reference to the slice.

Adds more tests to the basic slice tests to ensure that a stack-allocated
slice never makes it to Python, and also a heapalloc test that verifies
(when using bytecode) that assigning to a slice is no-alloc.

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/vm.c                              | 32 +++++++++++++++++++++---
 tests/basics/builtin_slice.py        | 37 ++++++++++++++++++++++++++--
 tests/micropython/heapalloc_slice.py | 18 ++++++++++++++
 tests/run-tests.py                   |  3 +++
 4 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 tests/micropython/heapalloc_slice.py

diff --git a/py/vm.c b/py/vm.c
index f87e52c929845..6f1179721a928 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -195,6 +195,22 @@
 #define TRACE_TICK(current_ip, current_sp, is_exception)
 #endif // MICROPY_PY_SYS_SETTRACE
 
+#if MICROPY_PY_BUILTINS_SLICE
+// This function is marked "no inline" so it doesn't increase the C stack usage of the main VM function.
+MP_NOINLINE static mp_obj_t *build_slice_stack_allocated(byte op, mp_obj_t *sp, mp_obj_t step) {
+    mp_obj_t stop = sp[2];
+    mp_obj_t start = sp[1];
+    mp_obj_slice_t slice = { .base = { .type = &mp_type_slice }, .start = start, .stop = stop, .step = step };
+    if (op == MP_BC_LOAD_SUBSCR) {
+        SET_TOP(mp_obj_subscr(TOP(), MP_OBJ_FROM_PTR(&slice), MP_OBJ_SENTINEL));
+    } else { // MP_BC_STORE_SUBSCR
+        mp_obj_subscr(TOP(), MP_OBJ_FROM_PTR(&slice), sp[-1]);
+        sp -= 2;
+    }
+    return sp;
+}
+#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:
@@ -849,9 +865,19 @@ unwind_jump:;
                         // 3-argument slice includes step
                         step = POP();
                     }
-                    mp_obj_t stop = POP();
-                    mp_obj_t start = TOP();
-                    SET_TOP(mp_obj_new_slice(start, stop, step));
+                    if ((*ip == MP_BC_LOAD_SUBSCR || *ip == MP_BC_STORE_SUBSCR) && mp_obj_is_native_type(mp_obj_get_type(sp[-2]))) {
+                        // Fast path optimisation for when the BUILD_SLICE is immediately followed
+                        // by a LOAD/STORE_SUBSCR for a native type to avoid needing to allocate
+                        // the slice on the heap.  In some cases (e.g. a[1:3] = x) this can result
+                        // in no allocations at all.  We can't do this for instance types because
+                        // the get/set/delattr implementation may keep a reference to the slice.
+                        byte op = *ip++;
+                        sp = build_slice_stack_allocated(op, sp - 2, step);
+                    } else {
+                        mp_obj_t stop = POP();
+                        mp_obj_t start = TOP();
+                        SET_TOP(mp_obj_new_slice(start, stop, step));
+                    }
                     DISPATCH();
                 }
                 #endif
diff --git a/tests/basics/builtin_slice.py b/tests/basics/builtin_slice.py
index df84d5c57bbc3..5197a7cada9e2 100644
--- a/tests/basics/builtin_slice.py
+++ b/tests/basics/builtin_slice.py
@@ -1,11 +1,44 @@
 # test builtin slice
 
+# ensures that slices passed to user types are heap-allocated and can be
+# safely stored as well as not overriden by subsequent slices.
+
 # print slice
 class A:
     def __getitem__(self, idx):
-        print(idx)
+        print("get", idx)
+        print("abc"[1:])
+        print("get", idx)
+        return idx
+
+    def __setitem__(self, idx, value):
+        print("set", idx)
+        print("abc"[1:])
+        print("set", idx)
+        self.saved_idx = idx
+        return idx
+
+    def __delitem__(self, idx):
+        print("del", idx)
+        print("abc"[1:])
+        print("del", idx)
         return idx
-s = A()[1:2:3]
+
+
+a = A()
+s = a[1:2:3]
+a[4:5:6] = s
+del a[7:8:9]
+
+print(a.saved_idx)
+
+# nested slicing
+print(A()[1 : A()[A()[2:3:4] : 5]])
+
+# tuple slicing
+a[1:2, 4:5, 7:8]
+a[1, 4:5, 7:8, 2]
+a[1:2, a[3:4], 5:6]
 
 # check type
 print(type(s) is slice)
diff --git a/tests/micropython/heapalloc_slice.py b/tests/micropython/heapalloc_slice.py
new file mode 100644
index 0000000000000..62d96595c719e
--- /dev/null
+++ b/tests/micropython/heapalloc_slice.py
@@ -0,0 +1,18 @@
+# slice operations that don't require allocation
+try:
+    from micropython import heap_lock, heap_unlock
+except (ImportError, AttributeError):
+    heap_lock = heap_unlock = lambda: 0
+
+b = bytearray(range(10))
+
+m = memoryview(b)
+
+heap_lock()
+
+b[3:5] = b"aa"
+m[5:7] = b"bb"
+
+heap_unlock()
+
+print(b)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 0eaee5278e0b0..fe338d7ffbaef 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -854,6 +854,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add(
             "micropython/emg_exc.py"
         )  # because native doesn't have proper traceback info
+        skip_tests.add(
+            "micropython/heapalloc_slice.py"
+        )  # because native doesn't do the stack-allocated slice optimisation
         skip_tests.add(
             "micropython/heapalloc_traceback.py"
         )  # because native doesn't have proper traceback info

From 0a4f9ec46bc0c962b5d0eff00e4ea49287fd9112 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 5 Jul 2025 15:09:06 +0100
Subject: [PATCH 2504/3129] py/mpprint: Rework integer vararg handling.

This adds support for %llx (needed by XINT_FMT for printing cell objects)
and incidentally support for capitalized output of %P.

It also reduces code size due to the common handling of all integers.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/mpprint.c | 97 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/py/mpprint.c b/py/mpprint.c
index 86dbfad05e30c..e56b949ddda5f 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -446,16 +446,36 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
             }
         }
 
-        // parse long specifiers (only for LP64 model where they make a difference)
-        #ifndef __LP64__
-        const
+        // parse long and long long specifiers (only where they make a difference)
+        #if defined(MICROPY_UNIX_COVERAGE) || (LONG_MAX > INT_MAX)
+        #define SUPPORT_L_FORMAT (1)
+        #else
+        #define SUPPORT_L_FORMAT (0)
         #endif
+        #if SUPPORT_L_FORMAT
         bool long_arg = false;
+        #endif
+
+        #if (MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D) || defined(_WIN64) || defined(MICROPY_UNIX_COVERAGE)
+        #define SUPPORT_LL_FORMAT (1)
+        #else
+        #define SUPPORT_LL_FORMAT (0)
+        #endif
+        #if SUPPORT_LL_FORMAT
+        bool long_long_arg = false;
+        #endif
+
         if (*fmt == 'l') {
             ++fmt;
-            #ifdef __LP64__
+            #if SUPPORT_L_FORMAT
             long_arg = true;
             #endif
+            #if SUPPORT_LL_FORMAT
+            if (*fmt == 'l') {
+                ++fmt;
+                long_long_arg = true;
+            }
+            #endif
         }
 
         if (*fmt == '\0') {
@@ -501,35 +521,50 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                 chrs += mp_print_strn(print, str, len, flags, fill, width);
                 break;
             }
-            case 'd': {
-                mp_int_t val;
-                if (long_arg) {
-                    val = va_arg(args, long int);
-                } else {
-                    val = va_arg(args, int);
-                }
-                chrs += mp_print_int(print, val, 1, 10, 'a', flags, fill, width);
-                break;
-            }
+            case 'd':
+            case 'p':
+            case 'P':
             case 'u':
             case 'x':
             case 'X': {
-                int base = 16 - ((*fmt + 1) & 6); // maps char u/x/X to base 10/16/16
-                char fmt_c = (*fmt & 0xf0) - 'P' + 'A'; // maps char u/x/X to char a/a/A
+                char fmt_chr = *fmt;
                 mp_uint_t val;
-                if (long_arg) {
-                    val = va_arg(args, unsigned long int);
+                if (fmt_chr == 'p' || fmt_chr == 'P') {
+                    val = va_arg(args, intptr_t);
+                }
+                #if SUPPORT_LL_FORMAT
+                else if (long_long_arg) {
+                    val = va_arg(args, unsigned long long);
+                }
+                #endif
+                #if SUPPORT_L_FORMAT
+                else if (long_arg) {
+                    if (sizeof(long) != sizeof(mp_uint_t) && fmt_chr == 'd') {
+                        val = va_arg(args, long);
+                    } else {
+                        val = va_arg(args, unsigned long);
+                    }
+                }
+                #endif
+                else {
+                    if (sizeof(int) != sizeof(mp_uint_t) && fmt_chr == 'd') {
+                        val = va_arg(args, int);
+                    } else {
+                        val = va_arg(args, unsigned);
+                    }
+                }
+                int base;
+                // Map format char x/p/X/P to a/a/A/A for hex letters.
+                // It doesn't matter what d/u map to.
+                char fmt_c = (fmt_chr & 0xf0) - 'P' + 'A';
+                if (fmt_chr == 'd' || fmt_chr == 'u') {
+                    base = 10;
                 } else {
-                    val = va_arg(args, unsigned int);
+                    base = 16;
                 }
-                chrs += mp_print_int(print, val, 0, base, fmt_c, flags, fill, width);
+                chrs += mp_print_int(print, val, fmt_chr == 'd', base, fmt_c, flags, fill, width);
                 break;
             }
-            case 'p':
-            case 'P': // don't bother to handle upcase for 'P'
-                // Use unsigned long int to work on both ILP32 and LP64 systems
-                chrs += mp_print_int(print, va_arg(args, unsigned long int), 0, 16, 'a', flags, fill, width);
-                break;
             #if MICROPY_PY_BUILTINS_FLOAT
             case 'e':
             case 'E':
@@ -545,18 +580,6 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                 #endif
                 break;
             }
-            #endif
-                // Because 'l' is eaten above, another 'l' means %ll.  We need to support
-                // this length specifier for OBJ_REPR_D (64-bit NaN boxing).
-                // TODO Either enable this unconditionally, or provide a specific config var.
-            #if (MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D) || defined(_WIN64)
-            case 'l': {
-                unsigned long long int arg_value = va_arg(args, unsigned long long int);
-                ++fmt;
-                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:
                 // if it's not %% then it's an unsupported format character

From 628d53d23cf42986bc3ae55fda2062e2016a7c2d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 5 Jul 2025 17:37:28 +0100
Subject: [PATCH 2505/3129] unix/coverage: Expand mp_printf coverage tests.

Test 'l' and 'll' sized objects.  When the platform's `mp_int_t` is not 64
bits, dummy values are printed instead so the test result can match across
all platforms.

Ensure hex test values have a letter so 'x' vs 'X' is tested.

And test 'p' and 'P' pointer printing.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c                  | 40 +++++++++++++++++++++++---
 tests/ports/unix/extra_coverage.py.exp | 23 ++++++++++++---
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 0df6bf279ae4d..68340d7f239a8 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -204,8 +204,20 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%d %+d % d\n", -123, 123, 123); // sign
         mp_printf(&mp_plat_print, "%05d\n", -123); // negative number with zero padding
         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, "%lx\n", 0x123fl); // long hex
+        mp_printf(&mp_plat_print, "%lX\n", 0x123fl); // capital long hex
+        if (sizeof(mp_int_t) == 8) {
+            mp_printf(&mp_plat_print, "%llx\n", LLONG_MAX); // long long hex
+            mp_printf(&mp_plat_print, "%llX\n", LLONG_MAX); // capital long long hex
+            mp_printf(&mp_plat_print, "%llu\n", ULLONG_MAX); // unsigned long long
+        } else {
+            // fake for platforms without narrower mp_int_t
+            mp_printf(&mp_plat_print, "7fffffffffffffff\n", LLONG_MAX);
+            mp_printf(&mp_plat_print, "7FFFFFFFFFFFFFFF\n", LLONG_MAX);
+            mp_printf(&mp_plat_print, "18446744073709551615\n", ULLONG_MAX);
+        }
+        mp_printf(&mp_plat_print, "%p\n", (void *)0x789f); // pointer
+        mp_printf(&mp_plat_print, "%P\n", (void *)0x789f); // pointer uppercase
         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
@@ -216,11 +228,31 @@ static mp_obj_t extra_coverage(void) {
         #endif
         mp_printf(&mp_plat_print, "%d\n", 0x80000000); // should print signed
         mp_printf(&mp_plat_print, "%u\n", 0x80000000); // should print unsigned
-        mp_printf(&mp_plat_print, "%x\n", 0x80000000); // should print unsigned
-        mp_printf(&mp_plat_print, "%X\n", 0x80000000); // should print unsigned
+        mp_printf(&mp_plat_print, "%x\n", 0x8000000f); // should print unsigned
+        mp_printf(&mp_plat_print, "%X\n", 0x8000000f); // should print unsigned
         mp_printf(&mp_plat_print, "abc\n%"); // string ends in middle of format specifier
         mp_printf(&mp_plat_print, "%%\n"); // literal % character
         mp_printf(&mp_plat_print, ".%-3s.\n", "a"); // left adjust
+
+        // Check that all kinds of mp_printf arguments are parsed out
+        // correctly, by having a char argument before and after each main type
+        // of value that can be formatted.
+        mp_printf(&mp_plat_print, "%c%%%c\n", '<', '>');
+        mp_printf(&mp_plat_print, "%c%p%c\n", '<', (void *)0xaaaa, '>');
+        mp_printf(&mp_plat_print, "%c%b%c\n", '<', true, '>');
+        mp_printf(&mp_plat_print, "%c%d%c\n", '<', 0xaaaa, '>');
+        mp_printf(&mp_plat_print, "%c%ld%c\n", '<', 0xaaaal, '>');
+        mp_printf(&mp_plat_print, "%c" INT_FMT "%c\n", '<', (mp_int_t)0xaaaa, '>');
+        mp_printf(&mp_plat_print, "%c%s%c\n", '<', "test", '>');
+        mp_printf(&mp_plat_print, "%c%f%c\n", '<', MICROPY_FLOAT_CONST(1000.), '>');
+        mp_printf(&mp_plat_print, "%c%q%c\n", '<', (qstr)MP_QSTR_True, '>');
+        if (sizeof(mp_int_t) == 8) {
+            mp_printf(&mp_plat_print, "%c%lld%c\n", '<', LLONG_MAX, '>');
+        } else {
+            mp_printf(&mp_plat_print, "<9223372036854775807>\n");
+        }
+
+
     }
 
     // GC
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 00658ab3adcea..e20871273d709 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -2,19 +2,34 @@
 -123 +123  123
 -0123
 123
-123
-1ABCDEF
+123f
+123F
+7fffffffffffffff
+7FFFFFFFFFFFFFFF
+18446744073709551615
+789f
+789F
 ab abc ' abc' ' True' 'Tru'
 
 false true
 (null)
 -2147483648
 2147483648
-80000000
-80000000
+8000000f
+8000000F
 abc
 %
 .a  .
+<%>
+<aaaa>
+<true>
+<43690>
+<43690>
+<43690>
+<test>
+<1000.000000>
+<True>
+<9223372036854775807>
 # GC
 0
 0

From 8504391766cf9cd181ea178669b75e362043694d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Jul 2025 12:56:49 +1000
Subject: [PATCH 2506/3129] alif/lwip_inc: Refactor lwipopts.h to use extmod's
 common options.

This change is a no-op for the firmware.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/lwip_inc/lwipopts.h | 43 ++++------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

diff --git a/ports/alif/lwip_inc/lwipopts.h b/ports/alif/lwip_inc/lwipopts.h
index c0622225e10de..62b6a84b6090d 100644
--- a/ports/alif/lwip_inc/lwipopts.h
+++ b/ports/alif/lwip_inc/lwipopts.h
@@ -1,49 +1,13 @@
 #ifndef MICROPY_INCLUDED_ALIF_LWIP_LWIPOPTS_H
 #define MICROPY_INCLUDED_ALIF_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
-#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_LOOPIF_MULTICAST           1
 #define LWIP_LOOPBACK_MAX_PBUFS         8
 
 #define LWIP_IPV6                       0
-#define LWIP_DHCP                       1
-#define LWIP_DHCP_CHECK_LINK_UP         1
-#define LWIP_DHCP_DOES_ACD_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 uint64_t se_services_rand64(void);
+
 #define LWIP_RAND() se_services_rand64()
 
 #define MEM_SIZE                        (16 * 1024)
@@ -55,6 +19,9 @@ extern uint64_t se_services_rand64(void);
 #define TCP_QUEUE_OOSEQ                 (1)
 #define MEMP_NUM_TCP_SEG                (2 * TCP_SND_QUEUELEN)
 
-typedef uint32_t sys_prot_t;
+// Include common lwIP configuration.
+#include "extmod/lwip-include/lwipopts_common.h"
+
+uint64_t se_services_rand64(void);
 
 #endif // MICROPY_INCLUDED_ALIF_LWIP_LWIPOPTS_H

From cf490ed34618782cef591a41438a62e1437d7d5c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Jul 2025 12:32:29 +1000
Subject: [PATCH 2507/3129] extmod/network_lwip: Add sys_untimeout_all_with_arg
 helper function.

Really lwIP should provide this, to deregister all callbacks on the given
netif.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/lwip-include/lwipopts_common.h |  3 +++
 extmod/modnetwork.h                   |  3 +++
 extmod/network_lwip.c                 | 13 +++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/extmod/lwip-include/lwipopts_common.h b/extmod/lwip-include/lwipopts_common.h
index 3e4230909499e..8cb1acfe2ca62 100644
--- a/extmod/lwip-include/lwipopts_common.h
+++ b/extmod/lwip-include/lwipopts_common.h
@@ -28,6 +28,9 @@
 
 #include "py/mpconfig.h"
 
+// This is needed to access `next_timeout` via `sys_timeouts_get_next_timeout()`.
+#define LWIP_TESTMODE                   1
+
 // This sys-arch protection is not needed.
 // Ports either protect lwIP code with flags, or run it at PendSV priority.
 #define SYS_ARCH_DECL_PROTECT(lev) do { } while (0)
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index d16329f07ddc2..754f6e12434be 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -82,6 +82,9 @@ extern const struct _mp_obj_type_t mp_network_ppp_lwip_type;
 #endif
 
 struct netif;
+
+void sys_untimeout_all_with_arg(void *arg);
+
 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);
diff --git a/extmod/network_lwip.c b/extmod/network_lwip.c
index 71dc295e1846e..9cfab6ef4cb53 100644
--- a/extmod/network_lwip.c
+++ b/extmod/network_lwip.c
@@ -52,6 +52,19 @@ int mp_mod_network_prefer_dns_use_ip_version = 4;
 
 // Implementations of network methods that can be used by any interface.
 
+// This follows sys_untimeout but removes all timeouts with the given argument.
+void sys_untimeout_all_with_arg(void *arg) {
+    for (struct sys_timeo **t = sys_timeouts_get_next_timeout(); *t != NULL;) {
+        if ((*t)->arg == arg) {
+            struct sys_timeo *next = (*t)->next;
+            memp_free(MEMP_SYS_TIMEOUT, *t);
+            *t = next;
+        } else {
+            t = &(*t)->next;
+        }
+    }
+}
+
 // This function provides the implementation of nic.ifconfig, is deprecated and will be removed.
 // Use network.ipconfig and nic.ipconfig instead.
 mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_obj_t *args) {

From 0b698b82417b17b1098af9e64433741154345252 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Jul 2025 12:32:53 +1000
Subject: [PATCH 2508/3129] rp2/mpnetworkport: Deregister all sys timeouts when
 netif is removed.

When mDNS is active on a netif it registers a lot of timeouts, namely:

    mdns_probe_and_announce
    mdns_handle_tc_question

    mdns_multicast_probe_timeout_reset_ipv4
    mdns_multicast_timeout_25ttl_reset_ipv4
    mdns_multicast_timeout_reset_ipv4
    mdns_send_multicast_msg_delayed_ipv4
    mdns_send_unicast_msg_delayed_ipv4

    mdns_multicast_probe_timeout_reset_ipv6
    mdns_multicast_timeout_25ttl_reset_ipv6
    mdns_multicast_timeout_reset_ipv6
    mdns_send_multicast_msg_delayed_ipv6
    mdns_send_unicast_msg_delayed_ipv6

These may still be active after a netif is removed, and if they are called
they will find that the mDNS state pointer in the netif is NULL and they
will crash.

These functions could be explicitly removed using `sys_untimeout()`, but
`mdns_handle_tc_question()` is static so it's not possible to access it.
Instead use the new `sys_untimeout_all_with_arg()` helper to deregister all
timeout callbacks when a netif is removed.

Fixes issue #17621.

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

diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index fed34be380a50..675552d1e5ce1 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -30,6 +30,7 @@
 
 #if MICROPY_PY_LWIP
 
+#include "extmod/modnetwork.h"
 #include "shared/runtime/softtimer.h"
 #include "lwip/netif.h"
 #include "lwip/timeouts.h"
@@ -183,6 +184,10 @@ static void mp_network_netif_status_cb(struct netif *netif, netif_nsc_reason_t r
         mp_network_soft_timer.mode = SOFT_TIMER_MODE_PERIODIC;
         soft_timer_reinsert(&mp_network_soft_timer, LWIP_TICK_RATE_MS);
     }
+
+    if (reason == LWIP_NSC_NETIF_REMOVED) {
+        sys_untimeout_all_with_arg(netif);
+    }
 }
 
 #endif // MICROPY_PY_LWIP

From 554f114f181ee942ee3c74e44cef653604abbaef Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 14 Jul 2025 12:45:42 -0400
Subject: [PATCH 2509/3129] examples/rp2/pio_uart_rx.py: Fix use of PIO
 constants.

Running the unmodified `pio_uart_rx.py` example by uploading the file and
importing it doesn't succeed, and instead emits a NameError at line 26.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 examples/rp2/pio_uart_rx.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/rp2/pio_uart_rx.py b/examples/rp2/pio_uart_rx.py
index f46aaa6a5e388..a5b2210876fc8 100644
--- a/examples/rp2/pio_uart_rx.py
+++ b/examples/rp2/pio_uart_rx.py
@@ -23,7 +23,7 @@
 @asm_pio(
     autopush=True,
     push_thresh=8,
-    in_shiftdir=rp2.PIO.SHIFT_RIGHT,
+    in_shiftdir=PIO.SHIFT_RIGHT,
     fifo_join=PIO.JOIN_RX,
 )
 def uart_rx_mini():
@@ -42,7 +42,7 @@ def uart_rx_mini():
 
 
 @asm_pio(
-    in_shiftdir=rp2.PIO.SHIFT_RIGHT,
+    in_shiftdir=PIO.SHIFT_RIGHT,
 )
 def uart_rx():
     # fmt: off

From c72a3e528d7909c212596b52de5f9a5fe0161f17 Mon Sep 17 00:00:00 2001
From: webreflection <andrea.giammarchi@gmail.com>
Date: Tue, 15 Jul 2025 10:40:15 +0200
Subject: [PATCH 2510/3129] webassembly/objpyproxy: Avoid throwing on implicit
 symbols access.

This commit improves get handling by guarding against implicit unknown
symbols accessed directly by specific JS native APIs.

Fixes issue #17657.

Signed-off-by: Andrea Giammarchi <andrea.giammarchi@gmail.com>
---
 ports/webassembly/objpyproxy.js              | 53 ++++++++++----------
 tests/ports/webassembly/py_proxy_get.mjs     | 14 ++++++
 tests/ports/webassembly/py_proxy_get.mjs.exp |  5 ++
 3 files changed, 46 insertions(+), 26 deletions(-)
 create mode 100644 tests/ports/webassembly/py_proxy_get.mjs
 create mode 100644 tests/ports/webassembly/py_proxy_get.mjs.exp

diff --git a/ports/webassembly/objpyproxy.js b/ports/webassembly/objpyproxy.js
index 0eafd0dec53de..64703d78a5589 100644
--- a/ports/webassembly/objpyproxy.js
+++ b/ports/webassembly/objpyproxy.js
@@ -165,34 +165,35 @@ const py_proxy_handler = {
         if (prop === "_ref") {
             return target._ref;
         }
-        if (prop === "then") {
-            return null;
-        }
 
-        if (prop === Symbol.iterator) {
-            // Get the Python object iterator, and return a JavaScript generator.
-            const iter_ref = Module.ccall(
-                "proxy_c_to_js_get_iter",
-                "number",
-                ["number"],
-                [target._ref],
-            );
-            return function* () {
-                const value = Module._malloc(3 * 4);
-                while (true) {
-                    const valid = Module.ccall(
-                        "proxy_c_to_js_iternext",
-                        "number",
-                        ["number", "pointer"],
-                        [iter_ref, value],
-                    );
-                    if (!valid) {
-                        break;
+        // ignore both then and all symbols but Symbol.iterator
+        if (prop === "then" || typeof prop !== "string") {
+            if (prop === Symbol.iterator) {
+                // Get the Python object iterator, and return a JavaScript generator.
+                const iter_ref = Module.ccall(
+                    "proxy_c_to_js_get_iter",
+                    "number",
+                    ["number"],
+                    [target._ref],
+                );
+                return function* () {
+                    const value = Module._malloc(3 * 4);
+                    while (true) {
+                        const valid = Module.ccall(
+                            "proxy_c_to_js_iternext",
+                            "number",
+                            ["number", "pointer"],
+                            [iter_ref, value],
+                        );
+                        if (!valid) {
+                            break;
+                        }
+                        yield proxy_convert_mp_to_js_obj_jsside(value);
                     }
-                    yield proxy_convert_mp_to_js_obj_jsside(value);
-                }
-                Module._free(value);
-            };
+                    Module._free(value);
+                };
+            }
+            return undefined;
         }
 
         const value = Module._malloc(3 * 4);
diff --git a/tests/ports/webassembly/py_proxy_get.mjs b/tests/ports/webassembly/py_proxy_get.mjs
new file mode 100644
index 0000000000000..825de7cabeb78
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_get.mjs
@@ -0,0 +1,14 @@
+// Test `<py-obj> get <attr>` on the JavaScript side, which tests PyProxy.get.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+x = {"a": 1}
+`);
+
+const x = mp.globals.get("x");
+console.log(x.a === 1);
+console.log(x.b === undefined);
+console.log(typeof x[Symbol.iterator] === "function");
+console.log(x[Symbol.toStringTag] === undefined);
+console.log(x.then === undefined);
diff --git a/tests/ports/webassembly/py_proxy_get.mjs.exp b/tests/ports/webassembly/py_proxy_get.mjs.exp
new file mode 100644
index 0000000000000..36c7afad66a16
--- /dev/null
+++ b/tests/ports/webassembly/py_proxy_get.mjs.exp
@@ -0,0 +1,5 @@
+true
+true
+true
+true
+true

From 2d8d64059fbc7cd72e40503e5af19eded73c3d47 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 18 Mar 2025 12:07:00 +1100
Subject: [PATCH 2511/3129] tests: Add specific tests for "long long" 64-bit
 bigints.

These will run on all ports which support them, but importantly
they'll also run on ports that don't support arbitrary precision
but do support 64-bit long ints.

Includes some test workarounds to account for things which will overflow
once "long long" big integers overflow (added in follow-up commit):

- uctypes_array_load_store test was failing already, now won't parse.
- all the ffi_int tests contain 64-bit unsigned values, that won't parse
  as long long.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/basics/int_64_basics.py            | 126 +++++++++++++++++++++++
 tests/extmod/uctypes_array_load_store.py |   7 ++
 tests/feature_check/int_64.py            |   2 +
 tests/feature_check/int_64.py.exp        |   1 +
 tests/run-tests.py                       |  14 ++-
 5 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 tests/basics/int_64_basics.py
 create mode 100644 tests/feature_check/int_64.py
 create mode 100644 tests/feature_check/int_64.py.exp

diff --git a/tests/basics/int_64_basics.py b/tests/basics/int_64_basics.py
new file mode 100644
index 0000000000000..73a06b64b13a0
--- /dev/null
+++ b/tests/basics/int_64_basics.py
@@ -0,0 +1,126 @@
+# test support for 64-bit long integers
+# (some ports don't support arbitrary precision but do support these)
+
+# this test is adapted from int_big1.py with numbers kept within 64-bit signed range
+
+# to test arbitrary precision integers
+
+x = 1000000000000000000
+xn = -1000000000000000000
+y = 2000000000000000000
+
+# printing
+print(x)
+print(y)
+print('%#X' % (x - x)) # print prefix
+print('{:#,}'.format(x)) # print with commas
+
+# construction
+print(int(x))
+
+# addition
+print(x + 1)
+print(x + y)
+print(x + xn == 0)
+print(bool(x + xn))
+
+# subtraction
+print(x - 1)
+print(x - y)
+print(y - x)
+print(x - x == 0)
+print(bool(x - x))
+
+# multiplication
+print(x * 2)
+print(1090511627776 * 1048500)
+
+# integer division
+print(x // 2)
+print(y // x)
+
+# bit inversion
+print(~x)
+print(~(-x))
+
+# left shift
+print("left shift positive")
+x = 0x40000000
+for i in range(32):
+    x = x << 1
+    print(x)
+
+# right shift
+print("right shift positive")
+x = 0x2000000000000000  # TODO: why can't second-tip bit be set?
+for i in range(64):
+    x = x >> 1
+    print(x)
+
+# left shift of a negative number
+print("left shift negative")
+for i in range(8):
+    print(-10000000000000000 << i)
+    print(-10000000000000001 << i)
+    print(-10000000000000002 << i)
+    print(-10000000000000003 << i)
+    print(-10000000000000004 << i)
+
+
+# right shift of a negative number
+print("right shift negative")
+for i in range(8):
+    print(-1000000000000000000 >> i)
+    print(-1000000000000000001 >> i)
+    print(-1000000000000000002 >> i)
+    print(-1000000000000000003 >> i)
+    print(-1000000000000000004 >> i)
+
+# conversion from string
+print(int("1234567890123456789"))
+print(int("-1234567890123456789"))
+print(int("1234567890abcdef", 16))
+print(int("1234567890ABCDEF", 16))
+print(int("-1234567890ABCDEF", 16))
+print(int("ijklmnopqrsz", 36))
+
+# numbers close to 64-bit limits
+print(int("-9111222333444555666"))
+print(int("9111222333444555666"))
+
+# numbers with preceding 0s
+print(int("-00000000000000000000009111222333444555666"))
+print(int("0000000000000000000000009111222333444555666"))
+
+# invalid characters in string
+try:
+    print(int("1234567890abcdef"))
+except ValueError:
+    print('ValueError');
+try:
+    print(int("123456789\x01"))
+except ValueError:
+    print('ValueError');
+
+# test parsing ints just on threshold of small to big
+# for 32 bit archs
+x = 1073741823 # small
+x = -1073741823 # small
+x = 1073741824 # big
+x = -1073741824 # big
+# for 64 bit archs
+x = 4611686018427387903 # small
+x = -4611686018427387903 # small
+x = 4611686018427387904 # big
+x = -4611686018427387904 # big
+
+# sys.maxsize is a constant bigint, so test it's compatible with dynamic ones
+import sys
+if hasattr(sys, "maxsize"):
+    print(sys.maxsize + 1 - 1 == sys.maxsize)
+else:
+    print(True)  # No maxsize property in this config
+
+# test extraction of big int value via mp_obj_get_int_maybe
+x = 1 << 62
+print('a' * (x + 4 - x))
diff --git a/tests/extmod/uctypes_array_load_store.py b/tests/extmod/uctypes_array_load_store.py
index 3b9bb6d7308ca..df7deb6837a17 100644
--- a/tests/extmod/uctypes_array_load_store.py
+++ b/tests/extmod/uctypes_array_load_store.py
@@ -6,6 +6,13 @@
     print("SKIP")
     raise SystemExit
 
+# 'int' needs to be able to represent UINT64 for this test
+try:
+    int("FF" * 8, 16)
+except OverflowError:
+    print("SKIP")
+    raise SystemExit
+
 N = 5
 
 for endian in ("NATIVE", "LITTLE_ENDIAN", "BIG_ENDIAN"):
diff --git a/tests/feature_check/int_64.py b/tests/feature_check/int_64.py
new file mode 100644
index 0000000000000..4d053782ca82b
--- /dev/null
+++ b/tests/feature_check/int_64.py
@@ -0,0 +1,2 @@
+# Check whether 64-bit long integers are supported
+print(1 << 62)
diff --git a/tests/feature_check/int_64.py.exp b/tests/feature_check/int_64.py.exp
new file mode 100644
index 0000000000000..aef5454e66263
--- /dev/null
+++ b/tests/feature_check/int_64.py.exp
@@ -0,0 +1 @@
+4611686018427387904
diff --git a/tests/run-tests.py b/tests/run-tests.py
index fe338d7ffbaef..c218afae7194a 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -628,6 +628,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     skip_tests = set()
     skip_native = False
     skip_int_big = False
+    skip_int_64 = False
     skip_bytearray = False
     skip_set_type = False
     skip_slice = False
@@ -658,6 +659,11 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         if output != b"1000000000000000000000000000000000000000000000\n":
             skip_int_big = True
 
+        # Check if 'long long' precision integers are supported, even if arbitrary precision is not
+        output = run_feature_check(pyb, args, "int_64.py")
+        if output != b"4611686018427387904\n":
+            skip_int_64 = True
+
         # Check if bytearray is supported, and skip such tests if it's not
         output = run_feature_check(pyb, args, "bytearray.py")
         if output != b"bytearray\n":
@@ -885,7 +891,12 @@ def run_one_test(test_file):
         test_name = os.path.splitext(os.path.basename(test_file))[0]
         is_native = test_name.startswith("native_") or test_name.startswith("viper_")
         is_endian = test_name.endswith("_endian")
-        is_int_big = test_name.startswith("int_big") or test_name.endswith("_intbig")
+        is_int_big = (
+            test_name.startswith("int_big")
+            or test_name.endswith("_intbig")
+            or test_name.startswith("ffi_int")  # these tests contain large integer literals
+        )
+        is_int_64 = test_name.startswith("int_64") or test_name.endswith("_int64")
         is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
         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
@@ -899,6 +910,7 @@ def run_one_test(test_file):
         skip_it |= skip_native and is_native
         skip_it |= skip_endian and is_endian
         skip_it |= skip_int_big and is_int_big
+        skip_it |= skip_int_64 and is_int_64
         skip_it |= skip_bytearray and is_bytearray
         skip_it |= skip_set_type and is_set_type
         skip_it |= skip_slice and is_slice

From 6d93b150b894c73656c33c56d049e45f70f8e3db Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 18 Mar 2025 13:27:02 +1100
Subject: [PATCH 2512/3129] tests/extmod/json_loads_int_64.py: Add test cases
 for LONGINT parse.

These tests cover the use of mp_obj_new_int_from_str_len when
mp_parse_num_integer overflows the SMALLINT limit, and also the case where
the value may not be null terminated.

Placed in a separate test file so that extmod/json test doesn't rely on
bigint support.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod/json_loads_int_64.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/extmod/json_loads_int_64.py

diff --git a/tests/extmod/json_loads_int_64.py b/tests/extmod/json_loads_int_64.py
new file mode 100644
index 0000000000000..193a3c28d8282
--- /dev/null
+++ b/tests/extmod/json_loads_int_64.py
@@ -0,0 +1,16 @@
+# Parse 64-bit integers from JSON payloads.
+#
+# This also exercises parsing integers from strings
+# where the value may not be null terminated (last line)
+try:
+    import json
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+print(json.loads("9111222333444555666"))
+print(json.loads("-9111222333444555666"))
+print(json.loads("9111222333444555666"))
+print(json.loads("-9111222333444555666"))
+print(json.loads("[\"9111222333444555666777\",9111222333444555666]"))

From a54b5d9aed871b20d76df3c45cd78bf51d28b249 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 18 Mar 2025 17:09:17 +1100
Subject: [PATCH 2513/3129] unix/variants: Add a 'longlong' variant to test
 64-bit bigints in CI.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_unix.yml              | 14 +++++++
 .../unix/variants/longlong/mpconfigvariant.h  | 37 +++++++++++++++++++
 .../unix/variants/longlong/mpconfigvariant.mk |  8 ++++
 tools/ci.sh                                   |  8 ++++
 4 files changed, 67 insertions(+)
 create mode 100644 ports/unix/variants/longlong/mpconfigvariant.h
 create mode 100644 ports/unix/variants/longlong/mpconfigvariant.mk

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 4b22926eaf8e5..60c0244a8f9e2 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -134,6 +134,20 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
+  longlong:
+    runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_32bit_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_longlong_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_longlong_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
   float:
     runs-on: ubuntu-latest
     steps:
diff --git a/ports/unix/variants/longlong/mpconfigvariant.h b/ports/unix/variants/longlong/mpconfigvariant.h
new file mode 100644
index 0000000000000..20c52e98f9dda
--- /dev/null
+++ b/ports/unix/variants/longlong/mpconfigvariant.h
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+// This config exists to test that the MICROPY_LONGINT_IMPL_LONGLONG variant
+// (i.e. minimal form of "big integer" that's backed by 64-bit int only) builds
+// and passes tests.
+
+#define MICROPY_LONGINT_IMPL           (MICROPY_LONGINT_IMPL_LONGLONG)
+
+// Set base feature level.
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+// Enable extra Unix features.
+#include "../mpconfigvariant_common.h"
diff --git a/ports/unix/variants/longlong/mpconfigvariant.mk b/ports/unix/variants/longlong/mpconfigvariant.mk
new file mode 100644
index 0000000000000..2d2c3706469fb
--- /dev/null
+++ b/ports/unix/variants/longlong/mpconfigvariant.mk
@@ -0,0 +1,8 @@
+# build interpreter with "bigints" implemented as "longlong"
+
+# otherwise, small int is essentially 64-bit
+MICROPY_FORCE_32BIT := 1
+
+MICROPY_PY_FFI := 0
+
+MPY_TOOL_FLAGS = -mlongint-impl longlong
diff --git a/tools/ci.sh b/tools/ci.sh
index 518eb7449713b..564b7810f57b3 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -695,6 +695,14 @@ function ci_unix_nanbox_run_tests {
     ci_unix_run_tests_full_no_native_helper nanbox PYTHON=python2.7
 }
 
+function ci_unix_longlong_build {
+    ci_unix_build_helper VARIANT=longlong
+}
+
+function ci_unix_longlong_run_tests {
+    ci_unix_run_tests_full_helper longlong
+}
+
 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

From 0cf1e7c0598c5daee6d63c8b0dff0d9d67899fec Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 19 Mar 2025 10:35:58 +1100
Subject: [PATCH 2514/3129] tests/thread: Rename thread_lock4 test to
 thread_lock4_intbig.

Relies on arbitrary precision math, so won't run on a port which
has threads & limited bigint support.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/thread/{thread_lock4.py => thread_lock4_intbig.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/thread/{thread_lock4.py => thread_lock4_intbig.py} (100%)

diff --git a/tests/thread/thread_lock4.py b/tests/thread/thread_lock4_intbig.py
similarity index 100%
rename from tests/thread/thread_lock4.py
rename to tests/thread/thread_lock4_intbig.py

From d07f103d68d8bb1b65cba047b9bef093b9375ebd Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 25 Mar 2025 09:53:44 +1100
Subject: [PATCH 2515/3129] tests: Skip bm_pidigits perf test if no arbitrary
 precision int support.

The other performance tests run and pass with only 64-bit big integer
support.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/perf_bench/bm_pidigits.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/perf_bench/bm_pidigits.py b/tests/perf_bench/bm_pidigits.py
index bdaa73cec7e9f..c935f103c5b78 100644
--- a/tests/perf_bench/bm_pidigits.py
+++ b/tests/perf_bench/bm_pidigits.py
@@ -5,6 +5,12 @@
 # This benchmark stresses big integer arithmetic.
 # Adapted from code on: http://benchmarksgame.alioth.debian.org/
 
+try:
+    int("0x10000000000000000", 16)
+except:
+    print("SKIP")  # No support for >64-bit integers
+    raise SystemExit
+
 
 def compose(a, b):
     aq, ar, as_, at = a

From 516aa02104c3344903bdda078b7c87f71f94938d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 26 Mar 2025 11:07:52 +1100
Subject: [PATCH 2516/3129] py/objint_longlong: Add arithmetic overflow checks.

Long long big integer support now raises an exception on overflow rather
than returning an undefined result.

Also adds an error when shifting by a negative value.

The new arithmetic checks are added in the misc.h header.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/misc.h                         | 105 ++++++++++++++++++++++++++++--
 py/objint_longlong.c              |  51 +++++++++++----
 tests/basics/int_64_basics.py     |  13 +++-
 tests/extmod/uctypes_addressof.py |   7 +-
 4 files changed, 154 insertions(+), 22 deletions(-)

diff --git a/py/misc.h b/py/misc.h
index 5d0893bbdd3f2..e034485838954 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -33,10 +33,15 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <limits.h>
 
 typedef unsigned char byte;
 typedef unsigned int uint;
 
+#ifndef __has_builtin
+#define __has_builtin(x) (0)
+#endif
+
 /** generic ops *************************************************/
 
 #ifndef MIN
@@ -374,26 +379,23 @@ static inline bool mp_check(bool value) {
 static inline uint32_t mp_popcount(uint32_t x) {
     return __popcnt(x);
 }
-#else
+#else // _MSC_VER
 #define mp_clz(x) __builtin_clz(x)
 #define mp_clzl(x) __builtin_clzl(x)
 #define mp_clzll(x) __builtin_clzll(x)
 #define mp_ctz(x) __builtin_ctz(x)
 #define mp_check(x) (x)
-#if defined __has_builtin
 #if __has_builtin(__builtin_popcount)
 #define mp_popcount(x) __builtin_popcount(x)
-#endif
-#endif
-#if !defined(mp_popcount)
+#else
 static inline uint32_t mp_popcount(uint32_t x) {
     x = x - ((x >> 1) & 0x55555555);
     x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
     x = (x + (x >> 4)) & 0x0F0F0F0F;
     return (x * 0x01010101) >> 24;
 }
-#endif
-#endif
+#endif // __has_builtin(__builtin_popcount)
+#endif // _MSC_VER
 
 #define MP_FIT_UNSIGNED(bits, value) (((value) & (~0U << (bits))) == 0)
 #define MP_FIT_SIGNED(bits, value) \
@@ -426,4 +428,93 @@ static inline uint32_t mp_clz_mpi(mp_int_t x) {
     #endif
 }
 
+// Overflow-checked operations for long long
+
+// Integer overflow builtins were added to GCC 5, but __has_builtin only in GCC 10
+//
+// Note that the builtins has a defined result when overflow occurs, whereas the custom
+// functions below don't update the result if an overflow would occur (to avoid UB).
+#define MP_GCC_HAS_BUILTIN_OVERFLOW (__GNUC__ >= 5)
+
+#if __has_builtin(__builtin_umulll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
+#define mp_mul_ull_overflow __builtin_umulll_overflow
+#else
+inline static bool mp_mul_ull_overflow(unsigned long long int x, unsigned long long int y, unsigned long long int *res) {
+    if (y > 0 && x > (ULLONG_MAX / y)) {
+        return true; // overflow
+    }
+    *res = x * y;
+    return false;
+}
+#endif
+
+#if __has_builtin(__builtin_smulll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
+#define mp_mul_ll_overflow __builtin_smulll_overflow
+#else
+inline static bool mp_mul_ll_overflow(long long int x, long long int y, long long int *res) {
+    bool overflow;
+
+    // Check for multiply overflow; see CERT INT32-C
+    if (x > 0) { // x is positive
+        if (y > 0) { // x and y are positive
+            overflow = (x > (LLONG_MAX / y));
+        } else { // x positive, y nonpositive
+            overflow = (y < (LLONG_MIN / x));
+        } // x positive, y nonpositive
+    } else { // x is nonpositive
+        if (y > 0) { // x is nonpositive, y is positive
+            overflow = (x < (LLONG_MIN / y));
+        } else { // x and y are nonpositive
+            overflow = (x != 0 && y < (LLONG_MAX / x));
+        } // End if x and y are nonpositive
+    } // End if x is nonpositive
+
+    if (!overflow) {
+        *res = x * y;
+    }
+
+    return overflow;
+}
+#endif
+
+#if __has_builtin(__builtin_saddll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
+#define mp_add_ll_overflow __builtin_saddll_overflow
+#else
+inline static bool mp_add_ll_overflow(long long int lhs, long long int rhs, long long int *res) {
+    bool overflow;
+
+    if (rhs > 0) {
+        overflow = (lhs > LLONG_MAX - rhs);
+    } else {
+        overflow = (lhs < LLONG_MIN - rhs);
+    }
+
+    if (!overflow) {
+        *res = lhs + rhs;
+    }
+
+    return overflow;
+}
+#endif
+
+#if __has_builtin(__builtin_ssubll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
+#define mp_sub_ll_overflow __builtin_ssubll_overflow
+#else
+inline static bool mp_sub_ll_overflow(long long int lhs, long long int rhs, long long int *res) {
+    bool overflow;
+
+    if (rhs > 0) {
+        overflow = (lhs < LLONG_MIN + rhs);
+    } else {
+        overflow = (lhs > LLONG_MAX + rhs);
+    }
+
+    if (!overflow) {
+        *res = lhs - rhs;
+    }
+
+    return overflow;
+}
+#endif
+
 #endif // MICROPY_INCLUDED_PY_MISC_H
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 5b60eb65ad85e..db09503215110 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -31,6 +31,7 @@
 #include "py/smallint.h"
 #include "py/objint.h"
 #include "py/runtime.h"
+#include "py/misc.h"
 
 #if MICROPY_PY_BUILTINS_FLOAT
 #include <math.h>
@@ -43,6 +44,10 @@
 const mp_obj_int_t mp_sys_maxsize_obj = {{&mp_type_int}, MP_SSIZE_MAX};
 #endif
 
+static void raise_long_long_overflow(void) {
+    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("result overflows long long storage"));
+}
+
 mp_obj_t mp_obj_int_from_bytes_impl(bool big_endian, size_t len, const byte *buf) {
     int delta = 1;
     if (!big_endian) {
@@ -120,7 +125,6 @@ mp_obj_t mp_obj_int_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
         // small int if the value fits without truncation
         case MP_UNARY_OP_HASH:
             return MP_OBJ_NEW_SMALL_INT((mp_int_t)o->val);
-
         case MP_UNARY_OP_POSITIVE:
             return o_in;
         case MP_UNARY_OP_NEGATIVE:
@@ -147,6 +151,8 @@ mp_obj_t mp_obj_int_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
 mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     long long lhs_val;
     long long rhs_val;
+    bool overflow = false;
+    long long result;
 
     if (mp_obj_is_small_int(lhs_in)) {
         lhs_val = MP_OBJ_SMALL_INT_VALUE(lhs_in);
@@ -167,13 +173,16 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
     switch (op) {
         case MP_BINARY_OP_ADD:
         case MP_BINARY_OP_INPLACE_ADD:
-            return mp_obj_new_int_from_ll(lhs_val + rhs_val);
+            overflow = mp_add_ll_overflow(lhs_val, rhs_val, &result);
+            break;
         case MP_BINARY_OP_SUBTRACT:
         case MP_BINARY_OP_INPLACE_SUBTRACT:
-            return mp_obj_new_int_from_ll(lhs_val - rhs_val);
+            overflow = mp_sub_ll_overflow(lhs_val, rhs_val, &result);
+            break;
         case MP_BINARY_OP_MULTIPLY:
         case MP_BINARY_OP_INPLACE_MULTIPLY:
-            return mp_obj_new_int_from_ll(lhs_val * rhs_val);
+            overflow = mp_mul_ll_overflow(lhs_val, rhs_val, &result);
+            break;
         case MP_BINARY_OP_FLOOR_DIVIDE:
         case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE:
             if (rhs_val == 0) {
@@ -199,9 +208,21 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
 
         case MP_BINARY_OP_LSHIFT:
         case MP_BINARY_OP_INPLACE_LSHIFT:
-            return mp_obj_new_int_from_ll(lhs_val << (int)rhs_val);
+            if ((int)rhs_val < 0) {
+                // negative shift not allowed
+                mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
+            }
+            result = lhs_val << (int)rhs_val;
+            // Left-shifting of negative values is implementation defined in C, but assume compiler
+            // will give us typical 2s complement behaviour unless the value overflows
+            overflow = rhs_val > 0 && ((lhs_val >= 0 && result < lhs_val) || (lhs_val < 0 && result > lhs_val));
+            break;
         case MP_BINARY_OP_RSHIFT:
         case MP_BINARY_OP_INPLACE_RSHIFT:
+            if ((int)rhs_val < 0) {
+                // negative shift not allowed
+                mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
+            }
             return mp_obj_new_int_from_ll(lhs_val >> (int)rhs_val);
 
         case MP_BINARY_OP_POWER:
@@ -213,18 +234,18 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
                 mp_raise_ValueError(MP_ERROR_TEXT("negative power with no float support"));
                 #endif
             }
-            long long ans = 1;
-            while (rhs_val > 0) {
+            result = 1;
+            while (rhs_val > 0 && !overflow) {
                 if (rhs_val & 1) {
-                    ans *= lhs_val;
+                    overflow = mp_mul_ll_overflow(result, lhs_val, &result);
                 }
-                if (rhs_val == 1) {
+                if (rhs_val == 1 || overflow) {
                     break;
                 }
                 rhs_val /= 2;
-                lhs_val *= lhs_val;
+                overflow = mp_mul_ll_overflow(lhs_val, lhs_val, &lhs_val);
             }
-            return mp_obj_new_int_from_ll(ans);
+            break;
         }
 
         case MP_BINARY_OP_LESS:
@@ -242,6 +263,12 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
             return MP_OBJ_NULL; // op not supported
     }
 
+    if (overflow) {
+        raise_long_long_overflow();
+    }
+
+    return mp_obj_new_int_from_ll(result);
+
 zero_division:
     mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("divide by zero"));
 }
@@ -267,7 +294,7 @@ mp_obj_t mp_obj_new_int_from_ll(long long val) {
 mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
     // TODO raise an exception if the unsigned long long won't fit
     if (val >> (sizeof(unsigned long long) * 8 - 1) != 0) {
-        mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("ulonglong too large"));
+        raise_long_long_overflow();
     }
     return mp_obj_new_int_from_ll(val);
 }
diff --git a/tests/basics/int_64_basics.py b/tests/basics/int_64_basics.py
index 73a06b64b13a0..289ea49b65ece 100644
--- a/tests/basics/int_64_basics.py
+++ b/tests/basics/int_64_basics.py
@@ -117,10 +117,21 @@
 # sys.maxsize is a constant bigint, so test it's compatible with dynamic ones
 import sys
 if hasattr(sys, "maxsize"):
-    print(sys.maxsize + 1 - 1 == sys.maxsize)
+    print(sys.maxsize - 1 + 1 == sys.maxsize)
 else:
     print(True)  # No maxsize property in this config
 
 # test extraction of big int value via mp_obj_get_int_maybe
 x = 1 << 62
 print('a' * (x + 4 - x))
+
+# negative shifts are invalid
+try:
+    print((1 << 48) >> -4)
+except ValueError as e:
+    print(e)
+
+try:
+    print((1 << 48) << -6)
+except ValueError as e:
+    print(e)
diff --git a/tests/extmod/uctypes_addressof.py b/tests/extmod/uctypes_addressof.py
index c83089d0f72af..213fcc05eee2b 100644
--- a/tests/extmod/uctypes_addressof.py
+++ b/tests/extmod/uctypes_addressof.py
@@ -12,5 +12,8 @@
     print(uctypes.addressof(uctypes.bytearray_at(1 << i, 8)))
 
 # Test address that is bigger than the greatest small-int but still within the address range.
-large_addr = maxsize + 1
-print(uctypes.addressof(uctypes.bytearray_at(large_addr, 8)) == large_addr)
+try:
+    large_addr = maxsize + 1
+    print(uctypes.addressof(uctypes.bytearray_at(large_addr, 8)) == large_addr)
+except OverflowError:
+    print(True)  # systems with 64-bit bigints will overflow on the above operation

From e9845ab20ec798c1d5bf00bd3b64ff5d96d94500 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 2 May 2025 15:39:35 +1000
Subject: [PATCH 2517/3129] py/smallint: Update mp_small_int_mul_overflow() to
 perform the multiply.

Makes it compatible with the __builtin_mul_overflow() syntax, used in
follow-up commit.

Includes optimisation in runtime.c to minimise the code size impact from
additional param.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/parsenum.c |  4 ++--
 py/runtime.c  | 13 +++++++------
 py/smallint.c |  5 ++++-
 py/smallint.h |  5 ++++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index 7e6695fbfcd70..31b332c180e31 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -99,10 +99,10 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
         }
 
         // add next digi and check for overflow
-        if (mp_small_int_mul_overflow(int_val, base)) {
+        if (mp_small_int_mul_overflow(int_val, base, &int_val)) {
             goto overflow;
         }
-        int_val = int_val * base + dig;
+        int_val += dig;
         if (!MP_SMALL_INT_FITS(int_val)) {
             goto overflow;
         }
diff --git a/py/runtime.c b/py/runtime.c
index 90587a010a460..0ab0626ef9407 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -505,13 +505,14 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
                     }
                     #endif
 
-                    if (mp_small_int_mul_overflow(lhs_val, rhs_val)) {
+                    mp_int_t int_res;
+                    if (mp_small_int_mul_overflow(lhs_val, rhs_val, &int_res)) {
                         // use higher precision
                         lhs = mp_obj_new_int_from_ll(lhs_val);
                         goto generic_binary_op;
                     } else {
                         // use standard precision
-                        return MP_OBJ_NEW_SMALL_INT(lhs_val * rhs_val);
+                        return MP_OBJ_NEW_SMALL_INT(int_res);
                     }
                 }
                 case MP_BINARY_OP_FLOOR_DIVIDE:
@@ -552,19 +553,19 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
                         mp_int_t ans = 1;
                         while (rhs_val > 0) {
                             if (rhs_val & 1) {
-                                if (mp_small_int_mul_overflow(ans, lhs_val)) {
+                                if (mp_small_int_mul_overflow(ans, lhs_val, &ans)) {
                                     goto power_overflow;
                                 }
-                                ans *= lhs_val;
                             }
                             if (rhs_val == 1) {
                                 break;
                             }
                             rhs_val /= 2;
-                            if (mp_small_int_mul_overflow(lhs_val, lhs_val)) {
+                            mp_int_t int_res;
+                            if (mp_small_int_mul_overflow(lhs_val, lhs_val, &int_res)) {
                                 goto power_overflow;
                             }
-                            lhs_val *= lhs_val;
+                            lhs_val = int_res;
                         }
                         lhs_val = ans;
                     }
diff --git a/py/smallint.c b/py/smallint.c
index aa542ca7bf29a..a494093d61a21 100644
--- a/py/smallint.c
+++ b/py/smallint.c
@@ -26,7 +26,7 @@
 
 #include "py/smallint.h"
 
-bool mp_small_int_mul_overflow(mp_int_t x, mp_int_t y) {
+bool mp_small_int_mul_overflow(mp_int_t x, mp_int_t y, mp_int_t *res) {
     // Check for multiply overflow; see CERT INT32-C
     if (x > 0) { // x is positive
         if (y > 0) { // x and y are positive
@@ -49,6 +49,9 @@ bool mp_small_int_mul_overflow(mp_int_t x, mp_int_t y) {
             }
         } // End if x and y are nonpositive
     } // End if x is nonpositive
+
+    // Result doesn't overflow
+    *res = x * y;
     return false;
 }
 
diff --git a/py/smallint.h b/py/smallint.h
index 584e0018d1ba3..e50f98651e6ae 100644
--- a/py/smallint.h
+++ b/py/smallint.h
@@ -68,7 +68,10 @@
 // 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);
+// Multiply two small ints.
+// If returns false, the correct result is stored in 'res'
+// If returns true, the multiplication would have overflowed. 'res' is unchanged.
+bool mp_small_int_mul_overflow(mp_int_t x, mp_int_t y, mp_int_t *res);
 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 17fbc5abdc7e139a922f6a11619deb7cb031e0cb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 15 Jul 2025 11:23:28 +1000
Subject: [PATCH 2518/3129] py/parsenum: Extend mp_parse_num_integer() to parse
 long long.

If big integer support is 'long long' then mp_parse_num_integer() can
parse to it directly instead of failing over from small int. This means
strtoll() is no longer pulled in, and fixes some bugs parsing long long
integers (i.e. can now parse negative values correctly, can now parse
values which aren't NULL terminated).

The (default) smallint parsing compiled code should stay the same here,
macros and a typedef are used to abstract some parts of it out.

When bigint is long long we parse to 'unsigned long long' first (to avoid
the code size hit of pulling in signed 64-bit math routines) and the
convert to signed at the end.

One tricky case this routine correctly overflows on is
int("9223372036854775808") which is one more than LLONG_MAX in decimal. No
unit test case added for this as it's too hard to detect 64-bit long
integer mode.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/objint_longlong.c | 10 ---------
 py/parsenum.c        | 51 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index db09503215110..22ac0ba12efa3 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -292,22 +292,12 @@ mp_obj_t mp_obj_new_int_from_ll(long long val) {
 }
 
 mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
-    // TODO raise an exception if the unsigned long long won't fit
     if (val >> (sizeof(unsigned long long) * 8 - 1) != 0) {
         raise_long_long_overflow();
     }
     return mp_obj_new_int_from_ll(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
-    char *endptr;
-    mp_obj_t result = mp_obj_new_int_from_ll(strtoll(*str, &endptr, base));
-    *str = endptr;
-    return result;
-}
-
 mp_int_t mp_obj_int_get_truncated(mp_const_obj_t self_in) {
     if (mp_obj_is_small_int(self_in)) {
         return MP_OBJ_SMALL_INT_VALUE(self_in);
diff --git a/py/parsenum.c b/py/parsenum.c
index 31b332c180e31..fcc69091737d0 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -46,6 +46,27 @@ static MP_NORETURN void raise_exc(mp_obj_t exc, mp_lexer_t *lex) {
     nlr_raise(exc);
 }
 
+#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_LONGLONG
+// For the common small integer parsing case, we parse directly to mp_int_t and
+// check that the value doesn't overflow a smallint (in which case we fail over
+// to bigint parsing if supported)
+typedef mp_int_t parsed_int_t;
+
+#define PARSED_INT_MUL_OVERFLOW mp_small_int_mul_overflow
+#define PARSED_INT_FITS MP_SMALL_INT_FITS
+#else
+// In the special case where bigint support is long long, we save code size by
+// parsing directly to long long and then return either a bigint or smallint
+// from the same result.
+//
+// To avoid pulling in (slow) signed 64-bit math routines we do the initial
+// parsing to an unsigned long long and only convert to signed at the end.
+typedef unsigned long long parsed_int_t;
+
+#define PARSED_INT_MUL_OVERFLOW mp_mul_ull_overflow
+#define PARSED_INT_FITS(I) ((I) <= (unsigned long long)LLONG_MAX)
+#endif
+
 mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, mp_lexer_t *lex) {
     const byte *restrict str = (const byte *)str_;
     const byte *restrict top = str + len;
@@ -76,7 +97,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
     str += mp_parse_num_base((const char *)str, top - str, &base);
 
     // string should be an integer number
-    mp_int_t int_val = 0;
+    parsed_int_t parsed_val = 0;
     const byte *restrict str_val_start = str;
     for (; str < top; str++) {
         // get next digit as a value
@@ -98,25 +119,29 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
             break;
         }
 
-        // add next digi and check for overflow
-        if (mp_small_int_mul_overflow(int_val, base, &int_val)) {
+        // add next digit and check for overflow
+        if (PARSED_INT_MUL_OVERFLOW(parsed_val, base, &parsed_val)) {
             goto overflow;
         }
-        int_val += dig;
-        if (!MP_SMALL_INT_FITS(int_val)) {
+        parsed_val += dig;
+        if (!PARSED_INT_FITS(parsed_val)) {
             goto overflow;
         }
     }
 
-    // negate value if needed
+    #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_LONGLONG
+    // The PARSED_INT_FITS check above ensures parsed_val fits in small int representation
+    ret_val = MP_OBJ_NEW_SMALL_INT(neg ? (-parsed_val) : parsed_val);
+have_ret_val:
+    #else
+    // The PARSED_INT_FITS check above ensures parsed_val won't overflow signed long long
+    long long signed_val = parsed_val;
     if (neg) {
-        int_val = -int_val;
+        signed_val = -signed_val;
     }
+    ret_val = mp_obj_new_int_from_ll(signed_val); // Could be large or small int
+    #endif
 
-    // create the small int
-    ret_val = MP_OBJ_NEW_SMALL_INT(int_val);
-
-have_ret_val:
     // check we parsed something
     if (str == str_val_start) {
         goto value_error;
@@ -135,6 +160,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
     return ret_val;
 
 overflow:
+    #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_LONGLONG
     // reparse using long int
     {
         const char *s2 = (const char *)str_val_start;
@@ -142,6 +168,9 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
         str = (const byte *)s2;
         goto have_ret_val;
     }
+    #else
+    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("result overflows long long storage"));
+    #endif
 
 value_error:
     {

From 7b38fa4fa3a1c44d224492b1f75a7a9f125c6d18 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Tue, 8 Jul 2025 10:54:00 -0400
Subject: [PATCH 2519/3129] tests/basics/fun_code_lnotab: Test removal of
 co_lnotab from v2.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/basics/fun_code_full.py   |  7 -------
 tests/basics/fun_code_lnotab.py | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 tests/basics/fun_code_lnotab.py

diff --git a/tests/basics/fun_code_full.py b/tests/basics/fun_code_full.py
index 5eb23150df09c..e1c867939a2a7 100644
--- a/tests/basics/fun_code_full.py
+++ b/tests/basics/fun_code_full.py
@@ -6,12 +6,6 @@
     print("SKIP")
     raise SystemExit
 
-try:
-    import warnings
-    warnings.simplefilter("ignore") # ignore deprecation warning about co_lnotab
-except ImportError:
-    pass
-
 def f(x, y):
     a = x + y
     b = x - y
@@ -25,7 +19,6 @@ def f(x, y):
 print(type(code.co_firstlineno)) # both ints (but mpy points to first line inside, cpy points to declaration)
 print(code.co_name)
 print(iter(code.co_names) is not None) # both iterable (but mpy returns dict with names as keys, cpy only the names; and not necessarily the same set)
-print(type(code.co_lnotab)) # both bytes
 
 co_lines = code.co_lines()
 
diff --git a/tests/basics/fun_code_lnotab.py b/tests/basics/fun_code_lnotab.py
new file mode 100644
index 0000000000000..9223e5730f0ea
--- /dev/null
+++ b/tests/basics/fun_code_lnotab.py
@@ -0,0 +1,34 @@
+# Test deprecation of co_lnotab
+
+try:
+    (lambda: 0).__code__.co_code
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+import unittest
+import sys
+
+
+mpy_is_v2 = getattr(sys.implementation, '_v2', False)
+
+
+def f():
+    pass
+
+
+class Test(unittest.TestCase):
+
+    @unittest.skipIf(mpy_is_v2, "Removed in MicroPython v2 and later.")
+    def test_co_lnotab_exists(self):
+        self.assertIsInstance(f.__code__.co_lnotab, bytes)
+
+    @unittest.skipUnless(mpy_is_v2, "Not removed before MicroPython v2.")
+    def test_co_lnotab_removed(self):
+        with self.assertRaises(AttributeError):
+            f.__code__.co_lnotab
+
+
+if __name__ == "__main__":
+    unittest.main()

From ddf2c3afb17c0ea3dd678d02d9c2f01bed5a3020 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Tue, 8 Jul 2025 12:50:37 -0400
Subject: [PATCH 2520/3129] py/objcode: Remove co_lnotab from v2 preview.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/objcode.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/objcode.c b/py/objcode.c
index 52df84d012b58..1ee33936c5a5f 100644
--- a/py/objcode.c
+++ b/py/objcode.c
@@ -69,6 +69,7 @@ static mp_obj_tuple_t *code_consts(const mp_module_context_t *context, const mp_
     return consts;
 }
 
+#if !MICROPY_PREVIEW_VERSION_2
 static mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
     // const mp_bytecode_prelude_t *prelude = &rc->prelude;
     uint start = 0;
@@ -106,6 +107,7 @@ static mp_obj_t raw_code_lnotab(const mp_raw_code_t *rc) {
     m_del(byte, buffer, buffer_size);
     return o;
 }
+#endif
 
 static mp_obj_t code_colines_iter(mp_obj_t);
 static mp_obj_t code_colines_next(mp_obj_t);
@@ -198,12 +200,14 @@ static void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         case MP_QSTR_co_names:
             dest[0] = MP_OBJ_FROM_PTR(o->dict_locals);
             break;
+        #if !MICROPY_PREVIEW_VERSION_2
         case MP_QSTR_co_lnotab:
             if (!o->lnotab) {
                 o->lnotab = raw_code_lnotab(rc);
             }
             dest[0] = o->lnotab;
             break;
+        #endif
         case MP_QSTR_co_lines:
             dest[0] = MP_OBJ_FROM_PTR(&code_colines_obj);
             dest[1] = self_in;

From a8d50fb6536a6073e2fc6969cf8ac6a273337332 Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Wed, 9 Jul 2025 09:12:52 +0800
Subject: [PATCH 2521/3129] py/mkrules.mk: Mute blobless errors.

This mutes usage error for blobless update from older `git` to
reduce noise upon submodule updating.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 py/mkrules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 495d8d48bd2fc..3120066fd4fa3 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -268,7 +268,7 @@ submodules:
 	$(ECHO) "Updating submodules: $(GIT_SUBMODULES)"
 ifneq ($(GIT_SUBMODULES),)
 	$(Q)cd $(TOP) && git submodule sync $(GIT_SUBMODULES)
-	$(Q)cd $(TOP) && git submodule update --init --filter=blob:none $(GIT_SUBMODULES) || \
+	$(Q)cd $(TOP) && git submodule update --init --filter=blob:none $(GIT_SUBMODULES) 2>/dev/null || \
 	  git submodule update --init $(GIT_SUBMODULES)
 endif
 .PHONY: submodules

From 5f55f8d01acd8a9f2223f62dd56a99b554d7f7a2 Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Wed, 16 Jul 2025 17:15:52 +0800
Subject: [PATCH 2522/3129] tools/pyboard.py: Align execpty prefix.

This aligns the prefix string in L285 to that in L284 though the
two strings have equal length.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 tools/pyboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 40928e8bbbe93..50ecd33b7ab24 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -282,7 +282,7 @@ def __init__(
         if device.startswith("exec:"):
             self.serial = ProcessToSerial(device[len("exec:") :])
         elif device.startswith("execpty:"):
-            self.serial = ProcessPtyToTerminal(device[len("qemupty:") :])
+            self.serial = ProcessPtyToTerminal(device[len("execpty:") :])
         elif device and device[0].isdigit() and device[-1].isdigit() and device.count(".") == 3:
             # device looks like an IP address
             self.serial = TelnetToSerial(device, user, password, read_timeout=10)

From b63e5280765d2e92c5b98bbfc6714d73a8296184 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 8 Jul 2025 23:06:05 +0200
Subject: [PATCH 2523/3129] examples/natmod/btree: Fix build on RV32 with
 Picolibc.

This commit fixes building the "btree" example natmod on RV32 when
Picolibc is being used and uses thread-local storage for storing the
errno variable.

The fix is surprisingly simple: Picolibc allows overriding the function
that will provide a pointer to the "errno" variable, and the btree
natmod integration code already has all of this machinery set up as part
of its library integration.  Redirecting Picolibc to the already
existing pointer provider function via a compile-time definition is
enough to let the module compile and pass QEMU tests.

This workaround will work on any Picolibc versions (Arm, RV32, Xtensa,
etc.) even if TLS support was not enabled to begin with, and will
effectively do nothing if the toolchain used will rely on Newlib to
provide standard C library functions.

Given that the btree module now builds and passes the relevant natmod
tests, said module is now part of the QEMU port's natmod testing
procedure, and CI now will build the btree module for RV32 as part to
its checks.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 examples/natmod/btree/Makefile | 3 +++
 ports/qemu/Makefile            | 3 +--
 tools/ci.sh                    | 8 +-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/examples/natmod/btree/Makefile b/examples/natmod/btree/Makefile
index 6273ccc6572a9..bcaa7a93d11be 100644
--- a/examples/natmod/btree/Makefile
+++ b/examples/natmod/btree/Makefile
@@ -36,6 +36,9 @@ ifeq ($(ARCH),xtensa)
 MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
 endif
 
+# Use our own errno implementation if Picolibc is used
+CFLAGS += -D__PICOLIBC_ERRNO_FUNCTION=__errno
+
 include $(MPY_DIR)/py/dynruntime.mk
 
 # btree needs gnu99 defined
diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index e9e1e0f957e2b..646659ceda56b 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -191,12 +191,11 @@ test_full: $(BUILD)/firmware.elf
 	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS) --via-mpy
 	cd $(TOP)/tests && ./run-tests.py $(RUN_TESTS_FULL_ARGS) --via-mpy --emit native
 
-# "btree" currently does not build for rv32imc (Picolibc TLS incompatibility).
 .PHONY: test_natmod
 test_natmod: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && \
-		for natmod in deflate framebuf heapq random_basic re; do \
+		for natmod in btree deflate framebuf heapq random_basic re; do \
 		./run-natmodtests.py -p -d execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" extmod/$$natmod*.py; \
 		done
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 564b7810f57b3..510bb3a4d3c8c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -563,7 +563,7 @@ function ci_native_mpy_modules_build {
     else
         arch=$1
     fi
-    for natmod in deflate features1 features3 features4 framebuf heapq random re
+    for natmod in btree deflate features1 features3 features4 framebuf heapq random re
     do
         make -C examples/natmod/$natmod ARCH=$arch clean
         make -C examples/natmod/$natmod ARCH=$arch
@@ -576,12 +576,6 @@ function ci_native_mpy_modules_build {
     else
         make -C examples/natmod/features2 ARCH=$arch
     fi
-
-    # btree requires thread local storage support on rv32imc.
-    if [ $arch != "rv32imc" ]; then
-        make -C examples/natmod/btree ARCH=$arch clean
-        make -C examples/natmod/btree ARCH=$arch
-    fi
 }
 
 function ci_native_mpy_modules_32bit_build {

From e993f53877027bc46b226d026845e523c2cc94ca Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 9 Jul 2025 17:14:13 +0200
Subject: [PATCH 2524/3129] docs/develop/natmod: Add notes on Picolibc and
 natmods.

This commit adds some documentation on what are the limitations of using
Picolibc as a standard C library for native modules.

This also contains a reference to the "errno" issue when building
natmods on RV32 that the PR this commit is part of, as it is not obvious
how to approach this issue when encountered for the first time.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/develop/natmod.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index 2ccd83288565c..072d78b2076b4 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -67,6 +67,9 @@ The known limitations are:
 
 * static BSS variables are not supported; workaround: use global BSS variables
 
+* thread-local storage variables are not supported on rv32imc; workaround: use
+  global BSS variables or allocate some space on the heap to store them
+
 So, if your C code has writable data, make sure the data is defined globally,
 without an initialiser, and only written to within functions.
 
@@ -225,6 +228,26 @@ other module, for example::
     print(factorial.factorial(10))
     # should display 3628800
 
+Using Picolibc when building modules
+------------------------------------
+
+Using `Picolibc <https://github.com/picolibc/picolibc>`_ as your C standard
+library is not only supported, but in fact it is the default for the rv32imc
+platform.  However, there are a couple of things worth mentioning to make sure
+you don't run into problems later when building code.
+
+Some pre-built Picolibc versions (for example, those provided by Ubuntu Linux
+as the ``picolibc-arm-none-eabi``, ``picolibc-riscv64-unknown-elf``, and
+``picolibc-xtensa-lx106-elf`` packages) assume thread-local storage (TLS) is
+available at runtime, but unfortunately MicroPython modules do not support that
+on some architectures (namely ``rv32imc``).  This means that some
+functionalities provided by Picolibc will default to use TLS, returning an
+error either during compilation or during linking.
+
+For an example on how this may affect you, the ``examples/natmod/btree``
+example module contains a workaround to make sure ``errno`` works (look for
+``__PICOLIBC_ERRNO_FUNCTION`` in the Makefile and follow the trail from there).
+
 Further examples
 ----------------
 

From 18f2e94846111ad05d49e260c59de366f3ae2489 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 15 Jul 2025 13:32:55 +1000
Subject: [PATCH 2525/3129] py/modsys: Add sys.implementation._thread
 attribute.

This is useful to distinguish between GIL and non-GIL builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/sys.rst | 10 ++++++++++
 py/modsys.c          | 24 ++++++++++++++++++++----
 tests/basics/sys1.py |  6 ++++++
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index baefd927051d2..cf80552178510 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -77,6 +77,8 @@ Constants
    * *_mpy* - supported mpy file-format version (optional attribute)
    * *_build* - string that can help identify the configuration that
      MicroPython was built with
+   * *_thread* - optional string attribute, exists if the target has threading
+     and is either "GIL" or "unsafe"
 
    This object is the recommended way to distinguish MicroPython from other
    Python implementations (note that it still may not exist in the very
@@ -95,6 +97,14 @@ Constants
    * On microcontroller targets, the first element is the board name and the second
      element (if present) is the board variant, for example ``'RPI_PICO2-RISCV'``
 
+   The *_thread* entry was added in version 1.26.0 and if it exists then the
+   target has the ``_thread`` module.  If the target enables the GIL (global
+   interpreter lock) then this attribute is ``"GIL"``.  Otherwise the attribute
+   is ``"unsafe"`` and the target has threading but does not enable the GIL,
+   and mutable Python objects (such as `bytearray`, `list` and `dict`) that are
+   shared amongst threads must be protected explicitly by locks such as
+   ``_thread.allocate_lock``.
+
    .. admonition:: Difference to CPython
       :class: attention
 
diff --git a/py/modsys.c b/py/modsys.c
index 9ab02293b9063..ef6273fc8c7ea 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -103,6 +103,18 @@ static const MP_DEFINE_STR_OBJ(mp_sys_implementation__build_obj, MICROPY_BOARD_B
 #define SYS_IMPLEMENTATION_ELEMS__BUILD
 #endif
 
+#if MICROPY_PY_THREAD
+#if MICROPY_PY_THREAD_GIL
+#define SYS_IMPLEMENTATION_ELEMS__THREAD \
+    , MP_ROM_QSTR(MP_QSTR_GIL)
+#else
+#define SYS_IMPLEMENTATION_ELEMS__THREAD \
+    , MP_ROM_QSTR(MP_QSTR_unsafe)
+#endif
+#else
+#define SYS_IMPLEMENTATION_ELEMS__THREAD
+#endif
+
 #if MICROPY_PREVIEW_VERSION_2
 #define SYS_IMPLEMENTATION_ELEMS__V2 \
     , MP_ROM_TRUE
@@ -120,6 +132,9 @@ static const qstr impl_fields[] = {
     #if defined(MICROPY_BOARD_BUILD_NAME)
     MP_QSTR__build,
     #endif
+    #if MICROPY_PY_THREAD
+    MP_QSTR__thread,
+    #endif
     #if MICROPY_PREVIEW_VERSION_2
     MP_QSTR__v2,
     #endif
@@ -127,20 +142,21 @@ static const qstr impl_fields[] = {
 static MP_DEFINE_ATTRTUPLE(
     mp_sys_implementation_obj,
     impl_fields,
-    3 + MICROPY_PERSISTENT_CODE_LOAD + MICROPY_BOARD_BUILD + MICROPY_PREVIEW_VERSION_2,
+    3 + MICROPY_PERSISTENT_CODE_LOAD + MICROPY_BOARD_BUILD + MICROPY_PY_THREAD + MICROPY_PREVIEW_VERSION_2,
     SYS_IMPLEMENTATION_ELEMS_BASE
     SYS_IMPLEMENTATION_ELEMS__MPY
     SYS_IMPLEMENTATION_ELEMS__BUILD
+    SYS_IMPLEMENTATION_ELEMS__THREAD
     SYS_IMPLEMENTATION_ELEMS__V2
     );
 #else
 static const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
     {&mp_type_tuple},
     3 + MICROPY_PERSISTENT_CODE_LOAD,
-    // Do not include SYS_IMPLEMENTATION_ELEMS__BUILD or SYS_IMPLEMENTATION_ELEMS__V2
-    // because SYS_IMPLEMENTATION_ELEMS__MPY may be empty if
+    // Do not include SYS_IMPLEMENTATION_ELEMS__BUILD, SYS_IMPLEMENTATION_ELEMS__THREAD
+    // or SYS_IMPLEMENTATION_ELEMS__V2 because SYS_IMPLEMENTATION_ELEMS__MPY may be empty if
     // MICROPY_PERSISTENT_CODE_LOAD is disabled, which means they'll share
-    // the same index. Cannot query _build or _v2 if MICROPY_PY_ATTRTUPLE is
+    // the same index. Cannot query _build, _thread or _v2 if MICROPY_PY_ATTRTUPLE is
     // disabled.
     {
         SYS_IMPLEMENTATION_ELEMS_BASE
diff --git a/tests/basics/sys1.py b/tests/basics/sys1.py
index 94220fe4a60c6..31081e4236a30 100644
--- a/tests/basics/sys1.py
+++ b/tests/basics/sys1.py
@@ -30,6 +30,12 @@
     # Effectively skip subtests
     print(str)
 
+if hasattr(sys.implementation, '_thread'):
+    print(sys.implementation._thread in ("GIL", "unsafe"))
+else:
+    # Effectively skip subtests
+    print(True)
+
 try:
     print(sys.intern('micropython') == 'micropython')
     has_intern = True

From 97fd18a7e299f5a00207f47c1728a9bb67a2fda0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Jul 2025 16:43:35 +1000
Subject: [PATCH 2526/3129] tests/extmod/select_poll_eintr.py: Pre-allocate
 global variables.

This is a workaround for the case where threading is enabled without a GIL.
In such a configuration, creating a new global variable is not atomic and
threads have race conditions resizing/accessing the global dict.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/select_poll_eintr.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/extmod/select_poll_eintr.py b/tests/extmod/select_poll_eintr.py
index d9e9b3190907c..fdc5ee5074a61 100644
--- a/tests/extmod/select_poll_eintr.py
+++ b/tests/extmod/select_poll_eintr.py
@@ -33,6 +33,14 @@ def thread_main():
     print("thread gc end")
 
 
+# Pre-allocate global variables here so the global dict is not resized by the main
+# thread while the secondary thread runs.  This is a workaround for the bug described
+# in https://github.com/micropython/micropython/pull/11604
+poller = None
+t0 = None
+result = None
+dt_ms = None
+
 # Start a thread to interrupt the main thread during its call to poll.
 lock = _thread.allocate_lock()
 lock.acquire()

From 377924b4438114889d5d873317c02c01078a54a5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Jul 2025 20:26:37 +1000
Subject: [PATCH 2527/3129] tests/thread/stress_aes.py: Reduce test time on PC
 targets.

This thread stress test is quite intensive and can run for a long time on
certain targets.  For example, builds with stackless enabled are slower
than non-stackless, and this test in stackless mode takes around 2 minutes
on the unix port of MicroPython with the existing parameters of
`n_thread=20` and `n_loop=5`.

It's not really necessary to test 20 threads at once, that's not really
going to test anything more than 10 at once.  So reduce the parameters to
keep the running time reasonable.

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

diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index d8d0acd568a7a..ca25f8ad2fd57 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -277,7 +277,7 @@ def thread_entry(n_loop):
         n_thread = 2
         n_loop = 2
     else:
-        n_thread = 20
+        n_thread = 10
         n_loop = 5
     for i in range(n_thread):
         _thread.start_new_thread(thread_entry, (n_loop,))

From 167c888df99691981587107dad76ddfe8f33bff5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Jul 2025 16:19:17 +1000
Subject: [PATCH 2528/3129] tests/run-tests.py: Detect threading and
 automatically run thread tests.

When detecting the target platform, also check if it has threading and
whether the GIL is enabled or not (using the new attribute
`sys.implementation._thread`).  If threading is available, add the thread
tests to the set of tests to run (unless the set of tests is explicitly
given).

With this change, the unix port no longer needs to explicitly run the set
of thread tests, so that line has been removed from the Makefile.

This change will make sure thread tests are run with other testing
combinations.  In particular, thread tests are now run:
- on the unix port with the native emitter
- on macOS builds
- on unix qemu, the architectures MIPS, ARM and RISCV-64

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile                |  1 -
 tests/feature_check/target_info.py |  4 +++-
 tests/run-tests.py                 | 17 ++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 4e4e81a965c07..f1ceabb117fae 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -259,7 +259,6 @@ test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 test_full_no_native: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	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 --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) -d basics float micropython
 	cat $(TOP)/tests/basics/0prelim.py | ./$(BUILD)/$(PROG) | grep -q 'abc'
 
diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
index f60f3b319192e..9501d808ef214 100644
--- a/tests/feature_check/target_info.py
+++ b/tests/feature_check/target_info.py
@@ -20,4 +20,6 @@
     "xtensawin",
     "rv32imc",
 ][sys_mpy >> 10]
-print(platform, arch)
+thread = getattr(sys.implementation, "_thread", None)
+
+print(platform, arch, thread)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index c218afae7194a..e2e95884ab193 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -251,22 +251,27 @@ def detect_test_platform(pyb, args):
     output = run_feature_check(pyb, args, "target_info.py")
     if output.endswith(b"CRASH"):
         raise ValueError("cannot detect platform: {}".format(output))
-    platform, arch = str(output, "ascii").strip().split()
+    platform, arch, thread = str(output, "ascii").strip().split()
     if arch == "None":
         arch = None
     inlineasm_arch = detect_inline_asm_arch(pyb, args)
+    if thread == "None":
+        thread = None
 
     args.platform = platform
     args.arch = arch
     if arch and not args.mpy_cross_flags:
         args.mpy_cross_flags = "-march=" + arch
     args.inlineasm_arch = inlineasm_arch
+    args.thread = thread
 
     print("platform={}".format(platform), end="")
     if arch:
         print(" arch={}".format(arch), end="")
     if inlineasm_arch:
         print(" inlineasm={}".format(inlineasm_arch), end="")
+    if thread:
+        print(" thread={}".format(thread), end="")
     print()
 
 
@@ -810,8 +815,8 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("cmdline/repl_sys_ps1_ps2.py")
         skip_tests.add("extmod/ssl_poll.py")
 
-    # Skip thread mutation tests on targets that don't have the GIL.
-    if args.platform in PC_PLATFORMS + ("rp2",):
+    # Skip thread mutation tests on targets that have unsafe threading behaviour.
+    if args.thread == "unsafe":
         for t in tests:
             if t.startswith("thread/mutate_"):
                 skip_tests.add(t)
@@ -1329,6 +1334,8 @@ def main():
             )
             if args.inlineasm_arch is not None:
                 test_dirs += ("inlineasm/{}".format(args.inlineasm_arch),)
+            if args.thread is not None:
+                test_dirs += ("thread",)
             if args.platform == "pyboard":
                 # run pyboard tests
                 test_dirs += ("float", "stress", "ports/stm32")
@@ -1337,9 +1344,9 @@ def main():
             elif args.platform == "renesas-ra":
                 test_dirs += ("float", "ports/renesas-ra")
             elif args.platform == "rp2":
-                test_dirs += ("float", "stress", "thread", "ports/rp2")
+                test_dirs += ("float", "stress", "ports/rp2")
             elif args.platform == "esp32":
-                test_dirs += ("float", "stress", "thread")
+                test_dirs += ("float", "stress")
             elif args.platform in ("esp8266", "minimal", "samd", "nrf"):
                 test_dirs += ("float",)
             elif args.platform == "WiPy":

From 081213ec9dbdf78becc1eb0c2f2837397fd47d86 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Jul 2025 01:11:09 +1000
Subject: [PATCH 2529/3129] tools/ci.sh: Increase timeout for unix qemu test
 runs.

The qemu emulation introduces enough overhead that the
`tests/thread/stress_aes.py` test overruns the default timeout.  So
increase it to allow this test to pass.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 510bb3a4d3c8c..a1700fbd3c75b 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -797,8 +797,10 @@ function ci_unix_qemu_mips_build {
 }
 
 function ci_unix_qemu_mips_run_tests {
+    # Issues with MIPS tests:
+    # - thread/stress_aes.py takes around 50 seconds
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py)
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py)
 }
 
 function ci_unix_qemu_arm_setup {
@@ -818,8 +820,9 @@ function ci_unix_qemu_arm_build {
 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)
+    # - thread/stress_aes.py takes around 70 seconds
     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 MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'vfs_posix.*\.py')
 }
 
 function ci_unix_qemu_riscv64_setup {
@@ -837,8 +840,10 @@ function ci_unix_qemu_riscv64_build {
 }
 
 function ci_unix_qemu_riscv64_run_tests {
+    # Issues with RISCV-64 tests:
+    # - thread/stress_aes.py takes around 140 seconds
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py)
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=180 ./run-tests.py)
 }
 
 ########################################################################################

From f835b1626d797c98b6603c1a58e270aaa8c27053 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Jul 2025 00:54:21 +1000
Subject: [PATCH 2530/3129] tools/ci.sh: Increase timeout for stackless clang
 test runs.

Stackless mode makes `tests/thread/stress_aes.py` slow, around 75 seconds
for this CI job (probably due to contention among the many threads for the
GC lock, to allocate frames for function calls).  So increase the timeout
to allow this test to pass.

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 a1700fbd3c75b..99168cff6e478 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -720,7 +720,8 @@ function ci_unix_stackless_clang_build {
 }
 
 function ci_unix_stackless_clang_run_tests {
-    ci_unix_run_tests_helper CC=clang
+    # Timeout needs to be increased for thread/stress_aes.py test.
+    MICROPY_TEST_TIMEOUT=90 ci_unix_run_tests_helper CC=clang
 }
 
 function ci_unix_float_clang_build {

From 279f51d7d27adab0ffbf4db263f839eaf89cb659 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 12 Jul 2025 01:08:17 +1000
Subject: [PATCH 2531/3129] tools/ci.sh: Skip thread/stress_heap.py test on
 macOS test run.

This test passes sometimes and fails other times.  Eventually that should
be fixed, but for now just skip this test.

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 99168cff6e478..dbfbaa54f2063 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -780,7 +780,8 @@ function ci_unix_macos_run_tests {
     # Issues with macOS tests:
     # - float_parse and float_parse_doubleprec parse/print floats out by a few mantissa bits
     # - ffi_callback crashes for an unknown reason
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude '(float_parse|float_parse_doubleprec|ffi_callback).py')
+    # - thread/stress_heap.py is flaky
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude '(float_parse|float_parse_doubleprec|ffi_callback|thread/stress_heap).py')
 }
 
 function ci_unix_qemu_mips_setup {

From 92193112bf0750615139b2d980667055a64a92a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jul 2025 17:10:53 +1000
Subject: [PATCH 2532/3129] tools/ci.sh: Skip thread/stress_recurse.py on unix
 qemu test runs.

This test passes sometimes and fails other times.  Eventually that should
be fixed, but for now just skip this test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index dbfbaa54f2063..6656b860f1cd1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -801,8 +801,9 @@ function ci_unix_qemu_mips_build {
 function ci_unix_qemu_mips_run_tests {
     # Issues with MIPS tests:
     # - thread/stress_aes.py takes around 50 seconds
+    # - thread/stress_recurse.py is flaky
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py)
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'thread/stress_recurse.py')
 }
 
 function ci_unix_qemu_arm_setup {
@@ -823,8 +824,9 @@ 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)
     # - thread/stress_aes.py takes around 70 seconds
+    # - thread/stress_recurse.py is flaky
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'vfs_posix.*\.py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'vfs_posix.*\.py|thread/stress_recurse.py')
 }
 
 function ci_unix_qemu_riscv64_setup {
@@ -844,8 +846,9 @@ function ci_unix_qemu_riscv64_build {
 function ci_unix_qemu_riscv64_run_tests {
     # Issues with RISCV-64 tests:
     # - thread/stress_aes.py takes around 140 seconds
+    # - thread/stress_recurse.py is flaky
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=180 ./run-tests.py)
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=180 ./run-tests.py --exclude 'thread/stress_recurse.py')
 }
 
 ########################################################################################

From b6460df721893ee89336641afea8e71b4d72f7c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jul 2025 22:35:53 +1000
Subject: [PATCH 2533/3129] unix: Allow the GIL to be enabled.

The unix port can now be built with the GIL enabled, by passing
MICROPY_PY_THREAD_GIL=1 on the make command line.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile                          | 4 ++++
 ports/unix/mpconfigport.h                    | 3 +++
 ports/unix/mpconfigport.mk                   | 1 +
 ports/unix/mphalport.h                       | 7 ++++++-
 ports/unix/variants/mpconfigvariant_common.h | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index f1ceabb117fae..4e9a3736aade6 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -132,7 +132,11 @@ ifeq ($(MICROPY_PY_SOCKET),1)
 CFLAGS += -DMICROPY_PY_SOCKET=1
 endif
 ifeq ($(MICROPY_PY_THREAD),1)
+ifeq ($(MICROPY_PY_THREAD_GIL),1)
+CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=1
+else
 CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
+endif
 LDFLAGS += $(LIBPTHREAD)
 endif
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 973b5e74ce10d..c18859ecbf75b 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -137,6 +137,9 @@ typedef long mp_off_t;
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
+// Recursive mutex is needed when threading is enabled, regardless of GIL setting.
+#define MICROPY_PY_THREAD_RECURSIVE_MUTEX (MICROPY_PY_THREAD)
+
 // Implementation of the machine module.
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/unix/modmachine.c"
 
diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk
index 1557c5461f6ed..f5ad0a14365e8 100644
--- a/ports/unix/mpconfigport.mk
+++ b/ports/unix/mpconfigport.mk
@@ -13,6 +13,7 @@ MICROPY_PY_BTREE = 1
 
 # _thread module using pthreads
 MICROPY_PY_THREAD = 1
+MICROPY_PY_THREAD_GIL = 0
 
 # Subset of CPython termios module
 MICROPY_PY_TERMIOS = 1
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index 02b60d8a873b9..0efd6940b3065 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -40,7 +40,12 @@
 //
 // Note that we don't delay for the full TIMEOUT_MS, as execution
 // can't be woken from the delay.
-#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) mp_hal_delay_us(500)
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) \
+    do { \
+        MP_THREAD_GIL_EXIT(); \
+        mp_hal_delay_us(500); \
+        MP_THREAD_GIL_ENTER(); \
+    } while (0)
 
 void mp_hal_set_interrupt_char(char c);
 
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 9eeed8797366c..65c874317666a 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -29,7 +29,7 @@
 
 // Send raise KeyboardInterrupt directly from the signal handler rather than
 // scheduling it into the VM.
-#define MICROPY_ASYNC_KBD_INTR         (1)
+#define MICROPY_ASYNC_KBD_INTR         (!MICROPY_PY_THREAD_GIL)
 
 // Enable helpers for printing debugging information.
 #ifndef MICROPY_DEBUG_PRINTERS

From b15065b95e24a939e09289ee18ce84579605b929 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jul 2025 22:42:17 +1000
Subject: [PATCH 2534/3129] github/workflows: Add new CI job to test unix port
 with GIL enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 12 ++++++++++++
 tools/ci.sh                      |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 60c0244a8f9e2..f3f613a789af3 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -160,6 +160,18 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
+  gil_enabled:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: source tools/ci.sh && ci_unix_gil_enabled_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_gil_enabled_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
   stackless_clang:
     runs-on: ubuntu-latest
     steps:
diff --git a/tools/ci.sh b/tools/ci.sh
index 6656b860f1cd1..30be7ec2b1275 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -707,6 +707,15 @@ function ci_unix_float_run_tests {
     ci_unix_run_tests_helper CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
 }
 
+function ci_unix_gil_enabled_build {
+    ci_unix_build_helper VARIANT=standard MICROPY_PY_THREAD_GIL=1
+    ci_unix_build_ffi_lib_helper gcc
+}
+
+function ci_unix_gil_enabled_run_tests {
+    ci_unix_run_tests_full_helper standard MICROPY_PY_THREAD_GIL=1
+}
+
 function ci_unix_clang_setup {
     sudo apt-get update
     sudo apt-get install clang

From b070765427283fd994f217b8c7601ef9b1f9a37a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jul 2025 22:49:15 +1000
Subject: [PATCH 2535/3129] tests/thread: Allow thread tests to pass with the
 native emitter.

The native emitter will not release/bounce the GIL when running code, so
if it runs tight loops then no other threads get a chance to run (if the
GIL is enabled).  So for the thread tests, explicitly include a call to
`time.sleep(0)` (or equivalent) to bounce the GIL and give other threads a
chance to run.

For some tests (eg `thread_coop.py`) the whole point of the test is to test
that the GIL is correctly bounced.  So for those cases force the use of the
bytecode emitter for the busy functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/mutate_bytearray.py  | 3 ++-
 tests/thread/mutate_dict.py       | 3 ++-
 tests/thread/mutate_instance.py   | 3 ++-
 tests/thread/mutate_list.py       | 3 ++-
 tests/thread/mutate_set.py        | 3 ++-
 tests/thread/stress_recurse.py    | 3 ++-
 tests/thread/stress_schedule.py   | 4 +++-
 tests/thread/thread_coop.py       | 3 +++
 tests/thread/thread_exc1.py       | 3 ++-
 tests/thread/thread_gc1.py        | 3 ++-
 tests/thread/thread_ident1.py     | 3 ++-
 tests/thread/thread_lock3.py      | 3 ++-
 tests/thread/thread_shared1.py    | 3 ++-
 tests/thread/thread_shared2.py    | 3 ++-
 tests/thread/thread_stacksize1.py | 3 ++-
 tests/thread/thread_stdin.py      | 3 ++-
 16 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/tests/thread/mutate_bytearray.py b/tests/thread/mutate_bytearray.py
index b4664781a1522..7116d291cfeec 100644
--- a/tests/thread/mutate_bytearray.py
+++ b/tests/thread/mutate_bytearray.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 # the shared bytearray
@@ -36,7 +37,7 @@ def th(n, lo, hi):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 
 # check bytearray has correct contents
 print(len(ba))
diff --git a/tests/thread/mutate_dict.py b/tests/thread/mutate_dict.py
index 3777af66248c6..dd5f69e6c5d66 100644
--- a/tests/thread/mutate_dict.py
+++ b/tests/thread/mutate_dict.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 # the shared dict
@@ -38,7 +39,7 @@ def th(n, lo, hi):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 
 # check dict has correct contents
 print(sorted(di.items()))
diff --git a/tests/thread/mutate_instance.py b/tests/thread/mutate_instance.py
index 306ad91c95cfa..63f7fb1e23df8 100644
--- a/tests/thread/mutate_instance.py
+++ b/tests/thread/mutate_instance.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 
@@ -40,7 +41,7 @@ def th(n, lo, hi):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 
 # check user instance has correct contents
 print(user.a, user.b, user.c)
diff --git a/tests/thread/mutate_list.py b/tests/thread/mutate_list.py
index 6f1e8812541a0..d7398a2f1e0b4 100644
--- a/tests/thread/mutate_list.py
+++ b/tests/thread/mutate_list.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 # the shared list
@@ -39,7 +40,7 @@ def th(n, lo, hi):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 
 # check list has correct contents
 li.sort()
diff --git a/tests/thread/mutate_set.py b/tests/thread/mutate_set.py
index 2d9a3e0ce9efd..7dcefa1d113f9 100644
--- a/tests/thread/mutate_set.py
+++ b/tests/thread/mutate_set.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 # the shared set
@@ -33,7 +34,7 @@ def th(n, lo, hi):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 
 # check set has correct contents
 print(sorted(se))
diff --git a/tests/thread/stress_recurse.py b/tests/thread/stress_recurse.py
index 73b3a40f33daa..ec8b43fe8fc22 100644
--- a/tests/thread/stress_recurse.py
+++ b/tests/thread/stress_recurse.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 
@@ -24,5 +25,5 @@ def thread_entry():
 
 # busy wait for thread to finish
 while not finished:
-    pass
+    time.sleep(0)
 print("done")
diff --git a/tests/thread/stress_schedule.py b/tests/thread/stress_schedule.py
index 97876f0f77ca8..362d71aa12e38 100644
--- a/tests/thread/stress_schedule.py
+++ b/tests/thread/stress_schedule.py
@@ -27,6 +27,8 @@ def task(x):
     n += 1
 
 
+# This function must always use the bytecode emitter so it bounces the GIL when running.
+@micropython.bytecode
 def thread():
     while thread_run:
         try:
@@ -46,7 +48,7 @@ def thread():
 # Wait up to 10 seconds for 10000 tasks to be scheduled.
 t = time.ticks_ms()
 while n < _NUM_TASKS and time.ticks_diff(time.ticks_ms(), t) < _TIMEOUT_MS:
-    pass
+    time.sleep(0)
 
 # Stop all threads.
 thread_run = False
diff --git a/tests/thread/thread_coop.py b/tests/thread/thread_coop.py
index aefc4af074db5..85cda789c936e 100644
--- a/tests/thread/thread_coop.py
+++ b/tests/thread/thread_coop.py
@@ -7,6 +7,7 @@
 import _thread
 import sys
 from time import ticks_ms, ticks_diff, sleep_ms
+import micropython
 
 
 done = False
@@ -21,6 +22,8 @@
     MAX_DELTA = 100
 
 
+# This function must always use the bytecode emitter so the VM can bounce the GIL when running.
+@micropython.bytecode
 def busy_thread():
     while not done:
         pass
diff --git a/tests/thread/thread_exc1.py b/tests/thread/thread_exc1.py
index cd87740929103..cd6599983c141 100644
--- a/tests/thread/thread_exc1.py
+++ b/tests/thread/thread_exc1.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 
@@ -34,5 +35,5 @@ def thread_entry():
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 print("done")
diff --git a/tests/thread/thread_gc1.py b/tests/thread/thread_gc1.py
index b36ea9d4c8421..45c17cc17bed3 100644
--- a/tests/thread/thread_gc1.py
+++ b/tests/thread/thread_gc1.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import gc
 import _thread
 
@@ -44,6 +45,6 @@ def thread_entry(n):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 
 print(n_correct == n_finished)
diff --git a/tests/thread/thread_ident1.py b/tests/thread/thread_ident1.py
index 2a3732eff53dc..08cfd3eb36e8a 100644
--- a/tests/thread/thread_ident1.py
+++ b/tests/thread/thread_ident1.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 
@@ -27,6 +28,6 @@ def thread_entry():
 new_tid = _thread.start_new_thread(thread_entry, ())
 
 while not finished:
-    pass
+    time.sleep(0)
 
 print("done", type(new_tid) == int, new_tid == tid)
diff --git a/tests/thread/thread_lock3.py b/tests/thread/thread_lock3.py
index a927dc6829e15..c5acfa21b7dc6 100644
--- a/tests/thread/thread_lock3.py
+++ b/tests/thread/thread_lock3.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 lock = _thread.allocate_lock()
@@ -26,4 +27,4 @@ def thread_entry(idx):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
diff --git a/tests/thread/thread_shared1.py b/tests/thread/thread_shared1.py
index 251e26fae6ca3..c2e33abcec7ee 100644
--- a/tests/thread/thread_shared1.py
+++ b/tests/thread/thread_shared1.py
@@ -2,6 +2,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 
@@ -40,5 +41,5 @@ def thread_entry(n, tup):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 print(tup)
diff --git a/tests/thread/thread_shared2.py b/tests/thread/thread_shared2.py
index a1223c2b94f40..4ce9057ca017e 100644
--- a/tests/thread/thread_shared2.py
+++ b/tests/thread/thread_shared2.py
@@ -3,6 +3,7 @@
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
+import time
 import _thread
 
 
@@ -31,5 +32,5 @@ def thread_entry(n, lst, idx):
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 print(lst)
diff --git a/tests/thread/thread_stacksize1.py b/tests/thread/thread_stacksize1.py
index 140d165cb3497..75e1da9642f95 100644
--- a/tests/thread/thread_stacksize1.py
+++ b/tests/thread/thread_stacksize1.py
@@ -3,6 +3,7 @@
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
 
 import sys
+import time
 import _thread
 
 # different implementations have different minimum sizes
@@ -51,5 +52,5 @@ def thread_entry():
 
 # busy wait for threads to finish
 while n_finished < n_thread:
-    pass
+    time.sleep(0)
 print("done")
diff --git a/tests/thread/thread_stdin.py b/tests/thread/thread_stdin.py
index a469933f19b55..498b0a3a27022 100644
--- a/tests/thread/thread_stdin.py
+++ b/tests/thread/thread_stdin.py
@@ -5,6 +5,7 @@
 # This is a regression test for https://github.com/micropython/micropython/issues/15230
 # on rp2, but doubles as a general property to test across all ports.
 import sys
+import time
 import _thread
 
 try:
@@ -38,7 +39,7 @@ def is_done(self):
 # have run yet. The actual delay is <20ms but spinning here instead of
 # sleep(0.1) means the test can run on MP builds without float support.
 while not thread_waiter.is_done():
-    pass
+    time.sleep(0)
 
 # The background thread should have completed its wait by now.
 print(thread_waiter.is_done())

From 677a0e01248bc7075f342c7df9671b006bf76c89 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Jul 2025 15:04:14 +1000
Subject: [PATCH 2536/3129] docs/reference/speed_python: Document schedule/GIL
 limitation of native.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/speed_python.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/reference/speed_python.rst b/docs/reference/speed_python.rst
index 64fd9df6c058a..9360fd6108027 100644
--- a/docs/reference/speed_python.rst
+++ b/docs/reference/speed_python.rst
@@ -246,6 +246,13 @@ There are certain limitations in the current implementation of the native code e
 * Context managers are not supported (the ``with`` statement).
 * Generators are not supported.
 * If ``raise`` is used an argument must be supplied.
+* The background scheduler (see `micropython.schedule`) is not run during
+  execution of native code.
+* On targets with thrteading and the GIL, the GIL is not released during
+  execution of native code.
+
+To mitigate the last two points, long running native functions should call
+``time.sleep(0)`` periodically, which will run the scheduler and bounce the GIL.
 
 The trade-off for the improved performance (roughly twice as fast as bytecode) is an
 increase in compiled code size.

From 8a457b8cf9c9aa6fc2f09f64914c3646827dbae2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jul 2025 22:53:59 +1000
Subject: [PATCH 2537/3129] tools/ci.sh: Change averaging to 1 for
 run-perfbench.py test.

The `run-perfbench.py` test is run as part of CI, but the actual
performance results are not used.  Rather, the test is just testing that
all the performance tests run correctly.

So there's no need to run with the default averaging of 8 (which runs each
test 8 times and takes the average time for the performance result) which
can take a lot of time for slower builds, eg unix sanitize, settrace and
stackless builds.

This commit changes the averaging to just 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 30be7ec2b1275..3e695c63a6402 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -538,7 +538,7 @@ function ci_unix_run_tests_helper {
 function ci_unix_run_tests_full_extra {
     micropython=$1
     (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)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=$micropython ./run-perfbench.py --average 1 1000 1000)
 }
 
 function ci_unix_run_tests_full_no_native_helper {

From b7e734bfb7494e83c7be42ebe222ec1988278f19 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 15 Jul 2025 17:14:10 +1000
Subject: [PATCH 2538/3129] tests/net_inet: Update micropython.org certificate
 for SSL tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/mpycert.der               | Bin 1289 -> 1290 bytes
 tests/net_inet/ssl_cert.py               |  68 +++++++++++------------
 tests/net_inet/test_sslcontext_client.py |   2 +-
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/net_inet/mpycert.der b/tests/net_inet/mpycert.der
index ac22dcf9e8b888a98c10bd12f2108feb696b68c8..0b0eabc9bc8135de25785cb8574ab78e03947aa9 100644
GIT binary patch
delta 850
zcmV-Y1Figt3W^FKFoFdJFoFW^paTK{0s;{LihVv4)-N#cBZj>x2WvF=ksq`HF_F|E
zf4YafTpIv6%gPGP)MpU+0X(HnrD4k^%2N9k0k^p*^(Y?gC$l6NIcEtB2<+fGuse4S
zz4PTcR6z_*u0htBbly?h?|c7Py{NYn_TDko@^Z;?Y72vOm7GQZWE7e6vDqTo&8U*9
z942}{{_j`?dkB?*+i?$$`{OYQy9vHfe@$PHk#;>=ot}g8>BMHU;Ra?yNEm=+pf?zr
zn}jl#v9i6y_!R)1Cy4vvV;7cen<r;W#M>xdX~KE%NnGG0P~pV9p#`jaKy3iD!a+Z$
zShz36T$`o437+x(>#&76{iq7>MZ|dPWh%nYUp(I9TumGI3nwe83qp5OPkCw`0*Bd?
z^#NHF#m`2h>h#0FdTf=%EwEmaFDB!;lVSp=e@^0wT?zvnkT}rwANg@y_`{E~H;8&~
zuq7YuzPH$h29D_ogw1llf%E*z&r?Y4z4mEB)TI$VHOLdPk{tzK>MqpS_({X9^_iBO
z?<Uycv?L2iAWi(!RJ5taA;{r28~=A?DHpl$OYdFk&3VwjkiWhovXI(JsYo$&sYDCm
zf8zEngK?yFd(xD_1sO&hxsUV2bVwyC4dwOQL*m<$o4FaZA1~i(4v#U@V-LG2+}&m@
zKd>8TQTRbT<W0G(xTKtBWA&?rBOT0BwySZj+{FQL+BWVA7%DRT2{C++_H*Z)oV7|7
zYIlNK&)SVe{vRr21u#By!p01_);nWLf2&3V{+Yl=Kqp{h-%vUSN7xlgpXx^+nOX>9
z47O}D2u;^G?MN*y1!%5-UGGfX*dRe)Xz{yR&EpQR3^9kBL*7Y4;m8C((L5W6MKEco
zsd5f^5*#tuJ|kD%r%#~p9D&hyA8*#uxu~-P7J)fSpH;5XYUH!O>ZR46OQXrwe>-yX
zO7>K%4E#9vV1VClHOh6NROBzbZWqZKr8l*rn!4=tz;#AXcc|!DR*_~cZr&+@)~1&Q
zUSvhSEY9j=LPW5`Pp$B@+yly)n+bxIf(>JeX89R%_|>_I5aNlL2{rkm9KMosBXsGV
cAJ;odnuJ&o!t<x%HSB&nMb0or1X63jz{`)ILI3~&

delta 849
zcmV-X1Frmv3W*9IFoFdIFoFW@paTK{0s;_As8W;nnlGYr21}>}jdjqGAhZE6k<}r8
z&sXK<#8eXPv`7BQCs=kyP$-NYK8W81oz=A%DZSmbTEF`C&ZEAs03l0aT3S2-FU42`
z_KE+F5ku?2wcr#7mXB{A*XO!{ISF-Tx5BR&TQ?>s=cDuoD{UJ8t6031u0a3k%U8s;
zTYq>B7-75@=TyeKNs-NN7}0=*?xtmbHoSD|yiiQ){2}u=7L$~^u+wWe2F(@{ddgCD
z$gOs=!kk^0MO<%Td&Vv9JQGre0ohmPI2_-NwI7m^n&(O!%tfejRq(LpqX+E$ryFLT
zKS+ylgmGBOI{NQk@>@hJJap%evPZ!OYR#Ir4VL#3fhJK@3hZI__x0lPipZ4$4ULob
z0a+Bgyu(MO<h-fI!=!Qy5RIZW;mGKdV*;mtlCkGOH|u$wf#%KPCE+?C>5xQ~qk&w{
z!(IKopm5c(mM9_%(()+J4CmD5LyROM9l=79(Fw1gOZ3QaPaqbtTHOKmANU_(YZNE2
za*boI?&8i%&o|w>qtwmktx&DKzvJvaVm5G@F{kK_-RffE60Y@})IBT=s?eNyzUn=H
zTtse`F=JYN)_zYUpi2dRUT@OW>R&TU6V_L@%HC19U84ztbp6M8p0l~E7TQWHmczD-
zVvqTB8KRy8-sx|fun*FpTK0up!UVU-)lM?RzXV;pDfah)j|^QrQ^`P(i~F_+Wx1pw
z)d}SjgoHPO&JZa4cEScFdPY)B+Ea3Wq$fXOaIC&*NC5k158GRz=+^@wE!WBRnL;^(
zL*I7_5(x1n*1D7#R2Yb*#g5?`nUi^I>>T+qK(Nd*0N<Zp=d_Zmkb;qo4d5P?x>-9e
zOJBmbMm1772Ee_ltWv=uphTCM_Y9yRr=e_dM-~?WXu!&*CS?SCv#!bKlvToiZ<{<E
zsrfF&AR6#?;J)k_)=$_a`*soNzvdwi=;+L~wx`v&_n$$}VIoFqgSKdwE_~`vmD?lh
zF32k=grs2UN%TZ6JNe3DR{`Q(kQVvL{CXouj;7Uta`7noUC#UMPIHfxF494in3>zB
buW(=WzWV|ozh)<Fw5|Ge5(_H?KF$N4`0cGR

diff --git a/tests/net_inet/ssl_cert.py b/tests/net_inet/ssl_cert.py
index 83d83e3f8e572..7bb270d5fda7a 100644
--- a/tests/net_inet/ssl_cert.py
+++ b/tests/net_inet/ssl_cert.py
@@ -5,7 +5,7 @@
 # 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=R10
+# 1 s:C=US, O=Let's Encrypt, CN=R11
 #   i:C=US, O=Internet Security Research Group, CN=ISRG Root X1
 #   a:PKEY: RSA, 2048 (bit); sigalg: sha256WithRSAEncryption
 #   v:NotBefore: Mar 13 00:00:00 2024 GMT; NotAfter: Mar 12 23:59:59 2027 GMT
@@ -14,39 +14,39 @@
 # Then convert to hex format using: for i in range(0,len(data),40):print(data[i:i+40].hex())
 
 ca_cert_chain = bytes.fromhex(
-    "30820505308202eda00302010202104ba85293f79a2fa273064ba8048d75d0300d06092a864886f7"
-    "0d01010b0500304f310b300906035504061302555331293027060355040a1320496e7465726e6574"
-    "2053656375726974792052657365617263682047726f7570311530130603550403130c4953524720"
-    "526f6f74205831301e170d3234303331333030303030305a170d3237303331323233353935395a30"
-    "33310b300906035504061302555331163014060355040a130d4c6574277320456e6372797074310c"
-    "300a0603550403130352313030820122300d06092a864886f70d01010105000382010f003082010a"
-    "0282010100cf57e5e6c45412edb447fec92758764650288c1d3e88df059dd5b51829bdddb55abffa"
-    "f6cea3beaf00214b625a5a3c012fc55803f689ff8e1143ebc1b5e01407968f6f1fd7e7ba81390975"
-    "65b7c2af185b372628e7a3f4072b6d1affab58bc95ae40ffe9cb57c4b55b7f780d1861bc17e754c6"
-    "bb4991cd6e18d18085eea66536bc74eabc504ceafc21f338169394bab0d36b3806cd16127aca5275"
-    "c8ad76b2c29c5d98455c6f617bc62dee3c13528601d957e6381cdf8db51f92919ae74a1ccc45a872"
-    "55f0b0e6a307ecfda71b669e3f488b71847158c93afaef5ef25b442b3c74e78fb247c1076acd9ab7"
-    "0d96f712812651540aec61f6f7f5e2f28ac8950d8d0203010001a381f83081f5300e0603551d0f01"
-    "01ff040403020186301d0603551d250416301406082b0601050507030206082b0601050507030130"
-    "120603551d130101ff040830060101ff020100301d0603551d0e04160414bbbcc347a5e4bca9c6c3"
-    "a4720c108da235e1c8e8301f0603551d2304183016801479b459e67bb6e5e40173800888c81a58f6"
-    "e99b6e303206082b0601050507010104263024302206082b060105050730028616687474703a2f2f"
-    "78312e692e6c656e63722e6f72672f30130603551d20040c300a3008060667810c01020130270603"
-    "551d1f0420301e301ca01aa0188616687474703a2f2f78312e632e6c656e63722e6f72672f300d06"
-    "092a864886f70d01010b0500038202010092b1e74137eb799d81e6cde225e13a20e9904495a3815c"
-    "cfc35dfdbda070d5b19628220bd2f228cf0ce7d4e6438c24221dc14292d109af9f4bf4c8704f2016"
-    "b15add01f61ff81f616b1427b0728d63aeeee2ce4bcf37ddbba3d4cde7ad50adbdbfe3ec3e623670"
-    "9931a7e88dddea62e212aef59cd43d2c0caad09c79beea3d5c446e9631635a7dd67e4f24a04b057f"
-    "5e6fd2d4ea5f334b13d657b6cade51b85da3098274fdc7789eb3b9ac16da4a2b96c3b68b628ff974"
-    "19a29e03dee96f9bb00fd2a05af6855cc204b7c8d54e32c4bf045dbc29f6f7818f0c5d3c53c94090"
-    "8bfbb60865b9a421d509e51384843782ce1028fc76c206257a46524dda5372a4273f6270acbe6948"
-    "00fb670fdb5ba1e8d703212dd7c9f69942398343df770a1208f125d6ba9419541888a5c58ee11a99"
-    "93796bec1cf93140b0cc3200df9f5ee7b492ab9082918d0de01e95ba593b2e4b5fc2b74635523906"
-    "c0bdaaac52c122a0449799f70ca021a7a16c714716170168c0caa62665047cb3aec9e79455c26f9b"
-    "3c1ca9f92ec5201af076e0beec18d64fd825fb7611e8bfe6210fe8e8ccb5b6a7d5b8f79f41cf6122"
-    "466a83b668972e7cea4e95db23eb2ec82b2884a460e949f4442e3bf9ca625701e25d9016f9c9fc7a"
-    "23488ea6d58172f128fa5dcefbed4e738f942ed241949899dba7af705ff5befb0220bf66276cb4ad"
-    "fa75120b2b3ece039e"
+    "30820506308202eea0030201020211008a7d3e13d62f30ef2386bd29076b34f8300d06092a864886"
+    "f70d01010b0500304f310b300906035504061302555331293027060355040a1320496e7465726e65"
+    "742053656375726974792052657365617263682047726f7570311530130603550403130c49535247"
+    "20526f6f74205831301e170d3234303331333030303030305a170d3237303331323233353935395a"
+    "3033310b300906035504061302555331163014060355040a130d4c6574277320456e637279707431"
+    "0c300a0603550403130352313130820122300d06092a864886f70d01010105000382010f00308201"
+    "0a0282010100ba87bc5c1b0039cbca0acdd46710f9013ca54ea561cb26ca52fb1501b7b928f5281e"
+    "ed27b324183967090c08ece03ab03b770ebdf3e53954410c4eae41d69974de51dbef7bff58bda8b7"
+    "13f6de31d5f272c9726a0b8374959c4600641499f3b1d922d9cda892aa1c267a3ffeef58057b0895"
+    "81db710f8efbe33109bb09be504d5f8f91763d5a9d9e83f2e9c466b3e106664348188065a037189a"
+    "9b843297b1b2bdc4f815009d2788fbe26317966c9b27674bc4db285e69c279f0495ce02450e1c4bc"
+    "a105ac7b406d00b4c2413fa758b82fc55c9ba5bb099ef1feebb08539fda80aef45c478eb652ac2cf"
+    "5f3cdee35c4d1bf70b272baa0b4277534f796a1d87d90203010001a381f83081f5300e0603551d0f"
+    "0101ff040403020186301d0603551d250416301406082b0601050507030206082b06010505070301"
+    "30120603551d130101ff040830060101ff020100301d0603551d0e04160414c5cf46a4eaf4c3c07a"
+    "6c95c42db05e922f26e3b9301f0603551d2304183016801479b459e67bb6e5e40173800888c81a58"
+    "f6e99b6e303206082b0601050507010104263024302206082b060105050730028616687474703a2f"
+    "2f78312e692e6c656e63722e6f72672f30130603551d20040c300a3008060667810c010201302706"
+    "03551d1f0420301e301ca01aa0188616687474703a2f2f78312e632e6c656e63722e6f72672f300d"
+    "06092a864886f70d01010b050003820201004ee2895d0a031c9038d0f51ff9715cf8c38fb237887a"
+    "6fb0251fedbeb7d886068ee90984cd72bf81f3fccacf5348edbdf66942d4a5113e35c813b2921d05"
+    "5fea2ed4d8f849c3adf599969cef26d8e1b4240b48204dfcd354b4a9c621c8e1361bff77642917b9"
+    "f04bef5deacd79d0bf90bfbe23b290da4aa9483174a9440be1e2f62d8371a4757bd294c10519461c"
+    "b98ff3c47448252a0de5f5db43e2db939bb919b41f2fdf6a0e8f31d3630fbb29dcdd662c3fb01b67"
+    "51f8413ce44db9acb8a49c6663f5ab85231dcc53b6ab71aedcc50171da36ee0a182a32fd09317c8f"
+    "f673e79c9cb54a156a77825acfda8d45fe1f2a6405303e73c2c60cb9d63b634aab4603fe99c04640"
+    "276063df503a0747d8154a9fea471f995a08620cb66c33084dd738ed482d2e0568ae805def4cdcd8"
+    "20415f68f1bb5acde30eb00c31879b43de4943e1c8043fd13c1b87453069a8a9720e79121c31d83e"
+    "2357dda74fa0f01c81d1771f6fd6d2b9a8b3031681394b9f55aed26ae4b3bfeaa5d59f4ba3c9d63b"
+    "72f34af654ab0cfc38f76080df6e35ca75a154e42fbc6e17c91aa537b5a29abaecf4c075464f77a8"
+    "e8595691662d6ede2981d6a697055e6445be2cceea644244b0c34fadf0b4dc03ca999b098295820d"
+    "638a66f91972f8d5b98910e289980935f9a21cbe92732374e99d1fd73b4a9a845810c2f3a7e235ec"
+    "7e3b45ce3046526bc0c0"
 )
 
 
diff --git a/tests/net_inet/test_sslcontext_client.py b/tests/net_inet/test_sslcontext_client.py
index 119a42721fa3f..0c83abb733378 100644
--- a/tests/net_inet/test_sslcontext_client.py
+++ b/tests/net_inet/test_sslcontext_client.py
@@ -5,7 +5,7 @@
 # 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=R10
+# 1 s:C=US, O=Let's Encrypt, CN=R11
 #   i:C=US, O=Internet Security Research Group, CN=ISRG Root X1
 #   a:PKEY: RSA, 2048 (bit); sigalg: sha256WithRSAEncryption
 #   v:NotBefore: Mar 13 00:00:00 2024 GMT; NotAfter: Mar 12 23:59:59 2027 GMT

From cc774c3daf68f3e2e1e920d7728b3c07cf6da32e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Jul 2025 15:27:39 +1000
Subject: [PATCH 2539/3129] tools/pyboard.py: Add timeout argument to
 Pyboard.exec_/exec.

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

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 50ecd33b7ab24..4099de299b2c3 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -530,8 +530,8 @@ def eval(self, expression, parse=False):
             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)
+    def exec_(self, command, timeout=10, data_consumer=None):
+        ret, ret_err = self.exec_raw(command, timeout, data_consumer)
         if ret_err:
             raise PyboardError("exception", ret, ret_err)
         return ret

From 941b7e35acd8bd7597ba6a6111cb8e94662094b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Jul 2025 15:28:15 +1000
Subject: [PATCH 2540/3129] tests/run-tests.py: Use TEST_TIMEOUT as timeout for
 bare-metal tests.

This parameter is already used for PC-based tests (eg unix and webassembly
ports), and it makes sense for it to be used for bare-metal ports as well.
That way the timeout is configurable for all targets.

Because this increases the default timeout from 10s to 30s, this fixes some
long-running tests that would previously fail due to a timeout such as
`thread/stress_aes.py` on ESP32.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index e2e95884ab193..522027c1f3e5d 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -15,7 +15,7 @@
 import threading
 import tempfile
 
-# Maximum time to run a PC-based test, in seconds.
+# Maximum time to run a single test, in seconds.
 TEST_TIMEOUT = float(os.environ.get('MICROPY_TEST_TIMEOUT', 30))
 
 # See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
@@ -333,7 +333,7 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
     try:
         had_crash = False
         pyb.enter_raw_repl()
-        output_mupy = pyb.exec_(script)
+        output_mupy = pyb.exec_(script, timeout=TEST_TIMEOUT)
     except pyboard.PyboardError as e:
         had_crash = True
         if not is_special and e.args[0] == "exception":

From 79b2d4ff222636075a9b6530e1694fa277132106 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Jul 2025 16:49:26 +1000
Subject: [PATCH 2541/3129] esp32/machine_uart: Improve sendbreak so it doesn't
 reconfig the UART.

Currently, `UART.sendbreak()` on esp32 will reconfigure the UART to a
slower baudrate and send out a null byte, to synthesise a break condition.
That's not great because it changes the baudrate of the RX path as well,
which could miss incoming bytes while sending the break.

This commit changes the sendbreak implementation to just reconfigure the TX
pin as GPIO in output mode, and hold the pin low for the required duration.

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

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 982d9a7e27aed..661c07138e535 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -508,20 +508,21 @@ static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
 }
 
 static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
-    // Save settings
+    // Calculate the length of the break, as 13 bits.
     uint32_t baudrate;
     check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
+    uint32_t break_delay_us = 13000000 / baudrate;
 
-    // Synthesise the break condition by reducing the baud rate,
-    // and cater for the worst case of 5 data bits, no parity.
-    check_esp_err(uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000)));
-    check_esp_err(uart_set_baudrate(self->uart_num, baudrate * 6 / 15));
-    char buf[1] = {0};
-    uart_write_bytes(self->uart_num, buf, 1);
+    // Wait for any outstanding data to be transmitted.
     check_esp_err(uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000)));
 
-    // Restore original setting
-    check_esp_err(uart_set_baudrate(self->uart_num, baudrate));
+    // Set the TX pin to output, pull it low, and wait for the break period.
+    mp_hal_pin_output(self->tx);
+    mp_hal_pin_write(self->tx, 0);
+    mp_hal_delay_us(break_delay_us);
+
+    // Restore original UART pin settings.
+    check_esp_err(uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts));
 }
 
 // Configure the timer used for IRQ_RXIDLE

From 1ab1f857b3eef3608cebb623526301621086faa1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Jul 2025 16:49:42 +1000
Subject: [PATCH 2542/3129] tests/extmod_hardware/machine_uart_irq_break.py:
 Remove send_uart.

This is no longer needed, the esp32 port can now pass this test using just
a single UART.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../extmod_hardware/machine_uart_irq_break.py | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/tests/extmod_hardware/machine_uart_irq_break.py b/tests/extmod_hardware/machine_uart_irq_break.py
index f255e0f0e6725..879f9cee6762f 100644
--- a/tests/extmod_hardware/machine_uart_irq_break.py
+++ b/tests/extmod_hardware/machine_uart_irq_break.py
@@ -19,18 +19,13 @@
     if "ESP32S2" in _machine or "ESP32C3" in _machine or "ESP32C6" in _machine:
         print("SKIP")
         raise SystemExit
-    # ESP32 needs separate UART instances for the test
-    recv_uart_id = 1
-    recv_tx_pin = 14
-    recv_rx_pin = 5
-    send_uart_id = 2
-    send_tx_pin = 4
-    send_rx_pin = 12
+    uart_id = 1
+    tx_pin = 4
+    rx_pin = 5
 elif "rp2" in sys.platform:
-    recv_uart_id = 0
-    send_uart_id = 0
-    recv_tx_pin = "GPIO0"
-    recv_rx_pin = "GPIO1"
+    uart_id = 0
+    tx_pin = "GPIO0"
+    rx_pin = "GPIO1"
 else:
     print("Please add support for this test on this platform.")
     raise SystemExit
@@ -42,22 +37,17 @@ def irq(u):
 
 # Test that the IRQ is called for each break received.
 for bits_per_s in (2400, 9600, 57600):
-    recv_uart = UART(recv_uart_id, bits_per_s, tx=recv_tx_pin, rx=recv_rx_pin)
-    if recv_uart_id != send_uart_id:
-        send_uart = UART(send_uart_id, bits_per_s, tx=send_tx_pin, rx=send_rx_pin)
-    else:
-        send_uart = recv_uart
-
-    recv_uart.irq(irq, recv_uart.IRQ_BREAK)
+    uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
+    uart.irq(irq, uart.IRQ_BREAK)
 
     print("write", bits_per_s)
     for i in range(3):
-        send_uart.write(str(i))
-        send_uart.flush()
+        uart.write(str(i))
+        uart.flush()
         time.sleep_ms(10)
-        send_uart.sendbreak()
+        uart.sendbreak()
         time.sleep_ms(10)
         if "esp32" in sys.platform:
             # On esp32 a read is needed to read in the break byte.
-            recv_uart.read()
+            uart.read()
     print("done")

From 10ef3e4ac2767b68f746f0ebb995672076eee67d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 20 Jul 2025 00:19:08 +1000
Subject: [PATCH 2543/3129] esp32: Update to use ESP-IDF v5.4.2.

This is a patch release of the IDF.  Comparing with 5.4.1, firmware size is
up by about 1.5k on ESP32 and 9k on ESP32-S3.  But IRAM usage (of the IDF)
is down by about 500 byte on ESP32 and DRAM usage is down by about 20k on
ESP32 and 10k on ESP32-S3.

Testing on ESP32, ESP32-S2, ESP32-S3 and ESP32-C3 shows no regressions,
except in BLE MTU ordering (the MTU exchange event occuring before the
connect event).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md              | 8 ++++----
 ports/esp32/tools/metrics_esp32.py | 2 +-
 tools/ci.sh                        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index d8b55e45f3b42..4adff66328df2 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -31,7 +31,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 v5.2, v5.2.2, v5.3, v5.4 and v5.4.1.
+Currently MicroPython supports v5.2, v5.2.2, v5.3, v5.4, v5.4.1 and v5.4.2.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
@@ -49,10 +49,10 @@ The steps to take are summarised below.
 To check out a copy of the IDF use git clone:
 
 ```bash
-$ git clone -b v5.4.1 --recursive https://github.com/espressif/esp-idf.git
+$ git clone -b v5.4.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v5.4.1` with any other supported version.
+You can replace `v5.4.2` with 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.)
 
@@ -61,7 +61,7 @@ MicroPython and update the submodules using:
 
 ```bash
 $ cd esp-idf
-$ git checkout v5.4.1
+$ git checkout v5.4.2
 $ git submodule update --init --recursive
 ```
 
diff --git a/ports/esp32/tools/metrics_esp32.py b/ports/esp32/tools/metrics_esp32.py
index 9efaae63a9baf..70f049c3bd415 100755
--- a/ports/esp32/tools/metrics_esp32.py
+++ b/ports/esp32/tools/metrics_esp32.py
@@ -37,7 +37,7 @@
 import subprocess
 from dataclasses import dataclass
 
-IDF_VERS = ("v5.4.1",)
+IDF_VERS = ("v5.4.2",)
 
 BUILDS = (
     ("ESP32_GENERIC", ""),
diff --git a/tools/ci.sh b/tools/ci.sh
index 3e695c63a6402..594bca80044cf 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -169,7 +169,7 @@ function ci_cc3200_build {
 # ports/esp32
 
 # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
-IDF_VER=v5.4.1
+IDF_VER=v5.4.2
 PYTHON=$(command -v python3 2> /dev/null)
 PYTHON_VER=$(${PYTHON:-python} --version | cut -d' ' -f2)
 

From c6423d5d8e47ee0dc6b60fe150b4a2b540116940 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 20 Jul 2025 22:01:54 +1000
Subject: [PATCH 2544/3129] tests/multi_bluetooth: Synchronise MTU exchange in
 BLE MTU tests.

With the recent update to ESP-IDF 5.4.2, there is a change in BLE event
behaviour which makes `tests/multi_bluetooth/ble_mtu.py` and
`tests/multi_bluetooth/ble_mtu_peripheral.py` now fail on ESP32 with IDF
5.4.2.

The change in behaviour is that MTU_EXCHANGE events can now occur before
CENTRAL_CONNECT/PERIPHERAL_CONNECT events.  That seems a bit strange,
because the MTU exchange occurs after the connection.  And looking at the
timing of the events there is exactly 100ms between them, ie MTU_EXCHANGE
fires and then exactly 100ms later CENTRAL_CONNECT/PERIPHERAL_CONNECT
fires.

It's unknown if this is a bug in (Espressif's) NimBLE, a subtle change in
scheduling with still valid behaviour, an intended change, a change allowed
under the BLE spec, or something else.

But in order to move forward with updating to IDF 5.4.2, the relevant tests
have been adjusted so they can pass.  The test just needs to wait a bit
between doing the connect and doing the MTU exchange, so the other side
sees the original/correct ordering of events.  This wait is done using the
multitest synchronisation primitives (broadcast and wait).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/ble_mtu.py            | 10 ++++++++++
 tests/multi_bluetooth/ble_mtu_peripheral.py | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/tests/multi_bluetooth/ble_mtu.py b/tests/multi_bluetooth/ble_mtu.py
index 5f00b270cc0c7..92a40fbb4bc87 100644
--- a/tests/multi_bluetooth/ble_mtu.py
+++ b/tests/multi_bluetooth/ble_mtu.py
@@ -106,6 +106,9 @@ def instance0():
             # Wait for central to connect to us.
             conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
 
+            # Inform the central that we have been connected to.
+            multitest.broadcast("peripheral is connected")
+
             mtu = wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS)
 
             multitest.wait(f"client:discovery:{i}")
@@ -138,6 +141,13 @@ def instance1():
             ble.gap_connect(BDADDR[0], BDADDR[1], TIMEOUT_MS)
             conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
+            # Wait for peripheral to be ready for MTU exchange.
+            # On ESP32 with NimBLE and IDF 5.4.2 (at least), if the MTU exchange occurs
+            # immediately after the peripheral connect event, the peripheral may see its
+            # _IRQ_MTU_EXCHANGED event before its _IRQ_CENTRAL_CONNECT event.  The wait
+            # here ensures correct event ordering on the peripheral.
+            multitest.wait("peripheral is connected")
+
             # Central-initiated mtu exchange.
             print("gattc_exchange_mtu")
             ble.gattc_exchange_mtu(conn_handle)
diff --git a/tests/multi_bluetooth/ble_mtu_peripheral.py b/tests/multi_bluetooth/ble_mtu_peripheral.py
index 1c0de40a0c4df..50882bcd79cb0 100644
--- a/tests/multi_bluetooth/ble_mtu_peripheral.py
+++ b/tests/multi_bluetooth/ble_mtu_peripheral.py
@@ -101,6 +101,13 @@ def instance0():
             # Wait for central to connect to us.
             conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
 
+            # Wait for central to be ready for MTU exchange.
+            # On ESP32 with NimBLE and IDF 5.4.2 (at least), if the MTU exchange occurs
+            # immediately after the central connect event, the central may see its
+            # _IRQ_MTU_EXCHANGED event before its _IRQ_PERIPHERAL_CONNECT event.  The
+            # wait here ensures correct event ordering on the central.
+            multitest.wait("central is connected")
+
             # Peripheral-initiated mtu exchange.
             print("gattc_exchange_mtu")
             ble.gattc_exchange_mtu(conn_handle)
@@ -142,6 +149,9 @@ def instance1():
             ble.gap_connect(BDADDR[0], BDADDR[1], 5000)
             conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
+            # Inform the peripheral that we have been connected to.
+            multitest.broadcast("central is connected")
+
             mtu = wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS)
 
             print("gattc_discover_characteristics")

From 41e0ec96cb10580c8d77156ed51c2e34bc2fc0ac Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 5 Jun 2025 15:32:01 +1000
Subject: [PATCH 2545/3129] extmod/mbedtls: Implement DTLS HelloVerify cookie
 support.

This is already enabled in the ESP-IDF mbedTLS config, so provide an
implementation of the cookie store functions. This allows DTLS connections
between two esp32 boards.

The session cookie store is a very simple dictionary associated with the
SSLContext. To work, the server needs to reuse the same SSLContext (but
cookies are never cleaned up, so a server with a high number of clients
should recycle the context periodically.)

Server code still needs to handle the MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED
error by waiting for the next UDP packet from the client.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/modtls_mbedtls.c | 53 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 71a14adcff12d..4bd0aea9ab3ec 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -62,6 +62,9 @@
 #include "mbedtls/ecdsa.h"
 #include "mbedtls/asn1.h"
 #endif
+#ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+#include "mbedtls/ssl_cookie.h"
+#endif
 
 #ifndef MICROPY_MBEDTLS_CONFIG_BARE_METAL
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (0)
@@ -92,6 +95,9 @@ typedef struct _mp_obj_ssl_context_t {
     #if MICROPY_PY_SSL_ECDSA_SIGN_ALT
     mp_obj_t ecdsa_sign_callback;
     #endif
+    #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+    mbedtls_ssl_cookie_ctx cookie_ctx;
+    #endif
 } mp_obj_ssl_context_t;
 
 // This corresponds to an SSLSocket object.
@@ -117,7 +123,8 @@ static const mp_obj_type_t ssl_socket_type;
 static const MP_DEFINE_STR_OBJ(mbedtls_version_obj, MBEDTLS_VERSION_STRING_FULL);
 
 static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
-    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname);
+    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname,
+    mp_obj_t client_id);
 
 /******************************************************************************/
 // Helper functions.
@@ -320,6 +327,16 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     mbedtls_ssl_conf_dbg(&self->conf, mbedtls_debug, NULL);
     #endif
 
+    #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+    mbedtls_ssl_cookie_init(&self->cookie_ctx);
+    ret = mbedtls_ssl_cookie_setup(&self->cookie_ctx, mbedtls_ctr_drbg_random, &self->ctr_drbg);
+    if (ret != 0) {
+        mbedtls_raise_error(ret);
+    }
+    mbedtls_ssl_conf_dtls_cookies(&self->conf, mbedtls_ssl_cookie_write, mbedtls_ssl_cookie_check,
+        &self->cookie_ctx);
+    #endif
+
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -366,6 +383,11 @@ static mp_obj_t ssl_context___del__(mp_obj_t self_in) {
     mbedtls_ctr_drbg_free(&self->ctr_drbg);
     mbedtls_entropy_free(&self->entropy);
     mbedtls_ssl_config_free(&self->conf);
+    #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+    if (self->is_dtls_server) {
+        mbedtls_ssl_cookie_free(&self->cookie_ctx);
+    }
+    #endif
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(ssl_context___del___obj, ssl_context___del__);
@@ -468,11 +490,14 @@ static mp_obj_t ssl_context_load_verify_locations(mp_obj_t self_in, mp_obj_t cad
 static MP_DEFINE_CONST_FUN_OBJ_2(ssl_context_load_verify_locations_obj, ssl_context_load_verify_locations);
 
 static mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname };
+    enum { ARG_server_side, ARG_do_handshake_on_connect, ARG_server_hostname, ARG_client_id };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
         { MP_QSTR_do_handshake_on_connect, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
         { MP_QSTR_server_hostname, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+        { MP_QSTR_client_id, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        #endif
     };
 
     // Parse arguments.
@@ -481,9 +506,14 @@ static mp_obj_t ssl_context_wrap_socket(size_t n_args, const mp_obj_t *pos_args,
     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);
 
+    mp_obj_t client_id = mp_const_none;
+    #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+    client_id = args[ARG_client_id].u_obj;
+    #endif
+
     // Create and return the new SSLSocket object.
     return ssl_socket_make_new(self, sock, args[ARG_server_side].u_bool,
-        args[ARG_do_handshake_on_connect].u_bool, args[ARG_server_hostname].u_obj);
+        args[ARG_do_handshake_on_connect].u_bool, args[ARG_server_hostname].u_obj, client_id);
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(ssl_context_wrap_socket_obj, 2, ssl_context_wrap_socket);
 
@@ -580,7 +610,7 @@ static int _mbedtls_timing_get_delay(void *ctx) {
 #endif
 
 static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t sock,
-    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname) {
+    bool server_side, bool do_handshake_on_connect, mp_obj_t server_hostname, mp_obj_t client_id) {
 
     // Store the current SSL context.
     store_active_context(ssl_context);
@@ -634,6 +664,21 @@ static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     #ifdef MBEDTLS_SSL_PROTO_DTLS
     mbedtls_ssl_set_timer_cb(&o->ssl, o, _mbedtls_timing_set_delay, _mbedtls_timing_get_delay);
     #endif
+    #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+    if (client_id != mp_const_none) {
+        mp_buffer_info_t buf;
+        if (mp_get_buffer(client_id, &buf, MP_BUFFER_READ)) {
+            ret = mbedtls_ssl_set_client_transport_id(&o->ssl, buf.buf, buf.len);
+        } else {
+            ret = MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
+        }
+        if (ret != 0) {
+            goto cleanup;
+        }
+    } else {
+        // TODO: should it be an error not to provide this argument for DTLS server?
+    }
+    #endif
 
     mbedtls_ssl_set_bio(&o->ssl, &o->sock, _mbedtls_ssl_send, _mbedtls_ssl_recv, NULL);
 

From 9b7d85227e67a7edd608aab4ff7eb4a838651f75 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 5 Jun 2025 15:32:38 +1000
Subject: [PATCH 2546/3129] extmod/mbedtls: Implement recommended DTLS
 features, make optional.

- DTLS spec recommends HelloVerify and Anti Replay protection be enabled,
  and these are enabled in the default mbedTLS config. Implement them here.

- To help compensate for the possible increase in code size, add a
  MICROPY_PY_SSL_DTLS build config macro that's enabled for EXTRA and
  above by default.

This allows bare metal mbedTLS ports to use DTLS with HelloVerify support.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/ssl.rst                   | 48 ++++++++++++++++++++++----
 extmod/mbedtls/mbedtls_config_common.h | 10 +++++-
 extmod/modtls_mbedtls.c                | 29 +++++++++-------
 py/mpconfig.h                          |  5 +++
 tests/extmod/tls_dtls.py               | 12 ++++++-
 tests/extmod/tls_dtls.py.exp           |  1 +
 6 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index 4327c74bad6c8..c86101872c364 100644
--- a/docs/library/ssl.rst
+++ b/docs/library/ssl.rst
@@ -66,7 +66,7 @@ class SSLContext
    Set the available ciphers for sockets created with this context.  *ciphers* should be
    a list of strings in the `IANA cipher suite format <https://wiki.mozilla.org/Security/Cipher_Suites>`_ .
 
-.. method:: SSLContext.wrap_socket(sock, *, server_side=False, do_handshake_on_connect=True, server_hostname=None)
+.. method:: SSLContext.wrap_socket(sock, *, server_side=False, do_handshake_on_connect=True, server_hostname=None, client_id=None)
 
    Takes a `stream` *sock* (usually socket.socket instance of ``SOCK_STREAM`` type),
    and returns an instance of ssl.SSLSocket, wrapping the underlying stream.
@@ -89,6 +89,9 @@ class SSLContext
      server certificate.  It also sets the name for Server Name Indication (SNI), allowing the server
      to present the proper certificate.
 
+   - *client_id* is a MicroPython-specific extension argument used only when implementing a DTLS
+     Server. See :ref:`dtls` for details.
+
 .. warning::
 
    Some implementations of ``ssl`` module do NOT validate server certificates,
@@ -117,6 +120,8 @@ Exceptions
 
    This exception does NOT exist. Instead its base class, OSError, is used.
 
+.. _dtls:
+
 DTLS support
 ------------
 
@@ -125,16 +130,47 @@ DTLS support
 
    This is a MicroPython extension.
 
-This module supports DTLS in client and server mode via the `PROTOCOL_DTLS_CLIENT`
-and `PROTOCOL_DTLS_SERVER` constants that can be used as the ``protocol`` argument
-of `SSLContext`.
+On most ports, this module supports DTLS in client and server mode via the
+`PROTOCOL_DTLS_CLIENT` and `PROTOCOL_DTLS_SERVER` constants that can be used as
+the ``protocol`` argument of `SSLContext`.
 
 In this case the underlying socket is expected to behave as a datagram socket (i.e.
 like the socket opened with ``socket.socket`` with ``socket.AF_INET`` as ``af`` and
 ``socket.SOCK_DGRAM`` as ``type``).
 
-DTLS is only supported on ports that use mbed TLS, and it is not enabled by default:
-it requires enabling ``MBEDTLS_SSL_PROTO_DTLS`` in the specific port configuration.
+DTLS is only supported on ports that use mbedTLS, and it is enabled by default
+in most configurations but can be manually disabled by defining
+``MICROPY_PY_SSL_DTLS`` to 0.
+
+DTLS server support
+^^^^^^^^^^^^^^^^^^^
+
+MicroPython's DTLS server support is configured with "Hello Verify" as required
+for DTLS 1.2. This is transparent for DTLS clients, but there are relevant
+considerations when implementing a DTLS server in MicroPython:
+
+- The server should pass an additional argument *client_id* when calling
+  `SSLContext.wrap_socket()`. This ID must be a `bytes` object (or similar) with
+  a transport-specific identifier representing the client.
+
+  The simplest approach is to convert the tuple of ``(client_ip, client_port)``
+  returned from ``socket.recv_from()`` into a byte string, i.e.::
+
+        _, client_addr = sock.recvfrom(1, socket.MSG_PEEK)
+        sock.connect(client_addr)  # Connect back to the client
+        sock = ssl_ctx.wrap_socket(sock, server_side=True,
+                                   client_id=repr(client_addr).encode())
+
+- The first time a client connects, the server call to ``wrap_socket`` will fail
+  with a `OSError` error "Hello Verify Required". This is because the DTLS
+  "Hello Verify" cookie is not yet known by the client. If the same client
+  connects a second time then ``wrap_socket`` will succeed.
+
+- DTLS cookies for "Hello Verify" are associated with the `SSLContext` object,
+  so the same `SSLContext` object should be used to wrap a subsequent connection
+  from the same client. The cookie implementation includes a timeout and has
+  constant memory use regardless of how many clients connect, so it's OK to
+  reuse the same `SSLContext` object for the lifetime of the server.
 
 Constants
 ---------
diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 6cd14befc3196..1f7ac88180d62 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
 
+#include "py/mpconfig.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
@@ -89,12 +91,18 @@
 #define MBEDTLS_SHA384_C
 #define MBEDTLS_SHA512_C
 #define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_PROTO_DTLS
 #define MBEDTLS_SSL_SRV_C
 #define MBEDTLS_SSL_TLS_C
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_USE_C
 
+#if MICROPY_PY_SSL_DTLS
+#define MBEDTLS_SSL_PROTO_DTLS
+#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
+#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
+#define MBEDTLS_SSL_COOKIE_C
+#endif
+
 // A port may enable this option to select additional bare-metal configuration.
 #if MICROPY_MBEDTLS_CONFIG_BARE_METAL
 
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 4bd0aea9ab3ec..418275440f309 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -78,7 +78,7 @@
 #define MP_PROTOCOL_TLS_CLIENT  0
 #define MP_PROTOCOL_TLS_SERVER  MP_ENDPOINT_IS_SERVER
 #define MP_PROTOCOL_DTLS_CLIENT MP_TRANSPORT_IS_DTLS
-#define MP_PROTOCOL_DTLS_SERVER MP_ENDPOINT_IS_SERVER | MP_TRANSPORT_IS_DTLS
+#define MP_PROTOCOL_DTLS_SERVER (MP_ENDPOINT_IS_SERVER | MP_TRANSPORT_IS_DTLS)
 
 // This corresponds to an SSLContext object.
 typedef struct _mp_obj_ssl_context_t {
@@ -96,6 +96,7 @@ typedef struct _mp_obj_ssl_context_t {
     mp_obj_t ecdsa_sign_callback;
     #endif
     #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
+    bool is_dtls_server;
     mbedtls_ssl_cookie_ctx cookie_ctx;
     #endif
 } mp_obj_ssl_context_t;
@@ -328,14 +329,17 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     #endif
 
     #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
-    mbedtls_ssl_cookie_init(&self->cookie_ctx);
-    ret = mbedtls_ssl_cookie_setup(&self->cookie_ctx, mbedtls_ctr_drbg_random, &self->ctr_drbg);
-    if (ret != 0) {
-        mbedtls_raise_error(ret);
+    self->is_dtls_server = (protocol == MP_PROTOCOL_DTLS_SERVER);
+    if (self->is_dtls_server) {
+        mbedtls_ssl_cookie_init(&self->cookie_ctx);
+        ret = mbedtls_ssl_cookie_setup(&self->cookie_ctx, mbedtls_ctr_drbg_random, &self->ctr_drbg);
+        if (ret != 0) {
+            mbedtls_raise_error(ret);
+        }
+        mbedtls_ssl_conf_dtls_cookies(&self->conf, mbedtls_ssl_cookie_write, mbedtls_ssl_cookie_check,
+            &self->cookie_ctx);
     }
-    mbedtls_ssl_conf_dtls_cookies(&self->conf, mbedtls_ssl_cookie_write, mbedtls_ssl_cookie_check,
-        &self->cookie_ctx);
-    #endif
+    #endif // MBEDTLS_SSL_DTLS_HELLO_VERIFY
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -664,19 +668,18 @@ static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
     #ifdef MBEDTLS_SSL_PROTO_DTLS
     mbedtls_ssl_set_timer_cb(&o->ssl, o, _mbedtls_timing_set_delay, _mbedtls_timing_get_delay);
     #endif
+
     #ifdef MBEDTLS_SSL_DTLS_HELLO_VERIFY
-    if (client_id != mp_const_none) {
+    if (ssl_context->is_dtls_server) {
+        // require the client_id parameter for DTLS (as per mbedTLS requirement)
+        ret = MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
         mp_buffer_info_t buf;
         if (mp_get_buffer(client_id, &buf, MP_BUFFER_READ)) {
             ret = mbedtls_ssl_set_client_transport_id(&o->ssl, buf.buf, buf.len);
-        } else {
-            ret = MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
         }
         if (ret != 0) {
             goto cleanup;
         }
-    } else {
-        // TODO: should it be an error not to provide this argument for DTLS server?
     }
     #endif
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 4c1276275964d..a1025fe5e1b18 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1941,6 +1941,11 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_PY_SSL_MBEDTLS_NEED_ACTIVE_CONTEXT (MICROPY_PY_SSL_ECDSA_SIGN_ALT)
 #endif
 
+// Whether to support DTLS protocol (non-CPython feature)
+#ifndef MICROPY_PY_SSL_DTLS
+#define MICROPY_PY_SSL_DTLS (MICROPY_SSL_MBEDTLS && MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 // Whether to provide the "vfs" module
 #ifndef MICROPY_PY_VFS
 #define MICROPY_PY_VFS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES && MICROPY_VFS)
diff --git a/tests/extmod/tls_dtls.py b/tests/extmod/tls_dtls.py
index b2d716769d3f7..a475cce8c112b 100644
--- a/tests/extmod/tls_dtls.py
+++ b/tests/extmod/tls_dtls.py
@@ -34,9 +34,19 @@ def ioctl(self, req, arg):
 # Wrap the DTLS Server
 dtls_server_ctx = SSLContext(PROTOCOL_DTLS_SERVER)
 dtls_server_ctx.verify_mode = CERT_NONE
-dtls_server = dtls_server_ctx.wrap_socket(server_socket, do_handshake_on_connect=False)
+dtls_server = dtls_server_ctx.wrap_socket(
+    server_socket, do_handshake_on_connect=False, client_id=b'dummy_client_id'
+)
 print("Wrapped DTLS Server")
 
+# wrap DTLS server with invalid client_id
+try:
+    dtls_server = dtls_server_ctx.wrap_socket(
+        server_socket, do_handshake_on_connect=False, client_id=4
+    )
+except OSError:
+    print("Failed to wrap DTLS Server with invalid client_id")
+
 # Wrap the DTLS Client
 dtls_client_ctx = SSLContext(PROTOCOL_DTLS_CLIENT)
 dtls_client_ctx.verify_mode = CERT_NONE
diff --git a/tests/extmod/tls_dtls.py.exp b/tests/extmod/tls_dtls.py.exp
index 78d72bff18816..dbd005d0edfb8 100644
--- a/tests/extmod/tls_dtls.py.exp
+++ b/tests/extmod/tls_dtls.py.exp
@@ -1,3 +1,4 @@
 Wrapped DTLS Server
+Failed to wrap DTLS Server with invalid client_id
 Wrapped DTLS Client
 OK

From 89f9ee9d7c08bb0912b94fe6190646c4d37508a2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 5 Jun 2025 15:33:56 +1000
Subject: [PATCH 2547/3129] tests/multi_net: Update DTLS multi-net test.

The original version of this test had to exchange a 1 byte UDP packet
before the DTLS handshake. This is no longer needed due to MSG_PEEK
support.

The test also doesn't work with HelloVerify enabled, as the first
connection attempt always fails with an
MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED result. Anticipate this by listening
for the client twice on the server side.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_net/tls_dtls_server_client.py     | 55 ++++++++++---------
 tests/multi_net/tls_dtls_server_client.py.exp | 23 ++++----
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/tests/multi_net/tls_dtls_server_client.py b/tests/multi_net/tls_dtls_server_client.py
index d50deb354ed4d..a81c4cb28230c 100644
--- a/tests/multi_net/tls_dtls_server_client.py
+++ b/tests/multi_net/tls_dtls_server_client.py
@@ -34,28 +34,36 @@ def instance0():
 
     multitest.next()
 
-    # Wait for the client to connect.
-    data, client_addr = s.recvfrom(1)
-    print("incoming connection", data)
-
-    # Connect back to the client, so the UDP socket can be used like a stream.
-    s.connect(client_addr)
-
-    # Create the DTLS context and load the certificate.
     ctx = tls.SSLContext(tls.PROTOCOL_DTLS_SERVER)
     ctx.load_cert_chain(cert, key)
 
-    # Wrap the UDP socket in server mode.
-    print("wrap socket")
-    s = ctx.wrap_socket(s, server_side=1)
-
-    # Transfer some data.
-    for _ in range(4):
-        print(s.recv(16))
-        s.send(b"server to client")
-
-    # Close the DTLS and UDP connection.
-    s.close()
+    # Because of "hello verify required", we expect the peer
+    # to connect twice: once to set the cookie, then second time
+    # successfully.
+    #
+    # As this isn't a real server, we hard-code two connection attempts
+    for _ in range(2):
+        print("waiting")
+        # Wait for the client to connect so we know their address
+        _, client_addr = s.recvfrom(1, socket.MSG_PEEK)
+        print("incoming connection")
+        s.connect(client_addr)  # Connect back to the client
+
+        # Wrap the UDP socket in server mode.
+        try:
+            s = ctx.wrap_socket(s, server_side=1, client_id=repr(client_addr).encode())
+        except OSError as e:
+            print(e)
+            continue  # wait for second connection
+
+        # Transfer some data.
+        for i in range(4):
+            print(s.recv(32))
+            s.send(b"server to client " + str(i).encode())
+
+        # Close the DTLS and UDP connection.
+        s.close()
+        break
 
 
 # DTLS client.
@@ -68,9 +76,6 @@ def instance1():
     print("connect")
     s.connect(addr)
 
-    # Send one byte to indicate a connection, and so the server can obtain our address.
-    s.write("X")
-
     # Create a DTLS context and load the certificate.
     ctx = tls.SSLContext(tls.PROTOCOL_DTLS_CLIENT)
     ctx.verify_mode = tls.CERT_REQUIRED
@@ -81,9 +86,9 @@ def instance1():
     s = ctx.wrap_socket(s, server_hostname="micropython.local")
 
     # Transfer some data.
-    for _ in range(4):
-        s.send(b"client to server")
-        print(s.recv(16))
+    for i in range(4):
+        s.send(b"client to server " + str(i).encode())
+        print(s.recv(32))
 
     # Close the DTLS and UDP connection.
     s.close()
diff --git a/tests/multi_net/tls_dtls_server_client.py.exp b/tests/multi_net/tls_dtls_server_client.py.exp
index f2ff396e181df..3de03056740da 100644
--- a/tests/multi_net/tls_dtls_server_client.py.exp
+++ b/tests/multi_net/tls_dtls_server_client.py.exp
@@ -1,14 +1,17 @@
 --- instance0 ---
-incoming connection b'X'
-wrap socket
-b'client to server'
-b'client to server'
-b'client to server'
-b'client to server'
+waiting
+incoming connection
+(-27264, 'MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED')
+waiting
+incoming connection
+b'client to server 0'
+b'client to server 1'
+b'client to server 2'
+b'client to server 3'
 --- instance1 ---
 connect
 wrap socket
-b'server to client'
-b'server to client'
-b'server to client'
-b'server to client'
+b'server to client 0'
+b'server to client 1'
+b'server to client 2'
+b'server to client 3'

From 28082d1d25c55a513677441c8053b82f6786aa3d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 12 Jun 2025 10:36:59 +1000
Subject: [PATCH 2548/3129] extmod/mbedtls: Undefine ARRAY_SIZE if defined by
 platform.

This is an annoying regression caused by including mpconfig.h in 36922df -
the mimxrt platform headers define ARRAY_SIZE and mbedtls also defines in
some source files, using a different parameter name which is a warning in
gcc.

Technically mimxrt SDK is to blame here, but as this isn't a named warning
in gcc the only way to work around it in the mimxrt port would be to
disable all warnings when building this particular mbedTLS source file.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 extmod/mbedtls/mbedtls_config_common.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 1f7ac88180d62..040b0598dce8d 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -123,4 +123,8 @@ void m_tracked_free(void *ptr);
 
 #endif
 
+// Workaround for a mimxrt platform driver header that defines ARRAY_SIZE,
+// which is also defined in some mbedtls source files.
+#undef ARRAY_SIZE
+
 #endif // MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H

From 6515cd05f17240c5d42d80638a55ce3b5ba4d1bf Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 26 Jun 2025 14:58:06 +1000
Subject: [PATCH 2549/3129] extmod/vfs_lfsx: Allow overriding the LFS2 on-disk
 version format.

Back in LFS2 version 2.6 they updated the on-disk version from 2.0 to 2.1
which broke back compatibility (aka older versions could no long read new
version disk format), see
https://github.com/littlefs-project/littlefs/releases/tag/v2.6.0

Then in LFS2 v2.7 an optional `config->disk_version` was added to force the
library to use an older disk format instead, see:
https://github.com/littlefs-project/littlefs/releases/tag/v2.7.0

This commit simply exposes `config->disk_version` as a compile time option
if LFS2_MULTIVERSION is set, otherwise there is no change in behavior.
This is Useful for compatibility with older LFS versions.

Note: LFS2_MULTIVERSION needs to be defined at the make / CFLAGS level,
setting it in mpconfigboard.h doesn't work as it's not included in the
`lfs2.c` file in any way.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/vfs_lfsx.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 372037784b484..bbdd21cfb9176 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -104,6 +104,12 @@ static void MP_VFS_LFSx(init_config)(MP_OBJ_VFS_LFSx * self, mp_obj_t bdev, size
     config->read_buffer = m_new(uint8_t, config->cache_size);
     config->prog_buffer = m_new(uint8_t, config->cache_size);
     config->lookahead_buffer = m_new(uint8_t, config->lookahead_size);
+    #ifdef LFS2_MULTIVERSION
+    // This can be set to override the on-disk lfs version.
+    // eg. for compat with lfs2 < v2.6 add the following to make:
+    // CFLAGS += '-DLFS2_MULTIVERSION=0x00020000'
+    config->disk_version = LFS2_MULTIVERSION;
+    #endif
     #endif
 }
 

From d79000df70d2fe50a7912da7f52813ad00584b3c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 19 Jul 2025 06:32:57 -0500
Subject: [PATCH 2550/3129] tests/extmod: Add (failing) test for VfsPosix in
 readonly mode.

I noticed that operations such as unlink could be performed on a nominally
read-only VfsPosix.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/extmod/vfs_posix_readonly.py     | 99 ++++++++++++++++++++++++++
 tests/extmod/vfs_posix_readonly.py.exp |  7 ++
 2 files changed, 106 insertions(+)
 create mode 100644 tests/extmod/vfs_posix_readonly.py
 create mode 100644 tests/extmod/vfs_posix_readonly.py.exp

diff --git a/tests/extmod/vfs_posix_readonly.py b/tests/extmod/vfs_posix_readonly.py
new file mode 100644
index 0000000000000..e7821381006fd
--- /dev/null
+++ b/tests/extmod/vfs_posix_readonly.py
@@ -0,0 +1,99 @@
+# Test for VfsPosix
+
+try:
+    import gc, os, vfs, errno
+
+    vfs.VfsPosix
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+# We need a directory for testing that doesn't already exist.
+# Skip the test if it does exist.
+temp_dir = "vfs_posix_readonly_test_dir"
+try:
+    os.stat(temp_dir)
+    raise SystemExit("Target directory {} exists".format(temp_dir))
+except OSError:
+    pass
+
+# mkdir (skip test if whole filesystem is readonly)
+try:
+    os.mkdir(temp_dir)
+except OSError as e:
+    if e.errno == errno.EROFS:
+        print("SKIP")
+        raise SystemExit
+
+fs_factory = lambda: vfs.VfsPosix(temp_dir)
+
+# mount
+fs = fs_factory()
+vfs.mount(fs, "/vfs")
+
+with open("/vfs/file", "w") as f:
+    f.write("content")
+
+# test reading works
+with open("/vfs/file") as f:
+    print("file:", f.read())
+
+os.mkdir("/vfs/emptydir")
+
+# umount
+vfs.umount("/vfs")
+
+# mount read-only
+fs = fs_factory()
+vfs.mount(fs, "/vfs", readonly=True)
+
+# test reading works
+with open("/vfs/file") as f:
+    print("file 2:", f.read())
+
+# test writing fails
+try:
+    with open("/vfs/test_write", "w"):
+        pass
+    print("opened")
+except OSError as er:
+    print(repr(er))
+
+# test removing fails
+try:
+    os.unlink("/vfs/file")
+    print("unlinked")
+except OSError as er:
+    print(repr(er))
+
+# test renaming fails
+try:
+    os.rename("/vfs/file2", "/vfs/renamed")
+    print("renamed")
+except OSError as er:
+    print(repr(er))
+
+# test removing directory fails
+try:
+    os.rmdir("/vfs/emptydir")
+    print("rmdir'd")
+except OSError as er:
+    print(repr(er))
+
+# test creating directory fails
+try:
+    os.mkdir("/vfs/emptydir2")
+    print("mkdir'd")
+except OSError as er:
+    print(repr(er))
+
+# umount
+vfs.umount("/vfs")
+
+fs = fs_factory()
+vfs.mount(fs, "/vfs")
+
+os.rmdir("/vfs/emptydir")
+os.unlink("/vfs/file")
+
+os.rmdir(temp_dir)
diff --git a/tests/extmod/vfs_posix_readonly.py.exp b/tests/extmod/vfs_posix_readonly.py.exp
new file mode 100644
index 0000000000000..40e4316775ff3
--- /dev/null
+++ b/tests/extmod/vfs_posix_readonly.py.exp
@@ -0,0 +1,7 @@
+file: content
+file 2: content
+OSError(30,)
+OSError(30,)
+OSError(30,)
+OSError(30,)
+OSError(30,)

From 3c603f7baf25b089a30f41d3cd57d13ba50b194c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 19 Jul 2025 06:33:50 -0500
Subject: [PATCH 2551/3129] extmod/vfs_posix: Add additional readonly checks.

Otherwise operations such as unlink can be performed on a nominally
read-only VfsPosix.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/vfs_posix.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index bd9a6d84062cf..9393d3b5e6460 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -160,10 +160,21 @@ static mp_obj_t vfs_posix_umount(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_umount_obj, vfs_posix_umount);
 
+static inline bool vfs_posix_is_readonly(mp_obj_vfs_posix_t *self) {
+    return self->readonly;
+}
+
+static void vfs_posix_require_writable(mp_obj_t self_in) {
+    mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
+    if (vfs_posix_is_readonly(self)) {
+        mp_raise_OSError(MP_EROFS);
+    }
+}
+
 static mp_obj_t vfs_posix_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     const char *mode = mp_obj_str_get_str(mode_in);
-    if (self->readonly
+    if (vfs_posix_is_readonly(self)
         && (strchr(mode, 'w') != NULL || strchr(mode, 'a') != NULL || strchr(mode, '+') != NULL)) {
         mp_raise_OSError(MP_EROFS);
     }
@@ -303,6 +314,7 @@ typedef struct _mp_obj_listdir_t {
 } mp_obj_listdir_t;
 
 static mp_obj_t vfs_posix_mkdir(mp_obj_t self_in, mp_obj_t path_in) {
+    vfs_posix_require_writable(self_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();
@@ -320,11 +332,13 @@ static mp_obj_t vfs_posix_mkdir(mp_obj_t self_in, mp_obj_t path_in) {
 static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_mkdir_obj, vfs_posix_mkdir);
 
 static mp_obj_t vfs_posix_remove(mp_obj_t self_in, mp_obj_t path_in) {
+    vfs_posix_require_writable(self_in);
     return vfs_posix_fun1_helper(self_in, path_in, unlink);
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_remove_obj, vfs_posix_remove);
 
 static mp_obj_t vfs_posix_rename(mp_obj_t self_in, mp_obj_t old_path_in, mp_obj_t new_path_in) {
+    vfs_posix_require_writable(self_in);
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     const char *old_path = vfs_posix_get_path_str(self, old_path_in);
     const char *new_path = vfs_posix_get_path_str(self, new_path_in);
@@ -339,6 +353,7 @@ static mp_obj_t vfs_posix_rename(mp_obj_t self_in, mp_obj_t old_path_in, mp_obj_
 static MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_rename_obj, vfs_posix_rename);
 
 static mp_obj_t vfs_posix_rmdir(mp_obj_t self_in, mp_obj_t path_in) {
+    vfs_posix_require_writable(self_in);
     return vfs_posix_fun1_helper(self_in, path_in, rmdir);
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_rmdir_obj, vfs_posix_rmdir);

From 59ee59901b9223697cf96f5859fcbf49fe9d21f4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 19 Jul 2025 06:38:18 -0500
Subject: [PATCH 2552/3129] extmod/vfs_posix: Add MICROPY_VFS_POSIX_WRITABLE
 option.

When this configuration flag is set, VfsPosix instances can be written.
Otherwise, they will always be created "read only".

This flag is useful when fuzzing micropython: Without VfsPosix, the fuzzing
input script cannot be read; but with writable VfsPosix, fuzzing scripts
can potentially perform undesired operations on the host filesystem.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/vfs_posix.c | 4 ++--
 py/mpconfig.h      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 9393d3b5e6460..27f833e802f69 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -137,7 +137,7 @@ static mp_obj_t vfs_posix_make_new(const mp_obj_type_t *type, size_t n_args, siz
         vstr_add_char(&vfs->root, '/');
     }
     vfs->root_len = vfs->root.len;
-    vfs->readonly = false;
+    vfs->readonly = !MICROPY_VFS_POSIX_WRITABLE;
 
     return MP_OBJ_FROM_PTR(vfs);
 }
@@ -161,7 +161,7 @@ static mp_obj_t vfs_posix_umount(mp_obj_t self_in) {
 static MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_umount_obj, vfs_posix_umount);
 
 static inline bool vfs_posix_is_readonly(mp_obj_vfs_posix_t *self) {
-    return self->readonly;
+    return !MICROPY_VFS_POSIX_WRITABLE || self->readonly;
 }
 
 static void vfs_posix_require_writable(mp_obj_t self_in) {
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a1025fe5e1b18..b812cf032a481 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1084,6 +1084,11 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_VFS_POSIX (0)
 #endif
 
+// Whether to include support for writable POSIX filesystems.
+#ifndef MICROPY_VFS_POSIX_WRITABLE
+#define MICROPY_VFS_POSIX_WRITABLE (1)
+#endif
+
 // Support for VFS FAT component, to mount a FAT filesystem within VFS
 #ifndef MICROPY_VFS_FAT
 #define MICROPY_VFS_FAT (0)

From d6876e227318f974b94655ee7b74dc4995701660 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Thu, 17 Jul 2025 23:40:19 +0200
Subject: [PATCH 2553/3129] py/obj: Fix REPR_C bias toward zero.

Current implementation of REPR_C works by clearing the two lower bits of
the mantissa to zero.  As this happens after each floating point operation,
this tends to bias floating point numbers towards zero, causing decimals
like .9997 instead of rounded numbers.  This is visible in test cases
involving repeated computations, such as `tests/misc/rge_sm.py` for
instance.

The suggested fix fills in the missing bits by copying the previous two
bits.  Although this cannot recreate missing information, it fixes the bias
by inserting plausible values for the lost bits, at a relatively low cost.

Some float tests involving irrational numbers have to be softened in case
of REPR_C, as the 30 bits are not always enough to fulfill the expectations
of the original test, and the change may randomly affect the last digits.
Such cases have been made explicit by testing for REPR_C or by adding a
clear comment.

The perf_test fft code was also missing a call to round() before casting a
log_2 operation to int, which was causing a failure due to a last-decimal
change.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 py/obj.h                          |  4 +++
 tests/float/cmath_fun.py          |  3 +++
 tests/float/math_fun_special.py   |  5 ++++
 tests/float/string_format_fp30.py | 42 -------------------------------
 tests/misc/rge_sm.py              | 10 +++++++-
 tests/perf_bench/bm_fft.py        |  2 +-
 tests/run-tests.py                |  6 -----
 7 files changed, 22 insertions(+), 50 deletions(-)
 delete mode 100644 tests/float/string_format_fp30.py

diff --git a/py/obj.h b/py/obj.h
index a1df661ff0992..6c2153697e6d4 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -206,6 +206,10 @@ static inline mp_float_t mp_obj_float_get(mp_const_obj_t o) {
         mp_float_t f;
         mp_uint_t u;
     } num = {.u = ((mp_uint_t)o - 0x80800000u) & ~3u};
+    // Rather than always truncating toward zero, which creates a strong
+    // bias, copy the two previous bits to fill in the two missing bits.
+    // This appears to be a pretty good heuristic.
+    num.u |= (num.u >> 2) & 3u;
     return num.f;
 }
 static inline mp_obj_t mp_obj_new_float(mp_float_t f) {
diff --git a/tests/float/cmath_fun.py b/tests/float/cmath_fun.py
index 39011733b02b4..0037d7c65596c 100644
--- a/tests/float/cmath_fun.py
+++ b/tests/float/cmath_fun.py
@@ -51,6 +51,9 @@
             print("%.5g" % ret)
         elif type(ret) == tuple:
             print("%.5g %.5g" % ret)
+        elif f_name == "exp":
+            # exp amplifies REPR_C inaccuracies, so we need to check one digit less
+            print("complex(%.4g, %.4g)" % (real, ret.imag))
         else:
             # some test (eg cmath.sqrt(-0.5)) disagree with CPython with tiny real part
             real = ret.real
diff --git a/tests/float/math_fun_special.py b/tests/float/math_fun_special.py
index e674ec8dfd0df..a747f73e9feb3 100644
--- a/tests/float/math_fun_special.py
+++ b/tests/float/math_fun_special.py
@@ -43,10 +43,15 @@
     ("lgamma", lgamma, pos_test_values + [50.0, 100.0]),
 ]
 
+is_REPR_C = float("1.0000001") == float("1.0")
+
 for function_name, function, test_vals in functions:
     for value in test_vals:
         try:
             ans = "{:.4g}".format(function(value))
         except ValueError as e:
             ans = str(e)
+        # a tiny error in REPR_C value for 1.5204998778 causes a wrong rounded value
+        if is_REPR_C and function_name == 'erfc' and ans == "1.521":
+            ans = "1.52"
         print("{}({:.4g}) = {}".format(function_name, value, ans))
diff --git a/tests/float/string_format_fp30.py b/tests/float/string_format_fp30.py
deleted file mode 100644
index 5f0b213daa342..0000000000000
--- a/tests/float/string_format_fp30.py
+++ /dev/null
@@ -1,42 +0,0 @@
-def test(fmt, *args):
-    print("{:8s}".format(fmt) + ">" + fmt.format(*args) + "<")
-
-
-test("{:10.4}", 123.456)
-test("{:10.4e}", 123.456)
-test("{:10.4e}", -123.456)
-# test("{:10.4f}", 123.456)
-# test("{:10.4f}", -123.456)
-test("{:10.4g}", 123.456)
-test("{:10.4g}", -123.456)
-test("{:10.4n}", 123.456)
-test("{:e}", 100)
-test("{:f}", 200)
-test("{:g}", 300)
-
-test("{:10.4E}", 123.456)
-test("{:10.4E}", -123.456)
-# test("{:10.4F}", 123.456)
-# test("{:10.4F}", -123.456)
-test("{:10.4G}", 123.456)
-test("{:10.4G}", -123.456)
-
-test("{:06e}", float("inf"))
-test("{:06e}", float("-inf"))
-test("{:06e}", float("nan"))
-
-# The following fails right now
-# test("{:10.1}", 0.0)
-
-print("%.0f" % (1.750000 % 0.08333333333))
-# Below isn't compatible with single-precision float
-# print("%.1f" % (1.750000 % 0.08333333333))
-# print("%.2f" % (1.750000 % 0.08333333333))
-# print("%.12f" % (1.750000 % 0.08333333333))
-
-# tests for errors in format string
-
-try:
-    "{:10.1b}".format(0.0)
-except ValueError:
-    print("ValueError")
diff --git a/tests/misc/rge_sm.py b/tests/misc/rge_sm.py
index 5e071687c495d..f5b0910dd3a3f 100644
--- a/tests/misc/rge_sm.py
+++ b/tests/misc/rge_sm.py
@@ -119,6 +119,7 @@ def phaseDiagram(system, trajStart, trajPlot, h=0.1, tend=1.0, range=1.0):
 
 
 def singleTraj(system, trajStart, h=0.02, tend=1.0):
+    is_REPR_C = float("1.0000001") == float("1.0")
     tstart = 0.0
 
     # compute the trajectory
@@ -130,7 +131,14 @@ def singleTraj(system, trajStart, h=0.02, tend=1.0):
 
     for i in range(len(rk.Trajectory)):
         tr = rk.Trajectory[i]
-        print(" ".join(["{:.4f}".format(t) for t in tr]))
+        tr_str = " ".join(["{:.4f}".format(t) for t in tr])
+        if is_REPR_C:
+            # allow two small deviations for REPR_C
+            if tr_str == "1.0000 0.3559 0.6485 1.1944 0.9271 0.1083":
+                tr_str = "1.0000 0.3559 0.6485 1.1944 0.9272 0.1083"
+            if tr_str == "16.0000 0.3894 0.5793 0.7017 0.5686 -0.0168":
+                tr_str = "16.0000 0.3894 0.5793 0.7017 0.5686 -0.0167"
+        print(tr_str)
 
 
 # phaseDiagram(sysSM, (lambda i, j: [0.354, 0.654, 1.278, 0.8 + 0.2 * i, 0.1 + 0.1 * j]), (lambda a: (a[4], a[5])), h=0.1, tend=math.log(10**17))
diff --git a/tests/perf_bench/bm_fft.py b/tests/perf_bench/bm_fft.py
index 9a2d03d11b97c..e35c1216c139f 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.log(n) / math.log(2))
+    levels = int(round(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
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 522027c1f3e5d..328d69f633cf7 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -105,9 +105,6 @@ def open(self, path, mode):
 # Tests to skip on specific targets.
 # These are tests that are difficult to detect that they should not be run on the given target.
 platform_tests_to_skip = {
-    "esp8266": (
-        "misc/rge_sm.py",  # incorrect values due to object representation C
-    ),
     "minimal": (
         "basics/class_inplace_op.py",  # all special methods not supported
         "basics/subclass_native_init.py",  # native subclassing corner cases not support
@@ -788,9 +785,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         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/float_format_ints_power10.py")  # requires fp32

From 8b3439e26c293e374bf94c674d1e747d5a57034f Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Sun, 20 Jul 2025 16:38:33 +0200
Subject: [PATCH 2554/3129] unix/variants/longlong: Use REPR_C on this variant.

There is currently no build using REPR_C in the unix CI tests.  As
discussed in PR #16953, this is something that combines well with the
longlong build.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 ports/unix/variants/longlong/mpconfigvariant.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/unix/variants/longlong/mpconfigvariant.h b/ports/unix/variants/longlong/mpconfigvariant.h
index 20c52e98f9dda..a04ff7a6ddaff 100644
--- a/ports/unix/variants/longlong/mpconfigvariant.h
+++ b/ports/unix/variants/longlong/mpconfigvariant.h
@@ -30,6 +30,15 @@
 
 #define MICROPY_LONGINT_IMPL           (MICROPY_LONGINT_IMPL_LONGLONG)
 
+// We build it on top of REPR C, which uses memory-efficient floating point
+// objects encoded directly mp_obj_t (30 bits only).
+// Therefore this variant should be built using MICROPY_FORCE_32BIT=1
+
+#define MICROPY_OBJ_REPR               (MICROPY_OBJ_REPR_C)
+#define MICROPY_FLOAT_IMPL             (MICROPY_FLOAT_IMPL_FLOAT)
+typedef int mp_int_t;
+typedef unsigned int mp_uint_t;
+
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 

From 6a4306a0df1e936954bfeff65297d74b9b0954e2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Jul 2025 18:23:07 +1000
Subject: [PATCH 2555/3129] unix/mpconfigport: Include time.h to get definition
 of time_t.

Without this there's a build error on macOS (at least).  This was likely
due to a combination of 9b7d85227e67a7edd608aab4ff7eb4a838651f75 and
df05caea6c6437a8b4756ec502a5e6210f4b6256.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpconfigport.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index c18859ecbf75b..68943fb894358 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -29,6 +29,9 @@
 // features to work on Unix-like systems, see mpconfigvariant.h (and
 // mpconfigvariant_common.h) for feature enabling.
 
+// For time_t, needed by MICROPY_TIMESTAMP_IMPL_TIME_T.
+#include <time.h>
+
 // For size_t and ssize_t
 #include <unistd.h>
 

From 7729e80fdddbd9f75cb350de70a84ed26cb601fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Jul 2025 22:58:52 +1000
Subject: [PATCH 2556/3129] all: Go back to using default ruff quote style.

Commit dc2fcfcc5511a371ff684f7d7772e7a7b479246d seems to have accidentally
changed the ruff quote style to "preserve", instead of keeping it at the
default which is "double".

Put it back to the default and update relevant .py files with this rule.

Signed-off-by: Damien George <damien@micropython.org>
---
 pyproject.toml                                |  1 -
 tests/cpydiff/core_fstring_parser.py          |  4 +--
 tests/extmod/deflate_compress_memory_error.py |  2 +-
 tests/extmod/json_loads.py                    |  2 +-
 tests/extmod/json_loads_int_64.py             |  2 +-
 tests/extmod/tls_dtls.py                      |  2 +-
 tests/float/math_fun_special.py               |  2 +-
 tests/import/import_star.py                   | 32 +++++++++----------
 tests/import/pkgstar_all_array/__init__.py    |  2 +-
 tests/import/pkgstar_all_miss/__init__.py     |  2 +-
 tests/import/pkgstar_all_tuple/__init__.py    |  2 +-
 tests/run-tests.py                            |  4 +--
 tools/mpremote/mpremote/commands.py           |  8 ++---
 tools/mpremote/mpremote/main.py               |  2 +-
 tools/mpremote/mpremote/repl.py               |  2 +-
 tools/mpy_ld.py                               | 22 ++++++-------
 16 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0dd15d06c7bcc..8c14c2bffa81d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -68,4 +68,3 @@ mccabe.max-complexity = 40
 #   repl_: not real python files
 #   viper_args: uses f(*)
 exclude = ["tests/basics/*.py", "tests/*/repl_*.py", "tests/micropython/viper_args.py"]
-quote-style = "preserve"
diff --git a/tests/cpydiff/core_fstring_parser.py b/tests/cpydiff/core_fstring_parser.py
index 570b92434a9a0..04b24cdfb6915 100644
--- a/tests/cpydiff/core_fstring_parser.py
+++ b/tests/cpydiff/core_fstring_parser.py
@@ -5,5 +5,5 @@
 workaround: Always use balanced braces and brackets in expressions inside f-strings
 """
 
-print(f'{"hello { world"}')
-print(f'{"hello ] world"}')
+print(f"{'hello { world'}")
+print(f"{'hello ] world'}")
diff --git a/tests/extmod/deflate_compress_memory_error.py b/tests/extmod/deflate_compress_memory_error.py
index 56ce0603081d4..19bef87bff3da 100644
--- a/tests/extmod/deflate_compress_memory_error.py
+++ b/tests/extmod/deflate_compress_memory_error.py
@@ -28,7 +28,7 @@
 
 # Try to compress.  This will try to allocate a large window and fail.
 try:
-    g.write('test')
+    g.write("test")
 except MemoryError:
     print("MemoryError")
 
diff --git a/tests/extmod/json_loads.py b/tests/extmod/json_loads.py
index 095e67d740b9d..092402d715d69 100644
--- a/tests/extmod/json_loads.py
+++ b/tests/extmod/json_loads.py
@@ -86,7 +86,7 @@ def my_print(o):
 
 # incomplete array declaration
 try:
-    my_print(json.loads('[0,'))
+    my_print(json.loads("[0,"))
 except ValueError:
     print("ValueError")
 
diff --git a/tests/extmod/json_loads_int_64.py b/tests/extmod/json_loads_int_64.py
index 193a3c28d8282..f6236f1904a87 100644
--- a/tests/extmod/json_loads_int_64.py
+++ b/tests/extmod/json_loads_int_64.py
@@ -13,4 +13,4 @@
 print(json.loads("-9111222333444555666"))
 print(json.loads("9111222333444555666"))
 print(json.loads("-9111222333444555666"))
-print(json.loads("[\"9111222333444555666777\",9111222333444555666]"))
+print(json.loads('["9111222333444555666777",9111222333444555666]'))
diff --git a/tests/extmod/tls_dtls.py b/tests/extmod/tls_dtls.py
index a475cce8c112b..753ab2fee4f40 100644
--- a/tests/extmod/tls_dtls.py
+++ b/tests/extmod/tls_dtls.py
@@ -35,7 +35,7 @@ def ioctl(self, req, arg):
 dtls_server_ctx = SSLContext(PROTOCOL_DTLS_SERVER)
 dtls_server_ctx.verify_mode = CERT_NONE
 dtls_server = dtls_server_ctx.wrap_socket(
-    server_socket, do_handshake_on_connect=False, client_id=b'dummy_client_id'
+    server_socket, do_handshake_on_connect=False, client_id=b"dummy_client_id"
 )
 print("Wrapped DTLS Server")
 
diff --git a/tests/float/math_fun_special.py b/tests/float/math_fun_special.py
index a747f73e9feb3..ecacedec552ec 100644
--- a/tests/float/math_fun_special.py
+++ b/tests/float/math_fun_special.py
@@ -52,6 +52,6 @@
         except ValueError as e:
             ans = str(e)
         # a tiny error in REPR_C value for 1.5204998778 causes a wrong rounded value
-        if is_REPR_C and function_name == 'erfc' and ans == "1.521":
+        if is_REPR_C and function_name == "erfc" and ans == "1.521":
             ans = "1.52"
         print("{}({:.4g}) = {}".format(function_name, value, ans))
diff --git a/tests/import/import_star.py b/tests/import/import_star.py
index 0947f6a835db1..2cb21b877d728 100644
--- a/tests/import/import_star.py
+++ b/tests/import/import_star.py
@@ -7,39 +7,39 @@
 except TypeError:
     # 2-argument version of next() not supported
     # we are probably not at MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES
-    print('SKIP')
+    print("SKIP")
     raise SystemExit
 
 # 1. test default visibility
 from pkgstar_default import *
 
-print('visibleFun' in globals())
-print('VisibleClass' in globals())
-print('_hiddenFun' in globals())
-print('_HiddenClass' in globals())
+print("visibleFun" in globals())
+print("VisibleClass" in globals())
+print("_hiddenFun" in globals())
+print("_HiddenClass" in globals())
 print(visibleFun())
 
 # 2. test explicit visibility as defined by __all__ (as an array)
 from pkgstar_all_array import *
 
-print('publicFun' in globals())
-print('PublicClass' in globals())
-print('unlistedFun' in globals())
-print('UnlistedClass' in globals())
-print('_privateFun' in globals())
-print('_PrivateClass' in globals())
+print("publicFun" in globals())
+print("PublicClass" in globals())
+print("unlistedFun" in globals())
+print("UnlistedClass" in globals())
+print("_privateFun" in globals())
+print("_PrivateClass" in globals())
 print(publicFun())
 # test dynamic import as used in asyncio
-print('dynamicFun' in globals())
+print("dynamicFun" in globals())
 print(dynamicFun())
 
 # 3. test explicit visibility as defined by __all__ (as an tuple)
 from pkgstar_all_tuple import *
 
-print('publicFun2' in globals())
-print('PublicClass2' in globals())
-print('unlistedFun2' in globals())
-print('UnlistedClass2' in globals())
+print("publicFun2" in globals())
+print("PublicClass2" in globals())
+print("unlistedFun2" in globals())
+print("UnlistedClass2" in globals())
 print(publicFun2())
 
 # 4. test reporting of missing entries in __all__
diff --git a/tests/import/pkgstar_all_array/__init__.py b/tests/import/pkgstar_all_array/__init__.py
index 4499a94d59181..03b012123fe0c 100644
--- a/tests/import/pkgstar_all_array/__init__.py
+++ b/tests/import/pkgstar_all_array/__init__.py
@@ -1,4 +1,4 @@
-__all__ = ['publicFun', 'PublicClass', 'dynamicFun']
+__all__ = ["publicFun", "PublicClass", "dynamicFun"]
 
 
 # Definitions below should always be imported by a star import
diff --git a/tests/import/pkgstar_all_miss/__init__.py b/tests/import/pkgstar_all_miss/__init__.py
index d960c7d0e29f5..f9bbb538072bf 100644
--- a/tests/import/pkgstar_all_miss/__init__.py
+++ b/tests/import/pkgstar_all_miss/__init__.py
@@ -1,4 +1,4 @@
-__all__ = ('existingFun', 'missingFun')
+__all__ = ("existingFun", "missingFun")
 
 
 def existingFun():
diff --git a/tests/import/pkgstar_all_tuple/__init__.py b/tests/import/pkgstar_all_tuple/__init__.py
index a97715ed3918d..433ddc8e97639 100644
--- a/tests/import/pkgstar_all_tuple/__init__.py
+++ b/tests/import/pkgstar_all_tuple/__init__.py
@@ -1,4 +1,4 @@
-__all__ = ('publicFun2', 'PublicClass2')
+__all__ = ("publicFun2", "PublicClass2")
 
 
 # Definitions below should always be imported by a star import
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 328d69f633cf7..a428665db03e0 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -16,7 +16,7 @@
 import tempfile
 
 # Maximum time to run a single test, in seconds.
-TEST_TIMEOUT = float(os.environ.get('MICROPY_TEST_TIMEOUT', 30))
+TEST_TIMEOUT = float(os.environ.get("MICROPY_TEST_TIMEOUT", 30))
 
 # See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
 # are guaranteed to always work, this one should though.
@@ -411,7 +411,7 @@ def get(required=False):
                     def send_get(what):
                         # Detect {\x00} pattern and convert to ctrl-key codes.
                         ctrl_code = lambda m: bytes([int(m.group(1))])
-                        what = re.sub(rb'{\\x(\d\d)}', ctrl_code, what)
+                        what = re.sub(rb"{\\x(\d\d)}", ctrl_code, what)
 
                         os.write(master, what)
                         return get()
diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 428600baf4375..4974c71e2e9c3 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -309,7 +309,7 @@ def do_filesystem_recursive_rm(state, path, args):
                 os.path.join(r_cwd, path) if not os.path.isabs(path) else path
             )
             if isinstance(state.transport, SerialTransport) and abs_path.startswith(
-                f'{SerialTransport.fs_hook_mount}/'
+                f"{SerialTransport.fs_hook_mount}/"
             ):
                 raise CommandError(
                     f"rm -r not permitted on {SerialTransport.fs_hook_mount} directory"
@@ -335,11 +335,11 @@ def do_filesystem_recursive_rm(state, path, args):
 
 
 def human_size(size, decimals=1):
-    for unit in ['B', 'K', 'M', 'G', 'T']:
-        if size < 1024.0 or unit == 'T':
+    for unit in ["B", "K", "M", "G", "T"]:
+        if size < 1024.0 or unit == "T":
             break
         size /= 1024.0
-    return f"{size:.{decimals}f}{unit}" if unit != 'B' else f"{int(size)}"
+    return f"{size:.{decimals}f}{unit}" if unit != "B" else f"{int(size)}"
 
 
 def do_filesystem_tree(state, path, args):
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 0441857fab777..0aec1efad1431 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -598,7 +598,7 @@ def main():
                 cmd == "fs"
                 and len(command_args) >= 1
                 and command_args[0] in ("ls", "tree")
-                and sum(1 for a in command_args if not a.startswith('-')) == 1
+                and sum(1 for a in command_args if not a.startswith("-")) == 1
             ):
                 command_args.append("")
 
diff --git a/tools/mpremote/mpremote/repl.py b/tools/mpremote/mpremote/repl.py
index 4fda04a2e2ab3..ad7e83ea8bfaf 100644
--- a/tools/mpremote/mpremote/repl.py
+++ b/tools/mpremote/mpremote/repl.py
@@ -110,7 +110,7 @@ def _is_disconnect_exception(exception):
     False otherwise.
     """
     if isinstance(exception, OSError):
-        if hasattr(exception, 'args') and len(exception.args) > 0:
+        if hasattr(exception, "args") and len(exception.args) > 0:
             # IO error, device disappeared
             if exception.args[0] == 5:
                 return True
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index a600ec12c3d85..af8450a842432 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -1521,31 +1521,31 @@ def parse_linkerscript(source):
     symbols = {}
 
     LINE_REGEX = re.compile(
-        r'^(?P<weak>PROVIDE\()?'  # optional weak marker start
-        r'(?P<symbol>[a-zA-Z_]\w*)'  # symbol name
-        r'=0x(?P<address>[\da-fA-F]{1,8})*'  # symbol address
-        r'(?(weak)\));$',  # optional weak marker end and line terminator
+        r"^(?P<weak>PROVIDE\()?"  # optional weak marker start
+        r"(?P<symbol>[a-zA-Z_]\w*)"  # symbol name
+        r"=0x(?P<address>[\da-fA-F]{1,8})*"  # symbol address
+        r"(?(weak)\));$",  # optional weak marker end and line terminator
         re.ASCII,
     )
 
     inside_comment = False
     for line in (line.strip() for line in source.readlines()):
-        if line.startswith('/*') and not inside_comment:
-            if not line.endswith('*/'):
+        if line.startswith("/*") and not inside_comment:
+            if not line.endswith("*/"):
                 inside_comment = True
             continue
         if inside_comment:
-            if line.endswith('*/'):
+            if line.endswith("*/"):
                 inside_comment = False
             continue
-        if line.startswith('//'):
+        if line.startswith("//"):
             continue
-        match = LINE_REGEX.match(''.join(line.split()))
+        match = LINE_REGEX.match("".join(line.split()))
         if not match:
             continue
         tokens = match.groupdict()
-        symbol = tokens['symbol']
-        address = int(tokens['address'], 16)
+        symbol = tokens["symbol"]
+        address = int(tokens["address"], 16)
         if symbol in symbols:
             raise ValueError(f"Symbol {symbol} already defined")
         symbols[symbol] = address

From bc77b27badaa4dfbebcc542ecb8ac41480e75787 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 6 Jun 2025 09:56:40 +1000
Subject: [PATCH 2557/3129] unix/mpthreadport: Ensure consistent type of
 PTHREAD_STACK_MIN.

It seems GCC 14 got stricter with warn/errs like -Wsign-compare and types a
"bare number" as a long int that can't be compared to a (unsigned) size_t.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/unix/mpthreadport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index ded3bd14aff70..141cd0218d93e 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -250,8 +250,8 @@ mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size
     }
 
     // minimum stack size is set by pthreads
-    if (*stack_size < PTHREAD_STACK_MIN) {
-        *stack_size = PTHREAD_STACK_MIN;
+    if (*stack_size < (size_t)PTHREAD_STACK_MIN) {
+        *stack_size = (size_t)PTHREAD_STACK_MIN;
     }
 
     // ensure there is enough stack to include a stack-overflow margin

From cbc6aed8facf8fea2eceb59b0e801f33038f1897 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Tue, 22 Jul 2025 09:37:27 +0100
Subject: [PATCH 2558/3129] lib/pico-sdk: Fix Pico SDK fetching develop
 picotool.

SDK 2.1.1 shipped with PICOTOOL_FETCH_FROM_GIT configured to fetch the
"develop" branch. This broke downstream CI, which was trusting Pico
SDK to fetch the correct version.

RPi have added a "2.1.1-correct-picotool" tag which fixes this.

lib/pico-sdk: Bump to "2.1.1-correct-picotool" tag.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index bddd20f928ce7..9a4113fbbae65 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit bddd20f928ce76142793bef434d4f75f4af6e433
+Subproject commit 9a4113fbbae65ee82d8cd6537963bc3d3b14bcca

From bba15e0a0bf72d03b74610e9a37ac79ffbdacd1a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Jul 2025 14:32:01 +1000
Subject: [PATCH 2559/3129] examples/natmod: Use LINK_RUNTIME=1 when building
 for armv6m.

To get division helper functions, eg `__aeabi_uidiv`, `__aeabi_idiv` and
`__aeabi_uidivmod`.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/natmod/btree/Makefile    | 5 +++++
 examples/natmod/deflate/Makefile  | 5 +++++
 examples/natmod/framebuf/Makefile | 5 +++++
 examples/natmod/re/Makefile       | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/examples/natmod/btree/Makefile b/examples/natmod/btree/Makefile
index bcaa7a93d11be..1910c67c1fc24 100644
--- a/examples/natmod/btree/Makefile
+++ b/examples/natmod/btree/Makefile
@@ -39,6 +39,11 @@ endif
 # Use our own errno implementation if Picolibc is used
 CFLAGS += -D__PICOLIBC_ERRNO_FUNCTION=__errno
 
+ifeq ($(ARCH),armv6m)
+# Link with libgcc.a for division helper functions
+LINK_RUNTIME = 1
+endif
+
 include $(MPY_DIR)/py/dynruntime.mk
 
 # btree needs gnu99 defined
diff --git a/examples/natmod/deflate/Makefile b/examples/natmod/deflate/Makefile
index 1f63de20d206e..5823aa4d45bf2 100644
--- a/examples/natmod/deflate/Makefile
+++ b/examples/natmod/deflate/Makefile
@@ -10,6 +10,11 @@ SRC = deflate.c
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH ?= x64
 
+ifeq ($(ARCH),armv6m)
+# Link with libgcc.a for division helper functions
+LINK_RUNTIME = 1
+endif
+
 ifeq ($(ARCH),xtensa)
 # Link with libm.a and libgcc.a from the toolchain
 LINK_RUNTIME = 1
diff --git a/examples/natmod/framebuf/Makefile b/examples/natmod/framebuf/Makefile
index cb821736e70dc..35453c0bb4b4c 100644
--- a/examples/natmod/framebuf/Makefile
+++ b/examples/natmod/framebuf/Makefile
@@ -10,6 +10,11 @@ SRC = framebuf.c
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
 ARCH ?= x64
 
+ifeq ($(ARCH),armv6m)
+# Link with libgcc.a for division helper functions
+LINK_RUNTIME = 1
+endif
+
 ifeq ($(ARCH),xtensa)
 MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
 endif
diff --git a/examples/natmod/re/Makefile b/examples/natmod/re/Makefile
index 56b08b9886878..6535693dcb88c 100644
--- a/examples/natmod/re/Makefile
+++ b/examples/natmod/re/Makefile
@@ -10,4 +10,9 @@ SRC = re.c
 # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin, rv32imc)
 ARCH = x64
 
+ifeq ($(ARCH),armv6m)
+# Link with libgcc.a for division helper functions
+LINK_RUNTIME = 1
+endif
+
 include $(MPY_DIR)/py/dynruntime.mk

From e750ecff70572fb11cbcaefb10f535de5033901b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Jul 2025 10:38:39 +1000
Subject: [PATCH 2560/3129] qemu/Makefile: Allow passing flags to test_natmod
 via RUN_TESTS_EXTRA.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/Makefile  | 2 +-
 ports/qemu/README.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 646659ceda56b..fc1e557974c97 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -196,7 +196,7 @@ test_natmod: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && \
 		for natmod in btree deflate framebuf heapq random_basic re; do \
-		./run-natmodtests.py -p -d execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" extmod/$$natmod*.py; \
+		./run-natmodtests.py -p -d execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_EXTRA) extmod/$$natmod*.py; \
 		done
 
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
diff --git a/ports/qemu/README.md b/ports/qemu/README.md
index c7d0dc1f4ea70..aab88ab5898c9 100644
--- a/ports/qemu/README.md
+++ b/ports/qemu/README.md
@@ -112,8 +112,8 @@ Extra make options
 
 The following options can be specified on the `make` command line:
 - `CFLAGS_EXTRA`: pass in extra flags for the compiler.
-- `RUN_TESTS_EXTRA`: pass in extra flags for `run-tests.py` when invoked via
-  `make test`.
+- `RUN_TESTS_EXTRA`: pass in extra flags for `run-tests.py` and `run-natmodtests.py`
+  when invoked via `make test` or `make test_natmod`.
 - `QEMU_DEBUG=1`: when running qemu (via `repl`, `run` or `test` target), qemu
   will block until a debugger is connected.  By default it waits for a gdb connection
   on TCP port 1234.

From f6e23fdef18be122590c6dd7159a93648d1358f1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Jul 2025 14:09:21 +1000
Subject: [PATCH 2561/3129] tools/ci.sh: Test building all natmod examples with
 all ARM-M archs.

And run both armv6m and armv7m under qemu.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 594bca80044cf..d787cbcf0733d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -346,9 +346,15 @@ function ci_qemu_build_arm_thumb {
     ci_qemu_build_arm_prepare
     make ${MAKEOPTS} -C ports/qemu test_full
 
-    # Test building and running native .mpy with armv7m architecture.
+    # Test building native .mpy with all ARM-M architectures.
+    ci_native_mpy_modules_build armv6m
     ci_native_mpy_modules_build armv7m
-    make ${MAKEOPTS} -C ports/qemu test_natmod
+    ci_native_mpy_modules_build armv7emsp
+    ci_native_mpy_modules_build armv7emdp
+
+    # Test running native .mpy with armv6m and armv7m architectures.
+    make ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv6m"
+    make ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv7m"
 }
 
 function ci_qemu_build_rv32 {
@@ -442,10 +448,6 @@ 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 9b61bb93f9e34314a527375bd9803693f08a9a63 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Jul 2025 14:59:07 +1000
Subject: [PATCH 2562/3129] webassembly/proxy_c: Provide constants for fixed
 JsProxy refs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/modjs.c   | 2 +-
 ports/webassembly/proxy_c.c | 2 +-
 ports/webassembly/proxy_c.h | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/webassembly/modjs.c b/ports/webassembly/modjs.c
index bed09086ab7cf..5558a2cdd82c0 100644
--- a/ports/webassembly/modjs.c
+++ b/ports/webassembly/modjs.c
@@ -35,7 +35,7 @@
 
 void mp_module_js_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_jsproxy_t global_this;
-    global_this.ref = 0;
+    global_this.ref = MP_OBJ_JSPROXY_REF_GLOBAL_THIS;
     mp_obj_jsproxy_attr(MP_OBJ_FROM_PTR(&global_this), attr, dest);
 }
 
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 00abc43bf2b3f..b7bc87b76349b 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -202,7 +202,7 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out) {
         out[2] = (uintptr_t)str;
     } else if (obj == mp_const_undefined) {
         kind = PROXY_KIND_MP_JSPROXY;
-        out[1] = 1;
+        out[1] = MP_OBJ_JSPROXY_REF_UNDEFINED;
     } else if (mp_obj_is_jsproxy(obj)) {
         kind = PROXY_KIND_MP_JSPROXY;
         out[1] = mp_obj_jsproxy_get_ref(obj);
diff --git a/ports/webassembly/proxy_c.h b/ports/webassembly/proxy_c.h
index d3567c195e7ac..4ca2b8644e832 100644
--- a/ports/webassembly/proxy_c.h
+++ b/ports/webassembly/proxy_c.h
@@ -28,6 +28,10 @@
 
 #include "py/obj.h"
 
+// Fixed JsProxy references.
+#define MP_OBJ_JSPROXY_REF_GLOBAL_THIS (0)
+#define MP_OBJ_JSPROXY_REF_UNDEFINED (1)
+
 // proxy value number of items
 #define PVN (3)
 

From 45aa65b67d075fa8b2e71d57f1a94566f51207bb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Jul 2025 14:51:46 +1000
Subject: [PATCH 2563/3129] webassembly/objjsproxy: Fix binding of self to
 JavaScript methods.

Fixes a bug in the binding of self/this to JavaScript methods.

The new semantics match Pyodide's behaviour, at least for the included
tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/modjs.c                     |   4 +-
 ports/webassembly/objjsproxy.c                | 114 +++++++++++++-----
 ports/webassembly/proxy_c.h                   |   3 +-
 .../webassembly/method_bind_behaviour.mjs     |  43 +++++++
 .../webassembly/method_bind_behaviour.mjs.exp |  11 ++
 5 files changed, 138 insertions(+), 37 deletions(-)
 create mode 100644 tests/ports/webassembly/method_bind_behaviour.mjs
 create mode 100644 tests/ports/webassembly/method_bind_behaviour.mjs.exp

diff --git a/ports/webassembly/modjs.c b/ports/webassembly/modjs.c
index 5558a2cdd82c0..2f91a012f0f7a 100644
--- a/ports/webassembly/modjs.c
+++ b/ports/webassembly/modjs.c
@@ -34,9 +34,7 @@
 // js module
 
 void mp_module_js_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    mp_obj_jsproxy_t global_this;
-    global_this.ref = MP_OBJ_JSPROXY_REF_GLOBAL_THIS;
-    mp_obj_jsproxy_attr(MP_OBJ_FROM_PTR(&global_this), attr, dest);
+    mp_obj_jsproxy_global_this_attr(attr, dest);
 }
 
 static const mp_rom_map_elem_t mp_module_js_globals_table[] = {
diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 167d4382bc630..28fef901477c3 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -43,7 +43,7 @@ EM_JS(bool, has_attr, (int jsref, const char *str), {
 });
 
 // *FORMAT-OFF*
-EM_JS(bool, lookup_attr, (int jsref, const char *str, uint32_t * out), {
+EM_JS(int, lookup_attr, (int jsref, const char *str, uint32_t * out), {
     const base = proxy_js_ref[jsref];
     const attr = UTF8ToString(str);
 
@@ -54,23 +54,17 @@ EM_JS(bool, lookup_attr, (int jsref, const char *str, uint32_t * out), {
     // - Otherwise, the attribute does not exist.
     let value = base[attr];
     if (value !== undefined || attr in base) {
-        if (typeof value === "function") {
-            if (base !== globalThis) {
-                if ("_ref" in value) {
-                    // This is a proxy of a Python function, it doesn't need
-                    // binding.  And not binding it means if it's passed back
-                    // to Python then it can be extracted from the proxy as a
-                    // true Python function.
-                } else {
-                    // A function that is not a Python function.  Bind it.
-                    value = value.bind(base);
-                }
-            }
-        }
         proxy_convert_js_to_mp_obj_jsside(value, out);
-        return true;
+        if (typeof value === "function" && !("_ref" in value)) {
+            // Attribute found and it's a JavaScript function.
+            return 2;
+        } else {
+            // Attribute found.
+            return 1;
+        }
     } else {
-        return false;
+        // Attribute not found.
+        return 0;
     }
 });
 // *FORMAT-ON*
@@ -98,33 +92,48 @@ EM_JS(void, call0, (int f_ref, uint32_t * out), {
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(int, call1, (int f_ref, uint32_t * a0, uint32_t * out), {
+EM_JS(int, call1, (int f_ref, bool via_call, uint32_t * a0, uint32_t * out), {
     const a0_js = proxy_convert_mp_to_js_obj_jsside(a0);
     const f = proxy_js_ref[f_ref];
-    const ret = f(a0_js);
+    let ret;
+    if (via_call) {
+        ret = f.call(a0_js);
+    } else {
+        ret = f(a0_js);
+    }
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(int, call2, (int f_ref, uint32_t * a0, uint32_t * a1, uint32_t * out), {
+EM_JS(int, call2, (int f_ref, bool via_call, uint32_t * a0, uint32_t * a1, uint32_t * out), {
     const a0_js = proxy_convert_mp_to_js_obj_jsside(a0);
     const a1_js = proxy_convert_mp_to_js_obj_jsside(a1);
     const f = proxy_js_ref[f_ref];
-    const ret = f(a0_js, a1_js);
+    let ret;
+    if (via_call) {
+        ret = f.call(a0_js, a1_js);
+    } else {
+        ret = f(a0_js, a1_js);
+    }
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(int, calln, (int f_ref, uint32_t n_args, uint32_t * value, uint32_t * out), {
+EM_JS(int, calln, (int f_ref, bool via_call, uint32_t n_args, uint32_t * value, uint32_t * out), {
     const f = proxy_js_ref[f_ref];
     const a = [];
     for (let i = 0; i < n_args; ++i) {
         const v = proxy_convert_mp_to_js_obj_jsside(value + i * 3 * 4);
         a.push(v);
     }
-    const ret = f(... a);
+    let ret;
+    if (via_call) {
+        ret = f.call(... a);
+    } else {
+        ret = f(... a);
+    }
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(void, call0_kwarg, (int f_ref, uint32_t n_kw, uint32_t * key, uint32_t * value, uint32_t * out), {
+EM_JS(void, call0_kwarg, (int f_ref, bool via_call, uint32_t n_kw, uint32_t * key, uint32_t * value, uint32_t * out), {
     const f = proxy_js_ref[f_ref];
     const a = {};
     for (let i = 0; i < n_kw; ++i) {
@@ -132,11 +141,16 @@ EM_JS(void, call0_kwarg, (int f_ref, uint32_t n_kw, uint32_t * key, uint32_t * v
         const v = proxy_convert_mp_to_js_obj_jsside(value + i * 3 * 4);
         a[k] = v;
     }
-    const ret = f(a);
+    let ret;
+    if (via_call) {
+        ret = f.call(a);
+    } else {
+        ret = f(a);
+    }
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(void, call1_kwarg, (int f_ref, uint32_t * arg0, uint32_t n_kw, uint32_t * key, uint32_t * value, uint32_t * out), {
+EM_JS(void, call1_kwarg, (int f_ref, bool via_call, uint32_t * arg0, uint32_t n_kw, uint32_t * key, uint32_t * value, uint32_t * out), {
     const f = proxy_js_ref[f_ref];
     const a0 = proxy_convert_mp_to_js_obj_jsside(arg0);
     const a = {};
@@ -145,7 +159,12 @@ EM_JS(void, call1_kwarg, (int f_ref, uint32_t * arg0, uint32_t n_kw, uint32_t *
         const v = proxy_convert_mp_to_js_obj_jsside(value + i * 3 * 4);
         a[k] = v;
     }
-    const ret = f(a0, a);
+    let ret;
+    if (via_call) {
+        ret = f.call(a0, a);
+    } else {
+        ret = f(a0, a);
+    }
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
@@ -208,12 +227,12 @@ static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         }
         uint32_t out[3];
         if (n_args == 0) {
-            call0_kwarg(self->ref, n_kw, key, value, out);
+            call0_kwarg(self->ref, self->bind_to_self, n_kw, key, value, out);
         } else {
             // n_args == 1
             uint32_t arg0[PVN];
             proxy_convert_mp_to_js_obj_cside(args[0], arg0);
-            call1_kwarg(self->ref, arg0, n_kw, key, value, out);
+            call1_kwarg(self->ref, self->bind_to_self, arg0, n_kw, key, value, out);
         }
         return proxy_convert_js_to_mp_obj_cside(out);
     }
@@ -226,7 +245,7 @@ static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         uint32_t arg0[PVN];
         uint32_t out[PVN];
         proxy_convert_mp_to_js_obj_cside(args[0], arg0);
-        call1(self->ref, arg0, out);
+        call1(self->ref, self->bind_to_self, arg0, out);
         return proxy_convert_js_to_mp_obj_cside(out);
     } else if (n_args == 2) {
         uint32_t arg0[PVN];
@@ -234,7 +253,7 @@ static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         uint32_t arg1[PVN];
         proxy_convert_mp_to_js_obj_cside(args[1], arg1);
         uint32_t out[3];
-        call2(self->ref, arg0, arg1, out);
+        call2(self->ref, self->bind_to_self, arg0, arg1, out);
         return proxy_convert_js_to_mp_obj_cside(out);
     } else {
         uint32_t value[PVN * n_args];
@@ -242,7 +261,7 @@ static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
             proxy_convert_mp_to_js_obj_cside(args[i], &value[i * PVN]);
         }
         uint32_t out[3];
-        calln(self->ref, n_args, value, out);
+        calln(self->ref, self->bind_to_self, n_args, value, out);
         return proxy_convert_js_to_mp_obj_cside(out);
     }
 }
@@ -298,17 +317,26 @@ static mp_obj_t jsproxy_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value)
     }
 }
 
-void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+static void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
         // Load attribute.
+        int lookup_ret;
         uint32_t out[PVN];
         if (attr == MP_QSTR___del__) {
             // For finaliser.
             dest[0] = MP_OBJ_FROM_PTR(&jsproxy___del___obj);
             dest[1] = self_in;
-        } else if (lookup_attr(self->ref, qstr_str(attr), out)) {
+        } else if ((lookup_ret = lookup_attr(self->ref, qstr_str(attr), out)) != 0) {
             dest[0] = proxy_convert_js_to_mp_obj_cside(out);
+            if (lookup_ret == 2) {
+                // The loaded attribute is a JavaScript method, which should be called
+                // with f.call(self, ...).  Indicate this via the bind_to_self member.
+                // This will either be called immediately (due to the mp_load_method
+                // optimisation) or turned into a bound_method and called later.
+                dest[1] = self_in;
+                ((mp_obj_jsproxy_t *)dest[0])->bind_to_self = true;
+            }
         } else if (attr == MP_QSTR_new) {
             // Special case to handle construction of JS objects.
             // JS objects don't have a ".new" attribute, doing "Obj.new" is a Pyodide idiom for "new Obj".
@@ -546,5 +574,25 @@ MP_DEFINE_CONST_OBJ_TYPE(
 mp_obj_t mp_obj_new_jsproxy(int ref) {
     mp_obj_jsproxy_t *o = mp_obj_malloc_with_finaliser(mp_obj_jsproxy_t, &mp_type_jsproxy);
     o->ref = ref;
+    o->bind_to_self = false;
     return MP_OBJ_FROM_PTR(o);
 }
+
+// Load/delete/store an attribute from/to the JavaScript globalThis entity.
+void mp_obj_jsproxy_global_this_attr(qstr attr, mp_obj_t *dest) {
+    if (dest[0] == MP_OBJ_NULL) {
+        // Load attribute.
+        uint32_t out[PVN];
+        if (lookup_attr(MP_OBJ_JSPROXY_REF_GLOBAL_THIS, qstr_str(attr), out)) {
+            dest[0] = proxy_convert_js_to_mp_obj_cside(out);
+        }
+    } else if (dest[1] == MP_OBJ_NULL) {
+        // Delete attribute.
+    } else {
+        // Store attribute.
+        uint32_t value[PVN];
+        proxy_convert_mp_to_js_obj_cside(dest[1], value);
+        store_attr(MP_OBJ_JSPROXY_REF_GLOBAL_THIS, qstr_str(attr), value);
+        dest[0] = MP_OBJ_NULL;
+    }
+}
diff --git a/ports/webassembly/proxy_c.h b/ports/webassembly/proxy_c.h
index 4ca2b8644e832..bac0a90bd68b5 100644
--- a/ports/webassembly/proxy_c.h
+++ b/ports/webassembly/proxy_c.h
@@ -38,6 +38,7 @@
 typedef struct _mp_obj_jsproxy_t {
     mp_obj_base_t base;
     int ref;
+    bool bind_to_self;
 } mp_obj_jsproxy_t;
 
 extern const mp_obj_type_t mp_type_jsproxy;
@@ -52,7 +53,7 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out);
 void proxy_convert_mp_to_js_exc_cside(void *exc, uint32_t *out);
 
 mp_obj_t mp_obj_new_jsproxy(int ref);
-void mp_obj_jsproxy_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
+void mp_obj_jsproxy_global_this_attr(qstr attr, mp_obj_t *dest);
 
 static inline bool mp_obj_is_jsproxy(mp_obj_t o) {
     return mp_obj_get_type(o) == &mp_type_jsproxy;
diff --git a/tests/ports/webassembly/method_bind_behaviour.mjs b/tests/ports/webassembly/method_bind_behaviour.mjs
new file mode 100644
index 0000000000000..24de0fa3bb1df
--- /dev/null
+++ b/tests/ports/webassembly/method_bind_behaviour.mjs
@@ -0,0 +1,43 @@
+// Test how JavaScript binds self/this when methods are called from Python.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+// Test accessing and calling JavaScript methods from Python.
+mp.runPython(`
+import js
+
+# Get the push method to call later on.
+push = js.Array.prototype.push
+
+# Create initial array.
+ar = js.Array(1, 2)
+js.console.log(ar)
+
+# Add an element using a method (should implicitly supply "ar" as context).
+print(ar.push(3))
+js.console.log(ar)
+
+# Add an element using prototype function, need to explicitly provide "ar" as context.
+print(push.call(ar, 4))
+js.console.log(ar)
+
+# Add an element using a method with call and explicit context.
+print(ar.push.call(ar, 5))
+js.console.log(ar)
+
+# Add an element using a different instances method with call and explicit context.
+print(js.Array().push.call(ar, 6))
+js.console.log(ar)
+`);
+
+// Test assigning Python functions to JavaScript objects, and using them like a method.
+mp.runPython(`
+import js
+
+a = js.Object()
+a.meth1 = lambda *x: print("meth1", x)
+a.meth1(1, 2)
+
+js.Object.prototype.meth2 = lambda *x: print("meth2", x)
+a.meth2(3, 4)
+`);
diff --git a/tests/ports/webassembly/method_bind_behaviour.mjs.exp b/tests/ports/webassembly/method_bind_behaviour.mjs.exp
new file mode 100644
index 0000000000000..ab3743f667266
--- /dev/null
+++ b/tests/ports/webassembly/method_bind_behaviour.mjs.exp
@@ -0,0 +1,11 @@
+[ 1, 2 ]
+3
+[ 1, 2, 3 ]
+4
+[ 1, 2, 3, 4 ]
+5
+[ 1, 2, 3, 4, 5 ]
+6
+[ 1, 2, 3, 4, 5, 6 ]
+meth1 (1, 2)
+meth2 (3, 4)

From 3185bb5827acd6a1f27a9299abee52640dd495f2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Jul 2025 13:06:28 +1000
Subject: [PATCH 2564/3129] py/obj: Add new type flag to indicate subscr
 accepts slice-on-stack.

The recently merged 5e9189d6d1c00c92694888bf9c74276779c40716 now allows
temporary slices to be allocated on the C stack, which is much better than
allocating them on the GC heap.

Unfortunately there are cases where the C-allocated slice can escape and be
retained as an object, which leads to crashes (because that object points
to the C stack which now has other values on it).

The fix here is to add a new `MP_TYPE_FLAG_SUBSCR_ALLOWS_STACK_SLICE`.
Native types should set this flag if their subscr method is guaranteed not
to hold on to a reference of the slice object.

Fixes issue #17733 (see also #17723).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h                           |  3 +++
 py/objarray.c                      |  4 ++--
 py/vm.c                            |  5 +++--
 tests/basics/slice_optimise.py     | 23 +++++++++++++++++++++++
 tests/basics/slice_optimise.py.exp |  2 ++
 5 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 tests/basics/slice_optimise.py
 create mode 100644 tests/basics/slice_optimise.py.exp

diff --git a/py/obj.h b/py/obj.h
index 6c2153697e6d4..4ac0cc0c611e5 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -558,6 +558,8 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 // 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).
+// If MP_TYPE_FLAG_SUBSCR_ALLOWS_STACK_SLICE is set then the "subscr" slot allows a stack
+//   allocated slice to be passed in (no references to it will be retained after the call).
 #define MP_TYPE_FLAG_NONE (0x0000)
 #define MP_TYPE_FLAG_IS_SUBCLASSED (0x0001)
 #define MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS (0x0002)
@@ -571,6 +573,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_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)
+#define MP_TYPE_FLAG_SUBSCR_ALLOWS_STACK_SLICE (0x0400)
 
 typedef enum {
     PRINT_STR = 0,
diff --git a/py/objarray.c b/py/objarray.c
index 1fd0269390409..ac4e343d069f4 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -626,7 +626,7 @@ 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_ITER_IS_GETITER,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER | MP_TYPE_FLAG_SUBSCR_ALLOWS_STACK_SLICE,
     make_new, bytearray_make_new,
     print, array_print,
     iter, array_iterator_new,
@@ -654,7 +654,7 @@ 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_ITER_IS_GETITER,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER | MP_TYPE_FLAG_SUBSCR_ALLOWS_STACK_SLICE,
     make_new, memoryview_make_new,
     iter, array_iterator_new,
     unary_op, array_unary_op,
diff --git a/py/vm.c b/py/vm.c
index 6f1179721a928..6b4a878992e17 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -865,9 +865,10 @@ unwind_jump:;
                         // 3-argument slice includes step
                         step = POP();
                     }
-                    if ((*ip == MP_BC_LOAD_SUBSCR || *ip == MP_BC_STORE_SUBSCR) && mp_obj_is_native_type(mp_obj_get_type(sp[-2]))) {
+                    if ((*ip == MP_BC_LOAD_SUBSCR || *ip == MP_BC_STORE_SUBSCR)
+                        && (mp_obj_get_type(sp[-2])->flags & MP_TYPE_FLAG_SUBSCR_ALLOWS_STACK_SLICE)) {
                         // Fast path optimisation for when the BUILD_SLICE is immediately followed
-                        // by a LOAD/STORE_SUBSCR for a native type to avoid needing to allocate
+                        // by a LOAD/STORE_SUBSCR for an accepting type, to avoid needing to allocate
                         // the slice on the heap.  In some cases (e.g. a[1:3] = x) this can result
                         // in no allocations at all.  We can't do this for instance types because
                         // the get/set/delattr implementation may keep a reference to the slice.
diff --git a/tests/basics/slice_optimise.py b/tests/basics/slice_optimise.py
new file mode 100644
index 0000000000000..f663e16b8c2f9
--- /dev/null
+++ b/tests/basics/slice_optimise.py
@@ -0,0 +1,23 @@
+# Test that the slice-on-stack optimisation does not break various uses of slice
+# (see MP_TYPE_FLAG_SUBSCR_ALLOWS_STACK_SLICE type option).
+#
+# Note: this test has a corresponding .py.exp file because hashing slice objects
+# was not allowed in CPython until 3.12.
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Attempt to index with a slice, error should contain the slice (failed key).
+try:
+    dict()[:]
+except KeyError as e:
+    print("KeyError", e.args)
+
+# Put a slice and another object into an OrderedDict, and retrieve them.
+x = OrderedDict()
+x[:"a"] = 1
+x["b"] = 2
+print(list(x.keys()), list(x.values()))
diff --git a/tests/basics/slice_optimise.py.exp b/tests/basics/slice_optimise.py.exp
new file mode 100644
index 0000000000000..3fa59aae15ae6
--- /dev/null
+++ b/tests/basics/slice_optimise.py.exp
@@ -0,0 +1,2 @@
+KeyError (slice(None, None, None),)
+[slice(None, 'a', None), 'b'] [1, 2]

From 5d9ef6bfb696106f8052a44c1e392695e908eafa Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 22 Jul 2025 10:48:16 +1000
Subject: [PATCH 2565/3129] py/objint_longlong: Fix left shift of negative
 values.

Previous comment was wrong, left shifting a negative value is UB in C. Use
the same approach as small int shifts (from runtime.c).

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/objint_longlong.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 22ac0ba12efa3..339ce7cfd8e96 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -208,14 +208,14 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
 
         case MP_BINARY_OP_LSHIFT:
         case MP_BINARY_OP_INPLACE_LSHIFT:
-            if ((int)rhs_val < 0) {
+            if (rhs_val < 0) {
                 // negative shift not allowed
                 mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
             }
-            result = lhs_val << (int)rhs_val;
-            // Left-shifting of negative values is implementation defined in C, but assume compiler
-            // will give us typical 2s complement behaviour unless the value overflows
-            overflow = rhs_val > 0 && ((lhs_val >= 0 && result < lhs_val) || (lhs_val < 0 && result > lhs_val));
+            overflow = rhs_val >= (sizeof(long long) * MP_BITS_PER_BYTE)
+                || lhs_val > (LLONG_MAX >> rhs_val)
+                || lhs_val < (LLONG_MIN >> rhs_val);
+            result = (unsigned long long)lhs_val << rhs_val;
             break;
         case MP_BINARY_OP_RSHIFT:
         case MP_BINARY_OP_INPLACE_RSHIFT:

From 096ff8b9ee216a8ca0345c00946799f8342570a6 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 22 Jul 2025 11:17:23 +1000
Subject: [PATCH 2566/3129] tests/micropython: Rename viper boundary tests that
 depend on big int.

These tests all depend on generating arbitrarily long (>64-bit) integers.

It would be possible to have these tests work in this case I think, as the
results are always masked to shorter values.  But quite fiddly.  So just
rename them so they are automatically skipped if the target doesn't have
big int support.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ...r16_store_boundary.py => viper_ptr16_store_boundary_intbig.py} | 0
 ...e_boundary.py.exp => viper_ptr16_store_boundary_intbig.py.exp} | 0
 ...r32_store_boundary.py => viper_ptr32_store_boundary_intbig.py} | 0
 ...e_boundary.py.exp => viper_ptr32_store_boundary_intbig.py.exp} | 0
 ...ptr8_store_boundary.py => viper_ptr8_store_boundary_intbig.py} | 0
 ...re_boundary.py.exp => viper_ptr8_store_boundary_intbig.py.exp} | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/micropython/{viper_ptr16_store_boundary.py => viper_ptr16_store_boundary_intbig.py} (100%)
 rename tests/micropython/{viper_ptr16_store_boundary.py.exp => viper_ptr16_store_boundary_intbig.py.exp} (100%)
 rename tests/micropython/{viper_ptr32_store_boundary.py => viper_ptr32_store_boundary_intbig.py} (100%)
 rename tests/micropython/{viper_ptr32_store_boundary.py.exp => viper_ptr32_store_boundary_intbig.py.exp} (100%)
 rename tests/micropython/{viper_ptr8_store_boundary.py => viper_ptr8_store_boundary_intbig.py} (100%)
 rename tests/micropython/{viper_ptr8_store_boundary.py.exp => viper_ptr8_store_boundary_intbig.py.exp} (100%)

diff --git a/tests/micropython/viper_ptr16_store_boundary.py b/tests/micropython/viper_ptr16_store_boundary_intbig.py
similarity index 100%
rename from tests/micropython/viper_ptr16_store_boundary.py
rename to tests/micropython/viper_ptr16_store_boundary_intbig.py
diff --git a/tests/micropython/viper_ptr16_store_boundary.py.exp b/tests/micropython/viper_ptr16_store_boundary_intbig.py.exp
similarity index 100%
rename from tests/micropython/viper_ptr16_store_boundary.py.exp
rename to tests/micropython/viper_ptr16_store_boundary_intbig.py.exp
diff --git a/tests/micropython/viper_ptr32_store_boundary.py b/tests/micropython/viper_ptr32_store_boundary_intbig.py
similarity index 100%
rename from tests/micropython/viper_ptr32_store_boundary.py
rename to tests/micropython/viper_ptr32_store_boundary_intbig.py
diff --git a/tests/micropython/viper_ptr32_store_boundary.py.exp b/tests/micropython/viper_ptr32_store_boundary_intbig.py.exp
similarity index 100%
rename from tests/micropython/viper_ptr32_store_boundary.py.exp
rename to tests/micropython/viper_ptr32_store_boundary_intbig.py.exp
diff --git a/tests/micropython/viper_ptr8_store_boundary.py b/tests/micropython/viper_ptr8_store_boundary_intbig.py
similarity index 100%
rename from tests/micropython/viper_ptr8_store_boundary.py
rename to tests/micropython/viper_ptr8_store_boundary_intbig.py
diff --git a/tests/micropython/viper_ptr8_store_boundary.py.exp b/tests/micropython/viper_ptr8_store_boundary_intbig.py.exp
similarity index 100%
rename from tests/micropython/viper_ptr8_store_boundary.py.exp
rename to tests/micropython/viper_ptr8_store_boundary_intbig.py.exp

From 0c8d35b322554293c0847a618fa90760cefa1b60 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jul 2025 06:33:11 -0500
Subject: [PATCH 2567/3129] ports: Eliminate define of {U,}INT_FMT where
 redundant.

The default definition in `py/mpconfig.h` for 32-bit architectures is
`%u/%d`, so these can be removed.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/cc3200/mpconfigport.h                             | 3 ---
 ports/esp32/mpconfigport.h                              | 3 ---
 ports/esp8266/mpconfigport.h                            | 3 ---
 ports/nrf/mpconfigport.h                                | 2 --
 ports/pic16bit/mpconfigport.h                           | 2 --
 ports/renesas-ra/mpconfigport.h                         | 2 --
 ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h         | 2 --
 ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h | 2 --
 ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h         | 2 --
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h  | 2 --
 ports/stm32/mpconfigport.h                              | 2 --
 ports/webassembly/mpconfigport.h                        | 2 --
 12 files changed, 27 deletions(-)

diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index f1ba4bedd002e..3e8498e380be4 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -155,9 +155,6 @@
 #define MICROPY_MAKE_POINTER_CALLABLE(p)            ((void *)((mp_uint_t)(p) | 1))
 #define MP_SSIZE_MAX                                (0x7FFFFFFF)
 
-#define UINT_FMT                                    "%u"
-#define INT_FMT                                     "%d"
-
 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;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index a6f103cdef7a5..721f22de11c55 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -326,9 +326,6 @@ void *esp_native_code_commit(void *, size_t, void *);
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f
 #define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
 
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-
 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;
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 03f3bb643d19b..bc2957190262b 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -150,9 +150,6 @@
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-
 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;
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index d52b5745d4e8f..963e1e8836db7 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -335,8 +335,6 @@ void *nrf_native_code_commit(void *, unsigned int, void *);
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
 #define HEX2_FMT "%02x"
 
 typedef int mp_int_t; // must be pointer size
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index d80f7edb9e546..7e6e1c4e02b17 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -77,8 +77,6 @@
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
 
-#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
 
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 8a116269bb49e..868cdbc7d6ada 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -234,8 +234,6 @@
 
 // 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
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index 44f6ce66bc495..17d338fdc3340 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-giga-r1-wifi"
 
 #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
 
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 47bf1be23d460..1be6189548bec 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nicla-vision"
 
 #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
 
diff --git a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
index f52c8a26a81d0..fc563b2800e25 100644
--- a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-opta"
 
 #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
 
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index a9ecf38fbfab4..d8818f257cfdd 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-portenta-h7"
 
 #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
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index b910188c5afaf..35deb93c6a0bf 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -230,8 +230,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 
 // 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
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index ab56162ca2b07..eea6f02a02633 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -107,8 +107,6 @@
 // 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;

From 7493275918dbe7d787044e648bc8036062cf7b0d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jul 2025 06:37:26 -0500
Subject: [PATCH 2568/3129] py/mpconfig,ports: Define new HEX_FMT formatting
 macro.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/powerpc/mpconfigport.h                 | 1 +
 ports/qemu/mpconfigport.h                    | 1 +
 ports/stm32/mpconfigport_nanbox.h            | 1 +
 ports/unix/variants/nanbox/mpconfigvariant.h | 1 +
 py/mpconfig.h                                | 3 +++
 5 files changed, 7 insertions(+)

diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index b74f374e7f9f5..25d85c9e61a72 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -96,6 +96,7 @@
 // This port is 64-bit
 #define UINT_FMT "%lu"
 #define INT_FMT "%ld"
+#define HEX_FMT "%lx"
 typedef signed long mp_int_t; // must be pointer size
 typedef unsigned long mp_uint_t; // must be pointer size
 
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index b02507277323e..9c879f55dfeb5 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -72,6 +72,7 @@
 
 #define UINT_FMT "%lu"
 #define INT_FMT "%ld"
+#define HEX_FMT "%lx"
 
 typedef int32_t mp_int_t; // must be pointer size
 typedef uint32_t mp_uint_t; // must be pointer size
diff --git a/ports/stm32/mpconfigport_nanbox.h b/ports/stm32/mpconfigport_nanbox.h
index f36d55aca9b4c..ffd87ba2f6c60 100644
--- a/ports/stm32/mpconfigport_nanbox.h
+++ b/ports/stm32/mpconfigport_nanbox.h
@@ -36,6 +36,7 @@
 // Types needed for nan-boxing
 #define UINT_FMT "%llu"
 #define INT_FMT "%lld"
+#define HEX_FMT "%llx"
 typedef int64_t mp_int_t;
 typedef uint64_t mp_uint_t;
 
diff --git a/ports/unix/variants/nanbox/mpconfigvariant.h b/ports/unix/variants/nanbox/mpconfigvariant.h
index 7b13b7dc6ce4e..8b23b93a8d3c8 100644
--- a/ports/unix/variants/nanbox/mpconfigvariant.h
+++ b/ports/unix/variants/nanbox/mpconfigvariant.h
@@ -48,3 +48,4 @@ typedef int64_t mp_int_t;
 typedef uint64_t mp_uint_t;
 #define UINT_FMT "%llu"
 #define INT_FMT "%lld"
+#define HEX_FMT "%llx"
diff --git a/py/mpconfig.h b/py/mpconfig.h
index b812cf032a481..619bce2ab290a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -2187,13 +2187,16 @@ typedef time_t mp_timestamp_t;
 // Archs where mp_int_t == long, long != int
 #define UINT_FMT "%lu"
 #define INT_FMT "%ld"
+#define HEX_FMT "%lx"
 #elif defined(_WIN64)
 #define UINT_FMT "%llu"
 #define INT_FMT "%lld"
+#define HEX_FMT "%llx"
 #else
 // Archs where mp_int_t == int
 #define UINT_FMT "%u"
 #define INT_FMT "%d"
+#define HEX_FMT "%x"
 #endif
 #endif // INT_FMT
 

From 519cba4d050e0c0bf69039908ef255b421d8ce57 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 21 Jun 2025 15:37:35 +0200
Subject: [PATCH 2569/3129] py: Cast type names to qstr explicitly.

The name field of type objects is of type `uint16_t` for efficiency, but
when the type is passed to `mp_printf` it must be cast explicitly to type
`qstr`.

These locations were found using an experimental gcc plugin for `mp_printf`
error checking, cross-building for x64 windows on Linux.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/builtinhelp.c   | 2 +-
 py/obj.c           | 2 +-
 py/objdict.c       | 2 +-
 py/objnamedtuple.c | 2 +-
 py/objtype.c       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index a3fcc4dfb77c6..c08c2e3b6342b 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -135,7 +135,7 @@ static void mp_help_print_obj(const mp_obj_t obj) {
     // try to print something sensible about the given object
     mp_print_str(MP_PYTHON_PRINTER, "object ");
     mp_obj_print(obj, PRINT_STR);
-    mp_printf(MP_PYTHON_PRINTER, " is of type %q\n", type->name);
+    mp_printf(MP_PYTHON_PRINTER, " is of type %q\n", (qstr)type->name);
 
     mp_map_t *map = NULL;
     if (type == &mp_type_module) {
diff --git a/py/obj.c b/py/obj.c
index 586759460762b..26a912fc6825e 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -128,7 +128,7 @@ void mp_obj_print_helper(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
     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);
+        mp_printf(print, "<%q>", (qstr)type->name);
     }
 }
 
diff --git a/py/objdict.c b/py/objdict.c
index cf64fa9555a28..451e87329030c 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -84,7 +84,7 @@ static void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
         #endif
     }
     if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict && kind != PRINT_JSON) {
-        mp_printf(print, "%q(", self->base.type->name);
+        mp_printf(print, "%q(", (qstr)self->base.type->name);
     }
     mp_print_str(print, "{");
     size_t cur = 0;
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index f019604d5257b..e8447ee31ef08 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -63,7 +63,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(namedtuple_asdict_obj, namedtuple_asdict);
 static void namedtuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_namedtuple_t *o = MP_OBJ_TO_PTR(o_in);
-    mp_printf(print, "%q", o->tuple.base.type->name);
+    mp_printf(print, "%q", (qstr)o->tuple.base.type->name);
     const qstr *fields = ((mp_obj_namedtuple_type_t *)o->tuple.base.type)->fields;
     mp_obj_attrtuple_print_helper(print, fields, &o->tuple);
 }
diff --git a/py/objtype.c b/py/objtype.c
index b9af1008995ef..f2173c79a173e 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -977,7 +977,7 @@ static bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
 static void type_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<class '%q'>", self->name);
+    mp_printf(print, "<class '%q'>", (qstr)self->name);
 }
 
 static mp_obj_t type_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {

From d0d111356f36373bdda387626162f60b38f2177a Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 21 Jun 2025 15:40:38 +0200
Subject: [PATCH 2570/3129] py: Fix mp_printf integer size mismatches.

The type of the argument must match the format string.  Add casts to ensure
that they do.

It's possible that casting from `size_t` to `unsigned` loses the correct
values by masking off upper bits, but it seems likely that the quantities
involved in practice are small enough that the `%u` formatter (32 bits on
most platforms, 16 on pic16bit) will in fact hold the correct value.

The alternative, casting to a wider type, adds code size.

These locations were found using an experimental gcc plugin for `mp_printf`
error checking, cross-building for x64 windows on Linux.

In one case there was already a cast, but it was written incorrectly and
did not have the intended effect.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/gc.c             | 2 +-
 py/modmicropython.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index eda63187b20a3..de66137f5800d 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -1202,7 +1202,7 @@ void gc_dump_alloc_table(const mp_print_t *print) {
                     }
                     if (bl2 - bl >= 2 * DUMP_BYTES_PER_LINE) {
                         // there are at least 2 lines containing only free blocks, so abbreviate their printing
-                        mp_printf(print, "\n       (%u lines all free)", (uint)(bl2 - bl) / DUMP_BYTES_PER_LINE);
+                        mp_printf(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
diff --git a/py/modmicropython.c b/py/modmicropython.c
index d1a687f10e14e..4d676cb4ab27b 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -98,7 +98,7 @@ static mp_obj_t mp_micropython_qstr_info(size_t n_args, const mp_obj_t *args) {
     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);
     mp_printf(&mp_plat_print, "qstr pool: n_pool=%u, n_qstr=%u, n_str_data_bytes=%u, n_total_bytes=%u\n",
-        n_pool, n_qstr, n_str_data_bytes, n_total_bytes);
+        (uint)n_pool, (uint)n_qstr, (uint)n_str_data_bytes, (uint)n_total_bytes);
     if (n_args == 1) {
         // arg given means dump qstr data
         qstr_dump_data();

From a1a8eacdce18b953bf16e669b1519b79ca3ab49d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 24 Jun 2025 10:07:37 +0200
Subject: [PATCH 2571/3129] unix/coverage: Avoid type checking an invalid
 string.

We still want this not to crash a runtime but the new static checker
wouldn't like it.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 68340d7f239a8..5bd02f6fbbc86 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -230,7 +230,12 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%u\n", 0x80000000); // should print unsigned
         mp_printf(&mp_plat_print, "%x\n", 0x8000000f); // should print unsigned
         mp_printf(&mp_plat_print, "%X\n", 0x8000000f); // should print unsigned
-        mp_printf(&mp_plat_print, "abc\n%"); // string ends in middle of format specifier
+        // note: storing the string in a variable is enough to prevent the
+        // format string checker from checking this format string. Otherwise,
+        // it would be a compile time diagnostic under the format string
+        // checker.
+        const char msg[] = "abc\n%";
+        mp_printf(&mp_plat_print, msg); // string ends in middle of format specifier
         mp_printf(&mp_plat_print, "%%\n"); // literal % character
         mp_printf(&mp_plat_print, ".%-3s.\n", "a"); // left adjust
 

From a06857a11ad16a3ca1e22815687c37a5ebd38fb6 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 24 Jun 2025 10:06:58 +0200
Subject: [PATCH 2572/3129] unix/coverage: Cast type names to qstr explicitly.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 5bd02f6fbbc86..c27198b3b31d5 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -218,7 +218,7 @@ static mp_obj_t extra_coverage(void) {
         }
         mp_printf(&mp_plat_print, "%p\n", (void *)0x789f); // pointer
         mp_printf(&mp_plat_print, "%P\n", (void *)0x789f); // pointer uppercase
-        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, "%.2s %.3s '%4.4s' '%5.5q' '%.3q'\n", "abc", "abc", "abc", (qstr)MP_QSTR_True, (qstr)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

From 61006d80169ea4dc12b62b835d41b9c55f673111 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 10 Jul 2025 19:39:10 +0100
Subject: [PATCH 2573/3129] unix/coverage: Cast values to fit %x formatting
 code.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes the following diagnostic produced by the plugin:

    error: argument 3: Format ‘%x’ requires a ‘int’ or
        ‘unsigned int’ (32 bits), not ‘long unsigned int’ [size 64]
        [-Werror=format=]

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 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 c27198b3b31d5..8b4072b9a37c3 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -528,7 +528,7 @@ static mp_obj_t extra_coverage(void) {
 
         // convert a large integer value (stored in a mpz) to mp_uint_t and to ll;
         mp_obj_t obj_bigint = mp_obj_new_int_from_uint((mp_uint_t)0xdeadbeef);
-        mp_printf(&mp_plat_print, "%x\n", mp_obj_get_uint(obj_bigint));
+        mp_printf(&mp_plat_print, "%x\n", (int)mp_obj_get_uint(obj_bigint));
         obj_bigint = mp_obj_new_int_from_ll(0xc0ffee777c0ffeell);
         long long value_ll = mp_obj_get_ll(obj_bigint);
         mp_printf(&mp_plat_print, "%x%08x\n", (uint32_t)(value_ll >> 32), (uint32_t)value_ll);
@@ -536,13 +536,13 @@ static mp_obj_t extra_coverage(void) {
         // convert a large integer value (stored via a struct object) to uint and to ll
         // `deadbeef` global is an uctypes.struct defined by extra_coverage.py
         obj_bigint = mp_load_global(MP_QSTR_deadbeef);
-        mp_printf(&mp_plat_print, "%x\n", mp_obj_get_uint(obj_bigint));
+        mp_printf(&mp_plat_print, "%x\n", (int)mp_obj_get_uint(obj_bigint));
         value_ll = mp_obj_get_ll(obj_bigint);
         mp_printf(&mp_plat_print, "%x%08x\n", (uint32_t)(value_ll >> 32), (uint32_t)value_ll);
 
         // convert a smaller integer value to mp_uint_t and to ll
         obj_bigint = mp_obj_new_int_from_uint(0xc0ffee);
-        mp_printf(&mp_plat_print, "%x\n", mp_obj_get_uint(obj_bigint));
+        mp_printf(&mp_plat_print, "%x\n", (int)mp_obj_get_uint(obj_bigint));
         value_ll = mp_obj_get_ll(obj_bigint);
         mp_printf(&mp_plat_print, "%x%08x\n", (uint32_t)(value_ll >> 32), (uint32_t)value_ll);
     }

From db7e93591702a8817bf6f9adde728698546ef7a2 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 24 Jun 2025 10:08:19 +0200
Subject: [PATCH 2574/3129] unix/coverage: Cast values to int for format
 printing.

During the coverage test, all the values encountered are within the range
of `%d`.

These locations were found using an experimental gcc plugin for `mp_printf`
error checking.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 8b4072b9a37c3..aef123bb6b771 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -171,13 +171,13 @@ static void pairheap_test(size_t nops, int *ops) {
         if (mp_pairheap_is_empty(pairheap_lt, heap)) {
             mp_printf(&mp_plat_print, " -");
         } else {
-            mp_printf(&mp_plat_print, " %d", mp_pairheap_peek(pairheap_lt, heap) - &node[0]);
+            mp_printf(&mp_plat_print, " %d", (int)(mp_pairheap_peek(pairheap_lt, heap) - &node[0]));
             ;
         }
     }
     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]);
+        mp_printf(&mp_plat_print, " %d", (int)(mp_pairheap_peek(pairheap_lt, heap) - &node[0]));
         ;
         heap = mp_pairheap_pop(pairheap_lt, heap);
     }
@@ -274,7 +274,7 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%p\n", gc_realloc(p, 0, false));
 
         // calling gc_nbytes with a non-heap pointer
-        mp_printf(&mp_plat_print, "%p\n", gc_nbytes(NULL));
+        mp_printf(&mp_plat_print, "%d\n", (int)gc_nbytes(NULL));
     }
 
     // GC initialisation and allocation stress test, to check the logic behind ALLOC_TABLE_GAP_BYTE
@@ -335,7 +335,7 @@ static mp_obj_t extra_coverage(void) {
                 }
                 ptrs[i][j] = j;
             }
-            mp_printf(&mp_plat_print, "%d %d\n", i, all_zero);
+            mp_printf(&mp_plat_print, "%d %d\n", (int)i, (int)all_zero);
 
             // hide the pointer from the GC and collect
             ptrs[i] = FLIP_POINTER(ptrs[i]);
@@ -351,7 +351,7 @@ static mp_obj_t extra_coverage(void) {
                     break;
                 }
             }
-            mp_printf(&mp_plat_print, "%d %d\n", i, correct_contents);
+            mp_printf(&mp_plat_print, "%d %d\n", (int)i, (int)correct_contents);
         }
 
         // free the memory blocks
@@ -449,7 +449,7 @@ static mp_obj_t extra_coverage(void) {
         // create a bytearray via mp_obj_new_bytearray
         mp_buffer_info_t bufinfo;
         mp_get_buffer_raise(mp_obj_new_bytearray(4, "data"), &bufinfo, MP_BUFFER_RW);
-        mp_printf(&mp_plat_print, "%.*s\n", bufinfo.len, bufinfo.buf);
+        mp_printf(&mp_plat_print, "%.*s\n", (int)bufinfo.len, bufinfo.buf);
     }
 
     // mpz
@@ -516,11 +516,11 @@ static mp_obj_t extra_coverage(void) {
 
         // hash the zero mpz integer
         mpz_set_from_int(&mpz, 0);
-        mp_printf(&mp_plat_print, "%d\n", mpz_hash(&mpz));
+        mp_printf(&mp_plat_print, "%d\n", (int)mpz_hash(&mpz));
 
         // convert the mpz zero integer to int
         mp_printf(&mp_plat_print, "%d\n", mpz_as_int_checked(&mpz, &value_signed));
-        mp_printf(&mp_plat_print, "%d\n", value_signed);
+        mp_printf(&mp_plat_print, "%d\n", (int)value_signed);
 
         // mpz_set_from_float with 0 as argument
         mpz_set_from_float(&mpz, 0);
@@ -562,7 +562,7 @@ static mp_obj_t extra_coverage(void) {
         mp_call_function_2_protected(MP_OBJ_FROM_PTR(&mp_builtin_divmod_obj), mp_obj_new_str_from_cstr("abc"), mp_obj_new_str_from_cstr("abc"));
 
         // mp_obj_int_get_checked with mp_obj_int_t that has a value that is a small integer
-        mp_printf(&mp_plat_print, "%d\n", mp_obj_int_get_checked(MP_OBJ_FROM_PTR(mp_obj_int_new_mpz())));
+        mp_printf(&mp_plat_print, "%d\n", (int)mp_obj_int_get_checked(MP_OBJ_FROM_PTR(mp_obj_int_new_mpz())));
 
         // mp_obj_int_get_uint_checked with non-negative small-int
         mp_printf(&mp_plat_print, "%d\n", (int)mp_obj_int_get_uint_checked(MP_OBJ_NEW_SMALL_INT(1)));
@@ -674,7 +674,7 @@ static mp_obj_t extra_coverage(void) {
         #endif
 
         mp_vm_return_kind_t ret = mp_execute_bytecode(code_state, MP_OBJ_NULL);
-        mp_printf(&mp_plat_print, "%d %d\n", ret, mp_obj_get_type(code_state->state[0]) == &mp_type_NotImplementedError);
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ret, mp_obj_get_type(code_state->state[0]) == &mp_type_NotImplementedError);
     }
 
     // scheduler
@@ -754,36 +754,36 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "# ringbuf\n");
 
         // Single-byte put/get with empty ringbuf.
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
         ringbuf_put(&ringbuf, 22);
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
         mp_printf(&mp_plat_print, "%d\n", ringbuf_get(&ringbuf));
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
 
         // Two-byte put/get with empty ringbuf.
         ringbuf_put16(&ringbuf, 0xaa55);
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
         mp_printf(&mp_plat_print, "%04x\n", ringbuf_get16(&ringbuf));
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
 
         // Two-byte put with full ringbuf.
         for (int i = 0; i < 99; ++i) {
             ringbuf_put(&ringbuf, i);
         }
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
         mp_printf(&mp_plat_print, "%d\n", ringbuf_put16(&ringbuf, 0x11bb));
         // Two-byte put with one byte free.
         ringbuf_get(&ringbuf);
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
         mp_printf(&mp_plat_print, "%d\n", ringbuf_put16(&ringbuf, 0x3377));
         ringbuf_get(&ringbuf);
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
         mp_printf(&mp_plat_print, "%d\n", ringbuf_put16(&ringbuf, 0xcc99));
         for (int i = 0; i < 97; ++i) {
             ringbuf_get(&ringbuf);
         }
         mp_printf(&mp_plat_print, "%04x\n", ringbuf_get16(&ringbuf));
-        mp_printf(&mp_plat_print, "%d %d\n", ringbuf_free(&ringbuf), ringbuf_avail(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_avail(&ringbuf));
 
         // Two-byte put with wrap around on first byte:
         ringbuf.iput = 0;

From aa9152ae0c61cab59691d74c95cf6fe10c3d5ea8 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 24 Jun 2025 10:06:50 +0200
Subject: [PATCH 2575/3129] unix/coverage: Provide argmuents of expected
 integer types.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/coverage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index aef123bb6b771..0b97226f7ca36 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -203,7 +203,7 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "# mp_printf\n");
         mp_printf(&mp_plat_print, "%d %+d % d\n", -123, 123, 123); // sign
         mp_printf(&mp_plat_print, "%05d\n", -123); // negative number with zero padding
-        mp_printf(&mp_plat_print, "%ld\n", 123); // long
+        mp_printf(&mp_plat_print, "%ld\n", 123l); // long
         mp_printf(&mp_plat_print, "%lx\n", 0x123fl); // long hex
         mp_printf(&mp_plat_print, "%lX\n", 0x123fl); // capital long hex
         if (sizeof(mp_int_t) == 8) {

From 338ca3b68f3ca8b38838198e7cb147940192cca2 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 17 Jul 2025 12:28:18 -0500
Subject: [PATCH 2576/3129] unix/coverage: Remove unused printf arguments.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 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 0b97226f7ca36..f071049eded50 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -212,9 +212,9 @@ static mp_obj_t extra_coverage(void) {
             mp_printf(&mp_plat_print, "%llu\n", ULLONG_MAX); // unsigned long long
         } else {
             // fake for platforms without narrower mp_int_t
-            mp_printf(&mp_plat_print, "7fffffffffffffff\n", LLONG_MAX);
-            mp_printf(&mp_plat_print, "7FFFFFFFFFFFFFFF\n", LLONG_MAX);
-            mp_printf(&mp_plat_print, "18446744073709551615\n", ULLONG_MAX);
+            mp_printf(&mp_plat_print, "7fffffffffffffff\n");
+            mp_printf(&mp_plat_print, "7FFFFFFFFFFFFFFF\n");
+            mp_printf(&mp_plat_print, "18446744073709551615\n");
         }
         mp_printf(&mp_plat_print, "%p\n", (void *)0x789f); // pointer
         mp_printf(&mp_plat_print, "%P\n", (void *)0x789f); // pointer uppercase

From 18a835e9b4019a1b141f481af902e172daceb8e9 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 24 Jun 2025 10:47:21 +0200
Subject: [PATCH 2577/3129] examples/usercmodule: Cast arguments for printf.

These locations were found using an experimental gcc plugin for `mp_printf`
error checking.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 examples/usercmodule/cexample/examplemodule.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
index 83cc3b27c058e..a2b4d766f109f 100644
--- a/examples/usercmodule/cexample/examplemodule.c
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -86,12 +86,12 @@ static void example_AdvancedTimer_print(const mp_print_t *print, mp_obj_t self_i
     mp_uint_t elapsed = mp_obj_get_int(example_Timer_time(self_in));
 
     // We'll make all representations print at least the class name.
-    mp_printf(print, "%q()", MP_QSTR_AdvancedTimer);
+    mp_printf(print, "%q()", (qstr)MP_QSTR_AdvancedTimer);
 
     // Decide what else to print based on print kind.
     if (kind == PRINT_STR) {
         // For __str__, let's attempt to make it more readable.
-        mp_printf(print, "  # created %d seconds ago", elapsed / 1000);
+        mp_printf(print, "  # created %d seconds ago", (int)(elapsed / 1000));
     }
 }
 

From 2d93909ebe050ab08abf7de63f735b1417e02084 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 6 Jul 2025 08:12:01 +0100
Subject: [PATCH 2578/3129] extmod/modlwip: Print timeout with correct format
 string.

As timeout is of type `mp_uint_t`, it must be printed with UINT_FMT.

Before, the compiler plugin produced an error in the PYBD_SF6 build, which
is a nanboxing build with 64-bit ints.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/modlwip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index b53559ed8cfe7..b84b3b7626bfe 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -907,7 +907,7 @@ static const mp_obj_type_t lwip_socket_type;
 
 static void lwip_socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     lwip_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<socket state=%d timeout=%d incoming=", self->state, self->timeout);
+    mp_printf(print, "<socket state=%d timeout=" UINT_FMT " incoming=", self->state, self->timeout);
     if (self->type == MOD_NETWORK_SOCK_STREAM) {
         mp_printf(print, "%p off=%d>", self->incoming.tcp.pbuf, self->recv_offset);
     } else {

From 4495610f8d5d38bf9f4b82f5568675509019758e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 6 Jul 2025 08:19:21 +0100
Subject: [PATCH 2579/3129] shared/netutils: Cast the ticks value before
 printing.

Before, the compiler plugin produced an error in the PYBD_SF6 build, which
is a nanboxing build with 64-bit ints.

I made the decision here to cast the value even though some significant
bits might be lost after 49.7 days.  However, the format used is "% 8d",
which produces a consistent width output for small ticks values (up to
about 1.1 days).  I judged that it was more valuable to preserve the fixed
width display than to accurately represent long time periods.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 shared/netutils/trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/netutils/trace.c b/shared/netutils/trace.c
index a6dfb42c28f00..24af4d5ca315f 100644
--- a/shared/netutils/trace.c
+++ b/shared/netutils/trace.c
@@ -56,7 +56,7 @@ static const char *ethertype_str(uint16_t type) {
 }
 
 void netutils_ethernet_trace(const mp_print_t *print, size_t len, const uint8_t *buf, unsigned int flags) {
-    mp_printf(print, "[% 8d] ETH%cX len=%u", mp_hal_ticks_ms(), flags & NETUTILS_TRACE_IS_TX ? 'T' : 'R', len);
+    mp_printf(print, "[% 8u] ETH%cX len=%u", (unsigned)mp_hal_ticks_ms(), flags & NETUTILS_TRACE_IS_TX ? 'T' : 'R', len);
     mp_printf(print, " dst=%02x:%02x:%02x:%02x:%02x:%02x", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
     mp_printf(print, " src=%02x:%02x:%02x:%02x:%02x:%02x", buf[6], buf[7], buf[8], buf[9], buf[10], buf[11]);
 

From ee4f27affa2a4cbf940081da4bdfa36d22351461 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 5 Jul 2025 09:34:29 +0100
Subject: [PATCH 2580/3129] py/objcell: Fix printing of cell ID/pointer.

On the nanbox build, `o->obj` is a 64-bit type but `%p` formats a 32-bit
type, leading to undefined behavior.

Print the cell's ID as a hex integer instead.

This location was found using an experimental gcc plugin for `mp_printf`
error checking.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objcell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objcell.c b/py/objcell.c
index 95966c7917cb7..5c030c7405a80 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -30,7 +30,7 @@
 static void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_cell_t *o = MP_OBJ_TO_PTR(o_in);
-    mp_printf(print, "<cell %p ", o->obj);
+    mp_printf(print, "<cell " HEX_FMT " ", (mp_uint_t)o->obj);
     if (o->obj == MP_OBJ_NULL) {
         mp_print_str(print, "(nil)");
     } else {

From 87b7a9d7349c28b3acb13815bb63484d12203895 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 6 Jul 2025 08:14:31 +0100
Subject: [PATCH 2581/3129] stm32: Add casts when printing small integers.

All these arguments are of type `mp_{u,}int_t`, but the actual value is
always a small integer.  Cast it so that it can format with the `%d/%u`
formatter.

Before, the compiler plugin produced an error in the PYBD_SF6 build, which
is a nanboxing build with 64-bit ints.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/stm32/extint.c       | 2 +-
 ports/stm32/led.c          | 2 +-
 ports/stm32/machine_uart.c | 2 +-
 ports/stm32/pin.c          | 2 +-
 ports/stm32/timer.c        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 9c3c24325368c..df0ed6e23e1f6 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -760,7 +760,7 @@ static mp_obj_t extint_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 
 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 line=%u>", self->line);
+    mp_printf(print, "<ExtInt line=%u>", (int)self->line);
 }
 
 static const mp_rom_map_elem_t extint_locals_dict_table[] = {
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 795d8c1109621..2fcb2abb60ddb 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -305,7 +305,7 @@ void led_debug(int n, int delay) {
 
 void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "LED(%u)", self->led_id);
+    mp_printf(print, "LED(%u)", (int)self->led_id);
 }
 
 /// \classmethod \constructor(id)
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 8f1faea4b69ec..c93eade5d3df6 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -93,7 +93,7 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         #endif
         {
             mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=",
-                self->uart_id, uart_get_baudrate(self), bits);
+                self->uart_id, uart_get_baudrate(self), (int)bits);
         }
         if (!(cr1 & USART_CR1_PCE)) {
             mp_print_str(print, "None");
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 7de87f2c7be2f..515437ac8610e 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -232,7 +232,7 @@ 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, ", alt=%d)", af_idx);
+                mp_printf(print, ", alt=%d)", (int)af_idx);
             } else {
                 mp_printf(print, ", alt=Pin.%q)", af_obj->name);
             }
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 4ec467d9db53d..8aa0b3a2dda4b 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -499,7 +499,7 @@ static uint32_t compute_dtg_from_ticks(mp_int_t ticks) {
 
 // Given the 8-bit value stored in the DTG field of the BDTR register, compute
 // the number of ticks.
-static mp_int_t compute_ticks_from_dtg(uint32_t dtg) {
+static unsigned compute_ticks_from_dtg(uint32_t dtg) {
     if ((dtg & 0x80) == 0) {
         return dtg & 0x7F;
     }

From ab620f40844a837546497252849933ef2f685f4d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 18 Jul 2025 06:06:42 -0500
Subject: [PATCH 2582/3129] py/mpprint: Fix printing pointers with upper bit
 set.

On a build like nanbox, `mp_uint_t` is wider than `u/intptr_t`.  Using a
signed type for fetching pointer values resulted in erroneous results: like
`<function f at 0xfffffffff7a60bc0>` instead of
`<function f at 0xf7a60bc0>`.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/mpprint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mpprint.c b/py/mpprint.c
index e56b949ddda5f..f1d8bd0c57366 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -530,7 +530,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                 char fmt_chr = *fmt;
                 mp_uint_t val;
                 if (fmt_chr == 'p' || fmt_chr == 'P') {
-                    val = va_arg(args, intptr_t);
+                    val = va_arg(args, uintptr_t);
                 }
                 #if SUPPORT_LL_FORMAT
                 else if (long_long_arg) {

From ebc9525c953dfbb6c44ab99320b5278e4314dafe Mon Sep 17 00:00:00 2001
From: Christian Lang <lang.chr86@gmail.com>
Date: Tue, 22 Jul 2025 21:23:12 +0200
Subject: [PATCH 2583/3129] rp2/modmachine: Do not use deprecated XOSC_MHZ and
 XOSC_KHZ.

XOSC_MHZ and XOSC_KHZ may not be defined if we use a custom XIN clock
by defining PLL_SYS_REFDIV etc. calculated by vcocalc.py.

Signed-off-by: Christian Lang <lang.chr86@gmail.com>
---
 ports/rp2/clocks_extra.c |  4 ++--
 ports/rp2/modmachine.c   | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ports/rp2/clocks_extra.c b/ports/rp2/clocks_extra.c
index 73def24b80455..ab3e6261f4b1e 100644
--- a/ports/rp2/clocks_extra.c
+++ b/ports/rp2/clocks_extra.c
@@ -83,8 +83,8 @@ void runtime_init_clocks_optional_usb(bool init_usb) {
     clock_configure(clk_ref,
         CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC,
         0,             // No aux mux
-        XOSC_KHZ * KHZ,
-        XOSC_KHZ * KHZ);
+        XOSC_HZ,
+        XOSC_HZ);
 
     /// \tag::configure_clk_sys[]
     // CLK SYS = PLL SYS (usually) 125MHz / 1 = 125MHz
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 1f1b0e2f59b1e..e5cf703edd3df 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -163,8 +163,6 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
         }
     }
 
-    const uint32_t xosc_hz = XOSC_MHZ * 1000000;
-
     uint32_t my_interrupts = MICROPY_BEGIN_ATOMIC_SECTION();
     #if MICROPY_PY_NETWORK_CYW43
     if (cyw43_poll_is_pending()) {
@@ -200,18 +198,18 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     #endif
 
     // CLK_REF = XOSC
-    clock_configure(clk_ref, CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC, 0, xosc_hz, xosc_hz);
+    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);
+    clock_configure(clk_sys, CLOCKS_CLK_SYS_CTRL_SRC_VALUE_CLK_REF, 0, XOSC_HZ, XOSC_HZ);
 
     // CLK_RTC = XOSC / 256
     #if PICO_RP2040
-    clock_configure(clk_rtc, 0, CLOCKS_CLK_RTC_CTRL_AUXSRC_VALUE_XOSC_CLKSRC, xosc_hz, xosc_hz / 256);
+    clock_configure(clk_rtc, 0, CLOCKS_CLK_RTC_CTRL_AUXSRC_VALUE_XOSC_CLKSRC, XOSC_HZ, XOSC_HZ / 256);
     #endif
 
     // CLK_PERI = CLK_SYS
-    clock_configure(clk_peri, 0, CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS, xosc_hz, xosc_hz);
+    clock_configure(clk_peri, 0, CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS, XOSC_HZ, XOSC_HZ);
 
     // Disable PLLs.
     pll_deinit(pll_sys);

From 062e82a7cd60165db7edd8ee32105ea19a31ae2f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 19 Jul 2025 11:24:34 -0500
Subject: [PATCH 2584/3129] py/objint_mpz: Fix pow3 where third argument is
 zero.

This finding is based on fuzzing MicroPython.  I manually minimized the
test case it provided.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objint_mpz.c                     | 7 ++++---
 tests/basics/builtin_pow3_intbig.py | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 6f2ea616c779c..ea4e409a257e8 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -356,9 +356,10 @@ static mpz_t *mp_mpz_for_int(mp_obj_t arg, mpz_t *temp) {
 mp_obj_t mp_obj_int_pow3(mp_obj_t base, mp_obj_t exponent,  mp_obj_t modulus) {
     if (!mp_obj_is_int(base) || !mp_obj_is_int(exponent) || !mp_obj_is_int(modulus)) {
         mp_raise_TypeError(MP_ERROR_TEXT("pow() with 3 arguments requires integers"));
+    } else if (modulus == MP_OBJ_NEW_SMALL_INT(0)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("divide by zero"));
     } else {
-        mp_obj_t result = mp_obj_new_int_from_ull(0); // Use the _from_ull version as this forces an mpz int
-        mp_obj_int_t *res_p = (mp_obj_int_t *)MP_OBJ_TO_PTR(result);
+        mp_obj_int_t *res_p = mp_obj_int_new_mpz();
 
         mpz_t l_temp, r_temp, m_temp;
         mpz_t *lhs = mp_mpz_for_int(base,     &l_temp);
@@ -376,7 +377,7 @@ mp_obj_t mp_obj_int_pow3(mp_obj_t base, mp_obj_t exponent,  mp_obj_t modulus) {
         if (mod == &m_temp) {
             mpz_deinit(mod);
         }
-        return result;
+        return MP_OBJ_FROM_PTR(res_p);
     }
 }
 #endif
diff --git a/tests/basics/builtin_pow3_intbig.py b/tests/basics/builtin_pow3_intbig.py
index bedc8b36b7edd..41d2acbc0cc75 100644
--- a/tests/basics/builtin_pow3_intbig.py
+++ b/tests/basics/builtin_pow3_intbig.py
@@ -20,3 +20,8 @@
 print(hex(pow(y, x-1, x))) # Should be 1, since x is prime
 print(hex(pow(y, y-1, x))) # Should be a 'big value'
 print(hex(pow(y, y-1, y))) # Should be a 'big value'
+
+try:
+    print(pow(1, 2, 0))
+except ValueError:
+    print("ValueError")

From 3c69277ba9e0f1e66c341c084320f7a763e1bdeb Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Mon, 21 Jul 2025 15:54:27 +0200
Subject: [PATCH 2585/3129] py/objint_longlong: Fix overflow check in
 mp_obj_int_get_checked.

This is to fix an outstanding TODO.  The test cases is using a range as
this will exist in all builds, but `mp_obj_get_int` is used in many
different parts of code where an overflow is more likely to occur.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 py/objint_longlong.c          | 13 +++++++++++--
 tests/basics/int_64_basics.py | 16 ++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 339ce7cfd8e96..8b8fdc62e8b02 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -308,8 +308,17 @@ mp_int_t mp_obj_int_get_truncated(mp_const_obj_t self_in) {
 }
 
 mp_int_t mp_obj_int_get_checked(mp_const_obj_t self_in) {
-    // TODO: Check overflow
-    return mp_obj_int_get_truncated(self_in);
+    if (mp_obj_is_small_int(self_in)) {
+        return MP_OBJ_SMALL_INT_VALUE(self_in);
+    } else {
+        const mp_obj_int_t *self = self_in;
+        long long value = self->val;
+        mp_int_t truncated = (mp_int_t)value;
+        if ((long long)truncated == value) {
+            return truncated;
+        }
+    }
+    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("overflow converting long int to machine word"));
 }
 
 mp_uint_t mp_obj_int_get_uint_checked(mp_const_obj_t self_in) {
diff --git a/tests/basics/int_64_basics.py b/tests/basics/int_64_basics.py
index 289ea49b65ece..2a161dac0ba14 100644
--- a/tests/basics/int_64_basics.py
+++ b/tests/basics/int_64_basics.py
@@ -125,6 +125,22 @@
 x = 1 << 62
 print('a' * (x + 4 - x))
 
+# test overflow check in mp_obj_get_int_maybe
+x = 1 << 32
+r = None
+try:
+    r = range(0, x)
+except OverflowError:
+    # 32-bit target, correctly handled the overflow of x
+    print("ok")
+if r is not None:
+    if len(r) == x:
+        # 64-bit target, everything is just a small-int
+        print("ok")
+    else:
+        # 32-bit target that did not handle the overflow of x
+        print("unhandled overflow")
+
 # negative shifts are invalid
 try:
     print((1 << 48) >> -4)

From 3a72f95919323d7a36cb3d153d92de90d64853a1 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Sun, 20 Jul 2025 16:38:33 +0200
Subject: [PATCH 2586/3129] py/objint_longlong: Fix longlong interoperability
 with floats.

Current longlong implementation does not allow a float as RHS of mathematic
operators, as it lacks the delegation code present in mpz.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 py/objint_longlong.c        | 17 +++++++++++++++++
 tests/float/int_64_float.py | 25 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 tests/float/int_64_float.py

diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 8b8fdc62e8b02..1a6242b97921e 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -165,11 +165,28 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
         rhs_val = MP_OBJ_SMALL_INT_VALUE(rhs_in);
     } else if (mp_obj_is_exact_type(rhs_in, &mp_type_int)) {
         rhs_val = ((mp_obj_int_t *)rhs_in)->val;
+    #if MICROPY_PY_BUILTINS_FLOAT
+    } else if (mp_obj_is_float(rhs_in)) {
+        return mp_obj_float_binary_op(op, (mp_float_t)lhs_val, rhs_in);
+    #endif
+    #if MICROPY_PY_BUILTINS_COMPLEX
+    } else if (mp_obj_is_type(rhs_in, &mp_type_complex)) {
+        return mp_obj_complex_binary_op(op, (mp_float_t)lhs_val, 0, rhs_in);
+    #endif
     } else {
         // delegate to generic function to check for extra cases
         return mp_obj_int_binary_op_extra_cases(op, lhs_in, rhs_in);
     }
 
+    #if MICROPY_PY_BUILTINS_FLOAT
+    if (op == MP_BINARY_OP_TRUE_DIVIDE || op == MP_BINARY_OP_INPLACE_TRUE_DIVIDE) {
+        if (rhs_val == 0) {
+            goto zero_division;
+        }
+        return mp_obj_new_float((mp_float_t)lhs_val / (mp_float_t)rhs_val);
+    }
+    #endif
+
     switch (op) {
         case MP_BINARY_OP_ADD:
         case MP_BINARY_OP_INPLACE_ADD:
diff --git a/tests/float/int_64_float.py b/tests/float/int_64_float.py
new file mode 100644
index 0000000000000..ffdb0c71dbafb
--- /dev/null
+++ b/tests/float/int_64_float.py
@@ -0,0 +1,25 @@
+# test int64 operation with float/complex
+
+i = 1 << 40
+
+# convert int64 to float on rhs
+print("%.5g" % (2.0 * i))
+
+# negative int64 as float
+print("%.5g" % float(-i))
+
+# this should convert to float
+print("%.5g" % (i / 5))
+
+# these should delegate to float
+print("%.5g" % (i * 1.2))
+print("%.5g" % (i / 1.2))
+
+# negative power should produce float
+print("%.5g" % (i**-1))
+print("%.5g" % ((2 + i - i) ** -3))
+
+try:
+    i / 0
+except ZeroDivisionError:
+    print("ZeroDivisionError")

From 82db5c81e027f6ad305a43ec3c90a13ba319e3b4 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Fri, 19 Jul 2024 13:01:09 -0400
Subject: [PATCH 2587/3129] tests/basics: Add tests for PEP487 __set_name__.

Including the stochastic tests needed to guarantee sensitivity to the
potential iterate-while-modifying hazard a naive implementation might have.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/basics/class_descriptor.py          |  20 ++-
 tests/basics/class_setname_hazard.py      | 182 ++++++++++++++++++++++
 tests/basics/class_setname_hazard_rand.py | 111 +++++++++++++
 3 files changed, 306 insertions(+), 7 deletions(-)
 create mode 100644 tests/basics/class_setname_hazard.py
 create mode 100644 tests/basics/class_setname_hazard_rand.py

diff --git a/tests/basics/class_descriptor.py b/tests/basics/class_descriptor.py
index 83d31674301d5..feaed2fbb2a43 100644
--- a/tests/basics/class_descriptor.py
+++ b/tests/basics/class_descriptor.py
@@ -1,22 +1,28 @@
 class Descriptor:
     def __get__(self, obj, cls):
-        print('get')
+        print("get")
         print(type(obj) is Main)
         print(cls is Main)
-        return 'result'
+        return "result"
 
     def __set__(self, obj, val):
-        print('set')
+        print("set")
         print(type(obj) is Main)
         print(val)
 
     def __delete__(self, obj):
-        print('delete')
+        print("delete")
         print(type(obj) is Main)
 
+    def __set_name__(self, owner, name):
+        print("set_name", name)
+        print(owner.__name__ == "Main")
+
+
 class Main:
     Forward = Descriptor()
 
+
 m = Main()
 try:
     m.__class__
@@ -26,15 +32,15 @@ class Main:
     raise SystemExit
 
 r = m.Forward
-if 'Descriptor' in repr(r.__class__):
+if "Descriptor" in repr(r.__class__):
     # Target doesn't support descriptors.
-    print('SKIP')
+    print("SKIP")
     raise SystemExit
 
 # Test assignment and deletion.
 
 print(r)
-m.Forward = 'a'
+m.Forward = "a"
 del m.Forward
 
 # Test that lookup of descriptors like __get__ are not passed into __getattr__.
diff --git a/tests/basics/class_setname_hazard.py b/tests/basics/class_setname_hazard.py
new file mode 100644
index 0000000000000..77c0409346282
--- /dev/null
+++ b/tests/basics/class_setname_hazard.py
@@ -0,0 +1,182 @@
+# Test that __set_name__ can access and mutate its owner argument.
+
+
+def skip_if_no_descriptors():
+    class Descriptor:
+        def __get__(self, obj, cls):
+            return
+
+    class TestClass:
+        Forward = Descriptor()
+
+    a = TestClass()
+    try:
+        a.__class__
+    except AttributeError:
+        # Target doesn't support __class__.
+        print("SKIP")
+        raise SystemExit
+
+    b = a.Forward
+    if "Descriptor" in repr(b.__class__):
+        # Target doesn't support descriptors.
+        print("SKIP")
+        raise SystemExit
+
+
+skip_if_no_descriptors()
+
+
+# Test basic accesses and mutations.
+
+
+class GetSibling:
+    def __set_name__(self, owner, name):
+        print(getattr(owner, name + "_sib"))
+
+
+class GetSiblingTest:
+    desc = GetSibling()
+    desc_sib = 111
+
+
+t110 = GetSiblingTest()
+
+
+class SetSibling:
+    def __set_name__(self, owner, name):
+        setattr(owner, name + "_sib", 121)
+
+
+class SetSiblingTest:
+    desc = SetSibling()
+
+
+t120 = SetSiblingTest()
+
+print(t120.desc_sib)
+
+
+class DelSibling:
+    def __set_name__(self, owner, name):
+        delattr(owner, name + "_sib")
+
+
+class DelSiblingTest:
+    desc = DelSibling()
+    desc_sib = 131
+
+
+t130 = DelSiblingTest()
+
+try:
+    print(t130.desc_sib)
+except AttributeError:
+    print("AttributeError")
+
+
+class GetSelf:
+    x = 211
+
+    def __set_name__(self, owner, name):
+        print(getattr(owner, name).x)
+
+
+class GetSelfTest:
+    desc = GetSelf()
+
+
+t210 = GetSelfTest()
+
+
+class SetSelf:
+    def __set_name__(self, owner, name):
+        setattr(owner, name, 221)
+
+
+class SetSelfTest:
+    desc = SetSelf()
+
+
+t220 = SetSelfTest()
+
+print(t220.desc)
+
+
+class DelSelf:
+    def __set_name__(self, owner, name):
+        delattr(owner, name)
+
+
+class DelSelfTest:
+    desc = DelSelf()
+
+
+t230 = DelSelfTest()
+
+try:
+    print(t230.desc)
+except AttributeError:
+    print("AttributeError")
+
+
+# Test exception behavior.
+
+
+class Raise:
+    def __set_name__(self, owner, name):
+        raise Exception()
+
+
+try:
+
+    class RaiseTest:
+        desc = Raise()
+except Exception as e:  # CPython raises RuntimeError, MicroPython propagates the original exception
+    print("Exception")
+
+
+# Ensure removed/overwritten class members still get __set_name__ called.
+
+
+class SetSpecific:
+    def __init__(self, sib_name, sib_replace):
+        self.sib_name = sib_name
+        self.sib_replace = sib_replace
+
+    def __set_name__(self, owner, name):
+        setattr(owner, self.sib_name, self.sib_replace)
+
+
+class SetReplaceTest:
+    a = SetSpecific("b", 312)  # one of these is changed first
+    b = SetSpecific("a", 311)
+
+
+t310 = SetReplaceTest()
+print(t310.a)
+print(t310.b)
+
+
+class DelSpecific:
+    def __init__(self, sib_name):
+        self.sib_name = sib_name
+
+    def __set_name__(self, owner, name):
+        delattr(owner, self.sib_name)
+
+
+class DelReplaceTest:
+    a = DelSpecific("b")  # one of these is removed first
+    b = DelSpecific("a")
+
+
+t320 = DelReplaceTest()
+try:
+    print(t320.a)
+except AttributeError:
+    print("AttributeError")
+try:
+    print(t320.b)
+except AttributeError:
+    print("AttributeError")
diff --git a/tests/basics/class_setname_hazard_rand.py b/tests/basics/class_setname_hazard_rand.py
new file mode 100644
index 0000000000000..4c9934c3bf068
--- /dev/null
+++ b/tests/basics/class_setname_hazard_rand.py
@@ -0,0 +1,111 @@
+# Test to make sure there's no sequence hazard even when a __set_name__ implementation
+# mutates and reorders the namespace of its owner class.
+# VERY hard bug to prove out except via a stochastic test.
+
+
+try:
+    from random import choice
+    import re
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def skip_if_no_descriptors():
+    class Descriptor:
+        def __get__(self, obj, cls):
+            return
+
+    class TestClass:
+        Forward = Descriptor()
+
+    a = TestClass()
+    try:
+        a.__class__
+    except AttributeError:
+        # Target doesn't support __class__.
+        print("SKIP")
+        raise SystemExit
+
+    b = a.Forward
+    if "Descriptor" in repr(b.__class__):
+        # Target doesn't support descriptors.
+        print("SKIP")
+        raise SystemExit
+
+
+skip_if_no_descriptors()
+
+letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+# Would be r"[A-Z]{5}", but not all ports support the {n} quantifier.
+junk_re = re.compile(r"[A-Z][A-Z][A-Z][A-Z][A-Z]")
+
+
+def junk_fill(obj, n=10):  # Add randomly-generated attributes to an object.
+    for i in range(n):
+        name = "".join(choice(letters) for j in range(5))
+        setattr(obj, name, object())
+
+
+def junk_clear(obj):  # Remove attributes added by junk_fill.
+    to_del = [name for name in dir(obj) if junk_re.match(name)]
+    for name in to_del:
+        delattr(obj, name)
+
+
+def junk_sequencer():
+    global runs
+    try:
+        while True:
+            owner, name = yield
+            runs[name] = runs.get(name, 0) + 1
+            junk_fill(owner)
+    finally:
+        junk_clear(owner)
+
+
+class JunkMaker:
+    def __set_name__(self, owner, name):
+        global seq
+        seq.send((owner, name))
+
+
+runs = {}
+seq = junk_sequencer()
+next(seq)
+
+
+class Main:
+    a = JunkMaker()
+    b = JunkMaker()
+    c = JunkMaker()
+    d = JunkMaker()
+    e = JunkMaker()
+    f = JunkMaker()
+    g = JunkMaker()
+    h = JunkMaker()
+    i = JunkMaker()
+    j = JunkMaker()
+    k = JunkMaker()
+    l = JunkMaker()
+    m = JunkMaker()
+    n = JunkMaker()
+    o = JunkMaker()
+    p = JunkMaker()
+    q = JunkMaker()
+    r = JunkMaker()
+    s = JunkMaker()
+    t = JunkMaker()
+    u = JunkMaker()
+    v = JunkMaker()
+    w = JunkMaker()
+    x = JunkMaker()
+    y = JunkMaker()
+    z = JunkMaker()
+
+
+seq.close()
+
+for k in letters.lower():
+    print(k, runs.get(k, 0))

From 4412753f0cf46fb28093a90d58988f541a531df4 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Fri, 19 Jul 2024 18:23:45 -0400
Subject: [PATCH 2588/3129] py/objtype: Add support for PEP487 __set_name__.

This commit adds support for the `__set_name__` data model method specified
by PEP487 - Simpler customisation of class creation.

This includes support for methods that mutate the owner class, and avoids
the naive modify-while-iterating hazard possible in a naive implementation
like micropython/micropython#15503.

Note that based on the benchmarks in micropython/micropython#16825, this is
also as fast or faster than the naive implementation, thanks to clever data
layout in `setname_list_t`, and the way this allows the capture step to run
during an existing loop through the class dict.

Other rejected approaches for dealing with the hazard include:

- python/cpython#72983
During the implementation of this feature for MicroPython, it was
discovered that some versions of CPython also have this naive hazard.
CPython resolved this bug in BPO-28797 and now makes a complete flat copy
of the class's dict to iterate.  This design decision doesn't make much
sense for a microcontroller though, even if it's perfectly reasonable in
the desktop world where memcpy might actually be cheaper than a
hard-to-branch-predict conditional; and it's also motivated in their case
by error-tracing considerations.

- micropython/micropython#16816
This is an equivalent implementation to CPython's approach that places this
copy directly on the stack; however it is both slower and has larger code
size than the approach taken here.

- micropython/micropython#15503
The simplest implementation is to just not worry about it and let the user
face the consequences if they mutate the owner class.  That's not a very
friendly behavior, though, and it's not actually much more performant than
this implementation on either time or code size.

- micropython/micropython#17693
Another alternative is to do the same as #15503 but leverage MicroPython's
existing `is_fixed` field in its dict type to convert attempted mutations
of the owner dict into `AttributeError`s.  This is safer than just leaving
the open hazard, but there's still important use-cases for owner-mutating
descriptors, and the performance gain is small enough that it isn't worth
missing support for those cases.

- combined micropython/micropython#17693 with this
Another version of this feature used a new feature define,
`MICROPY_PY_METACLASSES_LITE`, to control whether this algorithm or the
naive version is used.  This was rejected in favor of simplicity, based on
the very limited performance margin the naive version has (which in some
cases even goes _against_ it).

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/objtype.c | 90 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 13 deletions(-)

diff --git a/py/objtype.c b/py/objtype.c
index f2173c79a173e..818ceeb0589fb 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -661,8 +661,8 @@ static void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
     // try __getattr__
     if (attr != MP_QSTR___getattr__) {
         #if MICROPY_PY_DESCRIPTORS
-        // With descriptors enabled, don't delegate lookups of __get__/__set__/__delete__.
-        if (attr == MP_QSTR___get__ || attr == MP_QSTR___set__ || attr == MP_QSTR___delete__) {
+        // With descriptors enabled, don't delegate lookups of __get__/__set__/__delete__/__set_name__.
+        if (attr == MP_QSTR___get__ || attr == MP_QSTR___set__ || attr == MP_QSTR___delete__ || attr == MP_QSTR___set_name__) {
             return;
         }
         #endif
@@ -960,7 +960,7 @@ static bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
     #endif
     #if MICROPY_PY_DESCRIPTORS
     static const uint8_t to_check[] = {
-        MP_QSTR___get__, MP_QSTR___set__, MP_QSTR___delete__,
+        MP_QSTR___get__, MP_QSTR___set__, MP_QSTR___delete__, // not needed for MP_QSTR___set_name__ though
     };
     for (size_t i = 0; i < MP_ARRAY_SIZE(to_check); ++i) {
         mp_obj_t dest_temp[2];
@@ -974,6 +974,48 @@ static bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
 }
 #endif
 
+#if MICROPY_PY_DESCRIPTORS
+// Shared data layout for the __set_name__ call and a linked list of calls to be made.
+typedef union _setname_list_t setname_list_t;
+union _setname_list_t {
+    mp_obj_t call[4];
+    struct {
+        mp_obj_t _meth;
+        mp_obj_t _self;
+        setname_list_t *next; // can use the "owner" argument position temporarily for the linked list
+        mp_obj_t _name;
+    };
+};
+
+// Append any `__set_name__` method on `value` to the setname list, with its per-attr args
+static setname_list_t *setname_maybe_bind_append(setname_list_t *tail, mp_obj_t name, mp_obj_t value) {
+    // make certain our type-punning is safe:
+    MP_STATIC_ASSERT_NONCONSTEXPR(offsetof(setname_list_t, next) == offsetof(setname_list_t, call[2]));
+
+    // tail is a blank list entry
+    mp_load_method_maybe(value, MP_QSTR___set_name__, tail->call);
+    if (tail->call[1] != MP_OBJ_NULL) {
+        // Each time a __set_name__ is found, leave it in-place in the former tail and allocate a new tail
+        tail->next = m_new_obj(setname_list_t);
+        tail->next->next = NULL;
+        tail->call[3] = name;
+        return tail->next;
+    } else {
+        return tail;
+    }
+}
+
+// Execute the captured `__set_name__` calls, destroying the setname list in the process.
+static inline void setname_consume_call_all(setname_list_t *head, mp_obj_t owner) {
+    setname_list_t *next;
+    while ((next = head->next) != NULL) {
+        head->call[2] = owner;
+        mp_call_method_n_kw(2, 0, head->call);
+        head = next;
+    }
+}
+#endif
+
 static void type_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
@@ -1210,20 +1252,38 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         }
     }
 
+    #if MICROPY_PY_DESCRIPTORS
+    // To avoid any dynamic allocations when no __set_name__ exists,
+    // the head of this list is kept on the stack (marked blank with `next = NULL`).
+    setname_list_t setname_list = { .next = NULL };
+    setname_list_t *setname_tail = &setname_list;
+    #endif
+
     #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 < 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;
-                }
+    // Check if the class has any special accessor methods,
+    // and accumulate bound __set_name__ methods that need to be called
+    for (size_t i = 0; i < locals_ptr->map.alloc; i++) {
+        #if !MICROPY_PY_DESCRIPTORS
+        // __set_name__ needs to scan the entire locals map, can't early-terminate
+        if (o->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS) {
+            break;
+        }
+        #endif
+
+        if (mp_map_slot_is_filled(&locals_ptr->map, i)) {
+            const mp_map_elem_t *elem = &locals_ptr->map.table[i];
+
+            if (!(o->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS) // elidable when the early-termination check is enabled
+                && check_for_special_accessors(elem->key, elem->value)) {
+                o->flags |= MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS;
             }
+
+            #if MICROPY_PY_DESCRIPTORS
+            setname_tail = setname_maybe_bind_append(setname_tail, elem->key, elem->value);
+            #endif
         }
     }
-    #endif
+    #endif // ENABLE_SPECIAL_ACCESSORS
 
     const mp_obj_type_t *native_base;
     size_t num_native_bases = instance_count_native_bases(o, &native_base);
@@ -1241,6 +1301,10 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         }
     }
 
+    #if MICROPY_PY_DESCRIPTORS
+    setname_consume_call_all(&setname_list, MP_OBJ_FROM_PTR(o));
+    #endif
+
     return MP_OBJ_FROM_PTR(o);
 }
 

From d5dc5547427ef171e3ede4f8ac35ea9bf6f53fca Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 21 Jul 2025 08:33:17 -0400
Subject: [PATCH 2589/3129] docs: Document PEP487 __set_name__ implementation.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 docs/differences/python_36.rst | 7 ++++++-
 py/mpconfig.h                  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/differences/python_36.rst b/docs/differences/python_36.rst
index 3315b0594dafc..18da79f8f8431 100644
--- a/docs/differences/python_36.rst
+++ b/docs/differences/python_36.rst
@@ -25,7 +25,8 @@ Python 3.6 beta 1 was released on 12 Sep 2016, and a summary of the new 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 487 <https://www.python.org/dev/peps/pep-0487/>`_ | Simpler customization of class creation          | Partial         |
+  |                                                        |                                                  | [#setname]_     |
   +--------------------------------------------------------+--------------------------------------------------+-----------------+
   | `PEP 520 <https://www.python.org/dev/peps/pep-0520/>`_ | Preserving Class Attribute Definition Order      |                 |
   +--------------------------------------------------------+--------------------------------------------------+-----------------+
@@ -198,3 +199,7 @@ Changes to built-in modules:
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | The *compress()* and *decompress()* functions now accept keyword arguments                                   |                |
   +--------------------------------------------------------------------------------------------------------------+----------------+
+
+.. rubric:: Notes
+
+.. [#setname] Currently, only :func:`__set_name__` is implemented.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 619bce2ab290a..6ef6ec52e7cb6 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1129,7 +1129,7 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_PY_FUNCTION_ATTRS_CODE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_FULL_FEATURES)
 #endif
 
-// Whether to support the descriptors __get__, __set__, __delete__
+// Whether to support the descriptors __get__, __set__, __delete__, __set_name__
 // 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

From c3e77ad6db279c37bd39e467e7bbef7750fd5f7b Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Wed, 26 Feb 2025 12:38:08 -0500
Subject: [PATCH 2590/3129] tests/internal_bench/class_create: Benchmark class
 creation.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/internal_bench/class_create-0-empty.py  | 11 ++++++++++
 tests/internal_bench/class_create-1-slots.py  | 12 +++++++++++
 .../internal_bench/class_create-1.1-slots5.py | 12 +++++++++++
 .../class_create-2-classattr.py               | 11 ++++++++++
 .../class_create-2.1-classattr5.py            | 15 +++++++++++++
 .../class_create-2.3-classattr5objs.py        | 20 ++++++++++++++++++
 .../class_create-3-instancemethod.py          | 12 +++++++++++
 .../class_create-4-classmethod.py             | 13 ++++++++++++
 .../class_create-4.1-classmethod_implicit.py  | 12 +++++++++++
 .../class_create-5-staticmethod.py            | 13 ++++++++++++
 .../class_create-6-getattribute.py            | 12 +++++++++++
 .../class_create-6.1-getattr.py               | 12 +++++++++++
 .../class_create-6.2-property.py              | 13 ++++++++++++
 .../class_create-6.3-descriptor.py            | 17 +++++++++++++++
 .../internal_bench/class_create-7-inherit.py  | 14 +++++++++++++
 .../class_create-7.1-inherit_initsubclass.py  | 16 ++++++++++++++
 .../class_create-8-metaclass_setname.py       | 17 +++++++++++++++
 .../class_create-8.1-metaclass_setname5.py    | 21 +++++++++++++++++++
 18 files changed, 253 insertions(+)
 create mode 100644 tests/internal_bench/class_create-0-empty.py
 create mode 100644 tests/internal_bench/class_create-1-slots.py
 create mode 100644 tests/internal_bench/class_create-1.1-slots5.py
 create mode 100644 tests/internal_bench/class_create-2-classattr.py
 create mode 100644 tests/internal_bench/class_create-2.1-classattr5.py
 create mode 100644 tests/internal_bench/class_create-2.3-classattr5objs.py
 create mode 100644 tests/internal_bench/class_create-3-instancemethod.py
 create mode 100644 tests/internal_bench/class_create-4-classmethod.py
 create mode 100644 tests/internal_bench/class_create-4.1-classmethod_implicit.py
 create mode 100644 tests/internal_bench/class_create-5-staticmethod.py
 create mode 100644 tests/internal_bench/class_create-6-getattribute.py
 create mode 100644 tests/internal_bench/class_create-6.1-getattr.py
 create mode 100644 tests/internal_bench/class_create-6.2-property.py
 create mode 100644 tests/internal_bench/class_create-6.3-descriptor.py
 create mode 100644 tests/internal_bench/class_create-7-inherit.py
 create mode 100644 tests/internal_bench/class_create-7.1-inherit_initsubclass.py
 create mode 100644 tests/internal_bench/class_create-8-metaclass_setname.py
 create mode 100644 tests/internal_bench/class_create-8.1-metaclass_setname5.py

diff --git a/tests/internal_bench/class_create-0-empty.py b/tests/internal_bench/class_create-0-empty.py
new file mode 100644
index 0000000000000..1fd8ccd925715
--- /dev/null
+++ b/tests/internal_bench/class_create-0-empty.py
@@ -0,0 +1,11 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-1-slots.py b/tests/internal_bench/class_create-1-slots.py
new file mode 100644
index 0000000000000..9b3e4b9570da2
--- /dev/null
+++ b/tests/internal_bench/class_create-1-slots.py
@@ -0,0 +1,12 @@
+import bench
+
+
+def test(num):
+    l = ["x"]
+    for i in range(num // 40):
+
+        class X:
+            __slots__ = l
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-1.1-slots5.py b/tests/internal_bench/class_create-1.1-slots5.py
new file mode 100644
index 0000000000000..ccac77dec9daa
--- /dev/null
+++ b/tests/internal_bench/class_create-1.1-slots5.py
@@ -0,0 +1,12 @@
+import bench
+
+
+def test(num):
+    l = ["a", "b", "c", "d", "x"]
+    for i in range(num // 40):
+
+        class X:
+            __slots__ = l
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-2-classattr.py b/tests/internal_bench/class_create-2-classattr.py
new file mode 100644
index 0000000000000..049a7dab170c1
--- /dev/null
+++ b/tests/internal_bench/class_create-2-classattr.py
@@ -0,0 +1,11 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            x = 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-2.1-classattr5.py b/tests/internal_bench/class_create-2.1-classattr5.py
new file mode 100644
index 0000000000000..5051e7dcca70d
--- /dev/null
+++ b/tests/internal_bench/class_create-2.1-classattr5.py
@@ -0,0 +1,15 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            a = 0
+            b = 0
+            c = 0
+            d = 0
+            x = 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-2.3-classattr5objs.py b/tests/internal_bench/class_create-2.3-classattr5objs.py
new file mode 100644
index 0000000000000..74540865dcd14
--- /dev/null
+++ b/tests/internal_bench/class_create-2.3-classattr5objs.py
@@ -0,0 +1,20 @@
+import bench
+
+
+class Class:
+    pass
+
+
+def test(num):
+    instance = Class()
+    for i in range(num // 40):
+
+        class X:
+            a = instance
+            b = instance
+            c = instance
+            d = instance
+            x = instance
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-3-instancemethod.py b/tests/internal_bench/class_create-3-instancemethod.py
new file mode 100644
index 0000000000000..e8c201cb2c3c6
--- /dev/null
+++ b/tests/internal_bench/class_create-3-instancemethod.py
@@ -0,0 +1,12 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            def x(self):
+                pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-4-classmethod.py b/tests/internal_bench/class_create-4-classmethod.py
new file mode 100644
index 0000000000000..f34962bc67117
--- /dev/null
+++ b/tests/internal_bench/class_create-4-classmethod.py
@@ -0,0 +1,13 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            @classmethod
+            def x(cls):
+                pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-4.1-classmethod_implicit.py b/tests/internal_bench/class_create-4.1-classmethod_implicit.py
new file mode 100644
index 0000000000000..f2d1fcfd18821
--- /dev/null
+++ b/tests/internal_bench/class_create-4.1-classmethod_implicit.py
@@ -0,0 +1,12 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            def __new__(cls):
+                pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-5-staticmethod.py b/tests/internal_bench/class_create-5-staticmethod.py
new file mode 100644
index 0000000000000..0633556667544
--- /dev/null
+++ b/tests/internal_bench/class_create-5-staticmethod.py
@@ -0,0 +1,13 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            @staticmethod
+            def x():
+                pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-6-getattribute.py b/tests/internal_bench/class_create-6-getattribute.py
new file mode 100644
index 0000000000000..10a4fe7ce8d9f
--- /dev/null
+++ b/tests/internal_bench/class_create-6-getattribute.py
@@ -0,0 +1,12 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            def __getattribute__(self, name):
+                pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-6.1-getattr.py b/tests/internal_bench/class_create-6.1-getattr.py
new file mode 100644
index 0000000000000..b4b9ba2f5525b
--- /dev/null
+++ b/tests/internal_bench/class_create-6.1-getattr.py
@@ -0,0 +1,12 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            def __getattr__(self, name):
+                pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-6.2-property.py b/tests/internal_bench/class_create-6.2-property.py
new file mode 100644
index 0000000000000..cf847b6dc9c9f
--- /dev/null
+++ b/tests/internal_bench/class_create-6.2-property.py
@@ -0,0 +1,13 @@
+import bench
+
+
+def test(num):
+    for i in range(num // 40):
+
+        class X:
+            @property
+            def x(self):
+                pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-6.3-descriptor.py b/tests/internal_bench/class_create-6.3-descriptor.py
new file mode 100644
index 0000000000000..7b0a635726380
--- /dev/null
+++ b/tests/internal_bench/class_create-6.3-descriptor.py
@@ -0,0 +1,17 @@
+import bench
+
+
+class D:
+    def __get__(self, instance, owner=None):
+        pass
+
+
+def test(num):
+    descriptor = D()
+    for i in range(num // 40):
+
+        class X:
+            x = descriptor
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-7-inherit.py b/tests/internal_bench/class_create-7-inherit.py
new file mode 100644
index 0000000000000..f48fb215e0ab8
--- /dev/null
+++ b/tests/internal_bench/class_create-7-inherit.py
@@ -0,0 +1,14 @@
+import bench
+
+
+def test(num):
+    class B:
+        pass
+
+    for i in range(num // 40):
+
+        class X(B):
+            pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-7.1-inherit_initsubclass.py b/tests/internal_bench/class_create-7.1-inherit_initsubclass.py
new file mode 100644
index 0000000000000..0660fa86258fe
--- /dev/null
+++ b/tests/internal_bench/class_create-7.1-inherit_initsubclass.py
@@ -0,0 +1,16 @@
+import bench
+
+
+def test(num):
+    class B:
+        @classmethod
+        def __init_subclass__(cls):
+            pass
+
+    for i in range(num // 40):
+
+        class X(B):
+            pass
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-8-metaclass_setname.py b/tests/internal_bench/class_create-8-metaclass_setname.py
new file mode 100644
index 0000000000000..e4515b54279d1
--- /dev/null
+++ b/tests/internal_bench/class_create-8-metaclass_setname.py
@@ -0,0 +1,17 @@
+import bench
+
+
+class D:
+    def __set_name__(self, owner, name):
+        pass
+
+
+def test(num):
+    descriptor = D()
+    for i in range(num // 40):
+
+        class X:
+            x = descriptor
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_create-8.1-metaclass_setname5.py b/tests/internal_bench/class_create-8.1-metaclass_setname5.py
new file mode 100644
index 0000000000000..5daa3f8471bca
--- /dev/null
+++ b/tests/internal_bench/class_create-8.1-metaclass_setname5.py
@@ -0,0 +1,21 @@
+import bench
+
+
+class D:
+    def __set_name__(self, owner, name):
+        pass
+
+
+def test(num):
+    descriptor = D()
+    for i in range(num // 40):
+
+        class X:
+            a = descriptor
+            b = descriptor
+            c = descriptor
+            d = descriptor
+            x = descriptor
+
+
+bench.run(test)

From b9d6d6af4b1ac1a900351bebe5294604fea0119b Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Sun, 20 Jul 2025 12:07:05 -0400
Subject: [PATCH 2591/3129] tests/internal_bench/var: Benchmark descriptor
 access.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 .../var-6.2-instance-speciallookup.py         | 19 ++++++++++++++++++
 .../var-6.3-instance-property.py              | 17 ++++++++++++++++
 .../var-6.4-instance-descriptor.py            | 20 +++++++++++++++++++
 .../var-6.5-instance-getattr.py               | 16 +++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 tests/internal_bench/var-6.2-instance-speciallookup.py
 create mode 100644 tests/internal_bench/var-6.3-instance-property.py
 create mode 100644 tests/internal_bench/var-6.4-instance-descriptor.py
 create mode 100644 tests/internal_bench/var-6.5-instance-getattr.py

diff --git a/tests/internal_bench/var-6.2-instance-speciallookup.py b/tests/internal_bench/var-6.2-instance-speciallookup.py
new file mode 100644
index 0000000000000..71845f3aaa23c
--- /dev/null
+++ b/tests/internal_bench/var-6.2-instance-speciallookup.py
@@ -0,0 +1,19 @@
+import bench
+
+
+class Foo:
+    def __init__(self):
+        self.num = 20000000
+
+    def __getattr__(self, name):  # just trigger the 'special lookups' flag on the class
+        pass
+
+
+def test(num):
+    o = Foo()
+    i = 0
+    while i < o.num:
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-6.3-instance-property.py b/tests/internal_bench/var-6.3-instance-property.py
new file mode 100644
index 0000000000000..b4426ef7928e1
--- /dev/null
+++ b/tests/internal_bench/var-6.3-instance-property.py
@@ -0,0 +1,17 @@
+import bench
+
+
+class Foo:
+    @property
+    def num(self):
+        return 20000000
+
+
+def test(num):
+    o = Foo()
+    i = 0
+    while i < o.num:
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-6.4-instance-descriptor.py b/tests/internal_bench/var-6.4-instance-descriptor.py
new file mode 100644
index 0000000000000..b4df69f878f10
--- /dev/null
+++ b/tests/internal_bench/var-6.4-instance-descriptor.py
@@ -0,0 +1,20 @@
+import bench
+
+
+class Descriptor:
+    def __get__(self, instance, owner=None):
+        return 20000000
+
+
+class Foo:
+    num = Descriptor()
+
+
+def test(num):
+    o = Foo()
+    i = 0
+    while i < o.num:
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-6.5-instance-getattr.py b/tests/internal_bench/var-6.5-instance-getattr.py
new file mode 100644
index 0000000000000..3b2ef6721105f
--- /dev/null
+++ b/tests/internal_bench/var-6.5-instance-getattr.py
@@ -0,0 +1,16 @@
+import bench
+
+
+class Foo:
+    def __getattr__(self, name):
+        return 20000000
+
+
+def test(num):
+    o = Foo()
+    i = 0
+    while i < o.num:
+        i += 1
+
+
+bench.run(test)

From 88cb6bc818546e7fe8b862c784e1e4a6b8a12b8a Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Sun, 20 Jul 2025 13:47:01 -0400
Subject: [PATCH 2592/3129] tests/run-internalbench.py: Allow running
 internalbench on hardware.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/run-internalbench.py | 101 ++++++++++++++++++++++++++++---------
 tests/run-tests.py         |  52 +++++++++++--------
 2 files changed, 109 insertions(+), 44 deletions(-)

diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index c9f783e474c9c..99c6304afe9d6 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -8,6 +8,10 @@
 from glob import glob
 from collections import defaultdict
 
+run_tests_module = __import__("run-tests")
+sys.path.append(run_tests_module.base_path("../tools"))
+import pyboard
+
 if os.name == "nt":
     MICROPYTHON = os.getenv(
         "MICROPY_MICROPYTHON", "../ports/windows/build-standard/micropython.exe"
@@ -15,13 +19,39 @@
 else:
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
+injected_bench_code = b"""
+import time
+
+class bench_class:
+    ITERS = 20000000
+
+    @staticmethod
+    def run(test):
+        t = time.ticks_us()
+        test(bench_class.ITERS)
+        t = time.ticks_diff(time.ticks_us(), t)
+        s, us = divmod(t, 1_000_000)
+        print("{}.{:06}".format(s, us))
+
+import sys
+sys.modules['bench'] = bench_class
+"""
+
 
-def run_tests(pyb, test_dict):
+def execbench(pyb, filename, iters):
+    with open(filename, "rb") as f:
+        pyfile = f.read()
+    code = (injected_bench_code + pyfile).replace(b"20000000", str(iters).encode("utf-8"))
+    return pyb.exec(code).replace(b"\r\n", b"\n")
+
+
+def run_tests(pyb, test_dict, iters):
     test_count = 0
     testcase_count = 0
 
     for base_test, tests in sorted(test_dict.items()):
         print(base_test + ":")
+        baseline = None
         for test_file in tests:
             # run MicroPython
             if pyb is None:
@@ -36,20 +66,25 @@ def run_tests(pyb, test_dict):
                 # run on pyboard
                 pyb.enter_raw_repl()
                 try:
-                    output_mupy = pyb.execfile(test_file).replace(b"\r\n", b"\n")
+                    output_mupy = execbench(pyb, test_file[0], iters)
                 except pyboard.PyboardError:
                     output_mupy = b"CRASH"
 
-            output_mupy = float(output_mupy.strip())
+            try:
+                output_mupy = float(output_mupy.strip())
+            except ValueError:
+                output_mupy = -1
             test_file[1] = output_mupy
             testcase_count += 1
 
-        test_count += 1
-        baseline = None
-        for t in tests:
             if baseline is None:
-                baseline = t[1]
-            print("    %.3fs (%+06.2f%%) %s" % (t[1], (t[1] * 100 / baseline) - 100, t[0]))
+                baseline = test_file[1]
+            print(
+                "    %.3fs (%+06.2f%%) %s"
+                % (test_file[1], (test_file[1] * 100 / baseline) - 100, test_file[0])
+            )
+
+        test_count += 1
 
     print("{} tests performed ({} individual testcases)".format(test_count, testcase_count))
 
@@ -58,27 +93,47 @@ def run_tests(pyb, test_dict):
 
 
 def main():
-    cmd_parser = argparse.ArgumentParser(description="Run tests for MicroPython.")
-    cmd_parser.add_argument("--pyboard", action="store_true", help="run the tests on the pyboard")
+    cmd_parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=f"""Run and manage tests for MicroPython.
+
+{run_tests_module.test_instance_description}
+{run_tests_module.test_directory_description}
+""",
+        epilog=run_tests_module.test_instance_epilog,
+    )
+    cmd_parser.add_argument(
+        "-t", "--test-instance", default="unix", help="the MicroPython instance to test"
+    )
+    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(
+        "-I",
+        "--iters",
+        type=int,
+        default=200_000,
+        help="number of test iterations, only for remote instances (default 200,000)",
+    )
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     args = cmd_parser.parse_args()
 
     # Note pyboard support is copied over from run-tests.py, not tests, and likely needs revamping
-    if args.pyboard:
-        import pyboard
-
-        pyb = pyboard.Pyboard("/dev/ttyACM0")
-        pyb.enter_raw_repl()
-    else:
-        pyb = None
+    pyb = run_tests_module.get_test_instance(
+        args.test_instance, args.baudrate, args.user, args.password
+    )
 
     if len(args.files) == 0:
-        if pyb is None:
-            # run PC tests
-            test_dirs = ("internal_bench",)
+        if args.test_dirs:
+            test_dirs = tuple(args.test_dirs)
         else:
-            # run pyboard tests
-            test_dirs = ("basics", "float", "pyb")
+            test_dirs = ("internal_bench",)
+
         tests = sorted(
             test_file
             for test_files in (glob("{}/*.py".format(dir)) for dir in test_dirs)
@@ -95,7 +150,7 @@ def main():
             continue
         test_dict[m.group(1)].append([t, None])
 
-    if not run_tests(pyb, test_dict):
+    if not run_tests(pyb, test_dict, args.iters):
         sys.exit(1)
 
 
diff --git a/tests/run-tests.py b/tests/run-tests.py
index a428665db03e0..59aec327fa063 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1145,29 +1145,11 @@ def __call__(self, parser, args, value, option):
         args.filters.append((option, re.compile(value)))
 
 
-def main():
-    global injected_import_hook_code
-
-    cmd_parser = argparse.ArgumentParser(
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        description="""Run and manage tests for MicroPython.
-
+test_instance_description = """\
 By default the tests are run against the unix port of MicroPython. To run it
 against something else, use the -t option.  See below for details.
-
-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.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.py produces a pair of <test>.out and <test>.exp files in the result
-directory with the MicroPython output and the expectations, respectively.
-""",
-        epilog="""\
+"""
+test_instance_epilog = """\
 The -t option accepts the following for the test instance:
 - unix - use the unix port of MicroPython, specified by the MICROPY_MICROPYTHON
   environment variable (which defaults to the standard variant of either the unix
@@ -1183,7 +1165,35 @@ def main():
 - execpty:<command> - execute a command and attach to the printed /dev/pts/<n> device
 - <a>.<b>.<c>.<d> - connect to the given IPv4 address
 - anything else specifies a serial port
+"""
 
+test_directory_description = """\
+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.
+"""
+
+
+def main():
+    global injected_import_hook_code
+
+    cmd_parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=f"""Run and manage tests for MicroPython.
+
+{test_instance_description}
+{test_directory_description}
+
+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.py produces a pair of <test>.out and <test>.exp files in the result
+directory with the MicroPython output and the expectations, respectively.
+""",
+        epilog=f"""\
+{test_instance_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:

From ca9916968c06437fa39549b0995ceb811209f994 Mon Sep 17 00:00:00 2001
From: TianShuang Ke <QinYUN575@Gmail.com>
Date: Thu, 27 Jun 2024 22:36:18 +0800
Subject: [PATCH 2593/3129] esp32: Add support for ESP32-C2 (aka ESP8684).

Includes:
esp32/esp32c2: Adapt to target chip ESP32C2.
esp32/esp32c2: Fix heap size is too small to enable Bluetooth.

Signed-off-by: TianShuangKe <qinyun575@gmail.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/esp32/quickref.rst                       |  3 +++
 ports/esp32/README.md                         |  4 ++--
 .../esp32/boards/ESP32_GENERIC_C2/board.json  | 22 +++++++++++++++++++
 ports/esp32/boards/ESP32_GENERIC_C2/board.md  |  3 +++
 .../ESP32_GENERIC_C2/mpconfigboard.cmake      |  7 ++++++
 .../boards/ESP32_GENERIC_C2/mpconfigboard.h   |  7 ++++++
 ports/esp32/boards/sdkconfig.base             |  6 ++---
 ports/esp32/boards/sdkconfig.c2               | 11 ++++++++++
 ports/esp32/esp32_rmt.c                       |  6 ++++-
 ports/esp32/machine_adc.c                     |  6 +++++
 ports/esp32/machine_bitstream.c               | 11 ++++++----
 ports/esp32/machine_i2c.c                     |  6 ++++-
 ports/esp32/machine_pin.c                     |  2 +-
 ports/esp32/machine_pin.h                     | 17 ++++++++++++++
 ports/esp32/modesp32.c                        |  2 ++
 ports/esp32/modmachine.c                      |  6 +++++
 ports/esp32/mpconfigport.h                    |  4 +++-
 tests/extmod/machine_spi_rate.py              |  2 +-
 tests/ports/esp32/esp32_idf_heap_info.py      | 17 ++++++++++++--
 tests/ports/esp32/esp32_idf_heap_info.py.exp  |  4 ++--
 20 files changed, 128 insertions(+), 18 deletions(-)
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C2/board.json
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C2/board.md
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
 create mode 100644 ports/esp32/boards/sdkconfig.c2

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index c394414a76f51..49f546a17c03f 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -802,6 +802,9 @@ The RMT is ESP32-specific and allows generation of accurate digital pulses with
     # The channel resolution is 100ns (1/(source_freq/clock_div)).
     r.write_pulses((1, 20, 2, 40), 0) # Send 0 for 100ns, 1 for 2000ns, 0 for 200ns, 1 for 4000ns
 
+The ESP32-C2 family does not include any RMT peripheral, so this class is
+unavailable on those SoCs.
+
 OneWire driver
 --------------
 
diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 4adff66328df2..dd4584772cf84 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -5,8 +5,8 @@ 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.
 
-Currently supports ESP32, ESP32-C3, ESP32-C6, ESP32-S2 and ESP32-S3
-(ESP8266 is supported by a separate MicroPython port).
+Currently supports ESP32, ESP32-C2 (aka ESP8684), ESP32-C3, ESP32-C6, ESP32-S2
+and ESP32-S3 (ESP8266 is supported by a separate MicroPython port).
 
 Supported features include:
 - REPL (Python prompt) over UART0.
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/board.json b/ports/esp32/boards/ESP32_GENERIC_C2/board.json
new file mode 100644
index 0000000000000..da0931a0e4459
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
+    "docs": "",
+    "features": [
+        "BLE",
+        "External Flash",
+        "WiFi"
+    ],
+    "images": [
+        "esp32c2_devkitmini.jpg"
+    ],
+    "mcu": "esp32c2",
+    "product": "ESP32-C2",
+    "thumbnail": "",
+    "url": "https://www.espressif.com/en/products/modules",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/board.md b/ports/esp32/boards/ESP32_GENERIC_C2/board.md
new file mode 100644
index 0000000000000..b8ed10069feb3
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/board.md
@@ -0,0 +1,3 @@
+The following files are firmware images that should work on most ESP32-C2-based
+boards with at least 4MiB of flash and 26MHz crystal frequency. This includes
+ESP8684-WROOM and ESP8684-MINI modules.
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
new file mode 100644
index 0000000000000..e9d4989959f0f
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
@@ -0,0 +1,7 @@
+set(IDF_TARGET esp32c2)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/sdkconfig.c2
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
new file mode 100644
index 0000000000000..ee918aaba5493
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
@@ -0,0 +1,7 @@
+// This configuration is for a generic ESP32C2 board with 4MiB (or more) of flash.
+
+#define MICROPY_HW_BOARD_NAME               "ESP32C2 module"
+#define MICROPY_HW_MCU_NAME                 "ESP32C2"
+
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+#define MICROPY_PY_MACHINE_I2S              (0)
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 30740af434ddb..69abc63bdf008 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -125,9 +125,9 @@ CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL=y
 CONFIG_ETH_SPI_ETHERNET_DM9051=y
 
 # Using newlib "nano" formatting saves size on SoCs where "nano" formatting
-# functions are in ROM. Note some newer chips (c2,c6) have "full" newlib
-# formatting in ROM instead and should override this, check
-# ESP_ROM_HAS_NEWLIB_NANO_FORMAT.
+# functions are in ROM. ESP32-C6 (and possibly other new chips) have "full"
+# newlib formatting in ROM instead and should override this, check
+# ESP_ROM_HAS_NEWLIB_NANO_FORMAT in ESP-IDF.
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 # IRAM/DRAM split protection is a memory protection feature on some parts
diff --git a/ports/esp32/boards/sdkconfig.c2 b/ports/esp32/boards/sdkconfig.c2
new file mode 100644
index 0000000000000..e85bcdba35af2
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.c2
@@ -0,0 +1,11 @@
+#
+# Main XTAL Config
+#
+CONFIG_XTAL_FREQ_26=y
+# CONFIG_XTAL_FREQ_40 is not set
+CONFIG_XTAL_FREQ=26
+# Increase NimBLE stack size for functional BT
+CONFIG_BT_NIMBLE_TASK_STACK_SIZE=5120
+
+# Decrease mDNS stack size to save RAM
+CONFIG_MDNS_TASK_STACK_SIZE=3072
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 6890e16bf79f7..f3bfbecdd11d1 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -30,6 +30,8 @@
 #include "modesp32.h"
 
 #include "esp_task.h"
+
+#if SOC_RMT_SUPPORTED
 #include "driver/rmt.h"
 
 // This exposes the ESP32's RMT module to MicroPython. RMT is provided by the Espressif ESP-IDF:
@@ -105,7 +107,7 @@ esp_err_t rmt_driver_install_core1(uint8_t channel_id) {
     return rmt_driver_install(channel_id, 0, 0);
 }
 
-#endif
+#endif // MP_TASK_COREID==0
 
 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[] = {
@@ -387,3 +389,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, esp32_rmt_print,
     locals_dict, &esp32_rmt_locals_dict
     );
+
+#endif // SOC_RMT_SUPPORTED
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 02acaa22da035..c5575d45ec7cc 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -87,6 +87,12 @@ static const machine_adc_obj_t madc_obj[] = {
     {{&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_ESP32C2
+    {{&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},
     #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},
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index 6296ff06708c1..ed7fcc407df6c 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -90,6 +90,7 @@ static void IRAM_ATTR machine_bitstream_high_low_bitbang(mp_hal_pin_obj_t pin, u
     mp_hal_quiet_timing_exit(irq_state);
 }
 
+#if SOC_RMT_SUPPORTED
 /******************************************************************************/
 // RMT implementation
 
@@ -172,16 +173,18 @@ static void machine_bitstream_high_low_rmt(mp_hal_pin_obj_t pin, uint32_t *timin
     // Cancel RMT output to GPIO pin.
     esp_rom_gpio_connect_out_signal(pin, SIG_GPIO_OUT_IDX, false, false);
 }
-
+#endif
 /******************************************************************************/
 // 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 {
+    #if SOC_RMT_SUPPORTED
+    if (esp32_rmt_bitstream_channel_id >= 0) {
         machine_bitstream_high_low_rmt(pin, timing_ns, buf, len, esp32_rmt_bitstream_channel_id);
+        return;
     }
+    #endif
+    machine_bitstream_high_low_bitbang(pin, timing_ns, buf, len);
 }
 
 #endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 259101ee7e145..4a5fd717631a9 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -55,7 +55,11 @@
 #endif
 
 #if SOC_I2C_SUPPORT_XTAL
-#define I2C_SCLK_FREQ XTAL_CLK_FREQ
+#if CONFIG_XTAL_FREQ > 0
+#define I2C_SCLK_FREQ (CONFIG_XTAL_FREQ * 1000000)
+#else
+#error "I2C uses XTAL but no configured freq"
+#endif // CONFIG_XTAL_FREQ
 #elif SOC_I2C_SUPPORT_APB
 #define I2C_SCLK_FREQ APB_CLK_FREQ
 #else
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 4ab79f0a26460..9999223b59d50 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -152,7 +152,7 @@ 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(index)) {
-            #if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
+            #if !(CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
             rtc_gpio_deinit(index);
             #endif
         }
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
index 47f1ddebebf44..6fe9ef0e7787b 100644
--- a/ports/esp32/machine_pin.h
+++ b/ports/esp32/machine_pin.h
@@ -71,6 +71,23 @@
 #define MICROPY_HW_ENABLE_GPIO38 (1)
 #define MICROPY_HW_ENABLE_GPIO39 (1)
 
+#elif CONFIG_IDF_TARGET_ESP32C2
+
+#define MICROPY_HW_ENABLE_GPIO0 (1)
+#define MICROPY_HW_ENABLE_GPIO1 (1)
+#define MICROPY_HW_ENABLE_GPIO2 (1)
+#define MICROPY_HW_ENABLE_GPIO3 (1)
+#define MICROPY_HW_ENABLE_GPIO4 (1)
+#define MICROPY_HW_ENABLE_GPIO5 (1)
+#define MICROPY_HW_ENABLE_GPIO6 (1)
+#define MICROPY_HW_ENABLE_GPIO7 (1)
+#define MICROPY_HW_ENABLE_GPIO8 (1)
+#define MICROPY_HW_ENABLE_GPIO9 (1)
+#define MICROPY_HW_ENABLE_GPIO10 (1)
+#define MICROPY_HW_ENABLE_GPIO18 (1)
+#define MICROPY_HW_ENABLE_GPIO19 (1) // UART0_RXD
+#define MICROPY_HW_ENABLE_GPIO20 (1) // UART0_TXD
+
 #elif CONFIG_IDF_TARGET_ESP32C3
 
 #define MICROPY_HW_ENABLE_GPIO0 (1)
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index fcd6ed9fa83b8..bf7aec3944228 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -299,7 +299,9 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_NVS), MP_ROM_PTR(&esp32_nvs_type) },
     { MP_ROM_QSTR(MP_QSTR_Partition), MP_ROM_PTR(&esp32_partition_type) },
+    #if SOC_RMT_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_RMT), MP_ROM_PTR(&esp32_rmt_type) },
+    #endif
     #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     { MP_ROM_QSTR(MP_QSTR_ULP), MP_ROM_PTR(&esp32_ulp_type) },
     #endif
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 0d7ea44c66960..06360e8e8999c 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -99,6 +99,11 @@ static mp_obj_t mp_machine_get_freq(void) {
 
 static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
     mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
+    #if CONFIG_IDF_TARGET_ESP32C2
+    if (freq != 80 && freq != 120) {
+        mp_raise_ValueError(MP_ERROR_TEXT("frequency must be 80MHz or 120MHz"));
+    }
+    #else
     if (freq != 20 && freq != 40 && freq != 80 && freq != 160
         #if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
         && freq != 240
@@ -110,6 +115,7 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
         mp_raise_ValueError(MP_ERROR_TEXT("frequency must be 20MHz, 40MHz, 80Mhz, 160MHz or 240MHz"));
         #endif
     }
+    #endif
     esp_pm_config_t pm = {
         .max_freq_mhz = freq,
         .min_freq_mhz = freq,
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 721f22de11c55..142c1b1be2eb6 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -32,7 +32,7 @@
 #ifndef MICROPY_GC_INITIAL_HEAP_SIZE
 #if CONFIG_IDF_TARGET_ESP32
 #define MICROPY_GC_INITIAL_HEAP_SIZE        (56 * 1024)
-#elif CONFIG_IDF_TARGET_ESP32S2 && !CONFIG_SPIRAM
+#elif CONFIG_IDF_TARGET_ESP32C2 || (CONFIG_IDF_TARGET_ESP32S2 && !CONFIG_SPIRAM)
 #define MICROPY_GC_INITIAL_HEAP_SIZE        (36 * 1024)
 #else
 #define MICROPY_GC_INITIAL_HEAP_SIZE        (64 * 1024)
@@ -165,6 +165,8 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32s2"
 #elif CONFIG_IDF_TARGET_ESP32S3
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32s3"
+#elif CONFIG_IDF_TARGET_ESP32C2
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c2"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c3"
 #elif CONFIG_IDF_TARGET_ESP32C6
diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
index c65095f22a1a5..fe15b66fe648a 100644
--- a/tests/extmod/machine_spi_rate.py
+++ b/tests/extmod/machine_spi_rate.py
@@ -25,7 +25,7 @@
     spi_instances = ((0, Pin(18), Pin(19), Pin(16)),)
 elif "esp32" in sys.platform:
     impl = str(sys.implementation)
-    if "ESP32C3" in impl or "ESP32C6" in impl:
+    if any(soc in impl for soc in ("ESP32C2", "ESP32C3", "ESP32C6")):
         spi_instances = ((1, Pin(4), Pin(5), Pin(6)),)
     else:
         spi_instances = ((1, Pin(18), Pin(19), Pin(21)), (2, Pin(18), Pin(19), Pin(21)))
diff --git a/tests/ports/esp32/esp32_idf_heap_info.py b/tests/ports/esp32/esp32_idf_heap_info.py
index fdd89161f4310..2f45295938df7 100644
--- a/tests/ports/esp32/esp32_idf_heap_info.py
+++ b/tests/ports/esp32/esp32_idf_heap_info.py
@@ -5,6 +5,19 @@
     print("SKIP")
     raise SystemExit
 
+import sys
+
+# idf_heap_info() is expected to return at least this many
+# regions for HEAP_DATA and HEAP_EXEC, respectively.
+MIN_DATA = 3
+MIN_EXEC = 3
+
+impl = str(sys.implementation)
+if "ESP32C2" in impl:
+    # ESP32-C2 is less fragmented (yay!) and only has two memory regions
+    MIN_DATA = 2
+    MIN_EXEC = 2
+
 
 # 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
@@ -22,12 +35,12 @@ def chk_heap(kind, regions):
 
 # try getting heap regions
 regions = esp32.idf_heap_info(esp32.HEAP_DATA)
-print("HEAP_DATA >2:", len(regions) > 2)
+print("HEAP_DATA >=MIN:", len(regions) >= MIN_DATA)
 chk_heap("HEAP_DATA", regions)
 
 # try getting code regions
 regions = esp32.idf_heap_info(esp32.HEAP_EXEC)
-print("HEAP_EXEC >2:", len(regions) > 2)
+print("HEAP_EXEC >=MIN:", len(regions) >= MIN_EXEC)
 chk_heap("HEAP_EXEC", regions)
 
 # try invalid param
diff --git a/tests/ports/esp32/esp32_idf_heap_info.py.exp b/tests/ports/esp32/esp32_idf_heap_info.py.exp
index 2b63bf3259fc6..7fc50fc1624df 100644
--- a/tests/ports/esp32/esp32_idf_heap_info.py.exp
+++ b/tests/ports/esp32/esp32_idf_heap_info.py.exp
@@ -1,5 +1,5 @@
-HEAP_DATA >2: True
+HEAP_DATA >=MIN: True
 HEAP_DATA [True, True, True, True]
-HEAP_EXEC >2: True
+HEAP_EXEC >=MIN: True
 HEAP_EXEC [True, True, True, True]
 []

From 77c9eb7795da13dfe499f45f19e867362799b38a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 25 Jul 2025 13:22:00 +1000
Subject: [PATCH 2594/3129] esp32: Add "Free RAM" optimisation config flags.

This is necessary for ESP32-C2 Wi-Fi & BT to work reliably (and for TLS to
work at all). On IDF 5.4.2 the free static RAM goes from 60KB to 100KB, and
there will also be a reduction in lwIP & Wi-Fi memory use at runtime.

The performance trade-off seems low for most use cases, although it will
probably be significant for certain combinations of load (i.e. heavy
TCP/IP, heavy BT throughput, and some peripheral driver functions).

Added as a set of config flags because this is potentially useful on other
SoCs where the goal is to maximise RAM available for MicroPython.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../ESP32_GENERIC_C2/mpconfigboard.cmake      |  2 +
 ports/esp32/boards/sdkconfig.free_ram         | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 ports/esp32/boards/sdkconfig.free_ram

diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
index e9d4989959f0f..d935c22b886a0 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
@@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
     boards/sdkconfig.c2
+    # C2 has unusably low free RAM without these optimisations
+    boards/sdkconfig.free_ram
 )
diff --git a/ports/esp32/boards/sdkconfig.free_ram b/ports/esp32/boards/sdkconfig.free_ram
new file mode 100644
index 0000000000000..36c6455e3e6da
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.free_ram
@@ -0,0 +1,44 @@
+# This is a collection of sdkconfig settings that frees RAM at runtime,
+# at the expense of performance.
+#
+# Not all options will work on all SoC families, but adding this sdkconfig
+# set to a board should increase the free memory.
+#
+# - Many options free IRAM, which on most ESP32 families leads to
+#   free DRAM at runtime (original ESP32 and S2 may not).
+# - The other options reduce runtime DRAM usage from the heap.
+#
+# IMPORTANT: If you enable these config settings on a custom build then you may
+# encounter bugs or crashes. If you choose to open a MicroPython bug report then
+# please mention these config settings!
+
+# Place functions in flash whenever possible to free IRAM
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y
+
+# Use the SPI flash functions in ROM (when available). This may limit flash chip
+# support and cause issues with some flash chips. Each SoC family has different
+# set of chip support baked into ROM.
+CONFIG_SPI_FLASH_ROM_IMPL=y
+
+# Run the Bluetooth controller from flash not IRAM
+CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY=y
+
+# lwIP adjustments to limit runtime memory usage (at expense of performance, and/or
+# a reduction in number of active connections).
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=16
+CONFIG_LWIP_MAX_SOCKETS=6
+CONFIG_LWIP_MAX_ACTIVE_TCP=8
+
+# These lwIP values are recommended to scale relative to the Wi-Fi buffer numbers
+CONFIG_LWIP_TCP_WND_DEFAULT=3072
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=3072
+
+# Wi-Fi adjustments to reduce peak runtime memory usage, at expense of peak
+# performance
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=12
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=12
+CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=2
+CONFIG_ESP_WIFI_RX_BA_WIN=12

From d4399b3230c0020d0f5bc2dd42f19c4579f3bf3e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Jul 2025 12:35:24 +1000
Subject: [PATCH 2595/3129] esp32: Fix first line ESP32-C2 serial output after
 reset or deepsleep.

ESP32-C2 ROM prints at 74880bps (same as ESP8266), so need a newline
before first MicroPython output to avoid it being appended on end of
a line of noise.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../boards/ESP32_GENERIC_C2/board_init.c      | 35 +++++++++++++++++++
 .../ESP32_GENERIC_C2/mpconfigboard.cmake      |  5 +++
 .../boards/ESP32_GENERIC_C2/mpconfigboard.h   |  3 ++
 ports/esp32/boards/sdkconfig.c2               |  6 ++++
 4 files changed, 49 insertions(+)
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C2/board_init.c

diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/board_init.c b/ports/esp32/boards/ESP32_GENERIC_C2/board_init.c
new file mode 100644
index 0000000000000..355fe2bf0b24d
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/board_init.c
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 "py/mpconfig.h"
+
+void GENERIC_C2_board_startup(void) {
+    // With a 26MHz crystal the ESP32-C2 ROM prints output at 74880 which is
+    // interpreted mostly as noise, then boot.py output and/or the REPL banner
+    // prints at the end of a line of noise unless we inject a newline here
+    printf("\n");
+
+    boardctrl_startup();
+}
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
index d935c22b886a0..7a8b0e0b3d4af 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
@@ -7,3 +7,8 @@ set(SDKCONFIG_DEFAULTS
     # C2 has unusably low free RAM without these optimisations
     boards/sdkconfig.free_ram
 )
+
+set(MICROPY_SOURCE_BOARD
+    ${MICROPY_BOARD_DIR}/board_init.c
+)
+
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
index ee918aaba5493..999465373e817 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
@@ -5,3 +5,6 @@
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
+
+#define MICROPY_BOARD_STARTUP               GENERIC_C2_board_startup
+void GENERIC_C2_board_startup(void);
diff --git a/ports/esp32/boards/sdkconfig.c2 b/ports/esp32/boards/sdkconfig.c2
index e85bcdba35af2..194d815b6f27d 100644
--- a/ports/esp32/boards/sdkconfig.c2
+++ b/ports/esp32/boards/sdkconfig.c2
@@ -4,6 +4,12 @@
 CONFIG_XTAL_FREQ_26=y
 # CONFIG_XTAL_FREQ_40 is not set
 CONFIG_XTAL_FREQ=26
+
+# When using 26MHz crystal the baud rate defaults to 74880,
+# same as ESP8266 - MicroPython uses 115200, so switch early
+CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+
 # Increase NimBLE stack size for functional BT
 CONFIG_BT_NIMBLE_TASK_STACK_SIZE=5120
 

From ab4af2c1a61550cd300ff8dcd57fce6099f3338e Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Tue, 29 Jul 2025 18:10:17 +0800
Subject: [PATCH 2596/3129] py/mphal: Add stddef.h header for size_t.

This includes "stddef.h" for `size_t` to resolve NuttX integration build
issues.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 py/mphal.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/mphal.h b/py/mphal.h
index a4f222d0b1e11..d52e10be44c3c 100644
--- a/py/mphal.h
+++ b/py/mphal.h
@@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_PY_MPHAL_H
 
 #include <stdint.h>
+#include <stddef.h>
 #include "py/mpconfig.h"
 
 #ifdef MICROPY_MPHALPORT_H

From 135c1cc7cd6077eda2dc860b3b7b51d742f6f630 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Jul 2025 14:44:11 +1000
Subject: [PATCH 2597/3129] extmod/modtls_mbedtls: Do gc_collect and retry
 ssl_init on any error.

Contrary to the docs, mbedtls can return more than just
MBEDTLS_ERR_SSL_ALLOC_FAILED when `mbedtls_ssl_setup()` fails.  At least
MBEDTLS_ERR_MD_ALLOC_FAILED was also seen on ESP32_GENERIC, but there
could possibly be other error codes.

To cover all these codes, just check if `ret` is non-0, and in that case
do a `gc_collect()` and retry the init.

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

diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 418275440f309..58634257328da 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -639,7 +639,7 @@ static mp_obj_t ssl_socket_make_new(mp_obj_ssl_context_t *ssl_context, mp_obj_t
 
     ret = mbedtls_ssl_setup(&o->ssl, &ssl_context->conf);
     #if !MICROPY_MBEDTLS_CONFIG_BARE_METAL
-    if (ret == MBEDTLS_ERR_SSL_ALLOC_FAILED) {
+    if (ret != 0) {
         // If mbedTLS relies on platform libc heap for buffers (i.e. esp32
         // port), then run a GC pass and then try again. This is useful because
         // it may free a Python object (like an old SSL socket) whose finaliser

From 68434b4be7ea9d212d5f402b75e2ffac8434ee04 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 15 Jul 2025 12:00:37 +1000
Subject: [PATCH 2598/3129] zephyr/mpconfigport_minimal: Use
 MICROPY_CONFIG_ROM_LEVEL_MINIMUM.

This commit adjusts the configuration of the minimal zephyr build to use
MICROPY_CONFIG_ROM_LEVEL_MINIMUM.  That's a lot cleaner than explicitly
enabling/disabling options.

Prior to this change the minimal build for qemu_cortex_m3 had size:

    Memory region         Used Size  Region Size  %age Used
               FLASH:      114436 B       256 KB     43.65%
                 RAM:       26320 B        64 KB     40.16%

and had the following test results (running using the CI settings, ie
`-d basics float --exclude inf_nan_arith`):

    352 tests performed (7092 individual testcases)
    352 tests passed
    254 tests skipped: ...

With the changes here the qemu_cortex_m3 size is now:

    Memory region         Used Size  Region Size  %age Used
               FLASH:       99428 B       256 KB     37.93%
                 RAM:       26312 B        64 KB     40.15%

That's a good decrease of about 15k firmware size.  And the test suite
still passes with:

    342 tests performed (6776 individual testcases)
    341 tests passed
    265 tests skipped: ...

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/mpconfigport_minimal.h | 37 +++++++++++++----------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index a0a7f97394610..24e0c9f1adc05 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -30,41 +30,36 @@
 // Included here to get basic Zephyr environment (macros, etc.)
 #include <zephyr/kernel.h>
 
+// Use the minimum configuration level to get a small but useful system.
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
+#endif
+
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE
 #define MICROPY_HEAP_SIZE (16 * 1024)
 #endif
 
+#define MICROPY_ENABLE_COMPILER     (1)
+#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
 #define MICROPY_STACK_CHECK         (1)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_PY_ASYNC_AWAIT      (0)
-#define MICROPY_PY_ATTRTUPLE        (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE (0)
-#define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_MIN_MAX (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS (0)
-#define MICROPY_PY_BUILTINS_REVERSED (0)
-#define MICROPY_PY_BUILTINS_SET     (0)
-#define MICROPY_PY_BUILTINS_SLICE   (0)
-#define MICROPY_PY_ARRAY            (0)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (0)
-#define MICROPY_PY_SYS_MODULES      (0)
 #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)
 #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 
-// Saving extra crumbs to make sure binary fits in 128K
-#define MICROPY_COMP_CONST_FOLDING  (0)
-#define MICROPY_COMP_CONST (0)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
+// These features are enabled to get the test suite passing.
+#define MICROPY_FULL_CHECKS         (1)
+#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
+#define MICROPY_MULTIPLE_INHERITANCE (1)
+#define MICROPY_PY_ASSIGN_EXPR      (1)
+#define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
+#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
+#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
+#define MICROPY_PY_SYS              (1)
 
 #ifdef CONFIG_BOARD
 #define MICROPY_HW_BOARD_NAME "zephyr-" CONFIG_BOARD

From 4360da16845051d6744669f1a33a715f147c1494 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 15 Jul 2025 12:30:09 +1000
Subject: [PATCH 2599/3129] zephyr/mpconfigport: Use
 MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES.

This commit adjusts the configuration of the standard zephyr build to use
MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES.  That's a lot cleaner than
explicitly enabling/disabling options, and allows boards to more easily
fine-tune the settings, eg select a different feature level.

Features that are now enabled are:
- async/await keyword support
- `filter`, `property` and `reversed` builtins
- `range` attributes
- `str.count()` method
- `array` module with `array.array` object
- `collections` module with `collections.namedtuple` object
- `struct` module with everything
- `id = const()` and constant folding in the compiler

Bulding qemu_cortex_m3, the code size was originally:

    Memory region         Used Size  Region Size  %age Used
               FLASH:      193864 B       256 KB     73.95%
                 RAM:       61992 B        64 KB     94.59%

and with this commit it is now:

    Memory region         Used Size  Region Size  %age Used
               FLASH:      200698 B       256 KB     76.56%
                 RAM:       61992 B        64 KB     94.59%

That's a mild increase of +6834 bytes flash usage for a good selection of
new features.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/mpconfigport.h | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 62226a2ded738..848e04b389e58 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -31,6 +31,11 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
+// Use the basic configuration level to get a balance between size and features.
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES)
+#endif
+
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE
 #define MICROPY_HEAP_SIZE (16 * 1024)
@@ -48,20 +53,11 @@
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_PY_ASYNC_AWAIT      (0)
 #define MICROPY_PY_BUILTINS_BYTES_HEX (1)
-#define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS (0)
-#define MICROPY_PY_BUILTINS_REVERSED (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)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
@@ -80,7 +76,6 @@
 #endif
 #define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE "ports/zephyr/machine_pwm.c"
-#define MICROPY_PY_STRUCT           (0)
 #ifdef CONFIG_NETWORKING
 // If we have networking, we likely want errno comfort
 #define MICROPY_PY_ERRNO            (1)
@@ -96,7 +91,6 @@
 #define MICROPY_PY_BINASCII         (1)
 #define MICROPY_PY_HASHLIB          (1)
 #define MICROPY_PY_OS               (1)
-#define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modtime.c"
 #define MICROPY_PY_ZEPHYR           (1)
@@ -117,11 +111,6 @@
 #define MICROPY_FATFS_RPATH            (2)
 #define MICROPY_FATFS_NORTC            (1)
 
-// Saving extra crumbs to make sure binary fits in 128K
-#define MICROPY_COMP_CONST_FOLDING  (0)
-#define MICROPY_COMP_CONST (0)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
-
 // When CONFIG_THREAD_CUSTOM_DATA is enabled, MICROPY_PY_THREAD is enabled automatically
 #ifdef CONFIG_THREAD_CUSTOM_DATA
 #define MICROPY_PY_THREAD                   (1)

From 6a8c45b6c4683fa2dc68cab62219b0edad4dd15d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 20 Jul 2025 21:37:35 +1000
Subject: [PATCH 2600/3129] docs/library/bluetooth: Document all allowed args
 to UUID constructor.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/bluetooth.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index b09c370abd46d..251ff399ecaa2 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -764,4 +764,5 @@ Constructor
     The **value** can be either:
 
     - A 16-bit integer. e.g. ``0x2908``.
+    - An object with the buffer protocol and that is 2, 4 or 16 bytes long, e.g. ``b'\x08\x29'``.
     - A 128-bit UUID string. e.g. ``'6E400001-B5A3-F393-E0A9-E50E24DCCA9E'``.

From a9b038a57e2ca730dd95e79fc89491d0d1154e6e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 20 Jul 2025 21:38:03 +1000
Subject: [PATCH 2601/3129] examples/bluetooth/ble_advertising.py: Fix decoding
 UUIDs.

The UUID32 case was incorrect: first, the "<d" should have been "<I", and
second, the UUID constructor treats integer arguments as UUID16.  So this
UUID32 case needs to pass in the actual data bytes.

And then it's simpler to just make all cases pass in the data bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/bluetooth/ble_advertising.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/examples/bluetooth/ble_advertising.py b/examples/bluetooth/ble_advertising.py
index 2fe17d640b9d2..f0b97d7f5d93e 100644
--- a/examples/bluetooth/ble_advertising.py
+++ b/examples/bluetooth/ble_advertising.py
@@ -79,12 +79,9 @@ def decode_name(payload):
 
 def decode_services(payload):
     services = []
-    for u in decode_field(payload, _ADV_TYPE_UUID16_COMPLETE):
-        services.append(bluetooth.UUID(struct.unpack("<h", u)[0]))
-    for u in decode_field(payload, _ADV_TYPE_UUID32_COMPLETE):
-        services.append(bluetooth.UUID(struct.unpack("<d", u)[0]))
-    for u in decode_field(payload, _ADV_TYPE_UUID128_COMPLETE):
-        services.append(bluetooth.UUID(u))
+    for code in (_ADV_TYPE_UUID16_COMPLETE, _ADV_TYPE_UUID32_COMPLETE, _ADV_TYPE_UUID128_COMPLETE):
+        for u in decode_field(payload, code):
+            services.append(bluetooth.UUID(u))
     return services
 
 

From ff6491ded0ebaa7728ecba67c18641941885feb5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Jul 2025 14:52:17 +1000
Subject: [PATCH 2602/3129] tests/run-natmodtests.py: Automatically skip tests
 that are too large.

This follows a similar change made for `run-tests.py` in commit
229104558fb7f9d283b7302bc3720bc35c5c49cf.  The change here uses the same
logic to detect if a natmod test is too big for the target (eg overflows
(I)RAM loading the native .mpy), by printing "START TEST" at the start of
the test.

Typical output is now something like this:

    ...
    pass  extmod/random_basic.py
    pass  extmod/random_extra_float.py
    pass  extmod/random_extra.py
    SKIP  extmod/random_seed_default.py
    LRGE  extmod/re1.py
    SKIP  extmod/re_debug.py
    pass  extmod/re_error.py
    pass  extmod/re_group.py
    pass  extmod/re_groups.py
    ...

and the tests that are too large are reported at the end, and written to
the `_result.json` file.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-natmodtests.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index f9d2074f6f02b..55adb6049a3e8 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -170,6 +170,7 @@ def run_tests(target_truth, target, args, resolved_arch):
             print("skip  {} - mpy file not compiled".format(test_file))
             continue
         test_script += bytes(injected_import_hook_code.format(test_module), "ascii")
+        test_script += b"print('START TEST')\n"
         test_script += test_file_data
 
         # Run test under MicroPython
@@ -177,8 +178,18 @@ def run_tests(target_truth, target, args, resolved_arch):
 
         # Work out result of test
         extra = ""
+        result_out = result_out.removeprefix(b"START TEST\n")
         if error is None and result_out == b"SKIP\n":
             result = "SKIP"
+        elif (
+            error is not None
+            and error.args[0] == "exception"
+            and error.args[1] == b""
+            and b"MemoryError" in error.args[2]
+        ):
+            # Test had a MemoryError before anything (should be at least "START TEST")
+            # was printed, so the test is too big for the target.
+            result = "LRGE"
         elif error is not None:
             result = "FAIL"
             extra = " - " + str(error)
@@ -203,6 +214,8 @@ def run_tests(target_truth, target, args, resolved_arch):
             test_results.append((test_file, "pass", ""))
         elif result == "SKIP":
             test_results.append((test_file, "skip", ""))
+        elif result == "LRGE":
+            test_results.append((test_file, "skip", "too large"))
         else:
             test_results.append((test_file, "fail", ""))
 

From 4bdf2a2dc0b418aa014ef1c28b55a563f0c9f7e2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 29 Jul 2025 10:30:10 +1000
Subject: [PATCH 2603/3129] tests/multi_bluetooth: Extend the deep sleep test
 timeout.

As per comment, if a boot.py is present that connects to Wi-Fi then waking
can take a little longer.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/multi_bluetooth/stress_deepsleep_reconnect.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/multi_bluetooth/stress_deepsleep_reconnect.py b/tests/multi_bluetooth/stress_deepsleep_reconnect.py
index 7c34c0360670f..b588b4000b4ed 100644
--- a/tests/multi_bluetooth/stress_deepsleep_reconnect.py
+++ b/tests/multi_bluetooth/stress_deepsleep_reconnect.py
@@ -5,7 +5,9 @@
 from micropython import const
 import time, machine, bluetooth
 
-TIMEOUT_MS = 4000
+# Note: This value can be much lower most of the time, but an ESP32 with a boot.py
+# that connects to Wi-Fi may take an extra 5 seconds after reboot.
+TIMEOUT_MS = 8000
 
 _IRQ_CENTRAL_CONNECT = const(1)
 _IRQ_CENTRAL_DISCONNECT = const(2)

From fdbd23268d69d77a411aa5c2d792eaf5e77d454a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 29 Jul 2025 10:45:58 +1000
Subject: [PATCH 2604/3129] tests/run-multitests.py: Escape encoding errors
 instead of crashing.

It's possible for a test to output non-ASCII characters (for example, due
to a hard fault or serial noise or memory corruption). Rather than crashing
the test runner, backslash escape those characters and treat them as
program output.

Refactors the string encoding step to a single helper to avoid copy-paste.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/run-multitests.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 92bd64193d8ce..4412d0fde7fda 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -132,6 +132,11 @@ def get_host_ip(_ip_cache=[]):
     return _ip_cache[0]
 
 
+def decode(output):
+    # Convenience function to convert raw process or serial output to ASCII
+    return str(output, "ascii", "backslashreplace")
+
+
 class PyInstance:
     def __init__(self):
         pass
@@ -190,7 +195,7 @@ def run_script(self, script):
             output = p.stdout
         except subprocess.CalledProcessError as er:
             err = er
-        return str(output.strip(), "ascii"), err
+        return decode(output.strip()), err
 
     def start_script(self, script):
         self.popen = subprocess.Popen(
@@ -217,7 +222,7 @@ def readline(self):
             self.finished = self.popen.poll() is not None
             return None, None
         else:
-            return str(out.rstrip(), "ascii"), None
+            return decode(out.rstrip()), None
 
     def write(self, data):
         self.popen.stdin.write(data)
@@ -229,7 +234,7 @@ def is_finished(self):
     def wait_finished(self):
         self.popen.wait()
         out = self.popen.stdout.read()
-        return str(out, "ascii"), ""
+        return decode(out), ""
 
 
 class PyInstancePyboard(PyInstance):
@@ -264,7 +269,7 @@ def run_script(self, script):
             output = self.pyb.exec_(script)
         except pyboard.PyboardError as er:
             err = er
-        return str(output.strip(), "ascii"), err
+        return decode(output.strip()), err
 
     def start_script(self, script):
         self.pyb.enter_raw_repl()
@@ -283,13 +288,13 @@ def readline(self):
         if out.endswith(b"\x04"):
             self.finished = True
             out = out[:-1]
-            err = str(self.pyb.read_until(1, b"\x04"), "ascii")
+            err = decode(self.pyb.read_until(1, b"\x04"))
             err = err[:-1]
             if not out and not err:
                 return None, None
         else:
             err = None
-        return str(out.rstrip(), "ascii"), err
+        return decode(out.rstrip()), err
 
     def write(self, data):
         self.pyb.serial.write(data)
@@ -299,7 +304,7 @@ def is_finished(self):
 
     def wait_finished(self):
         out, err = self.pyb.follow(10, None)
-        return str(out, "ascii"), str(err, "ascii")
+        return decode(out), decode(err)
 
 
 def prepare_test_file_list(test_files):

From 241ee163c0c8a33267c699af59492641d0770f30 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Jul 2025 00:09:18 +1000
Subject: [PATCH 2605/3129] py/objboundmeth: Add option to use mp_is_equal
 instead of == comparison.

This option is needed for ports such as webassembly where objects are
proxied and can be identical without being the same C pointer.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h     | 8 ++++++++
 py/objboundmeth.c | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 6ef6ec52e7cb6..c316aa4b2d894 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1129,6 +1129,14 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_PY_FUNCTION_ATTRS_CODE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_FULL_FEATURES)
 #endif
 
+// Whether bound_method can just use == (feature disabled), or requires a call to
+// mp_obj_equal (feature enabled), to test equality of the self and meth entities.
+// This is only needed if objects and functions can be identical without being the
+// same thing, eg when using an object proxy.
+#ifndef MICROPY_PY_BOUND_METHOD_FULL_EQUALITY_CHECK
+#define MICROPY_PY_BOUND_METHOD_FULL_EQUALITY_CHECK (0)
+#endif
+
 // Whether to support the descriptors __get__, __set__, __delete__, __set_name__
 // This costs some code size and makes load/store/delete of instance
 // attributes slower for the classes that use this feature
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index e3503ff154a65..6df67f7bf9e0c 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -102,7 +102,11 @@ static mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_
     }
     mp_obj_bound_meth_t *lhs = MP_OBJ_TO_PTR(lhs_in);
     mp_obj_bound_meth_t *rhs = MP_OBJ_TO_PTR(rhs_in);
+    #if MICROPY_PY_BOUND_METHOD_FULL_EQUALITY_CHECK
+    return mp_obj_new_bool(mp_obj_equal(lhs->self, rhs->self) && mp_obj_equal(lhs->meth, rhs->meth));
+    #else
     return mp_obj_new_bool(lhs->self == rhs->self && lhs->meth == rhs->meth);
+    #endif
 }
 
 #if MICROPY_PY_FUNCTION_ATTRS

From 813f0c1cb9460502d0d8de24106f7ee8cc0723ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Jul 2025 23:40:47 +1000
Subject: [PATCH 2606/3129] webassembly/objjsproxy: Implement equality for
 JsProxy objects.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/mpconfigport.h |  1 +
 ports/webassembly/objjsproxy.c   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index eea6f02a02633..544e76f80540d 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -54,6 +54,7 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
+#define MICROPY_PY_BOUND_METHOD_FULL_EQUALITY_CHECK (1)
 
 #define MICROPY_EPOCH_IS_1970       (1)
 #define MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK (1)
diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 28fef901477c3..45f329d7e336b 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -266,6 +266,23 @@ static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     }
 }
 
+static mp_obj_t jsproxy_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
+    if (!mp_obj_is_type(rhs_in, &mp_type_jsproxy)) {
+        return MP_OBJ_NULL; // op not supported
+    }
+
+    mp_obj_jsproxy_t *lhs = MP_OBJ_TO_PTR(lhs_in);
+    mp_obj_jsproxy_t *rhs = MP_OBJ_TO_PTR(rhs_in);
+
+    switch (op) {
+        case MP_BINARY_OP_EQUAL:
+            return mp_obj_new_bool(lhs->ref == rhs->ref);
+
+        default:
+            return MP_OBJ_NULL; // op not supported
+    }
+}
+
 EM_JS(void, proxy_js_free_obj, (int js_ref), {
     if (js_ref >= PROXY_JS_REF_NUM_STATIC) {
         proxy_js_ref[js_ref] = undefined;
@@ -566,6 +583,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_ITER_IS_GETITER,
     print, jsproxy_print,
     call, jsproxy_call,
+    binary_op, jsproxy_binary_op,
     attr, mp_obj_jsproxy_attr,
     subscr, jsproxy_subscr,
     iter, jsproxy_getiter

From ffa98cb0143c43af9f4c61142784a08a19f660c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Jul 2025 23:41:16 +1000
Subject: [PATCH 2607/3129] webassembly/proxy_js: Reuse JsProxy ref if object
 matches.

This reduces memory use by reusing objects, and improves identity/equality
relationships of JavaScript objects on the Python side.

In 77bd8fe5b80b0e7e02cdb6b4272c401ae3dca638 PyProxy's were reused when the
same Python object was proxied across to JavaScript.  This commit does the
same thing but for JsProxy's going from JS to Python.  If an existing
JsProxy reference exists for the JS object about to be proxied across, then
it's reused.

This helps reduce the number of alive objects (memory use), and, more
importantly, improves equality relationships of JavaScript objects on the
Python side.  Eg we now get, on the Python side:

    import js

    print(js.Object == js.Object)

that prints True.  Previously it was False.

Note that this change does not make identity work with `is`, for example
`js.Object is js.Object` is actually False.  With more work that could be
made True but for now we leave that as-is.

The behaviour with this commit matches Pyodide semantics.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/objjsproxy.c                    |  1 +
 ports/webassembly/proxy_js.js                     | 12 +++++++++++-
 tests/ports/webassembly/py_proxy_identity.mjs     |  9 +++++++++
 tests/ports/webassembly/py_proxy_identity.mjs.exp |  9 ++++++++-
 tests/ports/webassembly/run_python_async.mjs.exp  |  6 +++---
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 45f329d7e336b..a8b21a744565c 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -285,6 +285,7 @@ static mp_obj_t jsproxy_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t r
 
 EM_JS(void, proxy_js_free_obj, (int js_ref), {
     if (js_ref >= PROXY_JS_REF_NUM_STATIC) {
+        proxy_js_ref_map.delete(proxy_js_ref[js_ref]);
         proxy_js_ref[js_ref] = undefined;
         if (js_ref < proxy_js_ref_next) {
             proxy_js_ref_next = js_ref;
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index 9e7c233e30bfc..cbd6e5b0088cc 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -62,6 +62,7 @@ class PythonError extends Error {
 function proxy_js_init() {
     globalThis.proxy_js_ref = [globalThis, undefined];
     globalThis.proxy_js_ref_next = PROXY_JS_REF_NUM_STATIC;
+    globalThis.proxy_js_ref_map = new Map();
     globalThis.proxy_js_map = new Map();
     globalThis.proxy_js_existing = [undefined];
     globalThis.pyProxyFinalizationRegistry = new FinalizationRegistry(
@@ -95,8 +96,15 @@ function proxy_js_check_existing(c_ref) {
     return globalThis.proxy_js_existing.length - 1;
 }
 
-// js_obj cannot be undefined
+// The `js_obj` argument cannot be `undefined`.
+// Returns an integer reference to the given `js_obj`.
 function proxy_js_add_obj(js_obj) {
+    // See if there is an existing JsProxy reference, and use that if there is.
+    const existing_ref = proxy_js_ref_map.get(js_obj);
+    if (existing_ref !== undefined) {
+        return existing_ref;
+    }
+
     // Search for the first free slot in proxy_js_ref.
     while (proxy_js_ref_next < proxy_js_ref.length) {
         if (proxy_js_ref[proxy_js_ref_next] === undefined) {
@@ -104,6 +112,7 @@ function proxy_js_add_obj(js_obj) {
             const id = proxy_js_ref_next;
             ++proxy_js_ref_next;
             proxy_js_ref[id] = js_obj;
+            proxy_js_ref_map.set(js_obj, id);
             return id;
         }
         ++proxy_js_ref_next;
@@ -113,6 +122,7 @@ function proxy_js_add_obj(js_obj) {
     const id = proxy_js_ref.length;
     proxy_js_ref[id] = js_obj;
     proxy_js_ref_next = proxy_js_ref.length;
+    proxy_js_ref_map.set(js_obj, id);
     return id;
 }
 
diff --git a/tests/ports/webassembly/py_proxy_identity.mjs b/tests/ports/webassembly/py_proxy_identity.mjs
index d4a720b738a6c..97dab2e78367a 100644
--- a/tests/ports/webassembly/py_proxy_identity.mjs
+++ b/tests/ports/webassembly/py_proxy_identity.mjs
@@ -23,4 +23,13 @@ js.eventTarget.addEventListener("event", callback)
 js.eventTarget.dispatchEvent(js.event)
 js.eventTarget.removeEventListener("event", callback)
 js.eventTarget.dispatchEvent(js.event)
+
+print("Object equality")
+print(js.Object == js.Object)
+print(js.Object.assign == js.Object.assign)
+
+print("Array equality")
+print(js.Array == js.Array)
+print(js.Array.prototype == js.Array.prototype)
+print(js.Array.prototype.push == js.Array.prototype.push)
 `);
diff --git a/tests/ports/webassembly/py_proxy_identity.mjs.exp b/tests/ports/webassembly/py_proxy_identity.mjs.exp
index 01ccf0d892653..344a0a202364c 100644
--- a/tests/ports/webassembly/py_proxy_identity.mjs.exp
+++ b/tests/ports/webassembly/py_proxy_identity.mjs.exp
@@ -1,3 +1,10 @@
 PyProxy { _ref: 3 } PyProxy { _ref: 3 }
 true
-callback <JsProxy 7>
+callback <JsProxy 5>
+Object equality
+True
+True
+Array equality
+True
+True
+True
diff --git a/tests/ports/webassembly/run_python_async.mjs.exp b/tests/ports/webassembly/run_python_async.mjs.exp
index ad6c49e336e5c..4dff64a605384 100644
--- a/tests/ports/webassembly/run_python_async.mjs.exp
+++ b/tests/ports/webassembly/run_python_async.mjs.exp
@@ -2,16 +2,16 @@
 1
 <JsProxy 2>
 py 1
-<JsProxy 5>
+<JsProxy 4>
 py 2
 2
 resolved 123
 3
 = TEST 2 ==========
 1
-<JsProxy 6>
+<JsProxy 5>
 py 1
-<JsProxy 9>
+<JsProxy 6>
 py 2
 2
 setTimeout resolved

From e4e1c9f4132f839dac0291557d9b992f67577fd3 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Fri, 4 Jul 2025 22:32:00 +0200
Subject: [PATCH 2608/3129] py/parsenum: Refactor float parsing code.

This commit extracts from the current float parsing code two functions
which could be reused elsewhere in MicroPython.

The code used to multiply a float x by a power of 10 is also simplified by
applying the binary exponent separately from the power of 5.  This avoids
the risk of overflow in the intermediate stage, before multiplying by x.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 py/parsenum.c | 211 +++++++++++++++++++++++++++-----------------------
 py/parsenum.h |   5 ++
 2 files changed, 117 insertions(+), 99 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index fcc69091737d0..019491b5132ae 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -195,6 +195,8 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
     }
 }
 
+#if MICROPY_PY_BUILTINS_FLOAT
+
 enum {
     REAL_IMAG_STATE_START = 0,
     REAL_IMAG_STATE_HAVE_REAL = 1,
@@ -207,25 +209,39 @@ typedef enum {
     PARSE_DEC_IN_EXP,
 } parse_dec_in_t;
 
-#if MICROPY_PY_BUILTINS_FLOAT
 // MANTISSA_MAX is used to retain precision while not overflowing mantissa
-// 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).
+#define MANTISSA_MAX (sizeof(mp_float_uint_t) == 8 ? 0x1999999999999998ULL : 0x19999998U)
+
+// MAX_EXACT_POWER_OF_5 is the largest value of x so that 5^x can be stored exactly in a float
 #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-#define MANTISSA_MAX 0x19999998U
-#define SMALL_NORMAL_VAL (1e-37F)
-#define SMALL_NORMAL_EXP (-37)
-#define EXACT_POWER_OF_10 (9)
+#define MAX_EXACT_POWER_OF_5 (10)
 #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-#define MANTISSA_MAX 0x1999999999999998ULL
-#define SMALL_NORMAL_VAL (1e-307)
-#define SMALL_NORMAL_EXP (-307)
-#define EXACT_POWER_OF_10 (22)
+#define MAX_EXACT_POWER_OF_5 (22)
 #endif
 
+// Helper to compute `num * (10.0 ** dec_exp)`
+mp_float_t mp_decimal_exp(mp_float_t num, int dec_exp) {
+
+    if (dec_exp == 0 || num == MICROPY_FLOAT_CONST(0.0)) {
+        return num;
+    }
+    mp_float_union_t res = {num};
+    // Multiply first by (2.0 ** dec_exp) via the exponent
+    // - this will ensure that the result of `pow()` is always in mp_float_t range
+    //   when the result is expected to be in mp_float_t range (e.g. during format)
+    // - we don't need to care about p.exp overflow, as (5.0 ** dec_exp) will anyway
+    //   force the final result toward the proper edge if needed (0.0 or inf)
+    res.p.exp += dec_exp;
+    // Use positive exponents when they are more precise then negative
+    if (dec_exp < 0 && dec_exp >= -MAX_EXACT_POWER_OF_5) {
+        res.f /= MICROPY_FLOAT_C_FUN(pow)(5, -dec_exp);
+    } else {
+        res.f *= MICROPY_FLOAT_C_FUN(pow)(5, dec_exp);
+    }
+    return (mp_float_t)res.f;
+}
+
+
 // Break out inner digit accumulation routine to ease trailing zero deferral.
 static mp_float_uint_t accept_digit(mp_float_uint_t p_mantissa, unsigned int dig, int *p_exp_extra, int in) {
     // Core routine to ingest an additional digit.
@@ -244,6 +260,85 @@ static mp_float_uint_t accept_digit(mp_float_uint_t p_mantissa, unsigned int dig
         return p_mantissa;
     }
 }
+
+// Helper to parse an unsigned decimal number into a mp_float_t
+const char *mp_parse_float_internal(const char *str, size_t len, mp_float_t *res) {
+    const char *top = str + len;
+
+    parse_dec_in_t in = PARSE_DEC_IN_INTG;
+    bool exp_neg = false;
+    mp_float_uint_t mantissa = 0;
+    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') {
+            dig -= '0';
+            if (in == PARSE_DEC_IN_EXP) {
+                // don't overflow exp_val when adding next digit, instead just truncate
+                // it and the resulting float will still be correct, either inf or 0.0
+                // (use INT_MAX/2 to allow adding exp_extra at the end without overflow)
+                if (exp_val < (INT_MAX / 2 - 9) / 10) {
+                    exp_val = 10 * exp_val + dig;
+                }
+            } else {
+                if (dig == 0 || mantissa >= MANTISSA_MAX) {
+                    // Defer treatment of zeros in fractional part.  If nothing comes afterwards, ignore them.
+                    // Also, once we reach MANTISSA_MAX, treat every additional digit as a trailing zero.
+                    if (in == PARSE_DEC_IN_INTG) {
+                        ++trailing_zeros_intg;
+                    } else {
+                        ++trailing_zeros_frac;
+                    }
+                } else {
+                    // Time to un-defer any trailing zeros.  Intg zeros first.
+                    while (trailing_zeros_intg) {
+                        mantissa = accept_digit(mantissa, 0, &exp_extra, PARSE_DEC_IN_INTG);
+                        --trailing_zeros_intg;
+                    }
+                    while (trailing_zeros_frac) {
+                        mantissa = accept_digit(mantissa, 0, &exp_extra, PARSE_DEC_IN_FRAC);
+                        --trailing_zeros_frac;
+                    }
+                    mantissa = accept_digit(mantissa, dig, &exp_extra, in);
+                }
+            }
+        } else if (in == PARSE_DEC_IN_INTG && dig == '.') {
+            in = PARSE_DEC_IN_FRAC;
+        } else if (in != PARSE_DEC_IN_EXP && ((dig | 0x20) == 'e')) {
+            in = PARSE_DEC_IN_EXP;
+            if (str < top) {
+                if (str[0] == '+') {
+                    str++;
+                } else if (str[0] == '-') {
+                    str++;
+                    exp_neg = true;
+                }
+            }
+            if (str == top) {
+                return NULL;
+            }
+        } else if (dig == '_') {
+            continue;
+        } else {
+            // unknown character
+            str--;
+            break;
+        }
+    }
+
+    // work out the exponent
+    if (exp_neg) {
+        exp_val = -exp_val;
+    }
+    exp_val += exp_extra + trailing_zeros_intg;
+
+    // At this point, we just need to multiply the mantissa by its base 10 exponent.
+    *res = (mp_float_t)mp_decimal_exp(mantissa, exp_val);
+
+    return str;
+}
 #endif // MICROPY_PY_BUILTINS_FLOAT
 
 #if MICROPY_PY_BUILTINS_COMPLEX
@@ -295,91 +390,9 @@ parse_start:;
         dec_val = MICROPY_FLOAT_C_FUN(nan)("");
     } else {
         // string should be a decimal number
-        parse_dec_in_t in = PARSE_DEC_IN_INTG;
-        bool exp_neg = false;
-        mp_float_uint_t mantissa = 0;
-        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') {
-                dig -= '0';
-                if (in == PARSE_DEC_IN_EXP) {
-                    // don't overflow exp_val when adding next digit, instead just truncate
-                    // it and the resulting float will still be correct, either inf or 0.0
-                    // (use INT_MAX/2 to allow adding exp_extra at the end without overflow)
-                    if (exp_val < (INT_MAX / 2 - 9) / 10) {
-                        exp_val = 10 * exp_val + dig;
-                    }
-                } else {
-                    if (dig == 0 || mantissa >= MANTISSA_MAX) {
-                        // Defer treatment of zeros in fractional part.  If nothing comes afterwards, ignore them.
-                        // Also, once we reach MANTISSA_MAX, treat every additional digit as a trailing zero.
-                        if (in == PARSE_DEC_IN_INTG) {
-                            ++trailing_zeros_intg;
-                        } else {
-                            ++trailing_zeros_frac;
-                        }
-                    } else {
-                        // Time to un-defer any trailing zeros.  Intg zeros first.
-                        while (trailing_zeros_intg) {
-                            mantissa = accept_digit(mantissa, 0, &exp_extra, PARSE_DEC_IN_INTG);
-                            --trailing_zeros_intg;
-                        }
-                        while (trailing_zeros_frac) {
-                            mantissa = accept_digit(mantissa, 0, &exp_extra, PARSE_DEC_IN_FRAC);
-                            --trailing_zeros_frac;
-                        }
-                        mantissa = accept_digit(mantissa, dig, &exp_extra, in);
-                    }
-                }
-            } else if (in == PARSE_DEC_IN_INTG && dig == '.') {
-                in = PARSE_DEC_IN_FRAC;
-            } else if (in != PARSE_DEC_IN_EXP && ((dig | 0x20) == 'e')) {
-                in = PARSE_DEC_IN_EXP;
-                if (str < top) {
-                    if (str[0] == '+') {
-                        str++;
-                    } else if (str[0] == '-') {
-                        str++;
-                        exp_neg = true;
-                    }
-                }
-                if (str == top) {
-                    goto value_error;
-                }
-            } else if (dig == '_') {
-                continue;
-            } else {
-                // unknown character
-                str--;
-                break;
-            }
-        }
-
-        // work out the exponent
-        if (exp_neg) {
-            exp_val = -exp_val;
-        }
-
-        // apply the exponent, making sure it's not a subnormal value
-        exp_val += exp_extra + trailing_zeros_intg;
-        dec_val = (mp_float_t)mantissa;
-        if (exp_val < SMALL_NORMAL_EXP) {
-            exp_val -= SMALL_NORMAL_EXP;
-            dec_val *= SMALL_NORMAL_VAL;
-        }
-
-        // At this point, we need to multiply the mantissa by its base 10 exponent. If possible,
-        // we would rather manipulate numbers that have an exact representation in IEEE754. It
-        // turns out small positive powers of 10 do, whereas small negative powers of 10 don't.
-        // So in that case, we'll yield a division of exact values rather than a multiplication
-        // of slightly erroneous values.
-        if (exp_val < 0 && exp_val >= -EXACT_POWER_OF_10) {
-            dec_val /= MICROPY_FLOAT_C_FUN(pow)(10, -exp_val);
-        } else {
-            dec_val *= MICROPY_FLOAT_C_FUN(pow)(10, exp_val);
+        str = mp_parse_float_internal(str, top - str, &dec_val);
+        if (!str) {
+            goto value_error;
         }
     }
 
diff --git a/py/parsenum.h b/py/parsenum.h
index f444632d23021..a807cb09d0572 100644
--- a/py/parsenum.h
+++ b/py/parsenum.h
@@ -34,6 +34,11 @@
 
 mp_obj_t mp_parse_num_integer(const char *restrict str, size_t len, int base, mp_lexer_t *lex);
 
+#if MICROPY_PY_BUILTINS_FLOAT
+mp_float_t mp_decimal_exp(mp_float_t num, int dec_exp);
+const char *mp_parse_float_internal(const char *str, size_t len, mp_float_t *res);
+#endif
+
 #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);
 

From dbbaa959c85c04dbbcde5908b5d0775b574e44e7 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Fri, 6 Jun 2025 14:55:21 +0200
Subject: [PATCH 2609/3129] py/formatfloat: Improve accuracy of float
 formatting code.

Following discussions in PR #16666, this commit updates the float
formatting code to improve the `repr` reversibility, i.e. the percentage of
valid floating point numbers that do parse back to the same number when
formatted by `repr` (in CPython it's 100%).

This new code offers a choice of 3 float conversion methods, depending on
the desired tradeoff between code size and conversion precision:

- BASIC method is the smallest code footprint

- APPROX method uses an iterative method to approximate the exact
  representation, which is a bit slower but but does not have a big impact
  on code size.  It provides `repr` reversibility on >99.8% of the cases in
  double precision, and on >98.5% in single precision (except with REPR_C,
  where reversibility is 100% as the last two bits are not taken into
  account).

- EXACT method uses higher-precision floats during conversion, which
  provides perfect results but has a higher impact on code size.  It is
  faster than APPROX method, and faster than the CPython equivalent
  implementation.  It is however not available on all compilers when using
  FLOAT_IMPL_DOUBLE.

Here is the table comparing the impact of the three conversion methods on
code footprint on PYBV10 (using single-precision floats) and reversibility
rate for both single-precision and double-precision floats.  The table
includes current situation as a baseline for the comparison:

              PYBV10  REPR_C   FLOAT  DOUBLE
    current = 364688   12.9%   27.6%   37.9%
    basic   = 364812   85.6%   60.5%   85.7%
    approx  = 365080  100.0%   98.5%   99.8%
    exact   = 366408  100.0%  100.0%  100.0%

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 ports/esp8266/mpconfigport.h             |   1 +
 ports/unix/coverage.c                    |  20 -
 py/formatfloat.c                         | 757 ++++++++++++++---------
 py/formatfloat.h                         |   1 +
 py/misc.h                                |  19 +
 py/mpconfig.h                            |  21 +
 py/mpprint.c                             |  12 +-
 py/mpprint.h                             |   1 +
 py/objcomplex.c                          |  31 +-
 py/objfloat.c                            |  18 +-
 py/parsenum.c                            |  50 +-
 py/parsenum.h                            |   2 +-
 tests/float/float_format.py              |  17 +-
 tests/float/float_format_accuracy.py     |  73 +++
 tests/float/float_format_ints.py         |  32 +-
 tests/float/float_struct_e.py            |   2 +-
 tests/float/float_struct_e_doubleprec.py |  43 ++
 tests/float/float_struct_e_fp30.py       |  43 ++
 tests/float/string_format_modulo3.py     |   2 +-
 tests/float/string_format_modulo3.py.exp |   2 -
 tests/ports/unix/extra_coverage.py.exp   |   4 -
 tests/ports/unix/ffi_float2.py           |   3 +-
 tests/ports/unix/ffi_float2.py.exp       |  12 +-
 tests/run-tests.py                       |   4 +
 24 files changed, 775 insertions(+), 395 deletions(-)
 create mode 100644 tests/float/float_format_accuracy.py
 create mode 100644 tests/float/float_struct_e_doubleprec.py
 create mode 100644 tests/float/float_struct_e_fp30.py
 delete mode 100644 tests/float/string_format_modulo3.py.exp

diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index bc2957190262b..323fba67f5b07 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -106,6 +106,7 @@
 #define MICROPY_PY_OS_URANDOM       (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_FLOAT_FORMAT_IMPL   (MICROPY_FLOAT_FORMAT_IMPL_BASIC)
 #define MICROPY_WARNINGS            (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN (1)
 #define MICROPY_STREAMS_POSIX_API   (1)
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index f071049eded50..b7c3d2c25ef6e 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -612,26 +612,6 @@ static mp_obj_t extra_coverage(void) {
         mp_emitter_warning(MP_PASS_CODE_SIZE, "test");
     }
 
-    // format float
-    {
-        mp_printf(&mp_plat_print, "# format float\n");
-
-        // format with inadequate buffer size
-        char buf[5];
-        mp_format_float(1, buf, sizeof(buf), 'g', 0, '+');
-        mp_printf(&mp_plat_print, "%s\n", buf);
-
-        // format with just enough buffer so that precision must be
-        // set from 0 to 1 twice
-        char buf2[8];
-        mp_format_float(1, buf2, sizeof(buf2), 'g', 0, '+');
-        mp_printf(&mp_plat_print, "%s\n", buf2);
-
-        // format where precision is trimmed to avoid buffer overflow
-        mp_format_float(1, buf2, sizeof(buf2), 'e', 0, '+');
-        mp_printf(&mp_plat_print, "%s\n", buf2);
-    }
-
     // binary
     {
         mp_printf(&mp_plat_print, "# binary\n");
diff --git a/py/formatfloat.c b/py/formatfloat.c
index 7cd471018da98..1ea34f84bf7fb 100644
--- a/py/formatfloat.c
+++ b/py/formatfloat.c
@@ -33,392 +33,537 @@
 #include <stdint.h>
 #include <math.h>
 #include "py/formatfloat.h"
+#include "py/parsenum.h"
 
 /***********************************************************************
 
   Routine for converting a arbitrary floating
   point number into a string.
 
-  The code in this function was inspired from Fred Bayer's pdouble.c.
-  Since pdouble.c was released as Public Domain, I'm releasing this
-  code as public domain as well.
+  The code in this function was inspired from Dave Hylands's previous
+  version, which was itself inspired from Fred Bayer's pdouble.c.
 
   The original code can be found in https://github.com/dhylands/format-float
 
-  Dave Hylands
-
 ***********************************************************************/
 
-#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-// 1 sign bit, 8 exponent bits, and 23 mantissa bits.
-// exponent values 0 and 255 are reserved, exponent can be 1 to 254.
-// exponent is stored with a bias of 127.
-// The min and max floats are on the order of 1x10^37 and 1x10^-37
-
-#define FPTYPE float
-#define FPCONST(x) x##F
-#define FPROUND_TO_ONE 0.9999995F
-#define FPDECEXP 32
-#define FPMIN_BUF_SIZE 6 // +9e+99
+// Float formatting debug code is intended for use in ports/unix only,
+// as it uses the libc float printing function as a reference.
+#define DEBUG_FLOAT_FORMATTING 0
+
+#if DEBUG_FLOAT_FORMATTING
+#define DEBUG_PRINTF(...) fprintf(stderr, __VA_ARGS__)
+#else
+#define DEBUG_PRINTF(...)
+#endif
+
+#if MICROPY_FLOAT_FORMAT_IMPL == MICROPY_FLOAT_FORMAT_IMPL_EXACT || MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+#define MP_FFUINT_FMT "%lu"
+#else
+#define MP_FFUINT_FMT "%u"
+#endif
+
+static inline int fp_expval(mp_float_t x) {
+    mp_float_union_t fb = { x };
+    return (int)fb.p.exp - MP_FLOAT_EXP_OFFSET;
+}
 
-#define FLT_SIGN_MASK   0x80000000
+#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
 
-static inline int fp_signbit(float x) {
-    mp_float_union_t fb = {x};
-    return fb.i & FLT_SIGN_MASK;
+static inline int fp_isless1(mp_float_t x) {
+    return x < 1.0;
 }
-#define fp_isnan(x) isnan(x)
-#define fp_isinf(x) isinf(x)
-static inline int fp_iszero(float x) {
-    mp_float_union_t fb = {x};
-    return fb.i == 0;
+
+static inline int fp_iszero(mp_float_t x) {
+    return x == 0.0;
 }
-static inline int fp_isless1(float x) {
-    mp_float_union_t fb = {x};
+
+#if MICROPY_FLOAT_FORMAT_IMPL != MICROPY_FLOAT_FORMAT_IMPL_APPROX
+static inline int fp_equal(mp_float_t x, mp_float_t y) {
+    return x == y;
+}
+#else
+static inline mp_float_t fp_diff(mp_float_t x, mp_float_t y) {
+    return x - y;
+}
+#endif
+
+#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
+
+// The functions below are roughly equivalent to the ones above,
+// but they are optimized to reduce code footprint by skipping
+// handling for special values such as nan, inf, +/-0.0
+// for ports where FP support is done in software.
+//
+// They also take into account lost bits of REPR_C as needed.
+
+static inline int fp_isless1(mp_float_t x) {
+    mp_float_union_t fb = { x };
     return fb.i < 0x3f800000;
 }
 
-#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+static inline int fp_iszero(mp_float_t x) {
+    mp_float_union_t x_check = { x };
+    return !x_check.i; // this is valid for REPR_C as well
+}
 
-#define FPTYPE double
-#define FPCONST(x) x
-#define FPROUND_TO_ONE 0.999999999995
-#define FPDECEXP 256
-#define FPMIN_BUF_SIZE 7 // +9e+199
-#define fp_signbit(x) signbit(x)
-#define fp_isnan(x) isnan(x)
-#define fp_isinf(x) isinf(x)
-#define fp_iszero(x) (x == 0)
-#define fp_isless1(x) (x < 1.0)
+#if MICROPY_FLOAT_FORMAT_IMPL != MICROPY_FLOAT_FORMAT_IMPL_APPROX
+static inline int fp_equal(mp_float_t x, mp_float_t y) {
+    mp_float_union_t x_check = { x };
+    mp_float_union_t y_check = { y };
+    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
+    return (x_check.i & ~3) == (y_check.i & ~3);
+    #else
+    return x_check.i == y_check.i;
+    #endif
+}
+#else
+static inline mp_float_t fp_diff(mp_float_t x, mp_float_t y) {
+    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
+    mp_float_union_t x_check = { x };
+    mp_float_union_t y_check = { y };
+    x_check.i &= ~3;
+    y_check.i &= ~3;
+    return x_check.f - y_check.f;
+    #else
+    return x - y;
+    #endif
+}
+#endif
 
-#endif // MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT/DOUBLE
+#endif
 
-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;
+#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
+#define FPMIN_BUF_SIZE 6 // +9e+99
+#define MAX_MANTISSA_DIGITS  (9)
+#define SAFE_MANTISSA_DIGITS (6)
+#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+#define FPMIN_BUF_SIZE 7 // +9e+199
+#define MAX_MANTISSA_DIGITS  (19)
+#define SAFE_MANTISSA_DIGITS (16)
+#endif
+
+// Internal formatting flags
+#define FMT_MODE_E 0x01  // render using scientific notation (%e)
+#define FMT_MODE_G 0x02  // render using general format (%g)
+#define FMT_MODE_F 0x04  // render using using expanded fixed-point format (%f)
+#define FMT_E_CASE 0x20  // don't change this value (used for case conversion!)
+
+static char *mp_prepend_zeros(char *s, int cnt) {
+    *s++ = '0';
+    *s++ = '.';
+    while (cnt > 0) {
+        *s++ = '0';
+        cnt--;
+    }
+    return s;
 }
 
-int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, char sign) {
+// Helper to convert a decimal mantissa (provided as an mp_large_float_uint_t) to string
+static int mp_format_mantissa(mp_large_float_uint_t mantissa, mp_large_float_uint_t mantissa_cap, char *buf, char *s,
+    int num_digits, int max_exp_zeros, int trailing_zeros, int dec, int e, int fmt_flags) {
 
-    char *s = buf;
+    DEBUG_PRINTF("mantissa=" MP_FFUINT_FMT " exp=%d (cap=" MP_FFUINT_FMT "):\n", mantissa, e, mantissa_cap);
 
-    if (buf_size <= FPMIN_BUF_SIZE) {
-        // FPMIN_BUF_SIZE is the minimum size needed to store any FP number.
-        // If the buffer does not have enough room for this (plus null terminator)
-        // then don't try to format the float.
+    if (mantissa) {
+        // If rounding/searching created an extra digit or removed too many, fix mantissa first
+        if (mantissa >= mantissa_cap) {
+            if (fmt_flags & FMT_MODE_F) {
+                assert(e >= 0);
+                num_digits++;
+                dec++;
+            } else {
+                mantissa /= 10;
+                e++;
+            }
+        }
+    }
 
-        if (buf_size >= 2) {
-            *s++ = '?';
+    // When 'g' format is used, replace small exponents by explicit zeros
+    if ((fmt_flags & FMT_MODE_G) && e != 0) {
+        if (e >= 0) {
+            // If 0 < e < max_exp_zeros, expand positive exponent into trailing zeros
+            if (e < max_exp_zeros) {
+                dec += e;
+                if (dec >= num_digits) {
+                    trailing_zeros = dec - (num_digits - 1);
+                }
+                e = 0;
+            }
+        } else {
+            // If -4 <= e < 0, expand negative exponent without losing significant digits
+            if (e >= -4) {
+                int cnt = 0;
+                while (e < 0 && !(mantissa % 10)) {
+                    mantissa /= 10;
+                    cnt++;
+                    e++;
+                }
+                num_digits -= cnt;
+                s = mp_prepend_zeros(s, cnt - e - 1);
+                dec = 255;
+                e = 0;
+            }
         }
-        if (buf_size >= 1) {
-            *s = '\0';
+    }
+
+    // Convert the integer mantissa to string
+    for (int digit = num_digits - 1; digit >= 0; digit--) {
+        int digit_ofs = (digit > dec ? digit + 1 : digit);
+        s[digit_ofs] = '0' + (int)(mantissa % 10);
+        mantissa /= 10;
+    }
+    int dot = (dec >= 255);
+    if (dec + 1 < num_digits) {
+        dot = 1;
+        s++;
+        s[dec] = '.';
+    }
+    s += num_digits;
+    #if DEBUG_FLOAT_FORMATTING
+    *s = 0;
+    DEBUG_PRINTF("  =      %s exp=%d num_digits=%d zeros=%d dec=%d\n", buf, e, num_digits, trailing_zeros, dec);
+    #endif
+
+    // Append or remove trailing zeros, as required by format
+    if (trailing_zeros) {
+        dec -= num_digits - 1;
+        while (trailing_zeros--) {
+            if (!dec--) {
+                *s++ = '.';
+                dot = 1;
+            }
+            *s++ = '0';
         }
-        return buf_size >= 2;
     }
-    if (fp_signbit(f) && !fp_isnan(f)) {
-        *s++ = '-';
-        f = -f;
-    } else {
-        if (sign) {
-            *s++ = sign;
+    if (fmt_flags & FMT_MODE_G) {
+        // 'g' format requires to remove trailing zeros after decimal point
+        if (dot) {
+            while (s[-1] == '0') {
+                s--;
+            }
+            if (s[-1] == '.') {
+                s--;
+            }
+        }
+    }
+
+    // Append the exponent if needed
+    if (((e != 0) || (fmt_flags & FMT_MODE_E)) && !(fmt_flags & FMT_MODE_F)) {
+        *s++ = 'E' | (fmt_flags & FMT_E_CASE);
+        if (e >= 0) {
+            *s++ = '+';
+        } else {
+            *s++ = '-';
+            e = -e;
         }
+        if (e >= 100) {
+            *s++ = '0' + (e / 100);
+        }
+        *s++ = '0' + ((e / 10) % 10);
+        *s++ = '0' + (e % 10);
     }
+    *s = '\0';
+    DEBUG_PRINTF("  ===>   %s\n", buf);
 
-    // buf_remaining contains bytes available for digits and exponent.
-    // It is buf_size minus room for the sign and null byte.
-    int buf_remaining = buf_size - 1 - (s - buf);
+    return s - buf;
+}
 
+// minimal value expected for buf_size, to avoid checking everywhere for overflow
+#define MIN_BUF_SIZE (MAX_MANTISSA_DIGITS + 10)
+
+int mp_format_float(mp_float_t f_entry, char *buf_entry, size_t buf_size, char fmt, int prec, char sign) {
+    assert(buf_size >= MIN_BUF_SIZE);
+
+    // Handle sign
+    mp_float_t f = f_entry;
+    char *buf = buf_entry;
+    if (signbit(f_entry) && !isnan(f_entry)) {
+        f = -f;
+        sign = '-';
+    }
+    if (sign) {
+        *buf++ = sign;
+        buf_size--;
+    }
+
+    // Handle inf/nan
+    char uc = fmt & 0x20;
     {
-        char uc = fmt & 0x20;
-        if (fp_isinf(f)) {
+        char *s = buf;
+        if (isinf(f)) {
             *s++ = 'I' ^ uc;
             *s++ = 'N' ^ uc;
             *s++ = 'F' ^ uc;
             goto ret;
-        } else if (fp_isnan(f)) {
+        } else if (isnan(f)) {
             *s++ = 'N' ^ uc;
             *s++ = 'A' ^ uc;
             *s++ = 'N' ^ uc;
         ret:
             *s = '\0';
-            return s - buf;
+            return s - buf_entry;
         }
     }
 
+    // Decode format character
+    int fmt_flags = (unsigned char)uc;  // setup FMT_E_CASE, clear all other bits
+    char lofmt = (char)(fmt | 0x20);  // fmt in lowercase
+    if (lofmt == 'f') {
+        fmt_flags |= FMT_MODE_F;
+    } else if (lofmt == 'g') {
+        fmt_flags |= FMT_MODE_G;
+    } else {
+        fmt_flags |= FMT_MODE_E;
+    }
+
+    // When precision is unspecified, default to 6
     if (prec < 0) {
         prec = 6;
     }
-    char e_char = 'E' | (fmt & 0x20);   // e_char will match case of fmt
-    fmt |= 0x20; // Force fmt to be lowercase
-    char org_fmt = fmt;
-    if (fmt == 'g' && prec == 0) {
-        prec = 1;
+    // Use high precision for `repr`, but switch to exponent mode
+    // after 16 digits in any case to match CPython behaviour
+    int max_exp_zeros = (prec < (int)buf_size - 3 ? prec : (int)buf_size - 3);
+    if (prec == MP_FLOAT_REPR_PREC) {
+        prec = MAX_MANTISSA_DIGITS;
+        max_exp_zeros = 16;
     }
-    int e;
-    int dec = 0;
-    char e_sign = '\0';
-    int num_digits = 0;
-    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') {
-            // Truncate precision to prevent buffer overflow
-            if (prec + 2 > buf_remaining) {
-                prec = buf_remaining - 2;
-            }
-            num_digits = prec + 1;
-        } else {
-            // Truncate precision to prevent buffer overflow
-            if (prec + 6 > buf_remaining) {
-                prec = buf_remaining - 6;
-            }
-            if (fmt == 'e') {
-                e_sign = '+';
-            }
+    // Precompute the exact decimal exponent of f, such that
+    // abs(e) is lower bound on abs(power of 10 exponent).
+    int e = 0;
+    if (!fp_iszero(f)) {
+        // Approximate power of 10 exponent from binary exponent.
+        e = (int)(fp_expval(f) * MICROPY_FLOAT_CONST(0.3010299956639812));  // 1/log2(10).
+        int positive_exp = !fp_isless1(f);
+        mp_float_t u_base = (mp_float_t)mp_decimal_exp((mp_large_float_t)1.0, e + positive_exp);
+        while ((f >= u_base) == positive_exp) {
+            e += (positive_exp ? 1 : -1);
+            u_base = (mp_float_t)mp_decimal_exp((mp_large_float_t)1.0, e + positive_exp);
         }
-    } else if (fp_isless1(f)) {
-        FPTYPE f_entry = f;  // Save f in case we go to 'f' format.
-        // Build negative exponent
-        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')
-
-        if (fmt == 'f' || (fmt == 'g' && e <= 4)) {
-            fmt = 'f';
-            dec = 0;
+    }
 
-            if (org_fmt == 'g') {
-                prec += (e - 1);
-            }
+    // For 'e' format, prec is # digits after the decimal
+    // For 'f' format, prec is # digits after the decimal
+    // For 'g' format, prec is the max number of significant digits
+    //
+    // For 'e' & 'g' format, there will be a single digit before the decimal
+    // For 'f' format, zeros must be expanded instead of using an exponent.
+    // Make sure there is enough room in the buffer for them, or switch to format 'g'.
+    if ((fmt_flags & FMT_MODE_F) && e > 0) {
+        int req_size = e + prec + 2;
+        if (req_size > (int)buf_size) {
+            fmt_flags ^= FMT_MODE_F;
+            fmt_flags |= FMT_MODE_G;
+            prec++;
+        }
+    }
 
-            // truncate precision to prevent buffer overflow
-            if (prec + 2 > buf_remaining) {
-                prec = buf_remaining - 2;
+    // To work independently of the format, we precompute:
+    // - the max number of significant digits to produce
+    // - the number of leading zeros to prepend (mode f only)
+    // - the number of trailing zeros to append
+    int max_digits = prec;
+    int lead_zeros = 0;
+    int trail_zeros = 0;
+    if (fmt_flags & FMT_MODE_F) {
+        if (max_digits > (int)buf_size - 3) {
+            // cannot satisfy requested number of decimals given buf_size, sorry
+            max_digits = (int)buf_size - 3;
+        }
+        if (e < 0) {
+            if (max_digits > 2 && e < -2) {
+                // Insert explicit leading zeros
+                lead_zeros = (-e < max_digits ? -e : max_digits) - 2;
+                max_digits -= lead_zeros;
+            } else {
+                max_digits++;
             }
-
-            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 = '-';
-            dec = 0;
-
-            if (prec > (buf_remaining - FPMIN_BUF_SIZE)) {
-                prec = buf_remaining - FPMIN_BUF_SIZE;
-                if (fmt == 'g') {
-                    prec++;
-                }
-            }
-            signed_e = -e;
+            max_digits += e + 1;
         }
     } else {
-        // Build positive exponent.
-        // We don't modify f at this point to avoid inaccuracies 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.
-        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 (!(fmt_flags & FMT_MODE_G) || max_digits == 0) {
+            max_digits++;
         }
+    }
+    if (max_digits > MAX_MANTISSA_DIGITS) {
+        // use trailing zeros to avoid overflowing the mantissa
+        trail_zeros = max_digits - MAX_MANTISSA_DIGITS;
+        max_digits = MAX_MANTISSA_DIGITS;
+    }
+    int overhead = (fmt_flags & FMT_MODE_F ? 3 : FPMIN_BUF_SIZE + 1);
+    if (trail_zeros > (int)buf_size - max_digits - overhead) {
+        // cannot satisfy requested number of decimals given buf_size, sorry
+        trail_zeros = (int)buf_size - max_digits - overhead;
+    }
 
-        // 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.
-
-        if (fmt == 'f') {
-            if (e >= buf_remaining) {
-                fmt = 'e';
-            } else if ((e + prec + 2) > buf_remaining) {
-                prec = buf_remaining - e - 2;
-                if (prec < 0) {
-                    // This means no decimal point, so we can add one back
-                    // for the decimal.
-                    prec++;
-                }
-            }
-        }
-        if (fmt == 'e' && prec > (buf_remaining - FPMIN_BUF_SIZE)) {
-            prec = buf_remaining - FPMIN_BUF_SIZE;
-        }
-        if (fmt == 'g') {
-            // Truncate precision to prevent buffer overflow
-            if (prec + (FPMIN_BUF_SIZE - 1) > buf_remaining) {
-                prec = buf_remaining - (FPMIN_BUF_SIZE - 1);
-            }
-        }
-        // If the user specified 'g' format, and e is < prec, then we'll switch
-        // to the fixed format.
+    // When the caller asks for more precision than available for sure,
+    // Look for a shorter (rounded) representation first, and only dig
+    // into more digits if there is no short representation.
+    int num_digits = (SAFE_MANTISSA_DIGITS < max_digits ? SAFE_MANTISSA_DIGITS : max_digits);
+try_again:
+    ;
 
-        if (fmt == 'g' && e < prec) {
-            fmt = 'f';
-            prec -= (e + 1);
-        }
-        if (fmt == 'f') {
-            dec = e;
-            num_digits = prec + e + 1;
+    char *s = buf;
+    int extra_zeros = trail_zeros + (max_digits - num_digits);
+    int decexp;
+    int dec = 0;
+
+    if (fp_iszero(f)) {
+        // no need for scaling 0.0
+        decexp = 0;
+    } else if (fmt_flags & FMT_MODE_F) {
+        decexp = num_digits - 1;
+        if (e < 0) {
+            // Negative exponent: we keep a single leading zero in the mantissa,
+            // as using more would waste precious digits needed for accuracy.
+            if (lead_zeros > 0) {
+                // We are using leading zeros
+                s = mp_prepend_zeros(s, lead_zeros);
+                decexp += lead_zeros + 1;
+                dec = 255; // no decimal dot
+            } else {
+                // Small negative exponent, work directly on the mantissa
+                dec = 0;
+            }
         } else {
-            e_sign = '+';
+            // Positive exponent: we will add trailing zeros separately
+            decexp -= e;
+            dec = e;
         }
-        signed_e = e;
+    } else {
+        decexp = num_digits - e - 1;
     }
-    if (prec < 0) {
-        // This can happen when the prec is trimmed to prevent buffer overflow
-        prec = 0;
+    DEBUG_PRINTF("input=%.19g e=%d fmt=%c max_d=%d num_d=%d decexp=%d dec=%d l0=%d r0=%d\n",
+        (double)f, e, lofmt, max_digits, num_digits, decexp, dec, lead_zeros, extra_zeros);
+
+    // At this point,
+    // - buf points to beginning of output buffer for the unsigned representation
+    // - num_digits == the number of mantissa digits to add
+    // - (dec + 1) == the number of digits to print before adding a decimal point
+    // - decexp == the power of 10 exponent to apply to f to get the decimal mantissa
+    // - e == the power of 10 exponent to append ('e' or 'g' format)
+    mp_large_float_uint_t mantissa_cap = 10;
+    for (int n = 1; n < num_digits; n++) {
+        mantissa_cap *= 10;
     }
 
-    // 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
-    // For g, prec is the max number of significant digits
-    //
-    // For e & g there will be a single digit before the decimal
-    // for f there will be e digits before the decimal
-
-    if (fmt == 'e') {
-        num_digits = prec + 1;
-    } else if (fmt == 'g') {
-        if (prec == 0) {
-            prec = 1;
+    // Build the decimal mantissa into a large uint
+    mp_large_float_uint_t mantissa = 1;
+    if (sizeof(mp_large_float_t) == sizeof(mp_float_t) && num_digits > SAFE_MANTISSA_DIGITS && decexp > 1) {
+        // if we don't have large floats, use integer multiply to produce the last digits
+        if (num_digits > SAFE_MANTISSA_DIGITS + 1 && decexp > 2) {
+            mantissa = 100;
+            decexp -= 2;
+        } else {
+            mantissa = 10;
+            decexp -= 1;
         }
-        num_digits = prec;
     }
-
-    int d = 0;
-    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.
-            u_base = MICROPY_FLOAT_C_FUN(pow)(10, digit_index);
-        }
-        for (d = 0; d < 9; ++d) {
-            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 > 0) {
-            // Emit this number (the leading digit).
-            *s++ = '0' + d;
-            if (dec == 0 && prec > 0) {
-                *s++ = '.';
-            }
-        }
-        --dec;
-        --num_digits;
-        if (digit_index <= 0) {
-            // 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);
+    mp_large_float_t mantissa_f = mp_decimal_exp((mp_large_float_t)f, decexp);
+    mantissa *= (mp_large_float_uint_t)(mantissa_f + (mp_large_float_t)0.5);
+    DEBUG_PRINTF("input=%.19g fmt=%c num_digits=%d dec=%d mantissa=" MP_FFUINT_FMT " r0=%d\n", (double)f, lofmt, num_digits, dec, mantissa, extra_zeros);
+
+    // Finally convert the decimal mantissa to a floating-point string, according to formatting rules
+    int reprlen = mp_format_mantissa(mantissa, mantissa_cap, buf, s, num_digits, max_exp_zeros, extra_zeros, dec, e, fmt_flags);
+    assert(reprlen + 1 <= (int)buf_size);
+
+    #if MICROPY_FLOAT_FORMAT_IMPL != MICROPY_FLOAT_FORMAT_IMPL_APPROX
+
+    if (num_digits < max_digits) {
+        // The initial precision might not be sufficient for an exact representation
+        // for all numbers. If the result is not exact, restart using next precision.
+        // parse the resulting number and compare against the original
+        mp_float_t check;
+        DEBUG_PRINTF("input=%.19g, compare to float('%s')\n", (double)f, buf);
+        mp_parse_float_internal(buf, reprlen, &check);
+        if (!fp_equal(check, f)) {
+            num_digits++;
+            DEBUG_PRINTF("Not perfect, retry using more digits (%d)\n", num_digits);
+            goto try_again;
         }
     }
-    // Rounding.  If the next digit to print is >= 5, round up.
-    if (d >= 5) {
-        char *rs = s;
-        rs--;
-        while (1) {
-            if (*rs == '.') {
-                rs--;
-                continue;
-            }
-            if (*rs < '0' || *rs > '9') {
-                // + or -
-                rs++; // So we sit on the digit to the right of the sign
-                break;
+
+    #else
+
+    // The initial decimal mantissa might not have been be completely accurate due
+    // to the previous loating point operations. The best way to verify this is to
+    // parse the resulting number and compare against the original
+    mp_float_t check;
+    DEBUG_PRINTF("input=%.19g, compare to float('%s')\n", (double)f, buf);
+    mp_parse_float_internal(buf, reprlen, &check);
+    mp_float_t diff = fp_diff(check, f);
+    mp_float_t best_diff = diff;
+    mp_large_float_uint_t best_mantissa = mantissa;
+
+    if (fp_iszero(diff)) {
+        // we have a perfect match
+        DEBUG_PRINTF(MP_FFUINT_FMT ": perfect match (direct)\n", mantissa);
+    } else {
+        // In order to get the best possible representation, we will perform a
+        // dichotomic search for a reversible representation.
+        // This will also provide optimal rounding on the fly.
+        unsigned err_range = 1;
+        if (num_digits > SAFE_MANTISSA_DIGITS) {
+            err_range <<= 3 * (num_digits - SAFE_MANTISSA_DIGITS);
+        }
+        int maxruns = 3 + 3 * (MAX_MANTISSA_DIGITS - SAFE_MANTISSA_DIGITS);
+        while (maxruns-- > 0) {
+            // update mantissa according to dichotomic search
+            if (signbit(diff)) {
+                mantissa += err_range;
+            } else {
+                // mantissa is expected to always have more significant digits than err_range
+                assert(mantissa >= err_range);
+                mantissa -= err_range;
             }
-            if (*rs < '9') {
-                (*rs)++;
+            // retry conversion
+            reprlen = mp_format_mantissa(mantissa, mantissa_cap, buf, s, num_digits, max_exp_zeros, extra_zeros, dec, e, fmt_flags);
+            assert(reprlen + 1 <= (int)buf_size);
+            DEBUG_PRINTF("input=%.19g, compare to float('%s')\n", (double)f, buf);
+            mp_parse_float_internal(buf, reprlen, &check);
+            DEBUG_PRINTF("check=%.19g num_digits=%d e=%d mantissa=" MP_FFUINT_FMT "\n", (double)check, num_digits, e, mantissa);
+            diff = fp_diff(check, f);
+            if (fp_iszero(diff)) {
+                // we have a perfect match
+                DEBUG_PRINTF(MP_FFUINT_FMT ": perfect match\n", mantissa);
                 break;
             }
-            *rs = '0';
-            if (rs == buf) {
-                break;
+            // keep track of our best estimate
+            mp_float_t delta = MICROPY_FLOAT_C_FUN(fabs)(diff) - MICROPY_FLOAT_C_FUN(fabs)(best_diff);
+            if (signbit(delta) || (fp_iszero(delta) && !(mantissa % 10u))) {
+                best_diff = diff;
+                best_mantissa = mantissa;
             }
-            rs--;
-        }
-        if (*rs == '0') {
-            // We need to insert a 1
-            if (rs[1] == '.' && fmt != 'f') {
-                // We're going to round 9.99 to 10.00
-                // Move the decimal point
-                rs[0] = '.';
-                rs[1] = '0';
-                if (e_sign == '-') {
-                    e--;
-                    if (e == 0) {
-                        e_sign = '+';
-                    }
-                } else {
-                    e++;
-                }
+            // string repr is not perfect: continue a dichotomic improvement
+            DEBUG_PRINTF(MP_FFUINT_FMT ": %.19g, err_range=%d\n", mantissa, (double)check, err_range);
+            if (err_range > 1) {
+                err_range >>= 1;
             } else {
-                // Need at extra digit at the end to make room for the leading '1'
-                // but if we're at the buffer size limit, just drop the final digit.
-                if ((size_t)(s + 1 - buf) < buf_size) {
-                    s++;
+                // We have tried all possible mantissa, without finding a reversible repr.
+                // Check if we have an alternate precision to try.
+                if (num_digits < max_digits) {
+                    num_digits++;
+                    DEBUG_PRINTF("Failed to find a perfect match, try with more digits (%d)\n", num_digits);
+                    goto try_again;
                 }
+                // Otherwise, keep the closest one, which is either the first one or the last one.
+                if (mantissa == best_mantissa) {
+                    // Last guess is the best one
+                    DEBUG_PRINTF(MP_FFUINT_FMT ": last guess was the best one\n", mantissa);
+                } else {
+                    // We had a better guess earlier
+                    DEBUG_PRINTF(MP_FFUINT_FMT ": use best guess\n", mantissa);
+                    reprlen = mp_format_mantissa(best_mantissa, mantissa_cap, buf, s, num_digits, max_exp_zeros, extra_zeros, dec, e, fmt_flags);
+                }
+                break;
             }
-            char *ss = s;
-            while (ss > rs) {
-                *ss = ss[-1];
-                ss--;
-            }
-            *rs = '1';
         }
     }
+    #endif
 
-    // verify that we did not overrun the input buffer so far
-    assert((size_t)(s + 1 - buf) <= buf_size);
-
-    if (org_fmt == 'g' && prec > 0) {
-        // Remove trailing zeros and a trailing decimal point
-        while (s[-1] == '0') {
-            s--;
-        }
-        if (s[-1] == '.') {
-            s--;
-        }
-    }
-    // Append the exponent
-    if (e_sign) {
-        *s++ = e_char;
-        *s++ = e_sign;
-        if (FPMIN_BUF_SIZE == 7 && e >= 100) {
-            *s++ = '0' + (e / 100);
-        }
-        *s++ = '0' + ((e / 10) % 10);
-        *s++ = '0' + (e % 10);
-    }
-    *s = '\0';
-
-    // verify that we did not overrun the input buffer
-    assert((size_t)(s + 1 - buf) <= buf_size);
-
-    return s - buf;
+    return buf + reprlen - buf_entry;
 }
 
 #endif // MICROPY_FLOAT_IMPL != MICROPY_FLOAT_IMPL_NONE
diff --git a/py/formatfloat.h b/py/formatfloat.h
index 9a1643b4ddff5..7b1414672b77b 100644
--- a/py/formatfloat.h
+++ b/py/formatfloat.h
@@ -29,6 +29,7 @@
 #include "py/mpconfig.h"
 
 #if MICROPY_PY_BUILTINS_FLOAT
+#define MP_FLOAT_REPR_PREC (99) // magic `prec` value for optimal `repr` behaviour
 int mp_format_float(mp_float_t f, char *buf, size_t bufSize, char fmt, int prec, char sign);
 #endif
 
diff --git a/py/misc.h b/py/misc.h
index e034485838954..86ac2ec9a1061 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -277,6 +277,25 @@ typedef union _mp_float_union_t {
     mp_float_uint_t i;
 } mp_float_union_t;
 
+#if MICROPY_FLOAT_FORMAT_IMPL == MICROPY_FLOAT_FORMAT_IMPL_EXACT
+
+#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
+// Exact float conversion requires using internally a bigger sort of floating point
+typedef double mp_large_float_t;
+#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+typedef long double mp_large_float_t;
+#endif
+// Always use a 64 bit mantissa for formatting and parsing
+typedef uint64_t mp_large_float_uint_t;
+
+#else // MICROPY_FLOAT_FORMAT_IMPL != MICROPY_FLOAT_FORMAT_IMPL_EXACT
+
+// No bigger floating points
+typedef mp_float_t mp_large_float_t;
+typedef mp_float_uint_t mp_large_float_uint_t;
+
+#endif
+
 #endif // MICROPY_PY_BUILTINS_FLOAT
 
 /** ROM string compression *************/
diff --git a/py/mpconfig.h b/py/mpconfig.h
index c316aa4b2d894..caa63fef3f6b0 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -861,6 +861,27 @@ typedef double mp_float_t;
 #define MICROPY_PY_BUILTINS_COMPLEX (MICROPY_PY_BUILTINS_FLOAT)
 #endif
 
+// Float to string conversion implementations
+//
+// Note that the EXACT method is only available if the compiler supports
+// floating points larger than mp_float_t:
+// - with MICROPY_FLOAT_IMPL_FLOAT, the compiler needs to support `double`
+// - with MICROPY_FLOAT_IMPL_DOUBLE, the compiler needs to support `long double`
+//
+#define MICROPY_FLOAT_FORMAT_IMPL_BASIC (0)  // smallest code, but inexact
+#define MICROPY_FLOAT_FORMAT_IMPL_APPROX (1) // slightly bigger, almost perfect
+#define MICROPY_FLOAT_FORMAT_IMPL_EXACT (2)  // bigger code, and 100% exact repr
+
+#ifndef MICROPY_FLOAT_FORMAT_IMPL
+#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
+#define MICROPY_FLOAT_FORMAT_IMPL (MICROPY_FLOAT_FORMAT_IMPL_APPROX)
+#elif defined(__SIZEOF_LONG_DOUBLE__) && __SIZEOF_LONG_DOUBLE__ > __SIZEOF_DOUBLE__
+#define MICROPY_FLOAT_FORMAT_IMPL (MICROPY_FLOAT_FORMAT_IMPL_EXACT)
+#else
+#define MICROPY_FLOAT_FORMAT_IMPL (MICROPY_FLOAT_FORMAT_IMPL_APPROX)
+#endif
+#endif
+
 // Whether to use the native _Float16 for 16-bit float support
 #ifndef MICROPY_FLOAT_USE_NATIVE_FLT16
 #ifdef __FLT16_MAX__
diff --git a/py/mpprint.c b/py/mpprint.c
index f1d8bd0c57366..bd7a250878b89 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -338,7 +338,7 @@ int mp_print_mp_int(const mp_print_t *print, mp_obj_t x, unsigned int base, int
 
 #if MICROPY_PY_BUILTINS_FLOAT
 int mp_print_float(const mp_print_t *print, mp_float_t f, char fmt, unsigned int flags, char fill, int width, int prec) {
-    char buf[32];
+    char buf[36];
     char sign = '\0';
     int chrs = 0;
 
@@ -349,11 +349,17 @@ int mp_print_float(const mp_print_t *print, mp_float_t f, char fmt, unsigned int
         sign = ' ';
     }
 
-    int len = mp_format_float(f, buf, sizeof(buf), fmt, prec, sign);
+    int len = mp_format_float(f, buf, sizeof(buf) - 3, fmt, prec, sign);
 
     char *s = buf;
 
-    if ((flags & PF_FLAG_ADD_PERCENT) && (size_t)(len + 1) < sizeof(buf)) {
+    if ((flags & PF_FLAG_ALWAYS_DECIMAL) && strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL && strchr(buf, 'n') == NULL) {
+        buf[len++] = '.';
+        buf[len++] = '0';
+        buf[len] = '\0';
+    }
+
+    if (flags & PF_FLAG_ADD_PERCENT) {
         buf[len++] = '%';
         buf[len] = '\0';
     }
diff --git a/py/mpprint.h b/py/mpprint.h
index 583f00bda8099..250ea24b87840 100644
--- a/py/mpprint.h
+++ b/py/mpprint.h
@@ -36,6 +36,7 @@
 #define PF_FLAG_CENTER_ADJUST     (0x020)
 #define PF_FLAG_ADD_PERCENT       (0x040)
 #define PF_FLAG_SHOW_OCTAL_LETTER (0x080)
+#define PF_FLAG_ALWAYS_DECIMAL    (0x100)
 #define PF_FLAG_SEP_POS           (9) // must be above all the above PF_FLAGs
 
 #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
diff --git a/py/objcomplex.c b/py/objcomplex.c
index 85b5852845737..805899edf4396 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -45,29 +45,18 @@ typedef struct _mp_obj_complex_t {
 static void complex_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_complex_t *o = MP_OBJ_TO_PTR(o_in);
-    #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-    char buf[16];
-    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
-    const int precision = 6;
-    #else
-    const int precision = 7;
-    #endif
-    #else
-    char buf[32];
-    const int precision = 16;
-    #endif
-    if (o->real == 0) {
-        mp_format_float(o->imag, buf, sizeof(buf), 'g', precision, '\0');
-        mp_printf(print, "%sj", buf);
+    const char *suffix;
+    int flags = 0;
+    if (o->real != 0) {
+        mp_print_str(print, "(");
+        mp_print_float(print, o->real, 'g', 0, '\0', -1, MP_FLOAT_REPR_PREC);
+        flags = PF_FLAG_SHOW_SIGN;
+        suffix = "j)";
     } else {
-        mp_format_float(o->real, buf, sizeof(buf), 'g', precision, '\0');
-        mp_printf(print, "(%s", buf);
-        if (o->imag >= 0 || isnan(o->imag)) {
-            mp_print_str(print, "+");
-        }
-        mp_format_float(o->imag, buf, sizeof(buf), 'g', precision, '\0');
-        mp_printf(print, "%sj)", buf);
+        suffix = "j";
     }
+    mp_print_float(print, o->imag, 'g', flags, '\0', -1, MP_FLOAT_REPR_PREC);
+    mp_print_str(print, suffix);
 }
 
 static mp_obj_t complex_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
diff --git a/py/objfloat.c b/py/objfloat.c
index 81b0daa620916..125b576fb61c3 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -110,23 +110,7 @@ mp_int_t mp_float_hash(mp_float_t src) {
 static void float_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_float_t o_val = mp_obj_float_get(o_in);
-    #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-    char buf[16];
-    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
-    const int precision = 6;
-    #else
-    const int precision = 7;
-    #endif
-    #else
-    char buf[32];
-    const int precision = 16;
-    #endif
-    mp_format_float(o_val, buf, sizeof(buf), 'g', precision, '\0');
-    mp_print_str(print, buf);
-    if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL && strchr(buf, 'n') == NULL) {
-        // Python floats always have decimal point (unless inf or nan)
-        mp_print_str(print, ".0");
-    }
+    mp_print_float(print, o_val, 'g', PF_FLAG_ALWAYS_DECIMAL, '\0', -1, MP_FLOAT_REPR_PREC);
 }
 
 static mp_obj_t float_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
diff --git a/py/parsenum.c b/py/parsenum.c
index 019491b5132ae..e18002306a259 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -210,7 +210,7 @@ typedef enum {
 } parse_dec_in_t;
 
 // MANTISSA_MAX is used to retain precision while not overflowing mantissa
-#define MANTISSA_MAX (sizeof(mp_float_uint_t) == 8 ? 0x1999999999999998ULL : 0x19999998U)
+#define MANTISSA_MAX (sizeof(mp_large_float_uint_t) == 8 ? 0x1999999999999998ULL : 0x19999998U)
 
 // MAX_EXACT_POWER_OF_5 is the largest value of x so that 5^x can be stored exactly in a float
 #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
@@ -220,11 +220,45 @@ typedef enum {
 #endif
 
 // Helper to compute `num * (10.0 ** dec_exp)`
-mp_float_t mp_decimal_exp(mp_float_t num, int dec_exp) {
-
-    if (dec_exp == 0 || num == MICROPY_FLOAT_CONST(0.0)) {
+mp_large_float_t mp_decimal_exp(mp_large_float_t num, int dec_exp) {
+    if (dec_exp == 0 || num == (mp_large_float_t)(0.0)) {
         return num;
     }
+
+    #if MICROPY_FLOAT_FORMAT_IMPL == MICROPY_FLOAT_FORMAT_IMPL_EXACT
+
+    // If the assert below fails, it means you have chosen MICROPY_FLOAT_FORMAT_IMPL_EXACT
+    // manually on a platform where `larger floats` are not supported, which would
+    // result in inexact conversions. To fix this issue, change your `mpconfigport.h`
+    // and select MICROPY_FLOAT_FORMAT_IMPL_APPROX instead
+    assert(sizeof(mp_large_float_t) > sizeof(mp_float_t));
+
+    // Perform power using simple multiplications, to avoid
+    // dependency to higher-precision pow() function
+    int neg_exp = (dec_exp < 0);
+    if (neg_exp) {
+        dec_exp = -dec_exp;
+    }
+    mp_large_float_t res = num;
+    mp_large_float_t expo = (mp_large_float_t)10.0;
+    while (dec_exp) {
+        if (dec_exp & 1) {
+            if (neg_exp) {
+                res /= expo;
+            } else {
+                res *= expo;
+            }
+        }
+        dec_exp >>= 1;
+        if (dec_exp) {
+            expo *= expo;
+        }
+    }
+    return res;
+
+    #else
+    // MICROPY_FLOAT_FORMAT_IMPL != MICROPY_FLOAT_FORMAT_IMPL_EXACT
+
     mp_float_union_t res = {num};
     // Multiply first by (2.0 ** dec_exp) via the exponent
     // - this will ensure that the result of `pow()` is always in mp_float_t range
@@ -238,12 +272,14 @@ mp_float_t mp_decimal_exp(mp_float_t num, int dec_exp) {
     } else {
         res.f *= MICROPY_FLOAT_C_FUN(pow)(5, dec_exp);
     }
-    return (mp_float_t)res.f;
+    return (mp_large_float_t)res.f;
+
+    #endif
 }
 
 
 // Break out inner digit accumulation routine to ease trailing zero deferral.
-static mp_float_uint_t accept_digit(mp_float_uint_t p_mantissa, unsigned int dig, int *p_exp_extra, int in) {
+static mp_large_float_uint_t accept_digit(mp_large_float_uint_t p_mantissa, unsigned int dig, int *p_exp_extra, int in) {
     // Core routine to ingest an additional digit.
     if (p_mantissa < MANTISSA_MAX) {
         // dec_val won't overflow so keep accumulating
@@ -267,7 +303,7 @@ const char *mp_parse_float_internal(const char *str, size_t len, mp_float_t *res
 
     parse_dec_in_t in = PARSE_DEC_IN_INTG;
     bool exp_neg = false;
-    mp_float_uint_t mantissa = 0;
+    mp_large_float_uint_t mantissa = 0;
     int exp_val = 0;
     int exp_extra = 0;
     int trailing_zeros_intg = 0, trailing_zeros_frac = 0;
diff --git a/py/parsenum.h b/py/parsenum.h
index a807cb09d0572..d532cb194a5d8 100644
--- a/py/parsenum.h
+++ b/py/parsenum.h
@@ -35,7 +35,7 @@
 mp_obj_t mp_parse_num_integer(const char *restrict str, size_t len, int base, mp_lexer_t *lex);
 
 #if MICROPY_PY_BUILTINS_FLOAT
-mp_float_t mp_decimal_exp(mp_float_t num, int dec_exp);
+mp_large_float_t mp_decimal_exp(mp_large_float_t num, int dec_exp);
 const char *mp_parse_float_internal(const char *str, size_t len, mp_float_t *res);
 #endif
 
diff --git a/tests/float/float_format.py b/tests/float/float_format.py
index 98ed0eb096fa4..0eb8b232b063a 100644
--- a/tests/float/float_format.py
+++ b/tests/float/float_format.py
@@ -2,14 +2,25 @@
 
 # general rounding
 for val in (116, 1111, 1234, 5010, 11111):
-    print("%.0f" % val)
-    print("%.1f" % val)
-    print("%.3f" % val)
+    print("Test on %d / 1000:" % val)
+    for fmt in ("%.5e", "%.3e", "%.1e", "%.0e", "%.3f", "%.1f", "%.0f", "%.3g", "%.1g", "%.0g"):
+        print(fmt, fmt % (val / 1000))
+
+# make sure round-up to the next unit is handled properly
+for val in range(4, 9):
+    divi = 10**val
+    print("Test on 99994 / (10 ** %d):" % val)
+    for fmt in ("%.5e", "%.3e", "%.1e", "%.0e", "%.3f", "%.1f", "%.0f", "%.3g", "%.1g", "%.0g"):
+        print(fmt, fmt % (99994 / divi))
 
 # make sure rounding is done at the correct precision
 for prec in range(8):
     print(("%%.%df" % prec) % 6e-5)
 
+# make sure trailing zeroes are added properly
+for prec in range(8):
+    print(("%%.%df" % prec) % 1e19)
+
 # check certain cases that had a digit value of 10 render as a ":" character
 print("%.2e" % float("9" * 51 + "e-39"))
 print("%.2e" % float("9" * 40 + "e-21"))
diff --git a/tests/float/float_format_accuracy.py b/tests/float/float_format_accuracy.py
new file mode 100644
index 0000000000000..f9467f9c05d89
--- /dev/null
+++ b/tests/float/float_format_accuracy.py
@@ -0,0 +1,73 @@
+# Test accuracy of `repr` conversions.
+# This test also increases code coverage for corner cases.
+
+try:
+    import array, math, random
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# The largest errors come from seldom used very small numbers, near the
+# limit of the representation. So we keep them out of this test to keep
+# the max relative error display useful.
+if float("1e-100") == 0.0:
+    # single-precision
+    float_type = "f"
+    float_size = 4
+    # testing range
+    min_expo = -96  # i.e. not smaller than 1.0e-29
+    # Expected results (given >=50'000 samples):
+    # - MICROPY_FLTCONV_IMPL_EXACT: 100% exact conversions
+    # - MICROPY_FLTCONV_IMPL_APPROX: >=98.53% exact conversions, max relative error <= 1.01e-7
+    min_success = 0.980  # with only 1200 samples, the success rate is lower
+    max_rel_err = 1.1e-7
+    # REPR_C is typically used with FORMAT_IMPL_BASIC, which has a larger error
+    is_REPR_C = float("1.0000001") == float("1.0")
+    if is_REPR_C:  # REPR_C
+        min_success = 0.83
+        max_rel_err = 5.75e-07
+else:
+    # double-precision
+    float_type = "d"
+    float_size = 8
+    # testing range
+    min_expo = -845  # i.e. not smaller than 1.0e-254
+    # Expected results (given >=200'000 samples):
+    # - MICROPY_FLTCONV_IMPL_EXACT: 100% exact conversions
+    # - MICROPY_FLTCONV_IMPL_APPROX: >=99.83% exact conversions, max relative error <= 2.7e-16
+    min_success = 0.997  # with only 1200 samples, the success rate is lower
+    max_rel_err = 2.7e-16
+
+
+# Deterministic pseudorandom generator. Designed to be uniform
+# on mantissa values and exponents, not on the represented number
+def pseudo_randfloat():
+    rnd_buff = bytearray(float_size)
+    for _ in range(float_size):
+        rnd_buff[_] = random.getrandbits(8)
+    return array.array(float_type, rnd_buff)[0]
+
+
+random.seed(42)
+stats = 0
+N = 1200
+max_err = 0
+for _ in range(N):
+    f = pseudo_randfloat()
+    while type(f) is not float or math.isinf(f) or math.isnan(f) or math.frexp(f)[1] <= min_expo:
+        f = pseudo_randfloat()
+
+    str_f = repr(f)
+    f2 = float(str_f)
+    if f2 == f:
+        stats += 1
+    else:
+        error = abs((f2 - f) / f)
+        if max_err < error:
+            max_err = error
+
+print(N, "values converted")
+if stats / N >= min_success and max_err <= max_rel_err:
+    print("float format accuracy OK")
+else:
+    print("FAILED: repr rate=%.3f%% max_err=%.3e" % (100 * stats / N, max_err))
diff --git a/tests/float/float_format_ints.py b/tests/float/float_format_ints.py
index df4444166c5fa..7b7b30c4b340b 100644
--- a/tests/float/float_format_ints.py
+++ b/tests/float/float_format_ints.py
@@ -12,14 +12,42 @@
             print(title, "with format", f_fmt, "gives", f_fmt.format(f))
             print(title, "with format", g_fmt, "gives", g_fmt.format(f))
 
+# The tests below check border cases involving all mantissa bits.
+# In case of REPR_C, where the mantissa is missing two bits, the
+# the string representation for such numbers might not always be exactly
+# the same but nevertheless be correct, so we must allow a few exceptions.
+is_REPR_C = float("1.0000001") == float("1.0")
+
 # 16777215 is 2^24 - 1, the largest integer that can be completely held
 # in a float32.
-print("{:f}".format(16777215))
+val_str = "{:f}".format(16777215)
+
+# When using REPR_C, 16777215.0 is the same as 16777212.0 or 16777214.4
+# (depending on the implementation of pow() function, the result may differ)
+if is_REPR_C and (val_str == "16777212.000000" or val_str == "16777214.400000"):
+    val_str = "16777215.000000"
+
+print(val_str)
+
 # 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))
+val_str = "{:f}".format(2147483520)
+
+# When using FLOAT_IMPL_FLOAT, 2147483520.0 == 2147483500.0
+# Both representations are valid, the second being "simpler"
+is_float32 = float("1e300") == float("inf")
+if is_float32 and val_str == "2147483500.000000":
+    val_str = "2147483520.000000"
+
+# When using REPR_C, 2147483520.0 is the same as 2147483200.0
+# Both representations are valid, the second being "simpler"
+if is_REPR_C and val_str == "2147483200.000000":
+    val_str = "2147483520.000000"
+
+print(val_str)
+
 # 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_struct_e.py b/tests/float/float_struct_e.py
index 403fbc5db4cde..ba4134f3393ed 100644
--- a/tests/float/float_struct_e.py
+++ b/tests/float/float_struct_e.py
@@ -32,7 +32,7 @@
     for i in (j, -j):
         x = struct.pack("<e", i)
         v = struct.unpack("<e", x)[0]
-        print("%.7f %s %.15f %s" % (i, x, v, i == v))
+        print("%.7f %s %.7f %s" % (i, x, v, i == v))
 
 # In CPython, packing a float that doesn't fit into a half-float raises OverflowError.
 # But in MicroPython it does not, but rather stores the value as inf.
diff --git a/tests/float/float_struct_e_doubleprec.py b/tests/float/float_struct_e_doubleprec.py
new file mode 100644
index 0000000000000..403fbc5db4cde
--- /dev/null
+++ b/tests/float/float_struct_e_doubleprec.py
@@ -0,0 +1,43 @@
+# Test struct pack/unpack with 'e' typecode.
+
+try:
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+test_values = (
+    1e-7,
+    2e-7,
+    1e-6,
+    1e-5,
+    1e-4,
+    1e-3,
+    1e-2,
+    0.1,
+    0,
+    1,
+    2,
+    4,
+    8,
+    10,
+    100,
+    1e3,
+    1e4,
+    6e4,
+    float("inf"),
+)
+
+for j in test_values:
+    for i in (j, -j):
+        x = struct.pack("<e", i)
+        v = struct.unpack("<e", x)[0]
+        print("%.7f %s %.15f %s" % (i, x, v, i == v))
+
+# In CPython, packing a float that doesn't fit into a half-float raises OverflowError.
+# But in MicroPython it does not, but rather stores the value as inf.
+# This test is here for coverage.
+try:
+    struct.pack("e", 1e15)
+except OverflowError:
+    pass
diff --git a/tests/float/float_struct_e_fp30.py b/tests/float/float_struct_e_fp30.py
new file mode 100644
index 0000000000000..6ef84ca063c76
--- /dev/null
+++ b/tests/float/float_struct_e_fp30.py
@@ -0,0 +1,43 @@
+# Test struct pack/unpack with 'e' typecode.
+
+try:
+    import struct
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+test_values = (
+    1e-7,
+    2e-7,
+    1e-6,
+    1e-5,
+    1e-4,
+    1e-3,
+    1e-2,
+    0.1,
+    0,
+    1,
+    2,
+    4,
+    8,
+    10,
+    100,
+    1e3,
+    1e4,
+    6e4,
+    float("inf"),
+)
+
+for j in test_values:
+    for i in (j, -j):
+        x = struct.pack("<e", i)
+        v = struct.unpack("<e", x)[0]
+        print("%.7f %s %.5f %s" % (i, x, v, i == v))
+
+# In CPython, packing a float that doesn't fit into a half-float raises OverflowError.
+# But in MicroPython it does not, but rather stores the value as inf.
+# This test is here for coverage.
+try:
+    struct.pack("e", 1e15)
+except OverflowError:
+    pass
diff --git a/tests/float/string_format_modulo3.py b/tests/float/string_format_modulo3.py
index f9d9c43cdf42d..f8aeeda20f29c 100644
--- a/tests/float/string_format_modulo3.py
+++ b/tests/float/string_format_modulo3.py
@@ -1,3 +1,3 @@
-# uPy and CPython outputs differ for the following
+# Test corner cases where MicroPython and CPython outputs used to differ in the past
 print("%.1g" % -9.9)  # round up 'g' with '-' sign
 print("%.2g" % 99.9)  # round up
diff --git a/tests/float/string_format_modulo3.py.exp b/tests/float/string_format_modulo3.py.exp
deleted file mode 100644
index 71432b3404519..0000000000000
--- a/tests/float/string_format_modulo3.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
--10
-100
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index e20871273d709..85e0e18cbfd8a 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -127,10 +127,6 @@ TypeError: can't convert NoneType to int
 TypeError: can't convert NoneType to int
 ValueError: 
 Warning: test
-# format float
-?
-+1e+00
-+1e+00
 # binary
 123
 456
diff --git a/tests/ports/unix/ffi_float2.py b/tests/ports/unix/ffi_float2.py
index bbed6966627e1..eac6cd106cf43 100644
--- a/tests/ports/unix/ffi_float2.py
+++ b/tests/ports/unix/ffi_float2.py
@@ -29,4 +29,5 @@ def ffi_open(names):
 
 for fun in (tgammaf,):
     for val in (0.5, 1, 1.0, 1.5, 4, 4.0):
-        print("%.6f" % fun(val))
+        # limit to 5 decimals in order to pass with REPR_C with FORMAT_IMPL_BASIC
+        print("%.5f" % fun(val))
diff --git a/tests/ports/unix/ffi_float2.py.exp b/tests/ports/unix/ffi_float2.py.exp
index 58fc6a01acb07..4c750e223a3a6 100644
--- a/tests/ports/unix/ffi_float2.py.exp
+++ b/tests/ports/unix/ffi_float2.py.exp
@@ -1,6 +1,6 @@
-1.772454
-1.000000
-1.000000
-0.886227
-6.000000
-6.000000
+1.77245
+1.00000
+1.00000
+0.88623
+6.00000
+6.00000
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 59aec327fa063..48dfc2f26e070 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -785,12 +785,16 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add(
             "float/float2int_intbig.py"
         )  # requires fp32, there's float2int_fp30_intbig.py instead
+        skip_tests.add(
+            "float/float_struct_e.py"
+        )  # requires fp32, there's float_struct_e_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/float_format_ints_power10.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_struct_e_doubleprec.py")
         skip_tests.add("float/float_format_ints_doubleprec.py")
         skip_tests.add("float/float_parse_doubleprec.py")
 

From 97d56527a06dbcbe6fdb96e41597b9b053df3315 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Aug 2025 10:30:55 +1000
Subject: [PATCH 2610/3129] github/workflows: Build unix port for docs and run
 workflow more often.

The unix port is needed to build the docs, due to the cpydiff tests which
run both CPython and MicroPython (unix port).  That was previously not
failing the CI because the output from MicroPython was:

    /bin/sh: 1: ../ports/unix/build-standard/micropython: not found

which doesn't match the CPython output for any of the cpydiff tests, and so
it was considered a "pass" in terms of the output differing.

Also, run the docs workflow when py/ or tests/cpydiff/ changes, because the
cpydiff results may change when the core code changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/docs.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index d01a4b50c9810..62a6f69fc3924 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -5,6 +5,8 @@ on:
   pull_request:
     paths:
       - docs/**
+      - py/**
+      - tests/cpydiff/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -19,5 +21,7 @@ jobs:
     - uses: actions/setup-python@v5
     - name: Install Python packages
       run: pip install -r docs/requirements.txt
+    - name: Build unix port
+      run: source tools/ci.sh && ci_unix_build_helper
     - name: Build docs
       run: make -C docs/ html

From 947d5448b477343fb1b113e24cb3d3b904a9d3e7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Aug 2025 11:12:08 +1000
Subject: [PATCH 2611/3129] tests/cpydiff: Remove passing types_float_rounding
 test.

Since commit dbbaa959c85c04dbbcde5908b5d0775b574e44e7, this test now
produces the same output on MicroPython as CPython does, namely -1e+01.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cpydiff/types_float_rounding.py | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 tests/cpydiff/types_float_rounding.py

diff --git a/tests/cpydiff/types_float_rounding.py b/tests/cpydiff/types_float_rounding.py
deleted file mode 100644
index 206e359ed9be7..0000000000000
--- a/tests/cpydiff/types_float_rounding.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-categories: Types,float
-description: uPy and CPython outputs formats may differ
-cause: Unknown
-workaround: Unknown
-"""
-
-print("%.1g" % -9.9)

From f8f6d71940cb34c762d919a255f084d18fbcf1c1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Jul 2025 18:52:45 +1000
Subject: [PATCH 2612/3129] nrf/drivers/bluetooth: Change soft-device download
 URL to self hosted.

The existing URLs have started to return a HTTP 403.  The simplest way
around this is to host the files at micropython.org, and point to them from
the download script.

The soft-device files have been retrieved from:
- https://www.nordicsemi.com/Products/Development-software/s110/download
- https://www.nordicsemi.com/Products/Development-software/s132/download
- https://www.nordicsemi.com/Products/Development-software/s140/download

Signed-off-by: Damien George <damien@micropython.org>
---
 .../drivers/bluetooth/download_ble_stack.sh   | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh
index 7886682b718e0..5004d7a28eff0 100755
--- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh
+++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh
@@ -10,12 +10,9 @@ function download_s110_nrf51_8_0_0
 
     mkdir -p $1/s110_nrf51_8.0.0
     cd $1/s110_nrf51_8.0.0
-    wget --post-data="fileName=DeviceDownload&ids=DBBEB2467E4A4EBCB791C2E7BE3FC7A8" https://www.nordicsemi.com/api/sitecore/Products/MedialibraryZipDownload2
-    mv MedialibraryZipDownload2 temp.zip
-    unzip -u temp.zip
+    wget https://micropython.org/resources/nrf-soft-device/s110nrf51800.zip
     unzip -u s110nrf51800.zip
     rm s110nrf51800.zip
-    rm temp.zip
     cd -
 }
 
@@ -29,12 +26,9 @@ function download_s132_nrf52_6_1_1
 
     mkdir -p $1/s132_nrf52_6.1.1
     cd $1/s132_nrf52_6.1.1
-    wget --post-data="fileName=DeviceDownload&ids=3AB3E86666FE4361A4A3B7E0D1CBB9B9" https://www.nordicsemi.com/api/sitecore/Products/MedialibraryZipDownload2
-    mv MedialibraryZipDownload2 temp.zip
-    unzip -u temp.zip
+    wget https://micropython.org/resources/nrf-soft-device/s132nrf52611.zip
     unzip -u s132nrf52611.zip
     rm s132nrf52611.zip
-    rm temp.zip
     cd -
 }
 
@@ -48,12 +42,9 @@ function download_s140_nrf52_6_1_1
 
     mkdir -p $1/s140_nrf52_6.1.1
     cd $1/s140_nrf52_6.1.1
-    wget --post-data="fileName=DeviceDownload&ids=CE89BA7633C540AFA48AB88E934DBF05" https://www.nordicsemi.com/api/sitecore/Products/MedialibraryZipDownload2
-    mv MedialibraryZipDownload2 temp.zip
-    unzip -u temp.zip
+    wget https://micropython.org/resources/nrf-soft-device/s140nrf52611.zip
     unzip -u s140nrf52611.zip
     rm s140nrf52611.zip
-    rm temp.zip
     cd -
 }
 
@@ -67,12 +58,9 @@ function download_s140_nrf52_7_3_0
 
     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
+    wget https://micropython.org/resources/nrf-soft-device/s140_nrf52_7.3.0.zip
     unzip -u s140_nrf52_7.3.0.zip
     rm s140_nrf52_7.3.0.zip
-    rm temp.zip
     cd -
 }
 

From f67a3703118be7d97629130d99630996ff3cb255 Mon Sep 17 00:00:00 2001
From: SiZiOUS <sizious@gmail.com>
Date: Sat, 19 Jul 2025 18:45:42 +0200
Subject: [PATCH 2613/3129] embed/port: Fix alloca include for Windows
 platforms.

When building the embedded port on MinGW-w64, I receive the following
error:

    fatal error: alloca.h: No such file or directory

MinGW-w64 (used on MSYS2) doesn't include `alloca.h`, but `alloca()` is
provided via `malloc.h` instead.  And this fix is also needed for other
Windows build systems.

Signed-off-by: SiZiOUS <sizious@gmail.com>
---
 ports/embed/port/mpconfigport_common.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/embed/port/mpconfigport_common.h b/ports/embed/port/mpconfigport_common.h
index 8e19859ed2ed9..aa65640fcd58c 100644
--- a/ports/embed/port/mpconfigport_common.h
+++ b/ports/embed/port/mpconfigport_common.h
@@ -34,8 +34,13 @@ typedef long mp_off_t;
 
 // Need to provide a declaration/definition of alloca()
 #if defined(__FreeBSD__) || defined(__NetBSD__)
+// BSD
 #include <stdlib.h>
+#elif defined(_WIN32)
+// Windows
+#include <malloc.h>
 #else
+// Other OS
 #include <alloca.h>
 #endif
 

From 69ead7d98ef30df3b6bd4485633490e80fca1718 Mon Sep 17 00:00:00 2001
From: Yoctopuce dev <dev@yoctopuce.com>
Date: Tue, 28 Jan 2025 00:26:08 +0100
Subject: [PATCH 2614/3129] py/parse: Add support for math module constants and
 float folding.

Add a new MICROPY_COMP_CONST_FLOAT feature, enabled by in mpy-cross and
when compiling with MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES.  The new
feature leverages the code of MICROPY_COMP_CONST_FOLDING to support folding
of floating point constants.

If MICROPY_COMP_MODULE_CONST is defined as well, math module constants are
made available at compile time. For example:

    _DEG_TO_GRADIANT = const(math.pi / 180)
    _INVALID_VALUE = const(math.nan)

A few corner cases had to be handled:
- The float const folding code should not fold expressions resulting into
  complex results, as the mpy parser for complex immediates has
  limitations.
- The constant generation code must distinguish between -0.0 and 0.0, which
  are different even if C consider them as ==.

This change removes previous limitations on the use of `const()`
expressions that would result in floating point number, so the test cases
of micropython/const_error have to be updated.

Additional test cases have been added to cover the new repr() code (from a
previous commit).  A few other simple test cases have been added to handle
the use of floats in `const()` expressions, but the float folding code
itself is also tested when running general float test cases, as float
expressions often get resolved at compile-time (with this change).

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
---
 mpy-cross/mpconfigport.h              |  4 +-
 py/builtin.h                          |  1 +
 py/emitcommon.c                       | 17 ++++-
 py/mpconfig.h                         |  7 +++
 py/parse.c                            | 89 +++++++++++++++++++--------
 tests/float/float_parse_doubleprec.py |  6 ++
 tests/micropython/const_error.py      |  2 -
 tests/micropython/const_error.py.exp  |  2 -
 tests/micropython/const_float.py      | 23 +++++++
 tests/micropython/const_float.py.exp  |  4 ++
 tests/micropython/const_math.py       | 18 ++++++
 tests/micropython/const_math.py.exp   |  1 +
 12 files changed, 143 insertions(+), 31 deletions(-)
 create mode 100644 tests/micropython/const_float.py
 create mode 100644 tests/micropython/const_float.py.exp
 create mode 100644 tests/micropython/const_math.py
 create mode 100644 tests/micropython/const_math.py.exp

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 94a598c9954b8..81cbfc2eeb937 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -55,6 +55,7 @@
 #define MICROPY_COMP_CONST_FOLDING  (1)
 #define MICROPY_COMP_MODULE_CONST   (1)
 #define MICROPY_COMP_CONST          (1)
+#define MICROPY_COMP_CONST_FLOAT    (1)
 #define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
 #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
 #define MICROPY_COMP_RETURN_IF_EXPR (1)
@@ -88,7 +89,8 @@
 #define MICROPY_PY_ARRAY            (0)
 #define MICROPY_PY_ATTRTUPLE        (0)
 #define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_MATH             (0)
+#define MICROPY_PY_MATH             (MICROPY_COMP_CONST_FLOAT)
+#define MICROPY_PY_MATH_CONSTANTS   (MICROPY_COMP_CONST_FLOAT)
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_GC               (0)
 #define MICROPY_PY_IO               (0)
diff --git a/py/builtin.h b/py/builtin.h
index 6efe3e8facabd..388bc8470053d 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -138,6 +138,7 @@ extern const mp_obj_module_t mp_module_sys;
 extern const mp_obj_module_t mp_module_errno;
 extern const mp_obj_module_t mp_module_uctypes;
 extern const mp_obj_module_t mp_module_machine;
+extern const mp_obj_module_t mp_module_math;
 
 extern const char MICROPY_PY_BUILTINS_HELP_TEXT[];
 
diff --git a/py/emitcommon.c b/py/emitcommon.c
index a9eb6e2021fc8..1f701db80a0a9 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -25,6 +25,7 @@
  */
 
 #include <assert.h>
+#include <math.h>
 
 #include "py/emit.h"
 #include "py/nativeglue.h"
@@ -72,7 +73,21 @@ static bool strictly_equal(mp_obj_t a, mp_obj_t b) {
         }
         return true;
     } else {
-        return mp_obj_equal(a, b);
+        if (!mp_obj_equal(a, b)) {
+            return false;
+        }
+        #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_COMP_CONST_FLOAT
+        if (a_type == &mp_type_float) {
+            mp_float_t a_val = mp_obj_float_get(a);
+            if (a_val == (mp_float_t)0.0) {
+                // Although 0.0 == -0.0, they are not strictly_equal and
+                // must be stored as two different constants in .mpy files
+                mp_float_t b_val = mp_obj_float_get(b);
+                return signbit(a_val) == signbit(b_val);
+            }
+        }
+        #endif
+        return true;
     }
 }
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index caa63fef3f6b0..ed5ccccb6a52a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -490,6 +490,13 @@
 #define MICROPY_COMP_CONST (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Whether to enable float constant folding like 1.2+3.4 (when MICROPY_COMP_CONST_FOLDING is also enabled)
+// and constant optimisation like id = const(1.2) (when MICROPY_COMP_CONST is also enabled)
+// and constant lookup like math.inf (when MICROPY_COMP_MODULE_CONST is also enabled)
+#ifndef MICROPY_COMP_CONST_FLOAT
+#define MICROPY_COMP_CONST_FLOAT (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
diff --git a/py/parse.c b/py/parse.c
index db89fb58450e3..91eea3e368907 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -336,18 +336,34 @@ static uint8_t peek_rule(parser_t *parser, size_t n) {
 }
 #endif
 
-bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
+#if MICROPY_COMP_CONST_FOLDING || MICROPY_EMIT_INLINE_ASM
+static bool mp_parse_node_get_number_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));
         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;
         *o = mp_parse_node_extract_const_object(pns);
-        return mp_obj_is_int(*o);
+        return mp_obj_is_int(*o)
+               #if MICROPY_COMP_CONST_FLOAT
+               || mp_obj_is_float(*o)
+               #endif
+        ;
     } else {
         return false;
     }
 }
+#endif
+
+#if MICROPY_EMIT_INLINE_ASM
+bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
+    return mp_parse_node_get_number_maybe(pn, o)
+           #if MICROPY_COMP_CONST_FLOAT
+           && mp_obj_is_int(*o)
+           #endif
+    ;
+}
+#endif
 
 #if MICROPY_COMP_CONST_TUPLE || MICROPY_COMP_CONST
 static bool mp_parse_node_is_const(mp_parse_node_t pn) {
@@ -642,12 +658,32 @@ static const mp_rom_map_elem_t mp_constants_table[] = {
     #if MICROPY_PY_UCTYPES
     { MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
     #endif
+    #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH && MICROPY_COMP_CONST_FLOAT
+    { MP_ROM_QSTR(MP_QSTR_math), MP_ROM_PTR(&mp_module_math) },
+    #endif
     // Extra constants as defined by a port
     MICROPY_PORT_CONSTANTS
 };
 static MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
 #endif
 
+static bool binary_op_maybe(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs, mp_obj_t *res) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t tmp = mp_binary_op(op, lhs, rhs);
+        #if MICROPY_PY_BUILTINS_COMPLEX
+        if (mp_obj_is_type(tmp, &mp_type_complex)) {
+            return false;
+        }
+        #endif
+        *res = tmp;
+        nlr_pop();
+        return true;
+    } else {
+        return false;
+    }
+}
+
 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) {
@@ -706,7 +742,7 @@ static bool fold_logical_constants(parser_t *parser, uint8_t rule_id, size_t *nu
 }
 
 static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
-    // this code does folding of arbitrary integer expressions, eg 1 + 2 * 3 + 4
+    // this code does folding of arbitrary numeric expressions, eg 1 + 2 * 3 + 4
     // it does not do partial folding, eg 1 + 2 + x -> 3 + x
 
     mp_obj_t arg0;
@@ -716,7 +752,7 @@ static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
         || rule_id == RULE_power) {
         // folding for binary ops: | ^ & **
         mp_parse_node_t pn = peek_result(parser, num_args - 1);
-        if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
+        if (!mp_parse_node_get_number_maybe(pn, &arg0)) {
             return false;
         }
         mp_binary_op_t op;
@@ -732,58 +768,61 @@ static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
         for (ssize_t i = num_args - 2; i >= 0; --i) {
             pn = peek_result(parser, i);
             mp_obj_t arg1;
-            if (!mp_parse_node_get_int_maybe(pn, &arg1)) {
+            if (!mp_parse_node_get_number_maybe(pn, &arg1)) {
                 return false;
             }
+            #if !MICROPY_COMP_CONST_FLOAT
             if (op == MP_BINARY_OP_POWER && mp_obj_int_sign(arg1) < 0) {
                 // ** can't have negative rhs
                 return false;
             }
-            arg0 = mp_binary_op(op, arg0, arg1);
+            #endif
+            if (!binary_op_maybe(op, arg0, arg1, &arg0)) {
+                return false;
+            }
         }
     } else if (rule_id == RULE_shift_expr
                || rule_id == RULE_arith_expr
                || rule_id == RULE_term) {
         // folding for binary ops: << >> + - * @ / % //
         mp_parse_node_t pn = peek_result(parser, num_args - 1);
-        if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
+        if (!mp_parse_node_get_number_maybe(pn, &arg0)) {
             return false;
         }
         for (ssize_t i = num_args - 2; i >= 1; i -= 2) {
             pn = peek_result(parser, i - 1);
             mp_obj_t arg1;
-            if (!mp_parse_node_get_int_maybe(pn, &arg1)) {
+            if (!mp_parse_node_get_number_maybe(pn, &arg1)) {
                 return false;
             }
             mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, i));
-            if (tok == MP_TOKEN_OP_AT || tok == MP_TOKEN_OP_SLASH) {
-                // Can't fold @ or /
+            if (tok == MP_TOKEN_OP_AT) {
+                // Can't fold @
+                return false;
+            }
+            #if !MICROPY_COMP_CONST_FLOAT
+            if (tok == MP_TOKEN_OP_SLASH) {
+                // Can't fold /
                 return false;
             }
+            #endif
             mp_binary_op_t op = MP_BINARY_OP_LSHIFT + (tok - MP_TOKEN_OP_DBL_LESS);
-            int rhs_sign = mp_obj_int_sign(arg1);
-            if (op <= MP_BINARY_OP_RSHIFT) {
-                // << and >> can't have negative rhs
-                if (rhs_sign < 0) {
-                    return false;
-                }
-            } else if (op >= MP_BINARY_OP_FLOOR_DIVIDE) {
-                // % and // can't have zero rhs
-                if (rhs_sign == 0) {
-                    return false;
-                }
+            if (!binary_op_maybe(op, arg0, arg1, &arg0)) {
+                return false;
             }
-            arg0 = mp_binary_op(op, arg0, arg1);
         }
     } else if (rule_id == RULE_factor_2) {
         // folding for unary ops: + - ~
         mp_parse_node_t pn = peek_result(parser, 0);
-        if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
+        if (!mp_parse_node_get_number_maybe(pn, &arg0)) {
             return false;
         }
         mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, 1));
         mp_unary_op_t op;
         if (tok == MP_TOKEN_OP_TILDE) {
+            if (!mp_obj_is_int(arg0)) {
+                return false;
+            }
             op = MP_UNARY_OP_INVERT;
         } else {
             assert(tok == MP_TOKEN_OP_PLUS || tok == MP_TOKEN_OP_MINUS); // should be
@@ -855,7 +894,7 @@ static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
             return false;
         }
         // id1.id2
-        // look it up in constant table, see if it can be replaced with an integer
+        // look it up in constant table, see if it can be replaced with an integer or a float
         mp_parse_node_struct_t *pns1 = (mp_parse_node_struct_t *)pn1;
         assert(MP_PARSE_NODE_IS_ID(pns1->nodes[0]));
         qstr q_base = MP_PARSE_NODE_LEAF_ARG(pn0);
@@ -866,7 +905,7 @@ static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
         }
         mp_obj_t dest[2];
         mp_load_method_maybe(elem->value, q_attr, dest);
-        if (!(dest[0] != MP_OBJ_NULL && mp_obj_is_int(dest[0]) && dest[1] == MP_OBJ_NULL)) {
+        if (!(dest[0] != MP_OBJ_NULL && (mp_obj_is_int(dest[0]) || mp_obj_is_float(dest[0])) && dest[1] == MP_OBJ_NULL)) {
             return false;
         }
         arg0 = dest[0];
diff --git a/tests/float/float_parse_doubleprec.py b/tests/float/float_parse_doubleprec.py
index 81fcadcee88b4..c1b0b4823b038 100644
--- a/tests/float/float_parse_doubleprec.py
+++ b/tests/float/float_parse_doubleprec.py
@@ -19,3 +19,9 @@
 print(float("1.00000000000000000000e-307"))
 print(float("10.0000000000000000000e-308"))
 print(float("100.000000000000000000e-309"))
+
+# ensure repr() adds an extra digit when needed for accurate parsing
+print(float(repr(float("2.0") ** 100)) == float("2.0") ** 100)
+
+# ensure repr does not add meaningless extra digits (1.234999999999)
+print(repr(1.2345))
diff --git a/tests/micropython/const_error.py b/tests/micropython/const_error.py
index d35be530a7c8d..950360e4dc782 100644
--- a/tests/micropython/const_error.py
+++ b/tests/micropython/const_error.py
@@ -18,8 +18,6 @@ def test_syntax(code):
 
 # these operations are not supported within const
 test_syntax("A = const(1 @ 2)")
-test_syntax("A = const(1 / 2)")
-test_syntax("A = const(1 ** -2)")
 test_syntax("A = const(1 << -2)")
 test_syntax("A = const(1 >> -2)")
 test_syntax("A = const(1 % 0)")
diff --git a/tests/micropython/const_error.py.exp b/tests/micropython/const_error.py.exp
index 3edc3efe9c3e9..bef69eb32ea7d 100644
--- a/tests/micropython/const_error.py.exp
+++ b/tests/micropython/const_error.py.exp
@@ -5,5 +5,3 @@ SyntaxError
 SyntaxError
 SyntaxError
 SyntaxError
-SyntaxError
-SyntaxError
diff --git a/tests/micropython/const_float.py b/tests/micropython/const_float.py
new file mode 100644
index 0000000000000..c3a0df0276bf8
--- /dev/null
+++ b/tests/micropython/const_float.py
@@ -0,0 +1,23 @@
+# test constant optimisation, with consts that are floats
+
+from micropython import const
+
+# check we can make consts from floats
+F1 = const(2.5)
+F2 = const(-0.3)
+print(type(F1), F1)
+print(type(F2), F2)
+
+# check arithmetic with floats
+F3 = const(F1 + F2)
+F4 = const(F1**2)
+print(F3, F4)
+
+# check int operations with float results
+F5 = const(1 / 2)
+F6 = const(2**-2)
+print(F5, F6)
+
+# note: we also test float expression folding when
+#       we're compiling test cases in tests/float, as
+#       many expressions are resolved at compile time.
diff --git a/tests/micropython/const_float.py.exp b/tests/micropython/const_float.py.exp
new file mode 100644
index 0000000000000..17a86a6d936c2
--- /dev/null
+++ b/tests/micropython/const_float.py.exp
@@ -0,0 +1,4 @@
+<class 'float'> 2.5
+<class 'float'> -0.3
+2.2 6.25
+0.5 0.25
diff --git a/tests/micropython/const_math.py b/tests/micropython/const_math.py
new file mode 100644
index 0000000000000..7ee5edc6d3240
--- /dev/null
+++ b/tests/micropython/const_math.py
@@ -0,0 +1,18 @@
+# Test expressions based on math module constants
+try:
+    import math
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+from micropython import const
+
+# check that we can make consts from math constants
+# (skip if the target has MICROPY_COMP_MODULE_CONST disabled)
+try:
+    exec("two_pi = const(2.0 * math.pi)")
+except SyntaxError:
+    print("SKIP")
+    raise SystemExit
+
+print(math.cos(two_pi))
diff --git a/tests/micropython/const_math.py.exp b/tests/micropython/const_math.py.exp
new file mode 100644
index 0000000000000..d3827e75a5cad
--- /dev/null
+++ b/tests/micropython/const_math.py.exp
@@ -0,0 +1 @@
+1.0

From f39434e9fb17405754277dd62dfea788a42d5afb Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Sun, 27 Jul 2025 22:16:24 +0100
Subject: [PATCH 2615/3129] py/asmthumb: Don't corrupt base register in large
 offset store.

asm_thumb_store_reg_reg_offset() modifies the base register when storing
with a large offset which triggers the generic path. If a variable lives
in that register, this corrupts it. Fix this by saving the base register
on the stack before modifying it.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 py/asmthumb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 18c3db9e4e28f..93860d2fdc1a2 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -492,8 +492,10 @@ void asm_thumb_store_reg_reg_offset(asm_thumb_t *as, uint reg_src, uint reg_base
         asm_thumb_op32(as, (OP_LDR_STR_W_HI(operation_size, reg_base) | OP_STR_W), OP_LDR_STR_W_LO(reg_src, (offset << operation_size)));
     } else {
         // Must use the generic sequence
+        asm_thumb_op16(as, OP_PUSH_RLIST(1 << reg_base));
         asm_thumb_add_reg_reg_offset(as, reg_base, reg_base, offset - 31, operation_size);
         asm_thumb_op16(as, ((OP_LDR_STR_TABLE[operation_size] | OP_STR) << 11) | (31 << 6) | (reg_base << 3) | reg_src);
+        asm_thumb_op16(as, OP_POP_RLIST(1 << reg_base));
     }
 }
 

From 953da2080eb9115536101627c7406727c5d44f8b Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Sun, 27 Jul 2025 22:35:02 +0100
Subject: [PATCH 2616/3129] tests/micropython: Test that viper offset stores
 don't clobber base reg.

When running the viper boundary tests, assert that the offset stores don't
clobber the base register, which is saved and temporarily modified on some
architectures.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 tests/micropython/viper_ptr16_store_boundary_intbig.py | 4 ++++
 tests/micropython/viper_ptr32_store_boundary_intbig.py | 4 ++++
 tests/micropython/viper_ptr8_store_boundary_intbig.py  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/tests/micropython/viper_ptr16_store_boundary_intbig.py b/tests/micropython/viper_ptr16_store_boundary_intbig.py
index 1694c61ac0a61..2193eddae1385 100644
--- a/tests/micropython/viper_ptr16_store_boundary_intbig.py
+++ b/tests/micropython/viper_ptr16_store_boundary_intbig.py
@@ -3,7 +3,9 @@
 SET_TEMPLATE = """
 @micropython.viper
 def set{off}(dest: ptr16):
+    saved = dest
     dest[{off}] = {val}
+    assert int(saved) == int(dest)
 set{off}(buffer)
 print(hex(get_index(buffer, {off})))
 """
@@ -15,7 +17,9 @@ def set{off}(dest: ptr16):
 
 @micropython.viper
 def set_index(dest: ptr16, i: int, val: uint):
+    saved = dest
     dest[i] = val
+    assert int(saved) == int(dest)
 
 
 def get_index(src, i):
diff --git a/tests/micropython/viper_ptr32_store_boundary_intbig.py b/tests/micropython/viper_ptr32_store_boundary_intbig.py
index 5109abb9dcaa8..b44f31b00af4d 100644
--- a/tests/micropython/viper_ptr32_store_boundary_intbig.py
+++ b/tests/micropython/viper_ptr32_store_boundary_intbig.py
@@ -3,7 +3,9 @@
 SET_TEMPLATE = """
 @micropython.viper
 def set{off}(dest: ptr32):
+    saved = dest
     dest[{off}] = {val}
+    assert int(saved) == int(dest)
 set{off}(buffer)
 print(hex(get_index(buffer, {off})))
 """
@@ -15,7 +17,9 @@ def set{off}(dest: ptr32):
 
 @micropython.viper
 def set_index(dest: ptr32, i: int, val: uint):
+    saved = dest
     dest[i] = val
+    assert int(saved) == int(dest)
 
 
 def get_index(src, i):
diff --git a/tests/micropython/viper_ptr8_store_boundary_intbig.py b/tests/micropython/viper_ptr8_store_boundary_intbig.py
index e1fe6dcae3279..d22a062743321 100644
--- a/tests/micropython/viper_ptr8_store_boundary_intbig.py
+++ b/tests/micropython/viper_ptr8_store_boundary_intbig.py
@@ -3,7 +3,9 @@
 SET_TEMPLATE = """
 @micropython.viper
 def set{off}(dest: ptr8):
+    saved = dest
     dest[{off}] = {val}
+    assert int(saved) == int(dest)
 set{off}(buffer)
 print(hex(get_index(buffer, {off})))
 """
@@ -15,7 +17,9 @@ def set{off}(dest: ptr8):
 
 @micropython.viper
 def set_index(dest: ptr8, i: int, val: uint):
+    saved = dest
     dest[i] = val
+    assert int(dest) == int(saved)
 
 
 def get_index(src: ptr8, i: int):

From 4ba626ab5a6c47588d25c40ac1dc20d59e33760d Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Mon, 28 Jul 2025 16:30:04 +0200
Subject: [PATCH 2617/3129] tools/mpremote: Fix errno.ENOTBLK attribute error
 on Windows.

Not all errors defined in stdlib errno are available on Windows.
Specifically, errno.ENOTBLK is not.

Fixes issue #17773.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 tools/mpremote/mpremote/mp_errno.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/mp_errno.py b/tools/mpremote/mpremote/mp_errno.py
index 37cb1e0cb9b04..e2554ef1db6e8 100644
--- a/tools/mpremote/mpremote/mp_errno.py
+++ b/tools/mpremote/mpremote/mp_errno.py
@@ -1,4 +1,5 @@
 import errno
+import platform
 
 # This table maps numeric values defined by `py/mperrno.h` to host errno code.
 MP_ERRNO_TABLE = {
@@ -16,7 +17,6 @@
     12: errno.ENOMEM,
     13: errno.EACCES,
     14: errno.EFAULT,
-    15: errno.ENOTBLK,
     16: errno.EBUSY,
     17: errno.EEXIST,
     18: errno.EXDEV,
@@ -51,3 +51,5 @@
     115: errno.EINPROGRESS,
     125: errno.ECANCELED,
 }
+if platform.system() != "Windows":
+    MP_ERRNO_TABLE[15] = errno.ENOTBLK

From dea949e860c0adc615171d25c7df79b59639f8ed Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Mon, 28 Jul 2025 16:52:11 +0200
Subject: [PATCH 2618/3129] tools/mpremote: Update ESPxxx detection for USB-CDC
 ports.

Detection of ESP-XX devices was based on just the names of the USB driver
name, and did not account for the switch of the newer ESP-xx devices to
USB-CDC.  On Windows this caused unwanted/unneeded resets as the DTR/RTS
signals are also used for automatic device reset over USB-CDC.  See
https://github.com/micropython/micropython/issues/9659#issuecomment-3124704572

This commit uses the Espressif registered VID 0x303A to detect USB-CDC
ports, to enable the same DTR/RTS settings as used on the UART-USB
connection.

Also improved the robustness of the code using `getattr()`.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 tools/mpremote/mpremote/transport_serial.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index 53fc48553b167..daeff02b594e2 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -40,6 +40,8 @@
 from .console import VT_ENABLED
 from .transport import TransportError, TransportExecError, Transport
 
+VID_ESPRESSIF = 0x303A  # Espressif Incorporated
+
 
 class SerialTransport(Transport):
     fs_hook_mount = "/remote"  # MUST match the mount point in fs_hook_code
@@ -71,7 +73,10 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None
                     self.serial = serial.Serial(**serial_kwargs)
                     self.serial.port = device
                     portinfo = list(serial.tools.list_ports.grep(device))  # type: ignore
-                    if portinfo and portinfo[0].manufacturer != "Microsoft":
+                    if portinfo and (
+                        getattr(portinfo[0], "vid", 0) == VID_ESPRESSIF
+                        or getattr(portinfo[0], "manufacturer", "") != "Microsoft"
+                    ):
                         # ESP8266/ESP32 boards use RTS/CTS for flashing and boot mode selection.
                         # DTR False: to avoid using the reset button will hang the MCU in bootloader mode
                         # RTS False: to prevent pulses on rts on serial.close() that would POWERON_RESET an ESPxx

From 41987c6cf43c18ff387e88d227469bf8b8e29b55 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Jul 2025 17:19:09 +1000
Subject: [PATCH 2619/3129] rp2/rp2_pio: Configure jmp_pin for PIO use if it's
 isolation is set.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/rp2_pio.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index d936553b55573..8fc7c0e786754 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -683,8 +683,10 @@ static mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
     }
 
     // Configure jmp pin, if needed.
+    int jmp_pin = -1;
     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));
+        jmp_pin = mp_hal_get_pin_obj(args[ARG_jmp_pin].u_obj);
+        sm_config_set_jmp_pin(&config, jmp_pin);
     }
 
     // Configure sideset pin, if needed.
@@ -716,6 +718,18 @@ static mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
     if (set_config.base >= 0) {
         asm_pio_init_gpio(self->pio, self->sm, &set_config);
     }
+    #if !PICO_RP2040
+    if (jmp_pin >= 0) {
+        // On RP2350 pins by default have their isolation enabled.  This means they will
+        // not work as input to a PIO without further configuration.  That's different to
+        // RP2040 where pins can work as PIO input from a reset.  To make RP2350 have
+        // similar behaviour as RP2040, configure the jmp pin for PIO use if it's isolation
+        // is enabled (which means it's probably unconfigured from reset).
+        if (pads_bank0_hw->io[jmp_pin] & PADS_BANK0_GPIO0_ISO_BITS) {
+            pio_gpio_init(self->pio, jmp_pin);
+        }
+    }
+    #endif
     if (sideset_config.base >= 0) {
         asm_pio_init_gpio(self->pio, self->sm, &sideset_config);
     }

From a9a606bf5d518375efb2b836a07df7d95dbd7b56 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Jul 2025 17:25:35 +1000
Subject: [PATCH 2620/3129] docs/library/rp2.StateMachine: Add a note about PIO
 in and jmp pins.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/rp2.StateMachine.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
index 1cb87e90b6e2d..4984be0b2183c 100644
--- a/docs/library/rp2.StateMachine.rst
+++ b/docs/library/rp2.StateMachine.rst
@@ -58,6 +58,11 @@ Methods
     - *pull_thresh* is the threshold in bits before auto-pull or conditional
       re-pulling is triggered.
 
+    Note: pins used for *in_base* need to be configured manually for input (or
+    otherwise) so that the PIO can see the desired signal (they could be input
+    pins, output pins, or connected to a different peripheral).  The *jmp_pin*
+    can also be configured manually, but by default will be an input pin.
+
 .. method:: StateMachine.active([value])
 
     Gets or sets whether the state machine is currently running.

From c9b52b2b7f164745eda7210ccf6640fce3737f59 Mon Sep 17 00:00:00 2001
From: Dryw Wade <dryw.wade@sparkfun.com>
Date: Thu, 31 Jul 2025 15:37:46 -0600
Subject: [PATCH 2621/3129] rp2/CMakeLists.txt: Fix flash size check logic.

Follow up to 6bfb83e30aa28e7bbfb0f77f378da05b32574f3d, if the variable
`PICO_FLASH_SIZE_BYTES` is not a numeric constant, eg "(2 * 1024 * 1024)",
then it won't pass the GREATER check.  So change the if logic to just test
if it's defined.

Signed-off-by: Dryw Wade <dryw.wade@sparkfun.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 49ba8d77d6352..120d07bcce1be 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -528,7 +528,7 @@ target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--wrap=runtime_init_clocks
 )
 
-if(PICO_FLASH_SIZE_BYTES GREATER 0)
+if(DEFINED PICO_FLASH_SIZE_BYTES)
     target_link_options(${MICROPY_TARGET} PRIVATE
         -Wl,--defsym=__micropy_flash_size__=${PICO_FLASH_SIZE_BYTES}
     )

From 769453c7504ebf71d65a57767fbeea41f2de63f4 Mon Sep 17 00:00:00 2001
From: root <root@WG112.localdomain>
Date: Tue, 17 Jun 2025 23:17:43 -0400
Subject: [PATCH 2622/3129] rp2/rp2_pio: Fix use of PIO2 in prog data
 structure.

The RP2350 PIO2 State Machines (8, 9, 10, 11) did not work.  The data
structure used to pass the PIO arguments was missing an entry for PIO2,
thus causing the PIO2 instances to write wrong data to wrong locations.

Fixes issue #17509.

Signed-off-by: Matt Westveld <github@intergalacticmicro.com>
---
 ports/rp2/modules/rp2.py | 15 ++++++++-------
 ports/rp2/rp2_pio.c      |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index 6068926036baf..442a802b3e9d7 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -7,12 +7,13 @@
 _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)
+_PROG_OFFSET_PIO2 = const(3)
+_PROG_EXECCTRL = const(4)
+_PROG_SHIFTCTRL = const(5)
+_PROG_OUT_PINS = const(6)
+_PROG_SET_PINS = const(7)
+_PROG_SIDESET_PINS = const(8)
+_PROG_MAX_FIELDS = const(9)
 
 
 class PIOASMError(Exception):
@@ -50,7 +51,7 @@ def __init__(
             | autopull << 17
             | autopush << 16
         )
-        self.prog = [array("H"), -1, -1, execctrl, shiftctrl, out_init, set_init, sideset_init]
+        self.prog = [array("H"), -1, -1, -1, execctrl, shiftctrl, out_init, set_init, sideset_init]
 
         self.wrap_used = False
 
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 8fc7c0e786754..611e74a1587d2 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -212,6 +212,7 @@ enum {
     PROG_DATA,
     PROG_OFFSET_PIO0,
     PROG_OFFSET_PIO1,
+    PROG_OFFSET_PIO2,
     PROG_EXECCTRL,
     PROG_SHIFTCTRL,
     PROG_OUT_PINS,

From ab7c5a1733b394af43035bdcf844b91fd7756dd9 Mon Sep 17 00:00:00 2001
From: Koudai Aono <koxudaxi@gmail.com>
Date: Thu, 10 Jul 2025 01:50:55 +0900
Subject: [PATCH 2623/3129] docs/library/btree: Fix method links to explicitly
 specify class.

So they don't clash with other potential references.

Signed-off-by: Koudai Aono <koxudaxi@gmail.com>
---
 docs/library/btree.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/library/btree.rst b/docs/library/btree.rst
index 9d1dcf1110dc7..5746695511157 100644
--- a/docs/library/btree.rst
+++ b/docs/library/btree.rst
@@ -151,10 +151,10 @@ Constants
 
 .. data:: INCL
 
-   A flag for `keys()`, `values()`, `items()` methods to specify that
+   A flag for :meth:`btree.keys`, :meth:`btree.values`, :meth:`btree.items` methods to specify that
    scanning should be inclusive of the end key.
 
 .. data:: DESC
 
-   A flag for `keys()`, `values()`, `items()` methods to specify that
+   A flag for :meth:`btree.keys`, :meth:`btree.values`, :meth:`btree.items` methods to specify that
    scanning should be in descending direction of keys.

From 1b578fe2c04402b1fe85b49fb5a89c23ae961f89 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 May 2025 12:21:57 +1000
Subject: [PATCH 2624/3129] extmod/machine_i2c_target: Add new
 machine.I2CTarget class.

This commit implements a generic I2C target/peripheral/"slave" device,
called `machine.I2CTarget`.  It can work in two separate modes:

- A general device with interrupts/events/callbacks for low-level I2C
  operations like address match, read request and stop.

- A memory device that allows reading/writing a specific region of memory
  (or "registers") on the target I2C device.

To make a memory device is very simple:

    from machine import I2CTarget

    mem = bytearray(8)
    i2c = I2CTarget(addr=67, mem=mem)

That's all that's needed to start the I2C target.  From then on it will
respond to any I2C controller on the bus, allowing reads and writes to the
mem bytearray.

It's also possible to register to receive events.  For example to be
notified when the memory is read/written:

    from machine import I2CTarget

    def irq_handler(i2c_target):
        flags = i2c_target.irq().flags()
        if flags & I2CTarget.IRQ_END_READ:
            print("controller read target at addr", i2c_target.memaddr)
        if flags & I2CTarget.IRQ_END_WRITE:
            print("controller wrote target at addr", i2c_target.memaddr)

    mem = bytearray(8)
    i2c = I2CTarget(addr=67, mem=mem)
    i2c.irq(irq_handler)

Instead of a memory device, an arbitrary I2C device can be implemented
using all the events (see docs).

This is based on the discussion in #3935.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake         |   1 +
 extmod/extmod.mk            |   1 +
 extmod/machine_i2c_target.c | 424 ++++++++++++++++++++++++++++++++++++
 extmod/modmachine.c         |   3 +
 extmod/modmachine.h         |   6 +
 5 files changed, 435 insertions(+)
 create mode 100644 extmod/machine_i2c_target.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 7cacd0a43329e..9ca869582e026 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -11,6 +11,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/machine_adc_block.c
     ${MICROPY_EXTMOD_DIR}/machine_bitstream.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
+    ${MICROPY_EXTMOD_DIR}/machine_i2c_target.c
     ${MICROPY_EXTMOD_DIR}/machine_i2s.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c
     ${MICROPY_EXTMOD_DIR}/machine_pulse.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 997dd3ba98ead..37151ad120e68 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -6,6 +6,7 @@ SRC_EXTMOD_C += \
 	extmod/machine_adc_block.c \
 	extmod/machine_bitstream.c \
 	extmod/machine_i2c.c \
+	extmod/machine_i2c_target.c \
 	extmod/machine_i2s.c \
 	extmod/machine_mem.c \
 	extmod/machine_pinbase.c \
diff --git a/extmod/machine_i2c_target.c b/extmod/machine_i2c_target.c
new file mode 100644
index 0000000000000..f63be183c86b6
--- /dev/null
+++ b/extmod/machine_i2c_target.c
@@ -0,0 +1,424 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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_I2C_TARGET
+
+#include "extmod/modmachine.h"
+#include "shared/runtime/mpirq.h"
+
+enum {
+    // Events exposed to Python.
+    I2C_TARGET_IRQ_ADDR_MATCH_READ = 1 << 0,
+    I2C_TARGET_IRQ_ADDR_MATCH_WRITE = 1 << 1,
+    I2C_TARGET_IRQ_READ_REQ = 1 << 2,
+    I2C_TARGET_IRQ_WRITE_REQ = 1 << 3,
+    I2C_TARGET_IRQ_END_READ = 1 << 4,
+    I2C_TARGET_IRQ_END_WRITE = 1 << 5,
+
+    // Internal event, not exposed to Python.
+    I2C_TARGET_IRQ_MEM_ADDR_MATCH = 1 << 6,
+};
+
+// Define the IRQs that require a hard interrupt.
+#define I2C_TARGET_IRQ_ALL_HARD ( \
+    I2C_TARGET_IRQ_ADDR_MATCH_READ \
+    | I2C_TARGET_IRQ_ADDR_MATCH_WRITE \
+    | I2C_TARGET_IRQ_READ_REQ \
+    | I2C_TARGET_IRQ_WRITE_REQ \
+    )
+
+enum {
+    STATE_INACTIVE,
+    STATE_IDLE,
+    STATE_ADDR_MATCH_READ,
+    STATE_ADDR_MATCH_WRITE,
+    STATE_MEM_ADDR_SELECT,
+    STATE_READING,
+    STATE_WRITING,
+};
+
+typedef struct _machine_i2c_target_data_t {
+    uint8_t state;
+    uint8_t mem_addr_count;
+    uint8_t mem_addrsize;
+    uint32_t mem_addr_last;
+    uint32_t mem_addr;
+    uint32_t mem_len;
+    uint8_t *mem_buf;
+} machine_i2c_target_data_t;
+
+typedef struct _machine_i2c_target_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+} machine_i2c_target_irq_obj_t;
+
+// The port must provide implementations of these low-level I2C target functions.
+
+static void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq);
+
+// Read up to N bytes, and return the number of bytes read.
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf);
+
+// Write (or buffer) N bytes, and return the number of bytes written/buffered.
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf);
+
+// Configure the given events to trigger an interrupt.
+static void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger);
+
+static mp_obj_t mp_machine_i2c_target_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self);
+
+static const mp_irq_methods_t machine_i2c_target_irq_methods;
+
+static machine_i2c_target_data_t machine_i2c_target_data[MICROPY_PY_MACHINE_I2C_TARGET_MAX];
+
+// Needed to retain a root pointer to the memory object.
+MP_REGISTER_ROOT_POINTER(mp_obj_t machine_i2c_target_mem_obj[MICROPY_PY_MACHINE_I2C_TARGET_MAX]);
+
+// Needed to retain a root pointer to the IRQ object.
+MP_REGISTER_ROOT_POINTER(void *machine_i2c_target_irq_obj[MICROPY_PY_MACHINE_I2C_TARGET_MAX]);
+
+static bool handle_event(machine_i2c_target_data_t *data, unsigned int trigger) {
+    unsigned int id = data - &machine_i2c_target_data[0];
+    if (trigger & I2C_TARGET_IRQ_MEM_ADDR_MATCH) {
+        data->mem_addr_last = data->mem_addr;
+    }
+    machine_i2c_target_irq_obj_t *irq = MP_STATE_PORT(machine_i2c_target_irq_obj[id]);
+    if (irq != NULL && (trigger & irq->trigger)) {
+        irq->flags = trigger & irq->trigger;
+        mp_machine_i2c_target_event_callback(irq);
+        return true; // irq handled
+    }
+    return false; // irq not handled
+}
+
+static void machine_i2c_target_data_init(machine_i2c_target_data_t *data, mp_obj_t mem_obj, mp_int_t mem_addrsize) {
+    data->state = STATE_IDLE;
+    data->mem_addr_count = 0;
+    data->mem_addrsize = 0;
+    data->mem_addr_last = 0;
+    data->mem_addr = 0;
+    data->mem_len = 0;
+    data->mem_buf = NULL;
+    if (mem_obj != mp_const_none) {
+        mp_buffer_info_t bufinfo;
+        mp_get_buffer_raise(mem_obj, &bufinfo, MP_BUFFER_RW);
+        if (mem_addrsize < 0 || mem_addrsize > 32 || mem_addrsize % 8 != 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("mem_addrsize must be 0, 8, 16, 24 or 32"));
+        }
+        data->mem_addrsize = mem_addrsize / 8;
+        data->mem_len = bufinfo.len;
+        data->mem_buf = bufinfo.buf;
+    }
+}
+
+static void machine_i2c_target_data_reset_helper(machine_i2c_target_data_t *data) {
+    if (data->state == STATE_READING) {
+        handle_event(data, I2C_TARGET_IRQ_END_READ);
+    } else if (data->state == STATE_ADDR_MATCH_WRITE || data->state == STATE_WRITING) {
+        handle_event(data, I2C_TARGET_IRQ_END_WRITE);
+    }
+    data->state = STATE_IDLE;
+}
+
+static void machine_i2c_target_data_addr_match(machine_i2c_target_data_t *data, bool read) {
+    machine_i2c_target_data_reset_helper(data);
+    if (read) {
+        handle_event(data, I2C_TARGET_IRQ_ADDR_MATCH_READ);
+        data->state = STATE_ADDR_MATCH_READ;
+    } else {
+        handle_event(data, I2C_TARGET_IRQ_ADDR_MATCH_WRITE);
+        data->state = STATE_ADDR_MATCH_WRITE;
+    }
+}
+
+static void machine_i2c_target_data_read_request(machine_i2c_target_obj_t *self, machine_i2c_target_data_t *data) {
+    // Let the user handle the read request.
+    bool event_handled = handle_event(data, I2C_TARGET_IRQ_READ_REQ);
+    if (data->mem_buf == NULL) {
+        data->state = STATE_READING;
+        if (!event_handled) {
+            // No data source, just write out a zero.
+            uint8_t val = 0;
+            mp_machine_i2c_target_write_bytes(self, 1, &val);
+        }
+    } else {
+        // Have a buffer.
+        if (data->state == STATE_MEM_ADDR_SELECT) {
+            // Got a short memory address.
+            data->mem_addr %= data->mem_len;
+            handle_event(data, I2C_TARGET_IRQ_MEM_ADDR_MATCH);
+        }
+        if (data->state != STATE_READING) {
+            data->state = STATE_READING;
+        }
+        uint8_t val = data->mem_buf[data->mem_addr++];
+        if (data->mem_addr >= data->mem_len) {
+            data->mem_addr = 0;
+        }
+        mp_machine_i2c_target_write_bytes(self, 1, &val);
+    }
+}
+
+static void machine_i2c_target_data_write_request(machine_i2c_target_obj_t *self, machine_i2c_target_data_t *data) {
+    // Let the user handle the write request.
+    bool event_handled = handle_event(data, I2C_TARGET_IRQ_WRITE_REQ);
+    if (data->mem_buf == NULL) {
+        data->state = STATE_WRITING;
+        if (!event_handled) {
+            // No data sink, just read and discard the incoming byte.
+            uint8_t buf = 0;
+            mp_machine_i2c_target_read_bytes(self, 1, &buf);
+        }
+    } else {
+        // Have a buffer.
+        uint8_t buf[4] = {0};
+        size_t n = mp_machine_i2c_target_read_bytes(self, sizeof(buf), &buf[0]);
+        for (size_t i = 0; i < n; ++i) {
+            uint8_t val = buf[i];
+            if (data->state == STATE_ADDR_MATCH_WRITE) {
+                data->state = STATE_MEM_ADDR_SELECT;
+                data->mem_addr = 0;
+                data->mem_addr_count = data->mem_addrsize;
+            }
+            if (data->state == STATE_MEM_ADDR_SELECT && data->mem_addr_count > 0) {
+                data->mem_addr = data->mem_addr << 8 | val;
+                --data->mem_addr_count;
+                if (data->mem_addr_count == 0) {
+                    data->mem_addr %= data->mem_len;
+                    handle_event(data, I2C_TARGET_IRQ_MEM_ADDR_MATCH);
+                }
+            } else {
+                if (data->state == STATE_MEM_ADDR_SELECT) {
+                    data->state = STATE_WRITING;
+                }
+                data->mem_buf[data->mem_addr++] = val;
+                if (data->mem_addr >= data->mem_len) {
+                    data->mem_addr = 0;
+                }
+            }
+        }
+    }
+}
+
+static inline void machine_i2c_target_data_restart_or_stop(machine_i2c_target_data_t *data) {
+    machine_i2c_target_data_reset_helper(data);
+}
+
+static inline void machine_i2c_target_data_stop(machine_i2c_target_data_t *data) {
+    machine_i2c_target_data_reset_helper(data);
+}
+
+// The port provides implementations of its bindings in this file.
+#include MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE
+
+static void machine_i2c_target_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t index = mp_machine_i2c_target_get_index(self);
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[index];
+    if (dest[0] == MP_OBJ_NULL) {
+        // Load attribute.
+        if (attr == MP_QSTR_memaddr) {
+            dest[0] = mp_obj_new_int(data->mem_addr_last);
+        } else {
+            // Continue lookup in locals_dict.
+            dest[1] = MP_OBJ_SENTINEL;
+        }
+    }
+}
+
+// I2CTarget.deinit()
+static mp_obj_t machine_i2c_target_deinit(mp_obj_t self_in) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t index = mp_machine_i2c_target_get_index(self);
+    if (machine_i2c_target_data[index].state != STATE_INACTIVE) {
+        machine_i2c_target_data[index].state = STATE_INACTIVE;
+        mp_machine_i2c_target_deinit(self);
+        MP_STATE_PORT(machine_i2c_target_mem_obj[index]) = MP_OBJ_NULL;
+        MP_STATE_PORT(machine_i2c_target_irq_obj[index]) = NULL;
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_target_deinit_obj, machine_i2c_target_deinit);
+
+// I2CTarget.readinto(buf)
+static mp_obj_t machine_i2c_target_readinto(mp_obj_t self_in, mp_obj_t buf_in) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
+    return MP_OBJ_NEW_SMALL_INT(mp_machine_i2c_target_read_bytes(self, bufinfo.len, bufinfo.buf));
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_i2c_target_readinto_obj, machine_i2c_target_readinto);
+
+// I2CTarget.write(data)
+static mp_obj_t machine_i2c_target_write(mp_obj_t self_in, mp_obj_t data_in) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
+    return MP_OBJ_NEW_SMALL_INT(mp_machine_i2c_target_write_bytes(self, bufinfo.len, bufinfo.buf));
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(machine_i2c_target_write_obj, machine_i2c_target_write);
+
+static machine_i2c_target_irq_obj_t *machine_i2c_target_get_irq(machine_i2c_target_obj_t *self) {
+    // Get the IRQ object.
+    size_t index = mp_machine_i2c_target_get_index(self);
+    machine_i2c_target_irq_obj_t *irq = MP_STATE_PORT(machine_i2c_target_irq_obj[index]);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(machine_i2c_target_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&machine_i2c_target_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = false;
+        MP_STATE_PORT(machine_i2c_target_irq_obj[index]) = irq;
+    }
+    return irq;
+}
+
+// I2CTarget.irq(handler=None, trigger=IRQ_END_READ|IRQ_END_WRITE, hard=False)
+static mp_obj_t machine_i2c_target_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 = I2C_TARGET_IRQ_END_READ | I2C_TARGET_IRQ_END_WRITE} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_i2c_target_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_i2c_target_irq_obj_t *irq = machine_i2c_target_get_irq(self);
+
+    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;
+
+        #if MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ
+        if ((trigger & I2C_TARGET_IRQ_ALL_HARD) && !hard) {
+            mp_raise_ValueError(MP_ERROR_TEXT("hard IRQ required"));
+        }
+        #else
+        if (hard) {
+            mp_raise_ValueError(MP_ERROR_TEXT("hard IRQ unsupported"));
+        }
+        #endif
+
+        // Disable all IRQs while data is updated.
+        mp_machine_i2c_target_irq_config(self, 0);
+
+        // 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 != 0) {
+            mp_machine_i2c_target_irq_config(self, trigger);
+        }
+    }
+    return MP_OBJ_FROM_PTR(irq);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_target_irq_obj, 1, machine_i2c_target_irq);
+
+static const mp_rom_map_elem_t machine_i2c_target_locals_dict_table[] = {
+    #if MICROPY_PY_MACHINE_I2C_TARGET_FINALISER
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_i2c_target_deinit_obj) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_i2c_target_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&machine_i2c_target_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&machine_i2c_target_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_i2c_target_irq_obj) },
+
+    #if MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ
+    { MP_ROM_QSTR(MP_QSTR_IRQ_ADDR_MATCH_READ), MP_ROM_INT(I2C_TARGET_IRQ_ADDR_MATCH_READ) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_ADDR_MATCH_WRITE), MP_ROM_INT(I2C_TARGET_IRQ_ADDR_MATCH_WRITE) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_READ_REQ), MP_ROM_INT(I2C_TARGET_IRQ_READ_REQ) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_WRITE_REQ), MP_ROM_INT(I2C_TARGET_IRQ_WRITE_REQ) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_IRQ_END_READ), MP_ROM_INT(I2C_TARGET_IRQ_END_READ) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_END_WRITE), MP_ROM_INT(I2C_TARGET_IRQ_END_WRITE) },
+};
+static MP_DEFINE_CONST_DICT(machine_i2c_target_locals_dict, machine_i2c_target_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2c_target_type,
+    MP_QSTR_I2CTarget,
+    MP_TYPE_FLAG_NONE,
+    make_new, mp_machine_i2c_target_make_new,
+    print, mp_machine_i2c_target_print,
+    attr, &machine_i2c_target_attr,
+    locals_dict, &machine_i2c_target_locals_dict
+    );
+
+static mp_uint_t machine_i2c_target_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t index = mp_machine_i2c_target_get_index(self);
+    machine_i2c_target_irq_obj_t *irq = MP_STATE_PORT(machine_i2c_target_irq_obj[index]);
+    mp_machine_i2c_target_irq_config(self, 0);
+    irq->flags = 0;
+    irq->trigger = new_trigger;
+    mp_machine_i2c_target_irq_config(self, new_trigger);
+    return 0;
+}
+
+static mp_uint_t machine_i2c_target_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t index = mp_machine_i2c_target_get_index(self);
+    machine_i2c_target_irq_obj_t *irq = MP_STATE_PORT(machine_i2c_target_irq_obj[index]);
+    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_i2c_target_irq_methods = {
+    .trigger = machine_i2c_target_irq_trigger,
+    .info = machine_i2c_target_irq_info,
+};
+
+#if !MICROPY_PY_MACHINE_I2C_TARGET_FINALISER
+void mp_machine_i2c_target_deinit_all(void) {
+    for (size_t i = 0; i < MICROPY_PY_MACHINE_I2C_TARGET_MAX; ++i) {
+        if (machine_i2c_target_data[i].state != STATE_INACTIVE) {
+            machine_i2c_target_deinit(MP_OBJ_FROM_PTR(&machine_i2c_target_obj[i]));
+        }
+    }
+}
+#endif
+
+#endif // MICROPY_PY_MACHINE_I2C_TARGET
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
index f2570123e3751..28b60683b1e58 100644
--- a/extmod/modmachine.c
+++ b/extmod/modmachine.c
@@ -219,6 +219,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_i2c_type) },
     #endif
+    #if MICROPY_PY_MACHINE_I2C_TARGET
+    { MP_ROM_QSTR(MP_QSTR_I2CTarget), MP_ROM_PTR(&machine_i2c_target_type) },
+    #endif
     #if MICROPY_PY_MACHINE_I2S
     { MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
     #endif
diff --git a/extmod/modmachine.h b/extmod/modmachine.h
index 26010be8e18f9..ef507aca7408c 100644
--- a/extmod/modmachine.h
+++ b/extmod/modmachine.h
@@ -129,6 +129,7 @@
 // A port must provide these types, but they are otherwise opaque.
 typedef struct _machine_adc_obj_t machine_adc_obj_t;
 typedef struct _machine_adc_block_obj_t machine_adc_block_obj_t;
+typedef struct _machine_i2c_target_obj_t machine_i2c_target_obj_t;
 typedef struct _machine_i2s_obj_t machine_i2s_obj_t;
 typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
 typedef struct _machine_uart_obj_t machine_uart_obj_t;
@@ -203,6 +204,7 @@ extern const machine_mem_obj_t machine_mem32_obj;
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_adc_block_type;
 extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t machine_i2c_target_type;
 extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_mem_type;
 extern const mp_obj_type_t machine_pin_type;
@@ -261,6 +263,10 @@ int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n
 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);
 #endif
 
+#if MICROPY_PY_MACHINE_I2C_TARGET
+void mp_machine_i2c_target_deinit_all(void);
+#endif
+
 #if MICROPY_PY_MACHINE_SPI
 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);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj);

From 9b1778fc77af2f1631143adc0f4f760e184260ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 May 2025 11:06:08 +1000
Subject: [PATCH 2625/3129] stm32/i2c: Move I2C IRQ handlers from stm32_it.c to
 i2c.c.

And add MP_STATIC_ASSERT to statically check that the IRQ names are correct
on the MCU that it's compiled for.

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

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index a1fde7e6ba114..883734bb1af60 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -590,4 +590,72 @@ int i2c_find_peripheral(mp_obj_t id) {
     return i2c_id;
 }
 
+#if MICROPY_PY_PYB_LEGACY
+
+#if defined(MICROPY_HW_I2C1_SCL)
+void I2C1_EV_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C1_EV_IRQn > 0);
+    IRQ_ENTER(I2C1_EV_IRQn);
+    i2c_ev_irq_handler(1);
+    IRQ_EXIT(I2C1_EV_IRQn);
+}
+
+void I2C1_ER_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C1_ER_IRQn > 0);
+    IRQ_ENTER(I2C1_ER_IRQn);
+    i2c_er_irq_handler(1);
+    IRQ_EXIT(I2C1_ER_IRQn);
+}
+#endif // defined(MICROPY_HW_I2C1_SCL)
+
+#if defined(MICROPY_HW_I2C2_SCL)
+void I2C2_EV_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C2_EV_IRQn > 0);
+    IRQ_ENTER(I2C2_EV_IRQn);
+    i2c_ev_irq_handler(2);
+    IRQ_EXIT(I2C2_EV_IRQn);
+}
+
+void I2C2_ER_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C2_ER_IRQn > 0);
+    IRQ_ENTER(I2C2_ER_IRQn);
+    i2c_er_irq_handler(2);
+    IRQ_EXIT(I2C2_ER_IRQn);
+}
+#endif // defined(MICROPY_HW_I2C2_SCL)
+
+#if defined(MICROPY_HW_I2C3_SCL)
+void I2C3_EV_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C3_EV_IRQn > 0);
+    IRQ_ENTER(I2C3_EV_IRQn);
+    i2c_ev_irq_handler(3);
+    IRQ_EXIT(I2C3_EV_IRQn);
+}
+
+void I2C3_ER_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C3_ER_IRQn > 0);
+    IRQ_ENTER(I2C3_ER_IRQn);
+    i2c_er_irq_handler(3);
+    IRQ_EXIT(I2C3_ER_IRQn);
+}
+#endif // defined(MICROPY_HW_I2C3_SCL)
+
+#if defined(MICROPY_HW_I2C4_SCL)
+void I2C4_EV_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C4_EV_IRQn > 0);
+    IRQ_ENTER(I2C4_EV_IRQn);
+    i2c_ev_irq_handler(4);
+    IRQ_EXIT(I2C4_EV_IRQn);
+}
+
+void I2C4_ER_IRQHandler(void) {
+    MP_STATIC_ASSERT(I2C4_ER_IRQn > 0);
+    IRQ_ENTER(I2C4_ER_IRQn);
+    i2c_er_irq_handler(4);
+    IRQ_EXIT(I2C4_ER_IRQn);
+}
+#endif // defined(MICROPY_HW_I2C4_SCL)
+
+#endif // MICROPY_PY_PYB_LEGACY
+
 #endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 3639e2f0499dd..9eda3cb23974f 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -80,7 +80,6 @@
 #include "uart.h"
 #include "storage.h"
 #include "dma.h"
-#include "i2c.h"
 #include "usb.h"
 
 #if defined(MICROPY_HW_USB_FS)
@@ -987,63 +986,3 @@ void LPUART2_IRQHandler(void) {
     IRQ_EXIT(LPUART2_IRQn);
 }
 #endif
-
-#if MICROPY_PY_PYB_LEGACY
-
-#if defined(MICROPY_HW_I2C1_SCL)
-void I2C1_EV_IRQHandler(void) {
-    IRQ_ENTER(I2C1_EV_IRQn);
-    i2c_ev_irq_handler(1);
-    IRQ_EXIT(I2C1_EV_IRQn);
-}
-
-void I2C1_ER_IRQHandler(void) {
-    IRQ_ENTER(I2C1_ER_IRQn);
-    i2c_er_irq_handler(1);
-    IRQ_EXIT(I2C1_ER_IRQn);
-}
-#endif // defined(MICROPY_HW_I2C1_SCL)
-
-#if defined(MICROPY_HW_I2C2_SCL)
-void I2C2_EV_IRQHandler(void) {
-    IRQ_ENTER(I2C2_EV_IRQn);
-    i2c_ev_irq_handler(2);
-    IRQ_EXIT(I2C2_EV_IRQn);
-}
-
-void I2C2_ER_IRQHandler(void) {
-    IRQ_ENTER(I2C2_ER_IRQn);
-    i2c_er_irq_handler(2);
-    IRQ_EXIT(I2C2_ER_IRQn);
-}
-#endif // defined(MICROPY_HW_I2C2_SCL)
-
-#if defined(MICROPY_HW_I2C3_SCL)
-void I2C3_EV_IRQHandler(void) {
-    IRQ_ENTER(I2C3_EV_IRQn);
-    i2c_ev_irq_handler(3);
-    IRQ_EXIT(I2C3_EV_IRQn);
-}
-
-void I2C3_ER_IRQHandler(void) {
-    IRQ_ENTER(I2C3_ER_IRQn);
-    i2c_er_irq_handler(3);
-    IRQ_EXIT(I2C3_ER_IRQn);
-}
-#endif // defined(MICROPY_HW_I2C3_SCL)
-
-#if defined(MICROPY_HW_I2C4_SCL)
-void I2C4_EV_IRQHandler(void) {
-    IRQ_ENTER(I2C4_EV_IRQn);
-    i2c_ev_irq_handler(4);
-    IRQ_EXIT(I2C4_EV_IRQn);
-}
-
-void I2C4_ER_IRQHandler(void) {
-    IRQ_ENTER(I2C4_ER_IRQn);
-    i2c_er_irq_handler(4);
-    IRQ_EXIT(I2C4_ER_IRQn);
-}
-#endif // defined(MICROPY_HW_I2C4_SCL)
-
-#endif // MICROPY_PY_PYB_LEGACY

From a4ca42f094f0c33ba8d4e8db2f9351586c3104e2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 19 Jul 2025 01:59:41 +1000
Subject: [PATCH 2626/3129] stm32/i2cslave: Change irq handler name to
 i2c_slave_irq_handler.

Remove the "ev" part, so this handler can be generalised to also handle
error IRQs.

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

diff --git a/ports/stm32/i2cslave.c b/ports/stm32/i2cslave.c
index a575c53085168..44604db69f2df 100644
--- a/ports/stm32/i2cslave.c
+++ b/ports/stm32/i2cslave.c
@@ -35,7 +35,7 @@ void i2c_slave_init_helper(i2c_slave_t *i2c, int addr) {
     i2c->CR1 = I2C_CR1_ACK | I2C_CR1_PE;
 }
 
-void i2c_slave_ev_irq_handler(i2c_slave_t *i2c) {
+void i2c_slave_irq_handler(i2c_slave_t *i2c) {
     uint32_t sr1 = i2c->SR1;
     if (sr1 & I2C_SR1_ADDR) {
         // Address matched
@@ -70,7 +70,7 @@ void i2c_slave_init_helper(i2c_slave_t *i2c, int addr) {
     i2c->CR1 |= I2C_CR1_PE;
 }
 
-void i2c_slave_ev_irq_handler(i2c_slave_t *i2c) {
+void i2c_slave_irq_handler(i2c_slave_t *i2c) {
     uint32_t isr = i2c->ISR;
     if (isr & I2C_ISR_ADDR) {
         // Address matched
diff --git a/ports/stm32/i2cslave.h b/ports/stm32/i2cslave.h
index cc4e7f9be92e3..a2108ab2384cb 100644
--- a/ports/stm32/i2cslave.h
+++ b/ports/stm32/i2cslave.h
@@ -78,7 +78,7 @@ static inline void i2c_slave_shutdown(i2c_slave_t *i2c, int irqn) {
     NVIC_DisableIRQ(irqn);
 }
 
-void i2c_slave_ev_irq_handler(i2c_slave_t *i2c);
+void i2c_slave_irq_handler(i2c_slave_t *i2c);
 
 // These should be provided externally
 int i2c_slave_process_addr_match(i2c_slave_t *i2c, int rw);
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 2be8793351e86..59f2d875798da 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1755,7 +1755,7 @@ void SysTick_Handler(void) {
 
 #if defined(MBOOT_I2C_SCL)
 void I2Cx_EV_IRQHandler(void) {
-    i2c_slave_ev_irq_handler(MBOOT_I2Cx);
+    i2c_slave_irq_handler(MBOOT_I2Cx);
 }
 #endif
 

From 17d0449ac80723fd5ab4f5cbba28b39818046814 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Aug 2025 17:02:53 +1000
Subject: [PATCH 2627/3129] stm32/i2cslave: Add functions to read/write I2C
 data.

Instead of requiring the callback to consume/provide the data.  This allows
the data to be consumed/provided later on, which will stretch the I2C clock
until that occurs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/i2cslave.c   | 12 ++++++++----
 ports/stm32/i2cslave.h   | 24 ++++++++++++++++++++++--
 ports/stm32/mboot/main.c | 14 ++++++++------
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/i2cslave.c b/ports/stm32/i2cslave.c
index 44604db69f2df..e60edf53b0017 100644
--- a/ports/stm32/i2cslave.c
+++ b/ports/stm32/i2cslave.c
@@ -45,10 +45,12 @@ void i2c_slave_irq_handler(i2c_slave_t *i2c) {
         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);
+        // This callback must call i2c_slave_write_byte.
+        i2c_slave_process_tx_byte(i2c);
     }
     if (sr1 & I2C_SR1_RXNE) {
-        i2c_slave_process_rx_byte(i2c, i2c->DR);
+        // This callback must call i2c_slave_read_byte.
+        i2c_slave_process_rx_byte(i2c);
     }
     if (sr1 & I2C_SR1_STOPF) {
         // STOPF only set at end of RX mode (in TX mode AF is set on NACK)
@@ -80,10 +82,12 @@ void i2c_slave_irq_handler(i2c_slave_t *i2c) {
         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);
+        // This callback must call i2c_slave_write_byte.
+        i2c_slave_process_tx_byte(i2c);
     }
     if (isr & I2C_ISR_RXNE) {
-        i2c_slave_process_rx_byte(i2c, i2c->RXDR);
+        // This callback must call i2c_slave_read_byte.
+        i2c_slave_process_rx_byte(i2c);
     }
     if (isr & I2C_ISR_STOPF) {
         // STOPF only set for STOP condition, not a repeated START
diff --git a/ports/stm32/i2cslave.h b/ports/stm32/i2cslave.h
index a2108ab2384cb..edead6cb2c50a 100644
--- a/ports/stm32/i2cslave.h
+++ b/ports/stm32/i2cslave.h
@@ -28,6 +28,8 @@
 
 #include STM32_HAL_H
 
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
+
 #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))
@@ -78,13 +80,31 @@ static inline void i2c_slave_shutdown(i2c_slave_t *i2c, int irqn) {
     NVIC_DisableIRQ(irqn);
 }
 
+static inline void i2c_slave_write_byte(i2c_slave_t *i2c, uint8_t value) {
+    #if defined(STM32F4)
+    i2c->DR = value;
+    #else
+    i2c->TXDR = value;
+    #endif
+}
+
+static inline uint8_t i2c_slave_read_byte(i2c_slave_t *i2c) {
+    #if defined(STM32F4)
+    return i2c->DR;
+    #else
+    return i2c->RXDR;
+    #endif
+}
+
 void i2c_slave_irq_handler(i2c_slave_t *i2c);
 
 // These should be provided externally
 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);
+int i2c_slave_process_rx_byte(i2c_slave_t *i2c);
 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_byte(i2c_slave_t *i2c);
 void i2c_slave_process_tx_end(i2c_slave_t *i2c);
 
+#endif
+
 #endif // MICROPY_INCLUDED_STM32_I2CSLAVE_H
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 59f2d875798da..bd796c89638cc 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -805,9 +805,9 @@ int i2c_slave_process_addr_match(i2c_slave_t *i2c, int rw) {
     return 0; // ACK
 }
 
-int i2c_slave_process_rx_byte(i2c_slave_t *i2c, uint8_t val) {
+int i2c_slave_process_rx_byte(i2c_slave_t *i2c) {
     if (i2c_obj.cmd_buf_pos < sizeof(i2c_obj.cmd_buf)) {
-        i2c_obj.cmd_buf[i2c_obj.cmd_buf_pos++] = val;
+        i2c_obj.cmd_buf[i2c_obj.cmd_buf_pos++] = i2c_slave_read_byte(i2c);
     }
     return 0; // ACK
 }
@@ -909,15 +909,17 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
     i2c_obj.cmd_arg_sent = false;
 }
 
-uint8_t i2c_slave_process_tx_byte(i2c_slave_t *i2c) {
+void i2c_slave_process_tx_byte(i2c_slave_t *i2c) {
+    uint8_t value;
     if (i2c_obj.cmd_send_arg) {
         i2c_obj.cmd_arg_sent = true;
-        return i2c_obj.cmd_arg;
+        value = i2c_obj.cmd_arg;
     } else if (i2c_obj.cmd_buf_pos < sizeof(i2c_obj.cmd_buf)) {
-        return i2c_obj.cmd_buf[i2c_obj.cmd_buf_pos++];
+        value = i2c_obj.cmd_buf[i2c_obj.cmd_buf_pos++];
     } else {
-        return 0;
+        value = 0;
     }
+    i2c_slave_write_byte(i2c, value);
 }
 
 void i2c_slave_process_tx_end(i2c_slave_t *i2c) {

From 2443878bd903a79c1522bd0a572dcd93e5ae777e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Aug 2025 17:06:26 +1000
Subject: [PATCH 2628/3129] stm32/i2cslave: Support i2c_slave_process_tx_end
 callback on F4.

The rounds out the F4 implementation to match the other supported MCUs.

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

diff --git a/ports/stm32/i2cslave.c b/ports/stm32/i2cslave.c
index e60edf53b0017..f3bb232f7fbb8 100644
--- a/ports/stm32/i2cslave.c
+++ b/ports/stm32/i2cslave.c
@@ -28,8 +28,14 @@
 
 #if defined(STM32F4)
 
+// The hardware triggers the following IRQs for the given scenarios:
+// - scan (0-length write):                 ADDR STOPF
+// - write of n bytes:                      ADDR RXNE*n STOPF
+// - read of n bytes:                       ADDR TXE*(n+1) AF
+// - write of n bytes then read of m bytes: ADDR RXNE*n ADDR TXE*(m+1) AF
+
 void i2c_slave_init_helper(i2c_slave_t *i2c, int addr) {
-    i2c->CR2 = I2C_CR2_ITBUFEN | I2C_CR2_ITEVTEN | 4 << I2C_CR2_FREQ_Pos;
+    i2c->CR2 = I2C_CR2_ITBUFEN | I2C_CR2_ITEVTEN | 4 << I2C_CR2_FREQ_Pos | I2C_CR2_ITERREN;
     i2c->OAR1 = 1 << 14 | addr << 1;
     i2c->OAR2 = 0;
     i2c->CR1 = I2C_CR1_ACK | I2C_CR1_PE;
@@ -37,6 +43,14 @@ void i2c_slave_init_helper(i2c_slave_t *i2c, int addr) {
 
 void i2c_slave_irq_handler(i2c_slave_t *i2c) {
     uint32_t sr1 = i2c->SR1;
+
+    // Clear all error flags.
+    i2c->SR1 &= ~(I2C_SR1_SMBALERT | I2C_SR1_TIMEOUT | I2C_SR1_PECERR | I2C_SR1_OVR | I2C_SR1_AF | I2C_SR1_ARLO | I2C_SR1_BERR);
+
+    if (sr1 & I2C_SR1_AF) {
+        // A NACK in TX mode, which is a stop condition.
+        i2c_slave_process_tx_end(i2c);
+    }
     if (sr1 & I2C_SR1_ADDR) {
         // Address matched
         // Read of SR1, SR2 needed to clear ADDR bit

From 78d16672e1bbc2727b879ecaa8ce12be69616c1e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Jul 2025 00:19:24 +1000
Subject: [PATCH 2629/3129] stm32/i2cslave: Account for slow addr_match
 callback.

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

diff --git a/ports/stm32/i2cslave.c b/ports/stm32/i2cslave.c
index f3bb232f7fbb8..0e4fbf48913de 100644
--- a/ports/stm32/i2cslave.c
+++ b/ports/stm32/i2cslave.c
@@ -94,6 +94,9 @@ void i2c_slave_irq_handler(i2c_slave_t *i2c) {
         i2c->ISR = I2C_ISR_TXE;
         i2c->ICR = I2C_ICR_ADDRCF;
         i2c_slave_process_addr_match(i2c, (i2c->ISR >> I2C_ISR_DIR_Pos) & 1);
+        // Re-read ISR in case i2c_slave_process_addr_match() took some time
+        // to process and TXIS/RXNE was set in the meantime.
+        isr = i2c->ISR;
     }
     if (isr & I2C_ISR_TXIS) {
         // This callback must call i2c_slave_write_byte.

From 01e570a347c1c679db93931a7f143c74762174fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 May 2025 12:22:23 +1000
Subject: [PATCH 2630/3129] stm32/machine_i2c_target: Implement I2CTarget
 class.

Works, tested on PYBV10, PYBD_SF2 and PYBD_SF6:

    buf = bytearray(16)
    machine.I2CTargetMemory("X", addr=67, mem=buf)

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile               |   1 +
 ports/stm32/i2c.c                  |  95 +++++++++++++--
 ports/stm32/i2c.h                  |   2 +
 ports/stm32/irq.h                  |   2 +
 ports/stm32/machine_i2c_target.c   | 179 +++++++++++++++++++++++++++++
 ports/stm32/main.c                 |   3 +
 ports/stm32/mboot/main.c           |   1 +
 ports/stm32/mpconfigboard_common.h |   6 +
 ports/stm32/mpconfigport.h         |   4 +
 9 files changed, 284 insertions(+), 9 deletions(-)
 create mode 100644 ports/stm32/machine_i2c_target.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 37d70dcdbf028..37ce8fbd8383d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -266,6 +266,7 @@ SRC_C += \
 	bufhelper.c \
 	dma.c \
 	i2c.c \
+	i2cslave.c \
 	pyb_i2c.c \
 	spi.c \
 	pyb_spi.c \
diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 883734bb1af60..4effb23438cf6 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -29,6 +29,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "i2c.h"
+#include "i2cslave.h"
 
 #if MICROPY_HW_ENABLE_HW_I2C
 
@@ -551,6 +552,10 @@ static const uint8_t i2c_available =
     #endif
 ;
 
+#if MICROPY_HW_ENABLE_HW_I2C_TARGET
+uint8_t i2c_target_enabled;
+#endif
+
 int i2c_find_peripheral(mp_obj_t id) {
     int i2c_id = 0;
     if (mp_obj_is_str(id)) {
@@ -590,20 +595,38 @@ int i2c_find_peripheral(mp_obj_t id) {
     return i2c_id;
 }
 
-#if MICROPY_PY_PYB_LEGACY
+#if MICROPY_HW_ENABLE_HW_I2C_TARGET || MICROPY_PY_PYB_LEGACY
 
 #if defined(MICROPY_HW_I2C1_SCL)
 void I2C1_EV_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C1_EV_IRQn > 0);
     IRQ_ENTER(I2C1_EV_IRQn);
-    i2c_ev_irq_handler(1);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 1) {
+        i2c_slave_irq_handler(I2C1);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_ev_irq_handler(1);
+        #endif
+    }
     IRQ_EXIT(I2C1_EV_IRQn);
 }
 
 void I2C1_ER_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C1_ER_IRQn > 0);
     IRQ_ENTER(I2C1_ER_IRQn);
-    i2c_er_irq_handler(1);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 1) {
+        i2c_slave_irq_handler(I2C1);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_er_irq_handler(1);
+        #endif
+    }
     IRQ_EXIT(I2C1_ER_IRQn);
 }
 #endif // defined(MICROPY_HW_I2C1_SCL)
@@ -612,14 +635,32 @@ void I2C1_ER_IRQHandler(void) {
 void I2C2_EV_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C2_EV_IRQn > 0);
     IRQ_ENTER(I2C2_EV_IRQn);
-    i2c_ev_irq_handler(2);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 2) {
+        i2c_slave_irq_handler(I2C2);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_ev_irq_handler(2);
+        #endif
+    }
     IRQ_EXIT(I2C2_EV_IRQn);
 }
 
 void I2C2_ER_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C2_ER_IRQn > 0);
     IRQ_ENTER(I2C2_ER_IRQn);
-    i2c_er_irq_handler(2);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 2) {
+        i2c_slave_irq_handler(I2C2);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_er_irq_handler(2);
+        #endif
+    }
     IRQ_EXIT(I2C2_ER_IRQn);
 }
 #endif // defined(MICROPY_HW_I2C2_SCL)
@@ -628,14 +669,32 @@ void I2C2_ER_IRQHandler(void) {
 void I2C3_EV_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C3_EV_IRQn > 0);
     IRQ_ENTER(I2C3_EV_IRQn);
-    i2c_ev_irq_handler(3);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 4) {
+        i2c_slave_irq_handler(I2C3);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_ev_irq_handler(3);
+        #endif
+    }
     IRQ_EXIT(I2C3_EV_IRQn);
 }
 
 void I2C3_ER_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C3_ER_IRQn > 0);
     IRQ_ENTER(I2C3_ER_IRQn);
-    i2c_er_irq_handler(3);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 4) {
+        i2c_slave_irq_handler(I2C3);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_er_irq_handler(3);
+        #endif
+    }
     IRQ_EXIT(I2C3_ER_IRQn);
 }
 #endif // defined(MICROPY_HW_I2C3_SCL)
@@ -644,14 +703,32 @@ void I2C3_ER_IRQHandler(void) {
 void I2C4_EV_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C4_EV_IRQn > 0);
     IRQ_ENTER(I2C4_EV_IRQn);
-    i2c_ev_irq_handler(4);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 8) {
+        i2c_slave_irq_handler(I2C4);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_ev_irq_handler(4);
+        #endif
+    }
     IRQ_EXIT(I2C4_EV_IRQn);
 }
 
 void I2C4_ER_IRQHandler(void) {
     MP_STATIC_ASSERT(I2C4_ER_IRQn > 0);
     IRQ_ENTER(I2C4_ER_IRQn);
-    i2c_er_irq_handler(4);
+    #if MICROPY_HW_ENABLE_HW_I2C_TARGET
+    if (i2c_target_enabled & 8) {
+        i2c_slave_irq_handler(I2C4);
+    } else
+    #endif
+    {
+        #if MICROPY_PY_PYB_LEGACY
+        i2c_er_irq_handler(4);
+        #endif
+    }
     IRQ_EXIT(I2C4_ER_IRQn);
 }
 #endif // defined(MICROPY_HW_I2C4_SCL)
diff --git a/ports/stm32/i2c.h b/ports/stm32/i2c.h
index a48076842cbbf..26c55ec00e6eb 100644
--- a/ports/stm32/i2c.h
+++ b/ports/stm32/i2c.h
@@ -46,6 +46,8 @@ extern I2C_HandleTypeDef I2CHandle4;
 extern const mp_obj_type_t pyb_i2c_type;
 extern const pyb_i2c_obj_t pyb_i2c_obj[4];
 
+extern uint8_t i2c_target_enabled;
+
 void i2c_init0(void);
 int pyb_i2c_init(I2C_HandleTypeDef *i2c);
 int pyb_i2c_init_freq(const pyb_i2c_obj_t *self, mp_int_t freq);
diff --git a/ports/stm32/irq.h b/ports/stm32/irq.h
index dfe901ff74b24..3348175420c41 100644
--- a/ports/stm32/irq.h
+++ b/ports/stm32/irq.h
@@ -177,6 +177,8 @@ static inline void restore_irq_pri(uint32_t state) {
 
 #define IRQ_PRI_HSEM            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 10, 0)
 
+#define IRQ_PRI_I2C             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 12, 0)
+
 // Interrupt priority for non-special timers.
 #define IRQ_PRI_TIMX            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 13, 0)
 
diff --git a/ports/stm32/machine_i2c_target.c b/ports/stm32/machine_i2c_target.c
new file mode 100644
index 0000000000000..83031677ebb27
--- /dev/null
+++ b/ports/stm32/machine_i2c_target.c
@@ -0,0 +1,179 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 is never compiled standalone, it's included directly from
+// extmod/machine_i2c_target.c via MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE.
+
+#include "i2c.h"
+#include "i2cslave.h"
+#include "irq.h"
+
+typedef struct _machine_i2c_target_obj_t {
+    mp_obj_base_t base;
+    I2C_TypeDef *i2c;
+    uint16_t irqn_ev;
+    uint16_t irqn_er;
+    mp_hal_pin_obj_t scl;
+    mp_hal_pin_obj_t sda;
+} machine_i2c_target_obj_t;
+
+static const machine_i2c_target_obj_t machine_i2c_target_obj[] = {
+    #if defined(MICROPY_HW_I2C1_SCL)
+    {{&machine_i2c_target_type}, I2C1, I2C1_EV_IRQn, I2C1_ER_IRQn, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
+    #else
+    {{NULL}, NULL, 0, 0, NULL, NULL},
+    #endif
+    #if defined(MICROPY_HW_I2C2_SCL)
+    {{&machine_i2c_target_type}, I2C2, I2C2_EV_IRQn, I2C2_ER_IRQn, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA},
+    #else
+    {{NULL}, NULL, 0, 0, NULL, NULL},
+    #endif
+    #if defined(MICROPY_HW_I2C3_SCL)
+    {{&machine_i2c_target_type}, I2C3, I2C3_EV_IRQn, I2C3_ER_IRQn, MICROPY_HW_I2C3_SCL, MICROPY_HW_I2C3_SDA},
+    #else
+    {{NULL}, NULL, 0, 0, NULL, NULL},
+    #endif
+    #if defined(MICROPY_HW_I2C4_SCL)
+    {{&machine_i2c_target_type}, I2C4, I2C4_EV_IRQn, I2C4_ER_IRQn, MICROPY_HW_I2C4_SCL, MICROPY_HW_I2C4_SDA},
+    #else
+    {{NULL}, NULL, 0, 0, NULL, NULL},
+    #endif
+};
+
+/******************************************************************************/
+// stm32 hardware bindings
+
+static machine_i2c_target_obj_t *get_self(i2c_slave_t *i2c) {
+    size_t i2c_id = ((uintptr_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
+    return (machine_i2c_target_obj_t *)&machine_i2c_target_obj[i2c_id];
+}
+
+static machine_i2c_target_data_t *get_data(i2c_slave_t *i2c) {
+    size_t i2c_id = ((uintptr_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
+    return &machine_i2c_target_data[i2c_id];
+}
+
+int i2c_slave_process_addr_match(i2c_slave_t *i2c, int rw) {
+    machine_i2c_target_data_addr_match(get_data(i2c), rw);
+    return 0;
+}
+
+int i2c_slave_process_rx_byte(i2c_slave_t *i2c) {
+    machine_i2c_target_data_write_request(get_self(i2c), get_data(i2c));
+    return 0;
+}
+
+void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
+    machine_i2c_target_data_stop(get_data(i2c));
+}
+
+void i2c_slave_process_tx_byte(i2c_slave_t *i2c) {
+    machine_i2c_target_data_read_request(get_self(i2c), get_data(i2c));
+}
+
+void i2c_slave_process_tx_end(i2c_slave_t *i2c) {
+    machine_i2c_target_data_stop(get_data(i2c));
+}
+
+/******************************************************************************/
+// I2CTarget port implementation
+
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return self - &machine_i2c_target_obj[0];
+}
+
+static inline void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
+    mp_irq_handler(&irq->base);
+}
+
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
+    if (len > 0) {
+        buf[0] = i2c_slave_read_byte(self->i2c);
+        len = 1;
+    }
+    return len;
+}
+
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf) {
+    if (len > 0) {
+        i2c_slave_write_byte(self->i2c, buf[0]);
+        len = 1;
+    }
+    return len;
+}
+
+static inline void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger) {
+    (void)self;
+    (void)trigger;
+}
+
+static mp_obj_t mp_machine_i2c_target_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_id, ARG_addr, ARG_addrsize, ARG_mem, ARG_mem_addrsize };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
+        { MP_QSTR_mem, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+    };
+    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 = i2c_find_peripheral(args[ARG_id].u_obj);
+
+    // Get static target object.
+    machine_i2c_target_obj_t *self = (machine_i2c_target_obj_t *)&machine_i2c_target_obj[i2c_id - 1];
+
+    // Initialise data.
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[i2c_id - 1] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id - 1];
+    machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
+
+    // Initialise the I2C target.
+    mp_hal_pin_config_alt(self->scl, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, AF_FN_I2C, i2c_id);
+    mp_hal_pin_config_alt(self->sda, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, AF_FN_I2C, i2c_id);
+    i2c_slave_init(self->i2c, self->irqn_ev, IRQ_PRI_I2C, args[ARG_addr].u_int);
+    NVIC_SetPriority(self->irqn_er, IRQ_PRI_I2C);
+    NVIC_EnableIRQ(self->irqn_er);
+
+    i2c_target_enabled |= 1 << (i2c_id - 1);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2CTarget(%u, addr=%u)",
+        self - &machine_i2c_target_obj[0] + 1,
+        (self->i2c->OAR1 >> 1) & 0x7f);
+}
+
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self) {
+    i2c_slave_shutdown(self->i2c, self->irqn_ev);
+    NVIC_DisableIRQ(self->irqn_er);
+}
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 137e132817483..af4d7f8bbb6d3 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -746,6 +746,9 @@ void stm32_main(uint32_t reset_mode) {
     #if MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
     pyb_i2c_deinit_all();
     #endif
+    #if MICROPY_PY_MACHINE_I2C_TARGET
+    mp_machine_i2c_target_deinit_all();
+    #endif
     #if MICROPY_HW_ENABLE_CAN
     pyb_can_deinit_all();
     #endif
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index bd796c89638cc..e40413e4e7a27 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -61,6 +61,7 @@
 
 // IRQ priorities (encoded values suitable for NVIC_SetPriority)
 // Most values are defined in irq.h.
+#undef IRQ_PRI_I2C
 #define IRQ_PRI_I2C (NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 1, 0))
 
 #if defined(MBOOT_CLK_PLLM)
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 9fa9bf7714877..dcbbbccceb6b0 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -639,8 +639,14 @@
 #if defined(MICROPY_HW_I2C1_SCL) || defined(MICROPY_HW_I2C2_SCL) \
     || defined(MICROPY_HW_I2C3_SCL) || defined(MICROPY_HW_I2C4_SCL)
 #define MICROPY_HW_ENABLE_HW_I2C (1)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
+#define MICROPY_HW_ENABLE_HW_I2C_TARGET (1)
+#else
+#define MICROPY_HW_ENABLE_HW_I2C_TARGET (0)
+#endif
 #else
 #define MICROPY_HW_ENABLE_HW_I2C (0)
+#define MICROPY_HW_ENABLE_HW_I2C_TARGET (0)
 #endif
 
 // Enable CAN if there are any peripherals defined
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 35deb93c6a0bf..191503cd4956f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -129,6 +129,10 @@
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_I2C      (MICROPY_HW_ENABLE_HW_I2C)
+#define MICROPY_PY_MACHINE_I2C_TARGET (MICROPY_HW_ENABLE_HW_I2C_TARGET)
+#define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/stm32/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX (4)
+#define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ (1)
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE "ports/stm32/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX (I2S_MODE_MASTER_RX)

From 56d2b47370d90616ae7ad6b6f078446efd69d0ff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Jul 2025 11:23:11 +1000
Subject: [PATCH 2631/3129] rp2/machine_i2c: Factor default pin macros to
 header file.

So they can be reused by the I2CTarget implementation.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_i2c.c | 40 +-----------------------
 ports/rp2/machine_i2c.h | 68 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 39 deletions(-)
 create mode 100644 ports/rp2/machine_i2c.h

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 94212fb487043..99a94ec2f1a00 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -28,51 +28,13 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/modmachine.h"
+#include "machine_i2c.h"
 
 #include "hardware/i2c.h"
 
 #define DEFAULT_I2C_FREQ (400000)
 #define DEFAULT_I2C_TIMEOUT (50000)
 
-#ifdef MICROPY_HW_I2C_NO_DEFAULT_PINS
-
-// With no default I2C, need to require the pin args.
-#define MICROPY_HW_I2C0_SCL (0)
-#define MICROPY_HW_I2C0_SDA (0)
-#define MICROPY_HW_I2C1_SCL (0)
-#define MICROPY_HW_I2C1_SDA (0)
-#define MICROPY_I2C_PINS_ARG_OPTS MP_ARG_REQUIRED
-
-#else
-
-// Most boards do not require pin args.
-#define MICROPY_I2C_PINS_ARG_OPTS 0
-
-#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
-#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))
-#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;
diff --git a/ports/rp2/machine_i2c.h b/ports/rp2/machine_i2c.h
new file mode 100644
index 0000000000000..da8cb5f8567d0
--- /dev/null
+++ b/ports/rp2/machine_i2c.h
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2025 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_MACHINE_I2C_H
+#define MICROPY_INCLUDED_RP2_MACHINE_I2C_H
+
+#ifdef MICROPY_HW_I2C_NO_DEFAULT_PINS
+
+// With no default I2C, need to require the pin args.
+#define MICROPY_HW_I2C0_SCL (0)
+#define MICROPY_HW_I2C0_SDA (0)
+#define MICROPY_HW_I2C1_SCL (0)
+#define MICROPY_HW_I2C1_SDA (0)
+#define MICROPY_I2C_PINS_ARG_OPTS MP_ARG_REQUIRED
+
+#else
+
+// Most boards do not require pin args.
+#define MICROPY_I2C_PINS_ARG_OPTS 0
+
+#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
+#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))
+#define IS_VALID_SDA(i2c, pin) (((pin) & 1) == 0 && (((pin) & 2) >> 1) == (i2c))
+
+#endif // MICROPY_INCLUDED_RP2_MACHINE_I2C_H

From 1839340dda5040fab0d05a5c58660ad0f4b5513e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 May 2025 14:00:05 +1000
Subject: [PATCH 2632/3129] rp2/machine_i2c_target: Implement I2CTarget class.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_i2c_target.c | 304 +++++++++++++++++++++++++++++++++
 ports/rp2/main.c               |   4 +
 ports/rp2/mpconfigport.h       |   4 +
 3 files changed, 312 insertions(+)
 create mode 100644 ports/rp2/machine_i2c_target.c

diff --git a/ports/rp2/machine_i2c_target.c b/ports/rp2/machine_i2c_target.c
new file mode 100644
index 0000000000000..dc3010727b522
--- /dev/null
+++ b/ports/rp2/machine_i2c_target.c
@@ -0,0 +1,304 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 is never compiled standalone, it's included directly from
+// extmod/machine_i2c_target.c via MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE.
+
+#include "machine_i2c.h"
+#include "hardware/i2c.h"
+
+typedef struct _machine_i2c_target_obj_t {
+    mp_obj_base_t base;
+    i2c_inst_t *const i2c_inst;
+    mp_hal_pin_obj_t scl;
+    mp_hal_pin_obj_t sda;
+    uint8_t state;
+    bool stop_pending;
+    bool irq_active;
+} machine_i2c_target_obj_t;
+
+static machine_i2c_target_obj_t machine_i2c_target_obj[] = {
+    {{&machine_i2c_target_type}, i2c0, MICROPY_HW_I2C0_SCL, MICROPY_HW_I2C0_SDA},
+    {{&machine_i2c_target_type}, i2c1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
+};
+
+/******************************************************************************/
+// RP2xxx hardware bindings
+
+static void check_stop_pending(machine_i2c_target_obj_t *self) {
+    if (self->irq_active) {
+        return;
+    }
+    if (self->stop_pending && !(self->i2c_inst->hw->status & I2C_IC_STATUS_RFNE_BITS)) {
+        unsigned int i2c_id = self - &machine_i2c_target_obj[0];
+        machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+        self->stop_pending = false;
+        self->state = STATE_IDLE;
+        machine_i2c_target_data_restart_or_stop(data);
+    }
+}
+
+static void i2c_target_handler(i2c_inst_t *i2c) {
+    unsigned int i2c_id = i2c == i2c0 ? 0 : 1;
+    machine_i2c_target_obj_t *self = &machine_i2c_target_obj[i2c_id];
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+
+    self->irq_active = true;
+
+    // Get the interrupt status.
+    uint32_t intr_stat = i2c->hw->intr_stat;
+
+    if (intr_stat & I2C_IC_INTR_STAT_R_TX_ABRT_BITS) {
+        // Clear the TX_ABRT condition.
+        (void)i2c->hw->clr_tx_abrt;
+    }
+
+    if (intr_stat & I2C_IC_INTR_STAT_R_START_DET_BITS) {
+        // Controller sent a start condition.
+        // Reset all state machines in case something went wrong.
+        (void)i2c->hw->clr_start_det;
+        if (self->state != STATE_IDLE) {
+            machine_i2c_target_data_reset_helper(data);
+            self->state = STATE_IDLE;
+        }
+    }
+
+    if (intr_stat & I2C_IC_INTR_STAT_R_RX_FULL_BITS) {
+        // Data from controller is available for reading.
+        // Mask interrupt until I2C_DATA_CMD is read from.
+        i2c->hw->intr_mask &= ~I2C_IC_INTR_MASK_M_RX_FULL_BITS;
+        if (self->state != STATE_WRITING) {
+            machine_i2c_target_data_addr_match(data, false);
+        }
+        machine_i2c_target_data_write_request(self, data);
+        self->state = STATE_WRITING;
+    }
+
+    if (intr_stat & (I2C_IC_INTR_STAT_R_RD_REQ_BITS | I2C_IC_INTR_STAT_R_RX_DONE_BITS)) {
+        // Controller is requesting data.
+        (void)i2c->hw->clr_rx_done;
+        (void)i2c->hw->clr_rd_req;
+        i2c->hw->intr_mask &= ~I2C_IC_INTR_MASK_M_RD_REQ_BITS;
+        if (self->state != STATE_READING) {
+            machine_i2c_target_data_addr_match(data, true);
+        }
+        machine_i2c_target_data_read_request(self, data);
+        self->state = STATE_READING;
+    }
+
+    if (intr_stat & I2C_IC_INTR_STAT_R_STOP_DET_BITS) {
+        // Controller has generated a stop condition.
+        (void)i2c->hw->clr_stop_det;
+        if (self->state == STATE_IDLE) {
+            machine_i2c_target_data_addr_match(data, false);
+        }
+        if (i2c->hw->status & I2C_IC_STATUS_RFNE_BITS) {
+            self->stop_pending = true;
+        } else {
+            machine_i2c_target_data_restart_or_stop(data);
+            self->state = STATE_IDLE;
+        }
+    }
+
+    self->irq_active = false;
+    check_stop_pending(self);
+}
+
+static void i2c_target_irq_handler(void) {
+    uint i2c_index = __get_current_exception() - VTABLE_FIRST_IRQ - I2C0_IRQ;
+    i2c_inst_t *i2c = i2c_get_instance(i2c_index);
+    i2c_target_handler(i2c);
+}
+
+static void i2c_target_init(i2c_inst_t *i2c, uint16_t addr, bool addr_10bit) {
+    i2c->hw->enable = 0;
+
+    // Configure general settings, target address and FIFO levels.
+    i2c->hw->con =
+        I2C_IC_CON_RX_FIFO_FULL_HLD_CTRL_BITS
+        | I2C_IC_CON_STOP_DET_IFADDRESSED_BITS;
+    if (addr_10bit) {
+        i2c->hw->con |= I2C_IC_CON_IC_10BITADDR_SLAVE_BITS;
+    }
+    i2c->hw->sar = addr;
+    i2c->hw->tx_tl = 1;
+    i2c->hw->rx_tl = 0; // interrupt when at least 1 byte is available
+    (void)i2c->hw->clr_intr;
+
+    // Enable interrupts.
+    i2c->hw->intr_mask =
+        I2C_IC_INTR_MASK_M_START_DET_BITS
+        | I2C_IC_INTR_MASK_M_STOP_DET_BITS
+        | I2C_IC_INTR_MASK_M_RX_DONE_BITS
+        | I2C_IC_INTR_MASK_M_TX_ABRT_BITS
+        | I2C_IC_INTR_MASK_M_RD_REQ_BITS
+        | I2C_IC_INTR_MASK_M_RX_FULL_BITS
+    ;
+
+    i2c->hw->enable = 1;
+
+    // Enable interrupt for current core.
+    uint i2c_index = i2c_hw_index(i2c);
+    uint num = I2C0_IRQ + i2c_index;
+    irq_set_exclusive_handler(num, i2c_target_irq_handler);
+    irq_set_enabled(num, true);
+}
+
+static void i2c_target_deinit(i2c_inst_t *i2c) {
+    uint i2c_index = i2c_hw_index(i2c);
+    uint num = I2C0_IRQ + i2c_index;
+    irq_set_enabled(num, false);
+    irq_remove_handler(num, i2c_target_irq_handler);
+
+    i2c->hw->intr_mask = 0;
+    i2c->hw->enable = 0;
+    i2c->hw->con = I2C_IC_CON_IC_SLAVE_DISABLE_BITS;
+}
+
+/******************************************************************************/
+// I2CTarget port implementation
+
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return self - &machine_i2c_target_obj[0];
+}
+
+static inline void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
+    mp_irq_handler(&irq->base);
+}
+
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
+    i2c_hw_t *i2c_hw = self->i2c_inst->hw;
+
+    // Read from the RX FIFO.
+    size_t i = 0;
+    while (i < len && (i2c_hw->status & I2C_IC_STATUS_RFNE_BITS)) {
+        buf[i++] = i2c_hw->data_cmd;
+    }
+
+    // Re-enable RX_FULL interrupt.
+    i2c_hw->intr_mask |= I2C_IC_INTR_MASK_M_RX_FULL_BITS;
+
+    check_stop_pending(self);
+
+    return i;
+}
+
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf) {
+    i2c_hw_t *i2c_hw = self->i2c_inst->hw;
+
+    // Write to the TX FIFO.
+    size_t i = 0;
+    while (i < len && (i2c_hw->status & I2C_IC_STATUS_TFNF_BITS)) {
+        i2c_hw->data_cmd = buf[i++];
+    }
+
+    // Re-enable RD_REQ interrupt.
+    i2c_hw->intr_mask |= I2C_IC_INTR_MASK_M_RD_REQ_BITS;
+
+    return i;
+}
+
+static inline void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger) {
+    (void)self;
+    (void)trigger;
+}
+
+static mp_obj_t mp_machine_i2c_target_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_addr, ARG_addrsize, ARG_mem, ARG_mem_addrsize, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        #ifdef PICO_DEFAULT_I2C
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = PICO_DEFAULT_I2C} },
+        #else
+        { MP_QSTR_id, MP_ARG_INT | MP_ARG_REQUIRED },
+        #endif
+        { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
+        { MP_QSTR_mem, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+        { MP_QSTR_scl, MICROPY_I2C_PINS_ARG_OPTS | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_sda, MICROPY_I2C_PINS_ARG_OPTS | 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);
+
+    int i2c_id = args[ARG_id].u_int;
+
+    // Check if the I2C bus is valid
+    if (i2c_id < 0 || i2c_id >= MP_ARRAY_SIZE(machine_i2c_target_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2CTarget(%d) doesn't exist"), i2c_id);
+    }
+
+    // Get static peripheral object.
+    machine_i2c_target_obj_t *self = &machine_i2c_target_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(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(i2c_id, sda)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad SDA pin"));
+        }
+        self->sda = sda;
+    }
+
+    // Initialise I2C target state and data.
+    self->state = STATE_IDLE;
+    self->stop_pending = false;
+    self->irq_active = false;
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[i2c_id] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+    machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
+
+    // Initialise I2C target hardware.
+    i2c_target_init(self->i2c_inst, args[ARG_addr].u_int, args[ARG_addrsize].u_int == 10);
+    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 void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    i2c_hw_t *i2c_hw = i2c_get_hw(self->i2c_inst);
+    mp_printf(print, "I2CTarget(%u, addr=%u, scl=%u, sda=%u)",
+        self - &machine_i2c_target_obj[0], i2c_hw->sar, self->scl, self->sda);
+}
+
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self) {
+    gpio_set_function(self->scl, GPIO_FUNC_SIO);
+    gpio_set_function(self->sda, GPIO_FUNC_SIO);
+    i2c_target_deinit(self->i2c_inst);
+}
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 0f10f63c6d296..1ffcabdfa0d14 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -34,6 +34,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/modmachine.h"
 #include "extmod/modnetwork.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
@@ -257,6 +258,9 @@ int main(int argc, char **argv) {
         machine_pwm_deinit_all();
         machine_pin_deinit();
         machine_uart_deinit_all();
+        #if MICROPY_PY_MACHINE_I2C_TARGET
+        mp_machine_i2c_target_deinit_all();
+        #endif
         #if MICROPY_PY_THREAD
         mp_thread_deinit();
         #endif
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 35afea4fac5f4..d35563bd07028 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -171,6 +171,10 @@
 #define MICROPY_PY_MACHINE_PWM                  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE      "ports/rp2/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C                  (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET           (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/rp2/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX       (2)
+#define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ  (1)
 #define MICROPY_PY_MACHINE_SOFTI2C              (1)
 #define MICROPY_PY_MACHINE_I2S                  (1)
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE      "ports/rp2/machine_i2s.c"

From 0c50343145c04b0b67c4b1eb3a337c4b0ea70b1f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jun 2025 12:41:01 +1000
Subject: [PATCH 2633/3129] zephyr/machine_i2c_target: Implement I2CTarget
 class.

Tested and working on rpi_pico and nucleo_wb55rg.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/nucleo_wb55rg.conf |   1 +
 ports/zephyr/boards/rpi_pico.conf      |   1 +
 ports/zephyr/machine_i2c_target.c      | 191 +++++++++++++++++++++++++
 ports/zephyr/main.c                    |   4 +
 ports/zephyr/mpconfigport.h            |   6 +
 5 files changed, 203 insertions(+)
 create mode 100644 ports/zephyr/machine_i2c_target.c

diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
index adfab367c892a..1c9c2f794cb05 100644
--- a/ports/zephyr/boards/nucleo_wb55rg.conf
+++ b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -4,6 +4,7 @@ CONFIG_NETWORKING=n
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_I2C=y
+CONFIG_I2C_TARGET=y
 CONFIG_SPI=y
 
 # Bluetooth
diff --git a/ports/zephyr/boards/rpi_pico.conf b/ports/zephyr/boards/rpi_pico.conf
index 6b31bc9f98bcb..683279ddc2c1c 100644
--- a/ports/zephyr/boards/rpi_pico.conf
+++ b/ports/zephyr/boards/rpi_pico.conf
@@ -13,6 +13,7 @@ CONFIG_NETWORKING=n
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_I2C=y
+CONFIG_I2C_TARGET=y
 CONFIG_SPI=y
 
 # MicroPython config.
diff --git a/ports/zephyr/machine_i2c_target.c b/ports/zephyr/machine_i2c_target.c
new file mode 100644
index 0000000000000..236f1334883a1
--- /dev/null
+++ b/ports/zephyr/machine_i2c_target.c
@@ -0,0 +1,191 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 is never compiled standalone, it's included directly from
+// extmod/machine_i2c_target.c via MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE.
+
+#include <zephyr/drivers/i2c.h>
+
+#include "zephyr_device.h"
+
+typedef struct _machine_i2c_target_obj_t {
+    mp_obj_base_t base;
+    const struct device *dev;
+    struct i2c_target_config cfg;
+    uint8_t state;
+    uint8_t data_byte;
+} machine_i2c_target_obj_t;
+
+static machine_i2c_target_obj_t machine_i2c_target_obj[] = {
+    {.base = {&machine_i2c_target_type}, .dev = NULL},
+};
+
+/******************************************************************************/
+// zephyr bindings
+//
+// Note that it's possible to get callbacks in either of these sequences:
+// - read_requested read_processed read_processed ... (eg STM32)
+// - read_requested read_processed read_requested read_processed ... (eg RP2xxx / Design Ware)
+
+static int i2c_target_write_requested(struct i2c_target_config *config) {
+    machine_i2c_target_obj_t *self = CONTAINER_OF(config, machine_i2c_target_obj_t, cfg);
+    self->state = STATE_WRITING;
+    machine_i2c_target_data_addr_match(&machine_i2c_target_data[0], false);
+    return 0;
+}
+
+static int i2c_target_write_received(struct i2c_target_config *config, uint8_t val) {
+    machine_i2c_target_obj_t *self = CONTAINER_OF(config, machine_i2c_target_obj_t, cfg);
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[0];
+    self->data_byte = val;
+    machine_i2c_target_data_write_request(self, data);
+    return 0;
+}
+
+static int i2c_target_read_requested(struct i2c_target_config *config, uint8_t *val) {
+    machine_i2c_target_obj_t *self = CONTAINER_OF(config, machine_i2c_target_obj_t, cfg);
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[0];
+    if (self->state != STATE_READING) {
+        machine_i2c_target_data_addr_match(data, true);
+        machine_i2c_target_data_read_request(self, data);
+        self->state = STATE_READING;
+    }
+    *val = self->data_byte;
+    return 0;
+}
+
+static int i2c_target_read_processed(struct i2c_target_config *config, uint8_t *val) {
+    machine_i2c_target_obj_t *self = CONTAINER_OF(config, machine_i2c_target_obj_t, cfg);
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[0];
+    machine_i2c_target_data_read_request(self, data);
+    *val = self->data_byte;
+    return 0;
+}
+
+// called only on stop, not restart
+static int i2c_target_stop(struct i2c_target_config *config) {
+    machine_i2c_target_obj_t *self = CONTAINER_OF(config, machine_i2c_target_obj_t, cfg);
+    if (self->state == STATE_IDLE) {
+        // Assume a stop without a start is a 0-byte write.
+        machine_i2c_target_data_addr_match(&machine_i2c_target_data[0], false);
+    }
+    self->state = STATE_IDLE;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[0];
+    machine_i2c_target_data_stop(data);
+    return 0;
+}
+
+static struct i2c_target_callbacks i2c_target_callbacks = {
+    .write_requested = i2c_target_write_requested,
+    .read_requested = i2c_target_read_requested,
+    .write_received = i2c_target_write_received,
+    .read_processed = i2c_target_read_processed,
+    .stop = i2c_target_stop,
+};
+
+/******************************************************************************/
+// I2CTarget port implementation
+
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return 0;
+}
+
+static void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
+    char dummy;
+    void *orig_top = MP_STATE_THREAD(stack_top);
+    mp_uint_t orig_limit = MP_STATE_THREAD(stack_limit);
+    MP_STATE_THREAD(stack_top) = &dummy;
+    MP_STATE_THREAD(stack_limit) = CONFIG_ISR_STACK_SIZE - 512;
+    mp_irq_handler(&irq->base);
+    MP_STATE_THREAD(stack_top) = orig_top;
+    MP_STATE_THREAD(stack_limit) = orig_limit;
+}
+
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
+    buf[0] = self->data_byte;
+    return 1;
+}
+
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf) {
+    self->data_byte = buf[0];
+    return 1;
+}
+
+static inline void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger) {
+    (void)self;
+    (void)trigger;
+}
+
+static mp_obj_t mp_machine_i2c_target_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_addr, ARG_addrsize, ARG_mem, ARG_mem_addrsize, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
+        { MP_QSTR_mem, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+    };
+
+    // Parse 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);
+
+    const struct device *dev = zephyr_device_find(args[ARG_id].u_obj);
+
+    machine_i2c_target_obj_t *self = &machine_i2c_target_obj[0];
+    if (!(self->dev == NULL || self->dev == dev)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("only one I2CTarget supported"));
+    }
+    self->dev = dev;
+    self->cfg.flags = 0;
+    self->cfg.address = args[ARG_addr].u_int;
+    self->cfg.callbacks = &i2c_target_callbacks;
+
+    // Initialise data.
+    self->state = STATE_IDLE;
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[0] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[0];
+    machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
+
+    // Initialise the I2C target.
+    int ret = i2c_target_register(self->dev, &self->cfg);
+    if (ret < 0) {
+        mp_raise_OSError(-ret);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2CTarget(%s, addr=%u)",
+        self->dev == NULL ? "" : self->dev->name, self->cfg.address);
+}
+
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self) {
+    i2c_target_unregister(self->dev, &self->cfg);
+    self->dev = NULL;
+}
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index eaef34a7868d3..f7ac997d92afd 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -53,6 +53,7 @@
 #include "shared/runtime/pyexec.h"
 #include "shared/readline/readline.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/modmachine.h"
 
 #if MICROPY_VFS
 #include "extmod/vfs.h"
@@ -197,6 +198,9 @@ int real_main(void) {
     #if MICROPY_PY_MACHINE
     machine_pin_deinit();
     #endif
+    #if MICROPY_PY_MACHINE_I2C_TARGET
+    mp_machine_i2c_target_deinit_all();
+    #endif
 
     #if MICROPY_PY_THREAD
     mp_thread_deinit();
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 848e04b389e58..fbf8dbcc7a709 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -62,6 +62,12 @@
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
 #define MICROPY_PY_MACHINE_I2C      (1)
+#ifdef CONFIG_I2C_TARGET
+#define MICROPY_PY_MACHINE_I2C_TARGET (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/zephyr/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ (1)
+#endif
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB (SPI_TRANSFER_MSB)

From 6e72cae619f4172205249b831382bd43205a4b10 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Jul 2025 16:30:56 +1000
Subject: [PATCH 2634/3129] alif/machine_i2c_target: Implement I2CTarget class.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/irq.h                |   1 +
 ports/alif/machine_i2c_target.c | 325 ++++++++++++++++++++++++++++++++
 ports/alif/main.c               |   4 +
 ports/alif/mpconfigport.h       |   4 +
 4 files changed, 334 insertions(+)
 create mode 100644 ports/alif/machine_i2c_target.c

diff --git a/ports/alif/irq.h b/ports/alif/irq.h
index 02df524a49c86..86b739795c173 100644
--- a/ports/alif/irq.h
+++ b/ports/alif/irq.h
@@ -49,6 +49,7 @@
 #define IRQ_PRI_HWSEM           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 8, 0)
 #define IRQ_PRI_GPU             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 10, 0)
 #define IRQ_PRI_GPIO            NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 50, 0)
+#define IRQ_PRI_I2C             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 60, 0)
 #define IRQ_PRI_RTC             NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 100, 0)
 #define IRQ_PRI_CYW43           NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 126, 0)
 #define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_7, 127, 0)
diff --git a/ports/alif/machine_i2c_target.c b/ports/alif/machine_i2c_target.c
new file mode 100644
index 0000000000000..cdc106049a08d
--- /dev/null
+++ b/ports/alif/machine_i2c_target.c
@@ -0,0 +1,325 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 is never compiled standalone, it's included directly from
+// extmod/machine_i2c_target.c via MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE.
+
+#include "i2c.h"
+
+#define I2C_IC_CON_RX_FIFO_FULL_HLD_CTRL (1 << 9)
+#define I2C_IC_CON_TX_EMPTY_CTRL (1 << 8)
+#define I2C_IC_CON_STOP_DET_IFADDRESSED (1 << 7)
+
+typedef struct _machine_i2c_target_obj_t {
+    mp_obj_base_t base;
+    I2C_Type *i2c;
+    mp_hal_pin_obj_t scl;
+    mp_hal_pin_obj_t sda;
+    uint8_t state;
+    bool stop_pending;
+    bool irq_active;
+} machine_i2c_target_obj_t;
+
+static machine_i2c_target_obj_t machine_i2c_target_obj[] = {
+    #if defined(MICROPY_HW_I2C0_SCL)
+    [0] = {{&machine_i2c_target_type}, (I2C_Type *)I2C0_BASE, MICROPY_HW_I2C0_SCL, MICROPY_HW_I2C0_SDA},
+    #endif
+    #if defined(MICROPY_HW_I2C1_SCL)
+    [1] = {{&machine_i2c_target_type}, (I2C_Type *)I2C1_BASE, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
+    #endif
+    #if defined(MICROPY_HW_I2C2_SCL)
+    [2] = {{&machine_i2c_target_type}, (I2C_Type *)I2C2_BASE, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA},
+    #endif
+    #if defined(MICROPY_HW_I2C3_SCL)
+    [3] = {{&machine_i2c_target_type}, (I2C_Type *)I2C3_BASE, MICROPY_HW_I2C3_SCL, MICROPY_HW_I2C3_SDA},
+    #endif
+};
+
+/******************************************************************************/
+// Alif I2C hardware bindings
+//
+// The hardware triggers the following IRQs for the given scenarios:
+// - scan (0-byte write) of another target: START_DET
+// - scan (0-byte write) of us:             START_DET STOP_DET
+// - write of n bytes:                      START_DET RX_FULL*n STOP_DET
+// - write of n bytes then read of m bytes: START_DET RX_FULL*n START_DET RD_REQ*m RX_DONE STOP_DET
+
+static inline unsigned int i2c_reg_base_to_index(I2C_Type *i2c) {
+    return ((uintptr_t)i2c - I2C0_BASE) / (I2C1_BASE - I2C0_BASE);
+}
+
+static const uint32_t i2c_irq_num[] = { I2C0_IRQ_IRQn, I2C1_IRQ_IRQn, I2C2_IRQ_IRQn, I2C3_IRQ_IRQn };
+
+static void check_stop_pending(machine_i2c_target_obj_t *self) {
+    if (self->irq_active) {
+        return;
+    }
+    if (self->stop_pending && !(self->i2c->I2C_STATUS & I2C_IC_STATUS_RECEIVE_FIFO_NOT_EMPTY)) {
+        unsigned int i2c_id = self - &machine_i2c_target_obj[0];
+        machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+        self->stop_pending = false;
+        self->state = STATE_IDLE;
+        machine_i2c_target_data_restart_or_stop(data);
+    }
+}
+
+static void i2c_target_irq_handler(machine_i2c_target_obj_t *self) {
+    unsigned int i2c_id = self - &machine_i2c_target_obj[0];
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+    I2C_Type *i2c = self->i2c;
+
+    self->irq_active = true;
+
+    // Get the interrupt status.
+    uint32_t intr_stat = i2c->I2C_RAW_INTR_STAT;
+
+    if (intr_stat & I2C_IC_INTR_STAT_TX_ABRT) {
+        // Clear the TX_ABRT condition.
+        (void)i2c->I2C_CLR_TX_ABRT;
+    }
+
+    if (intr_stat & I2C_IC_INTR_STAT_START_DET) {
+        // Controller sent a start condition.
+        // Reset all state machines in case something went wrong.
+        (void)i2c->I2C_CLR_START_DET;
+        if (self->state != STATE_IDLE) {
+            machine_i2c_target_data_reset_helper(data);
+            self->state = STATE_IDLE;
+        }
+    }
+
+    if (intr_stat & I2C_IC_INTR_STAT_RX_FULL) {
+        // Data from controller is available for reading.
+        // Mask interrupt until I2C_DATA_CMD is read from.
+        i2c->I2C_INTR_MASK &= ~I2C_IC_INTR_STAT_RX_FULL;
+        if (self->state != STATE_WRITING) {
+            machine_i2c_target_data_addr_match(data, false);
+        }
+        machine_i2c_target_data_write_request(self, data);
+        self->state = STATE_WRITING;
+    }
+
+    if (intr_stat & (I2C_IC_INTR_STAT_RD_REQ | I2C_IC_INTR_STAT_RX_DONE)) {
+        // Controller is requesting data.
+        // Note: for RX_DONE interrupt, no data needs to be written but this event is
+        // needed to match the expected I2CTarget event behaviour.  A TX_ABTR interrupt
+        // will be fired after the unused byte is written to I2C_DATA_CMD, and clearing
+        // that abort is required to reset the hardware I2C state machine.
+        (void)i2c->I2C_CLR_RX_DONE;
+        (void)i2c->I2C_CLR_RD_REQ;
+        i2c->I2C_INTR_MASK &= ~I2C_IC_INTR_STAT_RD_REQ;
+        if (self->state != STATE_READING) {
+            machine_i2c_target_data_addr_match(data, true);
+        }
+        machine_i2c_target_data_read_request(self, data);
+        self->state = STATE_READING;
+    }
+
+    if (intr_stat & I2C_IC_INTR_STAT_STOP_DET) {
+        // Controller has generated a stop condition.
+        (void)i2c->I2C_CLR_STOP_DET;
+        if (self->state == STATE_IDLE) {
+            machine_i2c_target_data_addr_match(data, false);
+        }
+        if (i2c->I2C_STATUS & I2C_IC_STATUS_RECEIVE_FIFO_NOT_EMPTY) {
+            self->stop_pending = true;
+        } else {
+            machine_i2c_target_data_restart_or_stop(data);
+            self->state = STATE_IDLE;
+        }
+    }
+
+    self->irq_active = false;
+    check_stop_pending(self);
+}
+
+void I2C0_IRQHandler(void) {
+    i2c_target_irq_handler(&machine_i2c_target_obj[0]);
+}
+
+void I2C1_IRQHandler(void) {
+    i2c_target_irq_handler(&machine_i2c_target_obj[1]);
+}
+
+void I2C2_IRQHandler(void) {
+    i2c_target_irq_handler(&machine_i2c_target_obj[2]);
+}
+
+void I2C3_IRQHandler(void) {
+    i2c_target_irq_handler(&machine_i2c_target_obj[3]);
+}
+
+static void i2c_target_init(I2C_Type *i2c, uint16_t addr, bool addr_10bit) {
+    i2c_disable(i2c);
+
+    uint32_t ic_con_reg = 0;
+    ic_con_reg |= I2C_IC_CON_RX_FIFO_FULL_HLD_CTRL;
+    ic_con_reg |= I2C_IC_CON_STOP_DET_IFADDRESSED;
+    if (addr_10bit) {
+        ic_con_reg |= I2C_SLAVE_10BIT_ADDR_MODE;
+    }
+    i2c->I2C_CON = ic_con_reg;
+    i2c->I2C_SAR = addr & I2C_IC_SAR_10BIT_ADDR_MASK;
+    i2c->I2C_TX_TL = 1;
+    i2c->I2C_RX_TL = 0; // interrupt when at least 1 byte is available
+    i2c_clear_all_interrupt(i2c);
+
+    // Enable interrupts.
+    i2c->I2C_INTR_MASK =
+        I2C_IC_INTR_STAT_STOP_DET
+        | I2C_IC_INTR_STAT_RX_DONE
+        | I2C_IC_INTR_STAT_TX_ABRT
+        | I2C_IC_INTR_STAT_RD_REQ
+        | I2C_IC_INTR_STAT_RX_FULL
+    ;
+
+    i2c_enable(i2c);
+
+    // Enable I2C interrupts.
+    uint32_t irq_num = i2c_irq_num[i2c_reg_base_to_index(i2c)];
+    NVIC_ClearPendingIRQ(irq_num);
+    NVIC_SetPriority(irq_num, IRQ_PRI_I2C);
+    NVIC_EnableIRQ(irq_num);
+}
+
+static void i2c_target_deinit(I2C_Type *i2c) {
+    uint32_t irq_num = i2c_irq_num[i2c_reg_base_to_index(i2c)];
+    NVIC_DisableIRQ(irq_num);
+    i2c_disable(i2c);
+}
+
+/******************************************************************************/
+// I2CTarget port implementation
+
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return self - &machine_i2c_target_obj[0];
+}
+
+static inline void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
+    mp_irq_handler(&irq->base);
+}
+
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
+    I2C_Type *i2c = self->i2c;
+
+    // Read from the RX FIFO.
+    size_t i = 0;
+    while (i < len && (i2c->I2C_STATUS & I2C_IC_STATUS_RECEIVE_FIFO_NOT_EMPTY)) {
+        buf[i++] = i2c->I2C_DATA_CMD;
+    }
+
+    // Re-enable RX_FULL interrupt.
+    i2c->I2C_INTR_MASK |= I2C_IC_INTR_STAT_RX_FULL;
+
+    check_stop_pending(self);
+
+    return i;
+}
+
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf) {
+    // Write to the TX FIFO.
+    size_t i = 0;
+    while (i < len && (self->i2c->I2C_STATUS & I2C_IC_STATUS_TRANSMIT_FIFO_NOT_FULL)) {
+        self->i2c->I2C_DATA_CMD = buf[i++];
+    }
+
+    // Re-enable RD_REQ interrupt.
+    self->i2c->I2C_INTR_MASK |= I2C_IC_INTR_STAT_RD_REQ;
+
+    return 1;
+}
+
+static inline void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger) {
+    (void)self;
+    (void)trigger;
+}
+
+static mp_obj_t mp_machine_i2c_target_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_addr, ARG_addrsize, ARG_mem, ARG_mem_addrsize, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT | MP_ARG_REQUIRED },
+        { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
+        { MP_QSTR_mem, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+        { 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 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);
+
+    int i2c_id = args[ARG_id].u_int;
+
+    // Check if the I2C bus is valid
+    if (i2c_id < 0 || i2c_id >= MP_ARRAY_SIZE(machine_i2c_target_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2CTarget(%d) doesn't exist"), i2c_id);
+    }
+
+    // Get static peripheral object.
+    machine_i2c_target_obj_t *self = &machine_i2c_target_obj[i2c_id];
+
+    // Disable I2C controller.
+    i2c_disable(self->i2c);
+
+    // Initialise data.
+    self->state = STATE_IDLE;
+    self->stop_pending = false;
+    self->irq_active = false;
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[i2c_id] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+    machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
+
+    // Set SCL/SDA pins if given.
+    if (args[ARG_scl].u_obj != mp_const_none) {
+        self->scl = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
+    }
+    if (args[ARG_sda].u_obj != mp_const_none) {
+        self->sda = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
+    }
+
+    // Configure I2C pins.
+    mp_hal_pin_config(self->scl, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(I2C_SCL, i2c_id), true);
+    mp_hal_pin_config(self->sda, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP,
+        MP_HAL_PIN_SPEED_LOW, MP_HAL_PIN_DRIVE_8MA, MP_HAL_PIN_ALT(I2C_SDA, i2c_id), true);
+
+    // Initialise the I2C target.
+    i2c_target_init(self->i2c, args[ARG_addr].u_int, args[ARG_addrsize].u_int == 10);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2CTarget(%u, addr=%u, scl=" MP_HAL_PIN_FMT ", sda=" MP_HAL_PIN_FMT ")",
+        self - &machine_i2c_target_obj[0], self->i2c->I2C_SAR, mp_hal_pin_name(self->scl), mp_hal_pin_name(self->sda));
+}
+
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self) {
+    i2c_target_deinit(self->i2c);
+}
diff --git a/ports/alif/main.c b/ports/alif/main.c
index ab5e85d5b9db6..308d8df900e66 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -31,6 +31,7 @@
 #include "py/mphal.h"
 #include "py/stackctrl.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/modmachine.h"
 #include "extmod/modnetwork.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
@@ -164,6 +165,9 @@ int main(void) {
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_deinit();
         #endif
+        #if MICROPY_PY_MACHINE_I2C_TARGET
+        mp_machine_i2c_target_deinit_all();
+        #endif
         soft_timer_deinit();
         machine_pin_irq_deinit();
         gc_sweep_all();
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index ddfc551bf8983..a8c8c842977ed 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -132,6 +132,10 @@
 #define MICROPY_PY_MACHINE_PULSE                (1)
 #define MICROPY_PY_MACHINE_I2C                  (MICROPY_HW_ENABLE_HW_I2C)
 #define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1  (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET           (MICROPY_HW_ENABLE_HW_I2C)
+#define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/alif/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX       (4)
+#define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ  (1)
 #define MICROPY_PY_MACHINE_SOFTI2C              (1)
 #define MICROPY_PY_MACHINE_SPI                  (1)
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)

From 67a442d8fabef4f203dd6b13ded46b3836232522 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Jul 2025 23:52:39 +1000
Subject: [PATCH 2635/3129] alif/machine_i2c: Allow changing I2C SCL/SDA pins.

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

diff --git a/ports/alif/machine_i2c.c b/ports/alif/machine_i2c.c
index a710aeeb01132..356c893dc7021 100644
--- a/ports/alif/machine_i2c.c
+++ b/ports/alif/machine_i2c.c
@@ -125,9 +125,12 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     self->freq = args[ARG_freq].u_int;
     self->timeout = args[ARG_timeout].u_int;
 
-    // here we would check the scl/sda pins and configure them, but it's not implemented
-    if (args[ARG_scl].u_obj != mp_const_none || args[ARG_sda].u_obj != mp_const_none) {
-        mp_raise_ValueError(MP_ERROR_TEXT("explicit choice of scl/sda is not implemented"));
+    // Set SCL/SDA pins if given.
+    if (args[ARG_scl].u_obj != mp_const_none) {
+        self->scl = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
+    }
+    if (args[ARG_sda].u_obj != mp_const_none) {
+        self->sda = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
     }
 
     // Disable I2C controller.

From 5c78762c166a22d66269357bc0ffe2129586dca0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 29 May 2025 09:48:02 +0200
Subject: [PATCH 2636/3129] mimxrt/machine_i2c_target: Support I2C target mode.

The functionality is similar to the RP2 implementation.  The supported
address size is 7 bit.  In order to achieve a sufficient response, the
target I2C IRQ handler has to run from RAM, causing much more code moved to
RAM than required.

Tested with Teensy 4.1, MIMXRT1021EVK, MIMXRT1011EVK and MIMXRT1170, using
both a On-Board SoftI2C as controller and a RP2 Pico as external
controller.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/mimxrt/boards/common.ld     |   2 +-
 ports/mimxrt/machine_i2c.c        |  13 +--
 ports/mimxrt/machine_i2c.h        |  38 +++++++
 ports/mimxrt/machine_i2c_target.c | 168 ++++++++++++++++++++++++++++++
 ports/mimxrt/main.c               |   1 +
 ports/mimxrt/mpconfigport.h       |   5 +
 6 files changed, 217 insertions(+), 10 deletions(-)
 create mode 100644 ports/mimxrt/machine_i2c.h
 create mode 100644 ports/mimxrt/machine_i2c_target.c

diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index 477ba38bc89a3..dcbc0a42366a3 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -98,7 +98,7 @@ SECTIONS
   .text :
   {
     . = ALIGN(4);
-    *(EXCLUDE_FILE(*fsl_flexspi.o *gc.o *vm.o *parse*.o *runtime*.o *map.o *mpirq.o ) .text*) /* .text* sections (code) */
+    *(EXCLUDE_FILE(*fsl_flexspi.o *gc.o *vm.o *runtime*.o *map.o *mpirq.o *machine_i2c_target.o *fsl_lpi2c.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/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index d170804f4f058..aa128e6ff6fe2 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -33,11 +33,7 @@
 
 #include "fsl_iomuxc.h"
 #include "fsl_lpi2c.h"
-
-#define DEFAULT_I2C_ID          (0)
-#define DEFAULT_I2C_FREQ        (400000)
-#define DEFAULT_I2C_DRIVE       (6)
-#define DEFAULT_I2C_TIMEOUT     (50000)
+#include "machine_i2c.h"
 
 typedef struct _machine_i2c_obj_t {
     mp_obj_base_t base;
@@ -57,12 +53,11 @@ typedef struct _iomux_table_t {
     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;
+const uint8_t i2c_index_table[] = MICROPY_HW_I2C_INDEX;
+LPI2C_Type *i2c_base_ptr_table[] = LPI2C_BASE_PTRS;
+const uint8_t micropy_hw_i2c_num = MICROPY_HW_I2C_NUM;
 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])
 
diff --git a/ports/mimxrt/machine_i2c.h b/ports/mimxrt/machine_i2c.h
new file mode 100644
index 0000000000000..c6d561ca585f1
--- /dev/null
+++ b/ports/mimxrt/machine_i2c.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Damien P. George
+ * Copyright (c) 2025 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.
+ */
+
+#define DEFAULT_I2C_ID          (0)
+#define DEFAULT_I2C_FREQ        (400000)
+#define DEFAULT_I2C_DRIVE       (6)
+#define DEFAULT_I2C_TIMEOUT     (50000)
+#define DEFAULT_I2C_FILTER_NS   (200)
+#define MICROPY_HW_I2C_NUM      ARRAY_SIZE(i2c_index_table)
+
+extern const uint8_t i2c_index_table[];
+extern LPI2C_Type *i2c_base_ptr_table[];
+extern bool lpi2c_set_iomux(int8_t hw_i2c, uint8_t drive);
+extern const uint8_t micropy_hw_i2c_num;
diff --git a/ports/mimxrt/machine_i2c_target.c b/ports/mimxrt/machine_i2c_target.c
new file mode 100644
index 0000000000000..aa408071f31bd
--- /dev/null
+++ b/ports/mimxrt/machine_i2c_target.c
@@ -0,0 +1,168 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Damien P. George
+ * Copyright (c) 2025 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 is never compiled standalone, it's included directly from
+// extmod/machine_i2c_target.c via MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE.
+
+#include "fsl_lpi2c.h"
+#include "machine_i2c.h"
+#include CLOCK_CONFIG_H
+
+typedef struct _machine_i2c_target_obj_t {
+    mp_obj_base_t base;
+    LPI2C_Type *i2c_inst;
+    uint8_t i2c_id;
+    uint8_t addr;
+    lpi2c_slave_config_t slave_config;
+    lpi2c_slave_handle_t handle;
+} machine_i2c_target_obj_t;
+
+static void lpi2c_slave_callback(LPI2C_Type *base, lpi2c_slave_transfer_t *xfer, void *param) {
+    machine_i2c_target_obj_t *self = (machine_i2c_target_obj_t *)param;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[self->i2c_id];
+
+    switch (xfer->event) {
+        case kLPI2C_SlaveAddressMatchEvent:
+            // Controller addressed us.
+            machine_i2c_target_data_addr_match(data, xfer->receivedAddress & 1);
+            break;
+        case kLPI2C_SlaveReceiveEvent:
+            // Data from controller is available for reading.
+            machine_i2c_target_data_write_request(self, data);
+            break;
+        case kLPI2C_SlaveTransmitEvent:
+            // Controller is requesting data.
+            machine_i2c_target_data_read_request(self, data);
+            break;
+        case kLPI2C_SlaveCompletionEvent:
+            // Transfer done.
+            machine_i2c_target_data_stop(data);
+            break;
+        default:
+            break;
+    }
+}
+
+/******************************************************************************/
+// I2CTarget port implementation
+
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return self->i2c_id;
+}
+
+static inline void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
+    mp_irq_handler(&irq->base);
+}
+
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
+    // LPI2C_Type *i2c_inst = self->i2c_inst;
+    // mp_int_t i = 0;
+    // mp_int_t val = 0;
+    // while (i < len && !((val = i2c_inst->SRDR) & LPI2C_SRDR_RXEMPTY_MASK)) {
+    //     buf[i++] = (uint8_t)(val & 0xff);
+    // }
+    // return i;
+    // Simple and fast version for len == 1
+    buf[0] = (uint8_t)(self->i2c_inst->SRDR);
+    return 1;
+}
+
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf) {
+    self->i2c_inst->STDR = buf[0];
+    return 1;
+}
+
+static inline void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger) {
+    (void)self;
+    (void)trigger;
+}
+
+static mp_obj_t mp_machine_i2c_target_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_addr, ARG_addrsize, ARG_mem, ARG_mem_addrsize, ARG_drive };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = DEFAULT_I2C_ID} },
+        { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
+        { MP_QSTR_mem, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+        { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_I2C_DRIVE} },
+    };
+
+    // Parse 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 I2C bus.
+    int i2c_id = args[ARG_id].u_int;
+    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);
+    }
+    int i2c_hw_id = i2c_index_table[i2c_id]; // the hw i2c number 1..n
+
+    // Get I2C Object.
+    machine_i2c_target_obj_t *self = mp_obj_malloc_with_finaliser(machine_i2c_target_obj_t, &machine_i2c_target_type);
+    self->i2c_id = i2c_id;
+    self->i2c_inst = i2c_base_ptr_table[i2c_hw_id];
+    uint8_t drive = args[ARG_drive].u_int;
+    if (drive < 1 || drive > 7) {
+        drive = DEFAULT_I2C_DRIVE;
+    }
+    // Set the target address.
+    self->addr = args[ARG_addr].u_int;
+    // Initialise data.
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[i2c_id] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[self->i2c_id];
+    machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
+
+    // Initialise the GPIO pins
+    lpi2c_set_iomux(i2c_hw_id, drive);
+    // Initialise the I2C peripheral
+    LPI2C_SlaveGetDefaultConfig(&self->slave_config);
+    self->slave_config.address0 = self->addr;
+    self->slave_config.sdaGlitchFilterWidth_ns = DEFAULT_I2C_FILTER_NS;
+    self->slave_config.sclGlitchFilterWidth_ns = DEFAULT_I2C_FILTER_NS;
+    LPI2C_SlaveInit(self->i2c_inst, &self->slave_config, BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT);
+    // Create the LPI2C handle for the non-blocking transfer
+    LPI2C_SlaveTransferCreateHandle(self->i2c_inst, &self->handle, lpi2c_slave_callback, self);
+    // Start accepting I2C transfers on the LPI2C slave peripheral
+    status_t reVal = LPI2C_SlaveTransferNonBlocking(self->i2c_inst, &self->handle,
+        kLPI2C_SlaveAddressMatchEvent | kLPI2C_SlaveTransmitEvent | kLPI2C_SlaveReceiveEvent | kLPI2C_SlaveCompletionEvent);
+    if (reVal != kStatus_Success) {
+        mp_raise_ValueError(MP_ERROR_TEXT("cannot start I2C"));
+    }
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2CTarget(%u, addr=%u)", self->i2c_id, self->addr);
+}
+
+// Stop the Slave transfer and free the memory objects.
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self) {
+    LPI2C_SlaveDeinit(self->i2c_inst);
+}
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 6b9d4fa17afe4..7166171f17c2d 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -55,6 +55,7 @@
 #endif
 
 #include "systick.h"
+#include "extmod/modmachine.h"
 #include "extmod/modnetwork.h"
 #include "extmod/vfs.h"
 
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index e1c605f452a32..8ceb3b418370b 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -92,6 +92,11 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/mimxrt/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C              (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET       (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/mimxrt/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX   (FSL_FEATURE_SOC_LPI2C_COUNT)
+#define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET_FINALISER (1)
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (0)
 #endif

From 79d182deb28a478413c187e1db33681a46e1d20e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 5 Jun 2025 20:48:25 +0200
Subject: [PATCH 2637/3129] samd/machine_i2c_target: Support I2C target mode.

Supporting readfrom_mem*(). writeto_mem() and a set of IRQs.  Enabled by
default for SAMD51 devices and SAMD21 devices with external flash.

Tested with ItsyBitsy M4 and ItsyBitsy M0 with both on-board SoftI2C and a
RP2 Pico as controller.

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: robert-hh <robert@hammelrath.com>
---
 .../ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h   |   1 +
 ports/samd/machine_i2c.c                      |  38 ++--
 ports/samd/machine_i2c_target.c               | 213 ++++++++++++++++++
 ports/samd/main.c                             |   3 +-
 ports/samd/mcu/samd21/mpconfigmcu.h           |   3 +
 ports/samd/mcu/samd51/mpconfigmcu.h           |   3 +
 ports/samd/mpconfigport.h                     |   4 +
 ports/samd/pin_af.c                           |  16 ++
 ports/samd/pin_af.h                           |   2 +
 ports/samd/samd_soc.c                         |   2 +-
 10 files changed, 259 insertions(+), 26 deletions(-)
 create mode 100644 ports/samd/machine_i2c_target.c

diff --git a/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h
index eb4704ff8cb97..bf44bd661c0a3 100644
--- a/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_NEOKEY_TRINKEY/mpconfigboard.h
@@ -8,6 +8,7 @@
 #define MICROPY_PY_MACHINE_SOFTI2C  (0)
 #define MICROPY_PY_MACHINE_SOFTSPI  (0)
 #define MICROPY_PY_MACHINE_I2C      (0)
+#define MICROPY_PY_MACHINE_I2C_TARGET (0)
 #define MICROPY_PY_MACHINE_SPI      (0)
 #define MICROPY_PY_MACHINE_UART     (0)
 #define MICROPY_PY_MACHINE_ADC      (0)
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index 172518523d208..50548b62a7d68 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -29,13 +29,11 @@
 
 #if MICROPY_PY_MACHINE_I2C
 
-#include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/modmachine.h"
 #include "samd_soc.h"
 #include "pin_af.h"
 #include "genhdr/pins.h"
-#include "clock_config.h"
 
 #define DEFAULT_I2C_FREQ    (400000)
 #define RISETIME_NS         (200)
@@ -79,9 +77,9 @@ static void i2c_send_command(Sercom *i2c, uint8_t command) {
 }
 
 void common_i2c_irq_handler(int i2c_id) {
-    // handle Sercom I2C IRQ
+    // Handle Sercom I2C IRQ for controller mode.
     machine_i2c_obj_t *self = MP_STATE_PORT(sercom_table[i2c_id]);
-    // Handle IRQ
+
     if (self != NULL) {
         Sercom *i2c = self->instance;
         // For now, clear all interrupts
@@ -114,7 +112,8 @@ void common_i2c_irq_handler(int i2c_id) {
         } 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;
+            i2c->I2CM.INTFLAG.reg = SERCOM_I2CM_INTFLAG_ERROR |
+                SERCOM_I2CM_INTFLAG_SB | SERCOM_I2CM_INTFLAG_MB;
         }
     }
 }
@@ -158,28 +157,19 @@ 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_i2c_type);
     self->id = id;
-    self->instance = sercom_instance[self->id];
+    self->instance = sercom_instance[id];
 
     // Set SCL/SDA pins.
-    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->sda = pin_config_for_i2c(args[ARG_sda].u_obj, id, 0);
+    self->scl = pin_config_for_i2c(args[ARG_scl].u_obj, id, 1);
+    MP_STATE_PORT(sercom_table[id]) = self;
 
-    sercom_pad_config_t scl_pad_config = get_sercom_config(self->scl, self->id);
-    sercom_pad_config_t 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 sda/scl pin"));
-    }
-    MP_STATE_PORT(sercom_table[self->id]) = self;
     self->freq = args[ARG_freq].u_int;
     // The unit for ARG_timeout is us, but the code uses ms.
     self->timeout = args[ARG_timeout].u_int / 1000;
 
-    // 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);
+    enable_sercom_clock(id);
 
     // Initialise the I2C peripheral
     Sercom *i2c = self->instance;
@@ -207,13 +197,13 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     i2c->I2CM.BAUD.reg = baud;
 
     // Enable interrupts
-    sercom_register_irq(self->id, &common_i2c_irq_handler);
+    sercom_register_irq(id, &common_i2c_irq_handler);
     #if defined(MCU_SAMD21)
-    NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
+    NVIC_EnableIRQ(SERCOM0_IRQn + 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); // ERROR interrupt
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * id); // MB interrupt
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * id + 1); // SB interrupt
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * id + 3); // ERROR interrupt
     #endif
 
     // Now enable I2C.
diff --git a/ports/samd/machine_i2c_target.c b/ports/samd/machine_i2c_target.c
new file mode 100644
index 0000000000000..054ca81dd1a34
--- /dev/null
+++ b/ports/samd/machine_i2c_target.c
@@ -0,0 +1,213 @@
+/*
+ * 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-2025 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 "samd_soc.h"
+#include "pin_af.h"
+#include "genhdr/pins.h"
+
+#define TRANSMIT          (1)
+#define RECEIVE           (0)
+#define NACK_RECVD        (i2c->I2CS.STATUS.bit.RXNACK == 1)
+#define IRQ_AMATCH        (i2c->I2CS.INTFLAG.bit.AMATCH == 1)
+#define IRQ_DRDY          (i2c->I2CS.INTFLAG.bit.DRDY == 1)
+#define IRQ_STOP          (i2c->I2CS.INTFLAG.bit.PREC == 1)
+
+#define PREPARE_ACK       i2c->I2CS.CTRLB.bit.ACKACT = 0
+#define PREPARE_NACK      i2c->I2CS.CTRLB.bit.ACKACT = 1
+
+typedef struct _machine_i2c_target_obj_t {
+    mp_obj_base_t base;
+    Sercom *instance;
+    uint8_t id;
+    uint8_t scl;
+    uint8_t sda;
+    uint8_t addr;
+    uint8_t direction;
+} machine_i2c_target_obj_t;
+
+void common_i2c_target_irq_handler(int i2c_id) {
+    // Handle Sercom I2C IRQ for target memory mode.
+    machine_i2c_target_obj_t *self = MP_STATE_PORT(sercom_table[i2c_id]);
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+
+    if (self != NULL) {
+        Sercom *i2c = self->instance;
+
+        if (IRQ_AMATCH) {
+            // Address match.
+            self->direction = i2c->I2CS.STATUS.bit.DIR;
+            machine_i2c_target_data_addr_match(data, self->direction);
+            // Send ACK
+            i2c->I2CS.CTRLB.bit.CMD = 3;
+
+        } else if (IRQ_DRDY) {
+            // Data to be handled, depending in the direction
+            if (self->direction == TRANSMIT) {
+                machine_i2c_target_data_read_request(self, data);
+            } else {
+                machine_i2c_target_data_write_request(self, data);
+            }
+            // ACK will be sent in mp_machine_i2c_target_read_bytes/mp_machine_i2c_target_write_bytes.
+        } else if (IRQ_STOP) {
+            // Stop detected. Just reset the data machine.
+            machine_i2c_target_data_stop(data);
+            i2c->I2CS.INTFLAG.reg |= SERCOM_I2CS_INTFLAG_PREC;
+
+        } else { // On any error clear the interrupts and reset the data state.
+            machine_i2c_target_data_stop(data);
+            i2c->I2CS.INTFLAG.reg = SERCOM_I2CS_INTFLAG_ERROR | SERCOM_I2CS_INTFLAG_AMATCH |
+                SERCOM_I2CS_INTFLAG_DRDY | SERCOM_I2CS_INTFLAG_PREC;
+        }
+    }
+}
+
+/******************************************************************************/
+// I2CTarget port implementation
+
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return self->id;
+}
+
+static void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
+    mp_irq_handler(&irq->base);
+}
+
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
+    Sercom *i2c = self->instance;
+    buf[0] = i2c->I2CS.DATA.reg;
+    i2c->I2CS.CTRLB.bit.CMD = 3; // send ACK
+    return 1;
+}
+
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf) {
+    Sercom *i2c = self->instance;
+    i2c->I2CS.DATA.reg = buf[0];
+    i2c->I2CS.CTRLB.bit.CMD = 3; // send ACK
+    return 1;
+}
+
+static inline void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger) {
+    (void)self;
+    (void)trigger;
+}
+
+mp_obj_t mp_machine_i2c_target_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_addr, ARG_addrsize, ARG_mem, ARG_mem_addrsize, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        #if MICROPY_HW_DEFAULT_I2C_ID < 0
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
+        #else
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = MICROPY_HW_DEFAULT_I2C_ID} },
+        #endif
+        { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
+        { MP_QSTR_mem, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+        #if defined(pin_SCL) && defined(pin_SDA)
+        { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = pin_SCL} },
+        { MP_QSTR_sda, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = pin_SDA} },
+        #else
+        { 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} },
+        #endif
+    };
+
+    // 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 = args[ARG_id].u_int;
+    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_target_obj_t *self = mp_obj_malloc_with_finaliser(machine_i2c_target_obj_t, &machine_i2c_target_type);
+    self->id = id;
+    self->instance = sercom_instance[id];
+
+    // Set SCL/SDA pins.
+    self->sda = pin_config_for_i2c(args[ARG_sda].u_obj, id, 0);
+    self->scl = pin_config_for_i2c(args[ARG_scl].u_obj, id, 1);
+
+    MP_STATE_PORT(sercom_table[id]) = self;
+
+    // Get the address and initialise data.
+    self->addr = args[ARG_addr].u_int;
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[id] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[id];
+    machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
+
+    // Set up the clocks
+    enable_sercom_clock(id);
+
+    // Initialise the I2C peripheral
+    Sercom *i2c = self->instance;
+    // Reset the device
+    i2c->I2CS.CTRLA.reg = SERCOM_I2CM_CTRLA_SWRST;
+    while (i2c->I2CS.SYNCBUSY.bit.SWRST == 1) {
+    }
+
+    // Set to slave mode, enable SCl timeout, set the address
+    i2c->I2CS.CTRLA.reg = SERCOM_I2CS_CTRLA_MODE(0x04)
+        | SERCOM_I2CS_CTRLA_SEXTTOEN | SERCOM_I2CS_CTRLA_LOWTOUTEN;
+    i2c->I2CS.ADDR.reg = self->addr << 1;
+
+    // Enable interrupts
+    sercom_register_irq(id, &common_i2c_target_irq_handler);
+    #if defined(MCU_SAMD21)
+    NVIC_EnableIRQ(SERCOM0_IRQn + id);
+    #elif defined(MCU_SAMD51)
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * id);
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * id + 1);
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * id + 2);
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * id + 3);
+    #endif
+    i2c->I2CS.INTENSET.reg = SERCOM_I2CS_INTENSET_DRDY | SERCOM_I2CS_INTENSET_AMATCH |
+        SERCOM_I2CS_INTENSET_PREC | SERCOM_I2CS_INTENSET_ERROR;
+
+    // Now enable I2C.
+    sercom_enable(i2c, 1);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2C(%u, scl=\"%q\", sda=\"%q\", addr=%u)",
+        self->id, pin_find_by_id(self->scl)->name, pin_find_by_id(self->sda)->name,
+        self->addr);
+}
+
+// Stop the Slave transfer and free the memory objects.
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self) {
+    // Disable I2C
+    sercom_enable(self->instance, 0);
+    MP_STATE_PORT(sercom_table[self->id]) = NULL;
+}
diff --git a/ports/samd/main.c b/ports/samd/main.c
index a7da95582f76c..475f57703d076 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -30,6 +30,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/stackctrl.h"
+#include "extmod/modmachine.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
@@ -101,7 +102,7 @@ void samd_main(void) {
         mp_usbd_deinit();
         #endif
         gc_sweep_all();
-        #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
+        #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_I2C_TARGET || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
         sercom_deinit_all();
         #endif
         mp_deinit();
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index f0a7a73e0c027..a29d5c0a04db4 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -78,6 +78,9 @@ unsigned long trng_random_u32(int delay);
 #ifndef MICROPY_PY_ONEWIRE
 #define MICROPY_PY_ONEWIRE              (SAMD21_EXTRA_FEATURES)
 #endif
+#ifndef MICROPY_PY_MACHINE_I2C_TARGET
+#define MICROPY_PY_MACHINE_I2C_TARGET   (SAMD21_EXTRA_FEATURES)
+#endif
 
 #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
 #define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 8cce90b886c07..a1ff208eb5939 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -16,6 +16,9 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
 #define MICROPY_PY_MACHINE_UART_IRQ     (1)
+#ifndef MICROPY_PY_MACHINE_I2C_TARGET
+#define MICROPY_PY_MACHINE_I2C_TARGET   (1)
+#endif
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (1)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 514f383948838..7b423bf0babff 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -127,6 +127,10 @@
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/samd/machine_wdt.c"
 #define MICROPY_PY_MACHINE_WDT_TIMEOUT_MS   (1)
 #define MICROPY_PLATFORM_VERSION            "ASF4"
+#define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE  "ports/samd/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX   (SERCOM_INST_NUM)
+#define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ (1)
+#define MICROPY_PY_MACHINE_I2C_TARGET_FINALISER (1)
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index 5d05b6d18d5c1..35cac27aa5700 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -161,3 +161,19 @@ pwm_config_t get_pwm_config(int pin_id, int wanted_dev, uint8_t device_status[])
 }
 
 #endif
+
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_I2C_TARGET
+
+// Configure a I2C pin. Used by machine_i2c.c and machine_i2c_target.c.
+uint8_t pin_config_for_i2c(mp_obj_t pin_obj, uint8_t id, uint8_t pad_nr) {
+    uint8_t pin = mp_hal_get_pin_obj(pin_obj);
+    sercom_pad_config_t pad_config = get_sercom_config(pin, id);
+    if (pad_config.pad_nr != pad_nr) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid sda/scl pin"));
+    }
+    // Configure the Pin mux.
+    mp_hal_set_pin_mux(pin, pad_config.alt_fct);
+    return pin;
+}
+
+#endif
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
index 83839a0503255..bc65e8ae23bf9 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -100,3 +100,5 @@ 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 *pin_find_by_id(int pin_id);
 const machine_pin_obj_t *pin_find(mp_obj_t pin);
+
+uint8_t pin_config_for_i2c(mp_obj_t pin_obj, uint8_t id, uint8_t pad_nr);
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index e78032513c216..fb6eb2083a304 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -122,7 +122,7 @@ void samd_init(void) {
     machine_rtc_start(false);
 }
 
-#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_I2C_TARGET || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
 
 Sercom *sercom_instance[] = SERCOM_INSTS;
 MP_REGISTER_ROOT_POINTER(void *sercom_table[SERCOM_INST_NUM]);

From ac5b1bce9986775e787a24f77f827c4ad50ffff5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Jul 2025 11:26:42 +1000
Subject: [PATCH 2638/3129] esp32/machine_i2c: Factor default pin macros to
 header file.

So the implementation of I2CTarget can use them.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_i2c.c | 21 +---------------
 ports/esp32/machine_i2c.h | 52 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 20 deletions(-)
 create mode 100644 ports/esp32/machine_i2c.h

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 4a5fd717631a9..a9e5f0d3b32cb 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -28,32 +28,13 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/modmachine.h"
+#include "machine_i2c.h"
 
 #include "driver/i2c.h"
 #include "hal/i2c_ll.h"
 
 #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 
-#ifndef MICROPY_HW_I2C0_SCL
-#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
-#define MICROPY_HW_I2C0_SCL (GPIO_NUM_9)
-#define MICROPY_HW_I2C0_SDA (GPIO_NUM_8)
-#else
-#define MICROPY_HW_I2C0_SCL (GPIO_NUM_18)
-#define MICROPY_HW_I2C0_SDA (GPIO_NUM_19)
-#endif
-#endif
-
-#ifndef MICROPY_HW_I2C1_SCL
-#if CONFIG_IDF_TARGET_ESP32
-#define MICROPY_HW_I2C1_SCL (GPIO_NUM_25)
-#define MICROPY_HW_I2C1_SDA (GPIO_NUM_26)
-#else
-#define MICROPY_HW_I2C1_SCL (GPIO_NUM_9)
-#define MICROPY_HW_I2C1_SDA (GPIO_NUM_8)
-#endif
-#endif
-
 #if SOC_I2C_SUPPORT_XTAL
 #if CONFIG_XTAL_FREQ > 0
 #define I2C_SCLK_FREQ (CONFIG_XTAL_FREQ * 1000000)
diff --git a/ports/esp32/machine_i2c.h b/ports/esp32/machine_i2c.h
new file mode 100644
index 0000000000000..299baa6dd6843
--- /dev/null
+++ b/ports/esp32/machine_i2c.h
@@ -0,0 +1,52 @@
+
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2025 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_MACHINE_I2C_H
+#define MICROPY_INCLUDED_ESP32_MACHINE_I2C_H
+
+// Configure default I2C0 pins.
+#ifndef MICROPY_HW_I2C0_SCL
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+#define MICROPY_HW_I2C0_SCL (GPIO_NUM_9)
+#define MICROPY_HW_I2C0_SDA (GPIO_NUM_8)
+#else
+#define MICROPY_HW_I2C0_SCL (GPIO_NUM_18)
+#define MICROPY_HW_I2C0_SDA (GPIO_NUM_19)
+#endif
+#endif
+
+// Configure default I2C1 pins.
+#ifndef MICROPY_HW_I2C1_SCL
+#if CONFIG_IDF_TARGET_ESP32
+#define MICROPY_HW_I2C1_SCL (GPIO_NUM_25)
+#define MICROPY_HW_I2C1_SDA (GPIO_NUM_26)
+#else
+#define MICROPY_HW_I2C1_SCL (GPIO_NUM_9)
+#define MICROPY_HW_I2C1_SDA (GPIO_NUM_8)
+#endif
+#endif
+
+#endif // MICROPY_INCLUDED_ESP32_MACHINE_I2C_H

From 7bc83afee2115d1a470bc2e901d998b63cef7b25 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Jul 2025 15:20:19 +1000
Subject: [PATCH 2639/3129] esp32/machine_i2c_target: Implement I2CTarget
 class.

Only soft IRQs are supported.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.base |   4 +
 ports/esp32/machine_i2c_target.c  | 225 ++++++++++++++++++++++++++++++
 ports/esp32/main.c                |   5 +
 ports/esp32/mpconfigport.h        |   4 +
 4 files changed, 238 insertions(+)
 create mode 100644 ports/esp32/machine_i2c_target.c

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 69abc63bdf008..2f1835c9242d4 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -139,3 +139,7 @@ CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT=n
 # Further limit total sockets in TIME-WAIT when there are many short-lived
 # connections.
 CONFIG_LWIP_MAX_ACTIVE_TCP=12
+
+# Enable new I2C slave API, and disable conflict check.
+CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK=y
+CONFIG_I2C_ENABLE_SLAVE_DRIVER_VERSION_2=y
diff --git a/ports/esp32/machine_i2c_target.c b/ports/esp32/machine_i2c_target.c
new file mode 100644
index 0000000000000..84795e6f138f8
--- /dev/null
+++ b/ports/esp32/machine_i2c_target.c
@@ -0,0 +1,225 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 is never compiled standalone, it's included directly from
+// extmod/machine_i2c_target.c via MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE.
+
+#include "machine_i2c.h"
+#include "driver/i2c_slave.h"
+
+// These headers are needed to call i2c_ll_txfifo_rst().
+#include "hal/i2c_ll.h"
+#include "../i2c_private.h"
+
+typedef struct _machine_i2c_target_obj_t {
+    mp_obj_base_t base;
+    i2c_slave_dev_handle_t handle;
+    i2c_slave_config_t config;
+    uint8_t state;
+    bool stop_pending;
+    bool irq_active;
+    int index;
+    const i2c_slave_rx_done_event_data_t *rx_done_event_data;
+} machine_i2c_target_obj_t;
+
+static machine_i2c_target_obj_t machine_i2c_target_obj[I2C_NUM_MAX];
+
+/******************************************************************************/
+// ESP-IDF hardware bindings
+
+// Called when the controller is about to read from the TX/send buffer.
+static bool i2c_slave_request_cb(i2c_slave_dev_handle_t i2c_slave, const i2c_slave_request_event_data_t *evt_data, void *arg) {
+    machine_i2c_target_obj_t *self = arg;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[self->config.i2c_port];
+
+    // Flush hardware TX FIFO to get rid of any data from a previous read.
+    i2c_ll_txfifo_rst(self->handle->base->hal.dev);
+
+    // Perform an entire read transaction, including start, read and stop events.
+    // We don't know how much data the controller will read, so write the entire
+    // memory buffer to the TX FIFO.
+    machine_i2c_target_data_addr_match(data, true);
+    for (uint32_t i = 0; i < data->mem_len; ++i) {
+        machine_i2c_target_data_read_request(self, data);
+    }
+    machine_i2c_target_data_restart_or_stop(data);
+
+    // A higher priority task was not woken up.
+    return false;
+}
+
+// Called when the controller has written into the RX/receive buffer.
+static bool i2c_slave_receive_cb(i2c_slave_dev_handle_t i2c_slave, const i2c_slave_rx_done_event_data_t *evt_data, void *arg) {
+    machine_i2c_target_obj_t *self = arg;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[self->config.i2c_port];
+
+    // Perform an entire write transaction, including start, read and stop events.
+    machine_i2c_target_data_addr_match(data, false);
+    self->index = 0;
+    self->rx_done_event_data = evt_data;
+    while (self->index < self->rx_done_event_data->length) {
+        machine_i2c_target_data_write_request(self, data);
+    }
+    machine_i2c_target_data_restart_or_stop(data);
+
+    // A higher priority task was not woken up.
+    return false;
+}
+
+static void i2c_target_init(machine_i2c_target_obj_t *self, machine_i2c_target_data_t *data, uint32_t addr, uint32_t addrsize, bool first_init) {
+    if (!first_init && self->handle != NULL) {
+        i2c_del_slave_device(self->handle);
+        self->handle = NULL;
+    }
+
+    self->config.clk_source = I2C_CLK_SRC_DEFAULT;
+    self->config.slave_addr = addr;
+    self->config.send_buf_depth = data->mem_len;
+    self->config.receive_buf_depth = data->mem_len;
+    if (addrsize == 7) {
+        self->config.addr_bit_len = I2C_ADDR_BIT_LEN_7;
+    } else {
+        #if SOC_I2C_SUPPORT_10BIT_ADDR
+        self->config.addr_bit_len = I2C_ADDR_BIT_LEN_10;
+        #else
+        mp_raise_ValueError(MP_ERROR_TEXT("10-bit address unsupported"));
+        #endif
+    }
+    self->config.intr_priority = 0; // 0 selects the default
+    self->config.flags.allow_pd = 0;
+    self->config.flags.enable_internal_pullup = 1;
+
+    ESP_ERROR_CHECK(i2c_new_slave_device(&self->config, &self->handle));
+    i2c_slave_event_callbacks_t cbs = {
+        .on_receive = i2c_slave_receive_cb,
+        .on_request = i2c_slave_request_cb,
+    };
+    ESP_ERROR_CHECK(i2c_slave_register_event_callbacks(self->handle, &cbs, self));
+}
+
+/******************************************************************************/
+// I2CTarget port implementation
+
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return self->config.i2c_port;
+}
+
+static void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
+    mp_irq_handler(&irq->base);
+}
+
+static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
+    size_t i = 0;
+    while (i < len && self->index < self->rx_done_event_data->length) {
+        buf[i++] = self->rx_done_event_data->buffer[self->index++];
+    }
+    return i;
+}
+
+static size_t mp_machine_i2c_target_write_bytes(machine_i2c_target_obj_t *self, size_t len, const uint8_t *buf) {
+    uint32_t write_len;
+    i2c_slave_write(self->handle, buf, len, &write_len, 1000);
+    return write_len;
+}
+
+static void mp_machine_i2c_target_irq_config(machine_i2c_target_obj_t *self, unsigned int trigger) {
+}
+
+static mp_obj_t mp_machine_i2c_target_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_addr, ARG_addrsize, ARG_mem, ARG_mem_addrsize, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
+        { MP_QSTR_mem, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
+        { 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);
+
+    int i2c_id = args[ARG_id].u_int;
+
+    // Check if the I2C bus is valid
+    if (i2c_id < 0 || i2c_id >= MP_ARRAY_SIZE(machine_i2c_target_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2CTarget(%d) doesn't exist"), i2c_id);
+    }
+
+    // Get static peripheral object.
+    machine_i2c_target_obj_t *self = &machine_i2c_target_obj[i2c_id];
+
+    bool first_init = false;
+    if (self->base.type == NULL) {
+        // Created for the first time, set default pins
+        self->base.type = &machine_i2c_target_type;
+        self->config.i2c_port = i2c_id;
+        if (self->config.i2c_port == 0) {
+            self->config.scl_io_num = MICROPY_HW_I2C0_SCL;
+            self->config.sda_io_num = MICROPY_HW_I2C0_SDA;
+        } else {
+            self->config.scl_io_num = MICROPY_HW_I2C1_SCL;
+            self->config.sda_io_num = MICROPY_HW_I2C1_SDA;
+        }
+        first_init = true;
+    }
+
+    // Initialise data.
+    self->state = STATE_IDLE;
+    self->stop_pending = false;
+    self->irq_active = false;
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[i2c_id] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id];
+    machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
+
+    // Set SCL/SDA pins if configured.
+    if (args[ARG_scl].u_obj != mp_const_none) {
+        self->config.scl_io_num = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
+    }
+    if (args[ARG_sda].u_obj != mp_const_none) {
+        self->config.sda_io_num = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
+    }
+
+    // Initialise the I2C target.
+    i2c_target_init(self, data, args[ARG_addr].u_int, args[ARG_addrsize].u_int, first_init);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2CTarget(%u, addr=%u, scl=%u, sda=%u)",
+        self->config.i2c_port, self->config.slave_addr, self->config.scl_io_num, self->config.sda_io_num);
+}
+
+static void mp_machine_i2c_target_deinit(machine_i2c_target_obj_t *self) {
+    if (self->handle != NULL) {
+        i2c_del_slave_device(self->handle);
+        self->handle = NULL;
+    }
+}
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index f048aa85f5f7f..f85fb6c084f90 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -51,6 +51,7 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mphal.h"
+#include "extmod/modmachine.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/timeutils/timeutils.h"
@@ -199,7 +200,11 @@ void mp_task(void *pvParameter) {
     machine_pwm_deinit_all();
     // TODO: machine_rmt_deinit_all();
     machine_pins_deinit();
+    #if MICROPY_PY_MACHINE_I2C_TARGET
+    mp_machine_i2c_target_deinit_all();
+    #endif
     machine_deinit();
+
     #if MICROPY_PY_SOCKET_EVENTS
     socket_events_deinit();
     #endif
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 142c1b1be2eb6..1844018030b8b 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -138,6 +138,10 @@
 #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)
+// I2C target hardware is limited on ESP32 (eg read event comes after the read) so we only support newer SoCs.
+#define MICROPY_PY_MACHINE_I2C_TARGET       (SOC_I2C_SUPPORT_SLAVE && !CONFIG_IDF_TARGET_ESP32)
+#define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/esp32/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX   (2)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)

From 6558d519a22154795c0da4101bc7bbd1527ed176 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 May 2025 14:00:31 +1000
Subject: [PATCH 2640/3129] tests/extmod_hardware: Add self unittest for
 I2CTarget.

This test uses a SoftI2C controller wired to an I2CTarget on the one board,
and tests all functionality of the I2CTarget class.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod_hardware/machine_i2c_target.py | 307 ++++++++++++++++++++
 1 file changed, 307 insertions(+)
 create mode 100644 tests/extmod_hardware/machine_i2c_target.py

diff --git a/tests/extmod_hardware/machine_i2c_target.py b/tests/extmod_hardware/machine_i2c_target.py
new file mode 100644
index 0000000000000..763e6f4771e0f
--- /dev/null
+++ b/tests/extmod_hardware/machine_i2c_target.py
@@ -0,0 +1,307 @@
+# Test machine.I2CTarget.
+#
+# IMPORTANT: This test requires hardware connections: a SoftI2C instance must be
+# wired to a hardware I2C target.  See pin definitions below.
+
+import sys
+
+try:
+    from machine import Pin, SoftI2C, I2CTarget
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import unittest
+
+ADDR = 67
+
+kwargs_target = {}
+
+# Configure pins based on the target.
+if sys.platform == "alif" and sys.implementation._build == "ALIF_ENSEMBLE":
+    args_controller = {"scl": "P1_1", "sda": "P1_0"}
+    args_target = (0,)  # on pins P0_3/P0_2
+elif sys.platform == "esp32":
+    args_controller = {"scl": 5, "sda": 6}
+    args_target = (0,)  # on pins 9/8 for C3 and S3, 18/19 for others
+    kwargs_target = {"scl": 9, "sda": 8}
+elif sys.platform == "rp2":
+    args_controller = {"scl": 5, "sda": 4}
+    args_target = (1,)
+elif sys.platform == "pyboard":
+    if sys.implementation._build == "NUCLEO_WB55":
+        args_controller = {"scl": "B8", "sda": "B9"}
+        args_target = (3,)
+    else:
+        args_controller = {"scl": "X1", "sda": "X2"}
+        args_target = ("X",)
+elif "zephyr-nucleo_wb55rg" in sys.implementation._machine:
+    # PB8=I2C1_SCL, PB9=I2C1_SDA (on Arduino header D15/D14)
+    # PC0=I2C3_SCL, PC1=I2C3_SDA (on Arduino header A0/A1)
+    args_controller = {"scl": Pin(("gpiob", 8)), "sda": Pin(("gpiob", 9))}
+    args_target = ("i2c3",)
+elif "zephyr-rpi_pico" in sys.implementation._machine:
+    args_controller = {"scl": Pin(("gpio0", 5)), "sda": Pin(("gpio0", 4))}
+    args_target = ("i2c1",)  # on gpio7/gpio6
+elif sys.platform == "mimxrt":
+    if "Teensy" in sys.implementation._machine:
+        args_controller = {"scl": "A6", "sda": "A3"}  # D20/D17
+    else:
+        args_controller = {"scl": "D0", "sda": "D1"}
+    args_target = (0,)  # pins 19/18 On Teensy 4.x
+elif sys.platform == "samd":
+    args_controller = {"scl": "D5", "sda": "D1"}
+    args_target = ()
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def config_pull_up():
+    Pin(args_controller["scl"], Pin.OPEN_DRAIN, Pin.PULL_UP)
+    Pin(args_controller["sda"], Pin.OPEN_DRAIN, Pin.PULL_UP)
+
+
+class TestMemory(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.mem = bytearray(8)
+        cls.i2c = SoftI2C(**args_controller)
+        cls.i2c_target = I2CTarget(*args_target, **kwargs_target, addr=ADDR, mem=cls.mem)
+        config_pull_up()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.i2c_target.deinit()
+
+    def test_scan(self):
+        self.assertIn(ADDR, self.i2c.scan())
+
+    def test_write(self):
+        self.mem[:] = b"01234567"
+        self.i2c.writeto_mem(ADDR, 0, b"test")
+        self.assertEqual(self.mem, bytearray(b"test4567"))
+        self.i2c.writeto_mem(ADDR, 4, b"TEST")
+        self.assertEqual(self.mem, bytearray(b"testTEST"))
+
+    def test_write_wrap(self):
+        self.mem[:] = b"01234567"
+        self.i2c.writeto_mem(ADDR, 6, b"test")
+        self.assertEqual(self.mem, bytearray(b"st2345te"))
+
+    @unittest.skipIf(sys.platform == "esp32", "write lengths larger than buffer unsupported")
+    def test_write_wrap_large(self):
+        self.mem[:] = b"01234567"
+        self.i2c.writeto_mem(ADDR, 0, b"testTESTmore")
+        self.assertEqual(self.mem, bytearray(b"moreTEST"))
+
+    def test_read(self):
+        self.mem[:] = b"01234567"
+        self.assertEqual(self.i2c.readfrom_mem(ADDR, 0, 4), b"0123")
+        self.assertEqual(self.i2c.readfrom_mem(ADDR, 4, 4), b"4567")
+
+    def test_read_wrap(self):
+        self.mem[:] = b"01234567"
+        self.assertEqual(self.i2c.readfrom_mem(ADDR, 0, 4), b"0123")
+        self.assertEqual(self.i2c.readfrom_mem(ADDR, 2, 4), b"2345")
+        self.assertEqual(self.i2c.readfrom_mem(ADDR, 6, 4), b"6701")
+
+    @unittest.skipIf(sys.platform == "esp32", "read lengths larger than buffer unsupported")
+    def test_read_wrap_large(self):
+        self.mem[:] = b"01234567"
+        self.assertEqual(self.i2c.readfrom_mem(ADDR, 0, 12), b"012345670123")
+
+    def test_write_read(self):
+        self.mem[:] = b"01234567"
+        self.assertEqual(self.i2c.writeto(ADDR, b"\x02"), 1)
+        self.assertEqual(self.i2c.readfrom(ADDR, 4), b"2345")
+
+    @unittest.skipIf(sys.platform == "esp32", "read after read unsupported")
+    def test_write_read_read(self):
+        self.mem[:] = b"01234567"
+        self.assertEqual(self.i2c.writeto(ADDR, b"\x02"), 1)
+        self.assertEqual(self.i2c.readfrom(ADDR, 4), b"2345")
+        self.assertEqual(self.i2c.readfrom(ADDR, 4), b"7012")
+
+
+@unittest.skipUnless(hasattr(I2CTarget, "IRQ_END_READ"), "IRQ unsupported")
+class TestMemoryIRQ(unittest.TestCase):
+    @staticmethod
+    def irq_handler(i2c_target):
+        flags = i2c_target.irq().flags()
+        TestMemoryIRQ.events[TestMemoryIRQ.num_events] = flags
+        TestMemoryIRQ.events[TestMemoryIRQ.num_events + 1] = i2c_target.memaddr
+        TestMemoryIRQ.num_events += 2
+
+    @classmethod
+    def setUpClass(cls):
+        cls.mem = bytearray(8)
+        cls.events = [0] * 8
+        cls.num_events = 0
+        cls.i2c = SoftI2C(**args_controller)
+        cls.i2c_target = I2CTarget(*args_target, **kwargs_target, addr=ADDR, mem=cls.mem)
+        cls.i2c_target.irq(TestMemoryIRQ.irq_handler)
+        config_pull_up()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.i2c_target.deinit()
+
+    @unittest.skipIf(sys.platform == "esp32", "scan doesn't trigger IRQ_END_WRITE")
+    def test_scan(self):
+        TestMemoryIRQ.num_events = 0
+        self.i2c.scan()
+        self.assertEqual(self.events[: self.num_events], [I2CTarget.IRQ_END_WRITE, 0])
+
+    def test_write(self):
+        TestMemoryIRQ.num_events = 0
+        self.mem[:] = b"01234567"
+        self.i2c.writeto_mem(ADDR, 2, b"test")
+        self.assertEqual(self.mem, bytearray(b"01test67"))
+        self.assertEqual(self.events[: self.num_events], [I2CTarget.IRQ_END_WRITE, 2])
+
+    def test_read(self):
+        TestMemoryIRQ.num_events = 0
+        self.mem[:] = b"01234567"
+        self.assertEqual(self.i2c.readfrom_mem(ADDR, 2, 4), b"2345")
+        self.assertEqual(self.events[: self.num_events], [I2CTarget.IRQ_END_READ, 2])
+
+
+@unittest.skipUnless(hasattr(I2CTarget, "IRQ_WRITE_REQ"), "IRQ unsupported")
+@unittest.skipIf(sys.platform == "mimxrt", "not working")
+@unittest.skipIf(sys.platform == "pyboard", "can't queue more than one byte")
+@unittest.skipIf(sys.platform == "samd", "not working")
+@unittest.skipIf(sys.platform == "zephyr", "must call readinto/write in IRQ handler")
+class TestPolling(unittest.TestCase):
+    @staticmethod
+    def irq_handler(i2c_target, buf=bytearray(1)):
+        flags = i2c_target.irq().flags()
+        if flags & I2CTarget.IRQ_READ_REQ:
+            i2c_target.write(b"0123")
+
+    @classmethod
+    def setUpClass(cls):
+        cls.i2c = SoftI2C(**args_controller)
+        cls.i2c_target = I2CTarget(*args_target, addr=ADDR)
+        cls.i2c_target.irq(
+            TestPolling.irq_handler,
+            I2CTarget.IRQ_WRITE_REQ | I2CTarget.IRQ_READ_REQ,
+            hard=True,
+        )
+        config_pull_up()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.i2c_target.deinit()
+
+    def test_read(self):
+        # Can't write data up front, must wait until IRQ_READ_REQ.
+        # self.assertEqual(self.i2c_target.write(b"abcd"), 4)
+        self.assertEqual(self.i2c.readfrom(ADDR, 4), b"0123")
+
+    def test_write(self):
+        # Can do the read outside the IRQ, but requires IRQ_WRITE_REQ trigger to be set.
+        self.assertEqual(self.i2c.writeto(ADDR, b"0123"), 4)
+        buf = bytearray(8)
+        self.assertEqual(self.i2c_target.readinto(buf), 4)
+        self.assertEqual(buf, b"0123\x00\x00\x00\x00")
+
+
+@unittest.skipUnless(hasattr(I2CTarget, "IRQ_ADDR_MATCH_READ"), "IRQ unsupported")
+class TestIRQ(unittest.TestCase):
+    @staticmethod
+    def irq_handler(i2c_target, buf=bytearray(1)):
+        flags = i2c_target.irq().flags()
+        TestIRQ.events[TestIRQ.num_events] = flags
+        TestIRQ.num_events += 1
+        if flags & I2CTarget.IRQ_READ_REQ:
+            i2c_target.write(b"Y")
+        if flags & I2CTarget.IRQ_WRITE_REQ:
+            i2c_target.readinto(buf)
+            TestIRQ.events[TestIRQ.num_events] = buf[0]
+            TestIRQ.num_events += 1
+
+    @classmethod
+    def setUpClass(cls):
+        cls.events = [0] * 8
+        cls.num_events = 0
+        cls.i2c = SoftI2C(**args_controller)
+        cls.i2c_target = I2CTarget(*args_target, addr=ADDR)
+        cls.i2c_target.irq(
+            TestIRQ.irq_handler,
+            I2CTarget.IRQ_ADDR_MATCH_READ
+            | I2CTarget.IRQ_ADDR_MATCH_WRITE
+            | I2CTarget.IRQ_WRITE_REQ
+            | I2CTarget.IRQ_READ_REQ
+            | I2CTarget.IRQ_END_READ
+            | I2CTarget.IRQ_END_WRITE,
+            hard=True,
+        )
+        config_pull_up()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.i2c_target.deinit()
+
+    def test_scan(self):
+        TestIRQ.num_events = 0
+        self.i2c.scan()
+        self.assertEqual(
+            self.events[: self.num_events],
+            [
+                I2CTarget.IRQ_ADDR_MATCH_WRITE,
+                I2CTarget.IRQ_END_WRITE,
+            ],
+        )
+
+    def test_write(self):
+        TestIRQ.num_events = 0
+        self.i2c.writeto(ADDR, b"XYZ")
+        self.assertEqual(
+            self.events[: self.num_events],
+            [
+                I2CTarget.IRQ_ADDR_MATCH_WRITE,
+                I2CTarget.IRQ_WRITE_REQ,
+                ord(b"X"),
+                I2CTarget.IRQ_WRITE_REQ,
+                ord(b"Y"),
+                I2CTarget.IRQ_WRITE_REQ,
+                ord(b"Z"),
+                I2CTarget.IRQ_END_WRITE,
+            ],
+        )
+
+    def test_read(self):
+        TestIRQ.num_events = 0
+        self.assertEqual(self.i2c.readfrom(ADDR, 1), b"Y")
+        self.assertEqual(
+            self.events[: self.num_events],
+            [
+                I2CTarget.IRQ_ADDR_MATCH_READ,
+                I2CTarget.IRQ_READ_REQ,
+                I2CTarget.IRQ_READ_REQ,
+                I2CTarget.IRQ_END_READ,
+            ],
+        )
+
+    def test_write_read(self):
+        TestIRQ.num_events = 0
+        self.i2c.writeto(ADDR, b"X", False)
+        self.assertEqual(self.i2c.readfrom(ADDR, 1), b"Y")
+        self.assertEqual(
+            self.events[: self.num_events],
+            [
+                I2CTarget.IRQ_ADDR_MATCH_WRITE,
+                I2CTarget.IRQ_WRITE_REQ,
+                ord(b"X"),
+                I2CTarget.IRQ_END_WRITE,
+                I2CTarget.IRQ_ADDR_MATCH_READ,
+                I2CTarget.IRQ_READ_REQ,
+                I2CTarget.IRQ_READ_REQ,
+                I2CTarget.IRQ_END_READ,
+            ],
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

From 277b615f261e3ab9c9c19d8b6d2afb6c5f9a5612 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Jul 2025 18:21:06 +1000
Subject: [PATCH 2641/3129] tests/multi_extmod: Add I2CTarget multi tests.

These require two boards wired together, SCL-SCL and SDA-SDA.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_extmod/machine_i2c_target_irq.py  | 137 ++++++++++++++++++
 .../machine_i2c_target_irq.py.exp             |  15 ++
 .../multi_extmod/machine_i2c_target_memory.py |  79 ++++++++++
 .../machine_i2c_target_memory.py.exp          |  16 ++
 4 files changed, 247 insertions(+)
 create mode 100644 tests/multi_extmod/machine_i2c_target_irq.py
 create mode 100644 tests/multi_extmod/machine_i2c_target_irq.py.exp
 create mode 100644 tests/multi_extmod/machine_i2c_target_memory.py
 create mode 100644 tests/multi_extmod/machine_i2c_target_memory.py.exp

diff --git a/tests/multi_extmod/machine_i2c_target_irq.py b/tests/multi_extmod/machine_i2c_target_irq.py
new file mode 100644
index 0000000000000..eafd9dfdca838
--- /dev/null
+++ b/tests/multi_extmod/machine_i2c_target_irq.py
@@ -0,0 +1,137 @@
+# Test I2CTarget IRQs and clock stretching.
+#
+# Requires two instances with their SCL and SDA lines connected together.
+# Any combination of the below supported boards can be used.
+#
+# Notes:
+# - pull-up resistors may be needed
+# - alif use 1.8V signalling
+
+import sys
+import time
+from machine import I2C, I2CTarget
+
+if not hasattr(I2CTarget, "IRQ_ADDR_MATCH_READ"):
+    print("SKIP")
+    raise SystemExit
+
+ADDR = 67
+clock_stretch_us = 200
+
+# Configure pins based on the target.
+if sys.platform == "alif":
+    i2c_args = (1,)  # pins P3_7/P3_6
+    i2c_kwargs = {}
+elif sys.platform == "mimxrt":
+    i2c_args = (0,)  # pins 19/18 on Teensy 4.x
+    i2c_kwargs = {}
+    clock_stretch_us = 50  # mimxrt cannot delay too long in the IRQ handler
+elif sys.platform == "rp2":
+    i2c_args = (0,)
+    i2c_kwargs = {"scl": 9, "sda": 8}
+elif sys.platform == "pyboard":
+    i2c_args = ("Y",)
+    i2c_kwargs = {}
+elif sys.platform == "samd":
+    i2c_args = ()  # pins SCL/SDA
+    i2c_kwargs = {}
+elif "zephyr-rpi_pico" in sys.implementation._machine:
+    i2c_args = ("i2c1",)  # on gpio7/gpio6
+    i2c_kwargs = {}
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def simple_irq(i2c_target):
+    flags = i2c_target.irq().flags()
+    if flags & I2CTarget.IRQ_ADDR_MATCH_READ:
+        print("IRQ_ADDR_MATCH_READ")
+    if flags & I2CTarget.IRQ_ADDR_MATCH_WRITE:
+        print("IRQ_ADDR_MATCH_WRITE")
+
+    # Force clock stretching.
+    time.sleep_us(clock_stretch_us)
+
+
+class I2CTargetMemory:
+    def __init__(self, i2c_target, mem):
+        self.buf1 = bytearray(1)
+        self.mem = mem
+        self.memaddr = 0
+        self.state = 0
+        i2c_target.irq(
+            self.irq,
+            I2CTarget.IRQ_ADDR_MATCH_WRITE | I2CTarget.IRQ_READ_REQ | I2CTarget.IRQ_WRITE_REQ,
+            hard=True,
+        )
+
+    def irq(self, i2c_target):
+        # Force clock stretching.
+        time.sleep_us(clock_stretch_us)
+
+        flags = i2c_target.irq().flags()
+        if flags & I2CTarget.IRQ_ADDR_MATCH_WRITE:
+            self.state = 0
+        if flags & I2CTarget.IRQ_READ_REQ:
+            self.buf1[0] = self.mem[self.memaddr]
+            self.memaddr += 1
+            i2c_target.write(self.buf1)
+        if flags & I2CTarget.IRQ_WRITE_REQ:
+            i2c_target.readinto(self.buf1)
+            if self.state == 0:
+                self.state = 1
+                self.memaddr = self.buf1[0]
+            else:
+                self.mem[self.memaddr] = self.buf1[0]
+                self.memaddr += 1
+        self.memaddr %= len(self.mem)
+
+        # Force clock stretching.
+        time.sleep_us(clock_stretch_us)
+
+
+# I2C controller
+def instance0():
+    i2c = I2C(*i2c_args, **i2c_kwargs)
+    multitest.next()
+    for iteration in range(2):
+        print("controller iteration", iteration)
+        multitest.wait("target stage 1")
+        i2c.writeto_mem(ADDR, 2, "0123")
+        multitest.broadcast("controller stage 2")
+        multitest.wait("target stage 3")
+        print(i2c.readfrom_mem(ADDR, 2, 4))
+        multitest.broadcast("controller stage 4")
+    print("done")
+
+
+# I2C target
+def instance1():
+    multitest.next()
+
+    for iteration in range(2):
+        print("target iteration", iteration)
+        buf = bytearray(b"--------")
+        if iteration == 0:
+            # Use built-in memory capability of I2CTarget.
+            i2c_target = I2CTarget(*i2c_args, **i2c_kwargs, addr=ADDR, mem=buf)
+            i2c_target.irq(
+                simple_irq,
+                I2CTarget.IRQ_ADDR_MATCH_READ | I2CTarget.IRQ_ADDR_MATCH_WRITE,
+                hard=True,
+            )
+        else:
+            # Implement a memory device by hand.
+            i2c_target = I2CTarget(*i2c_args, **i2c_kwargs, addr=ADDR)
+            I2CTargetMemory(i2c_target, buf)
+
+        multitest.broadcast("target stage 1")
+        multitest.wait("controller stage 2")
+        print(buf)
+        multitest.broadcast("target stage 3")
+        multitest.wait("controller stage 4")
+
+        i2c_target.deinit()
+
+    print("done")
diff --git a/tests/multi_extmod/machine_i2c_target_irq.py.exp b/tests/multi_extmod/machine_i2c_target_irq.py.exp
new file mode 100644
index 0000000000000..a17c8f43858b3
--- /dev/null
+++ b/tests/multi_extmod/machine_i2c_target_irq.py.exp
@@ -0,0 +1,15 @@
+--- instance0 ---
+controller iteration 0
+b'0123'
+controller iteration 1
+b'0123'
+done
+--- instance1 ---
+target iteration 0
+IRQ_ADDR_MATCH_WRITE
+bytearray(b'--0123--')
+IRQ_ADDR_MATCH_WRITE
+IRQ_ADDR_MATCH_READ
+target iteration 1
+bytearray(b'--0123--')
+done
diff --git a/tests/multi_extmod/machine_i2c_target_memory.py b/tests/multi_extmod/machine_i2c_target_memory.py
new file mode 100644
index 0000000000000..6b3f0d03eb7fe
--- /dev/null
+++ b/tests/multi_extmod/machine_i2c_target_memory.py
@@ -0,0 +1,79 @@
+# Test basic use of I2CTarget and a memory buffer.
+#
+# Requires two instances with their SCL and SDA lines connected together.
+# Any combination of the below supported boards can be used.
+#
+# Notes:
+# - pull-up resistors may be needed
+# - alif use 1.8V signalling
+
+import sys
+from machine import I2C, I2CTarget
+
+ADDR = 67
+
+# Configure pins based on the target.
+if sys.platform == "alif":
+    i2c_args = (1,)  # pins P3_7/P3_6
+    i2c_kwargs = {}
+elif sys.platform == "esp32":
+    i2c_args = (1,)  # on pins 9/8
+    i2c_kwargs = {}
+elif sys.platform == "mimxrt":
+    i2c_args = (0,)  # pins 19/18 on Teensy 4.x
+    i2c_kwargs = {}
+elif sys.platform == "rp2":
+    i2c_args = (0,)
+    i2c_kwargs = {"scl": 9, "sda": 8}
+elif sys.platform == "pyboard":
+    i2c_args = ("Y",)
+    i2c_kwargs = {}
+elif sys.platform == "samd":
+    i2c_args = ()  # pins SCL/SDA
+    i2c_kwargs = {}
+elif "zephyr-rpi_pico" in sys.implementation._machine:
+    i2c_args = ("i2c1",)  # on gpio7/gpio6
+    i2c_kwargs = {}
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+
+def simple_irq(i2c_target):
+    flags = i2c_target.irq().flags()
+    if flags & I2CTarget.IRQ_END_READ:
+        print("IRQ_END_READ", i2c_target.memaddr)
+    if flags & I2CTarget.IRQ_END_WRITE:
+        print("IRQ_END_WRITE", i2c_target.memaddr)
+
+
+# I2C controller
+def instance0():
+    i2c = I2C(*i2c_args, **i2c_kwargs)
+    multitest.next()
+    for iteration in range(2):
+        print("controller iteration", iteration)
+        multitest.wait("target stage 1")
+        i2c.writeto_mem(ADDR, 2 + iteration, "0123")
+        multitest.broadcast("controller stage 2")
+        multitest.wait("target stage 3")
+        print(i2c.readfrom_mem(ADDR, 2 + iteration, 4))
+        multitest.broadcast("controller stage 4")
+    print("done")
+
+
+# I2C target
+def instance1():
+    buf = bytearray(b"--------")
+    i2c_target = I2CTarget(*i2c_args, **i2c_kwargs, addr=ADDR, mem=buf)
+    i2c_target.irq(simple_irq)
+    multitest.next()
+    for iteration in range(2):
+        print("target iteration", iteration)
+        multitest.broadcast("target stage 1")
+        multitest.wait("controller stage 2")
+        print(buf)
+        multitest.broadcast("target stage 3")
+        multitest.wait("controller stage 4")
+    i2c_target.deinit()
+    print("done")
diff --git a/tests/multi_extmod/machine_i2c_target_memory.py.exp b/tests/multi_extmod/machine_i2c_target_memory.py.exp
new file mode 100644
index 0000000000000..71386cfe769d9
--- /dev/null
+++ b/tests/multi_extmod/machine_i2c_target_memory.py.exp
@@ -0,0 +1,16 @@
+--- instance0 ---
+controller iteration 0
+b'0123'
+controller iteration 1
+b'0123'
+done
+--- instance1 ---
+target iteration 0
+IRQ_END_WRITE 2
+bytearray(b'--0123--')
+IRQ_END_READ 2
+target iteration 1
+IRQ_END_WRITE 3
+bytearray(b'--00123-')
+IRQ_END_READ 3
+done

From bf6f229cf3feb6767d37b9df9dcf1e2d9abc49bd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 May 2025 15:55:46 +1000
Subject: [PATCH 2642/3129] docs/library: Document the new machine.I2CTarget
 class.

With some working examples that show how to use all the features.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.I2CTarget.rst | 174 +++++++++++++++++++++++++++++
 docs/library/machine.rst           |   1 +
 2 files changed, 175 insertions(+)
 create mode 100644 docs/library/machine.I2CTarget.rst

diff --git a/docs/library/machine.I2CTarget.rst b/docs/library/machine.I2CTarget.rst
new file mode 100644
index 0000000000000..0e4af84cb687c
--- /dev/null
+++ b/docs/library/machine.I2CTarget.rst
@@ -0,0 +1,174 @@
+.. currentmodule:: machine
+.. _machine.I2CTarget:
+
+class I2CTarget -- an I2C target device
+=======================================
+
+An I2C target is a device which connects to an I2C bus and is controlled by an
+I2C controller.  I2C targets can take many forms.  The :class:`machine.I2CTarget`
+class implements an I2C target that can be configured as a memory/register device,
+or as an arbitrary I2C device by using callbacks (if supported by the port).
+
+Example usage for the case of a memory device::
+
+    from machine import I2CTarget
+
+    # Create the backing memory for the I2C target.
+    mem = bytearray(8)
+
+    # Create an I2C target.  Depending on the port, extra parameters
+    # may be required to select the peripheral and/or pins to use.
+    i2c = I2CTarget(addr=67, mem=mem)
+
+    # At this point an I2C controller can read and write `mem`.
+    ...
+
+    # Deinitialise the I2C target.
+    i2c.deinit()
+
+Note that some ports require an ``id``, and maybe ``scl`` and ``sda`` pins, to be
+passed to the `I2CTarget` constructor, to select the hardware I2C instance and
+pins that it connects to.
+
+When configured as a memory device, it's also possible to register to receive events.
+For example to be notified when the memory is read/written::
+
+    from machine import I2CTarget
+
+    # Define an IRQ handler, for I2C events.
+    def irq_handler(i2c_target):
+        flags = i2c_target.irq().flags()
+        if flags & I2CTarget.IRQ_END_READ:
+            print("controller read target at addr", i2c_target.memaddr)
+        if flags & I2CTarget.IRQ_END_WRITE:
+            print("controller wrote target at addr", i2c_target.memaddr)
+
+    # Create the I2C target and register to receive default events.
+    mem = bytearray(8)
+    i2c = I2CTarget(addr=67, mem=mem)
+    i2c.irq(irq_handler)
+
+More complicated I2C devices can be implemented using the full set of events.  For
+example, to see the raw events as they are triggered::
+
+    from machine import I2CTarget
+
+    # Define an IRQ handler that prints the event id and responds to reads/writes.
+    def irq_handler(i2c_target, buf=bytearray(1)):
+        flags = i2c_target.irq().flags()
+        print(flags)
+        if flags & I2CTarget.IRQ_READ_REQ:
+            i2c_target.write(buf)
+        if flags & I2CTarget.IRQ_WRITE_REQ:
+            i2c_target.readinto(buf)
+
+    # Create the I2C target and register to receive all events.
+    i2c = I2CTarget(addr=67)
+    all_triggers = (
+        I2CTarget.IRQ_ADDR_MATCH_READ
+        | I2CTarget.IRQ_ADDR_MATCH_WRITE
+        | I2CTarget.IRQ_READ_REQ
+        | I2CTarget.IRQ_WRITE_REQ
+        | I2CTarget.IRQ_END_READ
+        | I2CTarget.IRQ_END_WRITE
+    )
+    i2c.irq(irq_handler, trigger=all_triggers, hard=True)
+
+Constructors
+------------
+
+.. class:: I2CTarget(id, addr, *, addrsize=7, mem=None, mem_addrsize=8, scl=None, sda=None)
+
+   Construct and return a new I2CTarget object using the following parameters:
+
+      - *id* identifies a particular I2C peripheral.  Allowed values depend on the
+        particular port/board.  Some ports have a default in which case this parameter
+        can be omitted.
+      - *addr* is the I2C address of the target.
+      - *addrsize* is the number of bits in the I2C target address.  Valid values
+        are 7 and 10.
+      - *mem* is an object with the buffer protocol that is writable.  If not
+        specified then there is no backing memory and data must be read/written
+        using the :meth:`I2CTarget.readinto` and :meth:`I2CTarget.write` methods.
+      - *mem_addrsize* is the number of bits in the memory address.  Valid values
+        are 0, 8, 16, 24 and 32.
+      - *scl* is a pin object specifying the pin to use for SCL.
+      - *sda* is a pin object specifying the pin to use for SDA.
+
+   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.
+
+General Methods
+---------------
+
+.. method:: I2CTarget.deinit()
+
+   Deinitialise the I2C target.  After this method is called the hardware will no
+   longer respond to requests on the I2C bus, and no other methods can be called.
+
+.. method:: I2CTarget.readinto(buf)
+
+   Read into the given buffer any pending bytes written by the I2C controller.
+   Returns the number of bytes read.
+
+.. method:: I2CTarget.write(buf)
+
+   Write out the bytes from the given buffer, to be passed to the I2C controller
+   after it sends a read request.  Returns the number of bytes written.  Most ports
+   only accept one byte at a time to this method.
+
+.. method:: I2CTarget.irq(handler=None, trigger=IRQ_END_READ|IRQ_END_WRITE, hard=False)
+
+   Configure an IRQ *handler* to be called when an event occurs.  The possible events are
+   given by the following constants, which can be or'd together and passed to the *trigger*
+   argument:
+
+      - ``IRQ_ADDR_MATCH_READ`` indicates that the target was addressed by a
+        controller for a read transaction.
+      - ``IRQ_ADDR_MATCH_READ`` indicates that the target was addressed by a
+        controller for a write transaction.
+      - ``IRQ_READ_REQ`` indicates that the controller is requesting data, and this
+        request must be satisfied by calling `I2CTarget.write` with the data to be
+        passed back to the controller.
+      - ``IRQ_WRITE_REQ`` indicates that the controller has written data, and the
+        data must be read by calling `I2CTarget.readinto`.
+      - ``IRQ_END_READ`` indicates that the controller has finished a read transaction.
+      - ``IRQ_END_WRITE`` indicates that the controller has finished a write transaction.
+
+   Not all triggers are available on all ports.  If a port has the constant then that
+   event is available.
+
+   Note the following restrictions:
+
+      - ``IRQ_ADDR_MATCH_READ``, ``IRQ_ADDR_MATCH_READ``, ``IRQ_READ_REQ`` and
+        ``IRQ_WRITE_REQ`` must be handled by a hard IRQ callback (with the *hard* argument
+        set to ``True``).  This is because these events have very strict timing requirements
+        and must usually be satisfied synchronously with the hardware event.
+
+      - ``IRQ_END_READ`` and ``IRQ_END_WRITE`` may be handled by either a soft or hard
+        IRQ callback (although note that all events must be registered with the same handler,
+        so if any events need a hard callback then all events must be hard).
+
+      - If a memory buffer has been supplied in the constructor then ``IRQ_END_WRITE``
+        is not emitted for the transaction that writes the memory address.  This is to
+        allow ``IRQ_END_READ`` and ``IRQ_END_WRITE`` to function correctly as soft IRQ
+        callbacks, where the IRQ handler may be called quite some time after the actual
+        hardware event.
+
+.. attribute:: I2CTarget.memaddr
+
+   The integer value of the most recent memory address that was selected by the I2C
+   controller (only valid if ``mem`` was specified in the constructor).
+
+Constants
+---------
+
+.. data:: I2CTarget.IRQ_ADDR_MATCH_READ
+          I2CTarget.IRQ_ADDR_MATCH_WRITE
+          I2CTarget.IRQ_READ_REQ
+          I2CTarget.IRQ_WRITE_REQ
+          I2CTarget.IRQ_END_READ
+          I2CTarget.IRQ_END_WRITE
+
+    IRQ trigger sources.
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 76d111f11ef3d..3c22aa9af6524 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -264,6 +264,7 @@ Classes
    machine.UART.rst
    machine.SPI.rst
    machine.I2C.rst
+   machine.I2CTarget.rst
    machine.I2S.rst
    machine.RTC.rst
    machine.Timer.rst

From c3f3339c87444acec814a150fdad28e650483405 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Tue, 15 Aug 2023 13:03:45 +0100
Subject: [PATCH 2643/3129] esp32/modesp32: Add esp32.PCNT class.

Add a new `esp32.PCNT` class that provides complete, low-level support to
the ESP32 PCNT pulse counting hardware units.

This can be used as a building block to implement the higher-level
`machine.Counter` and `machine.Encoder` classes.

This is enabled by default on all OG, S2, S3, C6 boards, but not on C3 (as
the PCNT peripheral is not supported).

Original implementation by: Jonathan Hogg <me@jonathanhogg.com>

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/sdkconfig.base |   1 +
 ports/esp32/esp32_common.cmake    |   1 +
 ports/esp32/esp32_pcnt.c          | 513 ++++++++++++++++++++++++++++++
 ports/esp32/main.c                |   5 +
 ports/esp32/modesp32.c            |   3 +
 ports/esp32/modesp32.h            |   6 +
 ports/esp32/mpconfigport.h        |   4 +
 7 files changed, 533 insertions(+)
 create mode 100644 ports/esp32/esp32_pcnt.c

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 2f1835c9242d4..4bbccf77d17d7 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -117,6 +117,7 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
 CONFIG_UART_ISR_IN_IRAM=y
 
 # IDF 5 deprecated
+CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 
 CONFIG_ETH_USE_SPI_ETHERNET=y
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 09b120391305f..9e8acf8897c6a 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -127,6 +127,7 @@ list(APPEND MICROPY_SOURCE_PORT
     modesp.c
     esp32_nvs.c
     esp32_partition.c
+    esp32_pcnt.c
     esp32_rmt.c
     esp32_ulp.c
     modesp32.c
diff --git a/ports/esp32/esp32_pcnt.c b/ports/esp32/esp32_pcnt.c
new file mode 100644
index 0000000000000..36d43ab4559c6
--- /dev/null
+++ b/ports/esp32/esp32_pcnt.c
@@ -0,0 +1,513 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021-22 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 "py/runtime.h"
+#include "py/mphal.h"
+#include "py/obj.h"
+
+#if MICROPY_PY_ESP32_PCNT
+
+#include "shared/runtime/mpirq.h"
+
+#include "modesp32.h"
+#include "driver/pcnt.h"
+
+#if !MICROPY_ENABLE_FINALISER
+#error "esp32.PCNT requires MICROPY_ENABLE_FINALISER."
+#endif
+
+typedef struct _esp32_pcnt_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+} esp32_pcnt_irq_obj_t;
+
+typedef struct _esp32_pcnt_obj_t {
+    mp_obj_base_t base;
+    pcnt_unit_t unit;
+    esp32_pcnt_irq_obj_t *irq;
+    struct _esp32_pcnt_obj_t *next;
+} esp32_pcnt_obj_t;
+
+// Linked list of PCNT units.
+MP_REGISTER_ROOT_POINTER(struct _esp32_pcnt_obj_t *esp32_pcnt_obj_head);
+
+// Once off installation of the PCNT ISR service (using the default service).
+// Persists across soft reset.
+static bool pcnt_isr_service_installed = false;
+
+static mp_obj_t esp32_pcnt_deinit(mp_obj_t self_in);
+
+void esp32_pcnt_deinit_all(void) {
+    esp32_pcnt_obj_t **pcnt = &MP_STATE_PORT(esp32_pcnt_obj_head);
+    while (*pcnt != NULL) {
+        esp32_pcnt_deinit(MP_OBJ_FROM_PTR(*pcnt));
+        *pcnt = (*pcnt)->next;
+    }
+}
+
+static void esp32_pcnt_init_helper(esp32_pcnt_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {
+        ARG_channel,
+        ARG_pin,
+        ARG_rising,
+        ARG_falling,
+        ARG_mode_pin,
+        ARG_mode_low,
+        ARG_mode_high,
+        ARG_min,
+        ARG_max,
+        ARG_filter,
+        ARG_threshold0,
+        ARG_threshold1,
+        ARG_value,
+    };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_channel,     MP_ARG_KW_ONLY | MP_ARG_INT,   {.u_int = 0} },
+        // Applies to the channel.
+        { MP_QSTR_pin,         MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_rising,      MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_falling,     MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mode_pin,    MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mode_low,    MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mode_high,   MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        // Applies to the whole unit.
+        { MP_QSTR_min,         MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_max,         MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_filter,      MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_threshold0,  MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_threshold1,  MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        // Implicitly zero if min, max, threshold0/1 are set.
+        { MP_QSTR_value,       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_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // The pin/mode_pin, rising, falling, mode_low, mode_high args all apply
+    // to the channel (defaults to channel zero).
+    mp_uint_t channel = args[ARG_channel].u_int;
+    if (channel >= PCNT_CHANNEL_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("channel"));
+    }
+
+    if (args[ARG_pin].u_obj != MP_OBJ_NULL || args[ARG_mode_pin].u_obj != MP_OBJ_NULL) {
+        // If you set mode_pin, you must also set pin.
+        if (args[ARG_pin].u_obj == MP_OBJ_NULL) {
+            mp_raise_ValueError(MP_ERROR_TEXT("pin"));
+        }
+
+        mp_hal_pin_obj_t pin = PCNT_PIN_NOT_USED;
+        mp_hal_pin_obj_t mode_pin = PCNT_PIN_NOT_USED;
+
+        // Set to None to disable pin/mode_pin.
+        if (args[ARG_pin].u_obj != mp_const_none) {
+            pin = mp_hal_get_pin_obj(args[ARG_pin].u_obj);
+        }
+        if (args[ARG_mode_pin].u_obj != MP_OBJ_NULL && args[ARG_mode_pin].u_obj != mp_const_none) {
+            mode_pin = mp_hal_get_pin_obj(args[ARG_mode_pin].u_obj);
+        }
+
+        pcnt_set_pin(self->unit, channel, pin, mode_pin);
+    }
+
+    if (
+        args[ARG_rising].u_obj != MP_OBJ_NULL || args[ARG_falling].u_obj != MP_OBJ_NULL ||
+        args[ARG_mode_low].u_obj != MP_OBJ_NULL || args[ARG_mode_high].u_obj != MP_OBJ_NULL
+        ) {
+        mp_uint_t rising = args[ARG_rising].u_obj == MP_OBJ_NULL ? PCNT_COUNT_DIS : mp_obj_get_int(args[ARG_rising].u_obj);
+        mp_uint_t falling = args[ARG_falling].u_obj == MP_OBJ_NULL ? PCNT_COUNT_DIS : mp_obj_get_int(args[ARG_falling].u_obj);
+        mp_uint_t mode_low = args[ARG_mode_low].u_obj == MP_OBJ_NULL ? PCNT_MODE_KEEP : mp_obj_get_int(args[ARG_mode_low].u_obj);
+        mp_uint_t mode_high = args[ARG_mode_high].u_obj == MP_OBJ_NULL ? PCNT_MODE_KEEP : mp_obj_get_int(args[ARG_mode_high].u_obj);
+        if (rising >= PCNT_COUNT_MAX) {
+            mp_raise_ValueError(MP_ERROR_TEXT("rising"));
+        }
+        if (falling >= PCNT_COUNT_MAX) {
+            mp_raise_ValueError(MP_ERROR_TEXT("falling"));
+        }
+        if (mode_low >= PCNT_MODE_MAX) {
+            mp_raise_ValueError(MP_ERROR_TEXT("mode_low"));
+        }
+        if (mode_high >= PCNT_MODE_MAX) {
+            mp_raise_ValueError(MP_ERROR_TEXT("mode_high"));
+        }
+        pcnt_set_mode(self->unit, channel, rising, falling, mode_high, mode_low);
+    }
+
+    // The rest of the arguments apply to the whole unit.
+
+    if (args[ARG_filter].u_obj != MP_OBJ_NULL) {
+        mp_uint_t filter = mp_obj_get_int(args[ARG_filter].u_obj);
+        if (filter > 1023) {
+            mp_raise_ValueError(MP_ERROR_TEXT("filter"));
+        }
+        if (filter) {
+            check_esp_err(pcnt_set_filter_value(self->unit, filter));
+            check_esp_err(pcnt_filter_enable(self->unit));
+        } else {
+            check_esp_err(pcnt_filter_disable(self->unit));
+        }
+    }
+
+    bool clear = false;
+    if (args[ARG_value].u_obj != MP_OBJ_NULL) {
+        mp_int_t value = mp_obj_get_int(args[ARG_value].u_obj);
+        if (value != 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("value"));
+        }
+        clear = true;
+    }
+
+    if (args[ARG_min].u_obj != MP_OBJ_NULL) {
+        mp_int_t minimum = mp_obj_get_int(args[ARG_min].u_obj);
+        if (minimum < -32768 || minimum > 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("minimum"));
+        }
+        check_esp_err(pcnt_set_event_value(self->unit, PCNT_EVT_L_LIM, minimum));
+        clear = true;
+    }
+
+    if (args[ARG_max].u_obj != MP_OBJ_NULL) {
+        mp_int_t maximum = mp_obj_get_int(args[ARG_max].u_obj);
+        if (maximum < 0 || maximum > 32767) {
+            mp_raise_ValueError(MP_ERROR_TEXT("maximum"));
+        }
+        check_esp_err(pcnt_set_event_value(self->unit, PCNT_EVT_H_LIM, maximum));
+        clear = true;
+    }
+
+    if (args[ARG_threshold0].u_obj != MP_OBJ_NULL) {
+        mp_int_t threshold0 = mp_obj_get_int(args[ARG_threshold0].u_obj);
+        if (threshold0 < -32768 || threshold0 > 32767) {
+            mp_raise_ValueError(MP_ERROR_TEXT("threshold0"));
+        }
+        check_esp_err(pcnt_set_event_value(self->unit, PCNT_EVT_THRES_0, threshold0));
+        clear = true;
+    }
+
+    if (args[ARG_threshold1].u_obj != MP_OBJ_NULL) {
+        mp_int_t threshold1 = mp_obj_get_int(args[ARG_threshold1].u_obj);
+        if (threshold1 < -32768 || threshold1 > 32767) {
+            mp_raise_ValueError(MP_ERROR_TEXT("threshold1"));
+        }
+        check_esp_err(pcnt_set_event_value(self->unit, PCNT_EVT_THRES_1, threshold1));
+        clear = true;
+    }
+
+    if (clear) {
+        check_esp_err(pcnt_counter_clear(self->unit));
+    }
+}
+
+// Disable any events, and remove the ISR handler for this unit.
+static void esp32_pcnt_disable_events_for_unit(esp32_pcnt_obj_t *self) {
+    if (!self->irq) {
+        return;
+    }
+
+    // Disable all possible events and remove the ISR.
+    for (pcnt_evt_type_t evt_type = PCNT_EVT_THRES_1; evt_type <= PCNT_EVT_ZERO; evt_type <<= 1) {
+        check_esp_err(pcnt_event_disable(self->unit, evt_type));
+    }
+    check_esp_err(pcnt_isr_handler_remove(self->unit));
+
+    // Clear IRQ object state.
+    self->irq->base.handler = mp_const_none;
+    self->irq->trigger = 0;
+}
+
+static mp_obj_t esp32_pcnt_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+    if (n_pos_args < 1) {
+        mp_raise_TypeError(MP_ERROR_TEXT("id"));
+    }
+
+    pcnt_unit_t unit = mp_obj_get_int(args[0]);
+    if (unit < 0 || unit >= PCNT_UNIT_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
+    }
+
+    // Try and find an existing instance for this unit.
+    esp32_pcnt_obj_t *self = MP_STATE_PORT(esp32_pcnt_obj_head);
+    while (self) {
+        if (self->unit == unit) {
+            break;
+        }
+        self = self->next;
+    }
+
+    if (!self) {
+        // Unused unit, create a new esp32_pcnt_obj_t instance and put it at
+        // the head of the list.
+        self = mp_obj_malloc(esp32_pcnt_obj_t, &esp32_pcnt_type);
+        self->unit = unit;
+        self->irq = NULL;
+        self->next = MP_STATE_PORT(esp32_pcnt_obj_head);
+        MP_STATE_PORT(esp32_pcnt_obj_head) = self;
+
+        // Ensure the unit is in a known (deactivated) state.
+        esp32_pcnt_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);
+    esp32_pcnt_init_helper(self, 0, args + n_pos_args, &kw_args);
+
+    // Ensure the global PCNT ISR service is installed.
+    if (!pcnt_isr_service_installed) {
+        check_esp_err(pcnt_isr_service_install(ESP_INTR_FLAG_IRAM));
+        pcnt_isr_service_installed = true;
+    }
+
+    // And enable for this unit.
+    check_esp_err(pcnt_intr_enable(self->unit));
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void esp32_pcnt_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "PCNT(%u)", self->unit);
+}
+
+static mp_obj_t esp32_pcnt_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    esp32_pcnt_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_pcnt_init_obj, 1, esp32_pcnt_init);
+
+static mp_obj_t esp32_pcnt_deinit(mp_obj_t self_in) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Remove IRQ and events.
+    esp32_pcnt_disable_events_for_unit(self);
+
+    // Deactivate both channels.
+    pcnt_config_t channel_config = {
+        .unit = self->unit,
+        .pulse_gpio_num = PCNT_PIN_NOT_USED,
+        .pos_mode = PCNT_COUNT_DIS,
+        .neg_mode = PCNT_COUNT_DIS,
+        .ctrl_gpio_num = PCNT_PIN_NOT_USED,
+        .lctrl_mode = PCNT_MODE_KEEP,
+        .hctrl_mode = PCNT_MODE_KEEP,
+        .counter_l_lim = 0,
+        .counter_h_lim = 0,
+    };
+    for (pcnt_channel_t channel = 0; channel <= 1; ++channel) {
+        channel_config.channel = channel;
+        check_esp_err(pcnt_unit_config(&channel_config));
+    }
+
+    // Disable filters & thresholds, pause & clear.
+    check_esp_err(pcnt_filter_disable(self->unit));
+    check_esp_err(pcnt_set_event_value(self->unit, PCNT_EVT_THRES_0, 0));
+    check_esp_err(pcnt_set_event_value(self->unit, PCNT_EVT_THRES_1, 0));
+    check_esp_err(pcnt_counter_pause(self->unit));
+    check_esp_err(pcnt_counter_clear(self->unit));
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_pcnt_deinit_obj, esp32_pcnt_deinit);
+
+static mp_obj_t esp32_pcnt_value(size_t n_args, const mp_obj_t *pos_args) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+
+    // Optionally use pcnt.value(True) to clear the counter but only support a
+    // value of zero. Note: This can lead to skipped counts.
+    if (n_args == 2) {
+        if (mp_obj_get_int(pos_args[1]) != 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("value"));
+        }
+    }
+
+    // This loop ensures that the caller's state (as inferred from IRQs, e.g.
+    // under/overflow) corresponds to the returned value, by synchronously
+    // flushing all pending IRQs.
+    int16_t value;
+    while (true) {
+        check_esp_err(pcnt_get_counter_value(self->unit, &value));
+        if (self->irq && self->irq->flags && self->irq->base.handler != mp_const_none) {
+            // The handler must call irq.flags() to clear self->irq->base.flags,
+            // otherwise this will be an infinite loop.
+            mp_call_function_1(self->irq->base.handler, self->irq->base.parent);
+        } else {
+            break;
+        }
+    }
+
+    if (n_args == 2) {
+        // Value was given, and we've already checked it was zero, so clear
+        // the counter.
+        check_esp_err(pcnt_counter_clear(self->unit));
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(value);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_pcnt_value_obj, 1, 2, esp32_pcnt_value);
+
+static mp_uint_t esp32_pcnt_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->irq->trigger = new_trigger;
+    for (pcnt_evt_type_t evt_type = PCNT_EVT_THRES_1; evt_type <= PCNT_EVT_ZERO; evt_type <<= 1) {
+        if (new_trigger & evt_type) {
+            pcnt_event_enable(self->unit, evt_type);
+        } else {
+            pcnt_event_disable(self->unit, evt_type);
+        }
+    }
+    return 0;
+}
+
+static mp_uint_t esp32_pcnt_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        // Atomically get-and-clear the flags.
+        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+        mp_uint_t flags = self->irq->flags;
+        self->irq->flags = 0;
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
+        return flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return self->irq->trigger;
+    }
+    return 0;
+}
+
+static const mp_irq_methods_t esp32_pcnt_irq_methods = {
+    .trigger = esp32_pcnt_irq_trigger,
+    .info = esp32_pcnt_irq_info,
+};
+
+static IRAM_ATTR void esp32_pcnt_intr_handler(void *arg) {
+    esp32_pcnt_obj_t *self = (esp32_pcnt_obj_t *)arg;
+    pcnt_unit_t unit = self->unit;
+    uint32_t status;
+    pcnt_get_event_status(unit, &status);
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+    self->irq->flags |= status;
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+    mp_irq_handler(&self->irq->base);
+}
+
+static mp_obj_t esp32_pcnt_irq(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger };
+    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 = PCNT_EVT_ZERO} },
+    };
+
+    esp32_pcnt_obj_t *self = pos_args[0];
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_pos_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (!self->irq) {
+        // Create IRQ object if necessary. This instance persists across a
+        // de-init.
+        self->irq = mp_obj_malloc(esp32_pcnt_irq_obj_t, &mp_irq_type);
+        self->irq->base.methods = (mp_irq_methods_t *)&esp32_pcnt_irq_methods;
+        self->irq->base.parent = MP_OBJ_FROM_PTR(self);
+        self->irq->base.ishard = false;
+        self->irq->base.handler = mp_const_none;
+        self->irq->trigger = 0;
+    }
+
+    if (n_pos_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;
+
+        if (trigger < PCNT_EVT_THRES_1 || trigger >= (PCNT_EVT_ZERO << 1)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("trigger"));
+        }
+
+        if (handler != mp_const_none) {
+            self->irq->base.handler = handler;
+            self->irq->trigger = trigger;
+            pcnt_isr_handler_add(self->unit, esp32_pcnt_intr_handler, (void *)self);
+            esp32_pcnt_irq_trigger(MP_OBJ_FROM_PTR(self), trigger);
+        } else {
+            // Remove the ISR, disable all events, clear the IRQ object state.
+            esp32_pcnt_disable_events_for_unit(self);
+        }
+    }
+
+    return MP_OBJ_FROM_PTR(self->irq);
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_pcnt_irq_obj, 1, esp32_pcnt_irq);
+
+static mp_obj_t esp32_pcnt_start(mp_obj_t self_in) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_esp_err(pcnt_counter_resume(self->unit));
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_pcnt_start_obj, esp32_pcnt_start);
+
+static mp_obj_t esp32_pcnt_stop(mp_obj_t self_in) {
+    esp32_pcnt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_esp_err(pcnt_counter_pause(self->unit));
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(esp32_pcnt_stop_obj, esp32_pcnt_stop);
+
+static const mp_rom_map_elem_t esp32_pcnt_locals_dict_table[] = {
+    // Methods
+    { MP_ROM_QSTR(MP_QSTR_init),            MP_ROM_PTR(&esp32_pcnt_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value),           MP_ROM_PTR(&esp32_pcnt_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),             MP_ROM_PTR(&esp32_pcnt_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_start),           MP_ROM_PTR(&esp32_pcnt_start_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stop),            MP_ROM_PTR(&esp32_pcnt_stop_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),          MP_ROM_PTR(&esp32_pcnt_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__),         MP_ROM_PTR(&esp32_pcnt_deinit_obj) },
+
+    // Constants
+    { MP_ROM_QSTR(MP_QSTR_IGNORE),          MP_ROM_INT(PCNT_COUNT_DIS) },
+    { MP_ROM_QSTR(MP_QSTR_INCREMENT),       MP_ROM_INT(PCNT_COUNT_INC) },
+    { MP_ROM_QSTR(MP_QSTR_DECREMENT),       MP_ROM_INT(PCNT_COUNT_DEC) },
+    { MP_ROM_QSTR(MP_QSTR_NORMAL),          MP_ROM_INT(PCNT_MODE_KEEP) },
+    { MP_ROM_QSTR(MP_QSTR_REVERSE),         MP_ROM_INT(PCNT_MODE_REVERSE) },
+    { MP_ROM_QSTR(MP_QSTR_HOLD),            MP_ROM_INT(PCNT_MODE_DISABLE) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_ZERO),        MP_ROM_INT(PCNT_EVT_ZERO) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_THRESHOLD0),  MP_ROM_INT(PCNT_EVT_THRES_0) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_THRESHOLD1),  MP_ROM_INT(PCNT_EVT_THRES_1) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_MIN),         MP_ROM_INT(PCNT_EVT_L_LIM) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_MAX),         MP_ROM_INT(PCNT_EVT_H_LIM) },
+};
+static MP_DEFINE_CONST_DICT(esp32_pcnt_locals_dict, esp32_pcnt_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp32_pcnt_type,
+    MP_QSTR_PCNT,
+    MP_TYPE_FLAG_NONE,
+    make_new, esp32_pcnt_make_new,
+    print, esp32_pcnt_print,
+    locals_dict, &esp32_pcnt_locals_dict
+    );
+
+#endif // MICROPY_PY_ESP32_PCNT
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index f85fb6c084f90..1523e07f916d6 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -61,6 +61,7 @@
 #include "uart.h"
 #include "usb.h"
 #include "usb_serial_jtag.h"
+#include "modesp32.h"
 #include "modmachine.h"
 #include "modnetwork.h"
 
@@ -181,6 +182,10 @@ void mp_task(void *pvParameter) {
 
     machine_timer_deinit_all();
 
+    #if MICROPY_PY_ESP32_PCNT
+    esp32_pcnt_deinit_all();
+    #endif
+
     #if MICROPY_PY_THREAD
     mp_thread_deinit();
     #endif
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index bf7aec3944228..858be2ed05f81 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -299,6 +299,9 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_NVS), MP_ROM_PTR(&esp32_nvs_type) },
     { MP_ROM_QSTR(MP_QSTR_Partition), MP_ROM_PTR(&esp32_partition_type) },
+    #if MICROPY_PY_ESP32_PCNT
+    { MP_ROM_QSTR(MP_QSTR_PCNT), MP_ROM_PTR(&esp32_pcnt_type) },
+    #endif
     #if SOC_RMT_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_RMT), MP_ROM_PTR(&esp32_rmt_type) },
     #endif
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index a685b7b38fe6f..81ab94dc633ae 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -66,6 +66,12 @@ 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;
 
+#if MICROPY_PY_ESP32_PCNT
+extern const mp_obj_type_t esp32_pcnt_type;
+
+void esp32_pcnt_deinit_all(void);
+#endif
+
 esp_err_t rmt_driver_install_core1(uint8_t channel_id);
 
 #endif // MICROPY_INCLUDED_ESP32_MODESP32_H
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 1844018030b8b..48ad39ef7ed17 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -70,6 +70,7 @@
 #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_SCHEDULER_DEPTH             (8)
+#define MICROPY_SCHEDULER_STATIC_NODES      (1)
 #define MICROPY_VFS                         (1)
 
 // control over Python builtins
@@ -194,6 +195,9 @@
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_SOCKET_EVENTS            (MICROPY_PY_WEBREPL)
 #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR    (1)
+#ifndef MICROPY_PY_ESP32_PCNT
+#define MICROPY_PY_ESP32_PCNT               (SOC_PCNT_SUPPORTED)
+#endif
 
 // fatfs configuration
 #define MICROPY_FATFS_ENABLE_LFN            (1)

From e54553c496bf915ed0263c2d2a61d31d61032dea Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Sat, 10 Sep 2022 17:08:27 +0100
Subject: [PATCH 2644/3129] docs/esp32: Add documentation for esp32.PCNT.

Document the new `esp32.PCNT` class for hardware pulse counting.

Originally authored by: Jonathan Hogg <me@jonathanhogg.com>

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/esp32/quickref.rst |  21 ++++++
 docs/library/esp32.rst  | 142 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 49f546a17c03f..7127cc402bd12 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -566,6 +566,27 @@ ESP32 S2:
 
     Provided to deinit the adc driver.
 
+Pulse Counter (pin pulse/edge counting)
+---------------------------------------
+
+The ESP32 provides up to 8 pulse counter peripherals depending on the hardware,
+with id 0..7. These can be configured to count rising and/or falling edges on
+any input pin.
+
+Use the :ref:`esp32.PCNT <esp32.PCNT>` class::
+
+    from machine import Pin
+    from esp32 import PCNT
+
+    counter = PCNT(0, pin=Pin(2), rising=PCNT.INCREMENT)        # create counter
+    counter.start()                                             # start counter
+    count = counter.value()                                     # read count, -32768..32767
+    counter.value(0)                                            # reset counter
+    count = counter.value(0)                                    # read and reset
+
+The PCNT hardware supports monitoring multiple pins in a single unit to
+implement quadrature decoding or up/down signal counters.
+
 Software SPI bus
 ----------------
 
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 4be6dc2671c52..0cf0ebc62636d 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -195,6 +195,148 @@ Constants
 
     Used in `idf_heap_info`.
 
+
+.. _esp32.PCNT:
+
+PCNT
+----
+
+This class provides access to the ESP32 hardware support for pulse counting.
+There are 8 pulse counter units, with id 0..7.
+
+See the :ref:`machine.Counter <machine.Counter>` and
+:ref:`machine.Encoder <machine.Encoder>` classes for simpler and portable
+abstractions of common pulse counting applications. These classes are
+implemented as thin Python shims around :class:`PCNT`.
+
+.. class:: PCNT(id, *, ...)
+
+    Returns the singleton PCNT instance for the given unit ``id``.
+
+    Keyword arguments are passed to the ``init()`` method as described
+    below.
+
+.. method:: PCNT.init(*, ...)
+
+    (Re-)initialise a pulse counter unit. Supported keyword arguments are:
+
+      - ``channel``: see description below
+      - ``pin``: the input Pin to monitor for pulses
+      - ``rising``: an action to take on a rising edge - one of
+        ``PCNT.INCREMENT``, ``PCNT.DECREMENT`` or ``PCNT.IGNORE`` (the default)
+      - ``falling``: an action to take on a falling edge (takes the save values
+        as the ``rising`` argument).
+      - ``mode_pin``: ESP32 pulse counters support monitoring a second pin and
+        altering the behaviour of the counter based on its level - set this
+        keyword to any input Pin
+      - ``mode_low``: set to either ``PCNT.HOLD`` or ``PCNT.REVERSE`` to
+        either suspend counting or reverse the direction of the counter (i.e.,
+        ``PCNT.INCREMENT`` behaves as ``PCNT.DECREMENT`` and vice versa)
+        when ``mode_pin`` is low
+      - ``mode_high``: as ``mode_low`` but for the behaviour when ``mode_pin``
+        is high
+      - ``filter``: set to a value 1..1023, in ticks of the 80MHz clock, to
+        enable the pulse width filter
+      - ``min``: set to the minimum level of the counter value when
+        decrementing (-32768..-1) or 0 to disable
+      - ``max``: set to the maximum level of the counter value when
+        incrementing (1..32767) or 0 to disable
+      - ``threshold0``: sets the counter value for the
+        ``PCNT.IRQ_THRESHOLD0`` event (see ``irq`` method)
+      - ``threshold1``: sets the counter value for the
+        ``PCNT.IRQ_THRESHOLD1`` event (see ``irq`` method)
+      - ``value``: can be set to ``0`` to reset the counter value
+
+    The hardware initialisation is done in stages and so some of the keyword
+    arguments can be used in groups or in isolation to partially reconfigure a
+    unit:
+
+      - the ``pin`` keyword (optionally combined with ``mode_pin``) can be used
+        to change just the bound pin(s)
+      - ``rising``, ``falling``, ``mode_low`` and ``mode_high`` can be used
+        (singly or together) to change the counting logic - omitted keywords
+        use their default (``PCNT.IGNORE`` or ``PCNT.NORMAL``)
+      - ``filter`` can be used to change only the pulse width filter (with 0
+        disabling it)
+      - each of ``min``, ``max``, ``threshold0`` and ``threshold1`` can
+        be used to change these limit/event values individually; however,
+        setting any will reset the counter to zero (i.e., they imply
+        ``value=0``)
+
+    Each pulse counter unit supports two channels, 0 and 1, each able to
+    monitor different pins with different counting logic but updating the same
+    counter value. Use ``channel=1`` with the ``pin``, ``rising``, ``falling``,
+    ``mode_pin``, ``mode_low`` and ``mode_high`` keywords to configure the
+    second channel.
+
+    The second channel can be used to configure 4X quadrature decoding with a
+    single counter unit::
+
+        pin_a = Pin(2, Pin.INPUT, pull=Pin.PULL_UP)
+        pin_b = Pin(3, Pin.INPUT, pull=Pin.PULL_UP)
+        rotary = PCNT(0, min=-32000, max=32000)
+        rotary.init(channel=0, pin=pin_a, falling=PCNT.INCREMENT, rising=PCNT.DECREMENT, mode_pin=pin_b, mode_low=PCNT.REVERSE)
+        rotary.init(channel=1, pin=pin_b, falling=PCNT.DECREMENT, rising=PCNT.INCREMENT, mode_pin=pin_a, mode_low=PCNT.REVERSE)
+        rotary.start()
+
+.. method:: PCNT.value([value])
+
+    Call this method with no arguments to return the current counter value.
+
+    If the optional *value* argument is set to ``0`` then the counter is
+    reset (but the previous value is returned). Read and reset is not atomic and
+    so it is possible for a pulse to be missed. Any value other than ``0`` will
+    raise an error.
+
+.. method:: PCNT.irq(handler=None, trigger=PCNT.IRQ_ZERO)
+
+    ESP32 pulse counters support interrupts on these counter events:
+
+      - ``PCNT.IRQ_ZERO``: the counter has reset to zero
+      - ``PCNT.IRQ_MIN``: the counter has hit the ``min`` value
+      - ``PCNT.IRQ_MAX``: the counter has hit the ``max`` value
+      - ``PCNT.IRQ_THRESHOLD0``: the counter has hit the ``threshold0`` value
+      - ``PCNT.IRQ_THRESHOLD1``: the counter has hit the ``threshold1`` value
+
+    ``trigger`` should be a bit-mask of the desired events OR'ed together. The
+    ``handler`` function should take a single argument which is the
+    :class:`PCNT` instance that raised the event.
+
+    This method returns a callback object. The callback object can be used to
+    access the bit-mask of events that are outstanding on the PCNT unit.::
+
+        def pcnt_irq(pcnt):
+            flags = pcnt.irq().flags()
+            if flags & PCNT.IRQ_ZERO:
+               # reset
+            if flags & PCNT.IRQ_MAX:
+               # overflow...
+            ... etc
+
+        pcnt.irq(handler=pcnt_irq, trigger=PCNT.IRQ_ZERO | PCNT.IRQ_MAX | ...)
+
+    **Note:** Accessing ``irq.flags()`` will clear the flags, so only call it
+    once per invocation of the handler.
+
+    The handler is called with the MicroPython scheduler and so will run at a
+    point after the interrupt. If another interrupt occurs before the handler
+    has been called then the events will be coalesced together into a single
+    call and the bit mask will indicate all events that have occurred.
+
+    To avoid race conditions between a handler being called and retrieving the
+    current counter value, the ``value()`` method will force execution of any
+    pending events before returning the current counter value (and potentially
+    resetting the value).
+
+    Only one handler can be in place per-unit. Set ``handler`` to ``None`` to
+    disable the event interrupt.
+
+.. Note::
+    ESP32 pulse counters reset to *zero* when reaching the minimum or maximum
+    value. Thus the ``IRQ_ZERO`` event will also trigger when either of these
+    events occurs.
+
+
 .. _esp32.RMT:
 
 RMT

From 327655905e9f523070301f2f35459197d46db4fb Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Sat, 10 Sep 2022 16:47:19 +0100
Subject: [PATCH 2645/3129] esp32/modules/machine.py: Add Counter and Encoder
 classes.

Adds a Python override of the `machine` module, which delegates to the
built-in module and adds an implementation of `Counter` and `Encoder`,
based on the `esp32.PCNT` class.

Original implementation by: Jonathan Hogg <me@jonathanhogg.com>

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/modules/machine.py | 192 +++++++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)
 create mode 100644 ports/esp32/modules/machine.py

diff --git a/ports/esp32/modules/machine.py b/ports/esp32/modules/machine.py
new file mode 100644
index 0000000000000..9cfda12f17753
--- /dev/null
+++ b/ports/esp32/modules/machine.py
@@ -0,0 +1,192 @@
+import sys
+
+_path = sys.path
+sys.path = ()
+try:
+    import machine as _machine
+finally:
+    sys.path = _path
+    del _path
+    del sys
+
+
+from micropython import const
+import esp32
+
+if hasattr(esp32, "PCNT"):
+    _PCNT_RANGE = const(32000)
+
+    class _CounterBase:
+        _PCNT = esp32.PCNT
+        # Singletons, keyed by PCNT unit_id (shared by both Counter & Encoder).
+        _INSTANCES = {}
+
+        # Use __new__ to implement a singleton rather than a factory function,
+        # because we need to be able to provide class attributes, e.g.
+        # Counter.RISING, which is not possible if Counter was a function
+        # (functions cannot have attributes in MicroPython).
+        def __new__(cls, unit_id, *_args, **_kwargs):
+            # Find an existing instance for this PCNT unit id.
+            self = cls._INSTANCES.get(unit_id)
+
+            if self:
+                # Verify that this PCNT is being used for the same type
+                # (Encoder or Counter).
+                if not isinstance(self, cls):
+                    raise ValueError("PCNT in use")
+            else:
+                # Previously unused PCNT unit.
+                self = object.__new__(cls)
+                cls._INSTANCES[unit_id] = self
+
+            # __init__ will now be called with the same args.
+            return self
+
+        def __init__(self, unit_id, *args, filter_ns=0, **kwargs):
+            self._unit_id = unit_id
+
+            if not hasattr(self, "_pcnt"):
+                # New instance, or previously deinit-ed.
+                self._pcnt = self._PCNT(unit_id, min=-_PCNT_RANGE, max=_PCNT_RANGE)
+            elif not (args or kwargs):
+                # Existing instance, and no args, so accessing the existing
+                # singleton without reconfiguring. Note: This means that
+                # Counter/Encoder cannot be partially re-initalised. Either
+                # you get the existing instance as-is (by passing no arguments
+                # other than the id), or you must pass all the necessary
+                # arguments to additionally re-configure it.
+                return
+
+            # Counter- or Encoder-specific configuration of self._pcnt.
+            self._configure(*args, **kwargs)
+
+            # Common unit configuration.
+            self._pcnt.init(
+                filter=min(max(0, filter_ns * 80 // 1000), 1023),
+                value=0,
+            )
+
+            # Note: We track number-of-overflows rather than the actual count in
+            # order to avoid the IRQ handler overflowing MicroPython's "small int"
+            # range. This gives an effective range of 2**30 overflows. User code
+            # should use counter.value(0) to reset the overflow count.
+            # The ESP32 PCNT resets to zero on under/overflow (i.e. it does not wrap
+            # around to the opposite limit), so each overflow corresponds to exactly
+            # _PCNT_RANGE counts.
+
+            # Reset counter state.
+            self._overflows = 0
+            self._offset = 0
+
+            # Install IRQ handler to handle under/overflow.
+            self._pcnt.irq(self._overflow, self._PCNT.IRQ_MIN | self._PCNT.IRQ_MAX)
+
+            # Start counting.
+            self._pcnt.start()
+
+        # Handle counter under/overflow.
+        def _overflow(self, pcnt):
+            mask = pcnt.irq().flags()
+            if mask & self._PCNT.IRQ_MIN:
+                self._overflows -= 1
+            elif mask & self._PCNT.IRQ_MAX:
+                self._overflows += 1
+
+        # Public machine.Counter & machine.Encoder API.
+        def init(self, *args, **kwargs):
+            self.__init__(self._unit_id, *args, **kwargs)
+
+        # Public machine.Counter & machine.Encoder API.
+        def deinit(self):
+            if hasattr(self, "_pcnt"):
+                self._pcnt.deinit()
+                del self._pcnt
+
+        # Public machine.Counter & machine.Encoder API.
+        def value(self, value=None):
+            if not hasattr(self, "_pcnt"):
+                raise RuntimeError("not initialised")
+
+            # This loop deals with the possibility that a PCNT overflow occurs
+            # between retrieving self._overflows and self._pcnt.value().
+            while True:
+                overflows = self._overflows
+                current = self._pcnt.value()
+                # Calling PCNT.value() forces any pending interrupts to run
+                # for this PCNT unit. So self._overflows must now be the the
+                # value corresponding to the value we read.
+                if self._overflows == overflows:
+                    break
+
+            # Compute the result including the number of times we've cycled
+            # through the range, and any applied offset.
+            result = overflows * _PCNT_RANGE + current + self._offset
+
+            # If a new value is specified, then zero out the overflows, and set
+            # self._offset so that it zeros out the current PCNT value. The
+            # mutation to self._overflows is atomic w.r.t. the overflow IRQ
+            # handler because the scheduler only runs on branch instructions.
+            if value is not None:
+                self._overflows -= overflows
+                self._offset = value - current
+
+            return result
+
+    class Counter(_CounterBase):
+        # Public machine.Counter API.
+        RISING = 1
+        FALLING = 2
+        UP = _CounterBase._PCNT.INCREMENT
+        DOWN = _CounterBase._PCNT.DECREMENT
+
+        # Counter-specific configuration.
+        def _configure(self, src, edge=RISING, direction=UP):
+            # Only use the first channel.
+            self._pcnt.init(
+                channel=0,
+                pin=src,
+                rising=direction if edge & Counter.RISING else self._PCNT.IGNORE,
+                falling=direction if edge & Counter.FALLING else self._PCNT.IGNORE,
+            )
+
+    class Encoder(_CounterBase):
+        # Encoder-specific configuration.
+        def _configure(self, phase_a, phase_b, phases=1):
+            if phases not in (1, 2, 4):
+                raise ValueError("phases")
+            # Configure the first channel.
+            self._pcnt.init(
+                channel=0,
+                pin=phase_a,
+                falling=self._PCNT.INCREMENT,
+                rising=self._PCNT.DECREMENT,
+                mode_pin=phase_b,
+                mode_low=self._PCNT.HOLD if phases == 1 else self._PCNT.REVERSE,
+            )
+            if phases == 4:
+                # For 4x quadrature, enable the second channel.
+                self._pcnt.init(
+                    channel=1,
+                    pin=phase_b,
+                    falling=self._PCNT.DECREMENT,
+                    rising=self._PCNT.INCREMENT,
+                    mode_pin=phase_a,
+                    mode_low=self._PCNT.REVERSE,
+                )
+            else:
+                # For 1x and 2x quadrature, disable the second channel.
+                self._pcnt.init(channel=1, pin=None, rising=self._PCNT.IGNORE)
+            self._phases = phases
+
+        def phases(self):
+            return self._phases
+
+    del _CounterBase
+
+
+del esp32
+
+
+# Delegate to built-in machine module.
+def __getattr__(attr):
+    return getattr(_machine, attr)

From 641ca2eb0624fc0df2b358f1a4652525af123fd7 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 12 Sep 2022 18:37:22 +0100
Subject: [PATCH 2646/3129] docs/library/machine: Add docs for Counter and
 Encoder.

Add documentation for `machine.Counter` and `machine.Encoder` as currently
implemented by the esp32 port, but intended to be implemented by other
ports.

Originally authored by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com> and
Jonathan Hogg <me@jonathanhogg.com>.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/esp32/quickref.rst          | 15 ++++++
 docs/library/esp32.rst           |  3 ++
 docs/library/machine.Counter.rst | 93 ++++++++++++++++++++++++++++++++
 docs/library/machine.Encoder.rst | 72 +++++++++++++++++++++++++
 docs/library/machine.rst         |  2 +
 docs/reference/glossary.rst      |  7 +++
 6 files changed, 192 insertions(+)
 create mode 100644 docs/library/machine.Counter.rst
 create mode 100644 docs/library/machine.Encoder.rst

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 7127cc402bd12..2c667a0f014db 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -587,6 +587,21 @@ Use the :ref:`esp32.PCNT <esp32.PCNT>` class::
 The PCNT hardware supports monitoring multiple pins in a single unit to
 implement quadrature decoding or up/down signal counters.
 
+See the :ref:`machine.Counter <machine.Counter>` and
+:ref:`machine.Encoder <machine.Encoder>` classes for simpler abstractions of
+common pulse counting applications::
+
+    from machine import Pin, Counter
+
+    counter = Counter(0, Pin(2))    # create a counter as above and start it
+    count = counter.value()         # read the count as an arbitrary precision signed integer
+
+    encoder = Encoder(0, Pin(12), Pin(14))    # create an encoder and begin counting
+    count = encoder.value()                   # read the count as an arbitrary precision signed integer
+
+Note that the id passed to these ``Counter()`` and ``Encoder()`` objects must be
+a PCNT id.
+
 Software SPI bus
 ----------------
 
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 0cf0ebc62636d..e5f39c7f59aa1 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -336,6 +336,9 @@ implemented as thin Python shims around :class:`PCNT`.
     value. Thus the ``IRQ_ZERO`` event will also trigger when either of these
     events occurs.
 
+See the :ref:`machine.Counter <machine.Counter>` and
+:ref:`machine.Encoder <machine.Encoder>` classes for simpler abstractions of
+common pulse counting applications.
 
 .. _esp32.RMT:
 
diff --git a/docs/library/machine.Counter.rst b/docs/library/machine.Counter.rst
new file mode 100644
index 0000000000000..f89a6d5b4f17a
--- /dev/null
+++ b/docs/library/machine.Counter.rst
@@ -0,0 +1,93 @@
+.. currentmodule:: machine
+.. _machine.Counter:
+
+class Counter -- pulse counter
+==============================
+
+Counter implements pulse counting by monitoring an input signal and counting
+rising or falling edges.
+
+Minimal example usage::
+
+    from machine import Pin, Counter
+
+    counter = Counter(0, Pin(0, Pin.IN))  # create Counter for pin 0 and begin counting
+    value = counter.value()               # retrieve current pulse count
+
+Availability: **ESP32**
+
+Constructors
+------------
+
+.. class:: Counter(id, ...)
+
+   Returns the singleton Counter object for the the given *id*. Values of *id*
+   depend on a particular port and its hardware. Values 0, 1, etc. are commonly
+   used to select hardware block #0, #1, etc.
+
+   Additional arguments are passed to the :meth:`init` method described below,
+   and will cause the Counter instance to be re-initialised and reset.
+
+   On ESP32, the *id* corresponds to a :ref:`PCNT unit <esp32.PCNT>`.
+
+Methods
+-------
+
+.. method:: Counter.init(src, *, ...)
+
+   Initialise and reset the Counter with the given parameters:
+
+   - *src* specifies the input pin as a :ref:`machine.Pin <machine.Pin>` object.
+     May be omitted on ports that have a predefined pin for a given hardware
+     block.
+
+   Additional keyword-only parameters that may be supported by a port are:
+
+   - *edge* specifies the edge to count. Either ``Counter.RISING`` (the default)
+     or ``Counter.FALLING``. *(Supported on ESP32)*
+
+   - *direction* specifies the direction to count. Either ``Counter.UP`` (the
+     default) or ``Counter.DOWN``. *(Supported on ESP32)*
+
+   - *filter_ns* specifies a minimum period of time in nanoseconds that the
+     source signal needs to be stable for a pulse to be counted. Implementations
+     should use the longest filter supported by the hardware that is less than
+     or equal to this value. The default is 0 (no filter). *(Supported on ESP32)*
+
+.. method:: Counter.deinit()
+
+   Stops the Counter, disabling any interrupts and releasing hardware resources.
+   A Soft Reset should deinitialize all Counter objects.
+
+.. method:: Counter.value([value])
+
+   Get, and optionally set, the counter value as a signed integer.
+   Implementations must aim to do the get and set atomically (i.e. without
+   leading to skipped counts).
+
+   This counter value could exceed the range of a :term:`small integer`, which
+   means that calling :meth:`Counter.value` could cause a heap allocation, but
+   implementations should aim to ensure that internal state only uses small
+   integers and therefore will not allocate until the user calls
+   :meth:`Counter.value`.
+
+   For example, on ESP32, the internal state counts overflows of the hardware
+   counter (every 32000 counts), which means that it will not exceed the small
+   integer range until ``2**30 * 32000`` counts (slightly over 1 year at 1MHz).
+
+   In general, it is recommended that you should use ``Counter.value(0)`` to reset
+   the counter (i.e. to measure the counts since the last call), and this will
+   avoid this problem.
+
+Constants
+---------
+
+.. data:: Counter.RISING
+          Counter.FALLING
+
+   Select the pulse edge.
+
+.. data:: Counter.UP
+          Counter.DOWN
+
+   Select the counting direction.
diff --git a/docs/library/machine.Encoder.rst b/docs/library/machine.Encoder.rst
new file mode 100644
index 0000000000000..fc2de32084867
--- /dev/null
+++ b/docs/library/machine.Encoder.rst
@@ -0,0 +1,72 @@
+.. currentmodule:: machine
+.. _machine.Encoder:
+
+class Encoder -- quadrature decoding
+====================================
+
+Encoder implements decoding of quadrature signals as commonly output from
+rotary encoders, by counting either up or down depending on the order of two
+input pulses.
+
+Minimal example usage::
+
+    from machine import Pin, Encoder
+
+    counter = Counter(0, Pin(0, Pin.IN), Pin(1, Pin.IN))   # create Encoder for pins 0, 1 and begin counting
+    value = counter.value()                                # retrieve current count
+
+Availability: **ESP32**
+
+Constructors
+------------
+
+.. class:: Encoder(id, ...)
+
+   Returns the singleton Encoder object for the the given *id*. Values of *id*
+   depend on a particular port and its hardware. Values 0, 1, etc. are commonly
+   used to select hardware block #0, #1, etc.
+
+   Additional arguments are passed to the :meth:`init` method described below,
+   and will cause the Encoder instance to be re-initialised and reset.
+
+   On ESP32, the *id* corresponds to a :ref:`PCNT unit <esp32.PCNT>`.
+
+Methods
+-------
+
+.. method:: Encoder.init(phase_a, phase_b, *, ...)
+
+   Initialise and reset the Encoder with the given parameters:
+
+   - *phase_a* specifies the first input pin as a
+     :ref:`machine.Pin <machine.Pin>` object.
+
+   - *phase_b* specifies the second input pin as a
+     :ref:`machine.Pin <machine.Pin>` object.
+
+   These pins may be omitted on ports that have predefined pins for a given
+   hardware block.
+
+   Additional keyword-only parameters that may be supported by a port are:
+
+   - *filter_ns* specifies a minimum period of time in nanoseconds that the
+     source signal needs to be stable for a pulse to be counted. Implementations
+     should use the longest filter supported by the hardware that is less than
+     or equal to this value. The default is 0 (no filter). *(Supported on ESP32)*
+
+   - *phases* specifies the number of signal edges to count and thus the
+     granularity of the decoding. e.g. 4 phases corresponds to "4x quadrature
+     decoding", and will result in four counts per pulse. Ports may support
+     either 1, 2, or 4 phases and the default is 1 phase. *(Supported on ESP32)*
+
+.. method:: Encoder.deinit()
+
+   Stops the Encoder, disabling any interrupts and releasing hardware resources.
+   A Soft Reset should deinitialize all Encoder objects.
+
+.. method:: Encoder.value([value])
+
+   Get, and optionally set, the encoder value as a signed integer.
+   Implementations should aim to do the get and set atomically.
+
+   See :meth:`machine.Counter.value` for details about overflow of this value.
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 3c22aa9af6524..7acaddde815bc 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -268,6 +268,8 @@ Classes
    machine.I2S.rst
    machine.RTC.rst
    machine.Timer.rst
+   machine.Counter.rst
+   machine.Encoder.rst
    machine.WDT.rst
    machine.SD.rst
    machine.SDCard.rst
diff --git a/docs/reference/glossary.rst b/docs/reference/glossary.rst
index efaa8f607f72a..ab0b22049bd67 100644
--- a/docs/reference/glossary.rst
+++ b/docs/reference/glossary.rst
@@ -188,6 +188,13 @@ Glossary
         Most MicroPython boards make a REPL available over a UART, and this is
         typically accessible on a host PC via USB.
 
+    small integer
+        MicroPython optimises the internal representation of integers such that
+        "small" values do not take up space on the heap, and calculations with
+        them do not require heap allocation. On most 32-bit ports, this
+        corresponds to values in the interval ``-2**30 <= x < 2**30``, but this
+        should be considered an implementation detail and not relied upon.
+
     stream
         Also known as a "file-like object". A Python object which provides
         sequential read-write access to the underlying data. A stream object

From 907c5e99769635678e4bfb8dda5c3c0e2aec040f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 30 Jul 2025 17:20:36 +1000
Subject: [PATCH 2647/3129] tests/extmod_hardware: Add basic tests for
 machine.Counter and Encoder.

These don't test any advanced features, just the basics.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/extmod_hardware/machine_counter.py | 90 +++++++++++++++++++++
 tests/extmod_hardware/machine_encoder.py | 99 ++++++++++++++++++++++++
 2 files changed, 189 insertions(+)
 create mode 100644 tests/extmod_hardware/machine_counter.py
 create mode 100644 tests/extmod_hardware/machine_encoder.py

diff --git a/tests/extmod_hardware/machine_counter.py b/tests/extmod_hardware/machine_counter.py
new file mode 100644
index 0000000000000..62ac1fed47ce7
--- /dev/null
+++ b/tests/extmod_hardware/machine_counter.py
@@ -0,0 +1,90 @@
+# Test machine.Counter implementation
+#
+# IMPORTANT: This test requires hardware connections: the out_pin and in_pin
+# must be wired together.
+
+try:
+    from machine import Counter
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import sys
+from machine import Pin
+
+if "esp32" in sys.platform:
+    id = 0
+    out_pin = 4
+    in_pin = 5
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+import unittest
+
+out_pin = Pin(out_pin, mode=Pin.OUT)
+in_pin = Pin(in_pin, mode=Pin.IN)
+
+
+def toggle(times):
+    for _ in range(times):
+        out_pin(1)
+        out_pin(0)
+
+
+class TestCounter(unittest.TestCase):
+    def setUp(self):
+        out_pin(0)
+        self.counter = Counter(id, in_pin)
+
+    def tearDown(self):
+        self.counter.deinit()
+
+    def assertCounter(self, value):
+        self.assertEqual(self.counter.value(), value)
+
+    def test_connections(self):
+        # Test the hardware connections are correct. If this test fails, all tests will fail.
+        out_pin(1)
+        self.assertEqual(1, in_pin())
+        out_pin(0)
+        self.assertEqual(0, in_pin())
+
+    def test_count_rising(self):
+        self.assertCounter(0)
+        toggle(100)
+        self.assertCounter(100)
+        out_pin(1)
+        self.assertEqual(self.counter.value(0), 101)
+        self.assertCounter(0)  # calling value(0) resets
+        out_pin(0)
+        self.assertCounter(0)  # no rising edge
+        out_pin(1)
+        self.assertCounter(1)
+
+    def test_change_directions(self):
+        self.assertCounter(0)
+        toggle(100)
+        self.assertCounter(100)
+        self.counter.init(in_pin, direction=Counter.DOWN)
+        self.assertCounter(0)  # calling init() zeroes the counter
+        self.counter.value(100)  # need to manually reset the value
+        self.assertCounter(100)
+        toggle(25)
+        self.assertCounter(75)
+
+    def test_count_falling(self):
+        self.counter.init(in_pin, direction=Counter.UP, edge=Counter.FALLING)
+        toggle(20)
+        self.assertCounter(20)
+        out_pin(1)
+        self.assertCounter(20)  # no falling edge
+        out_pin(0)
+        self.assertCounter(21)
+        self.counter.value(-(2**24))
+        toggle(20)
+        self.assertCounter(-(2**24 - 20))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/extmod_hardware/machine_encoder.py b/tests/extmod_hardware/machine_encoder.py
new file mode 100644
index 0000000000000..9bd2bb464178c
--- /dev/null
+++ b/tests/extmod_hardware/machine_encoder.py
@@ -0,0 +1,99 @@
+# Test machine.Encoder implementation
+#
+# IMPORTANT: This test requires hardware connections:
+# - out0_pin and in0_pin must be wired together.
+# - out1_pin and in1_pin must be wired together.
+
+try:
+    from machine import Encoder
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import sys
+from machine import Pin
+
+if "esp32" in sys.platform:
+    id = 0
+    out0_pin = 4
+    in0_pin = 5
+    out1_pin = 12
+    in1_pin = 13
+else:
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
+import unittest
+
+out0_pin = Pin(out0_pin, mode=Pin.OUT)
+in0_pin = Pin(in0_pin, mode=Pin.IN)
+out1_pin = Pin(out1_pin, mode=Pin.OUT)
+in1_pin = Pin(in1_pin, mode=Pin.IN)
+
+
+class TestEncoder(unittest.TestCase):
+    def setUp(self):
+        out0_pin(0)
+        out1_pin(0)
+        self.enc = Encoder(id, in0_pin, in1_pin)
+        self.pulses = 0  # track the expected encoder position in software
+
+    def tearDown(self):
+        self.enc.deinit()
+
+    def rotate(self, pulses):
+        for _ in range(abs(pulses)):
+            self.pulses += 1 if (pulses > 0) else -1
+            q = self.pulses % 4
+            # Only one pin should change state each "step" so output won't glitch
+            out0_pin(q in (1, 2))
+            out1_pin(q in (2, 3))
+
+    def assertPosition(self, value):
+        self.assertEqual(self.enc.value(), value)
+
+    def test_connections(self):
+        # Test the hardware connections are correct. If this test fails, all tests will fail.
+        for ch, outp, inp in ((0, out0_pin, in0_pin), (1, out1_pin, in1_pin)):
+            print("Testing channel ", ch)
+            outp(1)
+            self.assertEqual(1, inp())
+            outp(0)
+            self.assertEqual(0, inp())
+
+    def test_basics(self):
+        self.assertPosition(0)
+        self.rotate(100)
+        self.assertPosition(100 // 4)
+        self.rotate(-100)
+        self.assertPosition(0)
+
+    def test_partial(self):
+        # With phase=1 (default), need 4x pulses to count a rotation
+        self.assertPosition(0)
+        self.rotate(1)
+        self.assertPosition(0)
+        self.rotate(1)
+        self.assertPosition(0)
+        self.rotate(1)
+        self.assertPosition(1)  # only 3 pulses to count first rotation?
+        self.rotate(1)
+        self.assertPosition(1)
+        self.rotate(1)
+        self.assertPosition(1)
+        self.rotate(1)
+        self.assertPosition(1)
+        self.rotate(1)
+        self.assertPosition(2)  # 4 for next rotation
+        self.rotate(-1)
+        self.assertPosition(1)
+        self.rotate(-4)
+        self.assertPosition(0)
+        self.rotate(-4)
+        self.assertPosition(-1)
+        self.rotate(-3)
+        self.assertPosition(-1)
+
+
+if __name__ == "__main__":
+    unittest.main()

From 026a20da3e803328c4fc9bce66b9931d18f12c1e Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Thu, 1 May 2025 17:12:45 +0200
Subject: [PATCH 2648/3129] tools/mpremote: Add platformdirs dependency to
 requirements.txt.

Needed to easily find the user configuration file.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 tools/mpremote/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mpremote/requirements.txt b/tools/mpremote/requirements.txt
index 6209cde5c331d..0aa2bb42a951e 100644
--- a/tools/mpremote/requirements.txt
+++ b/tools/mpremote/requirements.txt
@@ -1,2 +1,3 @@
 pyserial >= 3.3
 importlib_metadata >= 1.4; python_version < "3.8"
+platformdirs >= 4.3.7

From 64b3944b0121710199d8d5958415ce71f21d67a7 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Thu, 1 May 2025 17:17:06 +0200
Subject: [PATCH 2649/3129] tools/mpremote: Locate config.py location across
 different host OSes.

Use `platformdirs.user_config_dir()` (see
https://platformdirs.readthedocs.io/en/latest/api.html#user-config-directory)
to provide portability across many different OSes and configuration styles.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 tools/mpremote/mpremote/main.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 0aec1efad1431..b31186ba2e1c9 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -22,6 +22,8 @@
 from collections.abc import Mapping
 from textwrap import dedent
 
+import platformdirs
+
 from .commands import (
     CommandError,
     do_connect,
@@ -439,13 +441,7 @@ def load_user_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)
+    path = platformdirs.user_config_dir(appname=_PROG, appauthor=False)
     config_file = os.path.join(path, "config.py")
 
     # Check if config file exists.
@@ -457,6 +453,9 @@ def load_user_config():
         config_data = f.read()
     prev_cwd = os.getcwd()
     os.chdir(path)
+    # Pass in the config path so that the config file can use it.
+    config.__dict__["config_path"] = path
+    config.__dict__["__file__"] = config_file
     exec(config_data, config.__dict__)
     os.chdir(prev_cwd)
 

From a9dd741e66a6afba3a6e862d134246d157a56777 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Thu, 1 May 2025 17:25:19 +0200
Subject: [PATCH 2650/3129] docs/reference/mpremote: Document location of
 config file.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 docs/reference/mpremote.rst | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index bee008c637319..8aecc3a5d4831 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -108,7 +108,7 @@ The full list of supported commands are:
   **Note:** Instead of using the ``connect`` command, there are several
   :ref:`pre-defined shortcuts <mpremote_shortcuts>` for common device paths. For
   example the ``a0`` shortcut command is equivalent to
-  ``connect /dev/ttyACM0`` (Linux), or ``c0`` for ``COM0`` (Windows).
+  ``connect /dev/ttyACM0`` (Linux), or ``c1`` for ``COM1`` (Windows).
 
   **Note:** The ``auto`` option will only detect USB serial ports, i.e. a serial
   port that has an associated USB VID/PID (i.e. CDC/ACM or FTDI-style
@@ -487,9 +487,16 @@ Shortcuts can be defined using the macro system.  Built-in shortcuts are:
 
 - ``cat``, ``edit``, ``ls``, ``cp``, ``rm``, ``mkdir``, ``rmdir``, ``touch``: Aliases for ``fs <sub-command>``
 
-Additional shortcuts can be defined by in user-configuration files, which is
-located at ``.config/mpremote/config.py``. This file should define a
-dictionary named ``commands``. The keys of this dictionary are the shortcuts
+Additional shortcuts can be defined in the user configuration file ``mpremote/config.py``,
+located in the User Configuration Directory.
+The correct location for each OS is determined using the ``platformdirs`` module.
+
+This is typically:
+- ``$XDG_CONFIG_HOME/mpremote/config.py``
+- ``$HOME/.config/mpremote/config.py``
+- ``$env:LOCALAPPDATA/mpremote/config.py``
+
+The ``config.py``` file should define a dictionary named ``commands``. The keys of this dictionary are the shortcuts
 and the values are either a string or a list-of-strings:
 
 .. code-block:: python3

From e6739fc87e9d633484aeb72fa2efac14e4ff7681 Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Tue, 8 Jul 2025 14:02:42 +0100
Subject: [PATCH 2651/3129] rp2/rp2_flash: Add binary info for ROMFS.

This describes the ROMFS location and size in Pico SDK's binary declaration
format, so it can be read from a .uf2 file for use with various tools.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 ports/rp2/rp2_flash.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index d6b9e13653315..4d41d45733c04 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -103,6 +103,18 @@ bi_decl(bi_block_device(
     BINARY_INFO_BLOCK_DEV_FLAG_WRITE |
     BINARY_INFO_BLOCK_DEV_FLAG_PT_UNKNOWN));
 
+#if MICROPY_HW_ROMFS_BYTES
+// Tag the ROMFS partition in the binary
+bi_decl(bi_block_device(
+    BINARY_INFO_TAG_MICROPYTHON,
+    "ROMFS",
+    XIP_BASE + MICROPY_HW_ROMFS_BASE,
+    MICROPY_HW_ROMFS_BYTES,
+    NULL,
+    BINARY_INFO_BLOCK_DEV_FLAG_READ |
+    BINARY_INFO_BLOCK_DEV_FLAG_PT_UNKNOWN));
+#endif
+
 // This is a workaround to pico-sdk #2201: https://github.com/raspberrypi/pico-sdk/issues/2201
 // which means the multicore_lockout_victim_is_initialized returns true even after core1 is reset.
 static bool use_multicore_lockout(void) {

From 3c9546ea0911b50d4b85ad4046864c90f84b3fd3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 2 Aug 2025 08:52:05 +1000
Subject: [PATCH 2652/3129] esp32/mpconfigport: Disable I2CTarget on ESP32-C6
 to reduce code size.

I2CTarget costs about 8k of flash size on ESP32-S2, and about 11k on
ESP32-C6.  The ESP32-C6 only has about 8k remaining, so disable I2CTarget
on that SoC until more flash can be made available.

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

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 48ad39ef7ed17..cc10fd0b7bbb4 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -140,7 +140,8 @@
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1 (1)
 // I2C target hardware is limited on ESP32 (eg read event comes after the read) so we only support newer SoCs.
-#define MICROPY_PY_MACHINE_I2C_TARGET       (SOC_I2C_SUPPORT_SLAVE && !CONFIG_IDF_TARGET_ESP32)
+// ESP32C6 does not have enough flash space so also disable it on that SoC.
+#define MICROPY_PY_MACHINE_I2C_TARGET       (SOC_I2C_SUPPORT_SLAVE && !CONFIG_IDF_TARGET_ESP32 && !CONFIG_IDF_TARGET_ESP32C6)
 #define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/esp32/machine_i2c_target.c"
 #define MICROPY_PY_MACHINE_I2C_TARGET_MAX   (2)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)

From 658a2e3dbd0316204a13f2478d98ea3f8649f064 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 2 Aug 2025 08:39:16 +1000
Subject: [PATCH 2653/3129] github/workflows: Add a CI job to build ESP32-C2
 and ESP32-C6 boards.

So that all six supported SoCs are built by CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 1 +
 tools/ci.sh                       | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 4c07f89437757..36ab341cfcdd2 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -25,6 +25,7 @@ jobs:
         ci_func:  # names are functions in ci.sh
           - esp32_build_cmod_spiram_s2
           - esp32_build_s3_c3
+          - esp32_build_c2_c6
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/tools/ci.sh b/tools/ci.sh
index d787cbcf0733d..8f045639b80c9 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -214,6 +214,13 @@ function ci_esp32_build_s3_c3 {
     make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C3
 }
 
+function ci_esp32_build_c2_c6 {
+    ci_esp32_build_common
+
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C2
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C6
+}
+
 ########################################################################################
 # ports/esp8266
 

From c0252d73c6499cf8c09fa57e17f4b530315b0ee0 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 2 Aug 2025 15:24:45 -0500
Subject: [PATCH 2654/3129] py/parse: Fix missing nlr_pop call in complex path
 of binary_op_maybe.

Reproducer (needs to be run as one compilation unit):

    ans = (-1) ** 2.3
    aa

Fixes issue #17815.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/parse.c b/py/parse.c
index 91eea3e368907..6260987b28a35 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -671,13 +671,13 @@ static bool binary_op_maybe(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs, mp_ob
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_obj_t tmp = mp_binary_op(op, lhs, rhs);
+        nlr_pop();
         #if MICROPY_PY_BUILTINS_COMPLEX
         if (mp_obj_is_type(tmp, &mp_type_complex)) {
             return false;
         }
         #endif
         *res = tmp;
-        nlr_pop();
         return true;
     } else {
         return false;

From 7c8ae78a0384ce3fac2e9421df2590ef7d7031ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Aug 2025 01:45:30 +1000
Subject: [PATCH 2655/3129] lib/micropython-lib: Update submodule to latest.

This brings in:
- lora: fix SNR value in SX126x received packets
- utop: add initial implementation for ESP32
- utop: print MicroPython memory info
- utop: print IDF heap details
- urllib.urequest: add support for headers to urequest.urlopen
- aiorepl: use blocking reads for raw REPL and raw paste
- errno: add ENOTCONN constant
- logging: allow logging.exception helper to handle tracebacks
- aioble-l2cap: raise correct error if l2cap disconnects during send
- abc: add ABC base class
- aiohttp: fix partial reads by using readexactly
- aiorepl: handle stream shutdown

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 5b496e944ec04..34c4ee1647ac4 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 5b496e944ec045177afa1620920a168410b7f60b
+Subproject commit 34c4ee1647ac4b177ae40adf0ec514660e433dc0

From 255d74b5a8c31ec06d1c2c528f7888f6c2dfc246 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Aug 2025 02:00:47 +1000
Subject: [PATCH 2656/3129] renesas-ra/mpconfigport: Enable
 MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE.

This setting was missed in df05caea6c6437a8b4756ec502a5e6210f4b6256.  It's
needed for this port to pass its `tests/ports/renesas-ra/modtime.py` test.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 868cdbc7d6ada..70d38e7d20e0e 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -99,6 +99,7 @@
 #ifndef MICROPY_FLOAT_IMPL // can be configured by each board via mpconfigboard.mk
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #endif
+#define MICROPY_TIME_SUPPORT_Y1969_AND_BEFORE (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_SCHEDULER_DEPTH     (8)
 #define MICROPY_SCHEDULER_STATIC_NODES (1)

From d5ecda05eb743839e9011f3d23657b39cd05e6c0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Aug 2025 10:33:26 +1000
Subject: [PATCH 2657/3129] ports: Allow MICROPY_PY_MACHINE_I2C_TARGET to be
 disabled by board cfg.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpconfigport.h          | 2 ++
 ports/esp32/mpconfigport.h         | 2 ++
 ports/mimxrt/mpconfigport.h        | 2 ++
 ports/rp2/mpconfigport.h           | 2 ++
 ports/stm32/mpconfigboard_common.h | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index a8c8c842977ed..8a65721bb0ffc 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -132,10 +132,12 @@
 #define MICROPY_PY_MACHINE_PULSE                (1)
 #define MICROPY_PY_MACHINE_I2C                  (MICROPY_HW_ENABLE_HW_I2C)
 #define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1  (1)
+#ifndef MICROPY_PY_MACHINE_I2C_TARGET
 #define MICROPY_PY_MACHINE_I2C_TARGET           (MICROPY_HW_ENABLE_HW_I2C)
 #define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/alif/machine_i2c_target.c"
 #define MICROPY_PY_MACHINE_I2C_TARGET_MAX       (4)
 #define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ  (1)
+#endif
 #define MICROPY_PY_MACHINE_SOFTI2C              (1)
 #define MICROPY_PY_MACHINE_SPI                  (1)
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index cc10fd0b7bbb4..e47b333c73698 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -139,11 +139,13 @@
 #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)
+#ifndef MICROPY_PY_MACHINE_I2C_TARGET
 // I2C target hardware is limited on ESP32 (eg read event comes after the read) so we only support newer SoCs.
 // ESP32C6 does not have enough flash space so also disable it on that SoC.
 #define MICROPY_PY_MACHINE_I2C_TARGET       (SOC_I2C_SUPPORT_SLAVE && !CONFIG_IDF_TARGET_ESP32 && !CONFIG_IDF_TARGET_ESP32C6)
 #define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/esp32/machine_i2c_target.c"
 #define MICROPY_PY_MACHINE_I2C_TARGET_MAX   (2)
+#endif
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 8ceb3b418370b..3cf6550d7b07b 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -92,11 +92,13 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/mimxrt/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C              (1)
+#ifndef MICROPY_PY_MACHINE_I2C_TARGET
 #define MICROPY_PY_MACHINE_I2C_TARGET       (1)
 #define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/mimxrt/machine_i2c_target.c"
 #define MICROPY_PY_MACHINE_I2C_TARGET_MAX   (FSL_FEATURE_SOC_LPI2C_COUNT)
 #define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ (1)
 #define MICROPY_PY_MACHINE_I2C_TARGET_FINALISER (1)
+#endif
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (0)
 #endif
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index d35563bd07028..c312293ace6e9 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -171,10 +171,12 @@
 #define MICROPY_PY_MACHINE_PWM                  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE      "ports/rp2/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C                  (1)
+#ifndef MICROPY_PY_MACHINE_I2C_TARGET
 #define MICROPY_PY_MACHINE_I2C_TARGET           (1)
 #define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/rp2/machine_i2c_target.c"
 #define MICROPY_PY_MACHINE_I2C_TARGET_MAX       (2)
 #define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ  (1)
+#endif
 #define MICROPY_PY_MACHINE_SOFTI2C              (1)
 #define MICROPY_PY_MACHINE_I2S                  (1)
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE      "ports/rp2/machine_i2s.c"
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index dcbbbccceb6b0..a8e50be5c6a8a 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -639,11 +639,13 @@
 #if defined(MICROPY_HW_I2C1_SCL) || defined(MICROPY_HW_I2C2_SCL) \
     || defined(MICROPY_HW_I2C3_SCL) || defined(MICROPY_HW_I2C4_SCL)
 #define MICROPY_HW_ENABLE_HW_I2C (1)
+#ifndef MICROPY_HW_ENABLE_HW_I2C_TARGET
 #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
 #define MICROPY_HW_ENABLE_HW_I2C_TARGET (1)
 #else
 #define MICROPY_HW_ENABLE_HW_I2C_TARGET (0)
 #endif
+#endif
 #else
 #define MICROPY_HW_ENABLE_HW_I2C (0)
 #define MICROPY_HW_ENABLE_HW_I2C_TARGET (0)

From ce109af712452474dfe3864f82b5430f4e2a5ff0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Aug 2025 15:47:15 +1000
Subject: [PATCH 2658/3129] esp32/machine_timer: Enable timer clock source for
 ESP32C6.

Otherwise the PLL is not enabled.  These changes are adapted from
`timer_legacy.h` in ESP-IDF.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_timer.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index a104288f6ee3c..faa47d59afc10 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -38,6 +38,8 @@
 #include "hal/timer_hal.h"
 #include "hal/timer_ll.h"
 #include "soc/timer_periph.h"
+#include "esp_private/esp_clk_tree_common.h"
+#include "esp_private/periph_ctrl.h"
 #include "machine_timer.h"
 
 #define TIMER_DIVIDER  8
@@ -163,8 +165,18 @@ static void machine_timer_isr_handler(machine_timer_obj_t *self) {
 void machine_timer_enable(machine_timer_obj_t *self) {
     // Initialise the timer.
     timer_hal_init(&self->hal_context, self->group, self->index);
+
+    PERIPH_RCC_ACQUIRE_ATOMIC(timer_group_periph_signals.groups[self->index].module, ref_count) {
+        if (ref_count == 0) {
+            timer_ll_enable_bus_clock(self->index, true);
+            timer_ll_reset_register(self->index);
+        }
+    }
+
     timer_ll_enable_counter(self->hal_context.dev, self->index, false);
+    esp_clk_tree_enable_src(GPTIMER_CLK_SRC_DEFAULT, true);
     timer_ll_set_clock_source(self->hal_context.dev, self->index, GPTIMER_CLK_SRC_DEFAULT);
+    timer_ll_enable_clock(self->hal_context.dev, self->index, true);
     timer_ll_set_clock_prescale(self->hal_context.dev, self->index, TIMER_DIVIDER);
     timer_hal_set_counter_value(&self->hal_context, 0);
     timer_ll_set_count_direction(self->hal_context.dev, self->index, GPTIMER_COUNT_UP);

From 593ae04eeb06b6fd7c6232eb41912b8d26170ddd Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Aug 2025 15:57:38 +1000
Subject: [PATCH 2659/3129] esp32/machine_timer: Fix machine.Timer() tick
 frequency on ESP32C2,C6.

Also future-proofs this code for other chips. Apart form C6 and C2, all
currently supported chips use APB clock for GPTIMER_CLK_SRC_DEFAULT.

ESP32-C2 uses 40MHz PLL but APB_CLK_FREQ was 26MHz.
ESP32-C6 uses 80MHz PLL but APB_CLK_FREQ was 40MHz.

Implementation now gets the correct frequency from ESP-IDF.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_timer.c | 24 +++++++++++++++---------
 ports/esp32/machine_timer.h |  9 ++-------
 ports/esp32/machine_uart.c  |  4 ++--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index faa47d59afc10..3fb893aadf1ab 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -42,11 +42,9 @@
 #include "esp_private/periph_ctrl.h"
 #include "machine_timer.h"
 
+#define TIMER_CLK_SRC GPTIMER_CLK_SRC_DEFAULT
 #define TIMER_DIVIDER  8
 
-// TIMER_BASE_CLK is normally 80MHz. TIMER_DIVIDER ought to divide this exactly
-#define TIMER_SCALE    (APB_CLK_FREQ / TIMER_DIVIDER)
-
 #define TIMER_FLAGS    0
 
 const mp_obj_type_t machine_timer_type;
@@ -54,6 +52,14 @@ const mp_obj_type_t machine_timer_type;
 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);
 static mp_obj_t machine_timer_deinit(mp_obj_t self_in);
 
+uint32_t machine_timer_freq_hz(void) {
+    // The timer source clock is APB or a fixed PLL (depending on chip), both constant frequency.
+    uint32_t freq;
+    check_esp_err(esp_clk_tree_src_get_freq_hz(TIMER_CLK_SRC, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &freq));
+    assert(freq % TIMER_DIVIDER == 0); // Source clock should divide evenly into TIMER_DIVIDER
+    return freq / TIMER_DIVIDER;
+}
+
 void machine_timer_deinit_all(void) {
     // Disable, deallocate and remove all timers from list
     machine_timer_obj_t **t = &MP_STATE_PORT(machine_timer_obj_head);
@@ -68,7 +74,7 @@ void machine_timer_deinit_all(void) {
 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 = self_in;
     qstr mode = self->repeat ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
-    uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms
+    uint64_t period = self->period / (machine_timer_freq_hz() / 1000); // convert to ms
     #if SOC_TIMER_GROUP_TIMERS_PER_GROUP == 1
     mp_printf(print, "Timer(%u, mode=%q, period=%lu)", self->group, mode, period);
     #else
@@ -174,8 +180,8 @@ void machine_timer_enable(machine_timer_obj_t *self) {
     }
 
     timer_ll_enable_counter(self->hal_context.dev, self->index, false);
-    esp_clk_tree_enable_src(GPTIMER_CLK_SRC_DEFAULT, true);
-    timer_ll_set_clock_source(self->hal_context.dev, self->index, GPTIMER_CLK_SRC_DEFAULT);
+    esp_clk_tree_enable_src(TIMER_CLK_SRC, true);
+    timer_ll_set_clock_source(self->hal_context.dev, self->index, TIMER_CLK_SRC);
     timer_ll_enable_clock(self->hal_context.dev, self->index, true);
     timer_ll_set_clock_prescale(self->hal_context.dev, self->index, TIMER_DIVIDER);
     timer_hal_set_counter_value(&self->hal_context, 0);
@@ -236,7 +242,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
 
     #if MICROPY_PY_BUILTINS_FLOAT
     if (args[ARG_freq].u_obj != mp_const_none) {
-        self->period = (uint64_t)(TIMER_SCALE / mp_obj_get_float(args[ARG_freq].u_obj));
+        self->period = (uint64_t)(machine_timer_freq_hz() / mp_obj_get_float(args[ARG_freq].u_obj));
     }
     #else
     if (args[ARG_freq].u_int != 0xffffffff) {
@@ -244,7 +250,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
     }
     #endif
     else {
-        self->period = (((uint64_t)args[ARG_period].u_int) * TIMER_SCALE) / args[ARG_tick_hz].u_int;
+        self->period = (((uint64_t)args[ARG_period].u_int) * machine_timer_freq_hz()) / args[ARG_tick_hz].u_int;
     }
 
     self->repeat = args[ARG_mode].u_int;
@@ -280,7 +286,7 @@ static mp_obj_t machine_timer_value(mp_obj_t self_in) {
         mp_raise_ValueError(MP_ERROR_TEXT("timer not set"));
     }
     uint64_t result = timer_ll_get_counter_value(self->hal_context.dev, self->index);
-    return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result / (TIMER_SCALE / 1000))); // value in ms
+    return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result / (machine_timer_freq_hz() / 1000))); // value in ms
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_value_obj, machine_timer_value);
 
diff --git a/ports/esp32/machine_timer.h b/ports/esp32/machine_timer.h
index 10fe2f39c90ae..5dd0ce95ac802 100644
--- a/ports/esp32/machine_timer.h
+++ b/ports/esp32/machine_timer.h
@@ -34,13 +34,6 @@
 #include "hal/timer_ll.h"
 #include "soc/timer_periph.h"
 
-#define TIMER_DIVIDER  8
-
-// TIMER_BASE_CLK is normally 80MHz. TIMER_DIVIDER ought to divide this exactly
-#define TIMER_SCALE    (APB_CLK_FREQ / TIMER_DIVIDER)
-
-#define TIMER_FLAGS    0
-
 typedef struct _machine_timer_obj_t {
     mp_obj_base_t base;
 
@@ -64,4 +57,6 @@ machine_timer_obj_t *machine_timer_create(mp_uint_t timer);
 void machine_timer_enable(machine_timer_obj_t *self);
 void machine_timer_disable(machine_timer_obj_t *self);
 
+uint32_t machine_timer_freq_hz(void);
+
 #endif // MICROPY_INCLUDED_ESP32_MACHINE_TIMER_H
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 661c07138e535..c4dab2cae5c81 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -58,7 +58,7 @@
 #define UART_IRQ_RXIDLE (0x1000)
 #define UART_IRQ_BREAK (1 << UART_BREAK)
 #define MP_UART_ALLOWED_FLAGS (UART_IRQ_RX | UART_IRQ_RXIDLE | UART_IRQ_BREAK)
-#define RXIDLE_TIMER_MIN (5000)  // 500 us
+#define RXIDLE_TIMER_MIN (machine_timer_freq_hz() * 5 / 10000) // 500us minimum rxidle time
 #define UART_QUEUE_SIZE (3)
 
 enum {
@@ -535,7 +535,7 @@ static void uart_irq_configure_timer(machine_uart_obj_t *self, mp_uint_t trigger
         self->mp_irq_obj->ishard = false;
         uint32_t baudrate;
         uart_get_baudrate(self->uart_num, &baudrate);
-        mp_int_t period = TIMER_SCALE * 20 / baudrate + 1;
+        mp_int_t period = machine_timer_freq_hz() * 20 / baudrate + 1;
         if (period < RXIDLE_TIMER_MIN) {
             period = RXIDLE_TIMER_MIN;
         }

From 4ce2dd2cdab6e57f3982fc899f15a2103d71b0be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 9 Aug 2025 23:31:31 +1000
Subject: [PATCH 2660/3129] all: Bump version to 1.26.0.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index ed5ccccb6a52a..8775b74bb61bc 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -32,7 +32,7 @@
 #define MICROPY_VERSION_MAJOR 1
 #define MICROPY_VERSION_MINOR 26
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 1
+#define MICROPY_VERSION_PRERELEASE 0
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From 7e8705fe2bdb083535e85c206b9fed9d2754e665 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 10 Aug 2025 08:42:11 +1000
Subject: [PATCH 2661/3129] all: Bump version to 1.27.0-preview.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 8775b74bb61bc..dd41ff6a70867 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -30,9 +30,9 @@
 // as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
 // are unavailable.
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 26
+#define MICROPY_VERSION_MINOR 27
 #define MICROPY_VERSION_MICRO 0
-#define MICROPY_VERSION_PRERELEASE 0
+#define MICROPY_VERSION_PRERELEASE 1
 
 // Combined version as a 32-bit number for convenience to allow version
 // comparison. Doesn't include prerelease state.

From c35427cbdbe105c8a3be099f8fd2946fa96c4a22 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 26 Jul 2025 17:31:24 +1000
Subject: [PATCH 2662/3129] tests/run-tests.py: Move tests to skip with native
 emitter to a list.

This makes `run-tests.py` a little more organised, by putting all the
tests-to-skip-when-using-the-native-emitter in a dedicated list.

This should make it easier to maintain the list, and understand why a test
is there.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 85 ++++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 48dfc2f26e070..cb3a2c3cd1630 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -102,6 +102,48 @@ def open(self, path, mode):
 # Platforms associated with the unix port, values of `sys.platform`.
 PC_PLATFORMS = ("darwin", "linux", "win32")
 
+# Tests to skip for specific emitters.
+emitter_tests_to_skip = {
+    # Some tests are known to fail with native emitter.
+    # Remove them from the below when they work.
+    "native": (
+        # These require raise_varargs.
+        "basics/gen_yield_from_close.py",
+        "basics/try_finally_return2.py",
+        "basics/try_reraise.py",
+        "basics/try_reraise2.py",
+        "misc/features.py",
+        # These require checking for unbound local.
+        "basics/annotate_var.py",
+        "basics/del_deref.py",
+        "basics/del_local.py",
+        "basics/scope_implicit.py",
+        "basics/unboundlocal.py",
+        # These require "raise from".
+        "basics/exception_chain.py",
+        # These require proper traceback info.
+        "basics/sys_tracebacklimit.py",
+        "misc/print_exception.py",
+        "micropython/emg_exc.py",
+        "micropython/heapalloc_traceback.py",
+        "micropython/opt_level_lineno.py",
+        # These require stack-allocated slice optimisation.
+        "micropython/heapalloc_slice.py",
+        # These require running the scheduler.
+        "micropython/schedule.py",
+        "extmod/asyncio_event_queue.py",
+        "extmod/asyncio_iterator_event.py",
+        # These require sys.exc_info().
+        "misc/sys_exc_info.py",
+        # These require sys.settrace().
+        "misc/sys_settrace_features.py",
+        "misc/sys_settrace_generator.py",
+        "misc/sys_settrace_loop.py",
+        # These are bytecode-specific tests.
+        "stress/bytecode_limit.py",
+    ),
+}
+
 # Tests to skip on specific targets.
 # These are tests that are difficult to detect that they should not be run on the given target.
 platform_tests_to_skip = {
@@ -824,6 +866,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         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 emitter-specific tests.
+    skip_tests.update(emitter_tests_to_skip.get(args.emit, ()))
+
     # Skip platform-specific tests.
     skip_tests.update(platform_tests_to_skip.get(args.platform, ()))
 
@@ -837,46 +882,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             # Works but CPython uses '\' path separator
             skip_tests.add("import/import_file.py")
 
-    # Some tests are known to fail with native emitter
-    # Remove them from the below when they work
-    if args.emit == "native":
-        skip_tests.add("basics/gen_yield_from_close.py")  # require raise_varargs
-        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/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("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("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
-        skip_tests.add(
-            "micropython/heapalloc_slice.py"
-        )  # because native doesn't do the stack-allocated slice optimisation
-        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
-        skip_tests.add("stress/bytecode_limit.py")  # bytecode specific test
-        skip_tests.add("extmod/asyncio_event_queue.py")  # native can't run schedule
-        skip_tests.add("extmod/asyncio_iterator_event.py")  # native can't run schedule
-
     def run_one_test(test_file):
         test_file = test_file.replace("\\", "/")
         test_file_abspath = os.path.abspath(test_file).replace("\\", "/")

From 1401fdb8b39bf08e9ed9d4c1293207a6bdc93cf8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 26 Jul 2025 19:11:36 +1000
Subject: [PATCH 2663/3129] tests/run-tests.py: Run tests-with-regex-output as
 normal tests.

Some tests (currently given by the `special_tests` list) have output which
must be mached via a regex, because it can change from run to run (eg the
address of an object is printed).  These tests are currently classified as
`is_special` in the test runner, which means they get special treatment.
In particular they don't set the emitter as specified by `args.emit`.  That
means these tests do not run via .mpy or using the native emitter, even if
those options are given on the command line.

This commit fixes that by considering `is_special` as different to
`tests_with_regex_output`.  The former is used for things like target
feature detection (which are not really tests) and when extra command line
options need to be passed to the unix micropython executable.  The latter
(now called `tests_with_regex_output`) are specifically for tests that have
output to be matched via regex.

The `thread_exc2.py` test now needs to be excluded when running using the
native emitter, because the native emitter doesn't print traceback info.
And the `sys_settrace_cov.py` test needs to be excluded because set-trace
output is different with the native emitter.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index cb3a2c3cd1630..859f16f484a85 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -127,6 +127,7 @@ def open(self, path, mode):
         "micropython/emg_exc.py",
         "micropython/heapalloc_traceback.py",
         "micropython/opt_level_lineno.py",
+        "thread/thread_exc2.py",
         # These require stack-allocated slice optimisation.
         "micropython/heapalloc_slice.py",
         # These require running the scheduler.
@@ -136,6 +137,7 @@ def open(self, path, mode):
         # These require sys.exc_info().
         "misc/sys_exc_info.py",
         # These require sys.settrace().
+        "misc/sys_settrace_cov.py",
         "misc/sys_settrace_features.py",
         "misc/sys_settrace_generator.py",
         "misc/sys_settrace_loop.py",
@@ -392,7 +394,7 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
     return had_crash, output_mupy
 
 
-special_tests = [
+tests_with_regex_output = [
     base_path(file)
     for file in (
         "micropython/meminfo.py",
@@ -409,10 +411,7 @@ def run_micropython(pyb, args, test_file, test_file_abspath, is_special=False):
     had_crash = False
     if pyb is None:
         # run on PC
-        if (
-            test_file_abspath.startswith((base_path("cmdline/"), base_path("feature_check/")))
-            or test_file_abspath in special_tests
-        ):
+        if test_file_abspath.startswith((base_path("cmdline/"), base_path("feature_check/"))):
             # special handling for tests of the unix cmdline program
             is_special = True
 
@@ -544,7 +543,7 @@ def send_get(what):
     if is_special and not had_crash and b"\nSKIP\n" in output_mupy:
         return b"SKIP\n"
 
-    if is_special or test_file_abspath in special_tests:
+    if is_special or test_file_abspath in tests_with_regex_output:
         # convert parts of the output that are not stable across runs
         with open(test_file + ".exp", "rb") as f:
             lines_exp = []

From 1273751a3b6f8a14679378e2e082e03979cb2ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 22 Jul 2025 15:57:49 +0200
Subject: [PATCH 2664/3129] esp32: Support building against IDFv5.5.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/boards/sdkconfig.base |  1 +
 ports/esp32/esp32_common.cmake    |  2 +-
 ports/esp32/machine_timer.c       |  5 +++++
 ports/esp32/modespnow.c           | 11 ++++++++++-
 ports/esp32/network_wlan.c        |  7 ++++++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 4bbccf77d17d7..78b09ec6b24b0 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -119,6 +119,7 @@ CONFIG_UART_ISR_IN_IRAM=y
 # IDF 5 deprecated
 CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_TOUCH_SUPPRESS_DEPRECATE_WARN=y
 
 CONFIG_ETH_USE_SPI_ETHERNET=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 9e8acf8897c6a..79a60adac9f36 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -265,7 +265,7 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
 
 # Add additional extmod and usermod components.
 if (MICROPY_PY_BTREE)
-    target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
+    target_link_libraries(${MICROPY_TARGET} $<TARGET_OBJECTS:micropy_extmod_btree>)
 endif()
 target_link_libraries(${MICROPY_TARGET} usermod)
 
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 3fb893aadf1ab..b0292a0379fea 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -181,8 +181,13 @@ void machine_timer_enable(machine_timer_obj_t *self) {
 
     timer_ll_enable_counter(self->hal_context.dev, self->index, false);
     esp_clk_tree_enable_src(TIMER_CLK_SRC, true);
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 5, 0)
     timer_ll_set_clock_source(self->hal_context.dev, self->index, TIMER_CLK_SRC);
     timer_ll_enable_clock(self->hal_context.dev, self->index, true);
+    #else
+    timer_ll_set_clock_source(self->group, self->index, TIMER_CLK_SRC);
+    timer_ll_enable_clock(self->group, self->index, true);
+    #endif
     timer_ll_set_clock_prescale(self->hal_context.dev, self->index, TIMER_DIVIDER);
     timer_hal_set_counter_value(&self->hal_context, 0);
     timer_ll_set_count_direction(self->hal_context.dev, self->index, GPTIMER_COUNT_UP);
diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index 7873ff8977876..ab50032ffeb51 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -179,7 +179,11 @@ static mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args,
 }
 
 // Forward declare the send and recv ESPNow callbacks
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 5, 0)
 static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
+#else
+static void send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status);
+#endif
 
 static void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len);
 
@@ -539,7 +543,12 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow_send_obj, 2, 4, espnow_send);
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send() logic.
-static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) {
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 5, 0)
+static void send_cb(const uint8_t *mac_addr, esp_now_send_status_t status)
+#else
+static void send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status)
+#endif
+{
     esp_espnow_obj_t *self = _get_singleton();
     self->tx_responses++;
     if (status != ESP_NOW_SEND_SUCCESS) {
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index e85d1328fdc2b..e20af4806c43d 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -767,6 +767,9 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA3_ENT), MP_ROM_INT(WIFI_AUTH_WPA3_ENTERPRISE) },
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA2_WPA3_ENT), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_ENTERPRISE) },
     #endif
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
+    { MP_ROM_QSTR(MP_QSTR_SEC_WPA_ENT), MP_ROM_INT(WIFI_AUTH_WPA_ENTERPRISE) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(WIFI_PS_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(WIFI_PS_MIN_MODEM) },
@@ -774,7 +777,9 @@ 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);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
+_Static_assert(WIFI_AUTH_MAX == 17, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types_generic.h");
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
 _Static_assert(WIFI_AUTH_MAX == 16, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types_generic.h");
 #elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
 _Static_assert(WIFI_AUTH_MAX == 14, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types_generic.h");

From 361c615f3e272df012fc18315e226f9131d25c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 10 Jul 2025 11:05:19 +0200
Subject: [PATCH 2665/3129] esp32/network_ppp: Use thread-safe API for PPPoS
 input.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A small follow-up to 3b1e22c66947271e8b60eddf4e8aa6dadc6d9a7d, in which
the entire PPP implementation was reworked to more closely resemble the
extmod version. One of the differences between extmod and the ESP32 port
is that the ESP32 port uses the thread-safe API, but in that changeset
the PPP input function was accidentally changed to use the non-safe API.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/network_ppp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 8b700c98ef386..77e4385ca1ee1 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -163,7 +163,7 @@ static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
         }
         mp_printf(&mp_plat_print, ")\n");
         #endif
-        pppos_input(self->pcb, (u8_t *)buf, len);
+        pppos_input_tcpip(self->pcb, (u8_t *)buf, len);
         total_len += len;
     }
 

From adcfdf625be4ce1a8506dccc33ea60ab5d84ab46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 10 Jul 2025 14:43:29 +0200
Subject: [PATCH 2666/3129] esp32/network_ppp: Use non-thread-safe API inside
 status callback.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The status callback runs on the lwIP tcpip_thread, and thus must use the
non-thread-safe API because the thread-safe API would cause a deadlock.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/network_ppp_lwip.c |  8 +++++---
 ports/esp32/network_ppp.c | 11 ++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
index 2c3dac92012a0..883275f48196b 100644
--- a/extmod/network_ppp_lwip.c
+++ b/extmod/network_ppp_lwip.c
@@ -62,8 +62,6 @@ typedef struct _network_ppp_obj_t {
 
 const mp_obj_type_t mp_network_ppp_lwip_type;
 
-static mp_obj_t network_ppp___del__(mp_obj_t self_in);
-
 static void network_ppp_stream_uart_irq_disable(network_ppp_obj_t *self) {
     if (self->stream == mp_const_none) {
         return;
@@ -88,8 +86,12 @@ static void network_ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
                 // only need to free the PPP PCB, not close it.
                 self->state = STATE_ACTIVE;
             }
+            network_ppp_stream_uart_irq_disable(self);
             // Clean up the PPP PCB.
-            network_ppp___del__(MP_OBJ_FROM_PTR(self));
+            if (ppp_free(pcb) == ERR_OK) {
+                self->state = STATE_INACTIVE;
+                self->pcb = NULL;
+            }
             break;
         default:
             self->state = STATE_ERROR;
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 77e4385ca1ee1..3a9cb239db893 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -68,8 +68,6 @@ typedef struct _network_ppp_obj_t {
 
 const mp_obj_type_t esp_network_ppp_lwip_type;
 
-static mp_obj_t network_ppp___del__(mp_obj_t self_in);
-
 static void network_ppp_stream_uart_irq_disable(network_ppp_obj_t *self) {
     if (self->stream == mp_const_none) {
         return;
@@ -94,8 +92,15 @@ static void network_ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
                 // only need to free the PPP PCB, not close it.
                 self->state = STATE_ACTIVE;
             }
+            network_ppp_stream_uart_irq_disable(self);
             // Clean up the PPP PCB.
-            network_ppp___del__(MP_OBJ_FROM_PTR(self));
+            // Note: Because we use pppapi_close instead of ppp_close, this
+            // callback will run on the lwIP tcpip_thread, thus to prevent a
+            // deadlock we must use the non-threadsafe function here.
+            if (ppp_free(pcb) == ERR_OK) {
+                self->state = STATE_INACTIVE;
+                self->pcb = NULL;
+            }
             break;
         default:
             self->state = STATE_ERROR;

From 8c47ff7153a7a54eced6c8177698339abe4973ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 8 Jul 2025 15:52:17 +0200
Subject: [PATCH 2667/3129] esp32/network_ppp: Correctly clean up PPP PCB after
 close.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If PPP is still connected, freeing the PCB will fail and thus instead we
should trigger a disconnect and wait for the lwIP callback to actually
free the PCB.

When PPP is not connected we should check if the freeing failed, warn
the user if so, and only mark the connection as inactive if not.

When all this happens during garbage collection the best case is that
the PPP connection is already dead, which means the callback will be
called immediately and cleanup will happen correctly. The worst case is
that the connection is still alive, thus we are unable to free the PCB
(lwIP won't let us) and it remains referenced in the netif_list, meaning
a use-after-free happens later when lwIP traverses that linked list.

This change does not fully prevent that, but it *does* improve how the
PPP.active(False) method on the ESP32 port behaves: It no longer
immediately tries to free (and fails), but instead triggers a disconnect
and lets the cleanup happen correctly through the status callback.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/network_ppp_lwip.c | 19 ++++++++++---------
 ports/esp32/network_ppp.c | 18 +++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
index 883275f48196b..12205521f670f 100644
--- a/extmod/network_ppp_lwip.c
+++ b/extmod/network_ppp_lwip.c
@@ -119,17 +119,18 @@ static mp_obj_t network_ppp_make_new(const mp_obj_type_t *type, size_t n_args, s
 
 static mp_obj_t network_ppp___del__(mp_obj_t self_in) {
     network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->state >= STATE_ACTIVE) {
-        if (self->state >= STATE_ERROR) {
-            // Still connected over the stream.
-            // Force the connection to close, with nocarrier=1.
-            self->state = STATE_INACTIVE;
-            ppp_close(self->pcb, 1);
-        }
-        network_ppp_stream_uart_irq_disable(self);
+
+    network_ppp_stream_uart_irq_disable(self);
+    if (self->state >= STATE_ERROR) {
+        // Still connected over the stream.
+        // Force the connection to close, with nocarrier=1.
+        ppp_close(self->pcb, 1);
+    } else if (self->state >= STATE_ACTIVE) {
         // Free PPP PCB and reset state.
+        if (ppp_free(self->pcb) != ERR_OK) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ppp_free failed"));
+        }
         self->state = STATE_INACTIVE;
-        ppp_free(self->pcb);
         self->pcb = NULL;
     }
     return mp_const_none;
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 3a9cb239db893..18e0c8816889a 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -128,17 +128,17 @@ static mp_obj_t network_ppp_make_new(const mp_obj_type_t *type, size_t n_args, s
 
 static mp_obj_t network_ppp___del__(mp_obj_t self_in) {
     network_ppp_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->state >= STATE_ACTIVE) {
-        if (self->state >= STATE_ERROR) {
-            // Still connected over the stream.
-            // Force the connection to close, with nocarrier=1.
-            self->state = STATE_INACTIVE;
-            pppapi_close(self->pcb, 1);
-        }
-        network_ppp_stream_uart_irq_disable(self);
+    network_ppp_stream_uart_irq_disable(self);
+    if (self->state >= STATE_ERROR) {
+        // Still connected over the stream.
+        // Force the connection to close, with nocarrier=1.
+        pppapi_close(self->pcb, 1);
+    } else if (self->state >= STATE_ACTIVE) {
         // Free PPP PCB and reset state.
+        if (pppapi_free(self->pcb) != ERR_OK) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("pppapi_free failed"));
+        }
         self->state = STATE_INACTIVE;
-        pppapi_free(self->pcb);
         self->pcb = NULL;
     }
     return mp_const_none;

From 20e1ae07336a89e7054562a1bef26fae99802210 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Sun, 3 Aug 2025 00:09:09 +0200
Subject: [PATCH 2668/3129] tools/mpremote: Fix encoding error in
 PyboardCommand.

This is a fix for utf-8 decoding errors that are thrown when non-utf-8
content is received.  For instance during a reboot of an ESP8266 module.

The fix is to handle conversion errors by replacing illegal characters.
Note that these illegal characters most often occur during an MCU reboot
sequence when the MCU is using baudrates different from 115200.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 tools/mpremote/mpremote/transport_serial.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index daeff02b594e2..e2490a7caf8be 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -795,7 +795,7 @@ def rd_str(self):
         if n == 0:
             return ""
         else:
-            return str(self.fin.read(n), "utf8")
+            return str(self.fin.read(n), "utf8", errors="backslashreplace")
 
     def wr_s8(self, i):
         self.fout.write(struct.pack("<b", i))
@@ -925,7 +925,7 @@ def do_write(self):
         fd = self.rd_s8()
         buf = self.rd_bytes()
         if self.data_files[fd][1]:
-            buf = str(buf, "utf8")
+            buf = str(buf, "utf8", errors="backslashreplace")
         n = self.data_files[fd][0].write(buf)
         self.wr_s32(n)
         # self.log_cmd(f"write {fd} {len(buf)} -> {n}")

From 6e450dba7e5042355462b807400ba8d389fc17e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 7 Aug 2025 13:30:13 +0200
Subject: [PATCH 2669/3129] tools/codeformat.py: Iterate lines instead of
 modifying list in-place.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Lechner <david@pybricks.com>
Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 tools/codeformat.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index c65174ddc1278..afba5c336d81d 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -92,21 +92,20 @@ def fixup_c(filename):
     # Write out file with fixups.
     with open(filename, "w", newline="") as f:
         dedent_stack = []
-        while lines:
-            # Get next line.
-            l = lines.pop(0)
-
+        for line_number, line in enumerate(lines, 1):
             # Dedent #'s to match indent of following line (not previous line).
-            m = re.match(r"( +)#(if |ifdef |ifndef |elif |else|endif)", l)
+            m = re.match(r"( +)#(if |ifdef |ifndef |elif |else|endif)", line)
             if m:
                 indent = len(m.group(1))
                 directive = m.group(2)
                 if directive in ("if ", "ifdef ", "ifndef "):
-                    l_next = lines[0]
-                    indent_next = len(re.match(r"( *)", l_next).group(1))
-                    if indent - 4 == indent_next and re.match(r" +(} else |case )", l_next):
+                    # Line numbers are 1-based, and lists are always 0-based,
+                    # thus this retrieves the next line, not the current one
+                    line_next = lines[line_number]
+                    indent_next = len(re.match(r"( *)", line_next).group(1))
+                    if indent - 4 == indent_next and re.match(r" +(} else |case )", line_next):
                         # This #-line (and all associated ones) needs dedenting by 4 spaces.
-                        l = l[4:]
+                        line = line[4:]
                         dedent_stack.append(indent - 4)
                     else:
                         # This #-line does not need dedenting.
@@ -116,12 +115,12 @@ def fixup_c(filename):
                         # This associated #-line needs dedenting to match the #if.
                         indent_diff = indent - dedent_stack[-1]
                         assert indent_diff >= 0
-                        l = l[indent_diff:]
+                        line = line[indent_diff:]
                     if directive == "endif":
                         dedent_stack.pop()
 
             # Write out line.
-            f.write(l)
+            f.write(line)
 
         assert not dedent_stack, filename
 

From 485dac783b8ba7b88fdbf28fcdf54eb053cd8ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 5 Aug 2025 13:21:59 +0200
Subject: [PATCH 2670/3129] tools/codeformat.py: Print filename + linenumber
 when dedenting fails.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 tools/codeformat.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index afba5c336d81d..7f13a059f45b4 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -75,6 +75,10 @@
 UNCRUSTIFY_CFG = os.path.join(TOP, "tools/uncrustify.cfg")
 
 
+class IndentationError(ValueError):
+    pass
+
+
 def list_files(paths, exclusions=None, prefix=""):
     files = set()
     for pattern in paths:
@@ -111,6 +115,10 @@ def fixup_c(filename):
                         # This #-line does not need dedenting.
                         dedent_stack.append(-1)
                 else:
+                    if len(dedent_stack) == 0:
+                        raise IndentationError(
+                            f'dedent stack is empty for "{directive}" at {filename}:{line_number}'
+                        )
                     if dedent_stack[-1] >= 0:
                         # This associated #-line needs dedenting to match the #if.
                         indent_diff = indent - dedent_stack[-1]

From 14ccdeb4d7b9b88ab012258e77d3070340fbc3da Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 25 Mar 2024 20:58:51 -0500
Subject: [PATCH 2671/3129] extmod/modre: Add support for start- and endpos.

Pattern objects have two additional parameters for the ::search and ::match
methods to define the starting and ending position of the subject within
the string to be searched.

This allows for searching a sub-string without creating a slice.  However,
one caveat of using the start-pos rather than a slice is that the start
anchor (`^`) remains anchored to the beginning of the text.

Signed-off-by: Jared Hancock <jared@greezybacon.me>
---
 docs/library/re.rst              | 14 +++++-
 extmod/modre.c                   | 25 +++++++++-
 tests/extmod/re_start_end_pos.py | 78 ++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 tests/extmod/re_start_end_pos.py

diff --git a/docs/library/re.rst b/docs/library/re.rst
index 19b15d2d2c299..b8aeefd90cfa4 100644
--- a/docs/library/re.rst
+++ b/docs/library/re.rst
@@ -154,8 +154,8 @@ Regex objects
 Compiled regular expression. Instances of this class are created using
 `re.compile()`.
 
-.. method:: regex.match(string)
-            regex.search(string)
+.. method:: regex.match(string, [pos, [endpos]])
+            regex.search(string, [pos, [endpos]])
             regex.sub(replace, string, count=0, flags=0, /)
 
    Similar to the module-level functions :meth:`match`, :meth:`search`
@@ -163,6 +163,16 @@ Compiled regular expression. Instances of this class are created using
    Using methods is (much) more efficient if the same regex is applied to
    multiple strings.
 
+   The optional second parameter *pos* gives an index in the string where the
+   search is to start; it defaults to ``0``. This is not completely equivalent
+   to slicing the string; the ``'^'`` pattern character matches at the real
+   beginning of the string and at positions just after a newline, but not
+   necessarily at the index where the search is to start.
+
+   The optional parameter *endpos* limits how far the string will be searched;
+   it will be as if the string is *endpos* characters long, so only the
+   characters from *pos* to ``endpos - 1`` will be searched for a match.
+
 .. method:: regex.split(string, max_split=-1, /)
 
    Split a *string* using regex. If *max_split* is given, it specifies
diff --git a/extmod/modre.c b/extmod/modre.c
index d17ec68d50eda..85e5d1b0f74f6 100644
--- a/extmod/modre.c
+++ b/extmod/modre.c
@@ -196,10 +196,11 @@ static void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
 
 // Note: this function can't be named re_exec because it may clash with system headers, eg on FreeBSD
 static mp_obj_t re_exec_helper(bool is_anchored, uint n_args, const mp_obj_t *args) {
-    (void)n_args;
     mp_obj_re_t *self;
+    bool was_compiled = false;
     if (mp_obj_is_type(args[0], (mp_obj_type_t *)&re_type)) {
         self = MP_OBJ_TO_PTR(args[0]);
+        was_compiled = true;
     } else {
         self = MP_OBJ_TO_PTR(mod_re_compile(1, args));
     }
@@ -207,6 +208,28 @@ static mp_obj_t re_exec_helper(bool is_anchored, uint n_args, const mp_obj_t *ar
     size_t len;
     subj.begin_line = subj.begin = mp_obj_str_get_data(args[1], &len);
     subj.end = subj.begin + len;
+
+    if (was_compiled && n_args > 2) {
+        // Arg #2 is starting-pos
+        mp_int_t startpos = mp_obj_get_int(args[2]);
+        if (startpos > (mp_int_t)len) {
+            startpos = len;
+        } else if (startpos < 0) {
+            startpos = 0;
+        }
+        subj.begin += startpos;
+        if (n_args > 3) {
+            // Arg #3 is ending-pos
+            mp_int_t endpos = mp_obj_get_int(args[3]);
+            if (endpos > (mp_int_t)len) {
+                endpos = len;
+            } else if (endpos < startpos) {
+                endpos = startpos;
+            }
+            subj.end = subj.begin_line + endpos;
+        }
+    }
+
     int caps_num = (self->re.sub + 1) * 2;
     mp_obj_match_t *match = m_new_obj_var(mp_obj_match_t, caps, char *, caps_num);
     // cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char
diff --git a/tests/extmod/re_start_end_pos.py b/tests/extmod/re_start_end_pos.py
new file mode 100644
index 0000000000000..bd16584374b89
--- /dev/null
+++ b/tests/extmod/re_start_end_pos.py
@@ -0,0 +1,78 @@
+# test start and end pos specification
+
+try:
+    import re
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def print_groups(match):
+    print("----")
+    try:
+        if match is not None:
+            i = 0
+            while True:
+                print(match.group(i))
+                i += 1
+    except IndexError:
+        pass
+
+
+p = re.compile(r"o")
+m = p.match("dog")
+print_groups(m)
+
+m = p.match("dog", 1)
+print_groups(m)
+
+m = p.match("dog", 2)
+print_groups(m)
+
+# No match past end of input
+m = p.match("dog", 5)
+print_groups(m)
+
+m = p.match("dog", 0, 1)
+print_groups(m)
+
+# Caret only matches the actual beginning
+p = re.compile(r"^o")
+m = p.match("dog", 1)
+print_groups(m)
+
+# End at beginning means searching empty string
+p = re.compile(r"o")
+m = p.match("dog", 1, 1)
+print_groups(m)
+
+# End before the beginning doesn't match anything
+m = p.match("dog", 2, 1)
+print_groups(m)
+
+# Negative starting values don't crash
+m = p.search("dog", -2)
+print_groups(m)
+
+m = p.search("dog", -2, -5)
+print_groups(m)
+
+# Search also works
+print("--search")
+
+p = re.compile(r"o")
+m = p.search("dog")
+print_groups(m)
+
+m = p.search("dog", 1)
+print_groups(m)
+
+m = p.search("dog", 2)
+print_groups(m)
+
+# Negative starting values don't crash
+m = p.search("dog", -2)
+print_groups(m)
+
+m = p.search("dog", -2, -5)
+print_groups(m)

From f10707febb41e042e929efaf9ee4a66b847a68d4 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Fri, 6 Jun 2025 18:12:29 -0500
Subject: [PATCH 2672/3129] extmod/modlwip: Support `family` specification in
 getaddrinfo.

`socket.getaddrinfo()` supports the specification of an address family;
however, the LwIP implementation does not use it. This change allows the
application to specify the address family request in DNS resolution. If
no family is specified, it falls back to the default preference
configured with `network.ipconfig()`.

Signed-off-by: Jared Hancock <jared.hancock@centeredsolutions.com>
---
 extmod/modlwip.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index b84b3b7626bfe..26aab6e81094a 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1802,10 +1802,11 @@ static mp_obj_t lwip_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     mp_obj_t host_in = args[0], port_in = args[1];
     const char *host = mp_obj_str_get_str(host_in);
     mp_int_t port = mp_obj_get_int(port_in);
+    mp_int_t family = 0;
 
     // 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]);
+        family = mp_obj_get_int(args[2]);
         mp_int_t type = 0;
         mp_int_t proto = 0;
         mp_int_t flags = 0;
@@ -1818,7 +1819,7 @@ static mp_obj_t lwip_getaddrinfo(size_t n_args, const mp_obj_t *args) {
                 }
             }
         }
-        if (!((family == 0 || family == MOD_NETWORK_AF_INET)
+        if (!((family == 0 || family == MOD_NETWORK_AF_INET || family == MOD_NETWORK_AF_INET6)
               && (type == 0 || type == MOD_NETWORK_SOCK_STREAM)
               && proto == 0
               && flags == 0)) {
@@ -1829,11 +1830,23 @@ static mp_obj_t lwip_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     getaddrinfo_state_t state;
     state.status = 0;
 
+    #if LWIP_VERSION_MAJOR >= 2
+    // If family was specified, then try and resolve the address type as
+    // requested. Otherwise, use the default from network configuration.
+    if (family == MOD_NETWORK_AF_INET) {
+        family = LWIP_DNS_ADDRTYPE_IPV4;
+    } else if (family == MOD_NETWORK_AF_INET6) {
+        family = LWIP_DNS_ADDRTYPE_IPV6;
+    } else {
+        family = mp_mod_network_prefer_dns_use_ip_version == 4 ? LWIP_DNS_ADDRTYPE_IPV4_IPV6 : LWIP_DNS_ADDRTYPE_IPV6_IPV4;
+    }
+    #endif
+
     MICROPY_PY_LWIP_ENTER
     #if LWIP_VERSION_MAJOR < 2
     err_t ret = dns_gethostbyname(host, (ip_addr_t *)&state.ipaddr, lwip_getaddrinfo_cb, &state);
     #else
-    err_t ret = dns_gethostbyname_addrtype(host, (ip_addr_t *)&state.ipaddr, lwip_getaddrinfo_cb, &state, mp_mod_network_prefer_dns_use_ip_version == 4 ? LWIP_DNS_ADDRTYPE_IPV4_IPV6 : LWIP_DNS_ADDRTYPE_IPV6_IPV4);
+    err_t ret = dns_gethostbyname_addrtype(host, (ip_addr_t *)&state.ipaddr, lwip_getaddrinfo_cb, &state, family);
     #endif
     MICROPY_PY_LWIP_EXIT
 

From b1d5c656de3f11fc1729f165c8d9709594ccbfb6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 24 Jul 2025 23:48:01 +0200
Subject: [PATCH 2673/3129] tests/micropython: Remove big ints dependence for
 viper boundary tests.

This commit provides an implementation for viper boundary tests that can
work even without big int support.

Since it uses a fixed-size buffer to hold values to work with, this
should work on any platform as long as its integers are at least 32 bits
wide, regardless its configuration on how big integers can get.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ...ntbig.py => viper_ptr16_store_boundary.py} | 43 ++++++++++---------
 ....exp => viper_ptr16_store_boundary.py.exp} |  0
 ...ntbig.py => viper_ptr32_store_boundary.py} | 42 +++++++++---------
 ....exp => viper_ptr32_store_boundary.py.exp} |  0
 ...intbig.py => viper_ptr8_store_boundary.py} | 42 +++++++++---------
 ...y.exp => viper_ptr8_store_boundary.py.exp} |  0
 6 files changed, 67 insertions(+), 60 deletions(-)
 rename tests/micropython/{viper_ptr16_store_boundary_intbig.py => viper_ptr16_store_boundary.py} (57%)
 rename tests/micropython/{viper_ptr16_store_boundary_intbig.py.exp => viper_ptr16_store_boundary.py.exp} (100%)
 rename tests/micropython/{viper_ptr32_store_boundary_intbig.py => viper_ptr32_store_boundary.py} (60%)
 rename tests/micropython/{viper_ptr32_store_boundary_intbig.py.exp => viper_ptr32_store_boundary.py.exp} (100%)
 rename tests/micropython/{viper_ptr8_store_boundary_intbig.py => viper_ptr8_store_boundary.py} (55%)
 rename tests/micropython/{viper_ptr8_store_boundary_intbig.py.exp => viper_ptr8_store_boundary.py.exp} (100%)

diff --git a/tests/micropython/viper_ptr16_store_boundary_intbig.py b/tests/micropython/viper_ptr16_store_boundary.py
similarity index 57%
rename from tests/micropython/viper_ptr16_store_boundary_intbig.py
rename to tests/micropython/viper_ptr16_store_boundary.py
index 2193eddae1385..3501a05685ec3 100644
--- a/tests/micropython/viper_ptr16_store_boundary_intbig.py
+++ b/tests/micropython/viper_ptr16_store_boundary.py
@@ -15,6 +15,23 @@ def set{off}(dest: ptr16):
 MASK = (1 << (8 * SIZE)) - 1
 
 
+next_int = 1
+test_buffer = bytearray(SIZE)
+
+
+def next_value() -> uint:
+    global next_int
+    global test_buffer
+    for index in range(1, SIZE):
+        test_buffer[index - 1] = test_buffer[index]
+    test_buffer[SIZE - 1] = next_int
+    next_int += 1
+    output = 0
+    for byte in test_buffer:
+        output = (output << 8) | byte
+    return output & MASK
+
+
 @micropython.viper
 def set_index(dest: ptr16, i: int, val: uint):
     saved = dest
@@ -27,8 +44,6 @@ def get_index(src, i):
 
 
 buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
-next = 1
-val = 0
 for bit in BIT_THRESHOLDS:
     print("---", bit)
     pre, idx, post = (
@@ -36,22 +51,10 @@ def get_index(src, i):
         (((1 << bit) - (1 * SIZE)) // SIZE),
         ((1 << bit) // SIZE),
     )
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, pre, val & MASK)
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, idx, val & MASK)
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, post, val & MASK)
-    val = (val << 8) + next
-    next += 1
+    set_index(buffer, pre, next_value())
+    set_index(buffer, idx, next_value())
+    set_index(buffer, post, next_value())
     print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
-    exec(SET_TEMPLATE.format(off=pre, val=val & MASK))
-    val = (val << 8) + next
-    next += 1
-    exec(SET_TEMPLATE.format(off=idx, val=val & MASK))
-    val = (val << 8) + next
-    next += 1
-    exec(SET_TEMPLATE.format(off=post, val=val & MASK))
+    exec(SET_TEMPLATE.format(off=pre, val=next_value()))
+    exec(SET_TEMPLATE.format(off=idx, val=next_value()))
+    exec(SET_TEMPLATE.format(off=post, val=next_value()))
diff --git a/tests/micropython/viper_ptr16_store_boundary_intbig.py.exp b/tests/micropython/viper_ptr16_store_boundary.py.exp
similarity index 100%
rename from tests/micropython/viper_ptr16_store_boundary_intbig.py.exp
rename to tests/micropython/viper_ptr16_store_boundary.py.exp
diff --git a/tests/micropython/viper_ptr32_store_boundary_intbig.py b/tests/micropython/viper_ptr32_store_boundary.py
similarity index 60%
rename from tests/micropython/viper_ptr32_store_boundary_intbig.py
rename to tests/micropython/viper_ptr32_store_boundary.py
index b44f31b00af4d..8c207278ec538 100644
--- a/tests/micropython/viper_ptr32_store_boundary_intbig.py
+++ b/tests/micropython/viper_ptr32_store_boundary.py
@@ -14,6 +14,22 @@ def set{off}(dest: ptr32):
 SIZE = 4
 MASK = (1 << (8 * SIZE)) - 1
 
+next_int = 1
+test_buffer = bytearray(SIZE)
+
+
+def next_value() -> uint:
+    global next_int
+    global test_buffer
+    for index in range(1, SIZE):
+        test_buffer[index - 1] = test_buffer[index]
+    test_buffer[SIZE - 1] = next_int
+    next_int += 1
+    output = 0
+    for byte in test_buffer:
+        output = (output << 8) | byte
+    return output & MASK
+
 
 @micropython.viper
 def set_index(dest: ptr32, i: int, val: uint):
@@ -32,8 +48,6 @@ def get_index(src, i):
 
 
 buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
-next = 1
-val = 0
 for bit in BIT_THRESHOLDS:
     print("---", bit)
     pre, idx, post = (
@@ -41,22 +55,10 @@ def get_index(src, i):
         (((1 << bit) - (1 * SIZE)) // SIZE),
         ((1 << bit) // SIZE),
     )
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, pre, val & MASK)
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, idx, val & MASK)
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, post, val & MASK)
-    val = (val << 8) + next
-    next += 1
+    set_index(buffer, pre, next_value())
+    set_index(buffer, idx, next_value())
+    set_index(buffer, post, next_value())
     print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
-    exec(SET_TEMPLATE.format(off=pre, val=val & MASK))
-    val = (val << 8) + next
-    next += 1
-    exec(SET_TEMPLATE.format(off=idx, val=val & MASK))
-    val = (val << 8) + next
-    next += 1
-    exec(SET_TEMPLATE.format(off=post, val=val & MASK))
+    exec(SET_TEMPLATE.format(off=pre, val=next_value()))
+    exec(SET_TEMPLATE.format(off=idx, val=next_value()))
+    exec(SET_TEMPLATE.format(off=post, val=next_value()))
diff --git a/tests/micropython/viper_ptr32_store_boundary_intbig.py.exp b/tests/micropython/viper_ptr32_store_boundary.py.exp
similarity index 100%
rename from tests/micropython/viper_ptr32_store_boundary_intbig.py.exp
rename to tests/micropython/viper_ptr32_store_boundary.py.exp
diff --git a/tests/micropython/viper_ptr8_store_boundary_intbig.py b/tests/micropython/viper_ptr8_store_boundary.py
similarity index 55%
rename from tests/micropython/viper_ptr8_store_boundary_intbig.py
rename to tests/micropython/viper_ptr8_store_boundary.py
index d22a062743321..d3cba17e16318 100644
--- a/tests/micropython/viper_ptr8_store_boundary_intbig.py
+++ b/tests/micropython/viper_ptr8_store_boundary.py
@@ -14,6 +14,22 @@ def set{off}(dest: ptr8):
 SIZE = 1
 MASK = (1 << (8 * SIZE)) - 1
 
+next_int = 1
+test_buffer = bytearray(SIZE)
+
+
+def next_value() -> uint:
+    global next_int
+    global test_buffer
+    for index in range(1, SIZE):
+        test_buffer[index - 1] = test_buffer[index]
+    test_buffer[SIZE - 1] = next_int
+    next_int += 1
+    output = 0
+    for byte in test_buffer:
+        output = (output << 8) | byte
+    return output & MASK
+
 
 @micropython.viper
 def set_index(dest: ptr8, i: int, val: uint):
@@ -27,27 +43,13 @@ def get_index(src: ptr8, i: int):
 
 
 buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
-next = 1
-val = 0
 for bit in BIT_THRESHOLDS:
     print("---", bit)
     pre, idx, post = (((1 << bit) - (2 * SIZE)), ((1 << bit) - (1 * SIZE)), (1 << bit))
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, pre, val & MASK)
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, idx, val & MASK)
-    val = (val << 8) + next
-    next += 1
-    set_index(buffer, post, val & MASK)
-    val = (val << 8) + next
-    next += 1
+    set_index(buffer, pre, next_value())
+    set_index(buffer, idx, next_value())
+    set_index(buffer, post, next_value())
     print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
-    exec(SET_TEMPLATE.format(off=pre, val=val & MASK))
-    val = (val << 8) + next
-    next += 1
-    exec(SET_TEMPLATE.format(off=idx, val=val & MASK))
-    val = (val << 8) + next
-    next += 1
-    exec(SET_TEMPLATE.format(off=post, val=val & MASK))
+    exec(SET_TEMPLATE.format(off=pre, val=next_value()))
+    exec(SET_TEMPLATE.format(off=idx, val=next_value()))
+    exec(SET_TEMPLATE.format(off=post, val=next_value()))
diff --git a/tests/micropython/viper_ptr8_store_boundary_intbig.py.exp b/tests/micropython/viper_ptr8_store_boundary.py.exp
similarity index 100%
rename from tests/micropython/viper_ptr8_store_boundary_intbig.py.exp
rename to tests/micropython/viper_ptr8_store_boundary.py.exp

From 0ee3f99da24e678a415a1d0b4575c38ad51430fe Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 10 Jul 2025 00:50:15 +0200
Subject: [PATCH 2674/3129] py/asmrv32: Make lt/le comparisons emitter shorter.

This commit simplifies the emitter code in charge of generating opcodes
performing less-than and less-than-or-equal comparisons.

By rewriting the SLT/SLTU opcode generator (handling less-than
comparisons) and de-inlining the less-than comparison generator call in
the less-than-or-equal generator, the output binary is ~80 bytes smaller
(measurements taken from the QEMU port).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index 158b5521917a6..723d32cdd7c89 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -573,12 +573,8 @@ void asm_rv32_meta_comparison_ne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2
 }
 
 void asm_rv32_meta_comparison_lt(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison) {
-    // slt(u) rd, rs1, rs2
-    if (unsigned_comparison) {
-        asm_rv32_opcode_sltu(state, rd, rs1, rs2);
-    } else {
-        asm_rv32_opcode_slt(state, rd, rs1, rs2);
-    }
+    // slt|sltu rd, rs1, rs2
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, (0x02 | (unsigned_comparison ? 1 : 0)), 0x00, rd, rs1, rs2));
 }
 
 void asm_rv32_meta_comparison_le(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison) {
@@ -588,11 +584,7 @@ void asm_rv32_meta_comparison_le(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2
     // ...                 ; PC + 8
     asm_rv32_opcode_cli(state, rd, 1);
     asm_rv32_opcode_beq(state, rs1, rs2, 8);
-    if (unsigned_comparison) {
-        asm_rv32_opcode_sltu(state, rd, rs1, rs2);
-    } else {
-        asm_rv32_opcode_slt(state, rd, rs1, rs2);
-    }
+    asm_rv32_meta_comparison_lt(state, rs1, rs2, rd, unsigned_comparison);
 }
 
 #endif // MICROPY_EMIT_RV32

From 4614ee9e682dfffa26a4226645baca0208ecfac6 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 21 Jul 2025 13:31:59 -0500
Subject: [PATCH 2675/3129] py/binary: Add MICROPY_PY_STRUCT_UNSAFE_TYPECODES.

This adds a compile-time flag to disable some "unsafe" and non-standard
typecodes in struct, array and related modules.

This is useful to turn off when fuzzing, as improper use of these typecodes
can crash MicroPython.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/binary.c   | 20 ++++++++++++++++----
 py/mpconfig.h |  7 +++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/py/binary.c b/py/binary.c
index 48d3421bca963..ef2857b4318dc 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -69,11 +69,13 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
                 case 'Q':
                     size = 8;
                     break;
+                #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
                 case 'P':
                 case 'O':
                 case 'S':
                     size = sizeof(void *);
                     break;
+                #endif
                 case 'e':
                     size = 2;
                     break;
@@ -119,12 +121,14 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
                     align = alignof(long long);
                     size = sizeof(long long);
                     break;
+                #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
                 case 'P':
                 case 'O':
                 case 'S':
                     align = alignof(void *);
                     size = sizeof(void *);
                     break;
+                #endif
                 case 'e':
                     align = 2;
                     size = 2;
@@ -280,12 +284,14 @@ mp_obj_t mp_binary_get_val_array(char typecode, void *p, size_t index) {
         case 'd':
             return mp_obj_new_float_from_d(((double *)p)[index]);
         #endif
-        // Extension to CPython: array of objects
+            // Extension to CPython: array of objects
+        #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
         case 'O':
             return ((mp_obj_t *)p)[index];
         // Extension to CPython: array of pointers
         case 'P':
             return mp_obj_new_int((mp_int_t)(uintptr_t)((void **)p)[index]);
+        #endif
     }
     return MP_OBJ_NEW_SMALL_INT(val);
 }
@@ -334,9 +340,9 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
 
     long long val = mp_binary_get_int(size, is_signed(val_type), (struct_type == '>'), p);
 
-    if (val_type == 'O') {
+    if (MICROPY_PY_STRUCT_UNSAFE_TYPECODES && val_type == 'O') {
         return (mp_obj_t)(mp_uint_t)val;
-    } else if (val_type == 'S') {
+    } else if (MICROPY_PY_STRUCT_UNSAFE_TYPECODES && val_type == 'S') {
         const char *s_val = (const char *)(uintptr_t)(mp_uint_t)val;
         return mp_obj_new_str_from_cstr(s_val);
     #if MICROPY_PY_BUILTINS_FLOAT
@@ -407,9 +413,11 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
 
     mp_uint_t val;
     switch (val_type) {
+        #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
         case 'O':
             val = (mp_uint_t)val_in;
             break;
+        #endif
         #if MICROPY_PY_BUILTINS_FLOAT
         case 'e':
             val = mp_encode_half_float(mp_obj_get_float_to_f(val_in));
@@ -474,10 +482,12 @@ void mp_binary_set_val_array(char typecode, void *p, size_t index, mp_obj_t val_
             ((double *)p)[index] = mp_obj_get_float_to_d(val_in);
             break;
         #endif
+        #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
         // Extension to CPython: array of objects
         case 'O':
             ((mp_obj_t *)p)[index] = val_in;
             break;
+        #endif
         default:
             #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
             if (mp_obj_is_exact_type(val_in, &mp_type_int)) {
@@ -534,9 +544,11 @@ void mp_binary_set_val_array_from_int(char typecode, void *p, size_t index, mp_i
             ((double *)p)[index] = (double)val;
             break;
         #endif
-        // Extension to CPython: array of pointers
+            // Extension to CPython: array of pointers
+        #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
         case 'P':
             ((void **)p)[index] = (void *)(uintptr_t)val;
             break;
+        #endif
     }
 }
diff --git a/py/mpconfig.h b/py/mpconfig.h
index dd41ff6a70867..5fe0e822f775c 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1601,6 +1601,13 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_PY_STRUCT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Whether struct module provides unsafe and non-standard typecodes O, P, S.
+// These typecodes are not in CPython and can cause crashes by accessing arbitrary
+// memory.
+#ifndef MICROPY_PY_STRUCT_UNSAFE_TYPECODES
+#define MICROPY_PY_STRUCT_UNSAFE_TYPECODES (1)
+#endif
+
 // Whether to provide "sys" module
 #ifndef MICROPY_PY_SYS
 #define MICROPY_PY_SYS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)

From 744270ac1b9ed3929cd41d1a6e1f6ea0e785745d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Aug 2025 10:35:22 +1000
Subject: [PATCH 2676/3129] py/misc: Add explicit dependency on py/mpconfig.h.

Macros in misc.h depend on values defined by including mpconfig.h.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/misc.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/misc.h b/py/misc.h
index 86ac2ec9a1061..5c1cc2f7a836b 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_PY_MISC_H
 #define MICROPY_INCLUDED_PY_MISC_H
 
+#include "py/mpconfig.h"
+
 // a mini library of useful types and functions
 
 /** types *******************************************************/

From f493075d88be9ce851c4d401d041b801701975c3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 10 Aug 2025 22:23:26 +1000
Subject: [PATCH 2677/3129] tests/run-tests.py: Automatically include float
 tests when possible.

This simplifies the code by removing the explicit addition of the "float/"
test directory for certain targets.  It also means the tests won't be added
incorrectly, eg on a unix build without float.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/feature_check/float.py       | 13 -----------
 tests/feature_check/float.py.exp   |  1 -
 tests/feature_check/target_info.py | 13 ++++++++++-
 tests/run-tests.py                 | 37 +++++++++++++-----------------
 4 files changed, 28 insertions(+), 36 deletions(-)
 delete mode 100644 tests/feature_check/float.py
 delete mode 100644 tests/feature_check/float.py.exp

diff --git a/tests/feature_check/float.py b/tests/feature_check/float.py
deleted file mode 100644
index d6d2a99d2429d..0000000000000
--- a/tests/feature_check/float.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# detect how many bits of precision the floating point implementation has
-
-try:
-    float
-except NameError:
-    print(0)
-else:
-    if float("1.0000001") == float("1.0"):
-        print(30)
-    elif float("1e300") == float("inf"):
-        print(32)
-    else:
-        print(64)
diff --git a/tests/feature_check/float.py.exp b/tests/feature_check/float.py.exp
deleted file mode 100644
index 900731ffd51ff..0000000000000
--- a/tests/feature_check/float.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-64
diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
index 9501d808ef214..6d95f8b163c09 100644
--- a/tests/feature_check/target_info.py
+++ b/tests/feature_check/target_info.py
@@ -22,4 +22,15 @@
 ][sys_mpy >> 10]
 thread = getattr(sys.implementation, "_thread", None)
 
-print(platform, arch, thread)
+# Detect how many bits of precision the floating point implementation has.
+try:
+    if float("1.0000001") == float("1.0"):
+        float_prec = 30
+    elif float("1e300") == float("inf"):
+        float_prec = 32
+    else:
+        float_prec = 64
+except NameError:
+    float_prec = 0
+
+print(platform, arch, thread, float_prec)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 859f16f484a85..498370f70e90c 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -292,12 +292,13 @@ def detect_test_platform(pyb, args):
     output = run_feature_check(pyb, args, "target_info.py")
     if output.endswith(b"CRASH"):
         raise ValueError("cannot detect platform: {}".format(output))
-    platform, arch, thread = str(output, "ascii").strip().split()
+    platform, arch, thread, float_prec = str(output, "ascii").strip().split()
     if arch == "None":
         arch = None
     inlineasm_arch = detect_inline_asm_arch(pyb, args)
     if thread == "None":
         thread = None
+    float_prec = int(float_prec)
 
     args.platform = platform
     args.arch = arch
@@ -305,6 +306,7 @@ def detect_test_platform(pyb, args):
         args.mpy_cross_flags = "-march=" + arch
     args.inlineasm_arch = inlineasm_arch
     args.thread = thread
+    args.float_prec = float_prec
 
     print("platform={}".format(platform), end="")
     if arch:
@@ -313,6 +315,8 @@ def detect_test_platform(pyb, args):
         print(" inlineasm={}".format(inlineasm_arch), end="")
     if thread:
         print(" thread={}".format(thread), end="")
+    if float_prec:
+        print(" float={}-bit".format(float_prec), end="")
     print()
 
 
@@ -685,8 +689,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     has_complex = True
     has_coverage = False
 
-    upy_float_precision = 32
-
     if True:
         # Even if we run completely different tests in a different directory,
         # we need to access feature_checks from the same directory as the
@@ -774,11 +776,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             skip_tests.add("cmdline/repl_words_move.py")
 
         upy_byteorder = run_feature_check(pyb, args, "byteorder.py")
-        upy_float_precision = run_feature_check(pyb, args, "float.py")
-        try:
-            upy_float_precision = int(upy_float_precision)
-        except ValueError:
-            upy_float_precision = 0
         has_complex = run_feature_check(pyb, args, "complex.py") == b"complex\n"
         has_coverage = run_feature_check(pyb, args, "coverage.py") == b"coverage\n"
         cpy_byteorder = subprocess.check_output(
@@ -814,7 +811,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             # fails with stack overflow on Debug builds
             skip_tests.add("misc/sys_settrace_features.py")
 
-    if upy_float_precision == 0:
+    if args.float_prec == 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")
@@ -822,7 +819,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("extmod/json_loads_float.py")
         skip_tests.add("extmod/random_extra_float.py")
         skip_tests.add("misc/rge_sm.py")
-    if upy_float_precision < 32:
+    if args.float_prec < 32:
         skip_tests.add(
             "float/float2int_intbig.py"
         )  # requires fp32, there's float2int_fp30_intbig.py instead
@@ -832,7 +829,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("float/bytes_construct.py")  # requires fp32
         skip_tests.add("float/bytearray_construct.py")  # requires fp32
         skip_tests.add("float/float_format_ints_power10.py")  # requires fp32
-    if upy_float_precision < 64:
+    if args.float_prec < 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_struct_e_doubleprec.py")
@@ -1348,26 +1345,25 @@ def main():
                 test_dirs += ("inlineasm/{}".format(args.inlineasm_arch),)
             if args.thread is not None:
                 test_dirs += ("thread",)
+            if args.float_prec > 0:
+                test_dirs += ("float",)
             if args.platform == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "ports/stm32")
+                test_dirs += ("stress", "ports/stm32")
             elif args.platform == "mimxrt":
-                test_dirs += ("float", "stress")
+                test_dirs += ("stress",)
             elif args.platform == "renesas-ra":
-                test_dirs += ("float", "ports/renesas-ra")
+                test_dirs += ("ports/renesas-ra")
             elif args.platform == "rp2":
-                test_dirs += ("float", "stress", "ports/rp2")
+                test_dirs += ("stress", "ports/rp2")
             elif args.platform == "esp32":
-                test_dirs += ("float", "stress")
-            elif args.platform in ("esp8266", "minimal", "samd", "nrf"):
-                test_dirs += ("float",)
+                test_dirs += ("stress",)
             elif args.platform == "WiPy":
                 # run WiPy tests
                 test_dirs += ("ports/cc3200",)
             elif args.platform in PC_PLATFORMS:
                 # run PC tests
                 test_dirs += (
-                    "float",
                     "import",
                     "io",
                     "stress",
@@ -1377,11 +1373,10 @@ def main():
                 )
             elif args.platform == "qemu":
                 test_dirs += (
-                    "float",
                     "ports/qemu",
                 )
             elif args.platform == "webassembly":
-                test_dirs += ("float", "ports/webassembly")
+                test_dirs += ("ports/webassembly",)
         else:
             # run tests from these directories
             test_dirs = args.test_dirs

From 656582795504cb6c9b025e716f20a2468e5d71ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 10 Aug 2025 22:25:15 +1000
Subject: [PATCH 2678/3129] tests/run-tests.py: Always include stress/ tests
 directory in tests.

Ports that now run the stress tests, that didn't prior to this commit are:
cc3200, esp8266, minimal, nrf, renesas-ra, samd, qemu, webassembly.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py          | 10 +++-------
 tests/stress/dict_copy.py   |  7 ++++++-
 tests/stress/dict_create.py |  6 +++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 498370f70e90c..21e0ab8872abd 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1340,6 +1340,7 @@ def main():
                 "micropython",
                 "misc",
                 "extmod",
+                "stress",
             )
             if args.inlineasm_arch is not None:
                 test_dirs += ("inlineasm/{}".format(args.inlineasm_arch),)
@@ -1349,15 +1350,11 @@ def main():
                 test_dirs += ("float",)
             if args.platform == "pyboard":
                 # run pyboard tests
-                test_dirs += ("stress", "ports/stm32")
-            elif args.platform == "mimxrt":
-                test_dirs += ("stress",)
+                test_dirs += ("ports/stm32",)
             elif args.platform == "renesas-ra":
                 test_dirs += ("ports/renesas-ra")
             elif args.platform == "rp2":
-                test_dirs += ("stress", "ports/rp2")
-            elif args.platform == "esp32":
-                test_dirs += ("stress",)
+                test_dirs += ("ports/rp2",)
             elif args.platform == "WiPy":
                 # run WiPy tests
                 test_dirs += ("ports/cc3200",)
@@ -1366,7 +1363,6 @@ def main():
                 test_dirs += (
                     "import",
                     "io",
-                    "stress",
                     "unicode",
                     "cmdline",
                     "ports/unix",
diff --git a/tests/stress/dict_copy.py b/tests/stress/dict_copy.py
index 73d3a5b51d601..f9b742e20f716 100644
--- a/tests/stress/dict_copy.py
+++ b/tests/stress/dict_copy.py
@@ -1,6 +1,11 @@
 # copying a large dictionary
 
-a = {i: 2 * i for i in range(1000)}
+try:
+    a = {i: 2 * i for i in range(1000)}
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
 b = a.copy()
 for i in range(1000):
     print(i, b[i])
diff --git a/tests/stress/dict_create.py b/tests/stress/dict_create.py
index e9db40a8e6c5b..91a83a12f9d85 100644
--- a/tests/stress/dict_create.py
+++ b/tests/stress/dict_create.py
@@ -3,6 +3,10 @@
 d = {}
 x = 1
 while x < 1000:
-    d[x] = x
+    try:
+        d[x] = x
+    except MemoryError:
+        print("SKIP")
+        raise SystemExit
     x += 1
 print(d[500])

From 1db71f9e553f2775b2c0326a3de778319a647f90 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 11:13:56 +1000
Subject: [PATCH 2679/3129] tests/run-tests.py: Generalise addition of port
 specific test directory.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 21e0ab8872abd..8735f93f2b3fe 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -102,6 +102,11 @@ def open(self, path, mode):
 # Platforms associated with the unix port, values of `sys.platform`.
 PC_PLATFORMS = ("darwin", "linux", "win32")
 
+# Mapping from `sys.platform` to the port name, for special cases.
+# See `platform_to_port()` function.
+platform_to_port_map = {"pyboard": "stm32", "WiPy": "cc3200"}
+platform_to_port_map.update({p: "unix" for p in PC_PLATFORMS})
+
 # Tests to skip for specific emitters.
 emitter_tests_to_skip = {
     # Some tests are known to fail with native emitter.
@@ -252,6 +257,10 @@ def convert_regex_escapes(line):
     return bytes("".join(cs), "utf8")
 
 
+def platform_to_port(platform):
+    return platform_to_port_map.get(platform, platform)
+
+
 def get_test_instance(test_instance, baudrate, user, password):
     if test_instance.startswith("port:"):
         _, port = test_instance.split(":", 1)
@@ -1348,31 +1357,17 @@ def main():
                 test_dirs += ("thread",)
             if args.float_prec > 0:
                 test_dirs += ("float",)
-            if args.platform == "pyboard":
-                # run pyboard tests
-                test_dirs += ("ports/stm32",)
-            elif args.platform == "renesas-ra":
-                test_dirs += ("ports/renesas-ra")
-            elif args.platform == "rp2":
-                test_dirs += ("ports/rp2",)
-            elif args.platform == "WiPy":
-                # run WiPy tests
-                test_dirs += ("ports/cc3200",)
-            elif args.platform in PC_PLATFORMS:
+            port_specific_test_dir = "ports/{}".format(platform_to_port(args.platform))
+            if os.path.isdir(port_specific_test_dir):
+                test_dirs += (port_specific_test_dir,)
+            if args.platform in PC_PLATFORMS:
                 # run PC tests
                 test_dirs += (
                     "import",
                     "io",
                     "unicode",
                     "cmdline",
-                    "ports/unix",
-                )
-            elif args.platform == "qemu":
-                test_dirs += (
-                    "ports/qemu",
                 )
-            elif args.platform == "webassembly":
-                test_dirs += ("ports/webassembly",)
         else:
             # run tests from these directories
             test_dirs = args.test_dirs

From e2744ce679269692ceed2bed1e6f4f6a7840b49b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 11:22:32 +1000
Subject: [PATCH 2680/3129] tests/run-tests.py: Autodetect if the target has
 unicode support.

The unicode tests are now run on all targets that enable unicode.  And
other unicode tests (namely `extmod/json_loads.py`) are now properly
skipped if the target doesn't have unicode support.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/feature_check/target_info.py |  2 +-
 tests/run-tests.py                 | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
index 6d95f8b163c09..962ebf4154b5c 100644
--- a/tests/feature_check/target_info.py
+++ b/tests/feature_check/target_info.py
@@ -33,4 +33,4 @@
 except NameError:
     float_prec = 0
 
-print(platform, arch, thread, float_prec)
+print(platform, arch, thread, float_prec, len("α") == 1)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 8735f93f2b3fe..e2bdf7c2c0286 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -301,13 +301,14 @@ def detect_test_platform(pyb, args):
     output = run_feature_check(pyb, args, "target_info.py")
     if output.endswith(b"CRASH"):
         raise ValueError("cannot detect platform: {}".format(output))
-    platform, arch, thread, float_prec = str(output, "ascii").strip().split()
+    platform, arch, thread, float_prec, unicode = str(output, "ascii").strip().split()
     if arch == "None":
         arch = None
     inlineasm_arch = detect_inline_asm_arch(pyb, args)
     if thread == "None":
         thread = None
     float_prec = int(float_prec)
+    unicode = unicode == "True"
 
     args.platform = platform
     args.arch = arch
@@ -316,6 +317,7 @@ def detect_test_platform(pyb, args):
     args.inlineasm_arch = inlineasm_arch
     args.thread = thread
     args.float_prec = float_prec
+    args.unicode = unicode
 
     print("platform={}".format(platform), end="")
     if arch:
@@ -326,6 +328,8 @@ def detect_test_platform(pyb, args):
         print(" thread={}".format(thread), end="")
     if float_prec:
         print(" float={}-bit".format(float_prec), end="")
+    if unicode:
+        print(" unicode", end="")
     print()
 
 
@@ -845,6 +849,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("float/float_format_ints_doubleprec.py")
         skip_tests.add("float/float_parse_doubleprec.py")
 
+    if not args.unicode:
+        skip_tests.add("extmod/json_loads.py")  # tests loading a utf-8 character
+
     if not has_complex:
         skip_tests.add("float/complex1.py")
         skip_tests.add("float/complex1_intbig.py")
@@ -870,6 +877,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if args.platform not in PC_PLATFORMS:
         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("unicode/file1.py")  # requires local file access
+        skip_tests.add("unicode/file2.py")  # requires local file access
+        skip_tests.add("unicode/file_invalid.py")  # requires local file access
 
     # Skip emitter-specific tests.
     skip_tests.update(emitter_tests_to_skip.get(args.emit, ()))
@@ -1357,6 +1367,8 @@ def main():
                 test_dirs += ("thread",)
             if args.float_prec > 0:
                 test_dirs += ("float",)
+            if args.unicode:
+                test_dirs += ("unicode",)
             port_specific_test_dir = "ports/{}".format(platform_to_port(args.platform))
             if os.path.isdir(port_specific_test_dir):
                 test_dirs += (port_specific_test_dir,)
@@ -1365,7 +1377,6 @@ def main():
                 test_dirs += (
                     "import",
                     "io",
-                    "unicode",
                     "cmdline",
                 )
         else:

From 54e6cfc6e3f3c2056bf2f06d32a58932d29f1ac3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 11:45:55 +1000
Subject: [PATCH 2681/3129] tests/basics: Skip tests of io module individually
 using SKIP.

Instead of using a feature check.  This is more consistent with how other
optional modules are skipped.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/io_buffered_writer.py   | 6 +++---
 tests/basics/io_bytesio_cow.py       | 8 +++++++-
 tests/basics/io_bytesio_ext.py       | 8 +++++++-
 tests/basics/io_bytesio_ext2.py      | 7 ++++++-
 tests/basics/io_iobase.py            | 7 ++++---
 tests/basics/io_stringio1.py         | 7 ++++++-
 tests/basics/io_stringio_base.py     | 6 +++++-
 tests/basics/io_stringio_with.py     | 7 ++++++-
 tests/basics/io_write_ext.py         | 5 +++--
 tests/feature_check/io_module.py     | 6 ------
 tests/feature_check/io_module.py.exp | 0
 tests/run-tests.py                   | 8 --------
 12 files changed, 47 insertions(+), 28 deletions(-)
 delete mode 100644 tests/feature_check/io_module.py
 delete mode 100644 tests/feature_check/io_module.py.exp

diff --git a/tests/basics/io_buffered_writer.py b/tests/basics/io_buffered_writer.py
index 60cf2c837d10f..3cfee0103f777 100644
--- a/tests/basics/io_buffered_writer.py
+++ b/tests/basics/io_buffered_writer.py
@@ -1,9 +1,9 @@
-import io
-
 try:
+    import io
+
     io.BytesIO
     io.BufferedWriter
-except AttributeError:
+except (AttributeError, ImportError):
     print('SKIP')
     raise SystemExit
 
diff --git a/tests/basics/io_bytesio_cow.py b/tests/basics/io_bytesio_cow.py
index 2edb7136a9691..543c12ad42ab2 100644
--- a/tests/basics/io_bytesio_cow.py
+++ b/tests/basics/io_bytesio_cow.py
@@ -1,6 +1,12 @@
 # Make sure that write operations on io.BytesIO don't
 # change original object it was constructed from.
-import io
+
+try:
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
 b = b"foobar"
 
 a = io.BytesIO(b)
diff --git a/tests/basics/io_bytesio_ext.py b/tests/basics/io_bytesio_ext.py
index 4d4c60c1363b7..92e715178116c 100644
--- a/tests/basics/io_bytesio_ext.py
+++ b/tests/basics/io_bytesio_ext.py
@@ -1,5 +1,11 @@
 # Extended stream operations on io.BytesIO
-import io
+
+try:
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
 a = io.BytesIO(b"foobar")
 a.seek(10)
 print(a.read(10))
diff --git a/tests/basics/io_bytesio_ext2.py b/tests/basics/io_bytesio_ext2.py
index 414ac90a3b083..f60a6a9a6041e 100644
--- a/tests/basics/io_bytesio_ext2.py
+++ b/tests/basics/io_bytesio_ext2.py
@@ -1,4 +1,9 @@
-import io
+try:
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
 a = io.BytesIO(b"foobar")
 try:
     a.seek(-10)
diff --git a/tests/basics/io_iobase.py b/tests/basics/io_iobase.py
index d3824c177f3b3..c01ca6a5073d6 100644
--- a/tests/basics/io_iobase.py
+++ b/tests/basics/io_iobase.py
@@ -1,8 +1,9 @@
-import io
 try:
+    import io
+
     io.IOBase
-except AttributeError:
-    print('SKIP')
+except (AttributeError, ImportError):
+    print("SKIP")
     raise SystemExit
 
 
diff --git a/tests/basics/io_stringio1.py b/tests/basics/io_stringio1.py
index 7d355930f5a29..889e3ce697377 100644
--- a/tests/basics/io_stringio1.py
+++ b/tests/basics/io_stringio1.py
@@ -1,4 +1,9 @@
-import io
+try:
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
 a = io.StringIO()
 print('io.StringIO' in repr(a))
 print(a.getvalue())
diff --git a/tests/basics/io_stringio_base.py b/tests/basics/io_stringio_base.py
index 0f65fb3fabc3b..c8890dab73ab7 100644
--- a/tests/basics/io_stringio_base.py
+++ b/tests/basics/io_stringio_base.py
@@ -1,7 +1,11 @@
 # Checks that an instance type inheriting from a native base that uses
 # MP_TYPE_FLAG_ITER_IS_STREAM will still have a getiter.
 
-import io
+try:
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 a = io.StringIO()
 a.write("hello\nworld\nmicro\npython\n")
diff --git a/tests/basics/io_stringio_with.py b/tests/basics/io_stringio_with.py
index a3aa6ec84e066..0155ad5382dcd 100644
--- a/tests/basics/io_stringio_with.py
+++ b/tests/basics/io_stringio_with.py
@@ -1,4 +1,9 @@
-import io
+try:
+    import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
 # test __enter__/__exit__
 with io.StringIO() as b:
     b.write("foo")
diff --git a/tests/basics/io_write_ext.py b/tests/basics/io_write_ext.py
index 695abccef4421..5af1de7a6c3aa 100644
--- a/tests/basics/io_write_ext.py
+++ b/tests/basics/io_write_ext.py
@@ -1,10 +1,11 @@
 # This tests extended (MicroPython-specific) form of write:
 # write(buf, len) and write(buf, offset, len)
-import io
 
 try:
+    import io
+
     io.BytesIO
-except AttributeError:
+except (AttributeError, ImportError):
     print('SKIP')
     raise SystemExit
 
diff --git a/tests/feature_check/io_module.py b/tests/feature_check/io_module.py
deleted file mode 100644
index 9094e605316ba..0000000000000
--- a/tests/feature_check/io_module.py
+++ /dev/null
@@ -1,6 +0,0 @@
-try:
-    import io
-
-    print("io")
-except ImportError:
-    print("no")
diff --git a/tests/feature_check/io_module.py.exp b/tests/feature_check/io_module.py.exp
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/tests/run-tests.py b/tests/run-tests.py
index e2bdf7c2c0286..958ddb1dc80e8 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -695,7 +695,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     skip_async = False
     skip_const = False
     skip_revops = False
-    skip_io_module = False
     skip_fstring = False
     skip_endian = False
     skip_inlineasm = False
@@ -752,11 +751,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         if output == b"TypeError\n":
             skip_revops = True
 
-        # Check if io module exists, and skip such tests if it doesn't
-        output = run_feature_check(pyb, args, "io_module.py")
-        if output != b"io\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, "fstring.py")
         if output != b"a=1\n":
@@ -925,7 +919,6 @@ def run_one_test(test_file):
         is_slice = test_name.find("slice") != -1 or test_name in misc_slice_tests
         is_async = test_name.startswith(("async_", "asyncio_")) or test_name.endswith("_async")
         is_const = test_name.startswith("const")
-        is_io_module = test_name.startswith("io_")
         is_fstring = test_name.startswith("string_fstring")
         is_inlineasm = test_name.startswith("asm")
 
@@ -940,7 +933,6 @@ def run_one_test(test_file):
         skip_it |= skip_async and is_async
         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
         skip_it |= skip_inlineasm and is_inlineasm
 

From f9b6d8e6088545f4d934ca4b4c2baa69ee62e89e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 12:26:40 +1000
Subject: [PATCH 2682/3129] github/workflows: Run webassembly and zephyr
 workflows if tests/ change.

Because these ports run tests as part of CI, and need to be run if any of
the tests change, to check those changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_webassembly.yml | 1 +
 .github/workflows/ports_zephyr.yml      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index 880f15ab34469..ceb35f83cd8f1 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -11,6 +11,7 @@ on:
       - 'shared/**'
       - 'lib/**'
       - 'ports/webassembly/**'
+      - 'tests/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index eb85af6a36154..ca3c36e004cca 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -11,6 +11,7 @@ on:
       - 'shared/**'
       - 'lib/**'
       - 'ports/zephyr/**'
+      - 'tests/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From c16fe5b5ede3dde468bb65cc15e3e072101b0295 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 13:26:19 +1000
Subject: [PATCH 2683/3129] webassembly: Enable C-stack checking.

This gets the recursive stress-tests working on this port.

For relatively small Python functions the maximum recursive depth is about
150 nested calls.

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

diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 770dfbe0ca5c7..e0e2d59ae6bd0 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -49,6 +49,9 @@
 // the top-level call into C.
 static size_t external_call_depth = 0;
 
+// Emscripten defaults to a 64k C-stack, so our limit should be less than that.
+#define CSTACK_SIZE (32 * 1024)
+
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 static void gc_collect_top_level(void);
 #endif
@@ -67,6 +70,8 @@ void external_call_depth_dec(void) {
 }
 
 void mp_js_init(int pystack_size, int heap_size) {
+    mp_cstack_init_with_sp_here(CSTACK_SIZE);
+
     #if MICROPY_ENABLE_PYSTACK
     mp_obj_t *pystack = (mp_obj_t *)malloc(pystack_size * sizeof(mp_obj_t));
     mp_pystack_init(pystack, pystack + pystack_size);
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 544e76f80540d..0783aacbbcd24 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -44,7 +44,6 @@
 #define MICROPY_READER_VFS          (MICROPY_VFS)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_PYSTACK      (1)
-#define MICROPY_STACK_CHECK         (0)
 #define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_REPL_EVENT_DRIVEN   (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)

From 0cb2c69b3f25816416f7141ca32697a3135d8e53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 13:51:58 +1000
Subject: [PATCH 2684/3129] tests/misc/rge_sm.py: Remove unused code from the
 test.

This cleans up the test to remove all unused code, making it smaller,
a bit faster to deploy to a target to run, and also use less RAM on the
target (which may help it run on targets that are just slightly out of
memory running it).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/misc/rge_sm.py | 49 --------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/tests/misc/rge_sm.py b/tests/misc/rge_sm.py
index f5b0910dd3a3f..56dad5749776e 100644
--- a/tests/misc/rge_sm.py
+++ b/tests/misc/rge_sm.py
@@ -39,14 +39,6 @@ def solve(self, finishtime):
             if not self.iterate():
                 break
 
-    def solveNSteps(self, nSteps):
-        for i in range(nSteps):
-            if not self.iterate():
-                break
-
-    def series(self):
-        return zip(*self.Trajectory)
-
 
 # 1-loop RGES for the main parameters of the SM
 # couplings are: g1, g2, g3 of U(1), SU(2), SU(3); yt (top Yukawa), lambda (Higgs quartic)
@@ -79,45 +71,6 @@ def series(self):
 )
 
 
-def drange(start, stop, step):
-    r = start
-    while r < stop:
-        yield r
-        r += step
-
-
-def phaseDiagram(system, trajStart, trajPlot, h=0.1, tend=1.0, range=1.0):
-    tstart = 0.0
-    for i in drange(0, range, 0.1 * range):
-        for j in drange(0, range, 0.1 * range):
-            rk = RungeKutta(system, trajStart(i, j), tstart, h)
-            rk.solve(tend)
-            # draw the line
-            for tr in rk.Trajectory:
-                x, y = trajPlot(tr)
-                print(x, y)
-            print()
-            # draw the arrow
-            continue
-            l = (len(rk.Trajectory) - 1) / 3
-            if l > 0 and 2 * l < len(rk.Trajectory):
-                p1 = rk.Trajectory[l]
-                p2 = rk.Trajectory[2 * l]
-                x1, y1 = trajPlot(p1)
-                x2, y2 = trajPlot(p2)
-                dx = -0.5 * (y2 - y1)  # orthogonal to line
-                dy = 0.5 * (x2 - x1)  # orthogonal to line
-                # l = math.sqrt(dx*dx + dy*dy)
-                # if abs(l) > 1e-3:
-                #    l = 0.1 / l
-                #    dx *= l
-                #    dy *= l
-                print(x1 + dx, y1 + dy)
-                print(x2, y2)
-                print(x1 - dx, y1 - dy)
-                print()
-
-
 def singleTraj(system, trajStart, h=0.02, tend=1.0):
     is_REPR_C = float("1.0000001") == float("1.0")
     tstart = 0.0
@@ -141,7 +94,5 @@ def singleTraj(system, trajStart, h=0.02, tend=1.0):
         print(tr_str)
 
 
-# phaseDiagram(sysSM, (lambda i, j: [0.354, 0.654, 1.278, 0.8 + 0.2 * i, 0.1 + 0.1 * j]), (lambda a: (a[4], a[5])), h=0.1, tend=math.log(10**17))
-
 # 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))  # true values

From 0f5f6484a2e6f330d03ee4786011ccb8062ac325 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 10 Aug 2025 12:05:32 +1000
Subject: [PATCH 2685/3129] tests/run-tests.py: Add support for .native.exp
 expected output files.

There are currently a few tests that are excluded when using the native
emitter because they test printing of exception tracebacks, which includes
line numbers.  And the native emitter doesn't store line numbers, so gets
these tests wrong.

But we'd still like to run these tests using the native emitter, because
they test useful things even if the line number info is not in the
traceback (eg that threads which crash print out their exception).

This commit adds support for native-specific .exp files, which are of the
form `<test>.py.native.exp`.  If such an .exp file exists then it take
precedence over any normal `<test>.py.exp` file.

(Actually, the implementation here is general enough that it also supports
`<test>.py.bytecode.exp` as well, if bytecode ever needs a specific exp
file.)

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 958ddb1dc80e8..d0a9121b4a4ca 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -994,7 +994,11 @@ def run_one_test(test_file):
             # Expected output is result of running unittest.
             output_expected = None
         else:
-            test_file_expected = test_file + ".exp"
+            # Prefer emitter-specific expected output.
+            test_file_expected = test_file + "." + args.emit + ".exp"
+            if not os.path.isfile(test_file_expected):
+                # Fall back to generic expected output.
+                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:
@@ -1202,8 +1206,8 @@ def main():
 {test_directory_description}
 
 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.
+produced by running the test through CPython unless a <test>.exp file is found (or a
+<test>.native.exp file when using the native emitter), in which 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.

From 95d1794afdbef4d0b57af321c0a5d69320dbe9fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 10 Aug 2025 12:04:58 +1000
Subject: [PATCH 2686/3129] tests/misc/print_exception.py: Use "raise e"
 instead of no-arg "raise".

This allows the test to run with the native emitter.

The test semantics remain the same.

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

diff --git a/tests/misc/print_exception.py b/tests/misc/print_exception.py
index 92754733b58b1..d41478360faf3 100644
--- a/tests/misc/print_exception.py
+++ b/tests/misc/print_exception.py
@@ -71,7 +71,7 @@ def g():
     except Exception as e:
         print("reraise")
         print_exc(e)
-        raise
+        raise e
 except Exception as e:
     print("caught")
     print_exc(e)

From 3c72c3a1e60cecc6ab05d5a81a1b50f42999f10f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 14:07:09 +1000
Subject: [PATCH 2687/3129] tests/micropython/opt_level_lineno.py: Force test
 func to use bytecode.

So that the test can run the same on all targets when used with the native
emitter.

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

diff --git a/tests/micropython/opt_level_lineno.py b/tests/micropython/opt_level_lineno.py
index d8253e54b41f0..dda9092d868cf 100644
--- a/tests/micropython/opt_level_lineno.py
+++ b/tests/micropython/opt_level_lineno.py
@@ -3,4 +3,15 @@
 # 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)")
+
+# force bytecode emitter, because native emitter doesn't store line numbers
+exec("""
+@micropython.bytecode
+def f():
+    try:
+        xyz
+    except NameError as er:
+        import sys
+        sys.print_exception(er)
+f()
+""")
diff --git a/tests/micropython/opt_level_lineno.py.exp b/tests/micropython/opt_level_lineno.py.exp
index 469b90ba7938a..b50f0628c81fb 100644
--- a/tests/micropython/opt_level_lineno.py.exp
+++ b/tests/micropython/opt_level_lineno.py.exp
@@ -1,3 +1,3 @@
 Traceback (most recent call last):
-  File "<string>", line 1, in <module>
+  File "<string>", line 1, in f
 NameError: name 'xyz' isn't defined
diff --git a/tests/run-tests.py b/tests/run-tests.py
index d0a9121b4a4ca..f8174b2d3b0c2 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -131,7 +131,6 @@ def open(self, path, mode):
         "misc/print_exception.py",
         "micropython/emg_exc.py",
         "micropython/heapalloc_traceback.py",
-        "micropython/opt_level_lineno.py",
         "thread/thread_exc2.py",
         # These require stack-allocated slice optimisation.
         "micropython/heapalloc_slice.py",

From a279c64046445c9dbde0a5d3d53d467cb7e43550 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 10 Aug 2025 12:06:16 +1000
Subject: [PATCH 2688/3129] tests: Add .native.exp output files for tests that
 differ with native.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/sys_tracebacklimit.py.native.exp | 22 +++++++++++++++++++
 tests/micropython/emg_exc.py.native.exp       |  2 ++
 .../heapalloc_traceback.py.native.exp         |  3 +++
 tests/misc/print_exception.py.native.exp      | 18 +++++++++++++++
 tests/run-tests.py                            |  6 -----
 tests/thread/thread_exc2.py.native.exp        |  3 +++
 6 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 tests/basics/sys_tracebacklimit.py.native.exp
 create mode 100644 tests/micropython/emg_exc.py.native.exp
 create mode 100644 tests/micropython/heapalloc_traceback.py.native.exp
 create mode 100644 tests/misc/print_exception.py.native.exp
 create mode 100644 tests/thread/thread_exc2.py.native.exp

diff --git a/tests/basics/sys_tracebacklimit.py.native.exp b/tests/basics/sys_tracebacklimit.py.native.exp
new file mode 100644
index 0000000000000..f9d30c058564b
--- /dev/null
+++ b/tests/basics/sys_tracebacklimit.py.native.exp
@@ -0,0 +1,22 @@
+ValueError: value
+
+limit 4
+ValueError: value
+
+limit 3
+ValueError: value
+
+limit 2
+ValueError: value
+
+limit 1
+ValueError: value
+
+limit 0
+ValueError: value
+
+limit -1
+ValueError: value
+
+True
+False
diff --git a/tests/micropython/emg_exc.py.native.exp b/tests/micropython/emg_exc.py.native.exp
new file mode 100644
index 0000000000000..9677c526a9cc8
--- /dev/null
+++ b/tests/micropython/emg_exc.py.native.exp
@@ -0,0 +1,2 @@
+ValueError: 1
+
diff --git a/tests/micropython/heapalloc_traceback.py.native.exp b/tests/micropython/heapalloc_traceback.py.native.exp
new file mode 100644
index 0000000000000..d6ac26aa829e1
--- /dev/null
+++ b/tests/micropython/heapalloc_traceback.py.native.exp
@@ -0,0 +1,3 @@
+StopIteration
+StopIteration: 
+
diff --git a/tests/misc/print_exception.py.native.exp b/tests/misc/print_exception.py.native.exp
new file mode 100644
index 0000000000000..59e856ae3c44a
--- /dev/null
+++ b/tests/misc/print_exception.py.native.exp
@@ -0,0 +1,18 @@
+caught
+Exception: msg
+
+caught
+Exception: fail
+
+finally
+caught
+Exception: fail
+
+reraise
+Exception: fail
+
+caught
+Exception: fail
+
+AttributeError: 'function' object has no attribute 'X'
+
diff --git a/tests/run-tests.py b/tests/run-tests.py
index f8174b2d3b0c2..aeea0bad5e779 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -126,12 +126,6 @@ def open(self, path, mode):
         "basics/unboundlocal.py",
         # These require "raise from".
         "basics/exception_chain.py",
-        # These require proper traceback info.
-        "basics/sys_tracebacklimit.py",
-        "misc/print_exception.py",
-        "micropython/emg_exc.py",
-        "micropython/heapalloc_traceback.py",
-        "thread/thread_exc2.py",
         # These require stack-allocated slice optimisation.
         "micropython/heapalloc_slice.py",
         # These require running the scheduler.
diff --git a/tests/thread/thread_exc2.py.native.exp b/tests/thread/thread_exc2.py.native.exp
new file mode 100644
index 0000000000000..9b2e715ef8dfc
--- /dev/null
+++ b/tests/thread/thread_exc2.py.native.exp
@@ -0,0 +1,3 @@
+Unhandled exception in thread started by <function thread_entry at 0x\[0-9a-f\]\+>
+ValueError: 
+done

From 2bba507148e8a751123257fa2b075c70d67e1160 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 10:48:16 +1000
Subject: [PATCH 2689/3129] tests: Require SSL certificate file to be available
 for test to run.

Previously, any test needing an SSL certificate file would automatically
skip if the file could not be found.  But that makes it too easy to
accidentally skip tests.

Instead, change it so that the test fails if the certificate file doesn't
exist.  That matches, for example, the fact that the test fails if
networking (LAN, WiFi) is not active.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/asyncio_tls_server_client.py               | 7 -------
 .../asyncio_tls_server_client_cert_required_error.py       | 7 -------
 tests/multi_net/asyncio_tls_server_client_readline.py      | 7 -------
 tests/multi_net/asyncio_tls_server_client_verify_error.py  | 7 -------
 tests/multi_net/ssl_cert_ec.py                             | 7 -------
 tests/multi_net/ssl_cert_rsa.py                            | 7 -------
 tests/multi_net/sslcontext_check_hostname_error.py         | 7 -------
 tests/multi_net/sslcontext_getpeercert.py                  | 7 -------
 tests/multi_net/sslcontext_server_client_files.py          | 7 -------
 tests/multi_net/sslcontext_verify_error.py                 | 7 -------
 tests/multi_net/sslcontext_verify_time_error.py            | 7 -------
 tests/net_inet/asyncio_tls_open_connection_readline.py     | 6 ------
 tests/net_inet/test_sslcontext_client.py                   | 5 -----
 13 files changed, 88 deletions(-)

diff --git a/tests/multi_net/asyncio_tls_server_client.py b/tests/multi_net/asyncio_tls_server_client.py
index 98f15c6625f0e..016f57970c092 100644
--- a/tests/multi_net/asyncio_tls_server_client.py
+++ b/tests/multi_net/asyncio_tls_server_client.py
@@ -14,13 +14,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 async def handle_connection(reader, writer):
     data = await reader.read(100)
diff --git a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
index 178ad39274032..eac9a98beae6c 100644
--- a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
+++ b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
@@ -14,13 +14,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 async def handle_connection(reader, writer):
     print("handle connection")
diff --git a/tests/multi_net/asyncio_tls_server_client_readline.py b/tests/multi_net/asyncio_tls_server_client_readline.py
index da5f1afee2ad6..6093628ce5b7b 100644
--- a/tests/multi_net/asyncio_tls_server_client_readline.py
+++ b/tests/multi_net/asyncio_tls_server_client_readline.py
@@ -14,13 +14,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 async def handle_connection(reader, writer):
     data = await reader.readline()
diff --git a/tests/multi_net/asyncio_tls_server_client_verify_error.py b/tests/multi_net/asyncio_tls_server_client_verify_error.py
index 362f0fc8ecf72..6dbff0482c8ae 100644
--- a/tests/multi_net/asyncio_tls_server_client_verify_error.py
+++ b/tests/multi_net/asyncio_tls_server_client_verify_error.py
@@ -14,13 +14,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 async def handle_connection(reader, writer):
     print("handle connection")
diff --git a/tests/multi_net/ssl_cert_ec.py b/tests/multi_net/ssl_cert_ec.py
index 2c5734e052661..8ecbd4d34f6e8 100644
--- a/tests/multi_net/ssl_cert_ec.py
+++ b/tests/multi_net/ssl_cert_ec.py
@@ -13,13 +13,6 @@
 certfile = "ec_cert.der"
 keyfile = "ec_key.der"
 
-try:
-    os.stat(certfile)
-    os.stat(keyfile)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 with open(certfile, "rb") as cf:
     cert = cadata = cf.read()
 
diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
index d148c8ebcfea8..b99493b0ae5d8 100644
--- a/tests/multi_net/ssl_cert_rsa.py
+++ b/tests/multi_net/ssl_cert_rsa.py
@@ -13,13 +13,6 @@
 certfile = "rsa_cert.der"
 keyfile = "rsa_key.der"
 
-try:
-    os.stat(certfile)
-    os.stat(keyfile)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 with open(certfile, "rb") as cf:
     cert = cadata = cf.read()
 
diff --git a/tests/multi_net/sslcontext_check_hostname_error.py b/tests/multi_net/sslcontext_check_hostname_error.py
index d85363f00bd63..6bd911ddfd7cc 100644
--- a/tests/multi_net/sslcontext_check_hostname_error.py
+++ b/tests/multi_net/sslcontext_check_hostname_error.py
@@ -14,13 +14,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 # Server
 def instance0():
diff --git a/tests/multi_net/sslcontext_getpeercert.py b/tests/multi_net/sslcontext_getpeercert.py
index e9d96be248c70..e2d2a4251163b 100644
--- a/tests/multi_net/sslcontext_getpeercert.py
+++ b/tests/multi_net/sslcontext_getpeercert.py
@@ -15,13 +15,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 # Server
 def instance0():
diff --git a/tests/multi_net/sslcontext_server_client_files.py b/tests/multi_net/sslcontext_server_client_files.py
index 64a4215c75b44..48ff6376fad9b 100644
--- a/tests/multi_net/sslcontext_server_client_files.py
+++ b/tests/multi_net/sslcontext_server_client_files.py
@@ -14,13 +14,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 # Server
 def instance0():
diff --git a/tests/multi_net/sslcontext_verify_error.py b/tests/multi_net/sslcontext_verify_error.py
index 5dc461e7708a8..07dcc690b7ccc 100644
--- a/tests/multi_net/sslcontext_verify_error.py
+++ b/tests/multi_net/sslcontext_verify_error.py
@@ -14,13 +14,6 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 # Server
 def instance0():
diff --git a/tests/multi_net/sslcontext_verify_time_error.py b/tests/multi_net/sslcontext_verify_time_error.py
index fbefdecf9f430..7b986322d15bd 100644
--- a/tests/multi_net/sslcontext_verify_time_error.py
+++ b/tests/multi_net/sslcontext_verify_time_error.py
@@ -14,13 +14,6 @@
 cert = cafile = "expired_cert.der"
 key = "ec_key.der"
 
-try:
-    os.stat(cafile)
-    os.stat(key)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 
 # Server
 def instance0():
diff --git a/tests/net_inet/asyncio_tls_open_connection_readline.py b/tests/net_inet/asyncio_tls_open_connection_readline.py
index 70145d91a794b..a0df88be4af1b 100644
--- a/tests/net_inet/asyncio_tls_open_connection_readline.py
+++ b/tests/net_inet/asyncio_tls_open_connection_readline.py
@@ -20,12 +20,6 @@
 
 ca_cert_chain = "isrg.der"
 
-try:
-    os.stat(ca_cert_chain)
-except OSError:
-    print("SKIP")
-    raise SystemExit
-
 with open(ca_cert_chain, "rb") as ca:
     cadata = ca.read()
 
diff --git a/tests/net_inet/test_sslcontext_client.py b/tests/net_inet/test_sslcontext_client.py
index 0c83abb733378..77f68da496a77 100644
--- a/tests/net_inet/test_sslcontext_client.py
+++ b/tests/net_inet/test_sslcontext_client.py
@@ -13,11 +13,6 @@
 # $ openssl x509 -in mpycert.pem -out mpycert.der -outform DER
 
 ca_cert_chain = "mpycert.der"
-try:
-    os.stat(ca_cert_chain)
-except OSError:
-    print("SKIP")
-    raise SystemExit
 
 
 def main(use_stream=True):

From e15219800e4874a6c2653cfbdd0553c37610aeff Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 5 Aug 2025 17:19:02 -0500
Subject: [PATCH 2690/3129] extmod/modframebuf: Fix crash in scroll() for large
 inputs.

If mp_int_t is wider than int, then the tests such as `xend < 0` can fail
even when the amount of scrolling requested is out of range.  This resulted
in a segmentation fault when attempting an out-of-bounds access to the
framebuffer.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/modframebuf.c            | 29 +++++++++++++++--------------
 tests/extmod/framebuf_scroll.py |  5 +++++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 5c4b9abf0c0b8..16606109ccdc4 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -787,39 +787,40 @@ static mp_obj_t framebuf_scroll(mp_obj_t self_in, mp_obj_t xstep_in, mp_obj_t ys
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t xstep = mp_obj_get_int(xstep_in);
     mp_int_t ystep = mp_obj_get_int(ystep_in);
-    int sx, y, xend, yend, dx, dy;
+    unsigned int sx, y, xend, yend;
+    int dx, dy;
     if (xstep < 0) {
-        sx = 0;
-        xend = self->width + xstep;
-        if (xend <= 0) {
+        if (-xstep >= self->width) {
             return mp_const_none;
         }
+        sx = 0;
+        xend = self->width + (int)xstep;
         dx = 1;
     } else {
-        sx = self->width - 1;
-        xend = xstep - 1;
-        if (xend >= sx) {
+        if (xstep >= self->width) {
             return mp_const_none;
         }
+        sx = self->width - 1;
+        xend = (int)xstep - 1;
         dx = -1;
     }
     if (ystep < 0) {
-        y = 0;
-        yend = self->height + ystep;
-        if (yend <= 0) {
+        if (-ystep >= self->height) {
             return mp_const_none;
         }
+        y = 0;
+        yend = self->height + (int)ystep;
         dy = 1;
     } else {
-        y = self->height - 1;
-        yend = ystep - 1;
-        if (yend >= y) {
+        if (ystep >= self->height) {
             return mp_const_none;
         }
+        y = self->height - 1;
+        yend = (int)ystep - 1;
         dy = -1;
     }
     for (; y != yend; y += dy) {
-        for (int x = sx; x != xend; x += dx) {
+        for (unsigned x = sx; x != xend; x += dx) {
             setpixel(self, x, y, getpixel(self, x - xstep, y - ystep));
         }
     }
diff --git a/tests/extmod/framebuf_scroll.py b/tests/extmod/framebuf_scroll.py
index db9b6ea1e9649..d7c07b1c65772 100644
--- a/tests/extmod/framebuf_scroll.py
+++ b/tests/extmod/framebuf_scroll.py
@@ -42,4 +42,9 @@ def prepare_buffer():
 fbuf.scroll(15, 7)
 fbuf.scroll(10, -1)
 fbuf.scroll(1, -10)
+try:
+    fbuf.scroll(1000000000000, -1)
+except OverflowError:
+    # When mp_int_t is 32 bits, this throws OverflowError.
+    pass
 printbuf()

From 803da9645f735edd3d1a80a3f920039e0f0298f2 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 11 Aug 2025 11:48:34 -0500
Subject: [PATCH 2691/3129] extmod/modframebuf: Save code size in setpixel.

There's a slight code size increase paid for by using setpixel_checked for
the last pixel of a line, instead of repeating the checks inline.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/modframebuf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 16606109ccdc4..593125aa16f91 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -483,9 +483,7 @@ static void line(const mp_obj_framebuf_t *fb, mp_int_t x1, mp_int_t y1, mp_int_t
         e += 2 * dy;
     }
 
-    if (0 <= x2 && x2 < fb->width && 0 <= y2 && y2 < fb->height) {
-        setpixel(fb, x2, y2, col);
-    }
+    setpixel_checked(fb, x2, y2, col, 1);
 }
 
 static mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args_in) {

From 0615d13963ba33650a5b2070368584c7aec9c9dd Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 6 Aug 2025 10:15:57 -0500
Subject: [PATCH 2692/3129] py/objringio: Detect incorrect constructor calls.

ringbuffer.size must be at least 2, and is a 16-bit quantity.

This fixes several cases including the one the fuzzer discovered, which
would lead to a fatal signal when accessing the object.

Fixes issue #17847.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objringio.c                      | 19 ++++++++-----------
 tests/micropython/ringio.py         | 18 ++++++++++++++++++
 tests/micropython/ringio.py.exp     |  3 +++
 tests/micropython/ringio_big.py     | 29 +++++++++++++++++++++++++++++
 tests/micropython/ringio_big.py.exp |  2 ++
 5 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 tests/micropython/ringio_big.py
 create mode 100644 tests/micropython/ringio_big.py.exp

diff --git a/py/objringio.c b/py/objringio.c
index ba1ec25307ea4..0025b26be3b07 100644
--- a/py/objringio.c
+++ b/py/objringio.c
@@ -39,22 +39,19 @@ typedef struct _micropython_ringio_obj_t {
 
 static mp_obj_t micropython_ringio_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_int_t buff_size = -1;
     mp_buffer_info_t bufinfo = {NULL, 0, 0};
 
     if (!mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) {
-        buff_size = mp_obj_get_int(args[0]);
+        bufinfo.len = mp_obj_get_int(args[0]) + 1;
+        bufinfo.buf = m_new(uint8_t, bufinfo.len);
     }
-    micropython_ringio_obj_t *self = mp_obj_malloc(micropython_ringio_obj_t, type);
-    if (bufinfo.buf != NULL) {
-        // buffer passed in, use it directly for ringbuffer.
-        self->ringbuffer.buf = bufinfo.buf;
-        self->ringbuffer.size = bufinfo.len;
-        self->ringbuffer.iget = self->ringbuffer.iput = 0;
-    } else {
-        // Allocate new buffer, add one extra to buff_size as ringbuf consumes one byte for tracking.
-        ringbuf_alloc(&(self->ringbuffer), buff_size + 1);
+    if (bufinfo.len < 2 || bufinfo.len > UINT16_MAX) {
+        mp_raise_ValueError(NULL);
     }
+    micropython_ringio_obj_t *self = mp_obj_malloc(micropython_ringio_obj_t, type);
+    self->ringbuffer.buf = bufinfo.buf;
+    self->ringbuffer.size = bufinfo.len;
+    self->ringbuffer.iget = self->ringbuffer.iput = 0;
     return MP_OBJ_FROM_PTR(self);
 }
 
diff --git a/tests/micropython/ringio.py b/tests/micropython/ringio.py
index a0102ef63dafa..4109288798448 100644
--- a/tests/micropython/ringio.py
+++ b/tests/micropython/ringio.py
@@ -46,3 +46,21 @@
     micropython.RingIO(None)
 except TypeError as ex:
     print(type(ex))
+
+try:
+    # Buffer may not be empty
+    micropython.RingIO(bytearray(0))
+except ValueError as ex:
+    print(type(ex))
+
+try:
+    # Buffer may not be too small
+    micropython.RingIO(bytearray(1))
+except ValueError as ex:
+    print(type(ex))
+
+try:
+    # Size may not be too small
+    micropython.RingIO(0)
+except ValueError as ex:
+    print(type(ex))
diff --git a/tests/micropython/ringio.py.exp b/tests/micropython/ringio.py.exp
index 65bae06472f8d..c391529a41e54 100644
--- a/tests/micropython/ringio.py.exp
+++ b/tests/micropython/ringio.py.exp
@@ -14,3 +14,6 @@ b'\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01'
 0
 b'\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01'
 <class 'TypeError'>
+<class 'ValueError'>
+<class 'ValueError'>
+<class 'ValueError'>
diff --git a/tests/micropython/ringio_big.py b/tests/micropython/ringio_big.py
new file mode 100644
index 0000000000000..d55c4c00b7c0d
--- /dev/null
+++ b/tests/micropython/ringio_big.py
@@ -0,0 +1,29 @@
+# Check that micropython.RingIO works correctly.
+
+import micropython
+
+try:
+    micropython.RingIO
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    # The maximum possible size
+    micropython.RingIO(bytearray(65535))
+    micropython.RingIO(65534)
+
+    try:
+        # Buffer may not be too big
+        micropython.RingIO(bytearray(65536))
+    except ValueError as ex:
+        print(type(ex))
+
+    try:
+        # Size may not be too big
+        micropython.RingIO(65535)
+    except ValueError as ex:
+        print(type(ex))
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
diff --git a/tests/micropython/ringio_big.py.exp b/tests/micropython/ringio_big.py.exp
new file mode 100644
index 0000000000000..72af34b383872
--- /dev/null
+++ b/tests/micropython/ringio_big.py.exp
@@ -0,0 +1,2 @@
+<class 'ValueError'>
+<class 'ValueError'>

From 141f7d0c35516403c39ce6266be7c6fb4551ef6f Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Tue, 12 Aug 2025 11:51:53 +0100
Subject: [PATCH 2693/3129] py/mkrules.cmake: Clean genhdr and frozen_mpy dirs.

CMake builds relied upon the parent Makefile removing the entire
build directory to successfully clean build artifacts.

py/mkrules.cmake: Add ADDITIONAL_CLEAN_FILES properties to ensure a
		  "make clean" from within the build directory removes
                  the genhdr and frozen_mpy directories.

Signed-off-by: Phil Howard <github@gadgetoid.com>
---
 py/mkrules.cmake | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 27d8b24f67ac8..e3d769cc59b5c 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -100,6 +100,12 @@ if(MICROPY_ROM_TEXT_COMPRESSION)
     )
 endif()
 
+# Ensure genhdr directory is removed on clean
+
+set_property(TARGET ${MICROPY_TARGET} APPEND PROPERTY ADDITIONAL_CLEAN_FILES
+    "${MICROPY_GENHDR_DIR}"
+)
+
 # Command to force the build of another command
 
 # Generate mpversion.h
@@ -244,6 +250,10 @@ add_custom_command(
 if(MICROPY_FROZEN_MANIFEST)
     set(MICROPY_FROZEN_CONTENT "${CMAKE_BINARY_DIR}/frozen_content.c")
 
+    set_property(TARGET ${MICROPY_TARGET} APPEND PROPERTY ADDITIONAL_CLEAN_FILES
+        "${CMAKE_BINARY_DIR}/frozen_mpy"
+    )
+
     target_sources(${MICROPY_TARGET} PRIVATE
         ${MICROPY_FROZEN_CONTENT}
     )

From 3efbd726eb89a1514c01a51857100b2718f12a50 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 14:44:48 +1000
Subject: [PATCH 2694/3129] py/parse: Remove explicit checks for invalid
 folding operations.

They are instead checked by `binary_op_maybe()`, which catches exceptions
for invalid int/float operations.

This is a follow-up to 69ead7d98ef30df3b6bd4485633490e80fca1718

Signed-off-by: Damien George <damien@micropython.org>
---
 py/parse.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/py/parse.c b/py/parse.c
index 6260987b28a35..1a50b13b5c790 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -771,12 +771,6 @@ static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
             if (!mp_parse_node_get_number_maybe(pn, &arg1)) {
                 return false;
             }
-            #if !MICROPY_COMP_CONST_FLOAT
-            if (op == MP_BINARY_OP_POWER && mp_obj_int_sign(arg1) < 0) {
-                // ** can't have negative rhs
-                return false;
-            }
-            #endif
             if (!binary_op_maybe(op, arg0, arg1, &arg0)) {
                 return false;
             }
@@ -796,16 +790,6 @@ static bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
                 return false;
             }
             mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, i));
-            if (tok == MP_TOKEN_OP_AT) {
-                // Can't fold @
-                return false;
-            }
-            #if !MICROPY_COMP_CONST_FLOAT
-            if (tok == MP_TOKEN_OP_SLASH) {
-                // Can't fold /
-                return false;
-            }
-            #endif
             mp_binary_op_t op = MP_BINARY_OP_LSHIFT + (tok - MP_TOKEN_OP_DBL_LESS);
             if (!binary_op_maybe(op, arg0, arg1, &arg0)) {
                 return false;

From 40cc4e4f74b1f39076100136bc2cb8db5ff24ea5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 16:35:16 +1000
Subject: [PATCH 2695/3129] py/objtype: Make mp_obj_new_type a static function.

It's only used once, in the same file it's defined, and making it static
reduces code size.

Along with this, the associated example code comment in `ports/unix/main.c`
has been removed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c | 13 -------------
 py/obj.h          |  1 -
 py/objtype.c      |  3 ++-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 530e20a3863b4..5f6b99f989a3a 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -616,19 +616,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
     }
     #endif
 
-    // Here is some example code to create a class and instance of that class.
-    // First is the Python, then the C code.
-    //
-    // class TestClass:
-    //     pass
-    // test_obj = TestClass()
-    // test_obj.attr = 42
-    //
-    // mp_obj_t test_class_type, test_class_instance;
-    // 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");
     printf("    total %d\n", m_get_total_bytes_allocated());
diff --git a/py/obj.h b/py/obj.h
index 4ac0cc0c611e5..69d6e626db3c1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -987,7 +987,6 @@ void *mp_obj_malloc_with_finaliser_helper(size_t num_bytes, const mp_obj_type_t
 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);
 static inline mp_obj_t mp_obj_new_bool(mp_int_t x) {
     return x ? mp_const_true : mp_const_false;
 }
diff --git a/py/objtype.c b/py/objtype.c
index 818ceeb0589fb..25c2dee994d74 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -44,6 +44,7 @@
 #define ENABLE_SPECIAL_ACCESSORS \
     (MICROPY_PY_DESCRIPTORS || MICROPY_PY_DELATTR_SETATTR || MICROPY_PY_BUILTINS_PROPERTY)
 
+static mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict);
 static mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo);
 static mp_obj_t static_class_method_make_new(const mp_obj_type_t *self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
@@ -1164,7 +1165,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     attr, type_attr
     );
 
-mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict) {
+static 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
     if (!mp_obj_is_type(bases_tuple, &mp_type_tuple)) {
         mp_raise_TypeError(NULL);

From b3cd1a355ebf50e06ec9f0c1594e47abd7ee339c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 11:47:52 +1000
Subject: [PATCH 2696/3129] extmod/modtime: Move tuple creation to common
 localtime implementation.

This factors code out of the ports and into the common `time.localtime`
implementation in `extmod/modtime.c`.  That helps to reduce code
duplication, prevent errors in implementation, and reduce code size on
some ports (mimxrt and stm32 at least).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modtime.c            | 26 +++++++++++++-------------
 ports/cc3200/mods/modtime.c | 19 +++----------------
 ports/esp32/modtime.c       | 18 +++---------------
 ports/esp8266/modtime.c     | 18 +++---------------
 ports/mimxrt/modtime.c      | 23 ++++++++++-------------
 ports/renesas-ra/modtime.c  | 23 ++++++++++-------------
 ports/rp2/modtime.c         | 18 +++---------------
 ports/samd/modtime.c        | 22 +++++-----------------
 ports/stm32/modtime.c       | 23 ++++++++++-------------
 ports/webassembly/modtime.c | 18 +++---------------
 10 files changed, 63 insertions(+), 145 deletions(-)

diff --git a/extmod/modtime.c b/extmod/modtime.c
index 999b81230bcb9..ee898828a4ab1 100644
--- a/extmod/modtime.c
+++ b/extmod/modtime.c
@@ -53,26 +53,26 @@
 // - 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) {
+    timeutils_struct_time_t tm;
     if (n_args == 0 || args[0] == mp_const_none) {
         // Get current date and time.
-        return mp_time_localtime_get();
+        mp_time_localtime_get(&tm);
     } else {
         // Convert given seconds to tuple.
         mp_timestamp_t seconds = timeutils_obj_get_timestamp(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_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(tm.tm_hour),
+        mp_obj_new_int(tm.tm_min),
+        mp_obj_new_int(tm.tm_sec),
+        mp_obj_new_int(tm.tm_wday),
+        mp_obj_new_int(tm.tm_yday),
+    };
+    return mp_obj_new_tuple(8, tuple);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_time_localtime_obj, 0, 1, time_localtime);
 
diff --git a/ports/cc3200/mods/modtime.c b/ports/cc3200/mods/modtime.c
index 254678fb2ddc5..d111667001115 100644
--- a/ports/cc3200/mods/modtime.c
+++ b/ports/cc3200/mods/modtime.c
@@ -29,23 +29,10 @@
 #include "shared/timeutils/timeutils.h"
 #include "pybrtc.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
-    timeutils_struct_time_t tm;
-
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
     // get the seconds from the RTC
-    timeutils_seconds_since_2000_to_struct_time(pyb_rtc_get_seconds(), &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(tm.tm_hour),
-            mp_obj_new_int(tm.tm_min),
-            mp_obj_new_int(tm.tm_sec),
-            mp_obj_new_int(tm.tm_wday),
-            mp_obj_new_int(tm.tm_yday)
-    };
-    return mp_obj_new_tuple(8, tuple);
+    timeutils_seconds_since_2000_to_struct_time(pyb_rtc_get_seconds(), tm);
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
diff --git a/ports/esp32/modtime.c b/ports/esp32/modtime.c
index 991f2cf578771..64f9359db69af 100644
--- a/ports/esp32/modtime.c
+++ b/ports/esp32/modtime.c
@@ -31,23 +31,11 @@
 #include "py/obj.h"
 #include "shared/timeutils/timeutils.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    timeutils_struct_time_t tm;
-    timeutils_seconds_since_epoch_to_struct_time(tv.tv_sec, &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);
+    timeutils_seconds_since_epoch_to_struct_time(tv.tv_sec, tm);
 }
 
 // Return the number of seconds since the Epoch.
diff --git a/ports/esp8266/modtime.c b/ports/esp8266/modtime.c
index e99d920fde80b..c0c1dccfe474d 100644
--- a/ports/esp8266/modtime.c
+++ b/ports/esp8266/modtime.c
@@ -29,22 +29,10 @@
 #include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
     mp_uint_t seconds = pyb_rtc_get_us_since_epoch() / 1000u / 1000u;
-    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);
+    timeutils_seconds_since_epoch_to_struct_time(seconds, tm);
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
diff --git a/ports/mimxrt/modtime.c b/ports/mimxrt/modtime.c
index 3bcfac411c0b3..fe77b8a733be2 100644
--- a/ports/mimxrt/modtime.c
+++ b/ports/mimxrt/modtime.c
@@ -29,22 +29,19 @@
 #include "shared/timeutils/timeutils.h"
 #include "fsl_snvs_lp.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
     // 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(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);
+    tm->tm_year = t.year;
+    tm->tm_mon = t.month;
+    tm->tm_mday = t.day;
+    tm->tm_hour = t.hour;
+    tm->tm_min = t.minute;
+    tm->tm_sec = t.second;
+    tm->tm_wday = timeutils_calc_weekday(t.year, t.month, t.day);
+    tm->tm_yday = timeutils_year_day(t.year, t.month, t.day);
 }
 
 // Return the number of seconds since the Epoch.
diff --git a/ports/renesas-ra/modtime.c b/ports/renesas-ra/modtime.c
index e1358f82bc5a4..b778ab2fe5e2a 100644
--- a/ports/renesas-ra/modtime.c
+++ b/ports/renesas-ra/modtime.c
@@ -28,23 +28,20 @@
 #include "shared/timeutils/timeutils.h"
 #include "rtc.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
     // get current date and time
     rtc_init_finalise();
     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);
+    tm->tm_year = time.year;
+    tm->tm_mon = time.month;
+    tm->tm_mday = time.date;
+    tm->tm_hour = time.hour;
+    tm->tm_min = time.minute;
+    tm->tm_sec = time.second;
+    tm->tm_wday = time.weekday - 1;
+    tm->tm_yday = timeutils_year_day(time.year, time.month, time.date);
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
diff --git a/ports/rp2/modtime.c b/ports/rp2/modtime.c
index 7d6dd8fd97112..a860903285e55 100644
--- a/ports/rp2/modtime.c
+++ b/ports/rp2/modtime.c
@@ -28,23 +28,11 @@
 #include "shared/timeutils/timeutils.h"
 #include "pico/aon_timer.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
     struct timespec ts;
     aon_timer_get_time(&ts);
-    timeutils_struct_time_t tm;
-    timeutils_seconds_since_epoch_to_struct_time(ts.tv_sec, &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(tm.tm_hour),
-        mp_obj_new_int(tm.tm_min),
-        mp_obj_new_int(tm.tm_sec),
-        mp_obj_new_int(tm.tm_wday),
-        mp_obj_new_int(tm.tm_yday),
-    };
-    return mp_obj_new_tuple(8, tuple);
+    timeutils_seconds_since_epoch_to_struct_time(ts.tv_sec, tm);
 }
 
 // Return the number of seconds since the Epoch.
diff --git a/ports/samd/modtime.c b/ports/samd/modtime.c
index 0bed3cb83a868..6168c645d6313 100644
--- a/ports/samd/modtime.c
+++ b/ports/samd/modtime.c
@@ -30,23 +30,11 @@
 
 static uint64_t time_us_64_offset_from_epoch;
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
-    timeutils_struct_time_t tm;
-    rtc_gettime(&tm);
-    tm.tm_wday = timeutils_calc_weekday(tm.tm_year, tm.tm_mon, tm.tm_mday);
-    tm.tm_yday = timeutils_year_day(tm.tm_year, tm.tm_mon, tm.tm_mday);
-    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);
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
+    rtc_gettime(tm);
+    tm->tm_wday = timeutils_calc_weekday(tm->tm_year, tm->tm_mon, tm->tm_mday);
+    tm->tm_yday = timeutils_year_day(tm->tm_year, tm->tm_mon, tm->tm_mday);
 }
 
 // Returns the number of seconds, as an integer, since the Epoch.
diff --git a/ports/stm32/modtime.c b/ports/stm32/modtime.c
index 87a4536b04374..e7051065187bc 100644
--- a/ports/stm32/modtime.c
+++ b/ports/stm32/modtime.c
@@ -28,8 +28,8 @@
 #include "shared/timeutils/timeutils.h"
 #include "rtc.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
     // get current date and time
     // note: need to call get time then get date to correctly access the registers
     rtc_init_finalise();
@@ -37,17 +37,14 @@ static mp_obj_t mp_time_localtime_get(void) {
     RTC_TimeTypeDef time;
     HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN);
     HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN);
-    mp_obj_t tuple[8] = {
-        mp_obj_new_int(2000 + date.Year),
-        mp_obj_new_int(date.Month),
-        mp_obj_new_int(date.Date),
-        mp_obj_new_int(time.Hours),
-        mp_obj_new_int(time.Minutes),
-        mp_obj_new_int(time.Seconds),
-        mp_obj_new_int(date.WeekDay - 1),
-        mp_obj_new_int(timeutils_year_day(2000 + date.Year, date.Month, date.Date)),
-    };
-    return mp_obj_new_tuple(8, tuple);
+    tm->tm_year = 2000 + date.Year;
+    tm->tm_mon = date.Month;
+    tm->tm_mday = date.Date;
+    tm->tm_hour = time.Hours;
+    tm->tm_min = time.Minutes;
+    tm->tm_sec = time.Seconds;
+    tm->tm_wday = date.WeekDay - 1;
+    tm->tm_yday = timeutils_year_day(tm->tm_year, date.Month, date.Date);
 }
 
 // Returns the number of seconds, as an integer, since 1/1/2000.
diff --git a/ports/webassembly/modtime.c b/ports/webassembly/modtime.c
index 1b1e63d4ddf3a..b6c0cda96da12 100644
--- a/ports/webassembly/modtime.c
+++ b/ports/webassembly/modtime.c
@@ -28,21 +28,9 @@
 #include "shared/timeutils/timeutils.h"
 #include "library.h"
 
-// Return the localtime as an 8-tuple.
-static mp_obj_t mp_time_localtime_get(void) {
-    timeutils_struct_time_t tm;
-    timeutils_seconds_since_epoch_to_struct_time(mp_hal_time_ms() / 1000, &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(tm.tm_hour),
-        mp_obj_new_int(tm.tm_min),
-        mp_obj_new_int(tm.tm_sec),
-        mp_obj_new_int(tm.tm_wday),
-        mp_obj_new_int(tm.tm_yday),
-    };
-    return mp_obj_new_tuple(8, tuple);
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
+    timeutils_seconds_since_epoch_to_struct_time(mp_hal_time_ms() / 1000, tm);
 }
 
 // Returns the number of seconds, as a float, since the Epoch.

From e58848a21eb6dafce53df991c52ac8db52354daa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 13:00:11 +1000
Subject: [PATCH 2697/3129] alif/machine_rtc: Implement RTC.datetime to get and
 set the RTC.

The LPRTC peripheral is a 32-bit counter with a 16-bit prescaler.  It's
configured here to count at 1Hz (to get maximum date range) and then the
prescaler value is used to get 30 microsecond resolution.  That's
essentially a 32+15=47-bit counter.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/machine_rtc.c | 104 ++++++++++++++++++++++++++++++++++++---
 ports/alif/mphalport.h   |   2 +
 2 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/ports/alif/machine_rtc.c b/ports/alif/machine_rtc.c
index 6473d1d80fbff..739fcab4b6cb0 100644
--- a/ports/alif/machine_rtc.c
+++ b/ports/alif/machine_rtc.c
@@ -28,9 +28,20 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/modmachine.h"
+#include "shared/timeutils/timeutils.h"
 #include "rtc.h"
 #include "sys_ctrl_rtc.h"
 
+// The LPRTC (low-power real-time counter) is a 32-bit counter with a 16-bit prescaler,
+// and usually clocked by a 32768Hz clock source.  To get a large date range of around
+// 136 years, the prescaler is set to 32768 and so the counter clocks at 1Hz.  Then the
+// counter counts the number of seconds since the 1970 Epoch.  The prescaler is used to
+// get the subseconds which are then converted to microseconds.
+//
+// The combined counter+prescaler counts starting at 0 from the year 1970 up to the year
+// 2106, with a resolution of 30.52 microseconds.
+#define LPRTC_PRESCALER_SETTING (32768)
+
 typedef struct _machine_rtc_obj_t {
     mp_obj_base_t base;
     LPRTC_Type *rtc;
@@ -44,24 +55,97 @@ void LPRTC_IRQHandler(void) {
     lprtc_interrupt_disable(machine_rtc.rtc);
 }
 
+// Returns the number of seconds and microseconds since the Epoch.
+uint32_t mp_hal_time_get(uint32_t *microseconds) {
+    uint32_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+    uint32_t count = lprtc_get_count(machine_rtc.rtc);
+    if (microseconds == NULL) {
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
+        return count;
+    }
+    uint32_t prescaler = machine_rtc.rtc->LPRTC_CPCVR;
+    uint32_t count2 = lprtc_get_count(machine_rtc.rtc);
+    if (count != count2) {
+        // The counter incremented during sampling of the prescaler, so resample the prescaler.
+        prescaler = machine_rtc.rtc->LPRTC_CPCVR;
+    }
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+
+    // Compute the microseconds from the up-counting prescaler value.
+    MP_STATIC_ASSERT(LPRTC_PRESCALER_SETTING == 32768);
+    *microseconds = 15625UL * prescaler / 512UL;
+
+    return count2;
+}
+
 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) {
     const machine_rtc_obj_t *self = &machine_rtc;
 
     // Check arguments.
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
-    enable_lprtc_clk();
-    lprtc_prescaler_disable(self->rtc);
-    lprtc_counter_wrap_disable(self->rtc);
     lprtc_interrupt_disable(self->rtc);
     lprtc_interrupt_unmask(self->rtc);
 
+    // Initialise the LPRTC if it's not already enabled.
+    if (!((VBAT->RTC_CLK_EN & RTC_CLK_ENABLE)
+          && (self->rtc->LPRTC_CCR & CCR_LPRTC_EN)
+          && (self->rtc->LPRTC_CPSR == LPRTC_PRESCALER_SETTING))) {
+        enable_lprtc_clk();
+        self->rtc->LPRTC_CCR = 0;
+        lprtc_load_prescaler(self->rtc, LPRTC_PRESCALER_SETTING);
+        lprtc_load_count(self->rtc, 0);
+        self->rtc->LPRTC_CCR = CCR_LPRTC_PSCLR_EN | CCR_LPRTC_EN;
+    }
+
     NVIC_SetPriority(LPRTC_IRQ_IRQn, IRQ_PRI_RTC);
     NVIC_ClearPendingIRQ(LPRTC_IRQ_IRQn);
     NVIC_EnableIRQ(LPRTC_IRQ_IRQn);
+
     return MP_OBJ_FROM_PTR(self);
 }
 
+static mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+    if (n_args == 1) {
+        // Get datetime.
+        uint32_t microseconds;
+        mp_timestamp_t s = mp_hal_time_get(&microseconds);
+        timeutils_struct_time_t tm;
+        timeutils_seconds_since_epoch_to_struct_time(s, &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(tm.tm_wday),
+            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(microseconds),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Set datetime.
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+        timeutils_struct_time_t tm = {
+            .tm_year = mp_obj_get_int(items[0]),
+            .tm_mon = mp_obj_get_int(items[1]),
+            .tm_mday = mp_obj_get_int(items[2]),
+            .tm_hour = mp_obj_get_int(items[4]),
+            .tm_min = mp_obj_get_int(items[5]),
+            .tm_sec = mp_obj_get_int(items[6]),
+        };
+        mp_timestamp_t s = timeutils_seconds_since_epoch(tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+
+        // Disable then re-enable the LPRTC so that the prescaler counter resets to 0.
+        machine_rtc.rtc->LPRTC_CCR = 0;
+        lprtc_load_count(machine_rtc.rtc, s);
+        machine_rtc.rtc->LPRTC_CCR = CCR_LPRTC_PSCLR_EN | CCR_LPRTC_EN;
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
+
 static mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_id, ARG_time, ARG_repeat };
 
@@ -80,13 +164,18 @@ static mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_ma
     if (mp_obj_is_int(args[ARG_time].u_obj)) {
         uint32_t seconds = mp_obj_get_int(args[1].u_obj) / 1000;
 
-        lprtc_counter_disable(self->rtc);
-        lprtc_load_count(self->rtc, 1);
-        lprtc_load_counter_match_register(self->rtc, seconds * 32768);
+        // Make sure we are guaranteed an interrupt:
+        // - if seconds = 0 it won't fire
+        // - if seconds = 1 it may miss if the counter rolls over just after it's read
+        // - if seconds >= 2 then it will always fire (when read/written close enough)
+        seconds = MAX(2, seconds);
 
+        // Configure the counter match as atomically as possible.
+        uint32_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
         lprtc_interrupt_ack(self->rtc);
+        lprtc_load_counter_match_register(self->rtc, lprtc_get_count(self->rtc) + seconds);
         lprtc_interrupt_enable(self->rtc);
-        lprtc_counter_enable(self->rtc);
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
     } else {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s)"));
     }
@@ -96,6 +185,7 @@ static mp_obj_t machine_rtc_alarm(size_t n_args, const mp_obj_t *pos_args, mp_ma
 static MP_DEFINE_CONST_FUN_OBJ_KW(machine_rtc_alarm_obj, 1, machine_rtc_alarm);
 
 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) },
     { MP_ROM_QSTR(MP_QSTR_alarm), MP_ROM_PTR(&machine_rtc_alarm_obj) },
 };
 static MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
diff --git a/ports/alif/mphalport.h b/ports/alif/mphalport.h
index f03dc7c1c1f84..731ac14fc57e6 100644
--- a/ports/alif/mphalport.h
+++ b/ports/alif/mphalport.h
@@ -373,3 +373,5 @@ 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);
+
+uint32_t mp_hal_time_get(uint32_t *microseconds);

From 0feb4f5ea419c038c69a6fd0b295b788c09f06a2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 13:12:22 +1000
Subject: [PATCH 2698/3129] alif/mphalport: Implement mp_hal_time_ns.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mphalport.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/alif/mphalport.c b/ports/alif/mphalport.c
index 39528a4b9f272..3bf8bb0aed7e3 100644
--- a/ports/alif/mphalport.c
+++ b/ports/alif/mphalport.c
@@ -167,7 +167,9 @@ void mp_hal_delay_ms(mp_uint_t ms) {
 }
 
 uint64_t mp_hal_time_ns(void) {
-    return 0;
+    uint32_t microseconds;
+    uint32_t s = mp_hal_time_get(&microseconds);
+    return (uint64_t)s * 1000000000ULL + (uint64_t)microseconds * 1000ULL;
 }
 
 void mp_hal_pin_config(const machine_pin_obj_t *pin, uint32_t mode,

From 46b366d7b245360e37443ca096f120c5d601f11d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 13:04:20 +1000
Subject: [PATCH 2699/3129] alif/fatfs_port: Implement get_fattime.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/fatfs_port.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ports/alif/fatfs_port.c b/ports/alif/fatfs_port.c
index 5883c9f3b9447..20b7920ebf0f1 100644
--- a/ports/alif/fatfs_port.c
+++ b/ports/alif/fatfs_port.c
@@ -24,15 +24,12 @@
  * THE SOFTWARE.
  */
 
+#include "py/mphal.h"
+#include "shared/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 
 DWORD get_fattime(void) {
-    // TODO
-    int year = 2024;
-    int month = 1;
-    int day = 1;
-    int hour = 0;
-    int min = 0;
-    int sec = 0;
-    return ((year - 1980) << 25) | (month << 21) | (day << 16) | (hour << 11) | (min << 5) | (sec / 2);
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_epoch_to_struct_time(mp_hal_time_get(NULL), &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);
 }

From 326730d8b283245462f7c9dc7d191e7c01cb3756 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 13:05:09 +1000
Subject: [PATCH 2700/3129] alif/mbedtls: Implement the mbedTLS time function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mbedtls/mbedtls_port.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/ports/alif/mbedtls/mbedtls_port.c b/ports/alif/mbedtls/mbedtls_port.c
index a8c155e31ae65..14e24f021f9e9 100644
--- a/ports/alif/mbedtls/mbedtls_port.c
+++ b/ports/alif/mbedtls/mbedtls_port.c
@@ -24,15 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "py/obj.h"
+#include "py/mphal.h"
 #include "se_services.h"
 #include "mbedtls_config_port.h"
 
-#if defined(MBEDTLS_HAVE_TIME)
-#include "shared/timeutils/timeutils.h"
-#include "mbedtls/platform_time.h"
-#endif
-
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
     uint32_t val = 0;
     int n = 0;
@@ -52,14 +47,7 @@ int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t
 #if defined(MBEDTLS_HAVE_TIME)
 
 time_t alif_mbedtls_time(time_t *timer) {
-    // TODO implement proper RTC time
-    unsigned int year = 2025;
-    unsigned int month = 1;
-    unsigned int date = 1;
-    unsigned int hours = 12;
-    unsigned int minutes = 0;
-    unsigned int seconds = 0;
-    return timeutils_seconds_since_epoch(year, month, date, hours, minutes, seconds);
+    return mp_hal_time_get(NULL);
 }
 
 #endif

From f1462448d023107e34bdc193d6947a2a78af7d54 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 13:05:39 +1000
Subject: [PATCH 2701/3129] alif/modtime: Implement the rest of the time
 module.

Adds: `time.time()`, `time.time_ns()`, `time.localtime()`, `time.mktime()`
and `time.gmtime()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/modtime.c      | 39 +++++++++++++++++++++++++++++++++++++++
 ports/alif/mpconfigport.h |  4 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 ports/alif/modtime.c

diff --git a/ports/alif/modtime.c b/ports/alif/modtime.c
new file mode 100644
index 0000000000000..6d40ec2cc37cf
--- /dev/null
+++ b/ports/alif/modtime.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 "shared/timeutils/timeutils.h"
+
+// Get the localtime.
+static void mp_time_localtime_get(timeutils_struct_time_t *tm) {
+    mp_timestamp_t s = mp_hal_time_get(NULL);
+    timeutils_seconds_since_epoch_to_struct_time(s, tm);
+}
+
+// Return the number of seconds since the Epoch.
+static mp_obj_t mp_time_time_get(void) {
+    return mp_obj_new_int_from_uint(mp_hal_time_get(NULL));
+}
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 8a65721bb0ffc..6b30ea2e6245a 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -119,7 +119,9 @@
 #define MICROPY_PY_OS_UNAME                     (1)
 #define MICROPY_PY_OS_URANDOM                   (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (se_services_rand64())
-#define MICROPY_PY_TIME                         (1)
+#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
+#define MICROPY_PY_TIME_TIME_TIME_NS            (1)
+#define MICROPY_PY_TIME_INCLUDEFILE             "ports/alif/modtime.c"
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE          "ports/alif/modmachine.c"
 #define MICROPY_PY_MACHINE_RESET                (1)

From f0f5abb7a3dd37551736fbbfbb5792875b0a539a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Aug 2025 13:30:09 +1000
Subject: [PATCH 2702/3129] alif/mpconfigport: Enable cryptolib and
 hashlib.md5/sha1.

They are enabled when SSL/mbedTLS is included in the firmware.  These new
features cost around +1400 bytes of code size.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpconfigport.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 6b30ea2e6245a..08b27e2786e75 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -112,6 +112,9 @@
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
+#define MICROPY_PY_CRYPTOLIB                    (MICROPY_PY_SSL)
+#define MICROPY_PY_HASHLIB_MD5                  (MICROPY_PY_SSL)
+#define MICROPY_PY_HASHLIB_SHA1                 (MICROPY_PY_SSL)
 #define MICROPY_PY_OS_INCLUDEFILE               "ports/alif/modos.c"
 #define MICROPY_PY_OS_DUPTERM                   (1)
 #define MICROPY_PY_OS_SEP                       (1)

From b7cfafc1ee5c0bf8148cb27c6b82a597c3a1aae0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Aug 2025 10:39:44 +1000
Subject: [PATCH 2703/3129] alif/alif.mk: Add MPY_CROSS_FLAGS setting.

The HP and HE CPUs have double-precision hardware floating point, so can
use the armv7emdp architecture.

This allows frozen code to use native/viper/asm_thumb decorators.

Fixes issue #17896.

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

diff --git a/ports/alif/alif.mk b/ports/alif/alif.mk
index 265418aa07456..d9e7c32578ce8 100644
--- a/ports/alif/alif.mk
+++ b/ports/alif/alif.mk
@@ -22,6 +22,8 @@ include $(TOP)/extmod/extmod.mk
 ################################################################################
 # Project specific settings and compiler/linker flags
 
+MPY_CROSS_FLAGS += -march=armv7emdp
+
 CROSS_COMPILE ?= arm-none-eabi-
 ALIF_DFP_REL_TOP ?= lib/alif_ensemble-cmsis-dfp
 ALIF_DFP_REL_HERE ?= $(TOP)/lib/alif_ensemble-cmsis-dfp

From bba354201809dd715287fd32c85818a23f978d97 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Wed, 13 Aug 2025 12:37:23 -0500
Subject: [PATCH 2704/3129] extmod/modlwip: Remove unused include and
 functions.

The lwIP includes are now port-specific.

The `sys_arch_{,un}protect` functions are not used according to line 34
of `extmod/lwip-include/lwipopts_common.h`.

Neither have been touched in nearly a decade.

Signed-off-by: Thomas Watson <twatson52@icloud.com>
---
 extmod/lwip-include/arch/cc.h   | 41 ---------------------------------
 extmod/lwip-include/arch/perf.h |  7 ------
 extmod/lwip-include/lwipopts.h  | 35 ----------------------------
 extmod/modlwip.c                | 12 ----------
 4 files changed, 95 deletions(-)
 delete mode 100644 extmod/lwip-include/arch/cc.h
 delete mode 100644 extmod/lwip-include/arch/perf.h
 delete mode 100644 extmod/lwip-include/lwipopts.h

diff --git a/extmod/lwip-include/arch/cc.h b/extmod/lwip-include/arch/cc.h
deleted file mode 100644
index 400dc6ec75de1..0000000000000
--- a/extmod/lwip-include/arch/cc.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_ARCH_CC_H
-#define MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_ARCH_CC_H
-
-#include <stdint.h>
-
-// Generate lwip's internal types from stdint
-
-typedef uint8_t u8_t;
-typedef int8_t s8_t;
-typedef uint16_t u16_t;
-typedef int16_t s16_t;
-typedef uint32_t u32_t;
-typedef int32_t s32_t;
-
-typedef u32_t mem_ptr_t;
-
-#define U16_F "hu"
-#define S16_F "hd"
-#define X16_F "hx"
-#define U32_F "u"
-#define S32_F "d"
-#define X32_F "x"
-
-#define X8_F  "02x"
-#define SZT_F "u"
-
-#define BYTE_ORDER LITTLE_ENDIAN
-
-#define LWIP_CHKSUM_ALGORITHM 2
-
-#include <assert.h>
-#define LWIP_PLATFORM_DIAG(x)
-#define LWIP_PLATFORM_ASSERT(x)  { assert(1); }
-
-//#define PACK_STRUCT_FIELD(x) x __attribute__((packed))
-#define PACK_STRUCT_FIELD(x) x
-#define PACK_STRUCT_STRUCT __attribute__((packed))
-#define PACK_STRUCT_BEGIN
-#define PACK_STRUCT_END
-
-#endif // MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_ARCH_CC_H
diff --git a/extmod/lwip-include/arch/perf.h b/extmod/lwip-include/arch/perf.h
deleted file mode 100644
index d310fc339f162..0000000000000
--- a/extmod/lwip-include/arch/perf.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_ARCH_PERF_H
-#define MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_ARCH_PERF_H
-
-#define PERF_START    /* null definition */
-#define PERF_STOP(x)  /* null definition */
-
-#endif // MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_ARCH_PERF_H
diff --git a/extmod/lwip-include/lwipopts.h b/extmod/lwip-include/lwipopts.h
deleted file mode 100644
index 2122f30f044e3..0000000000000
--- a/extmod/lwip-include/lwipopts.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_LWIPOPTS_H
-#define MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_LWIPOPTS_H
-
-#include <py/mpconfig.h>
-#include <py/misc.h>
-#include <py/mphal.h>
-
-// We're running without an OS for this port. We don't provide any services except light protection.
-#define NO_SYS 1
-
-#define SYS_LIGHTWEIGHT_PROT 1
-#include <stdint.h>
-typedef uint32_t sys_prot_t;
-
-#define TCP_LISTEN_BACKLOG 1
-
-// We'll put these into a proper ifdef once somebody implements an ethernet driver
-#define LWIP_ARP 0
-#define LWIP_ETHERNET 0
-
-#define LWIP_DNS 1
-
-#define LWIP_NETCONN 0
-#define LWIP_SOCKET 0
-
-#ifdef MICROPY_PY_LWIP_SLIP
-#define LWIP_HAVE_SLIPIF 1
-#endif
-
-// For now, we can simply define this as a macro for the timer code. But this function isn't
-// universal and other ports will need to do something else. It may be necessary to move
-// things like this into a port-provided header file.
-#define sys_now mp_hal_ticks_ms
-
-#endif // MICROPY_INCLUDED_EXTMOD_LWIP_INCLUDE_LWIPOPTS_H
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 26aab6e81094a..4b1c1b8f3a5ec 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1724,18 +1724,6 @@ static MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &lwip_socket_locals_dict
     );
 
-/******************************************************************************/
-// Support functions for memory protection. lwIP has its own memory management
-// routines for its internal structures, and since they might be called in
-// interrupt handlers, they need some protection.
-sys_prot_t sys_arch_protect() {
-    return (sys_prot_t)MICROPY_BEGIN_ATOMIC_SECTION();
-}
-
-void sys_arch_unprotect(sys_prot_t state) {
-    MICROPY_END_ATOMIC_SECTION((mp_uint_t)state);
-}
-
 /******************************************************************************/
 // Polling callbacks for the interfaces connected to lwIP. Right now it calls
 // itself a "list" but isn't; we only support a single interface.

From afa7265ffa911917f381ac6790ffe032b2b7baf8 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@analog.com>
Date: Fri, 25 Jul 2025 16:35:27 -0500
Subject: [PATCH 2705/3129] zephyr: Upgrade to Zephyr v4.2.0.

Updates the Zephyr port build instructions and CI to use the latest
Zephyr release tag.

Tested on max32690fthr and frdm_k64f.

Signed-off-by: Maureen Helm <maureen.helm@analog.com>
---
 docs/zephyr/tutorial/repl.rst | 4 ++--
 ports/zephyr/README.md        | 8 ++++----
 tools/ci.sh                   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
index 199dda2b7aeee..1b16c5ad21d7b 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 v4.0.0 ***
-        MicroPython v1.24.0-preview.179.g5b85b24bd on 2024-08-05; zephyr-frdm_k64f with mk64f12
+        *** Booting Zephyr OS build v4.2.0 ***
+        MicroPython v1.26.0-preview.451.gebc9525c9 on 2025-07-25; zephyr-frdm_k64f with mk64f12
         Type "help()" for more information.
         >>>
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 17c1f613de4ed..8384fabcf0261 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -5,8 +5,8 @@ This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
 This port tries to support all Zephyr versions supported upstream,
-i.e. currently v3.7 (LTS), v4.0 and the development branch. The CI is
-setup to use the latest version, i.e. v4.0.
+i.e. currently v3.7 (LTS), v4.2 and the development branch. The CI is
+setup to use the latest version, i.e. v4.2.
 
 All boards supported by Zephyr (with standard level of features
 support, like UART console) should work with MicroPython (but not all
@@ -43,13 +43,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 v4.0.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v4.2.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 v4.0.0
+    $ git checkout v4.2.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 8f045639b80c9..9152c2e2dd699 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -886,9 +886,9 @@ function ci_windows_build {
 ########################################################################################
 # ports/zephyr
 
-ZEPHYR_DOCKER_VERSION=v0.27.4
-ZEPHYR_SDK_VERSION=0.17.0
-ZEPHYR_VERSION=v4.0.0
+ZEPHYR_DOCKER_VERSION=v0.28.1
+ZEPHYR_SDK_VERSION=0.17.2
+ZEPHYR_VERSION=v4.2.0
 
 function ci_zephyr_setup {
     IMAGE=ghcr.io/zephyrproject-rtos/ci:${ZEPHYR_DOCKER_VERSION}

From 1588c455c41b445bfd1c65b5055847ab63114c96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 02:37:54 +0000
Subject: [PATCH 2706/3129] github/workflows: Bump actions/checkout from 4 to
 5.

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/biome.yml             |  2 +-
 .github/workflows/code_formatting.yml   |  2 +-
 .github/workflows/code_size.yml         |  2 +-
 .github/workflows/codespell.yml         |  2 +-
 .github/workflows/commit_formatting.yml |  2 +-
 .github/workflows/docs.yml              |  2 +-
 .github/workflows/examples.yml          |  2 +-
 .github/workflows/mpremote.yml          |  2 +-
 .github/workflows/mpy_format.yml        |  2 +-
 .github/workflows/ports.yml             |  2 +-
 .github/workflows/ports_alif.yml        |  2 +-
 .github/workflows/ports_cc3200.yml      |  2 +-
 .github/workflows/ports_esp32.yml       |  2 +-
 .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.yml        |  4 +--
 .github/workflows/ports_renesas-ra.yml  |  2 +-
 .github/workflows/ports_rp2.yml         |  2 +-
 .github/workflows/ports_samd.yml        |  2 +-
 .github/workflows/ports_stm32.yml       |  2 +-
 .github/workflows/ports_unix.yml        | 38 ++++++++++++-------------
 .github/workflows/ports_webassembly.yml |  2 +-
 .github/workflows/ports_windows.yml     |  6 ++--
 .github/workflows/ports_zephyr.yml      |  2 +-
 .github/workflows/ruff.yml              |  2 +-
 27 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/biome.yml b/.github/workflows/biome.yml
index 88744f16ca7d6..fea9c9c8bd7bc 100644
--- a/.github/workflows/biome.yml
+++ b/.github/workflows/biome.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Setup Biome
       uses: biomejs/setup-biome@v2
       with:
diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 9f30f048cfdbe..5669779946e06 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -10,7 +10,7 @@ jobs:
   code-formatting:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
     - name: Install packages
       run: source tools/ci.sh && ci_c_code_formatting_setup
diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 67261933798cb..8587ef0179442 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 100
     - name: Install packages
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 1d6b1dc9d2b27..688134b42515c 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -6,7 +6,7 @@ jobs:
   codespell:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     # codespell version should be kept in sync with .pre-commit-config.yml
     - run: pip install --user codespell==2.4.1 tomli
     - run: codespell
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index fcbcaa7092ee2..2e1def95c36e8 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 100
     - uses: actions/setup-python@v5
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 62a6f69fc3924..f9d61125b50c1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
     - name: Install Python packages
       run: pip install -r docs/requirements.txt
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 6613f106625a2..d16122b720b6c 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -18,7 +18,7 @@ jobs:
   embedding:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build
       run: make -C examples/embedding -f micropython_embed.mk && make -C examples/embedding
     - name: Run
diff --git a/.github/workflows/mpremote.yml b/.github/workflows/mpremote.yml
index ee91b6360b9b4..359d888286400 100644
--- a/.github/workflows/mpremote.yml
+++ b/.github/workflows/mpremote.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         # Setting this to zero means fetch all history and tags,
         # which hatch-vcs can use to discover the version tag.
diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index b6768a46c3cdc..4043b63288a0c 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -17,7 +17,7 @@ jobs:
   test:
     runs-on: ubuntu-22.04 # use 22.04 to get python2
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 1f262b0ba4bee..d4e89bd1aa924 100644
--- a/.github/workflows/ports.yml
+++ b/.github/workflows/ports.yml
@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build ports download metadata
       run: mkdir boards && ./tools/autobuild/build-downloads.py . ./boards
diff --git a/.github/workflows/ports_alif.yml b/.github/workflows/ports_alif.yml
index 0e96e7d816e50..a06b3f96ffae4 100644
--- a/.github/workflows/ports_alif.yml
+++ b/.github/workflows/ports_alif.yml
@@ -26,7 +26,7 @@ jobs:
           - alif_ae3_build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_alif_setup
     - name: Build ci_${{matrix.ci_func }}
diff --git a/.github/workflows/ports_cc3200.yml b/.github/workflows/ports_cc3200.yml
index f178a140587db..b60ff370daf9d 100644
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 36ab341cfcdd2..b86c6a76f82c7 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -28,7 +28,7 @@ jobs:
           - esp32_build_c2_c6
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - id: idf_ver
       name: Read the ESP-IDF version (including Python version)
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index 5236edf40b959..3293abed5980d 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 7743e036ab377..ae9a80ec5806c 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -24,7 +24,7 @@ jobs:
       run:
         working-directory: 'micropython repo'  # test build with space in path
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         path: 'micropython repo'
     - name: Install packages
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
index 76727c9d1f6bd..ce86617af05ce 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 c41b13e5ddffe..81f71ca8a96f4 100644
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_powerpc_setup
     - name: Build
diff --git a/.github/workflows/ports_qemu.yml b/.github/workflows/ports_qemu.yml
index ac09dde86408b..857645776629a 100644
--- a/.github/workflows/ports_qemu.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -29,7 +29,7 @@ jobs:
           - thumb
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_qemu_setup_arm
     - name: Build and run test suite ci_qemu_build_arm_${{ matrix.ci_func }}
@@ -41,7 +41,7 @@ jobs:
   build_and_test_rv32:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_qemu_setup_rv32
     - name: Build and run test suite
diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
index b9fa74331dc0b..bf99ed25fedae 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -21,7 +21,7 @@ jobs:
   build_renesas_ra_board:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 748f38e143893..22d2a9688015f 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -24,7 +24,7 @@ jobs:
       run:
         working-directory: 'micropython repo'  # test build with space in path
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         path: 'micropython repo'
     - name: Install packages
diff --git a/.github/workflows/ports_samd.yml b/.github/workflows/ports_samd.yml
index 5bf1826cd17bb..dbea255c79ad4 100644
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 8800f145189b8..43659a5d5dd5d 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -28,7 +28,7 @@ jobs:
           - stm32_misc_build
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_stm32_setup
     - name: Build ci_${{matrix.ci_func }}
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index f3f613a789af3..8fd8e1aec23d4 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -23,7 +23,7 @@ jobs:
   minimal:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build
       run: source tools/ci.sh && ci_unix_minimal_build
     - name: Run main test suite
@@ -35,7 +35,7 @@ jobs:
   reproducible:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build with reproducible date
       run: source tools/ci.sh && ci_unix_minimal_build
       env:
@@ -46,7 +46,7 @@ jobs:
   standard:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build
       run: source tools/ci.sh && ci_unix_standard_build
     - name: Run main test suite
@@ -58,7 +58,7 @@ jobs:
   standard_v2:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build
       run: source tools/ci.sh && ci_unix_standard_v2_build
     - name: Run main test suite
@@ -70,7 +70,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
@@ -105,7 +105,7 @@ jobs:
   coverage_32bit:
     runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_32bit_setup
     - name: Build
@@ -123,7 +123,7 @@ jobs:
   nanbox:
     runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_32bit_setup
     - name: Build
@@ -137,7 +137,7 @@ jobs:
   longlong:
     runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_32bit_setup
     - name: Build
@@ -151,7 +151,7 @@ jobs:
   float:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build
       run: source tools/ci.sh && ci_unix_float_build
     - name: Run main test suite
@@ -163,7 +163,7 @@ jobs:
   gil_enabled:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build
       run: source tools/ci.sh && ci_unix_gil_enabled_build
     - name: Run main test suite
@@ -175,7 +175,7 @@ jobs:
   stackless_clang:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_clang_setup
     - name: Build
@@ -189,7 +189,7 @@ jobs:
   float_clang:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_clang_setup
     - name: Build
@@ -203,7 +203,7 @@ jobs:
   settrace_stackless:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
@@ -220,7 +220,7 @@ jobs:
   macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
       with:
         python-version: '3.8'
@@ -236,7 +236,7 @@ jobs:
     # ubuntu-22.04 is needed for older libffi.
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_qemu_mips_setup
     - name: Build
@@ -251,7 +251,7 @@ jobs:
     # ubuntu-22.04 is needed for older libffi.
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_qemu_arm_setup
     - name: Build
@@ -266,7 +266,7 @@ jobs:
     # ubuntu-22.04 is needed for older libffi.
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_unix_qemu_riscv64_setup
     - name: Build
@@ -280,7 +280,7 @@ jobs:
   sanitize_address:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
@@ -305,7 +305,7 @@ jobs:
   sanitize_undefined:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index ceb35f83cd8f1..14399950b569e 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 f33277d471d3c..6b492640a1fa0 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -58,7 +58,7 @@ jobs:
     - uses: microsoft/setup-msbuild@v2
       with:
         vs-version: ${{ matrix.vs_version }}
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build mpy-cross.exe
       run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
     - name: Update submodules
@@ -125,7 +125,7 @@ jobs:
           git
           diffutils
         path-type: inherit  # Remove when setup-python is removed
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Build mpy-cross.exe
       run: make -C mpy-cross -j2
     - name: Update submodules
@@ -143,7 +143,7 @@ jobs:
   cross-build-on-linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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 ca3c36e004cca..9ce7034398669 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -30,7 +30,7 @@ jobs:
         large-packages: false
         docker-images: false
         swap-storage: false
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - id: versions
       name: Read Zephyr version
       run: source tools/ci.sh && echo "ZEPHYR=$ZEPHYR_VERSION" | tee "$GITHUB_OUTPUT"
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 4c4a2a3162ed6..633b0cdf82ef4 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -6,7 +6,7 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     # ruff version should be kept in sync with .pre-commit-config.yaml & also micropython-lib
     - run: pipx install ruff==0.11.6
     - run: ruff check --output-format=github .

From 1b35116c920550ba7bfc0f06bd4bad7d20f33b21 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Tue, 22 Jul 2025 20:14:14 +0900
Subject: [PATCH 2707/3129] stm32/dac: Fix 12-bit DAC issue on STM32H5.

For STM32H5, to use 12-bit DAC, the DMA parameter should set:
- Actual DMA source datawidth to CTR1.
- The length is the amount of data to be transferred from source to
  destination in bytes.

Also, this commit modifies the (dummy) definition of DMA_CIRCULAR for
STM32H5 to prevent conflict with data width specification.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/dac.c | 7 +++++--
 ports/stm32/dma.c | 4 ++--
 ports/stm32/dma.h | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 54d5acc6cea9d..0be0fd9300b12 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -174,7 +174,7 @@ static void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, ui
         // For STM32G4, DAC registers have to be accessed by words (32-bit).
         dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_WORD;
         #elif defined(STM32H5)
-        dma_align = 0;
+        dma_align = DMA_SRC_DATAWIDTH_BYTE | DMA_DEST_DATAWIDTH_WORD;
         #else
         dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_BYTE;
         #endif
@@ -183,7 +183,7 @@ static void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, ui
         // For STM32G4, DAC registers have to be accessed by words (32-bit).
         dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_WORD;
         #elif defined(STM32H5)
-        dma_align = 0;
+        dma_align = DMA_SRC_DATAWIDTH_HALFWORD | DMA_DEST_DATAWIDTH_WORD;
         #else
         dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_HALFWORD;
         #endif
@@ -490,7 +490,10 @@ mp_obj_t pyb_dac_write_timed(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         align = DAC_ALIGN_8B_R;
     } else {
         align = DAC_ALIGN_12B_R;
+        // For STM32H5, the length is the amount of data to be transferred from source to destination in bytes.
+        #if !defined(STM32H5)
         bufinfo.len /= 2;
+        #endif
     }
 
     dac_start_dma(self->dac_channel, tx_dma_descr, args[2].u_int, self->bits, align, bufinfo.len, bufinfo.buf);
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index c252770740d01..c2923f7ae732c 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -1737,10 +1737,10 @@ void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
     dma->CCR = init->Priority;
 
     uint32_t ctr1reg = 0;
-    ctr1reg |= init->SrcDataWidth;
+    ctr1reg |= config & DMA_CTR1_SDW_LOG2_Msk;
     ctr1reg |= init->SrcInc;
     ctr1reg |= (((init->SrcBurstLength - 1) << DMA_CTR1_SBL_1_Pos)) & DMA_CTR1_SBL_1_Msk;
-    ctr1reg |= init->DestDataWidth;
+    ctr1reg |= config & DMA_CTR1_DDW_LOG2_Msk;
     ctr1reg |= init->DestInc;
     ctr1reg |= (((init->DestBurstLength - 1) << DMA_CTR1_DBL_1_Pos)) & DMA_CTR1_DBL_1_Msk;
 
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index f05b22b5d05cd..75e007bc9fa98 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -33,7 +33,7 @@ typedef struct _dma_descr_t dma_descr_t;
 #if defined(STM32H5)
 // STM32H5 GPDMA doesn't feature circular mode directly, so define doesn't exist in
 // stm32 driver header. Define it here to make users like DAC driver happy.
-#define DMA_CIRCULAR 0x00000001
+#define DMA_CIRCULAR 0x20000000
 #endif
 
 #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7)

From 152a0782e6ef8fc510b3e0106df82e27595847c2 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Fri, 25 Jul 2025 20:14:03 +0900
Subject: [PATCH 2708/3129] stm32/dac: Add support for DAC feature on STM32G0.

DAC.write() and DAC.write_timed() are now available on STM32G0.

Tested on NUCLEO_G0B1RE.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h | 2 +-
 ports/stm32/dac.c                                | 2 +-
 ports/stm32/dma.c                                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
index 092ee177925eb..ead36ed6c763f 100644
--- a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
@@ -5,7 +5,7 @@
 #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_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (0) // can be enabled if USB cable connected to PA11/PA12
 #define MICROPY_PY_PYB_LEGACY       (0)
 
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 0be0fd9300b12..040892553d38c 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -97,7 +97,7 @@ static uint32_t TIMx_Config(mp_obj_t timer) {
     // work out the trigger channel (only certain ones are supported)
     if (tim->Instance == TIM2) {
         return DAC_TRIGGER_T2_TRGO;
-    #if defined(TIM4)
+    #if defined(TIM4) && defined(DAC_TRIGGER_T4_TRGO) // G0B1 doesn't have this
     } else if (tim->Instance == TIM4) {
         return DAC_TRIGGER_T4_TRGO;
     #endif
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index c2923f7ae732c..ad199b1fb91d9 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -1657,7 +1657,7 @@ static void dma_idle_handler(uint32_t tick) {
 }
 #endif
 
-#if defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32G0) || 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;
@@ -1680,7 +1680,7 @@ void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
     } else {
         __HAL_DMA2_REMAP(descr->sub_instance);
     }
-    #elif defined(STM32G4)
+    #elif defined(STM32G0) || defined(STM32G4)
     uint32_t *dmamux_ctrl = (void *)(DMAMUX1_Channel0_BASE + 0x04 * descr->id);
     *dmamux_ctrl = (*dmamux_ctrl & ~(0x7f)) | descr->sub_instance;
     #elif defined(STM32L1)
@@ -1807,7 +1807,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(STM32G0) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+#elif defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
 
 // These functions are currently not implemented or needed for this MCU.
 

From 365329cd540f631f1cfe805b475f792cf00257e0 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 27 Jul 2025 22:03:42 +0900
Subject: [PATCH 2709/3129] stm32/dac: Fix DAC write for MCUs that have
 D-Cache.

To prevent wrong DAC output, clean D-cache before starting DMA.

For more details, please refer to the following document:
https://www.st.com/resource/en/application_note/DM00272913.pdf

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/dac.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 040892553d38c..8022fd274ce97 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -485,6 +485,9 @@ mp_obj_t pyb_dac_write_timed(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     #endif
     }
 
+    // To prevent invalid dac output, clean D-cache before starting dma.
+    MP_HAL_CLEAN_DCACHE(bufinfo.buf, bufinfo.len);
+
     uint32_t align;
     if (self->bits == 8) {
         align = DAC_ALIGN_8B_R;

From c7ddf0c54fcc9c6abdb38db27a558ab635ba9763 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 11 Aug 2025 14:20:36 +0200
Subject: [PATCH 2710/3129] stm32/Makefile: Add .gc.blocks.table section to
 generated binary.

The generated binary file was missing this section, which caused a hard
fault when loading bin or dfu firmware (eg on ARDUINO_GIGA).

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 37ce8fbd8383d..abca3a05f8c7a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -611,7 +611,7 @@ TEXT0_ADDR ?= 0x08000000
 ifeq ($(TEXT1_ADDR),)
 # No TEXT1_ADDR given so put all firmware at TEXT0_ADDR location
 
-TEXT0_SECTIONS ?= .isr_vector .isr_extratext .text .data .ARM
+TEXT0_SECTIONS ?= .isr_vector .isr_extratext .text .gc.blocks.table .data .ARM
 
 deploy-stlink: $(BUILD)/firmware.bin
 	$(call RUN_STLINK,$^,$(TEXT0_ADDR))
@@ -629,7 +629,7 @@ else
 # TEXT0_ADDR and TEXT1_ADDR are specified so split firmware between these locations
 
 TEXT0_SECTIONS ?= .isr_vector .isr_extratext
-TEXT1_SECTIONS ?= .text .data .ARM
+TEXT1_SECTIONS ?= .text .gc.blocks.table .data .ARM
 
 deploy-stlink: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
 	$(call RUN_STLINK,$(word 1,$^),$(TEXT0_ADDR))

From 020eeba41246f6015fb56f830141077d43d2334b Mon Sep 17 00:00:00 2001
From: Tico06 <e.grammatico@gmail.com>
Date: Mon, 11 Aug 2025 19:30:47 +0200
Subject: [PATCH 2711/3129] stm32/eth_phy: Fix typo in header guard macro.

Typo on line 29 (PYH instead of PHY).

Compilation failing, here is the output:

    eth_phy.h:28: error: header guard 'MICROPY_INCLUDED_STM32_PHY_H'
    followed by '#define' of a different macro [Werror=header-guard]
        28 | #ifndef MICROPY_INCLUDED_STM32_PHY_H
    eth_phy.h:29: note: 'MICROPY_INCLUDED_STM32_PYH_H' is defined here;
    did you mean 'MICROPY_INCLUDED_STM32_PHY_H'?
        29 | #define MICROPY_INCLUDED_STM32_PYH_H

Signed-off-by: Tico06 <e.grammatico@gmail.com>
---
 ports/stm32/eth_phy.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/eth_phy.h b/ports/stm32/eth_phy.h
index 5036905c1f582..dccfb7951add8 100644
--- a/ports/stm32/eth_phy.h
+++ b/ports/stm32/eth_phy.h
@@ -26,7 +26,7 @@
  */
 
 #ifndef MICROPY_INCLUDED_STM32_PHY_H
-#define MICROPY_INCLUDED_STM32_PYH_H
+#define MICROPY_INCLUDED_STM32_PHY_H
 
 #if defined(MICROPY_HW_ETH_MDC)
 

From d81d56cc4d7c44978761f967841bcb6e8e84b54d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 22 Jul 2025 10:56:22 +1000
Subject: [PATCH 2712/3129] tools/ci: Add UBSan to longlong CI build.

Also rewrite the sanitizer argument variables to not assume a variant.

longlong variant currently fails in this config, due to a bug fixed
in follow-up commit.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/ci.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 9152c2e2dd699..095d96cf39beb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -518,13 +518,11 @@ CI_UNIX_OPTS_QEMU_RISCV64=(
 )
 
 CI_UNIX_OPTS_SANITIZE_ADDRESS=(
-    VARIANT=coverage
     CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
     LDFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
 )
 
 CI_UNIX_OPTS_SANITIZE_UNDEFINED=(
-    VARIANT=coverage
     CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
     LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
 )
@@ -699,7 +697,7 @@ function ci_unix_nanbox_run_tests {
 }
 
 function ci_unix_longlong_build {
-    ci_unix_build_helper VARIANT=longlong
+    ci_unix_build_helper VARIANT=longlong "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
 }
 
 function ci_unix_longlong_run_tests {
@@ -765,23 +763,23 @@ function ci_unix_settrace_stackless_run_tests {
 function ci_unix_sanitize_undefined_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix submodules
-    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+    make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
     ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_sanitize_undefined_run_tests {
-    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
 }
 
 function ci_unix_sanitize_address_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix submodules
-    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+    make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
     ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_sanitize_address_run_tests {
-    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
 }
 
 function ci_unix_macos_build {

From 3faf2298537ee34648d27a662529ff2aa73cec1c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Aug 2025 10:19:43 +1000
Subject: [PATCH 2713/3129] py/misc: Add a way to detect sanitizer builds.

Clang and gcc>=14 can use __has_feature() to detect if a sanitizer
is enabled, but older GCC has no mechanism - need to set a macro
explicitly for this to be recognised.

Necessary for increasing some resource limits in sanitizer builds.
Important not to use to avoid real issues!

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/misc.h   | 24 ++++++++++++++++++++++++
 tools/ci.sh |  6 ++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/py/misc.h b/py/misc.h
index 5c1cc2f7a836b..081163cadf9fd 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -43,6 +43,11 @@ typedef unsigned int uint;
 #ifndef __has_builtin
 #define __has_builtin(x) (0)
 #endif
+#ifndef __has_feature
+// This macro is supported by Clang and gcc>=14
+#define __has_feature(x) (0)
+#endif
+
 
 /** generic ops *************************************************/
 
@@ -538,4 +543,23 @@ inline static bool mp_sub_ll_overflow(long long int lhs, long long int rhs, long
 }
 #endif
 
+
+// Helper macros for detecting if sanitizers are enabled
+//
+// Use sparingly, not for masking issues reported by sanitizers!
+//
+// Can be detected automatically in Clang and gcc>=14, need to be
+// set manually otherwise.
+#ifndef MP_UBSAN
+#define MP_UBSAN __has_feature(undefined_behavior_sanitizer)
+#endif
+
+#ifndef MP_ASAN
+#define MP_ASAN __has_feature(address_sanitizer)
+#endif
+
+#ifndef MP_SANITIZER_BUILD
+#define MP_SANITIZER_BUILD (MP_UBSAN || MP_ASAN)
+#endif
+
 #endif // MICROPY_INCLUDED_PY_MISC_H
diff --git a/tools/ci.sh b/tools/ci.sh
index 095d96cf39beb..e165cb2cf3f48 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -518,12 +518,14 @@ CI_UNIX_OPTS_QEMU_RISCV64=(
 )
 
 CI_UNIX_OPTS_SANITIZE_ADDRESS=(
-    CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
+    # Macro MP_ASAN allows detecting ASan on gcc<=13
+    CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0 -DMP_ASAN=1"
     LDFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
 )
 
 CI_UNIX_OPTS_SANITIZE_UNDEFINED=(
-    CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
+    # Macro MP_UBSAN allows detecting UBSan on gcc<=13
+    CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute -DMP_UBSAN=1"
     LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
 )
 

From d8672f4cde83c0a5632f9e6ac5a55eb68fed64f9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Aug 2025 10:20:57 +1000
Subject: [PATCH 2714/3129] unix: Increase stack sizes if running with
 sanitizers.

The specific problem seems to be that the runtime "Python stack frame"
function call is several times more expensive in stack usage when running
with UBSan on older GCC (observed on gcc 11.4 as used in CI, would get
'RuntimeError: maximum recursion depth exceeded' when running some tests
with UBSan enabled.)

Other stack usage (i.e. from pushing things on the stack in Python) stays
the same. Whatever causes the usage seems to be mostly gone in later GCC
versions.

Includes a refactor to apply the same stack size multipliers
for the default thread stack size same as the main stack size.

This goes in a new port-specific header as it depends on macros
in misc.h, so can't be in mpconfigport.h.

A side effect of this is that the default thread stack size is
now doubled on ARM, same as the main stack size.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/unix/main.c         |  7 ++---
 ports/unix/mpthreadport.c |  5 ++--
 ports/unix/stack_size.h   | 54 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 ports/unix/stack_size.h

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 5f6b99f989a3a..dd0788aaad96b 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -54,6 +54,7 @@
 #include "extmod/vfs_posix.h"
 #include "genhdr/mpversion.h"
 #include "input.h"
+#include "stack_size.h"
 
 // Command line options, with their defaults
 static bool compile_only = false;
@@ -479,11 +480,7 @@ int main(int argc, char **argv) {
     #endif
 
     // Define a reasonable stack limit to detect stack overflow.
-    mp_uint_t stack_size = 40000 * (sizeof(void *) / 4);
-    #if defined(__arm__) && !defined(__thumb2__)
-    // ARM (non-Thumb) architectures require more stack.
-    stack_size *= 2;
-    #endif
+    mp_uint_t stack_size = 40000 * UNIX_STACK_MULTIPLIER;
 
     // We should capture stack top ASAP after start, and it should be
     // captured guaranteedly before any other stack variables are allocated.
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 141cd0218d93e..a41b3ec9f4701 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -31,6 +31,7 @@
 #include "py/runtime.h"
 #include "py/mpthread.h"
 #include "py/gc.h"
+#include "stack_size.h"
 
 #if MICROPY_PY_THREAD
 
@@ -244,9 +245,9 @@ void mp_thread_start(void) {
 }
 
 mp_uint_t mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
-    // default stack size is 8k machine-words
+    // default stack size
     if (*stack_size == 0) {
-        *stack_size = 8192 * sizeof(void *);
+        *stack_size = 32768 * UNIX_STACK_MULTIPLIER;
     }
 
     // minimum stack size is set by pthreads
diff --git a/ports/unix/stack_size.h b/ports/unix/stack_size.h
new file mode 100644
index 0000000000000..f6159bb69d529
--- /dev/null
+++ b/ports/unix/stack_size.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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_UNIX_STACK_SIZE_H
+#define MICROPY_INCLUDED_UNIX_STACK_SIZE_H
+
+#include "py/misc.h"
+
+// Define scaling factors for the stack size (also applies to main thread)
+#ifndef UNIX_STACK_MULTIPLIER
+
+#if defined(__arm__) && !defined(__thumb2__)
+// ARM (non-Thumb) architectures require more stack.
+#define UNIX_STACK_MUL_ARM 2
+#else
+#define UNIX_STACK_MUL_ARM 1
+#endif
+
+#if MP_SANITIZER_BUILD
+// Sanitizer features consume significant stack in some cases
+// This multiplier can probably be removed when using GCC 12 or newer.
+#define UNIX_STACK_MUL_SANITIZERS 4
+#else
+#define UNIX_STACK_MUL_SANITIZERS 1
+#endif
+
+// Double the stack size for 64-bit builds, plus additional scaling
+#define UNIX_STACK_MULTIPLIER ((sizeof(void *) / 4) * UNIX_STACK_MUL_ARM * UNIX_STACK_MUL_SANITIZERS)
+
+#endif // UNIX_STACK_MULTIPLIER
+
+#endif // MICROPY_INCLUDED_UNIX_STACK_SIZE_H

From 22deeeb8db1305b292e9146b7b00a58207755693 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 12 Aug 2025 11:03:50 +1000
Subject: [PATCH 2715/3129] tests/stress/recursive_iternext: Rewrite to find
 its own limit.

Necessary on the unix port when running with sanitizers, as the newly
increased stack size can run all tests at N=5000 without raising
RuntimeError, and increasing N to fix this causes issues on other
configurations.

This way the test progressively builds a deeper data structure until it
fails with RuntimeError. This is theoretically slower, but not noticeably
so in reality.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/stress/recursive_iternext.py | 64 ++++++++++--------------------
 1 file changed, 22 insertions(+), 42 deletions(-)

diff --git a/tests/stress/recursive_iternext.py b/tests/stress/recursive_iternext.py
index bbc389e726237..c737f1e36d70a 100644
--- a/tests/stress/recursive_iternext.py
+++ b/tests/stress/recursive_iternext.py
@@ -1,4 +1,8 @@
 # This tests that recursion with iternext doesn't lead to segfault.
+#
+# This test segfaults CPython, but that's not a bug as CPython doesn't enforce
+# limits on C recursion - see
+# https://github.com/python/cpython/issues/58218#issuecomment-1093570209
 try:
     enumerate
     filter
@@ -9,49 +13,25 @@
     print("SKIP")
     raise SystemExit
 
-# We need to pick an N that is large enough to hit the recursion
-# limit, but not too large that we run out of heap memory.
-try:
-    # large stack/heap, eg unix
-    [0] * 80000
-    N = 5000
-except:
-    try:
-        # medium, eg pyboard
-        [0] * 10000
-        N = 1000
-    except:
-        # small, eg esp8266
-        N = 100
-
-try:
-    x = (1, 2)
-    for i in range(N):
-        x = enumerate(x)
-    tuple(x)
-except RuntimeError:
-    print("RuntimeError")
 
-try:
+# Progressively build a bigger nested iterator structure (10 at a time for speed),
+# and then try to evaluate it via tuple(x) which makes deep recursive function calls.
+#
+# Eventually this should raise a RuntimeError as MicroPython runs out of stack.
+# It shouldn't ever raise a MemoryError, if it does then somehow MicroPython has
+# run out of heap (for the nested structure) before running out of stack.
+def recurse_iternext(nested_fn):
     x = (1, 2)
-    for i in range(N):
-        x = filter(None, x)
-    tuple(x)
-except RuntimeError:
-    print("RuntimeError")
+    while True:
+        for _ in range(10):
+            x = nested_fn(x)
+        try:
+            tuple(x)
+        except RuntimeError:
+            print("RuntimeError")
+            break
 
-try:
-    x = (1, 2)
-    for i in range(N):
-        x = map(max, x, ())
-    tuple(x)
-except RuntimeError:
-    print("RuntimeError")
 
-try:
-    x = (1, 2)
-    for i in range(N):
-        x = zip(x)
-    tuple(x)
-except RuntimeError:
-    print("RuntimeError")
+# Test on various nested iterator structures
+for nested_fn in [enumerate, lambda x: filter(None, x), lambda x: map(max, x, ()), zip]:
+    recurse_iternext(nested_fn)

From bd413d3d853e2c1fc0382b328176ff912d79da70 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 17 Aug 2025 07:28:35 +0200
Subject: [PATCH 2716/3129] py/asmthumb: Fix T3 encoding of conditional
 branches.

This commit fixes the encoding of conditional branch opcodes emitted for
ARMv7-M targets, when the emitter decides to use the T3 encoding for
said operation.

Fields J1 and J2 are now present in the generated opcode word, along
with correcting some minor issues in bitmasks and shifts computation.

This fixes #17940.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmthumb.c                             |  5 ++---
 tests/micropython/viper_large_jump.py     | 20 ++++++++++++++++++++
 tests/micropython/viper_large_jump.py.exp |  1 +
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 tests/micropython/viper_large_jump.py
 create mode 100644 tests/micropython/viper_large_jump.py.exp

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 93860d2fdc1a2..58cc7aea88085 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -267,9 +267,8 @@ bool asm_thumb_b_n_label(asm_thumb_t *as, uint label) {
 
 #define OP_BCC_N(cond, byte_offset) (0xd000 | ((cond) << 8) | (((byte_offset) >> 1) & 0x00ff))
 
-// all these bit-arithmetic operations need coverage testing!
-#define OP_BCC_W_HI(cond, byte_offset) (0xf000 | ((cond) << 6) | (((byte_offset) >> 10) & 0x0400) | (((byte_offset) >> 14) & 0x003f))
-#define OP_BCC_W_LO(byte_offset) (0x8000 | ((byte_offset) & 0x2000) | (((byte_offset) >> 1) & 0x0fff))
+#define OP_BCC_W_HI(cond, byte_offset) (0xf000 | ((cond) << 6) | (((byte_offset) >> 10) & 0x0400) | (((byte_offset) >> 12) & 0x003f))
+#define OP_BCC_W_LO(byte_offset) (0x8000 | (((byte_offset) >> 5) & 0x2000) | (((byte_offset) >> 8) & 0x0800) | (((byte_offset) >> 1) & 0x07ff))
 
 bool asm_thumb_bcc_nw_label(asm_thumb_t *as, int cond, uint label, bool wide) {
     mp_uint_t dest = get_label_dest(as, label);
diff --git a/tests/micropython/viper_large_jump.py b/tests/micropython/viper_large_jump.py
new file mode 100644
index 0000000000000..1c5913dec1ea2
--- /dev/null
+++ b/tests/micropython/viper_large_jump.py
@@ -0,0 +1,20 @@
+COUNT = 600
+
+
+try:
+    code = """
+@micropython.viper
+def f() -> int:
+    x = 0
+    while x < 10:
+"""
+    for i in range(COUNT):
+        code += "        x += 1\n"
+    code += "    return x"
+    exec(code)
+except MemoryError:
+    print("SKIP-TOO-LARGE")
+    raise SystemExit
+
+
+print(f())
diff --git a/tests/micropython/viper_large_jump.py.exp b/tests/micropython/viper_large_jump.py.exp
new file mode 100644
index 0000000000000..e9f960cf4ac4e
--- /dev/null
+++ b/tests/micropython/viper_large_jump.py.exp
@@ -0,0 +1 @@
+600

From 36501966821db97feaf27a6b87086bee0eb27775 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 16:52:29 +1000
Subject: [PATCH 2717/3129] py/objtype: Use locals_ptr directly instead of
 getting it from the slot.

This is a very minor code simplification, which reduces code size by about
-8 bytes.  It should have no functional change.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objtype.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/py/objtype.c b/py/objtype.c
index 25c2dee994d74..d40f619fae241 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1292,8 +1292,7 @@ static mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals
         mp_raise_TypeError(MP_ERROR_TEXT("multiple bases have instance lay-out conflict"));
     }
 
-    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);
+    mp_map_elem_t *elem = mp_map_lookup(&locals_ptr->map, MP_OBJ_NEW_QSTR(MP_QSTR___new__), MP_MAP_LOOKUP);
     if (elem != NULL) {
         // __new__ slot exists; check if it is a function
         if (mp_obj_is_fun(elem->value)) {

From 169d382248fcec1b62891db6339c349477020bd2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 17:00:44 +1000
Subject: [PATCH 2718/3129] py/mpconfig: Rename MICROPY_PY___FILE__ to
 MICROPY_MODULE___FILE__.

For consistency with other module-related configuration options.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/main.c              |  2 +-
 mpy-cross/mpconfigport.h      |  2 +-
 ports/esp8266/mpconfigport.h  |  2 +-
 ports/nrf/mpconfigport.h      |  2 +-
 ports/pic16bit/mpconfigport.h |  2 +-
 ports/powerpc/mpconfigport.h  |  2 +-
 ports/unix/main.c             |  2 +-
 py/builtinimport.c            |  6 +++---
 py/mpconfig.h                 | 10 +++++-----
 py/objmodule.c                |  2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 16f749ae4dc35..b7771ce6e798f 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -81,7 +81,7 @@ static int compile_and_save(const char *file, const char *output_file, const cha
             source_name = qstr_from_str(source_file);
         }
 
-        #if MICROPY_PY___FILE__
+        #if MICROPY_MODULE___FILE__
         mp_store_global(MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
         #endif
 
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 81cbfc2eeb937..0a6478b4f3d24 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -85,7 +85,7 @@
 #define MICROPY_GCREGS_SETJMP (1)
 #endif
 
-#define MICROPY_PY___FILE__         (0)
+#define MICROPY_MODULE___FILE__     (0)
 #define MICROPY_PY_ARRAY            (0)
 #define MICROPY_PY_ATTRTUPLE        (0)
 #define MICROPY_PY_COLLECTIONS      (0)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 323fba67f5b07..675751d2b4064 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -23,6 +23,7 @@
 #define MICROPY_OPT_MATH_FACTORIAL              (0)
 #define MICROPY_REPL_EMACS_KEYS                 (0)
 #define MICROPY_PY_BUILTINS_COMPLEX             (0)
+#define MICROPY_MODULE___FILE__                 (0)
 #define MICROPY_PY_DELATTR_SETATTR              (0)
 #define MICROPY_PY_BUILTINS_STR_CENTER          (0)
 #define MICROPY_PY_BUILTINS_STR_PARTITION       (0)
@@ -32,7 +33,6 @@
 #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)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 963e1e8836db7..d944fc8a11e71 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -264,6 +264,7 @@
 #define MICROPY_ERROR_REPORTING               (2)
 #define MICROPY_FULL_CHECKS                   (1)
 #define MICROPY_GC_ALLOC_THRESHOLD            (1)
+#define MICROPY_MODULE___FILE__               (1)
 #define MICROPY_MODULE_GETATTR                (1)
 #define MICROPY_MULTIPLE_INHERITANCE          (1)
 #define MICROPY_PY_ARRAY                      (1)
@@ -290,7 +291,6 @@
 #define MICROPY_PY_STRUCT                     (1)
 #define MICROPY_PY_SYS                        (1)
 #define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS     (1)
-#define MICROPY_PY___FILE__                   (1)
 #endif
 
 #ifndef MICROPY_PY_UBLUEPY
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index 7e6e1c4e02b17..e95f25aa0b689 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -43,6 +43,7 @@
 #define MICROPY_ENABLE_SOURCE_LINE  (0)
 #define MICROPY_ENABLE_DOC_STRING   (0)
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_MODULE___FILE__     (0)
 #define MICROPY_PY_ASYNC_AWAIT      (0)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
@@ -51,7 +52,6 @@
 #define MICROPY_PY_BUILTINS_SLICE   (0)
 #define MICROPY_PY_BUILTINS_PROPERTY (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY___FILE__         (0)
 #define MICROPY_PY_GC               (1)
 #define MICROPY_PY_ARRAY            (0)
 #define MICROPY_PY_COLLECTIONS      (0)
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 25d85c9e61a72..091e94bdafdf2 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -57,6 +57,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_MODULE___FILE__     (0)
 #define MICROPY_MODULE_BUILTIN_INIT         (1)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (1)
 #define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
@@ -73,7 +74,6 @@
 #define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #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_COLLECTIONS      (1)
diff --git a/ports/unix/main.c b/ports/unix/main.c
index dd0788aaad96b..51d99ce5f1510 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -139,7 +139,7 @@ static int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
 
         qstr source_name = lex->source_name;
 
-        #if MICROPY_PY___FILE__
+        #if MICROPY_MODULE___FILE__
         if (input_kind == MP_PARSE_FILE_INPUT) {
             mp_store_global(MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
         }
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 0611926fdd52a..a2737a03e8dc2 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -153,7 +153,7 @@ static mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
 
 #if MICROPY_MODULE_FROZEN_STR || MICROPY_ENABLE_COMPILER
 static void do_load_from_lexer(mp_module_context_t *context, mp_lexer_t *lex) {
-    #if MICROPY_PY___FILE__
+    #if MICROPY_MODULE___FILE__
     qstr source_name = lex->source_name;
     mp_store_attr(MP_OBJ_FROM_PTR(&context->module), MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
     #endif
@@ -166,7 +166,7 @@ static void do_load_from_lexer(mp_module_context_t *context, mp_lexer_t *lex) {
 
 #if (MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD) || MICROPY_MODULE_FROZEN_MPY
 static void do_execute_proto_fun(const mp_module_context_t *context, mp_proto_fun_t proto_fun, qstr source_name) {
-    #if MICROPY_PY___FILE__
+    #if MICROPY_MODULE___FILE__
     mp_store_attr(MP_OBJ_FROM_PTR(&context->module), MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
     #else
     (void)source_name;
@@ -225,7 +225,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;
-            #if MICROPY_PY___FILE__
+            #if MICROPY_MODULE___FILE__
             qstr frozen_file_qstr = qstr_from_str(file_str + frozen_path_prefix_len);
             #else
             qstr frozen_file_qstr = MP_QSTRnull;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 5fe0e822f775c..93d65f2b0e231 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -990,6 +990,11 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_STREAMS_POSIX_API (0)
 #endif
 
+// Whether to set __file__ on imported modules.
+#ifndef MICROPY_MODULE___FILE__
+#define MICROPY_MODULE___FILE__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
+#endif
+
 // Whether modules can use MP_REGISTER_MODULE_DELEGATION() to delegate failed
 // attribute lookups to a custom handler function.
 #ifndef MICROPY_MODULE_ATTR_DELEGATION
@@ -1422,11 +1427,6 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_PY_BUILTINS_HELP_MODULES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Whether to set __file__ for imported modules
-#ifndef MICROPY_PY___FILE__
-#define MICROPY_PY___FILE__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
-#endif
-
 // Whether to process __all__ when importing all public symbols from module
 #ifndef MICROPY_MODULE___ALL__
 #define MICROPY_MODULE___ALL__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
diff --git a/py/objmodule.c b/py/objmodule.c
index 5ce373b83d3f1..5ee2f7dc86023 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -44,7 +44,7 @@ static void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
         module_name = mp_obj_str_get_str(elem->value);
     }
 
-    #if MICROPY_PY___FILE__
+    #if MICROPY_MODULE___FILE__
     // If we store __file__ to imported modules then try to lookup this
     // symbol to give more information about the module.
     elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___file__), MP_MAP_LOOKUP);

From 989abae12c9210a0acf966bbc71e90f285d8795c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Aug 2025 17:02:01 +1000
Subject: [PATCH 2719/3129] py/mpconfig: Move MICROPY_MODULE___ALL__ option to
 other module options.

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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 93d65f2b0e231..b5483ee901199 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -990,6 +990,11 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_STREAMS_POSIX_API (0)
 #endif
 
+// Whether to process __all__ when importing all public symbols from a module.
+#ifndef MICROPY_MODULE___ALL__
+#define MICROPY_MODULE___ALL__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
+#endif
+
 // Whether to set __file__ on imported modules.
 #ifndef MICROPY_MODULE___FILE__
 #define MICROPY_MODULE___FILE__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
@@ -1427,11 +1432,6 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_PY_BUILTINS_HELP_MODULES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Whether to process __all__ when importing all public symbols from module
-#ifndef MICROPY_MODULE___ALL__
-#define MICROPY_MODULE___ALL__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES)
-#endif
-
 // Whether to provide mem-info related functions in micropython module
 #ifndef MICROPY_PY_MICROPYTHON_MEM_INFO
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)

From b5fcb33eaa682bb666c839cd4fb301175cc3564f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Aug 2025 12:56:16 +1000
Subject: [PATCH 2720/3129] py/mpconfig: Enable CRYPTOLIB, HASHLIB_MD5,
 HASHLIB_SHA1 if SSL enabled.

This commit unifies the configuration of MICROPY_PY_CRYPTOLIB,
MICROPY_PY_HASHLIB_MD5 and MICROPY_PY_HASHLIB_SHA1, so they are enabled by
default if MICROPY_PY_SSL is enabled.  This matches the existing
configuration of most of the ports.

With this change, all ports remain the same except:
- reneses-ra now enables MICROPY_PY_CRYPTOLIB, MICROPY_PY_HASHLIB_MD5 and
  MICROPY_PY_HASHLIB_SHA1.
- rp2 now enables MICROPY_PY_HASHLIB_MD5.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/mpconfigport.h                                   | 3 ---
 ports/esp32/mpconfigport.h                                  | 4 ----
 ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h        | 6 +-----
 ports/esp8266/mpconfigport.h                                | 1 +
 ports/mimxrt/mpconfigport.h                                 | 3 ---
 .../rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h  | 3 ---
 ports/rp2/mpconfigport.h                                    | 2 --
 ports/stm32/mpconfigport.h                                  | 3 ---
 ports/unix/variants/mpconfigvariant_common.h                | 6 ------
 py/mpconfig.h                                               | 6 +++---
 10 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 08b27e2786e75..6b30ea2e6245a 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -112,9 +112,6 @@
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
-#define MICROPY_PY_CRYPTOLIB                    (MICROPY_PY_SSL)
-#define MICROPY_PY_HASHLIB_MD5                  (MICROPY_PY_SSL)
-#define MICROPY_PY_HASHLIB_SHA1                 (MICROPY_PY_SSL)
 #define MICROPY_PY_OS_INCLUDEFILE               "ports/alif/modos.c"
 #define MICROPY_PY_OS_DUPTERM                   (1)
 #define MICROPY_PY_OS_SEP                       (1)
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index e47b333c73698..9b12dbd34a736 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -105,10 +105,6 @@
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif
-#define MICROPY_PY_HASHLIB_MD5              (1)
-#define MICROPY_PY_HASHLIB_SHA1             (1)
-#define MICROPY_PY_HASHLIB_SHA256           (1)
-#define MICROPY_PY_CRYPTOLIB                (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (esp_random())
 #define MICROPY_PY_OS_INCLUDEFILE           "ports/esp32/modos.c"
 #define MICROPY_PY_OS_DUPTERM               (1)
diff --git a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
index 1f679961e8786..cea2267c7ccd5 100644
--- a/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
+++ b/ports/esp8266/boards/ESP8266_GENERIC/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_READER_VFS              (MICROPY_VFS)
 #define MICROPY_VFS                     (1)
 
-#define MICROPY_PY_CRYPTOLIB            (1)
-
 #elif defined(MICROPY_ESP8266_1M)
 
 #define MICROPY_HW_BOARD_NAME "ESP module (1M)"
@@ -28,9 +26,6 @@
 #define MICROPY_READER_VFS              (MICROPY_VFS)
 #define MICROPY_VFS                     (1)
 
-
-#define MICROPY_PY_CRYPTOLIB            (1)
-
 #elif defined(MICROPY_ESP8266_512K)
 
 #define MICROPY_HW_BOARD_NAME "ESP module (512K)"
@@ -45,6 +40,7 @@
 #define MICROPY_PY_SYS_STDIO_BUFFER     (0)
 #define MICROPY_PY_ASYNCIO              (0)
 #define MICROPY_PY_RE_SUB               (0)
+#define MICROPY_PY_CRYPTOLIB            (0)
 #define MICROPY_PY_FRAMEBUF             (0)
 
 #endif
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 675751d2b4064..0321de45d7f22 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -56,6 +56,7 @@
 #define MICROPY_REPL_EVENT_DRIVEN   (0)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text
+#define MICROPY_PY_HASHLIB_MD5      (0)
 #define MICROPY_PY_HASHLIB_SHA1     (MICROPY_PY_SSL && MICROPY_SSL_AXTLS)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 3cf6550d7b07b..d6694badbad95 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -145,9 +145,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_WEBSOCKET                (MICROPY_PY_LWIP)
 #define MICROPY_PY_WEBREPL                  (MICROPY_PY_LWIP)
 #define MICROPY_PY_LWIP_SOCK_RAW            (MICROPY_PY_LWIP)
-#define MICROPY_PY_HASHLIB_MD5              (MICROPY_PY_SSL)
-#define MICROPY_PY_HASHLIB_SHA1             (MICROPY_PY_SSL)
-#define MICROPY_PY_CRYPTOLIB                (MICROPY_PY_SSL)
 #ifndef MICROPY_PY_NETWORK_PPP_LWIP
 #define MICROPY_PY_NETWORK_PPP_LWIP         (MICROPY_PY_LWIP)
 #endif
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 7783c0a17c64d..11aa663296f82 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -10,9 +10,6 @@
 // Enable networking.
 #define MICROPY_PY_NETWORK              (1)
 
-// Enable MD5 hash.
-#define MICROPY_PY_HASHLIB_MD5          (1)
-
 // Disable internal error numbers.
 #define MICROPY_USE_INTERNAL_ERRNO      (0)
 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index c312293ace6e9..0c226538cda1a 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -150,8 +150,6 @@
 #define MICROPY_PY_OS_URANDOM                   (1)
 #define MICROPY_PY_RE_MATCH_GROUPS              (1)
 #define MICROPY_PY_RE_MATCH_SPAN_START_END      (1)
-#define MICROPY_PY_HASHLIB_SHA1                 (1)
-#define MICROPY_PY_CRYPTOLIB                    (1)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS            (1)
 #define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modtime.c"
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 191503cd4956f..fac261f7e2480 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -97,9 +97,6 @@
 #endif
 
 // extended modules
-#define MICROPY_PY_HASHLIB_MD5      (MICROPY_PY_SSL)
-#define MICROPY_PY_HASHLIB_SHA1     (MICROPY_PY_SSL)
-#define MICROPY_PY_CRYPTOLIB        (MICROPY_PY_SSL)
 #define MICROPY_PY_OS_INCLUDEFILE   "ports/stm32/modos.c"
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index 65c874317666a..1ac59c95572dd 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -104,12 +104,6 @@
 #define MICROPY_PY_TIME_CUSTOM_SLEEP   (1)
 #define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modtime.c"
 
-#if MICROPY_PY_SSL
-#define MICROPY_PY_HASHLIB_MD5         (1)
-#define MICROPY_PY_HASHLIB_SHA1        (1)
-#define MICROPY_PY_CRYPTOLIB           (1)
-#endif
-
 // The "select" module is enabled by default, but disable select.select().
 #define MICROPY_PY_SELECT_POSIX_OPTIMISATIONS (1)
 #define MICROPY_PY_SELECT_SELECT       (0)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index b5483ee901199..877b262c8b7ae 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1860,11 +1860,11 @@ typedef time_t mp_timestamp_t;
 #endif
 
 #ifndef MICROPY_PY_HASHLIB_MD5
-#define MICROPY_PY_HASHLIB_MD5 (0)
+#define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL)
 #endif
 
 #ifndef MICROPY_PY_HASHLIB_SHA1
-#define MICROPY_PY_HASHLIB_SHA1  (0)
+#define MICROPY_PY_HASHLIB_SHA1  (MICROPY_PY_SSL)
 #endif
 
 #ifndef MICROPY_PY_HASHLIB_SHA256
@@ -1872,7 +1872,7 @@ typedef time_t mp_timestamp_t;
 #endif
 
 #ifndef MICROPY_PY_CRYPTOLIB
-#define MICROPY_PY_CRYPTOLIB (0)
+#define MICROPY_PY_CRYPTOLIB (MICROPY_PY_SSL)
 #endif
 
 // Depends on MICROPY_PY_CRYPTOLIB

From 14e9c00cb99465236c579da722a72a9cfc4ef12f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Aug 2025 14:17:09 +1000
Subject: [PATCH 2721/3129] py/builtinimport: Guard code needing sys.path with
 MICROPY_PY_SYS_PATH.

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

diff --git a/py/builtinimport.c b/py/builtinimport.c
index a2737a03e8dc2..57b5c14e8836e 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -116,7 +116,7 @@ static mp_import_stat_t stat_module(vstr_t *path) {
 // path (i.e. "<entry>/mod_name(.py)").
 static mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
     DEBUG_printf("stat_top_level: '%s'\n", qstr_str(mod_name));
-    #if MICROPY_PY_SYS
+    #if MICROPY_PY_SYS && MICROPY_PY_SYS_PATH
     size_t path_num;
     mp_obj_t *path_items;
     mp_obj_get_array(mp_sys_path, &path_num, &path_items);
@@ -367,7 +367,7 @@ static mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
     // Immediately return if the module at this level is already loaded.
     mp_map_elem_t *elem;
 
-    #if MICROPY_PY_SYS
+    #if MICROPY_PY_SYS && MICROPY_PY_SYS_PATH
     // If sys.path is empty, the intention is to force using a built-in. This
     // means we should also ignore any loaded modules with the same name
     // which may have come from the filesystem.

From a3f9dec78852caeb56b70f1cf5cd2bd71f36c1ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Aug 2025 13:11:51 +1000
Subject: [PATCH 2722/3129] py/mpconfig: Enable the sys module at all feature
 levels by default.

This is a pretty fundamental module, and even minimal ports like unix and
zephyr minimal have it enabled.  So, enabled it by default at the lowest
feature level.

Most things in the `sys` module are configurable, and off by default, so it
shouldn't add too much to ports that don't already have it enabled (which
is just the minimal port).

Also note that `sys` is still disabled on the bare-arm port, to keep that
ultra minimal.  It means we now have bare-arm without `sys` and the minimal
port with `sys`.  That will allow different code size comparisons if/when
new `sys` features are added.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/embedding/mpconfigport.h             | 1 +
 ports/bare-arm/mpconfigport.h                 | 3 +++
 ports/minimal/mpconfigport.h                  | 6 ++++++
 ports/nrf/mpconfigport.h                      | 1 -
 ports/powerpc/mpconfigport.h                  | 1 -
 ports/unix/variants/minimal/mpconfigvariant.h | 3 +--
 ports/zephyr/mpconfigport_minimal.h           | 1 -
 py/mpconfig.h                                 | 2 +-
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/examples/embedding/mpconfigport.h b/examples/embedding/mpconfigport.h
index ed34a5d766aeb..b7a38aa81a752 100644
--- a/examples/embedding/mpconfigport.h
+++ b/examples/embedding/mpconfigport.h
@@ -13,3 +13,4 @@
 #define MICROPY_ENABLE_COMPILER                 (1)
 #define MICROPY_ENABLE_GC                       (1)
 #define MICROPY_PY_GC                           (1)
+#define MICROPY_PY_SYS                          (0)
diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 65bb67f7b9a70..f4b87f23eff41 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -37,6 +37,9 @@
 // Python internal features
 #define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_NONE)
 
+// Fine control over Python builtins, classes, modules, etc.
+#define MICROPY_PY_SYS                          (0)
+
 // Type definitions for the specific machine
 
 typedef int32_t mp_int_t; // must be pointer size
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index 87287cbc6f359..b542c124d43c7 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -21,6 +21,12 @@
 // Use the minimum headroom in the chunk allocator for parse nodes.
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT    (16)
 
+// Disable all optional sys module features.
+#define MICROPY_PY_SYS_MODULES            (0)
+#define MICROPY_PY_SYS_EXIT               (0)
+#define MICROPY_PY_SYS_PATH               (0)
+#define MICROPY_PY_SYS_ARGV               (0)
+
 // type definitions for the specific machine
 
 typedef intptr_t mp_int_t; // must be pointer size
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index d944fc8a11e71..d361d01ccefa9 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -289,7 +289,6 @@
 #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)
 #endif
 
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 091e94bdafdf2..fcb66bab1e995 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -81,7 +81,6 @@
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_IO               (0)
 #define MICROPY_PY_STRUCT           (1)
-#define MICROPY_PY_SYS              (1)
 #define MICROPY_MODULE_FROZEN_MPY   (1)
 #define MICROPY_CPYTHON_COMPAT      (0)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 97ed786b8f409..2edac41c7fd12 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -61,6 +61,5 @@
 #define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
 #define MICROPY_PY_GENERATOR_PEND_THROW (1)
 
-// Enable just the sys and os built-in modules.
-#define MICROPY_PY_SYS (1)
+// Add just the os built-in module.
 #define MICROPY_PY_OS (1)
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index 24e0c9f1adc05..c802ba5254042 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -59,7 +59,6 @@
 #define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (1)
 #define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
-#define MICROPY_PY_SYS              (1)
 
 #ifdef CONFIG_BOARD
 #define MICROPY_HW_BOARD_NAME "zephyr-" CONFIG_BOARD
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 877b262c8b7ae..303eb08f90bea 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1610,7 +1610,7 @@ typedef time_t mp_timestamp_t;
 
 // Whether to provide "sys" module
 #ifndef MICROPY_PY_SYS
-#define MICROPY_PY_SYS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
+#define MICROPY_PY_SYS (1)
 #endif
 
 // Whether to initialise "sys.path" and "sys.argv" to their defaults in mp_init()

From bd7342d9ec31101a850ddaa77c2d67c76f803389 Mon Sep 17 00:00:00 2001
From: Yilin Sun <imi415@imi.moe>
Date: Mon, 1 Apr 2024 16:13:15 +0800
Subject: [PATCH 2723/3129] mimxrt: Restructure nxp_sdk to match official
 mcux-sdk.

The official mcux-sdk follows a slightly different structure to the
current nxp_sdk submodule, with many drivers moved to a common location.

To ease updating the newer versions of the SDK and/or add new families
the nxp_sdk submodule has been updated to follow the structure of
mcux-sdk, just trimmed down to families used here to considerably
reduce the size.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 .gitmodules                                   |   2 +-
 lib/nxp_driver                                |   2 +-
 ports/mimxrt/Makefile                         | 112 ++++++++++++------
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  42 +++----
 .../boards/SEEED_ARCH_MIX/mpconfigboard.h     |  56 ++++-----
 .../boards/SEEED_ARCH_MIX/mpconfigboard.mk    |   1 -
 ports/mimxrt/eth.c                            |   8 +-
 ports/mimxrt/machine_i2s.c                    |  10 +-
 ports/mimxrt/machine_pwm.c                    |   2 +
 ports/mimxrt/machine_rtc.c                    |   2 +-
 10 files changed, 145 insertions(+), 92 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 02849ec9bdd11..d2c229dd6d751 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,7 +35,7 @@
 	url = https://github.com/bluekitchen/btstack.git
 [submodule "lib/nxp_driver"]
 	path = lib/nxp_driver
-	url = https://github.com/hathach/nxp_driver.git
+	url = https://github.com/micropython/nxp_driver.git
 [submodule "lib/libhydrogen"]
 	path = lib/libhydrogen
 	url = https://github.com/jedisct1/libhydrogen.git
diff --git a/lib/nxp_driver b/lib/nxp_driver
index fa5a554c7944d..91b04b34a59f6 160000
--- a/lib/nxp_driver
+++ b/lib/nxp_driver
@@ -1 +1 @@
-Subproject commit fa5a554c7944d2a196626f8d3631e44943f9abcc
+Subproject commit 91b04b34a59f6d81661cec6f84611afe6330ce92
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 7788b54ca57ff..fea7e56da22f4 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -52,7 +52,8 @@ include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
 # Set SDK directory based on MCU_SERIES
-MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
+MCUX_SDK_DIR = lib/nxp_driver/sdk
+MCU_DIR = $(MCUX_SDK_DIR)/devices/$(MCU_SERIES)
 
 # Select linker scripts based on MCU_SERIES
 LD_FILES = boards/$(MCU_SERIES).ld boards/common.ld
@@ -72,8 +73,6 @@ GEN_PINS_SRC = $(BUILD)/pins_gen.c
 INC += -I$(BOARD_DIR)
 INC += -I$(BUILD)
 INC += -I$(TOP)
-INC += -I$(TOP)/$(MCU_DIR)
-INC += -I$(TOP)/$(MCU_DIR)/drivers
 INC += -I$(TOP)/lib/cmsis/inc
 INC += -I$(TOP)/lib/oofatfs
 INC += -I$(TOP)/lib/tinyusb/hw
@@ -111,35 +110,38 @@ SRC_TINYUSB_C += \
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP),1)
 SRC_ETH_C += \
-	$(MCU_DIR)/drivers/fsl_enet.c \
+	$(MCUX_SDK_DIR)/drivers/enet/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/device/phyrtl8211f/fsl_phyrtl8211f.c \
 	hal/phy/mdio/enet/fsl_enet_mdio.c
+
+INC_HAL_IMX += \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/enet
 endif
 
 # NXP SDK sources
 SRC_HAL_IMX_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_gpc.c \
-	$(MCU_DIR)/drivers/fsl_gpio.c \
-	$(MCU_DIR)/drivers/fsl_gpt.c \
-	$(MCU_DIR)/drivers/fsl_lpi2c.c \
-	$(MCU_DIR)/drivers/fsl_lpspi.c \
-	$(MCU_DIR)/drivers/fsl_lpspi_edma.c \
-	$(MCU_DIR)/drivers/fsl_pit.c \
-	$(MCU_DIR)/drivers/fsl_pwm.c \
-	$(MCU_DIR)/drivers/fsl_sai.c \
-	$(MCU_DIR)/drivers/fsl_snvs_hp.c \
-	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
-	$(MCU_DIR)/drivers/fsl_wdog.c \
+	$(MCUX_SDK_DIR)/drivers/common/fsl_common.c \
+	$(MCUX_SDK_DIR)/drivers/common/fsl_common_arm.c \
+	$(MCUX_SDK_DIR)/drivers/dmamux/fsl_dmamux.c \
+	$(MCUX_SDK_DIR)/drivers/edma/fsl_edma.c \
+	$(MCUX_SDK_DIR)/drivers/flexram/fsl_flexram.c \
+	$(MCUX_SDK_DIR)/drivers/flexspi/fsl_flexspi.c \
+	$(MCUX_SDK_DIR)/drivers/igpio/fsl_gpio.c \
+	$(MCUX_SDK_DIR)/drivers/gpt/fsl_gpt.c \
+	$(MCUX_SDK_DIR)/drivers/lpi2c/fsl_lpi2c.c \
+	$(MCUX_SDK_DIR)/drivers/lpspi/fsl_lpspi.c \
+	$(MCUX_SDK_DIR)/drivers/lpspi/fsl_lpspi_edma.c \
+	$(MCUX_SDK_DIR)/drivers/pit/fsl_pit.c \
+	$(MCUX_SDK_DIR)/drivers/pwm/fsl_pwm.c \
+	$(MCUX_SDK_DIR)/drivers/sai/fsl_sai.c \
+	$(MCUX_SDK_DIR)/drivers/snvs_hp/fsl_snvs_hp.c \
+	$(MCUX_SDK_DIR)/drivers/snvs_lp/fsl_snvs_lp.c \
+	$(MCUX_SDK_DIR)/drivers/wdog01/fsl_wdog.c \
 	$(MCU_DIR)/system_$(MCU_SERIES)$(MCU_CORE).c \
 
 # Use a specific boot header for 1062 so the Teensy loader doesn't erase the filesystem.
@@ -149,18 +151,42 @@ else
 SRC_HAL_IMX_C += $(MCU_DIR)/xip/fsl_flexspi_nor_boot.c
 endif
 
+INC_HAL_IMX += \
+	-I$(TOP)/$(MCU_DIR) \
+	-I$(TOP)/$(MCU_DIR)/drivers \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/common \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/dmamux \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/edma \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/flexram \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/flexspi \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/igpio \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/gpt \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpi2c \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpspi \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpuart \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/pit \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/pwm \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/sai \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/snvs_hp \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/snvs_lp \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/wdog01 \
+
 ifeq ($(MICROPY_HW_SDRAM_AVAIL),1)
-SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_semc.c
+SRC_HAL_IMX_C += $(MCUX_SDK_DIR)/drivers/semc/fsl_semc.c
+INC_HAL_IMX += -I$(TOP)/$(MCUX_SDK_DIR)/drivers/semc
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
-SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
+SRC_HAL_IMX_C += $(MCUX_SDK_DIR)/drivers/usdhc/fsl_usdhc.c
+INC_HAL_IMX += -I$(TOP)/$(MCUX_SDK_DIR)/drivers/usdhc
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1015 MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
 SRC_HAL_IMX_C += \
-	$(MCU_DIR)/drivers/fsl_qtmr.c \
+	$(MCUX_SDK_DIR)/drivers/qtmr_1/fsl_qtmr.c \
 	$(MCU_DIR)/drivers/fsl_romapi.c
+
+INC_HAL_IMX += -I$(TOP)/$(MCUX_SDK_DIR)/drivers/qtmr_1
 endif
 
 # If not empty, then it is 10xx.
@@ -171,24 +197,42 @@ APPLICATION_ADDR := 0x3000C000
 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 \
-	$(MCU_DIR)/drivers/fsl_mu.c
+	$(MCU_DIR)/drivers/fsl_soc_src.c \
+	$(MCU_DIR)/drivers/fsl_gpc.c \
+	$(MCUX_SDK_DIR)/drivers/caam/fsl_caam.c \
+	$(MCUX_SDK_DIR)/drivers/lpadc/fsl_lpadc.c \
+	$(MCUX_SDK_DIR)/drivers/mu/fsl_mu.c
+
+INC_HAL_IMX += \
+	-I$(TOP)/$(MCU_DIR)/drivers/cm7 \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/caam \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpadc \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/mu
+
+CFLAGS += -DCACHE_MODE_WRITE_THROUGH=1
 else
 SRC_HAL_IMX_C += \
-	$(MCU_DIR)/drivers/fsl_adc.c \
-	$(MCU_DIR)/drivers/fsl_cache.c \
-	$(MCU_DIR)/drivers/fsl_trng.c
+	$(MCUX_SDK_DIR)/drivers/adc_12b1msps_sar/fsl_adc.c \
+	$(MCUX_SDK_DIR)/drivers/cache/armv7-m7/fsl_cache.c \
+	$(MCUX_SDK_DIR)/drivers/gpc_1/fsl_gpc.c \
+	$(MCUX_SDK_DIR)/drivers/src/fsl_src.c \
+	$(MCUX_SDK_DIR)/drivers/trng/fsl_trng.c
+
+INC_HAL_IMX += \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/adc_12b1msps_sar \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/cache/armv7-m7 \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/gpc_1 \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/src \
+	-I$(TOP)/$(MCUX_SDK_DIR)/drivers/trng
 endif
 
+INC += $(INC_HAL_IMX)
+
 # C source files
 SRC_C += \
 	board_init.c \
@@ -371,8 +415,6 @@ 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) \
-	-DSPI_RETRY_TIMES=1000000 \
-	-DUART_RETRY_TIMES=1000000 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
 	-DXIP_EXTERNAL_FLASH=1 \
 	-fdata-sections \
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 59a5c4fa69f84..bf9157e9c664d 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -21,14 +21,14 @@
 #define MICROPY_HW_UART_INDEX   { 1, 3, 2, 6, 8 }
 
 #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_AD_B0_12_LPUART1_TXD }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RXD }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TXD }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RXD }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TXD }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RXD }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
-    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TXD }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RXD }, \
     { 0 }, { 0 }, \
-    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TXD }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RXD },
 
 #define IOMUX_TABLE_UART_CTS_RTS \
     { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
@@ -111,22 +111,22 @@
     }
 
 // --- 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_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DA15
 
 #define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_09_SEMC_ADDR00
 #define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_10_SEMC_ADDR01
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
index 627b1aa3b1311..0ed32653f3a3c 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -23,14 +23,14 @@
 #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 }, \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TXD }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RXD }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TXD }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RXD }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TXD }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RXD }, \
+    { IOMUXC_GPIO_B1_00_LPUART4_TXD }, { IOMUXC_GPIO_B1_01_LPUART4_RXD }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
-    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TXD }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RXD },
 
 #define IOMUX_TABLE_UART_CTS_RTS \
     { IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
@@ -98,13 +98,13 @@
 
 #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 */ \
+        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
@@ -140,22 +140,22 @@
     { 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_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DA15
 
 #define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_09_SEMC_ADDR00
 #define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_10_SEMC_ADDR01
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 7ea107b00df86..1bc38ccbad7b5 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -19,4 +19,3 @@ USE_UF2_BOOTLOADER = 1
 
 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
 
-CFLAGS += -DSPI_RETRY_TIMES=1000000
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 1ac19b83d6d44..1fbd9d3895f79 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -397,9 +397,11 @@ void eth_init_0(eth_t *self, int eth_id, const phy_operations_t *phy_ops, int ph
     enet_config.txAccelerConfig = kENET_TxAccelIpCheckEnabled | kENET_TxAccelProtoCheckEnabled;
     // Set interrupt
     enet_config.interrupt |= ENET_TX_INTERRUPT | ENET_RX_INTERRUPT;
+    // Set callback
+    enet_config.callback = eth_irq_handler;
+    enet_config.userData = (void *)self;
 
     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);
@@ -461,9 +463,11 @@ void eth_init_1(eth_t *self, int eth_id, const phy_operations_t *phy_ops, int ph
     enet_config.txAccelerConfig = kENET_TxAccelIpCheckEnabled | kENET_TxAccelProtoCheckEnabled;
     // Set interrupt
     enet_config.interrupt = ENET_TX_INTERRUPT | ENET_RX_INTERRUPT;
+    // Set callback
+    enet_config.callback = eth_irq_handler;
+    enet_config.userData = (void *)self;
 
     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);
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 8553cb285b668..b57da4ad19012 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -35,8 +35,14 @@
 #include "fsl_iomuxc.h"
 #include "fsl_dmamux.h"
 #include "fsl_edma.h"
+#include "fsl_common.h"
 #include "fsl_sai.h"
 
+#ifndef FSL_FEATURE_SAI_FIFO_COUNTn
+// Back-compat with mcux-sdk 2.11
+#define FSL_FEATURE_SAI_FIFO_COUNTn(x) FSL_FEATURE_SAI_FIFO_COUNT
+#endif
+
 // Notes on this port's specific implementation of I2S:
 // - the DMA callback is used to implement the asynchronous background operations, for non-blocking mode
 // - all 3 Modes of operation are implemented using the peripheral drivers in the NXP MCUXpresso SDK
@@ -538,14 +544,14 @@ static bool i2s_init(machine_i2s_obj_t *self) {
         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,
+            (FSL_FEATURE_SAI_FIFO_COUNTn(self->i2s_inst) - 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,
+            (FSL_FEATURE_SAI_FIFO_COUNTn(self->i2s_inst) - saiConfig.fifo.fifoWatermark) * bytes_per_sample,
             SIZEOF_DMA_BUFFER_IN_BYTES, kEDMA_PeripheralToMemory);
     }
 
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index b68521281ae6c..df76ed2b8bd34 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -241,7 +241,9 @@ static void configure_flexpwm(machine_pwm_obj_t *self) {
             pwmConfig.pairOperation = kPWM_Independent;
         }
         pwmConfig.clockSource = kPWM_BusClock;
+        #if !defined(FSL_FEATURE_PWM_HAS_NO_WAITEN) || (!FSL_FEATURE_PWM_HAS_NO_WAITEN)
         pwmConfig.enableWait = false;
+        #endif
         pwmConfig.initializationControl = self->sync ? kPWM_Initialize_MasterSync : kPWM_Initialize_LocalSync;
 
         if (PWM_Init(self->instance, self->submodule, &pwmConfig) == kStatus_Fail) {
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index e6c519991983b..b025e392612c7 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -156,7 +156,7 @@ void machine_rtc_start(void) {
     SNVS->HPCOMR |= SNVS_HPCOMR_NPSWA_EN_MASK;
     // Do a basic init.
     SNVS_LP_Init(SNVS);
-    #if FSL_FEATURE_SNVS_HAS_MULTIPLE_TAMPER
+    #if defined(FSL_FEATURE_SNVS_HAS_MULTIPLE_TAMPER) && (FSL_FEATURE_SNVS_HAS_MULTIPLE_TAMPER > 0)
     // Disable all external Tamper
     SNVS_LP_DisableAllExternalTamper(SNVS);
     #endif

From 053aade74100d43b57d4302986076e85bedbde17 Mon Sep 17 00:00:00 2001
From: Yilin Sun <imi415@imi.moe>
Date: Fri, 31 Jan 2025 12:49:20 +1100
Subject: [PATCH 2724/3129] mimxrt/boards: Re-generate MIMXRT1052 clock config
 files.

These were regenerated by the NXP Config tool for v2.11.

The board_init update was needed to ensure CLOCK_SetMode() is run
at the appropriate time during startup.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/mimxrt/board_init.c                     |   3 +
 ports/mimxrt/boards/MIMXRT1052_clock_config.c | 130 ++++++++++--------
 ports/mimxrt/boards/MIMXRT1052_clock_config.h | 102 +++++++-------
 3 files changed, 132 insertions(+), 103 deletions(-)

diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 88de27ea77371..0643da0645eaf 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -52,6 +52,9 @@ void board_init(void) {
     SCB_EnableICache();
     // Init clock
     BOARD_BootClockRUN();
+    #if !defined(MIMXRT117x_SERIES)
+    CLOCK_SetMode(kCLOCK_ModeRun);
+    #endif
     SystemCoreClockUpdate();
 
     // Enable IOCON clock
diff --git a/ports/mimxrt/boards/MIMXRT1052_clock_config.c b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
index bff43ae5e54b2..de65a3e584110 100644
--- a/ports/mimxrt/boards/MIMXRT1052_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 NXP
+ * Copyright 2022 NXP
  * All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
@@ -22,11 +22,11 @@
 
 /* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
 !!GlobalInfo
-product: Clocks v5.0
+product: Clocks v10.0
 processor: MIMXRT1052xxxxB
 package_id: MIMXRT1052DVL6B
 mcu_data: ksdk2_0
-processor_version: 0.0.0
+processor_version: 0.12.10
 board: IMXRT1050-EVKB
  * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
 
@@ -40,8 +40,6 @@ board: IMXRT1050-EVKB
 /*******************************************************************************
  * Variables
  ******************************************************************************/
-/* System clock frequency. */
-extern uint32_t SystemCoreClock;
 
 /*******************************************************************************
  ************************ BOARD_InitBootClocks function ************************
@@ -64,7 +62,6 @@ called_from_default_init: true
 - {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}
@@ -92,7 +89,7 @@ called_from_default_init: true
 - {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: TRACE_CLK_ROOT.outFreq, value: 132 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}
@@ -104,7 +101,7 @@ called_from_default_init: true
 - {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.TRACE_CLK_SEL.sel, value: CCM_ANALOG.PLL2_MAIN_CLK}
 - {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}
@@ -125,31 +122,45 @@ called_from_default_init: true
 - {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.div, value: '31', locked: true}
 - {id: CCM_ANALOG.PLL5.num, value: '0'}
+- {id: CCM_ANALOG.PLL5_BYPASS.sel, value: CCM_ANALOG.PLL5_POST_DIV}
+- {id: CCM_ANALOG.PLL5_POST_DIV.scale, value: '2'}
+- {id: CCM_ANALOG.VIDEO_DIV.scale, value: '4'}
 - {id: CCM_ANALOG_PLL_ENET_POWERDOWN_CFG, value: 'Yes'}
 - {id: CCM_ANALOG_PLL_USB1_POWER_CFG, value: 'Yes'}
+- {id: CCM_ANALOG_PLL_VIDEO_POWERDOWN_CFG, value: 'No'}
 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_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_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_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_video_pll_config_t videoPllConfig_BOARD_BootClockRUN =
+{
+    .loopDivider = 31,                            /* PLL loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .postDivider = 8,                             /* Divider after PLL */
+    .numerator = 0,                               /* 30 bit numerator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .denominator = 1,                             /* 30 bit denominator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
 };
 /*******************************************************************************
  * Code for BOARD_BootClockRUN configuration
@@ -213,10 +224,9 @@ void BOARD_BootClockRUN(void) {
     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.*/
+    /* 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);
@@ -227,10 +237,9 @@ void BOARD_BootClockRUN(void) {
     /* 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.*/
+    /* 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);
@@ -257,9 +266,9 @@ void BOARD_BootClockRUN(void) {
     /* Disable TRACE clock gate. */
     CLOCK_DisableClock(kCLOCK_Trace);
     /* Set TRACE_PODF. */
-    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 3);
     /* Set Trace clock source. */
-    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    CLOCK_SetMux(kCLOCK_TraceMux, 0);
     /* Disable SAI1 clock gate. */
     CLOCK_DisableClock(kCLOCK_Sai1);
     /* Set SAI1_CLK_PRED. */
@@ -351,10 +360,12 @@ void BOARD_BootClockRUN(void) {
     /* 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.*/
+     * 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
+    #if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+    #warning "SKIP_SYSCLK_INIT should be defined to keep system pll (selected to be SEMC source clock in SDK projects) unchanged."
+    #endif
     /* Init System PLL. */
     CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
     /* Init System pfd0. */
@@ -365,13 +376,10 @@ void BOARD_BootClockRUN(void) {
     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.*/
+     * 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);
@@ -395,21 +403,30 @@ void BOARD_BootClockRUN(void) {
     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;
+    /* Init Video PLL. */
+    uint32_t pllVideo;
+    /* Disable Video PLL output before initial Video PLL. */
+    CCM_ANALOG->PLL_VIDEO &= ~CCM_ANALOG_PLL_VIDEO_ENABLE_MASK;
+    /* Bypass PLL first */
+    CCM_ANALOG->PLL_VIDEO = (CCM_ANALOG->PLL_VIDEO & (~CCM_ANALOG_PLL_VIDEO_BYPASS_CLK_SRC_MASK)) |
+        CCM_ANALOG_PLL_VIDEO_BYPASS_MASK | CCM_ANALOG_PLL_VIDEO_BYPASS_CLK_SRC(0);
+    CCM_ANALOG->PLL_VIDEO_NUM = CCM_ANALOG_PLL_VIDEO_NUM_A(0);
+    CCM_ANALOG->PLL_VIDEO_DENOM = CCM_ANALOG_PLL_VIDEO_DENOM_B(1);
+    pllVideo = (CCM_ANALOG->PLL_VIDEO & (~(CCM_ANALOG_PLL_VIDEO_DIV_SELECT_MASK | CCM_ANALOG_PLL_VIDEO_POWERDOWN_MASK))) |
+        CCM_ANALOG_PLL_VIDEO_ENABLE_MASK | CCM_ANALOG_PLL_VIDEO_DIV_SELECT(31);
+    pllVideo |= CCM_ANALOG_PLL_VIDEO_POST_DIV_SELECT(1);
+    CCM_ANALOG->MISC2 = (CCM_ANALOG->MISC2 & (~CCM_ANALOG_MISC2_VIDEO_DIV_MASK)) | CCM_ANALOG_MISC2_VIDEO_DIV(3);
+    CCM_ANALOG->PLL_VIDEO = pllVideo;
+    while ((CCM_ANALOG->PLL_VIDEO & CCM_ANALOG_PLL_VIDEO_LOCK_MASK) == 0) {
+    }
+    /* Disable bypass for Video PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllVideo, 0);
     /* 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);
+    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. */
@@ -429,8 +446,7 @@ void BOARD_BootClockRUN(void) {
     /* 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);
+    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. */
@@ -457,13 +473,19 @@ void BOARD_BootClockRUN(void) {
     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 ENET Ref clock source. */
+    #if defined(IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK)
+    IOMUXC_GPR->GPR1 &= ~IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK;
+    #elif defined(IOMUXC_GPR_GPR1_ENET1_TX_CLK_DIR_MASK)
+    /* Backward compatibility for original bitfield name */
+    IOMUXC_GPR->GPR1 &= ~IOMUXC_GPR_GPR1_ENET1_TX_CLK_DIR_MASK;
+    #else
+    #error "Neither IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK nor IOMUXC_GPR_GPR1_ENET1_TX_CLK_DIR_MASK is defined."
+    #endif /* defined(IOMUXC_GPR_GPR1_ENET_REF_CLK_DIR_MASK) */
     /* 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;
-    CLOCK_SetMode(kCLOCK_ModeRun);
 }
diff --git a/ports/mimxrt/boards/MIMXRT1052_clock_config.h b/ports/mimxrt/boards/MIMXRT1052_clock_config.h
index 358a6f03b3668..0e7febef35eea 100644
--- a/ports/mimxrt/boards/MIMXRT1052_clock_config.h
+++ b/ports/mimxrt/boards/MIMXRT1052_clock_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 NXP
+ * Copyright 2022 NXP
  * All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
@@ -13,9 +13,9 @@
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
-#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+#define BOARD_XTAL0_CLK_HZ                         24000000U  /*!< Board xtal0 frequency in Hz */
 
-#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+#define BOARD_XTAL32K_CLK_HZ                          32768U  /*!< Board xtal32k frequency in Hz */
 /*******************************************************************************
  ************************ BOARD_InitBootClocks function ************************
  ******************************************************************************/
@@ -40,54 +40,55 @@ void BOARD_InitBootClocks(void);
 /*******************************************************************************
  * Definitions for BOARD_BootClockRUN configuration
  ******************************************************************************/
-#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
+#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 40000000UL
-#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
+#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_ENET_125M_CLK              2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK           1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET_REF_CLK               0UL
+#define BOARD_BOOTCLOCKRUN_ENET_TX_CLK                0UL
+#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             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             132000000UL
+#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.
  */
@@ -98,6 +99,9 @@ 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 Video PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_video_pll_config_t videoPllConfig_BOARD_BootClockRUN;
 
 /*******************************************************************************
  * API for BOARD_BootClockRUN configuration

From 72147c02c7e630505515746e0ac6ac31f34c143b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 12 Aug 2025 13:09:24 +0200
Subject: [PATCH 2725/3129] esp32/network_ppp: Stop polling if stream becomes
 None.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If while a polling operation is active the stream is removed we should
stop polling data from that stream.

This was already the intended behaviour, but implemented incorrectly.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/network_ppp_lwip.c | 4 ++--
 ports/esp32/network_ppp.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
index 12205521f670f..15e3ba0292020 100644
--- a/extmod/network_ppp_lwip.c
+++ b/extmod/network_ppp_lwip.c
@@ -145,8 +145,8 @@ static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
     }
 
     mp_int_t total_len = 0;
-    mp_obj_t stream = self->stream;
-    while (stream != mp_const_none) {
+    mp_obj_t stream;
+    while ((stream = self->stream) != mp_const_none) {
         uint8_t buf[256];
         int err;
         mp_uint_t len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 18e0c8816889a..97536267b87ca 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -153,8 +153,8 @@ static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
     }
 
     mp_int_t total_len = 0;
-    mp_obj_t stream = self->stream;
-    while (stream != mp_const_none) {
+    mp_obj_t stream;
+    while ((stream = self->stream) != mp_const_none) {
         uint8_t buf[256];
         int err;
         mp_uint_t len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);

From 1df5ee12e880fcd5a5129c7f0c077abdf2387f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Tue, 12 Aug 2025 13:09:24 +0200
Subject: [PATCH 2726/3129] esp32/network_ppp: Stop polling if PPP was
 disconnected.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When disconnecting from PPP the modem sends a confirmation. This message
is received, like all messages, through the poll() method. lwIP may then
immediately call our status callback with code PPPERR_USER to indicate
the connection was closed. Our callback then immediately proceeds to
free the PCB. Thus, during each new iteration of the loop in poll() we
must check if we haven't disconnected in the meantime to prevent calling
the pppos_input_tcpip with a PCB that is now NULL.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/network_ppp_lwip.c | 2 +-
 ports/esp32/network_ppp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/network_ppp_lwip.c b/extmod/network_ppp_lwip.c
index 15e3ba0292020..d7a1cf5e0ce56 100644
--- a/extmod/network_ppp_lwip.c
+++ b/extmod/network_ppp_lwip.c
@@ -146,7 +146,7 @@ static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
 
     mp_int_t total_len = 0;
     mp_obj_t stream;
-    while ((stream = self->stream) != mp_const_none) {
+    while (self->state >= STATE_ACTIVE && (stream = self->stream) != mp_const_none) {
         uint8_t buf[256];
         int err;
         mp_uint_t len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index 97536267b87ca..725d21048888d 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -154,7 +154,7 @@ static mp_obj_t network_ppp_poll(size_t n_args, const mp_obj_t *args) {
 
     mp_int_t total_len = 0;
     mp_obj_t stream;
-    while ((stream = self->stream) != mp_const_none) {
+    while (self->state >= STATE_ACTIVE && (stream = self->stream) != mp_const_none) {
         uint8_t buf[256];
         int err;
         mp_uint_t len = mp_stream_rw(stream, buf, sizeof(buf), &err, 0);

From b0fd0079f48bde7f12578823ef88c91f52757cff Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 19 Aug 2025 14:06:42 +0200
Subject: [PATCH 2727/3129] tests/micropython: Make tests behave in low memory
 condition.

This commit changes the "viper_ptr*_store_boundary" tests to make them
fail more gracefully in low memory conditions.

The original version of the tests compiled viper code blocks on the fly
when it needed them, making them fail at runtime on some boards that do
not come with enough memory for this test.  This clashes with
"run-tests.py"'s ability to look for a particular signature to mark
tests as skipped due to not enough memory.

Now compiled code blocks are generated at the beginning of the test
inside an appropriate exception handler.  In case of a memory error when
pre-compiling a code block, the running test exits reporting a low
memory condition to the test runner.  This allows to have clean test
runs on all platforms when it comes to viper pointer tests.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .../micropython/viper_ptr16_store_boundary.py | 39 ++++++++-------
 .../viper_ptr16_store_boundary.py.exp         | 26 ++++++----
 .../micropython/viper_ptr32_store_boundary.py | 48 ++++++++++---------
 .../viper_ptr32_store_boundary.py.exp         | 26 ++++++----
 .../micropython/viper_ptr8_store_boundary.py  | 34 ++++++++-----
 .../viper_ptr8_store_boundary.py.exp          | 26 ++++++----
 6 files changed, 119 insertions(+), 80 deletions(-)

diff --git a/tests/micropython/viper_ptr16_store_boundary.py b/tests/micropython/viper_ptr16_store_boundary.py
index 3501a05685ec3..7c774d4d1ca18 100644
--- a/tests/micropython/viper_ptr16_store_boundary.py
+++ b/tests/micropython/viper_ptr16_store_boundary.py
@@ -6,15 +6,12 @@ def set{off}(dest: ptr16):
     saved = dest
     dest[{off}] = {val}
     assert int(saved) == int(dest)
-set{off}(buffer)
-print(hex(get_index(buffer, {off})))
 """
 
 BIT_THRESHOLDS = (5, 8, 11, 12)
 SIZE = 2
 MASK = (1 << (8 * SIZE)) - 1
 
-
 next_int = 1
 test_buffer = bytearray(SIZE)
 
@@ -32,6 +29,10 @@ def next_value() -> uint:
     return output & MASK
 
 
+def get_index(src, i):
+    return src[i * SIZE] + (src[(i * SIZE) + 1] << 8)
+
+
 @micropython.viper
 def set_index(dest: ptr16, i: int, val: uint):
     saved = dest
@@ -39,22 +40,24 @@ def set_index(dest: ptr16, i: int, val: uint):
     assert int(saved) == int(dest)
 
 
-def get_index(src, i):
-    return src[i * SIZE] + (src[(i * SIZE) + 1] << 8)
+try:
+    buffer = bytearray((((1 << max(BIT_THRESHOLDS)) // 1024) + 1) * 1024)
+
+    for bit in BIT_THRESHOLDS:
+        offset = (1 << bit) - (2 * SIZE)
+        for index in range(0, 3 * SIZE, SIZE):
+            exec(SET_TEMPLATE.format(off=(offset + index) // SIZE, val=next_value()))
+except MemoryError:
+    print("SKIP-TOO-LARGE")
+    raise SystemExit
 
 
-buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
 for bit in BIT_THRESHOLDS:
     print("---", bit)
-    pre, idx, post = (
-        (((1 << bit) - (2 * SIZE)) // SIZE),
-        (((1 << bit) - (1 * SIZE)) // SIZE),
-        ((1 << bit) // SIZE),
-    )
-    set_index(buffer, pre, next_value())
-    set_index(buffer, idx, next_value())
-    set_index(buffer, post, next_value())
-    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
-    exec(SET_TEMPLATE.format(off=pre, val=next_value()))
-    exec(SET_TEMPLATE.format(off=idx, val=next_value()))
-    exec(SET_TEMPLATE.format(off=post, val=next_value()))
+    offset = (1 << bit) - (2 * SIZE)
+    for index in range(0, 3 * SIZE, SIZE):
+        globals()["set{}".format((offset + index) // SIZE)](buffer)
+        print(hex(get_index(buffer, (offset + index) // SIZE)))
+    for index in range(0, 3 * SIZE, SIZE):
+        set_index(buffer, (offset + index) // SIZE, next_value())
+        print(hex(get_index(buffer, (offset + index) // SIZE)))
diff --git a/tests/micropython/viper_ptr16_store_boundary.py.exp b/tests/micropython/viper_ptr16_store_boundary.py.exp
index 1c084da2d9c0f..007a50b3edafb 100644
--- a/tests/micropython/viper_ptr16_store_boundary.py.exp
+++ b/tests/micropython/viper_ptr16_store_boundary.py.exp
@@ -1,20 +1,28 @@
 --- 5
-0x1 0x102 0x203
+0x1
+0x102
+0x203
+0xc0d
+0xd0e
+0xe0f
+--- 8
 0x304
 0x405
 0x506
---- 8
-0x607 0x708 0x809
-0x90a
-0xa0b
-0xb0c
---- 11
-0xc0d 0xd0e 0xe0f
 0xf10
 0x1011
 0x1112
+--- 11
+0x607
+0x708
+0x809
+0x1213
+0x1314
+0x1415
 --- 12
-0x1213 0x1314 0x1415
+0x90a
+0xa0b
+0xb0c
 0x1516
 0x1617
 0x1718
diff --git a/tests/micropython/viper_ptr32_store_boundary.py b/tests/micropython/viper_ptr32_store_boundary.py
index 8c207278ec538..96ca74ad3ca70 100644
--- a/tests/micropython/viper_ptr32_store_boundary.py
+++ b/tests/micropython/viper_ptr32_store_boundary.py
@@ -6,8 +6,6 @@ def set{off}(dest: ptr32):
     saved = dest
     dest[{off}] = {val}
     assert int(saved) == int(dest)
-set{off}(buffer)
-print(hex(get_index(buffer, {off})))
 """
 
 BIT_THRESHOLDS = (5, 8, 11, 12)
@@ -31,13 +29,6 @@ def next_value() -> uint:
     return output & MASK
 
 
-@micropython.viper
-def set_index(dest: ptr32, i: int, val: uint):
-    saved = dest
-    dest[i] = val
-    assert int(saved) == int(dest)
-
-
 def get_index(src, i):
     return (
         src[i * SIZE]
@@ -47,18 +38,31 @@ def get_index(src, i):
     )
 
 
-buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
+@micropython.viper
+def set_index(dest: ptr32, i: int, val: uint):
+    saved = dest
+    dest[i] = val
+    assert int(dest) == int(saved)
+
+
+try:
+    buffer = bytearray((((1 << max(BIT_THRESHOLDS)) // 1024) + 1) * 1024)
+
+    for bit in BIT_THRESHOLDS:
+        offset = (1 << bit) - (2 * SIZE)
+        for index in range(0, 3 * SIZE, SIZE):
+            exec(SET_TEMPLATE.format(off=(offset + index) // SIZE, val=next_value()))
+except MemoryError:
+    print("SKIP-TOO-LARGE")
+    raise SystemExit
+
+
 for bit in BIT_THRESHOLDS:
     print("---", bit)
-    pre, idx, post = (
-        (((1 << bit) - (2 * SIZE)) // SIZE),
-        (((1 << bit) - (1 * SIZE)) // SIZE),
-        ((1 << bit) // SIZE),
-    )
-    set_index(buffer, pre, next_value())
-    set_index(buffer, idx, next_value())
-    set_index(buffer, post, next_value())
-    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
-    exec(SET_TEMPLATE.format(off=pre, val=next_value()))
-    exec(SET_TEMPLATE.format(off=idx, val=next_value()))
-    exec(SET_TEMPLATE.format(off=post, val=next_value()))
+    offset = (1 << bit) - (2 * SIZE)
+    for index in range(0, 3 * SIZE, SIZE):
+        globals()["set{}".format((offset + index) // SIZE)](buffer)
+        print(hex(get_index(buffer, (offset + index) // SIZE)))
+    for index in range(0, 3 * SIZE, SIZE):
+        set_index(buffer, (offset + index) // SIZE, next_value())
+        print(hex(get_index(buffer, (offset + index) // SIZE)))
diff --git a/tests/micropython/viper_ptr32_store_boundary.py.exp b/tests/micropython/viper_ptr32_store_boundary.py.exp
index 67b114d3358ee..7a9a51624743e 100644
--- a/tests/micropython/viper_ptr32_store_boundary.py.exp
+++ b/tests/micropython/viper_ptr32_store_boundary.py.exp
@@ -1,20 +1,28 @@
 --- 5
-0x1 0x102 0x10203
+0x1
+0x102
+0x10203
+0xa0b0c0d
+0xb0c0d0e
+0xc0d0e0f
+--- 8
 0x1020304
 0x2030405
 0x3040506
---- 8
-0x4050607 0x5060708 0x6070809
-0x708090a
-0x8090a0b
-0x90a0b0c
---- 11
-0xa0b0c0d 0xb0c0d0e 0xc0d0e0f
 0xd0e0f10
 0xe0f1011
 0xf101112
+--- 11
+0x4050607
+0x5060708
+0x6070809
+0x10111213
+0x11121314
+0x12131415
 --- 12
-0x10111213 0x11121314 0x12131415
+0x708090a
+0x8090a0b
+0x90a0b0c
 0x13141516
 0x14151617
 0x15161718
diff --git a/tests/micropython/viper_ptr8_store_boundary.py b/tests/micropython/viper_ptr8_store_boundary.py
index d3cba17e16318..68b76fd598b88 100644
--- a/tests/micropython/viper_ptr8_store_boundary.py
+++ b/tests/micropython/viper_ptr8_store_boundary.py
@@ -6,8 +6,6 @@ def set{off}(dest: ptr8):
     saved = dest
     dest[{off}] = {val}
     assert int(saved) == int(dest)
-set{off}(buffer)
-print(hex(get_index(buffer, {off})))
 """
 
 BIT_THRESHOLDS = (5, 8, 11, 12)
@@ -31,6 +29,10 @@ def next_value() -> uint:
     return output & MASK
 
 
+def get_index(src: ptr8, i: int):
+    return src[i]
+
+
 @micropython.viper
 def set_index(dest: ptr8, i: int, val: uint):
     saved = dest
@@ -38,18 +40,24 @@ def set_index(dest: ptr8, i: int, val: uint):
     assert int(dest) == int(saved)
 
 
-def get_index(src: ptr8, i: int):
-    return src[i]
+try:
+    buffer = bytearray((((1 << max(BIT_THRESHOLDS)) // 1024) + 1) * 1024)
+
+    for bit in BIT_THRESHOLDS:
+        offset = (1 << bit) - (2 * SIZE)
+        for index in range(0, 3 * SIZE, SIZE):
+            exec(SET_TEMPLATE.format(off=(offset + index) // SIZE, val=next_value()))
+except MemoryError:
+    print("SKIP-TOO-LARGE")
+    raise SystemExit
 
 
-buffer = bytearray(((1 << max(BIT_THRESHOLDS) + 1) // 1024) * 1024)
 for bit in BIT_THRESHOLDS:
     print("---", bit)
-    pre, idx, post = (((1 << bit) - (2 * SIZE)), ((1 << bit) - (1 * SIZE)), (1 << bit))
-    set_index(buffer, pre, next_value())
-    set_index(buffer, idx, next_value())
-    set_index(buffer, post, next_value())
-    print(hex(get_index(buffer, pre)), hex(get_index(buffer, idx)), hex(get_index(buffer, post)))
-    exec(SET_TEMPLATE.format(off=pre, val=next_value()))
-    exec(SET_TEMPLATE.format(off=idx, val=next_value()))
-    exec(SET_TEMPLATE.format(off=post, val=next_value()))
+    offset = (1 << bit) - (2 * SIZE)
+    for index in range(0, 3 * SIZE, SIZE):
+        globals()["set{}".format((offset + index) // SIZE)](buffer)
+        print(hex(get_index(buffer, (offset + index) // SIZE)))
+    for index in range(0, 3 * SIZE, SIZE):
+        set_index(buffer, (offset + index) // SIZE, next_value())
+        print(hex(get_index(buffer, (offset + index) // SIZE)))
diff --git a/tests/micropython/viper_ptr8_store_boundary.py.exp b/tests/micropython/viper_ptr8_store_boundary.py.exp
index 6b0f7ce13e8cf..621295d81a896 100644
--- a/tests/micropython/viper_ptr8_store_boundary.py.exp
+++ b/tests/micropython/viper_ptr8_store_boundary.py.exp
@@ -1,20 +1,28 @@
 --- 5
-0x1 0x2 0x3
+0x1
+0x2
+0x3
+0xd
+0xe
+0xf
+--- 8
 0x4
 0x5
 0x6
---- 8
-0x7 0x8 0x9
-0xa
-0xb
-0xc
---- 11
-0xd 0xe 0xf
 0x10
 0x11
 0x12
+--- 11
+0x7
+0x8
+0x9
+0x13
+0x14
+0x15
 --- 12
-0x13 0x14 0x15
+0xa
+0xb
+0xc
 0x16
 0x17
 0x18

From 87099b57314f37e19f6551b0d575b620e1d29323 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 24 Jul 2025 15:28:48 +0200
Subject: [PATCH 2728/3129] qemu/Makefile: Allow overriding floating point mode
 by boards.

This commit lets board use a different floating point mode rather than
the usual soft-float that was the original default for all QEMU-based
boards.

The configuration options are the same available in the "stm32" port.
Boards can set "MICROPY_FLOAT_IMPL" to either "float", "double", or
"none" to indicate which floating point mode they want, and optionally
"SUPPORTS_HARDWARE_FP_SINGLE" or "SUPPORTS_HARDWARE_FP_DOUBLE" can be
set to 1 to further indicate the hardware capabilities of the hardware
floating point unit, if present.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile       | 37 +++++++++++++++++++++++++++++++++----
 ports/qemu/mpconfigport.h |  1 -
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index fc1e557974c97..7784a266c3018 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -36,6 +36,8 @@ MICROPY_HEAP_SIZE ?= 143360
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 
+MICROPY_FLOAT_IMPL ?= float
+
 # include py core make definitions
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
@@ -44,6 +46,20 @@ GIT_SUBMODULES += lib/berkeley-db-1.xx
 
 CFLAGS += -DMICROPY_HEAP_SIZE=$(MICROPY_HEAP_SIZE)
 
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
+else ifeq ($(MICROPY_FLOAT_IMPL),float)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT -fsingle-precision-constant
+else
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
+endif
+
+ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
+CFLAGS += -DMICROPY_HW_FPU=1
+else ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
+CFLAGS += -DMICROPY_HW_FPU=1
+endif
+
 ################################################################################
 # ARM specific settings
 
@@ -156,16 +172,29 @@ SRC_C += \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 
-LIB_SRC_C += $(SRC_LIB_LIBM_C)
-LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_C)
+ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_HW_C)
+else
+LIBM_SRC_C += $(SRC_LIB_LIBM_DBL_SQRT_SW_C)
+endif
+else
+LIBM_SRC_C += $(SRC_LIB_LIBM_C)
+ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_HW_C)
+else
+LIBM_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
+endif
+endif
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_BOARD_O))
-OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(LIB_SRC_C)
+SRC_QSTR += $(SRC_C) $(LIBM_SRC_C)
 
 ################################################################################
 # Main targets
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 9c879f55dfeb5..6c6dd68535a12 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -51,7 +51,6 @@
 #define MICROPY_ENABLE_GC           (1)
 #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_WARNINGS            (1)
 #define MICROPY_PY_SYS_PLATFORM     "qemu"
 #define MICROPY_PY_SYS_STDIO_BUFFER (0)

From 19be404ad899701b655b2da78e57b34d7fb686be Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 24 Jul 2025 15:36:28 +0200
Subject: [PATCH 2729/3129] qemu/arm: Add definition for the MPS2_AN500
 machine.

This commit introduces a new target for the QEMU port called
"MPS2_AN500", an ARMv7-M machine with a Cortex-M7 CPU and
single-/double-precision floating point unit.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/README.md                          |  1 +
 ports/qemu/boards/MPS2_AN500/mpconfigboard.mk | 15 +++++++++++++++
 ports/qemu/mcu/arm/startup.c                  |  6 ++++++
 3 files changed, 22 insertions(+)
 create mode 100644 ports/qemu/boards/MPS2_AN500/mpconfigboard.mk

diff --git a/ports/qemu/README.md b/ports/qemu/README.md
index aab88ab5898c9..d8ef3ac551e9d 100644
--- a/ports/qemu/README.md
+++ b/ports/qemu/README.md
@@ -59,6 +59,7 @@ Available boards are:
 | ----------------- | ------------ | ------------------------ |
 | `MICROBIT`        | `arm`        | `microbit`               |
 | `MPS2_AN385`      | `arm`        | `mps2-an385`             |
+| `MPS2_AN500`      | `arm`        | `mps2-an500`             |
 | `NETDUINO2`       | `arm`        | `netduino2`              |
 | `SABRELITE`       | `arm`        | `sabrelite`              |
 | `VIRT_RV32`       | `riscv32`    | `virt`                   |
diff --git a/ports/qemu/boards/MPS2_AN500/mpconfigboard.mk b/ports/qemu/boards/MPS2_AN500/mpconfigboard.mk
new file mode 100644
index 0000000000000..b7b54a80563e4
--- /dev/null
+++ b/ports/qemu/boards/MPS2_AN500/mpconfigboard.mk
@@ -0,0 +1,15 @@
+QEMU_ARCH = arm
+QEMU_MACHINE = mps2-an500
+
+CFLAGS += -mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
+CFLAGS += -DQEMU_SOC_MPS2
+CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-M7"'
+
+LDSCRIPT = mcu/arm/mps2.ld
+
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
+
+MPY_CROSS_FLAGS += -march=armv7emdp
+
+MICROPY_FLOAT_IMPL = double
+SUPPORTS_HARDWARE_FP_DOUBLE = 1
diff --git a/ports/qemu/mcu/arm/startup.c b/ports/qemu/mcu/arm/startup.c
index a7e9efb9fba0f..56d246b143216 100644
--- a/ports/qemu/mcu/arm/startup.c
+++ b/ports/qemu/mcu/arm/startup.c
@@ -47,6 +47,12 @@ __attribute__((naked)) void Reset_Handler(void) {
     for (uint32_t *dest = &_sbss; dest < &_ebss;) {
         *dest++ = 0;
     }
+    #if MICROPY_HW_FPU && defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH == 7
+    // initialise the FPU (full access to CP10 and CP11, as per B3.2.20)
+    *((volatile uint32_t *)0xE000ED88) |= 0x00F00000;
+    __asm volatile ("dsb");
+    __asm volatile ("isb");
+    #endif
     // jump to board initialisation
     void _start(void);
     _start();

From 64cac4690fad4df240056f5e15900d7ef5274a4c Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 23 Jul 2025 13:25:31 +0200
Subject: [PATCH 2730/3129] qemu/mcu/arm/errorhandler: Add ARMv7-M debug
 registers.

This commit extends the QEMU port's CPU error handler for the Arm target
by printing out in detail the ARMv7-M debug registers if the firmware is
compiled for such a target.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/mcu/arm/errorhandler.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/ports/qemu/mcu/arm/errorhandler.c b/ports/qemu/mcu/arm/errorhandler.c
index a647c0e153606..278bc8d4e5c83 100644
--- a/ports/qemu/mcu/arm/errorhandler.c
+++ b/ports/qemu/mcu/arm/errorhandler.c
@@ -63,6 +63,8 @@ static const char *EXCEPTION_NAMES_TABLE[] = {
 // R0-R15, PSR, Kind
 uintptr_t registers_copy[18] = { 0 };
 
+#define BIT(v, b) (((v) & (1U << (b))) != 0)
+
 __attribute__((naked)) MP_NORETURN void exception_handler(uintptr_t kind) {
     // Save registers
     __asm volatile (
@@ -127,13 +129,33 @@ __attribute__((naked)) MP_NORETURN void exception_handler(uintptr_t kind) {
             }
             break;
     }
-    printf(" exception caught:\n");
+    printf(" exception caught:\n\n");
+    printf("CPU registers:\n");
     printf("R0:   %08X R1:   %08X R2:   %08X R3:   %08X\n", registers_copy[0], registers_copy[1], registers_copy[2], registers_copy[3]);
     printf("R4:   %08X R5:   %08X R6:   %08X R7:   %08X\n", registers_copy[4], registers_copy[5], registers_copy[6], registers_copy[7]);
     printf("R8:   %08X R9:   %08X R10:  %08X R11:  %08X\n", registers_copy[8], registers_copy[9], registers_copy[10], registers_copy[11]);
     printf("R12:  %08X R13:  %08X R14:  %08X R15:  %08X\n", registers_copy[12], registers_copy[13], registers_copy[14], registers_copy[15]);
     printf("xPSR: %08X\n", registers_copy[16]);
 
+    #if __ARM_ARCH == 7
+    uint32_t cfsr = *(volatile uint32_t *)0xE000ED28;
+    uint32_t hfsr = *(volatile uint32_t *)0xE000ED2C;
+    uint32_t dfsr = *(volatile uint32_t *)0xE000ED30;
+    uint32_t mmfar = *(volatile uint32_t *)0xE000ED34;
+    uint32_t bfar = *(volatile uint32_t *)0xE000ED38;
+
+    printf("\nDebug registers:\n");
+    printf("CFSR: %08lX HFSR: %08lX DFSR: %08lX MMFAR: %08lX BFAR: %08lX\n", cfsr, hfsr, dfsr, mmfar, bfar);
+    printf("CFSR.IACCVIOL:    %d CFSR.DACCVIOL:   %d CFSR.MUNSTKERR: %d CFSR.MSTKERR:   %d\n", BIT(cfsr, 0), BIT(cfsr, 1), BIT(cfsr, 3), BIT(cfsr, 4));
+    printf("CFSR.MLSPERR:     %d CFSR.MMARVALID:  %d CFSR.IBUSERR:   %d CFSR.PRECISERR: %d\n", BIT(cfsr, 5), BIT(cfsr, 7), BIT(cfsr, 8), BIT(cfsr, 9));
+    printf("CFSR.IMPRECISERR: %d CFSR.UNSTKERR:   %d CFSR.STKERR:    %d CFSR.LSPERR:    %d\n", BIT(cfsr, 10), BIT(cfsr, 11), BIT(cfsr, 12), BIT(cfsr, 13));
+    printf("CFSR.BFARVALID:   %d CFSR.UNDEFINSTR: %d CFSR.INVSTATE:  %d CFSR.INVPC:     %d\n", BIT(cfsr, 15), BIT(cfsr, 16), BIT(cfsr, 17), BIT(cfsr, 18));
+    printf("CFSR.NOCP:        %d CFSR.UNALIGNED:  %d CFSR.DIVBYZERO: %d\n", BIT(cfsr, 19), BIT(cfsr, 24), BIT(cfsr, 25));
+    printf("HFSR.VECTTBL:     %d HFSR.FORCED:     %d HFSR.DEBUGEVT:  %d\n", BIT(hfsr, 1), BIT(hfsr, 30), BIT(hfsr, 31));
+    printf("DFSR.HALTED:      %d DFSR.BKPT:       %d DFSR.DWTTRAP:   %d DFSR.VCATCH:    %d\n", BIT(dfsr, 0), BIT(dfsr, 1), BIT(dfsr, 2), BIT(dfsr, 3));
+    printf("DFSR.EXTERNAL:    %d\n", BIT(dfsr, 4));
+    #endif
+
     for (;;) {}
 }
 

From 6650506e06787cb742d11aee3f07ffeb5bbe0e82 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 24 Jul 2025 14:21:17 +0200
Subject: [PATCH 2731/3129] tools/ci.sh: Extend Arm testing to include hardfp
 targets.

This commit lets CI extend the testing scope of the QEMU Arm target, by
letting it perform the usual battery of tests (interpreter and natmods)
also on hardfp targets.

The default board for Arm testing lacks hardware floating point support,
so natmods weren't tested in that specific configuration.  With the
introduction of the "MPS_AN500" QEMU target, now this is made possible
as said board emulates a Cortex-M7 machine with a single- and
double-precision floating point unit.

To reduce the impact on build times, the "ci_qemu_build_arm_thumb" CI
step was split in two: "ci_qemu_build_arm_thumb_softfp" and
"ci_qemu_build_arm_thumb_hardfp" - so hopefully those can run in
parallel whenever possible.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .github/workflows/ports_qemu.yml |  3 ++-
 tools/ci.sh                      | 23 +++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ports_qemu.yml b/.github/workflows/ports_qemu.yml
index 857645776629a..1284f11bbb399 100644
--- a/.github/workflows/ports_qemu.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -26,7 +26,8 @@ jobs:
         ci_func:  # names are functions in ci.sh
           - bigendian
           - sabrelite
-          - thumb
+          - thumb_softfp
+          - thumb_hardfp
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
diff --git a/tools/ci.sh b/tools/ci.sh
index e165cb2cf3f48..d9d77f69008a7 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -349,19 +349,30 @@ function ci_qemu_build_arm_sabrelite {
     make ${MAKEOPTS} -C ports/qemu BOARD=SABRELITE test_full
 }
 
-function ci_qemu_build_arm_thumb {
+function ci_qemu_build_arm_thumb_softfp {
     ci_qemu_build_arm_prepare
-    make ${MAKEOPTS} -C ports/qemu test_full
+    make BOARD=MPS2_AN385 ${MAKEOPTS} -C ports/qemu test_full
 
-    # Test building native .mpy with all ARM-M architectures.
+    # Test building native .mpy with ARM-M softfp architectures.
     ci_native_mpy_modules_build armv6m
     ci_native_mpy_modules_build armv7m
+
+    # Test running native .mpy with all ARM-M architectures.
+    make BOARD=MPS2_AN385 ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv6m"
+    make BOARD=MPS2_AN385 ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv7m"
+}
+
+function ci_qemu_build_arm_thumb_hardfp {
+    ci_qemu_build_arm_prepare
+    make BOARD=MPS2_AN500 ${MAKEOPTS} -C ports/qemu test_full
+
+    # Test building native .mpy with all ARM-M hardfp architectures.
     ci_native_mpy_modules_build armv7emsp
     ci_native_mpy_modules_build armv7emdp
 
-    # Test running native .mpy with armv6m and armv7m architectures.
-    make ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv6m"
-    make ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv7m"
+    # Test running native .mpy with all ARM-M hardfp architectures.
+    make BOARD=MPS2_AN500 ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv7emsp"
+    make BOARD=MPS2_AN500 ${MAKEOPTS} -C ports/qemu test_natmod RUN_TESTS_EXTRA="--arch armv7emdp"
 }
 
 function ci_qemu_build_rv32 {

From 6c1d1f3ad4f5fb8139e9ba7517502bd441acd687 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 25 Aug 2025 23:18:13 +0200
Subject: [PATCH 2732/3129] qemu/mcu/arm/mps2.ld: Add .ARM.exidx section to the
 linkerscript.

This commit fixes a linking issue on certain Arm toolchains where
library code is compiled with exception support.

If a library with exception support is included in the MicroPython
build, the linker had no place to put the stack unwinding tables
necessary to perform exception handling at runtime.  This change adds a
new section to the linkerscript (and therefore the final ELF file) where
that data can be placed into.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/mcu/arm/mps2.ld | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/qemu/mcu/arm/mps2.ld b/ports/qemu/mcu/arm/mps2.ld
index dffefa3b00254..1597a7de316a3 100644
--- a/ports/qemu/mcu/arm/mps2.ld
+++ b/ports/qemu/mcu/arm/mps2.ld
@@ -19,7 +19,15 @@ SECTIONS
         *(.rodata*)
         . = ALIGN(4);
         _etext = .;
-        _sidata = _etext;
+    } > RAM
+
+    .ARM.exidx : AT ( _etext ) {
+        . = ALIGN(4);
+        __exidx_start = .;
+        *(.ARM.exidx*)
+        *(.gnu.linkonce.armexidx.*)
+        __exidx_end = .;
+        _sidata = __exidx_end;
     } > RAM
 
     .data : AT ( _sidata )

From c33a02fe6da766a9405fd14e23389b3c8b85d0b2 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 26 Aug 2025 03:12:00 +0200
Subject: [PATCH 2733/3129] tests/run-tests.py: Enable Arm inlineasm FPU tests
 if possible.

This commits lifts the unconditional restriction on inline assembler FPU
tests for the Qemu platform, and makes said restriction conditional to
the lack of an available floating point unit on the running platform.

The Qemu platform supported only emulated machines that could target up
to a Cortex-M3, so an ArmV7-M target that had no support for floating
point.  With the addition of MPS2_AN500 to the list of emulated targets
the range was extended to cover up to Cortex-M7, so a floating point
unit may possibly be available and thus able to run the FPU inlineasm
tests.

For that, the test runner was changed to detect the running architecture
when checking the target capabilities; if the target reports its
MicroPython architecture to be either "armv7emsp" or "armv7emdp"
(providing single-precision and double-precision floating point unit
support respectively) then the FPU-only inline tests are not put into
the blocked tests list.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/run-tests.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index aeea0bad5e779..7a00428198332 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -177,14 +177,6 @@ def open(self, path, mode):
         "thread/thread_lock3.py",
         "thread/thread_shared2.py",
     ),
-    "qemu": (
-        # Skip tests that require Cortex-M4.
-        "inlineasm/thumb/asmfpaddsub.py",
-        "inlineasm/thumb/asmfpcmp.py",
-        "inlineasm/thumb/asmfpldrstr.py",
-        "inlineasm/thumb/asmfpmuldiv.py",
-        "inlineasm/thumb/asmfpsqrt.py",
-    ),
     "webassembly": (
         "basics/string_format_modulo.py",  # can't print nulls to stdout
         "basics/string_strip.py",  # can't print nulls to stdout
@@ -757,13 +749,14 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
                 skip_tests.add("inlineasm/thumb/asmbitops.py")
                 skip_tests.add("inlineasm/thumb/asmconst.py")
                 skip_tests.add("inlineasm/thumb/asmdiv.py")
+                skip_tests.add("inlineasm/thumb/asmit.py")
+                skip_tests.add("inlineasm/thumb/asmspecialregs.py")
+            if args.arch not in ("armv7emsp", "armv7emdp"):
                 skip_tests.add("inlineasm/thumb/asmfpaddsub.py")
                 skip_tests.add("inlineasm/thumb/asmfpcmp.py")
                 skip_tests.add("inlineasm/thumb/asmfpldrstr.py")
                 skip_tests.add("inlineasm/thumb/asmfpmuldiv.py")
                 skip_tests.add("inlineasm/thumb/asmfpsqrt.py")
-                skip_tests.add("inlineasm/thumb/asmit.py")
-                skip_tests.add("inlineasm/thumb/asmspecialregs.py")
 
         # Check if emacs repl is supported, and skip such tests if it's not
         t = run_feature_check(pyb, args, "repl_emacs_check.py")

From 8c47e446bf99393fd20c0416970f5c9a78b294f7 Mon Sep 17 00:00:00 2001
From: David Schneider <schneidav81@gmail.com>
Date: Tue, 5 Aug 2025 16:37:58 +0200
Subject: [PATCH 2734/3129] py/obj: Fix a comment regarding make_new slot.

This was missed as part of the transition to make_new a mp_obj_type_t slot.

See also: 94beeabd2ee179d587942046555833e022241f24

Signed-off-by: David Schneider <schneidav81@gmail.com>
---
 py/obj.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/obj.h b/py/obj.h
index 69d6e626db3c1..d756d237abbc3 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -814,7 +814,7 @@ typedef struct _mp_obj_full_type_t {
 #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
 
 // 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]*)
+// Invoke as MP_DEFINE_CONST_OBJ_TYPE(_typename, _name, _flags, [, 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

From ce834b8d661a6fde275ec64083b7e2f4f3efea4d Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 26 Aug 2025 20:49:20 +0200
Subject: [PATCH 2735/3129] tools/mpy-tool.py: Allow dumping MPY segments into
 their own files.

This commit lets "tools/mpy-tool.py" extract MPY segments into their own
files, one file per segment.

A pair of new command line arguments were added, namely "-e"/"--extract"
that takes a filename prefix to use as a base for the generated files'
name, and "--extract-only" that - combined with "--extract" - allows
selecting which kinds of segment should be dumped to the filesystem.

So, for example, assuming there's a file called "module.mpy", running
"./mpy-tool.py --extract segments module.mpy" would yield a series of
files with names like "segments_0_module.py_QSTR_module.py.bin",
"segments_1_module.py_META__module_.bin",
"segments_2_module.py_QSTR_function.bin", etc.  In short the file name
format is "<base>_<count>_<sourcefile>_<segmentkind>_<segmentname>.bin",
with <segmentkind> being META, QSTR, OBJ, or CODE.  Source file names
and segment names will only contain characters in the range
"a-zA-Z0-9_-." to avoid having output file names with unexpected
characters.

The "--extract-only" option can accept one or more kinds, separated by
commas and treated as case insensitive strings.  The supported kinds
match what is currently handled by the "MPYSegment" class in
"tools/mpy-tool.py": "META", "QSTR", "OBJ", and "CODE".  The absence of
this command line option implies dumping every segment found.

If "--extract" is passed along with "--merge", dumping is performed
after the merge process takes place, in order to dump all possible
segments that match the requested segment kinds.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/mpy-tool.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 69d3a6c06f6b3..5c63f5be6d484 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1765,6 +1765,44 @@ def copy_section(file, offset, offset2):
             f.write(merged_mpy)
 
 
+def extract_segments(compiled_modules, basename, kinds_arg):
+    import re
+
+    kind_str = ("META", "QSTR", "OBJ", "CODE")
+    kinds = set()
+    if kinds_arg is not None:
+        for kind in kinds_arg.upper().split(","):
+            if kind in kind_str:
+                kinds.add(kind)
+            else:
+                raise Exception('unknown segment kind "%s"' % (kind,))
+    segments = []
+    for module in compiled_modules:
+        for segment in module.mpy_segments:
+            if not kinds or kind_str[segment.kind] in kinds:
+                segments.append((module.mpy_source_file, module.source_file.str, segment))
+    count_len = len(str(len(segments)))
+    sanitiser = re.compile("[^a-zA-Z0-9_.-]")
+    for counter, entry in enumerate(segments):
+        file_name, source_file, segment = entry
+        output_name = (
+            basename
+            + "_"
+            + str(counter).rjust(count_len, "0")
+            + "_"
+            + sanitiser.sub("_", source_file)
+            + "_"
+            + kind_str[segment.kind]
+            + "_"
+            + sanitiser.sub("_", str(segment.name))
+            + ".bin"
+        )
+        with open(file_name, "rb") as source:
+            with open(output_name, "wb") as output:
+                source.seek(segment.start)
+                output.write(source.read(segment.end - segment.start))
+
+
 def main(args=None):
     global global_qstrs
 
@@ -1781,6 +1819,14 @@ def main(args=None):
     cmd_parser.add_argument(
         "--merge", action="store_true", help="merge multiple .mpy files into one"
     )
+    cmd_parser.add_argument(
+        "-e", "--extract", metavar="BASE", type=str, help="write segments into separate files"
+    )
+    cmd_parser.add_argument(
+        "--extract-only",
+        metavar="KIND[,...]",
+        help="extract only segments of the given type (meta, qstr, obj, code)",
+    )
     cmd_parser.add_argument("-q", "--qstr-header", help="qstr header file to freeze against")
     cmd_parser.add_argument(
         "-mlongint-impl",
@@ -1848,6 +1894,9 @@ def main(args=None):
     if args.merge:
         merge_mpy(compiled_modules, args.output)
 
+    if args.extract:
+        extract_segments(compiled_modules, args.extract, args.extract_only)
+
 
 if __name__ == "__main__":
     main()

From 54787dc37b5c68b12b495deede84bf28530d4f63 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Wed, 27 Aug 2025 00:00:59 -0400
Subject: [PATCH 2736/3129] tools/ci.sh: Skip unreliable thread/thread_gc1.py
 test in Github CI.

The `thread/thread_gc1.py` test is a constant source of spurious failures
in Github CI.

This commit adds it to the list of tests skipped when running on Github CI
using either macos, qemu_riscv64, qemu_mips, or qemu_arm, to help reduce
the overall false positive rate and improve the predictive value of the
test fail indication.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tools/ci.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index d9d77f69008a7..1dfe3d66e8657 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -810,7 +810,8 @@ function ci_unix_macos_run_tests {
     # - float_parse and float_parse_doubleprec parse/print floats out by a few mantissa bits
     # - ffi_callback crashes for an unknown reason
     # - thread/stress_heap.py is flaky
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude '(float_parse|float_parse_doubleprec|ffi_callback|thread/stress_heap).py')
+    # - thread/thread_gc1.py is flaky
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude '(float_parse|float_parse_doubleprec|ffi_callback|thread/stress_heap|thread/thread_gc1).py')
 }
 
 function ci_unix_qemu_mips_setup {
@@ -831,8 +832,9 @@ function ci_unix_qemu_mips_run_tests {
     # Issues with MIPS tests:
     # - thread/stress_aes.py takes around 50 seconds
     # - thread/stress_recurse.py is flaky
+    # - thread/thread_gc1.py is flaky
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'thread/stress_recurse.py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'thread/stress_recurse.py|thread/thread_gc1.py')
 }
 
 function ci_unix_qemu_arm_setup {
@@ -854,8 +856,9 @@ 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)
     # - thread/stress_aes.py takes around 70 seconds
     # - thread/stress_recurse.py is flaky
+    # - thread/thread_gc1.py is flaky
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'vfs_posix.*\.py|thread/stress_recurse.py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=90 ./run-tests.py --exclude 'vfs_posix.*\.py|thread/stress_recurse.py|thread/thread_gc1.py')
 }
 
 function ci_unix_qemu_riscv64_setup {
@@ -876,8 +879,9 @@ function ci_unix_qemu_riscv64_run_tests {
     # Issues with RISCV-64 tests:
     # - thread/stress_aes.py takes around 140 seconds
     # - thread/stress_recurse.py is flaky
+    # - thread/thread_gc1.py is flaky
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=180 ./run-tests.py --exclude 'thread/stress_recurse.py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=180 ./run-tests.py --exclude 'thread/stress_recurse.py|thread/thread_gc1.py')
 }
 
 ########################################################################################

From f4f7fbf3dc8164ead907cb418773eef9bbba5644 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Tue, 26 Aug 2025 23:12:22 -0400
Subject: [PATCH 2737/3129] py/obj: Remove unused map new/free function
 declarations.

These functions were removed in 6c9fca2 for v1.9.3.  This commit removes
their declarations as well.

See-also: 6c9fca2aa911e31f6c1b48d3b950b4dc058473d4
Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/obj.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index d756d237abbc3..de740bf4ccf4d 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -502,9 +502,7 @@ static inline bool mp_map_slot_is_filled(const mp_map_t *map, size_t pos) {
 
 void mp_map_init(mp_map_t *map, size_t n);
 void mp_map_init_fixed_table(mp_map_t *map, size_t n, const mp_obj_t *table);
-mp_map_t *mp_map_new(size_t n);
 void mp_map_deinit(mp_map_t *map);
-void mp_map_free(mp_map_t *map);
 mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t lookup_kind);
 void mp_map_clear(mp_map_t *map);
 void mp_map_dump(mp_map_t *map);

From 1671977ca4be609679db36abc5594f1d76a71e23 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 15 Aug 2025 08:47:39 -0500
Subject: [PATCH 2738/3129] py/parsenum: Fix parsing LLONG_MIN in longlong
 configuration.

Re-organize `mp_parse_num_integer()` (for longlong) slightly so that the
most negative 64-bit integer can be parsed.

Fixes issue #17932.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objint.c                   | 2 +-
 py/parsenum.c                 | 9 ++++++---
 tests/basics/int_64_basics.py | 8 ++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/py/objint.c b/py/objint.c
index 87d8a27852d34..fd9ab106f92df 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -247,7 +247,7 @@ char *mp_obj_int_formatted(char **buf, size_t *buf_size, size_t *fmt_size, mp_co
 
     char sign = '\0';
     if (num < 0) {
-        num = -num;
+        num = -(fmt_uint_t)num;
         sign = '-';
     }
 
diff --git a/py/parsenum.c b/py/parsenum.c
index e18002306a259..4239f2dcd4d0f 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -64,7 +64,7 @@ typedef mp_int_t parsed_int_t;
 typedef unsigned long long parsed_int_t;
 
 #define PARSED_INT_MUL_OVERFLOW mp_mul_ull_overflow
-#define PARSED_INT_FITS(I) ((I) <= (unsigned long long)LLONG_MAX)
+#define PARSED_INT_FITS(I) ((I) <= (unsigned long long)LLONG_MAX + 1)
 #endif
 
 mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, mp_lexer_t *lex) {
@@ -135,8 +135,11 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
 have_ret_val:
     #else
     // The PARSED_INT_FITS check above ensures parsed_val won't overflow signed long long
-    long long signed_val = parsed_val;
-    if (neg) {
+    long long signed_val = -parsed_val;
+    if (!neg) {
+        if (signed_val == LLONG_MIN) {
+            goto overflow;
+        }
         signed_val = -signed_val;
     }
     ret_val = mp_obj_new_int_from_ll(signed_val); // Could be large or small int
diff --git a/tests/basics/int_64_basics.py b/tests/basics/int_64_basics.py
index 2a161dac0ba14..ef76793317ec8 100644
--- a/tests/basics/int_64_basics.py
+++ b/tests/basics/int_64_basics.py
@@ -151,3 +151,11 @@
     print((1 << 48) << -6)
 except ValueError as e:
     print(e)
+
+# Test that the most extreme 64 bit integer values all parse with int()
+print(int("-9223372036854775807"))
+print(int("-9223372036854775808"))
+print(int("9223372036854775807"))
+
+# Test that the most negative 64 bit integer can be formed via arithmetic
+print(-9223372036854775807-1)

From b6cd577cf6ea1de28092a7abe58613c66debd412 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 14 Aug 2025 10:22:11 -0500
Subject: [PATCH 2739/3129] py/mkrules.mk: Force ".pp" files to always rebuild.

These files are only built on demand for developers, and it is a quick
process.

Without FORCE, a sequence like this would leave the developer with an
outdated `main.pp` to inspect:

    make build-standard/main.pp
    touch input.h
    make build-standard/main.pp # Rebuilds now, wouldn't have before

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/mkrules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 3120066fd4fa3..6993a13a4f1ef 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -104,7 +104,7 @@ vpath %.cpp . $(TOP) $(USER_C_MODULES)
 $(BUILD)/%.o: %.cpp
 	$(call compile_cxx)
 
-$(BUILD)/%.pp: %.c
+$(BUILD)/%.pp: %.c FORCE
 	$(ECHO) "PreProcess $<"
 	$(Q)$(CPP) $(CFLAGS) -Wp,-C,-dD,-dI -o $@ $<
 

From 7a8ae72640bf15971e0dc87727a639281ffbcc02 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Aug 2025 11:02:04 +1000
Subject: [PATCH 2740/3129] tests/run-tests.py: Factor code for device
 shortcuts to a function.

So it can be reused by other test runners.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 7a00428198332..2d02e6b23c6a0 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -246,6 +246,17 @@ def platform_to_port(platform):
     return platform_to_port_map.get(platform, platform)
 
 
+def convert_device_shortcut_to_real_device(device):
+    if device.startswith("a") and device[1:].isdigit():
+        return "/dev/ttyACM" + device[1:]
+    elif device.startswith("u") and device[1:].isdigit():
+        return "/dev/ttyUSB" + device[1:]
+    elif device.startswith("c") and device[1:].isdigit():
+        return "COM" + device[1:]
+    else:
+        return device
+
+
 def get_test_instance(test_instance, baudrate, user, password):
     if test_instance.startswith("port:"):
         _, port = test_instance.split(":", 1)
@@ -253,15 +264,9 @@ def get_test_instance(test_instance, baudrate, user, password):
         return None
     elif test_instance == "webassembly":
         return PyboardNodeRunner()
-    elif test_instance.startswith("a") and test_instance[1:].isdigit():
-        port = "/dev/ttyACM" + test_instance[1:]
-    elif test_instance.startswith("u") and test_instance[1:].isdigit():
-        port = "/dev/ttyUSB" + test_instance[1:]
-    elif test_instance.startswith("c") and test_instance[1:].isdigit():
-        port = "COM" + test_instance[1:]
     else:
         # Assume it's a device path.
-        port = test_instance
+        port = convert_device_shortcut_to_real_device(test_instance)
 
     global pyboard
     sys.path.append(base_path("../tools"))

From f62c614d3e5f8bdfa6a3e1265cd5af8dca00adb1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Aug 2025 11:02:39 +1000
Subject: [PATCH 2741/3129] tests/run-multitests.py: Change -i argument to -t.

Back in commit 8978102f3595ae321484a6be44c1dcf25c8909a9 (see PR #16111) the
`run-tests.py` script was changed to use an improved way of selecting the
test instance, eg:

    $ ./run-tests.py -t a0

that would run on /dev/ttyACM0.  This has been a very nice improvement,
makes it easier to specify the target.

This commit updates `run-multitests.py` to use the same scheme.  It
previously used `-i` but now that's changed to `-t`.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 44 +++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 4412d0fde7fda..e5458ffe0d00c 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -238,17 +238,8 @@ 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)
+        device = device
         self.device = device
         self.pyb = pyboard.Pyboard(device)
         self.pyb.enter_raw_repl()
@@ -562,16 +553,24 @@ def main():
 
     cmd_parser = argparse.ArgumentParser(
         description="Run network tests for MicroPython",
+        epilog=(
+            run_tests_module.test_instance_epilog
+            + "Each instance arg can optionally have custom env provided, eg. <cmd>,ENV=VAR,ENV=VAR...\n"
+        ),
         formatter_class=argparse.RawTextHelpFormatter,
     )
     cmd_parser.add_argument(
         "-s", "--show-output", action="store_true", help="show test output after running"
     )
     cmd_parser.add_argument(
-        "-t", "--trace-output", action="store_true", help="trace test output while running"
+        "-c", "--trace-output", action="store_true", help="trace test output while running"
     )
     cmd_parser.add_argument(
-        "-i", "--instance", action="append", default=[], help="instance(s) to run the tests on"
+        "-t",
+        "--test-instance",
+        action="append",
+        default=[],
+        help="instance(s) to run the tests on",
     )
     cmd_parser.add_argument(
         "-p",
@@ -586,14 +585,6 @@ def main():
         default=run_tests_module.base_path("results"),
         help="directory for test results",
     )
-    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()
 
@@ -606,22 +597,23 @@ def main():
     instances_truth = [PyInstanceSubProcess([PYTHON_TRUTH]) for _ in range(max_instances)]
 
     instances_test = []
-    for i in cmd_args.instance:
+    for i in cmd_args.test_instance:
         # 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":
+        elif cmd == "unix":
             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:") :]))
+        elif cmd == "webassembly" or cmd.startswith("execpty:"):
+            print("unsupported instance string: {}".format(cmd), file=sys.stderr)
+            sys.exit(2)
         else:
-            print("unknown instance string: {}".format(cmd), file=sys.stderr)
-            sys.exit(1)
+            device = run_tests_module.convert_device_shortcut_to_real_device(cmd)
+            instances_test.append(PyInstancePyboard(device))
 
     for _ in range(max_instances - len(instances_test)):
         instances_test.append(PyInstanceSubProcess([MICROPYTHON]))

From bf185c37ed13e120383f2cbdf85e606e1e0a368a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Aug 2025 11:13:08 +1000
Subject: [PATCH 2742/3129] tests/run-natmodtests.py: Change -p/-d arguments to
 -t.

Following the similar change to `run-tests.py` and `run-multitests.py`.
What was previously, eg, `-p -d /dev/ttyACM0` is now `-t a0`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/Makefile      |  2 +-
 tests/run-natmodtests.py | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 7784a266c3018..d213c8fc03c5e 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -225,7 +225,7 @@ test_natmod: $(BUILD)/firmware.elf
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && \
 		for natmod in btree deflate framebuf heapq random_basic re; do \
-		./run-natmodtests.py -p -d execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_EXTRA) extmod/$$natmod*.py; \
+		./run-natmodtests.py -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_EXTRA) extmod/$$natmod*.py; \
 		done
 
 $(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 55adb6049a3e8..50e8d1272914e 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -11,9 +11,6 @@
 
 run_tests_module = __import__("run-tests")
 
-sys.path.append("../tools")
-import pyboard
-
 # Paths for host executables
 CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
 MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython")
@@ -112,7 +109,7 @@ def run_script(self, script):
             output = self.pyb.exec_(script)
             output = output.replace(b"\r\n", b"\n")
             return output, None
-        except pyboard.PyboardError as er:
+        except run_tests_module.pyboard.PyboardError as er:
             return b"", er
 
 
@@ -227,14 +224,16 @@ def run_tests(target_truth, target, args, resolved_arch):
 
 def main():
     cmd_parser = argparse.ArgumentParser(
-        description="Run dynamic-native-module tests under MicroPython"
-    )
-    cmd_parser.add_argument(
-        "-p", "--pyboard", action="store_true", help="run tests via pyboard.py"
+        description="Run dynamic-native-module tests under MicroPython",
+        epilog=run_tests_module.test_instance_epilog,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
     )
     cmd_parser.add_argument(
-        "-d", "--device", default="/dev/ttyACM0", help="the device for pyboard.py"
+        "-t", "--test-instance", default="unix", help="the MicroPython instance to test"
     )
+    cmd_parser.add_argument("--baudrate", default=115200, help="baud rate of the serial device")
+    cmd_parser.add_argument("--user", default="micro", help="telnet login username")
+    cmd_parser.add_argument("--password", default="python", help="telnet login password")
     cmd_parser.add_argument(
         "-a", "--arch", choices=AVAILABLE_ARCHS, help="override native architecture of the target"
     )
@@ -256,10 +255,15 @@ def main():
 
     target_truth = TargetSubprocess([CPYTHON3])
 
-    if args.pyboard:
-        target = TargetPyboard(pyboard.Pyboard(args.device))
-    else:
+    target = run_tests_module.get_test_instance(
+        args.test_instance, args.baudrate, args.user, args.password
+    )
+    if target is None:
+        # Use the unix port of MicroPython.
         target = TargetSubprocess([MICROPYTHON])
+    else:
+        # Use a remote target.
+        target = TargetPyboard(target)
 
     if hasattr(args, "arch") and args.arch is not None:
         target_arch = args.arch

From dbbc7d96672bb44a04f27fef32231dd7340d7952 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Aug 2025 11:27:20 +1000
Subject: [PATCH 2743/3129] tests/run-perfbench.py: Change -p/-d arguments to
 -t.

And the existing "-t" option is changed to "-m" (shorthand for the
"--diff-time" option).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index cac2fee58f0dc..2a2b7b6c9ddff 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -12,9 +12,6 @@
 
 run_tests_module = __import__("run-tests")
 
-sys.path.append("../tools")
-import pyboard
-
 prepare_script_for_target = run_tests_module.prepare_script_for_target
 
 # Paths for host executables
@@ -47,12 +44,12 @@ def run_script_on_target(target, script):
     output = b""
     err = None
 
-    if isinstance(target, pyboard.Pyboard):
+    if hasattr(target, "enter_raw_repl"):
         # Run via pyboard interface
         try:
             target.enter_raw_repl()
             output = target.exec_(script)
-        except pyboard.PyboardError as er:
+        except run_tests_module.pyboard.PyboardError as er:
             err = er
     else:
         # Run local executable
@@ -125,7 +122,7 @@ def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
                 f.write(test_script)
 
         # Process script through mpy-cross if needed
-        if isinstance(target, pyboard.Pyboard) or args.via_mpy:
+        if hasattr(target, "enter_raw_repl") or args.via_mpy:
             crash, test_script_target = prepare_script_for_target(args, script_text=test_script)
             if crash:
                 test_results.append((test_file, "fail", "preparation"))
@@ -253,17 +250,17 @@ def compute_diff(file1, file2, diff_score):
 def main():
     cmd_parser = argparse.ArgumentParser(description="Run benchmarks for MicroPython")
     cmd_parser.add_argument(
-        "-t", "--diff-time", action="store_true", help="diff time outputs from a previous run"
+        "-m", "--diff-time", action="store_true", help="diff time outputs from a previous run"
     )
     cmd_parser.add_argument(
         "-s", "--diff-score", action="store_true", help="diff score outputs from a previous run"
     )
     cmd_parser.add_argument(
-        "-p", "--pyboard", action="store_true", help="run tests via pyboard.py"
-    )
-    cmd_parser.add_argument(
-        "-d", "--device", default="/dev/ttyACM0", help="the device for pyboard.py"
+        "-t", "--test-instance", default="unix", help="the MicroPython instance to test"
     )
+    cmd_parser.add_argument("--baudrate", default=115200, help="baud rate of the serial device")
+    cmd_parser.add_argument("--user", default="micro", help="telnet login username")
+    cmd_parser.add_argument("--password", default="python", help="telnet login password")
     cmd_parser.add_argument("-a", "--average", default="8", help="averaging number")
     cmd_parser.add_argument(
         "--emit", default="bytecode", help="MicroPython emitter to use (bytecode or native)"
@@ -295,15 +292,18 @@ def main():
     M = int(args.M[0])
     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:
+    target = run_tests_module.get_test_instance(
+        args.test_instance, args.baudrate, args.user, args.password
+    )
+    if target is None:
+        # Use the unix port of MicroPython.
         target = [MICROPYTHON, "-X", "emit=" + args.emit]
         if args.heapsize is not None:
             target.extend(["-X", "heapsize=" + args.heapsize])
+    else:
+        # Use a remote target.
+        if not args.mpy_cross_flags:
+            args.mpy_cross_flags = "-march=armv7m"
 
     if len(args.files) == 0:
         tests_skip = ("benchrun.py",)
@@ -324,7 +324,7 @@ def main():
     test_results = run_benchmarks(args, target, N, M, n_average, tests)
     res = run_tests_module.create_test_report(args, test_results)
 
-    if isinstance(target, pyboard.Pyboard):
+    if hasattr(target, "exit_raw_repl"):
         target.exit_raw_repl()
         target.close()
 

From af745a5982b5be41c8e74d12c70a3b281eb49328 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Aug 2025 13:33:02 +1000
Subject: [PATCH 2744/3129] tests/net_inet/tls_num_errors.py: Make alloc of
 emg-exc-buf optional.

The unix port doesn't have `micropython.alloc_emergency_exception_buf()`
but it's still possible to run and pass this test.  So make that call
optional.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/tls_num_errors.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/net_inet/tls_num_errors.py b/tests/net_inet/tls_num_errors.py
index 34aa2bb455134..9c12114eab1f6 100644
--- a/tests/net_inet/tls_num_errors.py
+++ b/tests/net_inet/tls_num_errors.py
@@ -3,15 +3,21 @@
 import socket, ssl, sys
 
 try:
-    from micropython import alloc_emergency_exception_buf, heap_lock, heap_unlock
+    from micropython import heap_lock, heap_unlock
 except:
     print("SKIP")
     raise SystemExit
 
+try:
+    from micropython import alloc_emergency_exception_buf
+
+    alloc_emergency_exception_buf(256)
+except:
+    pass
+
 
 # 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:

From 3274f0355b2df6928bafed8a6dd721c2fdfb65df Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Aug 2025 13:31:18 +1000
Subject: [PATCH 2745/3129] tests/multi_net: Require SSL cert file to be
 available for test to run.

These were missed in 2bba507148e8a751123257fa2b075c70d67e1160 because they
didn't use the `os.stat` pattern.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/sslcontext_server_client.py         | 12 ++++--------
 tests/multi_net/sslcontext_server_client_ciphers.py | 12 ++++--------
 tests/multi_net/sslcontext_verify_callback.py       | 12 ++++--------
 tests/multi_net/tls_dtls_server_client.py           | 12 ++++--------
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py
index 6516de53f7dfb..fd330cee78a9c 100644
--- a/tests/multi_net/sslcontext_server_client.py
+++ b/tests/multi_net/sslcontext_server_client.py
@@ -14,14 +14,10 @@
 certfile = "ec_cert.der"
 keyfile = "ec_key.der"
 
-try:
-    with open(certfile, "rb") as cf:
-        cert = cadata = cf.read()
-    with open(keyfile, "rb") as kf:
-        key = kf.read()
-except OSError:
-    print("SKIP")
-    raise SystemExit
+with open(certfile, "rb") as cf:
+    cert = cadata = cf.read()
+with open(keyfile, "rb") as kf:
+    key = kf.read()
 
 
 # Server
diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py
index 3334d9d9e4c17..7017a6f5798ad 100644
--- a/tests/multi_net/sslcontext_server_client_ciphers.py
+++ b/tests/multi_net/sslcontext_server_client_ciphers.py
@@ -14,14 +14,10 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    with open(cafile, "rb") as f:
-        cadata = f.read()
-    with open(key, "rb") as f:
-        keydata = f.read()
-except OSError:
-    print("SKIP")
-    raise SystemExit
+with open(cafile, "rb") as f:
+    cadata = f.read()
+with open(key, "rb") as f:
+    keydata = f.read()
 
 
 # Server
diff --git a/tests/multi_net/sslcontext_verify_callback.py b/tests/multi_net/sslcontext_verify_callback.py
index 74b97382453bd..80056a5868c40 100644
--- a/tests/multi_net/sslcontext_verify_callback.py
+++ b/tests/multi_net/sslcontext_verify_callback.py
@@ -15,14 +15,10 @@
 cert = cafile = "ec_cert.der"
 key = "ec_key.der"
 
-try:
-    with open(cafile, "rb") as f:
-        cadata = f.read()
-    with open(key, "rb") as f:
-        key = f.read()
-except OSError:
-    print("SKIP")
-    raise SystemExit
+with open(cafile, "rb") as f:
+    cadata = f.read()
+with open(key, "rb") as f:
+    key = f.read()
 
 
 def verify_callback(cert, depth):
diff --git a/tests/multi_net/tls_dtls_server_client.py b/tests/multi_net/tls_dtls_server_client.py
index a81c4cb28230c..ec7d7de55fdc4 100644
--- a/tests/multi_net/tls_dtls_server_client.py
+++ b/tests/multi_net/tls_dtls_server_client.py
@@ -13,14 +13,10 @@
 certfile = "ec_cert.der"
 keyfile = "ec_key.der"
 
-try:
-    with open(certfile, "rb") as cf:
-        cert = cadata = cf.read()
-    with open(keyfile, "rb") as kf:
-        key = kf.read()
-except OSError:
-    print("SKIP")
-    raise SystemExit
+with open(certfile, "rb") as cf:
+    cert = cadata = cf.read()
+with open(keyfile, "rb") as kf:
+    key = kf.read()
 
 
 # DTLS server.

From f0d445a4663f568fedd24518134fcccb84affc1d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Aug 2025 13:33:22 +1000
Subject: [PATCH 2746/3129] tests/multi_net: Simplify SKIP when imports don't
 exist.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/asyncio_tcp_readinto.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/multi_net/asyncio_tcp_readinto.py b/tests/multi_net/asyncio_tcp_readinto.py
index 563b640e13b20..972195f96dcae 100644
--- a/tests/multi_net/asyncio_tcp_readinto.py
+++ b/tests/multi_net/asyncio_tcp_readinto.py
@@ -1,13 +1,8 @@
 # Test asyncio stream readinto() method using TCP server/client
 
-try:
-    import asyncio
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
 try:
     import array
+    import asyncio
 except ImportError:
     print("SKIP")
     raise SystemExit

From 5b98126c21f8eaa996e258761a291a7a88624082 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Aug 2025 15:32:39 +1000
Subject: [PATCH 2747/3129] esp32/boards: Reduce flash usage of ESP32-C6
 boards.

Reduces ESP32_GENERIC_C6 application flash size from 2024432 to
1813216 (206KB smaller).

Also has benefit of reducing D/IRAM size, increasing free memory at
runtime (167187 to 148584, -18603 bytes).

Most of this savings comes from building with -Os instead of -O2,
but about 10KB comes from using the SPI flash functions from the ROM.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake | 1 +
 ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake   | 1 +
 ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake        | 1 +
 ports/esp32/boards/sdkconfig.c6                         | 8 ++++++++
 ports/esp32/boards/sdkconfig.riscv                      | 3 +++
 5 files changed, 14 insertions(+)
 create mode 100644 ports/esp32/boards/sdkconfig.riscv

diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
index 3060c1cfd978a..48946f7094530 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c6)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.riscv
     boards/sdkconfig.c6
     boards/sdkconfig.ble
 )
diff --git a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
index 3060c1cfd978a..48946f7094530 100644
--- a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c6)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.riscv
     boards/sdkconfig.c6
     boards/sdkconfig.ble
 )
diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
index 024b1299fa3e5..418bb7ff0f0d9 100644
--- a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c6)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.riscv
     boards/sdkconfig.c6
     boards/sdkconfig.ble
     boards/UM_TINYC6/sdkconfig.board
diff --git a/ports/esp32/boards/sdkconfig.c6 b/ports/esp32/boards/sdkconfig.c6
index 18e8b75eb4e19..a90a8f80dfeea 100644
--- a/ports/esp32/boards/sdkconfig.c6
+++ b/ports/esp32/boards/sdkconfig.c6
@@ -1,2 +1,10 @@
 # Workaround for https://github.com/espressif/esp-idf/issues/14456
 CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n
+
+# 802.15.4 not currently supported in MicroPython, disabling saves
+# a little compile time (no difference in binary)
+CONFIG_IEEE802154_ENABLED=n
+
+# Using the SPI flash implementation in ROM saves about 10KB of binary size
+# (and some static RAM)
+CONFIG_SPI_FLASH_ROM_IMPL=y
diff --git a/ports/esp32/boards/sdkconfig.riscv b/ports/esp32/boards/sdkconfig.riscv
new file mode 100644
index 0000000000000..fff3ea830b714
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.riscv
@@ -0,0 +1,3 @@
+# ESP RISC-V binary sizes are generally larger than Xtensa ones,
+# so switch to size optimization by default
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y

From 9a9cc794222e6791d3d615aee4e32a06c5aeb1be Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Aug 2025 16:51:02 +1000
Subject: [PATCH 2748/3129] esp32/boards: Build ESP32-C2 and C3 with -Os
 instead of -O2.

Same optimisation that was applied to C6 in the parent commit, now applied
to all RISC-V boards.

    +------------+------------+------------+------------+
    | Size       | Before     | After      | Delta      |
    +------------+------------+------------+------------+
    | C2 Binary  | 1680384    | 1494224    | -186160    |
    | C2 D/IRAM  |   83710    |   79080    |   -4630    |
    | C3 Binary  | 1833328    | 1636624    | -196704    |
    | C3 D/IRAM  |  139608    |  131896    |   -7712    |
    +------------+------------+------------+------------+

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake          | 1 +
 ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake          | 1 +
 .../boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake     | 1 +
 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake             | 1 +
 4 files changed, 4 insertions(+)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
index 7a8b0e0b3d4af..6a59e8a25e221 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.riscv
     boards/sdkconfig.ble
     boards/sdkconfig.c2
     # C2 has unusably low free RAM without these optimisations
diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
index 429366afac979..41b32b84c894f 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.riscv
     boards/sdkconfig.ble
     boards/ESP32_GENERIC_C3/sdkconfig.c3usb
 )
diff --git a/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake
index 81cfff1d77b84..81d7f6b7ca4dd 100644
--- a/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/GARATRONIC_PYBSTICK26_ESP32C3/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.riscv
     boards/sdkconfig.ble
     boards/GARATRONIC_PYBSTICK26_ESP32C3/sdkconfig.board
 )
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
index 0ce7f85e5d580..4ecc71956651b 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32c3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.riscv
     boards/sdkconfig.ble
     boards/LOLIN_C3_MINI/sdkconfig.board
 )

From 704c70c5bb655afecec4d54537eb1489e689672c Mon Sep 17 00:00:00 2001
From: Jimisola Laursen <jimisola@jimisola.com>
Date: Wed, 9 Jul 2025 10:07:02 +0200
Subject: [PATCH 2749/3129] esp32/boards: Enable I2S for ESP32_GENERIC_C6 and
 other C6 boards.

I2S works on the ESP32-C6, and it now has enough space to fit.

Signed-off-by: Jimisola Laursen <jimisola@jimisola.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h | 2 --
 ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h   | 2 --
 ports/esp32/boards/UM_TINYC6/mpconfigboard.h        | 2 --
 3 files changed, 6 deletions(-)

diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
index d6cc9a6f67855..712e1fca157a5 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.h
@@ -3,7 +3,5 @@
 #define MICROPY_HW_BOARD_NAME               "ESP32C6 module"
 #define MICROPY_HW_MCU_NAME                 "ESP32C6"
 
-#define MICROPY_PY_MACHINE_I2S              (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/M5STACK_NANOC6/mpconfigboard.h b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
index 656ec0bc6c3c5..16ddc1e51d3e5 100644
--- a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.h
@@ -1,7 +1,5 @@
 #define MICROPY_HW_BOARD_NAME    "M5Stack NanoC6"
 #define MICROPY_HW_MCU_NAME      "ESP32C6"
 
-#define MICROPY_PY_MACHINE_I2S   (0)
-
 #define MICROPY_HW_I2C0_SCL      (1)
 #define MICROPY_HW_I2C0_SDA      (2)
diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.h b/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
index 09392d55594a0..131116e9ffb4b 100644
--- a/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.h
@@ -1,8 +1,6 @@
 #define MICROPY_HW_BOARD_NAME    "Unexpected Maker TinyC6"
 #define MICROPY_HW_MCU_NAME      "ESP32C6"
 
-#define MICROPY_PY_MACHINE_I2S   (0)
-
 #define MICROPY_HW_I2C0_SCL      (7)
 #define MICROPY_HW_I2C0_SDA      (6)
 

From 3adf0163765f3de76167705c8dc38bfd0f56e08a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Aug 2025 13:58:17 +1000
Subject: [PATCH 2750/3129] esp32: Revert "esp32/mpconfigport: Disable
 I2CTarget on ESP32-C6 to ..".

This reverts commit 3c9546ea0911b50d4b85ad4046864c90f84b3fd3.

I2CTarget now fits on ESP32-C6 because it's compiled with -Os, see commit
5b98126c21f8eaa996e258761a291a7a88624082.

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

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 9b12dbd34a736..0e62cd74823f8 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -137,8 +137,7 @@
 #define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1 (1)
 #ifndef MICROPY_PY_MACHINE_I2C_TARGET
 // I2C target hardware is limited on ESP32 (eg read event comes after the read) so we only support newer SoCs.
-// ESP32C6 does not have enough flash space so also disable it on that SoC.
-#define MICROPY_PY_MACHINE_I2C_TARGET       (SOC_I2C_SUPPORT_SLAVE && !CONFIG_IDF_TARGET_ESP32 && !CONFIG_IDF_TARGET_ESP32C6)
+#define MICROPY_PY_MACHINE_I2C_TARGET       (SOC_I2C_SUPPORT_SLAVE && !CONFIG_IDF_TARGET_ESP32)
 #define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/esp32/machine_i2c_target.c"
 #define MICROPY_PY_MACHINE_I2C_TARGET_MAX   (2)
 #endif

From 30c1b6e3d1ab0acd532b6f064e4466d605224460 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 20 Aug 2025 16:16:15 -0500
Subject: [PATCH 2751/3129] unix: Don't crash if heap locked in
 prompt_write_history.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/input.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/unix/input.c b/ports/unix/input.c
index 31926a5a8e1af..260e9eac8c9db 100644
--- a/ports/unix/input.c
+++ b/ports/unix/input.c
@@ -104,6 +104,9 @@ void prompt_write_history(void) {
     #if MICROPY_USE_READLINE == 1
     char *home = getenv("HOME");
     if (home != NULL) {
+        if (MP_STATE_THREAD(gc_lock_depth) != 0) {
+            return;
+        }
         vstr_t vstr;
         vstr_init(&vstr, 50);
         vstr_printf(&vstr, "%s/.micropython.history", home);

From 6ad91f25fb91cfb715210102691c763547261257 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 20 Aug 2025 16:17:19 -0500
Subject: [PATCH 2752/3129] unix: Unlock heap before readline.

This is intended to be equivalent to the unlock in
shared/runtime/pyexec.c.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 51d99ce5f1510..0acd8c9f27a98 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -209,6 +209,9 @@ static int do_repl(void) {
         mp_hal_stdio_mode_raw();
 
     input_restart:
+        // 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.
+        MP_STATE_THREAD(gc_lock_depth) = 0;
         vstr_reset(&line);
         int ret = readline(&line, mp_repl_get_ps1());
         mp_parse_input_kind_t parse_input_kind = MP_PARSE_SINGLE_INPUT;

From a791f7f43ccc21f4275e3905240e61cf5bfa1c0c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 20 Aug 2025 17:29:45 -0500
Subject: [PATCH 2753/3129] tests: Add test for heap lock in REPL.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/cmdline/repl_lock.py     |  7 +++++++
 tests/cmdline/repl_lock.py.exp | 10 ++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 tests/cmdline/repl_lock.py
 create mode 100644 tests/cmdline/repl_lock.py.exp

diff --git a/tests/cmdline/repl_lock.py b/tests/cmdline/repl_lock.py
new file mode 100644
index 0000000000000..77e2e9327401a
--- /dev/null
+++ b/tests/cmdline/repl_lock.py
@@ -0,0 +1,7 @@
+import micropython
+micropython.heap_lock()
+1+1
+micropython.heap_lock()
+None # Cause the repl's line storage to be enlarged ----------------
+micropython.heap_lock()
+raise SystemExit
diff --git a/tests/cmdline/repl_lock.py.exp b/tests/cmdline/repl_lock.py.exp
new file mode 100644
index 0000000000000..7cce24f6c6abd
--- /dev/null
+++ b/tests/cmdline/repl_lock.py.exp
@@ -0,0 +1,10 @@
+MicroPython \.\+ version
+Use \.\+
+>>> import micropython
+>>> micropython.heap_lock()
+>>> 1+1
+2
+>>> micropython.heap_lock()
+>>> None # Cause the repl's line storage to be enlarged ----------------
+>>> micropython.heap_lock()
+>>> raise SystemExit

From 4db2cf09e0006cc7cb91654f4699538d7d7f7732 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 1 Sep 2025 21:28:02 -0500
Subject: [PATCH 2754/3129] shared/runtime/pyexec: Unconditionally reset lock
 depth.

Saves code size for the same functionality.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 shared/runtime/pyexec.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index c828c75817940..0b253b4ceaa35 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -598,9 +598,7 @@ 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_THREAD(gc_lock_depth) != 0) {
-            MP_STATE_THREAD(gc_lock_depth) = 0;
-        }
+        MP_STATE_THREAD(gc_lock_depth) = 0;
 
         vstr_reset(&line);
         int ret = readline(&line, mp_repl_get_ps1());

From fc2a851202e214c6f9fa35b57baa9052501a8db5 Mon Sep 17 00:00:00 2001
From: Chris Mason <c.mason@inchipdesign.com.au>
Date: Sun, 17 Aug 2025 23:49:59 +1000
Subject: [PATCH 2755/3129] stm32: Enable I2CTarget for STM32L4.

STM32L4 uses the same I2C controller as STM32WB.  Change `defined(STM32WB)`
to `defined(STM32L4) || defined(STM32WB) ` in relevant files.

Also remove the dummy definition of I2C2_BASE for STM32L432xx.  It's now
provided by the dummy definition in `i2cslave.h`.

Signed-off-by: Chris Mason <c.mason@inchipdesign.com.au>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/i2c.c                  | 4 ----
 ports/stm32/i2cslave.c             | 2 +-
 ports/stm32/i2cslave.h             | 4 ++--
 ports/stm32/mpconfigboard_common.h | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 4effb23438cf6..778885eac8c8d 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -279,10 +279,6 @@ int i2c_write(i2c_t *i2c, const uint8_t *src, size_t len, size_t next_len) {
 #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];
diff --git a/ports/stm32/i2cslave.c b/ports/stm32/i2cslave.c
index 0e4fbf48913de..782cca7e4bfb7 100644
--- a/ports/stm32/i2cslave.c
+++ b/ports/stm32/i2cslave.c
@@ -76,7 +76,7 @@ void i2c_slave_irq_handler(i2c_slave_t *i2c) {
     }
 }
 
-#elif defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
+#elif defined(STM32F7) || defined(STM32H7) || defined(STM32L4) || 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 edead6cb2c50a..0b3317efacdf0 100644
--- a/ports/stm32/i2cslave.h
+++ b/ports/stm32/i2cslave.h
@@ -28,7 +28,7 @@
 
 #include STM32_HAL_H
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
 
 #if !defined(I2C2_BASE)
 // This MCU doesn't have I2C2_BASE, define it so that the i2c_idx calculation works.
@@ -63,7 +63,7 @@ static inline void i2c_slave_init(i2c_slave_t *i2c, int irqn, int irq_pri, int a
         volatile uint32_t tmp = RCC->APB1ENR1; // Delay after enabling clock
         (void)tmp;
     }
-    #elif defined(STM32WB)
+    #elif defined(STM32L4) || defined(STM32WB)
     RCC->APB1ENR1 |= 1 << (RCC_APB1ENR1_I2C1EN_Pos + i2c_idx);
     volatile uint32_t tmp = RCC->APB1ENR1; // Delay after enabling clock
     (void)tmp;
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index a8e50be5c6a8a..d5cef1fecea08 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -640,7 +640,7 @@
     || defined(MICROPY_HW_I2C3_SCL) || defined(MICROPY_HW_I2C4_SCL)
 #define MICROPY_HW_ENABLE_HW_I2C (1)
 #ifndef MICROPY_HW_ENABLE_HW_I2C_TARGET
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
 #define MICROPY_HW_ENABLE_HW_I2C_TARGET (1)
 #else
 #define MICROPY_HW_ENABLE_HW_I2C_TARGET (0)

From 9939565d50acfcd68429e86b6276a590197db951 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 26 Aug 2025 09:56:16 +0200
Subject: [PATCH 2756/3129] stm32/boards/ARDUINO_OPTA: Reset ETH PHY on board
 init.

As required by the datasheet.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/ARDUINO_OPTA/board_init.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/stm32/boards/ARDUINO_OPTA/board_init.c b/ports/stm32/boards/ARDUINO_OPTA/board_init.c
index c0907f5d31d7b..51b5b944234ba 100644
--- a/ports/stm32/boards/ARDUINO_OPTA/board_init.c
+++ b/ports/stm32/boards/ARDUINO_OPTA/board_init.c
@@ -61,6 +61,13 @@ void OPTA_board_early_init(void) {
         HAL_MPU_ConfigRegion(&MPU_InitStruct);
     }
     #endif
+
+    // 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);
 }
 
 void OPTA_board_enter_bootloader(void) {

From b3c8ed6c33fa237c2061b38b31060a7fd3559810 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Aug 2025 17:28:26 +1000
Subject: [PATCH 2757/3129] tests/ports/rp2: Decrease test lower bound for
 thread lightsleep time.

This makes the rp2-specific lightsleep test more lenient, so it passes.

This test was added in PR #16454 / 69993daa5c2eae6055f0b3b2330e95e78d6e3738
and even back then it did not pass reliably on RP2040.  The issue is that
threads can race each other to enter lightsleep mode, and when one of them
actually stops the CPU clock the other thread is stopped as well.
Depending on whether the other thread was just entering or just exiting
lightsleep itself, the total duration of all sleeps can vary and can be as
small as 2*T.

Therefore, adjust the minimum to allow 2*T.

`machine.lightsleep()` is anyway 1) specified only to wait at most the
given time; and 2) not well specified when multiple threads call it at the
same time.  So it seems OK to make the test more lenient.

Work done in collaboration with @projectgus.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/rp2/rp2_lightsleep_thread.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/ports/rp2/rp2_lightsleep_thread.py b/tests/ports/rp2/rp2_lightsleep_thread.py
index 494ead422315b..90db6c4a5f876 100644
--- a/tests/ports/rp2/rp2_lightsleep_thread.py
+++ b/tests/ports/rp2/rp2_lightsleep_thread.py
@@ -9,6 +9,7 @@
 SLEEP_MS = 250
 
 IDEAL_RUNTIME = N_SLEEPS * SLEEP_MS
+MIN_RUNTIME = 2 * SLEEP_MS
 MAX_RUNTIME = (N_SLEEPS + 1) * SLEEP_MS
 MAX_DELTA = 20
 
@@ -52,14 +53,17 @@ def test_cpu0_also_lightsleep(self):
         # is unspecified.
         #
         # Currently, the other thread will return immediately if one is already
-        # in lightsleep. Therefore, runtime can be between IDEAL_RUNTIME and
-        # IDEAL_RUNTIME * 2 depending on how many times the calls to lightsleep() race
-        # each other.
+        # in lightsleep doing set up, or waking up.  When a thread is actually in the
+        # sleep section of lightsleep, the CPU clock is stopped and that also stops
+        # the other thread.  It's possible for the total sleep time of this test to
+        # be less than IDEAL_RUNTIME due to the order in which each thread gets to go
+        # to sleep first and whether the other thread is paused before or after it
+        # tries to enter lightsleep itself.
         #
         # Note this test case is really only here to ensure that the rp2 hasn't
         # hung or failed to sleep at all - not to verify any correct behaviour
         # when there's a race to call lightsleep().
-        self.assertGreaterEqual(self.elapsed_ms(), IDEAL_RUNTIME - MAX_DELTA)
+        self.assertGreaterEqual(self.elapsed_ms(), MIN_RUNTIME - MAX_DELTA)
         self.assertLessEqual(self.elapsed_ms(), IDEAL_RUNTIME * 2 + MAX_DELTA)
 
 

From bfda577a3eaa061f8752197b076cf52a426f4fb6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Aug 2025 12:19:03 +1000
Subject: [PATCH 2758/3129] zephyr/CMakeLists.txt: Enable
 sys.implementation._build.

This is, eg, `ZEPHYR_NUCLEO_WB55RG`.

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

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index a5cc477204eb5..e7a55d804ae68 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -30,6 +30,7 @@ project(micropython)
 set(MICROPY_PORT_DIR    ${CMAKE_CURRENT_SOURCE_DIR})
 set(MICROPY_DIR         ${MICROPY_PORT_DIR}/../..)
 set(MICROPY_TARGET      micropython)
+string(TOUPPER          ZEPHYR_${BOARD} MICROPY_BOARD)
 
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)

From 4a60d230c346041659348d7097363650eff6cde7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Aug 2025 21:27:49 +1000
Subject: [PATCH 2759/3129] tests/run-tests.py: Detect target
 sys.implementation._build if possible.

That's useful to know the exact board that's being tested.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/feature_check/target_info.py | 3 ++-
 tests/run-tests.py                 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
index 962ebf4154b5c..5367eb6a47d64 100644
--- a/tests/feature_check/target_info.py
+++ b/tests/feature_check/target_info.py
@@ -20,6 +20,7 @@
     "xtensawin",
     "rv32imc",
 ][sys_mpy >> 10]
+build = getattr(sys.implementation, "_build", "unknown")
 thread = getattr(sys.implementation, "_thread", None)
 
 # Detect how many bits of precision the floating point implementation has.
@@ -33,4 +34,4 @@
 except NameError:
     float_prec = 0
 
-print(platform, arch, thread, float_prec, len("α") == 1)
+print(platform, arch, build, thread, float_prec, len("α") == 1)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 2d02e6b23c6a0..c434cd6fc1b14 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -291,7 +291,7 @@ def detect_test_platform(pyb, args):
     output = run_feature_check(pyb, args, "target_info.py")
     if output.endswith(b"CRASH"):
         raise ValueError("cannot detect platform: {}".format(output))
-    platform, arch, thread, float_prec, unicode = str(output, "ascii").strip().split()
+    platform, arch, build, thread, float_prec, unicode = str(output, "ascii").strip().split()
     if arch == "None":
         arch = None
     inlineasm_arch = detect_inline_asm_arch(pyb, args)
@@ -305,6 +305,7 @@ def detect_test_platform(pyb, args):
     if arch and not args.mpy_cross_flags:
         args.mpy_cross_flags = "-march=" + arch
     args.inlineasm_arch = inlineasm_arch
+    args.build = build
     args.thread = thread
     args.float_prec = float_prec
     args.unicode = unicode

From 3285e52127017e58125c7aacc361daae48dc6744 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Aug 2025 14:10:13 +1000
Subject: [PATCH 2760/3129] tests/run-tests.py: Add support for board-specific
 target_wiring config.

There are currently a few "hardware" tests that need external board
connections to be made for them to work, such as bridging a pair of pins.
For example, all tests in `tests/extmod_hardware` need some kind of
connection.

Along with the physical connections -- which are different for each board
-- there needs to be corresponding Python settings, eg which UART instance
to use and which pins for TX/RX.

These settings are currently hard-coded in each test file. That has a few
problems:
- settings are repeated, eg all the UART tests have pretty much the same
  settings code duplicated across them
- changing the settings means changing many files
- adding a new board means adding a lot of code
- the tests get bigger and bigger with each new board that they support,
  meaning they may not fit on targets with a small amount of RAM (that's
  already the case with `tests/extmod_hardware/machine_pwm.py`)
- if you have a custom board you have to manually edit the test to add your
  own settings

This commit aims to solve all the above problems by splitting the board-
specific settings out into separate files, one for each board (or port).
They are placed in the `tests/target_wiring/` directory.  The
`run-tests.py` test runner then loads the appropriate configuration for the
target that is being tested, sends it to the board so it's available as
`import target_wiring` (without needing a filesystem), and then executes
the test.  Note tht only tests that need `target_wiring` have it loaded.

This commit adds support for this `target_wiring` scheme.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 60 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index c434cd6fc1b14..feeaa982273ff 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -216,6 +216,9 @@ def open(self, path, mode):
     ),
 }
 
+# Tests that require `import target_wiring` to work.
+tests_requiring_target_wiring = ()
+
 
 def rm_f(fname):
     if os.path.exists(fname):
@@ -310,6 +313,7 @@ def detect_test_platform(pyb, args):
     args.float_prec = float_prec
     args.unicode = unicode
 
+    # Print the detected information about the target.
     print("platform={}".format(platform), end="")
     if arch:
         print(" arch={}".format(arch), end="")
@@ -321,7 +325,43 @@ def detect_test_platform(pyb, args):
         print(" float={}-bit".format(float_prec), end="")
     if unicode:
         print(" unicode", end="")
-    print()
+
+
+def detect_target_wiring_script(pyb, args):
+    tw_data = b""
+    tw_source = None
+    if args.target_wiring:
+        # A target_wiring path is explicitly provided, so use that.
+        tw_source = args.target_wiring
+        with open(tw_source, "rb") as f:
+            tw_data = f.read()
+    elif hasattr(pyb, "exec_raw") and pyb.exec_raw("import target_wiring") == (b"", b""):
+        # The board already has a target_wiring module available, so use that.
+        tw_source = "on-device"
+    else:
+        port = platform_to_port(args.platform)
+        build = args.build
+        tw_board_exact = None
+        tw_board_partial = None
+        tw_port = None
+        for file in os.listdir("target_wiring"):
+            file_base = file.removesuffix(".py")
+            if file_base == build:
+                # A file matching the target's board/build name.
+                tw_board_exact = file
+            elif file_base.endswith("x") and build.startswith(file_base.removesuffix("x")):
+                # A file with a partial match to the target's board/build name.
+                tw_board_partial = file
+            elif file_base == port:
+                # A file matching the target's port.
+                tw_port = file
+        tw_source = tw_board_exact or tw_board_partial or tw_port
+        if tw_source:
+            with open("target_wiring/" + tw_source, "rb") as f:
+                tw_data = f.read()
+    if tw_source:
+        print(" target_wiring={}".format(tw_source), end="")
+    pyb.target_wiring_script = tw_data
 
 
 def prepare_script_for_target(args, *, script_text=None, force_plain=False):
@@ -382,6 +422,12 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
     try:
         had_crash = False
         pyb.enter_raw_repl()
+        if test_file.endswith(tests_requiring_target_wiring) and pyb.target_wiring_script:
+            pyb.exec_(
+                "import sys;sys.modules['target_wiring']=__build_class__(lambda:exec("
+                + repr(pyb.target_wiring_script)
+                + "),'target_wiring')"
+            )
         output_mupy = pyb.exec_(script, timeout=TEST_TIMEOUT)
     except pyboard.PyboardError as e:
         had_crash = True
@@ -1285,6 +1331,11 @@ def main():
         default=None,
         help="prologue python file to execute before module import",
     )
+    cmd_parser.add_argument(
+        "--target-wiring",
+        default=None,
+        help="force the given script to be used as target_wiring.py",
+    )
     args = cmd_parser.parse_args()
 
     prologue = ""
@@ -1381,6 +1432,13 @@ def main():
         # tests explicitly given
         tests = args.files
 
+    # If any tests need it, prepare the target_wiring script for the target.
+    if pyb and any(test.endswith(tests_requiring_target_wiring) for test in tests):
+        detect_target_wiring_script(pyb, args)
+
+    # End the target information line.
+    print()
+
     if not args.keep_path:
         # Clear search path to make sure tests use only builtin modules, those in
         # extmod, and a path to unittest in case it's needed.

From 5bafb0bf68a65b0b43ef1e3d7e2b174b23b046f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Aug 2025 14:08:09 +1000
Subject: [PATCH 2761/3129] tests: Convert all machine.UART tests to use
 target_wiring.

All the existing `machine.UART` tests in extmod and extmod_hardware are
converted to use the new `target_wiring` scheme, which removes a lot of
duplicated board-specific settings.

All the existing boards that were supported by these UART tests now have
their own `target_wiring` file.  Some configurations are board specific (eg
NUCLEO_WB55) and others are port specific.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_uart_irq_txidle.py       | 33 +-----------
 tests/extmod/machine_uart_tx.py               | 25 ++-------
 .../extmod_hardware/machine_uart_irq_break.py | 20 +-------
 tests/extmod_hardware/machine_uart_irq_rx.py  | 51 +++----------------
 .../machine_uart_irq_rxidle.py                | 51 ++-----------------
 tests/run-tests.py                            |  8 ++-
 tests/target_wiring/EK_RA6M2.py               |  8 +++
 tests/target_wiring/NUCLEO_WB55.py            |  8 +++
 tests/target_wiring/PYBx.py                   |  8 +++
 tests/target_wiring/alif.py                   |  7 +++
 tests/target_wiring/esp32.py                  |  7 +++
 tests/target_wiring/mimxrt.py                 |  7 +++
 tests/target_wiring/nrf.py                    |  7 +++
 tests/target_wiring/rp2.py                    |  7 +++
 tests/target_wiring/samd.py                   |  7 +++
 15 files changed, 91 insertions(+), 163 deletions(-)
 create mode 100644 tests/target_wiring/EK_RA6M2.py
 create mode 100644 tests/target_wiring/NUCLEO_WB55.py
 create mode 100644 tests/target_wiring/PYBx.py
 create mode 100644 tests/target_wiring/alif.py
 create mode 100644 tests/target_wiring/esp32.py
 create mode 100644 tests/target_wiring/mimxrt.py
 create mode 100644 tests/target_wiring/nrf.py
 create mode 100644 tests/target_wiring/rp2.py
 create mode 100644 tests/target_wiring/samd.py

diff --git a/tests/extmod/machine_uart_irq_txidle.py b/tests/extmod/machine_uart_irq_txidle.py
index 084e9825768a8..a56f6e3cf8563 100644
--- a/tests/extmod/machine_uart_irq_txidle.py
+++ b/tests/extmod/machine_uart_irq_txidle.py
@@ -10,32 +10,7 @@
     raise SystemExit
 
 import time, sys
-
-# Configure pins based on the target.
-if "alif" in sys.platform:
-    uart_id = 1
-    tx_pin = None
-elif "rp2" in sys.platform:
-    uart_id = 0
-    tx_pin = "GPIO0"
-    rx_pin = "GPIO1"
-elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
-    uart_id = 0
-    tx_pin = "D1"
-    rx_pin = "D0"
-elif "samd" in sys.platform and "ItsyBitsy M4" in sys.implementation._machine:
-    uart_id = 3
-    tx_pin = "D1"
-    rx_pin = "D0"
-elif "mimxrt" in sys.platform:
-    uart_id = 1
-    tx_pin = None
-elif "nrf" in sys.platform:
-    uart_id = 0
-    tx_pin = None
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
+from target_wiring import uart_loopback_args, uart_loopback_kwargs
 
 
 def irq(u):
@@ -46,11 +21,7 @@ def irq(u):
 
 # Test that the IRQ is called after the write has completed.
 for bits_per_s in (2400, 9600, 115200):
-    if tx_pin is None:
-        uart = UART(uart_id, bits_per_s)
-    else:
-        uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
-
+    uart = UART(*uart_loopback_args, baudrate=bits_per_s, **uart_loopback_kwargs)
     uart.irq(irq, uart.IRQ_TXIDLE)
 
     # The IRQ_TXIDLE shall trigger after the message has been sent. Thus
diff --git a/tests/extmod/machine_uart_tx.py b/tests/extmod/machine_uart_tx.py
index 85bf7e9fb878a..70d57be46477c 100644
--- a/tests/extmod/machine_uart_tx.py
+++ b/tests/extmod/machine_uart_tx.py
@@ -8,50 +8,35 @@
     raise SystemExit
 
 import time, sys
+from target_wiring import uart_loopback_args, uart_loopback_kwargs
 
 initial_delay_ms = 0
 bit_margin = 0
 timing_margin_us = 100
 
-# Configure pins based on the target.
+# Tune test parameters based on the target.
 if "alif" in sys.platform:
-    uart_id = 1
-    pins = {}
     bit_margin = 1
 elif "esp32" in sys.platform:
-    uart_id = 1
-    pins = {}
     timing_margin_us = 400
 elif "mimxrt" in sys.platform:
-    uart_id = 1
-    pins = {}
     initial_delay_ms = 20  # UART sends idle frame after init, so wait for that
     bit_margin = 1
+elif "nrf" in sys.platform:
+    timing_margin_us = 130
 elif "pyboard" in sys.platform:
-    if "STM32WB" in sys.implementation._machine:
-        uart_id = "LP1"
-    else:
-        uart_id = 4
-    pins = {}
     initial_delay_ms = 50  # UART sends idle frame after init, so wait for that
     bit_margin = 1  # first start-bit must wait to sync with the UART clock
 elif "rp2" in sys.platform:
-    uart_id = 0
-    pins = {"tx": "GPIO0", "rx": "GPIO1"}
     timing_margin_us = 180
 elif "samd" in sys.platform:
-    uart_id = 2
-    pins = {"tx": "D1", "rx": "D0"}
     timing_margin_us = 300
     bit_margin = 1
-else:
-    print("SKIP")
-    raise SystemExit
 
 # Test that write+flush takes the expected amount of time to execute.
 for bits_per_s in (2400, 9600, 115200):
     text = "Hello World"
-    uart = UART(uart_id, bits_per_s, bits=8, parity=None, stop=1, **pins)
+    uart = UART(*uart_loopback_args, baudrate=bits_per_s, **uart_loopback_kwargs)
     time.sleep_ms(initial_delay_ms)
 
     start_us = time.ticks_us()
diff --git a/tests/extmod_hardware/machine_uart_irq_break.py b/tests/extmod_hardware/machine_uart_irq_break.py
index 879f9cee6762f..1832d9883ba54 100644
--- a/tests/extmod_hardware/machine_uart_irq_break.py
+++ b/tests/extmod_hardware/machine_uart_irq_break.py
@@ -12,23 +12,7 @@
     raise SystemExit
 
 import time, sys
-
-# Configure pins based on the target.
-if "esp32" in sys.platform:
-    _machine = sys.implementation._machine
-    if "ESP32S2" in _machine or "ESP32C3" in _machine or "ESP32C6" in _machine:
-        print("SKIP")
-        raise SystemExit
-    uart_id = 1
-    tx_pin = 4
-    rx_pin = 5
-elif "rp2" in sys.platform:
-    uart_id = 0
-    tx_pin = "GPIO0"
-    rx_pin = "GPIO1"
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
+from target_wiring import uart_loopback_args, uart_loopback_kwargs
 
 
 def irq(u):
@@ -37,7 +21,7 @@ def irq(u):
 
 # Test that the IRQ is called for each break received.
 for bits_per_s in (2400, 9600, 57600):
-    uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
+    uart = UART(*uart_loopback_args, baudrate=bits_per_s, **uart_loopback_kwargs)
     uart.irq(irq, uart.IRQ_BREAK)
 
     print("write", bits_per_s)
diff --git a/tests/extmod_hardware/machine_uart_irq_rx.py b/tests/extmod_hardware/machine_uart_irq_rx.py
index 3602c260e396d..92fe218835d73 100644
--- a/tests/extmod_hardware/machine_uart_irq_rx.py
+++ b/tests/extmod_hardware/machine_uart_irq_rx.py
@@ -13,49 +13,14 @@
 
 import time, sys
 
-byte_by_byte = False
-# Configure pins based on the target.
-if "alif" in sys.platform:
-    uart_id = 1
-    tx_pin = None
-    rx_pin = None
-elif "esp32" in sys.platform:
-    uart_id = 1
-    tx_pin = 4
-    rx_pin = 5
-elif "pyboard" in sys.platform:
-    if "STM32WB" in sys.implementation._machine:
-        # LPUART(1) is on PA2/PA3
-        uart_id = "LP1"
-    else:
-        # UART(4) is on PA0/PA1
-        uart_id = 4
-    tx_pin = None
-    rx_pin = None
-elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
-    uart_id = 0
-    tx_pin = "D1"
-    rx_pin = "D0"
-    byte_by_byte = True
-elif "samd" in sys.platform and "ItsyBitsy M4" in sys.implementation._machine:
-    uart_id = 3
-    tx_pin = "D1"
-    rx_pin = "D0"
-elif "nrf" in sys.platform:
-    uart_id = 0
-    tx_pin = None
-    rx_pin = None
-elif "renesas-ra" in sys.platform:
-    uart_id = 9
-    tx_pin = None  # P602 @ RA6M2
-    rx_pin = None  # P601 @ RA6M2
-elif "CC3200" in sys.implementation._machine:
+if "CC3200" in sys.implementation._machine:
     # CC3200 doesn't work because it's too slow and has an allocation error in the handler.
     print("SKIP")
     raise SystemExit
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
+
+from target_wiring import uart_loopback_args, uart_loopback_kwargs
+
+byte_by_byte = "ItsyBitsy M0" in sys.implementation._machine
 
 
 def irq(u):
@@ -67,11 +32,7 @@ def irq(u):
 # Test that the IRQ is called for each byte received.
 # Use slow baudrates so that the IRQ has time to run.
 for bits_per_s in (2400, 9600):
-    if tx_pin is None:
-        uart = UART(uart_id, bits_per_s)
-    else:
-        uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
-
+    uart = UART(*uart_loopback_args, baudrate=bits_per_s, **uart_loopback_kwargs)
     uart.irq(irq, uart.IRQ_RX)
 
     print("write", bits_per_s)
diff --git a/tests/extmod_hardware/machine_uart_irq_rxidle.py b/tests/extmod_hardware/machine_uart_irq_rxidle.py
index 3c743c9e0c1c0..40f781d078822 100644
--- a/tests/extmod_hardware/machine_uart_irq_rxidle.py
+++ b/tests/extmod_hardware/machine_uart_irq_rxidle.py
@@ -12,52 +12,10 @@
     raise SystemExit
 
 import time, sys
+from target_wiring import uart_loopback_args, uart_loopback_kwargs
 
 # Target tuning options.
-tune_wait_initial_rxidle = False
-
-# Configure pins based on the target.
-if "alif" in sys.platform:
-    uart_id = 1
-    tx_pin = None
-    rx_pin = None
-elif "esp32" in sys.platform:
-    uart_id = 1
-    tx_pin = 4
-    rx_pin = 5
-elif "mimxrt" in sys.platform:
-    uart_id = 1
-    tx_pin = None
-elif "pyboard" in sys.platform:
-    tune_wait_initial_rxidle = True
-    if "STM32WB" in sys.implementation._machine:
-        # LPUART(1) is on PA2/PA3
-        uart_id = "LP1"
-    else:
-        # UART(4) is on PA0/PA1
-        uart_id = 4
-    tx_pin = None
-    rx_pin = None
-elif "renesas-ra" in sys.platform:
-    uart_id = 9
-    tx_pin = None  # P602 @ RA6M2
-    rx_pin = None  # P601 @ RA6M2
-elif "rp2" in sys.platform:
-    uart_id = 0
-    tx_pin = "GPIO0"
-    rx_pin = "GPIO1"
-elif "samd" in sys.platform and "ItsyBitsy M0" in sys.implementation._machine:
-    uart_id = 0
-    tx_pin = "D1"
-    rx_pin = "D0"
-    byte_by_byte = True
-elif "samd" in sys.platform and "ItsyBitsy M4" in sys.implementation._machine:
-    uart_id = 3
-    tx_pin = "D1"
-    rx_pin = "D0"
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
+tune_wait_initial_rxidle = sys.platform == "pyboard"
 
 
 def irq(u):
@@ -71,10 +29,7 @@ def irq(u):
     print("========")
     print("bits_per_s:", bits_per_s)
 
-    if tx_pin is None:
-        uart = UART(uart_id, bits_per_s)
-    else:
-        uart = UART(uart_id, bits_per_s, tx=tx_pin, rx=rx_pin)
+    uart = UART(*uart_loopback_args, baudrate=bits_per_s, **uart_loopback_kwargs)
 
     # Ignore a possible initial RXIDLE condition after creating UART.
     if tune_wait_initial_rxidle:
diff --git a/tests/run-tests.py b/tests/run-tests.py
index feeaa982273ff..c3017542cc9a7 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -217,7 +217,13 @@ def open(self, path, mode):
 }
 
 # Tests that require `import target_wiring` to work.
-tests_requiring_target_wiring = ()
+tests_requiring_target_wiring = (
+    "extmod/machine_uart_irq_txidle.py",
+    "extmod/machine_uart_tx.py",
+    "extmod_hardware/machine_uart_irq_break.py",
+    "extmod_hardware/machine_uart_irq_rx.py",
+    "extmod_hardware/machine_uart_irq_rxidle.py",
+)
 
 
 def rm_f(fname):
diff --git a/tests/target_wiring/EK_RA6M2.py b/tests/target_wiring/EK_RA6M2.py
new file mode 100644
index 0000000000000..7d4a8cbbd6484
--- /dev/null
+++ b/tests/target_wiring/EK_RA6M2.py
@@ -0,0 +1,8 @@
+# Target wiring for EK_RA6M2.
+#
+# Connect:
+# - P601 to P602
+
+# UART(9) is on P602/P601.
+uart_loopback_args = (9,)
+uart_loopback_kwargs = {}
diff --git a/tests/target_wiring/NUCLEO_WB55.py b/tests/target_wiring/NUCLEO_WB55.py
new file mode 100644
index 0000000000000..ad7c120d3770e
--- /dev/null
+++ b/tests/target_wiring/NUCLEO_WB55.py
@@ -0,0 +1,8 @@
+# Target wiring for NUCLEO_WB55.
+#
+# Connect:
+# - PA2 to PA3
+
+# LPUART(1) is on PA2/PA3.
+uart_loopback_args = ("LP1",)
+uart_loopback_kwargs = {}
diff --git a/tests/target_wiring/PYBx.py b/tests/target_wiring/PYBx.py
new file mode 100644
index 0000000000000..10ce520ef0af4
--- /dev/null
+++ b/tests/target_wiring/PYBx.py
@@ -0,0 +1,8 @@
+# Target wiring for PYBV10, PYBV11, PYBLITEV10, PYBD_SF2, PYBD_SF3, PYBD_SF6.
+#
+# Connect:
+# - X1 to X2
+
+# UART("XA") is on X1/X2  (usually UART(4) on PA0/PA1).
+uart_loopback_args = ("XA",)
+uart_loopback_kwargs = {}
diff --git a/tests/target_wiring/alif.py b/tests/target_wiring/alif.py
new file mode 100644
index 0000000000000..18f3cbe7e5e0d
--- /dev/null
+++ b/tests/target_wiring/alif.py
@@ -0,0 +1,7 @@
+# Target wiring for general alif board.
+#
+# Connect:
+# - UART1 TX and RX, usually P0_5 and P0_4
+
+uart_loopback_args = (1,)
+uart_loopback_kwargs = {}
diff --git a/tests/target_wiring/esp32.py b/tests/target_wiring/esp32.py
new file mode 100644
index 0000000000000..63d7a81a2dc12
--- /dev/null
+++ b/tests/target_wiring/esp32.py
@@ -0,0 +1,7 @@
+# Target wiring for general esp32 board.
+#
+# Connect:
+# - GPIO4 to GPIO5
+
+uart_loopback_args = (1,)
+uart_loopback_kwargs = {"tx": 4, "rx": 5}
diff --git a/tests/target_wiring/mimxrt.py b/tests/target_wiring/mimxrt.py
new file mode 100644
index 0000000000000..669e9095990db
--- /dev/null
+++ b/tests/target_wiring/mimxrt.py
@@ -0,0 +1,7 @@
+# Target wiring for general mimxrt board.
+#
+# Connect:
+# - UART1 TX and RX, usually D0 and D1
+
+uart_loopback_args = (1,)
+uart_loopback_kwargs = {}
diff --git a/tests/target_wiring/nrf.py b/tests/target_wiring/nrf.py
new file mode 100644
index 0000000000000..6979dd28ee595
--- /dev/null
+++ b/tests/target_wiring/nrf.py
@@ -0,0 +1,7 @@
+# Target wiring for general nrf board.
+#
+# Connect:
+# - UART0 TX and RX
+
+uart_loopback_args = (0,)
+uart_loopback_kwargs = {}
diff --git a/tests/target_wiring/rp2.py b/tests/target_wiring/rp2.py
new file mode 100644
index 0000000000000..cb0fa0d626339
--- /dev/null
+++ b/tests/target_wiring/rp2.py
@@ -0,0 +1,7 @@
+# Target wiring for general rp2 board.
+#
+# Connect:
+# - GPIO0 to GPIO1
+
+uart_loopback_args = (0,)
+uart_loopback_kwargs = {"tx": "GPIO0", "rx": "GPIO1"}
diff --git a/tests/target_wiring/samd.py b/tests/target_wiring/samd.py
new file mode 100644
index 0000000000000..887c43a242f9b
--- /dev/null
+++ b/tests/target_wiring/samd.py
@@ -0,0 +1,7 @@
+# Target wiring for general samd board.
+#
+# Connect:
+# - D0 to D1
+
+uart_loopback_args = ()
+uart_loopback_kwargs = {"tx": "D1", "rx": "D0"}

From 123f66b2598e0feb96993fe19d98568517addc3b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Aug 2025 23:31:19 +1000
Subject: [PATCH 2762/3129] tests/target_wiring/ZEPHYR_NUCLEO_WB55RG.py: Add
 nucleo_wb55rg.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/target_wiring/ZEPHYR_NUCLEO_WB55RG.py | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 tests/target_wiring/ZEPHYR_NUCLEO_WB55RG.py

diff --git a/tests/target_wiring/ZEPHYR_NUCLEO_WB55RG.py b/tests/target_wiring/ZEPHYR_NUCLEO_WB55RG.py
new file mode 100644
index 0000000000000..c7ca2ac26f794
--- /dev/null
+++ b/tests/target_wiring/ZEPHYR_NUCLEO_WB55RG.py
@@ -0,0 +1,7 @@
+# Target wiring for zephyr nucleo_wb55rg.
+#
+# Connect:
+# - TX=PC0 to RX=PC1
+
+uart_loopback_args = ("lpuart1",)
+uart_loopback_kwargs = {}

From c7c0ad222ee017435ba24eeb82ba90a30dc8ae2b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Aug 2025 13:56:36 +1000
Subject: [PATCH 2763/3129] alif/tinyusb_port: Fix setting of USB device addr
 for fast hosts.

A fast host (eg Mac M4) may request the status for the SET_ADDRESS before
TinyUSB gets to process it.  This is because TinyUSB does not handle events
inside the USB ISR, rather it waits for the top-level thread to process
them.  Fix that by setting the USB device address as soon as
TUSB_REQ_SET_ADDRESS comes in.

This patch follows the corresponding upstream fix:
https://github.com/alifsemi/tinyusb/commit/fc40ea7fc6e6bd49baad6b504c88bb6a37c7a191

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

diff --git a/ports/alif/tinyusb_port/tusb_alif_dcd.c b/ports/alif/tinyusb_port/tusb_alif_dcd.c
index 9a990cedbe387..cae0be8d8468e 100644
--- a/ports/alif/tinyusb_port/tusb_alif_dcd.c
+++ b/ports/alif/tinyusb_port/tusb_alif_dcd.c
@@ -249,7 +249,11 @@ void dcd_set_address(uint8_t rhport, uint8_t dev_addr)
 {
     LOG("%010u >%s", DWT->CYCCNT, __func__);
 
-    udev->dcfg_b.devaddr = dev_addr;
+    // Device address is set from the ISR when SETUP packet is received
+    // By point TinyUSB calls this function, the address has already been
+    // set and STATUS sent back to the host. Xfer call below is purely for
+    // internal TinyUSB state to conclude transaction and issue next SETUP req.
+
     dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_IN), NULL, 0);
 }
 
@@ -571,6 +575,9 @@ static void _dcd_handle_depevt(uint8_t ep, uint8_t evt, uint8_t sts, uint16_t pa
 
             // XferNotReady NotActive for status stage
             if ((1 == ep) && (0b0010 == (sts & 0b1011))) {
+                if (0x00 == _ctrl_buf[0] && TUSB_REQ_SET_ADDRESS == _ctrl_buf[1]) {
+                    udev->dcfg_b.devaddr = _ctrl_buf[2];
+                }
                 _dcd_start_xfer(1, NULL, 0, TRBCTL_CTL_STAT2);
                 break;
             }

From 5f3e6b5b5381fd180280b0c852826db079808cce Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 18 Jul 2025 16:36:07 +0200
Subject: [PATCH 2764/3129] shared/tinyusb: Fix build errors with CDC support
 disabled.

This commit makes possible building MicroPython with USB CDC support
disabled.

The original code does support such a configuration but missed a few
spots where build errors would arise.  These changes fix the remaining
issues, fixing also warnings caused by the changes needed to make the
build succeed.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 shared/tinyusb/mp_usbd.h         | 3 +++
 shared/tinyusb/mp_usbd_runtime.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 5c8f2a6095f30..866ef8503a580 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -38,13 +38,16 @@
 #ifndef NO_QSTR
 #include "tusb.h"
 #include "device/dcd.h"
+#include "class/cdc/cdc_device.h"
 #endif
 
 // Initialise TinyUSB device.
 static inline void mp_usbd_init_tud(void) {
     tusb_init();
+    #if MICROPY_HW_USB_CDC
     tud_cdc_configure_fifo_t cfg = { .rx_persistent = 0, .tx_persistent = 1 };
     tud_cdc_configure_fifo(&cfg);
+    #endif
 }
 
 // Run the TinyUSB device task
diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index a1eebeebd2fcd..72e011732d400 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -267,9 +267,11 @@ static uint16_t runtime_dev_open(uint8_t rhport, tusb_desc_interface_t const *it
     }
 
     // If TinyUSB built-in drivers are enabled, don't claim any interface in the built-in range
+    #if USBD_ITF_BUILTIN_MAX > 0
     if (mp_usb_device_builtin_enabled(usbd) && itf_desc->bInterfaceNumber < USBD_ITF_BUILTIN_MAX) {
         return 0;
     }
+    #endif
 
     // Determine the total descriptor length of the interface(s) we are going to claim
     uint8_t assoc_itf_count = _runtime_dev_count_itfs(itf_desc);

From 1f7952e749d02f74492605ed9a50bd73dd4b4ead Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 25 Jul 2025 11:49:23 +0200
Subject: [PATCH 2765/3129] rp2/mphalport: Fix building with USB CDC disabled.

This commit fixes the linking issues in the RP2 port that arise when
explicitly disabling USB CDC support.

The console input ringbuffer needs to be made available if dupterm
support is enabled, and the console character input function would
always attempt to read from the input ringbuffer even if CDC support is
disabled and the console isn't bound to any UART.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/rp2/mphalport.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index b581b3b59f95d..4dd510dea4db3 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -50,7 +50,7 @@
 static uint64_t time_us_64_offset_from_epoch;
 #endif
 
-#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
+#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC || MICROPY_PY_OS_DUPTERM_NOTIFY
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
 #define MICROPY_HW_STDIN_BUFFER_LEN 512
@@ -83,11 +83,12 @@ int mp_hal_stdin_rx_chr(void) {
         #if MICROPY_HW_USB_CDC
         mp_usbd_cdc_poll_interfaces(0);
         #endif
-
+        #if MICROPY_HW_USB_CDC || MICROPY_HW_ENABLE_UART_REPL || MICROPY_PY_OS_DUPTERM_NOTIFY
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
         }
+        #endif
         #if MICROPY_PY_OS_DUPTERM
         int dupterm_c = mp_os_dupterm_rx_chr();
         if (dupterm_c >= 0) {

From 3e5ecd0c33ddeaf50e0ff48cf1c91f87c1320170 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 25 Jul 2025 12:15:01 +0200
Subject: [PATCH 2766/3129] mimxrt/mphalport: Fix building with USB CDC
 disabled.

This commit fixes the build issues in the MIMXRT port that arise when
explicitly disabling USB CDC support.

The console code assumed CDC support is always enabled even if it was
disabled in mpconfigport.h.  These changes make accessing CDC
conditional to that support configuration being enabled.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/mimxrt/mphalport.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index be5abd95bec54..c3802be30f5d7 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -47,7 +47,9 @@ ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0,
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
+    #if MICROPY_HW_USB_CDC
     ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
+    #endif
     #if MICROPY_PY_OS_DUPTERM
     ret |= mp_os_dupterm_poll(poll_flags);
     #endif
@@ -56,7 +58,9 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
+        #if MICROPY_HW_USB_CDC
         mp_usbd_cdc_poll_interfaces(0);
+        #endif
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
@@ -74,11 +78,13 @@ int mp_hal_stdin_rx_chr(void) {
 mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     mp_uint_t ret = len;
     bool did_write = false;
+    #if MICROPY_HW_USB_CDC
     mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
     if (cdc_res > 0) {
         did_write = true;
         ret = MIN(cdc_res, ret);
     }
+    #endif
     #if MICROPY_PY_OS_DUPTERM
     int dupterm_res = mp_os_dupterm_tx_strn(str, len);
     if (dupterm_res >= 0) {

From ef21e98520fb9cdac0ccc340f8be349af8abec29 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 25 Jul 2025 12:42:09 +0200
Subject: [PATCH 2767/3129] samd/mphalport: Fix building with USB CDC disabled.

This commit fixes the build issues in the SAMD port that arise when
explicitly disabling USB CDC support.

The console code assumed CDC support is always enabled even if it was
disabled in mpconfigport.h.  These changes make accessing CDC
conditional to that support configuration being enabled.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/samd/mphalport.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 84d05b9185afe..327ab436a7126 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -120,7 +120,9 @@ uint64_t mp_hal_ticks_us_64(void) {
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
+    #if MICROPY_HW_USB_CDC
     ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
+    #endif
     #if MICROPY_PY_OS_DUPTERM
     ret |= mp_os_dupterm_poll(poll_flags);
     #endif
@@ -129,8 +131,9 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-
+        #if MICROPY_HW_USB_CDC
         mp_usbd_cdc_poll_interfaces(0);
+        #endif
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
@@ -149,11 +152,13 @@ int mp_hal_stdin_rx_chr(void) {
 mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     mp_uint_t ret = len;
     bool did_write = false;
+    #if MICROPY_HW_USB_CDC
     mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
     if (cdc_res > 0) {
         did_write = true;
         ret = MIN(cdc_res, ret);
     }
+    #endif
     #if MICROPY_PY_OS_DUPTERM
     int dupterm_res = mp_os_dupterm_tx_strn(str, len);
     if (dupterm_res >= 0) {

From d1607598faf4ce2ef8e1a0385f75036ffb50ea9b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 25 Jul 2025 13:54:41 +0200
Subject: [PATCH 2768/3129] esp32/usb: Fix building with USB CDC disabled.

This commit fixes the build issues in the ESP32 port that arise when
explicitly disabling USB CDC support.

The USB support code gated the USB serial number retrieval behind the
USB CDC support definition, even though all USB devices must be able to
be queried for their serial number.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/esp32/usb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 3ce3d045810af..750dd59ee6fdc 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -28,16 +28,16 @@
 #include "py/mphal.h"
 #include "usb.h"
 
-#if MICROPY_HW_USB_CDC
-#include "esp_rom_gpio.h"
+#if MICROPY_HW_ENABLE_USBDEV
+
 #include "esp_mac.h"
+#include "esp_rom_gpio.h"
 #include "esp_private/usb_phy.h"
 
 #include "shared/tinyusb/mp_usbd.h"
 
 static usb_phy_handle_t phy_hdl;
 
-
 void usb_init(void) {
     // ref: https://github.com/espressif/esp-usb/blob/4b6a798d0bed444fff48147c8dcdbbd038e92892/device/esp_tinyusb/tinyusb.c
 
@@ -77,4 +77,4 @@ void mp_usbd_port_get_serial_number(char *serial_buf) {
     mp_usbd_hex_str(serial_buf, mac, sizeof(mac));
 }
 
-#endif // MICROPY_HW_USB_CDC
+#endif // MICROPY_HW_ENABLE_USBDEV

From 7dce35c7bea5c4c0dff0bb97b4dd4a989fd84fb2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Aug 2025 16:26:27 +1000
Subject: [PATCH 2769/3129] esp32: Update esp_tinyusb component to v1.7.6.

Reported to fix issues reported with serial corruption when interacting
with MicroPython from macOS hosts.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/main/idf_component.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/main/idf_component.yml b/ports/esp32/main/idf_component.yml
index f7773f4f4e472..cb14ffde60de8 100644
--- a/ports/esp32/main/idf_component.yml
+++ b/ports/esp32/main/idf_component.yml
@@ -4,7 +4,7 @@ dependencies:
   espressif/esp_tinyusb:
     rules:
       - if: "target in [esp32s2, esp32s3]"
-    version: "~1.0.0"
+    version: "~1.7.6"
   espressif/lan867x:
     version: "~1.0.0"
     rules:

From 1c4455bfe703055155d40197b41a00cc37b04b35 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 3 Sep 2025 15:44:10 +1000
Subject: [PATCH 2770/3129] tools: Add an environment variable
 MICROPY_MAINTAINER_BUILD.

This allows us to have some things which are fatal errors in CI or nightly
builds, but warnings in normal developer builds.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/autobuild/autobuild.sh | 3 +++
 tools/ci.sh                  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 7073152df7931..c24c4b3a9af4e 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -48,6 +48,9 @@ git -C ${MICROPY_AUTOBUILD_MICROPYTHON_REPO}/lib/pico-sdk submodule update --ini
 ########################################
 # Build all firmware
 
+# Fail on some things which are warnings otherwise
+export MICROPY_MAINTAINER_BUILD=1
+
 pushd ${MICROPY_AUTOBUILD_MICROPYTHON_REPO}
 
 # build cross compiler
diff --git a/tools/ci.sh b/tools/ci.sh
index 1dfe3d66e8657..115442ffd0feb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -9,6 +9,9 @@ fi
 # Ensure known OPEN_MAX (NO_FILES) limit.
 ulimit -n 1024
 
+# Fail on some things which are warnings otherwise
+export MICROPY_MAINTAINER_BUILD=1
+
 ########################################################################################
 # general helper functions
 

From 8d5a8892d22388b0d1b0e6769a0f1719a362937b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 20 Aug 2025 16:24:57 +1000
Subject: [PATCH 2771/3129] esp32: Add IDF Component Lockfiles to git repo.

This is recommended by Espressif, and it's the only way to ensure
everyone builds the same set of component versions.

The awkward part is that updating the ESP-IDF version will churn a line
in each of these files (and possibly other changes).

Adds a build-time check for lock file changes, which is either a warning or
a hard error depending on the value of MICROPY_MAINTAINER_BUILD
flag (introduced in previous commit).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/.gitignore                        |  1 -
 ports/esp32/CMakeLists.txt                    | 16 ++++++
 ports/esp32/README.md                         |  5 +-
 ports/esp32/lockfiles/README.md               | 12 +++++
 ports/esp32/lockfiles/dependencies.lock.esp32 | 35 +++++++++++++
 .../esp32/lockfiles/dependencies.lock.esp32c2 | 21 ++++++++
 .../esp32/lockfiles/dependencies.lock.esp32c3 | 21 ++++++++
 .../esp32/lockfiles/dependencies.lock.esp32c6 | 21 ++++++++
 .../esp32/lockfiles/dependencies.lock.esp32s2 | 50 +++++++++++++++++++
 .../esp32/lockfiles/dependencies.lock.esp32s3 | 50 +++++++++++++++++++
 tools/ci.sh                                   |  7 ++-
 11 files changed, 234 insertions(+), 5 deletions(-)
 create mode 100644 ports/esp32/lockfiles/README.md
 create mode 100644 ports/esp32/lockfiles/dependencies.lock.esp32
 create mode 100644 ports/esp32/lockfiles/dependencies.lock.esp32c2
 create mode 100644 ports/esp32/lockfiles/dependencies.lock.esp32c3
 create mode 100644 ports/esp32/lockfiles/dependencies.lock.esp32c6
 create mode 100644 ports/esp32/lockfiles/dependencies.lock.esp32s2
 create mode 100644 ports/esp32/lockfiles/dependencies.lock.esp32s3

diff --git a/ports/esp32/.gitignore b/ports/esp32/.gitignore
index a78ecd0191c9f..9c708bb85c630 100644
--- a/ports/esp32/.gitignore
+++ b/ports/esp32/.gitignore
@@ -1,2 +1 @@
-dependencies.lock
 managed_components/
diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 1db374b40a431..9d6be8010ff64 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -61,5 +61,21 @@ set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
 # Include main IDF cmake file.
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
+# Generate individual dependencies.lock files based on chip target
+idf_build_set_property(DEPENDENCIES_LOCK lockfiles/dependencies.lock.${IDF_TARGET})
+
 # Define the project.
 project(micropython)
+
+# Check for lockfile changes and either warn or error depending on build type
+message("Checking lockfile contents...")
+execute_process(COMMAND git diff --exit-code lockfiles/ WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+    RESULT_VARIABLE RES)
+if (RES)
+    # Maintainer builds (CI or autobuild runs) should fail if this has happened
+    if($ENV{MICROPY_MAINTAINER_BUILD})
+        message(FATAL_ERROR "Failing build as lockfiles are dirty (see above). Check that ESP-IDF versions match.")
+    else()
+        message(WARNING "Component lockfile contents have changed (see above). This may be due to building with a different ESP-IDF version. Please mention this output if reporting an issue with MicroPython.")
+    endif()
+endif()
diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index dd4584772cf84..2c09ebccd5039 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -30,8 +30,9 @@ 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 v5.2, v5.2.2, v5.3, v5.4, v5.4.1 and v5.4.2.
+The ESP-IDF changes quickly and MicroPython only supports certain versions. The
+current recommended version of ESP-IDF for MicroPython is v5.4.2. MicroPython
+also supports v5.2, v5.2.2, v5.3, v5.4 and v5.4.1.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
diff --git a/ports/esp32/lockfiles/README.md b/ports/esp32/lockfiles/README.md
new file mode 100644
index 0000000000000..a957b428f926f
--- /dev/null
+++ b/ports/esp32/lockfiles/README.md
@@ -0,0 +1,12 @@
+# ESP-IDF Component Lockfiles
+
+This directory contains the exact versions of ESP-IDF components that have been
+used to build MicroPython. It is updated by the [component version
+solver](https://docs.espressif.com/projects/idf-component-manager/en/latest/guides/version_solver.html).
+
+Unless you change the `main/idf_component.yml` file for MicroPython ESP32, files
+in this directory should only change contents if you build using a different
+ESP-IDF version to the last time the file was updated.
+
+*Please do not commit changes to these files and submit PRs unless the PR needs
+to change versions of components or ESP-IDF.*
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32 b/ports/esp32/lockfiles/dependencies.lock.esp32
new file mode 100644
index 0000000000000..5c2b7827544ef
--- /dev/null
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32
@@ -0,0 +1,35 @@
+dependencies:
+  espressif/lan867x:
+    component_hash: 0ff9dae3affeff53811e7c8283e67c6d36dc0c03e3bc5102c0fba629e08bf6c4
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.3'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    targets:
+    - esp32
+    - esp32p4
+    version: 1.0.3
+  espressif/mdns:
+    component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.0
+  idf:
+    source:
+      type: idf
+    version: 5.4.2
+direct_dependencies:
+- espressif/lan867x
+- espressif/mdns
+- idf
+manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+target: esp32
+version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c2 b/ports/esp32/lockfiles/dependencies.lock.esp32c2
new file mode 100644
index 0000000000000..df6ed2c1d89dc
--- /dev/null
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c2
@@ -0,0 +1,21 @@
+dependencies:
+  espressif/mdns:
+    component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.0
+  idf:
+    source:
+      type: idf
+    version: 5.4.2
+direct_dependencies:
+- espressif/mdns
+- idf
+manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+target: esp32c2
+version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c3 b/ports/esp32/lockfiles/dependencies.lock.esp32c3
new file mode 100644
index 0000000000000..a4c955d4763e9
--- /dev/null
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c3
@@ -0,0 +1,21 @@
+dependencies:
+  espressif/mdns:
+    component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.0
+  idf:
+    source:
+      type: idf
+    version: 5.4.2
+direct_dependencies:
+- espressif/mdns
+- idf
+manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+target: esp32c3
+version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c6 b/ports/esp32/lockfiles/dependencies.lock.esp32c6
new file mode 100644
index 0000000000000..fa81d8ad78dca
--- /dev/null
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c6
@@ -0,0 +1,21 @@
+dependencies:
+  espressif/mdns:
+    component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.0
+  idf:
+    source:
+      type: idf
+    version: 5.4.2
+direct_dependencies:
+- espressif/mdns
+- idf
+manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+target: esp32c6
+version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s2 b/ports/esp32/lockfiles/dependencies.lock.esp32s2
new file mode 100644
index 0000000000000..12430428e0979
--- /dev/null
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s2
@@ -0,0 +1,50 @@
+dependencies:
+  espressif/esp_tinyusb:
+    component_hash: 96d232ced7afe1976119b62f7fbf1944a2a78b36228ff6f7b9318394ac1153cc
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    - name: espressif/tinyusb
+      registry_url: https://components.espressif.com
+      require: public
+      version: '>=0.14.2'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.7.6~1
+  espressif/mdns:
+    component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.0
+  espressif/tinyusb:
+    component_hash: aa65639878f27a44d349044afd9c3fc134a92bd560874fdac1d836019b5c07ca
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com
+      type: service
+    targets:
+    - esp32s2
+    - esp32s3
+    - esp32p4
+    version: 0.18.0~4
+  idf:
+    source:
+      type: idf
+    version: 5.4.2
+direct_dependencies:
+- espressif/esp_tinyusb
+- espressif/mdns
+- idf
+manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+target: esp32s2
+version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s3 b/ports/esp32/lockfiles/dependencies.lock.esp32s3
new file mode 100644
index 0000000000000..215346dbd441c
--- /dev/null
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s3
@@ -0,0 +1,50 @@
+dependencies:
+  espressif/esp_tinyusb:
+    component_hash: 96d232ced7afe1976119b62f7fbf1944a2a78b36228ff6f7b9318394ac1153cc
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    - name: espressif/tinyusb
+      registry_url: https://components.espressif.com
+      require: public
+      version: '>=0.14.2'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.7.6~1
+  espressif/mdns:
+    component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.0
+  espressif/tinyusb:
+    component_hash: aa65639878f27a44d349044afd9c3fc134a92bd560874fdac1d836019b5c07ca
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com
+      type: service
+    targets:
+    - esp32s2
+    - esp32s3
+    - esp32p4
+    version: 0.18.0~4
+  idf:
+    source:
+      type: idf
+    version: 5.4.2
+direct_dependencies:
+- espressif/esp_tinyusb
+- espressif/mdns
+- idf
+manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+target: esp32s3
+version: 2.0.0
diff --git a/tools/ci.sh b/tools/ci.sh
index 115442ffd0feb..69e595087374c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -171,14 +171,17 @@ function ci_cc3200_build {
 ########################################################################################
 # ports/esp32
 
-# GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch)
-IDF_VER=v5.4.2
+# GitHub tag of ESP-IDF to use for CI, extracted from the esp32 dependency lockfile
+# This should end up as a tag name like vX.Y.Z
+# (note: This hacky parsing can be replaced with 'yq' once Ubuntu >=24.04 is in use)
+IDF_VER=v$(grep -A10 "idf:" ports/esp32/lockfiles/dependencies.lock.esp32 | grep "version:" | head -n1 | sed -E 's/ +version: //')
 PYTHON=$(command -v python3 2> /dev/null)
 PYTHON_VER=$(${PYTHON:-python} --version | cut -d' ' -f2)
 
 export IDF_CCACHE_ENABLE=1
 
 function ci_esp32_idf_setup {
+    echo "Using ESP-IDF version $IDF_VER"
     git clone --depth 1 --branch $IDF_VER https://github.com/espressif/esp-idf.git
     # doing a treeless clone isn't quite as good as --shallow-submodules, but it
     # is smaller than full clones and works when the submodule commit isn't a head.

From 3ec2e367decd8da968b1b85b65264bbab367bc9c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Aug 2025 15:34:12 +1000
Subject: [PATCH 2772/3129] shared/tinyusb: Fix hang from new
 tx_overwritabe_if_not_connected flag.

This flag is in the main branch of TinyUSB, included in Espressif since
their v0.18.0~3 component release (but it's not actually in TinyUSB v0.18.0
release).

Setting the flag is needed for the USB device not to block waiting for
space in the FIFO if the host is disconnected.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 866ef8503a580..4e3403b35690a 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -45,7 +45,18 @@
 static inline void mp_usbd_init_tud(void) {
     tusb_init();
     #if MICROPY_HW_USB_CDC
-    tud_cdc_configure_fifo_t cfg = { .rx_persistent = 0, .tx_persistent = 1 };
+    tud_cdc_configure_fifo_t cfg = { .rx_persistent = 0,
+                                     .tx_persistent = 1,
+
+                                     // This config flag is unreleased in TinyUSB >v0.18.0
+                                     // but included in Espressif's TinyUSB component since v0.18.0~3
+                                     //
+                                     // Versioning issue reported as
+                                     // https://github.com/espressif/esp-usb/issues/236
+                                     #if TUSB_VERSION_NUMBER > 1800 || defined(ESP_PLATFORM)
+                                     .tx_overwritabe_if_not_connected = 1,
+                                     #endif
+    };
     tud_cdc_configure_fifo(&cfg);
     #endif
 }

From a43e38544bf707831350dd53091c7d47eddd41bf Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 10 Sep 2025 09:35:36 +1000
Subject: [PATCH 2773/3129] shared/tinyusb/mp_usbd_cdc: Rewrite USB CDC TX
 loop.

This is related to the previous commit (where due to the new config flag
this loop could end up stuck indefinitely if the USB host was
disconnected). The previous loop could maybe still get stuck if the
low-level USB state and the high-level USB state got out of sync. (Not
clearly possible, but hard to say definitely not possible.)

To be "belts and braces" careful:

- Always run mp_usbd_task() each time around the loop to progress the
  state.
- Always evaluate the timeout if we fail to write anything to the FIFO.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd_cdc.c | 45 +++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index b4151f685c41e..9b380acefc060 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -98,32 +98,45 @@ mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
     if (!tusb_inited()) {
         return 0;
     }
+    mp_uint_t last_write = mp_hal_ticks_ms();
     size_t i = 0;
     while (i < len) {
         uint32_t n = len - i;
-        if (n > CFG_TUD_CDC_EP_BUFSIZE) {
-            n = CFG_TUD_CDC_EP_BUFSIZE;
-        }
+
         if (tud_cdc_connected()) {
-            // If CDC port is connected but the buffer is full, wait for up to USC_CDC_TIMEOUT ms.
-            mp_uint_t t0 = mp_hal_ticks_ms();
-            while (n > tud_cdc_write_available() && (mp_uint_t)(mp_hal_ticks_ms() - t0) < MICROPY_HW_USB_CDC_TX_TIMEOUT) {
-                mp_event_wait_ms(1);
-
-                // Explicitly run the USB stack as the scheduler may be locked (eg we
-                // are in an interrupt handler), while there is data pending.
-                mp_usbd_task();
-            }
             // Limit write to available space in tx buffer when connected.
+            //
+            // (If not connected then we write everything to the fifo, expecting
+            // it to overwrite old data so it will have latest data buffered
+            // when host connects.)
             n = MIN(n, tud_cdc_write_available());
-            if (n == 0) {
-                break;
-            }
         }
-        // When not connected we always write to usb fifo, ensuring it has latest data.
+
         uint32_t n2 = tud_cdc_write(str + i, n);
         tud_cdc_write_flush();
         i += n2;
+
+        if (i < len) {
+            if (n2 > 0) {
+                // reset the timeout each time we successfully write to the FIFO
+                last_write = mp_hal_ticks_ms();
+            } else {
+                if ((mp_uint_t)(mp_hal_ticks_ms() - last_write) >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+                    break; // Timeout
+                }
+
+                if (tud_cdc_connected()) {
+                    // If we know we're connected then we can wait for host to make
+                    // more space
+                    mp_event_wait_ms(1);
+                }
+            }
+
+            // Always explicitly run the USB stack as the scheduler may be
+            // locked (eg we are in an interrupt handler), while there is data
+            // or a state change pending.
+            mp_usbd_task();
+        }
     }
     return i;
 }

From 371db85c8e9c29ac66d772e051c7a167782e8407 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 6 Aug 2025 17:26:21 +1000
Subject: [PATCH 2774/3129] esp32/machine_uart: Convert machine.UART objects to
 static instances.

Makes machine.UART objects static instances (similar to other ports), adds
machine_uart_deinit_all() function for cleanup on soft reset.

- Fixes the case where the OS-level uart_event_task is leaked
  (along with 2KB of heap) when a UART object is garbage collected
  (including after a soft reset).

- Fixes hard fault if a previous UART irq() fires after the UART object is
  garbage collected (including after a soft reset), but before any new UART
  object is instantiated for the same UART number.

- Constructing multiple UART objects for the same UART now returns the
  same instance multiple times, not different instances.

- Was also able to streamline deinit/init to only install the driver once,
  rather than install-with-defaults/uninstall/reinstall.

Alternative would be to add a finaliser, but this is more consistent
with how most other UART objects are implemented.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_uart.c | 222 ++++++++++++++++++++++---------------
 ports/esp32/main.c         |   3 +
 ports/esp32/modmachine.h   |   1 +
 3 files changed, 136 insertions(+), 90 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index c4dab2cae5c81..55987c9b62768 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -68,6 +68,9 @@ enum {
     RXIDLE_ALERT,
 };
 
+// RXIDLE irq feature uses this machine.Timer id
+#define RXIDLE_TIMER_IDX 0
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uart_port_t uart_num;
@@ -96,6 +99,14 @@ typedef struct _machine_uart_obj_t {
 
 static const char *_parity_name[] = {"None", "1", "0"};
 
+static bool uart_is_repl(uart_port_t uart_num) {
+    #if MICROPY_HW_ENABLE_UART_REPL
+    return uart_num == MICROPY_HW_UART_REPL;
+    #else
+    return false;
+    #endif
+}
+
 /******************************************************************************/
 // MicroPython bindings for UART
 
@@ -245,13 +256,67 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     // wait for all data to be transmitted before changing settings
     uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000));
 
+    // If UART is being freshly initialised then restore object defaults
+    if (!uart_is_driver_installed(self->uart_num)) {
+        self->bits = 8;
+        self->parity = 0;
+        self->stop = 1;
+        self->rts = UART_PIN_NO_CHANGE;
+        self->cts = UART_PIN_NO_CHANGE;
+        self->txbuf = 256;
+        self->rxbuf = 256; // IDF minimum
+        self->timeout = 0;
+        self->timeout_char = 0;
+        self->invert = 0;
+        self->flowcontrol = 0;
+        self->uart_event_task = NULL;
+        self->uart_queue = NULL;
+        self->rxidle_state = RXIDLE_INACTIVE;
+
+        // Set the MicroPython default UART pins. These may be overwritten with
+        // caller-provided pins, below
+        switch (self->uart_num) {
+            case UART_NUM_0:
+                self->rx = UART_PIN_NO_CHANGE; // GPIO 3
+                self->tx = UART_PIN_NO_CHANGE; // GPIO 1
+                break;
+            case UART_NUM_1:
+                self->rx = 9;
+                self->tx = 10;
+                break;
+            #if SOC_UART_HP_NUM > 2
+            case UART_NUM_2:
+                self->rx = 16;
+                self->tx = 17;
+                break;
+            #endif
+            #if SOC_UART_LP_NUM >= 1
+            case LP_UART_NUM_0:
+                self->rx = 4;
+                self->tx = 5;
+                break;
+            #endif
+            case UART_NUM_MAX:
+                assert(0); // Range is checked in mp_machine_uart_make_new, value should be unreachable
+        }
+    }
+
+    // Default driver parameters, should correspond to values set above
+    uart_config_t uartcfg = {
+        .baud_rate = 115200,
+        .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,
+        .source_clk = UART_SOURCE_CLK,
+    };
+
+
     if ((args[ARG_txbuf].u_int >= 0 && args[ARG_txbuf].u_int != self->txbuf) || (args[ARG_rxbuf].u_int >= 0 && args[ARG_rxbuf].u_int != self->rxbuf)) {
-        // must reinitialise driver to change the tx/rx buffer size
-        #if MICROPY_HW_ENABLE_UART_REPL
-        if (self->uart_num == MICROPY_HW_UART_REPL) {
-            mp_raise_ValueError(MP_ERROR_TEXT("UART buffer size is fixed"));
+        if (uart_is_repl(self->uart_num)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("REPL UART buffer size is fixed"));
         }
-        #endif
 
         if (args[ARG_txbuf].u_int >= 0) {
             self->txbuf = args[ARG_txbuf].u_int;
@@ -259,18 +324,26 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         if (args[ARG_rxbuf].u_int >= 0) {
             self->rxbuf = args[ARG_rxbuf].u_int;
         }
-        uart_config_t uartcfg = {
-            .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
-            .rx_flow_ctrl_thresh = 0,
-            .source_clk = UART_SOURCE_CLK,
-        };
-        uint32_t baudrate;
-        check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
-        uartcfg.baud_rate = baudrate;
-        check_esp_err(uart_get_word_length(self->uart_num, &uartcfg.data_bits));
-        check_esp_err(uart_get_parity(self->uart_num, &uartcfg.parity));
-        check_esp_err(uart_get_stop_bits(self->uart_num, &uartcfg.stop_bits));
-        mp_machine_uart_deinit(self);
+
+        // must reinitialise driver to change the tx/rx buffer size
+        if (uart_is_driver_installed(self->uart_num)) {
+            // Update uartcfg with the current uart parameters
+            uint32_t baudrate;
+            check_esp_err(uart_get_baudrate(self->uart_num, &baudrate));
+            uartcfg.baud_rate = baudrate;
+            check_esp_err(uart_get_word_length(self->uart_num, &uartcfg.data_bits));
+            check_esp_err(uart_get_parity(self->uart_num, &uartcfg.parity));
+            check_esp_err(uart_get_stop_bits(self->uart_num, &uartcfg.stop_bits));
+            // De-initialise the driver
+            mp_machine_uart_deinit(self);
+        }
+    }
+
+    if (!uart_is_repl(self->uart_num) && !uart_is_driver_installed(self->uart_num)) {
+        // install the driver if needed - could be uninstalled for multiple reasons:
+        // 1. First time initialising this UART
+        // 2. Has been temporarily de-initialised to change the buffer size
+        // 3. Python code called .deinit() and now .init()
         check_esp_err(uart_param_config(self->uart_num, &uartcfg));
         check_esp_err(uart_driver_install(self->uart_num, self->rxbuf, self->txbuf, UART_QUEUE_SIZE, &self->uart_queue, 0));
         if (self->mp_irq_obj != NULL && self->mp_irq_obj->handler != mp_const_none) {
@@ -399,6 +472,9 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     }
     uint8_t uart_fifo_len = UART_HW_FIFO_LEN(self->uart_num);
     check_esp_err(uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, uart_fifo_len - uart_fifo_len / 4));
+
+    // discard any input from previous configuration
+    check_esp_err(uart_flush_input(self->uart_num));
 }
 
 static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -409,73 +485,14 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     if (uart_num < 0 || uart_num >= UART_NUM_MAX) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) does not exist"), uart_num);
     }
+    _Static_assert(UART_NUM_MAX == SOC_UART_NUM, "SOC and driver constant should match");
 
-    // Defaults
-    uart_config_t uartcfg = {
-        .baud_rate = 115200,
-        .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,
-        .source_clk = UART_SOURCE_CLK,
-    };
-
-    // create instance
-    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;
-    self->stop = 1;
-    self->rts = UART_PIN_NO_CHANGE;
-    self->cts = UART_PIN_NO_CHANGE;
-    self->txbuf = 256;
-    self->rxbuf = 256; // IDF minimum
-    self->timeout = 0;
-    self->timeout_char = 0;
-    self->invert = 0;
-    self->flowcontrol = 0;
-    self->uart_event_task = NULL;
-    self->uart_queue = NULL;
-    self->rxidle_state = RXIDLE_INACTIVE;
-
-    switch (uart_num) {
-        case UART_NUM_0:
-            self->rx = UART_PIN_NO_CHANGE; // GPIO 3
-            self->tx = UART_PIN_NO_CHANGE; // GPIO 1
-            break;
-        case UART_NUM_1:
-            self->rx = 9;
-            self->tx = 10;
-            break;
-        #if SOC_UART_HP_NUM > 2
-        case UART_NUM_2:
-            self->rx = 16;
-            self->tx = 17;
-            break;
-        #endif
-        #if SOC_UART_LP_NUM >= 1
-        case LP_UART_NUM_0:
-            self->rx = 4;
-            self->tx = 5;
-        #endif
-
-    }
-
-    #if MICROPY_HW_ENABLE_UART_REPL
-    // Only reset the driver if it's not the REPL UART.
-    if (uart_num != MICROPY_HW_UART_REPL)
-    #endif
-    {
-        // Remove any existing configuration
-        check_esp_err(uart_driver_delete(self->uart_num));
-        self->uart_queue = NULL;
-
-        // init the peripheral
-        // Setup
-        check_esp_err(uart_param_config(self->uart_num, &uartcfg));
-
-        check_esp_err(uart_driver_install(uart_num, self->rxbuf, self->txbuf, UART_QUEUE_SIZE, &self->uart_queue, 0));
+    machine_uart_obj_t *self = MP_STATE_PORT(machine_uart_objs)[uart_num];
+    if (self == NULL) {
+        // Allocate a new UART object
+        self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
+        self->uart_num = uart_num;
+        // remaining fields are set from inside mp_machine_uart_init_helper()
     }
 
     mp_map_t kw_args;
@@ -485,6 +502,8 @@ static mp_obj_t mp_machine_uart_make_new(const mp_obj_type_t *type, size_t n_arg
     // Make sure pins are connected.
     check_esp_err(uart_set_pin(self->uart_num, self->tx, self->rx, self->rts, self->cts));
 
+    MP_STATE_PORT(machine_uart_objs)[uart_num] = self;
+
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -493,8 +512,31 @@ static void mp_machine_uart_deinit(machine_uart_obj_t *self) {
         vTaskDelete(self->uart_event_task);
         self->uart_event_task = NULL;
     }
-    check_esp_err(uart_driver_delete(self->uart_num));
-    self->uart_queue = NULL;
+    if (self->rxidle_timer != NULL) {
+        machine_timer_disable(self->rxidle_timer);
+        if (self->rxidle_state > RXIDLE_STANDBY) {
+            // Currently deinit(),init() sequence resumes any previously
+            // configured irqs, and we currently also rely on this when changing
+            // buffer size - so keep rxidle in standby if it was active
+            self->rxidle_state = RXIDLE_STANDBY;
+        }
+    }
+    // Only stop the ESP-IDF driver entirely if it's not the REPL,
+    // (if it's the REPL then it shouldn't have any ISR configured anyway.)
+    if (!uart_is_repl(self->uart_num)) {
+        check_esp_err(uart_driver_delete(self->uart_num));
+        self->uart_queue = NULL;
+    }
+}
+
+void machine_uart_deinit_all(void) {
+    for (int i = 0; i < UART_NUM_MAX; i++) {
+        machine_uart_obj_t *uart = MP_STATE_PORT(machine_uart_objs)[i];
+        if (uart) {
+            mp_machine_uart_deinit(uart);
+            MP_STATE_PORT(machine_uart_objs)[i] = NULL;
+        }
+    }
 }
 
 static mp_int_t mp_machine_uart_any(machine_uart_obj_t *self) {
@@ -574,11 +616,9 @@ static const mp_irq_methods_t uart_irq_methods = {
 };
 
 static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args, mp_arg_val_t *args) {
-    #if MICROPY_HW_ENABLE_UART_REPL
-    if (self->uart_num == MICROPY_HW_UART_REPL) {
-        mp_raise_ValueError(MP_ERROR_TEXT("UART does not support IRQs"));
+    if (uart_is_repl(self->uart_num)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("REPL UART does not support IRQs"));
     }
-    #endif
 
     if (self->mp_irq_obj == NULL) {
         self->mp_irq_trigger = 0;
@@ -605,7 +645,7 @@ static mp_irq_obj_t *mp_machine_uart_irq(machine_uart_obj_t *self, bool any_args
         }
         self->mp_irq_obj->ishard = false;
         self->mp_irq_trigger = trigger;
-        self->rxidle_timer = machine_timer_create(0);
+        self->rxidle_timer = machine_timer_create(RXIDLE_TIMER_IDX);
         uart_irq_configure_timer(self, trigger);
 
         // Start a task for handling events
@@ -700,3 +740,5 @@ static mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint
     }
     return ret;
 }
+
+MP_REGISTER_ROOT_POINTER(void *machine_uart_objs[SOC_UART_NUM]);
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 1523e07f916d6..bd5775bc6637d 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -180,6 +180,9 @@ void mp_task(void *pvParameter) {
     MP_STATE_PORT(espnow_singleton) = NULL;
     #endif
 
+    // Deinit uart before timers, as esp32 uart
+    // depends on a timer instance
+    machine_uart_deinit_all();
     machine_timer_deinit_all();
 
     #if MICROPY_PY_ESP32_PCNT
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 9a5e6a566eb83..12e0d680024a8 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -20,6 +20,7 @@ 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_uart_deinit_all(void);
 void machine_i2s_init0();
 
 #endif // MICROPY_INCLUDED_ESP32_MODMACHINE_H

From 1aaf6eddd82170209ca90586160ac265b9412229 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Aug 2025 17:40:55 +1000
Subject: [PATCH 2775/3129] tools/mpremote: Don't apply Espressif DTR/RTS quirk
 to TinyUSB CDC dev.

The DTR quirk workaround from dea949e86 is needed for the Espressif
Serial/JTAG device, but not for TinyUSB - in fact DTR must be set for
TinyUSB to correctly determine if the serial port is open (and leads to
issues with lost bytes otherwise).

See discussion in PR #17999.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/mpremote/mpremote/transport_serial.py | 36 +++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index e2490a7caf8be..a26183680cae8 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -36,11 +36,37 @@
 # as a command line tool and a library for interacting with devices.
 
 import ast, io, os, re, struct, sys, time
+import serial
+import serial.tools.list_ports
 from errno import EPERM
 from .console import VT_ENABLED
 from .transport import TransportError, TransportExecError, Transport
 
 VID_ESPRESSIF = 0x303A  # Espressif Incorporated
+PID_ESPRESSIF_SERIAL_JTAG = 0x1001  # Serial/JTAG peripheral of ESP32-S3,C3,C6
+
+
+def has_espressif_dtr_quirk(devicename):
+    """ESP8266 and ESP32 dev boards use the DTR and RTS lines to trigger reset &
+    reset into bootloader mode. This can causes spurious reset issues on Windows.
+
+    Apply the quirk to any USB/Serial chip on Windows that isn't using the
+    Microsoft CDC-ACM driver, or to the integrated Espressif Serial/JTAG device.
+
+    Don't apply it to Espressif boards running TinyUSB, as TinyUSB uses DTR
+    to determine if the CDC port is open (and there's no spurious reset issue).
+    """
+    portinfo = list(serial.tools.list_ports.grep(devicename))  # type: ignore
+    if not portinfo:
+        return False
+
+    def port_attr(name):
+        return getattr(portinfo[0], name, None)
+
+    return (port_attr("vid"), port_attr("pid")) == (
+        VID_ESPRESSIF,
+        PID_ESPRESSIF_SERIAL_JTAG,
+    ) or port_attr("manufacturer") != "Microsoft"
 
 
 class SerialTransport(Transport):
@@ -52,9 +78,6 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None
         self.device_name = device
         self.mounted = False
 
-        import serial
-        import serial.tools.list_ports
-
         # Set options, and exclusive if pyserial supports it
         serial_kwargs = {
             "baudrate": baudrate,
@@ -72,12 +95,7 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None
                 elif os.name == "nt":
                     self.serial = serial.Serial(**serial_kwargs)
                     self.serial.port = device
-                    portinfo = list(serial.tools.list_ports.grep(device))  # type: ignore
-                    if portinfo and (
-                        getattr(portinfo[0], "vid", 0) == VID_ESPRESSIF
-                        or getattr(portinfo[0], "manufacturer", "") != "Microsoft"
-                    ):
-                        # ESP8266/ESP32 boards use RTS/CTS for flashing and boot mode selection.
+                    if has_espressif_dtr_quirk(device):
                         # DTR False: to avoid using the reset button will hang the MCU in bootloader mode
                         # RTS False: to prevent pulses on rts on serial.close() that would POWERON_RESET an ESPxx
                         self.serial.dtr = False  # DTR False = gpio0 High = Normal boot

From 9e89c752cb911ec9b4d3dd4d2edd6714e7ad09aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 10 Jul 2025 18:57:55 +0200
Subject: [PATCH 2776/3129] py/makeversionhdr.py: Always abbreviate Git hashes
 to same length.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Git hash is embedded in the version number.  The hash is abbreviated by
Git.  This commit changes the length of the Git hash abbreviation to a
fixed number, so that the length of the version string no longer varies
based on external factors (it can still vary, but will now be at least 10
characters).

This change is made because builds of the same MicroPython commit on
multiple machines were sometimes giving a version string with different
lengths, eg due to commits on other local branches having a clashing
abbreviated hash.  This change may also help the code size report to be
more consistent, because it will less often be impacted by random changes
in the version string length, at the cost of always being a few bytes
longer.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 py/makeversionhdr.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 406a061a0948a..5c73501b3bb9c 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -31,7 +31,16 @@ def get_version_info_from_git(repo_path):
     # Note: git describe doesn't work if no tag is available
     try:
         git_tag = subprocess.check_output(
-            ["git", "describe", "--tags", "--dirty", "--always", "--match", "v[1-9].*"],
+            [
+                "git",
+                "describe",
+                "--tags",
+                "--dirty",
+                "--always",
+                "--match",
+                "v[1-9].*",
+                "--abbrev=10",
+            ],
             cwd=repo_path,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

From a21d3f19753b02d452ece551d728944c70d5d572 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Fri, 29 Aug 2025 01:27:04 -0400
Subject: [PATCH 2777/3129] py/obj: Update with_finaliser version to match
 mp_obj_malloc_var.

Cleans up 24234937747e6d7fd920d21358fb26b826398e1a, and fixes builds
that include LFS but not MICROPY_ENABLE_FINALISER.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 extmod/vfs_lfsx_file.c | 4 ++--
 py/obj.h               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index ab5cce50088b9..56daa53e06869 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -90,9 +90,9 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
     }
 
     #if LFS_BUILD_VERSION == 1
-    MP_OBJ_VFS_LFSx_FILE *o = mp_obj_malloc_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, uint8_t, self->lfs.cfg->prog_size, type);
+    MP_OBJ_VFS_LFSx_FILE *o = mp_obj_malloc_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, file_buffer, uint8_t, self->lfs.cfg->prog_size, type);
     #else
-    MP_OBJ_VFS_LFSx_FILE *o = mp_obj_malloc_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, uint8_t, self->lfs.cfg->cache_size, type);
+    MP_OBJ_VFS_LFSx_FILE *o = mp_obj_malloc_var_with_finaliser(MP_OBJ_VFS_LFSx_FILE, file_buffer, uint8_t, self->lfs.cfg->cache_size, type);
     #endif
     o->vfs = self;
     #if !MICROPY_GC_CONSERVATIVE_CLEAR
diff --git a/py/obj.h b/py/obj.h
index de740bf4ccf4d..72def663d8d39 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -947,11 +947,11 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 // Object allocation macros for allocating objects that have a finaliser.
 #if MICROPY_ENABLE_FINALISER
 #define mp_obj_malloc_with_finaliser(struct_type, obj_type) ((struct_type *)mp_obj_malloc_with_finaliser_helper(sizeof(struct_type), obj_type))
-#define mp_obj_malloc_var_with_finaliser(struct_type, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_with_finaliser_helper(sizeof(struct_type) + sizeof(var_type) * (var_num), obj_type))
+#define mp_obj_malloc_var_with_finaliser(struct_type, var_field, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_with_finaliser_helper(offsetof(struct_type, var_field) + sizeof(var_type) * (var_num), obj_type))
 void *mp_obj_malloc_with_finaliser_helper(size_t num_bytes, const mp_obj_type_t *type);
 #else
 #define mp_obj_malloc_with_finaliser(struct_type, obj_type) mp_obj_malloc(struct_type, obj_type)
-#define mp_obj_malloc_var_with_finaliser(struct_type, var_type, var_num, obj_type) mp_obj_malloc_var(struct_type, var_type, var_num, obj_type)
+#define mp_obj_malloc_var_with_finaliser(struct_type, var_field, var_type, var_num, obj_type) mp_obj_malloc_var(struct_type, var_field, var_type, var_num, obj_type)
 #endif
 
 // These macros are derived from more primitive ones and are used to

From 1d90577b7e1fa5c4f452471378dd887152a4825c Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Sat, 30 Aug 2025 14:37:35 -0400
Subject: [PATCH 2778/3129] py/gc: Clean up usage of
 GC_ALLOC_FLAG_HAS_FINALISER flag.

The calls signature for gc_malloc was changed in
5ed578e5b48730606536ded9a711223ae9a70262, without cleaning up existing
code on the rationale that the previous bool is automatically converted
to an int with the same meaning.

This commit goes back and cleans up existing invocations to make their
behavior more readable in a modern context.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 ports/esp8266/posix_helpers.c | 2 +-
 ports/unix/coverage.c         | 2 +-
 py/malloc.c                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp8266/posix_helpers.c b/ports/esp8266/posix_helpers.c
index b72c4ff9d6671..11c9dc36dbdf9 100644
--- a/ports/esp8266/posix_helpers.c
+++ b/ports/esp8266/posix_helpers.c
@@ -33,7 +33,7 @@
 // Functions for external libs like axTLS, BerkeleyDB, etc.
 
 void *malloc(size_t size) {
-    void *p = gc_alloc(size, false);
+    void *p = gc_alloc(size, 0);
     if (p == NULL) {
         // POSIX requires ENOMEM to be set in case of error
         errno = ENOMEM;
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index b7c3d2c25ef6e..e47558689d154 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -270,7 +270,7 @@ static mp_obj_t extra_coverage(void) {
         gc_unlock();
 
         // using gc_realloc to resize to 0, which means free the memory
-        void *p = gc_alloc(4, false);
+        void *p = gc_alloc(4, 0);
         mp_printf(&mp_plat_print, "%p\n", gc_realloc(p, 0, false));
 
         // calling gc_nbytes with a non-heap pointer
diff --git a/py/malloc.c b/py/malloc.c
index 05daeb35d098a..5135dc26bd332 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -56,8 +56,8 @@
 #undef malloc
 #undef free
 #undef realloc
-#define malloc(b) gc_alloc((b), false)
-#define malloc_with_finaliser(b) gc_alloc((b), true)
+#define malloc(b) gc_alloc((b), 0)
+#define malloc_with_finaliser(b) gc_alloc((b), GC_ALLOC_FLAG_HAS_FINALISER)
 #define free gc_free
 #define realloc(ptr, n) gc_realloc(ptr, n, true)
 #define realloc_ext(ptr, n, mv) gc_realloc(ptr, n, mv)

From 9728538c3ae81c3e9932126e77ba469e36b30863 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 30 Aug 2025 10:51:53 -0500
Subject: [PATCH 2779/3129] py/compile: Throw SyntaxError instead of asserting.

This condition corresponds to invalid asm code like
```
@micropython.asm_rv32
def l():
    a=di(a2, a2, -1)
```
and possibly other forms where nodes[0] is not a STRUCT.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/compile.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/py/compile.c b/py/compile.c
index 7a1151bcd66f0..945ee2b2dee85 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3277,7 +3277,9 @@ static void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
         }
 
         // check structure of parse node
-        assert(MP_PARSE_NODE_IS_STRUCT(pns2->nodes[0]));
+        if (!MP_PARSE_NODE_IS_STRUCT(pns2->nodes[0])) {
+            goto not_an_instruction;
+        }
         if (!MP_PARSE_NODE_IS_NULL(pns2->nodes[1])) {
             goto not_an_instruction;
         }

From 7630ef0240a543883095635f5b43a81a11f79e20 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 10 Sep 2025 07:45:50 -0500
Subject: [PATCH 2780/3129] tests: Add a test for invalid syntax in
 @micropython.asm.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tests/inlineasm/thumb/asmerrors.py     | 4 ++++
 tests/inlineasm/thumb/asmerrors.py.exp | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 tests/inlineasm/thumb/asmerrors.py
 create mode 100644 tests/inlineasm/thumb/asmerrors.py.exp

diff --git a/tests/inlineasm/thumb/asmerrors.py b/tests/inlineasm/thumb/asmerrors.py
new file mode 100644
index 0000000000000..a26f9322540fd
--- /dev/null
+++ b/tests/inlineasm/thumb/asmerrors.py
@@ -0,0 +1,4 @@
+try:
+    exec("@micropython.asm_thumb\ndef l():\n    a = di(a2, a2, -1)")
+except SyntaxError as e:
+    print(e)
diff --git a/tests/inlineasm/thumb/asmerrors.py.exp b/tests/inlineasm/thumb/asmerrors.py.exp
new file mode 100644
index 0000000000000..7590f171e5184
--- /dev/null
+++ b/tests/inlineasm/thumb/asmerrors.py.exp
@@ -0,0 +1 @@
+expecting an assembler instruction

From 8e6cd4b58e338dd5c3aab7503d6cfe6260d02da5 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 7 Apr 2025 11:29:29 -0400
Subject: [PATCH 2781/3129] tests/cpydiff: Document lack of OSError errno
 subtype mapping.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/cpydiff/types_oserror_errnomap.py | 48 +++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 tests/cpydiff/types_oserror_errnomap.py

diff --git a/tests/cpydiff/types_oserror_errnomap.py b/tests/cpydiff/types_oserror_errnomap.py
new file mode 100644
index 0000000000000..6627bd2af4ab7
--- /dev/null
+++ b/tests/cpydiff/types_oserror_errnomap.py
@@ -0,0 +1,48 @@
+"""
+categories: Types,OSError
+description: OSError constructor returns a plain OSError for all errno values, rather than a relevant subtype.
+cause: MicroPython does not include the CPython-standard OSError subclasses.
+workaround: Catch OSError and use its errno attribute to discriminate the cause.
+"""
+
+import errno
+
+errno_list = [  # i.e. the set implemented by micropython
+    errno.EPERM,
+    errno.ENOENT,
+    errno.EIO,
+    errno.EBADF,
+    errno.EAGAIN,
+    errno.ENOMEM,
+    errno.EACCES,
+    errno.EEXIST,
+    errno.ENODEV,
+    errno.EISDIR,
+    errno.EINVAL,
+    errno.EOPNOTSUPP,
+    errno.EADDRINUSE,
+    errno.ECONNABORTED,
+    errno.ECONNRESET,
+    errno.ENOBUFS,
+    errno.ENOTCONN,
+    errno.ETIMEDOUT,
+    errno.ECONNREFUSED,
+    errno.EHOSTUNREACH,
+    errno.EALREADY,
+    errno.EINPROGRESS,
+]
+
+
+def errno_output_type(n):
+    try:
+        raise OSError(n, "")
+    except OSError as e:
+        return f"{type(e).__name__}"
+    except Exception as e:
+        return f"non-OSError {type(e).__name__}"
+    else:
+        return "no error"
+
+
+for n in errno_list:
+    print(errno.errorcode[n], "=", errno_output_type(n))

From 52d25928d57ed37d8ab675a5092fbe13bdae69a4 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Mon, 7 Apr 2025 11:11:58 -0400
Subject: [PATCH 2782/3129] tests/cpydiff: Document ENOTSUP vs EOPNOTSUPP.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/cpydiff/modules_errno_enotsup.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/cpydiff/modules_errno_enotsup.py

diff --git a/tests/cpydiff/modules_errno_enotsup.py b/tests/cpydiff/modules_errno_enotsup.py
new file mode 100644
index 0000000000000..80e5ad9d03220
--- /dev/null
+++ b/tests/cpydiff/modules_errno_enotsup.py
@@ -0,0 +1,10 @@
+"""
+categories: Modules,errno
+description: MicroPython does not include ``ENOTSUP`` as a name for errno 95.
+cause: MicroPython does not implement the ``ENOTSUP`` canonical alias for ``EOPNOTSUPP`` added in CPython 3.2.
+workaround: Use ``errno.EOPNOTSUPP`` in place of ``errno.ENOTSUP``.
+"""
+
+import errno
+
+print(f"{errno.errorcode[errno.EOPNOTSUPP]=!s}")

From 2327972947d6f5119ec13a95139fff090351c132 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Wed, 19 Feb 2025 12:10:29 -0500
Subject: [PATCH 2783/3129] tests/cpydiff: Test for PEP487 __init_subclass__.

This commit documents and verifies the current absence of
`__init_subclass__` functionality, in anticipation of a possible future
PEP487 'metaclasses lite' patch.

The main `core_class_initsubclass.py` test verifies if the method is
automatically called, while the other three verify other orthogonal
properties it should have: if the method is an implicit classmethod; if
MicroPython supplies the base case for the usual recursive function body
the PEP encourages; and if kwargs inheritance parameters work correctly.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/cpydiff/core_class_initsubclass.py      | 21 +++++++++++++
 ...core_class_initsubclass_autoclassmethod.py | 31 +++++++++++++++++++
 .../cpydiff/core_class_initsubclass_kwargs.py | 22 +++++++++++++
 .../cpydiff/core_class_initsubclass_super.py  | 22 +++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 tests/cpydiff/core_class_initsubclass.py
 create mode 100644 tests/cpydiff/core_class_initsubclass_autoclassmethod.py
 create mode 100644 tests/cpydiff/core_class_initsubclass_kwargs.py
 create mode 100644 tests/cpydiff/core_class_initsubclass_super.py

diff --git a/tests/cpydiff/core_class_initsubclass.py b/tests/cpydiff/core_class_initsubclass.py
new file mode 100644
index 0000000000000..8683271dcb0f2
--- /dev/null
+++ b/tests/cpydiff/core_class_initsubclass.py
@@ -0,0 +1,21 @@
+"""
+categories: Core,Classes
+description: ``__init_subclass__`` isn't automatically called.
+cause: MicroPython does not currently implement PEP 487.
+workaround: Manually call ``__init_subclass__`` after class creation if needed. e.g.::
+
+    class A(Base):
+        pass
+    A.__init_subclass__()
+
+"""
+
+
+class Base:
+    @classmethod
+    def __init_subclass__(cls):
+        print(f"Base.__init_subclass__({cls.__name__})")
+
+
+class A(Base):
+    pass
diff --git a/tests/cpydiff/core_class_initsubclass_autoclassmethod.py b/tests/cpydiff/core_class_initsubclass_autoclassmethod.py
new file mode 100644
index 0000000000000..b2f7628976c92
--- /dev/null
+++ b/tests/cpydiff/core_class_initsubclass_autoclassmethod.py
@@ -0,0 +1,31 @@
+"""
+categories: Core,Classes
+description: ``__init_subclass__`` isn't an implicit classmethod.
+cause: MicroPython does not currently implement PEP 487. ``__init_subclass__`` is not currently in the list of special-cased class/static methods.
+workaround: Decorate declarations of ``__init_subclass__`` with ``@classmethod``.
+"""
+
+
+def regularize_spelling(text, prefix="bound_"):
+    # for regularizing across the CPython "method" vs MicroPython "bound_method" spelling for the type of a bound classmethod
+    if text.startswith(prefix):
+        return text[len(prefix) :]
+    return text
+
+
+class A:
+    def __init_subclass__(cls):
+        pass
+
+    @classmethod
+    def manual_decorated(cls):
+        pass
+
+
+a = type(A.__init_subclass__).__name__
+b = type(A.manual_decorated).__name__
+
+print(regularize_spelling(a))
+print(regularize_spelling(b))
+if a != b:
+    print("FAIL")
diff --git a/tests/cpydiff/core_class_initsubclass_kwargs.py b/tests/cpydiff/core_class_initsubclass_kwargs.py
new file mode 100644
index 0000000000000..ed5157afeaede
--- /dev/null
+++ b/tests/cpydiff/core_class_initsubclass_kwargs.py
@@ -0,0 +1,22 @@
+"""
+categories: Core,Classes
+description: MicroPython doesn't support parameterized ``__init_subclass__`` class customization.
+cause: MicroPython does not currently implement PEP 487. The MicroPython syntax tree does not include a kwargs node after the class inheritance list.
+workaround: Use class variables or another mechanism to specify base-class customizations.
+"""
+
+
+class Base:
+    @classmethod
+    def __init_subclass__(cls, arg=None, **kwargs):
+        cls.init_subclass_was_called = True
+        print(f"Base.__init_subclass__({cls.__name__}, {arg=!r}, {kwargs=!r})")
+
+
+class A(Base, arg="arg"):
+    pass
+
+
+# Regularize across MicroPython not automatically calling __init_subclass__ either.
+if not getattr(A, "init_subclass_was_called", False):
+    A.__init_subclass__()
diff --git a/tests/cpydiff/core_class_initsubclass_super.py b/tests/cpydiff/core_class_initsubclass_super.py
new file mode 100644
index 0000000000000..d18671a74bf8e
--- /dev/null
+++ b/tests/cpydiff/core_class_initsubclass_super.py
@@ -0,0 +1,22 @@
+"""
+categories: Core,Classes
+description: ``__init_subclass__`` can't be defined a cooperatively-recursive way.
+cause: MicroPython does not currently implement PEP 487. The base object type does not have an ``__init_subclass__`` implementation.
+workaround: Omit the recursive ``__init_subclass__`` call unless it's known that the grandparent also defines it.
+"""
+
+
+class Base:
+    @classmethod
+    def __init_subclass__(cls, **kwargs):
+        cls.init_subclass_was_called = True
+        super().__init_subclass__(**kwargs)
+
+
+class A(Base):
+    pass
+
+
+# Regularize across MicroPython not automatically calling __init_subclass__ either.
+if not getattr(A, "init_subclass_was_called", False):
+    A.__init_subclass__()

From c224e976f733657058b2c10270470edb9c0657dc Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 12 Jun 2024 07:58:02 +0200
Subject: [PATCH 2784/3129] extmod/modplatform: Expose CPU features/extensions.

This adds the ability to expose CPU-specific features/extensions to
scripts when the `platform` module is compiled in, by implementing
`platform.processor()`.   Right now this is only available on
bare-metal RV32 and RV64.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/library/platform.rst |  8 ++++++++
 extmod/modplatform.c      | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/docs/library/platform.rst b/docs/library/platform.rst
index c091477d84cb1..c19ef0f5df524 100644
--- a/docs/library/platform.rst
+++ b/docs/library/platform.rst
@@ -36,3 +36,11 @@ Functions
    Returns a tuple of strings *(lib, version)*, where *lib* is the name of the
    libc that MicroPython is linked to, and *version* the corresponding version
    of this libc.
+
+.. function:: processor()
+
+   Returns a string with a detailed name of the processor, if one is available.
+   If no name for the processor is known, it will return an empty string
+   instead.
+
+   This is currently available only on RISC-V targets (both 32 and 64 bits).
diff --git a/extmod/modplatform.c b/extmod/modplatform.c
index c6d4d31b97ec1..e1f5476c3b3aa 100644
--- a/extmod/modplatform.c
+++ b/extmod/modplatform.c
@@ -61,11 +61,49 @@ static mp_obj_t platform_libc_ver(size_t n_args, const mp_obj_t *pos_args, mp_ma
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(platform_libc_ver_obj, 0, platform_libc_ver);
 
+#ifdef __riscv
+static mp_obj_t platform_processor(void) {
+    #if (__riscv_xlen <= 64) && !defined(__linux__)
+    uintptr_t misa_csr = 0;
+
+    // Load the MISA CSR directly.
+    __asm volatile (
+        "csrr %0, misa \n"
+        : "+r" (misa_csr)
+        :
+        :
+        );
+
+    char processor_buffer[31] = { // "RV32"/"RV64" + up to 26 chars.
+        #if (__riscv_xlen < 64)
+        "RV32"
+        #else
+        "RV64"
+        #endif
+    };
+    mp_uint_t offset = 4;
+    for (mp_uint_t bit = 0; bit < 26; bit++) {
+        if (misa_csr & (1U << bit)) {
+            processor_buffer[offset++] = 'A' + bit;
+        }
+    }
+
+    return mp_obj_new_str(processor_buffer, offset);
+    #else
+    return MP_OBJ_NEW_QSTR(MP_QSTR_);
+    #endif
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(platform_processor_obj, platform_processor);
+#endif
+
 static const mp_rom_map_elem_t modplatform_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_platform) },
     { 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) },
+    #ifdef __riscv
+    { MP_ROM_QSTR(MP_QSTR_processor), MP_ROM_PTR(&platform_processor_obj) },
+    #endif
 };
 
 static MP_DEFINE_CONST_DICT(modplatform_globals, modplatform_globals_table);

From 55ecaf14a0154e449fbbbaa19f26f55d81d5ee12 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 15 Aug 2025 08:22:49 +0200
Subject: [PATCH 2785/3129] extmod/machine_uart: Return from read()/write() at
 the first timeout.

Do not try to read/write again after timeout happened once.

Fixes issue #17611.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 extmod/machine_uart.c       | 4 ++--
 ports/cc3200/mods/pybuart.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extmod/machine_uart.c b/extmod/machine_uart.c
index b62f5a49c465f..77d5ec01f4a8e 100644
--- a/extmod/machine_uart.c
+++ b/extmod/machine_uart.c
@@ -140,10 +140,10 @@ static const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_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_read), MP_ROM_PTR(&mp_stream_read1_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_write), MP_ROM_PTR(&mp_stream_write1_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) },
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index eb2b3754f7473..5b71f02e29f87 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -579,13 +579,13 @@ static const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     { 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) },
+    { MP_ROM_QSTR(MP_QSTR_read),        MP_ROM_PTR(&mp_stream_read1_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_write),       MP_ROM_PTR(&mp_stream_write1_obj) },
     { MP_ROM_QSTR(MP_QSTR_flush),       MP_ROM_PTR(&mp_stream_flush_obj) },
 
     // class constants

From c50f9cbb4244a4aef2a77098939af3b7eb7410b3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 16 Aug 2025 21:26:06 +0200
Subject: [PATCH 2786/3129] esp32/machine_uart: Handle properly the
 timeout_char argument.

Before, it was ignored.  Tested with ESP32, ESP32S3, ESP32C6.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_uart.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 55987c9b62768..36b5bcb0ff92e 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -668,19 +668,18 @@ static mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t
         return 0;
     }
 
-    TickType_t time_to_wait;
-    if (self->timeout == 0) {
-        time_to_wait = 0;
-    } else {
-        time_to_wait = pdMS_TO_TICKS(self->timeout);
-    }
+    TickType_t time_to_wait = self->timeout > 0 ? pdMS_TO_TICKS(self->timeout) : 0;
 
-    bool release_gil = time_to_wait > 0;
+    bool release_gil = (self->timeout + self->timeout_char) > 0;
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }
 
-    int bytes_read = uart_read_bytes(self->uart_num, buf_in, size, time_to_wait);
+    int bytes_read = uart_read_bytes(self->uart_num, buf_in, 1, time_to_wait);
+    if (size > 1 && bytes_read != 0) {
+        time_to_wait = self->timeout_char > 0 ? pdMS_TO_TICKS(self->timeout_char) : 0;
+        bytes_read += uart_read_bytes(self->uart_num, buf_in + 1, size - 1, time_to_wait);
+    }
 
     if (release_gil) {
         MP_THREAD_GIL_ENTER();

From 66fb82e44e0beecb64225189ec8fb788b2076fb4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 16 Aug 2025 14:43:37 +0200
Subject: [PATCH 2787/3129] py/stream: Add a stream.readinto1() method for
 machine.UART.

Avoiding the double timeout when used with the UART class.
`stream.readinto1()` returns after the first timeout.

Fixes issue #17611.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 extmod/machine_uart.c       |  2 +-
 ports/cc3200/mods/pybuart.c |  2 +-
 py/stream.c                 | 13 +++++++++++--
 py/stream.h                 |  1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/extmod/machine_uart.c b/extmod/machine_uart.c
index 77d5ec01f4a8e..c7e761ccdb6fb 100644
--- a/extmod/machine_uart.c
+++ b/extmod/machine_uart.c
@@ -142,7 +142,7 @@ static const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read1_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_readinto), MP_ROM_PTR(&mp_stream_readinto1_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write1_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 5b71f02e29f87..273b945830aaf 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -583,7 +583,7 @@ static const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     /// \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) },
+    { MP_ROM_QSTR(MP_QSTR_readinto),    MP_ROM_PTR(&mp_stream_readinto1_obj) },
     /// \method write(buf)
     { MP_ROM_QSTR(MP_QSTR_write),       MP_ROM_PTR(&mp_stream_write1_obj) },
     { MP_ROM_QSTR(MP_QSTR_flush),       MP_ROM_PTR(&mp_stream_flush_obj) },
diff --git a/py/stream.c b/py/stream.c
index d7a8881e1a32d..e41fbdd5da907 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -287,7 +287,7 @@ static mp_obj_t stream_write1_method(mp_obj_t self_in, mp_obj_t arg) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_stream_write1_obj, stream_write1_method);
 
-static mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_readinto_generic(size_t n_args, const mp_obj_t *args, byte flags) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
 
@@ -303,7 +303,7 @@ static mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
     }
 
     int error;
-    mp_uint_t out_sz = mp_stream_read_exactly(args[0], bufinfo.buf, len, &error);
+    mp_uint_t out_sz = mp_stream_rw(args[0], bufinfo.buf, len, &error, flags);
     if (error != 0) {
         if (mp_is_nonblocking_error(error)) {
             return mp_const_none;
@@ -313,8 +313,17 @@ static mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
         return MP_OBJ_NEW_SMALL_INT(out_sz);
     }
 }
+
+static mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
+    return stream_readinto_generic(n_args, args, MP_STREAM_RW_READ);
+}
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto_obj, 2, 3, stream_readinto);
 
+static mp_obj_t stream_readinto1(size_t n_args, const mp_obj_t *args) {
+    return stream_readinto_generic(n_args, args, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto1_obj, 2, 3, stream_readinto1);
+
 static mp_obj_t stream_readall(mp_obj_t self_in) {
     const mp_stream_p_t *stream_p = mp_get_stream(self_in);
 
diff --git a/py/stream.h b/py/stream.h
index 7c4d38afa9b67..c3606e8ecedb8 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -79,6 +79,7 @@ typedef struct _mp_stream_p_t {
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_read_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_read1_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto1_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_unbuffered_readline_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_stream_unbuffered_readlines_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write_obj);

From e453d9d9f14ec5eabd1077d32ed8f293faeefb13 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 8 Sep 2025 17:09:12 +0200
Subject: [PATCH 2788/3129] py/stream: Support additional arguments for
 mp_stream_write1_obj.

As suggested by @dpgeorge adding a `stream_write_generic()` function.

Tested the different write timeouts with a RP2 using flow control.  Tested
support of the additional arguments of `uart.write()`.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 py/stream.c | 16 +++++++++-------
 py/stream.h |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/py/stream.c b/py/stream.c
index e41fbdd5da907..008c968452742 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -261,7 +261,7 @@ void mp_stream_write_adaptor(void *self, const char *buf, size_t len) {
     mp_stream_write(MP_OBJ_FROM_PTR(self), buf, len, MP_STREAM_RW_WRITE);
 }
 
-static mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t stream_write_generic(size_t n_args, const mp_obj_t *args, byte flags) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
     size_t max_len = (size_t)-1;
@@ -276,16 +276,18 @@ static mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
         }
     }
     bufinfo.len -= off;
-    return mp_stream_write(args[0], (byte *)bufinfo.buf + off, MIN(bufinfo.len, max_len), MP_STREAM_RW_WRITE);
+    return mp_stream_write(args[0], (byte *)bufinfo.buf + off, MIN(bufinfo.len, max_len), flags);
+}
+
+static mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
+    return stream_write_generic(n_args, args, MP_STREAM_RW_WRITE);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write_obj, 2, 4, stream_write_method);
 
-static mp_obj_t stream_write1_method(mp_obj_t self_in, mp_obj_t arg) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
-    return mp_stream_write(self_in, bufinfo.buf, bufinfo.len, MP_STREAM_RW_WRITE | MP_STREAM_RW_ONCE);
+static mp_obj_t stream_write1_method(size_t n_args, const mp_obj_t *args) {
+    return stream_write_generic(n_args, args, MP_STREAM_RW_WRITE | MP_STREAM_RW_ONCE);
 }
-MP_DEFINE_CONST_FUN_OBJ_2(mp_stream_write1_obj, stream_write1_method);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write1_obj, 2, 4, stream_write1_method);
 
 static mp_obj_t stream_readinto_generic(size_t n_args, const mp_obj_t *args, byte flags) {
     mp_buffer_info_t bufinfo;
diff --git a/py/stream.h b/py/stream.h
index c3606e8ecedb8..5a3462d5a3d08 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -83,7 +83,7 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto1_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_unbuffered_readline_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_stream_unbuffered_readlines_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(mp_stream_write1_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write1_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_stream_close_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream___exit___obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_seek_obj);

From d441788975a6dfb277ad9a3d54d651ae48817d16 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Jul 2025 23:09:49 +1000
Subject: [PATCH 2789/3129] esp8266/main: Use new cstack API and add a stack
 margin of 64 bytes.

The margin of 64 bytes is needed to get `micropython/extreme_exc.py` to
pass when run via-mpy.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/main.c         | 4 +---
 ports/esp8266/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index da712fce9be15..fb6cda3798479 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -31,7 +31,6 @@
 #include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
-#include "py/stackctrl.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/gc.h"
@@ -108,8 +107,7 @@ static void print_reset_info(void) {
 #endif
 
 static void mp_reset(void) {
-    mp_stack_set_top((void *)0x40000000);
-    mp_stack_set_limit(8192);
+    mp_cstack_init_with_top((void *)0x40000000, 8192);
     mp_hal_init();
     gc_init(heap, heap + sizeof(heap));
     mp_init();
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 0321de45d7f22..17c3ff4417608 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -52,6 +52,7 @@
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT  (64)
 #define MICROPY_DEBUG_PRINTER       (&mp_debug_print)
 #define MICROPY_ENABLE_GC           (1)
+#define MICROPY_STACK_CHECK_MARGIN  (64)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_REPL_EVENT_DRIVEN   (0)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)

From f0c6f16b9eeedc11f3b042704109fddb9aa3532f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 8 Aug 2025 10:09:13 -0500
Subject: [PATCH 2790/3129] all: Remove Python 2.7 support.

Python 2.7 has been EOL since January 2020.

Ubuntu oldoldlts (Focal Fossa, 20.04) has Python 3.8.  Debian oldoldstable
(Buster, from 2019) has Python 3.7.  RHEL 8 (from 2019) has Python 3.6.

It's easier than ever to install a modern Python using uv.

Given this, it seems like a fine idea to drop Python 2.7 support.

Even though the build is not tested on Python as old as 3.3, I left
comments stating that "3.3+" is the baseline Python version.  However, it
might make sense to bump this to e.g., 3.10, the oldest Python 3 version
used during CI. Or, using uv or another method actually test on the oldest
Python interpreter that is desirable to support (uv goes back to Python 3.7
easily; in October 2025, the oldest supported Python interpreter version
will be 3.10)

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 .github/workflows/mpy_format.yml |  2 +-
 .github/workflows/ports_unix.yml |  4 ++--
 README.md                        |  5 ++---
 docs/develop/gettingstarted.rst  |  2 +-
 ports/stm32/boards/pllvalues.py  |  5 ++---
 ports/stm32/make-stmconst.py     | 24 +++++---------------
 py/makeqstrdata.py               | 11 ++-------
 py/makeqstrdefs.py               |  2 +-
 py/makeversionhdr.py             | 14 +-----------
 tools/ci.sh                      | 11 +++------
 tools/mpy-tool.py                | 38 ++++++++------------------------
 tools/pydfu.py                   |  6 +----
 12 files changed, 31 insertions(+), 93 deletions(-)

diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index 4043b63288a0c..9d3cd139e68da 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04 # use 22.04 to get python2
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 8fd8e1aec23d4..20a0e8796940b 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -121,7 +121,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   nanbox:
-    runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
+    runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
@@ -135,7 +135,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   longlong:
-    runs-on: ubuntu-22.04 # use 22.04 to get python2, and libffi-dev:i386
+    runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
diff --git a/README.md b/README.md
index c78a2384604fe..9025da64444c0 100644
--- a/README.md
+++ b/README.md
@@ -80,9 +80,8 @@ This repository contains the following components:
 - [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`). Some ports (rp2 and esp32) additionally use CMake.
+You will also need bash, gcc, and Python 3.3+ available as the command `python3`.
+Some ports (rp2 and esp32) additionally use CMake.
 
 Supported platforms & architectures
 -----------------------------------
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index fed632ea1ac15..329d218a8799e 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -106,7 +106,7 @@ See the `ARM GCC
 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.
+Python 3 is also required.
 Check that you have Python available on your system:
 
 .. code-block:: bash
diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index ae042d999cec8..987b784a60884 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -105,7 +105,7 @@ def compute_pll2(hse, sys, relax_pll48):
         # VCO_OUT must be between 192MHz and 432MHz
         if sys * P not in mcu.range_vco_out:
             continue
-        NbyM = float(sys * P) / hse  # float for Python 2
+        NbyM = sys * P / hse
         # scan M
         M_min = mcu.range_n[0] // int(round(NbyM))  # starting value
         while mcu.range_vco_in[-1] * M_min < hse:
@@ -121,7 +121,7 @@ def compute_pll2(hse, sys, relax_pll48):
             # N is restricted
             if N not in mcu.range_n:
                 continue
-            Q = float(sys * P) / 48  # float for Python 2
+            Q = sys * P / 48
             # Q must be an integer in a set range
             if close_int(Q) and round(Q) in mcu.range_q:
                 # found valid values
@@ -142,7 +142,6 @@ def compute_pll2(hse, sys, relax_pll48):
 
 
 def compute_derived(hse, pll):
-    hse = float(hse)  # float for Python 2
     M, N, P, Q = pll
     vco_in = hse / M
     vco_out = hse * N / M
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 4ef6143bda560..ff84977ad0268 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -9,25 +9,13 @@
 import argparse
 import re
 
-# Python 2/3 compatibility
-import platform
 
-if platform.python_version_tuple()[0] == "2":
-
-    def convert_bytes_to_str(b):
-        return b
-
-elif platform.python_version_tuple()[0] == "3":
-
-    def convert_bytes_to_str(b):
-        try:
-            return str(b, "utf8")
-        except ValueError:
-            # some files have invalid utf8 bytes, so filter them out
-            return "".join(chr(l) for l in b if l <= 126)
-
-
-# end compatibility code
+def convert_bytes_to_str(b):
+    try:
+        return str(b, "utf8")
+    except ValueError:
+        # some files have invalid utf8 bytes, so filter them out
+        return "".join(chr(l) for l in b if l <= 126)
 
 
 # given a list of (name,regex) pairs, find the first one that matches the given line
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 3a9c7aff52536..8cd9bdc704aa8 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -1,7 +1,7 @@
 """
 Process raw qstr file and output qstr data with length, hash and data bytes.
 
-This script works with Python 2.6, 2.7, 3.3 and 3.4.
+This script works with Python 3.3+.
 """
 
 from __future__ import print_function
@@ -9,13 +9,7 @@
 import re
 import sys
 
-# Python 2/3/MicroPython compatibility:
-#   - iterating through bytes is different
-#   - codepoint2name from html.entities is hard-coded
-if sys.version_info[0] == 2:
-    bytes_cons = lambda val, enc=None: bytearray(val)
-elif sys.version_info[0] == 3:  # Also handles MicroPython
-    bytes_cons = bytes
+bytes_cons = bytes
 
 # fmt: off
 codepoint2name = {
@@ -57,7 +51,6 @@
     253: "yacute", 165: "yen", 255: "yuml", 950: "zeta", 8205: "zwj", 8204: "zwnj"
 }
 # fmt: on
-# end compatibility code
 
 codepoint2name[ord("-")] = "hyphen"
 
diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 8e930ef50616f..3f53e1ff31d81 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -2,7 +2,7 @@
 This script processes the output from the C preprocessor and extracts all
 qstr. Each qstr is transformed into a qstr definition of the form 'Q(...)'.
 
-This script works with Python 2.6, 2.7, 3.3 and 3.4.
+This script works with Python 3.3+.
 """
 
 from __future__ import print_function
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 5c73501b3bb9c..aec95f08ec4f8 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -1,7 +1,7 @@
 """
 Generate header file with macros defining MicroPython version info.
 
-This script works with Python 2.6, 2.7, 3.3 and 3.4.
+This script works with Python 3.3+.
 """
 
 from __future__ import print_function
@@ -22,12 +22,6 @@
 #   "vX.Y.Z-preview.N.gHASH.dirty" -- building at any subsequent commit in the cycle
 #                                     with local changes
 def get_version_info_from_git(repo_path):
-    # Python 2.6 doesn't have check_output, so check for that
-    try:
-        subprocess.check_output
-    except AttributeError:
-        return None
-
     # Note: git describe doesn't work if no tag is available
     try:
         git_tag = subprocess.check_output(
@@ -57,12 +51,6 @@ def get_version_info_from_git(repo_path):
 
 
 def get_hash_from_git(repo_path):
-    # Python 2.6 doesn't have check_output, so check for that.
-    try:
-        subprocess.check_output
-    except AttributeError:
-        return None
-
     try:
         return subprocess.check_output(
             ["git", "rev-parse", "--short", "HEAD"],
diff --git a/tools/ci.sh b/tools/ci.sh
index 69e595087374c..901059991efdf 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -130,15 +130,12 @@ function ci_code_size_build {
 
 function ci_mpy_format_setup {
     sudo apt-get update
-    sudo apt-get install python2.7
     sudo pip3 install pyelftools
-    python2.7 --version
     python3 --version
 }
 
 function ci_mpy_format_test {
     # Test mpy-tool.py dump feature on bytecode
-    python2.7 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
     python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
 
     # Build MicroPython
@@ -683,12 +680,11 @@ function ci_unix_coverage_run_native_mpy_tests {
 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 python2.7
+    sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
     sudo pip3 install ar
     gcc --version
-    python2.7 --version
     python3 --version
 }
 
@@ -706,13 +702,12 @@ 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.7 VARIANT=nanbox CFLAGS_EXTRA="-DMICROPY_PY_MATH_CONSTANTS=1"
+    ci_unix_build_helper VARIANT=nanbox CFLAGS_EXTRA="-DMICROPY_PY_MATH_CONSTANTS=1"
     ci_unix_build_ffi_lib_helper gcc -m32
 }
 
 function ci_unix_nanbox_run_tests {
-    ci_unix_run_tests_full_no_native_helper nanbox PYTHON=python2.7
+    ci_unix_run_tests_full_no_native_helper nanbox
 }
 
 function ci_unix_longlong_build {
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 5c63f5be6d484..c87c656ff9b7a 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -24,41 +24,21 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# Python 2/3/MicroPython compatibility code
-from __future__ import print_function
+import struct
 import sys
+from binascii import hexlify
 
-if sys.version_info[0] == 2:
-    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: isinstance(o, str)
-    is_bytes_type = lambda o: type(o) is bytearray
-    is_int_type = lambda o: isinstance(o, int) or isinstance(o, long)  # noqa: F821
-
-    def hexlify_to_str(b):
-        x = hexlify_py2(b)
-        return ":".join(x[i : i + 2] for i in range(0, len(x), 2))
-
-elif sys.version_info[0] == 3:  # Also handles MicroPython
-    from binascii import hexlify
+str_cons = str
+bytes_cons = bytes
+is_str_type = lambda o: isinstance(o, str)
+is_bytes_type = lambda o: isinstance(o, bytes)
+is_int_type = lambda o: isinstance(o, int)
 
-    str_cons = str
-    bytes_cons = bytes
-    is_str_type = lambda o: isinstance(o, str)
-    is_bytes_type = lambda o: isinstance(o, bytes)
-    is_int_type = lambda o: isinstance(o, int)
 
-    def hexlify_to_str(b):
-        return str(hexlify(b, ":"), "ascii")
+def hexlify_to_str(b):
+    return str(hexlify(b, ":"), "ascii")
 
 
-# end compatibility code
-
-import sys
-import struct
-
 sys.path.append(sys.path[0] + "/../py")
 import makeqstrdata as qstrutil
 
diff --git a/tools/pydfu.py b/tools/pydfu.py
index cd7354818cdea..8822b07bead8d 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -75,11 +75,7 @@
 # USB DFU interface
 __DFU_INTERFACE = 0
 
-# Python 3 deprecated getargspec in favour of getfullargspec, but
-# Python 2 doesn't have the latter, so detect which one to use
-getargspec = getattr(inspect, "getfullargspec", getattr(inspect, "getargspec", None))
-
-if "length" in getargspec(usb.util.get_string).args:
+if "length" in inspect.getfullargspec(usb.util.get_string).args:
     # PyUSB 1.0.0.b1 has the length argument
     def get_string(dev, index):
         return usb.util.get_string(dev, 255, index)

From 3c60e0cf216994ea8a502744b2f915a2a48788f4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 10 Sep 2025 07:37:23 -0500
Subject: [PATCH 2791/3129] tools: Remove unneeded future imports.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/file2h.py         | 2 --
 tools/insert-usb-ids.py | 2 --
 tools/makemanifest.py   | 1 -
 tools/manifestfile.py   | 1 -
 tools/pydfu.py          | 2 --
 5 files changed, 8 deletions(-)

diff --git a/tools/file2h.py b/tools/file2h.py
index 4607ab9279dc6..293f18a9c4ba7 100644
--- a/tools/file2h.py
+++ b/tools/file2h.py
@@ -5,8 +5,6 @@
 #    ;
 # This script simply prints the escaped string straight to stdout
 
-from __future__ import print_function
-
 import sys
 
 # Can either be set explicitly, or left blank to auto-detect
diff --git a/tools/insert-usb-ids.py b/tools/insert-usb-ids.py
index 177a68c4a45fb..bee285ad07734 100644
--- a/tools/insert-usb-ids.py
+++ b/tools/insert-usb-ids.py
@@ -2,8 +2,6 @@
 # inserts those values into the template file specified by sys.argv[2],
 # printing the result to stdout
 
-from __future__ import print_function
-
 import sys
 import re
 import string
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index e076a03e0be3c..860935397af14 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -24,7 +24,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from __future__ import print_function
 import sys
 import os
 import subprocess
diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index beaa36d0f5fc2..9c7a6e140f968 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -25,7 +25,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from __future__ import print_function
 import contextlib
 import os
 import sys
diff --git a/tools/pydfu.py b/tools/pydfu.py
index 8822b07bead8d..376c697cbd5eb 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -11,8 +11,6 @@
 See document UM0391 for a description of the DFuse file.
 """
 
-from __future__ import print_function
-
 import argparse
 import collections
 import inspect

From d9d9d1ab0d0f12aea4d1e15457af8041e00e3453 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 10 Sep 2025 07:37:46 -0500
Subject: [PATCH 2792/3129] py: Remove unneeded future imports.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/make_root_pointers.py | 2 --
 py/makecompresseddata.py | 2 --
 py/makemoduledefs.py     | 2 --
 py/makeqstrdata.py       | 2 --
 py/makeqstrdefs.py       | 2 --
 py/makeversionhdr.py     | 2 --
 6 files changed, 12 deletions(-)

diff --git a/py/make_root_pointers.py b/py/make_root_pointers.py
index efe398b8227ca..5da343c1270ec 100644
--- a/py/make_root_pointers.py
+++ b/py/make_root_pointers.py
@@ -6,8 +6,6 @@
 "struct _mp_state_vm_t" in py/mpstate.h
 """
 
-from __future__ import print_function
-
 import argparse
 import io
 import re
diff --git a/py/makecompresseddata.py b/py/makecompresseddata.py
index 1bce3e8e8374a..a6fa7db00b280 100644
--- a/py/makecompresseddata.py
+++ b/py/makecompresseddata.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import collections
 import re
 import sys
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 29162ab387c8b..1488db5c90e80 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -14,8 +14,6 @@
 the built-in version.
 """
 
-from __future__ import print_function
-
 import sys
 import re
 import io
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 8cd9bdc704aa8..0280a4aa683a2 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -4,8 +4,6 @@
 This script works with Python 3.3+.
 """
 
-from __future__ import print_function
-
 import re
 import sys
 
diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 3f53e1ff31d81..dd514c7033dd7 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -5,8 +5,6 @@
 This script works with Python 3.3+.
 """
 
-from __future__ import print_function
-
 import io
 import os
 import re
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index aec95f08ec4f8..249ec1830c136 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -4,8 +4,6 @@
 This script works with Python 3.3+.
 """
 
-from __future__ import print_function
-
 import argparse
 import sys
 import os

From 4f9bc4b71c55e12805f644a7733bfc21c45742e0 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 10 Sep 2025 07:39:13 -0500
Subject: [PATCH 2793/3129] mpy-cross: Remove unneeded future imports.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 mpy-cross/mpy_cross/__init__.py | 1 -
 mpy-cross/mpy_cross/__main__.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index 91cd6f99335b3..9399aa92f397e 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -25,7 +25,6 @@
 # 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 re
 import stat
diff --git a/mpy-cross/mpy_cross/__main__.py b/mpy-cross/mpy_cross/__main__.py
index 2b6b81c333362..fe78a9e077e77 100644
--- a/mpy-cross/mpy_cross/__main__.py
+++ b/mpy-cross/mpy_cross/__main__.py
@@ -25,7 +25,6 @@
 # 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 36ab1c26400a68c9f8c8c24cce03f487e403c312 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 10 Sep 2025 07:39:27 -0500
Subject: [PATCH 2794/3129] ports: Remove unneeded future imports.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 ports/cc3200/boards/make-pins.py | 2 --
 ports/nrf/boards/make-pins.py    | 2 --
 ports/stm32/boards/pllvalues.py  | 1 -
 ports/stm32/make-stmconst.py     | 2 --
 shared/memzip/make-memzip.py     | 2 --
 5 files changed, 9 deletions(-)

diff --git a/ports/cc3200/boards/make-pins.py b/ports/cc3200/boards/make-pins.py
index e30c02ce94a59..0a06805f777d6 100644
--- a/ports/cc3200/boards/make-pins.py
+++ b/ports/cc3200/boards/make-pins.py
@@ -4,8 +4,6 @@
 # Do not use this as a reference for new ports. See tools/boardgen.py and e.g.
 # ports/stm32/boards/make-pins.py.
 
-from __future__ import print_function
-
 import argparse
 import sys
 import csv
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 30da035589daf..20e89936f6ad8 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -4,8 +4,6 @@
 # Do not use this as a reference for new ports. See tools/boardgen.py and e.g.
 # ports/stm32/boards/make-pins.py.
 
-from __future__ import print_function
-
 import argparse
 import sys
 import csv
diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 987b784a60884..5558d04c5b9e1 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -4,7 +4,6 @@
 for the machine.freq() function.
 """
 
-from __future__ import print_function
 import re
 
 
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index ff84977ad0268..770033ef59de6 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -4,8 +4,6 @@
 for the stm module.
 """
 
-from __future__ import print_function
-
 import argparse
 import re
 
diff --git a/shared/memzip/make-memzip.py b/shared/memzip/make-memzip.py
index 92a5d6168bb1d..e406c55a43ca7 100755
--- a/shared/memzip/make-memzip.py
+++ b/shared/memzip/make-memzip.py
@@ -7,8 +7,6 @@
 # This is somewhat like frozen modules in python, but allows arbitrary files
 # to be used.
 
-from __future__ import print_function
-
 import argparse
 import os
 import subprocess

From 6d09d3e76e1c4837c9e54957ffaa3d6161803630 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Sun, 31 Aug 2025 13:20:13 -0400
Subject: [PATCH 2795/3129] tests/internal_bench/class_instance: Benchmark
 instantiation.

This commit adds tests to benchmark the performance of class instantiation.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tests/internal_bench/class_instance-0-object.py  | 11 +++++++++++
 .../class_instance-0.1-object-gc.py              | 13 +++++++++++++
 tests/internal_bench/class_instance-1-empty.py   | 13 +++++++++++++
 .../class_instance-1.1-classattr.py              | 13 +++++++++++++
 tests/internal_bench/class_instance-1.2-func.py  | 14 ++++++++++++++
 .../class_instance-1.3-empty-gc.py               | 15 +++++++++++++++
 tests/internal_bench/class_instance-2-init.py    | 14 ++++++++++++++
 .../class_instance-2.1-init_super.py             | 14 ++++++++++++++
 tests/internal_bench/class_instance-2.2-new.py   | 14 ++++++++++++++
 tests/internal_bench/class_instance-3-del.py     | 14 ++++++++++++++
 .../internal_bench/class_instance-3.1-del-gc.py  | 16 ++++++++++++++++
 tests/internal_bench/class_instance-4-slots.py   | 13 +++++++++++++
 .../internal_bench/class_instance-4.1-slots5.py  | 13 +++++++++++++
 13 files changed, 177 insertions(+)
 create mode 100644 tests/internal_bench/class_instance-0-object.py
 create mode 100644 tests/internal_bench/class_instance-0.1-object-gc.py
 create mode 100644 tests/internal_bench/class_instance-1-empty.py
 create mode 100644 tests/internal_bench/class_instance-1.1-classattr.py
 create mode 100644 tests/internal_bench/class_instance-1.2-func.py
 create mode 100644 tests/internal_bench/class_instance-1.3-empty-gc.py
 create mode 100644 tests/internal_bench/class_instance-2-init.py
 create mode 100644 tests/internal_bench/class_instance-2.1-init_super.py
 create mode 100644 tests/internal_bench/class_instance-2.2-new.py
 create mode 100644 tests/internal_bench/class_instance-3-del.py
 create mode 100644 tests/internal_bench/class_instance-3.1-del-gc.py
 create mode 100644 tests/internal_bench/class_instance-4-slots.py
 create mode 100644 tests/internal_bench/class_instance-4.1-slots5.py

diff --git a/tests/internal_bench/class_instance-0-object.py b/tests/internal_bench/class_instance-0-object.py
new file mode 100644
index 0000000000000..401c8ea7e3cc2
--- /dev/null
+++ b/tests/internal_bench/class_instance-0-object.py
@@ -0,0 +1,11 @@
+import bench
+
+X = object
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-0.1-object-gc.py b/tests/internal_bench/class_instance-0.1-object-gc.py
new file mode 100644
index 0000000000000..7c475963a8e81
--- /dev/null
+++ b/tests/internal_bench/class_instance-0.1-object-gc.py
@@ -0,0 +1,13 @@
+import bench
+import gc
+
+X = object
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+    gc.collect()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-1-empty.py b/tests/internal_bench/class_instance-1-empty.py
new file mode 100644
index 0000000000000..617d47a86e92b
--- /dev/null
+++ b/tests/internal_bench/class_instance-1-empty.py
@@ -0,0 +1,13 @@
+import bench
+
+
+class X:
+    pass
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-1.1-classattr.py b/tests/internal_bench/class_instance-1.1-classattr.py
new file mode 100644
index 0000000000000..4e667533d4aa1
--- /dev/null
+++ b/tests/internal_bench/class_instance-1.1-classattr.py
@@ -0,0 +1,13 @@
+import bench
+
+
+class X:
+    x = 0
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-1.2-func.py b/tests/internal_bench/class_instance-1.2-func.py
new file mode 100644
index 0000000000000..21bf7a1ac48fc
--- /dev/null
+++ b/tests/internal_bench/class_instance-1.2-func.py
@@ -0,0 +1,14 @@
+import bench
+
+
+class X:
+    def f(self):
+        pass
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-1.3-empty-gc.py b/tests/internal_bench/class_instance-1.3-empty-gc.py
new file mode 100644
index 0000000000000..a5108ef8e8156
--- /dev/null
+++ b/tests/internal_bench/class_instance-1.3-empty-gc.py
@@ -0,0 +1,15 @@
+import bench
+import gc
+
+
+class X:
+    pass
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+    gc.collect()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-2-init.py b/tests/internal_bench/class_instance-2-init.py
new file mode 100644
index 0000000000000..86619d3154840
--- /dev/null
+++ b/tests/internal_bench/class_instance-2-init.py
@@ -0,0 +1,14 @@
+import bench
+
+
+class X:
+    def __init__(self):
+        pass
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-2.1-init_super.py b/tests/internal_bench/class_instance-2.1-init_super.py
new file mode 100644
index 0000000000000..38bca5fef877a
--- /dev/null
+++ b/tests/internal_bench/class_instance-2.1-init_super.py
@@ -0,0 +1,14 @@
+import bench
+
+
+class X:
+    def __init__(self):
+        return super().__init__()
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-2.2-new.py b/tests/internal_bench/class_instance-2.2-new.py
new file mode 100644
index 0000000000000..dc5e78ea5ef98
--- /dev/null
+++ b/tests/internal_bench/class_instance-2.2-new.py
@@ -0,0 +1,14 @@
+import bench
+
+
+class X:
+    def __new__(cls):
+        return super().__new__(cls)
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-3-del.py b/tests/internal_bench/class_instance-3-del.py
new file mode 100644
index 0000000000000..af700f72a94a8
--- /dev/null
+++ b/tests/internal_bench/class_instance-3-del.py
@@ -0,0 +1,14 @@
+import bench
+
+
+class X:
+    def __del__(self):
+        pass
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-3.1-del-gc.py b/tests/internal_bench/class_instance-3.1-del-gc.py
new file mode 100644
index 0000000000000..311c71c3571b0
--- /dev/null
+++ b/tests/internal_bench/class_instance-3.1-del-gc.py
@@ -0,0 +1,16 @@
+import bench
+import gc
+
+
+class X:
+    def __del__(self):
+        pass
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+    gc.collect()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-4-slots.py b/tests/internal_bench/class_instance-4-slots.py
new file mode 100644
index 0000000000000..51b067fedf0b7
--- /dev/null
+++ b/tests/internal_bench/class_instance-4-slots.py
@@ -0,0 +1,13 @@
+import bench
+
+
+class X:
+    __slots__ = ["x"]
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)
diff --git a/tests/internal_bench/class_instance-4.1-slots5.py b/tests/internal_bench/class_instance-4.1-slots5.py
new file mode 100644
index 0000000000000..8f5c2ecb456d8
--- /dev/null
+++ b/tests/internal_bench/class_instance-4.1-slots5.py
@@ -0,0 +1,13 @@
+import bench
+
+
+class X:
+    __slots__ = ["a", "b", "c", "d", "x"]
+
+
+def test(num):
+    for i in range(num // 5):
+        x = X()
+
+
+bench.run(test)

From d28844d11b1414832458cfd91660a815255ca737 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Sun, 31 Aug 2025 13:21:08 -0400
Subject: [PATCH 2796/3129] tests/internal_bench/var: Benchmark checked
 attribute access.

This commit also includes a fix to the `var-6.2-instance-speciallookup.py`
test originally added by 82db5c8 / #16806, as the `__getattr__` method
actually does not trigger a class's special lookups flag as originally
believed.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 .../var-6.2-instance-speciallookup.py         |  2 +-
 tests/internal_bench/var-9-getattr.py         | 16 +++++++++++++
 .../internal_bench/var-9.1-getattr_default.py | 15 ++++++++++++
 .../var-9.2-getattr_default_special.py        | 16 +++++++++++++
 tests/internal_bench/var-9.3-except_ok.py     | 23 +++++++++++++++++++
 .../var-9.4-except_selfinduced.py             | 22 ++++++++++++++++++
 tests/internal_bench/var-9.5-except_error.py  | 22 ++++++++++++++++++
 .../var-9.6-except_error_special.py           | 23 +++++++++++++++++++
 8 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 tests/internal_bench/var-9-getattr.py
 create mode 100644 tests/internal_bench/var-9.1-getattr_default.py
 create mode 100644 tests/internal_bench/var-9.2-getattr_default_special.py
 create mode 100644 tests/internal_bench/var-9.3-except_ok.py
 create mode 100644 tests/internal_bench/var-9.4-except_selfinduced.py
 create mode 100644 tests/internal_bench/var-9.5-except_error.py
 create mode 100644 tests/internal_bench/var-9.6-except_error_special.py

diff --git a/tests/internal_bench/var-6.2-instance-speciallookup.py b/tests/internal_bench/var-6.2-instance-speciallookup.py
index 71845f3aaa23c..fee12b2f930c3 100644
--- a/tests/internal_bench/var-6.2-instance-speciallookup.py
+++ b/tests/internal_bench/var-6.2-instance-speciallookup.py
@@ -5,7 +5,7 @@ class Foo:
     def __init__(self):
         self.num = 20000000
 
-    def __getattr__(self, name):  # just trigger the 'special lookups' flag on the class
+    def __delattr__(self, name):  # just trigger the 'special lookups' flag on the class
         pass
 
 
diff --git a/tests/internal_bench/var-9-getattr.py b/tests/internal_bench/var-9-getattr.py
new file mode 100644
index 0000000000000..69d2bfed2e0ac
--- /dev/null
+++ b/tests/internal_bench/var-9-getattr.py
@@ -0,0 +1,16 @@
+import bench
+
+
+class Foo:
+    pass
+
+
+def test(num):
+    o = Foo()
+    o.num = num
+    i = 0
+    while i < getattr(o, "num", num):
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-9.1-getattr_default.py b/tests/internal_bench/var-9.1-getattr_default.py
new file mode 100644
index 0000000000000..e803d39b32667
--- /dev/null
+++ b/tests/internal_bench/var-9.1-getattr_default.py
@@ -0,0 +1,15 @@
+import bench
+
+
+class Foo:
+    pass
+
+
+def test(num):
+    o = Foo()
+    i = 0
+    while i < getattr(o, "num", num):
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-9.2-getattr_default_special.py b/tests/internal_bench/var-9.2-getattr_default_special.py
new file mode 100644
index 0000000000000..c48ec0742cff6
--- /dev/null
+++ b/tests/internal_bench/var-9.2-getattr_default_special.py
@@ -0,0 +1,16 @@
+import bench
+
+
+class Foo:
+    def __delattr__(self, name):  # just trigger the 'special lookups' flag on the class
+        pass
+
+
+def test(num):
+    o = Foo()
+    i = 0
+    while i < getattr(o, "num", num):
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-9.3-except_ok.py b/tests/internal_bench/var-9.3-except_ok.py
new file mode 100644
index 0000000000000..efc1a8f858cd0
--- /dev/null
+++ b/tests/internal_bench/var-9.3-except_ok.py
@@ -0,0 +1,23 @@
+import bench
+
+
+class Foo:
+    pass
+
+
+def test(num):
+    o = Foo()
+    o.num = num
+
+    def get():
+        try:
+            return o.num
+        except AttributeError:
+            return num
+
+    i = 0
+    while i < get():
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-9.4-except_selfinduced.py b/tests/internal_bench/var-9.4-except_selfinduced.py
new file mode 100644
index 0000000000000..544609ca4b6b3
--- /dev/null
+++ b/tests/internal_bench/var-9.4-except_selfinduced.py
@@ -0,0 +1,22 @@
+import bench
+
+
+class Foo:
+    pass
+
+
+def test(num):
+    o = Foo()
+
+    def get():
+        try:
+            raise AttributeError
+        except AttributeError:
+            return num
+
+    i = 0
+    while i < get():
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-9.5-except_error.py b/tests/internal_bench/var-9.5-except_error.py
new file mode 100644
index 0000000000000..caf83fa46ab3d
--- /dev/null
+++ b/tests/internal_bench/var-9.5-except_error.py
@@ -0,0 +1,22 @@
+import bench
+
+
+class Foo:
+    pass
+
+
+def test(num):
+    o = Foo()
+
+    def get():
+        try:
+            return o.num
+        except AttributeError:
+            return num
+
+    i = 0
+    while i < get():
+        i += 1
+
+
+bench.run(test)
diff --git a/tests/internal_bench/var-9.6-except_error_special.py b/tests/internal_bench/var-9.6-except_error_special.py
new file mode 100644
index 0000000000000..8bc395b4d7ef8
--- /dev/null
+++ b/tests/internal_bench/var-9.6-except_error_special.py
@@ -0,0 +1,23 @@
+import bench
+
+
+class Foo:
+    def __delattr__(self, name):  # just trigger the 'special lookups' flag on the class
+        pass
+
+
+def test(num):
+    o = Foo()
+
+    def get():
+        try:
+            return o.num
+        except AttributeError:
+            return num
+
+    i = 0
+    while i < get():
+        i += 1
+
+
+bench.run(test)

From 2707ae032f8b211ae37446c1606e6a9ce411c2d9 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Wed, 3 Sep 2025 15:41:04 -0400
Subject: [PATCH 2797/3129] tests/internal_bench/var: Benchmark ordered map
 accesses.

This adds an internal_bench benchmark that benchmarks ordered map linear
scan cache performance.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 .../var-6.6-instance-builtin_ordered.py              | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/internal_bench/var-6.6-instance-builtin_ordered.py

diff --git a/tests/internal_bench/var-6.6-instance-builtin_ordered.py b/tests/internal_bench/var-6.6-instance-builtin_ordered.py
new file mode 100644
index 0000000000000..02d7525230192
--- /dev/null
+++ b/tests/internal_bench/var-6.6-instance-builtin_ordered.py
@@ -0,0 +1,12 @@
+import bench
+
+
+def test(num):
+    i = 0
+    o = set()  # object with largest rom-frozen ordered locals_dict
+    n = "__contains__"  # last element in that dict for longest lookup
+    while i < num:
+        i += hasattr(o, n)  # True, converts to 1
+
+
+bench.run(test)

From c3040463849eb9b3e5f85706bb223d648e60510d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 4 Sep 2025 11:39:24 -0500
Subject: [PATCH 2798/3129] docs: Always use sphinx_rtd_theme.

Without this, the wy-alert block pushed all the content
to the right, making the locally built pages nearly illegible.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 docs/conf.py          | 16 +++-------------
 docs/requirements.txt |  1 +
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index eb61487582024..603543aa18c7e 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -55,6 +55,7 @@
     "sphinx.ext.todo",
     "sphinx.ext.coverage",
     "sphinxcontrib.jquery",
+    "sphinx_rtd_theme",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -128,20 +129,9 @@
 
 # -- Options for HTML output ----------------------------------------------
 
-# on_rtd is whether we are on readthedocs.org
-on_rtd = os.environ.get("READTHEDOCS", None) == "True"
+import sphinx_rtd_theme
 
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    try:
-        import sphinx_rtd_theme
-
-        html_theme = "sphinx_rtd_theme"
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
-    except:
-        html_theme = "default"
-        html_theme_path = ["."]
-else:
-    html_theme_path = ["."]
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 824e9799c773a..4d9b9558575df 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,3 @@
 sphinx~=7.2.6
 sphinxcontrib.jquery==4.1
+sphinx-rtd-theme==3.0.2

From 6d640a15ab5258140f402d62fcd69e73650c08d6 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Thu, 11 Sep 2025 17:52:10 -0400
Subject: [PATCH 2799/3129] py/obj: Document undocumented MP_TYPE_FLAG values.

This adds comments documentign the meaning of the type flag bits
`MP_TYPE_FLAG_IS_SUBCLASSED` and `MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS`,
for consistency with the comments added later on documenting the other
flags.

These flags were were originally made part of the public API in
c3450effd4c3a402eeccf44a84a05ef4b36d69a0. This block of doc comments
was only added later on when `MP_TYPE_FLAG_EQ_NOT_REFLEXIVE`,
`MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE`, and `MP_TYPE_FLAG_EQ_HAS_NEQ_TEST`
were added in 9ec1caf42e7733b5141b7aecf1b6e58834a94bf7.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/obj.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/obj.h b/py/obj.h
index 72def663d8d39..9a5d273cdd297 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -539,6 +539,10 @@ typedef mp_obj_t (*mp_fun_var_t)(size_t n, const mp_obj_t *);
 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_IS_SUBCLASSED is set, then subclasses of this class have been created.
+//   Mutations to this class that would require updating all subclasses must be rejected.
+// If MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS is set, then attribute lookups involving this
+//   class need to additionally check for special accessor methods, such as from descriptors.
 // 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

From e9da4c9c98c329c85eb7273437ff9e567d6cd006 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 3 Aug 2025 10:11:49 -0500
Subject: [PATCH 2800/3129] unix/modsocket: Use type-checking mp_obj_get_int.

MP_OBJ_SMALL_INT_VALUE would give erroneous results, such as assertion
failures in the coverage build and other oddities like:

    >>> s = socket.socket()
    >>> s.recv(3.14)
    MemoryError: memory allocation failed, allocating 4235896656 bytes

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/modsocket.c                | 33 ++++++++++++---------------
 tests/extmod/socket_badconstructor.py | 22 ++++++++++++++++++
 2 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 tests/extmod/socket_badconstructor.py

diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index 2aaa21183a9d4..14f321d34fb1d 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -280,11 +280,11 @@ static MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
 // these would be thrown as exceptions.
 static mp_obj_t socket_recv(size_t n_args, const mp_obj_t *args) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
-    int sz = MP_OBJ_SMALL_INT_VALUE(args[1]);
+    int sz = mp_obj_get_int(args[1]);
     int flags = 0;
 
     if (n_args > 2) {
-        flags = MP_OBJ_SMALL_INT_VALUE(args[2]);
+        flags = mp_obj_get_int(args[2]);
     }
 
     byte *buf = m_new(byte, sz);
@@ -298,11 +298,11 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recv_obj, 2, 3, socket_recv);
 
 static mp_obj_t socket_recvfrom(size_t n_args, const mp_obj_t *args) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
-    int sz = MP_OBJ_SMALL_INT_VALUE(args[1]);
+    int sz = mp_obj_get_int(args[1]);
     int flags = 0;
 
     if (n_args > 2) {
-        flags = MP_OBJ_SMALL_INT_VALUE(args[2]);
+        flags = mp_obj_get_int(args[2]);
     }
 
     struct sockaddr_storage addr;
@@ -331,7 +331,7 @@ static mp_obj_t socket_send(size_t n_args, const mp_obj_t *args) {
     int flags = 0;
 
     if (n_args > 2) {
-        flags = MP_OBJ_SMALL_INT_VALUE(args[2]);
+        flags = mp_obj_get_int(args[2]);
     }
 
     mp_buffer_info_t bufinfo;
@@ -349,7 +349,7 @@ static mp_obj_t socket_sendto(size_t n_args, const mp_obj_t *args) {
 
     mp_obj_t dst_addr = args[2];
     if (n_args > 3) {
-        flags = MP_OBJ_SMALL_INT_VALUE(args[2]);
+        flags = mp_obj_get_int(args[2]);
         dst_addr = args[3];
     }
 
@@ -366,7 +366,7 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_sendto_obj, 3, 4, socket_sendt
 static mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     (void)n_args; // always 4
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
-    int level = MP_OBJ_SMALL_INT_VALUE(args[1]);
+    int level = mp_obj_get_int(args[1]);
     int option = mp_obj_get_int(args[2]);
 
     const void *optval;
@@ -478,14 +478,11 @@ static mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, siz
     int proto = 0;
 
     if (n_args > 0) {
-        assert(mp_obj_is_small_int(args[0]));
-        family = MP_OBJ_SMALL_INT_VALUE(args[0]);
+        family = mp_obj_get_int(args[0]);
         if (n_args > 1) {
-            assert(mp_obj_is_small_int(args[1]));
-            type = MP_OBJ_SMALL_INT_VALUE(args[1]);
+            type = mp_obj_get_int(args[1]);
             if (n_args > 2) {
-                assert(mp_obj_is_small_int(args[2]));
-                proto = MP_OBJ_SMALL_INT_VALUE(args[2]);
+                proto = mp_obj_get_int(args[2]);
             }
         }
     }
@@ -582,7 +579,7 @@ static mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     // getaddrinfo accepts port in string notation, so however
     // it may seem stupid, we need to convert int to str
     if (mp_obj_is_small_int(args[1])) {
-        unsigned port = (unsigned short)MP_OBJ_SMALL_INT_VALUE(args[1]);
+        unsigned port = (unsigned short)mp_obj_get_int(args[1]);
         snprintf(buf, sizeof(buf), "%u", port);
         serv = buf;
         hints.ai_flags = AI_NUMERICSERV;
@@ -605,13 +602,13 @@ static mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     }
 
     if (n_args > 2) {
-        hints.ai_family = MP_OBJ_SMALL_INT_VALUE(args[2]);
+        hints.ai_family = mp_obj_get_int(args[2]);
         if (n_args > 3) {
-            hints.ai_socktype = MP_OBJ_SMALL_INT_VALUE(args[3]);
+            hints.ai_socktype = mp_obj_get_int(args[3]);
             if (n_args > 4) {
-                hints.ai_protocol = MP_OBJ_SMALL_INT_VALUE(args[4]);
+                hints.ai_protocol = mp_obj_get_int(args[4]);
                 if (n_args > 5) {
-                    hints.ai_flags = MP_OBJ_SMALL_INT_VALUE(args[5]);
+                    hints.ai_flags = mp_obj_get_int(args[5]);
                 }
             }
         }
diff --git a/tests/extmod/socket_badconstructor.py b/tests/extmod/socket_badconstructor.py
new file mode 100644
index 0000000000000..4a9d2668c7f1a
--- /dev/null
+++ b/tests/extmod/socket_badconstructor.py
@@ -0,0 +1,22 @@
+# Test passing in bad values to socket.socket constructor.
+
+try:
+    import socket
+except:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    s = socket.socket(None)
+except TypeError:
+    print("TypeError")
+
+try:
+    s = socket.socket(socket.AF_INET, None)
+except TypeError:
+    print("TypeError")
+
+try:
+    s = socket.socket(socket.AF_INET, socket.SOCK_RAW, None)
+except TypeError:
+    print("TypeError")

From a69425b533932bbcac0ef463f9e27f79ff2150e3 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 14 Aug 2025 10:04:33 -0500
Subject: [PATCH 2801/3129] unix/Makefile: Add additional testing targets.

These are convenience targets for running specific tests as a developer.
They are more useful that invoking run-tests directly as they take account
of the VARIANT= specified on the make command-line.

For instance, you can run all tests matching the regular expression "int"
with `make VARIANT=... test//int`.

The new targets are all documented in README.md.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 ports/unix/Makefile  | 20 +++++++++++++++++++-
 ports/unix/README.md |  8 ++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 4e9a3736aade6..e4638299f1538 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -254,12 +254,30 @@ endif
 
 include $(TOP)/py/mkrules.mk
 
-.PHONY: test test_full_no_native test_full
+.PHONY: test test_full_no_native test_full test//% test/% test-failures print-failures clean-failures
 
 test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
 
+test//%: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py -i "$*"
+
+test-failures: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --run-failures
+
+print-failures:
+	cd $(TOP)/tests && ./run-tests.py --print-failures
+
+clean-failures:
+	cd $(TOP)/tests && ./run-tests.py --clean-failures
+
+test/%: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py -d "$*"
+
 test_full_no_native: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
diff --git a/ports/unix/README.md b/ports/unix/README.md
index 656d4303d3816..ee983a882cc83 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -72,6 +72,14 @@ To run the complete testsuite, use:
 
     $ make test
 
+There are other make targets to interact with the testsuite:
+
+    $ make test//int       # Run all tests matching the pattern "int"
+    $ make test/ports/unix # Run all tests in ports/unix
+    $ make test-failures   # Re-run only the failed tests
+    $ make print-failures  # print the differences for failed tests
+    $ make clean-failures  # delete the .exp and .out files from failed tests
+
 The Unix port comes with a built-in package manager called `mip`, e.g.:
 
     $ ./build-standard/micropython -m mip install hmac

From 2dc6873bbc32dcae78a061b394a2dbfd53e70650 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Mon, 15 Sep 2025 14:18:41 +0530
Subject: [PATCH 2802/3129] py/py.cmake: Add nlraarch64.

- Required for aarch64 zephyr port targets to build.
- Tested with PocketBeagle 2 [0] A53 cores.

[0]: https://docs.zephyrproject.org/latest/boards/beagle/pocketbeagle_2/doc/index.html

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 py/py.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/py.cmake b/py/py.cmake
index 1c81ed4c58f32..ec2a5d832d25f 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -58,6 +58,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/mpz.c
     ${MICROPY_PY_DIR}/nativeglue.c
     ${MICROPY_PY_DIR}/nlr.c
+    ${MICROPY_PY_DIR}/nlraarch64.c
     ${MICROPY_PY_DIR}/nlrmips.c
     ${MICROPY_PY_DIR}/nlrpowerpc.c
     ${MICROPY_PY_DIR}/nlrrv32.c

From 29246ba81784e9e1b31a070082b2729f1b4b1d72 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 14 Sep 2025 19:22:06 +0900
Subject: [PATCH 2803/3129] tests/run-perfbench.py: Fix issues when -s/-m is
 used with failed tests.

The option '-s' (--diff-score) or '-m' (--diff-time) fails when the
specified result contains tests that was skipped or failed.

This patch ignores "skipped: " or "failed: " message.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 tests/run-perfbench.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 2a2b7b6c9ddff..039d11a36111e 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -194,7 +194,13 @@ def parse_output(filename):
         m = int(m.split("=")[1])
         data = []
         for l in f:
-            if ": " in l and ": SKIP" not in l and "CRASH: " not in l:
+            if (
+                ": " in l
+                and ": SKIP" not in l
+                and "CRASH: " not in l
+                and "skipped: " not in l
+                and "failed: " not in l
+            ):
                 name, values = l.strip().split(": ")
                 values = tuple(float(v) for v in values.split())
                 data.append((name,) + values)

From c76e6014423f2690106a815d1deb643fb6f3627f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 19:06:30 +0000
Subject: [PATCH 2804/3129] github/workflows: Bump actions/github-script from 7
 to 8.

Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/code_size_comment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_size_comment.yml b/.github/workflows/code_size_comment.yml
index 521afad709d17..2eed0b06b8ee5 100644
--- a/.github/workflows/code_size_comment.yml
+++ b/.github/workflows/code_size_comment.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: download-artifact
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |
@@ -56,7 +56,7 @@ jobs:
         run: unzip code-size-report.zip
       - name: Post comment to pull request
         if: steps.download-artifact.outputs.result == 'ok'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

From 6681530fc0f2b426e77642d887b548c0bae1fc9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 19:06:36 +0000
Subject: [PATCH 2805/3129] github/workflows: Bump actions/setup-python from 5
 to 6.

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '6'
  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/mpremote.yml          |  2 +-
 .github/workflows/ports_unix.yml        | 10 +++++-----
 .github/workflows/ports_windows.yml     |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 5669779946e06..2a7da52e26dbe 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
     - name: Install packages
       run: source tools/ci.sh && ci_c_code_formatting_setup
     - name: Run code formatting
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index 2e1def95c36e8..58ffb745b3434 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -13,6 +13,6 @@ jobs:
     - uses: actions/checkout@v5
       with:
         fetch-depth: 100
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
     - 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 f9d61125b50c1..6a277a4a4f05d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
     - name: Install Python packages
       run: pip install -r docs/requirements.txt
     - name: Build unix port
diff --git a/.github/workflows/mpremote.yml b/.github/workflows/mpremote.yml
index 359d888286400..36904764c991b 100644
--- a/.github/workflows/mpremote.yml
+++ b/.github/workflows/mpremote.yml
@@ -16,7 +16,7 @@ jobs:
         # Setting this to zero means fetch all history and tags,
         # which hatch-vcs can use to discover the version tag.
         fetch-depth: 0
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
     - name: Install build tools
       run: pip install build
     - name: Build mpremote wheel
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 20a0e8796940b..77d0b29ca96fb 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
       with:
@@ -204,7 +204,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
       with:
@@ -221,7 +221,7 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.8'
     - name: Build
@@ -281,7 +281,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
       with:
@@ -306,7 +306,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
       with:
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 6b492640a1fa0..84a93a50433db 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -109,7 +109,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       # note: can go back to installing mingw-w64-${{ matrix.env }}-python after
       # MSYS2 updates to Python >3.12 (due to settrace compatibility issue)
       with:

From be1a1eb7ac44c45d7d5280e2ceabc29bef6e107c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 08:52:13 -0500
Subject: [PATCH 2806/3129] tools/ci.sh: Make this script runnable as command.

This makes it easier to run a sequence of ci steps locally.  A help message
is also provided.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 docs/develop/gettingstarted.rst | 24 ++++++++++++++
 tools/ci.sh                     | 57 +++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 329d218a8799e..b625a72c98a86 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -282,6 +282,30 @@ To run a selection of tests on a board/device connected over USB use:
 
 See also :ref:`writingtests`.
 
+Using ci.sh locally
+-------------------
+
+MicroPython uses GitHub Actions for continuous integration.
+To reduce dependence on any specific CI system, the actual build steps for Unix-based builds are in the file ``tools/ci.sh``.
+This can also be used as a script on developer desktops, with caveats:
+
+* For most steps, An Ubuntu/Debian system similar to the one used during CI is assumed.
+* Some specific steps assume specific Ubuntu versions.
+* The setup steps may invoke the system package manager to install packages,
+  download and install software from the internet, etc.
+
+To get a usage message including the list of commands, run:
+
+.. code-block:: bash
+
+   $ tools/ci.sh --help
+
+As an example, you can build and test the unix minimal port with:
+
+.. code-block:: bash
+
+   $ tools/ci.sh unix_minimal_build unix_minimal_run_tests
+
 Folder structure
 ----------------
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 901059991efdf..6b974f9830460 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -970,3 +970,60 @@ function ci_alif_ae3_build {
     make ${MAKEOPTS} -C ports/alif BOARD=OPENMV_AE3 MCU_CORE=M55_DUAL
     make ${MAKEOPTS} -C ports/alif BOARD=ALIF_ENSEMBLE MCU_CORE=M55_DUAL
 }
+
+function _ci_help {
+    # Note: these lines must be indented with tab characters (required by bash <<-EOF)
+    cat <<-EOF
+	ci.sh: Script fragments used during CI
+
+	When invoked as a script, runs a sequence of ci steps,
+	stopping after the first error.
+
+	Usage:
+	    ${BASH_SOURCE} step1 step2...
+
+	Steps:
+	EOF
+    if type -path column > /dev/null 2>&1; then
+        grep '^function ci_' $0 | awk '{print $2}' | sed 's/^ci_//' | column
+    else
+        grep '^function ci_' $0 | awk '{print $2}' | sed 's/^ci_//'
+    fi
+    exit
+}
+
+function _ci_main {
+    case "$1" in
+        (-h|-?|--help)
+            _ci_help
+        ;;
+        (*)
+            cd $(dirname "$0")/..
+            while [ $# -ne 0 ]; do
+                ci_$1
+                shift
+            done
+        ;;
+    esac
+}
+
+# https://stackoverflow.com/questions/2683279/how-to-detect-if-a-script-is-being-sourced
+sourced=0
+if [ -n "$ZSH_VERSION" ]; then
+  case $ZSH_EVAL_CONTEXT in *:file) sourced=1;; esac
+elif [ -n "$KSH_VERSION" ]; then
+  [ "$(cd -- "$(dirname -- "$0")" && pwd -P)/$(basename -- "$0")" != "$(cd -- "$(dirname -- "${.sh.file}")" && pwd -P)/$(basename -- "${.sh.file}")" ] && sourced=1
+elif [ -n "$BASH_VERSION" ]; then
+  (return 0 2>/dev/null) && sourced=1
+else # All other shells: examine $0 for known shell binary filenames.
+     # Detects `sh` and `dash`; add additional shell filenames as needed.
+  case ${0##*/} in sh|-sh|dash|-dash) sourced=1;; esac
+fi
+
+if [ $sourced -eq 0 ]; then
+    # invoked as a command
+    if [ "$#" -eq 0 ]; then
+        set -- --help
+    fi
+    _ci_main "$@"
+fi

From 06a90e0b4b38543741c5749b5710f2796c61f0d8 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 14 Sep 2025 20:11:49 +0900
Subject: [PATCH 2807/3129] stm32/boards/NUCLEO_F401RE: Change flash latency
 for NUCLEO-F401RE.

For NUCLEO-F401RE, FLASH_LATENCY_2 can be specified for flash latency
because it runs at 84MHz.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
index 8dda34f4a06b2..6150765e18e50 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
@@ -21,6 +21,9 @@
 #define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV4)
 #define MICROPY_HW_CLK_PLLQ (7)
 
+// 84 MHz needs 2 wait states
+#define MICROPY_HW_FLASH_LATENCY (FLASH_LATENCY_2)
+
 // UART config
 #define MICROPY_HW_UART2_TX     (pin_A2)
 #define MICROPY_HW_UART2_RX     (pin_A3)

From 03e3a06de641cca6299b1a7bb8f9379014e61b8e Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Mon, 15 Sep 2025 09:39:28 +0900
Subject: [PATCH 2808/3129] stm32/boards/NUCLEO_G474RE: Change flash latency
 for NUCLEO-G474RE.

For NUCLEO-G474RE, FLASH_LATENCY_4 can be specified instead of
FLASH_LATENCY_8 because it runs at 170MHz.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h | 2 +-
 ports/stm32/system_stm32.c                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
index 62d104a5462be..e807a54780d98 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
@@ -29,7 +29,7 @@
 #define MICROPY_HW_CLK_USE_HSI48    (1) // for RNG
 
 // 4 wait states
-#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_8
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_4
 
 // UART config
 #define MICROPY_HW_LPUART1_TX       (pin_A2)  // A2 (to STLINK), B11, C1
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index b76a41e97bf78..5a9fef1c2a58f 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -494,7 +494,7 @@ MP_WEAK void SystemClock_Config(void) {
     #endif
 
     #if defined(STM32G4)
-    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_8) != HAL_OK) {
+    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, MICROPY_HW_FLASH_LATENCY) != HAL_OK) {
         MICROPY_BOARD_FATAL_ERROR("HAL_RCC_ClockConfig");
     }
     PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC | RCC_PERIPHCLK_LPUART1

From a6efc670647193cab3fd2b84253960f5304e0bdd Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Mon, 15 Sep 2025 08:09:01 +0900
Subject: [PATCH 2809/3129] stm32/i2c: Add hardware I2C implementation for
 STM32G4.

For STM32G4, hardware I2C can implement same as STM32L4 for machine.I2C.
This commit makes to be able to use of hardware I2C in machine.I2C.

Tested on NUCLEO-G474RE.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/i2c.c         | 4 ++--
 ports/stm32/machine_i2c.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 778885eac8c8d..2460a36cb1502 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -271,12 +271,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) || defined(STM32H7) || defined(STM32L4)
+#elif defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
 
 #if defined(STM32H7)
 #define APB1ENR            APB1LENR
 #define RCC_APB1ENR_I2C1EN RCC_APB1LENR_I2C1EN
-#elif defined(STM32L4)
+#elif defined(STM32G4) || defined(STM32L4)
 #define APB1ENR            APB1ENR1
 #define RCC_APB1ENR_I2C1EN RCC_APB1ENR1_I2C1EN
 #endif
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index ca2170e32d3bc..0fb9cf83c901a 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -34,7 +34,7 @@
 
 #define I2C_POLL_DEFAULT_TIMEOUT_US (50000) // 50ms
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4)
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;

From 7cbe083b2c8d58ae3e0128b28f001934d45cff35 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 14 Sep 2025 12:23:24 +0200
Subject: [PATCH 2810/3129] stm32/uart: Enable UART FIFO for STM32N6.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/Makefile | 2 +-
 ports/stm32/uart.c   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index abca3a05f8c7a..3af1d892a031e 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -445,7 +445,7 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),h7))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),h7 n6))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
     hal_uart_ex.c \
     )
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 9354af4a291e3..d0c5819b20dfa 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -665,7 +665,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     huart.Init.HwFlowCtl = flow;
     huart.Init.OverSampling = UART_OVERSAMPLING_16;
 
-    #if defined(STM32G4) || defined(STM32H7) // WB also has a fifo..
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32N6) // WB also has a fifo..
     huart.FifoMode = UART_FIFOMODE_ENABLE;
     #endif
 
@@ -717,7 +717,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
         uart_obj->char_width = CHAR_WIDTH_8BIT;
     }
 
-    #if defined(STM32H7)
+    #if defined(STM32H7) || defined(STM32N6)
     HAL_UARTEx_SetTxFifoThreshold(&huart, UART_TXFIFO_THRESHOLD_1_8);
     HAL_UARTEx_SetRxFifoThreshold(&huart, UART_RXFIFO_THRESHOLD_1_8);
     HAL_UARTEx_EnableFifoMode(&huart);
@@ -1186,8 +1186,8 @@ size_t uart_tx_data(machine_uart_obj_t *self, const void *src_in, size_t num_cha
     // timeout_char by FIFO size + 1.
     // STM32G4 has 8 words FIFO.
     timeout = (8 + 1) * self->timeout_char;
-    #elif defined(STM32H7)
-    // STM32H7 has 16 words FIFO.
+    #elif defined(STM32H7) || defined(STM32N6)
+    // STM32H7 and STM32N6 have 16 words FIFO.
     timeout = (16 + 1) * self->timeout_char;
     #else
     // The timeout specified here is for waiting for the TX data register to

From c4d99f34ae4bbec075550acff680f31364708580 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Mon, 15 Sep 2025 14:04:37 +0900
Subject: [PATCH 2811/3129] stm32/uart: Fix LPUART init failure with low
 baudrate.

UART prescaler value should set up correctly to initialize LPUART with low
baudrate for STM32G0/G4/H5.  This can be implemented similarly to
STM32H7/N6/WB.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index d0c5819b20dfa..63de8cc6fa549 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -673,7 +673,7 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     huart.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
     #endif
 
-    #if defined(STM32H7) || defined(STM32N6) || defined(STM32WB)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || 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) {

From 8d04f5da7df99f105523c32ceaeb72113e09a18c Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Mon, 15 Sep 2025 09:09:49 +0900
Subject: [PATCH 2812/3129] stm32/boards: Set RCC_HSE_BYPASS for relevant
 NUCLEO boards.

For NUCLEO boards that does not have HSE crystal, HSEState should set
RCC_HSE_BYPASS to use HSE clock from ST-LINK 8MHz.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h | 4 +++-
 ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h | 2 ++
 ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h | 2 ++
 ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h | 4 +++-
 ports/stm32/powerctrlboot.c                      | 2 ++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
index 6150765e18e50..21ce91fd9395f 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
@@ -9,12 +9,14 @@
 // HSE is 8MHz, HSI is 16MHz CPU freq set to 84MHz
 // 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
+// clock source by removing the #define MICROPY_HW_CLK_USE_HSI line
 #define MICROPY_HW_CLK_USE_HSI (1)
 
 #if MICROPY_HW_CLK_USE_HSI
 #define MICROPY_HW_CLK_PLLM (16)
 #else
+// HSE comes from ST-LINK 8MHz, not crystal.
+#define MICROPY_HW_CLK_USE_BYPASS (1)
 #define MICROPY_HW_CLK_PLLM (8)
 #endif
 #define MICROPY_HW_CLK_PLLN (336)
diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
index a0a6dbf8c51e0..62fd5abe6dde6 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
@@ -14,6 +14,8 @@
 #define MICROPY_HW_CLK_PLLN (336)
 #define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
 #define MICROPY_HW_CLK_PLLQ (7)
+// HSE comes from ST-LINK 8MHz, not crystal.
+#define MICROPY_HW_CLK_USE_BYPASS (1)
 
 // UART config
 #define MICROPY_HW_UART1_TX     (pin_B6)    // Arduino D10, pin 17 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
index 4ed9f41832d85..e607d5f9355dc 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
@@ -21,6 +21,8 @@ void NUCLEO_F767ZI_board_early_init(void);
 #define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
 #define MICROPY_HW_CLK_PLLQ (9)
 #define MICROPY_HW_FLASH_LATENCY (FLASH_LATENCY_7) // 210-216 MHz needs 7 wait states
+// HSE comes from ST-LINK 8MHz, not crystal.
+#define MICROPY_HW_CLK_USE_BYPASS (1)
 
 // UART config
 #define MICROPY_HW_UART2_TX         (pin_D5)
diff --git a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
index 5b83a980ce164..4eef1db8fdc1c 100644
--- a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
@@ -12,7 +12,7 @@
 // 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
+// clock source by removing the #define MICROPY_HW_CLK_USE_HSI line
 #define MICROPY_HW_CLK_USE_HSI (1)
 
 #if MICROPY_HW_CLK_USE_HSI
@@ -21,6 +21,8 @@
 #else
 #define MICROPY_HW_CLK_PLLMUL (RCC_CFGR_PLLMUL12)
 #define MICROPY_HW_CLK_PLLDIV (RCC_CFGR_PLLDIV3)
+// HSE comes from ST-LINK 8MHz, not crystal.
+#define MICROPY_HW_CLK_USE_BYPASS (1)
 #endif
 
 // UART config
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 059d2a45da9ce..2354deb4da1e9 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -385,7 +385,9 @@ void SystemClock_Config(void) {
     RCC->CFGR = RCC_CFGR_PLLSRC_HSI;
     #else
     // Enable the 8MHz external oscillator
+    #if MICROPY_HW_CLK_USE_BYPASS
     RCC->CR |= RCC_CR_HSEBYP;
+    #endif
     RCC->CR |= RCC_CR_HSEON;
     while (!(RCC->CR & RCC_CR_HSERDY)) {
     }

From ec1bfcfbb7944bb7bbf5048de0152867cf71817b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Sep 2025 11:41:59 +1000
Subject: [PATCH 2813/3129] stm32/main: Use defined constants to enable N6
 clocks during low power.

Use constants from the HAL instead of literal numbers to select which
peripheral clocks are enabled during low power mode.

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

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index af4d7f8bbb6d3..8bce6b477a5d1 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -400,19 +400,21 @@ void stm32_main(uint32_t reset_mode) {
 
     #if defined(STM32N6)
     // SRAM, XSPI needs to remain awake during sleep, eg so DMA from flash works.
-    LL_MEM_EnableClockLowPower(0xffffffff);
+    LL_MEM_EnableClockLowPower(LL_MEM_AXISRAM1 | LL_MEM_AXISRAM2 | LL_MEM_AXISRAM3
+        | LL_MEM_AXISRAM4 | LL_MEM_AXISRAM5 | LL_MEM_AXISRAM6 | LL_MEM_AHBSRAM1 | LL_MEM_AHBSRAM2
+        | LL_MEM_BKPSRAM | LL_MEM_FLEXRAM | LL_MEM_CACHEAXIRAM | LL_MEM_VENCRAM | LL_MEM_BOOTROM);
     LL_AHB5_GRP1_EnableClockLowPower(LL_AHB5_GRP1_PERIPH_XSPI2 | LL_AHB5_GRP1_PERIPH_XSPIM);
     LL_APB4_GRP1_EnableClock(LL_APB4_GRP1_PERIPH_RTC | LL_APB4_GRP1_PERIPH_RTCAPB);
     LL_APB4_GRP1_EnableClockLowPower(LL_APB4_GRP1_PERIPH_RTC | LL_APB4_GRP1_PERIPH_RTCAPB);
 
     // Enable some AHB peripherals during sleep.
-    LL_AHB1_GRP1_EnableClockLowPower(0xffffffff); // GPDMA1, ADC12
-    LL_AHB4_GRP1_EnableClockLowPower(0xffffffff); // GPIOA-Q, PWR, CRC
+    LL_AHB1_GRP1_EnableClockLowPower(LL_AHB1_GRP1_PERIPH_ALL); // GPDMA1, ADC12
+    LL_AHB4_GRP1_EnableClockLowPower(LL_AHB4_GRP1_PERIPH_ALL); // GPIOA-Q, PWR, CRC
 
     // Enable some APB peripherals during sleep.
-    LL_APB1_GRP1_EnableClockLowPower(0xffffffff); // I2C, I3C, LPTIM, SPI, TIM, UART, WWDG
-    LL_APB2_GRP1_EnableClockLowPower(0xffffffff); // SAI, SPI, TIM, UART
-    LL_APB4_GRP1_EnableClockLowPower(0xffffffff); // I2C, LPTIM, LPUART, RTC, SPI
+    LL_APB1_GRP1_EnableClockLowPower(LL_APB1_GRP1_PERIPH_ALL); // I2C, I3C, LPTIM, SPI, TIM, UART, WWDG
+    LL_APB2_GRP1_EnableClockLowPower(LL_APB2_GRP1_PERIPH_ALL); // SAI, SPI, TIM, UART
+    LL_APB4_GRP1_EnableClockLowPower(LL_APB4_GRP1_PERIPH_ALL); // I2C, LPTIM, LPUART, RTC, SPI
     #endif
 
     mpu_init();

From 1b92bda5b8e5e2db8e57c4b7134930e52bc5207a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 29 Sep 2024 17:40:17 +0200
Subject: [PATCH 2814/3129] mpy-cross: Add RISC-V RV64IMC support in MPY files.

MPY files can now hold data to be run on RV64IMC.  This can be
accomplished by passing the `-march=rv64imc` flag to mpy-cross.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/reference/mpyfiles.rst        | 2 +-
 mpy-cross/main.c                   | 9 ++++++++-
 mpy-cross/mpy_cross/__init__.py    | 1 +
 py/persistentcode.h                | 1 +
 tests/feature_check/target_info.py | 1 +
 tools/mpy-tool.py                  | 6 ++++--
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index be0114701aea7..cd4db623ffefa 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -58,7 +58,7 @@ If importing an .mpy file fails then try the following:
     sys_mpy = sys.implementation._mpy
     arch = [None, 'x86', 'x64',
         'armv6', 'armv6m', 'armv7m', 'armv7em', 'armv7emsp', 'armv7emdp',
-        'xtensa', 'xtensawin', 'rv32imc'][sys_mpy >> 10]
+        'xtensa', 'xtensawin', 'rv32imc', 'rv64imc'][sys_mpy >> 10]
     print('mpy version:', sys_mpy & 0xff)
     print('mpy sub-version:', sys_mpy >> 8 & 3)
     print('mpy flags:', end='')
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index b7771ce6e798f..63a74d0844b72 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -130,7 +130,8 @@ static int usage(char **argv) {
         "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;\n"
-        "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin, rv32imc, host, debug\n"
+        "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp,\n"
+        "                armv7emdp, xtensa, xtensawin, rv32imc, rv64imc, host, debug\n"
         "\n"
         "Implementation specific options:\n", argv[0]
         );
@@ -316,6 +317,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 } else if (strcmp(arch, "rv32imc") == 0) {
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_RV32IMC;
                     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_RV32I;
+                } else if (strcmp(arch, "rv64imc") == 0) {
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_RV64IMC;
+                    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_RV64I;
                 } else if (strcmp(arch, "debug") == 0) {
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_DEBUG;
                     mp_dynamic_compiler.nlr_buf_num_regs = 0;
@@ -329,6 +333,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
                     #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;
+                    #elif defined(__riscv) && (__riscv_xlen == 64)
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_RV64IMC;
+                    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_RV64I;
                     #else
                     mp_printf(&mp_stderr_print, "unable to determine host architecture for -march=host\n");
                     exit(1);
diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index 9399aa92f397e..6d7002a3b89d2 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -43,6 +43,7 @@
     "NATIVE_ARCH_XTENSA": "xtensa",
     "NATIVE_ARCH_XTENSAWIN": "xtensawin",
     "NATIVE_ARCH_RV32IMC": "rv32imc",
+    "NATIVE_ARCH_RV64IMC": "rv64imc",
 }
 
 globals().update(NATIVE_ARCHS)
diff --git a/py/persistentcode.h b/py/persistentcode.h
index cf257a7ab1fb6..a45d5fd182e5e 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -98,6 +98,7 @@ enum {
     MP_NATIVE_ARCH_XTENSA,
     MP_NATIVE_ARCH_XTENSAWIN,
     MP_NATIVE_ARCH_RV32IMC,
+    MP_NATIVE_ARCH_RV64IMC,
     MP_NATIVE_ARCH_DEBUG, // this entry should always be last
 };
 
diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
index 5367eb6a47d64..35a995a153df6 100644
--- a/tests/feature_check/target_info.py
+++ b/tests/feature_check/target_info.py
@@ -19,6 +19,7 @@
     "xtensa",
     "xtensawin",
     "rv32imc",
+    "rv64imc",
 ][sys_mpy >> 10]
 build = getattr(sys.implementation, "_build", "unknown")
 thread = getattr(sys.implementation, "_thread", None)
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index c87c656ff9b7a..df918e1539854 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -94,6 +94,7 @@ class Config:
 MP_NATIVE_ARCH_XTENSA = 9
 MP_NATIVE_ARCH_XTENSAWIN = 10
 MP_NATIVE_ARCH_RV32IMC = 11
+MP_NATIVE_ARCH_RV64IMC = 12
 
 MP_PERSISTENT_OBJ_FUN_TABLE = 0
 MP_PERSISTENT_OBJ_NONE = 1
@@ -1061,6 +1062,7 @@ def __init__(
             MP_NATIVE_ARCH_XTENSA,
             MP_NATIVE_ARCH_XTENSAWIN,
             MP_NATIVE_ARCH_RV32IMC,
+            MP_NATIVE_ARCH_RV64IMC,
         ):
             self.fun_data_attributes = '__attribute__((section(".text,\\"ax\\",@progbits # ")))'
         else:
@@ -1078,8 +1080,8 @@ def __init__(
             self.fun_data_attributes += " __attribute__ ((aligned (4)))"
         elif (
             MP_NATIVE_ARCH_ARMV6M <= config.native_arch <= MP_NATIVE_ARCH_ARMV7EMDP
-        ) or config.native_arch == MP_NATIVE_ARCH_RV32IMC:
-            # ARMVxxM or RV32IMC -- two byte align.
+        ) or MP_NATIVE_ARCH_RV32IMC <= config.native_arch <= MP_NATIVE_ARCH_RV64IMC:
+            # ARMVxxM or RV{32,64}IMC -- two byte align.
             self.fun_data_attributes += " __attribute__ ((aligned (2)))"
 
     def disassemble(self):

From 44986b1f0401f086254f7dabc65f1816db35829a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 29 Sep 2024 17:49:24 +0200
Subject: [PATCH 2815/3129] qemu/riscv64: Add new QEMU RV64 port.

This adds a QEMU-based bare metal RISC-V 64 bits port.  For the time being
only QEMU's "virt" 64 bits board is supported, using the lp64 ABI and the
RV64IMC architecture.

The port's README is also updated to keep track of these changes.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .github/workflows/ports_qemu.yml             |  12 +
 ports/qemu/Dockerfile.riscv                  |  39 +++
 ports/qemu/Makefile                          |  37 +++
 ports/qemu/README.md                         |  54 +++-
 ports/qemu/boards/VIRT_RV64/mpconfigboard.mk |  11 +
 ports/qemu/mcu/rv64/entrypoint.s             |  70 +++++
 ports/qemu/mcu/rv64/interrupts.c             | 294 +++++++++++++++++++
 ports/qemu/mcu/rv64/startup.c                |  86 ++++++
 ports/qemu/mcu/rv64/virt.ld                  |  98 +++++++
 ports/qemu/mpconfigport.h                    |  12 +-
 tools/ci.sh                                  |  13 +
 11 files changed, 717 insertions(+), 9 deletions(-)
 create mode 100644 ports/qemu/Dockerfile.riscv
 create mode 100644 ports/qemu/boards/VIRT_RV64/mpconfigboard.mk
 create mode 100644 ports/qemu/mcu/rv64/entrypoint.s
 create mode 100644 ports/qemu/mcu/rv64/interrupts.c
 create mode 100644 ports/qemu/mcu/rv64/startup.c
 create mode 100644 ports/qemu/mcu/rv64/virt.ld

diff --git a/.github/workflows/ports_qemu.yml b/.github/workflows/ports_qemu.yml
index 1284f11bbb399..e743f29c9966f 100644
--- a/.github/workflows/ports_qemu.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -50,3 +50,15 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  build_and_test_rv64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_qemu_setup_rv64
+    - name: Build and run test suite
+      run: source tools/ci.sh && ci_qemu_build_rv64
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
diff --git a/ports/qemu/Dockerfile.riscv b/ports/qemu/Dockerfile.riscv
new file mode 100644
index 0000000000000..9521872fe888b
--- /dev/null
+++ b/ports/qemu/Dockerfile.riscv
@@ -0,0 +1,39 @@
+# This file is part of the MicroPython project, https://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2025 Alessandro Gatti
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION 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 ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get install -y \
+        gcc-riscv64-unknown-elf \
+        picolibc-riscv64-unknown-elf \
+        python3 \
+        python3-pip \
+        python3-platformdirs \
+        python3-pyelftools \
+        python3-serial \
+        qemu-system && \
+    pip3 install ar --break-system-packages
+
+WORKDIR /micropython
diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index d213c8fc03c5e..685bb3536c47f 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -35,6 +35,10 @@ ifeq ($(QEMU_ARCH),riscv32)
 MICROPY_HEAP_SIZE ?= 143360
 FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
+ifeq ($(QEMU_ARCH),riscv64)
+MICROPY_HEAP_SIZE ?= 204800
+FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_const.py',))"
+endif
 
 MICROPY_FLOAT_IMPL ?= float
 
@@ -110,6 +114,39 @@ SRC_BOARD_O += mcu/rv32/entrypoint.o
 
 endif
 
+################################################################################
+# RISC-V 64-bit specific settings
+
+ifeq ($(QEMU_ARCH),riscv64)
+
+CROSS_COMPILE ?= riscv64-unknown-elf-
+
+GCC_VERSION = $(word 1, $(subst ., , $(shell $(CC) -dumpversion)))
+
+RV64_ABI = lp64
+
+QEMU_ARGS += -bios none
+
+# GCC 10 and lower do not recognise the Zicsr extension in the architecture name.
+ifeq ($(shell test $(GCC_VERSION) -le 10; echo $$?),0)
+RV64_ARCH ?= rv64imac
+else
+# Recent GCC versions explicitly require to declare extensions.
+RV64_ARCH ?= rv64imac_zicsr
+endif
+
+AFLAGS += -mabi=$(RV64_ABI) -march=$(RV64_ARCH)
+CFLAGS += $(AFLAGS) -mcmodel=medany
+LDFLAGS += -mabi=$(RV64_ABI) -march=$(RV64_ARCH) -Wl,-EL -mcmodel=medany
+
+SRC_C += \
+	mcu/rv64/interrupts.c \
+	mcu/rv64/startup.c \
+
+SRC_BOARD_O += mcu/rv64/entrypoint.o
+
+endif
+
 ################################################################################
 # Project specific settings and compiler/linker flags
 
diff --git a/ports/qemu/README.md b/ports/qemu/README.md
index d8ef3ac551e9d..bf5788961dbe9 100644
--- a/ports/qemu/README.md
+++ b/ports/qemu/README.md
@@ -1,8 +1,8 @@
 MicroPython port to qemu
 ========================
 
-This is experimental, community-supported port for Cortex-M and RISC-V RV32IMC
-emulation as provided by QEMU (http://qemu.org).
+This is experimental, community-supported port for Cortex-M and RISC-V
+RV32IMC/RV64IMC emulation as provided by QEMU (http://qemu.org).
 
 The purposes of this port are to enable:
 
@@ -26,9 +26,9 @@ Dependencies
 For ARM-based boards the build requires a bare-metal ARM toolchain, such as
 `arm-none-eabi-gcc`.
 
-### RISC-V
+### RISC-V 32
 
-For RISC-V-based boards the build requires a bare metal RISC-V toolchain with GCC 10
+For RV32-based boards the build requires a bare metal RISC-V toolchain with GCC 10
 or later, either with multilib support or 32 bits specific (M, C, and Zicsr
 extensions must be supported, along with ilp32 ABI).  Both newlib and picolibc are
 supported, with the latter having precedence if found.
@@ -37,6 +37,47 @@ Most pre-built toolchains should work out of the box, either coming from your
 Linux distribution's package manager, or independently packaged ones like
 [xPack](https://xpack.github.io/dev-tools/riscv-none-elf-gcc/).
 
+### RISC-V 64
+
+For RV64-based boards the build requires a bare metal RISC-V toolchain with GCC 10
+or later, either with multilib support or 64 bits specific (M, C, and Zicsr
+extensions must be supported, along with lp64 ABI).  In other words, if your
+compiler can build a binary that's compliant to any ratified RVA profiles,
+you *might* be good to go: if you run your cross-compiler `gcc` binary with `-v` as
+its only argument and you don't see mentions of `-mcmodel=medany`, your
+toolchain is probably not going to work for this situation (more later).  Both newlib
+and picolibc are supported, with the latter having precedence if found.
+
+RISC-V 64 toolchains are a bit more temperamental.  Some toolchains have their `libc`,
+`libm`, and `libgcc` libraries built in a way that they cannot be used with code
+placed at an offset beyond 0x7FFFF7FF.  QEMU's `VIRT_RV64` board code address space
+starts at 0x80000000, making those toolchains not viable if code from those libraries
+is brought in by the build process.  A lot of readily available RISC-V toolchains are
+unfortunately broken from this point of view.
+
+However, to work around this, a Docker container file is provided to be able to run
+tests using a known working compiler (the same one running MicroPython's RV32 and RV64
+CI jobs).
+
+To build the provided toolchain image you can use the following commands:
+
+```bash
+cd $MICROPYTHON_SOURCE_ROOT/ports/qemu
+docker build -t micropython/mpy-qemu-riscv -f Dockerfile.riscv .
+```
+
+and then tests can be run with:
+
+```bash
+cd $MICROPYTHON_SOURCE_ROOT
+docker container run -v .:/micropython --rm -it micropython/mpy-qemu-riscv make -C ports/qemu -- BOARD=VIRT_RV64 test
+```
+
+(If you use Podman, you can replace `docker` with `podman` in the commands above).
+
+Also, if you replace `VIRT_RV64` with `VIRT_RV32` you should be able to run
+32-bits tests as well!
+
 Build instructions
 ------------------
 
@@ -63,6 +104,7 @@ Available boards are:
 | `NETDUINO2`       | `arm`        | `netduino2`              |
 | `SABRELITE`       | `arm`        | `sabrelite`              |
 | `VIRT_RV32`       | `riscv32`    | `virt`                   |
+| `VIRT_RV64`       | `riscv64`    | `virt`                   |
 
 Running
 -------
@@ -100,8 +142,8 @@ tests against the serial device, for example:
     $ ./run-tests.py -t /dev/pts/1
 
 Selected native modules that come as examples with the MicroPython source tree
-can also be tested with this command (this is currently supported only for the
-`VIRT_RV32` board):
+can also be tested with this command (this is currently not supported for the
+`VIRT_RV64` board):
 
     $ make test_natmod
 
diff --git a/ports/qemu/boards/VIRT_RV64/mpconfigboard.mk b/ports/qemu/boards/VIRT_RV64/mpconfigboard.mk
new file mode 100644
index 0000000000000..dae4ca3e0364b
--- /dev/null
+++ b/ports/qemu/boards/VIRT_RV64/mpconfigboard.mk
@@ -0,0 +1,11 @@
+QEMU_ARCH = riscv64
+QEMU_MACHINE = virt
+
+CFLAGS += -DQEMU_SOC_VIRT
+CFLAGS += -DMICROPY_HW_MCU_NAME='"$(RV64_ARCH)"'
+
+LDSCRIPT = mcu/rv64/virt.ld
+
+SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv64i.o
+
+MPY_CROSS_FLAGS += -march=rv64imc
diff --git a/ports/qemu/mcu/rv64/entrypoint.s b/ports/qemu/mcu/rv64/entrypoint.s
new file mode 100644
index 0000000000000..7bf7c24c62bd9
--- /dev/null
+++ b/ports/qemu/mcu/rv64/entrypoint.s
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+        .section .start
+        .option  norvc              /* Do not emit compressed instructions. */
+        .type    start, @function
+        .global  start
+
+start:
+        .cfi_startproc
+
+        .option push
+        .option norelax
+        la   gp, _global_pointer    /* Load global pointer register. */
+        .option pop
+
+        csrw satp, zero             /* Disable supervisor mode. */
+
+        /* Fill stack with a canary value. */
+
+        li   t0, 0xBBBBBBBBBBBBBBBB /* Load canary value. */
+        la   t1, _sstack            /* Load stack area start address. */
+        la   t2, _estack            /* Load stack area end address. */
+1:
+        sd   t0, (t1)               /* Write canary. */
+        addi t1, t1, 8              /* Next word. */
+        bltu t1, t2, 1b             /* Loop until stack is filled. */
+
+        la   sp, _estack            /* Load stack pointer. */
+
+        /* Clear BSS area. */
+
+        la   t1, _sbss              /* Load BSS area start address. */
+        la   t2, _ebss              /* Load BSS area end address. */
+1:
+        sd   zero, (t1)             /* Clear word. */
+        addi t1, t1, 8              /* Next word. */
+        bltu t1, t2, 1b             /* Loop until BSS is cleared. */
+
+        /* Set program counter. */
+
+        la   t0, _entry_point       /* Load program counter address. */
+        csrw mepc, t0               /* Store it into machine exception PC. */
+        tail _entry_point           /* Jump to entry point. */
+
+        .cfi_endproc
+        .end
diff --git a/ports/qemu/mcu/rv64/interrupts.c b/ports/qemu/mcu/rv64/interrupts.c
new file mode 100644
index 0000000000000..e616e82d2793a
--- /dev/null
+++ b/ports/qemu/mcu/rv64/interrupts.c
@@ -0,0 +1,294 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
+#include <stdint.h>
+
+// Vector table
+
+void mtvec_table(void) __attribute__((naked, section(".text.mtvec"), aligned(256)));
+
+// Default interrupts
+
+#define ASSIGN_EMPTY_MACHINE_INTERRUPT(interrupt_name) \
+    void interrupt_name(void) __attribute__((alias("mtvec_nop")))
+
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_ssi);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_msi);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_sti);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_mti);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_sei);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_mei);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq0);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq1);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq2);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq3);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq4);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq5);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq6);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq7);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq8);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq9);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq10);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq11);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq12);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq13);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq14);
+ASSIGN_EMPTY_MACHINE_INTERRUPT(mtvec_plat_irq15);
+
+void mtvec_table(void) {
+    __asm volatile (
+        ".org mtvec_table + 0       \n"
+        "jal  zero, mtvec_exception \n" // Exception Handler
+        ".org mtvec_table + 4       \n"
+        "jal  zero, mtvec_ssi       \n" // Supervisor Software Interrupt
+        ".org mtvec_table + 12      \n"
+        "jal  zero, mtvec_msi       \n" // Machine Software Interrupt
+        ".org mtvec_table + 20      \n"
+        "jal  zero, mtvec_sti       \n" // Supervisor Timer Interrupt
+        ".org mtvec_table + 28      \n"
+        "jal  zero, mtvec_mti       \n" // Machine Timer Interrupt
+        ".org mtvec_table + 36      \n"
+        "jal  zero, mtvec_sei       \n" // Supervisor External Interrupt
+        ".org mtvec_table + 44      \n"
+        "jal  zero, mtvec_mei       \n" // Machine External Interrupt
+        // Not sure how many platform interrupts QEMU handles...
+        ".org mtvec_table + 48      \n"
+        "jal  mtvec_plat_irq0       \n" // Platform Interrupt #0
+        "jal  mtvec_plat_irq1       \n" // Platform Interrupt #1
+        "jal  mtvec_plat_irq2       \n" // Platform Interrupt #2
+        "jal  mtvec_plat_irq3       \n" // Platform Interrupt #3
+        "jal  mtvec_plat_irq4       \n" // Platform Interrupt #4
+        "jal  mtvec_plat_irq5       \n" // Platform Interrupt #5
+        "jal  mtvec_plat_irq6       \n" // Platform Interrupt #6
+        "jal  mtvec_plat_irq7       \n" // Platform Interrupt #7
+        "jal  mtvec_plat_irq8       \n" // Platform Interrupt #8
+        "jal  mtvec_plat_irq9       \n" // Platform Interrupt #9
+        "jal  mtvec_plat_irq10      \n" // Platform Interrupt #10
+        "jal  mtvec_plat_irq11      \n" // Platform Interrupt #11
+        "jal  mtvec_plat_irq12      \n" // Platform Interrupt #12
+        "jal  mtvec_plat_irq13      \n" // Platform Interrupt #13
+        "jal  mtvec_plat_irq14      \n" // Platform Interrupt #14
+        "jal  mtvec_plat_irq15      \n" // Platform Interrupt #15
+        :
+        :
+        : "memory"
+        );
+}
+
+static volatile uintptr_t registers_copy[35] = { 0 };
+
+static const char *exception_causes[] = {
+    "Reserved",                       // 0
+    "Supervisor software interrupt",  // 1
+    "Machine software interrupt",     // 2
+    "Supervisor timer interrupt",     // 3
+    "Machine timer interrupt",        // 4
+    "Supervisor external interrupt",  // 5
+    "Machine external interrupt",     // 6
+    "Designated for platform use",    // 7
+    "Instruction address misaligned", // 8
+    "Instruction address fault",      // 9
+    "Illegal instruction",            // 10
+    "Breakpoint",                     // 11
+    "Load address misaligned",        // 12
+    "Load address fault",             // 13
+    "Store/AMO address misaligned",   // 14
+    "Store/AMO access fault",         // 15
+    "Environment call from U-mode",   // 16
+    "Environment call from S-mode",   // 17
+    "Environment call from M-mode",   // 18
+    "Instruction page fault",         // 19
+    "Load page fault",                // 20
+    "Store/AMO page fault",           // 21
+    "Designated for custom use"       // 22
+};
+
+#define MSB64 (1ULL << 63)
+
+static const char *lookup_cause(uintptr_t mcause) {
+    if (mcause & MSB64) {
+        switch (mcause & (MSB64 - 1)) {
+            case 1:
+                return exception_causes[1];
+            case 3:
+                return exception_causes[2];
+            case 5:
+                return exception_causes[3];
+            case 7:
+                return exception_causes[4];
+            case 9:
+                return exception_causes[5];
+            case 11:
+                return exception_causes[6];
+            default:
+                return ((mcause & (MSB64 - 1)) >= 16) ?
+                       exception_causes[7] :
+                       exception_causes[0];
+        }
+    }
+
+    switch (mcause) {
+        case 0:
+            return exception_causes[8];
+        case 1:
+            return exception_causes[9];
+        case 2:
+            return exception_causes[10];
+        case 3:
+            return exception_causes[11];
+        case 4:
+            return exception_causes[12];
+        case 5:
+            return exception_causes[13];
+        case 6:
+            return exception_causes[14];
+        case 7:
+            return exception_causes[15];
+        case 8:
+            return exception_causes[16];
+        case 9:
+            return exception_causes[17];
+        case 11:
+            return exception_causes[18];
+        case 12:
+            return exception_causes[19];
+        case 13:
+            return exception_causes[20];
+        case 15:
+            return exception_causes[21];
+        default: {
+            if ((mcause >= 24 && mcause <= 31) ||
+                (mcause >= 48 && mcause <= 63)) {
+                return exception_causes[22];
+            }
+
+            return exception_causes[0];
+        }
+    }
+}
+
+#pragma GCC push_options
+#pragma GCC optimize ("align-functions=8")
+
+__attribute__((interrupt("machine"), weak)) void mtvec_nop(void) {
+}
+
+__attribute__((interrupt("machine"), weak)) void mtvec_exception(void) {
+    __asm volatile (
+        "csrrw x31, mscratch, x31  \n" // Save X31
+        "la    x31, registers_copy \n" // Load target address
+        "sd    x1, 0(x31)          \n" // Save X1
+        "sd    x2, 8(x31)          \n" // Save X2
+        "sd    x3, 16(x31)         \n" // Save X3
+        "sd    x4, 24(x31)         \n" // Save X4
+        "sd    x5, 32(x31)         \n" // Save X5
+        "sd    x6, 40(x31)         \n" // Save X6
+        "sd    x7, 48(x31)         \n" // Save X7
+        "sd    x8, 56(x31)         \n" // Save X8
+        "sd    x9, 64(x31)         \n" // Save X9
+        "sd    x10, 72(x31)        \n" // Save X10
+        "sd    x11, 80(x31)        \n" // Save X11
+        "sd    x12, 88(x31)        \n" // Save X12
+        "sd    x13, 96(x31)        \n" // Save X13
+        "sd    x14, 104(x31)       \n" // Save X14
+        "sd    x15, 112(x31)       \n" // Save X15
+        "sd    x16, 120(x31)       \n" // Save X16
+        "sd    x17, 128(x31)       \n" // Save X17
+        "sd    x18, 136(x31)       \n" // Save X18
+        "sd    x19, 144(x31)       \n" // Save X19
+        "sd    x20, 152(x31)       \n" // Save X20
+        "sd    x21, 160(x31)       \n" // Save X21
+        "sd    x22, 168(x31)       \n" // Save X22
+        "sd    x23, 176(x31)       \n" // Save X23
+        "sd    x24, 184(x31)       \n" // Save X24
+        "sd    x25, 192(x31)       \n" // Save X25
+        "sd    x26, 200(x31)       \n" // Save X26
+        "sd    x27, 208(x31)       \n" // Save X27
+        "sd    x28, 216(x31)       \n" // Save X28
+        "sd    x29, 224(x31)       \n" // Save X29
+        "sd    x30, 232(x31)       \n" // Save X30
+        "csrr  x30, mscratch       \n" // Restore X31
+        "sd    x30, 240(x31)       \n" // Save X31
+        "csrr  x30, mepc           \n" // Load MEPC
+        "sd    x30, 248(x31)       \n" // Save MEPC
+        "csrr  x30, mcause         \n" // Load MCAUSE
+        "sd    x30, 256(x31)       \n" // Save MCAUSE
+        "csrr  x30, mtval          \n" // Load MTVAL
+        "sd    x30, 264(x31)       \n" // Save MTVAL
+        "csrr  x30, mstatus        \n" // Load MSTATUS
+        "sd    x30, 272(x31)       \n" // Save MSTATUS
+        "ld    x30, 232(x31)       \n" // Restore X30
+        "ld    x31, 240(x31)       \n" // Restore X31
+        :
+        :
+        : "memory"
+        );
+
+    printf("\nMACHINE EXCEPTION CAUGHT:\n\n");
+
+    printf(" RA=%016lX  SP=%016lX  GP=%016lX  TP=%016lX  T0=%016lX  T1=%016lX\n",
+        registers_copy[0], registers_copy[1], registers_copy[2],
+        registers_copy[3], registers_copy[4], registers_copy[5]);
+    printf(" T2=%016lX  S0=%016lX  S1=%016lX  A0=%016lX  A1=%016lX  A2=%016lX\n",
+        registers_copy[6], registers_copy[7], registers_copy[8],
+        registers_copy[9], registers_copy[10], registers_copy[11]);
+    printf(" A3=%016lX  A4=%016lX  A5=%016lX  A6=%016lX  A7=%016lX  S2=%016lX\n",
+        registers_copy[12], registers_copy[13], registers_copy[14],
+        registers_copy[15], registers_copy[16], registers_copy[17]);
+    printf(" S3=%016lX  S4=%016lX  S5=%016lX  S6=%016lX  S7=%016lX  S8=%016lX\n",
+        registers_copy[18], registers_copy[19], registers_copy[20],
+        registers_copy[21], registers_copy[22], registers_copy[23]);
+    printf(" S9=%016lX S10=%016lX S11=%016lX  T3=%016lX  T4=%016lX  T5=%016lX\n",
+        registers_copy[24], registers_copy[25], registers_copy[26],
+        registers_copy[27], registers_copy[28], registers_copy[29]);
+    printf(" T6=%016lX\n\n", registers_copy[30]);
+
+    printf(" MEPC=%016lX MTVAL=%016lX MSTATUS=%016lx MCAUSE=%016lx (%s)\n",
+        registers_copy[31], registers_copy[33], registers_copy[34],
+        registers_copy[32], lookup_cause(registers_copy[32]));
+
+    exit(-1);
+}
+
+#pragma GCC pop_options
+
+void set_interrupt_table(void) {
+    __asm volatile (
+        "csrrci s0, mstatus, 8 \n" // S0 = MSTATUS & ~MIE
+        "csrw   mstatus, s0    \n" // Global machine interrupts are disabled
+        "csrw   mie, zero      \n" // Disable machine interrupts
+        "csrw   mip, zero      \n" // Clear pending machine interrupts
+        "addi   s0, %0, 1      \n" // Vectored machine interrupts enabled
+        "csrw   mtvec, s0      \n" // Set new machine vector table
+        "csrrsi s0, mstatus, 8 \n" // S0 = MSTATUS | MIE
+        "csrw   mstatus, s0    \n" // Global machine interrupts are enabled
+        :
+        : "r" (mtvec_table)
+        : "memory"
+        );
+}
diff --git a/ports/qemu/mcu/rv64/startup.c b/ports/qemu/mcu/rv64/startup.c
new file mode 100644
index 0000000000000..8c7c5b7312a0c
--- /dev/null
+++ b/ports/qemu/mcu/rv64/startup.c
@@ -0,0 +1,86 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 <stdlib.h>
+
+#include "uart.h"
+
+extern void set_interrupt_table(void);
+extern int main(int argc, char **argv);
+
+void _entry_point(void) {
+    // Set interrupt table
+    set_interrupt_table();
+    // Enable UART
+    uart_init();
+    // Now that we have a basic system up and running we can call main
+    main(0, 0);
+    // Finished
+    exit(0);
+}
+
+void exit(int status) {
+    uintptr_t semihosting_arguments[2] = { 0 };
+
+    // Exit via QEMU's RISC-V semihosting support.
+    __asm volatile (
+        ".option push            \n" // Transient options
+        ".option norvc           \n" // Do not emit compressed instructions
+        ".align 4                \n" // 16 bytes alignment
+        "mv     a1, %0           \n" // Load buffer
+        "li     t0, 0x20026      \n" // ADP_Stopped_ApplicationExit
+        "sd     t0, 0(a1)        \n" // ADP_Stopped_ApplicationExit
+        "sd     %1, 8(a1)        \n" // Exit code
+        "addi   a0, zero, 0x20   \n" // TARGET_SYS_EXIT_EXTENDED
+        "slli   zero, zero, 0x1F \n" // Entry NOP
+        "ebreak                  \n" // Give control to the debugger
+        "srai   zero, zero, 7    \n" // Semihosting call
+        ".option pop             \n" // Restore previous options set
+        :
+        : "r" (semihosting_arguments), "r" (status)
+        : "memory"
+        );
+
+    // Should never reach here.
+    for (;;) {
+    }
+}
+
+#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
+
+// Picolibc requires `stdout` to be explicitly defined.
+
+#ifdef _PICOLIBC__
+FILE *const stdout;
+#endif
diff --git a/ports/qemu/mcu/rv64/virt.ld b/ports/qemu/mcu/rv64/virt.ld
new file mode 100644
index 0000000000000..7727839e0d529
--- /dev/null
+++ b/ports/qemu/mcu/rv64/virt.ld
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Alessandro Gatti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/* Output format is 64 bits little endian. */
+OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv");
+
+/*
+ * Memory layout:
+ *
+ * 0x0000_0000_8000_0000: .text
+ *             .........: .rodata
+ * 0x0000_0000_8040_0000: .data
+ *             .........: _global_pointer
+ *             .........: .bss
+ * 0x0000_0000_8060_0000: .stack
+ * 0x0000_0000_8060_0000: _sstack
+ * 0x0000_0000_8061_FFFF: _estack
+ */
+MEMORY
+{
+    ROM   (xr)  : ORIGIN = 0x0000000080000000,        LENGTH = 4M
+    RAM   (xrw) : ORIGIN = ORIGIN(ROM) + LENGTH(ROM), LENGTH = 2M
+    STACK (rw)  : ORIGIN = ORIGIN(RAM) + LENGTH(RAM), LENGTH = 128K
+}
+
+SECTIONS
+{
+    /* Code + Read-Only data segment */
+
+    .text : ALIGN (4K)
+    {
+        *(.start)
+        *(.text)
+        . = ALIGN (4K);
+        *(.rodata)
+        _sirodata = .;
+    } > ROM
+
+    .rodata : AT (_sirodata) ALIGN (4K)
+    {
+        *(.rodata)
+    } > ROM
+
+    /* Data + BSS segment */
+
+    .data : ALIGN (4K)
+    {
+        *(.data)
+        _sibss = .;
+    } > RAM
+
+    .bss : AT (_sibss) ALIGN (4K)
+    {
+        /* Mark global pointer address. */
+        _global_pointer = .;
+
+        /* Mark BSS start. */
+        . = . + 4;
+        _sbss = .;
+        *(.bss)
+        /* Mark BSS end. */
+        _ebss = .;
+    } > RAM
+
+    /* Isolated stack segment. */
+
+    .stack : ALIGN(4K)
+    {
+        /* Mark stack start. */
+        _sstack = .;
+        . = LENGTH(STACK);
+        /* Mark stack end. */
+        _estack = .;
+    } > STACK
+}
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 6c6dd68535a12..1649d8a01ad2a 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -39,7 +39,7 @@
 #define MICROPY_EMIT_INLINE_THUMB   (1)
 #endif
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
-#elif defined(__riscv)
+#elif defined(__riscv) && (__riscv_xlen == 32)
 #define MICROPY_EMIT_RV32           (1)
 #define MICROPY_EMIT_INLINE_RV32    (1)
 #endif
@@ -67,14 +67,20 @@
 
 // type definitions for the specific machine
 
+#if defined(__riscv) && (__riscv_xlen == 64)
+#define MP_SSIZE_MAX (0x7fffffffffffffff)
+typedef int64_t mp_int_t; // must be pointer size
+typedef uint64_t mp_uint_t; // must be pointer size
+#else
 #define MP_SSIZE_MAX (0x7fffffff)
+typedef int32_t mp_int_t; // must be pointer size
+typedef uint32_t mp_uint_t; // must be pointer size
+#endif
 
 #define UINT_FMT "%lu"
 #define INT_FMT "%ld"
 #define HEX_FMT "%lx"
 
-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;
 
 // We need to provide a declaration/definition of alloca()
diff --git a/tools/ci.sh b/tools/ci.sh
index 6b974f9830460..26def3cc4de91 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -337,6 +337,13 @@ function ci_qemu_setup_rv32 {
     qemu-system-riscv32 --version
 }
 
+function ci_qemu_setup_rv64 {
+    ci_gcc_riscv_setup
+    sudo apt-get update
+    sudo apt-get install qemu-system
+    qemu-system-riscv64 --version
+}
+
 function ci_qemu_build_arm_prepare {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/qemu submodules
@@ -388,6 +395,12 @@ function ci_qemu_build_rv32 {
     make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV32 test_natmod
 }
 
+function ci_qemu_build_rv64 {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV64 submodules
+    make ${MAKEOPTS} -C ports/qemu BOARD=VIRT_RV64 test
+}
+
 ########################################################################################
 # ports/renesas-ra
 

From 42ea7bc32af49f305ece4f4e4601accea9df0534 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 7 Jul 2025 19:39:06 +0200
Subject: [PATCH 2816/3129] py/mpstate: Make it possible for mpy-cross to set
 emitter options.

This commit introduces a way for mpy-cross to pass a set of options to
the chosen emitter.

This is achieved by adding an opaque pointer to the dynamic compiler
state structure that is only accessed by emitters that have a need to
receive options from mpy-cross when generating code.  That's a way to
make this feature possible without breaking any existing code or
emitter, and without re-engineering the compiler entry point function
(together with passing the options struct downstream until it's time to
emit code).

The main use case for this is letting the RV32 emitter know which
optional extensions it can generate code with, to be able to emit better
suited code for the platform in use.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/mpstate.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/mpstate.h b/py/mpstate.h
index 138c5617300e8..325c12217521f 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -60,6 +60,12 @@ enum {
 // This structure contains dynamic configuration for the compiler.
 #if MICROPY_DYNAMIC_COMPILER
 typedef struct mp_dynamic_compiler_t {
+    // This is used to let mpy-cross pass options to the emitter chosen with
+    // `native_arch`.  The main use case for the time being is to give the
+    // RV32 emitter extended information about which extensions can be
+    // optionally used, in order to generate code that's better suited for the
+    // hardware platform the code will run on.
+    void *backend_options;
     uint8_t small_int_bits; // must be <= host small_int_bits
     uint8_t native_arch;
     uint8_t nlr_buf_num_regs;

From cb7ca6f1bc9c77969d465025f63afdd96892577a Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 19 Sep 2025 14:50:05 +0200
Subject: [PATCH 2817/3129] py/asmrv32: Use RV32 Zba opcodes if possible.

This commit adds optional support for selected Zba opcodes (address
generation) to speed up Viper and native code generation on MCUs where
those opcodes are supported (namely RP2350).

Right now support for these opcodes is opt-in, as extension detection
granularity on the RISC-V platform is still a bit in flux.  Relying on
the 'B' bit in the MISA register may yield both false positives and
false negatives depending on the RISC-V implementation the check runs
on.

As a side-effect of Zba support, regular non-byte load/stores have been
made shorter by two bytes.  Whilst this makes code using Zba take up the
same space as non-Zba code, the former will still be faster as it will
have to process just one instruction instead of two, without stalling
registers between the shift and the addition needed to compute the final
offset.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c  | 42 +++++++++++++++++++++++++++++++++
 py/asmrv32.h  | 65 ++++++++++++++++++++++++---------------------------
 py/mpconfig.h |  5 ++++
 3 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index 723d32cdd7c89..9313e61ccb710 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -36,6 +36,8 @@
 #if MICROPY_EMIT_RV32
 
 #include "py/asmrv32.h"
+#include "py/mpstate.h"
+#include "py/persistentcode.h"
 
 #if MICROPY_DEBUG_VERBOSE
 #define DEBUG_PRINT (1)
@@ -555,6 +557,46 @@ void asm_rv32_emit_optimised_xor(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs)
     asm_rv32_opcode_xor(state, rd, rd, rs);
 }
 
+static bool asm_rv32_allow_zba_opcodes(void) {
+    return asm_rv32_allowed_extensions() & RV32_EXT_ZBA;
+}
+
+static void asm_rv32_fix_up_scaled_reg_reg_reg(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t operation_size) {
+    assert(operation_size <= 2 && "Operation size value out of range.");
+
+    if (operation_size > 0 && asm_rv32_allow_zba_opcodes()) {
+        // sh{1,2}add rs1, rs2, rs1
+        asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 1 << operation_size, 0x10, rs1, rs2, rs1));
+    } else {
+        if (operation_size > 0) {
+            asm_rv32_opcode_cslli(state, rs2, operation_size);
+        }
+        asm_rv32_opcode_cadd(state, rs1, rs2);
+    }
+}
+
+void asm_rv32_emit_load_reg_reg_reg(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t operation_size) {
+    asm_rv32_fix_up_scaled_reg_reg_reg(state, rs1, rs2, operation_size);
+    if (operation_size == 2 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs1)) {
+        // c.lw rd', offset(rs')
+        asm_rv32_opcode_clw(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), RV32_MAP_IN_C_REGISTER_WINDOW(rs1), 0);
+    } else {
+        // lbu|lhu|lw rd, offset(rs)
+        asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, RV32_LOAD_OPCODE_TABLE[operation_size], rd, rs1, 0));
+    }
+}
+
+void asm_rv32_emit_store_reg_reg_reg(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t operation_size) {
+    asm_rv32_fix_up_scaled_reg_reg_reg(state, rs1, rs2, operation_size);
+    if (operation_size == 2 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs1)) {
+        // c.sw rd', offset(rs')
+        asm_rv32_opcode_csw(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), RV32_MAP_IN_C_REGISTER_WINDOW(rs1), 0);
+    } else {
+        // sb|sh|sw rd, offset(rs)
+        asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0x23, operation_size, rs1, rd, 0));
+    }
+}
+
 void asm_rv32_meta_comparison_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {
     // c.li rd, 1       ;
     // beq  rs1, rs2, 6 ; PC + 0
diff --git a/py/asmrv32.h b/py/asmrv32.h
index dac9c028b07a5..f320d3ee0dcdc 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -122,6 +122,16 @@ typedef struct _asm_rv32_t {
     mp_uint_t locals_stack_offset;
 } asm_rv32_t;
 
+enum {
+    RV32_EXT_NONE = 0,
+    RV32_EXT_ZBA = 1 << 0,
+};
+
+typedef struct _asm_rv32_backend_options_t {
+    // This is a bitmask holding a combination of RV32_EXT_* entries.
+    uint8_t allowed_extensions;
+} asm_rv32_backend_options_t;
+
 void asm_rv32_entry(asm_rv32_t *state, mp_uint_t locals);
 void asm_rv32_exit(asm_rv32_t *state);
 void asm_rv32_end_pass(asm_rv32_t *state);
@@ -679,6 +689,19 @@ static inline void asm_rv32_opcode_xori(asm_rv32_t *state, mp_uint_t rd, mp_uint
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x04, rd, rs, immediate));
 }
 
+static inline uint8_t asm_rv32_allowed_extensions(void) {
+    uint8_t extensions = 0;
+    #if MICROPY_EMIT_RV32_ZBA
+    extensions |= RV32_EXT_ZBA;
+    #endif
+    #if MICROPY_DYNAMIC_COMPILER
+    if (mp_dynamic_compiler.backend_options != NULL) {
+        extensions |= ((asm_rv32_backend_options_t *)mp_dynamic_compiler.backend_options)->allowed_extensions;
+    }
+    #endif
+    return extensions;
+}
+
 #define ASM_WORD_SIZE (4)
 #define ASM_HALFWORD_SIZE (2)
 
@@ -702,6 +725,8 @@ void asm_rv32_meta_comparison_lt(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2
 void asm_rv32_meta_comparison_le(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison);
 
 void asm_rv32_emit_optimised_load_immediate(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate);
+void asm_rv32_emit_load_reg_reg_reg(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t operation_size);
+void asm_rv32_emit_store_reg_reg_reg(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t operation_size);
 
 #ifdef GENERIC_ASM_API
 
@@ -760,40 +785,12 @@ void asm_rv32_emit_store_reg_reg_offset(asm_rv32_t *state, mp_uint_t source, mp_
 #define ASM_SUB_REG_REG(state, rd, rs) asm_rv32_opcode_sub(state, rd, rd, rs)
 #define ASM_XOR_REG_REG(state, rd, rs) asm_rv32_emit_optimised_xor(state, rd, rs)
 #define ASM_CLR_REG(state, rd)
-#define ASM_LOAD8_REG_REG_REG(state, rd, rs1, rs2) \
-    do { \
-        asm_rv32_opcode_cadd(state, rs1, rs2); \
-        asm_rv32_opcode_lbu(state, rd, rs1, 0); \
-    } while (0)
-#define ASM_LOAD16_REG_REG_REG(state, rd, rs1, rs2) \
-    do { \
-        asm_rv32_opcode_slli(state, rs2, rs2, 1); \
-        asm_rv32_opcode_cadd(state, rs1, rs2); \
-        asm_rv32_opcode_lhu(state, rd, rs1, 0); \
-    } while (0)
-#define ASM_LOAD32_REG_REG_REG(state, rd, rs1, rs2) \
-    do { \
-        asm_rv32_opcode_slli(state, rs2, rs2, 2); \
-        asm_rv32_opcode_cadd(state, rs1, rs2); \
-        asm_rv32_opcode_lw(state, rd, rs1, 0); \
-    } while (0)
-#define ASM_STORE8_REG_REG_REG(state, rd, rs1, rs2) \
-    do { \
-        asm_rv32_opcode_cadd(state, rs1, rs2); \
-        asm_rv32_opcode_sb(state, rd, rs1, 0); \
-    } while (0)
-#define ASM_STORE16_REG_REG_REG(state, rd, rs1, rs2) \
-    do { \
-        asm_rv32_opcode_slli(state, rs2, rs2, 1); \
-        asm_rv32_opcode_cadd(state, rs1, rs2); \
-        asm_rv32_opcode_sh(state, rd, rs1, 0); \
-    } while (0)
-#define ASM_STORE32_REG_REG_REG(state, rd, rs1, rs2) \
-    do { \
-        asm_rv32_opcode_slli(state, rs2, rs2, 2); \
-        asm_rv32_opcode_cadd(state, rs1, rs2); \
-        asm_rv32_opcode_sw(state, rd, rs1, 0); \
-    } while (0)
+#define ASM_LOAD8_REG_REG_REG(state, rd, rs1, rs2) asm_rv32_emit_load_reg_reg_reg(state, rd, rs1, rs2, 0)
+#define ASM_LOAD16_REG_REG_REG(state, rd, rs1, rs2) asm_rv32_emit_load_reg_reg_reg(state, rd, rs1, rs2, 1)
+#define ASM_LOAD32_REG_REG_REG(state, rd, rs1, rs2) asm_rv32_emit_load_reg_reg_reg(state, rd, rs1, rs2, 2)
+#define ASM_STORE8_REG_REG_REG(state, rd, rs1, rs2) asm_rv32_emit_store_reg_reg_reg(state, rd, rs1, rs2, 0)
+#define ASM_STORE16_REG_REG_REG(state, rd, rs1, rs2) asm_rv32_emit_store_reg_reg_reg(state, rd, rs1, rs2, 1)
+#define ASM_STORE32_REG_REG_REG(state, rd, rs1, rs2) asm_rv32_emit_store_reg_reg_reg(state, rd, rs1, rs2, 2)
 
 #endif
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 303eb08f90bea..ae44b461d37f1 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -421,6 +421,11 @@
 #define MICROPY_EMIT_RV32 (0)
 #endif
 
+// Whether to emit RISC-V RV32 Zba opcodes in native code
+#ifndef MICROPY_EMIT_RV32_ZBA
+#define MICROPY_EMIT_RV32_ZBA (0)
+#endif
+
 // Whether to enable the RISC-V RV32 inline assembler
 #ifndef MICROPY_EMIT_INLINE_RV32
 #define MICROPY_EMIT_INLINE_RV32 (0)

From 965c77ade9512532529379e26b37eaa7ed4a6e02 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 7 Jul 2025 22:30:34 +0200
Subject: [PATCH 2818/3129] mpy-cross/main: Add support for RV32 Zba opcodes.

This commit adds a new command line switch to inform the RV32 emitter to
use Zba opcodes in its output.

A new implementation-specific option was introduced, called
"-march-flags", that will contain a list of additional
architecture-specific flags to pass to the chosen native emitter
implementation.

At the moment only the RV32 emitter can make use of this command line
facility: if the architecture flags string equals to "zba"
(case-sensitive), then the native emitter will emit Zba opcodes if it
has a chance to do so.

At the moment there is no check on whether additional architecture flags
using to build a MPY file are compatible with the target the output code
is run on, so use this with caution.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 mpy-cross/main.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 63a74d0844b72..9dcad3c5d8cf8 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -40,6 +40,12 @@
 #include "ports/windows/fmode.h"
 #endif
 
+#if MICROPY_EMIT_NATIVE && MICROPY_EMIT_RV32
+#include "py/asmrv32.h"
+
+static asm_rv32_backend_options_t rv32_options = { 0 };
+#endif
+
 // Command line options, with their defaults
 static uint emit_opt = MP_EMIT_OPT_NONE;
 mp_uint_t mp_verbose_flag = 0;
@@ -132,6 +138,8 @@ static int usage(char **argv) {
         "-march=<arch> : set architecture for native emitter;\n"
         "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp,\n"
         "                armv7emdp, xtensa, xtensawin, rv32imc, rv64imc, host, debug\n"
+        "-march-flags=<flags> : set architecture-specific flags (OUTPUT FILE MAY NOT WORK ON ALL TARGETS!)\n"
+        "                       supported flags for rv32imc: zba\n"
         "\n"
         "Implementation specific options:\n", argv[0]
         );
@@ -237,11 +245,13 @@ MP_NOINLINE int main_(int argc, char **argv) {
     // 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;
+    mp_dynamic_compiler.backend_options = NULL;
 
     const char *input_file = NULL;
     const char *output_file = NULL;
     const char *source_file = NULL;
     bool option_parsing_active = true;
+    const char *arch_flags = NULL;
 
     // parse main options
     for (int a = 1; a < argc; a++) {
@@ -343,6 +353,8 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 } else {
                     return usage(argv);
                 }
+            } else if (strncmp(argv[a], "-march-flags=", sizeof("-march-flags=") - 1) == 0) {
+                arch_flags = argv[a] + sizeof("-march-flags=") - 1;
             } else if (strcmp(argv[a], "--") == 0) {
                 option_parsing_active = false;
             } else {
@@ -357,6 +369,27 @@ MP_NOINLINE int main_(int argc, char **argv) {
         }
     }
 
+    if (arch_flags && mp_dynamic_compiler.native_arch != MP_NATIVE_ARCH_NONE) {
+        bool processed = false;
+        #if MICROPY_EMIT_NATIVE && MICROPY_EMIT_RV32
+        if (mp_dynamic_compiler.native_arch == MP_NATIVE_ARCH_RV32IMC) {
+            mp_dynamic_compiler.backend_options = (void *)&rv32_options;
+            if (strncmp(arch_flags, "zba", sizeof("zba") - 1) == 0) {
+                rv32_options.allowed_extensions |= RV32_EXT_ZBA;
+                processed = true;
+            }
+        }
+        #endif
+        if (!processed) {
+            mp_printf(&mp_stderr_print, "unrecognised arch flags\n");
+            exit(1);
+        }
+        mp_printf(&mp_stderr_print,
+            "WARNING: Using architecture-specific flags may create a MPY file whose code won't run on all targets!\n"
+            "         Currently there are no checks in the module file loader for whether the chosen flags used to\n"
+            "         build the MPY file are compatible with the running target.\n\n");
+    }
+
     #if MICROPY_EMIT_NATIVE
     if ((MP_STATE_VM(default_emit_opt) == MP_EMIT_OPT_NATIVE_PYTHON
          || MP_STATE_VM(default_emit_opt) == MP_EMIT_OPT_VIPER)

From 40dbf774151140839c74e0bf226bb7d254129eb9 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 7 Jul 2025 22:09:25 +0200
Subject: [PATCH 2819/3129] py/emitinlinerv32: Add Zba opcodes to the inline
 assembler.

This commit adds support for Zba opcodes to the RV32 inline assembler.

Three new opcodes were added, SH1ADD, SH2ADD, and SH3ADD, which performs
a scaled addition (by 1, 2, or 3 bits respectively).  At the moment only
qemu's VIRT_RV32 and rp2's RPI_PICO2/RPI_PICO2_W ports support these
opcodes (the latter only when using the RISCV variant).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.h                                  |  18 ++
 py/emitinlinerv32.c                           | 177 +++++++++---------
 tests/feature_check/inlineasm_rv32_zba.py     |  10 +
 tests/feature_check/inlineasm_rv32_zba.py.exp |   1 +
 tests/inlineasm/rv32/asmzba.py                |  18 ++
 tests/inlineasm/rv32/asmzba.py.exp            |   3 +
 tests/run-tests.py                            |   6 +
 7 files changed, 146 insertions(+), 87 deletions(-)
 create mode 100644 tests/feature_check/inlineasm_rv32_zba.py
 create mode 100644 tests/feature_check/inlineasm_rv32_zba.py.exp
 create mode 100644 tests/inlineasm/rv32/asmzba.py
 create mode 100644 tests/inlineasm/rv32/asmzba.py.exp

diff --git a/py/asmrv32.h b/py/asmrv32.h
index f320d3ee0dcdc..27a08cf9fde11 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -593,6 +593,24 @@ static inline void asm_rv32_opcode_remu(asm_rv32_t *state, mp_uint_t rd, mp_uint
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x07, 0x01, rd, rs1, rs2));
 }
 
+// SH1ADD RD, RS1, RS2
+static inline void asm_rv32_opcode_sh1add(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0010000 ..... ..... 010 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x02, 0x10, rd, rs1, rs2));
+}
+
+// SH2ADD RD, RS1, RS2
+static inline void asm_rv32_opcode_sh2add(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0010000 ..... ..... 100 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x04, 0x10, rd, rs1, rs2));
+}
+
+// SH3ADD RD, RS1, RS2
+static inline void asm_rv32_opcode_sh3add(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
+    // R: 0010000 ..... ..... 110 ..... 0110011
+    asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_R(0x33, 0x06, 0x10, rd, rs1, rs2));
+}
+
 // SLL RD, RS1, RS2
 static inline void asm_rv32_opcode_sll(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2) {
     // R: 0000000 ..... ..... 001 ..... 0110011
diff --git a/py/emitinlinerv32.c b/py/emitinlinerv32.c
index a539242b84d95..8693b3bd1c03c 100644
--- a/py/emitinlinerv32.c
+++ b/py/emitinlinerv32.c
@@ -234,7 +234,8 @@ typedef struct _opcode_t {
     uint32_t argument2_shift : 4;
     uint32_t argument3_kind : 4;
     uint32_t argument3_shift : 4;
-    // 4 bits available here
+    uint32_t required_extensions : 1;
+    // 3 bits available here
     void *emitter;
 } opcode_t;
 
@@ -297,88 +298,91 @@ static const uint32_t OPCODE_MASKS[] = {
 };
 
 static const opcode_t OPCODES[] = {
-    { MP_QSTR_add,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_add       },
-    { MP_QSTR_addi,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_addi      },
-    { MP_QSTR_and_,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_and       },
-    { MP_QSTR_andi,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_andi      },
-    { MP_QSTR_auipc,      MASK_FFFFFFFF, MASK_FFFFF000, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   12, N,  0, asm_rv32_opcode_auipc     },
-    { MP_QSTR_beq,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_beq       },
-    { MP_QSTR_bge,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bge       },
-    { MP_QSTR_bgeu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bgeu      },
-    { MP_QSTR_blt,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_blt       },
-    { MP_QSTR_bltu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bltu      },
-    { MP_QSTR_bne,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, asm_rv32_opcode_bne       },
-    { MP_QSTR_csrrc,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_csrrc     },
-    { MP_QSTR_csrrs,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_csrrs     },
-    { MP_QSTR_csrrw,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_csrrw     },
-    { MP_QSTR_csrrci,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, asm_rv32_opcode_csrrci    },
-    { MP_QSTR_csrrsi,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, asm_rv32_opcode_csrrsi    },
-    { MP_QSTR_csrrwi,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, asm_rv32_opcode_csrrwi    },
-    { MP_QSTR_c_add,      MASK_FFFFFFFE, MASK_FFFFFFFE, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, asm_rv32_opcode_cadd      },
-    { MP_QSTR_c_addi,     MASK_FFFFFFFE, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  R,  0, IZ,  0,  N,  0, asm_rv32_opcode_caddi     },
-    { MP_QSTR_c_addi4spn, MASK_0000FF00, MASK_000003FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, IUZ, 0,  N,  0, asm_rv32_opcode_caddi4spn },
-    { MP_QSTR_c_and,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_cand      },
-    { MP_QSTR_c_andi,     MASK_0000FF00, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, I,   0,  N,  0, asm_rv32_opcode_candi     },
-    { MP_QSTR_c_beqz,     MASK_0000FF00, MASK_000001FE, MASK_NOT_USED, 2, CALL_RL,  RC, 0, L,   0,  N,  0, asm_rv32_opcode_cbeqz     },
-    { MP_QSTR_c_bnez,     MASK_0000FF00, MASK_000001FE, MASK_NOT_USED, 2, CALL_RL,  RC, 0, L,   0,  N,  0, asm_rv32_opcode_cbnez     },
-    { MP_QSTR_c_ebreak,   MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_cebreak   },
-    { MP_QSTR_c_j,        MASK_00000FFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_L,   L,  0, N,   0,  N,  0, asm_rv32_opcode_cj        },
-    { MP_QSTR_c_jal,      MASK_00000FFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_L,   L,  0, N,   0,  N,  0, asm_rv32_opcode_cjal      },
-    { MP_QSTR_c_jalr,     MASK_FFFFFFFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_R,   R,  0, N,   0,  N,  0, asm_rv32_opcode_cjalr     },
-    { MP_QSTR_c_jr,       MASK_FFFFFFFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_R,   R,  0, N,   0,  N,  0, asm_rv32_opcode_cjr       },
-    { MP_QSTR_c_li,       MASK_FFFFFFFE, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, asm_rv32_opcode_cli       },
-    { MP_QSTR_c_lui,      MASK_FFFFFFFA, MASK_0001F800, MASK_NOT_USED, 2, CALL_RI,  R,  0, IUZ, 12, N,  0, asm_rv32_opcode_clui      },
-    { MP_QSTR_c_lw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, asm_rv32_opcode_clw       },
-    { MP_QSTR_c_lwsp,     MASK_FFFFFFFE, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, asm_rv32_opcode_clwsp     },
-    { MP_QSTR_c_mv,       MASK_FFFFFFFE, MASK_FFFFFFFE, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, asm_rv32_opcode_cmv       },
-    { MP_QSTR_c_nop,      MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_cnop      },
-    { MP_QSTR_c_or,       MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_cor       },
-    { MP_QSTR_c_slli,     MASK_FFFFFFFE, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  R,  0, IU,  0,  N,  0, asm_rv32_opcode_cslli     },
-    { MP_QSTR_c_srai,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, asm_rv32_opcode_csrai     },
-    { MP_QSTR_c_srli,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, asm_rv32_opcode_csrli     },
-    { MP_QSTR_c_sub,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_csub      },
-    { MP_QSTR_c_sw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, asm_rv32_opcode_csw       },
-    { MP_QSTR_c_swsp,     MASK_FFFFFFFF, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, asm_rv32_opcode_cswsp     },
-    { MP_QSTR_c_xor,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, asm_rv32_opcode_cxor      },
-    { MP_QSTR_div,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_div       },
-    { MP_QSTR_divu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_divu      },
-    { MP_QSTR_ebreak,     MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_ebreak    },
-    { MP_QSTR_ecall,      MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, asm_rv32_opcode_ecall     },
-    { MP_QSTR_jal,        MASK_FFFFFFFF, MASK_001FFFFE, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, asm_rv32_opcode_jal       },
-    { MP_QSTR_jalr,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_jalr      },
-    { MP_QSTR_la,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, opcode_la                 },
-    { MP_QSTR_lb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lb        },
-    { MP_QSTR_lbu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lbu       },
-    { MP_QSTR_lh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lh        },
-    { MP_QSTR_lhu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lhu       },
-    { MP_QSTR_li,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, opcode_li                 },
-    { MP_QSTR_lui,        MASK_FFFFFFFF, MASK_FFFFF000, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   12, N,  0, asm_rv32_opcode_lui       },
-    { MP_QSTR_lw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_lw        },
-    { MP_QSTR_mv,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, asm_rv32_opcode_cmv       },
-    { MP_QSTR_mul,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mul       },
-    { MP_QSTR_mulh,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mulh      },
-    { MP_QSTR_mulhsu,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mulhsu    },
-    { MP_QSTR_mulhu,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_mulhu     },
-    { MP_QSTR_or_,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_or        },
-    { MP_QSTR_ori,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_ori       },
-    { MP_QSTR_rem,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_rem       },
-    { MP_QSTR_remu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_remu      },
-    { MP_QSTR_sb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_sb        },
-    { MP_QSTR_sh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_sh        },
-    { MP_QSTR_sll,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sll       },
-    { MP_QSTR_slli,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_slli      },
-    { MP_QSTR_slt,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_slt       },
-    { MP_QSTR_slti,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_slti      },
-    { MP_QSTR_sltiu,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_sltiu     },
-    { MP_QSTR_sltu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sltu      },
-    { MP_QSTR_sra,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sra       },
-    { MP_QSTR_srai,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_srai      },
-    { MP_QSTR_srl,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_srl       },
-    { MP_QSTR_srli,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, asm_rv32_opcode_srli      },
-    { MP_QSTR_sub,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_sub       },
-    { MP_QSTR_sw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, asm_rv32_opcode_sw        },
-    { MP_QSTR_xor,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, asm_rv32_opcode_xor       },
-    { MP_QSTR_xori,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, asm_rv32_opcode_xori      },
+    { MP_QSTR_add,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_add       },
+    { MP_QSTR_addi,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_addi      },
+    { MP_QSTR_and_,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_and       },
+    { MP_QSTR_andi,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_andi      },
+    { MP_QSTR_auipc,      MASK_FFFFFFFF, MASK_FFFFF000, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   12, N,  0, RV32_EXT_NONE, asm_rv32_opcode_auipc     },
+    { MP_QSTR_beq,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, RV32_EXT_NONE, asm_rv32_opcode_beq       },
+    { MP_QSTR_bge,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, RV32_EXT_NONE, asm_rv32_opcode_bge       },
+    { MP_QSTR_bgeu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, RV32_EXT_NONE, asm_rv32_opcode_bgeu      },
+    { MP_QSTR_blt,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, RV32_EXT_NONE, asm_rv32_opcode_blt       },
+    { MP_QSTR_bltu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, RV32_EXT_NONE, asm_rv32_opcode_bltu      },
+    { MP_QSTR_bne,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00001FFE, 3, CALL_RRL, R,  0, R,   0,  L,  0, RV32_EXT_NONE, asm_rv32_opcode_bne       },
+    { MP_QSTR_csrrc,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_csrrc     },
+    { MP_QSTR_csrrs,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_csrrs     },
+    { MP_QSTR_csrrw,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_csrrw     },
+    { MP_QSTR_csrrci,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_csrrci    },
+    { MP_QSTR_csrrsi,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_csrrsi    },
+    { MP_QSTR_csrrwi,     MASK_FFFFFFFF, MASK_00000FFF, MASK_0000001F, 3, CALL_RII, R,  0, IU,  0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_csrrwi    },
+    { MP_QSTR_c_add,      MASK_FFFFFFFE, MASK_FFFFFFFE, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cadd      },
+    { MP_QSTR_c_addi,     MASK_FFFFFFFE, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  R,  0, IZ,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_caddi     },
+    { MP_QSTR_c_addi4spn, MASK_0000FF00, MASK_000003FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, IUZ, 0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_caddi4spn },
+    { MP_QSTR_c_and,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cand      },
+    { MP_QSTR_c_andi,     MASK_0000FF00, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, I,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_candi     },
+    { MP_QSTR_c_beqz,     MASK_0000FF00, MASK_000001FE, MASK_NOT_USED, 2, CALL_RL,  RC, 0, L,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cbeqz     },
+    { MP_QSTR_c_bnez,     MASK_0000FF00, MASK_000001FE, MASK_NOT_USED, 2, CALL_RL,  RC, 0, L,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cbnez     },
+    { MP_QSTR_c_ebreak,   MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cebreak   },
+    { MP_QSTR_c_j,        MASK_00000FFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_L,   L,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cj        },
+    { MP_QSTR_c_jal,      MASK_00000FFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_L,   L,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cjal      },
+    { MP_QSTR_c_jalr,     MASK_FFFFFFFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_R,   R,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cjalr     },
+    { MP_QSTR_c_jr,       MASK_FFFFFFFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_R,   R,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cjr       },
+    { MP_QSTR_c_li,       MASK_FFFFFFFE, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cli       },
+    { MP_QSTR_c_lui,      MASK_FFFFFFFA, MASK_0001F800, MASK_NOT_USED, 2, CALL_RI,  R,  0, IUZ, 12, N,  0, RV32_EXT_NONE, asm_rv32_opcode_clui      },
+    { MP_QSTR_c_lw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, RV32_EXT_NONE, asm_rv32_opcode_clw       },
+    { MP_QSTR_c_lwsp,     MASK_FFFFFFFE, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_clwsp     },
+    { MP_QSTR_c_mv,       MASK_FFFFFFFE, MASK_FFFFFFFE, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cmv       },
+    { MP_QSTR_c_nop,      MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cnop      },
+    { MP_QSTR_c_or,       MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cor       },
+    { MP_QSTR_c_slli,     MASK_FFFFFFFE, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  R,  0, IU,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cslli     },
+    { MP_QSTR_c_srai,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_csrai     },
+    { MP_QSTR_c_srli,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_csrli     },
+    { MP_QSTR_c_sub,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_csub      },
+    { MP_QSTR_c_sw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, RV32_EXT_NONE, asm_rv32_opcode_csw       },
+    { MP_QSTR_c_swsp,     MASK_FFFFFFFF, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cswsp     },
+    { MP_QSTR_c_xor,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cxor      },
+    { MP_QSTR_div,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_div       },
+    { MP_QSTR_divu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_divu      },
+    { MP_QSTR_ebreak,     MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_ebreak    },
+    { MP_QSTR_ecall,      MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_ecall     },
+    { MP_QSTR_jal,        MASK_FFFFFFFF, MASK_001FFFFE, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_jal       },
+    { MP_QSTR_jalr,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_jalr      },
+    { MP_QSTR_la,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, RV32_EXT_NONE, opcode_la                 },
+    { MP_QSTR_lb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lb        },
+    { MP_QSTR_lbu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lbu       },
+    { MP_QSTR_lh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lh        },
+    { MP_QSTR_lhu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lhu       },
+    { MP_QSTR_li,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, opcode_li                 },
+    { MP_QSTR_lui,        MASK_FFFFFFFF, MASK_FFFFF000, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   12, N,  0, RV32_EXT_NONE, asm_rv32_opcode_lui       },
+    { MP_QSTR_lw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lw        },
+    { MP_QSTR_mv,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cmv       },
+    { MP_QSTR_mul,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_mul       },
+    { MP_QSTR_mulh,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_mulh      },
+    { MP_QSTR_mulhsu,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_mulhsu    },
+    { MP_QSTR_mulhu,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_mulhu     },
+    { MP_QSTR_or_,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_or        },
+    { MP_QSTR_ori,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_ori       },
+    { MP_QSTR_rem,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_rem       },
+    { MP_QSTR_remu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_remu      },
+    { MP_QSTR_sb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sb        },
+    { MP_QSTR_sh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sh        },
+    { MP_QSTR_sh1add,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_ZBA,  asm_rv32_opcode_sh1add    },
+    { MP_QSTR_sh2add,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_ZBA,  asm_rv32_opcode_sh2add    },
+    { MP_QSTR_sh3add,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_ZBA,  asm_rv32_opcode_sh3add    },
+    { MP_QSTR_sll,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sll       },
+    { MP_QSTR_slli,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_slli      },
+    { MP_QSTR_slt,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_slt       },
+    { MP_QSTR_slti,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_slti      },
+    { MP_QSTR_sltiu,      MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_sltiu     },
+    { MP_QSTR_sltu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sltu      },
+    { MP_QSTR_sra,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sra       },
+    { MP_QSTR_srai,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_srai      },
+    { MP_QSTR_srl,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_srl       },
+    { MP_QSTR_srli,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_srli      },
+    { MP_QSTR_sub,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sub       },
+    { MP_QSTR_sw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sw        },
+    { MP_QSTR_xor,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_xor       },
+    { MP_QSTR_xori,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_xori      },
 };
 
 #undef RC
@@ -785,10 +789,9 @@ static void emit_inline_rv32_opcode(emit_inline_asm_t *emit, qstr opcode, mp_uin
         }
     }
 
-    if (!opcode_data) {
-        emit_inline_rv32_error_exc(emit,
-            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                MP_ERROR_TEXT("unknown RV32 instruction '%q'"), opcode));
+    if (!opcode_data || (asm_rv32_allowed_extensions() & opcode_data->required_extensions) != opcode_data->required_extensions) {
+        emit_inline_rv32_error_exc(emit, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+            MP_ERROR_TEXT("invalid RV32 instruction '%q'"), opcode));
         return;
     }
 
diff --git a/tests/feature_check/inlineasm_rv32_zba.py b/tests/feature_check/inlineasm_rv32_zba.py
new file mode 100644
index 0000000000000..81228819042ee
--- /dev/null
+++ b/tests/feature_check/inlineasm_rv32_zba.py
@@ -0,0 +1,10 @@
+# check if RISC-V 32 inline asm supported Zba opcodes
+
+
+@micropython.asm_rv32
+def f():
+    sh1add(a0, a0, a0)
+
+
+f()
+print("rv32_zba")
diff --git a/tests/feature_check/inlineasm_rv32_zba.py.exp b/tests/feature_check/inlineasm_rv32_zba.py.exp
new file mode 100644
index 0000000000000..fde22f5f40090
--- /dev/null
+++ b/tests/feature_check/inlineasm_rv32_zba.py.exp
@@ -0,0 +1 @@
+rv32_zba
diff --git a/tests/inlineasm/rv32/asmzba.py b/tests/inlineasm/rv32/asmzba.py
new file mode 100644
index 0000000000000..75f3573c864d6
--- /dev/null
+++ b/tests/inlineasm/rv32/asmzba.py
@@ -0,0 +1,18 @@
+@micropython.asm_rv32
+def test_sh1add(a0, a1):
+    sh1add(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def test_sh2add(a0, a1):
+    sh2add(a0, a0, a1)
+
+
+@micropython.asm_rv32
+def test_sh3add(a0, a1):
+    sh3add(a0, a0, a1)
+
+
+print(hex(test_sh1add(10, 20)))
+print(hex(test_sh2add(10, 20)))
+print(hex(test_sh3add(10, 20)))
diff --git a/tests/inlineasm/rv32/asmzba.py.exp b/tests/inlineasm/rv32/asmzba.py.exp
new file mode 100644
index 0000000000000..5f56bd95642a4
--- /dev/null
+++ b/tests/inlineasm/rv32/asmzba.py.exp
@@ -0,0 +1,3 @@
+0x28
+0x3c
+0x64
diff --git a/tests/run-tests.py b/tests/run-tests.py
index c3017542cc9a7..d6eb9a3fbc258 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -816,6 +816,12 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
                 skip_tests.add("inlineasm/thumb/asmfpmuldiv.py")
                 skip_tests.add("inlineasm/thumb/asmfpsqrt.py")
 
+        if args.inlineasm_arch == "rv32":
+            # Check if @micropython.asm_rv32 supports Zba instructions, and skip such tests if it doesn't
+            output = run_feature_check(pyb, args, "inlineasm_rv32_zba.py")
+            if output != b"rv32_zba\n":
+                skip_tests.add("inlineasm/rv32/asmzba.py")
+
         # Check if emacs repl is supported, and skip such tests if it's not
         t = run_feature_check(pyb, args, "repl_emacs_check.py")
         if "True" not in str(t, "ascii"):

From 1fea1e20db7f677db5fb10b1e0becd7713755bb6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 11 Sep 2025 21:59:31 +0200
Subject: [PATCH 2820/3129] qemu: Enable Zba opcodes for the VIRT_RV32 board.

This commit enables the usage of the Zba address generation opcodes in
the QEMU port when targeting the "VIRT_RV32" board, which emulates a
generic RV32 target.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile                          | 2 +-
 ports/qemu/boards/VIRT_RV32/mpconfigboard.mk | 2 +-
 ports/qemu/mpconfigport.h                    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 685bb3536c47f..84711cc45aebd 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -193,7 +193,7 @@ CFLAGS += $(SPECS_FRAGMENT)
 LDFLAGS += $(SPECS_FRAGMENT)
 endif
 
-RUN_TESTS_FULL_ARGS = -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../ports/qemu/$<" $(RUN_TESTS_ARGS)
+RUN_TESTS_FULL_ARGS = -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../ports/qemu/$<" --mpy-cross-flags='$(MPY_CROSS_FLAGS)' $(RUN_TESTS_ARGS)
 
 ################################################################################
 # Source files and libraries
diff --git a/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
index ce12720928e32..6a3b94a98bc46 100644
--- a/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
+++ b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
@@ -8,4 +8,4 @@ LDSCRIPT = mcu/rv32/virt.ld
 
 SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
 
-MPY_CROSS_FLAGS += -march=rv32imc
+MPY_CROSS_FLAGS += -march=rv32imc -march-flags=zba
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 1649d8a01ad2a..3d2466a919546 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -41,6 +41,7 @@
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 #elif defined(__riscv) && (__riscv_xlen == 32)
 #define MICROPY_EMIT_RV32           (1)
+#define MICROPY_EMIT_RV32_ZBA       (1)
 #define MICROPY_EMIT_INLINE_RV32    (1)
 #endif
 

From 8757eb715ef9da9e1da7704d552210d5bc1b76e2 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Mon, 7 Jul 2025 22:29:24 +0200
Subject: [PATCH 2821/3129] rp2/mpconfigport: Enable Zba opcodes in RISC-V
 mode.

This commit enables generation of Zba opcodes by the native emitter
for the Pico2, as its RISC-V implementation supports both of those
extensions (see section 3.8 of the RP2350 datasheet).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/rp2/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 0c226538cda1a..e6e8aa076fa08 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -109,6 +109,7 @@
 #endif
 #elif PICO_RISCV
 #define MICROPY_EMIT_RV32                       (1)
+#define MICROPY_EMIT_RV32_ZBA                   (1)
 #define MICROPY_EMIT_INLINE_RV32                (1)
 #endif
 

From 353814df59171e435708813243f47cfbcf7c1646 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Fri, 19 Sep 2025 10:04:52 -0500
Subject: [PATCH 2822/3129] tools/ci.sh: Fix missing `set -e` when run as a
 script.

This is needed to correctly stop after an error in a CI step when running
`ci.sh` as a script.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 26def3cc4de91..3e34bd6fa860f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1011,6 +1011,7 @@ function _ci_main {
             _ci_help
         ;;
         (*)
+            set -e
             cd $(dirname "$0")/..
             while [ $# -ne 0 ]; do
                 ci_$1

From a277fe4a36f09558e57c89b7e365e34af14b1cf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Sep 2025 19:06:53 +0000
Subject: [PATCH 2823/3129] github/workflows: Bump actions/checkout from 4 to
 5.

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ports_qemu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ports_qemu.yml b/.github/workflows/ports_qemu.yml
index e743f29c9966f..cdecfae6c9b38 100644
--- a/.github/workflows/ports_qemu.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -54,7 +54,7 @@ jobs:
   build_and_test_rv64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install packages
       run: source tools/ci.sh && ci_qemu_setup_rv64
     - name: Build and run test suite

From cf097932a2a7ffd03958a8a14d9c87bd477ac5c3 Mon Sep 17 00:00:00 2001
From: Mike Wang <mikewang000000@gmail.com>
Date: Sun, 21 Sep 2025 01:44:59 +0800
Subject: [PATCH 2824/3129] unix/modsocket: Set file descriptor to -1 on close.

After s.close(), s.fileno() now returns -1, matching CPython behavior.
Some code relies on this compatibility, as it allows checking whether
a socket is closed by testing its fileno() value. This change ensures
better interoperability with existing Python code and libraries.

Signed-off-by: Mike Wang <mikewang000000@gmail.com>
---
 ports/unix/modsocket.c        |  9 ++++++---
 tests/extmod/socket_fileno.py | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 tests/extmod/socket_fileno.py

diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index 14f321d34fb1d..e7f25cdd43db7 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -140,9 +140,12 @@ static mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
             // The rationale MicroPython follows is that close() just releases
             // file descriptor. If you're interested to catch I/O errors before
             // closing fd, fsync() it.
-            MP_THREAD_GIL_EXIT();
-            close(self->fd);
-            MP_THREAD_GIL_ENTER();
+            if (self->fd >= 0) {
+                MP_THREAD_GIL_EXIT();
+                close(self->fd);
+                MP_THREAD_GIL_ENTER();
+            }
+            self->fd = -1;
             return 0;
 
         case MP_STREAM_GET_FILENO:
diff --git a/tests/extmod/socket_fileno.py b/tests/extmod/socket_fileno.py
new file mode 100644
index 0000000000000..da15825e3d56b
--- /dev/null
+++ b/tests/extmod/socket_fileno.py
@@ -0,0 +1,17 @@
+# Test socket.fileno() functionality
+
+try:
+    import socket
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+if not hasattr(socket.socket, "fileno"):
+    print("SKIP")
+    raise SystemExit
+
+s = socket.socket()
+print(s.fileno() >= 0)
+
+s.close()
+print(s.fileno())  #  should print -1

From 8c389db6ea552a7a5bfcb2de644bc3e8849ef521 Mon Sep 17 00:00:00 2001
From: Mike Wang <mikewang000000@gmail.com>
Date: Sun, 21 Sep 2025 00:09:17 +0800
Subject: [PATCH 2825/3129] unix/main: Ensure atexit function is called with -m
 <module>.

Previously, when running `micropython -m <module>` and the module called
sys.exit(), the registered atexit function was not executed. This was due
to sys.exit() raising a SystemExit exception, which bypassed the atexit
handler. This change fixes the issue so that the atexit function is
properly invoked when exiting via sys.exit().

Additionally, following the pattern in execute_from_lexer(),
mp_hal_set_interrupt_char() and mp_handle_pending() handling were added to
ensure that the atexit function is also executed when the user exits via
Ctrl-C.

Signed-off-by: Mike Wang <mikewang000000@gmail.com>
---
 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 0acd8c9f27a98..db50e12f59821 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -669,12 +669,18 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 subpkg_tried = false;
 
             reimport:
+                mp_hal_set_interrupt_char(CHAR_CTRL_C);
                 if (nlr_push(&nlr) == 0) {
                     mod = mp_builtin___import__(MP_ARRAY_SIZE(import_args), import_args);
+                    mp_hal_set_interrupt_char(-1);
+                    mp_handle_pending(true);
                     nlr_pop();
                 } else {
                     // uncaught exception
-                    return handle_uncaught_exception(nlr.ret_val) & 0xff;
+                    mp_hal_set_interrupt_char(-1);
+                    mp_handle_pending(false);
+                    ret = handle_uncaught_exception(nlr.ret_val) & 0xff;
+                    break;
                 }
 
                 // If this module is a package, see if it has a `__main__.py`.

From bf08f601fa67f005d5f21095b8fd455f7c7e7fab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 22 Sep 2025 11:41:36 +1000
Subject: [PATCH 2826/3129] tests/cmdline: Add tests for using -m combined with
 sys.atexit.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cmdline/cmd_module_atexit.py         | 16 ++++++++++++++++
 tests/cmdline/cmd_module_atexit.py.exp     |  3 +++
 tests/cmdline/cmd_module_atexit_exc.py     | 19 +++++++++++++++++++
 tests/cmdline/cmd_module_atexit_exc.py.exp |  3 +++
 4 files changed, 41 insertions(+)
 create mode 100644 tests/cmdline/cmd_module_atexit.py
 create mode 100644 tests/cmdline/cmd_module_atexit.py.exp
 create mode 100644 tests/cmdline/cmd_module_atexit_exc.py
 create mode 100644 tests/cmdline/cmd_module_atexit_exc.py.exp

diff --git a/tests/cmdline/cmd_module_atexit.py b/tests/cmdline/cmd_module_atexit.py
new file mode 100644
index 0000000000000..100bc112777e1
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit.py
@@ -0,0 +1,16 @@
+# cmdline: -m cmdline.cmd_module_atexit
+#
+# Test running as a module and using sys.atexit.
+
+import sys
+
+if not hasattr(sys, "atexit"):
+    print("SKIP")
+    raise SystemExit
+
+# Verify we ran as a module.
+print(sys.argv)
+
+sys.atexit(lambda: print("done"))
+
+print("start")
diff --git a/tests/cmdline/cmd_module_atexit.py.exp b/tests/cmdline/cmd_module_atexit.py.exp
new file mode 100644
index 0000000000000..2a0f756b1e799
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit.py.exp
@@ -0,0 +1,3 @@
+['cmdline.cmd_module_atexit', 'cmdline/cmd_module_atexit.py']
+start
+done
diff --git a/tests/cmdline/cmd_module_atexit_exc.py b/tests/cmdline/cmd_module_atexit_exc.py
new file mode 100644
index 0000000000000..88940a7741fb9
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit_exc.py
@@ -0,0 +1,19 @@
+# cmdline: -m cmdline.cmd_module_atexit_exc
+#
+# Test running as a module and using sys.atexit, with script completion via sys.exit.
+
+import sys
+
+if not hasattr(sys, "atexit"):
+    print("SKIP")
+    raise SystemExit
+
+# Verify we ran as a module.
+print(sys.argv)
+
+sys.atexit(lambda: print("done"))
+
+print("start")
+
+# This will raise SystemExit to finish the script, and atexit should still be run.
+sys.exit(0)
diff --git a/tests/cmdline/cmd_module_atexit_exc.py.exp b/tests/cmdline/cmd_module_atexit_exc.py.exp
new file mode 100644
index 0000000000000..6320d9d2d3011
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit_exc.py.exp
@@ -0,0 +1,3 @@
+['cmdline.cmd_module_atexit_exc', 'cmdline/cmd_module_atexit_exc.py']
+start
+done

From 592affce3f7118bbfa814fe92f127e9a37194d79 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 21 Sep 2025 15:01:19 +0900
Subject: [PATCH 2827/3129] stm32/make-stmconst.py: Fix missing peripheral
 consts in stm module.

Lines like the following were not handled by `make-stmconst.py`:

    #define APBPERIPH_BASE        (PERIPH_BASE)

This leads to missing definitions on stm module.  For example, `stm.RTC` is
not defined if `RTC_BASE` is defined as

    #define RTC_BASE              (APBPERIPH_BASE + 0x00002800UL)

because `APBPERIPH_BASE` is not handled as a valid id.

This patch modifies the RegExp so it can handle the above.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/make-stmconst.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 770033ef59de6..5601eb0af4208 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -41,7 +41,10 @@ class Lexer:
                 r"#define +(?P<id>[A-Z0-9_]+) +\(?(\(uint32_t\))?(?P<hex>0x[0-9A-F]+)U?L?\)?($| */\*)"
             ),
         ),
-        ("#define X", re.compile(r"#define +(?P<id>[A-Z0-9_]+) +(?P<id2>[A-Z0-9_]+)($| +/\*)")),
+        (
+            "#define X",
+            re.compile(r"#define +(?P<id>[A-Z0-9_]+) +\(?(?P<id2>[A-Z0-9_]+)\)?($| +/\*)"),
+        ),
         (
             "#define X+hex",
             re.compile(

From 65b2dc255b2415e7afd6960587a1857297f6913a Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 21 Sep 2025 10:04:48 +0900
Subject: [PATCH 2828/3129] stm32/powerctrlboot: Refactor clock settings for
 STM32G0.

Clock parameter definitions should be in `mpconfigboard.h` and use them at
clock initialization.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h | 14 +++++++++-----
 ports/stm32/powerctrlboot.c                      | 15 +++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
index ead36ed6c763f..e62243ca330e4 100644
--- a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
@@ -18,13 +18,17 @@
 #define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_2
 
 #if MICROPY_HW_CLK_USE_HSI
-#define MICROPY_HW_CLK_PLLM (16)
+#define MICROPY_HW_CLK_PLLM (1)
+#define MICROPY_HW_CLK_PLLN (8)
 #else
-#define MICROPY_HW_CLK_PLLM (8)
+// HSE comes from ST-LINK 8MHz, not crystal.
+#define MICROPY_HW_CLK_USE_BYPASS (1)
+#define MICROPY_HW_CLK_PLLM (1)
+#define MICROPY_HW_CLK_PLLN (16)
 #endif
-#define MICROPY_HW_CLK_PLLN (336)
-#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV4)
-#define MICROPY_HW_CLK_PLLQ (7)
+#define MICROPY_HW_CLK_PLLP (2)
+#define MICROPY_HW_CLK_PLLQ (2)
+#define MICROPY_HW_CLK_PLLR (2)
 
 // USART1 config
 #define MICROPY_HW_UART1_TX         (pin_A9)
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 2354deb4da1e9..a8ef8c34af8e6 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -145,17 +145,12 @@ void SystemClock_Config(void) {
     }
 
     // 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
+        (MICROPY_HW_CLK_PLLP - 1) << RCC_PLLCFGR_PLLP_Pos | RCC_PLLCFGR_PLLPEN
+            | (MICROPY_HW_CLK_PLLQ - 1) << RCC_PLLCFGR_PLLQ_Pos | RCC_PLLCFGR_PLLQEN
+            | (MICROPY_HW_CLK_PLLR - 1) << RCC_PLLCFGR_PLLR_Pos | RCC_PLLCFGR_PLLREN
+            | MICROPY_HW_CLK_PLLN << RCC_PLLCFGR_PLLN_Pos
+            | (MICROPY_HW_CLK_PLLM - 1) << RCC_PLLCFGR_PLLM_Pos
             | RCC_PLLCFGR_PLLSRC_HSI;
 
     #else

From 7ba82219f3d40689479704edfcc97fcf5b914b2c Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 21 Sep 2025 10:07:02 +0900
Subject: [PATCH 2829/3129] stm32/adc: Fix pyb.ADC issue for STM32G0.

Fixes are:
- The internal sensors of STM32G0 are connected channel 12, 13, 14.
- Update adc_refcor before reading vbat and tempsensor because reference
  values are at VDDA=3.0V.
- The method of initialize of sampling time is different with other MCUs:
  STM32G0 should initialize SamplingTimeCommon1/2 first.  When reading
  value from ADC, ADC_ChannelConfTypeDef.SamplingTime should be specified
  SamplingTimeCommon1 or SamplingTimeCommon2.  In this patch,
  SamplingTimeCommon2 is used for internal sensors and SamplingTimeCommon1
  is used for external ADC channels.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index f47e9eaad7b35..07368f4733d0d 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -212,6 +212,14 @@ static inline uint32_t adc_get_internal_channel(uint32_t channel) {
     if (channel == 16) {
         channel = ADC_CHANNEL_TEMPSENSOR;
     }
+    #elif defined(STM32G0)
+    if (channel == 12) {
+        channel = ADC_CHANNEL_TEMPSENSOR;
+    } else if (channel == 13) {
+        channel = ADC_CHANNEL_VREFINT;
+    } else if (channel == 14) {
+        channel = ADC_CHANNEL_VBAT;
+    }
     #elif defined(STM32G4)
     if (channel == 16) {
         channel = ADC_CHANNEL_TEMPSENSOR_ADC1;
@@ -344,6 +352,10 @@ static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
     adch->Init.DMAContinuousRequests = DISABLE;
     #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G0)
+    adch->Init.SamplingTimeCommon1 = ADC_SAMPLETIME_12CYCLES_5;
+    adch->Init.SamplingTimeCommon2 = ADC_SAMPLETIME_160CYCLES_5;
+    #endif
     #if defined(STM32G4) || defined(STM32H5)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV16;
     #else
@@ -432,9 +444,9 @@ static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     }
     #elif defined(STM32G0)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
-        sConfig.SamplingTime = ADC_SAMPLETIME_160CYCLES_5;
+        sConfig.SamplingTime = ADC_SAMPLINGTIME_COMMON_2;
     } else {
-        sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5;
+        sConfig.SamplingTime = ADC_SAMPLINGTIME_COMMON_1;
     }
     #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
@@ -939,9 +951,9 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
     return 0.0f; // TODO
     #else
 
-    #if defined(STM32G4) || defined(STM32L1) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L1) || defined(STM32L4)
     // Update the reference correction factor before reading tempsensor
-    // because TS_CAL1 and TS_CAL2 of STM32G4,L1/L4 are at VDDA=3.0V
+    // because TS_CAL1 and TS_CAL2 of STM32G0,G4,L1,L4 are at VDDA=3.0V
     adc_read_core_vref(adcHandle);
     #endif
 
@@ -966,9 +978,9 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
 }
 
 float adc_read_core_vbat(ADC_HandleTypeDef *adcHandle) {
-    #if defined(STM32G4) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4)
     // Update the reference correction factor before reading tempsensor
-    // because VREFINT of STM32G4,L4 is at VDDA=3.0V
+    // because VREFINT of STM32G0,G4,L4 is at VDDA=3.0V
     adc_read_core_vref(adcHandle);
     #endif
 

From ddf1a383ca110fa6787ea71ff92e3e110378bf2e Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 21 Sep 2025 10:07:53 +0900
Subject: [PATCH 2830/3129] stm32/machine_adc: Fix machine.ADC so it works on
 STM32G0.

Fixes are:
- Enable VREG before initializing ADC.
- The channel value of internal sensor should convert with
  __LL_ADC_CHANNEL_TO_DECIMAL_NB().

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/machine_adc.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 63cd4e089dd8b..20f392516cc7f 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -244,12 +244,12 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     }
     #endif
 
-    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || 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)
         mp_hal_delay_us(10); // T_ADCVREG_STUP
-        #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         mp_hal_delay_us(20); // T_ADCVREG_STUP
         #endif
     }
@@ -379,6 +379,12 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     #else
     adc->SMPR = sample_time << ADC_SMPR_SMP_Pos; // select sample time
     #endif
+
+    #if defined(STM32G0)
+    if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) {
+        channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
+    }
+    #endif
     adc->CHSELR = 1 << channel; // select channel for conversion
 
     #elif defined(STM32F4) || defined(STM32F7)

From 86323519835114a9761cd65f073a4bdaafcfec1c Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 21 Sep 2025 11:51:09 +0900
Subject: [PATCH 2831/3129] stm32/timer: Fix Timer(4) issue for STM32G0.

The definition of TIM_ENTRY of TIM4 is incorrect.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 8aa0b3a2dda4b..cb196210ba08a 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -865,7 +865,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
 
     #if defined(TIM4)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
-    TIM_ENTRY(3, TIM3_TIM4_IRQn),
+    TIM_ENTRY(4, TIM3_TIM4_IRQn),
     #else
     TIM_ENTRY(4, TIM4_IRQn),
     #endif

From 9a13688c13b6e0c2fe50f7a90f165b05e5b21991 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 21 Sep 2025 12:37:40 +0900
Subject: [PATCH 2832/3129] stm32/timer: Enable RTCAPB_CLK for STM32G0.

To get worked pyb.RTC and machine.RTC on STM32G0.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index b90d17149bde4..fa28fda6a893e 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -108,7 +108,7 @@ void rtc_init_start(bool force_init) {
     // Enable the RTC APB bus clock, to communicate with the RTC.
     #if defined(STM32H5)
     __HAL_RCC_RTC_CLK_ENABLE();
-    #elif defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32WL)
     __HAL_RCC_RTCAPB_CLK_ENABLE();
     #endif
 

From 531261497403b0932e524ea3ffb0ce56e071ba97 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sun, 21 Sep 2025 16:07:17 +0900
Subject: [PATCH 2833/3129] stm32/rtc: Fix RTC.wakeup issue for STM32G0.

To clear wakeup interrupt flag, set CWUTF on RTC_SCR instead of RTC_MISR.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 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 9eda3cb23974f..052550a8fa8d6 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -541,7 +541,7 @@ void RTC_IRQHandler(void) {
 #if defined(STM32G0)
 void RTC_TAMP_IRQHandler(void) {
     IRQ_ENTER(RTC_TAMP_IRQn);
-    RTC->MISR &= ~RTC_MISR_WUTMF; // clear wakeup interrupt flag
+    RTC->SCR |= RTC_SCR_CWUTF; // 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);

From 616f35f7f8783c133f67e2eedc6adbf2d26a7e47 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Sep 2025 16:30:57 +1000
Subject: [PATCH 2834/3129] tests/README: Update docs for run-perfbench.py now
 that it uses -t.

Follow up to dbbc7d96672bb44a04f27fef32231dd7340d7952

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/README.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 21e14eee5e128..6a6395c39cb39 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -67,16 +67,14 @@ 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
+To run tests on a firmware target using a serial port, run the command line like
 this:
 
 ```
-./run-perfbench.py -p -d /dev/ttyACM0 168 100
+./run-perfbench.py -t /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.
+* `-t PORTNAME` is the serial port to use (and it supports shorthand like `a0`).
 * `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
@@ -136,11 +134,11 @@ 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`
+utility: `./run-perfbench.py -t a0 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
+-m pybv-run1.txt pybv-run2.txt` or compare scores with `./run-perfbench.py -s
 pybv-run1.txt pybv-run2.txt`:
 
 ```

From 0d9aafd9f508c89dc13bbf06583f24cbee3fedfa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Aug 2025 13:46:36 +1000
Subject: [PATCH 2835/3129] tools/metrics.py: Compute mpy-cross size as part of
 size metrics.

Add support to `tools/metrics.py` to compute the size delta of mpy-cross,
alongside the sizes of port firmware.  This is an easy and cheap addition
because mpy-cross is usually built before the ports are.

Although the size of mpy-cross is not critical, it's still a nice
indication of how changes affect code size, and helps to eliminate any
unwanted increases in mpy-cross.

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

diff --git a/tools/metrics.py b/tools/metrics.py
index f6189e65abb4d..150b40bff10cd 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -57,6 +57,8 @@ def __init__(self, name, dir, output, make_flags=None):
         self.needs_mpy_cross = dir not in ("bare-arm", "minimal")
 
 
+mpy_cross_output = "mpy-cross/build/mpy-cross"
+
 port_data = {
     "b": PortData("bare-arm", "bare-arm", "build/firmware.elf"),
     "m": PortData("minimal x86", "minimal", "build/firmware.elf"),
@@ -142,6 +144,8 @@ def do_diff(args):
     max_delta = None
     for key, value1 in data1.items():
         value2 = data2[key]
+        if key == mpy_cross_output:
+            name = "mpy-cross"
         for port in port_data.values():
             if key == "ports/{}/{}".format(port.dir, port.output):
                 name = port.name
@@ -207,6 +211,10 @@ def do_sizes(args):
     ports = parse_port_list(args)
 
     print("COMPUTING SIZES")
+
+    if any(port.needs_mpy_cross for port in ports):
+        syscmd("size", mpy_cross_output)
+
     for port in ports:
         syscmd("size", "ports/{}/{}".format(port.dir, port.output))
 

From 91abffb4d66abd22ba4cb29beb3cde4ba7a7eda6 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 9 Sep 2025 12:34:30 +1000
Subject: [PATCH 2836/3129] github/workflows: Retry Windows VC2017 & 2019
 install steps.

The Windows 8.1 sdksetup.exe in particular seems seems to fail
intermittently pretty often, so retry each step up to four times before
failing outright.

Delete the Chocolatey temp directory between each run, as it seems like the
root cause is a corrupt download.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_windows.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 84a93a50433db..16396f0fdd45d 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -29,8 +29,10 @@ jobs:
         include:
         - visualstudio: '2017'
           vs_version: '[15, 16)'
+          custom_vs_install: true
         - visualstudio: '2019'
           vs_version: '[16, 17)'
+          custom_vs_install: true
         - visualstudio: '2022'
           vs_version: '[17, 18)'
         # trim down the number of jobs in the matrix
@@ -43,18 +45,17 @@ jobs:
     env:
       CI_BUILD_CONFIGURATION: ${{ matrix.configuration }}
     steps:
-    - name: Install Visual Studio 2017
-      if: matrix.visualstudio == '2017'
+    - name: Install Visual Studio ${{ matrix.visualstudio }}
+      if: matrix.custom_vs_install
+      shell: bash
+      # Shell functions in this block are to retry intermittent corrupt
+      # downloads (with a clean download dir) before failing the job outright
       run: |
-        choco install visualstudio2017buildtools
-        choco install visualstudio2017-workload-vctools
-        choco install windows-sdk-8.1
-    - name: Install Visual Studio 2019
-      if: matrix.visualstudio == '2019'
-      run: |
-        choco install visualstudio2019buildtools
-        choco install visualstudio2019-workload-vctools
-        choco install windows-sdk-8.1
+        try () { ($@) || ($@) || ($@) || ($@) }
+        clean_install () ( rm -rf $TEMP/chocolatey; choco install $1 )
+        try clean_install visualstudio${{ matrix.visualstudio }}buildtools
+        try clean_install visualstudio${{ matrix.visualstudio }}-workload-vctools
+        try clean_install windows-sdk-8.1
     - uses: microsoft/setup-msbuild@v2
       with:
         vs-version: ${{ matrix.vs_version }}

From 046013a1ffbeccb971b6067ff389ebd0350b9e9c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 24 Sep 2025 14:58:08 +1000
Subject: [PATCH 2837/3129] github/workflows: Run esp32&zephyr daily to keep
 mstr branch caches hot.

Currently it seems if master branch doesn't build for 1-2 days then the
cached ESP-IDF install (1.6GB) and Zephyr workspace (3.1GB) caches expire.

Then each PR branch has to create its own redundant cache instead of
falling back to the default branch cache, which is expensive and quickly
blows our 10GB cache limit.

Currently this is mitigated (and possibly happens more frequently) due to
GitHub's relatively soft enforcement of the limit (at time of writing we're
using 33GB of 10GB), but apparently they're going to start enforcing it
more aggressively in October.

(We may find we need to do this twice a day...)

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ports_esp32.yml  | 4 ++++
 .github/workflows/ports_zephyr.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index b86c6a76f82c7..c87552ade31c3 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -12,6 +12,10 @@ on:
       - 'lib/**'
       - 'drivers/**'
       - 'ports/esp32/**'
+  schedule:
+     # Scheduled run exists to keep master branch ESP-IDF cache entry hot
+     # and prevent creating many redundant per-branch cache entries instead.
+     - cron: "20 0 * * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index 9ce7034398669..09ffd616b4026 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -12,6 +12,10 @@ on:
       - 'lib/**'
       - 'ports/zephyr/**'
       - 'tests/**'
+  schedule:
+     # Scheduled run exists to keep master branch Zephyr cache entry hot
+     # and prevent creating many redundant per-branch cache entries instead.
+     - cron: "40 4 * * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From d0d9d978eb57e2c9ce996d8a7cbab3e8dd1c37d5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 22 Sep 2025 18:31:28 +0200
Subject: [PATCH 2838/3129] esp32/machine_uart: Call uart_wait_tx_done() only
 with driver installed.

Otherwise an error message will pop up at the first instatiation
of the UART object.

Addresses #18122 / #18123.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_uart.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 36b5bcb0ff92e..ea403f4221835 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -253,9 +253,6 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_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);
 
-    // wait for all data to be transmitted before changing settings
-    uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000));
-
     // If UART is being freshly initialised then restore object defaults
     if (!uart_is_driver_installed(self->uart_num)) {
         self->bits = 8;
@@ -299,6 +296,9 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
             case UART_NUM_MAX:
                 assert(0); // Range is checked in mp_machine_uart_make_new, value should be unreachable
         }
+    } else {
+        // wait for all data to be transmitted before changing settings
+        uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000));
     }
 
     // Default driver parameters, should correspond to values set above

From 6c9940b1f6fb75749ba2ac7949faaf76ace802da Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Aug 2025 20:12:40 +1000
Subject: [PATCH 2839/3129] stm32/adc: Get ADC working on STM32N6 MCUs.

Changes made here for N6 are:
- set RIF security attributes for ADC12
- clock ADC12 at 50MHz (maximum) so it runs at spec (max 5Msamp/sec)
- increase sampling time for standard channels to 46.5 cycles
- calibrate ADC in `adc.c`
- correctly clear ADC_CFGR1_RES bits in `machine_adc.c`
- set preselection register in `machine_adc.c`

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.c         |  9 +++++++--
 ports/stm32/machine_adc.c | 25 ++++++++++++++++---------
 ports/stm32/main.c        |  1 +
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 07368f4733d0d..c912d9df3a77d 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -314,6 +314,11 @@ static void adcx_clock_enable(ADC_HandleTypeDef *adch) {
 static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adcx_clock_enable(adch);
 
+    // Set ADC clock prescaler, if it's not done by HAL_ADC_Init() below.
+    #if defined(STM32N6)
+    LL_RCC_SetADCPrescaler(4 - 1); // 200MHz / 4 = 50MHz
+    #endif
+
     adch->Init.Resolution = resolution;
     adch->Init.ContinuousConvMode = DISABLE;
     adch->Init.DiscontinuousConvMode = DISABLE;
@@ -387,7 +392,7 @@ static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     #endif
     #if defined(STM32G0)
     HAL_ADCEx_Calibration_Start(adch);
-    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
     HAL_ADCEx_Calibration_Start(adch, ADC_SINGLE_ENDED);
     #endif
 }
@@ -461,7 +466,7 @@ static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_246CYCLES_5;
     } else {
-        sConfig.SamplingTime = ADC_SAMPLETIME_11CYCLES_5;
+        sConfig.SamplingTime = ADC_SAMPLETIME_46CYCLES_5;
     }
     sConfig.SingleDiff = ADC_SINGLE_ENDED;
     sConfig.OffsetNumber = ADC_OFFSET_NONE;
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 20f392516cc7f..14384429c4428 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -86,7 +86,7 @@
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_247CYCLES_5
 #elif defined(STM32N6)
-#define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_11CYCLES_5
+#define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_46CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_246CYCLES_5
 #endif
 
@@ -232,6 +232,8 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     ADC1_COMMON->CCR = 0; // ADCPR=PCLK/2
     #elif defined(STM32L1)
     ADC1_COMMON->CCR = 1 << ADC_CCR_ADCPRE_Pos; // ADCPRE=2
+    #elif defined(STM32N6)
+    LL_RCC_SetADCPrescaler(4 - 1); // 200MHz / 4 = 50MHz
     #elif defined(STM32WB)
     ADC1_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos | 0 << ADC_CCR_CKMODE_Pos; // PRESC=1, MODE=ASYNC
     #elif defined(STM32WL)
@@ -324,7 +326,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
 
     #elif defined(STM32N6)
 
-    uint32_t cfgr1_clr = ADC_CFGR1_CONT | ADC_CFGR1_EXTEN;
+    uint32_t cfgr1_clr = ADC_CFGR1_CONT | ADC_CFGR1_EXTEN | ADC_CFGR1_RES;
     uint32_t cfgr1 = res << ADC_CFGR1_RES_Pos;
     adc->CFGR1 = (adc->CFGR1 & ~cfgr1_clr) | cfgr1;
 
@@ -439,13 +441,6 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ) || defined(STM32N6)
     ADC_Common_TypeDef *adc_common = ADC12_COMMON;
     #elif defined(STM32H7)
-    #if defined(ADC_VER_V5_V90)
-    if (adc != ADC3) {
-        adc->PCSEL_RES0 |= 1 << channel;
-    }
-    #else
-    adc->PCSEL |= 1 << channel;
-    #endif
     ADC_Common_TypeDef *adc_common = adc == ADC3 ? ADC3_COMMON : ADC12_COMMON;
     #elif defined(STM32L4)
     ADC_Common_TypeDef *adc_common = ADCx_COMMON;
@@ -475,6 +470,7 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
         adc->OR |= ADC_OR_OP0; // Enable Vddcore channel on ADC2
     #endif
     }
+
     #if defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB)
     // MCU uses encoded literals for internal channels -> extract ADC channel for following code
     if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) {
@@ -482,6 +478,17 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     }
     adc->DIFSEL &= ~(1 << channel); // Set channel to Single-ended.
     #endif
+
+    #if defined(STM32H7) || defined(STM32N6)
+    #if defined(ADC_VER_V5_V90)
+    if (adc != ADC3) {
+        adc->PCSEL_RES0 |= 1 << channel;
+    }
+    #else
+    adc->PCSEL |= 1 << channel;
+    #endif
+    #endif
+
     adc->SQR1 = (channel & 0x1f) << ADC_SQR1_SQ1_Pos | (1 - 1) << ADC_SQR1_L_Pos;
     __IO uint32_t *smpr;
     if (channel <= 9) {
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 8bce6b477a5d1..51c29fe7537d5 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -316,6 +316,7 @@ static void risaf_init(void) {
     rimc_master.MasterCID = RIF_CID_1;
     rimc_master.SecPriv = RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV;
 
+    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_ADC12, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
     HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_SDMMC1, &rimc_master);
     HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_SDMMC1, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
     HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_SDMMC2, &rimc_master);

From 706cc8d833ebd2685b324cab48f1a7d8e0c8bca2 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 13:56:49 +0100
Subject: [PATCH 2840/3129] shared/runtime/mpirq: Factor out mp_irq_dispatch()
 and use it.

Separate out a routine to call an arbitrary function with arbitrary
argument either directly as a hard-IRQ handler or scheduled as a soft-IRQ
handler, adjusting mp_irq_handler() to wrap this. This can then be used
to implement other hard/soft callbacks, such as for machine.Timer.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 shared/runtime/mpirq.c | 25 +++++++++++++++++--------
 shared/runtime/mpirq.h |  1 +
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index 6111b9b10cfe4..0b3489c5141f3 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -65,9 +65,10 @@ void mp_irq_init(mp_irq_obj_t *self, const mp_irq_methods_t *methods, mp_obj_t p
     self->ishard = false;
 }
 
-void mp_irq_handler(mp_irq_obj_t *self) {
-    if (self->handler != mp_const_none) {
-        if (self->ishard) {
+int mp_irq_dispatch(mp_obj_t handler, mp_obj_t parent, bool ishard) {
+    int result = 0;
+    if (handler != mp_const_none) {
+        if (ishard) {
             // 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.
@@ -75,22 +76,30 @@ void mp_irq_handler(mp_irq_obj_t *self) {
             gc_lock();
             nlr_buf_t nlr;
             if (nlr_push(&nlr) == 0) {
-                mp_call_function_1(self->handler, self->parent);
+                mp_call_function_1(handler, parent);
                 nlr_pop();
             } else {
-                // Uncaught exception; disable the callback so that it doesn't run again
-                self->methods->trigger(self->parent, 0);
-                self->handler = mp_const_none;
                 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));
+                result = -1;
             }
             gc_unlock();
             mp_sched_unlock();
         } else {
             // Schedule call to user function
-            mp_sched_schedule(self->handler, self->parent);
+            mp_sched_schedule(handler, parent);
         }
     }
+    return result;
+}
+
+
+void mp_irq_handler(mp_irq_obj_t *self) {
+    if (mp_irq_dispatch(self->handler, self->parent, self->ishard) < 0) {
+        // Uncaught exception; disable the callback so that it doesn't run again
+        self->methods->trigger(self->parent, 0);
+        self->handler = mp_const_none;
+    }
 }
 
 /******************************************************************************/
diff --git a/shared/runtime/mpirq.h b/shared/runtime/mpirq.h
index dd423c0101137..c65741e0e49d1 100644
--- a/shared/runtime/mpirq.h
+++ b/shared/runtime/mpirq.h
@@ -77,6 +77,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);
+int mp_irq_dispatch(mp_obj_t handler, mp_obj_t parent, bool ishard);
 void mp_irq_handler(mp_irq_obj_t *self);
 
 #endif // MICROPY_INCLUDED_LIB_UTILS_MPIRQ_H

From ad11df7f7ac73b1d9d0c69274a5e56140c621401 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 13:59:53 +0100
Subject: [PATCH 2841/3129] shared/runtime/softtimer: Add support for hard
 callbacks.

Add a flag SOFT_TIMER_HARD_CALLBACK to request that a soft timer's python
callback is run directly from the IRQ handler with the scheduler and heap
locked, instead of being scheduled via mp_sched_schedule().

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 shared/runtime/softtimer.c | 7 ++++++-
 shared/runtime/softtimer.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
index 92a0d6d511100..b154cd9d7b5b3 100644
--- a/shared/runtime/softtimer.c
+++ b/shared/runtime/softtimer.c
@@ -28,6 +28,7 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
+#include "shared/runtime/mpirq.h"
 #include "softtimer.h"
 
 #ifdef MICROPY_SOFT_TIMER_TICKS_MS
@@ -88,7 +89,11 @@ void soft_timer_handler(void) {
         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));
+            if (mp_irq_dispatch(entry->py_callback, MP_OBJ_FROM_PTR(entry),
+                entry->flags & SOFT_TIMER_FLAG_HARD_CALLBACK)) {
+                // Uncaught exception; disable the callback so it doesn't run again.
+                entry->mode = SOFT_TIMER_MODE_ONE_SHOT;
+            }
         } else if (entry->c_callback) {
             entry->c_callback(entry);
         }
diff --git a/shared/runtime/softtimer.h b/shared/runtime/softtimer.h
index 6921c9f47d66a..464d2067ede93 100644
--- a/shared/runtime/softtimer.h
+++ b/shared/runtime/softtimer.h
@@ -30,6 +30,7 @@
 
 #define SOFT_TIMER_FLAG_PY_CALLBACK (1)
 #define SOFT_TIMER_FLAG_GC_ALLOCATED (2)
+#define SOFT_TIMER_FLAG_HARD_CALLBACK (4)
 
 #define SOFT_TIMER_MODE_ONE_SHOT (1)
 #define SOFT_TIMER_MODE_PERIODIC (2)

From 955b6a907cdaf15135470d2c71bcede8620eaa6f Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:02:32 +0100
Subject: [PATCH 2842/3129] extmod/machine_timer: Support hard IRQ soft timer
 callbacks.

machine.Timer() has inconsistent behaviour between ports: some run
callbacks in hard IRQ context whereas others schedule them like soft IRQs.

As on the rp2 port, add support to the generic software timer for a hard=
argument to explicitly choose between these, setting the default to False
to match the existing behaviour. This enables hard timer callbacks for
the alif, mimxrt and samd ports.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 extmod/machine_timer.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extmod/machine_timer.c b/extmod/machine_timer.c
index 665be82ce1211..7029f7ddef00c 100644
--- a/extmod/machine_timer.c
+++ b/extmod/machine_timer.c
@@ -42,13 +42,14 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
 }
 
 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, };
+    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, ARG_hard, };
     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} },
+        { MP_QSTR_hard,         MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
 
     // Parse args
@@ -81,6 +82,12 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
         self->py_callback = args[ARG_callback].u_obj;
     }
 
+    if (args[ARG_hard].u_bool) {
+        self->flags |= SOFT_TIMER_FLAG_HARD_CALLBACK;
+    } else {
+        self->flags &= ~SOFT_TIMER_FLAG_HARD_CALLBACK;
+    }
+
     if (self->py_callback != mp_const_none) {
         soft_timer_insert(self, self->delta_ms);
     }

From b7bf24e4812d2d27c61c8cb0dbcbbfc1a28a271c Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:04:45 +0100
Subject: [PATCH 2843/3129] rp2/machine_timer: Use mp_irq_dispatch() to reduce
 duplication.

Now that mp_irq_dispatch() is available to dispatch arbitary hard/soft
callbacks, take advantage of this for rp2 machine.Timer. This should
slightly reduce binary size.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/rp2/machine_timer.c | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index ffb4c7024308a..276fa5e788b33 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -29,6 +29,7 @@
 #include "py/mphal.h"
 #include "py/gc.h"
 #include "pico/time.h"
+#include "shared/runtime/mpirq.h"
 
 #define ALARM_ID_INVALID (-1)
 #define TIMER_MODE_ONE_SHOT (0)
@@ -49,29 +50,10 @@ 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;
 
-    if (self->ishard) {
-        // 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) {
-            mp_call_function_1(self->callback, MP_OBJ_FROM_PTR(self));
-            nlr_pop();
-        } else {
-            // Uncaught exception; disable the callback so it doesn't run again.
-            self->mode = TIMER_MODE_ONE_SHOT;
-            mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in timer callback\n");
-            mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
-        }
-        gc_unlock();
-        mp_sched_unlock();
-    } else {
-        mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
-    }
-
-    if (self->mode == TIMER_MODE_ONE_SHOT) {
+    if (mp_irq_dispatch(self->callback, MP_OBJ_FROM_PTR(self), self->ishard) < 0) {
+        // Uncaught exception; don't run the callback again.
+        return 0;
+    } else if (self->mode == TIMER_MODE_ONE_SHOT) {
         return 0;
     } else {
         return -self->delta_us;

From a69b08b756eae5b59006b93524a8d9c4d78847bc Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:18:03 +0100
Subject: [PATCH 2844/3129] renesas-ra/timer: Support soft IRQ timer callbacks.

machine.Timer() has inconsistent behaviour between ports: some run
callbacks in hard IRQ context whereas others schedule them like soft IRQs.

As on the rp2 port, add support to the renesas-ra port for a hard= argument
to explicitly choose between these, setting the default to True to match
the existing behaviour.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/renesas-ra/timer.c | 44 +++++++++++++---------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/ports/renesas-ra/timer.c b/ports/renesas-ra/timer.c
index d264ab0612989..286bc4d0fb50f 100644
--- a/ports/renesas-ra/timer.c
+++ b/ports/renesas-ra/timer.c
@@ -30,6 +30,7 @@
 
 #include "py/runtime.h"
 #include "py/gc.h"
+#include "shared/runtime/mpirq.h"
 #include "timer.h"
 #include "pin.h"
 #include "irq.h"
@@ -53,6 +54,7 @@ typedef struct _pyb_timer_obj_t {
     mp_obj_base_t base;
     uint8_t tim_id;
     mp_obj_t callback;
+    bool ishard;
     #if defined(TIMER_CHANNEL)
     pyb_timer_channel_obj_t *channel;
     #endif
@@ -91,7 +93,7 @@ static void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     mp_printf(print, "Timer(%u)", self->tim_id);
 }
 
-/// \method init(*, freq, prescaler, period)
+/// \method init(*, freq, hard)
 /// Initialise the timer.  Initialisation must be either by frequency (in Hz)
 /// or by prescaler and period:
 ///
@@ -102,16 +104,17 @@ static void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 ///   - `freq` - specifies the periodic frequency of the timer. You might 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.
+///   - `hard` - whether the callback should be called in hard-IRQ context
+///
+///  You must specify freq; hard defaults to True if not set.
 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 };
+    enum { ARG_freq, ARG_callback, ARG_hard };
     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} },
+        { MP_QSTR_hard,         MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
     };
     // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -128,11 +131,12 @@ static mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
         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"));
+        mp_raise_TypeError(MP_ERROR_TEXT("must specify freq"));
     }
     // Enable ARPE so that the auto-reload register is buffered.
     // This allows to smoothly change the frequency of the timer.
     // Start the timer running
+    self->ishard = args[ARG_hard].u_bool;
     if (args[ARG_callback].u_obj == mp_const_none) {
         // do nothing
     } else {
@@ -160,6 +164,7 @@ static mp_obj_t pyb_timer_make_new(const mp_obj_type_t *type, size_t n_args, siz
         tim->base.type = &pyb_timer_type;
         tim->tim_id = tim_id;
         tim->callback = mp_const_none;
+        tim->ishard = true;
         MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1] = tim;
     } else {
         // reference existing Timer object
@@ -513,30 +518,9 @@ static MP_DEFINE_CONST_OBJ_TYPE(
 #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();
+    if (mp_irq_dispatch(callback, MP_OBJ_FROM_PTR(tim), tim->ishard) < 0) {
+        // Uncaught exception; disable the callback so it doesn't run again.
+        tim->callback = mp_const_none;
     }
 }
 

From 49f2a1f0ed1ef140b2ae5a2bb1870b605d99c2f6 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:19:52 +0100
Subject: [PATCH 2845/3129] stm32/timer: Support soft IRQ timer callbacks.

machine.Timer() has inconsistent behaviour between ports: some run
callbacks in hard IRQ context whereas others schedule them like soft IRQs.

As on the rp2 port, add support to the stm32 port for a hard= argument
to explicitly choose between these, setting the default to True to match
the existing behaviour.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/stm32/timer.c | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index cb196210ba08a..9c4a5f8894e02 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -29,6 +29,7 @@
 
 #include "py/runtime.h"
 #include "py/gc.h"
+#include "shared/runtime/mpirq.h"
 #include "timer.h"
 #include "servo.h"
 #include "pin.h"
@@ -131,6 +132,7 @@ typedef struct _pyb_timer_obj_t {
     uint8_t tim_id;
     uint8_t is_32bit;
     mp_obj_t callback;
+    bool ishard;
     TIM_HandleTypeDef tim;
     IRQn_Type irqn;
     pyb_timer_channel_obj_t *channel;
@@ -632,10 +634,14 @@ static void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 ///       BRK_IN input is triggered. It can be set to `BRK_OFF`, `BRK_LOW`
 ///       and `BRK_HIGH`.
 ///
+///   - `hard` - specifies if the timer and channel callbacks should be run
+///      in hard-IRQ context (the default on stm32) or scheduled as a soft
+///      handler.
+///
 ///
 ///  You must either specify freq or both of period and prescaler.
 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, ARG_brk };
+    enum { ARG_freq, ARG_prescaler, ARG_period, ARG_tick_hz, ARG_mode, ARG_div, ARG_callback, ARG_deadtime, ARG_brk, ARG_hard };
     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_prescaler,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
@@ -646,6 +652,7 @@ static mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
         { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_deadtime,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_brk,          MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = BRK_OFF} },
+        { MP_QSTR_hard,         MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
     };
 
     // parse args
@@ -828,6 +835,7 @@ static mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
     self->tim.Instance->CR1 |= TIM_CR1_ARPE;
 
     // Start the timer running
+    self->ishard = args[ARG_hard].u_bool;
     if (args[ARG_callback].u_obj == mp_const_none) {
         HAL_TIM_Base_Start(&self->tim);
     } else {
@@ -1708,29 +1716,10 @@ static void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_o
             // clear the interrupt
             __HAL_TIM_CLEAR_IT(&tim->tim, irq_mask);
 
-            // 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();
+            if (mp_irq_dispatch(callback, MP_OBJ_FROM_PTR(tim), tim->ishard) < 0) {
+                // Uncaught exception; disable the callback so it doesn't run again.
+                tim->callback = mp_const_none;
+                __HAL_TIM_DISABLE_IT(&tim->tim, irq_mask);
             }
         }
     }

From c617ed159a632c59838000e21d2dde9ce1feaaec Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:20:34 +0100
Subject: [PATCH 2846/3129] zephyr/machine_timer: Support hard IRQ timer
 callbacks.

machine.Timer() has inconsistent behaviour between ports: some run
callbacks in hard IRQ context whereas others schedule them like soft IRQs.

As on the rp2 port, add support to the zephyr port for a hard= argument
to explicitly choose between these, setting the default to False to match
the existing behaviour.

Adjust the stack-limit check to use the ISR stack while the callback is
dispatched so that hard IRQ callbacks work, as with machine_pin.c and
machine_i2c_target.c IRQ callbacks.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/zephyr/machine_timer.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/machine_timer.c b/ports/zephyr/machine_timer.c
index 1bb743c2eb909..410e86762bd34 100644
--- a/ports/zephyr/machine_timer.c
+++ b/ports/zephyr/machine_timer.c
@@ -27,9 +27,11 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/obj.h"
 #include "py/runtime.h"
+#include "shared/runtime/mpirq.h"
 #include "modmachine.h"
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
@@ -51,6 +53,7 @@ typedef struct _machine_timer_obj_t {
     uint32_t period_ms;
 
     mp_obj_t callback;
+    bool ishard;
 
     struct _machine_timer_obj_t *next;
 } machine_timer_obj_t;
@@ -62,12 +65,31 @@ static mp_obj_t machine_timer_deinit(mp_obj_t self_in);
 
 static void machine_timer_callback(struct k_timer *timer) {
     machine_timer_obj_t *self = (machine_timer_obj_t *)k_timer_user_data_get(timer);
+
+    #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 *)&self;
+    MP_STATE_THREAD(stack_limit) = CONFIG_ISR_STACK_SIZE - 512;
+    #endif
+
+    if (mp_irq_dispatch(self->callback, MP_OBJ_FROM_PTR(self), self->ishard) < 0) {
+        // Uncaught exception; disable the callback so it doesn't run again.
+        self->mode = TIMER_MODE_ONE_SHOT;
+    }
+
     if (self->mode == TIMER_MODE_ONE_SHOT) {
         machine_timer_deinit(self);
     }
-    if (self->callback != mp_const_none) {
-        mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
-    }
+
+    #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_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -109,6 +131,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
         ARG_callback,
         ARG_period,
         ARG_freq,
+        ARG_hard,
     };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = TIMER_MODE_PERIODIC} },
@@ -119,6 +142,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
         #else
         { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
         #endif
+        { MP_QSTR_hard,         MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -139,6 +163,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
 
     self->mode = args[ARG_mode].u_int;
     self->callback = args[ARG_callback].u_obj;
+    self->ishard = args[ARG_hard].u_bool;
 
     k_timer_init(&self->my_timer, machine_timer_callback, NULL);
     k_timer_user_data_set(&self->my_timer, self);

From e7aa2a523c518fc17b6e73a06c2ef15e1b4cb9c8 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:21:48 +0100
Subject: [PATCH 2847/3129] esp8266/modmachine: Support hard IRQ timer
 callbacks.

machine.Timer() has inconsistent behaviour between ports: some run
callbacks in hard IRQ context whereas others schedule them like soft IRQs.

As on the rp2 port, add support to the esp8266 port for a hard= argument
to explicitly choose between these, setting the default to False to match
the existing behaviour. Open-code this as we don't link against mpirq.c
so can't use mp_irq_dispatch().

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/esp8266/modmachine.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index d43fe382457e0..ffc20784514b5 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -34,6 +34,7 @@
 #include "osapi.h"
 #include "etshal.h"
 #include "user_interface.h"
+#include "py/gc.h"
 
 // #define MACHINE_WAKE_IDLE (0x01)
 // #define MACHINE_WAKE_SLEEP (0x02)
@@ -169,6 +170,7 @@ typedef struct _esp_timer_obj_t {
     uint32_t remain_ms; // if non-zero, remaining time to handle large periods
     uint32_t period_ms; // if non-zero, periodic timer with a large period
     mp_obj_t callback;
+    bool ishard;
 } esp_timer_obj_t;
 
 static void esp_timer_arm_ms(esp_timer_obj_t *self, uint32_t ms, bool repeat) {
@@ -225,7 +227,27 @@ static void esp_timer_cb(void *arg) {
         self->remain_ms -= next_period_ms;
         os_timer_arm(&self->timer, next_period_ms, false);
     } else {
-        mp_sched_schedule(self->callback, self);
+        if (self->ishard) {
+            // 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) {
+                mp_call_function_1(self->callback, MP_OBJ_FROM_PTR(self));
+                nlr_pop();
+            } else {
+                // Uncaught exception; disable the callback so it doesn't run again.
+                self->period_ms = 0;
+                mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in timer callback\n");
+                mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
+            }
+            gc_unlock();
+            mp_sched_unlock();
+        } else {
+            mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
+        }
         if (self->period_ms != 0) {
             // A periodic timer with a larger period: reschedule it
             esp_timer_arm_ms(self, self->period_ms, true);
@@ -240,6 +262,7 @@ static mp_obj_t esp_timer_init_helper(esp_timer_obj_t *self, size_t n_args, cons
         ARG_period,
         ARG_tick_hz,
         ARG_freq,
+        ARG_hard,
     };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
@@ -251,6 +274,7 @@ static mp_obj_t esp_timer_init_helper(esp_timer_obj_t *self, size_t n_args, cons
         #else
         { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
         #endif
+        { MP_QSTR_hard,         MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
 
     // parse args
@@ -258,6 +282,7 @@ static mp_obj_t esp_timer_init_helper(esp_timer_obj_t *self, size_t n_args, cons
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     self->callback = args[ARG_callback].u_obj;
+    self->ishard = args[ARG_hard].u_bool;
     // Be sure to disarm timer before making any changes
     os_timer_disarm(&self->timer);
     os_timer_setfn(&self->timer, esp_timer_cb, self);

From 64fd2f5f360bfae4a231fc3db053139a4621e878 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:32:33 +0100
Subject: [PATCH 2848/3129] esp32/machine_timer: Warn that hard timers are not
 implemented.

machine.Timer() has inconsistent behaviour between ports: some run
callbacks in hard IRQ context whereas others schedule them like soft IRQs.

Most ports now support a hard= argument to the machine.Timer constructor
or initialiser to explicitly choose between these behaviours. However,
esp32 does not support hardware interrupts because they are not delivered
to the main thread, so the interrupt handler would need to acquire the GIL.

Raise a ValueError if hard=True is requested for esp32 machine.Timer.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/esp32/machine_timer.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index b0292a0379fea..ea9ce5469b0b7 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -227,6 +227,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
         ARG_period,
         ARG_tick_hz,
         ARG_freq,
+        ARG_hard,
     };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
@@ -238,6 +239,7 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
         #else
         { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
         #endif
+        { MP_QSTR_hard,         MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
 
     machine_timer_disable(self);
@@ -245,6 +247,10 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
     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_hard].u_bool) {
+        mp_raise_ValueError(MP_ERROR_TEXT("hard Timers are not implemented"));
+    }
+
     #if MICROPY_PY_BUILTINS_FLOAT
     if (args[ARG_freq].u_obj != mp_const_none) {
         self->period = (uint64_t)(machine_timer_freq_hz() / mp_obj_get_float(args[ARG_freq].u_obj));

From ccc954256f890b6626558349b513a6d840da24d9 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 14:49:17 +0100
Subject: [PATCH 2849/3129] tests: Generalise rp2 timer test into a cross-port
 test.

Now all ports with machine.Timer except nrf support both hard and
soft callbacks, generalise tests/ports/rp2_machine_timer.py into
tests/extmod/machine_timer.py.

There is an existing machine_soft_timer.py which varies period= and
covers the nrf port but skips esp32/esp8266 because they don't support
software timers. In our new test, we try varying freq= instead of period=,
and cover esp32/esp8266 (with a fixed choice of hardware timer) but skip
nrf because it doesn't support hard= or freq=.

Add a check that the heap is locked (so allocation fails) in hard
callbacks and it is unlocked (so allocation succeeds) in soft callbacks,
to ensure we're getting the right kind of callback, not falling back to
the default.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 tests/extmod/machine_timer.py            | 48 ++++++++++++++++++++++++
 tests/extmod/machine_timer.py.exp        | 16 ++++++++
 tests/ports/rp2/rp2_machine_timer.py     | 20 ----------
 tests/ports/rp2/rp2_machine_timer.py.exp | 16 --------
 4 files changed, 64 insertions(+), 36 deletions(-)
 create mode 100644 tests/extmod/machine_timer.py
 create mode 100644 tests/extmod/machine_timer.py.exp
 delete mode 100644 tests/ports/rp2/rp2_machine_timer.py
 delete mode 100644 tests/ports/rp2/rp2_machine_timer.py.exp

diff --git a/tests/extmod/machine_timer.py b/tests/extmod/machine_timer.py
new file mode 100644
index 0000000000000..ef97ea4e94955
--- /dev/null
+++ b/tests/extmod/machine_timer.py
@@ -0,0 +1,48 @@
+import sys
+
+try:
+    from machine import Timer
+    from time import sleep_ms
+except:
+    print("SKIP")
+    raise SystemExit
+
+if sys.platform in ("esp32", "esp8266", "nrf"):
+    # Software timers aren't implemented on the esp32 and esp8266 ports.
+    # The nrf port doesn't support selection of hard and soft callbacks,
+    # and only allows Timer(period=N), not Timer(freq=N).
+    print("SKIP")
+    raise SystemExit
+else:
+    timer_id = -1
+
+# Test both hard and soft IRQ handlers and both one-shot and periodic
+# timers. We adjust period in tests/extmod/machine_soft_timer.py, so try
+# adjusting freq here instead. The heap should be locked in hard callbacks
+# and unlocked in soft callbacks.
+
+
+def callback(t):
+    print("callback", mode[1], kind[1], freq, end=" ")
+    try:
+        allocate = bytearray(1)
+        print("unlocked")
+    except MemoryError:
+        print("locked")
+
+
+modes = [(Timer.ONE_SHOT, "one-shot"), (Timer.PERIODIC, "periodic")]
+kinds = [(False, "soft"), (True, "hard")]
+
+for mode in modes:
+    for kind in kinds:
+        for freq in 50, 25:
+            timer = Timer(
+                timer_id,
+                mode=mode[0],
+                freq=freq,
+                hard=kind[0],
+                callback=callback,
+            )
+            sleep_ms(90)
+            timer.deinit()
diff --git a/tests/extmod/machine_timer.py.exp b/tests/extmod/machine_timer.py.exp
new file mode 100644
index 0000000000000..26cdc644fdd08
--- /dev/null
+++ b/tests/extmod/machine_timer.py.exp
@@ -0,0 +1,16 @@
+callback one-shot soft 50 unlocked
+callback one-shot soft 25 unlocked
+callback one-shot hard 50 locked
+callback one-shot hard 25 locked
+callback periodic soft 50 unlocked
+callback periodic soft 50 unlocked
+callback periodic soft 50 unlocked
+callback periodic soft 50 unlocked
+callback periodic soft 25 unlocked
+callback periodic soft 25 unlocked
+callback periodic hard 50 locked
+callback periodic hard 50 locked
+callback periodic hard 50 locked
+callback periodic hard 50 locked
+callback periodic hard 25 locked
+callback periodic hard 25 locked
diff --git a/tests/ports/rp2/rp2_machine_timer.py b/tests/ports/rp2/rp2_machine_timer.py
deleted file mode 100644
index ac4efcf7f3835..0000000000000
--- a/tests/ports/rp2/rp2_machine_timer.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from machine import Timer
-from time import sleep_ms
-
-# Test the rp2-specific adjustable tick_hz and hard/soft IRQ handlers
-# for both one-shot and periodic timers.
-
-modes = {Timer.ONE_SHOT: "one-shot", Timer.PERIODIC: "periodic"}
-kinds = {False: "soft", True: "hard"}
-
-for mode in modes:
-    for hard in kinds:
-        for period in 2, 4:
-            timer = Timer(
-                mode=mode,
-                period=period,
-                hard=hard,
-                callback=lambda t: print("callback", modes[mode], kinds[hard], period),
-            )
-            sleep_ms(9)
-            timer.deinit()
diff --git a/tests/ports/rp2/rp2_machine_timer.py.exp b/tests/ports/rp2/rp2_machine_timer.py.exp
deleted file mode 100644
index b3dd93dfabfa8..0000000000000
--- a/tests/ports/rp2/rp2_machine_timer.py.exp
+++ /dev/null
@@ -1,16 +0,0 @@
-callback one-shot soft 2
-callback one-shot soft 4
-callback one-shot hard 2
-callback one-shot hard 4
-callback periodic soft 2
-callback periodic soft 2
-callback periodic soft 2
-callback periodic soft 2
-callback periodic soft 4
-callback periodic soft 4
-callback periodic hard 2
-callback periodic hard 2
-callback periodic hard 2
-callback periodic hard 2
-callback periodic hard 4
-callback periodic hard 4

From ec6cdf3718ce49026940c5e2f65fb07f3fc23309 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 15:25:21 +0100
Subject: [PATCH 2850/3129] tests: Test hardware timers as well as software
 timers.

On platforms where hardware timers are available, test these in each
combination of hard/soft and one-shot/periodic in the same way as for
software timers. Where a platform supports both software (id = -1) and
hardware (id >= 0) timers, the behaviour of both is now checked.

For now, esp8266 is the only platform that supports hardware timers and
both hard and soft callbacks.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 tests/extmod/machine_hard_timer.py     | 45 ++++++++++++++++++++++++++
 tests/extmod/machine_hard_timer.py.exp | 16 +++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 tests/extmod/machine_hard_timer.py
 create mode 100644 tests/extmod/machine_hard_timer.py.exp

diff --git a/tests/extmod/machine_hard_timer.py b/tests/extmod/machine_hard_timer.py
new file mode 100644
index 0000000000000..8fe42ea850842
--- /dev/null
+++ b/tests/extmod/machine_hard_timer.py
@@ -0,0 +1,45 @@
+import sys
+
+try:
+    from machine import Timer
+    from time import sleep_ms
+except:
+    print("SKIP")
+    raise SystemExit
+
+if sys.platform == "esp8266":
+    timer = Timer(0)
+else:
+    # Hardware timers are not implemented.
+    print("SKIP")
+    raise SystemExit
+
+# Test both hard and soft IRQ handlers and both one-shot and periodic
+# timers. We adjust period in tests/extmod/machine_soft_timer.py, so try
+# adjusting freq here instead. The heap should be locked in hard callbacks
+# and unlocked in soft callbacks.
+
+
+def callback(t):
+    print("callback", mode[1], kind[1], freq, end=" ")
+    try:
+        allocate = bytearray(1)
+        print("unlocked")
+    except MemoryError:
+        print("locked")
+
+
+modes = [(Timer.ONE_SHOT, "one-shot"), (Timer.PERIODIC, "periodic")]
+kinds = [(False, "soft"), (True, "hard")]
+
+for mode in modes:
+    for kind in kinds:
+        for freq in 50, 25:
+            timer.init(
+                mode=mode[0],
+                freq=freq,
+                hard=kind[0],
+                callback=callback,
+            )
+            sleep_ms(90)
+            timer.deinit()
diff --git a/tests/extmod/machine_hard_timer.py.exp b/tests/extmod/machine_hard_timer.py.exp
new file mode 100644
index 0000000000000..26cdc644fdd08
--- /dev/null
+++ b/tests/extmod/machine_hard_timer.py.exp
@@ -0,0 +1,16 @@
+callback one-shot soft 50 unlocked
+callback one-shot soft 25 unlocked
+callback one-shot hard 50 locked
+callback one-shot hard 25 locked
+callback periodic soft 50 unlocked
+callback periodic soft 50 unlocked
+callback periodic soft 50 unlocked
+callback periodic soft 50 unlocked
+callback periodic soft 25 unlocked
+callback periodic soft 25 unlocked
+callback periodic hard 50 locked
+callback periodic hard 50 locked
+callback periodic hard 50 locked
+callback periodic hard 50 locked
+callback periodic hard 25 locked
+callback periodic hard 25 locked

From b9523fd58c02dba74239015bf6b2a1983342a06b Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Mon, 25 Aug 2025 15:29:40 +0100
Subject: [PATCH 2851/3129] docs: Document the cross-port Timer hard= option.

Update the main machine.Timer specification, and any references to
hard/soft interrupts in port-specific documentation. There is a separate
copy of the machine.Timer documentation for the pyboard, so update that
too to keep everything consistent.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 docs/esp32/quickref.rst        |  4 ++++
 docs/esp8266/quickref.rst      |  3 +++
 docs/library/machine.Timer.rst | 20 +++++++++++++++++---
 docs/library/pyb.Timer.rst     | 14 +++++++++++++-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 2c667a0f014db..25e52ec32db5d 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -287,6 +287,10 @@ with a timer ID of 0, 0 and 1, or from 0 to 3 (inclusive)::
 The period is in milliseconds. When using UART.IRQ_RXIDLE, timer 0 is needed for
 the IRQ_RXIDLE mechanism and must not be used otherwise.
 
+Timer callbacks are scheduled as soft interrupts on this port; hard
+callbacks are not implemented. Specifying ``hard=True`` will raise
+a ValueError.
+
 Virtual timers are not currently supported on this port.
 
 .. _Pins_and_GPIO:
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index e17b60f676105..95e1fcf97682d 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -108,6 +108,9 @@ with timer ID of -1::
 
 The period is in milliseconds.
 
+By default, timer callbacks are scheduled as soft interrupts on this port.
+Specify ``hard=True`` to run them in hard interrupt context instead.
+
 Pins and GPIO
 -------------
 
diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index 44e6594080558..5d228ea7b67b5 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -18,8 +18,9 @@ Timer callbacks.
 
     Memory can't be allocated inside irq handlers (an interrupt) and so
     exceptions raised within a handler don't give much information.  See
-    :func:`micropython.alloc_emergency_exception_buf` for how to get around this
-    limitation.
+    :func:`micropython.alloc_emergency_exception_buf` for how to get around
+    this limitation, which applies to all callbacks of Timers created with
+    ``hard=True``.
 
 If you are using a WiPy board please refer to :ref:`machine.TimerWiPy <machine.TimerWiPy>`
 instead of this class.
@@ -38,7 +39,7 @@ Constructors
 Methods
 -------
 
-.. method:: Timer.init(*, mode=Timer.PERIODIC, freq=-1, period=-1, callback=None)
+.. method:: Timer.init(*, mode=Timer.PERIODIC, freq=-1, period=-1, callback=None, hard=True)
 
    Initialise the timer. Example::
 
@@ -76,6 +77,19 @@ Methods
        will occur upon timer expiration:
        ``TypeError: 'NoneType' object isn't callable``
 
+     - ``hard`` can be one of:
+
+       - ``True`` - The callback will be executed in hard interrupt
+         context, which minimises delay and jitter but is subject to the
+         limitations described in :ref:`isr_rules` including being unable
+         to allocate on the heap.
+       - ``False`` - The callback will be scheduled as a soft interrupt,
+         allowing it to allocate but possibly also introducing
+         garbage-collection delays and jitter.
+
+       The default value of this option is port-specific for historical
+       reasons.
+
 .. method:: Timer.deinit()
 
    Deinitialises the timer. Stops the timer, and disables the timer peripheral.
diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index c644e38d78624..0e9e49c0eabd1 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, brk=Timer.BRK_OFF)
+.. method:: Timer.init(*, freq, prescaler, period, mode=Timer.UP, div=1, callback=None, deadtime=0, brk=Timer.BRK_OFF, hard=True)
 
    Initialise the timer.  Initialisation must be either by frequency (in Hz)
    or by prescaler and period::
@@ -115,6 +115,18 @@ Methods
        ``mode=Pin.ALT, alt=Pin.AFn_TIMx``. The pin's GPIO input features are
        available in alt mode - ``pull=`` , ``value()`` and ``irq()``.
 
+     - ``hard`` can be one of:
+
+       - ``True`` - The callback will be executed in hard interrupt
+         context, which minimises delay and jitter but is subject to the
+         limitations described in :ref:`isr_rules` including being unable
+         to allocate on the heap.
+       - ``False`` - The callback will be scheduled as a soft interrupt,
+         allowing it to allocate but possibly also introducing
+         garbage-collection delays and jitter.
+
+       The default value of this option is True.
+
     You must either specify freq or both of period and prescaler.
 
 .. method:: Timer.deinit()

From 81985d20c98e1550c355263f1d6c7bd6150ee0b4 Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Tue, 9 Sep 2025 15:40:51 +0100
Subject: [PATCH 2852/3129] shared/runtime/mpirq: Check separate hard IRQ stack
 correctly.

On the zephyr port, hard IRQ handlers run with a separate stack on a
different thread, so each call to mp_irq_dispatch() and mp_irq_handler()
has to be wrapped with adjustments to the stack-limit checker.

Move these adjustments into the shared mp_irq_dispatch(), introducing
MICROPY_STACK_SIZE_HARD_IRQ which a port can define to non-zero if it
uses a separate stack for hard IRQ handlers. We only need wrap the hard
dispatch case. This should reduce binary size on zephyr without affecting
other ports.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 ports/zephyr/machine_i2c_target.c |  7 -------
 ports/zephyr/machine_pin.c        | 15 ---------------
 ports/zephyr/machine_timer.c      | 16 ----------------
 ports/zephyr/mpconfigport.h       |  2 ++
 py/mpconfig.h                     |  7 +++++++
 shared/runtime/mpirq.c            | 15 +++++++++++++++
 6 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/ports/zephyr/machine_i2c_target.c b/ports/zephyr/machine_i2c_target.c
index 236f1334883a1..c7786e7df92ba 100644
--- a/ports/zephyr/machine_i2c_target.c
+++ b/ports/zephyr/machine_i2c_target.c
@@ -114,14 +114,7 @@ static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *s
 }
 
 static void mp_machine_i2c_target_event_callback(machine_i2c_target_irq_obj_t *irq) {
-    char dummy;
-    void *orig_top = MP_STATE_THREAD(stack_top);
-    mp_uint_t orig_limit = MP_STATE_THREAD(stack_limit);
-    MP_STATE_THREAD(stack_top) = &dummy;
-    MP_STATE_THREAD(stack_limit) = CONFIG_ISR_STACK_SIZE - 512;
     mp_irq_handler(&irq->base);
-    MP_STATE_THREAD(stack_top) = orig_top;
-    MP_STATE_THREAD(stack_limit) = orig_limit;
 }
 
 static size_t mp_machine_i2c_target_read_bytes(machine_i2c_target_obj_t *self, size_t len, uint8_t *buf) {
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index e0718588d6599..1ae262419f558 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -64,22 +64,7 @@ void machine_pin_deinit(void) {
 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
-    // 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) {
diff --git a/ports/zephyr/machine_timer.c b/ports/zephyr/machine_timer.c
index 410e86762bd34..4b660849f677c 100644
--- a/ports/zephyr/machine_timer.c
+++ b/ports/zephyr/machine_timer.c
@@ -66,16 +66,6 @@ static mp_obj_t machine_timer_deinit(mp_obj_t self_in);
 static void machine_timer_callback(struct k_timer *timer) {
     machine_timer_obj_t *self = (machine_timer_obj_t *)k_timer_user_data_get(timer);
 
-    #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 *)&self;
-    MP_STATE_THREAD(stack_limit) = CONFIG_ISR_STACK_SIZE - 512;
-    #endif
-
     if (mp_irq_dispatch(self->callback, MP_OBJ_FROM_PTR(self), self->ishard) < 0) {
         // Uncaught exception; disable the callback so it doesn't run again.
         self->mode = TIMER_MODE_ONE_SHOT;
@@ -84,12 +74,6 @@ static void machine_timer_callback(struct k_timer *timer) {
     if (self->mode == TIMER_MODE_ONE_SHOT) {
         machine_timer_deinit(self);
     }
-
-    #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_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index fbf8dbcc7a709..f6b78e64f0c5c 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -47,6 +47,8 @@
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
 #define MICROPY_ENABLE_SOURCE_LINE  (1)
 #define MICROPY_STACK_CHECK         (1)
+#define MICROPY_STACK_CHECK_MARGIN  (512)
+#define MICROPY_STACK_SIZE_HARD_IRQ (CONFIG_ISR_STACK_SIZE)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_FINALISER    (MICROPY_VFS)
 #define MICROPY_HELPER_REPL         (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index ae44b461d37f1..f4b7c10583668 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -717,6 +717,13 @@
 #define MICROPY_STACK_CHECK_MARGIN (0)
 #endif
 
+// The size of a separate stack used for hard IRQ handlers, which should be
+// checked instead of the main stack when running a hard callback. 0 implies
+// there is no separate ISR stack to check.
+#ifndef MICROPY_STACK_SIZE_HARD_IRQ
+#define MICROPY_STACK_SIZE_HARD_IRQ (0)
+#endif
+
 // Whether to have an emergency exception buffer
 #ifndef MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (0)
diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index 0b3489c5141f3..4d848ae7e9102 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -69,6 +69,15 @@ int mp_irq_dispatch(mp_obj_t handler, mp_obj_t parent, bool ishard) {
     int result = 0;
     if (handler != mp_const_none) {
         if (ishard) {
+            #if MICROPY_STACK_CHECK && MICROPY_STACK_SIZE_HARD_IRQ > 0
+            // 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.
+            char *orig_stack_top = MP_STATE_THREAD(stack_top);
+            size_t orig_stack_limit = MP_STATE_THREAD(stack_limit);
+            mp_cstack_init_with_sp_here(MICROPY_STACK_SIZE_HARD_IRQ);
+            #endif
+
             // 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.
@@ -85,6 +94,12 @@ int mp_irq_dispatch(mp_obj_t handler, mp_obj_t parent, bool ishard) {
             }
             gc_unlock();
             mp_sched_unlock();
+
+            #if MICROPY_STACK_CHECK && MICROPY_STACK_SIZE_HARD_IRQ > 0
+            // Restore original stack-limit checking values.
+            MP_STATE_THREAD(stack_top) = orig_stack_top;
+            MP_STATE_THREAD(stack_limit) = orig_stack_limit;
+            #endif
         } else {
             // Schedule call to user function
             mp_sched_schedule(handler, parent);

From 2a03ade02cbeee55f275eda30b809812a8c83a7a Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Sat, 20 Sep 2025 17:29:48 +0200
Subject: [PATCH 2853/3129] docs/library/os: Document dupterm_notify function.

Closes issue #17799.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 docs/library/os.rst | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docs/library/os.rst b/docs/library/os.rst
index 710875e34c39b..bd552e36f0100 100644
--- a/docs/library/os.rst
+++ b/docs/library/os.rst
@@ -133,6 +133,37 @@ Terminal redirection and duplication
 
    The function returns the previous stream-like object in the given slot.
 
+.. function:: dupterm_notify(obj_in, /)
+
+    Notify the MicroPython REPL that input is available on a stream-like object
+    previously registered via `os.dupterm()`.
+
+    This function should be called by custom stream implementations (e.g., UART,
+    Bluetooth, or other non-USB REPL streams) to inform the REPL that input is
+    ready to be read. Proper use ensures that special characters such as
+    Ctrl+C (used to trigger KeyboardInterrupt) are processed promptly by the
+    REPL, enabling expected interruption behavior for user code.
+
+    The *obj_in* parameter is ignored by `os.dupterm_notify()`, but is required to allow calling
+    dupterm_notify from an interrupt handler such as `UART.irq()`.
+
+    Example:
+
+    .. code-block:: python
+
+        from machine import UART
+        import os
+        uart = UART(0)
+        os.dupterm(uart, 0)
+        uart.irq(os.dupterm_notify, machine.UART.IRQ_RX)
+
+    .. note::
+        If the ``dupterm_notify()`` function is not called, input from the custom stream
+        may not be detected or processed until the next REPL poll, potentially delaying
+        KeyboardInterrupts or other control signals.
+        This is especially important for UART, Bluetooth and other
+        non-standard REPL connections, where automatic notification is not guaranteed.
+
 Filesystem mounting
 -------------------
 

From 74270df9acbb619ce58830eb6940b3366d372526 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Thu, 25 Sep 2025 12:15:16 +0200
Subject: [PATCH 2854/3129] docs/README: Update doc build dependency.

The docs were changed in c3040463849eb9b3e5f85706bb223d648e60510d to
require sphinx_rtd_theme.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 docs/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 892726ba17ffe..11ad32ddb5dc2 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -13,8 +13,7 @@ Building the documentation locally
 If you're making changes to the documentation, you may want to build the
 documentation locally so that you can preview your changes.
 
-Install Sphinx, and optionally (for the RTD-styling), sphinx_rtd_theme,
-preferably in a virtualenv:
+Install Sphinx and sphinx_rtd_theme, preferably in a virtualenv:
 
      pip install sphinx
      pip install sphinx_rtd_theme

From 10b3d96b607404e5d73cb43c9d587ddb1f5665fc Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos_Verlinde@hotmail.com>
Date: Thu, 25 Sep 2025 12:16:51 +0200
Subject: [PATCH 2855/3129] docs/README: Document sphinx-autobuild for local
 preview.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>
---
 docs/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/README.md b/docs/README.md
index 11ad32ddb5dc2..9b3b036e063a6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -24,6 +24,21 @@ In `micropython/docs`, build the docs:
 
 You'll find the index page at `micropython/docs/build/html/index.html`.
 
+Documentation autobuild
+-----------------------
+
+For a more convenient development experience, you can use `sphinx-autobuild`
+to automatically rebuild and serve the documentation when you make changes:
+
+    pip install sphinx-autobuild
+
+Then run from the `micropython/docs` directory:
+
+    sphinx-autobuild . build/html
+
+This will start a local web server (typically at `http://127.0.0.1:8000`)
+and automatically rebuild the documentation whenever you save changes to the source files.
+
 Having readthedocs.org build the documentation
 ----------------------------------------------
 

From 2373340aa342dbd30e1482cf431895f808d863b2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 13 Sep 2025 19:33:34 +1000
Subject: [PATCH 2856/3129] py/stream: Reuse write implementation for readinto.

This commit refactors some common code in the core stream implementation,
to reduce code size while retaining the same functionality.

With the factoring, `readinto`/`readinto1` could now support an additional
4th argument (like write) but it's best not to introduce even more CPython
incompatibility, so they are left as having a maximum of 3 args.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/stream.c | 46 +++++++++++++---------------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/py/stream.c b/py/stream.c
index 008c968452742..93bdac42c8fc2 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -261,9 +261,14 @@ void mp_stream_write_adaptor(void *self, const char *buf, size_t len) {
     mp_stream_write(MP_OBJ_FROM_PTR(self), buf, len, MP_STREAM_RW_WRITE);
 }
 
-static mp_obj_t stream_write_generic(size_t n_args, const mp_obj_t *args, byte flags) {
+static mp_obj_t stream_readinto_write_generic(size_t n_args, const mp_obj_t *args, byte flags) {
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
+    mp_get_buffer_raise(args[1], &bufinfo, (flags & MP_STREAM_RW_WRITE) ? MP_BUFFER_READ : MP_BUFFER_WRITE);
+
+    // CPython extension, allow optional maximum length and offset:
+    // - stream.operation(buf, max_len)
+    // - stream.operation(buf, off, max_len)
+    // Similar to https://docs.python.org/3/library/socket.html#socket.socket.recv_into
     size_t max_len = (size_t)-1;
     size_t off = 0;
     if (n_args == 3) {
@@ -276,53 +281,28 @@ static mp_obj_t stream_write_generic(size_t n_args, const mp_obj_t *args, byte f
         }
     }
     bufinfo.len -= off;
+
+    // Perform the readinto or write operation.
     return mp_stream_write(args[0], (byte *)bufinfo.buf + off, MIN(bufinfo.len, max_len), flags);
 }
 
 static mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
-    return stream_write_generic(n_args, args, MP_STREAM_RW_WRITE);
+    return stream_readinto_write_generic(n_args, args, MP_STREAM_RW_WRITE);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write_obj, 2, 4, stream_write_method);
 
 static mp_obj_t stream_write1_method(size_t n_args, const mp_obj_t *args) {
-    return stream_write_generic(n_args, args, MP_STREAM_RW_WRITE | MP_STREAM_RW_ONCE);
+    return stream_readinto_write_generic(n_args, args, MP_STREAM_RW_WRITE | MP_STREAM_RW_ONCE);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write1_obj, 2, 4, stream_write1_method);
 
-static mp_obj_t stream_readinto_generic(size_t n_args, const mp_obj_t *args, byte flags) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
-
-    // CPython extension: if 2nd arg is provided, that's max len to read,
-    // instead of full buffer. Similar to
-    // https://docs.python.org/3/library/socket.html#socket.socket.recv_into
-    mp_uint_t len = bufinfo.len;
-    if (n_args > 2) {
-        len = mp_obj_get_int(args[2]);
-        if (len > bufinfo.len) {
-            len = bufinfo.len;
-        }
-    }
-
-    int error;
-    mp_uint_t out_sz = mp_stream_rw(args[0], bufinfo.buf, len, &error, flags);
-    if (error != 0) {
-        if (mp_is_nonblocking_error(error)) {
-            return mp_const_none;
-        }
-        mp_raise_OSError(error);
-    } else {
-        return MP_OBJ_NEW_SMALL_INT(out_sz);
-    }
-}
-
 static mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
-    return stream_readinto_generic(n_args, args, MP_STREAM_RW_READ);
+    return stream_readinto_write_generic(n_args, args, MP_STREAM_RW_READ);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto_obj, 2, 3, stream_readinto);
 
 static mp_obj_t stream_readinto1(size_t n_args, const mp_obj_t *args) {
-    return stream_readinto_generic(n_args, args, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
+    return stream_readinto_write_generic(n_args, args, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto1_obj, 2, 3, stream_readinto1);
 

From b44c4de4fde4a520f0af044d9495187abc9e29fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Sep 2025 13:09:25 +1000
Subject: [PATCH 2857/3129] tests/ports/unix: Add coverage test for readinto1
 stream method.

And expand the test for `readinto()` to test the difference between trying
to read the requested amount by doing multiple underlying IO calls, and
only doing one call.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/coverage.c                  |  1 +
 tests/ports/unix/extra_coverage.py     | 23 +++++++++++++++++++++++
 tests/ports/unix/extra_coverage.py.exp |  6 ++++++
 3 files changed, 30 insertions(+)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index e47558689d154..1dd009ed093df 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -97,6 +97,7 @@ static const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_write1), MP_ROM_PTR(&mp_stream_write1_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto1), MP_ROM_PTR(&mp_stream_readinto1_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
 };
diff --git a/tests/ports/unix/extra_coverage.py b/tests/ports/unix/extra_coverage.py
index 72f5fe56b3a3e..493d02cde981a 100644
--- a/tests/ports/unix/extra_coverage.py
+++ b/tests/ports/unix/extra_coverage.py
@@ -33,6 +33,7 @@
 print(stream.read(1))  # read 1 byte encounters non-blocking error
 print(stream.readline())  # readline encounters non-blocking error
 print(stream.readinto(bytearray(10)))  # readinto encounters non-blocking error
+print(stream.readinto1(bytearray(10)))  # readinto1 encounters non-blocking error
 print(stream.write(b"1"))  # write encounters non-blocking error
 print(stream.write1(b"1"))  # write1 encounters non-blocking error
 stream.set_buf(b"123")
@@ -48,6 +49,28 @@
 stream.set_error(0)
 print(stream.ioctl(0, bytearray(10)))  # successful ioctl call
 
+print("# stream.readinto")
+
+# stream.readinto will read 3 bytes then try to read more to fill the buffer,
+# but on the second attempt will encounter EIO and should raise that error.
+stream.set_error(errno.EIO)
+stream.set_buf(b"123")
+buf = bytearray(4)
+try:
+    stream.readinto(buf)
+except OSError as er:
+    print("OSError", er.errno == errno.EIO)
+print(buf)
+
+# stream.readinto1 will read 3 bytes then should return them immediately, and
+# not encounter the EIO.
+stream.set_error(errno.EIO)
+stream.set_buf(b"123")
+buf = bytearray(4)
+print(stream.readinto1(buf), buf)
+
+print("# stream textio")
+
 stream2 = data[3]  # is textio
 print(stream2.read(1))  # read 1 byte encounters non-blocking error with textio stream
 
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 85e0e18cbfd8a..5b6e1f3f0f0a1 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -214,11 +214,17 @@ None
 None
 None
 None
+None
 b'123'
 b'123'
 b'123'
 OSError
 0
+# stream.readinto
+OSError True
+bytearray(b'123\x00')
+3 bytearray(b'123\x00')
+# stream textio
 None
 None
 cpp None

From 7be82f8b7c9ee83696cb08f8f2936f0ed93cd52c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 15 Jul 2025 16:05:42 +0100
Subject: [PATCH 2858/3129] tests: Test extremes of range() and document
 differences to CPython.

This avoids remaining buggy cases where C signed overflow occurs.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/basics/builtin_range_maxsize.py | 38 +++++++++++++++++++++++++++
 tests/cpydiff/types_range_limits.py   | 26 ++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 tests/basics/builtin_range_maxsize.py
 create mode 100644 tests/cpydiff/types_range_limits.py

diff --git a/tests/basics/builtin_range_maxsize.py b/tests/basics/builtin_range_maxsize.py
new file mode 100644
index 0000000000000..b0f3a5e5129f1
--- /dev/null
+++ b/tests/basics/builtin_range_maxsize.py
@@ -0,0 +1,38 @@
+try:
+    from sys import maxsize
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Test the range builtin at extreme values. (https://github.com/micropython/micropython/issues/17684)
+#
+# This is written using asserts instead of prints because the value of `maxsize` differs.
+#
+# Numbers & counts right up against the max of mp_int_t also cause overflows, such as
+# objrange.c:115:14: runtime error: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long int'
+# so just avoid them for the purposes of this test.
+
+r = range(-maxsize + 1, -1)
+assert r.start == -maxsize + 1
+assert r.stop == -1
+assert r[0] == -maxsize + 1
+assert r[1] == -maxsize + 2
+assert r[-1] == -2
+assert r[-2] == -3
+
+ir = iter(r)
+assert next(ir) == -maxsize + 1
+assert next(ir) == -maxsize + 2
+
+r = range(0, maxsize - 1)
+assert len(r) == maxsize - 1
+assert r.stop == maxsize - 1
+
+r = range(maxsize, 0, -1)
+assert len(r) == maxsize
+assert r.start == maxsize
+assert r[0] == maxsize
+assert r[1] == maxsize - 1
+ir = iter(r)
+assert next(ir) == maxsize
+assert next(ir) == maxsize - 1
diff --git a/tests/cpydiff/types_range_limits.py b/tests/cpydiff/types_range_limits.py
new file mode 100644
index 0000000000000..e53d5fd4088f3
--- /dev/null
+++ b/tests/cpydiff/types_range_limits.py
@@ -0,0 +1,26 @@
+"""
+categories: Types,range
+description: Range objects with large start or stop arguments misbehave.
+cause: Intermediate calculations overflow the C mp_int_t type
+workaround: Avoid using such ranges
+"""
+
+from sys import maxsize
+
+# A range including `maxsize-1` cannot be created
+try:
+    print(range(-maxsize - 1, 0))
+except OverflowError:
+    print("OverflowError")
+
+# A range with `stop-start` exceeding sys.maxsize has incorrect len(), while CPython cannot calculate len().
+try:
+    print(len(range(-maxsize, maxsize)))
+except OverflowError:
+    print("OverflowError")
+
+# A range with `stop-start` exceeding sys.maxsize has incorrect len()
+try:
+    print(len(range(-maxsize, maxsize, maxsize)))
+except OverflowError:
+    print("OverflowError")

From 72867bce1d2cf39abe164bebf4d239c6974c9122 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 15 Jul 2025 16:09:19 +0100
Subject: [PATCH 2859/3129] py/objrange: Allow return of non-small ints.

The magnitude of `range()` arguments is not restricted to "small" ints, but
includes "machine ints" which fit inside a register but can only be
represented as "long integer" objects in Python.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objrange.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/objrange.c b/py/objrange.c
index 1cc575f33e763..e19d6c4dfcd4f 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -41,9 +41,9 @@ typedef struct _mp_obj_range_it_t {
 static mp_obj_t range_it_iternext(mp_obj_t o_in) {
     mp_obj_range_it_t *o = MP_OBJ_TO_PTR(o_in);
     if ((o->step > 0 && o->cur < o->stop) || (o->step < 0 && o->cur > o->stop)) {
-        mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(o->cur);
+        mp_int_t cur = o->cur;
         o->cur += o->step;
-        return o_out;
+        return mp_obj_new_int(cur);
     } else {
         return MP_OBJ_STOP_ITERATION;
     }
@@ -132,7 +132,7 @@ static mp_obj_t range_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
         case MP_UNARY_OP_BOOL:
             return mp_obj_new_bool(len > 0);
         case MP_UNARY_OP_LEN:
-            return MP_OBJ_NEW_SMALL_INT(len);
+            return mp_obj_new_int(len);
         default:
             return MP_OBJ_NULL;      // op not supported
     }
@@ -173,7 +173,7 @@ static mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
         }
         #endif
         size_t index_val = mp_get_index(self->base.type, len, index, false);
-        return MP_OBJ_NEW_SMALL_INT(self->start + index_val * self->step);
+        return mp_obj_new_int(self->start + index_val * self->step);
     } else {
         return MP_OBJ_NULL; // op not supported
     }

From 03b4c60fc1cf85e10b88dad3d7b04046b6393a15 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 10 Aug 2025 22:35:31 +1000
Subject: [PATCH 2860/3129] nrf/modules/machine/spi: Print SPI baudrate,
 polarity and phase.

On most ports, printing an instance of machine.SPI gives something like:

    >>> machine.SPI(1)
    SPI(1, baudrate=328125, polarity=0, phase=0, bits=8)

This commit makes the nrf port do the same.

The reason for this change is:
- make nrf consistent with other ports
- allow the `tests/extmod/machine_spi_rate.py` to run on the nrf port (this
  tests parses the output of str(spi) to get the actual baudrate)

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/modules/machine/spi.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index b00a5706c66c0..f474c88715c60 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -187,11 +187,33 @@ enum {
     ARG_INIT_firstbit
 };
 
+static inline uint32_t machine_hard_spi_get_baudrate(const machine_hard_spi_obj_t *self) {
+    MP_STATIC_ASSERT(NRF_SPI_FREQ_125K == (2 << 24));
+    MP_STATIC_ASSERT(NRF_SPI_FREQ_250K == (4 << 24));
+    MP_STATIC_ASSERT(NRF_SPI_FREQ_500K == (8 << 24));
+    MP_STATIC_ASSERT(NRF_SPI_FREQ_1M == (16 << 24));
+    MP_STATIC_ASSERT(NRF_SPI_FREQ_2M == (32 << 24));
+    MP_STATIC_ASSERT(NRF_SPI_FREQ_4M == (64 << 24));
+    MP_STATIC_ASSERT(NRF_SPI_FREQ_8M == (128 << 24));
+    #if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
+    if (self->p_config->frequency == NRF_SPIM_FREQ_16M) {
+        return 16000000;
+    }
+    if (self->p_config->frequency == NRF_SPIM_FREQ_32M) {
+        return 32000000;
+    }
+    #endif
+    return 125000 * (self->p_config->frequency >> 25);
+}
+
 static void machine_hard_spi_init_helper(const machine_hard_spi_obj_t *self, mp_arg_val_t *args);
 
 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(%u)", self->p_spi->drv_inst_idx);
+    unsigned int polarity = self->p_config->mode == NRF_SPI_MODE_0 || self->p_config->mode == NRF_SPI_MODE_1 ? 0 : 1;
+    unsigned int phase = self->p_config->mode == NRF_SPI_MODE_0 || self->p_config->mode == NRF_SPI_MODE_2 ? 0 : 1;
+    mp_printf(print, "SPI(%u, baudrate=%u, polarity=%u, phase=%u)",
+        self->p_spi->drv_inst_idx, machine_hard_spi_get_baudrate(self), polarity, phase);
 }
 
 static 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) {

From f1b00d67e969ae97d0dc362df7ee0355c1a12a30 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Sep 2025 11:16:05 +1000
Subject: [PATCH 2861/3129] cc3200/mpconfigport: Use
 MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES.

This commit makes it explicit that the port uses the
MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES feature level, and removes config
options that are the default at this level.

This change is a no-op for the firmware.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/mpconfigport.h | 39 +++++++------------------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 3e8498e380be4..ba7e5830ffd2f 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -32,31 +32,27 @@
 #include "semphr.h"
 #endif
 
+// Set the rom feature level.
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
+
 // options to control how MicroPython is built
 
 #define MICROPY_GC_STACK_ENTRY_TYPE                 uint16_t
 #define MICROPY_ALLOC_PATH_MAX                      (128)
 #define MICROPY_PERSISTENT_CODE_LOAD                (1)
-#define MICROPY_EMIT_THUMB                          (0)
-#define MICROPY_EMIT_INLINE_THUMB                   (0)
 #define MICROPY_COMP_CONST_LITERAL                  (0)
 #define MICROPY_COMP_MODULE_CONST                   (1)
 #define MICROPY_ENABLE_GC                           (1)
 #define MICROPY_ENABLE_FINALISER                    (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN            (0)
-#define MICROPY_STACK_CHECK                         (0)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF      (1)
+#define MICROPY_KBD_EXCEPTION                       (1)
 #define MICROPY_HELPER_REPL                         (1)
 #define MICROPY_ENABLE_SOURCE_LINE                  (1)
-#define MICROPY_ENABLE_DOC_STRING                   (0)
 #define MICROPY_REPL_AUTO_INDENT                    (1)
 #define MICROPY_ERROR_REPORTING                     (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_LONGINT_IMPL                        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_FLOAT_IMPL                          (MICROPY_FLOAT_IMPL_NONE)
-#define MICROPY_OPT_COMPUTED_GOTO                   (0)
 #define MICROPY_READER_VFS                          (1)
-#ifndef DEBUG // we need ram on the launchxl while debugging
-#define MICROPY_CPYTHON_COMPAT                      (1)
-#else
+#ifdef DEBUG // we need ram on the launchxl while debugging
 #define MICROPY_CPYTHON_COMPAT                      (0)
 #endif
 
@@ -74,7 +70,7 @@
 #define MICROPY_USE_INTERNAL_ERRNO                  (1)
 #define MICROPY_VFS                                 (1)
 #define MICROPY_VFS_FAT                             (1)
-#define MICROPY_PY_ASYNC_AWAIT (0)
+#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)
@@ -88,32 +84,16 @@
 #define MICROPY_PY_BUILTINS_EXECFILE                (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN               (1)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (1)
-#else
-#define MICROPY_PY_BUILTINS_STR_UNICODE             (0)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES          (0)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW              (0)
-#define MICROPY_PY_BUILTINS_FROZENSET               (0)
-#define MICROPY_PY_BUILTINS_EXECFILE                (0)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN               (0)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (0)
 #endif
-#define MICROPY_PY_MICROPYTHON_MEM_INFO             (0)
 #define MICROPY_PY_SYS_MAXSIZE                      (1)
-#define MICROPY_PY_SYS_EXIT                         (1)
 #define MICROPY_PY_SYS_STDFILES                     (1)
-#define MICROPY_PY_CMATH                            (0)
-#define MICROPY_PY_IO                               (1)
 #define MICROPY_PY_ERRNO                            (1)
 #define MICROPY_PY_ERRNO_ERRORCODE                  (0)
 #define MICROPY_PY_THREAD                           (1)
 #define MICROPY_PY_THREAD_GIL                       (1)
 #define MICROPY_PY_BINASCII                         (1)
-#define MICROPY_PY_UCTYPES                          (0)
-#define MICROPY_PY_DEFLATE                          (0)
 #define MICROPY_PY_JSON                             (1)
 #define MICROPY_PY_RE                               (1)
-#define MICROPY_PY_HEAPQ                            (0)
-#define MICROPY_PY_HASHLIB                          (0)
 #define MICROPY_PY_OS                               (1)
 #define MICROPY_PY_OS_INCLUDEFILE                   "ports/cc3200/mods/modos.c"
 #define MICROPY_PY_OS_DUPTERM                       (1)
@@ -124,7 +104,6 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME     (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS                (1)
 #define MICROPY_PY_TIME_INCLUDEFILE                 "ports/cc3200/mods/modtime.c"
-#define MICROPY_PY_VFS                              (1)
 #define MICROPY_PY_MACHINE                          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE              "ports/cc3200/mods/modmachine.c"
 #define MICROPY_PY_MACHINE_RESET                    (1)
@@ -133,10 +112,6 @@
 #define MICROPY_PY_MACHINE_WDT                      (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE          "ports/cc3200/mods/machine_wdt.c"
 
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF      (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE        (0)
-#define MICROPY_KBD_EXCEPTION                       (1)
-
 // We define our own list of errno constants to include in errno module
 #define MICROPY_PY_ERRNO_LIST \
     X(EPERM) \

From 24f395b5dbb2149bf505873e32f7899c6dd57558 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Sep 2025 15:24:02 +1000
Subject: [PATCH 2862/3129] tests/ports/webassembly: Move JsProxy identity test
 to separate file.

This test is not a PyProxy test, rather it's a JsProxy test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/webassembly/js_proxy_identity.mjs  | 18 ++++++++++++++++++
 .../webassembly/js_proxy_identity.mjs.exp      |  8 ++++++++
 tests/ports/webassembly/py_proxy_identity.mjs  |  9 ---------
 .../webassembly/py_proxy_identity.mjs.exp      |  7 -------
 4 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 tests/ports/webassembly/js_proxy_identity.mjs
 create mode 100644 tests/ports/webassembly/js_proxy_identity.mjs.exp

diff --git a/tests/ports/webassembly/js_proxy_identity.mjs b/tests/ports/webassembly/js_proxy_identity.mjs
new file mode 100644
index 0000000000000..e279d219d2104
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_identity.mjs
@@ -0,0 +1,18 @@
+// Test identity of JsProxy when they are the same JavaScript object.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+mp.runPython(`
+import js
+
+print(js.Object)
+
+print("Object equality")
+print(js.Object == js.Object)
+print(js.Object.assign == js.Object.assign)
+
+print("Array equality")
+print(js.Array == js.Array)
+print(js.Array.prototype == js.Array.prototype)
+print(js.Array.prototype.push == js.Array.prototype.push)
+`);
diff --git a/tests/ports/webassembly/js_proxy_identity.mjs.exp b/tests/ports/webassembly/js_proxy_identity.mjs.exp
new file mode 100644
index 0000000000000..5791d911bafa8
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_identity.mjs.exp
@@ -0,0 +1,8 @@
+<JsProxy 2>
+Object equality
+True
+True
+Array equality
+True
+True
+True
diff --git a/tests/ports/webassembly/py_proxy_identity.mjs b/tests/ports/webassembly/py_proxy_identity.mjs
index 97dab2e78367a..d4a720b738a6c 100644
--- a/tests/ports/webassembly/py_proxy_identity.mjs
+++ b/tests/ports/webassembly/py_proxy_identity.mjs
@@ -23,13 +23,4 @@ js.eventTarget.addEventListener("event", callback)
 js.eventTarget.dispatchEvent(js.event)
 js.eventTarget.removeEventListener("event", callback)
 js.eventTarget.dispatchEvent(js.event)
-
-print("Object equality")
-print(js.Object == js.Object)
-print(js.Object.assign == js.Object.assign)
-
-print("Array equality")
-print(js.Array == js.Array)
-print(js.Array.prototype == js.Array.prototype)
-print(js.Array.prototype.push == js.Array.prototype.push)
 `);
diff --git a/tests/ports/webassembly/py_proxy_identity.mjs.exp b/tests/ports/webassembly/py_proxy_identity.mjs.exp
index 344a0a202364c..b5b8b210bb605 100644
--- a/tests/ports/webassembly/py_proxy_identity.mjs.exp
+++ b/tests/ports/webassembly/py_proxy_identity.mjs.exp
@@ -1,10 +1,3 @@
 PyProxy { _ref: 3 } PyProxy { _ref: 3 }
 true
 callback <JsProxy 5>
-Object equality
-True
-True
-Array equality
-True
-True
-True

From 9eddbb32f338a51b475b56891b334084633fbd0e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Sep 2025 14:48:17 +1000
Subject: [PATCH 2863/3129] webassembly: Do GC in return path rather than entry
 path.

Doing GC calls in the entry path (when JavaScript calls into MicroPython at
the top/outer level) can lead to freeing of objects which are still in use.
This is because the (JavaScript) objects are referenced in the input
arguments to the C functions and they are not yet converted to full proxy
objects and not yet tracked properly by the live-object tracker.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/main.c    | 16 +++++++---------
 ports/webassembly/proxy_c.c | 17 +++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index e0e2d59ae6bd0..a7df7969c318e 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -58,15 +58,15 @@ static void gc_collect_top_level(void);
 
 void external_call_depth_inc(void) {
     ++external_call_depth;
-    #if MICROPY_GC_SPLIT_HEAP_AUTO
-    if (external_call_depth == 1) {
-        gc_collect_top_level();
-    }
-    #endif
 }
 
 void external_call_depth_dec(void) {
     --external_call_depth;
+    #if MICROPY_GC_SPLIT_HEAP_AUTO
+    if (external_call_depth == 0) {
+        gc_collect_top_level();
+    }
+    #endif
 }
 
 void mp_js_init(int pystack_size, int heap_size) {
@@ -133,13 +133,12 @@ void mp_js_do_import(const char *name, uint32_t *out) {
             }
         }
         nlr_pop();
-        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(ret, out);
     } else {
         // uncaught exception
-        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
+    external_call_depth_dec();
 }
 
 void mp_js_do_exec(const char *src, size_t len, uint32_t *out) {
@@ -153,13 +152,12 @@ void mp_js_do_exec(const char *src, size_t len, uint32_t *out) {
         mp_obj_t module_fun = mp_compile(&parse_tree, source_name, false);
         mp_obj_t ret = mp_call_function_0(module_fun);
         nlr_pop();
-        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(ret, out);
     } else {
         // uncaught exception
-        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
+    external_call_depth_dec();
 }
 
 void mp_js_do_exec_async(const char *src, size_t len, uint32_t *out) {
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index b7bc87b76349b..459f6a6dad88f 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -257,13 +257,12 @@ void proxy_c_to_js_call(uint32_t c_ref, uint32_t n_args, uint32_t *args_value, u
         mp_obj_t obj = proxy_c_get_obj(c_ref);
         mp_obj_t member = mp_call_function_n_kw(obj, n_args, 0, args);
         nlr_pop();
-        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(member, out);
     } else {
         // uncaught exception
-        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
+    external_call_depth_dec();
 }
 
 void proxy_c_to_js_dir(uint32_t c_ref, uint32_t *out) {
@@ -285,13 +284,12 @@ void proxy_c_to_js_dir(uint32_t c_ref, uint32_t *out) {
             dir = mp_builtin_dir_obj.fun.var(1, args);
         }
         nlr_pop();
-        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(dir, out);
     } else {
         // uncaught exception
-        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
+    external_call_depth_dec();
 }
 
 bool proxy_c_to_js_has_attr(uint32_t c_ref, const char *attr_in) {
@@ -333,13 +331,12 @@ void proxy_c_to_js_lookup_attr(uint32_t c_ref, const char *attr_in, uint32_t *ou
             member = mp_load_attr(obj, attr);
         }
         nlr_pop();
-        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(member, out);
     } else {
         // uncaught exception
-        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
     }
+    external_call_depth_dec();
 }
 
 static bool proxy_c_to_js_store_helper(uint32_t c_ref, const char *attr_in, uint32_t *value_in) {
@@ -450,16 +447,17 @@ bool proxy_c_to_js_iternext(uint32_t c_ref, uint32_t *out) {
             return false;
         }
         nlr_pop();
-        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(iter, out);
+        external_call_depth_dec();
         return true;
     } else {
-        external_call_depth_dec();
         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))) {
+            external_call_depth_dec();
             return false;
         } else {
             // uncaught exception
             proxy_convert_mp_to_js_exc_cside(nlr.ret_val, out);
+            external_call_depth_dec();
             return true;
         }
     }
@@ -605,11 +603,10 @@ void proxy_c_to_js_resume(uint32_t c_ref, uint32_t *args) {
         mp_obj_t reject = proxy_convert_js_to_mp_obj_cside(args + 2 * 3);
         mp_obj_t ret = proxy_resume_execute(obj, mp_const_none, mp_const_none, resolve, reject);
         nlr_pop();
-        external_call_depth_dec();
         proxy_convert_mp_to_js_obj_cside(ret, args);
     } else {
         // uncaught exception
-        external_call_depth_dec();
         proxy_convert_mp_to_js_exc_cside(nlr.ret_val, args);
     }
+    external_call_depth_dec();
 }

From a319ddefa60750ce1b71b1fc7296fc2c69adc66a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Sep 2025 13:56:58 +1000
Subject: [PATCH 2864/3129] webassembly: Improve identity and fix bug with lost
 JsProxy refs.

Commit ffa98cb0143c43af9f4c61142784a08a19f660c5 improved equality for
`JsProxy` objects so that, eg, `js.Object == js.Object` is true.

As mentioned in #17758, a further optimisation is to make identity work in
that case, eg `js.Object is js.Object` should be true (on the Python side).

This commit implements that, by keeping track of all `JsProxy` Python
objects and reusing them where possible: where the underlying JS ref is
equal, ie they point to the same JS object.  That reduces memory churn and
gives better identity behaviour of JS objects proxied over to Python.

As part of this, a bug is fixed where JS objects can be freed while there's
still a `JsProxy` referring to that JS object.  A test is added for that
exact scenario, and the test now passes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/objjsproxy.c                | 31 ++++++++++++
 ports/webassembly/proxy_c.c                   | 10 +++-
 ports/webassembly/proxy_c.h                   |  1 +
 ports/webassembly/proxy_js.js                 | 50 +++++++++----------
 tests/ports/webassembly/heap_expand.mjs.exp   | 48 +++++++++---------
 tests/ports/webassembly/js_proxy_identity.mjs |  7 +++
 .../webassembly/js_proxy_identity.mjs.exp     |  5 ++
 .../ports/webassembly/js_proxy_reuse_free.mjs | 48 ++++++++++++++++++
 .../webassembly/js_proxy_reuse_free.mjs.exp   |  7 +++
 9 files changed, 155 insertions(+), 52 deletions(-)
 create mode 100644 tests/ports/webassembly/js_proxy_reuse_free.mjs
 create mode 100644 tests/ports/webassembly/js_proxy_reuse_free.mjs.exp

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index a8b21a744565c..2d46702ff8eec 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -32,6 +32,9 @@
 #include "py/runtime.h"
 #include "proxy_c.h"
 
+static mp_obj_t *jsproxy_table = NULL;
+static size_t jsproxy_table_len = 0;
+
 EM_JS(bool, has_attr, (int jsref, const char *str), {
     const base = proxy_js_ref[jsref];
     const attr = UTF8ToString(str);
@@ -295,6 +298,7 @@ EM_JS(void, proxy_js_free_obj, (int js_ref), {
 
 static mp_obj_t jsproxy___del__(mp_obj_t self_in) {
     mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
+    jsproxy_table[self->ref] = MP_OBJ_NULL;
     proxy_js_free_obj(self->ref);
     return mp_const_none;
 }
@@ -590,13 +594,40 @@ MP_DEFINE_CONST_OBJ_TYPE(
     iter, jsproxy_getiter
     );
 
+void mp_obj_jsproxy_init(void) {
+    jsproxy_table = NULL;
+    jsproxy_table_len = 0;
+    MP_STATE_PORT(jsproxy_global_this) = mp_obj_new_jsproxy(MP_OBJ_JSPROXY_REF_GLOBAL_THIS);
+}
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t jsproxy_global_this);
+
 mp_obj_t mp_obj_new_jsproxy(int ref) {
+    // The proxy for this ref should not exist.
+    assert(ref >= jsproxy_table_len || jsproxy_table[ref] == MP_OBJ_NULL);
+
     mp_obj_jsproxy_t *o = mp_obj_malloc_with_finaliser(mp_obj_jsproxy_t, &mp_type_jsproxy);
     o->ref = ref;
     o->bind_to_self = false;
+    if (ref >= jsproxy_table_len) {
+        size_t new_len = MAX(16, ref * 2);
+        jsproxy_table = realloc(jsproxy_table, new_len * sizeof(mp_obj_t));
+        for (size_t i = jsproxy_table_len; i < new_len; ++i) {
+            jsproxy_table[i] = MP_OBJ_NULL;
+        }
+        jsproxy_table_len = new_len;
+    }
+    jsproxy_table[ref] = MP_OBJ_FROM_PTR(o);
     return MP_OBJ_FROM_PTR(o);
 }
 
+mp_obj_t mp_obj_get_jsproxy(int ref) {
+    // The proxy for this ref should exist.
+    assert(ref < jsproxy_table_len && jsproxy_table[ref] != MP_OBJ_NULL);
+
+    return jsproxy_table[ref];
+}
+
 // Load/delete/store an attribute from/to the JavaScript globalThis entity.
 void mp_obj_jsproxy_global_this_attr(qstr attr, mp_obj_t *dest) {
     if (dest[0] == MP_OBJ_NULL) {
diff --git a/ports/webassembly/proxy_c.c b/ports/webassembly/proxy_c.c
index 459f6a6dad88f..790ad90ef854f 100644
--- a/ports/webassembly/proxy_c.c
+++ b/ports/webassembly/proxy_c.c
@@ -59,8 +59,9 @@ enum {
     PROXY_KIND_JS_INTEGER = 3,
     PROXY_KIND_JS_DOUBLE = 4,
     PROXY_KIND_JS_STRING = 5,
-    PROXY_KIND_JS_OBJECT = 6,
-    PROXY_KIND_JS_PYPROXY = 7,
+    PROXY_KIND_JS_OBJECT_EXISTING = 6,
+    PROXY_KIND_JS_OBJECT = 7,
+    PROXY_KIND_JS_PYPROXY = 8,
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -83,6 +84,9 @@ void proxy_c_init(void) {
     MP_STATE_PORT(proxy_c_dict) = mp_obj_new_dict(0);
     mp_obj_list_append(MP_STATE_PORT(proxy_c_ref), MP_OBJ_NULL);
     proxy_c_ref_next = PROXY_C_REF_NUM_STATIC;
+
+    void mp_obj_jsproxy_init(void);
+    mp_obj_jsproxy_init();
 }
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t proxy_c_ref);
@@ -172,6 +176,8 @@ mp_obj_t proxy_convert_js_to_mp_obj_cside(uint32_t *value) {
         return s;
     } else if (value[0] == PROXY_KIND_JS_PYPROXY) {
         return proxy_c_get_obj(value[1]);
+    } else if (value[0] == PROXY_KIND_JS_OBJECT_EXISTING) {
+        return mp_obj_get_jsproxy(value[1]);
     } else {
         // PROXY_KIND_JS_OBJECT
         return mp_obj_new_jsproxy(value[1]);
diff --git a/ports/webassembly/proxy_c.h b/ports/webassembly/proxy_c.h
index bac0a90bd68b5..2f37aedbc5a4f 100644
--- a/ports/webassembly/proxy_c.h
+++ b/ports/webassembly/proxy_c.h
@@ -53,6 +53,7 @@ void proxy_convert_mp_to_js_obj_cside(mp_obj_t obj, uint32_t *out);
 void proxy_convert_mp_to_js_exc_cside(void *exc, uint32_t *out);
 
 mp_obj_t mp_obj_new_jsproxy(int ref);
+mp_obj_t mp_obj_get_jsproxy(int ref);
 void mp_obj_jsproxy_global_this_attr(qstr attr, mp_obj_t *dest);
 
 static inline bool mp_obj_is_jsproxy(mp_obj_t o) {
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
index cbd6e5b0088cc..60b832d81fd51 100644
--- a/ports/webassembly/proxy_js.js
+++ b/ports/webassembly/proxy_js.js
@@ -48,8 +48,9 @@ const PROXY_KIND_JS_BOOLEAN = 2;
 const PROXY_KIND_JS_INTEGER = 3;
 const PROXY_KIND_JS_DOUBLE = 4;
 const PROXY_KIND_JS_STRING = 5;
-const PROXY_KIND_JS_OBJECT = 6;
-const PROXY_KIND_JS_PYPROXY = 7;
+const PROXY_KIND_JS_OBJECT_EXISTING = 6;
+const PROXY_KIND_JS_OBJECT = 7;
+const PROXY_KIND_JS_PYPROXY = 8;
 
 class PythonError extends Error {
     constructor(exc_type, exc_details) {
@@ -63,6 +64,7 @@ function proxy_js_init() {
     globalThis.proxy_js_ref = [globalThis, undefined];
     globalThis.proxy_js_ref_next = PROXY_JS_REF_NUM_STATIC;
     globalThis.proxy_js_ref_map = new Map();
+    globalThis.proxy_js_ref_map.set(globalThis, 0);
     globalThis.proxy_js_map = new Map();
     globalThis.proxy_js_existing = [undefined];
     globalThis.pyProxyFinalizationRegistry = new FinalizationRegistry(
@@ -99,12 +101,6 @@ function proxy_js_check_existing(c_ref) {
 // The `js_obj` argument cannot be `undefined`.
 // Returns an integer reference to the given `js_obj`.
 function proxy_js_add_obj(js_obj) {
-    // See if there is an existing JsProxy reference, and use that if there is.
-    const existing_ref = proxy_js_ref_map.get(js_obj);
-    if (existing_ref !== undefined) {
-        return existing_ref;
-    }
-
     // Search for the first free slot in proxy_js_ref.
     while (proxy_js_ref_next < proxy_js_ref.length) {
         if (proxy_js_ref[proxy_js_ref_next] === undefined) {
@@ -175,7 +171,7 @@ function proxy_call_python(target, argumentsList) {
     return ret;
 }
 
-function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
+function proxy_convert_js_to_mp_obj_jsside_helper(js_obj, out, allow_pyproxy) {
     let kind;
     if (js_obj === undefined) {
         kind = PROXY_KIND_JS_UNDEFINED;
@@ -206,33 +202,35 @@ function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
         Module.setValue(out + 4, len, "i32");
         Module.setValue(out + 8, buf, "i32");
     } else if (
-        js_obj instanceof PyProxy ||
-        (typeof js_obj === "function" && "_ref" in js_obj) ||
-        js_obj instanceof PyProxyThenable
+        allow_pyproxy &&
+        (js_obj instanceof PyProxy ||
+            (typeof js_obj === "function" && "_ref" in js_obj) ||
+            js_obj instanceof PyProxyThenable)
     ) {
         kind = PROXY_KIND_JS_PYPROXY;
         Module.setValue(out + 4, js_obj._ref, "i32");
     } else {
-        kind = PROXY_KIND_JS_OBJECT;
-        const id = proxy_js_add_obj(js_obj);
+        let id;
+        // See if there is an existing JsProxy reference, and use that if there is.
+        const existing_ref = proxy_js_ref_map.get(js_obj);
+        if (existing_ref !== undefined) {
+            kind = PROXY_KIND_JS_OBJECT_EXISTING;
+            id = existing_ref;
+        } else {
+            kind = PROXY_KIND_JS_OBJECT;
+            id = proxy_js_add_obj(js_obj);
+        }
         Module.setValue(out + 4, id, "i32");
     }
     Module.setValue(out + 0, kind, "i32");
 }
 
+function proxy_convert_js_to_mp_obj_jsside(js_obj, out) {
+    proxy_convert_js_to_mp_obj_jsside_helper(js_obj, out, true);
+}
+
 function proxy_convert_js_to_mp_obj_jsside_force_double_proxy(js_obj, out) {
-    if (
-        js_obj instanceof PyProxy ||
-        (typeof js_obj === "function" && "_ref" in js_obj) ||
-        js_obj instanceof PyProxyThenable
-    ) {
-        const kind = PROXY_KIND_JS_OBJECT;
-        const id = proxy_js_add_obj(js_obj);
-        Module.setValue(out + 4, id, "i32");
-        Module.setValue(out + 0, kind, "i32");
-    } else {
-        proxy_convert_js_to_mp_obj_jsside(js_obj, out);
-    }
+    proxy_convert_js_to_mp_obj_jsside_helper(js_obj, out, false);
 }
 
 function proxy_convert_mp_to_js_obj_jsside(value) {
diff --git a/tests/ports/webassembly/heap_expand.mjs.exp b/tests/ports/webassembly/heap_expand.mjs.exp
index 56341351492f5..67ebe98e7fe02 100644
--- a/tests/ports/webassembly/heap_expand.mjs.exp
+++ b/tests/ports/webassembly/heap_expand.mjs.exp
@@ -1,27 +1,27 @@
-135241328
-135241296
-135241264
-135241232
-135241184
-135241136
-135241056
-135240912
-135240608
-135240080
-135239040
-135236976
-135232864
-135224656
-135208256
-135175472
-135109856
-134978768
-134716608
-135216752
-136217120
-138217808
-142219264
-150222192
+135241312
+135241280
+135241248
+135241216
+135241168
+135241120
+135241040
+135240896
+135240592
+135240064
+135239024
+135236960
+135232848
+135224640
+135208240
+135175456
+135109840
+134978752
+134716592
+135216800
+136217168
+138217984
+142219568
+150222816
 1
 2
 4
diff --git a/tests/ports/webassembly/js_proxy_identity.mjs b/tests/ports/webassembly/js_proxy_identity.mjs
index e279d219d2104..ca2f3980af4ec 100644
--- a/tests/ports/webassembly/js_proxy_identity.mjs
+++ b/tests/ports/webassembly/js_proxy_identity.mjs
@@ -11,8 +11,15 @@ print("Object equality")
 print(js.Object == js.Object)
 print(js.Object.assign == js.Object.assign)
 
+print("Object identity")
+print(js.Object is js.Object)
+
 print("Array equality")
 print(js.Array == js.Array)
 print(js.Array.prototype == js.Array.prototype)
 print(js.Array.prototype.push == js.Array.prototype.push)
+
+print("Array identity")
+print(js.Array is js.Array)
+print(js.Array.prototype is js.Array.prototype)
 `);
diff --git a/tests/ports/webassembly/js_proxy_identity.mjs.exp b/tests/ports/webassembly/js_proxy_identity.mjs.exp
index 5791d911bafa8..d8f1ae8913991 100644
--- a/tests/ports/webassembly/js_proxy_identity.mjs.exp
+++ b/tests/ports/webassembly/js_proxy_identity.mjs.exp
@@ -2,7 +2,12 @@
 Object equality
 True
 True
+Object identity
+True
 Array equality
 True
 True
 True
+Array identity
+True
+True
diff --git a/tests/ports/webassembly/js_proxy_reuse_free.mjs b/tests/ports/webassembly/js_proxy_reuse_free.mjs
new file mode 100644
index 0000000000000..ebca86f0bad01
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_reuse_free.mjs
@@ -0,0 +1,48 @@
+// Test reuse of JsProxy references and freeing of JsProxy objects.
+// This ensures that a Python-side JsProxy that refers to a JavaScript object retains
+// the correct JavaScript object in the case that another JsProxy that refers to the
+// same JavaScript object is freed.
+
+const mp = await (await import(process.argv[2])).loadMicroPython();
+
+globalThis.obj = [1, 2];
+globalThis.obj2 = [3, 4];
+
+console.log("JS obj:", globalThis.obj);
+
+mp.runPython(`
+import gc
+import js
+
+# Create 2 proxies of the same JS object.
+# They should refer to the same underlying JS-side reference.
+obj = js.obj
+obj_copy = js.obj
+print(obj, obj_copy, obj == obj_copy)
+
+# Print out the object.
+js.console.log("Py obj:", obj)
+
+# Forget obj_copy and trigger a GC when the Python code finishes.
+obj_copy = None
+gc.collect()
+`);
+
+console.log("JS obj:", globalThis.obj);
+
+mp.runPython(`
+# Create a new proxy of a different object.
+# It should not clobber the existing obj proxy reference.
+obj2 = js.obj2
+
+# Create a copy of the existing obj proxy.
+obj_copy = js.obj
+
+# Print the JS proxy, it should be the same reference as before.
+print(obj, obj_copy, obj == obj_copy)
+
+# Print out the object.
+js.console.log("Py obj:", obj)
+`);
+
+console.log("JS obj:", globalThis.obj);
diff --git a/tests/ports/webassembly/js_proxy_reuse_free.mjs.exp b/tests/ports/webassembly/js_proxy_reuse_free.mjs.exp
new file mode 100644
index 0000000000000..c74e4f49ee421
--- /dev/null
+++ b/tests/ports/webassembly/js_proxy_reuse_free.mjs.exp
@@ -0,0 +1,7 @@
+JS obj: [ 1, 2 ]
+<JsProxy 2> <JsProxy 2> True
+Py obj: [ 1, 2 ]
+JS obj: [ 1, 2 ]
+<JsProxy 2> <JsProxy 2> True
+Py obj: [ 1, 2 ]
+JS obj: [ 1, 2 ]

From 293bb0e575052c29aeeae0ea53a41eb1c1a88db8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Sep 2025 16:12:54 +1000
Subject: [PATCH 2865/3129] webassembly: Remove
 MICROPY_PY_BOUND_METHOD_FULL_EQUALITY_CHECK.

With the parent commit implementing proper identities, this equality check
option is no longer needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 0783aacbbcd24..b13da2991e63e 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -53,7 +53,6 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
-#define MICROPY_PY_BOUND_METHOD_FULL_EQUALITY_CHECK (1)
 
 #define MICROPY_EPOCH_IS_1970       (1)
 #define MICROPY_PY_ASYNCIO_TASK_QUEUE_PUSH_CALLBACK (1)

From 70c4ffa77081385df6401be80d5b2e640a2ca976 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 21 Sep 2025 09:50:02 -0500
Subject: [PATCH 2866/3129] tools/ci.sh: Add `--bash-completion` option.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 docs/develop/gettingstarted.rst | 16 ++++++++++++++++
 tools/ci.sh                     | 11 +++++++++++
 2 files changed, 27 insertions(+)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index b625a72c98a86..4cc818fda1b8e 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -306,6 +306,22 @@ As an example, you can build and test the unix minimal port with:
 
    $ tools/ci.sh unix_minimal_build unix_minimal_run_tests
 
+If you use the bash shell, you can add a ``ci`` command with tab completion:
+
+.. code-block:: bash
+
+   $ eval `tools/ci.sh --bash-completion`
+   $ ci unix_cov<tab>
+
+This will complete the ci step name to ``unix_coverage_``.
+Pressing tab a second time will show the list of matching steps:
+
+.. code-block:: bash
+
+   $ ci unix_coverage_<tab>
+   unix_coverage_32bit_build
+   unix_coverage_32bit_run_native_mpy_tests…
+
 Folder structure
 ----------------
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 3e34bd6fa860f..6ecf8cc67cce7 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1005,11 +1005,22 @@ function _ci_help {
     exit
 }
 
+function _ci_bash_completion {
+    echo "alias ci=\"$(readlink -f "$0")\"; complete -W '$(grep '^function ci_' $0 | awk '{print $2}' | sed 's/^ci_//')' ci"
+}
+
 function _ci_main {
     case "$1" in
         (-h|-?|--help)
             _ci_help
         ;;
+        (--bash-completion)
+            _ci_bash_completion
+        ;;
+        (-*)
+            echo "Unknown option: $1" 1>&2
+            exit 1
+        ;;
         (*)
             set -e
             cd $(dirname "$0")/..

From 7e5c55dc2f36022100fda3dc09063c4704251a12 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 21 Sep 2025 08:47:09 -0500
Subject: [PATCH 2867/3129] py/mkrules.mk: Add %.sz rule to print size of an
 object file.

It's frequently the case that a developer will want to compare the object
code size of various alternatives.  When this can be done at the single
object code level, the turnaround is faster.

Provide a rule `$(BUILD)/%.sz` to print the size of a given object.
Because it is a normal Makefile target that depends on an object file, it
rebuilds the object file if needed.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/mkrules.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 6993a13a4f1ef..4968ed58b03ea 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -108,6 +108,10 @@ $(BUILD)/%.pp: %.c FORCE
 	$(ECHO) "PreProcess $<"
 	$(Q)$(CPP) $(CFLAGS) -Wp,-C,-dD,-dI -o $@ $<
 
+.PHONY: $(BUILD)/%.sz
+$(BUILD)/%.sz: $(BUILD)/%.o
+	$(Q)$(SIZE) $<
+
 # Special case for compiling auto-generated source files.
 $(BUILD)/%.o: $(BUILD)/%.c
 	$(call compile_c)

From 1921d22b35cb241eff5aa923325c53efbedf1dc2 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 21 Sep 2025 09:51:01 -0500
Subject: [PATCH 2868/3129] docs/develop/gettingstarted: Document the
 additional unix test targets.

The docs in the port README are nice but don't appear at
docs.micropython.org.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 docs/develop/gettingstarted.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 4cc818fda1b8e..039be881e05ce 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -282,6 +282,19 @@ To run a selection of tests on a board/device connected over USB use:
 
 See also :ref:`writingtests`.
 
+Additional make targets for developers
+--------------------------------------
+
+In ``ports/unix`` there are additional targets related to running tests:
+
+.. code-block:: bash
+
+   $ make test//int       # Run all tests matching the pattern "int"
+   $ make test/ports/unix # Run all tests in ports/unix
+   $ make test-failures   # Re-run only the failed tests
+   $ make print-failures  # print the differences for failed tests
+   $ make clean-failures  # delete the .exp and .out files from failed tests
+
 Using ci.sh locally
 -------------------
 

From adf63198849caa8c660249782caa368589ef7916 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 21 Sep 2025 09:53:27 -0500
Subject: [PATCH 2869/3129] docs/develop/gettingstarted: Document %.sz and %.pp
 targets.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 docs/develop/gettingstarted.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 039be881e05ce..cb479458e1102 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -285,6 +285,21 @@ See also :ref:`writingtests`.
 Additional make targets for developers
 --------------------------------------
 
+In all ``make``-based ports, there is a target to print the size of a specific object file.
+When a change is confined to a single file, this is useful when testing variations to find smaller alternatives.
+
+For instance, to print the size of ``objstr.o`` in the ``py/`` directory when making a unix standard build:
+
+.. code-block:: bash
+
+   $ make build-standard/py/objstr.sz
+
+Similarly, there is a target to save the preprocessed version of a file:
+
+.. code-block:: bash
+
+   $ make build-standard/py/objstr.pp
+
 In ``ports/unix`` there are additional targets related to running tests:
 
 .. code-block:: bash

From 4b013ec3ff688b8dc3af0cc9159a5fc4c27d8d20 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 8 Aug 2025 08:53:14 -0500
Subject: [PATCH 2870/3129] extmod/vfs_reader: Check that open() resulted in a
 file-like object.

That is, an object whose type defines the protocol slot.

Note that due to protocol confusion, a variant of the original crasher that
returned e.g., a machine.Pin instance could still lead to a crash (#17852).

Fixes issue #17841.

Signed-off-by: Jeff Epler <jepler@gmail.com>
Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 extmod/vfs_reader.c                       |  2 +-
 tests/micropython/builtin_execfile.py     | 21 +++++++++++++++++++++
 tests/micropython/builtin_execfile.py.exp |  3 +++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/extmod/vfs_reader.c b/extmod/vfs_reader.c
index de5c4e03d3c13..6c36770295be6 100644
--- a/extmod/vfs_reader.c
+++ b/extmod/vfs_reader.c
@@ -83,7 +83,7 @@ void mp_reader_new_file(mp_reader_t *reader, qstr filename) {
     };
     mp_obj_t file = mp_vfs_open(MP_ARRAY_SIZE(args), &args[0], (mp_map_t *)&mp_const_empty_map);
 
-    const mp_stream_p_t *stream_p = mp_get_stream(file);
+    const mp_stream_p_t *stream_p = mp_get_stream_raise(file, MP_STREAM_OP_READ);
     int errcode = 0;
 
     #if MICROPY_VFS_ROM
diff --git a/tests/micropython/builtin_execfile.py b/tests/micropython/builtin_execfile.py
index 75a867bb94023..4fd4d66d4ee25 100644
--- a/tests/micropython/builtin_execfile.py
+++ b/tests/micropython/builtin_execfile.py
@@ -75,3 +75,24 @@ def open(self, file, mode):
 
 # Unmount the VFS object.
 vfs.umount(fs)
+
+
+class EvilFilesystem:
+    def mount(self, readonly, mkfs):
+        print("mount", readonly, mkfs)
+
+    def umount(self):
+        print("umount")
+
+    def open(self, file, mode):
+        return None
+
+
+fs = EvilFilesystem()
+vfs.mount(fs, "/test_mnt")
+try:
+    execfile("/test_mnt/test.py")
+    print("ExecFile succeeded")
+except OSError:
+    print("OSError")
+vfs.umount(fs)
diff --git a/tests/micropython/builtin_execfile.py.exp b/tests/micropython/builtin_execfile.py.exp
index 49703d570763d..d93dee547b6ea 100644
--- a/tests/micropython/builtin_execfile.py.exp
+++ b/tests/micropython/builtin_execfile.py.exp
@@ -5,3 +5,6 @@ open /test.py rb
 123
 TypeError
 umount
+mount False False
+OSError
+umount

From 0a41838becec8af2d80b90388072090ef2d0a4ad Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Fri, 26 Sep 2025 09:17:47 -0500
Subject: [PATCH 2871/3129] extmod/modopenamp: Check that mp_vfs_open actually
 returned a stream.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 extmod/modopenamp_remoteproc_store.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extmod/modopenamp_remoteproc_store.c b/extmod/modopenamp_remoteproc_store.c
index 03022ebc83518..7c2cee1099cda 100644
--- a/extmod/modopenamp_remoteproc_store.c
+++ b/extmod/modopenamp_remoteproc_store.c
@@ -76,6 +76,7 @@ static int openamp_remoteproc_store_open(void *store, const char *path, const vo
 
     openamp_remoteproc_filestore_t *fstore = store;
     fstore->file = mp_vfs_open(MP_ARRAY_SIZE(args), args, (mp_map_t *)&mp_const_empty_map);
+    (void)mp_get_stream_raise(fstore->file, MP_STREAM_OP_READ);
 
     int error = 0;
     mp_uint_t bytes = mp_stream_read_exactly(fstore->file, fstore->buf, RPROC_FILE_STORE_BUF_SIZE, &error);

From 2d08f2f6311739c26ed3e15d10d9c03d7cabfe9f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sat, 20 Sep 2025 11:48:23 -0500
Subject: [PATCH 2872/3129] extmod/moductypes: Error if small ints are not big
 enough.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 extmod/moductypes.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index eb72f441bbbce..ed865f4263f83 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "py/smallint.h"
 #include "py/runtime.h"
 #include "py/objtuple.h"
 #include "py/binary.h"
@@ -94,6 +95,17 @@ static MP_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) {
+    // Because mpy-cross turns an expression like `uctypes.INT8` into a single
+    // constant integer load, the uctypes constant values must be consistent, no
+    // matter the OBJ_REPR and mp_int_t type.
+    //
+    // However, these constants are 31 bits (counting the sign bit) while
+    // OBJ_REPR_B with 32-bit mp_int_t provides only 30 bits of small integer, so
+    // this combination is unsupported.
+    //
+    // For more information, see https://github.com/micropython/micropython/issues/18105
+    MP_STATIC_ASSERT(MP_SMALL_INT_BITS >= 31);
+
     mp_arg_check_num(n_args, n_kw, 2, 3, false);
     mp_obj_uctypes_struct_t *o = mp_obj_malloc(mp_obj_uctypes_struct_t, type);
     o->addr = (void *)(uintptr_t)mp_obj_get_int_truncated(args[0]);

From f6dcf35d5c685ff0594025b992679bebb8949a2e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 15 Jul 2025 18:28:35 +0100
Subject: [PATCH 2873/3129] tests/basics/int_big_to_small.py: Bifurcate test
 using small-int-max.

Different results are needed for different integer sizes.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tests/basics/int_big_to_small.py           | 11 ++++++++++
 tests/basics/int_big_to_small_int29.py     | 22 +++++++++++++++++++
 tests/basics/int_big_to_small_int29.py.exp | 25 ++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 tests/basics/int_big_to_small_int29.py
 create mode 100644 tests/basics/int_big_to_small_int29.py.exp

diff --git a/tests/basics/int_big_to_small.py b/tests/basics/int_big_to_small.py
index 64280d0c635f5..c92d263fc2837 100644
--- a/tests/basics/int_big_to_small.py
+++ b/tests/basics/int_big_to_small.py
@@ -5,6 +5,17 @@
     print("SKIP")
     raise SystemExit
 
+# Skip this test on "REPR B" where (1<<29 + 1) is not a small int.
+k = 1 << 29
+micropython.heap_lock()
+try:
+    k = k + 1
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+finally:
+    micropython.heap_unlock()
+
 # All less than small int max.
 for d in (0, 27, 1<<29, -1861, -(1<<29)):
     i = 1<<70
diff --git a/tests/basics/int_big_to_small_int29.py b/tests/basics/int_big_to_small_int29.py
new file mode 100644
index 0000000000000..438a74d2bc6a4
--- /dev/null
+++ b/tests/basics/int_big_to_small_int29.py
@@ -0,0 +1,22 @@
+try:
+    import micropython
+    micropython.heap_lock
+except:
+    print("SKIP")
+    raise SystemExit
+
+# All less than small int max.
+for d in (0, 27, 1<<28, -1861, -(1<<28)):
+    i = 1<<70
+    print(i)
+    j = (1<<70) + d
+    print(j)
+    # k should now be a small int.
+    k = j - i
+    print(k)
+
+    # Now verify that working with k doesn't allocate (i.e. it's a small int).
+    micropython.heap_lock()
+    print(k + 20)
+    print(k // 20)
+    micropython.heap_unlock()
diff --git a/tests/basics/int_big_to_small_int29.py.exp b/tests/basics/int_big_to_small_int29.py.exp
new file mode 100644
index 0000000000000..0920101924aa8
--- /dev/null
+++ b/tests/basics/int_big_to_small_int29.py.exp
@@ -0,0 +1,25 @@
+1180591620717411303424
+1180591620717411303424
+0
+20
+0
+1180591620717411303424
+1180591620717411303451
+27
+47
+1
+1180591620717411303424
+1180591620717679738880
+268435456
+268435476
+13421772
+1180591620717411303424
+1180591620717411301563
+-1861
+-1841
+-94
+1180591620717411303424
+1180591620717142867968
+-268435456
+-268435436
+-13421773

From fca5bbf664220599c7ed82f276f10996249fe8e5 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 15 Jul 2025 18:28:55 +0100
Subject: [PATCH 2874/3129] tests: Use OBJ_REPR_B compatible mpy file headers.

So these tests can run and pass using OBJ_REPR_B.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tests/extmod/vfs_rom.py                    | 2 +-
 tests/micropython/import_mpy_native.py     | 5 +++--
 tests/perf_bench/core_import_mpy_multi.py  | 4 ++--
 tests/perf_bench/core_import_mpy_single.py | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py
index cd14542ea6b09..18ae1f5cf96c8 100644
--- a/tests/extmod/vfs_rom.py
+++ b/tests/extmod/vfs_rom.py
@@ -25,7 +25,7 @@
 # An mpy file with four constant objects: str, bytes, long-int, float.
 test_mpy = (
     # header
-    b"M\x06\x00\x1f"  # mpy file header
+    b"M\x06\x00\x1e"  # mpy file header, -msmall-int-bits=30
     b"\x06"  # n_qstr
     b"\x05"  # n_obj
     # qstrs
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index ac5e724e8d468..7a9bb8eddb9a6 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -53,11 +53,12 @@ def open(self, path, mode):
 
 
 # these are the test .mpy files
-valid_header = bytes([77, 6, mpy_arch, 31])
+small_int_bits = 30
+valid_header = bytes([77, 6, mpy_arch, small_int_bits])
 # fmt: off
 user_files = {
     # bad architecture (mpy_arch needed for sub-version)
-    '/mod0.mpy': bytes([77, 6, 0xfc | mpy_arch, 31]),
+    '/mod0.mpy': bytes([77, 6, 0xfc | mpy_arch, small_int_bits]),
 
     # test loading of viper and asm
     '/mod1.mpy': valid_header + (
diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index 8affa157fa0c5..67deec0508801 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-# This is the test.py file that is compiled to test.mpy below.
+# This is the test.py file that is compiled to test.mpy below. mpy-cross must be invoked with `-msmall-int-bits=30`.
 """
 class A:
     def __init__(self, arg):
@@ -23,7 +23,7 @@ def f():
     x = ("const tuple", None, False, True, 1, 2, 3)
 result = 123
 """
-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'
+file_data = b'M\x06\x00\x1e\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(io.IOBase):
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index 4d9aa67bf2f0e..f472bb6476278 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -8,7 +8,7 @@
     print("SKIP")
     raise SystemExit
 
-# This is the test.py file that is compiled to test.mpy below.
+# This is the test.py file that is compiled to test.mpy below. mpy-cross must be invoked with `-msmall-int-bits=30`.
 # Many known and unknown names/strings are included to test the linking process.
 """
 class A0:
@@ -78,7 +78,7 @@ def f1():
     x = ("const tuple 9", None, False, True, 1, 2, 3)
 result = 123
 """
-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"
+file_data = b"M\x06\x00\x1e\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(io.IOBase):

From e35ac67421f71c430ce7a0b26532b048aa4528cd Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 15 Jul 2025 18:43:04 +0100
Subject: [PATCH 2875/3129] tests/stress/fun_call_limit.py: Allow to run with
 OBJ_REPR_B.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tests/stress/fun_call_limit.py     | 10 +++++++---
 tests/stress/fun_call_limit.py.exp |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/stress/fun_call_limit.py b/tests/stress/fun_call_limit.py
index b802aadd558c0..69f8aa5aec413 100644
--- a/tests/stress/fun_call_limit.py
+++ b/tests/stress/fun_call_limit.py
@@ -16,14 +16,16 @@ def test(n):
 
 
 # If the port has at least 32-bits then this test should pass.
-print(test(29))
+print(test(28))
 
 # 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.
+# 28 is the biggest number that will pass on a 32-bit port using object
+# representation B, which has 1<<28 still fitting in a positive small int.
 reached_limit = False
-for i in range(30, 70):
+any_test_succeeded = False
+for i in range(28, 70):
     result = test(i)
     if reached_limit:
         if result != "SyntaxError":
@@ -34,3 +36,5 @@ def test(n):
         else:
             if result != i + 4:
                 print("FAIL")
+            any_test_succeeded = True
+assert any_test_succeeded  # At least one iteration must have passed
diff --git a/tests/stress/fun_call_limit.py.exp b/tests/stress/fun_call_limit.py.exp
index 53d2b28043015..491abbfa8be72 100644
--- a/tests/stress/fun_call_limit.py.exp
+++ b/tests/stress/fun_call_limit.py.exp
@@ -1,2 +1,2 @@
-33
+32
 SyntaxError

From f658b0d862cb4eafe8df5bd22cb1302d83da4938 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 15 Jul 2025 18:49:51 +0100
Subject: [PATCH 2876/3129] py/objint: Fix converting float to int with
 OBJ_REPR_B.

The check for 'fits in a small int' is specific to the 31-bit int of other
object representations.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/objint.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/objint.c b/py/objint.c
index fd9ab106f92df..901264aca6564 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -117,9 +117,15 @@ static mp_fp_as_int_class_t mp_classify_fp_as_int(mp_float_t val) {
     }
     // 8 * sizeof(uintptr_t) counts the number of bits for a small int
     // TODO provide a way to configure this properly
+    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B
+    if (e <= ((8 * sizeof(uintptr_t) + MP_FLOAT_EXP_BIAS - 4) << MP_FLOAT_EXP_SHIFT_I32)) {
+        return MP_FP_CLASS_FIT_SMALLINT;
+    }
+    #else
     if (e <= ((8 * sizeof(uintptr_t) + MP_FLOAT_EXP_BIAS - 3) << MP_FLOAT_EXP_SHIFT_I32)) {
         return MP_FP_CLASS_FIT_SMALLINT;
     }
+    #endif
     #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
     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;

From e3ef68215605938c906196ae37120950d0eb6105 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 15 Jul 2025 18:51:25 +0100
Subject: [PATCH 2877/3129] github/workflows: Add 32-bit OBJ_REPR_B CI job.

This showed up some interesting errors (hopefully all fixed now).

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 .github/workflows/ports_unix.yml | 14 ++++++++++++++
 tools/ci.sh                      | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 77d0b29ca96fb..eeae895f6a215 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -217,6 +217,20 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
+  repr_b:
+    runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
+    steps:
+    - uses: actions/checkout@v5
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_32bit_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_repr_b_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_repr_b_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
   macos:
     runs-on: macos-latest
     steps:
diff --git a/tools/ci.sh b/tools/ci.sh
index 6ecf8cc67cce7..f55b004c45c15 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -556,6 +556,14 @@ CI_UNIX_OPTS_SANITIZE_UNDEFINED=(
     LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
 )
 
+CI_UNIX_OPTS_REPR_B=(
+    VARIANT=standard
+    CFLAGS_EXTRA="-DMICROPY_OBJ_REPR=MICROPY_OBJ_REPR_B -DMICROPY_PY_UCTYPES=0 -Dmp_int_t=int32_t -Dmp_uint_t=uint32_t"
+    MICROPY_FORCE_32BIT=1
+    RUN_TESTS_MPY_CROSS_FLAGS="--mpy-cross-flags=\"-march=x86 -msmall-int-bits=30\""
+
+)
+
 function ci_unix_build_helper {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix "$@" submodules
@@ -898,6 +906,17 @@ function ci_unix_qemu_riscv64_run_tests {
     (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython MICROPY_TEST_TIMEOUT=180 ./run-tests.py --exclude 'thread/stress_recurse.py|thread/thread_gc1.py')
 }
 
+function ci_unix_repr_b_build {
+    ci_unix_build_helper "${CI_UNIX_OPTS_REPR_B[@]}"
+    ci_unix_build_ffi_lib_helper gcc -m32
+}
+
+function ci_unix_repr_b_run_tests {
+    # ci_unix_run_tests_full_no_native_helper is not used due to
+    # https://github.com/micropython/micropython/issues/18105
+    ci_unix_run_tests_helper "${CI_UNIX_OPTS_REPR_B[@]}"
+}
+
 ########################################################################################
 # ports/windows
 

From beb4c3188f5c26ede14134db1d34f817793b7e46 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Sep 2025 23:55:36 +1000
Subject: [PATCH 2878/3129] py/runtime: Support importing a method from an
 instance.

This change follows CPython behaviour, allowing use of:

    from instance import method

to import a bound method from a class instance, eg registered via
setting `sys.modules["instance"] = instance`.

Admittedly this is probably a very rarely used pattern in Python, but it
resolves a long standing comment about whether or not this is actually
possible (it turns out it is possible!).  A test is added to show how it
works.

The main reason for this change is to fix a problem with imports in the
webassembly port: prior to this fix, it was not possible to do `from
js_module import function`, where `js_module` is a JavaScript object
registered to be visible to Python through the webassembly API function
`registerJsModule(js_module)`.  But now with this fix that is possible.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c                           | 14 +++++-----
 tests/basics/import_instance_method.py | 38 ++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 tests/basics/import_instance_method.py

diff --git a/py/runtime.c b/py/runtime.c
index 0ab0626ef9407..61aeb83f8d418 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1562,14 +1562,11 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name) {
     mp_obj_t dest[2];
 
     mp_load_method_maybe(module, name, dest);
-
     if (dest[1] != MP_OBJ_NULL) {
-        // Hopefully we can't import bound method from an object
-    import_error:
-        mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("can't import name %q"), name);
-    }
-
-    if (dest[0] != MP_OBJ_NULL) {
+        // Importing a bound method from a class instance.
+        return mp_obj_new_bound_meth(dest[0], dest[1]);
+    } else if (dest[0] != MP_OBJ_NULL) {
+        // Importing a function or attribute.
         return dest[0];
     }
 
@@ -1602,6 +1599,9 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name) {
     goto import_error;
 
     #endif
+
+import_error:
+    mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("can't import name %q"), name);
 }
 
 void mp_import_all(mp_obj_t module) {
diff --git a/tests/basics/import_instance_method.py b/tests/basics/import_instance_method.py
new file mode 100644
index 0000000000000..d25b70ac5f0bf
--- /dev/null
+++ b/tests/basics/import_instance_method.py
@@ -0,0 +1,38 @@
+# Test importing a method from a class instance.
+# This is not a common thing to do, but ensures MicroPython has the same semantics as CPython.
+
+import sys
+
+if not hasattr(sys, "modules"):
+    print("SKIP")
+    raise SystemExit
+
+
+class A:
+    def __init__(self, value):
+        self.value = value
+
+    def meth(self):
+        return self.value
+
+    def meth_with_arg(self, a):
+        return [self.value, a]
+
+
+# Register a class instance as the module "mod".
+sys.modules["mod"] = A(1)
+
+# Try importing it as a module.
+import mod
+
+print(mod.meth())
+print(mod.meth_with_arg(2))
+
+# Change the module.
+sys.modules["mod"] = A(3)
+
+# Try importing it using "from ... import".
+from mod import meth, meth_with_arg
+
+print(meth())
+print(meth_with_arg(4))

From 68ca22bbc882cda735d10f921769beff8aa60d77 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Sep 2025 00:02:54 +1000
Subject: [PATCH 2879/3129] tests/ports/webassembly: Expand test for
 registerJsModule.

This tests `from mod import foo` where `mod` is a module registered using
the webassembly API `registerJsModule(mod)`, and where `foo` is a
JavaScript function.  Prior to the parent commit, this would fail.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/webassembly/register_js_module.js | 39 +++++++++++++++++++
 .../webassembly/register_js_module.js.exp     | 10 +++++
 2 files changed, 49 insertions(+)

diff --git a/tests/ports/webassembly/register_js_module.js b/tests/ports/webassembly/register_js_module.js
index b512f2c0dd465..f58d12e50d31a 100644
--- a/tests/ports/webassembly/register_js_module.js
+++ b/tests/ports/webassembly/register_js_module.js
@@ -1,6 +1,45 @@
+// Test the registerJsModule() public API method.
+
 import(process.argv[2]).then((mp) => {
     mp.loadMicroPython().then((py) => {
+        // Simple module.
         py.registerJsModule("js_module", { y: 2 });
         py.runPython("import js_module; print(js_module); print(js_module.y)");
+
+        // Module with functions.
+        // In particular test how "this" behaves.
+        py.registerJsModule("js_module2", {
+            yes: true,
+            add1(x) {
+                return x + 1;
+            },
+            getThis() {
+                return this;
+            },
+        });
+
+        console.log("====");
+
+        // Test using simple import.
+        py.runPython(`
+import js_module2
+
+print(js_module2.yes)
+print(js_module2.add1(1))
+print(js_module2.getThis())
+print(js_module2.getThis().yes)
+`);
+
+        console.log("====");
+
+        // Test using "from ... import".
+        py.runPython(`
+from js_module2 import yes, add1, getThis
+
+print(yes)
+print(add1(2))
+print(getThis())
+print(getThis().yes)
+`);
     });
 });
diff --git a/tests/ports/webassembly/register_js_module.js.exp b/tests/ports/webassembly/register_js_module.js.exp
index 6e2bad3ce56fb..34bfd345d17c7 100644
--- a/tests/ports/webassembly/register_js_module.js.exp
+++ b/tests/ports/webassembly/register_js_module.js.exp
@@ -1,2 +1,12 @@
 <JsProxy 2>
 2
+====
+True
+2
+<JsProxy 3>
+True
+====
+True
+3
+<JsProxy 3>
+True

From 094000d418e9f7393b3d34814c3e43e6386145a7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 28 Sep 2025 22:16:36 +1000
Subject: [PATCH 2880/3129] webassembly/objjsproxy: Fix logic that determines
 if asyncio is active.

`cur_task` can never be `None` in the webassembly port, so test it for the
top-level task to see if an asyncio Task is active or not.

This fixes a bug where await'ing on a JavaScript awaitable that ends up
raising an error would not be caught on the Python side.  The fix here
makes sure it is caught by Python, as tested by the new test.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/asyncio/core.py             |  3 +-
 ports/webassembly/objjsproxy.c                |  3 +-
 .../webassembly/asyncio_top_level_await.mjs   | 32 +++++++++++++++++++
 .../asyncio_top_level_await.mjs.exp           |  6 ++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/ports/webassembly/asyncio/core.py b/ports/webassembly/asyncio/core.py
index 47846fc25a331..1d0124a6a211d 100644
--- a/ports/webassembly/asyncio/core.py
+++ b/ports/webassembly/asyncio/core.py
@@ -243,8 +243,7 @@ def get_event_loop():
 
 
 def current_task():
-    if cur_task is None:
-        raise RuntimeError("no running event loop")
+    assert cur_task is not None
     return cur_task
 
 
diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 2d46702ff8eec..93c40d8356b64 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -566,7 +566,8 @@ static mp_obj_t jsproxy_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
         // decouples the task from the thenable and allows cancelling the task.
         if (mp_asyncio_context != MP_OBJ_NULL) {
             mp_obj_t cur_task = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
-            if (cur_task != mp_const_none) {
+            mp_obj_t top_level_task = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__top_level_task));
+            if (cur_task != top_level_task) {
                 mp_obj_t thenable_event_class = mp_obj_dict_get(mp_asyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_ThenableEvent));
                 mp_obj_t thenable_event = mp_call_function_1(thenable_event_class, self_in);
                 mp_obj_t dest[2];
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs b/tests/ports/webassembly/asyncio_top_level_await.mjs
index 234b7a6ce6fb9..449985b493cdd 100644
--- a/tests/ports/webassembly/asyncio_top_level_await.mjs
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs
@@ -88,3 +88,35 @@ print("top-level end")
 `);
 
 console.log("finished");
+
+/**********************************************************/
+// Top-level await's on a JavaScript function that throws.
+
+console.log("= TEST 4 ==========");
+
+globalThis.jsFail = async () => {
+    console.log("jsFail");
+    throw new Error("jsFail");
+};
+
+await mp.runPythonAsync(`
+import asyncio
+import js
+
+# Test top-level catching from a failed JS await.
+try:
+    await js.jsFail()
+except Exception as er:
+    print("caught exception:", type(er), type(er.args[0]), er.args[1:])
+
+async def main():
+    try:
+        await js.jsFail()
+    except Exception as er:
+        print("caught exception:", type(er), type(er.args[0]), er.args[1:])
+
+# Test top-level waiting on a coro that catches.
+await main()
+`);
+
+console.log("finished");
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs.exp b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
index 66fefd2dcef86..90c817f3df753 100644
--- a/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
@@ -17,3 +17,9 @@ top-level wait task
 task end
 top-level end
 finished
+= TEST 4 ==========
+jsFail
+caught exception: <class 'JsException'> <class 'JsProxy'> ('Error', 'jsFail')
+jsFail
+caught exception: <class 'JsException'> <class 'JsProxy'> ('Error', 'jsFail')
+finished

From a563592b111686dde9b46785bb783d45ec0ba78e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 28 Sep 2025 22:28:27 +1000
Subject: [PATCH 2881/3129] webassembly/asyncio: Fix ThenableEvent to handle
 rejected thenables.

Prior to this fix, if a JavaScript thenable/Promise that was part of an
asyncio chain was rejected it would be ignored because the Python-side
`ThenableEvent` did not register a handler for the rejection.

That's fixed by this commit, and a corresponding test added.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/asyncio/core.py                | 16 +++++++++++++---
 .../webassembly/asyncio_top_level_await.mjs      |  4 ++++
 .../webassembly/asyncio_top_level_await.mjs.exp  |  2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ports/webassembly/asyncio/core.py b/ports/webassembly/asyncio/core.py
index 1d0124a6a211d..9d07bd7b858bc 100644
--- a/ports/webassembly/asyncio/core.py
+++ b/ports/webassembly/asyncio/core.py
@@ -79,9 +79,8 @@ def send(value):
 
 class ThenableEvent:
     def __init__(self, thenable):
-        self.result = None  # Result of the thenable
         self.waiting = None  # Task waiting on completion of this thenable
-        thenable.then(self.set)
+        thenable.then(self.set, self.cancel)
 
     def set(self, value=None):
         # Thenable/Promise is fulfilled, set result and schedule any waiting task.
@@ -90,6 +89,15 @@ def set(self, value=None):
             _task_queue.push(self.waiting)
             self.waiting = None
 
+    def cancel(self, value=None):
+        # Thenable/Promise is rejected, set error and schedule any waiting task.
+        self.error = jsffi.JsException(
+            value, getattr(value, "name", None), getattr(value, "message", None)
+        )
+        if self.waiting:
+            _task_queue.push(self.waiting)
+            self.waiting = None
+
     def remove(self, task):
         self.waiting = None
 
@@ -101,7 +109,9 @@ def wait(self):
         cur_task.data = self
         # Wait for the thenable to fulfill.
         yield
-        # Return the result of the thenable.
+        # Raise the error, or return the result, of the thenable.
+        if hasattr(self, "error"):
+            raise self.error
         return self.result
 
 
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs b/tests/ports/webassembly/asyncio_top_level_await.mjs
index 449985b493cdd..fedf10d9c5d7c 100644
--- a/tests/ports/webassembly/asyncio_top_level_await.mjs
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs
@@ -117,6 +117,10 @@ async def main():
 
 # Test top-level waiting on a coro that catches.
 await main()
+
+# Test top-level waiting on a task that catches.
+t = asyncio.create_task(main())
+await t
 `);
 
 console.log("finished");
diff --git a/tests/ports/webassembly/asyncio_top_level_await.mjs.exp b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
index 90c817f3df753..f6720b5aba7a9 100644
--- a/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
+++ b/tests/ports/webassembly/asyncio_top_level_await.mjs.exp
@@ -22,4 +22,6 @@ jsFail
 caught exception: <class 'JsException'> <class 'JsProxy'> ('Error', 'jsFail')
 jsFail
 caught exception: <class 'JsException'> <class 'JsProxy'> ('Error', 'jsFail')
+jsFail
+caught exception: <class 'JsException'> <class 'JsProxy'> ('Error', 'jsFail')
 finished

From 3dd8073c290c077f17ffdee17a019763ad82604d Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 29 Aug 2025 08:06:27 +1000
Subject: [PATCH 2882/3129] tools/mpremote: Workaround ESP DTR/RTS reset quirk
 at disconnect time.

The problem with ESP board spurious reset happens at disconnect time on
Windows (clearing DTR before RTS triggers a reset).

Previous workarounds tried to detect possible ESP boards and apply the
correct DTR and RTS settings when opening the port.

Instead, we can manually clear RTS before closing the port and thereby
avoid the reset issue. Opening the port can keep the default behaviour
(RTS & DTR both set).

close() is called from a finally block in the mpremote main module
(via do_disconnect()) - so this should always happen provided the Python
process isn't terminated by the OS.

One additional workaround is needed to prevent a spurious reset first time
a Silicon Labs CP210x-based ESP board is opened by mpremote after
enumeration.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/mpremote/mpremote/transport_serial.py | 60 +++++++++------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index a26183680cae8..eccdd4c1ea44b 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -42,31 +42,8 @@
 from .console import VT_ENABLED
 from .transport import TransportError, TransportExecError, Transport
 
-VID_ESPRESSIF = 0x303A  # Espressif Incorporated
-PID_ESPRESSIF_SERIAL_JTAG = 0x1001  # Serial/JTAG peripheral of ESP32-S3,C3,C6
 
-
-def has_espressif_dtr_quirk(devicename):
-    """ESP8266 and ESP32 dev boards use the DTR and RTS lines to trigger reset &
-    reset into bootloader mode. This can causes spurious reset issues on Windows.
-
-    Apply the quirk to any USB/Serial chip on Windows that isn't using the
-    Microsoft CDC-ACM driver, or to the integrated Espressif Serial/JTAG device.
-
-    Don't apply it to Espressif boards running TinyUSB, as TinyUSB uses DTR
-    to determine if the CDC port is open (and there's no spurious reset issue).
-    """
-    portinfo = list(serial.tools.list_ports.grep(devicename))  # type: ignore
-    if not portinfo:
-        return False
-
-    def port_attr(name):
-        return getattr(portinfo[0], name, None)
-
-    return (port_attr("vid"), port_attr("pid")) == (
-        VID_ESPRESSIF,
-        PID_ESPRESSIF_SERIAL_JTAG,
-    ) or port_attr("manufacturer") != "Microsoft"
+VID_SILICON_LABS = 0x10C4
 
 
 class SerialTransport(Transport):
@@ -90,19 +67,27 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None
         delayed = False
         for attempt in range(wait + 1):
             try:
-                if device.startswith("rfc2217://"):
-                    self.serial = serial.serial_for_url(device, **serial_kwargs)
-                elif os.name == "nt":
-                    self.serial = serial.Serial(**serial_kwargs)
-                    self.serial.port = device
-                    if has_espressif_dtr_quirk(device):
-                        # DTR False: to avoid using the reset button will hang the MCU in bootloader mode
-                        # RTS False: to prevent pulses on rts on serial.close() that would POWERON_RESET an ESPxx
-                        self.serial.dtr = False  # DTR False = gpio0 High = Normal boot
-                        self.serial.rts = False  # RTS False = EN High = MCU enabled
+                self.serial = serial.serial_for_url(device, do_not_open=True, **serial_kwargs)
+                if os.name == "nt":
+                    portinfo = list(serial.tools.list_ports.grep(device))  # type: ignore
+                    if portinfo and getattr(portinfo[0], "vid", None) == VID_SILICON_LABS:
+                        # Silicon Labs CP210x driver on Windows has a quirk
+                        # where after a power on reset it will set DTR and RTS
+                        # at different times when the port is opened (it doesn't
+                        # happen on subsequent openings).
+                        #
+                        # To avoid issues with spurious reset on Espressif boards we clear DTR and RTS,
+                        # open the port, and then set them in an order which prevents triggering a reset.
+                        self.serial.dtr = False
+                        self.serial.rts = False
+                        self.serial.open()
+                        self.serial.dtr = True
+                        self.serial.rts = True
+
+                # On all other host/driver combinations we keep the default
+                # behaviour (pyserial will set DTR and RTS automatically on open)
+                if not self.serial.isOpen():
                     self.serial.open()
-                else:
-                    self.serial = serial.Serial(device, **serial_kwargs)
                 break
             except OSError:
                 if wait == 0:
@@ -121,6 +106,9 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None
             print("")
 
     def close(self):
+        # ESP Windows quirk: Prevent target from resetting when Windows clears DTR before RTS
+        self.serial.rts = False
+        self.serial.dtr = False
         self.serial.close()
 
     def read_until(

From a80913292153a14424b29bdb9ca8847e8d35cf73 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 23 Jul 2025 16:14:22 -0500
Subject: [PATCH 2883/3129] py: Add MICROPY_USE_GCC_MUL_OVERFLOW_INTRINSIC.

Most MCUs apart from Cortex-M0 with Thumb 1 have an instruction
for computing the "high part" of a multiplication (e.g., the upper
32 bits of a 32x32 multiply).

When they do, gcc uses this to implement a small and fast
overflow check using the __builtin_mul_overflow intrinsic, which
is preferable to the guard division method previously used in smallint.c.

However, in contrast to the previous mp_small_int_mul_overflow
routine, which checks that the result fits not only within mp_int_t
but is SMALL_INT_FITS(), __builtin_mul_overflow only checks for
overflow of the C type. As a result, a slight change in the code
flow is needed for MP_BINARY_OP_MULTIPLY.

Other sites using mp_small_int_mul_overflow already had the
result value flow through to a SMALL_INT_FITS check so they didn't
need any additional changes.

Do similarly for the _ll and _ull multiply overflows checks.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/misc.h          | 49 ++++++++++++++-----------------------
 py/mpconfig.h      | 19 +++++++++++++++
 py/parsenum.c      |  3 ++-
 py/runtime.c       | 27 +++++----------------
 py/runtime_utils.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++
 py/smallint.c      | 29 ----------------------
 py/smallint.h      |  4 ----
 7 files changed, 105 insertions(+), 86 deletions(-)

diff --git a/py/misc.h b/py/misc.h
index 081163cadf9fd..ac5e8fb0edf3b 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -35,7 +35,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+#if __cplusplus // Required on at least one compiler to get ULLONG_MAX
+#include <climits>
+#else
 #include <limits.h>
+#endif
 
 typedef unsigned char byte;
 typedef unsigned int uint;
@@ -454,7 +458,7 @@ static inline uint32_t mp_clz_mpi(mp_int_t x) {
     #endif
 }
 
-// Overflow-checked operations for long long
+// Overflow-checked operations
 
 // Integer overflow builtins were added to GCC 5, but __has_builtin only in GCC 10
 //
@@ -462,45 +466,28 @@ static inline uint32_t mp_clz_mpi(mp_int_t x) {
 // functions below don't update the result if an overflow would occur (to avoid UB).
 #define MP_GCC_HAS_BUILTIN_OVERFLOW (__GNUC__ >= 5)
 
-#if __has_builtin(__builtin_umulll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
+#if MICROPY_USE_GCC_MUL_OVERFLOW_INTRINSIC
+
 #define mp_mul_ull_overflow __builtin_umulll_overflow
+#define mp_mul_ll_overflow __builtin_smulll_overflow
+static inline bool mp_mul_mp_int_t_overflow(mp_int_t x, mp_int_t y, mp_int_t *res) {
+    // __builtin_mul_overflow is a type-generic function, this inline ensures the argument
+    // types are checked to match mp_int_t.
+    return __builtin_mul_overflow(x, y, res);
+}
+
 #else
-inline static bool mp_mul_ull_overflow(unsigned long long int x, unsigned long long int y, unsigned long long int *res) {
+
+bool mp_mul_ll_overflow(long long int x, long long int y, long long int *res);
+bool mp_mul_mp_int_t_overflow(mp_int_t x, mp_int_t y, mp_int_t *res);
+static inline bool mp_mul_ull_overflow(unsigned long long int x, unsigned long long int y, unsigned long long int *res) {
     if (y > 0 && x > (ULLONG_MAX / y)) {
         return true; // overflow
     }
     *res = x * y;
     return false;
 }
-#endif
-
-#if __has_builtin(__builtin_smulll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
-#define mp_mul_ll_overflow __builtin_smulll_overflow
-#else
-inline static bool mp_mul_ll_overflow(long long int x, long long int y, long long int *res) {
-    bool overflow;
 
-    // Check for multiply overflow; see CERT INT32-C
-    if (x > 0) { // x is positive
-        if (y > 0) { // x and y are positive
-            overflow = (x > (LLONG_MAX / y));
-        } else { // x positive, y nonpositive
-            overflow = (y < (LLONG_MIN / x));
-        } // x positive, y nonpositive
-    } else { // x is nonpositive
-        if (y > 0) { // x is nonpositive, y is positive
-            overflow = (x < (LLONG_MIN / y));
-        } else { // x and y are nonpositive
-            overflow = (x != 0 && y < (LLONG_MAX / x));
-        } // End if x and y are nonpositive
-    } // End if x is nonpositive
-
-    if (!overflow) {
-        *res = x * y;
-    }
-
-    return overflow;
-}
 #endif
 
 #if __has_builtin(__builtin_saddll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
diff --git a/py/mpconfig.h b/py/mpconfig.h
index f4b7c10583668..45178034ac91e 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -2336,4 +2336,23 @@ typedef time_t mp_timestamp_t;
 #define MP_WARN_CAT(x) (NULL)
 #endif
 
+// If true, use __builtin_mul_overflow (a gcc intrinsic supported by clang) for
+// overflow checking when multiplying two small ints. Otherwise, use a portable
+// algorithm.
+//
+// Most MCUs have a 32x32->64 bit multiply instruction, in which case the
+// intrinsic is likely to be faster and generate smaller code. The main exception is
+// cortex-m0 with __ARM_ARCH_ISA_THUMB == 1.
+//
+// The intrinsic is in GCC starting with version 5.
+#ifndef MICROPY_USE_GCC_MUL_OVERFLOW_INTRINSIC
+#if defined(__ARM_ARCH_ISA_THUMB) && (__GNUC__ >= 5)
+#define MICROPY_USE_GCC_MUL_OVERFLOW_INTRINSIC (__ARM_ARCH_ISA_THUMB >= 2)
+#elif (__GNUC__ >= 5)
+#define MICROPY_USE_GCC_MUL_OVERFLOW_INTRINSIC (1)
+#else
+#define MICROPY_USE_GCC_MUL_OVERFLOW_INTRINSIC (0)
+#endif
+#endif
+
 #endif // MICROPY_INCLUDED_PY_MPCONFIG_H
diff --git a/py/parsenum.c b/py/parsenum.c
index 4239f2dcd4d0f..05bcc0f0a7028 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 
 #include "py/runtime.h"
+#include "py/misc.h"
 #include "py/parsenumbase.h"
 #include "py/parsenum.h"
 #include "py/smallint.h"
@@ -52,7 +53,7 @@ static MP_NORETURN void raise_exc(mp_obj_t exc, mp_lexer_t *lex) {
 // to bigint parsing if supported)
 typedef mp_int_t parsed_int_t;
 
-#define PARSED_INT_MUL_OVERFLOW mp_small_int_mul_overflow
+#define PARSED_INT_MUL_OVERFLOW mp_mul_mp_int_t_overflow
 #define PARSED_INT_FITS MP_SMALL_INT_FITS
 #else
 // In the special case where bigint support is long long, we save code size by
diff --git a/py/runtime.c b/py/runtime.c
index 61aeb83f8d418..58d5732be14ce 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -430,7 +430,7 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
             // Operations that can overflow:
             //      +       result always fits in mp_int_t, then handled by SMALL_INT check
             //      -       result always fits in mp_int_t, then handled by SMALL_INT check
-            //      *       checked explicitly
+            //      *       checked explicitly for fit in mp_int_t, then handled by SMALL_INT check
             //      /       if lhs=MIN and rhs=-1; result always fits in mp_int_t, then handled by SMALL_INT check
             //      %       if lhs=MIN and rhs=-1; result always fits in mp_int_t, then handled by SMALL_INT check
             //      <<      checked explicitly
@@ -489,31 +489,16 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
                     break;
                 case MP_BINARY_OP_MULTIPLY:
                 case MP_BINARY_OP_INPLACE_MULTIPLY: {
-
-                    // If long long type exists and is larger than mp_int_t, then
-                    // we can use the following code to perform overflow-checked multiplication.
-                    // Otherwise (eg in x64 case) we must use mp_small_int_mul_overflow.
-                    #if 0
-                    // compute result using long long precision
-                    long long res = (long long)lhs_val * (long long)rhs_val;
-                    if (res > MP_SMALL_INT_MAX || res < MP_SMALL_INT_MIN) {
-                        // result overflowed SMALL_INT, so return higher precision integer
-                        return mp_obj_new_int_from_ll(res);
-                    } else {
-                        // use standard precision
-                        lhs_val = (mp_int_t)res;
-                    }
-                    #endif
-
                     mp_int_t int_res;
-                    if (mp_small_int_mul_overflow(lhs_val, rhs_val, &int_res)) {
+                    if (mp_mul_mp_int_t_overflow(lhs_val, rhs_val, &int_res)) {
                         // use higher precision
                         lhs = mp_obj_new_int_from_ll(lhs_val);
                         goto generic_binary_op;
                     } else {
                         // use standard precision
-                        return MP_OBJ_NEW_SMALL_INT(int_res);
+                        lhs_val = int_res;
                     }
+                    break;
                 }
                 case MP_BINARY_OP_FLOOR_DIVIDE:
                 case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE:
@@ -553,7 +538,7 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
                         mp_int_t ans = 1;
                         while (rhs_val > 0) {
                             if (rhs_val & 1) {
-                                if (mp_small_int_mul_overflow(ans, lhs_val, &ans)) {
+                                if (mp_mul_mp_int_t_overflow(ans, lhs_val, &ans)) {
                                     goto power_overflow;
                                 }
                             }
@@ -562,7 +547,7 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
                             }
                             rhs_val /= 2;
                             mp_int_t int_res;
-                            if (mp_small_int_mul_overflow(lhs_val, lhs_val, &int_res)) {
+                            if (mp_mul_mp_int_t_overflow(lhs_val, lhs_val, &int_res)) {
                                 goto power_overflow;
                             }
                             lhs_val = int_res;
diff --git a/py/runtime_utils.c b/py/runtime_utils.c
index b92c6bd767cd8..50526b210fa5b 100644
--- a/py/runtime_utils.c
+++ b/py/runtime_utils.c
@@ -50,3 +50,63 @@ mp_obj_t mp_call_function_2_protected(mp_obj_t fun, mp_obj_t arg1, mp_obj_t arg2
         return MP_OBJ_NULL;
     }
 }
+
+#if !MICROPY_USE_GCC_MUL_OVERFLOW_INTRINSIC
+bool mp_mul_ll_overflow(long long int x, long long int y, long long int *res) {
+    bool overflow;
+
+    // Check for multiply overflow; see CERT INT32-C
+    if (x > 0) { // x is positive
+        if (y > 0) { // x and y are positive
+            overflow = (x > (LLONG_MAX / y));
+        } else { // x positive, y nonpositive
+            overflow = (y < (LLONG_MIN / x));
+        } // x positive, y nonpositive
+    } else { // x is nonpositive
+        if (y > 0) { // x is nonpositive, y is positive
+            overflow = (x < (LLONG_MIN / y));
+        } else { // x and y are nonpositive
+            overflow = (x != 0 && y < (LLONG_MAX / x));
+        } // End if x and y are nonpositive
+    } // End if x is nonpositive
+
+    if (!overflow) {
+        *res = x * y;
+    }
+
+    return overflow;
+}
+
+#define MP_UINT_MAX (~(mp_uint_t)0)
+#define MP_INT_MAX ((mp_int_t)(MP_UINT_MAX >> 1))
+#define MP_INT_MIN (-MP_INT_MAX - 1)
+
+bool mp_mul_mp_int_t_overflow(mp_int_t x, mp_int_t y, mp_int_t *res) {
+    // Check for multiply overflow; see CERT INT32-C
+    if (x > 0) { // x is positive
+        if (y > 0) { // x and y are positive
+            if (x > (MP_INT_MAX / y)) {
+                return true;
+            }
+        } else { // x positive, y nonpositive
+            if (y < (MP_INT_MIN / x)) {
+                return true;
+            }
+        } // x positive, y nonpositive
+    } else { // x is nonpositive
+        if (y > 0) { // x is nonpositive, y is positive
+            if (x < (MP_INT_MIN / y)) {
+                return true;
+            }
+        } else { // x and y are nonpositive
+            if (x != 0 && y < (MP_INT_MAX / x)) {
+                return true;
+            }
+        } // End if x and y are nonpositive
+    } // End if x is nonpositive
+
+    // Result doesn't overflow
+    *res = x * y;
+    return false;
+}
+#endif
diff --git a/py/smallint.c b/py/smallint.c
index a494093d61a21..eb99b58667a07 100644
--- a/py/smallint.c
+++ b/py/smallint.c
@@ -26,35 +26,6 @@
 
 #include "py/smallint.h"
 
-bool mp_small_int_mul_overflow(mp_int_t x, mp_int_t y, mp_int_t *res) {
-    // Check for multiply overflow; see CERT INT32-C
-    if (x > 0) { // x is positive
-        if (y > 0) { // x and y are positive
-            if (x > (MP_SMALL_INT_MAX / y)) {
-                return true;
-            }
-        } else { // x positive, y nonpositive
-            if (y < (MP_SMALL_INT_MIN / x)) {
-                return true;
-            }
-        } // x positive, y nonpositive
-    } else { // x is nonpositive
-        if (y > 0) { // x is nonpositive, y is positive
-            if (x < (MP_SMALL_INT_MIN / y)) {
-                return true;
-            }
-        } else { // x and y are nonpositive
-            if (x != 0 && y < (MP_SMALL_INT_MAX / x)) {
-                return true;
-            }
-        } // End if x and y are nonpositive
-    } // End if x is nonpositive
-
-    // Result doesn't overflow
-    *res = x * y;
-    return false;
-}
-
 mp_int_t mp_small_int_modulo(mp_int_t dividend, mp_int_t divisor) {
     // Python specs require that mod has same sign as second operand
     dividend %= divisor;
diff --git a/py/smallint.h b/py/smallint.h
index e50f98651e6ae..ec5b0af3b2867 100644
--- a/py/smallint.h
+++ b/py/smallint.h
@@ -68,10 +68,6 @@
 // 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)
 
-// Multiply two small ints.
-// If returns false, the correct result is stored in 'res'
-// If returns true, the multiplication would have overflowed. 'res' is unchanged.
-bool mp_small_int_mul_overflow(mp_int_t x, mp_int_t y, mp_int_t *res);
 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 ea63e43faf34a8c60eeae69f139ae4b0602a728f Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Sun, 28 Sep 2025 20:44:05 -0700
Subject: [PATCH 2884/3129] alif/machine_spi: Fix init() to only change
 requested settings.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 ports/alif/machine_spi.c | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/ports/alif/machine_spi.c b/ports/alif/machine_spi.c
index b2c14745cfc32..362ffa9b2142a 100644
--- a/ports/alif/machine_spi.c
+++ b/ports/alif/machine_spi.c
@@ -79,8 +79,8 @@ static inline uint32_t spi_get_clk(machine_spi_obj_t *spi) {
     return spi->is_lp ? GetSystemCoreClock() : GetSystemAHBClock();
 }
 
-static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
-    uint32_t polarity, uint32_t phase, uint32_t bits, uint32_t firstbit) {
+static void spi_init(machine_spi_obj_t *spi, int32_t baudrate,
+    int32_t polarity, int32_t phase, int32_t bits, int32_t firstbit) {
     const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
     switch (spi->id) {
         #if defined(MICROPY_HW_SPI0_SCK)
@@ -161,7 +161,9 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
     spi_mask_interrupts(spi->inst);
 
     // Configure baudrate clock
-    spi_set_bus_speed(spi->inst, baudrate, spi_get_clk(spi));
+    if (baudrate > 0) {
+        spi_set_bus_speed(spi->inst, baudrate, spi_get_clk(spi));
+    }
 
     // Configure FIFOs
     spi_set_tx_threshold(spi->inst, 0);
@@ -172,6 +174,21 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
     }
 
     // Configure SPI bus mode.
+    if (!spi->is_lp) {
+        if (polarity < 0) {
+            polarity = (spi->inst->SPI_CTRLR0 & SPI_CTRLR0_SCPOL_HIGH) ? 1 : 0;
+        }
+        if (phase < 0) {
+            phase = (spi->inst->SPI_CTRLR0 & SPI_CTRLR0_SCPH_HIGH) ? 1 : 0;
+        }
+    } else {
+        if (polarity < 0) {
+            polarity = (spi->inst->SPI_CTRLR0 & LPSPI_CTRLR0_SCPOL_HIGH) ? 1 : 0;
+        }
+        if (phase < 0) {
+            phase = (spi->inst->SPI_CTRLR0 & LPSPI_CTRLR0_SCPH_HIGH) ? 1 : 0;
+        }
+    }
     uint32_t spi_mode = (polarity << 1) | phase;
     if (!spi->is_lp) {
         spi_set_mode(spi->inst, spi_mode);
@@ -193,10 +210,12 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
     }
 
     // Configure frame size.
-    if (!spi->is_lp) {
-        spi_set_dfs(spi->inst, bits);
-    } else {
-        lpspi_set_dfs(spi->inst, bits);
+    if (bits > 0) {
+        if (!spi->is_lp) {
+            spi_set_dfs(spi->inst, bits);
+        } else {
+            lpspi_set_dfs(spi->inst, bits);
+        }
     }
 
     // Configure slave select pin

From 39e4413f46e616b70499865d1c22e523365d6f55 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Sun, 28 Sep 2025 20:49:29 -0700
Subject: [PATCH 2885/3129] alif/boards/OPENMV_AE3: Fix switch name to match
 OpenMV RT1062 and N6.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 ports/alif/boards/OPENMV_AE3/pins.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/alif/boards/OPENMV_AE3/pins.csv b/ports/alif/boards/OPENMV_AE3/pins.csv
index ab4f1a34f7e11..360b27af813c5 100644
--- a/ports/alif/boards/OPENMV_AE3/pins.csv
+++ b/ports/alif/boards/OPENMV_AE3/pins.csv
@@ -8,7 +8,7 @@ LED_GREEN,P6_3
 LED_BLUE,P6_0
 
 # User switch
-USR_SW,P15_7
+SW,P15_7
 
 # Flash on OSPI0
 FLASH_RESET,P3_3

From 58ff28b505cb311e4ffb024a81d81e1b094976bc Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Mon, 22 Sep 2025 20:24:18 +0900
Subject: [PATCH 2886/3129] stm32/rtc: Fix passing invalid argument to RTC
 callback.

NameError occurred when trying to access the argument of RTC.wakeup()
callback because the callback argument is not initialized.  To fix this
issue, this commit passes EXTI_RTC_WAKEUP to callback argument.

This is equivalent behavior with ExtInt callback.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/extint.c | 2 +-
 ports/stm32/extint.h | 1 +
 ports/stm32/rtc.c    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index df0ed6e23e1f6..b1e5c8a8f223c 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -127,7 +127,7 @@ 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
-static mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
+mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
 
 #if !defined(ETH)
 #define ETH_WKUP_IRQn   62  // Some MCUs don't have ETH, but we want a value to put in our table
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 801dcf62b54bd..cdebf6eb86a7d 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -64,6 +64,7 @@
 #endif
 
 #define EXTI_NUM_VECTORS        (PYB_EXTI_NUM_VECTORS)
+extern mp_obj_t pyb_extint_callback_arg[];
 
 void extint_init0(void);
 
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index fa28fda6a893e..fb106e179be1f 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -771,6 +771,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
 
     // 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);
 
     // disable register write protection
     RTC->WPR = 0xca;

From 64c7045213514d7d57abeee8705f6b4e70222785 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Wed, 24 Sep 2025 21:32:30 -0700
Subject: [PATCH 2887/3129] stm32/boards/OPENMV_N6: Define all OpenMV N6 pins.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 ports/stm32/boards/OPENMV_N6/pins.csv | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/boards/OPENMV_N6/pins.csv b/ports/stm32/boards/OPENMV_N6/pins.csv
index b05b8b57f9eb3..84b4160faf673 100644
--- a/ports/stm32/boards/OPENMV_N6/pins.csv
+++ b/ports/stm32/boards/OPENMV_N6/pins.csv
@@ -1,9 +1,9 @@
 ,PA0
 ,PA1
-,PA2
+ONOFF,PA2
 ,PA3
 ,PA4
-,PA5
+P6_ADC,PA5
 ,PA6
 ,PA7
 ,PA8
@@ -21,11 +21,13 @@ P2,PA12
 ,PB0
 ,PB1
 ,PB2
-,PB3
+CHG,PB3
 ,PB4
 ,PB5
 SPI4_MISO,PB6
 SPI4_MOSI,PB7
+P17,PB6
+P18,PB7
 ,PB8
 ,PB9
 I2C2_SCL,PB10
@@ -63,8 +65,8 @@ P11,PC13
 P10,PD6
 SPI2_MOSI,PD7
 P0,PD7
-,PD8
-,PD9
+ST,PD8
+PG,PD9
 ,PD10
 SPI2_MISO,PD11
 P1,PD11
@@ -81,19 +83,23 @@ P8,PD13
 ,PE6
 UART7_RX,PE7
 UART7_TX,PE8
+P13,PE7
+P14,PE8
 ,PE9
 ,PE10
 SPI4_CS,PE11
 SPI4_SCK,PE12
+P15,PE11
+P16,PE12
 I2C4_SCL,PE13
 I2C4_SDA,PE14
 ,PE15
 P6,PG0
 P9,PG12
 P7,PG13
-,PG15
+BAT_ADC,PG15
 
-BUTTON,PF4
+SW,PF4
 LED_RED,PG10
 LED_GREEN,PA7
 LED_BLUE,PB1

From ed46ff68207edfb0d4d3273cee1f3e5f1199dab4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 27 Sep 2025 16:01:37 +0200
Subject: [PATCH 2888/3129] stm32/boards: Add PG13 AF7 (USART3_RTS) to N6 AF
 file.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/stm32n657_af.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/stm32n657_af.csv b/ports/stm32/boards/stm32n657_af.csv
index 35e305a37676f..9bdb196f8810d 100644
--- a/ports/stm32/boards/stm32n657_af.csv
+++ b/ports/stm32/boards/stm32n657_af.csv
@@ -37,6 +37,6 @@ PortG,PG2 ,             ,                   ,                              ,
 PortG,PG5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_CTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D1                                              ,                                                            ,                                                ,                       ,        ,
 PortG,PG12,             ,TIM17_CH1          ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
-PortG,PG13,             ,                   ,TIM4_CH1                      ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG13,             ,                   ,TIM4_CH1                      ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP7/ADC12_INN3
 PortC,PH2 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_CMD                                   ,                                                       ,                                                            ,                                                ,                       ,        ,

From 6d65882b05381522ff946ba1f41fd0122edb344f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 27 Sep 2025 16:03:35 +0200
Subject: [PATCH 2889/3129] stm32/boards/OPENMV_N6: Define RTS pin for UART3.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/OPENMV_N6/mpconfigboard.h | 1 +
 ports/stm32/boards/OPENMV_N6/pins.csv        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
index ed7bb548a1d29..5e4f81099918b 100644
--- a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
+++ b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
@@ -53,6 +53,7 @@
 #define MICROPY_HW_UART2_CTS        (pyb_pin_BT_CTS)
 #define MICROPY_HW_UART3_TX         (pyb_pin_UART3_TX)
 #define MICROPY_HW_UART3_RX         (pyb_pin_UART3_RX)
+#define MICROPY_HW_UART3_RTS        (pyb_pin_UART3_RTS)
 #define MICROPY_HW_UART4_TX         (pyb_pin_UART4_TX)
 #define MICROPY_HW_UART4_RX         (pyb_pin_UART4_RX)
 #define MICROPY_HW_UART7_TX         (pyb_pin_UART7_TX)
diff --git a/ports/stm32/boards/OPENMV_N6/pins.csv b/ports/stm32/boards/OPENMV_N6/pins.csv
index 84b4160faf673..52f6c92496d7e 100644
--- a/ports/stm32/boards/OPENMV_N6/pins.csv
+++ b/ports/stm32/boards/OPENMV_N6/pins.csv
@@ -34,6 +34,7 @@ I2C2_SCL,PB10
 I2C2_SDA,PB11
 UART3_TX,PB10
 UART3_RX,PB11
+UART3_RTS,PG13
 P4,PB10
 P5,PB11
 ,PB12

From 7681c683920055a7b0285b2b40ce94656293d32e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Sep 2025 13:15:10 +1000
Subject: [PATCH 2890/3129] extmod/vfs_blockdev: Check return type is an
 integer.

This catches cases where the return type is not a small int, eg it could be
a string, or even a big integer.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_blockdev.c                    |  2 +-
 tests/extmod/vfs_blockdev_invalid.py     |  8 ++++----
 tests/extmod/vfs_blockdev_invalid.py.exp | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/extmod/vfs_blockdev.c b/extmod/vfs_blockdev.c
index d43c96b08f326..5c7d248ac5a9c 100644
--- a/extmod/vfs_blockdev.c
+++ b/extmod/vfs_blockdev.c
@@ -69,7 +69,7 @@ static int mp_vfs_blockdev_call_rw(mp_obj_t *args, size_t block_num, size_t bloc
         // and negative integer on errors. Check for positive integer
         // results as some callers (i.e. littlefs) will produce corrupt
         // results from these.
-        int i = MP_OBJ_SMALL_INT_VALUE(ret);
+        int i = mp_obj_get_int(ret);
         return i > 0 ? (-MP_EINVAL) : i;
     }
 }
diff --git a/tests/extmod/vfs_blockdev_invalid.py b/tests/extmod/vfs_blockdev_invalid.py
index 4d00f4b00273a..29d6bd6b2f9f7 100644
--- a/tests/extmod/vfs_blockdev_invalid.py
+++ b/tests/extmod/vfs_blockdev_invalid.py
@@ -70,8 +70,8 @@ def test(vfs_class):
         try:
             with fs.open("test", "r") as f:
                 print("opened")
-        except OSError as e:
-            print("OSError", e)
+        except Exception as e:
+            print(type(e), e)
 
         # This variant should succeed on open, may fail on read
         # unless the filesystem cached the contents already
@@ -81,8 +81,8 @@ def test(vfs_class):
                 bdev.read_res = res
                 print("read 1", f.read(1))
                 print("read rest", f.read())
-        except OSError as e:
-            print("OSError", e)
+        except Exception as e:
+            print(type(e), e)
 
 
 test(vfs.VfsLfs2)
diff --git a/tests/extmod/vfs_blockdev_invalid.py.exp b/tests/extmod/vfs_blockdev_invalid.py.exp
index 13695e0d88916..0ea0353501de3 100644
--- a/tests/extmod/vfs_blockdev_invalid.py.exp
+++ b/tests/extmod/vfs_blockdev_invalid.py.exp
@@ -2,27 +2,27 @@
 opened
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-OSError [Errno 5] EIO
+<class 'OSError'> [Errno 5] EIO
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-OSError [Errno 22] EINVAL
+<class 'OSError'> [Errno 22] EINVAL
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-OSError [Errno 22] EINVAL
+<class 'OSError'> [Errno 22] EINVAL
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-OSError [Errno 22] EINVAL
+<class 'TypeError'> can't convert str to int
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 <class 'VfsFat'>
 opened
 read 1 a
 read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-OSError [Errno 5] EIO
-OSError [Errno 5] EIO
-OSError [Errno 5] EIO
-OSError [Errno 5] EIO
-OSError [Errno 5] EIO
-OSError [Errno 5] EIO
-OSError [Errno 5] EIO
-OSError [Errno 5] EIO
+<class 'OSError'> [Errno 5] EIO
+<class 'OSError'> [Errno 5] EIO
+<class 'OSError'> [Errno 5] EIO
+<class 'OSError'> [Errno 5] EIO
+<class 'OSError'> [Errno 5] EIO
+<class 'OSError'> [Errno 5] EIO
+<class 'TypeError'> can't convert str to int
+<class 'TypeError'> can't convert str to int

From 4d905ef55235ed6f2f2d02799a3089ae8eb0c6e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Sep 2025 12:55:59 +1000
Subject: [PATCH 2891/3129] tests/run-tests.py: Skip certain tests when using
 --via-mpy.

These tests cannot pass when using `--via-mpy`.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index d6eb9a3fbc258..1aec3ad85e93e 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -107,6 +107,19 @@ def open(self, path, mode):
 platform_to_port_map = {"pyboard": "stm32", "WiPy": "cc3200"}
 platform_to_port_map.update({p: "unix" for p in PC_PLATFORMS})
 
+# Tests to skip for values of the `--via-mpy` argument.
+via_mpy_tests_to_skip = {
+    # Skip the following when mpy is enabled.
+    True: (
+        # These print out the filename and that's expected to match the .py name.
+        "import/import_file.py",
+        "io/argv.py",
+        "misc/sys_settrace_features.py",
+        "misc/sys_settrace_generator.py",
+        "misc/sys_settrace_loop.py",
+    ),
+}
+
 # Tests to skip for specific emitters.
 emitter_tests_to_skip = {
     # Some tests are known to fail with native emitter.
@@ -925,6 +938,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("unicode/file2.py")  # requires local file access
         skip_tests.add("unicode/file_invalid.py")  # requires local file access
 
+    # Skip certain tests when going via a .mpy file.
+    skip_tests.update(via_mpy_tests_to_skip.get(args.via_mpy, ()))
+
     # Skip emitter-specific tests.
     skip_tests.update(emitter_tests_to_skip.get(args.emit, ()))
 

From e031ead6b2043c412abb38804c1a1e350237e642 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Sep 2025 12:56:30 +1000
Subject: [PATCH 2892/3129] unix/Makefile: Run all possible tests when using
 --via-mpy.

Currently testing on the unix port with `--via-mpy` only runs tests in the
`basics`, `float` and `micropython` test directories.

This commit removes that restriction and now runs `--via-mpy` tests using
all possible test directories.  This improves test coverage.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index e4638299f1538..7df4c6f79b53c 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -278,16 +278,15 @@ test/%: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py -d "$*"
 
-test_full_no_native: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
+test_full_no_native: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py test
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
-	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)
 	cat $(TOP)/tests/basics/0prelim.py | ./$(BUILD)/$(PROG) | grep -q 'abc'
 
 test_full: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py test_full_no_native
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	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) --emit native -d basics float micropython
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native
 
 test_gcov: test_full
 	gcov -o $(BUILD)/py $(TOP)/py/*.c

From 4c9ce826cbfbd99cff10cc933064f87a13bee4ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Sep 2025 15:13:10 +1000
Subject: [PATCH 2893/3129] tests: Remove .py.exp files that match with CPython
 3.8.2 or newer.

Running the tests now requires CPython 3.8.2 or newer, which was
released February 2020 and should be widely available.

A few examples of features that were previously not supported by CPython,
but which are now:
- %-formatting for bytes and bytearray (PEP 461), CPython 3.5
- annotated variables (PEP 526), CPython 3.6
- assignment expressions (PEP 572), CPython 3.8

Note that `basics/fun_code_full.py.exp` is added here because that requires
CPython 3.10 or newer.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/README.md                          |  3 +-
 tests/basics/annotate_var.py.exp         |  5 ---
 tests/basics/assign_expr.py.exp          | 16 --------
 tests/basics/assign_expr_scope.py.exp    | 23 -----------
 tests/basics/async_await.py.exp          | 32 ---------------
 tests/basics/async_await2.py.exp         |  5 ---
 tests/basics/async_def.py.exp            |  3 --
 tests/basics/async_for.py.exp            | 51 ------------------------
 tests/basics/async_for2.py.exp           | 32 ---------------
 tests/basics/async_syntaxerror.py.exp    |  2 -
 tests/basics/async_with.py.exp           | 11 -----
 tests/basics/async_with2.py.exp          | 17 --------
 tests/basics/async_with_break.py.exp     | 15 -------
 tests/basics/async_with_return.py.exp    | 15 -------
 tests/basics/bytes_format_modulo.py.exp  |  5 ---
 tests/basics/class_inplace_op2.py.exp    | 12 ------
 tests/basics/class_ordereddict.py.exp    |  1 -
 tests/basics/fun_code_full.py.exp        |  9 +++++
 tests/basics/python36.py.exp             |  5 ---
 tests/basics/special_methods2.py.exp     | 19 ---------
 tests/basics/string_fstring_debug.py.exp |  9 -----
 tests/basics/try_finally_continue.py.exp |  9 -----
 tests/extmod/asyncio_basic.py.exp        |  6 ---
 tests/extmod/asyncio_lock.py.exp         | 41 -------------------
 tests/extmod/asyncio_wait_task.py.exp    | 12 ------
 tests/extmod/json_loads_bytes.py.exp     |  2 -
 tests/extmod/re_sub_unmatched.py.exp     |  1 -
 27 files changed, 11 insertions(+), 350 deletions(-)
 delete mode 100644 tests/basics/annotate_var.py.exp
 delete mode 100644 tests/basics/assign_expr.py.exp
 delete mode 100644 tests/basics/assign_expr_scope.py.exp
 delete mode 100644 tests/basics/async_await.py.exp
 delete mode 100644 tests/basics/async_await2.py.exp
 delete mode 100644 tests/basics/async_def.py.exp
 delete mode 100644 tests/basics/async_for.py.exp
 delete mode 100644 tests/basics/async_for2.py.exp
 delete mode 100644 tests/basics/async_syntaxerror.py.exp
 delete mode 100644 tests/basics/async_with.py.exp
 delete mode 100644 tests/basics/async_with2.py.exp
 delete mode 100644 tests/basics/async_with_break.py.exp
 delete mode 100644 tests/basics/async_with_return.py.exp
 delete mode 100644 tests/basics/bytes_format_modulo.py.exp
 delete mode 100644 tests/basics/class_inplace_op2.py.exp
 delete mode 100644 tests/basics/class_ordereddict.py.exp
 create mode 100644 tests/basics/fun_code_full.py.exp
 delete mode 100644 tests/basics/python36.py.exp
 delete mode 100644 tests/basics/special_methods2.py.exp
 delete mode 100644 tests/basics/string_fstring_debug.py.exp
 delete mode 100644 tests/basics/try_finally_continue.py.exp
 delete mode 100644 tests/extmod/asyncio_basic.py.exp
 delete mode 100644 tests/extmod/asyncio_lock.py.exp
 delete mode 100644 tests/extmod/asyncio_wait_task.py.exp
 delete mode 100644 tests/extmod/json_loads_bytes.py.exp
 delete mode 100644 tests/extmod/re_sub_unmatched.py.exp

diff --git a/tests/README.md b/tests/README.md
index 6a6395c39cb39..676e9d8320581 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,6 +1,7 @@
 # MicroPython Test Suite
 
-This directory contains tests for most parts of MicroPython.
+This directory contains tests for most parts of MicroPython.  To run it you will need
+CPython 3.8.2 or newer, which is used to validate MicroPython's behaviour.
 
 To run all stable tests, run the "run-tests.py" script in this directory.  By default
 that will run the test suite against the unix port of MicroPython.
diff --git a/tests/basics/annotate_var.py.exp b/tests/basics/annotate_var.py.exp
deleted file mode 100644
index 9b6536e966b0e..0000000000000
--- a/tests/basics/annotate_var.py.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-False
-1
-(1, 2)
-NameError
-1
diff --git a/tests/basics/assign_expr.py.exp b/tests/basics/assign_expr.py.exp
deleted file mode 100644
index 47da56b80d47b..0000000000000
--- a/tests/basics/assign_expr.py.exp
+++ /dev/null
@@ -1,16 +0,0 @@
-4
-True
-2
-4 5
-5
-1 5 5
-5
-2 1
-1 0
-any True
-8
-123
-any True
-8
-[(1, 0), (2, 2), (3, 6), (4, 12)]
-4
diff --git a/tests/basics/assign_expr_scope.py.exp b/tests/basics/assign_expr_scope.py.exp
deleted file mode 100644
index 5c780b382215f..0000000000000
--- a/tests/basics/assign_expr_scope.py.exp
+++ /dev/null
@@ -1,23 +0,0 @@
-scope0
-1
-None
-scope1
-[1]
-1
-None
-scope2
-[0, 1]
-1
-1
-scope3
-[0, 1]
-None
-None
-scope4
-[0, 1]
-1
-1
-scope5
-[0, 1]
-1
-None
diff --git a/tests/basics/async_await.py.exp b/tests/basics/async_await.py.exp
deleted file mode 100644
index b51c388a9339e..0000000000000
--- a/tests/basics/async_await.py.exp
+++ /dev/null
@@ -1,32 +0,0 @@
-4
-3
-2
-1
-0
-0
-1
-0
-0
-2
-1
-0
-0
-1
-0
-0
-3
-2
-1
-0
-0
-1
-0
-0
-2
-1
-0
-0
-1
-0
-0
-finished
diff --git a/tests/basics/async_await2.py.exp b/tests/basics/async_await2.py.exp
deleted file mode 100644
index fc9ff0aa535fc..0000000000000
--- a/tests/basics/async_await2.py.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-wait value: 1
-return from send: message from wait(1)
-wait got back: message from main
-x = 100
-got StopIteration
diff --git a/tests/basics/async_def.py.exp b/tests/basics/async_def.py.exp
deleted file mode 100644
index f555ace99ab20..0000000000000
--- a/tests/basics/async_def.py.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-decorator
-foo
-StopIteration
diff --git a/tests/basics/async_for.py.exp b/tests/basics/async_for.py.exp
deleted file mode 100644
index 6f59979c065de..0000000000000
--- a/tests/basics/async_for.py.exp
+++ /dev/null
@@ -1,51 +0,0 @@
-== start ==
-init
-aiter
-init
-anext
-a
-anext
-b
-anext
-c
-anext
-== finish ==
-== start ==
-init
-aiter
-init
-anext
-d
-anext
-e
-anext
-f
-anext
-AsyncIteratorWrapper-def
-== finish ==
-init
-== start ==
-aiter
-init
-anext
-g
-anext
-h
-anext
-i
-anext
-AsyncIteratorWrapper-ghi
-== finish ==
-init
-== start ==
-aiter
-init
-anext
-j
-anext
-k
-anext
-l
-anext
-AsyncIteratorWrapper-jkl
-== finish ==
diff --git a/tests/basics/async_for2.py.exp b/tests/basics/async_for2.py.exp
deleted file mode 100644
index 52bbe90c85376..0000000000000
--- a/tests/basics/async_for2.py.exp
+++ /dev/null
@@ -1,32 +0,0 @@
-init
-aiter
-anext
-f start: 20
-coro yielded: 21
-coro yielded: 22
-f returned: 23
-x 0
-anext
-f start: 20
-coro yielded: 21
-coro yielded: 22
-f returned: 23
-x 1
-anext
-f start: 20
-coro yielded: 21
-coro yielded: 22
-f returned: 23
-x 2
-anext
-f start: 20
-coro yielded: 21
-coro yielded: 22
-f returned: 23
-x 3
-anext
-f start: 20
-coro yielded: 21
-coro yielded: 22
-f returned: 23
-finished
diff --git a/tests/basics/async_syntaxerror.py.exp b/tests/basics/async_syntaxerror.py.exp
deleted file mode 100644
index 5275689b41383..0000000000000
--- a/tests/basics/async_syntaxerror.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-SyntaxError
-SyntaxError
diff --git a/tests/basics/async_with.py.exp b/tests/basics/async_with.py.exp
deleted file mode 100644
index 6bbf84cb4b52c..0000000000000
--- a/tests/basics/async_with.py.exp
+++ /dev/null
@@ -1,11 +0,0 @@
-enter
-body
-exit None None
-finished
-enter
-1
-exit <class 'ValueError'> error
-ValueError
-enter
-exit <class 'BaseException'> 
-BaseException
diff --git a/tests/basics/async_with2.py.exp b/tests/basics/async_with2.py.exp
deleted file mode 100644
index 76b173b4c24a7..0000000000000
--- a/tests/basics/async_with2.py.exp
+++ /dev/null
@@ -1,17 +0,0 @@
-enter
-f start: 10
-coro yielded: 11
-coro yielded: 12
-f returned: 13
-body start
-f start: 30
-coro yielded: 31
-coro yielded: 32
-body f returned: 33
-body end
-exit None None
-f start: 20
-coro yielded: 21
-coro yielded: 22
-f returned: 23
-finished
diff --git a/tests/basics/async_with_break.py.exp b/tests/basics/async_with_break.py.exp
deleted file mode 100644
index d077a88fad0e4..0000000000000
--- a/tests/basics/async_with_break.py.exp
+++ /dev/null
@@ -1,15 +0,0 @@
-enter
-body
-exit None None
-finished
-enter
-body
-exit None None
-finally
-finished
-enter
-body
-exit None None
-finally inner
-finally outer
-finished
diff --git a/tests/basics/async_with_return.py.exp b/tests/basics/async_with_return.py.exp
deleted file mode 100644
index d077a88fad0e4..0000000000000
--- a/tests/basics/async_with_return.py.exp
+++ /dev/null
@@ -1,15 +0,0 @@
-enter
-body
-exit None None
-finished
-enter
-body
-exit None None
-finally
-finished
-enter
-body
-exit None None
-finally inner
-finally outer
-finished
diff --git a/tests/basics/bytes_format_modulo.py.exp b/tests/basics/bytes_format_modulo.py.exp
deleted file mode 100644
index 782b7f91fcbfe..0000000000000
--- a/tests/basics/bytes_format_modulo.py.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-b'%'
-b'=1='
-b'=1=2='
-b'=str='
-b"=b'str'="
diff --git a/tests/basics/class_inplace_op2.py.exp b/tests/basics/class_inplace_op2.py.exp
deleted file mode 100644
index 8c323b5178ef4..0000000000000
--- a/tests/basics/class_inplace_op2.py.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-__imul__
-__imatmul__
-__ifloordiv__
-__itruediv__
-__imod__
-__ipow__
-__ior__
-__ixor__
-__iand__
-__ilshift__
-__irshift__
-TypeError
diff --git a/tests/basics/class_ordereddict.py.exp b/tests/basics/class_ordereddict.py.exp
deleted file mode 100644
index b723e327515c7..0000000000000
--- a/tests/basics/class_ordereddict.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-['a', 'b', 'c', 'd', 'e']
diff --git a/tests/basics/fun_code_full.py.exp b/tests/basics/fun_code_full.py.exp
new file mode 100644
index 0000000000000..830effadfc695
--- /dev/null
+++ b/tests/basics/fun_code_full.py.exp
@@ -0,0 +1,9 @@
+<class 'bytes'>
+(None,)
+fun_code_full.py
+<class 'int'>
+f
+True
+0
+0
+non-contiguous
diff --git a/tests/basics/python36.py.exp b/tests/basics/python36.py.exp
deleted file mode 100644
index 4b65daafa18fe..0000000000000
--- a/tests/basics/python36.py.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-100000
-165
-65535
-123
-83
diff --git a/tests/basics/special_methods2.py.exp b/tests/basics/special_methods2.py.exp
deleted file mode 100644
index a9ae75be55c95..0000000000000
--- a/tests/basics/special_methods2.py.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-__pos__ called
-__pos__ called
-__neg__ called
-__invert__ called
-__mul__ called
-__matmul__ called
-__truediv__ called
-__floordiv__ called
-__iadd__ called
-__isub__ called
-__mod__ called
-__pow__ called
-__or__ called
-__and__ called
-__xor__ called
-__lshift__ called
-__rshift__ called
-['a', 'b', 'c']
-False
diff --git a/tests/basics/string_fstring_debug.py.exp b/tests/basics/string_fstring_debug.py.exp
deleted file mode 100644
index f0309e1c98aa9..0000000000000
--- a/tests/basics/string_fstring_debug.py.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-a 1,=(1,) b
-a x,y,=(1, 2) b
-a x,1=(1, 1) b
diff --git a/tests/basics/try_finally_continue.py.exp b/tests/basics/try_finally_continue.py.exp
deleted file mode 100644
index 2901997b1aa18..0000000000000
--- a/tests/basics/try_finally_continue.py.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-4 0
-continue
-4 1
-continue
-4 2
-continue
-4 3
-continue
-None
diff --git a/tests/extmod/asyncio_basic.py.exp b/tests/extmod/asyncio_basic.py.exp
deleted file mode 100644
index 478e22abc8ff6..0000000000000
--- a/tests/extmod/asyncio_basic.py.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-start
-after sleep
-short
-long
-negative
-took 200 400 0
diff --git a/tests/extmod/asyncio_lock.py.exp b/tests/extmod/asyncio_lock.py.exp
deleted file mode 100644
index a37dfcbd2e519..0000000000000
--- a/tests/extmod/asyncio_lock.py.exp
+++ /dev/null
@@ -1,41 +0,0 @@
-False
-True
-False
-have lock
-----
-task start 1
-task start 2
-task start 3
-task have 1 0
-task have 2 0
-task have 3 0
-task have 1 1
-task have 2 1
-task have 3 1
-task have 1 2
-task end 1
-task have 2 2
-task end 2
-task have 3 2
-task end 3
-----
-task have True
-task release False
-task have True
-task release False
-task have again
-task have again
-----
-task got 0
-task release 0
-task cancel 1
-task got 2
-task release 2
-False
-----
-task got 0
-task cancel 1
-task release 0
-task got 2
-task cancel 2
-False
diff --git a/tests/extmod/asyncio_wait_task.py.exp b/tests/extmod/asyncio_wait_task.py.exp
deleted file mode 100644
index 514a434223315..0000000000000
--- a/tests/extmod/asyncio_wait_task.py.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-start
-task 1
-task 2
-----
-start
-hello
-world
-took 200 200
-task_raise
-ValueError
-task_raise
-ValueError
diff --git a/tests/extmod/json_loads_bytes.py.exp b/tests/extmod/json_loads_bytes.py.exp
deleted file mode 100644
index c2735a99052d2..0000000000000
--- a/tests/extmod/json_loads_bytes.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-[1, 2]
-[None]
diff --git a/tests/extmod/re_sub_unmatched.py.exp b/tests/extmod/re_sub_unmatched.py.exp
deleted file mode 100644
index 1e5f0fda0554d..0000000000000
--- a/tests/extmod/re_sub_unmatched.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-1-a2

From da568a3a3019685b217955fe312c04dbbd893ada Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 07:58:48 +1000
Subject: [PATCH 2894/3129] tests/stress: Improve qstr_limit test to run on
 minimal targets.

Changes here are:
- Split out string format module sub-test to a separate test file, so it
  can be skipped on targets that don't have str% capabilities.
- Print the whole type instead of `.__name__` to support targets that don't
  have `.__name__` enabled (this still tests the same thing).
- Print `RuntimeError` exception message to be sure the correct exception
  is being raised.

This test now runs on unix and zephyr minimal configurations.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/stress/qstr_limit.py                | 42 +++++++----------
 tests/stress/qstr_limit.py.exp            | 55 +++++++++++------------
 tests/stress/qstr_limit_str_modulo.py     | 21 +++++++++
 tests/stress/qstr_limit_str_modulo.py.exp |  5 +++
 4 files changed, 68 insertions(+), 55 deletions(-)
 create mode 100644 tests/stress/qstr_limit_str_modulo.py
 create mode 100644 tests/stress/qstr_limit_str_modulo.py.exp

diff --git a/tests/stress/qstr_limit.py b/tests/stress/qstr_limit.py
index 08b10a039f509..c7bd437f3adc1 100644
--- a/tests/stress/qstr_limit.py
+++ b/tests/stress/qstr_limit.py
@@ -12,8 +12,8 @@ def make_id(n, base="a"):
     var = make_id(l)
     try:
         exec(var + "=1", g)
-    except RuntimeError:
-        print("RuntimeError", l)
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
         continue
     print(var in g)
 
@@ -26,16 +26,16 @@ def f(**k):
 for l in range(254, 259):
     try:
         exec("f({}=1)".format(make_id(l)))
-    except RuntimeError:
-        print("RuntimeError", l)
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
 
 # type construction
 for l in range(254, 259):
     id = make_id(l)
     try:
-        print(type(id, (), {}).__name__)
-    except RuntimeError:
-        print("RuntimeError", l)
+        print(type(id, (), {}))
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
 
 
 # hasattr, setattr, getattr
@@ -48,28 +48,20 @@ class A:
     a = A()
     try:
         setattr(a, id, 123)
-    except RuntimeError:
-        print("RuntimeError", l)
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
     try:
         print(hasattr(a, id), getattr(a, id))
-    except RuntimeError:
-        print("RuntimeError", l)
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
 
 # format with keys
 for l in range(254, 259):
     id = make_id(l)
     try:
         print(("{" + id + "}").format(**{id: l}))
-    except RuntimeError:
-        print("RuntimeError", l)
-
-# modulo format with keys
-for l in range(254, 259):
-    id = make_id(l)
-    try:
-        print(("%(" + id + ")d") % {id: l})
-    except RuntimeError:
-        print("RuntimeError", l)
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
 
 # import module
 # (different OS's have different results so only run those that are consistent)
@@ -78,8 +70,8 @@ class A:
         __import__(make_id(l))
     except ImportError:
         print("ok", l)
-    except RuntimeError:
-        print("RuntimeError", l)
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
 
 # import package
 for l in (100, 101, 102, 128, 129):
@@ -87,5 +79,5 @@ class A:
         exec("import " + make_id(l) + "." + make_id(l, "A"))
     except ImportError:
         print("ok", l)
-    except RuntimeError:
-        print("RuntimeError", l)
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
diff --git a/tests/stress/qstr_limit.py.exp b/tests/stress/qstr_limit.py.exp
index 455761bc71e4a..2349adf220f98 100644
--- a/tests/stress/qstr_limit.py.exp
+++ b/tests/stress/qstr_limit.py.exp
@@ -1,43 +1,38 @@
 True
 True
-RuntimeError 256
-RuntimeError 257
-RuntimeError 258
+RuntimeError name too long 256
+RuntimeError name too long 257
+RuntimeError name too long 258
 {'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst': 1}
 {'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstu': 1}
-RuntimeError 256
-RuntimeError 257
-RuntimeError 258
-abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst
-abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstu
-RuntimeError 256
-RuntimeError 257
-RuntimeError 258
+RuntimeError name too long 256
+RuntimeError name too long 257
+RuntimeError name too long 258
+<class 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst'>
+<class 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstu'>
+RuntimeError name too long 256
+RuntimeError name too long 257
+RuntimeError name too long 258
 True 123
 True 123
-RuntimeError 256
-RuntimeError 256
-RuntimeError 257
-RuntimeError 257
-RuntimeError 258
-RuntimeError 258
+RuntimeError name too long 256
+RuntimeError name too long 256
+RuntimeError name too long 257
+RuntimeError name too long 257
+RuntimeError name too long 258
+RuntimeError name too long 258
 254
 255
-RuntimeError 256
-RuntimeError 257
-RuntimeError 258
-254
-255
-RuntimeError 256
-RuntimeError 257
-RuntimeError 258
+RuntimeError name too long 256
+RuntimeError name too long 257
+RuntimeError name too long 258
 ok 100
 ok 101
-RuntimeError 256
-RuntimeError 257
-RuntimeError 258
+RuntimeError name too long 256
+RuntimeError name too long 257
+RuntimeError name too long 258
 ok 100
 ok 101
 ok 102
-RuntimeError 128
-RuntimeError 129
+RuntimeError name too long 128
+RuntimeError name too long 129
diff --git a/tests/stress/qstr_limit_str_modulo.py b/tests/stress/qstr_limit_str_modulo.py
new file mode 100644
index 0000000000000..90b9f4364ec6f
--- /dev/null
+++ b/tests/stress/qstr_limit_str_modulo.py
@@ -0,0 +1,21 @@
+# Test interning qstrs that go over the qstr length limit (255 bytes in default configuration).
+# The tests here are specifically for str formatting with %.
+
+try:
+    "" % ()
+except TypeError:
+    print("SKIP")
+    raise SystemExit
+
+
+def make_id(n, base="a"):
+    return "".join(chr(ord(base) + i % 26) for i in range(n))
+
+
+# modulo format with keys
+for l in range(254, 259):
+    id = make_id(l)
+    try:
+        print(("%(" + id + ")d") % {id: l})
+    except RuntimeError as er:
+        print("RuntimeError", er, l)
diff --git a/tests/stress/qstr_limit_str_modulo.py.exp b/tests/stress/qstr_limit_str_modulo.py.exp
new file mode 100644
index 0000000000000..3632c85bffea3
--- /dev/null
+++ b/tests/stress/qstr_limit_str_modulo.py.exp
@@ -0,0 +1,5 @@
+254
+255
+RuntimeError name too long 256
+RuntimeError name too long 257
+RuntimeError name too long 258

From d37ce8c369cdc7e094c7b981a69fb3abddd6d2a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 08:30:28 +1000
Subject: [PATCH 2895/3129] tests/misc/sys_exc_info.py: Don't rely on slicing.

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

diff --git a/tests/misc/sys_exc_info.py b/tests/misc/sys_exc_info.py
index d7e8a2d943b5e..c076dd572b07b 100644
--- a/tests/misc/sys_exc_info.py
+++ b/tests/misc/sys_exc_info.py
@@ -8,13 +8,14 @@
 
 
 def f():
-    print(sys.exc_info()[0:2])
+    e = sys.exc_info()
+    print(e[0], e[1])
 
 
 try:
     raise ValueError("value", 123)
 except:
-    print(sys.exc_info()[0:2])
+    print(sys.exc_info()[0], sys.exc_info()[1])
     f()
 
 # Outside except block, sys.exc_info() should be back to None's

From 72be75f477328b16aba7eae281ef4de281073825 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 08:30:50 +1000
Subject: [PATCH 2896/3129] tests/run-tests.py: Improve skip detection for
 tests using slice.

This skips some additional tests that use slice, and no longer skips
`basics/string_format_modulo.py` which doesn't actually use slice (but
`float/string_format_modulo.py` does).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 1aec3ad85e93e..aeffa1b796afa 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -229,6 +229,26 @@ def open(self, path, mode):
     ),
 }
 
+# These tests don't test slice explicitly but rather use it to perform the test.
+tests_requiring_slice = (
+    "basics/builtin_range.py",
+    "basics/bytearray1.py",
+    "basics/class_super.py",
+    "basics/containment.py",
+    "basics/errno1.py",
+    "basics/fun_str.py",
+    "basics/generator1.py",
+    "basics/globals_del.py",
+    "basics/memoryview1.py",
+    "basics/memoryview_gc.py",
+    "basics/object1.py",
+    "basics/python34.py",
+    "basics/struct_endian.py",
+    "float/string_format_modulo.py",
+    "misc/non_compliant.py",
+    "misc/rge_sm.py",
+)
+
 # Tests that require `import target_wiring` to work.
 tests_requiring_target_wiring = (
     "extmod/machine_uart_irq_txidle.py",
@@ -855,24 +875,6 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
 
         skip_inlineasm = args.inlineasm_arch is None
 
-    # These tests don't test slice explicitly but rather use it to perform the test
-    misc_slice_tests = (
-        "builtin_range",
-        "bytearray1",
-        "class_super",
-        "containment",
-        "errno1",
-        "fun_str",
-        "generator1",
-        "globals_del",
-        "memoryview1",
-        "memoryview_gc",
-        "object1",
-        "python34",
-        "string_format_modulo",
-        "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
@@ -909,6 +911,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if not args.unicode:
         skip_tests.add("extmod/json_loads.py")  # tests loading a utf-8 character
 
+    if skip_slice:
+        skip_tests.update(tests_requiring_slice)
+
     if not has_complex:
         skip_tests.add("float/complex1.py")
         skip_tests.add("float/complex1_intbig.py")
@@ -982,7 +987,7 @@ def run_one_test(test_file):
         is_int_64 = test_name.startswith("int_64") or test_name.endswith("_int64")
         is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
         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_slice = test_name.find("slice") != -1
         is_async = test_name.startswith(("async_", "asyncio_")) or test_name.endswith("_async")
         is_const = test_name.startswith("const")
         is_fstring = test_name.startswith("string_fstring")

From c176fe8702cd806cbd0981234a4d7328e37b1673 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 11:49:38 +1000
Subject: [PATCH 2897/3129] tests/run-tests.py: Skip more tests that need
 slice.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index aeffa1b796afa..0672be771e977 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -244,7 +244,30 @@ def open(self, path, mode):
     "basics/object1.py",
     "basics/python34.py",
     "basics/struct_endian.py",
+    "extmod/btree1.py",
+    "extmod/deflate_decompress.py",
+    "extmod/framebuf16.py",
+    "extmod/framebuf4.py",
+    "extmod/machine1.py",
+    "extmod/time_mktime.py",
+    "extmod/time_res.py",
+    "extmod/tls_sslcontext_ciphers.py",
+    "extmod/vfs_fat_fileio1.py",
+    "extmod/vfs_fat_finaliser.py",
+    "extmod/vfs_fat_more.py",
+    "extmod/vfs_fat_ramdisk.py",
+    "extmod/vfs_fat_ramdisklarge.py",
+    "extmod/vfs_lfs.py",
+    "extmod/vfs_rom.py",
     "float/string_format_modulo.py",
+    "micropython/builtin_execfile.py",
+    "micropython/extreme_exc.py",
+    "micropython/heapalloc_fail_bytearray.py",
+    "micropython/heapalloc_fail_list.py",
+    "micropython/heapalloc_fail_memoryview.py",
+    "micropython/import_mpy_invalid.py",
+    "micropython/import_mpy_native.py",
+    "micropython/import_mpy_native_gc.py",
     "misc/non_compliant.py",
     "misc/rge_sm.py",
 )

From a3a2b9e9738332eb9033bc1c227c9a69e9476e97 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 11:50:29 +1000
Subject: [PATCH 2898/3129] tests/extmod: Improve skip detection of extmod
 tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_soft_timer.py     | 12 +++++-------
 tests/extmod/select_poll_custom.py     |  4 ++--
 tests/extmod/tls_threads.py            |  3 ++-
 tests/extmod/vfs_fat_ilistdir_del.py   |  3 +--
 tests/extmod/vfs_lfs_ilistdir_del.py   |  3 +--
 tests/extmod/vfs_posix_ilistdir_del.py |  3 +--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/tests/extmod/machine_soft_timer.py b/tests/extmod/machine_soft_timer.py
index 1e9c66aa225e1..aa19becd8ebd1 100644
--- a/tests/extmod/machine_soft_timer.py
+++ b/tests/extmod/machine_soft_timer.py
@@ -1,20 +1,18 @@
 # test "soft" machine.Timer (no hardware ID)
 import sys
 
-
-if sys.platform in ("esp32", "esp8266"):
-    print("SKIP")  # TODO: Implement soft timers for esp32/esp8266 ports
-    raise SystemExit
-
-
 try:
-    import time, machine as machine
+    import time, machine
 
     machine.Timer
 except:
     print("SKIP")
     raise SystemExit
 
+if sys.platform in ("esp32", "esp8266"):
+    print("SKIP")  # TODO: Implement soft timers for esp32/esp8266 ports
+    raise SystemExit
+
 # create and deinit
 t = machine.Timer(freq=1)
 t.deinit()
diff --git a/tests/extmod/select_poll_custom.py b/tests/extmod/select_poll_custom.py
index b854a8a14da55..0d2ab07b232f3 100644
--- a/tests/extmod/select_poll_custom.py
+++ b/tests/extmod/select_poll_custom.py
@@ -1,13 +1,13 @@
 # Test custom pollable objects implemented in Python.
 
-from micropython import const
-
 try:
     import socket, select, io
 except ImportError:
     print("SKIP")
     raise SystemExit
 
+from micropython import const
+
 _MP_STREAM_POLL = const(3)
 _MP_STREAM_GET_FILENO = const(10)
 
diff --git a/tests/extmod/tls_threads.py b/tests/extmod/tls_threads.py
index 4564abd3d80de..1e0c3d23d2f38 100644
--- a/tests/extmod/tls_threads.py
+++ b/tests/extmod/tls_threads.py
@@ -1,6 +1,5 @@
 # Ensure that SSL sockets can be allocated from multiple
 # threads without thread safety issues
-import unittest
 
 try:
     import _thread
@@ -11,6 +10,8 @@
     print("SKIP")
     raise SystemExit
 
+import unittest
+
 
 class TestSocket(io.IOBase):
     def write(self, buf):
diff --git a/tests/extmod/vfs_fat_ilistdir_del.py b/tests/extmod/vfs_fat_ilistdir_del.py
index a6e24ec92f3b5..964e6b12868eb 100644
--- a/tests/extmod/vfs_fat_ilistdir_del.py
+++ b/tests/extmod/vfs_fat_ilistdir_del.py
@@ -1,8 +1,7 @@
 # Test ilistdir __del__ for VfsFat using a RAM device.
-import gc
 
 try:
-    import os, vfs
+    import gc, os, vfs
 
     vfs.VfsFat
 except (ImportError, AttributeError):
diff --git a/tests/extmod/vfs_lfs_ilistdir_del.py b/tests/extmod/vfs_lfs_ilistdir_del.py
index f463b84b22492..828c85a258856 100644
--- a/tests/extmod/vfs_lfs_ilistdir_del.py
+++ b/tests/extmod/vfs_lfs_ilistdir_del.py
@@ -1,8 +1,7 @@
 # Test ilistdir __del__ for VfsLittle using a RAM device.
-import gc
 
 try:
-    import vfs
+    import gc, vfs
 
     vfs.VfsLfs2
 except (ImportError, AttributeError):
diff --git a/tests/extmod/vfs_posix_ilistdir_del.py b/tests/extmod/vfs_posix_ilistdir_del.py
index 78d7c854c543c..8b5984cd81c05 100644
--- a/tests/extmod/vfs_posix_ilistdir_del.py
+++ b/tests/extmod/vfs_posix_ilistdir_del.py
@@ -1,8 +1,7 @@
 # Test ilistdir __del__ for VfsPosix.
-import gc
 
 try:
-    import os, vfs
+    import gc, os, vfs
 
     vfs.VfsPosix
 except (ImportError, AttributeError):

From 3de5a4c63c4414a35f31ff50e3642129c1eada02 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 11:50:46 +1000
Subject: [PATCH 2899/3129] tests/extmod/vfs_posix_paths.py: Use tuple instead
 of set.

So it can be used on targets without set enabled (or at least not raise a
SyntaxError when compiling it).

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

diff --git a/tests/extmod/vfs_posix_paths.py b/tests/extmod/vfs_posix_paths.py
index b4fedc6716f01..c06318748a327 100644
--- a/tests/extmod/vfs_posix_paths.py
+++ b/tests/extmod/vfs_posix_paths.py
@@ -31,7 +31,7 @@
 fs.mkdir("subdir/one")
 print('listdir("/"):', sorted(i[0] for i in fs.ilistdir("/")))
 print('listdir("."):', sorted(i[0] for i in fs.ilistdir(".")))
-print('getcwd() in {"", "/"}:', fs.getcwd() in {"", "/"})
+print('getcwd() in ("", "/"):', fs.getcwd() in ("", "/"))
 print('chdir("subdir"):', fs.chdir("subdir"))
 print("getcwd():", fs.getcwd())
 print('mkdir("two"):', fs.mkdir("two"))
diff --git a/tests/extmod/vfs_posix_paths.py.exp b/tests/extmod/vfs_posix_paths.py.exp
index ecc13222aaaeb..d6a0960efd249 100644
--- a/tests/extmod/vfs_posix_paths.py.exp
+++ b/tests/extmod/vfs_posix_paths.py.exp
@@ -1,6 +1,6 @@
 listdir("/"): ['subdir']
 listdir("."): ['subdir']
-getcwd() in {"", "/"}: True
+getcwd() in ("", "/"): True
 chdir("subdir"): None
 getcwd(): /subdir
 mkdir("two"): None

From 381cd730c834a1d071e7e90787ef7354b8532142 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 11:51:36 +1000
Subject: [PATCH 2900/3129] tests/micropython: Improve skipping of tests using
 micropython module.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/emg_exc.py                          | 3 +--
 tests/micropython/emg_exc.py.exp                      | 2 +-
 tests/micropython/extreme_exc.py                      | 6 +++++-
 tests/micropython/heap_lock.py                        | 6 +++++-
 tests/micropython/heap_locked.py                      | 6 ++++--
 tests/micropython/heapalloc.py                        | 6 +++++-
 tests/micropython/heapalloc_exc_compressed.py         | 8 +++++++-
 tests/micropython/heapalloc_exc_compressed_emg_exc.py | 8 +++++++-
 tests/micropython/heapalloc_exc_raise.py              | 8 +++++++-
 tests/micropython/heapalloc_fail_bytearray.py         | 8 +++++++-
 tests/micropython/heapalloc_fail_dict.py              | 8 +++++++-
 tests/micropython/heapalloc_fail_list.py              | 8 +++++++-
 tests/micropython/heapalloc_fail_memoryview.py        | 8 +++++++-
 tests/micropython/heapalloc_fail_set.py               | 8 +++++++-
 tests/micropython/heapalloc_fail_tuple.py             | 8 +++++++-
 tests/micropython/heapalloc_inst_call.py              | 9 ++++++++-
 tests/micropython/heapalloc_int_from_bytes.py         | 9 ++++++++-
 tests/micropython/heapalloc_str.py                    | 9 ++++++++-
 tests/micropython/heapalloc_super.py                  | 9 ++++++++-
 tests/micropython/heapalloc_traceback.py              | 3 +--
 tests/micropython/heapalloc_traceback.py.exp          | 2 +-
 tests/micropython/heapalloc_yield_from.py             | 8 +++++++-
 tests/micropython/kbd_intr.py                         | 6 +++---
 tests/micropython/meminfo.py                          | 7 ++++---
 tests/micropython/memstats.py                         | 7 ++++---
 tests/micropython/opt_level.py                        | 8 +++++++-
 tests/micropython/opt_level_lineno.py                 | 8 +++++++-
 tests/micropython/ringio.py                           | 6 +++---
 tests/micropython/ringio_async.py                     | 4 +---
 tests/micropython/ringio_big.py                       | 6 +++---
 tests/micropython/schedule.py                         | 6 +++---
 tests/micropython/stack_use.py                        | 7 +++++--
 32 files changed, 165 insertions(+), 50 deletions(-)

diff --git a/tests/micropython/emg_exc.py b/tests/micropython/emg_exc.py
index 9a09956c86136..42b709375ce88 100644
--- a/tests/micropython/emg_exc.py
+++ b/tests/micropython/emg_exc.py
@@ -1,10 +1,9 @@
 # test that emergency exceptions work
 
-import micropython
 import sys
 
 try:
-    import io
+    import io, micropython
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/micropython/emg_exc.py.exp b/tests/micropython/emg_exc.py.exp
index 0d4b80ce2bc59..d18012d691aa0 100644
--- a/tests/micropython/emg_exc.py.exp
+++ b/tests/micropython/emg_exc.py.exp
@@ -1,4 +1,4 @@
 Traceback (most recent call last):
-, line 22, in f
+, line 21, in f
 ValueError: 1
 
diff --git a/tests/micropython/extreme_exc.py b/tests/micropython/extreme_exc.py
index ad819e408fd82..17323b566d3b5 100644
--- a/tests/micropython/extreme_exc.py
+++ b/tests/micropython/extreme_exc.py
@@ -1,6 +1,10 @@
 # test some extreme cases of allocating exceptions and tracebacks
 
-import micropython
+try:
+    import micropython
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # Check for stackless build, which can't call functions without
 # allocating a frame on the heap.
diff --git a/tests/micropython/heap_lock.py b/tests/micropython/heap_lock.py
index f2892a6dc581e..209a3143461a5 100644
--- a/tests/micropython/heap_lock.py
+++ b/tests/micropython/heap_lock.py
@@ -1,6 +1,10 @@
 # check that heap_lock/heap_unlock work as expected
 
-import micropython
+try:
+    import micropython
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 l = []
 l2 = list(range(100))
diff --git a/tests/micropython/heap_locked.py b/tests/micropython/heap_locked.py
index d9e5b5d4090af..d9d99493dd6b7 100644
--- a/tests/micropython/heap_locked.py
+++ b/tests/micropython/heap_locked.py
@@ -1,8 +1,10 @@
 # test micropython.heap_locked()
 
-import micropython
+try:
+    import micropython
 
-if not hasattr(micropython, "heap_locked"):
+    micropython.heap_locked
+except (AttributeError, ImportError):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/micropython/heapalloc.py b/tests/micropython/heapalloc.py
index e19f8d0255deb..010bf878a07b0 100644
--- a/tests/micropython/heapalloc.py
+++ b/tests/micropython/heapalloc.py
@@ -1,6 +1,10 @@
 # check that we can do certain things without allocating heap memory
 
-import micropython
+try:
+    import micropython
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # Check for stackless build, which can't call functions without
 # allocating a frame on heap.
diff --git a/tests/micropython/heapalloc_exc_compressed.py b/tests/micropython/heapalloc_exc_compressed.py
index aa071d641c21c..96fe3ca4f7e00 100644
--- a/tests/micropython/heapalloc_exc_compressed.py
+++ b/tests/micropython/heapalloc_exc_compressed.py
@@ -1,4 +1,10 @@
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 # Tests both code paths for built-in exception raising.
 # mp_obj_new_exception_msg_varg (exception requires decompression at raise-time to format)
diff --git a/tests/micropython/heapalloc_exc_compressed_emg_exc.py b/tests/micropython/heapalloc_exc_compressed_emg_exc.py
index 48ce9dd69e6e2..31d937b8f9345 100644
--- a/tests/micropython/heapalloc_exc_compressed_emg_exc.py
+++ b/tests/micropython/heapalloc_exc_compressed_emg_exc.py
@@ -1,4 +1,10 @@
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 # Does the full test from heapalloc_exc_compressed.py but while the heap is
 # locked (this can only work when the emergency exception buf is enabled).
diff --git a/tests/micropython/heapalloc_exc_raise.py b/tests/micropython/heapalloc_exc_raise.py
index 99810e0075064..917ccf42f1e16 100644
--- a/tests/micropython/heapalloc_exc_raise.py
+++ b/tests/micropython/heapalloc_exc_raise.py
@@ -1,6 +1,12 @@
 # Test that we can raise and catch (preallocated) exception
 # without memory allocation.
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 e = ValueError("error")
 
diff --git a/tests/micropython/heapalloc_fail_bytearray.py b/tests/micropython/heapalloc_fail_bytearray.py
index 1bf7ddd600b93..9ee73d1c583f2 100644
--- a/tests/micropython/heapalloc_fail_bytearray.py
+++ b/tests/micropython/heapalloc_fail_bytearray.py
@@ -1,6 +1,12 @@
 # test handling of failed heap allocation with bytearray
 
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 
 class GetSlice:
diff --git a/tests/micropython/heapalloc_fail_dict.py b/tests/micropython/heapalloc_fail_dict.py
index ce2d158bd09c6..04c79183578ff 100644
--- a/tests/micropython/heapalloc_fail_dict.py
+++ b/tests/micropython/heapalloc_fail_dict.py
@@ -1,6 +1,12 @@
 # test handling of failed heap allocation with dict
 
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 # create dict
 x = 1
diff --git a/tests/micropython/heapalloc_fail_list.py b/tests/micropython/heapalloc_fail_list.py
index 9a2e9a555f3e2..7afb6dc1019b3 100644
--- a/tests/micropython/heapalloc_fail_list.py
+++ b/tests/micropython/heapalloc_fail_list.py
@@ -1,6 +1,12 @@
 # test handling of failed heap allocation with list
 
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 
 class GetSlice:
diff --git a/tests/micropython/heapalloc_fail_memoryview.py b/tests/micropython/heapalloc_fail_memoryview.py
index da2d1abffa634..17e3e1262472c 100644
--- a/tests/micropython/heapalloc_fail_memoryview.py
+++ b/tests/micropython/heapalloc_fail_memoryview.py
@@ -1,6 +1,12 @@
 # test handling of failed heap allocation with memoryview
 
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 
 class GetSlice:
diff --git a/tests/micropython/heapalloc_fail_set.py b/tests/micropython/heapalloc_fail_set.py
index 3c347660ad763..0c4d85eef62a8 100644
--- a/tests/micropython/heapalloc_fail_set.py
+++ b/tests/micropython/heapalloc_fail_set.py
@@ -1,6 +1,12 @@
 # test handling of failed heap allocation with set
 
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 # create set
 x = 1
diff --git a/tests/micropython/heapalloc_fail_tuple.py b/tests/micropython/heapalloc_fail_tuple.py
index de79385e3e3cb..11718a8107b3a 100644
--- a/tests/micropython/heapalloc_fail_tuple.py
+++ b/tests/micropython/heapalloc_fail_tuple.py
@@ -1,6 +1,12 @@
 # test handling of failed heap allocation with tuple
 
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 # create tuple
 x = 1
diff --git a/tests/micropython/heapalloc_inst_call.py b/tests/micropython/heapalloc_inst_call.py
index 14d8826bf06ce..f78aa3cf87798 100644
--- a/tests/micropython/heapalloc_inst_call.py
+++ b/tests/micropython/heapalloc_inst_call.py
@@ -1,6 +1,13 @@
 # Test that calling clazz.__call__() with up to at least 3 arguments
 # doesn't require heap allocation.
-import micropython
+
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 
 class Foo0:
diff --git a/tests/micropython/heapalloc_int_from_bytes.py b/tests/micropython/heapalloc_int_from_bytes.py
index 5fe50443ae335..3310ea95d1472 100644
--- a/tests/micropython/heapalloc_int_from_bytes.py
+++ b/tests/micropython/heapalloc_int_from_bytes.py
@@ -1,6 +1,13 @@
 # Test that int.from_bytes() for small number of bytes generates
 # small int.
-import micropython
+
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 micropython.heap_lock()
 print(int.from_bytes(b"1", "little"))
diff --git a/tests/micropython/heapalloc_str.py b/tests/micropython/heapalloc_str.py
index 39aa56ccd7834..6372df5d37b13 100644
--- a/tests/micropython/heapalloc_str.py
+++ b/tests/micropython/heapalloc_str.py
@@ -1,5 +1,12 @@
 # String operations which don't require allocation
-import micropython
+
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 micropython.heap_lock()
 
diff --git a/tests/micropython/heapalloc_super.py b/tests/micropython/heapalloc_super.py
index 51afae3d83d06..6839eee330acd 100644
--- a/tests/micropython/heapalloc_super.py
+++ b/tests/micropython/heapalloc_super.py
@@ -1,5 +1,12 @@
 # test super() operations which don't require allocation
-import micropython
+
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 # Check for stackless build, which can't call functions without
 # allocating a frame on heap.
diff --git a/tests/micropython/heapalloc_traceback.py b/tests/micropython/heapalloc_traceback.py
index 4c5f99afeeb44..5ded8c5f0c62e 100644
--- a/tests/micropython/heapalloc_traceback.py
+++ b/tests/micropython/heapalloc_traceback.py
@@ -1,10 +1,9 @@
 # test that we can generate a traceback without allocating
 
-import micropython
 import sys
 
 try:
-    import io
+    import io, micropython
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/micropython/heapalloc_traceback.py.exp b/tests/micropython/heapalloc_traceback.py.exp
index 71929db93d5c1..e0799aa2b3544 100644
--- a/tests/micropython/heapalloc_traceback.py.exp
+++ b/tests/micropython/heapalloc_traceback.py.exp
@@ -1,5 +1,5 @@
 StopIteration
 Traceback (most recent call last):
-  File  , line 25, in test
+  File  , line 24, in test
 StopIteration: 
 
diff --git a/tests/micropython/heapalloc_yield_from.py b/tests/micropython/heapalloc_yield_from.py
index 950717189087d..9d4f8c6940f16 100644
--- a/tests/micropython/heapalloc_yield_from.py
+++ b/tests/micropython/heapalloc_yield_from.py
@@ -1,6 +1,12 @@
 # Check that yield-from can work without heap allocation
 
-import micropython
+try:
+    import micropython
+
+    micropython.heap_lock
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
 
 
 # Yielding from a function generator
diff --git a/tests/micropython/kbd_intr.py b/tests/micropython/kbd_intr.py
index 81977aaa52f6f..e1ed7185ef0a2 100644
--- a/tests/micropython/kbd_intr.py
+++ b/tests/micropython/kbd_intr.py
@@ -1,10 +1,10 @@
 # test the micropython.kbd_intr() function
 
-import micropython
-
 try:
+    import micropython
+
     micropython.kbd_intr
-except AttributeError:
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/micropython/meminfo.py b/tests/micropython/meminfo.py
index 957f061f1539a..f4dd8fdb6042c 100644
--- a/tests/micropython/meminfo.py
+++ b/tests/micropython/meminfo.py
@@ -1,9 +1,10 @@
 # tests meminfo functions in micropython module
 
-import micropython
+try:
+    import micropython
 
-# these functions are not always available
-if not hasattr(micropython, "mem_info"):
+    micropython.mem_info
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/micropython/memstats.py b/tests/micropython/memstats.py
index 33204d908c626..0e2e7b1c0b326 100644
--- a/tests/micropython/memstats.py
+++ b/tests/micropython/memstats.py
@@ -1,9 +1,10 @@
 # tests meminfo functions in micropython module
 
-import micropython
+try:
+    import micropython
 
-# these functions are not always available
-if not hasattr(micropython, "mem_total"):
+    micropython.mem_total
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/micropython/opt_level.py b/tests/micropython/opt_level.py
index dd5493a7a3cb8..789197d8825bf 100644
--- a/tests/micropython/opt_level.py
+++ b/tests/micropython/opt_level.py
@@ -1,4 +1,10 @@
-import micropython as micropython
+# test micropython.opt_level()
+
+try:
+    import micropython
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # check we can get and set the level
 micropython.opt_level(0)
diff --git a/tests/micropython/opt_level_lineno.py b/tests/micropython/opt_level_lineno.py
index dda9092d868cf..fcfbe8643da1e 100644
--- a/tests/micropython/opt_level_lineno.py
+++ b/tests/micropython/opt_level_lineno.py
@@ -1,4 +1,10 @@
-import micropython as micropython
+# test micropython.opt_level() and line numbers
+
+try:
+    import micropython
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # check that level 3 doesn't store line numbers
 # the expected output is that any line is printed as "line 1"
diff --git a/tests/micropython/ringio.py b/tests/micropython/ringio.py
index 4109288798448..d82c04565bd97 100644
--- a/tests/micropython/ringio.py
+++ b/tests/micropython/ringio.py
@@ -1,10 +1,10 @@
 # Check that micropython.RingIO works correctly.
 
-import micropython
-
 try:
+    import micropython
+
     micropython.RingIO
-except AttributeError:
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/micropython/ringio_async.py b/tests/micropython/ringio_async.py
index 2a4befc352766..0db146451c964 100644
--- a/tests/micropython/ringio_async.py
+++ b/tests/micropython/ringio_async.py
@@ -1,9 +1,7 @@
 # Check that micropython.RingIO works correctly with asyncio.Stream.
 
-import micropython
-
 try:
-    import asyncio
+    import asyncio, micropython
 
     asyncio.StreamWriter
     micropython.RingIO
diff --git a/tests/micropython/ringio_big.py b/tests/micropython/ringio_big.py
index d55c4c00b7c0d..ddbbae12a630c 100644
--- a/tests/micropython/ringio_big.py
+++ b/tests/micropython/ringio_big.py
@@ -1,10 +1,10 @@
 # Check that micropython.RingIO works correctly.
 
-import micropython
-
 try:
+    import micropython
+
     micropython.RingIO
-except AttributeError:
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/micropython/schedule.py b/tests/micropython/schedule.py
index 6a91459ea3d54..f3dd32661267b 100644
--- a/tests/micropython/schedule.py
+++ b/tests/micropython/schedule.py
@@ -1,10 +1,10 @@
 # test micropython.schedule() function
 
-import micropython
-
 try:
+    import micropython
+
     micropython.schedule
-except AttributeError:
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/micropython/stack_use.py b/tests/micropython/stack_use.py
index 640bb8b2f38cf..5d36fdca2fe01 100644
--- a/tests/micropython/stack_use.py
+++ b/tests/micropython/stack_use.py
@@ -1,7 +1,10 @@
 # tests stack_use function in micropython module
-import micropython
 
-if not hasattr(micropython, "stack_use"):
+try:
+    import micropython
+
+    micropython.stack_use
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 

From dcbda765d1dc654cdcba06e0a01649256330794e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Oct 2025 12:21:27 +1000
Subject: [PATCH 2901/3129] py/modmath: Make MICROPY_PY_MATH_POW_FIX_NAN also
 fix pow(x, NaN) cases.

This is needed by the zephyr port.  Combining it with the existing
`MICROPY_PY_MATH_POW_FIX_NAN` option should be safe, and eliminates the
need for a separate option.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modmath.c  | 6 +++++-
 py/mpconfig.h | 1 +
 py/objfloat.c | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/py/modmath.c b/py/modmath.c
index 919a8ccd9d3c0..045c842150e44 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -99,12 +99,16 @@ mp_float_t MICROPY_FLOAT_C_FUN(log2)(mp_float_t 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) {
+mp_float_t MICROPY_FLOAT_C_FUN(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);
     }
+    // pow(base, NaN) returns NaN for any other value of base
+    if (isnan(y)) {
+        return y;
+    }
     return MICROPY_FLOAT_C_FUN(pow)(x, y);
 }
 MATH_FUN_2(pow, pow_func)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 45178034ac91e..a6a21dd1c0899 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1559,6 +1559,7 @@ typedef time_t mp_timestamp_t;
 #endif
 
 // Whether to provide fix for pow(1, NaN) and pow(NaN, 0), which both should be 1 not NaN.
+// Also fixes pow(base, NaN) to return NaN for other values of base.
 #ifndef MICROPY_PY_MATH_POW_FIX_NAN
 #define MICROPY_PY_MATH_POW_FIX_NAN (0)
 #endif
diff --git a/py/objfloat.c b/py/objfloat.c
index 125b576fb61c3..b0ad70de4a3e8 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -301,6 +301,10 @@ mp_obj_t mp_obj_float_binary_op(mp_binary_op_t op, mp_float_t lhs_val, mp_obj_t
                 lhs_val = MICROPY_FLOAT_CONST(1.0);
                 break;
             }
+            if (isnan(rhs_val)) {
+                lhs_val = rhs_val;
+                break;
+            }
             #endif
             lhs_val = MICROPY_FLOAT_C_FUN(pow)(lhs_val, rhs_val);
             break;

From 798173dce521e3fe6c25933296a09f8e59478c2d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Oct 2025 12:22:48 +1000
Subject: [PATCH 2902/3129] zephyr/mpconfigport: Enable
 MICROPY_PY_MATH_POW_FIX_NAN.

This is needed because zephyr incorrectly has `pow(-1, NaN) = 1`.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/mpconfigport.h         | 1 +
 ports/zephyr/mpconfigport_minimal.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index f6b78e64f0c5c..6f55b0d788072 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -61,6 +61,7 @@
 #define MICROPY_PY_BUILTINS_HELP_TEXT zephyr_help_text
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
+#define MICROPY_PY_MATH_POW_FIX_NAN (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
 #define MICROPY_PY_MACHINE_I2C      (1)
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index c802ba5254042..2744119204443 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -50,6 +50,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_PY_MATH_POW_FIX_NAN (1)
 
 // These features are enabled to get the test suite passing.
 #define MICROPY_FULL_CHECKS         (1)

From 957e6b05e69524d1b03f3ccb446b433085a4de8e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 19:26:19 +1000
Subject: [PATCH 2903/3129] tools/ci.sh: Enable all possible tests on zephyr
 CI.

With the recent improvements to the test suite, and fixes for `pow`, the
full test suite can now be run (and appropriate tests will be automatically
skipped).

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index f55b004c45c15..b10f3d12dcc3c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -983,9 +983,7 @@ function ci_zephyr_build {
 
 function ci_zephyr_run_tests {
     docker exec zephyr-ci west build -p auto -b qemu_cortex_m3 -- -DCONF_FILE=prj_minimal.conf
-    # Issues with zephyr tests:
-    # - inf_nan_arith fails pow(-1, nan) test
-    (cd tests && ./run-tests.py -t execpty:"qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -monitor null -serial pty -kernel ../ports/zephyr/build/zephyr/zephyr.elf" -d basics float --exclude inf_nan_arith)
+    (cd tests && ./run-tests.py -t execpty:"qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -monitor null -serial pty -kernel ../ports/zephyr/build/zephyr/zephyr.elf")
 }
 
 ########################################################################################

From 7373cbba6b6f32476fc68a40a11fcba1cf1c7d3c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 19:26:34 +1000
Subject: [PATCH 2904/3129] tests/import: Skip import tests where needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/import/builtin_ext.py       | 6 ++++++
 tests/import/import_broken.py     | 6 ++++++
 tests/import/import_file.py       | 4 ++++
 tests/import/import_pkg9.py       | 2 +-
 tests/import/import_star_error.py | 5 +++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/tests/import/builtin_ext.py b/tests/import/builtin_ext.py
index 87465f1d5931a..aecbbb2639a30 100644
--- a/tests/import/builtin_ext.py
+++ b/tests/import/builtin_ext.py
@@ -1,3 +1,9 @@
+try:
+    import uos, utime
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
 # Verify that sys is a builtin.
 import sys
 
diff --git a/tests/import/import_broken.py b/tests/import/import_broken.py
index 3c7cf4a498528..440922157ef10 100644
--- a/tests/import/import_broken.py
+++ b/tests/import/import_broken.py
@@ -1,3 +1,9 @@
+try:
+    Exception.__class__
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
 import sys, pkg
 
 # Modules we import are usually added to sys.modules.
diff --git a/tests/import/import_file.py b/tests/import/import_file.py
index 90ec4e41e77aa..4cf307641c62d 100644
--- a/tests/import/import_file.py
+++ b/tests/import/import_file.py
@@ -1,3 +1,7 @@
+if "__file__" not in globals():
+    print("SKIP")
+    raise SystemExit
+
 import import1b
 
 print(import1b.__file__)
diff --git a/tests/import/import_pkg9.py b/tests/import/import_pkg9.py
index 4de028494f1a2..c2e0b618b6969 100644
--- a/tests/import/import_pkg9.py
+++ b/tests/import/import_pkg9.py
@@ -13,4 +13,4 @@
 import pkg9.mod2
 
 pkg9.mod1()
-print(pkg9.mod2.__name__, type(pkg9.mod2).__name__)
+print(pkg9.mod2.__name__, type(pkg9.mod2))
diff --git a/tests/import/import_star_error.py b/tests/import/import_star_error.py
index 9e1757b6ef5a2..73d9c863d6f51 100644
--- a/tests/import/import_star_error.py
+++ b/tests/import/import_star_error.py
@@ -1,5 +1,10 @@
 # test errors with import *
 
+if not hasattr(object, "__init__"):
+    # target doesn't have MICROPY_CPYTHON_COMPAT enabled, so doesn't check for "import *"
+    print("SKIP")
+    raise SystemExit
+
 # 'import *' is not allowed in function scope
 try:
     exec("def foo(): from x import *")

From cd6d9387105e5fca9764283e4b3b27b3b83d37ce Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Sep 2025 19:33:26 +1000
Subject: [PATCH 2905/3129] tests/extmod/asyncio_heaplock.py: Improve skip
 detection of test.

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

diff --git a/tests/extmod/asyncio_heaplock.py b/tests/extmod/asyncio_heaplock.py
index 8326443f0e6c5..9e9908de1cb6a 100644
--- a/tests/extmod/asyncio_heaplock.py
+++ b/tests/extmod/asyncio_heaplock.py
@@ -4,7 +4,11 @@
 # - StreamWriter.write, stream is blocked and data to write is a bytes object
 # - StreamWriter.write, when stream is not blocked
 
-import micropython
+try:
+    import asyncio, micropython
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 # strict stackless builds can't call functions without allocating a frame on the heap
 try:
@@ -24,12 +28,6 @@ def f(x):
     print("SKIP")
     raise SystemExit
 
-try:
-    import asyncio
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
 
 class TestStream:
     def __init__(self, blocked):

From 110bff9422701fde392e626d1c60f7c933bf7794 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Sep 2025 13:01:10 +1000
Subject: [PATCH 2906/3129] tests/run-tests.py: Don't include cmdline,io tests
 for minimal targets.

The unix minimal variant cannot run these tests because:
- it doesn't support -v -v debug printing
- it doesn't have `open()`

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 0672be771e977..404378b7946f4 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1469,11 +1469,9 @@ def main():
                 test_dirs += (port_specific_test_dir,)
             if args.platform in PC_PLATFORMS:
                 # run PC tests
-                test_dirs += (
-                    "import",
-                    "io",
-                    "cmdline",
-                )
+                test_dirs += ("import",)
+                if args.build != "minimal":
+                    test_dirs += ("cmdline", "io")
         else:
             # run tests from these directories
             test_dirs = args.test_dirs

From 1b9a9dde2d9dfc3e6dce7c69a93a54479101963c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Sep 2025 13:02:18 +1000
Subject: [PATCH 2907/3129] tests/basics/subclass_native_init.py: Skip if
 __init__ not supported.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/subclass_native_init.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/basics/subclass_native_init.py b/tests/basics/subclass_native_init.py
index 64167fa037e0c..102befd551fad 100644
--- a/tests/basics/subclass_native_init.py
+++ b/tests/basics/subclass_native_init.py
@@ -1,5 +1,9 @@
 # test subclassing a native type and overriding __init__
 
+if not hasattr(object, "__init__"):
+    print("SKIP")
+    raise SystemExit
+
 # overriding list.__init__()
 class L(list):
     def __init__(self, a, b):

From 1a96f72b5b81e15355526fe933bed92863cec77b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Sep 2025 13:05:46 +1000
Subject: [PATCH 2908/3129] tests/run-tests.py: Update list of tests that use
 float.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 404378b7946f4..82a6a3d972454 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -229,6 +229,36 @@ def open(self, path, mode):
     ),
 }
 
+# These tests don't test float explicitly but rather use it to perform the test.
+tests_requiring_float = (
+    "extmod/asyncio_basic.py",
+    "extmod/asyncio_basic2.py",
+    "extmod/asyncio_cancel_task.py",
+    "extmod/asyncio_event.py",
+    "extmod/asyncio_fair.py",
+    "extmod/asyncio_gather.py",
+    "extmod/asyncio_gather_notimpl.py",
+    "extmod/asyncio_get_event_loop.py",
+    "extmod/asyncio_iterator_event.py",
+    "extmod/asyncio_lock.py",
+    "extmod/asyncio_task_done.py",
+    "extmod/asyncio_wait_for.py",
+    "extmod/asyncio_wait_for_fwd.py",
+    "extmod/asyncio_wait_for_linked_task.py",
+    "extmod/asyncio_wait_task.py",
+    "extmod/json_dumps_float.py",
+    "extmod/json_loads_float.py",
+    "extmod/random_extra_float.py",
+    "extmod/select_poll_eintr.py",
+    "extmod/tls_threads.py",
+    "extmod/uctypes_le_float.py",
+    "extmod/uctypes_native_float.py",
+    "extmod/uctypes_sizeof_float.py",
+    "misc/rge_sm.py",
+    "ports/unix/ffi_float.py",
+    "ports/unix/ffi_float2.py",
+)
+
 # These tests don't test slice explicitly but rather use it to perform the test.
 tests_requiring_slice = (
     "basics/builtin_range.py",
@@ -907,13 +937,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             skip_tests.add("misc/sys_settrace_features.py")
 
     if args.float_prec == 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/json_dumps_float.py")
-        skip_tests.add("extmod/json_loads_float.py")
-        skip_tests.add("extmod/random_extra_float.py")
-        skip_tests.add("misc/rge_sm.py")
+        skip_tests.update(tests_requiring_float)
     if args.float_prec < 32:
         skip_tests.add(
             "float/float2int_intbig.py"

From 9b5e20dc20b54df432460d81a3a6189f6d601226 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Sep 2025 13:40:48 +1000
Subject: [PATCH 2909/3129] tests/stress/bytecode_limit.py: Tweak to run on
 minimal builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/stress/bytecode_limit.py     | 18 ++++++++++++++----
 tests/stress/bytecode_limit.py.exp |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/stress/bytecode_limit.py b/tests/stress/bytecode_limit.py
index 948d7668da551..0a72b66fa05b6 100644
--- a/tests/stress/bytecode_limit.py
+++ b/tests/stress/bytecode_limit.py
@@ -1,19 +1,29 @@
 # Test the limits of bytecode generation.
 
+import sys
+
+# Tune the test parameters based on the target's bytecode generator.
+if hasattr(sys.implementation, "_mpy"):
+    # Target can load .mpy files so generated bytecode uses 1 byte per qstr.
+    number_of_body_copies = (433, 432, 431, 399)
+else:
+    # Target can't load .mpy files so generated bytecode uses 2 bytes per qstr.
+    number_of_body_copies = (401, 400, 399, 398)
+
 body = " with f()()() as a:\n  try:\n   f()()()\n  except Exception:\n   pass\n"
 
 # Test overflow of jump offset.
 # Print results at the end in case an intermediate value of n fails with MemoryError.
 results = []
-for n in (433, 432, 431, 430):
+for n in number_of_body_copies:
     try:
         exec("cond = 0\nif cond:\n" + body * n + "else:\n print('cond false')\n")
-        results.append((n, "ok"))
+        results.append("ok")
     except MemoryError:
         print("SKIP")
         raise SystemExit
-    except RuntimeError:
-        results.append((n, "RuntimeError"))
+    except RuntimeError as er:
+        results.append(repr(er))
 print(results)
 
 # Test changing size of code info (source line/bytecode mapping) due to changing
diff --git a/tests/stress/bytecode_limit.py.exp b/tests/stress/bytecode_limit.py.exp
index cda52b1b97348..50511665f0076 100644
--- a/tests/stress/bytecode_limit.py.exp
+++ b/tests/stress/bytecode_limit.py.exp
@@ -1,4 +1,4 @@
 cond false
 cond false
-[(433, 'RuntimeError'), (432, 'RuntimeError'), (431, 'ok'), (430, 'ok')]
+["RuntimeError('bytecode overflow',)", "RuntimeError('bytecode overflow',)", 'ok', 'ok']
 [123]

From 9a37e2feb93079dc3154db3f891d21e4fd80b0fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Sep 2025 13:41:10 +1000
Subject: [PATCH 2910/3129] tests/ports/unix: Improve skip detection for
 os.getenv and time module.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/ports/unix/mod_os.py                | 3 +++
 tests/ports/unix/time_mktime_localtime.py | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/ports/unix/mod_os.py b/tests/ports/unix/mod_os.py
index f69fa45b2b22a..468f6badd1e75 100644
--- a/tests/ports/unix/mod_os.py
+++ b/tests/ports/unix/mod_os.py
@@ -1,6 +1,9 @@
 # This module is not entirely compatible with CPython
 import os
 
+if not hasattr(os, "getenv"):
+    print("SKIP")
+    raise SystemExit
 
 os.putenv("TEST_VARIABLE", "TEST_VALUE")
 
diff --git a/tests/ports/unix/time_mktime_localtime.py b/tests/ports/unix/time_mktime_localtime.py
index d1c03c103d704..df5d6cda690a2 100644
--- a/tests/ports/unix/time_mktime_localtime.py
+++ b/tests/ports/unix/time_mktime_localtime.py
@@ -1,4 +1,8 @@
-import time
+try:
+    import time
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 DAYS_PER_MONTH = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 

From 7db50ccf5fd0932bacd40436c44d3283e1441d61 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Oct 2025 15:17:13 +1000
Subject: [PATCH 2911/3129] tests/basics: Skip exception_chain and
 self_type_check on unix minimal.

These two tests can't run on the unix minimal build because it doesn't have
the relevant build options enabled.  So skip them.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/exception_chain.py | 7 +++++++
 tests/basics/self_type_check.py | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/tests/basics/exception_chain.py b/tests/basics/exception_chain.py
index 14dd6dfbade8e..cf19f049500da 100644
--- a/tests/basics/exception_chain.py
+++ b/tests/basics/exception_chain.py
@@ -1,6 +1,13 @@
 # Exception chaining is not supported, but check that basic
 # exception works as expected.
 
+import sys
+
+# The unix minimal build doesn't enable MICROPY_WARNINGS (required for this test).
+if getattr(sys.implementation, "_build", None) == "minimal":
+    print("SKIP")
+    raise SystemExit
+
 try:
     raise Exception from None
 except Exception:
diff --git a/tests/basics/self_type_check.py b/tests/basics/self_type_check.py
index 947e362cdbd78..c182afd783d60 100644
--- a/tests/basics/self_type_check.py
+++ b/tests/basics/self_type_check.py
@@ -1,5 +1,13 @@
 # make sure type of first arg (self) to a builtin method is checked
 
+import sys
+
+# Minimal builds usually don't enable MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG,
+# which is required for this test.
+if getattr(sys.implementation, "_build", None) == "minimal":
+    print("SKIP")
+    raise SystemExit
+
 list.append
 
 try:

From 688016c6a2e75e062c4b55fe1f50e40db9252ba6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Sep 2025 13:41:35 +1000
Subject: [PATCH 2912/3129] unix/variants/minimal: Enable C stack checking.

This unix minimal variant already has a few other things enabled beyond the
default minimal configuration, and C-stack checking is arguably more
important than those, so enable it.  This helps to get some of the stress
tests passing on this variant.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/minimal/mpconfigvariant.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 2edac41c7fd12..0e280a8f73058 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -49,6 +49,7 @@
 #define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
 #define MICROPY_ENABLE_COMPILER (1)
 #define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
+#define MICROPY_STACK_CHECK (1)
 #define MICROPY_FULL_CHECKS (1)
 #define MICROPY_HELPER_REPL (1)
 #define MICROPY_KBD_EXCEPTION (1)

From b2871e0d0aec0c3783fe4bad215fbd8a4d88e5fe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Sep 2025 13:43:18 +1000
Subject: [PATCH 2913/3129] tools/ci.sh: Enable the full test suite for unix
 minimal variant.

With all the preceeding improvements to the test suite, it's now possible
to just run `make VARIANT=minimal test` -- which is equivalent to just
`./run-tests.py` -- on the unix minimal variant.

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 b10f3d12dcc3c..a5555647bd7bb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -631,7 +631,7 @@ function ci_unix_minimal_build {
 }
 
 function ci_unix_minimal_run_tests {
-    (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)
+    make -C ports/unix VARIANT=minimal test
 }
 
 function ci_unix_standard_build {

From 7ef47ef98d8b98f9c2786e8d58a0307f59dceebb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 Sep 2024 17:46:59 +1000
Subject: [PATCH 2914/3129] tests/serial_test.py: Add test for serial
 throughput.

This is a test script used to test USB CDC (or USB UART) serial reliability
and throughput.

Run against any MicroPython remote target with:

    $ python serial_test.py -t <device>

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/README.md      |  12 ++
 tests/serial_test.py | 263 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)
 create mode 100755 tests/serial_test.py

diff --git a/tests/README.md b/tests/README.md
index 676e9d8320581..534e7e0a05972 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -203,6 +203,18 @@ internal_bench/bytebuf:
 1 tests performed (3 individual testcases)
 ```
 
+## Serial reliability and performance test
+
+Serial port reliability and performance can be tested using the `serial_test.py` script.
+Pass the name of the port to test against, for example:
+
+    $ ./serial_test.py -t /dev/ttyACM0
+
+If no port is specified then `/dev/ttyACM0` is used as the default.
+
+The test will send data out to the target, and receive data from the target, in various
+chunk sizes.  The throughput of the serial connection will be reported for each sub-test.
+
 ## Test key/certificates
 
 SSL/TLS tests in `multi_net` and `net_inet` use self-signed key/cert pairs
diff --git a/tests/serial_test.py b/tests/serial_test.py
new file mode 100755
index 0000000000000..1baa2282a0ab9
--- /dev/null
+++ b/tests/serial_test.py
@@ -0,0 +1,263 @@
+#!/usr/bin/env python
+#
+# Performance and reliability test for serial port communication.
+#
+# Basic usage:
+#   serial_test.py [-t serial-device]
+#
+# The `serial-device` will default to /dev/ttyACM0.
+
+import argparse
+import serial
+import sys
+import time
+
+run_tests_module = __import__("run-tests")
+
+read_test_script = """
+bin = True
+try:
+    wr=__import__("pyb").USB_VCP(0).send
+except:
+    import sys
+    if hasattr(sys.stdout,'buffer'):
+        wr=sys.stdout.buffer.write
+    else:
+        wr=sys.stdout.write
+        bin = False
+b=bytearray(%u)
+if bin:
+    wr('BIN')
+    for i in range(len(b)):
+        b[i] = i & 0xff
+else:
+    wr('TXT')
+    for i in range(len(b)):
+        b[i] = 0x20 + (i & 0x3f)
+for _ in range(%d):
+    wr(b)
+"""
+
+
+write_test_script_verified = """
+import sys
+try:
+    rd=__import__("pyb").USB_VCP(0).recv
+except:
+    rd=sys.stdin.readinto
+b=bytearray(%u)
+for _ in range(%u):
+    n = rd(b)
+    fail = 0
+    for i in range(n):
+        if b[i] != 32 + (i & 0x3f):
+            fail += 1
+    if fail:
+        sys.stdout.write(b'ER%%05u' %% fail)
+    else:
+        sys.stdout.write(b'OK%%05u' %% n)
+"""
+
+write_test_script_unverified = """
+import sys
+try:
+    rd=__import__("pyb").USB_VCP(0).recv
+except:
+    rd=sys.stdin.readinto
+b=bytearray(%u)
+for _ in range(%u):
+    n = rd(b)
+    if n != len(b):
+        sys.stdout.write(b'ER%%05u' %% n)
+    else:
+        sys.stdout.write(b'OK%%05u' %% n)
+"""
+
+
+class TestError(Exception):
+    pass
+
+
+def drain_input(ser):
+    time.sleep(0.1)
+    while ser.inWaiting() > 0:
+        data = ser.read(ser.inWaiting())
+        time.sleep(0.1)
+
+
+def send_script(ser, script):
+    chunk_size = 32
+    for i in range(0, len(script), chunk_size):
+        ser.write(script[i : i + chunk_size])
+        time.sleep(0.01)
+    ser.write(b"\x04")  # eof
+    ser.flush()
+    response = ser.read(2)
+    if response != b"OK":
+        response += ser.read(ser.inWaiting())
+        raise TestError("could not send script", response)
+
+
+def read_test(ser_repl, ser_data, bufsize, nbuf):
+    global test_passed
+
+    assert bufsize % 256 == 0  # for verify to work
+
+    # Load and run the read_test_script.
+    ser_repl.write(b"\x03\x01\x04")  # break, raw-repl, soft-reboot
+    drain_input(ser_repl)
+    script = bytes(read_test_script % (bufsize, nbuf), "ascii")
+    send_script(ser_repl, script)
+
+    # Read from the device the type of data that it will send (BIN or TXT).
+    data_type = ser_data.read(3)
+
+    # Read data from the device, check it is correct, and measure throughput.
+    n = 0
+    last_byte = None
+    t_start = time.time()
+    remain = nbuf * bufsize
+    total_data = bytearray(remain)
+    while remain:
+        t0 = time.monotonic_ns()
+        while ser_data.inWaiting() == 0:
+            if time.monotonic_ns() - t0 > 1e9:
+                # timeout waiting for data from device
+                break
+            time.sleep(0.0001)
+        if not ser_data.inWaiting():
+            test_passed = False
+            print("ERROR: timeout waiting for data")
+            print(total_data[:n])
+            return 0
+        to_read = min(ser_data.inWaiting(), remain)
+        data = ser_data.read(to_read)
+        remain -= len(data)
+        print(f"{n} / {nbuf * bufsize}", end="\r")
+        total_data[n : n + len(data)] = data
+        n += len(data)
+    t_end = time.time()
+    for i in range(0, len(total_data)):
+        if data_type == b"BIN":
+            wanted = i & 0xFF
+        else:
+            wanted = 0x20 + (i & 0x3F)
+        if total_data[i] != wanted:
+            test_passed = False
+            print("ERROR: data mismatch:", i, wanted, total_data[i])
+    ser_repl.write(b"\x03")  # break
+    t = t_end - t_start
+
+    # Print results.
+    print(
+        "DATA IN: bufsize=%u, read %u bytes in %.2f msec = %.2f kibytes/sec = %.2f MBits/sec"
+        % (bufsize, n, t * 1000, n / 1024 / t, n * 8 / 1000000 / t)
+    )
+
+    return n / t
+
+
+def write_test(ser_repl, ser_data, bufsize, nbuf, verified):
+    global test_passed
+
+    # Load and run the write_test_script.
+    ser_repl.write(b"\x03\x01\x04")  # break, raw-repl, soft-reboot
+    drain_input(ser_repl)
+    if verified:
+        script = write_test_script_verified
+    else:
+        script = write_test_script_unverified
+    script = bytes(script % (bufsize, nbuf), "ascii")
+    send_script(ser_repl, script)
+    drain_input(ser_repl)
+
+    # Write data to the device, check it is correct, and measure throughput.
+    n = 0
+    t_start = time.time()
+    buf = bytearray(bufsize)
+    for i in range(len(buf)):
+        buf[i] = 32 + (i & 0x3F)  # don't want to send ctrl chars!
+    for i in range(nbuf):
+        ser_data.write(buf)
+        n += len(buf)
+        print(f"{n} / {nbuf * bufsize}", end="\r")
+        response = ser_repl.read(7)
+        if response != b"OK%05u" % bufsize:
+            test_passed = False
+            print("ERROR: bad response, expecting OK%05u, got %r" % (bufsize, response))
+    t_end = time.time()
+    ser_repl.write(b"\x03")  # break
+    t = t_end - t_start
+
+    # Print results.
+    print(
+        "DATA OUT: verify=%d, bufsize=%u, wrote %u bytes in %.2f msec = %.2f kibytes/sec = %.2f MBits/sec"
+        % (verified, bufsize, n, t * 1000, n / 1024 / t, n * 8 / 1000000 / t)
+    )
+
+    return n / t
+
+
+def do_test(dev_repl, dev_data=None, time_per_subtest=1):
+    if dev_data is None:
+        print("REPL and data on", dev_repl)
+        ser_repl = serial.Serial(dev_repl, baudrate=115200, timeout=1)
+        ser_data = ser_repl
+    else:
+        print("REPL on", dev_repl)
+        print("data on", dev_data)
+        ser_repl = serial.Serial(dev_repl, baudrate=115200, timeout=1)
+        ser_data = serial.Serial(dev_data, baudrate=115200, timeout=1)
+
+    for test_func, test_args, bufsize in (
+        (read_test, (), 256),
+        (write_test, (True,), 128),
+        (write_test, (False,), 128),
+    ):
+        nbuf = 128
+        while bufsize <= 16384:
+            rate = test_func(ser_repl, ser_data, bufsize, nbuf, *test_args)
+            bufsize *= 2
+            if rate:
+                # Adjust the amount of data based on the rate, to keep each subtest
+                # at around time_per_subtest seconds long.
+                nbuf = max(min(128, int(rate * time_per_subtest / bufsize)), 1)
+
+    ser_repl.close()
+    ser_data.close()
+
+
+def main():
+    global test_passed
+
+    cmd_parser = argparse.ArgumentParser(
+        description="Test performance and reliability of serial port communication.",
+        epilog=run_tests_module.test_instance_epilog,
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
+    cmd_parser.add_argument(
+        "-t",
+        "--test-instance",
+        default="a0",
+        help="MicroPython instance to test",
+    )
+    cmd_parser.add_argument(
+        "--time-per-subtest", default="1", help="approximate time to take per subtest (in seconds)"
+    )
+    args = cmd_parser.parse_args()
+
+    dev_repl = run_tests_module.convert_device_shortcut_to_real_device(args.test_instance)
+
+    test_passed = True
+    try:
+        do_test(dev_repl, None, float(args.time_per_subtest))
+    except TestError as er:
+        test_passed = False
+        print("ERROR:", er)
+
+    if not test_passed:
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

From 3546f23143ed7fee66cf873dd224082d0cc424cb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 3 Sep 2025 09:54:07 +0200
Subject: [PATCH 2915/3129] esp32/machine_i2c: Update to support both v1 and v2
 of the IDF driver.

Support both the legacy ESP-IDF I2C driver (driver/i2c.h) and the new
driver/i2c_master.h API for all ESP32-series SoCs.  This is controlled by
the new config option MICROPY_HW_ESP_NEW_I2C_DRIVER, which is disabled by
default.

There is a small change to the legacy variant, which shows now as well freq
and timeout_us in the print() method.

Open issues with the new driver:

- No control of the stop=True|False option. stop is always assumed to
  be True. An issue is raised at the esp-idf repository for it.

- Separate call to probe the address at fixed 100kHz. The need is caused
  by the fact, that NACK on an address is considered as an hard error.
  According to espressif's issue tracker this is already changed for
  v6.x and will be backported to earlier versions. So we may see it in
  a version after V5.5.1 or in a version 5.4.3. There is code in
  comments to support zero-length writes.

Original patch for the v2 driver by Vincent1-python <pywei201209@163.com>.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/esp32/machine_i2c.c  | 245 ++++++++++++++++++++++++++++++++-----
 ports/esp32/mpconfigport.h |   3 +
 2 files changed, 216 insertions(+), 32 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index a9e5f0d3b32cb..e8d913def9392 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2025 Vincent1-python
  *
  * 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,11 +31,196 @@
 #include "extmod/modmachine.h"
 #include "machine_i2c.h"
 
+#if MICROPY_HW_ESP_NEW_I2C_DRIVER
+#include "driver/i2c_master.h"
+#else
 #include "driver/i2c.h"
 #include "hal/i2c_ll.h"
+#endif
 
 #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 
+#define I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
+
+// CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK is set if the related sdkconfig
+// option is set.
+
+#if MICROPY_HW_ESP_NEW_I2C_DRIVER
+
+typedef struct _machine_hw_i2c_obj_t {
+    mp_obj_base_t base;
+    i2c_master_bus_handle_t bus_handle;
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
+    i2c_master_dev_handle_t dev_handle;
+    #endif
+    uint8_t port : 8;
+    gpio_num_t scl : 8;
+    gpio_num_t sda : 8;
+    uint32_t freq;
+    uint32_t timeout_us;
+} machine_hw_i2c_obj_t;
+
+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, bool first_init) {
+
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
+    if (!first_init && self->dev_handle) {
+        i2c_master_bus_rm_device(self->dev_handle);
+        self->dev_handle = NULL;
+    }
+    #endif
+
+    if (!first_init && self->bus_handle) {
+        i2c_del_master_bus(self->bus_handle);
+        self->bus_handle = NULL;
+    }
+
+    i2c_master_bus_config_t bus_cfg = {
+        .i2c_port = self->port,
+        .scl_io_num = self->scl,
+        .sda_io_num = self->sda,
+        .clk_source = I2C_CLK_SRC_DEFAULT,
+        .glitch_ignore_cnt = 7,
+        .flags.enable_internal_pullup = true,
+    };
+    ESP_ERROR_CHECK(i2c_new_master_bus(&bus_cfg, &self->bus_handle));
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
+    i2c_device_config_t dev_cfg = {
+        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
+        .device_address = 0,  // Will be replaced
+        .scl_speed_hz = self->freq,
+    };
+    ESP_ERROR_CHECK(i2c_master_bus_add_device(self->bus_handle, &dev_cfg, &self->dev_handle));
+    #endif
+}
+
+static uint8_t *create_transfer_buffer(size_t n, mp_machine_i2c_buf_t *bufs, size_t *len_ptr) {
+    size_t len = 0;
+    uint8_t *buf;
+    if (n == 1) {
+        // Use given single buffer
+        len = bufs[0].len;
+        buf = bufs[0].buf;
+    } else {
+        // Allocate a buffer that can hold the data from all buffers
+        len = 0;
+        for (size_t i = 0; i < n; ++i) {
+            len += bufs[i].len;
+        }
+        buf = m_new(uint8_t, len);
+    }
+    *len_ptr = len;
+    return buf;
+}
+
+int machine_hw_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags) {
+    machine_hw_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Probe the address to see if any device responds.
+    // This test uses a fixed scl freq of 100_000.
+    esp_err_t err = i2c_master_probe(self->bus_handle, addr, self->timeout_us / 1000);
+    if (err != ESP_OK) {
+        return -MP_ENODEV;   // No device at address, return immediately
+    }
+
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 5, 0)
+    // Using ".device_address = I2C_DEVICE_ADDRESS_NOT_USED," below
+    // allows to write the address separately using the
+    // i2c_master_execute_defined_operations() API.
+    i2c_device_config_t dev_cfg = {
+        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
+        .device_address = addr,
+        .scl_speed_hz = self->freq,
+    };
+    i2c_master_dev_handle_t dev_handle;
+    err = i2c_master_bus_add_device(self->bus_handle, &dev_cfg, &dev_handle);
+    #else
+    #define dev_handle self->dev_handle
+    err = i2c_master_device_change_address(dev_handle, addr, self->timeout_us / 1000);
+    #endif
+    if (err != ESP_OK) {
+        return -MP_ENODEV;
+    }
+
+    size_t len = 0;
+    uint8_t *buf;
+
+    // Assume that with MP_MACHINE_I2C_FLAG_WRITE1 set the first
+    // buffer has to be written and all others have to be read.
+    // extmod/read_mem() uses only a single buffer for reading, but
+    // the other implementation(s) support multiple buffers.
+    if (flags & MP_MACHINE_I2C_FLAG_WRITE1) {
+        // create a large buffer if needed
+        buf = create_transfer_buffer(n - 1, bufs + 1, &len);
+        // Do a write then read
+        err = i2c_master_transmit_receive(dev_handle, bufs[0].buf, bufs[0].len, buf, len, self->timeout_us / 1000);
+        // Copy the data back if needed starting with the second buffer.
+        if (n > 2) {
+            len = 0;
+            for (size_t i = 1; i < n; ++i) {
+                memcpy(bufs[i].buf, buf + len, bufs[i].len);
+                len += bufs[i].len;
+            }
+            m_del(uint8_t, buf, len);
+        }
+        len += bufs[0].len;
+    } else if (bufs->len > 0) {
+        buf = create_transfer_buffer(n, bufs, &len);
+        // Transfer data and copy it from/to the buffers as needed.
+        if (flags & MP_MACHINE_I2C_FLAG_READ) {
+            err = i2c_master_receive(dev_handle, buf, len, self->timeout_us / 1000);
+            if (n > 1) {
+                len = 0;
+                for (size_t i = 0; i < n; ++i) {
+                    memcpy(bufs[i].buf, buf + len, bufs[i].len);
+                    len += bufs[i].len;
+                }
+            }
+        } else {
+            if (n > 1) {
+                len = 0;
+                for (size_t i = 0; i < n; ++i) {
+                    memcpy(buf + len, bufs[i].buf, bufs[i].len);
+                    len += bufs[i].len;
+                }
+            }
+            err = i2c_master_transmit(dev_handle, buf, len, self->timeout_us / 1000);
+            // Use i2c_master_execute_defined_operations() instead of
+            // i2c_master_transmit(), allowing for len == 0.
+            // That will be needed for scan() when dropping i2c_master_probe() is possible,
+            // after https://github.com/espressif/esp-idf/issues/17543 backported to supported versions
+            // i2c_operation_job_t i2c_ops[] = {
+            //     { .command = I2C_MASTER_CMD_START },
+            //     { .command = I2C_MASTER_CMD_WRITE, .write = { .ack_check = true, .data = buf, .total_bytes = len } },
+            //     { .command = I2C_MASTER_CMD_STOP },  // Stop is still mandatory
+            // };
+            // err = i2c_master_execute_defined_operations(dev_handle, i2c_ops, 3, self->timeout_us / 1000);
+        }
+        if (n > 1) {
+            m_del(uint8_t, buf, len);
+        }
+    }
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 5, 0)
+    // Remove the temporary handle.
+    i2c_master_bus_rm_device(dev_handle);
+    #endif
+
+    // Map errors
+    if (err == ESP_FAIL) {
+        return -MP_ENODEV;
+    }
+    if (err == ESP_ERR_TIMEOUT) {
+        return -MP_ETIMEDOUT;
+    }
+    if (err != ESP_OK) {
+        return -abs(err);
+    }
+    return len;
+}
+
+#else
+
 #if SOC_I2C_SUPPORT_XTAL
 #if CONFIG_XTAL_FREQ > 0
 #define I2C_SCLK_FREQ (CONFIG_XTAL_FREQ * 1000000)
@@ -47,18 +233,18 @@
 #error "unsupported I2C for ESP32 SoC variant"
 #endif
 
-#define I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
-
 typedef struct _machine_hw_i2c_obj_t {
     mp_obj_base_t base;
     i2c_port_t port : 8;
     gpio_num_t scl : 8;
     gpio_num_t sda : 8;
+    uint32_t freq;
+    uint32_t timeout_us;
 } machine_hw_i2c_obj_t;
 
 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) {
+static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, bool first_init) {
     if (!first_init) {
         i2c_driver_delete(self->port);
     }
@@ -68,10 +254,10 @@ static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, uint32_t freq, uint3
         .sda_pullup_en = GPIO_PULLUP_ENABLE,
         .scl_io_num = self->scl,
         .scl_pullup_en = GPIO_PULLUP_ENABLE,
-        .master.clk_speed = freq,
+        .master.clk_speed = self->freq,
     };
     i2c_param_config(self->port, &conf);
-    int timeout = I2C_SCLK_FREQ / 1000000 * timeout_us;
+    int timeout = I2C_SCLK_FREQ / 1000000 * self->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);
 }
@@ -124,15 +310,16 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_
     return data_len;
 }
 
+
+#endif  // MICROPY_HW_ESP_NEW_I2C_DRIVER
+
 /******************************************************************************/
 // MicroPython bindings for machine API
 
 static void machine_hw_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_hw_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    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_SCLK_FREQ / (h + l));
+    mp_printf(print, "I2C(%u, scl=%u, sda=%u, freq=%u, timeout=%u)",
+        self->port, self->scl, self->sda, self->freq, self->timeout_us);
 }
 
 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) {
@@ -147,49 +334,43 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
         { MP_QSTR_id, MP_ARG_INT, {.u_int = I2C_NUM_0} },
         { 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} },
-        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = I2C_DEFAULT_TIMEOUT_US} },
+        { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout, 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);
 
-    // Get I2C bus
     mp_int_t i2c_id = args[ARG_id].u_int;
-
-    // Check if the I2C bus is valid
     if (!(I2C_NUM_0 <= i2c_id && i2c_id < I2C_NUM_MAX)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
     }
 
-    // Get static peripheral object
-    machine_hw_i2c_obj_t *self = (machine_hw_i2c_obj_t *)&machine_hw_i2c_obj[i2c_id];
+    machine_hw_i2c_obj_t *self = &machine_hw_i2c_obj[i2c_id];
 
-    bool first_init = false;
-    if (self->base.type == NULL) {
-        // Created for the first time, set default pins
+    bool first_init = (self->base.type == NULL);
+    if (first_init) {
         self->base.type = &machine_i2c_type;
         self->port = i2c_id;
-        if (self->port == I2C_NUM_0) {
-            self->scl = MICROPY_HW_I2C0_SCL;
-            self->sda = MICROPY_HW_I2C0_SDA;
-        } else {
-            self->scl = MICROPY_HW_I2C1_SCL;
-            self->sda = MICROPY_HW_I2C1_SDA;
-        }
-        first_init = true;
+        self->scl = (i2c_id == I2C_NUM_0) ? MICROPY_HW_I2C0_SCL : MICROPY_HW_I2C1_SCL;
+        self->sda = (i2c_id == I2C_NUM_0) ? MICROPY_HW_I2C0_SDA : MICROPY_HW_I2C1_SDA;
+        self->freq = 400000;
+        self->timeout_us = I2C_DEFAULT_TIMEOUT_US;
     }
 
-    // Set SCL/SDA pins if given
     if (args[ARG_scl].u_obj != MP_OBJ_NULL) {
         self->scl = machine_pin_get_id(args[ARG_scl].u_obj);
     }
     if (args[ARG_sda].u_obj != MP_OBJ_NULL) {
         self->sda = machine_pin_get_id(args[ARG_sda].u_obj);
     }
+    if (args[ARG_freq].u_int != -1) {
+        self->freq = args[ARG_freq].u_int;
+    }
+    if (args[ARG_timeout].u_int != -1) {
+        self->timeout_us = args[ARG_timeout].u_int;
+    }
 
-    // Initialise the I2C peripheral
-    machine_hw_i2c_init(self, args[ARG_freq].u_int, args[ARG_timeout].u_int, first_init);
-
+    machine_hw_i2c_init(self, first_init);
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -208,4 +389,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &mp_machine_i2c_locals_dict
     );
 
-#endif
+#endif // MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 0e62cd74823f8..4614abc3c8ddf 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -186,6 +186,9 @@
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (esp_rom_get_cpu_ticks_per_us() * 1000000 / 200) // roughly
+#ifndef MICROPY_HW_ESP_NEW_I2C_DRIVER
+#define MICROPY_HW_ESP_NEW_I2C_DRIVER       (0)
+#endif
 #define MICROPY_PY_SSL                      (1)
 #define MICROPY_SSL_MBEDTLS                 (1)
 #define MICROPY_PY_WEBSOCKET                (1)

From 7d50952c2b2d335e9b5528fe1db57fb5f0f4ef0d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Mon, 29 Sep 2025 07:57:41 -0500
Subject: [PATCH 2916/3129] all: Use "static inline" consistently in function
 definitions.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 ports/renesas-ra/ra/ra_gpio.h | 4 ++--
 ports/rp2/mutex_extra.h       | 4 ++--
 ports/stm32/dma.h             | 4 ++--
 py/cstack.h                   | 4 ++--
 py/misc.h                     | 4 ++--
 shared/tinyusb/mp_usbd.h      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ports/renesas-ra/ra/ra_gpio.h b/ports/renesas-ra/ra/ra_gpio.h
index 58df7aafe9987..5c0f9eff8db0d 100644
--- a/ports/renesas-ra/ra/ra_gpio.h
+++ b/ports/renesas-ra/ra/ra_gpio.h
@@ -171,12 +171,12 @@ 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) {
+static inline void pwpr_unprotect(void) {
     _PWPR &= (uint8_t) ~0x80;
     _PWPR |= (uint8_t)0x40;
 }
 
-inline static void pwpr_protect(void) {
+static inline void pwpr_protect(void) {
     _PWPR &= (uint8_t) ~0x40;
     _PWPR |= (uint8_t)0x80;
 }
diff --git a/ports/rp2/mutex_extra.h b/ports/rp2/mutex_extra.h
index 5f4a2c3643b46..9cef2d6b66d1f 100644
--- a/ports/rp2/mutex_extra.h
+++ b/ports/rp2/mutex_extra.h
@@ -44,11 +44,11 @@ typedef struct {
     recursive_mutex_t mutex;
 } recursive_mutex_nowait_t;
 
-inline static void recursive_mutex_nowait_init(recursive_mutex_nowait_t *mtx) {
+static inline void recursive_mutex_nowait_init(recursive_mutex_nowait_t *mtx) {
     recursive_mutex_init(&mtx->mutex);
 }
 
-inline static bool recursive_mutex_nowait_try_enter(recursive_mutex_nowait_t *mtx, uint32_t *owner_out) {
+static inline bool recursive_mutex_nowait_try_enter(recursive_mutex_nowait_t *mtx, uint32_t *owner_out) {
     return recursive_mutex_try_enter(&mtx->mutex, owner_out);
 }
 
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 75e007bc9fa98..2ef3e3f266ea3 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -205,11 +205,11 @@ void dma_unprotect_rx_region(void *dest, size_t len);
 
 #else
 
-inline static void dma_protect_rx_region(uint8_t *dest, size_t len) {
+static inline void dma_protect_rx_region(uint8_t *dest, size_t len) {
     // No-ops on targets without D-Cache.
 }
 
-inline static void dma_unprotect_rx_region(void *dest, size_t len) {
+static inline void dma_unprotect_rx_region(void *dest, size_t len) {
 
 }
 
diff --git a/py/cstack.h b/py/cstack.h
index b12a18e13fcad..bcd919d31f932 100644
--- a/py/cstack.h
+++ b/py/cstack.h
@@ -35,7 +35,7 @@
 
 void mp_cstack_init_with_sp_here(size_t stack_size);
 
-inline static void mp_cstack_init_with_top(void *top, size_t stack_size) {
+static inline void mp_cstack_init_with_top(void *top, size_t stack_size) {
     MP_STATE_THREAD(stack_top) = (char *)top;
 
     #if MICROPY_STACK_CHECK
@@ -54,7 +54,7 @@ void mp_cstack_check(void);
 
 #else
 
-inline static void mp_cstack_check(void) {
+static inline void mp_cstack_check(void) {
     // No-op when stack checking is disabled
 }
 
diff --git a/py/misc.h b/py/misc.h
index ac5e8fb0edf3b..ee33f84e8f65e 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -493,7 +493,7 @@ static inline bool mp_mul_ull_overflow(unsigned long long int x, unsigned long l
 #if __has_builtin(__builtin_saddll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
 #define mp_add_ll_overflow __builtin_saddll_overflow
 #else
-inline static bool mp_add_ll_overflow(long long int lhs, long long int rhs, long long int *res) {
+static inline bool mp_add_ll_overflow(long long int lhs, long long int rhs, long long int *res) {
     bool overflow;
 
     if (rhs > 0) {
@@ -513,7 +513,7 @@ inline static bool mp_add_ll_overflow(long long int lhs, long long int rhs, long
 #if __has_builtin(__builtin_ssubll_overflow) || MP_GCC_HAS_BUILTIN_OVERFLOW
 #define mp_sub_ll_overflow __builtin_ssubll_overflow
 #else
-inline static bool mp_sub_ll_overflow(long long int lhs, long long int rhs, long long int *res) {
+static inline bool mp_sub_ll_overflow(long long int lhs, long long int rhs, long long int *res) {
     bool overflow;
 
     if (rhs > 0) {
diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 4e3403b35690a..176b1ba507c06 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -138,7 +138,7 @@ extern const mp_obj_type_t mp_type_usb_device_builtin_default;
 extern const mp_obj_type_t mp_type_usb_device_builtin_none;
 
 // Return true if any built-in driver is enabled
-inline static bool mp_usb_device_builtin_enabled(const mp_obj_usb_device_t *usbd) {
+static inline bool mp_usb_device_builtin_enabled(const mp_obj_usb_device_t *usbd) {
     return usbd->builtin_driver != MP_OBJ_FROM_PTR(&mp_type_usb_device_builtin_none);
 }
 

From effb9503ebbf7552cec1bc788850f27076cbc132 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 28 Sep 2025 09:56:11 -0500
Subject: [PATCH 2917/3129] github/workflows: Use new ci.sh style for calling
 functions.

During CI, invoke `ci.sh` the same way we'd recommend a developer to do so
locally.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 .github/workflows/code_formatting.yml   |   4 +-
 .github/workflows/code_size.yml         |   4 +-
 .github/workflows/commit_formatting.yml |   2 +-
 .github/workflows/docs.yml              |   2 +-
 .github/workflows/mpy_format.yml        |   4 +-
 .github/workflows/ports_alif.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.yml        |  12 +--
 .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_unix.yml        | 124 ++++++++++++------------
 .github/workflows/ports_webassembly.yml |   6 +-
 .github/workflows/ports_windows.yml     |   4 +-
 .github/workflows/ports_zephyr.yml      |   8 +-
 21 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 2a7da52e26dbe..8a18ca034540c 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -13,8 +13,8 @@ jobs:
     - uses: actions/checkout@v5
     - uses: actions/setup-python@v6
     - name: Install packages
-      run: source tools/ci.sh && ci_c_code_formatting_setup
+      run: tools/ci.sh c_code_formatting_setup
     - name: Run code formatting
-      run: source tools/ci.sh && ci_c_code_formatting_run
+      run: tools/ci.sh c_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
index 8587ef0179442..34bdf744cb7ca 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -29,9 +29,9 @@ jobs:
       with:
         fetch-depth: 100
     - name: Install packages
-      run: source tools/ci.sh && ci_code_size_setup
+      run: tools/ci.sh code_size_setup
     - name: Build
-      run: source tools/ci.sh && ci_code_size_build
+      run: tools/ci.sh code_size_build
     - name: Compute code size difference
       run: tools/metrics.py diff ~/size0 ~/size1 | tee diff
     - name: Save PR number
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index 58ffb745b3434..ca63fc796b0cc 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -15,4 +15,4 @@ jobs:
         fetch-depth: 100
     - uses: actions/setup-python@v6
     - name: Check commit message formatting
-      run: source tools/ci.sh && ci_commit_formatting_run
+      run: tools/ci.sh commit_formatting_run
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 6a277a4a4f05d..aa05cfb13873b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -22,6 +22,6 @@ jobs:
     - name: Install Python packages
       run: pip install -r docs/requirements.txt
     - name: Build unix port
-      run: source tools/ci.sh && ci_unix_build_helper
+      run: tools/ci.sh unix_build_helper
     - name: Build docs
       run: make -C docs/ html
diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index 9d3cd139e68da..e692a853e7b2c 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -19,6 +19,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_mpy_format_setup
+      run: tools/ci.sh mpy_format_setup
     - name: Test mpy-tool.py
-      run: source tools/ci.sh && ci_mpy_format_test
+      run: tools/ci.sh mpy_format_test
diff --git a/.github/workflows/ports_alif.yml b/.github/workflows/ports_alif.yml
index a06b3f96ffae4..eea8f53900ebc 100644
--- a/.github/workflows/ports_alif.yml
+++ b/.github/workflows/ports_alif.yml
@@ -28,6 +28,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_alif_setup
+      run: tools/ci.sh alif_setup
     - name: Build ci_${{matrix.ci_func }}
-      run: source tools/ci.sh && ci_${{ matrix.ci_func }}
+      run: tools/ci.sh ${{ matrix.ci_func }}
diff --git a/.github/workflows/ports_cc3200.yml b/.github/workflows/ports_cc3200.yml
index b60ff370daf9d..c57309c23a6d0 100644
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@@ -23,6 +23,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_cc3200_setup
+      run: tools/ci.sh cc3200_setup
     - name: Build
-      run: source tools/ci.sh && ci_cc3200_build
+      run: tools/ci.sh cc3200_build
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index c87552ade31c3..8ee3f44d6a2e1 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -51,7 +51,7 @@ jobs:
 
     - name: Install ESP-IDF packages
       if: steps.cache_esp_idf.outputs.cache-hit != 'true'
-      run: source tools/ci.sh && ci_esp32_idf_setup
+      run: tools/ci.sh esp32_idf_setup
 
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2
@@ -59,4 +59,4 @@ jobs:
         key: esp32-${{ matrix.ci_func }}
 
     - name: Build ci_${{matrix.ci_func }}
-      run: source tools/ci.sh && ci_${{ matrix.ci_func }}
+      run: tools/ci.sh ${{ matrix.ci_func }}
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index 3293abed5980d..96cf0c5a5cd3f 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -23,6 +23,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_esp8266_setup && ci_esp8266_path >> $GITHUB_PATH
+      run: tools/ci.sh esp8266_setup && tools/ci.sh esp8266_path >> $GITHUB_PATH
     - name: Build
-      run: source tools/ci.sh && ci_esp8266_build
+      run: tools/ci.sh esp8266_build
diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
index ae9a80ec5806c..bcbaf3de066c9 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -28,6 +28,6 @@ jobs:
       with:
         path: 'micropython repo'
     - name: Install packages
-      run: source tools/ci.sh && ci_mimxrt_setup
+      run: tools/ci.sh mimxrt_setup
     - name: Build
-      run: source tools/ci.sh && ci_mimxrt_build
+      run: tools/ci.sh mimxrt_build
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
index ce86617af05ce..995f65933e0b0 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -23,6 +23,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_nrf_setup
+      run: tools/ci.sh nrf_setup
     - name: Build
-      run: source tools/ci.sh && ci_nrf_build
+      run: tools/ci.sh nrf_build
diff --git a/.github/workflows/ports_powerpc.yml b/.github/workflows/ports_powerpc.yml
index 81f71ca8a96f4..27417fb3c3cf2 100644
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@@ -23,6 +23,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_powerpc_setup
+      run: tools/ci.sh powerpc_setup
     - name: Build
-      run: source tools/ci.sh && ci_powerpc_build
+      run: tools/ci.sh powerpc_build
diff --git a/.github/workflows/ports_qemu.yml b/.github/workflows/ports_qemu.yml
index cdecfae6c9b38..b038b03e71fed 100644
--- a/.github/workflows/ports_qemu.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -32,9 +32,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_qemu_setup_arm
+      run: tools/ci.sh qemu_setup_arm
     - name: Build and run test suite ci_qemu_build_arm_${{ matrix.ci_func }}
-      run: source tools/ci.sh && ci_qemu_build_arm_${{ matrix.ci_func }}
+      run: tools/ci.sh qemu_build_arm_${{ matrix.ci_func }}
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -44,9 +44,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_qemu_setup_rv32
+      run: tools/ci.sh qemu_setup_rv32
     - name: Build and run test suite
-      run: source tools/ci.sh && ci_qemu_build_rv32
+      run: tools/ci.sh qemu_build_rv32
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -56,9 +56,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_qemu_setup_rv64
+      run: tools/ci.sh qemu_setup_rv64
     - name: Build and run test suite
-      run: source tools/ci.sh && ci_qemu_build_rv64
+      run: tools/ci.sh qemu_build_rv64
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
index bf99ed25fedae..600b8ea8046bd 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_renesas_ra_setup
+      run: tools/ci.sh renesas_ra_setup
     - name: Build
-      run: source tools/ci.sh && ci_renesas_ra_board_build
+      run: tools/ci.sh renesas_ra_board_build
 
diff --git a/.github/workflows/ports_rp2.yml b/.github/workflows/ports_rp2.yml
index 22d2a9688015f..0837c06c97bd4 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -28,6 +28,6 @@ jobs:
       with:
         path: 'micropython repo'
     - name: Install packages
-      run: source tools/ci.sh && ci_rp2_setup
+      run: tools/ci.sh rp2_setup
     - name: Build
-      run: source tools/ci.sh && ci_rp2_build
+      run: tools/ci.sh rp2_build
diff --git a/.github/workflows/ports_samd.yml b/.github/workflows/ports_samd.yml
index dbea255c79ad4..d159fde175d54 100644
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@@ -23,6 +23,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_samd_setup
+      run: tools/ci.sh samd_setup
     - name: Build
-      run: source tools/ci.sh && ci_samd_build
+      run: tools/ci.sh samd_build
diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index 43659a5d5dd5d..eae3bae871f45 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_stm32_setup
+      run: tools/ci.sh stm32_setup
     - name: Build ci_${{matrix.ci_func }}
-      run: source tools/ci.sh && ci_${{ matrix.ci_func }}
+      run: tools/ci.sh ${{ matrix.ci_func }}
 
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index eeae895f6a215..d406a912a4acd 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -25,9 +25,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Build
-      run: source tools/ci.sh && ci_unix_minimal_build
+      run: tools/ci.sh unix_minimal_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_minimal_run_tests
+      run: tools/ci.sh unix_minimal_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -37,7 +37,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Build with reproducible date
-      run: source tools/ci.sh && ci_unix_minimal_build
+      run: tools/ci.sh unix_minimal_build
       env:
         SOURCE_DATE_EPOCH: 1234567890
     - name: Check reproducible build date
@@ -48,9 +48,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Build
-      run: source tools/ci.sh && ci_unix_standard_build
+      run: tools/ci.sh unix_standard_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_standard_run_tests
+      run: tools/ci.sh unix_standard_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -60,9 +60,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Build
-      run: source tools/ci.sh && ci_unix_standard_v2_build
+      run: tools/ci.sh unix_standard_v2_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_standard_v2_run_tests
+      run: tools/ci.sh unix_standard_v2_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -77,17 +77,17 @@ jobs:
       with:
         python-version: '3.11'
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_coverage_setup
+      run: tools/ci.sh unix_coverage_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_coverage_build
+      run: tools/ci.sh unix_coverage_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_coverage_run_tests
+      run: tools/ci.sh unix_coverage_run_tests
     - name: Test merging .mpy files
-      run: source tools/ci.sh && ci_unix_coverage_run_mpy_merge_tests
+      run: tools/ci.sh unix_coverage_run_mpy_merge_tests
     - name: Build native mpy modules
-      run: source tools/ci.sh && ci_native_mpy_modules_build
+      run: tools/ci.sh 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
+      run: tools/ci.sh unix_coverage_run_native_mpy_tests
     - name: Run gcov coverage analysis
       run: |
         (cd ports/unix && gcov -o build-coverage/py ../../py/*.c || true)
@@ -107,15 +107,15 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_32bit_setup
+      run: tools/ci.sh unix_32bit_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_coverage_32bit_build
+      run: tools/ci.sh unix_coverage_32bit_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_coverage_32bit_run_tests
+      run: tools/ci.sh unix_coverage_32bit_run_tests
     - name: Build native mpy modules
-      run: source tools/ci.sh && ci_native_mpy_modules_32bit_build
+      run: tools/ci.sh 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
+      run: tools/ci.sh unix_coverage_32bit_run_native_mpy_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -125,11 +125,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_32bit_setup
+      run: tools/ci.sh unix_32bit_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_nanbox_build
+      run: tools/ci.sh unix_nanbox_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_nanbox_run_tests
+      run: tools/ci.sh unix_nanbox_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -139,11 +139,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_32bit_setup
+      run: tools/ci.sh unix_32bit_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_longlong_build
+      run: tools/ci.sh unix_longlong_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_longlong_run_tests
+      run: tools/ci.sh unix_longlong_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -153,9 +153,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Build
-      run: source tools/ci.sh && ci_unix_float_build
+      run: tools/ci.sh unix_float_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_float_run_tests
+      run: tools/ci.sh unix_float_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -165,9 +165,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Build
-      run: source tools/ci.sh && ci_unix_gil_enabled_build
+      run: tools/ci.sh unix_gil_enabled_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_gil_enabled_run_tests
+      run: tools/ci.sh unix_gil_enabled_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -177,11 +177,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_clang_setup
+      run: tools/ci.sh unix_clang_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_stackless_clang_build
+      run: tools/ci.sh unix_stackless_clang_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_stackless_clang_run_tests
+      run: tools/ci.sh unix_stackless_clang_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -191,11 +191,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_clang_setup
+      run: tools/ci.sh unix_clang_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_float_clang_build
+      run: tools/ci.sh unix_float_clang_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_float_clang_run_tests
+      run: tools/ci.sh unix_float_clang_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -210,9 +210,9 @@ jobs:
       with:
         python-version: '3.11'
     - name: Build
-      run: source tools/ci.sh && ci_unix_settrace_stackless_build
+      run: tools/ci.sh unix_settrace_stackless_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_settrace_stackless_run_tests
+      run: tools/ci.sh unix_settrace_stackless_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -222,11 +222,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_32bit_setup
+      run: tools/ci.sh unix_32bit_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_repr_b_build
+      run: tools/ci.sh unix_repr_b_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_repr_b_run_tests
+      run: tools/ci.sh unix_repr_b_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -239,9 +239,9 @@ jobs:
       with:
         python-version: '3.8'
     - name: Build
-      run: source tools/ci.sh && ci_unix_macos_build
+      run: tools/ci.sh unix_macos_build
     - name: Run tests
-      run: source tools/ci.sh && ci_unix_macos_run_tests
+      run: tools/ci.sh unix_macos_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -252,11 +252,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_qemu_mips_setup
+      run: tools/ci.sh unix_qemu_mips_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_qemu_mips_build
+      run: tools/ci.sh unix_qemu_mips_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_qemu_mips_run_tests
+      run: tools/ci.sh unix_qemu_mips_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -267,11 +267,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_qemu_arm_setup
+      run: tools/ci.sh unix_qemu_arm_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_qemu_arm_build
+      run: tools/ci.sh unix_qemu_arm_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_qemu_arm_run_tests
+      run: tools/ci.sh unix_qemu_arm_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -282,11 +282,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_qemu_riscv64_setup
+      run: tools/ci.sh unix_qemu_riscv64_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_qemu_riscv64_build
+      run: tools/ci.sh unix_qemu_riscv64_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_qemu_riscv64_run_tests
+      run: tools/ci.sh unix_qemu_riscv64_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -301,17 +301,17 @@ jobs:
       with:
         python-version: '3.11'
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_coverage_setup
+      run: tools/ci.sh unix_coverage_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_sanitize_address_build
+      run: tools/ci.sh unix_sanitize_address_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_sanitize_address_run_tests
+      run: tools/ci.sh unix_sanitize_address_run_tests
     - name: Test merging .mpy files
-      run: source tools/ci.sh && ci_unix_coverage_run_mpy_merge_tests
+      run: tools/ci.sh unix_coverage_run_mpy_merge_tests
     - name: Build native mpy modules
-      run: source tools/ci.sh && ci_native_mpy_modules_build
+      run: tools/ci.sh 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
+      run: tools/ci.sh unix_coverage_run_native_mpy_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
@@ -326,17 +326,17 @@ jobs:
       with:
         python-version: '3.11'
     - name: Install packages
-      run: source tools/ci.sh && ci_unix_coverage_setup
+      run: tools/ci.sh unix_coverage_setup
     - name: Build
-      run: source tools/ci.sh && ci_unix_sanitize_undefined_build
+      run: tools/ci.sh unix_sanitize_undefined_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_sanitize_undefined_run_tests
+      run: tools/ci.sh unix_sanitize_undefined_run_tests
     - name: Test merging .mpy files
-      run: source tools/ci.sh && ci_unix_coverage_run_mpy_merge_tests
+      run: tools/ci.sh unix_coverage_run_mpy_merge_tests
     - name: Build native mpy modules
-      run: source tools/ci.sh && ci_native_mpy_modules_build
+      run: tools/ci.sh 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
+      run: tools/ci.sh unix_coverage_run_native_mpy_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index 14399950b569e..6bfbb5aec6c8e 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -23,11 +23,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_webassembly_setup
+      run: tools/ci.sh webassembly_setup
     - name: Build
-      run: source tools/ci.sh && ci_webassembly_build
+      run: tools/ci.sh webassembly_build
     - name: Run tests
-      run: source tools/ci.sh && ci_webassembly_run_tests
+      run: tools/ci.sh webassembly_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 16396f0fdd45d..e4e0152d3e9da 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -146,6 +146,6 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install packages
-      run: source tools/ci.sh && ci_windows_setup
+      run: tools/ci.sh windows_setup
     - name: Build
-      run: source tools/ci.sh && ci_windows_build
+      run: tools/ci.sh windows_build
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index 09ffd616b4026..3ed164e2f5f40 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -52,14 +52,14 @@ jobs:
       with:
         key: zephyr
     - name: Install packages
-      run: source tools/ci.sh && ci_zephyr_setup
+      run: tools/ci.sh zephyr_setup
     - name: Install Zephyr
       if: steps.cache_workspace.outputs.cache-hit != 'true'
-      run: source tools/ci.sh && ci_zephyr_install
+      run: tools/ci.sh zephyr_install
     - name: Build
-      run: source tools/ci.sh && ci_zephyr_build
+      run: tools/ci.sh zephyr_build
     - name: Run main test suite
-      run: source tools/ci.sh && ci_zephyr_run_tests
+      run: tools/ci.sh zephyr_run_tests
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures

From 75fb1addade14a223056d9c233369c29bf098d8d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Oct 2025 11:01:06 +1000
Subject: [PATCH 2918/3129] powerpc/mpconfigport: Remove definitions of _FMT
 macros.

Let the defaults in `py/mpconfig.h` be used instead.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/powerpc/mpconfigport.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index fcb66bab1e995..04bf4f37445f2 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -93,12 +93,8 @@
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
 // This port is 64-bit
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-#define HEX_FMT "%lx"
 typedef signed long mp_int_t; // must be pointer size
 typedef unsigned long mp_uint_t; // must be pointer size
-
 typedef long mp_off_t;
 
 // extra built in names to add to the global namespace

From bb205f093191c0a4d1b1835f3442dbda40e8eab8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Oct 2025 11:01:37 +1000
Subject: [PATCH 2919/3129] qemu/mpconfigport: Remove definitions of _FMT
 macros.

Let the defaults in `py/mpconfig.h` be used instead.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/mpconfigport.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 3d2466a919546..65c83a5fea5eb 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -78,10 +78,6 @@ typedef int32_t mp_int_t; // must be pointer size
 typedef uint32_t mp_uint_t; // must be pointer size
 #endif
 
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-#define HEX_FMT "%lx"
-
 typedef long mp_off_t;
 
 // We need to provide a declaration/definition of alloca()

From ab0080602578ce789d784aaaf50511313db70bc7 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Tue, 30 Sep 2025 15:56:35 -0500
Subject: [PATCH 2920/3129] py/mpconfig: Introduce SIZE_FMT macro.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 ports/stm32/mpconfigport_nanbox.h            | 1 +
 ports/unix/variants/nanbox/mpconfigvariant.h | 1 +
 py/mpconfig.h                                | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/ports/stm32/mpconfigport_nanbox.h b/ports/stm32/mpconfigport_nanbox.h
index ffd87ba2f6c60..7e9306aab8c10 100644
--- a/ports/stm32/mpconfigport_nanbox.h
+++ b/ports/stm32/mpconfigport_nanbox.h
@@ -37,6 +37,7 @@
 #define UINT_FMT "%llu"
 #define INT_FMT "%lld"
 #define HEX_FMT "%llx"
+#define SIZE_FMT "%lu"
 typedef int64_t mp_int_t;
 typedef uint64_t mp_uint_t;
 
diff --git a/ports/unix/variants/nanbox/mpconfigvariant.h b/ports/unix/variants/nanbox/mpconfigvariant.h
index 8b23b93a8d3c8..39969814ae448 100644
--- a/ports/unix/variants/nanbox/mpconfigvariant.h
+++ b/ports/unix/variants/nanbox/mpconfigvariant.h
@@ -49,3 +49,4 @@ typedef uint64_t mp_uint_t;
 #define UINT_FMT "%llu"
 #define INT_FMT "%lld"
 #define HEX_FMT "%llx"
+#define SIZE_FMT "%lu"
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a6a21dd1c0899..c25401b8cad40 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -2244,15 +2244,18 @@ typedef time_t mp_timestamp_t;
 #define UINT_FMT "%lu"
 #define INT_FMT "%ld"
 #define HEX_FMT "%lx"
+#define SIZE_FMT "%lu"
 #elif defined(_WIN64)
 #define UINT_FMT "%llu"
 #define INT_FMT "%lld"
 #define HEX_FMT "%llx"
+#define SIZE_FMT "%llu"
 #else
 // Archs where mp_int_t == int
 #define UINT_FMT "%u"
 #define INT_FMT "%d"
 #define HEX_FMT "%x"
+#define SIZE_FMT "%u"
 #endif
 #endif // INT_FMT
 

From c91e091ad72e3e15ca8981bd953f64714a5afb3e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 15 Aug 2025 08:01:12 -0500
Subject: [PATCH 2921/3129] py/runtime: Fix printing of failed allocation
 amounts.

On LP64 and LLP64 systems, size_t is bigger than unsigned.  Printing the
failed allocation using the new SIZE_FMT macro allows the correct failed
allocation size to be shown.

Example where this affects the failed allocation message (on x86_64
coverage build):

    >>> "a" * (1 << 54)

Before, this would print the size as 1.  Now it prints it as
18014398509481985 (2**54 + 1).

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/runtime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 58d5732be14ce..a84e22760be3b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1669,14 +1669,14 @@ mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_i
 #endif // MICROPY_ENABLE_COMPILER
 
 MP_NORETURN void m_malloc_fail(size_t num_bytes) {
-    DEBUG_printf("memory allocation failed, allocating %u bytes\n", (uint)num_bytes);
+    DEBUG_printf("memory allocation failed, allocating " SIZE_FMT " bytes\n", num_bytes);
     #if MICROPY_ENABLE_GC
     if (gc_is_locked()) {
         mp_raise_msg(&mp_type_MemoryError, MP_ERROR_TEXT("memory allocation failed, heap is locked"));
     }
     #endif
     mp_raise_msg_varg(&mp_type_MemoryError,
-        MP_ERROR_TEXT("memory allocation failed, allocating %u bytes"), (uint)num_bytes);
+        MP_ERROR_TEXT("memory allocation failed, allocating " SIZE_FMT " bytes"), num_bytes);
 }
 
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE

From c57aebf790c40125b663231ec4307d2a3f3cf193 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 25 Sep 2025 16:28:38 +0200
Subject: [PATCH 2922/3129] py/scheduler: Allow selective handling in
 mp_handle_pending.

Extend mp_handle_pending to support three distinct behaviors via
mp_handle_pending_internal():

- MP_HANDLE_PENDING_CALLBACKS_ONLY: process callbacks only
- MP_HANDLE_PENDING_CALLBACKS_AND_EXCEPTIONS: callbacks + raise exceptions
- MP_HANDLE_PENDING_CALLBACKS_AND_CLEAR_EXCEPTIONS: callbacks + clear only

Original mp_handle_pending(bool) preserved as inline wrapper for
backward compatibility.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 py/runtime.h   | 15 ++++++++++++++-
 py/scheduler.c | 13 ++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/py/runtime.h b/py/runtime.h
index f42039cab9055..0ef811c1e408c 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -52,6 +52,12 @@ typedef enum {
     MP_ARG_KW_ONLY   = 0x200,
 } mp_arg_flag_t;
 
+typedef enum {
+    MP_HANDLE_PENDING_CALLBACKS_ONLY,
+    MP_HANDLE_PENDING_CALLBACKS_AND_EXCEPTIONS,
+    MP_HANDLE_PENDING_CALLBACKS_AND_CLEAR_EXCEPTIONS,
+} mp_handle_pending_behaviour_t;
+
 typedef union _mp_arg_val_t {
     bool u_bool;
     mp_int_t u_int;
@@ -100,7 +106,14 @@ void mp_sched_keyboard_interrupt(void);
 #if MICROPY_ENABLE_VM_ABORT
 void mp_sched_vm_abort(void);
 #endif
-void mp_handle_pending(bool raise_exc);
+
+void mp_handle_pending_internal(mp_handle_pending_behaviour_t behavior);
+
+static inline void mp_handle_pending(bool raise_exc) {
+    mp_handle_pending_internal(raise_exc ?
+        MP_HANDLE_PENDING_CALLBACKS_AND_EXCEPTIONS :
+        MP_HANDLE_PENDING_CALLBACKS_AND_CLEAR_EXCEPTIONS);
+}
 
 #if MICROPY_ENABLE_SCHEDULER
 void mp_sched_lock(void);
diff --git a/py/scheduler.c b/py/scheduler.c
index d4cdb59efb6b5..5355074a7e76f 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -213,24 +213,27 @@ MP_REGISTER_ROOT_POINTER(mp_sched_item_t sched_queue[MICROPY_SCHEDULER_DEPTH]);
 
 // 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) {
+void mp_handle_pending_internal(mp_handle_pending_behaviour_t behavior) {
+    bool handle_exceptions = (behavior != MP_HANDLE_PENDING_CALLBACKS_ONLY);
+    bool raise_exceptions = (behavior == MP_HANDLE_PENDING_CALLBACKS_AND_EXCEPTIONS);
+
     // Handle pending VM abort.
     #if MICROPY_ENABLE_VM_ABORT
-    if (MP_STATE_VM(vm_abort) && mp_thread_is_main_thread()) {
+    if (handle_exceptions && MP_STATE_VM(vm_abort) && mp_thread_is_main_thread()) {
         MP_STATE_VM(vm_abort) = false;
-        if (raise_exc && nlr_get_abort() != NULL) {
+        if (raise_exceptions && nlr_get_abort() != NULL) {
             nlr_jump_abort();
         }
     }
     #endif
 
     // Handle any pending exception.
-    if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
+    if (handle_exceptions && 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);
         if (obj != MP_OBJ_NULL) {
             MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
-            if (raise_exc) {
+            if (raise_exceptions) {
                 MICROPY_END_ATOMIC_SECTION(atomic_state);
                 nlr_raise(obj);
             }

From 35d07df44597237a1aff661bd797c7c78d761ddc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 25 Sep 2025 16:55:47 +0200
Subject: [PATCH 2923/3129] stm32/usbd_hid_interface: Add runtime header.

Include runtime.h for mp_handle_pending.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/usbd_hid_interface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/usbd_hid_interface.c b/ports/stm32/usbd_hid_interface.c
index c167fb38f2522..5d00c3a92c3b8 100644
--- a/ports/stm32/usbd_hid_interface.c
+++ b/ports/stm32/usbd_hid_interface.c
@@ -26,7 +26,7 @@
 
 #include "usbd_hid_interface.h"
 
-#include "py/mpstate.h"
+#include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "usb.h"

From 2d14d4ef41c88a63f856b4b633478e6a262c85ee Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 22 Jul 2025 19:38:06 +1000
Subject: [PATCH 2924/3129] extmod/asyncio: Add IPv6 support to start_server().

Ensures that the underlying socket is opened with the correct protocol as
parsed by `getaddrinfo()`.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 extmod/asyncio/stream.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/asyncio/stream.py b/extmod/asyncio/stream.py
index cb0a804b5ed26..10d57ae8a1e22 100644
--- a/extmod/asyncio/stream.py
+++ b/extmod/asyncio/stream.py
@@ -180,11 +180,11 @@ async def start_server(cb, host, port, backlog=5, ssl=None):
     import socket
 
     # Create and bind server socket.
-    host = socket.getaddrinfo(host, port)[0]  # TODO this is blocking!
-    s = socket.socket()
+    addr_info = socket.getaddrinfo(host, port)[0]  # TODO this is blocking!
+    s = socket.socket(addr_info[0])  # Use address family from getaddrinfo
     s.setblocking(False)
     s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    s.bind(host[-1])
+    s.bind(addr_info[-1])
     s.listen(backlog)
 
     # Create and return server object and task.

From a79e1fd501d997051b85083ae4891dc28b2195d4 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Fri, 19 Sep 2025 17:31:05 +0530
Subject: [PATCH 2925/3129] zephyr/boards: Add PocketBeagle 2 rev A1 A53
 support.

This target runs on all 4 cores.  Only GPIO, I2C and UART are supported
right now.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 ports/zephyr/boards/pocketbeagle_2_am6254_a53.conf | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 ports/zephyr/boards/pocketbeagle_2_am6254_a53.conf

diff --git a/ports/zephyr/boards/pocketbeagle_2_am6254_a53.conf b/ports/zephyr/boards/pocketbeagle_2_am6254_a53.conf
new file mode 100644
index 0000000000000..f4fb7682bbe61
--- /dev/null
+++ b/ports/zephyr/boards/pocketbeagle_2_am6254_a53.conf
@@ -0,0 +1,3 @@
+# Hardware features
+CONFIG_I2C=y
+CONFIG_GPIO=y

From fb2b638ba0837b188deb0386270973261eb41fc0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 24 Sep 2025 11:22:25 +1000
Subject: [PATCH 2926/3129] docs: Label table columns as "CPython output" and
 "MicroPython output".

Abbreviating these doesn't really save space in the docs, as the code
blocks in the next row are always wider than the column headings.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/gen-cpydiff.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 3bb928090bb6e..af965a7bc8cf3 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -260,7 +260,7 @@ def gen_rst(results):
         output_cpy = ("::\n\n" if output_cpy != "" else "") + output_cpy
         output_upy = indent(output.output_upy, TAB).rstrip()
         output_upy = ("::\n\n" if output_upy != "" else "") + output_upy
-        table = gen_table([["CPy output:", output_cpy], ["uPy output:", output_upy]])
+        table = gen_table([["CPython output:", output_cpy], ["MicroPython output:", output_upy]])
         rst.write(table)
 
     template = open(INDEXTEMPLATE, "r")

From 3ec8b9a77c598104d5caf02e0b6e45d9f5d139dd Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 24 Sep 2025 11:17:51 +1000
Subject: [PATCH 2927/3129] all: Replace legacy name with MicroPython and MPy
 as applicable.

With the aim of getting consistency, and removing the need to learn an
additional term, replace uses of uPy/uPython with MPy/MicroPython.

Rule of thumb was to use "MPy" abbreviation where "CPy" is used nearby, but
the full word MicroPython otherwise.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/pyboard/tutorial/lcd_skin.rst              |   4 ++--
 docs/reference/asm_thumb2_index.rst             |   2 +-
 extmod/asyncio/core.py                          |   2 +-
 extmod/modtls_mbedtls.c                         |   2 +-
 extmod/vfs.c                                    |   2 +-
 ports/esp32/machine_hw_spi.c                    |   8 ++++----
 ports/webassembly/asyncio/core.py               |   2 +-
 ports/windows/msvc/paths.props                  |   2 +-
 py/gc.c                                         |   2 +-
 py/mpconfig.h                                   |   2 +-
 py/objexcept.c                                  |   2 +-
 py/objstr.c                                     |   2 +-
 tests/basics/async_await2.py                    |   2 +-
 tests/basics/async_for2.py                      |   2 +-
 tests/basics/async_with2.py                     |   2 +-
 tests/basics/boundmeth1.py                      |   2 +-
 tests/basics/builtin_range.py                   |   2 +-
 tests/basics/builtin_setattr.py                 |   2 +-
 tests/basics/class_bind_self.py                 |   2 +-
 tests/basics/del_attr.py                        |   2 +-
 tests/basics/del_global.py                      |   2 +-
 tests/basics/del_name.py                        |   2 +-
 tests/basics/frozenset_set.py                   |   2 +-
 tests/basics/fun_name.py                        |   2 +-
 tests/basics/gc1.py                             |   4 ++--
 tests/basics/io_iobase.py                       |   2 +-
 tests/basics/list_pop.py                        |   2 +-
 tests/basics/module2.py                         |   2 +-
 tests/basics/parser.py                          |   2 +-
 tests/basics/python34.py                        |   2 +-
 tests/basics/syntaxerror.py                     |   4 ++--
 tests/basics/sys_tracebacklimit.py              |   2 +-
 tests/basics/tuple1.py                          |   2 +-
 tests/cpydiff/modules_struct_fewargs.py         |   2 +-
 tests/cpydiff/modules_struct_manyargs.py        |   2 +-
 .../modules_struct_whitespace_in_format.py      |   2 +-
 .../cpydiff/types_float_implicit_conversion.py  |   2 +-
 tests/extmod/asyncio_set_exception_handler.py   |   2 +-
 tests/extmod/hashlib_md5.py                     |   3 +--
 tests/extmod/hashlib_sha1.py                    |   3 +--
 tests/extmod/hashlib_sha256.py                  |   3 +--
 tests/extmod/json_dump.py                       |   4 ++--
 tests/extmod/json_dump_iobase.py                |   2 +-
 tests/extmod/json_dump_separators.py            |   6 +++---
 tests/extmod/json_dumps_extra.py                |   2 +-
 tests/extmod/json_dumps_separators.py           |   2 +-
 tests/extmod/re_error.py                        |   2 +-
 tests/extmod/re_sub.py                          |   2 +-
 tests/float/string_format2.py                   |   4 ++--
 tests/float/string_format_modulo.py             |   2 +-
 tests/frozen/frozentest.mpy                     | Bin 196 -> 201 bytes
 tests/frozen/frozentest.py                      |   2 +-
 tests/io/builtin_print_file.py                  |   2 +-
 tests/io/file_seek.py                           |   2 +-
 tests/micropython/decorator_error.py            |   2 +-
 tests/micropython/heapalloc_traceback.py        |   2 +-
 tests/misc/non_compliant.py                     |   6 +++---
 tests/misc/non_compliant_lexer.py               |   2 +-
 tests/misc/print_exception.py                   |   6 +++---
 tests/ports/unix/extra_coverage.py              |   2 +-
 tests/ports/unix/extra_coverage.py.exp          |   2 +-
 61 files changed, 74 insertions(+), 77 deletions(-)

diff --git a/docs/pyboard/tutorial/lcd_skin.rst b/docs/pyboard/tutorial/lcd_skin.rst
index 4df0041607c75..9d0ff473e2bc6 100644
--- a/docs/pyboard/tutorial/lcd_skin.rst
+++ b/docs/pyboard/tutorial/lcd_skin.rst
@@ -29,7 +29,7 @@ Make sure the LCD skin is attached to the pyboard as pictured at the top of this
     >>> import pyb
     >>> lcd = pyb.LCD('X')
     >>> lcd.light(True)
-    >>> lcd.write('Hello uPy!\n')
+    >>> lcd.write('Hello MPy!\n')
 
 You can make a simple animation using the code::
 
@@ -38,7 +38,7 @@ You can make a simple animation using the code::
     lcd.light(True)
     for x in range(-80, 128):
         lcd.fill(0)
-        lcd.text('Hello uPy!', x, 10, 1)
+        lcd.text('Hello MPy!', x, 10, 1)
         lcd.show()
         pyb.delay(25)
 
diff --git a/docs/reference/asm_thumb2_index.rst b/docs/reference/asm_thumb2_index.rst
index ccf0201489a5e..97b3a8687e572 100644
--- a/docs/reference/asm_thumb2_index.rst
+++ b/docs/reference/asm_thumb2_index.rst
@@ -63,7 +63,7 @@ References
 -  :ref:`Assembler Tutorial <pyboard_tutorial_assembler>`
 -  `Wiki hints and tips
    <http://wiki.micropython.org/platforms/boards/pyboard/assembler>`__
--  `uPy Inline Assembler source-code,
+-  `MicroPython Inline Assembler source-code,
    emitinlinethumb.c <https://github.com/micropython/micropython/blob/master/py/emitinlinethumb.c>`__
 -  `ARM Thumb2 Instruction Set Quick Reference
    Card <http://infocenter.arm.com/help/topic/com.arm.doc.qrc0001l/QRC0001_UAL.pdf>`__
diff --git a/extmod/asyncio/core.py b/extmod/asyncio/core.py
index 5d46b4b80e2a1..7b70b43bce8bd 100644
--- a/extmod/asyncio/core.py
+++ b/extmod/asyncio/core.py
@@ -50,7 +50,7 @@ def __next__(self):
             raise self.exc
 
 
-# Pause task execution for the given time (integer in milliseconds, uPy extension)
+# Pause task execution for the given time (integer in milliseconds, MicroPython extension)
 # Use a SingletonGenerator to do it without allocating on the heap
 def sleep_ms(t, sgen=SingletonGenerator()):
     assert sgen.state is None
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 58634257328da..e2f7254f79587 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -304,7 +304,7 @@ static mp_obj_t ssl_context_make_new(const mp_obj_type_t *type_in, size_t n_args
     psa_crypto_init();
     #endif
 
-    const byte seed[] = "upy";
+    const byte seed[] = "mpy";
     int ret = mbedtls_ctr_drbg_seed(&self->ctr_drbg, mbedtls_entropy_func, &self->entropy, seed, sizeof(seed));
     if (ret != 0) {
         mbedtls_raise_error(ret);
diff --git a/extmod/vfs.c b/extmod/vfs.c
index aebf5ed295b3b..d2a7af5de00d4 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -96,7 +96,7 @@ mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out) {
     return MP_STATE_VM(vfs_cur);
 }
 
-// Version of mp_vfs_lookup_path that takes and returns uPy string objects.
+// Version of mp_vfs_lookup_path that takes and returns MicroPython string objects.
 static mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) {
     const char *path = mp_obj_str_get_str(path_in);
     const char *p_out;
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 6eb83fc09c37a..dcf8b3942a70b 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -38,10 +38,10 @@
 #include "soc/spi_pins.h"
 
 // SPI mappings by device, naming used by IDF old/new
-// upython   | ESP32     | ESP32S2   | ESP32S3 | ESP32C3 | ESP32C6
-// ----------+-----------+-----------+---------+---------+---------
-// SPI(id=1) | HSPI/SPI2 | FSPI/SPI2 | SPI2    | SPI2    | SPI2
-// SPI(id=2) | VSPI/SPI3 | HSPI/SPI3 | SPI3    | err     | err
+// MicroPython | ESP32     | ESP32S2   | ESP32S3 | ESP32C3 | ESP32C6
+// ------------+-----------+-----------+---------+---------+---------
+// SPI(id=1)   | HSPI/SPI2 | FSPI/SPI2 | SPI2    | SPI2    | SPI2
+// SPI(id=2)   | VSPI/SPI3 | HSPI/SPI3 | SPI3    | err     | err
 
 // Number of available hardware SPI peripherals.
 #if SOC_SPI_PERIPH_NUM > 2
diff --git a/ports/webassembly/asyncio/core.py b/ports/webassembly/asyncio/core.py
index 9d07bd7b858bc..eeffa253bcfe3 100644
--- a/ports/webassembly/asyncio/core.py
+++ b/ports/webassembly/asyncio/core.py
@@ -47,7 +47,7 @@ def __next__(self):
             raise self.exc
 
 
-# Pause task execution for the given time (integer in milliseconds, uPy extension)
+# Pause task execution for the given time (integer in milliseconds, MicroPython extension)
 # Use a SingletonGenerator to do it without allocating on the heap
 def sleep_ms(t, sgen=SingletonGenerator()):
     assert sgen.state is None
diff --git a/ports/windows/msvc/paths.props b/ports/windows/msvc/paths.props
index 767772a1aaf2e..a88182f4c95f7 100644
--- a/ports/windows/msvc/paths.props
+++ b/ports/windows/msvc/paths.props
@@ -31,7 +31,7 @@
     <PyVariantDir Condition="'$(PyVariantDir)' == ''">$(PyWinDir)variants\$(PyVariant)\</PyVariantDir>
     <PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyBuildDir)</PyTargetDir>
 
-    <!-- All include directories needed for uPy -->
+    <!-- All include directories needed for MicroPython -->
     <PyIncDirs>$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc;$(PyVariantDir)</PyIncDirs>
 
     <!-- Within PyBuildDir different subdirectories are used based on configuration and platform.
diff --git a/py/gc.c b/py/gc.c
index de66137f5800d..aa9f1e38b89bb 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -1245,7 +1245,7 @@ void gc_dump_alloc_table(const mp_print_t *print) {
                     break;
                 }
                 */
-                /* this prints the uPy object type of the head block */
+                /* this prints the MicroPython 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) {
diff --git a/py/mpconfig.h b/py/mpconfig.h
index c25401b8cad40..6da872c56cd72 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -2099,7 +2099,7 @@ typedef time_t mp_timestamp_t;
 /*****************************************************************************/
 /* Miscellaneous settings                                                    */
 
-// All uPy objects in ROM must be aligned on at least a 4 byte boundary
+// All MicroPython objects in ROM must be aligned on at least a 4 byte boundary
 // so that the small-int/qstr/pointer distinction can be made.  For machines
 // that don't do this (eg 16-bit CPU), define the following macro to something
 // like __attribute__((aligned(4))).
diff --git a/py/objexcept.c b/py/objexcept.c
index 5bf4e672baaf1..df91c32b1ca93 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -272,7 +272,7 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             // We allow 'exc.__traceback__ = None' assignment as low-level
             // optimization of pre-allocating exception instance and raising
             // it repeatedly - this avoids memory allocation during raise.
-            // However, uPy will keep adding traceback entries to such
+            // However, MicroPython will keep adding traceback entries to such
             // exception instance, so before throwing it, traceback should
             // be cleared like above.
             self->traceback_len = 0;
diff --git a/py/objstr.c b/py/objstr.c
index c81fc682fd4e8..df543041a8ccd 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1304,7 +1304,7 @@ static vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 }
 
                 case '\0':  // No explicit format type implies 'd'
-                case 'n':   // I don't think we support locales in uPy so use 'd'
+                case 'n':   // I don't think we support locales in MicroPython so use 'd'
                 case 'd':
                     mp_print_mp_int(&print, arg, 10, 'a', flags, fill, width, 0);
                     continue;
diff --git a/tests/basics/async_await2.py b/tests/basics/async_await2.py
index 1e3164df93372..7c1c85bfa5266 100644
--- a/tests/basics/async_await2.py
+++ b/tests/basics/async_await2.py
@@ -2,7 +2,7 @@
 
 import sys
 if sys.implementation.name == 'micropython':
-    # uPy allows normal generators to be awaitables
+    # MicroPython allows normal generators to be awaitables
     coroutine = lambda f: f
 else:
     import types
diff --git a/tests/basics/async_for2.py b/tests/basics/async_for2.py
index aad23a3e5ad8c..530ff390cce53 100644
--- a/tests/basics/async_for2.py
+++ b/tests/basics/async_for2.py
@@ -2,7 +2,7 @@
 
 import sys
 if sys.implementation.name == 'micropython':
-    # uPy allows normal generators to be awaitables
+    # MicroPython allows normal generators to be awaitables
     coroutine = lambda f: f
 else:
     import types
diff --git a/tests/basics/async_with2.py b/tests/basics/async_with2.py
index 44421ae91798e..bcdbfa906ac56 100644
--- a/tests/basics/async_with2.py
+++ b/tests/basics/async_with2.py
@@ -2,7 +2,7 @@
 
 import sys
 if sys.implementation.name == 'micropython':
-    # uPy allows normal generators to be awaitables
+    # MicroPython allows normal generators to be awaitables
     coroutine = lambda f: f
 else:
     import types
diff --git a/tests/basics/boundmeth1.py b/tests/basics/boundmeth1.py
index fe1b454688d64..9f08d9bbb259b 100644
--- a/tests/basics/boundmeth1.py
+++ b/tests/basics/boundmeth1.py
@@ -1,6 +1,6 @@
 # tests basics of bound methods
 
-# uPy and CPython differ when printing a bound method, so just print the type
+# MicroPython and CPython differ when printing a bound method, so just print the type
 print(type(repr([].append)))
 
 
diff --git a/tests/basics/builtin_range.py b/tests/basics/builtin_range.py
index 728679bc9a1fc..9608a8163107e 100644
--- a/tests/basics/builtin_range.py
+++ b/tests/basics/builtin_range.py
@@ -54,7 +54,7 @@
 print(range(1, 100, -5)[5:15:-3])
 print(range(1, 100, -5)[15:5:3])
 
-# for this case uPy gives a different stop value but the listed elements are still correct
+# for this case MicroPython gives a different stop value but the listed elements are still correct
 print(list(range(7, -2, -4)[2:-2:]))
 
 # zero step
diff --git a/tests/basics/builtin_setattr.py b/tests/basics/builtin_setattr.py
index e4acb14cac354..2c9a452c32774 100644
--- a/tests/basics/builtin_setattr.py
+++ b/tests/basics/builtin_setattr.py
@@ -21,5 +21,5 @@ def __init__(self):
 try:
     setattr(int, 'to_bytes', 1)
 except (AttributeError, TypeError):
-    # uPy raises AttributeError, CPython raises TypeError
+    # MicroPython raises AttributeError, CPython raises TypeError
     print('AttributeError/TypeError')
diff --git a/tests/basics/class_bind_self.py b/tests/basics/class_bind_self.py
index 813f876446ef2..8bece902ca254 100644
--- a/tests/basics/class_bind_self.py
+++ b/tests/basics/class_bind_self.py
@@ -52,7 +52,7 @@ def f4(self, arg): # generator
 print(C.f8(13))
 print(C.f9(14))
 
-# not working in uPy
+# not working in MicroPython
 #class C(list):
 #    # this acts like a method and binds self
 #    f1 = list.extend
diff --git a/tests/basics/del_attr.py b/tests/basics/del_attr.py
index 8487b97e311d0..90a8a5a6f833d 100644
--- a/tests/basics/del_attr.py
+++ b/tests/basics/del_attr.py
@@ -35,5 +35,5 @@ def f():
 try:
     del int.to_bytes
 except (AttributeError, TypeError):
-    # uPy raises AttributeError, CPython raises TypeError
+    # MicroPython raises AttributeError, CPython raises TypeError
     print('AttributeError/TypeError')
diff --git a/tests/basics/del_global.py b/tests/basics/del_global.py
index d740357b0332d..e1aa074b97a43 100644
--- a/tests/basics/del_global.py
+++ b/tests/basics/del_global.py
@@ -14,7 +14,7 @@ def do_del():
 try:
     do_del()
 except: # NameError:
-    # FIXME uPy returns KeyError for this
+    # FIXME MicroPython returns KeyError for this
     print("NameError")
 
 # delete globals using a list
diff --git a/tests/basics/del_name.py b/tests/basics/del_name.py
index c92be54d3b655..8393b2df92a72 100644
--- a/tests/basics/del_name.py
+++ b/tests/basics/del_name.py
@@ -10,7 +10,7 @@
 try:
     del x
 except: # NameError:
-    # FIXME uPy returns KeyError for this
+    # FIXME MicroPython returns KeyError for this
     print("NameError")
 
 class C:
diff --git a/tests/basics/frozenset_set.py b/tests/basics/frozenset_set.py
index 3bf456acfd70f..2b3c683260989 100644
--- a/tests/basics/frozenset_set.py
+++ b/tests/basics/frozenset_set.py
@@ -8,5 +8,5 @@
 # "Instances of set are compared to instances of frozenset based on their
 # members. For example:"
 print(set('abc') == frozenset('abc'))
-# This doesn't work in uPy
+# This doesn't work in MicroPython
 #print(set('abc') in set([frozenset('abc')]))
diff --git a/tests/basics/fun_name.py b/tests/basics/fun_name.py
index b2642280a2a65..8aac35eeafa25 100644
--- a/tests/basics/fun_name.py
+++ b/tests/basics/fun_name.py
@@ -16,7 +16,7 @@ def Fun(self):
     print('SKIP')
     raise SystemExit
 
-# __name__ of a bound native method is not implemented in uPy
+# __name__ of a bound native method is not implemented in MicroPython
 # the test here is to make sure it doesn't crash
 try:
     str((1).to_bytes.__name__)
diff --git a/tests/basics/gc1.py b/tests/basics/gc1.py
index 332bf9744c072..dff9538b14b5c 100644
--- a/tests/basics/gc1.py
+++ b/tests/basics/gc1.py
@@ -15,13 +15,13 @@
 gc.collect()
 
 if hasattr(gc, 'mem_free'):
-    # uPy has these extra functions
+    # MicroPython has these extra functions
     # just test they execute and return an int
     assert type(gc.mem_free()) is int
     assert type(gc.mem_alloc()) is int
 
 if hasattr(gc, 'threshold'):
-    # uPy has this extra function
+    # MicroPython has this extra function
     # check execution and returns
     assert(gc.threshold(1) is None)
     assert(gc.threshold() == 0)
diff --git a/tests/basics/io_iobase.py b/tests/basics/io_iobase.py
index c01ca6a5073d6..de7e4a0b06b38 100644
--- a/tests/basics/io_iobase.py
+++ b/tests/basics/io_iobase.py
@@ -9,7 +9,7 @@
 
 class MyIO(io.IOBase):
     def write(self, buf):
-        # CPython and uPy pass in different types for buf (str vs bytearray)
+        # CPython and MicroPython pass in different types for buf (str vs bytearray)
         print('write', len(buf))
         return len(buf)
 
diff --git a/tests/basics/list_pop.py b/tests/basics/list_pop.py
index 87ed456f85174..58bcdd91e414c 100644
--- a/tests/basics/list_pop.py
+++ b/tests/basics/list_pop.py
@@ -10,7 +10,7 @@
 else:
     raise AssertionError("No IndexError raised")
 
-# popping such that list storage shrinks (tests implementation detail of uPy)
+# popping such that list storage shrinks (tests implementation detail of MicroPython)
 l = list(range(20))
 for i in range(len(l)):
     l.pop()
diff --git a/tests/basics/module2.py b/tests/basics/module2.py
index a135601579cd7..d1dc18930f00d 100644
--- a/tests/basics/module2.py
+++ b/tests/basics/module2.py
@@ -1,4 +1,4 @@
-# uPy behaviour only: builtin modules are read-only
+# MicroPython behaviour only: builtin modules are read-only
 import sys
 try:
     sys.x = 1
diff --git a/tests/basics/parser.py b/tests/basics/parser.py
index 626b67ad7a941..6ae5f05ba458e 100644
--- a/tests/basics/parser.py
+++ b/tests/basics/parser.py
@@ -7,7 +7,7 @@
     raise SystemExit
 
 # completely empty string
-# uPy and CPy differ for this case
+# MPy and CPy differ for this case
 #try:
 #    compile("", "stdin", "single")
 #except SyntaxError:
diff --git a/tests/basics/python34.py b/tests/basics/python34.py
index 922234d22db93..3071b55eff8bf 100644
--- a/tests/basics/python34.py
+++ b/tests/basics/python34.py
@@ -28,7 +28,7 @@ def test_syntax(code):
 test_syntax("del ()") # can't delete empty tuple (in 3.6 we can)
 
 # from basics/sys1.py
-# uPy prints version 3.4
+# MicroPython prints version 3.4
 import sys
 print(sys.version[:3])
 print(sys.version_info[0], sys.version_info[1])
diff --git a/tests/basics/syntaxerror.py b/tests/basics/syntaxerror.py
index c0702cb24525e..7b6ef9b7550ea 100644
--- a/tests/basics/syntaxerror.py
+++ b/tests/basics/syntaxerror.py
@@ -86,7 +86,7 @@ def test_syntax(code):
 test_syntax("nonlocal a")
 test_syntax("await 1")
 
-# error on uPy, warning on CPy
+# error on MPy, warning on CPy
 #test_syntax("def f():\n a = 1\n global a")
 
 # default except must be last
@@ -98,7 +98,7 @@ def test_syntax(code):
 # non-keyword after keyword
 test_syntax("f(a=1, 2)")
 
-# doesn't error on uPy but should
+# doesn't error on MPy but should
 #test_syntax("f(1, i for i in i)")
 
 # all elements of dict/set must be pairs or singles
diff --git a/tests/basics/sys_tracebacklimit.py b/tests/basics/sys_tracebacklimit.py
index 3ae372b8d524e..6f575fde65404 100644
--- a/tests/basics/sys_tracebacklimit.py
+++ b/tests/basics/sys_tracebacklimit.py
@@ -30,7 +30,7 @@ def print_exc(e):
         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
+        # MPy 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("    "):
diff --git a/tests/basics/tuple1.py b/tests/basics/tuple1.py
index 72bb3f01bff4a..70ae071898e5b 100644
--- a/tests/basics/tuple1.py
+++ b/tests/basics/tuple1.py
@@ -17,7 +17,7 @@
 x += (10, 11, 12)
 print(x)
 
-# construction of tuple from large iterator (tests implementation detail of uPy)
+# construction of tuple from large iterator (tests implementation detail of MicroPython)
 print(tuple(range(20)))
 
 # unsupported unary operation
diff --git a/tests/cpydiff/modules_struct_fewargs.py b/tests/cpydiff/modules_struct_fewargs.py
index 49b2a3213c898..f6346a67938ed 100644
--- a/tests/cpydiff/modules_struct_fewargs.py
+++ b/tests/cpydiff/modules_struct_fewargs.py
@@ -1,6 +1,6 @@
 """
 categories: Modules,struct
-description: Struct pack with too few args, not checked by uPy
+description: Struct pack with too few args, not checked by MicroPython
 cause: Unknown
 workaround: Unknown
 """
diff --git a/tests/cpydiff/modules_struct_manyargs.py b/tests/cpydiff/modules_struct_manyargs.py
index e3b78930f219f..b2ea93b6c9330 100644
--- a/tests/cpydiff/modules_struct_manyargs.py
+++ b/tests/cpydiff/modules_struct_manyargs.py
@@ -1,6 +1,6 @@
 """
 categories: Modules,struct
-description: Struct pack with too many args, not checked by uPy
+description: Struct pack with too many args, not checked by MicroPython
 cause: Unknown
 workaround: Unknown
 """
diff --git a/tests/cpydiff/modules_struct_whitespace_in_format.py b/tests/cpydiff/modules_struct_whitespace_in_format.py
index a7a1d2facdfff..8b609425eb01c 100644
--- a/tests/cpydiff/modules_struct_whitespace_in_format.py
+++ b/tests/cpydiff/modules_struct_whitespace_in_format.py
@@ -1,6 +1,6 @@
 """
 categories: Modules,struct
-description: Struct pack with whitespace in format, whitespace ignored by CPython, error on uPy
+description: Struct pack with whitespace in format, whitespace ignored by CPython, error on MicroPython
 cause: MicroPython is optimised for code size.
 workaround: Don't use spaces in format strings.
 """
diff --git a/tests/cpydiff/types_float_implicit_conversion.py b/tests/cpydiff/types_float_implicit_conversion.py
index 3726839fac6d1..764c9e4e6ed7a 100644
--- a/tests/cpydiff/types_float_implicit_conversion.py
+++ b/tests/cpydiff/types_float_implicit_conversion.py
@@ -1,6 +1,6 @@
 """
 categories: Types,float
-description: uPy allows implicit conversion of objects in maths operations while CPython does not.
+description: MicroPython 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.
 """
diff --git a/tests/extmod/asyncio_set_exception_handler.py b/tests/extmod/asyncio_set_exception_handler.py
index 5935f0f4ebeaa..0ac4a624224ce 100644
--- a/tests/extmod/asyncio_set_exception_handler.py
+++ b/tests/extmod/asyncio_set_exception_handler.py
@@ -12,7 +12,7 @@ def custom_handler(loop, context):
 
 
 async def task(i):
-    # Raise with 2 args so exception prints the same in uPy and CPython
+    # Raise with 2 args so exception prints the same in MicroPython and CPython
     raise ValueError(i, i + 1)
 
 
diff --git a/tests/extmod/hashlib_md5.py b/tests/extmod/hashlib_md5.py
index 5f925fc97d02e..ebbe9155e0493 100644
--- a/tests/extmod/hashlib_md5.py
+++ b/tests/extmod/hashlib_md5.py
@@ -1,8 +1,7 @@
 try:
     import hashlib
 except ImportError:
-    # This is neither uPy, nor cPy, so must be uPy with
-    # hashlib module disabled.
+    # MicroPython with hashlib module disabled.
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/hashlib_sha1.py b/tests/extmod/hashlib_sha1.py
index af23033a591f2..46ffb73fcbe01 100644
--- a/tests/extmod/hashlib_sha1.py
+++ b/tests/extmod/hashlib_sha1.py
@@ -1,8 +1,7 @@
 try:
     import hashlib
 except ImportError:
-    # This is neither uPy, nor cPy, so must be uPy with
-    # hashlib module disabled.
+    # MicroPython with hashlib module disabled.
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/hashlib_sha256.py b/tests/extmod/hashlib_sha256.py
index f0d07e1482cf4..ffa0922a1cf49 100644
--- a/tests/extmod/hashlib_sha256.py
+++ b/tests/extmod/hashlib_sha256.py
@@ -1,8 +1,7 @@
 try:
     import hashlib
 except ImportError:
-    # This is neither uPy, nor cPy, so must be uPy with
-    # hashlib module disabled.
+    # MicroPython with hashlib module disabled.
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/json_dump.py b/tests/extmod/json_dump.py
index 897d33cc81253..0beb4f5f85698 100644
--- a/tests/extmod/json_dump.py
+++ b/tests/extmod/json_dump.py
@@ -16,11 +16,11 @@
 # dump to a small-int not allowed
 try:
     json.dump(123, 1)
-except (AttributeError, OSError):  # CPython and uPy have different errors
+except (AttributeError, OSError):  # CPython and MicroPython have different errors
     print("Exception")
 
 # dump to an object not allowed
 try:
     json.dump(123, {})
-except (AttributeError, OSError):  # CPython and uPy have different errors
+except (AttributeError, OSError):  # CPython and MicroPython have different errors
     print("Exception")
diff --git a/tests/extmod/json_dump_iobase.py b/tests/extmod/json_dump_iobase.py
index 94d317b87968f..81105e36dccec 100644
--- a/tests/extmod/json_dump_iobase.py
+++ b/tests/extmod/json_dump_iobase.py
@@ -18,7 +18,7 @@ def __init__(self):
 
     def write(self, buf):
         if type(buf) == bytearray:
-            # uPy passes a bytearray, CPython passes a str
+            # MicroPython passes a bytearray, CPython passes a str
             buf = str(buf, "ascii")
         self.buf += buf
         return len(buf)
diff --git a/tests/extmod/json_dump_separators.py b/tests/extmod/json_dump_separators.py
index 4f8e56dceb536..ce39294820fa9 100644
--- a/tests/extmod/json_dump_separators.py
+++ b/tests/extmod/json_dump_separators.py
@@ -25,20 +25,20 @@
     # dump to a small-int not allowed
     try:
         json.dump(123, 1, separators=sep)
-    except (AttributeError, OSError):  # CPython and uPy have different errors
+    except (AttributeError, OSError):  # CPython and MicroPython 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
+    except (AttributeError, OSError):  # CPython and MicroPython have different errors
         print("Exception")
 
 
 try:
     s = StringIO()
     json.dump(False, s, separators={"a": 1})
-except (TypeError, ValueError):  # CPython and uPy have different errors
+except (TypeError, ValueError):  # CPython and MicroPython have different errors
     print("Exception")
 
 # invalid separator types
diff --git a/tests/extmod/json_dumps_extra.py b/tests/extmod/json_dumps_extra.py
index 9074416a99d93..9faf8eefabb2f 100644
--- a/tests/extmod/json_dumps_extra.py
+++ b/tests/extmod/json_dumps_extra.py
@@ -1,4 +1,4 @@
-# test uPy json behaviour that's not valid in CPy
+# test MicroPython json behaviour that's not valid in CPython
 
 try:
     import json
diff --git a/tests/extmod/json_dumps_separators.py b/tests/extmod/json_dumps_separators.py
index a3a9ec308f09d..0a95f489a08ec 100644
--- a/tests/extmod/json_dumps_separators.py
+++ b/tests/extmod/json_dumps_separators.py
@@ -39,7 +39,7 @@
 
 try:
     json.dumps(False, separators={"a": 1})
-except (TypeError, ValueError):  # CPython and uPy have different errors
+except (TypeError, ValueError):  # CPython and MicroPython have different errors
     print("Exception")
 
 # invalid separator types
diff --git a/tests/extmod/re_error.py b/tests/extmod/re_error.py
index f61d0913289e1..bd678c9d25156 100644
--- a/tests/extmod/re_error.py
+++ b/tests/extmod/re_error.py
@@ -11,7 +11,7 @@ def test_re(r):
     try:
         re.compile(r)
         print("OK")
-    except:  # uPy and CPy use different errors, so just ignore the type
+    except:  # MPy and CPy use different errors, so just ignore the type
         print("Error")
 
 
diff --git a/tests/extmod/re_sub.py b/tests/extmod/re_sub.py
index ecaa66d83d8a7..95ba1d70d6e80 100644
--- a/tests/extmod/re_sub.py
+++ b/tests/extmod/re_sub.py
@@ -61,7 +61,7 @@ def A():
 except:
     print("invalid group")
 
-# invalid group with very large number (to test overflow in uPy)
+# invalid group with very large number (to test overflow in MicroPython)
 try:
     re.sub("(a)", "b\\199999999999999999999999999999999999999", "a")
 except:
diff --git a/tests/float/string_format2.py b/tests/float/string_format2.py
index 7a36f4d2f95dc..cdea4c1197249 100644
--- a/tests/float/string_format2.py
+++ b/tests/float/string_format2.py
@@ -144,7 +144,7 @@ def test_fmt(conv, fill, alignment, sign, prefix, width, precision, type, arg):
             for alignment in ("", "<", ">", "=", "^"):
                 for fill in ("", " ", "0", "@"):
                     for sign in ("", "+", "-", " "):
-                        # An empty precision defaults to 6, but when uPy is
+                        # An empty precision defaults to 6, but when MicroPython is
                         # configured to use a float, we can only use a
                         # precision of 6 with numbers less than 10 and still
                         # get results that compare to CPython (which uses
@@ -164,7 +164,7 @@ def test_fmt(conv, fill, alignment, sign, prefix, width, precision, type, arg):
         for alignment in ("", "<", ">", "=", "^"):
             for fill in ("", " ", "0", "@"):
                 for sign in ("", "+", "-", " "):
-                    # An empty precision defaults to 6, but when uPy is
+                    # An empty precision defaults to 6, but when MicroPython is
                     # configured to use a float, we can only use a
                     # precision of 6 with numbers less than 10 and still
                     # get results that compare to CPython (which uses
diff --git a/tests/float/string_format_modulo.py b/tests/float/string_format_modulo.py
index 3c206b7393588..55314643351db 100644
--- a/tests/float/string_format_modulo.py
+++ b/tests/float/string_format_modulo.py
@@ -6,7 +6,7 @@
 print("%u" % 1.0)
 
 # these 3 have different behaviour in Python 3.x versions
-# uPy raises a TypeError, following Python 3.5 (earlier versions don't)
+# MicroPython raises a TypeError, following Python 3.5 (earlier versions don't)
 # print("%x" % 18.0)
 # print("%o" % 18.0)
 # print("%X" % 18.0)
diff --git a/tests/frozen/frozentest.mpy b/tests/frozen/frozentest.mpy
index 99581617ac3d13e416722a63852da14088ff8db7..ccdf5e1a9576bb1e4100f2ffe52b4feb4977c09d 100644
GIT binary patch
delta 103
zcmX@Yc#=`cmyJQ5m02pSD8DK-uOzj&M6aNdfnOjK$S%rDO<`y(pD3Gc!z{pL!Wb#Y
qtjqwR7$FoyP-)luS)xFJ1}C3zF&05)K^7pV@o9L=b!Yv^z+?bodm2;#

delta 98
zcmX@fc!W{bmyJoDm02pSD8DK-uOzj&M6aNdfxoewtu&yLVWLvD4U+(~31g%nlQIK@
nVuVmkU`lD%`&ptuR)dpIxEPBdlOPL_)A%&J<+`(eWMDD?pnDiB

diff --git a/tests/frozen/frozentest.py b/tests/frozen/frozentest.py
index 78cdd60bf0431..74bdfb3b267f2 100644
--- a/tests/frozen/frozentest.py
+++ b/tests/frozen/frozentest.py
@@ -1,4 +1,4 @@
-print("uPy")
+print("interned")
 print("a long string that is not interned")
 print("a string that has unicode αβγ chars")
 print(b"bytes 1234\x01")
diff --git a/tests/io/builtin_print_file.py b/tests/io/builtin_print_file.py
index 822356a6cc305..e00f58635a9d2 100644
--- a/tests/io/builtin_print_file.py
+++ b/tests/io/builtin_print_file.py
@@ -13,5 +13,5 @@
 
 try:
     print(file=1)
-except (AttributeError, OSError):  # CPython and uPy differ in error message
+except (AttributeError, OSError):  # CPython and MicroPython differ in error message
     print("Error")
diff --git a/tests/io/file_seek.py b/tests/io/file_seek.py
index 3990df8409051..b9f9593786fe6 100644
--- a/tests/io/file_seek.py
+++ b/tests/io/file_seek.py
@@ -30,5 +30,5 @@
 try:
     f.seek(1)
 except (OSError, ValueError):
-    # CPy raises ValueError, uPy raises OSError
+    # CPy raises ValueError, MPy raises OSError
     print("OSError or ValueError")
diff --git a/tests/micropython/decorator_error.py b/tests/micropython/decorator_error.py
index 94772ac1e5fef..b5eae65b29209 100644
--- a/tests/micropython/decorator_error.py
+++ b/tests/micropython/decorator_error.py
@@ -1,4 +1,4 @@
-# test syntax errors for uPy-specific decorators
+# test syntax errors for MicroPython-specific decorators
 
 
 def test_syntax(code):
diff --git a/tests/micropython/heapalloc_traceback.py b/tests/micropython/heapalloc_traceback.py
index 5ded8c5f0c62e..1743d4956d806 100644
--- a/tests/micropython/heapalloc_traceback.py
+++ b/tests/micropython/heapalloc_traceback.py
@@ -34,7 +34,7 @@ def test():
 buf = io.StringIO()
 sys.print_exception(global_exc, buf)
 for l in buf.getvalue().split("\n"):
-    # uPy on pyboard prints <stdin> as file, so remove filename.
+    # MicroPython on pyboard prints <stdin> as file, so remove filename.
     if l.startswith("  File "):
         l = l.split('"')
         print(l[0], l[2])
diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index dd62f63255c72..54ad2960e49ef 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -39,7 +39,7 @@
 except NotImplementedError:
     print("NotImplementedError")
 
-# uPy raises TypeError, should be ValueError
+# MicroPython raises TypeError, should be ValueError
 try:
     "%c" % b"\x01\x02"
 except (TypeError, ValueError):
@@ -99,10 +99,10 @@
 except NotImplementedError:
     print("NotImplementedError")
 
-# struct pack with too many args, not checked by uPy
+# struct pack with too many args, not checked by MicroPython
 print(struct.pack("bb", 1, 2, 3))
 
-# struct pack with too few args, not checked by uPy
+# struct pack with too few args, not checked by MicroPython
 print(struct.pack("bb", 1))
 
 # array slice assignment with unsupported RHS
diff --git a/tests/misc/non_compliant_lexer.py b/tests/misc/non_compliant_lexer.py
index e1c21f3d713c4..04c605953e705 100644
--- a/tests/misc/non_compliant_lexer.py
+++ b/tests/misc/non_compliant_lexer.py
@@ -11,7 +11,7 @@ def test(code):
         print("NotImplementedError")
 
 
-# uPy requires spaces between literal numbers and keywords, CPy doesn't
+# MPy requires spaces between literal numbers and keywords, CPy doesn't
 try:
     eval("1and 0")
 except SyntaxError:
diff --git a/tests/misc/print_exception.py b/tests/misc/print_exception.py
index d41478360faf3..fdf5711c57876 100644
--- a/tests/misc/print_exception.py
+++ b/tests/misc/print_exception.py
@@ -20,11 +20,11 @@ def print_exc(e):
     print_exception(e, buf)
     s = buf.getvalue()
     for l in s.split("\n"):
-        # uPy on pyboard prints <stdin> as file, so remove filename.
+        # MPy on pyboard prints <stdin> as file, so 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
+        # MPy 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("    "):
@@ -89,7 +89,7 @@ def f():
 except Exception as e:
     print_exc(e)
 
-# Test non-stream object passed as output object, only valid for uPy
+# Test non-stream object passed as output object, only valid for MicroPython
 if hasattr(sys, "print_exception"):
     try:
         sys.print_exception(Exception, 1)
diff --git a/tests/ports/unix/extra_coverage.py b/tests/ports/unix/extra_coverage.py
index 493d02cde981a..2087e7ea2adc5 100644
--- a/tests/ports/unix/extra_coverage.py
+++ b/tests/ports/unix/extra_coverage.py
@@ -128,7 +128,7 @@
 
 print(returns_NULL())
 
-# test for freeze_mpy
+# test for freeze_mpy (importing prints several lines)
 import frozentest
 
 print(frozentest.__file__)
diff --git a/tests/ports/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index 5b6e1f3f0f0a1..d11e5ee6f4215 100644
--- a/tests/ports/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
@@ -250,7 +250,7 @@ b'\x00\xff'
 frzmpy4 1
 frzmpy4 2
 NULL
-uPy
+interned
 a long string that is not interned
 a string that has unicode αβγ chars
 b'bytes 1234\x01'

From 099991f3ef4a21f5bdd00767e68e7cad9ce925e4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Fri, 26 Sep 2025 09:43:58 -0500
Subject: [PATCH 2928/3129] py/misc: Use _Static_assert for MP_STATIC_ASSERT
 where possible.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Or use C++ `static_assert` when that's available.

For the same reasons that C++ has trouble with "nonconstexpr" static
assertions, `_Static_assert` rejects such expression as well.  So, fall
back to the old sizeof-array based implementation in that case.

When `_Static_assert` can be used, the diagnostic quality is improved:

    ../py/objint.c: In function ‘mp_obj_int_make_new’:
    ../py/misc.h:67:32: error: static assertion failed: "37 == 42"
    ../py/objint.c:45:5: note: in expansion of macro ‘MP_STATIC_ASSERT’

As compared to a diagnostic about

    ../py/misc.h:71:50: error: size of unnamed array is negative

Testing on godbolt indicated that this actually works back to gcc 4.5, but
it's easier to use GNUC >= 5 as the test; hypothetical users of 4.5, 4.6,
or 4.7 will just get slightly worse diagnostics.

See related issue #18116.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/misc.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/py/misc.h b/py/misc.h
index ee33f84e8f65e..ab40d3d9840dd 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -67,7 +67,14 @@ typedef unsigned int uint;
 #define MP_STRINGIFY(x) MP_STRINGIFY_HELPER(x)
 
 // Static assertion macro
+#if __cplusplus
+#define MP_STATIC_ASSERT(cond) static_assert((cond), #cond)
+#elif __GNUC__ >= 5 || __STDC_VERSION__ >= 201112L
+#define MP_STATIC_ASSERT(cond) _Static_assert((cond), #cond)
+#else
 #define MP_STATIC_ASSERT(cond) ((void)sizeof(char[1 - 2 * !(cond)]))
+#endif
+
 // In C++ things like comparing extern const pointers are not constant-expressions so cannot be used
 // in MP_STATIC_ASSERT. Note that not all possible compiler versions will reject this. Some gcc versions
 // do, others only with -Werror=vla, msvc always does.
@@ -76,7 +83,7 @@ typedef unsigned int uint;
 #if defined(_MSC_VER) || defined(__cplusplus)
 #define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)1)
 #else
-#define MP_STATIC_ASSERT_NONCONSTEXPR(cond) MP_STATIC_ASSERT(cond)
+#define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)sizeof(char[1 - 2 * !(cond)]))
 #endif
 
 // Round-up integer division

From 33cf1ab3ccabecd156176ceebcd56332e8a5d325 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sat, 27 Sep 2025 19:29:49 -0500
Subject: [PATCH 2929/3129] py/misc: Don't warn about a GNU extension for
 static assert macro.

This warning was enabled by default on clang 17.0.0 on macOS 26.  Disable
it, because we want to make these checks at compile-time even if it
requires an extension.

Fixes issue #18116.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/misc.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/misc.h b/py/misc.h
index ab40d3d9840dd..67248ac2f5b0d 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -83,6 +83,9 @@ typedef unsigned int uint;
 #if defined(_MSC_VER) || defined(__cplusplus)
 #define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)1)
 #else
+#if __clang__
+#pragma GCC diagnostic ignored "-Wgnu-folding-constant"
+#endif
 #define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)sizeof(char[1 - 2 * !(cond)]))
 #endif
 

From d7cb54b93b184a0fa026f201131c2acb86a4ef25 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 24 Sep 2025 14:33:18 +1000
Subject: [PATCH 2930/3129] github/workflows: Switch to macos-26 for unix CI.

To test if Apple Clang 17.0.0 + macOS 26 builds the unix port cleanly.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .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 d406a912a4acd..deee7b265fcb7 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -232,7 +232,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   macos:
-    runs-on: macos-latest
+    runs-on: macos-26
     steps:
     - uses: actions/checkout@v5
     - uses: actions/setup-python@v6

From 653f7784d7e566531ed1678486631c6c89aeedb7 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 28 Sep 2025 09:26:32 -0500
Subject: [PATCH 2931/3129] py/py.mk: Regenerate moduledefs.h if
 makemoduledefs.py changes.

This makes iterating on the script easier.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/py.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/py.mk b/py/py.mk
index e352d89792bfd..e7716a1adc9a6 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -252,7 +252,7 @@ $(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: $(HEADER_BUILD)/moduledefs.collected
+$(HEADER_BUILD)/moduledefs.h: $(HEADER_BUILD)/moduledefs.collected $(PY_SRC)/makemoduledefs.py
 	@$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makemoduledefs.py $< > $@
 

From 41284577ca389c463a3e69302de8ad0edaf97f24 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Fri, 26 Sep 2025 10:23:06 -0500
Subject: [PATCH 2932/3129] py/makemoduledefs.py: Avoid empty extensible module
 lists.

An empty array is a C extension supported by clang & GCC but not MSVC.

This also saves a bit of code size if there are no extensible modules.

Fixes issue #18141.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/builtinhelp.c     |  2 ++
 py/builtinimport.c   |  4 ++++
 py/makemoduledefs.py | 16 +++++++++++-----
 py/objmodule.c       | 13 ++++++++++++-
 py/objmodule.h       |  3 +++
 py/repl.c            |  7 +++++--
 6 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index c08c2e3b6342b..dc4fe582f75ef 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -79,7 +79,9 @@ static void mp_help_print_modules(void) {
     mp_obj_t list = mp_obj_new_list(0, NULL);
 
     mp_help_add_from_map(list, &mp_builtin_module_map);
+    #if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
     mp_help_add_from_map(list, &mp_builtin_extensible_module_map);
+    #endif
 
     #if MICROPY_MODULE_FROZEN
     extern const char mp_frozen_names[];
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 57b5c14e8836e..ff894f69d99e2 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -403,6 +403,7 @@ static mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
         // all the locations in sys.path.
         stat = stat_top_level(level_mod_name, &path);
 
+        #if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
         // If filesystem failed, now try and see if it matches an extensible
         // built-in module.
         if (stat == MP_IMPORT_STAT_NO_EXIST) {
@@ -411,6 +412,7 @@ static mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
                 return module_obj;
             }
         }
+        #endif
     } else {
         DEBUG_printf("Searching for sub-module\n");
 
@@ -646,11 +648,13 @@ mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
     if (module_obj != MP_OBJ_NULL) {
         return module_obj;
     }
+    #if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
     // Now try as an extensible built-in (e.g. `time`).
     module_obj = mp_module_get_builtin(module_name_qstr, true);
     if (module_obj != MP_OBJ_NULL) {
         return module_obj;
     }
+    #endif
 
     // Couldn't find the module, so fail
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 1488db5c90e80..c8fdc21f6fbe2 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -85,19 +85,25 @@ def generate_module_table_header(modules):
             )
         )
 
+    # There should always be at least one module (__main__ in runtime.c)
+    assert mod_defs
+
     print("\n#define MICROPY_REGISTERED_MODULES \\")
 
     for mod_def in sorted(mod_defs):
         print("    {mod_def} \\".format(mod_def=mod_def))
-
     print("// MICROPY_REGISTERED_MODULES")
 
-    print("\n#define MICROPY_REGISTERED_EXTENSIBLE_MODULES \\")
+    # There are not necessarily any extensible modules (e.g., bare-arm or minimal x86)
+    print("\n#define MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES ", len(extensible_mod_defs))
 
-    for mod_def in sorted(extensible_mod_defs):
-        print("    {mod_def} \\".format(mod_def=mod_def))
+    if extensible_mod_defs:
+        print("\n#define MICROPY_REGISTERED_EXTENSIBLE_MODULES \\")
+
+        for mod_def in sorted(extensible_mod_defs):
+            print("    {mod_def} \\".format(mod_def=mod_def))
 
-    print("// MICROPY_REGISTERED_EXTENSIBLE_MODULES")
+        print("// MICROPY_REGISTERED_EXTENSIBLE_MODULES")
 
 
 def generate_module_delegations(delegations):
diff --git a/py/objmodule.c b/py/objmodule.c
index 5ee2f7dc86023..8c26cc55a78ac 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -152,11 +152,13 @@ static const mp_rom_map_elem_t mp_builtin_module_table[] = {
 };
 MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
 
+#if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
 static const mp_rom_map_elem_t mp_builtin_extensible_module_table[] = {
     // built-in modules declared with MP_REGISTER_EXTENSIBLE_MODULE()
     MICROPY_REGISTERED_EXTENSIBLE_MODULES
 };
 MP_DEFINE_CONST_MAP(mp_builtin_extensible_module_map, mp_builtin_extensible_module_table);
+#endif
 
 #if MICROPY_MODULE_ATTR_DELEGATION && defined(MICROPY_MODULE_DELEGATIONS)
 typedef struct _mp_module_delegation_entry_t {
@@ -173,7 +175,13 @@ static const mp_module_delegation_entry_t mp_builtin_module_delegation_table[] =
 // Attempts to find (and initialise) a built-in, otherwise returns
 // MP_OBJ_NULL.
 mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
-    mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)(extensible ? &mp_builtin_extensible_module_map : &mp_builtin_module_map), MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+    #if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
+    const mp_map_t *map = extensible ? &mp_builtin_extensible_module_map : &mp_builtin_module_map;
+    #else
+    const mp_map_t *map = &mp_builtin_module_map;
+    #endif
+    mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+
     if (!elem) {
         #if MICROPY_PY_SYS
         // Special case for sys, which isn't extensible but can always be
@@ -183,6 +191,7 @@ mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
         }
         #endif
 
+        #if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
         if (extensible) {
             // At this point we've already tried non-extensible built-ins, the
             // filesystem, and now extensible built-ins. No match, so fail
@@ -204,6 +213,8 @@ mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
             return MP_OBJ_NULL;
         }
         elem = mp_map_lookup((mp_map_t *)&mp_builtin_extensible_module_map, MP_OBJ_NEW_QSTR(qstr_from_strn(module_name_str + 1, module_name_len - 1)), MP_MAP_LOOKUP);
+        #endif
+
         if (!elem) {
             return MP_OBJ_NULL;
         }
diff --git a/py/objmodule.h b/py/objmodule.h
index 8b14cd9fc3d30..78e4da3cac690 100644
--- a/py/objmodule.h
+++ b/py/objmodule.h
@@ -35,7 +35,10 @@
 #endif
 
 extern const mp_map_t mp_builtin_module_map;
+
+#if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
 extern const mp_map_t mp_builtin_extensible_module_map;
+#endif
 
 mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible);
 
diff --git a/py/repl.c b/py/repl.c
index b0ccfa383af3d..87cb50d4785db 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -162,8 +162,11 @@ static bool test_qstr(mp_obj_t obj, qstr name) {
         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) ||
-               mp_map_lookup((mp_map_t *)&mp_builtin_extensible_module_map, MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP);
+        return mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP)
+               #if MICROPY_HAVE_REGISTERED_EXTENSIBLE_MODULES
+               || mp_map_lookup((mp_map_t *)&mp_builtin_extensible_module_map, MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP)
+               #endif
+        ;
     }
 }
 

From d921dd6d61be29866e62b923d3e37859829188bd Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Thu, 2 Oct 2025 13:33:25 -0500
Subject: [PATCH 2933/3129] py/objmodule: Avoid interning a string
 unnecessarily.

If the lookup of the module name less the leading "u" is going to succeed,
it's already a qstr (because that qstr is the key in
`mp_builtin_extensible_module_map`).  So, use a function that will avoid
interning it if it's not already.

For example, if you `import unavailable` it used to intern the string
`navailable`, but now it won't.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/objmodule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objmodule.c b/py/objmodule.c
index 8c26cc55a78ac..2ffa7847f420f 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -212,7 +212,7 @@ mp_obj_t mp_module_get_builtin(qstr module_name, bool extensible) {
         if (module_name_str[0] != 'u') {
             return MP_OBJ_NULL;
         }
-        elem = mp_map_lookup((mp_map_t *)&mp_builtin_extensible_module_map, MP_OBJ_NEW_QSTR(qstr_from_strn(module_name_str + 1, module_name_len - 1)), MP_MAP_LOOKUP);
+        elem = mp_map_lookup((mp_map_t *)&mp_builtin_extensible_module_map, MP_OBJ_NEW_QSTR(qstr_find_strn(module_name_str + 1, module_name_len - 1)), MP_MAP_LOOKUP);
         #endif
 
         if (!elem) {

From b94162b5dfe19ae1083a0bdf0611e07262fe8fe8 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 4 Aug 2025 10:05:28 -0500
Subject: [PATCH 2934/3129] extmod/modwebsocket: Enable split frames and test
 them.

This fixes several assertion errors that were found in fuzz testing, for
unimplemented portions of the websocket spec.  The assertions were either
turned into Python exceptions, or the missing functionality was
implemented.

Split frames are now enabled and work, enabling reception of frames up to
64kB (assuming they are encoded with a 16-bit size field).

Frames with a 64-bit size fields remain unsupported but no longer result in
an assertion error.  Instead, Initial reception of such a frame will result
in OSError(EIO) and subsequent operations on the same websocket will fail
because framing has been lost.

Transmitting frames larger than 64kB is unsupported.  Attempting to
transmit such a frame will result in OSError(ENOBUFS).  Subsequent
operations on the websocket are possible.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/modwebsocket.c               | 22 +++++++++++++++-------
 tests/extmod/websocket_basic.py     | 27 ++++++++++++++++++++++-----
 tests/extmod/websocket_basic.py.exp |  9 +++++++--
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index d31d00160b23b..6640dbe422632 100644
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@@ -76,6 +76,7 @@ static mp_obj_t websocket_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
 static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in);
+
     const mp_stream_p_t *stream_p = mp_get_stream(self->sock);
     while (1) {
         if (self->to_recv != 0) {
@@ -93,9 +94,6 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
 
         switch (self->state) {
             case FRAME_HEADER: {
-                // TODO: Split frame handling below is untested so far, so conservatively disable it
-                assert(self->buf[0] & 0x80);
-
                 // "Control frames MAY be injected in the middle of a fragmented message."
                 // So, they must be processed before data frames (and not alter
                 // self->ws_flags)
@@ -120,14 +118,15 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
                     // Msg size is next 2 bytes
                     to_recv += 2;
                 } else if (sz == 127) {
-                    // Msg size is next 8 bytes
-                    assert(0);
+                    // Msg size is next 8 bytes (unsupported, no way to recover)
+                    mp_stream_close(self->sock);
+                    *errcode = MP_EIO;
+                    return MP_STREAM_ERROR;
                 }
                 if (self->buf[1] & 0x80) {
                     // Next 4 bytes is mask
                     to_recv += 4;
                 }
-
                 self->buf_pos = 0;
                 self->to_recv = to_recv;
                 self->msg_sz = sz; // May be overridden by FRAME_OPT
@@ -146,6 +145,8 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
             case FRAME_OPT: {
                 if ((self->buf_pos & 3) == 2) {
                     // First two bytes are message length
+                    // First two bytes are message length. Technically the size must be at least 126 per RFC6455
+                    // but MicroPython skips checking that.
                     self->msg_sz = (self->buf[0] << 8) | self->buf[1];
                 }
                 if (self->buf_pos >= 4) {
@@ -218,9 +219,16 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
 
 static mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_websocket_t *self = MP_OBJ_TO_PTR(self_in);
-    assert(size < 0x10000);
+    if (size >= 0x10000) {
+        *errcode = MP_ENOBUFS;
+        return MP_STREAM_ERROR;
+    }
     byte header[4] = {0x80 | (self->opts & FRAME_OPCODE_MASK)};
     int hdr_sz;
+    // "Note that in all cases, the minimal number of bytes MUST be used to
+    // encode the length, for example, the length of a 124-byte-long string
+    // can't be encoded as the sequence 126, 0, 124."
+    //   -- https://www.rfc-editor.org/rfc/rfc6455.html
     if (size < 126) {
         header[1] = size;
         hdr_sz = 2;
diff --git a/tests/extmod/websocket_basic.py b/tests/extmod/websocket_basic.py
index 133457784f681..6ebd65d655fe9 100644
--- a/tests/extmod/websocket_basic.py
+++ b/tests/extmod/websocket_basic.py
@@ -13,6 +13,13 @@ def ws_read(msg, sz):
     return ws.read(sz)
 
 
+# put raw data in the stream and do a series of websocket read
+def ws_readn(msg, *args):
+    ws = websocket.websocket(io.BytesIO(msg))
+    for sz in args:
+        yield ws.read(sz)
+
+
 # do a websocket write and then return the raw data from the stream
 def ws_write(msg, sz):
     s = io.BytesIO()
@@ -24,18 +31,28 @@ def ws_write(msg, sz):
 
 # basic frame
 print(ws_read(b"\x81\x04ping", 4))
-print(ws_read(b"\x80\x04ping", 4))  # FRAME_CONT
 print(ws_write(b"pong", 6))
 
-# split frames are not supported
-# print(ws_read(b"\x01\x04ping", 4))
+# split frames and irregular size reads
+for s in ws_readn(b"\x01\x04ping\x00\x04Ping\x80\x04PING", 6, 4, 2, 2):
+    print(s)
 
 # extended payloads
 print(ws_read(b"\x81~\x00\x80" + b"ping" * 32, 128))
 print(ws_write(b"pong" * 32, 132))
 
-# mask (returned data will be 'mask' ^ 'mask')
-print(ws_read(b"\x81\x84maskmask", 4))
+# 64-bit payload size, unsupported by MicroPython implementation. Framing is lost.
+msg = b"\x81\x7f\x00\x00\x00\x00\x00\x00\x00\x80" + b"ping" * 32
+ws = websocket.websocket(io.BytesIO(msg))
+try:
+    print(ws.read(1))
+except OSError as e:
+    print("ioctl: EIO:", e.errno == errno.EIO)
+
+# mask (returned data will be 'maskmask' ^ 'maskMASK')
+print(ws_read(b"\x81\x88maskmaskMASK", 8))
+# mask w/2-byte payload len (returned data will be 'maskmask' ^ 'maskMASK')
+print(ws_read(b"\x81\xfe\x00\x08maskmaskMASK", 8))
 
 # close control frame
 s = io.BytesIO(b"\x88\x00")  # FRAME_CLOSE
diff --git a/tests/extmod/websocket_basic.py.exp b/tests/extmod/websocket_basic.py.exp
index 152aae836d6a0..e4164ac69b1b9 100644
--- a/tests/extmod/websocket_basic.py.exp
+++ b/tests/extmod/websocket_basic.py.exp
@@ -1,9 +1,14 @@
 b'ping'
-b'ping'
 b'\x81\x04pong'
+b'pingPi'
+b'ngPI'
+b'NG'
+b''
 b'pingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingpingping'
 b'\x81~\x00\x80pongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpongpong'
-b'\x00\x00\x00\x00'
+ioctl: EIO: True
+b'\x00\x00\x00\x00    '
+b'\x00\x00\x00\x00    '
 b''
 b'\x88\x00'
 b'ping'

From 8013ef44db80f7fa941c4c404c848ba46cb1706b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sat, 4 Oct 2025 19:03:47 -0500
Subject: [PATCH 2935/3129] extmod/modwebsocket: Save a few bytes of text by
 using bit checks.

.. at least on x86_64 (unix standard build).  Size was unchanged on
RPI_PICO_W.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 extmod/modwebsocket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index 6640dbe422632..6a35dc1dbe495 100644
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@@ -143,13 +143,13 @@ static mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
             }
 
             case FRAME_OPT: {
-                if ((self->buf_pos & 3) == 2) {
-                    // First two bytes are message length
+                if (self->buf_pos & 2) { // to_recv was 2 or 6
+                    assert(self->buf_pos == 2 || self->buf_pos == 6);
                     // First two bytes are message length. Technically the size must be at least 126 per RFC6455
                     // but MicroPython skips checking that.
                     self->msg_sz = (self->buf[0] << 8) | self->buf[1];
                 }
-                if (self->buf_pos >= 4) {
+                if (self->buf_pos & 4) {
                     // Last 4 bytes is mask
                     memcpy(self->mask, self->buf + self->buf_pos - 4, 4);
                 }

From 6729493531b1910064ccd1eb95e65ed07f4d0f17 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sat, 4 Oct 2025 19:20:56 -0500
Subject: [PATCH 2936/3129] tests/extmod: Test websocket too-big packet
 transmission.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tests/extmod/websocket_toobig.py     | 28 ++++++++++++++++++++++++++++
 tests/extmod/websocket_toobig.py.exp |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 tests/extmod/websocket_toobig.py
 create mode 100644 tests/extmod/websocket_toobig.py.exp

diff --git a/tests/extmod/websocket_toobig.py b/tests/extmod/websocket_toobig.py
new file mode 100644
index 0000000000000..f4c5a74bbceac
--- /dev/null
+++ b/tests/extmod/websocket_toobig.py
@@ -0,0 +1,28 @@
+try:
+    import io
+    import errno
+    import websocket
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    buf = "x" * 65536
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
+
+# do a websocket write and then return the raw data from the stream
+def ws_write(msg, sz):
+    s = io.BytesIO()
+    ws = websocket.websocket(s)
+    ws.write(msg)
+    s.seek(0)
+    return s.read(sz)
+
+
+try:
+    print(ws_write(buf, 1))
+except OSError as e:
+    print("ioctl: ENOBUFS:", e.errno == errno.ENOBUFS)
diff --git a/tests/extmod/websocket_toobig.py.exp b/tests/extmod/websocket_toobig.py.exp
new file mode 100644
index 0000000000000..3bbd95282fdfe
--- /dev/null
+++ b/tests/extmod/websocket_toobig.py.exp
@@ -0,0 +1 @@
+ioctl: ENOBUFS: True

From 8204f9e8c3a877535b4a445b61030974be7cbd61 Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Sun, 8 Jun 2025 10:04:36 +0800
Subject: [PATCH 2937/3129] unix/Makefile: Allow out-of-tree tests.

This allows out-of-tree tests like:

    $ make -C ports/unix/ BUILD=/tmp MICROPY_MPYCROSS=~/bin/mpy-cross test

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 ports/unix/Makefile | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 7df4c6f79b53c..81751bf0f7b2c 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -26,6 +26,9 @@ FROZEN_MANIFEST ?= variants/manifest.py
 # This should be configured by the mpconfigvariant.mk
 PROG ?= micropython
 
+# For use in test rules below
+ABS_PROG = $(abspath $(BUILD)/$(PROG))
+
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS += qstrdefsport.h
 QSTR_GLOBAL_DEPENDENCIES += $(VARIANT_DIR)/mpconfigvariant.h
@@ -257,16 +260,13 @@ include $(TOP)/py/mkrules.mk
 .PHONY: test test_full_no_native test_full test//% test/% test-failures print-failures clean-failures
 
 test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=$(ABS_PROG) ./run-tests.py
 
 test//%: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py -i "$*"
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=$(ABS_PROG) ./run-tests.py -i "$*"
 
 test-failures: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --run-failures
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=$(ABS_PROG) ./run-tests.py --run-failures
 
 print-failures:
 	cd $(TOP)/tests && ./run-tests.py --print-failures
@@ -275,18 +275,15 @@ clean-failures:
 	cd $(TOP)/tests && ./run-tests.py --clean-failures
 
 test/%: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py -d "$*"
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=$(ABS_PROG) ./run-tests.py -d "$*"
 
 test_full_no_native: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py test
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS)
-	cat $(TOP)/tests/basics/0prelim.py | ./$(BUILD)/$(PROG) | grep -q 'abc'
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=$(ABS_PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS)
+	cat $(TOP)/tests/basics/0prelim.py | $(ABS_PROG) | grep -q 'abc'
 
 test_full: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py test_full_no_native
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	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) --emit native
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=$(ABS_PROG) ./run-tests.py --emit native
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=$(ABS_PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native
 
 test_gcov: test_full
 	gcov -o $(BUILD)/py $(TOP)/py/*.c

From 325ec7e30e028efba66e46288a9f315598b03ab3 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Fri, 26 Sep 2025 17:39:45 -0500
Subject: [PATCH 2938/3129] gitignore: Ignore files created by ci.sh zepyhr and
 esp8266.

After locally building zephyr e.g., with

    $ tools/ci.sh zephyr_setup zephyr_run_tests

these directories are created by the build system.  However, they should
never be tracked by git.  Similarly with the esp8266 ci.sh functions.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 .gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index b5010dfd14db6..56616426fb27a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,11 @@ user.props
 
 # MacOS desktop metadata files
 .DS_Store
+
+# Created by ci.sh zephyr targets
+/.ccache
+/zephyrproject
+
+# Created by ci.sh esp8266 targets
+/xtensa-lx106-elf-standalone.tar.gz
+/xtensa-lx106-elf/

From aacad2dd652c6aa7cae5510fad30e341b39c61b2 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 24 Sep 2025 09:17:25 +1000
Subject: [PATCH 2939/3129] lib/tinyusb: Update to version 0.18.0.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 5217cee5de4cd..86ad6e56c1700 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 5217cee5de4cd555018da90f9f1bcc87fb1c1d3a
+Subproject commit 86ad6e56c1700e85f1c5678607a762cfe3aa2f47

From ac4649da6e8328d8e80f4a95156f47d9258a29bf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Sep 2025 11:26:39 +1000
Subject: [PATCH 2940/3129] alif/tinyusb_port: Update dcd_init function to
 match TinyUSB v0.18.0.

These changes correspond to the following TinyUSB commits:

- d997f0071ea5d2d07e340d183fffb97e09526773
  change dcd_init() to take rhport struct

- 1f18be93db39dbc57bbf34f982dbe07e209a2ae3
  change the tusb_rhport_init_t struct, exclude the rhport to make API more
  consistent

- e83e08343afca86b2bacf26822ef9032571e6f56
  change dcd_init() return from void to bool

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/tinyusb_port/tusb_alif_dcd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/alif/tinyusb_port/tusb_alif_dcd.c b/ports/alif/tinyusb_port/tusb_alif_dcd.c
index cae0be8d8468e..c8f86082ddc5b 100644
--- a/ports/alif/tinyusb_port/tusb_alif_dcd.c
+++ b/ports/alif/tinyusb_port/tusb_alif_dcd.c
@@ -75,7 +75,7 @@ void dcd_uninit(void);
 
 // Initializes the USB peripheral for device mode and enables it.
 // This function should enable internal D+/D- pull-up for enumeration.
-void dcd_init(uint8_t rhport)
+bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init)
 {
     // enable 20mhz clock
     enable_cgu_clk20m();
@@ -172,6 +172,8 @@ void dcd_init(uint8_t rhport)
     NVIC_SetPriority(USB_IRQ_IRQn, 5);
 #endif
     dcd_int_enable(rhport);
+
+    return true;
 }
 
 

From 01a11ea45efe8e5fe7d2049902f7d6e6818d3ec1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Oct 2025 19:49:40 +1000
Subject: [PATCH 2941/3129] webassembly/objjsproxy: Support arbitrary number of
 args with kwargs.

When calling from Python into JavaScript and passing along keyword
arguments, the FFI bindings currently only support at most 1 positional
argument. For example:

    import js
    js.func(1, b=2, c=3)

This commit fixes that by supporting arbitrary number of positional
arguments, in combination with keyword arguments.  So now the following
works:

    import js
    js.func(1, 2, c=3, d=4)

Tests are added for these new, supported cases.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/objjsproxy.c           | 36 +++++++++++++-----------
 tests/ports/webassembly/fun_call.mjs     | 27 ++++++++++++++++++
 tests/ports/webassembly/fun_call.mjs.exp | 20 +++++++++++++
 3 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/ports/webassembly/objjsproxy.c b/ports/webassembly/objjsproxy.c
index 93c40d8356b64..7d6e0203b7ba2 100644
--- a/ports/webassembly/objjsproxy.c
+++ b/ports/webassembly/objjsproxy.c
@@ -153,20 +153,24 @@ EM_JS(void, call0_kwarg, (int f_ref, bool via_call, uint32_t n_kw, uint32_t * ke
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
 
-EM_JS(void, call1_kwarg, (int f_ref, bool via_call, uint32_t * arg0, uint32_t n_kw, uint32_t * key, uint32_t * value, uint32_t * out), {
+EM_JS(void, calln_kwarg, (int f_ref, bool via_call, uint32_t n_args, uint32_t * args_value, uint32_t n_kw, uint32_t * kw_key, uint32_t * kw_value, uint32_t * out), {
     const f = proxy_js_ref[f_ref];
-    const a0 = proxy_convert_mp_to_js_obj_jsside(arg0);
-    const a = {};
+    const a = [];
+    for (let i = 0; i < n_args; ++i) {
+        const v = proxy_convert_mp_to_js_obj_jsside(args_value + i * 3 * 4);
+        a.push(v);
+    }
+    const ks = {};
     for (let i = 0; i < n_kw; ++i) {
-        const k = UTF8ToString(getValue(key + i * 4, "i32"));
-        const v = proxy_convert_mp_to_js_obj_jsside(value + i * 3 * 4);
-        a[k] = v;
+        const k = UTF8ToString(getValue(kw_key + i * 4, "i32"));
+        const v = proxy_convert_mp_to_js_obj_jsside(kw_value + i * 3 * 4);
+        ks[k] = v;
     }
     let ret;
     if (via_call) {
-        ret = f.call(a0, a);
+        ret = f.call(... a, ks);
     } else {
-        ret = f(a0, a);
+        ret = f(... a, ks);
     }
     proxy_convert_js_to_mp_obj_jsside(ret, out);
 });
@@ -218,10 +222,9 @@ static void jsproxy_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
 static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_jsproxy_t *self = MP_OBJ_TO_PTR(self_in);
 
-    if (n_kw == 0) {
-        mp_arg_check_num(n_args, n_kw, 0, MP_OBJ_FUN_ARGS_MAX, false);
-    } else {
-        mp_arg_check_num(n_args, n_kw, 0, 1, true);
+    mp_arg_check_num(n_args, n_kw, 0, MP_OBJ_FUN_ARGS_MAX, true);
+
+    if (n_kw != 0) {
         uint32_t key[n_kw];
         uint32_t value[PVN * n_kw];
         for (int i = 0; i < n_kw; ++i) {
@@ -232,10 +235,11 @@ static mp_obj_t jsproxy_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         if (n_args == 0) {
             call0_kwarg(self->ref, self->bind_to_self, n_kw, key, value, out);
         } else {
-            // n_args == 1
-            uint32_t arg0[PVN];
-            proxy_convert_mp_to_js_obj_cside(args[0], arg0);
-            call1_kwarg(self->ref, self->bind_to_self, arg0, n_kw, key, value, out);
+            uint32_t value_args[PVN * n_args];
+            for (int i = 0; i < n_args; ++i) {
+                proxy_convert_mp_to_js_obj_cside(args[i], &value_args[i * PVN]);
+            }
+            calln_kwarg(self->ref, self->bind_to_self, n_args, value_args, n_kw, key, value, out);
         }
         return proxy_convert_js_to_mp_obj_cside(out);
     }
diff --git a/tests/ports/webassembly/fun_call.mjs b/tests/ports/webassembly/fun_call.mjs
index 295745d2e2e34..3a24d61bb9368 100644
--- a/tests/ports/webassembly/fun_call.mjs
+++ b/tests/ports/webassembly/fun_call.mjs
@@ -15,3 +15,30 @@ js.f(1, 2, 3, 4)
 js.f(1, 2, 3, 4, 5)
 js.f(1, 2, 3, 4, 5, 6)
 `);
+
+globalThis.g = (...args) => {
+    console.log(args);
+};
+mp.runPython(`
+import js
+js.g()
+js.g(a=1)
+js.g(a=1, b=2)
+js.g(a=1, b=2, c=3)
+js.g(a=1, b=2, c=3, d=4)
+js.g(a=1, b=2, c=3, d=4, e=5)
+js.g(1)
+js.g(1, b=2)
+js.g(1, b=2, c=3)
+js.g(1, b=2, c=3, d=4)
+js.g(1, b=2, c=3, d=4, e=5)
+js.g(1, 2)
+js.g(1, 2, c=3)
+js.g(1, 2, c=3, d=4)
+js.g(1, 2, c=3, d=4, e=5)
+js.g(1, 2, 3)
+js.g(1, 2, 3, d=4)
+js.g(1, 2, 3, d=4, e=5)
+js.g(1, 2, 3, 4)
+js.g(1, 2, 3, 4, e=5)
+`);
diff --git a/tests/ports/webassembly/fun_call.mjs.exp b/tests/ports/webassembly/fun_call.mjs.exp
index e9ed5f6ddf9de..57edb39a47ce2 100644
--- a/tests/ports/webassembly/fun_call.mjs.exp
+++ b/tests/ports/webassembly/fun_call.mjs.exp
@@ -5,3 +5,23 @@ undefined undefined undefined undefined undefined
 1 2 3 4 undefined
 1 2 3 4 5
 1 2 3 4 5
+[]
+[ { a: 1 } ]
+[ { a: 1, b: 2 } ]
+[ { a: 1, b: 2, c: 3 } ]
+[ { a: 1, b: 2, c: 3, d: 4 } ]
+[ { a: 1, b: 2, c: 3, d: 4, e: 5 } ]
+[ 1 ]
+[ 1, { b: 2 } ]
+[ 1, { b: 2, c: 3 } ]
+[ 1, { b: 2, c: 3, d: 4 } ]
+[ 1, { b: 2, c: 3, d: 4, e: 5 } ]
+[ 1, 2 ]
+[ 1, 2, { c: 3 } ]
+[ 1, 2, { c: 3, d: 4 } ]
+[ 1, 2, { c: 3, d: 4, e: 5 } ]
+[ 1, 2, 3 ]
+[ 1, 2, 3, { d: 4 } ]
+[ 1, 2, 3, { d: 4, e: 5 } ]
+[ 1, 2, 3, 4 ]
+[ 1, 2, 3, 4, { e: 5 } ]

From 5552fbe17240aedcada2ce3a5fbb5136a3087f65 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 17 Sep 2025 10:29:54 -0500
Subject: [PATCH 2942/3129] py/mpprint: Correctly format leading zeros with
 separators.

Correctly format integers when there are leading zeros with a grouping
character, such as "{:04,d}".format(0x100) -> "0,256".

The new padding patterns for commas-and-zeroes and underscores-and-zeroes
are smooshed together into the existing pad_zeroes to save space.

Only the two combinations of (decimal + commas) and (other bases +
underscores) are properly supported.

Also add a test for it.

Fixes issue #18082.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/mpprint.c                      | 39 +++++++++++++++++++++++++++----
 tests/basics/string_format_sep.py |  9 +++++++
 2 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 tests/basics/string_format_sep.py

diff --git a/py/mpprint.c b/py/mpprint.c
index bd7a250878b89..89b3dbd7676ca 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -40,8 +40,20 @@
 #include "py/formatfloat.h"
 #endif
 
-static const char pad_spaces[] = "                ";
-static const char pad_zeroes[] = "0000000000000000";
+static const char pad_spaces[16] = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '};
+#define pad_spaces_size  (sizeof(pad_spaces))
+static const char pad_common[23] = {'0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '_', '0', '0', '0', ',', '0', '0'};
+// The contents of pad_common is arranged to provide the following padding
+// strings with minimal flash size:
+//     0000000000000000 <- pad_zeroes
+//                 0000_000 <- pad_zeroes_underscore (offset: 12, size 5)
+//                      000,00 <- pad_zeroes_comma (offset: 17, size 4)
+#define pad_zeroes       (pad_common + 0)
+#define pad_zeroes_size  (16)
+#define pad_zeroes_underscore (pad_common + 12)
+#define pad_zeroes_underscore_size  (5)
+#define pad_zeroes_comma (pad_common + 17)
+#define pad_zeroes_comma_size  (4)
 
 static void plat_print_strn(void *env, const char *str, size_t len) {
     (void)env;
@@ -65,13 +77,30 @@ int mp_print_strn(const mp_print_t *print, const char *str, size_t len, unsigned
     int pad_size;
     int total_chars_printed = 0;
     const char *pad_chars;
+    char grouping = flags >> PF_FLAG_SEP_POS;
 
     if (!fill || fill == ' ') {
         pad_chars = pad_spaces;
-        pad_size = sizeof(pad_spaces) - 1;
-    } else if (fill == '0') {
+        pad_size = pad_spaces_size;
+    } else if (fill == '0' && !grouping) {
         pad_chars = pad_zeroes;
-        pad_size = sizeof(pad_zeroes) - 1;
+        pad_size = pad_zeroes_size;
+    } else if (fill == '0') {
+        if (grouping == '_') {
+            pad_chars = pad_zeroes_underscore;
+            pad_size = pad_zeroes_underscore_size;
+        } else {
+            pad_chars = pad_zeroes_comma;
+            pad_size = pad_zeroes_comma_size;
+        }
+        // The result will never start with a grouping character. An extra leading zero is added.
+        // width is dead after this so we can use it in calculation
+        if (width % pad_size == 0) {
+            pad++;
+            width++;
+        }
+        // position the grouping character correctly within the pad repetition
+        pad_chars += pad_size - 1 - width % pad_size;
     } else {
         // Other pad characters are fairly unusual, so we'll take the hit
         // and output them 1 at a time.
diff --git a/tests/basics/string_format_sep.py b/tests/basics/string_format_sep.py
new file mode 100644
index 0000000000000..de131fdaf3383
--- /dev/null
+++ b/tests/basics/string_format_sep.py
@@ -0,0 +1,9 @@
+try:
+    "%d" % 1
+except TypeError:
+    print("SKIP")
+    raise SystemExit
+
+for v in (0, 0x10, 0x1000, -0x10, -0x1000):
+    for sz in range(1, 12): print(("{:0%d,d}" % sz).format(v))
+    for sz in range(1, 12): print(("{:0%d_x}" % sz).format(v))

From 4963ae72bf7a30aa7d0268383c49ce2ae68f3157 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 17 Sep 2025 15:19:20 -0500
Subject: [PATCH 2943/3129] tests/cpydiff: Document unsupported float format
 with grouping char.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tests/cpydiff/types_str_formatsep_float.py | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 tests/cpydiff/types_str_formatsep_float.py

diff --git a/tests/cpydiff/types_str_formatsep_float.py b/tests/cpydiff/types_str_formatsep_float.py
new file mode 100644
index 0000000000000..b487cd3758e73
--- /dev/null
+++ b/tests/cpydiff/types_str_formatsep_float.py
@@ -0,0 +1,11 @@
+"""
+categories: Types,str
+description: MicroPython accepts but does not properly implement the "," or "_" grouping character for float values
+cause: To reduce code size, MicroPython does not implement this combination. Grouping characters will not appear in the number's significant digits and will appear at incorrect locations in leading zeros.
+workaround: Do not use a format string like ``{:,f}`` if exact CPython compatibility is required.
+"""
+
+print("{:,f}".format(3141.159))
+print("{:_f}".format(3141.159))
+print("{:011,.2f}".format(3141.159))
+print("{:011_.2f}".format(3141.159))

From aad6ee3d8c676c58c9dc390aa410bd8259268f44 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 15 Sep 2024 22:12:17 +1000
Subject: [PATCH 2944/3129] esp32/machine_i2c: Use IDF function for calculating
 main timeout.

The esp32 I2C driver sets a global timeout during init.  The functionality
for this is currently only correct for original esp32 and esp32-s2, newer
parts have a slightly different argument which is log-base-2 of the
timeout.

Note that `i2c_set_timeout()` is a thin layer around `i2c_ll_set_tout()`
with the latter writing directly to the hardware register.  So the timeout
argument passed to `i2c_set_timeout()` needs to be in units calculated by
`i2c_ll_calculate_timeout_us_to_reg_val()`.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/esp32/machine_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index e8d913def9392..74679d01da224 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -257,7 +257,7 @@ static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, bool first_init) {
         .master.clk_speed = self->freq,
     };
     i2c_param_config(self->port, &conf);
-    int timeout = I2C_SCLK_FREQ / 1000000 * self->timeout_us;
+    int timeout = i2c_ll_calculate_timeout_us_to_reg_val(I2C_SCLK_FREQ, self->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);
 }

From fef414eca49c44180fba9a0ab32e647c0373e67f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 13:44:42 -0500
Subject: [PATCH 2945/3129] tools/metrics.py: Use all CPUs during comparison
 builds.

Don't simply hard-code a parallelism of 3 for the build.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/metrics.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/metrics.py b/tools/metrics.py
index 150b40bff10cd..9f2496d35ac14 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -43,9 +43,9 @@
 
 """
 
-import collections, sys, re, subprocess
+import collections, sys, re, subprocess, multiprocessing
 
-MAKE_FLAGS = ["-j3", "CFLAGS_EXTRA=-DNDEBUG"]
+MAKE_FLAGS = ["-j{}".format(multiprocessing.cpu_count()), "CFLAGS_EXTRA=-DNDEBUG"]
 
 
 class PortData:

From 77729fe3f7198dc5c6f353ec78856159544c7abf Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 13:45:41 -0500
Subject: [PATCH 2946/3129] tools/ci.sh: Manipulate pipefail better.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index a5555647bd7bb..64c9d465d81de 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -105,13 +105,11 @@ function ci_code_size_build {
         git submodule update --init $SUBMODULES
         git show -s
         tools/metrics.py clean $PORTS_TO_CHECK
-        tools/metrics.py build $PORTS_TO_CHECK | tee $OUTFILE
+        # Allow errors from tools/metrics.py to propagate out of the pipe above.
+        (set -o pipefail; tools/metrics.py build $PORTS_TO_CHECK | tee $OUTFILE)
         return $?
     }
 
-    # Allow errors from tools/metrics.py to propagate out of the pipe above.
-    set -o pipefail
-
     # build reference, save to size0
     # ignore any errors with this build, in case master is failing
     code_size_build_step $REFERENCE ~/size0
@@ -119,7 +117,6 @@ function ci_code_size_build {
     code_size_build_step $COMPARISON ~/size1
     STATUS=$?
 
-    set +o pipefail
     unset -f code_size_build_step
 
     return $STATUS

From 0224b998636af09157a033933012e669cf12a071 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 13:46:37 -0500
Subject: [PATCH 2947/3129] tools/ci.sh: Add and use new ci_code_size_report
 function.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 .github/workflows/code_size.yml | 2 +-
 tools/ci.sh                     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 34bdf744cb7ca..f82d1d0c73567 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -33,7 +33,7 @@ jobs:
     - name: Build
       run: tools/ci.sh code_size_build
     - name: Compute code size difference
-      run: tools/metrics.py diff ~/size0 ~/size1 | tee diff
+      run: source tools/ci.sh && ci_code_size_report
     - name: Save PR number
       if: github.event_name == 'pull_request'
       env:
diff --git a/tools/ci.sh b/tools/ci.sh
index 64c9d465d81de..17044edf28806 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -122,6 +122,11 @@ function ci_code_size_build {
     return $STATUS
 }
 
+function ci_code_size_report {
+    # Allow errors from tools/metrics.py to propagate out of the pipe above.
+    (set -o pipefail; tools/metrics.py diff ~/size0 ~/size1 | tee diff)
+}
+
 ########################################################################################
 # .mpy file format
 

From 449866cb0af3fc547df6538a6552517cc8974616 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 13:50:28 -0500
Subject: [PATCH 2948/3129] tools/ci.sh: Exit with error if zcat fails during
 ci_esp8266_setup.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 17044edf28806..e6f33416b048c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -232,7 +232,7 @@ function ci_esp32_build_c2_c6 {
 function ci_esp8266_setup {
     sudo pip3 install pyserial esptool==3.3.1 pyelftools ar
     wget https://micropython.org/resources/xtensa-lx106-elf-standalone.tar.gz
-    zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+    (set -o pipefile; 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
 }

From 2c34497bd1f7edfbe288a0ddab28ee953d034cea Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 14:08:21 -0500
Subject: [PATCH 2949/3129] tools/metrics.py: When cleaning also clean
 mpy-cross.

Changes of interest could be in emitted mpy frozen files.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/metrics.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/metrics.py b/tools/metrics.py
index 9f2496d35ac14..361874c2528f5 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -185,6 +185,10 @@ def do_clean(args):
     ports = parse_port_list(args)
 
     print("CLEANING")
+
+    if any(port.needs_mpy_cross for port in ports):
+        syscmd("make", "-C", "mpy-cross", "clean")
+
     for port in ports:
         syscmd("make", "-C", "ports/{}".format(port.dir), port.make_flags, "clean")
 

From f982158f42df65f2ddf295df9b92d74be6357d44 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 13:45:17 -0500
Subject: [PATCH 2950/3129] tools/ci.sh: Let code_size_build be customized via
 environment.

For instance, to compare HEAD to origin/master on only the minimal x86
build, use

    PORTS_TO_CHECK=m REFERENCE=origin/master tools/ci.sh code_size_build

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index e6f33416b048c..1e5a7e5420b36 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -82,16 +82,20 @@ function ci_code_size_setup {
 
 function ci_code_size_build {
     # check the following ports for the change in their code size
-    PORTS_TO_CHECK=bmusxpdv
+    # Override the list by setting PORTS_TO_CHECK in the environment before invoking ci.
+    : ${PORTS_TO_CHECK:=bmusxpdv}
+    
     SUBMODULES="lib/asf4 lib/berkeley-db-1.xx lib/btstack lib/cyw43-driver lib/lwip lib/mbedtls lib/micropython-lib lib/nxp_driver lib/pico-sdk lib/stm32lib lib/tinyusb"
 
     # Default GitHub pull request sets HEAD to a generated merge commit
     # between PR branch (HEAD^2) and base branch (i.e. master) (HEAD^1).
     #
     # We want to compare this generated commit with the base branch, to see what
-    # the code size impact would be if we merged this PR.
-    REFERENCE=$(git rev-parse --short HEAD^1)
-    COMPARISON=$(git rev-parse --short HEAD)
+    # the code size impact would be if we merged this PR. During CI we are at a merge commit,
+    # so this tests the merged PR against its merge base.
+    # Override the refs by setting REFERENCE and/or COMPARISON in the environment before invoking ci.
+    : ${REFERENCE:=$(git rev-parse --short HEAD^1)}
+    : ${COMPARISON:=$(git rev-parse --short HEAD)}
 
     echo "Comparing sizes of reference ${REFERENCE} to ${COMPARISON}..."
     git log --oneline $REFERENCE..$COMPARISON

From 7778e78843b7e157b164b450ce9965ed4f7f3048 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 14:09:49 -0500
Subject: [PATCH 2951/3129] tools/metrics.py: Allow pre_cmd to set up
 environment.

This is a necessary step to allow cleanly building the xtensa port during
CI, as it's undesirable to apply the esp-idf environment settings while
building other ports.

PRE_CMD_<letter> can be used to override the command, or add a command if
not otherwise specified.  Note that <letter> is case sensitive.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/metrics.py | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/tools/metrics.py b/tools/metrics.py
index 361874c2528f5..d552857c4b359 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -43,18 +43,19 @@
 
 """
 
-import collections, sys, re, subprocess, multiprocessing
+import collections, os, sys, re, shlex, subprocess, multiprocessing
 
 MAKE_FLAGS = ["-j{}".format(multiprocessing.cpu_count()), "CFLAGS_EXTRA=-DNDEBUG"]
 
 
 class PortData:
-    def __init__(self, name, dir, output, make_flags=None):
+    def __init__(self, name, dir, output, make_flags=None, pre_cmd=None):
         self.name = name
         self.dir = dir
         self.output = output
         self.make_flags = make_flags
         self.needs_mpy_cross = dir not in ("bare-arm", "minimal")
+        self.pre_cmd = pre_cmd
 
 
 mpy_cross_output = "mpy-cross/build/mpy-cross"
@@ -67,7 +68,12 @@ 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-ESP8266_GENERIC/firmware.elf"),
-    "3": PortData("esp32", "esp32", "build-ESP32_GENERIC/micropython.elf"),
+    "3": PortData(
+        "esp32",
+        "esp32",
+        "build-ESP32_GENERIC/micropython.elf",
+        pre_cmd=". esp-idf/export.sh",
+    ),
     "x": PortData("mimxrt", "mimxrt", "build-TEENSY40/firmware.elf"),
     "e": PortData("renesas-ra", "renesas-ra", "build-EK_RA6M2/firmware.elf"),
     "r": PortData("nrf", "nrf", "build-PCA10040/firmware.elf"),
@@ -76,8 +82,15 @@ def __init__(self, name, dir, output, make_flags=None):
     "v": PortData("qemu rv32", "qemu", "build-VIRT_RV32/firmware.elf", "BOARD=VIRT_RV32"),
 }
 
+for port_letter, port in port_data.items():
+    port.pre_cmd = os.environ.get(f"PRE_CMD_{port_letter}", port.pre_cmd)
 
-def syscmd(*args):
+
+def quoted(args):
+    return " ".join(shlex.quote(word) for word in args)
+
+
+def syscmd(*args, pre_cmd=None):
     sys.stdout.flush()
     a2 = []
     for a in args:
@@ -85,6 +98,10 @@ def syscmd(*args):
             a2.append(a)
         elif a:
             a2.extend(a)
+    if pre_cmd is not None:
+        a2_quoted = quoted(a2)
+        a2 = ["bash", "-c", "{} && {}".format(pre_cmd, a2_quoted)]
+        print(a2)
     subprocess.check_call(a2)
 
 
@@ -190,7 +207,14 @@ def do_clean(args):
         syscmd("make", "-C", "mpy-cross", "clean")
 
     for port in ports:
-        syscmd("make", "-C", "ports/{}".format(port.dir), port.make_flags, "clean")
+        syscmd(
+            "make",
+            "-C",
+            "ports/{}".format(port.dir),
+            port.make_flags,
+            "clean",
+            pre_cmd=port.pre_cmd,
+        )
 
 
 def do_build(args):
@@ -204,7 +228,14 @@ def do_build(args):
 
     print("BUILDING PORTS")
     for port in ports:
-        syscmd("make", "-C", "ports/{}".format(port.dir), MAKE_FLAGS, port.make_flags)
+        syscmd(
+            "make",
+            "-C",
+            "ports/{}".format(port.dir),
+            MAKE_FLAGS,
+            port.make_flags,
+            pre_cmd=port.pre_cmd,
+        )
 
     do_sizes(args)
 

From 61988ee8fa86a3b6bf017355b4fb04238112dd35 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 3 Sep 2025 14:47:06 -0500
Subject: [PATCH 2952/3129] tools/ci.sh: Return to old branch after
 code_size_build.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 1e5a7e5420b36..fe71c30c5434a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -100,30 +100,33 @@ function ci_code_size_build {
     echo "Comparing sizes of reference ${REFERENCE} to ${COMPARISON}..."
     git log --oneline $REFERENCE..$COMPARISON
 
-    function code_size_build_step {
-        COMMIT=$1
-        OUTFILE=$2
-
-        echo "Building ${COMMIT}..."
-        git checkout --detach $COMMIT
-        git submodule update --init $SUBMODULES
-        git show -s
-        tools/metrics.py clean $PORTS_TO_CHECK
-        # Allow errors from tools/metrics.py to propagate out of the pipe above.
-        (set -o pipefail; tools/metrics.py build $PORTS_TO_CHECK | tee $OUTFILE)
-        return $?
-    }
-
-    # build reference, save to size0
-    # ignore any errors with this build, in case master is failing
-    code_size_build_step $REFERENCE ~/size0
-    # build PR/branch, save to size1
-    code_size_build_step $COMPARISON ~/size1
-    STATUS=$?
-
-    unset -f code_size_build_step
-
-    return $STATUS
+    OLD_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+
+    ( # Execute in a subshell so the trap & code_size_build_step doesn't leak
+        function code_size_build_step {
+            if [ ! -z "$OLD_BRANCH" ]; then
+                trap 'git checkout "$OLD_BRANCH"' RETURN EXIT ERR
+            fi
+
+            COMMIT=$1
+            OUTFILE=$2
+
+            echo "Building ${COMMIT}..."
+            git checkout --detach $COMMIT
+            git submodule update --init $SUBMODULES
+            git show -s
+            tools/metrics.py clean "$PORTS_TO_CHECK"
+            # Allow errors from tools/metrics.py to propagate out of the pipe below.
+            set -o pipefail
+            tools/metrics.py build "$PORTS_TO_CHECK" | tee $OUTFILE
+        }
+
+        # build reference, save to size0
+        # ignore any errors with this build, in case master is failing
+        code_size_build_step $REFERENCE ~/size0
+        # build PR/branch, save to size1
+        code_size_build_step $COMPARISON ~/size1
+    )
 }
 
 function ci_code_size_report {

From 13d49751f4f656c4ea12f3ed4cde2c404cf557ae Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Fri, 26 Sep 2025 15:30:09 -0500
Subject: [PATCH 2953/3129] tools/ci.sh: Re-add IGNORE_ERRORS to
 ci_code_size_build.

It was removed (possibly inadvertently)
in 4c55b0879b38b373b44e84552d6754b7842b5b72

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index fe71c30c5434a..80749d4b713f0 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -110,6 +110,7 @@ function ci_code_size_build {
 
             COMMIT=$1
             OUTFILE=$2
+            IGNORE_ERRORS=$3
 
             echo "Building ${COMMIT}..."
             git checkout --detach $COMMIT
@@ -118,14 +119,15 @@ function ci_code_size_build {
             tools/metrics.py clean "$PORTS_TO_CHECK"
             # Allow errors from tools/metrics.py to propagate out of the pipe below.
             set -o pipefail
-            tools/metrics.py build "$PORTS_TO_CHECK" | tee $OUTFILE
+            tools/metrics.py build "$PORTS_TO_CHECK" | tee $OUTFILE || $IGNORE_ERRORS
+            return $?
         }
 
         # build reference, save to size0
         # ignore any errors with this build, in case master is failing
-        code_size_build_step $REFERENCE ~/size0
+        code_size_build_step $REFERENCE ~/size0 true
         # build PR/branch, save to size1
-        code_size_build_step $COMPARISON ~/size1
+        code_size_build_step $COMPARISON ~/size1 false
     )
 }
 

From 8995a291e05aef6c2ab1a24647355eae87dca391 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 8 Oct 2025 17:03:52 +1100
Subject: [PATCH 2954/3129] tools/ci: Fix typo of pipefail.

Regression from 449866cb0af3fc547df6538a6552517cc8974616.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 80749d4b713f0..815e9bd4b1fed 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -241,7 +241,7 @@ function ci_esp32_build_c2_c6 {
 function ci_esp8266_setup {
     sudo pip3 install pyserial esptool==3.3.1 pyelftools ar
     wget https://micropython.org/resources/xtensa-lx106-elf-standalone.tar.gz
-    (set -o pipefile; zcat xtensa-lx106-elf-standalone.tar.gz | tar x)
+    (set -o pipefail; 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
 }

From f7b30aa423410d3c757f7463372035af206b16d4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 6 Oct 2025 16:07:18 +0200
Subject: [PATCH 2955/3129] stm32/boards/OPENMV_N6: Switch to object REPR_C.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/OPENMV_N6/mpconfigboard.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
index 5e4f81099918b..f1ece03fe0263 100644
--- a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
+++ b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
@@ -3,7 +3,10 @@
 
 #define MICROPY_GC_STACK_ENTRY_TYPE uint32_t
 #define MICROPY_ALLOC_GC_STACK_SIZE (128)
-#define MICROPY_FATFS_EXFAT         (1)
+
+#define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
+typedef int mp_int_t;               // must be pointer size
+typedef unsigned int mp_uint_t;     // must be pointer size
 
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_HAS_SWITCH       (0)
@@ -15,6 +18,7 @@
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_PY_PYB_LEGACY       (0)
+#define MICROPY_FATFS_EXFAT         (1)
 
 #define MICROPY_BOARD_ENTER_BOOTLOADER board_enter_bootloader
 #define MICROPY_BOARD_EARLY_INIT    board_early_init

From f498ebcdda54d99608da28822996fa03aa34b80a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:30:43 +1000
Subject: [PATCH 2956/3129] stm32/main: Remove unused include of stackctrl.h.

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

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 51c29fe7537d5..9ac2b44905bb1 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"

From b68574e59171e509d0e4b1b12e490726e460b5c3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:29:13 +1000
Subject: [PATCH 2957/3129] zephyr/main: Replace mp_stack_set with
 mp_cstack_init_with_sp_here.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/main.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index f7ac997d92afd..edf2ba1a3bbc4 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -48,7 +48,6 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mphal.h"
-#include "py/stackctrl.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/readline/readline.h"
@@ -129,8 +128,6 @@ static void vfs_init(void) {
 #endif // MICROPY_VFS
 
 int real_main(void) {
-    volatile int stack_dummy = 0;
-
     #if MICROPY_PY_THREAD
     struct k_thread *z_thread = (struct k_thread *)k_current_get();
     mp_thread_init((void *)z_thread->stack_info.start, z_thread->stack_info.size / sizeof(uintptr_t));
@@ -140,9 +137,7 @@ int real_main(void) {
     mp_hal_init();
 
 soft_reset:
-    mp_stack_set_top((void *)&stack_dummy);
-    // Make MicroPython's stack limit somewhat smaller than full stack available
-    mp_stack_set_limit(CONFIG_MAIN_STACK_SIZE - 512);
+    mp_cstack_init_with_sp_here(CONFIG_MAIN_STACK_SIZE);
     #if MICROPY_ENABLE_GC
     gc_init(heap, heap + sizeof(heap));
     #endif

From 76efdfa4d017e88ad4aeae9aa22f01dcc9229f8b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:34:06 +1000
Subject: [PATCH 2958/3129] alif/main: Replace mp_stack_set with
 mp_cstack_init_with_top.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/alif/main.c         | 4 +---
 ports/alif/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/alif/main.c b/ports/alif/main.c
index 308d8df900e66..d938b9ce422ab 100644
--- a/ports/alif/main.c
+++ b/ports/alif/main.c
@@ -29,7 +29,6 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "py/stackctrl.h"
 #include "extmod/modbluetooth.h"
 #include "extmod/modmachine.h"
 #include "extmod/modnetwork.h"
@@ -92,8 +91,7 @@ int main(void) {
     #endif
 
     // Initialise stack extents and GC heap.
-    mp_stack_set_top(&__StackTop);
-    mp_stack_set_limit(&__StackTop - &__StackLimit - 1024);
+    mp_cstack_init_with_top(&__StackTop, &__StackTop - &__StackLimit);
     gc_init(&__GcHeapStart, &__GcHeapEnd);
 
     #if MICROPY_PY_LWIP
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 6b30ea2e6245a..7bd33565e270e 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -97,6 +97,7 @@
 // Python internal features
 #define MICROPY_READER_VFS                      (1)
 #define MICROPY_ENABLE_GC                       (1)
+#define MICROPY_STACK_CHECK_MARGIN              (1024)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
 #ifndef MICROPY_FLOAT_IMPL

From 2399b4ea68ba7978d00b3bd3d315dcd57ac02ef3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:36:13 +1000
Subject: [PATCH 2959/3129] cc3200/mptask: Replace mp_stack_set_top with
 mp_cstack_init_with_top.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/mptask.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index 656a8fb8721b1..2664e063540d4 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 
 #include "py/mpconfig.h"
-#include "py/stackctrl.h"
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/gc.h"
@@ -131,7 +130,7 @@ void TASK_MicroPython(void *pvParameters) {
     #endif
 
     // initialise the stack pointer for the main thread (must be done after mp_thread_init)
-    mp_stack_set_top((void *)sp);
+    mp_cstack_init_with_top((void *)sp, 0);
 
     // GC init
     gc_init(&_boot, &_eheap);

From af2231896169bd409324cc99d9a72896b370ee69 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:38:07 +1000
Subject: [PATCH 2960/3129] mimxrt/main: Replace mp_stack_set calls with
 mp_cstack_init_with_top.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/main.c         | 4 +---
 ports/mimxrt/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 7166171f17c2d..22809916e7ac5 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -29,7 +29,6 @@
 #include "py/runtime.h"
 #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"
@@ -100,8 +99,7 @@ int main(void) {
         led_init();
         #endif
 
-        mp_stack_set_top(&_estack);
-        mp_stack_set_limit(&_estack - &_sstack - 1024);
+        mp_cstack_init_with_top(&_estack, &_estack - &_sstack);
 
         gc_init(&_gc_heap_start, &_gc_heap_end);
         mp_init();
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index d6694badbad95..8ad789d933229 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -54,6 +54,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_TRACKED_ALLOC               (MICROPY_SSL_MBEDTLS)
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
+#define MICROPY_STACK_CHECK_MARGIN          (1024)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_SCHEDULER_DEPTH             (8)

From 816074339a5633454795399e5be1d1560f5fb4d3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:42:39 +1000
Subject: [PATCH 2961/3129] nrf/main: Replace mp_stack_set calls with
 mp_cstack_init_with_top.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/main.c         | 7 +------
 ports/nrf/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 21a71c7c9e48c..e5d7828a82a58 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -36,7 +36,6 @@
 #include "py/parse.h"
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/compile.h"
 #include "py/persistentcode.h"
@@ -126,11 +125,7 @@ void MP_NORETURN _start(void) {
 
     led_state(1, 1); // MICROPY_HW_LED_1 aka MICROPY_HW_LED_RED
 
-    mp_stack_set_top(&_ram_end);
-
-    // Stack limit should be less than real stack size, so we have a chance
-    // to recover from limit hit.  (Limit is measured in bytes.)
-    mp_stack_set_limit((char *)&_ram_end - (char *)&_heap_end - 400);
+    mp_cstack_init_with_top(&_ram_end, (char *)&_ram_end - (char *)&_heap_end);
 
     machine_init();
 
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index d361d01ccefa9..4ad0a2d3d0385 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -120,6 +120,7 @@
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_FINALISER    (1)
 #define MICROPY_STACK_CHECK         (1)
+#define MICROPY_STACK_CHECK_MARGIN  (400)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_INFO           (1)
 #define MICROPY_REPL_AUTO_INDENT    (1)

From 73d6a0973c44e9e1846de9fc1400582a40eed369 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:45:59 +1000
Subject: [PATCH 2962/3129] powerpc/main: Replace mp_stack calls wih
 mp_cstack_init_with_sp_here.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/powerpc/main.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ports/powerpc/main.c b/ports/powerpc/main.c
index bbd2082b42b17..fa69696394c64 100644
--- a/ports/powerpc/main.c
+++ b/ports/powerpc/main.c
@@ -32,7 +32,6 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
-#include "py/stackctrl.h"
 #include "shared/runtime/pyexec.h"
 
 void __stack_chk_fail(void);
@@ -73,10 +72,7 @@ int main(int argc, char **argv) {
     mp_pystack_init(pystack, &pystack[1024]);
     #endif
 
-    #if MICROPY_STACK_CHECK
-    mp_stack_ctrl_init();
-    mp_stack_set_limit(48 * 1024);
-    #endif
+    mp_cstack_init_with_sp_here(48 * 1024);
 
     #if MICROPY_ENABLE_GC
     gc_init(heap, heap + sizeof(heap));

From 1737a690bc71d92daf27fe45d9a398ded02dcd59 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:49:30 +1000
Subject: [PATCH 2963/3129] esp8266/boards: Replace stackctrl.o with cstack.o
 in obj file list.

This was missed in d441788975a6dfb277ad9a3d54d651ae48817d16.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/esp8266_common.ld | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index 206c3f14b430e..c14afdfff0400 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -93,6 +93,7 @@ SECTIONS
         *py/binary.o*(.literal* .text*)
         *py/builtin*.o*(.literal* .text*)
         *py/compile.o*(.literal* .text*)
+        *py/cstack.o*(.literal* .text*)
         *py/emit*.o*(.literal* .text*)
         *py/persistentcode*.o*(.literal* .text*)
         *py/formatfloat.o*(.literal* .text*)
@@ -121,7 +122,6 @@ SECTIONS
         *py/sequence.o*(.literal* .text*)
         *py/showbc.o*(.literal* .text*)
         *py/smallint.o*(.literal* .text*)
-        *py/stackctrl.o*(.literal* .text*)
         *py/stream.o*(.literal* .text*)
         *py/unicode.o*(.literal* .text*)
         *py/vm.o*(.literal* .text*)

From cbe137c4b8b6402be95ebe173653f0ea1e9dab66 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:51:58 +1000
Subject: [PATCH 2964/3129] qemu/main: Replace mp_stack calls with
 mp_cstack_init_with_sp_here.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu/main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/qemu/main.c b/ports/qemu/main.c
index 75c6fe4cdc0d8..8d3097fbf1b33 100644
--- a/ports/qemu/main.c
+++ b/ports/qemu/main.c
@@ -28,7 +28,6 @@
 
 #include "py/compile.h"
 #include "py/runtime.h"
-#include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "shared/runtime/gchelper.h"
@@ -41,8 +40,7 @@
 static uint32_t gc_heap[MICROPY_HEAP_SIZE / sizeof(uint32_t)];
 
 int main(int argc, char **argv) {
-    mp_stack_ctrl_init();
-    mp_stack_set_limit(10240);
+    mp_cstack_init_with_sp_here(10240);
     gc_init(gc_heap, (char *)gc_heap + MICROPY_HEAP_SIZE);
 
     for (;;) {

From 12220b821e5c1a9469fa54309b075e9afd01a9be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:53:25 +1000
Subject: [PATCH 2965/3129] renesas-ra/main: Replace mp_stack_set with
 mp_cstack_init_with_top.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/main.c         | 6 +-----
 ports/renesas-ra/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index cfc4611ecb5cd..e0ef5ee195906 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
@@ -295,11 +294,8 @@ int main(void) {
     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);
+    mp_cstack_init_with_top(&_estack, (char *)&_estack - (char *)&_sstack);
 
     // GC init
     gc_init(MICROPY_HEAP_START, MICROPY_HEAP_END);
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 70d38e7d20e0e..946f71e7c1716 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -92,6 +92,7 @@
 #define MICROPY_TRACKED_ALLOC       (MICROPY_SSL_MBEDTLS || MICROPY_BLUETOOTH_BTSTACK)
 #define MICROPY_READER_VFS          (1)
 #define MICROPY_ENABLE_GC           (1)
+#define MICROPY_STACK_CHECK_MARGIN  (1024)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)
 #define MICROPY_REPL_INFO           (1)

From 639150e9f3fb8144368537b72187ee4890ba9b37 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:54:44 +1000
Subject: [PATCH 2966/3129] samd/main: Replace mp_stack_set calls with
 mp_cstack_init_with_top.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/main.c         | 4 +---
 ports/samd/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/samd/main.c b/ports/samd/main.c
index 475f57703d076..d4e991033c41f 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -29,7 +29,6 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "py/stackctrl.h"
 #include "extmod/modmachine.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
@@ -45,8 +44,7 @@ extern void pwm_deinit_all(void);
 extern void sercom_deinit_all(void);
 
 void samd_main(void) {
-    mp_stack_set_top(&_estack);
-    mp_stack_set_limit(&_estack - &_sstack - 1024);
+    mp_cstack_init_with_top(&_estack, &_estack - &_sstack);
     mp_hal_time_ns_set_from_rtc();
 
     for (;;) {
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 7b423bf0babff..a5524c631d5b4 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_STACK_CHECK_MARGIN          (1024)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_FLOAT)
 #ifndef MICROPY_PY_BUILTINS_COMPLEX

From 6ab3c3cb173bc28d39b8342cb7b66afeb29fae09 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:56:04 +1000
Subject: [PATCH 2967/3129] mpy-cross/main: Replace mp_stack calls with
 mp_cstack_init_with_sp_here.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/main.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 9dcad3c5d8cf8..51e338bbc2d51 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -34,7 +34,6 @@
 #include "py/persistentcode.h"
 #include "py/runtime.h"
 #include "py/gc.h"
-#include "py/stackctrl.h"
 #include "genhdr/mpversion.h"
 #ifdef _WIN32
 #include "ports/windows/fmode.h"
@@ -221,8 +220,6 @@ static char *backslash_to_forwardslash(char *path) {
 }
 
 MP_NOINLINE int main_(int argc, char **argv) {
-    mp_stack_set_limit(40000 * (sizeof(void *) / 4));
-
     pre_process_options(argc, argv);
 
     char *heap = malloc(heap_size);
@@ -418,7 +415,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
 }
 
 int main(int argc, char **argv) {
-    mp_stack_ctrl_init();
+    mp_cstack_init_with_sp_here(40000 * (sizeof(void *) / 4));
     return main_(argc, argv);
 }
 

From ddd6ca75be81711b0c44e076867989dd18d62bdb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 00:57:30 +1000
Subject: [PATCH 2968/3129] docs/develop/porting: Use
 mp_cstack_init_with_sp_here in docs.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/porting.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 99725e1000bef..c0cf130e09d67 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -42,7 +42,6 @@ The basic MicroPython firmware is implemented in the main port file, e.g ``main.
    #include "py/compile.h"
    #include "py/gc.h"
    #include "py/mperrno.h"
-   #include "py/stackctrl.h"
    #include "shared/runtime/gchelper.h"
    #include "shared/runtime/pyexec.h"
 
@@ -51,7 +50,7 @@ The basic MicroPython firmware is implemented in the main port file, e.g ``main.
 
    int main(int argc, char **argv) {
        // Initialise the MicroPython runtime.
-       mp_stack_ctrl_init();
+       mp_cstack_init_with_sp_here(2048);
        gc_init(heap, heap + sizeof(heap));
        mp_init();
 

From 01448d03f3b6eb6e8d8da3c26e06699cd6d14f79 Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Sat, 4 Oct 2025 14:03:03 +0200
Subject: [PATCH 2969/3129] zephyr: Remove defaulting to newlib.

Remove CONFIG_NEWLIB_LIBC=y, as it seems it is now unecessary.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/mpconfigport.h         | 7 ++++++-
 ports/zephyr/mpconfigport_minimal.h | 7 ++++++-
 ports/zephyr/prj.conf               | 1 -
 ports/zephyr/prj_minimal.conf       | 1 -
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 6f55b0d788072..c853530c7ee1d 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -61,7 +61,6 @@
 #define MICROPY_PY_BUILTINS_HELP_TEXT zephyr_help_text
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_MATH_POW_FIX_NAN (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
 #define MICROPY_PY_MACHINE_I2C      (1)
@@ -173,3 +172,9 @@ typedef long mp_off_t;
         k_msleep(1); \
     } while (0);
 #endif
+
+// Compatibility switches
+
+#ifdef CONFIG_NEWLIB_LIBC
+#define MICROPY_PY_MATH_POW_FIX_NAN (1)
+#endif
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index 2744119204443..6486480afd896 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -50,7 +50,6 @@
 #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)
 #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
-#define MICROPY_PY_MATH_POW_FIX_NAN (1)
 
 // These features are enabled to get the test suite passing.
 #define MICROPY_FULL_CHECKS         (1)
@@ -80,3 +79,9 @@ typedef long mp_off_t;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_EVENT_POLL_HOOK
+
+// Compatibility switches
+
+#ifdef CONFIG_NEWLIB_LIBC
+#define MICROPY_PY_MATH_POW_FIX_NAN (1)
+#endif
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 0939e226cfcf4..c13caa8fd1dd4 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -6,7 +6,6 @@ CONFIG_STDOUT_CONSOLE=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y
 
-CONFIG_NEWLIB_LIBC=y
 CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4736
 CONFIG_POLL=y
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index f58c932ceabe3..6fb5eadd5b675 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -1,4 +1,3 @@
-CONFIG_NEWLIB_LIBC=y
 CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_POLL=y

From c9a16e862caed343a55d6d192c833def3910d53a Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Sat, 4 Oct 2025 14:04:19 +0200
Subject: [PATCH 2970/3129] zephyr: Add boards files for rp2350's m33 on pico
 2.

Adds overlay and conf for RPi Pico2 ARM cpu on the zephyr port.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 .../zephyr/boards/rpi_pico2_rp2350a_m33.conf  | 17 +++++++
 .../boards/rpi_pico2_rp2350a_m33.overlay      | 50 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 ports/zephyr/boards/rpi_pico2_rp2350a_m33.conf
 create mode 100644 ports/zephyr/boards/rpi_pico2_rp2350a_m33.overlay

diff --git a/ports/zephyr/boards/rpi_pico2_rp2350a_m33.conf b/ports/zephyr/boards/rpi_pico2_rp2350a_m33.conf
new file mode 100644
index 0000000000000..846012724704e
--- /dev/null
+++ b/ports/zephyr/boards/rpi_pico2_rp2350a_m33.conf
@@ -0,0 +1,17 @@
+# Configure serial console over USB CDC ACM.
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_USBD_CDC_ACM_CLASS=y
+CONFIG_UART_LINE_CTRL=y
+
+# Disable networking.
+CONFIG_NETWORKING=n
+
+# Hardware features.
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_I2C=y
+CONFIG_I2C_TARGET=y
+CONFIG_SPI=y
+
+# MicroPython config.
+CONFIG_MICROPY_HEAP_SIZE=458752
diff --git a/ports/zephyr/boards/rpi_pico2_rp2350a_m33.overlay b/ports/zephyr/boards/rpi_pico2_rp2350a_m33.overlay
new file mode 100644
index 0000000000000..e5261561f881d
--- /dev/null
+++ b/ports/zephyr/boards/rpi_pico2_rp2350a_m33.overlay
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		/* Use USB CDC ACM as the console. */
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		second_stage_bootloader: partition@0 {
+			label = "second_stage_bootloader";
+			reg = <0x00000000 0x100>;
+			read-only;
+		};
+
+		code_partition: partition@100 {
+			label = "code-partition";
+			reg = <0x0000100 (DT_SIZE_M(1) - 0x100)>;
+			read-only;
+		};
+
+		storage_partition: partition@100000 {
+			label = "storage";
+			reg = <0x00100000 DT_SIZE_M(3)>;
+		};
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+	};
+};
+
+&i2c1 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	status = "okay";
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+};

From d42a301afd2661618e2a1a6a09c668b2f044c3d8 Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@metamagix.tech>
Date: Tue, 30 Sep 2025 12:52:25 -0700
Subject: [PATCH 2971/3129] zephyr/machine_adc: Add ADC support.

This commit adds support for ADC peripherals in the Zephyr port.

As is typical for Zephyr, the ADC channel setup is done in the devicetree
(typically using an overlay).  This code requires ADC channels to be listed
in the io-channels property of the zephyr,user root node.

Signed-off-by: Ned Konz <ned@metamagix.tech>
---
 docs/zephyr/quickref.rst    |  13 +++
 ports/zephyr/README.md      |  12 +-
 ports/zephyr/machine_adc.c  | 217 ++++++++++++++++++++++++++++++++++++
 ports/zephyr/mpconfigport.h |   7 ++
 4 files changed, 247 insertions(+), 2 deletions(-)
 create mode 100644 ports/zephyr/machine_adc.c

diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 0e985c70b3eb6..64054bf99454d 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -119,6 +119,19 @@ Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class::
     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
 
+Analog to Digital Converter (ADC)
+----------------------------------
+
+Use the :ref:`machine.ADC <machine.ADC>` class.
+
+Example of using ADC to read a pin's analog value (the ``zephyr,user`` node must contain
+the ``io-channels`` property containing all the ADC channels)::
+
+    from machine import ADC
+
+    adc = ADC(("adc", 0))
+    adc.read_uv()
+
 Disk Access
 -----------
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 8384fabcf0261..0f6b16d39cd98 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -19,7 +19,8 @@ Features supported at this time:
 * `machine.Pin` class for GPIO control, with IRQ support.
 * `machine.I2C` class for I2C control.
 * `machine.SPI` class for SPI control.
-* `machine.PWM` class for PWM control
+* `machine.PWM` class for PWM control.
+* `machine.ADC` class for ADC control.
 * `socket` module for networking (IPv4/IPv6).
 * "Frozen modules" support to allow to bundle Python modules together
   with firmware. Including complete applications, including with
@@ -119,7 +120,7 @@ To blink an LED:
         time.sleep(0.5)
 
 The above code uses an LED location for a FRDM-K64F board (port B, pin 21;
-following Zephyr conventions port are identified by their devicetree node
+following Zephyr conventions ports are identified by their devicetree node
 label. You will need to adjust it for another board (using board's 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
@@ -153,6 +154,13 @@ Example of using SPI to write a buffer to the MOSI pin:
     spi.init(baudrate=500000, polarity=1, phase=1, bits=8, firstbit=SPI.MSB)
     spi.write(b'abcd')
 
+Example of using ADC to read a pin's analog value (the 'zephyr,user' node must contain
+the 'io-channels' property with all the ADC channels):
+
+    from machine import ADC
+
+    adc = ADC(("adc", 0))
+    adc.read_uv()
 
 Minimal build
 -------------
diff --git a/ports/zephyr/machine_adc.c b/ports/zephyr/machine_adc.c
new file mode 100644
index 0000000000000..ffc694c81ba28
--- /dev/null
+++ b/ports/zephyr/machine_adc.c
@@ -0,0 +1,217 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 NED KONZ <NED@METAMAGIX.TECH>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 never compiled standalone, it's included directly from
+// extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
+
+/*
+ * The ADC peripheral and pinmux is configured in the board's .dts file. Make
+ * sure that the ADC is enabled (status = "okay";).
+ *
+ * In addition to that, this driver requires an ADC channel specified in the
+ * io-channels property of the zephyr,user node. This is usually done with a
+ * devicetree overlay.
+ *
+ * Configuration of channels (settings like gain, reference, or acquisition time)
+ * also needs to be specified in devicetree, in ADC controller child nodes. Also
+ * the ADC resolution and oversampling setting (if used) need to be specified
+ * there.
+ *
+ * Here is an excerpt from a devicetree overlay that configures an ADC
+ * with one channel that would be referred to as ('adc', 0) in the constructor
+ * of the ADC object:
+ *
+ *  / {
+ *      zephyr,user {
+ *          io-channels = <&adc 0>;
+ *      };
+ *  };
+ *
+ *  &adc {
+ *      #address-cells = <1>;
+ *      #size-cells = <0>;
+ *
+ *      channel@0 {
+ *          reg = <0>;
+ *          zephyr,gain = "ADC_GAIN_1_6";
+ *          zephyr,reference = "ADC_REF_INTERNAL";
+ *          zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+ *          zephyr,input-positive = <NRF_SAADC_AIN0>;
+ *          zephyr,resolution = <12>;
+ *      };
+ *      // other channels here (1, 4, 5, 7)
+ *  };
+ *
+ */
+
+#include <inttypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/adc.h>
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "zephyr_device.h"
+
+static uint16_t sample_buffer;
+
+static struct adc_sequence adc_sequence = {
+    .options = NULL, // No options set by default
+    .channels = 0,
+    .buffer = &sample_buffer,
+    .buffer_size = sizeof(sample_buffer),   // bytes, not samples
+    .resolution = 12, // Default resolution, can be changed later
+    .oversampling = 0, // Default oversampling, can be changed later
+    .calibrate = false, // Default to no calibration
+};
+
+#define USER_NODE DT_PATH(zephyr_user)
+
+#define DT_SPEC_AND_COMMA(node_id, prop, idx) \
+    ADC_DT_SPEC_GET_BY_IDX(node_id, idx),
+
+// Data of ADC io-channels specified in devicetree.
+static const struct adc_dt_spec adc_channels[] = {
+    // We require that the user node has an io-channels property.
+    #if DT_NODE_HAS_PROP(USER_NODE, io_channels)
+    DT_FOREACH_PROP_ELEM(USER_NODE, io_channels,
+        DT_SPEC_AND_COMMA)
+    #endif
+};
+
+#define NUM_CHANNELS ARRAY_SIZE(adc_channels)
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    char const *name;   // name given by the user in the tuple
+    const struct adc_dt_spec *spec; // ADC device channel specification
+} machine_adc_obj_t;
+
+
+static void mp_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(%s.%d)", self->name, self->spec->channel_id);
+}
+
+// constructor((adcblock, channel) | adc_obj, ...)
+static mp_obj_t mp_machine_adc_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);
+
+    machine_adc_obj_t *self = NULL;
+    if (mp_obj_is_type(args[0], &machine_adc_type)) {
+        // Already an ADC object, just return it
+        self = MP_OBJ_TO_PTR(args[0]);
+    } else if (mp_obj_is_type(args[0], &mp_type_tuple)) {
+        // Get the wanted (adcblock, channel) values.
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[0], 2, &items);
+        const char *dev_name = mp_obj_str_get_str(items[0]);
+        int channel_id = mp_obj_get_int(items[1]);
+        const struct device *wanted_port = zephyr_device_find(items[0]);
+
+        // Find the desired channel by device name and channel ID
+        struct adc_dt_spec const *wanted_adc_channel = NULL;
+
+        for (size_t i = 0U; i < ARRAY_SIZE(adc_channels); i++) {
+            if (adc_channels[i].dev == wanted_port &&
+                adc_channels[i].channel_id == channel_id) {
+                wanted_adc_channel = adc_channels + i;
+                break;
+            }
+        }
+
+        if (!wanted_adc_channel) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("ADC channel (%s, %d) not found"), dev_name, channel_id);
+        }
+
+        if (!adc_is_ready_dt(wanted_adc_channel)) {
+            mp_raise_OSError(MP_EIO);
+        }
+
+        int err = adc_channel_setup_dt(wanted_adc_channel);
+        if (err < 0) {
+            mp_raise_OSError(MP_EINVAL);
+        }
+
+        self = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
+        self->spec = wanted_adc_channel;
+        self->name = dev_name;
+    } else {
+        // Unknown type, raise a ValueError
+        mp_raise_ValueError(MP_ERROR_TEXT("ADC must be initialized with a tuple of (adcblock, channel) or an ADC object"));
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static mp_uint_t zephyr_adc_read(const struct adc_dt_spec *spec) {
+    int err = adc_sequence_init_dt(spec, &adc_sequence);
+    if (err < 0) {
+        mp_raise_OSError(MP_EOPNOTSUPP);
+    }
+
+    err = adc_read_dt(spec, &adc_sequence);
+    if (err < 0) {
+        mp_raise_OSError(MP_EIO);
+    }
+
+    return (mp_uint_t)sample_buffer; // Return the read value as a 16-bit integer
+}
+
+static mp_int_t mp_machine_adc_read_u16(machine_adc_obj_t *self) {
+    mp_uint_t raw = zephyr_adc_read(self->spec);
+    // Scale raw reading to 16 bit value using a Taylor expansion (for 8 <= bits <= 16)
+    mp_int_t bits = self->spec->resolution;
+    mp_uint_t u16 = raw << (16 - bits) | raw >> (2 * bits - 16);
+    return u16;
+}
+
+
+#if MICROPY_PY_MACHINE_ADC_READ_UV
+static mp_int_t mp_machine_adc_read_uv(machine_adc_obj_t *self) {
+    int32_t raw = (int32_t)zephyr_adc_read(self->spec);
+    int err = adc_raw_to_millivolts_dt(self->spec, &raw);
+    if (err < 0) {
+        mp_raise_OSError(MP_EOPNOTSUPP);
+    }
+    return (mp_int_t)raw * 1000UL; // Convert to microvolts
+}
+#endif
+
+
+#if MICROPY_PY_MACHINE_ADC_READ
+static mp_int_t mp_machine_adc_read(machine_adc_obj_t *self) {
+    mp_uint_t raw = zephyr_adc_read(self->spec);
+    return (mp_int_t)raw;
+}
+#endif
+
+#define MICROPY_PY_MACHINE_ADC_CLASS_CONSTANTS
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index c853530c7ee1d..064a75a7e9ec9 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -143,6 +143,13 @@ void mp_hal_signal_event(void);
 #define MICROPY_HW_MCU_NAME "unknown-cpu"
 #endif
 
+#ifdef CONFIG_ADC
+#define MICROPY_PY_MACHINE_ADC (1)
+#define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/zephyr/machine_adc.c"
+#define MICROPY_PY_MACHINE_ADC_READ (1)
+#define MICROPY_PY_MACHINE_ADC_READ_UV (1)
+#endif
+
 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;

From c6a78515fba853ecfe3083cba5f5a09fb72d475d Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@metamagix.tech>
Date: Tue, 30 Sep 2025 13:22:10 -0700
Subject: [PATCH 2972/3129] zephyr/modzsensor: Add set/get sensor attributes to
 zsensor.

This commit adds `Sensor.attr_set()` and `Sensor.attr_get_*()` methods that
are necessary to set various sensor attributes if they haven't been set
statically in the device tree.

This is needed, for example, because the LSM6DS3TR-C sensor on the XIAO BLE
NRF52840 SENSE board will not work with `zsensor` because it doesn't have
any default configuration for sampling frequency.

Various `SENSOR_ATTR_*` constants from
`zephyr/incude/zephyr/drivers/sensor.h` have been added as `ATTR_*`
constants in the `zsensor` module.

Signed-off-by: Ned Konz <ned@metamagix.tech>
---
 docs/library/zephyr.zsensor.rst | 113 +++++++++++++++++++++++++++++++-
 docs/zephyr/quickref.rst        |  37 ++++++++++-
 ports/zephyr/README.md          |   1 +
 ports/zephyr/modzsensor.c       |  88 +++++++++++++++++++++++++
 4 files changed, 235 insertions(+), 4 deletions(-)

diff --git a/docs/library/zephyr.zsensor.rst b/docs/library/zephyr.zsensor.rst
index 4eadc926dc1a4..2a666bb82c185 100644
--- a/docs/library/zephyr.zsensor.rst
+++ b/docs/library/zephyr.zsensor.rst
@@ -20,7 +20,8 @@ See Zephyr documentation for sensor usage here: `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.
+channels. Each channel may have multiple attributes that can be changed and/or queried.
+See `Channel Attributes`_ below for defined sensor channel attributes.
 
 Constructor
 ~~~~~~~~~~~
@@ -59,6 +60,36 @@ Methods
     Returns only the integer value of the measurement sample.
     (Ex. value of ``(1, 500000)`` returns as ``1``)
 
+.. method:: Sensor.attr_set(sensor_channel, channel_attribute, val1, [val2])
+
+    Set the given channel's attribute to the given value.
+    ``val1`` may be a float, in which case ``val2`` is not given, or
+    ``val1`` can be used for the value's
+    integer part and ``val2`` for the value's fractional part in millionths.
+
+    Returns ``None`` if successful, or raises ``OSError``.
+
+.. method:: Sensor.attr_get_float(sensor_channel, channel_attribute)
+
+   Returns the value of the sensor channel's attribute as a float.
+
+   Many sensors do not support this or any other of the ``attr_get`` methods.
+
+.. method:: Sensor.attr_get_micros(sensor_channel, channel_attribute)
+
+    Returns the value of the sensor channel's attribute in millionths.
+    (Ex. value of ``(1, 500000)`` returns as ``1500000``)
+
+.. method:: Sensor.attr_get_millis(sensor_channel, channel_attribute)
+
+    Returns the value of the sensor channel's attribute in thousandths.
+    (Ex. value of ``(1, 500000)`` returns as ``1500``)
+
+.. method:: Sensor.attr_get_int(sensor_channel, channel_attribute)
+
+    Returns only the integer value of the channel's attribute.
+    (Ex. value of ``(1, 500000)`` returns as ``1``)
+
 Channels
 ~~~~~~~~
 
@@ -74,6 +105,11 @@ Channels
 
     Acceleration on the Z axis, in m/s^2.
 
+.. data:: ACCEL_XYZ
+
+    Pseudo-channel representing all three accelerometer axes.
+    Used for :meth:`Sensor.attr_set` and the ``Sensor.attr_get_xxx()`` methods.
+
 .. data:: GYRO_X
 
     Angular velocity around the X axis, in radians/s.
@@ -86,6 +122,11 @@ Channels
 
     Angular velocity around the Z axis, in radians/s.
 
+.. data:: GYRO_XYZ
+
+    Pseudo-channel representing all three gyroscope axes.
+    Used for :meth:`Sensor.attr_set` and the ``Sensor.attr_get_xxx()`` methods.
+
 .. data:: MAGN_X
 
     Magnetic field on the X axis, in Gauss.
@@ -121,3 +162,73 @@ Channels
 .. data:: ALTITUDE
 
     Altitude, in meters.
+
+Channel Attributes
+~~~~~~~~~~~~~~~~~~~
+
+.. data:: ATTR_SAMPLING_FREQUENCY
+
+    Sensor sampling frequency, i.e. how many times a second the sensor takes a measurement.
+
+.. data:: ATTR_LOWER_THRESH
+
+    Lower threshold for trigger.
+
+.. data:: ATTR_UPPER_THRESH
+
+    Upper threshold for trigger.
+
+.. data:: ATTR_SLOPE_TH
+
+    Threshold for any-motion (slope) trigger.
+
+.. data:: ATTR_SLOPE_DUR
+
+    Duration for which the slope values needs to be outside the threshold for the trigger to fire.
+
+.. data:: ATTR_HYSTERESIS
+
+.. data:: ATTR_OVERSAMPLING
+
+    Oversampling factor.
+
+.. data:: ATTR_FULL_SCALE
+
+    Sensor range, in SI units.
+
+.. data:: ATTR_OFFSET
+
+    The sensor value returned will be altered by the amount indicated by offset: final_value = sensor_value + offset.
+
+.. data:: ATTR_CALIB_TARGET
+
+    Calibration target. This will be used by the internal chip's algorithms to calibrate itself on a certain axis, or all of them.
+
+.. data:: ATTR_CONFIGURATION
+
+    Configure the operating modes of a sensor.
+
+.. data:: ATTR_CALIBRATION
+
+    Set a calibration value needed by a sensor.
+
+.. data:: ATTR_FEATURE_MASK
+
+    Enable/disable sensor features.
+
+.. data:: ATTR_ALERT
+
+    Alert threshold or alert enable/disable.
+
+.. data:: ATTR_FF_DUR
+
+    Free-fall duration represented in milliseconds.
+    If the sampling frequency is changed during runtime, this attribute should be set to adjust freefall duration to the new sampling frequency.
+
+.. data:: ATTR_BATCH_DURATION
+
+    Hardware batch duration in ticks.
+
+.. data:: ATTR_GAIN
+
+.. data:: ATTR_RESOLUTION
diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 64054bf99454d..6025092a02c9f 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -99,10 +99,10 @@ Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class::
 
     from machine import SPI
 
-    spi = SPI("spi0")           # construct a spi bus with default configuration
+    spi = SPI("spi0")           # 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
+    # equivalently, construct the SPI bus and set configuration at the same time
     spi = SPI("spi0", baudrate=100000, polarity=0, phase=0, bits=8, firstbit=SPI.MSB)
     print(spi)                  # print device name and bus configuration
 
@@ -166,7 +166,7 @@ Use the :ref:`zephyr.FlashArea <zephyr.FlashArea>` class to support filesystem::
         f.write('Hello world')                  # write to the file
     print(open('/flash/hello.txt').read())      # print contents of the file
 
-The FlashAreas' IDs that are available are listed in the FlashArea module, as ID_*.
+The ``FlashAreas``' IDs that are available are listed in the FlashArea module, as ``ID_*``.
 
 Sensor
 ------
@@ -185,3 +185,34 @@ Use the :ref:`zsensor.Sensor <zsensor.Sensor>` class to access sensor data::
     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
+
+The channel IDs that are used as arguments to the :meth:`zsensor.Sensor.get_int`,
+:meth:`zsensor.Sensor.get_float()`, :meth:`zsensor.Sensor.get_millis()`, and
+:meth:`zsensor.Sensor.get_micros()` methods are constants in the :mod:`zsensor` module.
+
+You can use the :meth:`zsensor.Sensor.attr_set` method to set sensor attributes
+like full-scale range and update rate::
+
+    # Example for XIAO BLE NRF52840 SENSE
+    from zsensor import *
+    accel = Sensor('lsm6ds3tr_c')  # name from Devicetree
+    # Set full-scale to 2g (19.613300 m/sec^2)
+    # units are micro-m/s^2 (given as a float)
+    accel.attr_set(ACCEL_XYZ, ATTR_FULL_SCALE, 19.613300)
+    # Set sampling frequency to 104 Hz (as a pair of integers)
+    accel.attr_set(ACCEL_XYZ, ATTR_SAMPLING_FREQUENCY, 104, 0)
+    accel.measure()
+    accel.get_float(ACCEL_X) # -0.508 (m/s^2)
+    accel.get_float(ACCEL_Y) # -3.62 (m/s^2)
+    accel.get_float(ACCEL_Z) # 9.504889 (m/s^2)
+
+There are also the :meth:`zsensor.Sensor.attr_get_float`, :meth:`zsensor.Sensor.attr_get_int`,
+:meth:`zsensor.Sensor.attr_get_millis`, and :meth:`zsensor.Sensor.attr_get_micros` methods,
+but many sensors do not support these::
+
+    full_scale = accel.attr_get_float(ATTR_FULL_SCALE)
+
+The attribute IDs that are used as arguments to the :meth:`zsensor.Sensor.attr_set`,
+:meth:`zsensor.Sensor.attr_get_float`, :meth:`zsensor.Sensor.attr_get_int`,
+:meth:`zsensor.Sensor.attr_get_millis`, and :meth:`zsensor.Sensor.attr_get_micros`
+methods are constants in the :mod:`zsensor` module named ``ATTR_*``.
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 0f6b16d39cd98..480ff5705c21d 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -22,6 +22,7 @@ Features supported at this time:
 * `machine.PWM` class for PWM control.
 * `machine.ADC` class for ADC control.
 * `socket` module for networking (IPv4/IPv6).
+* `zsensor` module for reading sensors.
 * "Frozen modules" support to allow to bundle Python modules together
   with firmware. Including complete applications, including with
   run-on-boot capability.
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 51b7b2dbf53f3..c3a8b6d55506d 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -93,12 +93,77 @@ static mp_obj_t sensor_get_int(mp_obj_t self_in, mp_obj_t channel_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(sensor_get_int_obj, sensor_get_int);
 
+static void sensor_attr_get_internal(mp_obj_t self_in, mp_obj_t channel_in, mp_obj_t attr_in, struct sensor_value *res) {
+    mp_obj_sensor_t *self = MP_OBJ_TO_PTR(self_in);
+
+    int st = sensor_attr_get(self->dev, mp_obj_get_int(channel_in), mp_obj_get_int(attr_in), res);
+    if (st != 0) {
+        mp_raise_OSError(-st);
+    }
+}
+
+static mp_obj_t sensor_attr_get_float(mp_obj_t self_in, mp_obj_t channel_in, mp_obj_t attr_in) {
+    struct sensor_value val;
+    sensor_attr_get_internal(self_in, channel_in, attr_in, &val);
+    return mp_obj_new_float(val.val1 + (mp_float_t)val.val2 / 1000000);
+}
+MP_DEFINE_CONST_FUN_OBJ_3(sensor_attr_get_float_obj, sensor_attr_get_float);
+
+static mp_obj_t sensor_attr_get_micros(mp_obj_t self_in, mp_obj_t channel_in, mp_obj_t attr_in) {
+    struct sensor_value val;
+    sensor_attr_get_internal(self_in, channel_in, attr_in, &val);
+    return MP_OBJ_NEW_SMALL_INT(val.val1 * 1000000 + val.val2);
+}
+MP_DEFINE_CONST_FUN_OBJ_3(sensor_attr_get_micros_obj, sensor_attr_get_micros);
+
+static mp_obj_t sensor_attr_get_millis(mp_obj_t self_in, mp_obj_t channel_in, mp_obj_t attr_in) {
+    struct sensor_value val;
+    sensor_attr_get_internal(self_in, channel_in, attr_in, &val);
+    return MP_OBJ_NEW_SMALL_INT(val.val1 * 1000 + val.val2 / 1000);
+}
+MP_DEFINE_CONST_FUN_OBJ_3(sensor_attr_get_millis_obj, sensor_attr_get_millis);
+
+static mp_obj_t sensor_attr_get_int(mp_obj_t self_in, mp_obj_t channel_in, mp_obj_t attr_in) {
+    struct sensor_value val;
+    sensor_attr_get_internal(self_in, channel_in, attr_in, &val);
+    return MP_OBJ_NEW_SMALL_INT(val.val1);
+}
+MP_DEFINE_CONST_FUN_OBJ_3(sensor_attr_get_int_obj, sensor_attr_get_int);
+
+static mp_obj_t mp_sensor_attr_set(size_t n_args, const mp_obj_t *args) {
+    mp_obj_sensor_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_obj_t channel_in = args[1];
+    mp_obj_t attr_in = args[2];
+    struct sensor_value val;
+    if (n_args == 4) {
+        // One float argument
+        float v = mp_obj_get_float(args[3]);
+        val.val1 = (int32_t)v;
+        val.val2 = (int32_t)((v - val.val1) * 1000000);
+    } else {
+        // Two integer arguments
+        val.val1 = mp_obj_get_int(args[3]);
+        val.val2 = mp_obj_get_int(args[4]);
+    }
+    int st = sensor_attr_set(self->dev, mp_obj_get_int(channel_in), mp_obj_get_int(attr_in), &val);
+    if (st != 0) {
+        mp_raise_OSError(-st);
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sensor_attr_set_obj, 4, 5, mp_sensor_attr_set);
+
 static const mp_rom_map_elem_t sensor_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_measure), MP_ROM_PTR(&sensor_measure_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_float), MP_ROM_PTR(&sensor_get_float_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_micros), MP_ROM_PTR(&sensor_get_micros_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_millis), MP_ROM_PTR(&sensor_get_millis_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_int), MP_ROM_PTR(&sensor_get_int_obj) },
+    { MP_ROM_QSTR(MP_QSTR_attr_get_float), MP_ROM_PTR(&sensor_attr_get_float_obj) },
+    { MP_ROM_QSTR(MP_QSTR_attr_get_micros), MP_ROM_PTR(&sensor_attr_get_micros_obj) },
+    { MP_ROM_QSTR(MP_QSTR_attr_get_millis), MP_ROM_PTR(&sensor_attr_get_millis_obj) },
+    { MP_ROM_QSTR(MP_QSTR_attr_get_int), MP_ROM_PTR(&sensor_attr_get_int_obj) },
+    { MP_ROM_QSTR(MP_QSTR_attr_set), MP_ROM_PTR(&sensor_attr_set_obj) },
 };
 
 static MP_DEFINE_CONST_DICT(sensor_locals_dict, sensor_locals_dict_table);
@@ -119,12 +184,15 @@ static const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
     C(ACCEL_X),
     C(ACCEL_Y),
     C(ACCEL_Z),
+    C(ACCEL_XYZ),
     C(GYRO_X),
     C(GYRO_Y),
     C(GYRO_Z),
+    C(GYRO_XYZ),
     C(MAGN_X),
     C(MAGN_Y),
     C(MAGN_Z),
+    C(MAGN_XYZ),
     C(DIE_TEMP),
     C(AMBIENT_TEMP),
     C(PRESS),
@@ -145,6 +213,26 @@ static const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
     C(GAS_RES),
     C(VOLTAGE),
 #undef C
+#define C(name) { MP_ROM_QSTR(MP_QSTR_ATTR_##name), MP_ROM_INT(SENSOR_ATTR_##name) }
+    C(SAMPLING_FREQUENCY),
+    C(LOWER_THRESH),
+    C(UPPER_THRESH),
+    C(SLOPE_TH),
+    C(SLOPE_DUR),
+    C(HYSTERESIS),
+    C(OVERSAMPLING),
+    C(FULL_SCALE),
+    C(OFFSET),
+    C(CALIB_TARGET),
+    C(CONFIGURATION),
+    C(CALIBRATION),
+    C(FEATURE_MASK),
+    C(ALERT),
+    C(FF_DUR),
+    C(BATCH_DURATION),
+    C(GAIN),
+    C(RESOLUTION),
+#undef C
 };
 
 static MP_DEFINE_CONST_DICT(mp_module_zsensor_globals, mp_module_zsensor_globals_table);

From 29950295c4e99690e1907fb731020a4e3361a8ac Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Mon, 1 Sep 2025 13:18:20 +0530
Subject: [PATCH 2973/3129] zephyr/boards: Add PocketBeagle 2 rev A0 m4
 support.

Add support for PocketBeagle 2 rev A0 m4.  Since it has 256K of SRAM (split
into 192K instruction and 64K data regions), some things need to be
disabled in MicroPython to make it fit.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 .../boards/pocketbeagle_2_am6232_m4.conf      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 ports/zephyr/boards/pocketbeagle_2_am6232_m4.conf

diff --git a/ports/zephyr/boards/pocketbeagle_2_am6232_m4.conf b/ports/zephyr/boards/pocketbeagle_2_am6232_m4.conf
new file mode 100644
index 0000000000000..c63924c13b591
--- /dev/null
+++ b/ports/zephyr/boards/pocketbeagle_2_am6232_m4.conf
@@ -0,0 +1,30 @@
+# Disable Networking
+CONFIG_NETWORKING=n
+CONFIG_NET_IPV4=n
+CONFIG_NET_IPV6=n
+CONFIG_NET_UDP=n
+CONFIG_NET_TCP=n
+CONFIG_NET_SOCKETS=n
+CONFIG_TEST_RANDOM_GENERATOR=n
+
+CONFIG_NET_CONFIG_SETTINGS=n
+CONFIG_NET_CONFIG_NEED_IPV6=n
+CONFIG_NET_CONFIG_NEED_IPV4=n
+
+CONFIG_DNS_RESOLVER=n
+CONFIG_DNS_SERVER1=""
+CONFIG_DNS_SERVER_IP_ADDRESSES=n
+
+CONFIG_NET_BUF_POOL_USAGE=n
+CONFIG_NET_DHCPV4=n
+
+CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_GW=""
+
+# Disable FAT support. Does not fit
+CONFIG_MICROPY_VFS_FAT=n
+
+# Only elf output is used
+CONFIG_BUILD_OUTPUT_BIN=n
+CONFIG_BUILD_OUTPUT_HEX=n

From 00a926e99e45cf17cc96f73476fb9def2af567aa Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Mon, 15 Sep 2025 15:09:27 +0530
Subject: [PATCH 2974/3129] zephyr/boards: Add PocketBeagle 2 rev A1 m4
 support.

Same configuration as rev A0.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
 .../boards/pocketbeagle_2_am6254_m4.conf      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 ports/zephyr/boards/pocketbeagle_2_am6254_m4.conf

diff --git a/ports/zephyr/boards/pocketbeagle_2_am6254_m4.conf b/ports/zephyr/boards/pocketbeagle_2_am6254_m4.conf
new file mode 100644
index 0000000000000..c63924c13b591
--- /dev/null
+++ b/ports/zephyr/boards/pocketbeagle_2_am6254_m4.conf
@@ -0,0 +1,30 @@
+# Disable Networking
+CONFIG_NETWORKING=n
+CONFIG_NET_IPV4=n
+CONFIG_NET_IPV6=n
+CONFIG_NET_UDP=n
+CONFIG_NET_TCP=n
+CONFIG_NET_SOCKETS=n
+CONFIG_TEST_RANDOM_GENERATOR=n
+
+CONFIG_NET_CONFIG_SETTINGS=n
+CONFIG_NET_CONFIG_NEED_IPV6=n
+CONFIG_NET_CONFIG_NEED_IPV4=n
+
+CONFIG_DNS_RESOLVER=n
+CONFIG_DNS_SERVER1=""
+CONFIG_DNS_SERVER_IP_ADDRESSES=n
+
+CONFIG_NET_BUF_POOL_USAGE=n
+CONFIG_NET_DHCPV4=n
+
+CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_GW=""
+
+# Disable FAT support. Does not fit
+CONFIG_MICROPY_VFS_FAT=n
+
+# Only elf output is used
+CONFIG_BUILD_OUTPUT_BIN=n
+CONFIG_BUILD_OUTPUT_HEX=n

From 2f88c1e795334ab064b058bf28dfb38a59836a71 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 15 Oct 2025 09:58:41 +1100
Subject: [PATCH 2975/3129] esp32: Update tools/metrics_esp32.py to use JSON
 output.

Much cleaner. Also add deltas to the output table for easier
interpretation.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/Makefile               |  4 +-
 ports/esp32/tools/metrics_esp32.py | 72 +++++++++++++++++-------------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 7f31ea69192ab..d0984127ce344 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -98,10 +98,10 @@ monitor:
 	$(call RUN_IDF_PY,$(DEVICE) monitor)
 
 size:
-	$(call RUN_IDF_PY,size)
+	$(call RUN_IDF_PY,size $(SIZE_FLAGS))
 
 size-components:
-	$(call RUN_IDF_PY,size-components)
+	$(call RUN_IDF_PY,size-components $(SIZE_FLAGS))
 
 size-files:
 	$(call RUN_IDF_PY,size-files)
diff --git a/ports/esp32/tools/metrics_esp32.py b/ports/esp32/tools/metrics_esp32.py
index 70f049c3bd415..ad4acf6c7c1b0 100755
--- a/ports/esp32/tools/metrics_esp32.py
+++ b/ports/esp32/tools/metrics_esp32.py
@@ -27,9 +27,7 @@
 #
 # 5) If all goes well, it will run for a while and then print a Markdown
 #    formatted table of binary sizes, sorted by board+variant.
-#
-# Note that for ESP32-S3 and C3, IRAM and DRAM are exchangeable so the IRAM size
-# column of the table is really D/IRAM.
+import json
 import os
 import re
 import shutil
@@ -37,12 +35,14 @@
 import subprocess
 from dataclasses import dataclass
 
-IDF_VERS = ("v5.4.2",)
+IDF_VERS = ("v5.5.1", "v5.4.2")
 
 BUILDS = (
     ("ESP32_GENERIC", ""),
     ("ESP32_GENERIC", "D2WD"),
     ("ESP32_GENERIC", "SPIRAM"),
+    ("ESP32_GENERIC_C2", ""),
+    ("ESP32_GENERIC_C6", ""),
     ("ESP32_GENERIC_S3", ""),
     ("ESP32_GENERIC_S3", "SPIRAM_OCT"),
 )
@@ -60,9 +60,9 @@ class BuildSizes:
     idf_ver: str
     board: str
     variant: str
-    bin_size: str = ""
-    dram_size: str = ""
-    iram_size: str = ""
+    bin_size: int | str = ""
+    dram_size: int = 0
+    iram_size: int = 0
 
     def print_summary(self, include_ver=False):
         print(f"BOARD={self.board} BOARD_VARIANT={self.variant}")
@@ -80,7 +80,18 @@ def print_table_heading():
             "|-------|---------------|-------------|-------------|------------------|------------------|"
         )
 
-    def print_table_row(self, print_board):
+    def print_table_row(self, print_board, baseline=None):
+        def compare(field):
+            this = getattr(self, field)
+            if baseline and isinstance(this, int):
+                base = getattr(baseline, field)
+                delta = this - base
+                pct = ((this / base) * 100) - 100
+                plus = "+" if delta >= 0 else ""
+                return f"{this} ({plus}{delta}/{pct:.1f})"
+            else:
+                return str(this)
+
         print(
             "| "
             + " | ".join(
@@ -88,9 +99,9 @@ def print_table_row(self, print_board):
                     self.board if print_board else "",
                     self.variant if print_board else "",
                     self.idf_ver,
-                    self.bin_size,
-                    self.iram_size,
-                    self.dram_size,
+                    compare("bin_size"),
+                    compare("iram_size"),
+                    compare("dram_size"),
                 )
             )
             + " |"
@@ -131,25 +142,19 @@ def run_make(self, target):
 
     def make_size(self):
         try:
-            size_out = self.run_make("size")
-            try:
-                # pre IDF v5.4 size output
-                # "Used static DRAM:" or "Used stat D/IRAM:"
-                RE_DRAM = r"Used stat(?:ic)? D.*: *(\d+) bytes"
-                RE_IRAM = r"Used static IRAM: *(\d+) bytes"
-                self.dram_size = re.search(RE_DRAM, size_out).group(1)
-                self.iram_size = re.search(RE_IRAM, size_out).group(1)
-            except AttributeError:
-                # IDF v5.4 size output is much nicer formatted
-                # Note the pipes in these expressions are not the ASCII/RE |
-                RE_DRAM = r"│ *DI?RAM *│ *(\d+)"
-                RE_IRAM = r"│ *IRAM *│ *(\d+)"
-                self.dram_size = re.search(RE_DRAM, size_out).group(1)
-                self.iram_size = re.search(RE_IRAM, size_out).group(1)
-
-            # This line is the same on before/after versions
-            RE_BIN = r"Total image size: *(\d+) bytes"
-            self.bin_size = re.search(RE_BIN, size_out).group(1)
+            size_out = self.run_make("size SIZE_FLAGS='--format json'")
+            size_out = size_out[size_out.rindex("{") :]
+            size_out = json.loads(size_out)
+
+            def sum_sizes(*keys):
+                return sum(size_out.get(k, 0) for k in keys)
+
+            # Different targets report DRAM, IRAM, and/or D/IRAM separately
+            self.dram_size = sum_sizes(
+                "used_dram", "diram_data", "diram_bss", "diram_rodata", "diram_other"
+            )
+            self.iram_size = sum_sizes("used_iram", "diram_text", "diram_vectors")
+            self.bin_size = size_out["total_size"]
         except subprocess.CalledProcessError:
             self.bin_size = "build failed"
 
@@ -184,11 +189,16 @@ def main(do_clean):
 
     # print everything again as a table sorted by board+variant
     last_bv = ""
+    baseline_sizes = None
     BuildSizes.print_table_heading()
     for build_sizes in sorted(sizes):
         bv = (build_sizes.board, build_sizes.variant)
-        build_sizes.print_table_row(last_bv != bv)
+        new_board = last_bv != bv
+        if new_board:
+            baseline_sizes = None
+        build_sizes.print_table_row(last_bv != bv, baseline_sizes)
         last_bv = bv
+        baseline_sizes = build_sizes
 
 
 def idf_git(*commands):

From cfea71da507b5f40e86d81efd7ac24c4acd73b27 Mon Sep 17 00:00:00 2001
From: Florent <florent@frizoncorrea.fr>
Date: Sun, 28 Sep 2025 13:52:22 +0200
Subject: [PATCH 2976/3129] esp32/boards: Add new board variant for esp32c2
 devices with 2MiB flash.

Factors out the space-saving config options from `sdkconfig.d2wd` to a new
`sdkconfig.flash_2MiB` file, and uses that in the new C2 FLASH_2M variant.

Signed-off-by: Florent <florent@frizoncorrea.fr>
---
 .../ESP32_GENERIC/mpconfigvariant_D2WD.cmake    |  1 +
 ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd | 16 +---------------
 ports/esp32/boards/ESP32_GENERIC_C2/board.json  |  3 +++
 ports/esp32/boards/ESP32_GENERIC_C2/board.md    |  2 ++
 .../boards/ESP32_GENERIC_C2/mpconfigboard.h     |  5 +++++
 .../mpconfigvariant_FLASH_2M.cmake              | 10 ++++++++++
 ports/esp32/boards/sdkconfig.flash_2MiB         | 17 +++++++++++++++++
 7 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C2/mpconfigvariant_FLASH_2M.cmake
 create mode 100644 ports/esp32/boards/sdkconfig.flash_2MiB

diff --git a/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake
index 170c214bda073..ec9998cfa5274 100644
--- a/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     ${SDKCONFIG_DEFAULTS}
+    boards/sdkconfig.flash_2MiB
     boards/ESP32_GENERIC/sdkconfig.d2wd
 )
 
diff --git a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
index 2ac983693d3ff..017a6c772955a 100644
--- a/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
+++ b/ports/esp32/boards/ESP32_GENERIC/sdkconfig.d2wd
@@ -1,17 +1,3 @@
-# Optimise using -Os to reduce size
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_OPTIMIZATION_PERF=n
-CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
-
-# Change maximum log level to error, to reduce firmware size.
-CONFIG_LOG_MAXIMUM_LEVEL_ERROR=y
-CONFIG_LOG_MAXIMUM_LEVEL_INFO=n
-
-# Disable SPI Ethernet driver to reduce firmware size.
-CONFIG_ETH_USE_SPI_ETHERNET=n
-
+# Setting specific to d2wd
 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/ESP32_GENERIC_C2/board.json b/ports/esp32/boards/ESP32_GENERIC_C2/board.json
index da0931a0e4459..c496396ef1aea 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C2/board.json
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/board.json
@@ -18,5 +18,8 @@
     "product": "ESP32-C2",
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
+    "variants": {
+        "FLASH_2M": "2MiB flash"
+    },
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/board.md b/ports/esp32/boards/ESP32_GENERIC_C2/board.md
index b8ed10069feb3..7c5c295a44df6 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C2/board.md
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/board.md
@@ -1,3 +1,5 @@
 The following files are firmware images that should work on most ESP32-C2-based
 boards with at least 4MiB of flash and 26MHz crystal frequency. This includes
 ESP8684-WROOM and ESP8684-MINI modules.
+
+If your board has only 2MiB of flash, you should try the FLASH\_2M variant
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
index 999465373e817..300ddb0e235d4 100644
--- a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.h
@@ -1,7 +1,12 @@
 // This configuration is for a generic ESP32C2 board with 4MiB (or more) of flash.
 
+#ifndef MICROPY_HW_BOARD_NAME
 #define MICROPY_HW_BOARD_NAME               "ESP32C2 module"
+#endif
+
+#ifndef MICROPY_HW_MCU_NAME
 #define MICROPY_HW_MCU_NAME                 "ESP32C2"
+#endif
 
 #define MICROPY_HW_ENABLE_SDCARD            (0)
 #define MICROPY_PY_MACHINE_I2S              (0)
diff --git a/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigvariant_FLASH_2M.cmake b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigvariant_FLASH_2M.cmake
new file mode 100644
index 0000000000000..74af633db23c7
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C2/mpconfigvariant_FLASH_2M.cmake
@@ -0,0 +1,10 @@
+set(SDKCONFIG_DEFAULTS
+    ${SDKCONFIG_DEFAULTS}
+    boards/sdkconfig.flash_2MiB
+)
+
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="Generic ESP32-C2 module with 2MiB Flash"
+    MICROPY_OPT_COMPUTED_GOTO=0
+    MICROPY_PY_NETWORK_LAN=0
+)
diff --git a/ports/esp32/boards/sdkconfig.flash_2MiB b/ports/esp32/boards/sdkconfig.flash_2MiB
new file mode 100644
index 0000000000000..5239fbd4f18d3
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.flash_2MiB
@@ -0,0 +1,17 @@
+# Set flash size to 2MiB.
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=n
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-2MiB.csv"
+
+# Disable SPI Ethernet driver to reduce firmware size.
+CONFIG_ETH_USE_SPI_ETHERNET=n
+
+# Optimise using -Os to reduce size.
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_PERF=n
+CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
+
+# Change maximum log level to error, to reduce firmware size.
+CONFIG_LOG_MAXIMUM_LEVEL_ERROR=y
+CONFIG_LOG_MAXIMUM_LEVEL_INFO=n

From 0f49a1d240959fb7f7100124b1f7bdfdf10c45ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Oct 2025 17:02:47 +1000
Subject: [PATCH 2977/3129] esp32: Update to use ESP-IDF v5.5.1.

Tested with ESP32_GENERIC, ESP32_GENERIC_C3, ESP32_GENERIC_C6 and
ESP32_GENERIC_S3 firmware, using the full test suite.  There do not seem to
be any regressions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md                           | 10 +++++-----
 ports/esp32/boards/sdkconfig.spiram             |  4 ++++
 ports/esp32/lockfiles/dependencies.lock.esp32   |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32c2 |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32c3 |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32c6 |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32s2 |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32s3 |  2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 2c09ebccd5039..5a2bb9240d932 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -31,8 +31,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. The
-current recommended version of ESP-IDF for MicroPython is v5.4.2. MicroPython
-also supports v5.2, v5.2.2, v5.3, v5.4 and v5.4.1.
+current recommended version of ESP-IDF for MicroPython is v5.5.1. MicroPython
+also supports v5.2, v5.2.2, v5.3, v5.4, v5.4.1 and v5.4.2.
 
 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/latest/esp32/get-started/index.html#installation-step-by-step).
@@ -50,10 +50,10 @@ The steps to take are summarised below.
 To check out a copy of the IDF use git clone:
 
 ```bash
-$ git clone -b v5.4.2 --recursive https://github.com/espressif/esp-idf.git
+$ git clone -b v5.5.1 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v5.4.2` with any other supported version.
+You can replace `v5.5.1` with 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.)
 
@@ -62,7 +62,7 @@ MicroPython and update the submodules using:
 
 ```bash
 $ cd esp-idf
-$ git checkout v5.4.2
+$ git checkout v5.5.1
 $ git submodule update --init --recursive
 ```
 
diff --git a/ports/esp32/boards/sdkconfig.spiram b/ports/esp32/boards/sdkconfig.spiram
index f5503d554149c..79c7510b5380d 100644
--- a/ports/esp32/boards/sdkconfig.spiram
+++ b/ports/esp32/boards/sdkconfig.spiram
@@ -16,3 +16,7 @@ CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
+
+# Workaround for bug in IDFv5.5-v5.5.1
+# See https://github.com/espressif/esp-idf/issues/17436#issuecomment-3197206868
+CONFIG_NEWLIB_NANO_FORMAT=n
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32 b/ports/esp32/lockfiles/dependencies.lock.esp32
index 5c2b7827544ef..71eccf03201bc 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32
@@ -25,7 +25,7 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 5.4.2
+    version: 5.5.1
 direct_dependencies:
 - espressif/lan867x
 - espressif/mdns
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c2 b/ports/esp32/lockfiles/dependencies.lock.esp32c2
index df6ed2c1d89dc..5f46e61564136 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c2
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c2
@@ -12,7 +12,7 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 5.4.2
+    version: 5.5.1
 direct_dependencies:
 - espressif/mdns
 - idf
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c3 b/ports/esp32/lockfiles/dependencies.lock.esp32c3
index a4c955d4763e9..5fb11084ea2e7 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c3
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c3
@@ -12,7 +12,7 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 5.4.2
+    version: 5.5.1
 direct_dependencies:
 - espressif/mdns
 - idf
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c6 b/ports/esp32/lockfiles/dependencies.lock.esp32c6
index fa81d8ad78dca..4debf5548ea1d 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c6
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c6
@@ -12,7 +12,7 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 5.4.2
+    version: 5.5.1
 direct_dependencies:
 - espressif/mdns
 - idf
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s2 b/ports/esp32/lockfiles/dependencies.lock.esp32s2
index 12430428e0979..bb1443947e96f 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32s2
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s2
@@ -40,7 +40,7 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 5.4.2
+    version: 5.5.1
 direct_dependencies:
 - espressif/esp_tinyusb
 - espressif/mdns
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s3 b/ports/esp32/lockfiles/dependencies.lock.esp32s3
index 215346dbd441c..38c17f5d6252a 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32s3
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s3
@@ -40,7 +40,7 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 5.4.2
+    version: 5.5.1
 direct_dependencies:
 - espressif/esp_tinyusb
 - espressif/mdns

From 9999553aaed6f9fba09382f9615da254748f7a0c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 15 Oct 2025 15:15:48 +1100
Subject: [PATCH 2978/3129] esp32/boards: Apply additional IRAM savings.

Saves approx 19KB on ESP32-C6 and 11KB on ESP32-C2, meaning IDF V5.5.1
builds now have more free RAM than V5.4.2.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/boards/sdkconfig.base | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 78b09ec6b24b0..e1b30b8e52053 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -99,9 +99,15 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiBplus.csv"
 
-# To reduce iRAM usage
-CONFIG_ESP32_WIFI_IRAM_OPT=n
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+# To reduce IRAM usage
+CONFIG_ESP_WIFI_IRAM_OPT=n
+CONFIG_ESP_WIFI_EXTRA_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_SLP_IRAM_OPT=n
+CONFIG_ESP_PHY_IRAM_OPT=n
+CONFIG_I2C_MASTER_ISR_HANDLER_IN_IRAM=n
+CONFIG_RMT_TX_ISR_HANDLER_IN_IRAM=n
+CONFIG_RMT_RX_ISR_HANDLER_IN_IRAM=n
 CONFIG_SPI_MASTER_ISR_IN_IRAM=n
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
 CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=n

From 93f13dd88291b54d4fcd8acafe5c1f8ac6d823df Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 18 Oct 2025 19:02:14 +1100
Subject: [PATCH 2979/3129] github/workflows: Free up more disk space on zephyr
 workflow.

Zephyr CI is currently failing, because the runner is out of space.

Free up some more space using the existing plugin.

Fixes issue #18290.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_zephyr.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index 3ed164e2f5f40..3579f4e1bc90c 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -28,11 +28,14 @@ jobs:
     - uses: jlumbroso/free-disk-space@main
       with:
         # Only free up a few things so this step runs quickly.
+        # (android would save 9.6GiB, but takes about 13m)
+        # (large-packages would save 4.6GiB, but takes about 3m)
         android: false
         dotnet: true
         haskell: true
         large-packages: false
         docker-images: false
+        tool-cache: true
         swap-storage: false
     - uses: actions/checkout@v5
     - id: versions

From 60edfeeead49cba018c9695a0fa10f812b1e04d9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Oct 2025 22:50:20 +1000
Subject: [PATCH 2980/3129] tests/run-tests.py: Raise OSError on invalid file
 open for injected FS.

This makes sure that `open()` raises `OSError(ENOENT)` if the test script
attempts to open a file that does not exist.

For example, the test `tests/ports/esp32/check_err_str.py` attempts to do
this and this test currently fails when run with `--via-mpy` because the
injected filesystem lets a file by any name be opened.

The fix here tries to be as minimal as possible, so includes a size
optimisation for `stat()` to use a fixed 10-tuple.  It also fixes the
`OSError` argument, which should be positive.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 82a6a3d972454..202abfacb8895 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -88,10 +88,11 @@ def getcwd(self):
     return ""
   def stat(self, path):
     if path == '__injected_test.mpy':
-      return tuple(0 for _ in range(10))
+      return (0,0,0,0,0,0,0,0,0,0)
     else:
-      raise OSError(-2) # ENOENT
+      raise OSError(2) # ENOENT
   def open(self, path, mode):
+    self.stat(path)
     return __File()
 vfs.mount(__FS(), '/__vfstest')
 os.chdir('/__vfstest')

From c5dc84c7972e58f127f8c70a2c1fe2f49e488bc9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Oct 2025 23:02:55 +1000
Subject: [PATCH 2981/3129] tests: Move ports/esp32/resolve_on_connect.py to
 net_inet.

The main reason for moving this test is that it needs internet connection
to pass.  So putting it in `net_inet` makes sure it's alongside other tests
that need the internet.

Also, it's a general test that could eventually run on other ports, if/when
they support doing an address resolution as part of `socket.connect()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/{ports/esp32 => net_inet}/resolve_on_connect.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename tests/{ports/esp32 => net_inet}/resolve_on_connect.py (87%)

diff --git a/tests/ports/esp32/resolve_on_connect.py b/tests/net_inet/resolve_on_connect.py
similarity index 87%
rename from tests/ports/esp32/resolve_on_connect.py
rename to tests/net_inet/resolve_on_connect.py
index e604ce9ca099a..cd8bb9a1d1d9d 100644
--- a/tests/ports/esp32/resolve_on_connect.py
+++ b/tests/net_inet/resolve_on_connect.py
@@ -1,11 +1,13 @@
-# Test that the esp32's socket module performs DNS resolutions on bind and connect
+# Test that the socket module performs DNS resolutions on bind and connect.
+# Currenty only the esp32 port does this, so the test is restricted to that port.
+
 import sys
 
 if sys.implementation.name == "micropython" and sys.platform != "esp32":
     print("SKIP")
     raise SystemExit
 
-import socket, sys
+import socket
 
 
 def test_bind_resolves_0_0_0_0():

From 6fef4eb55ce0ea02ecedc7788ff5a7a042e352d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 17 Aug 2025 00:42:17 +1000
Subject: [PATCH 2982/3129] tests/net_inet/resolve_on_connect.py: Convert to
 use unittest.

This makes it clear what this test is expected to return/do.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/resolve_on_connect.py | 54 +++++++++-------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/tests/net_inet/resolve_on_connect.py b/tests/net_inet/resolve_on_connect.py
index cd8bb9a1d1d9d..ac36e0f7fcd21 100644
--- a/tests/net_inet/resolve_on_connect.py
+++ b/tests/net_inet/resolve_on_connect.py
@@ -8,51 +8,31 @@
     raise SystemExit
 
 import socket
+import unittest
 
 
-def test_bind_resolves_0_0_0_0():
-    s = socket.socket()
-    try:
-        s.bind(("0.0.0.0", 31245))
-        print("bind actually bound")
+class Test(unittest.TestCase):
+    def test_bind_resolves_0_0_0_0(self):
+        s = socket.socket()
+        self.assertEqual(s.bind(("0.0.0.0", 31245)), None)
         s.close()
-    except Exception as e:
-        print("bind raised", e)
 
-
-def test_bind_resolves_localhost():
-    s = socket.socket()
-    try:
-        s.bind(("localhost", 31245))
-        print("bind actually bound")
+    def test_bind_resolves_localhost(self):
+        s = socket.socket()
+        self.assertEqual(s.bind(("localhost", 31245)), None)
         s.close()
-    except Exception as e:
-        print("bind raised", e)
-
 
-def test_connect_resolves():
-    s = socket.socket()
-    try:
-        s.connect(("micropython.org", 80))
-        print("connect actually connected")
+    def test_connect_resolves(self):
+        s = socket.socket()
+        self.assertEqual(s.connect(("micropython.org", 80)), None)
         s.close()
-    except Exception as e:
-        print("connect raised", e)
-
 
-def test_connect_non_existent():
-    s = socket.socket()
-    try:
-        s.connect(("nonexistent.example.com", 80))
-        print("connect actually connected")
+    def test_connect_non_existent(self):
+        s = socket.socket()
+        with self.assertRaises(OSError):
+            s.connect(("nonexistent.example.com", 80))
         s.close()
-    except OSError as e:
-        print("connect raised OSError")
-    except Exception as e:
-        print("connect raised", e)
 
 
-test_funs = [n for n in dir() if n.startswith("test_")]
-for f in sorted(test_funs):
-    print("--", f, end=": ")
-    eval(f + "()")
+if __name__ == "__main__":
+    unittest.main()

From a3867590f917176c5276042a9edc2f400b665d4f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Jul 2025 12:24:51 +1000
Subject: [PATCH 2983/3129] tests/net_inet: Skip tests on axTLS when necessary.

These tests cannot run with axTLS, eg on esp8266.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/asyncio_tls_open_connection_readline.py | 4 ++++
 tests/net_inet/ssl_cert.py                             | 3 +++
 tests/net_inet/ssl_errors.py                           | 4 ++++
 tests/net_inet/test_sslcontext_client.py               | 4 ++++
 tests/net_inet/test_tls_nonblock.py                    | 7 +++++++
 5 files changed, 22 insertions(+)

diff --git a/tests/net_inet/asyncio_tls_open_connection_readline.py b/tests/net_inet/asyncio_tls_open_connection_readline.py
index a0df88be4af1b..492b85a5dbd24 100644
--- a/tests/net_inet/asyncio_tls_open_connection_readline.py
+++ b/tests/net_inet/asyncio_tls_open_connection_readline.py
@@ -2,6 +2,10 @@
 import os
 import asyncio
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 # 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:
diff --git a/tests/net_inet/ssl_cert.py b/tests/net_inet/ssl_cert.py
index 7bb270d5fda7a..4f065c5657ee2 100644
--- a/tests/net_inet/ssl_cert.py
+++ b/tests/net_inet/ssl_cert.py
@@ -1,6 +1,9 @@
 import socket
 import ssl
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
 
 # This certificate was obtained from micropython.org using openssl:
 # $ openssl s_client -showcerts -connect micropython.org:443 </dev/null 2>/dev/null
diff --git a/tests/net_inet/ssl_errors.py b/tests/net_inet/ssl_errors.py
index bc4e5910bccd8..c23f736b09b08 100644
--- a/tests/net_inet/ssl_errors.py
+++ b/tests/net_inet/ssl_errors.py
@@ -3,6 +3,10 @@
 
 import sys, errno, select, socket, ssl
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 
 def test(addr, hostname, block=True):
     print("---", hostname)
diff --git a/tests/net_inet/test_sslcontext_client.py b/tests/net_inet/test_sslcontext_client.py
index 77f68da496a77..bc06dc3c5832a 100644
--- a/tests/net_inet/test_sslcontext_client.py
+++ b/tests/net_inet/test_sslcontext_client.py
@@ -2,6 +2,10 @@
 import socket
 import ssl
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 # 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:
diff --git a/tests/net_inet/test_tls_nonblock.py b/tests/net_inet/test_tls_nonblock.py
index 60af858b1f146..3f9a61413f9cf 100644
--- a/tests/net_inet/test_tls_nonblock.py
+++ b/tests/net_inet/test_tls_nonblock.py
@@ -1,5 +1,12 @@
 import socket, ssl, errno, sys, time, select
 
+# Although this test doesn't need ssl.CERT_REQUIRED, it does require the ssl module
+# to support modern ciphers.  So exclude the test on axTLS which doesn't have
+# CERT_REQUIRED.
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 
 def test_one(site, opts):
     ai = socket.getaddrinfo(site, 443, socket.AF_INET)

From e1a6c11f4238cc31e6f11133d9e8c237919baee0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Oct 2025 12:52:14 +1100
Subject: [PATCH 2984/3129] tests/net_inet/tls_num_errors.py: Switch to tls mod
 and require mbedTLS.

This test is very specific to mbedTLS and how it raises errors when the
heap is locked.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/tls_num_errors.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/net_inet/tls_num_errors.py b/tests/net_inet/tls_num_errors.py
index 9c12114eab1f6..79678e07274c9 100644
--- a/tests/net_inet/tls_num_errors.py
+++ b/tests/net_inet/tls_num_errors.py
@@ -1,6 +1,11 @@
 # test that modtls produces a numerical error message when out of heap
 
-import socket, ssl, sys
+import socket, tls
+
+# This test is specific to the mbedTLS implementation, so require that.
+if not hasattr(tls, "MBEDTLS_VERSION"):
+    print("SKIP")
+    raise SystemExit
 
 try:
     from micropython import heap_lock, heap_unlock
@@ -18,11 +23,13 @@
 
 # test with heap locked to see it switch to number-only error message
 def test(addr):
+    ctx = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+    ctx.verify_mode = tls.CERT_NONE
     s = socket.socket()
     s.connect(addr)
     try:
         s.setblocking(False)
-        s = ssl.wrap_socket(s, do_handshake=False)
+        s = ctx.wrap_socket(s, do_handshake_on_connect=False)
         heap_lock()
         print("heap is locked")
         while True:

From c5c03e74ab207ef1c97f6dffe955669e8237a334 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Oct 2025 12:35:41 +1100
Subject: [PATCH 2985/3129] tests/net_inet/tls_text_errors.py: Add exp file to
 run on axTLS.

axTLS will print a warning, and the added .exp file will skip that line.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/tls_text_errors.py.exp | 2 ++
 tests/run-tests.py                    | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 tests/net_inet/tls_text_errors.py.exp

diff --git a/tests/net_inet/tls_text_errors.py.exp b/tests/net_inet/tls_text_errors.py.exp
new file mode 100644
index 0000000000000..2cedeb7c9a396
--- /dev/null
+++ b/tests/net_inet/tls_text_errors.py.exp
@@ -0,0 +1,2 @@
+########
+wrap: True
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 202abfacb8895..0e38f19860761 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -548,6 +548,7 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
         "basics/bytes_compare3.py",
         "basics/builtin_help.py",
         "misc/sys_settrace_cov.py",
+        "net_inet/tls_text_errors.py",
         "thread/thread_exc2.py",
         "ports/esp32/partition_ota.py",
     )

From 3b46c0018a0656bd98f0320efb00c11c268b44d3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Jul 2025 13:49:16 +1000
Subject: [PATCH 2986/3129] tests/net_hosted/ssl_verify_callback.py: Skip if no
 verify_callback.

axTLS does not implement the `verify_callback` attribute.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_hosted/ssl_verify_callback.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/net_hosted/ssl_verify_callback.py b/tests/net_hosted/ssl_verify_callback.py
index 0dba4e4fddcf6..cd03ff49d77f1 100644
--- a/tests/net_hosted/ssl_verify_callback.py
+++ b/tests/net_hosted/ssl_verify_callback.py
@@ -4,6 +4,12 @@
 import socket
 import tls
 
+context = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+
+if not hasattr(context, "verify_callback"):
+    print("SKIP")
+    raise SystemExit
+
 
 def verify_callback(cert, depth):
     print("verify_callback:", type(cert), len(cert) > 100, depth)
@@ -16,7 +22,6 @@ def verify_callback_fail(cert, depth):
 
 
 def test(peer_addr):
-    context = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
     context.verify_mode = tls.CERT_OPTIONAL
     context.verify_callback = verify_callback
     s = socket.socket()

From 196a8653a24abe26d474899570398426877c7563 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Sep 2025 15:19:48 +1000
Subject: [PATCH 2987/3129] tests/extmod/time_res.py: Properly skip functions
 not in time module.

If `time.time` doesn't exist, it tries to use `globals()['time']` which is
the time module itself, and that causes the test to fail.  Instead it
should just skip `time.time`.

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

diff --git a/tests/extmod/time_res.py b/tests/extmod/time_res.py
index 548bef1f1747c..ef20050b914d7 100644
--- a/tests/extmod/time_res.py
+++ b/tests/extmod/time_res.py
@@ -37,9 +37,12 @@ def test():
         time.sleep_ms(100)
         for func_name, _ in EXPECTED_MAP:
             try:
-                time_func = getattr(time, func_name, None) or globals()[func_name]
+                if func_name.endswith("_time"):
+                    time_func = globals()[func_name]
+                else:
+                    time_func = getattr(time, func_name)
                 now = time_func()  # may raise AttributeError
-            except (KeyError, AttributeError):
+            except AttributeError:
                 continue
             try:
                 results_map[func_name].add(now)

From ea2fdebce29f655fcae7b79214b063618e26ab69 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Sep 2025 16:54:45 +1000
Subject: [PATCH 2988/3129] tests/run-tests.py: Allow port:<dev> specification
 in run-multitests.py.

This moves the `port:<dev>` check for the test instance to the
`convert_device_shortcut_to_real_device()` helper function, which means
that `run-multitests.py` can use this specification.

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

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 0e38f19860761..b55bd8e497972 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -343,7 +343,9 @@ def platform_to_port(platform):
 
 
 def convert_device_shortcut_to_real_device(device):
-    if device.startswith("a") and device[1:].isdigit():
+    if device.startswith("port:"):
+        return device.split(":", 1)[1]
+    elif device.startswith("a") and device[1:].isdigit():
         return "/dev/ttyACM" + device[1:]
     elif device.startswith("u") and device[1:].isdigit():
         return "/dev/ttyUSB" + device[1:]
@@ -354,9 +356,7 @@ def convert_device_shortcut_to_real_device(device):
 
 
 def get_test_instance(test_instance, baudrate, user, password):
-    if test_instance.startswith("port:"):
-        _, port = test_instance.split(":", 1)
-    elif test_instance == "unix":
+    if test_instance == "unix":
         return None
     elif test_instance == "webassembly":
         return PyboardNodeRunner()

From b1802eb0e1363fb7d0d2c618a3522b84978c77d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Oct 2025 07:19:36 +1100
Subject: [PATCH 2989/3129] tools/ci.sh: Init micropython-lib submodule for
 zephyr build.

The zephyr port doesn't have a Makefile so can't run `make submodules`.
Instead they must be explicitly initialized.

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 815e9bd4b1fed..b81794a6ccb78 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -986,6 +986,7 @@ function ci_zephyr_install {
 }
 
 function ci_zephyr_build {
+    git submodule update --init lib/micropython-lib
     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
     docker exec zephyr-ci west build -p auto -b mimxrt1050_evk

From 7090fc5dd63bc1dcbe5470e2000ed333cb867d64 Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@metamagix.tech>
Date: Wed, 1 Oct 2025 10:56:41 -0700
Subject: [PATCH 2990/3129] zephyr: Mount all disks and flash partition,
 formatting if necessary.

Existing C code in `main.c` only mounts a flash filesystem if one exists,
and doesn't do anything if the 'storage' partition is not formatted.

This commit moves the mounting logic from `main.c` to frozen code using
`modules/_boot.py` and adds the formatting of a previously unformatted
partition if the mount fails.

Every available disk (in the newly added `DiskAccess.disks` tuple) will be
mounted on separate mount points (if they're formatted), and the 'storage'
flash partition (if any) will be mounted on /flash (and will be formatted
as LFS2 if necessary).

Also, `sys.path` will be updated with appropriate 'lib' subdirectories for
each mounted filesystem.

The current working directory will be changed to the last `DiskAccess.disk`
mounted, or to /flash if no disks were mounted.

Then `boot.py` and `main.py` will be executed from the current working
directory if they exist.

Thanks to @VynDragon for the logic in `zephyr/zephyr_storage.c`.

Signed-off-by: Ned Konz <ned@metamagix.tech>
---
 docs/zephyr/quickref.rst         | 14 +++---
 docs/zephyr/tutorial/storage.rst | 56 ++++++++++++++++++++----
 ports/zephyr/Kconfig             |  1 +
 ports/zephyr/main.c              | 41 +++---------------
 ports/zephyr/modules/_boot.py    | 73 ++++++++++++++++++++++++++++++++
 ports/zephyr/zephyr_storage.c    | 51 ++++++++++++++++++++--
 6 files changed, 183 insertions(+), 53 deletions(-)
 create mode 100644 ports/zephyr/modules/_boot.py

diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 6025092a02c9f..78d465050c070 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -135,11 +135,14 @@ the ``io-channels`` property containing all the ADC channels)::
 Disk Access
 -----------
 
-Use the :ref:`zephyr.DiskAccess <zephyr.DiskAccess>` class to support filesystem::
+Storage devices such as SD cards are automatically mounted at startup (e.g., at ``/sd``).
+For manual mounting, use the :ref:`zephyr.DiskAccess <zephyr.DiskAccess>` class::
 
     import vfs
     from zephyr import DiskAccess
 
+    print(DiskAccess.disks)             # list available disk names, e.g., ('SDHC',)
+
     block_dev = DiskAccess('SDHC')      # create a block device object for an SD card
     vfs.VfsFat.mkfs(block_dev)          # create FAT filesystem object using the disk storage block
     vfs.mount(block_dev, '/sd')         # mount the filesystem at the SD card subdirectory
@@ -152,12 +155,15 @@ Use the :ref:`zephyr.DiskAccess <zephyr.DiskAccess>` class to support filesystem
 Flash Area
 ----------
 
-Use the :ref:`zephyr.FlashArea <zephyr.FlashArea>` class to support filesystem::
+Flash storage is automatically mounted at ``/flash`` at startup with automatic filesystem creation.
+For manual mounting, use the :ref:`zephyr.FlashArea <zephyr.FlashArea>` class::
 
     import vfs
     from zephyr import FlashArea
 
-    block_dev = FlashArea(4, 4096)      # creates a block device object in the frdm-k64f flash scratch partition
+    print(FlashArea.areas)              # list available areas, e.g., {'storage': 1, 'scratch': 4}
+
+    block_dev = FlashArea(FlashArea.areas['scratch'], 4096)  # creates a block device object using the scratch partition
     vfs.VfsLfs2.mkfs(block_dev)         # create filesystem in lfs2 format using the flash block device
     vfs.mount(block_dev, '/flash')      # mount the filesystem at the flash subdirectory
 
@@ -166,8 +172,6 @@ Use the :ref:`zephyr.FlashArea <zephyr.FlashArea>` class to support filesystem::
         f.write('Hello world')                  # write to the file
     print(open('/flash/hello.txt').read())      # print contents of the file
 
-The ``FlashAreas``' IDs that are available are listed in the FlashArea module, as ``ID_*``.
-
 Sensor
 ------
 
diff --git a/docs/zephyr/tutorial/storage.rst b/docs/zephyr/tutorial/storage.rst
index 7fd449226fbff..835d239b6604f 100644
--- a/docs/zephyr/tutorial/storage.rst
+++ b/docs/zephyr/tutorial/storage.rst
@@ -8,6 +8,27 @@ Zephyr DiskAccess or FlashArea (flash map) APIs depending on which the board sup
 
 See `vfs Filesystem Mounting <https://docs.micropython.org/en/latest/library/vfs.html?highlight=vfs#filesystem-mounting>`_.
 
+Automatic Filesystem Mounting
+------------------------------
+
+MicroPython on Zephyr automatically attempts to mount available storage at startup:
+
+1. **Flash storage** (if available): Automatically mounted at ``/flash`` using the
+   littlefs2 filesystem. If the filesystem doesn't exist, it will be created
+   automatically.
+
+2. **Disk storage** (such as SD cards): Automatically detected and mounted at
+   ``/<disk_name>`` (e.g., ``/sd`` for SD cards).
+
+3. **Working directory**: The working directory is set to the mounted disk if
+   available, otherwise to ``/flash`` if flash storage is available.
+
+4. **Module search path**: The ``sys.path`` is automatically updated to include
+   ``/<disk>/lib`` for each mounted disk and ``/flash/lib`` for flash storage.
+
+This automatic mounting is performed by the ``_boot.py`` module at startup. For most
+use cases, you don't need to manually mount filesystems.
+
 Disk Access
 -----------
 
@@ -19,17 +40,26 @@ For use with SD card controllers, SD cards must be present at boot & not removed
 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).
 
+The available disk names can be accessed via the ``DiskAccess.disks`` attribute, which contains
+a tuple of available disk names (e.g., ``('SDHC',)`` or ``('SD',)``).
+
 Example usage of FatFS with an SD card on the mimxrt1050_evk board::
 
     import vfs
     from zephyr import DiskAccess
-    bdev = zephyr.DiskAccess('SDHC')        # create block device object using DiskAccess
+
+    # List available disks
+    print(DiskAccess.disks)                 # prints available disk names, e.g., ('SDHC',)
+
+    bdev = DiskAccess('SDHC')               # create block device object using DiskAccess
     vfs.VfsFat.mkfs(bdev)                   # create FAT filesystem object using the disk storage block
     vfs.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
 
+Note: In most cases, disks are automatically mounted at startup and manual mounting is not necessary.
+
 
 Flash Area
 ----------
@@ -41,16 +71,26 @@ 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 `vfs.AbstractBlockDev` protocol.
 
+The available flash area names can be accessed via the ``FlashArea.areas`` dictionary, which maps partition
+labels to their IDs (e.g., ``{'storage': 1, 'scratch': 4}``).
+
 Example usage with the internal flash on the reel_board or the rv32m1_vega_ri5cy board::
 
     import vfs
     from zephyr import FlashArea
-    bdev = FlashArea(FlashArea.STORAGE, 4096)   # create block device object using FlashArea
-    vfs.VfsLfs2.mkfs(bdev)                      # create Little filesystem object using the flash area block
-    vfs.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
+
+    # List available flash areas
+    print(FlashArea.areas)                          # prints available areas, e.g., {'storage': 1, 'scratch': 4}
+
+    bdev = FlashArea(FlashArea.areas['storage'], 4096)   # create block device object using FlashArea
+    vfs.VfsLfs2.mkfs(bdev)                               # create Little filesystem object using the flash area block
+    vfs.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
+
+Note: In most cases, the flash storage partition is automatically mounted at ``/flash`` at startup with
+automatic filesystem creation if needed, so manual mounting is not necessary.
 
 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.
+partition, use the scratch partition by replacing ``'storage'`` with ``'scratch'``.
diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig
index 6db0133f4f15d..d9e85c4fc200b 100644
--- a/ports/zephyr/Kconfig
+++ b/ports/zephyr/Kconfig
@@ -43,6 +43,7 @@ config MICROPY_VFS_LFS2
 
 config MICROPY_FROZEN_MODULES
 	bool "Enable Frozen Modules"
+	default y if FLASH_MAP || DISK_ACCESS
 
 config MICROPY_FROZEN_MANIFEST
 	string "Path to Frozen Modules manifest.py"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index edf2ba1a3bbc4..0fa4e97b24186 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -94,39 +94,6 @@ void init_zephyr(void) {
     #endif
 }
 
-#if MICROPY_VFS
-static void vfs_init(void) {
-    mp_obj_t bdev = NULL;
-    mp_obj_t mount_point;
-    const char *mount_point_str = NULL;
-    qstr path_lib_qstr = MP_QSTRnull;
-    int ret = 0;
-
-    #ifdef CONFIG_DISK_DRIVER_SDMMC
-    #if KERNEL_VERSION_NUMBER >= ZEPHYR_VERSION(4, 0, 0)
-    mp_obj_t args[] = { mp_obj_new_str_from_cstr(DT_PROP(DT_INST(0, zephyr_sdmmc_disk), disk_name)) };
-    #else
-    mp_obj_t args[] = { mp_obj_new_str_from_cstr(CONFIG_SDMMC_VOLUME_NAME) };
-    #endif
-    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";
-    path_lib_qstr = MP_QSTR__slash_sd_slash_lib;
-    #elif defined(CONFIG_FLASH_MAP) && FIXED_PARTITION_EXISTS(storage_partition)
-    mp_obj_t args[] = { MP_OBJ_NEW_SMALL_INT(FIXED_PARTITION_ID(storage_partition)), MP_OBJ_NEW_SMALL_INT(4096) };
-    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";
-    path_lib_qstr = MP_QSTR__slash_flash_slash_lib;
-    #endif
-
-    if ((bdev != NULL)) {
-        mount_point = mp_obj_new_str_from_cstr(mount_point_str);
-        ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
-        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(path_lib_qstr));
-        // TODO: if this failed, make a new file system and try to mount again
-    }
-}
-#endif // MICROPY_VFS
-
 int real_main(void) {
     #if MICROPY_PY_THREAD
     struct k_thread *z_thread = (struct k_thread *)k_current_get();
@@ -151,10 +118,12 @@ int real_main(void) {
     mp_usbd_init();
     #endif
 
-    #if MICROPY_VFS
-    vfs_init();
+    #if MICROPY_VFS && MICROPY_MODULE_FROZEN_MPY
+    // Mount and/or create the filesystem
+    pyexec_frozen_module("_boot.py", false);
     #endif
 
+
     #if MICROPY_MODULE_FROZEN || MICROPY_VFS
     // Execute user scripts.
     int ret = pyexec_file_if_exists("boot.py");
@@ -181,7 +150,7 @@ int real_main(void) {
         }
     }
 
-    #if MICROPY_MODULE_FROZEN || MICROPY_VFS
+    #if MICROPY_MODULE_FROZEN_MPY || MICROPY_VFS
 soft_reset_exit:
     #endif
 
diff --git a/ports/zephyr/modules/_boot.py b/ports/zephyr/modules/_boot.py
new file mode 100644
index 0000000000000..5af302fad72d0
--- /dev/null
+++ b/ports/zephyr/modules/_boot.py
@@ -0,0 +1,73 @@
+# ruff: noqa: F821
+import sys
+import os
+from micropython import const
+import vfs  # vfs is always available
+import zephyr
+
+# FlashArea depends on CONFIG_FLASH_MAP
+FlashArea = getattr(zephyr, "FlashArea", None)
+
+# DiskAccess depends on CONFIG_DISK_ACCESS
+DiskAccess = getattr(zephyr, "DiskAccess", None)
+
+_FLASH = const("/flash")
+_FLASH_LIB = const("/flash/lib")
+_STORAGE_KEY = const("storage")
+_FLASH_EXISTS = False
+
+
+def create_flash_partition():
+    """Create an LFS2 filesystem on the partition labeled storage
+    and mount it on /flash.
+    Return True if successful, False otherwise.
+    """
+    if _STORAGE_KEY in FlashArea.areas:
+        # TODO: get the erase block size from DTS instead of 4K.
+        bdev = FlashArea(FlashArea.areas[_STORAGE_KEY], 4096)
+        retval = True
+        try:
+            vfs.mount(bdev, _FLASH)
+        except OSError:
+            try:
+                vfs.VfsLfs2.mkfs(bdev)
+                vfs.mount(bdev, _FLASH)
+            except OSError:
+                print("Error formatting flash partition")
+                retval = False
+        return retval
+    return False
+
+
+def mount_all_disks():
+    """Now mount all the DiskAreas (if any)."""
+    retval = False
+    for da_name in DiskAccess.disks:
+        mount_name = f"/{da_name.lower()}"
+        da = DiskAccess(da_name)
+        try:
+            vfs.mount(da, mount_name)
+            sys.path.append(f"{mount_name}/lib")
+            os.chdir(mount_name)
+            retval = True
+        except OSError as e:
+            print(f"Error mounting {da_name}: {e}")
+    return retval
+
+
+if FlashArea and create_flash_partition():
+    _FLASH_EXISTS = True
+
+# Prefer disks to /flash
+if not (DiskAccess and mount_all_disks()):
+    if _FLASH_EXISTS:
+        os.chdir(_FLASH)
+
+# Place /flash/lib last on sys.path
+if _FLASH_EXISTS:
+    sys.path.append(_FLASH_LIB)
+
+# Cleanup globals for boot.py/main.py
+del FlashArea, DiskAccess, zephyr
+del sys, vfs, os, const
+del create_flash_partition, mount_all_disks, _FLASH_EXISTS
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 40bcef73384cf..e72e047d078ac 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -40,6 +40,11 @@
 #endif
 
 #ifdef CONFIG_DISK_ACCESS
+
+#define DISK_DEFINE_NAME(part) CONCAT(MP_QSTR_, DT_STRING_TOKEN(part, disk_name))
+
+#define FOREACH_DISK(n) MP_ROM_QSTR(DISK_DEFINE_NAME(n)),
+
 typedef struct _zephyr_disk_access_obj_t {
     mp_obj_base_t base;
     const char *pdrv;
@@ -121,10 +126,43 @@ static mp_obj_t zephyr_disk_access_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_o
 }
 static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_disk_access_ioctl_obj, zephyr_disk_access_ioctl);
 
+static const mp_rom_obj_tuple_t zephyr_disks_tuple = {
+    .base = {.type = &mp_type_tuple},
+    .items = {
+        #ifdef CONFIG_DISK_DRIVER_SDMMC
+        DT_FOREACH_STATUS_OKAY(zephyr_sdmmc_disk, FOREACH_DISK)
+        #endif
+        #ifdef CONFIG_DISK_DRIVER_MMC
+        DT_FOREACH_STATUS_OKAY(zephyr_mmc_disk, FOREACH_DISK)
+        #endif
+        #ifdef CONFIG_DISK_DRIVER_FLASH
+        DT_FOREACH_STATUS_OKAY(zephyr_flash_disk, FOREACH_DISK)
+        #endif
+        #ifdef CONFIG_DISK_DRIVER_RAM
+        DT_FOREACH_STATUS_OKAY(zephyr_ram_disk, FOREACH_DISK)
+        #endif
+    },
+    .len = MP_ARRAY_SIZE((mp_rom_obj_t []) {
+        #ifdef CONFIG_DISK_DRIVER_SDMMC
+        DT_FOREACH_STATUS_OKAY(zephyr_sdmmc_disk, FOREACH_DISK)
+        #endif
+        #ifdef CONFIG_DISK_DRIVER_MMC
+        DT_FOREACH_STATUS_OKAY(zephyr_mmc_disk, FOREACH_DISK)
+        #endif
+        #ifdef CONFIG_DISK_DRIVER_FLASH
+        DT_FOREACH_STATUS_OKAY(zephyr_flash_disk, FOREACH_DISK)
+        #endif
+        #ifdef CONFIG_DISK_DRIVER_RAM
+        DT_FOREACH_STATUS_OKAY(zephyr_ram_disk, FOREACH_DISK)
+        #endif
+    })
+};
+
 static const mp_rom_map_elem_t zephyr_disk_access_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&zephyr_disk_access_readblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&zephyr_disk_access_writeblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&zephyr_disk_access_ioctl_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disks), MP_ROM_PTR(&zephyr_disks_tuple) },
 };
 static MP_DEFINE_CONST_DICT(zephyr_disk_access_locals_dict, zephyr_disk_access_locals_dict_table);
 
@@ -140,8 +178,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 #ifdef CONFIG_FLASH_MAP
 
-#define FLASH_AREA_DEFINE_LABEL(part) CONCAT(MP_QSTR_ID_, DT_STRING_TOKEN(part, label))
-#define FLASH_AREA_DEFINE_NB(part) CONCAT(MP_QSTR_ID_, DT_FIXED_PARTITION_ID(part))
+#define FLASH_AREA_DEFINE_LABEL(part) CONCAT(MP_QSTR_, DT_STRING_TOKEN(part, label))
+#define FLASH_AREA_DEFINE_NB(part) CONCAT(MP_QSTR_, DT_FIXED_PARTITION_ID(part))
 
 #define FLASH_AREA_DEFINE_GETNAME(part) COND_CODE_1(DT_NODE_HAS_PROP(part, label), \
     (FLASH_AREA_DEFINE_LABEL(part)), (FLASH_AREA_DEFINE_NB(part)))
@@ -254,12 +292,17 @@ static mp_obj_t zephyr_flash_area_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_ob
 }
 static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_flash_area_ioctl_obj, zephyr_flash_area_ioctl);
 
+static const mp_rom_map_elem_t zephyr_flash_areas_table[] = {
+    /* Generate list of partition IDs from Zephyr Devicetree */
+    DT_FOREACH_STATUS_OKAY(fixed_partitions, FOREACH_PARTITION)
+};
+static MP_DEFINE_CONST_DICT(zephyr_flash_areas_dict, zephyr_flash_areas_table);
+
 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) },
-    /* Generate list of partition IDs from Zephyr Devicetree */
-    DT_FOREACH_STATUS_OKAY(fixed_partitions, FOREACH_PARTITION)
+    { MP_ROM_QSTR(MP_QSTR_areas), MP_ROM_PTR(&zephyr_flash_areas_dict) },
 };
 static MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);
 

From 4c11f64faa3841e2939ccf11aad618d213a236a4 Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@metamagix.tech>
Date: Fri, 17 Oct 2025 10:51:56 -0700
Subject: [PATCH 2991/3129] zephyr: Add erase block size to FlashArea.areas
 entries.

This commit changes the values in the `FlashArea.areas` dictionary from
simple integer IDs to (ID, erase-block-size) tuples.

`_boot.py` was changed to use the newly available erase block size.

Signed-off-by: Ned Konz <ned@metamagix.tech>
---
 ports/zephyr/README.md        | 22 ++++++++++++++++++++++
 ports/zephyr/modules/_boot.py |  3 +--
 ports/zephyr/zephyr_storage.c | 26 +++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 480ff5705c21d..eedcdcb58b336 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -163,6 +163,28 @@ the 'io-channels' property with all the ADC channels):
     adc = ADC(("adc", 0))
     adc.read_uv()
 
+Example of using FlashArea for flash storage access:
+
+    from zephyr import FlashArea
+
+    # FlashArea.areas is a dictionary mapping partition labels to tuples
+    # Each tuple contains (partition_id, erase_block_size)
+    print(FlashArea.areas)  # e.g. {'storage': (3, 4096)}
+
+    # Create a FlashArea object for a specific partition
+    # Constructor takes (partition_id, block_size)
+    partition_id, erase_size = FlashArea.areas['storage']
+    flash = FlashArea(partition_id, erase_size)
+
+    # Use with virtual filesystem (see _boot.py for automatic mounting)
+    import os
+    os.VfsFat(flash)  # or os.VfsLfs2(flash)
+
+The `FlashArea.areas` dictionary provides partition information from the Zephyr
+devicetree. The erase block size is obtained from the flash controller's
+`erase-block-size` property, or defaults to 4096 bytes for devices (like QSPI
+NOR flash) that don't specify this property.
+
 Minimal build
 -------------
 
diff --git a/ports/zephyr/modules/_boot.py b/ports/zephyr/modules/_boot.py
index 5af302fad72d0..d0ba21d3f0670 100644
--- a/ports/zephyr/modules/_boot.py
+++ b/ports/zephyr/modules/_boot.py
@@ -23,8 +23,7 @@ def create_flash_partition():
     Return True if successful, False otherwise.
     """
     if _STORAGE_KEY in FlashArea.areas:
-        # TODO: get the erase block size from DTS instead of 4K.
-        bdev = FlashArea(FlashArea.areas[_STORAGE_KEY], 4096)
+        bdev = FlashArea(*FlashArea.areas[_STORAGE_KEY])
         retval = True
         try:
             vfs.mount(bdev, _FLASH)
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index e72e047d078ac..b6396e711840d 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -184,15 +184,39 @@ MP_DEFINE_CONST_OBJ_TYPE(
 #define FLASH_AREA_DEFINE_GETNAME(part) COND_CODE_1(DT_NODE_HAS_PROP(part, label), \
     (FLASH_AREA_DEFINE_LABEL(part)), (FLASH_AREA_DEFINE_NB(part)))
 
-#define FLASH_AREA_DEFINE_DEFINE(part) { MP_ROM_QSTR(FLASH_AREA_DEFINE_GETNAME(part)), MP_ROM_INT(DT_FIXED_PARTITION_ID(part)) },
+// Helper macro to get erase block size from the flash device
+// Note: Some flash controllers have erase-block-size, others (like QSPI NOR) don't
+// For devices without this property, use 4096 as a common default for NOR flash
+#define FLASH_AREA_GET_ERASE_SIZE(part) \
+    DT_PROP_OR(DT_MTD_FROM_FIXED_PARTITION(part), erase_block_size, 4096)
+
+// Create a static tuple for each partition containing (id, erase_block_size)
+#define FLASH_AREA_DEFINE_TUPLE(part) \
+    static const mp_rom_obj_tuple_t flash_area_tuple_##part = { \
+        {&mp_type_tuple}, \
+        2, \
+        { \
+            MP_ROM_INT(DT_FIXED_PARTITION_ID(part)), \
+            MP_ROM_INT(FLASH_AREA_GET_ERASE_SIZE(part)), \
+        } \
+    };
+
+#define FLASH_AREA_TUPLE(part) COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_MTD_FROM_FIXED_PARTITION(part)), \
+    (FLASH_AREA_DEFINE_TUPLE(part)), ())
+
+#define FLASH_AREA_DEFINE_DEFINE(part) { MP_ROM_QSTR(FLASH_AREA_DEFINE_GETNAME(part)), MP_ROM_PTR(&flash_area_tuple_##part) },
 
 #define FLASH_AREA_DEFINE(part) COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_MTD_FROM_FIXED_PARTITION(part)), \
     (FLASH_AREA_DEFINE_DEFINE(part)), ())
 
 #define FOREACH_PARTITION(n) DT_FOREACH_CHILD(n, FLASH_AREA_DEFINE)
+#define FOREACH_PARTITION_TUPLE(n) DT_FOREACH_CHILD(n, FLASH_AREA_TUPLE)
 
 const mp_obj_type_t zephyr_flash_area_type;
 
+// Generate tuple definitions for all partitions
+DT_FOREACH_STATUS_OKAY(fixed_partitions, FOREACH_PARTITION_TUPLE)
+
 typedef struct _zephyr_flash_area_obj_t {
     mp_obj_base_t base;
     const struct flash_area *area;

From 7bb78fb6dfecf1edb9f1ba2943d558ed991111ab Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@metamagix.tech>
Date: Wed, 1 Oct 2025 14:16:44 -0700
Subject: [PATCH 2992/3129] zephyr/boards: Add XIAO BLE NRF52840 SENSE board.

This commit adds Zephyr support for the XIAO BLE NRF52840 SENSE board from
Seeed Studio.

It also provides a good example of a richer Zephyr port than the default,
adding:
- Frozen modules (including asyncio, upysh, aioble and aiorepl).
- Enough MicroPython features to support using aioble (at least for the
  `temp_sensor.py` example).
- JSON, random, re, struct, etc.

Signed-off-by: Ned Konz <ned@metamagix.tech>
---
 .../boards/xiao_ble_nrf52840_sense.conf       | 51 ++++++++++++
 .../boards/xiao_ble_nrf52840_sense.overlay    | 79 +++++++++++++++++++
 .../xiao_ble_nrf52840_sense/manifest.py       |  7 ++
 .../xiao_ble_nrf52840_sense/mpconfigport.h    | 27 +++++++
 4 files changed, 164 insertions(+)
 create mode 100644 ports/zephyr/boards/xiao_ble_nrf52840_sense.conf
 create mode 100644 ports/zephyr/boards/xiao_ble_nrf52840_sense.overlay
 create mode 100644 ports/zephyr/boards/xiao_ble_nrf52840_sense/manifest.py
 create mode 100644 ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h

diff --git a/ports/zephyr/boards/xiao_ble_nrf52840_sense.conf b/ports/zephyr/boards/xiao_ble_nrf52840_sense.conf
new file mode 100644
index 0000000000000..541ade2af246a
--- /dev/null
+++ b/ports/zephyr/boards/xiao_ble_nrf52840_sense.conf
@@ -0,0 +1,51 @@
+# Kconfig configuration for Seeed Studio's XIAO nRF52840 Sense
+
+CONFIG_NETWORKING=n
+CONFIG_CONSOLE_SUBSYS=n
+
+# for PDM microphone, set these three to y
+# and also enable in overlay
+CONFIG_AUDIO=n
+CONFIG_AUDIO_DMIC=n
+CONFIG_AUDIO_DMIC_NRFX_PDM=n
+
+# Enable Bluetooth
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_DEVICE_NAME="XIAO BLE nRF52840 Sense"
+CONFIG_BT_GATT_DYNAMIC_DB=y
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_GATT_CLIENT=y
+CONFIG_BT_L2CAP_TX_MTU=252
+CONFIG_BT_BUF_ACL_RX_SIZE=256
+CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
+
+CONFIG_MICROPY_HEAP_SIZE=98304
+CONFIG_MAIN_STACK_SIZE=8192
+
+# Enable drivers for peripherals
+CONFIG_GPIO=y
+CONFIG_I2C=y
+CONFIG_SPI=y
+CONFIG_PWM=y
+CONFIG_ADC=y
+
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+
+CONFIG_DISK_ACCESS=n
+
+CONFIG_MICROPY_FROZEN_MODULES=y
+CONFIG_MICROPY_FROZEN_MANIFEST="boards/xiao_ble_nrf52840_sense/manifest.py"
+CONFIG_MICROPY_CONFIGFILE="boards/xiao_ble_nrf52840_sense/mpconfigport.h"
+
+# CONFIG_DYNAMIC_THREAD=y
+CONFIG_THREAD_CUSTOM_DATA=y
+CONFIG_THREAD_MONITOR=y
+CONFIG_THREAD_STACK_INFO=y
+
+CONFIG_LOG=n
+CONFIG_FP16=n
+CONFIG_BOOT_BANNER=n
\ No newline at end of file
diff --git a/ports/zephyr/boards/xiao_ble_nrf52840_sense.overlay b/ports/zephyr/boards/xiao_ble_nrf52840_sense.overlay
new file mode 100644
index 0000000000000..727992e4c77b2
--- /dev/null
+++ b/ports/zephyr/boards/xiao_ble_nrf52840_sense.overlay
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025 NED KONZ <NED@METAMAGIX.TECH>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Replace default on-chip flash with external flash
+/delete-node/ &storage_partition;
+
+// 16Mib (2MiB) flash, mount as /flash
+&p25q16h {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		storage_partition: partition@0 {
+			label = "storage";
+			reg = <0x00000000 0x200000>;
+		};
+	};
+};
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1>, <&adc 4>, <&adc 5>, <&adc 7>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1_6";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN0>; /* P0.02 */
+		zephyr,resolution = <12>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1_6";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>; /* P0.03 */
+		zephyr,resolution = <12>;
+	};
+
+	channel@4 {
+		reg = <4>;
+		zephyr,gain = "ADC_GAIN_1_6";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>; /* P0.28 */
+		zephyr,resolution = <12>;
+	};
+
+	channel@5 {
+		reg = <5>;
+		zephyr,gain = "ADC_GAIN_1_6";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN5>; /* P0.29 */
+		zephyr,resolution = <12>;
+	};
+
+	// AIN7: battery reading
+	channel@7 {
+		reg = <7>;
+		zephyr,gain = "ADC_GAIN_1_6";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN7>; /* P0.31 */
+		zephyr,resolution = <12>;
+	};
+};
\ No newline at end of file
diff --git a/ports/zephyr/boards/xiao_ble_nrf52840_sense/manifest.py b/ports/zephyr/boards/xiao_ble_nrf52840_sense/manifest.py
new file mode 100644
index 0000000000000..2a84f61664444
--- /dev/null
+++ b/ports/zephyr/boards/xiao_ble_nrf52840_sense/manifest.py
@@ -0,0 +1,7 @@
+include("$(MPY_DIR)/extmod/asyncio")
+
+freeze("$(PORT_DIR)/modules")
+
+require("upysh")
+require("aioble")
+require("aiorepl")
diff --git a/ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h b/ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h
new file mode 100644
index 0000000000000..03ec9206fc014
--- /dev/null
+++ b/ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+#include "../mpconfigport.h"

From 2082a4d18967d23bbc77efebde20c5851422e21f Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@metamagix.tech>
Date: Sun, 5 Oct 2025 10:45:41 -0700
Subject: [PATCH 2993/3129] zephyr/boards: Add NXP MIMXRT1020 EVK board.

This board has plenty of RAM, flash, and peripherals, including Ethernet.
It also has a microSD slot, which also works.

Access to the REPL is via UART1, which is available via the DAPLink
connector J23.

Signed-off-by: Ned Konz <ned@metamagix.tech>
---
 ports/zephyr/boards/mimxrt1020_evk.conf       | 21 +++++++++++++++++++
 ports/zephyr/boards/mimxrt1020_evk.overlay    |  9 ++++++++
 .../zephyr/boards/mimxrt1020_evk/manifest.py  |  6 ++++++
 .../boards/mimxrt1020_evk/mpconfigport.h      |  3 +++
 4 files changed, 39 insertions(+)
 create mode 100644 ports/zephyr/boards/mimxrt1020_evk.conf
 create mode 100644 ports/zephyr/boards/mimxrt1020_evk.overlay
 create mode 100644 ports/zephyr/boards/mimxrt1020_evk/manifest.py
 create mode 100644 ports/zephyr/boards/mimxrt1020_evk/mpconfigport.h

diff --git a/ports/zephyr/boards/mimxrt1020_evk.conf b/ports/zephyr/boards/mimxrt1020_evk.conf
new file mode 100644
index 0000000000000..b782520514d07
--- /dev/null
+++ b/ports/zephyr/boards/mimxrt1020_evk.conf
@@ -0,0 +1,21 @@
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython"
+CONFIG_USB_MASS_STORAGE=y
+CONFIG_MASS_STORAGE_DISK_NAME="SDMMC"
+
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+
+CONFIG_MICROPY_FROZEN_MODULES=y
+CONFIG_MICROPY_FROZEN_MANIFEST="boards/mimxrt1020_evk/manifest.py"
+CONFIG_MICROPY_CONFIGFILE="boards/mimxrt1020_evk/mpconfigport.h"
+
+# CONFIG_DYNAMIC_THREAD=y
+CONFIG_THREAD_CUSTOM_DATA=y
+CONFIG_THREAD_MONITOR=y
+CONFIG_THREAD_STACK_INFO=y
+
+CONFIG_LOG=n
+CONFIG_FP16=n
+CONFIG_BOOT_BANNER=n
diff --git a/ports/zephyr/boards/mimxrt1020_evk.overlay b/ports/zephyr/boards/mimxrt1020_evk.overlay
new file mode 100644
index 0000000000000..83358de954638
--- /dev/null
+++ b/ports/zephyr/boards/mimxrt1020_evk.overlay
@@ -0,0 +1,9 @@
+/ {
+	aliases {
+		watchdog0 = &wdog0;
+	};
+};
+
+&wdog0 {
+	status = "okay";
+};
diff --git a/ports/zephyr/boards/mimxrt1020_evk/manifest.py b/ports/zephyr/boards/mimxrt1020_evk/manifest.py
new file mode 100644
index 0000000000000..7d98d906e10d7
--- /dev/null
+++ b/ports/zephyr/boards/mimxrt1020_evk/manifest.py
@@ -0,0 +1,6 @@
+include("$(MPY_DIR)/extmod/asyncio")
+
+freeze("$(PORT_DIR)/modules")
+
+require("upysh")
+require("aiorepl")
diff --git a/ports/zephyr/boards/mimxrt1020_evk/mpconfigport.h b/ports/zephyr/boards/mimxrt1020_evk/mpconfigport.h
new file mode 100644
index 0000000000000..6c62ad5497e25
--- /dev/null
+++ b/ports/zephyr/boards/mimxrt1020_evk/mpconfigport.h
@@ -0,0 +1,3 @@
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+#include "../mpconfigport.h"

From 0e1d857f807395683d6eb37caf0faea6d94594dd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Oct 2025 12:59:11 +1000
Subject: [PATCH 2994/3129] README: Define and describe the port Tier levels.

MicroPython has quite a few ports now (20 of them), but not all are in the
same stage of development.  This commit attempts to define port Tier levels
and assign a Tier to each of the existing ports.

The main aim here is to set expectations for the level of support and
development each port gets.  And also lower the bar of entry for new ports
so they can enter at a low Tier and gradually rise up to Tier 1.

See prior art here:
- https://peps.python.org/pep-0011/
- https://doc.rust-lang.org/rustc/target-tier-policy.html
- https://docs.zephyrproject.org/latest/project/release_process.html#hardware-support-tiers

Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 README.md                      | 90 +++++++++++++++++++++++++---------
 docs/develop/index.rst         |  1 +
 docs/develop/support_tiers.rst | 68 +++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 22 deletions(-)
 create mode 100644 docs/develop/support_tiers.rst

diff --git a/README.md b/README.md
index 9025da64444c0..375ff17d92481 100644
--- a/README.md
+++ b/README.md
@@ -98,28 +98,74 @@ 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, ESP32C6).
- - [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](ports/qemu) -- 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)
- - [webassembly](ports/webassembly) -- Emscripten port targeting browsers and NodeJS.
- - [zephyr](ports/zephyr) -- Zephyr RTOS.
+Over twenty different MicroPython ports are provided in this repository,
+split across three
+[MicroPython Support Tiers](https://docs.micropython.org/en/latest/develop/support_tiers.html).
+
+Tier 1 Ports
+============
+
+👑 Ports in [Tier 1](https://docs.micropython.org/en/latest/develop/support_tiers.html)
+are mature and have the most active development, support and testing:
+
+| Port                     | Target                                                                                 | Quick Reference                                                      |
+|--------------------------|----------------------------------------------------------------------------------------|----------------------------------------------------------------------|
+| [esp32](ports/esp32)*    | Espressif ESP32 SoCs (ESP32, ESP32S2, ESP32S3, ESP32C3, ESP32C6)                       | [here](https://docs.micropython.org/en/latest/esp32/quickref.html)   |
+| [mimxrt](ports/mimxrt)   | NXP m.iMX RT                                                                           | [here](https://docs.micropython.org/en/latest/mimxrt/quickref.html)  |
+| [rp2](ports/rp2)         | Raspberry Pi RP2040 and RP2350                                                         | [here](https://docs.micropython.org/en/latest/rp2/quickref.html)     |
+| [samd](ports/samd)       | Microchip (formerly Atmel) SAMD21 and SAMD51                                           | [here](https://docs.micropython.org/en/latest/samd/quickref.html)    |
+| [stm32](ports/stm32)     | STMicroelectronics STM32 MCUs (F0, F4, F7, G0, G4, H5, H7, L0, L1, L4, N6, WB, WL)     | [here](https://docs.micropython.org/en/latest/pyboard/quickref.html) |
+| [unix](ports/unix)       | Linux, BSD, macOS, WSL                                                                 | [here](https://docs.micropython.org/en/latest/unix/quickref.html)    |
+| [windows](ports/windows) | Microsoft Windows                                                                      | [here](https://docs.micropython.org/en/latest/unix/quickref.html)    |
+
+An asterisk indicates that the port has ongoing financial support from the vendor.
+
+Tier 2 Ports
+============
+
+✔ Ports in [Tier 2](https://docs.micropython.org/en/latest/develop/support_tiers.html)
+are less mature and less actively developed and tested than Tier 1, but
+still fully supported:
+
+| Port                             | Target                                                      | Quick Reference                                                         |
+|----------------------------------|-------------------------------------------------------------|-------------------------------------------------------------------------|
+| [alif](ports/alif)               | Alif Semiconductor Ensemble MCUs (E3, E7)                   |                                                                         |
+| [embed](ports/embed)             | Generates a set of .c/.h files for embedding into a project |                                                                         |
+| [nrf](ports/nrf)                 | Nordic Semiconductor nRF51 and nRF52                        |                                                                         |
+| [renesas-ra](ports/renesas-ra)   | Renesas RA family                                           | [here](https://docs.micropython.org/en/latest/renesas-ra/quickref.html) |
+| [webassembly](ports/webassembly) | Emscripten port targeting browsers and NodeJS               |                                                                         |
+| [zephyr](ports/zephyr)           | Zephyr RTOS                                                 | [here](https://docs.micropython.org/en/latest/zephyr/quickref.html)     |
+
+Tier 3 Ports
+============
+
+Ports in [Tier 3](https://docs.micropython.org/en/latest/develop/support_tiers.html)
+are built in CI but not regularly tested by the MicroPython maintainers:
+
+| Port                       | Target                                                            | Quick Reference                                                         |
+|----------------------------|-------------------------------------------------------------------|-------------------------------------------------------------------------|
+| [cc3200](ports/cc3200)     | Texas Instruments CC3200                                          | [For WiPy](https://docs.micropython.org/en/latest/wipy/quickref.html)   |
+| [esp8266](ports/esp8266)   | Espressif ESP8266 SoC                                             | [here](https://docs.micropython.org/en/latest/esp8266/quickref.html)    |
+| [pic16bit](ports/pic16bit) | Microchip PIC 16-bit                                              |                                                                         |
+| [powerpc](ports/powerpc)   | IBM PowerPC (including Microwatt)                                 |                                                                         |
+
+Additional Ports
+================
+
+In addition to the above there is a Tier M containing ports that are used
+primarily for maintenance, development and testing:
+
+- The ["bare-arm"](ports/bare-arm) port is an example of the absolute minimum
+  configuration that still includes the compiler, and is used to keep track
+  of the code size of the core runtime and VM.
+
+- 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.
+
+- The [qemu](ports/qemu) port is a QEMU-based emulated target for Cortex-A,
+  Cortex-M, RISC-V 32-bit and RISC-V 64-bit architectures.
 
 The MicroPython cross-compiler, mpy-cross
 -----------------------------------------
diff --git a/docs/develop/index.rst b/docs/develop/index.rst
index 327038f1978bd..1026b43d0c3f2 100644
--- a/docs/develop/index.rst
+++ b/docs/develop/index.rst
@@ -24,3 +24,4 @@ MicroPython to a new platform and implementing a core MicroPython library.
    publiccapi.rst
    extendingmicropython.rst
    porting.rst
+   support_tiers.rst
diff --git a/docs/develop/support_tiers.rst b/docs/develop/support_tiers.rst
new file mode 100644
index 0000000000000..f49ee4124f834
--- /dev/null
+++ b/docs/develop/support_tiers.rst
@@ -0,0 +1,68 @@
+MicroPython Support Tiers
+=========================
+
+MicroPython operates with a set of Support Tier levels for the various ports.
+Tiers 1, 2 and 3 are the main Tier levels with Tier 1 being the most mature and
+actively maintained.  There is also Tier M for additional ports used primarily
+for maintenance, development and testing. These Tier levels are defined in the
+table below.
+
+.. table::
+  :widths: 40 9 9 9 9
+
+  +-----------------------------------------------+--------+--------+--------+--------+
+  |                                               | Tier 1 | Tier 2 | Tier 3 | Tier M |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | builds pass under CI                          | ✔      | ✔      | ✔      | ✔      |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | tests run under CI (where possible)           | ✔      | ✔      | ✔      | ✔      |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | actively maintained                           | ✔      | ✔      |        | ✔      |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | stable Python API                             | ✔      | ✔      |        |        |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | new features actively developed               | ✔      | ✔      |        |        |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | tested on hardware for releases               | ✔      | ✔      |        |        |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | prioritized bug reports                       | ✔      |        |        | ✔      |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | regressions warrant a patch release           | ✔      |        |        | ✔      |
+  +-----------------------------------------------+--------+--------+--------+--------+
+  | has port-specific documentation               | ✔      |        |        |        |
+  +-----------------------------------------------+--------+--------+--------+--------+
+
+Lower Tiers may tick more boxes, but the above table defines the minimum requirements
+for a port to belong to a Tier.
+
+Tier 1 ports:
+
+  - esp32
+  - mimxrt
+  - rp2
+  - samd
+  - stm32
+  - unix
+  - windows
+
+Tier 2 ports:
+
+  - alif
+  - embed
+  - nrf
+  - renesas-ra
+  - webassembly
+  - zephyr
+
+Tier 3 ports:
+
+  - cc3200
+  - esp8266
+  - pic16bit
+  - powerpc
+
+Tier M ports:
+
+  - bare-arm
+  - minimal
+  - qemu

From eac81de4e0a462dd8121f93b42271774ced3c85f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sat, 11 Oct 2025 19:27:08 -0500
Subject: [PATCH 2995/3129] tools/ci.sh: Cross build 64-bit windows on Linux.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index b81794a6ccb78..0fb926359167f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -940,6 +940,7 @@ 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-
+    make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=x86_64-w64-mingw32- BUILD=build-standard-w64
 }
 
 ########################################################################################

From 007f127a61ea058ca010b85883072bdefe0234c0 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sat, 11 Oct 2025 19:12:55 -0500
Subject: [PATCH 2996/3129] all: Simplify mp_int_t/mp_uint_t definition.

Assuming proper C99 language support, we can select "the int type as big as
a pointer" (most of the time) or "the 64-bit int type" (nanboxing with
REPR_D), and then define everything else automatically.

This simplifies port configuration files.  And the types can still be
overridden if needed.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 docs/develop/porting.rst                      |   2 -
 mpy-cross/mpconfigport.h                      |  17 ---
 ports/alif/boards/OPENMV_AE3/mpconfigboard.h  |   3 -
 ports/alif/mpconfigport.h                     |   5 -
 ports/bare-arm/mpconfigport.h                 |   2 -
 ports/cc3200/mpconfigport.h                   |   2 -
 ports/embed/port/mpconfigport_common.h        |   2 -
 ports/esp32/mpconfigport.h                    |   2 -
 ports/esp32/mphalport.c                       |   8 +-
 ports/esp32/mphalport.h                       |   8 +-
 ports/esp8266/esp_mphal.c                     |   2 +-
 ports/esp8266/esp_mphal.h                     |   8 +-
 ports/esp8266/mpconfigport.h                  |   2 -
 ports/mimxrt/mpconfigport.h                   |   2 -
 ports/minimal/mpconfigport.h                  |   2 -
 ports/nrf/mpconfigport.h                      |   2 -
 ports/pic16bit/mpconfigport.h                 |   3 -
 ports/powerpc/mpconfigport.h                  |   3 -
 ports/qemu/mpconfigport.h                     |   4 -
 ports/renesas-ra/mpconfigport.h               |   6 -
 ports/rp2/mpconfigport.h                      |   2 -
 ports/samd/mpconfigport.h                     |   2 -
 .../stm32/boards/ARDUINO_GIGA/mpconfigboard.h |   2 -
 .../ARDUINO_NICLA_VISION/mpconfigboard.h      |   2 -
 .../stm32/boards/ARDUINO_OPTA/mpconfigboard.h |   2 -
 .../ARDUINO_PORTENTA_H7/mpconfigboard.h       |   2 -
 ports/stm32/boards/OPENMV_N6/mpconfigboard.h  |   2 -
 ports/stm32/mpconfigport.h                    |   6 -
 ports/stm32/mpconfigport_nanbox.h             |   8 --
 ports/unix/mpconfigport.h                     |  15 ---
 .../unix/variants/longlong/mpconfigvariant.h  |   2 -
 ports/unix/variants/nanbox/mpconfigvariant.h  |   9 --
 ports/webassembly/mpconfigport.h              |   6 -
 ports/windows/mpconfigport.h                  |  16 +--
 ports/zephyr/mpconfigport.h                   |   2 -
 ports/zephyr/mpconfigport_minimal.h           |   2 -
 py/misc.h                                     |  18 +--
 py/mpconfig.h                                 | 103 ++++++++++++++----
 py/mpprint.c                                  |   4 +-
 py/runtime_utils.c                            |   4 -
 40 files changed, 106 insertions(+), 188 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index c0cf130e09d67..5dff843a3a983 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -161,8 +161,6 @@ The following is an example of an ``mpconfigport.h`` file:
 
    // 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().
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 0a6478b4f3d24..febd18cc2b059 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -98,23 +98,6 @@
 
 // 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
-#elif defined(__MINGW32__) && defined(_WIN64)
-#include <stdint.h>
-typedef __int64 mp_int_t;
-typedef unsigned __int64 mp_uint_t;
-#elif defined(_MSC_VER) && defined(_WIN64)
-typedef __int64 mp_int_t;
-typedef unsigned __int64 mp_uint_t;
-#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;
diff --git a/ports/alif/boards/OPENMV_AE3/mpconfigboard.h b/ports/alif/boards/OPENMV_AE3/mpconfigboard.h
index cbdbd063ed3df..0495bc81c8a62 100644
--- a/ports/alif/boards/OPENMV_AE3/mpconfigboard.h
+++ b/ports/alif/boards/OPENMV_AE3/mpconfigboard.h
@@ -2,9 +2,6 @@
 #define MICROPY_HW_MCU_NAME         "AE302F80F55D5AE"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
-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;
 
 #define MICROPY_HW_USB_MSC          (CORE_M55_HP)
 #define MICROPY_HW_ENABLE_HW_I2C    (1)
diff --git a/ports/alif/mpconfigport.h b/ports/alif/mpconfigport.h
index 7bd33565e270e..34214a3f7dfd0 100644
--- a/ports/alif/mpconfigport.h
+++ b/ports/alif/mpconfigport.h
@@ -191,12 +191,7 @@
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-// Assume that if we already defined the obj repr then we also defined these items
-#ifndef MICROPY_OBJ_REPR
-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;
-#endif
 
 // Board configuration settings.
 
diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index f4b87f23eff41..7b0f764abed2a 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -42,8 +42,6 @@
 
 // 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;
 
 // Need to provide a declaration/definition of alloca()
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index ba7e5830ffd2f..38e766121ec24 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -130,8 +130,6 @@
 #define MICROPY_MAKE_POINTER_CALLABLE(p)            ((void *)((mp_uint_t)(p) | 1))
 #define MP_SSIZE_MAX                                (0x7FFFFFFF)
 
-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 MICROPY_EVENT_POLL_HOOK                     __WFI();
diff --git a/ports/embed/port/mpconfigport_common.h b/ports/embed/port/mpconfigport_common.h
index aa65640fcd58c..3d4d4276b4416 100644
--- a/ports/embed/port/mpconfigport_common.h
+++ b/ports/embed/port/mpconfigport_common.h
@@ -28,8 +28,6 @@
 
 // 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()
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 4614abc3c8ddf..09d75cd1a6d8a 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -337,8 +337,6 @@ void *esp_native_code_commit(void *, size_t, void *);
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f
 #define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
 
-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;
 // ssize_t, off_t as required by POSIX-signatured functions in stream.h
 #include <sys/types.h>
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 1cd99f4ae287b..5197ccc0421fc 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -184,15 +184,15 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     return did_write ? ret : 0;
 }
 
-uint32_t mp_hal_ticks_ms(void) {
+mp_uint_t mp_hal_ticks_ms(void) {
     return esp_timer_get_time() / 1000;
 }
 
-uint32_t mp_hal_ticks_us(void) {
+mp_uint_t mp_hal_ticks_us(void) {
     return esp_timer_get_time();
 }
 
-void mp_hal_delay_ms(uint32_t ms) {
+void mp_hal_delay_ms(mp_uint_t ms) {
     uint64_t us = (uint64_t)ms * 1000ULL;
     uint64_t dt;
     uint64_t t0 = esp_timer_get_time();
@@ -220,7 +220,7 @@ void mp_hal_delay_ms(uint32_t ms) {
     }
 }
 
-void mp_hal_delay_us(uint32_t us) {
+void mp_hal_delay_us(mp_uint_t us) {
     // these constants are tested for a 240MHz clock
     const uint32_t this_overhead = 5;
     const uint32_t pend_overhead = 150;
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index a919a859a4279..d779b6e66c09e 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -82,18 +82,18 @@ static inline void mp_end_atomic_section(mp_uint_t state) {
 #define MICROPY_BEGIN_ATOMIC_SECTION() mp_begin_atomic_section()
 #define MICROPY_END_ATOMIC_SECTION(state) mp_end_atomic_section(state)
 
-uint32_t mp_hal_ticks_us(void);
-__attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
+mp_uint_t mp_hal_ticks_us(void);
+__attribute__((always_inline)) static inline mp_uint_t mp_hal_ticks_cpu(void) {
     uint32_t ccount;
     #if CONFIG_IDF_TARGET_ARCH_RISCV
     __asm__ __volatile__ ("csrr %0, 0x7E2" : "=r" (ccount)); // Machine Performance Counter Value
     #else
     __asm__ __volatile__ ("rsr %0,ccount" : "=a" (ccount));
     #endif
-    return ccount;
+    return (mp_uint_t)ccount;
 }
 
-void mp_hal_delay_us(uint32_t);
+void mp_hal_delay_us(mp_uint_t);
 #define mp_hal_delay_us_fast(us) esp_rom_delay_us(us)
 void mp_hal_set_interrupt_char(int c);
 uint32_t mp_hal_get_cpu_freq(void);
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 75588f73b72b7..3f03c55800d77 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -50,7 +50,7 @@ void mp_hal_init(void) {
     uart_attached_to_dupterm = 0;
 }
 
-void MP_FASTCODE(mp_hal_delay_us)(uint32_t us) {
+void MP_FASTCODE(mp_hal_delay_us)(mp_uint_t us) {
     uint32_t start = system_get_time();
     while (system_get_time() - start < us) {
         mp_event_handle_nowait();
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index fb2e441c97297..6d2844e37d01a 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -57,17 +57,17 @@ extern int uart_attached_to_dupterm;
 void mp_hal_init(void);
 void mp_hal_rtc_init(void);
 
-__attribute__((always_inline)) static inline uint32_t mp_hal_ticks_us(void) {
+__attribute__((always_inline)) static inline mp_uint_t mp_hal_ticks_us(void) {
     return system_get_time();
 }
 
-__attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
+__attribute__((always_inline)) static inline mp_uint_t mp_hal_ticks_cpu(void) {
     uint32_t ccount;
     __asm__ __volatile__ ("rsr %0,ccount" : "=a" (ccount));
-    return ccount;
+    return (mp_uint_t)ccount;
 }
 
-void mp_hal_delay_us(uint32_t);
+void mp_hal_delay_us(mp_uint_t);
 void mp_hal_set_interrupt_char(int c);
 uint32_t mp_hal_get_cpu_freq(void);
 
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 17c3ff4417608..f8838ea368818 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -153,8 +153,6 @@
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-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;
 typedef uint32_t sys_prot_t; // for modlwip
 // ssize_t, off_t as required by POSIX-signatured functions in stream.h
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 8ad789d933229..0a623a6318700 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -231,8 +231,6 @@ extern const struct _mp_obj_type_t network_lan_type;
     ((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.
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index b542c124d43c7..a069f57be4c54 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -29,8 +29,6 @@
 
 // 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()
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 4ad0a2d3d0385..cce3f86cfd244 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -337,8 +337,6 @@ void *nrf_native_code_commit(void *, unsigned int, void *);
 
 #define HEX2_FMT "%02x"
 
-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
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index e95f25aa0b689..c7c7eec9d206c 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -77,9 +77,6 @@
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
 
-typedef int mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-
 typedef int mp_off_t;
 
 // extra builtin names to add to the global namespace
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 04bf4f37445f2..bc46c8db55ccc 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -92,9 +92,6 @@
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
-// This port is 64-bit
-typedef signed long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
 // extra built in names to add to the global namespace
diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 65c83a5fea5eb..3f3688569b956 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -70,12 +70,8 @@
 
 #if defined(__riscv) && (__riscv_xlen == 64)
 #define MP_SSIZE_MAX (0x7fffffffffffffff)
-typedef int64_t mp_int_t; // must be pointer size
-typedef uint64_t mp_uint_t; // must be pointer size
 #else
 #define MP_SSIZE_MAX (0x7fffffff)
-typedef int32_t mp_int_t; // must be pointer size
-typedef uint32_t mp_uint_t; // must be pointer size
 #endif
 
 typedef long mp_off_t;
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 946f71e7c1716..d6194494f6e99 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -234,12 +234,6 @@
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-// Assume that if we already defined the obj repr then we also defined these items
-#ifndef MICROPY_OBJ_REPR
-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;
 
 #if MICROPY_PY_THREAD
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index e6e8aa076fa08..6ce90e4f1f473 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -279,8 +279,6 @@
 #endif
 
 #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()
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index a5524c631d5b4..32009ae82f298 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -175,8 +175,6 @@
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
 #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.
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index 17d338fdc3340..71097406b430b 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-giga-r1-wifi"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
-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)
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 1be6189548bec..e15d07dcb3c84 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-nicla-vision"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
-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)
diff --git a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
index fc563b2800e25..851b9f9d2f815 100644
--- a/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_OPTA/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-opta"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
-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)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index d8818f257cfdd..1c1a804c5ec75 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-portenta-h7"
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
-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)
diff --git a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
index f1ece03fe0263..6e6bb43572f58 100644
--- a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
+++ b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
@@ -5,8 +5,6 @@
 #define MICROPY_ALLOC_GC_STACK_SIZE (128)
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
-typedef int mp_int_t;               // must be pointer size
-typedef unsigned int mp_uint_t;     // must be pointer size
 
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_HAS_SWITCH       (0)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index fac261f7e2480..0ca4e35e849bc 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -229,12 +229,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-// Assume that if we already defined the obj repr then we also defined these items
-#ifndef MICROPY_OBJ_REPR
-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;
 
 #if MICROPY_PY_THREAD
diff --git a/ports/stm32/mpconfigport_nanbox.h b/ports/stm32/mpconfigport_nanbox.h
index 7e9306aab8c10..5c5b3bc1a75c1 100644
--- a/ports/stm32/mpconfigport_nanbox.h
+++ b/ports/stm32/mpconfigport_nanbox.h
@@ -33,13 +33,5 @@
 #define MICROPY_EMIT_THUMB (0)
 #define MICROPY_EMIT_INLINE_THUMB (0)
 
-// Types needed for nan-boxing
-#define UINT_FMT "%llu"
-#define INT_FMT "%lld"
-#define HEX_FMT "%llx"
-#define SIZE_FMT "%lu"
-typedef int64_t mp_int_t;
-typedef uint64_t mp_uint_t;
-
 // Include base configuration file for rest of configuration
 #include <mpconfigport.h>
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 68943fb894358..f074398635198 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -73,21 +73,6 @@
     #define MICROPY_EMIT_ARM        (1)
 #endif
 
-// 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
-#else
-// Assume that if we already defined the obj repr then we also defined types.
-#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;
diff --git a/ports/unix/variants/longlong/mpconfigvariant.h b/ports/unix/variants/longlong/mpconfigvariant.h
index a04ff7a6ddaff..d50d360b1fe5c 100644
--- a/ports/unix/variants/longlong/mpconfigvariant.h
+++ b/ports/unix/variants/longlong/mpconfigvariant.h
@@ -36,8 +36,6 @@
 
 #define MICROPY_OBJ_REPR               (MICROPY_OBJ_REPR_C)
 #define MICROPY_FLOAT_IMPL             (MICROPY_FLOAT_IMPL_FLOAT)
-typedef int mp_int_t;
-typedef unsigned int mp_uint_t;
 
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
diff --git a/ports/unix/variants/nanbox/mpconfigvariant.h b/ports/unix/variants/nanbox/mpconfigvariant.h
index 39969814ae448..c9e9c1f63d95d 100644
--- a/ports/unix/variants/nanbox/mpconfigvariant.h
+++ b/ports/unix/variants/nanbox/mpconfigvariant.h
@@ -41,12 +41,3 @@
 #define MICROPY_EMIT_X64 (0)
 #define MICROPY_EMIT_THUMB (0)
 #define MICROPY_EMIT_ARM (0)
-
-#include <stdint.h>
-
-typedef int64_t mp_int_t;
-typedef uint64_t mp_uint_t;
-#define UINT_FMT "%llu"
-#define INT_FMT "%lld"
-#define HEX_FMT "%llx"
-#define SIZE_FMT "%lu"
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index b13da2991e63e..11b23a3ba4585 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -102,12 +102,6 @@
 
 #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
-// or as long. This requires different printf formatting specifiers
-// to print such value. So, we avoid int32_t and use int directly.
-typedef int mp_int_t; // must be pointer size
-typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
 #define MICROPY_HW_BOARD_NAME "JS"
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 4e140d5edb7d0..68744ba93e797 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -185,22 +185,8 @@ extern const struct _mp_print_t mp_stderr_print;
 
 // type definitions for the specific machine
 
-#if defined(__MINGW32__) && defined(__LP64__)
-typedef long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
-#elif defined(__MINGW32__) && defined(_WIN64)
-#include <stdint.h>
-typedef __int64 mp_int_t;
-typedef unsigned __int64 mp_uint_t;
+#if defined(__MINGW32__) && defined(_WIN64)
 #define MP_SSIZE_MAX __INT64_MAX__
-#elif defined(_MSC_VER) && defined(_WIN64)
-typedef __int64 mp_int_t;
-typedef unsigned __int64 mp_uint_t;
-#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
 
 typedef long suseconds_t;
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 064a75a7e9ec9..8d5d60ed29a3c 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -150,8 +150,6 @@ void mp_hal_signal_event(void);
 #define MICROPY_PY_MACHINE_ADC_READ_UV (1)
 #endif
 
-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_STATE_PORT MP_STATE_VM
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index 6486480afd896..83030804856ca 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -72,8 +72,6 @@
 #define MICROPY_HW_MCU_NAME "unknown-cpu"
 #endif
 
-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_STATE_PORT MP_STATE_VM
diff --git a/py/misc.h b/py/misc.h
index 67248ac2f5b0d..5188b8030db5c 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -456,15 +456,15 @@ static inline uint32_t mp_clz_mpi(mp_int_t x) {
     }
     return zeroes;
     #else
-    MP_STATIC_ASSERT(sizeof(mp_int_t) == sizeof(long long)
-        || sizeof(mp_int_t) == sizeof(long));
-
-    // ugly, but should compile to single intrinsic unless O0 is set
-    if (mp_check(sizeof(mp_int_t) == sizeof(long))) {
-        return mp_clzl((unsigned long)x);
-    } else {
-        return mp_clzll((unsigned long long)x);
-    }
+    #if MP_INT_MAX == INT_MAX
+    return mp_clz((unsigned)x);
+    #elif MP_INT_MAX == LONG_MAX
+    return mp_clzl((unsigned long)x);
+    #elif MP_INT_MAX == LLONG_MAX
+    return mp_clzll((unsigned long long)x);
+    #else
+    #error Unexpected MP_INT_MAX value
+    #endif
     #endif
 }
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 6da872c56cd72..6ad27c51fabbf 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -26,6 +26,15 @@
 #ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
 #define MICROPY_INCLUDED_PY_MPCONFIG_H
 
+#include <stdint.h>
+
+#if defined(__cplusplus) // Required on at least one compiler to get ULLONG_MAX
+#include <climits>
+#else
+#include <limits.h>
+#endif
+
+
 // Current version of MicroPython. This is used by sys.implementation.version
 // as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
 // are unavailable.
@@ -161,6 +170,78 @@
 #define MICROPY_OBJ_IMMEDIATE_OBJS (MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_D)
 #endif
 
+// Definition of the `mp_int_t` and `mp_uint_t` types and associated macros.
+// Normally, it suffices for the platform to do nothing: A type as wide
+// as a pointer is chosen, unless nanboxing (REPR_D) is selected, in
+// which case a 64-bit type is chosen to match the assumed size of
+// double-precision floats.
+//
+// In the case of exceptions, the port, board, or variant must define
+// MP_INT_TYPE as MP_INT_TYPE_OTHER and provide all the typedefs and
+// defines.
+#define MP_INT_TYPE_INTPTR (0)
+#define MP_INT_TYPE_INT64 (1)
+#define MP_INT_TYPE_OTHER (2)
+
+#if !defined(MP_INT_TYPE)
+#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
+#define MP_INT_TYPE (MP_INT_TYPE_INT64)
+#else
+#define MP_INT_TYPE (MP_INT_TYPE_INTPTR)
+#endif
+#endif
+
+#if MP_INT_TYPE == MP_INT_TYPE_INTPTR
+typedef intptr_t mp_int_t;
+typedef uintptr_t mp_uint_t;
+#define MP_INT_MAX INTPTR_MAX
+#define MP_INT_MIN INTPTR_MIN
+#define MP_UINT_MAX INTPTR_UMAX
+#elif MP_INT_TYPE == MP_INT_TYPE_INT64
+typedef int64_t mp_int_t;
+typedef uint64_t mp_uint_t;
+#define MP_INT_MAX INT64_MAX
+#define MP_INT_MIN INT64_MIN
+#define MP_UINT_MAX INT64_UMAX
+#endif
+
+// mp_printf format support for mp_int_t. In the unusual case that MP_INT_MAX doesn't
+// match any of the standard C types (int/long/long long), provide all 3
+// macros. Otherwise, rely on these automatic definitions.
+#if !defined(INT_FMT)
+#if MP_INT_MAX == INT_MAX
+#define INT_FMT "%d"
+#define UINT_FMT "%u"
+#define HEX_FMT "%x"
+#elif MP_INT_MAX == LONG_MAX
+#define INT_FMT "%ld"
+#define UINT_FMT "%lu"
+#define HEX_FMT "%lx"
+#elif MP_INT_MAX == LLONG_MAX
+#define INT_FMT "%lld"
+#define UINT_FMT "%llu"
+#define HEX_FMT "%llx"
+#else
+#error Unexpected MP_INT_MAX value
+#endif
+#endif
+
+// mp_printf format support for size_t. In the unusual case that SIZE_MAX doesn't
+// match any of the standard C types (int/long/long long), provide a
+// macro. Otherwise, rely on these automatic definitions.
+#if !defined(SIZE_FMT)
+#if SIZE_MAX == UINT_MAX
+#define SIZE_FMT "%u"
+#elif SIZE_MAX == ULONG_MAX
+#define SIZE_FMT "%lu"
+#elif SIZE_MAX == ULLONG_MAX
+#define SIZE_FMT "%llu"
+#else
+#error Unexpected SIZE_MAX value
+#endif
+#endif
+
+
 /*****************************************************************************/
 /* Memory allocation policy                                                  */
 
@@ -2237,28 +2318,6 @@ typedef time_t mp_timestamp_t;
 #define MP_SSIZE_MAX SSIZE_MAX
 #endif
 
-// printf format spec to use for mp_int_t and friends
-#ifndef INT_FMT
-#if defined(__LP64__)
-// Archs where mp_int_t == long, long != int
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-#define HEX_FMT "%lx"
-#define SIZE_FMT "%lu"
-#elif defined(_WIN64)
-#define UINT_FMT "%llu"
-#define INT_FMT "%lld"
-#define HEX_FMT "%llx"
-#define SIZE_FMT "%llu"
-#else
-// Archs where mp_int_t == int
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-#define HEX_FMT "%x"
-#define SIZE_FMT "%u"
-#endif
-#endif // INT_FMT
-
 // Modifier for function which doesn't return
 #ifndef MP_NORETURN
 #define MP_NORETURN __attribute__((noreturn))
diff --git a/py/mpprint.c b/py/mpprint.c
index 89b3dbd7676ca..fa37a4d07ffcd 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -482,7 +482,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
         }
 
         // parse long and long long specifiers (only where they make a difference)
-        #if defined(MICROPY_UNIX_COVERAGE) || (LONG_MAX > INT_MAX)
+        #if (MP_INT_MAX > INT_MAX && MP_INT_MAX == LONG_MAX) || defined(MICROPY_UNIX_COVERAGE)
         #define SUPPORT_L_FORMAT (1)
         #else
         #define SUPPORT_L_FORMAT (0)
@@ -491,7 +491,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
         bool long_arg = false;
         #endif
 
-        #if (MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D) || defined(_WIN64) || defined(MICROPY_UNIX_COVERAGE)
+        #if (MP_INT_MAX > LONG_MAX) || defined(MICROPY_UNIX_COVERAGE)
         #define SUPPORT_LL_FORMAT (1)
         #else
         #define SUPPORT_LL_FORMAT (0)
diff --git a/py/runtime_utils.c b/py/runtime_utils.c
index 50526b210fa5b..3b0ae279aa724 100644
--- a/py/runtime_utils.c
+++ b/py/runtime_utils.c
@@ -77,10 +77,6 @@ bool mp_mul_ll_overflow(long long int x, long long int y, long long int *res) {
     return overflow;
 }
 
-#define MP_UINT_MAX (~(mp_uint_t)0)
-#define MP_INT_MAX ((mp_int_t)(MP_UINT_MAX >> 1))
-#define MP_INT_MIN (-MP_INT_MAX - 1)
-
 bool mp_mul_mp_int_t_overflow(mp_int_t x, mp_int_t y, mp_int_t *res) {
     // Check for multiply overflow; see CERT INT32-C
     if (x > 0) { // x is positive

From 2af0c52a91769077908e24e18d2d9df87aa2eca8 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Mon, 13 Oct 2025 11:26:54 -0500
Subject: [PATCH 2997/3129] lib/libm_dbl: Allow building when DBL_EPSILON is
 defined in <float.h>.

This is the case in arm-none-eabi-gcc 14.2.1 (debian trixie).

This fixes a diagnostic like:

    ../../lib/libm_dbl/libm.h:92:9: error:
        "DBL_EPSILON" redefined [-Werror]
    /usr/lib/gcc/arm-none-eabi/14.2.1/include/float.h:114:9: note:
        this is the location of the previous definition

when building MPS2_AN500 (qemu port).

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 lib/libm_dbl/libm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/libm_dbl/libm.h b/lib/libm_dbl/libm.h
index cbae6916625e2..fa49ad1cddda5 100644
--- a/lib/libm_dbl/libm.h
+++ b/lib/libm_dbl/libm.h
@@ -89,7 +89,9 @@ do {                                              \
   (d) = __u.f;                                    \
 } while (0)
 
+#if !defined(DBL_EPSILON)
 #define DBL_EPSILON 2.22044604925031308085e-16
+#endif
 
 int __rem_pio2(double, double*);
 int __rem_pio2_large(double*, double*, int, int, int);

From 3bea8970730b4d4746d67081257befbb905308d1 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Thu, 16 Oct 2025 10:02:42 -0500
Subject: [PATCH 2998/3129] tools/metrics.py: Tersely show the commits in the
 size report.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will show a line for both the reference and comparison, e.g.,

    Reference:  zephyr/boards: Add PocketBeagle 2 rev A1… [00a926e99e]
    Comparison: metrics: Tersely show the commi… [merge of c7ac411e22]

When the comparison is a merge commit (as it is during CI) the second
parent of that commit is shown instead.

This will be helpful when checking which revision of the code size report
comment on a PR corresponds to which revision of the code.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh      | 13 +++++++++++--
 tools/metrics.py |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 0fb926359167f..fdaf8b7eedd4d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -80,6 +80,10 @@ function ci_code_size_setup {
     ci_picotool_setup
 }
 
+function _ci_is_git_merge {
+    [[ $(git log -1 --format=%P "$1" | wc -w) > 1 ]]
+}
+
 function ci_code_size_build {
     # check the following ports for the change in their code size
     # Override the list by setting PORTS_TO_CHECK in the environment before invoking ci.
@@ -112,21 +116,26 @@ function ci_code_size_build {
             OUTFILE=$2
             IGNORE_ERRORS=$3
 
-            echo "Building ${COMMIT}..."
             git checkout --detach $COMMIT
             git submodule update --init $SUBMODULES
             git show -s
             tools/metrics.py clean "$PORTS_TO_CHECK"
             # Allow errors from tools/metrics.py to propagate out of the pipe below.
             set -o pipefail
-            tools/metrics.py build "$PORTS_TO_CHECK" | tee $OUTFILE || $IGNORE_ERRORS
+            tools/metrics.py build "$PORTS_TO_CHECK" | tee -a $OUTFILE || $IGNORE_ERRORS
             return $?
         }
 
         # build reference, save to size0
         # ignore any errors with this build, in case master is failing
+        echo "BUILDING $(git log --format='%s [%h]' -1 ${REFERENCE})" > ~/size0
         code_size_build_step $REFERENCE ~/size0 true
         # build PR/branch, save to size1
+        if _ci_is_git_merge "$COMPARISON"; then
+            echo "BUILDING $(git log --oneline -1 --format='%s [merge of %h]' ${COMPARISON}^2)"
+        else
+            echo "BUILDING $(git log --oneline -1 --formta='%s [%h]' ${COMPARISON})"
+        fi > ~/size1
         code_size_build_step $COMPARISON ~/size1 false
     )
 }
diff --git a/tools/metrics.py b/tools/metrics.py
index d552857c4b359..8bb96ba119a23 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -127,6 +127,8 @@ def read_build_log(filename):
     with open(filename) as f:
         for line in f:
             line = line.strip()
+            if line.startswith("BUILDING ") and "_ref" not in data:
+                data["_ref"] = line.removeprefix("BUILDING ")
             if line.strip() == "COMPUTING SIZES":
                 found_sizes = True
             elif found_sizes:
@@ -158,6 +160,10 @@ def do_diff(args):
     data1 = read_build_log(args[0])
     data2 = read_build_log(args[1])
 
+    ref1 = data1.pop("_ref", "(unknown ref)")
+    ref2 = data2.pop("_ref", "(unknown ref)")
+    print(f"Reference:  {ref1}")
+    print(f"Comparison: {ref2}")
     max_delta = None
     for key, value1 in data1.items():
         value2 = data2[key]

From 6f4fd6aed9df777a53e765ca926a7a6e58d79b01 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 19 Oct 2025 15:15:24 -0500
Subject: [PATCH 2999/3129] tools/ci.sh: Use a better default reference ref in
 code_size_build.

Now the default reference commit is the first parent of the selected
commit, instead of the first parent of HEAD.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index fdaf8b7eedd4d..5d401843be386 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -98,8 +98,8 @@ function ci_code_size_build {
     # the code size impact would be if we merged this PR. During CI we are at a merge commit,
     # so this tests the merged PR against its merge base.
     # Override the refs by setting REFERENCE and/or COMPARISON in the environment before invoking ci.
-    : ${REFERENCE:=$(git rev-parse --short HEAD^1)}
     : ${COMPARISON:=$(git rev-parse --short HEAD)}
+    : ${REFERENCE:=$(git rev-parse --short ${COMPARISON}^1)}
 
     echo "Comparing sizes of reference ${REFERENCE} to ${COMPARISON}..."
     git log --oneline $REFERENCE..$COMPARISON

From be4892097eb88c53ee53a41b9725fc5565d5ff22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 29 Sep 2025 13:20:30 +0200
Subject: [PATCH 3000/3129] tools/autobuild: Use same length Git hash
 abbreviation in file names.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the version string consistent with the one used in code, see
commit 9e89c752cb.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 tools/autobuild/autobuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index c24c4b3a9af4e..9c94d887f045e 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -61,7 +61,7 @@ make -C mpy-cross
 # where SEMVER is vX.Y.Z or vX.Y.Z-preview.N.gHASH or vX.Y.Z-preview.N.gHASH.dirty
 FW_DATE=$(date '+%Y%m%d')
 # same logic as makeversionhdr.py, convert git-describe output into semver-compatible
-FW_GIT_TAG="$(git describe --tags --dirty --always --match 'v[1-9].*')"
+FW_GIT_TAG="$(git describe --tags --dirty --always --match 'v[1-9].*' --abbrev=10)"
 FW_SEMVER_MAJOR_MINOR_PATCH="$(echo $FW_GIT_TAG | cut -d'-' -f1)"
 FW_SEMVER_PRERELEASE="$(echo $FW_GIT_TAG | cut -s -d'-' -f2-)"
 if [ -z "$FW_SEMVER_PRERELEASE" ]; then

From c04d2d691c77ca3a4a623e0af866e58f67914573 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 11 Oct 2025 14:41:13 +0200
Subject: [PATCH 3001/3129] qemu/uart: Implement uart_rx_any function.

So it can be used for polling.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/uart.c | 20 ++++++++++++++++++++
 ports/qemu/uart.h |  1 +
 2 files changed, 21 insertions(+)

diff --git a/ports/qemu/uart.c b/ports/qemu/uart.c
index fb9376d1fb71d..6bf4ba6e2e2c5 100644
--- a/ports/qemu/uart.c
+++ b/ports/qemu/uart.c
@@ -57,6 +57,10 @@ int uart_rx_chr(void) {
     return UART0->DR;
 }
 
+int uart_rx_any(void) {
+    return UART0->SR & UART_SR_RXNE;
+}
+
 void uart_tx_strn(const char *buf, size_t len) {
     for (size_t i = 0; i < len; ++i) {
         UART0->DR = buf[i];
@@ -94,6 +98,10 @@ int uart_rx_chr(void) {
     return UART0->RXD;
 }
 
+int uart_rx_any(void) {
+    return UART0->RXDRDY ? 1 : 0;
+}
+
 void uart_tx_strn(const char *buf, size_t len) {
     for (size_t i = 0; i < len; ++i) {
         UART0->TXD = buf[i];
@@ -130,6 +138,10 @@ int uart_rx_chr(void) {
     return UART0->DATA;
 }
 
+int uart_rx_any(void) {
+    return UART0->STATE & UART_STATE_RXFULL;
+}
+
 void uart_tx_strn(const char *buf, size_t len) {
     for (size_t i = 0; i < len; ++i) {
         while (UART0->STATE & UART_STATE_TXFULL) {
@@ -170,6 +182,10 @@ int uart_rx_chr(void) {
     return UART1->URXD & 0xff;
 }
 
+int uart_rx_any(void) {
+    return !(UART1->UTS1 & UART_UTS1_RXEMPTY);
+}
+
 void uart_tx_strn(const char *buf, size_t len) {
     for (size_t i = 0; i < len; ++i) {
         UART1->UTXD = buf[i];
@@ -200,6 +216,10 @@ int uart_rx_chr(void) {
     return UART_RX_NO_CHAR;
 }
 
+int uart_rx_any(void) {
+    return UART0->LSR & UART_LSR_DR;
+}
+
 void uart_tx_strn(const char *buffer, size_t length) {
     for (size_t index = 0; index < length; index++) {
         while (!(UART0->LSR & UART_LSR_THRE)) {
diff --git a/ports/qemu/uart.h b/ports/qemu/uart.h
index 9c62a295d1d04..5363222f830b5 100644
--- a/ports/qemu/uart.h
+++ b/ports/qemu/uart.h
@@ -33,6 +33,7 @@
 
 void uart_init(void);
 int uart_rx_chr(void);
+int uart_rx_any(void);
 void uart_tx_strn(const char *buf, size_t len);
 
 #endif // MICROPY_INCLUDED_QEMU_ARM_UART_H

From e1f063a1fa622b0317a22e907ddb643d17514f40 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 11 Oct 2025 15:50:37 +0200
Subject: [PATCH 3002/3129] qemu/mcu/arm: Implement a SysTick driver.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/Makefile               |  1 +
 ports/qemu/mcu/arm/errorhandler.c |  2 +-
 ports/qemu/mcu/arm/startup.c      |  3 ++
 ports/qemu/mcu/arm/ticks.c        | 85 +++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 ports/qemu/mcu/arm/ticks.c

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 84711cc45aebd..4325a96f93f44 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -77,6 +77,7 @@ LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 SRC_C += \
 	mcu/arm/errorhandler.c \
 	mcu/arm/startup.c \
+	mcu/arm/ticks.c \
 	shared/runtime/semihosting_arm.c \
 
 endif
diff --git a/ports/qemu/mcu/arm/errorhandler.c b/ports/qemu/mcu/arm/errorhandler.c
index 278bc8d4e5c83..9f79aa5f72e34 100644
--- a/ports/qemu/mcu/arm/errorhandler.c
+++ b/ports/qemu/mcu/arm/errorhandler.c
@@ -191,7 +191,7 @@ __attribute__((naked)) MP_NORETURN void PendSV_Handler(void) {
     exception_handler(PENDING_SV);
 }
 
-__attribute__((naked)) MP_NORETURN void SysTick_Handler(void) {
+__attribute__((naked, weak)) MP_NORETURN void SysTick_Handler(void) {
     exception_handler(SYSTEM_TICK);
 }
 
diff --git a/ports/qemu/mcu/arm/startup.c b/ports/qemu/mcu/arm/startup.c
index 56d246b143216..add045b269a41 100644
--- a/ports/qemu/mcu/arm/startup.c
+++ b/ports/qemu/mcu/arm/startup.c
@@ -118,6 +118,9 @@ const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
 void _start(void) {
     mp_semihosting_init();
 
+    extern void ticks_init(void);
+    ticks_init();
+
     // Enable the UART
     uart_init();
 
diff --git a/ports/qemu/mcu/arm/ticks.c b/ports/qemu/mcu/arm/ticks.c
new file mode 100644
index 0000000000000..7a5d16ed5b75c
--- /dev/null
+++ b/ports/qemu/mcu/arm/ticks.c
@@ -0,0 +1,85 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 <stdint.h>
+
+// CPU frequency
+#ifndef CPU_FREQ_HZ
+#define CPU_FREQ_HZ             25000000u
+#endif
+
+// SysTick registers
+#define SYSTICK_BASE            0xE000E010
+#define SYSTICK_CSR             (*(volatile uint32_t *)(SYSTICK_BASE + 0x00))
+#define SYSTICK_RVR             (*(volatile uint32_t *)(SYSTICK_BASE + 0x04))
+#define SYSTICK_CVR             (*(volatile uint32_t *)(SYSTICK_BASE + 0x08))
+
+// SysTick config bits
+#define SYSTICK_CSR_ENABLE      (1 << 0)
+#define SYSTICK_CSR_TICKINT     (1 << 1)
+#define SYSTICK_CSR_CLKSOURCE   (1 << 2)
+
+static volatile uint32_t _ticks_ms = 0;
+#if defined(__ARM_ARCH_ISA_ARM)
+static volatile uint32_t _ticks_us = 0;
+#endif
+
+void ticks_init(void) {
+    #if !defined(__ARM_ARCH_ISA_ARM)
+    // Configure SysTick: reload at 1ms intervals (Cortex-M)
+    SYSTICK_CVR = 0;
+    SYSTICK_RVR = (CPU_FREQ_HZ / 1000) - 1;
+    SYSTICK_CSR = SYSTICK_CSR_ENABLE | SYSTICK_CSR_TICKINT | SYSTICK_CSR_CLKSOURCE;
+    #endif
+}
+
+uintptr_t ticks_ms(void) {
+    #if defined(__ARM_ARCH_ISA_ARM)
+    return _ticks_us++ / 1000;
+    #else
+    return _ticks_ms;
+    #endif
+}
+
+uintptr_t ticks_us(void) {
+    #if defined(__ARM_ARCH_ISA_ARM)
+    return _ticks_us++;
+    #else
+    // Get current values atomically
+    uint32_t ms = _ticks_ms;
+    uint32_t cvr = SYSTICK_CVR;
+
+    // Calculate microseconds from the down-counter
+    uint32_t elapsed_cycles = SYSTICK_RVR - cvr;
+    uint32_t us_fraction = (elapsed_cycles * 1000) / (CPU_FREQ_HZ / 1000);
+
+    return (ms * 1000) + us_fraction;
+    #endif
+}
+
+void SysTick_Handler(void) {
+    _ticks_ms++;
+}

From abbe883c0719c683fbb8382e204e4b50783fac24 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 18 Oct 2025 14:15:26 +0200
Subject: [PATCH 3003/3129] qemu/mcu/riscv: Implement ticks using the RDTIME
 control register.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/Makefile          |  2 ++
 ports/qemu/mcu/riscv/ticks.c | 68 ++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 ports/qemu/mcu/riscv/ticks.c

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 4325a96f93f44..03f004c7530fe 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -110,6 +110,7 @@ LDFLAGS += -mabi=$(RV32_ABI) -march=$(RV32_ARCH) -Wl,-EL
 SRC_C += \
 	mcu/rv32/interrupts.c \
 	mcu/rv32/startup.c \
+	mcu/riscv/ticks.c \
 
 SRC_BOARD_O += mcu/rv32/entrypoint.o
 
@@ -143,6 +144,7 @@ LDFLAGS += -mabi=$(RV64_ABI) -march=$(RV64_ARCH) -Wl,-EL -mcmodel=medany
 SRC_C += \
 	mcu/rv64/interrupts.c \
 	mcu/rv64/startup.c \
+	mcu/riscv/ticks.c \
 
 SRC_BOARD_O += mcu/rv64/entrypoint.o
 
diff --git a/ports/qemu/mcu/riscv/ticks.c b/ports/qemu/mcu/riscv/ticks.c
new file mode 100644
index 0000000000000..2ab52199451f7
--- /dev/null
+++ b/ports/qemu/mcu/riscv/ticks.c
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 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 <stdint.h>
+
+// RISC-V timebase frequency for QEMU
+#ifndef TIMEBASE_FREQ_HZ
+#define TIMEBASE_FREQ_HZ        10000000u
+#endif
+
+static uint64_t ticks_get_ticks(void) {
+    #if __riscv_xlen < 64
+    uint32_t ticks_lo = 0;
+    uint32_t ticks_hi = 0;
+    uint32_t rollover = 0;
+    do {
+        __asm volatile (
+            "rdtimeh %0 \n"
+            "rdtime  %1 \n"
+            "rdtimeh %2 \n"
+            : "=r" (ticks_hi), "=r" (ticks_lo), "=r" (rollover)
+            :
+            :
+            );
+    } while (ticks_hi != rollover);
+    return ((uint64_t)(ticks_hi) << 32ULL) | (uint64_t)(ticks_lo);
+    #else
+    uint64_t ticks = 0;
+    __asm volatile (
+        "rdtime %0 \n"
+        : "=r" (ticks)
+        :
+        :
+        );
+    return ticks;
+    #endif
+}
+
+uintptr_t ticks_ms(void) {
+    return (uintptr_t)(ticks_get_ticks() / (TIMEBASE_FREQ_HZ / 1000));
+}
+
+uintptr_t ticks_us(void) {
+    return (uintptr_t)(ticks_get_ticks() / (TIMEBASE_FREQ_HZ / 1000000));
+}

From 7ca70edae7a05b3be64e615630e52e1f5a1825df Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 15 Oct 2025 10:00:50 +0200
Subject: [PATCH 3004/3129] qemu/mphalport: Implement stdin poll and mp-hal
 ticks functions.

Using the newly added `uart_rx_any()` and system ticks functions.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/mphalport.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/ports/qemu/mphalport.c b/ports/qemu/mphalport.c
index dbb87b48b801a..bd3d653eed55b 100644
--- a/ports/qemu/mphalport.c
+++ b/ports/qemu/mphalport.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/mphal.h"
+#include "py/stream.h"
 #include "shared/runtime/semihosting_arm.h"
 #include "uart.h"
 
@@ -32,8 +33,15 @@
 #define USE_UART (1)
 #define USE_SEMIHOSTING (0)
 
+uintptr_t ticks_ms(void);
+uintptr_t ticks_us(void);
+
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
-    // Not implemented.
+    #if USE_UART
+    if ((poll_flags & MP_STREAM_POLL_RD) && uart_rx_any()) {
+        return MP_STREAM_POLL_RD;
+    }
+    #endif
     return 0;
 }
 
@@ -64,3 +72,27 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
     #endif
     return len;
 }
+
+mp_uint_t mp_hal_ticks_ms(void) {
+    return ticks_ms();
+}
+
+mp_uint_t mp_hal_ticks_us(void) {
+    return ticks_us();
+}
+
+void mp_hal_delay_ms(mp_uint_t ms) {
+    mp_uint_t start = mp_hal_ticks_ms();
+    while (mp_hal_ticks_ms() - start < ms) {
+    }
+}
+
+void mp_hal_delay_us(mp_uint_t us) {
+    mp_uint_t start = mp_hal_ticks_us();
+    while (mp_hal_ticks_us() - start < us) {
+    }
+}
+
+mp_uint_t mp_hal_ticks_cpu(void) {
+    return 0;
+}

From 0cf1a58c3dd02fa3faa0c49f75ac89a2f3ad23da Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 11 Oct 2025 15:51:38 +0200
Subject: [PATCH 3005/3129] qemu/mpconfigport: Enable time, select and stdio
 buffer.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/mpconfigport.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/qemu/mpconfigport.h b/ports/qemu/mpconfigport.h
index 3f3688569b956..dcaf6a5c51e6f 100644
--- a/ports/qemu/mpconfigport.h
+++ b/ports/qemu/mpconfigport.h
@@ -54,9 +54,6 @@
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_WARNINGS            (1)
 #define MICROPY_PY_SYS_PLATFORM     "qemu"
-#define MICROPY_PY_SYS_STDIO_BUFFER (0)
-#define MICROPY_PY_SELECT           (0)
-#define MICROPY_PY_TIME             (0)
 #define MICROPY_PY_ASYNCIO          (0)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/qemu/modmachine.c"

From debac3e3bd89c4022f4c9aa14287d5296338a7d9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Oct 2025 17:33:46 +0200
Subject: [PATCH 3006/3129] qemu/uart: Fix UART0 address for MPS3.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/uart.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/qemu/uart.c b/ports/qemu/uart.c
index 6bf4ba6e2e2c5..35e2944c845c4 100644
--- a/ports/qemu/uart.c
+++ b/ports/qemu/uart.c
@@ -108,7 +108,7 @@ void uart_tx_strn(const char *buf, size_t len) {
     }
 }
 
-#elif defined(QEMU_SOC_MPS2)
+#elif defined(QEMU_SOC_MPS2) || defined(QEMU_SOC_MPS3)
 
 #define UART_STATE_TXFULL (1 << 0)
 #define UART_STATE_RXFULL (1 << 1)
@@ -124,7 +124,11 @@ typedef struct _UART_t {
     volatile uint32_t BAUDDIV;
 } UART_t;
 
+#if defined(QEMU_SOC_MPS3)
+#define UART0 ((UART_t *)(0x49303000))
+#else
 #define UART0 ((UART_t *)(0x40004000))
+#endif
 
 void uart_init(void) {
     UART0->BAUDDIV = 16;

From 557290f49d1398cf350cdc9c6fd6fe86a4384eb1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Oct 2025 17:36:42 +0200
Subject: [PATCH 3007/3129] qemu/mcu/arm: Enable the FPU init for ARMv8-M.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/mcu/arm/startup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/qemu/mcu/arm/startup.c b/ports/qemu/mcu/arm/startup.c
index add045b269a41..5b8ae1958a6de 100644
--- a/ports/qemu/mcu/arm/startup.c
+++ b/ports/qemu/mcu/arm/startup.c
@@ -47,7 +47,7 @@ __attribute__((naked)) void Reset_Handler(void) {
     for (uint32_t *dest = &_sbss; dest < &_ebss;) {
         *dest++ = 0;
     }
-    #if MICROPY_HW_FPU && defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH == 7
+    #if MICROPY_HW_FPU && defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH >= 7
     // initialise the FPU (full access to CP10 and CP11, as per B3.2.20)
     *((volatile uint32_t *)0xE000ED88) |= 0x00F00000;
     __asm volatile ("dsb");

From 28919abb17fb645c9c5e89af44f9df85b8635e86 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Oct 2025 17:37:23 +0200
Subject: [PATCH 3008/3129] qemu/boards: Add new MPS3_AN547 board definition.

This is a Cortex-M55 board.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/qemu/boards/MPS3_AN547/mpconfigboard.mk | 16 ++++++
 ports/qemu/mcu/arm/mps3.ld                    | 49 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 ports/qemu/boards/MPS3_AN547/mpconfigboard.mk
 create mode 100644 ports/qemu/mcu/arm/mps3.ld

diff --git a/ports/qemu/boards/MPS3_AN547/mpconfigboard.mk b/ports/qemu/boards/MPS3_AN547/mpconfigboard.mk
new file mode 100644
index 0000000000000..772853935b71f
--- /dev/null
+++ b/ports/qemu/boards/MPS3_AN547/mpconfigboard.mk
@@ -0,0 +1,16 @@
+QEMU_ARCH = arm
+QEMU_MACHINE = mps3-an547
+
+CFLAGS += -mthumb -mcpu=cortex-m55 -mfloat-abi=hard -mfpu=fpv5-d16
+CFLAGS += -DQEMU_SOC_MPS3
+CFLAGS += -DMICROPY_HW_MCU_NAME='"Cortex-M55"'
+CFLAGS += -DCPU_FREQ_HZ=32000000
+
+LDSCRIPT = mcu/arm/mps3.ld
+
+SRC_BOARD_O = shared/runtime/gchelper_generic.o
+
+MPY_CROSS_FLAGS += -march=armv7emdp
+
+MICROPY_FLOAT_IMPL ?= double
+SUPPORTS_HARDWARE_FP_DOUBLE ?= 1
diff --git a/ports/qemu/mcu/arm/mps3.ld b/ports/qemu/mcu/arm/mps3.ld
new file mode 100644
index 0000000000000..6a576f355f044
--- /dev/null
+++ b/ports/qemu/mcu/arm/mps3.ld
@@ -0,0 +1,49 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Damien P. George
+ */
+
+MEMORY
+{
+    ITCM : ORIGIN = 0x00000000, LENGTH = 512K
+    RAM  : ORIGIN = 0x01000000, LENGTH = 2M
+}
+
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+SECTIONS
+{
+    .isr_vector : {
+        KEEP(*(.isr_vector))
+        . = ALIGN(4);
+    } > ITCM
+
+    .text : {
+        *(.text*)
+        *(.rodata*)
+        . = ALIGN(4);
+        *(.ARM.exidx*)
+        . = 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
+}

From 15401a3ae83c5e5652d30544eeaf189585066f52 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 12 Oct 2025 20:53:46 +0200
Subject: [PATCH 3009/3129] tools/mpremote: Fix exception when using pts.

Setting RTS/DTR raises "Inappropriate ioctl for device" for pts devices.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 tools/mpremote/mpremote/transport_serial.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/mpremote/mpremote/transport_serial.py b/tools/mpremote/mpremote/transport_serial.py
index eccdd4c1ea44b..b3584945bc5f9 100644
--- a/tools/mpremote/mpremote/transport_serial.py
+++ b/tools/mpremote/mpremote/transport_serial.py
@@ -38,7 +38,7 @@
 import ast, io, os, re, struct, sys, time
 import serial
 import serial.tools.list_ports
-from errno import EPERM
+from errno import EPERM, ENOTTY
 from .console import VT_ENABLED
 from .transport import TransportError, TransportExecError, Transport
 
@@ -107,8 +107,15 @@ def __init__(self, device, baudrate=115200, wait=0, exclusive=True, timeout=None
 
     def close(self):
         # ESP Windows quirk: Prevent target from resetting when Windows clears DTR before RTS
-        self.serial.rts = False
-        self.serial.dtr = False
+        try:
+            self.serial.rts = False
+            self.serial.dtr = False
+        except OSError as er:
+            if er.errno == ENOTTY:
+                # Some devices (like QEMU pts) don't support RTS/DTR control
+                pass
+            else:
+                raise er
         self.serial.close()
 
     def read_until(

From d05f32f1eb6ce3a88eb5d6e9330a9feae571f823 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 15 Oct 2025 11:29:03 +0200
Subject: [PATCH 3010/3129] windows/msvc: Make the PP defs for manifest
 freezing global.

This is consistent with the other ports (see py/mkrules.mk) and makes
more sense overall because it makes everything which is compiled use
the same flags; until now all compilation steps which ran before or in
absence of FreezeModules (e.g. qstr generation, compiling a single file
on the command line or in the IDE) would use different PP defs.  This
didn't happen to cause any issues apparently but it's just more
consistent/safer to not do that.

Signed-off-by: stijn <stijn@ignitron.net>
---
 ports/windows/msvc/common.props   | 1 +
 ports/windows/msvc/genhdr.targets | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props
index 55c9c934f22ea..b8d9096d67b76 100644
--- a/ports/windows/msvc/common.props
+++ b/ports/windows/msvc/common.props
@@ -23,6 +23,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(PyIncDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(FrozenManifest)' != ''">MICROPY_MODULE_FROZEN_MPY=1;MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool;MPZ_DIG_SIZE=16;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
       <WarningLevel>Level1</WarningLevel>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 7bd8364a9ed08..57ec707ef91b4 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -168,9 +168,6 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
   <Target Name="FreezeModules" Condition="'$(FrozenManifest)' != ''" DependsOnTargets="MakeQstrData;MakeRootPointers" 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;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)"/>
     <WriteLinesToFile File="$(TLogLocation)frozen.read.1.tlog" Lines="$(FrozenManifest)" Overwrite="True"/>

From 62cf07540cfbf99aade3a2d8e11999db155e5e2e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 15 Oct 2025 09:10:04 +0200
Subject: [PATCH 3011/3129] stm32/boards/OPENMV_N6: Fix float implementation.

32-bit floats are needed for object representation C.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/boards/OPENMV_N6/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/OPENMV_N6/mpconfigboard.mk b/ports/stm32/boards/OPENMV_N6/mpconfigboard.mk
index 0283a486c1ad3..a4afb7a976a9f 100644
--- a/ports/stm32/boards/OPENMV_N6/mpconfigboard.mk
+++ b/ports/stm32/boards/OPENMV_N6/mpconfigboard.mk
@@ -16,7 +16,7 @@ LD_FILES = boards/OPENMV_N6/board.ld boards/common_n6_flash.ld
 TEXT0_ADDR = 0x70080000
 
 # MicroPython settings
-MICROPY_FLOAT_IMPL = double
+MICROPY_FLOAT_IMPL = float
 MICROPY_PY_BLUETOOTH ?= 1
 MICROPY_BLUETOOTH_NIMBLE ?= 1
 MICROPY_BLUETOOTH_BTSTACK ?= 0

From 3808ccd5222a61fe9b5b0ec93220f489c12ee0e2 Mon Sep 17 00:00:00 2001
From: "Kwabena W. Agyeman" <kwagyeman@live.com>
Date: Tue, 21 Oct 2025 22:34:51 -0700
Subject: [PATCH 3012/3129] stm32/boards: Add missing AF options to N6 AF file.

Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
---
 ports/stm32/boards/stm32n657_af.csv | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/stm32n657_af.csv b/ports/stm32/boards/stm32n657_af.csv
index 9bdb196f8810d..220d27b3f88df 100644
--- a/ports/stm32/boards/stm32n657_af.csv
+++ b/ports/stm32/boards/stm32n657_af.csv
@@ -6,13 +6,15 @@ PortA,PA5 ,             ,                   ,                              ,
 PortA,PA8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP5
 PortA,PA9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP10
 PortA,PA10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP11/ADC12_INN10
-PortA,PA11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_RX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP12/ADC12_INN11
-PortA,PA12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART4_TX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP13/ADC12_INN12
+PortA,PA11,             ,                   ,                              ,                                    ,                                                   ,SPI2_NSS                                              ,CAN1_RXFD                                               ,                                                             ,UART4_RX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP12/ADC12_INN11
+PortA,PA12,             ,                   ,                              ,                                    ,                                                   ,SPI2_SCK                                              ,CAN1_TXFD                                               ,                                                             ,UART4_TX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP13/ADC12_INN12
 PortB,PB4 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D3                                              ,                                                            ,                                                ,                       ,        ,
+PortB,PB6 ,             ,                   ,                              ,                                    ,                                                   ,SPI4_MISO                                             ,                                                        ,TIM15_CH1                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortB,PB7 ,             ,                   ,                              ,                                    ,                                                   ,SPI4_MOSI                                             ,                                                        ,TIM15_CH2                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortB,PB8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D0                                              ,                                                            ,                                                ,                       ,        ,
 PortB,PB9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D2                                              ,                                                            ,                                                ,                       ,        ,
-PortB,PB10,             ,TIM2_CH3           ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
-PortB,PB11,             ,TIM2_CH4           ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortB,PB10,             ,TIM2_CH3           ,                              ,I3C2_SCL                            ,I2C2_SCL                                           ,                                                      ,                                                        ,USART3_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortB,PB11,             ,TIM2_CH4           ,                              ,I3C2_SDA                            ,I2C2_SDA                                           ,                                                      ,                                                        ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortC,PC8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D0                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortC,PC9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D1                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortC,PC10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D2                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
@@ -21,13 +23,19 @@ PortC,PC12,             ,                   ,                              ,
 PortD,PD2 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_CK                                              ,                                                            ,                                                ,                       ,        ,
 PortD,PD5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortD,PD6 ,             ,                   ,                              ,                                    ,TIM15_CH2                                          ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD7 ,             ,                   ,                              ,                                    ,                                                   ,SPI2_MOSI                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortD,PD8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortD,PD9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD11,             ,                   ,                              ,                                    ,                                                   ,SPI2_MISO                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortD,PD13,             ,                   ,TIM4_CH2                      ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART1_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE6 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART1_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE7 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART7_RX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,UART7_TX                          ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE11,             ,                   ,                              ,                                    ,                                                   ,SPI4_NSS                                              ,CAN3_TXFD                                               ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE12,             ,                   ,                              ,                                    ,                                                   ,SPI4_SCK                                              ,CAN3_RXFD                                               ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE13,             ,                   ,                              ,                                    ,I2C4_SCL                                           ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortE,PE14,             ,                   ,                              ,                                    ,I2C4_SDA                                           ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE15,             ,                   ,                              ,                                    ,                                                   ,SPI5_SCK                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortF,PF3 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC1_INP16
 PortF,PF6 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,

From 842657a0b8bc1e5dd6ca6542e979432742260afa Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 5 Jul 2025 22:31:47 +0900
Subject: [PATCH 3013/3129] stm32/flash: Change Flash sector size for
 STM32H7A3.

STM32H7A3 has 2MB internal flash and each sector size is 8KB.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/flash.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 85bcee5a97c91..f050ca5acd861 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -159,8 +159,13 @@ static const flash_layout_t flash_layout[] = {
 
 #define FLASH_LAYOUT_IS_HOMOGENEOUS (1)
 #define FLASH_LAYOUT_START_ADDR     (FLASH_BASE)
+#if defined(STM32H7A3xx) || defined(STM32H7A3xxQ)
+#define FLASH_LAYOUT_SECTOR_SIZE    (0x2000)
+#define FLASH_LAYOUT_NUM_SECTORS    (256)
+#else
 #define FLASH_LAYOUT_SECTOR_SIZE    (0x20000)
 #define FLASH_LAYOUT_NUM_SECTORS    (16)
+#endif
 
 #else
 #error Unsupported processor

From dbcfec7df87184392737288ee685beb8637f0e52 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 5 Jul 2025 22:32:04 +0900
Subject: [PATCH 3014/3129] stm32/adc: Use macros defined by HAL for H7.

For STM32H7, the following macro's value are different by ADC's version:
* ADC_CAL_ADDRESS
* ADC_CAL1
* TEMPSENSOR_CAL2_ADDR

Using macros defined by HAL become less dependent on ADC's version.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/adc.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index c912d9df3a77d..27f6c5c233e2c 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -107,21 +107,18 @@
 #define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 4))
 #define ADC_CAL_BITS            (12)
 
-#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
 
 #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) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits'
-
-#elif defined(STM32H7)
 
-#define ADC_SCALE_V             (3.3f)
-#define ADC_CAL_ADDRESS         (0x1FF1E860)
-#define ADC_CAL1                ((uint16_t *)(0x1FF1E820))
-#define ADC_CAL2                ((uint16_t *)(0x1FF1E840))
+#if defined(STM32H7)
 #define ADC_CAL_BITS            (16)
+#else
+#define ADC_CAL_BITS            (12) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits'
+#endif
 
 #else
 

From a9d04ed0a23415b41553702eaee301da5bd5cad5 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 5 Jul 2025 22:32:26 +0900
Subject: [PATCH 3015/3129] stm32/usbd_conf: Change USB pin configuration for
 STM32H7A3.

STM32H7A3 uses PA11, PA12 to enable USB function via built-in USB OTG port
on NUCLEO board.

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/usbd_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 7a9e63c9f32c1..d4af54b72968a 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -182,7 +182,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
 
         // Configure USB GPIO's.
 
-        #if defined(STM32H723xx)
+        #if defined(STM32H723xx) || (STM32H7A3xx) || defined(STM32H7A3xxQ)
 
         // These MCUs don't have an alternate function for USB but rather require
         // the pins to be disconnected from all peripherals, ie put in analog mode.
@@ -204,7 +204,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
 
         // Other MCUs have an alternate function for GPIO's to be in USB mode.
 
-        #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        #if 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;

From 7373338fa9afb31dc12c52546ca24b32dd3edaa2 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 5 Jul 2025 22:33:21 +0900
Subject: [PATCH 3016/3129] stm32/boards/NUCLEO_H7A3ZI_Q: Add NUCLEO_H7A3ZI_Q
 board support.

This change adds NUCLEO_H7A3ZI_Q Core Board support to the STM32 port.

NUCLEO_H7A3ZI_Q:
https://www.st.com/en/evaluation-tools/nucleo-h7a3zi-q.html

This board uses STM32H7A3ZI:
https://www.st.com/en/microcontrollers-microprocessors/stm32h7a3zi.html

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/boards/NUCLEO_H7A3ZI_Q/board.json |  15 +++
 .../stm32/boards/NUCLEO_H7A3ZI_Q/board_init.c |   7 +
 .../boards/NUCLEO_H7A3ZI_Q/mpconfigboard.h    | 116 +++++++++++++++++
 .../boards/NUCLEO_H7A3ZI_Q/mpconfigboard.mk   |  17 +++
 ports/stm32/boards/NUCLEO_H7A3ZI_Q/pins.csv   | 123 ++++++++++++++++++
 .../NUCLEO_H7A3ZI_Q/stm32h7xx_hal_conf.h      |  19 +++
 ports/stm32/boards/stm32h7a3.ld               |  39 ++++++
 7 files changed, 336 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_H7A3ZI_Q/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_H7A3ZI_Q/board_init.c
 create mode 100644 ports/stm32/boards/NUCLEO_H7A3ZI_Q/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_H7A3ZI_Q/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_H7A3ZI_Q/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_H7A3ZI_Q/stm32h7xx_hal_conf.h
 create mode 100644 ports/stm32/boards/stm32h7a3.ld

diff --git a/ports/stm32/boards/NUCLEO_H7A3ZI_Q/board.json b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/board.json
new file mode 100644
index 0000000000000..7ecc10a3e003f
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_h7a3zi_q.jpg"
+    ],
+    "mcu": "stm32h7",
+    "product": "Nucleo H7A3ZI-Q",
+    "thumbnail": "",
+    "url": "https://www.st.com/ja/evaluation-tools/nucleo-h7a3zi-q.html",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_H7A3ZI_Q/board_init.c b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/board_init.c
new file mode 100644
index 0000000000000..d2cadf2733d45
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/board_init.c
@@ -0,0 +1,7 @@
+#include "py/mphal.h"
+
+void NUCLEO_H7A3ZIQ_board_early_init(void) {
+    // Turn off the USB switch.
+    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_H7A3ZI_Q/mpconfigboard.h b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/mpconfigboard.h
new file mode 100644
index 0000000000000..6505d51f79079
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/mpconfigboard.h
@@ -0,0 +1,116 @@
+#define MICROPY_HW_BOARD_NAME               "NUCLEO_H7A3ZI_Q"
+#define MICROPY_HW_MCU_NAME                 "STM32H7A3ZIT6Q"
+
+#define MICROPY_HW_ENABLE_RTC               (1)
+#define MICROPY_HW_ENABLE_SERVO             (1)
+#define MICROPY_HW_ENABLE_RNG               (0) // RNG needs proper configuration
+#define MICROPY_HW_ENABLE_ADC               (1)
+#define MICROPY_HW_ENABLE_DAC               (1)
+#define MICROPY_HW_ENABLE_USB               (1)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+#define MICROPY_HW_HAS_SWITCH               (1)
+#define MICROPY_HW_HAS_FLASH                (1)
+
+#define MICROPY_BOARD_EARLY_INIT            NUCLEO_H7A3ZIQ_board_early_init
+
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+// There is no external HS crystal, instead it comes from ST-LINK MCO output which is 8MHz.
+// The following gives a 280Hz CPU speed.
+#define MICROPY_HW_CLK_USE_BYPASS           (1)
+#define MICROPY_HW_CLK_PLLM                 (2)
+#define MICROPY_HW_CLK_PLLN                 (140)
+#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_2)
+#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                (1)
+#define MICROPY_HW_CLK_PLL3N                (24)
+#define MICROPY_HW_CLK_PLL3P                (2)
+#define MICROPY_HW_CLK_PLL3Q                (4)
+#define MICROPY_HW_CLK_PLL3R                (2)
+#define MICROPY_HW_CLK_PLL3VCI              (RCC_PLL3VCIRANGE_3)
+#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
+
+// The board has an external 32kHz crystal attached
+#define MICROPY_HW_RTC_USE_LSE              (1)
+
+// SMPS configuration
+#define MICROPY_HW_PWR_SMPS_CONFIG          (PWR_DIRECT_SMPS_SUPPLY)
+
+// UART config
+#define MICROPY_HW_UART1_TX                 (pin_B14)   // Arduino D1,  pin14 on CN10
+#define MICROPY_HW_UART1_RX                 (pin_B15)   // Arduino D0,  pin16 on CN10
+#define MICROPY_HW_UART2_TX                 (pin_D5)    //              pin 6 on CN9
+#define MICROPY_HW_UART2_RX                 (pin_D6)    //              pin 4 on CN9
+#define MICROPY_HW_UART2_RTS                (pin_D4)    //              pin 8 on CN9
+#define MICROPY_HW_UART2_CTS                (pin_D3)    //              pin10 on CN9
+#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_UART7_TX                 (pin_F7)
+#define MICROPY_HW_UART7_RX                 (pin_F6)
+#define MICROPY_HW_UART8_TX                 (pin_E1)
+#define MICROPY_HW_UART8_RX                 (pin_E0)
+
+// UART3 connects to the STLINK-V3 on the Nucleo board
+// and this is exposed as a USB Serial port.
+#define MICROPY_HW_UART_REPL                PYB_UART_3
+#define MICROPY_HW_UART_REPL_BAUD           115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL                 (pin_B8)    // Arduino D15, pin 2 on CN7
+#define MICROPY_HW_I2C1_SDA                 (pin_B9)    // Arduino D14, pin 4 on CN7
+#define MICROPY_HW_I2C4_SCL                 (pin_F14)   //              pin19 on CN9
+#define MICROPY_HW_I2C4_SDA                 (pin_F15)   //              pin12 on CN9
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS                 (pin_A4)    //              pin17 on CN7
+#define MICROPY_HW_SPI1_SCK                 (pin_A5)    // Arduino D13, pin10 on CN7
+#define MICROPY_HW_SPI1_MISO                (pin_A6)    // Arduino D12, pin12 on CN7
+#define MICROPY_HW_SPI1_MOSI                (pin_A7)    // Arduino D11, pin14 on CN7
+#define MICROPY_HW_SPI2_NSS                 (pin_B12)
+#define MICROPY_HW_SPI2_SCK                 (pin_B10)
+#define MICROPY_HW_SPI2_MISO                (pin_C2)
+#define MICROPY_HW_SPI2_MOSI                (pin_C1)
+#define MICROPY_HW_SPI3_NSS                 (pin_A15)
+#define MICROPY_HW_SPI3_SCK                 (pin_B2)
+#define MICROPY_HW_SPI3_MISO                (pin_C10)
+#define MICROPY_HW_SPI3_MOSI                (pin_C11)
+
+// 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_E1)    // yellow
+#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
+#define MICROPY_HW_USB_HS                   (1)
+#define MICROPY_HW_USB_HS_IN_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)
+
+void NUCLEO_H7A3ZIQ_board_early_init(void);
diff --git a/ports/stm32/boards/NUCLEO_H7A3ZI_Q/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/mpconfigboard.mk
new file mode 100644
index 0000000000000..aa6125d0d80c5
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USE_MBOOT ?= 0
+
+# MCU settings
+MCU_SERIES = h7
+CMSIS_MCU = STM32H7A3xxQ
+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/stm32h7a3.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+endif
diff --git a/ports/stm32/boards/NUCLEO_H7A3ZI_Q/pins.csv b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/pins.csv
new file mode 100644
index 0000000000000..1b38fc4ba65d9
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/pins.csv
@@ -0,0 +1,123 @@
+A0,PA3
+A1,PC0
+A2,PC3
+A3,PB1
+A4,PC2
+A5,PF11
+A6,PC1
+A7,PC5
+A8,PA2
+D0,PB7
+D1,PB6
+D2,PG14
+D3,PE13
+D4,PE14
+D5,PE11
+D6,PA8
+D7,PG12
+D8,PG9
+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
+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,PG10
+D50,PG8
+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,PD10
+D65,PB14
+D66,PD1
+D67,PD0
+D68,PF15
+D69,PF14
+D70,PB5
+D71,PE9
+D72,PB2
+DAC1,PA4
+DAC2,PA5
+LED1,PB0
+LED2,PE1
+LED3,PB14
+SW,PC13
+I2C1_SDA,PB9
+I2C1_SCL,PB8
+I2C4_SCL,PF14
+I2C4_SDA,PF15
+OTG_FS_POWER,PD10
+OTG_FS_OVER_CURRENT,PG7
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+UART1_TX,PB14
+UART1_RX,PB15
+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
+,PC1
+,PA2
+,PA1
+,PA7
+,PC4
+,PC5
+,PG11
+,PG13
+,PB13
diff --git a/ports/stm32/boards/NUCLEO_H7A3ZI_Q/stm32h7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/stm32h7xx_hal_conf.h
new file mode 100644
index 0000000000000..311c1ff8015a9
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H7A3ZI_Q/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
+
+// 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)
+
+#include "boards/stm32h7xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/stm32h7a3.ld b/ports/stm32/boards/stm32h7a3.ld
new file mode 100644
index 0000000000000..3cb03b908fa40
--- /dev/null
+++ b/ports/stm32/boards/stm32h7a3.ld
@@ -0,0 +1,39 @@
+/*
+    GNU linker script for STM32H7A3
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K   /* sectors   0- 15,  128K */
+    FLASH_APP  (rx) : ORIGIN = 0x08020000, LENGTH = 1664K   /* sectors  16-223, 1664K */
+    FLASH_FS (r)    : ORIGIN = 0x081c0000, LENGTH =  256K   /* sectors 224-255,  256K */
+    DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH =  120K   /* Used for storage cache */
+    FS_CACHE (xrw)  : ORIGIN = 0x2001e000, LENGTH =    8K   /* Used for storage cache */
+    RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 1024K
+    RAM_CD (xrw)    : ORIGIN = 0x30000000, LENGTH =  128K
+    RAM_SRD (xrw)   : ORIGIN = 0x38000000, LENGTH =   32K
+}
+
+/* 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;
+
+/* Location of filesystem RAM cache */
+_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);
+
+/* 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);

From a6bc1ccbe51e582d39c6bf7b484c75bfb662357b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 23 Sep 2025 00:50:51 +0200
Subject: [PATCH 3017/3129] py/persistentcode: Add architecture flags
 compatibility checks.

This commit extends the MPY file format in a backwards-compatible way to
store an encoded form of architecture-specific flags that have been
specified in the "mpy-cross" command line, or that have been explicitly
set as part of a native emitter configuration.

The file format changes are as follows:

* The features byte, previously containing the target native
  architecture and the minor file format version, now claims bit 6 as a
  flag indicating the presence of an encoded architecture flags integer
* If architecture flags need to be stored, they are placed right after
  the MPY file header.

This means that properly-written MPY parsers, if encountering a MPY file
containing encoded architecture flags, should raise an error since no
architecture identifiers have been defined that make use of bits 6 and
7 in the referenced header byte.  This should give enough guarantees of
backwards compatibility when this feature is used (improper parsers were
subjected to breakage anyway).

The encoded architecture flags could have been placed at the end, but:

* Having them right after the header makes the architecture
  compatibility checks occur before having read the whole file in memory
  (which still happens on certain platforms as the reader may be backed
  by a memory buffer), and prevents eventual memory allocations that do
  not take place if the module is rejected early
* Properly-written MPY file parsers should have checked the upper two
  bits of the flags byte to be actually zero according to the format
  specification available right before this change, so no assumptions
  should have been made on the exact order of the chunks for an
  unexpected format.

The meaning of the architecture flags value is backend-specific, with
the only common characteristic of being a variable-encoded unsigned
integer for the time being.

The changes made to the file format effectively limit the number of
possible target architectures to 16, of which 13 are already claimed.
There aren't that many new architectures planned to be supported for the
lifetime of the current MPY file format, so this change still leaves
space for architecture updates if needed.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/reference/mpyfiles.rst | 27 ++++++++++++++++++++++++++-
 mpy-cross/main.c            |  1 +
 py/bc.h                     |  1 +
 py/persistentcode.c         | 15 +++++++++++++--
 py/persistentcode.h         |  6 +++++-
 tools/mpy-tool.py           | 37 ++++++++++++++++++++++++++++++++++---
 6 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index cd4db623ffefa..b2d552d09c8d1 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -80,6 +80,10 @@ If importing an .mpy file fails then try the following:
   above, or by inspecting the ``MPY_CROSS_FLAGS`` Makefile variable for the
   port that you are using.
 
+* If the third byte of the .mpy file has bit #6 set, then check whether the
+  encoded architecture-specific flag bits vuint is compatible with the
+  target you're importing the file on.
+
 The following table shows the correspondence between MicroPython release
 and .mpy version.
 
@@ -153,10 +157,31 @@ size    field
 ======  ================================
 byte    value 0x4d (ASCII 'M')
 byte    .mpy major version number
-byte    native arch and minor version number (was feature flags in older versions)
+byte    feature flags, native arch, minor version number (was feature flags in older versions)
 byte    number of bits in a small int
 ======  ================================
 
+The third byte is split as follows (MSB first):
+
+======  ================================
+bit     meaning
+======  ================================
+7       reserved, must be 0
+6       an architecture-specific flags vuint follows the header
+5..2    native arch number
+1..0    minor version number
+======  ================================
+
+Architecture-specific flags
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If bit #6 of the header's feature flags byte is set, then a vuint containing
+optional architecture-specific information will follow the header. The contents
+of this integer depends on which native architecture the file is meant for.
+
+See also ``mpy-tool.py``'s ``-march-flags`` command-line option to set this
+value when creating MPY files.
+
 The global qstr and constant tables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 51e338bbc2d51..0415eb664f95b 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -93,6 +93,7 @@ static int compile_and_save(const char *file, const char *output_file, const cha
         mp_parse_tree_t parse_tree = mp_parse(lex, MP_PARSE_FILE_INPUT);
         mp_compiled_module_t cm;
         cm.context = m_new_obj(mp_module_context_t);
+        cm.arch_flags = 0;
         mp_compile_to_raw_code(&parse_tree, source_name, false, &cm);
 
         if ((output_file != NULL && strcmp(output_file, "-") == 0) ||
diff --git a/py/bc.h b/py/bc.h
index f24510ea7ec72..8caac6d4e2e82 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -220,6 +220,7 @@ typedef struct _mp_compiled_module_t {
     bool has_native;
     size_t n_qstr;
     size_t n_obj;
+    size_t arch_flags;
     #endif
 } mp_compiled_module_t;
 
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 6ec0717f948b4..7d71cfd986d8d 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -471,7 +471,7 @@ void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *cm) {
         || 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) {
+    if (arch != MP_NATIVE_ARCH_NONE) {
         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
@@ -483,6 +483,12 @@ void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *cm) {
         }
     }
 
+    size_t arch_flags = 0;
+    if (MPY_FEATURE_ARCH_FLAGS_TEST(header[2])) {
+        (void)arch_flags;
+        mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy file"));
+    }
+
     size_t n_qstr = read_uint(reader);
     size_t n_obj = read_uint(reader);
     mp_module_context_alloc_tables(cm->context, n_qstr, n_obj);
@@ -504,6 +510,7 @@ void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *cm) {
     cm->has_native = MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE;
     cm->n_qstr = n_qstr;
     cm->n_obj = n_obj;
+    cm->arch_flags = arch_flags;
     #endif
 
     // Deregister exception handler and close the reader.
@@ -672,7 +679,7 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
     byte header[4] = {
         'M',
         MPY_VERSION,
-        cm->has_native ? MPY_FEATURE_ENCODE_SUB_VERSION(MPY_SUB_VERSION) | MPY_FEATURE_ENCODE_ARCH(MPY_FEATURE_ARCH_DYNAMIC) : 0,
+        (cm->arch_flags != 0 ? MPY_FEATURE_ARCH_FLAGS : 0) | (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
@@ -681,6 +688,10 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
     };
     mp_print_bytes(print, header, sizeof(header));
 
+    if (cm->arch_flags) {
+        mp_print_uint(print, cm->arch_flags);
+    }
+
     // Number of entries in constant table.
     mp_print_uint(print, cm->n_qstr);
     mp_print_uint(print, cm->n_obj);
diff --git a/py/persistentcode.h b/py/persistentcode.h
index a45d5fd182e5e..8fd7068e3cd52 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -45,7 +45,7 @@
 
 // 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)
+#define MPY_FEATURE_DECODE_ARCH(feat) (((feat) >> 2) & 0x2F)
 
 // Define the host architecture
 #if MICROPY_EMIT_X86
@@ -85,6 +85,10 @@
 #define MPY_FILE_HEADER_INT (MPY_VERSION \
     | (MPY_FEATURE_ENCODE_SUB_VERSION(MPY_SUB_VERSION) | MPY_FEATURE_ENCODE_ARCH(MPY_FEATURE_ARCH)) << 8)
 
+// Architecture-specific flags are present in the .mpy file
+#define MPY_FEATURE_ARCH_FLAGS (0x40)
+#define MPY_FEATURE_ARCH_FLAGS_TEST(x) (((x) & MPY_FEATURE_ARCH_FLAGS) == MPY_FEATURE_ARCH_FLAGS)
+
 enum {
     MP_NATIVE_ARCH_NONE = 0,
     MP_NATIVE_ARCH_X86,
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index df918e1539854..c68f17913770a 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -120,6 +120,8 @@ class Config:
 MP_BC_FORMAT_VAR_UINT = 2
 MP_BC_FORMAT_OFFSET = 3
 
+MP_NATIVE_ARCH_FLAGS_PRESENT = 0x40
+
 mp_unary_op_method_name = (
     "__pos__",
     "__neg__",
@@ -542,6 +544,7 @@ def __init__(
         mpy_source_file,
         mpy_segments,
         header,
+        arch_flags,
         qstr_table,
         obj_table,
         raw_code,
@@ -554,6 +557,7 @@ def __init__(
         self.mpy_segments = mpy_segments
         self.source_file = qstr_table[0]
         self.header = header
+        self.arch_flags = arch_flags
         self.qstr_table = qstr_table
         self.obj_table = obj_table
         self.raw_code = raw_code
@@ -1339,7 +1343,7 @@ def read_mpy(filename):
         if header[1] != config.MPY_VERSION:
             raise MPYReadError(filename, "incompatible .mpy version")
         feature_byte = header[2]
-        mpy_native_arch = feature_byte >> 2
+        mpy_native_arch = (feature_byte >> 2) & 0x2F
         if mpy_native_arch != MP_NATIVE_ARCH_NONE:
             mpy_sub_version = feature_byte & 3
             if mpy_sub_version != config.MPY_SUB_VERSION:
@@ -1350,6 +1354,11 @@ def read_mpy(filename):
                 raise MPYReadError(filename, "native architecture mismatch")
         config.mp_small_int_bits = header[3]
 
+        arch_flags = 0
+        # Read the architecture-specific flag bits if present.
+        if (feature_byte & MP_NATIVE_ARCH_FLAGS_PRESENT) != 0:
+            arch_flags = reader.read_uint()
+
         # Read number of qstrs, and number of objects.
         n_qstr = reader.read_uint()
         n_obj = reader.read_uint()
@@ -1378,6 +1387,7 @@ def read_mpy(filename):
         filename,
         segments,
         header,
+        arch_flags,
         qstr_table,
         obj_table,
         raw_code,
@@ -1673,25 +1683,39 @@ def merge_mpy(compiled_modules, output_file):
             merged_mpy.extend(f.read())
     else:
         main_cm_idx = None
+        arch_flags = 0
         for idx, cm in enumerate(compiled_modules):
             feature_byte = cm.header[2]
-            mpy_native_arch = feature_byte >> 2
+            mpy_native_arch = (feature_byte >> 2) & 0x2F
             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")
                 main_cm_idx = idx
+                arch_flags = cm.arch_flags
         if main_cm_idx is not None:
             # Shift main_cm to front of list.
             compiled_modules.insert(0, compiled_modules.pop(main_cm_idx))
 
+        if config.arch_flags is not None:
+            arch_flags = config.arch_flags
+
         header = bytearray(4)
         header[0] = ord("M")
         header[1] = config.MPY_VERSION
-        header[2] = config.native_arch << 2 | config.MPY_SUB_VERSION if config.native_arch else 0
+        header[2] = (
+            (MP_NATIVE_ARCH_FLAGS_PRESENT if arch_flags != 0 else 0)
+            | 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)
 
+        if arch_flags != 0:
+            merged_mpy.extend(mp_encode_uint(arch_flags))
+
         n_qstr = 0
         n_obj = 0
         for cm in compiled_modules:
@@ -1823,6 +1847,12 @@ def main(args=None):
         default=16,
         help="mpz digit size used by target (default 16)",
     )
+    cmd_parser.add_argument(
+        "-march-flags",
+        metavar="F",
+        type=int,
+        help="architecture flags value to set in the output file (strips existing flags if not present)",
+    )
     cmd_parser.add_argument("-o", "--output", default=None, help="output file")
     cmd_parser.add_argument("files", nargs="+", help="input .mpy files")
     args = cmd_parser.parse_args(args)
@@ -1835,6 +1865,7 @@ def main(args=None):
     }[args.mlongint_impl]
     config.MPZ_DIG_SIZE = args.mmpz_dig_size
     config.native_arch = MP_NATIVE_ARCH_NONE
+    config.arch_flags = args.march_flags
 
     # set config values for qstrs, and get the existing base set of qstrs
     # already in the firmware

From 64971f1a65aed54e6a1c041d069c2cb75f2dd64b Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 23 Sep 2025 22:52:44 +0200
Subject: [PATCH 3018/3129] py/persistentcode: Add architecture flags check for
 RV32 platforms.

This commit introduces the MPY architecture flags checking code specific
for the RV32 target, currently checking for the only additional
extension that is supported by the runtime: Zba.

The warnings inside "mpy-cross" have also been removed since now there
is a way to reject incompatible MPY files at runtime.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/reference/mpyfiles.rst | 15 +++++++++++++--
 mpy-cross/main.c            | 12 +++++++-----
 py/asmrv32.h                |  2 ++
 py/persistentcode.c         | 19 +++++++++++++++++--
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index b2d552d09c8d1..9687f5e46e313 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -179,8 +179,19 @@ If bit #6 of the header's feature flags byte is set, then a vuint containing
 optional architecture-specific information will follow the header. The contents
 of this integer depends on which native architecture the file is meant for.
 
-See also ``mpy-tool.py``'s ``-march-flags`` command-line option to set this
-value when creating MPY files.
+This is currently used to store which RISC-V processor extensions the MPY file
+needs to operate correctly besides I, M, C, and Zicsr.  Different flavours of
+ArmV7 are identified by their native architecture number, but reusing that
+mechanism would complicate things for RV32 and RV64.
+
+MPY files targeting RV32 or RV64 that do not need any particular processor
+extensions do not need to provide a flags integer (along with setting the
+appropriate bit in the header).  The lack of a flags value for RV32 and RV64
+MPY files is used to indicate that no specific extensions are needed, and saves
+one byte in the final output binary.
+
+See also the ``-march-flags`` command-line option in both ``mpy-tool.py`` and
+``mpy-cross`` to set this value when creating MPY files.
 
 The global qstr and constant tables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 0415eb664f95b..246390383a0b1 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -94,6 +94,12 @@ static int compile_and_save(const char *file, const char *output_file, const cha
         mp_compiled_module_t cm;
         cm.context = m_new_obj(mp_module_context_t);
         cm.arch_flags = 0;
+        #if MICROPY_EMIT_NATIVE && MICROPY_EMIT_RV32
+        if (mp_dynamic_compiler.native_arch == MP_NATIVE_ARCH_RV32IMC && mp_dynamic_compiler.backend_options != NULL) {
+            cm.arch_flags = ((asm_rv32_backend_options_t *)mp_dynamic_compiler.backend_options)->allowed_extensions;
+        }
+        #endif
+
         mp_compile_to_raw_code(&parse_tree, source_name, false, &cm);
 
         if ((output_file != NULL && strcmp(output_file, "-") == 0) ||
@@ -138,7 +144,7 @@ static int usage(char **argv) {
         "-march=<arch> : set architecture for native emitter;\n"
         "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp,\n"
         "                armv7emdp, xtensa, xtensawin, rv32imc, rv64imc, host, debug\n"
-        "-march-flags=<flags> : set architecture-specific flags (OUTPUT FILE MAY NOT WORK ON ALL TARGETS!)\n"
+        "-march-flags=<flags> : set architecture-specific flags\n"
         "                       supported flags for rv32imc: zba\n"
         "\n"
         "Implementation specific options:\n", argv[0]
@@ -382,10 +388,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
             mp_printf(&mp_stderr_print, "unrecognised arch flags\n");
             exit(1);
         }
-        mp_printf(&mp_stderr_print,
-            "WARNING: Using architecture-specific flags may create a MPY file whose code won't run on all targets!\n"
-            "         Currently there are no checks in the module file loader for whether the chosen flags used to\n"
-            "         build the MPY file are compatible with the running target.\n\n");
     }
 
     #if MICROPY_EMIT_NATIVE
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 27a08cf9fde11..4456e6119e826 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -125,6 +125,8 @@ typedef struct _asm_rv32_t {
 enum {
     RV32_EXT_NONE = 0,
     RV32_EXT_ZBA = 1 << 0,
+
+    RV32_EXT_ALL = RV32_EXT_ZBA
 };
 
 typedef struct _asm_rv32_backend_options_t {
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 7d71cfd986d8d..b12c100743392 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -63,6 +63,10 @@ typedef struct _bytecode_prelude_t {
     uint code_info_size;
 } bytecode_prelude_t;
 
+#if MICROPY_EMIT_RV32
+#include "py/asmrv32.h"
+#endif
+
 #endif // MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
 
 #if MICROPY_PERSISTENT_CODE_LOAD
@@ -485,8 +489,19 @@ void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *cm) {
 
     size_t arch_flags = 0;
     if (MPY_FEATURE_ARCH_FLAGS_TEST(header[2])) {
-        (void)arch_flags;
-        mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy file"));
+        #if MICROPY_EMIT_RV32
+        arch_flags = read_uint(reader);
+
+        if (MPY_FEATURE_ARCH_TEST(MP_NATIVE_ARCH_RV32IMC)) {
+            if ((arch_flags & (size_t)asm_rv32_allowed_extensions()) != arch_flags) {
+                mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy file"));
+            }
+        } else
+        #endif
+        {
+            (void)arch_flags;
+            mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy file"));
+        }
     }
 
     size_t n_qstr = read_uint(reader);

From b255224d096086cba3d51ecd4206b233eeced6ac Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 23 Sep 2025 01:20:18 +0200
Subject: [PATCH 3019/3129] tools/mpy-tool.py: Add architecture flags to
 disassembly output.

This commit extends "mpy-tool.py"'s disassembly output of a given MPY
file (triggered via the "-d" command line option) to include newly added
fields.

Now the target architecture for the chosen MPY file is printed out to
screen in human-readable format and, if present, architecture-specific
flags.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tools/mpy-tool.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index c68f17913770a..8fab1c969757a 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -96,6 +96,22 @@ class Config:
 MP_NATIVE_ARCH_RV32IMC = 11
 MP_NATIVE_ARCH_RV64IMC = 12
 
+MP_NATIVE_ARCH_NAMES = [
+    "NONE",
+    "X86",
+    "X64",
+    "ARMV6",
+    "ARMV6M",
+    "ARMV7M",
+    "ARMV7EM",
+    "ARMV7EMSP",
+    "ARMV7EMDP",
+    "XTENSA",
+    "XTENSAWIN",
+    "RV32IMC",
+    "RV64IMC",
+]
+
 MP_PERSISTENT_OBJ_FUN_TABLE = 0
 MP_PERSISTENT_OBJ_NONE = 1
 MP_PERSISTENT_OBJ_FALSE = 2
@@ -635,6 +651,14 @@ 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))
+        arch_index = (self.header[2] >> 2) & 0x2F
+        if arch_index >= len(MP_NATIVE_ARCH_NAMES):
+            arch_name = "UNKNOWN"
+        else:
+            arch_name = MP_NATIVE_ARCH_NAMES[arch_index]
+        print("arch:", arch_name)
+        if self.header[2] & MP_NATIVE_ARCH_FLAGS_PRESENT != 0:
+            print("arch_flags:", hex(self.arch_flags))
         print("qstr_table[%u]:" % len(self.qstr_table))
         for q in self.qstr_table:
             print("    %s" % q.str)

From 3e2b41f8f60d39226320aad93ed3490d5add1799 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 24 Oct 2025 17:08:05 +0200
Subject: [PATCH 3020/3129] mpy-cross/main: Parse raw integer arch flags values
 too.

This commit extends "mpy-cross"'s parsing of the architecture flags
value command line, allowing raw integer values as well as flag strings.

Integers can be represented as either decimal, binary, or hexadecimal
values, using the usual C language prefixes to mark non-base 10 values.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 mpy-cross/main.c | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 246390383a0b1..38190671c6ddd 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -34,6 +34,7 @@
 #include "py/persistentcode.h"
 #include "py/runtime.h"
 #include "py/gc.h"
+#include "py/parsenum.h"
 #include "genhdr/mpversion.h"
 #ifdef _WIN32
 #include "ports/windows/fmode.h"
@@ -144,7 +145,7 @@ static int usage(char **argv) {
         "-march=<arch> : set architecture for native emitter;\n"
         "                x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp,\n"
         "                armv7emdp, xtensa, xtensawin, rv32imc, rv64imc, host, debug\n"
-        "-march-flags=<flags> : set architecture-specific flags\n"
+        "-march-flags=<flags> : set architecture-specific flags (can be either a dec/hex/bin value or a string)\n"
         "                       supported flags for rv32imc: zba\n"
         "\n"
         "Implementation specific options:\n", argv[0]
@@ -226,6 +227,38 @@ static char *backslash_to_forwardslash(char *path) {
     return path;
 }
 
+// This will need to be reworked in case mpy-cross needs to set more bits than
+// what its small int representation allows to fit in there.
+static bool parse_integer(const char *value, mp_uint_t *integer) {
+    assert(value && "Attempting to parse a NULL string");
+    assert(integer && "Attempting to store into a NULL integer buffer");
+
+    size_t value_length = strlen(value);
+    int base = 10;
+    if (value_length > 2 && value[0] == '0') {
+        if ((value[1] | 0x20) == 'b') {
+            base = 2;
+        } else if ((value[1] | 0x20) == 'x') {
+            base = 16;
+        } else {
+            return false;
+        }
+    }
+
+    bool valid = false;
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t parsed = mp_parse_num_integer(value, value_length, base, NULL);
+        if (mp_obj_is_small_int(parsed)) {
+            *integer = MP_OBJ_SMALL_INT_VALUE(parsed);
+            valid = true;
+        }
+        nlr_pop();
+    }
+
+    return valid;
+}
+
 MP_NOINLINE int main_(int argc, char **argv) {
     pre_process_options(argc, argv);
 
@@ -378,7 +411,13 @@ MP_NOINLINE int main_(int argc, char **argv) {
         #if MICROPY_EMIT_NATIVE && MICROPY_EMIT_RV32
         if (mp_dynamic_compiler.native_arch == MP_NATIVE_ARCH_RV32IMC) {
             mp_dynamic_compiler.backend_options = (void *)&rv32_options;
-            if (strncmp(arch_flags, "zba", sizeof("zba") - 1) == 0) {
+            mp_uint_t raw_flags = 0;
+            if (parse_integer(arch_flags, &raw_flags)) {
+                if ((raw_flags & ~((mp_uint_t)RV32_EXT_ALL)) == 0) {
+                    rv32_options.allowed_extensions = raw_flags;
+                    processed = true;
+                }
+            } else if (strncmp(arch_flags, "zba", sizeof("zba") - 1) == 0) {
                 rv32_options.allowed_extensions |= RV32_EXT_ZBA;
                 processed = true;
             }

From 430837996b3cbb85849be92cc4d9ce98ce2a0905 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 24 Sep 2025 22:26:39 +0200
Subject: [PATCH 3021/3129] py/modsys: Add architecture flags to MicroPython
 metadata.

This commit adds the currently supported architecture flags value as the
upper part of "sys.implementation._mpy".

This had the side effect of perturbing quite a bit of testing
infrastructure and invalidating documentation related to MPY files.  To
make the test suite run successfully and keep the documentation in sync
the following changes have been made:

* The target info feature check file now isolates eventual architecture
  flags and adds them as a separate field
* The test runner now picks up the new architecture flags field, reports
  it to STDOUT if needed and stores it for future uses
* Relevant test files for MPY files import code had to be updated to
  mask out the architecture flags bits in order to perform correctly
* MPY file format documentation was updated to show how to mask off and
  properly display the architecture flags information.

This works out of the box if the flag bits can fit in a smallint value
once merged with the MPY file header value.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/reference/mpyfiles.rst               |  4 +++-
 py/asmrv32.h                              |  8 ++++----
 py/modsys.c                               | 10 +++++++++-
 tests/feature_check/target_info.py        |  5 +++--
 tests/micropython/import_mpy_native.py    |  4 ++--
 tests/micropython/import_mpy_native_gc.py |  2 +-
 tests/run-tests.py                        |  6 +++++-
 7 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 9687f5e46e313..58e45e158523c 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -58,12 +58,14 @@ If importing an .mpy file fails then try the following:
     sys_mpy = sys.implementation._mpy
     arch = [None, 'x86', 'x64',
         'armv6', 'armv6m', 'armv7m', 'armv7em', 'armv7emsp', 'armv7emdp',
-        'xtensa', 'xtensawin', 'rv32imc', 'rv64imc'][sys_mpy >> 10]
+        'xtensa', 'xtensawin', 'rv32imc', 'rv64imc'][(sys_mpy >> 10) & 0x0F]
     print('mpy version:', sys_mpy & 0xff)
     print('mpy sub-version:', sys_mpy >> 8 & 3)
     print('mpy flags:', end='')
     if arch:
         print(' -march=' + arch, end='')
+    if (sys_mpy >> 16) != 0:
+        print(' -march-flags=' + (sys_mpy >> 16), end='')
     print()
 
 * Check the validity of the .mpy file by inspecting the first two bytes of
diff --git a/py/asmrv32.h b/py/asmrv32.h
index 4456e6119e826..6f709daa11bce 100644
--- a/py/asmrv32.h
+++ b/py/asmrv32.h
@@ -709,11 +709,11 @@ static inline void asm_rv32_opcode_xori(asm_rv32_t *state, mp_uint_t rd, mp_uint
     asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x13, 0x04, rd, rs, immediate));
 }
 
+#define MICROPY_RV32_EXTENSIONS \
+    (MICROPY_EMIT_RV32_ZBA ? RV32_EXT_ZBA : 0)
+
 static inline uint8_t asm_rv32_allowed_extensions(void) {
-    uint8_t extensions = 0;
-    #if MICROPY_EMIT_RV32_ZBA
-    extensions |= RV32_EXT_ZBA;
-    #endif
+    uint8_t extensions = MICROPY_RV32_EXTENSIONS;
     #if MICROPY_DYNAMIC_COMPILER
     if (mp_dynamic_compiler.backend_options != NULL) {
         extensions |= ((asm_rv32_backend_options_t *)mp_dynamic_compiler.backend_options)->allowed_extensions;
diff --git a/py/modsys.c b/py/modsys.c
index ef6273fc8c7ea..3dae92681ab74 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -85,8 +85,16 @@ static const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER
     MP_ROM_PTR(&mp_sys_implementation_machine_obj)
 
 #if MICROPY_PERSISTENT_CODE_LOAD
+// Note: Adding architecture flags to _mpy will break if the flags information
+//       takes up more bits than what is available in a small-int value.
+#if MICROPY_EMIT_RV32
+#include "py/asmrv32.h"
+#define MPY_FILE_ARCH_FLAGS (MICROPY_RV32_EXTENSIONS << 16)
+#else
+#define MPY_FILE_ARCH_FLAGS (0)
+#endif
 #define SYS_IMPLEMENTATION_ELEMS__MPY \
-    , MP_ROM_INT(MPY_FILE_HEADER_INT)
+    , MP_ROM_INT(MPY_FILE_HEADER_INT | MPY_FILE_ARCH_FLAGS)
 #else
 #define SYS_IMPLEMENTATION_ELEMS__MPY
 #endif
diff --git a/tests/feature_check/target_info.py b/tests/feature_check/target_info.py
index 35a995a153df6..e95530023d7cb 100644
--- a/tests/feature_check/target_info.py
+++ b/tests/feature_check/target_info.py
@@ -20,7 +20,8 @@
     "xtensawin",
     "rv32imc",
     "rv64imc",
-][sys_mpy >> 10]
+][(sys_mpy >> 10) & 0x0F]
+arch_flags = sys_mpy >> 16
 build = getattr(sys.implementation, "_build", "unknown")
 thread = getattr(sys.implementation, "_thread", None)
 
@@ -35,4 +36,4 @@
 except NameError:
     float_prec = 0
 
-print(platform, arch, build, thread, float_prec, len("α") == 1)
+print(platform, arch, arch_flags, build, thread, float_prec, len("α") == 1)
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index 7a9bb8eddb9a6..b7908b5a6294c 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -54,11 +54,11 @@ def open(self, path, mode):
 
 # these are the test .mpy files
 small_int_bits = 30
-valid_header = bytes([77, 6, mpy_arch, small_int_bits])
+valid_header = bytes([77, 6, (mpy_arch & 0x3F), small_int_bits])
 # fmt: off
 user_files = {
     # bad architecture (mpy_arch needed for sub-version)
-    '/mod0.mpy': bytes([77, 6, 0xfc | mpy_arch, small_int_bits]),
+    '/mod0.mpy': bytes([77, 6, 0xfc | (mpy_arch & 3), small_int_bits]),
 
     # 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 851eb3922953b..997e052fdf8c0 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -67,7 +67,7 @@ def open(self, path, mode):
     features0_file_contents[arch] = features0_file_contents[0x1006]
 
 # Check that a .mpy exists for the target (ignore sub-version in lookup).
-sys_implementation_mpy = sys.implementation._mpy & ~(3 << 8)
+sys_implementation_mpy = (sys.implementation._mpy & ~(3 << 8)) & 0xFFFF
 if sys_implementation_mpy not in features0_file_contents:
     print("SKIP")
     raise SystemExit
diff --git a/tests/run-tests.py b/tests/run-tests.py
index b55bd8e497972..f184203a84a10 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -387,7 +387,9 @@ def detect_test_platform(pyb, args):
     output = run_feature_check(pyb, args, "target_info.py")
     if output.endswith(b"CRASH"):
         raise ValueError("cannot detect platform: {}".format(output))
-    platform, arch, build, thread, float_prec, unicode = str(output, "ascii").strip().split()
+    platform, arch, arch_flags, build, thread, float_prec, unicode = (
+        str(output, "ascii").strip().split()
+    )
     if arch == "None":
         arch = None
     inlineasm_arch = detect_inline_asm_arch(pyb, args)
@@ -400,6 +402,7 @@ def detect_test_platform(pyb, args):
     args.arch = arch
     if arch and not args.mpy_cross_flags:
         args.mpy_cross_flags = "-march=" + arch
+    args.arch_flags = arch_flags
     args.inlineasm_arch = inlineasm_arch
     args.build = build
     args.thread = thread
@@ -410,6 +413,7 @@ def detect_test_platform(pyb, args):
     print("platform={}".format(platform), end="")
     if arch:
         print(" arch={}".format(arch), end="")
+        print(" arch_flags={}".format(arch_flags), end="")
     if inlineasm_arch:
         print(" inlineasm={}".format(inlineasm_arch), end="")
     if thread:

From 331a5c46aa21a2ff973a9060d2d62ed73247ffed Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 24 Sep 2025 23:03:21 +0200
Subject: [PATCH 3022/3129] tests/micropython: Extend MPY import tests for
 RV32.

This commit extends the "micropython/import_mpy_native_gc" test with a
pre-built serialised MPY file built for RV32.

Before this commit, the test was skipped on said platform due to the
lack of a known-good MPY file to test the import procedure against.
Now the test is executed as part of the general CI test checks.

The MPY file's Makefile script was also updated to cater for modern
Linux environments where the required Python interpreter's command name
isn't "python", but "python3" instead (this occurs when using the past
two LTS Ubuntu releases for example).  This is the same kind of change
made in 31a008c6e26eccc3798a9ab4169019a02eadb830.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/micropython/import_mpy_native_gc.py              | 2 ++
 tests/micropython/import_mpy_native_gc_module/Makefile | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 997e052fdf8c0..bfc4e1c107da3 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -60,6 +60,8 @@ def open(self, path, mode):
     0x1006: b"M\x06\x13\x1f\x03\x008build/test_armv6m.native.mpy\x00\x08add1\x00\x0cunused\x00\x8eb0\xe0\x00\x00\x00\x00\x00\x00\x02K\x03J{D\x9bX\x18hpG\xd0\x00\x00\x00\x00\x00\x00\x00\x10\xb5\x05K\x05I\x06J{D\x9aX[X\x10h\x02!\x1bi\x98G\x10\xbd\xb8\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x10\xb5\x06K\x06J{D\x9bX\x02!\x1ci\xdbh\x98G\x02!\x010\xa0G\x10\xbd\xc0F\x96\x00\x00\x00\x00\x00\x00\x00\xf7\xb5\x12O\x12K\x7fD\xfdX\x12Lki|D\x00\x93ChXh\x00\x9b\x98G\x0fK\x01\x90\x0fJ\xfbXnk\x1a`\x0eK!\x00\xffX\xb8\x88\xb0G!\x00V \x081\xb0G!\x00x\x88\x101\xb0G\x01\x98\x00\x9b\x98G(h\xfe\xbd\xc0Fr\x00\x00\x00\x00\x00\x00\x00R\x00\x00\x00\x08\x00\x00\x00@\xe2\x01\x00\x04\x00\x00\x00\x00\x00\x00\x00\t\x00\x00\x00\x00\x00\x00\x00\x1d\x00\x00\x00\x00\x00\x00\x00A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00P\x04\x11p\rr\tt\xafd\x01f\xadh\x01j\xafl\x01n\xff",
     # -march=xtensawin
     0x2806: b"M\x06+\x1f\x03\x00>build/test_xtensawin.native.mpy\x00\x08add1\x00\x0cunused\x00\x8a\x12\x06\x16\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x006A\x00\x81\xf9\xff(\x08\x1d\xf0\x00\x006A\x00\x91\xfb\xff\x81\xf5\xff\xa8\t\x88H\x0c+\xe0\x08\x00-\n\x1d\xf0\x00\x006A\x00\x81\xf0\xff\xad\x02xH\x888\x0c+\xe0\x08\x00\x0c+\x1b\xaa\xe0\x07\x00-\n\x1d\xf06A\x00a\xe9\xff\x88\x122&\x05\xa2(\x01\xe0\x03\x00q\xe6\xff\x81\xea\xff\x92\xa7\x89\xa0\x99\x11H\xd6]\n\xb1\xe3\xff\xa2\x17\x02\x99\x08\xe0\x04\x00\xb1\xe2\xff\\j\xe0\x04\x00\xb1\xe1\xff\xa2\x17\x01\xe0\x04\x00\xad\x05\xe0\x03\x00(\x06\x1d\xf0p\x18\x04\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00(\x00\x00\x00\x00\x00\x00\x00\x1c\x00\x00\x00\x11\x02\r\x04\x07\x06\x03\t\x0c\xaf\x01\x01\x03\xad\x05\x01\x07\xaf\t\x01\x0b\xff",
+    # -march=rv32imc
+    0x2C06: b'M\x06/\x1f\x03\x00:build/test_rv32imc.native.mpy\x00\x08add1\x00\x0cunused\x00\x8fb\x97\x0f\x00\x00g\x80\x0f\x05\x97\x07\x00\x00\x83\xa7\x07\x0e\x88C\x82\x80\x97\x07\x00\x00\x83\xa7G\r\x17\x07\x00\x00\x03\'\xc7\r\x9cK\x08C\x89E\x82\x87A\x11\x97\x07\x00\x00\x83\xa7\xa7\x0b"\xc4\x80K\xdcG\x06\xc6\x89E\x82\x97\xa2\x87"D\xb2@\x89E\x05\x05A\x01\x82\x87\\A\x01\x11"\xcc\x17\x04\x00\x00\x03$$\tN\xc6\xc8C\x83)D\x01\x06\xce&\xcaJ\xc8R\xc4\x82\x99\x17\n\x00\x00\x03*\xca\x07\x03)D\x03\xaa\x84\xf9g\x03UJ\x00\x93\x87\x07$\x17\x07\x00\x00\x03\'\x07\x07\x1c\xc3\x97\x05\x00\x00\x93\x85\xe5\x03\x02\x99\x97\x05\x00\x00\x93\x85\xc5\x03\x13\x05`\x05\x02\x99\x03U*\x00\x97\x05\x00\x00\x93\x85%\x03\x02\x99&\x85\x82\x99\x08@\xf2@bD\xd2DBI\xb2I"J\x05a\x82\x80\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x14\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\x00P\x04\x11t\rv\xafx\xadz\t|\xafh\x01j\xadl\x01n\xafp\x01r\xff',
 }
 
 # Populate armv7m-derived archs based on armv6m.
diff --git a/tests/micropython/import_mpy_native_gc_module/Makefile b/tests/micropython/import_mpy_native_gc_module/Makefile
index 935ba6b59fa74..feccfc11762db 100644
--- a/tests/micropython/import_mpy_native_gc_module/Makefile
+++ b/tests/micropython/import_mpy_native_gc_module/Makefile
@@ -3,9 +3,13 @@ MPY_DIR = ../../..
 MOD = test_$(ARCH)
 SRC = test.c
 ARCH = x64
+PYTHON := $(command -v python3 2> /dev/null)
+ifndef PYTHON
+PYTHON = python
+endif
 
 .PHONY: main
 main: all
-	$(Q)cat $(MOD).mpy | python -c 'import sys; print(sys.stdin.buffer.read())'
+	$(Q)cat $(MOD).mpy | $(PYTHON) -c 'import sys; print(sys.stdin.buffer.read())'
 
 include $(MPY_DIR)/py/dynruntime.mk

From 849c67bcdc9f848a674554f3e03ef850a8f70692 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 25 Sep 2025 00:12:00 +0200
Subject: [PATCH 3023/3129] tests/run-tests.py: Pass auto-detected architecture
 flags to mpy-cross.

This commit lets "run-tests.py" use the encoded architecture flags
provided by the interpreter when invoking "mpy-cross".

If architecture flags are detected, they're mapped into the necessary
strings needed by "mpy-cross"'s "-march-flags" argument, so that tests
will always use all available extensions reported by the target.

Currently this is limited to the RV32 platform, as it is the only one
that is making use of this facility as of now.  This also lets the QEMU
port remove forced arguments to "mpy-cross" when running the test suite.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 ports/qemu/Makefile |  2 +-
 tests/run-tests.py  | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index 03f004c7530fe..ba9c53841aee5 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -196,7 +196,7 @@ CFLAGS += $(SPECS_FRAGMENT)
 LDFLAGS += $(SPECS_FRAGMENT)
 endif
 
-RUN_TESTS_FULL_ARGS = -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../ports/qemu/$<" --mpy-cross-flags='$(MPY_CROSS_FLAGS)' $(RUN_TESTS_ARGS)
+RUN_TESTS_FULL_ARGS = -t execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../ports/qemu/$<" $(RUN_TESTS_ARGS)
 
 ################################################################################
 # Source files and libraries
diff --git a/tests/run-tests.py b/tests/run-tests.py
index f184203a84a10..d8d2c42ad22e7 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -22,6 +22,8 @@
 # are guaranteed to always work, this one should though.
 BASEPATH = os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda: None)))
 
+RV32_ARCH_FLAGS = {"zba": 1 << 0}
+
 
 def base_path(*p):
     return os.path.abspath(os.path.join(BASEPATH, *p)).replace("\\", "/")
@@ -382,6 +384,17 @@ def detect_inline_asm_arch(pyb, args):
     return None
 
 
+def map_rv32_arch_flags(flags):
+    mapped_flags = []
+    for extension, bit in RV32_ARCH_FLAGS.items():
+        if flags & bit:
+            mapped_flags.append(extension)
+        flags &= ~bit
+    if flags:
+        raise Exception("Unexpected flag bits set in value {}".format(flags))
+    return mapped_flags
+
+
 def detect_test_platform(pyb, args):
     # Run a script to detect various bits of information about the target test instance.
     output = run_feature_check(pyb, args, "target_info.py")
@@ -397,12 +410,18 @@ def detect_test_platform(pyb, args):
         thread = None
     float_prec = int(float_prec)
     unicode = unicode == "True"
+    if arch == "rv32imc":
+        arch_flags = map_rv32_arch_flags(int(arch_flags))
+    else:
+        arch_flags = None
 
     args.platform = platform
     args.arch = arch
+    args.arch_flags = arch_flags
     if arch and not args.mpy_cross_flags:
         args.mpy_cross_flags = "-march=" + arch
-    args.arch_flags = arch_flags
+        if arch_flags:
+            args.mpy_cross_flags += " -march-flags=" + ",".join(arch_flags)
     args.inlineasm_arch = inlineasm_arch
     args.build = build
     args.thread = thread
@@ -413,7 +432,8 @@ def detect_test_platform(pyb, args):
     print("platform={}".format(platform), end="")
     if arch:
         print(" arch={}".format(arch), end="")
-        print(" arch_flags={}".format(arch_flags), end="")
+        if arch_flags:
+            print(" arch_flags={}".format(",".join(arch_flags)), end="")
     if inlineasm_arch:
         print(" inlineasm={}".format(inlineasm_arch), end="")
     if thread:

From a080585ffdc628ab14d70a1489e31ede485e9a88 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 25 Sep 2025 01:10:50 +0200
Subject: [PATCH 3024/3129] tests/ports/qemu: Add arch flags MPY import checks
 test.

This commit introduces a test file (along with its necessary data) to
test MPY files pass/reject cases, due to either mismatching architecture
flag requirements or unneeded "no-flags" values set.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 tests/ports/qemu/mpy_arch_flags_test.py     | 128 ++++++++++++++++++++
 tests/ports/qemu/mpy_arch_flags_test.py.exp |   1 +
 2 files changed, 129 insertions(+)
 create mode 100644 tests/ports/qemu/mpy_arch_flags_test.py
 create mode 100644 tests/ports/qemu/mpy_arch_flags_test.py.exp

diff --git a/tests/ports/qemu/mpy_arch_flags_test.py b/tests/ports/qemu/mpy_arch_flags_test.py
new file mode 100644
index 0000000000000..c07d92d533df9
--- /dev/null
+++ b/tests/ports/qemu/mpy_arch_flags_test.py
@@ -0,0 +1,128 @@
+try:
+    import sys, io, vfs
+
+    sys.implementation._mpy
+    io.IOBase
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+sys_implementation_mpy = sys.implementation._mpy
+arch = (sys_implementation_mpy >> 10) & 0x0F
+
+# RV32-only for now.
+if arch != 11:
+    print("SKIP")
+    raise SystemExit
+
+
+class UserFile(io.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):
+        if req == 4:  # MP_STREAM_CLOSE
+            return 0
+        return -1
+
+
+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])
+
+
+def mp_encode_uint(val):
+    encoded = [val & 0x7F]
+    val >>= 7
+    while val != 0:
+        encoded.insert(0, 0x80 | (val & 0x7F))
+        val >>= 7
+    return bytes(encoded)
+
+
+def add_flags(module, flags):
+    output = bytearray()
+    output.extend(module[:4])
+    output[2] |= 0x40
+    output.extend(mp_encode_uint(flags))
+    output.extend(module[4:])
+    return output
+
+
+arch_flags = sys_implementation_mpy >> 16
+can_test_partial_flags = arch_flags not in [1 << i for i in range(16)]
+
+# To recreate this string run:
+# echo "hello=1" | mpy-cross -s module.py - | python -c 'import sys; print(sys.stdin.buffer.read())'
+MPY_FILE_BASE = b"M\x06\x00\x1f\x03\x00\x12module.py\x00\x0f\nhello\x00@\x00\x02\x01\x81\x16\x02Qc"
+
+user_files = {
+    "/matching_flags.mpy": add_flags(MPY_FILE_BASE, arch_flags),
+    "/invalid_flags.mpy": add_flags(MPY_FILE_BASE, (~arch_flags & 0xFFFF)),
+    "/explicit_no_flags.mpy": add_flags(MPY_FILE_BASE, 0),
+}
+if can_test_partial_flags:
+    user_files["/partial_flags_more.mpy"] = add_flags(
+        MPY_FILE_BASE, (arch_flags | (arch_flags << 1)) & 0xFFFF
+    )
+    user_files["/partial_flags_less.mpy"] = add_flags(
+        MPY_FILE_BASE, (arch_flags >> 1) & arch_flags
+    )
+
+vfs.mount(UserFS(user_files), "/userfs")
+sys.path.append("/userfs")
+
+import matching_flags
+
+if not hasattr(matching_flags, "hello"):
+    print("Improper matching_flags import")
+
+import explicit_no_flags
+
+if not hasattr(explicit_no_flags, "hello"):
+    print("Improper explicit_no_flags import")
+
+try:
+    import invalid_flags
+
+    print("Unexpected invalid_flags import")
+except ValueError as e:
+    if str(e) != "incompatible .mpy file":
+        print("Unexpected invalid_flags import error:", str(e))
+
+if can_test_partial_flags:
+    import partial_flags_less
+
+    if not hasattr(partial_flags_less, "hello"):
+        print("Improper partial_flags_less import")
+
+    try:
+        import partial_flags_more
+
+        print("Unexpected partial_flags_more import")
+    except ValueError as e:
+        if str(e) != "incompatible .mpy file":
+            print("Unexpected partial_flags_more import error:", str(e))
+
+print("OK")
diff --git a/tests/ports/qemu/mpy_arch_flags_test.py.exp b/tests/ports/qemu/mpy_arch_flags_test.py.exp
new file mode 100644
index 0000000000000..d86bac9de59ab
--- /dev/null
+++ b/tests/ports/qemu/mpy_arch_flags_test.py.exp
@@ -0,0 +1 @@
+OK

From 2e74f0b6be27d9c2b510cfe42cf4b7119d414260 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sat, 11 Oct 2025 21:13:46 -0500
Subject: [PATCH 3025/3129] py/objlist: Make a small code size optimization in
 mp_quicksort.

While clarifying the meaning of the arguments to `mp_quicksort`, I noticed
that by pre-adjusting the `head` argument similar to what was already done
for `tail`, code size could be saved by eliminating repeated calculation of
`h + 1`.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
---
 py/objlist.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/py/objlist.c b/py/objlist.c
index 71414a849f40b..5a94ba8d983ec 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -277,10 +277,20 @@ static mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) {
     return ret;
 }
 
+// "head" is actually the *exclusive lower bound* of the range to sort. That is,
+// the first element to be sorted is `head[1]`, not `head[0]`. Similarly `tail`
+// is an *inclusive upper bound* of the range to sort. That is, the final
+// element to sort is `tail[0]`, not `tail[-1]`.
+//
+// The pivot element is always chosen as `tail[0]`.
+//
+// These unusual choices allows structuring the partitioning
+// process as a do/while loop, which generates smaller code than the equivalent
+// code with usual C bounds & a while or for loop.
 static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, mp_obj_t binop_less_result) {
     mp_cstack_check();
-    while (head < tail) {
-        mp_obj_t *h = head - 1;
+    while (tail - head > 1) { // So long as at least 2 elements remain
+        mp_obj_t *h = head;
         mp_obj_t *t = tail;
         mp_obj_t v = key_fn == MP_OBJ_NULL ? tail[0] : mp_call_function_1(key_fn, tail[0]); // get pivot using key_fn
         for (;;) {
@@ -291,19 +301,21 @@ static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, mp_obj
             if (h >= t) {
                 break;
             }
+            // A pair of objects must be swapped to the other side of the partition
             mp_obj_t x = h[0];
             h[0] = t[0];
             t[0] = x;
         }
+        // Place the pivot element in the proper position
         mp_obj_t x = h[0];
         h[0] = tail[0];
         tail[0] = x;
         // do the smaller recursive call first, to keep stack within O(log(N))
-        if (t - head < tail - h - 1) {
+        if (t - head < tail - h) {
             mp_quicksort(head, t, key_fn, binop_less_result);
-            head = h + 1;
+            head = h;
         } else {
-            mp_quicksort(h + 1, tail, key_fn, binop_less_result);
+            mp_quicksort(h, tail, key_fn, binop_less_result);
             tail = t;
         }
     }
@@ -327,7 +339,7 @@ mp_obj_t mp_obj_list_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_
     mp_obj_list_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
     if (self->len > 1) {
-        mp_quicksort(self->items, self->items + self->len - 1,
+        mp_quicksort(self->items - 1, self->items + self->len - 1,
             args.key.u_obj == mp_const_none ? MP_OBJ_NULL : args.key.u_obj,
             args.reverse.u_bool ? mp_const_false : mp_const_true);
     }

From 72e67f0f027e6427b14b5cd126d6d9edd832e3d2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 20 Oct 2025 08:52:18 +0200
Subject: [PATCH 3026/3129] samd/machine_bitstream: Tune ticks for SAMD51 and
 set pin to output.

Changes in this commit:
- Change ticks overhead value for SAMD51.  The value was too large and thus
  timing was quite bad.  At 120Mhz it's now within +/- 30ns.
- Set the pin to output mode.  That way, all Pin identifiers are accepted
  as argument, not only Pin objects.

Tested with ItsyBitsy M4 and M0 boards.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 ports/samd/machine_bitstream.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/samd/machine_bitstream.c b/ports/samd/machine_bitstream.c
index 9959d947cb449..e6a50da682dd9 100644
--- a/ports/samd/machine_bitstream.c
+++ b/ports/samd/machine_bitstream.c
@@ -36,7 +36,7 @@
 
 // No cycle counter on M0, do manual cycle counting instead.
 
-// STM32F091 @ 48MHz
+// SAMD21 @ 48MHz
 #define NS_CYCLES_PER_ITER_HIGH (3)
 #define NS_CYCLES_PER_ITER_LOW (3)
 #define NS_OVERHEAD_CYCLES_HIGH (12)
@@ -52,6 +52,7 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
     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;
+    mp_hal_pin_output(pin);
 
     // 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) {
@@ -163,11 +164,12 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
 
 #else // > CORTEX_M0
 
-#define NS_TICKS_OVERHEAD (70)
+#define NS_TICKS_OVERHEAD (40)
 
 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;
+    mp_hal_pin_output(pin);
     // 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;
@@ -191,8 +193,8 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
             mp_hal_pin_high(pin);
             while ((mp_hal_ticks_cpu() - start_ticks) < t[0]) {
             }
-            b <<= 1;
             mp_hal_pin_low(pin);
+            b <<= 1;
             while ((mp_hal_ticks_cpu() - start_ticks) < t[1]) {
             }
         }

From 6773051b5adf9ede2b82ce649717b3f40de29969 Mon Sep 17 00:00:00 2001
From: Craftzman7 <zezetta@icloud.com>
Date: Wed, 15 Oct 2025 16:53:36 -0700
Subject: [PATCH 3027/3129] rp2/boards: Add missing RP2350 RISC-V variants.

There are multiple RP2350 boards missing RISC-V builds.  Some were missing
entries in their `board.json` or a CMake file altogether.  This commit
fixes them.

Signed-off-by: Craftzman7 <zezetta@icloud.com>
---
 ports/rp2/boards/RPI_PICO2_W/board.json                        | 3 +++
 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json    | 3 +++
 .../SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant.cmake      | 1 +
 .../mpconfigvariant_RISCV.cmake                                | 1 +
 ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json        | 3 +++
 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json           | 3 +++
 .../rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant.cmake  | 1 +
 .../SPARKFUN_PROMICRO_RP2350/mpconfigvariant_RISCV.cmake       | 1 +
 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json          | 3 +++
 .../rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant.cmake | 1 +
 .../SPARKFUN_THINGPLUS_RP2350/mpconfigvariant_RISCV.cmake      | 1 +
 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json            | 3 +++
 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant.cmake | 1 +
 .../boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant_RISCV.cmake | 1 +
 14 files changed, 26 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant_RISCV.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant_RISCV.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant_RISCV.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant_RISCV.cmake

diff --git a/ports/rp2/boards/RPI_PICO2_W/board.json b/ports/rp2/boards/RPI_PICO2_W/board.json
index f35ea940a2663..e932fe82f48ea 100644
--- a/ports/rp2/boards/RPI_PICO2_W/board.json
+++ b/ports/rp2/boards/RPI_PICO2_W/board.json
@@ -17,5 +17,8 @@
     "product": "Pico 2 W",
     "thumbnail": "",
     "url": "https://www.raspberrypi.com/products/raspberry-pi-pico-2/",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
     "vendor": "Raspberry Pi"
 }
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
index e65a9462c73c3..231c988dfe731 100644
--- a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/board.json
@@ -21,5 +21,8 @@
     "product": "IoT Node LoRaWAN RP2350",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/26060",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
     "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant.cmake b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_IOTNODE_LORAWAN_RP2350/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json
index a0dd4d835a1bc..2c83fc8349cc6 100644
--- a/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json
+++ b/ports/rp2/boards/SPARKFUN_IOTREDBOARD_RP2350/board.json
@@ -22,5 +22,8 @@
     "product": "SparkFun IoT RedBoard RP2350",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/sparkfun-iot-redboard-rp2350.html",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
     "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
index 8e8b6319007ab..f5dc4f6dcf0d0 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/board.json
@@ -18,5 +18,8 @@
     "product": "Pro Micro RP2350",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/24870",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
     "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant.cmake b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO_RP2350/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
index a6222d7a0def0..9549bfd66bf66 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/board.json
@@ -23,5 +23,8 @@
     "product": "Thing Plus RP2350",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/products/25134",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
     "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant.cmake b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS_RP2350/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
index 6a06c0875bde0..808b7810915d8 100644
--- a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/board.json
@@ -21,5 +21,8 @@
     "product": "XRP Controller",
     "thumbnail": "",
     "url": "https://www.sparkfun.com/sparkfun-experiential-robotics-platform-xrp-controller.html",
+    "variants": {
+        "RISCV": "RISC-V CPU mode"
+    },
     "vendor": "SparkFun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant.cmake b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant.cmake
new file mode 100644
index 0000000000000..6fe039ba51bba
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350")
diff --git a/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant_RISCV.cmake b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant_RISCV.cmake
new file mode 100644
index 0000000000000..65a97fc3350d1
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_XRP_CONTROLLER/mpconfigvariant_RISCV.cmake
@@ -0,0 +1 @@
+set(PICO_PLATFORM "rp2350-riscv")

From 673524f55d8019d612a27c1d69992d061652cbb8 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 24 Sep 2025 09:08:18 +1000
Subject: [PATCH 3028/3129] lib/stm32lib: Update N6, U5 & WB.

Added STM32N6 with HAL1.2.0
Added STM32U5 with HAL1.8.0
Updated STM32WB from HAL1.10.0 to HAL1.23.0

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 lib/stm32lib            | 2 +-
 ports/stm32/mphalport.h | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/stm32lib b/lib/stm32lib
index 8b2bb4ef44fbf..07619754261b5 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 8b2bb4ef44fbfab5075ed9d09e83ddc3754b9257
+Subproject commit 07619754261b571fb2f7c9f36ab94c203880d9fb
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 03b0f8e7722ae..4d98ce9f192a0 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -4,7 +4,7 @@
 
 extern uint8_t mp_hal_unique_id_address[12];
 
-// 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
+// F0-1.9.0+F4-1.16.0+F7-1.7.0+G0-1.5.1+G4-1.3.0+H5-1.0.0+H7-1.11.0+L0-1.11.2+L1-1.10.3+L4-1.17.0+N6-1.2.0+U5-1.8.0+WB-1.23.0+WL-1.1.0
 #if defined(STM32F0)
 #define MICROPY_PLATFORM_VERSION "HAL1.9.0"
 #elif defined(STM32F4)
@@ -25,8 +25,12 @@ extern uint8_t mp_hal_unique_id_address[12];
 #define MICROPY_PLATFORM_VERSION "HAL1.10.3"
 #elif defined(STM32L4)
 #define MICROPY_PLATFORM_VERSION "HAL1.17.0"
+#elif defined(STM32N6)
+#define MICROPY_PLATFORM_VERSION "HAL1.2.0"
+#elif defined(STM32U5)
+#define MICROPY_PLATFORM_VERSION "HAL1.8.0"
 #elif defined(STM32WB)
-#define MICROPY_PLATFORM_VERSION "HAL1.10.0"
+#define MICROPY_PLATFORM_VERSION "HAL1.23.0"
 #elif defined(STM32WL)
 #define MICROPY_PLATFORM_VERSION "HAL1.1.0"
 #endif

From d20d19783d28972367db1fcf1c134f67e5e99dc7 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Tue, 22 Jul 2025 23:17:09 +0900
Subject: [PATCH 3029/3129] stm32: Add STM32U5 support.

This change adds STM32U5 support to the STM32 port.
STM32U5A5ZJ: https://www.st.com/ja/microcontrollers-microprocessors/stm32u5a5zj.html

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/Makefile                         |   4 +-
 ports/stm32/adc.c                            |  53 ++++--
 ports/stm32/adc.h                            |   2 +
 ports/stm32/boards/stm32u5a5_af.csv          | 158 +++++++++++++++++
 ports/stm32/boards/stm32u5a5xj.ld            |  35 ++++
 ports/stm32/boards/stm32u5xx_hal_conf_base.h | 176 +++++++++++++++++++
 ports/stm32/dac.c                            |  16 +-
 ports/stm32/dma.c                            |  65 ++++++-
 ports/stm32/dma.h                            |   6 +-
 ports/stm32/extint.c                         |  46 ++++-
 ports/stm32/extint.h                         |   7 +-
 ports/stm32/flash.c                          |  14 +-
 ports/stm32/i2c.c                            |  16 +-
 ports/stm32/machine_adc.c                    |  32 ++--
 ports/stm32/machine_i2c.c                    |   4 +-
 ports/stm32/machine_uart.c                   |   2 +-
 ports/stm32/mpconfigboard_common.h           |  19 ++
 ports/stm32/mphalport.c                      |   5 +-
 ports/stm32/powerctrl.c                      |  24 ++-
 ports/stm32/pyb_i2c.c                        |  12 +-
 ports/stm32/rtc.c                            |  27 +--
 ports/stm32/spi.c                            |   8 +-
 ports/stm32/stm32.mk                         |   2 +
 ports/stm32/stm32_it.c                       |  36 +++-
 ports/stm32/system_stm32.c                   |  78 +++++++-
 ports/stm32/timer.c                          |  13 +-
 ports/stm32/uart.c                           |  24 ++-
 ports/stm32/usb.c                            |   2 +
 ports/stm32/usbd_conf.c                      |  33 +++-
 29 files changed, 810 insertions(+), 109 deletions(-)
 create mode 100644 ports/stm32/boards/stm32u5a5_af.csv
 create mode 100644 ports/stm32/boards/stm32u5a5xj.ld
 create mode 100644 ports/stm32/boards/stm32u5xx_hal_conf_base.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 3af1d892a031e..8b35c82a27ce5 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -367,7 +367,7 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 l0 l1 l4 n6 wb))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 l0 l1 l4 n6 u5 wb))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_pcd.c \
 	hal_pcd_ex.c \
@@ -408,7 +408,7 @@ $(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno
 endif
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 n6))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h5 h7 n6 u5))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_dma_ex.c \
 	)
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 27f6c5c233e2c..326fc97b25104 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -107,7 +107,7 @@
 #define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 4))
 #define ADC_CAL_BITS            (12)
 
-#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB)
 
 #define ADC_SCALE_V             (((float)VREFINT_CAL_VREF) / 1000.0f)
 #define ADC_CAL_ADDRESS         (VREFINT_CAL_ADDR)
@@ -116,6 +116,8 @@
 
 #if defined(STM32H7)
 #define ADC_CAL_BITS            (16)
+#elif defined(STM32U5)
+#define ADC_CAL_BITS            (14)
 #else
 #define ADC_CAL_BITS            (12) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits'
 #endif
@@ -166,6 +168,8 @@
 #elif defined(STM32N6)
 // ADC2 VINP 16
 #define VBAT_DIV (4)
+#elif defined(STM32U5)
+#define VBAT_DIV (4)
 #else
 #error Unsupported processor
 #endif
@@ -233,6 +237,14 @@ static inline uint32_t adc_get_internal_channel(uint32_t channel) {
     } else if (channel == 18) {
         channel = ADC_CHANNEL_VBAT;
     }
+    #elif defined(STM32U5)
+    if (channel == 0) {
+        channel = ADC_CHANNEL_VREFINT;
+    } else if (channel == 18) {
+        channel = ADC_CHANNEL_VBAT;
+    } else if (channel == 19) {
+        channel = ADC_CHANNEL_TEMPSENSOR;
+    }
     #endif
     return channel;
 }
@@ -247,7 +259,7 @@ static bool is_adcx_channel(int channel) {
     // 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)
+    #elif defined(STM32G0) || defined(STM32H7) || defined(STM32U5)
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
            || IS_ADC_CHANNEL(__HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
     #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
@@ -268,7 +280,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) || defined(STM32L1)
     while ((adcHandle->Instance->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB)
     while (READ_BIT(adcHandle->Instance->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #else
     #error Unsupported processor
@@ -303,6 +315,8 @@ static void adcx_clock_enable(ADC_HandleTypeDef *adch) {
         __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
     }
     __HAL_RCC_ADC_CLK_ENABLE();
+    #elif defined(STM32U5)
+    __HAL_RCC_ADC12_CLK_ENABLE();
     #else
     #error Unsupported processor
     #endif
@@ -353,12 +367,12 @@ static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.LowPowerAutoWait = DISABLE;
     adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
     adch->Init.DMAContinuousRequests = DISABLE;
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32U5) || defined(STM32WB)
     #if defined(STM32G0)
     adch->Init.SamplingTimeCommon1 = ADC_SAMPLETIME_12CYCLES_5;
     adch->Init.SamplingTimeCommon2 = ADC_SAMPLETIME_160CYCLES_5;
     #endif
-    #if defined(STM32G4) || defined(STM32H5)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32U5)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV16;
     #else
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
@@ -369,6 +383,12 @@ static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.OversamplingMode = DISABLE;
     adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
     adch->Init.DMAContinuousRequests = DISABLE;
+    #if defined(STM32U5)
+    adch->Init.GainCompensation = 0;
+    adch->Init.TriggerFrequencyMode = ADC_TRIGGER_FREQ_HIGH;
+    adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
+    adch->Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
+    #endif
     #elif defined(STM32N6)
     adch->Init.GainCompensation = 0;
     adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
@@ -384,7 +404,7 @@ static void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
 
     HAL_ADC_Init(adch);
 
-    #if defined(STM32H7)
+    #if defined(STM32H7) || defined(STM32U5)
     HAL_ADCEx_Calibration_Start(adch, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED);
     #endif
     #if defined(STM32G0)
@@ -415,6 +435,8 @@ static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel) == 0) {
         channel = __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel);
     }
+    #elif defined(STM32U5)
+    sConfig.Rank = ADC_REGULAR_RANK_1;
     #else
     sConfig.Rank = 1;
     #endif
@@ -471,6 +493,15 @@ static void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     sConfig.OffsetSignedSaturation = DISABLE;
     sConfig.OffsetSaturation = DISABLE;
     sConfig.OffsetSign = ADC_OFFSET_SIGN_POSITIVE;
+    #elif defined(STM32U5)
+    if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
+        sConfig.SamplingTime = ADC_SAMPLETIME_391CYCLES_5;
+    } else {
+        sConfig.SamplingTime = ADC4_SAMPLETIME_3CYCLES_5;
+    }
+    sConfig.SingleDiff = ADC_SINGLE_ENDED;
+    sConfig.OffsetNumber = ADC_OFFSET_NONE;
+    sConfig.Offset = 0;
     #else
     #error Unsupported processor
     #endif
@@ -692,7 +723,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) || defined(STM32L1)
             self->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB)
             SET_BIT(self->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -802,7 +833,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) || defined(STM32L1)
             adc->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB)
             SET_BIT(adc->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -953,7 +984,7 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
     return 0.0f; // TODO
     #else
 
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L1) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L1) || defined(STM32L4) || defined(STM32U5)
     // Update the reference correction factor before reading tempsensor
     // because TS_CAL1 and TS_CAL2 of STM32G0,G4,L1,L4 are at VDDA=3.0V
     adc_read_core_vref(adcHandle);
@@ -967,7 +998,7 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
         return 0;
     }
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 100.0f;
-    #elif defined(STM32H5) || defined(STM32WB)
+    #elif defined(STM32H5) || defined(STM32U5) || defined(STM32WB)
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 100.0f;
     #else
@@ -980,7 +1011,7 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
 }
 
 float adc_read_core_vbat(ADC_HandleTypeDef *adcHandle) {
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32U5)
     // Update the reference correction factor before reading tempsensor
     // because VREFINT of STM32G0,G4,L4 is at VDDA=3.0V
     adc_read_core_vref(adcHandle);
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 0adc9ac2be648..96947c3266fb7 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(STM32U5)
+        adc_common = ADC12_COMMON;
         #elif defined(STM32WL)
         adc_common = ADC_COMMON;
         #endif
diff --git a/ports/stm32/boards/stm32u5a5_af.csv b/ports/stm32/boards/stm32u5a5_af.csv
new file mode 100644
index 0000000000000..94afd5aca73ea
--- /dev/null
+++ b/ports/stm32/boards/stm32u5a5_af.csv
@@ -0,0 +1,158 @@
+Port ,Pin ,AF0          ,AF1                ,AF2                           ,AF3                                 ,AF4                                                ,AF5                                                   ,AF6                                                     ,AF7                                                          ,AF8                               ,AF9                                                                  ,AF10                                         ,AF11                                                   ,AF12                                                        ,AF13                                            ,AF14                   ,AF15    ,ADC
+     ,    ,CRS/LPTIM1/SYS_AF,LPTIM1/TIM1/2/5/8,I2C5/6/LPTIM1/2/3/TIM1/2/3/4/5,ADF1/I2C4/OCTOSPIM_P1/OTG_HS/SAI1/SPI2/TIM1/8/USART2,DCMI/I2C1/2/3/4/5/LPTIM3,DCMI/I2C4/MDF1/OCTOSPIM_P1/2/SPI1/2/3,I2C3/MDF1/OCTOSPIM_P2/SPI3,LCD/USART1/2/3/6,HSPI1/LCD/LPUART1/SDMMC1/UART4/5,CAN1/TSC,CRS/DCMI/OCTOSPIM_P1/2/OTG_HS,DSI/FMC/LPGPIO1/SDMMC2/UCPD1,COMP1/2/FMC/SDMMC1/2/SYS_AF,LPTIM2/4/SAI1/2,LPTIM2/3/TIM2/15/16/17,SYS     ,ADC
+PortA,PA0 ,             ,TIM2_CH1           ,TIM5_CH1                      ,TIM8_ETR                            ,                                                   ,,SPI3_RDY                                                ,USART2_CTS,UART4_TX                          ,,OCTOSPIM_P2_NCS,,SDMMC2_CMD,AUDIOCLK,TIM2_ETR               ,EVENTOUT,ADC1_IN5/ADC2_IN5
+PortA,PA1 ,LPTIM1_CH2,TIM2_CH2           ,TIM5_CH2                      ,                                    ,I2C1_SMBA                                          ,SPI1_SCK,,USART2_RTS_DE,UART4_RX                          ,,OCTOSPIM_P1_DQS,LPGPIO1_P0,                                                            ,                                                ,TIM15_CH1N,EVENTOUT,ADC1_IN6/ADC2_IN6
+PortA,PA2 ,             ,TIM2_CH3           ,TIM5_CH3                      ,                                    ,                                                   ,SPI1_RDY,                                                        ,USART2_TX                                                    ,LPUART1_TX,                                                                     ,OCTOSPIM_P1_NCS,UCPD1_FRSTX1,                                                            ,                                                ,TIM15_CH1,EVENTOUT,ADC1_IN7/ADC2_IN7
+PortA,PA3 ,             ,TIM2_CH4           ,TIM5_CH4                      ,SAI1_CK1,                                                   ,,,USART2_RX                                                    ,LPUART1_RX,                                                                     ,OCTOSPIM_P1_CLK,LPGPIO1_P1,                                                            ,SAI1_MCLK_A,TIM15_CH2,EVENTOUT,ADC1_IN8/ADC2_IN8
+PortA,PA4 ,             ,                   ,,OCTOSPIM_P1_NCS,                                                   ,SPI1_NSS,SPI3_NSS,USART2_CK                                                    ,,                                                                     ,DCMI_HSYNC/PSSI_DE,                                                       ,                                                            ,SAI1_FS_B,LPTIM2_CH1,EVENTOUT,ADC1_IN9/ADC2_IN9/ADC4_IN9
+PortA,PA5 ,CSLEEP,TIM2_CH1           ,TIM2_ETR,TIM8_CH1N                           ,PSSI_D14,SPI1_SCK,                                                        ,USART3_RX,,,,,,,LPTIM2_ETR,EVENTOUT,ADC1_IN10/ADC2_IN10/ADC4_IN10
+PortA,PA6 ,CDSTOP,TIM1_BKIN          ,TIM3_CH1                      ,TIM8_BKIN                           ,DCMI_PIXCLK/PSSI_PDCK,SPI1_MISO,,USART3_CTS,LPUART1_CTS,                                                            ,OCTOSPIM_P1_IO3,LPGPIO1_P2,                                                            ,,TIM16_CH1,EVENTOUT,ADC1_IN11/ADC2_IN11/ADC4_IN11
+PortA,PA7 ,SRDSTOP,TIM1_CH1N          ,TIM3_CH2                      ,TIM8_CH1N                           ,I2C3_SCL,SPI1_MOSI,                                                        ,USART3_TX,,                                                            ,OCTOSPIM_P1_IO2,,,LPTIM2_CH2,TIM17_CH1,EVENTOUT,ADC1_IN12/ADC2_IN12/ADC4_IN20
+PortA,PA8 ,MCO,TIM1_CH1           ,                              ,SAI1_CK2,,SPI1_RDY                                              ,                                                        ,USART1_CK                                                    ,                                  ,                                                                     ,OTG_HS_SOF,,TRACECLK,SAI1_SCK_A,LPTIM2_CH1,EVENTOUT,
+PortA,PA9 ,             ,TIM1_CH2           ,                              ,SPI2_SCK,,DCMI_D0/PSSI_D0,                                                        ,USART1_TX                                                    ,,,,,,SAI1_FS_A,TIM15_BKIN,EVENTOUT,
+PortA,PA10,CRS_SYNC,TIM1_CH3           ,LPTIM2_IN2,SAI1_D1,,DCMI_D1/PSSI_D1,,USART1_RX                                                    ,                                  ,,OTG_HS_ID,,,SAI1_SD_A,TIM17_BKIN,EVENTOUT,
+PortA,PA11,             ,TIM1_CH4           ,TIM1_BKIN2,,                                                   ,SPI1_MISO,,USART1_CTS,                                  ,FDCAN1_RX                                                            ,,,,,,EVENTOUT,
+PortA,PA12,             ,TIM1_ETR           ,                              ,,                                                   ,SPI1_MOSI,OCTOSPIM_P2_NCS,USART1_RTS_DE,,FDCAN1_TX                                                            ,,                                                       ,                                                            ,,                       ,EVENTOUT,
+PortA,PA13,JTMS/SWDIO   ,IR_OUT,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,,                                                       ,                                                            ,SAI1_SD_B,                       ,EVENTOUT,
+PortA,PA14,JTCK/SWCLK   ,LPTIM1_CH1,                              ,                                    ,I2C1_SMBA,I2C4_SMBA,                                                        ,                                                             ,                                  ,                                                                     ,OTG_HS_SOF,                                                       ,                                                            ,SAI1_FS_B,                       ,EVENTOUT,
+PortA,PA15,JTDI         ,TIM2_CH1           ,TIM2_ETR,USART2_RX,,SPI1_NSS,SPI3_NSS,USART3_RTS_DE,UART4_RTS_DE,,,,,SAI2_FS_B,,EVENTOUT,
+PortB,PB0 ,             ,TIM1_CH2N          ,TIM3_CH3                      ,TIM8_CH2N,LPTIM3_CH1,SPI1_NSS,,USART3_CK,,                                                                     ,OCTOSPIM_P1_IO1,LPGPIO1_P9,COMP1_OUT,AUDIOCLK,,EVENTOUT,ADC1_IN15/ADC2_IN15/ADC4_IN18
+PortB,PB1 ,             ,TIM1_CH3N          ,TIM3_CH4                      ,TIM8_CH3N,LPTIM3_CH2,                                                      ,MDF1_SDI0,USART3_RTS_DE,LPUART1_RTS_DE,                                                                     ,OCTOSPIM_P1_IO0,LPGPIO1_P3,                                                            ,                                                ,LPTIM2_IN1,EVENTOUT,ADC1_IN16/ADC2_IN16/ADC4_IN19
+PortB,PB2 ,,LPTIM1_CH1,,TIM8_CH4N,I2C3_SMBA,SPI1_RDY,MDF1_CKI0,,LCD_B1,,OCTOSPIM_P1_DQS,UCPD1_FRSTX1,,,                       ,EVENTOUT,ADC1_IN17/ADC2_IN17
+PortB,PB3 ,JTDO/TRACESWO,TIM2_CH2           ,LPTIM1_CH1,ADF1_CCK0,I2C1_SDA,SPI1_SCK,SPI3_SCK,USART1_RTS_DE,,,CRS_SYNC                                     ,LPGPIO1_P11,SDMMC2_D2,SAI1_SCK_B,,EVENTOUT,
+PortB,PB4 ,NJTRST       ,LPTIM1_CH2         ,TIM3_CH1                      ,ADF1_SDI0,I2C3_SDA,SPI1_MISO,SPI3_MISO,USART1_CTS,UART5_RTS_DE,TSC_G2_IO1,DCMI_D12/PSSI_D12,LPGPIO1_P12,SDMMC2_D3,SAI1_MCLK_B,TIM17_BKIN,EVENTOUT,
+PortB,PB5 ,             ,LPTIM1_IN1         ,TIM3_CH2                      ,OCTOSPI1_NCLK,I2C1_SMBA                                          ,SPI1_MOSI,SPI3_MOSI,USART1_CK,UART5_CTS,TSC_G2_IO2,DCMI_D10/PSSI_D10,,COMP2_OUT,SAI1_SD_B,TIM16_BKIN,EVENTOUT,
+PortB,PB6 ,             ,LPTIM1_ETR         ,TIM4_CH1                      ,TIM8_BKIN2,I2C1_SCL                                           ,I2C4_SCL,MDF1_SDI5,USART1_TX                                                    ,,TSC_G2_IO3,DCMI_D5/PSSI_D5,                                                       ,,SAI1_FS_B,TIM16_CH1N,EVENTOUT,
+PortB,PB7 ,             ,LPTIM1_IN2,TIM4_CH2                      ,TIM8_BKIN,I2C1_SDA                                           ,I2C4_SDA,MDF1_CKI5,USART1_RX                                                    ,UART4_CTS,TSC_G2_IO4,DCMI_VSYNC/PSSI_RDY,,FMC_NL,,TIM17_CH1N,EVENTOUT,
+PortB,PB8 ,             ,                   ,TIM4_CH3                      ,SAI1_CK1,I2C1_SCL                                           ,MDF1_CCK0,SPI3_RDY,LCD_B1,SDMMC1_CKIN,FDCAN1_RX                                                            ,DCMI_D6/PSSI_D6,SDMMC2_D4,SDMMC1_D4,SAI1_MCLK_A,TIM16_CH1,EVENTOUT,
+PortB,PB9 ,             ,IR_OUT             ,TIM4_CH4                      ,SAI1_D2,I2C1_SDA                                           ,SPI2_NSS,,,SDMMC1_CDIR,FDCAN1_TX                                                            ,DCMI_D7/PSSI_D7,SDMMC2_D5,SDMMC1_D5,SAI1_FS_A,TIM17_CH1,EVENTOUT,
+PortB,PB10,             ,TIM2_CH3           ,LPTIM3_CH1                    ,I2C4_SCL,I2C2_SCL                                           ,SPI2_SCK,                                                        ,USART3_TX                                                    ,LPUART1_RX,TSC_SYNC,OCTOSPIM_P1_CLK,LPGPIO1_P4,COMP1_OUT,SAI1_SCK_A,                       ,EVENTOUT,
+PortB,PB11,             ,TIM2_CH4           ,                              ,I2C4_SDA,I2C2_SDA                                           ,SPI2_RDY                                              ,,USART3_RX                                                    ,LPUART1_TX,                                                                     ,OCTOSPIM_P1_NCS,,COMP2_OUT,                                                ,                       ,EVENTOUT,
+PortB,PB12,             ,TIM1_BKIN          ,I2C6_SMBA,,I2C2_SMBA,SPI2_NSS,MDF1_SDI1,USART3_CK                                                    ,LPUART1_RTS_DE,TSC_G1_IO1,OCTOSPIM_P1_NCLK,,                                                            ,SAI2_FS_A,TIM15_BKIN,EVENTOUT,
+PortB,PB13,             ,TIM1_CH1N          ,LPTIM3_IN1                    ,,I2C2_SCL,SPI2_SCK,MDF1_CKI1,USART3_CTS,LPUART1_CTS,TSC_G1_IO2,,,,SAI2_SCK_A,TIM15_CH1N,EVENTOUT,
+PortB,PB14,             ,TIM1_CH2N          ,LPTIM3_ETR,TIM8_CH2N,I2C2_SDA,SPI2_MISO,MDF1_SDI2,USART3_RTS_DE,,TSC_G1_IO3,                                             ,                                                       ,SDMMC2_D0,SAI2_MCLK_A,TIM15_CH1,EVENTOUT,
+PortB,PB15,RTC_REFIN    ,TIM1_CH3N          ,LPTIM2_IN2,TIM8_CH3N                           ,                                          ,SPI2_MOSI,MDF1_CKI2,,,,,FMC_NBL1,SDMMC2_D1,SAI2_SD_A,TIM15_CH2,EVENTOUT,
+PortC,PC0 ,             ,LPTIM1_IN1         ,                              ,OCTOSPIM_P1_IO7,I2C3_SCL,SPI2_RDY,MDF1_SDI4,USART6_CTS,LPUART1_RX,,,,SDMMC1_D5,SAI2_FS_A,LPTIM2_IN1,EVENTOUT,ADC1_IN1/ADC2_IN1/ADC4_IN1
+PortC,PC1 ,TRACED0      ,LPTIM1_CH1,,SPI2_MOSI,I2C3_SDA,,MDF1_CKI4,USART6_CK,LPUART1_TX,,OCTOSPIM_P1_IO4,,SDMMC2_CK,SAI1_SD_A,                       ,EVENTOUT,ADC1_IN2/ADC2_IN2/ADC4_IN2
+PortC,PC2 ,,LPTIM1_IN2          ,,                                    ,                                                  ,SPI2_MISO,MDF1_CCK1,USART6_RX,                                  ,,OCTOSPIM_P1_IO5,LPGPIO1_P5,,                                                ,                       ,EVENTOUT,ADC1_IN3/ADC2_IN3/ADC4_IN3
+PortC,PC3 ,,LPTIM1_ETR,LPTIM3_CH1,SAI1_D1,                                                   ,SPI2_MOSI,,USART6_TX,                                  ,,OCTOSPIM_P1_IO6,,,SAI1_SD_A,LPTIM2_ETR,EVENTOUT,
+PortC,PC4 ,             ,,I2C6_SMBA,,,,,USART3_RX                                                    ,                                  ,                                                                     ,OCTOSPIM_P1_IO7,,,,                       ,EVENTOUT,ADC1_IN13/ADC2_IN13/ADC4_IN22
+PortC,PC5 ,             ,TIM1_CH4N          ,,SAI1_D3,PSSI_D15,                                                      ,,USART3_RX,,,,,,,,EVENTOUT,ADC1_IN14/ADC2_IN14/ADC4_IN23
+PortC,PC6 ,CSLEEP,                   ,TIM3_CH1,TIM8_CH1                            ,                                                   ,,MDF1_CKI3,LCD_R0,SDMMC1_D0DIR                      ,TSC_G4_IO1,DCMI_D0/PSSI_D0,SDMMC2_D6,SDMMC1_D6,SAI2_MCLK_A,                       ,EVENTOUT,
+PortC,PC7 ,CDSTOP,                   ,TIM3_CH2                      ,TIM8_CH2                            ,                                                   ,                                                      ,MDF1_SDI3,LCD_R1,SDMMC1_D123DIR                    ,TSC_G4_IO2,DCMI_D1/PSSI_D1,SDMMC2_D7,SDMMC1_D7,SAI2_MCLK_B,LPTIM2_CH2,EVENTOUT,
+PortC,PC8 ,SRDSTOP,                   ,TIM3_CH3                      ,TIM8_CH3                            ,                                                   ,                                                      ,                                                        ,USART6_RX,,TSC_G4_IO3,DCMI_D2/PSSI_D2,,SDMMC1_D0                                                   ,,LPTIM3_CH1,EVENTOUT,
+PortC,PC9 ,TRACED0,TIM8_BKIN2,TIM3_CH4                      ,TIM8_CH4                            ,DCMI_D3/PSSI_D3,,                                                        ,USART6_TX,,TSC_G4_IO4,,,SDMMC1_D1                                                   ,,LPTIM3_CH2,EVENTOUT,
+PortC,PC10,TRACED1,                   ,LPTIM3_ETR                    ,ADF1_CCK1,                                                   ,                                                      ,SPI3_SCK,USART3_TX                                                    ,UART4_TX                          ,TSC_G3_IO2,DCMI_D8/PSSI_D8,LPGPIO1_P8,SDMMC1_D2                                                   ,SAI2_SCK_B,                       ,EVENTOUT,
+PortC,PC11,             ,                   ,LPTIM3_IN1                    ,ADF1_SDI0,DCMI_D2/PSSI_D2,OCTOSPIM_P1_NCS,SPI3_MISO,USART3_RX                                                    ,UART4_RX                          ,TSC_G3_IO3,DCMI_D4/PSSI_D4,UCPD1_FRSTX2,SDMMC1_D3                                                   ,SAI2_MCLK_B,                       ,EVENTOUT,
+PortC,PC12,TRACED3      ,                   ,                              ,                                    ,                                                   ,,SPI3_MOSI,USART3_CK                                                    ,UART5_TX                          ,TSC_G3_IO4,DCMI_D9/PSSI_D9,LPGPIO1_P10,SAI2_SD_B,,                       ,EVENTOUT,
+PortC,PC13,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,,,,,,,,EVENTOUT,
+PortC,PC14,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,,,,,,,,EVENTOUT,
+PortC,PC15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,,,,,,,,EVENTOUT,
+PortD,PD0 ,             ,                   ,I2C6_SDA,TIM8_CH4N                           ,I2C5_SDA,SPI2_NSS                                                      ,                                                        ,                                                             ,LCD_B4,FDCAN1_RX                                                            ,                                             ,,FMC_D2,                                                ,                       ,EVENTOUT,
+PortD,PD1 ,             ,                   ,I2C6_SCL,,I2C5_SCL,SPI2_SCK,                                                        ,                                                             ,LCD_B5,FDCAN1_TX                                                            ,                                             ,                                                       ,FMC_D3,                                                ,                       ,EVENTOUT,
+PortD,PD2 ,TRACED2      ,                   ,TIM3_ETR                      ,                                    ,I2C5_SMBA,                                                      ,                                                        ,USART3_RTS_DE,UART5_RX                          ,TSC_SYNC,DCMI_D11/PSSI_D11,LPGPIO1_P7,SDMMC1_CMD                                                  ,LPTIM4_ETR,,EVENTOUT,
+PortD,PD3 ,             ,                   ,I2C6_SMBA,SPI2_SCK,DCMI_D5/PSSI_D5,SPI2_MISO                                      ,MDF1_SDI0,USART2_CTS,LCD_CLK,                                                                     ,OCTOSPIM_P2_NCS,                                                       ,FMC_CLK                                                     ,,                       ,EVENTOUT,
+PortD,PD4 ,             ,                   ,                              ,                                    ,                                                   ,SPI2_MOSI,MDF1_CKI0,USART2_RTS_DE,                                  ,                                                                     ,OCTOSPIM_P1_IO4,                                                       ,FMC_NOE                                                     ,                                                ,                       ,EVENTOUT,
+PortD,PD5 ,             ,,                              ,                                    ,                                                   ,SPI2_RDY                                              ,                                                        ,USART2_TX                                                    ,                                  ,,OCTOSPIM_P1_IO5,                                                       ,FMC_NWE                                                     ,                                                ,                       ,EVENTOUT,
+PortD,PD6 ,             ,                   ,,SAI1_D1,DCMI_D10/PSSI_D10,SPI3_MOSI,MDF1_SDI1,USART2_RX                                                    ,LCD_DE,                                                                     ,OCTOSPIM_P1_IO6,SDMMC2_CK                                              ,FMC_NWAIT                                                   ,SAI1_SD_A,                       ,EVENTOUT,
+PortD,PD7 ,             ,                   ,                              ,                                    ,                                                   ,SPI1_MOSI/I2S1_SDO                                    ,                                                        ,USART2_CK                                                    ,                                  ,                                                                     ,OCTOSPIM_P1_IO7,SDMMC2_CMD                                             ,FMC_NCE/FMC_NE1                                       ,LPTIM4_OUT,,EVENTOUT,
+PortD,PD8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_TX                                                    ,LCD_R3,                                                                     ,DCMI_HSYNC/PSSI_DE,                                                       ,FMC_D13,                                                ,                       ,EVENTOUT,
+PortD,PD9 ,             ,                   ,LPTIM2_IN2,                                    ,                                                   ,                                                      ,                                                        ,USART3_RX                                                    ,LCD_R4,,DCMI_PIXCLK/PSSI_PDCK,                                                       ,FMC_D14,SAI2_MCLK_A,LPTIM3_IN1,EVENTOUT,
+PortD,PD10,             ,                   ,LPTIM2_CH2,,I2C5_SMBA,                                                      ,                                                        ,USART3_CK                                                    ,LCD_R5,TSC_G6_IO1,                                             ,                                                       ,FMC_D15,SAI2_SCK_A,LPTIM3_ETR,EVENTOUT,
+PortD,PD11,             ,                   ,,,I2C4_SMBA                                          ,                                                      ,                                                        ,USART3_CTS,LCD_R6,TSC_G6_IO2,,                                                       ,FMC_A16/FMC_CLE,SAI2_SD_A,LPTIM2_ETR,EVENTOUT,ADC4_IN15
+PortD,PD12,             ,,TIM4_CH1                      ,,I2C4_SCL                                           ,,,USART3_RTS_DE,LCD_R7,TSC_G6_IO3,,,FMC_ALE/FMC_A17,SAI2_FS_A,LPTIM2_IN1,EVENTOUT,ADC4_IN16
+PortD,PD13,             ,,TIM4_CH2                      ,,I2C4_SDA                                           ,,                                                        ,USART6_CTS,LCD_VSYNC,TSC_G6_IO4,,LPGPIO1_P6,FMC_A18                                                     ,LPTIM4_IN1,LPTIM2_CH1,EVENTOUT,ADC4_IN17
+PortD,PD14,             ,                   ,TIM4_CH3                      ,                                    ,                                                   ,                                                      ,                                                        ,USART6_CK,LCD_B2,,,,FMC_D0,                                                ,LPTIM3_CH1,EVENTOUT,
+PortD,PD15,             ,                   ,TIM4_CH4                      ,                                    ,                                                   ,                                                      ,                                                        ,USART6_RTS_DE,LCD_B3,                                                                     ,                                             ,,FMC_D1,                                                ,LPTIM3_CH2,EVENTOUT,
+PortE,PE0 ,             ,,TIM4_ETR                      ,,,,,USART6_RX,LCD_HSYNC,,DCMI_D2/PSSI_D2,LPGPIO1_P13,FMC_NBL0                                                    ,,TIM16_CH1,EVENTOUT,
+PortE,PE1 ,             ,,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART6_TX,LCD_VSYNC,,DCMI_D3/PSSI_D3,                                                       ,FMC_NBL1                                                    ,,TIM17_CH1,EVENTOUT,
+PortE,PE2 ,TRACECLK     ,,TIM3_ETR,SAI1_CK1          ,                                                   ,,,USART6_CK,LCD_R0,TSC_G7_IO1,                                             ,LPGPIO1_P14,FMC_A23                                                     ,SAI1_MCLK_A,                       ,EVENTOUT,
+PortE,PE3 ,TRACED0      ,                   ,TIM3_CH1,OCTOSPIM_P1_DQS,                                         ,                                                      ,,USART6_CTS,LCD_R1,TSC_G7_IO2,                                             ,LPGPIO1_P15,FMC_A19                                                     ,SAI1_SD_B,                       ,EVENTOUT,
+PortE,PE4 ,TRACED1      ,                   ,TIM3_CH2,SAI1_D2,                                         ,,MDF1_SDI3,USART6_RTS_DE,LCD_B0,TSC_G7_IO3,DCMI_D4/PSSI_D4,                                                       ,FMC_A20                                                     ,SAI1_FS_A,                       ,EVENTOUT,
+PortE,PE5 ,TRACED2      ,                   ,TIM3_CH3,SAI1_CK2,                                          ,,MDF1_CKI3,                                                             ,LCD_G0,TSC_G7_IO4,DCMI_D6/PSSI_D6,                                                       ,FMC_A21                                                     ,SAI1_SCK_A,                       ,EVENTOUT,
+PortE,PE6 ,TRACED3      ,,TIM3_CH4,SAI1_D1,                                          ,,,                                                             ,LCD_G1,                                                                     ,DCMI_D7/PSSI_D7,                                                       ,FMC_A22                                                     ,SAI1_SD_A,                       ,EVENTOUT,
+PortE,PE7 ,             ,TIM1_ETR           ,                              ,                                    ,                                                   ,                                                      ,MDF1_SDI2,,LCD_B6,                                                                     ,,                                                       ,FMC_D4,SAI1_SD_B,                       ,EVENTOUT,
+PortE,PE8 ,             ,TIM1_CH1N          ,                              ,                                    ,                                                   ,                                                      ,MDF1_CKI2,,LCD_B7,                                                                     ,,                                                       ,FMC_D5,SAI1_SCK_B,                       ,EVENTOUT,
+PortE,PE9 ,             ,TIM1_CH1           ,                              ,ADF1_CCK0,                                                   ,                                                      ,MDF1_CCK0,,LCD_G2,                                                                     ,OCTOSPIM_P1_NCLK,                                                       ,FMC_D6,SAI1_FS_B,                       ,EVENTOUT,
+PortE,PE10,             ,TIM1_CH2N          ,                              ,ADF1_SDI0,                                                   ,                                                      ,MDF1_SDI4,,LCD_G3,TSC_G5_IO1,OCTOSPIM_P1_CLK,                                                       ,FMC_D7,SAI1_MCLK_B,                       ,EVENTOUT,
+PortE,PE11,             ,TIM1_CH2           ,                              ,                                    ,,SPI1_RDY,MDF1_CKI4,,LCD_G4,TSC_G5_IO2,OCTOSPIM_P1_NCS,                                                       ,FMC_D8,                                                ,                       ,EVENTOUT,
+PortE,PE12,             ,TIM1_CH3N          ,                              ,                                    ,                                                   ,SPI1_NSS,MDF1_SDI5,                                                             ,LCD_G5,TSC_G5_IO3,OCTOSPIM_P1_IO0,                                                       ,FMC_D9,                                                ,                       ,EVENTOUT,
+PortE,PE13,             ,TIM1_CH3           ,                              ,                                    ,                                                   ,SPI1_SCK,MDF1_CKI5,                                                             ,LCD_G6,TSC_G5_IO4,OCTOSPIM_P1_IO1,                                                       ,FMC_D10,                                                ,                       ,EVENTOUT,
+PortE,PE14,             ,TIM1_CH4           ,TIM1_BKIN2,                                    ,                                                   ,SPI1_MISO,                                                        ,                                                             ,LCD_G7,                                                                     ,OCTOSPIM_P1_IO2,                                                       ,FMC_D11,                                                ,                       ,EVENTOUT,
+PortE,PE15,             ,TIM1_BKIN          ,                              ,TIM1_CH4N,                                                   ,SPI1_MOSI,                                                        ,,LCD_R2,                                                                     ,OCTOSPIM_P1_IO3,                                                       ,FMC_D12,                                                ,                       ,EVENTOUT,
+PortF,PF0 ,             ,                   ,I2C6_SDA,                                    ,I2C2_SDA,OCTOSPIM_P2_IO0,                                                        ,USART6_TX,                                  ,                                                                     ,                                             ,                                                       ,FMC_A0                                                      ,,                       ,EVENTOUT,
+PortF,PF1 ,             ,                   ,I2C6_SCL,                                    ,I2C2_SCL                                           ,OCTOSPIM_P2_IO1,                                                        ,USART6_RX,                                  ,                                                                     ,                                             ,                                                       ,FMC_A1                                                      ,,                       ,EVENTOUT,
+PortF,PF2 ,             ,                   ,LPTIM3_CH2                    ,,I2C2_SMBA                                          ,OCTOSPIM_P2_IO2,,USART6_CK,                                  ,                                                                     ,                                             ,                                                       ,FMC_A2                                                      ,,                       ,EVENTOUT,
+PortF,PF3 ,             ,                   ,LPTIM3_IN1                    ,ADF1_CCK0,                                                   ,OCTOSPIM_P2_IO3,MDF1_CCK0,USART6_CTS,UART5_TX,                                                                     ,                                             ,                                                       ,FMC_A3                                                      ,,                       ,EVENTOUT,
+PortF,PF4 ,             ,                   ,LPTIM3_ETR                    ,ADF1_SDI0,                                                   ,OCTOSPIM_P2_CLK,MDF1_SDI0,USART6_RTS_DE,UART5_RX,                                                                     ,                                             ,                                                       ,FMC_A4                                                      ,                                                ,                       ,EVENTOUT,
+PortF,PF5 ,             ,                   ,LPTIM3_CH1                    ,                                    ,,OCTOSPIM_P2_NCLK,MDF1_CKI0,,                                  ,                                                                     ,                                             ,                                                       ,FMC_A5                                                      ,                                                ,,EVENTOUT,
+PortF,PF6 ,             ,TIM5_ETR          ,TIM5_CH1,                                    ,DCMI_D12/PSSI_D12,OCTOSPIM_P2_NCS,,,                                  ,                                                                     ,OCTOSPIM_P1_IO3,                                                       ,                                                            ,SAI1_SD_B,                       ,EVENTOUT,
+PortF,PF7 ,             ,          ,TIM5_CH2,,,,,,                                  ,FDCAN1_RX,OCTOSPIM_P1_IO2,                                                       ,                                                            ,SAI1_MCLK_B,                       ,EVENTOUT,
+PortF,PF8 ,             ,         ,TIM5_CH3,                                    ,PSSI_D14,,,,                                  ,FDCAN1_TX,OCTOSPIM_P1_IO0,                                                       ,                                                            ,SAI1_SCK_B,                       ,EVENTOUT,
+PortF,PF9 ,             ,         ,TIM5_CH4,                                    ,PSSI_D15,,,,                                  ,                                                            ,OCTOSPIM_P1_IO1,                                                       ,                                                            ,SAI1_FS_B,TIM15_CH1,EVENTOUT,
+PortF,PF10,             ,         ,,OCTOSPIM_P1_CLK,PSSI_D15                                           ,                                                      ,MDF1_CCK1,                                                             ,                                  ,,DCMI_D11/PSSI_D11,DSI_TE,                                                            ,SAI1_D3,TIM15_CH2,EVENTOUT,
+PortF,PF11,             ,                   ,                              ,OCTOSPIM_P1_NCLK,                                                   ,,                                                        ,                                                             ,LCD_DE,,DCMI_D12/PSSI_D12,DSI_TE,,LPTIM4_IN1,,EVENTOUT,ADC1_INP2
+PortF,PF12,             ,                   ,                              ,                                    ,                                                   ,OCTOSPIM_P2_,                                                        ,                                                             ,LCD_B0,                                                                     ,                                             ,                                                       ,FMC_A6                                                      ,LPTIM4_ETR,,EVENTOUT,ADC1_INP6/ADC1_INN2
+PortF,PF13,             ,                   ,                              ,                                    ,I2C4_SMBA                                          ,                                                      ,                                                        ,                                                             ,LCD_B1,                                                                     ,                                             ,UCPD1_FRSTX2,FMC_A7                                                      ,LPTIM4_OUT,,EVENTOUT,ADC2_INP2
+PortF,PF14,             ,                   ,                              ,                                    ,I2C4_SCL,                                                      ,                                                        ,                                                             ,LCD_G0,TSC_G8_IO1,                                             ,                                                       ,FMC_A8                                                      ,                                                ,,EVENTOUT,ADC4_IN5
+PortF,PF15,             ,                   ,                              ,                                    ,I2C4_SDA                                           ,,                                                        ,                                                             ,LCD_G1,TSC_G8_IO2,                                             ,,FMC_A9                                                      ,                                                ,,EVENTOUT,ADC4_IN6
+PortG,PG0 ,             ,                   ,                              ,                                    ,                                                   ,OCTOSPIM_P2_IO4,                                                        ,                                                             ,                                  ,TSC_G8_IO3,                                             ,,FMC_A10                                                     ,                                                ,,EVENTOUT,ADC4_IN7
+PortG,PG1 ,             ,                   ,                              ,                                    ,                                                   ,OCTOSPIM_P2_IO5,                                                        ,,                                  ,TSC_G8_IO4,                                             ,,FMC_A11                                                     ,                                                ,                       ,EVENTOUT,ADC4_IN8
+PortG,PG2 ,,,,,,SPI1_SCK,                                                        ,,                                  ,                                                                     ,                                             ,,FMC_A12                                                     ,SAI2_SCK_B,,EVENTOUT,
+PortG,PG3 ,,,,,,SPI1_MISO,                                                        ,,                                  ,                                                                     ,                                             ,,FMC_A13                                                     ,SAI2_FS_B,,EVENTOUT,
+PortG,PG4 ,,,,,,SPI1_MOSI,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,FMC_A11                                                     ,SAI2_MCLK_B,,EVENTOUT,
+PortG,PG5 ,,,,,,SPI1_NSS,                                                        ,                                                             ,LPUART1_CTS,                                                                     ,,DSI_TE,FMC_A12                                                     ,SAI2_SD_B,                       ,EVENTOUT,
+PortG,PG6 ,             ,         ,                              ,OCTOSPIM_P1_DQS,I2C3_SMBA,SPI1_RDY                                              ,                                                        ,LCD_R1,LPUART1_RTS_DE,                                                                     ,,UCPD1_FRSTX1,,,                       ,EVENTOUT,
+PortG,PG7 ,             ,                   ,,SAI1_CK1,I2C3_SCL,OCTOSPIM_P2_DQS,MDF1_CCK0,,LPUART1_TX,                                                                     ,                                             ,UCPD1_FRSTX2,FMC_INT                                                     ,SAI1_MCLK_A,                       ,EVENTOUT,
+PortG,PG8 ,             ,                   ,                              ,,I2C3_SDA,,                                                        ,,LPUART1_RX,,,,,,                       ,EVENTOUT,
+PortG,PG9 ,             ,                   ,                              ,                                    ,                                                   ,OCTOSPIM_P2_IO6,SPI3_SCK,USART1_TX,,,,,FMC_NCE/FMC_NE2,SAI2_SCK_A,TIM15_CH1N,EVENTOUT,
+PortG,PG10,             ,LPTIM1_IN1,                              ,                                    ,                                                   ,OCTOSPIM_P2_IO7,SPI3_MISO,USART1_RX,,,,,FMC_NE3                                                     ,SAI2_FS_A,TIM15_CH1,EVENTOUT,
+PortG,PG11,             ,LPTIM1_IN2         ,                              ,OCTOSPIM_P1_IO5,                                                   ,,SPI3_MOSI,USART1_CTS,,,,,,SAI2_MCLK_A,TIM15_CH2,EVENTOUT,
+PortG,PG12,,LPTIM1_ETR,                              ,                                    ,,OCTOSPIM_P2_NCS,SPI3_NSS,USART1_RTS_DE,                                  ,                                                                     ,,,FMC_NE4                                                     ,SAI2_SD_A,,EVENTOUT,
+PortG,PG13,,,                              ,                                    ,I2C1_SDA,,SPI3_RDY,USART1_CK,LCD_R0,                                                                     ,,,FMC_A24                                                     ,,                       ,EVENTOUT,
+PortG,PG14,,LPTIM1_CH2,                              ,                                    ,I2C1_SCL,,,,LCD_R1,,,,FMC_A25                                                     ,,                       ,EVENTOUT,
+PortG,PG15,,LPTIM1_CH1,                              ,                                    ,I2C1_SMBA,OCTOSPIM_P2_DQS,,,                                  ,DCMI_D13/PSSI_D13,,,,,                       ,EVENTOUT,
+PortH,PH0 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,,,,,,,,EVENTOUT,
+PortH,PH1 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,,,,,,,,,EVENTOUT,
+PortH,PH2 ,             ,,                              ,OCTOSPIM_P1_IO4,                                                   ,                                                      ,                                                        ,,,,,,,,,EVENTOUT,
+PortH,PH3 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,,,,,,,,,EVENTOUT,
+PortH,PH4 ,             ,,I2C5_SDA,                                    ,I2C2_SCL,OCTOSPIM_P2_DQS,                                                        ,,                                  ,                                                                     ,PSSI_D14,,,,,EVENTOUT,
+PortH,PH5 ,             ,,I2C5_SCL,                                    ,I2C2_SDA,,                                                        ,,                                  ,                                                                     ,DCMI_PIXCLK/PSSI_PDCK,,,,,EVENTOUT,
+PortH,PH6 ,             ,,I2C5_SMBA,,I2C2_SMBA                                          ,OCTOSPIM_P2_CLK,                                                        ,,                                  ,                                                                     ,DCMI_D8/PSSI_D8,,,,,EVENTOUT,
+PortH,PH7 ,             ,,,,I2C3_SCL                                           ,OCTOSPIM_P2_NCLK,                                                        ,,                                  ,                                                                     ,DCMI_D9/PSSI_D9,,,,,EVENTOUT,
+PortH,PH8 ,             ,,,,I2C3_SDA                                           ,OCTOSPIM_P2_IO3,                                                        ,,                                  ,                                                                     ,DCMI_HSYNC/PSSI_DE,,,,,EVENTOUT,
+PortH,PH9 ,             ,,                     ,,I2C3_SMBA                                          ,OCTOSPIM_P2_IO4,                                                        ,                                                             ,HSPI1_NCS,                                                                     ,DCMI_D0/PSSI_D0,,,,,EVENTOUT,
+PortH,PH10,             ,,TIM5_CH1                      ,,,OCTOSPIM_P2_IO5,                                                        ,                                                             ,HSPI1_IO0,                                                                     ,DCMI_D1/PSSI_D1,,,,,EVENTOUT,
+PortH,PH11,             ,,TIM5_CH2                      ,,,OCTOSPIM_P2_IO6,                                                        ,                                                             ,HSPI1_IO1,                                                                     ,DCMI_D2/PSSI_D2,,,,,EVENTOUT,
+PortH,PH12,             ,,TIM5_CH3                      ,TIM8_CH4N,,OCTOSPIM_P2_IO7,                                                        ,                                                             ,HSPI1_IO2,                                                                     ,DCMI_D3/PSSI_D3,,,,,EVENTOUT,
+PortH,PH13,             ,,                              ,TIM8_CH1N                           ,                                                   ,                                                      ,                                                        ,,HSPI1_IO3,FDCAN1_TX                                                            ,                                             ,,,,,EVENTOUT,
+PortH,PH14,             ,,                              ,TIM8_CH2N                           ,                                                   ,                                                      ,                                                        ,                                                             ,HSPI1_IO4,FDCAN1_RX                                                            ,DCMI_D4/PSSI_D4,,,,,EVENTOUT,
+PortH,PH15,             ,,                              ,TIM8_CH3N                           ,                                                   ,OCTOSPIM_P2_IO6,                                                        ,                                                             ,HSPI1_IO5,                                                                     ,DCMI_D11/PSSI_D11,,,,,EVENTOUT,
+PortI,PI0 ,             ,                   ,TIM5_CH4                      ,OCTOSPIM_P1_IO5,                                                   ,SPI2_NSS,                                                        ,                                                             ,HSPI1_IO6,                                                                     ,DCMI_D13/PSSI_D13,,,,,EVENTOUT,
+PortI,PI1 ,,,,,,SPI2_SCK,OCTOSPIM_P2_IO2,                                                             ,HSPI1_IO7,                                                                     ,DCMI_D8/PSSI_D8,,,,,EVENTOUT,
+PortI,PI2 ,             ,                   ,                              ,TIM8_CH4                            ,                                                   ,SPI2_MISO,OCTOSPIM_P2_IO1,                                                             ,HSPI1_DQS0,                                                                     ,DCMI_D9/PSSI_D9,,,,,EVENTOUT,
+PortI,PI3 ,             ,                   ,                              ,TIM8_ETR                            ,                                                   ,SPI2_MOSI,OCTOSPIM_P2_IO0,                                                             ,HSPI1_CLK,                                                                     ,DCMI_D10/PSSI_D10,,,,,EVENTOUT,
+PortI,PI4 ,             ,                   ,                              ,TIM8_BKIN                           ,                                                   ,SPI2_RDY,                                                        ,                                                     ,HSPI1_NCLK,                                                                     ,DCMI_D5/PSSI_D5,,,,,EVENTOUT,
+PortI,PI5 ,             ,                   ,                              ,TIM8_CH1                            ,                                                   ,OCTOSPIM_P2_NCS,                                                        ,                                                             ,                                  ,                                                                     ,DCMI_VSYNC/PSSI_RDY,,,,,EVENTOUT,
+PortI,PI6 ,             ,                   ,                              ,TIM8_CH2                            ,                                                   ,OCTOSPIM_P2_CLK,                                                        ,                                                             ,                                  ,                                                                     ,DCMI_D6/PSSI_D6,,,,,EVENTOUT,
+PortI,PI7 ,             ,                   ,                              ,TIM8_CH3                            ,                                                   ,OCTOSPIM_P2_NCLK,                                                        ,                                                             ,                                  ,                                                                     ,DCMI_D7/PSSI_D7,,,,,EVENTOUT,
+PortI,PI8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,HSPI1_DQS1,,                                             ,,,,,EVENTOUT,
+PortI,PI9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,HSPI1_IO8,,                                             ,,,,,EVENTOUT,
+PortI,PI10,PI11,PI12,PI13,PI14,PI15,PI16,PI17,PI18,HSPI1_IO9,,                                             ,,,,,EVENTOUT,
+PortI,PI11,PI12,PI13,PI14,PI15,PI16,PI17,PI18,PI19,HSPI1_IO10,,                                             ,,,,,EVENTOUT,
+PortI,PI12,,,,,,,,,HSPI1_IO11,,,,,,,EVENTOUT,
+PortI,PI13,,,,,,,,,HSPI1_IO12,,,,,,,EVENTOUT,
+PortI,PI14,,,,,,,,,HSPI1_IO13,,,,,,,EVENTOUT,
+PortI,PI15,,,,,,,,,HSPI1_IO14,,,,,,,EVENTOUT,
+PortJ,PJ0,,,,,I2C5_SMBA,,,,HSPI1_IO15,,,,,,,EVENTOUT,
+PortJ,PJ1,,,,,I2C5_SDA,,,,,,,,,,,EVENTOUT,
+PortJ,PJ2,,,,,I2C5_SCL,,,,,,,,,,,EVENTOUT,
+PortJ,PJ3,,,,,,,,USART6_TX,,,,,,,,EVENTOUT,
+PortJ,PJ4,,,,,,,,USART6_RX,,,,,,,,EVENTOUT,
+PortJ,PJ5,,,,,,,,USART6_RTS_DE,,,,,,,,EVENTOUT,
+PortJ,PJ6,,,,,,,,USART6_CK,,,,,,,,EVENTOUT,
+PortJ,PJ7,,,,,,,,USART6_CK,,,,,,,,EVENTOUT,
+PortJ,PJ8,,,I2C6_SMBA,,,,,,,,,,,,,EVENTOUT,
+PortJ,PJ9,,,I2C6_SDA,,,,,,,,,,,,,EVENTOUT,
+PortJ,PJ10,,,I2C6_SCL,,,,,,,,,,,,,EVENTOUT,
+PortJ,PJ11,,,,,,,,,,,,,,,,EVENTOUT,
diff --git a/ports/stm32/boards/stm32u5a5xj.ld b/ports/stm32/boards/stm32u5a5xj.ld
new file mode 100644
index 0000000000000..356482e9f7ada
--- /dev/null
+++ b/ports/stm32/boards/stm32u5a5xj.ld
@@ -0,0 +1,35 @@
+/*
+    GNU linker script for STM32U5A5xJ
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 4096K
+    FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 992K    /* sectors 4-127 (for common_bl.ld) */
+    FLASH_FS (rx)   : ORIGIN = 0x08100000, LENGTH = 1024K   /* sectors 128-255 */
+    RAM   (xrw)     : ORIGIN = 0x20000000, LENGTH = 2496K   /* SRAM1/2/3/5: 2496KB */
+    SRAM4 (xrw)     : ORIGIN = 0x28000000, LENGTH = 16K
+    FS_CACHE (xrw)  : ORIGIN = 0x28000000, LENGTH = 8K
+}
+
+/* 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;
+
+/* 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/stm32u5xx_hal_conf_base.h b/ports/stm32/boards/stm32u5xx_hal_conf_base.h
new file mode 100644
index 0000000000000..be7ea524639ec
--- /dev/null
+++ b/ports/stm32/boards/stm32u5xx_hal_conf_base.h
@@ -0,0 +1,176 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 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_STM32U5XX_HAL_CONF_BASE_H
+#define MICROPY_INCLUDED_STM32U5XX_HAL_CONF_BASE_H
+
+// Enable various HAL modules
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_COMP_MODULE_ENABLED
+#define HAL_CORDIC_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+#define HAL_DAC_MODULE_ENABLED
+#define HAL_DCACHE_MODULE_ENABLED
+#define HAL_DCMI_MODULE_ENABLED
+#define HAL_DMA2D_MODULE_ENABLED
+#define HAL_DSI_MODULE_ENABLED
+#define HAL_FDCAN_MODULE_ENABLED
+#define HAL_FMAC_MODULE_ENABLED
+#define HAL_GFXMMU_MODULE_ENABLED
+#define HAL_GFXTIM_MODULE_ENABLED
+#define HAL_GPU2D_MODULE_ENABLED
+#define HAL_GTZC_MODULE_ENABLED
+#define HAL_HASH_MODULE_ENABLED
+#define HAL_HCD_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_ICACHE_MODULE_ENABLED
+#define HAL_IRDA_MODULE_ENABLED
+#define HAL_IWDG_MODULE_ENABLED
+#define HAL_JPEG_MODULE_ENABLED
+#define HAL_LPTIM_MODULE_ENABLED
+#define HAL_LTDC_MODULE_ENABLED
+#define HAL_MDF_MODULE_ENABLED
+#define HAL_MMC_MODULE_ENABLED
+#define HAL_NAND_MODULE_ENABLED
+#define HAL_NOR_MODULE_ENABLED
+#define HAL_OPAMP_MODULE_ENABLED
+#define HAL_OSPI_MODULE_ENABLED
+#define HAL_OTFDEC_MODULE_ENABLED
+#define HAL_PCD_MODULE_ENABLED
+#define HAL_PKA_MODULE_ENABLED
+#define HAL_PSSI_MODULE_ENABLED
+#define HAL_RAMCFG_MODULE_ENABLED
+#define HAL_RNG_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SAI_MODULE_ENABLED
+#define HAL_SD_MODULE_ENABLED
+#define HAL_SDIO_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_TSC_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_WWDG_MODULE_ENABLED
+#define HAL_XSPI_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+
+// Oscillator values in Hz
+#define CSI_VALUE (4000000)
+#define HSI_VALUE (16000000UL)
+#define HSI48_VALUE (48000000UL)
+#define LSI_VALUE (32000UL)
+#define MSI_VALUE (4000000UL)
+
+// SysTick has the highest priority
+#define TICK_INT_PRIORITY (0x00)
+
+// Miscellaneous HAL settings
+#define USE_RTOS              0
+#define USE_SPI_CRC           1
+#define USE_SDIO_TRANSCEIVER  0U
+#define SDIO_MAX_IO_NUMBER    7U
+#define PREFETCH_ENABLE      1U
+
+// Include various HAL modules for convenience
+#include "stm32u5xx_hal_rcc.h"
+#include "stm32u5xx_hal_gpio.h"
+#include "stm32u5xx_hal_icache.h"
+#include "stm32u5xx_hal_dcache.h"
+#include "stm32u5xx_hal_gtzc.h"
+#include "stm32u5xx_hal_dma.h"
+#include "stm32u5xx_hal_dma2d.h"
+#include "stm32u5xx_hal_dsi.h"
+#include "stm32u5xx_hal_cortex.h"
+#include "stm32u5xx_hal_pka.h"
+#include "stm32u5xx_hal_adc.h"
+#include "stm32u5xx_hal_comp.h"
+#include "stm32u5xx_hal_crc.h"
+#include "stm32u5xx_hal_cryp.h"
+#include "stm32u5xx_hal_dac.h"
+#include "stm32u5xx_hal_flash.h"
+#include "stm32u5xx_hal_hash.h"
+#include "stm32u5xx_hal_sram.h"
+#include "stm32u5xx_hal_mmc.h"
+#include "stm32u5xx_hal_nor.h"
+#include "stm32u5xx_hal_nand.h"
+#include "stm32u5xx_hal_i2c.h"
+#include "stm32u5xx_hal_iwdg.h"
+#include "stm32u5xx_hal_jpeg.h"
+#include "stm32u5xx_hal_lptim.h"
+#include "stm32u5xx_hal_ltdc.h"
+#include "stm32u5xx_hal_opamp.h"
+#include "stm32u5xx_hal_pwr.h"
+#include "stm32u5xx_hal_ospi.h"
+#include "stm32u5xx_hal_rng.h"
+#include "stm32u5xx_hal_rtc.h"
+#include "stm32u5xx_hal_sai.h"
+#include "stm32u5xx_hal_sd.h"
+#include "stm32u5xx_hal_sdio.h"
+#include "stm32u5xx_hal_smbus.h"
+#include "stm32u5xx_hal_spi.h"
+#include "stm32u5xx_hal_tim.h"
+#include "stm32u5xx_hal_tsc.h"
+#include "stm32u5xx_hal_uart.h"
+#include "stm32u5xx_hal_usart.h"
+#include "stm32u5xx_hal_irda.h"
+#include "stm32u5xx_hal_smartcard.h"
+#include "stm32u5xx_hal_wwdg.h"
+#include "stm32u5xx_hal_pcd.h"
+#include "stm32u5xx_hal_hcd.h"
+#include "stm32u5xx_hal_cordic.h"
+#include "stm32u5xx_hal_dcmi.h"
+#include "stm32u5xx_hal_exti.h"
+#include "stm32u5xx_hal_fdcan.h"
+#include "stm32u5xx_hal_fmac.h"
+#include "stm32u5xx_hal_gfxmmu.h"
+#include "stm32u5xx_hal_gfxtim.h"
+#include "stm32u5xx_hal_gpu2d.h"
+#include "stm32u5xx_hal_otfdec.h"
+#include "stm32u5xx_hal_pssi.h"
+#include "stm32u5xx_hal_ramcfg.h"
+#include "stm32u5xx_hal_mdf.h"
+#include "stm32u5xx_hal_xspi.h"
+#include "stm32u5xx_ll_usart.h"
+#include "stm32u5xx_ll_lpuart.h"
+#include "stm32u5xx_ll_rtc.h"
+#include "stm32u5xx_ll_adc.h"
+#include "stm32u5xx_ll_pwr.h"
+#include "stm32u5xx_ll_rcc.h"
+
+// HAL parameter assertions are disabled
+#define assert_param(expr) ((void)0)
+
+#endif /* MICROPY_INCLUDED_STM32U5XX_HAL_CONF_BASE_H */
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 8022fd274ce97..eb729a6d4eb77 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -66,7 +66,7 @@
 
 #if defined(MICROPY_HW_ENABLE_DAC) && MICROPY_HW_ENABLE_DAC
 
-#if defined(STM32H5) || defined(STM32H7)
+#if defined(STM32H5) || defined(STM32H7) || defined(STM32U5)
 #define DAC DAC1
 #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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32U5)
     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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32U5)
     DAC->MCR = (DAC->MCR & ~(DAC_MCR_MODE1_Msk << dac_channel)) | (outbuf << dac_channel);
     #else
     cr_off |= DAC_CR_BOFF1;
@@ -173,7 +173,7 @@ static void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, ui
         #if defined(STM32G4)
         // For STM32G4, DAC registers have to be accessed by words (32-bit).
         dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_WORD;
-        #elif defined(STM32H5)
+        #elif defined(STM32H5) || defined(STM32U5)
         dma_align = DMA_SRC_DATAWIDTH_BYTE | DMA_DEST_DATAWIDTH_WORD;
         #else
         dma_align = DMA_MDATAALIGN_BYTE | DMA_PDATAALIGN_BYTE;
@@ -182,7 +182,7 @@ static void dac_start_dma(uint32_t dac_channel, const dma_descr_t *dma_descr, ui
         #if defined(STM32G4)
         // For STM32G4, DAC registers have to be accessed by words (32-bit).
         dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_WORD;
-        #elif defined(STM32H5)
+        #elif defined(STM32H5) || defined(STM32U5)
         dma_align = DMA_SRC_DATAWIDTH_HALFWORD | DMA_DEST_DATAWIDTH_WORD;
         #else
         dma_align = DMA_MDATAALIGN_HALFWORD | DMA_PDATAALIGN_HALFWORD;
@@ -273,7 +273,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32U5)
     __HAL_RCC_DAC1_CLK_ENABLE();
     #elif defined(STM32L1)
     __HAL_RCC_DAC_CLK_ENABLE();
@@ -493,8 +493,8 @@ mp_obj_t pyb_dac_write_timed(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         align = DAC_ALIGN_8B_R;
     } else {
         align = DAC_ALIGN_12B_R;
-        // For STM32H5, the length is the amount of data to be transferred from source to destination in bytes.
-        #if !defined(STM32H5)
+        // For STM32H5/U5, the length is the amount of data to be transferred from source to destination in bytes.
+        #if !defined(STM32H5) && !defined(STM32U5)
         bufinfo.len /= 2;
         #endif
     }
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index ad199b1fb91d9..346b6b6f70ff4 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -81,7 +81,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(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -93,7 +93,7 @@ struct _dma_descr_t {
 
 // Default parameters to dma_init() shared by spi and i2c; Channel and Direction
 // vary depending on the peripheral instance so they get passed separately
-#if defined(STM32H5) || defined(STM32N6)
+#if defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
 static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     .Request = 0, // set by dma_init_handle
     .BlkHWRequest = DMA_BREQ_SINGLE_BURST,
@@ -186,7 +186,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
 #endif
 
 #if defined(MICROPY_HW_ENABLE_DAC) && MICROPY_HW_ENABLE_DAC
-#if defined(STM32H5)
+#if defined(STM32H5) || defined(STM32U5)
 // Default parameters to dma_init() for DAC tx
 static const DMA_InitTypeDef dma_init_struct_dac = {
     .Request = 0, // set by dma_init_handle
@@ -870,6 +870,50 @@ static const uint8_t dma_irqn[NSTREAM] = {
     GPDMA1_Channel15_IRQn,
 };
 
+#elif defined(STM32U5)
+
+#define NCONTROLLERS            (1)
+#define NSTREAMS_PER_CONTROLLER (16)
+#define NSTREAM                 (NCONTROLLERS * NSTREAMS_PER_CONTROLLER)
+
+#define DMA_SUB_INSTANCE_AS_UINT8(dma_channel) (dma_channel)
+
+#define DMA1_ENABLE_MASK (0x00ff) // Bits in dma_enable_mask corresponding to GPDMA1
+#define DMA2_ENABLE_MASK (0xff00) // Bits in dma_enable_mask corresponding to GPDMA2
+
+const dma_descr_t dma_SPI_1_RX = { GPDMA1_Channel0, GPDMA1_REQUEST_SPI1_RX, dma_id_0, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_1_TX = { GPDMA1_Channel1, GPDMA1_REQUEST_SPI1_TX, dma_id_1, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_RX = { GPDMA1_Channel2, GPDMA1_REQUEST_SPI2_RX, dma_id_2, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_TX = { GPDMA1_Channel3, GPDMA1_REQUEST_SPI2_TX, dma_id_3, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_3_RX = { GPDMA1_Channel4, GPDMA1_REQUEST_SPI3_RX, dma_id_4, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_3_TX = { GPDMA1_Channel5, GPDMA1_REQUEST_SPI3_TX, dma_id_5, &dma_init_struct_spi_i2c };
+#if MICROPY_HW_ENABLE_DAC
+const dma_descr_t dma_DAC_1_TX = { GPDMA1_Channel6, GPDMA1_REQUEST_DAC1_CH1, dma_id_6, &dma_init_struct_dac };
+const dma_descr_t dma_DAC_2_TX = { GPDMA1_Channel7, GPDMA1_REQUEST_DAC1_CH2, dma_id_7, &dma_init_struct_dac };
+#endif
+const dma_descr_t dma_I2C_1_TX = { GPDMA1_Channel8, GPDMA1_REQUEST_I2C1_TX,  dma_id_8,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_1_RX = { GPDMA1_Channel9, GPDMA1_REQUEST_I2C1_RX,  dma_id_9,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_2_TX = { GPDMA1_Channel10, GPDMA1_REQUEST_I2C2_TX,  dma_id_10,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_2_RX = { GPDMA1_Channel11, GPDMA1_REQUEST_I2C2_RX,  dma_id_11,   &dma_init_struct_spi_i2c };
+
+static const uint8_t dma_irqn[NSTREAM] = {
+    GPDMA1_Channel0_IRQn,
+    GPDMA1_Channel1_IRQn,
+    GPDMA1_Channel2_IRQn,
+    GPDMA1_Channel3_IRQn,
+    GPDMA1_Channel4_IRQn,
+    GPDMA1_Channel5_IRQn,
+    GPDMA1_Channel6_IRQn,
+    GPDMA1_Channel7_IRQn,
+    GPDMA1_Channel8_IRQn,
+    GPDMA1_Channel9_IRQn,
+    GPDMA1_Channel10_IRQn,
+    GPDMA1_Channel11_IRQn,
+    GPDMA1_Channel12_IRQn,
+    GPDMA1_Channel13_IRQn,
+    GPDMA1_Channel14_IRQn,
+    GPDMA1_Channel15_IRQn,
+};
 #endif
 
 static DMA_HandleTypeDef *dma_handle[NSTREAM] = {NULL};
@@ -886,7 +930,7 @@ volatile dma_idle_count_t dma_idle;
 #if defined(DMA2)
 #define DMA2_IS_CLK_ENABLED()   ((RCC->AHBENR & RCC_AHBENR_DMA2EN) != 0)
 #endif
-#elif defined(STM32H5)
+#elif defined(STM32H5) || defined(STM32U5)
 #define DMA1_IS_CLK_ENABLED()   (__HAL_RCC_GPDMA1_IS_CLK_ENABLED())
 #define DMA2_IS_CLK_ENABLED()   (__HAL_RCC_GPDMA2_IS_CLK_ENABLED())
 #define __HAL_RCC_DMA1_CLK_ENABLE __HAL_RCC_GPDMA1_CLK_ENABLE
@@ -1229,7 +1273,7 @@ void DMA2_Channel8_IRQHandler(void) {
 }
 #endif
 
-#elif defined(STM32H5) || defined(STM32N6)
+#elif defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
 
 #define DEFINE_IRQ_HANDLER(periph, channel, id) \
     void GPDMA##periph##_Channel##channel##_IRQHandler(void) { \
@@ -1480,7 +1524,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
     dma->Init.Request = dma_descr->sub_instance;
     #else
     #if !defined(STM32F0) && !defined(STM32L1)
@@ -1488,7 +1532,7 @@ void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint3
     #endif
     #endif
 
-    #if defined(STM32H5) || defined(STM32N6)
+    #if defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
     // Configure src/dest settings based on the DMA direction.
     if (dir == DMA_MEMORY_TO_PERIPH) {
         dma->Init.SrcInc = DMA_SINC_INCREMENTED;
@@ -1519,7 +1563,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(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || 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
@@ -1538,6 +1582,9 @@ void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir
         #endif
 
         NVIC_SetPriority(IRQn_NONNEG(dma_irqn[dma_id]), IRQ_PRI_DMA);
+        #if defined(STM32U5)
+        HAL_DMA_ConfigChannelAttributes(dma, DMA_CHANNEL_NPRIV);
+        #endif
         #else
         // if this stream was previously configured for this channel/request and direction then we
         // can skip most of the initialisation
@@ -1708,7 +1755,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(STM32H5)
+#elif defined(STM32H5) || defined(STM32U5)
 
 // Fully setup GPDMA linked list entry
 typedef struct _dma_ll_full_t {
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 2ef3e3f266ea3..ee62a2e20566c 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -30,13 +30,13 @@
 
 typedef struct _dma_descr_t dma_descr_t;
 
-#if defined(STM32H5)
-// STM32H5 GPDMA doesn't feature circular mode directly, so define doesn't exist in
+#if defined(STM32H5) || defined(STM32U5)
+// STM32H5/U5 GPDMA doesn't feature circular mode directly, so define doesn't exist in
 // stm32 driver header. Define it here to make users like DAC driver happy.
 #define DMA_CIRCULAR 0x20000000
 #endif
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32U5)
 
 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 b1e5c8a8f223c..9b658dca96846 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -92,7 +92,7 @@
 #define EXTI_SWIER_BB(line) (*(__IO uint32_t *)(PERIPH_BB_BASE + ((EXTI_OFFSET + offsetof(EXTI_TypeDef, SWIER)) * 32) + ((line) * 4)))
 #endif
 
-#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || 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.
@@ -170,7 +170,7 @@ static const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     ADC1_COMP_IRQn,
     #endif
 
-    #elif defined(STM32N6) || defined(STM32H5)
+    #elif defined(STM32N6) || defined(STM32H5) || defined(STM32U5)
 
     EXTI0_IRQn,
     EXTI1_IRQn,
@@ -314,7 +314,7 @@ void EXTI15_10_IRQHandler(void) {
     IRQ_EXIT(EXTI15_10_IRQn);
 }
 
-#elif defined(STM32H5) || defined(STM32N6)
+#elif defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
 
 DEFINE_EXTI_IRQ_HANDLER(0)
 DEFINE_EXTI_IRQ_HANDLER(1)
@@ -447,7 +447,7 @@ void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_
         #if !defined(STM32H5) && !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
-        #if defined(STM32G0) || defined(STM32H5) || defined(STM32N6)
+        #if defined(STM32G0) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
         EXTI->EXTICR[line >> 2] =
             (EXTI->EXTICR[line >> 2] & ~(0xff << (8 * (line & 0x03))))
             | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (8 * (line & 0x03)));
@@ -490,7 +490,7 @@ void extint_set(const machine_pin_obj_t *pin, uint32_t mode) {
         #if !defined(STM32H5) && !defined(STM32N6) && !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
-        #if defined(STM32G0) || defined(STM32H5) || defined(STM32N6)
+        #if defined(STM32G0) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
         EXTI->EXTICR[line >> 2] =
             (EXTI->EXTICR[line >> 2] & ~(0xff << (8 * (line & 0x03))))
             | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (8 * (line & 0x03)));
@@ -533,7 +533,7 @@ void extint_enable(uint line) {
     if (pyb_extint_mode[line] == EXTI_Mode_Interrupt) {
         #if defined(STM32H7)
         EXTI_D1->IMR1 |= (1 << line);
-        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= (1 << line);
         #else
         EXTI->IMR |= (1 << line);
@@ -541,7 +541,7 @@ void extint_enable(uint line) {
     } else {
         #if defined(STM32H7)
         EXTI_D1->EMR1 |= (1 << line);
-        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
         EXTI->EMR1 |= (1 << line);
         #else
         EXTI->EMR |= (1 << line);
@@ -567,7 +567,7 @@ void extint_disable(uint line) {
     #if defined(STM32H7)
     EXTI_D1->IMR1 &= ~(1 << line);
     EXTI_D1->EMR1 &= ~(1 << line);
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
     EXTI->IMR1 &= ~(1 << line);
     EXTI->EMR1 &= ~(1 << line);
     #else
@@ -589,7 +589,7 @@ void extint_swint(uint line) {
         return;
     }
     // we need 0 to 1 transition to trigger the interrupt
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
     EXTI->SWIER1 &= ~(1 << line);
     EXTI->SWIER1 |= (1 << line);
     #else
@@ -708,6 +708,12 @@ static mp_obj_t extint_regs(void) {
     mp_printf(print, "EXTI_PR1    %08x\n", (unsigned int)EXTI_D1->PR1);
     mp_printf(print, "EXTI_PR2    %08x\n", (unsigned int)EXTI_D1->PR2);
     mp_printf(print, "EXTI_PR3    %08x\n", (unsigned int)EXTI_D1->PR3);
+    #elif defined(STM32U5)
+    mp_printf(print, "EXTI_IMR1   %08x\n", (unsigned int)EXTI->IMR1);
+    mp_printf(print, "EXTI_EMR1   %08x\n", (unsigned int)EXTI->EMR1);
+    mp_printf(print, "EXTI_RTSR1  %08x\n", (unsigned int)EXTI->RTSR1);
+    mp_printf(print, "EXTI_FTSR1  %08x\n", (unsigned int)EXTI->FTSR1);
+    mp_printf(print, "EXTI_SWIER1 %08x\n", (unsigned int)EXTI->SWIER1);
     #else
     mp_printf(print, "EXTI_IMR   %08x\n", (unsigned int)EXTI->IMR);
     mp_printf(print, "EXTI_EMR   %08x\n", (unsigned int)EXTI->EMR);
@@ -803,10 +809,32 @@ void extint_init0(void) {
     }
 }
 
+static inline bool is_rtc_interrupt(uint32_t line) {
+    return false
+           #if defined(STM32U5)
+           || line == EXTI_RTC_WAKEUP
+           || line == EXTI_RTC_ALARM
+           || line == EXTI_RTC_TIMESTAMP
+           #endif
+    ;
+}
+
 // Interrupt handler
 void Handle_EXTI_Irq(uint32_t line) {
+    bool is_exti_irq;
+
     if (__HAL_GPIO_EXTI_GET_FLAG(1 << line)) {
         __HAL_GPIO_EXTI_CLEAR_FLAG(1 << line);
+        is_exti_irq = true;
+    } else if (is_rtc_interrupt(line)) {
+        // For STM32U5, __HAL_GPIO_EXTI_GET_FLAG cannot detect RTC interrupt.
+        // To handle RTC interrupt, check whether line is rtc interrupt.
+        is_exti_irq = true;
+    } else {
+        is_exti_irq = false;
+    }
+
+    if (is_exti_irq) {
         if (line < EXTI_NUM_VECTORS) {
             mp_obj_t *cb = &MP_STATE_PORT(pyb_extint_callback)[line];
             #if MICROPY_PY_NETWORK_CYW43 && defined(pyb_pin_WL_HOST_WAKE)
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index cdebf6eb86a7d..7406eb967111a 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -37,7 +37,7 @@
 #if defined(STM32L4)
 #define EXTI_RTC_ALARM          (18)
 #define EXTI_USB_OTG_FS_WAKEUP  (17)
-#else
+#elif !defined(STM32U5)
 #define EXTI_RTC_ALARM          (17)
 #define EXTI_USB_OTG_FS_WAKEUP  (18)
 #endif
@@ -55,6 +55,11 @@
 #elif defined(STM32G0)
 #define EXTI_RTC_WAKEUP         (19)
 #define EXTI_RTC_TIMESTAMP      (21)
+#elif defined(STM32U5)
+#define EXTI_RTC_TIMESTAMP      (26)
+#define EXTI_RTC_WAKEUP         (27)
+#define EXTI_RTC_ALARM          (28)
+#define EXTI_USB_OTG_FS_WAKEUP  (29)
 #else
 #define EXTI_RTC_TIMESTAMP      (21)
 #define EXTI_RTC_WAKEUP         (22)
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index f050ca5acd861..fcf46049c0abd 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -148,7 +148,7 @@ static const flash_layout_t flash_layout[] = {
 #define FLASH_LAYOUT_SECTOR_SIZE    (0x200)
 #define FLASH_LAYOUT_NUM_SECTORS    (1024)
 
-#elif defined(STM32H5)
+#elif defined(STM32H5) || defined(STM32U5)
 
 #define FLASH_LAYOUT_IS_HOMOGENEOUS (1)
 #define FLASH_LAYOUT_START_ADDR     (FLASH_BASE_NS)
@@ -225,7 +225,7 @@ static uint32_t get_page(uint32_t addr) {
     return (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
 }
 
-#elif defined(STM32G0) || defined(STM32G4)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32U5)
 
 static uint32_t get_page(uint32_t addr) {
     return (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
@@ -332,12 +332,12 @@ int flash_erase(uint32_t flash_dest) {
 
     // ... the erase type and number of pages/sectors,
     #if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) \
-    || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    || defined(STM32L1) || defined(STM32L4) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
 
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.NbPages = num_sectors;
 
-    #elif defined(STM32F4) || defined(STM32F7) || defined(STM32H5) || defined(STM32H7)
+    #elif defined(STM32F4) || defined(STM32F7) || defined(STM32H5) || defined(STM32H7) || defined(STM32U5)
 
     EraseInitStruct.TypeErase = TYPEERASE_SECTORS;
     EraseInitStruct.NbSectors = num_sectors;
@@ -354,7 +354,7 @@ int flash_erase(uint32_t flash_dest) {
     // ... and the flash bank and page/sector.
     #if defined(STM32F0) || defined(STM32L0) || defined(STM32L1)
     EraseInitStruct.PageAddress = flash_dest;
-    #elif defined(STM32G0) || defined(STM32G4) || (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE))
+    #elif defined(STM32G0) || defined(STM32G4) || (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32U5)
     EraseInitStruct.Page = get_page(flash_dest);
     EraseInitStruct.Banks = get_bank(flash_dest);
     #elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB) || defined(STM32WL)
@@ -458,9 +458,9 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
         #endif
     }
 
-    #elif defined(STM32H5) || defined(STM32H7)
+    #elif defined(STM32H5) || defined(STM32H7) || defined(STM32U5)
 
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32U5)
     static const unsigned int WORD32_PER_FLASHWORD = 4;
     static const unsigned int PROGRAM_TYPE = FLASH_TYPEPROGRAM_QUADWORD;
     #else
diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 2460a36cb1502..46b55f9407156 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -271,12 +271,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) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
+#elif defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32U5)
 
 #if defined(STM32H7)
 #define APB1ENR            APB1LENR
 #define RCC_APB1ENR_I2C1EN RCC_APB1LENR_I2C1EN
-#elif defined(STM32G4) || defined(STM32L4)
+#elif defined(STM32G4) || defined(STM32L4) || defined(STM32U5)
 #define APB1ENR            APB1ENR1
 #define RCC_APB1ENR_I2C1EN RCC_APB1ENR1_I2C1EN
 #endif
@@ -337,6 +337,16 @@ 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;
     }
+    #elif defined(STM32U5)
+    if (freq >= 1000000) {
+        i2c->TIMINGR = 0x30909DEC;
+    } else if (freq >= 400000) {
+        i2c->TIMINGR = 0x00F07BFF;
+    } else if (freq >= 100000) {
+        i2c->TIMINGR = 0x00701F6B;
+    } else {
+        return -MP_EINVAL;
+    }
     #else
     // These timing values are for f_I2CCLK=54MHz and are only approximate
     if (freq >= 1000000) {
@@ -512,7 +522,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) || defined(STM32H7)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32U5)
 
 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_adc.c b/ports/stm32/machine_adc.c
index 14384429c4428..a6e960911bd69 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -30,7 +30,7 @@
 #include "py/mphal.h"
 #include "adc.h"
 
-#if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
 #define ADC_V2 (1)
 #else
 #define ADC_V2 (0)
@@ -88,6 +88,9 @@
 #elif defined(STM32N6)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_46CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_246CYCLES_5
+#elif defined(STM32U5)
+#define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_5CYCLES
+#define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_391CYCLES_5
 #endif
 
 // Timeout for waiting for end-of-conversion
@@ -175,6 +178,8 @@ static void adc_wait_eoc(ADC_TypeDef *adc, int32_t timeout_ms) {
 
 #if defined(STM32H7)
 static const uint8_t adc_cr_to_bits_table[] = {16, 14, 12, 10, 8, 8, 8, 8};
+#elif defined(STM32U5)
+static const uint8_t adc_cr_to_bits_table[] = {14, 12, 10, 8};
 #else
 static const uint8_t adc_cr_to_bits_table[] = {12, 10, 8, 6};
 #endif
@@ -188,7 +193,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     if (adc == ADC1) {
         #if defined(STM32H5)
         __HAL_RCC_ADC_CLK_ENABLE();
-        #elif defined(STM32G4) || defined(STM32H7) || defined(STM32N6)
+        #elif defined(STM32G4) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC1_CLK_ENABLE();
@@ -198,7 +203,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     if (adc == ADC2) {
         #if defined(STM32H5)
         __HAL_RCC_ADC_CLK_ENABLE();
-        #elif defined(STM32G4) || defined(STM32H7) || defined(STM32N6)
+        #elif defined(STM32G4) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC2_CLK_ENABLE();
@@ -221,7 +226,7 @@ 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(STM32G4) || defined(STM32H5)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32U5)
     ADC12_COMMON->CCR = 7 << ADC_CCR_PRESC_Pos; // PCLK/16 (asynchronous clock mode)
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     ADC12_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
@@ -240,13 +245,13 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     ADC_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos; // PRESC=1
     #endif
 
-    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB)
     if (adc->CR & ADC_CR_DEEPPWD) {
         adc->CR = 0; // disable deep powerdown
     }
     #endif
 
-    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
     if (!(adc->CR & ADC_CR_ADVREGEN)) {
         adc->CR = ADC_CR_ADVREGEN; // enable VREG
         #if defined(STM32H7)
@@ -262,7 +267,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
         // ADC isn't enabled so calibrate it now
         #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
         LL_ADC_StartCalibration(adc);
-        #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32U5) || defined(STM32WB)
         LL_ADC_StartCalibration(adc, LL_ADC_SINGLE_ENDED);
         #elif defined(STM32N6)
         ADC_HandleTypeDef hadc;
@@ -324,7 +329,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     uint32_t cfgr = res << ADC_CFGR_RES_Pos;
     adc->CFGR = (adc->CFGR & ~cfgr_clr) | cfgr;
 
-    #elif defined(STM32N6)
+    #elif defined(STM32N6) || defined(STM32U5)
 
     uint32_t cfgr1_clr = ADC_CFGR1_CONT | ADC_CFGR1_EXTEN | ADC_CFGR1_RES;
     uint32_t cfgr1 = res << ADC_CFGR1_RES_Pos;
@@ -334,7 +339,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(STM32N6) || defined(STM32WL)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32N6) || defined(STM32U5) || defined(STM32WL)
     uint32_t res = (adc->CFGR1 & ADC_CFGR1_RES) >> ADC_CFGR1_RES_Pos;
     #elif defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
     uint32_t res = (adc->CR1 & ADC_CR1_RES) >> ADC_CR1_RES_Pos;
@@ -436,9 +441,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(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB)
 
-    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ) || defined(STM32N6)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ) || defined(STM32N6) || defined(STM32U5)
     ADC_Common_TypeDef *adc_common = ADC12_COMMON;
     #elif defined(STM32H7)
     ADC_Common_TypeDef *adc_common = adc == ADC3 ? ADC3_COMMON : ADC12_COMMON;
@@ -453,6 +458,9 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     #if defined(STM32G4)
     } else if (channel == ADC_CHANNEL_TEMPSENSOR_ADC1) {
         adc_common->CCR |= ADC_CCR_VSENSESEL;
+    #elif defined(STM32U5)
+    } else if (channel == ADC_CHANNEL_TEMPSENSOR) {
+        adc_common->CCR |= ADC_CCR_VSENSEEN;
     #else
     } else if (channel == ADC_CHANNEL_TEMPSENSOR) {
         adc_common->CCR |= ADC_CCR_TSEN;
@@ -471,7 +479,7 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     #endif
     }
 
-    #if defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB)
     // MCU uses encoded literals for internal channels -> extract ADC channel for following code
     if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 0fb9cf83c901a..a057b25e79d93 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -34,7 +34,7 @@
 
 #define I2C_POLL_DEFAULT_TIMEOUT_US (50000) // 50ms
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4) || defined(STM32U5)
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
@@ -182,7 +182,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) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32F7) || defined(STM32H7) || defined(STM32L4) || defined(STM32U5)
 #define MACHINE_I2C_TIMINGR (1)
 #else
 #define MACHINE_I2C_TIMINGR (0)
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index c93eade5d3df6..5bb5b6c99c535 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -399,7 +399,7 @@ static bool mp_machine_uart_txdone(machine_uart_obj_t *self) {
 
 // Send a break condition.
 static void mp_machine_uart_sendbreak(machine_uart_obj_t *self) {
-    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || 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/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index d5cef1fecea08..f36cdec8ec7ed 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -484,6 +484,20 @@
 #define MICROPY_HW_MAX_UART (10)
 #define MICROPY_HW_MAX_LPUART (1)
 
+// Configuration for STM32U5 series
+#elif defined(STM32U5)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (UID_BASE)
+// STM32U5 has 26 EXTI vectors but does not have line for RTC/USB.
+// To treat these interrupts as same as exti, add virtual vectors for
+// EXTI_RTC_TIMESTAMP (26), EXTI_RTC_WAKEUP (27),
+// EXTI_RTC_ALARM (28), and EXTI_USB_OTG_FS_WAKEUP  (29)
+#define PYB_EXTI_NUM_VECTORS (30)
+#define MICROPY_HW_MAX_I2C (6)
+#define MICROPY_HW_MAX_TIMER (17)
+#define MICROPY_HW_MAX_UART (6)
+#define MICROPY_HW_MAX_LPUART (1)
+
 // Configuration for STM32WB series
 #elif defined(STM32WB)
 
@@ -577,6 +591,11 @@
 #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)
+#elif defined(STM32U5)
+#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)
+#define MICROPY_HW_CLK_APB3_DIV (RCC_HCLK_DIV1)
 #else
 #define MICROPY_HW_CLK_AHB_DIV (RCC_SYSCLK_DIV1)
 #define MICROPY_HW_CLK_APB1_DIV (RCC_HCLK_DIV4)
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index fcd08cbd84562..b13ed0ee15020 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -90,7 +90,7 @@ void mp_hal_ticks_cpu_enable(void) {
 #endif
 
 void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
-    #if defined(STM32L476xx) || defined(STM32L496xx)
+    #if defined(STM32L476xx) || defined(STM32L496xx) || defined(STM32U5)
     if (gpio == GPIOG) {
         // Port G pins 2 thru 15 are powered using VddIO2 on these MCUs.
         HAL_PWREx_EnableVddIO2();
@@ -117,6 +117,9 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
     #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     #define AHBxENR AHB2ENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR_GPIOAEN_Pos
+    #elif defined(STM32U5)
+    #define AHBxENR AHB2ENR1
+    #define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR1_GPIOAEN_Pos
     #endif
 
     uint32_t gpio_idx = ((uint32_t)gpio - GPIOA_BASE) / (GPIOB_BASE - GPIOA_BASE);
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index a750e8f5be7e1..7211ef873cd52 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -404,7 +404,7 @@ static uint32_t calc_apb2_div(uint32_t wanted_div) {
     #endif
 }
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32U5)
 
 int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2) {
     // Return straight away if the clocks are already at the desired frequency
@@ -478,7 +478,7 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     // Determine the bus clock dividers
     // Note: AHB freq required to be >= 14.2MHz for USB operation
     RCC_ClkInitStruct.AHBCLKDivider = calc_ahb_div(sysclk / ahb);
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32U5)
     ahb = sysclk >> AHBPrescTable[RCC_ClkInitStruct.AHBCLKDivider >> RCC_CFGR2_HPRE_Pos];
     #elif defined(STM32H7)
     // Do nothing.
@@ -819,7 +819,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(STM32L1) && !defined(STM32L4) && !defined(STM32N6) && !defined(STM32WB) && !defined(STM32WL)
+    #if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L1) && !defined(STM32L4) && !defined(STM32N6) && !defined(STM32U5) && !defined(STM32WB) && !defined(STM32WL)
     // takes longer to wake but reduces stop current
     HAL_PWREx_EnableFlashPowerDown();
     #endif
@@ -939,17 +939,25 @@ void powerctrl_enter_stop_mode(void) {
 
     #else // defined(STM32H5)
 
+    #if defined(STM32U5)
+    #define RCC_FLAG_PLLRDY RCC_FLAG_PLL1RDY
+    #endif
+
     // enable PLL
     __HAL_RCC_PLL_ENABLE();
     while (!__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY)) {
     }
 
     // select PLL as system clock source
+    #if defined(STM32U5)
+    MODIFY_REG(RCC->CFGR1, RCC_CFGR1_SW, RCC_SYSCLKSOURCE_PLLCLK);
+    #else
     MODIFY_REG(RCC->CFGR, RCC_CFGR_SW, RCC_SYSCLKSOURCE_PLLCLK);
+    #endif
     #if defined(STM32H7)
     while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL1) {
     }
-    #elif defined(STM32G0) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
     while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_SYSCLKSOURCE_STATUS_PLLCLK) {
     }
     #else
@@ -1120,7 +1128,7 @@ MP_NORETURN 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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32U5) || 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)
@@ -1144,7 +1152,7 @@ MP_NORETURN void powerctrl_enter_standby_mode(void) {
     // clear RTC wake-up flags
     #if defined(SR_BITS)
     RTC->SR &= ~SR_BITS;
-    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32U5) || defined(STM32WL)
     RTC->MISR &= ~ISR_BITS;
     #else
     RTC->ISR &= ~ISR_BITS;
@@ -1159,7 +1167,7 @@ MP_NORETURN void powerctrl_enter_standby_mode(void) {
     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(STM32H5)
+    #elif defined(STM32H5) || defined(STM32U5)
     LL_PWR_ClearFlag_WU();
     #elif defined(STM32H7)
     // Clear and mask D1 EXTIs.
@@ -1203,6 +1211,8 @@ MP_NORETURN void powerctrl_enter_standby_mode(void) {
 
     #if defined(STM32WB)
     powerctrl_low_power_prep_wb55();
+    #elif defined(STM32U5)
+    HAL_PWR_EnableWakeUpPin(PWR_WAKEUP_PIN7_HIGH_3);
     #endif
 
     #endif
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 7e1489010d097..dc907c638d5e3 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -128,7 +128,7 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
     #endif
 };
 
-#if defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
+#if defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32U5)
 
 // The STM32F0, F3, F7, H7 and L4 use a TIMINGR register rather than ClockSpeed and
 // DutyCycle.
@@ -215,6 +215,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(STM32U5)
+// generated using CubeMX
+#define MICROPY_HW_I2C_BAUDRATE_TIMING { \
+        {PYB_I2C_SPEED_STANDARD, 0x30909DEC}, \
+        {PYB_I2C_SPEED_FULL, 0x00F07BFF}, \
+        {PYB_I2C_SPEED_FAST, 0x00701F6B}, \
+}
+#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"
 #endif
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index fb106e179be1f..72abcd75f9936 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -108,7 +108,7 @@ void rtc_init_start(bool force_init) {
     // Enable the RTC APB bus clock, to communicate with the RTC.
     #if defined(STM32H5)
     __HAL_RCC_RTC_CLK_ENABLE();
-    #elif defined(STM32G0) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32U5) || defined(STM32WL)
     __HAL_RCC_RTCAPB_CLK_ENABLE();
     #endif
 
@@ -179,7 +179,7 @@ void rtc_init_start(bool force_init) {
             // Clear source Reset Flag
             __HAL_RCC_CLEAR_RESET_FLAGS();
             // Turn the LSI on (it may need this even if the RTC is running)
-            #if defined(STM32H5)
+            #if defined(STM32H5) || defined(STM32U5)
             RCC->BDCR |= RCC_BDCR_LSION;
             #else
             RCC->CSR |= RCC_CSR_LSION;
@@ -192,7 +192,7 @@ void rtc_init_start(bool force_init) {
         if (rtc_running) {
             // Provide information about the registers that indicated the RTC is running.
             // Bits are (MSB first): LSIRDY LSION LSEBYP LSERDY LSEON
-            #if defined(STM32H5)
+            #if defined(STM32H5) || defined(STM32U5)
             rtc_info |= (RCC->BDCR >> RCC_BDCR_LSEON_Pos & 7) | (RCC->BDCR >> RCC_BDCR_LSION_Pos & 3) << 8;
             #else
             rtc_info |= (RCC->BDCR & 7) | (RCC->CSR & 3) << 8;
@@ -276,7 +276,7 @@ void rtc_init_finalise() {
     RTC_CalendarConfig();
     #if defined(STM32G0)
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_PWRRST) != RESET) {
-    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_BORRST) != RESET) {
     #else
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_PORRST) != RESET) {
@@ -327,7 +327,7 @@ static HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
                 return HAL_TIMEOUT;
             }
         }
-        #elif defined(STM32H5) || defined(STM32N6)
+        #elif defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
         // Wait for Backup domain Write protection disable
         while (!LL_PWR_IsEnabledBkUpAccess()) {
             if (HAL_GetTick() - tickstart > RCC_DBP_TIMEOUT_VALUE) {
@@ -412,7 +412,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5) || defined(STM32WL)
         hrtc->Instance->CR &= (uint32_t) ~RTC_CR_TAMPALRM_TYPE_Msk;
         hrtc->Instance->CR |= (uint32_t)(hrtc->Init.OutPutType);
         #else
@@ -521,6 +521,11 @@ static HAL_StatusTypeDef PYB_RTC_MspInit_Finalise(RTC_HandleTypeDef *hrtc) {
 
     // enable RTC peripheral clock
     __HAL_RCC_RTC_ENABLE();
+
+    #if defined(STM32U5)
+    __HAL_RCC_RTCAPB_CLK_ENABLE();
+    __HAL_RCC_RTCAPB_CLKAM_ENABLE();
+    #endif
     return HAL_OK;
 }
 
@@ -685,7 +690,7 @@ mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
 
-#if defined(STM32F0) || defined(STM32H5) || defined(STM32L0)
+#if defined(STM32F0) || defined(STM32H5) || defined(STM32L0) || defined(STM32U5)
 #define RTC_WKUP_IRQn RTC_IRQn
 #elif defined(STM32G0)
 #define RTC_WKUP_IRQn RTC_TAMP_IRQn
@@ -806,6 +811,8 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #elif defined(STM32H7)
         EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
+        #elif defined(STM32U5)
+        // do nothing
         #else
         EXTI->IMR |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR |= 1 << EXTI_RTC_WAKEUP;
@@ -814,7 +821,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         // clear interrupt flags
         #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
         RTC->ICSR &= ~RTC_ICSR_WUTWF;
-        #elif defined(STM32H5) || defined(STM32N6)
+        #elif defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
         LL_RTC_ClearFlag_WUT(RTC);
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         RTC->SR &= ~RTC_SR_WUTF;
@@ -825,7 +832,7 @@ 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) || defined(STM32H5) || defined(STM32N6)
+        #elif defined(STM32G0) || defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
         // Do nothing
         #else
         EXTI->PR = 1 << EXTI_RTC_WAKEUP;
@@ -841,7 +848,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || 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 248075579a87f..330e4d47425e2 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -106,8 +106,8 @@ const spi_t spi_obj[6] = {
 #error "spi_obj needs updating for new value of MICROPY_HW_SUBGHZSPI_ID"
 #endif
 
-#if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
-// STM32H5/H7 HAL requires SPI IRQs to be enabled and handled.
+#if defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5)
+// STM32H5/H7/U5 HAL requires SPI IRQs to be enabled and handled.
 #if defined(MICROPY_HW_SPI1_SCK)
 void SPI1_IRQHandler(void) {
     IRQ_ENTER(SPI1_IRQn);
@@ -499,7 +499,7 @@ int spi_init(const spi_t *self, bool enable_nss_pin) {
     dma_invalidate_channel(self->tx_dma_descr);
     dma_invalidate_channel(self->rx_dma_descr);
 
-    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5)
     NVIC_SetPriority(irqn, IRQ_PRI_SPI);
     HAL_NVIC_EnableIRQ(irqn);
     #else
@@ -753,7 +753,7 @@ 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(STM32H5) || defined(STM32H7) || defined(STM32N6)
+            #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5)
             uint log_prescaler = (spi->Init.BaudRatePrescaler >> 28) + 1;
             #else
             uint log_prescaler = (spi->Init.BaudRatePrescaler >> 3) + 1;
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index e6526fc6bd541..b63cb0cc51b31 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -67,6 +67,7 @@ CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_h5 = $(CFLAGS_CORTEX_M) -mtune=cortex-m33 -mcpu=cortex-m33
 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_n6 = $(CFLAGS_CORTEX_M) -mtune=cortex-m55 -mcpu=cortex-m55 -mcmse
+CFLAGS_MCU_u5 = $(CFLAGS_CORTEX_M) -mtune=cortex-m33 -mcpu=cortex-m33
 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_wl = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 
@@ -81,6 +82,7 @@ MPY_CROSS_MCU_ARCH_l4 = armv7m
 MPY_CROSS_MCU_ARCH_h5 = armv7m
 MPY_CROSS_MCU_ARCH_h7 = armv7m
 MPY_CROSS_MCU_ARCH_n6 = armv7m # really armv8m
+MPY_CROSS_MCU_ARCH_u5 = armv7m
 MPY_CROSS_MCU_ARCH_wb = armv7m
 MPY_CROSS_MCU_ARCH_wl = armv7m
 
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 052550a8fa8d6..470df4758f7d7 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -384,16 +384,28 @@ static void OTG_CMD_WKUP_Handler(PCD_HandleTypeDef *pcd_handle) {
         /* Enable the main PLL. */
         __HAL_RCC_PLL_ENABLE();
 
+        #if defined(STM32U5)
+        /* Wait till PLL is ready */
+        while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLL1RDY) == RESET) {
+        }
+
+        /* Select PLL as SYSCLK */
+        MODIFY_REG(RCC->CFGR1, RCC_CFGR1_SW, RCC_SYSCLKSOURCE_PLLCLK);
+        #else
         /* Wait till PLL is ready */
         while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET) {
         }
 
         /* Select PLL as SYSCLK */
         MODIFY_REG(RCC->CFGR, RCC_CFGR_SW, RCC_SYSCLKSOURCE_PLLCLK);
+        #endif
 
         #if defined(STM32H7)
         while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL1) {
         }
+        #elif defined(STM32U5)
+        while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_SYSCLKSOURCE_STATUS_PLLCLK) {
+        }
         #else
         while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL) {
         }
@@ -439,7 +451,7 @@ void OTG_HS_WKUP_IRQHandler(void) {
 
     OTG_CMD_WKUP_Handler(&pcd_hs_handle);
 
-    #if !defined(STM32H5) && !defined(STM32H7)
+    #if !defined(STM32H5) && !defined(STM32H7) && !defined(STM32U5)
     /* Clear EXTI pending Bit*/
     __HAL_USB_HS_EXTI_CLEAR_FLAG();
     #endif
@@ -507,6 +519,7 @@ void TAMP_STAMP_IRQHandler(void) {
 }
 #endif
 
+#if !defined(STM32U5)
 #if defined(STM32H5)
 void RTC_IRQHandler(void)
 #elif defined(STM32N6)
@@ -529,6 +542,7 @@ void RTC_WKUP_IRQHandler(void)
     Handle_EXTI_Irq(EXTI_RTC_WAKEUP); // clear EXTI flag and execute optional callback
     IRQ_EXIT(RTC_WKUP_IRQn);
 }
+#endif
 
 #if defined(STM32N6)
 void RTC_IRQHandler(void) {
@@ -573,6 +587,26 @@ void TIM1_BRK_UP_TRG_COM_IRQHandler(void) {
 
 #endif
 
+#if defined(STM32U5)
+extern RTC_HandleTypeDef RTCHandle;
+void RTC_IRQHandler(void) {
+    IRQ_ENTER(RTC_IRQn);
+    if (RTC->SR & RTC_SR_WUTF) {
+        RTC->SCR = RTC_SCR_CWUTF; // clear wakeup interrupt flag
+        Handle_EXTI_Irq(EXTI_RTC_WAKEUP); // clear EXTI flag and execute optional callback
+    }
+    if (RTC->SR & RTC_SR_ALRAF) {
+        RTC->SCR &= ~RTC_SCR_CALRAF; // clear Alarm A flag
+        Handle_EXTI_Irq(EXTI_RTC_ALARM); // clear EXTI flag and execute optional callback
+    }
+    if (RTC->SR & RTC_SR_TSF) {
+        RTC->SR &= ~RTC_SR_TSF; // clear timestamp flag
+        Handle_EXTI_Irq(EXTI_RTC_TIMESTAMP); // clear EXTI flag and execute optional callback
+    }
+    IRQ_EXIT(RTC_IRQn);
+}
+#endif
+
 void TIM1_BRK_TIM9_IRQHandler(void) {
     IRQ_ENTER(TIM1_BRK_TIM9_IRQn);
     timer_irq_handler(9);
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 5a9fef1c2a58f..514bf91786c13 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -79,7 +79,7 @@
 #include "boardctrl.h"
 #include "powerctrl.h"
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32U5)
 
 /**
   * @brief  System Clock Configuration
@@ -168,15 +168,23 @@ MP_WEAK void SystemClock_Config(void) {
     // on reset value, so we set it back here, so the clocksources are the same
     // whether we were started from DFU or from a power on reset.
     RCC->DCKCFGR2 = 0;
+    #elif defined(STM32U5)
+    __HAL_RCC_PWR_CLK_ENABLE();
+    #if MICROPY_HW_ENABLE_USB
+    HAL_PWREx_EnableVddUSB();
+    #endif
+    #if MICROPY_HW_ENABLE_ADC || MICROPY_HW_ENABLE_DAC
+    HAL_PWREx_EnableVddA();
+    #endif
     #endif
 
     RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
     RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-    #if defined(STM32G4) || defined(STM32H7)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32U5)
     RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
     #endif
 
-    #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+    #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32U5)
 
     #if defined(STM32H7) && defined(SMPS)
     // H7 MCUs with SMPS must provide a power supply configuration.
@@ -184,6 +192,11 @@ MP_WEAK void SystemClock_Config(void) {
     #elif defined(STM32H7)
     // H7 MCUs without SMPS, lock the power supply configuration update.
     MODIFY_REG(PWR->CR3, PWR_CR3_SCUEN, 0);
+    #elif defined(STM32U5)
+    HAL_PWREx_DisableUCPDDeadBattery();
+    if (HAL_PWREx_ConfigSupply(PWR_SMPS_SUPPLY) != HAL_OK) {
+        MICROPY_BOARD_FATAL_ERROR("HAL_PWREx_ConfigSupply");
+    }
     #else
     // other MCUs, enable power control clock.
     __PWR_CLK_ENABLE();
@@ -204,6 +217,12 @@ MP_WEAK void SystemClock_Config(void) {
 
     #endif // defined(STM32H7)
 
+    #if defined(STM32U5)
+    __HAL_RCC_SYSCFG_CLK_ENABLE();
+    if (HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1) != HAL_OK) {
+        MICROPY_BOARD_FATAL_ERROR("HAL_PWREx_ControlVoltageScaling");
+    }
+    #else
     /* 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.  */
@@ -217,6 +236,7 @@ MP_WEAK void SystemClock_Config(void) {
     {
         __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
     }
+    #endif
 
     #elif defined(STM32G4)
     // Configure the main internal regulator output voltage
@@ -233,7 +253,7 @@ MP_WEAK void SystemClock_Config(void) {
     #endif
 
     /* Enable HSE Oscillator and activate PLL with HSE as source */
-    #if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7)
+    #if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32U5)
     RCC_OscInitStruct.OscillatorType = MICROPY_HW_RCC_OSCILLATOR_TYPE;
     RCC_OscInitStruct.HSEState = MICROPY_HW_RCC_HSE_STATE;
     RCC_OscInitStruct.HSIState = MICROPY_HW_RCC_HSI_STATE;
@@ -305,6 +325,8 @@ MP_WEAK void SystemClock_Config(void) {
     RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
     #if defined(STM32H7)
     RCC_ClkInitStruct.ClockType |= (RCC_CLOCKTYPE_D3PCLK1 | RCC_CLOCKTYPE_D1PCLK1);
+    #elif defined(STM32U5)
+    RCC_ClkInitStruct.ClockType |= (RCC_CLOCKTYPE_PCLK3);
     #endif
 
     #if defined(MICROPY_HW_CLK_LAST_FREQ) && MICROPY_HW_CLK_LAST_FREQ
@@ -354,7 +376,7 @@ MP_WEAK 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(STM32G4) || defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32U5)
     RCC_OscInitStruct.PLL.PLLR = MICROPY_HW_CLK_PLLR;
     #endif
 
@@ -362,6 +384,15 @@ MP_WEAK void SystemClock_Config(void) {
     RCC_OscInitStruct.PLL.PLLRGE = MICROPY_HW_CLK_PLLVCI;
     RCC_OscInitStruct.PLL.PLLVCOSEL = MICROPY_HW_CLK_PLLVCO;
     RCC_OscInitStruct.PLL.PLLFRACN = MICROPY_HW_CLK_PLLFRAC;
+    #elif defined(STM32U5)
+    #if MICROPY_HW_RTC_USE_LSE
+    RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+    #else
+    RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+    #endif
+    RCC_OscInitStruct.PLL.PLLMBOOST = RCC_PLLMBOOST_DIV1;
+    RCC_OscInitStruct.PLL.PLLRGE = MICROPY_HW_CLK_PLLVCI;
+    RCC_OscInitStruct.PLL.PLLFRACN = MICROPY_HW_CLK_PLLFRAC;
     #endif
 
     #if defined(STM32F4) || defined(STM32F7)
@@ -385,6 +416,12 @@ MP_WEAK void SystemClock_Config(void) {
     RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
     RCC_ClkInitStruct.APB2CLKDivider = MICROPY_HW_CLK_APB2_DIV;
     RCC_ClkInitStruct.APB4CLKDivider = MICROPY_HW_CLK_APB4_DIV;
+    #elif defined(STM32U5)
+    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;
+    RCC_ClkInitStruct.APB3CLKDivider = MICROPY_HW_CLK_APB3_DIV;
     #endif
     #endif
 
@@ -506,6 +543,37 @@ MP_WEAK void SystemClock_Config(void) {
     PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48;
     PeriphClkInitStruct.Adc12ClockSelection = RCC_ADC12CLKSOURCE_SYSCLK;
     PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCCEx_PeriphCLKConfig");
+    }
+    #elif defined(STM32U5)
+    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, MICROPY_HW_FLASH_LATENCY) != HAL_OK) {
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCC_ClockConfig");
+    }
+
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_I2C1 | RCC_PERIPHCLK_I2C2
+        | RCC_PERIPHCLK_SPI1 | RCC_PERIPHCLK_SPI2 | RCC_PERIPHCLK_SPI3;
+    PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_PCLK1;
+    PeriphClkInitStruct.I2c2ClockSelection = RCC_I2C2CLKSOURCE_PCLK1;
+    PeriphClkInitStruct.Spi1ClockSelection = RCC_SPI1CLKSOURCE_SYSCLK;
+    PeriphClkInitStruct.Spi2ClockSelection = RCC_SPI2CLKSOURCE_SYSCLK;
+    PeriphClkInitStruct.Spi3ClockSelection = RCC_SPI3CLKSOURCE_SYSCLK;
+
+    #if defined(MICROPY_HW_ENABLE_ADC) || (MICROPY_HW_ENABLE_DAC)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_ADCDAC | RCC_PERIPHCLK_DAC1;
+    PeriphClkInitStruct.AdcDacClockSelection = RCC_ADCDACCLKSOURCE_HSE;
+    PeriphClkInitStruct.Dac1ClockSelection = RCC_DAC1CLKSOURCE_LSE;
+    #endif
+    #if defined(MICROPY_HW_ENABLE_USB)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_USBPHY;
+    PeriphClkInitStruct.UsbPhyClockSelection = RCC_USBPHYCLKSOURCE_PLL1;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_RTC_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = MICROPY_HW_RCC_RTC_CLKSOURCE;
+    #endif
+
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
         MICROPY_BOARD_FATAL_ERROR("HAL_RCCEx_PeriphCLKConfig");
     }
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 9c4a5f8894e02..aa41092829809 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -283,6 +283,9 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
         #elif defined(STM32H7)
         source = HAL_RCC_GetPCLK2Freq();
         clk_div = RCC->D2CFGR & RCC_D2CFGR_D2PPRE2;
+        #elif defined(STM32U5)
+        source = HAL_RCC_GetPCLK2Freq();
+        clk_div = RCC->CFGR1 & RCC_CFGR2_PPRE2;
         #else
         source = HAL_RCC_GetPCLK2Freq();
         clk_div = RCC->CFGR & RCC_CFGR_PPRE2;
@@ -296,6 +299,8 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
         clk_div = RCC->CDCFGR1 & RCC_CDCFGR2_CDPPRE1;
         #elif defined(STM32H7)
         clk_div = RCC->D2CFGR & RCC_D2CFGR_D2PPRE1;
+        #elif defined(STM32U5)
+        clk_div = RCC->CFGR1 & RCC_CFGR2_PPRE1;
         #else
         clk_div = RCC->CFGR & RCC_CFGR_PPRE1;
         #endif
@@ -888,7 +893,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(6, TIM6_IRQn),
     #elif defined(STM32G0)
     TIM_ENTRY(6, TIM6_DAC_LPTIM1_IRQn),
-    #elif defined(STM32H5) || defined(STM32N6)
+    #elif defined(STM32H5) || defined(STM32N6) || defined(STM32U5)
     TIM_ENTRY(6, TIM6_IRQn),
     #else
     TIM_ENTRY(6, TIM6_DAC_IRQn),
@@ -960,7 +965,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
 
     #if defined(TIM15)
-    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5)
     TIM_ENTRY(15, TIM15_IRQn),
     #else
     TIM_ENTRY(15, TIM1_BRK_TIM15_IRQn),
@@ -970,7 +975,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #if defined(TIM16)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(16, TIM16_FDCAN_IT0_IRQn),
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5) || defined(STM32WL)
     TIM_ENTRY(16, TIM16_IRQn),
     #else
     TIM_ENTRY(16, TIM1_UP_TIM16_IRQn),
@@ -980,7 +985,7 @@ static const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #if defined(TIM17)
     #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
     TIM_ENTRY(17, TIM17_FDCAN_IT1_IRQn),
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5) || 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 63de8cc6fa549..73e36881a7cbc 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -115,6 +115,15 @@
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_WUFIE)
 #endif
 
+#elif defined(STM32U5)
+#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)
+#else
+#define USART_CR3_IE_ALL (USART_CR3_IE_BASE)
+#endif
+
 #endif
 
 typedef struct _machine_uart_irq_map_t {
@@ -664,6 +673,9 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     huart.Init.Mode = UART_MODE_TX_RX;
     huart.Init.HwFlowCtl = flow;
     huart.Init.OverSampling = UART_OVERSAMPLING_16;
+    #if defined(STM32U5)
+    huart.Init.ClockPrescaler = UART_PRESCALER_DIV16;
+    #endif
 
     #if defined(STM32G4) || defined(STM32H7) || defined(STM32N6) // WB also has a fifo..
     huart.FifoMode = UART_FIFOMODE_ENABLE;
@@ -1036,14 +1048,14 @@ uint32_t uart_get_baudrate(machine_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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
             , self->uartx->PRESC
             #endif
             );
     }
     #endif
     return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
         self->uartx->PRESC,
         #endif
         LL_USART_OVERSAMPLING_16);
@@ -1053,7 +1065,7 @@ void uart_set_baudrate(machine_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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
             LL_LPUART_PRESCALER_DIV1,
             #endif
             baudrate);
@@ -1061,7 +1073,7 @@ void uart_set_baudrate(machine_uart_obj_t *self, uint32_t baudrate) {
     }
     #endif
     LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5) || defined(STM32WB) || defined(STM32WL)
         LL_USART_PRESCALER_DIV1,
         #endif
         LL_USART_OVERSAMPLING_16, baudrate);
@@ -1112,7 +1124,7 @@ int uart_rx_char(machine_uart_obj_t *self) {
         return data;
     } else {
         // no buffering
-        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32N6) || defined(STM32U5) || 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;
@@ -1267,7 +1279,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(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) || defined(STM32WL)
+                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32N6) || defined(STM32U5) || 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/usb.c b/ports/stm32/usb.c
index 2d70dcb2619c5..81025e48bac7e 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -69,6 +69,8 @@
 #define MAX_ENDPOINT(dev_id) ((dev_id) == USB_PHY_FS_ID ? 5 : 8)
 #elif defined(STM32H7) || defined(STM32N6)
 #define MAX_ENDPOINT(dev_id) (8)
+#elif defined(STM32U5)
+#define MAX_ENDPOINT(dev_id) (9)
 #endif
 
 // Constants for USB_VCP.irq trigger.
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index d4af54b72968a..2cf79e09e0752 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -182,7 +182,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
 
         // Configure USB GPIO's.
 
-        #if defined(STM32H723xx) || (STM32H7A3xx) || defined(STM32H7A3xxQ)
+        #if defined(STM32H723xx) || (STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32U5)
 
         // These MCUs don't have an alternate function for USB but rather require
         // the pins to be disconnected from all peripherals, ie put in analog mode.
@@ -196,6 +196,33 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         mp_hal_pin_config(pin_A12, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
         mp_hal_pin_config_speed(pin_A12, GPIO_SPEED_FREQ_VERY_HIGH);
 
+        #if defined(STM32U5)
+        HAL_SYSCFG_SetOTGPHYReferenceClockSelection(SYSCFG_OTG_HS_PHY_CLK_SELECT_1);
+
+        // Peripheral clock enable
+        __HAL_RCC_USB_OTG_HS_CLK_ENABLE();
+        __HAL_RCC_USBPHYC_CLK_ENABLE();
+
+        // Enable VDDUSB
+        if (__HAL_RCC_PWR_IS_CLK_DISABLED()) {
+            __HAL_RCC_PWR_CLK_ENABLE();
+            HAL_PWREx_EnableVddUSB();
+
+            // configure VOSR register of USB
+            HAL_PWREx_EnableUSBHSTranceiverSupply();
+            __HAL_RCC_PWR_CLK_DISABLE();
+        } else {
+            HAL_PWREx_EnableVddUSB();
+
+            // configure VOSR register of USB
+            HAL_PWREx_EnableUSBHSTranceiverSupply();
+        }
+
+        // Configuring the SYSCFG registers OTG_HS PHY
+        // OTG_HS PHY enable
+        HAL_SYSCFG_EnableOTGPHY(SYSCFG_OTG_HS_PHY_ENABLE);
+        #endif
+
         #elif defined(STM32N6)
 
         // These MCUs have dedicated USB pins.
@@ -247,7 +274,9 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         #else
 
         // Enable calling WFI and correct function of the embedded USB_FS_IN_HS phy
+        #if !defined(STM32U5)
         __HAL_RCC_USB_OTG_HS_ULPI_CLK_SLEEP_DISABLE();
+        #endif
         __HAL_RCC_USB_OTG_HS_CLK_SLEEP_ENABLE();
 
         // Enable USB HS Clocks
@@ -550,7 +579,7 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const
 
         #if MICROPY_HW_USB_HS_IN_FS
 
-        #if defined(STM32F723xx) || defined(STM32F733xx) || defined(STM32N6)
+        #if defined(STM32F723xx) || defined(STM32F733xx) || defined(STM32N6) || defined(STM32U5)
         pcd_hs_handle.Init.phy_itface = USB_OTG_HS_EMBEDDED_PHY;
         #else
         pcd_hs_handle.Init.phy_itface = PCD_PHY_EMBEDDED;

From e58425a5133399215e3a70bae2add40d78555ef9 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Tue, 22 Jul 2025 23:25:29 +0900
Subject: [PATCH 3030/3129] stm32/boards: Add NUCLEO-U5A5ZJ-Q board support.

This change adds NUCLEO-U5A5ZJ-Q support to the STM32 port.
NUCLEO-U5A5ZJ-Q: https://www.st.com/ja/evaluation-tools/nucleo-u5a5zj-q.html
This board use STM32U5A5ZJ: https://www.st.com/ja/microcontrollers-microprocessors/stm32u5a5zj.html

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 ports/stm32/boards/NUCLEO_U5A5ZJ_Q/board.json |  15 +++
 .../boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.h    |  82 ++++++++++++
 .../boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.mk   |  11 ++
 ports/stm32/boards/NUCLEO_U5A5ZJ_Q/pins.csv   | 123 ++++++++++++++++++
 .../NUCLEO_U5A5ZJ_Q/stm32u5xx_hal_conf.h      |  19 +++
 5 files changed, 250 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_U5A5ZJ_Q/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_U5A5ZJ_Q/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_U5A5ZJ_Q/stm32u5xx_hal_conf.h

diff --git a/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/board.json b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/board.json
new file mode 100644
index 0000000000000..4386b708480b7
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_u5a5zj_q.jpg"
+    ],
+    "mcu": "stm32u5",
+    "product": "Nucleo U5A5ZJ_Q",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.h b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.h
new file mode 100644
index 0000000000000..1b39e136bf29e
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.h
@@ -0,0 +1,82 @@
+#define MICROPY_HW_BOARD_NAME               "NUCLEO_U5A5ZJ_Q"
+#define MICROPY_HW_MCU_NAME                 "STM32U5A5ZJ"
+
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#define MICROPY_HW_ENABLE_ADC               (1)
+#define MICROPY_HW_ENABLE_DAC               (1)
+#define MICROPY_HW_ENABLE_USB               (1)
+#define MICROPY_HW_ENABLE_RNG               (1)
+#define MICROPY_HW_ENABLE_RTC               (1)
+#define MICROPY_HW_HAS_FLASH                (1)
+#define MICROPY_HW_HAS_SWITCH               (1)
+
+// The board has a 16MHz oscillator, the following gives 160MHz CPU speed
+#define MICROPY_HW_CLK_PLLM                 (1)
+#define MICROPY_HW_CLK_PLLN                 (10)
+#define MICROPY_HW_CLK_PLLP                 (10)
+#define MICROPY_HW_CLK_PLLQ                 (2)
+#define MICROPY_HW_CLK_PLLR                 (1)
+#define MICROPY_HW_CLK_PLLVCI               (RCC_PLLVCIRANGE_1)
+#define MICROPY_HW_CLK_PLLFRAC              (0)
+
+// 5 wait states, according to Table 37, Reference Manual (RM0481 Rev 1)
+#define MICROPY_HW_FLASH_LATENCY            FLASH_LATENCY_4
+
+// There is an external 32kHz oscillator
+#define MICROPY_HW_RTC_USE_LSE              (1)
+#define MICROPY_HW_RCC_RTC_CLKSOURCE        (RCC_RTCCLKSOURCE_LSE)
+
+// UART config
+#define MICROPY_HW_UART1_TX                 (pin_A9)
+#define MICROPY_HW_UART1_RX                 (pin_A10)
+#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)
+
+// Connect REPL to UART1 which is provided on ST-Link USB interface
+#define MICROPY_HW_UART_REPL                PYB_UART_1
+#define MICROPY_HW_UART_REPL_BAUD           115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL                 (pin_B8) // Arduino Connector CN7-Pin2 (D15)
+#define MICROPY_HW_I2C1_SDA                 (pin_B9) // Arduino Connector CN7-Pin4 (D14)
+#define MICROPY_HW_I2C2_SCL                 (pin_F1) // Connector CN9-Pin19
+#define MICROPY_HW_I2C2_SDA                 (pin_F0) // Connector CN9-Pin21
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS                 (pin_D14) // Arduino Connector CN7-Pin16 (D10)
+#define MICROPY_HW_SPI1_SCK                 (pin_A5) // Arduino Connector CN7-Pin10 (D13)
+#define MICROPY_HW_SPI1_MISO                (pin_A6) // Arduino Connector CN7-Pin12 (D12)
+#define MICROPY_HW_SPI1_MOSI                (pin_A7) // Arduino Connector CN7-Pin14 (D11)
+#define MICROPY_HW_SPI2_NSS                 (pin_D0)
+#define MICROPY_HW_SPI2_SCK                 (pin_B10)
+#define MICROPY_HW_SPI2_MISO                (pin_D3)
+#define MICROPY_HW_SPI2_MOSI                (pin_C1)
+#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)
+
+// 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_C7) // Green
+#define MICROPY_HW_LED2                     (pin_B7) // Orange
+#define MICROPY_HW_LED3                     (pin_G2) // Red
+#define MICROPY_HW_LED_ON(pin)              (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)             (mp_hal_pin_low(pin))
+
+// USB Configuration
+#define MICROPY_HW_USB_HS                   (1)
+#define MICROPY_HW_USB_HS_IN_FS             (1)
+
+#if 0 // FDCAN bus
+#define MICROPY_HW_CAN1_NAME                "FDCAN1"
+#define MICROPY_HW_CAN1_TX                  (pin_D1)
+#define MICROPY_HW_CAN1_RX                  (pin_D0)
+#endif
diff --git a/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.mk
new file mode 100644
index 0000000000000..e313f189e149f
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/mpconfigboard.mk
@@ -0,0 +1,11 @@
+# MCU settings
+MCU_SERIES = u5
+CMSIS_MCU = STM32U5A5xx
+MICROPY_FLOAT_IMPL = single
+AF_FILE = boards/stm32u5a5_af.csv
+
+LD_FILES = boards/stm32u5a5xj.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+
+# MicroPython settings
+MICROPY_HW_ENABLE_ISR_UART_FLASH_FUNCS_IN_RAM = 1
diff --git a/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/pins.csv b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/pins.csv
new file mode 100644
index 0000000000000..fb0a0d4b9b328
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/pins.csv
@@ -0,0 +1,123 @@
+A0,PA3
+A1,PA2
+A2,PC3
+A3,PB0
+A4,PC1
+A5,PC0
+A6,PB1
+A7,PC2
+A8,PA1
+D0,PG8
+D1,PG7
+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,PD11
+D18,PB13
+D19,PD12
+D20,PA4
+D21,PB4
+D22,PB5
+D23,PB3
+D24,PA4
+D25,PB4
+D26,PA2
+D27,PB10
+D28,PE15
+D29,PB0
+D30,PE12
+D31,PE14
+D32,PA0
+D33,PA8
+D34,PE0
+D35,PB11
+D36,PB10
+D37,PE15
+D38,PE14
+D39,PE12
+D40,PE10
+D41,PE7
+D42,PE8
+D43,PC8
+D44,PC9
+D45,PC10
+D46,PC11
+D47,PC12
+D48,PD2
+D49,PF3
+D50,PF5
+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,PB6
+D72,PB2
+DAC1,PA4
+DAC2,PA5
+LED1,PC7
+LED2,PB7
+LED3,PG2
+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
+UART1_TX,PA9
+UART1_RX,PA10
+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
diff --git a/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/stm32u5xx_hal_conf.h b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/stm32u5xx_hal_conf.h
new file mode 100644
index 0000000000000..3af461418428b
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_U5A5ZJ_Q/stm32u5xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2023 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32U5XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32U5XX_HAL_CONF_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)
+
+#include "boards/stm32u5xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32U5XX_HAL_CONF_H

From 4efc5e12b94082af16520e73ecdd53a67ceddfcf Mon Sep 17 00:00:00 2001
From: ennyKey <ennyKey@fn.de>
Date: Wed, 4 Dec 2024 17:52:42 +0100
Subject: [PATCH 3031/3129] stm32/machine_uart: Implement TX/RX inversion
 parameter for UART on H7.

Implemented the keyword-only parameter `invert` for the `UART.init` method
in accordance with the docs:
- added constants `UART.INV_TX` and `UART.INV_RX`
- added the new `invert` keyword parameter to the `uart_init` function
- adapted the `uart_init` call
- added invert setting to `uart_print` output

The feature applies only to STM32H7.

Signed-off-by: ennyKey <ennyKey@fn.de>
---
 ports/stm32/machine_uart.c | 43 ++++++++++++++++++++++++++++++++++++--
 ports/stm32/main.c         |  2 +-
 ports/stm32/mpbthciport.c  |  2 +-
 ports/stm32/uart.c         | 16 +++++++++++++-
 ports/stm32/uart.h         |  2 +-
 5 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 5bb5b6c99c535..4f251bd660d81 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -37,11 +37,20 @@
 #include "irq.h"
 #include "pendsv.h"
 
+#if defined(STM32H7)
+#define MICROPY_PY_MACHINE_UART_INV_ENTRY \
+    { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_ADVFEATURE_TXINVERT_INIT) }, \
+    { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_ADVFEATURE_RXINVERT_INIT) },
+#else
+#define MICROPY_PY_MACHINE_UART_INV_ENTRY
+#endif
+
 #define MICROPY_PY_MACHINE_UART_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) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_RXIDLE), MP_ROM_INT(UART_FLAG_IDLE) }, \
     { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(UART_FLAG_RXNE) }, \
+    MICROPY_PY_MACHINE_UART_INV_ENTRY \
 
 static void mp_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);
@@ -125,11 +134,27 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
         if (self->mp_irq_trigger != 0) {
             mp_printf(print, "; irq=0x%x", self->mp_irq_trigger);
         }
+        #if defined(STM32H7)
+        mp_print_str(print, ", invert=");
+        if (!(cr2 & (USART_CR2_TXINV | USART_CR2_RXINV))) {
+            mp_print_str(print, "0");
+        } else {
+            if (cr2 & USART_CR2_TXINV) {
+                mp_print_str(print, "INV_TX");
+                if (cr2 & USART_CR2_RXINV) {
+                    mp_print_str(print, "|");
+                }
+            }
+            if (cr2 & USART_CR2_RXINV) {
+                mp_print_str(print, "INV_RX");
+            }
+        }
+        #endif
         mp_print_str(print, ")");
     }
 }
 
-/// \method init(baudrate, bits=8, parity=None, stop=1, *, timeout=1000, timeout_char=0, flow=0, read_buf_len=64)
+/// \method init(baudrate, bits=8, parity=None, stop=1, *, timeout=1000, timeout_char=0, flow=0, read_buf_len=64, invert=0)
 ///
 /// Initialise the UART bus with the given parameters:
 ///
@@ -141,6 +166,7 @@ static void mp_machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_
 ///   - `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).
+///   - `invert` specifies which lines to invert. INV_TX | INV_RX (0 to disable). --> Only for STM32H7
 static void mp_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_REQUIRED | MP_ARG_INT, {.u_int = 9600} },
@@ -152,11 +178,17 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
         { 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 = 64} }, // legacy
+        #if defined(STM32H7)
+        { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        #endif
     };
 
     // parse args
     struct {
         mp_arg_val_t baudrate, bits, parity, stop, flow, timeout, timeout_char, rxbuf, read_buf_len;
+        #if defined(STM32H7)
+        mp_arg_val_t invert;
+        #endif
     } args;
     mp_arg_parse_all(n_args, pos_args, kw_args,
         MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args);
@@ -202,11 +234,18 @@ static void mp_machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args,
     // flow control
     uint32_t flow = args.flow.u_int;
 
+    // inverted
+    #if defined(STM32H7)
+    uint32_t invert = args.invert.u_int;
+    #else
+    uint32_t invert = 0;
+    #endif
+
     // 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)) {
+    if (!uart_init(self, baudrate, bits, parity, stop, flow, invert)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), self->uart_id);
     }
 
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 9ac2b44905bb1..1c59b6479fb5e 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -502,7 +502,7 @@ void stm32_main(uint32_t reset_mode) {
     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_init(&pyb_uart_repl_obj, MICROPY_HW_UART_REPL_BAUD, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, 0, 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(machine_uart_obj_all)[MICROPY_HW_UART_REPL - 1] = &pyb_uart_repl_obj;
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index 3f71146834e91..d8be247651dad 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -184,7 +184,7 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     MP_STATE_PORT(machine_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, baudrate, 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, 0);
     uart_set_rxbuf(&mp_bluetooth_hci_uart_obj, sizeof(hci_uart_rxbuf), hci_uart_rxbuf);
 
     // Add IRQ handler for IDLE (i.e. packet finished).
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 73e36881a7cbc..f1637fd498119 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -265,7 +265,7 @@ bool uart_exists(int uart_id) {
 
 // assumes Init parameters have been set up correctly
 bool uart_init(machine_uart_obj_t *uart_obj,
-    uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow) {
+    uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow, uint32_t invert) {
     USART_TypeDef *UARTx;
     IRQn_Type irqn;
     uint8_t uart_fn = AF_FN_UART;
@@ -677,6 +677,20 @@ bool uart_init(machine_uart_obj_t *uart_obj,
     huart.Init.ClockPrescaler = UART_PRESCALER_DIV16;
     #endif
 
+    #if defined(STM32H7)
+    huart.AdvancedInit.AdvFeatureInit = (UART_ADVFEATURE_TXINVERT_INIT | UART_ADVFEATURE_RXINVERT_INIT);
+    if (invert & UART_ADVFEATURE_RXINVERT_INIT) {
+        huart.AdvancedInit.RxPinLevelInvert = UART_ADVFEATURE_RXINV_ENABLE;
+    } else {
+        huart.AdvancedInit.RxPinLevelInvert = UART_ADVFEATURE_RXINV_DISABLE;
+    }
+    if (invert & UART_ADVFEATURE_TXINVERT_INIT) {
+        huart.AdvancedInit.TxPinLevelInvert = UART_ADVFEATURE_TXINV_ENABLE;
+    } else {
+        huart.AdvancedInit.TxPinLevelInvert = UART_ADVFEATURE_TXINV_DISABLE;
+    }
+    #endif
+
     #if defined(STM32G4) || defined(STM32H7) || defined(STM32N6) // WB also has a fifo..
     huart.FifoMode = UART_FIFOMODE_ENABLE;
     #endif
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index d92434c641c3e..448140f1778ce 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -87,7 +87,7 @@ void uart_init0(void);
 void uart_deinit_all(void);
 bool uart_exists(int uart_id);
 bool uart_init(machine_uart_obj_t *uart_obj,
-    uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow);
+    uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow, uint32_t invert);
 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);

From 6b0e1c2701490260cb81bbe884f42a9c18bea020 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 9 Aug 2024 19:37:10 +1000
Subject: [PATCH 3032/3129] shared/runtime/pyexec: Remove legacy USB IRQ enable
 code.

It's very STM32 USB stack specific and doesn't generalise well to other
ports.  So remove it.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 shared/runtime/pyexec.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 0b253b4ceaa35..7d2a70c01bc6b 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -35,10 +35,6 @@
 #include "py/gc.h"
 #include "py/frozenmod.h"
 #include "py/mphal.h"
-#if MICROPY_HW_ENABLE_USB
-#include "irq.h"
-#include "usb.h"
-#endif
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
 #include "genhdr/mpversion.h"
@@ -582,20 +578,6 @@ int pyexec_friendly_repl(void) {
 
     for (;;) {
     input_restart:
-
-        #if MICROPY_HW_ENABLE_USB
-        if (usb_vcp_is_enabled()) {
-            // If the user gets to here and interrupts are disabled then
-            // they'll never see the prompt, traceback etc. The USB REPL needs
-            // interrupts to be enabled or no transfers occur. So we try to
-            // do the user a favor and re-enable interrupts.
-            if (query_irq() == IRQ_STATE_DISABLED) {
-                enable_irq(IRQ_STATE_ENABLED);
-                mp_hal_stdout_tx_str("MPY: enabling IRQs\r\n");
-            }
-        }
-        #endif
-
         // 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.
         MP_STATE_THREAD(gc_lock_depth) = 0;

From 9bb266e31162ba80ec06a6bc9a6b94b9cbafa9b2 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 28 Oct 2025 16:20:31 +1100
Subject: [PATCH 3033/3129] stm32/usb: Add support for using TinyUSB stack.

This commit adapts the stm32 port to allow switching from STM USB stack to
TinyUSB stack.

Using TinyUSB improves consistancy with other MicroPython ports and brings
in the ability to use the runtime USB definition support recently added to
other TinyUSB based ports.

By default the existing STM USB stack is used.  TinyUSB can be enabled in a
board configuration with:

    #define MICROPY_HW_TINYUSB_STACK (1)

Or, it can be enabled from the command line with:

    make -C ports/stm32 CFLAGS_EXTRA='-DMICROPY_HW_TINYUSB_STACK=1'

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/stm32/Makefile               | 22 ++++++++-
 ports/stm32/main.c                 | 21 ++++++---
 ports/stm32/modmachine.c           |  7 ++-
 ports/stm32/modos.c                |  6 +--
 ports/stm32/modpyb.c               |  2 +-
 ports/stm32/mpconfigboard_common.h | 71 +++++++++++++++++++++++++-----
 ports/stm32/mphalport.c            | 28 ++++++++++++
 ports/stm32/mphalport.h            |  8 ++++
 ports/stm32/stm32_it.c             | 39 +++++++++++++++-
 ports/stm32/usb.c                  |  4 +-
 ports/stm32/usbd.c                 | 42 ++++++++++++++++++
 ports/stm32/usbd_conf.c            | 40 +++++++++++------
 ports/stm32/usbd_conf.h            |  4 ++
 tools/ci.sh                        |  2 +-
 14 files changed, 256 insertions(+), 40 deletions(-)
 create mode 100644 ports/stm32/usbd.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8b35c82a27ce5..5105b35b162e3 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -58,7 +58,7 @@ MBOOT_TEXT0_ADDR ?= 0x08000000
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES += lib/libhydrogen lib/stm32lib
+GIT_SUBMODULES += lib/libhydrogen lib/stm32lib lib/tinyusb
 
 CROSS_COMPILE ?= arm-none-eabi-
 LD_DIR=boards
@@ -110,6 +110,8 @@ 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 += -I$(TOP)/lib/tinyusb/src
+INC += -I$(TOP)/shared/tinyusb/
 INC += -Ilwip_inc
 
 CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_EXTRA)
@@ -213,6 +215,10 @@ SHARED_SRC_C += $(addprefix shared/,\
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
+	tinyusb/mp_usbd.c \
+	tinyusb/mp_usbd_cdc.c \
+	tinyusb/mp_usbd_descriptor.c \
+	tinyusb/mp_usbd_runtime.c \
 	)
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
@@ -242,7 +248,9 @@ SRC_C += \
 	boardctrl.c \
 	main.c \
 	stm32_it.c \
+	usbd.c \
 	usbd_conf.c \
+	usb.c \
 	usbd_desc.c \
 	usbd_cdc_interface.c \
 	usbd_hid_interface.c \
@@ -277,7 +285,6 @@ SRC_C += \
 	can.c \
 	fdcan.c \
 	pyb_can.c \
-	usb.c \
 	eth.c \
 	eth_phy.c \
 	gccollect.c \
@@ -460,6 +467,16 @@ USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
 	class/src/usbd_msc_scsi.c \
 	)
 
+# TinyUSB Stack source
+-include $(TOP)/lib/tinyusb/src/tinyusb.mk
+TINYUSB_SRC_C := $(addprefix lib/tinyusb/, \
+	$(TINYUSB_SRC_C) \
+	src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
+	src/portable/synopsys/dwc2/dcd_dwc2.c \
+	src/portable/synopsys/dwc2/dwc2_common.c \
+	src/portable/synopsys/dwc2/hcd_dwc2.c \
+	)
+
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 LIB_SRC_C += mbedtls/mbedtls_port.c
 endif
@@ -499,6 +516,7 @@ OBJ += $(addprefix $(BUILD)/, $(SHARED_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)/, $(TINYUSB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(GEN_PINS_SRC:.c=.o)
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 1c59b6479fb5e..d56b4c4076ecd 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -88,6 +88,11 @@
 #include "pyb_can.h"
 #include "subghz.h"
 
+#if MICROPY_HW_TINYUSB_STACK
+#include "usbd_conf.h"
+#include "shared/tinyusb/mp_usbd.h"
+#endif
+
 #if MICROPY_PY_THREAD
 static pyb_thread_t pyb_thread_main;
 #endif
@@ -275,14 +280,12 @@ static bool init_sdcard_fs(void) {
                 }
             }
 
-            #if MICROPY_HW_ENABLE_USB
+            #if MICROPY_HW_ENABLE_USB && !MICROPY_HW_TINYUSB_STACK
             if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_NONE) {
                 // if no USB MSC medium is selected then use the SD card
                 pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_SDCARD;
             }
-            #endif
 
-            #if MICROPY_HW_ENABLE_USB
             // only use SD card as current directory if that's what the USB medium is
             if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_SDCARD)
             #endif
@@ -606,8 +609,13 @@ void stm32_main(uint32_t reset_mode) {
     #endif
 
     #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_TINYUSB_STACK
+    pyb_usbd_init();
+    mp_usbd_init();
+    #else
     pyb_usb_init0();
     #endif
+    #endif
 
     #if MICROPY_PY_MACHINE_I2S
     machine_i2s_init0();
@@ -631,7 +639,7 @@ void stm32_main(uint32_t reset_mode) {
     }
     #endif
 
-    #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_STM_USB_STACK
     // if the SD card isn't used as the USB MSC medium then use the internal flash
     if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_NONE) {
         pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_FLASH;
@@ -665,7 +673,7 @@ void stm32_main(uint32_t reset_mode) {
     // or whose initialisation can be safely deferred until after running
     // boot.py.
 
-    #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_STM_USB_STACK
     // 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
@@ -770,6 +778,9 @@ void stm32_main(uint32_t reset_mode) {
     #else
     MP_STATE_PORT(pyb_stdio_uart) = NULL;
     #endif
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE && MICROPY_HW_TINYUSB_STACK
+    mp_usbd_deinit();
+    #endif
 
     MICROPY_BOARD_END_SOFT_RESET(&state);
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 8123cd8011521..c1ac6e0862d28 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -47,6 +47,7 @@
 #include "rtc.h"
 #include "i2c.h"
 #include "spi.h"
+#include "shared/tinyusb/mp_usbd.h"
 
 #if defined(STM32G0)
 // G0 has BOR and POR combined
@@ -297,9 +298,13 @@ MP_NORETURN static void mp_machine_reset(void) {
 
 // Activate the bootloader without BOOT* pins.
 MP_NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) {
-    #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_STM_USB_STACK
     pyb_usb_dev_deinit();
     #endif
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE && MICROPY_HW_TINYUSB_STACK
+    mp_usbd_deinit();
+    #endif
+
     #if MICROPY_HW_ENABLE_STORAGE
     storage_flush();
     #endif
diff --git a/ports/stm32/modos.c b/ports/stm32/modos.c
index 7949cf87cdecd..cd918fe715433 100644
--- a/ports/stm32/modos.c
+++ b/ports/stm32/modos.c
@@ -52,7 +52,7 @@ bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) {
            #if MICROPY_PY_MACHINE_UART
            || type == &machine_uart_type
            #endif
-           #if MICROPY_HW_ENABLE_USB
+           #if MICROPY_HW_STM_USB_STACK
            || type == &pyb_usb_vcp_type
            #endif
     ;
@@ -64,7 +64,7 @@ void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t s
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
     #endif
-    #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_STM_USB_STACK
     if (mp_obj_get_type(stream_detached) == &pyb_usb_vcp_type) {
         usb_vcp_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
@@ -75,7 +75,7 @@ void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t s
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
     }
     #endif
-    #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_STM_USB_STACK
     if (mp_obj_get_type(stream_attached) == &pyb_usb_vcp_type) {
         usb_vcp_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
     }
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 3d8696e3c426e..a985fa39da3cf 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -167,7 +167,7 @@ static const mp_rom_map_elem_t pyb_module_globals_table[] = {
     // Deprecated (use network.country instead).
     { MP_ROM_QSTR(MP_QSTR_country), MP_ROM_PTR(&mod_network_country_obj) },
 
-    #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_STM_USB_STACK
     { MP_ROM_QSTR(MP_QSTR_usb_mode), MP_ROM_PTR(&pyb_usb_mode_obj) },
     #if MICROPY_HW_USB_HID
     { MP_ROM_QSTR(MP_QSTR_hid_mouse), MP_ROM_PTR(&pyb_usb_hid_mouse_obj) },
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index f36cdec8ec7ed..47eb7f036c31c 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -250,12 +250,50 @@
 #error "Old USBD_xxx configuration option used, renamed to MICROPY_HW_USB_xxx"
 #endif
 
+// Select whether TinyUSB or legacy STM stack is used to provide USB.
+#ifndef MICROPY_HW_TINYUSB_STACK
+#define MICROPY_HW_TINYUSB_STACK (0)
+#endif
+
+// Central definition for STM USB stack (when not using TinyUSB)
+#define MICROPY_HW_STM_USB_STACK (MICROPY_HW_ENABLE_USB && !MICROPY_HW_TINYUSB_STACK)
+
+#if MICROPY_HW_TINYUSB_STACK
+#ifndef MICROPY_HW_ENABLE_USBDEV
+#define MICROPY_HW_ENABLE_USBDEV (1)
+#endif
+
+#ifndef MICROPY_HW_USB_CDC
+#define MICROPY_HW_USB_CDC (1)
+#endif
+
+#ifndef MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE    (1) // Support machine.USBDevice
+#endif
+#endif
+
+// Configure maximum number of CDC VCP interfaces, and whether MSC/HID are supported
+#ifndef MICROPY_HW_USB_CDC_NUM
+#define MICROPY_HW_USB_CDC_NUM (1)
+#endif
+#ifndef MICROPY_HW_USB_MSC
+#define MICROPY_HW_USB_MSC (MICROPY_HW_STM_USB_STACK)
+#endif
+#ifndef MICROPY_HW_USB_HID
+#define MICROPY_HW_USB_HID (MICROPY_HW_STM_USB_STACK)
+#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)
+
+// USB PID for TinyUSB Stack.
+#define MICROPY_HW_USB_PID              (0x9802)
+
+// USB PID table for STM USB stack.
 #define MICROPY_HW_USB_PID_CDC_MSC      (0x9800)
 #define MICROPY_HW_USB_PID_CDC_HID      (0x9801)
 #define MICROPY_HW_USB_PID_CDC          (0x9802)
@@ -369,6 +407,8 @@
 #endif
 #define MICROPY_HW_MAX_LPUART (0)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32F4
+
 // Configuration for STM32F7 series
 #elif defined(STM32F7)
 
@@ -384,6 +424,8 @@
 #define MICROPY_HW_MAX_UART (8)
 #define MICROPY_HW_MAX_LPUART (0)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32F7
+
 // Configuration for STM32G0 series
 #elif defined(STM32G0)
 
@@ -394,6 +436,8 @@
 #define MICROPY_HW_MAX_UART (6)
 #define MICROPY_HW_MAX_LPUART (2)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32G0
+
 // Configuration for STM32G4 series
 #elif defined(STM32G4)
 
@@ -404,6 +448,8 @@
 #define MICROPY_HW_MAX_UART (5) // UART1-5 + LPUART1
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32G4
+
 // Configuration for STM32H5 series
 #elif defined(STM32H5)
 
@@ -414,6 +460,8 @@
 #define MICROPY_HW_MAX_UART (12)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32H5
+
 // Configuration for STM32H7A3/B3 series
 #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
     defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -425,6 +473,8 @@
 #define MICROPY_HW_MAX_UART (10)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32H7
+
 // Configuration for STM32H7 series
 #elif defined(STM32H7)
 
@@ -435,6 +485,8 @@
 #define MICROPY_HW_MAX_UART (8)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32H7
+
 #if defined(MICROPY_HW_ANALOG_SWITCH_PA0) \
     || defined(MICROPY_HW_ANALOG_SWITCH_PA1) \
     || defined(MICROPY_HW_ANALOG_SWITCH_PC2) \
@@ -454,6 +506,8 @@
 #define MICROPY_HW_MAX_UART (5)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32L0
+
 // Configuration for STM32L1 series
 #elif defined(STM32L1)
 #define MP_HAL_UNIQUE_ID_ADDRESS (UID_BASE)
@@ -464,6 +518,8 @@
 #define MICROPY_HW_MAX_UART (5)
 #define MICROPY_HW_MAX_LPUART (0)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32L1
+
 // Configuration for STM32L4 series
 #elif defined(STM32L4)
 
@@ -474,6 +530,8 @@
 #define MICROPY_HW_MAX_UART (5)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32L4
+
 // Configuration for STM32N6 series
 #elif defined(STM32N6)
 
@@ -508,6 +566,8 @@
 #define MICROPY_HW_MAX_UART (1)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32WB
+
 #ifndef MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
 #define MICROPY_HW_STM32WB_FLASH_SYNCRONISATION (1)
 #endif
@@ -715,17 +775,6 @@
 #define MICROPY_HW_USB_IS_MULTI_OTG (1)
 #endif
 
-// Configure maximum number of CDC VCP interfaces, and whether MSC/HID are supported
-#ifndef MICROPY_HW_USB_CDC_NUM
-#define MICROPY_HW_USB_CDC_NUM (1)
-#endif
-#ifndef MICROPY_HW_USB_MSC
-#define MICROPY_HW_USB_MSC (MICROPY_HW_ENABLE_USB)
-#endif
-#ifndef MICROPY_HW_USB_HID
-#define MICROPY_HW_USB_HID (MICROPY_HW_ENABLE_USB)
-#endif
-
 // Pin definition header file
 #define MICROPY_PIN_DEFS_PORT_H "pin_defs_stm32.h"
 
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index b13ed0ee15020..51fb32ae8c69f 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -8,6 +8,17 @@
 #include "usb.h"
 #include "uart.h"
 
+#if MICROPY_HW_TINYUSB_STACK
+#include "shared/tinyusb/mp_usbd_cdc.h"
+
+#ifndef MICROPY_HW_STDIN_BUFFER_LEN
+#define MICROPY_HW_STDIN_BUFFER_LEN 512
+#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 };
+#endif
+
 // this table converts from HAL_StatusTypeDef to POSIX errno
 const byte mp_hal_status_to_errno_table[4] = {
     [HAL_OK] = 0,
@@ -26,6 +37,9 @@ MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
 
 MP_WEAK uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
+    #if MICROPY_HW_USB_CDC && MICROPY_HW_TINYUSB_STACK
+    ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
+    #endif
     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;
@@ -53,6 +67,13 @@ MP_WEAK int mp_hal_stdin_rx_chr(void) {
         if (dupterm_c >= 0) {
             return dupterm_c;
         }
+        #if MICROPY_HW_USB_CDC && MICROPY_HW_TINYUSB_STACK
+        mp_usbd_cdc_poll_interfaces(0);
+        int c = ringbuf_get(&stdin_ringbuf);
+        if (c != -1) {
+            return c;
+        }
+        #endif
         MICROPY_EVENT_POLL_HOOK
     }
 }
@@ -64,6 +85,13 @@ MP_WEAK mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
         uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
         did_write = true;
     }
+    #if MICROPY_HW_USB_CDC && MICROPY_HW_TINYUSB_STACK
+    mp_uint_t cdc_res = mp_usbd_cdc_tx_strn(str, len);
+    if (cdc_res > 0) {
+        did_write = true;
+        ret = MIN(cdc_res, ret);
+    }
+    #endif
     #if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
     lcd_print_strn(str, len);
     #endif
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 4d98ce9f192a0..098a848fb843b 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -1,6 +1,8 @@
 // We use the ST Cube HAL library for most hardware peripherals
 #include STM32_HAL_H
 #include "pin.h"
+#include "py/ringbuf.h"
+#include "shared/runtime/interrupt_char.h"
 
 extern uint8_t mp_hal_unique_id_address[12];
 
@@ -41,6 +43,8 @@ static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
     return -mp_hal_status_to_errno_table[status];
 }
 
+extern ringbuf_t stdin_ringbuf;
+
 MP_NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 
@@ -148,3 +152,7 @@ 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);
+
+static inline void mp_hal_wake_main_task_from_isr(void) {
+    // Defined for tinyusb support, nothing needs to be done here.
+}
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 470df4758f7d7..19778020d9aff 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -80,7 +80,13 @@
 #include "uart.h"
 #include "storage.h"
 #include "dma.h"
+
+#if MICROPY_HW_TINYUSB_STACK
+#include "tusb.h"
+#include "shared/tinyusb/mp_usbd.h"
+#else
 #include "usb.h"
+#endif
 
 #if defined(MICROPY_HW_USB_FS)
 extern PCD_HandleTypeDef pcd_fs_handle;
@@ -145,7 +151,7 @@ void HardFault_C_Handler(ExceptionRegisters_t *regs) {
         powerctrl_mcu_reset();
     }
 
-    #if MICROPY_HW_ENABLE_USB
+    #if MICROPY_HW_STM_USB_STACK
     // 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;
@@ -299,7 +305,11 @@ void DebugMon_Handler(void) {
 
 #if MICROPY_HW_USB_FS
 void USB_UCPD1_2_IRQHandler(void) {
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #else
     HAL_PCD_IRQHandler(&pcd_fs_handle);
+    #endif
 }
 #endif
 
@@ -307,7 +317,11 @@ void USB_UCPD1_2_IRQHandler(void) {
 
 #if MICROPY_HW_USB_FS
 void USB_DRD_FS_IRQHandler(void) {
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #else
     HAL_PCD_IRQHandler(&pcd_fs_handle);
+    #endif
 }
 #endif
 
@@ -315,7 +329,11 @@ void USB_DRD_FS_IRQHandler(void) {
 
 #if MICROPY_HW_USB_FS
 void USB_IRQHandler(void) {
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #else
     HAL_PCD_IRQHandler(&pcd_fs_handle);
+    #endif
 }
 #endif
 
@@ -323,7 +341,11 @@ void USB_IRQHandler(void) {
 
 #if MICROPY_HW_USB_FS
 void USB_LP_IRQHandler(void) {
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #else
     HAL_PCD_IRQHandler(&pcd_fs_handle);
+    #endif
 }
 #endif
 
@@ -337,7 +359,11 @@ void USB_LP_IRQHandler(void) {
 #if MICROPY_HW_USB_FS
 void OTG_FS_IRQHandler(void) {
     IRQ_ENTER(OTG_FS_IRQn);
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #else
     HAL_PCD_IRQHandler(&pcd_fs_handle);
+    #endif
     IRQ_EXIT(OTG_FS_IRQn);
 }
 #endif
@@ -345,13 +371,21 @@ void OTG_FS_IRQHandler(void) {
 #if defined(STM32N6)
 void USB1_OTG_HS_IRQHandler(void) {
     IRQ_ENTER(USB1_OTG_HS_IRQn);
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #else
     HAL_PCD_IRQHandler(&pcd_hs_handle);
+    #endif
     IRQ_EXIT(USB1_OTG_HS_IRQn);
 }
 #else
 void OTG_HS_IRQHandler(void) {
     IRQ_ENTER(OTG_HS_IRQn);
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #else
     HAL_PCD_IRQHandler(&pcd_hs_handle);
+    #endif
     IRQ_EXIT(OTG_HS_IRQn);
 }
 #endif
@@ -414,6 +448,9 @@ static void OTG_CMD_WKUP_Handler(PCD_HandleTypeDef *pcd_handle) {
         /* ungate PHY clock */
         __HAL_PCD_UNGATE_PHYCLOCK(pcd_handle);
     }
+    #if MICROPY_HW_TINYUSB_STACK
+    tud_int_handler(0);
+    #endif
 
 }
 #endif
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 81025e48bac7e..15d5637130a0b 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -45,7 +45,7 @@
 #include "sdcard.h"
 #include "usb.h"
 
-#if MICROPY_HW_ENABLE_USB
+#if MICROPY_HW_STM_USB_STACK
 
 // Work out which USB device to use as the main one (the one with the REPL)
 #if !defined(MICROPY_HW_USB_MAIN_DEV)
@@ -1156,4 +1156,4 @@ 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
+#endif // MICROPY_HW_STM_USB_STACK
diff --git a/ports/stm32/usbd.c b/ports/stm32/usbd.c
new file mode 100644
index 0000000000000..35275cd1bd02e
--- /dev/null
+++ b/ports/stm32/usbd.c
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Andrew Leech
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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"
+
+#if MICROPY_HW_ENABLE_USBDEV && MICROPY_HW_TINYUSB_STACK
+
+#include "mp_usbd.h"
+#include "py/mpconfig.h"
+#include "string.h"
+#include "mphalport.h"
+
+void mp_usbd_port_get_serial_number(char *serial_buf) {
+    uint8_t *id = (uint8_t *)MP_HAL_UNIQUE_ID_ADDRESS;
+    MP_STATIC_ASSERT(12 * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
+    mp_usbd_hex_str(serial_buf, id, 12);
+}
+
+#endif
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 2cf79e09e0752..18f350d4a9360 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -37,6 +37,12 @@
 
 #if MICROPY_HW_USB_FS || MICROPY_HW_USB_HS
 
+#if BUILDING_MBOOT
+// TinyUSB not used in mboot
+#undef MICROPY_HW_TINYUSB_STACK
+#endif
+
+// These handles are also used in Interrupt / Wakeup handlers.
 #if MICROPY_HW_USB_FS
 PCD_HandleTypeDef pcd_fs_handle;
 #endif
@@ -56,18 +62,17 @@ PCD_HandleTypeDef pcd_hs_handle;
 #define OTG_HS_IRQn USB1_OTG_HS_IRQn
 #endif
 
-/*******************************************************************************
-                       PCD BSP Routines
-*******************************************************************************/
-
-/**
-  * @brief  Initializes the PCD MSP.
-  * @param  hpcd: PCD handle
-  * @retval None
-  */
-void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
+#if MICROPY_HW_TINYUSB_STACK
+void pyb_usbd_init(void)
+#else
+void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
+#endif
+{
     #if MICROPY_HW_USB_FS
-    if (hpcd->Instance == USB_OTG_FS) {
+    #if MICROPY_HW_STM_USB_STACK
+    if (hpcd->Instance == USB_OTG_FS)
+    #endif
+    {
         // Configure USB GPIO's.
 
         #if defined(STM32G0) || defined(STM32G4)
@@ -139,7 +144,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         #endif
 
         // Enable VDDUSB
-        #if defined(STM32H5)
+        #if defined(STM32H5) || defined(STM32WB)
         HAL_PWREx_EnableVddUSB();
         #elif defined(STM32L4)
         if (__HAL_RCC_PWR_IS_CLK_DISABLED()) {
@@ -172,12 +177,17 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         HAL_NVIC_EnableIRQ(OTG_FS_IRQn);
         #endif
 
+        #if MICROPY_HW_STM_USB_STACK
         return;
+        #endif
     }
     #endif
 
     #if MICROPY_HW_USB_HS
-    if (hpcd->Instance == USB_OTG_HS) {
+    #if MICROPY_HW_STM_USB_STACK
+    if (hpcd->Instance == USB_OTG_HS)
+    #endif
+    {
         #if MICROPY_HW_USB_HS_IN_FS
 
         // Configure USB GPIO's.
@@ -319,6 +329,8 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
     #endif // MICROPY_HW_USB_HS
 }
 
+#if MICROPY_HW_STM_USB_STACK
+
 /**
   * @brief  DeInitializes the PCD MSP.
   * @param  hpcd: PCD handle
@@ -798,6 +810,8 @@ void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state) {
 }
 #endif
 
+#endif // MICROPY_HW_STM_USB_STACK
+
 #endif // MICROPY_HW_USB_FS || MICROPY_HW_USB_HS
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbd_conf.h b/ports/stm32/usbd_conf.h
index e61e7ce7efe43..cb0457982d5eb 100644
--- a/ports/stm32/usbd_conf.h
+++ b/ports/stm32/usbd_conf.h
@@ -64,6 +64,10 @@
 #define USBD_HS_NUM_TX_FIFO                   (9)
 #define USBD_HS_NUM_FIFO                      (1 + USBD_HS_NUM_TX_FIFO)
 
+#if MICROPY_HW_TINYUSB_STACK
+void pyb_usbd_init(void);
+#endif
+
 #endif // MICROPY_INCLUDED_STM32_USBD_CONF_H
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/tools/ci.sh b/tools/ci.sh
index 5d401843be386..42d231c458127 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -511,7 +511,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=STM32H573I_DK
+    make ${MAKEOPTS} -C ports/stm32 BOARD=STM32H573I_DK CFLAGS_EXTRA='-DMICROPY_HW_TINYUSB_STACK=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 faae8e73ef654339bd2adfab2b658e6e7f5ef368 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 28 Oct 2025 16:20:31 +1100
Subject: [PATCH 3034/3129] stm32/usb: Add TinyUSB Mass Storage support.

Implements USB MSC functionality for STM32 port when using TinyUSB stack,
supporting both internal Flash and SD card storage mediums.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/stm32/Makefile                          |   1 +
 ports/stm32/main.c                            |   4 +-
 ports/stm32/mpconfigboard_common.h            |   7 +-
 ports/stm32/msc_disk.c                        | 191 ++++++++++++++++++
 ports/stm32/storage.c                         |  10 +
 ports/stm32/usb.c                             |   2 +
 ports/stm32/usb.h                             |  11 +-
 .../stm32/usbdev/class/src/usbd_cdc_msc_hid.c |   2 +-
 8 files changed, 223 insertions(+), 5 deletions(-)
 create mode 100644 ports/stm32/msc_disk.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 5105b35b162e3..b43f284b1abee 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -256,6 +256,7 @@ SRC_C += \
 	usbd_hid_interface.c \
 	usbd_msc_interface.c \
 	mphalport.c \
+	msc_disk.c \
 	mpnetworkport.c \
 	mpthreadport.c \
 	irq.c \
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index d56b4c4076ecd..2d97adb1d4048 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -280,7 +280,7 @@ static bool init_sdcard_fs(void) {
                 }
             }
 
-            #if MICROPY_HW_ENABLE_USB && !MICROPY_HW_TINYUSB_STACK
+            #if MICROPY_HW_USB_MSC
             if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_NONE) {
                 // if no USB MSC medium is selected then use the SD card
                 pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_SDCARD;
@@ -639,7 +639,7 @@ void stm32_main(uint32_t reset_mode) {
     }
     #endif
 
-    #if MICROPY_HW_STM_USB_STACK
+    #if MICROPY_HW_USB_MSC
     // if the SD card isn't used as the USB MSC medium then use the internal flash
     if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_NONE) {
         pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_FLASH;
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 47eb7f036c31c..eefd5c05c1b2b 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -277,7 +277,7 @@
 #define MICROPY_HW_USB_CDC_NUM (1)
 #endif
 #ifndef MICROPY_HW_USB_MSC
-#define MICROPY_HW_USB_MSC (MICROPY_HW_STM_USB_STACK)
+#define MICROPY_HW_USB_MSC (MICROPY_HW_ENABLE_USB)
 #endif
 #ifndef MICROPY_HW_USB_HID
 #define MICROPY_HW_USB_HID (MICROPY_HW_STM_USB_STACK)
@@ -695,8 +695,13 @@
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(MICROPY_HW_BDEV_SPIFLASH, (src), MICROPY_HW_BDEV_SPIFLASH_OFFSET_BLOCKS + (bl), (n))
 #endif
 
+// Define the FATFS maximum sector size.
+#ifndef MICROPY_FATFS_MAX_SS
 #if defined(STM32N6)
 #define MICROPY_FATFS_MAX_SS                    (4096)
+#else
+#define MICROPY_FATFS_MAX_SS                    (512)
+#endif
 #endif
 
 // Whether to enable caching for external SPI flash, to allow block writes that are
diff --git a/ports/stm32/msc_disk.c b/ports/stm32/msc_disk.c
new file mode 100644
index 0000000000000..f32957cdea72c
--- /dev/null
+++ b/ports/stm32/msc_disk.c
@@ -0,0 +1,191 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2025 Andrew Leech
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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"
+
+#if MICROPY_HW_USB_MSC && MICROPY_HW_TINYUSB_STACK
+
+#include "py/misc.h"
+#include "tusb.h"
+#include "storage.h"
+#include "sdcard.h"
+#include "usb.h"
+
+// Storage medium selection (shared with main.c for compatibility)
+pyb_usb_storage_medium_t pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_NONE;
+
+// Ejection state
+static bool msc_ejected = false;
+
+// Invoked on SCSI_CMD_INQUIRY.
+// 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]) {
+    (void)lun;
+    memcpy(vendor_id, MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING), 8));
+    memcpy(product_id, MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING), 16));
+    memcpy(product_rev, MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING, MIN(strlen(MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING), 4));
+}
+
+// Invoked on 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) {
+    (void)lun;
+
+    if (msc_ejected || pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_NONE) {
+        tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3a, 0x00);
+        return false;
+    }
+
+    #if MICROPY_HW_ENABLE_SDCARD
+    if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_SDCARD) {
+        if (!sdcard_is_present()) {
+            tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3a, 0x00);
+            return false;
+        }
+    }
+    #endif
+
+    return true;
+}
+
+// Invoked on SCSI_CMD_READ_CAPACITY_10 and SCSI_CMD_READ_FORMAT_CAPACITY to determine the disk size.
+void tud_msc_capacity_cb(uint8_t lun, uint32_t *block_count, uint16_t *block_size) {
+    (void)lun;
+
+    if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_FLASH) {
+        *block_size = storage_get_block_size();
+        *block_count = storage_get_block_count();
+    #if MICROPY_HW_ENABLE_SDCARD
+    } else if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_SDCARD) {
+        *block_size = SDCARD_BLOCK_SIZE;
+        *block_count = sdcard_get_capacity_in_bytes() / (uint64_t)SDCARD_BLOCK_SIZE;
+    #endif
+    } else {
+        *block_size = 0;
+        *block_count = 0;
+    }
+}
+
+// Invoked on 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) {
+    (void)lun;
+    (void)power_condition;
+
+    if (load_eject) {
+        if (start) {
+            // Load disk storage
+            msc_ejected = false;
+        } else {
+            // Unload disk storage
+            msc_ejected = true;
+        }
+    }
+    return true;
+}
+
+// Callback invoked on READ10 command.
+// Copy disk's data to buffer (up to bufsize) and return number of read bytes.
+int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void *buffer, uint32_t bufsize) {
+    (void)lun;
+    (void)offset;
+
+    if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_FLASH) {
+        uint32_t block_count = bufsize / FLASH_BLOCK_SIZE;
+        int ret = storage_read_blocks(buffer, lba, block_count);
+        if (ret != 0) {
+            return -1;
+        }
+        return block_count * FLASH_BLOCK_SIZE;
+    #if MICROPY_HW_ENABLE_SDCARD
+    } else if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_SDCARD) {
+        uint32_t block_count = bufsize / SDCARD_BLOCK_SIZE;
+        if (sdcard_read_blocks(buffer, lba, block_count) != 0) {
+            return -1;
+        }
+        return block_count * SDCARD_BLOCK_SIZE;
+    #endif
+    }
+
+    return -1;
+}
+
+// Callback invoked on 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) {
+    (void)lun;
+    (void)offset;
+
+    if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_FLASH) {
+        uint32_t block_count = bufsize / FLASH_BLOCK_SIZE;
+        int ret = storage_write_blocks(buffer, lba, block_count);
+        if (ret != 0) {
+            return -1;
+        }
+        return block_count * FLASH_BLOCK_SIZE;
+    #if MICROPY_HW_ENABLE_SDCARD
+    } else if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_SDCARD) {
+        uint32_t block_count = bufsize / SDCARD_BLOCK_SIZE;
+        if (sdcard_write_blocks(buffer, lba, block_count) != 0) {
+            return -1;
+        }
+        return block_count * SDCARD_BLOCK_SIZE;
+    #endif
+    }
+
+    return -1;
+}
+
+// Callback invoked on a SCSI command that's not handled by TinyUSB.
+int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, uint16_t bufsize) {
+    (void)lun;
+    (void)buffer;
+    (void)bufsize;
+
+    int32_t resplen = 0;
+    switch (scsi_cmd[0]) {
+        case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
+            // Sync the logical unit if needed.
+            #if MICROPY_HW_ENABLE_STORAGE
+            if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_FLASH) {
+                storage_flush();
+            }
+            #endif
+            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 // MICROPY_HW_USB_MSC && MICROPY_HW_TINYUSB_STACK
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index d26ac821e5952..066fb48a603d3 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -171,6 +171,12 @@ bool storage_read_block(uint8_t *dest, uint32_t block) {
 
         return true;
 
+    } else if (block < FLASH_PART1_START_BLOCK) {
+        // Blocks between MBR and first partition: return zeros
+        // (This handles blocks 1 to FLASH_PART1_START_BLOCK-1)
+        memset(dest, 0, FLASH_BLOCK_SIZE);
+        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);
@@ -184,6 +190,10 @@ bool storage_write_block(const uint8_t *src, uint32_t block) {
     if (block == 0) {
         // can't write MBR, but pretend we did
         return true;
+    } else if (block < FLASH_PART1_START_BLOCK) {
+        // Blocks between MBR and first partition: ignore writes
+        // (This handles blocks 1 to FLASH_PART1_START_BLOCK-1)
+        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);
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 15d5637130a0b..c17d049124fbc 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -92,7 +92,9 @@ typedef struct _usb_device_t {
 } usb_device_t;
 
 usb_device_t usb_device = {0};
+#if MICROPY_HW_USB_MSC
 pyb_usb_storage_medium_t pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_NONE;
+#endif
 
 #if !MICROPY_HW_USB_IS_MULTI_OTG
 
diff --git a/ports/stm32/usb.h b/ports/stm32/usb.h
index 3c382887adce5..70e3ee64c7b81 100644
--- a/ports/stm32/usb.h
+++ b/ports/stm32/usb.h
@@ -26,7 +26,9 @@
 #ifndef MICROPY_INCLUDED_STM32_USB_H
 #define MICROPY_INCLUDED_STM32_USB_H
 
+#if MICROPY_HW_STM_USB_STACK
 #include "usbd_cdc_msc_hid0.h"
+#endif
 
 #define PYB_USB_FLAG_USB_MODE_CALLED    (0x0002)
 
@@ -41,10 +43,16 @@ typedef enum {
     USB_PHY_HS_ID = 1,
 } USB_PHY_ID;
 
+// Storage medium variable used by both USB stacks when MSC is enabled
+#if MICROPY_HW_USB_MSC
+extern pyb_usb_storage_medium_t pyb_usb_storage_medium;
+#endif
+
+#if MICROPY_HW_STM_USB_STACK
+
 typedef struct _pyb_usb_vcp_obj_t pyb_usb_vcp_obj_t;
 
 extern mp_uint_t pyb_usb_flags;
-extern pyb_usb_storage_medium_t pyb_usb_storage_medium;
 extern const struct _mp_rom_obj_tuple_t pyb_usb_hid_mouse_obj;
 extern const struct _mp_rom_obj_tuple_t pyb_usb_hid_keyboard_obj;
 extern const mp_obj_type_t pyb_usb_vcp_type;
@@ -66,5 +74,6 @@ void usb_vcp_attach_to_repl(const pyb_usb_vcp_obj_t *self, bool attached);
 void pyb_usb_host_init(void);
 void pyb_usb_host_process(void);
 uint pyb_usb_host_get_keyboard(void);
+#endif
 
 #endif // MICROPY_INCLUDED_STM32_USB_H
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 65d2fd70e5cfe..e541c32134372 100644
--- a/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c
+++ b/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c
@@ -28,7 +28,7 @@
 #include "usbd_ioreq.h"
 #include "usbd_cdc_msc_hid.h"
 
-#if MICROPY_HW_ENABLE_USB
+#if MICROPY_HW_STM_USB_STACK
 
 #define HEAD_DESC_SIZE (9)
 #define MSC_CLASS_DESC_SIZE (9 + 7 + 7)

From 27b7bf36a33f7c51a976c41b8682d7acfb4201cb Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 23 Oct 2025 09:48:00 +1100
Subject: [PATCH 3035/3129] stm32/usb: Add VBUS sensing configuration for
 TinyUSB on F4/F7.

TinyUSB's `dwc2_phy_init()` only sets the PWRDWN bit in the GCCFG register
but doesn't configure VBUS sensing, which is required for the DWC2 USB
controller to detect host connection on STM32F4 and STM32F7 series.

Without VBUS sensing configured, USB devices fail to enumerate on these
platforms when using the TinyUSB stack, while the legacy STM32 USB stack
works because it includes this configuration.

This commit adds VBUS sensing configuration in `pyb_usbd_init()` for
TinyUSB mode on STM32F4/F7:
- When VBUS detect pin is configured (typically PA9): Enable "B device"
  VBUS sensing (USB_OTG_GCCFG_VBUSBSEN)
- When no VBUS pin: Force VBUS valid (USB_OTG_GCCFG_NOVBUSSENS)

Tested on:
- NUCLEO-F429ZI: USB now enumerates successfully (CDC + MSC)
- NUCLEO-H563ZI: No regression (STM32H5 uses different register layout)

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/stm32/usbd_conf.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 18f350d4a9360..76142789d413a 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -177,6 +177,22 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
         HAL_NVIC_EnableIRQ(OTG_FS_IRQn);
         #endif
 
+        #if MICROPY_HW_TINYUSB_STACK
+        // Configure VBUS sensing for TinyUSB on STM32F4/F7 which have separate GCCFG register
+        // The DWC2 PHY init only sets PWRDWN bit, but doesn't configure VBUS sensing
+        #if defined(STM32F4) || defined(STM32F7)
+        #if defined(MICROPY_HW_USB_VBUS_DETECT_PIN)
+        // Enable VBUS sensing in "B device" mode (using PA9)
+        USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_NOVBUSSENS;
+        USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_VBUSBSEN;
+        #else
+        // Force VBUS valid (no VBUS detect pin configured)
+        USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_NOVBUSSENS;
+        USB_OTG_FS->GCCFG &= ~(USB_OTG_GCCFG_VBUSBSEN | USB_OTG_GCCFG_VBUSASEN);
+        #endif
+        #endif
+        #endif
+
         #if MICROPY_HW_STM_USB_STACK
         return;
         #endif

From 3da529554d013cce2eec7736dea3f2c561563a52 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sat, 25 Oct 2025 18:39:08 +0200
Subject: [PATCH 3036/3129] py/emitinlinerv32: Refactor opcode arguments
 validation.

This commit simplifies the way arguments are validated when processing
RV32 inline assembler opcodes.

Opcode arguments were handled in two separate passes, one that performed
a pure validation (with an early rejection in case of errors), and
another that converted the parse node into a serialised value but
without any error checking.

Considering that the validation pass effectively performed the parse
node conversion and then discarded its result once validated, it is
preferable to hold onto the serialised result to reuse it later at
opcode generation time.

With these changes, those two passes are merged into one single
operation when applicable (basically any opcode that doesn't use an
integer offset), removing a fair amount of duplicate code.  The size
savings should be around half a kilobyte, with no other changes in the
assembler's behaviour.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitinlinerv32.c | 149 +++++++++++++++-----------------------------
 1 file changed, 49 insertions(+), 100 deletions(-)

diff --git a/py/emitinlinerv32.c b/py/emitinlinerv32.c
index 8693b3bd1c03c..948b693179fe5 100644
--- a/py/emitinlinerv32.c
+++ b/py/emitinlinerv32.c
@@ -196,7 +196,6 @@ typedef enum {
     CALL_R,   // Opcode Register
     CALL_RL,  // Opcode Register, Label
     CALL_N,   // Opcode
-    CALL_I,   // Opcode Immediate
     CALL_RII, // Opcode Register, Register, Immediate
     CALL_RIR, // Opcode Register, Immediate(Register)
     CALL_COUNT
@@ -210,7 +209,6 @@ typedef enum {
 #define U (1 << 2) // Unsigned immediate
 #define Z (1 << 3) // Non-zero
 
-typedef void (*call_l_t)(asm_rv32_t *state, mp_uint_t label_index);
 typedef void (*call_ri_t)(asm_rv32_t *state, mp_uint_t rd, mp_int_t immediate);
 typedef void (*call_rri_t)(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_int_t immediate);
 typedef void (*call_rii_t)(asm_rv32_t *state, mp_uint_t rd, mp_uint_t immediate1, mp_int_t immediate2);
@@ -439,8 +437,7 @@ static bool validate_integer(mp_uint_t value, mp_uint_t mask, mp_uint_t flags) {
 #define ET_WRONG_ARGUMENTS_COUNT MP_ERROR_TEXT("opcode '%q': expecting %d arguments")
 #define ET_OUT_OF_RANGE          MP_ERROR_TEXT("opcode '%q' argument %d: out of range")
 
-static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
-    const opcode_t *opcode, mp_parse_node_t node, mp_uint_t node_index) {
+static bool serialise_argument(emit_inline_asm_t *emit, const opcode_t *opcode, mp_parse_node_t node, mp_uint_t node_index, mp_uint_t *serialised) {
     assert((node_index < 3) && "Invalid argument node number.");
 
     uint32_t kind = 0;
@@ -470,17 +467,19 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
             break;
     }
 
+    mp_uint_t serialised_value = 0;
+
     switch (kind & 0x03) {
         case N:
             assert(mask == OPCODE_MASKS[MASK_NOT_USED] && "Invalid mask index for missing operand.");
-            return true;
+            break;
 
         case R: {
             mp_uint_t register_index;
             if (!parse_register_node(node, &register_index, false)) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_register));
+                        ET_WRONG_ARGUMENT_KIND, opcode->qstring, node_index + 1, MP_QSTR_register));
                 return false;
             }
 
@@ -488,11 +487,11 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
                         MP_ERROR_TEXT("opcode '%q' argument %d: unknown register"),
-                        opcode_qstr, node_index + 1));
+                        opcode->qstring, node_index + 1));
                 return false;
             }
 
-            return true;
+            serialised_value = (kind & C) ? RV32_MAP_IN_C_REGISTER_WINDOW(register_index) : register_index;
         }
         break;
 
@@ -501,7 +500,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
             if (!mp_parse_node_get_int_maybe(node, &object)) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_integer));
+                        ET_WRONG_ARGUMENT_KIND, opcode->qstring, node_index + 1, MP_QSTR_integer));
                 return false;
             }
 
@@ -520,7 +519,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
                 goto zero_immediate;
             }
 
-            return true;
+            serialised_value = immediate;
         }
         break;
 
@@ -528,7 +527,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
             if (!MP_PARSE_NODE_IS_ID(node)) {
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                        ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_label));
+                        ET_WRONG_ARGUMENT_KIND, opcode->qstring, node_index + 1, MP_QSTR_label));
                 return false;
             }
 
@@ -538,7 +537,7 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
                 emit_inline_rv32_error_exc(emit,
                     mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
                         MP_ERROR_TEXT("opcode '%q' argument %d: undefined label '%q'"),
-                        opcode_qstr, node_index + 1, qstring));
+                        opcode->qstring, node_index + 1, qstring));
                 return false;
             }
 
@@ -552,27 +551,33 @@ static bool validate_argument(emit_inline_asm_t *emit, qstr opcode_qstr,
                     goto out_of_range;
                 }
             }
-            return true;
+
+            serialised_value = displacement;
         }
         break;
 
         default:
             assert(!"Unknown argument kind");
+            MP_UNREACHABLE;
             break;
     }
 
-    return false;
+    if (serialised != NULL) {
+        *serialised = serialised_value;
+    }
+
+    return true;
 
 out_of_range:
     emit_inline_rv32_error_exc(emit,
-        mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode_qstr, node_index + 1));
+        mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode->qstring, node_index + 1));
     return false;
 
 zero_immediate:
     emit_inline_rv32_error_exc(emit,
         mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
             MP_ERROR_TEXT("opcode '%q' argument %d: must not be zero"),
-            opcode_qstr, node_index + 1));
+            opcode->qstring, node_index + 1));
     return false;
 }
 
@@ -618,14 +623,14 @@ static bool parse_register_offset_node(emit_inline_asm_t *emit, qstr opcode_qstr
             return false;
         }
     } else {
-        if (!validate_argument(emit, opcode_qstr, opcode_data, node_struct->nodes[0], 1)) {
+        if (!serialise_argument(emit, opcode_data, node_struct->nodes[0], 1, NULL)) {
             return false;
         }
     }
 
     *offset_node = node_struct->nodes[0];
     node_struct = (mp_parse_node_struct_t *)node_struct->nodes[1];
-    if (!validate_argument(emit, opcode_qstr, opcode_data, node_struct->nodes[0], 2)) {
+    if (!serialise_argument(emit, opcode_data, node_struct->nodes[0], 2, NULL)) {
         return false;
     }
     *register_node = node_struct->nodes[0];
@@ -638,115 +643,58 @@ static bool parse_register_offset_node(emit_inline_asm_t *emit, qstr opcode_qstr
     return false;
 }
 
-static void handle_opcode(emit_inline_asm_t *emit, qstr opcode, const opcode_t *opcode_data, mp_parse_node_t *arguments) {
-    mp_uint_t rd = 0;
-    mp_uint_t rs1 = 0;
-    mp_uint_t rs2 = 0;
-
+static void handle_opcode(emit_inline_asm_t *emit, const opcode_t *opcode_data, mp_uint_t *arguments) {
     switch (opcode_data->calling_convention) {
-        case CALL_RRR: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
-            parse_register_node(arguments[2], &rs2, opcode_data->argument3_kind & C);
-            ((call_rrr_t)opcode_data->emitter)(&emit->as, rd, rs1, rs2);
+        case CALL_RRR:
+            ((call_rrr_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[1], arguments[2]);
             break;
-        }
 
-        case CALL_RR: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
-            ((call_rr_t)opcode_data->emitter)(&emit->as, rd, rs1);
+        case CALL_RR:
+            ((call_rr_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[1]);
             break;
-        }
 
-        case CALL_RRI: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
-            mp_obj_t object;
-            mp_parse_node_get_int_maybe(arguments[2], &object);
-            mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument3_shift;
-            ((call_rri_t)opcode_data->emitter)(&emit->as, rd, rs1, immediate);
+        case CALL_RRI:
+            ((call_rri_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[1], arguments[2]);
             break;
-        }
 
-        case CALL_RI: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            mp_obj_t object;
-            mp_parse_node_get_int_maybe(arguments[1], &object);
-            mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument2_shift;
-            ((call_ri_t)opcode_data->emitter)(&emit->as, rd, immediate);
+        case CALL_RI:
+            ((call_ri_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[1]);
             break;
-        }
 
-        case CALL_R: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            ((call_r_t)opcode_data->emitter)(&emit->as, rd);
+        case CALL_R:
+            ((call_r_t)opcode_data->emitter)(&emit->as, arguments[0]);
             break;
-        }
 
-        case CALL_RRL: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            parse_register_node(arguments[1], &rs1, opcode_data->argument2_kind & C);
-            qstr qstring;
-            mp_uint_t label_index = lookup_label(emit, arguments[2], &qstring);
-            ptrdiff_t displacement = label_code_offset(emit, label_index);
-            ((call_rri_t)opcode_data->emitter)(&emit->as, rd, rs1, displacement);
+        case CALL_RRL:
+            ((call_rri_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[1], (ptrdiff_t)arguments[2]);
             break;
-        }
 
-        case CALL_RL: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            qstr qstring;
-            mp_uint_t label_index = lookup_label(emit, arguments[1], &qstring);
-            ptrdiff_t displacement = label_code_offset(emit, label_index);
-            ((call_ri_t)opcode_data->emitter)(&emit->as, rd, displacement);
+        case CALL_RL:
+            ((call_ri_t)opcode_data->emitter)(&emit->as, arguments[0], (ptrdiff_t)arguments[1]);
             break;
-        }
 
-        case CALL_L: {
-            qstr qstring;
-            mp_uint_t label_index = lookup_label(emit, arguments[0], &qstring);
-            ptrdiff_t displacement = label_code_offset(emit, label_index);
-            ((call_i_t)opcode_data->emitter)(&emit->as, displacement);
+        case CALL_L:
+            ((call_i_t)opcode_data->emitter)(&emit->as, (ptrdiff_t)arguments[0]);
             break;
-        }
 
         case CALL_N:
             ((call_n_t)opcode_data->emitter)(&emit->as);
             break;
 
-        case CALL_I: {
-            mp_obj_t object;
-            mp_parse_node_get_int_maybe(arguments[0], &object);
-            mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument1_shift;
-            ((call_i_t)opcode_data->emitter)(&emit->as, immediate);
-            break;
-        }
-
-        case CALL_RII: {
-            parse_register_node(arguments[0], &rd, opcode_data->argument1_kind & C);
-            mp_obj_t object;
-            mp_parse_node_get_int_maybe(arguments[1], &object);
-            mp_uint_t immediate1 = mp_obj_get_int_truncated(object) << opcode_data->argument2_shift;
-            mp_parse_node_get_int_maybe(arguments[2], &object);
-            mp_uint_t immediate2 = mp_obj_get_int_truncated(object) << opcode_data->argument3_shift;
-            ((call_rii_t)opcode_data->emitter)(&emit->as, rd, immediate1, immediate2);
-            break;
-        }
-
-        case CALL_RIR:
-            assert(!"Should not get here.");
+        case CALL_RII:
+            ((call_rii_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[1], arguments[2]);
             break;
 
         default:
             assert(!"Unhandled call convention.");
+            MP_UNREACHABLE;
             break;
     }
 }
 
 static bool handle_load_store_opcode_with_offset(emit_inline_asm_t *emit, qstr opcode, const opcode_t *opcode_data, mp_parse_node_t *argument_nodes) {
     mp_parse_node_t nodes[3] = {0};
-    if (!validate_argument(emit, opcode, opcode_data, argument_nodes[0], 0)) {
+    if (!serialise_argument(emit, opcode_data, argument_nodes[0], 0, NULL)) {
         return false;
     }
     nodes[0] = argument_nodes[0];
@@ -806,16 +754,17 @@ static void emit_inline_rv32_opcode(emit_inline_asm_t *emit, qstr opcode, mp_uin
                     ET_WRONG_ARGUMENTS_COUNT, opcode, opcode_data->arguments_count));
             return;
         }
-        if (opcode_data->arguments_count >= 1 && !validate_argument(emit, opcode, opcode_data, argument_nodes[0], 0)) {
+        mp_uint_t serialised_arguments[3] = { 0 };
+        if (opcode_data->arguments_count >= 1 && !serialise_argument(emit, opcode_data, argument_nodes[0], 0, &serialised_arguments[0])) {
             return;
         }
-        if (opcode_data->arguments_count >= 2 && !validate_argument(emit, opcode, opcode_data, argument_nodes[1], 1)) {
+        if (opcode_data->arguments_count >= 2 && !serialise_argument(emit, opcode_data, argument_nodes[1], 1, &serialised_arguments[1])) {
             return;
         }
-        if (opcode_data->arguments_count >= 3 && !validate_argument(emit, opcode, opcode_data, argument_nodes[2], 2)) {
+        if (opcode_data->arguments_count >= 3 && !serialise_argument(emit, opcode_data, argument_nodes[2], 2, &serialised_arguments[2])) {
             return;
         }
-        handle_opcode(emit, opcode, opcode_data, argument_nodes);
+        handle_opcode(emit, opcode_data, serialised_arguments);
         return;
     }
 

From 385e4f3d0cb726a33beaca17bf403f1850bb3cbf Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Sun, 26 Oct 2025 20:21:15 +0100
Subject: [PATCH 3037/3129] py/emitinlinerv32: Refactor load/store opcodes
 validation.

This commit minimises the amount of code required to perform validation
of load/store opcodes, streamlining their validation and serialisation.

Load/store opcodes used to be handled as a special case due to how its
peculiar syntax yields parse node arguments that cannot be handled by
the regular validation and serialisation functions.

The changes in this commit attempt to reduce the amount of special code
needed for those opcodes to its bare minimum, by removing the special
opcode handling step, merging the validation and serialisation pass for
the combined offset + base register operand, and integrate said changes
in the existing argument handling structure.

That allowed to rework the special operand parsing function to make it
smaller, and remove the code that performed the special case validation
and emitted the opcode.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitinlinerv32.c | 140 ++++++++++++++++----------------------------
 1 file changed, 52 insertions(+), 88 deletions(-)

diff --git a/py/emitinlinerv32.c b/py/emitinlinerv32.c
index 948b693179fe5..a5f4c49c29409 100644
--- a/py/emitinlinerv32.c
+++ b/py/emitinlinerv32.c
@@ -223,7 +223,7 @@ typedef struct _opcode_t {
     uint16_t argument1_mask : 4;
     uint16_t argument2_mask : 4;
     uint16_t argument3_mask : 4;
-    uint16_t arguments_count : 2;
+    uint16_t parse_nodes : 2;
     // 2 bits available here
     uint32_t calling_convention : 4;
     uint32_t argument1_kind : 4;
@@ -327,7 +327,7 @@ static const opcode_t OPCODES[] = {
     { MP_QSTR_c_jr,       MASK_FFFFFFFE, MASK_NOT_USED, MASK_NOT_USED, 1, CALL_R,   R,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cjr       },
     { MP_QSTR_c_li,       MASK_FFFFFFFE, MASK_0000003F, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cli       },
     { MP_QSTR_c_lui,      MASK_FFFFFFFA, MASK_0001F800, MASK_NOT_USED, 2, CALL_RI,  R,  0, IUZ, 12, N,  0, RV32_EXT_NONE, asm_rv32_opcode_clui      },
-    { MP_QSTR_c_lw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, RV32_EXT_NONE, asm_rv32_opcode_clw       },
+    { MP_QSTR_c_lw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 2, CALL_RIR, RC, 0, I,   0,  RC, 0, RV32_EXT_NONE, asm_rv32_opcode_clw       },
     { MP_QSTR_c_lwsp,     MASK_FFFFFFFE, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_clwsp     },
     { MP_QSTR_c_mv,       MASK_FFFFFFFE, MASK_FFFFFFFE, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cmv       },
     { MP_QSTR_c_nop,      MASK_NOT_USED, MASK_NOT_USED, MASK_NOT_USED, 0, CALL_N,   N,  0, N,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cnop      },
@@ -336,7 +336,7 @@ static const opcode_t OPCODES[] = {
     { MP_QSTR_c_srai,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_csrai     },
     { MP_QSTR_c_srli,     MASK_0000FF00, MASK_0000001F, MASK_NOT_USED, 2, CALL_RI,  RC, 0, IU,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_csrli     },
     { MP_QSTR_c_sub,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_csub      },
-    { MP_QSTR_c_sw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 3, CALL_RIR, RC, 0, I,   0,  RC, 0, RV32_EXT_NONE, asm_rv32_opcode_csw       },
+    { MP_QSTR_c_sw,       MASK_0000FF00, MASK_0000007C, MASK_0000FF00, 2, CALL_RIR, RC, 0, I,   0,  RC, 0, RV32_EXT_NONE, asm_rv32_opcode_csw       },
     { MP_QSTR_c_swsp,     MASK_FFFFFFFF, MASK_000000FC, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cswsp     },
     { MP_QSTR_c_xor,      MASK_0000FF00, MASK_0000FF00, MASK_NOT_USED, 2, CALL_RR,  RC, 0, RC,  0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cxor      },
     { MP_QSTR_div,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_div       },
@@ -346,13 +346,13 @@ static const opcode_t OPCODES[] = {
     { MP_QSTR_jal,        MASK_FFFFFFFF, MASK_001FFFFE, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_jal       },
     { MP_QSTR_jalr,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_jalr      },
     { MP_QSTR_la,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RL,  R,  0, L,   0,  N,  0, RV32_EXT_NONE, opcode_la                 },
-    { MP_QSTR_lb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lb        },
-    { MP_QSTR_lbu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lbu       },
-    { MP_QSTR_lh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lh        },
-    { MP_QSTR_lhu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lhu       },
+    { MP_QSTR_lb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lb        },
+    { MP_QSTR_lbu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lbu       },
+    { MP_QSTR_lh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lh        },
+    { MP_QSTR_lhu,        MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lhu       },
     { MP_QSTR_li,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   0,  N,  0, RV32_EXT_NONE, opcode_li                 },
     { MP_QSTR_lui,        MASK_FFFFFFFF, MASK_FFFFF000, MASK_NOT_USED, 2, CALL_RI,  R,  0, I,   12, N,  0, RV32_EXT_NONE, asm_rv32_opcode_lui       },
-    { MP_QSTR_lw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lw        },
+    { MP_QSTR_lw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_lw        },
     { MP_QSTR_mv,         MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_NOT_USED, 2, CALL_RR,  R,  0, R,   0,  N,  0, RV32_EXT_NONE, asm_rv32_opcode_cmv       },
     { MP_QSTR_mul,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_mul       },
     { MP_QSTR_mulh,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_mulh      },
@@ -362,8 +362,8 @@ static const opcode_t OPCODES[] = {
     { MP_QSTR_ori,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_ori       },
     { MP_QSTR_rem,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_rem       },
     { MP_QSTR_remu,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_remu      },
-    { MP_QSTR_sb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sb        },
-    { MP_QSTR_sh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sh        },
+    { MP_QSTR_sb,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sb        },
+    { MP_QSTR_sh,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sh        },
     { MP_QSTR_sh1add,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_ZBA,  asm_rv32_opcode_sh1add    },
     { MP_QSTR_sh2add,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_ZBA,  asm_rv32_opcode_sh2add    },
     { MP_QSTR_sh3add,     MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_ZBA,  asm_rv32_opcode_sh3add    },
@@ -378,7 +378,7 @@ static const opcode_t OPCODES[] = {
     { MP_QSTR_srl,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_srl       },
     { MP_QSTR_srli,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_0000001F, 3, CALL_RRI, R,  0, R,   0,  IU, 0, RV32_EXT_NONE, asm_rv32_opcode_srli      },
     { MP_QSTR_sub,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sub       },
-    { MP_QSTR_sw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 3, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sw        },
+    { MP_QSTR_sw,         MASK_FFFFFFFF, MASK_00000FFF, MASK_FFFFFFFF, 2, CALL_RIR, R,  0, I,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_sw        },
     { MP_QSTR_xor,        MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_FFFFFFFF, 3, CALL_RRR, R,  0, R,   0,  R,  0, RV32_EXT_NONE, asm_rv32_opcode_xor       },
     { MP_QSTR_xori,       MASK_FFFFFFFF, MASK_FFFFFFFF, MASK_00000FFF, 3, CALL_RRI, R,  0, R,   0,  I,  0, RV32_EXT_NONE, asm_rv32_opcode_xori      },
 };
@@ -439,6 +439,7 @@ static bool validate_integer(mp_uint_t value, mp_uint_t mask, mp_uint_t flags) {
 
 static bool serialise_argument(emit_inline_asm_t *emit, const opcode_t *opcode, mp_parse_node_t node, mp_uint_t node_index, mp_uint_t *serialised) {
     assert((node_index < 3) && "Invalid argument node number.");
+    assert(serialised && "Serialised value pointer is NULL.");
 
     uint32_t kind = 0;
     uint32_t shift = 0;
@@ -562,10 +563,7 @@ static bool serialise_argument(emit_inline_asm_t *emit, const opcode_t *opcode,
             break;
     }
 
-    if (serialised != NULL) {
-        *serialised = serialised_value;
-    }
-
+    *serialised = serialised_value;
     return true;
 
 out_of_range:
@@ -581,19 +579,18 @@ static bool serialise_argument(emit_inline_asm_t *emit, const opcode_t *opcode,
     return false;
 }
 
-static bool parse_register_offset_node(emit_inline_asm_t *emit, qstr opcode_qstr, const opcode_t *opcode_data, mp_parse_node_t node, mp_uint_t node_index, mp_parse_node_t *register_node, mp_parse_node_t *offset_node, bool *negative) {
-    assert(register_node != NULL && "Register node pointer is NULL.");
-    assert(offset_node != NULL && "Offset node pointer is NULL.");
-    assert(negative != NULL && "Negative pointer is NULL.");
+static bool serialise_register_offset_node(emit_inline_asm_t *emit, const opcode_t *opcode_data, mp_parse_node_t node, mp_uint_t node_index, mp_uint_t *offset, mp_uint_t *base) {
+    assert(offset && "Attempting to store the offset value into NULL.");
+    assert(base && "Attempting to store the base register into NULL.");
 
     if (!MP_PARSE_NODE_IS_STRUCT_KIND(node, PN_atom_expr_normal) && !MP_PARSE_NODE_IS_STRUCT_KIND(node, PN_factor_2)) {
         goto invalid_structure;
     }
     mp_parse_node_struct_t *node_struct = (mp_parse_node_struct_t *)node;
-    *negative = false;
+    bool negative = false;
     if (MP_PARSE_NODE_IS_STRUCT_KIND(node, PN_factor_2)) {
         if (MP_PARSE_NODE_IS_TOKEN_KIND(node_struct->nodes[0], MP_TOKEN_OP_MINUS)) {
-            *negative = true;
+            negative = true;
         } else {
             if (!MP_PARSE_NODE_IS_TOKEN_KIND(node_struct->nodes[0], MP_TOKEN_OP_PLUS)) {
                 goto invalid_structure;
@@ -605,41 +602,40 @@ static bool parse_register_offset_node(emit_inline_asm_t *emit, qstr opcode_qstr
         node_struct = (mp_parse_node_struct_t *)node_struct->nodes[1];
     }
 
-    if (*negative) {
+    if (negative) {
         // If the value is negative, RULE_atom_expr_normal's first token will be the
         // offset stripped of its negative marker; range check will then fail if the
         // default method is used, so a custom check is used instead.
         mp_obj_t object;
         if (!mp_parse_node_get_int_maybe(node_struct->nodes[0], &object)) {
             emit_inline_rv32_error_exc(emit,
-                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_WRONG_ARGUMENT_KIND, opcode_qstr, 2, MP_QSTR_integer));
+                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_WRONG_ARGUMENT_KIND, opcode_data->qstring, 2, MP_QSTR_integer));
             return false;
         }
         mp_uint_t value = mp_obj_get_int_truncated(object);
         value = (~value + 1) & (mp_uint_t)-1;
         if (!validate_integer(value << opcode_data->argument2_shift, OPCODE_MASKS[opcode_data->argument2_mask], opcode_data->argument2_kind)) {
             emit_inline_rv32_error_exc(emit,
-                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode_qstr, 2));
+                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode_data->qstring, 2));
             return false;
         }
+        *offset = value;
     } else {
-        if (!serialise_argument(emit, opcode_data, node_struct->nodes[0], 1, NULL)) {
+        if (!serialise_argument(emit, opcode_data, node_struct->nodes[0], 1, offset)) {
             return false;
         }
     }
 
-    *offset_node = node_struct->nodes[0];
     node_struct = (mp_parse_node_struct_t *)node_struct->nodes[1];
-    if (!serialise_argument(emit, opcode_data, node_struct->nodes[0], 2, NULL)) {
+    if (!serialise_argument(emit, opcode_data, node_struct->nodes[0], 2, base)) {
         return false;
     }
-    *register_node = node_struct->nodes[0];
     return true;
 
 invalid_structure:
     emit_inline_rv32_error_exc(emit,
         mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-            ET_WRONG_ARGUMENT_KIND, opcode_qstr, node_index + 1, MP_QSTR_offset));
+            ET_WRONG_ARGUMENT_KIND, opcode_data->qstring, node_index + 1, MP_QSTR_offset));
     return false;
 }
 
@@ -685,6 +681,11 @@ static void handle_opcode(emit_inline_asm_t *emit, const opcode_t *opcode_data,
             ((call_rii_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[1], arguments[2]);
             break;
 
+        case CALL_RIR:
+            // The last two arguments indices are swapped on purpose.
+            ((call_rri_t)opcode_data->emitter)(&emit->as, arguments[0], arguments[2], arguments[1]);
+            break;
+
         default:
             assert(!"Unhandled call convention.");
             MP_UNREACHABLE;
@@ -692,42 +693,6 @@ static void handle_opcode(emit_inline_asm_t *emit, const opcode_t *opcode_data,
     }
 }
 
-static bool handle_load_store_opcode_with_offset(emit_inline_asm_t *emit, qstr opcode, const opcode_t *opcode_data, mp_parse_node_t *argument_nodes) {
-    mp_parse_node_t nodes[3] = {0};
-    if (!serialise_argument(emit, opcode_data, argument_nodes[0], 0, NULL)) {
-        return false;
-    }
-    nodes[0] = argument_nodes[0];
-    bool negative = false;
-    if (!parse_register_offset_node(emit, opcode, opcode_data, argument_nodes[1], 1, &nodes[1], &nodes[2], &negative)) {
-        return false;
-    }
-
-    mp_uint_t rd = 0;
-    mp_uint_t rs1 = 0;
-    if (!parse_register_node(nodes[0], &rd, opcode_data->argument1_kind & C)) {
-        return false;
-    }
-    if (!parse_register_node(nodes[1], &rs1, opcode_data->argument3_kind & C)) {
-        return false;
-    }
-
-    mp_obj_t object;
-    mp_parse_node_get_int_maybe(nodes[2], &object);
-    mp_uint_t immediate = mp_obj_get_int_truncated(object) << opcode_data->argument2_shift;
-    if (negative) {
-        immediate = (~immediate + 1) & (mp_uint_t)-1;
-    }
-    if (!is_in_signed_mask(OPCODE_MASKS[opcode_data->argument2_mask], immediate)) {
-        emit_inline_rv32_error_exc(emit,
-            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_OUT_OF_RANGE, opcode, 2));
-        return false;
-    }
-
-    ((call_rri_t)opcode_data->emitter)(&emit->as, rd, rs1, immediate);
-    return true;
-}
-
 static void emit_inline_rv32_opcode(emit_inline_asm_t *emit, qstr opcode, mp_uint_t arguments_count, mp_parse_node_t *argument_nodes) {
     const opcode_t *opcode_data = NULL;
     for (mp_uint_t index = 0; index < MP_ARRAY_SIZE(OPCODES); index++) {
@@ -747,37 +712,36 @@ static void emit_inline_rv32_opcode(emit_inline_asm_t *emit, qstr opcode, mp_uin
     assert((opcode_data->argument2_mask < MP_ARRAY_SIZE(OPCODE_MASKS)) && "Argument #2 opcode mask index out of bounds.");
     assert((opcode_data->argument3_mask < MP_ARRAY_SIZE(OPCODE_MASKS)) && "Argument #3 opcode mask index out of bounds.");
     assert((opcode_data->calling_convention < CALL_COUNT) && "Calling convention index out of bounds.");
-    if (opcode_data->calling_convention != CALL_RIR) {
-        if (opcode_data->arguments_count != arguments_count) {
-            emit_inline_rv32_error_exc(emit,
-                mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
-                    ET_WRONG_ARGUMENTS_COUNT, opcode, opcode_data->arguments_count));
-            return;
-        }
-        mp_uint_t serialised_arguments[3] = { 0 };
-        if (opcode_data->arguments_count >= 1 && !serialise_argument(emit, opcode_data, argument_nodes[0], 0, &serialised_arguments[0])) {
+    mp_uint_t serialised_arguments[3] = { 0 };
+    if (arguments_count != opcode_data->parse_nodes) {
+        emit_inline_rv32_error_exc(emit,
+            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
+                ET_WRONG_ARGUMENTS_COUNT, opcode, opcode_data->parse_nodes));
+        return;
+    }
+
+    if (opcode_data->parse_nodes >= 1 && !serialise_argument(emit, opcode_data, argument_nodes[0], 0, &serialised_arguments[0])) {
+        return;
+    }
+    if (opcode_data->calling_convention == CALL_RIR) {
+        // "register, offset(base)" calls require some preprocessing to
+        // split the offset and base nodes - not to mention that if the offset
+        // is negative, the parser won't see the offset as a single node but as
+        // a sequence of the minus sign token followed by the number itself.
+
+        if (!serialise_register_offset_node(emit, opcode_data, argument_nodes[1], 1, &serialised_arguments[1], &serialised_arguments[2])) {
             return;
         }
-        if (opcode_data->arguments_count >= 2 && !serialise_argument(emit, opcode_data, argument_nodes[1], 1, &serialised_arguments[1])) {
+    } else {
+        if (opcode_data->parse_nodes >= 2 && !serialise_argument(emit, opcode_data, argument_nodes[1], 1, &serialised_arguments[1])) {
             return;
         }
-        if (opcode_data->arguments_count >= 3 && !serialise_argument(emit, opcode_data, argument_nodes[2], 2, &serialised_arguments[2])) {
+        if (opcode_data->parse_nodes >= 3 && !serialise_argument(emit, opcode_data, argument_nodes[2], 2, &serialised_arguments[2])) {
             return;
         }
-        handle_opcode(emit, opcode_data, serialised_arguments);
-        return;
-    }
-
-    assert((opcode_data->argument2_kind & U) == 0 && "Offset must not be unsigned.");
-    assert((opcode_data->argument2_kind & Z) == 0 && "Offset can be zero.");
-
-    if (arguments_count != 2) {
-        emit_inline_rv32_error_exc(emit,
-            mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, ET_WRONG_ARGUMENTS_COUNT, opcode, 2));
-        return;
     }
 
-    handle_load_store_opcode_with_offset(emit, opcode, opcode_data, argument_nodes);
+    handle_opcode(emit, opcode_data, serialised_arguments);
 }
 
 #undef N

From a1684ad2c142e804cffce8f4f14b7293c1ac44b4 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 28 Oct 2025 15:38:38 +0100
Subject: [PATCH 3038/3129] py/asmrv32: Refactor register-indexed load/store
 emitters.

This commit shortens register-indexed load/store emitter functions, by
reusing integer-indexed equivalent operations as part of the sequence
generation process.

Before these changes, register-indexed load/store emitters would follow
two steps to generate the sequence: generate opcodes to fix up the
register offset to make it point to the exact position in memory where
the operation should take place, and then perform the load/store
operation itself using 0 as an offset from the recalculated address
register.

Since there is already a generic optimised emitter for integer-indexed
load/stores, that bit of code can be reused rather than having an ad-hoc
implementation that is tailored to operate on an offset of 0.  Removing
the custom emitter code in favour of calling the general integer-indexed
emitter saves around 150 bytes without any changes in the emitter
behaviour (generating the same opcode sequence and making use of future
improvement in that emitter too).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index 9313e61ccb710..9e4fefec0d451 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -577,24 +577,12 @@ static void asm_rv32_fix_up_scaled_reg_reg_reg(asm_rv32_t *state, mp_uint_t rs1,
 
 void asm_rv32_emit_load_reg_reg_reg(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t operation_size) {
     asm_rv32_fix_up_scaled_reg_reg_reg(state, rs1, rs2, operation_size);
-    if (operation_size == 2 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs1)) {
-        // c.lw rd', offset(rs')
-        asm_rv32_opcode_clw(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), RV32_MAP_IN_C_REGISTER_WINDOW(rs1), 0);
-    } else {
-        // lbu|lhu|lw rd, offset(rs)
-        asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_I(0x03, RV32_LOAD_OPCODE_TABLE[operation_size], rd, rs1, 0));
-    }
+    asm_rv32_emit_load_reg_reg_offset(state, rd, rs1, 0, operation_size);
 }
 
 void asm_rv32_emit_store_reg_reg_reg(asm_rv32_t *state, mp_uint_t rd, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t operation_size) {
     asm_rv32_fix_up_scaled_reg_reg_reg(state, rs1, rs2, operation_size);
-    if (operation_size == 2 && RV32_IS_IN_C_REGISTER_WINDOW(rd) && RV32_IS_IN_C_REGISTER_WINDOW(rs1)) {
-        // c.sw rd', offset(rs')
-        asm_rv32_opcode_csw(state, RV32_MAP_IN_C_REGISTER_WINDOW(rd), RV32_MAP_IN_C_REGISTER_WINDOW(rs1), 0);
-    } else {
-        // sb|sh|sw rd, offset(rs)
-        asm_rv32_emit_word_opcode(state, RV32_ENCODE_TYPE_S(0x23, operation_size, rs1, rd, 0));
-    }
+    asm_rv32_emit_store_reg_reg_offset(state, rd, rs1, 0, operation_size);
 }
 
 void asm_rv32_meta_comparison_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {

From 3cd95dda649b1b3c855a577cb8f97c874c7047d6 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Thu, 30 Oct 2025 22:47:23 +0100
Subject: [PATCH 3039/3129] py/asmrv32: Generate better comparison sequences.

This commit changes the sequences generated for not-equal and
less-than-or-equal comparisons, in favour of better replacements.

The new not-equal comparison generates a sequence of equal size but
without the burden of a jump to set the output value, this also had
the effect of reducing the size of the code generator as only two
opcodes need to be generated instead of three.

The less-than-or-equal sequence, on the other hand, is actually two
bytes shorter and does not contain any jumps.  If Zcb opcodes can be
used for performing the final XOR operation then two more bytes could be
saved on each comparison.  The same remarks about having a shorter
generator due to two opcodes being generated instead of three still
applies here.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/asmrv32.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/py/asmrv32.c b/py/asmrv32.c
index 9e4fefec0d451..1d0cea6c02616 100644
--- a/py/asmrv32.c
+++ b/py/asmrv32.c
@@ -586,13 +586,10 @@ void asm_rv32_emit_store_reg_reg_reg(asm_rv32_t *state, mp_uint_t rd, mp_uint_t
 }
 
 void asm_rv32_meta_comparison_eq(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {
-    // c.li rd, 1       ;
-    // beq  rs1, rs2, 6 ; PC + 0
-    // c.li rd, 0       ; PC + 4
-    // ...              ; PC + 6
-    asm_rv32_opcode_cli(state, rd, 1);
-    asm_rv32_opcode_beq(state, rs1, rs2, 6);
-    asm_rv32_opcode_cli(state, rd, 0);
+    // sub   rd, rs1, rs2
+    // sltiu rd, rd, 1
+    asm_rv32_opcode_sub(state, rd, rs1, rs2);
+    asm_rv32_opcode_sltiu(state, rd, rd, 1);
 }
 
 void asm_rv32_meta_comparison_ne(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd) {
@@ -608,13 +605,10 @@ void asm_rv32_meta_comparison_lt(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2
 }
 
 void asm_rv32_meta_comparison_le(asm_rv32_t *state, mp_uint_t rs1, mp_uint_t rs2, mp_uint_t rd, bool unsigned_comparison) {
-    // c.li   rd, 1        ;
-    // beq    rs1, rs2, 8  ; PC + 0
-    // slt(u) rd, rs1, rs2 ; PC + 4
-    // ...                 ; PC + 8
-    asm_rv32_opcode_cli(state, rd, 1);
-    asm_rv32_opcode_beq(state, rs1, rs2, 8);
-    asm_rv32_meta_comparison_lt(state, rs1, rs2, rd, unsigned_comparison);
+    // slt[u] rd, rs2, rs1
+    // xori   rd, rd, 1
+    asm_rv32_meta_comparison_lt(state, rs2, rs1, rd, unsigned_comparison);
+    asm_rv32_opcode_xori(state, rd, rd, 1);
 }
 
 #endif // MICROPY_EMIT_RV32

From e0a9b7023b28ac920b9e8e82f9bb4e8fda49ab3e Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Sun, 2 Nov 2025 11:41:43 -0500
Subject: [PATCH 3040/3129] py/objcode: Remove `mp_obj_code_t.lnotab` field
 from v2 preview.

This field exists to cache the lnotab field removed from v2 in #17639 by
ddf2c3afb17c0ea3dd678d02d9c2f01bed5a3020, and is now unused.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 py/objcode.c | 2 ++
 py/objcode.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/py/objcode.c b/py/objcode.c
index 1ee33936c5a5f..09904f10f3683 100644
--- a/py/objcode.c
+++ b/py/objcode.c
@@ -237,7 +237,9 @@ mp_obj_t mp_obj_new_code(const mp_module_context_t *context, const mp_raw_code_t
     o->context = context;
     o->rc = rc;
     o->dict_locals = mp_locals_get(); // this is a wrong! how to do this properly?
+    #if !MICROPY_PREVIEW_VERSION_2
     o->lnotab = MP_OBJ_NULL;
+    #endif
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/py/objcode.h b/py/objcode.h
index 8f26bd9dbd947..7be15e23f5271 100644
--- a/py/objcode.h
+++ b/py/objcode.h
@@ -75,12 +75,13 @@ static inline const void *mp_code_get_proto_fun(mp_obj_code_t *self) {
 #define MP_CODE_QSTR_MAP(context, idx) ((qstr)(context->constants.qstr_table[idx]))
 
 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;
+    #if !MICROPY_PREVIEW_VERSION_2
     mp_obj_t lnotab;
+    #endif
 } mp_obj_code_t;
 
 mp_obj_t mp_obj_new_code(const mp_module_context_t *context, const mp_raw_code_t *rc, bool result_required);

From 2b5669d193f2a2e41d7a57cedd86ec3130d2dab3 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 4 Nov 2025 01:56:33 +0100
Subject: [PATCH 3041/3129] py/emitnative: Generate shorter RV32 code for
 exception handling.

This commit lets the native emitter generate shorter code when clearing
exception objects on RV32.

Since there are no direct generic ASM functions to set a specific
immediate to a local variable, the native emitter usually generates an
immediate assignment to a temporary register and then a store of that
register into the chosen local variable.  This pattern is also followed
when clearing certain local variables related to exception handling,
using MP_OBJ_NULL as the immediate value to set.

Given that at the moment MP_OBJ_NULL is defined to be 0 (with some other
spots in the native emitter that leverage that fact when checking the
state of the variables mentioned earlier), and that the RV32 CPU has a
dedicated register that is hardwired to read 0, a new method to set
local variables to MP_OBJ_NULL is introduced.

When generating RV32 code, the new macro will skip the intermediate
register assignment and directly uses the X0/ZERO register to set the
chosen local variable to MP_OBJ_NULL.  Other platforms will still
generate the same code sequence as before this change.

This is a followup to 40585eaa8f1b603f0094b73764e8ce5623812ecf.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/emitnative.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 3aacf69a81784..a33ec01ec0f94 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -287,12 +287,27 @@ struct _emit_t {
 #define ASM_CLR_REG(state, rd) ASM_XOR_REG_REG(state, rd, rd)
 #endif
 
+#if N_RV32
+#define ASM_MOV_LOCAL_MP_OBJ_NULL(as, local_num, reg_temp) \
+    ASM_MOV_LOCAL_REG(as, local_num, REG_ZERO)
+#else
+#define ASM_MOV_LOCAL_MP_OBJ_NULL(as, local_num, reg_temp) \
+    ASM_MOV_REG_IMM(as, reg_temp, (mp_uint_t)MP_OBJ_NULL); \
+    ASM_MOV_LOCAL_REG(as, local_num, reg_temp)
+#endif
+
 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);
 
 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) {
+    // Generated code performing exception handling assumes that MP_OBJ_NULL
+    // equals to 0 to simplify some checks, leveraging dedicated opcodes for
+    // comparisons against 0.  If this assumption does not hold true anymore
+    // then generated code won't work correctly.
+    MP_STATIC_ASSERT(MP_OBJ_NULL == 0);
+
     emit_t *emit = m_new0(emit_t, 1);
     emit->emit_common = emit_common;
     emit->error_slot = error_slot;
@@ -1291,8 +1306,7 @@ static void emit_native_global_exc_entry(emit_t *emit) {
 
             // Check LOCAL_IDX_THROW_VAL for any injected value
             ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_THROW_VAL(emit));
-            ASM_MOV_REG_IMM(emit->as, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL);
-            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_ARG_2);
+            ASM_MOV_LOCAL_MP_OBJ_NULL(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_ARG_2);
             emit_call(emit, MP_F_NATIVE_RAISE);
         }
     }
@@ -2208,8 +2222,7 @@ static void emit_native_with_cleanup(emit_t *emit, mp_uint_t label) {
 
     // Replace exception with MP_OBJ_NULL.
     emit_native_label_assign(emit, *emit->label_slot);
-    ASM_MOV_REG_IMM(emit->as, REG_TEMP0, (mp_uint_t)MP_OBJ_NULL);
-    ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_TEMP0);
+    ASM_MOV_LOCAL_MP_OBJ_NULL(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_TEMP0);
 
     // end of with cleanup nlr_catch block
     emit_native_label_assign(emit, *emit->label_slot + 1);
@@ -2316,8 +2329,7 @@ static void emit_native_for_iter_end(emit_t *emit) {
 static void emit_native_pop_except_jump(emit_t *emit, mp_uint_t label, bool within_exc_handler) {
     if (within_exc_handler) {
         // Cancel any active exception so subsequent handlers don't see it
-        ASM_MOV_REG_IMM(emit->as, REG_TEMP0, (mp_uint_t)MP_OBJ_NULL);
-        ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_TEMP0);
+        ASM_MOV_LOCAL_MP_OBJ_NULL(emit->as, LOCAL_IDX_EXC_VAL(emit), REG_TEMP0);
     } else {
         emit_native_leave_exc_stack(emit, false);
     }
@@ -3002,8 +3014,7 @@ static void emit_native_yield(emit_t *emit, int kind) {
     if (kind == MP_EMIT_YIELD_VALUE) {
         // Check LOCAL_IDX_THROW_VAL for any injected value
         ASM_MOV_REG_LOCAL(emit->as, REG_ARG_1, LOCAL_IDX_THROW_VAL(emit));
-        ASM_MOV_REG_IMM(emit->as, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL);
-        ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_ARG_2);
+        ASM_MOV_LOCAL_MP_OBJ_NULL(emit->as, LOCAL_IDX_THROW_VAL(emit), REG_ARG_2);
         emit_call(emit, MP_F_NATIVE_RAISE);
     } else {
         // Label loop entry

From 4f2f520dc282f3b666e29aa7f316932cc9af8016 Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Sat, 18 Oct 2025 14:44:25 +0800
Subject: [PATCH 3042/3129] unix/modtime: Add type casting for mktime return
 value.

This adds type casting to avoid build errors on certain systems.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 ports/unix/modtime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index 41b7c89df4243..4f0550dbea765 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -189,7 +189,7 @@ static mp_obj_t mod_time_mktime(mp_obj_t tuple) {
         time.tm_isdst = -1; // auto-detect
     }
     time_t ret = mktime(&time);
-    if (ret == -1) {
+    if (ret == (time_t)-1) {
         mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("invalid mktime usage"));
     }
     return timeutils_obj_from_timestamp(ret);

From 1e5da2642cbb0b4c808323173b7a703c3a3cf24f Mon Sep 17 00:00:00 2001
From: John Smith <jsmith@jsmith.cz>
Date: Thu, 29 Aug 2024 10:29:35 +0200
Subject: [PATCH 3043/3129] shared/runtime: Set exit code according to the
 SystemExit exception.

Add abort setup code `nlr_set_abort` to the standard runtime executor.
This makes the standard runtime respond to abort signal without any further
modifications.

- When aborted, the program exits with 137 exit code (configurable, same as
  posix sig abort), to differentiate from a normal shutdown.

- When exited by exception/crash, the program will exit with exit code 1
  (configurable).

- When exited by exception KeyboardInterrupt, the program will exit with
  exit code 130 (configurable, same as posix sig int).

- When exited with a exit code (from Python environment), this code is
  propagated.  When a different object is passed, exit code is set to 1 and
  the value printed, to be consistent with Python docs:
  https://python.readthedocs.io/en/latest/library/exceptions.html#SystemExit

Signed-off-by: John Smith <jsmith@jsmith.cz>
---
 py/mpconfig.h           | 10 ++++++++++
 shared/runtime/pyexec.c | 42 +++++++++++++++++++++++++++++++++++------
 shared/runtime/pyexec.h | 11 +++++++++++
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 6ad27c51fabbf..97c40389b32f0 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1180,6 +1180,16 @@ typedef time_t mp_timestamp_t;
 #define MICROPY_ENABLE_VM_ABORT (0)
 #endif
 
+// Whether to handle abort behavior in pyexec code
+#ifndef MICROPY_PYEXEC_ENABLE_VM_ABORT
+#define MICROPY_PYEXEC_ENABLE_VM_ABORT (0)
+#endif
+
+// Whether to set exit codes according to the exit reason (keyboard interrupt, crash, normal exit, ...)
+#ifndef MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING
+#define MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING (0)
+#endif
+
 // Support for internal scheduler
 #ifndef MICROPY_ENABLE_SCHEDULER
 #define MICROPY_ENABLE_SCHEDULER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 7d2a70c01bc6b..cf17bd0dc356f 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -72,6 +72,10 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
     nlr_buf_t nlr;
     nlr.ret_val = NULL;
     if (nlr_push(&nlr) == 0) {
+        #if MICROPY_PYEXEC_ENABLE_VM_ABORT
+        nlr_set_abort(&nlr);
+        #endif
+
         mp_obj_t module_fun;
         #if MICROPY_MODULE_FROZEN_MPY
         if (exec_flags & EXEC_FLAG_SOURCE_IS_RAW_CODE) {
@@ -116,7 +120,7 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         mp_hal_set_interrupt_char(-1); // disable interrupt
         mp_handle_pending(true); // handle any pending exceptions (and any callbacks)
         nlr_pop();
-        ret = 1;
+        ret = PYEXEC_NORMAL_EXIT;
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {
             mp_hal_stdout_tx_strn("\x04", 1);
         }
@@ -135,15 +139,41 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             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
+        #if MICROPY_PYEXEC_ENABLE_VM_ABORT
+        if (nlr.ret_val == NULL) { // abort
+            ret = PYEXEC_ABORT;
+        } else
+        #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_SystemExit))) { // system exit
+            #if MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING
+            mp_obj_t val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val));
+            if (val != mp_const_none) {
+                if (mp_obj_is_int(val)) {
+                    ret = (int)mp_obj_int_get_truncated(val);
+                } else {
+                    mp_obj_print_helper(MICROPY_ERROR_PRINTER, val, PRINT_STR);
+                    mp_print_str(MICROPY_ERROR_PRINTER, "\n");
+                    ret = PYEXEC_UNHANDLED_EXCEPTION;
+                }
+            } else {
+                ret = PYEXEC_NORMAL_EXIT;
+            }
+            #else
             ret = PYEXEC_FORCED_EXIT;
-        } else {
+            #endif
+        } else { // other exception
             mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
-            ret = 0;
+            ret = PYEXEC_UNHANDLED_EXCEPTION;
+            #if MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING
+            if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_KeyboardInterrupt))) { // keyboard interrupt
+                ret = PYEXEC_KEYBOARD_INTERRUPT;
+            }
+            #endif
         }
     }
+    #if MICROPY_PYEXEC_ENABLE_VM_ABORT
+    nlr_set_abort(NULL);
+    #endif
 
     #if MICROPY_REPL_INFO
     // display debugging info if wanted
diff --git a/shared/runtime/pyexec.h b/shared/runtime/pyexec.h
index 95f4481626611..fb52c09b1cec1 100644
--- a/shared/runtime/pyexec.h
+++ b/shared/runtime/pyexec.h
@@ -37,6 +37,17 @@ extern pyexec_mode_kind_t pyexec_mode_kind;
 
 #define PYEXEC_FORCED_EXIT (0x100)
 
+#if MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING
+#define PYEXEC_NORMAL_EXIT (0)
+#define PYEXEC_UNHANDLED_EXCEPTION (1)
+#define PYEXEC_KEYBOARD_INTERRUPT (128 + 2) // same as SIG INT exit code
+#define PYEXEC_ABORT (128 + 9)              // same as SIG KILL exit code
+#else
+#define PYEXEC_NORMAL_EXIT (1)
+#define PYEXEC_UNHANDLED_EXCEPTION (0)
+#define PYEXEC_ABORT PYEXEC_FORCED_EXIT
+#endif
+
 int pyexec_raw_repl(void);
 int pyexec_friendly_repl(void);
 int pyexec_file(const char *filename);

From 509207c9d03c6116899350d7e3ae06962c0b4df2 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 25 Feb 2025 13:41:32 +0100
Subject: [PATCH 3044/3129] tools/cc1: Apply ruff formatting to cc1 script.

Running `ruff format tools/cc1` picks up `tools/cc1` which is a Python file
that does not have a .py file extension.

Signed-off-by: Christian Clauss <cclauss@me.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 tools/cc1 | 88 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 38 deletions(-)

diff --git a/tools/cc1 b/tools/cc1
index 827d5886a04f5..7a047e9ac1855 100755
--- a/tools/cc1
+++ b/tools/cc1
@@ -23,8 +23,8 @@ import re
 # TODO somehow make them externally configurable
 
 # this is the path to the true C compiler
-cc1_path = '/usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/cc1'
-#cc1_path = '/usr/lib/gcc/arm-none-eabi/5.3.0/cc1'
+cc1_path = "/usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/cc1"
+# cc1_path = '/usr/lib/gcc/arm-none-eabi/5.3.0/cc1'
 
 # this must be the same as MICROPY_QSTR_BYTES_IN_HASH
 bytes_in_qstr_hash = 2
@@ -41,11 +41,16 @@ print_debug = False
 ################################################################################
 
 # precompile regexs
-re_preproc_line = re.compile(r'# [0-9]+ ')
-re_map_entry = re.compile(r'\{.+?\(MP_QSTR_([A-Za-z0-9_]+)\).+\},')
-re_mp_obj_dict_t = re.compile(r'(?P<head>(static )?const mp_obj_dict_t (?P<id>[a-z0-9_]+) = \{ \.base = \{&mp_type_dict\}, \.map = \{ \.all_keys_are_qstrs = 1, \.is_fixed = 1, \.is_ordered = )1(?P<tail>, \.used = .+ };)$')
-re_mp_map_t = re.compile(r'(?P<head>(static )?const mp_map_t (?P<id>[a-z0-9_]+) = \{ \.all_keys_are_qstrs = 1, \.is_fixed = 1, \.is_ordered = )1(?P<tail>, \.used = .+ };)$')
-re_mp_rom_map_elem_t = re.compile(r'static const mp_rom_map_elem_t [a-z_0-9]+\[\] = {$')
+re_preproc_line = re.compile(r"# [0-9]+ ")
+re_map_entry = re.compile(r"\{.+?\(MP_QSTR_([A-Za-z0-9_]+)\).+\},")
+re_mp_obj_dict_t = re.compile(
+    r"(?P<head>(static )?const mp_obj_dict_t (?P<id>[a-z0-9_]+) = \{ \.base = \{&mp_type_dict\}, \.map = \{ \.all_keys_are_qstrs = 1, \.is_fixed = 1, \.is_ordered = )1(?P<tail>, \.used = .+ };)$"
+)
+re_mp_map_t = re.compile(
+    r"(?P<head>(static )?const mp_map_t (?P<id>[a-z0-9_]+) = \{ \.all_keys_are_qstrs = 1, \.is_fixed = 1, \.is_ordered = )1(?P<tail>, \.used = .+ };)$"
+)
+re_mp_rom_map_elem_t = re.compile(r"static const mp_rom_map_elem_t [a-z_0-9]+\[\] = {$")
+
 
 # this must match the equivalent function in qstr.c
 def compute_hash(qstr):
@@ -55,18 +60,19 @@ def compute_hash(qstr):
     # Make sure that valid hash is never zero, zero means "hash not computed"
     return (hash & ((1 << (8 * bytes_in_qstr_hash)) - 1)) or 1
 
+
 # this algo must match the equivalent in map.c
 def hash_insert(map, key, value):
     hash = compute_hash(key)
     pos = hash % len(map)
     start_pos = pos
     if print_debug:
-        print('  insert %s: start at %u/%u -- ' % (key, pos, len(map)), end='')
+        print("  insert %s: start at %u/%u -- " % (key, pos, len(map)), end="")
     while True:
         if map[pos] is None:
             # found empty slot, so key is not in table
             if print_debug:
-                print('put at %u' % pos)
+                print("put at %u" % pos)
             map[pos] = (key, value)
             return
         else:
@@ -76,6 +82,7 @@ def hash_insert(map, key, value):
             pos = (pos + 1) % len(map)
             assert pos != start_pos
 
+
 def hash_find(map, key):
     hash = compute_hash(key)
     pos = hash % len(map)
@@ -92,6 +99,7 @@ def hash_find(map, key):
             if pos == start_pos:
                 return attempts, None
 
+
 def process_map_table(file, line, output):
     output.append(line)
 
@@ -101,7 +109,7 @@ def process_map_table(file, line, output):
     while True:
         line = file.readline()
         if len(line) == 0:
-            print('unexpected end of input')
+            print("unexpected end of input")
             sys.exit(1)
         line = line.strip()
         if len(line) == 0:
@@ -110,38 +118,38 @@ def process_map_table(file, line, output):
         if re_preproc_line.match(line):
             # preprocessor line number comment
             continue
-        if line == '};':
+        if line == "};":
             # end of table (we assume it appears on a single line)
             break
         table_contents.append(line)
 
     # make combined string of entries
-    entries_str = ''.join(table_contents)
+    entries_str = "".join(table_contents)
 
     # split into individual entries
     entries = []
     while entries_str:
         # look for single entry, by matching nested braces
         match = None
-        if entries_str[0] == '{':
+        if entries_str[0] == "{":
             nested_braces = 0
             for i in range(len(entries_str)):
-                if entries_str[i] == '{':
+                if entries_str[i] == "{":
                     nested_braces += 1
-                elif entries_str[i] == '}':
+                elif entries_str[i] == "}":
                     nested_braces -= 1
                     if nested_braces == 0:
-                        match = re_map_entry.match(entries_str[:i + 2])
+                        match = re_map_entry.match(entries_str[: i + 2])
                         break
 
         if not match:
-            print('unknown line in table:', entries_str)
+            print("unknown line in table:", entries_str)
             sys.exit(1)
 
         # extract single entry
         line = match.group(0)
         qstr = match.group(1)
-        entries_str = entries_str[len(line):].lstrip()
+        entries_str = entries_str[len(line) :].lstrip()
 
         # add the qstr and the whole line to list of all entries
         entries.append((qstr, line))
@@ -164,28 +172,28 @@ def process_map_table(file, line, output):
         attempts, line = hash_find(map, qstr)
         assert line is not None
         if print_debug:
-            print('  %s lookup took %u attempts' % (qstr, attempts))
+            print("  %s lookup took %u attempts" % (qstr, attempts))
         total_attempts += attempts
     if len(entries):
         stats = len(map), len(entries) / len(map), total_attempts / len(entries)
     else:
         stats = 0, 0, 0
     if print_debug:
-        print('  table stats: size=%d, load=%.2f, avg_lookups=%.1f' % stats)
+        print("  table stats: size=%d, load=%.2f, avg_lookups=%.1f" % stats)
 
     # output hash table
     for row in map:
         if row is None:
-            output.append('{ 0, 0 },\n')
+            output.append("{ 0, 0 },\n")
         else:
-            output.append(row[1] + '\n')
-    output.append('};\n')
+            output.append(row[1] + "\n")
+    output.append("};\n")
 
     # skip to next non-blank line
     while True:
         line = file.readline()
         if len(line) == 0:
-            print('unexpected end of input')
+            print("unexpected end of input")
             sys.exit(1)
         line = line.strip()
         if len(line) == 0:
@@ -197,19 +205,20 @@ def process_map_table(file, line, output):
     if match is None:
         match = re_mp_map_t.match(line)
     if match is None:
-        print('expecting mp_obj_dict_t or mp_map_t definition')
+        print("expecting mp_obj_dict_t or mp_map_t definition")
         print(output[0])
         print(line)
         sys.exit(1)
-    line = match.group('head') + '0' + match.group('tail') + '\n'
+    line = match.group("head") + "0" + match.group("tail") + "\n"
     output.append(line)
 
-    return (match.group('id'),) + stats
+    return (match.group("id"),) + stats
+
 
 def process_file(filename):
     output = []
     file_changed = False
-    with open(filename, 'rt') as f:
+    with open(filename, "rt") as f:
         while True:
             line = f.readline()
             if not line:
@@ -218,39 +227,41 @@ def process_file(filename):
                 file_changed = True
                 stats = process_map_table(f, line, output)
                 if print_stats:
-                    print('  [%s: size=%d, load=%.2f, avg_lookups=%.1f]' % stats)
+                    print("  [%s: size=%d, load=%.2f, avg_lookups=%.1f]" % stats)
             else:
                 output.append(line)
 
     if file_changed:
         if print_debug:
-            print('  modifying static maps in', output[0].strip())
-        with open(filename, 'wt') as f:
+            print("  modifying static maps in", output[0].strip())
+        with open(filename, "wt") as f:
             for line in output:
                 f.write(line)
 
+
 def main():
     # run actual C compiler
     # need to quote args that have special characters in them
     def quote(s):
-        if s.find('<') != -1 or s.find('>') != -1:
+        if s.find("<") != -1 or s.find(">") != -1:
             return "'" + s + "'"
         else:
             return s
-    ret = os.system(cc1_path + ' ' + ' '.join(quote(s) for s in sys.argv[1:]))
+
+    ret = os.system(cc1_path + " " + " ".join(quote(s) for s in sys.argv[1:]))
     if ret != 0:
-        ret = (ret & 0x7f) or 127 # make it in range 0-127, but non-zero
+        ret = (ret & 0x7F) or 127  # make it in range 0-127, but non-zero
         sys.exit(ret)
 
-    if sys.argv[1] == '-E':
+    if sys.argv[1] == "-E":
         # CPP has been run, now do our processing stage
         for i, arg in enumerate(sys.argv):
-            if arg == '-o':
+            if arg == "-o":
                 return process_file(sys.argv[i + 1])
 
         print('%s: could not find "-o" option' % (sys.argv[0],))
         sys.exit(1)
-    elif sys.argv[1] == '-fpreprocessed':
+    elif sys.argv[1] == "-fpreprocessed":
         # compiler has been run, nothing more to do
         return
     else:
@@ -258,5 +269,6 @@ def main():
         print('%s: unknown first option "%s"' % (sys.argv[0], sys.argv[1]))
         sys.exit(1)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()

From 2a5c5093ec69baf1460d1dadb617b7f5371b5b60 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 5 Nov 2025 12:46:29 +1100
Subject: [PATCH 3045/3129] tools/cc1: Fix ruff lint check with list length.

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

diff --git a/tools/cc1 b/tools/cc1
index 7a047e9ac1855..aa2534f01e7bb 100755
--- a/tools/cc1
+++ b/tools/cc1
@@ -174,7 +174,7 @@ def process_map_table(file, line, output):
         if print_debug:
             print("  %s lookup took %u attempts" % (qstr, attempts))
         total_attempts += attempts
-    if len(entries):
+    if entries:
         stats = len(map), len(entries) / len(map), total_attempts / len(entries)
     else:
         stats = 0, 0, 0

From 10b7dfd9f20f58987da511d87684662d3a38ef01 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 Nov 2025 16:58:02 +1100
Subject: [PATCH 3046/3129] top: Include tools/cc1 in ruff search path.

So that pre-commit and CI will check formatting and linting.

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

diff --git a/pyproject.toml b/pyproject.toml
index 8c14c2bffa81d..041dd74191ff6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,6 +23,8 @@ ACKNOWLEDGEMENTS,\
 [tool.ruff]
 # Exclude third-party code from linting and formatting
 extend-exclude = ["lib"]
+# Include Python source files that don't end with .py
+extend-include = ["tools/cc1"]
 line-length = 99
 target-version = "py37"
 

From 2762fe680a03706d3c21efe51db9b1f8d193d2d0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 5 Nov 2025 15:41:35 +1100
Subject: [PATCH 3047/3129] tests/serial_test.py: Allow up to 2 seconds between
 bytes.

Only a problem when UART TX is also enabled and goes first (i.e. esp32
port) as sending 16384 bytes in one go triggers the timeout.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tests/serial_test.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/serial_test.py b/tests/serial_test.py
index 1baa2282a0ab9..455d2277f64dd 100755
--- a/tests/serial_test.py
+++ b/tests/serial_test.py
@@ -103,6 +103,11 @@ def read_test(ser_repl, ser_data, bufsize, nbuf):
 
     assert bufsize % 256 == 0  # for verify to work
 
+    # how long to wait for data from device
+    # (if UART TX is also enabled then it can take 1.4s to send
+    # out a 16KB butter at 115200bps)
+    READ_TIMEOUT_S = 2
+
     # Load and run the read_test_script.
     ser_repl.write(b"\x03\x01\x04")  # break, raw-repl, soft-reboot
     drain_input(ser_repl)
@@ -121,7 +126,7 @@ def read_test(ser_repl, ser_data, bufsize, nbuf):
     while remain:
         t0 = time.monotonic_ns()
         while ser_data.inWaiting() == 0:
-            if time.monotonic_ns() - t0 > 1e9:
+            if time.monotonic_ns() - t0 > READ_TIMEOUT_S * 1e9:
                 # timeout waiting for data from device
                 break
             time.sleep(0.0001)

From b4ab3a893c55858c9bf5d644c56abc0d9f7e7f44 Mon Sep 17 00:00:00 2001
From: Meir Armon <meirarmon@gmail.com>
Date: Mon, 16 Jun 2025 07:57:00 +0300
Subject: [PATCH 3048/3129] esp32/modesp32: Add esp32.wake_on_gpio() function.

Some boards support waking up via GPIO pins, but this is not currently
supported by MicroPython.  This commit adds support for waking with GPIO in
a similar interface to waking with ext0, ext1, touch and ulp.  This commit
adds documentation for this new function as well.

Signed-off-by: Meir Armon <meirarmon@gmail.com>
---
 docs/library/esp32.rst    |  9 +++++++
 ports/esp32/machine_rtc.c |  3 ++-
 ports/esp32/machine_rtc.h |  2 ++
 ports/esp32/modesp32.c    | 51 +++++++++++++++++++++++++++++++++++++--
 ports/esp32/modmachine.c  | 41 +++++++++++++++++++++++++++++++
 5 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index e5f39c7f59aa1..84f33f46e7262 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -43,6 +43,15 @@ Functions
 
     .. note:: This is only available for boards that have ext1 support.
 
+.. function:: wake_on_gpio(pins, level)
+
+    Configure how GPIO wakes the device from sleep.  *pins* can be ``None``
+    or a tuple/list of valid Pin objects.  *level* should be ``esp32.WAKEUP_ALL_LOW``
+    or ``esp32.WAKEUP_ANY_HIGH``.
+
+    .. note:: Some boards don't support waking on GPIO from deep sleep,
+       on those boards, the pins set here can only be used to wake from light sleep.
+
 .. function:: gpio_deep_sleep_hold(enable)
 
     Configure whether non-RTC GPIO pin configuration is retained during
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index ee6b1ad5cb5ec..d11ee22b510e0 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -86,8 +86,9 @@ machine_rtc_config_t machine_rtc_config = {
     .ext1_pins = 0,
     #endif
     #if SOC_PM_SUPPORT_EXT0_WAKEUP
-    .ext0_pin = -1
+    .ext0_pin = -1,
     #endif
+    .gpio_pins = 0,
 };
 
 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) {
diff --git a/ports/esp32/machine_rtc.h b/ports/esp32/machine_rtc.h
index 72717c5936d5b..e40a17fb3db9c 100644
--- a/ports/esp32/machine_rtc.h
+++ b/ports/esp32/machine_rtc.h
@@ -37,6 +37,7 @@ typedef struct {
     #if SOC_PM_SUPPORT_EXT0_WAKEUP
     int8_t ext0_pin;   // just the pin#, -1 == None
     #endif
+    uint64_t gpio_pins; // set bit == pin#
     #if SOC_TOUCH_SENSOR_SUPPORTED
     bool wake_on_touch : 1;
     #endif
@@ -50,6 +51,7 @@ typedef struct {
     #if SOC_PM_SUPPORT_EXT1_WAKEUP
     bool ext1_level : 1;
     #endif
+    bool gpio_level : 1;
 } machine_rtc_config_t;
 
 extern machine_rtc_config_t machine_rtc_config;
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 858be2ed05f81..1d002fc84bb03 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -46,12 +46,13 @@
 #define MULTI_HEAP_FREERTOS
 #include "../multi_heap_platform.h"
 #include "../heap_private.h"
+#include "driver/rtc_io.h"
 
 #if SOC_TOUCH_SENSOR_SUPPORTED
 static mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
 
     #if SOC_PM_SUPPORT_EXT0_WAKEUP
-    if (machine_rtc_config.ext0_pin != -1) {
+    if (machine_rtc_config.ext0_pin != -1 || machine_rtc_config.gpio_pins != 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
     }
     #endif
@@ -140,7 +141,7 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1)
 #if SOC_ULP_SUPPORTED
 static mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
     #if SOC_PM_SUPPORT_EXT0_WAKEUP
-    if (machine_rtc_config.ext0_pin != -1) {
+    if (machine_rtc_config.ext0_pin != -1 || machine_rtc_config.gpio_pins != 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
     }
     #endif
@@ -150,6 +151,51 @@ static mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_ulp_obj, esp32_wake_on_ulp);
 #endif
 
+static mp_obj_t esp32_wake_on_gpio(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {ARG_pins, ARG_level};
+    const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pins, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_level, MP_ARG_BOOL, {.u_bool = machine_rtc_config.gpio_level} },
+    };
+    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);
+    uint64_t gpio_pins = machine_rtc_config.gpio_pins;
+
+    #if SOC_ULP_SUPPORTED
+    if (machine_rtc_config.wake_on_ulp) {
+        mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
+    }
+    #endif
+
+    #if SOC_TOUCH_SENSOR_SUPPORTED
+    if (machine_rtc_config.wake_on_touch) {
+        mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
+    }
+    #endif
+
+    // Check that all pins are allowed
+    if (args[ARG_pins].u_obj != mp_const_none) {
+        size_t len = 0;
+        mp_obj_t *elem;
+        mp_obj_get_array(args[ARG_pins].u_obj, &len, &elem);
+        gpio_pins = 0;
+
+        for (int i = 0; i < len; i++) {
+            // Don't validate the pins at this point, since we can be using
+            // gpio pins for deepsleep or light sleep.
+            // Validations happen in the relevant sleep functions.
+            gpio_num_t pin_id = machine_pin_get_id(elem[i]);
+            gpio_pins |= (1ll << pin_id);
+        }
+    }
+
+    machine_rtc_config.gpio_level = args[ARG_level].u_bool;
+    machine_rtc_config.gpio_pins = gpio_pins;
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_gpio_obj, 0, esp32_wake_on_gpio);
+
 #if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
 static mp_obj_t esp32_gpio_deep_sleep_hold(const mp_obj_t enable) {
     if (mp_obj_is_true(enable)) {
@@ -284,6 +330,7 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     #if SOC_ULP_SUPPORTED
     { MP_ROM_QSTR(MP_QSTR_wake_on_ulp), MP_ROM_PTR(&esp32_wake_on_ulp_obj) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_wake_on_gpio), MP_ROM_PTR(&esp32_wake_on_gpio_obj) },
     #if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
     { MP_ROM_QSTR(MP_QSTR_gpio_deep_sleep_hold), MP_ROM_PTR(&esp32_gpio_deep_sleep_hold_obj) },
     #endif
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 06360e8e8999c..62f0bf73cf945 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -131,6 +131,12 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) {
 }
 
 static void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_obj_t *args) {
+    #if !SOC_DEEP_SLEEP_SUPPORTED
+    if (MACHINE_WAKE_DEEPSLEEP == wake_type) {
+        mp_raise_ValueError(MP_ERROR_TEXT("DEEPSLEEP not supported on this chip"));
+    }
+    #endif
+
     // First, disable any previously set wake-up source
     esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
 
@@ -170,6 +176,41 @@ static void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_
     }
     #endif
 
+    if (machine_rtc_config.gpio_pins != 0) {
+        #if !SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP
+        if (MACHINE_WAKE_DEEPSLEEP == wake_type) {
+            mp_raise_ValueError(MP_ERROR_TEXT("DEEPSLEEP with gpio pins not supported on this chip"));
+        }
+        #endif
+
+        gpio_int_type_t intr_type = machine_rtc_config.gpio_level ? GPIO_INTR_HIGH_LEVEL : GPIO_INTR_LOW_LEVEL;
+
+        for (int i = 0; i < GPIO_NUM_MAX; ++i) {
+            gpio_num_t gpio = (gpio_num_t)i;
+            uint64_t bm = 1ULL << i;
+
+            if (machine_rtc_config.gpio_pins & bm) {
+                gpio_sleep_set_direction(gpio, GPIO_MODE_INPUT);
+
+                if (MACHINE_WAKE_SLEEP == wake_type) {
+                    gpio_wakeup_enable(gpio, intr_type);
+                }
+            }
+        }
+
+        if (MACHINE_WAKE_DEEPSLEEP == wake_type) {
+            #if SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP
+            if (ESP_OK != esp_deep_sleep_enable_gpio_wakeup(
+                machine_rtc_config.gpio_pins,
+                machine_rtc_config.gpio_level ? ESP_GPIO_WAKEUP_GPIO_HIGH : ESP_GPIO_WAKEUP_GPIO_LOW)) {
+                mp_raise_ValueError(MP_ERROR_TEXT("wake-up pin not supported"));
+            }
+            #endif
+        } else {
+            esp_sleep_enable_gpio_wakeup();
+        }
+    }
+
     switch (wake_type) {
         case MACHINE_WAKE_SLEEP:
             esp_light_sleep_start();

From 27544a2d81da5b0d804a932d98d680f121a22b8f Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck <patrick@silicognition.com>
Date: Mon, 4 Aug 2025 17:13:34 -0600
Subject: [PATCH 3049/3129] esp32/boards: Add Silicognition ManT1S board
 definition.

New board planned to be launched on Crowd Supply in late 2025.  ESP32-based
core module with IEEE 802.3cg 10BASE-T1S Single Pair Ethernet networking
and power distribution over data lines.

Signed-off-by: Patrick Van Oosterwijck <patrick@silicognition.com>
---
 ports/esp32/boards/SIL_MANT1S/board.json      |  27 +++++
 ports/esp32/boards/SIL_MANT1S/manifest.py     |   2 +
 ports/esp32/boards/SIL_MANT1S/modules/ping.py | 114 ++++++++++++++++++
 .../boards/SIL_MANT1S/mpconfigboard.cmake     |   9 ++
 ports/esp32/boards/SIL_MANT1S/mpconfigboard.h |   6 +
 .../boards/SIL_MANT1S/partitions-8MiB-ota.csv |   9 ++
 ports/esp32/boards/SIL_MANT1S/pins.csv        |   3 +
 ports/esp32/boards/SIL_MANT1S/sdkconfig.board |  20 +++
 8 files changed, 190 insertions(+)
 create mode 100644 ports/esp32/boards/SIL_MANT1S/board.json
 create mode 100644 ports/esp32/boards/SIL_MANT1S/manifest.py
 create mode 100644 ports/esp32/boards/SIL_MANT1S/modules/ping.py
 create mode 100644 ports/esp32/boards/SIL_MANT1S/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/SIL_MANT1S/mpconfigboard.h
 create mode 100644 ports/esp32/boards/SIL_MANT1S/partitions-8MiB-ota.csv
 create mode 100644 ports/esp32/boards/SIL_MANT1S/pins.csv
 create mode 100644 ports/esp32/boards/SIL_MANT1S/sdkconfig.board

diff --git a/ports/esp32/boards/SIL_MANT1S/board.json b/ports/esp32/boards/SIL_MANT1S/board.json
new file mode 100644
index 0000000000000..06fd7f38bf40e
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/board.json
@@ -0,0 +1,27 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "deploy_options": {
+        "flash_offset": "0x1000"
+    },
+    "docs": "",
+    "features": [
+        "BLE",
+        "External Flash",
+        "External RAM",
+        "WiFi"
+    ],
+    "features_non_filterable": [
+        "T1S",
+        "10BASE-T1S"
+    ],
+    "images": [
+        "mant1s-board-top.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "ManT1S",
+    "thumbnail": "",
+    "url": "https://mant1s.net/",
+    "vendor": "Silicognition LLC"
+}
diff --git a/ports/esp32/boards/SIL_MANT1S/manifest.py b/ports/esp32/boards/SIL_MANT1S/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/SIL_MANT1S/modules/ping.py b/ports/esp32/boards/SIL_MANT1S/modules/ping.py
new file mode 100644
index 0000000000000..ec202f6f9aa08
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/modules/ping.py
@@ -0,0 +1,114 @@
+# µPing (MicroPing) for MicroPython
+# copyright (c) 2018 Shawwwn <shawwwn1@gmail.com>
+# License: MIT
+
+# Internet Checksum Algorithm
+# Author: Olav Morken
+# https://github.com/olavmrk/python-ping/blob/master/ping.py
+# Adjusted for ruff formatting to include in ManT1S MicroPython
+
+import utime
+import uselect
+import uctypes
+import usocket
+import ustruct
+import urandom
+
+
+# @data: bytes
+def checksum(data):
+    if len(data) & 0x1:  # Odd number of bytes
+        data += b"\0"
+    cs = 0
+    for pos in range(0, len(data), 2):
+        b1 = data[pos]
+        b2 = data[pos + 1]
+        cs += (b1 << 8) + b2
+    while cs >= 0x10000:
+        cs = (cs & 0xFFFF) + (cs >> 16)
+    cs = ~cs & 0xFFFF
+    return cs
+
+
+def ping(host, count=4, timeout=5000, interval=10, quiet=False, size=64):
+    # prepare packet
+    assert size >= 16, "pkt size too small"
+    pkt = b"Q" * size
+    pkt_desc = {
+        "type": uctypes.UINT8 | 0,
+        "code": uctypes.UINT8 | 1,
+        "checksum": uctypes.UINT16 | 2,
+        "id": uctypes.UINT16 | 4,
+        "seq": uctypes.INT16 | 6,
+        "timestamp": uctypes.UINT64 | 8,
+    }  # packet header descriptor
+    h = uctypes.struct(uctypes.addressof(pkt), pkt_desc, uctypes.BIG_ENDIAN)
+    h.type = 8  # ICMP_ECHO_REQUEST
+    h.code = 0
+    h.checksum = 0
+    h.id = urandom.getrandbits(16)
+    h.seq = 1
+
+    # init socket
+    sock = usocket.socket(usocket.AF_INET, usocket.SOCK_RAW, 1)
+    sock.setblocking(0)
+    sock.settimeout(timeout / 1000)
+    addr = usocket.getaddrinfo(host, 1)[0][-1][0]  # ip address
+    sock.connect((addr, 1))
+    not quiet and print("PING %s (%s): %u data bytes" % (host, addr, len(pkt)))
+
+    seqs = list(range(1, count + 1))  # [1,2,...,count]
+    c = 1
+    t = 0
+    n_trans = 0
+    n_recv = 0
+    finish = False
+    while t < timeout:
+        if t == interval and c <= count:
+            # send packet
+            h.checksum = 0
+            h.seq = c
+            h.timestamp = utime.ticks_us()
+            h.checksum = checksum(pkt)
+            if sock.send(pkt) == size:
+                n_trans += 1
+                t = 0  # reset timeout
+            else:
+                seqs.remove(c)
+            c += 1
+
+        # recv packet
+        while 1:
+            socks, _, _ = uselect.select([sock], [], [], 0)
+            if socks:
+                resp = socks[0].recv(4096)
+                resp_mv = memoryview(resp)
+                h2 = uctypes.struct(uctypes.addressof(resp_mv[20:]), pkt_desc, uctypes.BIG_ENDIAN)
+                # TODO: validate checksum (optional)
+                seq = h2.seq
+                if h2.type == 0 and h2.id == h.id and (seq in seqs):  # 0: ICMP_ECHO_REPLY
+                    t_elasped = (utime.ticks_us() - h2.timestamp) / 1000
+                    ttl = ustruct.unpack("!B", resp_mv[8:9])[0]  # time-to-live
+                    n_recv += 1
+                    not quiet and print(
+                        "%u bytes from %s: icmp_seq=%u, ttl=%u, time=%f ms"
+                        % (len(resp), addr, seq, ttl, t_elasped)
+                    )
+                    seqs.remove(seq)
+                    if len(seqs) == 0:
+                        finish = True
+                        break
+            else:
+                break
+
+        if finish:
+            break
+
+        utime.sleep_ms(1)
+        t += 1
+
+    # close
+    sock.close()
+    ret = (n_trans, n_recv)
+    not quiet and print("%u packets transmitted, %u packets received" % ret)
+    return ret
diff --git a/ports/esp32/boards/SIL_MANT1S/mpconfigboard.cmake b/ports/esp32/boards/SIL_MANT1S/mpconfigboard.cmake
new file mode 100644
index 0000000000000..3d17a28968916
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/mpconfigboard.cmake
@@ -0,0 +1,9 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/SIL_MANT1S/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/SIL_MANT1S/mpconfigboard.h b/ports/esp32/boards/SIL_MANT1S/mpconfigboard.h
new file mode 100644
index 0000000000000..342636c8a1f85
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/mpconfigboard.h
@@ -0,0 +1,6 @@
+#define MICROPY_HW_BOARD_NAME "Silicognition ManT1S"
+#define MICROPY_HW_MCU_NAME "ESP32-PICO-V3-02"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mant1s"
+
+#define MICROPY_HW_I2C0_SCL                 (32)
+#define MICROPY_HW_I2C0_SDA                 (33)
diff --git a/ports/esp32/boards/SIL_MANT1S/partitions-8MiB-ota.csv b/ports/esp32/boards/SIL_MANT1S/partitions-8MiB-ota.csv
new file mode 100644
index 0000000000000..6229f4f75a917
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/partitions-8MiB-ota.csv
@@ -0,0 +1,9 @@
+# Partition table for MicroPython with OTA support using 8MB 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,  0x200000,
+ota_1,    app,  ota_1,   0x210000, 0x200000,
diff --git a/ports/esp32/boards/SIL_MANT1S/pins.csv b/ports/esp32/boards/SIL_MANT1S/pins.csv
new file mode 100644
index 0000000000000..a3f037781069d
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/pins.csv
@@ -0,0 +1,3 @@
+I2C_SCL,GPIO32
+I2C_SDA,GPIO33
+
diff --git a/ports/esp32/boards/SIL_MANT1S/sdkconfig.board b/ports/esp32/boards/SIL_MANT1S/sdkconfig.board
new file mode 100644
index 0000000000000..53a605e2c1c13
--- /dev/null
+++ b/ports/esp32/boards/SIL_MANT1S/sdkconfig.board
@@ -0,0 +1,20 @@
+# 8 MB flash
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
+
+# Fast flash
+
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+
+# Partition table
+
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="boards/SIL_MANT1S/partitions-8MiB-ota.csv"
+
+# Network name
+
+CONFIG_LWIP_LOCAL_HOSTNAME="ManT1S"

From 2a3b9b0b4bed6ea51f1053e224278e9dbb266c35 Mon Sep 17 00:00:00 2001
From: Elvis Pfutzenreuter <epxx@epxx.co>
Date: Fri, 22 Nov 2024 20:38:58 -0300
Subject: [PATCH 3050/3129] esp32/esp32_rmt: Update RMT module to use the new
 RMT API.

The current `esp32.RMT` class uses a legacy API from ESP-IDF 4.x.  The
ESP-IDF 5.x offers a new API, which is overall better, and easier to
implement the RX side in the future.  This commit updates the module and
the documentation, preserving the current MicroPython RMT API as much as
possible.

The bitstream RMT implementation was updated as well, since ESP-IDF does
not allow firmware to reference legacy and new APIs at the same time (it
resets right after boot with an error message, even if neither module is
imported).

The documentation is updated accordingly.

Signed-off-by: Elvis Pfutzenreuter <elvis.pfutzenreuter@gmail.com>
---
 docs/esp32/quickref.rst           |   9 +-
 docs/library/esp32.rst            | 108 ++++++---
 ports/esp32/boards/sdkconfig.base |   1 -
 ports/esp32/esp32_common.cmake    |   8 +
 ports/esp32/esp32_rmt.c           | 368 +++++++++++++++++++-----------
 ports/esp32/machine_bitstream.c   | 141 ++++++------
 ports/esp32/modesp32.h            |   6 +-
 7 files changed, 396 insertions(+), 245 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 25e52ec32db5d..0cf7d81a7eaac 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -837,9 +837,9 @@ The RMT is ESP32-specific and allows generation of accurate digital pulses with
     import esp32
     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)
-    # The channel resolution is 100ns (1/(source_freq/clock_div)).
+    r = esp32.RMT(pin=Pin(18), resolution_hz=10000000)
+    r   # RMT(pin=18, source_freq=80000000, resolution_hz=10000000)
+    # The channel resolution is based on resolution_hz, i.e. 100ns for 10000000
     r.write_pulses((1, 20, 2, 40), 0) # Send 0 for 100ns, 1 for 2000ns, 0 for 200ns, 1 for 4000ns
 
 The ESP32-C2 family does not include any RMT peripheral, so this class is
@@ -903,8 +903,7 @@ The APA106 driver extends NeoPixel, but internally uses a different colour order
    ``NeoPixel`` object.
 
 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`.
+This low-level driver uses an RMT channel by default.
 
 APA102 (DotStar) uses a different driver as it has an additional clock pin.
 
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 84f33f46e7262..0f06377411381 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -362,29 +362,24 @@ used to transmit or receive many other types of digital signals::
     import esp32
     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, idle_level=0)
+    r = esp32.RMT(pin=Pin(18), resolution_hz=10000000)
+    r  # RMT(pin=18, source_freq=80000000, resolution_hz=10000000, idle_level=0)
 
     # To apply a carrier frequency to the high output
-    r = esp32.RMT(0, pin=Pin(18), clock_div=8, tx_carrier=(38000, 50, 1))
+    r = esp32.RMT(pin=Pin(18), resolution_hz=10000000, tx_carrier=(38000, 50, 1))
 
-    # The channel resolution is 100ns (1/(source_freq/clock_div)).
+    # The channel resolution is 100ns (1/resolution_hz)
     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*
-the clock input which determines the resolution of the RMT channel. The
-numbers specified in ``write_pulses`` are multiplied by the resolution to
+configure the input clock but, for now, it's fixed). ``resolution_hz`` determines
+the resolution of the RMT channel. The 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
-multiplying the resolution by a 15-bit (1-``PULSE_MAX``) number. There are eight
-channels (0-7) and each can have a different clock divider.
-
-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,
-100ns, 4000ns].
+So, in the example above, the resolution is resolution is (1/10Mhz) = 100ns.
+Since the ``start`` level is 0 and toggles with each number, the bitstream is
+``0101`` with durations of [100ns, 2000ns, 100ns, 4000ns].
 
 For more details see Espressif's `ESP-IDF RMT documentation.
 <https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/rmt.html>`_.
@@ -395,13 +390,24 @@ 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, idle_level=False, tx_carrier=None)
+.. class:: RMT(channel, *, pin=None, resolution_hz=10000000, clock_div=None, idle_level=False, num_symbols=48|64, 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. *idle_level* specifies
+    optional and a dummy parameter for backward compatibility. *pin* is required
+    and configures which Pin is bound to the RMT channel.
+    *resolution_hz* defines the resolution/unit of the samples.
+    For example, 1,000,000 means the unit is microsecond. The pulse widths can
+    assume values up to *RMT.PULSE_MAX*, so the resolution should be selected
+    accordingly to the signal to be transmitted.
+    *clock_div* (deprecated) is equivalent to *resolution_hz*, but expressed as
+    a clock divider that divides the source clock (80MHz) to the RMT
+    channel allowing the resolution to be specified. Either *clock_div* and
+    *resolution_hz* may be supplied, but not both.
+    *num_symbols* specifies the
+    RMT buffer allocated for this channel (minimum 48 or 64, depending on chip), from a small pool of
+    symbols (192 to 512, depending on chip) that are shared by all channels. This buffer does not limit the
+    size of the pulse train that you can send, but bigger buffers reduce the
+    CPU load and the potential of glitches/imprecise pulse lengths. *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.
@@ -419,21 +425,52 @@ For more details see Espressif's `ESP-IDF RMT documentation.
 .. method:: RMT.clock_div()
 
     Return the clock divider. Note that the channel resolution is
-    ``1 / (source_freq / clock_div)``.
+    ``1 / (source_freq / clock_div)``. (Method deprecated. The value may
+    not be faithful if resolution was supplied as *resolution_hz*.)
 
 .. method:: RMT.wait_done(*, timeout=0)
 
     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.
+    milliseconds for transmission to complete. Timeout of -1 blocks until
+    transmission is complete (and blocks forever if loop is enabled).
 
 .. 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 sequence is currently being transmitted then the
-    current loop iteration will be completed and then transmission will stop.
+    transmission will stop. (Method deprecated by `RMT.loop_count`.)
+
+.. method:: RMT.loop_count(n)
+
+    Configure looping on the channel. *n* is int. Affects the *next* call to
+    `RMT.write_pulses`. Set to ``0`` to disable looping, ``-1`` to enable
+    infinite looping, or a positive number to loop for a given number of times.
+    If *n* is changed, the current transmission is stopped.
+
+    Note: looping for a finite number of times is not supported by all flavors
+    of ESP32.
+
+.. method:: RMT.active([boolean])
+
+    If called without parameters, returns *True* if there is an ongoing transmission.
+
+    If called with parameter *False*, stops the ongoing transmission.
+    This is useful to stop an infinite transmission loop.
+    The current loop is finished and transmission stops.
+    The object is not invalidated, and the RMT channel is again enabled when a new
+    transmission is started.
+
+    Calling with parameter *True* does not restart transmission. A new transmission
+    should always be initiated by *write_pulses()*.
+
+.. method:: RMT.deinit()
+
+    Release all RMT resources and invalidate the object. All subsequent method
+    calls will raise OSError. Useful to free RMT resources without having to wait
+    for the object to be garbage-collected.
 
 .. method:: RMT.write_pulses(duration, data=True)
 
@@ -463,17 +500,28 @@ 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_rmt([value])
+
+    Configure RMT usage in the `machine.bitstream` implementation.
+
+    If *value* is ``True``, bitstream tries to use RMT if possible. If *value*
+    is ``False``, bitstream sticks to the bit-banging implementation.
+
+    If no parameter is supplied, it returns the current state. The default state
+    is ``True``.
+
 .. 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.
+    *This function is deprecated and will be replaced by `RMT.bitstream_rmt()`.*
+
+    Passing in no argument will return ``1`` if RMT was enabled for the `machine.bitstream`
+    feature, and ``None`` otherwise.
 
-    Passing in ``None`` disables the use of RMT and instead selects a bit-banging
-    implementation for `machine.bitstream`.
+    Passing any non-negative integer argument is equivalent to calling ``RMT.bitstream_rmt(True)``.
 
-    Passing in no argument will not change the channel.  This function returns
-    the current channel number.
+    .. note:: In previous versions of MicroPython it was necessary to use this function to assign
+              a specific RMT channel number for the bitstream, but the channel number is now assigned
+              dynamically.
 
 Constants
 ---------
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index e1b30b8e52053..6c8368ac488a2 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -124,7 +124,6 @@ CONFIG_UART_ISR_IN_IRAM=y
 
 # IDF 5 deprecated
 CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN=y
-CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_TOUCH_SUPPRESS_DEPRECATE_WARN=y
 
 CONFIG_ETH_USE_SPI_ETHERNET=y
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 79a60adac9f36..6922ac5fec02d 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -262,6 +262,14 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
 target_include_directories(${MICROPY_TARGET} PUBLIC
     ${IDF_PATH}/components/bt/host/nimble/nimble
 )
+if (IDF_VERSION VERSION_LESS "5.3")
+# Additional include directories needed for private RMT header.
+#  IDF 5.x versions before 5.3.1
+  message(STATUS "Using private rmt headers for ${IDF_VERSION}")
+  target_include_directories(${MICROPY_TARGET} PRIVATE
+    ${IDF_PATH}/components/driver/rmt
+  )
+endif()
 
 # Add additional extmod and usermod components.
 if (MICROPY_PY_BTREE)
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index f3bfbecdd11d1..85a98c2910bac 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 "Matt Trentini" <matt.trentini@gmail.com>
+ * Copyright (c) 2024 "Elvis Pfützenreuter" <elvis.pfutzenreuter@gmail.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
@@ -26,13 +27,16 @@
 
 #include "py/mphal.h"
 #include "py/runtime.h"
+#include "py/stream.h"
 #include "modmachine.h"
 #include "modesp32.h"
 
 #include "esp_task.h"
 
 #if SOC_RMT_SUPPORTED
-#include "driver/rmt.h"
+#include "esp_clk_tree.h"
+#include "driver/rmt_tx.h"
+#include "driver/rmt_encoder.h"
 
 // This exposes the ESP32's RMT module to MicroPython. RMT is provided by the Espressif ESP-IDF:
 //
@@ -46,105 +50,101 @@
 // Originally designed to generate infrared remote control signals, the module is very
 // flexible and quite easy-to-use.
 //
-// This current MicroPython implementation lacks some major features, notably receive pulses
-// and carrier output.
-
-// Last available RMT channel that can transmit.
-#define RMT_LAST_TX_CHANNEL (SOC_RMT_TX_CANDIDATES_PER_GROUP - 1)
+// This code exposes the RMT TX feature.
 
 // Forward declaration
 extern const mp_obj_type_t esp32_rmt_type;
 
 typedef struct _esp32_rmt_obj_t {
     mp_obj_base_t base;
-    uint8_t channel_id;
+    rmt_channel_handle_t channel;
+    bool enabled;
     gpio_num_t pin;
-    uint8_t clock_div;
-    mp_uint_t num_items;
-    rmt_item32_t *items;
-    bool loop_en;
+    uint32_t clock_freq;
+    int resolution_hz;
+    mp_uint_t cap_items;
+    rmt_symbol_word_t *items;
+    int loop_count;
+    int tx_ongoing;
+
+    rmt_encoder_handle_t encoder;
+    mp_uint_t idle_level;
 } 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_LAST_TX_CHANNEL;
-
-#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;
-
-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;
-}
-
-#else
+// Decide RMT usage in the machine_bitstream_high_low_rmt implementation.
+bool esp32_rmt_bitstream_enabled = true;
 
-// 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);
+static bool IRAM_ATTR esp32_rmt_tx_trans_done(rmt_channel_handle_t channel, const rmt_tx_done_event_data_t *edata, void *user_ctx) {
+    esp32_rmt_obj_t *self = user_ctx;
+    self->tx_ongoing -= 1;
+    return false;
 }
 
-#endif // MP_TASK_COREID==0
-
 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} },
+        { MP_QSTR_id,                          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_resolution_hz,               MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_clock_div,                   MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { 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_QSTR_num_symbols,                 MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOC_RMT_MEM_WORDS_PER_CHANNEL} },
     };
     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;
+    // RMT channel is an opaque struct in current RMT API and channel_id is a dummy parameter
+    // 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;
-    mp_uint_t idle_level = args[3].u_bool;
-    mp_obj_t tx_carrier_obj = args[4].u_obj;
 
-    if (esp32_rmt_bitstream_channel_id >= 0 && channel_id == esp32_rmt_bitstream_channel_id) {
-        mp_raise_ValueError(MP_ERROR_TEXT("channel used by bitstream"));
+    uint32_t clock_freq;
+    check_esp_err(esp_clk_tree_src_get_freq_hz(RMT_CLK_SRC_DEFAULT, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &clock_freq));
+
+    mp_uint_t resolution_hz;
+    if (args[2].u_obj != mp_const_none && args[3].u_obj != mp_const_none) {
+        mp_raise_ValueError(MP_ERROR_TEXT("resolution_hz and clock_div are mutually exclusive"));
+    } else if (args[2].u_obj == mp_const_none && args[3].u_obj == mp_const_none) {
+        // default value
+        resolution_hz = 10000000;
+    } else if (args[2].u_obj != mp_const_none) {
+        resolution_hz = mp_obj_get_int(args[2].u_obj);
+        if (resolution_hz <= 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("resolution_hz must be positive"));
+        }
+    } else if (args[3].u_obj != mp_const_none) {
+        mp_uint_t clock_div = mp_obj_get_int(args[3].u_obj);
+        if (clock_div < 1 || clock_div > 255) {
+            mp_raise_ValueError(MP_ERROR_TEXT("clock_div must be between 1 and 255"));
+        }
+        resolution_hz = clock_freq / clock_div;
     }
 
-    if (clock_div < 1 || clock_div > 255) {
-        mp_raise_ValueError(MP_ERROR_TEXT("clock_div must be between 1 and 255"));
+    mp_uint_t idle_level = args[4].u_bool;
+    mp_obj_t tx_carrier_obj = args[5].u_obj;
+    mp_uint_t num_symbols = args[6].u_int;
+
+    if (num_symbols < SOC_RMT_MEM_WORDS_PER_CHANNEL || ((num_symbols % 2) == 1)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("num_symbols must be even and at least %d"), SOC_RMT_MEM_WORDS_PER_CHANNEL);
     }
 
     esp32_rmt_obj_t *self = mp_obj_malloc_with_finaliser(esp32_rmt_obj_t, &esp32_rmt_type);
-    self->channel_id = channel_id;
+    self->channel = NULL;
     self->pin = pin_id;
-    self->clock_div = clock_div;
-    self->loop_en = false;
+    self->clock_freq = clock_freq;
+    self->resolution_hz = resolution_hz;
+    self->loop_count = 0;
+    self->tx_ongoing = 0;
+    self->idle_level = idle_level;
+    self->enabled = false;
+
+    rmt_tx_channel_config_t tx_chan_config = {
+        .clk_src = RMT_CLK_SRC_DEFAULT,
+        .gpio_num = self->pin,
+        .mem_block_symbols = num_symbols,
+        .resolution_hz = resolution_hz,
+        .trans_queue_depth = 4,
+    };
 
-    rmt_config_t config = {0};
-    config.rmt_mode = RMT_MODE_TX;
-    config.channel = (rmt_channel_t)self->channel_id;
-    config.gpio_num = self->pin;
-    config.mem_block_num = 1;
-    config.tx_config.loop_en = 0;
+    check_esp_err(rmt_new_tx_channel(&tx_chan_config, &self->channel));
 
     if (tx_carrier_obj != mp_const_none) {
         mp_obj_t *tx_carrier_details = NULL;
@@ -160,21 +160,21 @@ static mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
             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;
+        rmt_carrier_config_t tx_carrier_cfg = {
+            .duty_cycle = ((float)duty) / 100.0,
+            .frequency_hz = frequency,
+            .flags.polarity_active_low = !level,
+        };
+        check_esp_err(rmt_apply_carrier(self->channel, &tx_carrier_cfg));
     }
 
-    config.tx_config.idle_output_en = 1;
-    config.tx_config.idle_level = idle_level;
-
-    config.clk_div = self->clock_div;
+    rmt_copy_encoder_config_t copy_encoder_config = {};
+    check_esp_err(rmt_new_copy_encoder(&copy_encoder_config, &self->encoder));
 
-    check_esp_err(rmt_config(&config));
-    check_esp_err(rmt_driver_install_core1(config.channel));
+    rmt_tx_event_callbacks_t callbacks = {
+        .on_trans_done = esp32_rmt_tx_trans_done,
+    };
+    check_esp_err(rmt_tx_register_event_callbacks(self->channel, &callbacks, self));
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -182,33 +182,72 @@ 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) {
-        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);
+        mp_printf(print, "RMT(pin=%u, source_freq=%u, resolution_hz=%u, idle_level=%u)",
+            self->pin, self->clock_freq, self->resolution_hz, self->idle_level);
     } else {
         mp_printf(print, "RMT()");
     }
 }
 
+static void esp32_rmt_deactivate(esp32_rmt_obj_t *self) {
+    if (self->enabled) {
+        // FIXME: panics in ESP32 if called while TX is ongoing and TX sequence is long (>300ms)
+        // Does not panic in ESP32-S3, ESP32-C3 and ESP32-C6.
+        // Tested with ESP-IDF up to 5.5
+        // ESP-IDF issue: https://github.com/espressif/esp-idf/issues/17692
+        //
+        // Cause is Interrupt WDT to trigger because ESP-IDF rmt_disable() disables
+        // interrupts and spinlocks until the ongoing TX sequence is finished.
+        //
+        // Workaround is never try to stop RMT sequences longer than 300ms (which are unusual
+        // anyway). Or apply the patch mentioned at the GitHub issue to ESP-IDF.
+        rmt_disable(self->channel);
+        self->enabled = false;
+    }
+}
+
+static mp_obj_t esp32_rmt_active(size_t n_args, const mp_obj_t *args) {
+    esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (n_args == 1) {
+        return mp_obj_new_bool(self->enabled && self->tx_ongoing > 0);
+    } else if (mp_obj_is_true(args[1])) {
+        mp_raise_ValueError(MP_ERROR_TEXT("activate by calling write_pulses()"));
+    }
+
+    esp32_rmt_deactivate(self);
+
+    return mp_const_false;
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_rmt_active_obj, 1, 2, esp32_rmt_active);
+
 static mp_obj_t esp32_rmt_deinit(mp_obj_t self_in) {
-    // fixme: check for valid channel. Return exception if error occurs.
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
     if (self->pin != -1) { // Check if channel has already been deinitialised.
-        rmt_driver_uninstall(self->channel_id);
+        esp32_rmt_deactivate(self);
+        rmt_tx_event_callbacks_t callbacks = {
+            .on_trans_done = NULL,
+        };
+        rmt_tx_register_event_callbacks(self->channel, &callbacks, self);
+        rmt_del_encoder(self->encoder);
+        rmt_del_channel(self->channel);
         self->pin = -1; // -1 to indicate RMT is unused
+        self->tx_ongoing = 0;
         m_free(self->items);
     }
+
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_deinit_obj, esp32_rmt_deinit);
 
 // Return the source frequency.
-// Currently only the APB clock (80MHz) can be used but it is possible other
+// Currently only the default clock (80MHz) can be used but it is possible other
 // clock sources will added in the future.
 static mp_obj_t esp32_rmt_source_freq() {
-    return mp_obj_new_int(APB_CLK_FREQ);
+    uint32_t clock_freq;
+    check_esp_err(esp_clk_tree_src_get_freq_hz(RMT_CLK_SRC_DEFAULT, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &clock_freq));
+    return mp_obj_new_int(clock_freq);
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(esp32_rmt_source_freq_obj, esp32_rmt_source_freq);
 static MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_source_obj, MP_ROM_PTR(&esp32_rmt_source_freq_obj));
@@ -216,7 +255,11 @@ static MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_source_obj, MP_ROM_PTR(&esp32_
 // Return the clock divider.
 static mp_obj_t esp32_rmt_clock_div(mp_obj_t self_in) {
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int(self->clock_div);
+    if (self->pin == -1) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("already deinitialized"));
+    }
+
+    return mp_obj_new_int(self->clock_freq / self->resolution_hz);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_clock_div_obj, esp32_rmt_clock_div);
 
@@ -233,29 +276,86 @@ static mp_obj_t esp32_rmt_wait_done(size_t n_args, const mp_obj_t *pos_args, mp_
     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);
+    if (self->pin == -1) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("already deinitialized"));
+    } else if (!self->enabled) {
+        return mp_const_true;
+    } else if (args[1].u_int == 0 && self->tx_ongoing > 0) {
+        // shortcut to avoid console spamming with timeout msgs by rmt_tx_wait_all_done()
+        return mp_const_false;
+    }
 
-    esp_err_t err = rmt_wait_tx_done(self->channel_id, args[1].u_int / portTICK_PERIOD_MS);
+    esp_err_t err = rmt_tx_wait_all_done(self->channel, args[1].u_int);
     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);
 
+static mp_uint_t esp32_rmt_stream_ioctl(
+    mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    if (request != MP_STREAM_POLL) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+    esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret = 0;
+    if ((arg & MP_STREAM_POLL_WR) && self->tx_ongoing == 0) {
+        ret |= MP_STREAM_POLL_WR;
+    }
+    return ret;
+}
+
+static const mp_stream_p_t esp32_rmt_stream_p = {
+    .ioctl = esp32_rmt_stream_ioctl,
+};
+
+static void esp32_rmt_loop_in(esp32_rmt_obj_t *self, int new_loop_count) {
+    if (self->enabled && self->tx_ongoing > 0 && self->loop_count != 0 && new_loop_count == 0) {
+        // Break ongoing loop
+        esp32_rmt_deactivate(self);
+    }
+    self->loop_count = new_loop_count;
+}
+
 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);
-    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));
-        }
+    if (self->pin == -1) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("already deinitialized"));
     }
+
+    bool loop_en = mp_obj_get_int(loop);
+    esp32_rmt_loop_in(self, loop_en ? -1 : 0);
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(esp32_rmt_loop_obj, esp32_rmt_loop);
 
+static mp_obj_t esp32_rmt_loop_count(mp_obj_t self_in, mp_obj_t loop) {
+    esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->pin == -1) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("already deinitialized"));
+    }
+
+    int loop_count = mp_obj_get_int(loop);
+    if (loop_count < -1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("arg must be -1, 0 or positive"));
+    }
+    esp32_rmt_loop_in(self, loop_count);
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(esp32_rmt_loop_count_obj, esp32_rmt_loop_count);
+
 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]);
+    if (self->pin == -1) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("already deinitialized"));
+    }
+
+    if (self->enabled) {
+        rmt_tx_wait_all_done(self->channel, -1);
+    } else {
+        check_esp_err(rmt_enable(self->channel));
+        self->enabled = true;
+    }
+
     mp_obj_t duration_obj = args[1];
     mp_obj_t data_obj = n_args > 2 ? args[2] : mp_const_true;
 
@@ -290,14 +390,12 @@ static mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *args) {
     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;
+
+    if (num_items > self->cap_items) {
+        self->items = (rmt_symbol_word_t *)m_realloc(self->items, num_items * sizeof(rmt_symbol_word_t *));
+        self->cap_items = num_items;
     }
 
     for (mp_uint_t item_index = 0, pulse_index = 0; item_index < num_items; item_index++) {
@@ -314,63 +412,62 @@ static mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *args) {
         }
     }
 
-    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));
-    }
-
-    #if !CONFIG_IDF_TARGET_ESP32S3
-    check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false));
-    #endif
-
-    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));
-    }
+    rmt_transmit_config_t tx_config = {
+        .loop_count = self->loop_count,
+        .flags.eot_level = self->idle_level ? 1 : 0,
+    };
 
-    #if CONFIG_IDF_TARGET_ESP32S3
-    check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false));
-    #endif
+    rmt_encoder_reset(self->encoder);
+    check_esp_err(rmt_transmit(self->channel, self->encoder, self->items, num_items * sizeof(rmt_symbol_word_t), &tx_config));
+    self->tx_ongoing += 1;
 
     return mp_const_none;
 }
 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_rmt(size_t n_args, const mp_obj_t *args) {
+    if (n_args > 0) {
+        esp32_rmt_bitstream_enabled = mp_obj_is_true(args[0]);
+    }
+    return esp32_rmt_bitstream_enabled ? mp_const_true : mp_const_false;
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_rmt_bitstream_rmt_fun_obj, 0, 1, esp32_rmt_bitstream_rmt);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_bitstream_rmt_obj, MP_ROM_PTR(&esp32_rmt_bitstream_rmt_fun_obj));
+
 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;
+            esp32_rmt_bitstream_enabled = false;
         } else {
             mp_int_t channel_id = mp_obj_get_int(args[0]);
-            if (channel_id < 0 || channel_id > RMT_LAST_TX_CHANNEL) {
+            if (channel_id < 0) {
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid channel"));
             }
-            esp32_rmt_bitstream_channel_id = channel_id;
+            esp32_rmt_bitstream_enabled = true;
         }
     }
-    if (esp32_rmt_bitstream_channel_id < 0) {
+    if (!esp32_rmt_bitstream_enabled) {
         return mp_const_none;
     } else {
-        return MP_OBJ_NEW_SMALL_INT(esp32_rmt_bitstream_channel_id);
+        return MP_OBJ_NEW_SMALL_INT(1);
     }
 }
 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) },
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&esp32_rmt_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_clock_div), MP_ROM_PTR(&esp32_rmt_clock_div_obj) },
     { 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_loop_count), MP_ROM_PTR(&esp32_rmt_loop_count_obj) },
     { MP_ROM_QSTR(MP_QSTR_write_pulses), MP_ROM_PTR(&esp32_rmt_write_pulses_obj) },
 
     // Static methods
+    { MP_ROM_QSTR(MP_QSTR_bitstream_rmt), MP_ROM_PTR(&esp32_rmt_bitstream_rmt_obj) },
     { MP_ROM_QSTR(MP_QSTR_bitstream_channel), MP_ROM_PTR(&esp32_rmt_bitstream_channel_obj) },
 
     // Class methods
@@ -387,7 +484,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     make_new, esp32_rmt_make_new,
     print, esp32_rmt_print,
-    locals_dict, &esp32_rmt_locals_dict
+    locals_dict, &esp32_rmt_locals_dict,
+    protocol, &esp32_rmt_stream_p
     );
 
 #endif // SOC_RMT_SUPPORTED
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index ed7fcc407df6c..60addcc15b635 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -91,96 +91,95 @@ static void IRAM_ATTR machine_bitstream_high_low_bitbang(mp_hal_pin_obj_t pin, u
 }
 
 #if SOC_RMT_SUPPORTED
+
 /******************************************************************************/
 // RMT implementation
 
-#include "driver/rmt.h"
-
-// 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 }}};
-
-// 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++;
-    }
-
-    *translated_size = size;
-    *item_num = num;
-}
-
-// Use the reserved RMT channel to stream high/low data on the specified pin.
-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);
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
+#include "rmt_private.h"
+#endif
+#include "driver/rmt_tx.h"
+#include "driver/rmt_encoder.h"
 
+static bool machine_bitstream_high_low_rmt(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
     // 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_core1(config.channel));
+    uint32_t clock_div = 2;
+    rmt_channel_handle_t channel = NULL;
+    rmt_tx_channel_config_t tx_chan_config = {
+        .clk_src = RMT_CLK_SRC_DEFAULT,
+        .gpio_num = pin,
+        .mem_block_symbols = SOC_RMT_MEM_WORDS_PER_CHANNEL,
+        .resolution_hz = APB_CLK_FREQ / clock_div,
+        .trans_queue_depth = 1,
+    };
+    if (rmt_new_tx_channel(&tx_chan_config, &channel) != ESP_OK) {
+        return false;
+    }
+    check_esp_err(rmt_enable(channel));
 
     // Get the tick rate in kHz (this will likely be 40000).
-    uint32_t counter_clk_khz = 0;
-    check_esp_err(rmt_get_counter_clock(config.channel, &counter_clk_khz));
-
+    uint32_t counter_clk_khz = APB_CLK_FREQ / clock_div;
     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));
+    // Example: 500ns = 40000 * 500 / 1e6 = 20 ticks
+    // 20 ticks / 40MHz = 500e-9
+    rmt_bytes_encoder_config_t bytes_encoder_config = {
+        .bit0 = {
+            .level0 = 1,
+            .duration0 = (counter_clk_khz * timing_ns[0]) / 1e6,
+            .level1 = 0,
+            .duration1 = (counter_clk_khz * timing_ns[1]) / 1e6,
+        },
+        .bit1 = {
+            .level0 = 1,
+            .duration0 = (counter_clk_khz * timing_ns[2]) / 1e6,
+            .level1 = 0,
+            .duration1 = (counter_clk_khz * timing_ns[3]) / 1e6,
+        },
+        .flags.msb_first = 1
+    };
+
+    // Install the bits->highlow encoder.
+    rmt_encoder_handle_t encoder;
+    check_esp_err(rmt_new_bytes_encoder(&bytes_encoder_config, &encoder));
+
+    rmt_transmit_config_t tx_config = {
+        .loop_count = 0,
+        .flags.eot_level = 0,
+    };
+
+    // Stream the byte data using the encoder.
+    rmt_encoder_reset(encoder);
+    check_esp_err(rmt_transmit(channel, encoder, buf, len, &tx_config));
+
+    // Wait until completion.
+    rmt_tx_wait_all_done(channel, -1);
+
+    // Disable and release channel.
+    check_esp_err(rmt_del_encoder(encoder));
+    rmt_disable(channel);
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
+    channel->del(channel);
+    #else
+    rmt_del_channel(channel);
+    #endif
 
     // Cancel RMT output to GPIO pin.
     esp_rom_gpio_connect_out_signal(pin, SIG_GPIO_OUT_IDX, false, false);
+
+    return true;
 }
-#endif
+
+#endif // SOC_RMT_SUPPORTED
+
 /******************************************************************************/
 // 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 SOC_RMT_SUPPORTED
-    if (esp32_rmt_bitstream_channel_id >= 0) {
-        machine_bitstream_high_low_rmt(pin, timing_ns, buf, len, esp32_rmt_bitstream_channel_id);
+    if (esp32_rmt_bitstream_enabled && machine_bitstream_high_low_rmt(pin, timing_ns, buf, len)) {
+        // Use of RMT was successful.
         return;
     }
     #endif
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index 81ab94dc633ae..60c386565b8aa 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -1,6 +1,8 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODESP32_H
 #define MICROPY_INCLUDED_ESP32_MODESP32_H
 
+#include "driver/rmt_tx.h"
+
 #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 
     #define RTC_VALID_EXT_PINS \
@@ -59,7 +61,7 @@
 
 #define RTC_IS_VALID_EXT_PIN(pin_id) ((1ll << (pin_id)) & RTC_VALID_EXT_PINS)
 
-extern int8_t esp32_rmt_bitstream_channel_id;
+extern bool esp32_rmt_bitstream_enabled;
 
 extern const mp_obj_type_t esp32_nvs_type;
 extern const mp_obj_type_t esp32_partition_type;
@@ -72,6 +74,4 @@ extern const mp_obj_type_t esp32_pcnt_type;
 void esp32_pcnt_deinit_all(void);
 #endif
 
-esp_err_t rmt_driver_install_core1(uint8_t channel_id);
-
 #endif // MICROPY_INCLUDED_ESP32_MODESP32_H

From 713f40d20446240fcc340ffc5180802b0a22452a Mon Sep 17 00:00:00 2001
From: yuan_mo <2286087148@qq.com>
Date: Thu, 14 Aug 2025 09:15:59 +0800
Subject: [PATCH 3051/3129] esp32: Add support for ESP32-C5 SoCs.

Signed-off-by: yuan_mo <2286087148@qq.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 .../esp32/lockfiles/dependencies.lock.esp32c5 | 21 +++++++++++++++
 ports/esp32/machine_adc.c                     |  7 +++++
 ports/esp32/machine_i2c.c                     | 11 +++++++-
 ports/esp32/machine_pin.c                     |  7 ++++-
 ports/esp32/machine_pin.h                     | 26 +++++++++++++++++++
 ports/esp32/mpconfigport.h                    |  2 ++
 6 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 ports/esp32/lockfiles/dependencies.lock.esp32c5

diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c5 b/ports/esp32/lockfiles/dependencies.lock.esp32c5
new file mode 100644
index 0000000000000..204f64f68ca9f
--- /dev/null
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c5
@@ -0,0 +1,21 @@
+dependencies:
+  espressif/mdns:
+    component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.0
+  idf:
+    source:
+      type: idf
+    version: 5.5.1
+direct_dependencies:
+- espressif/mdns
+- idf
+manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+target: esp32c5
+version: 2.0.0
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index c5575d45ec7cc..432df3d3a20e6 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -100,6 +100,13 @@ static const machine_adc_obj_t madc_obj[] = {
     {{&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_ESP32C5
+    {{&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},
     #elif CONFIG_IDF_TARGET_ESP32C6
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_0},
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_1},
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 74679d01da224..9fb89660f743d 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -35,6 +35,7 @@
 #include "driver/i2c_master.h"
 #else
 #include "driver/i2c.h"
+#include "esp_clk_tree.h"
 #include "hal/i2c_ll.h"
 #endif
 
@@ -224,6 +225,8 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_
 #if SOC_I2C_SUPPORT_XTAL
 #if CONFIG_XTAL_FREQ > 0
 #define I2C_SCLK_FREQ (CONFIG_XTAL_FREQ * 1000000)
+#elif CONFIG_XTAL_FREQ == 0 && CONFIG_IDF_TARGET_ESP32C5
+// The crystal is auto-detected, so the I2C sclk frequency will be computed at runtime.
 #else
 #error "I2C uses XTAL but no configured freq"
 #endif // CONFIG_XTAL_FREQ
@@ -257,7 +260,13 @@ static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, bool first_init) {
         .master.clk_speed = self->freq,
     };
     i2c_param_config(self->port, &conf);
-    int timeout = i2c_ll_calculate_timeout_us_to_reg_val(I2C_SCLK_FREQ, self->timeout_us);
+    #if CONFIG_IDF_TARGET_ESP32C5
+    uint32_t i2c_sclk_freq;
+    check_esp_err(esp_clk_tree_src_get_freq_hz(I2C_CLK_SRC_DEFAULT, ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX, &i2c_sclk_freq));
+    #else
+    uint32_t i2c_sclk_freq = I2C_SCLK_FREQ;
+    #endif
+    int timeout = i2c_ll_calculate_timeout_us_to_reg_val(i2c_sclk_freq, self->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);
 }
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 9999223b59d50..efe6733194cbf 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -152,7 +152,7 @@ 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(index)) {
-            #if !(CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6)
+            #if !(CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6)
             rtc_gpio_deinit(index);
             #endif
         }
@@ -163,6 +163,11 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
+    #if CONFIG_IDF_TARGET_ESP32C5 && !MICROPY_HW_ESP_USB_SERIAL_JTAG
+    if (index == 13 || index == 14) {
+        CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
+    }
+    #endif
     #if CONFIG_IDF_TARGET_ESP32C6 && !MICROPY_HW_ESP_USB_SERIAL_JTAG
     if (index == 12 || index == 13) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
index 6fe9ef0e7787b..9e247a7367f0c 100644
--- a/ports/esp32/machine_pin.h
+++ b/ports/esp32/machine_pin.h
@@ -111,6 +111,32 @@
 #define MICROPY_HW_ENABLE_GPIO20 (1)
 #define MICROPY_HW_ENABLE_GPIO21 (1)
 
+#elif CONFIG_IDF_TARGET_ESP32C5
+
+#define MICROPY_HW_ENABLE_GPIO0 (1)
+#define MICROPY_HW_ENABLE_GPIO1 (1)
+#define MICROPY_HW_ENABLE_GPIO2 (1)
+#define MICROPY_HW_ENABLE_GPIO3 (1)
+#define MICROPY_HW_ENABLE_GPIO4 (1)
+#define MICROPY_HW_ENABLE_GPIO5 (1)
+#define MICROPY_HW_ENABLE_GPIO6 (1)
+#define MICROPY_HW_ENABLE_GPIO7 (1)
+#define MICROPY_HW_ENABLE_GPIO8 (1)
+#define MICROPY_HW_ENABLE_GPIO9 (1)
+#define MICROPY_HW_ENABLE_GPIO10 (1)
+#define MICROPY_HW_ENABLE_GPIO11 (1)
+#define MICROPY_HW_ENABLE_GPIO12 (1)
+#if !MICROPY_HW_ESP_USB_SERIAL_JTAG
+#define MICROPY_HW_ENABLE_GPIO13 (1)
+#define MICROPY_HW_ENABLE_GPIO14 (1)
+#endif
+#define MICROPY_HW_ENABLE_GPIO23 (1)
+#define MICROPY_HW_ENABLE_GPIO24 (1)
+#define MICROPY_HW_ENABLE_GPIO25 (1)
+#define MICROPY_HW_ENABLE_GPIO26 (1)
+#define MICROPY_HW_ENABLE_GPIO27 (1)
+#define MICROPY_HW_ENABLE_GPIO28 (1)
+
 #elif CONFIG_IDF_TARGET_ESP32C6
 
 #define MICROPY_HW_ENABLE_GPIO0 (1)
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 09d75cd1a6d8a..fafed3961cc9c 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -172,6 +172,8 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c2"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c3"
+#elif CONFIG_IDF_TARGET_ESP32C5
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c5"
 #elif CONFIG_IDF_TARGET_ESP32C6
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c6"
 #endif

From 30c74fc3b49a6a77c9fa8634c3902a895bfefea2 Mon Sep 17 00:00:00 2001
From: yuan_mo <2286087148@qq.com>
Date: Thu, 14 Aug 2025 09:15:59 +0800
Subject: [PATCH 3052/3129] esp32/boards: Add ESP32_GENERIC_C5 board
 definition.

Signed-off-by: yuan_mo <2286087148@qq.com>
---
 .../esp32/boards/ESP32_GENERIC_C5/board.json  | 22 +++++++++++++++++++
 ports/esp32/boards/ESP32_GENERIC_C5/board.md  |  2 ++
 .../ESP32_GENERIC_C5/mpconfigboard.cmake      | 10 +++++++++
 .../boards/ESP32_GENERIC_C5/mpconfigboard.h   |  7 ++++++
 .../boards/ESP32_GENERIC_C5/sdkconfig.board   |  2 ++
 5 files changed, 43 insertions(+)
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C5/board.json
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C5/board.md
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.h
 create mode 100644 ports/esp32/boards/ESP32_GENERIC_C5/sdkconfig.board

diff --git a/ports/esp32/boards/ESP32_GENERIC_C5/board.json b/ports/esp32/boards/ESP32_GENERIC_C5/board.json
new file mode 100644
index 0000000000000..371da3929c52d
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C5/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "deploy_options": {
+        "flash_offset": "0x2000"
+    },
+    "docs": "",
+    "features": [
+        "BLE",
+        "External Flash",
+        "WiFi"
+    ],
+    "images": [
+        "esp32c5_devkitmini.jpg"
+    ],
+    "mcu": "esp32c5",
+    "product": "ESP32-C5",
+    "thumbnail": "",
+    "url": "https://www.espressif.com/en/products/modules",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/ESP32_GENERIC_C5/board.md b/ports/esp32/boards/ESP32_GENERIC_C5/board.md
new file mode 100644
index 0000000000000..82bac44b96fd7
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C5/board.md
@@ -0,0 +1,2 @@
+The following files are firmware images that should work on most ESP32-C5-based
+boards with at least 4MiB of flash and 40MHz/48MHz crystal frequency. 
diff --git a/ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.cmake
new file mode 100644
index 0000000000000..79aba7d474fa6
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.cmake
@@ -0,0 +1,10 @@
+set(IDF_TARGET esp32c5)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.riscv
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.free_ram
+    boards/ESP32_GENERIC_C5/sdkconfig.board
+)
diff --git a/ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.h
new file mode 100644
index 0000000000000..5524684977548
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.h
@@ -0,0 +1,7 @@
+// This configuration is for a generic ESP32C5 board with 4MiB (or more) of flash.
+
+#define MICROPY_HW_BOARD_NAME               "ESP32C5 module"
+#define MICROPY_HW_MCU_NAME                 "ESP32C5"
+
+#define MICROPY_PY_MACHINE_I2S              (0)
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
diff --git a/ports/esp32/boards/ESP32_GENERIC_C5/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_C5/sdkconfig.board
new file mode 100644
index 0000000000000..369330682f91a
--- /dev/null
+++ b/ports/esp32/boards/ESP32_GENERIC_C5/sdkconfig.board
@@ -0,0 +1,2 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y

From 336d463eb287b8249451b23389517199e3e0fcc8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 15 Nov 2025 18:29:43 +1100
Subject: [PATCH 3053/3129] tools/ci.sh: Build ESP32_GENERIC_C5 as part of
 esp32 CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 2 +-
 tools/ci.sh                       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 8ee3f44d6a2e1..578bf33af5b58 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -29,7 +29,7 @@ jobs:
         ci_func:  # names are functions in ci.sh
           - esp32_build_cmod_spiram_s2
           - esp32_build_s3_c3
-          - esp32_build_c2_c6
+          - esp32_build_c2_c5_c6
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
diff --git a/tools/ci.sh b/tools/ci.sh
index 42d231c458127..63eed15bea2be 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -237,10 +237,11 @@ function ci_esp32_build_s3_c3 {
     make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C3
 }
 
-function ci_esp32_build_c2_c6 {
+function ci_esp32_build_c2_c5_c6 {
     ci_esp32_build_common
 
     make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C2
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C5
     make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_C6
 }
 

From 4441fd655c514dd92363ad00aa2e832c9f103b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 18 Aug 2025 16:00:04 +0200
Subject: [PATCH 3054/3129] lib/littlefs: Update LittleFS to v2.11.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 lib/littlefs/lfs2.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index abdec19d7cb6d..6c3c3ece76b74 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -93,6 +93,7 @@ static int lfs2_bd_read(lfs2_t *lfs2,
             // bypass cache?
             diff = lfs2_aligndown(diff, lfs2->cfg->read_size);
             int err = lfs2->cfg->read(lfs2->cfg, block, off, data, diff);
+            LFS2_ASSERT(err <= 0);
             if (err) {
                 return err;
             }
@@ -739,6 +740,7 @@ static lfs2_stag_t lfs2_dir_getslice(lfs2_t *lfs2, const lfs2_mdir_t *dir,
         int err = lfs2_bd_read(lfs2,
                 NULL, &lfs2->rcache, sizeof(ntag),
                 dir->pair[0], off, &ntag, sizeof(ntag));
+        LFS2_ASSERT(err <= 0);
         if (err) {
             return err;
         }
@@ -767,6 +769,7 @@ static lfs2_stag_t lfs2_dir_getslice(lfs2_t *lfs2, const lfs2_mdir_t *dir,
             err = lfs2_bd_read(lfs2,
                     NULL, &lfs2->rcache, diff,
                     dir->pair[0], off+sizeof(tag)+goff, gbuffer, diff);
+            LFS2_ASSERT(err <= 0);
             if (err) {
                 return err;
             }
@@ -828,9 +831,6 @@ static int lfs2_dir_getread(lfs2_t *lfs2, const lfs2_mdir_t *dir,
                 size -= diff;
                 continue;
             }
-
-            // rcache takes priority
-            diff = lfs2_min(diff, rcache->off-off);
         }
 
         // load to cache, first condition can no longer fail
@@ -1282,6 +1282,7 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
                     if (err == LFS2_ERR_CORRUPT) {
                         break;
                     }
+                    return err;
                 }
 
                 lfs2_fcrc_fromle32(&fcrc);
@@ -2267,7 +2268,7 @@ static int lfs2_dir_relocatingcommit(lfs2_t *lfs2, lfs2_mdir_t *dir,
         }
     }
 
-    if (dir->erased) {
+    if (dir->erased && dir->count < 0xff) {
         // try to commit
         struct lfs2_commit commit = {
             .block = dir->pair[0],
@@ -5225,7 +5226,9 @@ static int lfs2_fs_gc_(lfs2_t *lfs2) {
     }
 
     // try to populate the lookahead buffer, unless it's already full
-    if (lfs2->lookahead.size < 8*lfs2->cfg->lookahead_size) {
+    if (lfs2->lookahead.size < lfs2_min(
+            8 * lfs2->cfg->lookahead_size,
+            lfs2->block_count)) {
         err = lfs2_alloc_scan(lfs2);
         if (err) {
             return err;

From 8d05a8fc8a78dc6592e87ed5e87616bc01dce37c Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 19 Nov 2025 10:15:08 +1100
Subject: [PATCH 3055/3129] shared/tinyusb/mp_usbd: Reorder the
 mp_usbd_init/deinit functions.

Not a functional change, but makes it easier to see that mp_usbd_init() is
available regardless of whether MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE is
set.

Also adds a no-op inline mp_usbd_deinit() implementation, which means both
a port's calls to mp_usbd_init()/deinit() can both be guarded on the same
MICROPY_HW_ENABLE_USBDEV.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 shared/tinyusb/mp_usbd.h | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 176b1ba507c06..b4655553673a9 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -88,9 +88,22 @@ extern const uint8_t mp_usbd_builtin_desc_cfg[MP_USBD_BUILTIN_DESC_CFG_LEN];
 
 void mp_usbd_task_callback(mp_sched_node_t *node);
 
-#if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
-void mp_usbd_deinit(void);
+#if !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+
+static inline void mp_usbd_init(void) {
+    // Without runtime USB support, this can be a thin wrapper wrapper around tusb_init()
+    // which is called in the below helper function.
+    mp_usbd_init_tud();
+}
+
+static inline void mp_usbd_deinit(void) {
+    // Called in soft reset path. No-op if no runtime USB devices require cleanup.
+}
+
+#else
+// Runtime USB Device support requires more complex init/deinit
 void mp_usbd_init(void);
+void mp_usbd_deinit(void);
 
 const char *mp_usbd_runtime_string_cb(uint8_t index);
 
@@ -142,15 +155,7 @@ static inline bool mp_usb_device_builtin_enabled(const mp_obj_usb_device_t *usbd
     return usbd->builtin_driver != MP_OBJ_FROM_PTR(&mp_type_usb_device_builtin_none);
 }
 
-#else // Static USBD drivers only
-
-static inline void mp_usbd_init(void) {
-    // Without runtime USB support, this can be a thin wrapper wrapper around tusb_init()
-    // which is called in the below helper function.
-    mp_usbd_init_tud();
-}
-
-#endif
+#endif // MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
 
 #endif // MICROPY_HW_ENABLE_USBDEV
 

From 4766f5680e25d608bb4200d01ca414dd503b2e3f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 6 Nov 2025 11:05:09 +1100
Subject: [PATCH 3056/3129] esp32: Fix USB deinit/reinit path via soft reset.

Fixes problems with USB-CDC state after soft reset if USBDevice has been
active with the default USB-CDC driver also enabled.

This also brings ESP32 behaviour in line with RP2 and other ports, where
boot.py is executed before the runtime USB device is initialised. This
allows setting up a custom USB device in boot.py.

There is still a bug here, because calling tud_disconnect() doesn't cause
any UNPLUG or BUS_RESET events to arrive from TinyUSB - which means the USB
device state stays out of sync until we call mp_usbd_init() again...

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/main.c | 10 ++++++++--
 ports/esp32/usb.c  |  6 +-----
 ports/esp32/usb.h  |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index bd5775bc6637d..74e31647d76ff 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -107,7 +107,7 @@ void mp_task(void *pvParameter) {
     #if MICROPY_HW_ESP_USB_SERIAL_JTAG
     usb_serial_jtag_init();
     #elif MICROPY_HW_ENABLE_USBDEV
-    usb_init();
+    usb_phy_init();
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
     uart_stdout_init();
@@ -145,6 +145,11 @@ void mp_task(void *pvParameter) {
     // run boot-up scripts
     pyexec_frozen_module("_boot.py", false);
     int ret = pyexec_file_if_exists("boot.py");
+
+    #if MICROPY_HW_ENABLE_USBDEV
+    mp_usbd_init();
+    #endif
+
     if (ret & PYEXEC_FORCED_EXIT) {
         goto soft_reset_exit;
     }
@@ -193,7 +198,7 @@ void mp_task(void *pvParameter) {
     mp_thread_deinit();
     #endif
 
-    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    #if MICROPY_HW_ENABLE_USBDEV
     mp_usbd_deinit();
     #endif
 
@@ -219,6 +224,7 @@ void mp_task(void *pvParameter) {
 
     mp_deinit();
     fflush(stdout);
+
     goto soft_reset;
 }
 
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 750dd59ee6fdc..b90f53aa49daa 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -38,7 +38,7 @@
 
 static usb_phy_handle_t phy_hdl;
 
-void usb_init(void) {
+void usb_phy_init(void) {
     // ref: https://github.com/espressif/esp-usb/blob/4b6a798d0bed444fff48147c8dcdbbd038e92892/device/esp_tinyusb/tinyusb.c
 
     // Configure USB PHY
@@ -51,10 +51,6 @@ void usb_init(void) {
 
     // Init ESP USB Phy
     usb_new_phy(&phy_conf, &phy_hdl);
-
-    // Init MicroPython / TinyUSB
-    mp_usbd_init();
-
 }
 
 #if CONFIG_IDF_TARGET_ESP32S3
diff --git a/ports/esp32/usb.h b/ports/esp32/usb.h
index 2bfa3d31aff8b..99437266d9075 100644
--- a/ports/esp32/usb.h
+++ b/ports/esp32/usb.h
@@ -28,7 +28,7 @@
 
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT_MS (500)
 
-void usb_init(void);
+void usb_phy_init(void);
 void usb_usj_mode(void);
 
 #endif // MICROPY_INCLUDED_ESP32_USB_H

From a435e4ecfd87b8aa7720d0429acbd4043965b7e5 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Nov 2025 15:47:27 +1100
Subject: [PATCH 3057/3129] esp32: Take global dependencies out of
 mpconfigport.h.

This is necessary so the ESP-IDF TinyUSB component can include
py/mpconfig.h, but is also a good design goal (less creep of symbols
into unrelated parts of the code).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/machine_i2s.c  | 2 +-
 ports/esp32/modnetwork.h   | 1 +
 ports/esp32/mpconfigport.h | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index ba6377a76646d..27b70f1c8a13e 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -470,4 +470,4 @@ static void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
     }
 }
 
-MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_AUTO]);
+MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[SOC_I2S_NUM]);
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index ba69d5cc0f901..a68db41a3e353 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODNETWORK_H
 #define MICROPY_INCLUDED_ESP32_MODNETWORK_H
 
+#include "esp_wifi_types.h"
 #include "esp_netif.h"
 
 // lan867x component requires newer IDF version
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index fafed3961cc9c..142da4b2309ac 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -9,8 +9,6 @@
 #include "esp_random.h"
 #include "esp_system.h"
 #include "freertos/FreeRTOS.h"
-#include "driver/i2s_std.h"
-#include "esp_wifi_types.h"
 
 #ifndef MICROPY_CONFIG_ROM_LEVEL
 #define MICROPY_CONFIG_ROM_LEVEL            (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)

From 4f193132d2de4b464bbed29c9029727440da486a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Nov 2025 15:48:59 +1100
Subject: [PATCH 3058/3129] esp32: Remove dependency on esp_tinyusb.

Instead, depend directly on espressif/tinyusb component
(which is otherwise transitively included via esp_tinyusb).

Turns out esp_tinyusb builds a bunch of source files with
symbols that conflict with our tinyusb symbols (i.e.
descriptors_control.c).

This only works because nothing in MicroPython causes the linker to include
the esp_tinyusb.a library, however in order to override the dcd_int_handler
(in following commit) this caused the linker to pull this library in and
break the build.

There's also a problematic header skew - TinyUSB component was building
with the tusb_config.h file from esp_tinyusb component, but we have our own
tusb_config.h file in shared/tinyusb. The changes in parent commit allow
us to build the TinyUSB component with our tusb_config.h header.

User-facing impacts are:

- Can no longer override USB VID & PID via sdkconfig, have to set
  MICROPY_HW_USB_VID/PID instead (changes applied in this commit).

- esp32 boards will have the same USB serial number as other ports
  (i.e. based on the hardware MAC address, not hard-coded).

Side effects include:

- CFG_TUD_DWC2_SLAVE_ENABLE is now set, DMA mode is disabled.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../ARDUINO_NANO_ESP32/mpconfigboard.cmake    |  1 -
 .../boards/ARDUINO_NANO_ESP32/mpconfigboard.h |  5 +++++
 .../boards/ARDUINO_NANO_ESP32/sdkconfig.board |  7 ------
 .../ESP32_GENERIC_S2/mpconfigboard.cmake      |  1 -
 .../ESP32_GENERIC_S3/mpconfigboard.cmake      |  1 -
 .../boards/LOLIN_S2_MINI/mpconfigboard.cmake  |  1 -
 .../boards/LOLIN_S2_PICO/mpconfigboard.cmake  |  1 -
 .../M5STACK_ATOMS3_LITE/mpconfigboard.cmake   |  1 -
 .../boards/UM_FEATHERS2/mpconfigboard.cmake   |  1 -
 .../UM_FEATHERS2NEO/mpconfigboard.cmake       |  1 -
 .../boards/UM_FEATHERS3/mpconfigboard.cmake   |  1 -
 .../esp32/boards/UM_FEATHERS3/mpconfigboard.h |  5 +++++
 .../esp32/boards/UM_FEATHERS3/sdkconfig.board |  9 --------
 .../UM_FEATHERS3NEO/mpconfigboard.cmake       |  1 -
 .../boards/UM_FEATHERS3NEO/mpconfigboard.h    |  5 +++++
 .../boards/UM_FEATHERS3NEO/sdkconfig.board    |  9 --------
 .../boards/UM_NANOS3/mpconfigboard.cmake      |  1 -
 ports/esp32/boards/UM_NANOS3/mpconfigboard.h  |  5 +++++
 ports/esp32/boards/UM_NANOS3/sdkconfig.board  |  9 --------
 .../esp32/boards/UM_OMGS3/mpconfigboard.cmake |  1 -
 ports/esp32/boards/UM_OMGS3/mpconfigboard.h   |  5 +++++
 ports/esp32/boards/UM_OMGS3/sdkconfig.board   |  9 --------
 .../esp32/boards/UM_PROS3/mpconfigboard.cmake |  1 -
 ports/esp32/boards/UM_PROS3/mpconfigboard.h   |  5 +++++
 ports/esp32/boards/UM_PROS3/sdkconfig.board   |  9 --------
 .../UM_RGBTOUCH_MINI/mpconfigboard.cmake      |  1 -
 .../boards/UM_RGBTOUCH_MINI/mpconfigboard.h   |  5 +++++
 .../boards/UM_RGBTOUCH_MINI/sdkconfig.board   |  9 --------
 .../boards/UM_TINYS2/mpconfigboard.cmake      |  1 -
 .../boards/UM_TINYS3/mpconfigboard.cmake      |  1 -
 ports/esp32/boards/UM_TINYS3/mpconfigboard.h  |  5 +++++
 ports/esp32/boards/UM_TINYS3/sdkconfig.board  |  9 --------
 .../boards/UM_TINYWATCHS3/mpconfigboard.cmake |  1 -
 .../boards/UM_TINYWATCHS3/mpconfigboard.h     |  5 +++++
 .../boards/UM_TINYWATCHS3/sdkconfig.board     |  9 --------
 ports/esp32/boards/sdkconfig.usb              |  4 ----
 ports/esp32/esp32_common.cmake                |  8 +++++++
 ports/esp32/lockfiles/dependencies.lock.esp32 |  2 +-
 .../esp32/lockfiles/dependencies.lock.esp32c2 |  2 +-
 .../esp32/lockfiles/dependencies.lock.esp32c3 |  2 +-
 .../esp32/lockfiles/dependencies.lock.esp32c5 |  2 +-
 .../esp32/lockfiles/dependencies.lock.esp32c6 |  2 +-
 .../esp32/lockfiles/dependencies.lock.esp32s2 | 20 +++--------------
 .../esp32/lockfiles/dependencies.lock.esp32s3 | 20 +++--------------
 ports/esp32/main/idf_component.yml            |  4 ++--
 ports/esp32/mpconfigport.h                    | 22 ++++---------------
 46 files changed, 70 insertions(+), 159 deletions(-)
 delete mode 100644 ports/esp32/boards/sdkconfig.usb

diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
index a3888823421d2..06d3c27a6c765 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
@@ -6,7 +6,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
index 31b2a49bf8c31..3ca587ae40728 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
@@ -22,6 +22,11 @@
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 #define MICROPY_SCHEDULER_STATIC_NODES      (1)
 
+#define MICROPY_HW_USB_VID 0x2341
+#define MICROPY_HW_USB_PID 0x056B
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Arduino"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "Nano ESP32"
+
 #define MICROPY_BOARD_STARTUP                           NANO_ESP32_board_startup
 void NANO_ESP32_board_startup(void);
 
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
index d586dd4ce40dd..242cff84dde2b 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
@@ -11,13 +11,6 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="nano-esp32"
 
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x2341
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x056B
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Arduino"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="Nano ESP32"
-
 # compatibility with Espressif Arduino core
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_ESP_ENABLE_COREDUMP_TO_FLASH=y
diff --git a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
index 76d185d90d5fc..6907adb81926a 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
@@ -2,6 +2,5 @@ set(IDF_TARGET esp32s2)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.spiram_sx
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
index 9b0df3b3771ef..cdcefed84cf6d 100644
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.spiram_sx
     boards/ESP32_GENERIC_S3/sdkconfig.board
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
index dc9abd7478bca..8d6d1f3598dff 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -3,7 +3,6 @@ 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)
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
index dc9abd7478bca..8d6d1f3598dff 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -3,7 +3,6 @@ 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)
diff --git a/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake
index 10608fcec7f87..9157c6b93e5d1 100644
--- a/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/ESP32_GENERIC_S3/sdkconfig.board
 )
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
index 5e570d513bb47..2d8f70135e379 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.spiram_sx
-    boards/sdkconfig.usb
     boards/UM_FEATHERS2/sdkconfig.board
 )
 
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
index c98ef691769b5..defb597c9cc52 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.spiram_sx
-    boards/sdkconfig.usb
     boards/UM_FEATHERS2NEO/sdkconfig.board
 )
 
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
index 63d1af1da76ca..5a41be1862eb0 100644
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
index f4abfb21bc82a..cb6269ff9c6b7 100644
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
@@ -11,3 +11,8 @@
 #define MICROPY_HW_SPI1_MOSI                (35)
 #define MICROPY_HW_SPI1_MISO                (37)
 #define MICROPY_HW_SPI1_SCK                 (36)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x80D7
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "FeatherS3"
diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
index 3092e355982eb..2962cb44c6e43 100644
--- a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -4,12 +4,3 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS3"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D7
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="FeatherS3"
-CONFIG_TINYUSB_DESC_SERIAL_STRING="_fs3_"
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
index 1d2b887d2ce4e..698aa76f048b2 100644
--- a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h
index c08206f7b52fa..bfe38bc03bdd4 100644
--- a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.h
@@ -8,3 +8,8 @@
 #define MICROPY_HW_SPI1_MOSI                (35)
 #define MICROPY_HW_SPI1_MISO                (37)
 #define MICROPY_HW_SPI1_SCK                 (36)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x81FC
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "FeatherS3 Neo"
diff --git a/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
index 25b8d7689d86e..8d44c65c3f296 100644
--- a/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/sdkconfig.board
@@ -5,12 +5,3 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS3Neo"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x81FC
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="FeatherS3 Neo"
-CONFIG_TINYUSB_DESC_SERIAL_STRING="_fs3neo_"
diff --git a/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
index 6c7f34009e432..3935a66f8d0a9 100644
--- a/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_NANOS3/mpconfigboard.h b/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
index 44197be2a8f59..44434d26e2a27 100644
--- a/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_NANOS3/mpconfigboard.h
@@ -8,3 +8,8 @@
 #define MICROPY_HW_SPI1_MOSI                (35)
 #define MICROPY_HW_SPI1_MISO                (37)
 #define MICROPY_HW_SPI1_SCK                 (36)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x817A
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "NanoS3"
diff --git a/ports/esp32/boards/UM_NANOS3/sdkconfig.board b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
index e06f7a4245f9f..0a1361b9b504e 100644
--- a/ports/esp32/boards/UM_NANOS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_NANOS3/sdkconfig.board
@@ -4,12 +4,3 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMNanoS3"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x817A
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="NanoS3"
-CONFIG_TINYUSB_DESC_SERIAL_STRING="_ns3_"
diff --git a/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake b/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
index aa82111d75888..85c3d71e8c707 100644
--- a/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_OMGS3/mpconfigboard.h b/ports/esp32/boards/UM_OMGS3/mpconfigboard.h
index e3955a6b807da..451225b6fbf78 100644
--- a/ports/esp32/boards/UM_OMGS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_OMGS3/mpconfigboard.h
@@ -8,3 +8,8 @@
 #define MICROPY_HW_SPI1_MOSI (6)
 #define MICROPY_HW_SPI1_MISO (5)
 #define MICROPY_HW_SPI1_SCK (4)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x8225
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "OMGS3"
diff --git a/ports/esp32/boards/UM_OMGS3/sdkconfig.board b/ports/esp32/boards/UM_OMGS3/sdkconfig.board
index 8a0bf0b13afcd..794bc70b11171 100644
--- a/ports/esp32/boards/UM_OMGS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_OMGS3/sdkconfig.board
@@ -5,12 +5,3 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMOMGS3"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x8225
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="OMGS3"
-CONFIG_TINYUSB_DESC_SERIAL_STRING="_omgs3_"
diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
index 41a96f26e34c4..c8267f72802a5 100644
--- a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.h b/ports/esp32/boards/UM_PROS3/mpconfigboard.h
index cc0ebbefa3067..eea6f6e65dbcc 100644
--- a/ports/esp32/boards/UM_PROS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.h
@@ -8,3 +8,8 @@
 #define MICROPY_HW_SPI1_MOSI                (35)
 #define MICROPY_HW_SPI1_MISO                (37)
 #define MICROPY_HW_SPI1_SCK                 (36)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x80D4
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "ProS3"
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
index 75ca58d80b096..1b10ba11cd8ce 100644
--- a/ports/esp32/boards/UM_PROS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -4,12 +4,3 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMProS3"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D4
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-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_RGBTOUCH_MINI/mpconfigboard.cmake b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
index 8b29cb344e777..4686fc5884a42 100644
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h
index 1184124799318..2d83cba1619e4 100644
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.h
@@ -8,3 +8,8 @@
 #define MICROPY_HW_SPI1_MOSI (35)
 #define MICROPY_HW_SPI1_MISO (37)
 #define MICROPY_HW_SPI1_SCK (36)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x81FF
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "RGBTouchMini"
diff --git a/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board b/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
index 7d244fdc163f7..234aed6b210ed 100644
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/sdkconfig.board
@@ -5,12 +5,3 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMRGBTouchMini"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x81FF
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="RGBTouchMini"
-CONFIG_TINYUSB_DESC_SERIAL_STRING="_rgbtouch_mini_"
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
index 70cb4a814ff24..4b0c6bfccd77a 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.spiram_sx
-    boards/sdkconfig.usb
     boards/UM_TINYS2/sdkconfig.board
 )
 
diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
index 6c7f34009e432..3935a66f8d0a9 100644
--- a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
index 74c7622cb4b0f..2cba3f1b0a2f4 100644
--- a/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
@@ -8,3 +8,8 @@
 #define MICROPY_HW_SPI1_MOSI                (35)
 #define MICROPY_HW_SPI1_MISO                (37)
 #define MICROPY_HW_SPI1_SCK                 (36)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x80D1
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "TinyS3"
diff --git a/ports/esp32/boards/UM_TINYS3/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
index 2474c5fb27914..b9cb80695f55a 100644
--- a/ports/esp32/boards/UM_TINYS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -4,12 +4,3 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS3"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D1
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="TinyS3"
-CONFIG_TINYUSB_DESC_SERIAL_STRING="_ts3_"
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
index 089149c44c54d..2978dcd6f3ca7 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.usb
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
index 6cc1345413611..c8fc554a102a3 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.h
@@ -8,3 +8,8 @@
 #define MICROPY_HW_SPI1_MOSI                (35)
 #define MICROPY_HW_SPI1_MISO                (37)
 #define MICROPY_HW_SPI1_SCK                 (36)
+
+#define MICROPY_HW_USB_VID 0x303A
+#define MICROPY_HW_USB_PID 0x81B1
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Unexpected Maker"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "TinyWATCHS3"
diff --git a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
index 10121d235d0aa..da804fe30ad69 100644
--- a/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYWATCHS3/sdkconfig.board
@@ -4,12 +4,3 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_MEMTEST=
 
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyWATCHS3"
-
-CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
-CONFIG_TINYUSB_DESC_CUSTOM_PID=0x81B1
-CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
-CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
-CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
-CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
-CONFIG_TINYUSB_DESC_PRODUCT_STRING="TinyWATCHS3"
-CONFIG_TINYUSB_DESC_SERIAL_STRING="_tws3_"
diff --git a/ports/esp32/boards/sdkconfig.usb b/ports/esp32/boards/sdkconfig.usb
deleted file mode 100644
index 4090c710e62e6..0000000000000
--- a/ports/esp32/boards/sdkconfig.usb
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_USB_OTG_SUPPORTED=y
-CONFIG_TINYUSB_CDC_ENABLED=y
-CONFIG_TINYUSB_CDC_RX_BUFSIZE=256
-CONFIG_TINYUSB_CDC_TX_BUFSIZE=256
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
index 6922ac5fec02d..807d712830af2 100644
--- a/ports/esp32/esp32_common.cmake
+++ b/ports/esp32/esp32_common.cmake
@@ -97,6 +97,14 @@ if(MICROPY_PY_TINYUSB)
     list(APPEND MICROPY_INC_TINYUSB
         ${MICROPY_DIR}/shared/tinyusb/
     )
+
+    # Build the Espressif tinyusb component with MicroPython shared/tinyusb/tusb_config.h
+    idf_component_get_property(tusb_lib espressif__tinyusb COMPONENT_LIB)
+    target_include_directories(${tusb_lib} PRIVATE
+        ${MICROPY_DIR}/shared/tinyusb
+        ${MICROPY_DIR}
+        ${MICROPY_PORT_DIR}
+        ${MICROPY_BOARD_DIR})
 endif()
 
 list(APPEND MICROPY_SOURCE_PORT
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32 b/ports/esp32/lockfiles/dependencies.lock.esp32
index 71eccf03201bc..f48a8bcad6253 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32
@@ -30,6 +30,6 @@ direct_dependencies:
 - espressif/lan867x
 - espressif/mdns
 - idf
-manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
 target: esp32
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c2 b/ports/esp32/lockfiles/dependencies.lock.esp32c2
index 5f46e61564136..34311207ee1ca 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c2
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c2
@@ -16,6 +16,6 @@ dependencies:
 direct_dependencies:
 - espressif/mdns
 - idf
-manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
 target: esp32c2
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c3 b/ports/esp32/lockfiles/dependencies.lock.esp32c3
index 5fb11084ea2e7..811a3ab5106ee 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c3
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c3
@@ -16,6 +16,6 @@ dependencies:
 direct_dependencies:
 - espressif/mdns
 - idf
-manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
 target: esp32c3
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c5 b/ports/esp32/lockfiles/dependencies.lock.esp32c5
index 204f64f68ca9f..6f24d013470eb 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c5
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c5
@@ -16,6 +16,6 @@ dependencies:
 direct_dependencies:
 - espressif/mdns
 - idf
-manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3
 target: esp32c5
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c6 b/ports/esp32/lockfiles/dependencies.lock.esp32c6
index 4debf5548ea1d..74f2cdbd486f1 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c6
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c6
@@ -16,6 +16,6 @@ dependencies:
 direct_dependencies:
 - espressif/mdns
 - idf
-manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
 target: esp32c6
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s2 b/ports/esp32/lockfiles/dependencies.lock.esp32s2
index bb1443947e96f..a672c6d5e0a99 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32s2
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s2
@@ -1,18 +1,4 @@
 dependencies:
-  espressif/esp_tinyusb:
-    component_hash: 96d232ced7afe1976119b62f7fbf1944a2a78b36228ff6f7b9318394ac1153cc
-    dependencies:
-    - name: idf
-      require: private
-      version: '>=5.0'
-    - name: espressif/tinyusb
-      registry_url: https://components.espressif.com
-      require: public
-      version: '>=0.14.2'
-    source:
-      registry_url: https://components.espressif.com/
-      type: service
-    version: 1.7.6~1
   espressif/mdns:
     component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
     dependencies:
@@ -30,7 +16,7 @@ dependencies:
       require: private
       version: '>=5.0'
     source:
-      registry_url: https://components.espressif.com
+      registry_url: https://components.espressif.com/
       type: service
     targets:
     - esp32s2
@@ -42,9 +28,9 @@ dependencies:
       type: idf
     version: 5.5.1
 direct_dependencies:
-- espressif/esp_tinyusb
 - espressif/mdns
+- espressif/tinyusb
 - idf
-manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
 target: esp32s2
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s3 b/ports/esp32/lockfiles/dependencies.lock.esp32s3
index 38c17f5d6252a..f0f229c905466 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32s3
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s3
@@ -1,18 +1,4 @@
 dependencies:
-  espressif/esp_tinyusb:
-    component_hash: 96d232ced7afe1976119b62f7fbf1944a2a78b36228ff6f7b9318394ac1153cc
-    dependencies:
-    - name: idf
-      require: private
-      version: '>=5.0'
-    - name: espressif/tinyusb
-      registry_url: https://components.espressif.com
-      require: public
-      version: '>=0.14.2'
-    source:
-      registry_url: https://components.espressif.com/
-      type: service
-    version: 1.7.6~1
   espressif/mdns:
     component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed
     dependencies:
@@ -30,7 +16,7 @@ dependencies:
       require: private
       version: '>=5.0'
     source:
-      registry_url: https://components.espressif.com
+      registry_url: https://components.espressif.com/
       type: service
     targets:
     - esp32s2
@@ -42,9 +28,9 @@ dependencies:
       type: idf
     version: 5.5.1
 direct_dependencies:
-- espressif/esp_tinyusb
 - espressif/mdns
+- espressif/tinyusb
 - idf
-manifest_hash: 3b18b5bbac91c9fe5098d3759a37c84ed0828546d8cbc92e26e4c1698e689c8a
+manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
 target: esp32s3
 version: 2.0.0
diff --git a/ports/esp32/main/idf_component.yml b/ports/esp32/main/idf_component.yml
index cb14ffde60de8..1ee8aa9769cff 100644
--- a/ports/esp32/main/idf_component.yml
+++ b/ports/esp32/main/idf_component.yml
@@ -1,10 +1,10 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/mdns: "~1.1.0"
-  espressif/esp_tinyusb:
+  espressif/tinyusb:
     rules:
       - if: "target in [esp32s2, esp32s3]"
-    version: "~1.7.6"
+    version: "~0.18.0"
   espressif/lan867x:
     version: "~1.0.0"
     rules:
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 142da4b2309ac..7b973ebb969d2 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -223,19 +223,14 @@
 
 #ifndef MICROPY_HW_USB_VID
 #define USB_ESPRESSIF_VID 0x303A
-#if CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID
 #define MICROPY_HW_USB_VID  (USB_ESPRESSIF_VID)
-#else
-#define MICROPY_HW_USB_VID  (CONFIG_TINYUSB_DESC_CUSTOM_VID)
 #endif
 
 #ifndef MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
 #define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE    (1) // Support machine.USBDevice
 #endif
-#endif
 
 #ifndef MICROPY_HW_USB_PID
-#if CONFIG_TINYUSB_DESC_USE_DEFAULT_PID
 #define _PID_MAP(itf, n) ((CFG_TUD_##itf) << (n))
 // A combination of interfaces must have a unique product id, since PC will save device driver after the first plug.
 // Same VID/PID with different interface e.g MSC (first), then CDC (later) will possibly cause system error on PC.
@@ -244,25 +239,16 @@
 #define USB_TUSB_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \
     _PID_MAP(MIDI, 3))  // | _PID_MAP(AUDIO, 4) | _PID_MAP(VENDOR, 5) )
 #define MICROPY_HW_USB_PID  (USB_TUSB_PID)
-#else
-#define MICROPY_HW_USB_PID  (CONFIG_TINYUSB_DESC_CUSTOM_PID)
-#endif
 #endif
 
+// These Manufacturer & Product strings are the defaults when using the
+// esp_tinyusb component (which MicroPython used in the past).
 #ifndef MICROPY_HW_USB_MANUFACTURER_STRING
-#ifdef CONFIG_TINYUSB_DESC_MANUFACTURER_STRING
-#define MICROPY_HW_USB_MANUFACTURER_STRING CONFIG_TINYUSB_DESC_MANUFACTURER_STRING
-#else
-#define MICROPY_HW_USB_MANUFACTURER_STRING "MicroPython"
-#endif
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Espressif Systems"
 #endif
 
 #ifndef MICROPY_HW_USB_PRODUCT_FS_STRING
-#ifdef CONFIG_TINYUSB_DESC_PRODUCT_STRING
-#define MICROPY_HW_USB_PRODUCT_FS_STRING CONFIG_TINYUSB_DESC_PRODUCT_STRING
-#else
-#define MICROPY_HW_USB_PRODUCT_FS_STRING "Board in FS mode"
-#endif
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "Espressif Device"
 #endif
 
 #endif // MICROPY_HW_ENABLE_USBDEV

From 713f9dcd229e9bfaf3a1a4f9e91b1cef6ca08258 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Nov 2025 16:37:25 +1100
Subject: [PATCH 3059/3129] esp32: Fix USB Zero Length Packet issue with
 patched tinyusb.

Temporarily switch from the espressif TinyUSB component to
a MicroPython fork where this fix has been cherry-picked:
https://github.com/hathach/tinyusb/pull/3293

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/lockfiles/dependencies.lock.esp32   |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32c2 |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32c3 |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32c6 |  2 +-
 ports/esp32/lockfiles/dependencies.lock.esp32s2 | 13 +++++++------
 ports/esp32/lockfiles/dependencies.lock.esp32s3 | 13 +++++++------
 ports/esp32/main/idf_component.yml              |  5 ++++-
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32 b/ports/esp32/lockfiles/dependencies.lock.esp32
index f48a8bcad6253..4b0b2d9729d85 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32
@@ -30,6 +30,6 @@ direct_dependencies:
 - espressif/lan867x
 - espressif/mdns
 - idf
-manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
+manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3
 target: esp32
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c2 b/ports/esp32/lockfiles/dependencies.lock.esp32c2
index 34311207ee1ca..5c5cea0c9a189 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c2
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c2
@@ -16,6 +16,6 @@ dependencies:
 direct_dependencies:
 - espressif/mdns
 - idf
-manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
+manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3
 target: esp32c2
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c3 b/ports/esp32/lockfiles/dependencies.lock.esp32c3
index 811a3ab5106ee..4c4c869c27ea3 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c3
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c3
@@ -16,6 +16,6 @@ dependencies:
 direct_dependencies:
 - espressif/mdns
 - idf
-manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
+manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3
 target: esp32c3
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c6 b/ports/esp32/lockfiles/dependencies.lock.esp32c6
index 74f2cdbd486f1..b7435e1076718 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32c6
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32c6
@@ -16,6 +16,6 @@ dependencies:
 direct_dependencies:
 - espressif/mdns
 - idf
-manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
+manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3
 target: esp32c6
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s2 b/ports/esp32/lockfiles/dependencies.lock.esp32s2
index a672c6d5e0a99..a13d9fd401d47 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32s2
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s2
@@ -10,19 +10,20 @@ dependencies:
       type: service
     version: 1.1.0
   espressif/tinyusb:
-    component_hash: aa65639878f27a44d349044afd9c3fc134a92bd560874fdac1d836019b5c07ca
+    component_hash: ee1c962cff61eb975d508258d509974d58031cc27ff0d6c4117a67a613a49594
     dependencies:
     - name: idf
-      require: private
       version: '>=5.0'
     source:
-      registry_url: https://components.espressif.com/
-      type: service
+      git: https://github.com/micropython/tinyusb-espressif.git
+      path: .
+      type: git
     targets:
     - esp32s2
     - esp32s3
     - esp32p4
-    version: 0.18.0~4
+    - esp32h4
+    version: e4c0ec3caab3d9c25374de7047653b9ced8f14ff
   idf:
     source:
       type: idf
@@ -31,6 +32,6 @@ direct_dependencies:
 - espressif/mdns
 - espressif/tinyusb
 - idf
-manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
+manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3
 target: esp32s2
 version: 2.0.0
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s3 b/ports/esp32/lockfiles/dependencies.lock.esp32s3
index f0f229c905466..d5e7045b77a69 100644
--- a/ports/esp32/lockfiles/dependencies.lock.esp32s3
+++ b/ports/esp32/lockfiles/dependencies.lock.esp32s3
@@ -10,19 +10,20 @@ dependencies:
       type: service
     version: 1.1.0
   espressif/tinyusb:
-    component_hash: aa65639878f27a44d349044afd9c3fc134a92bd560874fdac1d836019b5c07ca
+    component_hash: ee1c962cff61eb975d508258d509974d58031cc27ff0d6c4117a67a613a49594
     dependencies:
     - name: idf
-      require: private
       version: '>=5.0'
     source:
-      registry_url: https://components.espressif.com/
-      type: service
+      git: https://github.com/micropython/tinyusb-espressif.git
+      path: .
+      type: git
     targets:
     - esp32s2
     - esp32s3
     - esp32p4
-    version: 0.18.0~4
+    - esp32h4
+    version: e4c0ec3caab3d9c25374de7047653b9ced8f14ff
   idf:
     source:
       type: idf
@@ -31,6 +32,6 @@ direct_dependencies:
 - espressif/mdns
 - espressif/tinyusb
 - idf
-manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55
+manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3
 target: esp32s3
 version: 2.0.0
diff --git a/ports/esp32/main/idf_component.yml b/ports/esp32/main/idf_component.yml
index 1ee8aa9769cff..77904865baae1 100644
--- a/ports/esp32/main/idf_component.yml
+++ b/ports/esp32/main/idf_component.yml
@@ -4,7 +4,10 @@ dependencies:
   espressif/tinyusb:
     rules:
       - if: "target in [esp32s2, esp32s3]"
-    version: "~0.18.0"
+    # Temporary workaround for https://github.com/hathach/tinyusb/issues/3154
+    # Can be removed once fix is released in espressif/tinyusb
+    git: https://github.com/micropython/tinyusb-espressif.git
+    version: cherrypick/dwc2_zlp_fix
   espressif/lan867x:
     version: "~1.0.0"
     rules:

From 787d85e0001089eb92f1c3643f29c14b3273b795 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Sun, 9 Nov 2025 00:08:42 +0100
Subject: [PATCH 3060/3129] tests/extmod/machine_i2s_rate.py: Adjust pins when
 running on ESP32-C3.

Changed the pin numbers used for the I2S rate testing as the pin numbers
used were incompatible with the limited GPIO pins availalbe on the
ESP32-C3, causing the tests to fail.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 tests/extmod/machine_i2s_rate.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
index c8fa11514c96b..f6de3d8f13ca0 100644
--- a/tests/extmod/machine_i2s_rate.py
+++ b/tests/extmod/machine_i2s_rate.py
@@ -26,7 +26,11 @@
         (2, Pin("D4"), Pin("D3"), Pin("D2"), None),
     )
 elif "esp32" in sys.platform:
-    i2s_instances = ((0, Pin(18), Pin(19), Pin(21), Pin(14)),)
+    try:
+        i2s_instances = ((0, Pin(18), Pin(19), Pin(21), Pin(14)),)
+    except ValueError:
+        # fallback to lower pin number for ESP32-C3
+        i2s_instances = ((0, Pin(6), Pin(7), Pin(10), Pin(11)),)
     # Allow for small additional RTOS overhead
     MAX_DELTA_MS = 8
 

From 8b7d9819b72f5c07ece0eefff556bf54bc35a161 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Nov 2025 13:34:38 +1100
Subject: [PATCH 3061/3129] tests/import: Make import_override and pkg7 tests
 behave under CPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/import/import_override.py           | 4 ++++
 tests/import/pkg7/subpkg1/subpkg2/mod3.py | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/import/import_override.py b/tests/import/import_override.py
index 029ebe54c1f70..0144e78cb9f32 100644
--- a/tests/import/import_override.py
+++ b/tests/import/import_override.py
@@ -2,6 +2,10 @@
 
 
 def custom_import(name, globals, locals, fromlist, level):
+    # CPython always tries to import _io, so just let that through as-is.
+    if name == "_io":
+        return orig_import(name, globals, locals, fromlist, level)
+
     print("import", name, fromlist, level)
 
     class M:
diff --git a/tests/import/pkg7/subpkg1/subpkg2/mod3.py b/tests/import/pkg7/subpkg1/subpkg2/mod3.py
index b0f4279fcf57b..f7f4c1e65f46f 100644
--- a/tests/import/pkg7/subpkg1/subpkg2/mod3.py
+++ b/tests/import/pkg7/subpkg1/subpkg2/mod3.py
@@ -5,7 +5,9 @@
 print(bar)
 
 # attempted relative import beyond top-level package
+# On older versions of CPython (eg 3.8) this is a ValueError, but on
+# newer CPython (eg 3.11) and MicroPython it's an ImportError.
 try:
     from .... import mod1
-except ImportError:
+except (ImportError, ValueError):
     print("ImportError")

From f3804c65896fd1471df723977f941f46e7b8bd26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Nov 2025 13:26:20 +1100
Subject: [PATCH 3062/3129] tests/import: Remove .py.exp files where they match
 CPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/import/import_override.py.exp | 2 --
 tests/import/import_pkg7.py.exp     | 8 --------
 tests/import/module_getattr.py.exp  | 1 -
 3 files changed, 11 deletions(-)
 delete mode 100644 tests/import/import_override.py.exp
 delete mode 100644 tests/import/import_pkg7.py.exp
 delete mode 100644 tests/import/module_getattr.py.exp

diff --git a/tests/import/import_override.py.exp b/tests/import/import_override.py.exp
deleted file mode 100644
index 365248da6d847..0000000000000
--- a/tests/import/import_override.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-import import1b None 0
-456
diff --git a/tests/import/import_pkg7.py.exp b/tests/import/import_pkg7.py.exp
deleted file mode 100644
index 8f21a615f6a61..0000000000000
--- a/tests/import/import_pkg7.py.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-pkg __name__: pkg7
-pkg __name__: pkg7.subpkg1
-pkg __name__: pkg7.subpkg1.subpkg2
-mod1
-mod2
-mod1.foo
-mod2.bar
-ImportError
diff --git a/tests/import/module_getattr.py.exp b/tests/import/module_getattr.py.exp
deleted file mode 100644
index bc59c12aa16bd..0000000000000
--- a/tests/import/module_getattr.py.exp
+++ /dev/null
@@ -1 +0,0 @@
-False

From d980bbd23717d504b8be8613e119467ca2136b2b Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Wed, 13 Aug 2025 17:13:49 +0300
Subject: [PATCH 3063/3129] tests/extmod_hardware/machine_encoder.py: Fix
 initial rotation count.

ESP32 requires initial high levels of the channels before starting the
count, in order to have 4 pulse for the first rotation.

Also add tests for encoder phases x2 and x4.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 tests/extmod_hardware/machine_encoder.py | 102 ++++++++++++++++++-----
 1 file changed, 81 insertions(+), 21 deletions(-)

diff --git a/tests/extmod_hardware/machine_encoder.py b/tests/extmod_hardware/machine_encoder.py
index 9bd2bb464178c..f28eb6de6f3a4 100644
--- a/tests/extmod_hardware/machine_encoder.py
+++ b/tests/extmod_hardware/machine_encoder.py
@@ -13,6 +13,9 @@
 import sys
 from machine import Pin
 
+PRINT = False
+PIN_INIT_VALUE = 1
+
 if "esp32" in sys.platform:
     id = 0
     out0_pin = 4
@@ -33,25 +36,70 @@
 
 class TestEncoder(unittest.TestCase):
     def setUp(self):
-        out0_pin(0)
-        out1_pin(0)
-        self.enc = Encoder(id, in0_pin, in1_pin)
+        out0_pin(PIN_INIT_VALUE)
+        out1_pin(PIN_INIT_VALUE)
+        self.enc = Encoder(id, in0_pin, in1_pin, phases=1)
+        self.enc2 = Encoder(id + 1, in0_pin, in1_pin, phases=2)
+        self.enc4 = Encoder(id + 2, in0_pin, in1_pin, phases=4)
         self.pulses = 0  # track the expected encoder position in software
+        if PRINT:
+            print(
+                "\nout0_pin() out1_pin() enc.value() enc2.value() enc4.value() |",
+                out0_pin(),
+                out1_pin(),
+                "|",
+                self.enc.value(),
+                self.enc2.value(),
+                self.enc4.value(),
+            )
 
     def tearDown(self):
         self.enc.deinit()
+        try:
+            self.enc2.deinit()
+        except:
+            pass
+        try:
+            self.enc4.deinit()
+        except:
+            pass
 
     def rotate(self, pulses):
         for _ in range(abs(pulses)):
             self.pulses += 1 if (pulses > 0) else -1
-            q = self.pulses % 4
-            # Only one pin should change state each "step" so output won't glitch
-            out0_pin(q in (1, 2))
-            out1_pin(q in (2, 3))
+            if pulses > 0:
+                if self.pulses % 2:
+                    out0_pin(not out0_pin())
+                else:
+                    out1_pin(not out1_pin())
+            else:
+                if self.pulses % 2:
+                    out1_pin(not out1_pin())
+                else:
+                    out0_pin(not out0_pin())
+        if PRINT:
+            print(
+                "out0_pin() out1_pin() enc.value() enc2.value() enc4.value() pulses self.pulses |",
+                out0_pin(),
+                out1_pin(),
+                "|",
+                self.enc.value(),
+                self.enc2.value(),
+                self.enc4.value(),
+                "|",
+                pulses,
+                self.pulses,
+            )
 
-    def assertPosition(self, value):
+    def assertPosition(self, value, value2=None, value4=None):
         self.assertEqual(self.enc.value(), value)
+        if not value2 is None:
+            self.assertEqual(self.enc2.value(), value2)
+        if not value4 is None:
+            self.assertEqual(self.enc4.value(), value4)
+        pass
 
+    @unittest.skipIf(sys.platform == "mimxrt", "cannot read back the pin")
     def test_connections(self):
         # Test the hardware connections are correct. If this test fails, all tests will fail.
         for ch, outp, inp in ((0, out0_pin, in0_pin), (1, out1_pin, in1_pin)):
@@ -64,7 +112,7 @@ def test_connections(self):
     def test_basics(self):
         self.assertPosition(0)
         self.rotate(100)
-        self.assertPosition(100 // 4)
+        self.assertPosition(100 // 4, 100 // 2, 100)
         self.rotate(-100)
         self.assertPosition(0)
 
@@ -72,27 +120,39 @@ def test_partial(self):
         # With phase=1 (default), need 4x pulses to count a rotation
         self.assertPosition(0)
         self.rotate(1)
-        self.assertPosition(0)
+        self.assertPosition(1, 1, 1)
         self.rotate(1)
-        self.assertPosition(0)
+        self.assertPosition(1, 1, 2)
         self.rotate(1)
-        self.assertPosition(1)  # only 3 pulses to count first rotation?
+        self.assertPosition(1, 2, 3)
         self.rotate(1)
-        self.assertPosition(1)
+        self.assertPosition(1, 2, 4)  # +4
         self.rotate(1)
-        self.assertPosition(1)
+        self.assertPosition(2, 3, 5)
         self.rotate(1)
-        self.assertPosition(1)
+        self.assertPosition(2, 3, 6)
         self.rotate(1)
-        self.assertPosition(2)  # 4 for next rotation
+        self.assertPosition(2, 4, 7)
+        self.rotate(1)
+        self.assertPosition(2, 4, 8)  # +4
         self.rotate(-1)
-        self.assertPosition(1)
-        self.rotate(-4)
-        self.assertPosition(0)
+        self.assertPosition(2, 4, 7)
+        self.rotate(-3)
+        self.assertPosition(1, 2, 4)  # -4
         self.rotate(-4)
-        self.assertPosition(-1)
+        self.assertPosition(0, 0, 0)  # -4
+        self.rotate(-1)
+        self.assertPosition(0, 0, -1)
+        self.rotate(-1)
+        self.assertPosition(0, -1, -2)
+        self.rotate(-1)
+        self.assertPosition(0, -1, -3)
+        self.rotate(-1)
+        self.assertPosition(-1, -2, -4)  # -4
+        self.rotate(-1)
+        self.assertPosition(-1, -2, -5)
         self.rotate(-3)
-        self.assertPosition(-1)
+        self.assertPosition(-2, -4, -8)  # -4
 
 
 if __name__ == "__main__":

From 094437686fc53727318eea82e5609106c26e882a Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Fri, 19 Sep 2025 13:04:37 +0300
Subject: [PATCH 3064/3129] tests/extmod_hardware/machine_encoder.py: Use
 target_wiring for encoder.

Signed-off-by: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
---
 tests/extmod_hardware/machine_encoder.py | 16 +++++-----------
 tests/run-tests.py                       |  1 +
 tests/target_wiring/esp32.py             |  5 +++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/extmod_hardware/machine_encoder.py b/tests/extmod_hardware/machine_encoder.py
index f28eb6de6f3a4..c218c8bfb646a 100644
--- a/tests/extmod_hardware/machine_encoder.py
+++ b/tests/extmod_hardware/machine_encoder.py
@@ -11,22 +11,16 @@
     raise SystemExit
 
 import sys
+import unittest
 from machine import Pin
+from target_wiring import encoder_loopback_id, encoder_loopback_out_pins, encoder_loopback_in_pins
 
 PRINT = False
 PIN_INIT_VALUE = 1
 
-if "esp32" in sys.platform:
-    id = 0
-    out0_pin = 4
-    in0_pin = 5
-    out1_pin = 12
-    in1_pin = 13
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
-
-import unittest
+id = encoder_loopback_id
+out0_pin, out1_pin = encoder_loopback_out_pins
+in0_pin, in1_pin = encoder_loopback_in_pins
 
 out0_pin = Pin(out0_pin, mode=Pin.OUT)
 in0_pin = Pin(in0_pin, mode=Pin.IN)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index d8d2c42ad22e7..b4654c2e6b582 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -309,6 +309,7 @@ def open(self, path, mode):
 tests_requiring_target_wiring = (
     "extmod/machine_uart_irq_txidle.py",
     "extmod/machine_uart_tx.py",
+    "extmod_hardware/machine_encoder.py",
     "extmod_hardware/machine_uart_irq_break.py",
     "extmod_hardware/machine_uart_irq_rx.py",
     "extmod_hardware/machine_uart_irq_rxidle.py",
diff --git a/tests/target_wiring/esp32.py b/tests/target_wiring/esp32.py
index 63d7a81a2dc12..2767cd5acb2e8 100644
--- a/tests/target_wiring/esp32.py
+++ b/tests/target_wiring/esp32.py
@@ -2,6 +2,11 @@
 #
 # Connect:
 # - GPIO4 to GPIO5
+# - GPIO12 to GPIO13
 
 uart_loopback_args = (1,)
 uart_loopback_kwargs = {"tx": 4, "rx": 5}
+
+encoder_loopback_id = 0
+encoder_loopback_out_pins = (4, 12)
+encoder_loopback_in_pins = (5, 13)

From 4e79698a997465b1043fa8cbc4a72cdac889341f Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Wed, 5 Nov 2025 10:19:27 +0000
Subject: [PATCH 3065/3129] rp2/pendsv: Fix PendSV_Handler dispatch check when
 threading enabled.

If MICROPY_PY_THREAD is set, PendSV_Handler acquires a mutex and calls the
dispatch functions. If pendsv_schedule_dispatch is called by a higher
priority interrupt while the mutex is acquired by PendSV_Handler it's
possible for the dispatch to not be triggered.

Add a check for dispatch calls at the end of PendSV_Handler once the mutex
has been released.

Fixes issue #18365.

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/pendsv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 05b521fde2607..a3a855b8d27df 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -180,5 +180,7 @@ void PendSV_Handler(void) {
 
     #if MICROPY_PY_THREAD
     mp_thread_recursive_mutex_unlock(&pendsv_mutex);
+    // Check if a dispatch occurred while the interrupt was being serviced
+    pendsv_resume_run_dispatch();
     #endif
 }

From 3d2eb3b8e907ee74350a69ff92af7a14d7c2f7c7 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sat, 15 Nov 2025 11:40:39 +0800
Subject: [PATCH 3066/3129] ports: Guard calls to machine_*_deinit_all() with
 #if where appropriate.

To allow these features to be properly disabled.
---
 ports/esp32/main.c  | 4 ++++
 ports/mimxrt/main.c | 4 ++++
 ports/rp2/main.c    | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 74e31647d76ff..41eea29b08ec3 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -187,7 +187,9 @@ void mp_task(void *pvParameter) {
 
     // Deinit uart before timers, as esp32 uart
     // depends on a timer instance
+    #if MICROPY_PY_MACHINE_UART
     machine_uart_deinit_all();
+    #endif
     machine_timer_deinit_all();
 
     #if MICROPY_PY_ESP32_PCNT
@@ -210,7 +212,9 @@ void mp_task(void *pvParameter) {
     mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
 
     // deinitialise peripherals
+    #if MICROPY_PY_MACHINE_PWM
     machine_pwm_deinit_all();
+    #endif
     // TODO: machine_rmt_deinit_all();
     machine_pins_deinit();
     #if MICROPY_PY_MACHINE_I2C_TARGET
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 22809916e7ac5..dcb1ede1670db 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -170,8 +170,12 @@ int main(void) {
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
+        #if MICROPY_PY_MACHINE_UART
         machine_uart_deinit_all();
+        #endif
+        #if MICROPY_PY_MACHINE_PWM
         machine_pwm_deinit_all();
+        #endif
         soft_timer_deinit();
         gc_sweep_all();
         mp_deinit();
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 1ffcabdfa0d14..f01522f243807 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -249,15 +249,21 @@ int main(int argc, char **argv) {
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
+        #if MICROPY_PY_MACHINE_I2S
         machine_i2s_deinit_all();
+        #endif
         rp2_dma_deinit();
         rp2_pio_deinit();
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_deinit();
         #endif
+        #if MICROPY_PY_MACHINE_PWM
         machine_pwm_deinit_all();
+        #endif
         machine_pin_deinit();
+        #if MICROPY_PY_MACHINE_UART
         machine_uart_deinit_all();
+        #endif
         #if MICROPY_PY_MACHINE_I2C_TARGET
         mp_machine_i2c_target_deinit_all();
         #endif

From 2ad1d29747df1f35c638b32477684c6e141d0f81 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 15 Nov 2025 10:42:41 +0100
Subject: [PATCH 3067/3129] alif/tinyusb_port: Add missing license header.

The full Alif license texit is available in
`lib/alif_ensemble-cmsis-dfp/License.txt` if it's needed.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/alif/tinyusb_port/alif_dcd_reg.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ports/alif/tinyusb_port/alif_dcd_reg.h b/ports/alif/tinyusb_port/alif_dcd_reg.h
index 84220f6be4ce4..c5a7076562f79 100644
--- a/ports/alif/tinyusb_port/alif_dcd_reg.h
+++ b/ports/alif/tinyusb_port/alif_dcd_reg.h
@@ -1,11 +1,13 @@
 // *FORMAT-OFF*
-///-------------------------------------------------------------------------------------------------
-/// @file    alif_dcd_reg.h
-/// @author  karol.saja@alifsemi.com
-/// @version 0.0.1
-/// @date    2023-09-08
-/// @brief   Low Level SPI driver
-///-------------------------------------------------------------------------------------------------
+/*
+ * Copyright (C) 2024 Alif Semiconductor - All Rights Reserved.
+ * Use, distribution and modification of this code is permitted under the
+ * terms stated in the Alif Semiconductor Software License Agreement
+ *
+ * You should have received a copy of the Alif Semiconductor Software
+ * License Agreement with this file. If not, please write to:
+ * contact@alifsemi.com, or visit: https://alifsemi.com/license
+ */
 
 #ifndef __ALIF_DCD_REG_H__
 #define __ALIF_DCD_REG_H__

From 5a69d4756751b92e13a6ea9a0c7b755dd3b43f7c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 26 Jul 2025 16:22:36 +1000
Subject: [PATCH 3068/3129] stm32/eth: Add support for Ethernet on N6 MCUs.

This adds working support for 100MBit Ethernet on N6 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32n657_af.csv          |  11 +
 ports/stm32/boards/stm32n6xx_hal_conf_base.h |   1 -
 ports/stm32/eth.c                            | 214 ++++++++++++++++---
 ports/stm32/main.c                           |   7 +-
 ports/stm32/powerctrlboot.c                  |   5 +
 5 files changed, 203 insertions(+), 35 deletions(-)

diff --git a/ports/stm32/boards/stm32n657_af.csv b/ports/stm32/boards/stm32n657_af.csv
index 220d27b3f88df..d7af193992e5c 100644
--- a/ports/stm32/boards/stm32n657_af.csv
+++ b/ports/stm32/boards/stm32n657_af.csv
@@ -20,6 +20,7 @@ PortC,PC9 ,             ,                   ,                              ,
 PortC,PC10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D2                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortC,PC11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_D3                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortC,PC12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,SDMMC1_CK                                    ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD1 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_MDC                                               ,                                                            ,                                                ,                       ,        ,
 PortD,PD2 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_CK                                              ,                                                            ,                                                ,                       ,        ,
 PortD,PD5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortD,PD6 ,             ,                   ,                              ,                                    ,TIM15_CH2                                          ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
@@ -27,6 +28,7 @@ PortD,PD7 ,             ,                   ,                              ,
 PortD,PD8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortD,PD9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortD,PD11,             ,                   ,                              ,                                    ,                                                   ,SPI2_MISO                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortD,PD12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_MDIO                                              ,                                                            ,                                                ,                       ,        ,
 PortD,PD13,             ,                   ,TIM4_CH2                      ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART1_TX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE6 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART1_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
@@ -38,12 +40,21 @@ PortE,PE13,             ,                   ,                              ,
 PortE,PE14,             ,                   ,                              ,                                    ,I2C4_SDA                                           ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE15,             ,                   ,                              ,                                    ,                                                   ,SPI5_SCK                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortF,PF3 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC1_INP16
+PortF,PF4 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_MDIO                                              ,                                                            ,                                                ,                       ,        ,
 PortF,PF6 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortF,PF7 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_REF_CLK                                      ,                                                            ,                                                ,                       ,        ,
+PortF,PF10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_CRS_DV                                       ,                                                            ,                                                ,                       ,        ,
+PortF,PF11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TX_EN                                        ,                                                            ,                                                ,                       ,        ,
+PortF,PF12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TXD0                                         ,                                                            ,                                                ,                       ,        ,
+PortF,PF13,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TXD1                                         ,                                                            ,                                                ,                       ,        ,
+PortF,PF14,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_RXD0                                         ,                                                            ,                                                ,                       ,        ,
+PortF,PF15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_RXD1                                         ,                                                            ,                                                ,                       ,        ,
 PortG,PG0 ,             ,                   ,TIM12_CH1                     ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG1 ,             ,                   ,                              ,                                    ,                                                   ,SPI5_MISO                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG2 ,             ,                   ,                              ,                                    ,                                                   ,SPI5_MOSI                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_CTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D1                                              ,                                                            ,                                                ,                       ,        ,
+PortG,PG11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_MDC                                               ,                                                            ,                                                ,                       ,        ,
 PortG,PG12,             ,TIM17_CH1          ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG13,             ,                   ,TIM4_CH1                      ,                                    ,                                                   ,                                                      ,                                                        ,USART3_RTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC12_INP7/ADC12_INN3
diff --git a/ports/stm32/boards/stm32n6xx_hal_conf_base.h b/ports/stm32/boards/stm32n6xx_hal_conf_base.h
index 641a003d8bf32..87556cf152115 100644
--- a/ports/stm32/boards/stm32n6xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32n6xx_hal_conf_base.h
@@ -160,7 +160,6 @@
 #include "stm32n6xx_hal_dcmipp.h"
 #include "stm32n6xx_hal_dma2d.h"
 #include "stm32n6xx_hal_dts.h"
-#include "stm32n6xx_hal_eth.h"
 #include "stm32n6xx_hal_exti.h"
 #include "stm32n6xx_hal_fdcan.h"
 #include "stm32n6xx_hal_gfxmmu.h"
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 9f655306816d9..0f8af5311bb5f 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -41,8 +41,19 @@
 #include "lwip/dhcp.h"
 #include "netif/ethernet.h"
 
+// Register and IRQ compatibility for STM32N6.
+#if defined(STM32N6)
+#define ETH                     ETH1
+#define ETH_MACMDIOAR_MB        (ETH_MACMDIOAR_GB)
+#define ETH_MACMDIOAR_MOC_Msk   (ETH_MACMDIOAR_GOC_Msk)
+#define ETH_MACMDIOAR_MOC_WR    (ETH_MACMDIOAR_GOC_0)
+#define ETH_MACMDIOAR_MOC_RD    (ETH_MACMDIOAR_GOC_1 | ETH_MACMDIOAR_GOC_0)
+#define ETH_IRQn                ETH1_IRQn
+#define ETH_IRQHandler          ETH1_IRQHandler
+#endif
+
 // ETH DMA RX and TX descriptor definitions
-#if defined(STM32H5)
+#if defined(STM32H5) || defined(STM32N6)
 #define RX_DESCR_3_OWN_Pos      (31)
 #define RX_DESCR_3_IOC_Pos      (30)
 #define RX_DESCR_3_BUF1V_Pos    (24)
@@ -85,6 +96,13 @@
 #define TX_DESCR_1_TBS1_Pos     (0)
 #endif
 
+// Static alternate function macro.
+#if defined(STM32N6)
+#define STATIC_AF_ETH(signal) STATIC_AF_ETH1_##signal
+#else
+#define STATIC_AF_ETH(signal) STATIC_AF_ETH_##signal
+#endif
+
 // Configuration values
 
 #define PHY_INIT_TIMEOUT_MS (10000)
@@ -95,6 +113,12 @@
 #define RX_BUF_NUM (5)
 #define TX_BUF_NUM (5)
 
+#if defined(STM32N6)
+// The N6 has two DMA channels, so use one for RX and one for TX.
+#define RX_DMA_CH (0)
+#define TX_DMA_CH (1)
+#endif
+
 typedef struct _eth_dma_rx_descr_t {
     volatile uint32_t rdes0, rdes1, rdes2, rdes3;
 } eth_dma_rx_descr_t;
@@ -129,7 +153,7 @@ static void eth_mac_deinit(eth_t *self);
 static void eth_process_frame(eth_t *self, size_t len, const uint8_t *buf);
 
 void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val) {
-    #if defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
     uint32_t ar = ETH->MACMDIOAR;
@@ -157,7 +181,7 @@ void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val) {
 }
 
 uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg) {
-    #if defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
     }
     uint32_t ar = ETH->MACMDIOAR;
@@ -197,15 +221,15 @@ int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
     }
 
     // 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_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);
-    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TX_EN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_TX_EN);
-    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);
+    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_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));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TX_EN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RMII_TX_EN));
+    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(STM32H5)
@@ -216,6 +240,11 @@ int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
     __HAL_RCC_ETH1MAC_CLK_ENABLE();
     __HAL_RCC_ETH1TX_CLK_ENABLE();
     __HAL_RCC_ETH1RX_CLK_ENABLE();
+    #elif defined(STM32N6)
+    __HAL_RCC_ETH1_CLK_ENABLE();
+    __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    __HAL_RCC_ETH1TX_CLK_ENABLE();
+    __HAL_RCC_ETH1RX_CLK_ENABLE();
     #else
     __HAL_RCC_ETH_CLK_ENABLE();
     #endif
@@ -229,7 +258,7 @@ void eth_set_trace(eth_t *self, uint32_t value) {
 static int eth_mac_init(eth_t *self) {
     // Configure MPU
     uint32_t irq_state = mpu_config_start();
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(16 * 1024));
     #else
     mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(MPU_REGION_SIZE_16KB));
@@ -241,16 +270,29 @@ static int eth_mac_init(eth_t *self) {
     __HAL_RCC_ETH_FORCE_RESET();
     #elif defined(STM32H7)
     __HAL_RCC_ETH1MAC_FORCE_RESET();
+    #elif defined(STM32N6)
+    __HAL_RCC_ETH1_FORCE_RESET();
     #else
     __HAL_RCC_ETHMAC_FORCE_RESET();
     #endif
 
+    // Select clock sources.
+    #if defined(STM32N6)
+    LL_RCC_SetETHREFTXClockSource(LL_RCC_ETH1REFTX_CLKSOURCE_EXT); // max 25MHz
+    LL_RCC_SetETHREFRXClockSource(LL_RCC_ETH1REFRX_CLKSOURCE_EXT); // max 125MHz
+    LL_RCC_SetETHClockSource(LL_RCC_ETH1_CLKSOURCE_IC12); // max 125MHz
+    LL_RCC_SetETH1PTPDivider(LL_RCC_ETH1PTP_DIV_1);
+    LL_RCC_SetETHPTPClockSource(LL_RCC_ETH1PTP_CLKSOURCE_HCLK); // max 200MHz
+    #endif
+
     // Select RMII interface
     #if defined(STM32H5)
     __HAL_RCC_SBS_CLK_ENABLE();
     SBS->PMCR = (SBS->PMCR & ~SBS_PMCR_ETH_SEL_PHY_Msk) | SBS_PMCR_ETH_SEL_PHY_2;
     #elif defined(STM32H7)
     SYSCFG->PMCR = (SYSCFG->PMCR & ~SYSCFG_PMCR_EPIS_SEL_Msk) | SYSCFG_PMCR_EPIS_SEL_2;
+    #elif defined(STM32N6)
+    LL_RCC_SetETHPHYInterface(LL_RCC_ETH1PHY_IF_RMII);
     #else
     __HAL_RCC_SYSCFG_CLK_ENABLE();
     SYSCFG->PMC |= SYSCFG_PMC_MII_RMII_SEL;
@@ -265,6 +307,13 @@ static int eth_mac_init(eth_t *self) {
     #elif 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();
+    #elif defined(STM32N6)
+    __HAL_RCC_ETH1_RELEASE_RESET();
+
+    __HAL_RCC_ETH1_CLK_SLEEP_ENABLE();
     __HAL_RCC_ETH1MAC_CLK_SLEEP_ENABLE();
     __HAL_RCC_ETH1TX_CLK_SLEEP_ENABLE();
     __HAL_RCC_ETH1RX_CLK_SLEEP_ENABLE();
@@ -277,7 +326,7 @@ static int eth_mac_init(eth_t *self) {
     #endif
 
     // Do a soft reset of the MAC core
-    #if defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     #define ETH_SOFT_RESET(eth) do { eth->DMAMR = ETH_DMAMR_SWR; } while (0)
     #define ETH_IS_RESET(eth) (eth->DMAMR & ETH_DMAMR_SWR)
     #else
@@ -299,7 +348,7 @@ static int eth_mac_init(eth_t *self) {
     // Set MII clock range
     uint32_t hclk = HAL_RCC_GetHCLKFreq();
     uint32_t cr_div;
-    #if defined(STM32H5)
+    #if defined(STM32H5) || defined(STM32N6)
     cr_div = ETH->MACMDIOAR & ~ETH_MACMDIOAR_CR;
     if (hclk < 35000000) {
         cr_div |= ETH_MACMDIOAR_CR_DIV16;
@@ -311,8 +360,17 @@ static int eth_mac_init(eth_t *self) {
         cr_div |= ETH_MACMDIOAR_CR_DIV62;
     } else if (hclk < 250000000) {
         cr_div |= ETH_MACMDIOAR_CR_DIV102;
+    #if defined(STM32H5)
     } else {
         cr_div |= ETH_MACMDIOAR_CR_DIV124;
+    #else
+    } else if (hclk < 300000000) {
+        cr_div |= ETH_MACMDIOAR_CR_DIV124;
+    } else if (hclk < 500000000) {
+        cr_div |= ETH_MACMDIOAR_CR_DIV204;
+    } else {
+        cr_div |= ETH_MACMDIOAR_CR_DIV324;
+    #endif
     }
     ETH->MACMDIOAR = cr_div;
     #elif defined(STM32H7)
@@ -344,9 +402,17 @@ static int eth_mac_init(eth_t *self) {
     ETH->MACMIIAR = cr_div;
     #endif
 
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
+    // Configure the MAC 1-us tick counter register.
+    WRITE_REG(ETH->MAC1USTCR, HAL_RCC_GetHCLKFreq() / 1000000U - 1U);
+    #endif
+
     #if defined(STM32H5) || defined(STM32H7)
     // don't skip 32bit words since our descriptors are continuous in memory
     ETH->DMACCR &= ~(ETH_DMACCR_DSL_Msk);
+    #elif defined(STM32N6)
+    ETH->DMA_CH[RX_DMA_CH].DMACCR &= ~(ETH_DMACxCR_DSL_Msk);
+    ETH->DMA_CH[TX_DMA_CH].DMACCR &= ~(ETH_DMACxCR_DSL_Msk);
     #endif
 
     // Reset the PHY
@@ -397,7 +463,7 @@ static int eth_mac_init(eth_t *self) {
     uint16_t phy_scsr = self->phy_get_link_status(self->phy_addr);
 
     // Burst mode configuration
-    #if defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     ETH->DMASBMR = ETH->DMASBMR & ~ETH_DMASBMR_AAL & ~ETH_DMASBMR_FB;
     #else
     ETH->DMABMR = 0;
@@ -410,6 +476,11 @@ static int eth_mac_init(eth_t *self) {
         | ETH_DMACIER_NIE // enable normal interrupts
         | ETH_DMACIER_RIE // enable RX interrupt
     ;
+    #elif defined(STM32N6)
+    ETH->DMA_CH[RX_DMA_CH].DMACIER =
+        ETH_DMACxIER_NIE // enable normal interrupts
+        | ETH_DMACxIER_RIE // enable RX interrupt
+    ;
     #else
     ETH->DMAIER =
         ETH_DMAIER_NISE // enable normal interrupts
@@ -419,7 +490,7 @@ static int eth_mac_init(eth_t *self) {
 
     // Configure RX descriptor lists
     for (size_t i = 0; i < RX_BUF_NUM; ++i) {
-        #if defined(STM32H5) || defined(STM32H7)
+        #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
         eth_dma.rx_descr[i].rdes3 =
             1 << RX_DESCR_3_OWN_Pos
                 | (1 << RX_DESCR_3_BUF1V_Pos) // buf1 address valid
@@ -439,6 +510,11 @@ static int eth_mac_init(eth_t *self) {
 
     #if defined(STM32H5) || defined(STM32H7)
     ETH->DMACRDLAR = (uint32_t)&eth_dma.rx_descr[0];
+    #elif defined(STM32N6)
+    // Set number of RX descriptors and buffer pointers.
+    ETH->DMA_CH[RX_DMA_CH].DMACRXRLR = RX_BUF_NUM - 1;
+    ETH->DMA_CH[RX_DMA_CH].DMACRXDLAR = (uint32_t)&eth_dma.rx_descr[0];
+    ETH->DMA_CH[RX_DMA_CH].DMACRXDTPR = (uint32_t)&eth_dma.rx_descr[RX_BUF_NUM - 1];
     #else
     ETH->DMARDLAR = (uint32_t)&eth_dma.rx_descr[0];
     #endif
@@ -446,7 +522,7 @@ static int eth_mac_init(eth_t *self) {
 
     // Configure TX descriptor lists
     for (size_t i = 0; i < TX_BUF_NUM; ++i) {
-        #if defined(STM32H5) || defined(STM32H7)
+        #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
         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;
@@ -465,6 +541,11 @@ static int eth_mac_init(eth_t *self) {
     ETH->DMACRDRLR = RX_BUF_NUM - 1;
 
     ETH->DMACTDLAR = (uint32_t)&eth_dma.tx_descr[0];
+    #elif defined(STM32N6)
+    // Set number of TX descriptors and buffer pointers.
+    ETH->DMA_CH[TX_DMA_CH].DMACTXRLR = TX_BUF_NUM - 1;
+    ETH->DMA_CH[TX_DMA_CH].DMACTXDLAR = (uint32_t)&eth_dma.tx_descr[0];
+    ETH->DMA_CH[TX_DMA_CH].DMACTXDTPR = (uint32_t)&eth_dma.tx_descr[0];
     #else
     ETH->DMATDLAR = (uint32_t)&eth_dma.tx_descr[0];
     #endif
@@ -476,6 +557,11 @@ static int eth_mac_init(eth_t *self) {
     ETH->MTLRQOMR = ETH_MTLRQOMR_RSF;
     // transmission starts when a full packet resides in the Tx queue
     ETH->MTLTQOMR = ETH_MTLTQOMR_TSF;
+    #elif defined(STM32N6)
+    // read from RX FIFO only after a full frame is written
+    ETH->MTL_QUEUE[0].MTLRXQOMR = ETH_MTLRXQxOMR_RSF;
+    // transmission starts when a full packet resides in the Tx queue
+    ETH->MTL_QUEUE[0].MTLTXQOMR = ETH_MTLTXQxOMR_TSF;
     #else
     ETH->DMAOMR =
         ETH_DMAOMR_RSF // read from RX FIFO after a full frame is written
@@ -485,7 +571,7 @@ static int eth_mac_init(eth_t *self) {
     mp_hal_delay_ms(2);
 
     // Select MAC filtering options
-    #if defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     ETH->MACPFR = ETH_MACPFR_RA; // pass all frames up
     #else
     ETH->MACFFR =
@@ -501,15 +587,47 @@ static int eth_mac_init(eth_t *self) {
     ETH->MACA0LR = mac[3] << 24 | mac[2] << 16 | mac[1] << 8 | mac[0];
     mp_hal_delay_ms(2);
 
+    // Work out the line speed configuration for MACCR.
+    uint32_t maccr = 0;
+    if (phy_scsr & PHY_SPEED_100HALF) {
+        maccr |= ETH_MACCR_FES;
+    }
+    if (phy_scsr & PHY_DUPLEX) {
+        maccr |= ETH_MACCR_DM;
+    }
+
+    #if defined(STM32N6)
+
+    maccr |=
+        ETH_MACCR_IPG_96BIT
+        | ETH_MACCR_SARC_REPADDR0
+        | ETH_MACCR_IPC
+        | ETH_MACCR_PS
+        | ETH_MACCR_BL_10
+        | ETH_MACCR_PRELEN_7;
+
+    ETH->MACCR = maccr;
+    ETH->MACECR = 0x618U;
+    ETH->MACWTR = ETH_MACWTR_WTO_2KB;
+    ETH->MACQ0TXFCR = ETH_MACQ0TXFCR_PLT_MINUS4;
+    ETH->MACRXFCR = 0;
+    ETH->MACRXQC0R = ETH_MACRXQC0R_RXQ0EN_GT | ETH_MACRXQC0R_RXQ1EN_NOT;
+
+    ETH->MTLOMR = ETH_MTLOMR_SCHALG_SP | ETH_MTLOMR_RAA_SP;
+    ETH->MTLRXQDMAMR = ETH_MTLRXQDMAMR_Q0MDMACH_DMACH0 | ETH_MTLRXQDMAMR_Q1MDMACH_DMACH1;
+    ETH->MTL_QUEUE[0].MTLTXQOMR = ETH_MTLTXQxOMR_TXQEN_EN | ETH_MTLTXQxOMR_TSF | 7 << ETH_MTLTXQxOMR_TQS_Pos;
+    ETH->MTL_QUEUE[1].MTLTXQOMR = ETH_MTLTXQxOMR_TXQEN_EN | ETH_MTLTXQxOMR_TSF | 7 << ETH_MTLTXQxOMR_TQS_Pos;
+    ETH->MTL_QUEUE[0].MTLRXQOMR = ETH_MTLRXQxOMR_RSF | 15 << ETH_MTLRXQxOMR_RQS_Pos;
+    ETH->MTL_QUEUE[1].MTLRXQOMR = ETH_MTLRXQxOMR_RSF | 15 << ETH_MTLRXQxOMR_RQS_Pos;
+
+    #else
+
     // Set main MAC control register
-    ETH->MACCR =
-        phy_scsr == PHY_SPEED_10FULL ? ETH_MACCR_DM
-        : phy_scsr == PHY_SPEED_100HALF ? ETH_MACCR_FES
-        : phy_scsr == PHY_SPEED_100FULL ? (ETH_MACCR_FES | ETH_MACCR_DM)
-        : 0
-    ;
+    ETH->MACCR = maccr;
     mp_hal_delay_ms(2);
 
+    #endif
+
     // Start MAC layer
     ETH->MACCR |=
         ETH_MACCR_TE // enable TX
@@ -521,6 +639,15 @@ static int eth_mac_init(eth_t *self) {
     #if defined(STM32H5) || defined(STM32H7)
     ETH->DMACRCR |= ETH_DMACRCR_SR; // start RX
     ETH->DMACTCR |= ETH_DMACTCR_ST; // start TX
+    #elif defined(STM32N6)
+    ETH->MTL_QUEUE[0].MTLTXQOMR |= ETH_MTLTXQxOMR_FTQ; // flush TX FIFO
+    ETH->MTL_QUEUE[1].MTLTXQOMR |= ETH_MTLTXQxOMR_FTQ; // flush TX FIFO
+    ETH->DMA_CH[RX_DMA_CH].DMACRXCR = RX_BUF_SIZE << ETH_DMACxRXCR_RBSZ_Pos;
+    ETH->DMA_CH[RX_DMA_CH].DMACRXCR |= ETH_DMACxRXCR_SR; // start RX
+    ETH->DMA_CH[TX_DMA_CH].DMACTXCR = 4 << ETH_DMACxTXCR_TXPBL_Pos;
+    ETH->DMA_CH[TX_DMA_CH].DMACTXCR |= ETH_DMACxTXCR_ST; // start TX
+    ETH->DMA_CH[RX_DMA_CH].DMACSR |= ETH_DMACxSR_TPS | ETH_DMACxSR_RPS; // clear TX/RX process stopped flags
+    ETH->DMA_CH[TX_DMA_CH].DMACSR |= ETH_DMACxSR_TPS | ETH_DMACxSR_RPS; // clear TX/RX process stopped flags
     #else
     ETH->DMAOMR |=
         ETH_DMAOMR_ST // start TX
@@ -547,6 +674,10 @@ static void eth_mac_deinit(eth_t *self) {
     __HAL_RCC_ETH1MAC_FORCE_RESET();
     __HAL_RCC_ETH1MAC_RELEASE_RESET();
     __HAL_RCC_ETH1MAC_CLK_DISABLE();
+    #elif defined(STM32N6)
+    __HAL_RCC_ETH1_FORCE_RESET();
+    __HAL_RCC_ETH1_RELEASE_RESET();
+    __HAL_RCC_ETH1_CLK_DISABLE();
     #else
     __HAL_RCC_ETHMAC_FORCE_RESET();
     __HAL_RCC_ETHMAC_RELEASE_RESET();
@@ -563,7 +694,7 @@ 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(STM32H5) || defined(STM32H7)
+        #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
         if (!(tx_descr->tdes3 & (1 << TX_DESCR_3_OWN_Pos))) {
             break;
         }
@@ -577,7 +708,7 @@ static int eth_tx_buf_get(size_t len, uint8_t **buf) {
         }
     }
 
-    #if defined(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     // 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;
@@ -599,7 +730,7 @@ 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(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     tx_descr->tdes3 =
         1 << TX_DESCR_3_OWN_Pos     // owned by DMA
             | 1 << TX_DESCR_3_LD_Pos // last segment
@@ -623,6 +754,11 @@ static int eth_tx_buf_send(void) {
         ETH->DMACSR = ETH_DMACSR_TBU;
     }
     ETH->DMACTDTPR = (uint32_t)&eth_dma.tx_descr[eth_dma.tx_descr_idx];
+    #elif defined(STM32N6)
+    if (ETH->DMA_CH[TX_DMA_CH].DMACSR & ETH_DMACxSR_TBU) {
+        ETH->DMA_CH[TX_DMA_CH].DMACSR = ETH_DMACxSR_TBU;
+    }
+    ETH->DMA_CH[TX_DMA_CH].DMACTXDTPR = (uint32_t)&eth_dma.tx_descr[eth_dma.tx_descr_idx];
     #else
     if (ETH->DMASR & ETH_DMASR_TBUS) {
         ETH->DMASR = ETH_DMASR_TBUS;
@@ -640,7 +776,7 @@ 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(STM32H5) || defined(STM32H7)
+    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     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
@@ -659,16 +795,24 @@ static void eth_dma_rx_free(void) {
     __DMB();
     #if defined(STM32H5) || defined(STM32H7)
     ETH->DMACRDTPR = (uint32_t)&rx_descr[eth_dma.rx_descr_idx];
+    #elif defined(STM32N6)
+    ETH->DMA_CH[RX_DMA_CH].DMACRXDTPR = (uint32_t)&rx_descr[eth_dma.rx_descr_idx];
     #else
     ETH->DMARPDR = 0;
     #endif
 }
 
 void ETH_IRQHandler(void) {
+    MP_STATIC_ASSERT(ETH_IRQn > 0);
+
     #if defined(STM32H5) || defined(STM32H7)
     uint32_t sr = ETH->DMACSR;
     ETH->DMACSR = ETH_DMACSR_NIS;
     uint32_t rx_interrupt = sr & ETH_DMACSR_RI;
+    #elif defined(STM32N6)
+    uint32_t sr = ETH->DMA_CH[RX_DMA_CH].DMACSR;
+    ETH->DMA_CH[RX_DMA_CH].DMACSR = ETH_DMACxSR_NIS;
+    uint32_t rx_interrupt = sr & ETH_DMACxSR_RI;
     #else
     uint32_t sr = ETH->DMASR;
     ETH->DMASR = ETH_DMASR_NIS;
@@ -677,11 +821,13 @@ void ETH_IRQHandler(void) {
     if (rx_interrupt) {
         #if defined(STM32H5) || defined(STM32H7)
         ETH->DMACSR = ETH_DMACSR_RI;
+        #elif defined(STM32N6)
+        ETH->DMA_CH[RX_DMA_CH].DMACSR = ETH_DMACxSR_RI;
         #else
         ETH->DMASR = ETH_DMASR_RS;
         #endif
         for (;;) {
-            #if defined(STM32H5) || defined(STM32H7)
+            #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
             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
@@ -696,13 +842,13 @@ void ETH_IRQHandler(void) {
             #endif
 
             // Get RX buffer containing new frame
-            #if defined(STM32H5) || defined(STM32H7)
+            #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
             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(STM32H5) || defined(STM32H7)
+            #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
             uint8_t *buf = &eth_dma.rx_buf[eth_dma.rx_descr_idx * RX_BUF_SIZE];
             #else
             uint8_t *buf = (uint8_t *)rx_descr->rdes2;
@@ -875,6 +1021,8 @@ void eth_low_power_mode(eth_t *self, bool enable) {
     // Enable eth clock
     #if defined(STM32H7)
     __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    #elif defined(STM32N6)
+    __HAL_RCC_ETH1_CLK_ENABLE();
     #else
     __HAL_RCC_ETH_CLK_ENABLE();
     #endif
@@ -886,6 +1034,8 @@ void eth_low_power_mode(eth_t *self, bool enable) {
         // Disable eth clock.
         #if defined(STM32H7)
         __HAL_RCC_ETH1MAC_CLK_DISABLE();
+        #elif defined(STM32N6)
+        __HAL_RCC_ETH1_CLK_DISABLE();
         #else
         __HAL_RCC_ETH_CLK_DISABLE();
         #endif
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 2d97adb1d4048..6f7413694b0b4 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -318,11 +318,14 @@ static void risaf_init(void) {
     rimc_master.MasterCID = RIF_CID_1;
     rimc_master.SecPriv = RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV;
 
-    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_ADC12, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
     HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_SDMMC1, &rimc_master);
-    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_SDMMC1, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
     HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_SDMMC2, &rimc_master);
+    HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_ETH1, &rimc_master);
+
+    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_ADC12, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
+    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_SDMMC1, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
     HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_SDMMC2, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
+    HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_ETH1, RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
 }
 #endif
 
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index a8ef8c34af8e6..7baaa6773209a 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -482,6 +482,11 @@ void SystemClock_Config(void) {
     LL_RCC_IC11_SetDivider(1);
     LL_RCC_IC11_Enable();
 
+    // Configure IC12 at 100MHz for ETH1CLKSEL.
+    LL_RCC_IC12_SetSource(LL_RCC_ICCLKSOURCE_PLL1);
+    LL_RCC_IC12_SetDivider(8);
+    LL_RCC_IC12_Enable();
+
     // Configure IC14 at 100MHz for slower peripherals.
     LL_RCC_IC14_SetSource(LL_RCC_ICCLKSOURCE_PLL1);
     LL_RCC_IC14_SetDivider(8);

From c8a818cf13747252349ffdee9cf1cb9ad6b3408a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 31 Oct 2025 21:35:18 +1100
Subject: [PATCH 3069/3129] stm32/lwip_inc: Include HAL header to get MCU
 define.

Otherwise the custom memory settings don't take place.

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

diff --git a/ports/stm32/lwip_inc/lwipopts.h b/ports/stm32/lwip_inc/lwipopts.h
index ad1143845f793..aa6cf85874ecb 100644
--- a/ports/stm32/lwip_inc/lwipopts.h
+++ b/ports/stm32/lwip_inc/lwipopts.h
@@ -1,6 +1,8 @@
 #ifndef MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H
 #define MICROPY_INCLUDED_STM32_LWIP_LWIPOPTS_H
 
+#include STM32_HAL_H
+
 #define LWIP_NETIF_EXT_STATUS_CALLBACK  1
 
 #define LWIP_LOOPIF_MULTICAST           1

From 6c4b05d8325b518ec620208e3d1fec72a53b86cb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Nov 2025 17:34:23 +1100
Subject: [PATCH 3070/3129] stm32/lwip_inc: Further increase N6 lwIP memory.

This MCU has a lot of memory and gigabit ethernet, so it benefits from
improved lwIP performance.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/lwip_inc/lwipopts.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/lwip_inc/lwipopts.h b/ports/stm32/lwip_inc/lwipopts.h
index aa6cf85874ecb..5711ba8944e00 100644
--- a/ports/stm32/lwip_inc/lwipopts.h
+++ b/ports/stm32/lwip_inc/lwipopts.h
@@ -14,11 +14,12 @@
 
 // Increase memory for lwIP to get better performance.
 #if defined(STM32N6)
-#define MEM_SIZE                        (16 * 1024)
+#define MEM_SIZE                        (64 * 1024)
+#define PBUF_POOL_SIZE                  (32)
 #define TCP_MSS                         (1460)
-#define TCP_WND                         (8 * TCP_MSS)
-#define TCP_SND_BUF                     (8 * TCP_MSS)
-#define MEMP_NUM_TCP_SEG                (32)
+#define TCP_WND                         (16 * TCP_MSS)
+#define TCP_SND_BUF                     (16 * TCP_MSS)
+#define MEMP_NUM_TCP_SEG                (64)
 #endif
 
 // Include common lwIP configuration.

From 15acd6d8f79a081bf9ae8a4b761b556011da26bb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Sep 2025 12:16:13 +1000
Subject: [PATCH 3071/3129] stm32/boards/NUCLEO_N657X0: Enable Ethernet.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h  | 11 +++++++++++
 ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk |  3 +++
 ports/stm32/boards/NUCLEO_N657X0/pins.csv         | 11 +++++++++++
 3 files changed, 25 insertions(+)

diff --git a/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h
index ccc3fa051ff3e..90ea1eae3a85f 100644
--- a/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.h
@@ -74,6 +74,17 @@
 #define MICROPY_HW_USB_HS_IN_FS                 (1)
 #define MICROPY_HW_USB_MAIN_DEV                 (USB_PHY_HS_ID)
 
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC                      (pin_G11)
+#define MICROPY_HW_ETH_MDIO                     (pin_F4)
+#define MICROPY_HW_ETH_RMII_REF_CLK             (pin_F7)
+#define MICROPY_HW_ETH_RMII_CRS_DV              (pin_F10)
+#define MICROPY_HW_ETH_RMII_RXD0                (pin_F14)
+#define MICROPY_HW_ETH_RMII_RXD1                (pin_F15)
+#define MICROPY_HW_ETH_RMII_TX_EN               (pin_F11)
+#define MICROPY_HW_ETH_RMII_TXD0                (pin_F12)
+#define MICROPY_HW_ETH_RMII_TXD1                (pin_F13)
+
 /******************************************************************************/
 // Bootloader configuration
 
diff --git a/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk
index fa64cb17065e0..777f22e61edf2 100644
--- a/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_N657X0/mpconfigboard.mk
@@ -24,3 +24,6 @@ endif
 
 # MicroPython settings
 MICROPY_FLOAT_IMPL = double
+MICROPY_PY_LWIP = 1
+MICROPY_PY_SSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/NUCLEO_N657X0/pins.csv b/ports/stm32/boards/NUCLEO_N657X0/pins.csv
index 033f0a552e00b..a8a3f6c5ab400 100644
--- a/ports/stm32/boards/NUCLEO_N657X0/pins.csv
+++ b/ports/stm32/boards/NUCLEO_N657X0/pins.csv
@@ -44,6 +44,17 @@ A5,PG15
 -SPI5_MISO,PG1
 -SPI5_MOSI,PG2
 
+# ETH1 RMII
+,PG11
+,PF4
+,PF7
+,PF10
+,PF11
+,PF12
+,PF13
+,PF14
+,PF15
+
 -BUTTON,PC13
 LED_BLUE,PG8
 LED_RED,PG10

From 769f5cf1a96a64454c837d3d201f8c06e44baaad Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 28 Oct 2025 17:19:25 +1100
Subject: [PATCH 3072/3129] stm32/eth_phy: Add support for 1000Mbit PHY.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/eth_phy.c | 19 +++++++++++++++----
 ports/stm32/eth_phy.h | 12 +++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/eth_phy.c b/ports/stm32/eth_phy.c
index 56cddba9c520b..2435cc3e0387b 100644
--- a/ports/stm32/eth_phy.c
+++ b/ports/stm32/eth_phy.c
@@ -31,8 +31,9 @@
 #if defined(MICROPY_HW_ETH_MDC)
 
 #define PHY_SCSR_LAN87XX                (0x001f)
-#define PHY_SCSR_LAN87XX_SPEED_Pos      (2)
-#define PHY_SCSR_LAN87XX_SPEED_Msk      (7)
+#define PHY_SCSR_LAN87XX_10M_Msk        (0x0004)
+#define PHY_SCSR_LAN87XX_100M_Msk       (0x0008)
+#define PHY_SCSR_LAN87XX_DUPLEX_Msk     (0x0010)
 
 #define PHY_SCSR_DP838XX                (0x0010)
 #define PHY_RECR_DP838XX                (0x0015)
@@ -41,8 +42,18 @@
 
 int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr) {
     // Get the link mode & speed
-    int16_t scsr = eth_phy_read(phy_addr, PHY_SCSR_LAN87XX);
-    return (scsr >> PHY_SCSR_LAN87XX_SPEED_Pos) & PHY_SCSR_LAN87XX_SPEED_Msk;
+    uint16_t scsr = eth_phy_read(phy_addr, PHY_SCSR_LAN87XX);
+    int16_t status = 0;
+    if (scsr & PHY_SCSR_LAN87XX_10M_Msk) {
+        status |= PHY_SPEED_10HALF;
+    }
+    if (scsr & PHY_SCSR_LAN87XX_100M_Msk) {
+        status |= PHY_SPEED_100HALF;
+    }
+    if (scsr & PHY_SCSR_LAN87XX_DUPLEX_Msk) {
+        status |= PHY_DUPLEX;
+    }
+    return status;
 }
 
 int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr) {
diff --git a/ports/stm32/eth_phy.h b/ports/stm32/eth_phy.h
index dccfb7951add8..1f2045082d008 100644
--- a/ports/stm32/eth_phy.h
+++ b/ports/stm32/eth_phy.h
@@ -50,11 +50,13 @@
 #define PHY_ANAR_SPEED_100FULL  (0x0100)
 #define PHY_ANAR_IEEE802_3      (0x0001)
 
-#define PHY_SPEED_10HALF   (1)
-#define PHY_SPEED_10FULL   (5)
-#define PHY_SPEED_100HALF  (2)
-#define PHY_SPEED_100FULL  (6)
-#define PHY_DUPLEX         (4)
+#define PHY_SPEED_10HALF        (0x01)
+#define PHY_SPEED_100HALF       (0x02)
+#define PHY_SPEED_1000HALF      (0x04)
+#define PHY_DUPLEX              (0x08)
+#define PHY_SPEED_10FULL        (PHY_DUPLEX | PHY_SPEED_10HALF)
+#define PHY_SPEED_100FULL       (PHY_DUPLEX | PHY_SPEED_100HALF)
+#define PHY_SPEED_1000FULL      (PHY_DUPLEX | PHY_SPEED_1000HALF)
 
 uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg);
 void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val);

From 7713cdd8fe9e57832ccd4794313d84f3480438f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Oct 2025 14:48:33 +1100
Subject: [PATCH 3073/3129] stm32/eth_phy: Add support for RTL8211 ETH PHY.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/eth.c     |  2 ++
 ports/stm32/eth.h     |  3 ++-
 ports/stm32/eth_phy.c | 31 +++++++++++++++++++++++++++++++
 ports/stm32/eth_phy.h |  1 +
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 0f8af5311bb5f..5f2478f082bc4 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -216,6 +216,8 @@ int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
         self->phy_get_link_status = eth_phy_dp838xx_get_link_status;
     } else if (phy_type == ETH_PHY_LAN8720 || phy_type == ETH_PHY_LAN8742) {
         self->phy_get_link_status = eth_phy_lan87xx_get_link_status;
+    } else if (phy_type == ETH_PHY_RTL8211) {
+        self->phy_get_link_status = eth_phy_rtl8211_get_link_status;
     } else {
         return -1;
     }
diff --git a/ports/stm32/eth.h b/ports/stm32/eth.h
index 5647449690cfa..6556f4a7c10b1 100644
--- a/ports/stm32/eth.h
+++ b/ports/stm32/eth.h
@@ -30,7 +30,8 @@ enum {
     ETH_PHY_LAN8742 = 0,
     ETH_PHY_LAN8720,
     ETH_PHY_DP83848,
-    ETH_PHY_DP83825
+    ETH_PHY_DP83825,
+    ETH_PHY_RTL8211
 };
 
 typedef struct _eth_t eth_t;
diff --git a/ports/stm32/eth_phy.c b/ports/stm32/eth_phy.c
index 2435cc3e0387b..5b4673cc77881 100644
--- a/ports/stm32/eth_phy.c
+++ b/ports/stm32/eth_phy.c
@@ -40,6 +40,14 @@
 #define PHY_SCSR_DP838XX_DUPLEX_Msk     (4)
 #define PHY_SCSR_DP838XX_10M_Msk        (2)
 
+#define PHY_RTL8211_DEFAULT_PAGE        (0xa42)
+#define PHY_RTL8211_PAGSR_ADDR          (0x1f)
+#define PHY_RTL8211_PHYSR_PAGE          (0xa43)
+#define PHY_RTL8211_PHYSR_ADDR          (0x1a)
+#define PHY_RTL8211_PHYSR_SPEED_Pos     (4)
+#define PHY_RTL8211_PHYSR_SPEED_Msk     (3 << PHY_RTL8211_PHYSR_SPEED_Pos)
+#define PHY_RTL8211_PHYSR_DUPLEX_Msk    (0x0008)
+
 int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr) {
     // Get the link mode & speed
     uint16_t scsr = eth_phy_read(phy_addr, PHY_SCSR_LAN87XX);
@@ -67,4 +75,27 @@ int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr) {
     return scsr;
 }
 
+int16_t eth_phy_rtl8211_get_link_status(uint32_t phy_addr) {
+    // Get the link mode & speed
+    eth_phy_write(phy_addr, PHY_RTL8211_PAGSR_ADDR, PHY_RTL8211_PHYSR_PAGE);
+    int16_t physr = eth_phy_read(phy_addr, PHY_RTL8211_PHYSR_ADDR);
+    eth_phy_write(phy_addr, PHY_RTL8211_PAGSR_ADDR, PHY_RTL8211_DEFAULT_PAGE);
+    int16_t status = 0;
+    switch ((physr & PHY_RTL8211_PHYSR_SPEED_Msk) >> PHY_RTL8211_PHYSR_SPEED_Pos) {
+        case 0:
+            status |= PHY_SPEED_10HALF;
+            break;
+        case 1:
+            status |= PHY_SPEED_100HALF;
+            break;
+        case 2:
+            status |= PHY_SPEED_1000HALF;
+            break;
+    }
+    if (physr & PHY_RTL8211_PHYSR_DUPLEX_Msk) {
+        status |= PHY_DUPLEX;
+    }
+    return status;
+}
+
 #endif
diff --git a/ports/stm32/eth_phy.h b/ports/stm32/eth_phy.h
index 1f2045082d008..79f0d7003b7f5 100644
--- a/ports/stm32/eth_phy.h
+++ b/ports/stm32/eth_phy.h
@@ -63,6 +63,7 @@ void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val);
 
 int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr);
 int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr);
+int16_t eth_phy_rtl8211_get_link_status(uint32_t phy_addr);
 
 #endif
 

From 0acac07a16dd900eead199e506d6dc001692e88d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 3 Nov 2025 23:53:45 +1100
Subject: [PATCH 3074/3129] stm32/eth_phy: Move PHY initialization to a
 dedicated function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/eth.c     | 7 ++++---
 ports/stm32/eth_phy.c | 6 ++++++
 ports/stm32/eth_phy.h | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 5f2478f082bc4..c2155399ebd4d 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -142,6 +142,7 @@ typedef struct _eth_t {
     struct netif netif;
     struct dhcp dhcp_struct;
     uint32_t phy_addr;
+    void (*phy_init)(uint32_t phy_addr);
     int16_t (*phy_get_link_status)(uint32_t phy_addr);
 } eth_t;
 
@@ -212,6 +213,7 @@ int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
     mp_hal_get_mac(mac_idx, &self->netif.hwaddr[0]);
     self->netif.hwaddr_len = 6;
     self->phy_addr = phy_addr;
+    self->phy_init = eth_phy_generic_init;
     if (phy_type == ETH_PHY_DP83825 || phy_type == ETH_PHY_DP83848) {
         self->phy_get_link_status = eth_phy_dp838xx_get_link_status;
     } else if (phy_type == ETH_PHY_LAN8720 || phy_type == ETH_PHY_LAN8742) {
@@ -417,9 +419,8 @@ static int eth_mac_init(eth_t *self) {
     ETH->DMA_CH[TX_DMA_CH].DMACCR &= ~(ETH_DMACxCR_DSL_Msk);
     #endif
 
-    // Reset the PHY
-    eth_phy_write(self->phy_addr, PHY_BCR, PHY_BCR_SOFT_RESET);
-    mp_hal_delay_ms(50);
+    // Reset and initialize the PHY.
+    self->phy_init(self->phy_addr);
 
     // Wait for the PHY link to be established
     int phy_state = 0;
diff --git a/ports/stm32/eth_phy.c b/ports/stm32/eth_phy.c
index 5b4673cc77881..fa4364a9104ec 100644
--- a/ports/stm32/eth_phy.c
+++ b/ports/stm32/eth_phy.c
@@ -48,6 +48,12 @@
 #define PHY_RTL8211_PHYSR_SPEED_Msk     (3 << PHY_RTL8211_PHYSR_SPEED_Pos)
 #define PHY_RTL8211_PHYSR_DUPLEX_Msk    (0x0008)
 
+void eth_phy_generic_init(uint32_t phy_addr) {
+    // Reset the PHY.
+    eth_phy_write(phy_addr, PHY_BCR, PHY_BCR_SOFT_RESET);
+    mp_hal_delay_ms(50);
+}
+
 int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr) {
     // Get the link mode & speed
     uint16_t scsr = eth_phy_read(phy_addr, PHY_SCSR_LAN87XX);
diff --git a/ports/stm32/eth_phy.h b/ports/stm32/eth_phy.h
index 79f0d7003b7f5..c369de1f43313 100644
--- a/ports/stm32/eth_phy.h
+++ b/ports/stm32/eth_phy.h
@@ -61,6 +61,7 @@
 uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg);
 void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val);
 
+void eth_phy_generic_init(uint32_t phy_addr);
 int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr);
 int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr);
 int16_t eth_phy_rtl8211_get_link_status(uint32_t phy_addr);

From d1e993f872293fc74b72d0d189c9610b66c61d21 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 3 Nov 2025 23:54:03 +1100
Subject: [PATCH 3075/3129] stm32/eth_phy: Add support for RTL8211
 inititialization.

This gets the status indicator working on the RTL8211.

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

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index c2155399ebd4d..d1ded64877f98 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -219,6 +219,7 @@ int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
     } else if (phy_type == ETH_PHY_LAN8720 || phy_type == ETH_PHY_LAN8742) {
         self->phy_get_link_status = eth_phy_lan87xx_get_link_status;
     } else if (phy_type == ETH_PHY_RTL8211) {
+        self->phy_init = eth_phy_rtl8211_init;
         self->phy_get_link_status = eth_phy_rtl8211_get_link_status;
     } else {
         return -1;
diff --git a/ports/stm32/eth_phy.c b/ports/stm32/eth_phy.c
index fa4364a9104ec..cdc632f26fe0a 100644
--- a/ports/stm32/eth_phy.c
+++ b/ports/stm32/eth_phy.c
@@ -47,6 +47,8 @@
 #define PHY_RTL8211_PHYSR_SPEED_Pos     (4)
 #define PHY_RTL8211_PHYSR_SPEED_Msk     (3 << PHY_RTL8211_PHYSR_SPEED_Pos)
 #define PHY_RTL8211_PHYSR_DUPLEX_Msk    (0x0008)
+#define PHY_RTL8211_LCR_PAGE            (0xd04)
+#define PHY_RTL8211_LCR_ADDR            (0x10)
 
 void eth_phy_generic_init(uint32_t phy_addr) {
     // Reset the PHY.
@@ -81,6 +83,16 @@ int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr) {
     return scsr;
 }
 
+void eth_phy_rtl8211_init(uint32_t phy_addr) {
+    // Perform generic PHY initialization.
+    eth_phy_generic_init(phy_addr);
+
+    // Configure LED0 output to show 10/100/1000 link speed, and activity.
+    eth_phy_write(phy_addr, PHY_RTL8211_PAGSR_ADDR, PHY_RTL8211_LCR_PAGE);
+    eth_phy_write(phy_addr, PHY_RTL8211_LCR_ADDR, 0x001b);
+    eth_phy_write(phy_addr, PHY_RTL8211_PAGSR_ADDR, PHY_RTL8211_DEFAULT_PAGE);
+}
+
 int16_t eth_phy_rtl8211_get_link_status(uint32_t phy_addr) {
     // Get the link mode & speed
     eth_phy_write(phy_addr, PHY_RTL8211_PAGSR_ADDR, PHY_RTL8211_PHYSR_PAGE);
diff --git a/ports/stm32/eth_phy.h b/ports/stm32/eth_phy.h
index c369de1f43313..7d4bf4c46890f 100644
--- a/ports/stm32/eth_phy.h
+++ b/ports/stm32/eth_phy.h
@@ -64,6 +64,7 @@ void eth_phy_write(uint32_t phy_addr, uint32_t reg, uint32_t val);
 void eth_phy_generic_init(uint32_t phy_addr);
 int16_t eth_phy_lan87xx_get_link_status(uint32_t phy_addr);
 int16_t eth_phy_dp838xx_get_link_status(uint32_t phy_addr);
+void eth_phy_rtl8211_init(uint32_t phy_addr);
 int16_t eth_phy_rtl8211_get_link_status(uint32_t phy_addr);
 
 #endif

From 45956a951651481f9eb062e843f4de6d4dc14d12 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Oct 2025 14:49:15 +1100
Subject: [PATCH 3076/3129] stm32/eth: Add support for gigabit RGMII peripheral
 interface.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32n657_af.csv | 20 +++++++++++-------
 ports/stm32/eth.c                   | 32 ++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/ports/stm32/boards/stm32n657_af.csv b/ports/stm32/boards/stm32n657_af.csv
index d7af193992e5c..c02c658bd7330 100644
--- a/ports/stm32/boards/stm32n657_af.csv
+++ b/ports/stm32/boards/stm32n657_af.csv
@@ -39,19 +39,25 @@ PortE,PE12,             ,                   ,                              ,
 PortE,PE13,             ,                   ,                              ,                                    ,I2C4_SCL                                           ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE14,             ,                   ,                              ,                                    ,I2C4_SDA                                           ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortE,PE15,             ,                   ,                              ,                                    ,                                                   ,SPI5_SCK                                              ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortF,PF0 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,ETH1_RGMII_GTX_CLK                                          ,                                                ,                       ,        ,
+PortF,PF2 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RGMII_CLK125                                      ,                                                            ,                                                ,                       ,        ,
 PortF,PF3 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,ADC1_INP16
 PortF,PF4 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_MDIO                                              ,                                                            ,                                                ,                       ,        ,
 PortF,PF6 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_RX                                                    ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
-PortF,PF7 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_REF_CLK                                      ,                                                            ,                                                ,                       ,        ,
-PortF,PF10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_CRS_DV                                       ,                                                            ,                                                ,                       ,        ,
-PortF,PF11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TX_EN                                        ,                                                            ,                                                ,                       ,        ,
-PortF,PF12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TXD0                                         ,                                                            ,                                                ,                       ,        ,
-PortF,PF13,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TXD1                                         ,                                                            ,                                                ,                       ,        ,
-PortF,PF14,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_RXD0                                         ,                                                            ,                                                ,                       ,        ,
-PortF,PF15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_RXD1                                         ,                                                            ,                                                ,                       ,        ,
+PortF,PF7 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_REF_CLK/ETH1_RGMII_RX_CLK                    ,                                                            ,                                                ,                       ,        ,
+PortF,PF8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RGMII_RXD2                                        ,                                                            ,                                                ,                       ,        ,
+PortF,PF9 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RGMII_RXD3                                        ,                                                            ,                                                ,                       ,        ,
+PortF,PF10,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_CRS_DV/ETH1_RGMII_RX_CTL                     ,                                                            ,                                                ,                       ,        ,
+PortF,PF11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TX_EN/ETH1_RGMII_TX_CTL                      ,                                                            ,                                                ,                       ,        ,
+PortF,PF12,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TXD0/ETH1_RGMII_TXD0                         ,                                                            ,                                                ,                       ,        ,
+PortF,PF13,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_TXD1/ETH1_RGMII_TXD1                         ,                                                            ,                                                ,                       ,        ,
+PortF,PF14,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_RXD0/ETH1_RGMII_RXD0                         ,                                                            ,                                                ,                       ,        ,
+PortF,PF15,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RMII_RXD1/ETH1_RGMII_RXD1                         ,                                                            ,                                                ,                       ,        ,
 PortG,PG0 ,             ,                   ,TIM12_CH1                     ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG1 ,             ,                   ,                              ,                                    ,                                                   ,SPI5_MISO                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG2 ,             ,                   ,                              ,                                    ,                                                   ,SPI5_MOSI                                             ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
+PortG,PG3 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RGMII_TXD2                                        ,                                                            ,                                                ,                       ,        ,
+PortG,PG4 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_RGMII_TXD3                                        ,                                                            ,                                                ,                       ,        ,
 PortG,PG5 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,USART2_CTS                                                   ,                                  ,                                                                     ,                                             ,                                                       ,                                                            ,                                                ,                       ,        ,
 PortG,PG8 ,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,SDMMC2_D1                                              ,                                                            ,                                                ,                       ,        ,
 PortG,PG11,             ,                   ,                              ,                                    ,                                                   ,                                                      ,                                                        ,                                                             ,                                  ,                                                                     ,                                             ,ETH1_MDC                                               ,                                                            ,                                                ,                       ,        ,
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index d1ded64877f98..c4a3460e654c6 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -225,9 +225,12 @@ int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
         return -1;
     }
 
-    // Configure GPIO
+    // Configure GPIO for management data.
     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));
+
+    #if defined(MICROPY_HW_ETH_RMII_REF_CLK)
+    // Configure GPIO for RMII interface.
     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));
@@ -235,6 +238,22 @@ int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TX_EN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RMII_TX_EN));
     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));
+    #else
+    // Configure GPIO for RGMII interface.
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_CLK125, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_CLK125));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_GTX_CLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_GTX_CLK));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_TXD0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_TXD0));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_TXD1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_TXD1));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_TXD2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_TXD2));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_TXD3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_TXD3));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_TX_CTL, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_TX_CTL));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_RX_CLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_RX_CLK));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_RXD0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_RXD0));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_RXD1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_RXD1));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_RXD2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_RXD2));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_RXD3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_RXD3));
+    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RGMII_RX_CTL, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH(RGMII_RX_CTL));
+    #endif
 
     // Enable peripheral clock
     #if defined(STM32H5)
@@ -290,14 +309,18 @@ static int eth_mac_init(eth_t *self) {
     LL_RCC_SetETHPTPClockSource(LL_RCC_ETH1PTP_CLKSOURCE_HCLK); // max 200MHz
     #endif
 
-    // Select RMII interface
+    // Select RMII or RGMII interface
     #if defined(STM32H5)
     __HAL_RCC_SBS_CLK_ENABLE();
     SBS->PMCR = (SBS->PMCR & ~SBS_PMCR_ETH_SEL_PHY_Msk) | SBS_PMCR_ETH_SEL_PHY_2;
     #elif defined(STM32H7)
     SYSCFG->PMCR = (SYSCFG->PMCR & ~SYSCFG_PMCR_EPIS_SEL_Msk) | SYSCFG_PMCR_EPIS_SEL_2;
     #elif defined(STM32N6)
+    #if defined(MICROPY_HW_ETH_RGMII_CLK125)
+    LL_RCC_SetETHPHYInterface(LL_RCC_ETH1PHY_IF_RGMII);
+    #else
     LL_RCC_SetETHPHYInterface(LL_RCC_ETH1PHY_IF_RMII);
+    #endif
     #else
     __HAL_RCC_SYSCFG_CLK_ENABLE();
     SYSCFG->PMC |= SYSCFG_PMC_MII_RMII_SEL;
@@ -602,11 +625,14 @@ static int eth_mac_init(eth_t *self) {
 
     #if defined(STM32N6)
 
+    if (!(phy_scsr & PHY_SPEED_1000HALF)) {
+        maccr |= ETH_MACCR_PS;
+    }
+
     maccr |=
         ETH_MACCR_IPG_96BIT
         | ETH_MACCR_SARC_REPADDR0
         | ETH_MACCR_IPC
-        | ETH_MACCR_PS
         | ETH_MACCR_BL_10
         | ETH_MACCR_PRELEN_7;
 

From 3202d57cfd9575182345e14d7d364d5e0e1a4967 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 Nov 2025 01:04:30 +1100
Subject: [PATCH 3077/3129] stm32/eth: Make TX and RX buffer sizes a multiple
 of 8.

Needed by N6, and doesn't hurt for other MCUs.

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

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index c4a3460e654c6..0af7d2ae01de9 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -107,8 +107,9 @@
 
 #define PHY_INIT_TIMEOUT_MS (10000)
 
-#define RX_BUF_SIZE (1524) // includes 4-byte CRC at end
-#define TX_BUF_SIZE (1524)
+// These buffer sizes need to be a multiple of 8 (for STM32N6 at least).
+#define RX_BUF_SIZE (1528) // includes 4-byte CRC at end
+#define TX_BUF_SIZE (1528)
 
 #define RX_BUF_NUM (5)
 #define TX_BUF_NUM (5)
@@ -130,11 +131,17 @@ typedef struct _eth_dma_tx_descr_t {
 typedef struct _eth_dma_t {
     eth_dma_rx_descr_t rx_descr[RX_BUF_NUM];
     eth_dma_tx_descr_t tx_descr[TX_BUF_NUM];
-    uint8_t rx_buf[RX_BUF_NUM * RX_BUF_SIZE] __attribute__((aligned(4)));
-    uint8_t tx_buf[TX_BUF_NUM * TX_BUF_SIZE] __attribute__((aligned(4)));
+    uint8_t rx_buf[RX_BUF_NUM * RX_BUF_SIZE] __attribute__((aligned(8)));
+    uint8_t tx_buf[TX_BUF_NUM * TX_BUF_SIZE] __attribute__((aligned(8)));
     size_t rx_descr_idx;
     size_t tx_descr_idx;
-    uint8_t padding[16384 - 15408];
+    // Make sure the size of this struct is 16k, for the MPU.
+    uint8_t padding[16 * 1024
+                    - sizeof(eth_dma_rx_descr_t) * RX_BUF_NUM
+                    - sizeof(eth_dma_tx_descr_t) * TX_BUF_NUM
+                    - RX_BUF_NUM * RX_BUF_SIZE
+                    - TX_BUF_NUM * TX_BUF_SIZE
+                    - sizeof(size_t) * 2];
 } eth_dma_t;
 
 typedef struct _eth_t {
@@ -210,6 +217,8 @@ uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg) {
 }
 
 int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
+    MP_STATIC_ASSERT(sizeof(eth_dma_t) == 16 * 1024);
+
     mp_hal_get_mac(mac_idx, &self->netif.hwaddr[0]);
     self->netif.hwaddr_len = 6;
     self->phy_addr = phy_addr;

From ba5711a011c84f5fab2c04a07424d9788aa36710 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Nov 2025 12:12:57 +1100
Subject: [PATCH 3078/3129] stm32/eth: Move DMA TX/RX index variables to normal
 RAM.

RAM shared with DMA needs caching disabled, which is slower for the MCU to
access.  So move these index variables (which are not shared with DMA) to
normal RAM.

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

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 0af7d2ae01de9..cece15d4572b5 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -133,15 +133,12 @@ typedef struct _eth_dma_t {
     eth_dma_tx_descr_t tx_descr[TX_BUF_NUM];
     uint8_t rx_buf[RX_BUF_NUM * RX_BUF_SIZE] __attribute__((aligned(8)));
     uint8_t tx_buf[TX_BUF_NUM * TX_BUF_SIZE] __attribute__((aligned(8)));
-    size_t rx_descr_idx;
-    size_t tx_descr_idx;
     // Make sure the size of this struct is 16k, for the MPU.
     uint8_t padding[16 * 1024
                     - sizeof(eth_dma_rx_descr_t) * RX_BUF_NUM
                     - sizeof(eth_dma_tx_descr_t) * TX_BUF_NUM
                     - RX_BUF_NUM * RX_BUF_SIZE
-                    - TX_BUF_NUM * TX_BUF_SIZE
-                    - sizeof(size_t) * 2];
+                    - TX_BUF_NUM * TX_BUF_SIZE];
 } eth_dma_t;
 
 typedef struct _eth_t {
@@ -153,8 +150,14 @@ typedef struct _eth_t {
     int16_t (*phy_get_link_status)(uint32_t phy_addr);
 } eth_t;
 
+// This struct contains RX and TX buffers shared with the DMA, and they may need
+// to go in a special RAM section, or have MPU settings applied.
 static eth_dma_t eth_dma MICROPY_HW_ETH_DMA_ATTRIBUTE;
 
+// These variables index the buffers in eth_dma and are not shared with DMA.
+static size_t eth_dma_rx_descr_idx;
+static size_t eth_dma_tx_descr_idx;
+
 eth_t eth_instance;
 
 static void eth_mac_deinit(eth_t *self);
@@ -554,7 +557,7 @@ static int eth_mac_init(eth_t *self) {
     #else
     ETH->DMARDLAR = (uint32_t)&eth_dma.rx_descr[0];
     #endif
-    eth_dma.rx_descr_idx = 0;
+    eth_dma_rx_descr_idx = 0;
 
     // Configure TX descriptor lists
     for (size_t i = 0; i < TX_BUF_NUM; ++i) {
@@ -585,7 +588,7 @@ static int eth_mac_init(eth_t *self) {
     #else
     ETH->DMATDLAR = (uint32_t)&eth_dma.tx_descr[0];
     #endif
-    eth_dma.tx_descr_idx = 0;
+    eth_dma_tx_descr_idx = 0;
 
     // Configure DMA
     #if defined(STM32H5) || defined(STM32H7)
@@ -730,7 +733,7 @@ static int eth_tx_buf_get(size_t len, uint8_t **buf) {
     }
 
     // Wait for DMA to release the current TX descriptor (if it has it)
-    eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[eth_dma.tx_descr_idx];
+    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(STM32H5) || defined(STM32H7) || defined(STM32N6)
@@ -749,15 +752,15 @@ static int eth_tx_buf_get(size_t len, uint8_t **buf) {
 
     #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
     // Update TX descriptor with length and buffer pointer
-    *buf = &eth_dma.tx_buf[eth_dma.tx_descr_idx * TX_BUF_SIZE];
+    *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];
+    *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];
+    tx_descr->tdes3 = (uint32_t)&eth_dma.tx_descr[(eth_dma_tx_descr_idx + 1) % TX_BUF_NUM];
     #endif
 
     return 0;
@@ -765,8 +768,8 @@ static int eth_tx_buf_get(size_t len, uint8_t **buf) {
 
 static int eth_tx_buf_send(void) {
     // Get TX descriptor and move to next one
-    eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[eth_dma.tx_descr_idx];
-    eth_dma.tx_descr_idx = (eth_dma.tx_descr_idx + 1) % TX_BUF_NUM;
+    eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[eth_dma_tx_descr_idx];
+    eth_dma_tx_descr_idx = (eth_dma_tx_descr_idx + 1) % TX_BUF_NUM;
 
     // Schedule to send next outgoing frame
     #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
@@ -792,12 +795,12 @@ static int eth_tx_buf_send(void) {
     if (ETH->DMACSR & ETH_DMACSR_TBU) {
         ETH->DMACSR = ETH_DMACSR_TBU;
     }
-    ETH->DMACTDTPR = (uint32_t)&eth_dma.tx_descr[eth_dma.tx_descr_idx];
+    ETH->DMACTDTPR = (uint32_t)&eth_dma.tx_descr[eth_dma_tx_descr_idx];
     #elif defined(STM32N6)
     if (ETH->DMA_CH[TX_DMA_CH].DMACSR & ETH_DMACxSR_TBU) {
         ETH->DMA_CH[TX_DMA_CH].DMACSR = ETH_DMACxSR_TBU;
     }
-    ETH->DMA_CH[TX_DMA_CH].DMACTXDTPR = (uint32_t)&eth_dma.tx_descr[eth_dma.tx_descr_idx];
+    ETH->DMA_CH[TX_DMA_CH].DMACTXDTPR = (uint32_t)&eth_dma.tx_descr[eth_dma_tx_descr_idx];
     #else
     if (ETH->DMASR & ETH_DMASR_TBUS) {
         ETH->DMASR = ETH_DMASR_TBUS;
@@ -810,9 +813,9 @@ static int eth_tx_buf_send(void) {
 
 static void eth_dma_rx_free(void) {
     // Get RX descriptor, RX buffer and move to next one
-    eth_dma_rx_descr_t *rx_descr = &eth_dma.rx_descr[eth_dma.rx_descr_idx];
-    uint8_t *buf = &eth_dma.rx_buf[eth_dma.rx_descr_idx * RX_BUF_SIZE];
-    eth_dma.rx_descr_idx = (eth_dma.rx_descr_idx + 1) % RX_BUF_NUM;
+    eth_dma_rx_descr_t *rx_descr = &eth_dma.rx_descr[eth_dma_rx_descr_idx];
+    uint8_t *buf = &eth_dma.rx_buf[eth_dma_rx_descr_idx * RX_BUF_SIZE];
+    eth_dma_rx_descr_idx = (eth_dma_rx_descr_idx + 1) % RX_BUF_NUM;
 
     // Schedule to get next incoming frame
     #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
@@ -826,16 +829,16 @@ static void eth_dma_rx_free(void) {
             | RX_BUF_SIZE << RX_DESCR_1_RBS1_Pos // maximum buffer length
     ;
     rx_descr->rdes2 = (uint32_t)buf;
-    rx_descr->rdes3 = (uint32_t)&eth_dma.rx_descr[eth_dma.rx_descr_idx];
+    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(STM32H5) || defined(STM32H7)
-    ETH->DMACRDTPR = (uint32_t)&rx_descr[eth_dma.rx_descr_idx];
+    ETH->DMACRDTPR = (uint32_t)&rx_descr[eth_dma_rx_descr_idx];
     #elif defined(STM32N6)
-    ETH->DMA_CH[RX_DMA_CH].DMACRXDTPR = (uint32_t)&rx_descr[eth_dma.rx_descr_idx];
+    ETH->DMA_CH[RX_DMA_CH].DMACRXDTPR = (uint32_t)&rx_descr[eth_dma_rx_descr_idx];
     #else
     ETH->DMARPDR = 0;
     #endif
@@ -867,13 +870,13 @@ void ETH_IRQHandler(void) {
         #endif
         for (;;) {
             #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
-            eth_dma_rx_descr_t *rx_descr_l = &eth_dma.rx_descr[eth_dma.rx_descr_idx];
+            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];
+            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;
@@ -888,7 +891,7 @@ void ETH_IRQHandler(void) {
             #endif
             len -= 4; // discard CRC at end
             #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
-            uint8_t *buf = &eth_dma.rx_buf[eth_dma.rx_descr_idx * RX_BUF_SIZE];
+            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

From f5a65b39944c85955ecfeca086cce8d27c2c8551 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Nov 2025 17:37:09 +1100
Subject: [PATCH 3079/3129] stm32/eth: Don't pad eth_dma_t struct on H5 and N6
 MCUs.

It's not necessary (and wastes RAM), the MPU can handle regions of
arbitrary size.

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

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index cece15d4572b5..81faca5cb4782 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -133,12 +133,14 @@ typedef struct _eth_dma_t {
     eth_dma_tx_descr_t tx_descr[TX_BUF_NUM];
     uint8_t rx_buf[RX_BUF_NUM * RX_BUF_SIZE] __attribute__((aligned(8)));
     uint8_t tx_buf[TX_BUF_NUM * TX_BUF_SIZE] __attribute__((aligned(8)));
+    #if !defined(STM32H5) && !defined(STM32N6)
     // Make sure the size of this struct is 16k, for the MPU.
     uint8_t padding[16 * 1024
                     - sizeof(eth_dma_rx_descr_t) * RX_BUF_NUM
                     - sizeof(eth_dma_tx_descr_t) * TX_BUF_NUM
                     - RX_BUF_NUM * RX_BUF_SIZE
                     - TX_BUF_NUM * TX_BUF_SIZE];
+    #endif
 } eth_dma_t;
 
 typedef struct _eth_t {
@@ -220,8 +222,6 @@ uint32_t eth_phy_read(uint32_t phy_addr, uint32_t reg) {
 }
 
 int eth_init(eth_t *self, int mac_idx, uint32_t phy_addr, int phy_type) {
-    MP_STATIC_ASSERT(sizeof(eth_dma_t) == 16 * 1024);
-
     mp_hal_get_mac(mac_idx, &self->netif.hwaddr[0]);
     self->netif.hwaddr_len = 6;
     self->phy_addr = phy_addr;
@@ -295,8 +295,9 @@ static int eth_mac_init(eth_t *self) {
     // Configure MPU
     uint32_t irq_state = mpu_config_start();
     #if defined(STM32H5) || defined(STM32N6)
-    mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(16 * 1024));
+    mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(sizeof(eth_dma_t)));
     #else
+    MP_STATIC_ASSERT(sizeof(eth_dma_t) == 16 * 1024);
     mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(MPU_REGION_SIZE_16KB));
     #endif
     mpu_config_end(irq_state);

From 9f87b7914294ede82c4e0f35621624a26bf9923c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Nov 2025 17:37:09 +1100
Subject: [PATCH 3080/3129] stm32/eth: Implement zero-copy of lwIP pbufs for TX
 path.

This option (currently only enabled for N6) allows the TX path to hold on
to a pbuf reference while the DMA accesses the pbuf's memory directly,
instead of copying the entire pbuf data into the internal buffers.

This is necessary to achieve gigabit speeds on the N6, although actually
achieving that speed requires higher up parts of the stack to be efficient
as well.

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

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 81faca5cb4782..60f2a23deca07 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -63,6 +63,7 @@
 #define TX_DESCR_3_FD_Pos       (29)
 #define TX_DESCR_3_LD_Pos       (28)
 #define TX_DESCR_3_CIC_Pos      (16)
+#define TX_DESCR_2_IOC_Pos      (31)
 #define TX_DESCR_2_B1L_Pos      (0)
 #define TX_DESCR_2_B1L_Msk      (0x3fff << TX_DESCR_2_B1L_Pos)
 #elif defined(STM32H7)
@@ -111,8 +112,17 @@
 #define RX_BUF_SIZE (1528) // includes 4-byte CRC at end
 #define TX_BUF_SIZE (1528)
 
+#if defined(MICROPY_HW_ETH_RMII_REF_CLK)
+// RMII in use.
 #define RX_BUF_NUM (5)
 #define TX_BUF_NUM (5)
+#define USE_PBUF_REF_FOR_TX (0)
+#else
+// RGMII in use, so increase number of buffers and use pbuf zero copy if possible.
+#define RX_BUF_NUM (16)
+#define TX_BUF_NUM (16)
+#define USE_PBUF_REF_FOR_TX (1)
+#endif
 
 #if defined(STM32N6)
 // The N6 has two DMA channels, so use one for RX and one for TX.
@@ -132,7 +142,9 @@ typedef struct _eth_dma_t {
     eth_dma_rx_descr_t rx_descr[RX_BUF_NUM];
     eth_dma_tx_descr_t tx_descr[TX_BUF_NUM];
     uint8_t rx_buf[RX_BUF_NUM * RX_BUF_SIZE] __attribute__((aligned(8)));
+    #if !USE_PBUF_REF_FOR_TX
     uint8_t tx_buf[TX_BUF_NUM * TX_BUF_SIZE] __attribute__((aligned(8)));
+    #endif
     #if !defined(STM32H5) && !defined(STM32N6)
     // Make sure the size of this struct is 16k, for the MPU.
     uint8_t padding[16 * 1024
@@ -156,6 +168,11 @@ typedef struct _eth_t {
 // to go in a special RAM section, or have MPU settings applied.
 static eth_dma_t eth_dma MICROPY_HW_ETH_DMA_ATTRIBUTE;
 
+#if USE_PBUF_REF_FOR_TX
+// This array holds lwIP pbufs that are currently in use by the DMA.
+static struct pbuf *eth_dma_pbuf[TX_BUF_NUM];
+#endif
+
 // These variables index the buffers in eth_dma and are not shared with DMA.
 static size_t eth_dma_rx_descr_idx;
 static size_t eth_dma_tx_descr_idx;
@@ -521,6 +538,16 @@ static int eth_mac_init(eth_t *self) {
         ETH_DMACxIER_NIE // enable normal interrupts
         | ETH_DMACxIER_RIE // enable RX interrupt
     ;
+    #if USE_PBUF_REF_FOR_TX
+    #if RX_DMA_CH == TX_DMA_CH
+    ETH->DMA_CH[TX_DMA_CH].DMACIER |= ETH_DMACxIER_TIE; // enable TX interrupt
+    #else
+    ETH->DMA_CH[TX_DMA_CH].DMACIER =
+        ETH_DMACxIER_NIE // enable normal interrupts
+        | ETH_DMACxIER_TIE // enable TX interrupt
+    ;
+    #endif
+    #endif
     #else
     ETH->DMAIER =
         ETH_DMAIER_NISE // enable normal interrupts
@@ -565,7 +592,7 @@ static int eth_mac_init(eth_t *self) {
         #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
         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].tdes2 = 0;
         eth_dma.tx_descr[i].tdes3 = 0;
         #else
         eth_dma.tx_descr[i].tdes0 = 1 << TX_DESCR_0_TCH_Pos;
@@ -590,6 +617,11 @@ static int eth_mac_init(eth_t *self) {
     ETH->DMATDLAR = (uint32_t)&eth_dma.tx_descr[0];
     #endif
     eth_dma_tx_descr_idx = 0;
+    #if USE_PBUF_REF_FOR_TX
+    for (int i = 0; i < TX_BUF_NUM; ++i) {
+        eth_dma_pbuf[i] = NULL;
+    }
+    #endif
 
     // Configure DMA
     #if defined(STM32H5) || defined(STM32H7)
@@ -728,7 +760,9 @@ static void eth_mac_deinit(eth_t *self) {
     #endif
 }
 
-static int eth_tx_buf_get(size_t len, uint8_t **buf) {
+#if !USE_PBUF_REF_FOR_TX
+
+int eth_tx_buf_get(size_t len, uint8_t **buf) {
     if (len > TX_BUF_SIZE) {
         return -MP_EINVAL;
     }
@@ -767,28 +801,51 @@ static int eth_tx_buf_get(size_t len, uint8_t **buf) {
     return 0;
 }
 
-static int eth_tx_buf_send(void) {
-    // Get TX descriptor and move to next one
-    eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[eth_dma_tx_descr_idx];
-    eth_dma_tx_descr_idx = (eth_dma_tx_descr_idx + 1) % TX_BUF_NUM;
+#else
 
-    // Schedule to send next outgoing frame
-    #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
-    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
-            | 1 << TX_DESCR_0_FS_Pos // first segment
-            | 3 << TX_DESCR_0_CIC_Pos // enable all checksums inserted by hardware
-            | 1 << TX_DESCR_0_TCH_Pos // TX descriptor is chained
-    ;
-    #endif
+int eth_tx_buf_get_ref(size_t len, uint8_t *buf, unsigned int idx) {
+    // Wait for DMA to release the current TX descriptor (if it has it).
+    eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[(eth_dma_tx_descr_idx + idx) % TX_BUF_NUM];
+    uint32_t t0 = mp_hal_ticks_ms();
+    while (tx_descr->tdes3 & (1 << TX_DESCR_3_OWN_Pos)) {
+        if (mp_hal_ticks_ms() - t0 > 1000) {
+            return -MP_ETIMEDOUT;
+        }
+    }
+
+    MP_HAL_CLEAN_DCACHE(buf, len);
+    tx_descr->tdes2 = (len & TX_DESCR_2_B1L_Msk) | (1 << TX_DESCR_2_IOC_Pos);
+    tx_descr->tdes0 = (uint32_t)buf;
+
+    return 0;
+}
+
+#endif
+
+static int eth_tx_buf_send(unsigned int num_segments) {
+    for (unsigned int segment = 0; segment < num_segments; ++segment) {
+        // Get TX descriptor and move to next one
+        eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[eth_dma_tx_descr_idx];
+        eth_dma_tx_descr_idx = (eth_dma_tx_descr_idx + 1) % TX_BUF_NUM;
+
+        // Schedule to send next outgoing frame
+        #if defined(STM32H5) || defined(STM32H7) || defined(STM32N6)
+        tx_descr->tdes3 =
+            1 << TX_DESCR_3_OWN_Pos     // owned by DMA
+                | (segment == num_segments - 1) << TX_DESCR_3_LD_Pos // last segment
+                | (segment == 0) << 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
+                | (segment == num_segments - 1) << TX_DESCR_0_LS_Pos // last segment
+                | (segment == 0) << TX_DESCR_0_FS_Pos // first segment
+                | 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();
@@ -902,6 +959,28 @@ void ETH_IRQHandler(void) {
             eth_dma_rx_free();
         }
     }
+
+    #if USE_PBUF_REF_FOR_TX
+    #if RX_DMA_CH != TX_DMA_CH
+    sr = ETH->DMA_CH[TX_DMA_CH].DMACSR;
+    ETH->DMA_CH[TX_DMA_CH].DMACSR = ETH_DMACxSR_NIS;
+    #endif
+    uint32_t tx_interrupt = sr & ETH_DMACxSR_TI;
+    if (tx_interrupt) {
+        ETH->DMA_CH[TX_DMA_CH].DMACSR = ETH_DMACxSR_TI;
+        for (int i = 0; i < TX_BUF_NUM; ++i) {
+            eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[i];
+            if (!(tx_descr->tdes3 & (1 << TX_DESCR_3_OWN_Pos))) {
+                // DMA does not own it
+                if (eth_dma_pbuf[i] != NULL) {
+                    // release pbuf
+                    pbuf_free(eth_dma_pbuf[i]);
+                    eth_dma_pbuf[i] = NULL;
+                }
+            }
+        }
+    }
+    #endif
 }
 
 /*******************************************************************************/
@@ -938,13 +1017,64 @@ static err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
     LINK_STATS_INC(link.xmit);
     eth_trace(netif->state, (size_t)-1, p, NETUTILS_TRACE_IS_TX | NETUTILS_TRACE_NEWLINE);
 
+    #if USE_PBUF_REF_FOR_TX
+
+    // Work out how many segments the pbuf has, and if it needs a copy made.
+    bool made_pbuf_copy = false;
+    unsigned int num_segments = 0;
+    for (struct pbuf *pb = p; pb != NULL; pb = pb->next) {
+        if (PBUF_NEEDS_COPY(pb)) {
+            // Note: this path is called for large UDP packets that are fragmented,
+            // because the fragments use PBUF_REF to divide up the original data.
+            p = pbuf_clone(PBUF_RAW, PBUF_RAM, p);
+            made_pbuf_copy = true;
+            num_segments = 1;
+            break;
+        }
+        ++num_segments;
+    }
+
+    // Allocate TX buffer slots.
+    unsigned int idx = 0;
+    for (struct pbuf *pb = p; pb != NULL; pb = pb->next) {
+        int ret = eth_tx_buf_get_ref(pb->len, pb->payload, idx++);
+        if (ret != 0) {
+            if (made_pbuf_copy) {
+                pbuf_free(p);
+            }
+            return ERR_BUF;
+        }
+    }
+
+    // Take references to pbufs
+    idx = 0;
+    for (struct pbuf *pb = p; pb != NULL; pb = pb->next) {
+        unsigned int tx_idx = (eth_dma_tx_descr_idx + idx) % TX_BUF_NUM;
+        if (eth_dma_pbuf[tx_idx] != NULL) {
+            pbuf_free(eth_dma_pbuf[tx_idx]);
+        }
+        if (!made_pbuf_copy) {
+            pbuf_ref(pb);
+        }
+        eth_dma_pbuf[tx_idx] = pb;
+        ++idx;
+    }
+
+    // Start the transmission.
+    int ret = eth_tx_buf_send(num_segments);
+
+    #else
+
+    // Allocate TX slot, copy the pbuf, and start the transmission.
     uint8_t *buf;
     int ret = eth_tx_buf_get(p->tot_len, &buf);
     if (ret == 0) {
         pbuf_copy_partial(p, buf, p->tot_len, 0);
-        ret = eth_tx_buf_send();
+        ret = eth_tx_buf_send(1);
     }
 
+    #endif
+
     return ret ? ERR_BUF : ERR_OK;
 }
 

From 5bd684081e5bfa1c449cb14d224e1f9f07097e2d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Oct 2025 14:47:59 +1100
Subject: [PATCH 3081/3129] stm32/network_lan: Allow a board to configure the
 default LAN PHY.

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

diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 0ef33e29777f9..ea03329add4c3 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -33,6 +33,11 @@
 
 #include "lwip/netif.h"
 
+// A board can customize the default PHY by defining this setting.
+#ifndef NETWORK_LAN_PHY
+#define NETWORK_LAN_PHY ETH_PHY_LAN8742
+#endif
+
 typedef struct _network_lan_obj_t {
     mp_obj_base_t base;
     eth_t *eth;
@@ -57,7 +62,7 @@ static mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
     enum { ARG_phy_addr, ARG_phy_type};
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_phy_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ETH_PHY_LAN8742} },
+        { MP_QSTR_phy_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = NETWORK_LAN_PHY} },
     };
     // Parse args.
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];

From 53189f9b92cfc7aa421af6a66ae3fc61f42b3219 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Oct 2025 00:17:30 +1100
Subject: [PATCH 3082/3129] stm32/boards/OPENMV_N6: Enable RGMII Ethernet.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/OPENMV_N6/mpconfigboard.h | 18 ++++++++++++++++++
 ports/stm32/boards/OPENMV_N6/pins.csv        | 13 +++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
index 6e6bb43572f58..0d63ff224783e 100644
--- a/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
+++ b/ports/stm32/boards/OPENMV_N6/mpconfigboard.h
@@ -126,6 +126,24 @@
 #define MICROPY_HW_USB_PID_CDC_HID  (MICROPY_HW_USB_PID)
 #define MICROPY_HW_USB_PID_CDC_MSC_HID  (MICROPY_HW_USB_PID)
 
+// Ethernet via RGMII
+#define NETWORK_LAN_PHY                         (ETH_PHY_RTL8211)
+#define MICROPY_HW_ETH_MDC                      (pin_D1)
+#define MICROPY_HW_ETH_MDIO                     (pin_D12)
+#define MICROPY_HW_ETH_RGMII_CLK125             (pin_F2)
+#define MICROPY_HW_ETH_RGMII_GTX_CLK            (pin_F0)
+#define MICROPY_HW_ETH_RGMII_TXD0               (pin_F12)
+#define MICROPY_HW_ETH_RGMII_TXD1               (pin_F13)
+#define MICROPY_HW_ETH_RGMII_TXD2               (pin_G3)
+#define MICROPY_HW_ETH_RGMII_TXD3               (pin_G4)
+#define MICROPY_HW_ETH_RGMII_TX_CTL             (pin_F11)
+#define MICROPY_HW_ETH_RGMII_RX_CLK             (pin_F7)
+#define MICROPY_HW_ETH_RGMII_RXD0               (pin_F14)
+#define MICROPY_HW_ETH_RGMII_RXD1               (pin_F15)
+#define MICROPY_HW_ETH_RGMII_RXD2               (pin_F8)
+#define MICROPY_HW_ETH_RGMII_RXD3               (pin_F9)
+#define MICROPY_HW_ETH_RGMII_RX_CTL             (pin_F10)
+
 // Murata 1YN configuration
 #define CYW43_CHIPSET_FIRMWARE_INCLUDE_FILE     "lib/cyw43-driver/firmware/w43439_sdio_1yn_7_95_59_combined.h"
 #define CYW43_WIFI_NVRAM_INCLUDE_FILE           "lib/cyw43-driver/firmware/wifi_nvram_1yn.h"
diff --git a/ports/stm32/boards/OPENMV_N6/pins.csv b/ports/stm32/boards/OPENMV_N6/pins.csv
index 52f6c92496d7e..2ca075a154a78 100644
--- a/ports/stm32/boards/OPENMV_N6/pins.csv
+++ b/ports/stm32/boards/OPENMV_N6/pins.csv
@@ -95,7 +95,20 @@ P16,PE12
 I2C4_SCL,PE13
 I2C4_SDA,PE14
 ,PE15
+,PF0
+,PF2
+,PF7
+,PF8
+,PF9
+,PF10
+,PF11
+,PF12
+,PF13
+,PF14
+,PF15
 P6,PG0
+,PG3
+,PG4
 P9,PG12
 P7,PG13
 BAT_ADC,PG15

From e74367684e3642441edccca1b41b061c06587cf0 Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Sun, 6 Apr 2025 18:31:48 +0200
Subject: [PATCH 3083/3129] zephyr: Introduce Zephyr native filesystem VFS
 interface.

This allows using Zephyr's supported VFS and interface it to MicroPython's
VFS.  That makes the MicroPython-side filesystem drivers unecessary, eg you
can disable LFS2 in MicroPython but still do LFS2 because it's using
Zephyr's.

An advantage of this is that the filesystem can be shared between Zephyr C
code and MicroPython.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/CMakeLists.txt      |   1 +
 ports/zephyr/README.md           |  44 ++
 ports/zephyr/modzephyr.c         |   3 +
 ports/zephyr/modzephyr.h         |   4 +
 ports/zephyr/mpconfigport.h      |   5 +-
 ports/zephyr/zephyr_filesystem.c | 782 +++++++++++++++++++++++++++++++
 6 files changed, 837 insertions(+), 2 deletions(-)
 create mode 100644 ports/zephyr/zephyr_filesystem.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index e7a55d804ae68..27229d21b9f7b 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -55,6 +55,7 @@ set(MICROPY_SOURCE_PORT
     uart_core.c
     zephyr_device.c
     zephyr_storage.c
+    zephyr_filesystem.c
     mpthreadport.c
 )
 list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index eedcdcb58b336..f3fcd8f70d3a5 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -208,3 +208,47 @@ run the following after you built an image with the previous command:
 
     $ west build -t run
 
+File Systems
+------------
+
+The Zephyr Micropython port provides 2 options for handling filesystems on the device:
+The first is the Micropython filesystem management, which uses Micropython's filesystem code and
+relies on zephyr's FlashArea API, this is enabled by default when 
+`CONFIG_FLASH` and `CONFIG_FLASH_MAP` are turned on.
+The second option is using Zephyr's Filesystem management:
+This relies on Zephyr's File System features and enables sharing access between zephyr and
+micropython code. Several configuration options must be enabled:
+
+    CONFIG_FLASH_MAP=y # Requirement for the file system subsystem
+    CONFIG_FILE_SYSTEM=y # Enables the file system subsystem
+    CONFIG_FILE_SYSTEM_LITTLEFS=y # Enables the littlefs support in zephyr
+    CONFIG_FILE_SYSTEM_MKFS=y # Enables the ability to create new file systems
+
+Then, a fstab must be added to the dts overlay, for example:
+
+    
+	fstab {
+		compatible = "zephyr,fstab";
+		lfs2: lfs2 {
+			compatible = "zephyr,fstab,littlefs";
+			mount-point = "/flash";
+			partition = <&storage_partition>;
+			read-size=<16>;
+			prog-size=<4096>;
+			cache-size=<4096>;
+			lookahead-size=<32>;
+			block-cycles=<4>;
+		};
+	};
+	
+It is then possible to use the FS like a normal Micropython filesystem:
+
+    import vfs, zephyr
+    zfs = zephyr.FileSystem(zephyr.FileSystem.fstab()[0])
+    vfs.mount(zfs, "/zephyr")
+
+You may disable Micropython's File system code to save space:
+    
+    CONFIG_MICROPY_VFS_FAT=n
+    CONFIG_MICROPY_VFS_LFS1=n
+    CONFIG_MICROPY_VFS_LFS2=n
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 08fdf5c5aa44d..7726737e16b1e 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -86,6 +86,9 @@ static const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     #ifdef CONFIG_FLASH_MAP
     { MP_ROM_QSTR(MP_QSTR_FlashArea), MP_ROM_PTR(&zephyr_flash_area_type) },
     #endif
+    #ifdef CONFIG_FILE_SYSTEM
+    { MP_ROM_QSTR(MP_QSTR_FileSystem), MP_ROM_PTR(&zephyr_filesystem_type) },
+    #endif
 };
 
 static MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
diff --git a/ports/zephyr/modzephyr.h b/ports/zephyr/modzephyr.h
index f9b7e8eea1607..834ec4a31c651 100644
--- a/ports/zephyr/modzephyr.h
+++ b/ports/zephyr/modzephyr.h
@@ -37,4 +37,8 @@ extern const mp_obj_type_t zephyr_disk_access_type;
 extern const mp_obj_type_t zephyr_flash_area_type;
 #endif
 
+#ifdef CONFIG_FILE_SYSTEM
+extern const mp_obj_type_t zephyr_filesystem_type;
+#endif
+
 #endif // MICROPY_INCLUDED_ZEPHYR_MODZEPHYR_H
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 8d5d60ed29a3c..7f84973488786 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -84,9 +84,10 @@
 #endif
 #define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE "ports/zephyr/machine_pwm.c"
-#ifdef CONFIG_NETWORKING
-// If we have networking, we likely want errno comfort
+#if defined(CONFIG_NETWORKING) || defined(CONFIG_FILE_SYSTEM)
 #define MICROPY_PY_ERRNO            (1)
+#endif
+#ifdef CONFIG_NETWORKING
 #define MICROPY_PY_SOCKET           (1)
 #endif
 #ifdef CONFIG_BT
diff --git a/ports/zephyr/zephyr_filesystem.c b/ports/zephyr/zephyr_filesystem.c
new file mode 100644
index 0000000000000..2ca726253555a
--- /dev/null
+++ b/ports/zephyr/zephyr_filesystem.c
@@ -0,0 +1,782 @@
+/*
+* This file is part of the MicroPython project, http://micropython.org/
+*
+* The MIT License (MIT)
+*
+* Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION 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"
+
+#if CONFIG_FILE_SYSTEM
+
+#if !MICROPY_VFS
+#error "with CONFIG_FILE_SYSTEM enabled, must also enable MICROPY_VFS"
+#endif
+
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/fs_sys.h>
+
+#include <string.h>
+#include "py/obj.h"
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+#include "extmod/vfs.h"
+#include "shared/timeutils/timeutils.h"
+
+// Declare each FSTAB entry
+#define FOREACH_FS_DEFINE(fs) FS_FSTAB_DECLARE_ENTRY(fs);
+
+#define FOREACH_FSTAB_DEFINE(n) DT_FOREACH_CHILD(n, FOREACH_FS_DEFINE)
+
+DT_FOREACH_STATUS_OKAY(zephyr_fstab, FOREACH_FSTAB_DEFINE)
+
+// Add all FSTAB entries to a table for us to use dynamically
+#define FOREACH_FS(fs) FS_FSTAB_ENTRY(fs)
+
+#define FOREACH_FSTAB(n) DT_FOREACH_CHILD(n, FOREACH_FS)
+
+static struct fs_mount_t *const zephyr_fs_mounts[] = {
+    &DT_FOREACH_STATUS_OKAY(zephyr_fstab, FOREACH_FSTAB),
+};
+
+#define zephyr_fs_mounts_size sizeof(zephyr_fs_mounts) / sizeof(struct fs_mount_t *)
+
+typedef struct _zephyr_fs_obj_t {
+    mp_obj_base_t base;
+    struct fs_mount_t *mount;
+    vstr_t cur_dir;
+    vstr_t root_dir;
+} zephyr_fs_obj_t;
+
+const char *zephyr_fs_make_path(zephyr_fs_obj_t *self, mp_obj_t path_in) {
+    const char *path = mp_obj_str_get_str(path_in);
+
+    if (path[0] != '/') {
+        size_t l = vstr_len(&self->root_dir);
+        size_t lc = vstr_len(&self->cur_dir);
+        vstr_add_str(&self->root_dir, "/");
+        vstr_add_strn(&self->root_dir, self->cur_dir.buf, lc);
+        vstr_add_str(&self->root_dir, path);
+        path = vstr_null_terminated_str(&self->root_dir);
+        self->root_dir.len = l;
+    } else {
+        size_t l = vstr_len(&self->root_dir);
+        vstr_add_str(&self->root_dir, path);
+        path = vstr_null_terminated_str(&self->root_dir);
+        self->root_dir.len = l;
+    }
+    return path;
+}
+
+typedef struct _zephyr_file_obj_t {
+    mp_obj_base_t base;
+    struct fs_file_t fp;
+} zephyr_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) {
+    zephyr_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    ssize_t err;
+
+    err = fs_read(&self->fp, buf, size);
+    if (err < 0) {
+        *errcode = -err;
+        return MP_STREAM_ERROR;
+    }
+    return err;
+}
+
+static mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+    zephyr_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    ssize_t err;
+
+    err = fs_write(&self->fp, buf, size);
+    if (err < 0) {
+        *errcode = -err;
+        return MP_STREAM_ERROR;
+    }
+    return err;
+}
+
+static mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    zephyr_file_obj_t *self = MP_OBJ_TO_PTR(o_in);
+    int err = -EINVAL;
+
+    if (request == MP_STREAM_SEEK) {
+        struct mp_stream_seek_t *s = (struct mp_stream_seek_t *)(uintptr_t)arg;
+
+        MP_STATIC_ASSERT(FS_SEEK_SET == MP_SEEK_SET);
+        MP_STATIC_ASSERT(FS_SEEK_CUR == MP_SEEK_CUR);
+        MP_STATIC_ASSERT(FS_SEEK_END == MP_SEEK_END);
+
+        err = fs_seek(&self->fp, s->offset, s->whence);
+
+        if (err < 0) {
+            *errcode = -err;
+            return MP_STREAM_ERROR;
+        }
+
+        off_t tell = fs_tell(&self->fp);
+        if (tell < 0) {
+            *errcode = -err;
+            return MP_STREAM_ERROR;
+        }
+        s->offset = tell;
+        return 0;
+
+    } else if (request == MP_STREAM_FLUSH) {
+        err = fs_sync(&self->fp);
+        if (err < 0) {
+            *errcode = -err;
+            return MP_STREAM_ERROR;
+        }
+        return 0;
+
+    } else if (request == MP_STREAM_CLOSE) {
+        err = fs_close(&self->fp);
+        if (err < 0) {
+            *errcode = -err;
+            return MP_STREAM_ERROR;
+        }
+        return 0;
+
+    } else {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+}
+
+static const mp_rom_map_elem_t zephyr_fs_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(&mp_stream___exit___obj) },
+};
+
+static MP_DEFINE_CONST_DICT(zephyr_fs_rawfile_locals_dict, zephyr_fs_rawfile_locals_dict_table);
+
+static const mp_stream_p_t zephyr_fs_fileio_stream_p = {
+    .read = file_obj_read,
+    .write = file_obj_write,
+    .ioctl = file_obj_ioctl,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_zephyr_fs_fileio,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
+    print, file_obj_print,
+    protocol, &zephyr_fs_fileio_stream_p,
+    locals_dict, &zephyr_fs_rawfile_locals_dict
+    );
+
+static const mp_stream_p_t zephyr_fs_textio_stream_p = {
+    .read = file_obj_read,
+    .write = file_obj_write,
+    .ioctl = file_obj_ioctl,
+    .is_text = true,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_zephyr_fs_textio,
+    MP_QSTR_TextIOWrapper,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
+    print, file_obj_print,
+    protocol, &zephyr_fs_textio_stream_p,
+    locals_dict, &zephyr_fs_rawfile_locals_dict
+    );
+
+// Factory function for I/O stream classes
+static mp_obj_t zephyr_fs_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const mp_obj_type_t *type = &mp_type_zephyr_fs_textio;
+    int flags = 0;
+    int err;
+    bool x_mode = false;
+    const char *mode_str = mp_obj_str_get_str(mode_in);
+    const char *path = zephyr_fs_make_path(self, path_in);
+
+    for (; *mode_str; ++mode_str) {
+        int new_flags = 0;
+        switch (*mode_str) {
+            case 'r':
+                new_flags = FS_O_READ;
+                break;
+            case 'w':
+                new_flags = FS_O_WRITE | FS_O_CREATE | FS_O_TRUNC;
+                break;
+            case 'x':
+                new_flags = FS_O_WRITE;
+                x_mode = true;
+                break;
+            case 'a':
+                new_flags = FS_O_WRITE | FS_O_CREATE | FS_O_APPEND;
+                break;
+            case '+':
+                flags |= FS_O_RDWR;
+                break;
+            case 'b':
+                type = &mp_type_zephyr_fs_fileio;
+                break;
+            case 't':
+                type = &mp_type_zephyr_fs_textio;
+                break;
+        }
+        if (new_flags) {
+            if (flags) {
+                mp_raise_ValueError(NULL);
+            }
+            flags = new_flags;
+        }
+    }
+
+    zephyr_file_obj_t *o = mp_obj_malloc_with_finaliser(zephyr_file_obj_t, type);
+
+    err = fs_open(&o->fp, path, flags);
+    if (x_mode && err < 0) {
+        err = fs_open(&o->fp, path, flags | FS_O_CREATE);
+    } else if (x_mode) {
+        fs_close(&o->fp);
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("file %s Already exists: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+    if (err < 0) {
+        m_del_obj(zephyr_file_obj_t, o);
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error opening file %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+
+    return MP_OBJ_FROM_PTR(o);
+}
+MP_DEFINE_CONST_FUN_OBJ_3(zephyr_fs_open_obj, zephyr_fs_open);
+
+typedef struct _mp_zephyr_fs_ilistdir_it_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    mp_fun_1_t finaliser;
+    bool is_str;
+    struct fs_dir_t dir;
+} mp_zephyr_fs_ilistdir_it_t;
+
+static mp_obj_t mp_zephyr_fs_ilistdir_it_iternext(mp_obj_t self_in) {
+    mp_zephyr_fs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
+    int err;
+
+    for (;;) {
+        struct fs_dirent stats;
+        err = fs_readdir(&self->dir, &stats);
+        char *fn = stats.name;
+        if (err < 0 || stats.name[0] == 0) {
+            // stop on error or end of dir
+            break;
+        }
+
+        // Note that Zephyr FS also already filters . and .., so we don't need to
+
+        // make 4-tuple with info about this entry
+        mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(4, NULL));
+        if (self->is_str) {
+            t->items[0] = mp_obj_new_str_from_cstr(fn);
+        } else {
+            t->items[0] = mp_obj_new_bytes((const byte *)fn, strlen(fn));
+        }
+        if (stats.type == FS_DIR_ENTRY_DIR) {
+            // dir
+            t->items[1] = MP_OBJ_NEW_SMALL_INT(MP_S_IFDIR);
+        } else {
+            // file
+            t->items[1] = MP_OBJ_NEW_SMALL_INT(MP_S_IFREG);
+        }
+        t->items[2] = MP_OBJ_NEW_SMALL_INT(0);         // no inode number
+        t->items[3] = mp_obj_new_int_from_uint(stats.size);
+
+        return MP_OBJ_FROM_PTR(t);
+    }
+
+    // ignore error because we may be closing a second time
+    fs_closedir(&self->dir);
+
+    return MP_OBJ_STOP_ITERATION;
+}
+
+static mp_obj_t mp_zephyr_fs_ilistdir_it_del(mp_obj_t self_in) {
+    mp_zephyr_fs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
+    // ignore result / error because we may be closing a second time.
+    fs_closedir(&self->dir);
+    return mp_const_none;
+}
+
+static mp_obj_t zephyr_fs_ilistdir_func(size_t n_args, const mp_obj_t *args) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    bool is_str_type = true;
+    const char *path;
+    int err;
+
+    if (n_args == 2) {
+        if (mp_obj_get_type(args[1]) == &mp_type_bytes) {
+            is_str_type = false;
+        }
+        path = zephyr_fs_make_path(self, args[1]);
+    } else {
+        path = "";
+    }
+
+    // Create a new iterator object to list the dir
+    mp_zephyr_fs_ilistdir_it_t *iter = mp_obj_malloc_with_finaliser(mp_zephyr_fs_ilistdir_it_t, &mp_type_polymorph_iter_with_finaliser);
+    iter->iternext = mp_zephyr_fs_ilistdir_it_iternext;
+    iter->finaliser = mp_zephyr_fs_ilistdir_it_del;
+    iter->is_str = is_str_type;
+
+    err = fs_opendir(&iter->dir, path);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("could not open directory %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+
+    return MP_OBJ_FROM_PTR(iter);
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zephyr_fs_ilistdir_obj, 1, 2, zephyr_fs_ilistdir_func);
+
+static mp_obj_t zephyr_fs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    const char *path = zephyr_fs_make_path(self, path_o);
+    int err;
+
+    err = fs_mkdir(path);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("could not mkdir %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(zephyr_fs_mkdir_obj, zephyr_fs_mkdir);
+
+
+static mp_obj_t zephyr_fs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    const char *path = mp_obj_str_get_str(path_in);
+    size_t lc = vstr_len(&self->cur_dir);
+    size_t l = vstr_len(&self->root_dir);
+    vstr_t chdir;
+    struct fs_dirent stats;
+    int err;
+
+
+    vstr_init(&chdir, 32);
+    vstr_add_strn(&chdir, self->root_dir.buf, l);
+    if (path[0] != '/') {
+        vstr_add_byte(&chdir, '/');
+        vstr_add_strn(&chdir, self->cur_dir.buf, lc);
+    }
+    vstr_add_str(&chdir, path);
+    vstr_add_byte(&chdir, '/');
+
+        #define CWD_LEN (vstr_len(&chdir))
+    size_t to = 1;
+    size_t from = 1;
+    char *cwd = vstr_str(&chdir);
+    while (from < CWD_LEN) {
+        for (; from < CWD_LEN && cwd[from] == '/'; ++from) {
+            // Scan for the start
+        }
+        if (from > to) {
+            // Found excessive slash chars, squeeze them out
+            vstr_cut_out_bytes(&chdir, to, from - to);
+            from = to;
+        }
+        for (; from < CWD_LEN && cwd[from] != '/'; ++from) {
+            // Scan for the next /
+        }
+        if ((from - to) == 1 && cwd[to] == '.') {
+            // './', ignore
+            vstr_cut_out_bytes(&chdir, to, ++from - to);
+            from = to;
+        } else if ((from - to) == 2 && cwd[to] == '.' && cwd[to + 1] == '.') {
+            // '../', skip back
+            if (to > 1) {
+                // Only skip back if not at the tip
+                for (--to; to > 1 && cwd[to - 1] != '/'; --to) {
+                    // Skip back
+                }
+            }
+            vstr_cut_out_bytes(&chdir, to, ++from - to);
+            from = to;
+        } else {
+            // Normal element, keep it and just move the offset
+            to = ++from;
+        }
+    }
+
+    err = fs_stat(vstr_null_terminated_str(&chdir), &stats);
+    vstr_cut_out_bytes(&chdir, 0, l + 1);
+    lc = vstr_len(&chdir);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("could not chdir to %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+
+    vstr_reset(&self->cur_dir);
+    vstr_add_strn(&self->cur_dir, chdir.buf, lc);
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(zephyr_fs_chdir_obj, zephyr_fs_chdir);
+
+static mp_obj_t zephyr_fs_getcwd(mp_obj_t vfs_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    char *path;
+
+    if (vstr_len(&self->cur_dir) == 0) {
+        return MP_OBJ_NEW_QSTR(MP_QSTR__slash_);
+    } else {
+        size_t l = vstr_len(&self->root_dir);
+        size_t lc = vstr_len(&self->cur_dir);
+        vstr_add_str(&self->root_dir, "/");
+        vstr_add_strn(&self->root_dir, self->cur_dir.buf, lc);
+        path = vstr_null_terminated_str(&self->root_dir);
+        self->root_dir.len = l;
+        return mp_obj_new_str_from_cstr(path + l);
+    }
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(zephyr_fs_getcwd_obj, zephyr_fs_getcwd);
+
+static mp_obj_t zephyr_fs_rmdir(mp_obj_t vfs_in, mp_obj_t path_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    const char *path = zephyr_fs_make_path(self, path_in);
+    struct fs_dirent stats;
+    int err;
+
+    err = fs_stat(path, &stats);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error getting stats of Zephyr File System at %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+    if (stats.type == FS_DIR_ENTRY_FILE) {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("not for removing files"));
+        return mp_const_none;
+    }
+    err = fs_unlink(path);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error removing directory at %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(zephyr_fs_rmdir_obj, zephyr_fs_rmdir);
+
+static mp_obj_t zephyr_fs_remove(mp_obj_t vfs_in, mp_obj_t path_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    const char *path = zephyr_fs_make_path(self, path_in);
+    struct fs_dirent stats;
+    int err;
+
+    err = fs_stat(path, &stats);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error getting stats of Zephyr File System at %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+    if (stats.type == FS_DIR_ENTRY_DIR) {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("not for removing directories"));
+        return mp_const_none;
+    }
+    err = fs_unlink(path);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error removing file at %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(zephyr_fs_remove_obj, zephyr_fs_remove);
+
+static mp_obj_t zephyr_fs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_out) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    const char *old_path = zephyr_fs_make_path(self, path_in);
+    const char *new_path = zephyr_fs_make_path(self, path_out);
+    int err;
+
+    err = fs_rename(old_path, new_path);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error renaming file from %s to %s: %q"), old_path, new_path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_fs_rename_obj, zephyr_fs_rename);
+
+static mp_import_stat_t zephyr_fs_import_stat(void *vfs_in, const char *path) {
+    zephyr_fs_obj_t *self = vfs_in;
+    struct fs_dirent stats;
+    assert(self != NULL);
+    const char *ppath = zephyr_fs_make_path(self, mp_obj_new_str_from_cstr(path));
+    int err;
+
+    err = fs_stat(ppath, &stats);
+    if (err == 0) {
+        if (stats.type == FS_DIR_ENTRY_DIR) {
+            return MP_IMPORT_STAT_DIR;
+        } else {
+            return MP_IMPORT_STAT_FILE;
+        }
+    }
+    return MP_IMPORT_STAT_NO_EXIST;
+}
+
+static mp_obj_t zephyr_fs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    int err;
+    struct fs_dirent stats;
+    const char *path = zephyr_fs_make_path(self, path_in);
+
+    err = fs_stat(path, &stats);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error getting stats of Zephyr File System at %s: %q"), path, mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+
+    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
+    mp_int_t mode = 0;
+    if (stats.type == FS_DIR_ENTRY_DIR) {
+        mode |= MP_S_IFDIR;
+    } else {
+        mode |= MP_S_IFREG;
+    }
+    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
+    t->items[3] = MP_OBJ_NEW_SMALL_INT(0);     // st_nlink
+    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(stats.size);     // st_size
+    t->items[7] = mp_obj_new_int_from_uint(0);     // st_atime
+    t->items[8] = mp_obj_new_int_from_uint(0);     // st_mtime
+    t->items[9] = mp_obj_new_int_from_uint(0);     // st_ctime
+
+    return MP_OBJ_FROM_PTR(t);
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(zephyr_fs_stat_obj, zephyr_fs_stat);
+
+static mp_obj_t zephyr_fs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(vfs_in);
+    (void)path_in;
+    int err;
+    struct fs_statvfs stats;
+    unsigned long bsize;
+
+    err = fs_statvfs(self->mount->mnt_point, &stats);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error getting stats of Zephyr File System: %q"), mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+
+    if (stats.f_frsize > stats.f_bsize) {
+        bsize = stats.f_frsize;
+    } else {
+        bsize = stats.f_bsize;
+    }
+
+    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
+
+    t->items[0] = MP_OBJ_NEW_SMALL_INT(bsize);     // f_bsize
+    t->items[1] = MP_OBJ_NEW_SMALL_INT(stats.f_frsize);     // f_frsize
+    t->items[2] = MP_OBJ_NEW_SMALL_INT(stats.f_blocks);     // f_blocks
+    t->items[3] = MP_OBJ_NEW_SMALL_INT(stats.f_bfree);     // f_bfree
+    t->items[4] = t->items[3];     // f_bavail
+    t->items[5] = MP_OBJ_NEW_SMALL_INT(0);     // f_files
+    t->items[6] = MP_OBJ_NEW_SMALL_INT(0);     // f_ffree
+    t->items[7] = MP_OBJ_NEW_SMALL_INT(0);     // f_favail
+    t->items[8] = MP_OBJ_NEW_SMALL_INT(0);     // f_flags
+    t->items[9] = MP_OBJ_NEW_SMALL_INT(MAX_FILE_NAME);     // f_namemax.
+
+    return MP_OBJ_FROM_PTR(t);
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(zephyr_fs_statvfs_obj, zephyr_fs_statvfs);
+
+static mp_obj_t zephyr_fs_umount(mp_obj_t self_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    int err;
+
+    err = fs_unmount(self->mount);
+    if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error un-mounting Zephyr File System: %q"), mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(zephyr_fs_umount_obj, zephyr_fs_umount);
+
+static mp_obj_t zephyr_fs_mount(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    int err;
+    (void)readonly;
+    (void)mkfs;
+
+    err = fs_mount(self->mount);
+    if (err == -EBUSY) {
+        err = fs_unmount(self->mount);
+        if (err < 0) {
+            mp_raise_msg_varg(&mp_type_OSError,
+                MP_ERROR_TEXT("error un-mounting Zephyr File System: %q"), mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+            return mp_const_none;
+        }
+        err = fs_mount(self->mount);
+    }
+
+    if (err == -EROFS) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("read only filesystem that requires formatting"));
+        return mp_const_none;
+    } else if (err < 0) {
+        mp_raise_msg_varg(&mp_type_OSError,
+            MP_ERROR_TEXT("error mounting Zephyr File System: %q"), mp_errno_to_str(MP_OBJ_NEW_SMALL_INT(-err)));
+        return mp_const_none;
+    }
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_3(zephyr_fs_mount_obj, zephyr_fs_mount);
+
+#if CONFIG_FILE_SYSTEM_MKFS
+static mp_obj_t zephyr_fs_mkfs(mp_obj_t self_in) {
+    zephyr_fs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Yes, they correspond indirectly
+    if (self->mount->fs->mkfs((int)self->mount->storage_dev, self->mount->fs_data, self->mount->flags) < 0) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("error formatting Zephyr File System"));
+    }
+
+    return mp_const_none;
+}
+
+static MP_DEFINE_CONST_FUN_OBJ_1(zephyr_fs_mkfs_obj, zephyr_fs_mkfs);
+#endif
+
+static mp_obj_t zephyr_fs_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);
+
+    if (!mp_obj_is_str(args[0])) {
+        mp_raise_ValueError(MP_ERROR_TEXT("argument must be a zephyr FSTAB mountpoint string"));
+        return mp_const_none;
+    }
+
+    const char *_mountpoint = mp_obj_str_get_str(args[0]);
+    int i = 0;
+
+    for (; i < zephyr_fs_mounts_size; i++) {
+        if (strcmp(_mountpoint, zephyr_fs_mounts[i]->mnt_point) == 0) {
+            break;
+        }
+    }
+
+    if (i == zephyr_fs_mounts_size) {
+        mp_raise_ValueError(MP_ERROR_TEXT("couldn't find zephyr mountpoint"));
+        return mp_const_none;
+    }
+
+    if (zephyr_fs_mounts[i]->fs == 0) {
+        if (fs_mount(zephyr_fs_mounts[i]) != 0) {
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("FS is invalid, try adding automount to fstab"));
+            return mp_const_none;
+        }
+    }
+
+    // create new object
+    zephyr_fs_obj_t *fs = mp_obj_malloc(zephyr_fs_obj_t, type);
+    fs->mount = zephyr_fs_mounts[i];
+    vstr_init(&fs->cur_dir, 32);
+    vstr_init(&fs->root_dir, 128);
+    vstr_add_str(&fs->root_dir, zephyr_fs_mounts[i]->mnt_point);
+
+    return MP_OBJ_FROM_PTR(fs);
+}
+
+static mp_obj_t zephyr_fs_fstab(void) {
+    mp_obj_t list = mp_obj_new_list(0, NULL);
+
+    for (int i = 0; i < zephyr_fs_mounts_size; i++) {
+        mp_obj_list_append(list, mp_obj_new_str_from_cstr(zephyr_fs_mounts[i]->mnt_point));
+    }
+
+    return list;
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(zephyr_fs_fstab_fun_obj, zephyr_fs_fstab);
+static MP_DEFINE_CONST_STATICMETHOD_OBJ(zephyr_fs_fstab_obj, MP_ROM_PTR(&zephyr_fs_fstab_fun_obj));
+
+static const mp_rom_map_elem_t zephyr_fs_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&zephyr_fs_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&zephyr_fs_umount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&zephyr_fs_statvfs_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&zephyr_fs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&zephyr_fs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&zephyr_fs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&zephyr_fs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&zephyr_fs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&zephyr_fs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&zephyr_fs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&zephyr_fs_open_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&zephyr_fs_ilistdir_obj) },
+    #if CONFIG_FILE_SYSTEM_MKFS
+    { MP_ROM_QSTR(MP_QSTR_mkfs), MP_ROM_PTR(&zephyr_fs_mkfs_obj) },
+    #endif
+    // Not part of the VFS API, used to list available File Systems
+    { MP_ROM_QSTR(MP_QSTR_fstab), MP_ROM_PTR(&zephyr_fs_fstab_obj) },
+};
+static MP_DEFINE_CONST_DICT(zephyr_fs_locals_dict, zephyr_fs_locals_dict_table);
+
+static const mp_vfs_proto_t zephyr_fs_proto = {
+    .import_stat = zephyr_fs_import_stat,
+};
+
+const mp_obj_type_t zephyr_filesystem_type;
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    zephyr_filesystem_type,
+    MP_QSTR_FileSystem,
+    MP_TYPE_FLAG_NONE,
+    make_new, zephyr_fs_make_new,
+    protocol, &zephyr_fs_proto,
+    locals_dict, &zephyr_fs_locals_dict
+    );
+
+#endif // CONFIG_FILE_SYSTEM

From 559eb7cdb36030cd12d502055d7d126520ebc750 Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Wed, 1 Oct 2025 15:00:18 +0200
Subject: [PATCH 3084/3129] zephyr/CMakeLists.txt: Fix FS config options being
 ignored.

This makes CONFIG_MICROPY_VFS_* actually do things.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/CMakeLists.txt | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 27229d21b9f7b..9db0a95c663de 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -82,14 +82,33 @@ set(MICROPY_QSTRDEFS_PORT
     ${MICROPY_PORT_DIR}/qstrdefsport.h
 )
 
-set(MICROPY_SOURCE_LIB
+if (CONFIG_MICROPY_VFS_FAT)
+
+list(APPEND MICROPY_SOURCE_LIB
     oofatfs/ff.c
     oofatfs/ffunicode.c
+)
+
+endif()
+
+if (CONFIG_MICROPY_VFS_LFS1)
+
+list(APPEND MICROPY_SOURCE_LIB
     littlefs/lfs1.c
     littlefs/lfs1_util.c
+)
+
+endif()
+
+if (CONFIG_MICROPY_VFS_LFS2)
+
+list(APPEND MICROPY_SOURCE_LIB
     littlefs/lfs2.c
     littlefs/lfs2_util.c
 )
+
+endif()
+
 list(TRANSFORM MICROPY_SOURCE_LIB PREPEND ${MICROPY_DIR}/lib/)
 
 set(MICROPY_SOURCE_QSTR

From a40aba345545f42ee0ad533ddb735bb597b63ad7 Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Wed, 1 Oct 2025 18:17:34 +0200
Subject: [PATCH 3085/3129] zephyr/boards: Setup rpi_pico to use Zephyr FS
 instead of MPY FS.

Use new Zephyr FS, and be a demonstration of that configuration.

This is still on-disk compatible with existing filesystems on the internal
flash.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/boards/rpi_pico.conf    | 10 ++++++++++
 ports/zephyr/boards/rpi_pico.overlay | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/ports/zephyr/boards/rpi_pico.conf b/ports/zephyr/boards/rpi_pico.conf
index 683279ddc2c1c..6a0be1c379960 100644
--- a/ports/zephyr/boards/rpi_pico.conf
+++ b/ports/zephyr/boards/rpi_pico.conf
@@ -18,3 +18,13 @@ CONFIG_SPI=y
 
 # MicroPython config.
 CONFIG_MICROPY_HEAP_SIZE=196608
+
+# File System Configuration
+CONFIG_FILE_SYSTEM=y
+CONFIG_FILE_SYSTEM_LITTLEFS=y
+CONFIG_FILE_SYSTEM_MKFS=y
+CONFIG_MICROPY_VFS_FAT=n
+CONFIG_MICROPY_VFS_LFS1=n
+CONFIG_MICROPY_VFS_LFS2=n
+# Default heap for littlefs is too small
+CONFIG_FS_LITTLEFS_FC_HEAP_SIZE=8192
diff --git a/ports/zephyr/boards/rpi_pico.overlay b/ports/zephyr/boards/rpi_pico.overlay
index d63ed73bdf62b..436e4210aecf3 100644
--- a/ports/zephyr/boards/rpi_pico.overlay
+++ b/ports/zephyr/boards/rpi_pico.overlay
@@ -9,6 +9,20 @@
 		/* Use USB CDC ACM as the console. */
 		zephyr,console = &cdc_acm_uart0;
 	};
+
+	fstab {
+		compatible = "zephyr,fstab";
+		lfs: lfs {
+			compatible = "zephyr,fstab,littlefs";
+			mount-point = "/flash";
+			partition = <&storage_partition>;
+			read-size=<16>;
+			prog-size=<256>;
+			cache-size=<1024>;
+			lookahead-size=<32>;
+			block-cycles=<4>;
+		};
+	};
 };
 
 /* Delete defined partitions and make a layout matching the rp2 port RPI_PICO configuration. */

From 0ebaad2ba041aeab8655d03881c15bb062b1bfc2 Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Sun, 26 Oct 2025 01:36:14 +0200
Subject: [PATCH 3086/3129] zephyr/modules: Add Zephyr FileSystem support to
 _boot.py.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/modules/_boot.py | 36 ++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/modules/_boot.py b/ports/zephyr/modules/_boot.py
index d0ba21d3f0670..ab3ed9c6340a9 100644
--- a/ports/zephyr/modules/_boot.py
+++ b/ports/zephyr/modules/_boot.py
@@ -11,12 +11,39 @@
 # DiskAccess depends on CONFIG_DISK_ACCESS
 DiskAccess = getattr(zephyr, "DiskAccess", None)
 
+# zephyr.FileSystem depends on CONFIG_FILE_SYSTEM and CONFIG_FLASH_MAP
+FileSystem = getattr(zephyr, "FileSystem", None)
+
 _FLASH = const("/flash")
 _FLASH_LIB = const("/flash/lib")
 _STORAGE_KEY = const("storage")
 _FLASH_EXISTS = False
 
 
+def mount_filesystem_flash():
+    """Create a filesystem if needed on the FS partition "/flash"
+    and mount it on /flash.
+    Return True if successful, False otherwise.
+    """
+    if _FLASH in FileSystem.fstab():
+        fs = FileSystem(_FLASH)
+        retval = True
+        try:
+            vfs.mount(fs, _FLASH)
+        except OSError:
+            if getattr(fs, "mkfs", None):
+                try:
+                    fs.mkfs()
+                    vfs.mount(fs, _FLASH)
+                except OSError:
+                    print("Error formatting flash partition")
+                    retval = False
+            else:
+                retval = False
+        return retval
+    return False
+
+
 def create_flash_partition():
     """Create an LFS2 filesystem on the partition labeled storage
     and mount it on /flash.
@@ -54,7 +81,10 @@ def mount_all_disks():
     return retval
 
 
-if FlashArea and create_flash_partition():
+# Prefer FileSystem over FlashArea Access
+if FileSystem and mount_filesystem_flash():
+    _FLASH_EXISTS = True
+elif FlashArea and create_flash_partition():
     _FLASH_EXISTS = True
 
 # Prefer disks to /flash
@@ -67,6 +97,6 @@ def mount_all_disks():
     sys.path.append(_FLASH_LIB)
 
 # Cleanup globals for boot.py/main.py
-del FlashArea, DiskAccess, zephyr
+del FlashArea, DiskAccess, FileSystem, zephyr
 del sys, vfs, os, const
-del create_flash_partition, mount_all_disks, _FLASH_EXISTS
+del mount_filesystem_flash, create_flash_partition, mount_all_disks, _FLASH_EXISTS

From c07fda73f7115d2d2d4e2d4bba00a3e8dfd1367e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 15 Nov 2025 08:58:32 +0100
Subject: [PATCH 3087/3129] docs/mimxrt/pinout: Use Dxx pin identifiers for
 Teensy boards.

The documentation used integers to specify Teensy board pins, which match
the board's silkscreen. But in Python code Dxx have to be used, since
integers are not accepted as a Pin identifier.

This commit changes the Pinout tables accordingly, consistent with the
other MIMXRT boards.

Signed-off-by: robert-hh <robert@hammelrath.com>
---
 docs/mimxrt/pinout.rst | 123 +++++++++++++++++++++--------------------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/docs/mimxrt/pinout.rst b/docs/mimxrt/pinout.rst
index 9aeb85401be8d..d2b62d56d01d6 100644
--- a/docs/mimxrt/pinout.rst
+++ b/docs/mimxrt/pinout.rst
@@ -5,7 +5,10 @@ Pinout for the i.MXRT machine modules
 
 .. _mimxrt_uart_pinout:
 
-|
+The Teensy 4.0 and 4.1 board show pin numbers **nn** at the board's silkscreen.
+These are denoted in the tables below as **Dnn**. E.g. a silkscreen number **1** is
+shown as **D1**. Whenever a Pin has to be specified in a script, **Dnn** must
+be used, not **nn**.
 
 UART pin assignment
 -------------------
@@ -17,8 +20,8 @@ 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
+Teensy 4.0             -          D0/D1        D7/D8       D14/D15
+Teensy 4.1             -          D0/D1        D7/D8       D14/D15
 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
@@ -35,11 +38,11 @@ Makerdiary RT1011     -           D9/D10      D13/A0       D11/D12
 
 |
 
-=================  ===========  ===========  =======  =======  =====
-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
+=================  ===========  ===========  =======  =======  =======
+Board / Pin            UART4        UART5      UART6   UART7    UART8
+=================  ===========  ===========  =======  =======  =======
+Teensy 4.0           D16/D17      D21/D20    D25/D24  D28/D29      -
+Teensy 4.1           D16/D17      D21/D20    D25/D24  D28/D29  D34/D35
 MIMXRT1010-EVK          -            -         -        -        -
 MIMXRT1015-EVK          -            -         -        -        -
 MIMXRT1020-EVK       D15/D14       A1/A0       -        -        -
@@ -51,7 +54,7 @@ MIMXRT1170-EVK       D15/D14      D25/D26    D33/D34  D35/D36    -
 Olimex RT1010Py         -            -         -        -        -
 Seeed ARCH MIX     J4_10/J4_11  J5_08/J5_12    -        -        -
 Makerdiary RT1011     A1/A2          -         -        -        -
-=================  ===========  ===========  =======  =======  =====
+=================  ===========  ===========  =======  =======  =======
 
 .. _mimxrt_pwm_pinout:
 
@@ -102,46 +105,46 @@ 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
+D0     F1/1/X      D0     F1/1/X
+D1     F1/0/X      D1     F1/0/X
+D2     F4/2/A      D2     F4/2/A
+D3     F4/2/B      D3     F4/2/B
+D4     F2/0/A      D4     F2/0/A
+D5     F2/1/A      D5     F2/1/A
+D6     F2/2/A      D6     F2/2/A
+D7     F1/3/B      D7     F1/3/B
+D8     F1/3/A      D8     F1/3/A
+D9     F2/2/B      D9     F2/2/B
+D10    Q1/0        D10    Q1/0
+D11    Q1/2        D11    Q1/2
+D12    Q1/1        D12    Q1/1
+D13    Q2/0        D13    Q2/0
+D14    Q3/2        D14    Q3/2
+D15    Q3/3        D15    Q3/3
+D18    Q3/1        D18    Q3/1
+D19    Q3/0        D19    Q3/0
+D22    F4/0/A      D22    F4/0/A
+D23    F4/1/A      D23    F4/1/A
+D24    F1/2/X      D24    F1/2/X
+D25    F1/3/X      D25    F1/3/X
+D28    F3/1/B      D28    F3/1/B
+D29    F3/1/A      D29    F3/1/A
+D33    F2/0/B      D33    F2/0/B
+-      -           D36    F2/3/A
+-      -           D37    F2/3/B
+DAT1   F1/1/B      D42    F1/1/B
+DAT0   F1/1/A      D43    F1/1/A
+CLK    F1/0/B      D44    F1/0/B
+CMD    F1/0/A      D45    F1/0/A
+DAT2   F1/2/A      D46    F1/2/A
+DAT3   F1/2/B      D47    F1/2/B
+-      -           D48    F1/0/B
+-      -           D49    F1/2/A
+-      -           D50    F1/2/B
+-      -           D51    F3/3/B
+-      -           D52    F1/1/B
+-      -           D53    F1/1/A
+-      -           D54    F3/0/A
 ====   ==========  ====   ==========
 
 |
@@ -330,11 +333,11 @@ 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
+=================  =========================  =======================  =================
+Teensy 4.0         D10/-/D11/D12/D13          D0/-/D26/D1/D27                -
+Teensy 4.1         D10/D37/D11/D12/D13        D0/-/D26/D1/D27          -/D29/D50/D54/D49
 MIXMXRT1010-EVK    D10/D7/D11/D12/D13                -                       -
 MIXMXRT1015-EVK    D10/-/D11/D12/D13                 -                       -
 MIXMXRT1020-EVK    D10/-/D11/D12/D13          A3/D0/A5/A4/A0                 -
@@ -347,7 +350,7 @@ Adafruit Metro M7  -/-/MOSI/MISO/SCK                -                        -
 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
 Makerdiary RT1011  A5/A2/A4/A3/A6             A11/A1/A10/A9/CLK
-=================  =========================  =======================  ===============
+=================  =========================  =======================  =================
 
 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.
@@ -367,8 +370,8 @@ 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         -        -
+Teensy 4.0         D18/D19      D17/D16      D25/D24       -        -
+Teensy 4.1         D18/D19      D17/D16      D25/D24       -        -
 MIXMXRT1010-EVK    D14/D15      D0/D1         -            -        -
 MIXMXRT1015-EVK    D14/D15       -            -            -        -
 MIXMXRT1020-EVK    D14/D15      A4/A5        D0/D1         -        -
@@ -396,10 +399,10 @@ 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
+Teensy 4.0         1   D23    D26      D27     D7      D21      D20     D8
+Teensy 4.0         2   D33    D4       D3      D2      -        -       D5
+Teensy 4.1         1   D23    D26      D27     D7      D21      D20     D8
+Teensy 4.1         2   D33    D4       D3      D2      -        -       D5
 Seeed Arch MIX     1   J4_09  J4_14    J4_15   J14_13  J4_11    J4_10   J4_10
 Adafruit Metro M7  1   D8     D10      D9      D12     D14      D15     D13
 Olimex RT1010Py    1   D8     D6       D7      D4      D1       D2      D3

From 48d96b400e73e7fbcca8365d0bebc0c41402dde5 Mon Sep 17 00:00:00 2001
From: Chris Liechti <cliechti@gmx.net>
Date: Mon, 30 Nov 2020 16:40:56 +0100
Subject: [PATCH 3088/3129] py/builtinimport: Support relative import in custom
 __import__ callback.

The globals need to be forwarded from the caller's context.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtinimport.c               | 19 ++++++++++++++-----
 py/runtime.c                     |  2 +-
 tests/import/builtin_import.py   |  9 +++++++++
 tests/import/import_override2.py | 18 ++++++++++++++++++
 4 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 tests/import/import_override2.py

diff --git a/py/builtinimport.c b/py/builtinimport.c
index ff894f69d99e2..2c7d796680fb6 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -267,7 +267,7 @@ static void do_load(mp_module_context_t *module_obj, vstr_t *file) {
 
 // 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) {
+static void evaluate_relative_import(mp_int_t level, const char **module_name, size_t *module_name_len, mp_obj_t globals) {
     // 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.
@@ -276,7 +276,7 @@ static void evaluate_relative_import(mp_int_t level, const char **module_name, s
     // 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__));
+    mp_obj_t current_module_name_obj = mp_obj_dict_get(globals, MP_OBJ_NEW_QSTR(MP_QSTR___name__));
     assert(current_module_name_obj != MP_OBJ_NULL);
 
     #if MICROPY_MODULE_OVERRIDE_MAIN_IMPORT && MICROPY_CPYTHON_COMPAT
@@ -284,12 +284,12 @@ static void evaluate_relative_import(mp_int_t level, const char **module_name, s
         // 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__));
+        current_module_name_obj = mp_obj_dict_get(globals, 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);
+    bool is_pkg = mp_map_lookup(mp_obj_dict_get_map(globals), MP_OBJ_NEW_QSTR(MP_QSTR___path__), MP_MAP_LOOKUP);
 
     #if DEBUG_PRINT
     DEBUG_printf("Current module/package: ");
@@ -569,10 +569,19 @@ mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
     const char *module_name = mp_obj_str_get_data(module_name_obj, &module_name_len);
 
     if (level != 0) {
+        // This is the dict with all global symbols.
+        mp_obj_t globals = MP_OBJ_FROM_PTR(mp_globals_get());
+        if (n_args >= 2 && args[1] != mp_const_none) {
+            globals = args[1];
+            if (!mp_obj_is_type(globals, &mp_type_dict)) {
+                mp_raise_TypeError(NULL);
+            }
+        }
+
         // Turn "foo.bar" with level=3 into "<current module 3 components>.foo.bar".
         // Current module name is extracted from globals().__name__.
-        evaluate_relative_import(level, &module_name, &module_name_len);
         // module_name is now an absolute module path.
+        evaluate_relative_import(level, &module_name, &module_name_len, globals);
     }
 
     if (module_name_len == 0) {
diff --git a/py/runtime.c b/py/runtime.c
index a84e22760be3b..ddc1ef7d3ead0 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1522,7 +1522,7 @@ mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level) {
     // build args array
     mp_obj_t args[5];
     args[0] = MP_OBJ_NEW_QSTR(name);
-    args[1] = mp_const_none; // TODO should be globals
+    args[1] = MP_OBJ_FROM_PTR(mp_globals_get()); // globals of the current context
     args[2] = mp_const_none; // TODO should be locals
     args[3] = fromlist;
     args[4] = level;
diff --git a/tests/import/builtin_import.py b/tests/import/builtin_import.py
index 734498d1be47b..364b0bae912ae 100644
--- a/tests/import/builtin_import.py
+++ b/tests/import/builtin_import.py
@@ -20,3 +20,12 @@
     __import__("xyz", None, None, None, -1)
 except ValueError:
     print("ValueError")
+
+# globals is not checked for level=0
+__import__("builtins", "globals")
+
+# globals must be a dict (or None) for level>0
+try:
+    __import__("builtins", "globals", None, None, 1)
+except TypeError:
+    print("TypeError")
diff --git a/tests/import/import_override2.py b/tests/import/import_override2.py
new file mode 100644
index 0000000000000..25aac44fe98d0
--- /dev/null
+++ b/tests/import/import_override2.py
@@ -0,0 +1,18 @@
+# test overriding __import__ combined with importing from the filesystem
+
+
+def custom_import(name, globals, locals, fromlist, level):
+    if level > 0:
+        print("import", name, fromlist, level)
+    return orig_import(name, globals, locals, fromlist, level)
+
+
+orig_import = __import__
+try:
+    __import__("builtins").__import__ = custom_import
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+# import calls __import__ behind the scenes
+import pkg7.subpkg1.subpkg2.mod3

From 45938432c6616fe684e67fdf4c5a9615a7c2fc73 Mon Sep 17 00:00:00 2001
From: Chris Liechti <cliechti@gmx.net>
Date: Wed, 2 Dec 2020 00:38:30 +0100
Subject: [PATCH 3089/3129] extmod/asyncio: Pass globals in __import__ call.

`globals()` needs to be provided in case `__import__` is a Python function.
---
 extmod/asyncio/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/asyncio/__init__.py b/extmod/asyncio/__init__.py
index 1f83750c5aafa..801af791414ed 100644
--- a/extmod/asyncio/__init__.py
+++ b/extmod/asyncio/__init__.py
@@ -26,6 +26,6 @@ def __getattr__(attr):
     mod = _attrs.get(attr, None)
     if mod is None:
         raise AttributeError(attr)
-    value = getattr(__import__(mod, None, None, True, 1), attr)
+    value = getattr(__import__(mod, globals(), None, True, 1), attr)
     globals()[attr] = value
     return value

From 128420359e9144369df2ed24e99217b3dc54446f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 Nov 2025 14:41:31 +1100
Subject: [PATCH 3090/3129] py/objdict: Implement bool and len unary ops for
 dict views.

Currently, dict views (eg `dict.keys()`, `dict.values()`) do not implement
the `bool` or `len` unary operations.  That may seem like a reasonable
omission for MicroPython to keep code size down, but it actually leads to
silently incorrect bool operations, because by default things are true.

Eg we currently have:

    >>> bool(dict().keys())
    True

which is wrong, it should be `False` because the dict is empty.

This commit implements `bool` and `len` unary operations on dict views by
simply delegating to the existing dict unary op function.

Fixes issue #12385.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objdict.c               | 3 ++-
 tests/basics/dict_views.py | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/py/objdict.c b/py/objdict.c
index 451e87329030c..692a7de42750f 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -521,7 +521,8 @@ static mp_obj_t dict_view_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     if (op == MP_UNARY_OP_HASH && o->kind == MP_DICT_VIEW_VALUES) {
         return MP_OBJ_NEW_SMALL_INT((mp_uint_t)o_in);
     }
-    return MP_OBJ_NULL;
+    // delegate all other ops to dict unary op handler
+    return dict_unary_op(op, o->dict);
 }
 
 static mp_obj_t dict_view_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
diff --git a/tests/basics/dict_views.py b/tests/basics/dict_views.py
index a82f47b6be26f..45f3238f1c624 100644
--- a/tests/basics/dict_views.py
+++ b/tests/basics/dict_views.py
@@ -6,6 +6,11 @@
 # print a view with more than one item
 print({1:1, 2:1}.values())
 
+# `bool` and `len` unary ops
+for d in ({}, {1: 2}, {1: 2, 3: 4}):
+    for op in (bool, len):
+        print(op(d.keys()), op(d.values()), op(d.items()))
+
 # unsupported binary op on a dict values view
 try:
     {1:1}.values() + 1

From 7a15c97f069ed11fe0f7e697e240bec7eea4d0fb Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.t.tran@gmail.com>
Date: Tue, 18 Nov 2025 21:43:55 -0800
Subject: [PATCH 3091/3129] docs/library/os: Clarify ilistdir tuples size
 element.

The currently documentation for ilistdir tuples says that the size element
is included based on the platform. However, this is not the case as it is
included based on the filesystem type. This commit makes the according
adjustment.

Fixes issue #17516.

Signed-off-by: Alex Tran <alex.t.tran@gmail.com>
---
 docs/library/os.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/library/os.rst b/docs/library/os.rst
index bd552e36f0100..483ef1c0a1ec3 100644
--- a/docs/library/os.rst
+++ b/docs/library/os.rst
@@ -55,10 +55,9 @@ Filesystem access
       directories and 0x8000 for regular files;
     - *inode* is an integer corresponding to the inode of the file, and may be 0
       for filesystems that don't have such a notion.
-    - Some platforms may return a 4-tuple that includes the entry's *size*.  For
-      file entries, *size* is an integer representing the size of the file
-      or -1 if unknown.  Its meaning is currently undefined for directory
-      entries.
+    - *size* is an integer that may be included depending on the filesystem type.
+      For file entries, *size* represents the size of the file or -1 if unknown.
+      Its meaning is currently undefined for directory entries.
 
 .. function:: listdir([dir])
 

From 40df95357c7b3270dc60421a0078fd73b122473f Mon Sep 17 00:00:00 2001
From: Phil Howard <github@gadgetoid.com>
Date: Wed, 16 Jul 2025 17:47:29 +0100
Subject: [PATCH 3092/3129] rp2: Fix RP2350 and RP2350B pin alt functions.

RP2350 builds were using the incomplete `rp2_af.csv` alt function table
(originally made for RP2040) which broke pins > 31 in RP2350B (48-pin
QFN-80) builds:

    >>> machine.Pin(31)
    Pin(GPIO31, mode=IN, pull=PULL_DOWN)

    >>> machine.Pin(32)
    Pin(GPIO32, mode=ALT, pull=PULL_DOWN, alt=31)

To fix this, separate alt-functions tables for RP2350 and RP2350B are added
in this commit.

UART_AUX (alt function 11) was also missing, along with XIP_CS1 and
CORESIGHT_TRACE, and they are  now added as well.

Signed-off-by: Phil Howard <github@gadgetoid.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt                      | 21 +++++---
 ports/rp2/boards/make-pins.py                 |  9 ++++
 .../rp2/boards/{rp2_af.csv => rp2040_af.csv}  |  0
 ports/rp2/boards/rp2350_af.csv                | 31 ++++++++++++
 ports/rp2/boards/rp2350b_af.csv               | 49 +++++++++++++++++++
 ports/rp2/machine_pin.c                       |  8 +++
 6 files changed, 112 insertions(+), 6 deletions(-)
 rename ports/rp2/boards/{rp2_af.csv => rp2040_af.csv} (100%)
 create mode 100644 ports/rp2/boards/rp2350_af.csv
 create mode 100644 ports/rp2/boards/rp2350b_af.csv

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 120d07bcce1be..c4a081e2efd54 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -644,12 +644,6 @@ separate_arguments(MICROPY_CPP_FLAGS_EXTRA)
 # Include the main MicroPython cmake rules.
 include(${MICROPY_DIR}/py/mkrules.cmake)
 
-set(GEN_PINS_AF_CSV "${MICROPY_PORT_DIR}/boards/rp2_af.csv")
-set(GEN_PINS_PREFIX "${MICROPY_PORT_DIR}/boards/rp2_prefix.c")
-set(GEN_PINS_MKPINS "${MICROPY_PORT_DIR}/boards/make-pins.py")
-set(GEN_PINS_SRC "${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c")
-set(GEN_PINS_HDR "${MICROPY_GENHDR_DIR}/pins.h")
-
 if(NOT PICO_NUM_GPIOS)
     set(PICO_NUM_GPIOS 30)
 endif()
@@ -658,6 +652,21 @@ if(NOT PICO_NUM_EXT_GPIOS)
     set(PICO_NUM_EXT_GPIOS 10)
 endif()
 
+if(PICO_RP2040)
+    set(GEN_PINS_AF_CSV "${MICROPY_PORT_DIR}/boards/rp2040_af.csv")
+elseif(PICO_RP2350)
+    if(PICO_NUM_GPIOS EQUAL 48)
+        set(GEN_PINS_AF_CSV "${MICROPY_PORT_DIR}/boards/rp2350b_af.csv")
+    else()
+        set(GEN_PINS_AF_CSV "${MICROPY_PORT_DIR}/boards/rp2350_af.csv")
+    endif()
+endif()
+
+set(GEN_PINS_PREFIX "${MICROPY_PORT_DIR}/boards/rp2_prefix.c")
+set(GEN_PINS_MKPINS "${MICROPY_PORT_DIR}/boards/make-pins.py")
+set(GEN_PINS_SRC "${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c")
+set(GEN_PINS_HDR "${MICROPY_GENHDR_DIR}/pins.h")
+
 if(NOT MICROPY_BOARD_PINS)
     set(MICROPY_BOARD_PINS "${MICROPY_BOARD_DIR}/pins.csv")
 endif()
diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
index 1da2edb7cacd6..07ce052bba3ca 100755
--- a/ports/rp2/boards/make-pins.py
+++ b/ports/rp2/boards/make-pins.py
@@ -60,6 +60,15 @@ def add_af(self, af_idx, _af_name, af):
         m = re.match("([A-Z][A-Z0-9][A-Z]+)(([0-9]+)(_.*)?)?", af)
         af_fn = m.group(1)
         af_unit = int(m.group(3)) if m.group(3) is not None else 0
+        if af_idx == 10:
+            # AF11 uses UART_AUX in lieu of UART
+            af_fn = "UART_AUX"
+        if af_fn.startswith("QMI"):
+            # The full func name is GPIO_FUNC_XIP_CS1
+            af_fn = "XIP_CS1"
+        if af_fn.startswith("TRACE"):
+            # The various TRACE functions all belong under CORESIGHT_TRACE
+            af_fn = "CORESIGHT_TRACE"
         if af_fn == "PIO":
             # Pins can be either PIO unit (unlike, say, I2C where a
             # pin can only be I2C0 _or_ I2C1, both sharing the same AF
diff --git a/ports/rp2/boards/rp2_af.csv b/ports/rp2/boards/rp2040_af.csv
similarity index 100%
rename from ports/rp2/boards/rp2_af.csv
rename to ports/rp2/boards/rp2040_af.csv
diff --git a/ports/rp2/boards/rp2350_af.csv b/ports/rp2/boards/rp2350_af.csv
new file mode 100644
index 0000000000000..cca30d9e74c8c
--- /dev/null
+++ b/ports/rp2/boards/rp2350_af.csv
@@ -0,0 +1,31 @@
+Pin,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11
+GPIO0,SPI0_RX,UART0_TX,I2C0_SDA,PWM0_A,SIO,PIO0,PIO1,PIO2,QMI_CS1,USB_OVCUR_DET,
+GPIO1,SPI0_CS,UART0_RX,I2C0_SCL,PWM0_B,SIO,PIO0,PIO1,PIO2,TRACECLK,USB_VBUS_DET,
+GPIO2,SPI0_SCK,UART0_CTS,I2C1_SDA,PWM1_A,SIO,PIO0,PIO1,PIO2,TRACEDATA0,USB_VBUS_EN,UART0_TX
+GPIO3,SPI0_TX,UART0_RTS,I2C1_SCL,PWM1_B,SIO,PIO0,PIO1,PIO2,TRACEDATA1,USB_OVCUR_DET,UART0_RX
+GPIO4,SPI0_RX,UART1_TX,I2C0_SDA,PWM2_A,SIO,PIO0,PIO1,PIO2,TRACEDATA2,USB_VBUS_DET,
+GPIO5,SPI0_CS,UART1_RX,I2C0_SCL,PWM2_B,SIO,PIO0,PIO1,PIO2,TRACEDATA3,USB_VBUS_EN,
+GPIO6,SPI0_SCK,UART1_CTS,I2C1_SDA,PWM3_A,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART1_TX
+GPIO7,SPI0_TX,UART1_RTS,I2C1_SCL,PWM3_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART1_RX
+GPIO8,SPI1_RX,UART1_TX,I2C0_SDA,PWM4_A,SIO,PIO0,PIO1,PIO2,QMI_CS1,USB_VBUS_EN,
+GPIO9,SPI1_CS,UART1_RX,I2C0_SCL,PWM4_B,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,
+GPIO10,SPI1_SCK,UART1_CTS,I2C1_SDA,PWM5_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART1_TX
+GPIO11,SPI1_TX,UART1_RTS,I2C1_SCL,PWM5_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,UART1_RX
+GPIO12,SPI1_RX,UART0_TX,I2C0_SDA,PWM6_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN0,USB_OVCUR_DET,
+GPIO13,SPI1_CS,UART0_RX,I2C0_SCL,PWM6_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT0,USB_VBUS_DET,
+GPIO14,SPI1_SCK,UART0_CTS,I2C1_SDA,PWM7_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN1,USB_VBUS_EN,UART0_TX
+GPIO15,SPI1_TX,UART0_RTS,I2C1_SCL,PWM7_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT1,USB_OVCUR_DET,UART0_RX
+GPIO16,SPI0_RX,UART0_TX,I2C0_SDA,PWM0_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,
+GPIO17,SPI0_CS,UART0_RX,I2C0_SCL,PWM0_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,
+GPIO18,SPI0_SCK,UART0_CTS,I2C1_SDA,PWM1_A,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART0_TX
+GPIO19,SPI0_TX,UART0_RTS,I2C1_SCL,PWM1_B,SIO,PIO0,PIO1,PIO2,QMI_CS1,USB_VBUS_DET,UART0_RX
+GPIO20,SPI0_RX,UART1_TX,I2C0_SDA,PWM2_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN0,USB_VBUS_EN,
+GPIO21,SPI0_CS,UART1_RX,I2C0_SCL,PWM2_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT0,USB_OVCUR_DET,
+GPIO22,SPI0_SCK,UART1_CTS,I2C1_SDA,PWM3_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN1,USB_VBUS_DET,UART1_TX
+GPIO23,SPI0_TX,UART1_RTS,I2C1_SCL,PWM3_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT1,USB_VBUS_EN,UART1_RX
+GPIO24,SPI1_RX,UART1_TX,I2C0_SDA,PWM4_A,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT2,USB_OVCUR_DET,
+GPIO25,SPI1_CS,UART1_RX,I2C0_SCL,PWM4_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT3,USB_VBUS_DET,
+GPIO26,SPI1_SCK,UART1_CTS,I2C1_SDA,PWM5_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,UART1_TX
+GPIO27,SPI1_TX,UART1_RTS,I2C1_SCL,PWM5_B,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART1_RX
+GPIO28,SPI1_RX,UART0_TX,I2C0_SDA,PWM6_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,
+GPIO29,SPI1_CS,UART0_RX,I2C0_SCL,PWM6_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,
diff --git a/ports/rp2/boards/rp2350b_af.csv b/ports/rp2/boards/rp2350b_af.csv
new file mode 100644
index 0000000000000..3b9053f58cd4d
--- /dev/null
+++ b/ports/rp2/boards/rp2350b_af.csv
@@ -0,0 +1,49 @@
+Pin,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11
+GPIO0,SPI0_RX,UART0_TX,I2C0_SDA,PWM0_A,SIO,PIO0,PIO1,PIO2,QMI_CS1,USB_OVCUR_DET,
+GPIO1,SPI0_CS,UART0_RX,I2C0_SCL,PWM0_B,SIO,PIO0,PIO1,PIO2,TRACECLK,USB_VBUS_DET,
+GPIO2,SPI0_SCK,UART0_CTS,I2C1_SDA,PWM1_A,SIO,PIO0,PIO1,PIO2,TRACEDATA0,USB_VBUS_EN,UART0_TX
+GPIO3,SPI0_TX,UART0_RTS,I2C1_SCL,PWM1_B,SIO,PIO0,PIO1,PIO2,TRACEDATA1,USB_OVCUR_DET,UART0_RX
+GPIO4,SPI0_RX,UART1_TX,I2C0_SDA,PWM2_A,SIO,PIO0,PIO1,PIO2,TRACEDATA2,USB_VBUS_DET,
+GPIO5,SPI0_CS,UART1_RX,I2C0_SCL,PWM2_B,SIO,PIO0,PIO1,PIO2,TRACEDATA3,USB_VBUS_EN,
+GPIO6,SPI0_SCK,UART1_CTS,I2C1_SDA,PWM3_A,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART1_TX
+GPIO7,SPI0_TX,UART1_RTS,I2C1_SCL,PWM3_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART1_RX
+GPIO8,SPI1_RX,UART1_TX,I2C0_SDA,PWM4_A,SIO,PIO0,PIO1,PIO2,QMI_CS1,USB_VBUS_EN,
+GPIO9,SPI1_CS,UART1_RX,I2C0_SCL,PWM4_B,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,
+GPIO10,SPI1_SCK,UART1_CTS,I2C1_SDA,PWM5_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART1_TX
+GPIO11,SPI1_TX,UART1_RTS,I2C1_SCL,PWM5_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,UART1_RX
+GPIO12,SPI1_RX,UART0_TX,I2C0_SDA,PWM6_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN0,USB_OVCUR_DET,
+GPIO13,SPI1_CS,UART0_RX,I2C0_SCL,PWM6_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT0,USB_VBUS_DET,
+GPIO14,SPI1_SCK,UART0_CTS,I2C1_SDA,PWM7_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN1,USB_VBUS_EN,UART0_TX
+GPIO15,SPI1_TX,UART0_RTS,I2C1_SCL,PWM7_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT1,USB_OVCUR_DET,UART0_RX
+GPIO16,SPI0_RX,UART0_TX,I2C0_SDA,PWM0_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,
+GPIO17,SPI0_CS,UART0_RX,I2C0_SCL,PWM0_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,
+GPIO18,SPI0_SCK,UART0_CTS,I2C1_SDA,PWM1_A,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART0_TX
+GPIO19,SPI0_TX,UART0_RTS,I2C1_SCL,PWM1_B,SIO,PIO0,PIO1,PIO2,QMI_CS1,USB_VBUS_DET,UART0_RX
+GPIO20,SPI0_RX,UART1_TX,I2C0_SDA,PWM2_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN0,USB_VBUS_EN,
+GPIO21,SPI0_CS,UART1_RX,I2C0_SCL,PWM2_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT0,USB_OVCUR_DET,
+GPIO22,SPI0_SCK,UART1_CTS,I2C1_SDA,PWM3_A,SIO,PIO0,PIO1,PIO2,GPCK_GPIN1,USB_VBUS_DET,UART1_TX
+GPIO23,SPI0_TX,UART1_RTS,I2C1_SCL,PWM3_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT1,USB_VBUS_EN,UART1_RX
+GPIO24,SPI1_RX,UART1_TX,I2C0_SDA,PWM4_A,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT2,USB_OVCUR_DET,
+GPIO25,SPI1_CS,UART1_RX,I2C0_SCL,PWM4_B,SIO,PIO0,PIO1,PIO2,GPCK_GPOUT3,USB_VBUS_DET,
+GPIO26,SPI1_SCK,UART1_CTS,I2C1_SDA,PWM5_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,UART1_TX
+GPIO27,SPI1_TX,UART1_RTS,I2C1_SCL,PWM5_B,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART1_RX
+GPIO28,SPI1_RX,UART0_TX,I2C0_SDA,PWM6_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,
+GPIO29,SPI1_CS,UART0_RX,I2C0_SCL,PWM6_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,
+GPIO30,SPI1_SCK,UART0_CTS,I2C1_SDA,PWM7_A,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART0_TX
+GPIO31,SPI1_TX,UART0_RTS,I2C1_SCL,PWM7_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART0_RX
+GPIO32,SPI0_RX,UART0_TX,I2C0_SDA,PWM8_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,
+GPIO33,SPI0_CS,UART0_RX,I2C0_SCL,PWM8_B,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,
+GPIO34,SPI0_SCK,UART0_CTS,I2C1_SDA,PWM9_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART0_TX
+GPIO35,SPI0_TX,UART0_RTS,I2C1_SCL,PWM9_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,UART0_RX
+GPIO36,SPI0_RX,UART1_TX,I2C0_SDA,PWM10_A,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,
+GPIO37,SPI0_CS,UART1_RX,I2C0_SCL,PWM10_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,
+GPIO38,SPI0_SCK,UART1_CTS,I2C1_SCL,PWM11_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,UART1_TX
+GPIO39,SPI0_TX,UART1_RTS,I2C1_SCL,PWM11_B,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART1_RX
+GPIO40,SPI1_RX,UART1_TX,I2C0_SDA,PWM8_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,
+GPIO41,SPI1_CS,UART1_RX,I2C0_SCL,PWM8_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,
+GPIO42,SPI1_SCK,UART1_CTS,I2C1_SDA,PWM9_A,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,UART1_TX
+GPIO43,SPI1_TX,UART1_RTS,I2C1_SCL,PWM9_B,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART1_RX
+GPIO44,SPI1_RX,UART0_TX,I2C0_SDA,PWM10_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_EN,
+GPIO45,SPI1_CS,UART0_RX,I2C0_SCL,PWM10_B,SIO,PIO0,PIO1,PIO2,,USB_OVCUR_DET,
+GPIO46,SPI1_SCK,UART0_CTS,I2C1_SDA,PWM11_A,SIO,PIO0,PIO1,PIO2,,USB_VBUS_DET,UART0_TX
+GPIO47,SPI1_TX,UART0_RTS,I2C1_SCL,PWM11_B,SIO,PIO0,PIO1,PIO2,QMI_CS1,USB_VBUS_EN,UART0_RX
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 7a2de0c0bc690..e1a184f322cbb 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -515,8 +515,16 @@ static const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { 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) },
+    #if NUM_PIOS >= 3
+    { MP_ROM_QSTR(MP_QSTR_ALT_PIO2), MP_ROM_INT(GPIO_FUNC_PIO2) },
+    #endif
     { 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) },
+    #if PICO_RP2350
+    { MP_ROM_QSTR(MP_QSTR_ALT_XIP_CS1), MP_ROM_INT(GPIO_FUNC_XIP_CS1) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_CORESIGHT_TRACE), MP_ROM_INT(GPIO_FUNC_CORESIGHT_TRACE) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_UART_AUX), MP_ROM_INT(GPIO_FUNC_UART_AUX) },
+    #endif
 };
 static MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 

From 5b3c928f53a0f0e2a1d6178569e594dbe9cf8f92 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 26 Oct 2023 09:02:16 +1100
Subject: [PATCH 3093/3129] unix/main: Use standard pyexec REPL for unix and
 windows ports.

This improves REPL usage consistency across ports, by utilizing the pyexec
code for the unix REPL.

Only enabled when MICROPY_USE_READLINE == 1 (the default).

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/unix/Makefile                           |  1 +
 ports/unix/main.c                             | 90 ++++---------------
 ports/windows/Makefile                        |  1 +
 ports/windows/micropython.vcxproj             |  1 +
 shared/runtime/pyexec.c                       |  9 ++
 tests/cmdline/cmd_sys_exit_0.py               |  5 ++
 tests/cmdline/cmd_sys_exit_0.py.exp           |  1 +
 tests/cmdline/cmd_sys_exit_error.py           |  5 ++
 tests/cmdline/cmd_sys_exit_error.py.exp       |  1 +
 tests/cmdline/cmd_sys_exit_none.py            |  5 ++
 tests/cmdline/cmd_sys_exit_none.py.exp        |  1 +
 tests/cmdline/repl_autocomplete.py.exp        |  2 +-
 .../repl_autocomplete_underscore.py.exp       |  2 +-
 tests/cmdline/repl_autoindent.py.exp          |  2 +-
 tests/cmdline/repl_basic.py.exp               |  2 +-
 tests/cmdline/repl_cont.py.exp                |  2 +-
 tests/cmdline/repl_emacs_keys.py.exp          |  2 +-
 tests/cmdline/repl_inspect.py.exp             |  2 +-
 tests/cmdline/repl_lock.py.exp                |  2 +-
 tests/cmdline/repl_micropyinspect.py.exp      |  2 +-
 tests/cmdline/repl_paste.py.exp               |  2 +-
 tests/cmdline/repl_sys_ps1_ps2.py.exp         |  2 +-
 tests/cmdline/repl_words_move.py.exp          |  2 +-
 tests/feature_check/repl_emacs_check.py.exp   |  2 +-
 .../repl_words_move_check.py.exp              |  2 +-
 25 files changed, 59 insertions(+), 89 deletions(-)
 create mode 100644 tests/cmdline/cmd_sys_exit_0.py
 create mode 100644 tests/cmdline/cmd_sys_exit_0.py.exp
 create mode 100644 tests/cmdline/cmd_sys_exit_error.py
 create mode 100644 tests/cmdline/cmd_sys_exit_error.py.exp
 create mode 100644 tests/cmdline/cmd_sys_exit_none.py
 create mode 100644 tests/cmdline/cmd_sys_exit_none.py.exp

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 81751bf0f7b2c..70e4f33917224 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -220,6 +220,7 @@ SRC_C += \
 
 SHARED_SRC_C += $(addprefix shared/,\
 	runtime/gchelper_generic.c \
+	runtime/pyexec.c \
 	timeutils/timeutils.c \
 	$(SHARED_SRC_C_EXTRA) \
 	)
diff --git a/ports/unix/main.c b/ports/unix/main.c
index db50e12f59821..1c5c2266aa053 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -55,6 +55,7 @@
 #include "genhdr/mpversion.h"
 #include "input.h"
 #include "stack_size.h"
+#include "shared/runtime/pyexec.h"
 
 // Command line options, with their defaults
 static bool compile_only = false;
@@ -195,95 +196,34 @@ static char *strjoin(const char *s1, int sep_char, const char *s2) {
 #endif
 
 static int do_repl(void) {
-    mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
-    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
 
-    // use MicroPython supplied readline
+    // use MicroPython supplied readline-based REPL
 
-    vstr_t line;
-    vstr_init(&line, 16);
+    int ret = 0;
+    mp_hal_stdio_mode_raw();
     for (;;) {
-        mp_hal_stdio_mode_raw();
-
-    input_restart:
-        // 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.
-        MP_STATE_THREAD(gc_lock_depth) = 0;
-        vstr_reset(&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) {
-            // cancel input
-            mp_hal_stdout_tx_str("\r\n");
-            goto input_restart;
-        } else if (ret == CHAR_CTRL_D) {
-            // EOF
-            printf("\n");
-            mp_hal_stdio_mode_orig();
-            vstr_clear(&line);
-            return 0;
-        } else if (ret == CHAR_CTRL_E) {
-            // paste mode
-            mp_hal_stdout_tx_str("\npaste mode; Ctrl-C to cancel, Ctrl-D to finish\n=== ");
-            vstr_reset(&line);
-            for (;;) {
-                char c = mp_hal_stdin_rx_chr();
-                if (c == CHAR_CTRL_C) {
-                    // cancel everything
-                    mp_hal_stdout_tx_str("\n");
-                    goto input_restart;
-                } else if (c == CHAR_CTRL_D) {
-                    // end of input
-                    mp_hal_stdout_tx_str("\n");
-                    break;
-                } else {
-                    // add char to buffer and echo
-                    vstr_add_byte(&line, c);
-                    if (c == '\r') {
-                        mp_hal_stdout_tx_str("\n=== ");
-                    } else {
-                        mp_hal_stdout_tx_strn(&c, 1);
-                    }
-                }
-            }
-            parse_input_kind = MP_PARSE_FILE_INPUT;
-        } else if (line.len == 0) {
-            if (ret != 0) {
-                printf("\n");
+        if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
+            if ((ret = pyexec_raw_repl()) != 0) {
+                break;
             }
-            goto input_restart;
         } else {
-            // 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, mp_repl_get_ps2());
-                if (ret == CHAR_CTRL_C) {
-                    // cancel everything
-                    printf("\n");
-                    goto input_restart;
-                } else if (ret == CHAR_CTRL_D) {
-                    // stop entering compound statement
-                    break;
-                }
+            if ((ret = pyexec_friendly_repl()) != 0) {
+                break;
             }
         }
-
-        mp_hal_stdio_mode_orig();
-
-        ret = execute_from_lexer(LEX_SRC_VSTR, &line, parse_input_kind, true);
-        if (ret & FORCED_EXIT) {
-            return ret;
-        }
     }
+    mp_hal_stdio_mode_orig();
+    return ret;
 
     #else
 
     // use simple readline
 
+    mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
+    mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE);
+    mp_hal_stdout_tx_str("\nUse Ctrl-D to exit, Ctrl-E for paste mode\n");
+
     for (;;) {
         char *line = prompt((char *)mp_repl_get_ps1());
         if (line == NULL) {
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 9eee98cdd4538..4129b7fe2cc44 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -83,6 +83,7 @@ OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 ifeq ($(MICROPY_USE_READLINE),1)
 CFLAGS += -DMICROPY_USE_READLINE=1
 SRC_C += shared/readline/readline.c
+SRC_C += shared/runtime/pyexec.c
 endif
 
 LIB += -lws2_32
diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index 9326f3f4cde18..f8bbec82cfdc6 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -89,6 +89,7 @@
     <ClCompile Include="@(PyExtModSource)" />
     <ClCompile Include="$(PyBaseDir)shared\readline\*.c" />
     <ClCompile Include="$(PyBaseDir)shared\runtime\gchelper_generic.c" />
+    <ClCompile Include="$(PyBaseDir)shared\runtime\pyexec.c" />
     <ClCompile Include="$(PyBaseDir)ports\windows\*.c" />
     <ClCompile Include="$(PyBaseDir)ports\windows\msvc\*.c" />
     <ClCompile Include="$(PyBaseDir)ports\unix\gccollect.c"/>
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index cf17bd0dc356f..237a6f9df1c2d 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -37,6 +37,7 @@
 #include "py/mphal.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
+#include "extmod/modplatform.h"
 #include "genhdr/mpversion.h"
 
 pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
@@ -103,6 +104,14 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             // source is a lexer, parse and compile the script
             qstr source_name = lex->source_name;
             mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
+            #if defined(MICROPY_UNIX_COVERAGE)
+            // allow to print the parse tree in the coverage build
+            if (mp_verbose_flag >= 3) {
+                printf("----------------\n");
+                mp_parse_node_print(&mp_plat_print, parse_tree.root, 0);
+                printf("----------------\n");
+            }
+            #endif
             module_fun = mp_compile(&parse_tree, source_name, exec_flags & EXEC_FLAG_IS_REPL);
             #else
             mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("script compilation not supported"));
diff --git a/tests/cmdline/cmd_sys_exit_0.py b/tests/cmdline/cmd_sys_exit_0.py
new file mode 100644
index 0000000000000..1294b739e8ff1
--- /dev/null
+++ b/tests/cmdline/cmd_sys_exit_0.py
@@ -0,0 +1,5 @@
+# cmdline:
+# test sys.exit(0) - success exit code
+import sys
+
+sys.exit(0)
diff --git a/tests/cmdline/cmd_sys_exit_0.py.exp b/tests/cmdline/cmd_sys_exit_0.py.exp
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/tests/cmdline/cmd_sys_exit_0.py.exp
@@ -0,0 +1 @@
+
diff --git a/tests/cmdline/cmd_sys_exit_error.py b/tests/cmdline/cmd_sys_exit_error.py
new file mode 100644
index 0000000000000..ecac15e94f1bf
--- /dev/null
+++ b/tests/cmdline/cmd_sys_exit_error.py
@@ -0,0 +1,5 @@
+# cmdline:
+# test sys.exit() functionality and exit codes
+import sys
+
+sys.exit(123)
diff --git a/tests/cmdline/cmd_sys_exit_error.py.exp b/tests/cmdline/cmd_sys_exit_error.py.exp
new file mode 100644
index 0000000000000..3911f71d6244d
--- /dev/null
+++ b/tests/cmdline/cmd_sys_exit_error.py.exp
@@ -0,0 +1 @@
+CRASH
\ No newline at end of file
diff --git a/tests/cmdline/cmd_sys_exit_none.py b/tests/cmdline/cmd_sys_exit_none.py
new file mode 100644
index 0000000000000..66e19666589ed
--- /dev/null
+++ b/tests/cmdline/cmd_sys_exit_none.py
@@ -0,0 +1,5 @@
+# cmdline:
+# test sys.exit(None) - should exit with code 0
+import sys
+
+sys.exit(None)
diff --git a/tests/cmdline/cmd_sys_exit_none.py.exp b/tests/cmdline/cmd_sys_exit_none.py.exp
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/tests/cmdline/cmd_sys_exit_none.py.exp
@@ -0,0 +1 @@
+
diff --git a/tests/cmdline/repl_autocomplete.py.exp b/tests/cmdline/repl_autocomplete.py.exp
index 75002985e3c63..8cf71bb447d43 100644
--- a/tests/cmdline/repl_autocomplete.py.exp
+++ b/tests/cmdline/repl_autocomplete.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # tests for autocompletion
 >>> import sys
 >>> not_exist.
diff --git a/tests/cmdline/repl_autocomplete_underscore.py.exp b/tests/cmdline/repl_autocomplete_underscore.py.exp
index 35617554f57b7..f9720ef233180 100644
--- a/tests/cmdline/repl_autocomplete_underscore.py.exp
+++ b/tests/cmdline/repl_autocomplete_underscore.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use Ctrl-D to exit, Ctrl-E for paste mode
+Type "help()" for more information.
 >>> # Test REPL autocompletion filtering of underscore attributes
 >>> 
 >>> # Start paste mode
diff --git a/tests/cmdline/repl_autoindent.py.exp b/tests/cmdline/repl_autoindent.py.exp
index 9127a7d31d903..f45bf840f092a 100644
--- a/tests/cmdline/repl_autoindent.py.exp
+++ b/tests/cmdline/repl_autoindent.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # tests for autoindent
 >>> if 1:
 ...     print(1)
diff --git a/tests/cmdline/repl_basic.py.exp b/tests/cmdline/repl_basic.py.exp
index 2b390ea98bb75..a190684743285 100644
--- a/tests/cmdline/repl_basic.py.exp
+++ b/tests/cmdline/repl_basic.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # basic REPL tests
 >>> print(1)
 1
diff --git a/tests/cmdline/repl_cont.py.exp b/tests/cmdline/repl_cont.py.exp
index 834c18a4d3699..d0d20adc49617 100644
--- a/tests/cmdline/repl_cont.py.exp
+++ b/tests/cmdline/repl_cont.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # check REPL allows to continue input
 >>> 1 \\\\
 ... + 2
diff --git a/tests/cmdline/repl_emacs_keys.py.exp b/tests/cmdline/repl_emacs_keys.py.exp
index 6102c19639a8a..b8b7b794f2d7c 100644
--- a/tests/cmdline/repl_emacs_keys.py.exp
+++ b/tests/cmdline/repl_emacs_keys.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # REPL tests of GNU-ish readline navigation
 >>> # history buffer navigation
 >>> 1
diff --git a/tests/cmdline/repl_inspect.py.exp b/tests/cmdline/repl_inspect.py.exp
index 051acfd153a61..89ae142019b8e 100644
--- a/tests/cmdline/repl_inspect.py.exp
+++ b/tests/cmdline/repl_inspect.py.exp
@@ -1,6 +1,6 @@
 test
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # cmdline: -i -c print("test")
 >>> # -c option combined with -i option results in REPL
 >>> 
diff --git a/tests/cmdline/repl_lock.py.exp b/tests/cmdline/repl_lock.py.exp
index 7cce24f6c6abd..d921fd6ae8e99 100644
--- a/tests/cmdline/repl_lock.py.exp
+++ b/tests/cmdline/repl_lock.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> import micropython
 >>> micropython.heap_lock()
 >>> 1+1
diff --git a/tests/cmdline/repl_micropyinspect.py.exp b/tests/cmdline/repl_micropyinspect.py.exp
index 93ff43546eace..504bb07d7d45e 100644
--- a/tests/cmdline/repl_micropyinspect.py.exp
+++ b/tests/cmdline/repl_micropyinspect.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # cmdline: cmdline/repl_micropyinspect
 >>> # setting MICROPYINSPECT environment variable before program exit triggers REPL
 >>> 
diff --git a/tests/cmdline/repl_paste.py.exp b/tests/cmdline/repl_paste.py.exp
index 22d9bd574006a..2b837f85cf993 100644
--- a/tests/cmdline/repl_paste.py.exp
+++ b/tests/cmdline/repl_paste.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use Ctrl-D to exit, Ctrl-E for paste mode
+Type "help()" for more information.
 >>> # Test REPL paste mode functionality
 >>> 
 >>> # Basic paste mode with a simple function
diff --git a/tests/cmdline/repl_sys_ps1_ps2.py.exp b/tests/cmdline/repl_sys_ps1_ps2.py.exp
index 9e82db5e313e4..6781660bf337d 100644
--- a/tests/cmdline/repl_sys_ps1_ps2.py.exp
+++ b/tests/cmdline/repl_sys_ps1_ps2.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # test changing ps1/ps2
 >>> import sys
 >>> sys.ps1 = "PS1"
diff --git a/tests/cmdline/repl_words_move.py.exp b/tests/cmdline/repl_words_move.py.exp
index 86f6b7788989e..c4d22a0d9a7fc 100644
--- a/tests/cmdline/repl_words_move.py.exp
+++ b/tests/cmdline/repl_words_move.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # word movement
 >>> # backward-word, start in word
 >>> \.\+
diff --git a/tests/feature_check/repl_emacs_check.py.exp b/tests/feature_check/repl_emacs_check.py.exp
index 82a4e28ee4f84..5fe8ba1cd2df8 100644
--- a/tests/feature_check/repl_emacs_check.py.exp
+++ b/tests/feature_check/repl_emacs_check.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # Check for emacs keys in REPL
 >>> t = \.\+
 >>> t == 2
diff --git a/tests/feature_check/repl_words_move_check.py.exp b/tests/feature_check/repl_words_move_check.py.exp
index 82a4e28ee4f84..5fe8ba1cd2df8 100644
--- a/tests/feature_check/repl_words_move_check.py.exp
+++ b/tests/feature_check/repl_words_move_check.py.exp
@@ -1,5 +1,5 @@
 MicroPython \.\+ version
-Use \.\+
+Type "help()" for more information.
 >>> # Check for emacs keys in REPL
 >>> t = \.\+
 >>> t == 2

From 3b2b8dd53826ef3b7ef755013e1ecdccd368cb8c Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 26 May 2025 19:28:40 +1000
Subject: [PATCH 3094/3129] shared/runtime/pyexec: Set __file__ for file input
 when enabled.

When `MICROPY_MODULE___FILE__` is enabled and parsing file input, set the
global `__file__` variable to the source filename. This matches the
behavior of the unix port and provides the current filename to the
executing script.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 shared/runtime/pyexec.c                | 5 +++++
 tests/cmdline/cmd_file_variable.py     | 5 +++++
 tests/cmdline/cmd_file_variable.py.exp | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 tests/cmdline/cmd_file_variable.py
 create mode 100644 tests/cmdline/cmd_file_variable.py.exp

diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 237a6f9df1c2d..6196367834473 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -103,6 +103,11 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             }
             // source is a lexer, parse and compile the script
             qstr source_name = lex->source_name;
+            #if MICROPY_MODULE___FILE__
+            if (input_kind == MP_PARSE_FILE_INPUT) {
+                mp_store_global(MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
+            }
+            #endif
             mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
             #if defined(MICROPY_UNIX_COVERAGE)
             // allow to print the parse tree in the coverage build
diff --git a/tests/cmdline/cmd_file_variable.py b/tests/cmdline/cmd_file_variable.py
new file mode 100644
index 0000000000000..6cac6744d904e
--- /dev/null
+++ b/tests/cmdline/cmd_file_variable.py
@@ -0,0 +1,5 @@
+# Test that __file__ is set correctly for script execution
+try:
+    print("__file__ =", __file__)
+except NameError:
+    print("__file__ not defined")
diff --git a/tests/cmdline/cmd_file_variable.py.exp b/tests/cmdline/cmd_file_variable.py.exp
new file mode 100644
index 0000000000000..6807569f662b5
--- /dev/null
+++ b/tests/cmdline/cmd_file_variable.py.exp
@@ -0,0 +1 @@
+__file__ = cmdline/cmd_file_variable.py

From 7b3a0fc6b7fe935be008d2518eb480b75a8809d1 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 26 May 2025 19:28:02 +1000
Subject: [PATCH 3095/3129] shared/runtime/pyexec: Provide support for
 compile-only mode.

When `MICROPY_PYEXEC_COMPILE_ONLY` is enabled and the global
`mp_compile_only` is True, code is compiled but not executed.

Also add comprehensive tests for compile-only functionality covering both
successful compilation and syntax error detection.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 pyproject.toml                              |  8 +++++++-
 shared/runtime/pyexec.c                     |  8 +++++++-
 tests/cmdline/cmd_compile_only.py           | 13 +++++++++++++
 tests/cmdline/cmd_compile_only.py.exp       |  1 +
 tests/cmdline/cmd_compile_only_error.py     |  6 ++++++
 tests/cmdline/cmd_compile_only_error.py.exp |  1 +
 6 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/cmdline/cmd_compile_only.py
 create mode 100644 tests/cmdline/cmd_compile_only.py.exp
 create mode 100644 tests/cmdline/cmd_compile_only_error.py
 create mode 100644 tests/cmdline/cmd_compile_only_error.py.exp

diff --git a/pyproject.toml b/pyproject.toml
index 041dd74191ff6..cdc79bb8ae6c6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,6 +30,7 @@ target-version = "py37"
 
 [tool.ruff.lint]
 exclude = [  # Ruff finds Python SyntaxError in these files
+  "tests/cmdline/cmd_compile_only_error.py",
   "tests/cmdline/repl_autocomplete.py",
   "tests/cmdline/repl_autocomplete_underscore.py",
   "tests/cmdline/repl_autoindent.py",
@@ -69,4 +70,9 @@ mccabe.max-complexity = 40
 #   basics: needs careful attention before applying automatic formatting
 #   repl_: not real python files
 #   viper_args: uses f(*)
-exclude = ["tests/basics/*.py", "tests/*/repl_*.py", "tests/micropython/viper_args.py"]
+exclude = [
+  "tests/basics/*.py",
+  "tests/*/repl_*.py",
+  "tests/cmdline/cmd_compile_only_error.py",
+  "tests/micropython/viper_args.py",
+]
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 6196367834473..910b39c08c2a5 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -130,7 +130,12 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         #if MICROPY_REPL_INFO
         start = mp_hal_ticks_ms();
         #endif
-        mp_call_function_0(module_fun);
+        #if MICROPY_PYEXEC_COMPILE_ONLY
+        if (!mp_compile_only)
+        #endif
+        {
+            mp_call_function_0(module_fun);
+        }
         mp_hal_set_interrupt_char(-1); // disable interrupt
         mp_handle_pending(true); // handle any pending exceptions (and any callbacks)
         nlr_pop();
@@ -706,6 +711,7 @@ int pyexec_file(const char *filename) {
     return parse_compile_execute(filename, MP_PARSE_FILE_INPUT, EXEC_FLAG_SOURCE_IS_FILENAME);
 }
 
+
 int pyexec_file_if_exists(const char *filename) {
     #if MICROPY_MODULE_FROZEN
     if (mp_find_frozen_module(filename, NULL, NULL) == MP_IMPORT_STAT_FILE) {
diff --git a/tests/cmdline/cmd_compile_only.py b/tests/cmdline/cmd_compile_only.py
new file mode 100644
index 0000000000000..89964c1b5bdf2
--- /dev/null
+++ b/tests/cmdline/cmd_compile_only.py
@@ -0,0 +1,13 @@
+# cmdline: -X compile-only
+# test compile-only functionality
+print("This should not be printed")
+x = 1 + 2
+
+
+def hello():
+    return "world"
+
+
+class TestClass:
+    def __init__(self):
+        self.value = 42
diff --git a/tests/cmdline/cmd_compile_only.py.exp b/tests/cmdline/cmd_compile_only.py.exp
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/tests/cmdline/cmd_compile_only.py.exp
@@ -0,0 +1 @@
+
diff --git a/tests/cmdline/cmd_compile_only_error.py b/tests/cmdline/cmd_compile_only_error.py
new file mode 100644
index 0000000000000..326937a5c07ef
--- /dev/null
+++ b/tests/cmdline/cmd_compile_only_error.py
@@ -0,0 +1,6 @@
+# cmdline: -X compile-only
+# test compile-only with syntax error
+print("This should not be printed")
+def broken_syntax(
+    # Missing closing parenthesis
+    return "error"
diff --git a/tests/cmdline/cmd_compile_only_error.py.exp b/tests/cmdline/cmd_compile_only_error.py.exp
new file mode 100644
index 0000000000000..3911f71d6244d
--- /dev/null
+++ b/tests/cmdline/cmd_compile_only_error.py.exp
@@ -0,0 +1 @@
+CRASH
\ No newline at end of file

From 7ac8fcf752389e2af37b49994478bd9d93f48434 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 26 May 2025 20:25:01 +1000
Subject: [PATCH 3096/3129] unix: Enable compile-only mode with shared pyexec
 REPL.

Provides support for command line `-X compile-only` option on unix port.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/unix/main.c            | 6 +++---
 ports/unix/mpconfigport.h    | 3 +++
 ports/unix/mphalport.h       | 4 ++++
 ports/windows/mpconfigport.h | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 1c5c2266aa053..934bd3252b568 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -58,7 +58,7 @@
 #include "shared/runtime/pyexec.h"
 
 // Command line options, with their defaults
-static bool compile_only = false;
+bool mp_compile_only = false;
 static uint emit_opt = MP_EMIT_OPT_NONE;
 
 #if MICROPY_ENABLE_GC
@@ -159,7 +159,7 @@ static int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
 
         mp_obj_t module_fun = mp_compile(&parse_tree, source_name, is_repl);
 
-        if (!compile_only) {
+        if (!mp_compile_only) {
             // execute it
             mp_call_function_0(module_fun);
         }
@@ -325,7 +325,7 @@ static void pre_process_options(int argc, char **argv) {
                 }
                 if (0) {
                 } else if (strcmp(argv[a + 1], "compile-only") == 0) {
-                    compile_only = true;
+                    mp_compile_only = true;
                 } else if (strcmp(argv[a + 1], "emit=bytecode") == 0) {
                     emit_opt = MP_EMIT_OPT_BYTECODE;
                 #if MICROPY_EMIT_NATIVE
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index f074398635198..562c93f99bd1f 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -151,6 +151,9 @@ typedef long mp_off_t;
 // Enable sys.executable.
 #define MICROPY_PY_SYS_EXECUTABLE (1)
 
+// Enable support for compile-only mode.
+#define MICROPY_PYEXEC_COMPILE_ONLY (1)
+
 #define MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
 
 // Bare-metal ports don't have stderr. Printing debug to stderr may give tests
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index 0efd6940b3065..eb2370c94b506 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -25,6 +25,7 @@
  */
 #include <errno.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #ifndef CHAR_CTRL_C
 #define CHAR_CTRL_C (3)
@@ -117,3 +118,6 @@ enum {
 
 void mp_hal_get_mac(int idx, uint8_t buf[6]);
 #endif
+
+// Global variable to control compile-only mode.
+extern bool mp_compile_only;
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 68744ba93e797..24c54438e6ec1 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -161,6 +161,9 @@
 #define MICROPY_MACHINE_MEM_GET_READ_ADDR   mod_machine_mem_get_addr
 #define MICROPY_MACHINE_MEM_GET_WRITE_ADDR  mod_machine_mem_get_addr
 
+// Enable support for compile-only mode.
+#define MICROPY_PYEXEC_COMPILE_ONLY (1)
+
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
 #define MICROPY_ERROR_PRINTER       (&mp_stderr_print)
 #define MICROPY_WARNINGS            (1)

From e067d96c8b71b3fe258583fd6cddb1094cb4efe5 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 26 May 2025 19:31:30 +1000
Subject: [PATCH 3097/3129] tests/run-tests.py: Add general newline
 normalization function.

Add a general normalize_newlines() function that handles newline variations
(\\r\\r\\n, \\r\\n) to \\n while preserving literal \\r characters that are
part of test content.

This provides a robust solution for cross-platform test compatibility,
particularly addressing PTY double-newline issues that can occur with some
terminal implementations.

The function is applied to all test output before comparison, eliminating
platform-specific newline issues.

Includes a unit test to verify the normalization behavior.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 .gitattributes                                |  1 +
 pyproject.toml                                |  1 +
 tests/micropython/test_normalize_newlines.py  | 14 ++++++++++++++
 .../test_normalize_newlines.py.exp            |  8 ++++++++
 tests/run-tests.py                            | 19 ++++++++++++++++++-
 5 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 tests/micropython/test_normalize_newlines.py
 create mode 100644 tests/micropython/test_normalize_newlines.py.exp

diff --git a/.gitattributes b/.gitattributes
index 2d8496db50488..c14a61b0d97d7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,6 +18,7 @@
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
+tests/micropython/test_normalize_newlines.py.exp -text
 ports/stm32/pybcdc.inf_template -text
 ports/stm32/usbhost/** -text
 ports/cc3200/hal/aes.c -text
diff --git a/pyproject.toml b/pyproject.toml
index cdc79bb8ae6c6..f3693eae1b420 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -74,5 +74,6 @@ exclude = [
   "tests/basics/*.py",
   "tests/*/repl_*.py",
   "tests/cmdline/cmd_compile_only_error.py",
+  "tests/micropython/test_normalize_newlines.py",
   "tests/micropython/viper_args.py",
 ]
diff --git a/tests/micropython/test_normalize_newlines.py b/tests/micropython/test_normalize_newlines.py
new file mode 100644
index 0000000000000..f19aaa69a3f75
--- /dev/null
+++ b/tests/micropython/test_normalize_newlines.py
@@ -0,0 +1,14 @@
+# Test for normalize_newlines functionality
+# This test verifies that test framework handles various newline combinations correctly
+
+# Note: This is more of an integration test since normalize_newlines is in the test framework
+# The actual testing happens when this test is run through run-tests.py
+
+print("Testing newline handling")
+print("Line 1\r\nLine 2")  # Windows-style line ending - should be normalized
+print("Line 3")            # Normal line
+print("Line 4")            # Normal line
+print("Line 5\nLine 6")    # Unix-style line ending - already normalized
+
+# Test that literal \r in strings is preserved
+print(repr("test\rstring"))  # Should show 'test\rstring' not 'test\nstring'
diff --git a/tests/micropython/test_normalize_newlines.py.exp b/tests/micropython/test_normalize_newlines.py.exp
new file mode 100644
index 0000000000000..c4395468cf109
--- /dev/null
+++ b/tests/micropython/test_normalize_newlines.py.exp
@@ -0,0 +1,8 @@
+Testing newline handling
+Line 1
+Line 2
+Line 3
+Line 4
+Line 5
+Line 6
+'test\rstring'
diff --git a/tests/run-tests.py b/tests/run-tests.py
index b4654c2e6b582..fba011fb54cb6 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -60,6 +60,23 @@ 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"
 
+
+def normalize_newlines(data):
+    """Normalize newline variations to \\n.
+
+    Only normalizes actual line endings, not literal \\r characters in strings.
+    Handles \\r\\r\\n and \\r\\n cases to ensure consistent comparison
+    across different platforms and terminals.
+    """
+    if isinstance(data, bytes):
+        # Handle PTY double-newline issue first
+        data = data.replace(b"\r\r\n", b"\n")
+        # Then handle standard Windows line endings
+        data = data.replace(b"\r\n", b"\n")
+        # Don't convert standalone \r as it might be literal content
+    return data
+
+
 # Code to allow a target MicroPython to import an .mpy from RAM
 # Note: the module is named `__injected_test` but it needs to have `__name__` set to
 # `__main__` so that the test sees itself as the main module, eg so unittest works.
@@ -706,7 +723,7 @@ def send_get(what):
         )
 
     # 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 = normalize_newlines(output_mupy)
 
     # don't try to convert the output if we should skip this test
     if had_crash or output_mupy in (b"SKIP\n", b"SKIP-TOO-LARGE\n", b"CRASH"):

From e06ac9ce089c5eda9cbd9ec035cdf56fe75be0ab Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 22 Jul 2025 15:28:28 +1000
Subject: [PATCH 3098/3129] unix/main: Replace execute_from_lexer with pyexec
 in do_file and do_str.

Consolidates file and string execution to use the standard pyexec interface
for consistency with other ports.

Simplify execute_from_lexer for remaining usage: Remove unused LEX_SRC_VSTR
and LEX_SRC_FILENAME cases, keeping only LEX_SRC_STR for REPL and
LEX_SRC_STDIN for stdin execution.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/unix/main.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 934bd3252b568..dec3f90dea5e8 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -111,8 +111,6 @@ static int handle_uncaught_exception(mp_obj_base_t *exc) {
 }
 
 #define LEX_SRC_STR (1)
-#define LEX_SRC_VSTR (2)
-#define LEX_SRC_FILENAME (3)
 #define LEX_SRC_STDIN (4)
 
 // Returns standard error codes: 0 for success, 1 for all other errors,
@@ -128,12 +126,6 @@ static int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
         if (source_kind == LEX_SRC_STR) {
             const char *line = source;
             lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, line, strlen(line), false);
-        } else if (source_kind == LEX_SRC_VSTR) {
-            const vstr_t *vstr = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, false);
-        } else if (source_kind == LEX_SRC_FILENAME) {
-            const char *filename = (const char *)source;
-            lex = mp_lexer_new_from_file(qstr_from_str(filename));
         } else { // LEX_SRC_STDIN
             lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, 0, false);
         }
@@ -251,12 +243,28 @@ static int do_repl(void) {
     #endif
 }
 
+static inline int convert_pyexec_result(int ret) {
+    // pyexec returns 1 for success, 0 for exception, PYEXEC_FORCED_EXIT for SystemExit
+    // Convert to unix port's expected codes: 0 for success, 1 for exception, FORCED_EXIT|val for SystemExit
+    if (ret == 1) {
+        return 0; // success
+    } else if (ret & PYEXEC_FORCED_EXIT) {
+        return ret; // SystemExit with exit value in lower 8 bits
+    } else {
+        return 1; // exception
+    }
+}
+
 static int do_file(const char *file) {
-    return execute_from_lexer(LEX_SRC_FILENAME, file, MP_PARSE_FILE_INPUT, false);
+    return convert_pyexec_result(pyexec_file(file));
 }
 
 static int do_str(const char *str) {
-    return execute_from_lexer(LEX_SRC_STR, str, MP_PARSE_FILE_INPUT, false);
+    vstr_t vstr;
+    vstr.buf = (char *)str;
+    vstr.len = strlen(str);
+    int ret = pyexec_vstr(&vstr, true);
+    return convert_pyexec_result(ret);
 }
 
 static void print_help(char **argv) {

From fd1ddc3f12b40e99faaf24dd099fd512fddcb62c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Oct 2025 13:11:23 +1100
Subject: [PATCH 3099/3129] shared/runtime/pyexec: Call
 mp_hal_stdio_mode_orig/raw as appropriate.

This ensures that ctrl-C works on the unix port when executing code at the
REPL.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c       |  2 --
 ports/unix/mphalport.h  |  3 +++
 shared/runtime/pyexec.c | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index dec3f90dea5e8..55fd8406ba670 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -193,7 +193,6 @@ static int do_repl(void) {
     // use MicroPython supplied readline-based REPL
 
     int ret = 0;
-    mp_hal_stdio_mode_raw();
     for (;;) {
         if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
             if ((ret = pyexec_raw_repl()) != 0) {
@@ -205,7 +204,6 @@ static int do_repl(void) {
             }
         }
     }
-    mp_hal_stdio_mode_orig();
     return ret;
 
     #else
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index eb2370c94b506..97c24978a25b3 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -48,6 +48,9 @@
         MP_THREAD_GIL_ENTER(); \
     } while (0)
 
+// The port provides `mp_hal_stdio_mode_raw()` and `mp_hal_stdio_mode_orig()`.
+#define MICROPY_HAL_HAS_STDIO_MODE_SWITCH (1)
+
 void mp_hal_set_interrupt_char(char c);
 
 #define mp_hal_stdio_poll unused // this is not implemented, nor needed
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 910b39c08c2a5..d2a1403e38115 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -536,10 +536,20 @@ MP_REGISTER_ROOT_POINTER(vstr_t * repl_line);
 
 #else // MICROPY_REPL_EVENT_DRIVEN
 
+#if !MICROPY_HAL_HAS_STDIO_MODE_SWITCH
+// If the port doesn't need any stdio mode switching calls then provide trivial ones.
+static inline void mp_hal_stdio_mode_raw(void) {
+}
+static inline void mp_hal_stdio_mode_orig(void) {
+}
+#endif
+
 int pyexec_raw_repl(void) {
     vstr_t line;
     vstr_init(&line, 32);
 
+    mp_hal_stdio_mode_raw();
+
 raw_repl_reset:
     mp_hal_stdout_tx_str("raw REPL; CTRL-B to exit\r\n");
 
@@ -553,6 +563,7 @@ int pyexec_raw_repl(void) {
                 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) {
+                        mp_hal_stdio_mode_orig();
                         return ret;
                     }
                     vstr_reset(&line);
@@ -565,6 +576,7 @@ int pyexec_raw_repl(void) {
                 mp_hal_stdout_tx_str("\r\n");
                 vstr_clear(&line);
                 pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
+                mp_hal_stdio_mode_orig();
                 return 0;
             } else if (c == CHAR_CTRL_C) {
                 // clear line
@@ -585,13 +597,17 @@ int pyexec_raw_repl(void) {
             // exit for a soft reset
             mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&line);
+            mp_hal_stdio_mode_orig();
             return PYEXEC_FORCED_EXIT;
         }
 
+        // Switch to original terminal mode to execute code, eg to support keyboard interrupt (SIGINT).
+        mp_hal_stdio_mode_orig();
         int ret = parse_compile_execute(&line, MP_PARSE_FILE_INPUT, EXEC_FLAG_PRINT_EOF | EXEC_FLAG_SOURCE_IS_VSTR);
         if (ret & PYEXEC_FORCED_EXIT) {
             return ret;
         }
+        mp_hal_stdio_mode_raw();
     }
 }
 
@@ -599,6 +615,8 @@ int pyexec_friendly_repl(void) {
     vstr_t line;
     vstr_init(&line, 32);
 
+    mp_hal_stdio_mode_raw();
+
 friendly_repl_reset:
     mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
     mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE);
@@ -640,6 +658,7 @@ int pyexec_friendly_repl(void) {
             mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&line);
             pyexec_mode_kind = PYEXEC_MODE_RAW_REPL;
+            mp_hal_stdio_mode_orig();
             return 0;
         } else if (ret == CHAR_CTRL_B) {
             // reset friendly REPL
@@ -653,6 +672,7 @@ int pyexec_friendly_repl(void) {
             // exit for a soft reset
             mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&line);
+            mp_hal_stdio_mode_orig();
             return PYEXEC_FORCED_EXIT;
         } else if (ret == CHAR_CTRL_E) {
             // paste mode
@@ -697,10 +717,13 @@ int pyexec_friendly_repl(void) {
             }
         }
 
+        // Switch to original terminal mode to execute code, eg to support keyboard interrupt (SIGINT).
+        mp_hal_stdio_mode_orig();
         ret = parse_compile_execute(&line, parse_input_kind, EXEC_FLAG_ALLOW_DEBUGGING | EXEC_FLAG_IS_REPL | EXEC_FLAG_SOURCE_IS_VSTR);
         if (ret & PYEXEC_FORCED_EXIT) {
             return ret;
         }
+        mp_hal_stdio_mode_raw();
     }
 }
 

From 5f815b8a2d15a31298386d58eff5ac3c4d0fba92 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 5 Nov 2025 16:35:31 +1100
Subject: [PATCH 3100/3129] unix: Enable exit code handling for sys.exit().

Enable `MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING` to propagate `sys.exit()`
exit codes properly. Update `convert_pyexec_result()` to handle return
values where pyexec returns the exit code with `PYEXEC_FORCED_EXIT` flag
set for `SystemExit`. Extract the exit code from the lower 8 bits when the
flag is set, otherwise return as-is (0 for success, 1 for exception).

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 ports/unix/main.c            | 12 ++++++++++++
 ports/unix/mpconfigport.h    |  3 +++
 ports/windows/mpconfigport.h |  3 +++
 shared/runtime/pyexec.c      |  1 +
 4 files changed, 19 insertions(+)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 55fd8406ba670..ecc6924494be7 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -242,6 +242,17 @@ static int do_repl(void) {
 }
 
 static inline int convert_pyexec_result(int ret) {
+    #if MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING
+    // With exit code handling enabled:
+    // pyexec returns exit code with PYEXEC_FORCED_EXIT flag set for SystemExit
+    // Unix port expects: 0 for success, non-zero for error/exit
+    if (ret & PYEXEC_FORCED_EXIT) {
+        // SystemExit: extract exit code from lower bits
+        return ret & 0xFF;
+    }
+    // Normal execution or exception: return as-is (0 for success, 1 for exception)
+    return ret;
+    #else
     // pyexec returns 1 for success, 0 for exception, PYEXEC_FORCED_EXIT for SystemExit
     // Convert to unix port's expected codes: 0 for success, 1 for exception, FORCED_EXIT|val for SystemExit
     if (ret == 1) {
@@ -251,6 +262,7 @@ static inline int convert_pyexec_result(int ret) {
     } else {
         return 1; // exception
     }
+    #endif
 }
 
 static int do_file(const char *file) {
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 562c93f99bd1f..854da1dbd4217 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -154,6 +154,9 @@ typedef long mp_off_t;
 // Enable support for compile-only mode.
 #define MICROPY_PYEXEC_COMPILE_ONLY (1)
 
+// Enable handling of sys.exit() exit codes.
+#define MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING (1)
+
 #define MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
 
 // Bare-metal ports don't have stderr. Printing debug to stderr may give tests
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 24c54438e6ec1..1edcd0eded155 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -164,6 +164,9 @@
 // Enable support for compile-only mode.
 #define MICROPY_PYEXEC_COMPILE_ONLY (1)
 
+// Enable handling of sys.exit() exit codes.
+#define MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING (1)
+
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
 #define MICROPY_ERROR_PRINTER       (&mp_stderr_print)
 #define MICROPY_WARNINGS            (1)
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index d2a1403e38115..428cc95b232f2 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -165,6 +165,7 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         #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_SystemExit))) { // system exit
             #if MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING
+            // None is an exit value of 0; an int is its value; anything else is 1
             mp_obj_t val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val));
             if (val != mp_const_none) {
                 if (mp_obj_is_int(val)) {

From a6864109db645045790d97b2e2b471d24a9a0560 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 5 Nov 2025 16:35:41 +1100
Subject: [PATCH 3101/3129] shared/runtime/pyexec: Set PYEXEC_FORCED_EXIT flag
 for SystemExit.

When `MICROPY_PYEXEC_ENABLE_EXIT_CODE_HANDLING` is enabled, `SystemExit`
now sets the `PYEXEC_FORCED_EXIT` flag in addition to the exit code. This
allows the REPL to properly detect and exit when SystemExit is raised,
while still preserving the exit code in the lower bits.

Fixes `repl_lock.py` test which expects REPL to exit on `SystemExit`.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 shared/runtime/pyexec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 428cc95b232f2..867bf58ab685b 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -178,6 +178,8 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             } else {
                 ret = PYEXEC_NORMAL_EXIT;
             }
+            // Set PYEXEC_FORCED_EXIT flag so REPL knows to exit
+            ret |= PYEXEC_FORCED_EXIT;
             #else
             ret = PYEXEC_FORCED_EXIT;
             #endif

From db8273def84510d71cd4d3017b345d83fe8b90bc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 21 Nov 2025 09:18:20 +0100
Subject: [PATCH 3102/3129] shared/tinyusb: Add macro to override TinyUSB
 callbacks.

Add wrapper macros that by default expand to the callback name.
Users can define this macro to add a prefix (e.g., mp_) to
callback implementations, to redirect or completely override
MicroPython's TinyUSB callbacks.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 shared/tinyusb/mp_usbd.c     |  2 +-
 shared/tinyusb/mp_usbd.h     | 16 ++++++++++++++++
 shared/tinyusb/mp_usbd_cdc.c |  6 +++---
 shared/tinyusb/mp_usbd_cdc.h |  4 +++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
index f03f7f7db419a..a21e5f027bbf0 100644
--- a/shared/tinyusb/mp_usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -44,7 +44,7 @@ void mp_usbd_task_callback(mp_sched_node_t *node) {
 #endif // !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
 
 // Schedule the TinyUSB task on demand, when there is a new USB device event
-TU_ATTR_FAST_FUNC void tud_event_hook_cb(uint8_t rhport, uint32_t eventid, bool in_isr) {
+TU_ATTR_FAST_FUNC void MICROPY_WRAP_TUD_EVENT_HOOK_CB(tud_event_hook_cb)(uint8_t rhport, uint32_t eventid, bool in_isr) {
     mp_usbd_schedule_task();
     mp_hal_wake_main_task_from_isr();
 }
diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index b4655553673a9..b482ec4306ec2 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -29,6 +29,22 @@
 
 #include "py/mpconfig.h"
 
+#ifndef MICROPY_WRAP_TUD_SOF_CB
+#define MICROPY_WRAP_TUD_SOF_CB(name) name
+#endif
+
+#ifndef MICROPY_WRAP_TUD_CDC_RX_CB
+#define MICROPY_WRAP_TUD_CDC_RX_CB(name) name
+#endif
+
+#ifndef MICROPY_WRAP_TUD_CDC_LINE_STATE_CB
+#define MICROPY_WRAP_TUD_CDC_LINE_STATE_CB(name) name
+#endif
+
+#ifndef MICROPY_WRAP_TUD_EVENT_HOOK_CB
+#define MICROPY_WRAP_TUD_EVENT_HOOK_CB(name) name
+#endif
+
 #if MICROPY_HW_ENABLE_USBDEV
 
 #include "py/obj.h"
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
index 9b380acefc060..961bdf89896ff 100644
--- a/shared/tinyusb/mp_usbd_cdc.c
+++ b/shared/tinyusb/mp_usbd_cdc.c
@@ -68,7 +68,7 @@ uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags) {
     return ret;
 }
 
-void tud_cdc_rx_cb(uint8_t itf) {
+void MICROPY_WRAP_TUD_CDC_RX_CB(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);
@@ -141,7 +141,7 @@ mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len) {
     return i;
 }
 
-void tud_sof_cb(uint32_t frame_count) {
+void MICROPY_WRAP_TUD_SOF_CB(tud_sof_cb)(uint32_t frame_count) {
     if (--cdc_connected_flush_delay < 0) {
         // Finished on-connection delay, disable SOF interrupt again.
         tud_sof_cb_enable(false);
@@ -172,7 +172,7 @@ static struct {
 } prev_line_state = {0};
 #endif
 
-void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
+void MICROPY_WRAP_TUD_CDC_LINE_STATE_CB(tud_cdc_line_state_cb)(uint8_t itf, bool dtr, bool rts) {
     #if MICROPY_HW_USB_CDC && !MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC
     if (dtr) {
         // A host application has started to open the cdc serial port.
diff --git a/shared/tinyusb/mp_usbd_cdc.h b/shared/tinyusb/mp_usbd_cdc.h
index 8d37a77315dcc..6d653a1d09b4f 100644
--- a/shared/tinyusb/mp_usbd_cdc.h
+++ b/shared/tinyusb/mp_usbd_cdc.h
@@ -27,6 +27,8 @@
 #ifndef MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H
 #define MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H
 
+#include "mp_usbd.h"
+
 #ifndef MICROPY_HW_USB_CDC_TX_TIMEOUT
 #define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 #endif
@@ -38,7 +40,7 @@
 #endif
 
 uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags);
-void tud_cdc_rx_cb(uint8_t itf);
+void MICROPY_WRAP_TUD_CDC_RX_CB(tud_cdc_rx_cb)(uint8_t itf);
 mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len);
 
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H

From c9af4e1a7e4820bd6702902b415a9a89942d2844 Mon Sep 17 00:00:00 2001
From: Anson Mansfield <amansfield@mantaro.com>
Date: Sun, 9 Nov 2025 13:16:07 -0500
Subject: [PATCH 3103/3129] tools/mpy-tool.py: Add Compiler Explorer JSON
 output.

This commit adds a `--json` option to `mpy-tool.py`, in order to generate
Compiler-Explorer-compatible JSON annotation information for the bytecode
disassembly. Some of this information might be theoretically possible to
parse out from the text itself, but not all of it is, e.g. disambiguating
child references with non-unique simple names.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
---
 tools/mpy-tool.py | 296 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 280 insertions(+), 16 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 8fab1c969757a..67e2cbf159c57 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -24,6 +24,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+import io
 import struct
 import sys
 from binascii import hexlify
@@ -302,6 +303,25 @@ class Opcode:
         MP_BC_POP_JUMP_IF_TRUE,
         MP_BC_POP_JUMP_IF_FALSE,
     )
+    ALL_OFFSET = (
+        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,
+        MP_BC_SETUP_WITH,
+        MP_BC_SETUP_EXCEPT,
+        MP_BC_SETUP_FINALLY,
+        MP_BC_POP_EXCEPT_JUMP,
+        MP_BC_FOR_ITER,
+    )
+    ALL_WITH_CHILD = (
+        MP_BC_MAKE_FUNCTION,
+        MP_BC_MAKE_FUNCTION_DEFARGS,
+        MP_BC_MAKE_CLOSURE,
+        MP_BC_MAKE_CLOSURE_DEFARGS,
+    )
 
     # Create a dict mapping opcode value to opcode name.
     mapping = ["unknown" for _ in range(256)]
@@ -896,7 +916,7 @@ def __init__(self, parent_name, qstr_table, fun_data, prelude_offset, code_kind)
         self.escaped_name = unique_escaped_name
 
     def disassemble_children(self):
-        print("  children:", [rc.simple_name.str for rc in self.children])
+        self.print_children_annotated()
         for rc in self.children:
             rc.disassemble()
 
@@ -985,6 +1005,75 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
         raw_code_count += 1
         raw_code_content += 4 * 4
 
+    @staticmethod
+    def decode_lineinfo(line_info: memoryview) -> "tuple[int, int, memoryview]":
+        c = line_info[0]
+        if (c & 0x80) == 0:
+            # 0b0LLBBBBB encoding
+            return (c & 0x1F), (c >> 5), line_info[1:]
+        else:
+            # 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte)
+            return (c & 0xF), (((c << 4) & 0x700) | line_info[1]), line_info[2:]
+
+    def get_source_annotation(self, ip: int, file=None) -> dict:
+        bc_offset = ip - self.offset_opcodes
+        try:
+            line_info = memoryview(self.fun_data)[self.offset_line_info : self.offset_opcodes]
+        except AttributeError:
+            return {"file": file, "line": None}
+
+        source_line = 1
+        while line_info:
+            bc_increment, line_increment, line_info = self.decode_lineinfo(line_info)
+            if bc_offset >= bc_increment:
+                bc_offset -= bc_increment
+                source_line += line_increment
+            else:
+                break
+
+        return {"file": file, "line": source_line}
+
+    def get_label(self, ip: "int | None" = None, child_num: "int | None" = None) -> str:
+        if ip is not None:
+            assert child_num is None
+            return "%s.%d" % (self.escaped_name, ip)
+        elif child_num is not None:
+            return "%s.child%d" % (self.escaped_name, child_num)
+        else:
+            return "%s" % self.escaped_name
+
+    def print_children_annotated(self) -> None:
+        """
+        Equivalent to `print("  children:", [child.simple_name.str for child in self.children])`,
+        but also includes json markers for the start and end of each one's name in that line.
+        """
+
+        labels = ["%s.children" % self.escaped_name]
+        annotation_labels = []
+        output = io.StringIO()
+        output.write("  children: [")
+        sep = ", "
+        for i, child in enumerate(self.children):
+            if i != 0:
+                output.write(sep)
+            start_col = output.tell() + 1
+            output.write(child.simple_name.str)
+            end_col = output.tell() + 1
+            labels.append(self.get_label(child_num=i))
+            annotation_labels.append(
+                {
+                    "name": self.get_label(child_num=i),
+                    "target": child.get_label(),
+                    "range": {
+                        "startCol": start_col,
+                        "endCol": end_col,
+                    },
+                },
+            )
+        output.write("]")
+
+        print(output.getvalue(), annotations={"labels": annotation_labels}, labels=labels)
+
 
 class RawCodeBytecode(RawCode):
     def __init__(self, parent_name, qstr_table, obj_table, fun_data):
@@ -993,9 +1082,58 @@ def __init__(self, parent_name, qstr_table, obj_table, fun_data):
             parent_name, qstr_table, fun_data, 0, MP_CODE_BYTECODE
         )
 
+    def get_opcode_annotations_labels(
+        self, opcode: int, ip: int, arg: int, sz: int, arg_pos: int, arg_len: int
+    ) -> "tuple[dict, list[str]]":
+        annotations = {
+            "source": self.get_source_annotation(ip),
+            "disassembly": Opcode.mapping[opcode],
+        }
+        labels = [self.get_label(ip)]
+
+        if opcode in Opcode.ALL_OFFSET:
+            annotations["link"] = {
+                "offset": arg_pos,
+                "length": arg_len,
+                "to": ip + arg + sz,
+            }
+            annotations["labels"] = [
+                {
+                    "name": self.get_label(ip),
+                    "target": self.get_label(ip + arg + sz),
+                    "range": {
+                        "startCol": arg_pos + 1,
+                        "endCol": arg_pos + arg_len + 1,
+                    },
+                },
+            ]
+
+        elif opcode in Opcode.ALL_WITH_CHILD:
+            try:
+                child = self.children[arg]
+            except IndexError:
+                # link out-of-range child to the child array itself
+                target = "%s.children" % self.escaped_name
+            else:
+                # link resolvable child to the actual child
+                target = child.get_label()
+
+            annotations["labels"] = [
+                {
+                    "name": self.get_label(ip),
+                    "target": target,
+                    "range": {
+                        "startCol": arg_pos + 1,
+                        "endCol": arg_pos + arg_len + 1,
+                    },
+                },
+            ]
+
+        return annotations, labels
+
     def disassemble(self):
         bc = self.fun_data
-        print("simple_name:", self.simple_name.str)
+        print("simple_name:", self.simple_name.str, labels=[self.get_label()])
         print("  raw bytecode:", len(bc), hexlify_to_str(bc))
         print("  prelude:", self.prelude_signature)
         print("  args:", [self.qstr_table[i].str for i in self.names[1:]])
@@ -1011,9 +1149,22 @@ def disassemble(self):
                 pass
             else:
                 arg = ""
-            print(
-                "  %-11s %s %s" % (hexlify_to_str(bc[ip : ip + sz]), Opcode.mapping[bc[ip]], arg)
+
+            pre_arg_part = "  %-11s %s" % (
+                hexlify_to_str(bc[ip : ip + sz]),
+                Opcode.mapping[bc[ip]],
+            )
+            arg_part = "%s" % arg
+            annotations, labels = self.get_opcode_annotations_labels(
+                opcode=bc[ip],
+                ip=ip,
+                arg=arg,
+                sz=sz,
+                arg_pos=len(pre_arg_part) + 1,
+                arg_len=len(arg_part),
             )
+
+            print(pre_arg_part, arg_part, annotations=annotations, labels=labels)
             ip += sz
         self.disassemble_children()
 
@@ -1114,7 +1265,7 @@ def __init__(
 
     def disassemble(self):
         fun_data = self.fun_data
-        print("simple_name:", self.simple_name.str)
+        print("simple_name:", self.simple_name.str, labels=[self.get_label()])
         print(
             "  raw data:",
             len(fun_data),
@@ -1833,6 +1984,100 @@ def extract_segments(compiled_modules, basename, kinds_arg):
                 output.write(source.read(segment.end - segment.start))
 
 
+class PrintShim:
+    """Base class for interposing extra functionality onto the global `print` method."""
+
+    def __init__(self):
+        self.wrapped_print = None
+
+    def __enter__(self):
+        global print
+
+        if self.wrapped_print is not None:
+            raise RecursionError
+
+        self.wrapped_print = print
+        print = self
+
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        global print
+
+        if self.wrapped_print is None:
+            return
+
+        print = self.wrapped_print
+        self.wrapped_print = None
+
+        self.on_exit()
+
+    def on_exit(self):
+        pass
+
+    def __call__(self, *a, **k):
+        return self.wrapped_print(*a, **k)
+
+
+class PrintIgnoreExtraArgs(PrintShim):
+    """Just strip the `annotations` and `labels` kwargs and pass down to the underlying print."""
+
+    def __call__(self, *a, annotations: dict = {}, labels: "list[str]" = (), **k):
+        return super().__call__(*a, **k)
+
+
+class PrintJson(PrintShim):
+    """Output lines as godbolt-compatible JSON with extra annotation info from `annotations` and `labels`, rather than plain text."""
+
+    def __init__(self, fp=sys.stdout, language_id: str = "mpy"):
+        super().__init__()
+        self.fp = fp
+        self.asm = {
+            "asm": [],
+            "labelDefinitions": {},
+            "languageId": language_id,
+        }
+        self.line_number: int = 0
+        self.buf: "io.StringIO | None" = None
+
+    def on_exit(self):
+        import json
+
+        if self.buf is not None:
+            # flush last partial line
+            self.__call__()
+
+        json.dump(self.asm, self.fp)
+
+    def __call__(self, *a, annotations: dict = {}, labels: "list[str]" = (), **k):
+        # ignore prints directed to an explicit output
+        if "file" in k:
+            return super().__call__(*a, **k)
+
+        if self.buf is None:
+            self.buf = io.StringIO()
+
+        super().__call__(*a, file=sys.stderr, **k)
+
+        if "end" in k:
+            # buffer partial-line prints to collect into a single AsmResultLine
+            return super().__call__(*a, file=self.buf, **k)
+        else:
+            retval = super().__call__(*a, file=self.buf, end="", **k)
+            output = self.buf.getvalue()
+            self.buf = None
+
+        asm_line = {"text": output}
+        asm_line.update(annotations)
+        self.asm["asm"].append(asm_line)
+
+        self.line_number += 1
+        for label in labels:
+            self.asm["labelDefinitions"][label] = self.line_number
+
+        return retval
+
+
 def main(args=None):
     global global_qstrs
 
@@ -1846,6 +2091,12 @@ def main(args=None):
         "-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(
+        "-j",
+        "--json",
+        action="store_true",
+        help="output hexdump, disassembly, and frozen code as JSON with extra metadata",
+    )
     cmd_parser.add_argument(
         "--merge", action="store_true", help="merge multiple .mpy files into one"
     )
@@ -1913,20 +2164,33 @@ def main(args=None):
         print(er, file=sys.stderr)
         sys.exit(1)
 
-    if args.hexdump:
-        hexdump_mpy(compiled_modules)
+    if args.json:
+        if args.freeze:
+            print_shim = PrintJson(sys.stdout, language_id="c")
+        elif args.hexdump:
+            print_shim = PrintJson(sys.stdout, language_id="stderr")
+        elif args.disassemble:
+            print_shim = PrintJson(sys.stdout, language_id="mpy")
+        else:
+            print_shim = PrintJson(sys.stdout)
+    else:
+        print_shim = PrintIgnoreExtraArgs()
 
-    if args.disassemble:
+    with print_shim:
         if args.hexdump:
-            print()
-        disassemble_mpy(compiled_modules)
+            hexdump_mpy(compiled_modules)
 
-    if args.freeze:
-        try:
-            freeze_mpy(firmware_qstr_idents, compiled_modules)
-        except FreezeError as er:
-            print(er, file=sys.stderr)
-            sys.exit(1)
+        if args.disassemble:
+            if args.hexdump:
+                print()
+            disassemble_mpy(compiled_modules)
+
+        if args.freeze:
+            try:
+                freeze_mpy(firmware_qstr_idents, compiled_modules)
+            except FreezeError as er:
+                print(er, file=sys.stderr)
+                sys.exit(1)
 
     if args.merge:
         merge_mpy(compiled_modules, args.output)

From 25dde8397fc26321bebf24a70cee0ce85de8e3cf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Nov 2025 16:12:03 +1100
Subject: [PATCH 3104/3129] nrf/drivers/usb: Provide macros for nrf errata.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/drivers/usb/tusb_config.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/nrf/drivers/usb/tusb_config.h b/ports/nrf/drivers/usb/tusb_config.h
index 935d9c2291376..231fe2b86c119 100644
--- a/ports/nrf/drivers/usb/tusb_config.h
+++ b/ports/nrf/drivers/usb/tusb_config.h
@@ -31,4 +31,11 @@
 // Device configuration
 #define CFG_TUSB_MCU                OPT_MCU_NRF5X
 
+// TinyUSB uses newer style errata functions, but we currently don't have the
+// latest nrfx component.  So provide macros mapping the new name to the old.
+#include "nrfx_usbd_errata.h"
+#define nrf52_errata_166 nrfx_usbd_errata_166
+#define nrf52_errata_171 nrfx_usbd_errata_171
+#define nrf52_errata_187 nrfx_usbd_errata_187
+
 #endif // MICROPY_INCLUDED_NRF_TUSB_CONFIG_H

From 7059e0769e5b53ae838ec4988ed70b246cc2b2fb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Nov 2025 14:22:23 +1100
Subject: [PATCH 3105/3129] lib/tinyusb: Update to version 0.19.0-24.

This is 0.19.0 plus the following changes:
- remove obsolete dcd_esp32sx
- fix for HID stylus descriptor and HID example
- typos, docs and generator scripts
- MTP fix
- DWC2 enumeration when EP0 size=8
- DWC2 fix for EP0 IN
- stm32 FSDEV IRQ remapping fix
- DWC2 ZLP fix

The reason we need the extra 24 commits is due to a bug with TinyUSB's
handling of zero-length-packets in the DWC2 (Synopsis) backend, which
affects the stm32 port.  That's fixed by
https://github.com/hathach/tinyusb/pull/3293

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 86ad6e56c1700..aa0fc2e08f1c2 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 86ad6e56c1700e85f1c5678607a762cfe3aa2f47
+Subproject commit aa0fc2e08f1c2dd6f026a431e8989357fbb4c5bf

From 207562dfab728211a59503eccec924e68a2b233f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Nov 2025 15:18:07 +1100
Subject: [PATCH 3106/3129] shared/tinyusb: Remove macro guard for
 tx_overwritabe_if_not_connected.

It's now available in the version of TinyUSB used by this repository.

Also, update to the newer `tud_cdc_configure_t` struct name and newer
`tud_cdc_configure()` function name.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/tinyusb/mp_usbd.h | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index b482ec4306ec2..311575b3ad8ba 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -61,19 +61,12 @@
 static inline void mp_usbd_init_tud(void) {
     tusb_init();
     #if MICROPY_HW_USB_CDC
-    tud_cdc_configure_fifo_t cfg = { .rx_persistent = 0,
-                                     .tx_persistent = 1,
-
-                                     // This config flag is unreleased in TinyUSB >v0.18.0
-                                     // but included in Espressif's TinyUSB component since v0.18.0~3
-                                     //
-                                     // Versioning issue reported as
-                                     // https://github.com/espressif/esp-usb/issues/236
-                                     #if TUSB_VERSION_NUMBER > 1800 || defined(ESP_PLATFORM)
-                                     .tx_overwritabe_if_not_connected = 1,
-                                     #endif
+    tud_cdc_configure_t cfg = {
+        .rx_persistent = 0,
+        .tx_persistent = 1,
+        .tx_overwritabe_if_not_connected = 1,
     };
-    tud_cdc_configure_fifo(&cfg);
+    tud_cdc_configure(&cfg);
     #endif
 }
 

From be8d5fc27b30ade25bdd272368fd8b91e4d4b338 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 29 Jul 2025 10:23:31 +1000
Subject: [PATCH 3107/3129] esp32/README: Update the README details to account
 for newer chips.

Noted while adding C2 support that some of these comments are a bit out of
date. Spun out to its own commit, and also mention C5 as well.

This change also adds some recommendation on which ESP32 board to pick, as
we occasionally see issues or questions that would be non-issues on a board
with more RAM (and for small production or personal projects the savings of
picking a cheaper ESP32 chip are basically neglible).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/README.md | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 5a2bb9240d932..55964febeaff4 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -5,16 +5,17 @@ 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.
 
-Currently supports ESP32, ESP32-C2 (aka ESP8684), ESP32-C3, ESP32-C6, ESP32-S2
-and ESP32-S3 (ESP8266 is supported by a separate MicroPython port).
+Currently supports ESP32, ESP32-C2 (aka ESP8684), ESP32-C3, ESP32-C5, ESP32-C6,
+ESP32-S2 and ESP32-S3. ESP8266 is supported by a separate MicroPython port.
 
 Supported features include:
-- REPL (Python prompt) over UART0.
-- 16k stack for the MicroPython task and approximately 100k Python heap.
+- REPL (Python prompt) over UART0 and/or the integrated USB peripheral.
 - 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.
-- Internal filesystem using the flash (currently 2M in size).
+- Internal filesystem using the remaining flash area.
+- Threading support via the _thread module (built on native FreeRTOS tasks),
+  with GIL enabled.
 - The machine module with GPIO, UART, SPI, software I2C, ADC, DAC, PWM,
   TouchPad, WDT and Timer.
 - The network module with WLAN (WiFi) support.
@@ -22,6 +23,26 @@ Supported features include:
 
 Initial development of this ESP32 port was sponsored in part by Microbric Pty Ltd.
 
+Choosing a suitable chip
+------------------------
+
+ESP32 chips are not all the same. The different ESP32 families have different
+capabilities and resources available. In particular, the ESP32-C2 and ESP32-S2
+(without external SPIRAM) have the least RAM. They can still run MicroPython
+well but may run out of RAM if a program uses a lot of resources, eg if it
+needs many complex code modules, multiple TLS connections, large memory
+buffers for a display, etc.
+
+ESP32 boards with external "SPIRAM" (also called PSRAM) have megabytes of RAM
+available - significantly more than any board without external SPIRAM. SPIRAM is
+supported on original ESP32, ESP32-S2 and ESP32-S3 chips. Not every ESP32 board
+has SPIRAM included, even if the chip supports it.
+
+If you don't need particular hardware features but are looking for a board with
+the usual Wi-Fi and BLE support, many peripherals and plenty of RAM then
+recommend finding a board based on ESP32-S3 with SPIRAM included (usually 2MB,
+4MB or 8MB).
+
 Setting up ESP-IDF and the build environment
 --------------------------------------------
 

From de2ace72e943c8b38d77b7d68e8fe73e48459f76 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 19 Nov 2025 17:59:25 +1100
Subject: [PATCH 3108/3129] esp32/modespnow: Fix espnow rate setting.

Only set the rate on interfaces that are active.

It seems ESP-IDF 5.4.x or so added checks that the interface is enabled,
whereas previous versions silently did nothing.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/esp32/modespnow.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index ab50032ffeb51..5d048f6b2c7d7 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -187,6 +187,16 @@ static void send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t st
 
 static void recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *msg, int msg_len);
 
+// Return the current wifi mode, or raise ValueError
+static wifi_mode_t get_wifi_mode(void) {
+    wifi_mode_t mode;
+    if (esp_wifi_get_mode(&mode) != ESP_OK || mode == WIFI_MODE_NULL) {
+        // network.WLAN STA or AP must be set active(True) before ESP-NOW can be used
+        mp_raise_OSError(MP_ENOENT);
+    }
+    return mode;
+}
+
 // ESPNow.init(): Initialise the data buffers and ESP-NOW functions.
 // Initialise the Espressif ESPNOW software stack, register callbacks and
 // allocate the recv data buffers.
@@ -197,7 +207,6 @@ static mp_obj_t espnow_init(mp_obj_t _) {
         self->recv_buffer = m_new_obj(ringbuf_t);
         ringbuf_alloc(self->recv_buffer, self->recv_buffer_size);
 
-        esp_initialise_wifi();  // Call the wifi init code in network_wlan.c
         check_esp_err(esp_now_init());
         check_esp_err(esp_now_register_recv_cb(recv_cb));
         check_esp_err(esp_now_register_send_cb(send_cb));
@@ -260,9 +269,13 @@ static mp_obj_t espnow_config(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         self->recv_timeout_ms = args[ARG_timeout_ms].u_int;
     }
     if (args[ARG_rate].u_int >= 0) {
-        esp_initialise_wifi();  // Call the wifi init code in network_wlan.c
-        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, args[ARG_rate].u_int));
-        check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, args[ARG_rate].u_int));
+        wifi_mode_t mode = get_wifi_mode();
+        if (mode == WIFI_MODE_STA || mode == WIFI_MODE_APSTA) {
+            check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_STA, args[ARG_rate].u_int));
+        }
+        if (mode == WIFI_MODE_AP || mode == WIFI_MODE_APSTA) {
+            check_esp_err(esp_wifi_config_espnow_rate(ESP_IF_WIFI_AP, args[ARG_rate].u_int));
+        }
     }
     if (args[ARG_get].u_obj == MP_OBJ_NULL) {
         return mp_const_none;

From 7e10d22134dabf41e2208aea292774c852d95d13 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 20 Nov 2025 12:52:56 +1100
Subject: [PATCH 3109/3129] esp32,docs: Add constants and documentation for
 espnow data rates.

Changes are:
- Add constants for some of the supported ESP-NOW data rates.
- Add constants for switching an ESP32 WLAN radio in/out of
  Long Range mode.
- Document the new constants and their usage.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/espnow.rst       | 49 ++++++++++++++++++++++++++++++++---
 docs/library/network.WLAN.rst | 32 +++++++++++++++++++++++
 ports/esp32/modespnow.c       | 16 ++++++++++++
 ports/esp32/network_wlan.c    | 14 ++++++++++
 4 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/docs/library/espnow.rst b/docs/library/espnow.rst
index 84e9e9465de96..4b4b058f87a89 100644
--- a/docs/library/espnow.rst
+++ b/docs/library/espnow.rst
@@ -164,13 +164,15 @@ Configuration
         wait forever. The timeout can also be provided as arg to
         `recv()`/`irecv()`/`recvinto()`.
 
-        *rate*: (ESP32 only) Set the transmission speed for
-        ESPNow packets. Must be set to a number from the allowed numeric values
-        in `enum wifi_phy_rate_t
-        <https://docs.espressif.com/projects/esp-idf/en/v5.2.3/esp32/
+        *rate*: (ESP32 only) Set the transmission data rate for ESPNow packets.
+        The default setting is `espnow.RATE_1M`. It's recommended to use one of
+        the other ``espnow.RATE_nnn`` constants to set this, but it's also
+        possible to pass an integer corresponding to the `enum wifi_phy_rate_t
+        <https://docs.espressif.com/projects/esp-idf/en/v5.5.1/esp32/
         api-reference/network/esp_wifi.html#_CPPv415wifi_phy_rate_t>`_. This
         parameter is actually *write-only* due to ESP-IDF not providing any
         means for querying the radio interface's rate parameter.
+        See also `espnow-long-range`.
 
     .. data:: Returns:
 
@@ -574,6 +576,45 @@ Constants
           espnow.MAX_TOTAL_PEER_NUM(=20)
           espnow.MAX_ENCRYPT_PEER_NUM(=6)
 
+The following constants correspond to different transmit data rates on ESP32
+only. Lower data rates are generally more reliable over long distances:
+
+.. data:: espnow.RATE_LORA_250K
+          espnow.RATE_LORA_500K
+
+             See  `espnow-long-range`.
+
+.. data:: espnow.RATE_1M
+          espnow.RATE_2M
+          espnow.RATE_5M
+          espnow.RATE_6M
+          espnow.RATE_11M
+          espnow.RATE_12M
+          espnow.RATE_24M
+          espnow.RATE_54M
+
+Unless using the two proprietary long range data rates, only the sender must
+configure the data rate.
+
+.. _espnow-long-range:
+
+Long Range Mode
+---------------
+
+(ESP32 Only, except ESP32-C2)
+
+To use the `espnow.RATE_LORA_250K` and `espnow.RATE_LORA_500K` data rates,
+first set the `WLAN` interface object to long-range mode, i.e.::
+
+  import network, espnow
+  sta = network.WLAN(network.WLAN.IF_STA)
+  sta.active(True)
+  sta.config(channel=6, protocol=WLAN.PROTOCOL_LR)  # Set on sender & receiver
+  e = espnow.ESPNow()
+  e.config(rate=espnow.RATE_LORA_250K)  # Needed on sender only
+
+For more information about the limitations of long-range mode, see `WLAN.PROTOCOL_LR`.
+
 Exceptions
 ----------
 
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index ee0ef490fda84..27d6b383a36a6 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -145,6 +145,7 @@ Methods
    reconnects     Number of reconnect attempts to make (integer, 0=none, -1=unlimited)
    txpower        Maximum transmit power in dBm (integer or float)
    pm             WiFi Power Management setting (see below for allowed values)
+   protocol       (ESP32 Only.) WiFi Low level 802.11 protocol. See `WLAN.PROTOCOL_DEFAULTS`.
    =============  ===========
 
 Constants
@@ -161,3 +162,34 @@ Constants
         * ``PM_POWERSAVE``: enable WiFi power management with additional power
           savings and reduced WiFi performance
         * ``PM_NONE``: disable wifi power management
+
+
+ESP32 Protocol Constants
+------------------------
+
+The following ESP32-only constants relate to the ``WLAN.config(protocol=...)``
+network interface parameter:
+
+.. data:: WLAN.PROTOCOL_DEFAULTS
+
+      A bitmap representing all of the default 802.11 Wi-Fi modes supported by
+      the chip. Consult `ESP-IDF Wi-Fi Protocols`_ documentation for details.
+
+.. data:: WLAN.PROTOCOL_LR
+
+      This value corresponds to the `Espressif proprietary "long-range" mode`_,
+      which is not compatible with standard Wi-Fi devices. By setting this
+      protocol it's possible for an ESP32 STA in long-range mode to connect to
+      an ESP32 AP in long-range mode, or to use `ESP-NOW long range modes
+      <espnow-long-range>`.
+
+      This mode can be bitwise ORed with some standard 802.11 protocol bits
+      (including `WLAN.PROTOCOL_DEFAULTS`) in order to support a mix of standard
+      Wi-Fi modes as well as LR mode, consult the `Espressif long-range
+      documentation`_ for more details.
+
+      Long range mode is not supported on ESP32-C2.
+
+.. _ESP-IDF Wi-Fi Protocols: https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/wifi.html#wi-fi-protocol-mode
+.. _Espressif proprietary "long-range" mode:
+.. _Espressif long-range documentation: https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/wifi.html#long-range-lr
diff --git a/ports/esp32/modespnow.c b/ports/esp32/modespnow.c
index 5d048f6b2c7d7..725374ea77c55 100644
--- a/ports/esp32/modespnow.c
+++ b/ports/esp32/modespnow.c
@@ -817,6 +817,22 @@ static const mp_rom_map_elem_t espnow_globals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_KEY_LEN), MP_ROM_INT(ESP_NOW_KEY_LEN)},
     { MP_ROM_QSTR(MP_QSTR_MAX_TOTAL_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_TOTAL_PEER_NUM)},
     { MP_ROM_QSTR(MP_QSTR_MAX_ENCRYPT_PEER_NUM), MP_ROM_INT(ESP_NOW_MAX_ENCRYPT_PEER_NUM)},
+
+    #if !CONFIG_IDF_TARGET_ESP32C2
+    { MP_ROM_QSTR(MP_QSTR_RATE_LORA_250K), MP_ROM_INT(WIFI_PHY_RATE_LORA_250K)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_LORA_500K), MP_ROM_INT(WIFI_PHY_RATE_LORA_500K)},
+    #endif
+    // Note: specifying long preamble versions for the lower bit rates apart
+    // from the non-802.11b 6Mbit rate, for more robust error correction
+    { MP_ROM_QSTR(MP_QSTR_RATE_1M), MP_ROM_INT(WIFI_PHY_RATE_1M_L)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_2M), MP_ROM_INT(WIFI_PHY_RATE_2M_L)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_5M), MP_ROM_INT(WIFI_PHY_RATE_5M_L)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_6M), MP_ROM_INT(WIFI_PHY_RATE_6M)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_11M), MP_ROM_INT(WIFI_PHY_RATE_11M_L)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_12M), MP_ROM_INT(WIFI_PHY_RATE_12M)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_24M), MP_ROM_INT(WIFI_PHY_RATE_24M)},
+    { MP_ROM_QSTR(MP_QSTR_RATE_54M), MP_ROM_INT(WIFI_PHY_RATE_54M)},
+
 };
 static MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
 
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index e20af4806c43d..07b16e91cb941 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -79,6 +79,15 @@ static bool mdns_initialised = false;
 static uint8_t conf_wifi_sta_reconnects = 0;
 static uint8_t wifi_sta_reconnects;
 
+// The rules for this default are defined in the documentation of esp_wifi_set_protocol()
+// rather than in code, so we have to recreate them here.
+#if CONFIG_SOC_WIFI_HE_SUPPORT
+// Note: No Explicit support for 5GHz here, yet
+#define WIFI_PROTOCOL_DEFAULT (WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N | WIFI_PROTOCOL_11AX)
+#else
+#define WIFI_PROTOCOL_DEFAULT (WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N)
+#endif
+
 // 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 void network_wlan_wifi_event_handler(void *event_handler_arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
@@ -771,6 +780,11 @@ static const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SEC_WPA_ENT), MP_ROM_INT(WIFI_AUTH_WPA_ENTERPRISE) },
     #endif
 
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_DEFAULT), MP_ROM_INT(WIFI_PROTOCOL_DEFAULT) },
+    #if !CONFIG_IDF_TARGET_ESP32C2
+    { MP_ROM_QSTR(MP_QSTR_PROTOCOL_LR), MP_ROM_INT(WIFI_PROTOCOL_LR) },
+    #endif
+
     { MP_ROM_QSTR(MP_QSTR_PM_NONE), MP_ROM_INT(WIFI_PS_NONE) },
     { MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(WIFI_PS_MIN_MODEM) },
     { MP_ROM_QSTR(MP_QSTR_PM_POWERSAVE), MP_ROM_INT(WIFI_PS_MAX_MODEM) },

From 938e2c0f2b79c983202cbeccd0bc91e13eff13d2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 20 Nov 2025 13:01:42 +1100
Subject: [PATCH 3110/3129] tests/multi_espnow: Add test case for espnow rate
 changes.

Uses constants added in previous commit.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 docs/library/espnow.rst           |  2 +-
 tests/multi_espnow/75_rate.py     | 92 +++++++++++++++++++++++++++++++
 tests/multi_espnow/75_rate.py.exp | 31 +++++++++++
 3 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 tests/multi_espnow/75_rate.py
 create mode 100644 tests/multi_espnow/75_rate.py.exp

diff --git a/docs/library/espnow.rst b/docs/library/espnow.rst
index 4b4b058f87a89..14a92c11400b9 100644
--- a/docs/library/espnow.rst
+++ b/docs/library/espnow.rst
@@ -172,7 +172,7 @@ Configuration
         api-reference/network/esp_wifi.html#_CPPv415wifi_phy_rate_t>`_. This
         parameter is actually *write-only* due to ESP-IDF not providing any
         means for querying the radio interface's rate parameter.
-        See also `espnow-long-range`.
+        See also `espnow-long-range`. This API currently doesn't work on ESP32-C6.
 
     .. data:: Returns:
 
diff --git a/tests/multi_espnow/75_rate.py b/tests/multi_espnow/75_rate.py
new file mode 100644
index 0000000000000..9c05a24bd0098
--- /dev/null
+++ b/tests/multi_espnow/75_rate.py
@@ -0,0 +1,92 @@
+# Test configuring transmit rates for ESP-NOW on ESP32
+
+import sys
+import time
+
+try:
+    import network
+    import espnow
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# ESP8266 doesn't support multiple ESP-NOW data rates
+if sys.platform == "esp8266":
+    print("SKIP")
+    raise SystemExit
+
+# Currently the config(rate=...) implementation is not compatible with ESP32-C6
+# (this test passes when C6 is receiver, but not if C6 is sender.)
+if "ESP32C6" in sys.implementation._machine:
+    print("SKIP")
+    raise SystemExit
+
+# ESP32-C2 doesn't support Long Range mode. This test is currently written assuming
+# LR mode can be enabled.
+if "ESP32C2" in sys.implementation._machine:
+    print("SKIP")
+    raise SystemExit
+
+
+timeout_ms = 1000
+default_pmk = b"MicroPyth0nRules"
+CHANNEL = 9
+
+
+def init_sta():
+    sta = network.WLAN(network.WLAN.IF_STA)
+    e = espnow.ESPNow()
+    e.active(True)
+    sta.active(True)
+    sta.disconnect()  # Force AP disconnect for any saved config, important so the channel doesn't change
+    sta.config(channel=CHANNEL)
+    e.set_pmk(default_pmk)
+    # Enable both default 802.11 modes and Long Range modes
+    sta.config(protocol=network.WLAN.PROTOCOL_LR | network.WLAN.PROTOCOL_DEFAULT)
+    return sta, e
+
+
+# Receiver
+def instance0():
+    sta, e = init_sta()
+    multitest.globals(PEER=sta.config("mac"))
+    multitest.next()
+    while True:
+        peer, msg = e.recv(timeout_ms)
+        if peer is None:
+            print("Timeout")
+            break
+        # Note that we don't have any way in Python to tell what data rate this message
+        # was received with, so we're assuming the rate was correct.
+        print(msg)
+    e.active(False)
+
+
+# Sender
+def instance1():
+    sta, e = init_sta()
+    multitest.next()
+    peer = PEER
+
+    e.add_peer(peer)
+    # Test normal, non-LR rates
+    for msg, rate in (
+        (b"default rate", None),
+        (b"5Mbit", espnow.RATE_5M),
+        (b"11Mbit", espnow.RATE_11M),
+        (b"24Mbit", espnow.RATE_24M),
+        (b"54Mbit", espnow.RATE_54M),
+        (b"250K LR", espnow.RATE_LORA_250K),
+        (b"500K LR", espnow.RATE_LORA_500K),
+        # switch back to non-LR rates to check it's all OK
+        (b"1Mbit again", espnow.RATE_1M),
+        (b"11Mbit again", espnow.RATE_11M),
+    ):
+        if rate is not None:
+            e.config(rate=rate)
+        for _ in range(3):
+            e.send(peer, msg)
+        time.sleep_ms(50)  # give messages some time to be received before continuing
+    e.del_peer(peer)
+
+    e.active(False)
diff --git a/tests/multi_espnow/75_rate.py.exp b/tests/multi_espnow/75_rate.py.exp
new file mode 100644
index 0000000000000..5a275ee6b28bc
--- /dev/null
+++ b/tests/multi_espnow/75_rate.py.exp
@@ -0,0 +1,31 @@
+--- instance0 ---
+b'default rate'
+b'default rate'
+b'default rate'
+b'5Mbit'
+b'5Mbit'
+b'5Mbit'
+b'11Mbit'
+b'11Mbit'
+b'11Mbit'
+b'24Mbit'
+b'24Mbit'
+b'24Mbit'
+b'54Mbit'
+b'54Mbit'
+b'54Mbit'
+b'250K LR'
+b'250K LR'
+b'250K LR'
+b'500K LR'
+b'500K LR'
+b'500K LR'
+b'1Mbit again'
+b'1Mbit again'
+b'1Mbit again'
+b'11Mbit again'
+b'11Mbit again'
+b'11Mbit again'
+Timeout
+--- instance1 ---
+

From c22ff43753c0679d375db32c9f8752558c8d7511 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 19:06:26 +0000
Subject: [PATCH 3111/3129] github/workflows: Bump actions/checkout from 5 to
 6.

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/biome.yml             |  2 +-
 .github/workflows/code_formatting.yml   |  2 +-
 .github/workflows/code_size.yml         |  2 +-
 .github/workflows/codespell.yml         |  2 +-
 .github/workflows/commit_formatting.yml |  2 +-
 .github/workflows/docs.yml              |  2 +-
 .github/workflows/examples.yml          |  2 +-
 .github/workflows/mpremote.yml          |  2 +-
 .github/workflows/mpy_format.yml        |  2 +-
 .github/workflows/ports.yml             |  2 +-
 .github/workflows/ports_alif.yml        |  2 +-
 .github/workflows/ports_cc3200.yml      |  2 +-
 .github/workflows/ports_esp32.yml       |  2 +-
 .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.yml        |  6 ++--
 .github/workflows/ports_renesas-ra.yml  |  2 +-
 .github/workflows/ports_rp2.yml         |  2 +-
 .github/workflows/ports_samd.yml        |  2 +-
 .github/workflows/ports_stm32.yml       |  2 +-
 .github/workflows/ports_unix.yml        | 40 ++++++++++++-------------
 .github/workflows/ports_webassembly.yml |  2 +-
 .github/workflows/ports_windows.yml     |  6 ++--
 .github/workflows/ports_zephyr.yml      |  2 +-
 .github/workflows/ruff.yml              |  2 +-
 27 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/biome.yml b/.github/workflows/biome.yml
index fea9c9c8bd7bc..0cde10acc9182 100644
--- a/.github/workflows/biome.yml
+++ b/.github/workflows/biome.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: Setup Biome
       uses: biomejs/setup-biome@v2
       with:
diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 8a18ca034540c..95653d941f91f 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -10,7 +10,7 @@ jobs:
   code-formatting:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
     - name: Install packages
       run: tools/ci.sh c_code_formatting_setup
diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index f82d1d0c73567..aed416767883d 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 100
     - name: Install packages
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 688134b42515c..c413a430a5b29 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -6,7 +6,7 @@ jobs:
   codespell:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     # codespell version should be kept in sync with .pre-commit-config.yml
     - run: pip install --user codespell==2.4.1 tomli
     - run: codespell
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index ca63fc796b0cc..6abc3612a0004 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 100
     - uses: actions/setup-python@v6
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index aa05cfb13873b..79755b741973f 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
     - name: Install Python packages
       run: pip install -r docs/requirements.txt
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index d16122b720b6c..4adeaae2e5e4b 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -18,7 +18,7 @@ jobs:
   embedding:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build
       run: make -C examples/embedding -f micropython_embed.mk && make -C examples/embedding
     - name: Run
diff --git a/.github/workflows/mpremote.yml b/.github/workflows/mpremote.yml
index 36904764c991b..5b9f1ff130a27 100644
--- a/.github/workflows/mpremote.yml
+++ b/.github/workflows/mpremote.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         # Setting this to zero means fetch all history and tags,
         # which hatch-vcs can use to discover the version tag.
diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index e692a853e7b2c..b51110db67762 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -17,7 +17,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh mpy_format_setup
     - name: Test mpy-tool.py
diff --git a/.github/workflows/ports.yml b/.github/workflows/ports.yml
index d4e89bd1aa924..5e71d4d076ae3 100644
--- a/.github/workflows/ports.yml
+++ b/.github/workflows/ports.yml
@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build ports download metadata
       run: mkdir boards && ./tools/autobuild/build-downloads.py . ./boards
diff --git a/.github/workflows/ports_alif.yml b/.github/workflows/ports_alif.yml
index eea8f53900ebc..6fb225937a90d 100644
--- a/.github/workflows/ports_alif.yml
+++ b/.github/workflows/ports_alif.yml
@@ -26,7 +26,7 @@ jobs:
           - alif_ae3_build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh alif_setup
     - name: Build ci_${{matrix.ci_func }}
diff --git a/.github/workflows/ports_cc3200.yml b/.github/workflows/ports_cc3200.yml
index c57309c23a6d0..194483ec218d1 100644
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh cc3200_setup
     - name: Build
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 578bf33af5b58..eea82126d4f29 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -32,7 +32,7 @@ jobs:
           - esp32_build_c2_c5_c6
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - id: idf_ver
       name: Read the ESP-IDF version (including Python version)
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index 96cf0c5a5cd3f..eb7f59cdc4900 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh esp8266_setup && tools/ci.sh esp8266_path >> $GITHUB_PATH
     - name: Build
diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
index bcbaf3de066c9..fd80f3f632925 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -24,7 +24,7 @@ jobs:
       run:
         working-directory: 'micropython repo'  # test build with space in path
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         path: 'micropython repo'
     - name: Install packages
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
index 995f65933e0b0..bec9a5dfb5b8f 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh nrf_setup
     - name: Build
diff --git a/.github/workflows/ports_powerpc.yml b/.github/workflows/ports_powerpc.yml
index 27417fb3c3cf2..a883d026806b5 100644
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh powerpc_setup
     - name: Build
diff --git a/.github/workflows/ports_qemu.yml b/.github/workflows/ports_qemu.yml
index b038b03e71fed..0ed95dbe5f93a 100644
--- a/.github/workflows/ports_qemu.yml
+++ b/.github/workflows/ports_qemu.yml
@@ -30,7 +30,7 @@ jobs:
           - thumb_hardfp
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh qemu_setup_arm
     - name: Build and run test suite ci_qemu_build_arm_${{ matrix.ci_func }}
@@ -42,7 +42,7 @@ jobs:
   build_and_test_rv32:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh qemu_setup_rv32
     - name: Build and run test suite
@@ -54,7 +54,7 @@ jobs:
   build_and_test_rv64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh qemu_setup_rv64
     - name: Build and run test suite
diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
index 600b8ea8046bd..920691eca70e1 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -21,7 +21,7 @@ jobs:
   build_renesas_ra_board:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh renesas_ra_setup
     - name: Build
diff --git a/.github/workflows/ports_rp2.yml b/.github/workflows/ports_rp2.yml
index 0837c06c97bd4..ea19e2da7ffc9 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -24,7 +24,7 @@ jobs:
       run:
         working-directory: 'micropython repo'  # test build with space in path
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         path: 'micropython repo'
     - name: Install packages
diff --git a/.github/workflows/ports_samd.yml b/.github/workflows/ports_samd.yml
index d159fde175d54..eb806ceb04400 100644
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh samd_setup
     - name: Build
diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index eae3bae871f45..45aa0c6130483 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -28,7 +28,7 @@ jobs:
           - stm32_misc_build
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh stm32_setup
     - name: Build ci_${{matrix.ci_func }}
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index deee7b265fcb7..19d6dcf85651e 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -23,7 +23,7 @@ jobs:
   minimal:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build
       run: tools/ci.sh unix_minimal_build
     - name: Run main test suite
@@ -35,7 +35,7 @@ jobs:
   reproducible:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build with reproducible date
       run: tools/ci.sh unix_minimal_build
       env:
@@ -46,7 +46,7 @@ jobs:
   standard:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build
       run: tools/ci.sh unix_standard_build
     - name: Run main test suite
@@ -58,7 +58,7 @@ jobs:
   standard_v2:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build
       run: tools/ci.sh unix_standard_v2_build
     - name: Run main test suite
@@ -70,7 +70,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
@@ -105,7 +105,7 @@ jobs:
   coverage_32bit:
     runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_32bit_setup
     - name: Build
@@ -123,7 +123,7 @@ jobs:
   nanbox:
     runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_32bit_setup
     - name: Build
@@ -137,7 +137,7 @@ jobs:
   longlong:
     runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_32bit_setup
     - name: Build
@@ -151,7 +151,7 @@ jobs:
   float:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build
       run: tools/ci.sh unix_float_build
     - name: Run main test suite
@@ -163,7 +163,7 @@ jobs:
   gil_enabled:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build
       run: tools/ci.sh unix_gil_enabled_build
     - name: Run main test suite
@@ -175,7 +175,7 @@ jobs:
   stackless_clang:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_clang_setup
     - name: Build
@@ -189,7 +189,7 @@ jobs:
   float_clang:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_clang_setup
     - name: Build
@@ -203,7 +203,7 @@ jobs:
   settrace_stackless:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
@@ -220,7 +220,7 @@ jobs:
   repr_b:
     runs-on: ubuntu-22.04 # use 22.04 to get libffi-dev:i386
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_32bit_setup
     - name: Build
@@ -234,7 +234,7 @@ jobs:
   macos:
     runs-on: macos-26
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
         python-version: '3.8'
@@ -250,7 +250,7 @@ jobs:
     # ubuntu-22.04 is needed for older libffi.
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_qemu_mips_setup
     - name: Build
@@ -265,7 +265,7 @@ jobs:
     # ubuntu-22.04 is needed for older libffi.
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_qemu_arm_setup
     - name: Build
@@ -280,7 +280,7 @@ jobs:
     # ubuntu-22.04 is needed for older libffi.
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh unix_qemu_riscv64_setup
     - name: Build
@@ -294,7 +294,7 @@ jobs:
   sanitize_address:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
@@ -319,7 +319,7 @@ jobs:
   sanitize_undefined:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       # Python 3.12 is the default for ubuntu-24.04, but that has compatibility issues with settrace tests.
       # Can remove this step when ubuntu-latest uses a more recent Python 3.x as the default.
diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index 6bfbb5aec6c8e..f6619cc8976df 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh webassembly_setup
     - name: Build
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index e4e0152d3e9da..793eba36a7b6b 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -59,7 +59,7 @@ jobs:
     - uses: microsoft/setup-msbuild@v2
       with:
         vs-version: ${{ matrix.vs_version }}
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build mpy-cross.exe
       run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
     - name: Update submodules
@@ -126,7 +126,7 @@ jobs:
           git
           diffutils
         path-type: inherit  # Remove when setup-python is removed
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Build mpy-cross.exe
       run: make -C mpy-cross -j2
     - name: Update submodules
@@ -144,7 +144,7 @@ jobs:
   cross-build-on-linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install packages
       run: tools/ci.sh windows_setup
     - name: Build
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index 3579f4e1bc90c..812f4cbf47ba2 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -37,7 +37,7 @@ jobs:
         docker-images: false
         tool-cache: true
         swap-storage: false
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - id: versions
       name: Read Zephyr version
       run: source tools/ci.sh && echo "ZEPHYR=$ZEPHYR_VERSION" | tee "$GITHUB_OUTPUT"
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 633b0cdf82ef4..6a8d4055a91b0 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -6,7 +6,7 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     # ruff version should be kept in sync with .pre-commit-config.yaml & also micropython-lib
     - run: pipx install ruff==0.11.6
     - run: ruff check --output-format=github .

From d1caa9df07d07a9c2897d106fe5fb7f4b595203e Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.t.tran@gmail.com>
Date: Fri, 21 Nov 2025 21:37:05 -0800
Subject: [PATCH 3112/3129] unix/modsocket: Add IP ADD and DROP MEMBERSHIP to
 socket constants.

Add the IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP to modsocket in the Unix
port so that the directives take on the values defined in the system
headers. This is needed because the values of these directives are
different for MacOS vs other Unix systems.

Fixes issue #8456.

Signed-off-by: Alex Tran <alex.t.tran@gmail.com>
---
 ports/unix/modsocket.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/unix/modsocket.c b/ports/unix/modsocket.c
index e7f25cdd43db7..660ace79b52ce 100644
--- a/ports/unix/modsocket.c
+++ b/ports/unix/modsocket.c
@@ -709,6 +709,9 @@ static const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     C(SO_KEEPALIVE),
     C(SO_LINGER),
     C(SO_REUSEADDR),
+
+    C(IP_ADD_MEMBERSHIP),
+    C(IP_DROP_MEMBERSHIP),
 #undef C
 };
 

From 4633d2a0374f79c3306e60b603377606664e8a24 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 19 Nov 2025 02:50:12 +0100
Subject: [PATCH 3113/3129] tools/ci.sh: Add zsh and fish shell completion
 support.

This commit adds custom command completion functions for both the zsh
and fish shell.

The behaviour for those new completions follow the existing completion
for the bash shell, including the way to generate the completion alias
(with appropriately named command line switches).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 docs/develop/gettingstarted.rst | 10 +++++++++-
 tools/ci.sh                     | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index cb479458e1102..a6afc5cad84c7 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -338,7 +338,15 @@ If you use the bash shell, you can add a ``ci`` command with tab completion:
 
 .. code-block:: bash
 
-   $ eval `tools/ci.sh --bash-completion`
+   $ eval $(tools/ci.sh --bash-completion)
+
+For the zsh shell, replace ``--bash-completion`` with ``--zsh-completion``.
+For the fish shell, replace ``--bash-completion`` with ``--fish-completion``.
+
+Then, typing:
+
+.. code-block:: bash
+
    $ ci unix_cov<tab>
 
 This will complete the ci step name to ``unix_coverage_``.
diff --git a/tools/ci.sh b/tools/ci.sh
index 63eed15bea2be..fa7a529b212f6 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1049,6 +1049,14 @@ function _ci_bash_completion {
     echo "alias ci=\"$(readlink -f "$0")\"; complete -W '$(grep '^function ci_' $0 | awk '{print $2}' | sed 's/^ci_//')' ci"
 }
 
+function _ci_zsh_completion {
+    echo "alias ci=\"$(readlink -f "$0"\"); _complete_mpy_ci_zsh() { compadd $(grep '^function ci_' $0 | awk '{sub(/^ci_/,"",$2); print $2}' | tr '\n' ' ') }; autoload -Uz compinit; compinit; compdef _complete_mpy_ci_zsh $(readlink -f "$0")"
+}
+
+function _ci_fish_completion {
+    echo "alias ci=\"$(readlink -f "$0"\"); complete -c ci -p $(readlink -f "$0") -f -a '$(grep '^function ci_' $(readlink -f "$0") | awk '{sub(/^ci_/,"",$2); print $2}' | tr '\n' ' ')'"
+}
+
 function _ci_main {
     case "$1" in
         (-h|-?|--help)
@@ -1057,6 +1065,12 @@ function _ci_main {
         (--bash-completion)
             _ci_bash_completion
         ;;
+        (--zsh-completion)
+            _ci_zsh_completion
+        ;;
+        (--fish-completion)
+            _ci_fish_completion
+        ;;
         (-*)
             echo "Unknown option: $1" 1>&2
             exit 1

From 1c47db32e4096c4fdb978771ef108d93bff28ace Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Thu, 6 Nov 2025 16:44:40 +0100
Subject: [PATCH 3114/3129] docs/library: Document OrderedDict.popitem()'s
 CPython differences.

Fixes issue #18370.

Signed-off-by: Jos Verlinde <jos_verlinde@hotmail.com>
---
 docs/library/collections.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index 6a23e456c66a7..f973e521e2ea5 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -101,3 +101,19 @@ Classes
         a 2
         w 5
         b 3
+
+    .. method:: OrderedDict.popitem()
+
+        Remove and return a (key, value) pair from the dictionary.
+        Pairs are returned in LIFO order.
+
+        .. admonition:: Difference to CPython
+            :class: attention
+
+            ``OrderedDict.popitem()`` does not support the ``last=False`` argument and
+            will always remove and return the last item if present.
+
+            A workaround for this is to use ``pop(<first_key>)`` to remove the first item::
+
+                first_key = next(iter(d))
+                d.pop(first_key)

From 9b3b3a53ed52340809f9b87f0c215bbd8e87f9a9 Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.t.tran@gmail.com>
Date: Mon, 24 Nov 2025 16:57:00 -0800
Subject: [PATCH 3115/3129] docs/library: Fix typos under I2CTarget irq method
 description.

There were a few typos in the documentation for the `I2CTarget.irq` method
description where `IRQ_ADDR_MATCH_READ` was used, however
`IRQ_ADDR_MATCH_WRITE` should have been used.

Fixes issue #18470.

Signed-off-by: Alex Tran <alex.t.tran@gmail.com>
---
 docs/library/machine.I2CTarget.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.I2CTarget.rst b/docs/library/machine.I2CTarget.rst
index 0e4af84cb687c..2765b98143a5f 100644
--- a/docs/library/machine.I2CTarget.rst
+++ b/docs/library/machine.I2CTarget.rst
@@ -126,7 +126,7 @@ General Methods
 
       - ``IRQ_ADDR_MATCH_READ`` indicates that the target was addressed by a
         controller for a read transaction.
-      - ``IRQ_ADDR_MATCH_READ`` indicates that the target was addressed by a
+      - ``IRQ_ADDR_MATCH_WRITE`` indicates that the target was addressed by a
         controller for a write transaction.
       - ``IRQ_READ_REQ`` indicates that the controller is requesting data, and this
         request must be satisfied by calling `I2CTarget.write` with the data to be
@@ -141,7 +141,7 @@ General Methods
 
    Note the following restrictions:
 
-      - ``IRQ_ADDR_MATCH_READ``, ``IRQ_ADDR_MATCH_READ``, ``IRQ_READ_REQ`` and
+      - ``IRQ_ADDR_MATCH_READ``, ``IRQ_ADDR_MATCH_WRITE``, ``IRQ_READ_REQ`` and
         ``IRQ_WRITE_REQ`` must be handled by a hard IRQ callback (with the *hard* argument
         set to ``True``).  This is because these events have very strict timing requirements
         and must usually be satisfied synchronously with the hardware event.

From d5ad2cdcca3e94e4d1822dbedc2c3f42057a6ce4 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Tue, 2 Sep 2025 23:26:53 +1000
Subject: [PATCH 3116/3129] docs/library: Add machine.DAC documentation.

Fixes issue #7915.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 docs/library/machine.DAC.rst | 68 ++++++++++++++++++++++++++++++++++++
 docs/library/machine.rst     |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 docs/library/machine.DAC.rst

diff --git a/docs/library/machine.DAC.rst b/docs/library/machine.DAC.rst
new file mode 100644
index 0000000000000..befcba8323060
--- /dev/null
+++ b/docs/library/machine.DAC.rst
@@ -0,0 +1,68 @@
+.. currentmodule:: machine
+.. _machine.DAC:
+
+class DAC -- digital to analog conversion
+=========================================
+
+The DAC is used to output an analog voltage based on a digital value.
+
+The output voltage will be between 0 and 3.3V.
+
+DAC is currently supported on ESP32 [#esp32_dac]_, SAMD and Renesas RA.
+
+.. note::
+  The STM32 port has similar functionality to ``machine.DAC``. See
+  :ref:`pyb.DAC <pyb.DAC>` for details.
+
+Example usage (ESP32)::
+
+    from machine import DAC
+
+    dac = DAC(pin)    # create a DAC object acting on a pin
+    dac.write(128)    # write a value to the DAC
+    dac.write(255)    # output maximum value, 3.3V
+
+Constructors
+------------
+
+.. class:: DAC(id)
+
+  Construct a new DAC object.
+
+  ``id`` is a pin object (ESP32 and Renesas RA) or an index to a DAC resource (SAMD).
+
+.. note::
+  On the ESP32, DAC functionality is available on pins 25 and 26. On the
+  ESP32-S2, pins 17 and 18. See :ref:`ESP32 Quickref <esp32_quickref>`
+  for more details.
+
+.. note::
+  SAMD21 has one DAC resource, SAMD51 has two. See :ref:`SAMD Quickref <samd_quickref>`
+  for more details.
+
+Methods
+-------
+
+.. method:: DAC.write(value)
+
+  Output an analog voltage to the pin connected to the DAC.
+
+  ``value`` is a representation of the desired output; a linear interpolation of
+  0-3.3V, though the range differs depending on the port and micro, see below:
+
+  +--------------+------+--------+
+  | *Port/micro* | Bits | Range  |
+  +==============+======+========+
+  | ESP32        | 8    | 0-255  |
+  +--------------+------+--------+
+  | SAMD21       | 10   | 0-1023 |
+  +--------------+------+--------+
+  | SAMD51       | 12   | 0-4095 |
+  +--------------+------+--------+
+  | Renesas RA   | 12   | 0-4095 |
+  +--------------+------+--------+
+
+.. rubric:: Footnotes
+
+.. [#esp32_dac] The original ESP32 and ESP32-S2 *only*, since DAC hardware is
+    not present on other microcontrollers in the family.
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 7acaddde815bc..69eda917e5abb 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -260,6 +260,7 @@ Classes
    machine.Signal.rst
    machine.ADC.rst
    machine.ADCBlock.rst
+   machine.DAC.rst
    machine.PWM.rst
    machine.UART.rst
    machine.SPI.rst

From bd111ccd4b4932ea94ba7c66007840cb88e3b4a7 Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Thu, 20 Nov 2025 21:01:20 +0100
Subject: [PATCH 3117/3129] zephyr: Allow a custom dts.

Allows using custom DTS things such as bindings.

Signed-off-by: Vdragon <mail@massdriver.space>
---
 ports/zephyr/CMakeLists.txt                   |  2 ++
 ports/zephyr/dts/bindings/vendor-prefixes.txt | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 ports/zephyr/dts/bindings/vendor-prefixes.txt

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 9db0a95c663de..cf35ba73da278 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -35,6 +35,8 @@ string(TOUPPER          ZEPHYR_${BOARD} MICROPY_BOARD)
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
 
+list(APPEND DTS_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/dts)
+
 if (CONFIG_MICROPY_FROZEN_MODULES)
     cmake_path(ABSOLUTE_PATH CONFIG_MICROPY_FROZEN_MANIFEST BASE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
     set(MICROPY_FROZEN_MANIFEST ${CONFIG_MICROPY_FROZEN_MANIFEST})
diff --git a/ports/zephyr/dts/bindings/vendor-prefixes.txt b/ports/zephyr/dts/bindings/vendor-prefixes.txt
new file mode 100644
index 0000000000000..f2dc741d997d6
--- /dev/null
+++ b/ports/zephyr/dts/bindings/vendor-prefixes.txt
@@ -0,0 +1,15 @@
+# Device tree binding vendor prefix registry. Keep this list in
+# alphabetical order.
+#
+# This isn't an exhaustive list, but you should add new prefixes to it
+# before using them to avoid name-space collisions.
+#
+# The contents of this file are parsed during documentation generation.
+# Anything that starts with a '#' is treated as a comment and ignored.
+# Non-empty lines should be in this format:
+#
+# <vendor-prefix><TAB><Full name of vendor>
+
+# zephyr-keep-sorted-start
+micropython	MicroPython Project
+# zephyr-keep-sorted-stop

From 3d9a3e89cf4a32fdc6fca2a8edd91714b5b67665 Mon Sep 17 00:00:00 2001
From: Vdragon <mail@massdriver.space>
Date: Sat, 25 Oct 2025 23:39:33 +0200
Subject: [PATCH 3118/3129] zephyr: Add support for GC split-heap.

Adds the ability to use PSRAM and non-contiguous memory.

Example usage, add this to dts overlay:

    / {
            heap_psram {
                    compatible = "micropython,heap";
                    size = <DT_SIZE_M(4)>;
                    memory-region = <&psram>;
            };

            heap_sram1 {
                    compatible = "micropython,heap";
                    size = <DT_SIZE_K(140)>;
                    memory-region = <&sram1>;
            };
    };

Signed-off-by: Vdragon <mail@massdriver.space>
---
 .../micropython/micropython,heap.yaml         | 23 +++++++++++++++++
 ports/zephyr/main.c                           | 25 +++++++++++++++++++
 ports/zephyr/mpconfigport.h                   |  4 +++
 3 files changed, 52 insertions(+)
 create mode 100644 ports/zephyr/dts/bindings/micropython/micropython,heap.yaml

diff --git a/ports/zephyr/dts/bindings/micropython/micropython,heap.yaml b/ports/zephyr/dts/bindings/micropython/micropython,heap.yaml
new file mode 100644
index 0000000000000..333baa96686ac
--- /dev/null
+++ b/ports/zephyr/dts/bindings/micropython/micropython,heap.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    MicroPython Heap
+    Used to define micropython heap areas.
+
+compatible: "micropython,heap"
+
+include: [base.yaml]
+
+properties:
+  size:
+    type: int
+    required: true
+    description: |
+      Size of the heap
+
+  memory-region:
+    type: phandle
+    required: true
+    description: |
+      Memory region to place the heap in
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 0fa4e97b24186..c82814e04b5d0 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -58,6 +58,28 @@
 #include "extmod/vfs.h"
 #endif
 
+#if MICROPY_ENABLE_GC
+#if MICROPY_GC_SPLIT_HEAP && DT_HAS_COMPAT_STATUS_OKAY(micropython_heap)
+
+#include <zephyr/linker/devicetree_regions.h>
+
+#define MICROPY_HEAP_NAME(node) CONCAT(DT_NODE_FULL_NAME_TOKEN(node), _heap)
+
+#define MICROPY_HEAP_DEFINE(node) \
+    static char MICROPY_HEAP_NAME(node)[DT_PROP(node, size)] \
+    Z_GENERIC_SECTION(LINKER_DT_NODE_REGION_NAME(DT_PROP(node, memory_region)));
+
+DT_FOREACH_STATUS_OKAY(micropython_heap, MICROPY_HEAP_DEFINE)
+
+#define MICROPY_HEAP_ADD(node) \
+    gc_add((void *)&MICROPY_HEAP_NAME(node), \
+    (void *)&(MICROPY_HEAP_NAME(node)[DT_PROP(node, size) - 1]));
+
+#elif DT_HAS_COMPAT_STATUS_OKAY(micropython_heap)
+#error Has additional Heap but split heap is not enabled
+#endif
+#endif
+
 #include "modmachine.h"
 #include "modzephyr.h"
 
@@ -107,6 +129,9 @@ int real_main(void) {
     mp_cstack_init_with_sp_here(CONFIG_MAIN_STACK_SIZE);
     #if MICROPY_ENABLE_GC
     gc_init(heap, heap + sizeof(heap));
+    #if MICROPY_GC_SPLIT_HEAP && DT_HAS_COMPAT_STATUS_OKAY(micropython_heap)
+    DT_FOREACH_STATUS_OKAY(micropython_heap, MICROPY_HEAP_ADD)
+    #endif
     #endif
     mp_init();
 
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 7f84973488786..56a442c26972e 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -151,6 +151,10 @@ void mp_hal_signal_event(void);
 #define MICROPY_PY_MACHINE_ADC_READ_UV (1)
 #endif
 
+#if DT_HAS_COMPAT_STATUS_OKAY(micropython_heap)
+#define MICROPY_GC_SPLIT_HEAP (1)
+#endif
+
 typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM

From 65f994e26a852eecc2b641db4d35b5e1676d4442 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Tue, 4 Nov 2025 20:18:16 +0100
Subject: [PATCH 3119/3129] py/compile: Allow NULL emitter table entries.

This commit fixes a regression introduced in
1b92bda5b8e5e2db8e57c4b7134930e52bc5207a, where a new architecture was
added to mpy-cross but it had no matching native emitter exists.

The result was that the architecture emitter entry point would be
correctly calculated according to the native architecture index, but if
the emitters entry points table was not updated to match the new number
of architectures an out of bound access may be performed.

Unfortunately adding RV64IMC shifted the debug emitter index further
down the table, and that table wasn't updated to reflect the lack of an
emitter for RV64.  Adding a NULL entry there would cause a NULL pointer
access as there was no need to perform any check about the emitter entry
point function's validity until now.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 py/compile.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/py/compile.c b/py/compile.c
index 945ee2b2dee85..6d7e9c4a14643 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -103,6 +103,7 @@ static const emit_method_table_t *emit_native_table[] = {
     &emit_native_xtensa_method_table,
     &emit_native_xtensawin_method_table,
     &emit_native_rv32_method_table,
+    NULL,
     &emit_native_debug_method_table,
 };
 
@@ -3571,6 +3572,13 @@ void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool
                 case MP_EMIT_OPT_NATIVE_PYTHON:
                 case MP_EMIT_OPT_VIPER:
                     if (emit_native == NULL) {
+                        // The check looks like this to work around a false
+                        // warning in GCC 13 (and possibly later), where it
+                        // assumes that the check will always fail.
+                        if ((uintptr_t)NATIVE_EMITTER_TABLE == (uintptr_t)NULL) {
+                            comp->compile_error = mp_obj_new_exception_msg(&mp_type_NotImplementedError, MP_ERROR_TEXT("cannot emit native code for this architecture"));
+                            goto emit_finished;
+                        }
                         emit_native = NATIVE_EMITTER(new)(&comp->emit_common, &comp->compile_error, &comp->next_label, max_num_labels);
                     }
                     comp->emit_method_table = NATIVE_EMITTER_TABLE;
@@ -3603,6 +3611,10 @@ void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool
         }
     }
 
+    #if MICROPY_EMIT_NATIVE
+emit_finished:
+    #endif
+
     if (comp->compile_error != MP_OBJ_NULL) {
         // if there is no line number for the error then use the line
         // number for the start of this scope

From 6b661ca3f6d877cfca224cc311cb84eba2d2b380 Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Wed, 5 Nov 2025 21:58:51 +0100
Subject: [PATCH 3120/3129] github/workflows: Test mpy-cross debug emitter.

This commit adds a new workflow step to the CI, to test the debug
emitter provided by mpy-cross.  The checks being done are limited to
make sure that the debug emitter does not crash and emits opcodes for a
simple test file that is guaranteed to work for all configurations.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 .github/workflows/mpy_format.yml | 4 ++++
 tools/ci.sh                      | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index b51110db67762..ab668c1cb5ea0 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -6,6 +6,8 @@ on:
     paths:
       - '.github/workflows/*.yml'
       - 'examples/**'
+      - 'mpy-cross/**'
+      - 'py/**'
       - 'tests/**'
       - 'tools/**'
 
@@ -22,3 +24,5 @@ jobs:
       run: tools/ci.sh mpy_format_setup
     - name: Test mpy-tool.py
       run: tools/ci.sh mpy_format_test
+    - name: Test mpy-cross debug emitter
+      run: tools/ci.sh mpy_cross_debug_emitter
diff --git a/tools/ci.sh b/tools/ci.sh
index fa7a529b212f6..e34940f758947 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -173,6 +173,15 @@ function ci_mpy_format_test {
     $micropython ./tools/mpy-tool.py -x -d examples/natmod/features1/features1.mpy
 }
 
+function ci_mpy_cross_debug_emitter {
+    make ${MAKEOPTS} -C mpy-cross
+    mpy_cross=./mpy-cross/build/mpy-cross
+
+    # Make sure the debug emitter does not crash or fail for simple files
+    $mpy_cross -X emit=native -march=debug ./tests/basics/0prelim.py | \
+	    grep -E "ENTRY|EXIT" | wc -l | grep "^2$"
+}
+
 ########################################################################################
 # ports/cc3200
 

From b087cb41e85641b9aa530dc2001e151750219f0b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 24 Nov 2025 11:51:28 +0100
Subject: [PATCH 3121/3129] stm32/mpconfigboard_common: Define TinyUSB MCU type
 for N6.

Allows using TinyUSB stack on N6.

Note there's still an issue with TinyUSB on the N6: `pyb_usbd_init()` can't
be called multiple times (on soft-reboot).

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 ports/stm32/mpconfigboard_common.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index eefd5c05c1b2b..1ce42055d80f9 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -542,6 +542,9 @@
 #define MICROPY_HW_MAX_UART (10)
 #define MICROPY_HW_MAX_LPUART (1)
 
+#define CFG_TUSB_MCU OPT_MCU_STM32N6
+#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED)
+
 // Configuration for STM32U5 series
 #elif defined(STM32U5)
 

From cad9bb3a2b5c73637d67591c43ee10c39719fa5e Mon Sep 17 00:00:00 2001
From: Mike Tolkachev <mstolkachev@gmail.com>
Date: Mon, 13 Oct 2025 11:06:24 -0300
Subject: [PATCH 3122/3129] stm32: Add support for STM32F469xx MCUs.

Signed-off-by: Mike Tolkachev <contact@miketolkachev.dev>
---
 ports/stm32/adc.c                 |  2 +-
 ports/stm32/boards/stm32f469xi.ld | 35 +++++++++++++++++++++++++++++++
 ports/stm32/mpu.h                 |  2 +-
 ports/stm32/powerctrl.c           |  6 +++---
 4 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 ports/stm32/boards/stm32f469xi.ld

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 326fc97b25104..e9be7021322d5 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -138,7 +138,7 @@
     defined(STM32F413xx) || defined(STM32F427xx) || \
     defined(STM32F429xx) || defined(STM32F437xx) || \
     defined(STM32F439xx) || defined(STM32F446xx) || \
-    defined(STM32F479xx)
+    defined(STM32F479xx) || defined(STM32F469xx)
 #define VBAT_DIV (4)
 #elif defined(STM32F722xx) || defined(STM32F723xx) || \
     defined(STM32F732xx) || defined(STM32F733xx) || \
diff --git a/ports/stm32/boards/stm32f469xi.ld b/ports/stm32/boards/stm32f469xi.ld
new file mode 100644
index 0000000000000..4da9bf16f1a8f
--- /dev/null
+++ b/ports/stm32/boards/stm32f469xi.ld
@@ -0,0 +1,35 @@
+/*
+    GNU linker script for STM32F469xI (2Mbyte)
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K   /* Entire flash */
+    FLASH_START (rx): ORIGIN = 0x08000000, LENGTH = 16K     /* Sector 0 */
+    FLASH_FS (r)    : ORIGIN = 0x08004000, LENGTH = 112K    /* Sectors 1, 2, 3, 4 */
+    FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 1920K   /* Sectors 5 - 23 */
+    CCMRAM (rw)     : ORIGIN = 0x10000000, LENGTH = 64K     /* CCM RAM used for storage cache */
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 320K    /* SRAM1, SRAM2, SRAM3 */
+}
+
+/* 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;
+
+/* 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/mpu.h b/ports/stm32/mpu.h
index 8713fe8370c5b..1d43e87f8d7b1 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -28,7 +28,7 @@
 
 #include "irq.h"
 
-#if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
+#if (defined(STM32F4) && defined(MICROPY_HW_ETH_MDC)) || defined(STM32F469xx) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
 
 #define MPU_REGION_ETH      (MPU_REGION_NUMBER0)
 #define MPU_REGION_QSPI1    (MPU_REGION_NUMBER1)
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 7211ef873cd52..a63c57f4a78bb 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -798,13 +798,13 @@ void powerctrl_enter_stop_mode(void) {
 
     #if defined(STM32H7) || \
     defined(STM32F427xx) || defined(STM32F437xx) || \
-    defined(STM32F429xx) || defined(STM32F439xx) || \
+    defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F469xx) || \
     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
+    // for STM32F427xx, STM32F437xx, STM32F429xx, STM32F439xx, and STM32F469xx
     // 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;
@@ -1039,7 +1039,7 @@ void powerctrl_enter_stop_mode(void) {
 
     #if defined(STM32H7) || \
     defined(STM32F427xx) || defined(STM32F437xx) || \
-    defined(STM32F429xx) || defined(STM32F439xx) || \
+    defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F469xx) || \
     defined(STM32WB55xx) || defined(STM32WB35xx)
     // Enable SysTick Interrupt
     SysTick->CTRL |= SysTick_CTRL_TICKINT_Msk;

From b4d546d82e01d16664b2d17d9f145cb4768460c9 Mon Sep 17 00:00:00 2001
From: Mike Tolkachev <mstolkachev@gmail.com>
Date: Mon, 13 Oct 2025 11:06:24 -0300
Subject: [PATCH 3123/3129] stm32/boards/STM32F469DISC: Add new board
 definition files.

Signed-off-by: Mike Tolkachev <contact@miketolkachev.dev>
---
 ports/stm32/boards/STM32F469DISC/bdev.c       |  45 ++++++
 ports/stm32/boards/STM32F469DISC/board_init.c |  44 ++++++
 .../boards/STM32F469DISC/mpconfigboard.h      | 133 +++++++++++++++++
 .../boards/STM32F469DISC/mpconfigboard.mk     |  20 +++
 ports/stm32/boards/STM32F469DISC/pins.csv     | 135 ++++++++++++++++++
 .../boards/STM32F469DISC/stm32f4xx_hal_conf.h |  41 ++++++
 6 files changed, 418 insertions(+)
 create mode 100644 ports/stm32/boards/STM32F469DISC/bdev.c
 create mode 100644 ports/stm32/boards/STM32F469DISC/board_init.c
 create mode 100644 ports/stm32/boards/STM32F469DISC/mpconfigboard.h
 create mode 100644 ports/stm32/boards/STM32F469DISC/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/STM32F469DISC/pins.csv
 create mode 100644 ports/stm32/boards/STM32F469DISC/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/STM32F469DISC/bdev.c b/ports/stm32/boards/STM32F469DISC/bdev.c
new file mode 100644
index 0000000000000..40e4917e26d21
--- /dev/null
+++ b/ports/stm32/boards/STM32F469DISC/bdev.c
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Mike Tolkachev <contact@miketolkachev.dev>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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
+static mp_spiflash_cache_t spi_bdev_cache;
+#endif
+
+// External SPI flash uses 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 flash device instance
+spi_bdev_t spi_bdev;
diff --git a/ports/stm32/boards/STM32F469DISC/board_init.c b/ports/stm32/boards/STM32F469DISC/board_init.c
new file mode 100644
index 0000000000000..e4f75f218f80d
--- /dev/null
+++ b/ports/stm32/boards/STM32F469DISC/board_init.c
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Mike Tolkachev <contact@miketolkachev.dev>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 "storage.h"
+#include "boardctrl.h"
+#include "qspi.h"
+
+// Micron N25Q128A13EF840F of original STM32F469I-DISCO board
+static const mp_spiflash_chip_params_t chip_params_n25q128a13ef840f = {
+    .jedec_id = 0, // Not used for detection
+    .memory_size_bytes_log2 = MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2,
+    .qspi_prescaler = MICROPY_HW_QSPI_PRESCALER,
+    .qread_num_dummy = MICROPY_HW_QSPIFLASH_DUMMY_CYCLES
+};
+
+// Early board initialization hook called before file system is mounted
+void STM32F469DISC_board_early_init(void) {
+    // Initialize QSPI flash device parameters
+    MICROPY_HW_BDEV_SPIFLASH->spiflash.chip_params = &chip_params_n25q128a13ef840f;
+}
diff --git a/ports/stm32/boards/STM32F469DISC/mpconfigboard.h b/ports/stm32/boards/STM32F469DISC/mpconfigboard.h
new file mode 100644
index 0000000000000..1668618ce2b43
--- /dev/null
+++ b/ports/stm32/boards/STM32F469DISC/mpconfigboard.h
@@ -0,0 +1,133 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Mike Tolkachev <contact@miketolkachev.dev>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION 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 board is configured to communicate over USB port, not ST-Link
+
+#define MICROPY_HW_BOARD_NAME       "F469DISC"
+#define MICROPY_HW_MCU_NAME         "STM32F469"
+
+// Use external QSPI flash for storage by default
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+#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)
+
+#define MICROPY_BOARD_EARLY_INIT    STM32F469DISC_board_early_init
+void STM32F469DISC_board_early_init(void);
+
+// QSPI flash storage configuration
+#if !BUILDING_MBOOT
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE    (1)
+#endif
+#define MICROPY_HW_SPIFLASH_SOFT_RESET      (1)
+#define MICROPY_HW_SPIFLASH_SIZE_BITS       (128 * 1024 * 1024)
+#define MICROPY_HW_SPIFLASH_CHIP_PARAMS     (1) // enable extended parameters
+#define MICROPY_HW_QSPI_PRESCALER           (3)
+#define MICROPY_HW_QSPIFLASH_DUMMY_CYCLES   (4)
+#define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (27)
+#define MICROPY_HW_QSPIFLASH_CS             (pyb_pin_QSPI_CS)
+#define MICROPY_HW_QSPIFLASH_SCK            (pyb_pin_QSPI_CLK)
+#define MICROPY_HW_QSPIFLASH_IO0            (pyb_pin_QSPI_D0)
+#define MICROPY_HW_QSPIFLASH_IO1            (pyb_pin_QSPI_D1)
+#define MICROPY_HW_QSPIFLASH_IO2            (pyb_pin_QSPI_D2)
+#define MICROPY_HW_QSPIFLASH_IO3            (pyb_pin_QSPI_D3)
+
+// QSPI flash block device configuration
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_BDEV_SPIFLASH    (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
+
+// HSE is 8MHz
+#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_6
+
+// UART config
+#define MICROPY_HW_UART3_NAME       "YB"
+#define MICROPY_HW_UART3_TX         (pin_B10)
+#define MICROPY_HW_UART3_RX         (pin_B11)
+#define MICROPY_HW_UART6_NAME       "YA"
+#define MICROPY_HW_UART6_TX         (pin_G14)
+#define MICROPY_HW_UART6_RX         (pin_G9)
+#define MICROPY_HW_UART2_NAME       "UART2"
+#define MICROPY_HW_UART2_TX         (pin_A2) // Needed to enable AF
+#define MICROPY_HW_UART2_RX         (pin_A3) // Dummy, not routed on PCB
+#define MICROPY_HW_UART2_CK         (pin_A4)
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pin_B8)
+#define MICROPY_HW_I2C1_SDA         (pin_B9)
+
+// SPI
+#define MICROPY_HW_SPI2_NSS         (pin_B9)
+#define MICROPY_HW_SPI2_SCK         (pin_D3)
+#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)
+
+// 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_G6) // green
+#define MICROPY_HW_LED2             (pin_D4) // orange
+#define MICROPY_HW_LED3             (pin_D5) // red
+#define MICROPY_HW_LED4             (pin_K3) // blue
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
+
+// SD Card SDMMC
+#define MICROPY_HW_SDCARD_CK               (pin_C12)
+#define MICROPY_HW_SDCARD_CMD              (pin_D2)
+#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_DETECT_PIN       (pin_G2)
+#define MICROPY_HW_SDCARD_DETECT_PULL      (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT   (GPIO_PIN_RESET)
+
+// 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/STM32F469DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F469DISC/mpconfigboard.mk
new file mode 100644
index 0000000000000..bc95739c7db11
--- /dev/null
+++ b/ports/stm32/boards/STM32F469DISC/mpconfigboard.mk
@@ -0,0 +1,20 @@
+# MCU settings
+MCU_SERIES = f4
+CMSIS_MCU = STM32F469xx
+MICROPY_FLOAT_IMPL = double
+AF_FILE = boards/stm32f479_af.csv
+
+ifeq ($(USE_MBOOT),1)
+# When using Mboot all the text goes together after the filesystem
+LD_FILES = boards/stm32f469xi.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/stm32f469xi.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+endif
+
+# MicroPython settings
+MICROPY_PY_SSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/STM32F469DISC/pins.csv b/ports/stm32/boards/STM32F469DISC/pins.csv
new file mode 100644
index 0000000000000..055581ba944b1
--- /dev/null
+++ b/ports/stm32/boards/STM32F469DISC/pins.csv
@@ -0,0 +1,135 @@
+A0,PB1
+A1,PC2
+A2,PC3
+A3,PC4
+A4,PC5
+A5,PA4
+D0,PG9
+D1,PG14
+D2,PG13
+D3,PA1
+D4,PG12
+D5,PA2
+D6,PA6
+D7,PG11
+D8,PG10
+D9,PA7
+D10,PH6
+D11,PB15
+D12,PB14
+D13,PD3
+D14,PB9
+D15,PB8
+LED1,PG6
+LED2,PD4
+LED3,PD5
+LED4,PK3
+SW,PA0
+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_D0,PC8
+SD_D1,PC9
+SD_D2,PC10
+SD_D3,PC11
+SD_CK,PC12
+SD_CMD,PD2
+SD_SW,PC2
+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
+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
+UART1_TX,PB10
+UART1_RX,PB11
+UART6_TX,PG14
+UART6_RX,PG9
+CAN2_TX,PB13
+CAN2_RX,PB12
+QSPI_CS,PB6
+QSPI_CLK,PF10
+QSPI_D0,PF8
+QSPI_D1,PF9
+QSPI_D2,PF7
+QSPI_D3,PF6
+FMC_SDCKE0,PH2
+FMC_SDNE0,PH3
+FMC_SDCLK,PG8
+FMC_SDNCAS,PG15
+FMC_SDNRAS,PF11
+FMC_SDNWE,PH5
+FMC_BA0,PG4
+FMC_BA1,PG5
+FMC_NBL0,PE0
+FMC_NBL1,PE1
+FMC_NBL2,PI4
+FMC_NBL3,PI5
+FMC_A0,PF0
+FMC_A1,PF1
+FMC_A2,PF2
+FMC_A3,PF3
+FMC_A4,PF4
+FMC_A5,PF5
+FMC_A6,PF12
+FMC_A7,PF13
+FMC_A8,PF14
+FMC_A9,PF15
+FMC_A10,PG0
+FMC_A11,PG1
+FMC_A12,PG2
+FMC_D0,PD14
+FMC_D1,PD15
+FMC_D2,PD0
+FMC_D3,PD1
+FMC_D4,PE7
+FMC_D5,PE8
+FMC_D6,PE9
+FMC_D7,PE10
+FMC_D8,PE11
+FMC_D9,PE12
+FMC_D10,PE13
+FMC_D11,PE14
+FMC_D12,PE15
+FMC_D13,PD8
+FMC_D14,PD9
+FMC_D15,PD10
+FMC_D16,PH8
+FMC_D17,PH9
+FMC_D18,PH10
+FMC_D19,PH11
+FMC_D20,PH12
+FMC_D21,PH13
+FMC_D22,PH14
+FMC_D23,PH15
+FMC_D24,PI0
+FMC_D25,PI1
+FMC_D26,PI2
+FMC_D27,PI3
+FMC_D28,PI6
+FMC_D29,PI7
+FMC_D30,PI9
+FMC_D31,PI10
diff --git a/ports/stm32/boards/STM32F469DISC/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F469DISC/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..b5a54cbf7c172
--- /dev/null
+++ b/ports/stm32/boards/STM32F469DISC/stm32f4xx_hal_conf.h
@@ -0,0 +1,41 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2025 Mike Tolkachev <contact@miketolkachev.dev>
+ */
+
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_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)
+
+#define HAL_DMA2D_MODULE_ENABLED
+#define HAL_LTDC_MODULE_ENABLED
+#define HAL_QSPI_MODULE_ENABLED
+#define HAL_DSI_MODULE_ENABLED
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+#include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+#include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+#include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_DSI_MODULE_ENABLED
+#include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 22cff2f6f590cdcd70c795ad95bf6678c3e80435 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Nov 2025 18:30:46 +1100
Subject: [PATCH 3124/3129] stm32/boards/STM32F469DISC: Add board.json file.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/STM32F469DISC/board.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ports/stm32/boards/STM32F469DISC/board.json

diff --git a/ports/stm32/boards/STM32F469DISC/board.json b/ports/stm32/boards/STM32F469DISC/board.json
new file mode 100644
index 0000000000000..9530e1e8128e7
--- /dev/null
+++ b/ports/stm32/boards/STM32F469DISC/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "stm32f469disc.jpg"
+    ],
+    "mcu": "stm32f4",
+    "product": "Discovery F469",
+    "thumbnail": "",
+    "url": "https://www.st.com/en/evaluation-tools/32f469idiscovery.html",
+    "vendor": "ST Microelectronics"
+}

From 9b73e344ebdb9f086013ff45e9dc73af33d2c0d1 Mon Sep 17 00:00:00 2001
From: Yuuki NAGAO <wf.yn386@gmail.com>
Date: Sat, 26 Jul 2025 08:39:41 +0900
Subject: [PATCH 3125/3129] stm32/boards/WEACTSTUDIO_MINI_STM32H743: Add WeAct
 H743VI board support.

This change adds WeAct Studio Mini STM32H743 board support to the STM32
port.  Some of the work from PR #12540 is combined here.

WeAct Studio Mini STM32H43 board:
https://github.com/WeActStudio/MiniSTM32H7xx

This board uses STM32H743VI:
https://www.st.com/en/microcontrollers-microprocessors/stm32h743vi.html

Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
---
 .../boards/WEACTSTUDIO_MINI_STM32H743/bdev.c  |  47 +++++
 .../WEACTSTUDIO_MINI_STM32H743/board.json     |  13 ++
 .../WEACTSTUDIO_MINI_STM32H743/board_init.c   |  16 ++
 .../WEACTSTUDIO_MINI_STM32H743/deploy.md      |  19 ++
 .../WEACTSTUDIO_MINI_STM32H743/manifest.py    |   4 +
 .../mpconfigboard.h                           | 171 ++++++++++++++++++
 .../mpconfigboard.mk                          |  22 +++
 .../WEACTSTUDIO_MINI_STM32H743/pins.csv       | 100 ++++++++++
 .../stm32h7xx_hal_conf.h                      |  19 ++
 .../weact_stm32h743.ld                        |  33 ++++
 10 files changed, 444 insertions(+)
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/bdev.c
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/board.json
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/board_init.c
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/deploy.md
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/manifest.py
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.h
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/pins.csv
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/stm32h7xx_hal_conf.h
 create mode 100644 ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/weact_stm32h743.ld

diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/bdev.c b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/bdev.c
new file mode 100644
index 0000000000000..b70142300772c
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/bdev.c
@@ -0,0 +1,47 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+
+#include "storage.h"
+#include "spi.h"
+#include "qspi.h"
+#include "py/mpconfig.h"
+
+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,
+};
+
+#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_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+
+    .bus.u_spi.data = (void *)&spi_bus,
+    .bus.u_spi.proto = &spi_proto,
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+    .cache = &spi_bdev_cache,
+    #endif
+};
+
+spi_bdev_t spi_bdev;
+
+// Second external SPI flash uses hardware QSPI interface
+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/WEACTSTUDIO_MINI_STM32H743/board.json b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/board.json
new file mode 100644
index 0000000000000..11a6e08152f06
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "features": ["External Flash", "DAC", "Display","microSD", "USB", "USB-C"],
+    "images": [
+        "weact_stm32h743.jpg"
+    ],
+    "mcu": "stm32h7",
+    "product": "Mini STM32H743",
+    "url": "https://github.com/WeActStudio/MiniSTM32H7xx",
+    "vendor": "WeAct Studio"
+}
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/board_init.c b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/board_init.c
new file mode 100644
index 0000000000000..0adf04982c8a4
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/board_init.c
@@ -0,0 +1,16 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+
+#include "py/mphal.h"
+#include "storage.h"
+
+void WeAct_Core_early_init(void) {
+    // Turn off the USB switch.
+    mp_hal_pin_output(pyb_pin_OTG_FS_POWER);
+    mp_hal_pin_low(pyb_pin_OTG_FS_POWER);
+
+    // Explicitly init SPI2 because it's not enabled as a block device
+    spi_bdev_ioctl(&spi_bdev2, BDEV_IOCTL_INIT, (uint32_t)&spiflash2_config);
+}
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/deploy.md b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/deploy.md
new file mode 100644
index 0000000000000..a4572bfe30617
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/deploy.md
@@ -0,0 +1,19 @@
+### WeAct Studio STM32H7xx
+
+WeAct Studio make a number of STM32H7xx-based boards, they can all be updated
+using
+[DFU](https://en.wikipedia.org/wiki/USB?useskin=vector#Device_Firmware_Upgrade_mechanism).
+
+### DFU update
+
+Hold the Boot button - the middle of the cluster of three buttons - while the
+board is reset (either by connecting USB or by pressing reset). Release the Boot
+button shortly after the board has reset. The board ought to now be in DFU mode
+and detectable as such from a connected computer.
+
+Use a tool like [`dfu-util`](https://dfu-util.sourceforge.net/) to update the
+firmware:
+
+```bash
+dfu-util --alt 0 -D firmware.dfu
+```
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/manifest.py b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/manifest.py
new file mode 100644
index 0000000000000..7d163e1847964
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/manifest.py
@@ -0,0 +1,4 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+# Currently this file is a placeholder.
+# It would be good to extend to add an LCD driver.
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.h b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.h
new file mode 100644
index 0000000000000..ad9f3bc45ee08
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.h
@@ -0,0 +1,171 @@
+#define MICROPY_HW_BOARD_NAME               "WEACTSTUDIO_MINI_STM32H743"
+#define MICROPY_HW_MCU_NAME                 "STM32H743VIT6"
+
+#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               (1)
+#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)
+
+// ROMFS config
+#define MICROPY_HW_ROMFS_ENABLE_EXTERNAL_QSPI   (1)
+#define MICROPY_HW_ROMFS_QSPI_SPIFLASH_OBJ      (&spi_bdev2.spiflash)
+#define MICROPY_HW_ROMFS_ENABLE_PART0           (1)
+
+// Flash storage config
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE    (1)
+// Disable internal filesystem to use spiflash.
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+// W25Q64 for storage
+#define MICROPY_HW_SPIFLASH_SIZE_BYTES      (8 * 1024 * 1024)
+
+// SPI flash #1, for R/W storage
+#define MICROPY_HW_SPIFLASH_CS              (pin_D6)
+#define MICROPY_HW_SPIFLASH_SCK             (pin_B3)
+#define MICROPY_HW_SPIFLASH_MOSI            (pin_D7)
+#define MICROPY_HW_SPIFLASH_MISO            (pin_B4)
+
+// External SPI Flash configuration
+#define MICROPY_HW_SPI_IS_RESERVED(id)      (id == 1)
+
+// 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_SPIFLASH            (&spi_bdev)
+#define MICROPY_HW_BDEV_SPIFLASH_CONFIG     (&spiflash_config)
+#define MICROPY_HW_BDEV_SPIFLASH_SIZE_BYTES (MICROPY_HW_SPIFLASH_SIZE_BITS / 8)
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED   (&spi_bdev) // for extended block protocol
+#define MICROPY_HW_SPIFLASH_SIZE_BITS       (MICROPY_HW_SPIFLASH_SIZE_BYTES * 8)
+
+// SPI flash #2, to be memory mapped
+#define MICROPY_HW_QSPI_PRESCALER           (2) // 120 MHz
+#define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (26)
+#define MICROPY_HW_QSPIFLASH_CS             (pin_B6)
+#define MICROPY_HW_QSPIFLASH_SCK            (pin_B2)
+#define MICROPY_HW_QSPIFLASH_IO0            (pin_D11)
+#define MICROPY_HW_QSPIFLASH_IO1            (pin_D12)
+#define MICROPY_HW_QSPIFLASH_IO2            (pin_E2)
+#define MICROPY_HW_QSPIFLASH_IO3            (pin_D13)
+
+// SPI flash #2, block device config
+extern const struct _mp_spiflash_config_t spiflash2_config;
+extern struct _spi_bdev_t spi_bdev2;
+
+#define MICROPY_BOARD_EARLY_INIT            WeAct_Core_early_init
+
+// This board has 25MHz HSE.
+// The following gives a 480MHz CPU speed.
+#define MICROPY_HW_CLK_USE_HSE              (1)
+#define MICROPY_HW_CLK_PLLM                 (5)
+#define MICROPY_HW_CLK_PLLN                 (192)
+#define MICROPY_HW_CLK_PLLP                 (2)
+#define MICROPY_HW_CLK_PLLQ                 (20)
+#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)
+
+// The USB clock is set using PLL3
+#define MICROPY_HW_CLK_PLL3M                (5)
+#define MICROPY_HW_CLK_PLL3N                (192)
+#define MICROPY_HW_CLK_PLL3P                (2)
+#define MICROPY_HW_CLK_PLL3Q                (20)
+#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)
+
+// 32kHz crystal for RTC
+#define MICROPY_HW_RTC_USE_LSE              (1)
+#define MICROPY_HW_RTC_USE_US               (0)
+
+// 6 wait states
+#define MICROPY_HW_FLASH_LATENCY            FLASH_LATENCY_6
+
+// UART
+#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_C11)
+#define MICROPY_HW_UART4_RX                 (pin_C10)
+#define MICROPY_HW_UART5_TX                 (pin_B12) // or SPI2
+#define MICROPY_HW_UART5_RX                 (pin_B13) // or SPI2
+#define MICROPY_HW_UART6_TX                 (pin_C6)
+#define MICROPY_HW_UART6_RX                 (pin_C7)
+#define MICROPY_HW_UART7_TX                 (pin_E8)
+#define MICROPY_HW_UART7_RX                 (pin_E7)
+
+// 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
+// NOTE: SPI1 is used for the SPI flash.
+#define MICROPY_HW_SPI1_NSS                 (pin_D6)
+#define MICROPY_HW_SPI1_SCK                 (pin_B3)
+#define MICROPY_HW_SPI1_MISO                (pin_B4)
+#define MICROPY_HW_SPI1_MOSI                (pin_D7)
+
+#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)
+// NOTE: SPI3 is used for the QSPI flash.
+#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)
+// NOTE: SPI4 is used for the ST7735 LCD.
+#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)
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX                  (pin_B9)
+#define MICROPY_HW_CAN1_RX                  (pin_B8)
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN                (pin_C13) // K1 on the board.
+#define MICROPY_HW_USRSW_PULL               (GPIO_PULLDOWN)
+#define MICROPY_HW_USRSW_EXTI_MODE          (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED            (1)
+
+// LEDs
+#define MICROPY_HW_LED1                     (pin_E3) // the only controllable LED on the board.
+#define MICROPY_HW_LED_ON(pin)              (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)             (mp_hal_pin_low(pin))
+
+// SD Card SDMMC
+#define MICROPY_HW_SDCARD_SDMMC             (1)
+#define MICROPY_HW_SDCARD_CK                (pin_C12)
+#define MICROPY_HW_SDCARD_CMD               (pin_D2)
+#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)
+
+// SD card detect switch
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_D4)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_SET)
+
+// USB config
+#define MICROPY_HW_USB_FS                   (1)
+
+void WeAct_Core_early_init(void);
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.mk b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.mk
new file mode 100644
index 0000000000000..c13c3ddad72cc
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/mpconfigboard.mk
@@ -0,0 +1,22 @@
+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 everything goes after the bootloader
+LD_FILES = boards/stm32h723.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08020000
+else
+# When not using Mboot everything goes at the start of flash
+LD_FILES = boards/WEACTSTUDIO_MINI_STM32H743/weact_stm32h743.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+endif
+
+# MicroPython settings
+MICROPY_VFS_LFS2 = 1
+
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/pins.csv b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/pins.csv
new file mode 100644
index 0000000000000..61b188cc6b68d
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/pins.csv
@@ -0,0 +1,100 @@
+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
+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
+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
+E11,PE11
+E12,PE12
+E13,PE13
+E14,PE14
+E15,PE15
+LED_BLUE,PE3
+KEY_1,PC13
+QSPI_CS,PB6
+QSPI_CLK,PB2
+QSPI_D0,PD11
+QSPI_D1,PD12
+QSPI_D2,PE2
+QSPI_D3,PD13
+USB_DM,PA11
+USB_DP,PA12
+OSC32_IN,PC14
+OSC32_OUT,PC15
+SDIO_D0,PC8
+SDIO_D1,PC9
+SDIO_D2,PC10
+SDIO_D3,PC11
+SDIO_CMD,PD2
+SDIO_CK,PC12
+SD_SW,PD4
+OTG_FS_POWER,PD10
+OTG_FS_OVER_CURRENT,PG7
+USB_VBUS,PA9
+USB_ID,PA10
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/stm32h7xx_hal_conf.h b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/stm32h7xx_hal_conf.h
new file mode 100644
index 0000000000000..c8f60c56055ef
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/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
+
+// 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)
+
+#include "boards/stm32h7xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/weact_stm32h743.ld b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/weact_stm32h743.ld
new file mode 100644
index 0000000000000..356d69171a5e0
--- /dev/null
+++ b/ports/stm32/boards/WEACTSTUDIO_MINI_STM32H743/weact_stm32h743.ld
@@ -0,0 +1,33 @@
+/*
+    GNU linker script for WeAct Studio STM32H743
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K   /* sectors (0-15) */
+    FLASH_APP  (rx) : ORIGIN = 0x08020000, LENGTH = 1920K   /* sectors (1-15) */
+    FLASH_ROMFS (rx): ORIGIN = 0x90000000, LENGTH = 8192K   /* external QSPI */
+    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;
+
+/* ROMFS location */
+_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
+_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);

From 14b5080515ec483f0f7be843a089eea835e4519f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Nov 2025 15:00:12 +1100
Subject: [PATCH 3126/3129] shared/tinyusb: Add optional port-specific hook on
 USBD init.

This allows a port to do hardware initialization just before the TinyUSB
stack is brought up.  That means the hardware is only turned on when it's
needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/tinyusb/mp_usbd.h         | 5 +++++
 shared/tinyusb/mp_usbd_runtime.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/shared/tinyusb/mp_usbd.h b/shared/tinyusb/mp_usbd.h
index 311575b3ad8ba..d73cb5ade828c 100644
--- a/shared/tinyusb/mp_usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -45,6 +45,10 @@
 #define MICROPY_WRAP_TUD_EVENT_HOOK_CB(name) name
 #endif
 
+#ifndef MICROPY_HW_TINYUSB_LL_INIT
+#define MICROPY_HW_TINYUSB_LL_INIT()
+#endif
+
 #if MICROPY_HW_ENABLE_USBDEV
 
 #include "py/obj.h"
@@ -102,6 +106,7 @@ void mp_usbd_task_callback(mp_sched_node_t *node);
 static inline void mp_usbd_init(void) {
     // Without runtime USB support, this can be a thin wrapper wrapper around tusb_init()
     // which is called in the below helper function.
+    MICROPY_HW_TINYUSB_LL_INIT();
     mp_usbd_init_tud();
 }
 
diff --git a/shared/tinyusb/mp_usbd_runtime.c b/shared/tinyusb/mp_usbd_runtime.c
index 72e011732d400..39344729da1cb 100644
--- a/shared/tinyusb/mp_usbd_runtime.c
+++ b/shared/tinyusb/mp_usbd_runtime.c
@@ -430,6 +430,8 @@ void mp_usbd_init(void) {
     }
 
     if (need_usb) {
+        // Call any port-specific initialization code.
+        MICROPY_HW_TINYUSB_LL_INIT();
         // The following will call tusb_init(), which is safe to call redundantly.
         mp_usbd_init_tud();
         // Reconnect if mp_usbd_deinit() has disconnected.

From f43810b1cd4142474a99df4e08d51a97eb9af00a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Nov 2025 23:24:24 +1100
Subject: [PATCH 3127/3129] stm32/usbd_conf: Clean up USBD hardware
 initialization functions.

Break the FS and HS initialization routines out into separate functions,
and call them as necessary from the TinyUSB or STM USB helper functions.

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

diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 76142789d413a..be56b2202ce5a 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -62,16 +62,8 @@ PCD_HandleTypeDef pcd_hs_handle;
 #define OTG_HS_IRQn USB1_OTG_HS_IRQn
 #endif
 
-#if MICROPY_HW_TINYUSB_STACK
-void pyb_usbd_init(void)
-#else
-void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
-#endif
-{
-    #if MICROPY_HW_USB_FS
-    #if MICROPY_HW_STM_USB_STACK
-    if (hpcd->Instance == USB_OTG_FS)
-    #endif
+#if MICROPY_HW_USB_FS
+static void mp_usbd_ll_init_fs(void) {
     {
         // Configure USB GPIO's.
 
@@ -192,17 +184,12 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
         #endif
         #endif
         #endif
-
-        #if MICROPY_HW_STM_USB_STACK
-        return;
-        #endif
     }
-    #endif
+}
+#endif // MICROPY_HW_USB_FS
 
-    #if MICROPY_HW_USB_HS
-    #if MICROPY_HW_STM_USB_STACK
-    if (hpcd->Instance == USB_OTG_HS)
-    #endif
+#if MICROPY_HW_USB_HS
+static void mp_usbd_ll_init_hs(void) {
     {
         #if MICROPY_HW_USB_HS_IN_FS
 
@@ -342,10 +329,36 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
         NVIC_SetPriority(OTG_HS_IRQn, IRQ_PRI_OTG_HS);
         HAL_NVIC_EnableIRQ(OTG_HS_IRQn);
     }
-    #endif // MICROPY_HW_USB_HS
 }
+#endif // MICROPY_HW_USB_HS
+
+#if MICROPY_HW_TINYUSB_STACK
+
+void pyb_usbd_init(void) {
+    #if MICROPY_HW_USB_FS
+    mp_usbd_ll_init_fs();
+    #endif
+
+    #if MICROPY_HW_USB_HS
+    mp_usbd_ll_init_hs();
+    #endif
+}
+
+#elif MICROPY_HW_STM_USB_STACK
 
-#if MICROPY_HW_STM_USB_STACK
+void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
+    #if MICROPY_HW_USB_FS
+    if (hpcd->Instance == USB_OTG_FS) {
+        mp_usbd_ll_init_fs();
+    }
+    #endif
+
+    #if MICROPY_HW_USB_HS
+    if (hpcd->Instance == USB_OTG_HS) {
+        mp_usbd_ll_init_hs();
+    }
+    #endif
+}
 
 /**
   * @brief  DeInitializes the PCD MSP.

From 63c94fe73ed5c52d4d7ccbf4ddcc2a1e3178d21b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Nov 2025 15:00:32 +1100
Subject: [PATCH 3128/3129] stm32: Fix init sequence of USB hardware and
 TinyUSB stack.

This commit fixes the initialization sequence for TinyUSB when enabled on
the stm32 port:

- Following other ports, `mp_usbd_init()` should be called just after
  running `boot.py`, to give the user a chance to configure USB.

- Hardware initialization (via `pyb_usbd_init()`) should only occur once,
  the first time TinyUSB is started up.  This is achieved by adding a hook
  to the shared TinyUSB bindings to call `pyb_usbd_init()`, and only do the
  hardware init if TinyUSB was not already initialized.

Also, `pyb_usbd_init()` is renamed `mp_usbd_ll_init()` to make it match
with the rest of the stared TinyUSB binding code.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c                 | 11 +++++------
 ports/stm32/mpconfigboard_common.h |  1 +
 ports/stm32/mphalport.h            |  1 +
 ports/stm32/usbd_conf.c            |  8 +++++++-
 ports/stm32/usbd_conf.h            |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 6f7413694b0b4..8085a5e25763e 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -611,14 +611,9 @@ void stm32_main(uint32_t reset_mode) {
     pyb_can_init0();
     #endif
 
-    #if MICROPY_HW_ENABLE_USB
-    #if MICROPY_HW_TINYUSB_STACK
-    pyb_usbd_init();
-    mp_usbd_init();
-    #else
+    #if MICROPY_HW_STM_USB_STACK && MICROPY_HW_ENABLE_USB
     pyb_usb_init0();
     #endif
-    #endif
 
     #if MICROPY_PY_MACHINE_I2S
     machine_i2s_init0();
@@ -690,6 +685,10 @@ void stm32_main(uint32_t reset_mode) {
     }
     #endif
 
+    #if MICROPY_HW_TINYUSB_STACK && MICROPY_HW_ENABLE_USBDEV
+    mp_usbd_init();
+    #endif
+
     #if MICROPY_HW_HAS_MMA7660
     // MMA accel: init and reset
     accel_init();
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 1ce42055d80f9..e21f474d7afb6 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -261,6 +261,7 @@
 #if MICROPY_HW_TINYUSB_STACK
 #ifndef MICROPY_HW_ENABLE_USBDEV
 #define MICROPY_HW_ENABLE_USBDEV (1)
+#define MICROPY_HW_TINYUSB_LL_INIT mp_usbd_ll_init
 #endif
 
 #ifndef MICROPY_HW_USB_CDC
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 098a848fb843b..50aa456971181 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -1,6 +1,7 @@
 // We use the ST Cube HAL library for most hardware peripherals
 #include STM32_HAL_H
 #include "pin.h"
+#include "usbd_conf.h"
 #include "py/ringbuf.h"
 #include "shared/runtime/interrupt_char.h"
 
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index be56b2202ce5a..e5ac9311d13dc 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -32,6 +32,7 @@
 #include "usbd_core.h"
 #include "py/obj.h"
 #include "py/mphal.h"
+#include "shared/tinyusb/mp_usbd.h"
 #include "irq.h"
 #include "usb.h"
 
@@ -334,7 +335,12 @@ static void mp_usbd_ll_init_hs(void) {
 
 #if MICROPY_HW_TINYUSB_STACK
 
-void pyb_usbd_init(void) {
+void mp_usbd_ll_init(void) {
+    // Only initialize the USB hardware once.
+    if (tusb_inited()) {
+        return;
+    }
+
     #if MICROPY_HW_USB_FS
     mp_usbd_ll_init_fs();
     #endif
diff --git a/ports/stm32/usbd_conf.h b/ports/stm32/usbd_conf.h
index cb0457982d5eb..5829d68701088 100644
--- a/ports/stm32/usbd_conf.h
+++ b/ports/stm32/usbd_conf.h
@@ -65,7 +65,7 @@
 #define USBD_HS_NUM_FIFO                      (1 + USBD_HS_NUM_TX_FIFO)
 
 #if MICROPY_HW_TINYUSB_STACK
-void pyb_usbd_init(void);
+void mp_usbd_ll_init(void);
 #endif
 
 #endif // MICROPY_INCLUDED_STM32_USBD_CONF_H

From 41acdd8083effcd513ee245075280b78af1ad938 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 26 Nov 2025 13:02:16 +1100
Subject: [PATCH 3129/3129] stm32/rtc: Make sure RTC is using LSE on N6 MCUs.

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

diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 72abcd75f9936..ae33f834cbf71 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -134,19 +134,27 @@ void rtc_init_start(bool force_init) {
     if (!force_init) {
         bool rtc_running = false;
         #if defined(STM32N6)
+        // Note: the low-level boot on the N6 seems to always enable the RTC and the LSI, and
+        // switch the RTC to LSI mode.  So the logic below needs to account for that:
+        // - if LSE is ready then switch back to the LSE
+        // - even if LSI is ready, don't use it if the board is configured to use LSE
+        uint32_t rtc_clock_source = LL_RCC_GetRTCClockSource();
         if (LL_RCC_IsEnabledRTC()
-            && LL_RCC_GetRTCClockSource() == LL_RCC_RTC_CLKSOURCE_LSE
             && LL_RCC_LSE_IsReady()) {
             // LSE is enabled & ready --> no need to (re-)init RTC
             rtc_running = true;
+            if (rtc_clock_source != LL_RCC_RTC_CLKSOURCE_LSE) {
+                LL_RCC_SetRTCClockSource(LL_RCC_RTC_CLKSOURCE_LSE);
+            }
             // remove Backup Domain write protection
             HAL_PWR_EnableBkUpAccess();
             // Clear source Reset Flag
             __HAL_RCC_CLEAR_RESET_FLAGS();
             // provide some status information
             rtc_info |= 0x40000;
-        } else if (LL_RCC_IsEnabledRTC()
-                   && LL_RCC_GetRTCClockSource() == LL_RCC_RTC_CLKSOURCE_LSI) {
+        } else if (!rtc_use_lse
+                   && LL_RCC_IsEnabledRTC()
+                   && rtc_clock_source == LL_RCC_RTC_CLKSOURCE_LSI) {
             // LSI configured as the RTC clock source --> no need to (re-)init RTC
             rtc_running = true;
             // remove Backup Domain write protection